From e019265ec958f836b0290d07afbf5fe2e1c3d14a Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sat, 14 Feb 2004 22:56:51 +0000
Subject: [PATCH 0001/5331] * Scripts to set up and run the absolute minimal
 pure Nix   environment; that is, an operating system environment in which
 there   is (essentially) only a store.

  The script `make-disk.sh' creates an ext2 disk image, creates a Nix
  store in it, and copies the closure of the bash package (from
  nixpkgs) to it.  The script `run.sh' then starts bash in a UML
  virtual machine.

  The contents of the image after creation look like this:

  $ ls -l
  drwxr-xr-x    2 root     root         1024 2004-02-14 19:13 dev
  lrwxrwxrwx    1 root     root           61 2004-02-14 23:34 init -> /nix/store/e40873ece7a010752ad72b4262b23d28-bash-2.05b/bin/sh
  drwx------    2 root     root        12288 2004-02-14 19:13 lost+found
  drwxr-xr-x    4 root     root         1024 2004-02-14 19:13 nix
  drwxr-xr-x    2 root     root         1024 2004-02-14 19:13 proc
  drwxrwxrwt    2 root     root         1024 2004-02-14 19:13 tmp

  The next step is to add all the other stuff that goes into a working
  system (coreutils, etc.).  BTW, if you don't have `ls' you can still
  list directories by doing `echo *' :-)

  Nix itself should also be Nixified so that it can be put into the
  store.

svn path=/nixu/trunk/; revision=783
---
 bootstrap.nix |  4 ++++
 fill-disk.sh  | 64 +++++++++++++++++++++++++++++++++++++++++++++++++++
 make-disk.sh  | 34 +++++++++++++++++++++++++++
 run.sh        |  5 ++++
 4 files changed, 107 insertions(+)
 create mode 100644 bootstrap.nix
 create mode 100755 fill-disk.sh
 create mode 100755 make-disk.sh
 create mode 100755 run.sh

diff --git a/bootstrap.nix b/bootstrap.nix
new file mode 100644
index 00000000000..bd141c96ff8
--- /dev/null
+++ b/bootstrap.nix
@@ -0,0 +1,4 @@
+let {
+  pkgs = import pkgs/system/i686-linux.nix;
+  body = pkgs.bash;
+}
\ No newline at end of file
diff --git a/fill-disk.sh b/fill-disk.sh
new file mode 100755
index 00000000000..8c09c788e9d
--- /dev/null
+++ b/fill-disk.sh
@@ -0,0 +1,64 @@
+#! /bin/sh -e
+
+initExpr=$1
+
+make_dir() {
+    mode=$1
+    name=$2
+    echo creating $name...
+    if ! test -d $root/$name; then mkdir $root/$name; fi
+    chmod $mode $root/$name
+}
+
+root=/tmp/mnt
+
+echo mounting...
+mount -t ext2 /dev/discs/disc0/disc $root
+
+make_dir 00755 /dev
+make_dir 00755 /proc
+make_dir 01777 /tmp
+make_dir 00755 /nix
+make_dir 00755 /nix/store
+make_dir 00755 /nix/var
+make_dir 00755 /nix/var/nix
+make_dir 00755 /nix/var/nix/db
+make_dir 00755 /nix/var/log
+make_dir 00755 /nix/var/log/nix
+
+export NIX_ROOT=$root
+
+echo initialising Nix DB...
+/nix/bin/nix-store --init
+
+echo verifying Nix DB...
+/nix/bin/nix-store --verify
+
+echo registering valid paths...
+(while read storepath; do
+    echo PATH $storepath
+    if ! /nix/bin/nix-store --isvalid $storepath 2> /dev/null; then
+        (unset NIX_ROOT; /nix/bin/nix-store --dump $storepath) | /nix/bin/nix-store --restore $storepath
+        /nix/bin/nix-store --validpath $storepath
+    fi
+done) < /tmp/storepaths
+
+echo registering successors...
+(while read line; do
+    echo SUCC $line
+    /nix/bin/nix-store --successor $line
+done) < /tmp/successors
+
+echo setting init symlink...
+initPath=$(/nix/bin/nix-store -qn $initExpr)
+rm -f $root/init
+ln -s $initPath/bin/sh $root/init
+
+echo unmounting...
+umount $root
+
+echo syncing...
+sync
+
+echo halting...
+/sbin/halt -d -f
diff --git a/make-disk.sh b/make-disk.sh
new file mode 100755
index 00000000000..e891159f9e8
--- /dev/null
+++ b/make-disk.sh
@@ -0,0 +1,34 @@
+#! /bin/sh -e
+
+image=/tmp/disk.img
+size=$(expr 256 \* 1024 \* 1024)
+storepaths=/tmp/storepaths
+successors=/tmp/successors
+
+if ! test -f $image; then 
+
+    echo creating empty disk of $size bytes in $image...
+    # Note: this is a sparse file.
+    dd if=/dev/zero of=$image bs=1 seek=$(expr $size - 1) count=1
+
+    echo creating disk image in $image...
+    /sbin/mke2fs -F $image
+
+fi
+
+
+# What to copy?
+storeexpr=$(nix-instantiate ./bootstrap.nix)
+nix-store -rB $storeexpr
+nix-store -qn --requisites $storeexpr > $storepaths
+
+(while read storepath; do
+  nix-store -q --predecessors $storepath | (while read predecessor; do
+    echo $predecessor $storepath
+  done) 
+done) < $storepaths > $successors
+
+# Fill the disk with the minimal Nix store.
+if ! test -d /tmp/mnt; then mkdir /tmp/mnt; fi
+linux ubd0=$image root=/dev/root rootflags=/ rootfstype=hostfs init="$(pwd)/fill-disk.sh $storeexpr"
+
diff --git a/run.sh b/run.sh
new file mode 100755
index 00000000000..19c329f67b1
--- /dev/null
+++ b/run.sh
@@ -0,0 +1,5 @@
+#! /bin/sh -e
+
+image=/tmp/disk.img
+
+linux ubd0=$image init="/init"
-- 
GitLab


From 1f7a8c8ae9fd84a60d8c02fd5c24bcfef52c3f80 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 16 Feb 2004 09:41:00 +0000
Subject: [PATCH 0002/5331] * Started setting up a proper init environment.

svn path=/nixu/trunk/; revision=785
---
 bootstrap.nix    |  4 ----
 fill-disk.sh     |  2 +-
 init/builder.sh  | 14 ++++++++++++++
 init/default.nix |  9 +++++++++
 init/init.sh     | 14 ++++++++++++++
 make-disk.sh     |  2 +-
 pkgs.nix         |  4 ++++
 run.sh           |  2 +-
 8 files changed, 44 insertions(+), 7 deletions(-)
 delete mode 100644 bootstrap.nix
 create mode 100755 init/builder.sh
 create mode 100644 init/default.nix
 create mode 100644 init/init.sh
 create mode 100644 pkgs.nix

diff --git a/bootstrap.nix b/bootstrap.nix
deleted file mode 100644
index bd141c96ff8..00000000000
--- a/bootstrap.nix
+++ /dev/null
@@ -1,4 +0,0 @@
-let {
-  pkgs = import pkgs/system/i686-linux.nix;
-  body = pkgs.bash;
-}
\ No newline at end of file
diff --git a/fill-disk.sh b/fill-disk.sh
index 8c09c788e9d..b3c852ddb20 100755
--- a/fill-disk.sh
+++ b/fill-disk.sh
@@ -52,7 +52,7 @@ done) < /tmp/successors
 echo setting init symlink...
 initPath=$(/nix/bin/nix-store -qn $initExpr)
 rm -f $root/init
-ln -s $initPath/bin/sh $root/init
+ln -s $initPath/bin/init $root/init
 
 echo unmounting...
 umount $root
diff --git a/init/builder.sh b/init/builder.sh
new file mode 100755
index 00000000000..5809ad62a30
--- /dev/null
+++ b/init/builder.sh
@@ -0,0 +1,14 @@
+#! /bin/sh -e
+
+. $stdenv/setup
+
+mkdir $out
+mkdir $out/bin
+
+sed \
+    -e "s^@bash\@^$bash^g" \
+    -e "s^@coreutils\@^$coreutils^g" \
+    -e "s^@findutils\@^$findutils^g" \
+    < $src > $out/bin/init
+
+chmod +x $out/bin/init
diff --git a/init/default.nix b/init/default.nix
new file mode 100644
index 00000000000..82bbb460db0
--- /dev/null
+++ b/init/default.nix
@@ -0,0 +1,9 @@
+{stdenv, bash, coreutils, findutils}:
+
+derivation {
+  name = "init";
+  system = stdenv.system;
+  builder = ./builder.sh;
+  src = ./init.sh;
+  inherit stdenv bash coreutils findutils;
+}
diff --git a/init/init.sh b/init/init.sh
new file mode 100644
index 00000000000..bb17ef5208f
--- /dev/null
+++ b/init/init.sh
@@ -0,0 +1,14 @@
+#! @bash@/bin/sh -e
+
+export PATH=@bash@/bin:@coreutils@/bin:@findutils@/bin
+
+echo "--- Nix ---"
+
+#echo "remounting root..."
+
+echo "starting root shell..."
+
+@bash@/bin/sh
+
+echo "shutting down..."
+exit 0
diff --git a/make-disk.sh b/make-disk.sh
index e891159f9e8..fb2c3a38545 100755
--- a/make-disk.sh
+++ b/make-disk.sh
@@ -18,7 +18,7 @@ fi
 
 
 # What to copy?
-storeexpr=$(nix-instantiate ./bootstrap.nix)
+storeexpr=$(echo '(import ./pkgs.nix).init' | nix-instantiate -)
 nix-store -rB $storeexpr
 nix-store -qn --requisites $storeexpr > $storepaths
 
diff --git a/pkgs.nix b/pkgs.nix
new file mode 100644
index 00000000000..b9fc7a22273
--- /dev/null
+++ b/pkgs.nix
@@ -0,0 +1,4 @@
+rec {
+  inherit (import pkgs/system/i686-linux.nix) stdenv bash coreutils findutils;
+  init = (import ./init) {inherit stdenv bash coreutils findutils;};
+}
diff --git a/run.sh b/run.sh
index 19c329f67b1..5f6a9e34fe9 100755
--- a/run.sh
+++ b/run.sh
@@ -2,4 +2,4 @@
 
 image=/tmp/disk.img
 
-linux ubd0=$image init="/init"
+linux ubd0="$image" mem=256M init="/init"
-- 
GitLab


From 1e87e75d079c4d80bf6cba8b2d986894121b217f Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 18 Feb 2004 10:56:07 +0000
Subject: [PATCH 0003/5331] * Use sysvinit's init to start the system.  This
 has the happy   side-effect of initialising the console properly (i.e.,
 enabling   Ctrl-[C, Z]).

svn path=/nixu/trunk/; revision=801
---
 fill-disk.sh     | 20 +++++++++++++++++---
 init/builder.sh  |  4 ++++
 init/default.nix |  4 ++--
 init/init.sh     | 25 ++++++++++++++++++++++---
 make-disk.sh     | 21 +++++++++++++--------
 pkgs.nix         |  9 +++++++--
 6 files changed, 65 insertions(+), 18 deletions(-)

diff --git a/fill-disk.sh b/fill-disk.sh
index b3c852ddb20..8c9e3b6c8fd 100755
--- a/fill-disk.sh
+++ b/fill-disk.sh
@@ -1,6 +1,7 @@
 #! /bin/sh -e
 
-initExpr=$1
+sysvinitPath=$1
+initPath=$2
 
 make_dir() {
     mode=$1
@@ -18,6 +19,8 @@ mount -t ext2 /dev/discs/disc0/disc $root
 make_dir 00755 /dev
 make_dir 00755 /proc
 make_dir 01777 /tmp
+make_dir 00755 /etc # global non-constant configuration
+make_dir 00755 /var
 make_dir 00755 /nix
 make_dir 00755 /nix/store
 make_dir 00755 /nix/var
@@ -25,6 +28,13 @@ make_dir 00755 /nix/var/nix
 make_dir 00755 /nix/var/nix/db
 make_dir 00755 /nix/var/log
 make_dir 00755 /nix/var/log/nix
+make_dir 00755 /mnt
+make_dir 00755 /mnt/host
+make_dir 00755 /home
+make_dir 00755 /home/root
+
+rm -f $root/etc/mtab
+ln -s /proc/mounts $root/etc/mtab
 
 export NIX_ROOT=$root
 
@@ -50,9 +60,13 @@ echo registering successors...
 done) < /tmp/successors
 
 echo setting init symlink...
-initPath=$(/nix/bin/nix-store -qn $initExpr)
 rm -f $root/init
-ln -s $initPath/bin/init $root/init
+ln -s $sysvinitPath/sbin/init $root/init
+
+echo setting up inittab...
+rm -f $root/etc/inittab
+echo "id:2:initdefault:" >> $root/etc/inittab
+echo "si::bootwait:$initPath/bin/init" >> $root/etc/inittab
 
 echo unmounting...
 umount $root
diff --git a/init/builder.sh b/init/builder.sh
index 5809ad62a30..a12da5342b1 100755
--- a/init/builder.sh
+++ b/init/builder.sh
@@ -9,6 +9,10 @@ sed \
     -e "s^@bash\@^$bash^g" \
     -e "s^@coreutils\@^$coreutils^g" \
     -e "s^@findutils\@^$findutils^g" \
+    -e "s^@utillinux\@^$utillinux^g" \
+    -e "s^@sysvinit\@^$sysvinit^g" \
+    -e "s^@e2fsprogs\@^$e2fsprogs^g" \
+    -e "s^@nix\@^$nix^g" \
     < $src > $out/bin/init
 
 chmod +x $out/bin/init
diff --git a/init/default.nix b/init/default.nix
index 82bbb460db0..c49891d593f 100644
--- a/init/default.nix
+++ b/init/default.nix
@@ -1,9 +1,9 @@
-{stdenv, bash, coreutils, findutils}:
+{stdenv, bash, coreutils, findutils, utillinux, sysvinit, e2fsprogs, nix}:
 
 derivation {
   name = "init";
   system = stdenv.system;
   builder = ./builder.sh;
   src = ./init.sh;
-  inherit stdenv bash coreutils findutils;
+  inherit stdenv bash coreutils findutils utillinux sysvinit e2fsprogs nix;
 }
diff --git a/init/init.sh b/init/init.sh
index bb17ef5208f..c5007b44f2d 100644
--- a/init/init.sh
+++ b/init/init.sh
@@ -1,14 +1,33 @@
 #! @bash@/bin/sh -e
 
-export PATH=@bash@/bin:@coreutils@/bin:@findutils@/bin
+trap "echo 'ignoring TERM signal'" SIGTERM
+trap "echo 'ignoring INT signal'" SIGINT
+
+export PATH=@nix@/bin:@bash@/bin:@coreutils@/bin:@findutils@/bin:@utillinux@/bin:@utillinux@/sbin:@sysvinit@/bin:@sysvinit@/sbin:@e2fsprogs@/bin:@e2fsprogs@/sbin
 
 echo "--- Nix ---"
 
-#echo "remounting root..."
+echo "mounting /proc..."
+mount -n -t proc none /proc
+
+echo "checking /dev/root..."
+e2fsck -y /dev/root || test "$?" -le 1
+
+echo "remounting / writable..."
+mount -n -o remount,rw /dev/root /
+
+echo "mounting /mnt/host..."
+mount -n -t hostfs none /mnt/host
 
 echo "starting root shell..."
 
 @bash@/bin/sh
 
+echo "remounting / read-only..."
+mount -n -o remount,rw /dev/root / || echo "(failed)" # ignore errors
+
+echo "syncing..."
+sync || echo "(failed)" # ignore errors
+
 echo "shutting down..."
-exit 0
+halt -d -f
diff --git a/make-disk.sh b/make-disk.sh
index fb2c3a38545..498753d6fbb 100755
--- a/make-disk.sh
+++ b/make-disk.sh
@@ -2,7 +2,7 @@
 
 image=/tmp/disk.img
 size=$(expr 256 \* 1024 \* 1024)
-storepaths=/tmp/storepaths
+storePaths=/tmp/storepaths
 successors=/tmp/successors
 
 if ! test -f $image; then 
@@ -16,19 +16,24 @@ if ! test -f $image; then
 
 fi
 
-
 # What to copy?
-storeexpr=$(echo '(import ./pkgs.nix).init' | nix-instantiate -)
-nix-store -rB $storeexpr
-nix-store -qn --requisites $storeexpr > $storepaths
+storeExpr=$(echo '(import ./pkgs.nix).everything' | nix-instantiate -)
+nix-store -rB $storeExpr
+nix-store -qn --requisites $storeExpr > $storePaths
 
 (while read storepath; do
   nix-store -q --predecessors $storepath | (while read predecessor; do
     echo $predecessor $storepath
   done) 
-done) < $storepaths > $successors
+done) < $storePaths > $successors
+
+# Location of sysvinit?
+sysvinitPath=$(nix-store -qn $(echo '(import ./pkgs.nix).sysvinit' | nix-instantiate -))
+
+# Location of Nix init?
+initPath=$(nix-store -qn $(echo '(import ./pkgs.nix).init' | nix-instantiate -))
 
 # Fill the disk with the minimal Nix store.
 if ! test -d /tmp/mnt; then mkdir /tmp/mnt; fi
-linux ubd0=$image root=/dev/root rootflags=/ rootfstype=hostfs init="$(pwd)/fill-disk.sh $storeexpr"
-
+linux ubd0=$image root=/dev/root rootflags=/ rootfstype=hostfs \
+  init="$(pwd)/fill-disk.sh $sysvinitPath $initPath"
diff --git a/pkgs.nix b/pkgs.nix
index b9fc7a22273..d0314a6b300 100644
--- a/pkgs.nix
+++ b/pkgs.nix
@@ -1,4 +1,9 @@
 rec {
-  inherit (import pkgs/system/i686-linux.nix) stdenv bash coreutils findutils;
-  init = (import ./init) {inherit stdenv bash coreutils findutils;};
+  inherit (import pkgs/system/i686-linux.nix)
+    stdenv bash coreutils findutils utillinux sysvinit e2fsprogs nix;
+
+  init = (import ./init)
+    {inherit stdenv bash coreutils findutils utillinux sysvinit e2fsprogs nix;};
+
+  everything = [init sysvinit];
 }
-- 
GitLab


From 008ef42267aa9a675cc71b314babf2cc42243c7e Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 18 Feb 2004 14:12:49 +0000
Subject: [PATCH 0004/5331] * init -> boot, to prevent confusion.

svn path=/nixu/trunk/; revision=802
---
 {init => boot}/builder.sh  | 0
 {init => boot}/default.nix | 0
 {init => boot}/init.sh     | 3 ---
 3 files changed, 3 deletions(-)
 rename {init => boot}/builder.sh (100%)
 rename {init => boot}/default.nix (100%)
 rename {init => boot}/init.sh (89%)

diff --git a/init/builder.sh b/boot/builder.sh
similarity index 100%
rename from init/builder.sh
rename to boot/builder.sh
diff --git a/init/default.nix b/boot/default.nix
similarity index 100%
rename from init/default.nix
rename to boot/default.nix
diff --git a/init/init.sh b/boot/init.sh
similarity index 89%
rename from init/init.sh
rename to boot/init.sh
index c5007b44f2d..e34a516c6de 100644
--- a/init/init.sh
+++ b/boot/init.sh
@@ -1,8 +1,5 @@
 #! @bash@/bin/sh -e
 
-trap "echo 'ignoring TERM signal'" SIGTERM
-trap "echo 'ignoring INT signal'" SIGINT
-
 export PATH=@nix@/bin:@bash@/bin:@coreutils@/bin:@findutils@/bin:@utillinux@/bin:@utillinux@/sbin:@sysvinit@/bin:@sysvinit@/sbin:@e2fsprogs@/bin:@e2fsprogs@/sbin
 
 echo "--- Nix ---"
-- 
GitLab


From 3514c5658b7a8d618ef3babdf54377bf17406689 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 18 Feb 2004 14:56:32 +0000
Subject: [PATCH 0005/5331] * Proper sysvinit boot/halt.  At runlevel 2,
 creates login shells at   virtual consoles 0 and 1.  To shutdown, do `init 0'
 (`halt' and   `shutdown' don't work because they call /sbin/init).

svn path=/nixu/trunk/; revision=803
---
 boot/{init.sh => boot.sh} | 13 +------------
 boot/builder.sh           | 24 +++++++++++++-----------
 boot/default.nix          |  6 ++++--
 boot/halt.sh              | 12 ++++++++++++
 boot/login.sh             | 15 +++++++++++++++
 fill-disk.sh              |  7 +++++--
 make-disk.sh              |  6 +++---
 pkgs.nix                  |  4 ++--
 8 files changed, 55 insertions(+), 32 deletions(-)
 rename boot/{init.sh => boot.sh} (65%)
 create mode 100644 boot/halt.sh
 create mode 100644 boot/login.sh

diff --git a/boot/init.sh b/boot/boot.sh
similarity index 65%
rename from boot/init.sh
rename to boot/boot.sh
index e34a516c6de..3f17ea32ac0 100644
--- a/boot/init.sh
+++ b/boot/boot.sh
@@ -16,15 +16,4 @@ mount -n -o remount,rw /dev/root /
 echo "mounting /mnt/host..."
 mount -n -t hostfs none /mnt/host
 
-echo "starting root shell..."
-
-@bash@/bin/sh
-
-echo "remounting / read-only..."
-mount -n -o remount,rw /dev/root / || echo "(failed)" # ignore errors
-
-echo "syncing..."
-sync || echo "(failed)" # ignore errors
-
-echo "shutting down..."
-halt -d -f
+echo "boot done."
diff --git a/boot/builder.sh b/boot/builder.sh
index a12da5342b1..902940dc907 100755
--- a/boot/builder.sh
+++ b/boot/builder.sh
@@ -5,14 +5,16 @@
 mkdir $out
 mkdir $out/bin
 
-sed \
-    -e "s^@bash\@^$bash^g" \
-    -e "s^@coreutils\@^$coreutils^g" \
-    -e "s^@findutils\@^$findutils^g" \
-    -e "s^@utillinux\@^$utillinux^g" \
-    -e "s^@sysvinit\@^$sysvinit^g" \
-    -e "s^@e2fsprogs\@^$e2fsprogs^g" \
-    -e "s^@nix\@^$nix^g" \
-    < $src > $out/bin/init
-
-chmod +x $out/bin/init
+for i in $boot $halt $login; do
+    dst=$out/bin/$(basename $i | cut -c34-)
+    sed \
+        -e "s^@bash\@^$bash^g" \
+        -e "s^@coreutils\@^$coreutils^g" \
+        -e "s^@findutils\@^$findutils^g" \
+        -e "s^@utillinux\@^$utillinux^g" \
+        -e "s^@sysvinit\@^$sysvinit^g" \
+        -e "s^@e2fsprogs\@^$e2fsprogs^g" \
+        -e "s^@nix\@^$nix^g" \
+        < $i > $dst
+    chmod +x $dst
+done
\ No newline at end of file
diff --git a/boot/default.nix b/boot/default.nix
index c49891d593f..8f6820c5e4a 100644
--- a/boot/default.nix
+++ b/boot/default.nix
@@ -1,9 +1,11 @@
 {stdenv, bash, coreutils, findutils, utillinux, sysvinit, e2fsprogs, nix}:
 
 derivation {
-  name = "init";
+  name = "boot";
   system = stdenv.system;
   builder = ./builder.sh;
-  src = ./init.sh;
+  boot = ./boot.sh;
+  halt = ./halt.sh;
+  login = ./login.sh;
   inherit stdenv bash coreutils findutils utillinux sysvinit e2fsprogs nix;
 }
diff --git a/boot/halt.sh b/boot/halt.sh
new file mode 100644
index 00000000000..19e89045854
--- /dev/null
+++ b/boot/halt.sh
@@ -0,0 +1,12 @@
+#! @bash@/bin/sh -e
+
+export PATH=@nix@/bin:@bash@/bin:@coreutils@/bin:@findutils@/bin:@utillinux@/bin:@utillinux@/sbin:@sysvinit@/bin:@sysvinit@/sbin:@e2fsprogs@/bin:@e2fsprogs@/sbin
+
+echo "remounting / read-only..."
+mount -n -o remount,rw /dev/root / || echo "(failed)" # ignore errors
+
+echo "syncing..."
+sync || echo "(failed)" # ignore errors
+
+echo "shutting down..."
+halt -d -f
diff --git a/boot/login.sh b/boot/login.sh
new file mode 100644
index 00000000000..74e14b64de6
--- /dev/null
+++ b/boot/login.sh
@@ -0,0 +1,15 @@
+#! @bash@/bin/sh -e
+
+tty=$1
+
+exec < $tty > $tty 2>&1
+
+export PATH=@nix@/bin:@bash@/bin:@coreutils@/bin:@findutils@/bin:@utillinux@/bin:@utillinux@/sbin:@sysvinit@/bin:@sysvinit@/sbin:@e2fsprogs@/bin:@e2fsprogs@/sbin
+
+echo
+echo "=== Welcome to Nix! ==="
+
+export HOME=/home/root
+cd $HOME
+
+exec @bash@/bin/sh
diff --git a/fill-disk.sh b/fill-disk.sh
index 8c9e3b6c8fd..b50088e16e0 100755
--- a/fill-disk.sh
+++ b/fill-disk.sh
@@ -1,7 +1,7 @@
 #! /bin/sh -e
 
 sysvinitPath=$1
-initPath=$2
+bootPath=$2
 
 make_dir() {
     mode=$1
@@ -66,7 +66,10 @@ ln -s $sysvinitPath/sbin/init $root/init
 echo setting up inittab...
 rm -f $root/etc/inittab
 echo "id:2:initdefault:" >> $root/etc/inittab
-echo "si::bootwait:$initPath/bin/init" >> $root/etc/inittab
+echo "si::bootwait:$bootPath/bin/boot.sh" >> $root/etc/inittab
+echo "ht:06:wait:$bootPath/bin/halt.sh" >> $root/etc/inittab
+echo "1:2345:respawn:$bootPath/bin/login.sh /dev/ttys/0" >> $root/etc/inittab
+echo "2:2345:respawn:$bootPath/bin/login.sh /dev/ttys/1" >> $root/etc/inittab
 
 echo unmounting...
 umount $root
diff --git a/make-disk.sh b/make-disk.sh
index 498753d6fbb..00e3cb28de1 100755
--- a/make-disk.sh
+++ b/make-disk.sh
@@ -30,10 +30,10 @@ done) < $storePaths > $successors
 # Location of sysvinit?
 sysvinitPath=$(nix-store -qn $(echo '(import ./pkgs.nix).sysvinit' | nix-instantiate -))
 
-# Location of Nix init?
-initPath=$(nix-store -qn $(echo '(import ./pkgs.nix).init' | nix-instantiate -))
+# Location of Nix boot scripts?
+bootPath=$(nix-store -qn $(echo '(import ./pkgs.nix).boot' | nix-instantiate -))
 
 # Fill the disk with the minimal Nix store.
 if ! test -d /tmp/mnt; then mkdir /tmp/mnt; fi
 linux ubd0=$image root=/dev/root rootflags=/ rootfstype=hostfs \
-  init="$(pwd)/fill-disk.sh $sysvinitPath $initPath"
+  init="$(pwd)/fill-disk.sh $sysvinitPath $bootPath"
diff --git a/pkgs.nix b/pkgs.nix
index d0314a6b300..d0df974d902 100644
--- a/pkgs.nix
+++ b/pkgs.nix
@@ -2,8 +2,8 @@ rec {
   inherit (import pkgs/system/i686-linux.nix)
     stdenv bash coreutils findutils utillinux sysvinit e2fsprogs nix;
 
-  init = (import ./init)
+  boot = (import ./boot)
     {inherit stdenv bash coreutils findutils utillinux sysvinit e2fsprogs nix;};
 
-  everything = [init sysvinit];
+  everything = [boot sysvinit];
 }
-- 
GitLab


From 91a5fe9eb05718f7e4b5adc68fc6f65fe34f10a6 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 19 Feb 2004 12:49:00 +0000
Subject: [PATCH 0006/5331] * Networking now works in the UML machine. 
 Masquerading for the tun   device should be enabled on the host in order for
 the UML machine to   be able to talk to the Internet.

svn path=/nixu/trunk/; revision=806
---
 boot/boot.sh     | 14 +++++++++++++-
 boot/builder.sh  |  6 ++++--
 boot/default.nix |  7 +++++--
 boot/env.sh      |  1 +
 boot/halt.sh     |  2 +-
 boot/login.sh    |  4 ++--
 fill-disk.sh     | 11 ++++++++++-
 pkgs.nix         |  7 ++++---
 run.sh           |  4 +++-
 9 files changed, 43 insertions(+), 13 deletions(-)
 create mode 100644 boot/env.sh

diff --git a/boot/boot.sh b/boot/boot.sh
index 3f17ea32ac0..191c081c753 100644
--- a/boot/boot.sh
+++ b/boot/boot.sh
@@ -1,6 +1,6 @@
 #! @bash@/bin/sh -e
 
-export PATH=@nix@/bin:@bash@/bin:@coreutils@/bin:@findutils@/bin:@utillinux@/bin:@utillinux@/sbin:@sysvinit@/bin:@sysvinit@/sbin:@e2fsprogs@/bin:@e2fsprogs@/sbin
+. @out@/bin/env.sh
 
 echo "--- Nix ---"
 
@@ -16,4 +16,16 @@ mount -n -o remount,rw /dev/root /
 echo "mounting /mnt/host..."
 mount -n -t hostfs none /mnt/host
 
+echo "setting up hostname..."
+hostname uml
+
+echo "enabling loopback interface..."
+ifconfig lo 127.0.0.1
+
+echo "enabling ethernet interface..."
+ifconfig eth0 $(cat /etc/networking/local-ip) up
+
+echo "setting up routing table..."
+route add default gw $(cat /etc/networking/gateway-ip)
+
 echo "boot done."
diff --git a/boot/builder.sh b/boot/builder.sh
index 902940dc907..8748d8875e5 100755
--- a/boot/builder.sh
+++ b/boot/builder.sh
@@ -5,7 +5,7 @@
 mkdir $out
 mkdir $out/bin
 
-for i in $boot $halt $login; do
+for i in $boot $halt $login $env; do
     dst=$out/bin/$(basename $i | cut -c34-)
     sed \
         -e "s^@bash\@^$bash^g" \
@@ -14,7 +14,9 @@ for i in $boot $halt $login; do
         -e "s^@utillinux\@^$utillinux^g" \
         -e "s^@sysvinit\@^$sysvinit^g" \
         -e "s^@e2fsprogs\@^$e2fsprogs^g" \
+        -e "s^@nettools\@^$nettools^g" \
         -e "s^@nix\@^$nix^g" \
+        -e "s^@out\@^$out^g" \
         < $i > $dst
     chmod +x $dst
-done
\ No newline at end of file
+done
diff --git a/boot/default.nix b/boot/default.nix
index 8f6820c5e4a..6ecd30758b8 100644
--- a/boot/default.nix
+++ b/boot/default.nix
@@ -1,4 +1,5 @@
-{stdenv, bash, coreutils, findutils, utillinux, sysvinit, e2fsprogs, nix}:
+{ stdenv, bash, coreutils, findutils, utillinux, sysvinit, e2fsprogs
+, nettools, nix}:
 
 derivation {
   name = "boot";
@@ -7,5 +8,7 @@ derivation {
   boot = ./boot.sh;
   halt = ./halt.sh;
   login = ./login.sh;
-  inherit stdenv bash coreutils findutils utillinux sysvinit e2fsprogs nix;
+  env = ./env.sh;
+  inherit stdenv bash coreutils findutils utillinux sysvinit
+          e2fsprogs nettools nix;
 }
diff --git a/boot/env.sh b/boot/env.sh
new file mode 100644
index 00000000000..75504da38b7
--- /dev/null
+++ b/boot/env.sh
@@ -0,0 +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:
diff --git a/boot/halt.sh b/boot/halt.sh
index 19e89045854..8ec9e64535b 100644
--- a/boot/halt.sh
+++ b/boot/halt.sh
@@ -1,6 +1,6 @@
 #! @bash@/bin/sh -e
 
-export PATH=@nix@/bin:@bash@/bin:@coreutils@/bin:@findutils@/bin:@utillinux@/bin:@utillinux@/sbin:@sysvinit@/bin:@sysvinit@/sbin:@e2fsprogs@/bin:@e2fsprogs@/sbin
+. @out@/bin/env.sh
 
 echo "remounting / read-only..."
 mount -n -o remount,rw /dev/root / || echo "(failed)" # ignore errors
diff --git a/boot/login.sh b/boot/login.sh
index 74e14b64de6..9222b2aba13 100644
--- a/boot/login.sh
+++ b/boot/login.sh
@@ -1,11 +1,11 @@
 #! @bash@/bin/sh -e
 
+. @out@/bin/env.sh
+
 tty=$1
 
 exec < $tty > $tty 2>&1
 
-export PATH=@nix@/bin:@bash@/bin:@coreutils@/bin:@findutils@/bin:@utillinux@/bin:@utillinux@/sbin:@sysvinit@/bin:@sysvinit@/sbin:@e2fsprogs@/bin:@e2fsprogs@/sbin
-
 echo
 echo "=== Welcome to Nix! ==="
 
diff --git a/fill-disk.sh b/fill-disk.sh
index b50088e16e0..6dc0449f73e 100755
--- a/fill-disk.sh
+++ b/fill-disk.sh
@@ -69,7 +69,16 @@ echo "id:2:initdefault:" >> $root/etc/inittab
 echo "si::bootwait:$bootPath/bin/boot.sh" >> $root/etc/inittab
 echo "ht:06:wait:$bootPath/bin/halt.sh" >> $root/etc/inittab
 echo "1:2345:respawn:$bootPath/bin/login.sh /dev/ttys/0" >> $root/etc/inittab
-echo "2:2345:respawn:$bootPath/bin/login.sh /dev/ttys/1" >> $root/etc/inittab
+#echo "2:2345:respawn:$bootPath/bin/login.sh /dev/ttys/1" >> $root/etc/inittab
+
+echo setting up networking information...
+make_dir 00755 /etc/networking
+echo 192.168.150.1 > $root/etc/networking/local-ip
+echo 192.168.150.3 > $root/etc/networking/gateway-ip
+cp /etc/resolv.conf $root/etc
+rm -f $root/etc/hosts
+echo "127.0.0.1 localhost" >> $root/etc/hosts
+echo "192.168.150.1 uml" >> $root/etc/hosts
 
 echo unmounting...
 umount $root
diff --git a/pkgs.nix b/pkgs.nix
index d0df974d902..3b6fcb7646e 100644
--- a/pkgs.nix
+++ b/pkgs.nix
@@ -1,9 +1,10 @@
 rec {
   inherit (import pkgs/system/i686-linux.nix)
-    stdenv bash coreutils findutils utillinux sysvinit e2fsprogs nix;
+    stdenv bash coreutils findutils utillinux sysvinit e2fsprogs
+    nettools nix;
 
-  boot = (import ./boot)
-    {inherit stdenv bash coreutils findutils utillinux sysvinit e2fsprogs nix;};
+  boot = (import ./boot) {inherit stdenv bash coreutils findutils
+    utillinux sysvinit e2fsprogs nettools nix;};
 
   everything = [boot sysvinit];
 }
diff --git a/run.sh b/run.sh
index 5f6a9e34fe9..9a51834e0d2 100755
--- a/run.sh
+++ b/run.sh
@@ -2,4 +2,6 @@
 
 image=/tmp/disk.img
 
-linux ubd0="$image" mem=256M init="/init"
+linux ubd0="$image" mem=256M \
+  eth0=tuntap,tap4,,192.168.150.1 \
+  init="/init"
-- 
GitLab


From 656ea85e60047fb5af644214ecb37c97e16f34a6 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 16 Jul 2004 15:41:47 +0000
Subject: [PATCH 0007/5331] * Ignore failure to set up networking. * Unmount,
 don't remount / on halt.

svn path=/nixu/trunk/; revision=1169
---
 boot/boot.sh | 6 ++++--
 boot/halt.sh | 4 ++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/boot/boot.sh b/boot/boot.sh
index 191c081c753..a6ce1f2d67a 100644
--- a/boot/boot.sh
+++ b/boot/boot.sh
@@ -1,5 +1,7 @@
 #! @bash@/bin/sh -e
 
+set -e
+
 . @out@/bin/env.sh
 
 echo "--- Nix ---"
@@ -23,9 +25,9 @@ echo "enabling loopback interface..."
 ifconfig lo 127.0.0.1
 
 echo "enabling ethernet interface..."
-ifconfig eth0 $(cat /etc/networking/local-ip) up
+ifconfig eth0 $(cat /etc/networking/local-ip) up || true
 
 echo "setting up routing table..."
-route add default gw $(cat /etc/networking/gateway-ip)
+route add default gw $(cat /etc/networking/gateway-ip) || true
 
 echo "boot done."
diff --git a/boot/halt.sh b/boot/halt.sh
index 8ec9e64535b..c6e000b92b6 100644
--- a/boot/halt.sh
+++ b/boot/halt.sh
@@ -2,8 +2,8 @@
 
 . @out@/bin/env.sh
 
-echo "remounting / read-only..."
-mount -n -o remount,rw /dev/root / || echo "(failed)" # ignore errors
+echo "unmount file systems..."
+umount -avt noproc,nonfs,nosmbfs,nodevfs || echo "(failed)" # ignore errors
 
 echo "syncing..."
 sync || echo "(failed)" # ignore errors
-- 
GitLab


From 23f6a57f7a5df2589385cc70e303d6ff21d2c805 Mon Sep 17 00:00:00 2001
From: Armijn Hemel <armijn@gpl-violations.org>
Date: Fri, 6 Aug 2004 13:10:44 +0000
Subject: [PATCH 0008/5331] add an installation guide

svn path=/nixu/trunk/; revision=1240
---
 INSTALL | 72 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 72 insertions(+)
 create mode 100644 INSTALL

diff --git a/INSTALL b/INSTALL
new file mode 100644
index 00000000000..dfa2ef6bece
--- /dev/null
+++ b/INSTALL
@@ -0,0 +1,72 @@
+Setting up and running Nix UML ("nixu")
+
+It is possible to run Nix inside a User Mode Linux environment (UML). The Nix
+expressions for this can be found at
+https://svn.cs.uu.nl:12443/repos/trace/nixu/.
+
+
+  Installation on SuSE Linux 9
+
+Download the latest nixpkgs collection and checkout the nixu trunk with
+subversion. Install the uml and uml-utilities packages with Nix and run the
+"make-disk.sh" script which can be found in nixu. After it has built
+everything (or downloaded everything from the nixpkgs cache which can be
+used with nix-pull) you can use the "run.sh" script to start the UML.
+
+
+  Installation on Fedora Core 1
+
+Installing the Nix UML on Fedora Core 1 is a bit tricky. Nix relies on
+Berkeley DB and there are issues with Berkeley DB and NPTL kernels (New POSIX
+Thread Library) on Red Hat based systems. Since the system we build inside
+UML does not use NPTL we cannot use the Nix we use on the host system to
+fill the disk once we've booted our the kernel of our UML.
+
+The solution is as follows:
+
+- install all packages via the nix-pull mechanisms with the MANIFEST from
+  the official nix-pkgs site to avoid that impure builds link against the
+  NPTL glibc on the host system.
+- install Nix in Nix
+- in the nixu scripts edit make-disk.sh and fill-disk.sh.
+  In make-disk.sh prefix all nix-* commands with the absolute path to the
+  host-Nix installation bin directory (for example: /nix/bin). In
+  fill-disk.sh replace all /nix/bin paths with a relative path to the Nix
+  installed with Nix (for example: /usr/home/nix/.nix-profile/bin).
+
+This should fix the installation problems and the Nix UML should boot
+flawlessly.
+
+
+  Nix UML and 2.6 kernel
+
+Installing the current Nix UML packages with a 2.4 kernel on a 2.6
+kernel based host system will most likely fail. Linux kernel 2.6 uses NPTL
+by default, but UML itself seems to be broken somewhat so halfway the system
+seems to hang.
+
+Installing a 2.6 based UML with Nix is not trivial and is not advised.
+
+
+  Adding packages to the UML Nix installation
+
+Packages can be added the the Nix UML installation by editing a few files.
+The first file packages should be added to is 'pkgs.nix'. The other files
+that should be edited all reside in the "boot" directory. In default.nix
+the packages should be added as an argument (first line) and given as an
+argument to the builder (line starting with "inherit"). In "builder.sh"
+there is a giant sed expression which subsitutes all occurences of the
+names of the packages in the files with the right value. If the programs
+that are added need to be added to $PATH the file "env.sh" has to be
+edited.
+
+Another option is to enable networking in the UML and use nix-pull to get
+all the right packages. One thing you have to make sure is that the packages
+you want to install are indeed defined in the nix files.
+
+
+  Differences with a normal UML
+
+A lot of packages are still missing from the current UML. User management
+is completely lacking, init scripts and system configuration (/etc) are
+not there yet.
-- 
GitLab


From eb5fbd58d801b7abdf0cecb7cbd4faea651f9f8d Mon Sep 17 00:00:00 2001
From: Armijn Hemel <armijn@gpl-violations.org>
Date: Fri, 6 Aug 2004 13:45:41 +0000
Subject: [PATCH 0009/5331] - add instructions to add users - nix-pull does not
 work yet

svn path=/nixu/trunk/; revision=1241
---
 INSTALL | 34 ++++++++++++++++++++++++++--------
 1 file changed, 26 insertions(+), 8 deletions(-)

diff --git a/INSTALL b/INSTALL
index dfa2ef6bece..a7408dc89c9 100644
--- a/INSTALL
+++ b/INSTALL
@@ -48,6 +48,25 @@ seems to hang.
 Installing a 2.6 based UML with Nix is not trivial and is not advised.
 
 
+  Using the Nix UML
+
+By default, the Nix UML comes with very little configuration. Apart from the
+networking information and mount information, there is nothing. One of the
+first things to do is to add user and group information, otherwise a lot
+of tools won't work. There are empty passwd, shadow and group files. Due
+to some limitations in Nix it is only possible to modify the password file
+as root.
+
+- add a root user:
+
+useradd root
+
+- edit /etc/passwd and change the UID to 0 ("vim" is provided)
+- add a root group:
+
+groupadd root
+
+
   Adding packages to the UML Nix installation
 
 Packages can be added the the Nix UML installation by editing a few files.
@@ -55,14 +74,13 @@ The first file packages should be added to is 'pkgs.nix'. The other files
 that should be edited all reside in the "boot" directory. In default.nix
 the packages should be added as an argument (first line) and given as an
 argument to the builder (line starting with "inherit"). In "builder.sh"
-there is a giant sed expression which subsitutes all occurences of the
-names of the packages in the files with the right value. If the programs
-that are added need to be added to $PATH the file "env.sh" has to be
-edited.
-
-Another option is to enable networking in the UML and use nix-pull to get
-all the right packages. One thing you have to make sure is that the packages
-you want to install are indeed defined in the nix files.
+there is a sed expression which subsitutes all occurences of the names of
+the packages in the files with the right value. If the programs that are
+added need to be added to $PATH the file "env.sh" has to be edited and the
+UML has to be recreated.
+
+Another option would be to enable networking in the UML and use nix-pull to
+get all the right packages, however this does not work yet.
 
 
   Differences with a normal UML
-- 
GitLab


From 8c3de58259a59df042b3cc52d93f68681849bdcc Mon Sep 17 00:00:00 2001
From: Armijn Hemel <armijn@gpl-violations.org>
Date: Fri, 6 Aug 2004 13:50:42 +0000
Subject: [PATCH 0010/5331] add a directory, touch a few files

svn path=/nixu/trunk/; revision=1242
---
 fill-disk.sh | 25 +++++++++++++++++++------
 1 file changed, 19 insertions(+), 6 deletions(-)

diff --git a/fill-disk.sh b/fill-disk.sh
index 6dc0449f73e..89a5f992ade 100755
--- a/fill-disk.sh
+++ b/fill-disk.sh
@@ -11,6 +11,12 @@ make_dir() {
     chmod $mode $root/$name
 }
 
+
+touch_file() {
+    name=$1
+    echo creating $name...
+    if ! test -d $root/$name; then touch $root/$name; fi
+}
 root=/tmp/mnt
 
 echo mounting...
@@ -20,6 +26,7 @@ make_dir 00755 /dev
 make_dir 00755 /proc
 make_dir 01777 /tmp
 make_dir 00755 /etc # global non-constant configuration
+make_dir 00755 /etc-secret # global non-constant configuration
 make_dir 00755 /var
 make_dir 00755 /nix
 make_dir 00755 /nix/store
@@ -33,30 +40,36 @@ make_dir 00755 /mnt/host
 make_dir 00755 /home
 make_dir 00755 /home/root
 
+touch_file /etc/passwd
+touch_file /etc/shadow
+touch_file /etc/group
+
 rm -f $root/etc/mtab
 ln -s /proc/mounts $root/etc/mtab
 
 export NIX_ROOT=$root
+NIX_CMD_PATH=/usr/home/nix/.nix-profile/bin
 
 echo initialising Nix DB...
-/nix/bin/nix-store --init
+#/nix/bin/nix-store --init
+$NIX_CMD_PATH/nix-store --init
 
 echo verifying Nix DB...
-/nix/bin/nix-store --verify
+$NIX_CMD_PATH/nix-store --verify
 
 echo registering valid paths...
 (while read storepath; do
     echo PATH $storepath
-    if ! /nix/bin/nix-store --isvalid $storepath 2> /dev/null; then
-        (unset NIX_ROOT; /nix/bin/nix-store --dump $storepath) | /nix/bin/nix-store --restore $storepath
-        /nix/bin/nix-store --validpath $storepath
+    if ! $NIX_CMD_PATH/nix-store --isvalid $storepath 2> /dev/null; then
+        (unset NIX_ROOT; $NIX_CMD_PATH/nix-store --dump $storepath) | $NIX_CMD_PATH/nix-store --restore $storepath
+        $NIX_CMD_PATH/nix-store --validpath $storepath
     fi
 done) < /tmp/storepaths
 
 echo registering successors...
 (while read line; do
     echo SUCC $line
-    /nix/bin/nix-store --successor $line
+    $NIX_CMD_PATH/nix-store --successor $line
 done) < /tmp/successors
 
 echo setting init symlink...
-- 
GitLab


From 85bbb5e447cc42e01f558bb9fe39c54471e11e23 Mon Sep 17 00:00:00 2001
From: Armijn Hemel <armijn@gpl-violations.org>
Date: Fri, 6 Aug 2004 13:52:39 +0000
Subject: [PATCH 0011/5331] 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  | 12 ++++++++++++
 boot/default.nix |  6 ++++--
 boot/env.sh      |  2 +-
 make-disk.sh     | 15 +++++++++------
 pkgs.nix         |  6 +++---
 run.sh           |  2 +-
 6 files changed, 30 insertions(+), 13 deletions(-)

diff --git a/boot/builder.sh b/boot/builder.sh
index 8748d8875e5..63dbe39c081 100755
--- a/boot/builder.sh
+++ b/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
diff --git a/boot/default.nix b/boot/default.nix
index 6ecd30758b8..84507a004ac 100644
--- a/boot/default.nix
+++ b/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;
 }
diff --git a/boot/env.sh b/boot/env.sh
index 75504da38b7..627305570f6 100644
--- a/boot/env.sh
+++ b/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
diff --git a/make-disk.sh b/make-disk.sh
index 00e3cb28de1..3e55795a480 100755
--- a/make-disk.sh
+++ b/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-store -qn --requisites $storeExpr > $storePaths
+
+NIX_CMD_PATH=/nix/bin
+
+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
diff --git a/pkgs.nix b/pkgs.nix
index 3b6fcb7646e..1ffa835f584 100644
--- a/pkgs.nix
+++ b/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];
 }
diff --git a/run.sh b/run.sh
index 9a51834e0d2..50728feca25 100755
--- a/run.sh
+++ b/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"
-- 
GitLab


From 9a9cc067442a6ae02e30816113548cb2f7ad4ffd Mon Sep 17 00:00:00 2001
From: Armijn Hemel <armijn@gpl-violations.org>
Date: Fri, 6 Aug 2004 14:07:57 +0000
Subject: [PATCH 0012/5331] workaround for nix-pull

svn path=/nixu/trunk/; revision=1244
---
 INSTALL | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/INSTALL b/INSTALL
index a7408dc89c9..c7920b55e5e 100644
--- a/INSTALL
+++ b/INSTALL
@@ -80,11 +80,11 @@ added need to be added to $PATH the file "env.sh" has to be edited and the
 UML has to be recreated.
 
 Another option would be to enable networking in the UML and use nix-pull to
-get all the right packages, however this does not work yet.
+get all the right packages, however this does not work yet out of the box.
+A small trick is to symlink /bin/sh to the current version of "sh":
 
+# mkdir /bin
+# cd /bin
+# ln -s `which ssh` sh
 
-  Differences with a normal UML
-
-A lot of packages are still missing from the current UML. User management
-is completely lacking, init scripts and system configuration (/etc) are
-not there yet.
+We're looking for a more permanent solution to fix this.
-- 
GitLab


From d40375a0bfc10ee2b26bb90742bf36cbb4fe00a8 Mon Sep 17 00:00:00 2001
From: Armijn Hemel <armijn@gpl-violations.org>
Date: Fri, 6 Aug 2004 16:38:43 +0000
Subject: [PATCH 0013/5331] fix typo

svn path=/nixu/trunk/; revision=1245
---
 INSTALL | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/INSTALL b/INSTALL
index c7920b55e5e..79098f8b07c 100644
--- a/INSTALL
+++ b/INSTALL
@@ -83,8 +83,7 @@ Another option would be to enable networking in the UML and use nix-pull to
 get all the right packages, however this does not work yet out of the box.
 A small trick is to symlink /bin/sh to the current version of "sh":
 
-# mkdir /bin
 # cd /bin
-# ln -s `which ssh` sh
+# ln -s `which sh` sh
 
 We're looking for a more permanent solution to fix this.
-- 
GitLab


From 511b3fd83f636127bc45f3a7c6c8522b31669d45 Mon Sep 17 00:00:00 2001
From: Armijn Hemel <armijn@gpl-violations.org>
Date: Fri, 6 Aug 2004 17:22:24 +0000
Subject: [PATCH 0014/5331] add more packages that are necessary for a complete
 build

svn path=/nixu/trunk/; revision=1246
---
 boot/builder.sh  | 5 +++++
 boot/default.nix | 6 ++++--
 boot/env.sh      | 2 +-
 fill-disk.sh     | 5 +++--
 make-disk.sh     | 2 +-
 pkgs.nix         | 7 +++++--
 6 files changed, 19 insertions(+), 8 deletions(-)

diff --git a/boot/builder.sh b/boot/builder.sh
index 63dbe39c081..d09eaa11d58 100755
--- a/boot/builder.sh
+++ b/boot/builder.sh
@@ -28,6 +28,11 @@ for i in $boot $halt $login $env; do
         -e "s^@shadowutils\@^$shadowutils^g" \
         -e "s^@iputils\@^$iputils^g" \
         -e "s^@gnumake\@^$gnumake^g" \
+        -e "s^@curl\@^$curl^g" \
+        -e "s^@gnused\@^$gnused^g" \
+        -e "s^@gnutar\@^$gnutar^g" \
+        -e "s^@gnugrep\@^$gnugrep^g" \
+        -e "s^@gzip\@^$gzip^g" \
         -e "s^@out\@^$out^g" \
         < $i > $dst
     chmod +x $dst
diff --git a/boot/default.nix b/boot/default.nix
index 84507a004ac..062fe2a4714 100644
--- a/boot/default.nix
+++ b/boot/default.nix
@@ -1,6 +1,7 @@
 { stdenv, bash, coreutils, findutils, utillinux, sysvinit, e2fsprogs
 , nettools, nix, subversion, gcc, wget, which, vim, less, screen, openssh
-, binutils, strace, shadowutils, iputils, gnumake}:
+, binutils, strace, shadowutils, iputils, gnumake, curl, gnused, gnugrep
+, gnutar, gzip}:
 
 derivation {
   name = "boot";
@@ -12,5 +13,6 @@ derivation {
   env = ./env.sh;
   inherit stdenv bash coreutils findutils utillinux sysvinit
           e2fsprogs nettools nix subversion gcc wget which vim less screen
-          openssh binutils strace shadowutils iputils gnumake;
+          openssh binutils strace shadowutils iputils gnumake curl gnused
+          gnutar gnugrep gzip;
 }
diff --git a/boot/env.sh b/boot/env.sh
index 627305570f6..33a6d1eb3ce 100644
--- a/boot/env.sh
+++ b/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:@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
+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:@curl@/bin:@gnused@/bin:@gnutar@/bin:@gnugrep@/bin:@gzip@/bin
diff --git a/fill-disk.sh b/fill-disk.sh
index 89a5f992ade..0873badcff8 100755
--- a/fill-disk.sh
+++ b/fill-disk.sh
@@ -14,7 +14,7 @@ make_dir() {
 
 touch_file() {
     name=$1
-    echo creating $name...
+    echo touching $name...
     if ! test -d $root/$name; then touch $root/$name; fi
 }
 root=/tmp/mnt
@@ -22,11 +22,12 @@ root=/tmp/mnt
 echo mounting...
 mount -t ext2 /dev/discs/disc0/disc $root
 
+make_dir 00755 /bin
 make_dir 00755 /dev
 make_dir 00755 /proc
 make_dir 01777 /tmp
 make_dir 00755 /etc # global non-constant configuration
-make_dir 00755 /etc-secret # global non-constant configuration
+make_dir 00755 /etc-secret
 make_dir 00755 /var
 make_dir 00755 /nix
 make_dir 00755 /nix/store
diff --git a/make-disk.sh b/make-disk.sh
index 3e55795a480..87e761110cd 100755
--- a/make-disk.sh
+++ b/make-disk.sh
@@ -1,7 +1,7 @@
 #! /bin/sh -e
 
 image=/tmp/disk.img
-size=$(expr 256 \* 1024 \* 1024)
+size=$(expr 2048 \* 1024 \* 1024)
 storePaths=/tmp/storepaths
 successors=/tmp/successors
 
diff --git a/pkgs.nix b/pkgs.nix
index 1ffa835f584..cb80054bca3 100644
--- a/pkgs.nix
+++ b/pkgs.nix
@@ -1,10 +1,13 @@
 rec {
   inherit (import /usr/home/nix/nixpkgs-0.6pre1121/pkgs/system/i686-linux.nix)
     stdenv bash coreutils findutils utillinux sysvinit e2fsprogs
-    nettools nix subversion gcc wget which vim less screen openssh binutils strace shadowutils iputils gnumake;
+    nettools nix subversion gcc wget which vim less screen openssh binutils
+    strace shadowutils iputils gnumake curl gnused gnutar gnugrep gzip;
 
   boot = (import ./boot) {inherit stdenv bash coreutils findutils
-    utillinux sysvinit e2fsprogs nettools nix subversion gcc wget which vim less screen openssh binutils strace shadowutils iputils gnumake;};
+    utillinux sysvinit e2fsprogs nettools nix subversion gcc wget which vim
+    less screen openssh binutils strace shadowutils iputils gnumake curl
+    gnused gnutar gnugrep gzip;};
 
   everything = [boot sysvinit];
 }
-- 
GitLab


From f763a7c40ade67009759562e79fbb0c9050b4431 Mon Sep 17 00:00:00 2001
From: Armijn Hemel <armijn@gpl-violations.org>
Date: Tue, 9 Nov 2004 10:28:21 +0000
Subject: [PATCH 0015/5331] change to new packages, with new nix, new bash, new
 everything! It's shiny and new!

svn path=/nixu/trunk/; revision=1730
---
 fill-disk.sh | 8 +++++---
 make-disk.sh | 4 ++--
 pkgs.nix     | 2 +-
 run.sh       | 2 +-
 4 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/fill-disk.sh b/fill-disk.sh
index 0873badcff8..969dfea25bf 100755
--- a/fill-disk.sh
+++ b/fill-disk.sh
@@ -49,7 +49,9 @@ rm -f $root/etc/mtab
 ln -s /proc/mounts $root/etc/mtab
 
 export NIX_ROOT=$root
-NIX_CMD_PATH=/usr/home/nix/.nix-profile/bin
+#NIX_CMD_PATH=/usr/home/nix/.nix-profile/bin
+#NIX_CMD_PATH=/home/armijn/.nix-profile/bin
+NIX_CMD_PATH=/nix/bin
 
 echo initialising Nix DB...
 #/nix/bin/nix-store --init
@@ -65,13 +67,13 @@ echo registering valid paths...
         (unset NIX_ROOT; $NIX_CMD_PATH/nix-store --dump $storepath) | $NIX_CMD_PATH/nix-store --restore $storepath
         $NIX_CMD_PATH/nix-store --validpath $storepath
     fi
-done) < /tmp/storepaths
+done) < /tmp/mystorepaths
 
 echo registering successors...
 (while read line; do
     echo SUCC $line
     $NIX_CMD_PATH/nix-store --successor $line
-done) < /tmp/successors
+done) < /tmp/mysuccessors
 
 echo setting init symlink...
 rm -f $root/init
diff --git a/make-disk.sh b/make-disk.sh
index 87e761110cd..9ea97636bbd 100755
--- a/make-disk.sh
+++ b/make-disk.sh
@@ -2,8 +2,8 @@
 
 image=/tmp/disk.img
 size=$(expr 2048 \* 1024 \* 1024)
-storePaths=/tmp/storepaths
-successors=/tmp/successors
+storePaths=/tmp/mystorepaths
+successors=/tmp/mysuccessors
 
 if ! test -f $image; then 
 
diff --git a/pkgs.nix b/pkgs.nix
index cb80054bca3..5660e111f37 100644
--- a/pkgs.nix
+++ b/pkgs.nix
@@ -1,5 +1,5 @@
 rec {
-  inherit (import /usr/home/nix/nixpkgs-0.6pre1121/pkgs/system/i686-linux.nix)
+  inherit (import /home/armijn/pkgs/system/i686-linux.nix)
     stdenv bash coreutils findutils utillinux sysvinit e2fsprogs
     nettools nix subversion gcc wget which vim less screen openssh binutils
     strace shadowutils iputils gnumake curl gnused gnutar gnugrep gzip;
diff --git a/run.sh b/run.sh
index 50728feca25..e6ec1e005e2 100755
--- a/run.sh
+++ b/run.sh
@@ -3,5 +3,5 @@
 image=/tmp/disk.img
 
 linux ubd0="$image" mem=256M \
-  eth0=tuntap,tap1,,192.168.150.3 \
+  eth0=tuntap,tap1 \
   init="/init"
-- 
GitLab


From c29ea5dd01c2a66c252423b26d4774b40a935fad Mon Sep 17 00:00:00 2001
From: Armijn Hemel <armijn@gpl-violations.org>
Date: Tue, 7 Dec 2004 17:38:55 +0000
Subject: [PATCH 0016/5331] add gcc to the default PATH in nixu

svn path=/nixu/trunk/; revision=1840
---
 boot/builder.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/boot/builder.sh b/boot/builder.sh
index d09eaa11d58..6adf93e99ee 100755
--- a/boot/builder.sh
+++ b/boot/builder.sh
@@ -33,6 +33,7 @@ for i in $boot $halt $login $env; do
         -e "s^@gnutar\@^$gnutar^g" \
         -e "s^@gnugrep\@^$gnugrep^g" \
         -e "s^@gzip\@^$gzip^g" \
+        -e "s^@gcc\@^$gcc^g" \
         -e "s^@out\@^$out^g" \
         < $i > $dst
     chmod +x $dst
-- 
GitLab


From 1e607c92215a1a66fb5b665314dd4d3a6d8a06fb Mon Sep 17 00:00:00 2001
From: Armijn Hemel <armijn@gpl-violations.org>
Date: Tue, 5 Jul 2005 13:52:49 +0000
Subject: [PATCH 0017/5331] rewrite nixu scripts to use nix-push. Install the
 whole NixU environment in two main steps:

1 - first build everything (nix-push)
2 - install everything on a seperate disk/machine (nix-pull)

svn path=/nixu/trunk/; revision=3291
---
 boot/builder.sh  |  1 +
 boot/default.nix |  8 ++++----
 boot/env.sh      |  2 +-
 make-disk.sh     | 40 +++++++---------------------------------
 pkgs.nix         | 10 +++++-----
 5 files changed, 18 insertions(+), 43 deletions(-)

diff --git a/boot/builder.sh b/boot/builder.sh
index 6adf93e99ee..e86d2d41668 100755
--- a/boot/builder.sh
+++ b/boot/builder.sh
@@ -34,6 +34,7 @@ for i in $boot $halt $login $env; do
         -e "s^@gnugrep\@^$gnugrep^g" \
         -e "s^@gzip\@^$gzip^g" \
         -e "s^@gcc\@^$gcc^g" \
+        -e "s^@mingetty\@^$mingetty^g" \
         -e "s^@out\@^$out^g" \
         < $i > $dst
     chmod +x $dst
diff --git a/boot/default.nix b/boot/default.nix
index 062fe2a4714..76125381301 100644
--- a/boot/default.nix
+++ b/boot/default.nix
@@ -1,7 +1,7 @@
-{ stdenv, bash, coreutils, findutils, utillinux, sysvinit, e2fsprogs
+{ stdenv, kernel, bash, coreutils, findutils, utillinux, sysvinit, e2fsprogs
 , nettools, nix, subversion, gcc, wget, which, vim, less, screen, openssh
 , binutils, strace, shadowutils, iputils, gnumake, curl, gnused, gnugrep
-, gnutar, gzip}:
+, gnutar, gzip, mingetty}:
 
 derivation {
   name = "boot";
@@ -11,8 +11,8 @@ derivation {
   halt = ./halt.sh;
   login = ./login.sh;
   env = ./env.sh;
-  inherit stdenv bash coreutils findutils utillinux sysvinit
+  inherit stdenv kernel bash coreutils findutils utillinux sysvinit
           e2fsprogs nettools nix subversion gcc wget which vim less screen
           openssh binutils strace shadowutils iputils gnumake curl gnused
-          gnutar gnugrep gzip;
+          gnutar gnugrep gzip mingetty;
 }
diff --git a/boot/env.sh b/boot/env.sh
index 33a6d1eb3ce..322a2cd2216 100644
--- a/boot/env.sh
+++ b/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:@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:@curl@/bin:@gnused@/bin:@gnutar@/bin:@gnugrep@/bin:@gzip@/bin
+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:@curl@/bin:@gnused@/bin:@gnutar@/bin:@gnugrep@/bin:@gzip@/bin:@mingetty@/sbin
diff --git a/make-disk.sh b/make-disk.sh
index 9ea97636bbd..fc8b075d152 100755
--- a/make-disk.sh
+++ b/make-disk.sh
@@ -1,42 +1,16 @@
 #! /bin/sh -e
 
-image=/tmp/disk.img
-size=$(expr 2048 \* 1024 \* 1024)
-storePaths=/tmp/mystorepaths
-successors=/tmp/mysuccessors
-
-if ! test -f $image; then 
-
-    echo creating empty disk of $size bytes in $image...
-    # Note: this is a sparse file.
-    dd if=/dev/zero of=$image bs=1 seek=$(expr $size - 1) count=1
-
-    echo creating disk image in $image...
-    /sbin/mke2fs -F $image
-
-fi
-
-# What to copy?
+archivesDir=/tmp/arch
+manifest=${archivesDir}/MANIFEST
 
 NIX_CMD_PATH=/nix/bin
 
-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_CMD_PATH/nix-store -q --predecessors $storepath | (while read predecessor; do
-    echo $predecessor $storepath
-  done) 
-done) < $storePaths > $successors
+storeExpr=$(echo '(import ./pkgs.nix).everything' | $NIX_CMD_PATH/nix-instantiate -v -v -)
+$NIX_CMD_PATH/nix-push --copy $archivesDir $manifest $(nix-store -r $storeExpr)
+$NIX_CMD_PATH/nix-push --copy $archivesDir $manifest $(nix-store -r $(echo '(import ./pkgs.nix).kernel' | $NIX_CMD_PATH/nix-instantiate -))
 
 # Location of sysvinit?
-sysvinitPath=$($NIX_CMD_PATH/nix-store -qn $(echo '(import ./pkgs.nix).sysvinit' | $NIX_CMD_PATH/nix-instantiate -))
+#sysvinitPath=$($NIX_CMD_PATH/nix-store -q $(echo '(import ./pkgs.nix).sysvinit' | $NIX_CMD_PATH/nix-instantiate -))
 
 # Location of Nix boot scripts?
-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
-linux ubd0=$image root=/dev/root rootflags=/ rootfstype=hostfs \
-  init="$(pwd)/fill-disk.sh $sysvinitPath $bootPath"
+#bootPath=$($NIX_CMD_PATH/nix-store -q $(echo '(import ./pkgs.nix).boot' | $NIX_CMD_PATH/nix-instantiate -))
diff --git a/pkgs.nix b/pkgs.nix
index 5660e111f37..9a3aa3c2c88 100644
--- a/pkgs.nix
+++ b/pkgs.nix
@@ -1,13 +1,13 @@
 rec {
-  inherit (import /home/armijn/pkgs/system/i686-linux.nix)
-    stdenv bash coreutils findutils utillinux sysvinit e2fsprogs
+  inherit (import /nixpkgs/trunk/pkgs/system/i686-linux.nix)
+    stdenv kernel bash coreutils findutils utillinux sysvinit e2fsprogs
     nettools nix subversion gcc wget which vim less screen openssh binutils
-    strace shadowutils iputils gnumake curl gnused gnutar gnugrep gzip;
+    strace shadowutils iputils gnumake curl gnused gnutar gnugrep gzip mingetty;
 
-  boot = (import ./boot) {inherit stdenv bash coreutils findutils
+  boot = (import ./boot) {inherit stdenv kernel bash coreutils findutils
     utillinux sysvinit e2fsprogs nettools nix subversion gcc wget which vim
     less screen openssh binutils strace shadowutils iputils gnumake curl
-    gnused gnutar gnugrep gzip;};
+    gnused gnutar gnugrep gzip mingetty;};
 
   everything = [boot sysvinit];
 }
-- 
GitLab


From b31d4e8079802b9ec07ff97955b483ec215f3afe Mon Sep 17 00:00:00 2001
From: Armijn Hemel <armijn@gpl-violations.org>
Date: Tue, 5 Jul 2005 14:39:12 +0000
Subject: [PATCH 0018/5331] copy nixpkgs, so it reflects what was built. This
 code uses a simple "cp -a" so there is a race condition (nixpkgs being
 altered after the build). However, with a bit of care and "policy" this
 should work ;-)

Also push all packages we want to push at once.

svn path=/nixu/trunk/; revision=3292
---
 make-disk.sh | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/make-disk.sh b/make-disk.sh
index fc8b075d152..44564a58362 100755
--- a/make-disk.sh
+++ b/make-disk.sh
@@ -2,15 +2,18 @@
 
 archivesDir=/tmp/arch
 manifest=${archivesDir}/MANIFEST
+nixpkgs=/nixpkgs/trunk/pkgs
 
 NIX_CMD_PATH=/nix/bin
 
 storeExpr=$(echo '(import ./pkgs.nix).everything' | $NIX_CMD_PATH/nix-instantiate -v -v -)
-$NIX_CMD_PATH/nix-push --copy $archivesDir $manifest $(nix-store -r $storeExpr)
-$NIX_CMD_PATH/nix-push --copy $archivesDir $manifest $(nix-store -r $(echo '(import ./pkgs.nix).kernel' | $NIX_CMD_PATH/nix-instantiate -))
+$NIX_CMD_PATH/nix-push --copy $archivesDir $manifest $(nix-store -r $storeExpr) $(nix-store -r $(echo '(import ./pkgs.nix).kernel' | $NIX_CMD_PATH/nix-instantiate -))
+#$NIX_CMD_PATH/nix-push --copy $archivesDir $manifest $(nix-store -r $(echo '(import ./pkgs.nix).kernel' | $NIX_CMD_PATH/nix-instantiate -))
 
 # Location of sysvinit?
 #sysvinitPath=$($NIX_CMD_PATH/nix-store -q $(echo '(import ./pkgs.nix).sysvinit' | $NIX_CMD_PATH/nix-instantiate -))
 
 # Location of Nix boot scripts?
 #bootPath=$($NIX_CMD_PATH/nix-store -q $(echo '(import ./pkgs.nix).boot' | $NIX_CMD_PATH/nix-instantiate -))
+
+cp -a ${nixpkgs} ${archivesDir}
-- 
GitLab


From 1054efb792d6574e902dcabdf34391b4681485a9 Mon Sep 17 00:00:00 2001
From: Armijn Hemel <armijn@gpl-violations.org>
Date: Wed, 6 Jul 2005 14:42:41 +0000
Subject: [PATCH 0019/5331] apart from nixpkgs also copy the NixU scripts

svn path=/nixu/trunk/; revision=3298
---
 make-disk.sh | 8 ++++++--
 pkgs.nix     | 2 +-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/make-disk.sh b/make-disk.sh
index 44564a58362..00fb5d205ba 100755
--- a/make-disk.sh
+++ b/make-disk.sh
@@ -2,7 +2,9 @@
 
 archivesDir=/tmp/arch
 manifest=${archivesDir}/MANIFEST
-nixpkgs=/nixpkgs/trunk/pkgs
+nixpkgs=/nixpkgs2/trunk/pkgs
+
+rm -rf ${archivesDir}/*
 
 NIX_CMD_PATH=/nix/bin
 
@@ -16,4 +18,6 @@ $NIX_CMD_PATH/nix-push --copy $archivesDir $manifest $(nix-store -r $storeExpr)
 # Location of Nix boot scripts?
 #bootPath=$($NIX_CMD_PATH/nix-store -q $(echo '(import ./pkgs.nix).boot' | $NIX_CMD_PATH/nix-instantiate -))
 
-cp -a ${nixpkgs} ${archivesDir}
+cp -fa ${nixpkgs} ${archivesDir}
+mkdir ${archivesDir}/scripts
+cp -fa * ${archivesDir}/scripts
diff --git a/pkgs.nix b/pkgs.nix
index 9a3aa3c2c88..eb55e1a772c 100644
--- a/pkgs.nix
+++ b/pkgs.nix
@@ -1,5 +1,5 @@
 rec {
-  inherit (import /nixpkgs/trunk/pkgs/system/i686-linux.nix)
+  inherit (import /nixpkgs2/trunk/pkgs/system/i686-linux.nix)
     stdenv kernel bash coreutils findutils utillinux sysvinit e2fsprogs
     nettools nix subversion gcc wget which vim less screen openssh binutils
     strace shadowutils iputils gnumake curl gnused gnutar gnugrep gzip mingetty;
-- 
GitLab


From 9380bf77d880d8e345dd70f63048e237e6755e35 Mon Sep 17 00:00:00 2001
From: Armijn Hemel <armijn@gpl-violations.org>
Date: Wed, 6 Jul 2005 16:00:20 +0000
Subject: [PATCH 0020/5331] rewrite make-disk.sh and have it parameterize
 fill-disk.sh with the location of sysvinit and the boot scripts that will be
 used.

svn path=/nixu/trunk/; revision=3299
---
 fill-disk.sh | 43 ++++++++++++++++---------------------------
 make-disk.sh | 12 +++++++++---
 2 files changed, 25 insertions(+), 30 deletions(-)

diff --git a/fill-disk.sh b/fill-disk.sh
index 969dfea25bf..3839119efbf 100755
--- a/fill-disk.sh
+++ b/fill-disk.sh
@@ -1,7 +1,7 @@
 #! /bin/sh -e
 
-sysvinitPath=$1
-bootPath=$2
+sysvinitPath=@sysvinitPath@
+bootPath=@bootPath@
 
 make_dir() {
     mode=$1
@@ -49,8 +49,6 @@ rm -f $root/etc/mtab
 ln -s /proc/mounts $root/etc/mtab
 
 export NIX_ROOT=$root
-#NIX_CMD_PATH=/usr/home/nix/.nix-profile/bin
-#NIX_CMD_PATH=/home/armijn/.nix-profile/bin
 NIX_CMD_PATH=/nix/bin
 
 echo initialising Nix DB...
@@ -60,20 +58,20 @@ $NIX_CMD_PATH/nix-store --init
 echo verifying Nix DB...
 $NIX_CMD_PATH/nix-store --verify
 
-echo registering valid paths...
-(while read storepath; do
-    echo PATH $storepath
-    if ! $NIX_CMD_PATH/nix-store --isvalid $storepath 2> /dev/null; then
-        (unset NIX_ROOT; $NIX_CMD_PATH/nix-store --dump $storepath) | $NIX_CMD_PATH/nix-store --restore $storepath
-        $NIX_CMD_PATH/nix-store --validpath $storepath
-    fi
-done) < /tmp/mystorepaths
-
-echo registering successors...
-(while read line; do
-    echo SUCC $line
-    $NIX_CMD_PATH/nix-store --successor $line
-done) < /tmp/mysuccessors
+#echo registering valid paths...
+#(while read storepath; do
+#    echo PATH $storepath
+#    if ! $NIX_CMD_PATH/nix-store --isvalid $storepath 2> /dev/null; then
+#        (unset NIX_ROOT; $NIX_CMD_PATH/nix-store --dump $storepath) | $NIX_CMD_PATH/nix-store --restore $storepath
+#        $NIX_CMD_PATH/nix-store --validpath $storepath
+#    fi
+#done) < /tmp/mystorepaths
+
+#echo registering successors...
+#(while read line; do
+#    echo SUCC $line
+#    $NIX_CMD_PATH/nix-store --successor $line
+#done) < /tmp/mysuccessors
 
 echo setting init symlink...
 rm -f $root/init
@@ -95,12 +93,3 @@ cp /etc/resolv.conf $root/etc
 rm -f $root/etc/hosts
 echo "127.0.0.1 localhost" >> $root/etc/hosts
 echo "192.168.150.1 uml" >> $root/etc/hosts
-
-echo unmounting...
-umount $root
-
-echo syncing...
-sync
-
-echo halting...
-/sbin/halt -d -f
diff --git a/make-disk.sh b/make-disk.sh
index 00fb5d205ba..09017bcaa7c 100755
--- a/make-disk.sh
+++ b/make-disk.sh
@@ -3,6 +3,7 @@
 archivesDir=/tmp/arch
 manifest=${archivesDir}/MANIFEST
 nixpkgs=/nixpkgs2/trunk/pkgs
+fill_disk=$archivesDir/scripts/fill-disk.sh
 
 rm -rf ${archivesDir}/*
 
@@ -10,14 +11,19 @@ NIX_CMD_PATH=/nix/bin
 
 storeExpr=$(echo '(import ./pkgs.nix).everything' | $NIX_CMD_PATH/nix-instantiate -v -v -)
 $NIX_CMD_PATH/nix-push --copy $archivesDir $manifest $(nix-store -r $storeExpr) $(nix-store -r $(echo '(import ./pkgs.nix).kernel' | $NIX_CMD_PATH/nix-instantiate -))
-#$NIX_CMD_PATH/nix-push --copy $archivesDir $manifest $(nix-store -r $(echo '(import ./pkgs.nix).kernel' | $NIX_CMD_PATH/nix-instantiate -))
 
 # Location of sysvinit?
-#sysvinitPath=$($NIX_CMD_PATH/nix-store -q $(echo '(import ./pkgs.nix).sysvinit' | $NIX_CMD_PATH/nix-instantiate -))
+sysvinitPath=$($NIX_CMD_PATH/nix-store -q $(echo '(import ./pkgs.nix).sysvinit' | $NIX_CMD_PATH/nix-instantiate -))
 
 # Location of Nix boot scripts?
-#bootPath=$($NIX_CMD_PATH/nix-store -q $(echo '(import ./pkgs.nix).boot' | $NIX_CMD_PATH/nix-instantiate -))
+bootPath=$($NIX_CMD_PATH/nix-store -q $(echo '(import ./pkgs.nix).boot' | $NIX_CMD_PATH/nix-instantiate -))
+
+echo "bootPath: ${bootPath}"
 
 cp -fa ${nixpkgs} ${archivesDir}
 mkdir ${archivesDir}/scripts
 cp -fa * ${archivesDir}/scripts
+sed -e "s^@sysvinitPath\@^$sysvinitPath^g" \
+    -e "s^@bootPath\@^$bootPath^g" \
+    < $fill_disk > $fill_disk.tmp
+mv $fill_disk.tmp $fill_disk
-- 
GitLab


From 59456f93669ef50767bd258a3b32fada892252e6 Mon Sep 17 00:00:00 2001
From: Armijn Hemel <armijn@gpl-violations.org>
Date: Fri, 8 Jul 2005 10:06:41 +0000
Subject: [PATCH 0021/5331] run the Nix scripts for installing everything from
 the Nix built Nix.

svn path=/nixu/trunk/; revision=3303
---
 fill-disk.sh | 5 +----
 make-disk.sh | 5 ++++-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/fill-disk.sh b/fill-disk.sh
index 3839119efbf..180676dd055 100755
--- a/fill-disk.sh
+++ b/fill-disk.sh
@@ -19,9 +19,6 @@ touch_file() {
 }
 root=/tmp/mnt
 
-echo mounting...
-mount -t ext2 /dev/discs/disc0/disc $root
-
 make_dir 00755 /bin
 make_dir 00755 /dev
 make_dir 00755 /proc
@@ -49,7 +46,7 @@ rm -f $root/etc/mtab
 ln -s /proc/mounts $root/etc/mtab
 
 export NIX_ROOT=$root
-NIX_CMD_PATH=/nix/bin
+NIX_CMD_PATH=@NIX_CMD_PATH@/bin
 
 echo initialising Nix DB...
 #/nix/bin/nix-store --init
diff --git a/make-disk.sh b/make-disk.sh
index 09017bcaa7c..6c3843bb56e 100755
--- a/make-disk.sh
+++ b/make-disk.sh
@@ -18,12 +18,15 @@ sysvinitPath=$($NIX_CMD_PATH/nix-store -q $(echo '(import ./pkgs.nix).sysvinit'
 # Location of Nix boot scripts?
 bootPath=$($NIX_CMD_PATH/nix-store -q $(echo '(import ./pkgs.nix).boot' | $NIX_CMD_PATH/nix-instantiate -))
 
-echo "bootPath: ${bootPath}"
+#echo "bootPath: ${bootPath}"
+
+nix=$($NIX_CMD_PATH/nix-store -q $(echo '(import ./pkgs.nix).nix' | $NIX_CMD_PATH/nix-instantiate -))
 
 cp -fa ${nixpkgs} ${archivesDir}
 mkdir ${archivesDir}/scripts
 cp -fa * ${archivesDir}/scripts
 sed -e "s^@sysvinitPath\@^$sysvinitPath^g" \
     -e "s^@bootPath\@^$bootPath^g" \
+    -e "s^@NIX_CMD_PATH\@^$nix^g" \
     < $fill_disk > $fill_disk.tmp
 mv $fill_disk.tmp $fill_disk
-- 
GitLab


From 5432cd148be8b69a3643404553d50c3a713b81d8 Mon Sep 17 00:00:00 2001
From: Armijn Hemel <armijn@gpl-violations.org>
Date: Mon, 11 Jul 2005 17:59:19 +0000
Subject: [PATCH 0022/5331] copy the right packages into the diskimage, copy
 nixpkgs

svn path=/nixu/trunk/; revision=3313
---
 fill-disk.sh |  7 +++++++
 make-disk.sh | 10 ++++++++--
 2 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/fill-disk.sh b/fill-disk.sh
index 180676dd055..3bd450e3cb5 100755
--- a/fill-disk.sh
+++ b/fill-disk.sh
@@ -33,6 +33,7 @@ make_dir 00755 /nix/var/nix
 make_dir 00755 /nix/var/nix/db
 make_dir 00755 /nix/var/log
 make_dir 00755 /nix/var/log/nix
+make_dir 00755 /nixpkgs
 make_dir 00755 /mnt
 make_dir 00755 /mnt/host
 make_dir 00755 /home
@@ -55,6 +56,12 @@ $NIX_CMD_PATH/nix-store --init
 echo verifying Nix DB...
 $NIX_CMD_PATH/nix-store --verify
 
+echo copying nixpkgs...
+cp -fa ../pkgs $root/nixpkgs
+
+echo adding packages...
+$NIX_CMD_PATH/nix-pull file:///$(manifest)
+
 #echo registering valid paths...
 #(while read storepath; do
 #    echo PATH $storepath
diff --git a/make-disk.sh b/make-disk.sh
index 6c3843bb56e..7a0b04f23f3 100755
--- a/make-disk.sh
+++ b/make-disk.sh
@@ -5,6 +5,7 @@ manifest=${archivesDir}/MANIFEST
 nixpkgs=/nixpkgs2/trunk/pkgs
 fill_disk=$archivesDir/scripts/fill-disk.sh
 
+chmod -R +w ${archivesDir}/*
 rm -rf ${archivesDir}/*
 
 NIX_CMD_PATH=/nix/bin
@@ -18,11 +19,16 @@ sysvinitPath=$($NIX_CMD_PATH/nix-store -q $(echo '(import ./pkgs.nix).sysvinit'
 # Location of Nix boot scripts?
 bootPath=$($NIX_CMD_PATH/nix-store -q $(echo '(import ./pkgs.nix).boot' | $NIX_CMD_PATH/nix-instantiate -))
 
-#echo "bootPath: ${bootPath}"
-
 nix=$($NIX_CMD_PATH/nix-store -q $(echo '(import ./pkgs.nix).nix' | $NIX_CMD_PATH/nix-instantiate -))
 
+#nixDeps=$($NIX_CMD_PATH/nix-store -qR $(echo '(import ./pkgs.nix).nix' | $NIX_CMD_PATH/nix-instantiate -))
+
+nixDeps=$($NIX_CMD_PATH/nix-store -qR $(nix-store -r $(echo '(import ./pkgs.nix).nix' | $NIX_CMD_PATH/nix-instantiate -)))
+
+echo $nixDeps
+
 cp -fa ${nixpkgs} ${archivesDir}
+cp -fa --parents ${nixDeps} ${archivesDir}
 mkdir ${archivesDir}/scripts
 cp -fa * ${archivesDir}/scripts
 sed -e "s^@sysvinitPath\@^$sysvinitPath^g" \
-- 
GitLab


From c05605e316f0293852dde3df6e652caed989a302 Mon Sep 17 00:00:00 2001
From: Armijn Hemel <armijn@gpl-violations.org>
Date: Thu, 14 Jul 2005 16:57:39 +0000
Subject: [PATCH 0023/5331] disable NIX_ROOT, use things like NIX_STATE_DIR
 instead

svn path=/nixu/trunk/; revision=3338
---
 fill-disk.sh | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/fill-disk.sh b/fill-disk.sh
index 3bd450e3cb5..2bb88f33142 100755
--- a/fill-disk.sh
+++ b/fill-disk.sh
@@ -3,6 +3,14 @@
 sysvinitPath=@sysvinitPath@
 bootPath=@bootPath@
 
+if ! test -n "$1"
+then
+    echo "need URL for manifest!"
+    exit
+else
+    manifest=$1
+fi
+
 make_dir() {
     mode=$1
     name=$2
@@ -31,6 +39,7 @@ make_dir 00755 /nix/store
 make_dir 00755 /nix/var
 make_dir 00755 /nix/var/nix
 make_dir 00755 /nix/var/nix/db
+make_dir 00755 /nix/var/nix/manifests
 make_dir 00755 /nix/var/log
 make_dir 00755 /nix/var/log/nix
 make_dir 00755 /nixpkgs
@@ -44,9 +53,10 @@ touch_file /etc/shadow
 touch_file /etc/group
 
 rm -f $root/etc/mtab
-ln -s /proc/mounts $root/etc/mtab
+#ln -s /proc/mounts $root/etc/mtab
 
-export NIX_ROOT=$root
+#export NIX_ROOT=$root
+export NIX_STATE_DIR=$root/nix/var/nix
 NIX_CMD_PATH=@NIX_CMD_PATH@/bin
 
 echo initialising Nix DB...
@@ -60,7 +70,7 @@ echo copying nixpkgs...
 cp -fa ../pkgs $root/nixpkgs
 
 echo adding packages...
-$NIX_CMD_PATH/nix-pull file:///$(manifest)
+$NIX_CMD_PATH/nix-pull $manifest
 
 #echo registering valid paths...
 #(while read storepath; do
-- 
GitLab


From 8122aebd1908bd03ac059f1f89cbc65bac4c3d99 Mon Sep 17 00:00:00 2001
From: Armijn Hemel <armijn@gpl-violations.org>
Date: Mon, 18 Jul 2005 09:47:42 +0000
Subject: [PATCH 0024/5331] add grub

svn path=/nixu/trunk/; revision=3353
---
 boot/builder.sh  | 1 +
 boot/default.nix | 4 ++--
 boot/env.sh      | 2 +-
 make-disk.sh     | 2 +-
 pkgs.nix         | 5 +++--
 5 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/boot/builder.sh b/boot/builder.sh
index e86d2d41668..5ebfadcbcf7 100755
--- a/boot/builder.sh
+++ b/boot/builder.sh
@@ -35,6 +35,7 @@ for i in $boot $halt $login $env; do
         -e "s^@gzip\@^$gzip^g" \
         -e "s^@gcc\@^$gcc^g" \
         -e "s^@mingetty\@^$mingetty^g" \
+        -e "s^@grub\@^$grub^g" \
         -e "s^@out\@^$out^g" \
         < $i > $dst
     chmod +x $dst
diff --git a/boot/default.nix b/boot/default.nix
index 76125381301..5320404b733 100644
--- a/boot/default.nix
+++ b/boot/default.nix
@@ -1,7 +1,7 @@
 { stdenv, kernel, bash, coreutils, findutils, utillinux, sysvinit, e2fsprogs
 , nettools, nix, subversion, gcc, wget, which, vim, less, screen, openssh
 , binutils, strace, shadowutils, iputils, gnumake, curl, gnused, gnugrep
-, gnutar, gzip, mingetty}:
+, gnutar, gzip, mingetty, grub}:
 
 derivation {
   name = "boot";
@@ -14,5 +14,5 @@ derivation {
   inherit stdenv kernel bash coreutils findutils utillinux sysvinit
           e2fsprogs nettools nix subversion gcc wget which vim less screen
           openssh binutils strace shadowutils iputils gnumake curl gnused
-          gnutar gnugrep gzip mingetty;
+          gnutar gnugrep gzip mingetty grub;
 }
diff --git a/boot/env.sh b/boot/env.sh
index 322a2cd2216..6ec13130b66 100644
--- a/boot/env.sh
+++ b/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:@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:@curl@/bin:@gnused@/bin:@gnutar@/bin:@gnugrep@/bin:@gzip@/bin:@mingetty@/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:@curl@/bin:@gnused@/bin:@gnutar@/bin:@gnugrep@/bin:@gzip@/bin:@mingetty@/sbin:@grub@/bin:@grub@/sbin
diff --git a/make-disk.sh b/make-disk.sh
index 7a0b04f23f3..2548f0e7788 100755
--- a/make-disk.sh
+++ b/make-disk.sh
@@ -5,7 +5,7 @@ manifest=${archivesDir}/MANIFEST
 nixpkgs=/nixpkgs2/trunk/pkgs
 fill_disk=$archivesDir/scripts/fill-disk.sh
 
-chmod -R +w ${archivesDir}/*
+chmod -f -R +w ${archivesDir}/*
 rm -rf ${archivesDir}/*
 
 NIX_CMD_PATH=/nix/bin
diff --git a/pkgs.nix b/pkgs.nix
index eb55e1a772c..42fbfef6476 100644
--- a/pkgs.nix
+++ b/pkgs.nix
@@ -2,12 +2,13 @@ rec {
   inherit (import /nixpkgs2/trunk/pkgs/system/i686-linux.nix)
     stdenv kernel bash coreutils findutils utillinux sysvinit e2fsprogs
     nettools nix subversion gcc wget which vim less screen openssh binutils
-    strace shadowutils iputils gnumake curl gnused gnutar gnugrep gzip mingetty;
+    strace shadowutils iputils gnumake curl gnused gnutar gnugrep gzip
+    mingetty grub;
 
   boot = (import ./boot) {inherit stdenv kernel bash coreutils findutils
     utillinux sysvinit e2fsprogs nettools nix subversion gcc wget which vim
     less screen openssh binutils strace shadowutils iputils gnumake curl
-    gnused gnutar gnugrep gzip mingetty;};
+    gnused gnutar gnugrep gzip mingetty grub;};
 
   everything = [boot sysvinit];
 }
-- 
GitLab


From 5c6d52dbd86b8ee9bad8a628aa2b5bc281b2969c Mon Sep 17 00:00:00 2001
From: Armijn Hemel <armijn@gpl-violations.org>
Date: Tue, 19 Jul 2005 15:39:32 +0000
Subject: [PATCH 0025/5331] - add more directories - make /dev/null inside a
 chroot to install

svn path=/nixu/trunk/; revision=3366
---
 fill-disk.sh | 24 +++++++++++++++++++++---
 make-disk.sh |  3 ++-
 pkgs.nix     |  2 +-
 3 files changed, 24 insertions(+), 5 deletions(-)

diff --git a/fill-disk.sh b/fill-disk.sh
index 2bb88f33142..57459727b9b 100755
--- a/fill-disk.sh
+++ b/fill-disk.sh
@@ -43,11 +43,14 @@ make_dir 00755 /nix/var/nix/manifests
 make_dir 00755 /nix/var/log
 make_dir 00755 /nix/var/log/nix
 make_dir 00755 /nixpkgs
+make_dir 00755 /nixpkgs/trunk
 make_dir 00755 /mnt
 make_dir 00755 /mnt/host
 make_dir 00755 /home
 make_dir 00755 /home/root
 
+mknod $root/dev/null c 1 3
+
 touch_file /etc/passwd
 touch_file /etc/shadow
 touch_file /etc/group
@@ -55,8 +58,10 @@ touch_file /etc/group
 rm -f $root/etc/mtab
 #ln -s /proc/mounts $root/etc/mtab
 
-#export NIX_ROOT=$root
+export NIX_DATA_DIR=$root/nix/share
+export NIX_LOG_DIR=$root/nix/log/nix
 export NIX_STATE_DIR=$root/nix/var/nix
+export NIX_CONF_DIR=$root/nix/etc
 NIX_CMD_PATH=@NIX_CMD_PATH@/bin
 
 echo initialising Nix DB...
@@ -67,11 +72,24 @@ echo verifying Nix DB...
 $NIX_CMD_PATH/nix-store --verify
 
 echo copying nixpkgs...
-cp -fa ../pkgs $root/nixpkgs
+cp -fa ../pkgs $root/nixpkgs/trunk
+
+make_dir 0755 /tmp/scripts
+cp -fa ../scripts $/tmp/scripts
 
-echo adding packages...
+echo adding manifest
 $NIX_CMD_PATH/nix-pull $manifest
 
+echo adding packages
+export NIX_ROOT=$root
+unset NIX_DATA_DIR
+unset NIX_LOG_DIR
+unset NIX_STATE_DIR
+unset NIX_CONF_DIR
+
+storeExpr=$(echo '(import ./pkgs.nix).everything' | $NIX_CMD_PATH/nix-instantiate -v -v -)
+$NIX_CMD_PATH/nix-store -r $storeExpr
+
 #echo registering valid paths...
 #(while read storepath; do
 #    echo PATH $storepath
diff --git a/make-disk.sh b/make-disk.sh
index 2548f0e7788..71aa7939495 100755
--- a/make-disk.sh
+++ b/make-disk.sh
@@ -11,7 +11,8 @@ rm -rf ${archivesDir}/*
 NIX_CMD_PATH=/nix/bin
 
 storeExpr=$(echo '(import ./pkgs.nix).everything' | $NIX_CMD_PATH/nix-instantiate -v -v -)
-$NIX_CMD_PATH/nix-push --copy $archivesDir $manifest $(nix-store -r $storeExpr) $(nix-store -r $(echo '(import ./pkgs.nix).kernel' | $NIX_CMD_PATH/nix-instantiate -))
+#$NIX_CMD_PATH/nix-push --copy $archivesDir $manifest $(nix-store -r $storeExpr) $(nix-store -r $(echo '(import ./pkgs.nix).kernel' | $NIX_CMD_PATH/nix-instantiate -))
+$NIX_CMD_PATH/nix-push --copy $archivesDir $manifest $storeExpr $(nix-store -r $(echo '(import ./pkgs.nix).kernel' | $NIX_CMD_PATH/nix-instantiate -))
 
 # Location of sysvinit?
 sysvinitPath=$($NIX_CMD_PATH/nix-store -q $(echo '(import ./pkgs.nix).sysvinit' | $NIX_CMD_PATH/nix-instantiate -))
diff --git a/pkgs.nix b/pkgs.nix
index 42fbfef6476..c74ec7589a5 100644
--- a/pkgs.nix
+++ b/pkgs.nix
@@ -1,5 +1,5 @@
 rec {
-  inherit (import /nixpkgs2/trunk/pkgs/system/i686-linux.nix)
+  inherit (import /nixpkgs/trunk/pkgs/system/i686-linux.nix)
     stdenv kernel bash coreutils findutils utillinux sysvinit e2fsprogs
     nettools nix subversion gcc wget which vim less screen openssh binutils
     strace shadowutils iputils gnumake curl gnused gnutar gnugrep gzip
-- 
GitLab


From 200251da1a131ee18576cedeacfb845fa5e94af6 Mon Sep 17 00:00:00 2001
From: Armijn Hemel <armijn@gpl-violations.org>
Date: Tue, 19 Jul 2005 16:00:34 +0000
Subject: [PATCH 0026/5331] fix tpyos

svn path=/nixu/trunk/; revision=3367
---
 fill-disk.sh | 2 +-
 make-disk.sh | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/fill-disk.sh b/fill-disk.sh
index 57459727b9b..1e3a4e2938c 100755
--- a/fill-disk.sh
+++ b/fill-disk.sh
@@ -75,7 +75,7 @@ echo copying nixpkgs...
 cp -fa ../pkgs $root/nixpkgs/trunk
 
 make_dir 0755 /tmp/scripts
-cp -fa ../scripts $/tmp/scripts
+cp -fa ../scripts $root/tmp/scripts
 
 echo adding manifest
 $NIX_CMD_PATH/nix-pull $manifest
diff --git a/make-disk.sh b/make-disk.sh
index 71aa7939495..1f6d177d2f1 100755
--- a/make-disk.sh
+++ b/make-disk.sh
@@ -11,8 +11,8 @@ rm -rf ${archivesDir}/*
 NIX_CMD_PATH=/nix/bin
 
 storeExpr=$(echo '(import ./pkgs.nix).everything' | $NIX_CMD_PATH/nix-instantiate -v -v -)
-#$NIX_CMD_PATH/nix-push --copy $archivesDir $manifest $(nix-store -r $storeExpr) $(nix-store -r $(echo '(import ./pkgs.nix).kernel' | $NIX_CMD_PATH/nix-instantiate -))
-$NIX_CMD_PATH/nix-push --copy $archivesDir $manifest $storeExpr $(nix-store -r $(echo '(import ./pkgs.nix).kernel' | $NIX_CMD_PATH/nix-instantiate -))
+$NIX_CMD_PATH/nix-push --copy $archivesDir $manifest $(nix-store -r $storeExpr) $(nix-store -r $(echo '(import ./pkgs.nix).kernel' | $NIX_CMD_PATH/nix-instantiate -))
+#$NIX_CMD_PATH/nix-push --copy $archivesDir $manifest $storeExpr $(nix-store -r $(echo '(import ./pkgs.nix).kernel' | $NIX_CMD_PATH/nix-instantiate -))
 
 # Location of sysvinit?
 sysvinitPath=$($NIX_CMD_PATH/nix-store -q $(echo '(import ./pkgs.nix).sysvinit' | $NIX_CMD_PATH/nix-instantiate -))
-- 
GitLab


From 62882b6d0a788e63b6122f37e7659f554f193baf Mon Sep 17 00:00:00 2001
From: Armijn Hemel <armijn@gpl-violations.org>
Date: Tue, 19 Jul 2005 16:02:17 +0000
Subject: [PATCH 0027/5331] use right path

svn path=/nixu/trunk/; revision=3368
---
 fill-disk.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fill-disk.sh b/fill-disk.sh
index 1e3a4e2938c..99bc0ac0486 100755
--- a/fill-disk.sh
+++ b/fill-disk.sh
@@ -75,7 +75,7 @@ echo copying nixpkgs...
 cp -fa ../pkgs $root/nixpkgs/trunk
 
 make_dir 0755 /tmp/scripts
-cp -fa ../scripts $root/tmp/scripts
+cp -fa ../scripts $root/tmp
 
 echo adding manifest
 $NIX_CMD_PATH/nix-pull $manifest
-- 
GitLab


From 001302e0f8de18c1967aff4a38c0600aee4f928d Mon Sep 17 00:00:00 2001
From: Armijn Hemel <armijn@gpl-violations.org>
Date: Tue, 19 Jul 2005 16:55:44 +0000
Subject: [PATCH 0028/5331] touch something to keep chmod happy

svn path=/nixu/trunk/; revision=3370
---
 make-disk.sh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/make-disk.sh b/make-disk.sh
index 1f6d177d2f1..7427fd77c9a 100755
--- a/make-disk.sh
+++ b/make-disk.sh
@@ -2,9 +2,10 @@
 
 archivesDir=/tmp/arch
 manifest=${archivesDir}/MANIFEST
-nixpkgs=/nixpkgs2/trunk/pkgs
+nixpkgs=/nixpkgs/trunk/pkgs
 fill_disk=$archivesDir/scripts/fill-disk.sh
 
+touch ${archivesDir}/blah
 chmod -f -R +w ${archivesDir}/*
 rm -rf ${archivesDir}/*
 
-- 
GitLab


From 7bbee5b669449fb9bfb6091ab1ed0016c4e40eb6 Mon Sep 17 00:00:00 2001
From: Armijn Hemel <armijn@gpl-violations.org>
Date: Fri, 29 Jul 2005 14:47:24 +0000
Subject: [PATCH 0029/5331] some docs

svn path=/nixu/trunk/; revision=3467
---
 storepaths_format | 8 ++++++++
 1 file changed, 8 insertions(+)
 create mode 100644 storepaths_format

diff --git a/storepaths_format b/storepaths_format
new file mode 100644
index 00000000000..8d789e8592b
--- /dev/null
+++ b/storepaths_format
@@ -0,0 +1,8 @@
+/nix/store/abcd-<package>
+2
+/nix/store/1234-<package-1>
+/nix/store/5678-<package-2>
+
+Amount of dependencies determined by:
+
+nix-store -q --references p
-- 
GitLab


From d623c357b56e5bb96593387de68073b5fecd9d36 Mon Sep 17 00:00:00 2001
From: Armijn Hemel <armijn@gpl-violations.org>
Date: Fri, 29 Jul 2005 14:52:54 +0000
Subject: [PATCH 0030/5331] bit more doc (to make braaaaaain failure recovery
 easier)

svn path=/nixu/trunk/; revision=3468
---
 storepaths_format | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/storepaths_format b/storepaths_format
index 8d789e8592b..dbb20caa111 100644
--- a/storepaths_format
+++ b/storepaths_format
@@ -6,3 +6,7 @@
 Amount of dependencies determined by:
 
 nix-store -q --references p
+
+or better (for a large expression)
+
+nix-store -q --requisites p
-- 
GitLab


From 8f7215a7792edec0f8da730d69ae6401f13299ba Mon Sep 17 00:00:00 2001
From: Armijn Hemel <armijn@gpl-violations.org>
Date: Fri, 29 Jul 2005 16:54:36 +0000
Subject: [PATCH 0031/5331] various improvements + stubs for later work,
 definitely not production ready

svn path=/nixu/trunk/; revision=3473
---
 fill-disk.sh | 38 ++++++++++++++++++++++++++++++++------
 make-disk.sh | 33 ++++++++++++++++++++++++++++-----
 2 files changed, 60 insertions(+), 11 deletions(-)

diff --git a/fill-disk.sh b/fill-disk.sh
index 99bc0ac0486..5dfb264884c 100755
--- a/fill-disk.sh
+++ b/fill-disk.sh
@@ -5,10 +5,10 @@ bootPath=@bootPath@
 
 if ! test -n "$1"
 then
-    echo "need URL for manifest!"
+    echo "need harddisk device for installing!"
     exit
 else
-    manifest=$1
+    device=$1
 fi
 
 make_dir() {
@@ -27,6 +27,17 @@ touch_file() {
 }
 root=/tmp/mnt
 
+mkdir -p /tmp/mnt
+
+mount $device /tmp/mnt
+
+mkdir -p /nix
+mkdir -p /nixpkgs/trunk/pkgs
+
+# temporary hack
+mount --bind /mnt/cdrom1/nix /nix
+mount --bind /mnt/cdrom1/pkgs /nixpkgs/trunk/pkgs
+
 make_dir 00755 /bin
 make_dir 00755 /dev
 make_dir 00755 /proc
@@ -77,8 +88,8 @@ cp -fa ../pkgs $root/nixpkgs/trunk
 make_dir 0755 /tmp/scripts
 cp -fa ../scripts $root/tmp
 
-echo adding manifest
-$NIX_CMD_PATH/nix-pull $manifest
+#echo adding manifest
+#$NIX_CMD_PATH/nix-pull $manifest
 
 echo adding packages
 export NIX_ROOT=$root
@@ -87,8 +98,21 @@ unset NIX_LOG_DIR
 unset NIX_STATE_DIR
 unset NIX_CONF_DIR
 
-storeExpr=$(echo '(import ./pkgs.nix).everything' | $NIX_CMD_PATH/nix-instantiate -v -v -)
-$NIX_CMD_PATH/nix-store -r $storeExpr
+#storeExpr=$(echo '(import /tmp/scripts/pkgs.nix).everything' | $NIX_CMD_PATH/nix-instantiate -v -v -)
+#storeExpr=$(echo '(import ./pkgs.nix).everything' | $NIX_CMD_PATH/nix-instantiate -v -v -)
+#$NIX_CMD_PATH/nix-store -r $storeExpr
+#echo $storeExpr
+#storeExpr2=$($NIX_CMD_PATH/nix-store -qR $($NIX_CMD_PATH/nix-store -r $storeExpr))
+#echo storeExpr $storeExpr
+#echo $($NIX_CMD_PATH/nix-store -qR --include-outputs $storeExpr)
+
+echo copying store
+
+(while read storepaths; do
+  cp -fa $storepaths $root/nix/store
+done) < /mnt/cdrom1/mystorepaths
+
+#cp -fa ../nix/store/* $root/nix/store
 
 #echo registering valid paths...
 #(while read storepath; do
@@ -105,6 +129,8 @@ $NIX_CMD_PATH/nix-store -r $storeExpr
 #    $NIX_CMD_PATH/nix-store --successor $line
 #done) < /tmp/mysuccessors
 
+exit
+
 echo setting init symlink...
 rm -f $root/init
 ln -s $sysvinitPath/sbin/init $root/init
diff --git a/make-disk.sh b/make-disk.sh
index 7427fd77c9a..a229616b8ff 100755
--- a/make-disk.sh
+++ b/make-disk.sh
@@ -1,9 +1,13 @@
 #! /bin/sh -e
 
+declare -a deps
+
 archivesDir=/tmp/arch
 manifest=${archivesDir}/MANIFEST
 nixpkgs=/nixpkgs/trunk/pkgs
 fill_disk=$archivesDir/scripts/fill-disk.sh
+storePaths=$archivesDir/mystorepaths
+validatePaths=$archivesDir/validatepaths
 
 touch ${archivesDir}/blah
 chmod -f -R +w ${archivesDir}/*
@@ -12,8 +16,7 @@ rm -rf ${archivesDir}/*
 NIX_CMD_PATH=/nix/bin
 
 storeExpr=$(echo '(import ./pkgs.nix).everything' | $NIX_CMD_PATH/nix-instantiate -v -v -)
-$NIX_CMD_PATH/nix-push --copy $archivesDir $manifest $(nix-store -r $storeExpr) $(nix-store -r $(echo '(import ./pkgs.nix).kernel' | $NIX_CMD_PATH/nix-instantiate -))
-#$NIX_CMD_PATH/nix-push --copy $archivesDir $manifest $storeExpr $(nix-store -r $(echo '(import ./pkgs.nix).kernel' | $NIX_CMD_PATH/nix-instantiate -))
+#$NIX_CMD_PATH/nix-push --copy $archivesDir $manifest $(nix-store -r $storeExpr) $(nix-store -r $(echo '(import ./pkgs.nix).kernel' | $NIX_CMD_PATH/nix-instantiate -))
 
 # Location of sysvinit?
 sysvinitPath=$($NIX_CMD_PATH/nix-store -q $(echo '(import ./pkgs.nix).sysvinit' | $NIX_CMD_PATH/nix-instantiate -))
@@ -25,12 +28,32 @@ nix=$($NIX_CMD_PATH/nix-store -q $(echo '(import ./pkgs.nix).nix' | $NIX_CMD_PAT
 
 #nixDeps=$($NIX_CMD_PATH/nix-store -qR $(echo '(import ./pkgs.nix).nix' | $NIX_CMD_PATH/nix-instantiate -))
 
-nixDeps=$($NIX_CMD_PATH/nix-store -qR $(nix-store -r $(echo '(import ./pkgs.nix).nix' | $NIX_CMD_PATH/nix-instantiate -)))
+#nixDeps=$($NIX_CMD_PATH/nix-store -qR $(nix-store -r $(echo '(import ./pkgs.nix).nix' | $NIX_CMD_PATH/nix-instantiate -)))
+echo $($NIX_CMD_PATH/nix-store -qR $(nix-store -r $(echo '(import ./pkgs.nix).nix' | $NIX_CMD_PATH/nix-instantiate -))) >> $storePaths
+
+#echo $nixDeps > $storePaths
+
+utilLinux=$($NIX_CMD_PATH/nix-store -qR $(nix-store -r $(echo '(import ./pkgs.nix).utillinux' | $NIX_CMD_PATH/nix-instantiate -)))
+
+(while read storepath; do
+   cp -fa --parents ${storepath} ${archivesDir}
+done) < $storePaths
+
+echo utillinux $utilLinux
 
-echo $nixDeps
+for i in $utilLinux; do
+  echo i $i
+  deps=( $($NIX_CMD_PATH/nix-store -q --references $i) )
+  echo length ${#deps[@]}
+  if test "${#deps[@]}" = 0
+  then
+    echo zarro
+  fi
+done
 
 cp -fa ${nixpkgs} ${archivesDir}
-cp -fa --parents ${nixDeps} ${archivesDir}
+#cp -fa --parents ${nixDeps} ${archivesDir}
+cp -fau --parents ${utilLinux} ${archivesDir}
 mkdir ${archivesDir}/scripts
 cp -fa * ${archivesDir}/scripts
 sed -e "s^@sysvinitPath\@^$sysvinitPath^g" \
-- 
GitLab


From cc0935ebe8ba2cf7b4395faad739a17cfdaab91a Mon Sep 17 00:00:00 2001
From: Armijn Hemel <armijn@gpl-violations.org>
Date: Sun, 31 Jul 2005 13:11:44 +0000
Subject: [PATCH 0032/5331] - added some more comments, generate ISO file -
 added stubs for making a bootable CD with isolinux. Still missing are kernel,
 boot configuration and more

svn path=/nixu/trunk/; revision=3480
---
 make-disk.sh | 20 ++++++++++++++++++++
 pkgs.nix     |  2 +-
 2 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/make-disk.sh b/make-disk.sh
index a229616b8ff..9d3f1124117 100755
--- a/make-disk.sh
+++ b/make-disk.sh
@@ -26,6 +26,8 @@ bootPath=$($NIX_CMD_PATH/nix-store -q $(echo '(import ./pkgs.nix).boot' | $NIX_C
 
 nix=$($NIX_CMD_PATH/nix-store -q $(echo '(import ./pkgs.nix).nix' | $NIX_CMD_PATH/nix-instantiate -))
 
+syslinux=$($NIX_CMD_PATH/nix-store -q $(echo '(import ./pkgs.nix).syslinux' | $NIX_CMD_PATH/nix-instantiate -))
+
 #nixDeps=$($NIX_CMD_PATH/nix-store -qR $(echo '(import ./pkgs.nix).nix' | $NIX_CMD_PATH/nix-instantiate -))
 
 #nixDeps=$($NIX_CMD_PATH/nix-store -qR $(nix-store -r $(echo '(import ./pkgs.nix).nix' | $NIX_CMD_PATH/nix-instantiate -)))
@@ -51,9 +53,17 @@ for i in $utilLinux; do
   fi
 done
 
+echo copying nixpkgs
+
 cp -fa ${nixpkgs} ${archivesDir}
+
+echo copying packges from store
+
 #cp -fa --parents ${nixDeps} ${archivesDir}
 cp -fau --parents ${utilLinux} ${archivesDir}
+
+echo copying scripts
+
 mkdir ${archivesDir}/scripts
 cp -fa * ${archivesDir}/scripts
 sed -e "s^@sysvinitPath\@^$sysvinitPath^g" \
@@ -61,3 +71,13 @@ sed -e "s^@sysvinitPath\@^$sysvinitPath^g" \
     -e "s^@NIX_CMD_PATH\@^$nix^g" \
     < $fill_disk > $fill_disk.tmp
 mv $fill_disk.tmp $fill_disk
+
+echo copying bootimage
+
+mkdir ${archivesDir}/isolinux
+cp ${syslinux}/lib/syslinux/isolinux.bin ${archivesDir}/isolinux
+chmod u+w ${archivesDir}/isolinux/*
+mkisofs -rJ -o /tmp/nix-pull.iso -b isolinux/isolinux.bin -c isolinux/boot.cat \
+                -no-emul-boot -boot-load-size 4 -boot-info-table \
+                ${archivesDir}
+
diff --git a/pkgs.nix b/pkgs.nix
index c74ec7589a5..5ec423bbdb1 100644
--- a/pkgs.nix
+++ b/pkgs.nix
@@ -3,7 +3,7 @@ rec {
     stdenv kernel bash coreutils findutils utillinux sysvinit e2fsprogs
     nettools nix subversion gcc wget which vim less screen openssh binutils
     strace shadowutils iputils gnumake curl gnused gnutar gnugrep gzip
-    mingetty grub;
+    mingetty grub syslinux;
 
   boot = (import ./boot) {inherit stdenv kernel bash coreutils findutils
     utillinux sysvinit e2fsprogs nettools nix subversion gcc wget which vim
-- 
GitLab


From ec898a881eb9a3f33f5fc2c5f9098dd8863d5dfa Mon Sep 17 00:00:00 2001
From: Armijn Hemel <armijn@gpl-violations.org>
Date: Sun, 31 Jul 2005 15:25:39 +0000
Subject: [PATCH 0033/5331] build kernel and copy it to the diskimage. Now all
 there is left is an initial ramdisk.

svn path=/nixu/trunk/; revision=3481
---
 make-disk.sh | 20 ++++++++++++++++++--
 pkgs.nix     |  2 +-
 2 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/make-disk.sh b/make-disk.sh
index 9d3f1124117..4ef319bcb08 100755
--- a/make-disk.sh
+++ b/make-disk.sh
@@ -1,5 +1,6 @@
 #! /bin/sh -e
 
+# deps is an array
 declare -a deps
 
 archivesDir=/tmp/arch
@@ -8,7 +9,9 @@ nixpkgs=/nixpkgs/trunk/pkgs
 fill_disk=$archivesDir/scripts/fill-disk.sh
 storePaths=$archivesDir/mystorepaths
 validatePaths=$archivesDir/validatepaths
+bootiso=/tmp/nixos.iso
 
+# keep chmod happy
 touch ${archivesDir}/blah
 chmod -f -R +w ${archivesDir}/*
 rm -rf ${archivesDir}/*
@@ -28,6 +31,8 @@ nix=$($NIX_CMD_PATH/nix-store -q $(echo '(import ./pkgs.nix).nix' | $NIX_CMD_PAT
 
 syslinux=$($NIX_CMD_PATH/nix-store -q $(echo '(import ./pkgs.nix).syslinux' | $NIX_CMD_PATH/nix-instantiate -))
 
+kernel=$($NIX_CMD_PATH/nix-store -r $(echo '(import ./pkgs.nix).kernel' | $NIX_CMD_PATH/nix-instantiate -))
+
 #nixDeps=$($NIX_CMD_PATH/nix-store -qR $(echo '(import ./pkgs.nix).nix' | $NIX_CMD_PATH/nix-instantiate -))
 
 #nixDeps=$($NIX_CMD_PATH/nix-store -qR $(nix-store -r $(echo '(import ./pkgs.nix).nix' | $NIX_CMD_PATH/nix-instantiate -)))
@@ -77,7 +82,18 @@ echo copying bootimage
 mkdir ${archivesDir}/isolinux
 cp ${syslinux}/lib/syslinux/isolinux.bin ${archivesDir}/isolinux
 chmod u+w ${archivesDir}/isolinux/*
-mkisofs -rJ -o /tmp/nix-pull.iso -b isolinux/isolinux.bin -c isolinux/boot.cat \
+
+echo copying kernel
+
+# By following the symlink we don't have to know the version number
+# of the kernel here.
+cp -L $kernel/vmlinuz ${archivesDir}/isolinux/linux
+
+# echo making ramdisk
+# todo!
+
+echo creating ISO image
+
+mkisofs -rJ -o ${bootiso} -b isolinux/isolinux.bin -c isolinux/boot.cat \
                 -no-emul-boot -boot-load-size 4 -boot-info-table \
                 ${archivesDir}
-
diff --git a/pkgs.nix b/pkgs.nix
index 5ec423bbdb1..28c45b7d44f 100644
--- a/pkgs.nix
+++ b/pkgs.nix
@@ -10,5 +10,5 @@ rec {
     less screen openssh binutils strace shadowutils iputils gnumake curl
     gnused gnutar gnugrep gzip mingetty grub;};
 
-  everything = [boot sysvinit];
+  everything = [boot sysvinit kernel];
 }
-- 
GitLab


From 16de9c1c61d6b02762cbd66dbaa23d13cf3e9b24 Mon Sep 17 00:00:00 2001
From: Armijn Hemel <armijn@gpl-violations.org>
Date: Sun, 31 Jul 2005 19:01:59 +0000
Subject: [PATCH 0034/5331] add configuration for isolinux

svn path=/nixu/trunk/; revision=3482
---
 isolinux.cfg | 6 ++++++
 make-disk.sh | 3 +++
 2 files changed, 9 insertions(+)
 create mode 100755 isolinux.cfg

diff --git a/isolinux.cfg b/isolinux.cfg
new file mode 100755
index 00000000000..1b69bafd4a9
--- /dev/null
+++ b/isolinux.cfg
@@ -0,0 +1,6 @@
+default linux
+prompt 1
+timeout 600
+label linux
+  kernel vmlinuz
+  append root=/dev/hdc
diff --git a/make-disk.sh b/make-disk.sh
index 4ef319bcb08..a82632703ce 100755
--- a/make-disk.sh
+++ b/make-disk.sh
@@ -81,6 +81,7 @@ echo copying bootimage
 
 mkdir ${archivesDir}/isolinux
 cp ${syslinux}/lib/syslinux/isolinux.bin ${archivesDir}/isolinux
+cp isolinux.cfg ${archivesDir}/isolinux
 chmod u+w ${archivesDir}/isolinux/*
 
 echo copying kernel
@@ -91,6 +92,8 @@ cp -L $kernel/vmlinuz ${archivesDir}/isolinux/linux
 
 # echo making ramdisk
 # todo!
+mkdir ${archivesDir}/sbin
+ln -s /scripts/fill-disk.sh ${archivesDir}/sbin/init
 
 echo creating ISO image
 
-- 
GitLab


From 96776b9065a0a2c61d4dfa44db06f4b14b3f1ba4 Mon Sep 17 00:00:00 2001
From: Armijn Hemel <armijn@gpl-violations.org>
Date: Sun, 31 Jul 2005 19:04:58 +0000
Subject: [PATCH 0035/5331] use "vmlinuz" instead of "linux", small cosmetic
 thing

svn path=/nixu/trunk/; revision=3483
---
 make-disk.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/make-disk.sh b/make-disk.sh
index a82632703ce..4e76b5aac69 100755
--- a/make-disk.sh
+++ b/make-disk.sh
@@ -88,7 +88,7 @@ echo copying kernel
 
 # By following the symlink we don't have to know the version number
 # of the kernel here.
-cp -L $kernel/vmlinuz ${archivesDir}/isolinux/linux
+cp -L $kernel/vmlinuz ${archivesDir}/isolinux
 
 # echo making ramdisk
 # todo!
-- 
GitLab


From b9617c9541eda51df5f10d917d4f193f23977662 Mon Sep 17 00:00:00 2001
From: Armijn Hemel <armijn@gpl-violations.org>
Date: Sun, 31 Jul 2005 20:40:57 +0000
Subject: [PATCH 0036/5331] we need parted in the installer and on the target
 disk for sure...

svn path=/nixu/trunk/; revision=3487
---
 boot/default.nix | 4 ++--
 pkgs.nix         | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/boot/default.nix b/boot/default.nix
index 5320404b733..52a7fd1d028 100644
--- a/boot/default.nix
+++ b/boot/default.nix
@@ -1,7 +1,7 @@
 { stdenv, kernel, bash, coreutils, findutils, utillinux, sysvinit, e2fsprogs
 , nettools, nix, subversion, gcc, wget, which, vim, less, screen, openssh
 , binutils, strace, shadowutils, iputils, gnumake, curl, gnused, gnugrep
-, gnutar, gzip, mingetty, grub}:
+, gnutar, gzip, mingetty, grub, parted}:
 
 derivation {
   name = "boot";
@@ -14,5 +14,5 @@ derivation {
   inherit stdenv kernel bash coreutils findutils utillinux sysvinit
           e2fsprogs nettools nix subversion gcc wget which vim less screen
           openssh binutils strace shadowutils iputils gnumake curl gnused
-          gnutar gnugrep gzip mingetty grub;
+          gnutar gnugrep gzip mingetty grub parted;
 }
diff --git a/pkgs.nix b/pkgs.nix
index 28c45b7d44f..d404a71e496 100644
--- a/pkgs.nix
+++ b/pkgs.nix
@@ -3,12 +3,12 @@ rec {
     stdenv kernel bash coreutils findutils utillinux sysvinit e2fsprogs
     nettools nix subversion gcc wget which vim less screen openssh binutils
     strace shadowutils iputils gnumake curl gnused gnutar gnugrep gzip
-    mingetty grub syslinux;
+    mingetty grub syslinux parted;
 
   boot = (import ./boot) {inherit stdenv kernel bash coreutils findutils
     utillinux sysvinit e2fsprogs nettools nix subversion gcc wget which vim
     less screen openssh binutils strace shadowutils iputils gnumake curl
-    gnused gnutar gnugrep gzip mingetty grub;};
+    gnused gnutar gnugrep gzip mingetty grub parted;};
 
   everything = [boot sysvinit kernel];
 }
-- 
GitLab


From 9c56696e75fec0130f03c39fdef7a3869e29bbdb Mon Sep 17 00:00:00 2001
From: Armijn Hemel <armijn@gpl-violations.org>
Date: Mon, 1 Aug 2005 17:30:45 +0000
Subject: [PATCH 0037/5331] support for initrd. Right now the image is *WAY*
 too big, so it boots with a kernel panic. initrd should be brought back to a
 few megabytes instead so it can be safely unzipped in memory.

Ideas:
- klibc instead of glibc
- leave out a lot of packages in the initrd:
  - gcc
  - linux-headers
  - ...
- have a minimal "stage 1", which mounts the CD (figure out how) and
remounts part of the CD on /nix and /nixpkgs

svn path=/nixu/trunk/; revision=3502
---
 fill-disk.sh | 11 ++++++-----
 isolinux.cfg |  2 +-
 make-disk.sh | 33 +++++++++++++++++++++++++++++++--
 3 files changed, 38 insertions(+), 8 deletions(-)

diff --git a/fill-disk.sh b/fill-disk.sh
index 5dfb264884c..2f5ac0e117d 100755
--- a/fill-disk.sh
+++ b/fill-disk.sh
@@ -1,4 +1,5 @@
-#! /bin/sh -e
+#! @bash@ -e
+##  #! /bin/sh -e
 
 sysvinitPath=@sysvinitPath@
 bootPath=@bootPath@
@@ -31,12 +32,12 @@ mkdir -p /tmp/mnt
 
 mount $device /tmp/mnt
 
-mkdir -p /nix
-mkdir -p /nixpkgs/trunk/pkgs
+# mkdir -p /nix
+# mkdir -p /nixpkgs/trunk/pkgs
 
 # temporary hack
-mount --bind /mnt/cdrom1/nix /nix
-mount --bind /mnt/cdrom1/pkgs /nixpkgs/trunk/pkgs
+# mount --bind /mnt/cdrom1/nix /nix
+# mount --bind /mnt/cdrom1/pkgs /nixpkgs/trunk/pkgs
 
 make_dir 00755 /bin
 make_dir 00755 /dev
diff --git a/isolinux.cfg b/isolinux.cfg
index 1b69bafd4a9..40bd0186880 100755
--- a/isolinux.cfg
+++ b/isolinux.cfg
@@ -3,4 +3,4 @@ prompt 1
 timeout 600
 label linux
   kernel vmlinuz
-  append root=/dev/hdc
+  append initrd=initram.img ramdisk_size=1000000
diff --git a/make-disk.sh b/make-disk.sh
index 4e76b5aac69..b44861a27a6 100755
--- a/make-disk.sh
+++ b/make-disk.sh
@@ -10,6 +10,8 @@ fill_disk=$archivesDir/scripts/fill-disk.sh
 storePaths=$archivesDir/mystorepaths
 validatePaths=$archivesDir/validatepaths
 bootiso=/tmp/nixos.iso
+#initrd=/tmp/initrd.img
+initrd=/tmp/initram.img
 
 # keep chmod happy
 touch ${archivesDir}/blah
@@ -42,6 +44,8 @@ echo $($NIX_CMD_PATH/nix-store -qR $(nix-store -r $(echo '(import ./pkgs.nix).ni
 
 utilLinux=$($NIX_CMD_PATH/nix-store -qR $(nix-store -r $(echo '(import ./pkgs.nix).utillinux' | $NIX_CMD_PATH/nix-instantiate -)))
 
+bash=$($NIX_CMD_PATH/nix-store -q $(echo '(import ./pkgs.nix).bash' | $NIX_CMD_PATH/nix-instantiate -))
+
 (while read storepath; do
    cp -fa --parents ${storepath} ${archivesDir}
 done) < $storePaths
@@ -58,6 +62,18 @@ for i in $utilLinux; do
   fi
 done
 
+echo creating directories for bootimage
+
+mkdir ${archivesDir}/bin
+mkdir ${archivesDir}/sbin
+mkdir -p ${archivesDir}/usr/bin
+mkdir -p ${archivesDir}/usr/sbin
+mkdir ${archivesDir}/tmp
+mkdir ${archivesDir}/proc
+mkdir ${archivesDir}/var
+mkdir ${archivesDir}/etc
+mkdir ${archivesDir}/dev
+
 echo copying nixpkgs
 
 cp -fa ${nixpkgs} ${archivesDir}
@@ -67,6 +83,8 @@ echo copying packges from store
 #cp -fa --parents ${nixDeps} ${archivesDir}
 cp -fau --parents ${utilLinux} ${archivesDir}
 
+echo bash $bash
+
 echo copying scripts
 
 mkdir ${archivesDir}/scripts
@@ -74,6 +92,7 @@ cp -fa * ${archivesDir}/scripts
 sed -e "s^@sysvinitPath\@^$sysvinitPath^g" \
     -e "s^@bootPath\@^$bootPath^g" \
     -e "s^@NIX_CMD_PATH\@^$nix^g" \
+    -e "s^@bash\@^$bash^g" \
     < $fill_disk > $fill_disk.tmp
 mv $fill_disk.tmp $fill_disk
 
@@ -92,8 +111,18 @@ cp -L $kernel/vmlinuz ${archivesDir}/isolinux
 
 # echo making ramdisk
 # todo!
-mkdir ${archivesDir}/sbin
-ln -s /scripts/fill-disk.sh ${archivesDir}/sbin/init
+# mkdir ${archivesDir}/sbin
+# ln -s /scripts/fill-disk.sh ${archivesDir}/sbin/init
+ln -s /scripts/fill-disk.sh ${archivesDir}/init
+
+echo creating ramdisk
+
+rm -f ${initrd}
+(cd ${archivesDir}; find . |cpio -c -o) | gzip -9 > ${initrd}
+
+#mkcramfs ${archivesDir} /tmp/initramdisk.img
+
+cp ${initrd} ${archivesDir}/isolinux
 
 echo creating ISO image
 
-- 
GitLab


From e6b3f223f628971ca54447c7a43f3ad54f5299a2 Mon Sep 17 00:00:00 2001
From: Armijn Hemel <armijn@gpl-violations.org>
Date: Tue, 2 Aug 2005 12:29:23 +0000
Subject: [PATCH 0038/5331] whoops, not just query for, but actually *build*
 syslinux :o

svn path=/nixu/trunk/; revision=3511
---
 make-disk.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/make-disk.sh b/make-disk.sh
index b44861a27a6..3825221a91c 100755
--- a/make-disk.sh
+++ b/make-disk.sh
@@ -31,7 +31,7 @@ bootPath=$($NIX_CMD_PATH/nix-store -q $(echo '(import ./pkgs.nix).boot' | $NIX_C
 
 nix=$($NIX_CMD_PATH/nix-store -q $(echo '(import ./pkgs.nix).nix' | $NIX_CMD_PATH/nix-instantiate -))
 
-syslinux=$($NIX_CMD_PATH/nix-store -q $(echo '(import ./pkgs.nix).syslinux' | $NIX_CMD_PATH/nix-instantiate -))
+syslinux=$($NIX_CMD_PATH/nix-store -r $(echo '(import ./pkgs.nix).syslinux' | $NIX_CMD_PATH/nix-instantiate -))
 
 kernel=$($NIX_CMD_PATH/nix-store -r $(echo '(import ./pkgs.nix).kernel' | $NIX_CMD_PATH/nix-instantiate -))
 
-- 
GitLab


From 45492df16b60102c9bc796ba26fcc091c632d2d0 Mon Sep 17 00:00:00 2001
From: Armijn Hemel <armijn@gpl-violations.org>
Date: Wed, 3 Aug 2005 12:00:42 +0000
Subject: [PATCH 0039/5331] reduce the size of the initrd a lot

svn path=/nixu/trunk/; revision=3514
---
 fill-disk.sh |  8 +++++++-
 make-disk.sh | 41 +++++++++++++++++++++++++++++------------
 2 files changed, 36 insertions(+), 13 deletions(-)

diff --git a/fill-disk.sh b/fill-disk.sh
index 2f5ac0e117d..1e4e7a45f44 100755
--- a/fill-disk.sh
+++ b/fill-disk.sh
@@ -1,9 +1,15 @@
 #! @bash@ -e
-##  #! /bin/sh -e
+
+export PATH=@bash@/bin:@coreutils@/bin:@findutils@/bin:@utillinux@/bin:@utillinux@/sbin
 
 sysvinitPath=@sysvinitPath@
 bootPath=@bootPath@
 
+mknod /dev/null c 1 3
+mknod /dev/console c 5 1
+
+echo "blaat"
+
 if ! test -n "$1"
 then
     echo "need harddisk device for installing!"
diff --git a/make-disk.sh b/make-disk.sh
index 3825221a91c..6bcfebcf7d9 100755
--- a/make-disk.sh
+++ b/make-disk.sh
@@ -12,6 +12,7 @@ validatePaths=$archivesDir/validatepaths
 bootiso=/tmp/nixos.iso
 #initrd=/tmp/initrd.img
 initrd=/tmp/initram.img
+initdir=${archivesDir}/initdir
 
 # keep chmod happy
 touch ${archivesDir}/blah
@@ -45,6 +46,9 @@ echo $($NIX_CMD_PATH/nix-store -qR $(nix-store -r $(echo '(import ./pkgs.nix).ni
 utilLinux=$($NIX_CMD_PATH/nix-store -qR $(nix-store -r $(echo '(import ./pkgs.nix).utillinux' | $NIX_CMD_PATH/nix-instantiate -)))
 
 bash=$($NIX_CMD_PATH/nix-store -q $(echo '(import ./pkgs.nix).bash' | $NIX_CMD_PATH/nix-instantiate -))
+coreutils=$($NIX_CMD_PATH/nix-store -q $(echo '(import ./pkgs.nix).coreutils' | $NIX_CMD_PATH/nix-instantiate -))
+findutils=$($NIX_CMD_PATH/nix-store -q $(echo '(import ./pkgs.nix).findutils' | $NIX_CMD_PATH/nix-instantiate -))
+utillinux=$($NIX_CMD_PATH/nix-store -q $(echo '(import ./pkgs.nix).utillinux' | $NIX_CMD_PATH/nix-instantiate -))
 
 (while read storepath; do
    cp -fa --parents ${storepath} ${archivesDir}
@@ -64,15 +68,16 @@ done
 
 echo creating directories for bootimage
 
-mkdir ${archivesDir}/bin
-mkdir ${archivesDir}/sbin
-mkdir -p ${archivesDir}/usr/bin
-mkdir -p ${archivesDir}/usr/sbin
-mkdir ${archivesDir}/tmp
-mkdir ${archivesDir}/proc
-mkdir ${archivesDir}/var
-mkdir ${archivesDir}/etc
-mkdir ${archivesDir}/dev
+mkdir ${initdir}
+mkdir ${initdir}/bin
+mkdir ${initdir}/sbin
+mkdir -p ${initdir}/usr/bin
+mkdir -p ${initdir}/usr/sbin
+mkdir ${initdir}/tmp
+mkdir ${initdir}/proc
+mkdir ${initdir}/var
+mkdir ${initdir}/etc
+mkdir ${initdir}/dev
 
 echo copying nixpkgs
 
@@ -83,7 +88,7 @@ echo copying packges from store
 #cp -fa --parents ${nixDeps} ${archivesDir}
 cp -fau --parents ${utilLinux} ${archivesDir}
 
-echo bash $bash
+bashdeps=$($NIX_CMD_PATH/nix-store -qR $(nix-store -r $(echo '(import ./pkgs.nix).bash' | $NIX_CMD_PATH/nix-instantiate -)))
 
 echo copying scripts
 
@@ -93,6 +98,9 @@ sed -e "s^@sysvinitPath\@^$sysvinitPath^g" \
     -e "s^@bootPath\@^$bootPath^g" \
     -e "s^@NIX_CMD_PATH\@^$nix^g" \
     -e "s^@bash\@^$bash^g" \
+    -e "s^@findutils\@^$findutils^g" \
+    -e "s^@coreutils\@^$coreutils^g" \
+    -e "s^@utillinux\@^$utillinux^g" \
     < $fill_disk > $fill_disk.tmp
 mv $fill_disk.tmp $fill_disk
 
@@ -113,12 +121,21 @@ cp -L $kernel/vmlinuz ${archivesDir}/isolinux
 # todo!
 # mkdir ${archivesDir}/sbin
 # ln -s /scripts/fill-disk.sh ${archivesDir}/sbin/init
-ln -s /scripts/fill-disk.sh ${archivesDir}/init
+# ln -s /scripts/fill-disk.sh ${archivesDir}/init
 
 echo creating ramdisk
 
 rm -f ${initrd}
-(cd ${archivesDir}; find . |cpio -c -o) | gzip -9 > ${initrd}
+cp ${archivesDir}/scripts/fill-disk.sh ${initdir}/init
+cp ${bash}/bin/* ${initdir}/bin
+#cp /nix/store/570hmhmx3v57605cqg9yfvvyh0nnb8k8-bash ${initdir}/bin/sh
+chmod u+x ${initdir}/init
+cp -fau --parents ${bashdeps} ${initdir}
+
+#mknod ${initdir}/dev/null c 1 3
+#mknod ${initdir}/dev/console c 5 1
+
+(cd ${archivesDir}/initdisk; find . |cpio -c -o) | gzip -9 > ${initrd}
 
 #mkcramfs ${archivesDir} /tmp/initramdisk.img
 
-- 
GitLab


From 93bcd71b157387637c625029de5268104117db4c Mon Sep 17 00:00:00 2001
From: Armijn Hemel <armijn@gpl-violations.org>
Date: Wed, 3 Aug 2005 17:59:23 +0000
Subject: [PATCH 0040/5331] This update fixes a few critical errors:

- cd to the right directory when making the initramfs image (stupid stupid stupid mistake, cost me a day of work!)
- make a bunch of devices inside the ramdisk
- copy the kernel and all modules to the CD image
- set the #! line in fill-disk to the right place (as in, append /bin/sh, another stupidity, which was luckily easily spot after fixing the first mistake, which was far more important)


svn path=/nixu/trunk/; revision=3523
---
 fill-disk.sh | 45 ++++++++++++++++++++++++++++++++++++++++++---
 isolinux.cfg |  2 +-
 make-disk.sh | 21 ++++++++++-----------
 3 files changed, 53 insertions(+), 15 deletions(-)

diff --git a/fill-disk.sh b/fill-disk.sh
index 1e4e7a45f44..d7860316e4a 100755
--- a/fill-disk.sh
+++ b/fill-disk.sh
@@ -1,12 +1,51 @@
-#! @bash@ -e
+#! @bash@/bin/sh -e
 
 export PATH=@bash@/bin:@coreutils@/bin:@findutils@/bin:@utillinux@/bin:@utillinux@/sbin
 
 sysvinitPath=@sysvinitPath@
 bootPath=@bootPath@
 
-mknod /dev/null c 1 3
-mknod /dev/console c 5 1
+mount -t proc proc /proc
+mount -t sysfs sys /sys
+
+#mount -t /dev/hdc /installimage
+
+# make a complete /dev filesystem
+# ripped permissions and everything from anaconda (loader2/devices.h)
+
+# consoles
+
+mknod -m 0600 /dev/console c 5 1
+mknod -m 0600 /dev/ttyS0 c 4 64
+mknod -m 0600 /dev/ttyS1 c 4 65
+mknod -m 0600 /dev/ttyS2 c 4 66
+mknod -m 0600 /dev/ttyS3 c 4 67
+
+# base UNIX devices
+mknod -m 0600 /dev/mem c 1 1
+mknod -m 0666 /dev/null c 1 3
+mknod -m 0666 /dev/zero c 1 5
+
+# tty
+mknod -m 0600 /dev/tty c 5 0
+mknod -m 0600 /dev/tty0 c 4 0
+mknod -m 0600 /dev/tty1 c 4 1
+mknod -m 0600 /dev/tty2 c 4 2
+mknod -m 0600 /dev/tty3 c 4 3
+mknod -m 0600 /dev/tty4 c 4 4
+mknod -m 0600 /dev/tty5 c 4 5
+mknod -m 0600 /dev/tty6 c 4 6
+mknod -m 0600 /dev/tty7 c 4 7
+mknod -m 0600 /dev/tty8 c 4 8
+mknod -m 0600 /dev/tty9 c 4 9
+
+mkdir -m 0755 /dev/pts
+mknod -m 0666 /dev/ptmx c 5 2
+
+# random
+
+mknod -m 0644 /dev/random c 1 8
+mknod -m 0644 /dev/urandom c 1 9
 
 echo "blaat"
 
diff --git a/isolinux.cfg b/isolinux.cfg
index 40bd0186880..f46570c89ff 100755
--- a/isolinux.cfg
+++ b/isolinux.cfg
@@ -3,4 +3,4 @@ prompt 1
 timeout 600
 label linux
   kernel vmlinuz
-  append initrd=initram.img ramdisk_size=1000000
+  append initrd=initram.img init=/bin/sh
diff --git a/make-disk.sh b/make-disk.sh
index 6bcfebcf7d9..0877d3ecf83 100755
--- a/make-disk.sh
+++ b/make-disk.sh
@@ -70,14 +70,16 @@ echo creating directories for bootimage
 
 mkdir ${initdir}
 mkdir ${initdir}/bin
+mkdir ${initdir}/dev
+mkdir ${initdir}/etc
+mkdir ${initdir}/installimage
+mkdir ${initdir}/proc
 mkdir ${initdir}/sbin
+mkdir ${initdir}/sys
+mkdir ${initdir}/tmp
 mkdir -p ${initdir}/usr/bin
 mkdir -p ${initdir}/usr/sbin
-mkdir ${initdir}/tmp
-mkdir ${initdir}/proc
 mkdir ${initdir}/var
-mkdir ${initdir}/etc
-mkdir ${initdir}/dev
 
 echo copying nixpkgs
 
@@ -87,6 +89,7 @@ echo copying packges from store
 
 #cp -fa --parents ${nixDeps} ${archivesDir}
 cp -fau --parents ${utilLinux} ${archivesDir}
+#cp -fau --parents ${kernel} ${archivesDir}
 
 bashdeps=$($NIX_CMD_PATH/nix-store -qR $(nix-store -r $(echo '(import ./pkgs.nix).bash' | $NIX_CMD_PATH/nix-instantiate -)))
 
@@ -128,16 +131,12 @@ echo creating ramdisk
 rm -f ${initrd}
 cp ${archivesDir}/scripts/fill-disk.sh ${initdir}/init
 cp ${bash}/bin/* ${initdir}/bin
-#cp /nix/store/570hmhmx3v57605cqg9yfvvyh0nnb8k8-bash ${initdir}/bin/sh
+#cp -f /nix/store/570hmhmx3v57605cqg9yfvvyh0nnb8k8-bash ${initdir}/bin/sh
 chmod u+x ${initdir}/init
 cp -fau --parents ${bashdeps} ${initdir}
 
-#mknod ${initdir}/dev/null c 1 3
-#mknod ${initdir}/dev/console c 5 1
-
-(cd ${archivesDir}/initdisk; find . |cpio -c -o) | gzip -9 > ${initrd}
-
-#mkcramfs ${archivesDir} /tmp/initramdisk.img
+#(cd ${initdir}; find . |cpio -c -o) | gzip -9 > ${initrd}
+(cd ${archivesDir}/initdir; find . |cpio -c -o) | gzip -9 > ${initrd}
 
 cp ${initrd} ${archivesDir}/isolinux
 
-- 
GitLab


From 81bfae51f72885a411ea422d2a12bd0747982753 Mon Sep 17 00:00:00 2001
From: Armijn Hemel <armijn@gpl-violations.org>
Date: Wed, 3 Aug 2005 18:14:47 +0000
Subject: [PATCH 0041/5331] - set timeout for isolinux to 1 minute - copy
 util-linux to ramdisk   TODO:    - do this with other tools as well in a bit
 more generic way

svn path=/nixu/trunk/; revision=3524
---
 isolinux.cfg | 2 +-
 make-disk.sh | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/isolinux.cfg b/isolinux.cfg
index f46570c89ff..180b144eeb5 100755
--- a/isolinux.cfg
+++ b/isolinux.cfg
@@ -1,6 +1,6 @@
 default linux
 prompt 1
-timeout 600
+timeout 60
 label linux
   kernel vmlinuz
   append initrd=initram.img init=/bin/sh
diff --git a/make-disk.sh b/make-disk.sh
index 0877d3ecf83..ba964d09c0e 100755
--- a/make-disk.sh
+++ b/make-disk.sh
@@ -134,6 +134,7 @@ cp ${bash}/bin/* ${initdir}/bin
 #cp -f /nix/store/570hmhmx3v57605cqg9yfvvyh0nnb8k8-bash ${initdir}/bin/sh
 chmod u+x ${initdir}/init
 cp -fau --parents ${bashdeps} ${initdir}
+cp -fau --parents ${utilLinux} ${initdir}
 
 #(cd ${initdir}; find . |cpio -c -o) | gzip -9 > ${initrd}
 (cd ${archivesDir}/initdir; find . |cpio -c -o) | gzip -9 > ${initrd}
-- 
GitLab


From 8151b78162e48b31e88c23b6b8fc8d964d9fb119 Mon Sep 17 00:00:00 2001
From: Armijn Hemel <armijn@gpl-violations.org>
Date: Thu, 4 Aug 2005 14:45:27 +0000
Subject: [PATCH 0042/5331] add necessary packages. Now it works and we have to
 decide: - either add the device with mknod - use hotplug to build all devices
 dynamically

svn path=/nixu/trunk/; revision=3525
---
 fill-disk.sh | 22 +++++++++++++---------
 make-disk.sh |  7 ++++---
 2 files changed, 17 insertions(+), 12 deletions(-)

diff --git a/fill-disk.sh b/fill-disk.sh
index d7860316e4a..f384d15d7ec 100755
--- a/fill-disk.sh
+++ b/fill-disk.sh
@@ -15,7 +15,7 @@ mount -t sysfs sys /sys
 
 # consoles
 
-mknod -m 0600 /dev/console c 5 1
+#mknod -m 0600 /dev/console c 5 1
 mknod -m 0600 /dev/ttyS0 c 4 64
 mknod -m 0600 /dev/ttyS1 c 4 65
 mknod -m 0600 /dev/ttyS2 c 4 66
@@ -49,13 +49,15 @@ mknod -m 0644 /dev/urandom c 1 9
 
 echo "blaat"
 
-if ! test -n "$1"
-then
-    echo "need harddisk device for installing!"
-    exit
-else
-    device=$1
-fi
+#if ! test -n "$1"
+#then
+#    echo "need harddisk device for installing!"
+#    exit
+#else
+#    device=$1
+#fi
+
+device=/dev/hda1
 
 make_dir() {
     mode=$1
@@ -75,7 +77,9 @@ root=/tmp/mnt
 
 mkdir -p /tmp/mnt
 
-mount $device /tmp/mnt
+mount -t ext2 $device /tmp/mnt
+
+cd /sys; echo *
 
 # mkdir -p /nix
 # mkdir -p /nixpkgs/trunk/pkgs
diff --git a/make-disk.sh b/make-disk.sh
index ba964d09c0e..7b2f20781f7 100755
--- a/make-disk.sh
+++ b/make-disk.sh
@@ -44,6 +44,7 @@ echo $($NIX_CMD_PATH/nix-store -qR $(nix-store -r $(echo '(import ./pkgs.nix).ni
 #echo $nixDeps > $storePaths
 
 utilLinux=$($NIX_CMD_PATH/nix-store -qR $(nix-store -r $(echo '(import ./pkgs.nix).utillinux' | $NIX_CMD_PATH/nix-instantiate -)))
+coreUtils=$($NIX_CMD_PATH/nix-store -qR $(nix-store -r $(echo '(import ./pkgs.nix).coreutils' | $NIX_CMD_PATH/nix-instantiate -)))
 
 bash=$($NIX_CMD_PATH/nix-store -q $(echo '(import ./pkgs.nix).bash' | $NIX_CMD_PATH/nix-instantiate -))
 coreutils=$($NIX_CMD_PATH/nix-store -q $(echo '(import ./pkgs.nix).coreutils' | $NIX_CMD_PATH/nix-instantiate -))
@@ -131,13 +132,13 @@ echo creating ramdisk
 rm -f ${initrd}
 cp ${archivesDir}/scripts/fill-disk.sh ${initdir}/init
 cp ${bash}/bin/* ${initdir}/bin
-#cp -f /nix/store/570hmhmx3v57605cqg9yfvvyh0nnb8k8-bash ${initdir}/bin/sh
 chmod u+x ${initdir}/init
 cp -fau --parents ${bashdeps} ${initdir}
 cp -fau --parents ${utilLinux} ${initdir}
+cp -fau --parents ${coreUtils} ${initdir}
 
-#(cd ${initdir}; find . |cpio -c -o) | gzip -9 > ${initrd}
-(cd ${archivesDir}/initdir; find . |cpio -c -o) | gzip -9 > ${initrd}
+(cd ${initdir}; find . |cpio -c -o) | gzip -9 > ${initrd}
+#(cd ${archivesDir}/initdir; find . |cpio -c -o) | gzip -9 > ${initrd}
 
 cp ${initrd} ${archivesDir}/isolinux
 
-- 
GitLab


From c785eeaaec25755b845d7811bbd2e8353bc1e411 Mon Sep 17 00:00:00 2001
From: Armijn Hemel <armijn@gpl-violations.org>
Date: Thu, 4 Aug 2005 22:57:13 +0000
Subject: [PATCH 0043/5331] add stubs for creation of the installer via Nix
 expressions, similar to the bootscripts and initscripts. This will mean lots
 of cruft from the current fill-disk.sh can be removed.

svn path=/nixu/trunk/; revision=3526
---
 init/default.nix | 9 +++++++++
 1 file changed, 9 insertions(+)
 create mode 100644 init/default.nix

diff --git a/init/default.nix b/init/default.nix
new file mode 100644
index 00000000000..b03437310c0
--- /dev/null
+++ b/init/default.nix
@@ -0,0 +1,9 @@
+{ stdenv, bash, coreutils, utillinux, e2fsprogs, nix, shadowutils, mingetty, grub, parted}:
+
+derivation {
+  name = "init";
+  system = stdenv.system;
+  builder = ./builder.sh;
+  inherit stdenv bash coreutils utillinux e2fsprogs nix shadowutils
+          mingetty grub parted;
+}
-- 
GitLab


From bc3ffa345873bfbbb3252fceb857875846802121 Mon Sep 17 00:00:00 2001
From: Armijn Hemel <armijn@gpl-violations.org>
Date: Fri, 5 Aug 2005 13:48:22 +0000
Subject: [PATCH 0044/5331] get NixOS more towards an installable state. Stuff
 now actually gets installed on the disk itself. Missing is functionality to
 detect the right drive with the install CD in it.

svn path=/nixu/trunk/; revision=3531
---
 fill-disk.sh      |  39 ++++++++-
 init/fill-disk.sh | 203 ++++++++++++++++++++++++++++++++++++++++++++++
 make-disk.sh      |   4 +
 pkgs.nix          |   5 +-
 4 files changed, 248 insertions(+), 3 deletions(-)
 create mode 100755 init/fill-disk.sh

diff --git a/fill-disk.sh b/fill-disk.sh
index f384d15d7ec..c6717945815 100755
--- a/fill-disk.sh
+++ b/fill-disk.sh
@@ -1,6 +1,6 @@
 #! @bash@/bin/sh -e
 
-export PATH=@bash@/bin:@coreutils@/bin:@findutils@/bin:@utillinux@/bin:@utillinux@/sbin
+export PATH=@bash@/bin:@coreutils@/bin:@findutils@/bin:@utillinux@/bin:@utillinux@/sbin:@e2fsprogs@/sbin
 
 sysvinitPath=@sysvinitPath@
 bootPath=@bootPath@
@@ -47,7 +47,22 @@ mknod -m 0666 /dev/ptmx c 5 2
 mknod -m 0644 /dev/random c 1 8
 mknod -m 0644 /dev/urandom c 1 9
 
-echo "blaat"
+mknod -m 0660 /dev/hda b 3 0
+mknod -m 0660 /dev/hda1 b 3 1
+mknod -m 0660 /dev/hda2 b 3 2
+mknod -m 0660 /dev/hda3 b 3 3
+
+#mknod -m 0660 /dev/sda b 8 0
+#mknod -m 0660 /dev/sda1 b 8 1
+#mknod -m 0660 /dev/sda2 b 8 2
+#mknod -m 0660 /dev/sda3 b 8 3
+
+echo "dev"
+cd /dev; echo *
+
+mkfs.ext2 /dev/hda1
+mkswap /dev/hda2
+
 
 #if ! test -n "$1"
 #then
@@ -58,6 +73,8 @@ echo "blaat"
 #fi
 
 device=/dev/hda1
+#device=/dev/sda1
+
 
 make_dir() {
     mode=$1
@@ -88,6 +105,10 @@ cd /sys; echo *
 # mount --bind /mnt/cdrom1/nix /nix
 # mount --bind /mnt/cdrom1/pkgs /nixpkgs/trunk/pkgs
 
+##
+## Create a directory tree on the installation disk.
+##
+
 make_dir 00755 /bin
 make_dir 00755 /dev
 make_dir 00755 /proc
@@ -110,6 +131,10 @@ make_dir 00755 /mnt/host
 make_dir 00755 /home
 make_dir 00755 /home/root
 
+##
+## Add a few devices to /dev on the install disk. This is by far complete.
+##
+
 mknod $root/dev/null c 1 3
 
 touch_file /etc/passwd
@@ -119,6 +144,12 @@ touch_file /etc/group
 rm -f $root/etc/mtab
 #ln -s /proc/mounts $root/etc/mtab
 
+cat /proc/mounts
+
+## Probe for CD device which contains our CD here and mount /nix and
+## /nixpkgs from it inside the ramdisk. Anaconda uses kudzu for this.
+## Find out how Knoppix and SUSE do this...
+
 export NIX_DATA_DIR=$root/nix/share
 export NIX_LOG_DIR=$root/nix/log/nix
 export NIX_STATE_DIR=$root/nix/var/nix
@@ -201,3 +232,7 @@ cp /etc/resolv.conf $root/etc
 rm -f $root/etc/hosts
 echo "127.0.0.1 localhost" >> $root/etc/hosts
 echo "192.168.150.1 uml" >> $root/etc/hosts
+
+###
+### Do funky stuff with grub here.
+###
diff --git a/init/fill-disk.sh b/init/fill-disk.sh
new file mode 100755
index 00000000000..f384d15d7ec
--- /dev/null
+++ b/init/fill-disk.sh
@@ -0,0 +1,203 @@
+#! @bash@/bin/sh -e
+
+export PATH=@bash@/bin:@coreutils@/bin:@findutils@/bin:@utillinux@/bin:@utillinux@/sbin
+
+sysvinitPath=@sysvinitPath@
+bootPath=@bootPath@
+
+mount -t proc proc /proc
+mount -t sysfs sys /sys
+
+#mount -t /dev/hdc /installimage
+
+# make a complete /dev filesystem
+# ripped permissions and everything from anaconda (loader2/devices.h)
+
+# consoles
+
+#mknod -m 0600 /dev/console c 5 1
+mknod -m 0600 /dev/ttyS0 c 4 64
+mknod -m 0600 /dev/ttyS1 c 4 65
+mknod -m 0600 /dev/ttyS2 c 4 66
+mknod -m 0600 /dev/ttyS3 c 4 67
+
+# base UNIX devices
+mknod -m 0600 /dev/mem c 1 1
+mknod -m 0666 /dev/null c 1 3
+mknod -m 0666 /dev/zero c 1 5
+
+# tty
+mknod -m 0600 /dev/tty c 5 0
+mknod -m 0600 /dev/tty0 c 4 0
+mknod -m 0600 /dev/tty1 c 4 1
+mknod -m 0600 /dev/tty2 c 4 2
+mknod -m 0600 /dev/tty3 c 4 3
+mknod -m 0600 /dev/tty4 c 4 4
+mknod -m 0600 /dev/tty5 c 4 5
+mknod -m 0600 /dev/tty6 c 4 6
+mknod -m 0600 /dev/tty7 c 4 7
+mknod -m 0600 /dev/tty8 c 4 8
+mknod -m 0600 /dev/tty9 c 4 9
+
+mkdir -m 0755 /dev/pts
+mknod -m 0666 /dev/ptmx c 5 2
+
+# random
+
+mknod -m 0644 /dev/random c 1 8
+mknod -m 0644 /dev/urandom c 1 9
+
+echo "blaat"
+
+#if ! test -n "$1"
+#then
+#    echo "need harddisk device for installing!"
+#    exit
+#else
+#    device=$1
+#fi
+
+device=/dev/hda1
+
+make_dir() {
+    mode=$1
+    name=$2
+    echo creating $name...
+    if ! test -d $root/$name; then mkdir $root/$name; fi
+    chmod $mode $root/$name
+}
+
+
+touch_file() {
+    name=$1
+    echo touching $name...
+    if ! test -d $root/$name; then touch $root/$name; fi
+}
+root=/tmp/mnt
+
+mkdir -p /tmp/mnt
+
+mount -t ext2 $device /tmp/mnt
+
+cd /sys; echo *
+
+# mkdir -p /nix
+# mkdir -p /nixpkgs/trunk/pkgs
+
+# temporary hack
+# mount --bind /mnt/cdrom1/nix /nix
+# mount --bind /mnt/cdrom1/pkgs /nixpkgs/trunk/pkgs
+
+make_dir 00755 /bin
+make_dir 00755 /dev
+make_dir 00755 /proc
+make_dir 01777 /tmp
+make_dir 00755 /etc # global non-constant configuration
+make_dir 00755 /etc-secret
+make_dir 00755 /var
+make_dir 00755 /nix
+make_dir 00755 /nix/store
+make_dir 00755 /nix/var
+make_dir 00755 /nix/var/nix
+make_dir 00755 /nix/var/nix/db
+make_dir 00755 /nix/var/nix/manifests
+make_dir 00755 /nix/var/log
+make_dir 00755 /nix/var/log/nix
+make_dir 00755 /nixpkgs
+make_dir 00755 /nixpkgs/trunk
+make_dir 00755 /mnt
+make_dir 00755 /mnt/host
+make_dir 00755 /home
+make_dir 00755 /home/root
+
+mknod $root/dev/null c 1 3
+
+touch_file /etc/passwd
+touch_file /etc/shadow
+touch_file /etc/group
+
+rm -f $root/etc/mtab
+#ln -s /proc/mounts $root/etc/mtab
+
+export NIX_DATA_DIR=$root/nix/share
+export NIX_LOG_DIR=$root/nix/log/nix
+export NIX_STATE_DIR=$root/nix/var/nix
+export NIX_CONF_DIR=$root/nix/etc
+NIX_CMD_PATH=@NIX_CMD_PATH@/bin
+
+echo initialising Nix DB...
+#/nix/bin/nix-store --init
+$NIX_CMD_PATH/nix-store --init
+
+echo verifying Nix DB...
+$NIX_CMD_PATH/nix-store --verify
+
+echo copying nixpkgs...
+cp -fa ../pkgs $root/nixpkgs/trunk
+
+make_dir 0755 /tmp/scripts
+cp -fa ../scripts $root/tmp
+
+#echo adding manifest
+#$NIX_CMD_PATH/nix-pull $manifest
+
+echo adding packages
+export NIX_ROOT=$root
+unset NIX_DATA_DIR
+unset NIX_LOG_DIR
+unset NIX_STATE_DIR
+unset NIX_CONF_DIR
+
+#storeExpr=$(echo '(import /tmp/scripts/pkgs.nix).everything' | $NIX_CMD_PATH/nix-instantiate -v -v -)
+#storeExpr=$(echo '(import ./pkgs.nix).everything' | $NIX_CMD_PATH/nix-instantiate -v -v -)
+#$NIX_CMD_PATH/nix-store -r $storeExpr
+#echo $storeExpr
+#storeExpr2=$($NIX_CMD_PATH/nix-store -qR $($NIX_CMD_PATH/nix-store -r $storeExpr))
+#echo storeExpr $storeExpr
+#echo $($NIX_CMD_PATH/nix-store -qR --include-outputs $storeExpr)
+
+echo copying store
+
+(while read storepaths; do
+  cp -fa $storepaths $root/nix/store
+done) < /mnt/cdrom1/mystorepaths
+
+#cp -fa ../nix/store/* $root/nix/store
+
+#echo registering valid paths...
+#(while read storepath; do
+#    echo PATH $storepath
+#    if ! $NIX_CMD_PATH/nix-store --isvalid $storepath 2> /dev/null; then
+#        (unset NIX_ROOT; $NIX_CMD_PATH/nix-store --dump $storepath) | $NIX_CMD_PATH/nix-store --restore $storepath
+#        $NIX_CMD_PATH/nix-store --validpath $storepath
+#    fi
+#done) < /tmp/mystorepaths
+
+#echo registering successors...
+#(while read line; do
+#    echo SUCC $line
+#    $NIX_CMD_PATH/nix-store --successor $line
+#done) < /tmp/mysuccessors
+
+exit
+
+echo setting init symlink...
+rm -f $root/init
+ln -s $sysvinitPath/sbin/init $root/init
+
+echo setting up inittab...
+rm -f $root/etc/inittab
+echo "id:2:initdefault:" >> $root/etc/inittab
+echo "si::bootwait:$bootPath/bin/boot.sh" >> $root/etc/inittab
+echo "ht:06:wait:$bootPath/bin/halt.sh" >> $root/etc/inittab
+echo "1:2345:respawn:$bootPath/bin/login.sh /dev/ttys/0" >> $root/etc/inittab
+#echo "2:2345:respawn:$bootPath/bin/login.sh /dev/ttys/1" >> $root/etc/inittab
+
+echo setting up networking information...
+make_dir 00755 /etc/networking
+echo 192.168.150.1 > $root/etc/networking/local-ip
+echo 192.168.150.3 > $root/etc/networking/gateway-ip
+cp /etc/resolv.conf $root/etc
+rm -f $root/etc/hosts
+echo "127.0.0.1 localhost" >> $root/etc/hosts
+echo "192.168.150.1 uml" >> $root/etc/hosts
diff --git a/make-disk.sh b/make-disk.sh
index 7b2f20781f7..9d4bb589e37 100755
--- a/make-disk.sh
+++ b/make-disk.sh
@@ -45,11 +45,13 @@ echo $($NIX_CMD_PATH/nix-store -qR $(nix-store -r $(echo '(import ./pkgs.nix).ni
 
 utilLinux=$($NIX_CMD_PATH/nix-store -qR $(nix-store -r $(echo '(import ./pkgs.nix).utillinux' | $NIX_CMD_PATH/nix-instantiate -)))
 coreUtils=$($NIX_CMD_PATH/nix-store -qR $(nix-store -r $(echo '(import ./pkgs.nix).coreutils' | $NIX_CMD_PATH/nix-instantiate -)))
+e2fsProgs=$($NIX_CMD_PATH/nix-store -qR $(nix-store -r $(echo '(import ./pkgs.nix).e2fsprogs' | $NIX_CMD_PATH/nix-instantiate -)))
 
 bash=$($NIX_CMD_PATH/nix-store -q $(echo '(import ./pkgs.nix).bash' | $NIX_CMD_PATH/nix-instantiate -))
 coreutils=$($NIX_CMD_PATH/nix-store -q $(echo '(import ./pkgs.nix).coreutils' | $NIX_CMD_PATH/nix-instantiate -))
 findutils=$($NIX_CMD_PATH/nix-store -q $(echo '(import ./pkgs.nix).findutils' | $NIX_CMD_PATH/nix-instantiate -))
 utillinux=$($NIX_CMD_PATH/nix-store -q $(echo '(import ./pkgs.nix).utillinux' | $NIX_CMD_PATH/nix-instantiate -))
+e2fsprogs=$($NIX_CMD_PATH/nix-store -q $(echo '(import ./pkgs.nix).e2fsprogs' | $NIX_CMD_PATH/nix-instantiate -))
 
 (while read storepath; do
    cp -fa --parents ${storepath} ${archivesDir}
@@ -105,6 +107,7 @@ sed -e "s^@sysvinitPath\@^$sysvinitPath^g" \
     -e "s^@findutils\@^$findutils^g" \
     -e "s^@coreutils\@^$coreutils^g" \
     -e "s^@utillinux\@^$utillinux^g" \
+    -e "s^@e2fsprogs\@^$e2fsprogs^g" \
     < $fill_disk > $fill_disk.tmp
 mv $fill_disk.tmp $fill_disk
 
@@ -136,6 +139,7 @@ chmod u+x ${initdir}/init
 cp -fau --parents ${bashdeps} ${initdir}
 cp -fau --parents ${utilLinux} ${initdir}
 cp -fau --parents ${coreUtils} ${initdir}
+cp -fau --parents ${e2fsProgs} ${initdir}
 
 (cd ${initdir}; find . |cpio -c -o) | gzip -9 > ${initrd}
 #(cd ${archivesDir}/initdir; find . |cpio -c -o) | gzip -9 > ${initrd}
diff --git a/pkgs.nix b/pkgs.nix
index d404a71e496..23573c7aedb 100644
--- a/pkgs.nix
+++ b/pkgs.nix
@@ -10,5 +10,8 @@ rec {
     less screen openssh binutils strace shadowutils iputils gnumake curl
     gnused gnutar gnugrep gzip mingetty grub parted;};
 
-  everything = [boot sysvinit kernel];
+  init = (import ./init) {inherit stdenv bash coreutils 
+    utillinux e2fsprogs nix shadowutils mingetty grub parted;};
+
+  everything = [boot init sysvinit kernel];
 }
-- 
GitLab


From 9babae1704ee8a1ae75cd0060f5b0e7701667da4 Mon Sep 17 00:00:00 2001
From: Armijn Hemel <armijn@gpl-violations.org>
Date: Fri, 5 Aug 2005 21:56:48 +0000
Subject: [PATCH 0045/5331] split fill-disk in two parts

svn path=/nixu/trunk/; revision=3532
---
 init/default.nix  |  2 ++
 init/fill-disk.sh | 39 +++++++++++++++++++++++++++++++++++++--
 2 files changed, 39 insertions(+), 2 deletions(-)

diff --git a/init/default.nix b/init/default.nix
index b03437310c0..48c27469ee8 100644
--- a/init/default.nix
+++ b/init/default.nix
@@ -4,6 +4,8 @@ derivation {
   name = "init";
   system = stdenv.system;
   builder = ./builder.sh;
+  stage1 = ./prepare-disk.sh;
+  stage2 = ./fill-disk.sh;
   inherit stdenv bash coreutils utillinux e2fsprogs nix shadowutils
           mingetty grub parted;
 }
diff --git a/init/fill-disk.sh b/init/fill-disk.sh
index f384d15d7ec..c6717945815 100755
--- a/init/fill-disk.sh
+++ b/init/fill-disk.sh
@@ -1,6 +1,6 @@
 #! @bash@/bin/sh -e
 
-export PATH=@bash@/bin:@coreutils@/bin:@findutils@/bin:@utillinux@/bin:@utillinux@/sbin
+export PATH=@bash@/bin:@coreutils@/bin:@findutils@/bin:@utillinux@/bin:@utillinux@/sbin:@e2fsprogs@/sbin
 
 sysvinitPath=@sysvinitPath@
 bootPath=@bootPath@
@@ -47,7 +47,22 @@ mknod -m 0666 /dev/ptmx c 5 2
 mknod -m 0644 /dev/random c 1 8
 mknod -m 0644 /dev/urandom c 1 9
 
-echo "blaat"
+mknod -m 0660 /dev/hda b 3 0
+mknod -m 0660 /dev/hda1 b 3 1
+mknod -m 0660 /dev/hda2 b 3 2
+mknod -m 0660 /dev/hda3 b 3 3
+
+#mknod -m 0660 /dev/sda b 8 0
+#mknod -m 0660 /dev/sda1 b 8 1
+#mknod -m 0660 /dev/sda2 b 8 2
+#mknod -m 0660 /dev/sda3 b 8 3
+
+echo "dev"
+cd /dev; echo *
+
+mkfs.ext2 /dev/hda1
+mkswap /dev/hda2
+
 
 #if ! test -n "$1"
 #then
@@ -58,6 +73,8 @@ echo "blaat"
 #fi
 
 device=/dev/hda1
+#device=/dev/sda1
+
 
 make_dir() {
     mode=$1
@@ -88,6 +105,10 @@ cd /sys; echo *
 # mount --bind /mnt/cdrom1/nix /nix
 # mount --bind /mnt/cdrom1/pkgs /nixpkgs/trunk/pkgs
 
+##
+## Create a directory tree on the installation disk.
+##
+
 make_dir 00755 /bin
 make_dir 00755 /dev
 make_dir 00755 /proc
@@ -110,6 +131,10 @@ make_dir 00755 /mnt/host
 make_dir 00755 /home
 make_dir 00755 /home/root
 
+##
+## Add a few devices to /dev on the install disk. This is by far complete.
+##
+
 mknod $root/dev/null c 1 3
 
 touch_file /etc/passwd
@@ -119,6 +144,12 @@ touch_file /etc/group
 rm -f $root/etc/mtab
 #ln -s /proc/mounts $root/etc/mtab
 
+cat /proc/mounts
+
+## Probe for CD device which contains our CD here and mount /nix and
+## /nixpkgs from it inside the ramdisk. Anaconda uses kudzu for this.
+## Find out how Knoppix and SUSE do this...
+
 export NIX_DATA_DIR=$root/nix/share
 export NIX_LOG_DIR=$root/nix/log/nix
 export NIX_STATE_DIR=$root/nix/var/nix
@@ -201,3 +232,7 @@ cp /etc/resolv.conf $root/etc
 rm -f $root/etc/hosts
 echo "127.0.0.1 localhost" >> $root/etc/hosts
 echo "192.168.150.1 uml" >> $root/etc/hosts
+
+###
+### Do funky stuff with grub here.
+###
-- 
GitLab


From 55cf30623fc7d266aa43d4ce7e5241041bc47bac Mon Sep 17 00:00:00 2001
From: Armijn Hemel <armijn@gpl-violations.org>
Date: Fri, 5 Aug 2005 22:05:35 +0000
Subject: [PATCH 0046/5331] split fill-disk into prepare-disk (preparing the
 RAM disk and finding the CD player and everything) and install-disk
 (installing everything)

svn path=/nixu/trunk/; revision=3533
---
 init/default.nix                       |  2 +-
 init/{fill-disk.sh => install-disk.sh} | 63 ------------------------
 init/prepare-disk.sh                   | 68 ++++++++++++++++++++++++++
 3 files changed, 69 insertions(+), 64 deletions(-)
 rename init/{fill-disk.sh => install-disk.sh} (74%)
 create mode 100755 init/prepare-disk.sh

diff --git a/init/default.nix b/init/default.nix
index 48c27469ee8..9657101ac03 100644
--- a/init/default.nix
+++ b/init/default.nix
@@ -5,7 +5,7 @@ derivation {
   system = stdenv.system;
   builder = ./builder.sh;
   stage1 = ./prepare-disk.sh;
-  stage2 = ./fill-disk.sh;
+  stage2 = ./install-disk.sh;
   inherit stdenv bash coreutils utillinux e2fsprogs nix shadowutils
           mingetty grub parted;
 }
diff --git a/init/fill-disk.sh b/init/install-disk.sh
similarity index 74%
rename from init/fill-disk.sh
rename to init/install-disk.sh
index c6717945815..9e18719f208 100755
--- a/init/fill-disk.sh
+++ b/init/install-disk.sh
@@ -5,65 +5,6 @@ export PATH=@bash@/bin:@coreutils@/bin:@findutils@/bin:@utillinux@/bin:@utillinu
 sysvinitPath=@sysvinitPath@
 bootPath=@bootPath@
 
-mount -t proc proc /proc
-mount -t sysfs sys /sys
-
-#mount -t /dev/hdc /installimage
-
-# make a complete /dev filesystem
-# ripped permissions and everything from anaconda (loader2/devices.h)
-
-# consoles
-
-#mknod -m 0600 /dev/console c 5 1
-mknod -m 0600 /dev/ttyS0 c 4 64
-mknod -m 0600 /dev/ttyS1 c 4 65
-mknod -m 0600 /dev/ttyS2 c 4 66
-mknod -m 0600 /dev/ttyS3 c 4 67
-
-# base UNIX devices
-mknod -m 0600 /dev/mem c 1 1
-mknod -m 0666 /dev/null c 1 3
-mknod -m 0666 /dev/zero c 1 5
-
-# tty
-mknod -m 0600 /dev/tty c 5 0
-mknod -m 0600 /dev/tty0 c 4 0
-mknod -m 0600 /dev/tty1 c 4 1
-mknod -m 0600 /dev/tty2 c 4 2
-mknod -m 0600 /dev/tty3 c 4 3
-mknod -m 0600 /dev/tty4 c 4 4
-mknod -m 0600 /dev/tty5 c 4 5
-mknod -m 0600 /dev/tty6 c 4 6
-mknod -m 0600 /dev/tty7 c 4 7
-mknod -m 0600 /dev/tty8 c 4 8
-mknod -m 0600 /dev/tty9 c 4 9
-
-mkdir -m 0755 /dev/pts
-mknod -m 0666 /dev/ptmx c 5 2
-
-# random
-
-mknod -m 0644 /dev/random c 1 8
-mknod -m 0644 /dev/urandom c 1 9
-
-mknod -m 0660 /dev/hda b 3 0
-mknod -m 0660 /dev/hda1 b 3 1
-mknod -m 0660 /dev/hda2 b 3 2
-mknod -m 0660 /dev/hda3 b 3 3
-
-#mknod -m 0660 /dev/sda b 8 0
-#mknod -m 0660 /dev/sda1 b 8 1
-#mknod -m 0660 /dev/sda2 b 8 2
-#mknod -m 0660 /dev/sda3 b 8 3
-
-echo "dev"
-cd /dev; echo *
-
-mkfs.ext2 /dev/hda1
-mkswap /dev/hda2
-
-
 #if ! test -n "$1"
 #then
 #    echo "need harddisk device for installing!"
@@ -146,10 +87,6 @@ rm -f $root/etc/mtab
 
 cat /proc/mounts
 
-## Probe for CD device which contains our CD here and mount /nix and
-## /nixpkgs from it inside the ramdisk. Anaconda uses kudzu for this.
-## Find out how Knoppix and SUSE do this...
-
 export NIX_DATA_DIR=$root/nix/share
 export NIX_LOG_DIR=$root/nix/log/nix
 export NIX_STATE_DIR=$root/nix/var/nix
diff --git a/init/prepare-disk.sh b/init/prepare-disk.sh
new file mode 100755
index 00000000000..3e0c845de83
--- /dev/null
+++ b/init/prepare-disk.sh
@@ -0,0 +1,68 @@
+#! @bash@/bin/sh -e
+
+export PATH=@bash@/bin:@coreutils@/bin:@findutils@/bin:@utillinux@/bin:@utillinux@/sbin:@e2fsprogs@/sbin
+
+sysvinitPath=@sysvinitPath@
+bootPath=@bootPath@
+
+mount -t proc proc /proc
+mount -t sysfs sys /sys
+
+#mount -t /dev/hdc /installimage
+
+# make a complete /dev filesystem
+# ripped permissions and everything from anaconda (loader2/devices.h)
+
+# consoles
+
+#mknod -m 0600 /dev/console c 5 1
+mknod -m 0600 /dev/ttyS0 c 4 64
+mknod -m 0600 /dev/ttyS1 c 4 65
+mknod -m 0600 /dev/ttyS2 c 4 66
+mknod -m 0600 /dev/ttyS3 c 4 67
+
+# base UNIX devices
+mknod -m 0600 /dev/mem c 1 1
+mknod -m 0666 /dev/null c 1 3
+mknod -m 0666 /dev/zero c 1 5
+
+# tty
+mknod -m 0600 /dev/tty c 5 0
+mknod -m 0600 /dev/tty0 c 4 0
+mknod -m 0600 /dev/tty1 c 4 1
+mknod -m 0600 /dev/tty2 c 4 2
+mknod -m 0600 /dev/tty3 c 4 3
+mknod -m 0600 /dev/tty4 c 4 4
+mknod -m 0600 /dev/tty5 c 4 5
+mknod -m 0600 /dev/tty6 c 4 6
+mknod -m 0600 /dev/tty7 c 4 7
+mknod -m 0600 /dev/tty8 c 4 8
+mknod -m 0600 /dev/tty9 c 4 9
+
+mkdir -m 0755 /dev/pts
+mknod -m 0666 /dev/ptmx c 5 2
+
+# random
+
+mknod -m 0644 /dev/random c 1 8
+mknod -m 0644 /dev/urandom c 1 9
+
+mknod -m 0660 /dev/hda b 3 0
+mknod -m 0660 /dev/hda1 b 3 1
+mknod -m 0660 /dev/hda2 b 3 2
+mknod -m 0660 /dev/hda3 b 3 3
+
+#mknod -m 0660 /dev/sda b 8 0
+#mknod -m 0660 /dev/sda1 b 8 1
+#mknod -m 0660 /dev/sda2 b 8 2
+#mknod -m 0660 /dev/sda3 b 8 3
+
+echo "dev"
+cd /dev; echo *
+
+mkfs.ext2 /dev/hda1
+mkswap /dev/hda2
+
+## Probe for CD device which contains our CD here and mount /nix and
+## /nixpkgs from it inside the ramdisk. Anaconda uses kudzu for this.
+## Find out how Knoppix and SUSE do this...
-- 
GitLab


From 2ed7eb698bf0e608a025d28740ccee60a6d4bd0b Mon Sep 17 00:00:00 2001
From: Armijn Hemel <armijn@gpl-violations.org>
Date: Fri, 5 Aug 2005 22:07:34 +0000
Subject: [PATCH 0047/5331] invoke install-disk (untested)

svn path=/nixu/trunk/; revision=3534
---
 init/prepare-disk.sh | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/init/prepare-disk.sh b/init/prepare-disk.sh
index 3e0c845de83..8ba9e93ddfc 100755
--- a/init/prepare-disk.sh
+++ b/init/prepare-disk.sh
@@ -66,3 +66,5 @@ mkswap /dev/hda2
 ## Probe for CD device which contains our CD here and mount /nix and
 ## /nixpkgs from it inside the ramdisk. Anaconda uses kudzu for this.
 ## Find out how Knoppix and SUSE do this...
+
+$(./install-disk.sh)
-- 
GitLab


From 592b736d33baab9c33c58199005a0b17fc8bd6f5 Mon Sep 17 00:00:00 2001
From: Armijn Hemel <armijn@gpl-violations.org>
Date: Tue, 9 Aug 2005 16:51:26 +0000
Subject: [PATCH 0048/5331] add modutils, start with code that will find the
 right CD player our install CD is in.

svn path=/nixu/trunk/; revision=3540
---
 boot/default.nix | 4 ++--
 fill-disk.sh     | 4 ++++
 init/default.nix | 4 ++--
 make-disk.sh     | 7 +++++++
 pkgs.nix         | 6 +++---
 5 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/boot/default.nix b/boot/default.nix
index 52a7fd1d028..97313b94e83 100644
--- a/boot/default.nix
+++ b/boot/default.nix
@@ -1,7 +1,7 @@
 { stdenv, kernel, bash, coreutils, findutils, utillinux, sysvinit, e2fsprogs
 , nettools, nix, subversion, gcc, wget, which, vim, less, screen, openssh
 , binutils, strace, shadowutils, iputils, gnumake, curl, gnused, gnugrep
-, gnutar, gzip, mingetty, grub, parted}:
+, gnutar, gzip, mingetty, grub, parted, modutils}:
 
 derivation {
   name = "boot";
@@ -14,5 +14,5 @@ derivation {
   inherit stdenv kernel bash coreutils findutils utillinux sysvinit
           e2fsprogs nettools nix subversion gcc wget which vim less screen
           openssh binutils strace shadowutils iputils gnumake curl gnused
-          gnutar gnugrep gzip mingetty grub parted;
+          gnutar gnugrep gzip mingetty grub parted modutils;
 }
diff --git a/fill-disk.sh b/fill-disk.sh
index c6717945815..2e5d7e90018 100755
--- a/fill-disk.sh
+++ b/fill-disk.sh
@@ -4,6 +4,7 @@ export PATH=@bash@/bin:@coreutils@/bin:@findutils@/bin:@utillinux@/bin:@utillinu
 
 sysvinitPath=@sysvinitPath@
 bootPath=@bootPath@
+modutils=@modutils@
 
 mount -t proc proc /proc
 mount -t sysfs sys /sys
@@ -150,6 +151,8 @@ cat /proc/mounts
 ## /nixpkgs from it inside the ramdisk. Anaconda uses kudzu for this.
 ## Find out how Knoppix and SUSE do this...
 
+cat /proc/ide/hd*/driver
+
 export NIX_DATA_DIR=$root/nix/share
 export NIX_LOG_DIR=$root/nix/log/nix
 export NIX_STATE_DIR=$root/nix/var/nix
@@ -236,3 +239,4 @@ echo "192.168.150.1 uml" >> $root/etc/hosts
 ###
 ### Do funky stuff with grub here.
 ###
+
diff --git a/init/default.nix b/init/default.nix
index 9657101ac03..9c7a468efe1 100644
--- a/init/default.nix
+++ b/init/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, bash, coreutils, utillinux, e2fsprogs, nix, shadowutils, mingetty, grub, parted}:
+{ stdenv, bash, coreutils, utillinux, e2fsprogs, nix, shadowutils, mingetty, grub, parted, modutils}:
 
 derivation {
   name = "init";
@@ -7,5 +7,5 @@ derivation {
   stage1 = ./prepare-disk.sh;
   stage2 = ./install-disk.sh;
   inherit stdenv bash coreutils utillinux e2fsprogs nix shadowutils
-          mingetty grub parted;
+          mingetty grub parted modutils;
 }
diff --git a/make-disk.sh b/make-disk.sh
index 9d4bb589e37..4a87ffed629 100755
--- a/make-disk.sh
+++ b/make-disk.sh
@@ -46,12 +46,14 @@ echo $($NIX_CMD_PATH/nix-store -qR $(nix-store -r $(echo '(import ./pkgs.nix).ni
 utilLinux=$($NIX_CMD_PATH/nix-store -qR $(nix-store -r $(echo '(import ./pkgs.nix).utillinux' | $NIX_CMD_PATH/nix-instantiate -)))
 coreUtils=$($NIX_CMD_PATH/nix-store -qR $(nix-store -r $(echo '(import ./pkgs.nix).coreutils' | $NIX_CMD_PATH/nix-instantiate -)))
 e2fsProgs=$($NIX_CMD_PATH/nix-store -qR $(nix-store -r $(echo '(import ./pkgs.nix).e2fsprogs' | $NIX_CMD_PATH/nix-instantiate -)))
+modUtils=$($NIX_CMD_PATH/nix-store -qR $(nix-store -r $(echo '(import ./pkgs.nix).modutils' | $NIX_CMD_PATH/nix-instantiate -)))
 
 bash=$($NIX_CMD_PATH/nix-store -q $(echo '(import ./pkgs.nix).bash' | $NIX_CMD_PATH/nix-instantiate -))
 coreutils=$($NIX_CMD_PATH/nix-store -q $(echo '(import ./pkgs.nix).coreutils' | $NIX_CMD_PATH/nix-instantiate -))
 findutils=$($NIX_CMD_PATH/nix-store -q $(echo '(import ./pkgs.nix).findutils' | $NIX_CMD_PATH/nix-instantiate -))
 utillinux=$($NIX_CMD_PATH/nix-store -q $(echo '(import ./pkgs.nix).utillinux' | $NIX_CMD_PATH/nix-instantiate -))
 e2fsprogs=$($NIX_CMD_PATH/nix-store -q $(echo '(import ./pkgs.nix).e2fsprogs' | $NIX_CMD_PATH/nix-instantiate -))
+modutils=$($NIX_CMD_PATH/nix-store -q $(echo '(import ./pkgs.nix).modutils' | $NIX_CMD_PATH/nix-instantiate -))
 
 (while read storepath; do
    cp -fa --parents ${storepath} ${archivesDir}
@@ -76,6 +78,7 @@ mkdir ${initdir}/bin
 mkdir ${initdir}/dev
 mkdir ${initdir}/etc
 mkdir ${initdir}/installimage
+mkdir ${initdir}/modules
 mkdir ${initdir}/proc
 mkdir ${initdir}/sbin
 mkdir ${initdir}/sys
@@ -108,6 +111,7 @@ sed -e "s^@sysvinitPath\@^$sysvinitPath^g" \
     -e "s^@coreutils\@^$coreutils^g" \
     -e "s^@utillinux\@^$utillinux^g" \
     -e "s^@e2fsprogs\@^$e2fsprogs^g" \
+    -e "s^@modutils\@^$modutils^g" \
     < $fill_disk > $fill_disk.tmp
 mv $fill_disk.tmp $fill_disk
 
@@ -140,6 +144,7 @@ cp -fau --parents ${bashdeps} ${initdir}
 cp -fau --parents ${utilLinux} ${initdir}
 cp -fau --parents ${coreUtils} ${initdir}
 cp -fau --parents ${e2fsProgs} ${initdir}
+cp -fau --parents ${modUtils} ${initdir}
 
 (cd ${initdir}; find . |cpio -c -o) | gzip -9 > ${initrd}
 #(cd ${archivesDir}/initdir; find . |cpio -c -o) | gzip -9 > ${initrd}
@@ -151,3 +156,5 @@ echo creating ISO image
 mkisofs -rJ -o ${bootiso} -b isolinux/isolinux.bin -c isolinux/boot.cat \
                 -no-emul-boot -boot-load-size 4 -boot-info-table \
                 ${archivesDir}
+
+echo ${kernel}
diff --git a/pkgs.nix b/pkgs.nix
index 23573c7aedb..6fae9f65ca3 100644
--- a/pkgs.nix
+++ b/pkgs.nix
@@ -3,15 +3,15 @@ rec {
     stdenv kernel bash coreutils findutils utillinux sysvinit e2fsprogs
     nettools nix subversion gcc wget which vim less screen openssh binutils
     strace shadowutils iputils gnumake curl gnused gnutar gnugrep gzip
-    mingetty grub syslinux parted;
+    mingetty grub syslinux parted modutils;
 
   boot = (import ./boot) {inherit stdenv kernel bash coreutils findutils
     utillinux sysvinit e2fsprogs nettools nix subversion gcc wget which vim
     less screen openssh binutils strace shadowutils iputils gnumake curl
-    gnused gnutar gnugrep gzip mingetty grub parted;};
+    gnused gnutar gnugrep gzip mingetty grub parted modutils;};
 
   init = (import ./init) {inherit stdenv bash coreutils 
-    utillinux e2fsprogs nix shadowutils mingetty grub parted;};
+    utillinux e2fsprogs nix shadowutils mingetty grub parted modutils;};
 
   everything = [boot init sysvinit kernel];
 }
-- 
GitLab


From 8aaf4e9a752a276d57186cf9fc34ea8d70214980 Mon Sep 17 00:00:00 2001
From: Armijn Hemel <armijn@gpl-violations.org>
Date: Thu, 11 Aug 2005 14:06:04 +0000
Subject: [PATCH 0049/5331] touch a file "NIXOS" so we can more easily find the
 NixOS install CD

svn path=/nixu/trunk/; revision=3546
---
 make-disk.sh | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/make-disk.sh b/make-disk.sh
index 4a87ffed629..70698a30b9e 100755
--- a/make-disk.sh
+++ b/make-disk.sh
@@ -146,6 +146,8 @@ cp -fau --parents ${coreUtils} ${initdir}
 cp -fau --parents ${e2fsProgs} ${initdir}
 cp -fau --parents ${modUtils} ${initdir}
 
+touch ${initdir}/NIXOS
+
 (cd ${initdir}; find . |cpio -c -o) | gzip -9 > ${initrd}
 #(cd ${archivesDir}/initdir; find . |cpio -c -o) | gzip -9 > ${initrd}
 
-- 
GitLab


From edbd58ca43f55a8b431a9fa51c7c539684e32a04 Mon Sep 17 00:00:00 2001
From: Armijn Hemel <armijn@gpl-violations.org>
Date: Fri, 12 Aug 2005 16:26:51 +0000
Subject: [PATCH 0050/5331] search for NixOS CD, mount it, copy packages onto
 the target disk for real now. Only IDE drives supported so far.

svn path=/nixu/trunk/; revision=3559
---
 fill-disk.sh | 61 ++++++++++++++++++++++++++++++++++++++++++----------
 make-disk.sh |  1 +
 2 files changed, 51 insertions(+), 11 deletions(-)

diff --git a/fill-disk.sh b/fill-disk.sh
index 2e5d7e90018..6d66b7fb638 100755
--- a/fill-disk.sh
+++ b/fill-disk.sh
@@ -53,6 +53,21 @@ mknod -m 0660 /dev/hda1 b 3 1
 mknod -m 0660 /dev/hda2 b 3 2
 mknod -m 0660 /dev/hda3 b 3 3
 
+mknod -m 0660 /dev/hdb b 3 64
+mknod -m 0660 /dev/hdb1 b 3 65
+mknod -m 0660 /dev/hdb2 b 3 66
+mknod -m 0660 /dev/hdb3 b 3 67
+
+mknod -m 0660 /dev/hdc b 22 0
+mknod -m 0660 /dev/hdc1 b 22 1
+mknod -m 0660 /dev/hdc2 b 22 2
+mknod -m 0660 /dev/hdc3 b 22 3
+
+mknod -m 0660 /dev/hdd b 22 64
+mknod -m 0660 /dev/hdd1 b 22 65
+mknod -m 0660 /dev/hdd2 b 22 66
+mknod -m 0660 /dev/hdd3 b 22 67
+
 #mknod -m 0660 /dev/sda b 8 0
 #mknod -m 0660 /dev/sda1 b 8 1
 #mknod -m 0660 /dev/sda2 b 8 2
@@ -99,13 +114,6 @@ mount -t ext2 $device /tmp/mnt
 
 cd /sys; echo *
 
-# mkdir -p /nix
-# mkdir -p /nixpkgs/trunk/pkgs
-
-# temporary hack
-# mount --bind /mnt/cdrom1/nix /nix
-# mount --bind /mnt/cdrom1/pkgs /nixpkgs/trunk/pkgs
-
 ##
 ## Create a directory tree on the installation disk.
 ##
@@ -151,7 +159,38 @@ cat /proc/mounts
 ## /nixpkgs from it inside the ramdisk. Anaconda uses kudzu for this.
 ## Find out how Knoppix and SUSE do this...
 
-cat /proc/ide/hd*/driver
+#devices=$(grep -r cdrom hd* | cut -d '/' -f 1 | sort | uniq)
+#echo devices ${devices}
+
+DEVICES="/dev/hd?"
+
+echo devices ${DEVICES}
+
+for i in ${DEVICES}
+do
+echo "Looking for CDROM in: $i"
+if mount -t iso9660 $i /cdrom >/dev/null 2>&1
+then
+  echo "cdrom contents"
+  ls /cdrom
+  if test -f /cdrom/NIXOS
+  then
+    cddevice=$i
+    echo "Accessing NixOS CDROM at $i"
+  break
+fi
+#umount /cdrom
+fi
+done
+
+echo cddevice ${cddevice}
+
+#echo path $PATH
+ls -l @coreutils@/bin/l*
+#rm -rf /nix
+ln -s /cdrom/nixpkgs /nixpkgs
+mount --bind /cdrom/nix /nix
+
 
 export NIX_DATA_DIR=$root/nix/share
 export NIX_LOG_DIR=$root/nix/log/nix
@@ -167,10 +206,10 @@ echo verifying Nix DB...
 $NIX_CMD_PATH/nix-store --verify
 
 echo copying nixpkgs...
-cp -fa ../pkgs $root/nixpkgs/trunk
+cp -fa /nixpkgs $root/nixpkgs/trunk
 
 make_dir 0755 /tmp/scripts
-cp -fa ../scripts $root/tmp
+cp -fa /cdrom/scripts $root/tmp
 
 #echo adding manifest
 #$NIX_CMD_PATH/nix-pull $manifest
@@ -194,7 +233,7 @@ echo copying store
 
 (while read storepaths; do
   cp -fa $storepaths $root/nix/store
-done) < /mnt/cdrom1/mystorepaths
+done) < /cdrom/mystorepaths
 
 #cp -fa ../nix/store/* $root/nix/store
 
diff --git a/make-disk.sh b/make-disk.sh
index 70698a30b9e..c02fb7778d3 100755
--- a/make-disk.sh
+++ b/make-disk.sh
@@ -75,6 +75,7 @@ echo creating directories for bootimage
 
 mkdir ${initdir}
 mkdir ${initdir}/bin
+mkdir ${initdir}/cdrom
 mkdir ${initdir}/dev
 mkdir ${initdir}/etc
 mkdir ${initdir}/installimage
-- 
GitLab


From a866ceef3e9ecc65c93af49b43b7235d842ae3e0 Mon Sep 17 00:00:00 2001
From: Armijn Hemel <armijn@gpl-violations.org>
Date: Fri, 12 Aug 2005 23:40:12 +0000
Subject: [PATCH 0051/5331] add grub to the path

svn path=/nixu/trunk/; revision=3564
---
 fill-disk.sh | 6 ++----
 make-disk.sh | 2 ++
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/fill-disk.sh b/fill-disk.sh
index 6d66b7fb638..7e86434a78e 100755
--- a/fill-disk.sh
+++ b/fill-disk.sh
@@ -1,6 +1,6 @@
 #! @bash@/bin/sh -e
 
-export PATH=@bash@/bin:@coreutils@/bin:@findutils@/bin:@utillinux@/bin:@utillinux@/sbin:@e2fsprogs@/sbin
+export PATH=@bash@/bin:@coreutils@/bin:@findutils@/bin:@utillinux@/bin:@utillinux@/sbin:@e2fsprogs@/sbin:@grub@/sbin
 
 sysvinitPath=@sysvinitPath@
 bootPath=@bootPath@
@@ -252,8 +252,6 @@ done) < /cdrom/mystorepaths
 #    $NIX_CMD_PATH/nix-store --successor $line
 #done) < /tmp/mysuccessors
 
-exit
-
 echo setting init symlink...
 rm -f $root/init
 ln -s $sysvinitPath/sbin/init $root/init
@@ -270,7 +268,7 @@ echo setting up networking information...
 make_dir 00755 /etc/networking
 echo 192.168.150.1 > $root/etc/networking/local-ip
 echo 192.168.150.3 > $root/etc/networking/gateway-ip
-cp /etc/resolv.conf $root/etc
+#cp /etc/resolv.conf $root/etc
 rm -f $root/etc/hosts
 echo "127.0.0.1 localhost" >> $root/etc/hosts
 echo "192.168.150.1 uml" >> $root/etc/hosts
diff --git a/make-disk.sh b/make-disk.sh
index c02fb7778d3..0b7e31ab89d 100755
--- a/make-disk.sh
+++ b/make-disk.sh
@@ -54,6 +54,7 @@ findutils=$($NIX_CMD_PATH/nix-store -q $(echo '(import ./pkgs.nix).findutils' |
 utillinux=$($NIX_CMD_PATH/nix-store -q $(echo '(import ./pkgs.nix).utillinux' | $NIX_CMD_PATH/nix-instantiate -))
 e2fsprogs=$($NIX_CMD_PATH/nix-store -q $(echo '(import ./pkgs.nix).e2fsprogs' | $NIX_CMD_PATH/nix-instantiate -))
 modutils=$($NIX_CMD_PATH/nix-store -q $(echo '(import ./pkgs.nix).modutils' | $NIX_CMD_PATH/nix-instantiate -))
+grub=$($NIX_CMD_PATH/nix-store -q $(echo '(import ./pkgs.nix).grub' | $NIX_CMD_PATH/nix-instantiate -))
 
 (while read storepath; do
    cp -fa --parents ${storepath} ${archivesDir}
@@ -113,6 +114,7 @@ sed -e "s^@sysvinitPath\@^$sysvinitPath^g" \
     -e "s^@utillinux\@^$utillinux^g" \
     -e "s^@e2fsprogs\@^$e2fsprogs^g" \
     -e "s^@modutils\@^$modutils^g" \
+    -e "s^@grub\@^$grub^g" \
     < $fill_disk > $fill_disk.tmp
 mv $fill_disk.tmp $fill_disk
 
-- 
GitLab


From 655ef5ac38e051f260fa0e8ba56a70418e4cff03 Mon Sep 17 00:00:00 2001
From: Armijn Hemel <armijn@gpl-violations.org>
Date: Fri, 12 Aug 2005 23:41:57 +0000
Subject: [PATCH 0052/5331] actually build grub too

svn path=/nixu/trunk/; revision=3565
---
 make-disk.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/make-disk.sh b/make-disk.sh
index 0b7e31ab89d..73919434889 100755
--- a/make-disk.sh
+++ b/make-disk.sh
@@ -54,7 +54,7 @@ findutils=$($NIX_CMD_PATH/nix-store -q $(echo '(import ./pkgs.nix).findutils' |
 utillinux=$($NIX_CMD_PATH/nix-store -q $(echo '(import ./pkgs.nix).utillinux' | $NIX_CMD_PATH/nix-instantiate -))
 e2fsprogs=$($NIX_CMD_PATH/nix-store -q $(echo '(import ./pkgs.nix).e2fsprogs' | $NIX_CMD_PATH/nix-instantiate -))
 modutils=$($NIX_CMD_PATH/nix-store -q $(echo '(import ./pkgs.nix).modutils' | $NIX_CMD_PATH/nix-instantiate -))
-grub=$($NIX_CMD_PATH/nix-store -q $(echo '(import ./pkgs.nix).grub' | $NIX_CMD_PATH/nix-instantiate -))
+grub=$($NIX_CMD_PATH/nix-store -r $(echo '(import ./pkgs.nix).grub' | $NIX_CMD_PATH/nix-instantiate -))
 
 (while read storepath; do
    cp -fa --parents ${storepath} ${archivesDir}
-- 
GitLab


From fdab68ff43dbf2eae0d91cba41ba4751f075c0e5 Mon Sep 17 00:00:00 2001
From: Armijn Hemel <armijn@gpl-violations.org>
Date: Fri, 12 Aug 2005 23:51:12 +0000
Subject: [PATCH 0053/5331] make a /boot directory on the targetdrive

svn path=/nixu/trunk/; revision=3566
---
 fill-disk.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/fill-disk.sh b/fill-disk.sh
index 7e86434a78e..ec1533ee4b9 100755
--- a/fill-disk.sh
+++ b/fill-disk.sh
@@ -119,6 +119,7 @@ cd /sys; echo *
 ##
 
 make_dir 00755 /bin
+make_dir 00755 /boot
 make_dir 00755 /dev
 make_dir 00755 /proc
 make_dir 01777 /tmp
-- 
GitLab


From c7bd0ec47368335d522d5ff122cfa1afee6a0ceb Mon Sep 17 00:00:00 2001
From: Armijn Hemel <armijn@gpl-violations.org>
Date: Sun, 14 Aug 2005 01:40:36 +0000
Subject: [PATCH 0054/5331] get grub right, also copy all the packages needed
 for a nice booting system

svn path=/nixu/trunk/; revision=3575
---
 boot/default.nix |  4 ++--
 fill-disk.sh     | 51 ++++++++++++++++++++++++++++++------------------
 init/default.nix |  4 ++--
 make-disk.sh     | 32 +++++++++++++++++++++++-------
 pkgs.nix         |  6 +++---
 5 files changed, 64 insertions(+), 33 deletions(-)

diff --git a/boot/default.nix b/boot/default.nix
index 97313b94e83..3724660ae22 100644
--- a/boot/default.nix
+++ b/boot/default.nix
@@ -1,7 +1,7 @@
 { stdenv, kernel, bash, coreutils, findutils, utillinux, sysvinit, e2fsprogs
 , nettools, nix, subversion, gcc, wget, which, vim, less, screen, openssh
 , binutils, strace, shadowutils, iputils, gnumake, curl, gnused, gnugrep
-, gnutar, gzip, mingetty, grub, parted, modutils}:
+, gnutar, gzip, mingetty, grubWrapper, parted, modutils}:
 
 derivation {
   name = "boot";
@@ -14,5 +14,5 @@ derivation {
   inherit stdenv kernel bash coreutils findutils utillinux sysvinit
           e2fsprogs nettools nix subversion gcc wget which vim less screen
           openssh binutils strace shadowutils iputils gnumake curl gnused
-          gnutar gnugrep gzip mingetty grub parted modutils;
+          gnutar gnugrep gzip mingetty grubWrapper parted modutils;
 }
diff --git a/fill-disk.sh b/fill-disk.sh
index ec1533ee4b9..7d1ce76d31b 100755
--- a/fill-disk.sh
+++ b/fill-disk.sh
@@ -1,6 +1,8 @@
 #! @bash@/bin/sh -e
 
-export PATH=@bash@/bin:@coreutils@/bin:@findutils@/bin:@utillinux@/bin:@utillinux@/sbin:@e2fsprogs@/sbin:@grub@/sbin
+export PATH=@bash@/bin:@coreutils@/bin:@findutils@/bin:@utillinux@/bin:@utillinux@/sbin:@e2fsprogs@/sbin:@grub@/sbin:@sysvinitPath@/sbin
+
+kernel=@kernel@
 
 sysvinitPath=@sysvinitPath@
 bootPath=@bootPath@
@@ -9,8 +11,6 @@ modutils=@modutils@
 mount -t proc proc /proc
 mount -t sysfs sys /sys
 
-#mount -t /dev/hdc /installimage
-
 # make a complete /dev filesystem
 # ripped permissions and everything from anaconda (loader2/devices.h)
 
@@ -73,11 +73,15 @@ mknod -m 0660 /dev/hdd3 b 22 67
 #mknod -m 0660 /dev/sda2 b 8 2
 #mknod -m 0660 /dev/sda3 b 8 3
 
+mknod -m 0600 /dev/initctl p
+
 echo "dev"
 cd /dev; echo *
 
-mkfs.ext2 /dev/hda1
-mkswap /dev/hda2
+targetdrive=/dev/hda
+device=${targetdrive}1
+mkfs.ext2 ${device}
+mkswap ${targetdrive}2
 
 
 #if ! test -n "$1"
@@ -88,9 +92,6 @@ mkswap /dev/hda2
 #    device=$1
 #fi
 
-device=/dev/hda1
-#device=/dev/sda1
-
 
 make_dir() {
     mode=$1
@@ -121,11 +122,12 @@ cd /sys; echo *
 make_dir 00755 /bin
 make_dir 00755 /boot
 make_dir 00755 /dev
-make_dir 00755 /proc
-make_dir 01777 /tmp
 make_dir 00755 /etc # global non-constant configuration
 make_dir 00755 /etc-secret
-make_dir 00755 /var
+make_dir 00755 /home
+make_dir 00755 /home/root
+make_dir 00755 /mnt
+make_dir 00755 /mnt/host
 make_dir 00755 /nix
 make_dir 00755 /nix/store
 make_dir 00755 /nix/var
@@ -136,16 +138,18 @@ make_dir 00755 /nix/var/log
 make_dir 00755 /nix/var/log/nix
 make_dir 00755 /nixpkgs
 make_dir 00755 /nixpkgs/trunk
-make_dir 00755 /mnt
-make_dir 00755 /mnt/host
-make_dir 00755 /home
-make_dir 00755 /home/root
+make_dir 00755 /proc
+make_dir 00755 /sbin
+make_dir 01777 /tmp
+make_dir 00755 /usr
+make_dir 00755 /var
 
 ##
 ## Add a few devices to /dev on the install disk. This is by far complete.
 ##
 
 mknod $root/dev/null c 1 3
+mknod -m 0600 $root/dev/console c 5 1
 
 touch_file /etc/passwd
 touch_file /etc/shadow
@@ -232,11 +236,11 @@ unset NIX_CONF_DIR
 
 echo copying store
 
-(while read storepaths; do
-  cp -fa $storepaths $root/nix/store
-done) < /cdrom/mystorepaths
+#(while read storepaths; do
+  #cp -fa $storepaths $root/nix/store
+#done) < /cdrom/mystorepaths
 
-#cp -fa ../nix/store/* $root/nix/store
+cp -fa /nix/store/* $root/nix/store
 
 #echo registering valid paths...
 #(while read storepath; do
@@ -274,7 +278,16 @@ rm -f $root/etc/hosts
 echo "127.0.0.1 localhost" >> $root/etc/hosts
 echo "192.168.150.1 uml" >> $root/etc/hosts
 
+
 ###
 ### Do funky stuff with grub here.
 ###
 
+ln -s @kernel@/vmlinuz /tmp/mnt/boot/vmlinuz
+ln -s @sysvinitPath@/sbin/init /tmp/mnt/sbin/init
+
+grub-install --root-directory=/tmp/mnt --no-floppy ${targetdrive}
+
+echo install done
+telinit 0
+
diff --git a/init/default.nix b/init/default.nix
index 9c7a468efe1..fae29176468 100644
--- a/init/default.nix
+++ b/init/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, bash, coreutils, utillinux, e2fsprogs, nix, shadowutils, mingetty, grub, parted, modutils}:
+{ stdenv, bash, coreutils, utillinux, e2fsprogs, nix, shadowutils, mingetty, grubWrapper, parted, modutils}:
 
 derivation {
   name = "init";
@@ -7,5 +7,5 @@ derivation {
   stage1 = ./prepare-disk.sh;
   stage2 = ./install-disk.sh;
   inherit stdenv bash coreutils utillinux e2fsprogs nix shadowutils
-          mingetty grub parted modutils;
+          mingetty grubWrapper parted modutils;
 }
diff --git a/make-disk.sh b/make-disk.sh
index 73919434889..432585cf871 100755
--- a/make-disk.sh
+++ b/make-disk.sh
@@ -25,10 +25,10 @@ storeExpr=$(echo '(import ./pkgs.nix).everything' | $NIX_CMD_PATH/nix-instantiat
 #$NIX_CMD_PATH/nix-push --copy $archivesDir $manifest $(nix-store -r $storeExpr) $(nix-store -r $(echo '(import ./pkgs.nix).kernel' | $NIX_CMD_PATH/nix-instantiate -))
 
 # Location of sysvinit?
-sysvinitPath=$($NIX_CMD_PATH/nix-store -q $(echo '(import ./pkgs.nix).sysvinit' | $NIX_CMD_PATH/nix-instantiate -))
+sysvinitPath=$($NIX_CMD_PATH/nix-store -r $(echo '(import ./pkgs.nix).sysvinit' | $NIX_CMD_PATH/nix-instantiate -))
 
 # Location of Nix boot scripts?
-bootPath=$($NIX_CMD_PATH/nix-store -q $(echo '(import ./pkgs.nix).boot' | $NIX_CMD_PATH/nix-instantiate -))
+bootPath=$($NIX_CMD_PATH/nix-store -r $(echo '(import ./pkgs.nix).boot' | $NIX_CMD_PATH/nix-instantiate -))
 
 nix=$($NIX_CMD_PATH/nix-store -q $(echo '(import ./pkgs.nix).nix' | $NIX_CMD_PATH/nix-instantiate -))
 
@@ -47,6 +47,12 @@ utilLinux=$($NIX_CMD_PATH/nix-store -qR $(nix-store -r $(echo '(import ./pkgs.ni
 coreUtils=$($NIX_CMD_PATH/nix-store -qR $(nix-store -r $(echo '(import ./pkgs.nix).coreutils' | $NIX_CMD_PATH/nix-instantiate -)))
 e2fsProgs=$($NIX_CMD_PATH/nix-store -qR $(nix-store -r $(echo '(import ./pkgs.nix).e2fsprogs' | $NIX_CMD_PATH/nix-instantiate -)))
 modUtils=$($NIX_CMD_PATH/nix-store -qR $(nix-store -r $(echo '(import ./pkgs.nix).modutils' | $NIX_CMD_PATH/nix-instantiate -)))
+Grub=$($NIX_CMD_PATH/nix-store -qR $(nix-store -r $(echo '(import ./pkgs.nix).grubWrapper' | $NIX_CMD_PATH/nix-instantiate -)))
+#gnuSed=$($NIX_CMD_PATH/nix-store -qR $(nix-store -r $(echo '(import ./pkgs.nix).gnused' | $NIX_CMD_PATH/nix-instantiate -)))
+#gnuGrep=$($NIX_CMD_PATH/nix-store -qR $(nix-store -r $(echo '(import ./pkgs.nix).gnugrep' | $NIX_CMD_PATH/nix-instantiate -)))
+Kernel=$($NIX_CMD_PATH/nix-store -qR $(nix-store -r $(echo '(import ./pkgs.nix).kernel' | $NIX_CMD_PATH/nix-instantiate -)))
+SysVinit=$($NIX_CMD_PATH/nix-store -qR $(nix-store -r $(echo '(import ./pkgs.nix).sysvinit' | $NIX_CMD_PATH/nix-instantiate -)))
+BootPath=$($NIX_CMD_PATH/nix-store -qR $(nix-store -r $(echo '(import ./pkgs.nix).boot' | $NIX_CMD_PATH/nix-instantiate -)))
 
 bash=$($NIX_CMD_PATH/nix-store -q $(echo '(import ./pkgs.nix).bash' | $NIX_CMD_PATH/nix-instantiate -))
 coreutils=$($NIX_CMD_PATH/nix-store -q $(echo '(import ./pkgs.nix).coreutils' | $NIX_CMD_PATH/nix-instantiate -))
@@ -54,7 +60,9 @@ findutils=$($NIX_CMD_PATH/nix-store -q $(echo '(import ./pkgs.nix).findutils' |
 utillinux=$($NIX_CMD_PATH/nix-store -q $(echo '(import ./pkgs.nix).utillinux' | $NIX_CMD_PATH/nix-instantiate -))
 e2fsprogs=$($NIX_CMD_PATH/nix-store -q $(echo '(import ./pkgs.nix).e2fsprogs' | $NIX_CMD_PATH/nix-instantiate -))
 modutils=$($NIX_CMD_PATH/nix-store -q $(echo '(import ./pkgs.nix).modutils' | $NIX_CMD_PATH/nix-instantiate -))
-grub=$($NIX_CMD_PATH/nix-store -r $(echo '(import ./pkgs.nix).grub' | $NIX_CMD_PATH/nix-instantiate -))
+grub=$($NIX_CMD_PATH/nix-store -r $(echo '(import ./pkgs.nix).grubWrapper' | $NIX_CMD_PATH/nix-instantiate -))
+#gnused=$($NIX_CMD_PATH/nix-store -r $(echo '(import ./pkgs.nix).gnused' | $NIX_CMD_PATH/nix-instantiate -))
+#gnugrep=$($NIX_CMD_PATH/nix-store -r $(echo '(import ./pkgs.nix).gnugrep' | $NIX_CMD_PATH/nix-instantiate -))
 
 (while read storepath; do
    cp -fa --parents ${storepath} ${archivesDir}
@@ -95,9 +103,16 @@ cp -fa ${nixpkgs} ${archivesDir}
 
 echo copying packges from store
 
+echo GRUB ${Grub}
+
 #cp -fa --parents ${nixDeps} ${archivesDir}
 cp -fau --parents ${utilLinux} ${archivesDir}
-#cp -fau --parents ${kernel} ${archivesDir}
+cp -fau --parents ${Grub} ${archivesDir}
+#cp -fau --parents ${gnuSed} ${archivesDir}
+#cp -fau --parents ${gnuGrep} ${archivesDir}
+cp -fau --parents ${Kernel} ${archivesDir}
+cp -fau --parents ${SysVinit} ${archivesDir}
+cp -fau --parents ${BootPath} ${archivesDir}
 
 bashdeps=$($NIX_CMD_PATH/nix-store -qR $(nix-store -r $(echo '(import ./pkgs.nix).bash' | $NIX_CMD_PATH/nix-instantiate -)))
 
@@ -115,6 +130,7 @@ sed -e "s^@sysvinitPath\@^$sysvinitPath^g" \
     -e "s^@e2fsprogs\@^$e2fsprogs^g" \
     -e "s^@modutils\@^$modutils^g" \
     -e "s^@grub\@^$grub^g" \
+    -e "s^@kernel\@^$kernel^g" \
     < $fill_disk > $fill_disk.tmp
 mv $fill_disk.tmp $fill_disk
 
@@ -141,7 +157,7 @@ echo creating ramdisk
 
 rm -f ${initrd}
 cp ${archivesDir}/scripts/fill-disk.sh ${initdir}/init
-cp ${bash}/bin/* ${initdir}/bin
+ln -s ${bash}/bin/bash ${initdir}/bin/sh
 chmod u+x ${initdir}/init
 cp -fau --parents ${bashdeps} ${initdir}
 cp -fau --parents ${utilLinux} ${initdir}
@@ -152,7 +168,6 @@ cp -fau --parents ${modUtils} ${initdir}
 touch ${initdir}/NIXOS
 
 (cd ${initdir}; find . |cpio -c -o) | gzip -9 > ${initrd}
-#(cd ${archivesDir}/initdir; find . |cpio -c -o) | gzip -9 > ${initrd}
 
 cp ${initrd} ${archivesDir}/isolinux
 
@@ -162,4 +177,7 @@ mkisofs -rJ -o ${bootiso} -b isolinux/isolinux.bin -c isolinux/boot.cat \
                 -no-emul-boot -boot-load-size 4 -boot-info-table \
                 ${archivesDir}
 
-echo ${kernel}
+# cleanup, be diskspace friendly
+rm -f ${initrd}
+chmod -f -R +w ${archivesDir}/*
+rm -rf ${archivesDir}/*
diff --git a/pkgs.nix b/pkgs.nix
index 6fae9f65ca3..b530a8b00cd 100644
--- a/pkgs.nix
+++ b/pkgs.nix
@@ -3,15 +3,15 @@ rec {
     stdenv kernel bash coreutils findutils utillinux sysvinit e2fsprogs
     nettools nix subversion gcc wget which vim less screen openssh binutils
     strace shadowutils iputils gnumake curl gnused gnutar gnugrep gzip
-    mingetty grub syslinux parted modutils;
+    mingetty grubWrapper syslinux parted modutils;
 
   boot = (import ./boot) {inherit stdenv kernel bash coreutils findutils
     utillinux sysvinit e2fsprogs nettools nix subversion gcc wget which vim
     less screen openssh binutils strace shadowutils iputils gnumake curl
-    gnused gnutar gnugrep gzip mingetty grub parted modutils;};
+    gnused gnutar gnugrep gzip mingetty grubWrapper parted modutils;};
 
   init = (import ./init) {inherit stdenv bash coreutils 
-    utillinux e2fsprogs nix shadowutils mingetty grub parted modutils;};
+    utillinux e2fsprogs nix shadowutils mingetty grubWrapper parted modutils;};
 
   everything = [boot init sysvinit kernel];
 }
-- 
GitLab


From ea3b3356ba12fe737691fac446f2487f27295978 Mon Sep 17 00:00:00 2001
From: Armijn Hemel <armijn@gpl-violations.org>
Date: Sun, 14 Aug 2005 13:50:29 +0000
Subject: [PATCH 0055/5331] add right devices in /dev NixOS now boots, but
 mounts the filesystem read-only, filesystem is dirty, etc.

svn path=/nixu/trunk/; revision=3579
---
 fill-disk.sh | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/fill-disk.sh b/fill-disk.sh
index 7d1ce76d31b..be9dc847c24 100755
--- a/fill-disk.sh
+++ b/fill-disk.sh
@@ -150,6 +150,9 @@ make_dir 00755 /var
 
 mknod $root/dev/null c 1 3
 mknod -m 0600 $root/dev/console c 5 1
+mknod -m 0600 $root/dev/tty c 5 0
+mknod -m 0600 $root/dev/tty0 c 4 0
+mknod -m 0600 $root/dev/tty1 c 4 1
 
 touch_file /etc/passwd
 touch_file /etc/shadow
@@ -266,7 +269,7 @@ rm -f $root/etc/inittab
 echo "id:2:initdefault:" >> $root/etc/inittab
 echo "si::bootwait:$bootPath/bin/boot.sh" >> $root/etc/inittab
 echo "ht:06:wait:$bootPath/bin/halt.sh" >> $root/etc/inittab
-echo "1:2345:respawn:$bootPath/bin/login.sh /dev/ttys/0" >> $root/etc/inittab
+echo "1:2345:respawn:$bootPath/bin/login.sh /dev/tty1" >> $root/etc/inittab
 #echo "2:2345:respawn:$bootPath/bin/login.sh /dev/ttys/1" >> $root/etc/inittab
 
 echo setting up networking information...
-- 
GitLab


From 08ad69d2dc6ddc545bf40338f39fa739725456d8 Mon Sep 17 00:00:00 2001
From: Armijn Hemel <armijn@gpl-violations.org>
Date: Sun, 14 Aug 2005 14:34:46 +0000
Subject: [PATCH 0056/5331] some cleanups: - umount the filesystem after
 installing (so it's clean) - some hardcoded paths gone -

svn path=/nixu/trunk/; revision=3581
---
 fill-disk.sh | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/fill-disk.sh b/fill-disk.sh
index be9dc847c24..170504b7501 100755
--- a/fill-disk.sh
+++ b/fill-disk.sh
@@ -109,9 +109,9 @@ touch_file() {
 }
 root=/tmp/mnt
 
-mkdir -p /tmp/mnt
+mkdir -p $root
 
-mount -t ext2 $device /tmp/mnt
+mount -t ext2 $device $root
 
 cd /sys; echo *
 
@@ -140,6 +140,7 @@ make_dir 00755 /nixpkgs
 make_dir 00755 /nixpkgs/trunk
 make_dir 00755 /proc
 make_dir 00755 /sbin
+make_dir 00755 /sys
 make_dir 01777 /tmp
 make_dir 00755 /usr
 make_dir 00755 /var
@@ -286,11 +287,16 @@ echo "192.168.150.1 uml" >> $root/etc/hosts
 ### Do funky stuff with grub here.
 ###
 
-ln -s @kernel@/vmlinuz /tmp/mnt/boot/vmlinuz
-ln -s @sysvinitPath@/sbin/init /tmp/mnt/sbin/init
+ln -s @kernel@/vmlinuz $root/boot/vmlinuz
+ln -s @sysvinitPath@/sbin/init $root/sbin/init
 
-grub-install --root-directory=/tmp/mnt --no-floppy ${targetdrive}
+echo installing bootloader
+
+grub-install --root-directory=${root} --no-floppy ${targetdrive}
+
+echo umounting filesystem
+
+umount $root
 
 echo install done
 telinit 0
-
-- 
GitLab


From 597f96352865e4394d7782dd495919526d98a4a9 Mon Sep 17 00:00:00 2001
From: Armijn Hemel <armijn@gpl-violations.org>
Date: Sun, 14 Aug 2005 15:08:15 +0000
Subject: [PATCH 0057/5331] more cleanups - remove some debugging code - add
 better descriptions for a few actions

svn path=/nixu/trunk/; revision=3582
---
 fill-disk.sh | 25 +++++++++++++------------
 make-disk.sh |  2 --
 2 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/fill-disk.sh b/fill-disk.sh
index 170504b7501..f6ecda9d3e0 100755
--- a/fill-disk.sh
+++ b/fill-disk.sh
@@ -8,12 +8,16 @@ sysvinitPath=@sysvinitPath@
 bootPath=@bootPath@
 modutils=@modutils@
 
+echo mounting special filesystems
+
 mount -t proc proc /proc
 mount -t sysfs sys /sys
 
 # make a complete /dev filesystem
 # ripped permissions and everything from anaconda (loader2/devices.h)
 
+echo making device nodes
+
 # consoles
 
 #mknod -m 0600 /dev/console c 5 1
@@ -75,9 +79,6 @@ mknod -m 0660 /dev/hdd3 b 22 67
 
 mknod -m 0600 /dev/initctl p
 
-echo "dev"
-cd /dev; echo *
-
 targetdrive=/dev/hda
 device=${targetdrive}1
 mkfs.ext2 ${device}
@@ -111,14 +112,16 @@ root=/tmp/mnt
 
 mkdir -p $root
 
-mount -t ext2 $device $root
+echo mounting the target drive
 
-cd /sys; echo *
+mount -t ext2 $device $root
 
 ##
 ## Create a directory tree on the installation disk.
 ##
 
+echo creating file system hierarchy on target drive
+
 make_dir 00755 /bin
 make_dir 00755 /boot
 make_dir 00755 /dev
@@ -149,6 +152,8 @@ make_dir 00755 /var
 ## Add a few devices to /dev on the install disk. This is by far complete.
 ##
 
+echo making device nodes on target drive
+
 mknod $root/dev/null c 1 3
 mknod -m 0600 $root/dev/console c 5 1
 mknod -m 0600 $root/dev/tty c 5 0
@@ -162,7 +167,7 @@ touch_file /etc/group
 rm -f $root/etc/mtab
 #ln -s /proc/mounts $root/etc/mtab
 
-cat /proc/mounts
+#cat /proc/mounts
 
 ## Probe for CD device which contains our CD here and mount /nix and
 ## /nixpkgs from it inside the ramdisk. Anaconda uses kudzu for this.
@@ -173,8 +178,6 @@ cat /proc/mounts
 
 DEVICES="/dev/hd?"
 
-echo devices ${DEVICES}
-
 for i in ${DEVICES}
 do
 echo "Looking for CDROM in: $i"
@@ -192,11 +195,8 @@ fi
 fi
 done
 
-echo cddevice ${cddevice}
+echo switch to /nix and /nixpkgs from CD
 
-#echo path $PATH
-ls -l @coreutils@/bin/l*
-#rm -rf /nix
 ln -s /cdrom/nixpkgs /nixpkgs
 mount --bind /cdrom/nix /nix
 
@@ -224,6 +224,7 @@ cp -fa /cdrom/scripts $root/tmp
 #$NIX_CMD_PATH/nix-pull $manifest
 
 echo adding packages
+
 export NIX_ROOT=$root
 unset NIX_DATA_DIR
 unset NIX_LOG_DIR
diff --git a/make-disk.sh b/make-disk.sh
index 432585cf871..b94aac69846 100755
--- a/make-disk.sh
+++ b/make-disk.sh
@@ -103,8 +103,6 @@ cp -fa ${nixpkgs} ${archivesDir}
 
 echo copying packges from store
 
-echo GRUB ${Grub}
-
 #cp -fa --parents ${nixDeps} ${archivesDir}
 cp -fau --parents ${utilLinux} ${archivesDir}
 cp -fau --parents ${Grub} ${archivesDir}
-- 
GitLab


From 2389fc5bef70c5ba95e732f135f2135848cedfd1 Mon Sep 17 00:00:00 2001
From: Armijn Hemel <armijn@gpl-violations.org>
Date: Mon, 15 Aug 2005 17:02:54 +0000
Subject: [PATCH 0058/5331] copy /nixpkgs contents instead of just the link
 (fixes NIXOS-9)

svn path=/nixu/trunk/; revision=3586
---
 fill-disk.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fill-disk.sh b/fill-disk.sh
index f6ecda9d3e0..9b64544bfa3 100755
--- a/fill-disk.sh
+++ b/fill-disk.sh
@@ -215,7 +215,7 @@ echo verifying Nix DB...
 $NIX_CMD_PATH/nix-store --verify
 
 echo copying nixpkgs...
-cp -fa /nixpkgs $root/nixpkgs/trunk
+cp -fLa /nixpkgs $root/nixpkgs/trunk
 
 make_dir 0755 /tmp/scripts
 cp -fa /cdrom/scripts $root/tmp
-- 
GitLab


From e8f7642f096f7d193fdf9f1bad98b0864957c45c Mon Sep 17 00:00:00 2001
From: Armijn Hemel <armijn@gpl-violations.org>
Date: Tue, 16 Aug 2005 18:32:08 +0000
Subject: [PATCH 0059/5331] fix copying bug for real

svn path=/nixu/trunk/; revision=3588
---
 fill-disk.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fill-disk.sh b/fill-disk.sh
index 9b64544bfa3..160822a5597 100755
--- a/fill-disk.sh
+++ b/fill-disk.sh
@@ -215,7 +215,7 @@ echo verifying Nix DB...
 $NIX_CMD_PATH/nix-store --verify
 
 echo copying nixpkgs...
-cp -fLa /nixpkgs $root/nixpkgs/trunk
+cp -fLa /cdrom/pkgs $root/nixpkgs/trunk
 
 make_dir 0755 /tmp/scripts
 cp -fa /cdrom/scripts $root/tmp
-- 
GitLab


From 91b9cabf9bbf7aeb7107932145c401b186fe78c8 Mon Sep 17 00:00:00 2001
From: Armijn Hemel <armijn@gpl-violations.org>
Date: Tue, 16 Aug 2005 18:58:23 +0000
Subject: [PATCH 0060/5331] svn export nixpkgs, don't copy it (gets rid of
 about 34 MB)

svn path=/nixu/trunk/; revision=3589
---
 make-disk.sh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/make-disk.sh b/make-disk.sh
index b94aac69846..6e85a1138ac 100755
--- a/make-disk.sh
+++ b/make-disk.sh
@@ -99,7 +99,8 @@ mkdir ${initdir}/var
 
 echo copying nixpkgs
 
-cp -fa ${nixpkgs} ${archivesDir}
+svn export ${nixpkgs} ${archivesDir}/pkgs
+#cp -fa ${nixpkgs} ${archivesDir}
 
 echo copying packges from store
 
-- 
GitLab


From 38cb12017a7b8c23239539ff538277288201272b Mon Sep 17 00:00:00 2001
From: Armijn Hemel <armijn@gpl-violations.org>
Date: Tue, 16 Aug 2005 21:46:08 +0000
Subject: [PATCH 0061/5331] fix typo, add some more echo statements, minor
 cleanup

svn path=/nixu/trunk/; revision=3591
---
 make-disk.sh | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/make-disk.sh b/make-disk.sh
index 6e85a1138ac..3384e78e742 100755
--- a/make-disk.sh
+++ b/make-disk.sh
@@ -10,10 +10,11 @@ fill_disk=$archivesDir/scripts/fill-disk.sh
 storePaths=$archivesDir/mystorepaths
 validatePaths=$archivesDir/validatepaths
 bootiso=/tmp/nixos.iso
-#initrd=/tmp/initrd.img
 initrd=/tmp/initram.img
 initdir=${archivesDir}/initdir
 
+echo cleaning old build
+
 # keep chmod happy
 touch ${archivesDir}/blah
 chmod -f -R +w ${archivesDir}/*
@@ -102,7 +103,7 @@ echo copying nixpkgs
 svn export ${nixpkgs} ${archivesDir}/pkgs
 #cp -fa ${nixpkgs} ${archivesDir}
 
-echo copying packges from store
+echo copying packages from store
 
 #cp -fa --parents ${nixDeps} ${archivesDir}
 cp -fau --parents ${utilLinux} ${archivesDir}
@@ -177,6 +178,9 @@ mkisofs -rJ -o ${bootiso} -b isolinux/isolinux.bin -c isolinux/boot.cat \
                 ${archivesDir}
 
 # cleanup, be diskspace friendly
+
+echo cleaning up
+
 rm -f ${initrd}
 chmod -f -R +w ${archivesDir}/*
 rm -rf ${archivesDir}/*
-- 
GitLab


From 0b4feb3a6c50bbbb1c119f39e9d44e26cc1a691d Mon Sep 17 00:00:00 2001
From: Armijn Hemel <armijn@gpl-violations.org>
Date: Wed, 17 Aug 2005 19:19:54 +0000
Subject: [PATCH 0062/5331] add hotplug here, temporarily disable e2fsck, so at
 least everything is mounted rw

svn path=/nixu/trunk/; revision=3630
---
 boot/boot.sh     | 4 ++--
 boot/default.nix | 2 +-
 fill-disk.sh     | 5 +++++
 init/default.nix | 2 +-
 make-disk.sh     | 4 ++++
 pkgs.nix         | 6 +++---
 6 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/boot/boot.sh b/boot/boot.sh
index a6ce1f2d67a..0ef72d9907e 100644
--- a/boot/boot.sh
+++ b/boot/boot.sh
@@ -9,8 +9,8 @@ echo "--- Nix ---"
 echo "mounting /proc..."
 mount -n -t proc none /proc
 
-echo "checking /dev/root..."
-e2fsck -y /dev/root || test "$?" -le 1
+#echo "checking /dev/root..."
+#e2fsck -y /dev/root || test "$?" -le 1
 
 echo "remounting / writable..."
 mount -n -o remount,rw /dev/root /
diff --git a/boot/default.nix b/boot/default.nix
index 3724660ae22..315fab0e18d 100644
--- a/boot/default.nix
+++ b/boot/default.nix
@@ -1,7 +1,7 @@
 { stdenv, kernel, bash, coreutils, findutils, utillinux, sysvinit, e2fsprogs
 , nettools, nix, subversion, gcc, wget, which, vim, less, screen, openssh
 , binutils, strace, shadowutils, iputils, gnumake, curl, gnused, gnugrep
-, gnutar, gzip, mingetty, grubWrapper, parted, modutils}:
+, gnutar, gzip, mingetty, grubWrapper, parted, modutils, hotplug}:
 
 derivation {
   name = "boot";
diff --git a/fill-disk.sh b/fill-disk.sh
index 160822a5597..17e6dd42d04 100755
--- a/fill-disk.sh
+++ b/fill-disk.sh
@@ -7,6 +7,7 @@ kernel=@kernel@
 sysvinitPath=@sysvinitPath@
 bootPath=@bootPath@
 modutils=@modutils@
+hotplug=@hotplug@
 
 echo mounting special filesystems
 
@@ -290,6 +291,10 @@ echo "192.168.150.1 uml" >> $root/etc/hosts
 
 ln -s @kernel@/vmlinuz $root/boot/vmlinuz
 ln -s @sysvinitPath@/sbin/init $root/sbin/init
+ln -s @hotplug@/sbin/hotplug $root/sbin/hotplug
+ln -s @hotplug@/etc/hotplug $root/etc/hotplug
+ln -s @hotplug@/etc/hotplug.d $root/etc/hotplug.d
+ln -s $device $root/dev/root
 
 echo installing bootloader
 
diff --git a/init/default.nix b/init/default.nix
index fae29176468..fbb983cba2d 100644
--- a/init/default.nix
+++ b/init/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, bash, coreutils, utillinux, e2fsprogs, nix, shadowutils, mingetty, grubWrapper, parted, modutils}:
+{ stdenv, bash, coreutils, utillinux, e2fsprogs, nix, shadowutils, mingetty, grubWrapper, parted, modutils, hotplug}:
 
 derivation {
   name = "init";
diff --git a/make-disk.sh b/make-disk.sh
index 3384e78e742..4767e220acb 100755
--- a/make-disk.sh
+++ b/make-disk.sh
@@ -62,6 +62,7 @@ utillinux=$($NIX_CMD_PATH/nix-store -q $(echo '(import ./pkgs.nix).utillinux' |
 e2fsprogs=$($NIX_CMD_PATH/nix-store -q $(echo '(import ./pkgs.nix).e2fsprogs' | $NIX_CMD_PATH/nix-instantiate -))
 modutils=$($NIX_CMD_PATH/nix-store -q $(echo '(import ./pkgs.nix).modutils' | $NIX_CMD_PATH/nix-instantiate -))
 grub=$($NIX_CMD_PATH/nix-store -r $(echo '(import ./pkgs.nix).grubWrapper' | $NIX_CMD_PATH/nix-instantiate -))
+hotplug=$($NIX_CMD_PATH/nix-store -r $(echo '(import ./pkgs.nix).hotplug' | $NIX_CMD_PATH/nix-instantiate -))
 #gnused=$($NIX_CMD_PATH/nix-store -r $(echo '(import ./pkgs.nix).gnused' | $NIX_CMD_PATH/nix-instantiate -))
 #gnugrep=$($NIX_CMD_PATH/nix-store -r $(echo '(import ./pkgs.nix).gnugrep' | $NIX_CMD_PATH/nix-instantiate -))
 
@@ -113,6 +114,7 @@ cp -fau --parents ${Grub} ${archivesDir}
 cp -fau --parents ${Kernel} ${archivesDir}
 cp -fau --parents ${SysVinit} ${archivesDir}
 cp -fau --parents ${BootPath} ${archivesDir}
+cp -fau --parents ${hotplug} ${archivesDir}
 
 bashdeps=$($NIX_CMD_PATH/nix-store -qR $(nix-store -r $(echo '(import ./pkgs.nix).bash' | $NIX_CMD_PATH/nix-instantiate -)))
 
@@ -131,6 +133,7 @@ sed -e "s^@sysvinitPath\@^$sysvinitPath^g" \
     -e "s^@modutils\@^$modutils^g" \
     -e "s^@grub\@^$grub^g" \
     -e "s^@kernel\@^$kernel^g" \
+    -e "s^@hotplug\@^$hotplug^g" \
     < $fill_disk > $fill_disk.tmp
 mv $fill_disk.tmp $fill_disk
 
@@ -164,6 +167,7 @@ cp -fau --parents ${utilLinux} ${initdir}
 cp -fau --parents ${coreUtils} ${initdir}
 cp -fau --parents ${e2fsProgs} ${initdir}
 cp -fau --parents ${modUtils} ${initdir}
+cp -fau --parents ${hotplug} ${initdir}
 
 touch ${initdir}/NIXOS
 
diff --git a/pkgs.nix b/pkgs.nix
index b530a8b00cd..f380bedc125 100644
--- a/pkgs.nix
+++ b/pkgs.nix
@@ -3,15 +3,15 @@ rec {
     stdenv kernel bash coreutils findutils utillinux sysvinit e2fsprogs
     nettools nix subversion gcc wget which vim less screen openssh binutils
     strace shadowutils iputils gnumake curl gnused gnutar gnugrep gzip
-    mingetty grubWrapper syslinux parted modutils;
+    mingetty grubWrapper syslinux parted modutils hotplug;
 
   boot = (import ./boot) {inherit stdenv kernel bash coreutils findutils
     utillinux sysvinit e2fsprogs nettools nix subversion gcc wget which vim
     less screen openssh binutils strace shadowutils iputils gnumake curl
-    gnused gnutar gnugrep gzip mingetty grubWrapper parted modutils;};
+    gnused gnutar gnugrep gzip mingetty grubWrapper parted modutils hotplug;};
 
   init = (import ./init) {inherit stdenv bash coreutils 
-    utillinux e2fsprogs nix shadowutils mingetty grubWrapper parted modutils;};
+    utillinux e2fsprogs nix shadowutils mingetty grubWrapper parted modutils hotplug;};
 
   everything = [boot init sysvinit kernel];
 }
-- 
GitLab


From 26ccf579e03b4e9455bc7a74eb1dc3e415225416 Mon Sep 17 00:00:00 2001
From: Armijn Hemel <armijn@gpl-violations.org>
Date: Wed, 17 Aug 2005 20:51:19 +0000
Subject: [PATCH 0063/5331] ssh wants /dev/urandom (or /dev/random, but urandom
 works too)

svn path=/nixu/trunk/; revision=3631
---
 fill-disk.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/fill-disk.sh b/fill-disk.sh
index 17e6dd42d04..94fe3a30a4e 100755
--- a/fill-disk.sh
+++ b/fill-disk.sh
@@ -160,6 +160,7 @@ mknod -m 0600 $root/dev/console c 5 1
 mknod -m 0600 $root/dev/tty c 5 0
 mknod -m 0600 $root/dev/tty0 c 4 0
 mknod -m 0600 $root/dev/tty1 c 4 1
+mknod -m 0444 $root/dev/urandom c 1 9
 
 touch_file /etc/passwd
 touch_file /etc/shadow
-- 
GitLab


From 9a29f7097711e89115fff6469dc7b57e6a5ace2f Mon Sep 17 00:00:00 2001
From: Armijn Hemel <armijn@gpl-violations.org>
Date: Thu, 18 Aug 2005 22:55:27 +0000
Subject: [PATCH 0064/5331] mount sysfs at boottime

svn path=/nixu/trunk/; revision=3635
---
 boot/boot.sh | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/boot/boot.sh b/boot/boot.sh
index 0ef72d9907e..03cd14066b6 100644
--- a/boot/boot.sh
+++ b/boot/boot.sh
@@ -9,6 +9,9 @@ echo "--- Nix ---"
 echo "mounting /proc..."
 mount -n -t proc none /proc
 
+echo "mounting /sys..."
+mount -n -t sysfs none /sys
+
 #echo "checking /dev/root..."
 #e2fsck -y /dev/root || test "$?" -le 1
 
-- 
GitLab


From b39fca2ade8b92e91c1afda775e3ed3fbfd4d58d Mon Sep 17 00:00:00 2001
From: Armijn Hemel <armijn@gpl-violations.org>
Date: Fri, 19 Aug 2005 15:26:01 +0000
Subject: [PATCH 0065/5331] - add udev (not yet in use) - clean up 100 MB of
 unused stuff on the CD

svn path=/nixu/trunk/; revision=3637
---
 boot/default.nix | 4 ++--
 make-disk.sh     | 7 +++++--
 pkgs.nix         | 4 ++--
 3 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/boot/default.nix b/boot/default.nix
index 315fab0e18d..78c7c39c924 100644
--- a/boot/default.nix
+++ b/boot/default.nix
@@ -1,7 +1,7 @@
 { stdenv, kernel, bash, coreutils, findutils, utillinux, sysvinit, e2fsprogs
 , nettools, nix, subversion, gcc, wget, which, vim, less, screen, openssh
 , binutils, strace, shadowutils, iputils, gnumake, curl, gnused, gnugrep
-, gnutar, gzip, mingetty, grubWrapper, parted, modutils, hotplug}:
+, gnutar, gzip, mingetty, grubWrapper, parted, modutils, hotplug, udev}:
 
 derivation {
   name = "boot";
@@ -14,5 +14,5 @@ derivation {
   inherit stdenv kernel bash coreutils findutils utillinux sysvinit
           e2fsprogs nettools nix subversion gcc wget which vim less screen
           openssh binutils strace shadowutils iputils gnumake curl gnused
-          gnutar gnugrep gzip mingetty grubWrapper parted modutils;
+          gnutar gnugrep gzip mingetty grubWrapper parted modutils udev;
 }
diff --git a/make-disk.sh b/make-disk.sh
index 4767e220acb..3218fc8007d 100755
--- a/make-disk.sh
+++ b/make-disk.sh
@@ -63,8 +63,7 @@ e2fsprogs=$($NIX_CMD_PATH/nix-store -q $(echo '(import ./pkgs.nix).e2fsprogs' |
 modutils=$($NIX_CMD_PATH/nix-store -q $(echo '(import ./pkgs.nix).modutils' | $NIX_CMD_PATH/nix-instantiate -))
 grub=$($NIX_CMD_PATH/nix-store -r $(echo '(import ./pkgs.nix).grubWrapper' | $NIX_CMD_PATH/nix-instantiate -))
 hotplug=$($NIX_CMD_PATH/nix-store -r $(echo '(import ./pkgs.nix).hotplug' | $NIX_CMD_PATH/nix-instantiate -))
-#gnused=$($NIX_CMD_PATH/nix-store -r $(echo '(import ./pkgs.nix).gnused' | $NIX_CMD_PATH/nix-instantiate -))
-#gnugrep=$($NIX_CMD_PATH/nix-store -r $(echo '(import ./pkgs.nix).gnugrep' | $NIX_CMD_PATH/nix-instantiate -))
+udev=$($NIX_CMD_PATH/nix-store -r $(echo '(import ./pkgs.nix).udev' | $NIX_CMD_PATH/nix-instantiate -))
 
 (while read storepath; do
    cp -fa --parents ${storepath} ${archivesDir}
@@ -115,6 +114,7 @@ cp -fau --parents ${Kernel} ${archivesDir}
 cp -fau --parents ${SysVinit} ${archivesDir}
 cp -fau --parents ${BootPath} ${archivesDir}
 cp -fau --parents ${hotplug} ${archivesDir}
+cp -fau --parents ${udev} ${archivesDir}
 
 bashdeps=$($NIX_CMD_PATH/nix-store -qR $(nix-store -r $(echo '(import ./pkgs.nix).bash' | $NIX_CMD_PATH/nix-instantiate -)))
 
@@ -173,6 +173,9 @@ touch ${initdir}/NIXOS
 
 (cd ${initdir}; find . |cpio -c -o) | gzip -9 > ${initrd}
 
+chmod -f -R +w ${initdir}/*
+rm -rf ${initdir}
+
 cp ${initrd} ${archivesDir}/isolinux
 
 echo creating ISO image
diff --git a/pkgs.nix b/pkgs.nix
index f380bedc125..7d5d568cb93 100644
--- a/pkgs.nix
+++ b/pkgs.nix
@@ -3,12 +3,12 @@ rec {
     stdenv kernel bash coreutils findutils utillinux sysvinit e2fsprogs
     nettools nix subversion gcc wget which vim less screen openssh binutils
     strace shadowutils iputils gnumake curl gnused gnutar gnugrep gzip
-    mingetty grubWrapper syslinux parted modutils hotplug;
+    mingetty grubWrapper syslinux parted modutils hotplug udev;
 
   boot = (import ./boot) {inherit stdenv kernel bash coreutils findutils
     utillinux sysvinit e2fsprogs nettools nix subversion gcc wget which vim
     less screen openssh binutils strace shadowutils iputils gnumake curl
-    gnused gnutar gnugrep gzip mingetty grubWrapper parted modutils hotplug;};
+    gnused gnutar gnugrep gzip mingetty grubWrapper parted modutils hotplug udev;};
 
   init = (import ./init) {inherit stdenv bash coreutils 
     utillinux e2fsprogs nix shadowutils mingetty grubWrapper parted modutils hotplug;};
-- 
GitLab


From 30196b92434692707d649798fb201aa5ba3c3922 Mon Sep 17 00:00:00 2001
From: Armijn Hemel <armijn@gpl-violations.org>
Date: Fri, 19 Aug 2005 16:09:31 +0000
Subject: [PATCH 0066/5331] incorporate udev in the boot scripts. Now we have
 loads of devices :)

svn path=/nixu/trunk/; revision=3638
---
 boot/boot.sh    | 4 ++--
 boot/builder.sh | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/boot/boot.sh b/boot/boot.sh
index 03cd14066b6..1589ba796e1 100644
--- a/boot/boot.sh
+++ b/boot/boot.sh
@@ -18,8 +18,8 @@ mount -n -t sysfs none /sys
 echo "remounting / writable..."
 mount -n -o remount,rw /dev/root /
 
-echo "mounting /mnt/host..."
-mount -n -t hostfs none /mnt/host
+echo "starting udev..."
+@udev@/sbin/udevstart
 
 echo "setting up hostname..."
 hostname uml
diff --git a/boot/builder.sh b/boot/builder.sh
index 5ebfadcbcf7..4b637748ade 100755
--- a/boot/builder.sh
+++ b/boot/builder.sh
@@ -36,6 +36,7 @@ for i in $boot $halt $login $env; do
         -e "s^@gcc\@^$gcc^g" \
         -e "s^@mingetty\@^$mingetty^g" \
         -e "s^@grub\@^$grub^g" \
+        -e "s^@udev\@^$udev^g" \
         -e "s^@out\@^$out^g" \
         < $i > $dst
     chmod +x $dst
-- 
GitLab


From 49cd9fae36c8397ba917f52bc2e3564d0b614d5a Mon Sep 17 00:00:00 2001
From: Armijn Hemel <armijn@gpl-violations.org>
Date: Fri, 19 Aug 2005 22:39:48 +0000
Subject: [PATCH 0067/5331] make /lib/modules

svn path=/nixu/trunk/; revision=3643
---
 fill-disk.sh | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/fill-disk.sh b/fill-disk.sh
index 94fe3a30a4e..218260caf6c 100755
--- a/fill-disk.sh
+++ b/fill-disk.sh
@@ -130,6 +130,8 @@ make_dir 00755 /etc # global non-constant configuration
 make_dir 00755 /etc-secret
 make_dir 00755 /home
 make_dir 00755 /home/root
+make_dir 00755 /lib
+make_dir 00755 /lib/modules
 make_dir 00755 /mnt
 make_dir 00755 /mnt/host
 make_dir 00755 /nix
-- 
GitLab


From 6e7614fdb0d9a4896b9041ab69656fb917804df9 Mon Sep 17 00:00:00 2001
From: Armijn Hemel <armijn@gpl-violations.org>
Date: Sat, 20 Aug 2005 21:49:53 +0000
Subject: [PATCH 0068/5331] use module-init-tools instead of modutils. Now we
 can insert modules :)

svn path=/nixu/trunk/; revision=3650
---
 boot/builder.sh  |  1 +
 boot/default.nix |  4 ++--
 boot/env.sh      |  2 +-
 fill-disk.sh     | 15 +++++++++++++++
 init/default.nix |  4 ++--
 make-disk.sh     |  4 ++--
 pkgs.nix         |  6 +++---
 7 files changed, 26 insertions(+), 10 deletions(-)

diff --git a/boot/builder.sh b/boot/builder.sh
index 4b637748ade..ae2fdbf32b6 100755
--- a/boot/builder.sh
+++ b/boot/builder.sh
@@ -35,6 +35,7 @@ for i in $boot $halt $login $env; do
         -e "s^@gzip\@^$gzip^g" \
         -e "s^@gcc\@^$gcc^g" \
         -e "s^@mingetty\@^$mingetty^g" \
+        -e "s^@module_init_tools\@^$module_init_tools^g" \
         -e "s^@grub\@^$grub^g" \
         -e "s^@udev\@^$udev^g" \
         -e "s^@out\@^$out^g" \
diff --git a/boot/default.nix b/boot/default.nix
index 78c7c39c924..0bfc2517361 100644
--- a/boot/default.nix
+++ b/boot/default.nix
@@ -1,7 +1,7 @@
 { stdenv, kernel, bash, coreutils, findutils, utillinux, sysvinit, e2fsprogs
 , nettools, nix, subversion, gcc, wget, which, vim, less, screen, openssh
 , binutils, strace, shadowutils, iputils, gnumake, curl, gnused, gnugrep
-, gnutar, gzip, mingetty, grubWrapper, parted, modutils, hotplug, udev}:
+, gnutar, gzip, mingetty, grubWrapper, parted, module_init_tools, hotplug, udev}:
 
 derivation {
   name = "boot";
@@ -14,5 +14,5 @@ derivation {
   inherit stdenv kernel bash coreutils findutils utillinux sysvinit
           e2fsprogs nettools nix subversion gcc wget which vim less screen
           openssh binutils strace shadowutils iputils gnumake curl gnused
-          gnutar gnugrep gzip mingetty grubWrapper parted modutils udev;
+          gnutar gnugrep gzip mingetty grubWrapper parted module_init_tools udev;
 }
diff --git a/boot/env.sh b/boot/env.sh
index 6ec13130b66..8366f534213 100644
--- a/boot/env.sh
+++ b/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:@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:@curl@/bin:@gnused@/bin:@gnutar@/bin:@gnugrep@/bin:@gzip@/bin:@mingetty@/sbin:@grub@/bin:@grub@/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:@curl@/bin:@gnused@/bin:@gnutar@/bin:@gnugrep@/bin:@gzip@/bin:@mingetty@/sbin:@grub@/bin:@grub@/sbin:@module_init_tools@/sbin
diff --git a/fill-disk.sh b/fill-disk.sh
index 218260caf6c..50c335ccc4d 100755
--- a/fill-disk.sh
+++ b/fill-disk.sh
@@ -150,6 +150,11 @@ make_dir 00755 /sys
 make_dir 01777 /tmp
 make_dir 00755 /usr
 make_dir 00755 /var
+make_dir 00755 /var/log
+make_dir 00755 /var/run
+make_dir 00755 /var/spool
+make_dir 00755 /var/state
+make_dir 00755 /var/tmp
 
 ##
 ## Add a few devices to /dev on the install disk. This is by far complete.
@@ -287,6 +292,16 @@ rm -f $root/etc/hosts
 echo "127.0.0.1 localhost" >> $root/etc/hosts
 echo "192.168.150.1 uml" >> $root/etc/hosts
 
+###
+### Do kernel stuff here.
+###
+strippedName=$(basename @kernel@);
+if echo "$strippedName" | grep -q '^[a-z0-9]\{32\}-'; then
+        strippedName=$(echo "$strippedName" | cut -c34-)
+fi
+
+echo "stripped" $strippedName
+
 
 ###
 ### Do funky stuff with grub here.
diff --git a/init/default.nix b/init/default.nix
index fbb983cba2d..39f8586f7eb 100644
--- a/init/default.nix
+++ b/init/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, bash, coreutils, utillinux, e2fsprogs, nix, shadowutils, mingetty, grubWrapper, parted, modutils, hotplug}:
+{ stdenv, bash, coreutils, utillinux, e2fsprogs, nix, shadowutils, mingetty, grubWrapper, parted, module_init_tools, hotplug}:
 
 derivation {
   name = "init";
@@ -7,5 +7,5 @@ derivation {
   stage1 = ./prepare-disk.sh;
   stage2 = ./install-disk.sh;
   inherit stdenv bash coreutils utillinux e2fsprogs nix shadowutils
-          mingetty grubWrapper parted modutils;
+          mingetty grubWrapper parted module_init_tools;
 }
diff --git a/make-disk.sh b/make-disk.sh
index 3218fc8007d..588f031d3dc 100755
--- a/make-disk.sh
+++ b/make-disk.sh
@@ -47,7 +47,7 @@ echo $($NIX_CMD_PATH/nix-store -qR $(nix-store -r $(echo '(import ./pkgs.nix).ni
 utilLinux=$($NIX_CMD_PATH/nix-store -qR $(nix-store -r $(echo '(import ./pkgs.nix).utillinux' | $NIX_CMD_PATH/nix-instantiate -)))
 coreUtils=$($NIX_CMD_PATH/nix-store -qR $(nix-store -r $(echo '(import ./pkgs.nix).coreutils' | $NIX_CMD_PATH/nix-instantiate -)))
 e2fsProgs=$($NIX_CMD_PATH/nix-store -qR $(nix-store -r $(echo '(import ./pkgs.nix).e2fsprogs' | $NIX_CMD_PATH/nix-instantiate -)))
-modUtils=$($NIX_CMD_PATH/nix-store -qR $(nix-store -r $(echo '(import ./pkgs.nix).modutils' | $NIX_CMD_PATH/nix-instantiate -)))
+modUtils=$($NIX_CMD_PATH/nix-store -qR $(nix-store -r $(echo '(import ./pkgs.nix).module_init_tools' | $NIX_CMD_PATH/nix-instantiate -)))
 Grub=$($NIX_CMD_PATH/nix-store -qR $(nix-store -r $(echo '(import ./pkgs.nix).grubWrapper' | $NIX_CMD_PATH/nix-instantiate -)))
 #gnuSed=$($NIX_CMD_PATH/nix-store -qR $(nix-store -r $(echo '(import ./pkgs.nix).gnused' | $NIX_CMD_PATH/nix-instantiate -)))
 #gnuGrep=$($NIX_CMD_PATH/nix-store -qR $(nix-store -r $(echo '(import ./pkgs.nix).gnugrep' | $NIX_CMD_PATH/nix-instantiate -)))
@@ -60,7 +60,7 @@ coreutils=$($NIX_CMD_PATH/nix-store -q $(echo '(import ./pkgs.nix).coreutils' |
 findutils=$($NIX_CMD_PATH/nix-store -q $(echo '(import ./pkgs.nix).findutils' | $NIX_CMD_PATH/nix-instantiate -))
 utillinux=$($NIX_CMD_PATH/nix-store -q $(echo '(import ./pkgs.nix).utillinux' | $NIX_CMD_PATH/nix-instantiate -))
 e2fsprogs=$($NIX_CMD_PATH/nix-store -q $(echo '(import ./pkgs.nix).e2fsprogs' | $NIX_CMD_PATH/nix-instantiate -))
-modutils=$($NIX_CMD_PATH/nix-store -q $(echo '(import ./pkgs.nix).modutils' | $NIX_CMD_PATH/nix-instantiate -))
+modutils=$($NIX_CMD_PATH/nix-store -q $(echo '(import ./pkgs.nix).module_init_tools' | $NIX_CMD_PATH/nix-instantiate -))
 grub=$($NIX_CMD_PATH/nix-store -r $(echo '(import ./pkgs.nix).grubWrapper' | $NIX_CMD_PATH/nix-instantiate -))
 hotplug=$($NIX_CMD_PATH/nix-store -r $(echo '(import ./pkgs.nix).hotplug' | $NIX_CMD_PATH/nix-instantiate -))
 udev=$($NIX_CMD_PATH/nix-store -r $(echo '(import ./pkgs.nix).udev' | $NIX_CMD_PATH/nix-instantiate -))
diff --git a/pkgs.nix b/pkgs.nix
index 7d5d568cb93..5a5065bcfe9 100644
--- a/pkgs.nix
+++ b/pkgs.nix
@@ -3,15 +3,15 @@ rec {
     stdenv kernel bash coreutils findutils utillinux sysvinit e2fsprogs
     nettools nix subversion gcc wget which vim less screen openssh binutils
     strace shadowutils iputils gnumake curl gnused gnutar gnugrep gzip
-    mingetty grubWrapper syslinux parted modutils hotplug udev;
+    mingetty grubWrapper syslinux parted module_init_tools hotplug udev;
 
   boot = (import ./boot) {inherit stdenv kernel bash coreutils findutils
     utillinux sysvinit e2fsprogs nettools nix subversion gcc wget which vim
     less screen openssh binutils strace shadowutils iputils gnumake curl
-    gnused gnutar gnugrep gzip mingetty grubWrapper parted modutils hotplug udev;};
+    gnused gnutar gnugrep gzip mingetty grubWrapper parted module_init_tools hotplug udev;};
 
   init = (import ./init) {inherit stdenv bash coreutils 
-    utillinux e2fsprogs nix shadowutils mingetty grubWrapper parted modutils hotplug;};
+    utillinux e2fsprogs nix shadowutils mingetty grubWrapper parted module_init_tools hotplug;};
 
   everything = [boot init sysvinit kernel];
 }
-- 
GitLab


From 4c6230b0a6c7e9d52cc8869c2a6c72f198189455 Mon Sep 17 00:00:00 2001
From: Armijn Hemel <armijn@gpl-violations.org>
Date: Sun, 21 Aug 2005 17:39:47 +0000
Subject: [PATCH 0069/5331] add dhcp package. This doesn't work quite nicely
 though, needs some resolving...

svn path=/nixu/trunk/; revision=3653
---
 boot/builder.sh  |  1 +
 boot/default.nix |  6 ++++--
 boot/env.sh      |  2 +-
 fill-disk.sh     | 12 +++++++++---
 init/default.nix |  4 ++--
 make-disk.sh     |  2 ++
 pkgs.nix         | 11 +++++++----
 7 files changed, 26 insertions(+), 12 deletions(-)

diff --git a/boot/builder.sh b/boot/builder.sh
index ae2fdbf32b6..679b18b514a 100755
--- a/boot/builder.sh
+++ b/boot/builder.sh
@@ -38,6 +38,7 @@ for i in $boot $halt $login $env; do
         -e "s^@module_init_tools\@^$module_init_tools^g" \
         -e "s^@grub\@^$grub^g" \
         -e "s^@udev\@^$udev^g" \
+        -e "s^@dhcp\@^$dhcp^g" \
         -e "s^@out\@^$out^g" \
         < $i > $dst
     chmod +x $dst
diff --git a/boot/default.nix b/boot/default.nix
index 0bfc2517361..28661278cb3 100644
--- a/boot/default.nix
+++ b/boot/default.nix
@@ -1,7 +1,8 @@
 { stdenv, kernel, bash, coreutils, findutils, utillinux, sysvinit, e2fsprogs
 , nettools, nix, subversion, gcc, wget, which, vim, less, screen, openssh
 , binutils, strace, shadowutils, iputils, gnumake, curl, gnused, gnugrep
-, gnutar, gzip, mingetty, grubWrapper, parted, module_init_tools, hotplug, udev}:
+, gnutar, gzip, mingetty, grubWrapper, parted, module_init_tools, hotplug
+, udev, dhcp}:
 
 derivation {
   name = "boot";
@@ -14,5 +15,6 @@ derivation {
   inherit stdenv kernel bash coreutils findutils utillinux sysvinit
           e2fsprogs nettools nix subversion gcc wget which vim less screen
           openssh binutils strace shadowutils iputils gnumake curl gnused
-          gnutar gnugrep gzip mingetty grubWrapper parted module_init_tools udev;
+          gnutar gnugrep gzip mingetty grubWrapper parted module_init_tools
+          udev dhcp;
 }
diff --git a/boot/env.sh b/boot/env.sh
index 8366f534213..7564e350d36 100644
--- a/boot/env.sh
+++ b/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:@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:@curl@/bin:@gnused@/bin:@gnutar@/bin:@gnugrep@/bin:@gzip@/bin:@mingetty@/sbin:@grub@/bin:@grub@/sbin:@module_init_tools@/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:@curl@/bin:@gnused@/bin:@gnutar@/bin:@gnugrep@/bin:@gzip@/bin:@mingetty@/sbin:@grub@/bin:@grub@/sbin:@module_init_tools@/sbin:@dhcp@/sbin
diff --git a/fill-disk.sh b/fill-disk.sh
index 50c335ccc4d..ab8eda71fb1 100755
--- a/fill-disk.sh
+++ b/fill-disk.sh
@@ -169,9 +169,9 @@ mknod -m 0600 $root/dev/tty0 c 4 0
 mknod -m 0600 $root/dev/tty1 c 4 1
 mknod -m 0444 $root/dev/urandom c 1 9
 
-touch_file /etc/passwd
-touch_file /etc/shadow
-touch_file /etc/group
+#touch_file /etc/passwd
+#touch_file /etc/shadow
+#touch_file /etc/group
 
 rm -f $root/etc/mtab
 #ln -s /proc/mounts $root/etc/mtab
@@ -292,6 +292,12 @@ rm -f $root/etc/hosts
 echo "127.0.0.1 localhost" >> $root/etc/hosts
 echo "192.168.150.1 uml" >> $root/etc/hosts
 
+echo setting up initial account information...
+
+echo "root:x:0:root" > $root/etc/group
+echo "root:x:0:0:root:/root:/bin/sh" > $root/etc/passwd
+echo "root::12757:0:99999:7:::" > $root/etc/shadow
+
 ###
 ### Do kernel stuff here.
 ###
diff --git a/init/default.nix b/init/default.nix
index 39f8586f7eb..92c34794287 100644
--- a/init/default.nix
+++ b/init/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, bash, coreutils, utillinux, e2fsprogs, nix, shadowutils, mingetty, grubWrapper, parted, module_init_tools, hotplug}:
+{ stdenv, bash, coreutils, utillinux, e2fsprogs, nix, shadowutils, mingetty, grubWrapper, parted, module_init_tools, hotplug, dhcp}:
 
 derivation {
   name = "init";
@@ -7,5 +7,5 @@ derivation {
   stage1 = ./prepare-disk.sh;
   stage2 = ./install-disk.sh;
   inherit stdenv bash coreutils utillinux e2fsprogs nix shadowutils
-          mingetty grubWrapper parted module_init_tools;
+          mingetty grubWrapper parted module_init_tools dhcp;
 }
diff --git a/make-disk.sh b/make-disk.sh
index 588f031d3dc..eb46887a91f 100755
--- a/make-disk.sh
+++ b/make-disk.sh
@@ -64,6 +64,7 @@ modutils=$($NIX_CMD_PATH/nix-store -q $(echo '(import ./pkgs.nix).module_init_to
 grub=$($NIX_CMD_PATH/nix-store -r $(echo '(import ./pkgs.nix).grubWrapper' | $NIX_CMD_PATH/nix-instantiate -))
 hotplug=$($NIX_CMD_PATH/nix-store -r $(echo '(import ./pkgs.nix).hotplug' | $NIX_CMD_PATH/nix-instantiate -))
 udev=$($NIX_CMD_PATH/nix-store -r $(echo '(import ./pkgs.nix).udev' | $NIX_CMD_PATH/nix-instantiate -))
+dhcp=$($NIX_CMD_PATH/nix-store -r $(echo '(import ./pkgs.nix).dhcp' | $NIX_CMD_PATH/nix-instantiate -))
 
 (while read storepath; do
    cp -fa --parents ${storepath} ${archivesDir}
@@ -115,6 +116,7 @@ cp -fau --parents ${SysVinit} ${archivesDir}
 cp -fau --parents ${BootPath} ${archivesDir}
 cp -fau --parents ${hotplug} ${archivesDir}
 cp -fau --parents ${udev} ${archivesDir}
+cp -fau --parents ${dhcp} ${archivesDir}
 
 bashdeps=$($NIX_CMD_PATH/nix-store -qR $(nix-store -r $(echo '(import ./pkgs.nix).bash' | $NIX_CMD_PATH/nix-instantiate -)))
 
diff --git a/pkgs.nix b/pkgs.nix
index 5a5065bcfe9..a127d31b29a 100644
--- a/pkgs.nix
+++ b/pkgs.nix
@@ -3,15 +3,18 @@ rec {
     stdenv kernel bash coreutils findutils utillinux sysvinit e2fsprogs
     nettools nix subversion gcc wget which vim less screen openssh binutils
     strace shadowutils iputils gnumake curl gnused gnutar gnugrep gzip
-    mingetty grubWrapper syslinux parted module_init_tools hotplug udev;
+    mingetty grubWrapper syslinux parted module_init_tools hotplug udev
+    dhcp;
 
   boot = (import ./boot) {inherit stdenv kernel bash coreutils findutils
     utillinux sysvinit e2fsprogs nettools nix subversion gcc wget which vim
     less screen openssh binutils strace shadowutils iputils gnumake curl
-    gnused gnutar gnugrep gzip mingetty grubWrapper parted module_init_tools hotplug udev;};
+    gnused gnutar gnugrep gzip mingetty grubWrapper parted module_init_tools
+    hotplug udev dhcp;};
 
-  init = (import ./init) {inherit stdenv bash coreutils 
-    utillinux e2fsprogs nix shadowutils mingetty grubWrapper parted module_init_tools hotplug;};
+  init = (import ./init) {inherit stdenv bash coreutils utillinux e2fsprogs
+    nix shadowutils mingetty grubWrapper parted module_init_tools hotplug
+    dhcp;};
 
   everything = [boot init sysvinit kernel];
 }
-- 
GitLab


From fb451cc09f741ec60d3a5ef756ea44c95e0cb213 Mon Sep 17 00:00:00 2001
From: Armijn Hemel <armijn@gpl-violations.org>
Date: Sun, 21 Aug 2005 19:56:30 +0000
Subject: [PATCH 0070/5331] use the dhcp wrapper, add a directory needed for
 DHCP

svn path=/nixu/trunk/; revision=3656
---
 boot/builder.sh  | 2 +-
 boot/default.nix | 4 ++--
 boot/env.sh      | 2 +-
 fill-disk.sh     | 2 ++
 init/default.nix | 4 ++--
 make-disk.sh     | 2 +-
 pkgs.nix         | 6 +++---
 7 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/boot/builder.sh b/boot/builder.sh
index 679b18b514a..dce3250f090 100755
--- a/boot/builder.sh
+++ b/boot/builder.sh
@@ -38,7 +38,7 @@ for i in $boot $halt $login $env; do
         -e "s^@module_init_tools\@^$module_init_tools^g" \
         -e "s^@grub\@^$grub^g" \
         -e "s^@udev\@^$udev^g" \
-        -e "s^@dhcp\@^$dhcp^g" \
+        -e "s^@dhcpWrapper\@^$dhcpWrapper^g" \
         -e "s^@out\@^$out^g" \
         < $i > $dst
     chmod +x $dst
diff --git a/boot/default.nix b/boot/default.nix
index 28661278cb3..0827f59d7bd 100644
--- a/boot/default.nix
+++ b/boot/default.nix
@@ -2,7 +2,7 @@
 , nettools, nix, subversion, gcc, wget, which, vim, less, screen, openssh
 , binutils, strace, shadowutils, iputils, gnumake, curl, gnused, gnugrep
 , gnutar, gzip, mingetty, grubWrapper, parted, module_init_tools, hotplug
-, udev, dhcp}:
+, udev, dhcpWrapper}:
 
 derivation {
   name = "boot";
@@ -16,5 +16,5 @@ derivation {
           e2fsprogs nettools nix subversion gcc wget which vim less screen
           openssh binutils strace shadowutils iputils gnumake curl gnused
           gnutar gnugrep gzip mingetty grubWrapper parted module_init_tools
-          udev dhcp;
+          udev dhcpWrapper;
 }
diff --git a/boot/env.sh b/boot/env.sh
index 7564e350d36..84b8e7c7b3a 100644
--- a/boot/env.sh
+++ b/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:@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:@curl@/bin:@gnused@/bin:@gnutar@/bin:@gnugrep@/bin:@gzip@/bin:@mingetty@/sbin:@grub@/bin:@grub@/sbin:@module_init_tools@/sbin:@dhcp@/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:@curl@/bin:@gnused@/bin:@gnutar@/bin:@gnugrep@/bin:@gzip@/bin:@mingetty@/sbin:@grub@/bin:@grub@/sbin:@module_init_tools@/sbin:@dhcpWrapper@/sbin
diff --git a/fill-disk.sh b/fill-disk.sh
index ab8eda71fb1..eab6d7ecaf2 100755
--- a/fill-disk.sh
+++ b/fill-disk.sh
@@ -154,6 +154,7 @@ make_dir 00755 /var/log
 make_dir 00755 /var/run
 make_dir 00755 /var/spool
 make_dir 00755 /var/state
+make_dir 00755 /var/state/dhcp
 make_dir 00755 /var/tmp
 
 ##
@@ -274,6 +275,7 @@ cp -fa /nix/store/* $root/nix/store
 echo setting init symlink...
 rm -f $root/init
 ln -s $sysvinitPath/sbin/init $root/init
+ln -s $bash/bin/sh $root/bin/sh
 
 echo setting up inittab...
 rm -f $root/etc/inittab
diff --git a/init/default.nix b/init/default.nix
index 92c34794287..c81e75513cd 100644
--- a/init/default.nix
+++ b/init/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, bash, coreutils, utillinux, e2fsprogs, nix, shadowutils, mingetty, grubWrapper, parted, module_init_tools, hotplug, dhcp}:
+{ stdenv, bash, coreutils, utillinux, e2fsprogs, nix, shadowutils, mingetty, grubWrapper, parted, module_init_tools, hotplug, dhcpWrapper}:
 
 derivation {
   name = "init";
@@ -7,5 +7,5 @@ derivation {
   stage1 = ./prepare-disk.sh;
   stage2 = ./install-disk.sh;
   inherit stdenv bash coreutils utillinux e2fsprogs nix shadowutils
-          mingetty grubWrapper parted module_init_tools dhcp;
+          mingetty grubWrapper parted module_init_tools dhcpWrapper;
 }
diff --git a/make-disk.sh b/make-disk.sh
index eb46887a91f..ac626727b90 100755
--- a/make-disk.sh
+++ b/make-disk.sh
@@ -64,7 +64,7 @@ modutils=$($NIX_CMD_PATH/nix-store -q $(echo '(import ./pkgs.nix).module_init_to
 grub=$($NIX_CMD_PATH/nix-store -r $(echo '(import ./pkgs.nix).grubWrapper' | $NIX_CMD_PATH/nix-instantiate -))
 hotplug=$($NIX_CMD_PATH/nix-store -r $(echo '(import ./pkgs.nix).hotplug' | $NIX_CMD_PATH/nix-instantiate -))
 udev=$($NIX_CMD_PATH/nix-store -r $(echo '(import ./pkgs.nix).udev' | $NIX_CMD_PATH/nix-instantiate -))
-dhcp=$($NIX_CMD_PATH/nix-store -r $(echo '(import ./pkgs.nix).dhcp' | $NIX_CMD_PATH/nix-instantiate -))
+dhcp=$($NIX_CMD_PATH/nix-store -r $(echo '(import ./pkgs.nix).dhcpWrapper' | $NIX_CMD_PATH/nix-instantiate -))
 
 (while read storepath; do
    cp -fa --parents ${storepath} ${archivesDir}
diff --git a/pkgs.nix b/pkgs.nix
index a127d31b29a..874548e01f2 100644
--- a/pkgs.nix
+++ b/pkgs.nix
@@ -4,17 +4,17 @@ rec {
     nettools nix subversion gcc wget which vim less screen openssh binutils
     strace shadowutils iputils gnumake curl gnused gnutar gnugrep gzip
     mingetty grubWrapper syslinux parted module_init_tools hotplug udev
-    dhcp;
+    dhcpWrapper;
 
   boot = (import ./boot) {inherit stdenv kernel bash coreutils findutils
     utillinux sysvinit e2fsprogs nettools nix subversion gcc wget which vim
     less screen openssh binutils strace shadowutils iputils gnumake curl
     gnused gnutar gnugrep gzip mingetty grubWrapper parted module_init_tools
-    hotplug udev dhcp;};
+    hotplug udev dhcpWrapper;};
 
   init = (import ./init) {inherit stdenv bash coreutils utillinux e2fsprogs
     nix shadowutils mingetty grubWrapper parted module_init_tools hotplug
-    dhcp;};
+    dhcpWrapper;};
 
   everything = [boot init sysvinit kernel];
 }
-- 
GitLab


From f88a356cc6a0026fb8371d5c4a1bbe0ff9fbc868 Mon Sep 17 00:00:00 2001
From: Armijn Hemel <armijn@gpl-violations.org>
Date: Sun, 21 Aug 2005 22:41:22 +0000
Subject: [PATCH 0071/5331] make correct symlink to /bin/sh and /bin/bash

svn path=/nixu/trunk/; revision=3658
---
 fill-disk.sh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/fill-disk.sh b/fill-disk.sh
index eab6d7ecaf2..8391eef8b82 100755
--- a/fill-disk.sh
+++ b/fill-disk.sh
@@ -275,7 +275,8 @@ cp -fa /nix/store/* $root/nix/store
 echo setting init symlink...
 rm -f $root/init
 ln -s $sysvinitPath/sbin/init $root/init
-ln -s $bash/bin/sh $root/bin/sh
+ln -s @bash@/bin/sh $root/bin/sh
+ln -s @bash@/bin/bash $root/bin/bash
 
 echo setting up inittab...
 rm -f $root/etc/inittab
-- 
GitLab


From b1b5fdd7cd66310cdba8bc50303aff25533a493d Mon Sep 17 00:00:00 2001
From: Armijn Hemel <armijn@gpl-violations.org>
Date: Sun, 21 Aug 2005 23:15:24 +0000
Subject: [PATCH 0072/5331] change root homedir to /root instead of /home/root

svn path=/nixu/trunk/; revision=3659
---
 boot/login.sh | 2 +-
 fill-disk.sh  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/boot/login.sh b/boot/login.sh
index 9222b2aba13..14bb418bd9a 100644
--- a/boot/login.sh
+++ b/boot/login.sh
@@ -9,7 +9,7 @@ exec < $tty > $tty 2>&1
 echo
 echo "=== Welcome to Nix! ==="
 
-export HOME=/home/root
+export HOME=/root
 cd $HOME
 
 exec @bash@/bin/sh
diff --git a/fill-disk.sh b/fill-disk.sh
index 8391eef8b82..84ace7b66d7 100755
--- a/fill-disk.sh
+++ b/fill-disk.sh
@@ -129,7 +129,6 @@ make_dir 00755 /dev
 make_dir 00755 /etc # global non-constant configuration
 make_dir 00755 /etc-secret
 make_dir 00755 /home
-make_dir 00755 /home/root
 make_dir 00755 /lib
 make_dir 00755 /lib/modules
 make_dir 00755 /mnt
@@ -145,6 +144,7 @@ make_dir 00755 /nix/var/log/nix
 make_dir 00755 /nixpkgs
 make_dir 00755 /nixpkgs/trunk
 make_dir 00755 /proc
+make_dir 00750 /root
 make_dir 00755 /sbin
 make_dir 00755 /sys
 make_dir 01777 /tmp
-- 
GitLab


From fe90fce5d15f185251e27da8eae93d213ffb6116 Mon Sep 17 00:00:00 2001
From: Armijn Hemel <armijn@gpl-violations.org>
Date: Mon, 22 Aug 2005 14:23:01 +0000
Subject: [PATCH 0073/5331] mount /dev/pts, zo we've got PTYs (for screen)

svn path=/nixu/trunk/; revision=3661
---
 boot/boot.sh | 3 +++
 fill-disk.sh | 1 +
 2 files changed, 4 insertions(+)

diff --git a/boot/boot.sh b/boot/boot.sh
index 1589ba796e1..6115bd988c1 100644
--- a/boot/boot.sh
+++ b/boot/boot.sh
@@ -12,6 +12,9 @@ mount -n -t proc none /proc
 echo "mounting /sys..."
 mount -n -t sysfs none /sys
 
+echo "mounting /dev/pts..."
+mount -n -t devpts none /dev/pts
+
 #echo "checking /dev/root..."
 #e2fsck -y /dev/root || test "$?" -le 1
 
diff --git a/fill-disk.sh b/fill-disk.sh
index 84ace7b66d7..9e7e11e4f2c 100755
--- a/fill-disk.sh
+++ b/fill-disk.sh
@@ -126,6 +126,7 @@ echo creating file system hierarchy on target drive
 make_dir 00755 /bin
 make_dir 00755 /boot
 make_dir 00755 /dev
+make_dir 00755 /dev/pts
 make_dir 00755 /etc # global non-constant configuration
 make_dir 00755 /etc-secret
 make_dir 00755 /home
-- 
GitLab


From bc79eeb3b0face4bff7647f27dedb90466ce48fc Mon Sep 17 00:00:00 2001
From: Armijn Hemel <armijn@gpl-violations.org>
Date: Tue, 23 Aug 2005 10:53:20 +0000
Subject: [PATCH 0074/5331] add a dummy builder for init

svn path=/nixu/trunk/; revision=3665
---
 init/builder.sh | 42 ++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 42 insertions(+)
 create mode 100755 init/builder.sh

diff --git a/init/builder.sh b/init/builder.sh
new file mode 100755
index 00000000000..15ba03d4780
--- /dev/null
+++ b/init/builder.sh
@@ -0,0 +1,42 @@
+#! /bin/sh -e
+
+. $stdenv/setup
+
+mkdir $out
+mkdir $out/bin
+
+#for i in $boot $halt $login $env; do
+#    dst=$out/bin/$(basename $i | cut -c34-)
+#    sed \
+#        -e "s^@bash\@^$bash^g" \
+#        -e "s^@coreutils\@^$coreutils^g" \
+#        -e "s^@findutils\@^$findutils^g" \
+#        -e "s^@utillinux\@^$utillinux^g" \
+#        -e "s^@sysvinit\@^$sysvinit^g" \
+#        -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^@curl\@^$curl^g" \
+#        -e "s^@gnused\@^$gnused^g" \
+#        -e "s^@gnutar\@^$gnutar^g" \
+#        -e "s^@gnugrep\@^$gnugrep^g" \
+#        -e "s^@gzip\@^$gzip^g" \
+#        -e "s^@gcc\@^$gcc^g" \
+#        -e "s^@mingetty\@^$mingetty^g" \
+#        -e "s^@grub\@^$grub^g" \
+#        -e "s^@out\@^$out^g" \
+#        < $i > $dst
+#    chmod +x $dst
+#done
-- 
GitLab


From d707a61ac2adbf9f902d250e16204a9a3df49341 Mon Sep 17 00:00:00 2001
From: Armijn Hemel <armijn@gpl-violations.org>
Date: Tue, 23 Aug 2005 15:56:17 +0000
Subject: [PATCH 0075/5331] add nano

svn path=/nixu/trunk/; revision=3670
---
 boot/builder.sh  |  4 +++-
 boot/default.nix |  8 ++++----
 boot/env.sh      |  2 +-
 fill-disk.sh     |  4 ++--
 make-disk.sh     | 20 +++++++++++---------
 pkgs.nix         | 12 ++++++------
 6 files changed, 27 insertions(+), 23 deletions(-)

diff --git a/boot/builder.sh b/boot/builder.sh
index dce3250f090..1a94fb52d0f 100755
--- a/boot/builder.sh
+++ b/boot/builder.sh
@@ -10,7 +10,7 @@ for i in $boot $halt $login $env; do
     sed \
         -e "s^@bash\@^$bash^g" \
         -e "s^@coreutils\@^$coreutils^g" \
-        -e "s^@findutils\@^$findutils^g" \
+        -e "s^@findutilsWrapper\@^$findutilsWrapper^g" \
         -e "s^@utillinux\@^$utillinux^g" \
         -e "s^@sysvinit\@^$sysvinit^g" \
         -e "s^@e2fsprogs\@^$e2fsprogs^g" \
@@ -39,6 +39,8 @@ for i in $boot $halt $login $env; do
         -e "s^@grub\@^$grub^g" \
         -e "s^@udev\@^$udev^g" \
         -e "s^@dhcpWrapper\@^$dhcpWrapper^g" \
+        -e "s^@man\@^$man^g" \
+        -e "s^@nano\@^$nano^g" \
         -e "s^@out\@^$out^g" \
         < $i > $dst
     chmod +x $dst
diff --git a/boot/default.nix b/boot/default.nix
index 0827f59d7bd..dc3632f8f70 100644
--- a/boot/default.nix
+++ b/boot/default.nix
@@ -1,8 +1,8 @@
-{ stdenv, kernel, bash, coreutils, findutils, utillinux, sysvinit, e2fsprogs
+{ stdenv, kernel, bash, coreutils, findutilsWrapper, utillinux, sysvinit, e2fsprogs
 , nettools, nix, subversion, gcc, wget, which, vim, less, screen, openssh
 , binutils, strace, shadowutils, iputils, gnumake, curl, gnused, gnugrep
 , gnutar, gzip, mingetty, grubWrapper, parted, module_init_tools, hotplug
-, udev, dhcpWrapper}:
+, udev, dhcpWrapper, man, nano}:
 
 derivation {
   name = "boot";
@@ -12,9 +12,9 @@ derivation {
   halt = ./halt.sh;
   login = ./login.sh;
   env = ./env.sh;
-  inherit stdenv kernel bash coreutils findutils utillinux sysvinit
+  inherit stdenv kernel bash coreutils findutilsWrapper utillinux sysvinit
           e2fsprogs nettools nix subversion gcc wget which vim less screen
           openssh binutils strace shadowutils iputils gnumake curl gnused
           gnutar gnugrep gzip mingetty grubWrapper parted module_init_tools
-          udev dhcpWrapper;
+          udev dhcpWrapper man nano;
 }
diff --git a/boot/env.sh b/boot/env.sh
index 84b8e7c7b3a..1f151ae93b3 100644
--- a/boot/env.sh
+++ b/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:@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:@curl@/bin:@gnused@/bin:@gnutar@/bin:@gnugrep@/bin:@gzip@/bin:@mingetty@/sbin:@grub@/bin:@grub@/sbin:@module_init_tools@/sbin:@dhcpWrapper@/sbin
+export PATH=@nix@/bin:@bash@/bin:@coreutils@/bin:@findutilsWrapper@/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:@curl@/bin:@gnused@/bin:@gnutar@/bin:@gnugrep@/bin:@gzip@/bin:@mingetty@/sbin:@grub@/bin:@grub@/sbin:@module_init_tools@/sbin:@dhcpWrapper@/sbin:@man@/bin:@nano@/bin
diff --git a/fill-disk.sh b/fill-disk.sh
index 9e7e11e4f2c..084295c4da8 100755
--- a/fill-disk.sh
+++ b/fill-disk.sh
@@ -1,6 +1,6 @@
 #! @bash@/bin/sh -e
 
-export PATH=@bash@/bin:@coreutils@/bin:@findutils@/bin:@utillinux@/bin:@utillinux@/sbin:@e2fsprogs@/sbin:@grub@/sbin:@sysvinitPath@/sbin
+export PATH=@bash@/bin:@coreutils@/bin:@findutils@/bin:@utillinux@/bin:@utillinux@/sbin:@e2fsprogs@/sbin:@grub@/sbin:@sysvinitPath@/sbin:@gnugrep@/bin
 
 kernel=@kernel@
 
@@ -256,7 +256,7 @@ echo copying store
   #cp -fa $storepaths $root/nix/store
 #done) < /cdrom/mystorepaths
 
-cp -fa /nix/store/* $root/nix/store
+cp -fva /nix/store/* $root/nix/store
 
 #echo registering valid paths...
 #(while read storepath; do
diff --git a/make-disk.sh b/make-disk.sh
index ac626727b90..f3e149e080c 100755
--- a/make-disk.sh
+++ b/make-disk.sh
@@ -57,7 +57,7 @@ BootPath=$($NIX_CMD_PATH/nix-store -qR $(nix-store -r $(echo '(import ./pkgs.nix
 
 bash=$($NIX_CMD_PATH/nix-store -q $(echo '(import ./pkgs.nix).bash' | $NIX_CMD_PATH/nix-instantiate -))
 coreutils=$($NIX_CMD_PATH/nix-store -q $(echo '(import ./pkgs.nix).coreutils' | $NIX_CMD_PATH/nix-instantiate -))
-findutils=$($NIX_CMD_PATH/nix-store -q $(echo '(import ./pkgs.nix).findutils' | $NIX_CMD_PATH/nix-instantiate -))
+findutils=$($NIX_CMD_PATH/nix-store -q $(echo '(import ./pkgs.nix).findutilsWrapper' | $NIX_CMD_PATH/nix-instantiate -))
 utillinux=$($NIX_CMD_PATH/nix-store -q $(echo '(import ./pkgs.nix).utillinux' | $NIX_CMD_PATH/nix-instantiate -))
 e2fsprogs=$($NIX_CMD_PATH/nix-store -q $(echo '(import ./pkgs.nix).e2fsprogs' | $NIX_CMD_PATH/nix-instantiate -))
 modutils=$($NIX_CMD_PATH/nix-store -q $(echo '(import ./pkgs.nix).module_init_tools' | $NIX_CMD_PATH/nix-instantiate -))
@@ -65,6 +65,7 @@ grub=$($NIX_CMD_PATH/nix-store -r $(echo '(import ./pkgs.nix).grubWrapper' | $NI
 hotplug=$($NIX_CMD_PATH/nix-store -r $(echo '(import ./pkgs.nix).hotplug' | $NIX_CMD_PATH/nix-instantiate -))
 udev=$($NIX_CMD_PATH/nix-store -r $(echo '(import ./pkgs.nix).udev' | $NIX_CMD_PATH/nix-instantiate -))
 dhcp=$($NIX_CMD_PATH/nix-store -r $(echo '(import ./pkgs.nix).dhcpWrapper' | $NIX_CMD_PATH/nix-instantiate -))
+nano=$($NIX_CMD_PATH/nix-store -r $(echo '(import ./pkgs.nix).nano' | $NIX_CMD_PATH/nix-instantiate -))
 
 (while read storepath; do
    cp -fa --parents ${storepath} ${archivesDir}
@@ -107,16 +108,17 @@ svn export ${nixpkgs} ${archivesDir}/pkgs
 echo copying packages from store
 
 #cp -fa --parents ${nixDeps} ${archivesDir}
-cp -fau --parents ${utilLinux} ${archivesDir}
-cp -fau --parents ${Grub} ${archivesDir}
+cp -fvau --parents ${utilLinux} ${archivesDir}
+cp -fvau --parents ${Grub} ${archivesDir}
 #cp -fau --parents ${gnuSed} ${archivesDir}
 #cp -fau --parents ${gnuGrep} ${archivesDir}
-cp -fau --parents ${Kernel} ${archivesDir}
-cp -fau --parents ${SysVinit} ${archivesDir}
-cp -fau --parents ${BootPath} ${archivesDir}
-cp -fau --parents ${hotplug} ${archivesDir}
-cp -fau --parents ${udev} ${archivesDir}
-cp -fau --parents ${dhcp} ${archivesDir}
+cp -fvau --parents ${Kernel} ${archivesDir}
+cp -fvau --parents ${SysVinit} ${archivesDir}
+cp -fvau --parents ${BootPath} ${archivesDir}
+cp -fvau --parents ${hotplug} ${archivesDir}
+cp -fvau --parents ${udev} ${archivesDir}
+cp -fvau --parents ${dhcp} ${archivesDir}
+cp -fvau --parents ${nano} ${archivesDir}
 
 bashdeps=$($NIX_CMD_PATH/nix-store -qR $(nix-store -r $(echo '(import ./pkgs.nix).bash' | $NIX_CMD_PATH/nix-instantiate -)))
 
diff --git a/pkgs.nix b/pkgs.nix
index 874548e01f2..af8d61a3f36 100644
--- a/pkgs.nix
+++ b/pkgs.nix
@@ -1,20 +1,20 @@
 rec {
   inherit (import /nixpkgs/trunk/pkgs/system/i686-linux.nix)
-    stdenv kernel bash coreutils findutils utillinux sysvinit e2fsprogs
+    stdenv kernel bash coreutils findutilsWrapper utillinux sysvinit e2fsprogs
     nettools nix subversion gcc wget which vim less screen openssh binutils
     strace shadowutils iputils gnumake curl gnused gnutar gnugrep gzip
     mingetty grubWrapper syslinux parted module_init_tools hotplug udev
-    dhcpWrapper;
+    dhcpWrapper man nano;
 
-  boot = (import ./boot) {inherit stdenv kernel bash coreutils findutils
+  boot = (import ./boot) {inherit stdenv kernel bash coreutils findutilsWrapper
     utillinux sysvinit e2fsprogs nettools nix subversion gcc wget which vim
     less screen openssh binutils strace shadowutils iputils gnumake curl
     gnused gnutar gnugrep gzip mingetty grubWrapper parted module_init_tools
-    hotplug udev dhcpWrapper;};
+    hotplug udev dhcpWrapper man nano;};
 
   init = (import ./init) {inherit stdenv bash coreutils utillinux e2fsprogs
     nix shadowutils mingetty grubWrapper parted module_init_tools hotplug
-    dhcpWrapper;};
+    dhcpWrapper man nano;};
 
-  everything = [boot init sysvinit kernel];
+  everything = [boot sysvinit kernel];
 }
-- 
GitLab


From 9c75e2cb14a6d5eadd6fd59b76627e271c54a195 Mon Sep 17 00:00:00 2001
From: Armijn Hemel <armijn@gpl-violations.org>
Date: Tue, 23 Aug 2005 16:53:39 +0000
Subject: [PATCH 0076/5331] fill-disk wants grep

svn path=/nixu/trunk/; revision=3671
---
 make-disk.sh | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/make-disk.sh b/make-disk.sh
index f3e149e080c..580ee797746 100755
--- a/make-disk.sh
+++ b/make-disk.sh
@@ -66,6 +66,7 @@ hotplug=$($NIX_CMD_PATH/nix-store -r $(echo '(import ./pkgs.nix).hotplug' | $NIX
 udev=$($NIX_CMD_PATH/nix-store -r $(echo '(import ./pkgs.nix).udev' | $NIX_CMD_PATH/nix-instantiate -))
 dhcp=$($NIX_CMD_PATH/nix-store -r $(echo '(import ./pkgs.nix).dhcpWrapper' | $NIX_CMD_PATH/nix-instantiate -))
 nano=$($NIX_CMD_PATH/nix-store -r $(echo '(import ./pkgs.nix).nano' | $NIX_CMD_PATH/nix-instantiate -))
+gnugrep=$($NIX_CMD_PATH/nix-store -r $(echo '(import ./pkgs.nix).gnugrep' | $NIX_CMD_PATH/nix-instantiate -))
 
 (while read storepath; do
    cp -fa --parents ${storepath} ${archivesDir}
@@ -138,6 +139,7 @@ sed -e "s^@sysvinitPath\@^$sysvinitPath^g" \
     -e "s^@grub\@^$grub^g" \
     -e "s^@kernel\@^$kernel^g" \
     -e "s^@hotplug\@^$hotplug^g" \
+    -e "s^@gnugrep\@^$gnugrep^g" \
     < $fill_disk > $fill_disk.tmp
 mv $fill_disk.tmp $fill_disk
 
-- 
GitLab


From 52bc4c5681107fcf54978f1df4e26b1470422961 Mon Sep 17 00:00:00 2001
From: Armijn Hemel <armijn@gpl-violations.org>
Date: Tue, 23 Aug 2005 21:00:45 +0000
Subject: [PATCH 0077/5331] get the kernel versioning right. Right now it's
 only printed, but it should be used for creating the
 /lib/modules/<kernel-version> stuff right

svn path=/nixu/trunk/; revision=3673
---
 fill-disk.sh | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/fill-disk.sh b/fill-disk.sh
index 084295c4da8..5231fa7f97f 100755
--- a/fill-disk.sh
+++ b/fill-disk.sh
@@ -307,11 +307,15 @@ echo "root::12757:0:99999:7:::" > $root/etc/shadow
 ###
 strippedName=$(basename @kernel@);
 if echo "$strippedName" | grep -q '^[a-z0-9]\{32\}-'; then
-        strippedName=$(echo "$strippedName" | cut -c34-)
+        strippedName=$(echo "$strippedName" | cut -c34- | cut -c 7-)
 fi
 
-echo "stripped" $strippedName
+kernelhash=$(basename @kernel@);
+if echo "$kernelhash" | grep -q '^[a-z0-9]\{32\}-'; then
+        kernelhash=$(echo "$kernelhash" | cut -c -32)
+fi
 
+echo "kernelthing" $strippedName-$kernelhash
 
 ###
 ### Do funky stuff with grub here.
-- 
GitLab


From 240a2de945094f525d7a80bdc257e75dcc92f917 Mon Sep 17 00:00:00 2001
From: Armijn Hemel <armijn@gpl-violations.org>
Date: Tue, 23 Aug 2005 23:07:49 +0000
Subject: [PATCH 0078/5331] - make /lib/modules/<hash-part>-<kernelversion> -
 make symlinks to "build" and "kernel" in those directories - copy all
 modules.* files (like modules.dep). This is done so future add-on modules can
 modify these files instead of the ones in the store...

Since the Nix hash is embedded in the path, this can still be considered
safe and it makes modprobe work automagically.

svn path=/nixu/trunk/; revision=3674
---
 fill-disk.sh | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/fill-disk.sh b/fill-disk.sh
index 5231fa7f97f..a562fbda572 100755
--- a/fill-disk.sh
+++ b/fill-disk.sh
@@ -315,7 +315,14 @@ if echo "$kernelhash" | grep -q '^[a-z0-9]\{32\}-'; then
         kernelhash=$(echo "$kernelhash" | cut -c -32)
 fi
 
-echo "kernelthing" $strippedName-$kernelhash
+version=$strippedName-$kernelhash
+
+make_dir 0755 /lib/modules/$version
+
+ln -s @kernel@/lib/modules/$version/build $root/lib/modules/$version/build
+ln -s @kernel@/lib/modules/$version/kernel $root/lib/modules/$version/kernel
+cp @kernel@/lib/modules/$version/modules.* $root/lib/modules/$version
+chmod 644 $root/lib/modules/$version/modules.*
 
 ###
 ### Do funky stuff with grub here.
-- 
GitLab


From af61e915925fd766457d821823351a1482d25ac3 Mon Sep 17 00:00:00 2001
From: Armijn Hemel <armijn@gpl-violations.org>
Date: Wed, 24 Aug 2005 14:04:07 +0000
Subject: [PATCH 0079/5331] add /nix/var/nix/profiles and other nix related
 directories

svn path=/nixu/trunk/; revision=3680
---
 fill-disk.sh | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/fill-disk.sh b/fill-disk.sh
index a562fbda572..a96cdf39dde 100755
--- a/fill-disk.sh
+++ b/fill-disk.sh
@@ -139,7 +139,10 @@ make_dir 00755 /nix/store
 make_dir 00755 /nix/var
 make_dir 00755 /nix/var/nix
 make_dir 00755 /nix/var/nix/db
+make_dir 00755 /nix/var/nix/gcroots
 make_dir 00755 /nix/var/nix/manifests
+make_dir 00755 /nix/var/nix/profiles
+make_dir 00755 /nix/var/nix/temproots
 make_dir 00755 /nix/var/log
 make_dir 00755 /nix/var/log/nix
 make_dir 00755 /nixpkgs
-- 
GitLab


From de9fa851968adeb728634f6e8e249f26f88572e1 Mon Sep 17 00:00:00 2001
From: Armijn Hemel <armijn@gpl-violations.org>
Date: Thu, 25 Aug 2005 17:53:43 +0000
Subject: [PATCH 0080/5331] fix error in format

svn path=/nixu/trunk/; revision=3687
---
 storepaths_format | 1 +
 1 file changed, 1 insertion(+)

diff --git a/storepaths_format b/storepaths_format
index dbb20caa111..5b71b007445 100644
--- a/storepaths_format
+++ b/storepaths_format
@@ -1,4 +1,5 @@
 /nix/store/abcd-<package>
+deriver
 2
 /nix/store/1234-<package-1>
 /nix/store/5678-<package-2>
-- 
GitLab


From 3dce29bb92622cedfb6dcbe10abee793930ab038 Mon Sep 17 00:00:00 2001
From: Armijn Hemel <armijn@gpl-violations.org>
Date: Thu, 25 Aug 2005 23:10:36 +0000
Subject: [PATCH 0081/5331] make /var/run in the installdisk, add some code for
 registering the copied Nix store in the Nix database, still unfinished

svn path=/nixu/trunk/; revision=3690
---
 fill-disk.sh | 10 +++++++---
 make-disk.sh | 25 ++++++++++++++++++++++---
 2 files changed, 29 insertions(+), 6 deletions(-)

diff --git a/fill-disk.sh b/fill-disk.sh
index a96cdf39dde..b5bd0880f69 100755
--- a/fill-disk.sh
+++ b/fill-disk.sh
@@ -1,6 +1,6 @@
 #! @bash@/bin/sh -e
 
-export PATH=@bash@/bin:@coreutils@/bin:@findutils@/bin:@utillinux@/bin:@utillinux@/sbin:@e2fsprogs@/sbin:@grub@/sbin:@sysvinitPath@/sbin:@gnugrep@/bin
+export PATH=@bash@/bin:@coreutils@/bin:@findutils@/bin:@utillinux@/bin:@utillinux@/sbin:@e2fsprogs@/sbin:@grub@/sbin:@sysvinitPath@/sbin:@gnugrep@/bin:@which@/bin
 
 kernel=@kernel@
 
@@ -82,6 +82,7 @@ mknod -m 0600 /dev/initctl p
 
 targetdrive=/dev/hda
 device=${targetdrive}1
+echo ext2 fs blaat `which mkfs.ext2`
 mkfs.ext2 ${device}
 mkswap ${targetdrive}2
 
@@ -245,10 +246,12 @@ unset NIX_LOG_DIR
 unset NIX_STATE_DIR
 unset NIX_CONF_DIR
 
+storeExpr=$(echo '(import /tmp/scripts/pkgs.nix).kernel' | $NIX_CMD_PATH/nix-instantiate -v -v -)
 #storeExpr=$(echo '(import /tmp/scripts/pkgs.nix).everything' | $NIX_CMD_PATH/nix-instantiate -v -v -)
 #storeExpr=$(echo '(import ./pkgs.nix).everything' | $NIX_CMD_PATH/nix-instantiate -v -v -)
 #$NIX_CMD_PATH/nix-store -r $storeExpr
-#echo $storeExpr
+echo $storeExpr > $root/tmp/storeExpr
+cp /cdrom/mystorepaths $root/tmp
 #storeExpr2=$($NIX_CMD_PATH/nix-store -qR $($NIX_CMD_PATH/nix-store -r $storeExpr))
 #echo storeExpr $storeExpr
 #echo $($NIX_CMD_PATH/nix-store -qR --include-outputs $storeExpr)
@@ -347,4 +350,5 @@ echo umounting filesystem
 umount $root
 
 echo install done
-telinit 0
+#telinit 0
+shutdown -h now
diff --git a/make-disk.sh b/make-disk.sh
index 580ee797746..223e634ddc7 100755
--- a/make-disk.sh
+++ b/make-disk.sh
@@ -40,9 +40,24 @@ kernel=$($NIX_CMD_PATH/nix-store -r $(echo '(import ./pkgs.nix).kernel' | $NIX_C
 #nixDeps=$($NIX_CMD_PATH/nix-store -qR $(echo '(import ./pkgs.nix).nix' | $NIX_CMD_PATH/nix-instantiate -))
 
 #nixDeps=$($NIX_CMD_PATH/nix-store -qR $(nix-store -r $(echo '(import ./pkgs.nix).nix' | $NIX_CMD_PATH/nix-instantiate -)))
-echo $($NIX_CMD_PATH/nix-store -qR $(nix-store -r $(echo '(import ./pkgs.nix).nix' | $NIX_CMD_PATH/nix-instantiate -))) >> $storePaths
+#echo $($NIX_CMD_PATH/nix-store -qR $(nix-store -r $(echo '(import ./pkgs.nix).nix' | $NIX_CMD_PATH/nix-instantiate -))) >> $storePaths
+#$NIX_CMD_PATH/nix-store -qR $(nix-store -r $(echo '(import ./pkgs.nix).nix' | $NIX_CMD_PATH/nix-instantiate -)) >> $storePaths
 
-#echo $nixDeps > $storePaths
+nixblaat=$(nix-store -r $(echo '(import ./pkgs.nix).nix'| $NIX_CMD_PATH/nix-instantiate -))
+echo $nixblaat >> $storePaths
+echo '' >> $storePaths
+#echo 13 >> $storePaths
+## Nix does --references, not --requisites for registering paths
+nixdeps=$($NIX_CMD_PATH/nix-store -q --references $(nix-store -r $(echo '(import ./pkgs.nix).nix' | $NIX_CMD_PATH/nix-instantiate -)))
+
+pkgs=$(echo $nixdeps | wc -w)
+
+echo $pkgs >> $storePaths
+
+for i in $nixdeps
+do
+  echo $i >> $storePaths
+done
 
 utilLinux=$($NIX_CMD_PATH/nix-store -qR $(nix-store -r $(echo '(import ./pkgs.nix).utillinux' | $NIX_CMD_PATH/nix-instantiate -)))
 coreUtils=$($NIX_CMD_PATH/nix-store -qR $(nix-store -r $(echo '(import ./pkgs.nix).coreutils' | $NIX_CMD_PATH/nix-instantiate -)))
@@ -67,6 +82,7 @@ udev=$($NIX_CMD_PATH/nix-store -r $(echo '(import ./pkgs.nix).udev' | $NIX_CMD_P
 dhcp=$($NIX_CMD_PATH/nix-store -r $(echo '(import ./pkgs.nix).dhcpWrapper' | $NIX_CMD_PATH/nix-instantiate -))
 nano=$($NIX_CMD_PATH/nix-store -r $(echo '(import ./pkgs.nix).nano' | $NIX_CMD_PATH/nix-instantiate -))
 gnugrep=$($NIX_CMD_PATH/nix-store -r $(echo '(import ./pkgs.nix).gnugrep' | $NIX_CMD_PATH/nix-instantiate -))
+which=$($NIX_CMD_PATH/nix-store -r $(echo '(import ./pkgs.nix).which' | $NIX_CMD_PATH/nix-instantiate -))
 
 (while read storepath; do
    cp -fa --parents ${storepath} ${archivesDir}
@@ -100,6 +116,7 @@ mkdir ${initdir}/tmp
 mkdir -p ${initdir}/usr/bin
 mkdir -p ${initdir}/usr/sbin
 mkdir ${initdir}/var
+mkdir ${initdir}/var/run
 
 echo copying nixpkgs
 
@@ -140,6 +157,7 @@ sed -e "s^@sysvinitPath\@^$sysvinitPath^g" \
     -e "s^@kernel\@^$kernel^g" \
     -e "s^@hotplug\@^$hotplug^g" \
     -e "s^@gnugrep\@^$gnugrep^g" \
+    -e "s^@which\@^$which^g" \
     < $fill_disk > $fill_disk.tmp
 mv $fill_disk.tmp $fill_disk
 
@@ -174,6 +192,7 @@ cp -fau --parents ${coreUtils} ${initdir}
 cp -fau --parents ${e2fsProgs} ${initdir}
 cp -fau --parents ${modUtils} ${initdir}
 cp -fau --parents ${hotplug} ${initdir}
+cp -fau --parents ${which} ${initdir}
 
 touch ${initdir}/NIXOS
 
@@ -183,6 +202,7 @@ chmod -f -R +w ${initdir}/*
 rm -rf ${initdir}
 
 cp ${initrd} ${archivesDir}/isolinux
+rm -f ${initrd}
 
 echo creating ISO image
 
@@ -194,6 +214,5 @@ mkisofs -rJ -o ${bootiso} -b isolinux/isolinux.bin -c isolinux/boot.cat \
 
 echo cleaning up
 
-rm -f ${initrd}
 chmod -f -R +w ${archivesDir}/*
 rm -rf ${archivesDir}/*
-- 
GitLab


From 789f716808b25d3aa9ccff714c6dd5f5f1538201 Mon Sep 17 00:00:00 2001
From: Armijn Hemel <armijn@gpl-violations.org>
Date: Fri, 26 Aug 2005 16:06:52 +0000
Subject: [PATCH 0082/5331] use tar for copying nixpkgs instead of cp to speed
 up installation process. Commit 3700 :)

svn path=/nixu/trunk/; revision=3700
---
 fill-disk.sh |  5 +++--
 make-disk.sh | 10 +++++++++-
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/fill-disk.sh b/fill-disk.sh
index b5bd0880f69..6916cc740e1 100755
--- a/fill-disk.sh
+++ b/fill-disk.sh
@@ -1,6 +1,6 @@
 #! @bash@/bin/sh -e
 
-export PATH=@bash@/bin:@coreutils@/bin:@findutils@/bin:@utillinux@/bin:@utillinux@/sbin:@e2fsprogs@/sbin:@grub@/sbin:@sysvinitPath@/sbin:@gnugrep@/bin:@which@/bin
+export PATH=@bash@/bin:@coreutils@/bin:@findutils@/bin:@utillinux@/bin:@utillinux@/sbin:@e2fsprogs@/sbin:@grub@/sbin:@sysvinitPath@/sbin:@gnugrep@/bin:@which@/bin:@gnutar@/bin
 
 kernel=@kernel@
 
@@ -230,7 +230,8 @@ echo verifying Nix DB...
 $NIX_CMD_PATH/nix-store --verify
 
 echo copying nixpkgs...
-cp -fLa /cdrom/pkgs $root/nixpkgs/trunk
+#cp -fLa /cdrom/pkgs $root/nixpkgs/trunk
+tar --directory=/cdrom -cf - pkgs | tar --directory=$root/nixpkgs/trunk -xvf -
 
 make_dir 0755 /tmp/scripts
 cp -fa /cdrom/scripts $root/tmp
diff --git a/make-disk.sh b/make-disk.sh
index 223e634ddc7..63012c683e6 100755
--- a/make-disk.sh
+++ b/make-disk.sh
@@ -22,7 +22,7 @@ rm -rf ${archivesDir}/*
 
 NIX_CMD_PATH=/nix/bin
 
-storeExpr=$(echo '(import ./pkgs.nix).everything' | $NIX_CMD_PATH/nix-instantiate -v -v -)
+storeExpr=$($NIX_CMD_PATH/nix-store -qR $(echo '(import ./pkgs.nix).everything' | $NIX_CMD_PATH/nix-instantiate -))
 #$NIX_CMD_PATH/nix-push --copy $archivesDir $manifest $(nix-store -r $storeExpr) $(nix-store -r $(echo '(import ./pkgs.nix).kernel' | $NIX_CMD_PATH/nix-instantiate -))
 
 # Location of sysvinit?
@@ -59,6 +59,11 @@ do
   echo $i >> $storePaths
 done
 
+for i in $storeExpr
+do
+  echo $i >> $archivesDir/store-expressions
+done
+
 utilLinux=$($NIX_CMD_PATH/nix-store -qR $(nix-store -r $(echo '(import ./pkgs.nix).utillinux' | $NIX_CMD_PATH/nix-instantiate -)))
 coreUtils=$($NIX_CMD_PATH/nix-store -qR $(nix-store -r $(echo '(import ./pkgs.nix).coreutils' | $NIX_CMD_PATH/nix-instantiate -)))
 e2fsProgs=$($NIX_CMD_PATH/nix-store -qR $(nix-store -r $(echo '(import ./pkgs.nix).e2fsprogs' | $NIX_CMD_PATH/nix-instantiate -)))
@@ -83,6 +88,7 @@ dhcp=$($NIX_CMD_PATH/nix-store -r $(echo '(import ./pkgs.nix).dhcpWrapper' | $NI
 nano=$($NIX_CMD_PATH/nix-store -r $(echo '(import ./pkgs.nix).nano' | $NIX_CMD_PATH/nix-instantiate -))
 gnugrep=$($NIX_CMD_PATH/nix-store -r $(echo '(import ./pkgs.nix).gnugrep' | $NIX_CMD_PATH/nix-instantiate -))
 which=$($NIX_CMD_PATH/nix-store -r $(echo '(import ./pkgs.nix).which' | $NIX_CMD_PATH/nix-instantiate -))
+gnutar=$($NIX_CMD_PATH/nix-store -r $(echo '(import ./pkgs.nix).gnutar' | $NIX_CMD_PATH/nix-instantiate -))
 
 (while read storepath; do
    cp -fa --parents ${storepath} ${archivesDir}
@@ -137,6 +143,7 @@ cp -fvau --parents ${hotplug} ${archivesDir}
 cp -fvau --parents ${udev} ${archivesDir}
 cp -fvau --parents ${dhcp} ${archivesDir}
 cp -fvau --parents ${nano} ${archivesDir}
+cp -fvau --parents ${gnutar} ${archivesDir}
 
 bashdeps=$($NIX_CMD_PATH/nix-store -qR $(nix-store -r $(echo '(import ./pkgs.nix).bash' | $NIX_CMD_PATH/nix-instantiate -)))
 
@@ -158,6 +165,7 @@ sed -e "s^@sysvinitPath\@^$sysvinitPath^g" \
     -e "s^@hotplug\@^$hotplug^g" \
     -e "s^@gnugrep\@^$gnugrep^g" \
     -e "s^@which\@^$which^g" \
+    -e "s^@gnutar\@^$gnutar^g" \
     < $fill_disk > $fill_disk.tmp
 mv $fill_disk.tmp $fill_disk
 
-- 
GitLab


From 3b7a4df52ee78186ebe2a53ab0a565a175f971f5 Mon Sep 17 00:00:00 2001
From: Armijn Hemel <armijn@gpl-violations.org>
Date: Fri, 26 Aug 2005 18:38:57 +0000
Subject: [PATCH 0083/5331] use tar instead of cp, which should be a bit faster
 (but is it really?)

svn path=/nixu/trunk/; revision=3709
---
 fill-disk.sh | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/fill-disk.sh b/fill-disk.sh
index 6916cc740e1..2a44c22f908 100755
--- a/fill-disk.sh
+++ b/fill-disk.sh
@@ -263,7 +263,8 @@ echo copying store
   #cp -fa $storepaths $root/nix/store
 #done) < /cdrom/mystorepaths
 
-cp -fva /nix/store/* $root/nix/store
+#cp -fva /nix/store/* $root/nix/store
+tar cf - /nix/store | tar --directory=$root -xvf -
 
 #echo registering valid paths...
 #(while read storepath; do
@@ -301,7 +302,7 @@ echo 192.168.150.3 > $root/etc/networking/gateway-ip
 #cp /etc/resolv.conf $root/etc
 rm -f $root/etc/hosts
 echo "127.0.0.1 localhost" >> $root/etc/hosts
-echo "192.168.150.1 uml" >> $root/etc/hosts
+#echo "192.168.150.1 uml" >> $root/etc/hosts
 
 echo setting up initial account information...
 
@@ -352,4 +353,5 @@ umount $root
 
 echo install done
 #telinit 0
+ln -s @sysvinitPath@/sbin/init /sbin/init
 shutdown -h now
-- 
GitLab


From 796f3bb6913cf08de035eaf2e07a07273a78745a Mon Sep 17 00:00:00 2001
From: Armijn Hemel <armijn@gpl-violations.org>
Date: Fri, 26 Aug 2005 22:21:29 +0000
Subject: [PATCH 0084/5331] add grub configuration file (menu.lst) during
 installation

svn path=/nixu/trunk/; revision=3715
---
 fill-disk.sh | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/fill-disk.sh b/fill-disk.sh
index 2a44c22f908..cab29a3fb22 100755
--- a/fill-disk.sh
+++ b/fill-disk.sh
@@ -347,6 +347,15 @@ echo installing bootloader
 
 grub-install --root-directory=${root} --no-floppy ${targetdrive}
 
+# FIXME "root (hd0,0)"
+cat > $root/boot/grub/menu.lst << GRUBEND
+default=0
+timeout=5
+title NixOS
+        root (hd0,0)
+        kernel @kernel@/vmlinuz root=$device
+GRUBEND
+
 echo umounting filesystem
 
 umount $root
-- 
GitLab


From a3ae8f4143245ca403098758d1984a06fbf56cf3 Mon Sep 17 00:00:00 2001
From: Armijn Hemel <armijn@gpl-violations.org>
Date: Sat, 27 Aug 2005 00:04:30 +0000
Subject: [PATCH 0085/5331] remove some debugging statements

svn path=/nixu/trunk/; revision=3716
---
 fill-disk.sh | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/fill-disk.sh b/fill-disk.sh
index cab29a3fb22..bb699d6de68 100755
--- a/fill-disk.sh
+++ b/fill-disk.sh
@@ -4,6 +4,8 @@ export PATH=@bash@/bin:@coreutils@/bin:@findutils@/bin:@utillinux@/bin:@utillinu
 
 kernel=@kernel@
 
+storePaths=/mystorepaths
+
 sysvinitPath=@sysvinitPath@
 bootPath=@bootPath@
 modutils=@modutils@
@@ -82,7 +84,6 @@ mknod -m 0600 /dev/initctl p
 
 targetdrive=/dev/hda
 device=${targetdrive}1
-echo ext2 fs blaat `which mkfs.ext2`
 mkfs.ext2 ${device}
 mkswap ${targetdrive}2
 
@@ -198,8 +199,6 @@ do
 echo "Looking for CDROM in: $i"
 if mount -t iso9660 $i /cdrom >/dev/null 2>&1
 then
-  echo "cdrom contents"
-  ls /cdrom
   if test -f /cdrom/NIXOS
   then
     cddevice=$i
@@ -266,7 +265,10 @@ echo copying store
 #cp -fva /nix/store/* $root/nix/store
 tar cf - /nix/store | tar --directory=$root -xvf -
 
-#echo registering valid paths...
+echo registering valid paths...
+
+$NIX_CMD_PATH/nix-store --register-validity < $root/tmp/mystorepaths
+
 #(while read storepath; do
 #    echo PATH $storepath
 #    if ! $NIX_CMD_PATH/nix-store --isvalid $storepath 2> /dev/null; then
@@ -336,7 +338,6 @@ chmod 644 $root/lib/modules/$version/modules.*
 ### Do funky stuff with grub here.
 ###
 
-ln -s @kernel@/vmlinuz $root/boot/vmlinuz
 ln -s @sysvinitPath@/sbin/init $root/sbin/init
 ln -s @hotplug@/sbin/hotplug $root/sbin/hotplug
 ln -s @hotplug@/etc/hotplug $root/etc/hotplug
-- 
GitLab


From fff45e114e464e554a91bc8b77032e16ca368f65 Mon Sep 17 00:00:00 2001
From: Armijn Hemel <armijn@gpl-violations.org>
Date: Sat, 27 Aug 2005 00:36:07 +0000
Subject: [PATCH 0086/5331] - register all valid paths inside the Nix database.
 The .drv files are not included, this is a purely binary deployment. - add
 grub to the initial environment

svn path=/nixu/trunk/; revision=3717
---
 boot/builder.sh |  2 +-
 make-disk.sh    | 66 +++++++++++++++++++++++++++++--------------------
 2 files changed, 40 insertions(+), 28 deletions(-)

diff --git a/boot/builder.sh b/boot/builder.sh
index 1a94fb52d0f..a350d06e020 100755
--- a/boot/builder.sh
+++ b/boot/builder.sh
@@ -36,7 +36,7 @@ for i in $boot $halt $login $env; do
         -e "s^@gcc\@^$gcc^g" \
         -e "s^@mingetty\@^$mingetty^g" \
         -e "s^@module_init_tools\@^$module_init_tools^g" \
-        -e "s^@grub\@^$grub^g" \
+        -e "s^@grub\@^$grubWrapper^g" \
         -e "s^@udev\@^$udev^g" \
         -e "s^@dhcpWrapper\@^$dhcpWrapper^g" \
         -e "s^@man\@^$man^g" \
diff --git a/make-disk.sh b/make-disk.sh
index 63012c683e6..6c42916df1b 100755
--- a/make-disk.sh
+++ b/make-disk.sh
@@ -22,7 +22,7 @@ rm -rf ${archivesDir}/*
 
 NIX_CMD_PATH=/nix/bin
 
-storeExpr=$($NIX_CMD_PATH/nix-store -qR $(echo '(import ./pkgs.nix).everything' | $NIX_CMD_PATH/nix-instantiate -))
+storeExpr=$($NIX_CMD_PATH/nix-store -qR $($NIX_CMD_PATH/nix-store -r $(echo '(import ./pkgs.nix).everything' | $NIX_CMD_PATH/nix-instantiate -)))
 #$NIX_CMD_PATH/nix-push --copy $archivesDir $manifest $(nix-store -r $storeExpr) $(nix-store -r $(echo '(import ./pkgs.nix).kernel' | $NIX_CMD_PATH/nix-instantiate -))
 
 # Location of sysvinit?
@@ -43,25 +43,37 @@ kernel=$($NIX_CMD_PATH/nix-store -r $(echo '(import ./pkgs.nix).kernel' | $NIX_C
 #echo $($NIX_CMD_PATH/nix-store -qR $(nix-store -r $(echo '(import ./pkgs.nix).nix' | $NIX_CMD_PATH/nix-instantiate -))) >> $storePaths
 #$NIX_CMD_PATH/nix-store -qR $(nix-store -r $(echo '(import ./pkgs.nix).nix' | $NIX_CMD_PATH/nix-instantiate -)) >> $storePaths
 
-nixblaat=$(nix-store -r $(echo '(import ./pkgs.nix).nix'| $NIX_CMD_PATH/nix-instantiate -))
-echo $nixblaat >> $storePaths
-echo '' >> $storePaths
+#nixblaat=$(nix-store -r $(echo '(import ./pkgs.nix).nix'| $NIX_CMD_PATH/nix-instantiate -))
+#echo $nixblaat >> $storePaths
+#echo '' >> $storePaths
 #echo 13 >> $storePaths
 ## Nix does --references, not --requisites for registering paths
-nixdeps=$($NIX_CMD_PATH/nix-store -q --references $(nix-store -r $(echo '(import ./pkgs.nix).nix' | $NIX_CMD_PATH/nix-instantiate -)))
+#nixdeps=$($NIX_CMD_PATH/nix-store -q --references $(nix-store -r $(echo '(import ./pkgs.nix).nix' | $NIX_CMD_PATH/nix-instantiate -)))
 
-pkgs=$(echo $nixdeps | wc -w)
+#pkgs=$(echo $nixdeps | wc -w)
 
-echo $pkgs >> $storePaths
+#echo $pkgs >> $storePaths
 
-for i in $nixdeps
-do
-  echo $i >> $storePaths
-done
+#for i in $nixdeps
+#do
+  #echo $i >> $storePaths
+#done
 
 for i in $storeExpr
 do
   echo $i >> $archivesDir/store-expressions
+  echo $i >> $archivesDir/store-expressions-storepath
+  echo $i >> $storePaths
+  echo '' >> $storePaths
+  deps=$($NIX_CMD_PATH/nix-store -q --references $i)
+  pkgs=$(echo $deps | wc -w)
+  echo $pkgs >> $storePaths
+  for j in $deps
+  do
+    echo $j >> $storePaths
+  done
+  echo copying from store: $i
+  tar -cf - $i | tar --directory=$archivesDir -xf -
 done
 
 utilLinux=$($NIX_CMD_PATH/nix-store -qR $(nix-store -r $(echo '(import ./pkgs.nix).utillinux' | $NIX_CMD_PATH/nix-instantiate -)))
@@ -90,9 +102,9 @@ gnugrep=$($NIX_CMD_PATH/nix-store -r $(echo '(import ./pkgs.nix).gnugrep' | $NIX
 which=$($NIX_CMD_PATH/nix-store -r $(echo '(import ./pkgs.nix).which' | $NIX_CMD_PATH/nix-instantiate -))
 gnutar=$($NIX_CMD_PATH/nix-store -r $(echo '(import ./pkgs.nix).gnutar' | $NIX_CMD_PATH/nix-instantiate -))
 
-(while read storepath; do
-   cp -fa --parents ${storepath} ${archivesDir}
-done) < $storePaths
+#(while read storepath; do
+   #cp -fa --parents ${storepath} ${archivesDir}
+#done) < $storePaths
 
 echo utillinux $utilLinux
 
@@ -129,21 +141,21 @@ echo copying nixpkgs
 svn export ${nixpkgs} ${archivesDir}/pkgs
 #cp -fa ${nixpkgs} ${archivesDir}
 
-echo copying packages from store
+#echo copying packages from store
 
 #cp -fa --parents ${nixDeps} ${archivesDir}
-cp -fvau --parents ${utilLinux} ${archivesDir}
-cp -fvau --parents ${Grub} ${archivesDir}
-#cp -fau --parents ${gnuSed} ${archivesDir}
-#cp -fau --parents ${gnuGrep} ${archivesDir}
-cp -fvau --parents ${Kernel} ${archivesDir}
-cp -fvau --parents ${SysVinit} ${archivesDir}
-cp -fvau --parents ${BootPath} ${archivesDir}
-cp -fvau --parents ${hotplug} ${archivesDir}
-cp -fvau --parents ${udev} ${archivesDir}
-cp -fvau --parents ${dhcp} ${archivesDir}
-cp -fvau --parents ${nano} ${archivesDir}
-cp -fvau --parents ${gnutar} ${archivesDir}
+#cp -fvau --parents ${utilLinux} ${archivesDir}
+#cp -fvau --parents ${Grub} ${archivesDir}
+##cp -fau --parents ${gnuSed} ${archivesDir}
+##cp -fau --parents ${gnuGrep} ${archivesDir}
+#cp -fvau --parents ${Kernel} ${archivesDir}
+#cp -fvau --parents ${SysVinit} ${archivesDir}
+#cp -fvau --parents ${BootPath} ${archivesDir}
+#cp -fvau --parents ${hotplug} ${archivesDir}
+#cp -fvau --parents ${udev} ${archivesDir}
+#cp -fvau --parents ${dhcp} ${archivesDir}
+#cp -fvau --parents ${nano} ${archivesDir}
+#cp -fvau --parents ${gnutar} ${archivesDir}
 
 bashdeps=$($NIX_CMD_PATH/nix-store -qR $(nix-store -r $(echo '(import ./pkgs.nix).bash' | $NIX_CMD_PATH/nix-instantiate -)))
 
-- 
GitLab


From de289092b2066b22dd62b1ffa9542ce36b7ee5dd Mon Sep 17 00:00:00 2001
From: Armijn Hemel <armijn@gpl-violations.org>
Date: Sun, 28 Aug 2005 00:51:34 +0000
Subject: [PATCH 0087/5331] - various cleanups - have mingetty listen on tty2
 (but this still fails because of missing /dev/log - get rid of /init on the
 targetdrive, solely use /sbin/init (and even that has to go one day) - use
 dietlibc statically linked e2fsprogs for the installer. More to come :)

svn path=/nixu/trunk/; revision=3734
---
 boot/builder.sh  |  2 +-
 boot/default.nix |  4 ++--
 boot/env.sh      |  2 +-
 fill-disk.sh     | 44 ++++++++++++--------------------------------
 make-disk.sh     |  6 ++++--
 pkgs.nix         | 11 ++++++-----
 6 files changed, 26 insertions(+), 43 deletions(-)

diff --git a/boot/builder.sh b/boot/builder.sh
index a350d06e020..bef4682093d 100755
--- a/boot/builder.sh
+++ b/boot/builder.sh
@@ -34,7 +34,7 @@ for i in $boot $halt $login $env; do
         -e "s^@gnugrep\@^$gnugrep^g" \
         -e "s^@gzip\@^$gzip^g" \
         -e "s^@gcc\@^$gcc^g" \
-        -e "s^@mingetty\@^$mingetty^g" \
+        -e "s^@mingettyWrapper\@^$mingettyWrapper^g" \
         -e "s^@module_init_tools\@^$module_init_tools^g" \
         -e "s^@grub\@^$grubWrapper^g" \
         -e "s^@udev\@^$udev^g" \
diff --git a/boot/default.nix b/boot/default.nix
index dc3632f8f70..17957c934a7 100644
--- a/boot/default.nix
+++ b/boot/default.nix
@@ -1,7 +1,7 @@
 { stdenv, kernel, bash, coreutils, findutilsWrapper, utillinux, sysvinit, e2fsprogs
 , nettools, nix, subversion, gcc, wget, which, vim, less, screen, openssh
 , binutils, strace, shadowutils, iputils, gnumake, curl, gnused, gnugrep
-, gnutar, gzip, mingetty, grubWrapper, parted, module_init_tools, hotplug
+, gnutar, gzip, mingettyWrapper, grubWrapper, parted, module_init_tools, hotplug
 , udev, dhcpWrapper, man, nano}:
 
 derivation {
@@ -15,6 +15,6 @@ derivation {
   inherit stdenv kernel bash coreutils findutilsWrapper utillinux sysvinit
           e2fsprogs nettools nix subversion gcc wget which vim less screen
           openssh binutils strace shadowutils iputils gnumake curl gnused
-          gnutar gnugrep gzip mingetty grubWrapper parted module_init_tools
+          gnutar gnugrep gzip mingettyWrapper grubWrapper parted module_init_tools
           udev dhcpWrapper man nano;
 }
diff --git a/boot/env.sh b/boot/env.sh
index 1f151ae93b3..ee481270ee9 100644
--- a/boot/env.sh
+++ b/boot/env.sh
@@ -1 +1 @@
-export PATH=@nix@/bin:@bash@/bin:@coreutils@/bin:@findutilsWrapper@/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:@curl@/bin:@gnused@/bin:@gnutar@/bin:@gnugrep@/bin:@gzip@/bin:@mingetty@/sbin:@grub@/bin:@grub@/sbin:@module_init_tools@/sbin:@dhcpWrapper@/sbin:@man@/bin:@nano@/bin
+export PATH=@nix@/bin:@bash@/bin:@coreutils@/bin:@findutilsWrapper@/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:@curl@/bin:@gnused@/bin:@gnutar@/bin:@gnugrep@/bin:@gzip@/bin:@mingettyWrapper@/sbin:@grub@/bin:@grub@/sbin:@module_init_tools@/sbin:@dhcpWrapper@/sbin:@man@/bin:@nano@/bin
diff --git a/fill-disk.sh b/fill-disk.sh
index bb699d6de68..df64f730219 100755
--- a/fill-disk.sh
+++ b/fill-disk.sh
@@ -2,6 +2,11 @@
 
 export PATH=@bash@/bin:@coreutils@/bin:@findutils@/bin:@utillinux@/bin:@utillinux@/sbin:@e2fsprogs@/sbin:@grub@/sbin:@sysvinitPath@/sbin:@gnugrep@/bin:@which@/bin:@gnutar@/bin
 
+##
+## In the beginning we want to have a minimalistic environment, built with
+## klibc.
+##
+
 kernel=@kernel@
 
 storePaths=/mystorepaths
@@ -10,6 +15,7 @@ sysvinitPath=@sysvinitPath@
 bootPath=@bootPath@
 modutils=@modutils@
 hotplug=@hotplug@
+mingetty=@mingetty@
 
 echo mounting special filesystems
 
@@ -176,22 +182,13 @@ mknod -m 0600 $root/dev/tty0 c 4 0
 mknod -m 0600 $root/dev/tty1 c 4 1
 mknod -m 0444 $root/dev/urandom c 1 9
 
-#touch_file /etc/passwd
-#touch_file /etc/shadow
-#touch_file /etc/group
-
 rm -f $root/etc/mtab
 #ln -s /proc/mounts $root/etc/mtab
 
-#cat /proc/mounts
-
 ## Probe for CD device which contains our CD here and mount /nix and
 ## /nixpkgs from it inside the ramdisk. Anaconda uses kudzu for this.
 ## Find out how Knoppix and SUSE do this...
 
-#devices=$(grep -r cdrom hd* | cut -d '/' -f 1 | sort | uniq)
-#echo devices ${devices}
-
 DEVICES="/dev/hd?"
 
 for i in ${DEVICES}
@@ -204,13 +201,14 @@ then
     cddevice=$i
     echo "Accessing NixOS CDROM at $i"
   break
-fi
-#umount /cdrom
+  fi
 fi
 done
 
 echo switch to /nix and /nixpkgs from CD
 
+## starting here it's OK to have full blown glibc
+
 ln -s /cdrom/nixpkgs /nixpkgs
 mount --bind /cdrom/nix /nix
 
@@ -222,7 +220,6 @@ export NIX_CONF_DIR=$root/nix/etc
 NIX_CMD_PATH=@NIX_CMD_PATH@/bin
 
 echo initialising Nix DB...
-#/nix/bin/nix-store --init
 $NIX_CMD_PATH/nix-store --init
 
 echo verifying Nix DB...
@@ -258,10 +255,6 @@ cp /cdrom/mystorepaths $root/tmp
 
 echo copying store
 
-#(while read storepaths; do
-  #cp -fa $storepaths $root/nix/store
-#done) < /cdrom/mystorepaths
-
 #cp -fva /nix/store/* $root/nix/store
 tar cf - /nix/store | tar --directory=$root -xvf -
 
@@ -269,23 +262,10 @@ echo registering valid paths...
 
 $NIX_CMD_PATH/nix-store --register-validity < $root/tmp/mystorepaths
 
-#(while read storepath; do
-#    echo PATH $storepath
-#    if ! $NIX_CMD_PATH/nix-store --isvalid $storepath 2> /dev/null; then
-#        (unset NIX_ROOT; $NIX_CMD_PATH/nix-store --dump $storepath) | $NIX_CMD_PATH/nix-store --restore $storepath
-#        $NIX_CMD_PATH/nix-store --validpath $storepath
-#    fi
-#done) < /tmp/mystorepaths
-
-#echo registering successors...
-#(while read line; do
-#    echo SUCC $line
-#    $NIX_CMD_PATH/nix-store --successor $line
-#done) < /tmp/mysuccessors
-
 echo setting init symlink...
 rm -f $root/init
-ln -s $sysvinitPath/sbin/init $root/init
+#ln -s $sysvinitPath/sbin/init $root/init
+ln -s @sysvinitPath@/sbin/init $root/sbin/init
 ln -s @bash@/bin/sh $root/bin/sh
 ln -s @bash@/bin/bash $root/bin/bash
 
@@ -295,6 +275,7 @@ echo "id:2:initdefault:" >> $root/etc/inittab
 echo "si::bootwait:$bootPath/bin/boot.sh" >> $root/etc/inittab
 echo "ht:06:wait:$bootPath/bin/halt.sh" >> $root/etc/inittab
 echo "1:2345:respawn:$bootPath/bin/login.sh /dev/tty1" >> $root/etc/inittab
+echo "2:2345:respawn:$mingetty/sbin/mingetty tty2" >> $root/etc/inittab
 #echo "2:2345:respawn:$bootPath/bin/login.sh /dev/ttys/1" >> $root/etc/inittab
 
 echo setting up networking information...
@@ -338,7 +319,6 @@ chmod 644 $root/lib/modules/$version/modules.*
 ### Do funky stuff with grub here.
 ###
 
-ln -s @sysvinitPath@/sbin/init $root/sbin/init
 ln -s @hotplug@/sbin/hotplug $root/sbin/hotplug
 ln -s @hotplug@/etc/hotplug $root/etc/hotplug
 ln -s @hotplug@/etc/hotplug.d $root/etc/hotplug.d
diff --git a/make-disk.sh b/make-disk.sh
index 6c42916df1b..3d33571ec99 100755
--- a/make-disk.sh
+++ b/make-disk.sh
@@ -78,7 +78,7 @@ done
 
 utilLinux=$($NIX_CMD_PATH/nix-store -qR $(nix-store -r $(echo '(import ./pkgs.nix).utillinux' | $NIX_CMD_PATH/nix-instantiate -)))
 coreUtils=$($NIX_CMD_PATH/nix-store -qR $(nix-store -r $(echo '(import ./pkgs.nix).coreutils' | $NIX_CMD_PATH/nix-instantiate -)))
-e2fsProgs=$($NIX_CMD_PATH/nix-store -qR $(nix-store -r $(echo '(import ./pkgs.nix).e2fsprogs' | $NIX_CMD_PATH/nix-instantiate -)))
+e2fsProgs=$($NIX_CMD_PATH/nix-store -qR $(nix-store -r $(echo '(import ./pkgs.nix).e2fsprogsDiet' | $NIX_CMD_PATH/nix-instantiate -)))
 modUtils=$($NIX_CMD_PATH/nix-store -qR $(nix-store -r $(echo '(import ./pkgs.nix).module_init_tools' | $NIX_CMD_PATH/nix-instantiate -)))
 Grub=$($NIX_CMD_PATH/nix-store -qR $(nix-store -r $(echo '(import ./pkgs.nix).grubWrapper' | $NIX_CMD_PATH/nix-instantiate -)))
 #gnuSed=$($NIX_CMD_PATH/nix-store -qR $(nix-store -r $(echo '(import ./pkgs.nix).gnused' | $NIX_CMD_PATH/nix-instantiate -)))
@@ -91,9 +91,10 @@ bash=$($NIX_CMD_PATH/nix-store -q $(echo '(import ./pkgs.nix).bash' | $NIX_CMD_P
 coreutils=$($NIX_CMD_PATH/nix-store -q $(echo '(import ./pkgs.nix).coreutils' | $NIX_CMD_PATH/nix-instantiate -))
 findutils=$($NIX_CMD_PATH/nix-store -q $(echo '(import ./pkgs.nix).findutilsWrapper' | $NIX_CMD_PATH/nix-instantiate -))
 utillinux=$($NIX_CMD_PATH/nix-store -q $(echo '(import ./pkgs.nix).utillinux' | $NIX_CMD_PATH/nix-instantiate -))
-e2fsprogs=$($NIX_CMD_PATH/nix-store -q $(echo '(import ./pkgs.nix).e2fsprogs' | $NIX_CMD_PATH/nix-instantiate -))
+e2fsprogs=$($NIX_CMD_PATH/nix-store -q $(echo '(import ./pkgs.nix).e2fsprogsDiet' | $NIX_CMD_PATH/nix-instantiate -))
 modutils=$($NIX_CMD_PATH/nix-store -q $(echo '(import ./pkgs.nix).module_init_tools' | $NIX_CMD_PATH/nix-instantiate -))
 grub=$($NIX_CMD_PATH/nix-store -r $(echo '(import ./pkgs.nix).grubWrapper' | $NIX_CMD_PATH/nix-instantiate -))
+mingettyWrapper=$($NIX_CMD_PATH/nix-store -r $(echo '(import ./pkgs.nix).mingettyWrapper' | $NIX_CMD_PATH/nix-instantiate -))
 hotplug=$($NIX_CMD_PATH/nix-store -r $(echo '(import ./pkgs.nix).hotplug' | $NIX_CMD_PATH/nix-instantiate -))
 udev=$($NIX_CMD_PATH/nix-store -r $(echo '(import ./pkgs.nix).udev' | $NIX_CMD_PATH/nix-instantiate -))
 dhcp=$($NIX_CMD_PATH/nix-store -r $(echo '(import ./pkgs.nix).dhcpWrapper' | $NIX_CMD_PATH/nix-instantiate -))
@@ -178,6 +179,7 @@ sed -e "s^@sysvinitPath\@^$sysvinitPath^g" \
     -e "s^@gnugrep\@^$gnugrep^g" \
     -e "s^@which\@^$which^g" \
     -e "s^@gnutar\@^$gnutar^g" \
+    -e "s^@mingetty\@^$mingettyWrapper^g" \
     < $fill_disk > $fill_disk.tmp
 mv $fill_disk.tmp $fill_disk
 
diff --git a/pkgs.nix b/pkgs.nix
index af8d61a3f36..d02d0a7a134 100644
--- a/pkgs.nix
+++ b/pkgs.nix
@@ -1,19 +1,20 @@
 rec {
   inherit (import /nixpkgs/trunk/pkgs/system/i686-linux.nix)
-    stdenv kernel bash coreutils findutilsWrapper utillinux sysvinit e2fsprogs
+    stdenv kernel bash coreutils findutilsWrapper utillinux sysvinit
+   e2fsprogsDiet e2fsprogs
     nettools nix subversion gcc wget which vim less screen openssh binutils
     strace shadowutils iputils gnumake curl gnused gnutar gnugrep gzip
-    mingetty grubWrapper syslinux parted module_init_tools hotplug udev
+    mingettyWrapper grubWrapper syslinux parted module_init_tools hotplug udev
     dhcpWrapper man nano;
 
   boot = (import ./boot) {inherit stdenv kernel bash coreutils findutilsWrapper
     utillinux sysvinit e2fsprogs nettools nix subversion gcc wget which vim
     less screen openssh binutils strace shadowutils iputils gnumake curl
-    gnused gnutar gnugrep gzip mingetty grubWrapper parted module_init_tools
+    gnused gnutar gnugrep gzip mingettyWrapper grubWrapper parted module_init_tools
     hotplug udev dhcpWrapper man nano;};
 
-  init = (import ./init) {inherit stdenv bash coreutils utillinux e2fsprogs
-    nix shadowutils mingetty grubWrapper parted module_init_tools hotplug
+  init = (import ./init) {inherit stdenv bash coreutils utillinux e2fsprogsDiet
+    nix shadowutils mingettyWrapper grubWrapper parted module_init_tools hotplug
     dhcpWrapper man nano;};
 
   everything = [boot sysvinit kernel];
-- 
GitLab


From 142cef0a9eed3db300d5b2a2bd6534924e12cdb7 Mon Sep 17 00:00:00 2001
From: Armijn Hemel <armijn@gpl-violations.org>
Date: Sun, 28 Aug 2005 16:56:48 +0000
Subject: [PATCH 0088/5331] switch to dietlibc coreutils in the initrams. Use
 thit up until a certain point, after which we switch to the normal coreutils.
 Oh, this should really be refactored...

svn path=/nixu/trunk/; revision=3738
---
 fill-disk.sh | 2 +-
 make-disk.sh | 6 ++++--
 pkgs.nix     | 4 ++--
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/fill-disk.sh b/fill-disk.sh
index df64f730219..203f4ac59a7 100755
--- a/fill-disk.sh
+++ b/fill-disk.sh
@@ -1,6 +1,6 @@
 #! @bash@/bin/sh -e
 
-export PATH=@bash@/bin:@coreutils@/bin:@findutils@/bin:@utillinux@/bin:@utillinux@/sbin:@e2fsprogs@/sbin:@grub@/sbin:@sysvinitPath@/sbin:@gnugrep@/bin:@which@/bin:@gnutar@/bin
+export PATH=@bash@/bin:@coreutilsdiet@/bin:@coreutils@/bin:@findutils@/bin:@utillinux@/bin:@utillinux@/sbin:@e2fsprogs@/sbin:@grub@/sbin:@sysvinitPath@/sbin:@gnugrep@/bin:@which@/bin:@gnutar@/bin
 
 ##
 ## In the beginning we want to have a minimalistic environment, built with
diff --git a/make-disk.sh b/make-disk.sh
index 3d33571ec99..c8dd31d3b0a 100755
--- a/make-disk.sh
+++ b/make-disk.sh
@@ -77,7 +77,7 @@ do
 done
 
 utilLinux=$($NIX_CMD_PATH/nix-store -qR $(nix-store -r $(echo '(import ./pkgs.nix).utillinux' | $NIX_CMD_PATH/nix-instantiate -)))
-coreUtils=$($NIX_CMD_PATH/nix-store -qR $(nix-store -r $(echo '(import ./pkgs.nix).coreutils' | $NIX_CMD_PATH/nix-instantiate -)))
+coreUtilsDiet=$($NIX_CMD_PATH/nix-store -qR $(nix-store -r $(echo '(import ./pkgs.nix).coreutilsDiet' | $NIX_CMD_PATH/nix-instantiate -)))
 e2fsProgs=$($NIX_CMD_PATH/nix-store -qR $(nix-store -r $(echo '(import ./pkgs.nix).e2fsprogsDiet' | $NIX_CMD_PATH/nix-instantiate -)))
 modUtils=$($NIX_CMD_PATH/nix-store -qR $(nix-store -r $(echo '(import ./pkgs.nix).module_init_tools' | $NIX_CMD_PATH/nix-instantiate -)))
 Grub=$($NIX_CMD_PATH/nix-store -qR $(nix-store -r $(echo '(import ./pkgs.nix).grubWrapper' | $NIX_CMD_PATH/nix-instantiate -)))
@@ -88,6 +88,7 @@ SysVinit=$($NIX_CMD_PATH/nix-store -qR $(nix-store -r $(echo '(import ./pkgs.nix
 BootPath=$($NIX_CMD_PATH/nix-store -qR $(nix-store -r $(echo '(import ./pkgs.nix).boot' | $NIX_CMD_PATH/nix-instantiate -)))
 
 bash=$($NIX_CMD_PATH/nix-store -q $(echo '(import ./pkgs.nix).bash' | $NIX_CMD_PATH/nix-instantiate -))
+coreutilsdiet=$($NIX_CMD_PATH/nix-store -q $(echo '(import ./pkgs.nix).coreutilsDiet' | $NIX_CMD_PATH/nix-instantiate -))
 coreutils=$($NIX_CMD_PATH/nix-store -q $(echo '(import ./pkgs.nix).coreutils' | $NIX_CMD_PATH/nix-instantiate -))
 findutils=$($NIX_CMD_PATH/nix-store -q $(echo '(import ./pkgs.nix).findutilsWrapper' | $NIX_CMD_PATH/nix-instantiate -))
 utillinux=$($NIX_CMD_PATH/nix-store -q $(echo '(import ./pkgs.nix).utillinux' | $NIX_CMD_PATH/nix-instantiate -))
@@ -169,6 +170,7 @@ sed -e "s^@sysvinitPath\@^$sysvinitPath^g" \
     -e "s^@NIX_CMD_PATH\@^$nix^g" \
     -e "s^@bash\@^$bash^g" \
     -e "s^@findutils\@^$findutils^g" \
+    -e "s^@coreutilsdiet\@^$coreutilsdiet^g" \
     -e "s^@coreutils\@^$coreutils^g" \
     -e "s^@utillinux\@^$utillinux^g" \
     -e "s^@e2fsprogs\@^$e2fsprogs^g" \
@@ -210,7 +212,7 @@ ln -s ${bash}/bin/bash ${initdir}/bin/sh
 chmod u+x ${initdir}/init
 cp -fau --parents ${bashdeps} ${initdir}
 cp -fau --parents ${utilLinux} ${initdir}
-cp -fau --parents ${coreUtils} ${initdir}
+cp -fau --parents ${coreUtilsDiet} ${initdir}
 cp -fau --parents ${e2fsProgs} ${initdir}
 cp -fau --parents ${modUtils} ${initdir}
 cp -fau --parents ${hotplug} ${initdir}
diff --git a/pkgs.nix b/pkgs.nix
index d02d0a7a134..fff17e9921d 100644
--- a/pkgs.nix
+++ b/pkgs.nix
@@ -1,6 +1,6 @@
 rec {
   inherit (import /nixpkgs/trunk/pkgs/system/i686-linux.nix)
-    stdenv kernel bash coreutils findutilsWrapper utillinux sysvinit
+    stdenv kernel bash coreutils coreutilsDiet findutilsWrapper utillinux sysvinit
    e2fsprogsDiet e2fsprogs
     nettools nix subversion gcc wget which vim less screen openssh binutils
     strace shadowutils iputils gnumake curl gnused gnutar gnugrep gzip
@@ -13,7 +13,7 @@ rec {
     gnused gnutar gnugrep gzip mingettyWrapper grubWrapper parted module_init_tools
     hotplug udev dhcpWrapper man nano;};
 
-  init = (import ./init) {inherit stdenv bash coreutils utillinux e2fsprogsDiet
+  init = (import ./init) {inherit stdenv bash coreutilsDiet utillinux e2fsprogsDiet
     nix shadowutils mingettyWrapper grubWrapper parted module_init_tools hotplug
     dhcpWrapper man nano;};
 
-- 
GitLab


From 1581e0c08ef6b704c6f3900d3d817ac88160f2c7 Mon Sep 17 00:00:00 2001
From: Armijn Hemel <armijn@gpl-violations.org>
Date: Tue, 30 Aug 2005 11:23:56 +0000
Subject: [PATCH 0089/5331] remove dependency on /nix, so we can build NixOS
 inside NixOS

svn path=/nixu/trunk/; revision=3747
---
 make-disk.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/make-disk.sh b/make-disk.sh
index c8dd31d3b0a..55db5bc6b7d 100755
--- a/make-disk.sh
+++ b/make-disk.sh
@@ -20,7 +20,7 @@ touch ${archivesDir}/blah
 chmod -f -R +w ${archivesDir}/*
 rm -rf ${archivesDir}/*
 
-NIX_CMD_PATH=/nix/bin
+NIX_CMD_PATH=$(dirname $(which nix-store))
 
 storeExpr=$($NIX_CMD_PATH/nix-store -qR $($NIX_CMD_PATH/nix-store -r $(echo '(import ./pkgs.nix).everything' | $NIX_CMD_PATH/nix-instantiate -)))
 #$NIX_CMD_PATH/nix-push --copy $archivesDir $manifest $(nix-store -r $storeExpr) $(nix-store -r $(echo '(import ./pkgs.nix).kernel' | $NIX_CMD_PATH/nix-instantiate -))
@@ -216,7 +216,7 @@ cp -fau --parents ${coreUtilsDiet} ${initdir}
 cp -fau --parents ${e2fsProgs} ${initdir}
 cp -fau --parents ${modUtils} ${initdir}
 cp -fau --parents ${hotplug} ${initdir}
-cp -fau --parents ${which} ${initdir}
+#cp -fau --parents ${which} ${initdir}
 
 touch ${initdir}/NIXOS
 
-- 
GitLab


From 115f0e2a25c87c63dbfeec5e06079eabeaadb9e2 Mon Sep 17 00:00:00 2001
From: Armijn Hemel <armijn@gpl-violations.org>
Date: Tue, 30 Aug 2005 13:14:04 +0000
Subject: [PATCH 0090/5331] we don't use UML at all anymore and the
 installation instructions are *way* out of date

svn path=/nixu/trunk/; revision=3749
---
 INSTALL | 89 ---------------------------------------------------------
 1 file changed, 89 deletions(-)
 delete mode 100644 INSTALL

diff --git a/INSTALL b/INSTALL
deleted file mode 100644
index 79098f8b07c..00000000000
--- a/INSTALL
+++ /dev/null
@@ -1,89 +0,0 @@
-Setting up and running Nix UML ("nixu")
-
-It is possible to run Nix inside a User Mode Linux environment (UML). The Nix
-expressions for this can be found at
-https://svn.cs.uu.nl:12443/repos/trace/nixu/.
-
-
-  Installation on SuSE Linux 9
-
-Download the latest nixpkgs collection and checkout the nixu trunk with
-subversion. Install the uml and uml-utilities packages with Nix and run the
-"make-disk.sh" script which can be found in nixu. After it has built
-everything (or downloaded everything from the nixpkgs cache which can be
-used with nix-pull) you can use the "run.sh" script to start the UML.
-
-
-  Installation on Fedora Core 1
-
-Installing the Nix UML on Fedora Core 1 is a bit tricky. Nix relies on
-Berkeley DB and there are issues with Berkeley DB and NPTL kernels (New POSIX
-Thread Library) on Red Hat based systems. Since the system we build inside
-UML does not use NPTL we cannot use the Nix we use on the host system to
-fill the disk once we've booted our the kernel of our UML.
-
-The solution is as follows:
-
-- install all packages via the nix-pull mechanisms with the MANIFEST from
-  the official nix-pkgs site to avoid that impure builds link against the
-  NPTL glibc on the host system.
-- install Nix in Nix
-- in the nixu scripts edit make-disk.sh and fill-disk.sh.
-  In make-disk.sh prefix all nix-* commands with the absolute path to the
-  host-Nix installation bin directory (for example: /nix/bin). In
-  fill-disk.sh replace all /nix/bin paths with a relative path to the Nix
-  installed with Nix (for example: /usr/home/nix/.nix-profile/bin).
-
-This should fix the installation problems and the Nix UML should boot
-flawlessly.
-
-
-  Nix UML and 2.6 kernel
-
-Installing the current Nix UML packages with a 2.4 kernel on a 2.6
-kernel based host system will most likely fail. Linux kernel 2.6 uses NPTL
-by default, but UML itself seems to be broken somewhat so halfway the system
-seems to hang.
-
-Installing a 2.6 based UML with Nix is not trivial and is not advised.
-
-
-  Using the Nix UML
-
-By default, the Nix UML comes with very little configuration. Apart from the
-networking information and mount information, there is nothing. One of the
-first things to do is to add user and group information, otherwise a lot
-of tools won't work. There are empty passwd, shadow and group files. Due
-to some limitations in Nix it is only possible to modify the password file
-as root.
-
-- add a root user:
-
-useradd root
-
-- edit /etc/passwd and change the UID to 0 ("vim" is provided)
-- add a root group:
-
-groupadd root
-
-
-  Adding packages to the UML Nix installation
-
-Packages can be added the the Nix UML installation by editing a few files.
-The first file packages should be added to is 'pkgs.nix'. The other files
-that should be edited all reside in the "boot" directory. In default.nix
-the packages should be added as an argument (first line) and given as an
-argument to the builder (line starting with "inherit"). In "builder.sh"
-there is a sed expression which subsitutes all occurences of the names of
-the packages in the files with the right value. If the programs that are
-added need to be added to $PATH the file "env.sh" has to be edited and the
-UML has to be recreated.
-
-Another option would be to enable networking in the UML and use nix-pull to
-get all the right packages, however this does not work yet out of the box.
-A small trick is to symlink /bin/sh to the current version of "sh":
-
-# cd /bin
-# ln -s `which sh` sh
-
-We're looking for a more permanent solution to fix this.
-- 
GitLab


From eac09bcb315ceb0c1062454e51e607b466a59bd0 Mon Sep 17 00:00:00 2001
From: Armijn Hemel <armijn@gpl-violations.org>
Date: Tue, 30 Aug 2005 13:16:16 +0000
Subject: [PATCH 0091/5331] cleanups commit 3750 :)

svn path=/nixu/trunk/; revision=3750
---
 make-disk.sh | 24 ------------------------
 1 file changed, 24 deletions(-)

diff --git a/make-disk.sh b/make-disk.sh
index 55db5bc6b7d..341701917e5 100755
--- a/make-disk.sh
+++ b/make-disk.sh
@@ -43,26 +43,8 @@ kernel=$($NIX_CMD_PATH/nix-store -r $(echo '(import ./pkgs.nix).kernel' | $NIX_C
 #echo $($NIX_CMD_PATH/nix-store -qR $(nix-store -r $(echo '(import ./pkgs.nix).nix' | $NIX_CMD_PATH/nix-instantiate -))) >> $storePaths
 #$NIX_CMD_PATH/nix-store -qR $(nix-store -r $(echo '(import ./pkgs.nix).nix' | $NIX_CMD_PATH/nix-instantiate -)) >> $storePaths
 
-#nixblaat=$(nix-store -r $(echo '(import ./pkgs.nix).nix'| $NIX_CMD_PATH/nix-instantiate -))
-#echo $nixblaat >> $storePaths
-#echo '' >> $storePaths
-#echo 13 >> $storePaths
-## Nix does --references, not --requisites for registering paths
-#nixdeps=$($NIX_CMD_PATH/nix-store -q --references $(nix-store -r $(echo '(import ./pkgs.nix).nix' | $NIX_CMD_PATH/nix-instantiate -)))
-
-#pkgs=$(echo $nixdeps | wc -w)
-
-#echo $pkgs >> $storePaths
-
-#for i in $nixdeps
-#do
-  #echo $i >> $storePaths
-#done
-
 for i in $storeExpr
 do
-  echo $i >> $archivesDir/store-expressions
-  echo $i >> $archivesDir/store-expressions-storepath
   echo $i >> $storePaths
   echo '' >> $storePaths
   deps=$($NIX_CMD_PATH/nix-store -q --references $i)
@@ -198,12 +180,6 @@ echo copying kernel
 # of the kernel here.
 cp -L $kernel/vmlinuz ${archivesDir}/isolinux
 
-# echo making ramdisk
-# todo!
-# mkdir ${archivesDir}/sbin
-# ln -s /scripts/fill-disk.sh ${archivesDir}/sbin/init
-# ln -s /scripts/fill-disk.sh ${archivesDir}/init
-
 echo creating ramdisk
 
 rm -f ${initrd}
-- 
GitLab


From f64cf78dfa28b9ed797dfeb9d63b948baa7c7ffb Mon Sep 17 00:00:00 2001
From: Armijn Hemel <armijn@gpl-violations.org>
Date: Wed, 31 Aug 2005 09:39:41 +0000
Subject: [PATCH 0092/5331] fix for cpio. Between cpio 2.5 and 2.6 semantics of
 the -c flag (which we used) has changed. Switch to a flag which is unlikely
 to change (-H newc)

svn path=/nixu/trunk/; revision=3756
---
 make-disk.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/make-disk.sh b/make-disk.sh
index 341701917e5..5cb46a2b214 100755
--- a/make-disk.sh
+++ b/make-disk.sh
@@ -196,7 +196,7 @@ cp -fau --parents ${hotplug} ${initdir}
 
 touch ${initdir}/NIXOS
 
-(cd ${initdir}; find . |cpio -c -o) | gzip -9 > ${initrd}
+(cd ${initdir}; find . |cpio -H newc -o) | gzip -9 > ${initrd}
 
 chmod -f -R +w ${initdir}/*
 rm -rf ${initdir}
-- 
GitLab


From d227f0e83ac33fe60e6bb0295e518b4e19b401da Mon Sep 17 00:00:00 2001
From: Armijn Hemel <armijn@gpl-violations.org>
Date: Wed, 31 Aug 2005 10:11:07 +0000
Subject: [PATCH 0093/5331] temporarily outcomment mingetty

svn path=/nixu/trunk/; revision=3757
---
 fill-disk.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fill-disk.sh b/fill-disk.sh
index 203f4ac59a7..37600769e8f 100755
--- a/fill-disk.sh
+++ b/fill-disk.sh
@@ -275,7 +275,7 @@ echo "id:2:initdefault:" >> $root/etc/inittab
 echo "si::bootwait:$bootPath/bin/boot.sh" >> $root/etc/inittab
 echo "ht:06:wait:$bootPath/bin/halt.sh" >> $root/etc/inittab
 echo "1:2345:respawn:$bootPath/bin/login.sh /dev/tty1" >> $root/etc/inittab
-echo "2:2345:respawn:$mingetty/sbin/mingetty tty2" >> $root/etc/inittab
+#echo "2:2345:respawn:$mingetty/sbin/mingetty tty2" >> $root/etc/inittab
 #echo "2:2345:respawn:$bootPath/bin/login.sh /dev/ttys/1" >> $root/etc/inittab
 
 echo setting up networking information...
-- 
GitLab


From 14b2ad157c07f805dd6ec92eef899cb30482b203 Mon Sep 17 00:00:00 2001
From: Armijn Hemel <armijn@gpl-violations.org>
Date: Wed, 31 Aug 2005 12:02:28 +0000
Subject: [PATCH 0094/5331] add logging capabilities. Install log is now copied
 to /root/install-log.

svn path=/nixu/trunk/; revision=3759
---
 fill-disk.sh |  4 ++++
 init.sh      |  3 +++
 make-disk.sh | 10 +++++++++-
 3 files changed, 16 insertions(+), 1 deletion(-)
 create mode 100644 init.sh

diff --git a/fill-disk.sh b/fill-disk.sh
index 37600769e8f..6ae875cab94 100755
--- a/fill-disk.sh
+++ b/fill-disk.sh
@@ -337,6 +337,10 @@ title NixOS
         kernel @kernel@/vmlinuz root=$device
 GRUBEND
 
+echo copying install log
+
+cp /tmp/install-log $root/root
+
 echo umounting filesystem
 
 umount $root
diff --git a/init.sh b/init.sh
new file mode 100644
index 00000000000..b7ab17f20af
--- /dev/null
+++ b/init.sh
@@ -0,0 +1,3 @@
+#! @bash@/bin/sh -e
+
+exec ./fill-disk.sh | @coreutils@/bin/tee /tmp/install-log
diff --git a/make-disk.sh b/make-disk.sh
index 5cb46a2b214..115cd722bfa 100755
--- a/make-disk.sh
+++ b/make-disk.sh
@@ -12,6 +12,7 @@ validatePaths=$archivesDir/validatepaths
 bootiso=/tmp/nixos.iso
 initrd=/tmp/initram.img
 initdir=${archivesDir}/initdir
+initscript=$archivesDir/scripts/init.sh
 
 echo cleaning old build
 
@@ -147,6 +148,10 @@ echo copying scripts
 
 mkdir ${archivesDir}/scripts
 cp -fa * ${archivesDir}/scripts
+sed -e "s^@bash\@^$bash^g" \
+    -e "s^@coreutils\@^$coreutilsdiet^g" \
+    < $initscript > $initscript.tmp
+mv $initscript.tmp $initscript
 sed -e "s^@sysvinitPath\@^$sysvinitPath^g" \
     -e "s^@bootPath\@^$bootPath^g" \
     -e "s^@NIX_CMD_PATH\@^$nix^g" \
@@ -183,9 +188,12 @@ cp -L $kernel/vmlinuz ${archivesDir}/isolinux
 echo creating ramdisk
 
 rm -f ${initrd}
-cp ${archivesDir}/scripts/fill-disk.sh ${initdir}/init
+#cp ${archivesDir}/scripts/fill-disk.sh ${initdir}/init
+cp ${archivesDir}/scripts/fill-disk.sh ${initdir}/
+cp ${archivesDir}/scripts/init.sh ${initdir}/init
 ln -s ${bash}/bin/bash ${initdir}/bin/sh
 chmod u+x ${initdir}/init
+chmod u+x ${initdir}/fill-disk.sh
 cp -fau --parents ${bashdeps} ${initdir}
 cp -fau --parents ${utilLinux} ${initdir}
 cp -fau --parents ${coreUtilsDiet} ${initdir}
-- 
GitLab


From f74115278f5f633b620f05c938da3b4dd9932471 Mon Sep 17 00:00:00 2001
From: Armijn Hemel <armijn@gpl-violations.org>
Date: Wed, 31 Aug 2005 12:58:46 +0000
Subject: [PATCH 0095/5331] add a shell on tty2

svn path=/nixu/trunk/; revision=3760
---
 fill-disk.sh |  4 ++++
 make-disk.sh | 23 +++++++++++++++++++++++
 2 files changed, 27 insertions(+)

diff --git a/fill-disk.sh b/fill-disk.sh
index 6ae875cab94..cf9a4c5eaec 100755
--- a/fill-disk.sh
+++ b/fill-disk.sh
@@ -88,6 +88,10 @@ mknod -m 0660 /dev/hdd3 b 22 67
 
 mknod -m 0600 /dev/initctl p
 
+echo starting emergency shell on tty2
+
+exec ./ramdisk-login.sh /dev/tty2 &
+
 targetdrive=/dev/hda
 device=${targetdrive}1
 mkfs.ext2 ${device}
diff --git a/make-disk.sh b/make-disk.sh
index 115cd722bfa..aad35e52d2e 100755
--- a/make-disk.sh
+++ b/make-disk.sh
@@ -7,6 +7,7 @@ archivesDir=/tmp/arch
 manifest=${archivesDir}/MANIFEST
 nixpkgs=/nixpkgs/trunk/pkgs
 fill_disk=$archivesDir/scripts/fill-disk.sh
+ramdisk_login=$archivesDir/scripts/ramdisk-login.sh
 storePaths=$archivesDir/mystorepaths
 validatePaths=$archivesDir/validatepaths
 bootiso=/tmp/nixos.iso
@@ -172,6 +173,26 @@ sed -e "s^@sysvinitPath\@^$sysvinitPath^g" \
     < $fill_disk > $fill_disk.tmp
 mv $fill_disk.tmp $fill_disk
 
+sed -e "s^@sysvinitPath\@^$sysvinitPath^g" \
+    -e "s^@bootPath\@^$bootPath^g" \
+    -e "s^@NIX_CMD_PATH\@^$nix^g" \
+    -e "s^@bash\@^$bash^g" \
+    -e "s^@findutils\@^$findutils^g" \
+    -e "s^@coreutilsdiet\@^$coreutilsdiet^g" \
+    -e "s^@coreutils\@^$coreutils^g" \
+    -e "s^@utillinux\@^$utillinux^g" \
+    -e "s^@e2fsprogs\@^$e2fsprogs^g" \
+    -e "s^@modutils\@^$modutils^g" \
+    -e "s^@grub\@^$grub^g" \
+    -e "s^@kernel\@^$kernel^g" \
+    -e "s^@hotplug\@^$hotplug^g" \
+    -e "s^@gnugrep\@^$gnugrep^g" \
+    -e "s^@which\@^$which^g" \
+    -e "s^@gnutar\@^$gnutar^g" \
+    -e "s^@mingetty\@^$mingettyWrapper^g" \
+    < $ramdisk_login > $ramdisk_login.tmp
+mv $ramdisk_login.tmp $ramdisk_login
+
 echo copying bootimage
 
 mkdir ${archivesDir}/isolinux
@@ -190,10 +211,12 @@ echo creating ramdisk
 rm -f ${initrd}
 #cp ${archivesDir}/scripts/fill-disk.sh ${initdir}/init
 cp ${archivesDir}/scripts/fill-disk.sh ${initdir}/
+cp ${archivesDir}/scripts/ramdisk-login.sh ${initdir}/
 cp ${archivesDir}/scripts/init.sh ${initdir}/init
 ln -s ${bash}/bin/bash ${initdir}/bin/sh
 chmod u+x ${initdir}/init
 chmod u+x ${initdir}/fill-disk.sh
+chmod u+x ${initdir}/ramdisk-login.sh
 cp -fau --parents ${bashdeps} ${initdir}
 cp -fau --parents ${utilLinux} ${initdir}
 cp -fau --parents ${coreUtilsDiet} ${initdir}
-- 
GitLab


From b86eb3cf4f6d2a24747402f98ad7dea8830f8ee7 Mon Sep 17 00:00:00 2001
From: Armijn Hemel <armijn@gpl-violations.org>
Date: Wed, 31 Aug 2005 13:26:20 +0000
Subject: [PATCH 0096/5331] don't forget ramdisk login script

svn path=/nixu/trunk/; revision=3761
---
 ramdisk-login.sh | 15 +++++++++++++++
 1 file changed, 15 insertions(+)
 create mode 100644 ramdisk-login.sh

diff --git a/ramdisk-login.sh b/ramdisk-login.sh
new file mode 100644
index 00000000000..5ef5117cfe9
--- /dev/null
+++ b/ramdisk-login.sh
@@ -0,0 +1,15 @@
+#! @bash@/bin/sh -e
+
+export PATH=@bash@/bin:@coreutilsdiet@/bin:@coreutils@/bin:@findutils@/bin:@utillinux@/bin:@utillinux@/sbin:@e2fsprogs@/sbin:@grub@/sbin:@sysvinitPath@/sbin:@gnugrep@/bin:@which@/bin:@gnutar@/bin
+
+tty=$1
+
+exec < $tty > $tty 2>&1
+
+echo
+echo "=== Welcome to Nix! ==="
+
+export HOME=/
+cd $HOME
+
+exec @bash@/bin/sh
-- 
GitLab


From 066c85b4f0e52ab4864d890480c94df0d29de715 Mon Sep 17 00:00:00 2001
From: Armijn Hemel <armijn@gpl-violations.org>
Date: Wed, 31 Aug 2005 16:38:34 +0000
Subject: [PATCH 0097/5331] run a busy loop after we've finished the install,
 instead of kernel panicking

svn path=/nixu/trunk/; revision=3762
---
 fill-disk.sh | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/fill-disk.sh b/fill-disk.sh
index cf9a4c5eaec..fc3bb782e9d 100755
--- a/fill-disk.sh
+++ b/fill-disk.sh
@@ -348,8 +348,13 @@ cp /tmp/install-log $root/root
 echo umounting filesystem
 
 umount $root
+umount /cdrom
 
 echo install done
-#telinit 0
 ln -s @sysvinitPath@/sbin/init /sbin/init
-shutdown -h now
+
+echo it\'s safe to turn off your machine
+
+while true; do
+   sleep 60;
+done
-- 
GitLab


From 9f0a098056d60bed104cd6bc76d9b185d106d24b Mon Sep 17 00:00:00 2001
From: Armijn Hemel <armijn@gpl-violations.org>
Date: Fri, 2 Sep 2005 16:47:58 +0000
Subject: [PATCH 0098/5331] fix error in detection of NixOS install CD

svn path=/nixu/trunk/; revision=3772
---
 fill-disk.sh | 24 +++++++++++++-----------
 make-disk.sh |  6 ++++--
 pkgs.nix     |  6 +++---
 3 files changed, 20 insertions(+), 16 deletions(-)

diff --git a/fill-disk.sh b/fill-disk.sh
index fc3bb782e9d..65499c7df83 100755
--- a/fill-disk.sh
+++ b/fill-disk.sh
@@ -1,6 +1,6 @@
 #! @bash@/bin/sh -e
 
-export PATH=@bash@/bin:@coreutilsdiet@/bin:@coreutils@/bin:@findutils@/bin:@utillinux@/bin:@utillinux@/sbin:@e2fsprogs@/sbin:@grub@/sbin:@sysvinitPath@/sbin:@gnugrep@/bin:@which@/bin:@gnutar@/bin
+export PATH=@bash@/bin:@coreutilsdiet@/bin:@coreutils@/bin:@findutils@/bin:@utillinux@/bin:@utillinux@/sbin:@e2fsprogs@/sbin:@grub@/sbin:@sysvinitPath@/sbin:@gnugrep@/bin:@which@/bin:@gnutar@/bin:@eject@/bin
 
 ##
 ## In the beginning we want to have a minimalistic environment, built with
@@ -187,7 +187,7 @@ mknod -m 0600 $root/dev/tty1 c 4 1
 mknod -m 0444 $root/dev/urandom c 1 9
 
 rm -f $root/etc/mtab
-#ln -s /proc/mounts $root/etc/mtab
+ln -s /proc/mounts $root/etc/mtab
 
 ## Probe for CD device which contains our CD here and mount /nix and
 ## /nixpkgs from it inside the ramdisk. Anaconda uses kudzu for this.
@@ -198,15 +198,15 @@ DEVICES="/dev/hd?"
 for i in ${DEVICES}
 do
 echo "Looking for CDROM in: $i"
-if mount -t iso9660 $i /cdrom >/dev/null 2>&1
-then
-  if test -f /cdrom/NIXOS
+  if mount -t iso9660 $i /cdrom >/dev/null 2>&1
   then
-    cddevice=$i
-    echo "Accessing NixOS CDROM at $i"
-  break
+    if test -f /cdrom/NIXOS
+    then
+      cddevice=$i
+      echo "Accessing NixOS CDROM at $i"
+    break
+    fi
   fi
-fi
 done
 
 echo switch to /nix and /nixpkgs from CD
@@ -327,6 +327,7 @@ ln -s @hotplug@/sbin/hotplug $root/sbin/hotplug
 ln -s @hotplug@/etc/hotplug $root/etc/hotplug
 ln -s @hotplug@/etc/hotplug.d $root/etc/hotplug.d
 ln -s $device $root/dev/root
+ln -s @sysvinitPath@/sbin/init /sbin/init
 
 echo installing bootloader
 
@@ -348,11 +349,12 @@ cp /tmp/install-log $root/root
 echo umounting filesystem
 
 umount $root
+#umount /nix
 umount /cdrom
+#echo ejecting $cddevice
+#eject $cddevice
 
 echo install done
-ln -s @sysvinitPath@/sbin/init /sbin/init
-
 echo it\'s safe to turn off your machine
 
 while true; do
diff --git a/make-disk.sh b/make-disk.sh
index aad35e52d2e..7f6be2694e6 100755
--- a/make-disk.sh
+++ b/make-disk.sh
@@ -87,6 +87,7 @@ nano=$($NIX_CMD_PATH/nix-store -r $(echo '(import ./pkgs.nix).nano' | $NIX_CMD_P
 gnugrep=$($NIX_CMD_PATH/nix-store -r $(echo '(import ./pkgs.nix).gnugrep' | $NIX_CMD_PATH/nix-instantiate -))
 which=$($NIX_CMD_PATH/nix-store -r $(echo '(import ./pkgs.nix).which' | $NIX_CMD_PATH/nix-instantiate -))
 gnutar=$($NIX_CMD_PATH/nix-store -r $(echo '(import ./pkgs.nix).gnutar' | $NIX_CMD_PATH/nix-instantiate -))
+eject=$($NIX_CMD_PATH/nix-store -r $(echo '(import ./pkgs.nix).eject' | $NIX_CMD_PATH/nix-instantiate -))
 
 #(while read storepath; do
    #cp -fa --parents ${storepath} ${archivesDir}
@@ -168,6 +169,7 @@ sed -e "s^@sysvinitPath\@^$sysvinitPath^g" \
     -e "s^@hotplug\@^$hotplug^g" \
     -e "s^@gnugrep\@^$gnugrep^g" \
     -e "s^@which\@^$which^g" \
+    -e "s^@eject\@^$eject^g" \
     -e "s^@gnutar\@^$gnutar^g" \
     -e "s^@mingetty\@^$mingettyWrapper^g" \
     < $fill_disk > $fill_disk.tmp
@@ -223,9 +225,9 @@ cp -fau --parents ${coreUtilsDiet} ${initdir}
 cp -fau --parents ${e2fsProgs} ${initdir}
 cp -fau --parents ${modUtils} ${initdir}
 cp -fau --parents ${hotplug} ${initdir}
-#cp -fau --parents ${which} ${initdir}
+cp -fau --parents ${eject} ${initdir}
 
-touch ${initdir}/NIXOS
+touch ${archivesDir}/NIXOS
 
 (cd ${initdir}; find . |cpio -H newc -o) | gzip -9 > ${initrd}
 
diff --git a/pkgs.nix b/pkgs.nix
index fff17e9921d..78d6805dee8 100644
--- a/pkgs.nix
+++ b/pkgs.nix
@@ -5,7 +5,7 @@ rec {
     nettools nix subversion gcc wget which vim less screen openssh binutils
     strace shadowutils iputils gnumake curl gnused gnutar gnugrep gzip
     mingettyWrapper grubWrapper syslinux parted module_init_tools hotplug udev
-    dhcpWrapper man nano;
+    dhcpWrapper man nano eject;
 
   boot = (import ./boot) {inherit stdenv kernel bash coreutils findutilsWrapper
     utillinux sysvinit e2fsprogs nettools nix subversion gcc wget which vim
@@ -15,7 +15,7 @@ rec {
 
   init = (import ./init) {inherit stdenv bash coreutilsDiet utillinux e2fsprogsDiet
     nix shadowutils mingettyWrapper grubWrapper parted module_init_tools hotplug
-    dhcpWrapper man nano;};
+    dhcpWrapper man nano eject;};
 
-  everything = [boot sysvinit kernel];
+  everything = [boot sysvinit kernel eject];
 }
-- 
GitLab


From f8cea32cf1dd89a465c9a1de94684b35e06c0d78 Mon Sep 17 00:00:00 2001
From: Armijn Hemel <armijn@gpl-violations.org>
Date: Fri, 30 Sep 2005 15:22:08 +0000
Subject: [PATCH 0099/5331] add some stuff, incl. some things to /etc/inittab,
 but keep them outcommented

svn path=/nixu/trunk/; revision=3976
---
 fill-disk.sh |  2 +-
 make-disk.sh | 10 ++++++----
 pkgs.nix     |  4 ++--
 3 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/fill-disk.sh b/fill-disk.sh
index 65499c7df83..ddb75f0506f 100755
--- a/fill-disk.sh
+++ b/fill-disk.sh
@@ -279,7 +279,7 @@ echo "id:2:initdefault:" >> $root/etc/inittab
 echo "si::bootwait:$bootPath/bin/boot.sh" >> $root/etc/inittab
 echo "ht:06:wait:$bootPath/bin/halt.sh" >> $root/etc/inittab
 echo "1:2345:respawn:$bootPath/bin/login.sh /dev/tty1" >> $root/etc/inittab
-#echo "2:2345:respawn:$mingetty/sbin/mingetty tty2" >> $root/etc/inittab
+echo #"2:2345:respawn:$mingetty/sbin/mingetty tty2" >> $root/etc/inittab
 #echo "2:2345:respawn:$bootPath/bin/login.sh /dev/ttys/1" >> $root/etc/inittab
 
 echo setting up networking information...
diff --git a/make-disk.sh b/make-disk.sh
index 7f6be2694e6..f8293d9c38a 100755
--- a/make-disk.sh
+++ b/make-disk.sh
@@ -88,6 +88,7 @@ gnugrep=$($NIX_CMD_PATH/nix-store -r $(echo '(import ./pkgs.nix).gnugrep' | $NIX
 which=$($NIX_CMD_PATH/nix-store -r $(echo '(import ./pkgs.nix).which' | $NIX_CMD_PATH/nix-instantiate -))
 gnutar=$($NIX_CMD_PATH/nix-store -r $(echo '(import ./pkgs.nix).gnutar' | $NIX_CMD_PATH/nix-instantiate -))
 eject=$($NIX_CMD_PATH/nix-store -r $(echo '(import ./pkgs.nix).eject' | $NIX_CMD_PATH/nix-instantiate -))
+sysklogd=$($NIX_CMD_PATH/nix-store -r $(echo '(import ./pkgs.nix).sysklogd' | $NIX_CMD_PATH/nix-instantiate -))
 
 #(while read storepath; do
    #cp -fa --parents ${storepath} ${archivesDir}
@@ -125,8 +126,8 @@ mkdir ${initdir}/var/run
 
 echo copying nixpkgs
 
-svn export ${nixpkgs} ${archivesDir}/pkgs
-#cp -fa ${nixpkgs} ${archivesDir}
+#svn export ${nixpkgs} ${archivesDir}/pkgs
+cp -fa ${nixpkgs} ${archivesDir}
 
 #echo copying packages from store
 
@@ -170,6 +171,7 @@ sed -e "s^@sysvinitPath\@^$sysvinitPath^g" \
     -e "s^@gnugrep\@^$gnugrep^g" \
     -e "s^@which\@^$which^g" \
     -e "s^@eject\@^$eject^g" \
+    -e "s^@sysklogd\@^$sysklogd^g" \
     -e "s^@gnutar\@^$gnutar^g" \
     -e "s^@mingetty\@^$mingettyWrapper^g" \
     < $fill_disk > $fill_disk.tmp
@@ -225,7 +227,7 @@ cp -fau --parents ${coreUtilsDiet} ${initdir}
 cp -fau --parents ${e2fsProgs} ${initdir}
 cp -fau --parents ${modUtils} ${initdir}
 cp -fau --parents ${hotplug} ${initdir}
-cp -fau --parents ${eject} ${initdir}
+#cp -fau --parents ${eject} ${initdir}
 
 touch ${archivesDir}/NIXOS
 
@@ -248,4 +250,4 @@ mkisofs -rJ -o ${bootiso} -b isolinux/isolinux.bin -c isolinux/boot.cat \
 echo cleaning up
 
 chmod -f -R +w ${archivesDir}/*
-rm -rf ${archivesDir}/*
+#rm -rf ${archivesDir}/*
diff --git a/pkgs.nix b/pkgs.nix
index 78d6805dee8..a995404f335 100644
--- a/pkgs.nix
+++ b/pkgs.nix
@@ -5,7 +5,7 @@ rec {
     nettools nix subversion gcc wget which vim less screen openssh binutils
     strace shadowutils iputils gnumake curl gnused gnutar gnugrep gzip
     mingettyWrapper grubWrapper syslinux parted module_init_tools hotplug udev
-    dhcpWrapper man nano eject;
+    dhcpWrapper man nano eject sysklogd;
 
   boot = (import ./boot) {inherit stdenv kernel bash coreutils findutilsWrapper
     utillinux sysvinit e2fsprogs nettools nix subversion gcc wget which vim
@@ -17,5 +17,5 @@ rec {
     nix shadowutils mingettyWrapper grubWrapper parted module_init_tools hotplug
     dhcpWrapper man nano eject;};
 
-  everything = [boot sysvinit kernel eject];
+  everything = [boot sysvinit kernel sysklogd];
 }
-- 
GitLab


From 18a56f26a286a0faa89d8ac037959e81be18ca48 Mon Sep 17 00:00:00 2001
From: Armijn Hemel <armijn@gpl-violations.org>
Date: Fri, 30 Sep 2005 16:50:35 +0000
Subject: [PATCH 0100/5331] argh! If we want to have # echoed into a file, make
 sure to enclose it in brackets...

svn path=/nixu/trunk/; revision=3980
---
 fill-disk.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fill-disk.sh b/fill-disk.sh
index ddb75f0506f..cfa52a5aa29 100755
--- a/fill-disk.sh
+++ b/fill-disk.sh
@@ -279,7 +279,7 @@ echo "id:2:initdefault:" >> $root/etc/inittab
 echo "si::bootwait:$bootPath/bin/boot.sh" >> $root/etc/inittab
 echo "ht:06:wait:$bootPath/bin/halt.sh" >> $root/etc/inittab
 echo "1:2345:respawn:$bootPath/bin/login.sh /dev/tty1" >> $root/etc/inittab
-echo #"2:2345:respawn:$mingetty/sbin/mingetty tty2" >> $root/etc/inittab
+echo "#2:2345:respawn:$mingetty/sbin/mingetty tty2" >> $root/etc/inittab
 #echo "2:2345:respawn:$bootPath/bin/login.sh /dev/ttys/1" >> $root/etc/inittab
 
 echo setting up networking information...
-- 
GitLab


From d04db9e95fcadb76dd97d52fc44bfa90b39ccbab Mon Sep 17 00:00:00 2001
From: Armijn Hemel <armijn@gpl-violations.org>
Date: Mon, 3 Oct 2005 15:44:10 +0000
Subject: [PATCH 0101/5331] small howto on how to install today's version of
 NixOS.

svn path=/nixu/trunk/; revision=4001
---
 howto | 74 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 74 insertions(+)
 create mode 100644 howto

diff --git a/howto b/howto
new file mode 100644
index 00000000000..3e7f4f0fd9d
--- /dev/null
+++ b/howto
@@ -0,0 +1,74 @@
+NixOS installation HOWTO -- October 3, 2005
+
+This is small HOWTO of how to build and install the current version of
+NixOS.
+
+
+  Building
+
+Install Nix. Checkout nixpkgs from Subversion, as well as nixu. Adapt the
+scripts in nixu to reflect the location of nixpkgs (default /nixpkgs).
+Make a directory /tmp/arch. Run ./make-disk.sh. Wait.
+
+  Burning
+
+Use your favourite tool to burn the ISO image to a CD.
+
+  Preparing the host machine
+
+Currently NixOS can only be installed with machines that have a specific
+hardware set up:
+
+An ATA harddisk on the first ATA controller (hda) with:
+- data partition (hda1)
+- swap partition (hda2)
+
+All data on these two partitions will be wiped and the bootloader in the
+Master Boot Record (MBR) will be overwritten with GRUB.
+
+  Booting
+
+Insert the CD, make sure it can boot from CD and reboot. Let it run for a
+while.
+
+  Configuring
+
+To get NixOS in a working state, do the following:
+
+- load the networkdriver. This is machine dependent. On the labmachines this
+is the e1000 driver:
+
+# modprobe e1000
+
+- bring the interface up:
+
+# ifconfig eth0 up
+
+If the interface is different (say, eth1) replace eth0 with the right
+interface.
+
+- if DHCP is used, run a DHCP client to obtain an IP address:
+
+# dhclient eth0
+
+The interface will not be configured, but it will give you all the right
+information needed to configure the interface.
+
+# ifconfig eth0 <ip address> netmask <netmask>
+# route add default gw <gateway ip address>
+# vim /etc/resolv.conf
+
+  Making logins on virtual consoles work.
+
+Logins on virtual consoles are disabled by default. To make them work:
+
+- edit /etc/inittab and outcomment the lines with "mingetty" in them
+- copy /etc/services from a working Linux machine to /etc/services on the
+NixOS machine (needed for sysklogd)
+- copy /etc/syslog.conf from a working Linux machine to /etc/syslog.conf on the
+NixOS machine (needed for sysklogd)
+- launch sysklogd
+- copy /etc/login.defs from a working Linux machine to /etc/login.defs on the
+NixOS machine (needed for mingetty)
+- chmod +x /path/to/mingetty
+- relaunch init
-- 
GitLab


From 83aa84be942ad8990ea2ce754ac3e4cfef2d9eb8 Mon Sep 17 00:00:00 2001
From: Armijn Hemel <armijn@gpl-violations.org>
Date: Tue, 11 Oct 2005 10:48:10 +0000
Subject: [PATCH 0102/5331] no longer hardcode the directory where we put our
 stuff in (previously /tmp/arch), but use mktemp instead, which is a *lot*
 cleaner. Update documentation accordingly.

svn path=/nixu/trunk/; revision=4047
---
 howto        |  2 +-
 make-disk.sh | 11 ++---------
 2 files changed, 3 insertions(+), 10 deletions(-)

diff --git a/howto b/howto
index 3e7f4f0fd9d..13b8aa3b8bf 100644
--- a/howto
+++ b/howto
@@ -8,7 +8,7 @@ NixOS.
 
 Install Nix. Checkout nixpkgs from Subversion, as well as nixu. Adapt the
 scripts in nixu to reflect the location of nixpkgs (default /nixpkgs).
-Make a directory /tmp/arch. Run ./make-disk.sh. Wait.
+Make sure mktemp is installed. Run ./make-disk.sh. Wait.
 
   Burning
 
diff --git a/make-disk.sh b/make-disk.sh
index f8293d9c38a..6e87f0e488f 100755
--- a/make-disk.sh
+++ b/make-disk.sh
@@ -3,7 +3,7 @@
 # deps is an array
 declare -a deps
 
-archivesDir=/tmp/arch
+archivesDir=$(mktemp -d)
 manifest=${archivesDir}/MANIFEST
 nixpkgs=/nixpkgs/trunk/pkgs
 fill_disk=$archivesDir/scripts/fill-disk.sh
@@ -15,13 +15,6 @@ initrd=/tmp/initram.img
 initdir=${archivesDir}/initdir
 initscript=$archivesDir/scripts/init.sh
 
-echo cleaning old build
-
-# keep chmod happy
-touch ${archivesDir}/blah
-chmod -f -R +w ${archivesDir}/*
-rm -rf ${archivesDir}/*
-
 NIX_CMD_PATH=$(dirname $(which nix-store))
 
 storeExpr=$($NIX_CMD_PATH/nix-store -qR $($NIX_CMD_PATH/nix-store -r $(echo '(import ./pkgs.nix).everything' | $NIX_CMD_PATH/nix-instantiate -)))
@@ -250,4 +243,4 @@ mkisofs -rJ -o ${bootiso} -b isolinux/isolinux.bin -c isolinux/boot.cat \
 echo cleaning up
 
 chmod -f -R +w ${archivesDir}/*
-#rm -rf ${archivesDir}/*
+rm -rf ${archivesDir}/*
-- 
GitLab


From 583ce934a8d0b1493c88e4d9893041c82f08e4d7 Mon Sep 17 00:00:00 2001
From: Armijn Hemel <armijn@gpl-violations.org>
Date: Tue, 11 Oct 2005 19:39:41 +0000
Subject: [PATCH 0103/5331] - add NIC driver info for vmware - add profile
 support

svn path=/nixu/trunk/; revision=4069
---
 fill-disk.sh | 6 +++++-
 howto        | 2 ++
 make-disk.sh | 2 +-
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/fill-disk.sh b/fill-disk.sh
index cfa52a5aa29..ad50100ddd5 100755
--- a/fill-disk.sh
+++ b/fill-disk.sh
@@ -221,7 +221,7 @@ export NIX_DATA_DIR=$root/nix/share
 export NIX_LOG_DIR=$root/nix/log/nix
 export NIX_STATE_DIR=$root/nix/var/nix
 export NIX_CONF_DIR=$root/nix/etc
-NIX_CMD_PATH=@NIX_CMD_PATH@/bin
+NIX_CMD_PATH=@nix@/bin
 
 echo initialising Nix DB...
 $NIX_CMD_PATH/nix-store --init
@@ -265,6 +265,7 @@ tar cf - /nix/store | tar --directory=$root -xvf -
 echo registering valid paths...
 
 $NIX_CMD_PATH/nix-store --register-validity < $root/tmp/mystorepaths
+$NIX_CMD_PATH/nix-env -iKf /nixpkgs/trunk/pkgs/system/i686-linux.nix nix
 
 echo setting init symlink...
 rm -f $root/init
@@ -297,6 +298,9 @@ echo "root:x:0:root" > $root/etc/group
 echo "root:x:0:0:root:/root:/bin/sh" > $root/etc/passwd
 echo "root::12757:0:99999:7:::" > $root/etc/shadow
 
+echo default profile for root
+echo "source @nix@/etc/profile.d/nix.sh" > $root/root/.profile
+
 ###
 ### Do kernel stuff here.
 ###
diff --git a/howto b/howto
index 13b8aa3b8bf..640f2b1a0a2 100644
--- a/howto
+++ b/howto
@@ -40,6 +40,8 @@ is the e1000 driver:
 
 # modprobe e1000
 
+In vmware the driver is "pcnet32".
+
 - bring the interface up:
 
 # ifconfig eth0 up
diff --git a/make-disk.sh b/make-disk.sh
index 6e87f0e488f..831c2eed7a3 100755
--- a/make-disk.sh
+++ b/make-disk.sh
@@ -150,7 +150,7 @@ sed -e "s^@bash\@^$bash^g" \
 mv $initscript.tmp $initscript
 sed -e "s^@sysvinitPath\@^$sysvinitPath^g" \
     -e "s^@bootPath\@^$bootPath^g" \
-    -e "s^@NIX_CMD_PATH\@^$nix^g" \
+    -e "s^@nix\@^$nix^g" \
     -e "s^@bash\@^$bash^g" \
     -e "s^@findutils\@^$findutils^g" \
     -e "s^@coreutilsdiet\@^$coreutilsdiet^g" \
-- 
GitLab


From b53b6e5b436a8d1fae619481eb4b10f230c96668 Mon Sep 17 00:00:00 2001
From: Armijn Hemel <armijn@gpl-violations.org>
Date: Wed, 12 Oct 2005 22:40:10 +0000
Subject: [PATCH 0104/5331] dhclient works now, adapt documentation

svn path=/nixu/trunk/; revision=4080
---
 howto | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/howto b/howto
index 640f2b1a0a2..366f2947a9b 100644
--- a/howto
+++ b/howto
@@ -49,12 +49,12 @@ In vmware the driver is "pcnet32".
 If the interface is different (say, eth1) replace eth0 with the right
 interface.
 
-- if DHCP is used, run a DHCP client to obtain an IP address:
+- if DHCP is used, run a DHCP client to obtain an IP address, routing
+and resolving information:
 
 # dhclient eth0
 
-The interface will not be configured, but it will give you all the right
-information needed to configure the interface.
+Otherwise, do this yourself:
 
 # ifconfig eth0 <ip address> netmask <netmask>
 # route add default gw <gateway ip address>
-- 
GitLab


From e378ef0bf443794ce7708889fe864e1bfcbaef6f Mon Sep 17 00:00:00 2001
From: Armijn Hemel <armijn@gpl-violations.org>
Date: Fri, 14 Oct 2005 10:42:06 +0000
Subject: [PATCH 0105/5331] update documentation

svn path=/nixu/trunk/; revision=4087
---
 howto | 1 -
 1 file changed, 1 deletion(-)

diff --git a/howto b/howto
index 366f2947a9b..000e9fd2ee9 100644
--- a/howto
+++ b/howto
@@ -72,5 +72,4 @@ NixOS machine (needed for sysklogd)
 - launch sysklogd
 - copy /etc/login.defs from a working Linux machine to /etc/login.defs on the
 NixOS machine (needed for mingetty)
-- chmod +x /path/to/mingetty
 - relaunch init
-- 
GitLab


From 569bbf75b1e89aecf0c5c650be0c49d0ddc9fc9e Mon Sep 17 00:00:00 2001
From: Armijn Hemel <armijn@gpl-violations.org>
Date: Sun, 16 Oct 2005 21:48:33 +0000
Subject: [PATCH 0106/5331] don't make /bin/bash anymore

svn path=/nixu/trunk/; revision=4095
---
 fill-disk.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fill-disk.sh b/fill-disk.sh
index ad50100ddd5..9f671bce04d 100755
--- a/fill-disk.sh
+++ b/fill-disk.sh
@@ -272,7 +272,7 @@ rm -f $root/init
 #ln -s $sysvinitPath/sbin/init $root/init
 ln -s @sysvinitPath@/sbin/init $root/sbin/init
 ln -s @bash@/bin/sh $root/bin/sh
-ln -s @bash@/bin/bash $root/bin/bash
+#ln -s @bash@/bin/bash $root/bin/bash
 
 echo setting up inittab...
 rm -f $root/etc/inittab
-- 
GitLab


From b084dc18b3ca50a839f1e98c305f364a5650f1ed Mon Sep 17 00:00:00 2001
From: Armijn Hemel <armijn@gpl-violations.org>
Date: Wed, 19 Oct 2005 14:07:21 +0000
Subject: [PATCH 0107/5331] also add coreutils to Nix default profile

svn path=/nixu/trunk/; revision=4106
---
 fill-disk.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/fill-disk.sh b/fill-disk.sh
index 9f671bce04d..5b0495a5328 100755
--- a/fill-disk.sh
+++ b/fill-disk.sh
@@ -266,6 +266,7 @@ echo registering valid paths...
 
 $NIX_CMD_PATH/nix-store --register-validity < $root/tmp/mystorepaths
 $NIX_CMD_PATH/nix-env -iKf /nixpkgs/trunk/pkgs/system/i686-linux.nix nix
+$NIX_CMD_PATH/nix-env -iKf /nixpkgs/trunk/pkgs/system/i686-linux.nix coreutils
 
 echo setting init symlink...
 rm -f $root/init
-- 
GitLab


From 22195d35a598a922ed56d823c14f7eff5f42a56f Mon Sep 17 00:00:00 2001
From: Armijn Hemel <armijn@gpl-violations.org>
Date: Wed, 19 Oct 2005 14:14:08 +0000
Subject: [PATCH 0108/5331] make /etc/sysconfig so we can store information,
 such as hardware configuration of the box (needed for Kudzu)

svn path=/nixu/trunk/; revision=4107
---
 fill-disk.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/fill-disk.sh b/fill-disk.sh
index 5b0495a5328..fc51a3f106e 100755
--- a/fill-disk.sh
+++ b/fill-disk.sh
@@ -140,6 +140,7 @@ make_dir 00755 /boot
 make_dir 00755 /dev
 make_dir 00755 /dev/pts
 make_dir 00755 /etc # global non-constant configuration
+make_dir 00755 /etc/sysconfig
 make_dir 00755 /etc-secret
 make_dir 00755 /home
 make_dir 00755 /lib
-- 
GitLab


From 988e34e5bc161ee109970641f35de28a7aa4f4bb Mon Sep 17 00:00:00 2001
From: Armijn Hemel <armijn@gpl-violations.org>
Date: Mon, 12 Dec 2005 14:45:46 +0000
Subject: [PATCH 0109/5331] touch an empty login.defs, needed for login

svn path=/nixu/trunk/; revision=4353
---
 init/install-disk.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/init/install-disk.sh b/init/install-disk.sh
index 9e18719f208..de158cda600 100755
--- a/init/install-disk.sh
+++ b/init/install-disk.sh
@@ -81,6 +81,7 @@ mknod $root/dev/null c 1 3
 touch_file /etc/passwd
 touch_file /etc/shadow
 touch_file /etc/group
+touch_file /etc/login.defs
 
 rm -f $root/etc/mtab
 #ln -s /proc/mounts $root/etc/mtab
-- 
GitLab


From 5d0899c0bcb9024a3b0ecb1a162ea21014f6573e Mon Sep 17 00:00:00 2001
From: Armijn Hemel <armijn@gpl-violations.org>
Date: Tue, 13 Dec 2005 14:24:31 +0000
Subject: [PATCH 0110/5331] add a bunch of stuff for SSH user privilege
 seperation (yes, we want this)

svn path=/nixu/trunk/; revision=4361
---
 fill-disk.sh | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/fill-disk.sh b/fill-disk.sh
index fc51a3f106e..dbc18322d58 100755
--- a/fill-disk.sh
+++ b/fill-disk.sh
@@ -167,6 +167,8 @@ make_dir 00755 /sys
 make_dir 01777 /tmp
 make_dir 00755 /usr
 make_dir 00755 /var
+make_dir 00755 /var/empty
+make_dir 00111 /var/empty/sshd
 make_dir 00755 /var/log
 make_dir 00755 /var/run
 make_dir 00755 /var/spool
@@ -297,8 +299,11 @@ echo "127.0.0.1 localhost" >> $root/etc/hosts
 echo setting up initial account information...
 
 echo "root:x:0:root" > $root/etc/group
+echo "sshd:x:74:" >> $root/etc/group
 echo "root:x:0:0:root:/root:/bin/sh" > $root/etc/passwd
-echo "root::12757:0:99999:7:::" > $root/etc/shadow
+echo "sshd:x:74:74:Privilege-separated SSH:/var/empty/sshd:/sbin/nologin" >> $root/etc/passwd
+echo "root::12757:0:99999:7:::" >> $root/etc/shadow
+echo "sshd:!!:12757:0:99999:7:::" >> $root/etc/shadow
 
 echo default profile for root
 echo "source @nix@/etc/profile.d/nix.sh" > $root/root/.profile
-- 
GitLab


From ec790cdf85f1535ea1a119b184ad8ef6bda40e5c Mon Sep 17 00:00:00 2001
From: Armijn Hemel <armijn@gpl-violations.org>
Date: Tue, 13 Dec 2005 14:28:55 +0000
Subject: [PATCH 0111/5331] add a seperate dir for SSH-keys. Remove the
 /etc-secret dir, we probably won't be using it anyway...

svn path=/nixu/trunk/; revision=4362
---
 fill-disk.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fill-disk.sh b/fill-disk.sh
index dbc18322d58..1ea71f23acf 100755
--- a/fill-disk.sh
+++ b/fill-disk.sh
@@ -140,8 +140,8 @@ make_dir 00755 /boot
 make_dir 00755 /dev
 make_dir 00755 /dev/pts
 make_dir 00755 /etc # global non-constant configuration
+make_dir 00755 /etc/ssh
 make_dir 00755 /etc/sysconfig
-make_dir 00755 /etc-secret
 make_dir 00755 /home
 make_dir 00755 /lib
 make_dir 00755 /lib/modules
-- 
GitLab


From ff840ef21c5ce18f5e76fec2010132e5a783aa3d Mon Sep 17 00:00:00 2001
From: Armijn Hemel <armijn@gpl-violations.org>
Date: Wed, 14 Dec 2005 00:46:59 +0000
Subject: [PATCH 0112/5331] small corrections to the installer

svn path=/nixu/trunk/; revision=4368
---
 howto | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/howto b/howto
index 000e9fd2ee9..057fb17276b 100644
--- a/howto
+++ b/howto
@@ -60,16 +60,22 @@ Otherwise, do this yourself:
 # route add default gw <gateway ip address>
 # vim /etc/resolv.conf
 
-  Making logins on virtual consoles work.
-
-Logins on virtual consoles are disabled by default. To make them work:
+  Making syslog work.
 
-- edit /etc/inittab and outcomment the lines with "mingetty" in them
 - copy /etc/services from a working Linux machine to /etc/services on the
 NixOS machine (needed for sysklogd)
 - copy /etc/syslog.conf from a working Linux machine to /etc/syslog.conf on the
 NixOS machine (needed for sysklogd)
 - launch sysklogd
+
+  Making logins on virtual consoles work.
+
+Logins on virtual consoles are disabled by default. To make them work:
+
+- edit /etc/inittab and outcomment the lines with "mingetty" in them
 - copy /etc/login.defs from a working Linux machine to /etc/login.defs on the
-NixOS machine (needed for mingetty)
+NixOS machine (needed for mingetty). Alternatively, do:
+
+# touch /etc/login.defs
+
 - relaunch init
-- 
GitLab


From f130123af58709952d2ecfcd5b0d824b49f963cf Mon Sep 17 00:00:00 2001
From: Armijn Hemel <armijn@gpl-violations.org>
Date: Thu, 22 Dec 2005 19:34:36 +0000
Subject: [PATCH 0113/5331] also make /var/lock and /var/lock/subsys: needed
 for ssh and others

svn path=/nixu/trunk/; revision=4414
---
 fill-disk.sh | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/fill-disk.sh b/fill-disk.sh
index 1ea71f23acf..d3206a7e7fe 100755
--- a/fill-disk.sh
+++ b/fill-disk.sh
@@ -169,6 +169,8 @@ make_dir 00755 /usr
 make_dir 00755 /var
 make_dir 00755 /var/empty
 make_dir 00111 /var/empty/sshd
+make_dir 00755 /var/lock
+make_dir 00755 /var/lock/subsys
 make_dir 00755 /var/log
 make_dir 00755 /var/run
 make_dir 00755 /var/spool
-- 
GitLab


From fe355bba78b0b0bfa78459940f77581a3644fef1 Mon Sep 17 00:00:00 2001
From: Armijn Hemel <armijn@gpl-violations.org>
Date: Sat, 24 Dec 2005 11:50:42 +0000
Subject: [PATCH 0114/5331] replace a lot of tools we initially use with
 statically linked versions.

This reduces the ramdisk installer size with a few megabytes when gzipped,
but with about 40 MB when unpacked in memory.

There are a few improvements possible:

- strip the binaries. This saves another few MBs.
- only copy the binaries we really need to /bin or /sbin. This could reduce
the size of the installer a lot, especially with util-linux, of which we
don't use that many tools at all.
- try to move some packages we link with glibc right now (like util-linux) to
dietlibc. This will not work for bash, already tried that.
- try to use busybox as a replacement for everything.

svn path=/nixu/trunk/; revision=4428
---
 boot/builder.sh  |  2 ++
 boot/default.nix |  4 ++--
 fill-disk.sh     | 18 ++++++++++----
 make-disk.sh     | 62 ++++++++++++++++++++++++++++++------------------
 pkgs.nix         | 14 +++++------
 5 files changed, 64 insertions(+), 36 deletions(-)

diff --git a/boot/builder.sh b/boot/builder.sh
index bef4682093d..bf747933083 100755
--- a/boot/builder.sh
+++ b/boot/builder.sh
@@ -9,9 +9,11 @@ for i in $boot $halt $login $env; do
     dst=$out/bin/$(basename $i | cut -c34-)
     sed \
         -e "s^@bash\@^$bash^g" \
+        -e "s^@bashStatic\@^$bashStatic^g" \
         -e "s^@coreutils\@^$coreutils^g" \
         -e "s^@findutilsWrapper\@^$findutilsWrapper^g" \
         -e "s^@utillinux\@^$utillinux^g" \
+        -e "s^@utillinuxStatic\@^$utillinuxStatic^g" \
         -e "s^@sysvinit\@^$sysvinit^g" \
         -e "s^@e2fsprogs\@^$e2fsprogs^g" \
         -e "s^@nettools\@^$nettools^g" \
diff --git a/boot/default.nix b/boot/default.nix
index 17957c934a7..12d80e54419 100644
--- a/boot/default.nix
+++ b/boot/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, kernel, bash, coreutils, findutilsWrapper, utillinux, sysvinit, e2fsprogs
+{ stdenv, kernel, bash, bashStatic, coreutils, findutilsWrapper, utillinux, utillinuxStatic, sysvinit, e2fsprogs
 , nettools, nix, subversion, gcc, wget, which, vim, less, screen, openssh
 , binutils, strace, shadowutils, iputils, gnumake, curl, gnused, gnugrep
 , gnutar, gzip, mingettyWrapper, grubWrapper, parted, module_init_tools, hotplug
@@ -12,7 +12,7 @@ derivation {
   halt = ./halt.sh;
   login = ./login.sh;
   env = ./env.sh;
-  inherit stdenv kernel bash coreutils findutilsWrapper utillinux sysvinit
+  inherit stdenv kernel bash bashStatic coreutils findutilsWrapper utillinux sysvinit
           e2fsprogs nettools nix subversion gcc wget which vim less screen
           openssh binutils strace shadowutils iputils gnumake curl gnused
           gnutar gnugrep gzip mingettyWrapper grubWrapper parted module_init_tools
diff --git a/fill-disk.sh b/fill-disk.sh
index d3206a7e7fe..3240b2b57d4 100755
--- a/fill-disk.sh
+++ b/fill-disk.sh
@@ -1,6 +1,6 @@
 #! @bash@/bin/sh -e
 
-export PATH=@bash@/bin:@coreutilsdiet@/bin:@coreutils@/bin:@findutils@/bin:@utillinux@/bin:@utillinux@/sbin:@e2fsprogs@/sbin:@grub@/sbin:@sysvinitPath@/sbin:@gnugrep@/bin:@which@/bin:@gnutar@/bin:@eject@/bin
+export PATH=@bash@/bin:@coreutilsdiet@/bin:@coreutils@/bin:@findutils@/bin:@utillinux@/bin:@utillinux@/sbin:@utilLinux@/bin:@utilLinux@/sbin:@e2fsprogs@/sbin:@grub@/sbin:@sysvinitPath@/sbin:@gnugrep@/bin:@which@/bin:@gnutar@/bin:@eject@/bin:@kudzu@/sbin
 
 ##
 ## In the beginning we want to have a minimalistic environment, built with
@@ -194,6 +194,7 @@ mknod -m 0444 $root/dev/urandom c 1 9
 rm -f $root/etc/mtab
 ln -s /proc/mounts $root/etc/mtab
 
+
 ## Probe for CD device which contains our CD here and mount /nix and
 ## /nixpkgs from it inside the ramdisk. Anaconda uses kudzu for this.
 ## Find out how Knoppix and SUSE do this...
@@ -221,6 +222,9 @@ echo switch to /nix and /nixpkgs from CD
 ln -s /cdrom/nixpkgs /nixpkgs
 mount --bind /cdrom/nix /nix
 
+echo probing for hardware...
+
+kudzu
 
 export NIX_DATA_DIR=$root/nix/share
 export NIX_LOG_DIR=$root/nix/log/nix
@@ -228,6 +232,10 @@ export NIX_STATE_DIR=$root/nix/var/nix
 export NIX_CONF_DIR=$root/nix/etc
 NIX_CMD_PATH=@nix@/bin
 
+echo bringing up networking...
+
+nic=`kudzu -p | grep eth | sort | uniq | cut -d ' ' -f 2`
+
 echo initialising Nix DB...
 $NIX_CMD_PATH/nix-store --init
 
@@ -290,13 +298,15 @@ echo "#2:2345:respawn:$mingetty/sbin/mingetty tty2" >> $root/etc/inittab
 #echo "2:2345:respawn:$bootPath/bin/login.sh /dev/ttys/1" >> $root/etc/inittab
 
 echo setting up networking information...
+
 make_dir 00755 /etc/networking
-echo 192.168.150.1 > $root/etc/networking/local-ip
-echo 192.168.150.3 > $root/etc/networking/gateway-ip
 #cp /etc/resolv.conf $root/etc
 rm -f $root/etc/hosts
 echo "127.0.0.1 localhost" >> $root/etc/hosts
-#echo "192.168.150.1 uml" >> $root/etc/hosts
+
+echo storing hardware information...
+
+kudzu -p > $root/etc/sysconfig/hwconf
 
 echo setting up initial account information...
 
diff --git a/make-disk.sh b/make-disk.sh
index 831c2eed7a3..eda0f9cbd41 100755
--- a/make-disk.sh
+++ b/make-disk.sh
@@ -53,10 +53,10 @@ do
   tar -cf - $i | tar --directory=$archivesDir -xf -
 done
 
-utilLinux=$($NIX_CMD_PATH/nix-store -qR $(nix-store -r $(echo '(import ./pkgs.nix).utillinux' | $NIX_CMD_PATH/nix-instantiate -)))
+utilLinux=$(nix-store -r $(echo '(import ./pkgs.nix).utillinuxStatic' | $NIX_CMD_PATH/nix-instantiate -))
 coreUtilsDiet=$($NIX_CMD_PATH/nix-store -qR $(nix-store -r $(echo '(import ./pkgs.nix).coreutilsDiet' | $NIX_CMD_PATH/nix-instantiate -)))
 e2fsProgs=$($NIX_CMD_PATH/nix-store -qR $(nix-store -r $(echo '(import ./pkgs.nix).e2fsprogsDiet' | $NIX_CMD_PATH/nix-instantiate -)))
-modUtils=$($NIX_CMD_PATH/nix-store -qR $(nix-store -r $(echo '(import ./pkgs.nix).module_init_tools' | $NIX_CMD_PATH/nix-instantiate -)))
+modUtils=$($NIX_CMD_PATH/nix-store -qR $(nix-store -r $(echo '(import ./pkgs.nix).module_init_toolsStatic' | $NIX_CMD_PATH/nix-instantiate -)))
 Grub=$($NIX_CMD_PATH/nix-store -qR $(nix-store -r $(echo '(import ./pkgs.nix).grubWrapper' | $NIX_CMD_PATH/nix-instantiate -)))
 #gnuSed=$($NIX_CMD_PATH/nix-store -qR $(nix-store -r $(echo '(import ./pkgs.nix).gnused' | $NIX_CMD_PATH/nix-instantiate -)))
 #gnuGrep=$($NIX_CMD_PATH/nix-store -qR $(nix-store -r $(echo '(import ./pkgs.nix).gnugrep' | $NIX_CMD_PATH/nix-instantiate -)))
@@ -64,13 +64,14 @@ Kernel=$($NIX_CMD_PATH/nix-store -qR $(nix-store -r $(echo '(import ./pkgs.nix).
 SysVinit=$($NIX_CMD_PATH/nix-store -qR $(nix-store -r $(echo '(import ./pkgs.nix).sysvinit' | $NIX_CMD_PATH/nix-instantiate -)))
 BootPath=$($NIX_CMD_PATH/nix-store -qR $(nix-store -r $(echo '(import ./pkgs.nix).boot' | $NIX_CMD_PATH/nix-instantiate -)))
 
-bash=$($NIX_CMD_PATH/nix-store -q $(echo '(import ./pkgs.nix).bash' | $NIX_CMD_PATH/nix-instantiate -))
+#bash=$($NIX_CMD_PATH/nix-store -q $(echo '(import ./pkgs.nix).bash' | $NIX_CMD_PATH/nix-instantiate -))
+bash=$($NIX_CMD_PATH/nix-store -q $(echo '(import ./pkgs.nix).bashStatic' | $NIX_CMD_PATH/nix-instantiate -))
 coreutilsdiet=$($NIX_CMD_PATH/nix-store -q $(echo '(import ./pkgs.nix).coreutilsDiet' | $NIX_CMD_PATH/nix-instantiate -))
 coreutils=$($NIX_CMD_PATH/nix-store -q $(echo '(import ./pkgs.nix).coreutils' | $NIX_CMD_PATH/nix-instantiate -))
 findutils=$($NIX_CMD_PATH/nix-store -q $(echo '(import ./pkgs.nix).findutilsWrapper' | $NIX_CMD_PATH/nix-instantiate -))
 utillinux=$($NIX_CMD_PATH/nix-store -q $(echo '(import ./pkgs.nix).utillinux' | $NIX_CMD_PATH/nix-instantiate -))
 e2fsprogs=$($NIX_CMD_PATH/nix-store -q $(echo '(import ./pkgs.nix).e2fsprogsDiet' | $NIX_CMD_PATH/nix-instantiate -))
-modutils=$($NIX_CMD_PATH/nix-store -q $(echo '(import ./pkgs.nix).module_init_tools' | $NIX_CMD_PATH/nix-instantiate -))
+modutils=$($NIX_CMD_PATH/nix-store -q $(echo '(import ./pkgs.nix).module_init_toolsStatic' | $NIX_CMD_PATH/nix-instantiate -))
 grub=$($NIX_CMD_PATH/nix-store -r $(echo '(import ./pkgs.nix).grubWrapper' | $NIX_CMD_PATH/nix-instantiate -))
 mingettyWrapper=$($NIX_CMD_PATH/nix-store -r $(echo '(import ./pkgs.nix).mingettyWrapper' | $NIX_CMD_PATH/nix-instantiate -))
 hotplug=$($NIX_CMD_PATH/nix-store -r $(echo '(import ./pkgs.nix).hotplug' | $NIX_CMD_PATH/nix-instantiate -))
@@ -82,22 +83,23 @@ which=$($NIX_CMD_PATH/nix-store -r $(echo '(import ./pkgs.nix).which' | $NIX_CMD
 gnutar=$($NIX_CMD_PATH/nix-store -r $(echo '(import ./pkgs.nix).gnutar' | $NIX_CMD_PATH/nix-instantiate -))
 eject=$($NIX_CMD_PATH/nix-store -r $(echo '(import ./pkgs.nix).eject' | $NIX_CMD_PATH/nix-instantiate -))
 sysklogd=$($NIX_CMD_PATH/nix-store -r $(echo '(import ./pkgs.nix).sysklogd' | $NIX_CMD_PATH/nix-instantiate -))
+kudzu=$($NIX_CMD_PATH/nix-store -r $(echo '(import ./pkgs.nix).kudzu' | $NIX_CMD_PATH/nix-instantiate -))
 
 #(while read storepath; do
    #cp -fa --parents ${storepath} ${archivesDir}
 #done) < $storePaths
 
-echo utillinux $utilLinux
+#echo utillinux $utilLinux
 
-for i in $utilLinux; do
-  echo i $i
-  deps=( $($NIX_CMD_PATH/nix-store -q --references $i) )
-  echo length ${#deps[@]}
-  if test "${#deps[@]}" = 0
-  then
-    echo zarro
-  fi
-done
+#for i in $utilLinux; do
+#  echo i $i
+#  deps=( $($NIX_CMD_PATH/nix-store -q --references $i) )
+#  echo length ${#deps[@]}
+#  if test "${#deps[@]}" = 0
+#  then
+#    echo zarro
+#  fi
+#done
 
 echo creating directories for bootimage
 
@@ -106,6 +108,7 @@ mkdir ${initdir}/bin
 mkdir ${initdir}/cdrom
 mkdir ${initdir}/dev
 mkdir ${initdir}/etc
+mkdir ${initdir}/etc/sysconfig
 mkdir ${initdir}/installimage
 mkdir ${initdir}/modules
 mkdir ${initdir}/proc
@@ -138,7 +141,7 @@ cp -fa ${nixpkgs} ${archivesDir}
 #cp -fvau --parents ${nano} ${archivesDir}
 #cp -fvau --parents ${gnutar} ${archivesDir}
 
-bashdeps=$($NIX_CMD_PATH/nix-store -qR $(nix-store -r $(echo '(import ./pkgs.nix).bash' | $NIX_CMD_PATH/nix-instantiate -)))
+bashdeps=$($NIX_CMD_PATH/nix-store -qR $(nix-store -r $(echo '(import ./pkgs.nix).bashStatic' | $NIX_CMD_PATH/nix-instantiate -)))
 
 echo copying scripts
 
@@ -155,6 +158,7 @@ sed -e "s^@sysvinitPath\@^$sysvinitPath^g" \
     -e "s^@findutils\@^$findutils^g" \
     -e "s^@coreutilsdiet\@^$coreutilsdiet^g" \
     -e "s^@coreutils\@^$coreutils^g" \
+    -e "s^@utilLinux\@^$utilLinux^g" \
     -e "s^@utillinux\@^$utillinux^g" \
     -e "s^@e2fsprogs\@^$e2fsprogs^g" \
     -e "s^@modutils\@^$modutils^g" \
@@ -163,7 +167,7 @@ sed -e "s^@sysvinitPath\@^$sysvinitPath^g" \
     -e "s^@hotplug\@^$hotplug^g" \
     -e "s^@gnugrep\@^$gnugrep^g" \
     -e "s^@which\@^$which^g" \
-    -e "s^@eject\@^$eject^g" \
+    -e "s^@kudzu\@^$kudzu^g" \
     -e "s^@sysklogd\@^$sysklogd^g" \
     -e "s^@gnutar\@^$gnutar^g" \
     -e "s^@mingetty\@^$mingettyWrapper^g" \
@@ -177,7 +181,7 @@ sed -e "s^@sysvinitPath\@^$sysvinitPath^g" \
     -e "s^@findutils\@^$findutils^g" \
     -e "s^@coreutilsdiet\@^$coreutilsdiet^g" \
     -e "s^@coreutils\@^$coreutils^g" \
-    -e "s^@utillinux\@^$utillinux^g" \
+    -e "s^@utillinux\@^$utilLinux^g" \
     -e "s^@e2fsprogs\@^$e2fsprogs^g" \
     -e "s^@modutils\@^$modutils^g" \
     -e "s^@grub\@^$grub^g" \
@@ -203,6 +207,10 @@ echo copying kernel
 # of the kernel here.
 cp -L $kernel/vmlinuz ${archivesDir}/isolinux
 
+echo linking kernel modules
+
+ln -s $kernel/lib $archivesDir/lib
+
 echo creating ramdisk
 
 rm -f ${initrd}
@@ -210,16 +218,24 @@ rm -f ${initrd}
 cp ${archivesDir}/scripts/fill-disk.sh ${initdir}/
 cp ${archivesDir}/scripts/ramdisk-login.sh ${initdir}/
 cp ${archivesDir}/scripts/init.sh ${initdir}/init
-ln -s ${bash}/bin/bash ${initdir}/bin/sh
+#ln -s ${bash}/bin/bash ${initdir}/bin/sh
+cp ${bash}/bin/bash ${initdir}/bin/sh
 chmod u+x ${initdir}/init
 chmod u+x ${initdir}/fill-disk.sh
 chmod u+x ${initdir}/ramdisk-login.sh
-cp -fau --parents ${bashdeps} ${initdir}
+#cp -fau --parents ${bashdeps} ${initdir}
+#cp -fau --parents ${utilLinux} ${initdir}
+#cp -fau --parents ${coreUtilsDiet} ${initdir}
+#cp -fau --parents ${e2fsProgs} ${initdir}
+#cp -fau --parents ${modUtils} ${initdir}
+#cp -fau --parents ${hotplug} ${initdir}
+cp -fau --parents ${bash} ${initdir}
 cp -fau --parents ${utilLinux} ${initdir}
-cp -fau --parents ${coreUtilsDiet} ${initdir}
-cp -fau --parents ${e2fsProgs} ${initdir}
-cp -fau --parents ${modUtils} ${initdir}
+cp -fau --parents ${coreutilsdiet} ${initdir}
+cp -fau --parents ${e2fsprogs} ${initdir}
+cp -fau --parents ${modutils} ${initdir}
 cp -fau --parents ${hotplug} ${initdir}
+#cp -fau --parents ${kudzu} ${initdir}
 #cp -fau --parents ${eject} ${initdir}
 
 touch ${archivesDir}/NIXOS
@@ -243,4 +259,4 @@ mkisofs -rJ -o ${bootiso} -b isolinux/isolinux.bin -c isolinux/boot.cat \
 echo cleaning up
 
 chmod -f -R +w ${archivesDir}/*
-rm -rf ${archivesDir}/*
+#rm -rf ${archivesDir}/*
diff --git a/pkgs.nix b/pkgs.nix
index a995404f335..e1a4288c156 100644
--- a/pkgs.nix
+++ b/pkgs.nix
@@ -1,21 +1,21 @@
 rec {
   inherit (import /nixpkgs/trunk/pkgs/system/i686-linux.nix)
-    stdenv kernel bash coreutils coreutilsDiet findutilsWrapper utillinux sysvinit
+    stdenv kernel bash bashStatic coreutils coreutilsDiet findutilsWrapper utillinux utillinuxStatic sysvinit
    e2fsprogsDiet e2fsprogs
     nettools nix subversion gcc wget which vim less screen openssh binutils
     strace shadowutils iputils gnumake curl gnused gnutar gnugrep gzip
-    mingettyWrapper grubWrapper syslinux parted module_init_tools hotplug udev
-    dhcpWrapper man nano eject sysklogd;
+    mingettyWrapper grubWrapper syslinux parted module_init_tools module_init_toolsStatic hotplug udev
+    dhcpWrapper man nano eject sysklogd kudzu;
 
-  boot = (import ./boot) {inherit stdenv kernel bash coreutils findutilsWrapper
-    utillinux sysvinit e2fsprogs nettools nix subversion gcc wget which vim
+  boot = (import ./boot) {inherit stdenv kernel bash bashStatic coreutils findutilsWrapper
+    utillinux utillinuxStatic sysvinit e2fsprogs nettools nix subversion gcc wget which vim
     less screen openssh binutils strace shadowutils iputils gnumake curl
     gnused gnutar gnugrep gzip mingettyWrapper grubWrapper parted module_init_tools
     hotplug udev dhcpWrapper man nano;};
 
-  init = (import ./init) {inherit stdenv bash coreutilsDiet utillinux e2fsprogsDiet
+  init = (import ./init) {inherit stdenv bash bashStatic coreutilsDiet utillinux e2fsprogsDiet
     nix shadowutils mingettyWrapper grubWrapper parted module_init_tools hotplug
     dhcpWrapper man nano eject;};
 
-  everything = [boot sysvinit kernel sysklogd];
+  everything = [boot sysvinit kernel sysklogd kudzu];
 }
-- 
GitLab


From d124bd94348234da8e21369fa0ceeb4fa511b518 Mon Sep 17 00:00:00 2001
From: Armijn Hemel <armijn@gpl-violations.org>
Date: Sat, 24 Dec 2005 21:15:24 +0000
Subject: [PATCH 0115/5331] some more tweaks. Enable extra logins on tty2 and
 tty3. Default root password is empty.

svn path=/nixu/trunk/; revision=4429
---
 fill-disk.sh | 12 +++++++++---
 make-disk.sh | 26 +++++++++++++++-----------
 2 files changed, 24 insertions(+), 14 deletions(-)

diff --git a/fill-disk.sh b/fill-disk.sh
index 3240b2b57d4..93e55f5a979 100755
--- a/fill-disk.sh
+++ b/fill-disk.sh
@@ -1,6 +1,6 @@
 #! @bash@/bin/sh -e
 
-export PATH=@bash@/bin:@coreutilsdiet@/bin:@coreutils@/bin:@findutils@/bin:@utillinux@/bin:@utillinux@/sbin:@utilLinux@/bin:@utilLinux@/sbin:@e2fsprogs@/sbin:@grub@/sbin:@sysvinitPath@/sbin:@gnugrep@/bin:@which@/bin:@gnutar@/bin:@eject@/bin:@kudzu@/sbin
+export PATH=/bin:/sbin:@bash@/bin:@coreutilsdiet@/bin:@coreutils@/bin:@findutils@/bin:@utillinux@/bin:@utillinux@/sbin:@utilLinux@/bin:@utilLinux@/sbin:@e2fsprogs@/sbin:@grub@/sbin:@sysvinitPath@/sbin:@gnugrep@/bin:@which@/bin:@gnutar@/bin:@eject@/bin:@kudzu@/sbin
 
 ##
 ## In the beginning we want to have a minimalistic environment, built with
@@ -236,6 +236,8 @@ echo bringing up networking...
 
 nic=`kudzu -p | grep eth | sort | uniq | cut -d ' ' -f 2`
 
+echo "NIC: $nic"
+
 echo initialising Nix DB...
 $NIX_CMD_PATH/nix-store --init
 
@@ -285,7 +287,7 @@ echo setting init symlink...
 rm -f $root/init
 #ln -s $sysvinitPath/sbin/init $root/init
 ln -s @sysvinitPath@/sbin/init $root/sbin/init
-ln -s @bash@/bin/sh $root/bin/sh
+ln -s @bashGlibc@/bin/sh $root/bin/sh
 #ln -s @bash@/bin/bash $root/bin/bash
 
 echo setting up inittab...
@@ -294,7 +296,8 @@ echo "id:2:initdefault:" >> $root/etc/inittab
 echo "si::bootwait:$bootPath/bin/boot.sh" >> $root/etc/inittab
 echo "ht:06:wait:$bootPath/bin/halt.sh" >> $root/etc/inittab
 echo "1:2345:respawn:$bootPath/bin/login.sh /dev/tty1" >> $root/etc/inittab
-echo "#2:2345:respawn:$mingetty/sbin/mingetty tty2" >> $root/etc/inittab
+echo "2:2345:respawn:$mingetty/sbin/mingetty tty2" >> $root/etc/inittab
+echo "3:2345:respawn:$mingetty/sbin/mingetty tty3" >> $root/etc/inittab
 #echo "2:2345:respawn:$bootPath/bin/login.sh /dev/ttys/1" >> $root/etc/inittab
 
 echo setting up networking information...
@@ -307,6 +310,7 @@ echo "127.0.0.1 localhost" >> $root/etc/hosts
 echo storing hardware information...
 
 kudzu -p > $root/etc/sysconfig/hwconf
+#cp /etc/modprobe.conf $root/etc/
 
 echo setting up initial account information...
 
@@ -320,6 +324,8 @@ echo "sshd:!!:12757:0:99999:7:::" >> $root/etc/shadow
 echo default profile for root
 echo "source @nix@/etc/profile.d/nix.sh" > $root/root/.profile
 
+touch_file /etc/login.defs
+
 ###
 ### Do kernel stuff here.
 ###
diff --git a/make-disk.sh b/make-disk.sh
index eda0f9cbd41..ccca59b28f4 100755
--- a/make-disk.sh
+++ b/make-disk.sh
@@ -64,7 +64,7 @@ Kernel=$($NIX_CMD_PATH/nix-store -qR $(nix-store -r $(echo '(import ./pkgs.nix).
 SysVinit=$($NIX_CMD_PATH/nix-store -qR $(nix-store -r $(echo '(import ./pkgs.nix).sysvinit' | $NIX_CMD_PATH/nix-instantiate -)))
 BootPath=$($NIX_CMD_PATH/nix-store -qR $(nix-store -r $(echo '(import ./pkgs.nix).boot' | $NIX_CMD_PATH/nix-instantiate -)))
 
-#bash=$($NIX_CMD_PATH/nix-store -q $(echo '(import ./pkgs.nix).bash' | $NIX_CMD_PATH/nix-instantiate -))
+bashGlibc=$($NIX_CMD_PATH/nix-store -q $(echo '(import ./pkgs.nix).bash' | $NIX_CMD_PATH/nix-instantiate -))
 bash=$($NIX_CMD_PATH/nix-store -q $(echo '(import ./pkgs.nix).bashStatic' | $NIX_CMD_PATH/nix-instantiate -))
 coreutilsdiet=$($NIX_CMD_PATH/nix-store -q $(echo '(import ./pkgs.nix).coreutilsDiet' | $NIX_CMD_PATH/nix-instantiate -))
 coreutils=$($NIX_CMD_PATH/nix-store -q $(echo '(import ./pkgs.nix).coreutils' | $NIX_CMD_PATH/nix-instantiate -))
@@ -124,6 +124,7 @@ echo copying nixpkgs
 
 #svn export ${nixpkgs} ${archivesDir}/pkgs
 cp -fa ${nixpkgs} ${archivesDir}
+#tar cf $archivesDir
 
 #echo copying packages from store
 
@@ -141,8 +142,6 @@ cp -fa ${nixpkgs} ${archivesDir}
 #cp -fvau --parents ${nano} ${archivesDir}
 #cp -fvau --parents ${gnutar} ${archivesDir}
 
-bashdeps=$($NIX_CMD_PATH/nix-store -qR $(nix-store -r $(echo '(import ./pkgs.nix).bashStatic' | $NIX_CMD_PATH/nix-instantiate -)))
-
 echo copying scripts
 
 mkdir ${archivesDir}/scripts
@@ -155,6 +154,7 @@ sed -e "s^@sysvinitPath\@^$sysvinitPath^g" \
     -e "s^@bootPath\@^$bootPath^g" \
     -e "s^@nix\@^$nix^g" \
     -e "s^@bash\@^$bash^g" \
+    -e "s^@bashGlibc\@^$bashGlibc^g" \
     -e "s^@findutils\@^$findutils^g" \
     -e "s^@coreutilsdiet\@^$coreutilsdiet^g" \
     -e "s^@coreutils\@^$coreutils^g" \
@@ -223,20 +223,24 @@ cp ${bash}/bin/bash ${initdir}/bin/sh
 chmod u+x ${initdir}/init
 chmod u+x ${initdir}/fill-disk.sh
 chmod u+x ${initdir}/ramdisk-login.sh
-#cp -fau --parents ${bashdeps} ${initdir}
 #cp -fau --parents ${utilLinux} ${initdir}
 #cp -fau --parents ${coreUtilsDiet} ${initdir}
 #cp -fau --parents ${e2fsProgs} ${initdir}
 #cp -fau --parents ${modUtils} ${initdir}
 #cp -fau --parents ${hotplug} ${initdir}
-cp -fau --parents ${bash} ${initdir}
-cp -fau --parents ${utilLinux} ${initdir}
-cp -fau --parents ${coreutilsdiet} ${initdir}
-cp -fau --parents ${e2fsprogs} ${initdir}
-cp -fau --parents ${modutils} ${initdir}
-cp -fau --parents ${hotplug} ${initdir}
+cp -fau --parents ${bash}/bin ${initdir}
+cp -fau --parents ${utilLinux}/bin ${initdir}
+chmod -R u+w ${initdir}
+cp -fau --parents ${utilLinux}/sbin ${initdir}
+cp -fau --parents ${coreutilsdiet}/bin ${initdir}
+cp -fau --parents ${e2fsprogs}/bin ${initdir}
+chmod -R u+w ${initdir}
+cp -fau --parents ${e2fsprogs}/sbin ${initdir}
+cp -fau --parents ${modutils}/bin ${initdir}
+chmod -R u+w ${initdir}
+cp -fau --parents ${modutils}/sbin ${initdir}
+#cp -fau --parents ${hotplug} ${initdir}
 #cp -fau --parents ${kudzu} ${initdir}
-#cp -fau --parents ${eject} ${initdir}
 
 touch ${archivesDir}/NIXOS
 
-- 
GitLab


From dfa61299fe29934f6aaa2238056ffb5e5bf0a1a0 Mon Sep 17 00:00:00 2001
From: Armijn Hemel <armijn@gpl-violations.org>
Date: Wed, 4 Jan 2006 18:19:23 +0000
Subject: [PATCH 0116/5331] add module_init_tools/bin to the initial path on
 tty1

svn path=/nixu/trunk/; revision=4488
---
 boot/env.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/boot/env.sh b/boot/env.sh
index ee481270ee9..e5e6051c0ac 100644
--- a/boot/env.sh
+++ b/boot/env.sh
@@ -1 +1 @@
-export PATH=@nix@/bin:@bash@/bin:@coreutils@/bin:@findutilsWrapper@/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:@curl@/bin:@gnused@/bin:@gnutar@/bin:@gnugrep@/bin:@gzip@/bin:@mingettyWrapper@/sbin:@grub@/bin:@grub@/sbin:@module_init_tools@/sbin:@dhcpWrapper@/sbin:@man@/bin:@nano@/bin
+export PATH=@nix@/bin:@bash@/bin:@coreutils@/bin:@findutilsWrapper@/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:@curl@/bin:@gnused@/bin:@gnutar@/bin:@gnugrep@/bin:@gzip@/bin:@mingettyWrapper@/sbin:@grub@/bin:@grub@/sbin:@module_init_tools@/bin:@module_init_tools@/sbin:@dhcpWrapper@/sbin:@man@/bin:@nano@/bin
-- 
GitLab


From f20d80957c5eb6f29433f1d21a7cf2bd7144fd1b Mon Sep 17 00:00:00 2001
From: Armijn Hemel <armijn@gpl-violations.org>
Date: Fri, 6 Jan 2006 15:51:19 +0000
Subject: [PATCH 0117/5331] add some testscripts for generating kernel modules
 layout. Right now too much cruft gets symlinked, needs weeding and
 documenting...lots of documenting....

svn path=/nixu/trunk/; revision=4501
---
 fill-disk.sh           | 10 ++++-----
 make-disk.sh           |  6 +++++-
 scripts/kernel.nix     |  6 ++++++
 scripts/make-kernel.sh | 49 ++++++++++++++++++++++++++++++++++++++++++
 4 files changed, 65 insertions(+), 6 deletions(-)
 create mode 100644 scripts/kernel.nix
 create mode 100755 scripts/make-kernel.sh

diff --git a/fill-disk.sh b/fill-disk.sh
index 93e55f5a979..0687b4e7fb4 100755
--- a/fill-disk.sh
+++ b/fill-disk.sh
@@ -224,7 +224,7 @@ mount --bind /cdrom/nix /nix
 
 echo probing for hardware...
 
-kudzu
+#kudzu
 
 export NIX_DATA_DIR=$root/nix/share
 export NIX_LOG_DIR=$root/nix/log/nix
@@ -232,11 +232,11 @@ export NIX_STATE_DIR=$root/nix/var/nix
 export NIX_CONF_DIR=$root/nix/etc
 NIX_CMD_PATH=@nix@/bin
 
-echo bringing up networking...
+#echo bringing up networking...
 
-nic=`kudzu -p | grep eth | sort | uniq | cut -d ' ' -f 2`
+#nic=`kudzu -p | grep eth | sort | uniq | cut -d ' ' -f 2`
 
-echo "NIC: $nic"
+#echo "NIC: $nic"
 
 echo initialising Nix DB...
 $NIX_CMD_PATH/nix-store --init
@@ -309,7 +309,7 @@ echo "127.0.0.1 localhost" >> $root/etc/hosts
 
 echo storing hardware information...
 
-kudzu -p > $root/etc/sysconfig/hwconf
+#kudzu -p > $root/etc/sysconfig/hwconf
 #cp /etc/modprobe.conf $root/etc/
 
 echo setting up initial account information...
diff --git a/make-disk.sh b/make-disk.sh
index ccca59b28f4..34a1c2b5f33 100755
--- a/make-disk.sh
+++ b/make-disk.sh
@@ -83,7 +83,7 @@ which=$($NIX_CMD_PATH/nix-store -r $(echo '(import ./pkgs.nix).which' | $NIX_CMD
 gnutar=$($NIX_CMD_PATH/nix-store -r $(echo '(import ./pkgs.nix).gnutar' | $NIX_CMD_PATH/nix-instantiate -))
 eject=$($NIX_CMD_PATH/nix-store -r $(echo '(import ./pkgs.nix).eject' | $NIX_CMD_PATH/nix-instantiate -))
 sysklogd=$($NIX_CMD_PATH/nix-store -r $(echo '(import ./pkgs.nix).sysklogd' | $NIX_CMD_PATH/nix-instantiate -))
-kudzu=$($NIX_CMD_PATH/nix-store -r $(echo '(import ./pkgs.nix).kudzu' | $NIX_CMD_PATH/nix-instantiate -))
+#kudzu=$($NIX_CMD_PATH/nix-store -r $(echo '(import ./pkgs.nix).kudzu' | $NIX_CMD_PATH/nix-instantiate -))
 
 #(while read storepath; do
    #cp -fa --parents ${storepath} ${archivesDir}
@@ -231,13 +231,17 @@ chmod u+x ${initdir}/ramdisk-login.sh
 cp -fau --parents ${bash}/bin ${initdir}
 cp -fau --parents ${utilLinux}/bin ${initdir}
 chmod -R u+w ${initdir}
+echo utilLinux $utilLinux
 cp -fau --parents ${utilLinux}/sbin ${initdir}
+echo coreutils
 cp -fau --parents ${coreutilsdiet}/bin ${initdir}
 cp -fau --parents ${e2fsprogs}/bin ${initdir}
 chmod -R u+w ${initdir}
+echo e2fsprogs
 cp -fau --parents ${e2fsprogs}/sbin ${initdir}
 cp -fau --parents ${modutils}/bin ${initdir}
 chmod -R u+w ${initdir}
+echo modutils
 cp -fau --parents ${modutils}/sbin ${initdir}
 #cp -fau --parents ${hotplug} ${initdir}
 #cp -fau --parents ${kudzu} ${initdir}
diff --git a/scripts/kernel.nix b/scripts/kernel.nix
new file mode 100644
index 00000000000..3a799a5ea4d
--- /dev/null
+++ b/scripts/kernel.nix
@@ -0,0 +1,6 @@
+rec {
+  inherit (import /nixpkgs/trunk/pkgs/system/i686-linux.nix)
+    stdenv kernel ov511;
+
+  everything = [kernel ov511];
+}
diff --git a/scripts/make-kernel.sh b/scripts/make-kernel.sh
new file mode 100755
index 00000000000..e3a199fb84a
--- /dev/null
+++ b/scripts/make-kernel.sh
@@ -0,0 +1,49 @@
+#! /bin/sh -e
+
+archivesDir=$(mktemp -d)
+manifest=${archivesDir}/MANIFEST
+nixpkgs=/nixpkgs/trunk/pkgs
+fill_disk=$archivesDir/scripts/fill-disk.sh
+ramdisk_login=$archivesDir/scripts/ramdisk-login.sh
+storePaths=$archivesDir/mystorepaths
+validatePaths=$archivesDir/validatepaths
+bootiso=/tmp/nixos.iso
+initrd=/tmp/initram.img
+initdir=${archivesDir}/initdir
+initscript=$archivesDir/scripts/init.sh
+
+NIX_CMD_PATH=$(dirname $(which nix-store))
+cpwd=`pwd`
+
+storeExpr=$($NIX_CMD_PATH/nix-store -qR $($NIX_CMD_PATH/nix-store -r $(echo '(import ./kernel.nix).everything' | $NIX_CMD_PATH/nix-instantiate -)))
+
+kernel=$($NIX_CMD_PATH/nix-store -r $(echo '(import ./kernel.nix).kernel' | $NIX_CMD_PATH/nix-instantiate -))
+
+ov511=$($NIX_CMD_PATH/nix-store -r $(echo '(import ./kernel.nix).ov511' | $NIX_CMD_PATH/nix-instantiate -))
+
+echo $kernel
+echo $ov511
+
+echo making kernel stuff
+
+kernelVersion=$(cd $kernel/lib/modules/; ls -d *)
+mkdir -p $archivesDir/lib/modules/$kernelVersion
+
+echo $kernelVersion
+
+cd $kernel
+
+# make directories
+
+find . -not -path "./lib/modules/$kernelVersion/build*" -type d | xargs -n 1 -i% mkdir -p $archivesDir/%
+
+# link all files
+find . -not -path "./lib/modules/$kernelVersion/build*" -type f | xargs -n 1 -i% ln -s $kernel/% $archivesDir/%
+
+# make directories
+
+cd $ov511
+find . -not -path "./lib/modules/$kernelVersion/build*" -type d | xargs -n 1 -i% mkdir -p $archivesDir/%
+
+# link all files
+find . -not -path "./lib/modules/$kernelVersion/build*" -type f | xargs -n 1 -i% ln -s $kernel/% $archivesDir/%
-- 
GitLab


From bdf2a61d916c7f0c7af523a1b58960385a849d40 Mon Sep 17 00:00:00 2001
From: Armijn Hemel <armijn@gpl-violations.org>
Date: Sat, 7 Jan 2006 01:24:29 +0000
Subject: [PATCH 0118/5331] add /var/run/usb. This is needed for hotplugging.
 Actually, this is probably the wrong place to make these directories. After
 all, if we build this into a real installer what do we know what to install?
 Perhaps we will use a completely different hotplug implementation that won't
 use this directory. Ah well, future work ;)

svn path=/nixu/trunk/; revision=4502
---
 fill-disk.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/fill-disk.sh b/fill-disk.sh
index 0687b4e7fb4..d36f4bc044b 100755
--- a/fill-disk.sh
+++ b/fill-disk.sh
@@ -173,6 +173,7 @@ make_dir 00755 /var/lock
 make_dir 00755 /var/lock/subsys
 make_dir 00755 /var/log
 make_dir 00755 /var/run
+make_dir 00755 /var/run/usb
 make_dir 00755 /var/spool
 make_dir 00755 /var/state
 make_dir 00755 /var/state/dhcp
-- 
GitLab


From 9cbf8a84fb42b1fa0b6fbf2b94db740e9c6a34e4 Mon Sep 17 00:00:00 2001
From: Armijn Hemel <armijn@gpl-violations.org>
Date: Sat, 7 Jan 2006 14:36:13 +0000
Subject: [PATCH 0119/5331] enable swap during install

svn path=/nixu/trunk/; revision=4503
---
 fill-disk.sh | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/fill-disk.sh b/fill-disk.sh
index d36f4bc044b..b8acc73ad19 100755
--- a/fill-disk.sh
+++ b/fill-disk.sh
@@ -1,6 +1,6 @@
 #! @bash@/bin/sh -e
 
-export PATH=/bin:/sbin:@bash@/bin:@coreutilsdiet@/bin:@coreutils@/bin:@findutils@/bin:@utillinux@/bin:@utillinux@/sbin:@utilLinux@/bin:@utilLinux@/sbin:@e2fsprogs@/sbin:@grub@/sbin:@sysvinitPath@/sbin:@gnugrep@/bin:@which@/bin:@gnutar@/bin:@eject@/bin:@kudzu@/sbin
+export PATH=/bin:/sbin:@bash@/bin:@coreutilsdiet@/bin:@coreutils@/bin:@findutils@/bin:@utillinux@/bin:@utillinux@/sbin:@utilLinux@/bin:@utilLinux@/sbin:@e2fsprogs@/sbin:@grub@/sbin:@sysvinitPath@/sbin:@gnugrep@/bin:@which@/bin:@gnutar@/bin:@eject@/bin:@kudzu@/sbin:@xawtv@/bin
 
 ##
 ## In the beginning we want to have a minimalistic environment, built with
@@ -8,6 +8,7 @@ export PATH=/bin:/sbin:@bash@/bin:@coreutilsdiet@/bin:@coreutils@/bin:@findutils
 ##
 
 kernel=@kernel@
+xawtv=@xawtv@
 
 storePaths=/mystorepaths
 
@@ -92,11 +93,17 @@ echo starting emergency shell on tty2
 
 exec ./ramdisk-login.sh /dev/tty2 &
 
+echo formatting target device
+
 targetdrive=/dev/hda
 device=${targetdrive}1
 mkfs.ext2 ${device}
-mkswap ${targetdrive}2
+swapdevice=${targetdrive}2
+mkswap $swapdevice
+
+echo enabling swap
 
+swapon $swapdevice
 
 #if ! test -n "$1"
 #then
@@ -297,8 +304,8 @@ echo "id:2:initdefault:" >> $root/etc/inittab
 echo "si::bootwait:$bootPath/bin/boot.sh" >> $root/etc/inittab
 echo "ht:06:wait:$bootPath/bin/halt.sh" >> $root/etc/inittab
 echo "1:2345:respawn:$bootPath/bin/login.sh /dev/tty1" >> $root/etc/inittab
-echo "2:2345:respawn:$mingetty/sbin/mingetty tty2" >> $root/etc/inittab
-echo "3:2345:respawn:$mingetty/sbin/mingetty tty3" >> $root/etc/inittab
+echo "#2:2345:respawn:$mingetty/sbin/mingetty tty2" >> $root/etc/inittab
+echo "#3:2345:respawn:$mingetty/sbin/mingetty tty3" >> $root/etc/inittab
 #echo "2:2345:respawn:$bootPath/bin/login.sh /dev/ttys/1" >> $root/etc/inittab
 
 echo setting up networking information...
@@ -326,6 +333,7 @@ echo default profile for root
 echo "source @nix@/etc/profile.d/nix.sh" > $root/root/.profile
 
 touch_file /etc/login.defs
+touch_file /etc/services
 
 ###
 ### Do kernel stuff here.
-- 
GitLab


From 77b661cfab670c2a3f0edc578804941ee9760a47 Mon Sep 17 00:00:00 2001
From: Armijn Hemel <armijn@gpl-violations.org>
Date: Sat, 7 Jan 2006 15:42:59 +0000
Subject: [PATCH 0120/5331] e2fsprogs dynamically loads some library, even if
 it's statically linked.

svn path=/nixu/trunk/; revision=4505
---
 boot/default.nix | 4 ++--
 make-disk.sh     | 8 +-------
 pkgs.nix         | 6 +++---
 3 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/boot/default.nix b/boot/default.nix
index 12d80e54419..588f3d58273 100644
--- a/boot/default.nix
+++ b/boot/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, kernel, bash, bashStatic, coreutils, findutilsWrapper, utillinux, utillinuxStatic, sysvinit, e2fsprogs
+{ stdenv, bash, bashStatic, coreutils, findutilsWrapper, utillinux, utillinuxStatic, sysvinit, e2fsprogs
 , nettools, nix, subversion, gcc, wget, which, vim, less, screen, openssh
 , binutils, strace, shadowutils, iputils, gnumake, curl, gnused, gnugrep
 , gnutar, gzip, mingettyWrapper, grubWrapper, parted, module_init_tools, hotplug
@@ -12,7 +12,7 @@ derivation {
   halt = ./halt.sh;
   login = ./login.sh;
   env = ./env.sh;
-  inherit stdenv kernel bash bashStatic coreutils findutilsWrapper utillinux sysvinit
+  inherit stdenv bash bashStatic coreutils findutilsWrapper utillinux sysvinit
           e2fsprogs nettools nix subversion gcc wget which vim less screen
           openssh binutils strace shadowutils iputils gnumake curl gnused
           gnutar gnugrep gzip mingettyWrapper grubWrapper parted module_init_tools
diff --git a/make-disk.sh b/make-disk.sh
index 34a1c2b5f33..f226e216a30 100755
--- a/make-disk.sh
+++ b/make-disk.sh
@@ -225,20 +225,14 @@ chmod u+x ${initdir}/fill-disk.sh
 chmod u+x ${initdir}/ramdisk-login.sh
 #cp -fau --parents ${utilLinux} ${initdir}
 #cp -fau --parents ${coreUtilsDiet} ${initdir}
-#cp -fau --parents ${e2fsProgs} ${initdir}
 #cp -fau --parents ${modUtils} ${initdir}
 #cp -fau --parents ${hotplug} ${initdir}
 cp -fau --parents ${bash}/bin ${initdir}
 cp -fau --parents ${utilLinux}/bin ${initdir}
 chmod -R u+w ${initdir}
-echo utilLinux $utilLinux
 cp -fau --parents ${utilLinux}/sbin ${initdir}
-echo coreutils
+cp -fau --parents ${e2fsProgs} ${initdir}
 cp -fau --parents ${coreutilsdiet}/bin ${initdir}
-cp -fau --parents ${e2fsprogs}/bin ${initdir}
-chmod -R u+w ${initdir}
-echo e2fsprogs
-cp -fau --parents ${e2fsprogs}/sbin ${initdir}
 cp -fau --parents ${modutils}/bin ${initdir}
 chmod -R u+w ${initdir}
 echo modutils
diff --git a/pkgs.nix b/pkgs.nix
index e1a4288c156..d156cddbab8 100644
--- a/pkgs.nix
+++ b/pkgs.nix
@@ -5,9 +5,9 @@ rec {
     nettools nix subversion gcc wget which vim less screen openssh binutils
     strace shadowutils iputils gnumake curl gnused gnutar gnugrep gzip
     mingettyWrapper grubWrapper syslinux parted module_init_tools module_init_toolsStatic hotplug udev
-    dhcpWrapper man nano eject sysklogd kudzu;
+    dhcpWrapper man nano eject sysklogd kudzu xawtv;
 
-  boot = (import ./boot) {inherit stdenv kernel bash bashStatic coreutils findutilsWrapper
+  boot = (import ./boot) {inherit stdenv bash bashStatic coreutils findutilsWrapper
     utillinux utillinuxStatic sysvinit e2fsprogs nettools nix subversion gcc wget which vim
     less screen openssh binutils strace shadowutils iputils gnumake curl
     gnused gnutar gnugrep gzip mingettyWrapper grubWrapper parted module_init_tools
@@ -17,5 +17,5 @@ rec {
     nix shadowutils mingettyWrapper grubWrapper parted module_init_tools hotplug
     dhcpWrapper man nano eject;};
 
-  everything = [boot sysvinit kernel sysklogd kudzu];
+  everything = [boot sysvinit sysklogd kernel xawtv];
 }
-- 
GitLab


From 908db1fd4510613479e3de7377b466611125af5b Mon Sep 17 00:00:00 2001
From: Armijn Hemel <armijn@gpl-violations.org>
Date: Sat, 7 Jan 2006 18:07:32 +0000
Subject: [PATCH 0121/5331] rename dir...it makes more sense

svn path=/nixu/trunk/; revision=4508
---
 {scripts => kernelscripts}/kernel.nix     | 0
 {scripts => kernelscripts}/make-kernel.sh | 0
 2 files changed, 0 insertions(+), 0 deletions(-)
 rename {scripts => kernelscripts}/kernel.nix (100%)
 rename {scripts => kernelscripts}/make-kernel.sh (100%)

diff --git a/scripts/kernel.nix b/kernelscripts/kernel.nix
similarity index 100%
rename from scripts/kernel.nix
rename to kernelscripts/kernel.nix
diff --git a/scripts/make-kernel.sh b/kernelscripts/make-kernel.sh
similarity index 100%
rename from scripts/make-kernel.sh
rename to kernelscripts/make-kernel.sh
-- 
GitLab


From ed5199d3b26042ceb8916b9da5592ff3e206e1fb Mon Sep 17 00:00:00 2001
From: Armijn Hemel <armijn@gpl-violations.org>
Date: Sat, 7 Jan 2006 22:35:20 +0000
Subject: [PATCH 0122/5331] make symlinks to the right location

svn path=/nixu/trunk/; revision=4511
---
 kernelscripts/make-kernel.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kernelscripts/make-kernel.sh b/kernelscripts/make-kernel.sh
index e3a199fb84a..14f006a0553 100755
--- a/kernelscripts/make-kernel.sh
+++ b/kernelscripts/make-kernel.sh
@@ -46,4 +46,4 @@ cd $ov511
 find . -not -path "./lib/modules/$kernelVersion/build*" -type d | xargs -n 1 -i% mkdir -p $archivesDir/%
 
 # link all files
-find . -not -path "./lib/modules/$kernelVersion/build*" -type f | xargs -n 1 -i% ln -s $kernel/% $archivesDir/%
+find . -not -path "./lib/modules/$kernelVersion/build*" -type f | xargs -n 1 -i% ln -s $ov511/% $archivesDir/%
-- 
GitLab


From 41eb324771b9632b8fac9248ea8f4c0964068315 Mon Sep 17 00:00:00 2001
From: Armijn Hemel <armijn@gpl-violations.org>
Date: Sun, 8 Jan 2006 00:23:31 +0000
Subject: [PATCH 0123/5331] add a bit about hotplugging

svn path=/nixu/trunk/; revision=4515
---
 howto | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/howto b/howto
index 057fb17276b..7209c06d427 100644
--- a/howto
+++ b/howto
@@ -79,3 +79,22 @@ NixOS machine (needed for mingetty). Alternatively, do:
 # touch /etc/login.defs
 
 - relaunch init
+
+
+  Making hotplugging work
+
+Many devices are controlled by so called "hot plugging". The kernel executes
+a program -- usually /sbin/hotplug, but this is configurable at boottime by
+setting the right path in /proc/sys/kernel/hotplug -- when a new device is
+added to the machine. This program makes sure the right kernel modules are
+loaded and optionally, if enabled, sends a message to udev to create the right
+device node in /dev (NOTE: this is not enabled in NixOS right now).
+
+- install hotplug package
+  - make symlinks /etc/hotplug, /etc/hotplug.d, /sbin/hotplug (TODO: make
+    this pure)
+  - make sure the kernel and additional modules are prepared well (currently
+    this is hackish, but workable: see kernelscripts/make-kernel.sh for an
+    example)
+  - (optionally:) launch udev
+  - plug in a device
-- 
GitLab


From 80595bb21f8ebc7f08ddc7012789050ad2a19c57 Mon Sep 17 00:00:00 2001
From: Armijn Hemel <armijn@gpl-violations.org>
Date: Sun, 8 Jan 2006 00:42:45 +0000
Subject: [PATCH 0124/5331] add a bit about mounting usbfs

svn path=/nixu/trunk/; revision=4516
---
 howto | 21 +++++++++++++--------
 1 file changed, 13 insertions(+), 8 deletions(-)

diff --git a/howto b/howto
index 7209c06d427..646f2c2ebf6 100644
--- a/howto
+++ b/howto
@@ -83,18 +83,23 @@ NixOS machine (needed for mingetty). Alternatively, do:
 
   Making hotplugging work
 
-Many devices are controlled by so called "hot plugging". The kernel executes
-a program -- usually /sbin/hotplug, but this is configurable at boottime by
-setting the right path in /proc/sys/kernel/hotplug -- when a new device is
-added to the machine. This program makes sure the right kernel modules are
-loaded and optionally, if enabled, sends a message to udev to create the right
-device node in /dev (NOTE: this is not enabled in NixOS right now).
-
+Many devices (USB, Firewire) are controlled by so called "hot plugging". The
+kernel executes a program -- usually /sbin/hotplug, but this is configurable
+at boottime by setting the right path in /proc/sys/kernel/hotplug -- when a
+new device is added to the machine. This program makes sure the right kernel
+modules are loaded and optionally, if enabled, sends a message to udev to
+create the right device node in /dev (NOTE: this is not enabled in NixOS right
+now).
+
+- mount usbfs (for USB):
+  # mount -t usbfs usbfs /proc/bus/usb
 - install hotplug package
   - make symlinks /etc/hotplug, /etc/hotplug.d, /sbin/hotplug (TODO: make
     this pure)
   - make sure the kernel and additional modules are prepared well (currently
     this is hackish, but workable: see kernelscripts/make-kernel.sh for an
     example)
-  - (optionally:) launch udev
+  - (optionally:) install udev
+    - make a symlink to /etc/udev/udev.conf
+    - launch udev
   - plug in a device
-- 
GitLab


From bb2278902150b62b47122dc39cdcbbdbb039cf51 Mon Sep 17 00:00:00 2001
From: Armijn Hemel <armijn@gpl-violations.org>
Date: Thu, 12 Jan 2006 13:51:43 +0000
Subject: [PATCH 0125/5331] change the hostname from "uml" to "nixos" to keep
 eelco happy ;)

svn path=/nixu/trunk/; revision=4540
---
 boot/boot.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/boot/boot.sh b/boot/boot.sh
index 6115bd988c1..5f04abe0134 100644
--- a/boot/boot.sh
+++ b/boot/boot.sh
@@ -25,7 +25,7 @@ echo "starting udev..."
 @udev@/sbin/udevstart
 
 echo "setting up hostname..."
-hostname uml
+hostname nixos
 
 echo "enabling loopback interface..."
 ifconfig lo 127.0.0.1
-- 
GitLab


From 994b85b4af3cbd1e504246ab3895f16a6ddcba54 Mon Sep 17 00:00:00 2001
From: Armijn Hemel <armijn@gpl-violations.org>
Date: Mon, 16 Jan 2006 16:05:16 +0000
Subject: [PATCH 0126/5331] make all paths absolute...still needed: a builder

svn path=/nixu/trunk/; revision=4563
---
 kernelscripts/make-kernel.sh    | 49 ---------------------------------
 kernelscripts/make-kernel.sh.in | 36 ++++++++++++++++++++++++
 2 files changed, 36 insertions(+), 49 deletions(-)
 delete mode 100755 kernelscripts/make-kernel.sh
 create mode 100755 kernelscripts/make-kernel.sh.in

diff --git a/kernelscripts/make-kernel.sh b/kernelscripts/make-kernel.sh
deleted file mode 100755
index 14f006a0553..00000000000
--- a/kernelscripts/make-kernel.sh
+++ /dev/null
@@ -1,49 +0,0 @@
-#! /bin/sh -e
-
-archivesDir=$(mktemp -d)
-manifest=${archivesDir}/MANIFEST
-nixpkgs=/nixpkgs/trunk/pkgs
-fill_disk=$archivesDir/scripts/fill-disk.sh
-ramdisk_login=$archivesDir/scripts/ramdisk-login.sh
-storePaths=$archivesDir/mystorepaths
-validatePaths=$archivesDir/validatepaths
-bootiso=/tmp/nixos.iso
-initrd=/tmp/initram.img
-initdir=${archivesDir}/initdir
-initscript=$archivesDir/scripts/init.sh
-
-NIX_CMD_PATH=$(dirname $(which nix-store))
-cpwd=`pwd`
-
-storeExpr=$($NIX_CMD_PATH/nix-store -qR $($NIX_CMD_PATH/nix-store -r $(echo '(import ./kernel.nix).everything' | $NIX_CMD_PATH/nix-instantiate -)))
-
-kernel=$($NIX_CMD_PATH/nix-store -r $(echo '(import ./kernel.nix).kernel' | $NIX_CMD_PATH/nix-instantiate -))
-
-ov511=$($NIX_CMD_PATH/nix-store -r $(echo '(import ./kernel.nix).ov511' | $NIX_CMD_PATH/nix-instantiate -))
-
-echo $kernel
-echo $ov511
-
-echo making kernel stuff
-
-kernelVersion=$(cd $kernel/lib/modules/; ls -d *)
-mkdir -p $archivesDir/lib/modules/$kernelVersion
-
-echo $kernelVersion
-
-cd $kernel
-
-# make directories
-
-find . -not -path "./lib/modules/$kernelVersion/build*" -type d | xargs -n 1 -i% mkdir -p $archivesDir/%
-
-# link all files
-find . -not -path "./lib/modules/$kernelVersion/build*" -type f | xargs -n 1 -i% ln -s $kernel/% $archivesDir/%
-
-# make directories
-
-cd $ov511
-find . -not -path "./lib/modules/$kernelVersion/build*" -type d | xargs -n 1 -i% mkdir -p $archivesDir/%
-
-# link all files
-find . -not -path "./lib/modules/$kernelVersion/build*" -type f | xargs -n 1 -i% ln -s $ov511/% $archivesDir/%
diff --git a/kernelscripts/make-kernel.sh.in b/kernelscripts/make-kernel.sh.in
new file mode 100755
index 00000000000..681587f62dd
--- /dev/null
+++ b/kernelscripts/make-kernel.sh.in
@@ -0,0 +1,36 @@
+#! /bin/sh -e
+
+#archivesDir=$(@mktemp@/bin/mktemp -d)
+archivesDir=/
+
+cpwd=@coreutils@/bin/pwd
+
+storeExpr=$(@nix@/bin/nix-store -qR $(@nix@/bin/nix-store -r $(echo '(import ./kernel.nix).everything' | @nix@/bin/nix-instantiate -)))
+
+kernel=$(@nix@/bin/nix-store -r $(echo '(import ./kernel.nix).kernel' | @nix@/bin/nix-instantiate -))
+
+ov511=$(@nix@/bin/nix-store -r $(echo '(import ./kernel.nix).ov511' | @nix@/bin/nix-instantiate -))
+
+#echo making kernel stuff
+
+kernelVersion=$(cd $kernel/lib/modules/; @coreutils@/bin/ls -d *)
+@coreutils@/bin/mkdir -p $archivesDir/lib/modules/$kernelVersion
+
+#echo $kernelVersion
+
+cd $kernel
+
+# make directories
+
+@findutils@/bin/find . -not -path "./lib/modules/$kernelVersion/build*" -type d | @findutils@/bin/xargs -n 1 -i% @coreutils@/bin/mkdir -p $archivesDir/%
+
+# link all files
+@findutils@/bin/find . -not -path "./lib/modules/$kernelVersion/build*" -type f | @findutils@/bin/xargs -n 1 -i% @coreutils@/bin/ln -s $kernel/% $archivesDir/%
+
+# make directories
+
+cd $ov511
+@findutils@/bin/find . -not -path "./lib/modules/$kernelVersion/build*" -type d | @findutils@/bin/xargs -n 1 -i% @coreutils@/bin/mkdir -p $archivesDir/%
+
+# link all files
+@findutils@/bin/find . -not -path "./lib/modules/$kernelVersion/build*" -type f | @findutils@/bin/xargs -n 1 -i% @coreutils@/bin/ln -s $ov511/% $archivesDir/%
-- 
GitLab


From 6bad2b0809060748b8608024fce5779dd200b86f Mon Sep 17 00:00:00 2001
From: Armijn Hemel <armijn@gpl-violations.org>
Date: Fri, 20 Jan 2006 13:47:01 +0000
Subject: [PATCH 0127/5331] do stuff with utmp and wtmp, so tools like "w" work

svn path=/nixu/trunk/; revision=4581
---
 boot/boot.sh | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/boot/boot.sh b/boot/boot.sh
index 5f04abe0134..5183d045613 100644
--- a/boot/boot.sh
+++ b/boot/boot.sh
@@ -27,6 +27,10 @@ echo "starting udev..."
 echo "setting up hostname..."
 hostname nixos
 
+echo "cleaning utmp and wtmp..."
+echo "" > /var/run/utmp
+echo "" > /var/log/wtmp
+
 echo "enabling loopback interface..."
 ifconfig lo 127.0.0.1
 
-- 
GitLab


From ff05d84a100f3488381dde187e9892061017d709 Mon Sep 17 00:00:00 2001
From: Armijn Hemel <armijn@gpl-violations.org>
Date: Thu, 26 Jan 2006 10:25:06 +0000
Subject: [PATCH 0128/5331] we also want /dev/input to be available (fixme,
 can't this one be created by udev instead?)

svn path=/nixu/trunk/; revision=4593
---
 fill-disk.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/fill-disk.sh b/fill-disk.sh
index b8acc73ad19..f009a68bcb2 100755
--- a/fill-disk.sh
+++ b/fill-disk.sh
@@ -146,6 +146,7 @@ make_dir 00755 /bin
 make_dir 00755 /boot
 make_dir 00755 /dev
 make_dir 00755 /dev/pts
+make_dir 00755 /dev/input
 make_dir 00755 /etc # global non-constant configuration
 make_dir 00755 /etc/ssh
 make_dir 00755 /etc/sysconfig
-- 
GitLab


From caf9b6bfba3d033e2298e45f56c390a4c695cba7 Mon Sep 17 00:00:00 2001
From: Armijn Hemel <armijn@gpl-violations.org>
Date: Thu, 26 Jan 2006 19:48:51 +0000
Subject: [PATCH 0129/5331] start of good HOWTO for using X in NixOS

svn path=/nixu/trunk/; revision=4602
---
 X-howto | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)
 create mode 100644 X-howto

diff --git a/X-howto b/X-howto
new file mode 100644
index 00000000000..6cf4bd36763
--- /dev/null
+++ b/X-howto
@@ -0,0 +1,16 @@
+Making X work in NixOS (fixing guide)
+
+  Mouse
+
+* for mouse support /dev/input/mice needs to be there. This device can be
+created either automatically with udev, or manually with mknod.
+
+  Fonts
+
+Right now fonts have to be copied from another machine and put into
+/usr/X11R6/lib/X11/fonts
+
+  Config
+
+in services/trunk/configurations/tyros.cs.uu.nl-xorg/ there is a Nix expression
+which builds a working X configuration for use in VMware.
-- 
GitLab


From 78767321ce6004fe0adfec33f0b40a5e2b113f08 Mon Sep 17 00:00:00 2001
From: Armijn Hemel <armijn@gpl-violations.org>
Date: Tue, 31 Jan 2006 11:01:28 +0000
Subject: [PATCH 0130/5331] add something so we modprobe some stuff for at
 least one family of USB controllers (uhci-hcd). This is of course not very
 elegant: even if a machine does not have USB, or another USB controller this
 module will loaded. A better way would be to let some hardware probing
 program run first, but that is "future work"

svn path=/nixu/trunk/; revision=4631
---
 boot/boot.sh | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/boot/boot.sh b/boot/boot.sh
index 5183d045613..c964e410c41 100644
--- a/boot/boot.sh
+++ b/boot/boot.sh
@@ -31,6 +31,9 @@ echo "cleaning utmp and wtmp..."
 echo "" > /var/run/utmp
 echo "" > /var/log/wtmp
 
+echo "loading USB controller modules..."
+@module_init_tools@/sbin/modprobe uhci-hcd
+
 echo "enabling loopback interface..."
 ifconfig lo 127.0.0.1
 
-- 
GitLab


From 89df039e35a36282687e903b76e5345163f9957f Mon Sep 17 00:00:00 2001
From: Armijn Hemel <armijn@gpl-violations.org>
Date: Wed, 1 Feb 2006 13:31:52 +0000
Subject: [PATCH 0131/5331] * store the value of hotplug in
 /etc/sysconfig/hotplug and cat this value to /proc/sys/kernel/hotplug during
 boot. (FIXME, install hotplug during install of NixOS) * /dev/input is
 created by udev

svn path=/nixu/trunk/; revision=4660
---
 boot/boot.sh                    |  3 +++
 fill-disk.sh                    | 13 ++++++++++--
 kernelscripts/kernel.nix        |  6 ------
 kernelscripts/make-kernel.sh.in | 36 ---------------------------------
 4 files changed, 14 insertions(+), 44 deletions(-)
 delete mode 100644 kernelscripts/kernel.nix
 delete mode 100755 kernelscripts/make-kernel.sh.in

diff --git a/boot/boot.sh b/boot/boot.sh
index c964e410c41..8ed197ca287 100644
--- a/boot/boot.sh
+++ b/boot/boot.sh
@@ -31,6 +31,9 @@ echo "cleaning utmp and wtmp..."
 echo "" > /var/run/utmp
 echo "" > /var/log/wtmp
 
+echo "setting hotplug..."
+cat /etc/sysconfig/hotplug > /proc/sys/kernel/hotplug
+
 echo "loading USB controller modules..."
 @module_init_tools@/sbin/modprobe uhci-hcd
 
diff --git a/fill-disk.sh b/fill-disk.sh
index f009a68bcb2..18beb23d318 100755
--- a/fill-disk.sh
+++ b/fill-disk.sh
@@ -146,7 +146,6 @@ make_dir 00755 /bin
 make_dir 00755 /boot
 make_dir 00755 /dev
 make_dir 00755 /dev/pts
-make_dir 00755 /dev/input
 make_dir 00755 /etc # global non-constant configuration
 make_dir 00755 /etc/ssh
 make_dir 00755 /etc/sysconfig
@@ -359,15 +358,25 @@ cp @kernel@/lib/modules/$version/modules.* $root/lib/modules/$version
 chmod 644 $root/lib/modules/$version/modules.*
 
 ###
-### Do funky stuff with grub here.
+### hotplug
 ###
 
+echo "@hotplug@/sbin/hotplug" > $root/etc/sysconfig/hotplug
 ln -s @hotplug@/sbin/hotplug $root/sbin/hotplug
 ln -s @hotplug@/etc/hotplug $root/etc/hotplug
 ln -s @hotplug@/etc/hotplug.d $root/etc/hotplug.d
+
+###
+### init
+###
+
 ln -s $device $root/dev/root
 ln -s @sysvinitPath@/sbin/init /sbin/init
 
+###
+### Do funky stuff with grub here.
+###
+
 echo installing bootloader
 
 grub-install --root-directory=${root} --no-floppy ${targetdrive}
diff --git a/kernelscripts/kernel.nix b/kernelscripts/kernel.nix
deleted file mode 100644
index 3a799a5ea4d..00000000000
--- a/kernelscripts/kernel.nix
+++ /dev/null
@@ -1,6 +0,0 @@
-rec {
-  inherit (import /nixpkgs/trunk/pkgs/system/i686-linux.nix)
-    stdenv kernel ov511;
-
-  everything = [kernel ov511];
-}
diff --git a/kernelscripts/make-kernel.sh.in b/kernelscripts/make-kernel.sh.in
deleted file mode 100755
index 681587f62dd..00000000000
--- a/kernelscripts/make-kernel.sh.in
+++ /dev/null
@@ -1,36 +0,0 @@
-#! /bin/sh -e
-
-#archivesDir=$(@mktemp@/bin/mktemp -d)
-archivesDir=/
-
-cpwd=@coreutils@/bin/pwd
-
-storeExpr=$(@nix@/bin/nix-store -qR $(@nix@/bin/nix-store -r $(echo '(import ./kernel.nix).everything' | @nix@/bin/nix-instantiate -)))
-
-kernel=$(@nix@/bin/nix-store -r $(echo '(import ./kernel.nix).kernel' | @nix@/bin/nix-instantiate -))
-
-ov511=$(@nix@/bin/nix-store -r $(echo '(import ./kernel.nix).ov511' | @nix@/bin/nix-instantiate -))
-
-#echo making kernel stuff
-
-kernelVersion=$(cd $kernel/lib/modules/; @coreutils@/bin/ls -d *)
-@coreutils@/bin/mkdir -p $archivesDir/lib/modules/$kernelVersion
-
-#echo $kernelVersion
-
-cd $kernel
-
-# make directories
-
-@findutils@/bin/find . -not -path "./lib/modules/$kernelVersion/build*" -type d | @findutils@/bin/xargs -n 1 -i% @coreutils@/bin/mkdir -p $archivesDir/%
-
-# link all files
-@findutils@/bin/find . -not -path "./lib/modules/$kernelVersion/build*" -type f | @findutils@/bin/xargs -n 1 -i% @coreutils@/bin/ln -s $kernel/% $archivesDir/%
-
-# make directories
-
-cd $ov511
-@findutils@/bin/find . -not -path "./lib/modules/$kernelVersion/build*" -type d | @findutils@/bin/xargs -n 1 -i% @coreutils@/bin/mkdir -p $archivesDir/%
-
-# link all files
-@findutils@/bin/find . -not -path "./lib/modules/$kernelVersion/build*" -type f | @findutils@/bin/xargs -n 1 -i% @coreutils@/bin/ln -s $ov511/% $archivesDir/%
-- 
GitLab


From a05f476c39c452ff9e945a6f1f818267d0d4f6c6 Mon Sep 17 00:00:00 2001
From: Armijn Hemel <armijn@gpl-violations.org>
Date: Wed, 8 Mar 2006 19:14:12 +0000
Subject: [PATCH 0132/5331] add a doc directory, with some documentation in it

svn path=/nixu/trunk/; revision=5006
---
 doc/configuration.txt | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)
 create mode 100644 doc/configuration.txt

diff --git a/doc/configuration.txt b/doc/configuration.txt
new file mode 100644
index 00000000000..2275c6e4281
--- /dev/null
+++ b/doc/configuration.txt
@@ -0,0 +1,25 @@
+Configuration in NixOS
+
+Configuration in NixOS is not very straightforward. On other Linux
+distribution site-specific information (password files, host files, and
+so on) are stored with information that is rather generic for a lot of
+operating systems. To be able to handle these in a gentle way I have decided
+to seperate these two a bit more in NixOS.
+
+In particular, in the /etc directory there is a Nix profile called "configs".
+In this profile the generic configuration is kept. In time this can grow
+to keep configuration which is site specific, but which can easily be kept
+in the store, such as "profile" (default system wide Bourne shell profile)
+
+Right now two packages should be in this profile:
+
+* etcServices : installs a file called "services" (/etc/services should
+point to this)
+* etcProtocols : installs a file called "protocols" (/etc/protocols should
+point to this)
+
+During install time these packages should be installed and the right symlinks
+should be made.
+
+When NIX-40 is closed, we might consider making /etc itself a profile and
+keep even more configuration information inside the Nix store.
-- 
GitLab


From af9eb8537e29605d6fafb6d939b8e4c2e4b70a10 Mon Sep 17 00:00:00 2001
From: Armijn Hemel <armijn@gpl-violations.org>
Date: Wed, 8 Mar 2006 19:15:14 +0000
Subject: [PATCH 0133/5331] move the existing documentation to the docs
 directory

svn path=/nixu/trunk/; revision=5007
---
 X-howto => doc/X-howto | 0
 howto => doc/howto     | 0
 2 files changed, 0 insertions(+), 0 deletions(-)
 rename X-howto => doc/X-howto (100%)
 rename howto => doc/howto (100%)

diff --git a/X-howto b/doc/X-howto
similarity index 100%
rename from X-howto
rename to doc/X-howto
diff --git a/howto b/doc/howto
similarity index 100%
rename from howto
rename to doc/howto
-- 
GitLab


From d8550e9d105017650e47528cc7257b7fee46cb19 Mon Sep 17 00:00:00 2001
From: Armijn Hemel <armijn@gpl-violations.org>
Date: Tue, 25 Apr 2006 23:52:31 +0000
Subject: [PATCH 0134/5331] remove all reference to the "hotplug" package,
 since it is obsolete.

TODO: update udev

svn path=/nixu/trunk/; revision=5222
---
 boot/boot.sh     |  3 ---
 boot/default.nix |  2 +-
 fill-disk.sh     | 10 ----------
 init/default.nix |  2 +-
 make-disk.sh     |  6 ------
 pkgs.nix         |  8 ++++----
 6 files changed, 6 insertions(+), 25 deletions(-)

diff --git a/boot/boot.sh b/boot/boot.sh
index 8ed197ca287..c964e410c41 100644
--- a/boot/boot.sh
+++ b/boot/boot.sh
@@ -31,9 +31,6 @@ echo "cleaning utmp and wtmp..."
 echo "" > /var/run/utmp
 echo "" > /var/log/wtmp
 
-echo "setting hotplug..."
-cat /etc/sysconfig/hotplug > /proc/sys/kernel/hotplug
-
 echo "loading USB controller modules..."
 @module_init_tools@/sbin/modprobe uhci-hcd
 
diff --git a/boot/default.nix b/boot/default.nix
index 588f3d58273..e6e31ca161b 100644
--- a/boot/default.nix
+++ b/boot/default.nix
@@ -1,7 +1,7 @@
 { stdenv, bash, bashStatic, coreutils, findutilsWrapper, utillinux, utillinuxStatic, sysvinit, e2fsprogs
 , nettools, nix, subversion, gcc, wget, which, vim, less, screen, openssh
 , binutils, strace, shadowutils, iputils, gnumake, curl, gnused, gnugrep
-, gnutar, gzip, mingettyWrapper, grubWrapper, parted, module_init_tools, hotplug
+, gnutar, gzip, mingettyWrapper, grubWrapper, parted, module_init_tools
 , udev, dhcpWrapper, man, nano}:
 
 derivation {
diff --git a/fill-disk.sh b/fill-disk.sh
index 18beb23d318..391a5b3dba0 100755
--- a/fill-disk.sh
+++ b/fill-disk.sh
@@ -15,7 +15,6 @@ storePaths=/mystorepaths
 sysvinitPath=@sysvinitPath@
 bootPath=@bootPath@
 modutils=@modutils@
-hotplug=@hotplug@
 mingetty=@mingetty@
 
 echo mounting special filesystems
@@ -357,15 +356,6 @@ ln -s @kernel@/lib/modules/$version/kernel $root/lib/modules/$version/kernel
 cp @kernel@/lib/modules/$version/modules.* $root/lib/modules/$version
 chmod 644 $root/lib/modules/$version/modules.*
 
-###
-### hotplug
-###
-
-echo "@hotplug@/sbin/hotplug" > $root/etc/sysconfig/hotplug
-ln -s @hotplug@/sbin/hotplug $root/sbin/hotplug
-ln -s @hotplug@/etc/hotplug $root/etc/hotplug
-ln -s @hotplug@/etc/hotplug.d $root/etc/hotplug.d
-
 ###
 ### init
 ###
diff --git a/init/default.nix b/init/default.nix
index c81e75513cd..f1b10b5bc8f 100644
--- a/init/default.nix
+++ b/init/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, bash, coreutils, utillinux, e2fsprogs, nix, shadowutils, mingetty, grubWrapper, parted, module_init_tools, hotplug, dhcpWrapper}:
+{ stdenv, bash, coreutils, utillinux, e2fsprogs, nix, shadowutils, mingetty, grubWrapper, parted, module_init_tools, dhcpWrapper}:
 
 derivation {
   name = "init";
diff --git a/make-disk.sh b/make-disk.sh
index f226e216a30..d2af5273ab2 100755
--- a/make-disk.sh
+++ b/make-disk.sh
@@ -74,7 +74,6 @@ e2fsprogs=$($NIX_CMD_PATH/nix-store -q $(echo '(import ./pkgs.nix).e2fsprogsDiet
 modutils=$($NIX_CMD_PATH/nix-store -q $(echo '(import ./pkgs.nix).module_init_toolsStatic' | $NIX_CMD_PATH/nix-instantiate -))
 grub=$($NIX_CMD_PATH/nix-store -r $(echo '(import ./pkgs.nix).grubWrapper' | $NIX_CMD_PATH/nix-instantiate -))
 mingettyWrapper=$($NIX_CMD_PATH/nix-store -r $(echo '(import ./pkgs.nix).mingettyWrapper' | $NIX_CMD_PATH/nix-instantiate -))
-hotplug=$($NIX_CMD_PATH/nix-store -r $(echo '(import ./pkgs.nix).hotplug' | $NIX_CMD_PATH/nix-instantiate -))
 udev=$($NIX_CMD_PATH/nix-store -r $(echo '(import ./pkgs.nix).udev' | $NIX_CMD_PATH/nix-instantiate -))
 dhcp=$($NIX_CMD_PATH/nix-store -r $(echo '(import ./pkgs.nix).dhcpWrapper' | $NIX_CMD_PATH/nix-instantiate -))
 nano=$($NIX_CMD_PATH/nix-store -r $(echo '(import ./pkgs.nix).nano' | $NIX_CMD_PATH/nix-instantiate -))
@@ -136,7 +135,6 @@ cp -fa ${nixpkgs} ${archivesDir}
 #cp -fvau --parents ${Kernel} ${archivesDir}
 #cp -fvau --parents ${SysVinit} ${archivesDir}
 #cp -fvau --parents ${BootPath} ${archivesDir}
-#cp -fvau --parents ${hotplug} ${archivesDir}
 #cp -fvau --parents ${udev} ${archivesDir}
 #cp -fvau --parents ${dhcp} ${archivesDir}
 #cp -fvau --parents ${nano} ${archivesDir}
@@ -164,7 +162,6 @@ sed -e "s^@sysvinitPath\@^$sysvinitPath^g" \
     -e "s^@modutils\@^$modutils^g" \
     -e "s^@grub\@^$grub^g" \
     -e "s^@kernel\@^$kernel^g" \
-    -e "s^@hotplug\@^$hotplug^g" \
     -e "s^@gnugrep\@^$gnugrep^g" \
     -e "s^@which\@^$which^g" \
     -e "s^@kudzu\@^$kudzu^g" \
@@ -186,7 +183,6 @@ sed -e "s^@sysvinitPath\@^$sysvinitPath^g" \
     -e "s^@modutils\@^$modutils^g" \
     -e "s^@grub\@^$grub^g" \
     -e "s^@kernel\@^$kernel^g" \
-    -e "s^@hotplug\@^$hotplug^g" \
     -e "s^@gnugrep\@^$gnugrep^g" \
     -e "s^@which\@^$which^g" \
     -e "s^@gnutar\@^$gnutar^g" \
@@ -226,7 +222,6 @@ chmod u+x ${initdir}/ramdisk-login.sh
 #cp -fau --parents ${utilLinux} ${initdir}
 #cp -fau --parents ${coreUtilsDiet} ${initdir}
 #cp -fau --parents ${modUtils} ${initdir}
-#cp -fau --parents ${hotplug} ${initdir}
 cp -fau --parents ${bash}/bin ${initdir}
 cp -fau --parents ${utilLinux}/bin ${initdir}
 chmod -R u+w ${initdir}
@@ -237,7 +232,6 @@ cp -fau --parents ${modutils}/bin ${initdir}
 chmod -R u+w ${initdir}
 echo modutils
 cp -fau --parents ${modutils}/sbin ${initdir}
-#cp -fau --parents ${hotplug} ${initdir}
 #cp -fau --parents ${kudzu} ${initdir}
 
 touch ${archivesDir}/NIXOS
diff --git a/pkgs.nix b/pkgs.nix
index d156cddbab8..90d5e5646b3 100644
--- a/pkgs.nix
+++ b/pkgs.nix
@@ -1,20 +1,20 @@
 rec {
-  inherit (import /nixpkgs/trunk/pkgs/system/i686-linux.nix)
+  inherit (import /nixpkgs/trunk/pkgs/top-level/all-packages.nix {})
     stdenv kernel bash bashStatic coreutils coreutilsDiet findutilsWrapper utillinux utillinuxStatic sysvinit
    e2fsprogsDiet e2fsprogs
     nettools nix subversion gcc wget which vim less screen openssh binutils
     strace shadowutils iputils gnumake curl gnused gnutar gnugrep gzip
-    mingettyWrapper grubWrapper syslinux parted module_init_tools module_init_toolsStatic hotplug udev
+    mingettyWrapper grubWrapper syslinux parted module_init_tools module_init_toolsStatic udev
     dhcpWrapper man nano eject sysklogd kudzu xawtv;
 
   boot = (import ./boot) {inherit stdenv bash bashStatic coreutils findutilsWrapper
     utillinux utillinuxStatic sysvinit e2fsprogs nettools nix subversion gcc wget which vim
     less screen openssh binutils strace shadowutils iputils gnumake curl
     gnused gnutar gnugrep gzip mingettyWrapper grubWrapper parted module_init_tools
-    hotplug udev dhcpWrapper man nano;};
+    udev dhcpWrapper man nano;};
 
   init = (import ./init) {inherit stdenv bash bashStatic coreutilsDiet utillinux e2fsprogsDiet
-    nix shadowutils mingettyWrapper grubWrapper parted module_init_tools hotplug
+    nix shadowutils mingettyWrapper grubWrapper parted module_init_tools
     dhcpWrapper man nano eject;};
 
   everything = [boot sysvinit sysklogd kernel xawtv];
-- 
GitLab


From 2a304add0b593b1b93cca3cc913812924d57affe Mon Sep 17 00:00:00 2001
From: Armijn Hemel <armijn@gpl-violations.org>
Date: Fri, 28 Apr 2006 12:45:32 +0000
Subject: [PATCH 0135/5331] rewrite to new Nixpkgs and new Nix version

svn path=/nixu/trunk/; revision=5233
---
 fill-disk.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/fill-disk.sh b/fill-disk.sh
index 391a5b3dba0..e59a0260f34 100755
--- a/fill-disk.sh
+++ b/fill-disk.sh
@@ -287,8 +287,8 @@ tar cf - /nix/store | tar --directory=$root -xvf -
 echo registering valid paths...
 
 $NIX_CMD_PATH/nix-store --register-validity < $root/tmp/mystorepaths
-$NIX_CMD_PATH/nix-env -iKf /nixpkgs/trunk/pkgs/system/i686-linux.nix nix
-$NIX_CMD_PATH/nix-env -iKf /nixpkgs/trunk/pkgs/system/i686-linux.nix coreutils
+$NIX_CMD_PATH/nix-env -iKf /nixpkgs/trunk/pkgs/top-level/all-packages.nix nix
+$NIX_CMD_PATH/nix-env -iKf /nixpkgs/trunk/pkgs/top-level/all-packages.nix coreutils
 
 echo setting init symlink...
 rm -f $root/init
-- 
GitLab


From 02cf649af649119030b57732695d1273fac79ea4 Mon Sep 17 00:00:00 2001
From: Armijn Hemel <armijn@gpl-violations.org>
Date: Sat, 24 Jun 2006 22:14:43 +0000
Subject: [PATCH 0136/5331] small cleanups, also move to newer Nix

svn path=/nixu/trunk/; revision=5524
---
 fill-disk.sh | 26 +++++++--------
 make-disk.sh | 94 +++++++++++++++++++++++++++-------------------------
 pkgs.nix     | 12 ++++---
 3 files changed, 69 insertions(+), 63 deletions(-)

diff --git a/fill-disk.sh b/fill-disk.sh
index e59a0260f34..d39bbfb72c3 100755
--- a/fill-disk.sh
+++ b/fill-disk.sh
@@ -237,7 +237,7 @@ export NIX_DATA_DIR=$root/nix/share
 export NIX_LOG_DIR=$root/nix/log/nix
 export NIX_STATE_DIR=$root/nix/var/nix
 export NIX_CONF_DIR=$root/nix/etc
-NIX_CMD_PATH=@nix@/bin
+NIX=@nix@/bin
 
 #echo bringing up networking...
 
@@ -246,10 +246,10 @@ NIX_CMD_PATH=@nix@/bin
 #echo "NIC: $nic"
 
 echo initialising Nix DB...
-$NIX_CMD_PATH/nix-store --init
+$NIX/nix-store --init
 
 echo verifying Nix DB...
-$NIX_CMD_PATH/nix-store --verify
+$NIX/nix-store --verify
 
 echo copying nixpkgs...
 #cp -fLa /cdrom/pkgs $root/nixpkgs/trunk
@@ -259,7 +259,7 @@ make_dir 0755 /tmp/scripts
 cp -fa /cdrom/scripts $root/tmp
 
 #echo adding manifest
-#$NIX_CMD_PATH/nix-pull $manifest
+#$NIX/nix-pull $manifest
 
 echo adding packages
 
@@ -269,15 +269,15 @@ unset NIX_LOG_DIR
 unset NIX_STATE_DIR
 unset NIX_CONF_DIR
 
-storeExpr=$(echo '(import /tmp/scripts/pkgs.nix).kernel' | $NIX_CMD_PATH/nix-instantiate -v -v -)
-#storeExpr=$(echo '(import /tmp/scripts/pkgs.nix).everything' | $NIX_CMD_PATH/nix-instantiate -v -v -)
-#storeExpr=$(echo '(import ./pkgs.nix).everything' | $NIX_CMD_PATH/nix-instantiate -v -v -)
-#$NIX_CMD_PATH/nix-store -r $storeExpr
+storeExpr=$(echo '(import /tmp/scripts/pkgs.nix).kernel' | $NIX/nix-instantiate -v -v -)
+#storeExpr=$(echo '(import /tmp/scripts/pkgs.nix).everything' | $NIX/nix-instantiate -v -v -)
+#storeExpr=$(echo '(import ./pkgs.nix).everything' | $NIX/nix-instantiate -v -v -)
+#$NIX/nix-store -r $storeExpr
 echo $storeExpr > $root/tmp/storeExpr
 cp /cdrom/mystorepaths $root/tmp
-#storeExpr2=$($NIX_CMD_PATH/nix-store -qR $($NIX_CMD_PATH/nix-store -r $storeExpr))
+#storeExpr2=$($NIX/nix-store -qR $($NIX/nix-store -r $storeExpr))
 #echo storeExpr $storeExpr
-#echo $($NIX_CMD_PATH/nix-store -qR --include-outputs $storeExpr)
+#echo $($NIX/nix-store -qR --include-outputs $storeExpr)
 
 echo copying store
 
@@ -286,9 +286,9 @@ tar cf - /nix/store | tar --directory=$root -xvf -
 
 echo registering valid paths...
 
-$NIX_CMD_PATH/nix-store --register-validity < $root/tmp/mystorepaths
-$NIX_CMD_PATH/nix-env -iKf /nixpkgs/trunk/pkgs/top-level/all-packages.nix nix
-$NIX_CMD_PATH/nix-env -iKf /nixpkgs/trunk/pkgs/top-level/all-packages.nix coreutils
+$NIX/nix-store --register-validity < $root/tmp/mystorepaths
+$NIX/nix-env -iKf /nixpkgs/trunk/pkgs/top-level/all-packages.nix nix
+$NIX/nix-env -iKf /nixpkgs/trunk/pkgs/top-level/all-packages.nix coreutils
 
 echo setting init symlink...
 rm -f $root/init
diff --git a/make-disk.sh b/make-disk.sh
index d2af5273ab2..52a09680e06 100755
--- a/make-disk.sh
+++ b/make-disk.sh
@@ -15,34 +15,35 @@ initrd=/tmp/initram.img
 initdir=${archivesDir}/initdir
 initscript=$archivesDir/scripts/init.sh
 
-NIX_CMD_PATH=$(dirname $(which nix-store))
+# determine where we can find the Nix binaries
+NIX=$(dirname $(which nix-store))
 
-storeExpr=$($NIX_CMD_PATH/nix-store -qR $($NIX_CMD_PATH/nix-store -r $(echo '(import ./pkgs.nix).everything' | $NIX_CMD_PATH/nix-instantiate -)))
-#$NIX_CMD_PATH/nix-push --copy $archivesDir $manifest $(nix-store -r $storeExpr) $(nix-store -r $(echo '(import ./pkgs.nix).kernel' | $NIX_CMD_PATH/nix-instantiate -))
+storeExpr=$($NIX/nix-store -qR $($NIX/nix-store -r $(echo '(import ./pkgs.nix).everything' | $NIX/nix-instantiate -)))
+#$NIX/nix-push --copy $archivesDir $manifest $($NIX/nix-store -r $storeExpr) $($NIX/nix-store -r $(echo '(import ./pkgs.nix).kernel' | $NIX/nix-instantiate -))
 
 # Location of sysvinit?
-sysvinitPath=$($NIX_CMD_PATH/nix-store -r $(echo '(import ./pkgs.nix).sysvinit' | $NIX_CMD_PATH/nix-instantiate -))
+sysvinitPath=$($NIX/nix-store -r $(echo '(import ./pkgs.nix).sysvinit' | $NIX/nix-instantiate -))
 
 # Location of Nix boot scripts?
-bootPath=$($NIX_CMD_PATH/nix-store -r $(echo '(import ./pkgs.nix).boot' | $NIX_CMD_PATH/nix-instantiate -))
+bootPath=$($NIX/nix-store -r $(echo '(import ./pkgs.nix).boot' | $NIX/nix-instantiate -))
 
-nix=$($NIX_CMD_PATH/nix-store -q $(echo '(import ./pkgs.nix).nix' | $NIX_CMD_PATH/nix-instantiate -))
+nix=$($NIX/nix-store -q $(echo '(import ./pkgs.nix).nixUnstable' | $NIX/nix-instantiate -))
 
-syslinux=$($NIX_CMD_PATH/nix-store -r $(echo '(import ./pkgs.nix).syslinux' | $NIX_CMD_PATH/nix-instantiate -))
+syslinux=$($NIX/nix-store -r $(echo '(import ./pkgs.nix).syslinux' | $NIX/nix-instantiate -))
 
-kernel=$($NIX_CMD_PATH/nix-store -r $(echo '(import ./pkgs.nix).kernel' | $NIX_CMD_PATH/nix-instantiate -))
+kernel=$($NIX/nix-store -r $(echo '(import ./pkgs.nix).kernel' | $NIX/nix-instantiate -))
 
-#nixDeps=$($NIX_CMD_PATH/nix-store -qR $(echo '(import ./pkgs.nix).nix' | $NIX_CMD_PATH/nix-instantiate -))
+#nixDeps=$($NIX/nix-store -qR $(echo '(import ./pkgs.nix).nix' | $NIX/nix-instantiate -))
 
-#nixDeps=$($NIX_CMD_PATH/nix-store -qR $(nix-store -r $(echo '(import ./pkgs.nix).nix' | $NIX_CMD_PATH/nix-instantiate -)))
-#echo $($NIX_CMD_PATH/nix-store -qR $(nix-store -r $(echo '(import ./pkgs.nix).nix' | $NIX_CMD_PATH/nix-instantiate -))) >> $storePaths
-#$NIX_CMD_PATH/nix-store -qR $(nix-store -r $(echo '(import ./pkgs.nix).nix' | $NIX_CMD_PATH/nix-instantiate -)) >> $storePaths
+#nixDeps=$($NIX/nix-store -qR $(nix-store -r $(echo '(import ./pkgs.nix).nix' | $NIX/nix-instantiate -)))
+#echo $($NIX/nix-store -qR $(nix-store -r $(echo '(import ./pkgs.nix).nix' | $NIX/nix-instantiate -))) >> $storePaths
+#$NIX/nix-store -qR $(nix-store -r $(echo '(import ./pkgs.nix).nix' | $NIX/nix-instantiate -)) >> $storePaths
 
 for i in $storeExpr
 do
   echo $i >> $storePaths
   echo '' >> $storePaths
-  deps=$($NIX_CMD_PATH/nix-store -q --references $i)
+  deps=$($NIX/nix-store -q --references $i)
   pkgs=$(echo $deps | wc -w)
   echo $pkgs >> $storePaths
   for j in $deps
@@ -53,36 +54,39 @@ do
   tar -cf - $i | tar --directory=$archivesDir -xf -
 done
 
-utilLinux=$(nix-store -r $(echo '(import ./pkgs.nix).utillinuxStatic' | $NIX_CMD_PATH/nix-instantiate -))
-coreUtilsDiet=$($NIX_CMD_PATH/nix-store -qR $(nix-store -r $(echo '(import ./pkgs.nix).coreutilsDiet' | $NIX_CMD_PATH/nix-instantiate -)))
-e2fsProgs=$($NIX_CMD_PATH/nix-store -qR $(nix-store -r $(echo '(import ./pkgs.nix).e2fsprogsDiet' | $NIX_CMD_PATH/nix-instantiate -)))
-modUtils=$($NIX_CMD_PATH/nix-store -qR $(nix-store -r $(echo '(import ./pkgs.nix).module_init_toolsStatic' | $NIX_CMD_PATH/nix-instantiate -)))
-Grub=$($NIX_CMD_PATH/nix-store -qR $(nix-store -r $(echo '(import ./pkgs.nix).grubWrapper' | $NIX_CMD_PATH/nix-instantiate -)))
-#gnuSed=$($NIX_CMD_PATH/nix-store -qR $(nix-store -r $(echo '(import ./pkgs.nix).gnused' | $NIX_CMD_PATH/nix-instantiate -)))
-#gnuGrep=$($NIX_CMD_PATH/nix-store -qR $(nix-store -r $(echo '(import ./pkgs.nix).gnugrep' | $NIX_CMD_PATH/nix-instantiate -)))
-Kernel=$($NIX_CMD_PATH/nix-store -qR $(nix-store -r $(echo '(import ./pkgs.nix).kernel' | $NIX_CMD_PATH/nix-instantiate -)))
-SysVinit=$($NIX_CMD_PATH/nix-store -qR $(nix-store -r $(echo '(import ./pkgs.nix).sysvinit' | $NIX_CMD_PATH/nix-instantiate -)))
-BootPath=$($NIX_CMD_PATH/nix-store -qR $(nix-store -r $(echo '(import ./pkgs.nix).boot' | $NIX_CMD_PATH/nix-instantiate -)))
-
-bashGlibc=$($NIX_CMD_PATH/nix-store -q $(echo '(import ./pkgs.nix).bash' | $NIX_CMD_PATH/nix-instantiate -))
-bash=$($NIX_CMD_PATH/nix-store -q $(echo '(import ./pkgs.nix).bashStatic' | $NIX_CMD_PATH/nix-instantiate -))
-coreutilsdiet=$($NIX_CMD_PATH/nix-store -q $(echo '(import ./pkgs.nix).coreutilsDiet' | $NIX_CMD_PATH/nix-instantiate -))
-coreutils=$($NIX_CMD_PATH/nix-store -q $(echo '(import ./pkgs.nix).coreutils' | $NIX_CMD_PATH/nix-instantiate -))
-findutils=$($NIX_CMD_PATH/nix-store -q $(echo '(import ./pkgs.nix).findutilsWrapper' | $NIX_CMD_PATH/nix-instantiate -))
-utillinux=$($NIX_CMD_PATH/nix-store -q $(echo '(import ./pkgs.nix).utillinux' | $NIX_CMD_PATH/nix-instantiate -))
-e2fsprogs=$($NIX_CMD_PATH/nix-store -q $(echo '(import ./pkgs.nix).e2fsprogsDiet' | $NIX_CMD_PATH/nix-instantiate -))
-modutils=$($NIX_CMD_PATH/nix-store -q $(echo '(import ./pkgs.nix).module_init_toolsStatic' | $NIX_CMD_PATH/nix-instantiate -))
-grub=$($NIX_CMD_PATH/nix-store -r $(echo '(import ./pkgs.nix).grubWrapper' | $NIX_CMD_PATH/nix-instantiate -))
-mingettyWrapper=$($NIX_CMD_PATH/nix-store -r $(echo '(import ./pkgs.nix).mingettyWrapper' | $NIX_CMD_PATH/nix-instantiate -))
-udev=$($NIX_CMD_PATH/nix-store -r $(echo '(import ./pkgs.nix).udev' | $NIX_CMD_PATH/nix-instantiate -))
-dhcp=$($NIX_CMD_PATH/nix-store -r $(echo '(import ./pkgs.nix).dhcpWrapper' | $NIX_CMD_PATH/nix-instantiate -))
-nano=$($NIX_CMD_PATH/nix-store -r $(echo '(import ./pkgs.nix).nano' | $NIX_CMD_PATH/nix-instantiate -))
-gnugrep=$($NIX_CMD_PATH/nix-store -r $(echo '(import ./pkgs.nix).gnugrep' | $NIX_CMD_PATH/nix-instantiate -))
-which=$($NIX_CMD_PATH/nix-store -r $(echo '(import ./pkgs.nix).which' | $NIX_CMD_PATH/nix-instantiate -))
-gnutar=$($NIX_CMD_PATH/nix-store -r $(echo '(import ./pkgs.nix).gnutar' | $NIX_CMD_PATH/nix-instantiate -))
-eject=$($NIX_CMD_PATH/nix-store -r $(echo '(import ./pkgs.nix).eject' | $NIX_CMD_PATH/nix-instantiate -))
-sysklogd=$($NIX_CMD_PATH/nix-store -r $(echo '(import ./pkgs.nix).sysklogd' | $NIX_CMD_PATH/nix-instantiate -))
-#kudzu=$($NIX_CMD_PATH/nix-store -r $(echo '(import ./pkgs.nix).kudzu' | $NIX_CMD_PATH/nix-instantiate -))
+utilLinux=$(nix-store -r $(echo '(import ./pkgs.nix).utillinuxStatic' | $NIX/nix-instantiate -))
+coreUtilsDiet=$($NIX/nix-store -qR $(nix-store -r $(echo '(import ./pkgs.nix).coreutilsDiet' | $NIX/nix-instantiate -)))
+
+## temporarily normal e2fsprogs until I can get it to build with dietlibc
+#e2fsProgs=$($NIX/nix-store -qR $(nix-store -r $(echo '(import ./pkgs.nix).e2fsprogsDiet' | $NIX/nix-instantiate -)))
+e2fsProgs=$($NIX/nix-store -qR $(nix-store -r $(echo '(import ./pkgs.nix).e2fsprogs' | $NIX/nix-instantiate -)))
+modUtils=$($NIX/nix-store -qR $(nix-store -r $(echo '(import ./pkgs.nix).module_init_toolsStatic' | $NIX/nix-instantiate -)))
+Grub=$($NIX/nix-store -qR $(nix-store -r $(echo '(import ./pkgs.nix).grubWrapper' | $NIX/nix-instantiate -)))
+#gnuSed=$($NIX/nix-store -qR $(nix-store -r $(echo '(import ./pkgs.nix).gnused' | $NIX/nix-instantiate -)))
+#gnuGrep=$($NIX/nix-store -qR $(nix-store -r $(echo '(import ./pkgs.nix).gnugrep' | $NIX/nix-instantiate -)))
+Kernel=$($NIX/nix-store -qR $(nix-store -r $(echo '(import ./pkgs.nix).kernel' | $NIX/nix-instantiate -)))
+SysVinit=$($NIX/nix-store -qR $(nix-store -r $(echo '(import ./pkgs.nix).sysvinit' | $NIX/nix-instantiate -)))
+BootPath=$($NIX/nix-store -qR $(nix-store -r $(echo '(import ./pkgs.nix).boot' | $NIX/nix-instantiate -)))
+
+bashGlibc=$($NIX/nix-store -q $(echo '(import ./pkgs.nix).bash' | $NIX/nix-instantiate -))
+bash=$($NIX/nix-store -q $(echo '(import ./pkgs.nix).bashStatic' | $NIX/nix-instantiate -))
+coreutilsdiet=$($NIX/nix-store -q $(echo '(import ./pkgs.nix).coreutilsDiet' | $NIX/nix-instantiate -))
+coreutils=$($NIX/nix-store -q $(echo '(import ./pkgs.nix).coreutils' | $NIX/nix-instantiate -))
+findutils=$($NIX/nix-store -q $(echo '(import ./pkgs.nix).findutilsWrapper' | $NIX/nix-instantiate -))
+utillinux=$($NIX/nix-store -q $(echo '(import ./pkgs.nix).utillinux' | $NIX/nix-instantiate -))
+e2fsprogs=$($NIX/nix-store -q $(echo '(import ./pkgs.nix).e2fsprogsDiet' | $NIX/nix-instantiate -))
+modutils=$($NIX/nix-store -q $(echo '(import ./pkgs.nix).module_init_toolsStatic' | $NIX/nix-instantiate -))
+grub=$($NIX/nix-store -r $(echo '(import ./pkgs.nix).grubWrapper' | $NIX/nix-instantiate -))
+mingettyWrapper=$($NIX/nix-store -r $(echo '(import ./pkgs.nix).mingettyWrapper' | $NIX/nix-instantiate -))
+udev=$($NIX/nix-store -r $(echo '(import ./pkgs.nix).udev' | $NIX/nix-instantiate -))
+dhcp=$($NIX/nix-store -r $(echo '(import ./pkgs.nix).dhcpWrapper' | $NIX/nix-instantiate -))
+nano=$($NIX/nix-store -r $(echo '(import ./pkgs.nix).nano' | $NIX/nix-instantiate -))
+gnugrep=$($NIX/nix-store -r $(echo '(import ./pkgs.nix).gnugrep' | $NIX/nix-instantiate -))
+which=$($NIX/nix-store -r $(echo '(import ./pkgs.nix).which' | $NIX/nix-instantiate -))
+gnutar=$($NIX/nix-store -r $(echo '(import ./pkgs.nix).gnutar' | $NIX/nix-instantiate -))
+eject=$($NIX/nix-store -r $(echo '(import ./pkgs.nix).eject' | $NIX/nix-instantiate -))
+sysklogd=$($NIX/nix-store -r $(echo '(import ./pkgs.nix).sysklogd' | $NIX/nix-instantiate -))
+#kudzu=$($NIX/nix-store -r $(echo '(import ./pkgs.nix).kudzu' | $NIX/nix-instantiate -))
 
 #(while read storepath; do
    #cp -fa --parents ${storepath} ${archivesDir}
@@ -92,7 +96,7 @@ sysklogd=$($NIX_CMD_PATH/nix-store -r $(echo '(import ./pkgs.nix).sysklogd' | $N
 
 #for i in $utilLinux; do
 #  echo i $i
-#  deps=( $($NIX_CMD_PATH/nix-store -q --references $i) )
+#  deps=( $($NIX/nix-store -q --references $i) )
 #  echo length ${#deps[@]}
 #  if test "${#deps[@]}" = 0
 #  then
@@ -173,7 +177,7 @@ mv $fill_disk.tmp $fill_disk
 
 sed -e "s^@sysvinitPath\@^$sysvinitPath^g" \
     -e "s^@bootPath\@^$bootPath^g" \
-    -e "s^@NIX_CMD_PATH\@^$nix^g" \
+    -e "s^@NIX\@^$nix^g" \
     -e "s^@bash\@^$bash^g" \
     -e "s^@findutils\@^$findutils^g" \
     -e "s^@coreutilsdiet\@^$coreutilsdiet^g" \
diff --git a/pkgs.nix b/pkgs.nix
index 90d5e5646b3..6ded595d5e1 100644
--- a/pkgs.nix
+++ b/pkgs.nix
@@ -2,20 +2,22 @@ rec {
   inherit (import /nixpkgs/trunk/pkgs/top-level/all-packages.nix {})
     stdenv kernel bash bashStatic coreutils coreutilsDiet findutilsWrapper utillinux utillinuxStatic sysvinit
    e2fsprogsDiet e2fsprogs
-    nettools nix subversion gcc wget which vim less screen openssh binutils
+    nettools nixUnstable subversion gcc wget which vim less screen openssh binutils
     strace shadowutils iputils gnumake curl gnused gnutar gnugrep gzip
     mingettyWrapper grubWrapper syslinux parted module_init_tools module_init_toolsStatic udev
     dhcpWrapper man nano eject sysklogd kudzu xawtv;
 
   boot = (import ./boot) {inherit stdenv bash bashStatic coreutils findutilsWrapper
-    utillinux utillinuxStatic sysvinit e2fsprogs nettools nix subversion gcc wget which vim
+    utillinux utillinuxStatic sysvinit e2fsprogs nettools subversion gcc wget which vim
     less screen openssh binutils strace shadowutils iputils gnumake curl
     gnused gnutar gnugrep gzip mingettyWrapper grubWrapper parted module_init_tools
-    udev dhcpWrapper man nano;};
+    udev dhcpWrapper man nano;
+    nix = nixUnstable;};
 
   init = (import ./init) {inherit stdenv bash bashStatic coreutilsDiet utillinux e2fsprogsDiet
-    nix shadowutils mingettyWrapper grubWrapper parted module_init_tools
-    dhcpWrapper man nano eject;};
+    shadowutils mingettyWrapper grubWrapper parted module_init_tools
+    dhcpWrapper man nano eject;
+    nix = nixUnstable;};
 
   everything = [boot sysvinit sysklogd kernel xawtv];
 }
-- 
GitLab


From 32c8535c4d72a7612822b61ec95c3883189173d6 Mon Sep 17 00:00:00 2001
From: Armijn Hemel <armijn@gpl-violations.org>
Date: Sun, 25 Jun 2006 10:42:17 +0000
Subject: [PATCH 0137/5331] reenable e2fsprogs compiled with dietlibc

svn path=/nixu/trunk/; revision=5528
---
 make-disk.sh | 5 +++--
 pkgs.nix     | 7 ++++---
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/make-disk.sh b/make-disk.sh
index 52a09680e06..fc62a697dea 100755
--- a/make-disk.sh
+++ b/make-disk.sh
@@ -58,8 +58,8 @@ utilLinux=$(nix-store -r $(echo '(import ./pkgs.nix).utillinuxStatic' | $NIX/nix
 coreUtilsDiet=$($NIX/nix-store -qR $(nix-store -r $(echo '(import ./pkgs.nix).coreutilsDiet' | $NIX/nix-instantiate -)))
 
 ## temporarily normal e2fsprogs until I can get it to build with dietlibc
-#e2fsProgs=$($NIX/nix-store -qR $(nix-store -r $(echo '(import ./pkgs.nix).e2fsprogsDiet' | $NIX/nix-instantiate -)))
-e2fsProgs=$($NIX/nix-store -qR $(nix-store -r $(echo '(import ./pkgs.nix).e2fsprogs' | $NIX/nix-instantiate -)))
+e2fsProgs=$($NIX/nix-store -qR $(nix-store -r $(echo '(import ./pkgs.nix).e2fsprogsDiet' | $NIX/nix-instantiate -)))
+#e2fsProgs=$($NIX/nix-store -qR $(nix-store -r $(echo '(import ./pkgs.nix).e2fsprogs' | $NIX/nix-instantiate -)))
 modUtils=$($NIX/nix-store -qR $(nix-store -r $(echo '(import ./pkgs.nix).module_init_toolsStatic' | $NIX/nix-instantiate -)))
 Grub=$($NIX/nix-store -qR $(nix-store -r $(echo '(import ./pkgs.nix).grubWrapper' | $NIX/nix-instantiate -)))
 #gnuSed=$($NIX/nix-store -qR $(nix-store -r $(echo '(import ./pkgs.nix).gnused' | $NIX/nix-instantiate -)))
@@ -75,6 +75,7 @@ coreutils=$($NIX/nix-store -q $(echo '(import ./pkgs.nix).coreutils' | $NIX/nix-
 findutils=$($NIX/nix-store -q $(echo '(import ./pkgs.nix).findutilsWrapper' | $NIX/nix-instantiate -))
 utillinux=$($NIX/nix-store -q $(echo '(import ./pkgs.nix).utillinux' | $NIX/nix-instantiate -))
 e2fsprogs=$($NIX/nix-store -q $(echo '(import ./pkgs.nix).e2fsprogsDiet' | $NIX/nix-instantiate -))
+#e2fsprogs=$($NIX/nix-store -q $(echo '(import ./pkgs.nix).e2fsprogs' | $NIX/nix-instantiate -))
 modutils=$($NIX/nix-store -q $(echo '(import ./pkgs.nix).module_init_toolsStatic' | $NIX/nix-instantiate -))
 grub=$($NIX/nix-store -r $(echo '(import ./pkgs.nix).grubWrapper' | $NIX/nix-instantiate -))
 mingettyWrapper=$($NIX/nix-store -r $(echo '(import ./pkgs.nix).mingettyWrapper' | $NIX/nix-instantiate -))
diff --git a/pkgs.nix b/pkgs.nix
index 6ded595d5e1..f028a8e03d3 100644
--- a/pkgs.nix
+++ b/pkgs.nix
@@ -14,10 +14,11 @@ rec {
     udev dhcpWrapper man nano;
     nix = nixUnstable;};
 
-  init = (import ./init) {inherit stdenv bash bashStatic coreutilsDiet utillinux e2fsprogsDiet
+  init = (import ./init) {inherit stdenv bash bashStatic coreutilsDiet utillinux
     shadowutils mingettyWrapper grubWrapper parted module_init_tools
-    dhcpWrapper man nano eject;
-    nix = nixUnstable;};
+    dhcpWrapper man nano eject e2fsprogsDiet;
+    nix = nixUnstable;
+    };
 
   everything = [boot sysvinit sysklogd kernel xawtv];
 }
-- 
GitLab


From e76efef0d0d4fb53ab2081ec999704775f8e7044 Mon Sep 17 00:00:00 2001
From: Armijn Hemel <armijn@gpl-violations.org>
Date: Sun, 2 Jul 2006 22:37:40 +0000
Subject: [PATCH 0138/5331] make sure we always have mktemp, by building our
 own version first using Nix. This makes it a bit more pure to build the NixOS
 iso. Still room for improvement though...

svn path=/nixu/trunk/; revision=5559
---
 make-disk.sh | 10 +++++++---
 pkgs.nix     |  2 +-
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/make-disk.sh b/make-disk.sh
index fc62a697dea..6043b61fcb2 100755
--- a/make-disk.sh
+++ b/make-disk.sh
@@ -3,7 +3,13 @@
 # deps is an array
 declare -a deps
 
-archivesDir=$(mktemp -d)
+# determine where we can find the Nix binaries
+NIX=$(dirname $(which nix-store))
+
+# make sure we use our own mktemp, because it is more pure
+mktemp=$($NIX/nix-store -r $(echo '(import ./pkgs.nix).mktemp' | $NIX/nix-instantiate -))
+archivesDir=$($mktemp/bin/mktemp -d)
+
 manifest=${archivesDir}/MANIFEST
 nixpkgs=/nixpkgs/trunk/pkgs
 fill_disk=$archivesDir/scripts/fill-disk.sh
@@ -15,8 +21,6 @@ initrd=/tmp/initram.img
 initdir=${archivesDir}/initdir
 initscript=$archivesDir/scripts/init.sh
 
-# determine where we can find the Nix binaries
-NIX=$(dirname $(which nix-store))
 
 storeExpr=$($NIX/nix-store -qR $($NIX/nix-store -r $(echo '(import ./pkgs.nix).everything' | $NIX/nix-instantiate -)))
 #$NIX/nix-push --copy $archivesDir $manifest $($NIX/nix-store -r $storeExpr) $($NIX/nix-store -r $(echo '(import ./pkgs.nix).kernel' | $NIX/nix-instantiate -))
diff --git a/pkgs.nix b/pkgs.nix
index f028a8e03d3..66076370bc3 100644
--- a/pkgs.nix
+++ b/pkgs.nix
@@ -5,7 +5,7 @@ rec {
     nettools nixUnstable subversion gcc wget which vim less screen openssh binutils
     strace shadowutils iputils gnumake curl gnused gnutar gnugrep gzip
     mingettyWrapper grubWrapper syslinux parted module_init_tools module_init_toolsStatic udev
-    dhcpWrapper man nano eject sysklogd kudzu xawtv;
+    dhcpWrapper man nano eject sysklogd kudzu xawtv mktemp;
 
   boot = (import ./boot) {inherit stdenv bash bashStatic coreutils findutilsWrapper
     utillinux utillinuxStatic sysvinit e2fsprogs nettools subversion gcc wget which vim
-- 
GitLab


From a60d5c3bdb3ee213ad091c1f8a66acadef167be0 Mon Sep 17 00:00:00 2001
From: Armijn Hemel <armijn@gpl-violations.org>
Date: Mon, 3 Jul 2006 08:39:52 +0000
Subject: [PATCH 0139/5331] also use sed and tar from Nixpkgs instead of the
 host system

svn path=/nixu/trunk/; revision=5562
---
 make-disk.sh | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/make-disk.sh b/make-disk.sh
index 6043b61fcb2..aee054fd1e9 100755
--- a/make-disk.sh
+++ b/make-disk.sh
@@ -6,10 +6,13 @@ declare -a deps
 # determine where we can find the Nix binaries
 NIX=$(dirname $(which nix-store))
 
-# make sure we use our own mktemp, because it is more pure
+# make sure we use many of our own tools, because it is more pure
 mktemp=$($NIX/nix-store -r $(echo '(import ./pkgs.nix).mktemp' | $NIX/nix-instantiate -))
-archivesDir=$($mktemp/bin/mktemp -d)
 
+gnused=$($NIX/nix-store -r $(echo '(import ./pkgs.nix).gnused' | $NIX/nix-instantiate -))
+gnutar=$($NIX/nix-store -r $(echo '(import ./pkgs.nix).gnutar' | $NIX/nix-instantiate -))
+
+archivesDir=$($mktemp/bin/mktemp -d)
 manifest=${archivesDir}/MANIFEST
 nixpkgs=/nixpkgs/trunk/pkgs
 fill_disk=$archivesDir/scripts/fill-disk.sh
@@ -55,7 +58,7 @@ do
     echo $j >> $storePaths
   done
   echo copying from store: $i
-  tar -cf - $i | tar --directory=$archivesDir -xf -
+  $gnutar/bin/tar -cf - $i | $gnutar/bin/tar --directory=$archivesDir -xf -
 done
 
 utilLinux=$(nix-store -r $(echo '(import ./pkgs.nix).utillinuxStatic' | $NIX/nix-instantiate -))
@@ -88,7 +91,6 @@ dhcp=$($NIX/nix-store -r $(echo '(import ./pkgs.nix).dhcpWrapper' | $NIX/nix-ins
 nano=$($NIX/nix-store -r $(echo '(import ./pkgs.nix).nano' | $NIX/nix-instantiate -))
 gnugrep=$($NIX/nix-store -r $(echo '(import ./pkgs.nix).gnugrep' | $NIX/nix-instantiate -))
 which=$($NIX/nix-store -r $(echo '(import ./pkgs.nix).which' | $NIX/nix-instantiate -))
-gnutar=$($NIX/nix-store -r $(echo '(import ./pkgs.nix).gnutar' | $NIX/nix-instantiate -))
 eject=$($NIX/nix-store -r $(echo '(import ./pkgs.nix).eject' | $NIX/nix-instantiate -))
 sysklogd=$($NIX/nix-store -r $(echo '(import ./pkgs.nix).sysklogd' | $NIX/nix-instantiate -))
 #kudzu=$($NIX/nix-store -r $(echo '(import ./pkgs.nix).kudzu' | $NIX/nix-instantiate -))
@@ -153,11 +155,11 @@ echo copying scripts
 
 mkdir ${archivesDir}/scripts
 cp -fa * ${archivesDir}/scripts
-sed -e "s^@bash\@^$bash^g" \
+$gnused/bin/sed -e "s^@bash\@^$bash^g" \
     -e "s^@coreutils\@^$coreutilsdiet^g" \
     < $initscript > $initscript.tmp
 mv $initscript.tmp $initscript
-sed -e "s^@sysvinitPath\@^$sysvinitPath^g" \
+$gnused/bin/sed -e "s^@sysvinitPath\@^$sysvinitPath^g" \
     -e "s^@bootPath\@^$bootPath^g" \
     -e "s^@nix\@^$nix^g" \
     -e "s^@bash\@^$bash^g" \
@@ -180,7 +182,7 @@ sed -e "s^@sysvinitPath\@^$sysvinitPath^g" \
     < $fill_disk > $fill_disk.tmp
 mv $fill_disk.tmp $fill_disk
 
-sed -e "s^@sysvinitPath\@^$sysvinitPath^g" \
+$gnused/bin/sed -e "s^@sysvinitPath\@^$sysvinitPath^g" \
     -e "s^@bootPath\@^$bootPath^g" \
     -e "s^@NIX\@^$nix^g" \
     -e "s^@bash\@^$bash^g" \
-- 
GitLab


From c984b735bddbb7c3fddd6af4d3d68d7062409f19 Mon Sep 17 00:00:00 2001
From: Armijn Hemel <armijn@gpl-violations.org>
Date: Mon, 3 Jul 2006 09:32:15 +0000
Subject: [PATCH 0140/5331] also use mkisofs from Nixpkgs

svn path=/nixu/trunk/; revision=5563
---
 make-disk.sh | 7 ++++---
 pkgs.nix     | 2 +-
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/make-disk.sh b/make-disk.sh
index aee054fd1e9..e7b68b484eb 100755
--- a/make-disk.sh
+++ b/make-disk.sh
@@ -11,6 +11,7 @@ mktemp=$($NIX/nix-store -r $(echo '(import ./pkgs.nix).mktemp' | $NIX/nix-instan
 
 gnused=$($NIX/nix-store -r $(echo '(import ./pkgs.nix).gnused' | $NIX/nix-instantiate -))
 gnutar=$($NIX/nix-store -r $(echo '(import ./pkgs.nix).gnutar' | $NIX/nix-instantiate -))
+cdrtools=$($NIX/nix-store -r $(echo '(import ./pkgs.nix).cdrtools' | $NIX/nix-instantiate -))
 
 archivesDir=$($mktemp/bin/mktemp -d)
 manifest=${archivesDir}/MANIFEST
@@ -257,9 +258,9 @@ rm -f ${initrd}
 
 echo creating ISO image
 
-mkisofs -rJ -o ${bootiso} -b isolinux/isolinux.bin -c isolinux/boot.cat \
-                -no-emul-boot -boot-load-size 4 -boot-info-table \
-                ${archivesDir}
+$cdrtools/bin/mkisofs -rJ -o ${bootiso} -b isolinux/isolinux.bin \
+                -c isolinux/boot.cat  -no-emul-boot -boot-load-size 4 \
+                -boot-info-table ${archivesDir}
 
 # cleanup, be diskspace friendly
 
diff --git a/pkgs.nix b/pkgs.nix
index 66076370bc3..e2005944648 100644
--- a/pkgs.nix
+++ b/pkgs.nix
@@ -5,7 +5,7 @@ rec {
     nettools nixUnstable subversion gcc wget which vim less screen openssh binutils
     strace shadowutils iputils gnumake curl gnused gnutar gnugrep gzip
     mingettyWrapper grubWrapper syslinux parted module_init_tools module_init_toolsStatic udev
-    dhcpWrapper man nano eject sysklogd kudzu xawtv mktemp;
+    dhcpWrapper man nano eject sysklogd kudzu xawtv mktemp cdrtools;
 
   boot = (import ./boot) {inherit stdenv bash bashStatic coreutils findutilsWrapper
     utillinux utillinuxStatic sysvinit e2fsprogs nettools subversion gcc wget which vim
-- 
GitLab


From a1bd3698efacfa5e507b13c18a5d48d73f4bab1d Mon Sep 17 00:00:00 2001
From: Armijn Hemel <armijn@gpl-violations.org>
Date: Mon, 3 Jul 2006 22:20:22 +0000
Subject: [PATCH 0141/5331] also use our own coreutils

svn path=/nixu/trunk/; revision=5564
---
 make-disk.sh | 106 +++++++++++++++++++++++++--------------------------
 1 file changed, 53 insertions(+), 53 deletions(-)

diff --git a/make-disk.sh b/make-disk.sh
index e7b68b484eb..603402c6343 100755
--- a/make-disk.sh
+++ b/make-disk.sh
@@ -12,6 +12,7 @@ mktemp=$($NIX/nix-store -r $(echo '(import ./pkgs.nix).mktemp' | $NIX/nix-instan
 gnused=$($NIX/nix-store -r $(echo '(import ./pkgs.nix).gnused' | $NIX/nix-instantiate -))
 gnutar=$($NIX/nix-store -r $(echo '(import ./pkgs.nix).gnutar' | $NIX/nix-instantiate -))
 cdrtools=$($NIX/nix-store -r $(echo '(import ./pkgs.nix).cdrtools' | $NIX/nix-instantiate -))
+coreutils=$($NIX/nix-store -q $(echo '(import ./pkgs.nix).coreutils' | $NIX/nix-instantiate -))
 
 archivesDir=$($mktemp/bin/mktemp -d)
 manifest=${archivesDir}/MANIFEST
@@ -52,7 +53,7 @@ do
   echo $i >> $storePaths
   echo '' >> $storePaths
   deps=$($NIX/nix-store -q --references $i)
-  pkgs=$(echo $deps | wc -w)
+  pkgs=$(echo $deps | $coreutils/bin/wc -w)
   echo $pkgs >> $storePaths
   for j in $deps
   do
@@ -79,7 +80,6 @@ BootPath=$($NIX/nix-store -qR $(nix-store -r $(echo '(import ./pkgs.nix).boot' |
 bashGlibc=$($NIX/nix-store -q $(echo '(import ./pkgs.nix).bash' | $NIX/nix-instantiate -))
 bash=$($NIX/nix-store -q $(echo '(import ./pkgs.nix).bashStatic' | $NIX/nix-instantiate -))
 coreutilsdiet=$($NIX/nix-store -q $(echo '(import ./pkgs.nix).coreutilsDiet' | $NIX/nix-instantiate -))
-coreutils=$($NIX/nix-store -q $(echo '(import ./pkgs.nix).coreutils' | $NIX/nix-instantiate -))
 findutils=$($NIX/nix-store -q $(echo '(import ./pkgs.nix).findutilsWrapper' | $NIX/nix-instantiate -))
 utillinux=$($NIX/nix-store -q $(echo '(import ./pkgs.nix).utillinux' | $NIX/nix-instantiate -))
 e2fsprogs=$($NIX/nix-store -q $(echo '(import ./pkgs.nix).e2fsprogsDiet' | $NIX/nix-instantiate -))
@@ -114,27 +114,27 @@ sysklogd=$($NIX/nix-store -r $(echo '(import ./pkgs.nix).sysklogd' | $NIX/nix-in
 
 echo creating directories for bootimage
 
-mkdir ${initdir}
-mkdir ${initdir}/bin
-mkdir ${initdir}/cdrom
-mkdir ${initdir}/dev
-mkdir ${initdir}/etc
-mkdir ${initdir}/etc/sysconfig
-mkdir ${initdir}/installimage
-mkdir ${initdir}/modules
-mkdir ${initdir}/proc
-mkdir ${initdir}/sbin
-mkdir ${initdir}/sys
-mkdir ${initdir}/tmp
-mkdir -p ${initdir}/usr/bin
-mkdir -p ${initdir}/usr/sbin
-mkdir ${initdir}/var
-mkdir ${initdir}/var/run
+$coreutils/bin/mkdir ${initdir}
+$coreutils/bin/mkdir ${initdir}/bin
+$coreutils/bin/mkdir ${initdir}/cdrom
+$coreutils/bin/mkdir ${initdir}/dev
+$coreutils/bin/mkdir ${initdir}/etc
+$coreutils/bin/mkdir ${initdir}/etc/sysconfig
+$coreutils/bin/mkdir ${initdir}/installimage
+$coreutils/bin/mkdir ${initdir}/modules
+$coreutils/bin/mkdir ${initdir}/proc
+$coreutils/bin/mkdir ${initdir}/sbin
+$coreutils/bin/mkdir ${initdir}/sys
+$coreutils/bin/mkdir ${initdir}/tmp
+$coreutils/bin/mkdir -p ${initdir}/usr/bin
+$coreutils/bin/mkdir -p ${initdir}/usr/sbin
+$coreutils/bin/mkdir ${initdir}/var
+$coreutils/bin/mkdir ${initdir}/var/run
 
 echo copying nixpkgs
 
 #svn export ${nixpkgs} ${archivesDir}/pkgs
-cp -fa ${nixpkgs} ${archivesDir}
+$coreutils/bin/cp -fa ${nixpkgs} ${archivesDir}
 #tar cf $archivesDir
 
 #echo copying packages from store
@@ -154,12 +154,12 @@ cp -fa ${nixpkgs} ${archivesDir}
 
 echo copying scripts
 
-mkdir ${archivesDir}/scripts
-cp -fa * ${archivesDir}/scripts
+$coreutils/bin/mkdir ${archivesDir}/scripts
+$coreutils/bin/cp -fa * ${archivesDir}/scripts
 $gnused/bin/sed -e "s^@bash\@^$bash^g" \
     -e "s^@coreutils\@^$coreutilsdiet^g" \
     < $initscript > $initscript.tmp
-mv $initscript.tmp $initscript
+$coreutils/bin/mv $initscript.tmp $initscript
 $gnused/bin/sed -e "s^@sysvinitPath\@^$sysvinitPath^g" \
     -e "s^@bootPath\@^$bootPath^g" \
     -e "s^@nix\@^$nix^g" \
@@ -181,7 +181,7 @@ $gnused/bin/sed -e "s^@sysvinitPath\@^$sysvinitPath^g" \
     -e "s^@gnutar\@^$gnutar^g" \
     -e "s^@mingetty\@^$mingettyWrapper^g" \
     < $fill_disk > $fill_disk.tmp
-mv $fill_disk.tmp $fill_disk
+$coreutils/bin/mv $fill_disk.tmp $fill_disk
 
 $gnused/bin/sed -e "s^@sysvinitPath\@^$sysvinitPath^g" \
     -e "s^@bootPath\@^$bootPath^g" \
@@ -200,61 +200,61 @@ $gnused/bin/sed -e "s^@sysvinitPath\@^$sysvinitPath^g" \
     -e "s^@gnutar\@^$gnutar^g" \
     -e "s^@mingetty\@^$mingettyWrapper^g" \
     < $ramdisk_login > $ramdisk_login.tmp
-mv $ramdisk_login.tmp $ramdisk_login
+$coreutils/bin/mv $ramdisk_login.tmp $ramdisk_login
 
 echo copying bootimage
 
-mkdir ${archivesDir}/isolinux
-cp ${syslinux}/lib/syslinux/isolinux.bin ${archivesDir}/isolinux
-cp isolinux.cfg ${archivesDir}/isolinux
-chmod u+w ${archivesDir}/isolinux/*
+$coreutils/bin/mkdir ${archivesDir}/isolinux
+$coreutils/bin/cp ${syslinux}/lib/syslinux/isolinux.bin ${archivesDir}/isolinux
+$coreutils/bin/cp isolinux.cfg ${archivesDir}/isolinux
+$coreutils/bin/chmod u+w ${archivesDir}/isolinux/*
 
 echo copying kernel
 
 # By following the symlink we don't have to know the version number
 # of the kernel here.
-cp -L $kernel/vmlinuz ${archivesDir}/isolinux
+$coreutils/bin/cp -L $kernel/vmlinuz ${archivesDir}/isolinux
 
 echo linking kernel modules
 
-ln -s $kernel/lib $archivesDir/lib
+$coreutils/bin/ln -s $kernel/lib $archivesDir/lib
 
 echo creating ramdisk
 
-rm -f ${initrd}
+$coreutils/bin/rm -f ${initrd}
 #cp ${archivesDir}/scripts/fill-disk.sh ${initdir}/init
-cp ${archivesDir}/scripts/fill-disk.sh ${initdir}/
-cp ${archivesDir}/scripts/ramdisk-login.sh ${initdir}/
-cp ${archivesDir}/scripts/init.sh ${initdir}/init
+$coreutils/bin/cp ${archivesDir}/scripts/fill-disk.sh ${initdir}/
+$coreutils/bin/cp ${archivesDir}/scripts/ramdisk-login.sh ${initdir}/
+$coreutils/bin/cp ${archivesDir}/scripts/init.sh ${initdir}/init
 #ln -s ${bash}/bin/bash ${initdir}/bin/sh
-cp ${bash}/bin/bash ${initdir}/bin/sh
-chmod u+x ${initdir}/init
-chmod u+x ${initdir}/fill-disk.sh
-chmod u+x ${initdir}/ramdisk-login.sh
+$coreutils/bin/cp ${bash}/bin/bash ${initdir}/bin/sh
+$coreutils/bin/chmod u+x ${initdir}/init
+$coreutils/bin/chmod u+x ${initdir}/fill-disk.sh
+$coreutils/bin/chmod u+x ${initdir}/ramdisk-login.sh
 #cp -fau --parents ${utilLinux} ${initdir}
 #cp -fau --parents ${coreUtilsDiet} ${initdir}
 #cp -fau --parents ${modUtils} ${initdir}
-cp -fau --parents ${bash}/bin ${initdir}
-cp -fau --parents ${utilLinux}/bin ${initdir}
-chmod -R u+w ${initdir}
-cp -fau --parents ${utilLinux}/sbin ${initdir}
-cp -fau --parents ${e2fsProgs} ${initdir}
-cp -fau --parents ${coreutilsdiet}/bin ${initdir}
-cp -fau --parents ${modutils}/bin ${initdir}
-chmod -R u+w ${initdir}
+$coreutils/bin/cp -fau --parents ${bash}/bin ${initdir}
+$coreutils/bin/cp -fau --parents ${utilLinux}/bin ${initdir}
+$coreutils/bin/chmod -R u+w ${initdir}
+$coreutils/bin/cp -fau --parents ${utilLinux}/sbin ${initdir}
+$coreutils/bin/cp -fau --parents ${e2fsProgs} ${initdir}
+$coreutils/bin/cp -fau --parents ${coreutilsdiet}/bin ${initdir}
+$coreutils/bin/cp -fau --parents ${modutils}/bin ${initdir}
+$coreutils/bin/chmod -R u+w ${initdir}
 echo modutils
-cp -fau --parents ${modutils}/sbin ${initdir}
+$coreutils/bin/cp -fau --parents ${modutils}/sbin ${initdir}
 #cp -fau --parents ${kudzu} ${initdir}
 
-touch ${archivesDir}/NIXOS
+$coreutils/bin/touch ${archivesDir}/NIXOS
 
 (cd ${initdir}; find . |cpio -H newc -o) | gzip -9 > ${initrd}
 
-chmod -f -R +w ${initdir}/*
-rm -rf ${initdir}
+$coreutils/bin/chmod -f -R +w ${initdir}/*
+$coreutils/bin/rm -rf ${initdir}
 
-cp ${initrd} ${archivesDir}/isolinux
-rm -f ${initrd}
+$coreutils/bin/cp ${initrd} ${archivesDir}/isolinux
+$coreutils/bin/rm -f ${initrd}
 
 echo creating ISO image
 
@@ -266,5 +266,5 @@ $cdrtools/bin/mkisofs -rJ -o ${bootiso} -b isolinux/isolinux.bin \
 
 echo cleaning up
 
-chmod -f -R +w ${archivesDir}/*
+$coreutils/bin/chmod -f -R +w ${archivesDir}/*
 #rm -rf ${archivesDir}/*
-- 
GitLab


From 8a14c8d8864bda6e8270af9630df90abbaa12cd8 Mon Sep 17 00:00:00 2001
From: Armijn Hemel <armijn@gpl-violations.org>
Date: Mon, 3 Jul 2006 22:40:56 +0000
Subject: [PATCH 0142/5331] wel also want to use our own gzip

svn path=/nixu/trunk/; revision=5565
---
 make-disk.sh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/make-disk.sh b/make-disk.sh
index 603402c6343..fd6152fd2e8 100755
--- a/make-disk.sh
+++ b/make-disk.sh
@@ -13,6 +13,7 @@ gnused=$($NIX/nix-store -r $(echo '(import ./pkgs.nix).gnused' | $NIX/nix-instan
 gnutar=$($NIX/nix-store -r $(echo '(import ./pkgs.nix).gnutar' | $NIX/nix-instantiate -))
 cdrtools=$($NIX/nix-store -r $(echo '(import ./pkgs.nix).cdrtools' | $NIX/nix-instantiate -))
 coreutils=$($NIX/nix-store -q $(echo '(import ./pkgs.nix).coreutils' | $NIX/nix-instantiate -))
+gzip=$($NIX/nix-store -q $(echo '(import ./pkgs.nix).gzip' | $NIX/nix-instantiate -))
 
 archivesDir=$($mktemp/bin/mktemp -d)
 manifest=${archivesDir}/MANIFEST
@@ -248,7 +249,7 @@ $coreutils/bin/cp -fau --parents ${modutils}/sbin ${initdir}
 
 $coreutils/bin/touch ${archivesDir}/NIXOS
 
-(cd ${initdir}; find . |cpio -H newc -o) | gzip -9 > ${initrd}
+(cd ${initdir}; find . |cpio -H newc -o) | $gzip/bin/gzip -9 > ${initrd}
 
 $coreutils/bin/chmod -f -R +w ${initdir}/*
 $coreutils/bin/rm -rf ${initdir}
-- 
GitLab


From 45a2be1fbef27c9f4d16212e769f8f0ca1fa165f Mon Sep 17 00:00:00 2001
From: Armijn Hemel <armijn@gpl-violations.org>
Date: Mon, 3 Jul 2006 23:16:44 +0000
Subject: [PATCH 0143/5331] also use our own cpio. Make sure we don't just
 query nix expressions, but actually realize them as well. D'oh!

svn path=/nixu/trunk/; revision=5566
---
 make-disk.sh | 7 ++++---
 pkgs.nix     | 2 +-
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/make-disk.sh b/make-disk.sh
index fd6152fd2e8..101c1b7f977 100755
--- a/make-disk.sh
+++ b/make-disk.sh
@@ -12,8 +12,9 @@ mktemp=$($NIX/nix-store -r $(echo '(import ./pkgs.nix).mktemp' | $NIX/nix-instan
 gnused=$($NIX/nix-store -r $(echo '(import ./pkgs.nix).gnused' | $NIX/nix-instantiate -))
 gnutar=$($NIX/nix-store -r $(echo '(import ./pkgs.nix).gnutar' | $NIX/nix-instantiate -))
 cdrtools=$($NIX/nix-store -r $(echo '(import ./pkgs.nix).cdrtools' | $NIX/nix-instantiate -))
-coreutils=$($NIX/nix-store -q $(echo '(import ./pkgs.nix).coreutils' | $NIX/nix-instantiate -))
-gzip=$($NIX/nix-store -q $(echo '(import ./pkgs.nix).gzip' | $NIX/nix-instantiate -))
+coreutils=$($NIX/nix-store -r $(echo '(import ./pkgs.nix).coreutils' | $NIX/nix-instantiate -))
+gzip=$($NIX/nix-store -r $(echo '(import ./pkgs.nix).gzip' | $NIX/nix-instantiate -))
+cpio=$($NIX/nix-store -r $(echo '(import ./pkgs.nix).cpio' | $NIX/nix-instantiate -))
 
 archivesDir=$($mktemp/bin/mktemp -d)
 manifest=${archivesDir}/MANIFEST
@@ -249,7 +250,7 @@ $coreutils/bin/cp -fau --parents ${modutils}/sbin ${initdir}
 
 $coreutils/bin/touch ${archivesDir}/NIXOS
 
-(cd ${initdir}; find . |cpio -H newc -o) | $gzip/bin/gzip -9 > ${initrd}
+(cd ${initdir}; find . |$cpio/bin/cpio -H newc -o) | $gzip/bin/gzip -9 > ${initrd}
 
 $coreutils/bin/chmod -f -R +w ${initdir}/*
 $coreutils/bin/rm -rf ${initdir}
diff --git a/pkgs.nix b/pkgs.nix
index e2005944648..0762f3e2099 100644
--- a/pkgs.nix
+++ b/pkgs.nix
@@ -5,7 +5,7 @@ rec {
     nettools nixUnstable subversion gcc wget which vim less screen openssh binutils
     strace shadowutils iputils gnumake curl gnused gnutar gnugrep gzip
     mingettyWrapper grubWrapper syslinux parted module_init_tools module_init_toolsStatic udev
-    dhcpWrapper man nano eject sysklogd kudzu xawtv mktemp cdrtools;
+    dhcpWrapper man nano eject sysklogd kudzu xawtv mktemp cdrtools cpio;
 
   boot = (import ./boot) {inherit stdenv bash bashStatic coreutils findutilsWrapper
     utillinux utillinuxStatic sysvinit e2fsprogs nettools subversion gcc wget which vim
-- 
GitLab


From afb7f5b95008dc2986535b3bae56695a7c9aef39 Mon Sep 17 00:00:00 2001
From: Armijn Hemel <armijn@gpl-violations.org>
Date: Tue, 4 Jul 2006 18:12:48 +0000
Subject: [PATCH 0144/5331] actually build nix-unstable

svn path=/nixu/trunk/; revision=5577
---
 make-disk.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/make-disk.sh b/make-disk.sh
index 101c1b7f977..7311499b1e2 100755
--- a/make-disk.sh
+++ b/make-disk.sh
@@ -38,7 +38,7 @@ sysvinitPath=$($NIX/nix-store -r $(echo '(import ./pkgs.nix).sysvinit' | $NIX/ni
 # Location of Nix boot scripts?
 bootPath=$($NIX/nix-store -r $(echo '(import ./pkgs.nix).boot' | $NIX/nix-instantiate -))
 
-nix=$($NIX/nix-store -q $(echo '(import ./pkgs.nix).nixUnstable' | $NIX/nix-instantiate -))
+nix=$($NIX/nix-store -r $(echo '(import ./pkgs.nix).nixUnstable' | $NIX/nix-instantiate -))
 
 syslinux=$($NIX/nix-store -r $(echo '(import ./pkgs.nix).syslinux' | $NIX/nix-instantiate -))
 
-- 
GitLab


From 89762236cfba6fa514bbee565a117f125870553d Mon Sep 17 00:00:00 2001
From: Armijn Hemel <armijn@gpl-violations.org>
Date: Tue, 4 Jul 2006 20:38:14 +0000
Subject: [PATCH 0145/5331] it is nice to have a few more ttys available in
 NixOS, so mknod them

svn path=/nixu/trunk/; revision=5582
---
 fill-disk.sh | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/fill-disk.sh b/fill-disk.sh
index d39bbfb72c3..3ed5edc8bfc 100755
--- a/fill-disk.sh
+++ b/fill-disk.sh
@@ -196,6 +196,8 @@ mknod -m 0600 $root/dev/console c 5 1
 mknod -m 0600 $root/dev/tty c 5 0
 mknod -m 0600 $root/dev/tty0 c 4 0
 mknod -m 0600 $root/dev/tty1 c 4 1
+mknod -m 0600 $root/dev/tty2 c 4 2
+mknod -m 0600 $root/dev/tty3 c 4 3
 mknod -m 0444 $root/dev/urandom c 1 9
 
 rm -f $root/etc/mtab
-- 
GitLab


From 95fa5b81b13dc6bd61b24aec180dbcff33854b26 Mon Sep 17 00:00:00 2001
From: Armijn Hemel <armijn@gpl-violations.org>
Date: Sun, 9 Jul 2006 22:33:01 +0000
Subject: [PATCH 0146/5331] remove a dependency on an external coreutils
 (overlooked)

svn path=/nixu/trunk/; revision=5669
---
 make-disk.sh | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/make-disk.sh b/make-disk.sh
index 7311499b1e2..10289da0042 100755
--- a/make-disk.sh
+++ b/make-disk.sh
@@ -3,8 +3,13 @@
 # deps is an array
 declare -a deps
 
+NIXSTORE=`which nix-store`
+NIXINSTANTIATE=`which nix-instantiate`
+
+coreutils=$($NIXSTORE -r $(echo '(import ./pkgs.nix).coreutils' | $NIXINSTANTIATE -))
+
 # determine where we can find the Nix binaries
-NIX=$(dirname $(which nix-store))
+NIX=$($coreutils/bin/dirname $(which nix-store))
 
 # make sure we use many of our own tools, because it is more pure
 mktemp=$($NIX/nix-store -r $(echo '(import ./pkgs.nix).mktemp' | $NIX/nix-instantiate -))
@@ -12,7 +17,6 @@ mktemp=$($NIX/nix-store -r $(echo '(import ./pkgs.nix).mktemp' | $NIX/nix-instan
 gnused=$($NIX/nix-store -r $(echo '(import ./pkgs.nix).gnused' | $NIX/nix-instantiate -))
 gnutar=$($NIX/nix-store -r $(echo '(import ./pkgs.nix).gnutar' | $NIX/nix-instantiate -))
 cdrtools=$($NIX/nix-store -r $(echo '(import ./pkgs.nix).cdrtools' | $NIX/nix-instantiate -))
-coreutils=$($NIX/nix-store -r $(echo '(import ./pkgs.nix).coreutils' | $NIX/nix-instantiate -))
 gzip=$($NIX/nix-store -r $(echo '(import ./pkgs.nix).gzip' | $NIX/nix-instantiate -))
 cpio=$($NIX/nix-store -r $(echo '(import ./pkgs.nix).cpio' | $NIX/nix-instantiate -))
 
-- 
GitLab


From 8c56a19d5505f37a348a9c1acde3aa0be17ff243 Mon Sep 17 00:00:00 2001
From: Armijn Hemel <armijn@gpl-violations.org>
Date: Mon, 31 Jul 2006 15:16:10 +0000
Subject: [PATCH 0147/5331] take closure of statically linked bash, this makes
 it "deterministic" according to eelco ;)

svn path=/nixu/trunk/; revision=6007
---
 make-disk.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/make-disk.sh b/make-disk.sh
index 10289da0042..5710edecb97 100755
--- a/make-disk.sh
+++ b/make-disk.sh
@@ -84,7 +84,7 @@ SysVinit=$($NIX/nix-store -qR $(nix-store -r $(echo '(import ./pkgs.nix).sysvini
 BootPath=$($NIX/nix-store -qR $(nix-store -r $(echo '(import ./pkgs.nix).boot' | $NIX/nix-instantiate -)))
 
 bashGlibc=$($NIX/nix-store -q $(echo '(import ./pkgs.nix).bash' | $NIX/nix-instantiate -))
-bash=$($NIX/nix-store -q $(echo '(import ./pkgs.nix).bashStatic' | $NIX/nix-instantiate -))
+bash=$($NIX/nix-store -qR $($NIX/nix-store -r $(echo '(import ./pkgs.nix).bashStatic' | $NIX/nix-instantiate -)))
 coreutilsdiet=$($NIX/nix-store -q $(echo '(import ./pkgs.nix).coreutilsDiet' | $NIX/nix-instantiate -))
 findutils=$($NIX/nix-store -q $(echo '(import ./pkgs.nix).findutilsWrapper' | $NIX/nix-instantiate -))
 utillinux=$($NIX/nix-store -q $(echo '(import ./pkgs.nix).utillinux' | $NIX/nix-instantiate -))
-- 
GitLab


From 2c87da322d2781fee2f6cd65d1924651318f2dd8 Mon Sep 17 00:00:00 2001
From: Armijn Hemel <armijn@gpl-violations.org>
Date: Wed, 2 Aug 2006 22:34:13 +0000
Subject: [PATCH 0148/5331] use less packages

svn path=/nixu/trunk/; revision=6024
---
 pkgs.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs.nix b/pkgs.nix
index 0762f3e2099..de670d2eeda 100644
--- a/pkgs.nix
+++ b/pkgs.nix
@@ -2,10 +2,10 @@ rec {
   inherit (import /nixpkgs/trunk/pkgs/top-level/all-packages.nix {})
     stdenv kernel bash bashStatic coreutils coreutilsDiet findutilsWrapper utillinux utillinuxStatic sysvinit
    e2fsprogsDiet e2fsprogs
-    nettools nixUnstable subversion gcc wget which vim less screen openssh binutils
+    nettools nixUnstable subversion gcc wget which vim less screen openssh binutils nixStatic
     strace shadowutils iputils gnumake curl gnused gnutar gnugrep gzip
     mingettyWrapper grubWrapper syslinux parted module_init_tools module_init_toolsStatic udev
-    dhcpWrapper man nano eject sysklogd kudzu xawtv mktemp cdrtools cpio;
+    dhcpWrapper man nano eject sysklogd mktemp cdrtools cpio;
 
   boot = (import ./boot) {inherit stdenv bash bashStatic coreutils findutilsWrapper
     utillinux utillinuxStatic sysvinit e2fsprogs nettools subversion gcc wget which vim
@@ -20,5 +20,5 @@ rec {
     nix = nixUnstable;
     };
 
-  everything = [boot sysvinit sysklogd kernel xawtv];
+  everything = [boot sysvinit sysklogd kernel ];
 }
-- 
GitLab


From 493661f8808f5c6fa35f85dea5f4e450ae92bb64 Mon Sep 17 00:00:00 2001
From: Armijn Hemel <armijn@gpl-violations.org>
Date: Wed, 2 Aug 2006 22:42:56 +0000
Subject: [PATCH 0149/5331] This is a major big update for the install process
 for NixOS. This requires the latest patches to Nix itself, which were
 committed the last few days.

Biggest changes:

make-disk.sh:
* use nix-push to generate NAR files and a manifest
* use only copy a "few" packages (but probably still too many than we want) to the Nix store on the CD

fill-disk.sh:
* use nix-pull to register a manifest with a lot of packages. Only copy and
register as valid the few packages that are in the Nix store on the installer
CD, install the rest via nix-env and other tools (this needs to be reviewed
thoroughly for optimizations).

All in all the install process is a lot cleaner now, the login script is broken
however (but should be relatively easy to fix with some Nix wizardry). NIX_ROOT
is still broken, but we can work around most issues with relative ease now.

svn path=/nixu/trunk/; revision=6025
---
 fill-disk.sh | 54 ++++++++++++++++++++++++++++++++++++++++------------
 make-disk.sh | 30 ++++++++++++++++++++---------
 2 files changed, 63 insertions(+), 21 deletions(-)

diff --git a/fill-disk.sh b/fill-disk.sh
index 3ed5edc8bfc..7664549e580 100755
--- a/fill-disk.sh
+++ b/fill-disk.sh
@@ -1,10 +1,10 @@
 #! @bash@/bin/sh -e
 
-export PATH=/bin:/sbin:@bash@/bin:@coreutilsdiet@/bin:@coreutils@/bin:@findutils@/bin:@utillinux@/bin:@utillinux@/sbin:@utilLinux@/bin:@utilLinux@/sbin:@e2fsprogs@/sbin:@grub@/sbin:@sysvinitPath@/sbin:@gnugrep@/bin:@which@/bin:@gnutar@/bin:@eject@/bin:@kudzu@/sbin:@xawtv@/bin
+export PATH=/bin:/sbin:@bash@/bin:@coreutilsdiet@/bin:@coreutils@/bin:@findutils@/bin:@utillinux@/bin:@utillinux@/sbin:@utilLinux@/bin:@utilLinux@/sbin:@e2fsprogs@/sbin:@grub@/sbin:@sysvinitPath@/sbin:@gnugrep@/bin:@which@/bin:@gnutar@/bin:@eject@/bin:@kudzu@/sbin:@utillinux@/bin
 
 ##
 ## In the beginning we want to have a minimalistic environment, built with
-## klibc.
+## dietlibc.
 ##
 
 kernel=@kernel@
@@ -143,6 +143,7 @@ echo creating file system hierarchy on target drive
 
 make_dir 00755 /bin
 make_dir 00755 /boot
+make_dir 00755 /cdrom
 make_dir 00755 /dev
 make_dir 00755 /dev/pts
 make_dir 00755 /etc # global non-constant configuration
@@ -224,13 +225,18 @@ echo "Looking for CDROM in: $i"
   fi
 done
 
-echo switch to /nix and /nixpkgs from CD
 
-## starting here it's OK to have full blown glibc
+echo mounting /cdrom in the target
 
+mount --bind /cdrom $root/cdrom
+
+echo switch to /nix and /nixpkgs from CD
+## starting here it's OK to have full blown glibc
 ln -s /cdrom/nixpkgs /nixpkgs
+
 mount --bind /cdrom/nix /nix
 
+
 echo probing for hardware...
 
 #kudzu
@@ -260,9 +266,6 @@ tar --directory=/cdrom -cf - pkgs | tar --directory=$root/nixpkgs/trunk -xvf -
 make_dir 0755 /tmp/scripts
 cp -fa /cdrom/scripts $root/tmp
 
-#echo adding manifest
-#$NIX/nix-pull $manifest
-
 echo adding packages
 
 export NIX_ROOT=$root
@@ -283,20 +286,43 @@ cp /cdrom/mystorepaths $root/tmp
 
 echo copying store
 
-#cp -fva /nix/store/* $root/nix/store
+cp -fva /nix/store/* $root/nix/store
 tar cf - /nix/store | tar --directory=$root -xvf -
 
 echo registering valid paths...
 
 $NIX/nix-store --register-validity < $root/tmp/mystorepaths
+
+unset NIX_ROOT
+export NIX_DATA_DIR=$root/nix/share
+export NIX_LOG_DIR=$root/nix/log/nix
+export NIX_STATE_DIR=$root/nix/var/nix
+export NIX_CONF_DIR=$root/nix/etc
+
+echo creating /bin/sh
+ln -s @bashGlibc@/bin/sh $root/bin/sh
+
+echo adding manifest
+$NIX/nix-pull file:///cdrom/MANIFEST
+
+export NIX_ROOT=$root
+unset NIX_DATA_DIR
+unset NIX_LOG_DIR
+unset NIX_STATE_DIR
+unset NIX_CONF_DIR
+
+### Fix this. Probably nix-instantiate, then nix-store -r.
+### Also make sure everything gets installed into an actual profile!
 $NIX/nix-env -iKf /nixpkgs/trunk/pkgs/top-level/all-packages.nix nix
 $NIX/nix-env -iKf /nixpkgs/trunk/pkgs/top-level/all-packages.nix coreutils
+$NIX/nix-env -iKf /nixpkgs/trunk/pkgs/top-level/all-packages.nix gnugrep
+$NIX/nix-env -iKf /nixpkgs/trunk/pkgs/top-level/all-packages.nix linux
+$NIX/nix-env -iKf /nixpkgs/trunk/pkgs/top-level/all-packages.nix grub
 
 echo setting init symlink...
 rm -f $root/init
 #ln -s $sysvinitPath/sbin/init $root/init
 ln -s @sysvinitPath@/sbin/init $root/sbin/init
-ln -s @bashGlibc@/bin/sh $root/bin/sh
 #ln -s @bash@/bin/bash $root/bin/bash
 
 echo setting up inittab...
@@ -339,12 +365,12 @@ touch_file /etc/services
 ###
 ### Do kernel stuff here.
 ###
-strippedName=$(basename @kernel@);
+strippedName=$(basename $root/@kernel@);
 if echo "$strippedName" | grep -q '^[a-z0-9]\{32\}-'; then
         strippedName=$(echo "$strippedName" | cut -c34- | cut -c 7-)
 fi
 
-kernelhash=$(basename @kernel@);
+kernelhash=$(basename $root/@kernel@);
 if echo "$kernelhash" | grep -q '^[a-z0-9]\{32\}-'; then
         kernelhash=$(echo "$kernelhash" | cut -c -32)
 fi
@@ -355,7 +381,7 @@ make_dir 0755 /lib/modules/$version
 
 ln -s @kernel@/lib/modules/$version/build $root/lib/modules/$version/build
 ln -s @kernel@/lib/modules/$version/kernel $root/lib/modules/$version/kernel
-cp @kernel@/lib/modules/$version/modules.* $root/lib/modules/$version
+cp $root/@kernel@/lib/modules/$version/modules.* $root/lib/modules/$version
 chmod 644 $root/lib/modules/$version/modules.*
 
 ###
@@ -382,9 +408,13 @@ title NixOS
         kernel @kernel@/vmlinuz root=$device
 GRUBEND
 
+# clear substitutes here?
+# nix-store --clear-substitutes ??
+
 echo copying install log
 
 cp /tmp/install-log $root/root
+sleep 10;
 
 echo umounting filesystem
 
diff --git a/make-disk.sh b/make-disk.sh
index 5710edecb97..0cd081f0611 100755
--- a/make-disk.sh
+++ b/make-disk.sh
@@ -32,9 +32,16 @@ initrd=/tmp/initram.img
 initdir=${archivesDir}/initdir
 initscript=$archivesDir/scripts/init.sh
 
+nix=$($NIX/nix-store -r $(echo '(import ./pkgs.nix).nixUnstable' | $NIX/nix-instantiate -))
+
+nixDeps=$($NIX/nix-store -qR $nix)
 
 storeExpr=$($NIX/nix-store -qR $($NIX/nix-store -r $(echo '(import ./pkgs.nix).everything' | $NIX/nix-instantiate -)))
-#$NIX/nix-push --copy $archivesDir $manifest $($NIX/nix-store -r $storeExpr) $($NIX/nix-store -r $(echo '(import ./pkgs.nix).kernel' | $NIX/nix-instantiate -))
+#storeExpr=$($NIX/nix-store -r $($NIX/nix-store -qR $(echo '(import ./pkgs.nix).everything' | $NIX/nix-instantiate -)))
+
+### make NAR files for everything we want to install and some more. Make sure
+### the right URL is in there, so specify /cdrom and not cdrom
+$NIX/nix-push --copy $archivesDir $manifest --target /cdrom $storeExpr $($NIX/nix-store -r $(echo '(import ./pkgs.nix).kernel' | $NIX/nix-instantiate -))
 
 # Location of sysvinit?
 sysvinitPath=$($NIX/nix-store -r $(echo '(import ./pkgs.nix).sysvinit' | $NIX/nix-instantiate -))
@@ -42,8 +49,6 @@ sysvinitPath=$($NIX/nix-store -r $(echo '(import ./pkgs.nix).sysvinit' | $NIX/ni
 # Location of Nix boot scripts?
 bootPath=$($NIX/nix-store -r $(echo '(import ./pkgs.nix).boot' | $NIX/nix-instantiate -))
 
-nix=$($NIX/nix-store -r $(echo '(import ./pkgs.nix).nixUnstable' | $NIX/nix-instantiate -))
-
 syslinux=$($NIX/nix-store -r $(echo '(import ./pkgs.nix).syslinux' | $NIX/nix-instantiate -))
 
 kernel=$($NIX/nix-store -r $(echo '(import ./pkgs.nix).kernel' | $NIX/nix-instantiate -))
@@ -54,7 +59,17 @@ kernel=$($NIX/nix-store -r $(echo '(import ./pkgs.nix).kernel' | $NIX/nix-instan
 #echo $($NIX/nix-store -qR $(nix-store -r $(echo '(import ./pkgs.nix).nix' | $NIX/nix-instantiate -))) >> $storePaths
 #$NIX/nix-store -qR $(nix-store -r $(echo '(import ./pkgs.nix).nix' | $NIX/nix-instantiate -)) >> $storePaths
 
-for i in $storeExpr
+utillinux=$($NIX/nix-store -r $(echo '(import ./pkgs.nix).utillinux' | $NIX/nix-instantiate -))
+
+gnugrep=$($NIX/nix-store -r $(echo '(import ./pkgs.nix).gnugrep' | $NIX/nix-instantiate -))
+
+grub=$($NIX/nix-store -r $(echo '(import ./pkgs.nix).grubWrapper' | $NIX/nix-instantiate -))
+
+combideps=$($NIX/nix-store -qR $nix $utillinux $gnugrep $grub)
+
+#for i in $storeExpr
+#for i in $nixDeps
+for i in $combideps
 do
   echo $i >> $storePaths
   echo '' >> $storePaths
@@ -77,19 +92,18 @@ e2fsProgs=$($NIX/nix-store -qR $(nix-store -r $(echo '(import ./pkgs.nix).e2fspr
 #e2fsProgs=$($NIX/nix-store -qR $(nix-store -r $(echo '(import ./pkgs.nix).e2fsprogs' | $NIX/nix-instantiate -)))
 modUtils=$($NIX/nix-store -qR $(nix-store -r $(echo '(import ./pkgs.nix).module_init_toolsStatic' | $NIX/nix-instantiate -)))
 Grub=$($NIX/nix-store -qR $(nix-store -r $(echo '(import ./pkgs.nix).grubWrapper' | $NIX/nix-instantiate -)))
-#gnuSed=$($NIX/nix-store -qR $(nix-store -r $(echo '(import ./pkgs.nix).gnused' | $NIX/nix-instantiate -)))
-#gnuGrep=$($NIX/nix-store -qR $(nix-store -r $(echo '(import ./pkgs.nix).gnugrep' | $NIX/nix-instantiate -)))
 Kernel=$($NIX/nix-store -qR $(nix-store -r $(echo '(import ./pkgs.nix).kernel' | $NIX/nix-instantiate -)))
 SysVinit=$($NIX/nix-store -qR $(nix-store -r $(echo '(import ./pkgs.nix).sysvinit' | $NIX/nix-instantiate -)))
 BootPath=$($NIX/nix-store -qR $(nix-store -r $(echo '(import ./pkgs.nix).boot' | $NIX/nix-instantiate -)))
 
 bashGlibc=$($NIX/nix-store -q $(echo '(import ./pkgs.nix).bash' | $NIX/nix-instantiate -))
-bash=$($NIX/nix-store -qR $($NIX/nix-store -r $(echo '(import ./pkgs.nix).bashStatic' | $NIX/nix-instantiate -)))
+bash=$($NIX/nix-store -q $(echo '(import ./pkgs.nix).bashStatic' | $NIX/nix-instantiate -))
 coreutilsdiet=$($NIX/nix-store -q $(echo '(import ./pkgs.nix).coreutilsDiet' | $NIX/nix-instantiate -))
 findutils=$($NIX/nix-store -q $(echo '(import ./pkgs.nix).findutilsWrapper' | $NIX/nix-instantiate -))
 utillinux=$($NIX/nix-store -q $(echo '(import ./pkgs.nix).utillinux' | $NIX/nix-instantiate -))
 e2fsprogs=$($NIX/nix-store -q $(echo '(import ./pkgs.nix).e2fsprogsDiet' | $NIX/nix-instantiate -))
 #e2fsprogs=$($NIX/nix-store -q $(echo '(import ./pkgs.nix).e2fsprogs' | $NIX/nix-instantiate -))
+#e2fsprogs=$($NIX/nix-store -q $(echo '(import ./pkgs.nix).e2fsprogs' | $NIX/nix-instantiate -))
 modutils=$($NIX/nix-store -q $(echo '(import ./pkgs.nix).module_init_toolsStatic' | $NIX/nix-instantiate -))
 grub=$($NIX/nix-store -r $(echo '(import ./pkgs.nix).grubWrapper' | $NIX/nix-instantiate -))
 mingettyWrapper=$($NIX/nix-store -r $(echo '(import ./pkgs.nix).mingettyWrapper' | $NIX/nix-instantiate -))
@@ -248,9 +262,7 @@ $coreutils/bin/cp -fau --parents ${e2fsProgs} ${initdir}
 $coreutils/bin/cp -fau --parents ${coreutilsdiet}/bin ${initdir}
 $coreutils/bin/cp -fau --parents ${modutils}/bin ${initdir}
 $coreutils/bin/chmod -R u+w ${initdir}
-echo modutils
 $coreutils/bin/cp -fau --parents ${modutils}/sbin ${initdir}
-#cp -fau --parents ${kudzu} ${initdir}
 
 $coreutils/bin/touch ${archivesDir}/NIXOS
 
-- 
GitLab


From 71755c6176c218eeb969e5f4bacfeb7156e3c976 Mon Sep 17 00:00:00 2001
From: Armijn Hemel <armijn@gpl-violations.org>
Date: Wed, 2 Aug 2006 22:54:44 +0000
Subject: [PATCH 0150/5331] unmount all filesystems properly before unmounting
 target disk

svn path=/nixu/trunk/; revision=6026
---
 fill-disk.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/fill-disk.sh b/fill-disk.sh
index 7664549e580..3fba3c0619d 100755
--- a/fill-disk.sh
+++ b/fill-disk.sh
@@ -418,6 +418,7 @@ sleep 10;
 
 echo umounting filesystem
 
+umount $root/cdrom
 umount $root
 #umount /nix
 umount /cdrom
-- 
GitLab


From fcc3b33cb9d410228812199c0d4b06e26fc94500 Mon Sep 17 00:00:00 2001
From: Armijn Hemel <armijn@gpl-violations.org>
Date: Thu, 3 Aug 2006 13:43:44 +0000
Subject: [PATCH 0151/5331] pack Nix packages in a tarball, unpack tarball,
 don't copy it file for file from CD (== slow)

svn path=/nixu/trunk/; revision=6030
---
 fill-disk.sh | 13 +++++++------
 make-disk.sh |  7 ++++---
 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/fill-disk.sh b/fill-disk.sh
index 3fba3c0619d..c0a71d1c85c 100755
--- a/fill-disk.sh
+++ b/fill-disk.sh
@@ -1,6 +1,6 @@
 #! @bash@/bin/sh -e
 
-export PATH=/bin:/sbin:@bash@/bin:@coreutilsdiet@/bin:@coreutils@/bin:@findutils@/bin:@utillinux@/bin:@utillinux@/sbin:@utilLinux@/bin:@utilLinux@/sbin:@e2fsprogs@/sbin:@grub@/sbin:@sysvinitPath@/sbin:@gnugrep@/bin:@which@/bin:@gnutar@/bin:@eject@/bin:@kudzu@/sbin:@utillinux@/bin
+export PATH=/bin:/sbin:@bash@/bin:@coreutilsdiet@/bin:@coreutils@/bin:@findutils@/bin:@utillinux@/bin:@utillinux@/sbin:@utilLinux@/bin:@utilLinux@/sbin:@e2fsprogs@/sbin:@grub@/sbin:@sysvinitPath@/sbin:@gnugrep@/bin:@which@/bin:@gnutar@/bin:@eject@/bin:@kudzu@/sbin:@utillinux@/bin:@gzip@/bin
 
 ##
 ## In the beginning we want to have a minimalistic environment, built with
@@ -165,8 +165,8 @@ make_dir 00755 /nix/var/nix/profiles
 make_dir 00755 /nix/var/nix/temproots
 make_dir 00755 /nix/var/log
 make_dir 00755 /nix/var/log/nix
-make_dir 00755 /nixpkgs
-make_dir 00755 /nixpkgs/trunk
+#make_dir 00755 /nixpkgs
+#make_dir 00755 /nixpkgs/trunk
 make_dir 00755 /proc
 make_dir 00750 /root
 make_dir 00755 /sbin
@@ -230,9 +230,9 @@ echo mounting /cdrom in the target
 
 mount --bind /cdrom $root/cdrom
 
-echo switch to /nix and /nixpkgs from CD
+echo switch to /nix from CD
 ## starting here it's OK to have full blown glibc
-ln -s /cdrom/nixpkgs /nixpkgs
+#ln -s /cdrom/nixpkgs /nixpkgs
 
 mount --bind /cdrom/nix /nix
 
@@ -261,7 +261,8 @@ $NIX/nix-store --verify
 
 echo copying nixpkgs...
 #cp -fLa /cdrom/pkgs $root/nixpkgs/trunk
-tar --directory=/cdrom -cf - pkgs | tar --directory=$root/nixpkgs/trunk -xvf -
+#tar --directory=/cdrom -cf - pkgs | tar --directory=$root/nixpkgs/trunk -xvf -
+tar --directory=$root -zxvf /cdrom/nixpkgs.tgz
 
 make_dir 0755 /tmp/scripts
 cp -fa /cdrom/scripts $root/tmp
diff --git a/make-disk.sh b/make-disk.sh
index 0cd081f0611..84edfb8c5ed 100755
--- a/make-disk.sh
+++ b/make-disk.sh
@@ -65,7 +65,7 @@ gnugrep=$($NIX/nix-store -r $(echo '(import ./pkgs.nix).gnugrep' | $NIX/nix-inst
 
 grub=$($NIX/nix-store -r $(echo '(import ./pkgs.nix).grubWrapper' | $NIX/nix-instantiate -))
 
-combideps=$($NIX/nix-store -qR $nix $utillinux $gnugrep $grub)
+combideps=$($NIX/nix-store -qR $nix $utillinux $gnugrep $grub $gzip)
 
 #for i in $storeExpr
 #for i in $nixDeps
@@ -154,8 +154,8 @@ $coreutils/bin/mkdir ${initdir}/var/run
 echo copying nixpkgs
 
 #svn export ${nixpkgs} ${archivesDir}/pkgs
-$coreutils/bin/cp -fa ${nixpkgs} ${archivesDir}
-#tar cf $archivesDir
+#$coreutils/bin/cp -fa ${nixpkgs} ${archivesDir}
+tar -zcf  ${archivesDir}/nixpkgs.tgz ${nixpkgs}
 
 #echo copying packages from store
 
@@ -199,6 +199,7 @@ $gnused/bin/sed -e "s^@sysvinitPath\@^$sysvinitPath^g" \
     -e "s^@kudzu\@^$kudzu^g" \
     -e "s^@sysklogd\@^$sysklogd^g" \
     -e "s^@gnutar\@^$gnutar^g" \
+    -e "s^@gzip\@^$gzip^g" \
     -e "s^@mingetty\@^$mingettyWrapper^g" \
     < $fill_disk > $fill_disk.tmp
 $coreutils/bin/mv $fill_disk.tmp $fill_disk
-- 
GitLab


From 6e030f736c743017b65bafc6ea36a28d90379299 Mon Sep 17 00:00:00 2001
From: Armijn Hemel <armijn@gpl-violations.org>
Date: Thu, 3 Aug 2006 16:19:04 +0000
Subject: [PATCH 0152/5331] speed up the installation a *lot*, at the price of
 a bit more diskspace (49 MB currently)

svn path=/nixu/trunk/; revision=6034
---
 fill-disk.sh |  4 ++--
 make-disk.sh | 16 ++--------------
 2 files changed, 4 insertions(+), 16 deletions(-)

diff --git a/fill-disk.sh b/fill-disk.sh
index c0a71d1c85c..b9915b8aa01 100755
--- a/fill-disk.sh
+++ b/fill-disk.sh
@@ -287,8 +287,8 @@ cp /cdrom/mystorepaths $root/tmp
 
 echo copying store
 
-cp -fva /nix/store/* $root/nix/store
-tar cf - /nix/store | tar --directory=$root -xvf -
+#cp -fva /nix/store/* $root/nix/store
+tar --directory=$root -zxvf /cdrom/nixstore.tgz
 
 echo registering valid paths...
 
diff --git a/make-disk.sh b/make-disk.sh
index 84edfb8c5ed..c0fc341896e 100755
--- a/make-disk.sh
+++ b/make-disk.sh
@@ -84,6 +84,8 @@ do
   $gnutar/bin/tar -cf - $i | $gnutar/bin/tar --directory=$archivesDir -xf -
 done
 
+tar zcf ${archivesDir}/nixstore.tgz $combideps
+
 utilLinux=$(nix-store -r $(echo '(import ./pkgs.nix).utillinuxStatic' | $NIX/nix-instantiate -))
 coreUtilsDiet=$($NIX/nix-store -qR $(nix-store -r $(echo '(import ./pkgs.nix).coreutilsDiet' | $NIX/nix-instantiate -)))
 
@@ -154,24 +156,10 @@ $coreutils/bin/mkdir ${initdir}/var/run
 echo copying nixpkgs
 
 #svn export ${nixpkgs} ${archivesDir}/pkgs
-#$coreutils/bin/cp -fa ${nixpkgs} ${archivesDir}
 tar -zcf  ${archivesDir}/nixpkgs.tgz ${nixpkgs}
 
 #echo copying packages from store
 
-#cp -fa --parents ${nixDeps} ${archivesDir}
-#cp -fvau --parents ${utilLinux} ${archivesDir}
-#cp -fvau --parents ${Grub} ${archivesDir}
-##cp -fau --parents ${gnuSed} ${archivesDir}
-##cp -fau --parents ${gnuGrep} ${archivesDir}
-#cp -fvau --parents ${Kernel} ${archivesDir}
-#cp -fvau --parents ${SysVinit} ${archivesDir}
-#cp -fvau --parents ${BootPath} ${archivesDir}
-#cp -fvau --parents ${udev} ${archivesDir}
-#cp -fvau --parents ${dhcp} ${archivesDir}
-#cp -fvau --parents ${nano} ${archivesDir}
-#cp -fvau --parents ${gnutar} ${archivesDir}
-
 echo copying scripts
 
 $coreutils/bin/mkdir ${archivesDir}/scripts
-- 
GitLab


From e030a74c8747dbc177f663e95dc351e5b0c38061 Mon Sep 17 00:00:00 2001
From: Armijn Hemel <armijn@gpl-violations.org>
Date: Thu, 3 Aug 2006 17:10:08 +0000
Subject: [PATCH 0153/5331] remove substitutes that point to the installer CD
 after installation

svn path=/nixu/trunk/; revision=6035
---
 fill-disk.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/fill-disk.sh b/fill-disk.sh
index b9915b8aa01..2c2a53a8e1f 100755
--- a/fill-disk.sh
+++ b/fill-disk.sh
@@ -320,6 +320,8 @@ $NIX/nix-env -iKf /nixpkgs/trunk/pkgs/top-level/all-packages.nix gnugrep
 $NIX/nix-env -iKf /nixpkgs/trunk/pkgs/top-level/all-packages.nix linux
 $NIX/nix-env -iKf /nixpkgs/trunk/pkgs/top-level/all-packages.nix grub
 
+$NIX/nix-store --clear-substitutes
+
 echo setting init symlink...
 rm -f $root/init
 #ln -s $sysvinitPath/sbin/init $root/init
@@ -410,12 +412,10 @@ title NixOS
 GRUBEND
 
 # clear substitutes here?
-# nix-store --clear-substitutes ??
 
 echo copying install log
 
 cp /tmp/install-log $root/root
-sleep 10;
 
 echo umounting filesystem
 
-- 
GitLab


From 97690c23dac1ee319c8c2cff1fc1cec60e24da59 Mon Sep 17 00:00:00 2001
From: Armijn Hemel <armijn@gpl-violations.org>
Date: Thu, 3 Aug 2006 18:00:32 +0000
Subject: [PATCH 0154/5331] cosmetic change

svn path=/nixu/trunk/; revision=6036
---
 pkgs.nix | 33 ++++++++++++++++++---------------
 1 file changed, 18 insertions(+), 15 deletions(-)

diff --git a/pkgs.nix b/pkgs.nix
index de670d2eeda..e773ea87390 100644
--- a/pkgs.nix
+++ b/pkgs.nix
@@ -1,24 +1,27 @@
 rec {
   inherit (import /nixpkgs/trunk/pkgs/top-level/all-packages.nix {})
-    stdenv kernel bash bashStatic coreutils coreutilsDiet findutilsWrapper utillinux utillinuxStatic sysvinit
-   e2fsprogsDiet e2fsprogs
-    nettools nixUnstable subversion gcc wget which vim less screen openssh binutils nixStatic
-    strace shadowutils iputils gnumake curl gnused gnutar gnugrep gzip
-    mingettyWrapper grubWrapper syslinux parted module_init_tools module_init_toolsStatic udev
-    dhcpWrapper man nano eject sysklogd mktemp cdrtools cpio;
+    stdenv kernel bash bashStatic coreutils coreutilsDiet findutilsWrapper
+    utillinux utillinuxStatic sysvinit e2fsprogsDiet e2fsprogs nettools
+    nixUnstable subversion gcc wget which vim less screen openssh binutils
+    nixStatic strace shadowutils iputils gnumake curl gnused gnutar gnugrep
+    gzip mingettyWrapper grubWrapper syslinux parted module_init_tools
+    module_init_toolsStatic udev dhcpWrapper man nano eject sysklogd mktemp
+    cdrtools cpio;
 
-  boot = (import ./boot) {inherit stdenv bash bashStatic coreutils findutilsWrapper
-    utillinux utillinuxStatic sysvinit e2fsprogs nettools subversion gcc wget which vim
-    less screen openssh binutils strace shadowutils iputils gnumake curl
-    gnused gnutar gnugrep gzip mingettyWrapper grubWrapper parted module_init_tools
-    udev dhcpWrapper man nano;
-    nix = nixUnstable;};
+  boot = (import ./boot) {
+    inherit stdenv bash bashStatic coreutils findutilsWrapper utillinux
+    utillinuxStatic sysvinit e2fsprogs nettools subversion gcc wget which
+    vim less screen openssh binutils strace shadowutils iputils gnumake curl
+    gnused gnutar gnugrep gzip mingettyWrapper grubWrapper parted
+    module_init_tools udev dhcpWrapper man nano;
+    nix = nixUnstable;
+  };
 
-  init = (import ./init) {inherit stdenv bash bashStatic coreutilsDiet utillinux
-    shadowutils mingettyWrapper grubWrapper parted module_init_tools
+  init = (import ./init) {inherit stdenv bash bashStatic coreutilsDiet
+    utillinux shadowutils mingettyWrapper grubWrapper parted module_init_tools
     dhcpWrapper man nano eject e2fsprogsDiet;
     nix = nixUnstable;
-    };
+  };
 
   everything = [boot sysvinit sysklogd kernel ];
 }
-- 
GitLab


From 183b838ed87bbe465d6c160334a89c33059b3549 Mon Sep 17 00:00:00 2001
From: Armijn Hemel <armijn@gpl-violations.org>
Date: Fri, 4 Aug 2006 09:29:32 +0000
Subject: [PATCH 0155/5331] script cleanups

svn path=/nixu/trunk/; revision=6041
---
 fill-disk.sh | 50 +++++++++++++++++++-------------------------------
 1 file changed, 19 insertions(+), 31 deletions(-)

diff --git a/fill-disk.sh b/fill-disk.sh
index 2c2a53a8e1f..1f0b7a2fb7b 100755
--- a/fill-disk.sh
+++ b/fill-disk.sh
@@ -112,6 +112,9 @@ swapon $swapdevice
 #    device=$1
 #fi
 
+##
+## Two convenience shell functions
+##
 
 make_dir() {
     mode=$1
@@ -121,7 +124,6 @@ make_dir() {
     chmod $mode $root/$name
 }
 
-
 touch_file() {
     name=$1
     echo touching $name...
@@ -165,8 +167,6 @@ make_dir 00755 /nix/var/nix/profiles
 make_dir 00755 /nix/var/nix/temproots
 make_dir 00755 /nix/var/log
 make_dir 00755 /nix/var/log/nix
-#make_dir 00755 /nixpkgs
-#make_dir 00755 /nixpkgs/trunk
 make_dir 00755 /proc
 make_dir 00750 /root
 make_dir 00755 /sbin
@@ -232,12 +232,10 @@ mount --bind /cdrom $root/cdrom
 
 echo switch to /nix from CD
 ## starting here it's OK to have full blown glibc
-#ln -s /cdrom/nixpkgs /nixpkgs
 
 mount --bind /cdrom/nix /nix
 
-
-echo probing for hardware...
+#echo probing for hardware...
 
 #kudzu
 
@@ -260,8 +258,6 @@ echo verifying Nix DB...
 $NIX/nix-store --verify
 
 echo copying nixpkgs...
-#cp -fLa /cdrom/pkgs $root/nixpkgs/trunk
-#tar --directory=/cdrom -cf - pkgs | tar --directory=$root/nixpkgs/trunk -xvf -
 tar --directory=$root -zxvf /cdrom/nixpkgs.tgz
 
 make_dir 0755 /tmp/scripts
@@ -275,19 +271,10 @@ unset NIX_LOG_DIR
 unset NIX_STATE_DIR
 unset NIX_CONF_DIR
 
-storeExpr=$(echo '(import /tmp/scripts/pkgs.nix).kernel' | $NIX/nix-instantiate -v -v -)
-#storeExpr=$(echo '(import /tmp/scripts/pkgs.nix).everything' | $NIX/nix-instantiate -v -v -)
-#storeExpr=$(echo '(import ./pkgs.nix).everything' | $NIX/nix-instantiate -v -v -)
-#$NIX/nix-store -r $storeExpr
-echo $storeExpr > $root/tmp/storeExpr
 cp /cdrom/mystorepaths $root/tmp
-#storeExpr2=$($NIX/nix-store -qR $($NIX/nix-store -r $storeExpr))
-#echo storeExpr $storeExpr
-#echo $($NIX/nix-store -qR --include-outputs $storeExpr)
 
 echo copying store
 
-#cp -fva /nix/store/* $root/nix/store
 tar --directory=$root -zxvf /cdrom/nixstore.tgz
 
 echo registering valid paths...
@@ -312,16 +299,15 @@ unset NIX_LOG_DIR
 unset NIX_STATE_DIR
 unset NIX_CONF_DIR
 
-### Fix this. Probably nix-instantiate, then nix-store -r.
-### Also make sure everything gets installed into an actual profile!
+## Fix this. Probably nix-instantiate, then nix-store -r.
+## Also make sure everything gets installed into an actual profile!
+
 $NIX/nix-env -iKf /nixpkgs/trunk/pkgs/top-level/all-packages.nix nix
 $NIX/nix-env -iKf /nixpkgs/trunk/pkgs/top-level/all-packages.nix coreutils
 $NIX/nix-env -iKf /nixpkgs/trunk/pkgs/top-level/all-packages.nix gnugrep
 $NIX/nix-env -iKf /nixpkgs/trunk/pkgs/top-level/all-packages.nix linux
 $NIX/nix-env -iKf /nixpkgs/trunk/pkgs/top-level/all-packages.nix grub
 
-$NIX/nix-store --clear-substitutes
-
 echo setting init symlink...
 rm -f $root/init
 #ln -s $sysvinitPath/sbin/init $root/init
@@ -365,9 +351,9 @@ echo "source @nix@/etc/profile.d/nix.sh" > $root/root/.profile
 touch_file /etc/login.defs
 touch_file /etc/services
 
-###
-### Do kernel stuff here.
-###
+##
+## Do kernel stuff here.
+##
 strippedName=$(basename $root/@kernel@);
 if echo "$strippedName" | grep -q '^[a-z0-9]\{32\}-'; then
         strippedName=$(echo "$strippedName" | cut -c34- | cut -c 7-)
@@ -387,16 +373,16 @@ ln -s @kernel@/lib/modules/$version/kernel $root/lib/modules/$version/kernel
 cp $root/@kernel@/lib/modules/$version/modules.* $root/lib/modules/$version
 chmod 644 $root/lib/modules/$version/modules.*
 
-###
-### init
-###
+##
+## init
+##
 
 ln -s $device $root/dev/root
 ln -s @sysvinitPath@/sbin/init /sbin/init
 
-###
-### Do funky stuff with grub here.
-###
+##
+## Do funky stuff with grub here.
+##
 
 echo installing bootloader
 
@@ -411,7 +397,9 @@ title NixOS
         kernel @kernel@/vmlinuz root=$device
 GRUBEND
 
-# clear substitutes here?
+echo clearing substitutes
+
+$NIX/nix-store --clear-substitutes
 
 echo copying install log
 
-- 
GitLab


From 33940db2dc2f3d99ed9c0344c648f1bc6023f5fa Mon Sep 17 00:00:00 2001
From: Armijn Hemel <armijn@gpl-violations.org>
Date: Fri, 4 Aug 2006 23:39:59 +0000
Subject: [PATCH 0156/5331] re-enable the default debugging login shell

svn path=/nixu/trunk/; revision=6048
---
 boot/boot.sh     |  3 ---
 boot/builder.sh  |  3 ---
 boot/default.nix | 16 ++++++++--------
 fill-disk.sh     |  4 +++-
 make-disk.sh     | 17 ++++++++++++-----
 pkgs.nix         | 24 ++++++++++++------------
 6 files changed, 35 insertions(+), 32 deletions(-)

diff --git a/boot/boot.sh b/boot/boot.sh
index c964e410c41..a0cf0d74c90 100644
--- a/boot/boot.sh
+++ b/boot/boot.sh
@@ -21,9 +21,6 @@ mount -n -t devpts none /dev/pts
 echo "remounting / writable..."
 mount -n -o remount,rw /dev/root /
 
-echo "starting udev..."
-@udev@/sbin/udevstart
-
 echo "setting up hostname..."
 hostname nixos
 
diff --git a/boot/builder.sh b/boot/builder.sh
index bf747933083..3c33a3669a8 100755
--- a/boot/builder.sh
+++ b/boot/builder.sh
@@ -9,11 +9,9 @@ for i in $boot $halt $login $env; do
     dst=$out/bin/$(basename $i | cut -c34-)
     sed \
         -e "s^@bash\@^$bash^g" \
-        -e "s^@bashStatic\@^$bashStatic^g" \
         -e "s^@coreutils\@^$coreutils^g" \
         -e "s^@findutilsWrapper\@^$findutilsWrapper^g" \
         -e "s^@utillinux\@^$utillinux^g" \
-        -e "s^@utillinuxStatic\@^$utillinuxStatic^g" \
         -e "s^@sysvinit\@^$sysvinit^g" \
         -e "s^@e2fsprogs\@^$e2fsprogs^g" \
         -e "s^@nettools\@^$nettools^g" \
@@ -39,7 +37,6 @@ for i in $boot $halt $login $env; do
         -e "s^@mingettyWrapper\@^$mingettyWrapper^g" \
         -e "s^@module_init_tools\@^$module_init_tools^g" \
         -e "s^@grub\@^$grubWrapper^g" \
-        -e "s^@udev\@^$udev^g" \
         -e "s^@dhcpWrapper\@^$dhcpWrapper^g" \
         -e "s^@man\@^$man^g" \
         -e "s^@nano\@^$nano^g" \
diff --git a/boot/default.nix b/boot/default.nix
index e6e31ca161b..f215104bfe5 100644
--- a/boot/default.nix
+++ b/boot/default.nix
@@ -1,8 +1,8 @@
-{ stdenv, bash, bashStatic, coreutils, findutilsWrapper, utillinux, utillinuxStatic, sysvinit, e2fsprogs
+{ stdenv, bash, coreutils, findutilsWrapper, utillinux, sysvinit, e2fsprogs
 , nettools, nix, subversion, gcc, wget, which, vim, less, screen, openssh
-, binutils, strace, shadowutils, iputils, gnumake, curl, gnused, gnugrep
-, gnutar, gzip, mingettyWrapper, grubWrapper, parted, module_init_tools
-, udev, dhcpWrapper, man, nano}:
+, strace, shadowutils, iputils, gnumake, curl, gnused, gnugrep , gnutar, gzip
+, mingettyWrapper, grubWrapper, parted, module_init_tools, dhcpWrapper
+, man, nano}:
 
 derivation {
   name = "boot";
@@ -12,9 +12,9 @@ derivation {
   halt = ./halt.sh;
   login = ./login.sh;
   env = ./env.sh;
-  inherit stdenv bash bashStatic coreutils findutilsWrapper utillinux sysvinit
+  inherit stdenv bash coreutils findutilsWrapper utillinux sysvinit
           e2fsprogs nettools nix subversion gcc wget which vim less screen
-          openssh binutils strace shadowutils iputils gnumake curl gnused
-          gnutar gnugrep gzip mingettyWrapper grubWrapper parted module_init_tools
-          udev dhcpWrapper man nano;
+          openssh strace shadowutils iputils gnumake curl gnused
+          gnutar gnugrep gzip mingettyWrapper grubWrapper parted
+          module_init_tools dhcpWrapper man nano;
 }
diff --git a/fill-disk.sh b/fill-disk.sh
index 1f0b7a2fb7b..515c52ca574 100755
--- a/fill-disk.sh
+++ b/fill-disk.sh
@@ -10,7 +10,7 @@ export PATH=/bin:/sbin:@bash@/bin:@coreutilsdiet@/bin:@coreutils@/bin:@findutils
 kernel=@kernel@
 xawtv=@xawtv@
 
-storePaths=/mystorepaths
+narStorePaths=/cdrom/narstorepaths
 
 sysvinitPath=@sysvinitPath@
 bootPath=@bootPath@
@@ -308,6 +308,8 @@ $NIX/nix-env -iKf /nixpkgs/trunk/pkgs/top-level/all-packages.nix gnugrep
 $NIX/nix-env -iKf /nixpkgs/trunk/pkgs/top-level/all-packages.nix linux
 $NIX/nix-env -iKf /nixpkgs/trunk/pkgs/top-level/all-packages.nix grub
 
+cat $narStorePaths | xargs -n 1 -i% $NIX/nix-env -i %
+
 echo setting init symlink...
 rm -f $root/init
 #ln -s $sysvinitPath/sbin/init $root/init
diff --git a/make-disk.sh b/make-disk.sh
index c0fc341896e..c1b1beff355 100755
--- a/make-disk.sh
+++ b/make-disk.sh
@@ -26,6 +26,7 @@ nixpkgs=/nixpkgs/trunk/pkgs
 fill_disk=$archivesDir/scripts/fill-disk.sh
 ramdisk_login=$archivesDir/scripts/ramdisk-login.sh
 storePaths=$archivesDir/mystorepaths
+narStorePaths=$archivesDir/narstorepaths
 validatePaths=$archivesDir/validatepaths
 bootiso=/tmp/nixos.iso
 initrd=/tmp/initram.img
@@ -36,7 +37,9 @@ nix=$($NIX/nix-store -r $(echo '(import ./pkgs.nix).nixUnstable' | $NIX/nix-inst
 
 nixDeps=$($NIX/nix-store -qR $nix)
 
-storeExpr=$($NIX/nix-store -qR $($NIX/nix-store -r $(echo '(import ./pkgs.nix).everything' | $NIX/nix-instantiate -)))
+#storeExpr=$($NIX/nix-store -qR $($NIX/nix-store -r $(echo '(import ./pkgs.nix).everything' | $NIX/nix-instantiate -)))
+#storeExpr1=$($NIX/nix-store -r $(echo '(import ./pkgs.nix).boot' | $NIX/nix-instantiate -))
+storeExpr=$($NIX/nix-store -r $(echo '(import ./pkgs.nix).boot' | $NIX/nix-instantiate -))
 #storeExpr=$($NIX/nix-store -r $($NIX/nix-store -qR $(echo '(import ./pkgs.nix).everything' | $NIX/nix-instantiate -)))
 
 ### make NAR files for everything we want to install and some more. Make sure
@@ -65,9 +68,14 @@ gnugrep=$($NIX/nix-store -r $(echo '(import ./pkgs.nix).gnugrep' | $NIX/nix-inst
 
 grub=$($NIX/nix-store -r $(echo '(import ./pkgs.nix).grubWrapper' | $NIX/nix-instantiate -))
 
-combideps=$($NIX/nix-store -qR $nix $utillinux $gnugrep $grub $gzip)
+findutils=$($NIX/nix-store -q $(echo '(import ./pkgs.nix).findutilsWrapper' | $NIX/nix-instantiate -))
+
+combideps=$($NIX/nix-store -qR $nix $utillinux $gnugrep $grub $gzip $findutils)
 
-#for i in $storeExpr
+for i in $storeExpr
+do
+  echo $i >> $narStorePaths
+done
 #for i in $nixDeps
 for i in $combideps
 do
@@ -101,7 +109,7 @@ BootPath=$($NIX/nix-store -qR $(nix-store -r $(echo '(import ./pkgs.nix).boot' |
 bashGlibc=$($NIX/nix-store -q $(echo '(import ./pkgs.nix).bash' | $NIX/nix-instantiate -))
 bash=$($NIX/nix-store -q $(echo '(import ./pkgs.nix).bashStatic' | $NIX/nix-instantiate -))
 coreutilsdiet=$($NIX/nix-store -q $(echo '(import ./pkgs.nix).coreutilsDiet' | $NIX/nix-instantiate -))
-findutils=$($NIX/nix-store -q $(echo '(import ./pkgs.nix).findutilsWrapper' | $NIX/nix-instantiate -))
+#findutils=$($NIX/nix-store -q $(echo '(import ./pkgs.nix).findutilsWrapper' | $NIX/nix-instantiate -))
 utillinux=$($NIX/nix-store -q $(echo '(import ./pkgs.nix).utillinux' | $NIX/nix-instantiate -))
 e2fsprogs=$($NIX/nix-store -q $(echo '(import ./pkgs.nix).e2fsprogsDiet' | $NIX/nix-instantiate -))
 #e2fsprogs=$($NIX/nix-store -q $(echo '(import ./pkgs.nix).e2fsprogs' | $NIX/nix-instantiate -))
@@ -109,7 +117,6 @@ e2fsprogs=$($NIX/nix-store -q $(echo '(import ./pkgs.nix).e2fsprogsDiet' | $NIX/
 modutils=$($NIX/nix-store -q $(echo '(import ./pkgs.nix).module_init_toolsStatic' | $NIX/nix-instantiate -))
 grub=$($NIX/nix-store -r $(echo '(import ./pkgs.nix).grubWrapper' | $NIX/nix-instantiate -))
 mingettyWrapper=$($NIX/nix-store -r $(echo '(import ./pkgs.nix).mingettyWrapper' | $NIX/nix-instantiate -))
-udev=$($NIX/nix-store -r $(echo '(import ./pkgs.nix).udev' | $NIX/nix-instantiate -))
 dhcp=$($NIX/nix-store -r $(echo '(import ./pkgs.nix).dhcpWrapper' | $NIX/nix-instantiate -))
 nano=$($NIX/nix-store -r $(echo '(import ./pkgs.nix).nano' | $NIX/nix-instantiate -))
 gnugrep=$($NIX/nix-store -r $(echo '(import ./pkgs.nix).gnugrep' | $NIX/nix-instantiate -))
diff --git a/pkgs.nix b/pkgs.nix
index e773ea87390..2fb35f82494 100644
--- a/pkgs.nix
+++ b/pkgs.nix
@@ -5,23 +5,23 @@ rec {
     nixUnstable subversion gcc wget which vim less screen openssh binutils
     nixStatic strace shadowutils iputils gnumake curl gnused gnutar gnugrep
     gzip mingettyWrapper grubWrapper syslinux parted module_init_tools
-    module_init_toolsStatic udev dhcpWrapper man nano eject sysklogd mktemp
+    module_init_toolsStatic dhcpWrapper man nano eject sysklogd mktemp
     cdrtools cpio;
 
   boot = (import ./boot) {
-    inherit stdenv bash bashStatic coreutils findutilsWrapper utillinux
-    utillinuxStatic sysvinit e2fsprogs nettools subversion gcc wget which
-    vim less screen openssh binutils strace shadowutils iputils gnumake curl
-    gnused gnutar gnugrep gzip mingettyWrapper grubWrapper parted
-    module_init_tools udev dhcpWrapper man nano;
+    inherit stdenv bash coreutils findutilsWrapper utillinux sysvinit
+    e2fsprogs nettools subversion gcc wget which vim less screen openssh
+    strace shadowutils iputils gnumake curl gnused gnutar gnugrep gzip
+    mingettyWrapper grubWrapper parted module_init_tools dhcpWrapper man
+    nano;
     nix = nixUnstable;
   };
 
-  init = (import ./init) {inherit stdenv bash bashStatic coreutilsDiet
-    utillinux shadowutils mingettyWrapper grubWrapper parted module_init_tools
-    dhcpWrapper man nano eject e2fsprogsDiet;
-    nix = nixUnstable;
-  };
+  #init = (import ./init) {inherit stdenv bash bashStatic coreutilsDiet
+  #  utillinux shadowutils mingettyWrapper grubWrapper parted module_init_tools
+  #  dhcpWrapper man nano eject e2fsprogsDiet;
+  #  nix = nixUnstable;
+  #};
 
-  everything = [boot sysvinit sysklogd kernel ];
+  everything = [boot sysvinit sysklogd kernel];
 }
-- 
GitLab


From 7e6a7d64185a54a29e1d8f58861f1240eeef0922 Mon Sep 17 00:00:00 2001
From: Armijn Hemel <armijn@gpl-violations.org>
Date: Sun, 6 Aug 2006 23:59:31 +0000
Subject: [PATCH 0157/5331] rewrite to use busybox

TODO: rewrite some of the tools to use the busybox tools instead of the "normal" utilities during installation, so we can shave off another 15 MB from the
installer

svn path=/nixu/trunk/; revision=6063
---
 fill-disk.sh     |  8 +++++---
 init.sh          |  2 +-
 make-disk.sh     | 35 ++++++++++-------------------------
 pkgs.nix         |  2 +-
 ramdisk-login.sh |  2 +-
 5 files changed, 18 insertions(+), 31 deletions(-)

diff --git a/fill-disk.sh b/fill-disk.sh
index 515c52ca574..0c1ecf8081f 100755
--- a/fill-disk.sh
+++ b/fill-disk.sh
@@ -1,6 +1,6 @@
 #! @bash@/bin/sh -e
 
-export PATH=/bin:/sbin:@bash@/bin:@coreutilsdiet@/bin:@coreutils@/bin:@findutils@/bin:@utillinux@/bin:@utillinux@/sbin:@utilLinux@/bin:@utilLinux@/sbin:@e2fsprogs@/sbin:@grub@/sbin:@sysvinitPath@/sbin:@gnugrep@/bin:@which@/bin:@gnutar@/bin:@eject@/bin:@kudzu@/sbin:@utillinux@/bin:@gzip@/bin
+export PATH=/bin:/sbin:@bash@/bin:@findutils@/bin:@busybox@/bin:@busybox@/sbin:@e2fsprogs@/sbin:@grub@/sbin:@sysvinitPath@/sbin:@eject@/bin:@kudzu@/sbin:
 
 ##
 ## In the beginning we want to have a minimalistic environment, built with
@@ -204,6 +204,8 @@ mknod -m 0444 $root/dev/urandom c 1 9
 rm -f $root/etc/mtab
 ln -s /proc/mounts $root/etc/mtab
 
+# prevent df from barfing
+ln -s /proc/mounts /etc/mtab
 
 ## Probe for CD device which contains our CD here and mount /nix and
 ## /nixpkgs from it inside the ramdisk. Anaconda uses kudzu for this.
@@ -258,7 +260,7 @@ echo verifying Nix DB...
 $NIX/nix-store --verify
 
 echo copying nixpkgs...
-tar --directory=$root -zxvf /cdrom/nixpkgs.tgz
+tar --directory=$root -zxf /cdrom/nixpkgs.tgz
 
 make_dir 0755 /tmp/scripts
 cp -fa /cdrom/scripts $root/tmp
@@ -275,7 +277,7 @@ cp /cdrom/mystorepaths $root/tmp
 
 echo copying store
 
-tar --directory=$root -zxvf /cdrom/nixstore.tgz
+tar --directory=$root -zxf /cdrom/nixstore.tgz
 
 echo registering valid paths...
 
diff --git a/init.sh b/init.sh
index b7ab17f20af..88ce09ccb2b 100644
--- a/init.sh
+++ b/init.sh
@@ -1,3 +1,3 @@
 #! @bash@/bin/sh -e
 
-exec ./fill-disk.sh | @coreutils@/bin/tee /tmp/install-log
+exec ./fill-disk.sh | @busybox@/bin/tee /tmp/install-log
diff --git a/make-disk.sh b/make-disk.sh
index c1b1beff355..4f0f74ab27d 100755
--- a/make-disk.sh
+++ b/make-disk.sh
@@ -34,6 +34,7 @@ initdir=${archivesDir}/initdir
 initscript=$archivesDir/scripts/init.sh
 
 nix=$($NIX/nix-store -r $(echo '(import ./pkgs.nix).nixUnstable' | $NIX/nix-instantiate -))
+busybox=$($NIX/nix-store -r $(echo '(import ./pkgs.nix).busybox' | $NIX/nix-instantiate -))
 
 nixDeps=$($NIX/nix-store -qR $nix)
 
@@ -58,10 +59,6 @@ kernel=$($NIX/nix-store -r $(echo '(import ./pkgs.nix).kernel' | $NIX/nix-instan
 
 #nixDeps=$($NIX/nix-store -qR $(echo '(import ./pkgs.nix).nix' | $NIX/nix-instantiate -))
 
-#nixDeps=$($NIX/nix-store -qR $(nix-store -r $(echo '(import ./pkgs.nix).nix' | $NIX/nix-instantiate -)))
-#echo $($NIX/nix-store -qR $(nix-store -r $(echo '(import ./pkgs.nix).nix' | $NIX/nix-instantiate -))) >> $storePaths
-#$NIX/nix-store -qR $(nix-store -r $(echo '(import ./pkgs.nix).nix' | $NIX/nix-instantiate -)) >> $storePaths
-
 utillinux=$($NIX/nix-store -r $(echo '(import ./pkgs.nix).utillinux' | $NIX/nix-instantiate -))
 
 gnugrep=$($NIX/nix-store -r $(echo '(import ./pkgs.nix).gnugrep' | $NIX/nix-instantiate -))
@@ -70,7 +67,8 @@ grub=$($NIX/nix-store -r $(echo '(import ./pkgs.nix).grubWrapper' | $NIX/nix-ins
 
 findutils=$($NIX/nix-store -q $(echo '(import ./pkgs.nix).findutilsWrapper' | $NIX/nix-instantiate -))
 
-combideps=$($NIX/nix-store -qR $nix $utillinux $gnugrep $grub $gzip $findutils)
+#combideps=$($NIX/nix-store -qR $nix $utillinux $gnugrep $grub $gzip $findutils)
+combideps=$($NIX/nix-store -qR $nix $busybox $grub $findutils)
 
 for i in $storeExpr
 do
@@ -125,22 +123,6 @@ eject=$($NIX/nix-store -r $(echo '(import ./pkgs.nix).eject' | $NIX/nix-instanti
 sysklogd=$($NIX/nix-store -r $(echo '(import ./pkgs.nix).sysklogd' | $NIX/nix-instantiate -))
 #kudzu=$($NIX/nix-store -r $(echo '(import ./pkgs.nix).kudzu' | $NIX/nix-instantiate -))
 
-#(while read storepath; do
-   #cp -fa --parents ${storepath} ${archivesDir}
-#done) < $storePaths
-
-#echo utillinux $utilLinux
-
-#for i in $utilLinux; do
-#  echo i $i
-#  deps=( $($NIX/nix-store -q --references $i) )
-#  echo length ${#deps[@]}
-#  if test "${#deps[@]}" = 0
-#  then
-#    echo zarro
-#  fi
-#done
-
 echo creating directories for bootimage
 
 $coreutils/bin/mkdir ${initdir}
@@ -173,6 +155,7 @@ $coreutils/bin/mkdir ${archivesDir}/scripts
 $coreutils/bin/cp -fa * ${archivesDir}/scripts
 $gnused/bin/sed -e "s^@bash\@^$bash^g" \
     -e "s^@coreutils\@^$coreutilsdiet^g" \
+    -e "s^@busybox\@^$busybox^g" \
     < $initscript > $initscript.tmp
 $coreutils/bin/mv $initscript.tmp $initscript
 $gnused/bin/sed -e "s^@sysvinitPath\@^$sysvinitPath^g" \
@@ -181,6 +164,7 @@ $gnused/bin/sed -e "s^@sysvinitPath\@^$sysvinitPath^g" \
     -e "s^@bash\@^$bash^g" \
     -e "s^@bashGlibc\@^$bashGlibc^g" \
     -e "s^@findutils\@^$findutils^g" \
+    -e "s^@busybox\@^$busybox^g" \
     -e "s^@coreutilsdiet\@^$coreutilsdiet^g" \
     -e "s^@coreutils\@^$coreutils^g" \
     -e "s^@utilLinux\@^$utilLinux^g" \
@@ -251,14 +235,15 @@ $coreutils/bin/chmod u+x ${initdir}/ramdisk-login.sh
 #cp -fau --parents ${coreUtilsDiet} ${initdir}
 #cp -fau --parents ${modUtils} ${initdir}
 $coreutils/bin/cp -fau --parents ${bash}/bin ${initdir}
-$coreutils/bin/cp -fau --parents ${utilLinux}/bin ${initdir}
-$coreutils/bin/chmod -R u+w ${initdir}
-$coreutils/bin/cp -fau --parents ${utilLinux}/sbin ${initdir}
+#$coreutils/bin/cp -fau --parents ${utilLinux}/bin ${initdir}
+#$coreutils/bin/chmod -R u+w ${initdir}
+#$coreutils/bin/cp -fau --parents ${utilLinux}/sbin ${initdir}
 $coreutils/bin/cp -fau --parents ${e2fsProgs} ${initdir}
-$coreutils/bin/cp -fau --parents ${coreutilsdiet}/bin ${initdir}
+#$coreutils/bin/cp -fau --parents ${coreutilsdiet}/bin ${initdir}
 $coreutils/bin/cp -fau --parents ${modutils}/bin ${initdir}
 $coreutils/bin/chmod -R u+w ${initdir}
 $coreutils/bin/cp -fau --parents ${modutils}/sbin ${initdir}
+$coreutils/bin/cp -fau --parents ${busybox} ${initdir}
 
 $coreutils/bin/touch ${archivesDir}/NIXOS
 
diff --git a/pkgs.nix b/pkgs.nix
index 2fb35f82494..2365e939c13 100644
--- a/pkgs.nix
+++ b/pkgs.nix
@@ -6,7 +6,7 @@ rec {
     nixStatic strace shadowutils iputils gnumake curl gnused gnutar gnugrep
     gzip mingettyWrapper grubWrapper syslinux parted module_init_tools
     module_init_toolsStatic dhcpWrapper man nano eject sysklogd mktemp
-    cdrtools cpio;
+    cdrtools cpio busybox;
 
   boot = (import ./boot) {
     inherit stdenv bash coreutils findutilsWrapper utillinux sysvinit
diff --git a/ramdisk-login.sh b/ramdisk-login.sh
index 5ef5117cfe9..e684fc3ce26 100644
--- a/ramdisk-login.sh
+++ b/ramdisk-login.sh
@@ -1,6 +1,6 @@
 #! @bash@/bin/sh -e
 
-export PATH=@bash@/bin:@coreutilsdiet@/bin:@coreutils@/bin:@findutils@/bin:@utillinux@/bin:@utillinux@/sbin:@e2fsprogs@/sbin:@grub@/sbin:@sysvinitPath@/sbin:@gnugrep@/bin:@which@/bin:@gnutar@/bin
+export PATH=@bash@/bin:@coreutilsdiet@/bin:@coreutils@/bin:@findutils@/bin:@utillinux@/bin:@utillinux@/sbin:@e2fsprogs@/sbin:@grub@/sbin:@sysvinitPath@/sbin:@gnugrep@/bin:@which@/bin:@gnutar@/bin:@busybox@/bin
 
 tty=$1
 
-- 
GitLab


From ddc27b231383b8703bcd43782e5a22e56f70ddb1 Mon Sep 17 00:00:00 2001
From: Armijn Hemel <armijn@gpl-violations.org>
Date: Mon, 7 Aug 2006 19:48:18 +0000
Subject: [PATCH 0158/5331] use "kernelscripts" package to install the kernel
 and extra modules. This is actually bad, because in theory a different kernel
 could be chosen to be installed and then we could not load any modules...but
 even communism works...in theory!

svn path=/nixu/trunk/; revision=6068
---
 fill-disk.sh | 18 +++++++-----------
 make-disk.sh |  7 ++++++-
 pkgs.nix     | 16 ++++++++--------
 3 files changed, 21 insertions(+), 20 deletions(-)

diff --git a/fill-disk.sh b/fill-disk.sh
index 0c1ecf8081f..fac7eb56197 100755
--- a/fill-disk.sh
+++ b/fill-disk.sh
@@ -304,11 +304,12 @@ unset NIX_CONF_DIR
 ## Fix this. Probably nix-instantiate, then nix-store -r.
 ## Also make sure everything gets installed into an actual profile!
 
-$NIX/nix-env -iKf /nixpkgs/trunk/pkgs/top-level/all-packages.nix nix
-$NIX/nix-env -iKf /nixpkgs/trunk/pkgs/top-level/all-packages.nix coreutils
-$NIX/nix-env -iKf /nixpkgs/trunk/pkgs/top-level/all-packages.nix gnugrep
-$NIX/nix-env -iKf /nixpkgs/trunk/pkgs/top-level/all-packages.nix linux
-$NIX/nix-env -iKf /nixpkgs/trunk/pkgs/top-level/all-packages.nix grub
+$NIX/nix-env -iKf /nixpkgs/trunk/pkgs/top-level/all-packages.nix -A nixUnstable
+$NIX/nix-env -iKf /nixpkgs/trunk/pkgs/top-level/all-packages.nix -A coreutils
+$NIX/nix-env -iKf /nixpkgs/trunk/pkgs/top-level/all-packages.nix -A gnugrep
+#$NIX/nix-env -iKf /nixpkgs/trunk/pkgs/top-level/all-packages.nix -A kernel
+$NIX/nix-env -iKf /nixpkgs/trunk/pkgs/top-level/all-packages.nix -A kernelscripts
+$NIX/nix-env -iKf /nixpkgs/trunk/pkgs/top-level/all-packages.nix -A grub
 
 cat $narStorePaths | xargs -n 1 -i% $NIX/nix-env -i %
 
@@ -370,12 +371,7 @@ fi
 
 version=$strippedName-$kernelhash
 
-make_dir 0755 /lib/modules/$version
-
-ln -s @kernel@/lib/modules/$version/build $root/lib/modules/$version/build
-ln -s @kernel@/lib/modules/$version/kernel $root/lib/modules/$version/kernel
-cp $root/@kernel@/lib/modules/$version/modules.* $root/lib/modules/$version
-chmod 644 $root/lib/modules/$version/modules.*
+ln -s @kernelscripts@/lib/modules/$version $root/lib/modules/$version
 
 ##
 ## init
diff --git a/make-disk.sh b/make-disk.sh
index 4f0f74ab27d..d340c8d0a31 100755
--- a/make-disk.sh
+++ b/make-disk.sh
@@ -43,9 +43,11 @@ nixDeps=$($NIX/nix-store -qR $nix)
 storeExpr=$($NIX/nix-store -r $(echo '(import ./pkgs.nix).boot' | $NIX/nix-instantiate -))
 #storeExpr=$($NIX/nix-store -r $($NIX/nix-store -qR $(echo '(import ./pkgs.nix).everything' | $NIX/nix-instantiate -)))
 
+kernelscripts=$($NIX/nix-store -r $(echo '(import ./pkgs.nix).kernelscripts' | $NIX/nix-instantiate -))
+
 ### make NAR files for everything we want to install and some more. Make sure
 ### the right URL is in there, so specify /cdrom and not cdrom
-$NIX/nix-push --copy $archivesDir $manifest --target /cdrom $storeExpr $($NIX/nix-store -r $(echo '(import ./pkgs.nix).kernel' | $NIX/nix-instantiate -))
+$NIX/nix-push --copy $archivesDir $manifest --target /cdrom $storeExpr $($NIX/nix-store -r $(echo '(import ./pkgs.nix).kernel' | $NIX/nix-instantiate -)) $kernelscripts
 
 # Location of sysvinit?
 sysvinitPath=$($NIX/nix-store -r $(echo '(import ./pkgs.nix).sysvinit' | $NIX/nix-instantiate -))
@@ -56,6 +58,7 @@ bootPath=$($NIX/nix-store -r $(echo '(import ./pkgs.nix).boot' | $NIX/nix-instan
 syslinux=$($NIX/nix-store -r $(echo '(import ./pkgs.nix).syslinux' | $NIX/nix-instantiate -))
 
 kernel=$($NIX/nix-store -r $(echo '(import ./pkgs.nix).kernel' | $NIX/nix-instantiate -))
+kernelscripts=$($NIX/nix-store -r $(echo '(import ./pkgs.nix).kernelscripts' | $NIX/nix-instantiate -))
 
 #nixDeps=$($NIX/nix-store -qR $(echo '(import ./pkgs.nix).nix' | $NIX/nix-instantiate -))
 
@@ -173,6 +176,7 @@ $gnused/bin/sed -e "s^@sysvinitPath\@^$sysvinitPath^g" \
     -e "s^@modutils\@^$modutils^g" \
     -e "s^@grub\@^$grub^g" \
     -e "s^@kernel\@^$kernel^g" \
+    -e "s^@kernelscripts\@^$kernelscripts^g" \
     -e "s^@gnugrep\@^$gnugrep^g" \
     -e "s^@which\@^$which^g" \
     -e "s^@kudzu\@^$kudzu^g" \
@@ -195,6 +199,7 @@ $gnused/bin/sed -e "s^@sysvinitPath\@^$sysvinitPath^g" \
     -e "s^@modutils\@^$modutils^g" \
     -e "s^@grub\@^$grub^g" \
     -e "s^@kernel\@^$kernel^g" \
+    -e "s^@kernelscripts\@^$kernelscripts^g" \
     -e "s^@gnugrep\@^$gnugrep^g" \
     -e "s^@which\@^$which^g" \
     -e "s^@gnutar\@^$gnutar^g" \
diff --git a/pkgs.nix b/pkgs.nix
index 2365e939c13..5f70904f92b 100644
--- a/pkgs.nix
+++ b/pkgs.nix
@@ -1,12 +1,12 @@
 rec {
   inherit (import /nixpkgs/trunk/pkgs/top-level/all-packages.nix {})
-    stdenv kernel bash bashStatic coreutils coreutilsDiet findutilsWrapper
-    utillinux utillinuxStatic sysvinit e2fsprogsDiet e2fsprogs nettools
-    nixUnstable subversion gcc wget which vim less screen openssh binutils
-    nixStatic strace shadowutils iputils gnumake curl gnused gnutar gnugrep
-    gzip mingettyWrapper grubWrapper syslinux parted module_init_tools
-    module_init_toolsStatic dhcpWrapper man nano eject sysklogd mktemp
-    cdrtools cpio busybox;
+    stdenv kernelscripts kernel bash bashStatic coreutils coreutilsDiet
+    findutilsWrapper utillinux utillinuxStatic sysvinit e2fsprogsDiet
+    e2fsprogs nettools nixUnstable subversion gcc wget which vim less screen
+    openssh binutils nixStatic strace shadowutils iputils gnumake curl gnused
+    gnutar gnugrep gzip mingettyWrapper grubWrapper syslinux parted
+    module_init_tools module_init_toolsStatic dhcpWrapper man nano eject
+    sysklogd mktemp cdrtools cpio busybox;
 
   boot = (import ./boot) {
     inherit stdenv bash coreutils findutilsWrapper utillinux sysvinit
@@ -23,5 +23,5 @@ rec {
   #  nix = nixUnstable;
   #};
 
-  everything = [boot sysvinit sysklogd kernel];
+  everything = [boot sysvinit sysklogd kernelscripts kernel];
 }
-- 
GitLab


From 9626049ec5a2e114a7cbfe90fdf5d2a10221867c Mon Sep 17 00:00:00 2001
From: Armijn Hemel <armijn@gpl-violations.org>
Date: Tue, 8 Aug 2006 20:24:33 +0000
Subject: [PATCH 0159/5331] first attempt at using network installs

svn path=/nixu/trunk/; revision=6076
---
 fill-disk.sh | 14 ++++++++++----
 make-disk.sh | 40 +++++++++++++++++++++++++++++++++++-----
 2 files changed, 45 insertions(+), 9 deletions(-)

diff --git a/fill-disk.sh b/fill-disk.sh
index fac7eb56197..7c077b85d80 100755
--- a/fill-disk.sh
+++ b/fill-disk.sh
@@ -1,6 +1,6 @@
 #! @bash@/bin/sh -e
 
-export PATH=/bin:/sbin:@bash@/bin:@findutils@/bin:@busybox@/bin:@busybox@/sbin:@e2fsprogs@/sbin:@grub@/sbin:@sysvinitPath@/sbin:@eject@/bin:@kudzu@/sbin:
+export PATH=/bin:/sbin:@bash@/bin:@findutils@/bin:@busybox@/bin:@busybox@/sbin:@e2fsprogs@/sbin:@grub@/sbin:@sysvinitPath@/sbin:@eject@/bin:@dhcp@/sbin:@modutils@/sbin
 
 ##
 ## In the beginning we want to have a minimalistic environment, built with
@@ -153,7 +153,6 @@ make_dir 00755 /etc/ssh
 make_dir 00755 /etc/sysconfig
 make_dir 00755 /home
 make_dir 00755 /lib
-make_dir 00755 /lib/modules
 make_dir 00755 /mnt
 make_dir 00755 /mnt/host
 make_dir 00755 /nix
@@ -227,10 +226,10 @@ echo "Looking for CDROM in: $i"
   fi
 done
 
-
 echo mounting /cdrom in the target
 
 mount --bind /cdrom $root/cdrom
+mount --bind /cdrom/lib /lib
 
 echo switch to /nix from CD
 ## starting here it's OK to have full blown glibc
@@ -247,7 +246,14 @@ export NIX_STATE_DIR=$root/nix/var/nix
 export NIX_CONF_DIR=$root/nix/etc
 NIX=@nix@/bin
 
-#echo bringing up networking...
+echo bringing up networking...
+
+modprobe 3c59x
+dhclient eth0
+
+while true; do
+   sleep 60;
+done
 
 #nic=`kudzu -p | grep eth | sort | uniq | cut -d ' ' -f 2`
 
diff --git a/make-disk.sh b/make-disk.sh
index d340c8d0a31..87aad70a968 100755
--- a/make-disk.sh
+++ b/make-disk.sh
@@ -21,6 +21,7 @@ gzip=$($NIX/nix-store -r $(echo '(import ./pkgs.nix).gzip' | $NIX/nix-instantiat
 cpio=$($NIX/nix-store -r $(echo '(import ./pkgs.nix).cpio' | $NIX/nix-instantiate -))
 
 archivesDir=$($mktemp/bin/mktemp -d)
+archivesDir2=$($mktemp/bin/mktemp -d)
 manifest=${archivesDir}/MANIFEST
 nixpkgs=/nixpkgs/trunk/pkgs
 fill_disk=$archivesDir/scripts/fill-disk.sh
@@ -47,7 +48,8 @@ kernelscripts=$($NIX/nix-store -r $(echo '(import ./pkgs.nix).kernelscripts' | $
 
 ### make NAR files for everything we want to install and some more. Make sure
 ### the right URL is in there, so specify /cdrom and not cdrom
-$NIX/nix-push --copy $archivesDir $manifest --target /cdrom $storeExpr $($NIX/nix-store -r $(echo '(import ./pkgs.nix).kernel' | $NIX/nix-instantiate -)) $kernelscripts
+#$NIX/nix-push --copy $archivesDir $manifest --target file:///cdrom $storeExpr $($NIX/nix-store -r $(echo '(import ./pkgs.nix).kernel' | $NIX/nix-instantiate -)) $kernelscripts
+$NIX/nix-push --copy $archivesDir2 $manifest --target http://losser.labs.cs.uu.nl/~armijn/.nix/ $storeExpr $($NIX/nix-store -r $(echo '(import ./pkgs.nix).kernel' | $NIX/nix-instantiate -)) $kernelscripts
 
 # Location of sysvinit?
 sysvinitPath=$($NIX/nix-store -r $(echo '(import ./pkgs.nix).sysvinit' | $NIX/nix-instantiate -))
@@ -70,8 +72,12 @@ grub=$($NIX/nix-store -r $(echo '(import ./pkgs.nix).grubWrapper' | $NIX/nix-ins
 
 findutils=$($NIX/nix-store -q $(echo '(import ./pkgs.nix).findutilsWrapper' | $NIX/nix-instantiate -))
 
+modutils=$($NIX/nix-store -q $(echo '(import ./pkgs.nix).module_init_toolsStatic' | $NIX/nix-instantiate -))
+
+dhcp=$($NIX/nix-store -r $(echo '(import ./pkgs.nix).dhcpWrapper' | $NIX/nix-instantiate -))
+
 #combideps=$($NIX/nix-store -qR $nix $utillinux $gnugrep $grub $gzip $findutils)
-combideps=$($NIX/nix-store -qR $nix $busybox $grub $findutils)
+combideps=$($NIX/nix-store -qR $nix $busybox $grub $findutils $modutils $dhcp)
 
 for i in $storeExpr
 do
@@ -135,6 +141,7 @@ $coreutils/bin/mkdir ${initdir}/dev
 $coreutils/bin/mkdir ${initdir}/etc
 $coreutils/bin/mkdir ${initdir}/etc/sysconfig
 $coreutils/bin/mkdir ${initdir}/installimage
+$coreutils/bin/mkdir ${initdir}/lib
 $coreutils/bin/mkdir ${initdir}/modules
 $coreutils/bin/mkdir ${initdir}/proc
 $coreutils/bin/mkdir ${initdir}/sbin
@@ -144,6 +151,7 @@ $coreutils/bin/mkdir -p ${initdir}/usr/bin
 $coreutils/bin/mkdir -p ${initdir}/usr/sbin
 $coreutils/bin/mkdir ${initdir}/var
 $coreutils/bin/mkdir ${initdir}/var/run
+$coreutils/bin/mkdir -p ${initdir}/var/state/dhcp
 
 echo copying nixpkgs
 
@@ -179,7 +187,7 @@ $gnused/bin/sed -e "s^@sysvinitPath\@^$sysvinitPath^g" \
     -e "s^@kernelscripts\@^$kernelscripts^g" \
     -e "s^@gnugrep\@^$gnugrep^g" \
     -e "s^@which\@^$which^g" \
-    -e "s^@kudzu\@^$kudzu^g" \
+    -e "s^@dhcp\@^$dhcp^g" \
     -e "s^@sysklogd\@^$sysklogd^g" \
     -e "s^@gnutar\@^$gnutar^g" \
     -e "s^@gzip\@^$gzip^g" \
@@ -220,12 +228,34 @@ echo copying kernel
 # of the kernel here.
 $coreutils/bin/cp -L $kernel/vmlinuz ${archivesDir}/isolinux
 
-echo linking kernel modules
+strippedName=$(basename $kernel);
+if echo "$strippedName" | grep -q '^[a-z0-9]\{32\}-'; then
+        strippedName=$(echo "$strippedName" | cut -c34- | cut -c 7-)
+fi
+
+kernelhash=$(basename $root/$kernel);
+if echo "$kernelhash" | grep -q '^[a-z0-9]\{32\}-'; then
+        kernelhash=$(echo "$kernelhash" | cut -c -32)
+fi
 
-$coreutils/bin/ln -s $kernel/lib $archivesDir/lib
+version=$strippedName-$kernelhash
+
+echo version: $version
+
+#echo linking kernel modules
+#$coreutils/bin/ln -s $kernel/lib $archivesDir/lib
+
+echo copying network drivers
+#$coreutils/bin/cp -fau --parents --no-preserve=mode $kernel/lib/modules/*/modules.* $archivesDir
+#$coreutils/bin/cp -fau --parents --no-preserve=mode $kernel/lib/modules/*/kernel/drivers/net/* $archivesDir
+
+$gnutar/bin/tar -cf - $kernel/lib/modules/*/modules.* | $gnutar/bin/tar --directory=$archivesDir --strip-components 3 -xf -
+$gnutar/bin/tar -cf - $kernel/lib/modules/*/kernel/drivers/net/* | $gnutar/bin/tar --directory=$archivesDir --strip-components 3 -xf -
 
 echo creating ramdisk
 
+umask 0022
+
 $coreutils/bin/rm -f ${initrd}
 #cp ${archivesDir}/scripts/fill-disk.sh ${initdir}/init
 $coreutils/bin/cp ${archivesDir}/scripts/fill-disk.sh ${initdir}/
-- 
GitLab


From 297d159c8d00eb266d9c8ba5fec7dcaac391e2a3 Mon Sep 17 00:00:00 2001
From: Armijn Hemel <armijn@gpl-violations.org>
Date: Tue, 8 Aug 2006 21:31:34 +0000
Subject: [PATCH 0160/5331] make sure /etc/resolv.conf is available in our
 chroot

svn path=/nixu/trunk/; revision=6077
---
 fill-disk.sh | 13 +++++++++----
 make-disk.sh |  2 +-
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/fill-disk.sh b/fill-disk.sh
index 7c077b85d80..4a8088341a2 100755
--- a/fill-disk.sh
+++ b/fill-disk.sh
@@ -248,12 +248,13 @@ NIX=@nix@/bin
 
 echo bringing up networking...
 
-modprobe 3c59x
+#labmachine has 3c59x
+#modprobe 3c59x
+#vmware has pcnet32
+modprobe pcnet32
 dhclient eth0
 
-while true; do
-   sleep 60;
-done
+cp /etc/resolv.conf $root/etc/resolv.conf
 
 #nic=`kudzu -p | grep eth | sort | uniq | cut -d ' ' -f 2`
 
@@ -407,6 +408,10 @@ echo clearing substitutes
 
 $NIX/nix-store --clear-substitutes
 
+echo clearing network information
+
+rm $root/etc/resolv.conf
+
 echo copying install log
 
 cp /tmp/install-log $root/root
diff --git a/make-disk.sh b/make-disk.sh
index 87aad70a968..f10ac09c00d 100755
--- a/make-disk.sh
+++ b/make-disk.sh
@@ -49,7 +49,7 @@ kernelscripts=$($NIX/nix-store -r $(echo '(import ./pkgs.nix).kernelscripts' | $
 ### make NAR files for everything we want to install and some more. Make sure
 ### the right URL is in there, so specify /cdrom and not cdrom
 #$NIX/nix-push --copy $archivesDir $manifest --target file:///cdrom $storeExpr $($NIX/nix-store -r $(echo '(import ./pkgs.nix).kernel' | $NIX/nix-instantiate -)) $kernelscripts
-$NIX/nix-push --copy $archivesDir2 $manifest --target http://losser.labs.cs.uu.nl/~armijn/.nix/ $storeExpr $($NIX/nix-store -r $(echo '(import ./pkgs.nix).kernel' | $NIX/nix-instantiate -)) $kernelscripts
+$NIX/nix-push --copy $archivesDir2 $manifest --target http://losser.labs.cs.uu.nl/~armijn/.nix $storeExpr $($NIX/nix-store -r $(echo '(import ./pkgs.nix).kernel' | $NIX/nix-instantiate -)) $kernelscripts
 
 # Location of sysvinit?
 sysvinitPath=$($NIX/nix-store -r $(echo '(import ./pkgs.nix).sysvinit' | $NIX/nix-instantiate -))
-- 
GitLab


From 65203abef4d5b46c16a085ea30348145b4cd99c6 Mon Sep 17 00:00:00 2001
From: Armijn Hemel <armijn@gpl-violations.org>
Date: Tue, 8 Aug 2006 22:35:40 +0000
Subject: [PATCH 0161/5331] make sure /lib/modules exists on the target drive.
 Whoopsie.

svn path=/nixu/trunk/; revision=6078
---
 fill-disk.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/fill-disk.sh b/fill-disk.sh
index 4a8088341a2..fd3d3cbf405 100755
--- a/fill-disk.sh
+++ b/fill-disk.sh
@@ -153,6 +153,7 @@ make_dir 00755 /etc/ssh
 make_dir 00755 /etc/sysconfig
 make_dir 00755 /home
 make_dir 00755 /lib
+make_dir 00755 /lib/modules
 make_dir 00755 /mnt
 make_dir 00755 /mnt/host
 make_dir 00755 /nix
-- 
GitLab


From 65742f6eb9ea15e6fd3107c4920a96dbeb34ddb1 Mon Sep 17 00:00:00 2001
From: Armijn Hemel <armijn@gpl-violations.org>
Date: Sun, 27 Aug 2006 14:14:59 +0000
Subject: [PATCH 0162/5331] refactor install process: * user is dropped into a
 shell, where the user can run tools like fdisk to partition a disk * user
 needs to add a file called "disklayout" where it specifies SWAP,
 INSTALLDEVICE and TARGETDRIVE * depending on the values of these the
 installscript might need to be fixed to get the GRUB configuration right

It's still somewhat inflexible, but it gives the user a bit more control than the old scheme

svn path=/nixu/trunk/; revision=6271
---
 fill-disk.sh | 106 +++++++++------------------------------------------
 init.sh      |  78 ++++++++++++++++++++++++++++++++++++-
 install.sh   |   3 ++
 login.sh     |  15 ++++++++
 make-disk.sh |  29 +++++++++++++-
 5 files changed, 141 insertions(+), 90 deletions(-)
 create mode 100644 install.sh
 create mode 100644 login.sh

diff --git a/fill-disk.sh b/fill-disk.sh
index fd3d3cbf405..2895f957e8b 100755
--- a/fill-disk.sh
+++ b/fill-disk.sh
@@ -1,11 +1,6 @@
 #! @bash@/bin/sh -e
 
-export PATH=/bin:/sbin:@bash@/bin:@findutils@/bin:@busybox@/bin:@busybox@/sbin:@e2fsprogs@/sbin:@grub@/sbin:@sysvinitPath@/sbin:@eject@/bin:@dhcp@/sbin:@modutils@/sbin
-
-##
-## In the beginning we want to have a minimalistic environment, built with
-## dietlibc.
-##
+export PATH=/bin:/sbin:@bash@/bin:@findutils@/bin:@e2fsprogs@/sbin:@grub@/sbin:@sysvinitPath@/sbin:@eject@/bin:@dhcp@/sbin:@modutils@/sbin:@busybox@/bin:@busybox@/sbin
 
 kernel=@kernel@
 xawtv=@xawtv@
@@ -17,87 +12,23 @@ bootPath=@bootPath@
 modutils=@modutils@
 mingetty=@mingetty@
 
-echo mounting special filesystems
-
-mount -t proc proc /proc
-mount -t sysfs sys /sys
-
-# make a complete /dev filesystem
-# ripped permissions and everything from anaconda (loader2/devices.h)
-
-echo making device nodes
-
-# consoles
-
-#mknod -m 0600 /dev/console c 5 1
-mknod -m 0600 /dev/ttyS0 c 4 64
-mknod -m 0600 /dev/ttyS1 c 4 65
-mknod -m 0600 /dev/ttyS2 c 4 66
-mknod -m 0600 /dev/ttyS3 c 4 67
-
-# base UNIX devices
-mknod -m 0600 /dev/mem c 1 1
-mknod -m 0666 /dev/null c 1 3
-mknod -m 0666 /dev/zero c 1 5
-
-# tty
-mknod -m 0600 /dev/tty c 5 0
-mknod -m 0600 /dev/tty0 c 4 0
-mknod -m 0600 /dev/tty1 c 4 1
-mknod -m 0600 /dev/tty2 c 4 2
-mknod -m 0600 /dev/tty3 c 4 3
-mknod -m 0600 /dev/tty4 c 4 4
-mknod -m 0600 /dev/tty5 c 4 5
-mknod -m 0600 /dev/tty6 c 4 6
-mknod -m 0600 /dev/tty7 c 4 7
-mknod -m 0600 /dev/tty8 c 4 8
-mknod -m 0600 /dev/tty9 c 4 9
-
-mkdir -m 0755 /dev/pts
-mknod -m 0666 /dev/ptmx c 5 2
-
-# random
-
-mknod -m 0644 /dev/random c 1 8
-mknod -m 0644 /dev/urandom c 1 9
-
-mknod -m 0660 /dev/hda b 3 0
-mknod -m 0660 /dev/hda1 b 3 1
-mknod -m 0660 /dev/hda2 b 3 2
-mknod -m 0660 /dev/hda3 b 3 3
-
-mknod -m 0660 /dev/hdb b 3 64
-mknod -m 0660 /dev/hdb1 b 3 65
-mknod -m 0660 /dev/hdb2 b 3 66
-mknod -m 0660 /dev/hdb3 b 3 67
-
-mknod -m 0660 /dev/hdc b 22 0
-mknod -m 0660 /dev/hdc1 b 22 1
-mknod -m 0660 /dev/hdc2 b 22 2
-mknod -m 0660 /dev/hdc3 b 22 3
-
-mknod -m 0660 /dev/hdd b 22 64
-mknod -m 0660 /dev/hdd1 b 22 65
-mknod -m 0660 /dev/hdd2 b 22 66
-mknod -m 0660 /dev/hdd3 b 22 67
-
-#mknod -m 0660 /dev/sda b 8 0
-#mknod -m 0660 /dev/sda1 b 8 1
-#mknod -m 0660 /dev/sda2 b 8 2
-#mknod -m 0660 /dev/sda3 b 8 3
-
-mknod -m 0600 /dev/initctl p
-
-echo starting emergency shell on tty2
-
-exec ./ramdisk-login.sh /dev/tty2 &
-
 echo formatting target device
 
-targetdrive=/dev/hda
-device=${targetdrive}1
+if test -e disklayout; then
+  source disklayout
+else
+  echo no disk layout configuration present...exiting
+  exit 1
+fi
+
+# $targetdrive is also used by GRUB!
+#targetdrive=/dev/hda
+targetdrive=${TARGETDRIVE}
+#device=${targetdrive}1
+device=${INSTALLDEVICE}
 mkfs.ext2 ${device}
-swapdevice=${targetdrive}2
+#swapdevice=${targetdrive}2
+swapdevice=${SWAP}
 mkswap $swapdevice
 
 echo enabling swap
@@ -428,7 +359,8 @@ umount /cdrom
 
 echo install done
 echo it\'s safe to turn off your machine
+echo exiting install process
 
-while true; do
-   sleep 60;
-done
+#while true; do
+   #sleep 60;
+#done
diff --git a/init.sh b/init.sh
index 88ce09ccb2b..b17a6637f67 100644
--- a/init.sh
+++ b/init.sh
@@ -1,3 +1,79 @@
 #! @bash@/bin/sh -e
 
-exec ./fill-disk.sh | @busybox@/bin/tee /tmp/install-log
+export PATH=/bin:/sbin:@bash@/bin:@findutils@/bin:@busybox@/bin:@busybox@/sbin:@e2fsprogs@/sbin:@grub@/sbin:@sysvinitPath@/sbin:@eject@/bin:@dhcp@/sbin:@modutils@/sbin
+
+echo mounting special filesystems
+
+mount -t proc proc /proc
+mount -t sysfs sys /sys
+
+# make a complete /dev filesystem
+# ripped permissions and everything from anaconda (loader2/devices.h)
+
+echo making device nodes
+
+# consoles
+
+#mknod -m 0600 /dev/console c 5 1
+mknod -m 0600 /dev/ttyS0 c 4 64
+mknod -m 0600 /dev/ttyS1 c 4 65
+mknod -m 0600 /dev/ttyS2 c 4 66
+mknod -m 0600 /dev/ttyS3 c 4 67
+
+# base UNIX devices
+mknod -m 0600 /dev/mem c 1 1
+mknod -m 0666 /dev/null c 1 3
+mknod -m 0666 /dev/zero c 1 5
+
+# tty
+mknod -m 0600 /dev/tty c 5 0
+mknod -m 0600 /dev/tty0 c 4 0
+mknod -m 0600 /dev/tty1 c 4 1
+mknod -m 0600 /dev/tty2 c 4 2
+mknod -m 0600 /dev/tty3 c 4 3
+mknod -m 0600 /dev/tty4 c 4 4
+mknod -m 0600 /dev/tty5 c 4 5
+mknod -m 0600 /dev/tty6 c 4 6
+mknod -m 0600 /dev/tty7 c 4 7
+mknod -m 0600 /dev/tty8 c 4 8
+mknod -m 0600 /dev/tty9 c 4 9
+
+mkdir -m 0755 /dev/pts
+mknod -m 0666 /dev/ptmx c 5 2
+
+# random
+
+mknod -m 0644 /dev/random c 1 8
+mknod -m 0644 /dev/urandom c 1 9
+
+mknod -m 0660 /dev/hda b 3 0
+mknod -m 0660 /dev/hda1 b 3 1
+mknod -m 0660 /dev/hda2 b 3 2
+mknod -m 0660 /dev/hda3 b 3 3
+
+mknod -m 0660 /dev/hdb b 3 64
+mknod -m 0660 /dev/hdb1 b 3 65
+mknod -m 0660 /dev/hdb2 b 3 66
+mknod -m 0660 /dev/hdb3 b 3 67
+
+mknod -m 0660 /dev/hdc b 22 0
+mknod -m 0660 /dev/hdc1 b 22 1
+mknod -m 0660 /dev/hdc2 b 22 2
+mknod -m 0660 /dev/hdc3 b 22 3
+
+mknod -m 0660 /dev/hdd b 22 64
+mknod -m 0660 /dev/hdd1 b 22 65
+mknod -m 0660 /dev/hdd2 b 22 66
+mknod -m 0660 /dev/hdd3 b 22 67
+
+#mknod -m 0660 /dev/sda b 8 0
+#mknod -m 0660 /dev/sda1 b 8 1
+#mknod -m 0660 /dev/sda2 b 8 2
+#mknod -m 0660 /dev/sda3 b 8 3
+
+mknod -m 0600 /dev/initctl p
+
+echo starting emergency shell on tty2
+
+exec ./ramdisk-login.sh /dev/tty2 &
+exec ./login.sh
diff --git a/install.sh b/install.sh
new file mode 100644
index 00000000000..88ce09ccb2b
--- /dev/null
+++ b/install.sh
@@ -0,0 +1,3 @@
+#! @bash@/bin/sh -e
+
+exec ./fill-disk.sh | @busybox@/bin/tee /tmp/install-log
diff --git a/login.sh b/login.sh
new file mode 100644
index 00000000000..c94a8e48d20
--- /dev/null
+++ b/login.sh
@@ -0,0 +1,15 @@
+#! @bash@/bin/sh -e
+
+export PATH=@bash@/bin:@coreutilsdiet@/bin:@coreutils@/bin:@findutils@/bin:@utillinux@/bin:@utillinux@/sbin:@e2fsprogs@/sbin:@grub@/sbin:@sysvinitPath@/sbin:@gnugrep@/bin:@which@/bin:@gnutar@/bin:@busybox@/bin:@busybox@/sbin
+
+#tty=$1
+
+#exec < $tty > $tty 2>&1
+
+echo
+echo "=== Welcome to Nix! ==="
+
+export HOME=/
+cd $HOME
+
+exec @bash@/bin/sh
diff --git a/make-disk.sh b/make-disk.sh
index f10ac09c00d..0710bf4aee2 100755
--- a/make-disk.sh
+++ b/make-disk.sh
@@ -26,6 +26,7 @@ manifest=${archivesDir}/MANIFEST
 nixpkgs=/nixpkgs/trunk/pkgs
 fill_disk=$archivesDir/scripts/fill-disk.sh
 ramdisk_login=$archivesDir/scripts/ramdisk-login.sh
+login_script=$archivesDir/scripts/login.sh
 storePaths=$archivesDir/mystorepaths
 narStorePaths=$archivesDir/narstorepaths
 validatePaths=$archivesDir/validatepaths
@@ -48,8 +49,8 @@ kernelscripts=$($NIX/nix-store -r $(echo '(import ./pkgs.nix).kernelscripts' | $
 
 ### make NAR files for everything we want to install and some more. Make sure
 ### the right URL is in there, so specify /cdrom and not cdrom
-#$NIX/nix-push --copy $archivesDir $manifest --target file:///cdrom $storeExpr $($NIX/nix-store -r $(echo '(import ./pkgs.nix).kernel' | $NIX/nix-instantiate -)) $kernelscripts
-$NIX/nix-push --copy $archivesDir2 $manifest --target http://losser.labs.cs.uu.nl/~armijn/.nix $storeExpr $($NIX/nix-store -r $(echo '(import ./pkgs.nix).kernel' | $NIX/nix-instantiate -)) $kernelscripts
+$NIX/nix-push --copy $archivesDir $manifest --target file:///cdrom $storeExpr $($NIX/nix-store -r $(echo '(import ./pkgs.nix).kernel' | $NIX/nix-instantiate -)) $kernelscripts
+#$NIX/nix-push --copy $archivesDir2 $manifest --target http://losser.labs.cs.uu.nl/~armijn/.nix $storeExpr $($NIX/nix-store -r $(echo '(import ./pkgs.nix).kernel' | $NIX/nix-instantiate -)) $kernelscripts
 
 # Location of sysvinit?
 sysvinitPath=$($NIX/nix-store -r $(echo '(import ./pkgs.nix).sysvinit' | $NIX/nix-instantiate -))
@@ -212,9 +213,31 @@ $gnused/bin/sed -e "s^@sysvinitPath\@^$sysvinitPath^g" \
     -e "s^@which\@^$which^g" \
     -e "s^@gnutar\@^$gnutar^g" \
     -e "s^@mingetty\@^$mingettyWrapper^g" \
+    -e "s^@busybox\@^$busybox^g" \
     < $ramdisk_login > $ramdisk_login.tmp
 $coreutils/bin/mv $ramdisk_login.tmp $ramdisk_login
 
+$gnused/bin/sed -e "s^@sysvinitPath\@^$sysvinitPath^g" \
+    -e "s^@bootPath\@^$bootPath^g" \
+    -e "s^@NIX\@^$nix^g" \
+    -e "s^@bash\@^$bash^g" \
+    -e "s^@findutils\@^$findutils^g" \
+    -e "s^@coreutilsdiet\@^$coreutilsdiet^g" \
+    -e "s^@coreutils\@^$coreutils^g" \
+    -e "s^@utillinux\@^$utilLinux^g" \
+    -e "s^@e2fsprogs\@^$e2fsprogs^g" \
+    -e "s^@modutils\@^$modutils^g" \
+    -e "s^@grub\@^$grub^g" \
+    -e "s^@kernel\@^$kernel^g" \
+    -e "s^@kernelscripts\@^$kernelscripts^g" \
+    -e "s^@gnugrep\@^$gnugrep^g" \
+    -e "s^@which\@^$which^g" \
+    -e "s^@gnutar\@^$gnutar^g" \
+    -e "s^@mingetty\@^$mingettyWrapper^g" \
+    -e "s^@busybox\@^$busybox^g" \
+    < $login_script > $login_script.tmp
+$coreutils/bin/mv $login_script.tmp $login_script
+
 echo copying bootimage
 
 $coreutils/bin/mkdir ${archivesDir}/isolinux
@@ -260,12 +283,14 @@ $coreutils/bin/rm -f ${initrd}
 #cp ${archivesDir}/scripts/fill-disk.sh ${initdir}/init
 $coreutils/bin/cp ${archivesDir}/scripts/fill-disk.sh ${initdir}/
 $coreutils/bin/cp ${archivesDir}/scripts/ramdisk-login.sh ${initdir}/
+$coreutils/bin/cp ${archivesDir}/scripts/login.sh ${initdir}/
 $coreutils/bin/cp ${archivesDir}/scripts/init.sh ${initdir}/init
 #ln -s ${bash}/bin/bash ${initdir}/bin/sh
 $coreutils/bin/cp ${bash}/bin/bash ${initdir}/bin/sh
 $coreutils/bin/chmod u+x ${initdir}/init
 $coreutils/bin/chmod u+x ${initdir}/fill-disk.sh
 $coreutils/bin/chmod u+x ${initdir}/ramdisk-login.sh
+$coreutils/bin/chmod u+x ${initdir}/login.sh
 #cp -fau --parents ${utilLinux} ${initdir}
 #cp -fau --parents ${coreUtilsDiet} ${initdir}
 #cp -fau --parents ${modUtils} ${initdir}
-- 
GitLab


From f7c69397b7adef2d6451b3d6389e05d8ba6c00fe Mon Sep 17 00:00:00 2001
From: Armijn Hemel <armijn@gpl-violations.org>
Date: Sun, 27 Aug 2006 15:34:24 +0000
Subject: [PATCH 0163/5331] update howto to reflect new changes

svn path=/nixu/trunk/; revision=6274
---
 doc/howto | 24 ++++++++++++++++++------
 1 file changed, 18 insertions(+), 6 deletions(-)

diff --git a/doc/howto b/doc/howto
index 646f2c2ebf6..cb5f572535f 100644
--- a/doc/howto
+++ b/doc/howto
@@ -14,22 +14,34 @@ Make sure mktemp is installed. Run ./make-disk.sh. Wait.
 
 Use your favourite tool to burn the ISO image to a CD.
 
-  Preparing the host machine
+  Installing
 
 Currently NixOS can only be installed with machines that have a specific
 hardware set up:
 
 An ATA harddisk on the first ATA controller (hda) with:
-- data partition (hda1)
-- swap partition (hda2)
+- data partition
+- swap partition
 
 All data on these two partitions will be wiped and the bootloader in the
 Master Boot Record (MBR) will be overwritten with GRUB.
 
-  Booting
+The NixOS installer will drop you into a shell, from which you can run
+fdisk. Then it expects to find a file called "disklayout" with three
+variables:
 
-Insert the CD, make sure it can boot from CD and reboot. Let it run for a
-while.
+SWAP :: partition to use as swap
+INSTALLDEVICE :: partition that will be /root
+TARGETDRIVE :: drive on which grub will be installed
+
+This file will be read by the install script automatically when you launch
+the script:
+
+# sh fill-disk.sh
+
+The configuration data that grub writes to disk might not be correct. The
+grub configuration writes a file to disk which assumes /dev/hda1 is the root
+partition.
 
   Configuring
 
-- 
GitLab


From 1323e55ad3a094212fb4b007ec82dd4b7ae697b6 Mon Sep 17 00:00:00 2001
From: Armijn Hemel <armijn@gpl-violations.org>
Date: Sun, 27 Aug 2006 22:18:39 +0000
Subject: [PATCH 0164/5331] remove the root(hd0,0) line, because it wasn't
 needed. At least, not in our situation. I don't know how it will it work with
 something like dual booting and chain loading, so that is unsupported right
 now :P

svn path=/nixu/trunk/; revision=6282
---
 fill-disk.sh | 2 +-
 make-disk.sh | 6 ++++--
 pkgs.nix     | 4 ++--
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/fill-disk.sh b/fill-disk.sh
index 2895f957e8b..a09b3bc5444 100755
--- a/fill-disk.sh
+++ b/fill-disk.sh
@@ -332,7 +332,6 @@ cat > $root/boot/grub/menu.lst << GRUBEND
 default=0
 timeout=5
 title NixOS
-        root (hd0,0)
         kernel @kernel@/vmlinuz root=$device
 GRUBEND
 
@@ -348,6 +347,7 @@ echo copying install log
 
 cp /tmp/install-log $root/root
 
+# bizar. busybox umount doesn't like things with --bind it seems.
 echo umounting filesystem
 
 umount $root/cdrom
diff --git a/make-disk.sh b/make-disk.sh
index 0710bf4aee2..3b392115c6a 100755
--- a/make-disk.sh
+++ b/make-disk.sh
@@ -47,9 +47,11 @@ storeExpr=$($NIX/nix-store -r $(echo '(import ./pkgs.nix).boot' | $NIX/nix-insta
 
 kernelscripts=$($NIX/nix-store -r $(echo '(import ./pkgs.nix).kernelscripts' | $NIX/nix-instantiate -))
 
+mkinitrd=$($NIX/nix-store -r $(echo '(import ./pkgs.nix).mkinitrd' | $NIX/nix-instantiate -))
+
 ### make NAR files for everything we want to install and some more. Make sure
 ### the right URL is in there, so specify /cdrom and not cdrom
-$NIX/nix-push --copy $archivesDir $manifest --target file:///cdrom $storeExpr $($NIX/nix-store -r $(echo '(import ./pkgs.nix).kernel' | $NIX/nix-instantiate -)) $kernelscripts
+$NIX/nix-push --copy $archivesDir $manifest --target file:///cdrom $storeExpr $($NIX/nix-store -r $(echo '(import ./pkgs.nix).kernel' | $NIX/nix-instantiate -)) $kernelscripts $mkinitrd
 #$NIX/nix-push --copy $archivesDir2 $manifest --target http://losser.labs.cs.uu.nl/~armijn/.nix $storeExpr $($NIX/nix-store -r $(echo '(import ./pkgs.nix).kernel' | $NIX/nix-instantiate -)) $kernelscripts
 
 # Location of sysvinit?
@@ -80,7 +82,7 @@ dhcp=$($NIX/nix-store -r $(echo '(import ./pkgs.nix).dhcpWrapper' | $NIX/nix-ins
 #combideps=$($NIX/nix-store -qR $nix $utillinux $gnugrep $grub $gzip $findutils)
 combideps=$($NIX/nix-store -qR $nix $busybox $grub $findutils $modutils $dhcp)
 
-for i in $storeExpr
+for i in $storeExpr $mkinitrd
 do
   echo $i >> $narStorePaths
 done
diff --git a/pkgs.nix b/pkgs.nix
index 5f70904f92b..41efb92c99e 100644
--- a/pkgs.nix
+++ b/pkgs.nix
@@ -6,7 +6,7 @@ rec {
     openssh binutils nixStatic strace shadowutils iputils gnumake curl gnused
     gnutar gnugrep gzip mingettyWrapper grubWrapper syslinux parted
     module_init_tools module_init_toolsStatic dhcpWrapper man nano eject
-    sysklogd mktemp cdrtools cpio busybox;
+    sysklogd mktemp cdrtools cpio busybox mkinitrd;
 
   boot = (import ./boot) {
     inherit stdenv bash coreutils findutilsWrapper utillinux sysvinit
@@ -23,5 +23,5 @@ rec {
   #  nix = nixUnstable;
   #};
 
-  everything = [boot sysvinit sysklogd kernelscripts kernel];
+  everything = [boot sysvinit sysklogd kernelscripts kernel mkinitrd];
 }
-- 
GitLab


From 4a8b316cf6f14b5e1f7e6bee04070b685c69881b Mon Sep 17 00:00:00 2001
From: Armijn Hemel <armijn@gpl-violations.org>
Date: Sun, 27 Aug 2006 22:31:35 +0000
Subject: [PATCH 0165/5331] * show installation instructions at install time *
 update manual to reflect new method better

svn path=/nixu/trunk/; revision=6285
---
 doc/howto | 14 +++++++-------
 login.sh  | 12 ++++++++++++
 2 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/doc/howto b/doc/howto
index cb5f572535f..58e3344d6ea 100644
--- a/doc/howto
+++ b/doc/howto
@@ -1,4 +1,4 @@
-NixOS installation HOWTO -- October 3, 2005
+NixOS installation HOWTO -- August 28, 2006
 
 This is small HOWTO of how to build and install the current version of
 NixOS.
@@ -39,16 +39,16 @@ the script:
 
 # sh fill-disk.sh
 
-The configuration data that grub writes to disk might not be correct. The
-grub configuration writes a file to disk which assumes /dev/hda1 is the root
-partition.
+The configuration data that grub writes to disk might not be correct (should
+be). When something goes wrong you probably won't have to reinstall. The
+manual for grub is quite helpful in these cases.
 
   Configuring
 
 To get NixOS in a working state, do the following:
 
-- load the networkdriver. This is machine dependent. On the labmachines this
-is the e1000 driver:
+- load the networkdriver. This is machine dependent. On the labmachines (Dell
+Optiplex GX-260) this is the e1000 driver:
 
 # modprobe e1000
 
@@ -93,7 +93,7 @@ NixOS machine (needed for mingetty). Alternatively, do:
 - relaunch init
 
 
-  Making hotplugging work
+  Making hotplugging work -- BROKEN RIGHT NOW
 
 Many devices (USB, Firewire) are controlled by so called "hot plugging". The
 kernel executes a program -- usually /sbin/hotplug, but this is configurable
diff --git a/login.sh b/login.sh
index c94a8e48d20..3a6b9983885 100644
--- a/login.sh
+++ b/login.sh
@@ -8,6 +8,18 @@ export PATH=@bash@/bin:@coreutilsdiet@/bin:@coreutils@/bin:@findutils@/bin:@util
 
 echo
 echo "=== Welcome to Nix! ==="
+echo "NixOS Installation instructions"
+echo ""
+echo "* edit the file called 'disklayout' (vi is provided) and provide"
+echo "  the following name=value pairs:"
+echo "  * INSTALLDEVICE (root device, for example /dev/hda1)"
+echo "  * SWAP (swap device, for example /dev/hda2)"
+echo "  * TARGETDRIVE (target drive to install grub, for example /dev/hda)"
+echo "* run: sh fill-disk.sh"
+echo ""
+echo ""
+echo ""
+echo ""
 
 export HOME=/
 cd $HOME
-- 
GitLab


From b5bdf9b4534fc999e6ad4e943330271769a8b76c Mon Sep 17 00:00:00 2001
From: Armijn Hemel <armijn@gpl-violations.org>
Date: Mon, 28 Aug 2006 13:41:41 +0000
Subject: [PATCH 0166/5331] -r, not -q

svn path=/nixu/trunk/; revision=6295
---
 make-disk.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/make-disk.sh b/make-disk.sh
index 3b392115c6a..6866b2a2e87 100755
--- a/make-disk.sh
+++ b/make-disk.sh
@@ -75,7 +75,7 @@ grub=$($NIX/nix-store -r $(echo '(import ./pkgs.nix).grubWrapper' | $NIX/nix-ins
 
 findutils=$($NIX/nix-store -q $(echo '(import ./pkgs.nix).findutilsWrapper' | $NIX/nix-instantiate -))
 
-modutils=$($NIX/nix-store -q $(echo '(import ./pkgs.nix).module_init_toolsStatic' | $NIX/nix-instantiate -))
+modutils=$($NIX/nix-store -r $(echo '(import ./pkgs.nix).module_init_toolsStatic' | $NIX/nix-instantiate -))
 
 dhcp=$($NIX/nix-store -r $(echo '(import ./pkgs.nix).dhcpWrapper' | $NIX/nix-instantiate -))
 
-- 
GitLab


From 964780812de8cdf7fe9d958829976144e17c52d9 Mon Sep 17 00:00:00 2001
From: Armijn Hemel <armijn@gpl-violations.org>
Date: Tue, 29 Aug 2006 21:58:33 +0000
Subject: [PATCH 0167/5331] fix NIXOS-38

svn path=/nixu/trunk/; revision=6317
---
 fill-disk.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fill-disk.sh b/fill-disk.sh
index a09b3bc5444..3cce7aab512 100755
--- a/fill-disk.sh
+++ b/fill-disk.sh
@@ -123,7 +123,7 @@ make_dir 00755 /var/tmp
 
 echo making device nodes on target drive
 
-mknod $root/dev/null c 1 3
+mknod -m 0666 $root/dev/null c 1 3
 mknod -m 0600 $root/dev/console c 5 1
 mknod -m 0600 $root/dev/tty c 5 0
 mknod -m 0600 $root/dev/tty0 c 4 0
-- 
GitLab


From e876f67580b1726e67a5630a4a107669fa56ffb3 Mon Sep 17 00:00:00 2001
From: Armijn Hemel <armijn@gpl-violations.org>
Date: Wed, 30 Aug 2006 00:15:02 +0000
Subject: [PATCH 0168/5331] pass nano. Not that it actually works, because it
 also needs ncurses for terminal information...

svn path=/nixu/trunk/; revision=6321
---
 fill-disk.sh | 3 +++
 login.sh     | 2 +-
 make-disk.sh | 7 +++++--
 pkgs.nix     | 4 ++--
 4 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/fill-disk.sh b/fill-disk.sh
index 3cce7aab512..e9e974b3586 100755
--- a/fill-disk.sh
+++ b/fill-disk.sh
@@ -132,6 +132,9 @@ mknod -m 0600 $root/dev/tty2 c 4 2
 mknod -m 0600 $root/dev/tty3 c 4 3
 mknod -m 0444 $root/dev/urandom c 1 9
 
+## needed for sshd and friends. Should actually be made by udev.
+mknod -m 0666 $root/dev/ptmx c 5 2
+
 rm -f $root/etc/mtab
 ln -s /proc/mounts $root/etc/mtab
 
diff --git a/login.sh b/login.sh
index 3a6b9983885..1c33a2ebc91 100644
--- a/login.sh
+++ b/login.sh
@@ -1,6 +1,6 @@
 #! @bash@/bin/sh -e
 
-export PATH=@bash@/bin:@coreutilsdiet@/bin:@coreutils@/bin:@findutils@/bin:@utillinux@/bin:@utillinux@/sbin:@e2fsprogs@/sbin:@grub@/sbin:@sysvinitPath@/sbin:@gnugrep@/bin:@which@/bin:@gnutar@/bin:@busybox@/bin:@busybox@/sbin
+export PATH=@bash@/bin:@coreutilsdiet@/bin:@coreutils@/bin:@findutils@/bin:@utillinux@/bin:@utillinux@/sbin:@e2fsprogs@/sbin:@grub@/sbin:@sysvinitPath@/sbin:@gnugrep@/bin:@which@/bin:@gnutar@/bin:@busybox@/bin:@busybox@/sbin:@nano@/bin
 
 #tty=$1
 
diff --git a/make-disk.sh b/make-disk.sh
index 6866b2a2e87..f263f6d51c6 100755
--- a/make-disk.sh
+++ b/make-disk.sh
@@ -37,6 +37,8 @@ initscript=$archivesDir/scripts/init.sh
 
 nix=$($NIX/nix-store -r $(echo '(import ./pkgs.nix).nixUnstable' | $NIX/nix-instantiate -))
 busybox=$($NIX/nix-store -r $(echo '(import ./pkgs.nix).busybox' | $NIX/nix-instantiate -))
+nano=$($NIX/nix-store -r $(echo '(import ./pkgs.nix).nano' | $NIX/nix-instantiate -))
+nanoDiet=$($NIX/nix-store -r $(echo '(import ./pkgs.nix).nanoDiet' | $NIX/nix-instantiate -))
 
 nixDeps=$($NIX/nix-store -qR $nix)
 
@@ -80,7 +82,7 @@ modutils=$($NIX/nix-store -r $(echo '(import ./pkgs.nix).module_init_toolsStatic
 dhcp=$($NIX/nix-store -r $(echo '(import ./pkgs.nix).dhcpWrapper' | $NIX/nix-instantiate -))
 
 #combideps=$($NIX/nix-store -qR $nix $utillinux $gnugrep $grub $gzip $findutils)
-combideps=$($NIX/nix-store -qR $nix $busybox $grub $findutils $modutils $dhcp)
+combideps=$($NIX/nix-store -qR $nix $busybox $grub $findutils $modutils $dhcp $nano)
 
 for i in $storeExpr $mkinitrd
 do
@@ -128,7 +130,6 @@ modutils=$($NIX/nix-store -q $(echo '(import ./pkgs.nix).module_init_toolsStatic
 grub=$($NIX/nix-store -r $(echo '(import ./pkgs.nix).grubWrapper' | $NIX/nix-instantiate -))
 mingettyWrapper=$($NIX/nix-store -r $(echo '(import ./pkgs.nix).mingettyWrapper' | $NIX/nix-instantiate -))
 dhcp=$($NIX/nix-store -r $(echo '(import ./pkgs.nix).dhcpWrapper' | $NIX/nix-instantiate -))
-nano=$($NIX/nix-store -r $(echo '(import ./pkgs.nix).nano' | $NIX/nix-instantiate -))
 gnugrep=$($NIX/nix-store -r $(echo '(import ./pkgs.nix).gnugrep' | $NIX/nix-instantiate -))
 which=$($NIX/nix-store -r $(echo '(import ./pkgs.nix).which' | $NIX/nix-instantiate -))
 eject=$($NIX/nix-store -r $(echo '(import ./pkgs.nix).eject' | $NIX/nix-instantiate -))
@@ -237,6 +238,7 @@ $gnused/bin/sed -e "s^@sysvinitPath\@^$sysvinitPath^g" \
     -e "s^@gnutar\@^$gnutar^g" \
     -e "s^@mingetty\@^$mingettyWrapper^g" \
     -e "s^@busybox\@^$busybox^g" \
+    -e "s^@nano\@^$nanoDiet^g" \
     < $login_script > $login_script.tmp
 $coreutils/bin/mv $login_script.tmp $login_script
 
@@ -306,6 +308,7 @@ $coreutils/bin/cp -fau --parents ${modutils}/bin ${initdir}
 $coreutils/bin/chmod -R u+w ${initdir}
 $coreutils/bin/cp -fau --parents ${modutils}/sbin ${initdir}
 $coreutils/bin/cp -fau --parents ${busybox} ${initdir}
+$coreutils/bin/cp -fau --parents ${nanoDiet} ${initdir}
 
 $coreutils/bin/touch ${archivesDir}/NIXOS
 
diff --git a/pkgs.nix b/pkgs.nix
index 41efb92c99e..f202283eecc 100644
--- a/pkgs.nix
+++ b/pkgs.nix
@@ -5,8 +5,8 @@ rec {
     e2fsprogs nettools nixUnstable subversion gcc wget which vim less screen
     openssh binutils nixStatic strace shadowutils iputils gnumake curl gnused
     gnutar gnugrep gzip mingettyWrapper grubWrapper syslinux parted
-    module_init_tools module_init_toolsStatic dhcpWrapper man nano eject
-    sysklogd mktemp cdrtools cpio busybox mkinitrd;
+    module_init_tools module_init_toolsStatic dhcpWrapper man nano nanoDiet
+    eject sysklogd mktemp cdrtools cpio busybox mkinitrd;
 
   boot = (import ./boot) {
     inherit stdenv bash coreutils findutilsWrapper utillinux sysvinit
-- 
GitLab


From 62f61928e7a7cb20b2498cb2936248f810e76521 Mon Sep 17 00:00:00 2001
From: Armijn Hemel <armijn@gpl-violations.org>
Date: Wed, 30 Aug 2006 00:40:15 +0000
Subject: [PATCH 0169/5331] also copy a statically linked ncurses to the
 installer, so at least we get all the right terminfo thingies.

svn path=/nixu/trunk/; revision=6326
---
 make-disk.sh | 2 ++
 pkgs.nix     | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/make-disk.sh b/make-disk.sh
index f263f6d51c6..844ffe58c3c 100755
--- a/make-disk.sh
+++ b/make-disk.sh
@@ -39,6 +39,7 @@ nix=$($NIX/nix-store -r $(echo '(import ./pkgs.nix).nixUnstable' | $NIX/nix-inst
 busybox=$($NIX/nix-store -r $(echo '(import ./pkgs.nix).busybox' | $NIX/nix-instantiate -))
 nano=$($NIX/nix-store -r $(echo '(import ./pkgs.nix).nano' | $NIX/nix-instantiate -))
 nanoDiet=$($NIX/nix-store -r $(echo '(import ./pkgs.nix).nanoDiet' | $NIX/nix-instantiate -))
+ncurses=$($NIX/nix-store -r $(echo '(import ./pkgs.nix).ncursesDiet' | $NIX/nix-instantiate -))
 
 nixDeps=$($NIX/nix-store -qR $nix)
 
@@ -309,6 +310,7 @@ $coreutils/bin/chmod -R u+w ${initdir}
 $coreutils/bin/cp -fau --parents ${modutils}/sbin ${initdir}
 $coreutils/bin/cp -fau --parents ${busybox} ${initdir}
 $coreutils/bin/cp -fau --parents ${nanoDiet} ${initdir}
+$coreutils/bin/cp -fau --parents ${ncurses} ${initdir}
 
 $coreutils/bin/touch ${archivesDir}/NIXOS
 
diff --git a/pkgs.nix b/pkgs.nix
index f202283eecc..b774ce33fb7 100644
--- a/pkgs.nix
+++ b/pkgs.nix
@@ -6,7 +6,7 @@ rec {
     openssh binutils nixStatic strace shadowutils iputils gnumake curl gnused
     gnutar gnugrep gzip mingettyWrapper grubWrapper syslinux parted
     module_init_tools module_init_toolsStatic dhcpWrapper man nano nanoDiet
-    eject sysklogd mktemp cdrtools cpio busybox mkinitrd;
+    eject sysklogd mktemp cdrtools cpio busybox mkinitrd ncursesDiet;
 
   boot = (import ./boot) {
     inherit stdenv bash coreutils findutilsWrapper utillinux sysvinit
-- 
GitLab


From da7b60735b9b6139577ce899d1fd958c83ab3b6b Mon Sep 17 00:00:00 2001
From: Armijn Hemel <armijn@gpl-violations.org>
Date: Sat, 23 Sep 2006 23:06:28 +0000
Subject: [PATCH 0170/5331] -r, not -q

svn path=/nixu/trunk/; revision=6589
---
 make-disk.sh | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/make-disk.sh b/make-disk.sh
index 844ffe58c3c..186e42e549b 100755
--- a/make-disk.sh
+++ b/make-disk.sh
@@ -76,7 +76,7 @@ gnugrep=$($NIX/nix-store -r $(echo '(import ./pkgs.nix).gnugrep' | $NIX/nix-inst
 
 grub=$($NIX/nix-store -r $(echo '(import ./pkgs.nix).grubWrapper' | $NIX/nix-instantiate -))
 
-findutils=$($NIX/nix-store -q $(echo '(import ./pkgs.nix).findutilsWrapper' | $NIX/nix-instantiate -))
+findutils=$($NIX/nix-store -r $(echo '(import ./pkgs.nix).findutilsWrapper' | $NIX/nix-instantiate -))
 
 modutils=$($NIX/nix-store -r $(echo '(import ./pkgs.nix).module_init_toolsStatic' | $NIX/nix-instantiate -))
 
@@ -119,15 +119,15 @@ Kernel=$($NIX/nix-store -qR $(nix-store -r $(echo '(import ./pkgs.nix).kernel' |
 SysVinit=$($NIX/nix-store -qR $(nix-store -r $(echo '(import ./pkgs.nix).sysvinit' | $NIX/nix-instantiate -)))
 BootPath=$($NIX/nix-store -qR $(nix-store -r $(echo '(import ./pkgs.nix).boot' | $NIX/nix-instantiate -)))
 
-bashGlibc=$($NIX/nix-store -q $(echo '(import ./pkgs.nix).bash' | $NIX/nix-instantiate -))
-bash=$($NIX/nix-store -q $(echo '(import ./pkgs.nix).bashStatic' | $NIX/nix-instantiate -))
-coreutilsdiet=$($NIX/nix-store -q $(echo '(import ./pkgs.nix).coreutilsDiet' | $NIX/nix-instantiate -))
+bashGlibc=$($NIX/nix-store -r $(echo '(import ./pkgs.nix).bash' | $NIX/nix-instantiate -))
+bash=$($NIX/nix-store -r $(echo '(import ./pkgs.nix).bashStatic' | $NIX/nix-instantiate -))
+coreutilsdiet=$($NIX/nix-store -r $(echo '(import ./pkgs.nix).coreutilsDiet' | $NIX/nix-instantiate -))
 #findutils=$($NIX/nix-store -q $(echo '(import ./pkgs.nix).findutilsWrapper' | $NIX/nix-instantiate -))
-utillinux=$($NIX/nix-store -q $(echo '(import ./pkgs.nix).utillinux' | $NIX/nix-instantiate -))
-e2fsprogs=$($NIX/nix-store -q $(echo '(import ./pkgs.nix).e2fsprogsDiet' | $NIX/nix-instantiate -))
+utillinux=$($NIX/nix-store -r $(echo '(import ./pkgs.nix).utillinux' | $NIX/nix-instantiate -))
+e2fsprogs=$($NIX/nix-store -r $(echo '(import ./pkgs.nix).e2fsprogsDiet' | $NIX/nix-instantiate -))
 #e2fsprogs=$($NIX/nix-store -q $(echo '(import ./pkgs.nix).e2fsprogs' | $NIX/nix-instantiate -))
 #e2fsprogs=$($NIX/nix-store -q $(echo '(import ./pkgs.nix).e2fsprogs' | $NIX/nix-instantiate -))
-modutils=$($NIX/nix-store -q $(echo '(import ./pkgs.nix).module_init_toolsStatic' | $NIX/nix-instantiate -))
+modutils=$($NIX/nix-store -r $(echo '(import ./pkgs.nix).module_init_toolsStatic' | $NIX/nix-instantiate -))
 grub=$($NIX/nix-store -r $(echo '(import ./pkgs.nix).grubWrapper' | $NIX/nix-instantiate -))
 mingettyWrapper=$($NIX/nix-store -r $(echo '(import ./pkgs.nix).mingettyWrapper' | $NIX/nix-instantiate -))
 dhcp=$($NIX/nix-store -r $(echo '(import ./pkgs.nix).dhcpWrapper' | $NIX/nix-instantiate -))
-- 
GitLab


From edcdb69c5772798023185e45fb70bb6e4a220794 Mon Sep 17 00:00:00 2001
From: Armijn Hemel <armijn@gpl-violations.org>
Date: Sun, 24 Sep 2006 22:03:33 +0000
Subject: [PATCH 0171/5331] make it easier to relocate the location of nixpkgs.

svn path=/nixu/trunk/; revision=6602
---
 fill-disk.sh | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/fill-disk.sh b/fill-disk.sh
index e9e974b3586..fc9fc78deb7 100755
--- a/fill-disk.sh
+++ b/fill-disk.sh
@@ -12,6 +12,8 @@ bootPath=@bootPath@
 modutils=@modutils@
 mingetty=@mingetty@
 
+nixpkgs=/nixpkgs/trunk
+
 echo formatting target device
 
 if test -e disklayout; then
@@ -246,12 +248,12 @@ unset NIX_CONF_DIR
 ## Fix this. Probably nix-instantiate, then nix-store -r.
 ## Also make sure everything gets installed into an actual profile!
 
-$NIX/nix-env -iKf /nixpkgs/trunk/pkgs/top-level/all-packages.nix -A nixUnstable
-$NIX/nix-env -iKf /nixpkgs/trunk/pkgs/top-level/all-packages.nix -A coreutils
-$NIX/nix-env -iKf /nixpkgs/trunk/pkgs/top-level/all-packages.nix -A gnugrep
-#$NIX/nix-env -iKf /nixpkgs/trunk/pkgs/top-level/all-packages.nix -A kernel
-$NIX/nix-env -iKf /nixpkgs/trunk/pkgs/top-level/all-packages.nix -A kernelscripts
-$NIX/nix-env -iKf /nixpkgs/trunk/pkgs/top-level/all-packages.nix -A grub
+$NIX/nix-env -iKf $nixpkgs/pkgs/top-level/all-packages.nix -A nixUnstable
+$NIX/nix-env -iKf $nixpkgs/pkgs/top-level/all-packages.nix -A coreutils
+$NIX/nix-env -iKf $nixpkgs/pkgs/top-level/all-packages.nix -A gnugrep
+#$NIX/nix-env -iKf $nixpkgs/pkgs/top-level/all-packages.nix -A kernel
+$NIX/nix-env -iKf $nixpkgs/pkgs/top-level/all-packages.nix -A kernelscripts
+$NIX/nix-env -iKf $nixpkgs/pkgs/top-level/all-packages.nix -A grub
 
 cat $narStorePaths | xargs -n 1 -i% $NIX/nix-env -i %
 
-- 
GitLab


From c8b64ef689442f9989f818d9d592542da95843a4 Mon Sep 17 00:00:00 2001
From: Armijn Hemel <armijn@gpl-violations.org>
Date: Sun, 8 Oct 2006 22:05:06 +0000
Subject: [PATCH 0172/5331] we can safely use the stable version again

svn path=/nixu/trunk/; revision=6680
---
 fill-disk.sh | 2 +-
 make-disk.sh | 2 +-
 pkgs.nix     | 5 ++---
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/fill-disk.sh b/fill-disk.sh
index fc9fc78deb7..52078fad147 100755
--- a/fill-disk.sh
+++ b/fill-disk.sh
@@ -248,7 +248,7 @@ unset NIX_CONF_DIR
 ## Fix this. Probably nix-instantiate, then nix-store -r.
 ## Also make sure everything gets installed into an actual profile!
 
-$NIX/nix-env -iKf $nixpkgs/pkgs/top-level/all-packages.nix -A nixUnstable
+$NIX/nix-env -iKf $nixpkgs/pkgs/top-level/all-packages.nix -A nix
 $NIX/nix-env -iKf $nixpkgs/pkgs/top-level/all-packages.nix -A coreutils
 $NIX/nix-env -iKf $nixpkgs/pkgs/top-level/all-packages.nix -A gnugrep
 #$NIX/nix-env -iKf $nixpkgs/pkgs/top-level/all-packages.nix -A kernel
diff --git a/make-disk.sh b/make-disk.sh
index 186e42e549b..6e9893a345a 100755
--- a/make-disk.sh
+++ b/make-disk.sh
@@ -35,7 +35,7 @@ initrd=/tmp/initram.img
 initdir=${archivesDir}/initdir
 initscript=$archivesDir/scripts/init.sh
 
-nix=$($NIX/nix-store -r $(echo '(import ./pkgs.nix).nixUnstable' | $NIX/nix-instantiate -))
+nix=$($NIX/nix-store -r $(echo '(import ./pkgs.nix).nix' | $NIX/nix-instantiate -))
 busybox=$($NIX/nix-store -r $(echo '(import ./pkgs.nix).busybox' | $NIX/nix-instantiate -))
 nano=$($NIX/nix-store -r $(echo '(import ./pkgs.nix).nano' | $NIX/nix-instantiate -))
 nanoDiet=$($NIX/nix-store -r $(echo '(import ./pkgs.nix).nanoDiet' | $NIX/nix-instantiate -))
diff --git a/pkgs.nix b/pkgs.nix
index b774ce33fb7..794ccce4ed8 100644
--- a/pkgs.nix
+++ b/pkgs.nix
@@ -2,7 +2,7 @@ rec {
   inherit (import /nixpkgs/trunk/pkgs/top-level/all-packages.nix {})
     stdenv kernelscripts kernel bash bashStatic coreutils coreutilsDiet
     findutilsWrapper utillinux utillinuxStatic sysvinit e2fsprogsDiet
-    e2fsprogs nettools nixUnstable subversion gcc wget which vim less screen
+    e2fsprogs nettools nix subversion gcc wget which vim less screen
     openssh binutils nixStatic strace shadowutils iputils gnumake curl gnused
     gnutar gnugrep gzip mingettyWrapper grubWrapper syslinux parted
     module_init_tools module_init_toolsStatic dhcpWrapper man nano nanoDiet
@@ -13,8 +13,7 @@ rec {
     e2fsprogs nettools subversion gcc wget which vim less screen openssh
     strace shadowutils iputils gnumake curl gnused gnutar gnugrep gzip
     mingettyWrapper grubWrapper parted module_init_tools dhcpWrapper man
-    nano;
-    nix = nixUnstable;
+    nano nix;
   };
 
   #init = (import ./init) {inherit stdenv bash bashStatic coreutilsDiet
-- 
GitLab


From 89c31b1c2c99b8accd2e7efc13a68067c07d8845 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 11 Oct 2006 11:11:41 +0000
Subject: [PATCH 0173/5331] * Sketch for purely functional NixOS configuration.

svn path=/nixu/trunk/; revision=6694
---
 pure/devices.nix    | 20 +++++++++++
 pure/disks.nix      | 84 +++++++++++++++++++++++++++++++++++++++++++++
 pure/networking.nix | 58 +++++++++++++++++++++++++++++++
 pure/top-level.nix  | 26 ++++++++++++++
 4 files changed, 188 insertions(+)
 create mode 100644 pure/devices.nix
 create mode 100644 pure/disks.nix
 create mode 100644 pure/networking.nix
 create mode 100644 pure/top-level.nix

diff --git a/pure/devices.nix b/pure/devices.nix
new file mode 100644
index 00000000000..140f8afb7e6
--- /dev/null
+++ b/pure/devices.nix
@@ -0,0 +1,20 @@
+[
+  { id = "net-dev-1";
+    comment = "Broadcom Corporation NetXtreme BCM5751 Gigabit Ethernet PCI Express";
+    location = {
+      busId = "pci-0000:02:00.0";
+      macAddr = "00:14:22:bc:68:51";
+      prefer = "macAddr"; # i.e., don't care if busId changes
+    };
+    extraModules = []; # tg3
+  }
+
+  { id = "keyboard-1";
+    comment = "Dell Computer Corp. SK-8125 Keyboard";
+    location = {
+      busId = "usb-003-003";
+    };
+    extraModules = [];
+  }
+  
+]
diff --git a/pure/disks.nix b/pure/disks.nix
new file mode 100644
index 00000000000..c1ad104fbd9
--- /dev/null
+++ b/pure/disks.nix
@@ -0,0 +1,84 @@
+{
+
+  /* Old school. */
+
+  volume1 = {
+    mountPoint = "/";
+    filesystem = "ext3";
+    location = {
+      device = "/dev/hda1";
+    };
+    creationParams = {
+      disk = "/dev/hda";
+      partition = 1;
+      startCylinder = 1;
+      endCylinder = 1000;
+    };
+  };
+  
+  volume2 = {
+    filesystem = "swap";
+    location = {
+      device = "/dev/hda2";
+    };
+    creationParams = {
+      disk = "/dev/hda";
+      startCylinder = 1001;
+      endCylinder = 1100;
+    };
+  };
+
+
+  /* With partition labels; don't care which device holds the file
+    system. */
+
+  volume1 = {
+    mountPoint = "/";
+    filesystem = "auto";
+    location = {
+      label = "ROOT_DISK";
+    };
+    # Only relevant when creating.
+    creationParams = {
+      disk = "/dev/hda";
+      partition = 1;
+      startCylinder = 1;
+      endCylinder = 1000;
+      filesystem = "ext3";
+    };
+  };
+
+
+  /* LVM. */
+
+  volume1 = {
+    mountPoint = "/data";
+    filesystem = "auto";
+    location = {
+      lvmVolumeGroup = "system";
+      lvmVolumeName = "big-volume"; # -> /dev/mapper/system-big-volume
+    };
+  };
+
+  lvmConfig = {
+    devices = [
+      ...
+    ];
+    groups = [
+      { name = "system";
+        volumes = [
+          { name = "big-volume";
+            size = 1048576; # -> 1 GiB
+          }
+          { name = "blah";
+            size = 1048576; # -> 1 GiB
+          }
+        ];
+        # When realising this configuration, only delete explicitly
+        # listed volumes for safety.
+        canDelete = ["foobar"];
+      };
+    ];
+  };
+  
+}
diff --git a/pure/networking.nix b/pure/networking.nix
new file mode 100644
index 00000000000..0f3b550a8f5
--- /dev/null
+++ b/pure/networking.nix
@@ -0,0 +1,58 @@
+{
+
+  identification = {
+    fromDHCP = false;
+    hostname = "foobar";
+  };
+
+
+  interfaces = [
+
+    # Manual configuration.
+    { name = "eth0";
+      hardware = {
+        type = "ethernet";
+        device = "net-dev-1";
+      };
+      link = {
+        ip4 = {
+          address = "192.168.1.2";
+          nameservers = [ # to be used when this interface is up
+            "1.2.3.4";
+            "1.2.3.5";
+          ];
+          routes = [ # idem, add when up
+            { destination = "0.0.0.0";
+              netmask = "0.0.0.0";
+              gateway = "192.168.1.1";
+              # iface implied (eth0)
+            }
+            { destination = "192.168.1.0";
+              netmask = "255.255.255.0";
+              # iface implied (eth0)
+            }
+          ];
+        };
+        ip6 = ...;
+      };
+    }
+
+    # Automatic configuration via DHCP
+    { name = "eth0";
+      hardware = {
+        type = "ethernet";
+        device = "net-dev-1";
+      };
+      link = {
+        useDHCP = true;
+      };
+    }
+    
+  ];
+
+
+  firewall = {
+    # ...
+  };
+
+}
\ No newline at end of file
diff --git a/pure/top-level.nix b/pure/top-level.nix
new file mode 100644
index 00000000000..46c220f5c8e
--- /dev/null
+++ b/pure/top-level.nix
@@ -0,0 +1,26 @@
+rec {
+
+  devices = import ./devices.nix;
+
+  disks = import ./disks.nix;
+
+  networking = import ./networking.nix;
+
+  systemServices = [
+    terminalRunner
+    syslogServer
+    dhcpClient
+    sshServer
+    subversionServer
+  ];
+  
+  systemInit = {
+    inherit devices disks networking;
+    inherit systemServices;
+  };
+
+  kernel = import ... {
+    externalModules = [nvidia vmware ...];
+  }
+
+}
-- 
GitLab


From 319489bf8b73f744ed78d3d9218e8aa84d112fe3 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 31 Oct 2006 12:15:08 +0000
Subject: [PATCH 0174/5331] * Don't use hardcoded /nixpkgs.

svn path=/nixu/trunk/; revision=6914
---
 pkgs.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs.nix b/pkgs.nix
index 794ccce4ed8..2fc4be64d55 100644
--- a/pkgs.nix
+++ b/pkgs.nix
@@ -1,5 +1,5 @@
 rec {
-  inherit (import /nixpkgs/trunk/pkgs/top-level/all-packages.nix {})
+  inherit (import ./pkgs/top-level/all-packages.nix {})
     stdenv kernelscripts kernel bash bashStatic coreutils coreutilsDiet
     findutilsWrapper utillinux utillinuxStatic sysvinit e2fsprogsDiet
     e2fsprogs nettools nix subversion gcc wget which vim less screen
-- 
GitLab


From c55460a027ae723f14a4cada7fed9bc5c2595cc5 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 31 Oct 2006 17:39:55 +0000
Subject: [PATCH 0175/5331] * Use tar 1.15.1 for now (1.16 is buggy). * Honour
 $TMPDIR (my /tmp is full).

svn path=/nixu/trunk/; revision=6918
---
 make-disk.sh | 14 +++++++++-----
 pkgs.nix     |  2 +-
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/make-disk.sh b/make-disk.sh
index 6e9893a345a..037f8aaeb80 100755
--- a/make-disk.sh
+++ b/make-disk.sh
@@ -1,12 +1,16 @@
 #! /bin/sh -e
 
+set -x
+
+if test -z "$TMPDIR"; then export TMPDIR=/tmp; fi
+
 # deps is an array
 declare -a deps
 
 NIXSTORE=`which nix-store`
 NIXINSTANTIATE=`which nix-instantiate`
 
-coreutils=$($NIXSTORE -r $(echo '(import ./pkgs.nix).coreutils' | $NIXINSTANTIATE -))
+coreutils=$(nix-store -r $(nix-instantiate ./pkgs.nix -A coreutils))
 
 # determine where we can find the Nix binaries
 NIX=$($coreutils/bin/dirname $(which nix-store))
@@ -15,7 +19,7 @@ NIX=$($coreutils/bin/dirname $(which nix-store))
 mktemp=$($NIX/nix-store -r $(echo '(import ./pkgs.nix).mktemp' | $NIX/nix-instantiate -))
 
 gnused=$($NIX/nix-store -r $(echo '(import ./pkgs.nix).gnused' | $NIX/nix-instantiate -))
-gnutar=$($NIX/nix-store -r $(echo '(import ./pkgs.nix).gnutar' | $NIX/nix-instantiate -))
+gnutar=$($NIX/nix-store -r $(echo '(import ./pkgs.nix).gnutar151' | $NIX/nix-instantiate -))
 cdrtools=$($NIX/nix-store -r $(echo '(import ./pkgs.nix).cdrtools' | $NIX/nix-instantiate -))
 gzip=$($NIX/nix-store -r $(echo '(import ./pkgs.nix).gzip' | $NIX/nix-instantiate -))
 cpio=$($NIX/nix-store -r $(echo '(import ./pkgs.nix).cpio' | $NIX/nix-instantiate -))
@@ -23,15 +27,15 @@ cpio=$($NIX/nix-store -r $(echo '(import ./pkgs.nix).cpio' | $NIX/nix-instantiat
 archivesDir=$($mktemp/bin/mktemp -d)
 archivesDir2=$($mktemp/bin/mktemp -d)
 manifest=${archivesDir}/MANIFEST
-nixpkgs=/nixpkgs/trunk/pkgs
+nixpkgs=./pkgs
 fill_disk=$archivesDir/scripts/fill-disk.sh
 ramdisk_login=$archivesDir/scripts/ramdisk-login.sh
 login_script=$archivesDir/scripts/login.sh
 storePaths=$archivesDir/mystorepaths
 narStorePaths=$archivesDir/narstorepaths
 validatePaths=$archivesDir/validatepaths
-bootiso=/tmp/nixos.iso
-initrd=/tmp/initram.img
+bootiso=$TMPDIR/nixos.iso
+initrd=$TMPDIR/initram.img
 initdir=${archivesDir}/initdir
 initscript=$archivesDir/scripts/init.sh
 
diff --git a/pkgs.nix b/pkgs.nix
index 2fc4be64d55..00cc0ff6dab 100644
--- a/pkgs.nix
+++ b/pkgs.nix
@@ -4,7 +4,7 @@ rec {
     findutilsWrapper utillinux utillinuxStatic sysvinit e2fsprogsDiet
     e2fsprogs nettools nix subversion gcc wget which vim less screen
     openssh binutils nixStatic strace shadowutils iputils gnumake curl gnused
-    gnutar gnugrep gzip mingettyWrapper grubWrapper syslinux parted
+    gnutar gnutar151 gnugrep gzip mingettyWrapper grubWrapper syslinux parted
     module_init_tools module_init_toolsStatic dhcpWrapper man nano nanoDiet
     eject sysklogd mktemp cdrtools cpio busybox mkinitrd ncursesDiet;
 
-- 
GitLab


From 2b995a1150ce46827fc5fe5cbb88ffa1d864ec84 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 31 Oct 2006 20:28:35 +0000
Subject: [PATCH 0176/5331] * Turns out that nested backticks (like $(...
 $(...))) are evil, since   bash doesn't check the exit status of the inner
 commands.  Replace   the $(nix-store -r $(nix-instantiate)) calls with
 nix-build.

* Some of the diet packages are gone now, use the dietlibc stdenv.

svn path=/nixu/trunk/; revision=6920
---
 make-disk.sh | 115 ++++++++++++++++++++++++---------------------------
 pkgs.nix     |  24 +++++++++--
 2 files changed, 74 insertions(+), 65 deletions(-)

diff --git a/make-disk.sh b/make-disk.sh
index 037f8aaeb80..46eb96a1fe0 100755
--- a/make-disk.sh
+++ b/make-disk.sh
@@ -7,22 +7,21 @@ if test -z "$TMPDIR"; then export TMPDIR=/tmp; fi
 # deps is an array
 declare -a deps
 
-NIXSTORE=`which nix-store`
-NIXINSTANTIATE=`which nix-instantiate`
+build="nix-build --no-out-link"
 
-coreutils=$(nix-store -r $(nix-instantiate ./pkgs.nix -A coreutils))
+coreutils=$($build ./pkgs.nix -A coreutils)
 
 # determine where we can find the Nix binaries
 NIX=$($coreutils/bin/dirname $(which nix-store))
 
 # make sure we use many of our own tools, because it is more pure
-mktemp=$($NIX/nix-store -r $(echo '(import ./pkgs.nix).mktemp' | $NIX/nix-instantiate -))
+mktemp=$($build ./pkgs.nix -A mktemp)
 
-gnused=$($NIX/nix-store -r $(echo '(import ./pkgs.nix).gnused' | $NIX/nix-instantiate -))
-gnutar=$($NIX/nix-store -r $(echo '(import ./pkgs.nix).gnutar151' | $NIX/nix-instantiate -))
-cdrtools=$($NIX/nix-store -r $(echo '(import ./pkgs.nix).cdrtools' | $NIX/nix-instantiate -))
-gzip=$($NIX/nix-store -r $(echo '(import ./pkgs.nix).gzip' | $NIX/nix-instantiate -))
-cpio=$($NIX/nix-store -r $(echo '(import ./pkgs.nix).cpio' | $NIX/nix-instantiate -))
+gnused=$($build ./pkgs.nix -A gnused)
+gnutar=$($build ./pkgs.nix -A gnutar151)
+cdrtools=$($build ./pkgs.nix -A cdrtools)
+gzip=$($build ./pkgs.nix -A gzip)
+cpio=$($build ./pkgs.nix -A cpio)
 
 archivesDir=$($mktemp/bin/mktemp -d)
 archivesDir2=$($mktemp/bin/mktemp -d)
@@ -39,52 +38,47 @@ initrd=$TMPDIR/initram.img
 initdir=${archivesDir}/initdir
 initscript=$archivesDir/scripts/init.sh
 
-nix=$($NIX/nix-store -r $(echo '(import ./pkgs.nix).nix' | $NIX/nix-instantiate -))
-busybox=$($NIX/nix-store -r $(echo '(import ./pkgs.nix).busybox' | $NIX/nix-instantiate -))
-nano=$($NIX/nix-store -r $(echo '(import ./pkgs.nix).nano' | $NIX/nix-instantiate -))
-nanoDiet=$($NIX/nix-store -r $(echo '(import ./pkgs.nix).nanoDiet' | $NIX/nix-instantiate -))
-ncurses=$($NIX/nix-store -r $(echo '(import ./pkgs.nix).ncursesDiet' | $NIX/nix-instantiate -))
+nix=$($build ./pkgs.nix -A nix)
+busybox=$($build ./pkgs.nix -A busybox)
+nano=$($build ./pkgs.nix -A nano)
+nanoDiet=$($build ./pkgs.nix -A nanoDiet)
+ncurses=$($build ./pkgs.nix -A ncursesDiet)
 
 nixDeps=$($NIX/nix-store -qR $nix)
 
-#storeExpr=$($NIX/nix-store -qR $($NIX/nix-store -r $(echo '(import ./pkgs.nix).everything' | $NIX/nix-instantiate -)))
-#storeExpr1=$($NIX/nix-store -r $(echo '(import ./pkgs.nix).boot' | $NIX/nix-instantiate -))
-storeExpr=$($NIX/nix-store -r $(echo '(import ./pkgs.nix).boot' | $NIX/nix-instantiate -))
-#storeExpr=$($NIX/nix-store -r $($NIX/nix-store -qR $(echo '(import ./pkgs.nix).everything' | $NIX/nix-instantiate -)))
+storeExpr=$($build ./pkgs.nix -A boot)
 
-kernelscripts=$($NIX/nix-store -r $(echo '(import ./pkgs.nix).kernelscripts' | $NIX/nix-instantiate -))
+kernelscripts=$($build ./pkgs.nix -A kernelscripts)
 
-mkinitrd=$($NIX/nix-store -r $(echo '(import ./pkgs.nix).mkinitrd' | $NIX/nix-instantiate -))
+mkinitrd=$($build ./pkgs.nix -A mkinitrd)
 
 ### make NAR files for everything we want to install and some more. Make sure
 ### the right URL is in there, so specify /cdrom and not cdrom
-$NIX/nix-push --copy $archivesDir $manifest --target file:///cdrom $storeExpr $($NIX/nix-store -r $(echo '(import ./pkgs.nix).kernel' | $NIX/nix-instantiate -)) $kernelscripts $mkinitrd
-#$NIX/nix-push --copy $archivesDir2 $manifest --target http://losser.labs.cs.uu.nl/~armijn/.nix $storeExpr $($NIX/nix-store -r $(echo '(import ./pkgs.nix).kernel' | $NIX/nix-instantiate -)) $kernelscripts
+$NIX/nix-push --copy $archivesDir $manifest --target file:///cdrom $storeExpr $($build ./pkgs.nix -A kernel) $kernelscripts $mkinitrd
+#$NIX/nix-push --copy $archivesDir2 $manifest --target http://losser.labs.cs.uu.nl/~armijn/.nix $storeExpr $($build ./pkgs.nix -A kernel) $kernelscripts
 
 # Location of sysvinit?
-sysvinitPath=$($NIX/nix-store -r $(echo '(import ./pkgs.nix).sysvinit' | $NIX/nix-instantiate -))
+sysvinitPath=$($build ./pkgs.nix -A sysvinit)
 
 # Location of Nix boot scripts?
-bootPath=$($NIX/nix-store -r $(echo '(import ./pkgs.nix).boot' | $NIX/nix-instantiate -))
+bootPath=$($build ./pkgs.nix -A boot)
 
-syslinux=$($NIX/nix-store -r $(echo '(import ./pkgs.nix).syslinux' | $NIX/nix-instantiate -))
+syslinux=$($build ./pkgs.nix -A syslinux)
 
-kernel=$($NIX/nix-store -r $(echo '(import ./pkgs.nix).kernel' | $NIX/nix-instantiate -))
-kernelscripts=$($NIX/nix-store -r $(echo '(import ./pkgs.nix).kernelscripts' | $NIX/nix-instantiate -))
+kernel=$($build ./pkgs.nix -A kernel)
+kernelscripts=$($build ./pkgs.nix -A kernelscripts)
 
-#nixDeps=$($NIX/nix-store -qR $(echo '(import ./pkgs.nix).nix' | $NIX/nix-instantiate -))
+utillinux=$($build ./pkgs.nix -A utillinux)
 
-utillinux=$($NIX/nix-store -r $(echo '(import ./pkgs.nix).utillinux' | $NIX/nix-instantiate -))
+gnugrep=$($build ./pkgs.nix -A gnugrep)
 
-gnugrep=$($NIX/nix-store -r $(echo '(import ./pkgs.nix).gnugrep' | $NIX/nix-instantiate -))
+grub=$($build ./pkgs.nix -A grubWrapper)
 
-grub=$($NIX/nix-store -r $(echo '(import ./pkgs.nix).grubWrapper' | $NIX/nix-instantiate -))
+findutils=$($build ./pkgs.nix -A findutilsWrapper)
 
-findutils=$($NIX/nix-store -r $(echo '(import ./pkgs.nix).findutilsWrapper' | $NIX/nix-instantiate -))
+modutils=$($build ./pkgs.nix -A module_init_toolsStatic)
 
-modutils=$($NIX/nix-store -r $(echo '(import ./pkgs.nix).module_init_toolsStatic' | $NIX/nix-instantiate -))
-
-dhcp=$($NIX/nix-store -r $(echo '(import ./pkgs.nix).dhcpWrapper' | $NIX/nix-instantiate -))
+dhcp=$($build ./pkgs.nix -A dhcpWrapper)
 
 #combideps=$($NIX/nix-store -qR $nix $utillinux $gnugrep $grub $gzip $findutils)
 combideps=$($NIX/nix-store -qR $nix $busybox $grub $findutils $modutils $dhcp $nano)
@@ -111,35 +105,32 @@ done
 
 tar zcf ${archivesDir}/nixstore.tgz $combideps
 
-utilLinux=$(nix-store -r $(echo '(import ./pkgs.nix).utillinuxStatic' | $NIX/nix-instantiate -))
-coreUtilsDiet=$($NIX/nix-store -qR $(nix-store -r $(echo '(import ./pkgs.nix).coreutilsDiet' | $NIX/nix-instantiate -)))
+utilLinux=$($build ./pkgs.nix -A utillinuxStatic)
+coreUtilsDiet=$($NIX/nix-store -qR $($build ./pkgs.nix -A coreutilsDiet))
 
 ## temporarily normal e2fsprogs until I can get it to build with dietlibc
-e2fsProgs=$($NIX/nix-store -qR $(nix-store -r $(echo '(import ./pkgs.nix).e2fsprogsDiet' | $NIX/nix-instantiate -)))
-#e2fsProgs=$($NIX/nix-store -qR $(nix-store -r $(echo '(import ./pkgs.nix).e2fsprogs' | $NIX/nix-instantiate -)))
-modUtils=$($NIX/nix-store -qR $(nix-store -r $(echo '(import ./pkgs.nix).module_init_toolsStatic' | $NIX/nix-instantiate -)))
-Grub=$($NIX/nix-store -qR $(nix-store -r $(echo '(import ./pkgs.nix).grubWrapper' | $NIX/nix-instantiate -)))
-Kernel=$($NIX/nix-store -qR $(nix-store -r $(echo '(import ./pkgs.nix).kernel' | $NIX/nix-instantiate -)))
-SysVinit=$($NIX/nix-store -qR $(nix-store -r $(echo '(import ./pkgs.nix).sysvinit' | $NIX/nix-instantiate -)))
-BootPath=$($NIX/nix-store -qR $(nix-store -r $(echo '(import ./pkgs.nix).boot' | $NIX/nix-instantiate -)))
-
-bashGlibc=$($NIX/nix-store -r $(echo '(import ./pkgs.nix).bash' | $NIX/nix-instantiate -))
-bash=$($NIX/nix-store -r $(echo '(import ./pkgs.nix).bashStatic' | $NIX/nix-instantiate -))
-coreutilsdiet=$($NIX/nix-store -r $(echo '(import ./pkgs.nix).coreutilsDiet' | $NIX/nix-instantiate -))
-#findutils=$($NIX/nix-store -q $(echo '(import ./pkgs.nix).findutilsWrapper' | $NIX/nix-instantiate -))
-utillinux=$($NIX/nix-store -r $(echo '(import ./pkgs.nix).utillinux' | $NIX/nix-instantiate -))
-e2fsprogs=$($NIX/nix-store -r $(echo '(import ./pkgs.nix).e2fsprogsDiet' | $NIX/nix-instantiate -))
-#e2fsprogs=$($NIX/nix-store -q $(echo '(import ./pkgs.nix).e2fsprogs' | $NIX/nix-instantiate -))
-#e2fsprogs=$($NIX/nix-store -q $(echo '(import ./pkgs.nix).e2fsprogs' | $NIX/nix-instantiate -))
-modutils=$($NIX/nix-store -r $(echo '(import ./pkgs.nix).module_init_toolsStatic' | $NIX/nix-instantiate -))
-grub=$($NIX/nix-store -r $(echo '(import ./pkgs.nix).grubWrapper' | $NIX/nix-instantiate -))
-mingettyWrapper=$($NIX/nix-store -r $(echo '(import ./pkgs.nix).mingettyWrapper' | $NIX/nix-instantiate -))
-dhcp=$($NIX/nix-store -r $(echo '(import ./pkgs.nix).dhcpWrapper' | $NIX/nix-instantiate -))
-gnugrep=$($NIX/nix-store -r $(echo '(import ./pkgs.nix).gnugrep' | $NIX/nix-instantiate -))
-which=$($NIX/nix-store -r $(echo '(import ./pkgs.nix).which' | $NIX/nix-instantiate -))
-eject=$($NIX/nix-store -r $(echo '(import ./pkgs.nix).eject' | $NIX/nix-instantiate -))
-sysklogd=$($NIX/nix-store -r $(echo '(import ./pkgs.nix).sysklogd' | $NIX/nix-instantiate -))
-#kudzu=$($NIX/nix-store -r $(echo '(import ./pkgs.nix).kudzu' | $NIX/nix-instantiate -))
+e2fsProgs=$($NIX/nix-store -qR $($build ./pkgs.nix -A e2fsprogsDiet))
+#e2fsProgs=$($NIX/nix-store -qR $($build ./pkgs.nix -A e2fsprogs))
+modUtils=$($NIX/nix-store -qR $($build ./pkgs.nix -A module_init_toolsStatic))
+Grub=$($NIX/nix-store -qR $($build ./pkgs.nix -A grubWrapper))
+Kernel=$($NIX/nix-store -qR $($build ./pkgs.nix -A kernel))
+SysVinit=$($NIX/nix-store -qR $($build ./pkgs.nix -A sysvinit))
+BootPath=$($NIX/nix-store -qR $($build ./pkgs.nix -A boot))
+
+bashGlibc=$($build ./pkgs.nix -A bash)
+bash=$($build ./pkgs.nix -A diet.bash)
+coreutilsdiet=$($build ./pkgs.nix -A diet.coreutils)
+utillinux=$($build ./pkgs.nix -A utillinux)
+e2fsprogs=$($build ./pkgs.nix -A e2fsprogsDiet)
+modutils=$($build ./pkgs.nix -A module_init_toolsStatic)
+grub=$($build ./pkgs.nix -A grubWrapper)
+mingettyWrapper=$($build ./pkgs.nix -A mingettyWrapper)
+dhcp=$($build ./pkgs.nix -A dhcpWrapper)
+gnugrep=$($build ./pkgs.nix -A gnugrep)
+which=$($build ./pkgs.nix -A which)
+eject=$($build ./pkgs.nix -A eject)
+sysklogd=$($build ./pkgs.nix -A sysklogd)
+#kudzu=$($build ./pkgs.nix -A kudzu)
 
 echo creating directories for bootimage
 
diff --git a/pkgs.nix b/pkgs.nix
index 00cc0ff6dab..ea530f649d1 100644
--- a/pkgs.nix
+++ b/pkgs.nix
@@ -1,6 +1,21 @@
-rec {
-  inherit (import ./pkgs/top-level/all-packages.nix {})
-    stdenv kernelscripts kernel bash bashStatic coreutils coreutilsDiet
+let 
+
+  pkgs = import ./pkgs/top-level/all-packages.nix {};
+
+  # !!! copied from stdenv/linux/make-bootstrap-tools.nix.
+  pkgsToRemove = 
+    [ "binutils" "gcc" "coreutils" "findutils" "diffutils" "gnused" "gnugrep"
+      "gawk" "gnutar" "gzip" "bzip2" "gnumake" "bash" "patch" "patchelf"
+    ];
+    
+  pkgsDiet = import ./pkgs/top-level/all-packages.nix {
+    bootStdenv = removeAttrs (pkgs.useDietLibC pkgs.stdenv) pkgsToRemove;
+  };
+
+in rec {
+
+  inherit (pkgs)
+    stdenv kernelscripts kernel bash coreutils coreutilsDiet
     findutilsWrapper utillinux utillinuxStatic sysvinit e2fsprogsDiet
     e2fsprogs nettools nix subversion gcc wget which vim less screen
     openssh binutils nixStatic strace shadowutils iputils gnumake curl gnused
@@ -8,6 +23,8 @@ rec {
     module_init_tools module_init_toolsStatic dhcpWrapper man nano nanoDiet
     eject sysklogd mktemp cdrtools cpio busybox mkinitrd ncursesDiet;
 
+  diet = pkgsDiet;
+    
   boot = (import ./boot) {
     inherit stdenv bash coreutils findutilsWrapper utillinux sysvinit
     e2fsprogs nettools subversion gcc wget which vim less screen openssh
@@ -23,4 +40,5 @@ rec {
   #};
 
   everything = [boot sysvinit sysklogd kernelscripts kernel mkinitrd];
+  
 }
-- 
GitLab


From f546cad4b7e721a0b499940cc0f2286015febd19 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 1 Nov 2006 12:07:22 +0000
Subject: [PATCH 0177/5331] * Some fixes.

svn path=/nixu/trunk/; revision=6923
---
 fill-disk.sh | 23 +++++++++++++----------
 make-disk.sh |  2 +-
 2 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/fill-disk.sh b/fill-disk.sh
index 52078fad147..43edcb4dfab 100755
--- a/fill-disk.sh
+++ b/fill-disk.sh
@@ -1,4 +1,6 @@
-#! @bash@/bin/sh -e
+#! @bash@/bin/sh
+
+set -e
 
 export PATH=/bin:/sbin:@bash@/bin:@findutils@/bin:@e2fsprogs@/sbin:@grub@/sbin:@sysvinitPath@/sbin:@eject@/bin:@dhcp@/sbin:@modutils@/sbin:@busybox@/bin:@busybox@/sbin
 
@@ -12,7 +14,7 @@ bootPath=@bootPath@
 modutils=@modutils@
 mingetty=@mingetty@
 
-nixpkgs=/nixpkgs/trunk
+nixpkgs=/nixpkgs
 
 echo formatting target device
 
@@ -188,10 +190,10 @@ echo bringing up networking...
 #labmachine has 3c59x
 #modprobe 3c59x
 #vmware has pcnet32
-modprobe pcnet32
-dhclient eth0
+#modprobe pcnet32
+#dhclient eth0
 
-cp /etc/resolv.conf $root/etc/resolv.conf
+#cp /etc/resolv.conf $root/etc/resolv.conf
 
 #nic=`kudzu -p | grep eth | sort | uniq | cut -d ' ' -f 2`
 
@@ -204,7 +206,8 @@ echo verifying Nix DB...
 $NIX/nix-store --verify
 
 echo copying nixpkgs...
-tar --directory=$root -zxf /cdrom/nixpkgs.tgz
+mkdir -p $root/nixpkgs/pkgs
+tar --directory=$root/nixpkgs/pkgs -zxf /cdrom/nixpkgs.tgz
 
 make_dir 0755 /tmp/scripts
 cp -fa /cdrom/scripts $root/tmp
@@ -344,13 +347,13 @@ echo clearing substitutes
 
 $NIX/nix-store --clear-substitutes
 
-echo clearing network information
+#echo clearing network information
 
-rm $root/etc/resolv.conf
+#rm $root/etc/resolv.conf
 
-echo copying install log
+#echo copying install log
 
-cp /tmp/install-log $root/root
+#cp /tmp/install-log $root/root
 
 # bizar. busybox umount doesn't like things with --bind it seems.
 echo umounting filesystem
diff --git a/make-disk.sh b/make-disk.sh
index 46eb96a1fe0..4d0a12e08f9 100755
--- a/make-disk.sh
+++ b/make-disk.sh
@@ -156,7 +156,7 @@ $coreutils/bin/mkdir -p ${initdir}/var/state/dhcp
 echo copying nixpkgs
 
 #svn export ${nixpkgs} ${archivesDir}/pkgs
-tar -zcf  ${archivesDir}/nixpkgs.tgz ${nixpkgs}
+(cd $nixpkgs && tar -zcf  ${archivesDir}/nixpkgs.tgz .)
 
 #echo copying packages from store
 
-- 
GitLab


From fff70110669973a561019f2c23e59fca5c9d0244 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 2 Nov 2006 17:56:50 +0000
Subject: [PATCH 0178/5331] Purifying the NixOS build stuff.

* make-initrd.nix: builds a initial RAM disk.  The resulting initrd
  will contain just a Nix store containing the specified lists of
  packages, with a symlink `/init' to the actual init program in the
  Nix store.

* make-iso9660-image.nix: builds a bootable ISO image.

* rescue-system.nix: builds a bootable ISO image (using the two
  function above) that boots into a very minimal Linux environment
  containing (at the moment) the dietlibc-based bash and coreutils,
  loaded from the initrd.  Eventually this should become a two-stage
  boot (load kernel modules from the initrd, mount the actual root
  file system (e.g., the installation CD), call the real init).

  The rescue system (probably a misnomer) should become the minimal
  environment necessary for the installer (on CD) and the boot process
  of an installed NixOS (on HD).

svn path=/nixu/trunk/; revision=6926
---
 test/isolinux.cfg           |  6 +++++
 test/make-initrd.nix        | 20 ++++++++++++++++
 test/make-initrd.sh         | 20 ++++++++++++++++
 test/make-iso9660-image.nix | 28 ++++++++++++++++++++++
 test/make-iso9660-image.sh  | 10 ++++++++
 test/rescue-system.nix      | 47 +++++++++++++++++++++++++++++++++++++
 6 files changed, 131 insertions(+)
 create mode 100644 test/isolinux.cfg
 create mode 100644 test/make-initrd.nix
 create mode 100644 test/make-initrd.sh
 create mode 100644 test/make-iso9660-image.nix
 create mode 100644 test/make-iso9660-image.sh
 create mode 100644 test/rescue-system.nix

diff --git a/test/isolinux.cfg b/test/isolinux.cfg
new file mode 100644
index 00000000000..be947a949f7
--- /dev/null
+++ b/test/isolinux.cfg
@@ -0,0 +1,6 @@
+default linux
+prompt 1
+timeout 60
+label linux
+  kernel vmlinuz
+  append initrd=initrd
diff --git a/test/make-initrd.nix b/test/make-initrd.nix
new file mode 100644
index 00000000000..f850e1cf657
--- /dev/null
+++ b/test/make-initrd.nix
@@ -0,0 +1,20 @@
+# Create an initial ramdisk containing the specified set of packages.
+# An initial ramdisk is used during the initial stages of booting a
+# Linux system.  It is loaded by the boot loader along with the kernel
+# image.  It's supposed to contain everything (such as kernel modules)
+# necessary to allow us to mount the root file system.  Once the root
+# file system is mounted, the `real' boot script can be called.
+#
+# An initrd is really just a gzipped cpio archive.
+#
+# A symlink `/init' is made to the store path passed in the `init'
+# argument.
+
+{stdenv, cpio, packages, init}:
+
+stdenv.mkDerivation {
+  name = "initrd";
+  builder = ./make-initrd.sh;
+  buildInputs = [cpio];
+  inherit packages init;
+}
diff --git a/test/make-initrd.sh b/test/make-initrd.sh
new file mode 100644
index 00000000000..f3b522d5384
--- /dev/null
+++ b/test/make-initrd.sh
@@ -0,0 +1,20 @@
+source $stdenv/setup
+
+set -o pipefail
+
+# Get the paths in the closure of `packages'.  Unfortunately, the only
+# way to get the closure is to call Nix, which is strictly speaking
+# forbidden.  But we do it anyway.  In time, we should add a feature
+# to Nix to let Nix pass closures to builders.
+packagesClosure=$(/nix/bin/nix-store -qR $packages $init)
+
+# Paths in cpio archives *must* be relative, otherwise the kernel
+# won't unpack 'em.
+mkdir root
+cd root
+cp -prvd --parents $packagesClosure .
+
+# Put the closure in a gzipped cpio archive.
+ensureDir $out
+ln -s $init init
+find * -print0 | cpio -ov -H newc --null | gzip -9 > $out/initrd
diff --git a/test/make-iso9660-image.nix b/test/make-iso9660-image.nix
new file mode 100644
index 00000000000..976f7047fd4
--- /dev/null
+++ b/test/make-iso9660-image.nix
@@ -0,0 +1,28 @@
+{ stdenv, cdrtools
+
+  # The file name of the resulting ISO image.
+, isoName ? "cd.iso"
+
+, # The files and directories to be placed in the ISO file system.
+  # This is a list of attribute sets {source, target} where `source'
+  # is the file system object (regular file or directory) to be
+  # grafted in the file system at path `target'.
+  contents
+
+  # Whether this should be an El-Torito bootable CD.
+, bootable ? false
+
+  # The path (in the ISO file system) of the boot image.
+, bootImage ? ""
+
+}:
+
+assert bootable -> bootImage != "";
+
+stdenv.mkDerivation {
+  name = "iso9660-image";
+  builder = ./make-iso9660-image.sh;
+  buildInputs = [cdrtools];
+  inherit isoName bootable bootImage;
+  graftList = map ({source, target}: target + "=" + source) contents;
+}
diff --git a/test/make-iso9660-image.sh b/test/make-iso9660-image.sh
new file mode 100644
index 00000000000..7e9017f41a1
--- /dev/null
+++ b/test/make-iso9660-image.sh
@@ -0,0 +1,10 @@
+source $stdenv/setup
+
+ensureDir $out
+
+if test -n "$bootable"; then
+    bootFlags="-b $bootImage -c boot.cat -no-emul-boot -boot-load-size 4"
+fi
+
+# !!! -f is a quick hack.
+mkisofs -r -J -f -o $out/$isoName $bootFlags -graft-points $graftList
diff --git a/test/rescue-system.nix b/test/rescue-system.nix
new file mode 100644
index 00000000000..ba8e0151037
--- /dev/null
+++ b/test/rescue-system.nix
@@ -0,0 +1,47 @@
+rec {
+
+  pkgs = import ./pkgs/top-level/all-packages.nix {};
+
+  stdenvLinuxStuff = import ./pkgs/stdenv/linux {
+    system = pkgs.stdenv.system;
+    allPackages = import ./pkgs/top-level/all-packages.nix;
+  };
+
+  bash = pkgs.bash;
+
+  
+  initialRamdisk = import ./make-initrd.nix {
+    inherit (pkgs) stdenv cpio;
+    packages = [
+      stdenvLinuxStuff.staticTools
+    ];
+    init = stdenvLinuxStuff.bootstrapTools.bash;
+  };
+
+  
+  rescueCD = import ./make-iso9660-image.nix {
+    inherit (pkgs) stdenv cdrtools;
+    isoName = "nixos.iso";
+    
+    contents = [
+      { source = pkgs.syslinux + "/lib/syslinux/isolinux.bin";
+        target = "isolinux/isolinux.bin";
+      }
+      { source = ./isolinux.cfg;
+        target = "isolinux/isolinux.cfg";
+      }
+      { source = pkgs.kernel + "/vmlinuz";
+        target = "isolinux/vmlinuz";
+      }
+      { source = initialRamdisk + "/initrd";
+          #/boot/initrd-2.6.13-15.12-default;
+        target = "isolinux/initrd";
+      }
+    ];
+    
+    bootable = true;
+    bootImage = "isolinux/isolinux.bin";
+  };
+
+    
+}
-- 
GitLab


From 333632578118f10eede229e1a43200cc61d911c3 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 2 Nov 2006 17:58:33 +0000
Subject: [PATCH 0179/5331] * Remove cruft.  BTW, to build the rescue ISO
 image:

  $ nix-build ./rescue-system.nix -A rescueCD

  Point VMware at ./result/nixos.iso and voila.

svn path=/nixu/trunk/; revision=6927
---
 test/rescue-system.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/test/rescue-system.nix b/test/rescue-system.nix
index ba8e0151037..f652e429b77 100644
--- a/test/rescue-system.nix
+++ b/test/rescue-system.nix
@@ -34,7 +34,6 @@ rec {
         target = "isolinux/vmlinuz";
       }
       { source = initialRamdisk + "/initrd";
-          #/boot/initrd-2.6.13-15.12-default;
         target = "isolinux/initrd";
       }
     ];
-- 
GitLab


From 2d31e1b6d6a6f474ed525344bc1667279a7c36a6 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 2 Nov 2006 22:48:01 +0000
Subject: [PATCH 0180/5331] * A minimal boot script for stage 1 of the boot
 (loading kernel   modules).  The closure of the boot script is all we need in
 the   initrd.

svn path=/nixu/trunk/; revision=6929
---
 test/boot-stage-1-init.sh | 17 +++++++++++++++++
 test/boot-stage-1.nix     | 16 ++++++++++++++++
 test/isolinux.cfg         |  2 +-
 test/rescue-system.nix    | 25 ++++++++++++++++++++-----
 4 files changed, 54 insertions(+), 6 deletions(-)
 create mode 100644 test/boot-stage-1-init.sh
 create mode 100644 test/boot-stage-1.nix

diff --git a/test/boot-stage-1-init.sh b/test/boot-stage-1-init.sh
new file mode 100644
index 00000000000..da5d4e56f76
--- /dev/null
+++ b/test/boot-stage-1-init.sh
@@ -0,0 +1,17 @@
+#! @shell@
+
+# Print a greeting.
+cat <<EOF
+
+<<< NixOS Stage 1 >>>
+
+EOF
+
+# Set the PATH.
+export PATH=/empty
+for i in @path@; do
+    PATH=$PATH:$i/bin
+done
+
+# Start an interactive shell.
+exec @shell@
diff --git a/test/boot-stage-1.nix b/test/boot-stage-1.nix
new file mode 100644
index 00000000000..da053a9e6c9
--- /dev/null
+++ b/test/boot-stage-1.nix
@@ -0,0 +1,16 @@
+# This Nix expression builds the script that performs the first stage
+# of booting the system: it loads the modules necessary to mount the
+# root file system, then calls /init in the root file system to start
+# the second boot stage.  The closure of the result of this expression
+# is supposed to be put into an initial RAM disk (initrd).
+
+{genericSubstituter, shell, staticTools}:
+
+genericSubstituter {
+  src = ./boot-stage-1-init.sh;
+  isExecutable = true;
+  inherit shell;
+  path = [
+    staticTools
+  ];
+}
diff --git a/test/isolinux.cfg b/test/isolinux.cfg
index be947a949f7..ff19e84c098 100644
--- a/test/isolinux.cfg
+++ b/test/isolinux.cfg
@@ -3,4 +3,4 @@ prompt 1
 timeout 60
 label linux
   kernel vmlinuz
-  append initrd=initrd
+  append initrd=initrd selinux=0 apm=on acpi=on
diff --git a/test/rescue-system.nix b/test/rescue-system.nix
index f652e429b77..994723eef1f 100644
--- a/test/rescue-system.nix
+++ b/test/rescue-system.nix
@@ -2,6 +2,10 @@ rec {
 
   pkgs = import ./pkgs/top-level/all-packages.nix {};
 
+  pkgsDiet = import ./pkgs/top-level/all-packages.nix {
+    bootStdenv = pkgs.useDietLibC pkgs.stdenv;
+  };
+
   stdenvLinuxStuff = import ./pkgs/stdenv/linux {
     system = pkgs.stdenv.system;
     allPackages = import ./pkgs/top-level/all-packages.nix;
@@ -9,16 +13,27 @@ rec {
 
   bash = pkgs.bash;
 
+
+  # The init script of boot stage 1 (loading kernel modules for
+  # mounting the root FS).
+  bootStage1 = import ./boot-stage-1.nix {
+    inherit (pkgs) genericSubstituter;
+    shell = stdenvLinuxStuff.bootstrapTools.bash;
+    staticTools = stdenvLinuxStuff.staticTools;
+  };
   
+
+  # The closure of the init script of boot stage 1 is what we put in
+  # the initial RAM disk.
   initialRamdisk = import ./make-initrd.nix {
     inherit (pkgs) stdenv cpio;
-    packages = [
-      stdenvLinuxStuff.staticTools
-    ];
-    init = stdenvLinuxStuff.bootstrapTools.bash;
+    packages = [];
+    init = bootStage1;
   };
 
-  
+
+  # Create an ISO image containing the isolinux boot loader, the
+  # kernel, and initrd produced above.
   rescueCD = import ./make-iso9660-image.nix {
     inherit (pkgs) stdenv cdrtools;
     isoName = "nixos.iso";
-- 
GitLab


From ae4b6973bb738b4c68a77f500beaf96725c8d883 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 2 Nov 2006 22:50:30 +0000
Subject: [PATCH 0181/5331] * Oops.

svn path=/nixu/trunk/; revision=6930
---
 test/boot-stage-1-init.sh | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/test/boot-stage-1-init.sh b/test/boot-stage-1-init.sh
index da5d4e56f76..c3dd9e88878 100644
--- a/test/boot-stage-1-init.sh
+++ b/test/boot-stage-1-init.sh
@@ -1,11 +1,9 @@
 #! @shell@
 
 # Print a greeting.
-cat <<EOF
-
-<<< NixOS Stage 1 >>>
-
-EOF
+echo
+echo "<<< NixOS Stage 1 >>>"
+echo
 
 # Set the PATH.
 export PATH=/empty
-- 
GitLab


From 707dd205382f1b8d060681b9edbea123f84f5164 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 2 Nov 2006 23:58:06 +0000
Subject: [PATCH 0182/5331] * Make device nodes in the stage 1 init (copied
 from ../init.sh).

svn path=/nixu/trunk/; revision=6932
---
 test/boot-stage-1-init.sh |  3 ++
 test/boot-stage-1.nix     |  1 +
 test/make-devices.sh      | 58 +++++++++++++++++++++++++++++++++++++++
 test/make-initrd.sh       |  2 +-
 4 files changed, 63 insertions(+), 1 deletion(-)
 create mode 100644 test/make-devices.sh

diff --git a/test/boot-stage-1-init.sh b/test/boot-stage-1-init.sh
index c3dd9e88878..782ff485c41 100644
--- a/test/boot-stage-1-init.sh
+++ b/test/boot-stage-1-init.sh
@@ -11,5 +11,8 @@ for i in @path@; do
     PATH=$PATH:$i/bin
 done
 
+# Create device nodes in /dev.
+source @makeDevices@
+
 # Start an interactive shell.
 exec @shell@
diff --git a/test/boot-stage-1.nix b/test/boot-stage-1.nix
index da053a9e6c9..e5477888862 100644
--- a/test/boot-stage-1.nix
+++ b/test/boot-stage-1.nix
@@ -13,4 +13,5 @@ genericSubstituter {
   path = [
     staticTools
   ];
+  makeDevices = ./make-devices.sh;
 }
diff --git a/test/make-devices.sh b/test/make-devices.sh
new file mode 100644
index 00000000000..dead9814f7a
--- /dev/null
+++ b/test/make-devices.sh
@@ -0,0 +1,58 @@
+#mknod -m 0600 /dev/console c 5 1
+mknod -m 0600 /dev/ttyS0 c 4 64
+mknod -m 0600 /dev/ttyS1 c 4 65
+mknod -m 0600 /dev/ttyS2 c 4 66
+mknod -m 0600 /dev/ttyS3 c 4 67
+
+# base UNIX devices
+mknod -m 0600 /dev/mem c 1 1
+mknod -m 0666 /dev/null c 1 3
+mknod -m 0666 /dev/zero c 1 5
+
+# tty
+mknod -m 0600 /dev/tty c 5 0
+mknod -m 0600 /dev/tty0 c 4 0
+mknod -m 0600 /dev/tty1 c 4 1
+mknod -m 0600 /dev/tty2 c 4 2
+mknod -m 0600 /dev/tty3 c 4 3
+mknod -m 0600 /dev/tty4 c 4 4
+mknod -m 0600 /dev/tty5 c 4 5
+mknod -m 0600 /dev/tty6 c 4 6
+mknod -m 0600 /dev/tty7 c 4 7
+mknod -m 0600 /dev/tty8 c 4 8
+mknod -m 0600 /dev/tty9 c 4 9
+
+mkdir -m 0755 /dev/pts
+mknod -m 0666 /dev/ptmx c 5 2
+
+# random
+
+mknod -m 0644 /dev/random c 1 8
+mknod -m 0644 /dev/urandom c 1 9
+
+mknod -m 0660 /dev/hda b 3 0
+mknod -m 0660 /dev/hda1 b 3 1
+mknod -m 0660 /dev/hda2 b 3 2
+mknod -m 0660 /dev/hda3 b 3 3
+
+mknod -m 0660 /dev/hdb b 3 64
+mknod -m 0660 /dev/hdb1 b 3 65
+mknod -m 0660 /dev/hdb2 b 3 66
+mknod -m 0660 /dev/hdb3 b 3 67
+
+mknod -m 0660 /dev/hdc b 22 0
+mknod -m 0660 /dev/hdc1 b 22 1
+mknod -m 0660 /dev/hdc2 b 22 2
+mknod -m 0660 /dev/hdc3 b 22 3
+
+mknod -m 0660 /dev/hdd b 22 64
+mknod -m 0660 /dev/hdd1 b 22 65
+mknod -m 0660 /dev/hdd2 b 22 66
+mknod -m 0660 /dev/hdd3 b 22 67
+
+#mknod -m 0660 /dev/sda b 8 0
+#mknod -m 0660 /dev/sda1 b 8 1
+#mknod -m 0660 /dev/sda2 b 8 2
+#mknod -m 0660 /dev/sda3 b 8 3
+
+mknod -m 0600 /dev/initctl p
diff --git a/test/make-initrd.sh b/test/make-initrd.sh
index f3b522d5384..2620b90eec7 100644
--- a/test/make-initrd.sh
+++ b/test/make-initrd.sh
@@ -12,7 +12,7 @@ packagesClosure=$(/nix/bin/nix-store -qR $packages $init)
 # won't unpack 'em.
 mkdir root
 cd root
-cp -prvd --parents $packagesClosure .
+cp -prd --parents $packagesClosure .
 
 # Put the closure in a gzipped cpio archive.
 ensureDir $out
-- 
GitLab


From 23381ed03f0bc4783c57e72288afa52c85429f81 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 3 Nov 2006 00:36:08 +0000
Subject: [PATCH 0183/5331] * Add the module tools, util-linux and the kernel
 modules to the   initrd.  Of course, the next step is to only add the kernel
 modules   that we're going to need.

svn path=/nixu/trunk/; revision=6934
---
 test/boot-stage-1-init.sh | 15 +++++++++++++++
 test/boot-stage-1.nix     |  8 ++++++--
 test/rescue-system.nix    | 10 +++++++++-
 3 files changed, 30 insertions(+), 3 deletions(-)

diff --git a/test/boot-stage-1-init.sh b/test/boot-stage-1-init.sh
index 782ff485c41..629e6c24745 100644
--- a/test/boot-stage-1-init.sh
+++ b/test/boot-stage-1-init.sh
@@ -9,10 +9,25 @@ echo
 export PATH=/empty
 for i in @path@; do
     PATH=$PATH:$i/bin
+    if test -e $i/sbin; then
+        PATH=$PATH:$i/sbin
+    fi
 done
 
+# Mount special file systems.
+mkdir /etc # to shut up mount
+touch /etc/fstab # idem
+mkdir /proc
+mount -t proc proc /proc
+mkdir /sys
+mount -t sysfs sys /sys
+
 # Create device nodes in /dev.
 source @makeDevices@
 
+# Load some kernel modules.
+export MODULE_DIR=@kernel@
+modprobe ide_disk
+
 # Start an interactive shell.
 exec @shell@
diff --git a/test/boot-stage-1.nix b/test/boot-stage-1.nix
index e5477888862..9fed0020c76 100644
--- a/test/boot-stage-1.nix
+++ b/test/boot-stage-1.nix
@@ -4,14 +4,18 @@
 # the second boot stage.  The closure of the result of this expression
 # is supposed to be put into an initial RAM disk (initrd).
 
-{genericSubstituter, shell, staticTools}:
+{ genericSubstituter, shell, staticTools
+, module_init_tools, utillinux, kernel
+}:
 
 genericSubstituter {
   src = ./boot-stage-1-init.sh;
   isExecutable = true;
-  inherit shell;
+  inherit shell kernel;
   path = [
     staticTools
+    module_init_tools
+    utillinux
   ];
   makeDevices = ./make-devices.sh;
 }
diff --git a/test/rescue-system.nix b/test/rescue-system.nix
index 994723eef1f..9491e8538e5 100644
--- a/test/rescue-system.nix
+++ b/test/rescue-system.nix
@@ -14,10 +14,18 @@ rec {
   bash = pkgs.bash;
 
 
+  # Determine the set of modules that we need to mount the root FS.
+  modulesClosure = import ./modules-closure.nix {
+    inherit (pkgs) stdenv kernel;
+    rootModules = "ide-cd";
+  };
+
+
   # The init script of boot stage 1 (loading kernel modules for
   # mounting the root FS).
   bootStage1 = import ./boot-stage-1.nix {
-    inherit (pkgs) genericSubstituter;
+    inherit (pkgs) genericSubstituter
+      module_init_tools utillinux kernel;
     shell = stdenvLinuxStuff.bootstrapTools.bash;
     staticTools = stdenvLinuxStuff.staticTools;
   };
-- 
GitLab


From 6eb94a9bfd5271cab21a3f4b75e289bf8ce0f145 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 3 Nov 2006 09:45:06 +0000
Subject: [PATCH 0184/5331] * Load some modules, mount the install CD.

svn path=/nixu/trunk/; revision=6936
---
 test/boot-stage-1-init.sh | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/test/boot-stage-1-init.sh b/test/boot-stage-1-init.sh
index 629e6c24745..a5957fada5f 100644
--- a/test/boot-stage-1-init.sh
+++ b/test/boot-stage-1-init.sh
@@ -26,8 +26,15 @@ mount -t sysfs sys /sys
 source @makeDevices@
 
 # Load some kernel modules.
-export MODULE_DIR=@kernel@
-modprobe ide_disk
+export MODULE_DIR=@kernel@/lib/modules/
+modprobe ide-generic
+modprobe ide-disk
+modprobe ide-cd
+
+# Mount the installation CD.
+mkdir /mnt
+mkdir /mnt/cdrom
+mount -o ro /dev/hdc /mnt/cdrom
 
 # Start an interactive shell.
 exec @shell@
-- 
GitLab


From 412fcfe2f7029742ac5f9c14c19d4503ef789ba5 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 3 Nov 2006 09:49:34 +0000
Subject: [PATCH 0185/5331] * Fixes.

svn path=/nixu/trunk/; revision=6937
---
 make-disk.sh | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/make-disk.sh b/make-disk.sh
index 4d0a12e08f9..d3fe502301a 100755
--- a/make-disk.sh
+++ b/make-disk.sh
@@ -24,7 +24,6 @@ gzip=$($build ./pkgs.nix -A gzip)
 cpio=$($build ./pkgs.nix -A cpio)
 
 archivesDir=$($mktemp/bin/mktemp -d)
-archivesDir2=$($mktemp/bin/mktemp -d)
 manifest=${archivesDir}/MANIFEST
 nixpkgs=./pkgs
 fill_disk=$archivesDir/scripts/fill-disk.sh
@@ -55,7 +54,6 @@ mkinitrd=$($build ./pkgs.nix -A mkinitrd)
 ### make NAR files for everything we want to install and some more. Make sure
 ### the right URL is in there, so specify /cdrom and not cdrom
 $NIX/nix-push --copy $archivesDir $manifest --target file:///cdrom $storeExpr $($build ./pkgs.nix -A kernel) $kernelscripts $mkinitrd
-#$NIX/nix-push --copy $archivesDir2 $manifest --target http://losser.labs.cs.uu.nl/~armijn/.nix $storeExpr $($build ./pkgs.nix -A kernel) $kernelscripts
 
 # Location of sysvinit?
 sysvinitPath=$($build ./pkgs.nix -A sysvinit)
@@ -106,7 +104,7 @@ done
 tar zcf ${archivesDir}/nixstore.tgz $combideps
 
 utilLinux=$($build ./pkgs.nix -A utillinuxStatic)
-coreUtilsDiet=$($NIX/nix-store -qR $($build ./pkgs.nix -A coreutilsDiet))
+coreUtilsDiet=$($build ./pkgs.nix -A diet.coreutils)
 
 ## temporarily normal e2fsprogs until I can get it to build with dietlibc
 e2fsProgs=$($NIX/nix-store -qR $($build ./pkgs.nix -A e2fsprogsDiet))
-- 
GitLab


From a94dd5c8b1c71ccda2e77047a926efc219392c36 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 3 Nov 2006 11:47:40 +0000
Subject: [PATCH 0186/5331] * Given a kernel build (with modules in
 $kernel/lib/modules/VERSION),   `modules-closure.nix' produces a module tree
 in   $out/lib/modules/VERSION that contains only the modules identified   by
 `rootModules', plus their dependencies.  It also generates an   appropriate
 modules.dep.  This is useful for initrds, as we   obviously don't want a copy
 of the entire kernel module tree in the   initial RAM disk.

svn path=/nixu/trunk/; revision=6939
---
 test/boot-stage-1-init.sh |  2 +-
 test/boot-stage-1.nix     |  6 +++---
 test/modules-closure.nix  | 13 +++++++++++++
 test/modules-closure.sh   | 37 +++++++++++++++++++++++++++++++++++++
 test/rescue-system.nix    | 11 +++++------
 5 files changed, 59 insertions(+), 10 deletions(-)
 create mode 100644 test/modules-closure.nix
 create mode 100644 test/modules-closure.sh

diff --git a/test/boot-stage-1-init.sh b/test/boot-stage-1-init.sh
index a5957fada5f..f216f05e237 100644
--- a/test/boot-stage-1-init.sh
+++ b/test/boot-stage-1-init.sh
@@ -26,7 +26,7 @@ mount -t sysfs sys /sys
 source @makeDevices@
 
 # Load some kernel modules.
-export MODULE_DIR=@kernel@/lib/modules/
+export MODULE_DIR=@modules@/lib/modules/
 modprobe ide-generic
 modprobe ide-disk
 modprobe ide-cd
diff --git a/test/boot-stage-1.nix b/test/boot-stage-1.nix
index 9fed0020c76..1099fe08a21 100644
--- a/test/boot-stage-1.nix
+++ b/test/boot-stage-1.nix
@@ -5,17 +5,17 @@
 # is supposed to be put into an initial RAM disk (initrd).
 
 { genericSubstituter, shell, staticTools
-, module_init_tools, utillinux, kernel
+, module_init_tools, utillinux, modules
 }:
 
 genericSubstituter {
   src = ./boot-stage-1-init.sh;
   isExecutable = true;
-  inherit shell kernel;
+  inherit shell modules;
   path = [
     staticTools
     module_init_tools
-    utillinux
+#    utillinux
   ];
   makeDevices = ./make-devices.sh;
 }
diff --git a/test/modules-closure.nix b/test/modules-closure.nix
new file mode 100644
index 00000000000..86015a8b182
--- /dev/null
+++ b/test/modules-closure.nix
@@ -0,0 +1,13 @@
+# Given a kernel build (with modules in $kernel/lib/modules/VERSION),
+# produce a module tree in $out/lib/modules/VERSION that contains only
+# the modules identified by `rootModules', plus their dependencies.
+# Also generate an appropriate modules.dep.
+
+{stdenv, kernel, rootModules, module_init_tools}:
+
+stdenv.mkDerivation {
+  name = kernel.name + "-shrunk";
+  builder = ./modules-closure.sh;
+  inherit kernel rootModules module_init_tools;
+  allowedReferences = ["out"];
+}
diff --git a/test/modules-closure.sh b/test/modules-closure.sh
new file mode 100644
index 00000000000..c5fcbba87f1
--- /dev/null
+++ b/test/modules-closure.sh
@@ -0,0 +1,37 @@
+source $stdenv/setup
+
+set -o pipefail
+
+PATH=$module_init_tools/sbin:$PATH
+
+version=$(cd $kernel/lib/modules && ls -d *)
+
+echo "kernel version is $version"
+
+export MODULE_DIR=$kernel/lib/modules/
+
+# Determine the dependencies of each root module.
+closure=
+for module in $rootModules; do
+    echo "root module: $module"
+    deps=$(modprobe --set-version "$version" --show-depends "$module" \
+        | sed 's/^insmod //')
+    for i in $deps; do echo $i; done
+    closure="$closure $deps"
+done
+
+# Remove duplicates.
+closure=$(for i in $closure; do echo $i; done | sort | uniq)
+
+echo "closure:"
+ensureDir $out
+for module in $closure; do
+    echo $module
+    target=$(echo $module | sed "s^$kernel^$out^")
+    mkdir -p $(dirname $target)
+    cp $module $target
+    grep "^$module" $kernel/lib/modules/$version/modules.dep \
+        | sed "s^$kernel^$out^g" \
+        >> $out/lib/modules/$version/modules.dep
+done
+
diff --git a/test/rescue-system.nix b/test/rescue-system.nix
index 9491e8538e5..b42030b659c 100644
--- a/test/rescue-system.nix
+++ b/test/rescue-system.nix
@@ -11,21 +11,20 @@ rec {
     allPackages = import ./pkgs/top-level/all-packages.nix;
   };
 
-  bash = pkgs.bash;
-
 
   # Determine the set of modules that we need to mount the root FS.
   modulesClosure = import ./modules-closure.nix {
-    inherit (pkgs) stdenv kernel;
-    rootModules = "ide-cd";
+    inherit (pkgs) stdenv kernel module_init_tools;
+    rootModules = ["ide-cd" "ide-disk" "ide-generic"];
   };
 
 
   # The init script of boot stage 1 (loading kernel modules for
   # mounting the root FS).
   bootStage1 = import ./boot-stage-1.nix {
-    inherit (pkgs) genericSubstituter
-      module_init_tools utillinux kernel;
+    inherit (pkgs) genericSubstituter utillinux;
+    inherit (pkgsDiet) module_init_tools;
+    modules = modulesClosure;
     shell = stdenvLinuxStuff.bootstrapTools.bash;
     staticTools = stdenvLinuxStuff.staticTools;
   };
-- 
GitLab


From 1aa35c8267d1a6319bef51ce969f8863b7928558 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 3 Nov 2006 13:35:02 +0000
Subject: [PATCH 0187/5331] * Instead of adding all of util-linux to the initd,
 add just mount   (and nuke its references so that we don't get glibc etc.). 
 The   initrd is now 3.2 MB (and that includes the entire staticTools from  
 the stdenv bootstrap, most of which we don't actually need).

svn path=/nixu/trunk/; revision=6942
---
 test/boot-stage-1.nix  |  4 ++--
 test/rescue-system.nix | 19 ++++++++++++++++++-
 2 files changed, 20 insertions(+), 3 deletions(-)

diff --git a/test/boot-stage-1.nix b/test/boot-stage-1.nix
index 1099fe08a21..329ca513a95 100644
--- a/test/boot-stage-1.nix
+++ b/test/boot-stage-1.nix
@@ -5,7 +5,7 @@
 # is supposed to be put into an initial RAM disk (initrd).
 
 { genericSubstituter, shell, staticTools
-, module_init_tools, utillinux, modules
+, module_init_tools, extraUtils, modules
 }:
 
 genericSubstituter {
@@ -15,7 +15,7 @@ genericSubstituter {
   path = [
     staticTools
     module_init_tools
-#    utillinux
+    extraUtils
   ];
   makeDevices = ./make-devices.sh;
 }
diff --git a/test/rescue-system.nix b/test/rescue-system.nix
index b42030b659c..5e1e47a112f 100644
--- a/test/rescue-system.nix
+++ b/test/rescue-system.nix
@@ -6,6 +6,10 @@ rec {
     bootStdenv = pkgs.useDietLibC pkgs.stdenv;
   };
 
+  pkgsStatic = import ./pkgs/top-level/all-packages.nix {
+    bootStdenv = pkgs.makeStaticBinaries pkgs.stdenv;
+  };
+
   stdenvLinuxStuff = import ./pkgs/stdenv/linux {
     system = pkgs.stdenv.system;
     allPackages = import ./pkgs/top-level/all-packages.nix;
@@ -19,11 +23,24 @@ 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 {
+    name = "extra-utils";
+    builder = builtins.toFile "builder.sh"
+      "source $stdenv/setup; ensureDir $out/bin; cp $utillinux/bin/mount $out/bin; nuke-refs $out/bin/mount";
+    buildInputs = [pkgs.nukeReferences];
+    inherit (pkgsStatic) utillinux;
+  };
+  
+
   # The init script of boot stage 1 (loading kernel modules for
   # mounting the root FS).
   bootStage1 = import ./boot-stage-1.nix {
-    inherit (pkgs) genericSubstituter utillinux;
+    inherit (pkgs) genericSubstituter;
     inherit (pkgsDiet) module_init_tools;
+    inherit extraUtils;
     modules = modulesClosure;
     shell = stdenvLinuxStuff.bootstrapTools.bash;
     staticTools = stdenvLinuxStuff.staticTools;
-- 
GitLab


From 14cc7b88289ce90470f9b5556707e9cd2becb519 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 3 Nov 2006 23:41:57 +0000
Subject: [PATCH 0188/5331] * Support adding the closure of a set of store
 paths to the ISO   image (along with an /init symlink for stage 2 of the boot
   process).

svn path=/nixu/trunk/; revision=6944
---
 test/make-iso9660-image.nix | 14 ++++++++++++--
 test/make-iso9660-image.sh  | 23 ++++++++++++++++++++++-
 test/rescue-system.nix      |  2 ++
 3 files changed, 36 insertions(+), 3 deletions(-)

diff --git a/test/make-iso9660-image.nix b/test/make-iso9660-image.nix
index 976f7047fd4..f08aac3abc5 100644
--- a/test/make-iso9660-image.nix
+++ b/test/make-iso9660-image.nix
@@ -9,6 +9,15 @@
   # grafted in the file system at path `target'.
   contents
 
+, # In addition to `contents', the closure of the store paths listed
+  # in `packages' are also placed in the file system.
+  packages ? []
+
+, # `init' should be a store path, the closure of which is added to
+  # the image, just like `packages'.  However, in addition, a symlink
+  # `/init' to `init' will be created.
+  init ? null
+
   # Whether this should be an El-Torito bootable CD.
 , bootable ? false
 
@@ -23,6 +32,7 @@ stdenv.mkDerivation {
   name = "iso9660-image";
   builder = ./make-iso9660-image.sh;
   buildInputs = [cdrtools];
-  inherit isoName bootable bootImage;
-  graftList = map ({source, target}: target + "=" + source) contents;
+  inherit isoName packages init bootable bootImage;
+  sources = map ({source, target}: source) contents;
+  targets = map ({source, target}: target) contents;
 }
diff --git a/test/make-iso9660-image.sh b/test/make-iso9660-image.sh
index 7e9017f41a1..a2d98044c13 100644
--- a/test/make-iso9660-image.sh
+++ b/test/make-iso9660-image.sh
@@ -6,5 +6,26 @@ if test -n "$bootable"; then
     bootFlags="-b $bootImage -c boot.cat -no-emul-boot -boot-load-size 4"
 fi
 
+graftList=
+sources_=($sources)
+targets_=($targets)
+for ((i = 0; i < ${#targets_[@]}; i++)); do
+    graftList="$graftList ${targets_[$i]}=$(readlink -f ${sources_[$i]})"
+done
+
+# !!! Just as with make-initrd.nix, the call to Nix here needs to be
+# fixed.
+packagesClosure=$(/nix/bin/nix-store -qR $packages $init)
+
+for i in $packagesClosure; do
+    graftList="$graftList ${i:1}=$i"
+done
+
+if test -n "$init"; then
+    ln -s $init init
+    graftList="$graftList init=init"
+fi
+
 # !!! -f is a quick hack.
-mkisofs -r -J -f -o $out/$isoName $bootFlags -graft-points $graftList
+mkisofs -r -J -o $out/$isoName $bootFlags \
+    -graft-points $graftList
diff --git a/test/rescue-system.nix b/test/rescue-system.nix
index 5e1e47a112f..d87de72715e 100644
--- a/test/rescue-system.nix
+++ b/test/rescue-system.nix
@@ -76,6 +76,8 @@ rec {
         target = "isolinux/initrd";
       }
     ];
+
+    init = pkgs.bash + "/bin/sh";
     
     bootable = true;
     bootImage = "isolinux/isolinux.bin";
-- 
GitLab


From 1691c6667326f5e3b9209444c38be28451f3820a Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sat, 4 Nov 2006 00:01:13 +0000
Subject: [PATCH 0189/5331] * Nix expression for stage 2. * Start stage 2 from
 stage 1.

svn path=/nixu/trunk/; revision=6945
---
 test/boot-stage-1-init.sh |  7 ++++++-
 test/boot-stage-2-init.sh | 31 +++++++++++++++++++++++++++++++
 test/boot-stage-2.nix     | 14 ++++++++++++++
 test/rescue-system.nix    | 10 +++++++++-
 4 files changed, 60 insertions(+), 2 deletions(-)
 create mode 100644 test/boot-stage-2-init.sh
 create mode 100644 test/boot-stage-2.nix

diff --git a/test/boot-stage-1-init.sh b/test/boot-stage-1-init.sh
index f216f05e237..2100d864d04 100644
--- a/test/boot-stage-1-init.sh
+++ b/test/boot-stage-1-init.sh
@@ -36,5 +36,10 @@ mkdir /mnt
 mkdir /mnt/cdrom
 mount -o ro /dev/hdc /mnt/cdrom
 
-# Start an interactive shell.
+# Start stage 2.  !!! We use chroot for now, but I guess that should
+# be pivot_root or so.
+chroot /mnt/cdrom /init
+
+# If starting stage 2 failed, start an interactive shell.
+echo "Stage 2 failed, starting emergency shell..."
 exec @shell@
diff --git a/test/boot-stage-2-init.sh b/test/boot-stage-2-init.sh
new file mode 100644
index 00000000000..4be4a29de2d
--- /dev/null
+++ b/test/boot-stage-2-init.sh
@@ -0,0 +1,31 @@
+#! @shell@
+
+# !!! copied from stage 1; remove duplication
+
+# Print a greeting.
+echo
+echo "<<< NixOS Stage 2 >>>"
+echo
+
+# Set the PATH.
+export PATH=/empty
+for i in @path@; do
+    PATH=$PATH:$i/bin
+    if test -e $i/sbin; then
+        PATH=$PATH:$i/sbin
+    fi
+done
+
+# Mount special file systems.
+mkdir /etc # to shut up mount
+touch /etc/fstab # idem
+mkdir /proc
+mount -t proc proc /proc
+mkdir /sys
+mount -t sysfs sys /sys
+
+# Create device nodes in /dev.
+source @makeDevices@
+
+# Start an interactive shell.
+exec @shell@
diff --git a/test/boot-stage-2.nix b/test/boot-stage-2.nix
new file mode 100644
index 00000000000..5605bd593a5
--- /dev/null
+++ b/test/boot-stage-2.nix
@@ -0,0 +1,14 @@
+{ genericSubstituter, shell, coreutils
+, utillinux
+}:
+
+genericSubstituter {
+  src = ./boot-stage-2-init.sh;
+  isExecutable = true;
+  inherit shell;
+  path = [
+    coreutils
+    utillinux
+  ];
+  makeDevices = ./make-devices.sh;
+}
diff --git a/test/rescue-system.nix b/test/rescue-system.nix
index d87de72715e..b20a662c599 100644
--- a/test/rescue-system.nix
+++ b/test/rescue-system.nix
@@ -56,6 +56,14 @@ rec {
   };
 
 
+  # The init script of boot stage 2, which is supposed to do
+  # everything else to bring up the system.
+  bootStage2 = import ./boot-stage-2.nix {
+    inherit (pkgs) genericSubstituter coreutils utillinux;
+    shell = pkgs.bash + "/bin/sh";
+  };
+
+
   # Create an ISO image containing the isolinux boot loader, the
   # kernel, and initrd produced above.
   rescueCD = import ./make-iso9660-image.nix {
@@ -77,7 +85,7 @@ rec {
       }
     ];
 
-    init = pkgs.bash + "/bin/sh";
+    init = bootStage2;
     
     bootable = true;
     bootImage = "isolinux/isolinux.bin";
-- 
GitLab


From db08678bd4a6d102eaf51092255059fea2603d66 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sat, 4 Nov 2006 00:18:22 +0000
Subject: [PATCH 0190/5331] * Create dummy mount points in the ISO image for
 /proc etc.

svn path=/nixu/trunk/; revision=6946
---
 test/boot-stage-1-init.sh |  4 ++--
 test/boot-stage-2-init.sh | 10 +++++-----
 test/rescue-system.nix    | 11 +++++++++++
 3 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/test/boot-stage-1-init.sh b/test/boot-stage-1-init.sh
index 2100d864d04..091dc4310de 100644
--- a/test/boot-stage-1-init.sh
+++ b/test/boot-stage-1-init.sh
@@ -18,9 +18,9 @@ done
 mkdir /etc # to shut up mount
 touch /etc/fstab # idem
 mkdir /proc
-mount -t proc proc /proc
+mount -t proc none /proc
 mkdir /sys
-mount -t sysfs sys /sys
+mount -t sysfs none /sys
 
 # Create device nodes in /dev.
 source @makeDevices@
diff --git a/test/boot-stage-2-init.sh b/test/boot-stage-2-init.sh
index 4be4a29de2d..a9e9c63708b 100644
--- a/test/boot-stage-2-init.sh
+++ b/test/boot-stage-2-init.sh
@@ -17,12 +17,12 @@ for i in @path@; do
 done
 
 # Mount special file systems.
-mkdir /etc # to shut up mount
+mount -t tmpfs none /etc -n # to shut up mount
 touch /etc/fstab # idem
-mkdir /proc
-mount -t proc proc /proc
-mkdir /sys
-mount -t sysfs sys /sys
+mount -t proc none /proc
+mount -t sysfs none /sys
+mount -t tmpfs none /dev
+mount -t tmpfs none /tmp
 
 # Create device nodes in /dev.
 source @makeDevices@
diff --git a/test/rescue-system.nix b/test/rescue-system.nix
index b20a662c599..da1c2544401 100644
--- a/test/rescue-system.nix
+++ b/test/rescue-system.nix
@@ -64,6 +64,14 @@ rec {
   };
 
 
+  # Since the CD is read-only, the mount points must be on disk.
+  cdMountPoints = pkgs.stdenv.mkDerivation {
+    name = "mount-points";
+    builder = builtins.toFile "builder.sh"
+      "source $stdenv/setup; mkdir $out; cd $out; mkdir proc sys tmp etc dev";
+  };
+
+
   # Create an ISO image containing the isolinux boot loader, the
   # kernel, and initrd produced above.
   rescueCD = import ./make-iso9660-image.nix {
@@ -83,6 +91,9 @@ rec {
       { source = initialRamdisk + "/initrd";
         target = "isolinux/initrd";
       }
+      { source = cdMountPoints;
+        target = "/";
+      }
     ];
 
     init = bootStage2;
-- 
GitLab


From eb1c50ebc91cf79f167964331fed932b3c24b400 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sat, 4 Nov 2006 11:27:08 +0000
Subject: [PATCH 0191/5331] * Version number, stable marker.

svn path=/nixu/trunk/; revision=6947
---
 STABLE  | 1 +
 VERSION | 1 +
 2 files changed, 2 insertions(+)
 create mode 100644 STABLE
 create mode 100644 VERSION

diff --git a/STABLE b/STABLE
new file mode 100644
index 00000000000..c227083464f
--- /dev/null
+++ b/STABLE
@@ -0,0 +1 @@
+0
\ No newline at end of file
diff --git a/VERSION b/VERSION
new file mode 100644
index 00000000000..ceab6e11ece
--- /dev/null
+++ b/VERSION
@@ -0,0 +1 @@
+0.1
\ No newline at end of file
-- 
GitLab


From b3c6510393233f1e6b851f8f7db0fb95fcb95c8d Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sat, 4 Nov 2006 12:00:05 +0000
Subject: [PATCH 0192/5331] * Conform to build farm conventions.

svn path=/nixu/trunk/; revision=6948
---
 test/make-iso9660-image.sh | 8 +++++---
 test/rescue-system.nix     | 6 +++++-
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/test/make-iso9660-image.sh b/test/make-iso9660-image.sh
index a2d98044c13..b4994bfa013 100644
--- a/test/make-iso9660-image.sh
+++ b/test/make-iso9660-image.sh
@@ -1,7 +1,5 @@
 source $stdenv/setup
 
-ensureDir $out
-
 if test -n "$bootable"; then
     bootFlags="-b $bootImage -c boot.cat -no-emul-boot -boot-load-size 4"
 fi
@@ -27,5 +25,9 @@ if test -n "$init"; then
 fi
 
 # !!! -f is a quick hack.
-mkisofs -r -J -o $out/$isoName $bootFlags \
+ensureDir $out/files
+mkisofs -r -J -o $out/files/$isoName $bootFlags \
     -graft-points $graftList
+
+ensureDir $out/nix-support
+echo $system > $out/nix-support/system
diff --git a/test/rescue-system.nix b/test/rescue-system.nix
index da1c2544401..69899180baf 100644
--- a/test/rescue-system.nix
+++ b/test/rescue-system.nix
@@ -1,12 +1,16 @@
+{system ? __currentSystem}:
+
 rec {
 
-  pkgs = import ./pkgs/top-level/all-packages.nix {};
+  pkgs = import ./pkgs/top-level/all-packages.nix {inherit system;};
 
   pkgsDiet = import ./pkgs/top-level/all-packages.nix {
+    inherit system;
     bootStdenv = pkgs.useDietLibC pkgs.stdenv;
   };
 
   pkgsStatic = import ./pkgs/top-level/all-packages.nix {
+    inherit system;
     bootStdenv = pkgs.makeStaticBinaries pkgs.stdenv;
   };
 
-- 
GitLab


From 07d2f691f0293a3772b5ab67633efd7b8b4bdc00 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sat, 4 Nov 2006 12:07:16 +0000
Subject: [PATCH 0193/5331] * Doh.

svn path=/nixu/trunk/; revision=6949
---
 test/make-iso9660-image.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/test/make-iso9660-image.sh b/test/make-iso9660-image.sh
index b4994bfa013..b708c05ee31 100644
--- a/test/make-iso9660-image.sh
+++ b/test/make-iso9660-image.sh
@@ -25,8 +25,8 @@ if test -n "$init"; then
 fi
 
 # !!! -f is a quick hack.
-ensureDir $out/files
-mkisofs -r -J -o $out/files/$isoName $bootFlags \
+ensureDir $out
+mkisofs -r -J -o $out/$isoName $bootFlags \
     -graft-points $graftList
 
 ensureDir $out/nix-support
-- 
GitLab


From 09cdc88291520419a0ae4c760b4c7199e26d7802 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sat, 4 Nov 2006 12:08:02 +0000
Subject: [PATCH 0194/5331] * Doh x2.

svn path=/nixu/trunk/; revision=6950
---
 test/make-iso9660-image.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/make-iso9660-image.sh b/test/make-iso9660-image.sh
index b708c05ee31..b8fcce5dddd 100644
--- a/test/make-iso9660-image.sh
+++ b/test/make-iso9660-image.sh
@@ -26,7 +26,7 @@ fi
 
 # !!! -f is a quick hack.
 ensureDir $out
-mkisofs -r -J -o $out/$isoName $bootFlags \
+mkisofs -r -J -o $out/iso/$isoName $bootFlags \
     -graft-points $graftList
 
 ensureDir $out/nix-support
-- 
GitLab


From 2e2af9df0a1ab66590ba0fdf6f23add44281ac48 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sat, 4 Nov 2006 12:08:10 +0000
Subject: [PATCH 0195/5331] * Doh x3.

svn path=/nixu/trunk/; revision=6951
---
 test/make-iso9660-image.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/make-iso9660-image.sh b/test/make-iso9660-image.sh
index b8fcce5dddd..17f44e78ff0 100644
--- a/test/make-iso9660-image.sh
+++ b/test/make-iso9660-image.sh
@@ -25,7 +25,7 @@ if test -n "$init"; then
 fi
 
 # !!! -f is a quick hack.
-ensureDir $out
+ensureDir $out/iso
 mkisofs -r -J -o $out/iso/$isoName $bootFlags \
     -graft-points $graftList
 
-- 
GitLab


From 1cec62ba5d76dd842b4cd1afe014bf86fb94b036 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sat, 4 Nov 2006 13:25:10 +0000
Subject: [PATCH 0196/5331] * Add additional packages to the path of the
 interactive shell started   at the end of stage 2. * Stage 2: set MODULE_DIR
 to point at a full module tree.

svn path=/nixu/trunk/; revision=6954
---
 test/boot-stage-2-init.sh | 11 +++++++++++
 test/boot-stage-2.nix     |  5 +++--
 test/rescue-system.nix    | 24 +++++++++++++++++++++++-
 3 files changed, 37 insertions(+), 3 deletions(-)

diff --git a/test/boot-stage-2-init.sh b/test/boot-stage-2-init.sh
index a9e9c63708b..02b440f5a36 100644
--- a/test/boot-stage-2-init.sh
+++ b/test/boot-stage-2-init.sh
@@ -27,5 +27,16 @@ mount -t tmpfs none /tmp
 # Create device nodes in /dev.
 source @makeDevices@
 
+# Ensure that the module tools can find the kernel modules.
+export MODULE_DIR=@kernel@/lib/modules/
+
+# Additional path for the interactive shell.
+for i in @extraPath@; do
+    PATH=$PATH:$i/bin
+    if test -e $i/sbin; then
+        PATH=$PATH:$i/sbin
+    fi
+done
+
 # Start an interactive shell.
 exec @shell@
diff --git a/test/boot-stage-2.nix b/test/boot-stage-2.nix
index 5605bd593a5..8f68858f536 100644
--- a/test/boot-stage-2.nix
+++ b/test/boot-stage-2.nix
@@ -1,14 +1,15 @@
 { genericSubstituter, shell, coreutils
-, utillinux
+, utillinux, kernel, path ? []
 }:
 
 genericSubstituter {
   src = ./boot-stage-2-init.sh;
   isExecutable = true;
-  inherit shell;
+  inherit shell kernel;
   path = [
     coreutils
     utillinux
   ];
+  extraPath = path;
   makeDevices = ./make-devices.sh;
 }
diff --git a/test/rescue-system.nix b/test/rescue-system.nix
index 69899180baf..216cf2009f9 100644
--- a/test/rescue-system.nix
+++ b/test/rescue-system.nix
@@ -63,8 +63,30 @@ rec {
   # The init script of boot stage 2, which is supposed to do
   # everything else to bring up the system.
   bootStage2 = import ./boot-stage-2.nix {
-    inherit (pkgs) genericSubstituter coreutils utillinux;
+    inherit (pkgs) genericSubstituter coreutils utillinux kernel;
     shell = pkgs.bash + "/bin/sh";
+
+    # Additional stuff; add whatever you want here.
+    path = [
+      pkgs.bash
+      pkgs.bzip2
+      pkgs.cpio
+      pkgs.curl
+      pkgs.e2fsprogs
+      pkgs.findutils
+      pkgs.gnugrep
+      pkgs.gnused
+      pkgs.gnutar
+      pkgs.grub
+      pkgs.gzip
+      pkgs.iputils
+      pkgs.less
+      pkgs.module_init_tools
+      pkgs.nano
+      pkgs.netcat
+      pkgs.nettools
+      pkgs.vim
+    ];
   };
 
 
-- 
GitLab


From 8a43fcd57c2718c92d5f29019b795d135db8e6de Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 6 Nov 2006 22:21:50 +0000
Subject: [PATCH 0197/5331] * Stage 1: clean up better (unmount /proc and /sys,
 remount new root   to /). * Stage 2: use sysvinit to create a bunch of
 mingetty's on virtual   consoles 1-6.  Show a nice welcoming message.  Start
 syslogd and log   everything to tty10.

svn path=/nixu/trunk/; revision=6963
---
 test/boot-stage-1-init.sh | 12 +++++++---
 test/boot-stage-2-init.sh | 46 ++++++++++++++++++++++++++++++++++++++-
 test/boot-stage-2.nix     |  5 +++--
 test/make-devices.sh      | 17 +++++----------
 test/rescue-system.nix    | 20 ++++++++++++-----
 5 files changed, 78 insertions(+), 22 deletions(-)

diff --git a/test/boot-stage-1-init.sh b/test/boot-stage-1-init.sh
index 091dc4310de..b9e2d1f4434 100644
--- a/test/boot-stage-1-init.sh
+++ b/test/boot-stage-1-init.sh
@@ -36,9 +36,15 @@ mkdir /mnt
 mkdir /mnt/cdrom
 mount -o ro /dev/hdc /mnt/cdrom
 
-# Start stage 2.  !!! We use chroot for now, but I guess that should
-# be pivot_root or so.
-chroot /mnt/cdrom /init
+# Start stage 2.
+# !!! Note: we can't use pivot_root here (the kernel gods have
+# decreed), but we could use run-init from klibc, which deletes all
+# files in the initramfs, remounts the target root on /, and chroots.
+cd /mnt/cdrom
+mount --move . /
+umount /proc # cleanup
+umount /sys
+exec chroot . /init
 
 # If starting stage 2 failed, start an interactive shell.
 echo "Stage 2 failed, starting emergency shell..."
diff --git a/test/boot-stage-2-init.sh b/test/boot-stage-2-init.sh
index 02b440f5a36..28ed1d19de3 100644
--- a/test/boot-stage-2-init.sh
+++ b/test/boot-stage-2-init.sh
@@ -23,6 +23,12 @@ mount -t proc none /proc
 mount -t sysfs none /sys
 mount -t tmpfs none /dev
 mount -t tmpfs none /tmp
+mount -t tmpfs none /var
+mount -t tmpfs none /nix/var
+
+mkdir -p /nix/var/nix/db
+mkdir -p /nix/var/nix/gcroots
+mkdir -p /nix/var/nix/temproots
 
 # Create device nodes in /dev.
 source @makeDevices@
@@ -38,5 +44,43 @@ for i in @extraPath@; do
     fi
 done
 
+# Start syslogd.
+mkdir -p /var/run
+#mkdir -p /var/log
+#touch /var/log/messages
+echo "*.* /dev/tty10" > /etc/syslog.conf
+echo "syslog 514/udp" > /etc/services # required, even if we don't use it
+@sysklogd@/sbin/syslogd &
+
+# login/su absolutely need this.
+touch /etc/login.defs 
+
+# Enable a password-less root login.
+echo "root::0:0:root:/:@shell@" > /etc/passwd
+echo "root:*:0" > /etc/group
+
+cat > /etc/profile <<EOF
+export PATH=$PATH
+export MODULE_DIR=$MODULE_DIR
+EOF
+
+# Set up inittab.
+for i in $(seq 1 6); do 
+    echo "$i:2345:respawn:@mingetty@/sbin/mingetty --noclear tty$i" >> /etc/inittab
+done
+
+# Show a nice greeting on each terminal.
+cat > /etc/issue <<EOF
+
+<<< Welcome to NixOS (\m) - Kernel \r (\l) >>>
+
+You can log in as \`root'.
+
+
+EOF
+
 # Start an interactive shell.
-exec @shell@
+#exec @shell@
+
+# Start init.
+exec init 2
diff --git a/test/boot-stage-2.nix b/test/boot-stage-2.nix
index 8f68858f536..f1aff2d59a9 100644
--- a/test/boot-stage-2.nix
+++ b/test/boot-stage-2.nix
@@ -1,11 +1,12 @@
 { genericSubstituter, shell, coreutils
-, utillinux, kernel, path ? []
+, utillinux, kernel, sysklogd, mingetty
+, path ? []
 }:
 
 genericSubstituter {
   src = ./boot-stage-2-init.sh;
   isExecutable = true;
-  inherit shell kernel;
+  inherit shell kernel sysklogd mingetty;
   path = [
     coreutils
     utillinux
diff --git a/test/make-devices.sh b/test/make-devices.sh
index dead9814f7a..1e9f9719ea4 100644
--- a/test/make-devices.sh
+++ b/test/make-devices.sh
@@ -1,4 +1,3 @@
-#mknod -m 0600 /dev/console c 5 1
 mknod -m 0600 /dev/ttyS0 c 4 64
 mknod -m 0600 /dev/ttyS1 c 4 65
 mknod -m 0600 /dev/ttyS2 c 4 66
@@ -11,16 +10,12 @@ mknod -m 0666 /dev/zero c 1 5
 
 # tty
 mknod -m 0600 /dev/tty c 5 0
-mknod -m 0600 /dev/tty0 c 4 0
-mknod -m 0600 /dev/tty1 c 4 1
-mknod -m 0600 /dev/tty2 c 4 2
-mknod -m 0600 /dev/tty3 c 4 3
-mknod -m 0600 /dev/tty4 c 4 4
-mknod -m 0600 /dev/tty5 c 4 5
-mknod -m 0600 /dev/tty6 c 4 6
-mknod -m 0600 /dev/tty7 c 4 7
-mknod -m 0600 /dev/tty8 c 4 8
-mknod -m 0600 /dev/tty9 c 4 9
+if ! test -e /dev/console; then
+    mknod -m 0600 /dev/console c 5 1
+fi
+for i in $(seq 0 10); do
+    mknod -m 0600 /dev/tty$i c 4 $i
+done
 
 mkdir -m 0755 /dev/pts
 mknod -m 0666 /dev/ptmx c 5 2
diff --git a/test/rescue-system.nix b/test/rescue-system.nix
index 216cf2009f9..044bf1a7065 100644
--- a/test/rescue-system.nix
+++ b/test/rescue-system.nix
@@ -33,7 +33,7 @@ rec {
   extraUtils = pkgs.stdenv.mkDerivation {
     name = "extra-utils";
     builder = builtins.toFile "builder.sh"
-      "source $stdenv/setup; ensureDir $out/bin; cp $utillinux/bin/mount $out/bin; nuke-refs $out/bin/mount";
+      "source $stdenv/setup; ensureDir $out/bin; cp $utillinux/bin/mount $utillinux/bin/umount $utillinux/sbin/pivot_root $out/bin; nuke-refs $out/bin/*";
     buildInputs = [pkgs.nukeReferences];
     inherit (pkgsStatic) utillinux;
   };
@@ -63,7 +63,8 @@ rec {
   # The init script of boot stage 2, which is supposed to do
   # everything else to bring up the system.
   bootStage2 = import ./boot-stage-2.nix {
-    inherit (pkgs) genericSubstituter coreutils utillinux kernel;
+    inherit (pkgs) genericSubstituter coreutils utillinux kernel
+      sysklogd;
     shell = pkgs.bash + "/bin/sh";
 
     # Additional stuff; add whatever you want here.
@@ -86,7 +87,15 @@ rec {
       pkgs.netcat
       pkgs.nettools
       pkgs.vim
+      pkgs.nix
+      pkgs.strace
+      pkgs.sysvinit
+      pkgs.procps
+      pkgs.shadowutils
+      pkgs.sysklogd
     ];
+
+    mingetty = pkgs.mingettyWrapper;
   };
 
 
@@ -94,12 +103,13 @@ rec {
   cdMountPoints = pkgs.stdenv.mkDerivation {
     name = "mount-points";
     builder = builtins.toFile "builder.sh"
-      "source $stdenv/setup; mkdir $out; cd $out; mkdir proc sys tmp etc dev";
+      "source $stdenv/setup; mkdir $out; cd $out; mkdir proc sys tmp etc dev var mnt nix nix/var";
   };
 
 
   # Create an ISO image containing the isolinux boot loader, the
-  # kernel, and initrd produced above.
+  # kernel, the initrd produced above, and the closure of the stage 2
+  # init.
   rescueCD = import ./make-iso9660-image.nix {
     inherit (pkgs) stdenv cdrtools;
     isoName = "nixos.iso";
@@ -128,5 +138,5 @@ rec {
     bootImage = "isolinux/isolinux.bin";
   };
 
-    
+
 }
-- 
GitLab


From da8cec4795de1b3992f6963e0c5832cffdc9f57e Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 7 Nov 2006 22:05:27 +0000
Subject: [PATCH 0198/5331] * Use udevtrigger to create device nodes for all
 known devices. * Plug and play: load kernel modules for all supported PCI
 devices   automatically.

svn path=/nixu/trunk/; revision=6975
---
 test/boot-stage-2-init.sh | 45 ++++++++++++++++++++++++++-------------
 test/boot-stage-2.nix     |  8 +++++--
 test/rescue-system.nix    |  6 ++----
 3 files changed, 38 insertions(+), 21 deletions(-)

diff --git a/test/boot-stage-2-init.sh b/test/boot-stage-2-init.sh
index 28ed1d19de3..50069ebe216 100644
--- a/test/boot-stage-2-init.sh
+++ b/test/boot-stage-2-init.sh
@@ -30,19 +30,20 @@ mkdir -p /nix/var/nix/db
 mkdir -p /nix/var/nix/gcroots
 mkdir -p /nix/var/nix/temproots
 
-# Create device nodes in /dev.
-source @makeDevices@
-
 # Ensure that the module tools can find the kernel modules.
 export MODULE_DIR=@kernel@/lib/modules/
 
-# Additional path for the interactive shell.
-for i in @extraPath@; do
-    PATH=$PATH:$i/bin
-    if test -e $i/sbin; then
-        PATH=$PATH:$i/sbin
-    fi
-done
+# Create device nodes in /dev.
+#source @makeDevices@
+
+# Start udev.
+udevd --daemon
+
+# Let udev create device nodes for all modules that have already been
+# loaded into the kernel (or for which support is built into the
+# kernel).
+udevtrigger
+udevsettle # wait for udev to finish
 
 # Start syslogd.
 mkdir -p /var/run
@@ -52,6 +53,12 @@ echo "*.* /dev/tty10" > /etc/syslog.conf
 echo "syslog 514/udp" > /etc/services # required, even if we don't use it
 @sysklogd@/sbin/syslogd &
 
+# Try to load modules for all PCI devices.
+for i in /sys/bus/pci/devices/*/modalias; do
+    echo "Trying to load a module for $(basename $(dirname $i))..."
+    modprobe $(cat $i)
+done
+
 # login/su absolutely need this.
 touch /etc/login.defs 
 
@@ -59,11 +66,6 @@ touch /etc/login.defs
 echo "root::0:0:root:/:@shell@" > /etc/passwd
 echo "root:*:0" > /etc/group
 
-cat > /etc/profile <<EOF
-export PATH=$PATH
-export MODULE_DIR=$MODULE_DIR
-EOF
-
 # Set up inittab.
 for i in $(seq 1 6); do 
     echo "$i:2345:respawn:@mingetty@/sbin/mingetty --noclear tty$i" >> /etc/inittab
@@ -79,6 +81,19 @@ You can log in as \`root'.
 
 EOF
 
+# Additional path for the interactive shell.
+for i in @extraPath@; do
+    PATH=$PATH:$i/bin
+    if test -e $i/sbin; then
+        PATH=$PATH:$i/sbin
+    fi
+done
+
+cat > /etc/profile <<EOF
+export PATH=$PATH
+export MODULE_DIR=$MODULE_DIR
+EOF
+
 # Start an interactive shell.
 #exec @shell@
 
diff --git a/test/boot-stage-2.nix b/test/boot-stage-2.nix
index f1aff2d59a9..4b7ab3c318e 100644
--- a/test/boot-stage-2.nix
+++ b/test/boot-stage-2.nix
@@ -1,5 +1,6 @@
-{ genericSubstituter, shell, coreutils
-, utillinux, kernel, sysklogd, mingetty
+{ genericSubstituter, shell, coreutils, findutils
+, utillinux, kernel, sysklogd, mingetty, udev
+, module_init_tools
 , path ? []
 }:
 
@@ -9,7 +10,10 @@ genericSubstituter {
   inherit shell kernel sysklogd mingetty;
   path = [
     coreutils
+    findutils
     utillinux
+    udev
+    module_init_tools
   ];
   extraPath = path;
   makeDevices = ./make-devices.sh;
diff --git a/test/rescue-system.nix b/test/rescue-system.nix
index 044bf1a7065..eda7cf599d4 100644
--- a/test/rescue-system.nix
+++ b/test/rescue-system.nix
@@ -63,8 +63,8 @@ rec {
   # The init script of boot stage 2, which is supposed to do
   # everything else to bring up the system.
   bootStage2 = import ./boot-stage-2.nix {
-    inherit (pkgs) genericSubstituter coreutils utillinux kernel
-      sysklogd;
+    inherit (pkgs) genericSubstituter coreutils findutils
+      utillinux kernel sysklogd udev module_init_tools;
     shell = pkgs.bash + "/bin/sh";
 
     # Additional stuff; add whatever you want here.
@@ -74,7 +74,6 @@ rec {
       pkgs.cpio
       pkgs.curl
       pkgs.e2fsprogs
-      pkgs.findutils
       pkgs.gnugrep
       pkgs.gnused
       pkgs.gnutar
@@ -82,7 +81,6 @@ rec {
       pkgs.gzip
       pkgs.iputils
       pkgs.less
-      pkgs.module_init_tools
       pkgs.nano
       pkgs.netcat
       pkgs.nettools
-- 
GitLab


From 624fe3f2d4771079165e37285cfef45e30b61277 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 7 Nov 2006 22:45:42 +0000
Subject: [PATCH 0199/5331] * Automatically bring up the network devices and
 start dhclient on   them.

svn path=/nixu/trunk/; revision=6976
---
 test/boot-stage-2-init.sh | 12 ++++++++++++
 test/boot-stage-2.nix     |  4 +++-
 test/rescue-system.nix    |  7 ++++---
 3 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/test/boot-stage-2-init.sh b/test/boot-stage-2-init.sh
index 50069ebe216..8235715e09e 100644
--- a/test/boot-stage-2-init.sh
+++ b/test/boot-stage-2-init.sh
@@ -59,6 +59,18 @@ for i in /sys/bus/pci/devices/*/modalias; do
     modprobe $(cat $i)
 done
 
+# Bring up the network devices.
+modprobe af_packet
+for i in $(cd /sys/class/net && ls -d *); do
+    echo "Bringing up network device $i..."
+    if ifconfig $i up; then
+        if test "$i" != "lo"; then
+            mkdir -p /var/state/dhcp
+            dhclient $i
+        fi
+    fi
+done
+
 # login/su absolutely need this.
 touch /etc/login.defs 
 
diff --git a/test/boot-stage-2.nix b/test/boot-stage-2.nix
index 4b7ab3c318e..4514d1779ad 100644
--- a/test/boot-stage-2.nix
+++ b/test/boot-stage-2.nix
@@ -1,6 +1,6 @@
 { genericSubstituter, shell, coreutils, findutils
 , utillinux, kernel, sysklogd, mingetty, udev
-, module_init_tools
+, module_init_tools, nettools, dhcp
 , path ? []
 }:
 
@@ -14,6 +14,8 @@ genericSubstituter {
     utillinux
     udev
     module_init_tools
+    nettools
+    dhcp
   ];
   extraPath = path;
   makeDevices = ./make-devices.sh;
diff --git a/test/rescue-system.nix b/test/rescue-system.nix
index eda7cf599d4..fd22e482f2e 100644
--- a/test/rescue-system.nix
+++ b/test/rescue-system.nix
@@ -64,8 +64,10 @@ rec {
   # everything else to bring up the system.
   bootStage2 = import ./boot-stage-2.nix {
     inherit (pkgs) genericSubstituter coreutils findutils
-      utillinux kernel sysklogd udev module_init_tools;
+      utillinux kernel sysklogd udev module_init_tools
+      nettools;
     shell = pkgs.bash + "/bin/sh";
+    dhcp = pkgs.dhcpWrapper;
 
     # Additional stuff; add whatever you want here.
     path = [
@@ -83,8 +85,7 @@ rec {
       pkgs.less
       pkgs.nano
       pkgs.netcat
-      pkgs.nettools
-      pkgs.vim
+#      pkgs.vim
       pkgs.nix
       pkgs.strace
       pkgs.sysvinit
-- 
GitLab


From 67050453343e58664047fa0361d746baffd27d9f Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 8 Nov 2006 02:34:14 +0000
Subject: [PATCH 0200/5331] * Start of the installer: copy the closure of Nix
 to the target device   so we can then do nix-env operations in a chroot to do
 the actual   installation.

svn path=/nixu/trunk/; revision=6977
---
 test/installer.nix     | 15 +++++++++++++++
 test/installer.sh      | 41 +++++++++++++++++++++++++++++++++++++++++
 test/rescue-system.nix |  7 +++++++
 3 files changed, 63 insertions(+)
 create mode 100644 test/installer.nix
 create mode 100644 test/installer.sh

diff --git a/test/installer.nix b/test/installer.nix
new file mode 100644
index 00000000000..1560e665489
--- /dev/null
+++ b/test/installer.nix
@@ -0,0 +1,15 @@
+{ stdenv, genericSubstituter, shell, nix
+}:
+
+genericSubstituter {
+  src = ./installer.sh;
+  isExecutable = true;
+  inherit shell nix;
+  
+  nixClosure = stdenv.mkDerivation {
+    name = "closure";
+    builder = builtins.toFile "builder.sh"
+      "source $stdenv/setup; /nix/bin/nix-store -qR $nix > $out";
+    inherit nix;
+  };
+}
diff --git a/test/installer.sh b/test/installer.sh
new file mode 100644
index 00000000000..c2742e9018e
--- /dev/null
+++ b/test/installer.sh
@@ -0,0 +1,41 @@
+#! @shell@
+
+# Syntax: installer.sh <DEVICE> <NIX-EXPR>
+# (e.g., installer.sh /dev/hda1 ./my-machine.nix)
+
+# - mount target device
+# - make Nix store etc.
+# - copy closure of rescue env to target device
+# - register validity
+# - start the "target" installer in a chroot to the target device
+#   * do a nix-pull
+#   * nix-env -p system-profile -i <nix-expr for the configuration>
+#   * run hook scripts provided by packages in the configuration?
+# - install/update grub
+
+targetDevice="$1"
+
+if test -z "$targetDevice"; then
+    echo "syntax: installer.sh <targetDevice>"
+    exit 1
+fi
+
+
+# Make sure that the target device isn't mounted.
+umount "$targetDevice" 2> /dev/null
+
+
+# Check it.
+fsck "$targetDevice" || exit 1
+
+
+# Mount the target device.
+mountPoint=/tmp/inst-mnt
+mkdir -p $mountPoint
+mount "$targetDevice" $mountPoint || exit 1
+
+
+# Copy Nix to the Nix store on the target device.
+mkdir -p $mountPoint/nix/store/
+cp -prd $(cat @nixClosure@) $mountPoint/nix/store/ || exit 1
+
diff --git a/test/rescue-system.nix b/test/rescue-system.nix
index fd22e482f2e..e4147b153f5 100644
--- a/test/rescue-system.nix
+++ b/test/rescue-system.nix
@@ -98,6 +98,13 @@ rec {
   };
 
 
+  # The installer.
+  nixosInstaller = import ./installer.nix {
+    inherit (pkgs) stdenv genericSubstituter nix;
+    shell = pkgs.bash + "/bin/sh";
+  };
+
+
   # Since the CD is read-only, the mount points must be on disk.
   cdMountPoints = pkgs.stdenv.mkDerivation {
     name = "mount-points";
-- 
GitLab


From 4b333e0f67caa765feec052d79804f4520221bb7 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 8 Nov 2006 09:31:45 +0000
Subject: [PATCH 0201/5331] * Add the installer and rsync to the path.

svn path=/nixu/trunk/; revision=6979
---
 test/installer.nix     |  1 +
 test/installer.sh      |  2 +-
 test/rescue-system.nix | 16 +++++++++-------
 3 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/test/installer.nix b/test/installer.nix
index 1560e665489..d960bab1bb1 100644
--- a/test/installer.nix
+++ b/test/installer.nix
@@ -3,6 +3,7 @@
 
 genericSubstituter {
   src = ./installer.sh;
+  dir = "bin";
   isExecutable = true;
   inherit shell nix;
   
diff --git a/test/installer.sh b/test/installer.sh
index c2742e9018e..a823a2b76a4 100644
--- a/test/installer.sh
+++ b/test/installer.sh
@@ -37,5 +37,5 @@ mount "$targetDevice" $mountPoint || exit 1
 
 # Copy Nix to the Nix store on the target device.
 mkdir -p $mountPoint/nix/store/
-cp -prd $(cat @nixClosure@) $mountPoint/nix/store/ || exit 1
+rsync -av $(cat @nixClosure@) $mountPoint/nix/store/ || exit 1
 
diff --git a/test/rescue-system.nix b/test/rescue-system.nix
index e4147b153f5..4e22ecb4d89 100644
--- a/test/rescue-system.nix
+++ b/test/rescue-system.nix
@@ -60,6 +60,13 @@ rec {
   };
 
 
+  # The installer.
+  nixosInstaller = import ./installer.nix {
+    inherit (pkgs) stdenv genericSubstituter nix;
+    shell = pkgs.bash + "/bin/sh";
+  };
+
+
   # The init script of boot stage 2, which is supposed to do
   # everything else to bring up the system.
   bootStage2 = import ./boot-stage-2.nix {
@@ -92,19 +99,14 @@ rec {
       pkgs.procps
       pkgs.shadowutils
       pkgs.sysklogd
+      pkgs.rsync
+      nixosInstaller
     ];
 
     mingetty = pkgs.mingettyWrapper;
   };
 
 
-  # The installer.
-  nixosInstaller = import ./installer.nix {
-    inherit (pkgs) stdenv genericSubstituter nix;
-    shell = pkgs.bash + "/bin/sh";
-  };
-
-
   # Since the CD is read-only, the mount points must be on disk.
   cdMountPoints = pkgs.stdenv.mkDerivation {
     name = "mount-points";
-- 
GitLab


From 67f3ee3b644ff9819a9f295d79a44e000fa8622c Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 10 Nov 2006 14:38:15 +0000
Subject: [PATCH 0202/5331] * Probe for the NixOS installation CD.

svn path=/nixu/trunk/; revision=6985
---
 test/boot-stage-1-init.sh | 39 +++++++++++++++++++++++++++++++++++----
 test/boot-stage-1.nix     |  3 ++-
 test/boot-stage-2-init.sh |  3 +++
 test/rescue-system.nix    | 14 ++++++++++++--
 4 files changed, 52 insertions(+), 7 deletions(-)

diff --git a/test/boot-stage-1-init.sh b/test/boot-stage-1-init.sh
index b9e2d1f4434..a2e958d91f6 100644
--- a/test/boot-stage-1-init.sh
+++ b/test/boot-stage-1-init.sh
@@ -1,5 +1,11 @@
 #! @shell@
 
+fail() {
+    # If starting stage 2 failed, start an interactive shell.
+    echo "Stage 2 failed, starting emergency shell..."
+    exec @shell@
+}
+
 # Print a greeting.
 echo
 echo "<<< NixOS Stage 1 >>>"
@@ -31,10 +37,37 @@ modprobe ide-generic
 modprobe ide-disk
 modprobe ide-cd
 
+# Try to find and mount the installation CD.
+
 # Mount the installation CD.
 mkdir /mnt
 mkdir /mnt/cdrom
-mount -o ro /dev/hdc /mnt/cdrom
+
+echo "probing for the NixOS installation CD..."
+
+for i in /sys/devices/*/*/media; do
+    if test "$(cat $i)" = "cdrom"; then
+
+        # Hopefully `drivename' matches the device created in /dev.
+        devName=/dev/$(cat $(dirname $i)/drivename)
+
+        echo "  in $devName..."
+
+        if mount -o ro -t iso9660 $devName /mnt/cdrom; then
+            if test -e "/mnt/cdrom/@cdromLabel@"; then
+                found=1
+                break
+            fi
+            umount /mnt/cdrom
+        fi
+        
+    fi
+done
+
+if test -z "$found"; then
+    echo "CD not found!"
+    fail
+fi
 
 # Start stage 2.
 # !!! Note: we can't use pivot_root here (the kernel gods have
@@ -46,6 +79,4 @@ umount /proc # cleanup
 umount /sys
 exec chroot . /init
 
-# If starting stage 2 failed, start an interactive shell.
-echo "Stage 2 failed, starting emergency shell..."
-exec @shell@
+fail
diff --git a/test/boot-stage-1.nix b/test/boot-stage-1.nix
index 329ca513a95..0f714a6d599 100644
--- a/test/boot-stage-1.nix
+++ b/test/boot-stage-1.nix
@@ -6,12 +6,13 @@
 
 { genericSubstituter, shell, staticTools
 , module_init_tools, extraUtils, modules
+, cdromLabel ? ""
 }:
 
 genericSubstituter {
   src = ./boot-stage-1-init.sh;
   isExecutable = true;
-  inherit shell modules;
+  inherit shell modules cdromLabel;
   path = [
     staticTools
     module_init_tools
diff --git a/test/boot-stage-2-init.sh b/test/boot-stage-2-init.sh
index 8235715e09e..be54926aabc 100644
--- a/test/boot-stage-2-init.sh
+++ b/test/boot-stage-2-init.sh
@@ -106,6 +106,9 @@ export PATH=$PATH
 export MODULE_DIR=$MODULE_DIR
 EOF
 
+# Set the host name.
+hostname nixos
+
 # Start an interactive shell.
 #exec @shell@
 
diff --git a/test/rescue-system.nix b/test/rescue-system.nix
index 4e22ecb4d89..097ca084b29 100644
--- a/test/rescue-system.nix
+++ b/test/rescue-system.nix
@@ -20,6 +20,10 @@ rec {
   };
 
 
+  # The label used to identify the installation CD.
+  cdromLabel = "NIXOS";
+
+
   # Determine the set of modules that we need to mount the root FS.
   modulesClosure = import ./modules-closure.nix {
     inherit (pkgs) stdenv kernel module_init_tools;
@@ -45,6 +49,7 @@ rec {
     inherit (pkgs) genericSubstituter;
     inherit (pkgsDiet) module_init_tools;
     inherit extraUtils;
+    inherit cdromLabel;
     modules = modulesClosure;
     shell = stdenvLinuxStuff.bootstrapTools.bash;
     staticTools = stdenvLinuxStuff.staticTools;
@@ -110,8 +115,13 @@ rec {
   # Since the CD is read-only, the mount points must be on disk.
   cdMountPoints = pkgs.stdenv.mkDerivation {
     name = "mount-points";
-    builder = builtins.toFile "builder.sh"
-      "source $stdenv/setup; mkdir $out; cd $out; mkdir proc sys tmp etc dev var mnt nix nix/var";
+    builder = builtins.toFile "builder.sh" "
+      source $stdenv/setup
+      mkdir $out
+      cd $out
+      mkdir proc sys tmp etc dev var mnt nix nix/var
+      touch $out/${cdromLabel}
+    ";
   };
 
 
-- 
GitLab


From b60dd36c8fccc5d04497385b8ed6f336a396bb87 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sat, 11 Nov 2006 17:59:08 +0000
Subject: [PATCH 0203/5331] * Set up the target file system, copy Nix, do a
 nix-pull in a chroot,   and do a nix-env to install some packages.

svn path=/nixu/trunk/; revision=6991
---
 test/installer.sh | 68 +++++++++++++++++++++++++++++++++++++++++++++--
 1 file changed, 66 insertions(+), 2 deletions(-)

diff --git a/test/installer.sh b/test/installer.sh
index a823a2b76a4..1cf18c9f37a 100644
--- a/test/installer.sh
+++ b/test/installer.sh
@@ -34,8 +34,72 @@ mountPoint=/tmp/inst-mnt
 mkdir -p $mountPoint
 mount "$targetDevice" $mountPoint || exit 1
 
+mkdir -p $mountPoint/dev $mountPoint/proc $mountPoint/sys || exit 1
+mount --bind /dev $mountPoint/dev || exit 1
+mount --bind /proc $mountPoint/proc || exit 1
+mount --bind /sys $mountPoint/sys || exit 1
+
+trap "umount $mountPoint/dev; umount $mountPoint/proc; umount $mountPoint/sys; umount $mountPoint" EXIT
+
+mkdir -p $mountPoint/tmp
+mkdir -p $mountPoint/var
+
+
+# Create the necessary Nix directories on the target device, if they
+# don't already exist.
+mkdir -p \
+    $mountPoint/nix/store \
+    $mountPoint/nix/var/nix/gcroots \
+    $mountPoint/nix/var/nix/temproots \
+    $mountPoint/nix/var/nix/manifests \
+    $mountPoint/nix/var/nix/userpool \
+    $mountPoint/nix/var/nix/profiles \
+    $mountPoint/nix/var/nix/db \
+    $mountPoint/nix/var/log/nix/drvs
+
 
 # Copy Nix to the Nix store on the target device.
-mkdir -p $mountPoint/nix/store/
-rsync -av $(cat @nixClosure@) $mountPoint/nix/store/ || exit 1
+echo "copying Nix to $targetDevice...."
+for i in $(cat @nixClosure@); do
+    echo "  $i"
+    rsync -a $i $mountPoint/nix/store/ || exit 1
+done
+
+
+# Register the paths in the Nix closure as valid.  This is necessary
+# to prevent them from being deleted the first time we install
+# something.  (I.e., Nix will see that, e.g., the glibc path is not
+# valid, delete it to get it out of the way, but as a result nothing
+# will work anymore.)
+for i in $(cat @nixClosure@); do
+    echo $i
+    echo # deriver
+    echo 0 # nr of references
+done \
+| chroot $mountPoint @nix@/bin/nix-store --register-validity || exit 1
+
+
+# Create the required /bin/sh symlink; otherwise lots of things
+# (notably the system() function) won't work.
+mkdir -p $mountPoint/bin
+ln -sf $(type -tp sh) $mountPoint/bin/sh
+
+
+# Enable networking in the chroot.
+mkdir -p $mountPoint/etc
+cp /etc/resolv.conf $mountPoint/etc/
+
+
+# Do a nix-pull.
+nixpkgsURL=http://nix.cs.uu.nl/dist/nix/nixpkgs-0.11pre6984
+chroot $mountPoint @nix@/bin/nix-pull $nixpkgsURL/MANIFEST
+
+
+# Install some packages.
+rm -rf $mountPoint/scratch
+mkdir $mountPoint/scratch
+curl $nixpkgsURL/nixexprs.tar.bz2 | tar xj -C $mountPoint/scratch
+
+nixpkgsName=$(cd $mountPoint/scratch && ls)
 
+chroot $mountPoint @nix@/bin/nix-env -f /scratch/$nixpkgsName -i aterm
-- 
GitLab


From b7e8c174a114656a959a7aa48245a5d1d29c6dba Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sat, 11 Nov 2006 22:29:05 +0000
Subject: [PATCH 0204/5331] * Add Perl to the path (since it was already on the
 CD as a dependency).

svn path=/nixu/trunk/; revision=6992
---
 test/rescue-system.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/test/rescue-system.nix b/test/rescue-system.nix
index 097ca084b29..b435d10f57f 100644
--- a/test/rescue-system.nix
+++ b/test/rescue-system.nix
@@ -105,6 +105,7 @@ rec {
       pkgs.shadowutils
       pkgs.sysklogd
       pkgs.rsync
+      pkgs.perl
       nixosInstaller
     ];
 
-- 
GitLab


From afc05314c4cdbde8cf02853c336d31d91c2a07de Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sat, 11 Nov 2006 22:31:26 +0000
Subject: [PATCH 0205/5331] * The installer now takes a user-specified Nix
 expression that will be   built in the target Nix store and installed in the
 "system" user   environment.  Not quite sure what should go in there, but
 probably   the kernel, initrd, the boot scripts and eventually the system  
 services.  Maybe grub as well.

svn path=/nixu/trunk/; revision=6993
---
 test/installer.sh | 56 +++++++++++++++++++++++++++++++----------------
 1 file changed, 37 insertions(+), 19 deletions(-)

diff --git a/test/installer.sh b/test/installer.sh
index 1cf18c9f37a..359086a5238 100644
--- a/test/installer.sh
+++ b/test/installer.sh
@@ -13,33 +13,48 @@
 #   * run hook scripts provided by packages in the configuration?
 # - install/update grub
 
+set -e
+
 targetDevice="$1"
+nixExpr="$2"
 
-if test -z "$targetDevice"; then
-    echo "syntax: installer.sh <targetDevice>"
+if test -z "$targetDevice" -o -z "$nixExpr"; then
+    echo "syntax: installer.sh <targetDevice> <nixExpr>"
     exit 1
 fi
 
+nixExpr=$(readlink -f "$nixExpr")
+
 
 # Make sure that the target device isn't mounted.
-umount "$targetDevice" 2> /dev/null
+umount "$targetDevice" 2> /dev/null || true
 
 
 # Check it.
-fsck "$targetDevice" || exit 1
+fsck "$targetDevice"
 
 
 # Mount the target device.
 mountPoint=/tmp/inst-mnt
 mkdir -p $mountPoint
-mount "$targetDevice" $mountPoint || exit 1
+mount "$targetDevice" $mountPoint
+
+mkdir -p $mountPoint/dev $mountPoint/proc $mountPoint/sys $mountPoint/mnt
+mount --rbind / $mountPoint/mnt
+mount --bind /dev $mountPoint/dev
+mount --bind /proc $mountPoint/proc
+mount --bind /sys $mountPoint/sys
 
-mkdir -p $mountPoint/dev $mountPoint/proc $mountPoint/sys || exit 1
-mount --bind /dev $mountPoint/dev || exit 1
-mount --bind /proc $mountPoint/proc || exit 1
-mount --bind /sys $mountPoint/sys || exit 1
+cleanup() {
+    for i in $(grep -F "$mountPoint" /proc/mounts \
+        | perl -e 'while (<>) { /^\S+\s+(\S+)\s+/; print "$1\n"; }' \
+        | sort -r);
+    do
+        umount $i
+    done
+}
 
-trap "umount $mountPoint/dev; umount $mountPoint/proc; umount $mountPoint/sys; umount $mountPoint" EXIT
+trap "cleanup" EXIT
 
 mkdir -p $mountPoint/tmp
 mkdir -p $mountPoint/var
@@ -62,7 +77,7 @@ mkdir -p \
 echo "copying Nix to $targetDevice...."
 for i in $(cat @nixClosure@); do
     echo "  $i"
-    rsync -a $i $mountPoint/nix/store/ || exit 1
+    rsync -a $i $mountPoint/nix/store/
 done
 
 
@@ -76,7 +91,7 @@ for i in $(cat @nixClosure@); do
     echo # deriver
     echo 0 # nr of references
 done \
-| chroot $mountPoint @nix@/bin/nix-store --register-validity || exit 1
+| chroot $mountPoint @nix@/bin/nix-store --register-validity
 
 
 # Create the required /bin/sh symlink; otherwise lots of things
@@ -90,16 +105,19 @@ mkdir -p $mountPoint/etc
 cp /etc/resolv.conf $mountPoint/etc/
 
 
-# Do a nix-pull.
+# Do a nix-pull to speed up building.
 nixpkgsURL=http://nix.cs.uu.nl/dist/nix/nixpkgs-0.11pre6984
 chroot $mountPoint @nix@/bin/nix-pull $nixpkgsURL/MANIFEST
 
 
-# Install some packages.
-rm -rf $mountPoint/scratch
-mkdir $mountPoint/scratch
-curl $nixpkgsURL/nixexprs.tar.bz2 | tar xj -C $mountPoint/scratch
+# Build the specified Nix expression in the target store and install
+# it into the system configuration profile.
 
-nixpkgsName=$(cd $mountPoint/scratch && ls)
+#rm -rf $mountPoint/scratch
+#mkdir $mountPoint/scratch
+#curl $nixpkgsURL/nixexprs.tar.bz2 | tar xj -C $mountPoint/scratch
+#nixpkgsName=$(cd $mountPoint/scratch && ls)
 
-chroot $mountPoint @nix@/bin/nix-env -f /scratch/$nixpkgsName -i aterm
+chroot $mountPoint @nix@/bin/nix-env \
+    -p /nix/var/nix/profiles/system \
+    -f "/mnt/$nixExpr" -i '*'
-- 
GitLab


From 0785dfb9f8db82218c538d91052007583f1c6b20 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sun, 12 Nov 2006 18:48:47 +0000
Subject: [PATCH 0206/5331] * Lots of refactoring; put the CD image generation
 in rescue-cd.nix.   Support booting from something other than a CD.  Add some
 parameters   to specify the root device.

svn path=/nixu/trunk/; revision=7000
---
 test/boot-stage-1-init.sh | 57 +++++++++++++++++++++++------------
 test/boot-stage-1.nix     | 16 ++++++++--
 test/rescue-cd.nix        | 63 +++++++++++++++++++++++++++++++++++++++
 test/rescue-system.nix    | 57 ++++-------------------------------
 4 files changed, 121 insertions(+), 72 deletions(-)
 create mode 100644 test/rescue-cd.nix

diff --git a/test/boot-stage-1-init.sh b/test/boot-stage-1-init.sh
index a2e958d91f6..1299599a94e 100644
--- a/test/boot-stage-1-init.sh
+++ b/test/boot-stage-1-init.sh
@@ -6,11 +6,13 @@ fail() {
     exec @shell@
 }
 
+
 # Print a greeting.
 echo
 echo "<<< NixOS Stage 1 >>>"
 echo
 
+
 # Set the PATH.
 export PATH=/empty
 for i in @path@; do
@@ -20,6 +22,7 @@ for i in @path@; do
     fi
 done
 
+
 # Mount special file systems.
 mkdir /etc # to shut up mount
 touch /etc/fstab # idem
@@ -28,52 +31,68 @@ mount -t proc none /proc
 mkdir /sys
 mount -t sysfs none /sys
 
+
 # Create device nodes in /dev.
 source @makeDevices@
 
+
 # Load some kernel modules.
 export MODULE_DIR=@modules@/lib/modules/
 modprobe ide-generic
 modprobe ide-disk
 modprobe ide-cd
 
-# Try to find and mount the installation CD.
 
-# Mount the installation CD.
+# Try to find and mount the root device.
 mkdir /mnt
-mkdir /mnt/cdrom
+mkdir /mnt/root
+
+echo "mounting the root device..."
+
+if test -n "@autoDetectRootDevice@"; then
 
-echo "probing for the NixOS installation CD..."
+    # Look for the root device by label.
+    echo "probing for the NixOS installation CD..."
 
-for i in /sys/devices/*/*/media; do
-    if test "$(cat $i)" = "cdrom"; then
+    for i in /sys/devices/*/*/media; do
+        if test "$(cat $i)" = "cdrom"; then
 
-        # Hopefully `drivename' matches the device created in /dev.
-        devName=/dev/$(cat $(dirname $i)/drivename)
+            # Hopefully `drivename' matches the device created in /dev.
+            devName=/dev/$(cat $(dirname $i)/drivename)
 
-        echo "  in $devName..."
+            echo "  in $devName..."
 
-        if mount -o ro -t iso9660 $devName /mnt/cdrom; then
-            if test -e "/mnt/cdrom/@cdromLabel@"; then
-                found=1
-                break
+            if mount -o ro -t iso9660 $devName /mnt/root; then
+                if test -e "/mnt/root/@rootLabel@"; then
+                    found=1
+                    break
+                fi
+                umount /mnt/root
             fi
-            umount /mnt/cdrom
-        fi
         
+        fi
+    done
+
+    if test -z "$found"; then
+        echo "CD not found!"
+        fail
     fi
-done
 
-if test -z "$found"; then
-    echo "CD not found!"
+else
+
+    # Hard-coded root device.
+    mount -o ro "@rootDevice@" /mnt/root
+
+    # Testing.
     fail
+
 fi
 
 # Start stage 2.
 # !!! Note: we can't use pivot_root here (the kernel gods have
 # decreed), but we could use run-init from klibc, which deletes all
 # files in the initramfs, remounts the target root on /, and chroots.
-cd /mnt/cdrom
+cd /mnt/root
 mount --move . /
 umount /proc # cleanup
 umount /sys
diff --git a/test/boot-stage-1.nix b/test/boot-stage-1.nix
index 0f714a6d599..bb52b3f8354 100644
--- a/test/boot-stage-1.nix
+++ b/test/boot-stage-1.nix
@@ -6,13 +6,25 @@
 
 { genericSubstituter, shell, staticTools
 , module_init_tools, extraUtils, modules
-, cdromLabel ? ""
+
+, # Whether to find root device automatically using its label.
+  autoDetectRootDevice
+  
+, # If not scanning, the root must be specified explicitly.
+  rootDevice
+
+  # If scanning, we need a disk label.
+, rootLabel
 }:
 
+assert !autoDetectRootDevice -> rootDevice != "";
+assert autoDetectRootDevice -> rootLabel != "";
+
 genericSubstituter {
   src = ./boot-stage-1-init.sh;
   isExecutable = true;
-  inherit shell modules cdromLabel;
+  inherit shell modules;
+  inherit autoDetectRootDevice rootDevice rootLabel;
   path = [
     staticTools
     module_init_tools
diff --git a/test/rescue-cd.nix b/test/rescue-cd.nix
new file mode 100644
index 00000000000..defeeb48ece
--- /dev/null
+++ b/test/rescue-cd.nix
@@ -0,0 +1,63 @@
+let
+
+  # The label used to identify the installation CD.
+  cdromLabel = "NIXOS";
+
+in
+
+  # Build boot scripts for the CD that find the CD-ROM automatically.
+  with import ./rescue-system.nix {
+    autoDetectRootDevice = true;
+    rootLabel = cdromLabel;
+  };
+
+  
+rec {
+
+
+  # Since the CD is read-only, the mount points must be on disk.
+  cdMountPoints = pkgs.stdenv.mkDerivation {
+    name = "mount-points";
+    builder = builtins.toFile "builder.sh" "
+      source $stdenv/setup
+      mkdir $out
+      cd $out
+      mkdir proc sys tmp etc dev var mnt nix nix/var
+      touch $out/${cdromLabel}
+    ";
+  };
+
+
+  # Create an ISO image containing the isolinux boot loader, the
+  # kernel, the initrd produced above, and the closure of the stage 2
+  # init.
+  rescueCD = import ./make-iso9660-image.nix {
+    inherit (pkgs) stdenv cdrtools;
+    isoName = "nixos.iso";
+    
+    contents = [
+      { source = pkgs.syslinux + "/lib/syslinux/isolinux.bin";
+        target = "isolinux/isolinux.bin";
+      }
+      { source = ./isolinux.cfg;
+        target = "isolinux/isolinux.cfg";
+      }
+      { source = pkgs.kernel + "/vmlinuz";
+        target = "isolinux/vmlinuz";
+      }
+      { source = initialRamdisk + "/initrd";
+        target = "isolinux/initrd";
+      }
+      { source = cdMountPoints;
+        target = "/";
+      }
+    ];
+
+    init = bootStage2;
+    
+    bootable = true;
+    bootImage = "isolinux/isolinux.bin";
+  };
+
+
+}
diff --git a/test/rescue-system.nix b/test/rescue-system.nix
index b435d10f57f..890e3cfdf82 100644
--- a/test/rescue-system.nix
+++ b/test/rescue-system.nix
@@ -1,4 +1,8 @@
-{system ? __currentSystem}:
+{ system ? __currentSystem
+, autoDetectRootDevice ? false
+, rootDevice ? ""
+, rootLabel ? ""
+}:
 
 rec {
 
@@ -20,10 +24,6 @@ rec {
   };
 
 
-  # The label used to identify the installation CD.
-  cdromLabel = "NIXOS";
-
-
   # Determine the set of modules that we need to mount the root FS.
   modulesClosure = import ./modules-closure.nix {
     inherit (pkgs) stdenv kernel module_init_tools;
@@ -49,7 +49,7 @@ rec {
     inherit (pkgs) genericSubstituter;
     inherit (pkgsDiet) module_init_tools;
     inherit extraUtils;
-    inherit cdromLabel;
+    inherit autoDetectRootDevice rootDevice rootLabel;
     modules = modulesClosure;
     shell = stdenvLinuxStuff.bootstrapTools.bash;
     staticTools = stdenvLinuxStuff.staticTools;
@@ -113,49 +113,4 @@ rec {
   };
 
 
-  # Since the CD is read-only, the mount points must be on disk.
-  cdMountPoints = pkgs.stdenv.mkDerivation {
-    name = "mount-points";
-    builder = builtins.toFile "builder.sh" "
-      source $stdenv/setup
-      mkdir $out
-      cd $out
-      mkdir proc sys tmp etc dev var mnt nix nix/var
-      touch $out/${cdromLabel}
-    ";
-  };
-
-
-  # Create an ISO image containing the isolinux boot loader, the
-  # kernel, the initrd produced above, and the closure of the stage 2
-  # init.
-  rescueCD = import ./make-iso9660-image.nix {
-    inherit (pkgs) stdenv cdrtools;
-    isoName = "nixos.iso";
-    
-    contents = [
-      { source = pkgs.syslinux + "/lib/syslinux/isolinux.bin";
-        target = "isolinux/isolinux.bin";
-      }
-      { source = ./isolinux.cfg;
-        target = "isolinux/isolinux.cfg";
-      }
-      { source = pkgs.kernel + "/vmlinuz";
-        target = "isolinux/vmlinuz";
-      }
-      { source = initialRamdisk + "/initrd";
-        target = "isolinux/initrd";
-      }
-      { source = cdMountPoints;
-        target = "/";
-      }
-    ];
-
-    init = bootStage2;
-    
-    bootable = true;
-    bootImage = "isolinux/isolinux.bin";
-  };
-
-
 }
-- 
GitLab


From 0b26af2188736e73ec6e5f7d0eeacf34370812ba Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sun, 12 Nov 2006 23:30:03 +0000
Subject: [PATCH 0207/5331] * The installer now installs a configuration on the
 target device that   boots into stage 1 (kernel+initrd) succesfully.

  `system-configuration.nix' contains the definition of the
  configuration to be installed.  The attribute systemConfiguration is
  installed into the profile /nix/var/nix/profiles/system.  Then the
  program /nix/var/nix/profiles/system/bin/switch-to-configuration is
  called to finalise the installation.  This program (generated by
  system-configuration.sh) installs Grub on the drive with a menu that
  contains the entry for the desired kernel and initrd.

  In principle this allows us to do rollbacks to previous system
  configurations by doing `nix-env --rollback' and then calling
  switch-to-configuration to update Grub.  Ideally this should be done
  in a single command (and we should consider the obvious risk of
  garbage collecting the current kernel etc. to which the current Grub
  menu points...).

  Maybe the responsibility for generating the Grub menu should be
  placed somewhere else.  For instance, we could generate a Grub menu
  automatically out of all the generations in the `system' profile.

svn path=/nixu/trunk/; revision=7009
---
 test/installer.sh             | 17 ++++++++++++++---
 test/make-initrd.nix          |  4 ++--
 test/make-initrd.sh           |  2 +-
 test/rescue-cd.nix            |  2 ++
 test/rescue-system.nix        |  2 +-
 test/system-configuration.nix | 32 ++++++++++++++++++++++++++++++++
 test/system-configuration.sh  | 29 +++++++++++++++++++++++++++++
 7 files changed, 81 insertions(+), 7 deletions(-)
 create mode 100644 test/system-configuration.nix
 create mode 100644 test/system-configuration.sh

diff --git a/test/installer.sh b/test/installer.sh
index 359086a5238..14b6e2a4aac 100644
--- a/test/installer.sh
+++ b/test/installer.sh
@@ -31,7 +31,7 @@ umount "$targetDevice" 2> /dev/null || true
 
 
 # Check it.
-fsck "$targetDevice"
+fsck -n "$targetDevice"
 
 
 # Mount the target device.
@@ -107,7 +107,7 @@ cp /etc/resolv.conf $mountPoint/etc/
 
 # Do a nix-pull to speed up building.
 nixpkgsURL=http://nix.cs.uu.nl/dist/nix/nixpkgs-0.11pre6984
-chroot $mountPoint @nix@/bin/nix-pull $nixpkgsURL/MANIFEST
+#chroot $mountPoint @nix@/bin/nix-pull $nixpkgsURL/MANIFEST
 
 
 # Build the specified Nix expression in the target store and install
@@ -120,4 +120,15 @@ chroot $mountPoint @nix@/bin/nix-pull $nixpkgsURL/MANIFEST
 
 chroot $mountPoint @nix@/bin/nix-env \
     -p /nix/var/nix/profiles/system \
-    -f "/mnt/$nixExpr" -i '*'
+    -f "/mnt/$nixExpr" -i system-configuration
+
+
+# Grub needs a mtab.
+echo "$targetDevice / somefs rw 0 0" > $mountPoint/etc/mtab
+
+
+# Switch to the new system configuration.  This will install Grub with
+# a menu default pointing at the kernel/initrd/etc of the new
+# configuration.
+echo "finalising the installation..."
+chroot $mountPoint /nix/var/nix/profiles/system/bin/switch-to-configuration
diff --git a/test/make-initrd.nix b/test/make-initrd.nix
index f850e1cf657..91722b96602 100644
--- a/test/make-initrd.nix
+++ b/test/make-initrd.nix
@@ -10,11 +10,11 @@
 # A symlink `/init' is made to the store path passed in the `init'
 # argument.
 
-{stdenv, cpio, packages, init}:
+{stdenv, cpio, packages, init, nix}:
 
 stdenv.mkDerivation {
   name = "initrd";
   builder = ./make-initrd.sh;
-  buildInputs = [cpio];
+  buildInputs = [cpio nix];
   inherit packages init;
 }
diff --git a/test/make-initrd.sh b/test/make-initrd.sh
index 2620b90eec7..5da23533feb 100644
--- a/test/make-initrd.sh
+++ b/test/make-initrd.sh
@@ -6,7 +6,7 @@ set -o pipefail
 # way to get the closure is to call Nix, which is strictly speaking
 # forbidden.  But we do it anyway.  In time, we should add a feature
 # to Nix to let Nix pass closures to builders.
-packagesClosure=$(/nix/bin/nix-store -qR $packages $init)
+packagesClosure=$(nix-store -qR $packages $init)
 
 # Paths in cpio archives *must* be relative, otherwise the kernel
 # won't unpack 'em.
diff --git a/test/rescue-cd.nix b/test/rescue-cd.nix
index defeeb48ece..002288bea87 100644
--- a/test/rescue-cd.nix
+++ b/test/rescue-cd.nix
@@ -14,6 +14,8 @@ in
   
 rec {
 
+  inherit nixosInstaller; # !!! debug
+
 
   # Since the CD is read-only, the mount points must be on disk.
   cdMountPoints = pkgs.stdenv.mkDerivation {
diff --git a/test/rescue-system.nix b/test/rescue-system.nix
index 890e3cfdf82..40ec535c6b1 100644
--- a/test/rescue-system.nix
+++ b/test/rescue-system.nix
@@ -59,7 +59,7 @@ rec {
   # The closure of the init script of boot stage 1 is what we put in
   # the initial RAM disk.
   initialRamdisk = import ./make-initrd.nix {
-    inherit (pkgs) stdenv cpio;
+    inherit (pkgs) stdenv cpio nix;
     packages = [];
     init = bootStage1;
   };
diff --git a/test/system-configuration.nix b/test/system-configuration.nix
new file mode 100644
index 00000000000..ef04dc1badc
--- /dev/null
+++ b/test/system-configuration.nix
@@ -0,0 +1,32 @@
+let
+
+  # The root device.
+  rootDevice = "/dev/hda1";
+
+  # The device on which GRUB should be installed (leave empty if you
+  # don't want GRUB to be installed).
+  grubDevice = "/dev/hda";
+
+in
+
+  # Build boot scripts for the CD that find the CD-ROM automatically.
+  with import ./rescue-system.nix {
+    autoDetectRootDevice = false;
+    inherit rootDevice;
+  };
+
+  
+rec {
+
+
+  systemConfiguration = pkgs.stdenv.mkDerivation {
+    name = "system-configuration";
+    builder = ./system-configuration.sh;
+    inherit (pkgs) grub coreutils gnused gnugrep diffutils;
+    inherit grubDevice;
+    kernel = pkgs.kernel + "/vmlinuz";
+    initrd = initialRamdisk + "/initrd";
+  };
+
+
+}
diff --git a/test/system-configuration.sh b/test/system-configuration.sh
new file mode 100644
index 00000000000..17d58f4d0cb
--- /dev/null
+++ b/test/system-configuration.sh
@@ -0,0 +1,29 @@
+source $stdenv/setup
+
+ensureDir $out
+
+ln -s $kernel $out/kernel
+ln -s $grub $out/grub
+
+cat > $out/menu.lst << GRUBEND
+# Automatically generated.  DO NOT EDIT THIS FILE!
+default=0
+timeout=5
+title NixOS
+        kernel $kernel selinux=0 apm=on acpi=on
+        initrd $initrd
+GRUBEND
+
+ensureDir $out/bin
+
+cat > $out/bin/switch-to-configuration <<EOF
+#! $SHELL
+set -e
+export PATH=$coreutils/bin:$gnused/bin:$gnugrep/bin:$diffutils/bin
+if test -n "$grubDevice"; then
+    $grub/sbin/grub-install "$grubDevice" --no-floppy --recheck
+    cp -f $out/menu.lst /boot/grub/menu.lst
+fi
+EOF
+
+chmod +x $out/bin/switch-to-configuration
-- 
GitLab


From 49f8402876487d779916ee2633a58b4e06033fbb Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 13 Nov 2006 11:41:27 +0000
Subject: [PATCH 0208/5331] * Boot into a fully functional stage 2. * Stage 2
 init: handle non-read-only roots.

svn path=/nixu/trunk/; revision=7014
---
 test/boot-stage-1-init.sh     |  6 ++--
 test/boot-stage-1.nix         |  9 +++++
 test/boot-stage-2-init.sh     | 67 ++++++++++++++++++++++++++---------
 test/boot-stage-2.nix         |  7 ++--
 test/installer.nix            |  3 +-
 test/make-iso9660-image.nix   |  4 +--
 test/make-iso9660-image.sh    |  2 +-
 test/rescue-cd.nix            |  6 ++--
 test/rescue-system.nix        |  5 +++
 test/system-configuration.nix | 12 ++++---
 test/system-configuration.sh  |  1 +
 11 files changed, 90 insertions(+), 32 deletions(-)

diff --git a/test/boot-stage-1-init.sh b/test/boot-stage-1-init.sh
index 1299599a94e..3e93571ebda 100644
--- a/test/boot-stage-1-init.sh
+++ b/test/boot-stage-1-init.sh
@@ -83,9 +83,6 @@ else
     # Hard-coded root device.
     mount -o ro "@rootDevice@" /mnt/root
 
-    # Testing.
-    fail
-
 fi
 
 # Start stage 2.
@@ -96,6 +93,7 @@ cd /mnt/root
 mount --move . /
 umount /proc # cleanup
 umount /sys
-exec chroot . /init
+
+exec chroot . @stage2Init@
 
 fail
diff --git a/test/boot-stage-1.nix b/test/boot-stage-1.nix
index bb52b3f8354..ef1ebfc7225 100644
--- a/test/boot-stage-1.nix
+++ b/test/boot-stage-1.nix
@@ -15,6 +15,10 @@
 
   # If scanning, we need a disk label.
 , rootLabel
+
+, # The path of the stage 2 init to call once we've mounted the root
+  # device.
+  stage2Init ? "/init"
 }:
 
 assert !autoDetectRootDevice -> rootDevice != "";
@@ -31,4 +35,9 @@ genericSubstituter {
     extraUtils
   ];
   makeDevices = ./make-devices.sh;
+
+  # We only want the path of the stage 2 init, we don't want it as a
+  # dependency (since then it the stage 2 init would end up in the
+  # initrd).
+  stage2Init = toString stage2Init; # !!! doesn't work
 }
diff --git a/test/boot-stage-2-init.sh b/test/boot-stage-2-init.sh
index be54926aabc..edf3e9c0dbf 100644
--- a/test/boot-stage-2-init.sh
+++ b/test/boot-stage-2-init.sh
@@ -2,11 +2,13 @@
 
 # !!! copied from stage 1; remove duplication
 
+
 # Print a greeting.
 echo
 echo "<<< NixOS Stage 2 >>>"
 echo
 
+
 # Set the PATH.
 export PATH=/empty
 for i in @path@; do
@@ -16,49 +18,70 @@ for i in @path@; do
     fi
 done
 
-# Mount special file systems.
-mount -t tmpfs none /etc -n # to shut up mount
-touch /etc/fstab # idem
+
+# Mount special file systems, initialise required directories.
+
+if test -z "@readOnlyRoot@"; then
+    #rootDev=$(grep "/dev/.* / " /proc/mounts | sed 's/^\([^ ]*\) .*/\1/')
+    mount -o remount,rw /dontcare / # !!! check for failure
+fi
+
+needWritableDir() {
+    if test -n "@readOnlyRoot@"; then
+        mount -t tmpfs none $1 $3
+        chmod $2 $1
+    else
+        mkdir -m $2 -p $1
+    fi
+}
+
+needWritableDir /etc 0755 -n # to shut up mount
+
+test -e /etc/fstab || touch /etc/fstab # idem
+
 mount -t proc none /proc
 mount -t sysfs none /sys
-mount -t tmpfs none /dev
-mount -t tmpfs none /tmp
-mount -t tmpfs none /var
-mount -t tmpfs none /nix/var
+needWritableDir /dev 0755
+needWritableDir /tmp 01777
+needWritableDir /var 0755
+needWritableDir /nix/var 0755
+
+mkdir -m 0755 -p /nix/var/nix/db
+mkdir -m 0755 -p /nix/var/nix/gcroots
+mkdir -m 0755 -p /nix/var/nix/temproots
 
-mkdir -p /nix/var/nix/db
-mkdir -p /nix/var/nix/gcroots
-mkdir -p /nix/var/nix/temproots
 
 # Ensure that the module tools can find the kernel modules.
 export MODULE_DIR=@kernel@/lib/modules/
 
-# Create device nodes in /dev.
-#source @makeDevices@
 
 # Start udev.
 udevd --daemon
 
+
 # Let udev create device nodes for all modules that have already been
 # loaded into the kernel (or for which support is built into the
 # kernel).
 udevtrigger
 udevsettle # wait for udev to finish
 
+
 # Start syslogd.
-mkdir -p /var/run
+mkdir -m 0755 -p /var/run
 #mkdir -p /var/log
 #touch /var/log/messages
 echo "*.* /dev/tty10" > /etc/syslog.conf
 echo "syslog 514/udp" > /etc/services # required, even if we don't use it
 @sysklogd@/sbin/syslogd &
 
+
 # Try to load modules for all PCI devices.
 for i in /sys/bus/pci/devices/*/modalias; do
     echo "Trying to load a module for $(basename $(dirname $i))..."
     modprobe $(cat $i)
 done
 
+
 # Bring up the network devices.
 modprobe af_packet
 for i in $(cd /sys/class/net && ls -d *); do
@@ -71,18 +94,26 @@ for i in $(cd /sys/class/net && ls -d *); do
     fi
 done
 
+
 # login/su absolutely need this.
-touch /etc/login.defs 
+test -e /etc/login.defs || touch /etc/login.defs 
+
 
 # Enable a password-less root login.
-echo "root::0:0:root:/:@shell@" > /etc/passwd
-echo "root:*:0" > /etc/group
+if ! test -e /etc/passwd; then
+    echo "root::0:0:root:/:@shell@" > /etc/passwd
+fi
+if ! test -e /etc/group; then
+    echo "root:*:0" > /etc/group
+fi
+
 
 # Set up inittab.
 for i in $(seq 1 6); do 
     echo "$i:2345:respawn:@mingetty@/sbin/mingetty --noclear tty$i" >> /etc/inittab
 done
 
+
 # Show a nice greeting on each terminal.
 cat > /etc/issue <<EOF
 
@@ -93,6 +124,7 @@ You can log in as \`root'.
 
 EOF
 
+
 # Additional path for the interactive shell.
 for i in @extraPath@; do
     PATH=$PATH:$i/bin
@@ -106,11 +138,14 @@ export PATH=$PATH
 export MODULE_DIR=$MODULE_DIR
 EOF
 
+
 # Set the host name.
 hostname nixos
 
+
 # Start an interactive shell.
 #exec @shell@
 
+
 # Start init.
 exec init 2
diff --git a/test/boot-stage-2.nix b/test/boot-stage-2.nix
index 4514d1779ad..51420554500 100644
--- a/test/boot-stage-2.nix
+++ b/test/boot-stage-2.nix
@@ -2,12 +2,16 @@
 , utillinux, kernel, sysklogd, mingetty, udev
 , module_init_tools, nettools, dhcp
 , path ? []
+
+, # Whether the root device is root only.  If so, we'll mount a
+  # ramdisk on /etc, /var and so on.
+  readOnlyRoot
 }:
 
 genericSubstituter {
   src = ./boot-stage-2-init.sh;
   isExecutable = true;
-  inherit shell kernel sysklogd mingetty;
+  inherit shell kernel sysklogd mingetty readOnlyRoot;
   path = [
     coreutils
     findutils
@@ -18,5 +22,4 @@ genericSubstituter {
     dhcp
   ];
   extraPath = path;
-  makeDevices = ./make-devices.sh;
 }
diff --git a/test/installer.nix b/test/installer.nix
index d960bab1bb1..4b3ec85939c 100644
--- a/test/installer.nix
+++ b/test/installer.nix
@@ -10,7 +10,8 @@ genericSubstituter {
   nixClosure = stdenv.mkDerivation {
     name = "closure";
     builder = builtins.toFile "builder.sh"
-      "source $stdenv/setup; /nix/bin/nix-store -qR $nix > $out";
+      "source $stdenv/setup; nix-store -qR $nix > $out";
+    buildInputs = [nix];
     inherit nix;
   };
 }
diff --git a/test/make-iso9660-image.nix b/test/make-iso9660-image.nix
index f08aac3abc5..861b229b8a4 100644
--- a/test/make-iso9660-image.nix
+++ b/test/make-iso9660-image.nix
@@ -1,4 +1,4 @@
-{ stdenv, cdrtools
+{ stdenv, cdrtools, nix
 
   # The file name of the resulting ISO image.
 , isoName ? "cd.iso"
@@ -31,7 +31,7 @@ assert bootable -> bootImage != "";
 stdenv.mkDerivation {
   name = "iso9660-image";
   builder = ./make-iso9660-image.sh;
-  buildInputs = [cdrtools];
+  buildInputs = [cdrtools nix];
   inherit isoName packages init bootable bootImage;
   sources = map ({source, target}: source) contents;
   targets = map ({source, target}: target) contents;
diff --git a/test/make-iso9660-image.sh b/test/make-iso9660-image.sh
index 17f44e78ff0..774fbb8a90e 100644
--- a/test/make-iso9660-image.sh
+++ b/test/make-iso9660-image.sh
@@ -13,7 +13,7 @@ done
 
 # !!! Just as with make-initrd.nix, the call to Nix here needs to be
 # fixed.
-packagesClosure=$(/nix/bin/nix-store -qR $packages $init)
+packagesClosure=$(nix-store -qR $packages $init)
 
 for i in $packagesClosure; do
     graftList="$graftList ${i:1}=$i"
diff --git a/test/rescue-cd.nix b/test/rescue-cd.nix
index 002288bea87..ddb6a7cb677 100644
--- a/test/rescue-cd.nix
+++ b/test/rescue-cd.nix
@@ -9,12 +9,14 @@ in
   with import ./rescue-system.nix {
     autoDetectRootDevice = true;
     rootLabel = cdromLabel;
+    stage2Init = "/init";
+    readOnlyRoot = true;
   };
 
   
 rec {
 
-  inherit nixosInstaller; # !!! debug
+  inherit nixosInstaller bootStage1; # !!! debug
 
 
   # Since the CD is read-only, the mount points must be on disk.
@@ -34,7 +36,7 @@ rec {
   # kernel, the initrd produced above, and the closure of the stage 2
   # init.
   rescueCD = import ./make-iso9660-image.nix {
-    inherit (pkgs) stdenv cdrtools;
+    inherit (pkgs) stdenv cdrtools nix;
     isoName = "nixos.iso";
     
     contents = [
diff --git a/test/rescue-system.nix b/test/rescue-system.nix
index 40ec535c6b1..b2050fb14ae 100644
--- a/test/rescue-system.nix
+++ b/test/rescue-system.nix
@@ -2,6 +2,8 @@
 , autoDetectRootDevice ? false
 , rootDevice ? ""
 , rootLabel ? ""
+, stage2Init
+, readOnlyRoot
 }:
 
 rec {
@@ -50,6 +52,7 @@ rec {
     inherit (pkgsDiet) module_init_tools;
     inherit extraUtils;
     inherit autoDetectRootDevice rootDevice rootLabel;
+    inherit stage2Init;
     modules = modulesClosure;
     shell = stdenvLinuxStuff.bootstrapTools.bash;
     staticTools = stdenvLinuxStuff.staticTools;
@@ -110,6 +113,8 @@ rec {
     ];
 
     mingetty = pkgs.mingettyWrapper;
+
+    inherit readOnlyRoot;
   };
 
 
diff --git a/test/system-configuration.nix b/test/system-configuration.nix
index ef04dc1badc..531dc0d5cb8 100644
--- a/test/system-configuration.nix
+++ b/test/system-configuration.nix
@@ -7,14 +7,17 @@ let
   # don't want GRUB to be installed).
   grubDevice = "/dev/hda";
 
-in
-
-  # Build boot scripts for the CD that find the CD-ROM automatically.
-  with import ./rescue-system.nix {
+  # Build boot scripts.
+  bootEnv = import ./rescue-system.nix {
     autoDetectRootDevice = false;
     inherit rootDevice;
+    stage2Init = "/init"; # !!! should be bootEnv.bootStage2;
+    readOnlyRoot = false;
   };
 
+in
+
+with bootEnv;
   
 rec {
 
@@ -24,6 +27,7 @@ rec {
     builder = ./system-configuration.sh;
     inherit (pkgs) grub coreutils gnused gnugrep diffutils;
     inherit grubDevice;
+    inherit bootStage2;
     kernel = pkgs.kernel + "/vmlinuz";
     initrd = initialRamdisk + "/initrd";
   };
diff --git a/test/system-configuration.sh b/test/system-configuration.sh
index 17d58f4d0cb..d35811a84da 100644
--- a/test/system-configuration.sh
+++ b/test/system-configuration.sh
@@ -23,6 +23,7 @@ export PATH=$coreutils/bin:$gnused/bin:$gnugrep/bin:$diffutils/bin
 if test -n "$grubDevice"; then
     $grub/sbin/grub-install "$grubDevice" --no-floppy --recheck
     cp -f $out/menu.lst /boot/grub/menu.lst
+    ln -sf $bootStage2 /init # !!! fix?
 fi
 EOF
 
-- 
GitLab


From f9d0c57385a86c909e1b139eaec35beb935eb547 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 13 Nov 2006 11:42:23 +0000
Subject: [PATCH 0209/5331] * Set permissions explicitly.

svn path=/nixu/trunk/; revision=7015
---
 test/installer.sh | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/test/installer.sh b/test/installer.sh
index 14b6e2a4aac..c5dcecf2064 100644
--- a/test/installer.sh
+++ b/test/installer.sh
@@ -39,7 +39,7 @@ mountPoint=/tmp/inst-mnt
 mkdir -p $mountPoint
 mount "$targetDevice" $mountPoint
 
-mkdir -p $mountPoint/dev $mountPoint/proc $mountPoint/sys $mountPoint/mnt
+mkdir -m 0755 -p $mountPoint/dev $mountPoint/proc $mountPoint/sys $mountPoint/mnt
 mount --rbind / $mountPoint/mnt
 mount --bind /dev $mountPoint/dev
 mount --bind /proc $mountPoint/proc
@@ -56,13 +56,13 @@ cleanup() {
 
 trap "cleanup" EXIT
 
-mkdir -p $mountPoint/tmp
-mkdir -p $mountPoint/var
+mkdir -m 01777 -p $mountPoint/tmp
+mkdir -m 0755 -p $mountPoint/var
 
 
 # Create the necessary Nix directories on the target device, if they
 # don't already exist.
-mkdir -p \
+mkdir -m 0755 -p \
     $mountPoint/nix/store \
     $mountPoint/nix/var/nix/gcroots \
     $mountPoint/nix/var/nix/temproots \
@@ -96,18 +96,18 @@ done \
 
 # Create the required /bin/sh symlink; otherwise lots of things
 # (notably the system() function) won't work.
-mkdir -p $mountPoint/bin
+mkdir -m 0755 -p $mountPoint/bin
 ln -sf $(type -tp sh) $mountPoint/bin/sh
 
 
 # Enable networking in the chroot.
-mkdir -p $mountPoint/etc
+mkdir -m 0755 -p $mountPoint/etc
 cp /etc/resolv.conf $mountPoint/etc/
 
 
 # Do a nix-pull to speed up building.
 nixpkgsURL=http://nix.cs.uu.nl/dist/nix/nixpkgs-0.11pre6984
-#chroot $mountPoint @nix@/bin/nix-pull $nixpkgsURL/MANIFEST
+chroot $mountPoint @nix@/bin/nix-pull $nixpkgsURL/MANIFEST
 
 
 # Build the specified Nix expression in the target store and install
-- 
GitLab


From 91a66e72dc2f215928691c46cb1e810dc19dd61f Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 13 Nov 2006 16:19:57 +0000
Subject: [PATCH 0210/5331] * rescue-system -> boot-environment.

svn path=/nixu/trunk/; revision=7017
---
 test/{rescue-system.nix => boot-environment.nix} | 0
 test/rescue-cd.nix                               | 2 +-
 test/system-configuration.nix                    | 2 +-
 3 files changed, 2 insertions(+), 2 deletions(-)
 rename test/{rescue-system.nix => boot-environment.nix} (100%)

diff --git a/test/rescue-system.nix b/test/boot-environment.nix
similarity index 100%
rename from test/rescue-system.nix
rename to test/boot-environment.nix
diff --git a/test/rescue-cd.nix b/test/rescue-cd.nix
index ddb6a7cb677..70c44ca2382 100644
--- a/test/rescue-cd.nix
+++ b/test/rescue-cd.nix
@@ -6,7 +6,7 @@ let
 in
 
   # Build boot scripts for the CD that find the CD-ROM automatically.
-  with import ./rescue-system.nix {
+  with import ./boot-environment.nix {
     autoDetectRootDevice = true;
     rootLabel = cdromLabel;
     stage2Init = "/init";
diff --git a/test/system-configuration.nix b/test/system-configuration.nix
index 531dc0d5cb8..a1c90813e6b 100644
--- a/test/system-configuration.nix
+++ b/test/system-configuration.nix
@@ -8,7 +8,7 @@ let
   grubDevice = "/dev/hda";
 
   # Build boot scripts.
-  bootEnv = import ./rescue-system.nix {
+  bootEnv = import ./boot-environment.nix {
     autoDetectRootDevice = false;
     inherit rootDevice;
     stage2Init = "/init"; # !!! should be bootEnv.bootStage2;
-- 
GitLab


From 82ce465751df40ce7f68d41dc9c196dfcade620d Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 13 Nov 2006 19:01:39 +0000
Subject: [PATCH 0211/5331] * Use `exportReferencesGraph' to register the
 references of the   initial Nix installation correctly.

svn path=/nixu/trunk/; revision=7021
---
 test/installer.nix | 15 ++++++++++-----
 test/installer.sh  | 21 ++++++++++++++-------
 2 files changed, 24 insertions(+), 12 deletions(-)

diff --git a/test/installer.nix b/test/installer.nix
index 4b3ec85939c..2f8963a443b 100644
--- a/test/installer.nix
+++ b/test/installer.nix
@@ -6,12 +6,17 @@ genericSubstituter {
   dir = "bin";
   isExecutable = true;
   inherit shell nix;
-  
+
   nixClosure = stdenv.mkDerivation {
     name = "closure";
-    builder = builtins.toFile "builder.sh"
-      "source $stdenv/setup; nix-store -qR $nix > $out";
-    buildInputs = [nix];
-    inherit nix;
+    exportReferencesGraph = ["refs" nix];
+    builder = builtins.toFile "builder.sh" "
+      source $stdenv/setup
+      if ! test -e refs; then
+        echo 'Your Nix installation is too old!'
+        exit 1
+      fi
+      cp refs $out
+    ";
   };
 }
diff --git a/test/installer.sh b/test/installer.sh
index c5dcecf2064..4abad8e3840 100644
--- a/test/installer.sh
+++ b/test/installer.sh
@@ -73,9 +73,21 @@ mkdir -m 0755 -p \
     $mountPoint/nix/var/log/nix/drvs
 
 
+# Get the store paths to copy from the references graph.
+storePaths=""
+while read storePath; do
+    storePaths="$storePaths $storePath"
+    read deriver
+    read count
+    for ((i = 0; i < $count; i++)); do
+        read ref
+    done
+done < @nixClosure@
+
+
 # Copy Nix to the Nix store on the target device.
 echo "copying Nix to $targetDevice...."
-for i in $(cat @nixClosure@); do
+for i in $storePaths; do
     echo "  $i"
     rsync -a $i $mountPoint/nix/store/
 done
@@ -86,12 +98,7 @@ done
 # something.  (I.e., Nix will see that, e.g., the glibc path is not
 # valid, delete it to get it out of the way, but as a result nothing
 # will work anymore.)
-for i in $(cat @nixClosure@); do
-    echo $i
-    echo # deriver
-    echo 0 # nr of references
-done \
-| chroot $mountPoint @nix@/bin/nix-store --register-validity
+chroot $mountPoint @nix@/bin/nix-store --register-validity < @nixClosure@
 
 
 # Create the required /bin/sh symlink; otherwise lots of things
-- 
GitLab


From 78b2ed263ea9739f2813f62fa2e0a8fd93f91803 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 17 Nov 2006 14:13:21 +0000
Subject: [PATCH 0212/5331] * Use exportReferencesGraph everywhere.

svn path=/nixu/trunk/; revision=7063
---
 test/boot-environment.nix   |  6 +++---
 test/installer.nix          | 11 +++--------
 test/installer.sh           | 11 +----------
 test/make-initrd.nix        | 23 ++++++++++++++---------
 test/make-initrd.sh         | 13 +++++++------
 test/make-iso9660-image.nix | 12 +++++++++---
 test/make-iso9660-image.sh  |  6 ++----
 test/paths-from-graph.sh    | 10 ++++++++++
 test/rescue-cd.nix          |  2 +-
 9 files changed, 50 insertions(+), 44 deletions(-)
 create mode 100644 test/paths-from-graph.sh

diff --git a/test/boot-environment.nix b/test/boot-environment.nix
index b2050fb14ae..2dc1445e9f9 100644
--- a/test/boot-environment.nix
+++ b/test/boot-environment.nix
@@ -62,15 +62,15 @@ rec {
   # The closure of the init script of boot stage 1 is what we put in
   # the initial RAM disk.
   initialRamdisk = import ./make-initrd.nix {
-    inherit (pkgs) stdenv cpio nix;
-    packages = [];
+    inherit (pkgs) stdenv cpio;
     init = bootStage1;
   };
 
 
   # The installer.
   nixosInstaller = import ./installer.nix {
-    inherit (pkgs) stdenv genericSubstituter nix;
+    inherit (pkgs) stdenv genericSubstituter;
+    nix = pkgs.nixUnstable; # needs the exportReferencesGraph feature
     shell = pkgs.bash + "/bin/sh";
   };
 
diff --git a/test/installer.nix b/test/installer.nix
index 2f8963a443b..44080b86a85 100644
--- a/test/installer.nix
+++ b/test/installer.nix
@@ -7,16 +7,11 @@ genericSubstituter {
   isExecutable = true;
   inherit shell nix;
 
+  pathsFromGraph = ./paths-from-graph.sh;
+
   nixClosure = stdenv.mkDerivation {
     name = "closure";
     exportReferencesGraph = ["refs" nix];
-    builder = builtins.toFile "builder.sh" "
-      source $stdenv/setup
-      if ! test -e refs; then
-        echo 'Your Nix installation is too old!'
-        exit 1
-      fi
-      cp refs $out
-    ";
+    builder = builtins.toFile "builder.sh" "source $stdenv/setup; cp refs $out";
   };
 }
diff --git a/test/installer.sh b/test/installer.sh
index 4abad8e3840..be20b3095b8 100644
--- a/test/installer.sh
+++ b/test/installer.sh
@@ -74,16 +74,7 @@ mkdir -m 0755 -p \
 
 
 # Get the store paths to copy from the references graph.
-storePaths=""
-while read storePath; do
-    storePaths="$storePaths $storePath"
-    read deriver
-    read count
-    for ((i = 0; i < $count; i++)); do
-        read ref
-    done
-done < @nixClosure@
-
+storePaths=$(@shell@ @pathsFromGraph@ @nixClosure@)
 
 # Copy Nix to the Nix store on the target device.
 echo "copying Nix to $targetDevice...."
diff --git a/test/make-initrd.nix b/test/make-initrd.nix
index 91722b96602..2fb52f121fb 100644
--- a/test/make-initrd.nix
+++ b/test/make-initrd.nix
@@ -1,20 +1,25 @@
-# Create an initial ramdisk containing the specified set of packages.
-# An initial ramdisk is used during the initial stages of booting a
-# Linux system.  It is loaded by the boot loader along with the kernel
-# image.  It's supposed to contain everything (such as kernel modules)
-# necessary to allow us to mount the root file system.  Once the root
-# file system is mounted, the `real' boot script can be called.
+# Create an initial ramdisk containing the closure of the specified
+# `init' package.  An initial ramdisk is used during the initial
+# stages of booting a Linux system.  It is loaded by the boot loader
+# along with the kernel image.  It's supposed to contain everything
+# (such as kernel modules) necessary to allow us to mount the root
+# file system.  Once the root file system is mounted, the `real' boot
+# script can be called.
 #
 # An initrd is really just a gzipped cpio archive.
 #
 # A symlink `/init' is made to the store path passed in the `init'
 # argument.
 
-{stdenv, cpio, packages, init, nix}:
+{stdenv, cpio, init}:
 
 stdenv.mkDerivation {
   name = "initrd";
   builder = ./make-initrd.sh;
-  buildInputs = [cpio nix];
-  inherit packages init;
+  buildInputs = [cpio];
+  inherit init;
+  
+  # For obtaining the closure of `init'.
+  exportReferencesGraph = ["init-closure" init];
+  pathsFromGraph = ./paths-from-graph.sh;
 }
diff --git a/test/make-initrd.sh b/test/make-initrd.sh
index 5da23533feb..ea2ca5819a6 100644
--- a/test/make-initrd.sh
+++ b/test/make-initrd.sh
@@ -2,17 +2,18 @@ source $stdenv/setup
 
 set -o pipefail
 
-# Get the paths in the closure of `packages'.  Unfortunately, the only
-# way to get the closure is to call Nix, which is strictly speaking
-# forbidden.  But we do it anyway.  In time, we should add a feature
-# to Nix to let Nix pass closures to builders.
-packagesClosure=$(nix-store -qR $packages $init)
+# Get the paths in the closure of `init'.
+if ! test -e ./init-closure; then
+    echo 'Your Nix installation is too old! Upgrade to nix-0.11pre7038 or newer.'
+    exit 1
+fi
+storePaths=$($SHELL $pathsFromGraph ./init-closure)
 
 # Paths in cpio archives *must* be relative, otherwise the kernel
 # won't unpack 'em.
 mkdir root
 cd root
-cp -prd --parents $packagesClosure .
+cp -prd --parents $storePaths .
 
 # Put the closure in a gzipped cpio archive.
 ensureDir $out
diff --git a/test/make-iso9660-image.nix b/test/make-iso9660-image.nix
index 861b229b8a4..e98de8ffcb4 100644
--- a/test/make-iso9660-image.nix
+++ b/test/make-iso9660-image.nix
@@ -1,4 +1,4 @@
-{ stdenv, cdrtools, nix
+{ stdenv, cdrtools
 
   # The file name of the resulting ISO image.
 , isoName ? "cd.iso"
@@ -9,9 +9,11 @@
   # grafted in the file system at path `target'.
   contents
 
+/*
 , # In addition to `contents', the closure of the store paths listed
   # in `packages' are also placed in the file system.
   packages ? []
+*/
 
 , # `init' should be a store path, the closure of which is added to
   # the image, just like `packages'.  However, in addition, a symlink
@@ -31,8 +33,12 @@ assert bootable -> bootImage != "";
 stdenv.mkDerivation {
   name = "iso9660-image";
   builder = ./make-iso9660-image.sh;
-  buildInputs = [cdrtools nix];
-  inherit isoName packages init bootable bootImage;
+  buildInputs = [cdrtools];
+  inherit isoName init bootable bootImage;
   sources = map ({source, target}: source) contents;
   targets = map ({source, target}: target) contents;
+
+  # For obtaining the closure of `init'.
+  exportReferencesGraph = ["init-closure" init];
+  pathsFromGraph = ./paths-from-graph.sh;
 }
diff --git a/test/make-iso9660-image.sh b/test/make-iso9660-image.sh
index 774fbb8a90e..9a8bef7416d 100644
--- a/test/make-iso9660-image.sh
+++ b/test/make-iso9660-image.sh
@@ -11,11 +11,9 @@ for ((i = 0; i < ${#targets_[@]}; i++)); do
     graftList="$graftList ${targets_[$i]}=$(readlink -f ${sources_[$i]})"
 done
 
-# !!! Just as with make-initrd.nix, the call to Nix here needs to be
-# fixed.
-packagesClosure=$(nix-store -qR $packages $init)
+storePaths=$($SHELL $pathsFromGraph ./init-closure)
 
-for i in $packagesClosure; do
+for i in $storePaths; do
     graftList="$graftList ${i:1}=$i"
 done
 
diff --git a/test/paths-from-graph.sh b/test/paths-from-graph.sh
new file mode 100644
index 00000000000..4a134cb3165
--- /dev/null
+++ b/test/paths-from-graph.sh
@@ -0,0 +1,10 @@
+graph="$1"
+
+while read storePath; do
+    echo $storePath
+    read deriver
+    read count
+    for ((i = 0; i < $count; i++)); do
+        read ref
+    done
+done < $graph
diff --git a/test/rescue-cd.nix b/test/rescue-cd.nix
index 70c44ca2382..da9e4cd3f3b 100644
--- a/test/rescue-cd.nix
+++ b/test/rescue-cd.nix
@@ -36,7 +36,7 @@ rec {
   # kernel, the initrd produced above, and the closure of the stage 2
   # init.
   rescueCD = import ./make-iso9660-image.nix {
-    inherit (pkgs) stdenv cdrtools nix;
+    inherit (pkgs) stdenv cdrtools;
     isoName = "nixos.iso";
     
     contents = [
-- 
GitLab


From 6ae45d46eda3d45d8118666fd57eac01ad48aad8 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 17 Nov 2006 15:27:31 +0000
Subject: [PATCH 0213/5331] * Put Nixpkgs and the NixOS expressions on the
 installation CD (the   installer needs them).

svn path=/nixu/trunk/; revision=7065
---
 test/boot-environment.nix | 10 +++++-----
 test/boot-stage-2-init.sh |  1 +
 test/rescue-cd.nix        | 36 +++++++++++++++++++++++++++++++++++-
 3 files changed, 41 insertions(+), 6 deletions(-)

diff --git a/test/boot-environment.nix b/test/boot-environment.nix
index 2dc1445e9f9..59fe96634e6 100644
--- a/test/boot-environment.nix
+++ b/test/boot-environment.nix
@@ -100,15 +100,15 @@ rec {
       pkgs.less
       pkgs.nano
       pkgs.netcat
-#      pkgs.vim
       pkgs.nix
-      pkgs.strace
-      pkgs.sysvinit
+      pkgs.perl
       pkgs.procps
+      pkgs.rsync
       pkgs.shadowutils
+      pkgs.strace
       pkgs.sysklogd
-      pkgs.rsync
-      pkgs.perl
+      pkgs.sysvinit
+#      pkgs.vim
       nixosInstaller
     ];
 
diff --git a/test/boot-stage-2-init.sh b/test/boot-stage-2-init.sh
index edf3e9c0dbf..164c19dcf2b 100644
--- a/test/boot-stage-2-init.sh
+++ b/test/boot-stage-2-init.sh
@@ -79,6 +79,7 @@ echo "syslog 514/udp" > /etc/services # required, even if we don't use it
 for i in /sys/bus/pci/devices/*/modalias; do
     echo "Trying to load a module for $(basename $(dirname $i))..."
     modprobe $(cat $i)
+    echo ""
 done
 
 
diff --git a/test/rescue-cd.nix b/test/rescue-cd.nix
index da9e4cd3f3b..d045a903ff9 100644
--- a/test/rescue-cd.nix
+++ b/test/rescue-cd.nix
@@ -24,7 +24,7 @@ rec {
     name = "mount-points";
     builder = builtins.toFile "builder.sh" "
       source $stdenv/setup
-      mkdir $out
+      ensureDir $out
       cd $out
       mkdir proc sys tmp etc dev var mnt nix nix/var
       touch $out/${cdromLabel}
@@ -32,6 +32,34 @@ rec {
   };
 
 
+  # 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 {  
+    name = "tarball";
+    inherit tarName input;
+    builder = builtins.toFile "builder.sh" "
+      source $stdenv/setup
+      ensureDir $out
+      (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
+  # of crap (like .svn if this is a working copy).  An "svn export"
+  # would be better, but that's impure.
+  nixosTarball = makeTarball "nixos.tar.bz2" ./.;
+
+  
+  nixpkgsTarball = pkgs.fetchurl {
+    url = http://nix.cs.uu.nl/dist/nix/nixpkgs-0.11pre7060/nixpkgs-0.11pre7060.tar.bz2;
+    md5 = "67163e7a71f7b8cb01461e1d0467a6e1";
+  };
+
+
   # Create an ISO image containing the isolinux boot loader, the
   # kernel, the initrd produced above, and the closure of the stage 2
   # init.
@@ -55,6 +83,12 @@ rec {
       { source = cdMountPoints;
         target = "/";
       }
+      { source = nixosTarball + "/" + nixosTarball.tarName;
+        target = "/" + nixosTarball.tarName;
+      }
+      { source = nixpkgsTarball;
+        target = "/nixpkgs.tar.bz2";
+      }
     ];
 
     init = bootStage2;
-- 
GitLab


From e1e386cba607f5b9a88b6eee45206e63bb5bb2a1 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 17 Nov 2006 16:29:31 +0000
Subject: [PATCH 0214/5331] * Clear the inittab.

svn path=/nixu/trunk/; revision=7066
---
 test/boot-stage-2-init.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/test/boot-stage-2-init.sh b/test/boot-stage-2-init.sh
index 164c19dcf2b..6bfff35f224 100644
--- a/test/boot-stage-2-init.sh
+++ b/test/boot-stage-2-init.sh
@@ -110,6 +110,7 @@ fi
 
 
 # Set up inittab.
+echo -n > /etc/inittab
 for i in $(seq 1 6); do 
     echo "$i:2345:respawn:@mingetty@/sbin/mingetty --noclear tty$i" >> /etc/inittab
 done
-- 
GitLab


From 4798d7a4d22843b060f197eb8fadc54bc327d618 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 17 Nov 2006 16:38:24 +0000
Subject: [PATCH 0215/5331] * Use the same Nix consistently.

svn path=/nixu/trunk/; revision=7067
---
 test/boot-environment.nix | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/test/boot-environment.nix b/test/boot-environment.nix
index 59fe96634e6..04434f69894 100644
--- a/test/boot-environment.nix
+++ b/test/boot-environment.nix
@@ -25,6 +25,8 @@ rec {
     allPackages = import ./pkgs/top-level/all-packages.nix;
   };
 
+  nix = pkgs.nixUnstable; # we need the exportReferencesGraph feature
+
 
   # Determine the set of modules that we need to mount the root FS.
   modulesClosure = import ./modules-closure.nix {
@@ -70,7 +72,8 @@ rec {
   # The installer.
   nixosInstaller = import ./installer.nix {
     inherit (pkgs) stdenv genericSubstituter;
-    nix = pkgs.nixUnstable; # needs the exportReferencesGraph feature
+    inherit nix;
+    nix = pkgs.nixUnstable; 
     shell = pkgs.bash + "/bin/sh";
   };
 
@@ -100,7 +103,6 @@ rec {
       pkgs.less
       pkgs.nano
       pkgs.netcat
-      pkgs.nix
       pkgs.perl
       pkgs.procps
       pkgs.rsync
@@ -109,6 +111,7 @@ rec {
       pkgs.sysklogd
       pkgs.sysvinit
 #      pkgs.vim
+      nix
       nixosInstaller
     ];
 
-- 
GitLab


From 29d9b88aa9a5d8b56e05893dd6bbcb78b6387d8e Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 17 Nov 2006 16:41:02 +0000
Subject: [PATCH 0216/5331] * Doh.

svn path=/nixu/trunk/; revision=7068
---
 test/boot-environment.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/test/boot-environment.nix b/test/boot-environment.nix
index 04434f69894..6b250b33585 100644
--- a/test/boot-environment.nix
+++ b/test/boot-environment.nix
@@ -73,7 +73,6 @@ rec {
   nixosInstaller = import ./installer.nix {
     inherit (pkgs) stdenv genericSubstituter;
     inherit nix;
-    nix = pkgs.nixUnstable; 
     shell = pkgs.bash + "/bin/sh";
   };
 
-- 
GitLab


From d191615e96a342f3ca9871cd3a2418b46f306553 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sun, 19 Nov 2006 18:16:29 +0000
Subject: [PATCH 0217/5331] * Use Upstart instead of sysvinit.

svn path=/nixu/trunk/; revision=7074
---
 test/boot-environment.nix |  4 ++--
 test/boot-stage-2-init.sh | 22 ++++++++++++++++------
 test/boot-stage-2.nix     |  5 +++--
 3 files changed, 21 insertions(+), 10 deletions(-)

diff --git a/test/boot-environment.nix b/test/boot-environment.nix
index 6b250b33585..4d4d98a0ed5 100644
--- a/test/boot-environment.nix
+++ b/test/boot-environment.nix
@@ -82,7 +82,7 @@ rec {
   bootStage2 = import ./boot-stage-2.nix {
     inherit (pkgs) genericSubstituter coreutils findutils
       utillinux kernel sysklogd udev module_init_tools
-      nettools;
+      nettools upstart;
     shell = pkgs.bash + "/bin/sh";
     dhcp = pkgs.dhcpWrapper;
 
@@ -108,7 +108,7 @@ rec {
       pkgs.shadowutils
       pkgs.strace
       pkgs.sysklogd
-      pkgs.sysvinit
+#      pkgs.sysvinit
 #      pkgs.vim
       nix
       nixosInstaller
diff --git a/test/boot-stage-2-init.sh b/test/boot-stage-2-init.sh
index 6bfff35f224..a80ee2aaa59 100644
--- a/test/boot-stage-2-init.sh
+++ b/test/boot-stage-2-init.sh
@@ -50,6 +50,8 @@ mkdir -m 0755 -p /nix/var/nix/db
 mkdir -m 0755 -p /nix/var/nix/gcroots
 mkdir -m 0755 -p /nix/var/nix/temproots
 
+mkdir -m 0755 -p /var/log
+
 
 # Ensure that the module tools can find the kernel modules.
 export MODULE_DIR=@kernel@/lib/modules/
@@ -109,10 +111,18 @@ if ! test -e /etc/group; then
 fi
 
 
-# Set up inittab.
-echo -n > /etc/inittab
+# Set up the Upstart jobs.
+export UPSTART_CFG_DIR=/etc/event.d
+mkdir -p $UPSTART_CFG_DIR
+
+cp -f @upstart@/etc/event.d/logd $UPSTART_CFG_DIR/logd
+
 for i in $(seq 1 6); do 
-    echo "$i:2345:respawn:@mingetty@/sbin/mingetty --noclear tty$i" >> /etc/inittab
+    cat > $UPSTART_CFG_DIR/tty$i <<EOF
+start on startup
+stop on shutdown
+respawn @mingetty@/sbin/mingetty --noclear tty$i
+EOF
 done
 
 
@@ -146,8 +156,8 @@ hostname nixos
 
 
 # Start an interactive shell.
-#exec @shell@
+@shell@ &
 
 
-# Start init.
-exec init 2
+# Start Upstart's init.
+exec @upstart@/sbin/init -v
diff --git a/test/boot-stage-2.nix b/test/boot-stage-2.nix
index 51420554500..b81684d2402 100644
--- a/test/boot-stage-2.nix
+++ b/test/boot-stage-2.nix
@@ -1,6 +1,6 @@
 { genericSubstituter, shell, coreutils, findutils
 , utillinux, kernel, sysklogd, mingetty, udev
-, module_init_tools, nettools, dhcp
+, module_init_tools, nettools, dhcp, upstart
 , path ? []
 
 , # Whether the root device is root only.  If so, we'll mount a
@@ -11,7 +11,7 @@
 genericSubstituter {
   src = ./boot-stage-2-init.sh;
   isExecutable = true;
-  inherit shell kernel sysklogd mingetty readOnlyRoot;
+  inherit shell kernel sysklogd mingetty upstart readOnlyRoot;
   path = [
     coreutils
     findutils
@@ -20,6 +20,7 @@ genericSubstituter {
     module_init_tools
     nettools
     dhcp
+    upstart
   ];
   extraPath = path;
 }
-- 
GitLab


From fb4ab4bc8efc47b98da6d7ae34a9b8fd646adf70 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sun, 19 Nov 2006 20:07:45 +0000
Subject: [PATCH 0218/5331] * Nixify the Upstart jobs.

svn path=/nixu/trunk/; revision=7075
---
 test/boot-environment.nix      | 31 ++++++++++++++++++++++++++++---
 test/boot-stage-2-init.sh      | 18 +++---------------
 test/boot-stage-2.nix          |  7 +++++--
 test/rescue-cd.nix             |  2 +-
 test/upstart-jobs/gather.nix   | 19 +++++++++++++++++++
 test/upstart-jobs/mingetty.nix |  8 ++++++++
 test/upstart-jobs/mingetty.sh  |  3 +++
 test/upstart-jobs/syslogd.nix  |  8 ++++++++
 test/upstart-jobs/syslogd.sh   |  3 +++
 9 files changed, 78 insertions(+), 21 deletions(-)
 create mode 100644 test/upstart-jobs/gather.nix
 create mode 100644 test/upstart-jobs/mingetty.nix
 create mode 100644 test/upstart-jobs/mingetty.sh
 create mode 100644 test/upstart-jobs/syslogd.nix
 create mode 100644 test/upstart-jobs/syslogd.sh

diff --git a/test/boot-environment.nix b/test/boot-environment.nix
index 4d4d98a0ed5..281a6318af0 100644
--- a/test/boot-environment.nix
+++ b/test/boot-environment.nix
@@ -77,12 +77,39 @@ rec {
   };
 
 
+  # The services (Upstart) configuration for the system.
+  upstartJobs = import ./upstart-jobs/gather.nix {
+    inherit (pkgs) stdenv;
+
+    jobs = [
+      # For the builtin logd job.
+      pkgs.upstart 
+
+      # The terminals on ttyX.
+      (map 
+        (ttyNumber: import ./upstart-jobs/mingetty.nix {
+          inherit (pkgs) genericSubstituter;
+          mingetty = pkgs.mingettyWrapper;
+          inherit ttyNumber;
+        })
+        [1 2 3 4 5 6]
+      )
+
+      # Syslogd.
+      (import ./upstart-jobs/syslogd.nix {
+        inherit (pkgs) genericSubstituter sysklogd;
+      })
+    ];
+  };
+
+
   # The init script of boot stage 2, which is supposed to do
   # everything else to bring up the system.
   bootStage2 = import ./boot-stage-2.nix {
     inherit (pkgs) genericSubstituter coreutils findutils
-      utillinux kernel sysklogd udev module_init_tools
+      utillinux kernel udev module_init_tools
       nettools upstart;
+    inherit upstartJobs;
     shell = pkgs.bash + "/bin/sh";
     dhcp = pkgs.dhcpWrapper;
 
@@ -114,8 +141,6 @@ rec {
       nixosInstaller
     ];
 
-    mingetty = pkgs.mingettyWrapper;
-
     inherit readOnlyRoot;
   };
 
diff --git a/test/boot-stage-2-init.sh b/test/boot-stage-2-init.sh
index a80ee2aaa59..5f68fea82cd 100644
--- a/test/boot-stage-2-init.sh
+++ b/test/boot-stage-2-init.sh
@@ -68,13 +68,10 @@ udevtrigger
 udevsettle # wait for udev to finish
 
 
-# Start syslogd.
+# Necessary configuration for syslogd.
 mkdir -m 0755 -p /var/run
-#mkdir -p /var/log
-#touch /var/log/messages
 echo "*.* /dev/tty10" > /etc/syslog.conf
 echo "syslog 514/udp" > /etc/services # required, even if we don't use it
-@sysklogd@/sbin/syslogd &
 
 
 # Try to load modules for all PCI devices.
@@ -113,17 +110,8 @@ fi
 
 # Set up the Upstart jobs.
 export UPSTART_CFG_DIR=/etc/event.d
-mkdir -p $UPSTART_CFG_DIR
 
-cp -f @upstart@/etc/event.d/logd $UPSTART_CFG_DIR/logd
-
-for i in $(seq 1 6); do 
-    cat > $UPSTART_CFG_DIR/tty$i <<EOF
-start on startup
-stop on shutdown
-respawn @mingetty@/sbin/mingetty --noclear tty$i
-EOF
-done
+ln -sf @upstartJobs@/etc/event.d /etc/event.d
 
 
 # Show a nice greeting on each terminal.
@@ -156,7 +144,7 @@ hostname nixos
 
 
 # Start an interactive shell.
-@shell@ &
+#exec @shell@
 
 
 # Start Upstart's init.
diff --git a/test/boot-stage-2.nix b/test/boot-stage-2.nix
index b81684d2402..9b37d4cd6f3 100644
--- a/test/boot-stage-2.nix
+++ b/test/boot-stage-2.nix
@@ -1,17 +1,20 @@
 { genericSubstituter, shell, coreutils, findutils
-, utillinux, kernel, sysklogd, mingetty, udev
+, utillinux, kernel, udev
 , module_init_tools, nettools, dhcp, upstart
 , path ? []
 
 , # Whether the root device is root only.  If so, we'll mount a
   # ramdisk on /etc, /var and so on.
   readOnlyRoot
+
+, # The Upstart job configuration.
+  upstartJobs
 }:
 
 genericSubstituter {
   src = ./boot-stage-2-init.sh;
   isExecutable = true;
-  inherit shell kernel sysklogd mingetty upstart readOnlyRoot;
+  inherit shell kernel upstart readOnlyRoot upstartJobs;
   path = [
     coreutils
     findutils
diff --git a/test/rescue-cd.nix b/test/rescue-cd.nix
index d045a903ff9..e66de36e424 100644
--- a/test/rescue-cd.nix
+++ b/test/rescue-cd.nix
@@ -16,7 +16,7 @@ in
   
 rec {
 
-  inherit nixosInstaller bootStage1; # !!! debug
+  inherit nixosInstaller bootStage1 upstartJobs; # !!! debug
 
 
   # Since the CD is read-only, the mount points must be on disk.
diff --git a/test/upstart-jobs/gather.nix b/test/upstart-jobs/gather.nix
new file mode 100644
index 00000000000..914c78e7a89
--- /dev/null
+++ b/test/upstart-jobs/gather.nix
@@ -0,0 +1,19 @@
+# Create an etc/event.d directory containing symlinks to the
+# specified list of Upstart job files.
+{stdenv, jobs}:
+
+stdenv.mkDerivation {
+  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
+  ";
+}
diff --git a/test/upstart-jobs/mingetty.nix b/test/upstart-jobs/mingetty.nix
new file mode 100644
index 00000000000..0a38bc66e6a
--- /dev/null
+++ b/test/upstart-jobs/mingetty.nix
@@ -0,0 +1,8 @@
+{genericSubstituter, mingetty, ttyNumber}:
+
+genericSubstituter {
+  src = ./mingetty.sh;
+  dir = "etc/event.d";
+  name = "tty" + toString ttyNumber;
+  inherit mingetty ttyNumber;
+}
diff --git a/test/upstart-jobs/mingetty.sh b/test/upstart-jobs/mingetty.sh
new file mode 100644
index 00000000000..f1eab56510c
--- /dev/null
+++ b/test/upstart-jobs/mingetty.sh
@@ -0,0 +1,3 @@
+start on startup
+stop on shutdown
+respawn @mingetty@/sbin/mingetty --noclear tty@ttyNumber@
diff --git a/test/upstart-jobs/syslogd.nix b/test/upstart-jobs/syslogd.nix
new file mode 100644
index 00000000000..fddcea6692f
--- /dev/null
+++ b/test/upstart-jobs/syslogd.nix
@@ -0,0 +1,8 @@
+{genericSubstituter, sysklogd}:
+
+genericSubstituter {
+  src = ./syslogd.sh;
+  dir = "etc/event.d";
+  name = "syslogd";
+  inherit sysklogd;
+}
diff --git a/test/upstart-jobs/syslogd.sh b/test/upstart-jobs/syslogd.sh
new file mode 100644
index 00000000000..d87d5b30557
--- /dev/null
+++ b/test/upstart-jobs/syslogd.sh
@@ -0,0 +1,3 @@
+start on startup
+stop on shutdown
+respawn @sysklogd@/sbin/syslogd -n
-- 
GitLab


From 70aca5974c480e7163a6275a5d5f3ea1e7681593 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sun, 19 Nov 2006 21:03:22 +0000
Subject: [PATCH 0219/5331] * Simplification.

svn path=/nixu/trunk/; revision=7076
---
 test/boot-environment.nix      | 36 +++++++++++++++++++---------------
 test/upstart-jobs/make-job.nix |  7 +++++++
 test/upstart-jobs/mingetty.nix | 12 +++++++-----
 test/upstart-jobs/mingetty.sh  |  3 ---
 test/upstart-jobs/syslogd.nix  | 12 +++++++-----
 test/upstart-jobs/syslogd.sh   |  3 ---
 6 files changed, 41 insertions(+), 32 deletions(-)
 create mode 100644 test/upstart-jobs/make-job.nix
 delete mode 100644 test/upstart-jobs/mingetty.sh
 delete mode 100644 test/upstart-jobs/syslogd.sh

diff --git a/test/boot-environment.nix b/test/boot-environment.nix
index 281a6318af0..dcf29322139 100644
--- a/test/boot-environment.nix
+++ b/test/boot-environment.nix
@@ -81,25 +81,29 @@ rec {
   upstartJobs = import ./upstart-jobs/gather.nix {
     inherit (pkgs) stdenv;
 
-    jobs = [
-      # For the builtin logd job.
-      pkgs.upstart 
-
-      # The terminals on ttyX.
-      (map 
-        (ttyNumber: import ./upstart-jobs/mingetty.nix {
-          inherit (pkgs) genericSubstituter;
-          mingetty = pkgs.mingettyWrapper;
-          inherit ttyNumber;
-        })
-        [1 2 3 4 5 6]
-      )
-
+    jobs = map makeJob [
       # Syslogd.
       (import ./upstart-jobs/syslogd.nix {
-        inherit (pkgs) genericSubstituter sysklogd;
+        inherit (pkgs) sysklogd;
       })
-    ];
+    ]
+
+    # The terminals on ttyX.
+    ++ (map 
+      (ttyNumber: makeJob (import ./upstart-jobs/mingetty.nix {
+        mingetty = pkgs.mingettyWrapper;
+        inherit ttyNumber;
+      }))
+      [1 2 3 4 5 6]
+    )
+
+    # For the builtin logd job.
+    ++ [pkgs.upstart];
+  };
+
+  
+  makeJob = import ./upstart-jobs/make-job.nix {
+    inherit (pkgs) stdenv;
   };
 
 
diff --git a/test/upstart-jobs/make-job.nix b/test/upstart-jobs/make-job.nix
new file mode 100644
index 00000000000..3995a8f21aa
--- /dev/null
+++ b/test/upstart-jobs/make-job.nix
@@ -0,0 +1,7 @@
+{stdenv}: job:
+
+stdenv.mkDerivation {
+  inherit (job) name job;
+  builder = builtins.toFile "builder.sh"
+    "source $stdenv/setup; ensureDir $out/etc/event.d; echo \"$job\" > $out/etc/event.d/$name";
+}
diff --git a/test/upstart-jobs/mingetty.nix b/test/upstart-jobs/mingetty.nix
index 0a38bc66e6a..cdce937535c 100644
--- a/test/upstart-jobs/mingetty.nix
+++ b/test/upstart-jobs/mingetty.nix
@@ -1,8 +1,10 @@
-{genericSubstituter, mingetty, ttyNumber}:
+{mingetty, ttyNumber}:
 
-genericSubstituter {
-  src = ./mingetty.sh;
-  dir = "etc/event.d";
+{
   name = "tty" + toString ttyNumber;
-  inherit mingetty ttyNumber;
+  job = "
+    start on startup
+    stop on shutdown
+    respawn ${mingetty}/sbin/mingetty --noclear tty${toString ttyNumber}
+  ";
 }
diff --git a/test/upstart-jobs/mingetty.sh b/test/upstart-jobs/mingetty.sh
deleted file mode 100644
index f1eab56510c..00000000000
--- a/test/upstart-jobs/mingetty.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-start on startup
-stop on shutdown
-respawn @mingetty@/sbin/mingetty --noclear tty@ttyNumber@
diff --git a/test/upstart-jobs/syslogd.nix b/test/upstart-jobs/syslogd.nix
index fddcea6692f..8f326b0d6cf 100644
--- a/test/upstart-jobs/syslogd.nix
+++ b/test/upstart-jobs/syslogd.nix
@@ -1,8 +1,10 @@
-{genericSubstituter, sysklogd}:
+{sysklogd}:
 
-genericSubstituter {
-  src = ./syslogd.sh;
-  dir = "etc/event.d";
+{
   name = "syslogd";
-  inherit sysklogd;
+  job = "
+    start on startup
+    stop on shutdown
+    respawn ${sysklogd}/sbin/syslogd -n
+  ";
 }
diff --git a/test/upstart-jobs/syslogd.sh b/test/upstart-jobs/syslogd.sh
deleted file mode 100644
index d87d5b30557..00000000000
--- a/test/upstart-jobs/syslogd.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-start on startup
-stop on shutdown
-respawn @sysklogd@/sbin/syslogd -n
-- 
GitLab


From 369b48eadf00c84db2cb8b6524cd49190744a06f Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sun, 19 Nov 2006 22:05:49 +0000
Subject: [PATCH 0220/5331] * Start dhclient as an Upstart job.

svn path=/nixu/trunk/; revision=7078
---
 test/boot-environment.nix      |  6 +++++-
 test/boot-stage-2-init.sh      |  7 +------
 test/boot-stage-2.nix          |  3 +--
 test/upstart-jobs/dhclient.nix | 29 +++++++++++++++++++++++++++++
 4 files changed, 36 insertions(+), 9 deletions(-)
 create mode 100644 test/upstart-jobs/dhclient.nix

diff --git a/test/boot-environment.nix b/test/boot-environment.nix
index dcf29322139..a32ebd48c72 100644
--- a/test/boot-environment.nix
+++ b/test/boot-environment.nix
@@ -86,6 +86,11 @@ rec {
       (import ./upstart-jobs/syslogd.nix {
         inherit (pkgs) sysklogd;
       })
+
+      # DHCP client.
+      (import ./upstart-jobs/dhclient.nix {
+        dhcp = pkgs.dhcpWrapper;
+      })
     ]
 
     # The terminals on ttyX.
@@ -115,7 +120,6 @@ rec {
       nettools upstart;
     inherit upstartJobs;
     shell = pkgs.bash + "/bin/sh";
-    dhcp = pkgs.dhcpWrapper;
 
     # Additional stuff; add whatever you want here.
     path = [
diff --git a/test/boot-stage-2-init.sh b/test/boot-stage-2-init.sh
index 5f68fea82cd..96d92b1ba77 100644
--- a/test/boot-stage-2-init.sh
+++ b/test/boot-stage-2-init.sh
@@ -86,12 +86,7 @@ done
 modprobe af_packet
 for i in $(cd /sys/class/net && ls -d *); do
     echo "Bringing up network device $i..."
-    if ifconfig $i up; then
-        if test "$i" != "lo"; then
-            mkdir -p /var/state/dhcp
-            dhclient $i
-        fi
-    fi
+    ifconfig $i up
 done
 
 
diff --git a/test/boot-stage-2.nix b/test/boot-stage-2.nix
index 9b37d4cd6f3..a7d22c3fb79 100644
--- a/test/boot-stage-2.nix
+++ b/test/boot-stage-2.nix
@@ -1,6 +1,6 @@
 { genericSubstituter, shell, coreutils, findutils
 , utillinux, kernel, udev
-, module_init_tools, nettools, dhcp, upstart
+, module_init_tools, nettools, upstart
 , path ? []
 
 , # Whether the root device is root only.  If so, we'll mount a
@@ -22,7 +22,6 @@ genericSubstituter {
     udev
     module_init_tools
     nettools
-    dhcp
     upstart
   ];
   extraPath = path;
diff --git a/test/upstart-jobs/dhclient.nix b/test/upstart-jobs/dhclient.nix
new file mode 100644
index 00000000000..8a5c4fe9a5f
--- /dev/null
+++ b/test/upstart-jobs/dhclient.nix
@@ -0,0 +1,29 @@
+{dhcp}:
+
+{
+  name = "dhclient";
+  
+  job = "
+description \"DHCP client\"
+
+start on startup
+stop on shutdown
+
+script
+    interfaces=
+    for i in $(cd /sys/class/net && ls -d *); do
+        if test \"$i\" != \"lo\" -a \"$(cat /sys/class/net/$i/operstate)\" != 'down'; then
+            interfaces=\"$interfaces $i\"
+        fi
+    done
+
+    if test -z \"$interfaces\"; then
+        echo 'No interfaces on which to start dhclient!'
+        exit 1
+    fi
+
+    exec ${dhcp}/sbin/dhclient -d $interfaces
+end script
+  ";
+  
+}
-- 
GitLab


From 962b1df3aa805fa02a9b0932e6d14778d04bb034 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 20 Nov 2006 17:06:44 +0000
Subject: [PATCH 0221/5331] * Some more upstartification.

svn path=/nixu/trunk/; revision=7081
---
 test/boot-environment.nix                |  8 +++++-
 test/boot-stage-2-init.sh                |  8 ------
 test/boot-stage-2.nix                    |  3 +-
 test/upstart-jobs/dhclient.nix           |  4 +--
 test/upstart-jobs/network-interfaces.nix | 35 ++++++++++++++++++++++++
 5 files changed, 45 insertions(+), 13 deletions(-)
 create mode 100644 test/upstart-jobs/network-interfaces.nix

diff --git a/test/boot-environment.nix b/test/boot-environment.nix
index a32ebd48c72..e0acb16252e 100644
--- a/test/boot-environment.nix
+++ b/test/boot-environment.nix
@@ -87,6 +87,11 @@ rec {
         inherit (pkgs) sysklogd;
       })
 
+      # Network interfaces.
+      (import ./upstart-jobs/network-interfaces.nix {
+        inherit (pkgs) nettools kernel;
+      })
+      
       # DHCP client.
       (import ./upstart-jobs/dhclient.nix {
         dhcp = pkgs.dhcpWrapper;
@@ -117,7 +122,7 @@ rec {
   bootStage2 = import ./boot-stage-2.nix {
     inherit (pkgs) genericSubstituter coreutils findutils
       utillinux kernel udev module_init_tools
-      nettools upstart;
+      upstart;
     inherit upstartJobs;
     shell = pkgs.bash + "/bin/sh";
 
@@ -137,6 +142,7 @@ rec {
       pkgs.less
       pkgs.nano
       pkgs.netcat
+      pkgs.nettools
       pkgs.perl
       pkgs.procps
       pkgs.rsync
diff --git a/test/boot-stage-2-init.sh b/test/boot-stage-2-init.sh
index 96d92b1ba77..e624fdbacc1 100644
--- a/test/boot-stage-2-init.sh
+++ b/test/boot-stage-2-init.sh
@@ -82,14 +82,6 @@ for i in /sys/bus/pci/devices/*/modalias; do
 done
 
 
-# Bring up the network devices.
-modprobe af_packet
-for i in $(cd /sys/class/net && ls -d *); do
-    echo "Bringing up network device $i..."
-    ifconfig $i up
-done
-
-
 # login/su absolutely need this.
 test -e /etc/login.defs || touch /etc/login.defs 
 
diff --git a/test/boot-stage-2.nix b/test/boot-stage-2.nix
index a7d22c3fb79..dc8cfbf891f 100644
--- a/test/boot-stage-2.nix
+++ b/test/boot-stage-2.nix
@@ -1,6 +1,6 @@
 { genericSubstituter, shell, coreutils, findutils
 , utillinux, kernel, udev
-, module_init_tools, nettools, upstart
+, module_init_tools, upstart
 , path ? []
 
 , # Whether the root device is root only.  If so, we'll mount a
@@ -21,7 +21,6 @@ genericSubstituter {
     utillinux
     udev
     module_init_tools
-    nettools
     upstart
   ];
   extraPath = path;
diff --git a/test/upstart-jobs/dhclient.nix b/test/upstart-jobs/dhclient.nix
index 8a5c4fe9a5f..a9c9f375bbb 100644
--- a/test/upstart-jobs/dhclient.nix
+++ b/test/upstart-jobs/dhclient.nix
@@ -6,8 +6,8 @@
   job = "
 description \"DHCP client\"
 
-start on startup
-stop on shutdown
+start on network-interfaces
+stop on network-interfaces/stop
 
 script
     interfaces=
diff --git a/test/upstart-jobs/network-interfaces.nix b/test/upstart-jobs/network-interfaces.nix
new file mode 100644
index 00000000000..3539a29afeb
--- /dev/null
+++ b/test/upstart-jobs/network-interfaces.nix
@@ -0,0 +1,35 @@
+# !!! Don't like it that I have to pass the kernel here.
+{nettools, kernel}:
+
+{
+  name = "network-interfaces";
+  
+  job = "
+start on startup
+stop on shutdown
+
+start script
+    export MODULE_DIR=${kernel}/lib/modules/
+
+    modprobe af_packet
+    
+    for i in $(cd /sys/class/net && ls -d *); do
+        echo \"Bringing up network device $i...\"
+        ${nettools}/sbin/ifconfig $i up || true
+    done
+end script
+
+# Hack: Upstart doesn't yet support what we want: a service that
+# doesn't have a running process associated with it.
+respawn sleep 10000
+
+stop script
+    for i in $(cd /sys/class/net && ls -d *); do
+        echo \"Bringing up network device $i...\"
+        ${nettools}/sbin/ifconfig $i down || true
+    done
+end script
+
+  ";
+  
+}
-- 
GitLab


From 7bba427e939839d286d87a8c5f5fef3383e6dbc5 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 20 Nov 2006 17:28:08 +0000
Subject: [PATCH 0222/5331] * Put the PCI module probing in an Upstart task. 
 We now have   more-or-less "asynchronous" booting: the login prompt appears
 almost   immediately, before the hardware and the network are started.

svn path=/nixu/trunk/; revision=7082
---
 test/boot-environment.nix                | 10 ++++++++--
 test/boot-stage-2-init.sh                |  8 --------
 test/boot-stage-2.nix                    |  4 +---
 test/upstart-jobs/dhclient.nix           |  2 +-
 test/upstart-jobs/hardware-scan.nix      | 23 +++++++++++++++++++++++
 test/upstart-jobs/network-interfaces.nix |  6 +++---
 6 files changed, 36 insertions(+), 17 deletions(-)
 create mode 100644 test/upstart-jobs/hardware-scan.nix

diff --git a/test/boot-environment.nix b/test/boot-environment.nix
index e0acb16252e..b70906b13f6 100644
--- a/test/boot-environment.nix
+++ b/test/boot-environment.nix
@@ -87,9 +87,14 @@ rec {
         inherit (pkgs) sysklogd;
       })
 
+      # Hardware scan; loads modules for PCI devices.
+      (import ./upstart-jobs/hardware-scan.nix {
+        inherit (pkgs) kernel module_init_tools;
+      })
+      
       # Network interfaces.
       (import ./upstart-jobs/network-interfaces.nix {
-        inherit (pkgs) nettools kernel;
+        inherit (pkgs) nettools kernel module_init_tools;
       })
       
       # DHCP client.
@@ -121,7 +126,7 @@ rec {
   # everything else to bring up the system.
   bootStage2 = import ./boot-stage-2.nix {
     inherit (pkgs) genericSubstituter coreutils findutils
-      utillinux kernel udev module_init_tools
+      utillinux kernel udev
       upstart;
     inherit upstartJobs;
     shell = pkgs.bash + "/bin/sh";
@@ -140,6 +145,7 @@ rec {
       pkgs.gzip
       pkgs.iputils
       pkgs.less
+      pkgs.module_init_tools
       pkgs.nano
       pkgs.netcat
       pkgs.nettools
diff --git a/test/boot-stage-2-init.sh b/test/boot-stage-2-init.sh
index e624fdbacc1..d8bcf620d48 100644
--- a/test/boot-stage-2-init.sh
+++ b/test/boot-stage-2-init.sh
@@ -74,14 +74,6 @@ echo "*.* /dev/tty10" > /etc/syslog.conf
 echo "syslog 514/udp" > /etc/services # required, even if we don't use it
 
 
-# Try to load modules for all PCI devices.
-for i in /sys/bus/pci/devices/*/modalias; do
-    echo "Trying to load a module for $(basename $(dirname $i))..."
-    modprobe $(cat $i)
-    echo ""
-done
-
-
 # login/su absolutely need this.
 test -e /etc/login.defs || touch /etc/login.defs 
 
diff --git a/test/boot-stage-2.nix b/test/boot-stage-2.nix
index dc8cfbf891f..1bf8856f480 100644
--- a/test/boot-stage-2.nix
+++ b/test/boot-stage-2.nix
@@ -1,6 +1,5 @@
 { genericSubstituter, shell, coreutils, findutils
-, utillinux, kernel, udev
-, module_init_tools, upstart
+, utillinux, kernel, udev, upstart
 , path ? []
 
 , # Whether the root device is root only.  If so, we'll mount a
@@ -20,7 +19,6 @@ genericSubstituter {
     findutils
     utillinux
     udev
-    module_init_tools
     upstart
   ];
   extraPath = path;
diff --git a/test/upstart-jobs/dhclient.nix b/test/upstart-jobs/dhclient.nix
index a9c9f375bbb..3eb71f1745a 100644
--- a/test/upstart-jobs/dhclient.nix
+++ b/test/upstart-jobs/dhclient.nix
@@ -6,7 +6,7 @@
   job = "
 description \"DHCP client\"
 
-start on network-interfaces
+start on network-interfaces/started
 stop on network-interfaces/stop
 
 script
diff --git a/test/upstart-jobs/hardware-scan.nix b/test/upstart-jobs/hardware-scan.nix
new file mode 100644
index 00000000000..3ffd8f9223f
--- /dev/null
+++ b/test/upstart-jobs/hardware-scan.nix
@@ -0,0 +1,23 @@
+# !!! Don't like it that I have to pass the kernel here.
+{kernel, module_init_tools}:
+
+{
+  name = "hardware-scan";
+  
+  job = "
+start on startup
+
+script
+    export MODULE_DIR=${kernel}/lib/modules/
+    
+    # Try to load modules for all PCI devices.
+    for i in /sys/bus/pci/devices/*/modalias; do
+        echo \"Trying to load a module for $(basename $(dirname $i))...\"
+        ${module_init_tools}/sbin/modprobe $(cat $i) || true
+        echo \"\"
+    done
+end script
+
+  ";
+
+}
diff --git a/test/upstart-jobs/network-interfaces.nix b/test/upstart-jobs/network-interfaces.nix
index 3539a29afeb..844ccd3f507 100644
--- a/test/upstart-jobs/network-interfaces.nix
+++ b/test/upstart-jobs/network-interfaces.nix
@@ -1,17 +1,17 @@
 # !!! Don't like it that I have to pass the kernel here.
-{nettools, kernel}:
+{nettools, kernel, module_init_tools}:
 
 {
   name = "network-interfaces";
   
   job = "
-start on startup
+start on hardware-scan
 stop on shutdown
 
 start script
     export MODULE_DIR=${kernel}/lib/modules/
 
-    modprobe af_packet
+    ${module_init_tools}/sbin/modprobe af_packet
     
     for i in $(cd /sys/class/net && ls -d *); do
         echo \"Bringing up network device $i...\"
-- 
GitLab


From 49b2a218b54f4eefb7ac4ef50acc14d4ae2908ca Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 20 Nov 2006 20:50:52 +0000
Subject: [PATCH 0223/5331] * Support entering maintenance mode ("shutdown
 now") and powering off   the system ("halt").

svn path=/nixu/trunk/; revision=7083
---
 test/boot-environment.nix               | 10 ++++++++++
 test/upstart-jobs/halt.nix              | 23 +++++++++++++++++++++++
 test/upstart-jobs/maintenance-shell.nix | 19 +++++++++++++++++++
 3 files changed, 52 insertions(+)
 create mode 100644 test/upstart-jobs/halt.nix
 create mode 100644 test/upstart-jobs/maintenance-shell.nix

diff --git a/test/boot-environment.nix b/test/boot-environment.nix
index b70906b13f6..887e8feb978 100644
--- a/test/boot-environment.nix
+++ b/test/boot-environment.nix
@@ -101,6 +101,16 @@ rec {
       (import ./upstart-jobs/dhclient.nix {
         dhcp = pkgs.dhcpWrapper;
       })
+
+      # Handles the maintenance/stalled event (single-user shell).
+      (import ./upstart-jobs/maintenance-shell.nix {
+        inherit (pkgs) bash;
+      })
+
+      # Handles the reboot/halt events.
+      (import ./upstart-jobs/halt.nix {
+        inherit (pkgs) bash;
+      })
     ]
 
     # The terminals on ttyX.
diff --git a/test/upstart-jobs/halt.nix b/test/upstart-jobs/halt.nix
new file mode 100644
index 00000000000..f259ea77cc9
--- /dev/null
+++ b/test/upstart-jobs/halt.nix
@@ -0,0 +1,23 @@
+{bash}:
+
+{
+  name = "sys-halt";
+  
+  job = "
+start on reboot
+start on halt
+start on system-halt
+start on power-off
+
+script
+    exec < /dev/tty1 > /dev/tty1 2>&1
+    echo \"\"
+    echo \"<<< SYSTEM SHUTDOWN >>>\"
+    echo \"\"
+
+    # Right now all events above power off the system.
+    exec halt -f -p
+end script
+  ";
+  
+}
diff --git a/test/upstart-jobs/maintenance-shell.nix b/test/upstart-jobs/maintenance-shell.nix
new file mode 100644
index 00000000000..9e2acdaa0f5
--- /dev/null
+++ b/test/upstart-jobs/maintenance-shell.nix
@@ -0,0 +1,19 @@
+{bash}:
+
+{
+  name = "maintenance-shell";
+  
+  job = "
+start on maintenance
+start on stalled
+
+script
+    exec < /dev/tty1 > /dev/tty1 2>&1
+    echo \"\"
+    echo \"<<< MAINTENANCE SHELL >>>\"
+    echo \"\"
+    exec ${bash}/bin/sh
+end script
+  ";
+  
+}
-- 
GitLab


From 54f6e4fc713ff2fbddf66ae0df578a5eeb01300c Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 20 Nov 2006 21:19:34 +0000
Subject: [PATCH 0224/5331] * Unmount file systems.

svn path=/nixu/trunk/; revision=7084
---
 test/upstart-jobs/halt.nix | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/test/upstart-jobs/halt.nix b/test/upstart-jobs/halt.nix
index f259ea77cc9..71e9ae1b536 100644
--- a/test/upstart-jobs/halt.nix
+++ b/test/upstart-jobs/halt.nix
@@ -15,8 +15,20 @@ script
     echo \"<<< SYSTEM SHUTDOWN >>>\"
     echo \"\"
 
+    # Do an initial sync just in case.
+    sync || true
+
+    # Unmount file systems.
+    umount -n -a || true
+
+    # Remount / read-only
+    mount -n -o remount,ro /dontcare / || true
+
+    # Final sync.
+    sync || true
+
     # Right now all events above power off the system.
-    exec halt -f -p
+    exec halt -f
 end script
   ";
   
-- 
GitLab


From 7e97935e178fa0c4cf71468e083bd1aa0b393cbd Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 20 Nov 2006 21:20:04 +0000
Subject: [PATCH 0225/5331] * Doh.

svn path=/nixu/trunk/; revision=7085
---
 test/upstart-jobs/halt.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/upstart-jobs/halt.nix b/test/upstart-jobs/halt.nix
index 71e9ae1b536..23b863e803d 100644
--- a/test/upstart-jobs/halt.nix
+++ b/test/upstart-jobs/halt.nix
@@ -28,7 +28,7 @@ script
     sync || true
 
     # Right now all events above power off the system.
-    exec halt -f
+    exec halt -f -p
 end script
   ";
   
-- 
GitLab


From 16d28b3552c55dfe21c1d24ffa57da2140cb967a Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 23 Nov 2006 15:25:29 +0000
Subject: [PATCH 0226/5331] * New Nixpkgs.

svn path=/nixu/trunk/; revision=7091
---
 test/rescue-cd.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/test/rescue-cd.nix b/test/rescue-cd.nix
index e66de36e424..172ceeaf68d 100644
--- a/test/rescue-cd.nix
+++ b/test/rescue-cd.nix
@@ -55,8 +55,8 @@ rec {
 
   
   nixpkgsTarball = pkgs.fetchurl {
-    url = http://nix.cs.uu.nl/dist/nix/nixpkgs-0.11pre7060/nixpkgs-0.11pre7060.tar.bz2;
-    md5 = "67163e7a71f7b8cb01461e1d0467a6e1";
+    url = http://nix.cs.uu.nl/dist/nix/nixpkgs-0.11pre7087/nixpkgs-0.11pre7087.tar.bz2;
+    md5 = "c5840fcd049d75e00ad856ecbbef6857)";
   };
 
 
-- 
GitLab


From e6d2d5077950d4be06fcb255eeb5cc99b979d9fa Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 23 Nov 2006 16:00:23 +0000
Subject: [PATCH 0227/5331] * Bring in /etc/profile.local.

svn path=/nixu/trunk/; revision=7092
---
 test/boot-stage-2-init.sh | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/test/boot-stage-2-init.sh b/test/boot-stage-2-init.sh
index d8bcf620d48..aa6f81e5f9b 100644
--- a/test/boot-stage-2-init.sh
+++ b/test/boot-stage-2-init.sh
@@ -115,6 +115,9 @@ done
 cat > /etc/profile <<EOF
 export PATH=$PATH
 export MODULE_DIR=$MODULE_DIR
+if test -f /etc/profile.local; then
+    source /etc/profile.local
+fi
 EOF
 
 
-- 
GitLab


From 183ed7a5ea8df0431b6e5a64fe95146deded3aa9 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 23 Nov 2006 16:46:23 +0000
Subject: [PATCH 0228/5331] * Create a symlink to /nix/var/nix/profiles from  
 /nix/var/nix/gcroots/, otherwise garbage collection will end   tragically.

svn path=/nixu/trunk/; revision=7093
---
 test/boot-stage-2-init.sh | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/test/boot-stage-2-init.sh b/test/boot-stage-2-init.sh
index aa6f81e5f9b..0c7a105c3a1 100644
--- a/test/boot-stage-2-init.sh
+++ b/test/boot-stage-2-init.sh
@@ -52,6 +52,8 @@ mkdir -m 0755 -p /nix/var/nix/temproots
 
 mkdir -m 0755 -p /var/log
 
+ln -sf /nix/var/nix/profiles /nix/var/nix/gcroots/
+
 
 # Ensure that the module tools can find the kernel modules.
 export MODULE_DIR=@kernel@/lib/modules/
-- 
GitLab


From c8c62dba0b9b1465bb06b2c3355246a1066bb65c Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 23 Nov 2006 17:27:43 +0000
Subject: [PATCH 0229/5331] * Remove /etc/mtab.

svn path=/nixu/trunk/; revision=7094
---
 test/boot-stage-2-init.sh | 2 ++
 test/installer.sh         | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/test/boot-stage-2-init.sh b/test/boot-stage-2-init.sh
index 0c7a105c3a1..bda2bfdb64d 100644
--- a/test/boot-stage-2-init.sh
+++ b/test/boot-stage-2-init.sh
@@ -21,6 +21,8 @@ done
 
 # Mount special file systems, initialise required directories.
 
+rm -f /etc/mtab
+
 if test -z "@readOnlyRoot@"; then
     #rootDev=$(grep "/dev/.* / " /proc/mounts | sed 's/^\([^ ]*\) .*/\1/')
     mount -o remount,rw /dontcare / # !!! check for failure
diff --git a/test/installer.sh b/test/installer.sh
index be20b3095b8..8e438f5388c 100644
--- a/test/installer.sh
+++ b/test/installer.sh
@@ -118,7 +118,7 @@ chroot $mountPoint @nix@/bin/nix-pull $nixpkgsURL/MANIFEST
 
 chroot $mountPoint @nix@/bin/nix-env \
     -p /nix/var/nix/profiles/system \
-    -f "/mnt/$nixExpr" -i system-configuration
+    -f "/mnt/$nixExpr" -i -A systemConfiguration
 
 
 # Grub needs a mtab.
-- 
GitLab


From a0821fbd497f761da8dd321e6dad440d41b783a3 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 23 Nov 2006 17:32:09 +0000
Subject: [PATCH 0230/5331] * /dev should always be a ramdisk.

svn path=/nixu/trunk/; revision=7095
---
 test/boot-stage-2-init.sh | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/test/boot-stage-2-init.sh b/test/boot-stage-2-init.sh
index bda2bfdb64d..a93d22d2470 100644
--- a/test/boot-stage-2-init.sh
+++ b/test/boot-stage-2-init.sh
@@ -30,8 +30,7 @@ fi
 
 needWritableDir() {
     if test -n "@readOnlyRoot@"; then
-        mount -t tmpfs none $1 $3
-        chmod $2 $1
+        mount -t tmpfs -o "mode=$2" none $1 $3
     else
         mkdir -m $2 -p $1
     fi
@@ -43,7 +42,7 @@ test -e /etc/fstab || touch /etc/fstab # idem
 
 mount -t proc none /proc
 mount -t sysfs none /sys
-needWritableDir /dev 0755
+mount -t tmpfs -o "mode=0755" none /dev
 needWritableDir /tmp 01777
 needWritableDir /var 0755
 needWritableDir /nix/var 0755
-- 
GitLab


From e6ebe2e2aadef7a1ff4284fb6419e6e7fd196b8e Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 23 Nov 2006 17:43:28 +0000
Subject: [PATCH 0231/5331] * Add an Upstart job for sshd.  The start script
 automatically creates   an sshd user, a host key, etc.

svn path=/nixu/trunk/; revision=7096
---
 test/boot-environment.nix  |  5 +++++
 test/boot-stage-2-init.sh  |  1 +
 test/upstart-jobs/sshd.nix | 32 ++++++++++++++++++++++++++++++++
 3 files changed, 38 insertions(+)
 create mode 100644 test/upstart-jobs/sshd.nix

diff --git a/test/boot-environment.nix b/test/boot-environment.nix
index 887e8feb978..aecb23fd4b3 100644
--- a/test/boot-environment.nix
+++ b/test/boot-environment.nix
@@ -102,6 +102,11 @@ rec {
         dhcp = pkgs.dhcpWrapper;
       })
 
+      # SSH daemon.
+      (import ./upstart-jobs/sshd.nix {
+        inherit (pkgs) openssh;
+      })
+
       # Handles the maintenance/stalled event (single-user shell).
       (import ./upstart-jobs/maintenance-shell.nix {
         inherit (pkgs) bash;
diff --git a/test/boot-stage-2-init.sh b/test/boot-stage-2-init.sh
index a93d22d2470..75ff879883e 100644
--- a/test/boot-stage-2-init.sh
+++ b/test/boot-stage-2-init.sh
@@ -93,6 +93,7 @@ fi
 # Set up the Upstart jobs.
 export UPSTART_CFG_DIR=/etc/event.d
 
+rm -f /etc/event.d
 ln -sf @upstartJobs@/etc/event.d /etc/event.d
 
 
diff --git a/test/upstart-jobs/sshd.nix b/test/upstart-jobs/sshd.nix
new file mode 100644
index 00000000000..919a96dda5a
--- /dev/null
+++ b/test/upstart-jobs/sshd.nix
@@ -0,0 +1,32 @@
+{openssh}:
+
+{
+  name = "sshd";
+  
+  job = "
+description \"SSH server\"
+
+start on network-interfaces/started
+stop on network-interfaces/stop
+
+start script
+    mkdir -m 0555 -p /var/empty
+
+    mkdir -m 0755 -p /etc/ssh
+
+    echo 'X11Forwarding yes' > /etc/ssh/sshd_config
+
+    if ! test -f /etc/ssh/ssh_host_dsa_key; then
+        ${openssh}/bin/ssh-keygen -t dsa -b 1024 -f /etc/ssh/ssh_host_dsa_key -N ''
+    fi
+
+    if ! grep -q '^sshd:' /etc/passwd; then
+        echo 'sshd:x:74:74:SSH privilege separation user:/var/empty:/noshell' >> /etc/passwd
+    fi
+
+end script
+
+respawn ${openssh}/sbin/sshd -h /etc/ssh/ssh_host_dsa_key -f /etc/ssh/sshd_config
+  ";
+  
+}
-- 
GitLab


From 5e8d54eef7048304170e86a8c58d006ce63f9a5d Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 23 Nov 2006 17:46:55 +0000
Subject: [PATCH 0232/5331] * Remove /etc/mtab on boot. * Start an emergency
 shell if we can't remount / read-writable.

svn path=/nixu/trunk/; revision=7097
---
 test/boot-stage-2-init.sh | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/test/boot-stage-2-init.sh b/test/boot-stage-2-init.sh
index 75ff879883e..9edb255f3d5 100644
--- a/test/boot-stage-2-init.sh
+++ b/test/boot-stage-2-init.sh
@@ -21,11 +21,12 @@ done
 
 # Mount special file systems, initialise required directories.
 
-rm -f /etc/mtab
-
 if test -z "@readOnlyRoot@"; then
     #rootDev=$(grep "/dev/.* / " /proc/mounts | sed 's/^\([^ ]*\) .*/\1/')
-    mount -o remount,rw /dontcare / # !!! check for failure
+    if mount -t dontcare -o remount,rw /dontcare /; then
+	echo "Couldn't remount / read-writable, starting emergency shell!"
+	exec @shell@
+    fi
 fi
 
 needWritableDir() {
@@ -40,7 +41,8 @@ needWritableDir /etc 0755 -n # to shut up mount
 
 test -e /etc/fstab || touch /etc/fstab # idem
 
-mount -t proc none /proc
+mount -n -t proc none /proc
+cp /proc/mounts /etc/mtab
 mount -t sysfs none /sys
 mount -t tmpfs -o "mode=0755" none /dev
 needWritableDir /tmp 01777
-- 
GitLab


From 0db7e06e7f73054fb1b5d195ecc226fea2024347 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 23 Nov 2006 17:51:03 +0000
Subject: [PATCH 0233/5331] * Oops.

svn path=/nixu/trunk/; revision=7098
---
 test/boot-stage-2-init.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/boot-stage-2-init.sh b/test/boot-stage-2-init.sh
index 9edb255f3d5..a6295dfc92a 100644
--- a/test/boot-stage-2-init.sh
+++ b/test/boot-stage-2-init.sh
@@ -23,7 +23,7 @@ done
 
 if test -z "@readOnlyRoot@"; then
     #rootDev=$(grep "/dev/.* / " /proc/mounts | sed 's/^\([^ ]*\) .*/\1/')
-    if mount -t dontcare -o remount,rw /dontcare /; then
+    if ! mount -t dontcare -o remount,rw /dontcare /; then
 	echo "Couldn't remount / read-writable, starting emergency shell!"
 	exec @shell@
     fi
-- 
GitLab


From 3bf7001325858f71f54cea0468d5a2d7f04cd6b3 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 23 Nov 2006 21:59:25 +0000
Subject: [PATCH 0234/5331] * Oops.

svn path=/nixu/trunk/; revision=7099
---
 test/rescue-cd.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/rescue-cd.nix b/test/rescue-cd.nix
index 172ceeaf68d..48040f6495c 100644
--- a/test/rescue-cd.nix
+++ b/test/rescue-cd.nix
@@ -56,7 +56,7 @@ rec {
   
   nixpkgsTarball = pkgs.fetchurl {
     url = http://nix.cs.uu.nl/dist/nix/nixpkgs-0.11pre7087/nixpkgs-0.11pre7087.tar.bz2;
-    md5 = "c5840fcd049d75e00ad856ecbbef6857)";
+    md5 = "c5840fcd049d75e00ad856ecbbef6857";
   };
 
 
-- 
GitLab


From bd62a8273efc016271be65d1365e2297a901cb93 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 23 Nov 2006 22:16:59 +0000
Subject: [PATCH 0235/5331] * Quick hack to allow localhost to be looked up
 (NIXOS-41).

svn path=/nixu/trunk/; revision=7100
---
 test/boot-stage-2-init.sh | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/test/boot-stage-2-init.sh b/test/boot-stage-2-init.sh
index a6295dfc92a..5fd302a6835 100644
--- a/test/boot-stage-2-init.sh
+++ b/test/boot-stage-2-init.sh
@@ -92,6 +92,11 @@ if ! test -e /etc/group; then
 fi
 
 
+# We need "localhost" (!!! destructive hack for NIXOS-41).
+echo "127.0.0.1 localhost" > /etc/localhost
+echo "hosts: files dns" > /etc/nsswitch.conf
+
+
 # Set up the Upstart jobs.
 export UPSTART_CFG_DIR=/etc/event.d
 
-- 
GitLab


From 498bb32c828075c03df1a602acd9f66bee38d27e Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 23 Nov 2006 22:52:15 +0000
Subject: [PATCH 0236/5331] * Doh.

svn path=/nixu/trunk/; revision=7101
---
 test/boot-stage-2-init.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/boot-stage-2-init.sh b/test/boot-stage-2-init.sh
index 5fd302a6835..12d6baf84a5 100644
--- a/test/boot-stage-2-init.sh
+++ b/test/boot-stage-2-init.sh
@@ -93,7 +93,7 @@ fi
 
 
 # We need "localhost" (!!! destructive hack for NIXOS-41).
-echo "127.0.0.1 localhost" > /etc/localhost
+echo "127.0.0.1 localhost" > /etc/hosts
 echo "hosts: files dns" > /etc/nsswitch.conf
 
 
-- 
GitLab


From 843aa8505ccd610ae801c1a34bca343586fb324d Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 23 Nov 2006 22:53:16 +0000
Subject: [PATCH 0237/5331] * Handle reboot properly.

svn path=/nixu/trunk/; revision=7102
---
 test/boot-environment.nix  | 13 +++++++++----
 test/upstart-jobs/halt.nix | 20 +++++++++++++-------
 2 files changed, 22 insertions(+), 11 deletions(-)

diff --git a/test/boot-environment.nix b/test/boot-environment.nix
index aecb23fd4b3..16ac9484820 100644
--- a/test/boot-environment.nix
+++ b/test/boot-environment.nix
@@ -112,12 +112,17 @@ rec {
         inherit (pkgs) bash;
       })
 
-      # Handles the reboot/halt events.
-      (import ./upstart-jobs/halt.nix {
-        inherit (pkgs) bash;
-      })
     ]
 
+    # Handles the reboot/halt events.
+    ++ (map
+      (event: makeJob (import ./upstart-jobs/halt.nix {
+        inherit (pkgs) bash;
+        inherit event;
+      }))
+      ["reboot" "halt" "system-halt" "power-off"]
+    )
+    
     # The terminals on ttyX.
     ++ (map 
       (ttyNumber: makeJob (import ./upstart-jobs/mingetty.nix {
diff --git a/test/upstart-jobs/halt.nix b/test/upstart-jobs/halt.nix
index 23b863e803d..58be12db69c 100644
--- a/test/upstart-jobs/halt.nix
+++ b/test/upstart-jobs/halt.nix
@@ -1,13 +1,15 @@
-{bash}:
+{bash, event}:
+
+assert event == "reboot"
+    || event == "halt"
+    || event == "system-halt"
+    || event == "power-off";
 
 {
-  name = "sys-halt";
+  name = "sys-" + event;
   
   job = "
-start on reboot
-start on halt
-start on system-halt
-start on power-off
+start on ${event}
 
 script
     exec < /dev/tty1 > /dev/tty1 2>&1
@@ -28,7 +30,11 @@ script
     sync || true
 
     # Right now all events above power off the system.
-    exec halt -f -p
+    if test ${event} = reboot; then
+        exec reboot -f
+    else
+        exec halt -f -p
+    fi
 end script
   ";
   
-- 
GitLab


From f1a46db43ba45abe4626e656b54c0c933525be83 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 23 Nov 2006 22:53:25 +0000
Subject: [PATCH 0238/5331] * Notes.

svn path=/nixu/trunk/; revision=7103
---
 test/README | 14 ++++++++++++++
 1 file changed, 14 insertions(+)
 create mode 100644 test/README

diff --git a/test/README b/test/README
new file mode 100644
index 00000000000..701faaf22fa
--- /dev/null
+++ b/test/README
@@ -0,0 +1,14 @@
+Switching to maintenance mode:
+
+$ shutdown now
+
+To get out of maintenance mode:
+
+$ initctl emit startup 
+
+
+Updating the current system configuration:
+
+$ nix-env -p /nix/var/nix/profiles/system -f system-configuration.nix -i -A systemConfiguration
+$ /nix/var/nix/profiles/system/bin/switch-to-configuration
+
-- 
GitLab


From 84b1cafe4bad452693e66dcdaeb0aa557ea32211 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 23 Nov 2006 22:58:25 +0000
Subject: [PATCH 0239/5331] * Fill in /etc/mtab with something sensible.

svn path=/nixu/trunk/; revision=7104
---
 test/boot-stage-2-init.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/boot-stage-2-init.sh b/test/boot-stage-2-init.sh
index 12d6baf84a5..23ca93937c9 100644
--- a/test/boot-stage-2-init.sh
+++ b/test/boot-stage-2-init.sh
@@ -42,7 +42,7 @@ needWritableDir /etc 0755 -n # to shut up mount
 test -e /etc/fstab || touch /etc/fstab # idem
 
 mount -n -t proc none /proc
-cp /proc/mounts /etc/mtab
+cat /proc/mounts > /etc/mtab
 mount -t sysfs none /sys
 mount -t tmpfs -o "mode=0755" none /dev
 needWritableDir /tmp 01777
-- 
GitLab


From 34acdf1f22bf9239b93253bdf3a2406a9413a03a Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 23 Nov 2006 23:22:43 +0000
Subject: [PATCH 0240/5331] * Generate a Grub boot menu that contains all
 generations of the   system profile.

svn path=/nixu/trunk/; revision=7105
---
 test/grub-menu-builder.sh     | 50 +++++++++++++++++++++++++++++++++++
 test/installer.sh             |  2 +-
 test/system-configuration.nix |  8 ++++++
 test/system-configuration.sh  |  5 +---
 4 files changed, 60 insertions(+), 5 deletions(-)
 create mode 100644 test/grub-menu-builder.sh

diff --git a/test/grub-menu-builder.sh b/test/grub-menu-builder.sh
new file mode 100644
index 00000000000..83760d975cf
--- /dev/null
+++ b/test/grub-menu-builder.sh
@@ -0,0 +1,50 @@
+#! @bash@/bin/sh -e
+
+default=$1
+if test -z "$1"; then
+    echo "Syntax: grub-menu-builder.sh <DEFAULT-CONFIG>"
+    exit 1
+fi
+
+
+target=/boot/grub/menu.lst
+tmp=$target.tmp
+
+cat > $tmp << GRUBEND
+# Automatically generated.  DO NOT EDIT THIS FILE!
+default=0
+timeout=5
+GRUBEND
+
+addEntry() {
+    name="$1"
+    path="$2"
+
+    cat >> $tmp << GRUBEND
+title $name
+GRUBEND
+
+    #cat $path/menu.lst >> $tmp
+
+    grep -v "title \|default=\|timeout=" < $path/menu.lst >> $tmp
+}
+
+
+if test -n "$tmp"; then
+    addEntry "NixOS - Default" $default
+fi
+
+
+# Add all generations of the system profile to the menu, in reverse
+# (most recent to least recent) order.
+for generation in $(
+    (cd /nix/var/nix/profiles && ls -d system-*-link) \
+    | sed 's/system-\([0-9]\+\)-link/\1/' \
+    | sort -n -r); do
+    echo $generation
+    addEntry "NixOS - Configuration $generation" \
+        /nix/var/nix/profiles/system-$generation-link
+done
+
+
+cp $tmp $target
diff --git a/test/installer.sh b/test/installer.sh
index 8e438f5388c..d3f747c8310 100644
--- a/test/installer.sh
+++ b/test/installer.sh
@@ -19,7 +19,7 @@ targetDevice="$1"
 nixExpr="$2"
 
 if test -z "$targetDevice" -o -z "$nixExpr"; then
-    echo "syntax: installer.sh <targetDevice> <nixExpr>"
+    echo "Syntax: installer.sh <targetDevice> <nixExpr>"
     exit 1
 fi
 
diff --git a/test/system-configuration.nix b/test/system-configuration.nix
index a1c90813e6b..8675cf5d71b 100644
--- a/test/system-configuration.nix
+++ b/test/system-configuration.nix
@@ -28,9 +28,17 @@ rec {
     inherit (pkgs) grub coreutils gnused gnugrep diffutils;
     inherit grubDevice;
     inherit bootStage2;
+    inherit grubMenuBuilder;
     kernel = pkgs.kernel + "/vmlinuz";
     initrd = initialRamdisk + "/initrd";
   };
 
 
+  grubMenuBuilder = pkgs.genericSubstituter {
+    src = ./grub-menu-builder.sh;
+    isExecutable = true;
+    inherit (pkgs) bash;
+  };
+
+
 }
diff --git a/test/system-configuration.sh b/test/system-configuration.sh
index d35811a84da..653774cc5cc 100644
--- a/test/system-configuration.sh
+++ b/test/system-configuration.sh
@@ -6,9 +6,6 @@ ln -s $kernel $out/kernel
 ln -s $grub $out/grub
 
 cat > $out/menu.lst << GRUBEND
-# Automatically generated.  DO NOT EDIT THIS FILE!
-default=0
-timeout=5
 title NixOS
         kernel $kernel selinux=0 apm=on acpi=on
         initrd $initrd
@@ -21,8 +18,8 @@ cat > $out/bin/switch-to-configuration <<EOF
 set -e
 export PATH=$coreutils/bin:$gnused/bin:$gnugrep/bin:$diffutils/bin
 if test -n "$grubDevice"; then
+    $grubMenuBuilder $out
     $grub/sbin/grub-install "$grubDevice" --no-floppy --recheck
-    cp -f $out/menu.lst /boot/grub/menu.lst
     ln -sf $bootStage2 /init # !!! fix?
 fi
 EOF
-- 
GitLab


From 1fb01e46c594282eb3ecc797883dda4018c355a5 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 24 Nov 2006 00:00:32 +0000
Subject: [PATCH 0241/5331] * Put the date of each configuration in the Grub
 menu.

svn path=/nixu/trunk/; revision=7106
---
 test/grub-menu-builder.sh | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/test/grub-menu-builder.sh b/test/grub-menu-builder.sh
index 83760d975cf..36fc0b05e12 100644
--- a/test/grub-menu-builder.sh
+++ b/test/grub-menu-builder.sh
@@ -42,8 +42,10 @@ for generation in $(
     | sed 's/system-\([0-9]\+\)-link/\1/' \
     | sort -n -r); do
     echo $generation
-    addEntry "NixOS - Configuration $generation" \
-        /nix/var/nix/profiles/system-$generation-link
+    link=/nix/var/nix/profiles/system-$generation-link
+    date=$(stat --printf="%y\n" $link | sed 's/\..*//')
+    addEntry "NixOS - Configuration $generation ($date)" $link
+        
 done
 
 
-- 
GitLab


From 2cccff268df477df673880415a250eae5c816b26 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 24 Nov 2006 00:04:29 +0000
Subject: [PATCH 0242/5331] * Pass the path of the stage 2 init script to stage
 1 init through the   kernel command line, instead of having a /init symlink. 
 This allows   us to switch between configurations. * Some debug support:
 adding `debug' to the kernel command line gives   a stage 1 shell.

svn path=/nixu/trunk/; revision=7107
---
 test/README                   |  5 +++++
 test/boot-stage-1-init.sh     | 26 +++++++++++++++++++++++++-
 test/system-configuration.nix |  2 +-
 test/system-configuration.sh  |  6 ++----
 4 files changed, 33 insertions(+), 6 deletions(-)

diff --git a/test/README b/test/README
index 701faaf22fa..e2f76b08301 100644
--- a/test/README
+++ b/test/README
@@ -1,3 +1,8 @@
+To get a Stage 1 shell:
+
+Add "debug1" to the kernel command line.
+
+
 Switching to maintenance mode:
 
 $ shutdown now
diff --git a/test/boot-stage-1-init.sh b/test/boot-stage-1-init.sh
index 3e93571ebda..3d115760e06 100644
--- a/test/boot-stage-1-init.sh
+++ b/test/boot-stage-1-init.sh
@@ -32,6 +32,25 @@ mkdir /sys
 mount -t sysfs none /sys
 
 
+# Process the kernel command line.
+stage2Init=@stage2Init@
+for o in $(cat /proc/cmdline); do
+    case $o in
+        init=*)
+            set -- $(IFS==; echo $o)
+            stage2Init=$2
+            ;;
+        debugtrace)
+            # Show each command.
+            set -x
+            ;;
+        debug1)
+            fail
+            ;;
+    esac
+done
+
+
 # Create device nodes in /dev.
 source @makeDevices@
 
@@ -85,6 +104,7 @@ else
 
 fi
 
+
 # Start stage 2.
 # !!! Note: we can't use pivot_root here (the kernel gods have
 # decreed), but we could use run-init from klibc, which deletes all
@@ -94,6 +114,10 @@ mount --move . /
 umount /proc # cleanup
 umount /sys
 
-exec chroot . @stage2Init@
+echo "INIT = $stage2Init"
+
+if test -z "$stage2Init"; then fail; fi
+
+exec chroot . $stage2Init
 
 fail
diff --git a/test/system-configuration.nix b/test/system-configuration.nix
index 8675cf5d71b..b357683f446 100644
--- a/test/system-configuration.nix
+++ b/test/system-configuration.nix
@@ -11,7 +11,7 @@ let
   bootEnv = import ./boot-environment.nix {
     autoDetectRootDevice = false;
     inherit rootDevice;
-    stage2Init = "/init"; # !!! should be bootEnv.bootStage2;
+    stage2Init = ""; # Passed on the command line via Grub.
     readOnlyRoot = false;
   };
 
diff --git a/test/system-configuration.sh b/test/system-configuration.sh
index 653774cc5cc..4a803d81e4b 100644
--- a/test/system-configuration.sh
+++ b/test/system-configuration.sh
@@ -6,9 +6,8 @@ ln -s $kernel $out/kernel
 ln -s $grub $out/grub
 
 cat > $out/menu.lst << GRUBEND
-title NixOS
-        kernel $kernel selinux=0 apm=on acpi=on
-        initrd $initrd
+kernel $kernel selinux=0 apm=on acpi=on init=$bootStage2
+initrd $initrd
 GRUBEND
 
 ensureDir $out/bin
@@ -20,7 +19,6 @@ export PATH=$coreutils/bin:$gnused/bin:$gnugrep/bin:$diffutils/bin
 if test -n "$grubDevice"; then
     $grubMenuBuilder $out
     $grub/sbin/grub-install "$grubDevice" --no-floppy --recheck
-    ln -sf $bootStage2 /init # !!! fix?
 fi
 EOF
 
-- 
GitLab


From 23d2f02841ecc9d5ee2fa9ffc33643118013671a Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 24 Nov 2006 00:18:14 +0000
Subject: [PATCH 0243/5331] * Debug support / quasi-single user mode.

svn path=/nixu/trunk/; revision=7108
---
 test/boot-stage-2-init.sh | 24 +++++++++++++++++++++++-
 1 file changed, 23 insertions(+), 1 deletion(-)

diff --git a/test/boot-stage-2-init.sh b/test/boot-stage-2-init.sh
index 23ca93937c9..83232b77e90 100644
--- a/test/boot-stage-2-init.sh
+++ b/test/boot-stage-2-init.sh
@@ -19,7 +19,7 @@ for i in @path@; do
 done
 
 
-# Mount special file systems, initialise required directories.
+# Mount special file systems.
 
 if test -z "@readOnlyRoot@"; then
     #rootDev=$(grep "/dev/.* / " /proc/mounts | sed 's/^\([^ ]*\) .*/\1/')
@@ -43,6 +43,28 @@ test -e /etc/fstab || touch /etc/fstab # idem
 
 mount -n -t proc none /proc
 cat /proc/mounts > /etc/mtab
+
+
+# Process the kernel command line.
+for o in $(cat /proc/cmdline); do
+    case $o in
+        debugtrace)
+            # Show each command.
+            set -x
+            ;;
+        debug2)
+            echo "Debug shell called from $out"
+            exec @shell@
+            ;;
+        S|s|single)
+            # !!! argh, can't pass a startup event to Upstart yet.
+            exec @shell@
+            ;;
+    esac
+done
+
+
+# More special file systems, initialise required directories.
 mount -t sysfs none /sys
 mount -t tmpfs -o "mode=0755" none /dev
 needWritableDir /tmp 01777
-- 
GitLab


From 02f31e7e85accac62d9cf3be04780e8e8dced965 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 24 Nov 2006 00:24:08 +0000
Subject: [PATCH 0244/5331] * Doh.

svn path=/nixu/trunk/; revision=7109
---
 test/boot-stage-2-init.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/boot-stage-2-init.sh b/test/boot-stage-2-init.sh
index 83232b77e90..ceea877cbeb 100644
--- a/test/boot-stage-2-init.sh
+++ b/test/boot-stage-2-init.sh
@@ -53,7 +53,7 @@ for o in $(cat /proc/cmdline); do
             set -x
             ;;
         debug2)
-            echo "Debug shell called from $out"
+            echo "Debug shell called from @out@"
             exec @shell@
             ;;
         S|s|single)
-- 
GitLab


From 9d171e03274d58df481dffc6dfc26f5b9095f878 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 24 Nov 2006 00:25:44 +0000
Subject: [PATCH 0245/5331] * Unnecessary message.

svn path=/nixu/trunk/; revision=7110
---
 test/boot-stage-2-init.sh | 2 --
 1 file changed, 2 deletions(-)

diff --git a/test/boot-stage-2-init.sh b/test/boot-stage-2-init.sh
index ceea877cbeb..3f480e87519 100644
--- a/test/boot-stage-2-init.sh
+++ b/test/boot-stage-2-init.sh
@@ -131,8 +131,6 @@ cat > /etc/issue <<EOF
 
 <<< Welcome to NixOS (\m) - Kernel \r (\l) >>>
 
-You can log in as \`root'.
-
 
 EOF
 
-- 
GitLab


From 5f212a6913a9d0553f83afea16dbe5862bc1a765 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 24 Nov 2006 00:34:50 +0000
Subject: [PATCH 0246/5331] * Handle ctrl-alt-delete.

svn path=/nixu/trunk/; revision=7111
---
 test/boot-environment.nix             |  3 +++
 test/upstart-jobs/ctrl-alt-delete.nix | 12 ++++++++++++
 2 files changed, 15 insertions(+)
 create mode 100644 test/upstart-jobs/ctrl-alt-delete.nix

diff --git a/test/boot-environment.nix b/test/boot-environment.nix
index 16ac9484820..6f124b88fef 100644
--- a/test/boot-environment.nix
+++ b/test/boot-environment.nix
@@ -112,6 +112,9 @@ rec {
         inherit (pkgs) bash;
       })
 
+      # Ctrl-alt-delete action.
+      (import ./upstart-jobs/ctrl-alt-delete.nix)
+
     ]
 
     # Handles the reboot/halt events.
diff --git a/test/upstart-jobs/ctrl-alt-delete.nix b/test/upstart-jobs/ctrl-alt-delete.nix
new file mode 100644
index 00000000000..126154bae73
--- /dev/null
+++ b/test/upstart-jobs/ctrl-alt-delete.nix
@@ -0,0 +1,12 @@
+{
+  name = "ctrl-alt-delete";
+  
+  job = "
+on ctrlaltdel
+
+script
+    shutdown -r now 'Ctrl-Alt-Delete pressed'
+end script
+  ";
+  
+}
-- 
GitLab


From f0695e9fcd1b113614d77e8e3243692ee0e59672 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 24 Nov 2006 10:50:49 +0000
Subject: [PATCH 0247/5331] * Clear utmp.

svn path=/nixu/trunk/; revision=7115
---
 test/boot-stage-2-init.sh | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/test/boot-stage-2-init.sh b/test/boot-stage-2-init.sh
index 3f480e87519..d2dc42045a1 100644
--- a/test/boot-stage-2-init.sh
+++ b/test/boot-stage-2-init.sh
@@ -84,6 +84,13 @@ ln -sf /nix/var/nix/profiles /nix/var/nix/gcroots/
 export MODULE_DIR=@kernel@/lib/modules/
 
 
+# Miscellaneous cleanup.
+rm -f /var/run/*
+
+echo -n > /var/run/utmp # must exist
+chmod 664 /var/run/utmp
+
+
 # Start udev.
 udevd --daemon
 
-- 
GitLab


From bb0a2b0d78e40ae835e6516bf70a1fb2df4298db Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 24 Nov 2006 12:13:11 +0000
Subject: [PATCH 0248/5331] * In stage 1, fsck the root device before mounting
 it.  If automatic   repair fails, drop the user into an emergency shell.

svn path=/nixu/trunk/; revision=7117
---
 test/boot-environment.nix | 10 ++++++++--
 test/boot-stage-1-init.sh | 28 ++++++++++++++++++++++++++--
 test/boot-stage-2-init.sh |  8 --------
 3 files changed, 34 insertions(+), 12 deletions(-)

diff --git a/test/boot-environment.nix b/test/boot-environment.nix
index 6f124b88fef..af7b9678518 100644
--- a/test/boot-environment.nix
+++ b/test/boot-environment.nix
@@ -40,10 +40,16 @@ rec {
   # need.
   extraUtils = pkgs.stdenv.mkDerivation {
     name = "extra-utils";
-    builder = builtins.toFile "builder.sh"
-      "source $stdenv/setup; ensureDir $out/bin; cp $utillinux/bin/mount $utillinux/bin/umount $utillinux/sbin/pivot_root $out/bin; nuke-refs $out/bin/*";
+    builder = builtins.toFile "builder.sh" "
+      source $stdenv/setup
+      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
+      nuke-refs $out/bin/*
+    ";
     buildInputs = [pkgs.nukeReferences];
     inherit (pkgsStatic) utillinux;
+    e2fsprogs = pkgs.e2fsprogsDiet;
   };
   
 
diff --git a/test/boot-stage-1-init.sh b/test/boot-stage-1-init.sh
index 3d115760e06..b25ce05368e 100644
--- a/test/boot-stage-1-init.sh
+++ b/test/boot-stage-1-init.sh
@@ -81,7 +81,7 @@ if test -n "@autoDetectRootDevice@"; then
 
             echo "  in $devName..."
 
-            if mount -o ro -t iso9660 $devName /mnt/root; then
+            if mount -n -o ro -t iso9660 $devName /mnt/root; then
                 if test -e "/mnt/root/@rootLabel@"; then
                     found=1
                     break
@@ -100,7 +100,31 @@ if test -n "@autoDetectRootDevice@"; then
 else
 
     # Hard-coded root device.
-    mount -o ro "@rootDevice@" /mnt/root
+    rootDevice="@rootDevice@"
+
+    # Check the root device.
+    fsck -C -a "$rootDevice"
+    fsckResult=$?
+
+    if test $(($fsckResult | 2)) = $fsckResult; then
+        echo "fsck finished, rebooting..."
+        sleep 3
+        # reboot -f -d !!! don't have reboot yet
+        fail
+    fi
+
+    if test $(($fsckResult | 4)) = $fsckResult; then
+        echo "$rootDevice has unrepaired errors, please fix them manually."
+        fail
+    fi
+
+    if test $fsckResult -ge 8; then
+        echo "fsck on $rootDevice failed."
+        fail
+    fi
+
+    # Mount read-writable.
+    mount -n -o rw "$rootDevice" /mnt/root || fail
 
 fi
 
diff --git a/test/boot-stage-2-init.sh b/test/boot-stage-2-init.sh
index d2dc42045a1..57f9e4e444f 100644
--- a/test/boot-stage-2-init.sh
+++ b/test/boot-stage-2-init.sh
@@ -21,14 +21,6 @@ done
 
 # Mount special file systems.
 
-if test -z "@readOnlyRoot@"; then
-    #rootDev=$(grep "/dev/.* / " /proc/mounts | sed 's/^\([^ ]*\) .*/\1/')
-    if ! mount -t dontcare -o remount,rw /dontcare /; then
-	echo "Couldn't remount / read-writable, starting emergency shell!"
-	exec @shell@
-    fi
-fi
-
 needWritableDir() {
     if test -n "@readOnlyRoot@"; then
         mount -t tmpfs -o "mode=$2" none $1 $3
-- 
GitLab


From f4dc05da97b995d577017c4a075ca7e763adaf23 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 24 Nov 2006 15:31:20 +0000
Subject: [PATCH 0249/5331] * /var/run: create earlier.

svn path=/nixu/trunk/; revision=7118
---
 test/boot-stage-2-init.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/test/boot-stage-2-init.sh b/test/boot-stage-2-init.sh
index 57f9e4e444f..f1ce3371967 100644
--- a/test/boot-stage-2-init.sh
+++ b/test/boot-stage-2-init.sh
@@ -77,7 +77,8 @@ export MODULE_DIR=@kernel@/lib/modules/
 
 
 # Miscellaneous cleanup.
-rm -f /var/run/*
+rm -rf /var/run
+mkdir -m 0755 -p /var/run
 
 echo -n > /var/run/utmp # must exist
 chmod 664 /var/run/utmp
@@ -95,7 +96,6 @@ udevsettle # wait for udev to finish
 
 
 # Necessary configuration for syslogd.
-mkdir -m 0755 -p /var/run
 echo "*.* /dev/tty10" > /etc/syslog.conf
 echo "syslog 514/udp" > /etc/services # required, even if we don't use it
 
-- 
GitLab


From 9d1be4d54fd2d180854bda41dda7887bba16f5b3 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 24 Nov 2006 15:31:28 +0000
Subject: [PATCH 0250/5331] * Create /boot/grub.

svn path=/nixu/trunk/; revision=7119
---
 test/system-configuration.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/test/system-configuration.sh b/test/system-configuration.sh
index 4a803d81e4b..06472ae8d83 100644
--- a/test/system-configuration.sh
+++ b/test/system-configuration.sh
@@ -17,6 +17,7 @@ cat > $out/bin/switch-to-configuration <<EOF
 set -e
 export PATH=$coreutils/bin:$gnused/bin:$gnugrep/bin:$diffutils/bin
 if test -n "$grubDevice"; then
+    mkdir -m 0700 -p /boot/grub
     $grubMenuBuilder $out
     $grub/sbin/grub-install "$grubDevice" --no-floppy --recheck
 fi
-- 
GitLab


From 9ac2e48e26bca04b77d9aedf06307dacc279dad9 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 24 Nov 2006 15:56:11 +0000
Subject: [PATCH 0251/5331] * Don't daemonise sshd.

svn path=/nixu/trunk/; revision=7120
---
 test/upstart-jobs/sshd.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/upstart-jobs/sshd.nix b/test/upstart-jobs/sshd.nix
index 919a96dda5a..466c7616f55 100644
--- a/test/upstart-jobs/sshd.nix
+++ b/test/upstart-jobs/sshd.nix
@@ -26,7 +26,7 @@ start script
 
 end script
 
-respawn ${openssh}/sbin/sshd -h /etc/ssh/ssh_host_dsa_key -f /etc/ssh/sshd_config
+respawn ${openssh}/sbin/sshd -D -h /etc/ssh/ssh_host_dsa_key -f /etc/ssh/sshd_config
   ";
   
 }
-- 
GitLab


From 3055ff0ae65bad1e4f281ad71297cd8f8c784801 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 24 Nov 2006 16:31:01 +0000
Subject: [PATCH 0252/5331] * Don't use /sys/class/net/*/operstate to find out
 the active interface,   since there seems to be a delay after the interface
 is brought up before   operstate reflects that.

svn path=/nixu/trunk/; revision=7121
---
 test/upstart-jobs/dhclient.nix           | 16 ++++++++++++++--
 test/upstart-jobs/network-interfaces.nix |  5 +++--
 2 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/test/upstart-jobs/dhclient.nix b/test/upstart-jobs/dhclient.nix
index 3eb71f1745a..dae773ab717 100644
--- a/test/upstart-jobs/dhclient.nix
+++ b/test/upstart-jobs/dhclient.nix
@@ -10,9 +10,21 @@ start on network-interfaces/started
 stop on network-interfaces/stop
 
 script
+    # Determine the interface on which to start dhclient.
     interfaces=
-    for i in $(cd /sys/class/net && ls -d *); do
-        if test \"$i\" != \"lo\" -a \"$(cat /sys/class/net/$i/operstate)\" != 'down'; then
+
+    # !!! apparent race; operstate seems to have a slight delay, so
+    # if dhclient is started right after network-interfaces, we don't
+    # always see all the interfaces.
+
+    #for i in $(cd /sys/class/net && ls -d *); do
+    #    if test \"$i\" != \"lo\" -a \"$(cat /sys/class/net/$i/operstate)\" != 'down'; then
+    #        interfaces=\"$interfaces $i\"
+    #    fi
+    #done
+
+    for i in $(ifconfig | grep '^[^ ]' | sed 's/ .*//'); do
+        if test \"$i\" != \"lo\"; then
             interfaces=\"$interfaces $i\"
         fi
     done
diff --git a/test/upstart-jobs/network-interfaces.nix b/test/upstart-jobs/network-interfaces.nix
index 844ccd3f507..d85c7e02001 100644
--- a/test/upstart-jobs/network-interfaces.nix
+++ b/test/upstart-jobs/network-interfaces.nix
@@ -12,11 +12,12 @@ start script
     export MODULE_DIR=${kernel}/lib/modules/
 
     ${module_init_tools}/sbin/modprobe af_packet
-    
+
     for i in $(cd /sys/class/net && ls -d *); do
         echo \"Bringing up network device $i...\"
         ${nettools}/sbin/ifconfig $i up || true
     done
+
 end script
 
 # Hack: Upstart doesn't yet support what we want: a service that
@@ -25,7 +26,7 @@ respawn sleep 10000
 
 stop script
     for i in $(cd /sys/class/net && ls -d *); do
-        echo \"Bringing up network device $i...\"
+        echo \"Taking down network device $i...\"
         ${nettools}/sbin/ifconfig $i down || true
     done
 end script
-- 
GitLab


From 6f91f8768f723cd69407ff19b5170438f9094e53 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 24 Nov 2006 16:38:22 +0000
Subject: [PATCH 0253/5331] * Need /var/state/dhcp.

svn path=/nixu/trunk/; revision=7122
---
 test/upstart-jobs/dhclient.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/test/upstart-jobs/dhclient.nix b/test/upstart-jobs/dhclient.nix
index dae773ab717..7ccc87615ad 100644
--- a/test/upstart-jobs/dhclient.nix
+++ b/test/upstart-jobs/dhclient.nix
@@ -34,6 +34,8 @@ script
         exit 1
     fi
 
+    mkdir -m 755 -p /var/state/dhcp
+
     exec ${dhcp}/sbin/dhclient -d $interfaces
 end script
   ";
-- 
GitLab


From 66574e789c23aab4bcc14ae0e33a9a4381b23f4e Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sat, 25 Nov 2006 00:39:43 +0000
Subject: [PATCH 0254/5331] * Include etc/profile.d/nix.sh.

svn path=/nixu/trunk/; revision=7127
---
 test/boot-stage-2-init.sh | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/test/boot-stage-2-init.sh b/test/boot-stage-2-init.sh
index f1ce3371967..58277751680 100644
--- a/test/boot-stage-2-init.sh
+++ b/test/boot-stage-2-init.sh
@@ -145,6 +145,11 @@ done
 cat > /etc/profile <<EOF
 export PATH=$PATH
 export MODULE_DIR=$MODULE_DIR
+
+source $(dirname $(type -tp nix-env))/../etc/profile.d/nix.sh
+
+alias ll="ls -l"
+
 if test -f /etc/profile.local; then
     source /etc/profile.local
 fi
-- 
GitLab


From 81856426cf3d82cee7ae36a3ee762cf78bf911c2 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sun, 26 Nov 2006 22:57:35 +0000
Subject: [PATCH 0255/5331] * Run the virtual consoles in 1024x768x16.

svn path=/nixu/trunk/; revision=7136
---
 test/system-configuration.nix | 4 ++++
 test/system-configuration.sh  | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/test/system-configuration.nix b/test/system-configuration.nix
index b357683f446..dee0461c2e4 100644
--- a/test/system-configuration.nix
+++ b/test/system-configuration.nix
@@ -15,6 +15,9 @@ let
     readOnlyRoot = false;
   };
 
+  # Extra kernel command line arguments.
+  extraKernelParams = "vga=0x317 console=tty1 splash=verbose";
+
 in
 
 with bootEnv;
@@ -31,6 +34,7 @@ rec {
     inherit grubMenuBuilder;
     kernel = pkgs.kernel + "/vmlinuz";
     initrd = initialRamdisk + "/initrd";
+    inherit extraKernelParams;
   };
 
 
diff --git a/test/system-configuration.sh b/test/system-configuration.sh
index 06472ae8d83..11254a24d0a 100644
--- a/test/system-configuration.sh
+++ b/test/system-configuration.sh
@@ -6,7 +6,7 @@ ln -s $kernel $out/kernel
 ln -s $grub $out/grub
 
 cat > $out/menu.lst << GRUBEND
-kernel $kernel selinux=0 apm=on acpi=on init=$bootStage2
+kernel $kernel selinux=0 apm=on acpi=on init=$bootStage2 $extraKernelParams
 initrd $initrd
 GRUBEND
 
-- 
GitLab


From 0b1caba9d8d0e93d0c57be6e6e45b92f2d89ddbc Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sun, 26 Nov 2006 23:00:30 +0000
Subject: [PATCH 0256/5331] * Use fbsplash / splashutils to give virtual
 consoles a nice   background.  Each console can have a different theme.  The
 mapping   from consoles to themes is specified in splash-themes.nix.

svn path=/nixu/trunk/; revision=7137
---
 test/boot-environment.nix                    |  8 ++++
 test/splash-themes.nix                       | 45 ++++++++++++++++++++
 test/upstart-jobs/tty-backgrounds-combine.sh | 37 ++++++++++++++++
 test/upstart-jobs/tty-backgrounds.nix        | 44 +++++++++++++++++++
 test/upstart-jobs/unpack-theme.sh            | 16 +++++++
 5 files changed, 150 insertions(+)
 create mode 100644 test/splash-themes.nix
 create mode 100644 test/upstart-jobs/tty-backgrounds-combine.sh
 create mode 100644 test/upstart-jobs/tty-backgrounds.nix
 create mode 100644 test/upstart-jobs/unpack-theme.sh

diff --git a/test/boot-environment.nix b/test/boot-environment.nix
index af7b9678518..05099ee97bb 100644
--- a/test/boot-environment.nix
+++ b/test/boot-environment.nix
@@ -113,6 +113,14 @@ rec {
         inherit (pkgs) openssh;
       })
 
+      # Transparent TTY backgrounds.
+      (import ./upstart-jobs/tty-backgrounds.nix {
+        inherit (pkgs) stdenv splashutils;
+        backgrounds = (import ./splash-themes.nix {
+          inherit (pkgs) fetchurl;
+        }).ttyBackgrounds;
+      })
+
       # Handles the maintenance/stalled event (single-user shell).
       (import ./upstart-jobs/maintenance-shell.nix {
         inherit (pkgs) bash;
diff --git a/test/splash-themes.nix b/test/splash-themes.nix
new file mode 100644
index 00000000000..cbc725dda1c
--- /dev/null
+++ b/test/splash-themes.nix
@@ -0,0 +1,45 @@
+{fetchurl}:
+
+rec {
+
+  # Some themes.
+  
+  themeBabyTux = fetchurl {
+    url = http://www.bootsplash.de/files/themes/Theme-BabyTux.tar.bz2;
+    md5 = "a6d89d1c1cff3b6a08e2f526f2eab4e0";
+  };
+
+  themeFrozenBubble = fetchurl {
+    url = http://www.bootsplash.de/files/themes/Theme-FrozenBubble.tar.bz2;
+    md5 = "da49f04988ab04b7e0de117b0d25061a";
+  };
+
+  themePativo = fetchurl {
+    url = http://www.bootsplash.de/files/themes/Theme-Pativo.tar.bz2;
+    md5 = "9e13beaaadf88d43a5293e7ab757d569";
+  };
+
+
+  # The themes to use for each tty.  For each tty except the first
+  # entry in the list, you can omit `theme' to get the same theme as
+  # the first one.  If a tty does not appear, it doesn't get a
+  # theme (i.e., it will keep a black background).
+  
+  ttyBackgrounds = [
+    { tty = 1;
+      theme = themeBabyTux;
+    }
+    { tty = 2;
+    }
+    { tty = 3;
+      theme = themeFrozenBubble;
+    }
+    { tty = 4;
+      theme = themePativo;
+    }
+    { tty = 6;
+      theme = themeFrozenBubble;
+    }
+  ];
+  
+}
diff --git a/test/upstart-jobs/tty-backgrounds-combine.sh b/test/upstart-jobs/tty-backgrounds-combine.sh
new file mode 100644
index 00000000000..50bab1fcd8c
--- /dev/null
+++ b/test/upstart-jobs/tty-backgrounds-combine.sh
@@ -0,0 +1,37 @@
+source $stdenv/setup
+
+ttys=($ttys)
+themes=($themes)
+
+ensureDir $out
+
+default=
+
+for ((n = 0; n < ${#ttys[*]}; n++)); do
+    tty=${ttys[$n]}
+    theme=${themes[$n]}
+
+    if test "$theme" = "default"; then
+        if test -z "$default"; then
+            echo "No default theme!"
+            exit 1
+        fi
+        theme=$default
+    fi
+        
+    if test -z "$default"; then default=$theme; fi
+
+    echo "TTY $tty -> $theme"
+
+    themeName=$(cd $theme && ls)
+    
+    ln -sf $theme/$themeName $out/$themeName
+
+    if test -e $out/$tty; then
+        echo "Multiple themes defined for the same TTY!"
+        exit 1
+    fi
+
+    ln -sf $themeName $out/$tty
+    
+done
diff --git a/test/upstart-jobs/tty-backgrounds.nix b/test/upstart-jobs/tty-backgrounds.nix
new file mode 100644
index 00000000000..fd8eabea6a6
--- /dev/null
+++ b/test/upstart-jobs/tty-backgrounds.nix
@@ -0,0 +1,44 @@
+{stdenv, splashutils, backgrounds}:
+
+rec {
+  name = "tty-backgrounds";
+
+  unpackTheme = theme: stdenv.mkDerivation {
+    name = "theme";
+    builder = ./unpack-theme.sh;
+    inherit theme;
+  };
+
+  themesUnpacked = stdenv.mkDerivation {
+    name = "splash-themes";
+    builder = ./tty-backgrounds-combine.sh;
+    # !!! Should use XML here.
+    ttys = map (x: x.tty) backgrounds;
+    themes = map (x: if x ? theme then (unpackTheme x.theme) else "default") backgrounds;
+  };
+
+  job = "
+start on hardware-scan
+
+script
+
+    rm -f /etc/splash
+    ln -s ${themesUnpacked} /etc/splash
+
+    # Critical: tell the kernel where to find splash_helper.  It calls
+    # this program every time we switch between consoles.
+    echo ${splashutils}/bin/splash_helper > /proc/sys/kernel/fbsplash
+
+    # Set the theme for each console, as determined by
+    # tty-backgrounds-combine.sh above.
+    for tty in ${toString (map (x: x.tty) backgrounds)}; do
+        theme=$(readlink ${themesUnpacked}/$tty)
+        ${splashutils}/bin/splash_util --tty $tty -c setcfg -t $theme || true
+        ${splashutils}/bin/splash_util --tty $tty -c setpic -t $theme || true
+        ${splashutils}/bin/splash_util --tty $tty -c on || true
+    done
+
+end script
+  ";
+  
+}
diff --git a/test/upstart-jobs/unpack-theme.sh b/test/upstart-jobs/unpack-theme.sh
new file mode 100644
index 00000000000..c3a860692e5
--- /dev/null
+++ b/test/upstart-jobs/unpack-theme.sh
@@ -0,0 +1,16 @@
+source $stdenv/setup
+
+ensureDir $out
+
+tar xvfj $theme -C $out
+
+themeName=$(cd $out && ls)
+
+for i in $out/$themeName/config/*.cfg; do
+    echo "converting $i"
+    # Rewrite /etc paths.  Also, the file names
+    # config/bootsplash-<RES>.cfg should be <RES>.cfg.
+    sed "s^/etc/bootsplash/themes^$out^g" < $i > $out/$themeName/$(basename $i | sed 's^.*-^^')
+done
+
+rm $out/$themeName/config/*.cfg
-- 
GitLab


From 19659d26c2bec431b4e538dfeed2dc4282405417 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sun, 26 Nov 2006 23:26:37 +0000
Subject: [PATCH 0257/5331] * Allow the tty-backgrounds service to be stopped,
 and remove the   themes from all consoles when we do so.

svn path=/nixu/trunk/; revision=7140
---
 test/splash-themes.nix                | 15 ++++++++++-----
 test/upstart-jobs/tty-backgrounds.nix | 12 +++++++++++-
 2 files changed, 21 insertions(+), 6 deletions(-)

diff --git a/test/splash-themes.nix b/test/splash-themes.nix
index cbc725dda1c..72ab07bcae5 100644
--- a/test/splash-themes.nix
+++ b/test/splash-themes.nix
@@ -14,11 +14,16 @@ rec {
     md5 = "da49f04988ab04b7e0de117b0d25061a";
   };
 
-  themePativo = fetchurl {
+  themePativo = fetchurl { # Yeah!
     url = http://www.bootsplash.de/files/themes/Theme-Pativo.tar.bz2;
     md5 = "9e13beaaadf88d43a5293e7ab757d569";
   };
 
+  themeGNU = fetchurl {
+    url = http://www.bootsplash.de/files/themes/Theme-GNU.tar.bz2;
+    md5 = "61969309d23c631e57b0a311102ef034";
+  };
+
 
   # The themes to use for each tty.  For each tty except the first
   # entry in the list, you can omit `theme' to get the same theme as
@@ -32,13 +37,13 @@ rec {
     { tty = 2;
     }
     { tty = 3;
-      theme = themeFrozenBubble;
+      theme = themeGNU;
     }
     { tty = 4;
-      theme = themePativo;
+      theme = themeGNU;
     }
-    { tty = 6;
-      theme = themeFrozenBubble;
+    { tty = 5;
+      theme = themePativo;
     }
   ];
   
diff --git a/test/upstart-jobs/tty-backgrounds.nix b/test/upstart-jobs/tty-backgrounds.nix
index fd8eabea6a6..3282a879279 100644
--- a/test/upstart-jobs/tty-backgrounds.nix
+++ b/test/upstart-jobs/tty-backgrounds.nix
@@ -20,7 +20,7 @@ rec {
   job = "
 start on hardware-scan
 
-script
+start script
 
     rm -f /etc/splash
     ln -s ${themesUnpacked} /etc/splash
@@ -39,6 +39,16 @@ script
     done
 
 end script
+
+respawn sleep 10000 # !!! Hack
+
+stop script
+    # Disable the theme on each console.
+    for tty in ${toString (map (x: x.tty) backgrounds)}; do
+        ${splashutils}/bin/splash_util --tty $tty -c off || true
+    done
+end script
+
   ";
   
 }
-- 
GitLab


From 05acdb8610309cc4624818b494bf27f990feef1a Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sun, 26 Nov 2006 23:32:15 +0000
Subject: [PATCH 0258/5331] * Put something on the logging console.

svn path=/nixu/trunk/; revision=7141
---
 test/splash-themes.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/test/splash-themes.nix b/test/splash-themes.nix
index 72ab07bcae5..cc3a7b756fa 100644
--- a/test/splash-themes.nix
+++ b/test/splash-themes.nix
@@ -45,6 +45,9 @@ rec {
     { tty = 5;
       theme = themePativo;
     }
+    { tty = 10; # logging console
+      theme = themeGNU;
+    }
   ];
   
 }
-- 
GitLab


From 0905c1525a98f967f339fd0c7b88618c9fc10d9b Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sun, 26 Nov 2006 23:54:49 +0000
Subject: [PATCH 0259/5331] * Refactoring.

svn path=/nixu/trunk/; revision=7142
---
 test/helpers/unpack-theme.nix                  | 7 +++++++
 test/{upstart-jobs => helpers}/unpack-theme.sh | 2 ++
 test/upstart-jobs/tty-backgrounds-combine.sh   | 2 +-
 test/upstart-jobs/tty-backgrounds.nix          | 6 ++----
 4 files changed, 12 insertions(+), 5 deletions(-)
 create mode 100644 test/helpers/unpack-theme.nix
 rename test/{upstart-jobs => helpers}/unpack-theme.sh (92%)

diff --git a/test/helpers/unpack-theme.nix b/test/helpers/unpack-theme.nix
new file mode 100644
index 00000000000..69d2eebe530
--- /dev/null
+++ b/test/helpers/unpack-theme.nix
@@ -0,0 +1,7 @@
+{stdenv, theme}:
+
+stdenv.mkDerivation {
+  name = "theme";
+  builder = ./unpack-theme.sh;
+  inherit theme;
+}
diff --git a/test/upstart-jobs/unpack-theme.sh b/test/helpers/unpack-theme.sh
similarity index 92%
rename from test/upstart-jobs/unpack-theme.sh
rename to test/helpers/unpack-theme.sh
index c3a860692e5..6eda7bcfbd4 100644
--- a/test/upstart-jobs/unpack-theme.sh
+++ b/test/helpers/unpack-theme.sh
@@ -14,3 +14,5 @@ for i in $out/$themeName/config/*.cfg; do
 done
 
 rm $out/$themeName/config/*.cfg
+
+ln -s $themeName $out/default
diff --git a/test/upstart-jobs/tty-backgrounds-combine.sh b/test/upstart-jobs/tty-backgrounds-combine.sh
index 50bab1fcd8c..894952d6940 100644
--- a/test/upstart-jobs/tty-backgrounds-combine.sh
+++ b/test/upstart-jobs/tty-backgrounds-combine.sh
@@ -23,7 +23,7 @@ for ((n = 0; n < ${#ttys[*]}; n++)); do
 
     echo "TTY $tty -> $theme"
 
-    themeName=$(cd $theme && ls)
+    themeName=$(cd $theme && ls | grep -v default)
     
     ln -sf $theme/$themeName $out/$themeName
 
diff --git a/test/upstart-jobs/tty-backgrounds.nix b/test/upstart-jobs/tty-backgrounds.nix
index 3282a879279..abe6f52305a 100644
--- a/test/upstart-jobs/tty-backgrounds.nix
+++ b/test/upstart-jobs/tty-backgrounds.nix
@@ -3,10 +3,8 @@
 rec {
   name = "tty-backgrounds";
 
-  unpackTheme = theme: stdenv.mkDerivation {
-    name = "theme";
-    builder = ./unpack-theme.sh;
-    inherit theme;
+  unpackTheme = theme: import ../helpers/unpack-theme.nix {
+    inherit stdenv theme;
   };
 
   themesUnpacked = stdenv.mkDerivation {
-- 
GitLab


From 3a70748bb5df6f726a9dff816bcd329a789cfb2c Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 27 Nov 2006 01:35:34 +0000
Subject: [PATCH 0260/5331] * Show a splash screen during booting.  The splash
 screen is displayed   by the program /sbin/splash_helper in the initrd and is
 called even   before /init. * make-initrd.nix: allow a list of FSOs to be
 placed in the initrd,   with a symlink to each top-level FSO (e.g., /init,  
 /sbin/splash_helper, /etc/splash). * make-initrd.nix: pre-create /proc, /dev
 and /sys, because   splash_helper needs them.

svn path=/nixu/trunk/; revision=7144
---
 test/boot-environment.nix | 28 +++++++++++++++++++----
 test/boot-stage-1-init.sh |  6 ++---
 test/make-initrd.nix      | 18 ++++++++++-----
 test/make-initrd.sh       | 47 ++++++++++++++++++++++++++++-----------
 test/splash-themes.nix    |  5 +++++
 5 files changed, 78 insertions(+), 26 deletions(-)

diff --git a/test/boot-environment.nix b/test/boot-environment.nix
index 05099ee97bb..61638c2980c 100644
--- a/test/boot-environment.nix
+++ b/test/boot-environment.nix
@@ -28,6 +28,12 @@ rec {
   nix = pkgs.nixUnstable; # we need the exportReferencesGraph feature
 
 
+  # Splash configuration.
+  splashThemes = import ./splash-themes.nix {
+    inherit (pkgs) fetchurl;
+  };
+
+
   # Determine the set of modules that we need to mount the root FS.
   modulesClosure = import ./modules-closure.nix {
     inherit (pkgs) stdenv kernel module_init_tools;
@@ -45,10 +51,12 @@ rec {
       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;
   };
   
@@ -71,7 +79,21 @@ rec {
   # the initial RAM disk.
   initialRamdisk = import ./make-initrd.nix {
     inherit (pkgs) stdenv cpio;
-    init = bootStage1;
+    contents = [
+      { object = bootStage1;
+        symlink = "/init";
+      }
+      { object = extraUtils;
+        suffix = "/bin/splash_helper";
+        symlink = "/sbin/splash_helper";
+      }
+      { object = import ./helpers/unpack-theme.nix {
+          inherit (pkgs) stdenv;
+          theme = splashThemes.splashScreen;
+        };
+        symlink = "/etc/splash";
+      }
+    ];
   };
 
 
@@ -116,9 +138,7 @@ rec {
       # Transparent TTY backgrounds.
       (import ./upstart-jobs/tty-backgrounds.nix {
         inherit (pkgs) stdenv splashutils;
-        backgrounds = (import ./splash-themes.nix {
-          inherit (pkgs) fetchurl;
-        }).ttyBackgrounds;
+        backgrounds = splashThemes.ttyBackgrounds;
       })
 
       # Handles the maintenance/stalled event (single-user shell).
diff --git a/test/boot-stage-1-init.sh b/test/boot-stage-1-init.sh
index b25ce05368e..d62bd157975 100644
--- a/test/boot-stage-1-init.sh
+++ b/test/boot-stage-1-init.sh
@@ -24,11 +24,11 @@ done
 
 
 # Mount special file systems.
-mkdir /etc # to shut up mount
+mkdir -p /etc # to shut up mount
 touch /etc/fstab # idem
-mkdir /proc
+mkdir -p /proc
 mount -t proc none /proc
-mkdir /sys
+mkdir -p /sys
 mount -t sysfs none /sys
 
 
diff --git a/test/make-initrd.nix b/test/make-initrd.nix
index 2fb52f121fb..a28c312564e 100644
--- a/test/make-initrd.nix
+++ b/test/make-initrd.nix
@@ -1,5 +1,5 @@
 # Create an initial ramdisk containing the closure of the specified
-# `init' package.  An initial ramdisk is used during the initial
+# file system objects.  An initial ramdisk is used during the initial
 # stages of booting a Linux system.  It is loaded by the boot loader
 # along with the kernel image.  It's supposed to contain everything
 # (such as kernel modules) necessary to allow us to mount the root
@@ -8,18 +8,24 @@
 #
 # An initrd is really just a gzipped cpio archive.
 #
-# A symlink `/init' is made to the store path passed in the `init'
+# Symlinks are created for each top-level file system object.  E.g.,
+# `contents = {object = ...; symlink = /init;}' is a typical
 # argument.
 
-{stdenv, cpio, init}:
+{stdenv, cpio, contents}:
 
 stdenv.mkDerivation {
   name = "initrd";
   builder = ./make-initrd.sh;
   buildInputs = [cpio];
-  inherit init;
+
+  # !!! should use XML.
+  objects = map (x: x.object) contents;
+  symlinks = map (x: x.symlink) contents;
+  suffices = map (x: if x ? suffix then x.suffix else "none") contents;
   
-  # For obtaining the closure of `init'.
-  exportReferencesGraph = ["init-closure" init];
+  # For obtaining the closure of `contents'.
+  exportReferencesGraph =
+    map (x: [("closure-" + baseNameOf x.symlink) x.object]) contents;
   pathsFromGraph = ./paths-from-graph.sh;
 }
diff --git a/test/make-initrd.sh b/test/make-initrd.sh
index ea2ca5819a6..8d07300466b 100644
--- a/test/make-initrd.sh
+++ b/test/make-initrd.sh
@@ -2,20 +2,41 @@ source $stdenv/setup
 
 set -o pipefail
 
-# Get the paths in the closure of `init'.
-if ! test -e ./init-closure; then
-    echo 'Your Nix installation is too old! Upgrade to nix-0.11pre7038 or newer.'
-    exit 1
-fi
-storePaths=$($SHELL $pathsFromGraph ./init-closure)
-
-# Paths in cpio archives *must* be relative, otherwise the kernel
-# won't unpack 'em.
+objects=($objects)
+symlinks=($symlinks)
+suffices=($suffices)
+
 mkdir root
-cd root
-cp -prd --parents $storePaths .
+
+# Needed for splash_helper, which gets run before init.
+mkdir root/dev
+mkdir root/sys
+mkdir root/proc
+
+
+for ((n = 0; n < ${#objects[*]}; n++)); do
+    object=${objects[$n]}
+    symlink=${symlinks[$n]}
+    suffix=${suffices[$n]}
+    if test "$suffix" = none; then suffix=; fi
+
+    # Get the paths in the closure of `object'.
+    closure=closure-$(basename $symlink)
+    if ! test -e $closure; then
+        echo 'Your Nix installation is too old! Upgrade to nix-0.11pre7038 or newer.'
+        exit 1
+    fi
+    storePaths=$($SHELL $pathsFromGraph $closure)
+
+    # Paths in cpio archives *must* be relative, otherwise the kernel
+    # won't unpack 'em.
+    (cd root && cp -prd --parents $storePaths .)
+
+    mkdir -p $(dirname root/$symlink)
+    ln -s $object$suffix root/$symlink
+done
+    
 
 # Put the closure in a gzipped cpio archive.
 ensureDir $out
-ln -s $init init
-find * -print0 | cpio -ov -H newc --null | gzip -9 > $out/initrd
+(cd root && find * -print0 | cpio -ov -H newc --null | gzip -9 > $out/initrd)
diff --git a/test/splash-themes.nix b/test/splash-themes.nix
index cc3a7b756fa..25be6168b37 100644
--- a/test/splash-themes.nix
+++ b/test/splash-themes.nix
@@ -25,6 +25,11 @@ rec {
   };
 
 
+  # The splash screen.
+  
+  splashScreen = themeBabyTux;
+
+
   # The themes to use for each tty.  For each tty except the first
   # entry in the list, you can omit `theme' to get the same theme as
   # the first one.  If a tty does not appear, it doesn't get a
-- 
GitLab


From 8c0b223c3cbf6fc62dc8b488252d66233fc74e95 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 27 Nov 2006 13:51:08 +0000
Subject: [PATCH 0261/5331] * Only run grub-install in switch-to-configuration
 when   NIXOS_INSTALL_GRUB is set (which we do in the installer).

svn path=/nixu/trunk/; revision=7146
---
 test/installer.sh            | 2 +-
 test/system-configuration.sh | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/test/installer.sh b/test/installer.sh
index d3f747c8310..04c3c80c212 100644
--- a/test/installer.sh
+++ b/test/installer.sh
@@ -129,4 +129,4 @@ echo "$targetDevice / somefs rw 0 0" > $mountPoint/etc/mtab
 # a menu default pointing at the kernel/initrd/etc of the new
 # configuration.
 echo "finalising the installation..."
-chroot $mountPoint /nix/var/nix/profiles/system/bin/switch-to-configuration
+NIXOS_INSTALL_GRUB=1 chroot $mountPoint /nix/var/nix/profiles/system/bin/switch-to-configuration
diff --git a/test/system-configuration.sh b/test/system-configuration.sh
index 11254a24d0a..a9351f97ade 100644
--- a/test/system-configuration.sh
+++ b/test/system-configuration.sh
@@ -19,7 +19,9 @@ export PATH=$coreutils/bin:$gnused/bin:$gnugrep/bin:$diffutils/bin
 if test -n "$grubDevice"; then
     mkdir -m 0700 -p /boot/grub
     $grubMenuBuilder $out
-    $grub/sbin/grub-install "$grubDevice" --no-floppy --recheck
+    if test "\$NIXOS_INSTALL_GRUB" = 1; then
+        $grub/sbin/grub-install "$grubDevice" --no-floppy --recheck
+    fi
 fi
 EOF
 
-- 
GitLab


From 5bc78ac1510e57ee7fe74c6e0a9af3de4fded72b Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 27 Nov 2006 13:59:50 +0000
Subject: [PATCH 0262/5331] * Don't hardcode selinux=0 etc. * Store the paths
 of init and initrd.

svn path=/nixu/trunk/; revision=7147
---
 test/boot-environment.nix     | 1 -
 test/system-configuration.nix | 9 ++++++++-
 test/system-configuration.sh  | 5 ++++-
 3 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/test/boot-environment.nix b/test/boot-environment.nix
index 61638c2980c..a9d85eb773c 100644
--- a/test/boot-environment.nix
+++ b/test/boot-environment.nix
@@ -212,7 +212,6 @@ rec {
       pkgs.shadowutils
       pkgs.strace
       pkgs.sysklogd
-#      pkgs.sysvinit
 #      pkgs.vim
       nix
       nixosInstaller
diff --git a/test/system-configuration.nix b/test/system-configuration.nix
index dee0461c2e4..640f17f907e 100644
--- a/test/system-configuration.nix
+++ b/test/system-configuration.nix
@@ -16,7 +16,14 @@ let
   };
 
   # Extra kernel command line arguments.
-  extraKernelParams = "vga=0x317 console=tty1 splash=verbose";
+  extraKernelParams = [
+    "selinux=0"
+    "apm=on"
+    "acpi=on"
+    "vga=0x317"
+    "console=tty1"
+    "splash=verbose"
+  ];
 
 in
 
diff --git a/test/system-configuration.sh b/test/system-configuration.sh
index a9351f97ade..fa2e7def257 100644
--- a/test/system-configuration.sh
+++ b/test/system-configuration.sh
@@ -4,9 +4,12 @@ ensureDir $out
 
 ln -s $kernel $out/kernel
 ln -s $grub $out/grub
+ln -s $bootStage2 $out/init
+ln -s $initrd $out/initrd
+echo "$extraKernelParams" > $out/kernel-params
 
 cat > $out/menu.lst << GRUBEND
-kernel $kernel selinux=0 apm=on acpi=on init=$bootStage2 $extraKernelParams
+kernel $kernel init=$bootStage2 $extraKernelParams
 initrd $initrd
 GRUBEND
 
-- 
GitLab


From e68fc42aa3db5546a63a2fc3597f7235f12d4dd1 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 27 Nov 2006 15:07:46 +0000
Subject: [PATCH 0263/5331] * Prototyping a bit: first class options.  We want
 the configuration   of NixOS to be specified externally from the main Nix
 expressions   (since an installation would be hard to maintain if users
 started   editing the NixOS expressions directory).  But to make that  
 user-friendly we need:

  - Hierarchical options (just like the Nixpkgs configuration).
  - Option descriptions from which documentation can be generated.
  - Validation (e.g., does each option exist? does it have a valid
    value?).
  - The option declarations should be inside the Nix expressions to
    which they are relevant (rather than, say, one big file with option
    declarations).

svn path=/nixu/trunk/; revision=7148
---
 test/options.nix | 97 ++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 97 insertions(+)
 create mode 100644 test/options.nix

diff --git a/test/options.nix b/test/options.nix
new file mode 100644
index 00000000000..2b58044c5ed
--- /dev/null
+++ b/test/options.nix
@@ -0,0 +1,97 @@
+[
+
+  (option {
+    name = ["networking" "hostname"];
+    default = "nixos";
+    description = "The name of the machine."
+  })
+
+  (option {
+    name = ["networking" "useDHCP"];
+    default = true;
+    description = "
+      Whether to use DHCP to obtain an IP adress and other
+      configuration for all network interfaces that are not manually
+      configured.
+    "
+  })
+
+  (option {
+    name = ["networking" "interfaces"];
+    default = [];
+    example = [
+      { interface = "eth0";
+        ipAddress = "131.211.84.78";
+        netmask = "255.255.255.128";
+        gateway = "131.211.84.1";
+      }
+    ];
+    description = "
+      The configuration for each network interface.  If
+      <option>networking.useDHCP</option> is true, then each interface
+      not listed here will be configured using DHCP.
+    "
+  })
+
+  (option {
+    name = ["filesystems" "mountPoints"];
+    example = [
+      { device = "/dev/hda2";
+        mountPoint = "/";
+      }
+    ];
+    description = "
+      The file systems to be mounted by NixOS.  It must include an
+      entry for the root directory (<literal>mountPoint =
+      \"/\"</literal>).  This is the file system on which NixOS is (to
+      be) installed..
+    ";
+  })
+
+  (option {
+    name = ["services" "syslogd" "tty"];
+    default = 10;
+    description = "
+      The tty device on which syslogd will print important log
+      messages.
+    ";
+  })
+    
+  (option {
+    name = ["services" "mingetty" "ttys"];
+    default = [1 2 3 4 5 6];
+    description = "
+      The list of tty (virtual console) devices on which to start a
+      login prompt.
+    ";
+  })
+    
+  (option {
+    name = ["services" "mingetty" "waitOnMounts"];
+    default = false;
+    description = "
+      Whether the login prompts on the virtual consoles will be
+      started before or after all file systems have been mounted.  By
+      default we don't wait, but if for example your /home is on a
+      separate partition, you may want to turn this on.
+    ";
+  })
+
+  (option {
+    name = ["services" "sshd" "enable"];
+    default = false;
+    description = "
+      Whether to enable the Secure Shell daemon, which allows secure
+      remote logins.
+    ";
+  })
+
+  (option {
+    name = ["services" "sshd" "forwardX11"];
+    default = false;
+    description = "
+      Whether to enable sshd to forward X11 connections.
+    ";
+  })
+
+]
-- 
GitLab


From 67bada088620a42b65762f231099fb8de27a2af0 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 27 Nov 2006 15:32:11 +0000
Subject: [PATCH 0264/5331] * Utility: rebuild the NixOS configuration and
 switch to it.

svn path=/nixu/trunk/; revision=7149
---
 test/upgrade.sh | 4 ++++
 1 file changed, 4 insertions(+)
 create mode 100755 test/upgrade.sh

diff --git a/test/upgrade.sh b/test/upgrade.sh
new file mode 100755
index 00000000000..97dc4fa4826
--- /dev/null
+++ b/test/upgrade.sh
@@ -0,0 +1,4 @@
+#! /bin/sh
+set -e
+nix-env -p /nix/var/nix/profiles/system -f system-configuration.nix -i -A systemConfiguration
+/nix/var/nix/profiles/system/bin/switch-to-configuration
-- 
GitLab


From 1a0fcfdf1a890881aea0ff86ee97f7845bb4beaa Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 27 Nov 2006 16:26:51 +0000
Subject: [PATCH 0265/5331] * User configuration: use the `networking.hostname'
 option to   configure the host name.

svn path=/nixu/trunk/; revision=7150
---
 test/boot-environment.nix | 39 ++++++++++++++++++++++++++++++++--
 test/boot-stage-2-init.sh |  2 +-
 test/boot-stage-2.nix     |  4 +++-
 test/options.nix          | 44 +++++++++++++++++++--------------------
 4 files changed, 63 insertions(+), 26 deletions(-)

diff --git a/test/boot-environment.nix b/test/boot-environment.nix
index a9d85eb773c..78086e99cfc 100644
--- a/test/boot-environment.nix
+++ b/test/boot-environment.nix
@@ -183,8 +183,7 @@ rec {
   # everything else to bring up the system.
   bootStage2 = import ./boot-stage-2.nix {
     inherit (pkgs) genericSubstituter coreutils findutils
-      utillinux kernel udev
-      upstart;
+      utillinux kernel udev upstart;
     inherit upstartJobs;
     shell = pkgs.bash + "/bin/sh";
 
@@ -218,6 +217,42 @@ rec {
     ];
 
     inherit readOnlyRoot;
+
+    hostName = config.get ["networking" "hostname"];
+  };
+
+
+  lib = import ./pkgs/lib;
+
+
+  config = rec {
+
+    # The user configuration.
+    config = {
+      networking = {
+        hostname = "vindaloo";
+      };
+    };
+
+    # The option declarations, i.e., option names with defaults and
+    # documentation.
+    declarations = import ./options.nix;
+
+    # Get the option named `name' from the user configuration, using
+    # its default value if it's not defined.
+    get = name:
+      let
+        sameName = lib.filter (opt: lib.eqLists opt.name name) declarations;
+        default =
+          if sameName == []
+          then abort ("Undeclared option `" + printName name + "'.")
+          else if !builtins.head sameName ? default
+          then abort ("Option `" + printName name + "' has no default.")
+          else (builtins.head sameName).default;
+      in lib.getAttr name default config;
+  
+    printName = name: lib.concatStrings (lib.intersperse "." name);
+
   };
 
 
diff --git a/test/boot-stage-2-init.sh b/test/boot-stage-2-init.sh
index 58277751680..57a6a20a71f 100644
--- a/test/boot-stage-2-init.sh
+++ b/test/boot-stage-2-init.sh
@@ -157,7 +157,7 @@ EOF
 
 
 # Set the host name.
-hostname nixos
+hostname @hostName@
 
 
 # Start an interactive shell.
diff --git a/test/boot-stage-2.nix b/test/boot-stage-2.nix
index 1bf8856f480..7d73e37cb4f 100644
--- a/test/boot-stage-2.nix
+++ b/test/boot-stage-2.nix
@@ -8,12 +8,14 @@
 
 , # The Upstart job configuration.
   upstartJobs
+
+, hostName
 }:
 
 genericSubstituter {
   src = ./boot-stage-2-init.sh;
   isExecutable = true;
-  inherit shell kernel upstart readOnlyRoot upstartJobs;
+  inherit shell kernel upstart readOnlyRoot upstartJobs hostName;
   path = [
     coreutils
     findutils
diff --git a/test/options.nix b/test/options.nix
index 2b58044c5ed..4cd2f3a7343 100644
--- a/test/options.nix
+++ b/test/options.nix
@@ -1,22 +1,22 @@
-[
+[        
 
-  (option {
+  {
     name = ["networking" "hostname"];
     default = "nixos";
-    description = "The name of the machine."
-  })
+    description = "The name of the machine.";
+  }
 
-  (option {
+  {
     name = ["networking" "useDHCP"];
     default = true;
     description = "
       Whether to use DHCP to obtain an IP adress and other
       configuration for all network interfaces that are not manually
       configured.
-    "
-  })
+    ";
+  }
 
-  (option {
+  {
     name = ["networking" "interfaces"];
     default = [];
     example = [
@@ -30,10 +30,10 @@
       The configuration for each network interface.  If
       <option>networking.useDHCP</option> is true, then each interface
       not listed here will be configured using DHCP.
-    "
-  })
+    ";
+  }
 
-  (option {
+  {
     name = ["filesystems" "mountPoints"];
     example = [
       { device = "/dev/hda2";
@@ -46,27 +46,27 @@
       \"/\"</literal>).  This is the file system on which NixOS is (to
       be) installed..
     ";
-  })
+  }
 
-  (option {
+  {
     name = ["services" "syslogd" "tty"];
     default = 10;
     description = "
       The tty device on which syslogd will print important log
       messages.
     ";
-  })
+  }
     
-  (option {
+  {
     name = ["services" "mingetty" "ttys"];
     default = [1 2 3 4 5 6];
     description = "
       The list of tty (virtual console) devices on which to start a
       login prompt.
     ";
-  })
+  }
     
-  (option {
+  {
     name = ["services" "mingetty" "waitOnMounts"];
     default = false;
     description = "
@@ -75,23 +75,23 @@
       default we don't wait, but if for example your /home is on a
       separate partition, you may want to turn this on.
     ";
-  })
+  }
 
-  (option {
+  {
     name = ["services" "sshd" "enable"];
     default = false;
     description = "
       Whether to enable the Secure Shell daemon, which allows secure
       remote logins.
     ";
-  })
+  }
 
-  (option {
+  {
     name = ["services" "sshd" "forwardX11"];
     default = false;
     description = "
       Whether to enable sshd to forward X11 connections.
     ";
-  })
+  }
 
 ]
-- 
GitLab


From 0817c307dcd33a6868781c61a48b359e6a6f70da Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 27 Nov 2006 19:49:05 +0000
Subject: [PATCH 0266/5331] * Moving stuff around.

svn path=/nixos/trunk/; revision=7155
---
 test/README => README                         |   0
 STABLE                                        |   1 -
 VERSION                                       |   1 -
 ...ot-environment.nix => boot-environment.nix |   0
 ...ot-stage-1-init.sh => boot-stage-1-init.sh |   0
 test/boot-stage-1.nix => boot-stage-1.nix     |   0
 ...ot-stage-2-init.sh => boot-stage-2-init.sh |   0
 test/boot-stage-2.nix => boot-stage-2.nix     |   0
 boot/boot.sh                                  |  43 --
 boot/builder.sh                               |  46 ---
 boot/default.nix                              |  20 -
 boot/env.sh                                   |   1 -
 boot/halt.sh                                  |  12 -
 boot/login.sh                                 |  15 -
 doc/X-howto                                   |  16 -
 doc/configuration.txt                         |  25 --
 doc/howto                                     | 117 ------
 fill-disk.sh                                  | 374 ------------------
 ...ub-menu-builder.sh => grub-menu-builder.sh |   0
 {test/helpers => helpers}/unpack-theme.nix    |   0
 {test/helpers => helpers}/unpack-theme.sh     |   0
 init.sh                                       |  79 ----
 init/builder.sh                               |  42 --
 init/default.nix                              |  11 -
 init/install-disk.sh                          | 176 ---------
 init/prepare-disk.sh                          |  70 ----
 install.sh                                    |   3 -
 test/installer.nix => installer.nix           |   0
 test/installer.sh => installer.sh             |   0
 isolinux.cfg                                  |   2 +-
 login.sh                                      |  27 --
 test/make-devices.sh => make-devices.sh       |   0
 make-disk.sh                                  | 329 ---------------
 test/make-initrd.nix => make-initrd.nix       |   0
 test/make-initrd.sh => make-initrd.sh         |   0
 ...so9660-image.nix => make-iso9660-image.nix |   0
 ...-iso9660-image.sh => make-iso9660-image.sh |   0
 ...modules-closure.nix => modules-closure.nix |   0
 test/modules-closure.sh => modules-closure.sh |   0
 test/options.nix => options.nix               |   0
 ...paths-from-graph.sh => paths-from-graph.sh |   0
 pkgs.nix                                      |  44 ---
 pure/devices.nix                              |  20 -
 pure/disks.nix                                |  84 ----
 pure/networking.nix                           |  58 ---
 pure/top-level.nix                            |  26 --
 ramdisk-login.sh                              |  15 -
 test/rescue-cd.nix => rescue-cd.nix           |   0
 run.sh                                        |   7 -
 test/splash-themes.nix => splash-themes.nix   |   0
 storepaths_format                             |  13 -
 ...figuration.nix => system-configuration.nix |   0
 ...onfiguration.sh => system-configuration.sh |   0
 test/isolinux.cfg                             |   6 -
 test/upgrade.sh => upgrade.sh                 |   0
 .../ctrl-alt-delete.nix                       |   0
 .../dhclient.nix                              |   0
 .../upstart-jobs => upstart-jobs}/gather.nix  |   0
 {test/upstart-jobs => upstart-jobs}/halt.nix  |   0
 .../hardware-scan.nix                         |   0
 .../maintenance-shell.nix                     |   0
 .../make-job.nix                              |   0
 .../mingetty.nix                              |   0
 .../network-interfaces.nix                    |   0
 {test/upstart-jobs => upstart-jobs}/sshd.nix  |   0
 .../upstart-jobs => upstart-jobs}/syslogd.nix |   0
 .../tty-backgrounds-combine.sh                |   0
 .../tty-backgrounds.nix                       |   0
 68 files changed, 1 insertion(+), 1682 deletions(-)
 rename test/README => README (100%)
 delete mode 100644 STABLE
 delete mode 100644 VERSION
 rename test/boot-environment.nix => boot-environment.nix (100%)
 rename test/boot-stage-1-init.sh => boot-stage-1-init.sh (100%)
 rename test/boot-stage-1.nix => boot-stage-1.nix (100%)
 rename test/boot-stage-2-init.sh => boot-stage-2-init.sh (100%)
 rename test/boot-stage-2.nix => boot-stage-2.nix (100%)
 delete mode 100644 boot/boot.sh
 delete mode 100755 boot/builder.sh
 delete mode 100644 boot/default.nix
 delete mode 100644 boot/env.sh
 delete mode 100644 boot/halt.sh
 delete mode 100644 boot/login.sh
 delete mode 100644 doc/X-howto
 delete mode 100644 doc/configuration.txt
 delete mode 100644 doc/howto
 delete mode 100755 fill-disk.sh
 rename test/grub-menu-builder.sh => grub-menu-builder.sh (100%)
 rename {test/helpers => helpers}/unpack-theme.nix (100%)
 rename {test/helpers => helpers}/unpack-theme.sh (100%)
 delete mode 100644 init.sh
 delete mode 100755 init/builder.sh
 delete mode 100644 init/default.nix
 delete mode 100755 init/install-disk.sh
 delete mode 100755 init/prepare-disk.sh
 delete mode 100644 install.sh
 rename test/installer.nix => installer.nix (100%)
 rename test/installer.sh => installer.sh (100%)
 mode change 100755 => 100644 isolinux.cfg
 delete mode 100644 login.sh
 rename test/make-devices.sh => make-devices.sh (100%)
 delete mode 100755 make-disk.sh
 rename test/make-initrd.nix => make-initrd.nix (100%)
 rename test/make-initrd.sh => make-initrd.sh (100%)
 rename test/make-iso9660-image.nix => make-iso9660-image.nix (100%)
 rename test/make-iso9660-image.sh => make-iso9660-image.sh (100%)
 rename test/modules-closure.nix => modules-closure.nix (100%)
 rename test/modules-closure.sh => modules-closure.sh (100%)
 rename test/options.nix => options.nix (100%)
 rename test/paths-from-graph.sh => paths-from-graph.sh (100%)
 delete mode 100644 pkgs.nix
 delete mode 100644 pure/devices.nix
 delete mode 100644 pure/disks.nix
 delete mode 100644 pure/networking.nix
 delete mode 100644 pure/top-level.nix
 delete mode 100644 ramdisk-login.sh
 rename test/rescue-cd.nix => rescue-cd.nix (100%)
 delete mode 100755 run.sh
 rename test/splash-themes.nix => splash-themes.nix (100%)
 delete mode 100644 storepaths_format
 rename test/system-configuration.nix => system-configuration.nix (100%)
 rename test/system-configuration.sh => system-configuration.sh (100%)
 delete mode 100644 test/isolinux.cfg
 rename test/upgrade.sh => upgrade.sh (100%)
 rename {test/upstart-jobs => upstart-jobs}/ctrl-alt-delete.nix (100%)
 rename {test/upstart-jobs => upstart-jobs}/dhclient.nix (100%)
 rename {test/upstart-jobs => upstart-jobs}/gather.nix (100%)
 rename {test/upstart-jobs => upstart-jobs}/halt.nix (100%)
 rename {test/upstart-jobs => upstart-jobs}/hardware-scan.nix (100%)
 rename {test/upstart-jobs => upstart-jobs}/maintenance-shell.nix (100%)
 rename {test/upstart-jobs => upstart-jobs}/make-job.nix (100%)
 rename {test/upstart-jobs => upstart-jobs}/mingetty.nix (100%)
 rename {test/upstart-jobs => upstart-jobs}/network-interfaces.nix (100%)
 rename {test/upstart-jobs => upstart-jobs}/sshd.nix (100%)
 rename {test/upstart-jobs => upstart-jobs}/syslogd.nix (100%)
 rename {test/upstart-jobs => upstart-jobs}/tty-backgrounds-combine.sh (100%)
 rename {test/upstart-jobs => upstart-jobs}/tty-backgrounds.nix (100%)

diff --git a/test/README b/README
similarity index 100%
rename from test/README
rename to README
diff --git a/STABLE b/STABLE
deleted file mode 100644
index c227083464f..00000000000
--- a/STABLE
+++ /dev/null
@@ -1 +0,0 @@
-0
\ No newline at end of file
diff --git a/VERSION b/VERSION
deleted file mode 100644
index ceab6e11ece..00000000000
--- a/VERSION
+++ /dev/null
@@ -1 +0,0 @@
-0.1
\ No newline at end of file
diff --git a/test/boot-environment.nix b/boot-environment.nix
similarity index 100%
rename from test/boot-environment.nix
rename to boot-environment.nix
diff --git a/test/boot-stage-1-init.sh b/boot-stage-1-init.sh
similarity index 100%
rename from test/boot-stage-1-init.sh
rename to boot-stage-1-init.sh
diff --git a/test/boot-stage-1.nix b/boot-stage-1.nix
similarity index 100%
rename from test/boot-stage-1.nix
rename to boot-stage-1.nix
diff --git a/test/boot-stage-2-init.sh b/boot-stage-2-init.sh
similarity index 100%
rename from test/boot-stage-2-init.sh
rename to boot-stage-2-init.sh
diff --git a/test/boot-stage-2.nix b/boot-stage-2.nix
similarity index 100%
rename from test/boot-stage-2.nix
rename to boot-stage-2.nix
diff --git a/boot/boot.sh b/boot/boot.sh
deleted file mode 100644
index a0cf0d74c90..00000000000
--- a/boot/boot.sh
+++ /dev/null
@@ -1,43 +0,0 @@
-#! @bash@/bin/sh -e
-
-set -e
-
-. @out@/bin/env.sh
-
-echo "--- Nix ---"
-
-echo "mounting /proc..."
-mount -n -t proc none /proc
-
-echo "mounting /sys..."
-mount -n -t sysfs none /sys
-
-echo "mounting /dev/pts..."
-mount -n -t devpts none /dev/pts
-
-#echo "checking /dev/root..."
-#e2fsck -y /dev/root || test "$?" -le 1
-
-echo "remounting / writable..."
-mount -n -o remount,rw /dev/root /
-
-echo "setting up hostname..."
-hostname nixos
-
-echo "cleaning utmp and wtmp..."
-echo "" > /var/run/utmp
-echo "" > /var/log/wtmp
-
-echo "loading USB controller modules..."
-@module_init_tools@/sbin/modprobe uhci-hcd
-
-echo "enabling loopback interface..."
-ifconfig lo 127.0.0.1
-
-echo "enabling ethernet interface..."
-ifconfig eth0 $(cat /etc/networking/local-ip) up || true
-
-echo "setting up routing table..."
-route add default gw $(cat /etc/networking/gateway-ip) || true
-
-echo "boot done."
diff --git a/boot/builder.sh b/boot/builder.sh
deleted file mode 100755
index 3c33a3669a8..00000000000
--- a/boot/builder.sh
+++ /dev/null
@@ -1,46 +0,0 @@
-#! /bin/sh -e
-
-. $stdenv/setup
-
-mkdir $out
-mkdir $out/bin
-
-for i in $boot $halt $login $env; do
-    dst=$out/bin/$(basename $i | cut -c34-)
-    sed \
-        -e "s^@bash\@^$bash^g" \
-        -e "s^@coreutils\@^$coreutils^g" \
-        -e "s^@findutilsWrapper\@^$findutilsWrapper^g" \
-        -e "s^@utillinux\@^$utillinux^g" \
-        -e "s^@sysvinit\@^$sysvinit^g" \
-        -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^@curl\@^$curl^g" \
-        -e "s^@gnused\@^$gnused^g" \
-        -e "s^@gnutar\@^$gnutar^g" \
-        -e "s^@gnugrep\@^$gnugrep^g" \
-        -e "s^@gzip\@^$gzip^g" \
-        -e "s^@gcc\@^$gcc^g" \
-        -e "s^@mingettyWrapper\@^$mingettyWrapper^g" \
-        -e "s^@module_init_tools\@^$module_init_tools^g" \
-        -e "s^@grub\@^$grubWrapper^g" \
-        -e "s^@dhcpWrapper\@^$dhcpWrapper^g" \
-        -e "s^@man\@^$man^g" \
-        -e "s^@nano\@^$nano^g" \
-        -e "s^@out\@^$out^g" \
-        < $i > $dst
-    chmod +x $dst
-done
diff --git a/boot/default.nix b/boot/default.nix
deleted file mode 100644
index f215104bfe5..00000000000
--- a/boot/default.nix
+++ /dev/null
@@ -1,20 +0,0 @@
-{ stdenv, bash, coreutils, findutilsWrapper, utillinux, sysvinit, e2fsprogs
-, nettools, nix, subversion, gcc, wget, which, vim, less, screen, openssh
-, strace, shadowutils, iputils, gnumake, curl, gnused, gnugrep , gnutar, gzip
-, mingettyWrapper, grubWrapper, parted, module_init_tools, dhcpWrapper
-, man, nano}:
-
-derivation {
-  name = "boot";
-  system = stdenv.system;
-  builder = ./builder.sh;
-  boot = ./boot.sh;
-  halt = ./halt.sh;
-  login = ./login.sh;
-  env = ./env.sh;
-  inherit stdenv bash coreutils findutilsWrapper utillinux sysvinit
-          e2fsprogs nettools nix subversion gcc wget which vim less screen
-          openssh strace shadowutils iputils gnumake curl gnused
-          gnutar gnugrep gzip mingettyWrapper grubWrapper parted
-          module_init_tools dhcpWrapper man nano;
-}
diff --git a/boot/env.sh b/boot/env.sh
deleted file mode 100644
index e5e6051c0ac..00000000000
--- a/boot/env.sh
+++ /dev/null
@@ -1 +0,0 @@
-export PATH=@nix@/bin:@bash@/bin:@coreutils@/bin:@findutilsWrapper@/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:@curl@/bin:@gnused@/bin:@gnutar@/bin:@gnugrep@/bin:@gzip@/bin:@mingettyWrapper@/sbin:@grub@/bin:@grub@/sbin:@module_init_tools@/bin:@module_init_tools@/sbin:@dhcpWrapper@/sbin:@man@/bin:@nano@/bin
diff --git a/boot/halt.sh b/boot/halt.sh
deleted file mode 100644
index c6e000b92b6..00000000000
--- a/boot/halt.sh
+++ /dev/null
@@ -1,12 +0,0 @@
-#! @bash@/bin/sh -e
-
-. @out@/bin/env.sh
-
-echo "unmount file systems..."
-umount -avt noproc,nonfs,nosmbfs,nodevfs || echo "(failed)" # ignore errors
-
-echo "syncing..."
-sync || echo "(failed)" # ignore errors
-
-echo "shutting down..."
-halt -d -f
diff --git a/boot/login.sh b/boot/login.sh
deleted file mode 100644
index 14bb418bd9a..00000000000
--- a/boot/login.sh
+++ /dev/null
@@ -1,15 +0,0 @@
-#! @bash@/bin/sh -e
-
-. @out@/bin/env.sh
-
-tty=$1
-
-exec < $tty > $tty 2>&1
-
-echo
-echo "=== Welcome to Nix! ==="
-
-export HOME=/root
-cd $HOME
-
-exec @bash@/bin/sh
diff --git a/doc/X-howto b/doc/X-howto
deleted file mode 100644
index 6cf4bd36763..00000000000
--- a/doc/X-howto
+++ /dev/null
@@ -1,16 +0,0 @@
-Making X work in NixOS (fixing guide)
-
-  Mouse
-
-* for mouse support /dev/input/mice needs to be there. This device can be
-created either automatically with udev, or manually with mknod.
-
-  Fonts
-
-Right now fonts have to be copied from another machine and put into
-/usr/X11R6/lib/X11/fonts
-
-  Config
-
-in services/trunk/configurations/tyros.cs.uu.nl-xorg/ there is a Nix expression
-which builds a working X configuration for use in VMware.
diff --git a/doc/configuration.txt b/doc/configuration.txt
deleted file mode 100644
index 2275c6e4281..00000000000
--- a/doc/configuration.txt
+++ /dev/null
@@ -1,25 +0,0 @@
-Configuration in NixOS
-
-Configuration in NixOS is not very straightforward. On other Linux
-distribution site-specific information (password files, host files, and
-so on) are stored with information that is rather generic for a lot of
-operating systems. To be able to handle these in a gentle way I have decided
-to seperate these two a bit more in NixOS.
-
-In particular, in the /etc directory there is a Nix profile called "configs".
-In this profile the generic configuration is kept. In time this can grow
-to keep configuration which is site specific, but which can easily be kept
-in the store, such as "profile" (default system wide Bourne shell profile)
-
-Right now two packages should be in this profile:
-
-* etcServices : installs a file called "services" (/etc/services should
-point to this)
-* etcProtocols : installs a file called "protocols" (/etc/protocols should
-point to this)
-
-During install time these packages should be installed and the right symlinks
-should be made.
-
-When NIX-40 is closed, we might consider making /etc itself a profile and
-keep even more configuration information inside the Nix store.
diff --git a/doc/howto b/doc/howto
deleted file mode 100644
index 58e3344d6ea..00000000000
--- a/doc/howto
+++ /dev/null
@@ -1,117 +0,0 @@
-NixOS installation HOWTO -- August 28, 2006
-
-This is small HOWTO of how to build and install the current version of
-NixOS.
-
-
-  Building
-
-Install Nix. Checkout nixpkgs from Subversion, as well as nixu. Adapt the
-scripts in nixu to reflect the location of nixpkgs (default /nixpkgs).
-Make sure mktemp is installed. Run ./make-disk.sh. Wait.
-
-  Burning
-
-Use your favourite tool to burn the ISO image to a CD.
-
-  Installing
-
-Currently NixOS can only be installed with machines that have a specific
-hardware set up:
-
-An ATA harddisk on the first ATA controller (hda) with:
-- data partition
-- swap partition
-
-All data on these two partitions will be wiped and the bootloader in the
-Master Boot Record (MBR) will be overwritten with GRUB.
-
-The NixOS installer will drop you into a shell, from which you can run
-fdisk. Then it expects to find a file called "disklayout" with three
-variables:
-
-SWAP :: partition to use as swap
-INSTALLDEVICE :: partition that will be /root
-TARGETDRIVE :: drive on which grub will be installed
-
-This file will be read by the install script automatically when you launch
-the script:
-
-# sh fill-disk.sh
-
-The configuration data that grub writes to disk might not be correct (should
-be). When something goes wrong you probably won't have to reinstall. The
-manual for grub is quite helpful in these cases.
-
-  Configuring
-
-To get NixOS in a working state, do the following:
-
-- load the networkdriver. This is machine dependent. On the labmachines (Dell
-Optiplex GX-260) this is the e1000 driver:
-
-# modprobe e1000
-
-In vmware the driver is "pcnet32".
-
-- bring the interface up:
-
-# ifconfig eth0 up
-
-If the interface is different (say, eth1) replace eth0 with the right
-interface.
-
-- if DHCP is used, run a DHCP client to obtain an IP address, routing
-and resolving information:
-
-# dhclient eth0
-
-Otherwise, do this yourself:
-
-# ifconfig eth0 <ip address> netmask <netmask>
-# route add default gw <gateway ip address>
-# vim /etc/resolv.conf
-
-  Making syslog work.
-
-- copy /etc/services from a working Linux machine to /etc/services on the
-NixOS machine (needed for sysklogd)
-- copy /etc/syslog.conf from a working Linux machine to /etc/syslog.conf on the
-NixOS machine (needed for sysklogd)
-- launch sysklogd
-
-  Making logins on virtual consoles work.
-
-Logins on virtual consoles are disabled by default. To make them work:
-
-- edit /etc/inittab and outcomment the lines with "mingetty" in them
-- copy /etc/login.defs from a working Linux machine to /etc/login.defs on the
-NixOS machine (needed for mingetty). Alternatively, do:
-
-# touch /etc/login.defs
-
-- relaunch init
-
-
-  Making hotplugging work -- BROKEN RIGHT NOW
-
-Many devices (USB, Firewire) are controlled by so called "hot plugging". The
-kernel executes a program -- usually /sbin/hotplug, but this is configurable
-at boottime by setting the right path in /proc/sys/kernel/hotplug -- when a
-new device is added to the machine. This program makes sure the right kernel
-modules are loaded and optionally, if enabled, sends a message to udev to
-create the right device node in /dev (NOTE: this is not enabled in NixOS right
-now).
-
-- mount usbfs (for USB):
-  # mount -t usbfs usbfs /proc/bus/usb
-- install hotplug package
-  - make symlinks /etc/hotplug, /etc/hotplug.d, /sbin/hotplug (TODO: make
-    this pure)
-  - make sure the kernel and additional modules are prepared well (currently
-    this is hackish, but workable: see kernelscripts/make-kernel.sh for an
-    example)
-  - (optionally:) install udev
-    - make a symlink to /etc/udev/udev.conf
-    - launch udev
-  - plug in a device
diff --git a/fill-disk.sh b/fill-disk.sh
deleted file mode 100755
index 43edcb4dfab..00000000000
--- a/fill-disk.sh
+++ /dev/null
@@ -1,374 +0,0 @@
-#! @bash@/bin/sh
-
-set -e
-
-export PATH=/bin:/sbin:@bash@/bin:@findutils@/bin:@e2fsprogs@/sbin:@grub@/sbin:@sysvinitPath@/sbin:@eject@/bin:@dhcp@/sbin:@modutils@/sbin:@busybox@/bin:@busybox@/sbin
-
-kernel=@kernel@
-xawtv=@xawtv@
-
-narStorePaths=/cdrom/narstorepaths
-
-sysvinitPath=@sysvinitPath@
-bootPath=@bootPath@
-modutils=@modutils@
-mingetty=@mingetty@
-
-nixpkgs=/nixpkgs
-
-echo formatting target device
-
-if test -e disklayout; then
-  source disklayout
-else
-  echo no disk layout configuration present...exiting
-  exit 1
-fi
-
-# $targetdrive is also used by GRUB!
-#targetdrive=/dev/hda
-targetdrive=${TARGETDRIVE}
-#device=${targetdrive}1
-device=${INSTALLDEVICE}
-mkfs.ext2 ${device}
-#swapdevice=${targetdrive}2
-swapdevice=${SWAP}
-mkswap $swapdevice
-
-echo enabling swap
-
-swapon $swapdevice
-
-#if ! test -n "$1"
-#then
-#    echo "need harddisk device for installing!"
-#    exit
-#else
-#    device=$1
-#fi
-
-##
-## Two convenience shell functions
-##
-
-make_dir() {
-    mode=$1
-    name=$2
-    echo creating $name...
-    if ! test -d $root/$name; then mkdir $root/$name; fi
-    chmod $mode $root/$name
-}
-
-touch_file() {
-    name=$1
-    echo touching $name...
-    if ! test -d $root/$name; then touch $root/$name; fi
-}
-root=/tmp/mnt
-
-mkdir -p $root
-
-echo mounting the target drive
-
-mount -t ext2 $device $root
-
-##
-## Create a directory tree on the installation disk.
-##
-
-echo creating file system hierarchy on target drive
-
-make_dir 00755 /bin
-make_dir 00755 /boot
-make_dir 00755 /cdrom
-make_dir 00755 /dev
-make_dir 00755 /dev/pts
-make_dir 00755 /etc # global non-constant configuration
-make_dir 00755 /etc/ssh
-make_dir 00755 /etc/sysconfig
-make_dir 00755 /home
-make_dir 00755 /lib
-make_dir 00755 /lib/modules
-make_dir 00755 /mnt
-make_dir 00755 /mnt/host
-make_dir 00755 /nix
-make_dir 00755 /nix/store
-make_dir 00755 /nix/var
-make_dir 00755 /nix/var/nix
-make_dir 00755 /nix/var/nix/db
-make_dir 00755 /nix/var/nix/gcroots
-make_dir 00755 /nix/var/nix/manifests
-make_dir 00755 /nix/var/nix/profiles
-make_dir 00755 /nix/var/nix/temproots
-make_dir 00755 /nix/var/log
-make_dir 00755 /nix/var/log/nix
-make_dir 00755 /proc
-make_dir 00750 /root
-make_dir 00755 /sbin
-make_dir 00755 /sys
-make_dir 01777 /tmp
-make_dir 00755 /usr
-make_dir 00755 /var
-make_dir 00755 /var/empty
-make_dir 00111 /var/empty/sshd
-make_dir 00755 /var/lock
-make_dir 00755 /var/lock/subsys
-make_dir 00755 /var/log
-make_dir 00755 /var/run
-make_dir 00755 /var/run/usb
-make_dir 00755 /var/spool
-make_dir 00755 /var/state
-make_dir 00755 /var/state/dhcp
-make_dir 00755 /var/tmp
-
-##
-## Add a few devices to /dev on the install disk. This is by far complete.
-##
-
-echo making device nodes on target drive
-
-mknod -m 0666 $root/dev/null c 1 3
-mknod -m 0600 $root/dev/console c 5 1
-mknod -m 0600 $root/dev/tty c 5 0
-mknod -m 0600 $root/dev/tty0 c 4 0
-mknod -m 0600 $root/dev/tty1 c 4 1
-mknod -m 0600 $root/dev/tty2 c 4 2
-mknod -m 0600 $root/dev/tty3 c 4 3
-mknod -m 0444 $root/dev/urandom c 1 9
-
-## needed for sshd and friends. Should actually be made by udev.
-mknod -m 0666 $root/dev/ptmx c 5 2
-
-rm -f $root/etc/mtab
-ln -s /proc/mounts $root/etc/mtab
-
-# prevent df from barfing
-ln -s /proc/mounts /etc/mtab
-
-## Probe for CD device which contains our CD here and mount /nix and
-## /nixpkgs from it inside the ramdisk. Anaconda uses kudzu for this.
-## Find out how Knoppix and SUSE do this...
-
-DEVICES="/dev/hd?"
-
-for i in ${DEVICES}
-do
-echo "Looking for CDROM in: $i"
-  if mount -t iso9660 $i /cdrom >/dev/null 2>&1
-  then
-    if test -f /cdrom/NIXOS
-    then
-      cddevice=$i
-      echo "Accessing NixOS CDROM at $i"
-    break
-    fi
-  fi
-done
-
-echo mounting /cdrom in the target
-
-mount --bind /cdrom $root/cdrom
-mount --bind /cdrom/lib /lib
-
-echo switch to /nix from CD
-## starting here it's OK to have full blown glibc
-
-mount --bind /cdrom/nix /nix
-
-#echo probing for hardware...
-
-#kudzu
-
-export NIX_DATA_DIR=$root/nix/share
-export NIX_LOG_DIR=$root/nix/log/nix
-export NIX_STATE_DIR=$root/nix/var/nix
-export NIX_CONF_DIR=$root/nix/etc
-NIX=@nix@/bin
-
-echo bringing up networking...
-
-#labmachine has 3c59x
-#modprobe 3c59x
-#vmware has pcnet32
-#modprobe pcnet32
-#dhclient eth0
-
-#cp /etc/resolv.conf $root/etc/resolv.conf
-
-#nic=`kudzu -p | grep eth | sort | uniq | cut -d ' ' -f 2`
-
-#echo "NIC: $nic"
-
-echo initialising Nix DB...
-$NIX/nix-store --init
-
-echo verifying Nix DB...
-$NIX/nix-store --verify
-
-echo copying nixpkgs...
-mkdir -p $root/nixpkgs/pkgs
-tar --directory=$root/nixpkgs/pkgs -zxf /cdrom/nixpkgs.tgz
-
-make_dir 0755 /tmp/scripts
-cp -fa /cdrom/scripts $root/tmp
-
-echo adding packages
-
-export NIX_ROOT=$root
-unset NIX_DATA_DIR
-unset NIX_LOG_DIR
-unset NIX_STATE_DIR
-unset NIX_CONF_DIR
-
-cp /cdrom/mystorepaths $root/tmp
-
-echo copying store
-
-tar --directory=$root -zxf /cdrom/nixstore.tgz
-
-echo registering valid paths...
-
-$NIX/nix-store --register-validity < $root/tmp/mystorepaths
-
-unset NIX_ROOT
-export NIX_DATA_DIR=$root/nix/share
-export NIX_LOG_DIR=$root/nix/log/nix
-export NIX_STATE_DIR=$root/nix/var/nix
-export NIX_CONF_DIR=$root/nix/etc
-
-echo creating /bin/sh
-ln -s @bashGlibc@/bin/sh $root/bin/sh
-
-echo adding manifest
-$NIX/nix-pull file:///cdrom/MANIFEST
-
-export NIX_ROOT=$root
-unset NIX_DATA_DIR
-unset NIX_LOG_DIR
-unset NIX_STATE_DIR
-unset NIX_CONF_DIR
-
-## Fix this. Probably nix-instantiate, then nix-store -r.
-## Also make sure everything gets installed into an actual profile!
-
-$NIX/nix-env -iKf $nixpkgs/pkgs/top-level/all-packages.nix -A nix
-$NIX/nix-env -iKf $nixpkgs/pkgs/top-level/all-packages.nix -A coreutils
-$NIX/nix-env -iKf $nixpkgs/pkgs/top-level/all-packages.nix -A gnugrep
-#$NIX/nix-env -iKf $nixpkgs/pkgs/top-level/all-packages.nix -A kernel
-$NIX/nix-env -iKf $nixpkgs/pkgs/top-level/all-packages.nix -A kernelscripts
-$NIX/nix-env -iKf $nixpkgs/pkgs/top-level/all-packages.nix -A grub
-
-cat $narStorePaths | xargs -n 1 -i% $NIX/nix-env -i %
-
-echo setting init symlink...
-rm -f $root/init
-#ln -s $sysvinitPath/sbin/init $root/init
-ln -s @sysvinitPath@/sbin/init $root/sbin/init
-#ln -s @bash@/bin/bash $root/bin/bash
-
-echo setting up inittab...
-rm -f $root/etc/inittab
-echo "id:2:initdefault:" >> $root/etc/inittab
-echo "si::bootwait:$bootPath/bin/boot.sh" >> $root/etc/inittab
-echo "ht:06:wait:$bootPath/bin/halt.sh" >> $root/etc/inittab
-echo "1:2345:respawn:$bootPath/bin/login.sh /dev/tty1" >> $root/etc/inittab
-echo "#2:2345:respawn:$mingetty/sbin/mingetty tty2" >> $root/etc/inittab
-echo "#3:2345:respawn:$mingetty/sbin/mingetty tty3" >> $root/etc/inittab
-#echo "2:2345:respawn:$bootPath/bin/login.sh /dev/ttys/1" >> $root/etc/inittab
-
-echo setting up networking information...
-
-make_dir 00755 /etc/networking
-#cp /etc/resolv.conf $root/etc
-rm -f $root/etc/hosts
-echo "127.0.0.1 localhost" >> $root/etc/hosts
-
-echo storing hardware information...
-
-#kudzu -p > $root/etc/sysconfig/hwconf
-#cp /etc/modprobe.conf $root/etc/
-
-echo setting up initial account information...
-
-echo "root:x:0:root" > $root/etc/group
-echo "sshd:x:74:" >> $root/etc/group
-echo "root:x:0:0:root:/root:/bin/sh" > $root/etc/passwd
-echo "sshd:x:74:74:Privilege-separated SSH:/var/empty/sshd:/sbin/nologin" >> $root/etc/passwd
-echo "root::12757:0:99999:7:::" >> $root/etc/shadow
-echo "sshd:!!:12757:0:99999:7:::" >> $root/etc/shadow
-
-echo default profile for root
-echo "source @nix@/etc/profile.d/nix.sh" > $root/root/.profile
-
-touch_file /etc/login.defs
-touch_file /etc/services
-
-##
-## Do kernel stuff here.
-##
-strippedName=$(basename $root/@kernel@);
-if echo "$strippedName" | grep -q '^[a-z0-9]\{32\}-'; then
-        strippedName=$(echo "$strippedName" | cut -c34- | cut -c 7-)
-fi
-
-kernelhash=$(basename $root/@kernel@);
-if echo "$kernelhash" | grep -q '^[a-z0-9]\{32\}-'; then
-        kernelhash=$(echo "$kernelhash" | cut -c -32)
-fi
-
-version=$strippedName-$kernelhash
-
-ln -s @kernelscripts@/lib/modules/$version $root/lib/modules/$version
-
-##
-## init
-##
-
-ln -s $device $root/dev/root
-ln -s @sysvinitPath@/sbin/init /sbin/init
-
-##
-## Do funky stuff with grub here.
-##
-
-echo installing bootloader
-
-grub-install --root-directory=${root} --no-floppy ${targetdrive}
-
-# FIXME "root (hd0,0)"
-cat > $root/boot/grub/menu.lst << GRUBEND
-default=0
-timeout=5
-title NixOS
-        kernel @kernel@/vmlinuz root=$device
-GRUBEND
-
-echo clearing substitutes
-
-$NIX/nix-store --clear-substitutes
-
-#echo clearing network information
-
-#rm $root/etc/resolv.conf
-
-#echo copying install log
-
-#cp /tmp/install-log $root/root
-
-# bizar. busybox umount doesn't like things with --bind it seems.
-echo umounting filesystem
-
-umount $root/cdrom
-umount $root
-#umount /nix
-umount /cdrom
-#echo ejecting $cddevice
-#eject $cddevice
-
-echo install done
-echo it\'s safe to turn off your machine
-echo exiting install process
-
-#while true; do
-   #sleep 60;
-#done
diff --git a/test/grub-menu-builder.sh b/grub-menu-builder.sh
similarity index 100%
rename from test/grub-menu-builder.sh
rename to grub-menu-builder.sh
diff --git a/test/helpers/unpack-theme.nix b/helpers/unpack-theme.nix
similarity index 100%
rename from test/helpers/unpack-theme.nix
rename to helpers/unpack-theme.nix
diff --git a/test/helpers/unpack-theme.sh b/helpers/unpack-theme.sh
similarity index 100%
rename from test/helpers/unpack-theme.sh
rename to helpers/unpack-theme.sh
diff --git a/init.sh b/init.sh
deleted file mode 100644
index b17a6637f67..00000000000
--- a/init.sh
+++ /dev/null
@@ -1,79 +0,0 @@
-#! @bash@/bin/sh -e
-
-export PATH=/bin:/sbin:@bash@/bin:@findutils@/bin:@busybox@/bin:@busybox@/sbin:@e2fsprogs@/sbin:@grub@/sbin:@sysvinitPath@/sbin:@eject@/bin:@dhcp@/sbin:@modutils@/sbin
-
-echo mounting special filesystems
-
-mount -t proc proc /proc
-mount -t sysfs sys /sys
-
-# make a complete /dev filesystem
-# ripped permissions and everything from anaconda (loader2/devices.h)
-
-echo making device nodes
-
-# consoles
-
-#mknod -m 0600 /dev/console c 5 1
-mknod -m 0600 /dev/ttyS0 c 4 64
-mknod -m 0600 /dev/ttyS1 c 4 65
-mknod -m 0600 /dev/ttyS2 c 4 66
-mknod -m 0600 /dev/ttyS3 c 4 67
-
-# base UNIX devices
-mknod -m 0600 /dev/mem c 1 1
-mknod -m 0666 /dev/null c 1 3
-mknod -m 0666 /dev/zero c 1 5
-
-# tty
-mknod -m 0600 /dev/tty c 5 0
-mknod -m 0600 /dev/tty0 c 4 0
-mknod -m 0600 /dev/tty1 c 4 1
-mknod -m 0600 /dev/tty2 c 4 2
-mknod -m 0600 /dev/tty3 c 4 3
-mknod -m 0600 /dev/tty4 c 4 4
-mknod -m 0600 /dev/tty5 c 4 5
-mknod -m 0600 /dev/tty6 c 4 6
-mknod -m 0600 /dev/tty7 c 4 7
-mknod -m 0600 /dev/tty8 c 4 8
-mknod -m 0600 /dev/tty9 c 4 9
-
-mkdir -m 0755 /dev/pts
-mknod -m 0666 /dev/ptmx c 5 2
-
-# random
-
-mknod -m 0644 /dev/random c 1 8
-mknod -m 0644 /dev/urandom c 1 9
-
-mknod -m 0660 /dev/hda b 3 0
-mknod -m 0660 /dev/hda1 b 3 1
-mknod -m 0660 /dev/hda2 b 3 2
-mknod -m 0660 /dev/hda3 b 3 3
-
-mknod -m 0660 /dev/hdb b 3 64
-mknod -m 0660 /dev/hdb1 b 3 65
-mknod -m 0660 /dev/hdb2 b 3 66
-mknod -m 0660 /dev/hdb3 b 3 67
-
-mknod -m 0660 /dev/hdc b 22 0
-mknod -m 0660 /dev/hdc1 b 22 1
-mknod -m 0660 /dev/hdc2 b 22 2
-mknod -m 0660 /dev/hdc3 b 22 3
-
-mknod -m 0660 /dev/hdd b 22 64
-mknod -m 0660 /dev/hdd1 b 22 65
-mknod -m 0660 /dev/hdd2 b 22 66
-mknod -m 0660 /dev/hdd3 b 22 67
-
-#mknod -m 0660 /dev/sda b 8 0
-#mknod -m 0660 /dev/sda1 b 8 1
-#mknod -m 0660 /dev/sda2 b 8 2
-#mknod -m 0660 /dev/sda3 b 8 3
-
-mknod -m 0600 /dev/initctl p
-
-echo starting emergency shell on tty2
-
-exec ./ramdisk-login.sh /dev/tty2 &
-exec ./login.sh
diff --git a/init/builder.sh b/init/builder.sh
deleted file mode 100755
index 15ba03d4780..00000000000
--- a/init/builder.sh
+++ /dev/null
@@ -1,42 +0,0 @@
-#! /bin/sh -e
-
-. $stdenv/setup
-
-mkdir $out
-mkdir $out/bin
-
-#for i in $boot $halt $login $env; do
-#    dst=$out/bin/$(basename $i | cut -c34-)
-#    sed \
-#        -e "s^@bash\@^$bash^g" \
-#        -e "s^@coreutils\@^$coreutils^g" \
-#        -e "s^@findutils\@^$findutils^g" \
-#        -e "s^@utillinux\@^$utillinux^g" \
-#        -e "s^@sysvinit\@^$sysvinit^g" \
-#        -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^@curl\@^$curl^g" \
-#        -e "s^@gnused\@^$gnused^g" \
-#        -e "s^@gnutar\@^$gnutar^g" \
-#        -e "s^@gnugrep\@^$gnugrep^g" \
-#        -e "s^@gzip\@^$gzip^g" \
-#        -e "s^@gcc\@^$gcc^g" \
-#        -e "s^@mingetty\@^$mingetty^g" \
-#        -e "s^@grub\@^$grub^g" \
-#        -e "s^@out\@^$out^g" \
-#        < $i > $dst
-#    chmod +x $dst
-#done
diff --git a/init/default.nix b/init/default.nix
deleted file mode 100644
index f1b10b5bc8f..00000000000
--- a/init/default.nix
+++ /dev/null
@@ -1,11 +0,0 @@
-{ stdenv, bash, coreutils, utillinux, e2fsprogs, nix, shadowutils, mingetty, grubWrapper, parted, module_init_tools, dhcpWrapper}:
-
-derivation {
-  name = "init";
-  system = stdenv.system;
-  builder = ./builder.sh;
-  stage1 = ./prepare-disk.sh;
-  stage2 = ./install-disk.sh;
-  inherit stdenv bash coreutils utillinux e2fsprogs nix shadowutils
-          mingetty grubWrapper parted module_init_tools dhcpWrapper;
-}
diff --git a/init/install-disk.sh b/init/install-disk.sh
deleted file mode 100755
index de158cda600..00000000000
--- a/init/install-disk.sh
+++ /dev/null
@@ -1,176 +0,0 @@
-#! @bash@/bin/sh -e
-
-export PATH=@bash@/bin:@coreutils@/bin:@findutils@/bin:@utillinux@/bin:@utillinux@/sbin:@e2fsprogs@/sbin
-
-sysvinitPath=@sysvinitPath@
-bootPath=@bootPath@
-
-#if ! test -n "$1"
-#then
-#    echo "need harddisk device for installing!"
-#    exit
-#else
-#    device=$1
-#fi
-
-device=/dev/hda1
-#device=/dev/sda1
-
-
-make_dir() {
-    mode=$1
-    name=$2
-    echo creating $name...
-    if ! test -d $root/$name; then mkdir $root/$name; fi
-    chmod $mode $root/$name
-}
-
-
-touch_file() {
-    name=$1
-    echo touching $name...
-    if ! test -d $root/$name; then touch $root/$name; fi
-}
-root=/tmp/mnt
-
-mkdir -p /tmp/mnt
-
-mount -t ext2 $device /tmp/mnt
-
-cd /sys; echo *
-
-# mkdir -p /nix
-# mkdir -p /nixpkgs/trunk/pkgs
-
-# temporary hack
-# mount --bind /mnt/cdrom1/nix /nix
-# mount --bind /mnt/cdrom1/pkgs /nixpkgs/trunk/pkgs
-
-##
-## Create a directory tree on the installation disk.
-##
-
-make_dir 00755 /bin
-make_dir 00755 /dev
-make_dir 00755 /proc
-make_dir 01777 /tmp
-make_dir 00755 /etc # global non-constant configuration
-make_dir 00755 /etc-secret
-make_dir 00755 /var
-make_dir 00755 /nix
-make_dir 00755 /nix/store
-make_dir 00755 /nix/var
-make_dir 00755 /nix/var/nix
-make_dir 00755 /nix/var/nix/db
-make_dir 00755 /nix/var/nix/manifests
-make_dir 00755 /nix/var/log
-make_dir 00755 /nix/var/log/nix
-make_dir 00755 /nixpkgs
-make_dir 00755 /nixpkgs/trunk
-make_dir 00755 /mnt
-make_dir 00755 /mnt/host
-make_dir 00755 /home
-make_dir 00755 /home/root
-
-##
-## Add a few devices to /dev on the install disk. This is by far complete.
-##
-
-mknod $root/dev/null c 1 3
-
-touch_file /etc/passwd
-touch_file /etc/shadow
-touch_file /etc/group
-touch_file /etc/login.defs
-
-rm -f $root/etc/mtab
-#ln -s /proc/mounts $root/etc/mtab
-
-cat /proc/mounts
-
-export NIX_DATA_DIR=$root/nix/share
-export NIX_LOG_DIR=$root/nix/log/nix
-export NIX_STATE_DIR=$root/nix/var/nix
-export NIX_CONF_DIR=$root/nix/etc
-NIX_CMD_PATH=@NIX_CMD_PATH@/bin
-
-echo initialising Nix DB...
-#/nix/bin/nix-store --init
-$NIX_CMD_PATH/nix-store --init
-
-echo verifying Nix DB...
-$NIX_CMD_PATH/nix-store --verify
-
-echo copying nixpkgs...
-cp -fa ../pkgs $root/nixpkgs/trunk
-
-make_dir 0755 /tmp/scripts
-cp -fa ../scripts $root/tmp
-
-#echo adding manifest
-#$NIX_CMD_PATH/nix-pull $manifest
-
-echo adding packages
-export NIX_ROOT=$root
-unset NIX_DATA_DIR
-unset NIX_LOG_DIR
-unset NIX_STATE_DIR
-unset NIX_CONF_DIR
-
-#storeExpr=$(echo '(import /tmp/scripts/pkgs.nix).everything' | $NIX_CMD_PATH/nix-instantiate -v -v -)
-#storeExpr=$(echo '(import ./pkgs.nix).everything' | $NIX_CMD_PATH/nix-instantiate -v -v -)
-#$NIX_CMD_PATH/nix-store -r $storeExpr
-#echo $storeExpr
-#storeExpr2=$($NIX_CMD_PATH/nix-store -qR $($NIX_CMD_PATH/nix-store -r $storeExpr))
-#echo storeExpr $storeExpr
-#echo $($NIX_CMD_PATH/nix-store -qR --include-outputs $storeExpr)
-
-echo copying store
-
-(while read storepaths; do
-  cp -fa $storepaths $root/nix/store
-done) < /mnt/cdrom1/mystorepaths
-
-#cp -fa ../nix/store/* $root/nix/store
-
-#echo registering valid paths...
-#(while read storepath; do
-#    echo PATH $storepath
-#    if ! $NIX_CMD_PATH/nix-store --isvalid $storepath 2> /dev/null; then
-#        (unset NIX_ROOT; $NIX_CMD_PATH/nix-store --dump $storepath) | $NIX_CMD_PATH/nix-store --restore $storepath
-#        $NIX_CMD_PATH/nix-store --validpath $storepath
-#    fi
-#done) < /tmp/mystorepaths
-
-#echo registering successors...
-#(while read line; do
-#    echo SUCC $line
-#    $NIX_CMD_PATH/nix-store --successor $line
-#done) < /tmp/mysuccessors
-
-exit
-
-echo setting init symlink...
-rm -f $root/init
-ln -s $sysvinitPath/sbin/init $root/init
-
-echo setting up inittab...
-rm -f $root/etc/inittab
-echo "id:2:initdefault:" >> $root/etc/inittab
-echo "si::bootwait:$bootPath/bin/boot.sh" >> $root/etc/inittab
-echo "ht:06:wait:$bootPath/bin/halt.sh" >> $root/etc/inittab
-echo "1:2345:respawn:$bootPath/bin/login.sh /dev/ttys/0" >> $root/etc/inittab
-#echo "2:2345:respawn:$bootPath/bin/login.sh /dev/ttys/1" >> $root/etc/inittab
-
-echo setting up networking information...
-make_dir 00755 /etc/networking
-echo 192.168.150.1 > $root/etc/networking/local-ip
-echo 192.168.150.3 > $root/etc/networking/gateway-ip
-cp /etc/resolv.conf $root/etc
-rm -f $root/etc/hosts
-echo "127.0.0.1 localhost" >> $root/etc/hosts
-echo "192.168.150.1 uml" >> $root/etc/hosts
-
-###
-### Do funky stuff with grub here.
-###
diff --git a/init/prepare-disk.sh b/init/prepare-disk.sh
deleted file mode 100755
index 8ba9e93ddfc..00000000000
--- a/init/prepare-disk.sh
+++ /dev/null
@@ -1,70 +0,0 @@
-#! @bash@/bin/sh -e
-
-export PATH=@bash@/bin:@coreutils@/bin:@findutils@/bin:@utillinux@/bin:@utillinux@/sbin:@e2fsprogs@/sbin
-
-sysvinitPath=@sysvinitPath@
-bootPath=@bootPath@
-
-mount -t proc proc /proc
-mount -t sysfs sys /sys
-
-#mount -t /dev/hdc /installimage
-
-# make a complete /dev filesystem
-# ripped permissions and everything from anaconda (loader2/devices.h)
-
-# consoles
-
-#mknod -m 0600 /dev/console c 5 1
-mknod -m 0600 /dev/ttyS0 c 4 64
-mknod -m 0600 /dev/ttyS1 c 4 65
-mknod -m 0600 /dev/ttyS2 c 4 66
-mknod -m 0600 /dev/ttyS3 c 4 67
-
-# base UNIX devices
-mknod -m 0600 /dev/mem c 1 1
-mknod -m 0666 /dev/null c 1 3
-mknod -m 0666 /dev/zero c 1 5
-
-# tty
-mknod -m 0600 /dev/tty c 5 0
-mknod -m 0600 /dev/tty0 c 4 0
-mknod -m 0600 /dev/tty1 c 4 1
-mknod -m 0600 /dev/tty2 c 4 2
-mknod -m 0600 /dev/tty3 c 4 3
-mknod -m 0600 /dev/tty4 c 4 4
-mknod -m 0600 /dev/tty5 c 4 5
-mknod -m 0600 /dev/tty6 c 4 6
-mknod -m 0600 /dev/tty7 c 4 7
-mknod -m 0600 /dev/tty8 c 4 8
-mknod -m 0600 /dev/tty9 c 4 9
-
-mkdir -m 0755 /dev/pts
-mknod -m 0666 /dev/ptmx c 5 2
-
-# random
-
-mknod -m 0644 /dev/random c 1 8
-mknod -m 0644 /dev/urandom c 1 9
-
-mknod -m 0660 /dev/hda b 3 0
-mknod -m 0660 /dev/hda1 b 3 1
-mknod -m 0660 /dev/hda2 b 3 2
-mknod -m 0660 /dev/hda3 b 3 3
-
-#mknod -m 0660 /dev/sda b 8 0
-#mknod -m 0660 /dev/sda1 b 8 1
-#mknod -m 0660 /dev/sda2 b 8 2
-#mknod -m 0660 /dev/sda3 b 8 3
-
-echo "dev"
-cd /dev; echo *
-
-mkfs.ext2 /dev/hda1
-mkswap /dev/hda2
-
-## Probe for CD device which contains our CD here and mount /nix and
-## /nixpkgs from it inside the ramdisk. Anaconda uses kudzu for this.
-## Find out how Knoppix and SUSE do this...
-
-$(./install-disk.sh)
diff --git a/install.sh b/install.sh
deleted file mode 100644
index 88ce09ccb2b..00000000000
--- a/install.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-#! @bash@/bin/sh -e
-
-exec ./fill-disk.sh | @busybox@/bin/tee /tmp/install-log
diff --git a/test/installer.nix b/installer.nix
similarity index 100%
rename from test/installer.nix
rename to installer.nix
diff --git a/test/installer.sh b/installer.sh
similarity index 100%
rename from test/installer.sh
rename to installer.sh
diff --git a/isolinux.cfg b/isolinux.cfg
old mode 100755
new mode 100644
index 180b144eeb5..ff19e84c098
--- a/isolinux.cfg
+++ b/isolinux.cfg
@@ -3,4 +3,4 @@ prompt 1
 timeout 60
 label linux
   kernel vmlinuz
-  append initrd=initram.img init=/bin/sh
+  append initrd=initrd selinux=0 apm=on acpi=on
diff --git a/login.sh b/login.sh
deleted file mode 100644
index 1c33a2ebc91..00000000000
--- a/login.sh
+++ /dev/null
@@ -1,27 +0,0 @@
-#! @bash@/bin/sh -e
-
-export PATH=@bash@/bin:@coreutilsdiet@/bin:@coreutils@/bin:@findutils@/bin:@utillinux@/bin:@utillinux@/sbin:@e2fsprogs@/sbin:@grub@/sbin:@sysvinitPath@/sbin:@gnugrep@/bin:@which@/bin:@gnutar@/bin:@busybox@/bin:@busybox@/sbin:@nano@/bin
-
-#tty=$1
-
-#exec < $tty > $tty 2>&1
-
-echo
-echo "=== Welcome to Nix! ==="
-echo "NixOS Installation instructions"
-echo ""
-echo "* edit the file called 'disklayout' (vi is provided) and provide"
-echo "  the following name=value pairs:"
-echo "  * INSTALLDEVICE (root device, for example /dev/hda1)"
-echo "  * SWAP (swap device, for example /dev/hda2)"
-echo "  * TARGETDRIVE (target drive to install grub, for example /dev/hda)"
-echo "* run: sh fill-disk.sh"
-echo ""
-echo ""
-echo ""
-echo ""
-
-export HOME=/
-cd $HOME
-
-exec @bash@/bin/sh
diff --git a/test/make-devices.sh b/make-devices.sh
similarity index 100%
rename from test/make-devices.sh
rename to make-devices.sh
diff --git a/make-disk.sh b/make-disk.sh
deleted file mode 100755
index d3fe502301a..00000000000
--- a/make-disk.sh
+++ /dev/null
@@ -1,329 +0,0 @@
-#! /bin/sh -e
-
-set -x
-
-if test -z "$TMPDIR"; then export TMPDIR=/tmp; fi
-
-# deps is an array
-declare -a deps
-
-build="nix-build --no-out-link"
-
-coreutils=$($build ./pkgs.nix -A coreutils)
-
-# determine where we can find the Nix binaries
-NIX=$($coreutils/bin/dirname $(which nix-store))
-
-# make sure we use many of our own tools, because it is more pure
-mktemp=$($build ./pkgs.nix -A mktemp)
-
-gnused=$($build ./pkgs.nix -A gnused)
-gnutar=$($build ./pkgs.nix -A gnutar151)
-cdrtools=$($build ./pkgs.nix -A cdrtools)
-gzip=$($build ./pkgs.nix -A gzip)
-cpio=$($build ./pkgs.nix -A cpio)
-
-archivesDir=$($mktemp/bin/mktemp -d)
-manifest=${archivesDir}/MANIFEST
-nixpkgs=./pkgs
-fill_disk=$archivesDir/scripts/fill-disk.sh
-ramdisk_login=$archivesDir/scripts/ramdisk-login.sh
-login_script=$archivesDir/scripts/login.sh
-storePaths=$archivesDir/mystorepaths
-narStorePaths=$archivesDir/narstorepaths
-validatePaths=$archivesDir/validatepaths
-bootiso=$TMPDIR/nixos.iso
-initrd=$TMPDIR/initram.img
-initdir=${archivesDir}/initdir
-initscript=$archivesDir/scripts/init.sh
-
-nix=$($build ./pkgs.nix -A nix)
-busybox=$($build ./pkgs.nix -A busybox)
-nano=$($build ./pkgs.nix -A nano)
-nanoDiet=$($build ./pkgs.nix -A nanoDiet)
-ncurses=$($build ./pkgs.nix -A ncursesDiet)
-
-nixDeps=$($NIX/nix-store -qR $nix)
-
-storeExpr=$($build ./pkgs.nix -A boot)
-
-kernelscripts=$($build ./pkgs.nix -A kernelscripts)
-
-mkinitrd=$($build ./pkgs.nix -A mkinitrd)
-
-### make NAR files for everything we want to install and some more. Make sure
-### the right URL is in there, so specify /cdrom and not cdrom
-$NIX/nix-push --copy $archivesDir $manifest --target file:///cdrom $storeExpr $($build ./pkgs.nix -A kernel) $kernelscripts $mkinitrd
-
-# Location of sysvinit?
-sysvinitPath=$($build ./pkgs.nix -A sysvinit)
-
-# Location of Nix boot scripts?
-bootPath=$($build ./pkgs.nix -A boot)
-
-syslinux=$($build ./pkgs.nix -A syslinux)
-
-kernel=$($build ./pkgs.nix -A kernel)
-kernelscripts=$($build ./pkgs.nix -A kernelscripts)
-
-utillinux=$($build ./pkgs.nix -A utillinux)
-
-gnugrep=$($build ./pkgs.nix -A gnugrep)
-
-grub=$($build ./pkgs.nix -A grubWrapper)
-
-findutils=$($build ./pkgs.nix -A findutilsWrapper)
-
-modutils=$($build ./pkgs.nix -A module_init_toolsStatic)
-
-dhcp=$($build ./pkgs.nix -A dhcpWrapper)
-
-#combideps=$($NIX/nix-store -qR $nix $utillinux $gnugrep $grub $gzip $findutils)
-combideps=$($NIX/nix-store -qR $nix $busybox $grub $findutils $modutils $dhcp $nano)
-
-for i in $storeExpr $mkinitrd
-do
-  echo $i >> $narStorePaths
-done
-#for i in $nixDeps
-for i in $combideps
-do
-  echo $i >> $storePaths
-  echo '' >> $storePaths
-  deps=$($NIX/nix-store -q --references $i)
-  pkgs=$(echo $deps | $coreutils/bin/wc -w)
-  echo $pkgs >> $storePaths
-  for j in $deps
-  do
-    echo $j >> $storePaths
-  done
-  echo copying from store: $i
-  $gnutar/bin/tar -cf - $i | $gnutar/bin/tar --directory=$archivesDir -xf -
-done
-
-tar zcf ${archivesDir}/nixstore.tgz $combideps
-
-utilLinux=$($build ./pkgs.nix -A utillinuxStatic)
-coreUtilsDiet=$($build ./pkgs.nix -A diet.coreutils)
-
-## temporarily normal e2fsprogs until I can get it to build with dietlibc
-e2fsProgs=$($NIX/nix-store -qR $($build ./pkgs.nix -A e2fsprogsDiet))
-#e2fsProgs=$($NIX/nix-store -qR $($build ./pkgs.nix -A e2fsprogs))
-modUtils=$($NIX/nix-store -qR $($build ./pkgs.nix -A module_init_toolsStatic))
-Grub=$($NIX/nix-store -qR $($build ./pkgs.nix -A grubWrapper))
-Kernel=$($NIX/nix-store -qR $($build ./pkgs.nix -A kernel))
-SysVinit=$($NIX/nix-store -qR $($build ./pkgs.nix -A sysvinit))
-BootPath=$($NIX/nix-store -qR $($build ./pkgs.nix -A boot))
-
-bashGlibc=$($build ./pkgs.nix -A bash)
-bash=$($build ./pkgs.nix -A diet.bash)
-coreutilsdiet=$($build ./pkgs.nix -A diet.coreutils)
-utillinux=$($build ./pkgs.nix -A utillinux)
-e2fsprogs=$($build ./pkgs.nix -A e2fsprogsDiet)
-modutils=$($build ./pkgs.nix -A module_init_toolsStatic)
-grub=$($build ./pkgs.nix -A grubWrapper)
-mingettyWrapper=$($build ./pkgs.nix -A mingettyWrapper)
-dhcp=$($build ./pkgs.nix -A dhcpWrapper)
-gnugrep=$($build ./pkgs.nix -A gnugrep)
-which=$($build ./pkgs.nix -A which)
-eject=$($build ./pkgs.nix -A eject)
-sysklogd=$($build ./pkgs.nix -A sysklogd)
-#kudzu=$($build ./pkgs.nix -A kudzu)
-
-echo creating directories for bootimage
-
-$coreutils/bin/mkdir ${initdir}
-$coreutils/bin/mkdir ${initdir}/bin
-$coreutils/bin/mkdir ${initdir}/cdrom
-$coreutils/bin/mkdir ${initdir}/dev
-$coreutils/bin/mkdir ${initdir}/etc
-$coreutils/bin/mkdir ${initdir}/etc/sysconfig
-$coreutils/bin/mkdir ${initdir}/installimage
-$coreutils/bin/mkdir ${initdir}/lib
-$coreutils/bin/mkdir ${initdir}/modules
-$coreutils/bin/mkdir ${initdir}/proc
-$coreutils/bin/mkdir ${initdir}/sbin
-$coreutils/bin/mkdir ${initdir}/sys
-$coreutils/bin/mkdir ${initdir}/tmp
-$coreutils/bin/mkdir -p ${initdir}/usr/bin
-$coreutils/bin/mkdir -p ${initdir}/usr/sbin
-$coreutils/bin/mkdir ${initdir}/var
-$coreutils/bin/mkdir ${initdir}/var/run
-$coreutils/bin/mkdir -p ${initdir}/var/state/dhcp
-
-echo copying nixpkgs
-
-#svn export ${nixpkgs} ${archivesDir}/pkgs
-(cd $nixpkgs && tar -zcf  ${archivesDir}/nixpkgs.tgz .)
-
-#echo copying packages from store
-
-echo copying scripts
-
-$coreutils/bin/mkdir ${archivesDir}/scripts
-$coreutils/bin/cp -fa * ${archivesDir}/scripts
-$gnused/bin/sed -e "s^@bash\@^$bash^g" \
-    -e "s^@coreutils\@^$coreutilsdiet^g" \
-    -e "s^@busybox\@^$busybox^g" \
-    < $initscript > $initscript.tmp
-$coreutils/bin/mv $initscript.tmp $initscript
-$gnused/bin/sed -e "s^@sysvinitPath\@^$sysvinitPath^g" \
-    -e "s^@bootPath\@^$bootPath^g" \
-    -e "s^@nix\@^$nix^g" \
-    -e "s^@bash\@^$bash^g" \
-    -e "s^@bashGlibc\@^$bashGlibc^g" \
-    -e "s^@findutils\@^$findutils^g" \
-    -e "s^@busybox\@^$busybox^g" \
-    -e "s^@coreutilsdiet\@^$coreutilsdiet^g" \
-    -e "s^@coreutils\@^$coreutils^g" \
-    -e "s^@utilLinux\@^$utilLinux^g" \
-    -e "s^@utillinux\@^$utillinux^g" \
-    -e "s^@e2fsprogs\@^$e2fsprogs^g" \
-    -e "s^@modutils\@^$modutils^g" \
-    -e "s^@grub\@^$grub^g" \
-    -e "s^@kernel\@^$kernel^g" \
-    -e "s^@kernelscripts\@^$kernelscripts^g" \
-    -e "s^@gnugrep\@^$gnugrep^g" \
-    -e "s^@which\@^$which^g" \
-    -e "s^@dhcp\@^$dhcp^g" \
-    -e "s^@sysklogd\@^$sysklogd^g" \
-    -e "s^@gnutar\@^$gnutar^g" \
-    -e "s^@gzip\@^$gzip^g" \
-    -e "s^@mingetty\@^$mingettyWrapper^g" \
-    < $fill_disk > $fill_disk.tmp
-$coreutils/bin/mv $fill_disk.tmp $fill_disk
-
-$gnused/bin/sed -e "s^@sysvinitPath\@^$sysvinitPath^g" \
-    -e "s^@bootPath\@^$bootPath^g" \
-    -e "s^@NIX\@^$nix^g" \
-    -e "s^@bash\@^$bash^g" \
-    -e "s^@findutils\@^$findutils^g" \
-    -e "s^@coreutilsdiet\@^$coreutilsdiet^g" \
-    -e "s^@coreutils\@^$coreutils^g" \
-    -e "s^@utillinux\@^$utilLinux^g" \
-    -e "s^@e2fsprogs\@^$e2fsprogs^g" \
-    -e "s^@modutils\@^$modutils^g" \
-    -e "s^@grub\@^$grub^g" \
-    -e "s^@kernel\@^$kernel^g" \
-    -e "s^@kernelscripts\@^$kernelscripts^g" \
-    -e "s^@gnugrep\@^$gnugrep^g" \
-    -e "s^@which\@^$which^g" \
-    -e "s^@gnutar\@^$gnutar^g" \
-    -e "s^@mingetty\@^$mingettyWrapper^g" \
-    -e "s^@busybox\@^$busybox^g" \
-    < $ramdisk_login > $ramdisk_login.tmp
-$coreutils/bin/mv $ramdisk_login.tmp $ramdisk_login
-
-$gnused/bin/sed -e "s^@sysvinitPath\@^$sysvinitPath^g" \
-    -e "s^@bootPath\@^$bootPath^g" \
-    -e "s^@NIX\@^$nix^g" \
-    -e "s^@bash\@^$bash^g" \
-    -e "s^@findutils\@^$findutils^g" \
-    -e "s^@coreutilsdiet\@^$coreutilsdiet^g" \
-    -e "s^@coreutils\@^$coreutils^g" \
-    -e "s^@utillinux\@^$utilLinux^g" \
-    -e "s^@e2fsprogs\@^$e2fsprogs^g" \
-    -e "s^@modutils\@^$modutils^g" \
-    -e "s^@grub\@^$grub^g" \
-    -e "s^@kernel\@^$kernel^g" \
-    -e "s^@kernelscripts\@^$kernelscripts^g" \
-    -e "s^@gnugrep\@^$gnugrep^g" \
-    -e "s^@which\@^$which^g" \
-    -e "s^@gnutar\@^$gnutar^g" \
-    -e "s^@mingetty\@^$mingettyWrapper^g" \
-    -e "s^@busybox\@^$busybox^g" \
-    -e "s^@nano\@^$nanoDiet^g" \
-    < $login_script > $login_script.tmp
-$coreutils/bin/mv $login_script.tmp $login_script
-
-echo copying bootimage
-
-$coreutils/bin/mkdir ${archivesDir}/isolinux
-$coreutils/bin/cp ${syslinux}/lib/syslinux/isolinux.bin ${archivesDir}/isolinux
-$coreutils/bin/cp isolinux.cfg ${archivesDir}/isolinux
-$coreutils/bin/chmod u+w ${archivesDir}/isolinux/*
-
-echo copying kernel
-
-# By following the symlink we don't have to know the version number
-# of the kernel here.
-$coreutils/bin/cp -L $kernel/vmlinuz ${archivesDir}/isolinux
-
-strippedName=$(basename $kernel);
-if echo "$strippedName" | grep -q '^[a-z0-9]\{32\}-'; then
-        strippedName=$(echo "$strippedName" | cut -c34- | cut -c 7-)
-fi
-
-kernelhash=$(basename $root/$kernel);
-if echo "$kernelhash" | grep -q '^[a-z0-9]\{32\}-'; then
-        kernelhash=$(echo "$kernelhash" | cut -c -32)
-fi
-
-version=$strippedName-$kernelhash
-
-echo version: $version
-
-#echo linking kernel modules
-#$coreutils/bin/ln -s $kernel/lib $archivesDir/lib
-
-echo copying network drivers
-#$coreutils/bin/cp -fau --parents --no-preserve=mode $kernel/lib/modules/*/modules.* $archivesDir
-#$coreutils/bin/cp -fau --parents --no-preserve=mode $kernel/lib/modules/*/kernel/drivers/net/* $archivesDir
-
-$gnutar/bin/tar -cf - $kernel/lib/modules/*/modules.* | $gnutar/bin/tar --directory=$archivesDir --strip-components 3 -xf -
-$gnutar/bin/tar -cf - $kernel/lib/modules/*/kernel/drivers/net/* | $gnutar/bin/tar --directory=$archivesDir --strip-components 3 -xf -
-
-echo creating ramdisk
-
-umask 0022
-
-$coreutils/bin/rm -f ${initrd}
-#cp ${archivesDir}/scripts/fill-disk.sh ${initdir}/init
-$coreutils/bin/cp ${archivesDir}/scripts/fill-disk.sh ${initdir}/
-$coreutils/bin/cp ${archivesDir}/scripts/ramdisk-login.sh ${initdir}/
-$coreutils/bin/cp ${archivesDir}/scripts/login.sh ${initdir}/
-$coreutils/bin/cp ${archivesDir}/scripts/init.sh ${initdir}/init
-#ln -s ${bash}/bin/bash ${initdir}/bin/sh
-$coreutils/bin/cp ${bash}/bin/bash ${initdir}/bin/sh
-$coreutils/bin/chmod u+x ${initdir}/init
-$coreutils/bin/chmod u+x ${initdir}/fill-disk.sh
-$coreutils/bin/chmod u+x ${initdir}/ramdisk-login.sh
-$coreutils/bin/chmod u+x ${initdir}/login.sh
-#cp -fau --parents ${utilLinux} ${initdir}
-#cp -fau --parents ${coreUtilsDiet} ${initdir}
-#cp -fau --parents ${modUtils} ${initdir}
-$coreutils/bin/cp -fau --parents ${bash}/bin ${initdir}
-#$coreutils/bin/cp -fau --parents ${utilLinux}/bin ${initdir}
-#$coreutils/bin/chmod -R u+w ${initdir}
-#$coreutils/bin/cp -fau --parents ${utilLinux}/sbin ${initdir}
-$coreutils/bin/cp -fau --parents ${e2fsProgs} ${initdir}
-#$coreutils/bin/cp -fau --parents ${coreutilsdiet}/bin ${initdir}
-$coreutils/bin/cp -fau --parents ${modutils}/bin ${initdir}
-$coreutils/bin/chmod -R u+w ${initdir}
-$coreutils/bin/cp -fau --parents ${modutils}/sbin ${initdir}
-$coreutils/bin/cp -fau --parents ${busybox} ${initdir}
-$coreutils/bin/cp -fau --parents ${nanoDiet} ${initdir}
-$coreutils/bin/cp -fau --parents ${ncurses} ${initdir}
-
-$coreutils/bin/touch ${archivesDir}/NIXOS
-
-(cd ${initdir}; find . |$cpio/bin/cpio -H newc -o) | $gzip/bin/gzip -9 > ${initrd}
-
-$coreutils/bin/chmod -f -R +w ${initdir}/*
-$coreutils/bin/rm -rf ${initdir}
-
-$coreutils/bin/cp ${initrd} ${archivesDir}/isolinux
-$coreutils/bin/rm -f ${initrd}
-
-echo creating ISO image
-
-$cdrtools/bin/mkisofs -rJ -o ${bootiso} -b isolinux/isolinux.bin \
-                -c isolinux/boot.cat  -no-emul-boot -boot-load-size 4 \
-                -boot-info-table ${archivesDir}
-
-# cleanup, be diskspace friendly
-
-echo cleaning up
-
-$coreutils/bin/chmod -f -R +w ${archivesDir}/*
-#rm -rf ${archivesDir}/*
diff --git a/test/make-initrd.nix b/make-initrd.nix
similarity index 100%
rename from test/make-initrd.nix
rename to make-initrd.nix
diff --git a/test/make-initrd.sh b/make-initrd.sh
similarity index 100%
rename from test/make-initrd.sh
rename to make-initrd.sh
diff --git a/test/make-iso9660-image.nix b/make-iso9660-image.nix
similarity index 100%
rename from test/make-iso9660-image.nix
rename to make-iso9660-image.nix
diff --git a/test/make-iso9660-image.sh b/make-iso9660-image.sh
similarity index 100%
rename from test/make-iso9660-image.sh
rename to make-iso9660-image.sh
diff --git a/test/modules-closure.nix b/modules-closure.nix
similarity index 100%
rename from test/modules-closure.nix
rename to modules-closure.nix
diff --git a/test/modules-closure.sh b/modules-closure.sh
similarity index 100%
rename from test/modules-closure.sh
rename to modules-closure.sh
diff --git a/test/options.nix b/options.nix
similarity index 100%
rename from test/options.nix
rename to options.nix
diff --git a/test/paths-from-graph.sh b/paths-from-graph.sh
similarity index 100%
rename from test/paths-from-graph.sh
rename to paths-from-graph.sh
diff --git a/pkgs.nix b/pkgs.nix
deleted file mode 100644
index ea530f649d1..00000000000
--- a/pkgs.nix
+++ /dev/null
@@ -1,44 +0,0 @@
-let 
-
-  pkgs = import ./pkgs/top-level/all-packages.nix {};
-
-  # !!! copied from stdenv/linux/make-bootstrap-tools.nix.
-  pkgsToRemove = 
-    [ "binutils" "gcc" "coreutils" "findutils" "diffutils" "gnused" "gnugrep"
-      "gawk" "gnutar" "gzip" "bzip2" "gnumake" "bash" "patch" "patchelf"
-    ];
-    
-  pkgsDiet = import ./pkgs/top-level/all-packages.nix {
-    bootStdenv = removeAttrs (pkgs.useDietLibC pkgs.stdenv) pkgsToRemove;
-  };
-
-in rec {
-
-  inherit (pkgs)
-    stdenv kernelscripts kernel bash coreutils coreutilsDiet
-    findutilsWrapper utillinux utillinuxStatic sysvinit e2fsprogsDiet
-    e2fsprogs nettools nix subversion gcc wget which vim less screen
-    openssh binutils nixStatic strace shadowutils iputils gnumake curl gnused
-    gnutar gnutar151 gnugrep gzip mingettyWrapper grubWrapper syslinux parted
-    module_init_tools module_init_toolsStatic dhcpWrapper man nano nanoDiet
-    eject sysklogd mktemp cdrtools cpio busybox mkinitrd ncursesDiet;
-
-  diet = pkgsDiet;
-    
-  boot = (import ./boot) {
-    inherit stdenv bash coreutils findutilsWrapper utillinux sysvinit
-    e2fsprogs nettools subversion gcc wget which vim less screen openssh
-    strace shadowutils iputils gnumake curl gnused gnutar gnugrep gzip
-    mingettyWrapper grubWrapper parted module_init_tools dhcpWrapper man
-    nano nix;
-  };
-
-  #init = (import ./init) {inherit stdenv bash bashStatic coreutilsDiet
-  #  utillinux shadowutils mingettyWrapper grubWrapper parted module_init_tools
-  #  dhcpWrapper man nano eject e2fsprogsDiet;
-  #  nix = nixUnstable;
-  #};
-
-  everything = [boot sysvinit sysklogd kernelscripts kernel mkinitrd];
-  
-}
diff --git a/pure/devices.nix b/pure/devices.nix
deleted file mode 100644
index 140f8afb7e6..00000000000
--- a/pure/devices.nix
+++ /dev/null
@@ -1,20 +0,0 @@
-[
-  { id = "net-dev-1";
-    comment = "Broadcom Corporation NetXtreme BCM5751 Gigabit Ethernet PCI Express";
-    location = {
-      busId = "pci-0000:02:00.0";
-      macAddr = "00:14:22:bc:68:51";
-      prefer = "macAddr"; # i.e., don't care if busId changes
-    };
-    extraModules = []; # tg3
-  }
-
-  { id = "keyboard-1";
-    comment = "Dell Computer Corp. SK-8125 Keyboard";
-    location = {
-      busId = "usb-003-003";
-    };
-    extraModules = [];
-  }
-  
-]
diff --git a/pure/disks.nix b/pure/disks.nix
deleted file mode 100644
index c1ad104fbd9..00000000000
--- a/pure/disks.nix
+++ /dev/null
@@ -1,84 +0,0 @@
-{
-
-  /* Old school. */
-
-  volume1 = {
-    mountPoint = "/";
-    filesystem = "ext3";
-    location = {
-      device = "/dev/hda1";
-    };
-    creationParams = {
-      disk = "/dev/hda";
-      partition = 1;
-      startCylinder = 1;
-      endCylinder = 1000;
-    };
-  };
-  
-  volume2 = {
-    filesystem = "swap";
-    location = {
-      device = "/dev/hda2";
-    };
-    creationParams = {
-      disk = "/dev/hda";
-      startCylinder = 1001;
-      endCylinder = 1100;
-    };
-  };
-
-
-  /* With partition labels; don't care which device holds the file
-    system. */
-
-  volume1 = {
-    mountPoint = "/";
-    filesystem = "auto";
-    location = {
-      label = "ROOT_DISK";
-    };
-    # Only relevant when creating.
-    creationParams = {
-      disk = "/dev/hda";
-      partition = 1;
-      startCylinder = 1;
-      endCylinder = 1000;
-      filesystem = "ext3";
-    };
-  };
-
-
-  /* LVM. */
-
-  volume1 = {
-    mountPoint = "/data";
-    filesystem = "auto";
-    location = {
-      lvmVolumeGroup = "system";
-      lvmVolumeName = "big-volume"; # -> /dev/mapper/system-big-volume
-    };
-  };
-
-  lvmConfig = {
-    devices = [
-      ...
-    ];
-    groups = [
-      { name = "system";
-        volumes = [
-          { name = "big-volume";
-            size = 1048576; # -> 1 GiB
-          }
-          { name = "blah";
-            size = 1048576; # -> 1 GiB
-          }
-        ];
-        # When realising this configuration, only delete explicitly
-        # listed volumes for safety.
-        canDelete = ["foobar"];
-      };
-    ];
-  };
-  
-}
diff --git a/pure/networking.nix b/pure/networking.nix
deleted file mode 100644
index 0f3b550a8f5..00000000000
--- a/pure/networking.nix
+++ /dev/null
@@ -1,58 +0,0 @@
-{
-
-  identification = {
-    fromDHCP = false;
-    hostname = "foobar";
-  };
-
-
-  interfaces = [
-
-    # Manual configuration.
-    { name = "eth0";
-      hardware = {
-        type = "ethernet";
-        device = "net-dev-1";
-      };
-      link = {
-        ip4 = {
-          address = "192.168.1.2";
-          nameservers = [ # to be used when this interface is up
-            "1.2.3.4";
-            "1.2.3.5";
-          ];
-          routes = [ # idem, add when up
-            { destination = "0.0.0.0";
-              netmask = "0.0.0.0";
-              gateway = "192.168.1.1";
-              # iface implied (eth0)
-            }
-            { destination = "192.168.1.0";
-              netmask = "255.255.255.0";
-              # iface implied (eth0)
-            }
-          ];
-        };
-        ip6 = ...;
-      };
-    }
-
-    # Automatic configuration via DHCP
-    { name = "eth0";
-      hardware = {
-        type = "ethernet";
-        device = "net-dev-1";
-      };
-      link = {
-        useDHCP = true;
-      };
-    }
-    
-  ];
-
-
-  firewall = {
-    # ...
-  };
-
-}
\ No newline at end of file
diff --git a/pure/top-level.nix b/pure/top-level.nix
deleted file mode 100644
index 46c220f5c8e..00000000000
--- a/pure/top-level.nix
+++ /dev/null
@@ -1,26 +0,0 @@
-rec {
-
-  devices = import ./devices.nix;
-
-  disks = import ./disks.nix;
-
-  networking = import ./networking.nix;
-
-  systemServices = [
-    terminalRunner
-    syslogServer
-    dhcpClient
-    sshServer
-    subversionServer
-  ];
-  
-  systemInit = {
-    inherit devices disks networking;
-    inherit systemServices;
-  };
-
-  kernel = import ... {
-    externalModules = [nvidia vmware ...];
-  }
-
-}
diff --git a/ramdisk-login.sh b/ramdisk-login.sh
deleted file mode 100644
index e684fc3ce26..00000000000
--- a/ramdisk-login.sh
+++ /dev/null
@@ -1,15 +0,0 @@
-#! @bash@/bin/sh -e
-
-export PATH=@bash@/bin:@coreutilsdiet@/bin:@coreutils@/bin:@findutils@/bin:@utillinux@/bin:@utillinux@/sbin:@e2fsprogs@/sbin:@grub@/sbin:@sysvinitPath@/sbin:@gnugrep@/bin:@which@/bin:@gnutar@/bin:@busybox@/bin
-
-tty=$1
-
-exec < $tty > $tty 2>&1
-
-echo
-echo "=== Welcome to Nix! ==="
-
-export HOME=/
-cd $HOME
-
-exec @bash@/bin/sh
diff --git a/test/rescue-cd.nix b/rescue-cd.nix
similarity index 100%
rename from test/rescue-cd.nix
rename to rescue-cd.nix
diff --git a/run.sh b/run.sh
deleted file mode 100755
index e6ec1e005e2..00000000000
--- a/run.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-#! /bin/sh -e
-
-image=/tmp/disk.img
-
-linux ubd0="$image" mem=256M \
-  eth0=tuntap,tap1 \
-  init="/init"
diff --git a/test/splash-themes.nix b/splash-themes.nix
similarity index 100%
rename from test/splash-themes.nix
rename to splash-themes.nix
diff --git a/storepaths_format b/storepaths_format
deleted file mode 100644
index 5b71b007445..00000000000
--- a/storepaths_format
+++ /dev/null
@@ -1,13 +0,0 @@
-/nix/store/abcd-<package>
-deriver
-2
-/nix/store/1234-<package-1>
-/nix/store/5678-<package-2>
-
-Amount of dependencies determined by:
-
-nix-store -q --references p
-
-or better (for a large expression)
-
-nix-store -q --requisites p
diff --git a/test/system-configuration.nix b/system-configuration.nix
similarity index 100%
rename from test/system-configuration.nix
rename to system-configuration.nix
diff --git a/test/system-configuration.sh b/system-configuration.sh
similarity index 100%
rename from test/system-configuration.sh
rename to system-configuration.sh
diff --git a/test/isolinux.cfg b/test/isolinux.cfg
deleted file mode 100644
index ff19e84c098..00000000000
--- a/test/isolinux.cfg
+++ /dev/null
@@ -1,6 +0,0 @@
-default linux
-prompt 1
-timeout 60
-label linux
-  kernel vmlinuz
-  append initrd=initrd selinux=0 apm=on acpi=on
diff --git a/test/upgrade.sh b/upgrade.sh
similarity index 100%
rename from test/upgrade.sh
rename to upgrade.sh
diff --git a/test/upstart-jobs/ctrl-alt-delete.nix b/upstart-jobs/ctrl-alt-delete.nix
similarity index 100%
rename from test/upstart-jobs/ctrl-alt-delete.nix
rename to upstart-jobs/ctrl-alt-delete.nix
diff --git a/test/upstart-jobs/dhclient.nix b/upstart-jobs/dhclient.nix
similarity index 100%
rename from test/upstart-jobs/dhclient.nix
rename to upstart-jobs/dhclient.nix
diff --git a/test/upstart-jobs/gather.nix b/upstart-jobs/gather.nix
similarity index 100%
rename from test/upstart-jobs/gather.nix
rename to upstart-jobs/gather.nix
diff --git a/test/upstart-jobs/halt.nix b/upstart-jobs/halt.nix
similarity index 100%
rename from test/upstart-jobs/halt.nix
rename to upstart-jobs/halt.nix
diff --git a/test/upstart-jobs/hardware-scan.nix b/upstart-jobs/hardware-scan.nix
similarity index 100%
rename from test/upstart-jobs/hardware-scan.nix
rename to upstart-jobs/hardware-scan.nix
diff --git a/test/upstart-jobs/maintenance-shell.nix b/upstart-jobs/maintenance-shell.nix
similarity index 100%
rename from test/upstart-jobs/maintenance-shell.nix
rename to upstart-jobs/maintenance-shell.nix
diff --git a/test/upstart-jobs/make-job.nix b/upstart-jobs/make-job.nix
similarity index 100%
rename from test/upstart-jobs/make-job.nix
rename to upstart-jobs/make-job.nix
diff --git a/test/upstart-jobs/mingetty.nix b/upstart-jobs/mingetty.nix
similarity index 100%
rename from test/upstart-jobs/mingetty.nix
rename to upstart-jobs/mingetty.nix
diff --git a/test/upstart-jobs/network-interfaces.nix b/upstart-jobs/network-interfaces.nix
similarity index 100%
rename from test/upstart-jobs/network-interfaces.nix
rename to upstart-jobs/network-interfaces.nix
diff --git a/test/upstart-jobs/sshd.nix b/upstart-jobs/sshd.nix
similarity index 100%
rename from test/upstart-jobs/sshd.nix
rename to upstart-jobs/sshd.nix
diff --git a/test/upstart-jobs/syslogd.nix b/upstart-jobs/syslogd.nix
similarity index 100%
rename from test/upstart-jobs/syslogd.nix
rename to upstart-jobs/syslogd.nix
diff --git a/test/upstart-jobs/tty-backgrounds-combine.sh b/upstart-jobs/tty-backgrounds-combine.sh
similarity index 100%
rename from test/upstart-jobs/tty-backgrounds-combine.sh
rename to upstart-jobs/tty-backgrounds-combine.sh
diff --git a/test/upstart-jobs/tty-backgrounds.nix b/upstart-jobs/tty-backgrounds.nix
similarity index 100%
rename from test/upstart-jobs/tty-backgrounds.nix
rename to upstart-jobs/tty-backgrounds.nix
-- 
GitLab


From a9234b5c073a62faa002e61f16a601cf190df40a Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 27 Nov 2006 19:49:05 +0000
Subject: [PATCH 0267/5331] * Moving stuff around.

svn path=/nixu/trunk/; revision=7155
---
 test/README                                  |  19 --
 test/boot-environment.nix                    | 259 -------------------
 test/boot-stage-1-init.sh                    | 147 -----------
 test/boot-stage-1.nix                        |  43 ---
 test/boot-stage-2-init.sh                    | 168 ------------
 test/boot-stage-2.nix                        |  27 --
 test/grub-menu-builder.sh                    |  52 ----
 test/helpers/unpack-theme.nix                |   7 -
 test/helpers/unpack-theme.sh                 |  18 --
 test/installer.nix                           |  17 --
 test/installer.sh                            | 132 ----------
 test/isolinux.cfg                            |   6 -
 test/make-devices.sh                         |  53 ----
 test/make-initrd.nix                         |  31 ---
 test/make-initrd.sh                          |  42 ---
 test/make-iso9660-image.nix                  |  44 ----
 test/make-iso9660-image.sh                   |  31 ---
 test/modules-closure.nix                     |  13 -
 test/modules-closure.sh                      |  37 ---
 test/options.nix                             |  97 -------
 test/paths-from-graph.sh                     |  10 -
 test/rescue-cd.nix                           | 101 --------
 test/splash-themes.nix                       |  58 -----
 test/system-configuration.nix                |  55 ----
 test/system-configuration.sh                 |  31 ---
 test/upgrade.sh                              |   4 -
 test/upstart-jobs/ctrl-alt-delete.nix        |  12 -
 test/upstart-jobs/dhclient.nix               |  43 ---
 test/upstart-jobs/gather.nix                 |  19 --
 test/upstart-jobs/halt.nix                   |  41 ---
 test/upstart-jobs/hardware-scan.nix          |  23 --
 test/upstart-jobs/maintenance-shell.nix      |  19 --
 test/upstart-jobs/make-job.nix               |   7 -
 test/upstart-jobs/mingetty.nix               |  10 -
 test/upstart-jobs/network-interfaces.nix     |  36 ---
 test/upstart-jobs/sshd.nix                   |  32 ---
 test/upstart-jobs/syslogd.nix                |  10 -
 test/upstart-jobs/tty-backgrounds-combine.sh |  37 ---
 test/upstart-jobs/tty-backgrounds.nix        |  52 ----
 39 files changed, 1843 deletions(-)
 delete mode 100644 test/README
 delete mode 100644 test/boot-environment.nix
 delete mode 100644 test/boot-stage-1-init.sh
 delete mode 100644 test/boot-stage-1.nix
 delete mode 100644 test/boot-stage-2-init.sh
 delete mode 100644 test/boot-stage-2.nix
 delete mode 100644 test/grub-menu-builder.sh
 delete mode 100644 test/helpers/unpack-theme.nix
 delete mode 100644 test/helpers/unpack-theme.sh
 delete mode 100644 test/installer.nix
 delete mode 100644 test/installer.sh
 delete mode 100644 test/isolinux.cfg
 delete mode 100644 test/make-devices.sh
 delete mode 100644 test/make-initrd.nix
 delete mode 100644 test/make-initrd.sh
 delete mode 100644 test/make-iso9660-image.nix
 delete mode 100644 test/make-iso9660-image.sh
 delete mode 100644 test/modules-closure.nix
 delete mode 100644 test/modules-closure.sh
 delete mode 100644 test/options.nix
 delete mode 100644 test/paths-from-graph.sh
 delete mode 100644 test/rescue-cd.nix
 delete mode 100644 test/splash-themes.nix
 delete mode 100644 test/system-configuration.nix
 delete mode 100644 test/system-configuration.sh
 delete mode 100755 test/upgrade.sh
 delete mode 100644 test/upstart-jobs/ctrl-alt-delete.nix
 delete mode 100644 test/upstart-jobs/dhclient.nix
 delete mode 100644 test/upstart-jobs/gather.nix
 delete mode 100644 test/upstart-jobs/halt.nix
 delete mode 100644 test/upstart-jobs/hardware-scan.nix
 delete mode 100644 test/upstart-jobs/maintenance-shell.nix
 delete mode 100644 test/upstart-jobs/make-job.nix
 delete mode 100644 test/upstart-jobs/mingetty.nix
 delete mode 100644 test/upstart-jobs/network-interfaces.nix
 delete mode 100644 test/upstart-jobs/sshd.nix
 delete mode 100644 test/upstart-jobs/syslogd.nix
 delete mode 100644 test/upstart-jobs/tty-backgrounds-combine.sh
 delete mode 100644 test/upstart-jobs/tty-backgrounds.nix

diff --git a/test/README b/test/README
deleted file mode 100644
index e2f76b08301..00000000000
--- a/test/README
+++ /dev/null
@@ -1,19 +0,0 @@
-To get a Stage 1 shell:
-
-Add "debug1" to the kernel command line.
-
-
-Switching to maintenance mode:
-
-$ shutdown now
-
-To get out of maintenance mode:
-
-$ initctl emit startup 
-
-
-Updating the current system configuration:
-
-$ nix-env -p /nix/var/nix/profiles/system -f system-configuration.nix -i -A systemConfiguration
-$ /nix/var/nix/profiles/system/bin/switch-to-configuration
-
diff --git a/test/boot-environment.nix b/test/boot-environment.nix
deleted file mode 100644
index 78086e99cfc..00000000000
--- a/test/boot-environment.nix
+++ /dev/null
@@ -1,259 +0,0 @@
-{ system ? __currentSystem
-, autoDetectRootDevice ? false
-, rootDevice ? ""
-, rootLabel ? ""
-, stage2Init
-, readOnlyRoot
-}:
-
-rec {
-
-  pkgs = import ./pkgs/top-level/all-packages.nix {inherit system;};
-
-  pkgsDiet = import ./pkgs/top-level/all-packages.nix {
-    inherit system;
-    bootStdenv = pkgs.useDietLibC pkgs.stdenv;
-  };
-
-  pkgsStatic = import ./pkgs/top-level/all-packages.nix {
-    inherit system;
-    bootStdenv = pkgs.makeStaticBinaries pkgs.stdenv;
-  };
-
-  stdenvLinuxStuff = import ./pkgs/stdenv/linux {
-    system = pkgs.stdenv.system;
-    allPackages = import ./pkgs/top-level/all-packages.nix;
-  };
-
-  nix = pkgs.nixUnstable; # we need the exportReferencesGraph feature
-
-
-  # Splash configuration.
-  splashThemes = import ./splash-themes.nix {
-    inherit (pkgs) fetchurl;
-  };
-
-
-  # Determine the set of modules that we need to mount the root FS.
-  modulesClosure = import ./modules-closure.nix {
-    inherit (pkgs) stdenv kernel module_init_tools;
-    rootModules = ["ide-cd" "ide-disk" "ide-generic"];
-  };
-
-
-  # 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 {
-    name = "extra-utils";
-    builder = builtins.toFile "builder.sh" "
-      source $stdenv/setup
-      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
-  # mounting the root FS).
-  bootStage1 = import ./boot-stage-1.nix {
-    inherit (pkgs) genericSubstituter;
-    inherit (pkgsDiet) module_init_tools;
-    inherit extraUtils;
-    inherit autoDetectRootDevice rootDevice rootLabel;
-    inherit stage2Init;
-    modules = modulesClosure;
-    shell = stdenvLinuxStuff.bootstrapTools.bash;
-    staticTools = stdenvLinuxStuff.staticTools;
-  };
-  
-
-  # The closure of the init script of boot stage 1 is what we put in
-  # the initial RAM disk.
-  initialRamdisk = import ./make-initrd.nix {
-    inherit (pkgs) stdenv cpio;
-    contents = [
-      { object = bootStage1;
-        symlink = "/init";
-      }
-      { object = extraUtils;
-        suffix = "/bin/splash_helper";
-        symlink = "/sbin/splash_helper";
-      }
-      { object = import ./helpers/unpack-theme.nix {
-          inherit (pkgs) stdenv;
-          theme = splashThemes.splashScreen;
-        };
-        symlink = "/etc/splash";
-      }
-    ];
-  };
-
-
-  # The installer.
-  nixosInstaller = import ./installer.nix {
-    inherit (pkgs) stdenv genericSubstituter;
-    inherit nix;
-    shell = pkgs.bash + "/bin/sh";
-  };
-
-
-  # The services (Upstart) configuration for the system.
-  upstartJobs = import ./upstart-jobs/gather.nix {
-    inherit (pkgs) stdenv;
-
-    jobs = map makeJob [
-      # Syslogd.
-      (import ./upstart-jobs/syslogd.nix {
-        inherit (pkgs) sysklogd;
-      })
-
-      # Hardware scan; loads modules for PCI devices.
-      (import ./upstart-jobs/hardware-scan.nix {
-        inherit (pkgs) kernel module_init_tools;
-      })
-      
-      # Network interfaces.
-      (import ./upstart-jobs/network-interfaces.nix {
-        inherit (pkgs) nettools kernel module_init_tools;
-      })
-      
-      # DHCP client.
-      (import ./upstart-jobs/dhclient.nix {
-        dhcp = pkgs.dhcpWrapper;
-      })
-
-      # SSH daemon.
-      (import ./upstart-jobs/sshd.nix {
-        inherit (pkgs) openssh;
-      })
-
-      # Transparent TTY backgrounds.
-      (import ./upstart-jobs/tty-backgrounds.nix {
-        inherit (pkgs) stdenv splashutils;
-        backgrounds = splashThemes.ttyBackgrounds;
-      })
-
-      # Handles the maintenance/stalled event (single-user shell).
-      (import ./upstart-jobs/maintenance-shell.nix {
-        inherit (pkgs) bash;
-      })
-
-      # Ctrl-alt-delete action.
-      (import ./upstart-jobs/ctrl-alt-delete.nix)
-
-    ]
-
-    # Handles the reboot/halt events.
-    ++ (map
-      (event: makeJob (import ./upstart-jobs/halt.nix {
-        inherit (pkgs) bash;
-        inherit event;
-      }))
-      ["reboot" "halt" "system-halt" "power-off"]
-    )
-    
-    # The terminals on ttyX.
-    ++ (map 
-      (ttyNumber: makeJob (import ./upstart-jobs/mingetty.nix {
-        mingetty = pkgs.mingettyWrapper;
-        inherit ttyNumber;
-      }))
-      [1 2 3 4 5 6]
-    )
-
-    # For the builtin logd job.
-    ++ [pkgs.upstart];
-  };
-
-  
-  makeJob = import ./upstart-jobs/make-job.nix {
-    inherit (pkgs) stdenv;
-  };
-
-
-  # The init script of boot stage 2, which is supposed to do
-  # everything else to bring up the system.
-  bootStage2 = import ./boot-stage-2.nix {
-    inherit (pkgs) genericSubstituter coreutils findutils
-      utillinux kernel udev upstart;
-    inherit upstartJobs;
-    shell = pkgs.bash + "/bin/sh";
-
-    # Additional stuff; add whatever you want here.
-    path = [
-      pkgs.bash
-      pkgs.bzip2
-      pkgs.cpio
-      pkgs.curl
-      pkgs.e2fsprogs
-      pkgs.gnugrep
-      pkgs.gnused
-      pkgs.gnutar
-      pkgs.grub
-      pkgs.gzip
-      pkgs.iputils
-      pkgs.less
-      pkgs.module_init_tools
-      pkgs.nano
-      pkgs.netcat
-      pkgs.nettools
-      pkgs.perl
-      pkgs.procps
-      pkgs.rsync
-      pkgs.shadowutils
-      pkgs.strace
-      pkgs.sysklogd
-#      pkgs.vim
-      nix
-      nixosInstaller
-    ];
-
-    inherit readOnlyRoot;
-
-    hostName = config.get ["networking" "hostname"];
-  };
-
-
-  lib = import ./pkgs/lib;
-
-
-  config = rec {
-
-    # The user configuration.
-    config = {
-      networking = {
-        hostname = "vindaloo";
-      };
-    };
-
-    # The option declarations, i.e., option names with defaults and
-    # documentation.
-    declarations = import ./options.nix;
-
-    # Get the option named `name' from the user configuration, using
-    # its default value if it's not defined.
-    get = name:
-      let
-        sameName = lib.filter (opt: lib.eqLists opt.name name) declarations;
-        default =
-          if sameName == []
-          then abort ("Undeclared option `" + printName name + "'.")
-          else if !builtins.head sameName ? default
-          then abort ("Option `" + printName name + "' has no default.")
-          else (builtins.head sameName).default;
-      in lib.getAttr name default config;
-  
-    printName = name: lib.concatStrings (lib.intersperse "." name);
-
-  };
-
-
-}
diff --git a/test/boot-stage-1-init.sh b/test/boot-stage-1-init.sh
deleted file mode 100644
index d62bd157975..00000000000
--- a/test/boot-stage-1-init.sh
+++ /dev/null
@@ -1,147 +0,0 @@
-#! @shell@
-
-fail() {
-    # If starting stage 2 failed, start an interactive shell.
-    echo "Stage 2 failed, starting emergency shell..."
-    exec @shell@
-}
-
-
-# Print a greeting.
-echo
-echo "<<< NixOS Stage 1 >>>"
-echo
-
-
-# Set the PATH.
-export PATH=/empty
-for i in @path@; do
-    PATH=$PATH:$i/bin
-    if test -e $i/sbin; then
-        PATH=$PATH:$i/sbin
-    fi
-done
-
-
-# Mount special file systems.
-mkdir -p /etc # to shut up mount
-touch /etc/fstab # idem
-mkdir -p /proc
-mount -t proc none /proc
-mkdir -p /sys
-mount -t sysfs none /sys
-
-
-# Process the kernel command line.
-stage2Init=@stage2Init@
-for o in $(cat /proc/cmdline); do
-    case $o in
-        init=*)
-            set -- $(IFS==; echo $o)
-            stage2Init=$2
-            ;;
-        debugtrace)
-            # Show each command.
-            set -x
-            ;;
-        debug1)
-            fail
-            ;;
-    esac
-done
-
-
-# Create device nodes in /dev.
-source @makeDevices@
-
-
-# Load some kernel modules.
-export MODULE_DIR=@modules@/lib/modules/
-modprobe ide-generic
-modprobe ide-disk
-modprobe ide-cd
-
-
-# Try to find and mount the root device.
-mkdir /mnt
-mkdir /mnt/root
-
-echo "mounting the root device..."
-
-if test -n "@autoDetectRootDevice@"; then
-
-    # Look for the root device by label.
-    echo "probing for the NixOS installation CD..."
-
-    for i in /sys/devices/*/*/media; do
-        if test "$(cat $i)" = "cdrom"; then
-
-            # Hopefully `drivename' matches the device created in /dev.
-            devName=/dev/$(cat $(dirname $i)/drivename)
-
-            echo "  in $devName..."
-
-            if mount -n -o ro -t iso9660 $devName /mnt/root; then
-                if test -e "/mnt/root/@rootLabel@"; then
-                    found=1
-                    break
-                fi
-                umount /mnt/root
-            fi
-        
-        fi
-    done
-
-    if test -z "$found"; then
-        echo "CD not found!"
-        fail
-    fi
-
-else
-
-    # Hard-coded root device.
-    rootDevice="@rootDevice@"
-
-    # Check the root device.
-    fsck -C -a "$rootDevice"
-    fsckResult=$?
-
-    if test $(($fsckResult | 2)) = $fsckResult; then
-        echo "fsck finished, rebooting..."
-        sleep 3
-        # reboot -f -d !!! don't have reboot yet
-        fail
-    fi
-
-    if test $(($fsckResult | 4)) = $fsckResult; then
-        echo "$rootDevice has unrepaired errors, please fix them manually."
-        fail
-    fi
-
-    if test $fsckResult -ge 8; then
-        echo "fsck on $rootDevice failed."
-        fail
-    fi
-
-    # Mount read-writable.
-    mount -n -o rw "$rootDevice" /mnt/root || fail
-
-fi
-
-
-# Start stage 2.
-# !!! Note: we can't use pivot_root here (the kernel gods have
-# decreed), but we could use run-init from klibc, which deletes all
-# files in the initramfs, remounts the target root on /, and chroots.
-cd /mnt/root
-mount --move . /
-umount /proc # cleanup
-umount /sys
-
-echo "INIT = $stage2Init"
-
-if test -z "$stage2Init"; then fail; fi
-
-exec chroot . $stage2Init
-
-fail
diff --git a/test/boot-stage-1.nix b/test/boot-stage-1.nix
deleted file mode 100644
index ef1ebfc7225..00000000000
--- a/test/boot-stage-1.nix
+++ /dev/null
@@ -1,43 +0,0 @@
-# This Nix expression builds the script that performs the first stage
-# of booting the system: it loads the modules necessary to mount the
-# root file system, then calls /init in the root file system to start
-# the second boot stage.  The closure of the result of this expression
-# is supposed to be put into an initial RAM disk (initrd).
-
-{ genericSubstituter, shell, staticTools
-, module_init_tools, extraUtils, modules
-
-, # Whether to find root device automatically using its label.
-  autoDetectRootDevice
-  
-, # If not scanning, the root must be specified explicitly.
-  rootDevice
-
-  # If scanning, we need a disk label.
-, rootLabel
-
-, # The path of the stage 2 init to call once we've mounted the root
-  # device.
-  stage2Init ? "/init"
-}:
-
-assert !autoDetectRootDevice -> rootDevice != "";
-assert autoDetectRootDevice -> rootLabel != "";
-
-genericSubstituter {
-  src = ./boot-stage-1-init.sh;
-  isExecutable = true;
-  inherit shell modules;
-  inherit autoDetectRootDevice rootDevice rootLabel;
-  path = [
-    staticTools
-    module_init_tools
-    extraUtils
-  ];
-  makeDevices = ./make-devices.sh;
-
-  # We only want the path of the stage 2 init, we don't want it as a
-  # dependency (since then it the stage 2 init would end up in the
-  # initrd).
-  stage2Init = toString stage2Init; # !!! doesn't work
-}
diff --git a/test/boot-stage-2-init.sh b/test/boot-stage-2-init.sh
deleted file mode 100644
index 57a6a20a71f..00000000000
--- a/test/boot-stage-2-init.sh
+++ /dev/null
@@ -1,168 +0,0 @@
-#! @shell@
-
-# !!! copied from stage 1; remove duplication
-
-
-# Print a greeting.
-echo
-echo "<<< NixOS Stage 2 >>>"
-echo
-
-
-# Set the PATH.
-export PATH=/empty
-for i in @path@; do
-    PATH=$PATH:$i/bin
-    if test -e $i/sbin; then
-        PATH=$PATH:$i/sbin
-    fi
-done
-
-
-# Mount special file systems.
-
-needWritableDir() {
-    if test -n "@readOnlyRoot@"; then
-        mount -t tmpfs -o "mode=$2" none $1 $3
-    else
-        mkdir -m $2 -p $1
-    fi
-}
-
-needWritableDir /etc 0755 -n # to shut up mount
-
-test -e /etc/fstab || touch /etc/fstab # idem
-
-mount -n -t proc none /proc
-cat /proc/mounts > /etc/mtab
-
-
-# Process the kernel command line.
-for o in $(cat /proc/cmdline); do
-    case $o in
-        debugtrace)
-            # Show each command.
-            set -x
-            ;;
-        debug2)
-            echo "Debug shell called from @out@"
-            exec @shell@
-            ;;
-        S|s|single)
-            # !!! argh, can't pass a startup event to Upstart yet.
-            exec @shell@
-            ;;
-    esac
-done
-
-
-# More special file systems, initialise required directories.
-mount -t sysfs none /sys
-mount -t tmpfs -o "mode=0755" none /dev
-needWritableDir /tmp 01777
-needWritableDir /var 0755
-needWritableDir /nix/var 0755
-
-mkdir -m 0755 -p /nix/var/nix/db
-mkdir -m 0755 -p /nix/var/nix/gcroots
-mkdir -m 0755 -p /nix/var/nix/temproots
-
-mkdir -m 0755 -p /var/log
-
-ln -sf /nix/var/nix/profiles /nix/var/nix/gcroots/
-
-
-# Ensure that the module tools can find the kernel modules.
-export MODULE_DIR=@kernel@/lib/modules/
-
-
-# Miscellaneous cleanup.
-rm -rf /var/run
-mkdir -m 0755 -p /var/run
-
-echo -n > /var/run/utmp # must exist
-chmod 664 /var/run/utmp
-
-
-# Start udev.
-udevd --daemon
-
-
-# Let udev create device nodes for all modules that have already been
-# loaded into the kernel (or for which support is built into the
-# kernel).
-udevtrigger
-udevsettle # wait for udev to finish
-
-
-# Necessary configuration for syslogd.
-echo "*.* /dev/tty10" > /etc/syslog.conf
-echo "syslog 514/udp" > /etc/services # required, even if we don't use it
-
-
-# login/su absolutely need this.
-test -e /etc/login.defs || touch /etc/login.defs 
-
-
-# Enable a password-less root login.
-if ! test -e /etc/passwd; then
-    echo "root::0:0:root:/:@shell@" > /etc/passwd
-fi
-if ! test -e /etc/group; then
-    echo "root:*:0" > /etc/group
-fi
-
-
-# We need "localhost" (!!! destructive hack for NIXOS-41).
-echo "127.0.0.1 localhost" > /etc/hosts
-echo "hosts: files dns" > /etc/nsswitch.conf
-
-
-# Set up the Upstart jobs.
-export UPSTART_CFG_DIR=/etc/event.d
-
-rm -f /etc/event.d
-ln -sf @upstartJobs@/etc/event.d /etc/event.d
-
-
-# Show a nice greeting on each terminal.
-cat > /etc/issue <<EOF
-
-<<< Welcome to NixOS (\m) - Kernel \r (\l) >>>
-
-
-EOF
-
-
-# Additional path for the interactive shell.
-for i in @extraPath@; do
-    PATH=$PATH:$i/bin
-    if test -e $i/sbin; then
-        PATH=$PATH:$i/sbin
-    fi
-done
-
-cat > /etc/profile <<EOF
-export PATH=$PATH
-export MODULE_DIR=$MODULE_DIR
-
-source $(dirname $(type -tp nix-env))/../etc/profile.d/nix.sh
-
-alias ll="ls -l"
-
-if test -f /etc/profile.local; then
-    source /etc/profile.local
-fi
-EOF
-
-
-# Set the host name.
-hostname @hostName@
-
-
-# Start an interactive shell.
-#exec @shell@
-
-
-# Start Upstart's init.
-exec @upstart@/sbin/init -v
diff --git a/test/boot-stage-2.nix b/test/boot-stage-2.nix
deleted file mode 100644
index 7d73e37cb4f..00000000000
--- a/test/boot-stage-2.nix
+++ /dev/null
@@ -1,27 +0,0 @@
-{ genericSubstituter, shell, coreutils, findutils
-, utillinux, kernel, udev, upstart
-, path ? []
-
-, # Whether the root device is root only.  If so, we'll mount a
-  # ramdisk on /etc, /var and so on.
-  readOnlyRoot
-
-, # The Upstart job configuration.
-  upstartJobs
-
-, hostName
-}:
-
-genericSubstituter {
-  src = ./boot-stage-2-init.sh;
-  isExecutable = true;
-  inherit shell kernel upstart readOnlyRoot upstartJobs hostName;
-  path = [
-    coreutils
-    findutils
-    utillinux
-    udev
-    upstart
-  ];
-  extraPath = path;
-}
diff --git a/test/grub-menu-builder.sh b/test/grub-menu-builder.sh
deleted file mode 100644
index 36fc0b05e12..00000000000
--- a/test/grub-menu-builder.sh
+++ /dev/null
@@ -1,52 +0,0 @@
-#! @bash@/bin/sh -e
-
-default=$1
-if test -z "$1"; then
-    echo "Syntax: grub-menu-builder.sh <DEFAULT-CONFIG>"
-    exit 1
-fi
-
-
-target=/boot/grub/menu.lst
-tmp=$target.tmp
-
-cat > $tmp << GRUBEND
-# Automatically generated.  DO NOT EDIT THIS FILE!
-default=0
-timeout=5
-GRUBEND
-
-addEntry() {
-    name="$1"
-    path="$2"
-
-    cat >> $tmp << GRUBEND
-title $name
-GRUBEND
-
-    #cat $path/menu.lst >> $tmp
-
-    grep -v "title \|default=\|timeout=" < $path/menu.lst >> $tmp
-}
-
-
-if test -n "$tmp"; then
-    addEntry "NixOS - Default" $default
-fi
-
-
-# Add all generations of the system profile to the menu, in reverse
-# (most recent to least recent) order.
-for generation in $(
-    (cd /nix/var/nix/profiles && ls -d system-*-link) \
-    | sed 's/system-\([0-9]\+\)-link/\1/' \
-    | sort -n -r); do
-    echo $generation
-    link=/nix/var/nix/profiles/system-$generation-link
-    date=$(stat --printf="%y\n" $link | sed 's/\..*//')
-    addEntry "NixOS - Configuration $generation ($date)" $link
-        
-done
-
-
-cp $tmp $target
diff --git a/test/helpers/unpack-theme.nix b/test/helpers/unpack-theme.nix
deleted file mode 100644
index 69d2eebe530..00000000000
--- a/test/helpers/unpack-theme.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{stdenv, theme}:
-
-stdenv.mkDerivation {
-  name = "theme";
-  builder = ./unpack-theme.sh;
-  inherit theme;
-}
diff --git a/test/helpers/unpack-theme.sh b/test/helpers/unpack-theme.sh
deleted file mode 100644
index 6eda7bcfbd4..00000000000
--- a/test/helpers/unpack-theme.sh
+++ /dev/null
@@ -1,18 +0,0 @@
-source $stdenv/setup
-
-ensureDir $out
-
-tar xvfj $theme -C $out
-
-themeName=$(cd $out && ls)
-
-for i in $out/$themeName/config/*.cfg; do
-    echo "converting $i"
-    # Rewrite /etc paths.  Also, the file names
-    # config/bootsplash-<RES>.cfg should be <RES>.cfg.
-    sed "s^/etc/bootsplash/themes^$out^g" < $i > $out/$themeName/$(basename $i | sed 's^.*-^^')
-done
-
-rm $out/$themeName/config/*.cfg
-
-ln -s $themeName $out/default
diff --git a/test/installer.nix b/test/installer.nix
deleted file mode 100644
index 44080b86a85..00000000000
--- a/test/installer.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-{ stdenv, genericSubstituter, shell, nix
-}:
-
-genericSubstituter {
-  src = ./installer.sh;
-  dir = "bin";
-  isExecutable = true;
-  inherit shell nix;
-
-  pathsFromGraph = ./paths-from-graph.sh;
-
-  nixClosure = stdenv.mkDerivation {
-    name = "closure";
-    exportReferencesGraph = ["refs" nix];
-    builder = builtins.toFile "builder.sh" "source $stdenv/setup; cp refs $out";
-  };
-}
diff --git a/test/installer.sh b/test/installer.sh
deleted file mode 100644
index 04c3c80c212..00000000000
--- a/test/installer.sh
+++ /dev/null
@@ -1,132 +0,0 @@
-#! @shell@
-
-# Syntax: installer.sh <DEVICE> <NIX-EXPR>
-# (e.g., installer.sh /dev/hda1 ./my-machine.nix)
-
-# - mount target device
-# - make Nix store etc.
-# - copy closure of rescue env to target device
-# - register validity
-# - start the "target" installer in a chroot to the target device
-#   * do a nix-pull
-#   * nix-env -p system-profile -i <nix-expr for the configuration>
-#   * run hook scripts provided by packages in the configuration?
-# - install/update grub
-
-set -e
-
-targetDevice="$1"
-nixExpr="$2"
-
-if test -z "$targetDevice" -o -z "$nixExpr"; then
-    echo "Syntax: installer.sh <targetDevice> <nixExpr>"
-    exit 1
-fi
-
-nixExpr=$(readlink -f "$nixExpr")
-
-
-# Make sure that the target device isn't mounted.
-umount "$targetDevice" 2> /dev/null || true
-
-
-# Check it.
-fsck -n "$targetDevice"
-
-
-# Mount the target device.
-mountPoint=/tmp/inst-mnt
-mkdir -p $mountPoint
-mount "$targetDevice" $mountPoint
-
-mkdir -m 0755 -p $mountPoint/dev $mountPoint/proc $mountPoint/sys $mountPoint/mnt
-mount --rbind / $mountPoint/mnt
-mount --bind /dev $mountPoint/dev
-mount --bind /proc $mountPoint/proc
-mount --bind /sys $mountPoint/sys
-
-cleanup() {
-    for i in $(grep -F "$mountPoint" /proc/mounts \
-        | perl -e 'while (<>) { /^\S+\s+(\S+)\s+/; print "$1\n"; }' \
-        | sort -r);
-    do
-        umount $i
-    done
-}
-
-trap "cleanup" EXIT
-
-mkdir -m 01777 -p $mountPoint/tmp
-mkdir -m 0755 -p $mountPoint/var
-
-
-# Create the necessary Nix directories on the target device, if they
-# don't already exist.
-mkdir -m 0755 -p \
-    $mountPoint/nix/store \
-    $mountPoint/nix/var/nix/gcroots \
-    $mountPoint/nix/var/nix/temproots \
-    $mountPoint/nix/var/nix/manifests \
-    $mountPoint/nix/var/nix/userpool \
-    $mountPoint/nix/var/nix/profiles \
-    $mountPoint/nix/var/nix/db \
-    $mountPoint/nix/var/log/nix/drvs
-
-
-# Get the store paths to copy from the references graph.
-storePaths=$(@shell@ @pathsFromGraph@ @nixClosure@)
-
-# Copy Nix to the Nix store on the target device.
-echo "copying Nix to $targetDevice...."
-for i in $storePaths; do
-    echo "  $i"
-    rsync -a $i $mountPoint/nix/store/
-done
-
-
-# Register the paths in the Nix closure as valid.  This is necessary
-# to prevent them from being deleted the first time we install
-# something.  (I.e., Nix will see that, e.g., the glibc path is not
-# valid, delete it to get it out of the way, but as a result nothing
-# will work anymore.)
-chroot $mountPoint @nix@/bin/nix-store --register-validity < @nixClosure@
-
-
-# Create the required /bin/sh symlink; otherwise lots of things
-# (notably the system() function) won't work.
-mkdir -m 0755 -p $mountPoint/bin
-ln -sf $(type -tp sh) $mountPoint/bin/sh
-
-
-# Enable networking in the chroot.
-mkdir -m 0755 -p $mountPoint/etc
-cp /etc/resolv.conf $mountPoint/etc/
-
-
-# Do a nix-pull to speed up building.
-nixpkgsURL=http://nix.cs.uu.nl/dist/nix/nixpkgs-0.11pre6984
-chroot $mountPoint @nix@/bin/nix-pull $nixpkgsURL/MANIFEST
-
-
-# Build the specified Nix expression in the target store and install
-# it into the system configuration profile.
-
-#rm -rf $mountPoint/scratch
-#mkdir $mountPoint/scratch
-#curl $nixpkgsURL/nixexprs.tar.bz2 | tar xj -C $mountPoint/scratch
-#nixpkgsName=$(cd $mountPoint/scratch && ls)
-
-chroot $mountPoint @nix@/bin/nix-env \
-    -p /nix/var/nix/profiles/system \
-    -f "/mnt/$nixExpr" -i -A systemConfiguration
-
-
-# Grub needs a mtab.
-echo "$targetDevice / somefs rw 0 0" > $mountPoint/etc/mtab
-
-
-# Switch to the new system configuration.  This will install Grub with
-# a menu default pointing at the kernel/initrd/etc of the new
-# configuration.
-echo "finalising the installation..."
-NIXOS_INSTALL_GRUB=1 chroot $mountPoint /nix/var/nix/profiles/system/bin/switch-to-configuration
diff --git a/test/isolinux.cfg b/test/isolinux.cfg
deleted file mode 100644
index ff19e84c098..00000000000
--- a/test/isolinux.cfg
+++ /dev/null
@@ -1,6 +0,0 @@
-default linux
-prompt 1
-timeout 60
-label linux
-  kernel vmlinuz
-  append initrd=initrd selinux=0 apm=on acpi=on
diff --git a/test/make-devices.sh b/test/make-devices.sh
deleted file mode 100644
index 1e9f9719ea4..00000000000
--- a/test/make-devices.sh
+++ /dev/null
@@ -1,53 +0,0 @@
-mknod -m 0600 /dev/ttyS0 c 4 64
-mknod -m 0600 /dev/ttyS1 c 4 65
-mknod -m 0600 /dev/ttyS2 c 4 66
-mknod -m 0600 /dev/ttyS3 c 4 67
-
-# base UNIX devices
-mknod -m 0600 /dev/mem c 1 1
-mknod -m 0666 /dev/null c 1 3
-mknod -m 0666 /dev/zero c 1 5
-
-# tty
-mknod -m 0600 /dev/tty c 5 0
-if ! test -e /dev/console; then
-    mknod -m 0600 /dev/console c 5 1
-fi
-for i in $(seq 0 10); do
-    mknod -m 0600 /dev/tty$i c 4 $i
-done
-
-mkdir -m 0755 /dev/pts
-mknod -m 0666 /dev/ptmx c 5 2
-
-# random
-
-mknod -m 0644 /dev/random c 1 8
-mknod -m 0644 /dev/urandom c 1 9
-
-mknod -m 0660 /dev/hda b 3 0
-mknod -m 0660 /dev/hda1 b 3 1
-mknod -m 0660 /dev/hda2 b 3 2
-mknod -m 0660 /dev/hda3 b 3 3
-
-mknod -m 0660 /dev/hdb b 3 64
-mknod -m 0660 /dev/hdb1 b 3 65
-mknod -m 0660 /dev/hdb2 b 3 66
-mknod -m 0660 /dev/hdb3 b 3 67
-
-mknod -m 0660 /dev/hdc b 22 0
-mknod -m 0660 /dev/hdc1 b 22 1
-mknod -m 0660 /dev/hdc2 b 22 2
-mknod -m 0660 /dev/hdc3 b 22 3
-
-mknod -m 0660 /dev/hdd b 22 64
-mknod -m 0660 /dev/hdd1 b 22 65
-mknod -m 0660 /dev/hdd2 b 22 66
-mknod -m 0660 /dev/hdd3 b 22 67
-
-#mknod -m 0660 /dev/sda b 8 0
-#mknod -m 0660 /dev/sda1 b 8 1
-#mknod -m 0660 /dev/sda2 b 8 2
-#mknod -m 0660 /dev/sda3 b 8 3
-
-mknod -m 0600 /dev/initctl p
diff --git a/test/make-initrd.nix b/test/make-initrd.nix
deleted file mode 100644
index a28c312564e..00000000000
--- a/test/make-initrd.nix
+++ /dev/null
@@ -1,31 +0,0 @@
-# Create an initial ramdisk containing the closure of the specified
-# file system objects.  An initial ramdisk is used during the initial
-# stages of booting a Linux system.  It is loaded by the boot loader
-# along with the kernel image.  It's supposed to contain everything
-# (such as kernel modules) necessary to allow us to mount the root
-# file system.  Once the root file system is mounted, the `real' boot
-# script can be called.
-#
-# An initrd is really just a gzipped cpio archive.
-#
-# Symlinks are created for each top-level file system object.  E.g.,
-# `contents = {object = ...; symlink = /init;}' is a typical
-# argument.
-
-{stdenv, cpio, contents}:
-
-stdenv.mkDerivation {
-  name = "initrd";
-  builder = ./make-initrd.sh;
-  buildInputs = [cpio];
-
-  # !!! should use XML.
-  objects = map (x: x.object) contents;
-  symlinks = map (x: x.symlink) contents;
-  suffices = map (x: if x ? suffix then x.suffix else "none") contents;
-  
-  # For obtaining the closure of `contents'.
-  exportReferencesGraph =
-    map (x: [("closure-" + baseNameOf x.symlink) x.object]) contents;
-  pathsFromGraph = ./paths-from-graph.sh;
-}
diff --git a/test/make-initrd.sh b/test/make-initrd.sh
deleted file mode 100644
index 8d07300466b..00000000000
--- a/test/make-initrd.sh
+++ /dev/null
@@ -1,42 +0,0 @@
-source $stdenv/setup
-
-set -o pipefail
-
-objects=($objects)
-symlinks=($symlinks)
-suffices=($suffices)
-
-mkdir root
-
-# Needed for splash_helper, which gets run before init.
-mkdir root/dev
-mkdir root/sys
-mkdir root/proc
-
-
-for ((n = 0; n < ${#objects[*]}; n++)); do
-    object=${objects[$n]}
-    symlink=${symlinks[$n]}
-    suffix=${suffices[$n]}
-    if test "$suffix" = none; then suffix=; fi
-
-    # Get the paths in the closure of `object'.
-    closure=closure-$(basename $symlink)
-    if ! test -e $closure; then
-        echo 'Your Nix installation is too old! Upgrade to nix-0.11pre7038 or newer.'
-        exit 1
-    fi
-    storePaths=$($SHELL $pathsFromGraph $closure)
-
-    # Paths in cpio archives *must* be relative, otherwise the kernel
-    # won't unpack 'em.
-    (cd root && cp -prd --parents $storePaths .)
-
-    mkdir -p $(dirname root/$symlink)
-    ln -s $object$suffix root/$symlink
-done
-    
-
-# Put the closure in a gzipped cpio archive.
-ensureDir $out
-(cd root && find * -print0 | cpio -ov -H newc --null | gzip -9 > $out/initrd)
diff --git a/test/make-iso9660-image.nix b/test/make-iso9660-image.nix
deleted file mode 100644
index e98de8ffcb4..00000000000
--- a/test/make-iso9660-image.nix
+++ /dev/null
@@ -1,44 +0,0 @@
-{ stdenv, cdrtools
-
-  # The file name of the resulting ISO image.
-, isoName ? "cd.iso"
-
-, # The files and directories to be placed in the ISO file system.
-  # This is a list of attribute sets {source, target} where `source'
-  # is the file system object (regular file or directory) to be
-  # grafted in the file system at path `target'.
-  contents
-
-/*
-, # In addition to `contents', the closure of the store paths listed
-  # in `packages' are also placed in the file system.
-  packages ? []
-*/
-
-, # `init' should be a store path, the closure of which is added to
-  # the image, just like `packages'.  However, in addition, a symlink
-  # `/init' to `init' will be created.
-  init ? null
-
-  # Whether this should be an El-Torito bootable CD.
-, bootable ? false
-
-  # The path (in the ISO file system) of the boot image.
-, bootImage ? ""
-
-}:
-
-assert bootable -> bootImage != "";
-
-stdenv.mkDerivation {
-  name = "iso9660-image";
-  builder = ./make-iso9660-image.sh;
-  buildInputs = [cdrtools];
-  inherit isoName init bootable bootImage;
-  sources = map ({source, target}: source) contents;
-  targets = map ({source, target}: target) contents;
-
-  # For obtaining the closure of `init'.
-  exportReferencesGraph = ["init-closure" init];
-  pathsFromGraph = ./paths-from-graph.sh;
-}
diff --git a/test/make-iso9660-image.sh b/test/make-iso9660-image.sh
deleted file mode 100644
index 9a8bef7416d..00000000000
--- a/test/make-iso9660-image.sh
+++ /dev/null
@@ -1,31 +0,0 @@
-source $stdenv/setup
-
-if test -n "$bootable"; then
-    bootFlags="-b $bootImage -c boot.cat -no-emul-boot -boot-load-size 4"
-fi
-
-graftList=
-sources_=($sources)
-targets_=($targets)
-for ((i = 0; i < ${#targets_[@]}; i++)); do
-    graftList="$graftList ${targets_[$i]}=$(readlink -f ${sources_[$i]})"
-done
-
-storePaths=$($SHELL $pathsFromGraph ./init-closure)
-
-for i in $storePaths; do
-    graftList="$graftList ${i:1}=$i"
-done
-
-if test -n "$init"; then
-    ln -s $init init
-    graftList="$graftList init=init"
-fi
-
-# !!! -f is a quick hack.
-ensureDir $out/iso
-mkisofs -r -J -o $out/iso/$isoName $bootFlags \
-    -graft-points $graftList
-
-ensureDir $out/nix-support
-echo $system > $out/nix-support/system
diff --git a/test/modules-closure.nix b/test/modules-closure.nix
deleted file mode 100644
index 86015a8b182..00000000000
--- a/test/modules-closure.nix
+++ /dev/null
@@ -1,13 +0,0 @@
-# Given a kernel build (with modules in $kernel/lib/modules/VERSION),
-# produce a module tree in $out/lib/modules/VERSION that contains only
-# the modules identified by `rootModules', plus their dependencies.
-# Also generate an appropriate modules.dep.
-
-{stdenv, kernel, rootModules, module_init_tools}:
-
-stdenv.mkDerivation {
-  name = kernel.name + "-shrunk";
-  builder = ./modules-closure.sh;
-  inherit kernel rootModules module_init_tools;
-  allowedReferences = ["out"];
-}
diff --git a/test/modules-closure.sh b/test/modules-closure.sh
deleted file mode 100644
index c5fcbba87f1..00000000000
--- a/test/modules-closure.sh
+++ /dev/null
@@ -1,37 +0,0 @@
-source $stdenv/setup
-
-set -o pipefail
-
-PATH=$module_init_tools/sbin:$PATH
-
-version=$(cd $kernel/lib/modules && ls -d *)
-
-echo "kernel version is $version"
-
-export MODULE_DIR=$kernel/lib/modules/
-
-# Determine the dependencies of each root module.
-closure=
-for module in $rootModules; do
-    echo "root module: $module"
-    deps=$(modprobe --set-version "$version" --show-depends "$module" \
-        | sed 's/^insmod //')
-    for i in $deps; do echo $i; done
-    closure="$closure $deps"
-done
-
-# Remove duplicates.
-closure=$(for i in $closure; do echo $i; done | sort | uniq)
-
-echo "closure:"
-ensureDir $out
-for module in $closure; do
-    echo $module
-    target=$(echo $module | sed "s^$kernel^$out^")
-    mkdir -p $(dirname $target)
-    cp $module $target
-    grep "^$module" $kernel/lib/modules/$version/modules.dep \
-        | sed "s^$kernel^$out^g" \
-        >> $out/lib/modules/$version/modules.dep
-done
-
diff --git a/test/options.nix b/test/options.nix
deleted file mode 100644
index 4cd2f3a7343..00000000000
--- a/test/options.nix
+++ /dev/null
@@ -1,97 +0,0 @@
-[        
-
-  {
-    name = ["networking" "hostname"];
-    default = "nixos";
-    description = "The name of the machine.";
-  }
-
-  {
-    name = ["networking" "useDHCP"];
-    default = true;
-    description = "
-      Whether to use DHCP to obtain an IP adress and other
-      configuration for all network interfaces that are not manually
-      configured.
-    ";
-  }
-
-  {
-    name = ["networking" "interfaces"];
-    default = [];
-    example = [
-      { interface = "eth0";
-        ipAddress = "131.211.84.78";
-        netmask = "255.255.255.128";
-        gateway = "131.211.84.1";
-      }
-    ];
-    description = "
-      The configuration for each network interface.  If
-      <option>networking.useDHCP</option> is true, then each interface
-      not listed here will be configured using DHCP.
-    ";
-  }
-
-  {
-    name = ["filesystems" "mountPoints"];
-    example = [
-      { device = "/dev/hda2";
-        mountPoint = "/";
-      }
-    ];
-    description = "
-      The file systems to be mounted by NixOS.  It must include an
-      entry for the root directory (<literal>mountPoint =
-      \"/\"</literal>).  This is the file system on which NixOS is (to
-      be) installed..
-    ";
-  }
-
-  {
-    name = ["services" "syslogd" "tty"];
-    default = 10;
-    description = "
-      The tty device on which syslogd will print important log
-      messages.
-    ";
-  }
-    
-  {
-    name = ["services" "mingetty" "ttys"];
-    default = [1 2 3 4 5 6];
-    description = "
-      The list of tty (virtual console) devices on which to start a
-      login prompt.
-    ";
-  }
-    
-  {
-    name = ["services" "mingetty" "waitOnMounts"];
-    default = false;
-    description = "
-      Whether the login prompts on the virtual consoles will be
-      started before or after all file systems have been mounted.  By
-      default we don't wait, but if for example your /home is on a
-      separate partition, you may want to turn this on.
-    ";
-  }
-
-  {
-    name = ["services" "sshd" "enable"];
-    default = false;
-    description = "
-      Whether to enable the Secure Shell daemon, which allows secure
-      remote logins.
-    ";
-  }
-
-  {
-    name = ["services" "sshd" "forwardX11"];
-    default = false;
-    description = "
-      Whether to enable sshd to forward X11 connections.
-    ";
-  }
-
-]
diff --git a/test/paths-from-graph.sh b/test/paths-from-graph.sh
deleted file mode 100644
index 4a134cb3165..00000000000
--- a/test/paths-from-graph.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-graph="$1"
-
-while read storePath; do
-    echo $storePath
-    read deriver
-    read count
-    for ((i = 0; i < $count; i++)); do
-        read ref
-    done
-done < $graph
diff --git a/test/rescue-cd.nix b/test/rescue-cd.nix
deleted file mode 100644
index 48040f6495c..00000000000
--- a/test/rescue-cd.nix
+++ /dev/null
@@ -1,101 +0,0 @@
-let
-
-  # The label used to identify the installation CD.
-  cdromLabel = "NIXOS";
-
-in
-
-  # Build boot scripts for the CD that find the CD-ROM automatically.
-  with import ./boot-environment.nix {
-    autoDetectRootDevice = true;
-    rootLabel = cdromLabel;
-    stage2Init = "/init";
-    readOnlyRoot = true;
-  };
-
-  
-rec {
-
-  inherit nixosInstaller bootStage1 upstartJobs; # !!! debug
-
-
-  # Since the CD is read-only, the mount points must be on disk.
-  cdMountPoints = pkgs.stdenv.mkDerivation {
-    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 {  
-    name = "tarball";
-    inherit tarName input;
-    builder = builtins.toFile "builder.sh" "
-      source $stdenv/setup
-      ensureDir $out
-      (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
-  # of crap (like .svn if this is a working copy).  An "svn export"
-  # would be better, but that's impure.
-  nixosTarball = makeTarball "nixos.tar.bz2" ./.;
-
-  
-  nixpkgsTarball = pkgs.fetchurl {
-    url = http://nix.cs.uu.nl/dist/nix/nixpkgs-0.11pre7087/nixpkgs-0.11pre7087.tar.bz2;
-    md5 = "c5840fcd049d75e00ad856ecbbef6857";
-  };
-
-
-  # Create an ISO image containing the isolinux boot loader, the
-  # kernel, the initrd produced above, and the closure of the stage 2
-  # init.
-  rescueCD = import ./make-iso9660-image.nix {
-    inherit (pkgs) stdenv cdrtools;
-    isoName = "nixos.iso";
-    
-    contents = [
-      { source = pkgs.syslinux + "/lib/syslinux/isolinux.bin";
-        target = "isolinux/isolinux.bin";
-      }
-      { source = ./isolinux.cfg;
-        target = "isolinux/isolinux.cfg";
-      }
-      { source = pkgs.kernel + "/vmlinuz";
-        target = "isolinux/vmlinuz";
-      }
-      { source = initialRamdisk + "/initrd";
-        target = "isolinux/initrd";
-      }
-      { source = cdMountPoints;
-        target = "/";
-      }
-      { source = nixosTarball + "/" + nixosTarball.tarName;
-        target = "/" + nixosTarball.tarName;
-      }
-      { source = nixpkgsTarball;
-        target = "/nixpkgs.tar.bz2";
-      }
-    ];
-
-    init = bootStage2;
-    
-    bootable = true;
-    bootImage = "isolinux/isolinux.bin";
-  };
-
-
-}
diff --git a/test/splash-themes.nix b/test/splash-themes.nix
deleted file mode 100644
index 25be6168b37..00000000000
--- a/test/splash-themes.nix
+++ /dev/null
@@ -1,58 +0,0 @@
-{fetchurl}:
-
-rec {
-
-  # Some themes.
-  
-  themeBabyTux = fetchurl {
-    url = http://www.bootsplash.de/files/themes/Theme-BabyTux.tar.bz2;
-    md5 = "a6d89d1c1cff3b6a08e2f526f2eab4e0";
-  };
-
-  themeFrozenBubble = fetchurl {
-    url = http://www.bootsplash.de/files/themes/Theme-FrozenBubble.tar.bz2;
-    md5 = "da49f04988ab04b7e0de117b0d25061a";
-  };
-
-  themePativo = fetchurl { # Yeah!
-    url = http://www.bootsplash.de/files/themes/Theme-Pativo.tar.bz2;
-    md5 = "9e13beaaadf88d43a5293e7ab757d569";
-  };
-
-  themeGNU = fetchurl {
-    url = http://www.bootsplash.de/files/themes/Theme-GNU.tar.bz2;
-    md5 = "61969309d23c631e57b0a311102ef034";
-  };
-
-
-  # The splash screen.
-  
-  splashScreen = themeBabyTux;
-
-
-  # The themes to use for each tty.  For each tty except the first
-  # entry in the list, you can omit `theme' to get the same theme as
-  # the first one.  If a tty does not appear, it doesn't get a
-  # theme (i.e., it will keep a black background).
-  
-  ttyBackgrounds = [
-    { tty = 1;
-      theme = themeBabyTux;
-    }
-    { tty = 2;
-    }
-    { tty = 3;
-      theme = themeGNU;
-    }
-    { tty = 4;
-      theme = themeGNU;
-    }
-    { tty = 5;
-      theme = themePativo;
-    }
-    { tty = 10; # logging console
-      theme = themeGNU;
-    }
-  ];
-  
-}
diff --git a/test/system-configuration.nix b/test/system-configuration.nix
deleted file mode 100644
index 640f17f907e..00000000000
--- a/test/system-configuration.nix
+++ /dev/null
@@ -1,55 +0,0 @@
-let
-
-  # The root device.
-  rootDevice = "/dev/hda1";
-
-  # The device on which GRUB should be installed (leave empty if you
-  # don't want GRUB to be installed).
-  grubDevice = "/dev/hda";
-
-  # Build boot scripts.
-  bootEnv = import ./boot-environment.nix {
-    autoDetectRootDevice = false;
-    inherit rootDevice;
-    stage2Init = ""; # Passed on the command line via Grub.
-    readOnlyRoot = false;
-  };
-
-  # Extra kernel command line arguments.
-  extraKernelParams = [
-    "selinux=0"
-    "apm=on"
-    "acpi=on"
-    "vga=0x317"
-    "console=tty1"
-    "splash=verbose"
-  ];
-
-in
-
-with bootEnv;
-  
-rec {
-
-
-  systemConfiguration = pkgs.stdenv.mkDerivation {
-    name = "system-configuration";
-    builder = ./system-configuration.sh;
-    inherit (pkgs) grub coreutils gnused gnugrep diffutils;
-    inherit grubDevice;
-    inherit bootStage2;
-    inherit grubMenuBuilder;
-    kernel = pkgs.kernel + "/vmlinuz";
-    initrd = initialRamdisk + "/initrd";
-    inherit extraKernelParams;
-  };
-
-
-  grubMenuBuilder = pkgs.genericSubstituter {
-    src = ./grub-menu-builder.sh;
-    isExecutable = true;
-    inherit (pkgs) bash;
-  };
-
-
-}
diff --git a/test/system-configuration.sh b/test/system-configuration.sh
deleted file mode 100644
index fa2e7def257..00000000000
--- a/test/system-configuration.sh
+++ /dev/null
@@ -1,31 +0,0 @@
-source $stdenv/setup
-
-ensureDir $out
-
-ln -s $kernel $out/kernel
-ln -s $grub $out/grub
-ln -s $bootStage2 $out/init
-ln -s $initrd $out/initrd
-echo "$extraKernelParams" > $out/kernel-params
-
-cat > $out/menu.lst << GRUBEND
-kernel $kernel init=$bootStage2 $extraKernelParams
-initrd $initrd
-GRUBEND
-
-ensureDir $out/bin
-
-cat > $out/bin/switch-to-configuration <<EOF
-#! $SHELL
-set -e
-export PATH=$coreutils/bin:$gnused/bin:$gnugrep/bin:$diffutils/bin
-if test -n "$grubDevice"; then
-    mkdir -m 0700 -p /boot/grub
-    $grubMenuBuilder $out
-    if test "\$NIXOS_INSTALL_GRUB" = 1; then
-        $grub/sbin/grub-install "$grubDevice" --no-floppy --recheck
-    fi
-fi
-EOF
-
-chmod +x $out/bin/switch-to-configuration
diff --git a/test/upgrade.sh b/test/upgrade.sh
deleted file mode 100755
index 97dc4fa4826..00000000000
--- a/test/upgrade.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-#! /bin/sh
-set -e
-nix-env -p /nix/var/nix/profiles/system -f system-configuration.nix -i -A systemConfiguration
-/nix/var/nix/profiles/system/bin/switch-to-configuration
diff --git a/test/upstart-jobs/ctrl-alt-delete.nix b/test/upstart-jobs/ctrl-alt-delete.nix
deleted file mode 100644
index 126154bae73..00000000000
--- a/test/upstart-jobs/ctrl-alt-delete.nix
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  name = "ctrl-alt-delete";
-  
-  job = "
-on ctrlaltdel
-
-script
-    shutdown -r now 'Ctrl-Alt-Delete pressed'
-end script
-  ";
-  
-}
diff --git a/test/upstart-jobs/dhclient.nix b/test/upstart-jobs/dhclient.nix
deleted file mode 100644
index 7ccc87615ad..00000000000
--- a/test/upstart-jobs/dhclient.nix
+++ /dev/null
@@ -1,43 +0,0 @@
-{dhcp}:
-
-{
-  name = "dhclient";
-  
-  job = "
-description \"DHCP client\"
-
-start on network-interfaces/started
-stop on network-interfaces/stop
-
-script
-    # Determine the interface on which to start dhclient.
-    interfaces=
-
-    # !!! apparent race; operstate seems to have a slight delay, so
-    # if dhclient is started right after network-interfaces, we don't
-    # always see all the interfaces.
-
-    #for i in $(cd /sys/class/net && ls -d *); do
-    #    if test \"$i\" != \"lo\" -a \"$(cat /sys/class/net/$i/operstate)\" != 'down'; then
-    #        interfaces=\"$interfaces $i\"
-    #    fi
-    #done
-
-    for i in $(ifconfig | grep '^[^ ]' | sed 's/ .*//'); do
-        if test \"$i\" != \"lo\"; then
-            interfaces=\"$interfaces $i\"
-        fi
-    done
-
-    if test -z \"$interfaces\"; then
-        echo 'No interfaces on which to start dhclient!'
-        exit 1
-    fi
-
-    mkdir -m 755 -p /var/state/dhcp
-
-    exec ${dhcp}/sbin/dhclient -d $interfaces
-end script
-  ";
-  
-}
diff --git a/test/upstart-jobs/gather.nix b/test/upstart-jobs/gather.nix
deleted file mode 100644
index 914c78e7a89..00000000000
--- a/test/upstart-jobs/gather.nix
+++ /dev/null
@@ -1,19 +0,0 @@
-# Create an etc/event.d directory containing symlinks to the
-# specified list of Upstart job files.
-{stdenv, jobs}:
-
-stdenv.mkDerivation {
-  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
-  ";
-}
diff --git a/test/upstart-jobs/halt.nix b/test/upstart-jobs/halt.nix
deleted file mode 100644
index 58be12db69c..00000000000
--- a/test/upstart-jobs/halt.nix
+++ /dev/null
@@ -1,41 +0,0 @@
-{bash, event}:
-
-assert event == "reboot"
-    || event == "halt"
-    || event == "system-halt"
-    || event == "power-off";
-
-{
-  name = "sys-" + event;
-  
-  job = "
-start on ${event}
-
-script
-    exec < /dev/tty1 > /dev/tty1 2>&1
-    echo \"\"
-    echo \"<<< SYSTEM SHUTDOWN >>>\"
-    echo \"\"
-
-    # Do an initial sync just in case.
-    sync || true
-
-    # Unmount file systems.
-    umount -n -a || true
-
-    # Remount / read-only
-    mount -n -o remount,ro /dontcare / || true
-
-    # Final sync.
-    sync || true
-
-    # Right now all events above power off the system.
-    if test ${event} = reboot; then
-        exec reboot -f
-    else
-        exec halt -f -p
-    fi
-end script
-  ";
-  
-}
diff --git a/test/upstart-jobs/hardware-scan.nix b/test/upstart-jobs/hardware-scan.nix
deleted file mode 100644
index 3ffd8f9223f..00000000000
--- a/test/upstart-jobs/hardware-scan.nix
+++ /dev/null
@@ -1,23 +0,0 @@
-# !!! Don't like it that I have to pass the kernel here.
-{kernel, module_init_tools}:
-
-{
-  name = "hardware-scan";
-  
-  job = "
-start on startup
-
-script
-    export MODULE_DIR=${kernel}/lib/modules/
-    
-    # Try to load modules for all PCI devices.
-    for i in /sys/bus/pci/devices/*/modalias; do
-        echo \"Trying to load a module for $(basename $(dirname $i))...\"
-        ${module_init_tools}/sbin/modprobe $(cat $i) || true
-        echo \"\"
-    done
-end script
-
-  ";
-
-}
diff --git a/test/upstart-jobs/maintenance-shell.nix b/test/upstart-jobs/maintenance-shell.nix
deleted file mode 100644
index 9e2acdaa0f5..00000000000
--- a/test/upstart-jobs/maintenance-shell.nix
+++ /dev/null
@@ -1,19 +0,0 @@
-{bash}:
-
-{
-  name = "maintenance-shell";
-  
-  job = "
-start on maintenance
-start on stalled
-
-script
-    exec < /dev/tty1 > /dev/tty1 2>&1
-    echo \"\"
-    echo \"<<< MAINTENANCE SHELL >>>\"
-    echo \"\"
-    exec ${bash}/bin/sh
-end script
-  ";
-  
-}
diff --git a/test/upstart-jobs/make-job.nix b/test/upstart-jobs/make-job.nix
deleted file mode 100644
index 3995a8f21aa..00000000000
--- a/test/upstart-jobs/make-job.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{stdenv}: job:
-
-stdenv.mkDerivation {
-  inherit (job) name job;
-  builder = builtins.toFile "builder.sh"
-    "source $stdenv/setup; ensureDir $out/etc/event.d; echo \"$job\" > $out/etc/event.d/$name";
-}
diff --git a/test/upstart-jobs/mingetty.nix b/test/upstart-jobs/mingetty.nix
deleted file mode 100644
index cdce937535c..00000000000
--- a/test/upstart-jobs/mingetty.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-{mingetty, ttyNumber}:
-
-{
-  name = "tty" + toString ttyNumber;
-  job = "
-    start on startup
-    stop on shutdown
-    respawn ${mingetty}/sbin/mingetty --noclear tty${toString ttyNumber}
-  ";
-}
diff --git a/test/upstart-jobs/network-interfaces.nix b/test/upstart-jobs/network-interfaces.nix
deleted file mode 100644
index d85c7e02001..00000000000
--- a/test/upstart-jobs/network-interfaces.nix
+++ /dev/null
@@ -1,36 +0,0 @@
-# !!! Don't like it that I have to pass the kernel here.
-{nettools, kernel, module_init_tools}:
-
-{
-  name = "network-interfaces";
-  
-  job = "
-start on hardware-scan
-stop on shutdown
-
-start script
-    export MODULE_DIR=${kernel}/lib/modules/
-
-    ${module_init_tools}/sbin/modprobe af_packet
-
-    for i in $(cd /sys/class/net && ls -d *); do
-        echo \"Bringing up network device $i...\"
-        ${nettools}/sbin/ifconfig $i up || true
-    done
-
-end script
-
-# Hack: Upstart doesn't yet support what we want: a service that
-# doesn't have a running process associated with it.
-respawn sleep 10000
-
-stop script
-    for i in $(cd /sys/class/net && ls -d *); do
-        echo \"Taking down network device $i...\"
-        ${nettools}/sbin/ifconfig $i down || true
-    done
-end script
-
-  ";
-  
-}
diff --git a/test/upstart-jobs/sshd.nix b/test/upstart-jobs/sshd.nix
deleted file mode 100644
index 466c7616f55..00000000000
--- a/test/upstart-jobs/sshd.nix
+++ /dev/null
@@ -1,32 +0,0 @@
-{openssh}:
-
-{
-  name = "sshd";
-  
-  job = "
-description \"SSH server\"
-
-start on network-interfaces/started
-stop on network-interfaces/stop
-
-start script
-    mkdir -m 0555 -p /var/empty
-
-    mkdir -m 0755 -p /etc/ssh
-
-    echo 'X11Forwarding yes' > /etc/ssh/sshd_config
-
-    if ! test -f /etc/ssh/ssh_host_dsa_key; then
-        ${openssh}/bin/ssh-keygen -t dsa -b 1024 -f /etc/ssh/ssh_host_dsa_key -N ''
-    fi
-
-    if ! grep -q '^sshd:' /etc/passwd; then
-        echo 'sshd:x:74:74:SSH privilege separation user:/var/empty:/noshell' >> /etc/passwd
-    fi
-
-end script
-
-respawn ${openssh}/sbin/sshd -D -h /etc/ssh/ssh_host_dsa_key -f /etc/ssh/sshd_config
-  ";
-  
-}
diff --git a/test/upstart-jobs/syslogd.nix b/test/upstart-jobs/syslogd.nix
deleted file mode 100644
index 8f326b0d6cf..00000000000
--- a/test/upstart-jobs/syslogd.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-{sysklogd}:
-
-{
-  name = "syslogd";
-  job = "
-    start on startup
-    stop on shutdown
-    respawn ${sysklogd}/sbin/syslogd -n
-  ";
-}
diff --git a/test/upstart-jobs/tty-backgrounds-combine.sh b/test/upstart-jobs/tty-backgrounds-combine.sh
deleted file mode 100644
index 894952d6940..00000000000
--- a/test/upstart-jobs/tty-backgrounds-combine.sh
+++ /dev/null
@@ -1,37 +0,0 @@
-source $stdenv/setup
-
-ttys=($ttys)
-themes=($themes)
-
-ensureDir $out
-
-default=
-
-for ((n = 0; n < ${#ttys[*]}; n++)); do
-    tty=${ttys[$n]}
-    theme=${themes[$n]}
-
-    if test "$theme" = "default"; then
-        if test -z "$default"; then
-            echo "No default theme!"
-            exit 1
-        fi
-        theme=$default
-    fi
-        
-    if test -z "$default"; then default=$theme; fi
-
-    echo "TTY $tty -> $theme"
-
-    themeName=$(cd $theme && ls | grep -v default)
-    
-    ln -sf $theme/$themeName $out/$themeName
-
-    if test -e $out/$tty; then
-        echo "Multiple themes defined for the same TTY!"
-        exit 1
-    fi
-
-    ln -sf $themeName $out/$tty
-    
-done
diff --git a/test/upstart-jobs/tty-backgrounds.nix b/test/upstart-jobs/tty-backgrounds.nix
deleted file mode 100644
index abe6f52305a..00000000000
--- a/test/upstart-jobs/tty-backgrounds.nix
+++ /dev/null
@@ -1,52 +0,0 @@
-{stdenv, splashutils, backgrounds}:
-
-rec {
-  name = "tty-backgrounds";
-
-  unpackTheme = theme: import ../helpers/unpack-theme.nix {
-    inherit stdenv theme;
-  };
-
-  themesUnpacked = stdenv.mkDerivation {
-    name = "splash-themes";
-    builder = ./tty-backgrounds-combine.sh;
-    # !!! Should use XML here.
-    ttys = map (x: x.tty) backgrounds;
-    themes = map (x: if x ? theme then (unpackTheme x.theme) else "default") backgrounds;
-  };
-
-  job = "
-start on hardware-scan
-
-start script
-
-    rm -f /etc/splash
-    ln -s ${themesUnpacked} /etc/splash
-
-    # Critical: tell the kernel where to find splash_helper.  It calls
-    # this program every time we switch between consoles.
-    echo ${splashutils}/bin/splash_helper > /proc/sys/kernel/fbsplash
-
-    # Set the theme for each console, as determined by
-    # tty-backgrounds-combine.sh above.
-    for tty in ${toString (map (x: x.tty) backgrounds)}; do
-        theme=$(readlink ${themesUnpacked}/$tty)
-        ${splashutils}/bin/splash_util --tty $tty -c setcfg -t $theme || true
-        ${splashutils}/bin/splash_util --tty $tty -c setpic -t $theme || true
-        ${splashutils}/bin/splash_util --tty $tty -c on || true
-    done
-
-end script
-
-respawn sleep 10000 # !!! Hack
-
-stop script
-    # Disable the theme on each console.
-    for tty in ${toString (map (x: x.tty) backgrounds)}; do
-        ${splashutils}/bin/splash_util --tty $tty -c off || true
-    done
-end script
-
-  ";
-  
-}
-- 
GitLab


From 5c89e891dfd63ba4ed1189de153b6cbd0ad7c906 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 28 Nov 2006 10:45:21 +0000
Subject: [PATCH 0268/5331] * Refactoring.

svn path=/nixos/trunk/; revision=7156
---
 .../boot-stage-1-init.sh                      |  0
 boot-stage-1.nix => boot/boot-stage-1.nix     |  0
 .../boot-stage-2-init.sh                      |  0
 boot-stage-2.nix => boot/boot-stage-2.nix     |  0
 make-devices.sh => boot/make-devices.sh       |  0
 make-initrd.nix => boot/make-initrd.nix       |  2 +-
 make-initrd.sh => boot/make-initrd.sh         |  0
 .../boot-environment.nix                      | 48 +++++++++----------
 options.nix => configuration/options.nix      |  0
 .../splash-themes.nix                         |  0
 .../system-configuration.nix                  |  2 +-
 .../system-configuration.sh                   |  0
 isolinux.cfg => helpers/isolinux.cfg          |  0
 .../make-iso9660-image.nix                    |  0
 .../make-iso9660-image.sh                     |  0
 .../modules-closure.nix                       |  0
 .../modules-closure.sh                        |  0
 .../paths-from-graph.sh                       |  0
 .../grub-menu-builder.sh                      |  0
 .../nixos-installer.nix                       |  4 +-
 installer.sh => installer/nixos-installer.sh  |  0
 rescue-cd.nix => instances/rescue-cd.nix      |  6 +--
 22 files changed, 31 insertions(+), 31 deletions(-)
 rename boot-stage-1-init.sh => boot/boot-stage-1-init.sh (100%)
 rename boot-stage-1.nix => boot/boot-stage-1.nix (100%)
 rename boot-stage-2-init.sh => boot/boot-stage-2-init.sh (100%)
 rename boot-stage-2.nix => boot/boot-stage-2.nix (100%)
 rename make-devices.sh => boot/make-devices.sh (100%)
 rename make-initrd.nix => boot/make-initrd.nix (95%)
 rename make-initrd.sh => boot/make-initrd.sh (100%)
 rename boot-environment.nix => configuration/boot-environment.nix (81%)
 rename options.nix => configuration/options.nix (100%)
 rename splash-themes.nix => configuration/splash-themes.nix (100%)
 rename system-configuration.nix => configuration/system-configuration.nix (96%)
 rename system-configuration.sh => configuration/system-configuration.sh (100%)
 rename isolinux.cfg => helpers/isolinux.cfg (100%)
 rename make-iso9660-image.nix => helpers/make-iso9660-image.nix (100%)
 rename make-iso9660-image.sh => helpers/make-iso9660-image.sh (100%)
 rename modules-closure.nix => helpers/modules-closure.nix (100%)
 rename modules-closure.sh => helpers/modules-closure.sh (100%)
 rename paths-from-graph.sh => helpers/paths-from-graph.sh (100%)
 rename grub-menu-builder.sh => installer/grub-menu-builder.sh (100%)
 rename installer.nix => installer/nixos-installer.nix (79%)
 rename installer.sh => installer/nixos-installer.sh (100%)
 rename rescue-cd.nix => instances/rescue-cd.nix (94%)

diff --git a/boot-stage-1-init.sh b/boot/boot-stage-1-init.sh
similarity index 100%
rename from boot-stage-1-init.sh
rename to boot/boot-stage-1-init.sh
diff --git a/boot-stage-1.nix b/boot/boot-stage-1.nix
similarity index 100%
rename from boot-stage-1.nix
rename to boot/boot-stage-1.nix
diff --git a/boot-stage-2-init.sh b/boot/boot-stage-2-init.sh
similarity index 100%
rename from boot-stage-2-init.sh
rename to boot/boot-stage-2-init.sh
diff --git a/boot-stage-2.nix b/boot/boot-stage-2.nix
similarity index 100%
rename from boot-stage-2.nix
rename to boot/boot-stage-2.nix
diff --git a/make-devices.sh b/boot/make-devices.sh
similarity index 100%
rename from make-devices.sh
rename to boot/make-devices.sh
diff --git a/make-initrd.nix b/boot/make-initrd.nix
similarity index 95%
rename from make-initrd.nix
rename to boot/make-initrd.nix
index a28c312564e..b737b2f9779 100644
--- a/make-initrd.nix
+++ b/boot/make-initrd.nix
@@ -27,5 +27,5 @@ stdenv.mkDerivation {
   # For obtaining the closure of `contents'.
   exportReferencesGraph =
     map (x: [("closure-" + baseNameOf x.symlink) x.object]) contents;
-  pathsFromGraph = ./paths-from-graph.sh;
+  pathsFromGraph = ../helpers/paths-from-graph.sh;
 }
diff --git a/make-initrd.sh b/boot/make-initrd.sh
similarity index 100%
rename from make-initrd.sh
rename to boot/make-initrd.sh
diff --git a/boot-environment.nix b/configuration/boot-environment.nix
similarity index 81%
rename from boot-environment.nix
rename to configuration/boot-environment.nix
index 78086e99cfc..b38c73b0035 100644
--- a/boot-environment.nix
+++ b/configuration/boot-environment.nix
@@ -8,21 +8,21 @@
 
 rec {
 
-  pkgs = import ./pkgs/top-level/all-packages.nix {inherit system;};
+  pkgs = import ../pkgs/top-level/all-packages.nix {inherit system;};
 
-  pkgsDiet = import ./pkgs/top-level/all-packages.nix {
+  pkgsDiet = import ../pkgs/top-level/all-packages.nix {
     inherit system;
     bootStdenv = pkgs.useDietLibC pkgs.stdenv;
   };
 
-  pkgsStatic = import ./pkgs/top-level/all-packages.nix {
+  pkgsStatic = import ../pkgs/top-level/all-packages.nix {
     inherit system;
     bootStdenv = pkgs.makeStaticBinaries pkgs.stdenv;
   };
 
-  stdenvLinuxStuff = import ./pkgs/stdenv/linux {
+  stdenvLinuxStuff = import ../pkgs/stdenv/linux {
     system = pkgs.stdenv.system;
-    allPackages = import ./pkgs/top-level/all-packages.nix;
+    allPackages = import ../pkgs/top-level/all-packages.nix;
   };
 
   nix = pkgs.nixUnstable; # we need the exportReferencesGraph feature
@@ -35,7 +35,7 @@ rec {
 
 
   # Determine the set of modules that we need to mount the root FS.
-  modulesClosure = import ./modules-closure.nix {
+  modulesClosure = import ../helpers/modules-closure.nix {
     inherit (pkgs) stdenv kernel module_init_tools;
     rootModules = ["ide-cd" "ide-disk" "ide-generic"];
   };
@@ -63,7 +63,7 @@ rec {
 
   # The init script of boot stage 1 (loading kernel modules for
   # mounting the root FS).
-  bootStage1 = import ./boot-stage-1.nix {
+  bootStage1 = import ../boot/boot-stage-1.nix {
     inherit (pkgs) genericSubstituter;
     inherit (pkgsDiet) module_init_tools;
     inherit extraUtils;
@@ -77,7 +77,7 @@ rec {
 
   # The closure of the init script of boot stage 1 is what we put in
   # the initial RAM disk.
-  initialRamdisk = import ./make-initrd.nix {
+  initialRamdisk = import ../boot/make-initrd.nix {
     inherit (pkgs) stdenv cpio;
     contents = [
       { object = bootStage1;
@@ -87,7 +87,7 @@ rec {
         suffix = "/bin/splash_helper";
         symlink = "/sbin/splash_helper";
       }
-      { object = import ./helpers/unpack-theme.nix {
+      { object = import ../helpers/unpack-theme.nix {
           inherit (pkgs) stdenv;
           theme = splashThemes.splashScreen;
         };
@@ -98,7 +98,7 @@ rec {
 
 
   # The installer.
-  nixosInstaller = import ./installer.nix {
+  nixosInstaller = import ../installer/nixos-installer.nix {
     inherit (pkgs) stdenv genericSubstituter;
     inherit nix;
     shell = pkgs.bash + "/bin/sh";
@@ -106,54 +106,54 @@ rec {
 
 
   # The services (Upstart) configuration for the system.
-  upstartJobs = import ./upstart-jobs/gather.nix {
+  upstartJobs = import ../upstart-jobs/gather.nix {
     inherit (pkgs) stdenv;
 
     jobs = map makeJob [
       # Syslogd.
-      (import ./upstart-jobs/syslogd.nix {
+      (import ../upstart-jobs/syslogd.nix {
         inherit (pkgs) sysklogd;
       })
 
       # Hardware scan; loads modules for PCI devices.
-      (import ./upstart-jobs/hardware-scan.nix {
+      (import ../upstart-jobs/hardware-scan.nix {
         inherit (pkgs) kernel module_init_tools;
       })
       
       # Network interfaces.
-      (import ./upstart-jobs/network-interfaces.nix {
+      (import ../upstart-jobs/network-interfaces.nix {
         inherit (pkgs) nettools kernel module_init_tools;
       })
       
       # DHCP client.
-      (import ./upstart-jobs/dhclient.nix {
+      (import ../upstart-jobs/dhclient.nix {
         dhcp = pkgs.dhcpWrapper;
       })
 
       # SSH daemon.
-      (import ./upstart-jobs/sshd.nix {
+      (import ../upstart-jobs/sshd.nix {
         inherit (pkgs) openssh;
       })
 
       # Transparent TTY backgrounds.
-      (import ./upstart-jobs/tty-backgrounds.nix {
+      (import ../upstart-jobs/tty-backgrounds.nix {
         inherit (pkgs) stdenv splashutils;
         backgrounds = splashThemes.ttyBackgrounds;
       })
 
       # Handles the maintenance/stalled event (single-user shell).
-      (import ./upstart-jobs/maintenance-shell.nix {
+      (import ../upstart-jobs/maintenance-shell.nix {
         inherit (pkgs) bash;
       })
 
       # Ctrl-alt-delete action.
-      (import ./upstart-jobs/ctrl-alt-delete.nix)
+      (import ../upstart-jobs/ctrl-alt-delete.nix)
 
     ]
 
     # Handles the reboot/halt events.
     ++ (map
-      (event: makeJob (import ./upstart-jobs/halt.nix {
+      (event: makeJob (import ../upstart-jobs/halt.nix {
         inherit (pkgs) bash;
         inherit event;
       }))
@@ -162,7 +162,7 @@ rec {
     
     # The terminals on ttyX.
     ++ (map 
-      (ttyNumber: makeJob (import ./upstart-jobs/mingetty.nix {
+      (ttyNumber: makeJob (import ../upstart-jobs/mingetty.nix {
         mingetty = pkgs.mingettyWrapper;
         inherit ttyNumber;
       }))
@@ -174,14 +174,14 @@ rec {
   };
 
   
-  makeJob = import ./upstart-jobs/make-job.nix {
+  makeJob = import ../upstart-jobs/make-job.nix {
     inherit (pkgs) stdenv;
   };
 
 
   # The init script of boot stage 2, which is supposed to do
   # everything else to bring up the system.
-  bootStage2 = import ./boot-stage-2.nix {
+  bootStage2 = import ../boot/boot-stage-2.nix {
     inherit (pkgs) genericSubstituter coreutils findutils
       utillinux kernel udev upstart;
     inherit upstartJobs;
@@ -222,7 +222,7 @@ rec {
   };
 
 
-  lib = import ./pkgs/lib;
+  lib = pkgs.library;
 
 
   config = rec {
diff --git a/options.nix b/configuration/options.nix
similarity index 100%
rename from options.nix
rename to configuration/options.nix
diff --git a/splash-themes.nix b/configuration/splash-themes.nix
similarity index 100%
rename from splash-themes.nix
rename to configuration/splash-themes.nix
diff --git a/system-configuration.nix b/configuration/system-configuration.nix
similarity index 96%
rename from system-configuration.nix
rename to configuration/system-configuration.nix
index 640f17f907e..db4482306e4 100644
--- a/system-configuration.nix
+++ b/configuration/system-configuration.nix
@@ -46,7 +46,7 @@ rec {
 
 
   grubMenuBuilder = pkgs.genericSubstituter {
-    src = ./grub-menu-builder.sh;
+    src = ../installer/grub-menu-builder.sh;
     isExecutable = true;
     inherit (pkgs) bash;
   };
diff --git a/system-configuration.sh b/configuration/system-configuration.sh
similarity index 100%
rename from system-configuration.sh
rename to configuration/system-configuration.sh
diff --git a/isolinux.cfg b/helpers/isolinux.cfg
similarity index 100%
rename from isolinux.cfg
rename to helpers/isolinux.cfg
diff --git a/make-iso9660-image.nix b/helpers/make-iso9660-image.nix
similarity index 100%
rename from make-iso9660-image.nix
rename to helpers/make-iso9660-image.nix
diff --git a/make-iso9660-image.sh b/helpers/make-iso9660-image.sh
similarity index 100%
rename from make-iso9660-image.sh
rename to helpers/make-iso9660-image.sh
diff --git a/modules-closure.nix b/helpers/modules-closure.nix
similarity index 100%
rename from modules-closure.nix
rename to helpers/modules-closure.nix
diff --git a/modules-closure.sh b/helpers/modules-closure.sh
similarity index 100%
rename from modules-closure.sh
rename to helpers/modules-closure.sh
diff --git a/paths-from-graph.sh b/helpers/paths-from-graph.sh
similarity index 100%
rename from paths-from-graph.sh
rename to helpers/paths-from-graph.sh
diff --git a/grub-menu-builder.sh b/installer/grub-menu-builder.sh
similarity index 100%
rename from grub-menu-builder.sh
rename to installer/grub-menu-builder.sh
diff --git a/installer.nix b/installer/nixos-installer.nix
similarity index 79%
rename from installer.nix
rename to installer/nixos-installer.nix
index 44080b86a85..818b3e19887 100644
--- a/installer.nix
+++ b/installer/nixos-installer.nix
@@ -2,12 +2,12 @@
 }:
 
 genericSubstituter {
-  src = ./installer.sh;
+  src = ./nixos-installer.sh;
   dir = "bin";
   isExecutable = true;
   inherit shell nix;
 
-  pathsFromGraph = ./paths-from-graph.sh;
+  pathsFromGraph = ../helpers/paths-from-graph.sh;
 
   nixClosure = stdenv.mkDerivation {
     name = "closure";
diff --git a/installer.sh b/installer/nixos-installer.sh
similarity index 100%
rename from installer.sh
rename to installer/nixos-installer.sh
diff --git a/rescue-cd.nix b/instances/rescue-cd.nix
similarity index 94%
rename from rescue-cd.nix
rename to instances/rescue-cd.nix
index 48040f6495c..a8a88836911 100644
--- a/rescue-cd.nix
+++ b/instances/rescue-cd.nix
@@ -6,7 +6,7 @@ let
 in
 
   # Build boot scripts for the CD that find the CD-ROM automatically.
-  with import ./boot-environment.nix {
+  with import ../configuration/boot-environment.nix {
     autoDetectRootDevice = true;
     rootLabel = cdromLabel;
     stage2Init = "/init";
@@ -63,7 +63,7 @@ rec {
   # Create an ISO image containing the isolinux boot loader, the
   # kernel, the initrd produced above, and the closure of the stage 2
   # init.
-  rescueCD = import ./make-iso9660-image.nix {
+  rescueCD = import ../helpers/make-iso9660-image.nix {
     inherit (pkgs) stdenv cdrtools;
     isoName = "nixos.iso";
     
@@ -71,7 +71,7 @@ rec {
       { source = pkgs.syslinux + "/lib/syslinux/isolinux.bin";
         target = "isolinux/isolinux.bin";
       }
-      { source = ./isolinux.cfg;
+      { source = ../helpers/isolinux.cfg;
         target = "isolinux/isolinux.cfg";
       }
       { source = pkgs.kernel + "/vmlinuz";
-- 
GitLab


From cba92bbdf132f25fb00b6ca1455dca6dc9bac650 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 28 Nov 2006 13:36:27 +0000
Subject: [PATCH 0269/5331] * First step towards setuid/setgid support: a
 setuid/setgid wrapper   program.

  The Nix store cannot directly support setuid binaries for a number
  of reasons:

  - Builds are generally not performed as root (and they shouldn't
    be), so the builder cannot chown/chmod executables to the right
    setuid ownership.

  - Unpacking a NAR archive containing a setuid binary would only work
    when Nix is run as root.

  - Worst of all, setuid binaries don't fit in the purely functional
    model: if a security bug is discovered in a setuid binary, that
    binary should be removed from the system to prevent users from
    calling it.  But we cannot garbage collect it unless all
    references to it are gone, which might never happen.  Of course,
    we could just remove setuid permission, but that would also be
    impure.

  So the solution is to keep setuid-ness out of the Nix store.
  Rather, for programs that we want to execute as setuid, we generate
  wrapper programs (as root) that are setuid and do an execve() to
  call the real, non-setuid program in the Nix store.

  That's what setuid-wrapper does.  It determines its own name (e.g.,
  /var/setuid-wrappers/passwd), reads the name of the wrapped program
  from <self>.real (e.g., /var/setuid-wrappers/passwd.real, which
  might contain /nix/var/nix/profiles/system/bin/passwd), and executes
  it.  Thus, the non-setuid passwd in the Nix store would be executed
  with the effective user set to root.

  Setuid-wrapper also performs a few security checks to prevent it
  from reading a fake <self>.real file through hard-linking tricks.

svn path=/nixos/trunk/; revision=7157
---
 helpers/setuid/setuid-wrapper.c | 77 +++++++++++++++++++++++++++++++++
 1 file changed, 77 insertions(+)
 create mode 100644 helpers/setuid/setuid-wrapper.c

diff --git a/helpers/setuid/setuid-wrapper.c b/helpers/setuid/setuid-wrapper.c
new file mode 100644
index 00000000000..04923896d4e
--- /dev/null
+++ b/helpers/setuid/setuid-wrapper.c
@@ -0,0 +1,77 @@
+#include <stdlib.h>
+#include <stdio.h>
+#include <string.h>
+#include <unistd.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <fcntl.h>
+#include <dirent.h>
+
+extern char **environ;
+
+static char * wrapperDir = "/home/root/nixos/helpers/setuid";
+
+int main(int argc, char * * argv)
+{
+    char self[PATH_MAX];
+    
+    int len = readlink("/proc/self/exe", self, sizeof(self) - 1);
+    if (len == -1) abort();
+    self[len] = 0;
+
+    //printf("self = %s, ch = %c\n", self, self[strlen(wrapperDir)]);
+
+    
+    /* Make sure that we are being executed from the right location,
+       i.e., `wrapperDir'.  This is to prevent someone from
+       creating hard link `X' from some other location, along with a
+       false `X.real' file, to allow arbitrary programs from being
+       executed setuid. */
+    if ((strncmp(self, wrapperDir, sizeof(wrapperDir)) != 0) ||
+        (self[strlen(wrapperDir)] != '/'))
+        abort();
+
+    
+    /* Make *really* *really* sure that we were executed as `self',
+       and not, say, as some other setuid program.  That is, our
+       effective uid/gid should match the uid/gid of `self'. */
+    //printf("%d %d\n", geteuid(), getegid());
+
+    struct stat st;
+    if (lstat(self, &st) == -1) abort();
+
+    //printf("%d %d\n", st.st_uid, st.st_gid);
+    
+    if ((st.st_mode & S_ISUID) != 0 &&
+        st.st_uid != geteuid())
+        abort();
+
+    if ((st.st_mode & S_ISGID) != 0 &&
+        st.st_gid != getegid())
+        abort();
+
+    /* And, of course, we shouldn't be writable. */
+    if (st.st_mode & (S_IWGRP | S_IWOTH))
+        abort();
+
+
+    /* Read the path of the real (wrapped) program from <self>.real. */
+    char realFN[PATH_MAX + 10];
+    if (snprintf(realFN, sizeof(realFN), "%s.real", self) >= sizeof(realFN))
+        abort();
+
+    int fdSelf = open(realFN, O_RDONLY);
+    if (fdSelf == -1) abort();
+
+    char real[PATH_MAX];
+    len = read(fdSelf, real, PATH_MAX);
+    if (len == -1) abort();
+    if (len == sizeof(real)) abort();
+    real[len] = 0;
+    
+    //printf("real = %s, len = %d\n", real, len);
+
+    execve(real, argv, environ);
+    
+    exit(1);
+}
-- 
GitLab


From cb6c02f092bcdec37dae6f71a16b3c378c3e80bb Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 28 Nov 2006 15:06:08 +0000
Subject: [PATCH 0270/5331] * Set NIX_CONF_DIR.

svn path=/nixos/trunk/; revision=7158
---
 boot/boot-stage-2-init.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/boot/boot-stage-2-init.sh b/boot/boot-stage-2-init.sh
index 57a6a20a71f..009e9af7c87 100644
--- a/boot/boot-stage-2-init.sh
+++ b/boot/boot-stage-2-init.sh
@@ -145,6 +145,7 @@ done
 cat > /etc/profile <<EOF
 export PATH=$PATH
 export MODULE_DIR=$MODULE_DIR
+export NIX_CONF_DIR=/nix/etc/nix
 
 source $(dirname $(type -tp nix-env))/../etc/profile.d/nix.sh
 
-- 
GitLab


From 362f0f752b972ac2cb83dce972e5271f638633d5 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 28 Nov 2006 16:47:14 +0000
Subject: [PATCH 0271/5331] * Don't put every package in the boot environment
 in $PATH but rather   create a symlink tree and put that in $PATH.

svn path=/nixos/trunk/; revision=7161
---
 boot/boot-stage-2-init.sh          |  9 ++-------
 boot/boot-stage-2.nix              | 30 ++++++++++++++++++++++++------
 configuration/boot-environment.nix |  2 +-
 3 files changed, 27 insertions(+), 14 deletions(-)

diff --git a/boot/boot-stage-2-init.sh b/boot/boot-stage-2-init.sh
index 009e9af7c87..ee18c320c97 100644
--- a/boot/boot-stage-2-init.sh
+++ b/boot/boot-stage-2-init.sh
@@ -11,7 +11,7 @@ echo
 
 # Set the PATH.
 export PATH=/empty
-for i in @path@; do
+for i in @startPath@; do
     PATH=$PATH:$i/bin
     if test -e $i/sbin; then
         PATH=$PATH:$i/sbin
@@ -135,12 +135,7 @@ EOF
 
 
 # Additional path for the interactive shell.
-for i in @extraPath@; do
-    PATH=$PATH:$i/bin
-    if test -e $i/sbin; then
-        PATH=$PATH:$i/sbin
-    fi
-done
+PATH=@fullPath@/bin:@fullPath@/sbin
 
 cat > /etc/profile <<EOF
 export PATH=$PATH
diff --git a/boot/boot-stage-2.nix b/boot/boot-stage-2.nix
index 7d73e37cb4f..9c1640bc455 100644
--- a/boot/boot-stage-2.nix
+++ b/boot/boot-stage-2.nix
@@ -1,4 +1,4 @@
-{ genericSubstituter, shell, coreutils, findutils
+{ genericSubstituter, buildEnv, shell, coreutils, findutils
 , utillinux, kernel, udev, upstart
 , path ? []
 
@@ -12,16 +12,34 @@
 , hostName
 }:
 
-genericSubstituter {
-  src = ./boot-stage-2-init.sh;
-  isExecutable = true;
-  inherit shell kernel upstart readOnlyRoot upstartJobs hostName;
-  path = [
+let
+
+  startPath = [
     coreutils
     findutils
     utillinux
     udev
     upstart
   ];
+
+in
+
+genericSubstituter {
+  src = ./boot-stage-2-init.sh;
+  isExecutable = true;
+  inherit shell kernel upstart readOnlyRoot upstartJobs hostName;
+  inherit startPath;
+
+  # We don't want to put all of `startPath' and `path' in $PATH, since
+  # then we get an embarrassingly long $PATH.  So use the user
+  # environment builder to make a directory with symlinks to those
+  # packages.
+  fullPath = buildEnv {
+    name = "boot-stage-2-path";
+    paths = startPath ++ path;
+    pathsToLink = ["/bin" "/sbin" "/man/man1" "/share/man/man1"];
+    ignoreCollisions = true;
+  };
+  
   extraPath = path;
 }
diff --git a/configuration/boot-environment.nix b/configuration/boot-environment.nix
index b38c73b0035..885c994eea7 100644
--- a/configuration/boot-environment.nix
+++ b/configuration/boot-environment.nix
@@ -182,7 +182,7 @@ rec {
   # The init script of boot stage 2, which is supposed to do
   # everything else to bring up the system.
   bootStage2 = import ../boot/boot-stage-2.nix {
-    inherit (pkgs) genericSubstituter coreutils findutils
+    inherit (pkgs) genericSubstituter buildEnv coreutils findutils
       utillinux kernel udev upstart;
     inherit upstartJobs;
     shell = pkgs.bash + "/bin/sh";
-- 
GitLab


From 4b3525fa80081e617f6dbb321480f3c15e6e3e89 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 28 Nov 2006 16:59:47 +0000
Subject: [PATCH 0272/5331] * Handle the case where nix-env is a symlink.

svn path=/nixos/trunk/; revision=7162
---
 boot/boot-stage-2-init.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/boot/boot-stage-2-init.sh b/boot/boot-stage-2-init.sh
index ee18c320c97..5ad85bea27e 100644
--- a/boot/boot-stage-2-init.sh
+++ b/boot/boot-stage-2-init.sh
@@ -142,7 +142,7 @@ export PATH=$PATH
 export MODULE_DIR=$MODULE_DIR
 export NIX_CONF_DIR=/nix/etc/nix
 
-source $(dirname $(type -tp nix-env))/../etc/profile.d/nix.sh
+source $(dirname $(readlink -f $(type -tp nix-env)))/../etc/profile.d/nix.sh
 
 alias ll="ls -l"
 
-- 
GitLab


From 39ac293b58e3d10dfba686067df5f12f80807d92 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 28 Nov 2006 17:34:27 +0000
Subject: [PATCH 0273/5331] * Create setuid wrappers for a few programs (su and
 passwd).  This is   still a bit ad hoc, but it works.

svn path=/nixos/trunk/; revision=7163
---
 boot/boot-stage-2-init.sh          | 15 ++++++++++++++-
 boot/boot-stage-2.nix              |  7 ++++---
 configuration/boot-environment.nix |  7 +++++++
 helpers/setuid/builder.sh          |  5 +++++
 helpers/setuid/default.nix         |  8 ++++++++
 helpers/setuid/setuid-wrapper.c    |  2 +-
 6 files changed, 39 insertions(+), 5 deletions(-)
 create mode 100644 helpers/setuid/builder.sh
 create mode 100644 helpers/setuid/default.nix

diff --git a/boot/boot-stage-2-init.sh b/boot/boot-stage-2-init.sh
index 5ad85bea27e..262412c9eb4 100644
--- a/boot/boot-stage-2-init.sh
+++ b/boot/boot-stage-2-init.sh
@@ -135,7 +135,7 @@ EOF
 
 
 # Additional path for the interactive shell.
-PATH=@fullPath@/bin:@fullPath@/sbin
+PATH=@wrapperDir@:@fullPath@/bin:@fullPath@/sbin
 
 cat > /etc/profile <<EOF
 export PATH=$PATH
@@ -152,6 +152,19 @@ fi
 EOF
 
 
+# Make a few setuid programs work.
+wrapperDir=@wrapperDir@
+if test -d $wrapperDir; then rm -f $wrapperDir/*; fi
+mkdir -p $wrapperDir
+for i in passwd su; do
+    program=$(type -tp $i)
+    cp $(type -tp setuid-wrapper) $wrapperDir/$i
+    echo -n $program > $wrapperDir/$i.real
+    chown root.root $wrapperDir/$i
+    chmod 4755 $wrapperDir/$i
+done
+
+
 # Set the host name.
 hostname @hostName@
 
diff --git a/boot/boot-stage-2.nix b/boot/boot-stage-2.nix
index 9c1640bc455..9e92194ded7 100644
--- a/boot/boot-stage-2.nix
+++ b/boot/boot-stage-2.nix
@@ -1,5 +1,5 @@
 { genericSubstituter, buildEnv, shell, coreutils, findutils
-, utillinux, kernel, udev, upstart
+, utillinux, kernel, udev, upstart, setuidWrapper
 , path ? []
 
 , # Whether the root device is root only.  If so, we'll mount a
@@ -20,6 +20,7 @@ let
     utillinux
     udev
     upstart
+    setuidWrapper
   ];
 
 in
@@ -40,6 +41,6 @@ genericSubstituter {
     pathsToLink = ["/bin" "/sbin" "/man/man1" "/share/man/man1"];
     ignoreCollisions = true;
   };
-  
-  extraPath = path;
+
+  wrapperDir = setuidWrapper.wrapperDir;
 }
diff --git a/configuration/boot-environment.nix b/configuration/boot-environment.nix
index 885c994eea7..34c9a73079f 100644
--- a/configuration/boot-environment.nix
+++ b/configuration/boot-environment.nix
@@ -179,11 +179,18 @@ rec {
   };
 
 
+  setuidWrapper = import ../helpers/setuid {
+    inherit (pkgs) stdenv;
+    wrapperDir = "/var/setuid-wrappers";
+  };
+
+
   # The init script of boot stage 2, which is supposed to do
   # everything else to bring up the system.
   bootStage2 = import ../boot/boot-stage-2.nix {
     inherit (pkgs) genericSubstituter buildEnv coreutils findutils
       utillinux kernel udev upstart;
+    inherit setuidWrapper;
     inherit upstartJobs;
     shell = pkgs.bash + "/bin/sh";
 
diff --git a/helpers/setuid/builder.sh b/helpers/setuid/builder.sh
new file mode 100644
index 00000000000..f9e13b1115c
--- /dev/null
+++ b/helpers/setuid/builder.sh
@@ -0,0 +1,5 @@
+source $stdenv/setup
+
+ensureDir $out/bin
+
+gcc -Wall -O2 -DWRAPPER_DIR=\"$wrapperDir\" $setuidWrapper -o $out/bin/setuid-wrapper
diff --git a/helpers/setuid/default.nix b/helpers/setuid/default.nix
new file mode 100644
index 00000000000..412b5ed2208
--- /dev/null
+++ b/helpers/setuid/default.nix
@@ -0,0 +1,8 @@
+{stdenv, wrapperDir}:
+
+stdenv.mkDerivation {
+  name = "setuid-wrapper";
+  builder = ./builder.sh;
+  setuidWrapper = ./setuid-wrapper.c;
+  inherit wrapperDir;
+}
\ No newline at end of file
diff --git a/helpers/setuid/setuid-wrapper.c b/helpers/setuid/setuid-wrapper.c
index 04923896d4e..805ede7e2dd 100644
--- a/helpers/setuid/setuid-wrapper.c
+++ b/helpers/setuid/setuid-wrapper.c
@@ -9,7 +9,7 @@
 
 extern char **environ;
 
-static char * wrapperDir = "/home/root/nixos/helpers/setuid";
+static char * wrapperDir = WRAPPER_DIR;
 
 int main(int argc, char * * argv)
 {
-- 
GitLab


From a66bae7b2f6cbb2a7e1c1c80db5e6d46652d0e68 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 28 Nov 2006 17:40:56 +0000
Subject: [PATCH 0274/5331] * Strip.

svn path=/nixos/trunk/; revision=7164
---
 helpers/setuid/builder.sh | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/helpers/setuid/builder.sh b/helpers/setuid/builder.sh
index f9e13b1115c..574a73ac11c 100644
--- a/helpers/setuid/builder.sh
+++ b/helpers/setuid/builder.sh
@@ -3,3 +3,5 @@ source $stdenv/setup
 ensureDir $out/bin
 
 gcc -Wall -O2 -DWRAPPER_DIR=\"$wrapperDir\" $setuidWrapper -o $out/bin/setuid-wrapper
+
+strip -s $out/bin/setuid-wrapper
-- 
GitLab


From 8532f2be8e7d46485feeef730496a29c1960ae2d Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 28 Nov 2006 22:27:56 +0000
Subject: [PATCH 0275/5331] * Add the X server as an Upstart service.  The X
 server is pure,   except for the fonts, which are still hardcoded.  The
 current   configuration uses the VESA driver, which should work on most  
 machines.  Of course, the configuration should now be generated from   a
 higher-level specification.

svn path=/nixos/trunk/; revision=7165
---
 configuration/boot-environment.nix     |  6 +++
 configuration/system-configuration.nix |  2 +
 upstart-jobs/xserver.conf              | 68 ++++++++++++++++++++++++++
 upstart-jobs/xserver.nix               | 49 +++++++++++++++++++
 4 files changed, 125 insertions(+)
 create mode 100644 upstart-jobs/xserver.conf
 create mode 100644 upstart-jobs/xserver.nix

diff --git a/configuration/boot-environment.nix b/configuration/boot-environment.nix
index 34c9a73079f..cc7dd45bc10 100644
--- a/configuration/boot-environment.nix
+++ b/configuration/boot-environment.nix
@@ -135,6 +135,12 @@ rec {
         inherit (pkgs) openssh;
       })
 
+      # X server.
+      (import ../upstart-jobs/xserver.nix {
+        inherit (pkgs) genericSubstituter;
+        inherit (pkgs.xorg) xorgserver xf86inputkeyboard xf86inputmouse xf86videovesa;
+      })
+
       # Transparent TTY backgrounds.
       (import ../upstart-jobs/tty-backgrounds.nix {
         inherit (pkgs) stdenv splashutils;
diff --git a/configuration/system-configuration.nix b/configuration/system-configuration.nix
index db4482306e4..f080e61078a 100644
--- a/configuration/system-configuration.nix
+++ b/configuration/system-configuration.nix
@@ -31,6 +31,8 @@ with bootEnv;
   
 rec {
 
+  inherit upstartJobs;
+
 
   systemConfiguration = pkgs.stdenv.mkDerivation {
     name = "system-configuration";
diff --git a/upstart-jobs/xserver.conf b/upstart-jobs/xserver.conf
new file mode 100644
index 00000000000..48a89781ec5
--- /dev/null
+++ b/upstart-jobs/xserver.conf
@@ -0,0 +1,68 @@
+Section "Files"
+EndSection
+
+
+Section "ServerFlags"
+  Option       "AllowMouseOpenFail" "on"
+  Option "DontVTSwitch" "off"
+EndSection
+
+
+Section "Module"
+EndSection
+
+
+Section "InputDevice"
+  Driver       "kbd"
+  Identifier   "Keyboard[0]"
+  Option       "Protocol" "Standard"
+  Option       "XkbLayout" "us"
+  Option       "XkbModel" "pc104"
+  Option       "XkbRules" "xfree86"
+EndSection
+
+
+Section "InputDevice"
+  Driver       "mouse"
+  Identifier   "Mouse[0]"
+  Option       "Device" "/dev/mice"
+EndSection
+
+
+Section "Monitor"
+  Identifier   "Monitor[0]"
+  Option       "DPMS"
+  UseModes     "Modes[0]"
+EndSection
+
+
+Section "Modes"
+  Identifier   "Modes[0]"
+EndSection
+
+
+Section "Screen"
+  Identifier   "Screen[0]"
+  Device       "Device[0]"
+  Monitor      "Monitor[0]"
+  DefaultDepth 16
+  SubSection "Display"
+    Depth      16
+    Modes      "1024x768"
+  EndSubSection
+EndSection
+
+
+Section "Device"
+  Identifier   "Device[0]"
+  Driver       "vesa"
+EndSection
+
+
+Section "ServerLayout"
+  Identifier   "Layout[all]"
+  InputDevice  "Keyboard[0]" "CoreKeyboard"
+  InputDevice  "Mouse[0]" "CorePointer"
+  Screen       "Screen[0]"
+EndSection
+
diff --git a/upstart-jobs/xserver.nix b/upstart-jobs/xserver.nix
new file mode 100644
index 00000000000..d654dcffa7e
--- /dev/null
+++ b/upstart-jobs/xserver.nix
@@ -0,0 +1,49 @@
+{ genericSubstituter
+
+, xorgserver
+
+, xf86inputkeyboard
+
+, xf86inputmouse
+
+, xf86videovesa
+
+, # Virtual console for the X server.
+  tty ? 7
+
+, # X display number.
+  display ? 0
+
+}:
+
+let
+
+  config = genericSubstituter {
+    name = "xserver.conf";
+    src = ./xserver.conf;
+  };
+
+in
+
+rec {
+  name = "xserver";
+
+  job = "
+start on network-interfaces
+
+start script
+
+end script
+
+# !!! -ac is a bad idea.
+exec ${xorgserver}/bin/X \\
+    -ac -nolisten tcp -terminate \\
+    -logfile /var/log/X.${toString display}.log \\
+    -fp /var/fonts \\
+    -modulepath ${xorgserver}/lib/xorg/modules,${xf86inputkeyboard}/lib/xorg/modules/input,${xf86inputmouse}/lib/xorg/modules/input,${xf86videovesa}/lib/xorg/modules/drivers \\
+    -config ${config} \\
+    :${toString display} vt${toString tty}
+
+  ";
+  
+}
-- 
GitLab


From 79464e0d9c4523a9221b2d9169ad79c9f6b7a508 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 29 Nov 2006 22:34:59 +0000
Subject: [PATCH 0276/5331] * Don't start X by default.

svn path=/nixos/trunk/; revision=7170
---
 upstart-jobs/xserver.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/upstart-jobs/xserver.nix b/upstart-jobs/xserver.nix
index d654dcffa7e..4a5fb534819 100644
--- a/upstart-jobs/xserver.nix
+++ b/upstart-jobs/xserver.nix
@@ -29,7 +29,7 @@ rec {
   name = "xserver";
 
   job = "
-start on network-interfaces
+#start on network-interfaces
 
 start script
 
-- 
GitLab


From ec764b7c081f419a6c41866ae11730eb27787563 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 29 Nov 2006 23:10:22 +0000
Subject: [PATCH 0277/5331] * Helper script to check for and create accounts.

svn path=/nixos/trunk/; revision=7171
---
 configuration/system-configuration.sh |  1 +
 helpers/accounts.sh                   | 20 ++++++++++++++++++++
 upstart-jobs/sshd.nix                 |  6 ++++--
 3 files changed, 25 insertions(+), 2 deletions(-)
 create mode 100644 helpers/accounts.sh

diff --git a/configuration/system-configuration.sh b/configuration/system-configuration.sh
index fa2e7def257..0020053edf7 100644
--- a/configuration/system-configuration.sh
+++ b/configuration/system-configuration.sh
@@ -26,6 +26,7 @@ if test -n "$grubDevice"; then
         $grub/sbin/grub-install "$grubDevice" --no-floppy --recheck
     fi
 fi
+sync
 EOF
 
 chmod +x $out/bin/switch-to-configuration
diff --git a/helpers/accounts.sh b/helpers/accounts.sh
new file mode 100644
index 00000000000..1e189c56e7f
--- /dev/null
+++ b/helpers/accounts.sh
@@ -0,0 +1,20 @@
+userExists() {
+    local name="$1"
+    if id -u "$name" > /dev/null 2>&1; then
+        return 0 # true
+    else
+        return 1 # false
+    fi
+}
+
+
+createUser() {
+    local name="$1"
+    local password="$2"
+    local uid="$3"
+    local gid="$4"
+    local gecos="$5"
+    local homedir="$6"
+    local shell="$7"
+    echo "$name:$password:$uid:$gid:$gecos:$homedir:$shell" >> /etc/passwd
+}
diff --git a/upstart-jobs/sshd.nix b/upstart-jobs/sshd.nix
index 466c7616f55..3f210467277 100644
--- a/upstart-jobs/sshd.nix
+++ b/upstart-jobs/sshd.nix
@@ -10,6 +10,8 @@ start on network-interfaces/started
 stop on network-interfaces/stop
 
 start script
+    source ${../helpers/accounts.sh}
+
     mkdir -m 0555 -p /var/empty
 
     mkdir -m 0755 -p /etc/ssh
@@ -20,8 +22,8 @@ start script
         ${openssh}/bin/ssh-keygen -t dsa -b 1024 -f /etc/ssh/ssh_host_dsa_key -N ''
     fi
 
-    if ! grep -q '^sshd:' /etc/passwd; then
-        echo 'sshd:x:74:74:SSH privilege separation user:/var/empty:/noshell' >> /etc/passwd
+    if ! userExists sshd; then
+        createUser sshd x 74 74 'SSH privilege separation user' /var/empty /noshell
     fi
 
 end script
-- 
GitLab


From bc3f4f8352b907bcc0e861451e3e2c8327587015 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 29 Nov 2006 23:41:21 +0000
Subject: [PATCH 0278/5331] * Set up Nix so that builds are never performed as
 root, but rather   under nix-build-N.

svn path=/nixos/trunk/; revision=7172
---
 boot/boot-stage-2-init.sh    | 33 ++++++++++++++++++++++++++++++++-
 boot/boot-stage-2.nix        |  2 ++
 installer/nixos-installer.sh |  4 +++-
 3 files changed, 37 insertions(+), 2 deletions(-)

diff --git a/boot/boot-stage-2-init.sh b/boot/boot-stage-2-init.sh
index 262412c9eb4..e5ab202ea14 100644
--- a/boot/boot-stage-2-init.sh
+++ b/boot/boot-stage-2-init.sh
@@ -105,9 +105,18 @@ test -e /etc/login.defs || touch /etc/login.defs
 
 
 # Enable a password-less root login.
+source @accounts@
+
 if ! test -e /etc/passwd; then
-    echo "root::0:0:root:/:@shell@" > /etc/passwd
+    if test -n "@readOnlyRoot@"; then
+        rootHome=/
+    else
+        rootHome=/home/root
+        mkdir -p $rootHome
+    fi
+    createUser root '' 0 0 'System administrator' $rootHome/var/empty @shell@
 fi
+
 if ! test -e /etc/group; then
     echo "root:*:0" > /etc/group
 fi
@@ -118,6 +127,28 @@ echo "127.0.0.1 localhost" > /etc/hosts
 echo "hosts: files dns" > /etc/nsswitch.conf
 
 
+# Set up Nix accounts.
+if test -z "@readOnlyRoot@"; then
+
+    for i in $(seq 1 10); do
+        account=nix-build-$i
+        if ! userExists $account; then
+            createUser $account x \
+                $((i + 30000)) $((i + 30000)) \
+                'Nix build user' /var/empty /noshell
+        fi
+        accounts="$accounts $account"
+    done
+
+    mkdir -p /nix/etc/nix
+    cat > /nix/etc/nix/nix.conf <<EOF
+build-allow-root = false
+build-users = $accounts
+EOF
+
+fi
+
+
 # Set up the Upstart jobs.
 export UPSTART_CFG_DIR=/etc/event.d
 
diff --git a/boot/boot-stage-2.nix b/boot/boot-stage-2.nix
index 9e92194ded7..ec28a5005ae 100644
--- a/boot/boot-stage-2.nix
+++ b/boot/boot-stage-2.nix
@@ -43,4 +43,6 @@ genericSubstituter {
   };
 
   wrapperDir = setuidWrapper.wrapperDir;
+
+  accounts = ../helpers/accounts.sh;
 }
diff --git a/installer/nixos-installer.sh b/installer/nixos-installer.sh
index 04c3c80c212..eb524309046 100644
--- a/installer/nixos-installer.sh
+++ b/installer/nixos-installer.sh
@@ -63,7 +63,6 @@ mkdir -m 0755 -p $mountPoint/var
 # Create the necessary Nix directories on the target device, if they
 # don't already exist.
 mkdir -m 0755 -p \
-    $mountPoint/nix/store \
     $mountPoint/nix/var/nix/gcroots \
     $mountPoint/nix/var/nix/temproots \
     $mountPoint/nix/var/nix/manifests \
@@ -72,6 +71,9 @@ mkdir -m 0755 -p \
     $mountPoint/nix/var/nix/db \
     $mountPoint/nix/var/log/nix/drvs
 
+mkdir -m 1777 -p \
+    $mountPoint/nix/store \
+
 
 # Get the store paths to copy from the references graph.
 storePaths=$(@shell@ @pathsFromGraph@ @nixClosure@)
-- 
GitLab


From f20d572814357ed9eae3f12deaec68687e5bc0cd Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sat, 9 Dec 2006 00:06:18 +0000
Subject: [PATCH 0279/5331] * Multi-user Nix setup has changed.

svn path=/nixos/trunk/; revision=7285
---
 boot/boot-stage-2-init.sh          | 15 ++++++++++-----
 boot/boot-stage-2.nix              |  3 ++-
 configuration/boot-environment.nix |  5 ++---
 3 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/boot/boot-stage-2-init.sh b/boot/boot-stage-2-init.sh
index e5ab202ea14..df5a399b1aa 100644
--- a/boot/boot-stage-2-init.sh
+++ b/boot/boot-stage-2-init.sh
@@ -131,21 +131,26 @@ echo "hosts: files dns" > /etc/nsswitch.conf
 if test -z "@readOnlyRoot@"; then
 
     for i in $(seq 1 10); do
-        account=nix-build-$i
+        account=nixbld$i
         if ! userExists $account; then
             createUser $account x \
-                $((i + 30000)) $((i + 30000)) \
+                $((i + 30000)) 30000 \
                 'Nix build user' /var/empty /noshell
         fi
-        accounts="$accounts $account"
+        accounts="$accounts${accounts:+,}$account"
     done
 
+    if ! grep -q "^nixbld:" /etc/group; then
+        echo "nixbld:*:30000:$accounts" >> /etc/group
+    fi
+
     mkdir -p /nix/etc/nix
     cat > /nix/etc/nix/nix.conf <<EOF
-build-allow-root = false
-build-users = $accounts
+build-users-group = nixbld
 EOF
 
+    chown root.nixbld /nix/store
+    chmod 1775 /nix/store
 fi
 
 
diff --git a/boot/boot-stage-2.nix b/boot/boot-stage-2.nix
index ec28a5005ae..f167731ef28 100644
--- a/boot/boot-stage-2.nix
+++ b/boot/boot-stage-2.nix
@@ -1,5 +1,5 @@
 { genericSubstituter, buildEnv, shell, coreutils, findutils
-, utillinux, kernel, udev, upstart, setuidWrapper
+, gnugrep, utillinux, kernel, udev, upstart, setuidWrapper
 , path ? []
 
 , # Whether the root device is root only.  If so, we'll mount a
@@ -17,6 +17,7 @@ let
   startPath = [
     coreutils
     findutils
+    gnugrep
     utillinux
     udev
     upstart
diff --git a/configuration/boot-environment.nix b/configuration/boot-environment.nix
index cc7dd45bc10..426b639aa33 100644
--- a/configuration/boot-environment.nix
+++ b/configuration/boot-environment.nix
@@ -195,7 +195,7 @@ rec {
   # everything else to bring up the system.
   bootStage2 = import ../boot/boot-stage-2.nix {
     inherit (pkgs) genericSubstituter buildEnv coreutils findutils
-      utillinux kernel udev upstart;
+      gnugrep utillinux kernel udev upstart;
     inherit setuidWrapper;
     inherit upstartJobs;
     shell = pkgs.bash + "/bin/sh";
@@ -207,7 +207,6 @@ rec {
       pkgs.cpio
       pkgs.curl
       pkgs.e2fsprogs
-      pkgs.gnugrep
       pkgs.gnused
       pkgs.gnutar
       pkgs.grub
@@ -243,7 +242,7 @@ rec {
     # The user configuration.
     config = {
       networking = {
-        hostname = "vindaloo";
+        hostname = "nixos";
       };
     };
 
-- 
GitLab


From f049c35a8632b6d249848af01d3183c4b2961a2a Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sat, 9 Dec 2006 02:51:42 +0000
Subject: [PATCH 0280/5331] * More semi-purification of /etc.

svn path=/nixos/trunk/; revision=7290
---
 boot/boot-stage-2-init.sh          | 36 ++++++++-------------
 boot/boot-stage-2.nix              |  6 +++-
 configuration/boot-environment.nix | 51 ++++++++++++++++++++++++++++++
 configuration/etc/hosts            |  1 +
 configuration/etc/issue            |  4 +++
 configuration/etc/login.defs       | 11 +++++++
 configuration/etc/nsswitch.conf    |  8 +++++
 configuration/etc/sshd_config      |  1 +
 configuration/etc/syslog.conf      |  3 ++
 helpers/make-etc.nix               | 11 +++++++
 helpers/make-etc.sh                | 10 ++++++
 upstart-jobs/sshd.nix              |  2 --
 12 files changed, 118 insertions(+), 26 deletions(-)
 create mode 100644 configuration/etc/hosts
 create mode 100644 configuration/etc/issue
 create mode 100644 configuration/etc/login.defs
 create mode 100644 configuration/etc/nsswitch.conf
 create mode 100644 configuration/etc/sshd_config
 create mode 100644 configuration/etc/syslog.conf
 create mode 100644 helpers/make-etc.nix
 create mode 100644 helpers/make-etc.sh

diff --git a/boot/boot-stage-2-init.sh b/boot/boot-stage-2-init.sh
index df5a399b1aa..9645586b4f5 100644
--- a/boot/boot-stage-2-init.sh
+++ b/boot/boot-stage-2-init.sh
@@ -72,6 +72,16 @@ mkdir -m 0755 -p /var/log
 ln -sf /nix/var/nix/profiles /nix/var/nix/gcroots/
 
 
+# Set up the statically computed bits of /etc.
+rm -f /etc/static
+ln -s @etc@/etc /etc/static
+for i in $(cd /etc/static && find * -type l); do
+    mkdir -p /etc/$(dirname $i)
+    rm -f /etc/$i
+    ln -s /etc/static/$i /etc/$i
+done
+
+
 # Ensure that the module tools can find the kernel modules.
 export MODULE_DIR=@kernel@/lib/modules/
 
@@ -95,15 +105,6 @@ udevtrigger
 udevsettle # wait for udev to finish
 
 
-# Necessary configuration for syslogd.
-echo "*.* /dev/tty10" > /etc/syslog.conf
-echo "syslog 514/udp" > /etc/services # required, even if we don't use it
-
-
-# login/su absolutely need this.
-test -e /etc/login.defs || touch /etc/login.defs 
-
-
 # Enable a password-less root login.
 source @accounts@
 
@@ -122,11 +123,6 @@ if ! test -e /etc/group; then
 fi
 
 
-# We need "localhost" (!!! destructive hack for NIXOS-41).
-echo "127.0.0.1 localhost" > /etc/hosts
-echo "hosts: files dns" > /etc/nsswitch.conf
-
-
 # Set up Nix accounts.
 if test -z "@readOnlyRoot@"; then
 
@@ -161,15 +157,6 @@ rm -f /etc/event.d
 ln -sf @upstartJobs@/etc/event.d /etc/event.d
 
 
-# Show a nice greeting on each terminal.
-cat > /etc/issue <<EOF
-
-<<< Welcome to NixOS (\m) - Kernel \r (\l) >>>
-
-
-EOF
-
-
 # Additional path for the interactive shell.
 PATH=@wrapperDir@:@fullPath@/bin:@fullPath@/sbin
 
@@ -177,6 +164,9 @@ cat > /etc/profile <<EOF
 export PATH=$PATH
 export MODULE_DIR=$MODULE_DIR
 export NIX_CONF_DIR=/nix/etc/nix
+if test "\$HOME" != root; then
+    export NIX_REMOTE=daemon
+fi
 
 source $(dirname $(readlink -f $(type -tp nix-env)))/../etc/profile.d/nix.sh
 
diff --git a/boot/boot-stage-2.nix b/boot/boot-stage-2.nix
index f167731ef28..ed157930b5f 100644
--- a/boot/boot-stage-2.nix
+++ b/boot/boot-stage-2.nix
@@ -9,6 +9,10 @@
 , # The Upstart job configuration.
   upstartJobs
 
+, # Static configuration files to be placed (through symlinks) in
+  # /etc.
+  etc
+
 , hostName
 }:
 
@@ -29,7 +33,7 @@ in
 genericSubstituter {
   src = ./boot-stage-2-init.sh;
   isExecutable = true;
-  inherit shell kernel upstart readOnlyRoot upstartJobs hostName;
+  inherit shell kernel upstart readOnlyRoot upstartJobs etc hostName;
   inherit startPath;
 
   # We don't want to put all of `startPath' and `path' in $PATH, since
diff --git a/configuration/boot-environment.nix b/configuration/boot-environment.nix
index 426b639aa33..bb82b9787f5 100644
--- a/configuration/boot-environment.nix
+++ b/configuration/boot-environment.nix
@@ -179,6 +179,56 @@ rec {
     ++ [pkgs.upstart];
   };
 
+
+  etc = import ../helpers/make-etc.nix {
+    inherit (pkgs) stdenv;
+
+    configFiles = [
+
+      { # TCP/UDP port assignments.
+        source = pkgs.iana_etc + "/etc/services";
+        target = "services";
+      }
+
+      { # IP protocol numbers.
+        source = pkgs.iana_etc + "/etc/protocols";
+        target = "protocols";
+      }
+
+      { # Hostname-to-IP mappings.
+        source = ./etc/hosts;
+        target = "hosts";
+      }
+
+      { # Name Service Switch configuration file.  Required by the C library.
+        source = ./etc/nsswitch.conf;
+        target = "nsswitch.conf";
+      }
+
+      { # Configuration file for the system logging daemon.
+        source = ./etc/syslog.conf;
+        target = "syslog.conf";
+      }
+
+      { # Friendly greeting on the virtual consoles.
+        source = ./etc/issue;
+        target = "issue";
+      }
+
+      { # Configuration for pwdutils (login, passwd, useradd, etc.).
+        # You cannot login without it!
+        source = ./etc/login.defs;
+        target = "login.defs";
+      }
+
+      { # SSH daemon configuration.
+        source = ./etc/sshd_config;
+        target = "ssh/sshd_config";
+      }
+    
+    ];
+  };
+
   
   makeJob = import ../upstart-jobs/make-job.nix {
     inherit (pkgs) stdenv;
@@ -198,6 +248,7 @@ rec {
       gnugrep utillinux kernel udev upstart;
     inherit setuidWrapper;
     inherit upstartJobs;
+    inherit etc;
     shell = pkgs.bash + "/bin/sh";
 
     # Additional stuff; add whatever you want here.
diff --git a/configuration/etc/hosts b/configuration/etc/hosts
new file mode 100644
index 00000000000..75721cd5afd
--- /dev/null
+++ b/configuration/etc/hosts
@@ -0,0 +1 @@
+127.0.0.1 localhost
diff --git a/configuration/etc/issue b/configuration/etc/issue
new file mode 100644
index 00000000000..43502e56827
--- /dev/null
+++ b/configuration/etc/issue
@@ -0,0 +1,4 @@
+
+<<< Welcome to NixOS (\m) - Kernel \r (\l) >>>
+
+
diff --git a/configuration/etc/login.defs b/configuration/etc/login.defs
new file mode 100644
index 00000000000..d146275b9f5
--- /dev/null
+++ b/configuration/etc/login.defs
@@ -0,0 +1,11 @@
+DEFAULT_HOME            yes
+
+SYSTEM_UID_MIN            100
+SYSTEM_UID_MAX            499
+UID_MIN                  1000
+UID_MAX                 29999
+
+SYSTEM_GID_MIN            100
+SYSTEM_GID_MAX            499
+GID_MIN                  1000
+GID_MAX                 29999
diff --git a/configuration/etc/nsswitch.conf b/configuration/etc/nsswitch.conf
new file mode 100644
index 00000000000..de9c533f07b
--- /dev/null
+++ b/configuration/etc/nsswitch.conf
@@ -0,0 +1,8 @@
+passwd:         compat
+group:          compat
+
+hosts:          files dns
+networks:       files dns
+
+services:       files
+protocols:      files
diff --git a/configuration/etc/sshd_config b/configuration/etc/sshd_config
new file mode 100644
index 00000000000..33619c72028
--- /dev/null
+++ b/configuration/etc/sshd_config
@@ -0,0 +1 @@
+X11Forwarding yes
diff --git a/configuration/etc/syslog.conf b/configuration/etc/syslog.conf
new file mode 100644
index 00000000000..f89bcc6b2ad
--- /dev/null
+++ b/configuration/etc/syslog.conf
@@ -0,0 +1,3 @@
+*.* /dev/tty10
+
+*.* -/var/log/messages
diff --git a/helpers/make-etc.nix b/helpers/make-etc.nix
new file mode 100644
index 00000000000..9785823248a
--- /dev/null
+++ b/helpers/make-etc.nix
@@ -0,0 +1,11 @@
+{stdenv, configFiles}:
+
+stdenv.mkDerivation {
+  name = "etc";
+
+  builder = ./make-etc.sh;
+
+  /* !!! Use toXML. */
+  sources = map (x: x.source) configFiles;
+  targets = map (x: x.target) configFiles;
+}
diff --git a/helpers/make-etc.sh b/helpers/make-etc.sh
new file mode 100644
index 00000000000..7834d553fdc
--- /dev/null
+++ b/helpers/make-etc.sh
@@ -0,0 +1,10 @@
+source $stdenv/setup
+
+ensureDir $out/etc
+
+sources_=($sources)
+targets_=($targets)
+for ((i = 0; i < ${#targets_[@]}; i++)); do
+    ensureDir $out/etc/$(dirname ${targets_[$i]})
+    ln -s ${sources_[$i]} $out/etc/${targets_[$i]}
+done
diff --git a/upstart-jobs/sshd.nix b/upstart-jobs/sshd.nix
index 3f210467277..d3002f87e25 100644
--- a/upstart-jobs/sshd.nix
+++ b/upstart-jobs/sshd.nix
@@ -16,8 +16,6 @@ start script
 
     mkdir -m 0755 -p /etc/ssh
 
-    echo 'X11Forwarding yes' > /etc/ssh/sshd_config
-
     if ! test -f /etc/ssh/ssh_host_dsa_key; then
         ${openssh}/bin/ssh-keygen -t dsa -b 1024 -f /etc/ssh/ssh_host_dsa_key -N ''
     fi
-- 
GitLab


From 2fe4badb9a4799b96b2de6d8ebf18c9b5e2c9171 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sat, 9 Dec 2006 03:11:14 +0000
Subject: [PATCH 0281/5331] * Start the Nix daemon to enable multi-user package
 management in   NixOS.

svn path=/nixos/trunk/; revision=7291
---
 boot/boot-stage-2-init.sh          |  6 +++++-
 configuration/boot-environment.nix |  5 +++++
 upgrade.sh                         |  2 +-
 upstart-jobs/nix-daemon.nix        | 13 +++++++++++++
 4 files changed, 24 insertions(+), 2 deletions(-)
 create mode 100644 upstart-jobs/nix-daemon.nix

diff --git a/boot/boot-stage-2-init.sh b/boot/boot-stage-2-init.sh
index 9645586b4f5..7e0bee2cdc6 100644
--- a/boot/boot-stage-2-init.sh
+++ b/boot/boot-stage-2-init.sh
@@ -105,6 +105,10 @@ udevtrigger
 udevsettle # wait for udev to finish
 
 
+# !!! Hack - should be done with udev rules.
+chmod 666 /dev/null
+
+
 # Enable a password-less root login.
 source @accounts@
 
@@ -164,7 +168,7 @@ cat > /etc/profile <<EOF
 export PATH=$PATH
 export MODULE_DIR=$MODULE_DIR
 export NIX_CONF_DIR=/nix/etc/nix
-if test "\$HOME" != root; then
+if test "\$USER" != root; then
     export NIX_REMOTE=daemon
 fi
 
diff --git a/configuration/boot-environment.nix b/configuration/boot-environment.nix
index bb82b9787f5..df445fb12db 100644
--- a/configuration/boot-environment.nix
+++ b/configuration/boot-environment.nix
@@ -135,6 +135,11 @@ rec {
         inherit (pkgs) openssh;
       })
 
+      # Nix daemon - required for multi-user Nix.
+      (import ../upstart-jobs/nix-daemon.nix {
+        inherit nix;
+      })
+
       # X server.
       (import ../upstart-jobs/xserver.nix {
         inherit (pkgs) genericSubstituter;
diff --git a/upgrade.sh b/upgrade.sh
index 97dc4fa4826..857b5dc0155 100755
--- a/upgrade.sh
+++ b/upgrade.sh
@@ -1,4 +1,4 @@
 #! /bin/sh
 set -e
-nix-env -p /nix/var/nix/profiles/system -f system-configuration.nix -i -A systemConfiguration
+nix-env -p /nix/var/nix/profiles/system -f configuration/system-configuration.nix -i -A systemConfiguration
 /nix/var/nix/profiles/system/bin/switch-to-configuration
diff --git a/upstart-jobs/nix-daemon.nix b/upstart-jobs/nix-daemon.nix
new file mode 100644
index 00000000000..a730c9e4d84
--- /dev/null
+++ b/upstart-jobs/nix-daemon.nix
@@ -0,0 +1,13 @@
+{nix}:
+
+{
+  name = "nix-daemon";
+  
+  job = "
+    start on startup
+    stop on shutdown
+    set NIX_CONF_DIR=/nix/etc/nix
+    respawn ${nix}/bin/nix-worker --daemon > /dev/null 2>&1
+  ";
+
+}
-- 
GitLab


From af8dc724d18bfcc5d1ea563b81e70fa0fd2466cf Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sat, 9 Dec 2006 18:18:27 +0000
Subject: [PATCH 0282/5331] * Remove symlinks in /etc that are not in the
 current configuration.

svn path=/nixos/trunk/; revision=7293
---
 boot/boot-stage-2-init.sh | 20 ++++++++++++++++----
 1 file changed, 16 insertions(+), 4 deletions(-)

diff --git a/boot/boot-stage-2-init.sh b/boot/boot-stage-2-init.sh
index 7e0bee2cdc6..96d4e086275 100644
--- a/boot/boot-stage-2-init.sh
+++ b/boot/boot-stage-2-init.sh
@@ -73,12 +73,24 @@ ln -sf /nix/var/nix/profiles /nix/var/nix/gcroots/
 
 
 # Set up the statically computed bits of /etc.
-rm -f /etc/static
-ln -s @etc@/etc /etc/static
-for i in $(cd /etc/static && find * -type l); do
+staticEtc=/etc/static
+rm -f $staticEtc
+ln -s @etc@/etc $staticEtc
+for i in $(cd $staticEtc && find * -type l); do
     mkdir -p /etc/$(dirname $i)
     rm -f /etc/$i
-    ln -s /etc/static/$i /etc/$i
+    ln -s $staticEtc/$i /etc/$i
+done
+
+
+# Remove dangling symlinks that point to /etc/static.  These are
+# configuration files that existed in a previous configuration but not
+# in the current one.
+for i in $(find /etc/ -type l); do
+    target=$(readlink "$i")
+    if test "${target:0:${#staticEtc}}" = "$staticEtc" -a ! -e "$i"; then
+        rm -f "$i"
+    fi
 done
 
 
-- 
GitLab


From 9986bda673cf84775d8cb2584e8573cb82553006 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sat, 9 Dec 2006 19:25:23 +0000
Subject: [PATCH 0283/5331] * Move the stuff in boot-stage-2-init.sh that
 doesn't have to happen   at boot time into a separate script.  This will
 allow us to change   the configuration without rebooting (provided that the
 configuration   doesn't have a different kernel, init, etc.).

svn path=/nixos/trunk/; revision=7294
---
 boot/boot-stage-2-init.sh               | 118 +-----------------------
 boot/boot-stage-2.nix                   |  33 +------
 configuration/activate-configuration.sh | 110 ++++++++++++++++++++++
 configuration/boot-environment.nix      | 109 ++++++++++++++--------
 4 files changed, 191 insertions(+), 179 deletions(-)
 create mode 100644 configuration/activate-configuration.sh

diff --git a/boot/boot-stage-2-init.sh b/boot/boot-stage-2-init.sh
index 96d4e086275..824e89a8a75 100644
--- a/boot/boot-stage-2-init.sh
+++ b/boot/boot-stage-2-init.sh
@@ -72,26 +72,9 @@ mkdir -m 0755 -p /var/log
 ln -sf /nix/var/nix/profiles /nix/var/nix/gcroots/
 
 
-# Set up the statically computed bits of /etc.
-staticEtc=/etc/static
-rm -f $staticEtc
-ln -s @etc@/etc $staticEtc
-for i in $(cd $staticEtc && find * -type l); do
-    mkdir -p /etc/$(dirname $i)
-    rm -f /etc/$i
-    ln -s $staticEtc/$i /etc/$i
-done
-
-
-# Remove dangling symlinks that point to /etc/static.  These are
-# configuration files that existed in a previous configuration but not
-# in the current one.
-for i in $(find /etc/ -type l); do
-    target=$(readlink "$i")
-    if test "${target:0:${#staticEtc}}" = "$staticEtc" -a ! -e "$i"; then
-        rm -f "$i"
-    fi
-done
+# Run the script that performs all configuration activation that does
+# not have to be done at boot time.
+source @activateConfiguration@
 
 
 # Ensure that the module tools can find the kernel modules.
@@ -117,103 +100,10 @@ udevtrigger
 udevsettle # wait for udev to finish
 
 
-# !!! Hack - should be done with udev rules.
-chmod 666 /dev/null
-
-
-# Enable a password-less root login.
-source @accounts@
-
-if ! test -e /etc/passwd; then
-    if test -n "@readOnlyRoot@"; then
-        rootHome=/
-    else
-        rootHome=/home/root
-        mkdir -p $rootHome
-    fi
-    createUser root '' 0 0 'System administrator' $rootHome/var/empty @shell@
-fi
-
-if ! test -e /etc/group; then
-    echo "root:*:0" > /etc/group
-fi
-
-
-# Set up Nix accounts.
-if test -z "@readOnlyRoot@"; then
-
-    for i in $(seq 1 10); do
-        account=nixbld$i
-        if ! userExists $account; then
-            createUser $account x \
-                $((i + 30000)) 30000 \
-                'Nix build user' /var/empty /noshell
-        fi
-        accounts="$accounts${accounts:+,}$account"
-    done
-
-    if ! grep -q "^nixbld:" /etc/group; then
-        echo "nixbld:*:30000:$accounts" >> /etc/group
-    fi
-
-    mkdir -p /nix/etc/nix
-    cat > /nix/etc/nix/nix.conf <<EOF
-build-users-group = nixbld
-EOF
-
-    chown root.nixbld /nix/store
-    chmod 1775 /nix/store
-fi
-
-
-# Set up the Upstart jobs.
-export UPSTART_CFG_DIR=/etc/event.d
-
-rm -f /etc/event.d
-ln -sf @upstartJobs@/etc/event.d /etc/event.d
-
-
-# Additional path for the interactive shell.
-PATH=@wrapperDir@:@fullPath@/bin:@fullPath@/sbin
-
-cat > /etc/profile <<EOF
-export PATH=$PATH
-export MODULE_DIR=$MODULE_DIR
-export NIX_CONF_DIR=/nix/etc/nix
-if test "\$USER" != root; then
-    export NIX_REMOTE=daemon
-fi
-
-source $(dirname $(readlink -f $(type -tp nix-env)))/../etc/profile.d/nix.sh
-
-alias ll="ls -l"
-
-if test -f /etc/profile.local; then
-    source /etc/profile.local
-fi
-EOF
-
-
-# Make a few setuid programs work.
-wrapperDir=@wrapperDir@
-if test -d $wrapperDir; then rm -f $wrapperDir/*; fi
-mkdir -p $wrapperDir
-for i in passwd su; do
-    program=$(type -tp $i)
-    cp $(type -tp setuid-wrapper) $wrapperDir/$i
-    echo -n $program > $wrapperDir/$i.real
-    chown root.root $wrapperDir/$i
-    chmod 4755 $wrapperDir/$i
-done
-
-
-# Set the host name.
-hostname @hostName@
-
-
 # Start an interactive shell.
 #exec @shell@
 
 
 # Start Upstart's init.
+export UPSTART_CFG_DIR=/etc/event.d
 exec @upstart@/sbin/init -v
diff --git a/boot/boot-stage-2.nix b/boot/boot-stage-2.nix
index ed157930b5f..051a7105642 100644
--- a/boot/boot-stage-2.nix
+++ b/boot/boot-stage-2.nix
@@ -1,19 +1,10 @@
-{ genericSubstituter, buildEnv, shell, coreutils, findutils
-, gnugrep, utillinux, kernel, udev, upstart, setuidWrapper
-, path ? []
+{ genericSubstituter, shell, coreutils, findutils
+, gnugrep, utillinux, kernel, udev, upstart
+, activateConfiguration
 
 , # Whether the root device is root only.  If so, we'll mount a
   # ramdisk on /etc, /var and so on.
   readOnlyRoot
-
-, # The Upstart job configuration.
-  upstartJobs
-
-, # Static configuration files to be placed (through symlinks) in
-  # /etc.
-  etc
-
-, hostName
 }:
 
 let
@@ -25,7 +16,6 @@ let
     utillinux
     udev
     upstart
-    setuidWrapper
   ];
 
 in
@@ -33,21 +23,6 @@ in
 genericSubstituter {
   src = ./boot-stage-2-init.sh;
   isExecutable = true;
-  inherit shell kernel upstart readOnlyRoot upstartJobs etc hostName;
+  inherit shell kernel upstart readOnlyRoot activateConfiguration;
   inherit startPath;
-
-  # We don't want to put all of `startPath' and `path' in $PATH, since
-  # then we get an embarrassingly long $PATH.  So use the user
-  # environment builder to make a directory with symlinks to those
-  # packages.
-  fullPath = buildEnv {
-    name = "boot-stage-2-path";
-    paths = startPath ++ path;
-    pathsToLink = ["/bin" "/sbin" "/man/man1" "/share/man/man1"];
-    ignoreCollisions = true;
-  };
-
-  wrapperDir = setuidWrapper.wrapperDir;
-
-  accounts = ../helpers/accounts.sh;
 }
diff --git a/configuration/activate-configuration.sh b/configuration/activate-configuration.sh
new file mode 100644
index 00000000000..0aee051503a
--- /dev/null
+++ b/configuration/activate-configuration.sh
@@ -0,0 +1,110 @@
+#! @shell@
+
+
+# !!! Hack - should be done with udev rules.
+chmod 666 /dev/null
+
+
+# Set up the statically computed bits of /etc.
+staticEtc=/etc/static
+rm -f $staticEtc
+ln -s @etc@/etc $staticEtc
+for i in $(cd $staticEtc && find * -type l); do
+    mkdir -p /etc/$(dirname $i)
+    rm -f /etc/$i
+    ln -s $staticEtc/$i /etc/$i
+done
+
+
+# Remove dangling symlinks that point to /etc/static.  These are
+# configuration files that existed in a previous configuration but not
+# in the current one.
+for i in $(find /etc/ -type l); do
+    target=$(readlink "$i")
+    if test "${target:0:${#staticEtc}}" = "$staticEtc" -a ! -e "$i"; then
+        rm -f "$i"
+    fi
+done
+
+
+# Enable a password-less root login.
+source @accounts@
+
+if ! test -e /etc/passwd; then
+    if test -n "@readOnlyRoot@"; then
+        rootHome=/
+    else
+        rootHome=/home/root
+        mkdir -p $rootHome
+    fi
+    createUser root '' 0 0 'System administrator' $rootHome/var/empty @shell@
+fi
+
+if ! test -e /etc/group; then
+    echo "root:*:0" > /etc/group
+fi
+
+
+# Set up Nix accounts.
+if test -z "@readOnlyRoot@"; then
+
+    for i in $(seq 1 10); do
+        account=nixbld$i
+        if ! userExists $account; then
+            createUser $account x \
+                $((i + 30000)) 30000 \
+                'Nix build user' /var/empty /noshell
+        fi
+        accounts="$accounts${accounts:+,}$account"
+    done
+
+    if ! grep -q "^nixbld:" /etc/group; then
+        echo "nixbld:*:30000:$accounts" >> /etc/group
+    fi
+
+    mkdir -p /nix/etc/nix
+    cat > /nix/etc/nix/nix.conf <<EOF
+build-users-group = nixbld
+EOF
+
+    chown root.nixbld /nix/store
+    chmod 1775 /nix/store
+fi
+
+
+# Additional path for the interactive shell.
+PATH=@wrapperDir@:@fullPath@/bin:@fullPath@/sbin
+
+cat > /etc/profile <<EOF
+export PATH=$PATH
+export MODULE_DIR=@kernel@/lib/modules
+export NIX_CONF_DIR=/nix/etc/nix
+if test "\$USER" != root; then
+    export NIX_REMOTE=daemon
+fi
+
+source $(dirname $(readlink -f $(type -tp nix-env)))/../etc/profile.d/nix.sh
+
+alias ll="ls -l"
+
+if test -f /etc/profile.local; then
+    source /etc/profile.local
+fi
+EOF
+
+
+# Make a few setuid programs work.
+wrapperDir=@wrapperDir@
+if test -d $wrapperDir; then rm -f $wrapperDir/*; fi
+mkdir -p $wrapperDir
+for i in passwd su; do
+    program=$(type -tp $i)
+    cp $(type -tp setuid-wrapper) $wrapperDir/$i
+    echo -n $program > $wrapperDir/$i.real
+    chown root.root $wrapperDir/$i
+    chmod 4755 $wrapperDir/$i
+done
+
+
+# Set the host name.
+hostname @hostName@
diff --git a/configuration/boot-environment.nix b/configuration/boot-environment.nix
index df445fb12db..721d21cb668 100644
--- a/configuration/boot-environment.nix
+++ b/configuration/boot-environment.nix
@@ -230,7 +230,12 @@ rec {
         source = ./etc/sshd_config;
         target = "ssh/sshd_config";
       }
-    
+
+      { # The Upstart events defined above.
+        source = upstartJobs + "/etc/event.d";
+        target = "event.d";
+      }
+
     ];
   };
 
@@ -246,47 +251,79 @@ rec {
   };
 
 
+  # The packages you want in the boot environment.
+  fullPath = [
+    pkgs.bash
+    pkgs.bzip2
+    pkgs.coreutils
+    pkgs.cpio
+    pkgs.curl
+    pkgs.e2fsprogs
+    pkgs.findutils
+    pkgs.gnugrep
+    pkgs.gnused
+    pkgs.gnutar
+    pkgs.grub
+    pkgs.gzip
+    pkgs.iputils
+    pkgs.less
+    pkgs.module_init_tools
+    pkgs.nano
+    pkgs.netcat
+    pkgs.nettools
+    pkgs.perl
+    pkgs.procps
+    pkgs.rsync
+    pkgs.shadowutils
+    pkgs.strace
+    pkgs.sysklogd
+    pkgs.udev
+    pkgs.upstart
+    pkgs.utillinux
+#    pkgs.vim
+    nix
+    nixosInstaller
+    setuidWrapper
+  ];
+
+
+  # The script that activates the configuration, i.e., it sets up
+  # /etc, accounts, etc.  It doesn't do anything that can only be done
+  # at boot time (such as start `init').
+  activateConfiguration = pkgs.genericSubstituter {
+    src = ./activate-configuration.sh;
+    isExecutable = true;
+
+    shell = pkgs.bash + "/bin/sh";
+
+    inherit etc;
+    inherit readOnlyRoot;
+    inherit (pkgs) kernel;
+    hostName = config.get ["networking" "hostname"];
+    wrapperDir = setuidWrapper.wrapperDir;
+    accounts = ../helpers/accounts.sh;
+
+    # We don't want to put all of `startPath' and `path' in $PATH, since
+    # then we get an embarrassingly long $PATH.  So use the user
+    # environment builder to make a directory with symlinks to those
+    # packages.
+    fullPath = pkgs.buildEnv {
+      name = "boot-stage-2-path";
+      paths = fullPath;
+      pathsToLink = ["/bin" "/sbin" "/man/man1" "/share/man/man1"];
+      ignoreCollisions = true;
+    };
+  };
+
+
   # The init script of boot stage 2, which is supposed to do
   # everything else to bring up the system.
   bootStage2 = import ../boot/boot-stage-2.nix {
-    inherit (pkgs) genericSubstituter buildEnv coreutils findutils
+    inherit (pkgs) genericSubstituter coreutils findutils
       gnugrep utillinux kernel udev upstart;
-    inherit setuidWrapper;
-    inherit upstartJobs;
-    inherit etc;
     shell = pkgs.bash + "/bin/sh";
-
-    # Additional stuff; add whatever you want here.
-    path = [
-      pkgs.bash
-      pkgs.bzip2
-      pkgs.cpio
-      pkgs.curl
-      pkgs.e2fsprogs
-      pkgs.gnused
-      pkgs.gnutar
-      pkgs.grub
-      pkgs.gzip
-      pkgs.iputils
-      pkgs.less
-      pkgs.module_init_tools
-      pkgs.nano
-      pkgs.netcat
-      pkgs.nettools
-      pkgs.perl
-      pkgs.procps
-      pkgs.rsync
-      pkgs.shadowutils
-      pkgs.strace
-      pkgs.sysklogd
-#      pkgs.vim
-      nix
-      nixosInstaller
-    ];
-
     inherit readOnlyRoot;
-
-    hostName = config.get ["networking" "hostname"];
+    inherit activateConfiguration;
   };
 
 
-- 
GitLab


From 4ac288e7245f9c155aa284f7dc6590859d6c2d10 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sun, 10 Dec 2006 00:04:58 +0000
Subject: [PATCH 0284/5331] * Allow switching to a new configuration without
 rebooting.  However,   we don't stop/start/restart Upstart jobs yet.

svn path=/nixos/trunk/; revision=7297
---
 configuration/system-configuration.nix |  3 ++-
 configuration/system-configuration.sh  | 11 ++++++++++-
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/configuration/system-configuration.nix b/configuration/system-configuration.nix
index f080e61078a..c470dbf1cff 100644
--- a/configuration/system-configuration.nix
+++ b/configuration/system-configuration.nix
@@ -37,9 +37,10 @@ rec {
   systemConfiguration = pkgs.stdenv.mkDerivation {
     name = "system-configuration";
     builder = ./system-configuration.sh;
-    inherit (pkgs) grub coreutils gnused gnugrep diffutils;
+    inherit (pkgs) grub coreutils gnused gnugrep diffutils findutils;
     inherit grubDevice;
     inherit bootStage2;
+    inherit activateConfiguration;
     inherit grubMenuBuilder;
     kernel = pkgs.kernel + "/vmlinuz";
     initrd = initialRamdisk + "/initrd";
diff --git a/configuration/system-configuration.sh b/configuration/system-configuration.sh
index 0020053edf7..72cbe430e5d 100644
--- a/configuration/system-configuration.sh
+++ b/configuration/system-configuration.sh
@@ -6,6 +6,7 @@ ln -s $kernel $out/kernel
 ln -s $grub $out/grub
 ln -s $bootStage2 $out/init
 ln -s $initrd $out/initrd
+ln -s $activateConfiguration $out/activate
 echo "$extraKernelParams" > $out/kernel-params
 
 cat > $out/menu.lst << GRUBEND
@@ -18,7 +19,8 @@ ensureDir $out/bin
 cat > $out/bin/switch-to-configuration <<EOF
 #! $SHELL
 set -e
-export PATH=$coreutils/bin:$gnused/bin:$gnugrep/bin:$diffutils/bin
+export PATH=$coreutils/bin:$gnused/bin:$gnugrep/bin:$diffutils/bin:$findutils/bin
+
 if test -n "$grubDevice"; then
     mkdir -m 0700 -p /boot/grub
     $grubMenuBuilder $out
@@ -26,6 +28,13 @@ if test -n "$grubDevice"; then
         $grub/sbin/grub-install "$grubDevice" --no-floppy --recheck
     fi
 fi
+
+if test "\$activateNow" = "1"; then
+    echo "Activating the configuration..."
+    $out/activate
+    kill -TERM 1 # make Upstart reload its events    
+fi
+
 sync
 EOF
 
-- 
GitLab


From acf656125cdbdd7cfbafb8aba577524ff7e14ea8 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sun, 10 Dec 2006 22:29:44 +0000
Subject: [PATCH 0285/5331] * Lots of refactoring. * Clear the PATH in most
 scripts.  This helps to ensure purity.

svn path=/nixos/trunk/; revision=7299
---
 boot/boot-stage-1-init.sh                |  4 +--
 boot/boot-stage-1.nix                    |  6 ++--
 boot/boot-stage-2-init.sh                | 22 +++++---------
 boot/boot-stage-2.nix                    | 13 +++++----
 boot/make-initrd.sh                      |  2 +-
 configuration/activate-configuration.sh  | 25 ++++++++++++++--
 configuration/boot-environment.nix       | 27 ++++++++++-------
 configuration/switch-to-configuration.sh | 37 ++++++++++++++++++++++++
 configuration/system-configuration.nix   |  9 ++++--
 configuration/system-configuration.sh    | 26 ++---------------
 installer/grub-menu-builder.sh           |  3 ++
 installer/nixos-installer.nix            |  7 ++---
 upgrade.sh                               |  2 +-
 upstart-jobs/dhclient.nix                |  4 +--
 upstart-jobs/xserver.nix                 |  4 +--
 15 files changed, 117 insertions(+), 74 deletions(-)
 create mode 100644 configuration/switch-to-configuration.sh

diff --git a/boot/boot-stage-1-init.sh b/boot/boot-stage-1-init.sh
index d62bd157975..e3b26127d46 100644
--- a/boot/boot-stage-1-init.sh
+++ b/boot/boot-stage-1-init.sh
@@ -1,9 +1,9 @@
-#! @shell@
+#! @staticShell@
 
 fail() {
     # If starting stage 2 failed, start an interactive shell.
     echo "Stage 2 failed, starting emergency shell..."
-    exec @shell@
+    exec @staticShell@
 }
 
 
diff --git a/boot/boot-stage-1.nix b/boot/boot-stage-1.nix
index ef1ebfc7225..f8b84eb6fdb 100644
--- a/boot/boot-stage-1.nix
+++ b/boot/boot-stage-1.nix
@@ -4,7 +4,7 @@
 # the second boot stage.  The closure of the result of this expression
 # is supposed to be put into an initial RAM disk (initrd).
 
-{ genericSubstituter, shell, staticTools
+{ substituteAll, staticShell, staticTools
 , module_init_tools, extraUtils, modules
 
 , # Whether to find root device automatically using its label.
@@ -24,10 +24,10 @@
 assert !autoDetectRootDevice -> rootDevice != "";
 assert autoDetectRootDevice -> rootLabel != "";
 
-genericSubstituter {
+substituteAll {
   src = ./boot-stage-1-init.sh;
   isExecutable = true;
-  inherit shell modules;
+  inherit staticShell modules;
   inherit autoDetectRootDevice rootDevice rootLabel;
   path = [
     staticTools
diff --git a/boot/boot-stage-2-init.sh b/boot/boot-stage-2-init.sh
index 824e89a8a75..4a4a5f6f7e2 100644
--- a/boot/boot-stage-2-init.sh
+++ b/boot/boot-stage-2-init.sh
@@ -63,32 +63,24 @@ needWritableDir /tmp 01777
 needWritableDir /var 0755
 needWritableDir /nix/var 0755
 
-mkdir -m 0755 -p /nix/var/nix/db
-mkdir -m 0755 -p /nix/var/nix/gcroots
-mkdir -m 0755 -p /nix/var/nix/temproots
 
-mkdir -m 0755 -p /var/log
+# Miscellaneous boot time cleanup.
+rm -rf /var/run
+
 
-ln -sf /nix/var/nix/profiles /nix/var/nix/gcroots/
+# Create the minimal device nodes needed before we run udev.
+mknod -m 0666 /dev/null c 1 3
 
 
 # Run the script that performs all configuration activation that does
 # not have to be done at boot time.
-source @activateConfiguration@
+@activateConfiguration@
 
 
 # Ensure that the module tools can find the kernel modules.
 export MODULE_DIR=@kernel@/lib/modules/
 
 
-# Miscellaneous cleanup.
-rm -rf /var/run
-mkdir -m 0755 -p /var/run
-
-echo -n > /var/run/utmp # must exist
-chmod 664 /var/run/utmp
-
-
 # Start udev.
 udevd --daemon
 
@@ -106,4 +98,6 @@ udevsettle # wait for udev to finish
 
 # Start Upstart's init.
 export UPSTART_CFG_DIR=/etc/event.d
+export PATH=/empty
+for i in @upstartPath@; do PATH=$PATH:$i/bin; done
 exec @upstart@/sbin/init -v
diff --git a/boot/boot-stage-2.nix b/boot/boot-stage-2.nix
index 051a7105642..f501c12017f 100644
--- a/boot/boot-stage-2.nix
+++ b/boot/boot-stage-2.nix
@@ -1,18 +1,19 @@
-{ genericSubstituter, shell, coreutils, findutils
-, gnugrep, utillinux, kernel, udev, upstart
+{ substituteAll, coreutils
+, utillinux, kernel, udev, upstart
 , activateConfiguration
 
 , # Whether the root device is root only.  If so, we'll mount a
   # ramdisk on /etc, /var and so on.
   readOnlyRoot
+
+, # Path for Upstart jobs.  Should be quite minimal.
+  upstartPath
 }:
 
 let
 
   startPath = [
     coreutils
-    findutils
-    gnugrep
     utillinux
     udev
     upstart
@@ -20,9 +21,9 @@ let
 
 in
 
-genericSubstituter {
+substituteAll {
   src = ./boot-stage-2-init.sh;
   isExecutable = true;
-  inherit shell kernel upstart readOnlyRoot activateConfiguration;
+  inherit kernel upstart readOnlyRoot activateConfiguration upstartPath;
   inherit startPath;
 }
diff --git a/boot/make-initrd.sh b/boot/make-initrd.sh
index 8d07300466b..45ee036e4e8 100644
--- a/boot/make-initrd.sh
+++ b/boot/make-initrd.sh
@@ -35,7 +35,7 @@ for ((n = 0; n < ${#objects[*]}; n++)); do
     mkdir -p $(dirname root/$symlink)
     ln -s $object$suffix root/$symlink
 done
-    
+
 
 # Put the closure in a gzipped cpio archive.
 ensureDir $out
diff --git a/configuration/activate-configuration.sh b/configuration/activate-configuration.sh
index 0aee051503a..a6971c9f7fc 100644
--- a/configuration/activate-configuration.sh
+++ b/configuration/activate-configuration.sh
@@ -1,8 +1,7 @@
 #! @shell@
 
-
-# !!! Hack - should be done with udev rules.
-chmod 666 /dev/null
+export PATH=/empty
+for i in @path@; do PATH=$PATH:$i/bin; done
 
 
 # Set up the statically computed bits of /etc.
@@ -27,6 +26,15 @@ for i in $(find /etc/ -type l); do
 done
 
 
+# Various log directories.
+mkdir -m 0755 -p /var/run
+
+echo -n > /var/run/utmp # must exist
+chmod 664 /var/run/utmp
+
+mkdir -m 0755 -p /var/log
+
+
 # Enable a password-less root login.
 source @accounts@
 
@@ -93,6 +101,17 @@ fi
 EOF
 
 
+# Nix initialisation.
+mkdir -m 0755 -p /nix/var/nix/db
+mkdir -m 0755 -p /nix/var/nix/gcroots
+mkdir -m 0755 -p /nix/var/nix/temproots
+
+ln -sf /nix/var/nix/profiles /nix/var/nix/gcroots/
+
+chown root.nixbld /nix/store
+chmod 1775 /nix/store
+
+
 # Make a few setuid programs work.
 wrapperDir=@wrapperDir@
 if test -d $wrapperDir; then rm -f $wrapperDir/*; fi
diff --git a/configuration/boot-environment.nix b/configuration/boot-environment.nix
index 721d21cb668..f6890108774 100644
--- a/configuration/boot-environment.nix
+++ b/configuration/boot-environment.nix
@@ -64,13 +64,13 @@ rec {
   # The init script of boot stage 1 (loading kernel modules for
   # mounting the root FS).
   bootStage1 = import ../boot/boot-stage-1.nix {
-    inherit (pkgs) genericSubstituter;
+    inherit (pkgs) substituteAll;
     inherit (pkgsDiet) module_init_tools;
     inherit extraUtils;
     inherit autoDetectRootDevice rootDevice rootLabel;
     inherit stage2Init;
     modules = modulesClosure;
-    shell = stdenvLinuxStuff.bootstrapTools.bash;
+    staticShell = stdenvLinuxStuff.bootstrapTools.bash;
     staticTools = stdenvLinuxStuff.staticTools;
   };
   
@@ -99,9 +99,8 @@ rec {
 
   # The installer.
   nixosInstaller = import ../installer/nixos-installer.nix {
-    inherit (pkgs) stdenv genericSubstituter;
+    inherit (pkgs) stdenv substituteAll;
     inherit nix;
-    shell = pkgs.bash + "/bin/sh";
   };
 
 
@@ -127,6 +126,7 @@ rec {
       
       # DHCP client.
       (import ../upstart-jobs/dhclient.nix {
+        inherit (pkgs) nettools;
         dhcp = pkgs.dhcpWrapper;
       })
 
@@ -142,7 +142,7 @@ rec {
 
       # X server.
       (import ../upstart-jobs/xserver.nix {
-        inherit (pkgs) genericSubstituter;
+        inherit (pkgs) substituteAll;
         inherit (pkgs.xorg) xorgserver xf86inputkeyboard xf86inputmouse xf86videovesa;
       })
 
@@ -290,12 +290,10 @@ rec {
   # The script that activates the configuration, i.e., it sets up
   # /etc, accounts, etc.  It doesn't do anything that can only be done
   # at boot time (such as start `init').
-  activateConfiguration = pkgs.genericSubstituter {
+  activateConfiguration = pkgs.substituteAll {
     src = ./activate-configuration.sh;
     isExecutable = true;
 
-    shell = pkgs.bash + "/bin/sh";
-
     inherit etc;
     inherit readOnlyRoot;
     inherit (pkgs) kernel;
@@ -303,6 +301,8 @@ rec {
     wrapperDir = setuidWrapper.wrapperDir;
     accounts = ../helpers/accounts.sh;
 
+    path = [pkgs.coreutils pkgs.gnugrep pkgs.findutils];
+
     # We don't want to put all of `startPath' and `path' in $PATH, since
     # then we get an embarrassingly long $PATH.  So use the user
     # environment builder to make a directory with symlinks to those
@@ -319,11 +319,16 @@ rec {
   # The init script of boot stage 2, which is supposed to do
   # everything else to bring up the system.
   bootStage2 = import ../boot/boot-stage-2.nix {
-    inherit (pkgs) genericSubstituter coreutils findutils
-      gnugrep utillinux kernel udev upstart;
-    shell = pkgs.bash + "/bin/sh";
+    inherit (pkgs) substituteAll coreutils 
+      utillinux kernel udev upstart;
     inherit readOnlyRoot;
     inherit activateConfiguration;
+    upstartPath = [
+      pkgs.coreutils
+      pkgs.findutils
+      pkgs.gnugrep
+      pkgs.gnused
+    ];
   };
 
 
diff --git a/configuration/switch-to-configuration.sh b/configuration/switch-to-configuration.sh
new file mode 100644
index 00000000000..8c03311a7c5
--- /dev/null
+++ b/configuration/switch-to-configuration.sh
@@ -0,0 +1,37 @@
+#! @shell@
+
+set -e
+export PATH=/empty
+for i in @path@; do PATH=$PATH:$i/bin; done
+action="$1"
+
+if test -z "$action"; then
+    cat <<EOF
+Usage: $0 [switch|boot|test]
+
+switch: make the configuration the boot default and activate now
+boot:   make the configuration the boot default
+test:   activate the configuration, but don't make it the boot default
+EOF
+    exit 1
+fi
+
+if test "$action" = "switch" -o "$action" = "boot"; then
+    if test -n "@grubDevice@"; then
+        mkdir -m 0700 -p /boot/grub
+        @grubMenuBuilder@ @out@
+        if test "$NIXOS_INSTALL_GRUB" = 1; then
+            @grub@/sbin/grub-install "@grubDevice@" --no-floppy --recheck
+        fi
+    else
+        echo "Warning: don't know how to make this configuration bootable" 1>&2
+    fi
+fi
+
+if test "$action" = "switch" -o "$action" = "test"; then
+    echo "Activating the configuration..."
+    @out@/activate
+    kill -TERM 1 # make Upstart reload its events    
+fi
+
+sync
diff --git a/configuration/system-configuration.nix b/configuration/system-configuration.nix
index c470dbf1cff..39b4f961f16 100644
--- a/configuration/system-configuration.nix
+++ b/configuration/system-configuration.nix
@@ -34,24 +34,29 @@ rec {
   inherit upstartJobs;
 
 
-  systemConfiguration = pkgs.stdenv.mkDerivation {
+  systemConfiguration = pkgs.stdenvNew.mkDerivation {
     name = "system-configuration";
     builder = ./system-configuration.sh;
+    switchToConfiguration = ./switch-to-configuration.sh;
     inherit (pkgs) grub coreutils gnused gnugrep diffutils findutils;
     inherit grubDevice;
     inherit bootStage2;
     inherit activateConfiguration;
     inherit grubMenuBuilder;
+    inherit etc;
     kernel = pkgs.kernel + "/vmlinuz";
     initrd = initialRamdisk + "/initrd";
     inherit extraKernelParams;
+    # Most of these are needed by grub-install.
+    path = [pkgs.coreutils pkgs.gnused pkgs.gnugrep pkgs.findutils pkgs.diffutils];
   };
 
 
-  grubMenuBuilder = pkgs.genericSubstituter {
+  grubMenuBuilder = pkgs.substituteAll {
     src = ../installer/grub-menu-builder.sh;
     isExecutable = true;
     inherit (pkgs) bash;
+    path = [pkgs.coreutils pkgs.gnused pkgs.gnugrep];
   };
 
 
diff --git a/configuration/system-configuration.sh b/configuration/system-configuration.sh
index 72cbe430e5d..e1f240e218f 100644
--- a/configuration/system-configuration.sh
+++ b/configuration/system-configuration.sh
@@ -7,6 +7,8 @@ ln -s $grub $out/grub
 ln -s $bootStage2 $out/init
 ln -s $initrd $out/initrd
 ln -s $activateConfiguration $out/activate
+ln -s $etc/etc $out/etc
+
 echo "$extraKernelParams" > $out/kernel-params
 
 cat > $out/menu.lst << GRUBEND
@@ -15,27 +17,5 @@ initrd $initrd
 GRUBEND
 
 ensureDir $out/bin
-
-cat > $out/bin/switch-to-configuration <<EOF
-#! $SHELL
-set -e
-export PATH=$coreutils/bin:$gnused/bin:$gnugrep/bin:$diffutils/bin:$findutils/bin
-
-if test -n "$grubDevice"; then
-    mkdir -m 0700 -p /boot/grub
-    $grubMenuBuilder $out
-    if test "\$NIXOS_INSTALL_GRUB" = 1; then
-        $grub/sbin/grub-install "$grubDevice" --no-floppy --recheck
-    fi
-fi
-
-if test "\$activateNow" = "1"; then
-    echo "Activating the configuration..."
-    $out/activate
-    kill -TERM 1 # make Upstart reload its events    
-fi
-
-sync
-EOF
-
+substituteAll $switchToConfiguration $out/bin/switch-to-configuration
 chmod +x $out/bin/switch-to-configuration
diff --git a/installer/grub-menu-builder.sh b/installer/grub-menu-builder.sh
index 36fc0b05e12..cc678212a8c 100644
--- a/installer/grub-menu-builder.sh
+++ b/installer/grub-menu-builder.sh
@@ -1,5 +1,8 @@
 #! @bash@/bin/sh -e
 
+export PATH=/empty
+for i in @path@; do PATH=$PATH:$i/bin; done
+
 default=$1
 if test -z "$1"; then
     echo "Syntax: grub-menu-builder.sh <DEFAULT-CONFIG>"
diff --git a/installer/nixos-installer.nix b/installer/nixos-installer.nix
index 818b3e19887..783a48f40a9 100644
--- a/installer/nixos-installer.nix
+++ b/installer/nixos-installer.nix
@@ -1,11 +1,10 @@
-{ stdenv, genericSubstituter, shell, nix
-}:
+{stdenv, substituteAll, nix}:
 
-genericSubstituter {
+substituteAll {
   src = ./nixos-installer.sh;
   dir = "bin";
   isExecutable = true;
-  inherit shell nix;
+  inherit nix;
 
   pathsFromGraph = ../helpers/paths-from-graph.sh;
 
diff --git a/upgrade.sh b/upgrade.sh
index 857b5dc0155..961bc1959ef 100755
--- a/upgrade.sh
+++ b/upgrade.sh
@@ -1,4 +1,4 @@
 #! /bin/sh
 set -e
 nix-env -p /nix/var/nix/profiles/system -f configuration/system-configuration.nix -i -A systemConfiguration
-/nix/var/nix/profiles/system/bin/switch-to-configuration
+/nix/var/nix/profiles/system/bin/switch-to-configuration switch
diff --git a/upstart-jobs/dhclient.nix b/upstart-jobs/dhclient.nix
index 7ccc87615ad..3b8161820d8 100644
--- a/upstart-jobs/dhclient.nix
+++ b/upstart-jobs/dhclient.nix
@@ -1,4 +1,4 @@
-{dhcp}:
+{dhcp, nettools}:
 
 {
   name = "dhclient";
@@ -23,7 +23,7 @@ script
     #    fi
     #done
 
-    for i in $(ifconfig | grep '^[^ ]' | sed 's/ .*//'); do
+    for i in $(${nettools}/sbin/ifconfig | grep '^[^ ]' | sed 's/ .*//'); do
         if test \"$i\" != \"lo\"; then
             interfaces=\"$interfaces $i\"
         fi
diff --git a/upstart-jobs/xserver.nix b/upstart-jobs/xserver.nix
index 4a5fb534819..8979092cbc2 100644
--- a/upstart-jobs/xserver.nix
+++ b/upstart-jobs/xserver.nix
@@ -1,4 +1,4 @@
-{ genericSubstituter
+{ substituteAll
 
 , xorgserver
 
@@ -18,7 +18,7 @@
 
 let
 
-  config = genericSubstituter {
+  config = substituteAll {
     name = "xserver.conf";
     src = ./xserver.conf;
   };
-- 
GitLab


From c063ea2bfa56245100b3971376c0f9231b9d2722 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sun, 10 Dec 2006 22:43:04 +0000
Subject: [PATCH 0286/5331] * Use runCommand.

svn path=/nixos/trunk/; revision=7300
---
 configuration/boot-environment.nix | 22 +++++++++-----------
 installer/nixos-installer.nix      | 10 ++++-----
 instances/rescue-cd.nix            | 33 +++++++++++-------------------
 upstart-jobs/gather.nix            | 14 ++++---------
 upstart-jobs/make-job.nix          |  9 +++-----
 5 files changed, 33 insertions(+), 55 deletions(-)

diff --git a/configuration/boot-environment.nix b/configuration/boot-environment.nix
index f6890108774..c9e01d1773f 100644
--- a/configuration/boot-environment.nix
+++ b/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 {
-    name = "extra-utils";
-    builder = builtins.toFile "builder.sh" "
-      source $stdenv/setup
+  extraUtils = pkgs.runCommand "extra-utils"
+    { buildInputs = [pkgs.nukeReferences];
+      inherit (pkgsStatic) utillinux;
+      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;
   };
 
 
diff --git a/installer/nixos-installer.nix b/installer/nixos-installer.nix
index 783a48f40a9..651efeabeb5 100644
--- a/installer/nixos-installer.nix
+++ b/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 {
-    name = "closure";
-    exportReferencesGraph = ["refs" nix];
-    builder = builtins.toFile "builder.sh" "source $stdenv/setup; cp refs $out";
-  };
+  nixClosure = runCommand "closure"
+    {exportReferencesGraph = ["refs" nix];}
+    "cp refs $out";
 }
diff --git a/instances/rescue-cd.nix b/instances/rescue-cd.nix
index a8a88836911..bfe4dca3fd1 100644
--- a/instances/rescue-cd.nix
+++ b/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 {
-    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}
-    ";
-  };
+  cdMountPoints = pkgs.runCommand "mount-points" {} "
+    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 {  
-    name = "tarball";
-    inherit tarName input;
-    builder = builtins.toFile "builder.sh" "
-      source $stdenv/setup
-      ensureDir $out
-      (cd $input && tar cvfj $out/$tarName . \\
-        --exclude '*~' --exclude '.svn' \\
-        --exclude 'pkgs' --exclude 'result')
-    ";
-  };
+  makeTarball = tarName: input: pkgs.runCommand "tarball" "
+    ensureDir $out
+    (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
diff --git a/upstart-jobs/gather.nix b/upstart-jobs/gather.nix
index 914c78e7a89..47193167360 100644
--- a/upstart-jobs/gather.nix
+++ b/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 {
-  name = "upstart-jobs";
-
-  inherit jobs;
-
-  builder = builtins.toFile "builder.sh" "
-    source $stdenv/setup
+runCommand "upstart-jobs" {inherit jobs;}
+  "
     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
-  ";
-}
+  "
diff --git a/upstart-jobs/make-job.nix b/upstart-jobs/make-job.nix
index 3995a8f21aa..630ae1d83e1 100644
--- a/upstart-jobs/make-job.nix
+++ b/upstart-jobs/make-job.nix
@@ -1,7 +1,4 @@
-{stdenv}: job:
+{runCommand}: job:
 
-stdenv.mkDerivation {
-  inherit (job) name job;
-  builder = builtins.toFile "builder.sh"
-    "source $stdenv/setup; ensureDir $out/etc/event.d; echo \"$job\" > $out/etc/event.d/$name";
-}
+runCommand job.name {inherit (job) job;}
+  "ensureDir $out/etc/event.d; echo \"$job\" > $out/etc/event.d/$name"
-- 
GitLab


From 578b56d3c6fa4c47e5b2a98b840c2f0ec3c20204 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 11 Dec 2006 00:52:36 +0000
Subject: [PATCH 0287/5331] * Make halt/reboot work again (umount and reboot
 were no longer in   $PATH).

* Use the login from pam_login instead of shadowutils.

svn path=/nixos/trunk/; revision=7302
---
 boot/boot-stage-2-init.sh          | 22 +++++++++++++---------
 boot/boot-stage-2.nix              | 16 +++++-----------
 configuration/boot-environment.nix |  5 +++--
 upstart-jobs/halt.nix              |  4 +++-
 upstart-jobs/mingetty.nix          |  4 ++--
 5 files changed, 26 insertions(+), 25 deletions(-)

diff --git a/boot/boot-stage-2-init.sh b/boot/boot-stage-2-init.sh
index 4a4a5f6f7e2..a3387fbac57 100644
--- a/boot/boot-stage-2-init.sh
+++ b/boot/boot-stage-2-init.sh
@@ -10,13 +10,18 @@ echo
 
 
 # Set the PATH.
-export PATH=/empty
-for i in @startPath@; do
-    PATH=$PATH:$i/bin
-    if test -e $i/sbin; then
-        PATH=$PATH:$i/sbin
-    fi
-done
+setPath() {
+    local dirs="$1"
+    export PATH=/empty
+    for i in $dirs; do
+        PATH=$PATH:$i/bin
+        if test -e $i/sbin; then
+            PATH=$PATH:$i/sbin
+        fi
+    done
+}
+
+setPath "@path@"
 
 
 # Mount special file systems.
@@ -98,6 +103,5 @@ udevsettle # wait for udev to finish
 
 # Start Upstart's init.
 export UPSTART_CFG_DIR=/etc/event.d
-export PATH=/empty
-for i in @upstartPath@; do PATH=$PATH:$i/bin; done
+setPath "@upstartPath@"
 exec @upstart@/sbin/init -v
diff --git a/boot/boot-stage-2.nix b/boot/boot-stage-2.nix
index f501c12017f..8772759aaf4 100644
--- a/boot/boot-stage-2.nix
+++ b/boot/boot-stage-2.nix
@@ -10,20 +10,14 @@
   upstartPath
 }:
 
-let
-
-  startPath = [
+substituteAll {
+  src = ./boot-stage-2-init.sh;
+  isExecutable = true;
+  inherit kernel upstart readOnlyRoot activateConfiguration upstartPath;
+  path = [
     coreutils
     utillinux
     udev
     upstart
   ];
-
-in
-
-substituteAll {
-  src = ./boot-stage-2-init.sh;
-  isExecutable = true;
-  inherit kernel upstart readOnlyRoot activateConfiguration upstartPath;
-  inherit startPath;
 }
diff --git a/configuration/boot-environment.nix b/configuration/boot-environment.nix
index c9e01d1773f..5ffe9576026 100644
--- a/configuration/boot-environment.nix
+++ b/configuration/boot-environment.nix
@@ -163,7 +163,7 @@ rec {
     # Handles the reboot/halt events.
     ++ (map
       (event: makeJob (import ../upstart-jobs/halt.nix {
-        inherit (pkgs) bash;
+        inherit (pkgs) bash utillinux;
         inherit event;
       }))
       ["reboot" "halt" "system-halt" "power-off"]
@@ -172,7 +172,7 @@ rec {
     # The terminals on ttyX.
     ++ (map 
       (ttyNumber: makeJob (import ../upstart-jobs/mingetty.nix {
-        mingetty = pkgs.mingettyWrapper;
+        inherit (pkgs) mingetty pam_login;
         inherit ttyNumber;
       }))
       [1 2 3 4 5 6]
@@ -326,6 +326,7 @@ rec {
       pkgs.findutils
       pkgs.gnugrep
       pkgs.gnused
+      pkgs.upstart
     ];
   };
 
diff --git a/upstart-jobs/halt.nix b/upstart-jobs/halt.nix
index 58be12db69c..6e4e833f643 100644
--- a/upstart-jobs/halt.nix
+++ b/upstart-jobs/halt.nix
@@ -1,4 +1,4 @@
-{bash, event}:
+{bash, event, utillinux}:
 
 assert event == "reboot"
     || event == "halt"
@@ -17,6 +17,8 @@ script
     echo \"<<< SYSTEM SHUTDOWN >>>\"
     echo \"\"
 
+    export PATH=${utillinux}/bin:$PATH
+
     # Do an initial sync just in case.
     sync || true
 
diff --git a/upstart-jobs/mingetty.nix b/upstart-jobs/mingetty.nix
index cdce937535c..f67a8ced92c 100644
--- a/upstart-jobs/mingetty.nix
+++ b/upstart-jobs/mingetty.nix
@@ -1,10 +1,10 @@
-{mingetty, ttyNumber}:
+{mingetty, pam_login, ttyNumber}:
 
 {
   name = "tty" + toString ttyNumber;
   job = "
     start on startup
     stop on shutdown
-    respawn ${mingetty}/sbin/mingetty --noclear tty${toString ttyNumber}
+    respawn ${mingetty}/sbin/mingetty --loginprog=${pam_login}/bin/login --noclear tty${toString ttyNumber}
   ";
 }
-- 
GitLab


From 06256e22d80978882939471383e7108488198fde Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 11 Dec 2006 01:03:26 +0000
Subject: [PATCH 0288/5331] * A script to test configurations, i.e., make them
 current without   making them the boot default.  So if we screw up, we can
 just reset   to get back to normal.

svn path=/nixos/trunk/; revision=7303
---
 configuration/boot-environment.nix | 2 +-
 test.sh                            | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)
 create mode 100755 test.sh

diff --git a/configuration/boot-environment.nix b/configuration/boot-environment.nix
index 5ffe9576026..4c4092bf3c9 100644
--- a/configuration/boot-environment.nix
+++ b/configuration/boot-environment.nix
@@ -271,8 +271,8 @@ rec {
     pkgs.nettools
     pkgs.perl
     pkgs.procps
+    pkgs.pwdutils
     pkgs.rsync
-    pkgs.shadowutils
     pkgs.strace
     pkgs.sysklogd
     pkgs.udev
diff --git a/test.sh b/test.sh
new file mode 100755
index 00000000000..6bb66bf742e
--- /dev/null
+++ b/test.sh
@@ -0,0 +1,4 @@
+#! /bin/sh
+set -e
+nix-build configuration/system-configuration.nix -A systemConfiguration -K -k
+./result/bin/switch-to-configuration test
-- 
GitLab


From f327b072cb8446a44b0b7de7076f79247a29868e Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 11 Dec 2006 02:44:26 +0000
Subject: [PATCH 0289/5331] * Very basic PAM configuration.  We now use
 Blowfish hashing for   /etc/shadow.

svn path=/nixos/trunk/; revision=7306
---
 configuration/boot-environment.nix | 26 +++++++++++++++++++++++++-
 configuration/etc/default/passwd   | 15 +++++++++++++++
 configuration/etc/pam.d/login      |  4 ++++
 configuration/etc/pam.d/other      |  8 ++++++++
 configuration/etc/pam.d/passwd     |  4 ++++
 configuration/etc/pam.d/useradd    |  5 +++++
 6 files changed, 61 insertions(+), 1 deletion(-)
 create mode 100644 configuration/etc/default/passwd
 create mode 100644 configuration/etc/pam.d/login
 create mode 100644 configuration/etc/pam.d/other
 create mode 100644 configuration/etc/pam.d/passwd
 create mode 100644 configuration/etc/pam.d/useradd

diff --git a/configuration/boot-environment.nix b/configuration/boot-environment.nix
index 4c4092bf3c9..6e14ef2e193 100644
--- a/configuration/boot-environment.nix
+++ b/configuration/boot-environment.nix
@@ -234,7 +234,31 @@ rec {
         target = "event.d";
       }
 
-    ];
+      { # Configuration for passwd and friends (e.g., hash algorithm
+        # for /etc/passwd).
+        source = ./etc/default/passwd;
+        target = "default/passwd";
+      }
+
+    ]
+
+    # A bunch of PAM configuration files for various programs.
+    ++ (map
+      (program:
+        { source = pkgs.substituteAll {
+            src = ./etc/pam.d + ("/" + program);
+            inherit (pkgs) pam_unix2;
+          };
+          target = "pam.d/" + program;
+        }
+      )
+      [
+        "login"
+        "passwd"
+        "useradd"
+        "other"
+      ]
+    );
   };
 
   
diff --git a/configuration/etc/default/passwd b/configuration/etc/default/passwd
new file mode 100644
index 00000000000..5804e28c38b
--- /dev/null
+++ b/configuration/etc/default/passwd
@@ -0,0 +1,15 @@
+# Define default crypt hash
+# CRYPT={des,md5,blowfish}
+CRYPT=des
+
+# for local files, use a more secure hash. We
+# don't need to be portable here:
+CRYPT_FILES=blowfish
+
+# sometimes we need to specify special options for
+# a hash (variable is prepended by the name of the
+# crypt hash).
+BLOWFISH_CRYPT_FILES=10
+
+# For NIS, we should always use DES:
+CRYPT_YP=des
diff --git a/configuration/etc/pam.d/login b/configuration/etc/pam.d/login
new file mode 100644
index 00000000000..29ec6d7b11a
--- /dev/null
+++ b/configuration/etc/pam.d/login
@@ -0,0 +1,4 @@
+auth     required       @pam_unix2@/lib/security/pam_unix2.so
+account  required       @pam_unix2@/lib/security/pam_unix2.so
+password required       @pam_unix2@/lib/security/pam_unix2.so nullok use_first_pass use_authtok
+session  required       @pam_unix2@/lib/security/pam_unix2.so
diff --git a/configuration/etc/pam.d/other b/configuration/etc/pam.d/other
new file mode 100644
index 00000000000..b1ed9205b72
--- /dev/null
+++ b/configuration/etc/pam.d/other
@@ -0,0 +1,8 @@
+auth     required       pam_warn.so
+auth     required       pam_deny.so
+account  required       pam_warn.so
+account  required       pam_deny.so
+password required       pam_warn.so
+password required       pam_deny.so
+session  required       pam_warn.so
+session  required       pam_deny.so
diff --git a/configuration/etc/pam.d/passwd b/configuration/etc/pam.d/passwd
new file mode 100644
index 00000000000..423e0efb496
--- /dev/null
+++ b/configuration/etc/pam.d/passwd
@@ -0,0 +1,4 @@
+auth     required       @pam_unix2@/lib/security/pam_unix2.so
+account  required       @pam_unix2@/lib/security/pam_unix2.so
+password required       @pam_unix2@/lib/security/pam_unix2.so nullok debug
+session  required       @pam_unix2@/lib/security/pam_unix2.so
diff --git a/configuration/etc/pam.d/useradd b/configuration/etc/pam.d/useradd
new file mode 100644
index 00000000000..b4aac2aba95
--- /dev/null
+++ b/configuration/etc/pam.d/useradd
@@ -0,0 +1,5 @@
+auth     sufficient     pam_rootok.so
+auth     required       pam_permit.so
+account  required       pam_permit.so
+password required       pam_permit.so
+session  required       pam_permit.so
-- 
GitLab


From 85fc6aedf2f57811adf601057a26e29136c23fa0 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 11 Dec 2006 02:52:23 +0000
Subject: [PATCH 0290/5331] * Cleanup.

svn path=/nixos/trunk/; revision=7307
---
 configuration/etc/pam.d/login  | 2 +-
 configuration/etc/pam.d/passwd | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/configuration/etc/pam.d/login b/configuration/etc/pam.d/login
index 29ec6d7b11a..d3463aab5ae 100644
--- a/configuration/etc/pam.d/login
+++ b/configuration/etc/pam.d/login
@@ -1,4 +1,4 @@
 auth     required       @pam_unix2@/lib/security/pam_unix2.so
 account  required       @pam_unix2@/lib/security/pam_unix2.so
-password required       @pam_unix2@/lib/security/pam_unix2.so nullok use_first_pass use_authtok
+password required       @pam_unix2@/lib/security/pam_unix2.so nullok
 session  required       @pam_unix2@/lib/security/pam_unix2.so
diff --git a/configuration/etc/pam.d/passwd b/configuration/etc/pam.d/passwd
index 423e0efb496..d3463aab5ae 100644
--- a/configuration/etc/pam.d/passwd
+++ b/configuration/etc/pam.d/passwd
@@ -1,4 +1,4 @@
 auth     required       @pam_unix2@/lib/security/pam_unix2.so
 account  required       @pam_unix2@/lib/security/pam_unix2.so
-password required       @pam_unix2@/lib/security/pam_unix2.so nullok debug
+password required       @pam_unix2@/lib/security/pam_unix2.so nullok
 session  required       @pam_unix2@/lib/security/pam_unix2.so
-- 
GitLab


From b80769d5aed53e747d8d5ec169fbc4df37e86882 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 11 Dec 2006 02:55:28 +0000
Subject: [PATCH 0291/5331] * Hm, "set" doesn't seem to do the right thing.

svn path=/nixos/trunk/; revision=7308
---
 upstart-jobs/nix-daemon.nix | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/upstart-jobs/nix-daemon.nix b/upstart-jobs/nix-daemon.nix
index a730c9e4d84..84bbdea4f11 100644
--- a/upstart-jobs/nix-daemon.nix
+++ b/upstart-jobs/nix-daemon.nix
@@ -6,8 +6,10 @@
   job = "
     start on startup
     stop on shutdown
-    set NIX_CONF_DIR=/nix/etc/nix
-    respawn ${nix}/bin/nix-worker --daemon > /dev/null 2>&1
+    script
+      export NIX_CONF_DIR=/nix/etc/nix
+      exec ${nix}/bin/nix-worker --daemon > /dev/null 2>&1
+    end script
   ";
 
 }
-- 
GitLab


From efa9b1ba88163d4dfeb87547a423d5d1abdc4695 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 11 Dec 2006 03:03:42 +0000
Subject: [PATCH 0292/5331] * Grmbl.

svn path=/nixos/trunk/; revision=7309
---
 boot/boot-stage-2-init.sh | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/boot/boot-stage-2-init.sh b/boot/boot-stage-2-init.sh
index a3387fbac57..c31b4620911 100644
--- a/boot/boot-stage-2-init.sh
+++ b/boot/boot-stage-2-init.sh
@@ -96,6 +96,8 @@ udevd --daemon
 udevtrigger
 udevsettle # wait for udev to finish
 
+chmod 666 /dev/null # grmbl
+
 
 # Start an interactive shell.
 #exec @shell@
-- 
GitLab


From 1561e2421d0ff068f627cdd1219ec04803e16d87 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 11 Dec 2006 03:25:13 +0000
Subject: [PATCH 0293/5331] * Enable PAM in the SSH daemon.

svn path=/nixos/trunk/; revision=7311
---
 configuration/boot-environment.nix | 1 +
 configuration/etc/sshd_config      | 1 +
 2 files changed, 2 insertions(+)

diff --git a/configuration/boot-environment.nix b/configuration/boot-environment.nix
index 6e14ef2e193..ecc58406948 100644
--- a/configuration/boot-environment.nix
+++ b/configuration/boot-environment.nix
@@ -254,6 +254,7 @@ rec {
       )
       [
         "login"
+        "sshd"
         "passwd"
         "useradd"
         "other"
diff --git a/configuration/etc/sshd_config b/configuration/etc/sshd_config
index 33619c72028..994042bc78f 100644
--- a/configuration/etc/sshd_config
+++ b/configuration/etc/sshd_config
@@ -1 +1,2 @@
 X11Forwarding yes
+UsePAM yes
-- 
GitLab


From 970924e487c0c17563f2c6654295ead0462b1997 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 11 Dec 2006 14:16:03 +0000
Subject: [PATCH 0294/5331] * Forgotten to add.

svn path=/nixos/trunk/; revision=7312
---
 configuration/etc/pam.d/sshd | 4 ++++
 1 file changed, 4 insertions(+)
 create mode 100644 configuration/etc/pam.d/sshd

diff --git a/configuration/etc/pam.d/sshd b/configuration/etc/pam.d/sshd
new file mode 100644
index 00000000000..d3463aab5ae
--- /dev/null
+++ b/configuration/etc/pam.d/sshd
@@ -0,0 +1,4 @@
+auth     required       @pam_unix2@/lib/security/pam_unix2.so
+account  required       @pam_unix2@/lib/security/pam_unix2.so
+password required       @pam_unix2@/lib/security/pam_unix2.so nullok
+session  required       @pam_unix2@/lib/security/pam_unix2.so
-- 
GitLab


From 16a9702c4a102b5a7883a75c098513b9befa06d6 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 11 Dec 2006 15:32:10 +0000
Subject: [PATCH 0295/5331] * Move some stuff out of boot-environment.nix.

svn path=/nixos/trunk/; revision=7313
---
 configuration/boot-environment.nix | 164 +----------------------------
 configuration/etc.nix              |  80 ++++++++++++++
 configuration/upstart.nix          |  88 ++++++++++++++++
 3 files changed, 173 insertions(+), 159 deletions(-)
 create mode 100644 configuration/etc.nix
 create mode 100644 configuration/upstart.nix

diff --git a/configuration/boot-environment.nix b/configuration/boot-environment.nix
index ecc58406948..dfab2b61670 100644
--- a/configuration/boot-environment.nix
+++ b/configuration/boot-environment.nix
@@ -103,171 +103,17 @@ rec {
 
 
   # The services (Upstart) configuration for the system.
-  upstartJobs = import ../upstart-jobs/gather.nix {
-    inherit (pkgs) runCommand;
-
-    jobs = map makeJob [
-      # Syslogd.
-      (import ../upstart-jobs/syslogd.nix {
-        inherit (pkgs) sysklogd;
-      })
-
-      # Hardware scan; loads modules for PCI devices.
-      (import ../upstart-jobs/hardware-scan.nix {
-        inherit (pkgs) kernel module_init_tools;
-      })
-      
-      # Network interfaces.
-      (import ../upstart-jobs/network-interfaces.nix {
-        inherit (pkgs) nettools kernel module_init_tools;
-      })
-      
-      # DHCP client.
-      (import ../upstart-jobs/dhclient.nix {
-        inherit (pkgs) nettools;
-        dhcp = pkgs.dhcpWrapper;
-      })
-
-      # SSH daemon.
-      (import ../upstart-jobs/sshd.nix {
-        inherit (pkgs) openssh;
-      })
-
-      # Nix daemon - required for multi-user Nix.
-      (import ../upstart-jobs/nix-daemon.nix {
-        inherit nix;
-      })
-
-      # X server.
-      (import ../upstart-jobs/xserver.nix {
-        inherit (pkgs) substituteAll;
-        inherit (pkgs.xorg) xorgserver xf86inputkeyboard xf86inputmouse xf86videovesa;
-      })
-
-      # Transparent TTY backgrounds.
-      (import ../upstart-jobs/tty-backgrounds.nix {
-        inherit (pkgs) stdenv splashutils;
-        backgrounds = splashThemes.ttyBackgrounds;
-      })
-
-      # Handles the maintenance/stalled event (single-user shell).
-      (import ../upstart-jobs/maintenance-shell.nix {
-        inherit (pkgs) bash;
-      })
-
-      # Ctrl-alt-delete action.
-      (import ../upstart-jobs/ctrl-alt-delete.nix)
-
-    ]
-
-    # Handles the reboot/halt events.
-    ++ (map
-      (event: makeJob (import ../upstart-jobs/halt.nix {
-        inherit (pkgs) bash utillinux;
-        inherit event;
-      }))
-      ["reboot" "halt" "system-halt" "power-off"]
-    )
-    
-    # The terminals on ttyX.
-    ++ (map 
-      (ttyNumber: makeJob (import ../upstart-jobs/mingetty.nix {
-        inherit (pkgs) mingetty pam_login;
-        inherit ttyNumber;
-      }))
-      [1 2 3 4 5 6]
-    )
-
-    # For the builtin logd job.
-    ++ [pkgs.upstart];
+  upstartJobs = import ./upstart.nix {
+    inherit pkgs nix splashThemes;
   };
 
 
-  etc = import ../helpers/make-etc.nix {
-    inherit (pkgs) stdenv;
-
-    configFiles = [
-
-      { # TCP/UDP port assignments.
-        source = pkgs.iana_etc + "/etc/services";
-        target = "services";
-      }
-
-      { # IP protocol numbers.
-        source = pkgs.iana_etc + "/etc/protocols";
-        target = "protocols";
-      }
-
-      { # Hostname-to-IP mappings.
-        source = ./etc/hosts;
-        target = "hosts";
-      }
-
-      { # Name Service Switch configuration file.  Required by the C library.
-        source = ./etc/nsswitch.conf;
-        target = "nsswitch.conf";
-      }
-
-      { # Configuration file for the system logging daemon.
-        source = ./etc/syslog.conf;
-        target = "syslog.conf";
-      }
-
-      { # Friendly greeting on the virtual consoles.
-        source = ./etc/issue;
-        target = "issue";
-      }
-
-      { # Configuration for pwdutils (login, passwd, useradd, etc.).
-        # You cannot login without it!
-        source = ./etc/login.defs;
-        target = "login.defs";
-      }
-
-      { # SSH daemon configuration.
-        source = ./etc/sshd_config;
-        target = "ssh/sshd_config";
-      }
-
-      { # The Upstart events defined above.
-        source = upstartJobs + "/etc/event.d";
-        target = "event.d";
-      }
-
-      { # Configuration for passwd and friends (e.g., hash algorithm
-        # for /etc/passwd).
-        source = ./etc/default/passwd;
-        target = "default/passwd";
-      }
-
-    ]
-
-    # A bunch of PAM configuration files for various programs.
-    ++ (map
-      (program:
-        { source = pkgs.substituteAll {
-            src = ./etc/pam.d + ("/" + program);
-            inherit (pkgs) pam_unix2;
-          };
-          target = "pam.d/" + program;
-        }
-      )
-      [
-        "login"
-        "sshd"
-        "passwd"
-        "useradd"
-        "other"
-      ]
-    );
+  # The static parts of /etc.
+  etc = import ./etc.nix {
+    inherit pkgs upstartJobs;
   };
 
   
-  makeJob = import ../upstart-jobs/make-job.nix {
-    inherit (pkgs) runCommand;
-  };
-
-
   setuidWrapper = import ../helpers/setuid {
     inherit (pkgs) stdenv;
     wrapperDir = "/var/setuid-wrappers";
diff --git a/configuration/etc.nix b/configuration/etc.nix
new file mode 100644
index 00000000000..d8027c6873e
--- /dev/null
+++ b/configuration/etc.nix
@@ -0,0 +1,80 @@
+{pkgs, upstartJobs}:
+
+import ../helpers/make-etc.nix {
+  inherit (pkgs) stdenv;
+
+  configFiles = [
+
+    { # TCP/UDP port assignments.
+      source = pkgs.iana_etc + "/etc/services";
+      target = "services";
+    }
+
+    { # IP protocol numbers.
+      source = pkgs.iana_etc + "/etc/protocols";
+      target = "protocols";
+    }
+
+    { # Hostname-to-IP mappings.
+      source = ./etc/hosts;
+      target = "hosts";
+    }
+
+    { # Name Service Switch configuration file.  Required by the C library.
+      source = ./etc/nsswitch.conf;
+      target = "nsswitch.conf";
+    }
+
+    { # Configuration file for the system logging daemon.
+      source = ./etc/syslog.conf;
+      target = "syslog.conf";
+    }
+
+    { # Friendly greeting on the virtual consoles.
+      source = ./etc/issue;
+      target = "issue";
+    }
+
+    { # Configuration for pwdutils (login, passwd, useradd, etc.).
+      # You cannot login without it!
+      source = ./etc/login.defs;
+      target = "login.defs";
+    }
+
+    { # SSH daemon configuration.
+      source = ./etc/sshd_config;
+      target = "ssh/sshd_config";
+    }
+
+    { # The Upstart events defined above.
+      source = upstartJobs + "/etc/event.d";
+      target = "event.d";
+    }
+
+    { # Configuration for passwd and friends (e.g., hash algorithm
+      # for /etc/passwd).
+      source = ./etc/default/passwd;
+      target = "default/passwd";
+    }
+
+  ]
+
+  # A bunch of PAM configuration files for various programs.
+  ++ (map
+    (program:
+      { source = pkgs.substituteAll {
+          src = ./etc/pam.d + ("/" + program);
+          inherit (pkgs) pam_unix2;
+        };
+        target = "pam.d/" + program;
+      }
+    )
+    [
+      "login"
+      "sshd"
+      "passwd"
+      "useradd"
+      "other"
+    ]
+  );
+}
\ No newline at end of file
diff --git a/configuration/upstart.nix b/configuration/upstart.nix
new file mode 100644
index 00000000000..8efa0a4ca75
--- /dev/null
+++ b/configuration/upstart.nix
@@ -0,0 +1,88 @@
+{pkgs, nix, splashThemes}:
+
+let 
+
+  makeJob = import ../upstart-jobs/make-job.nix {
+    inherit (pkgs) runCommand;
+  };
+
+in
+
+import ../upstart-jobs/gather.nix {
+  inherit (pkgs) runCommand;
+
+  jobs = map makeJob [
+    # Syslogd.
+    (import ../upstart-jobs/syslogd.nix {
+      inherit (pkgs) sysklogd;
+    })
+
+    # Hardware scan; loads modules for PCI devices.
+    (import ../upstart-jobs/hardware-scan.nix {
+      inherit (pkgs) kernel module_init_tools;
+    })
+      
+    # Network interfaces.
+    (import ../upstart-jobs/network-interfaces.nix {
+      inherit (pkgs) nettools kernel module_init_tools;
+    })
+      
+    # DHCP client.
+    (import ../upstart-jobs/dhclient.nix {
+      inherit (pkgs) nettools;
+      dhcp = pkgs.dhcpWrapper;
+    })
+
+    # SSH daemon.
+    (import ../upstart-jobs/sshd.nix {
+      inherit (pkgs) openssh;
+    })
+
+    # Nix daemon - required for multi-user Nix.
+    (import ../upstart-jobs/nix-daemon.nix {
+      inherit nix;
+    })
+
+    # X server.
+    (import ../upstart-jobs/xserver.nix {
+      inherit (pkgs) substituteAll;
+      inherit (pkgs.xorg) xorgserver xf86inputkeyboard xf86inputmouse xf86videovesa;
+    })
+
+    # Transparent TTY backgrounds.
+    (import ../upstart-jobs/tty-backgrounds.nix {
+      inherit (pkgs) stdenv splashutils;
+      backgrounds = splashThemes.ttyBackgrounds;
+    })
+
+    # Handles the maintenance/stalled event (single-user shell).
+    (import ../upstart-jobs/maintenance-shell.nix {
+      inherit (pkgs) bash;
+    })
+
+    # Ctrl-alt-delete action.
+    (import ../upstart-jobs/ctrl-alt-delete.nix)
+
+  ]
+
+  # Handles the reboot/halt events.
+  ++ (map
+    (event: makeJob (import ../upstart-jobs/halt.nix {
+      inherit (pkgs) bash utillinux;
+      inherit event;
+    }))
+    ["reboot" "halt" "system-halt" "power-off"]
+  )
+    
+  # The terminals on ttyX.
+  ++ (map 
+    (ttyNumber: makeJob (import ../upstart-jobs/mingetty.nix {
+      inherit (pkgs) mingetty pam_login;
+      inherit ttyNumber;
+    }))
+    [1 2 3 4 5 6]
+  )
+
+  # For the builtin logd job.
+  ++ [pkgs.upstart];
+}
-- 
GitLab


From ce29e4efc7f7986612be1f6cbd7598814545cdbe Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 11 Dec 2006 15:42:02 +0000
Subject: [PATCH 0296/5331] * More refactoring.

svn path=/nixos/trunk/; revision=7314
---
 configuration/boot-environment.nix | 35 +++++-------------------------
 configuration/config.nix           | 29 +++++++++++++++++++++++++
 2 files changed, 34 insertions(+), 30 deletions(-)
 create mode 100644 configuration/config.nix

diff --git a/configuration/boot-environment.nix b/configuration/boot-environment.nix
index dfab2b61670..4d7f9d38d7b 100644
--- a/configuration/boot-environment.nix
+++ b/configuration/boot-environment.nix
@@ -202,38 +202,13 @@ rec {
   };
 
 
-  lib = pkgs.library;
+  config = import ./config.nix pkgs.library configData;
 
-
-  config = rec {
-
-    # The user configuration.
-    config = {
-      networking = {
-        hostname = "nixos";
-      };
+  # The user configuration.
+  configData = {
+    networking = {
+      hostname = "nixos";
     };
-
-    # The option declarations, i.e., option names with defaults and
-    # documentation.
-    declarations = import ./options.nix;
-
-    # Get the option named `name' from the user configuration, using
-    # its default value if it's not defined.
-    get = name:
-      let
-        sameName = lib.filter (opt: lib.eqLists opt.name name) declarations;
-        default =
-          if sameName == []
-          then abort ("Undeclared option `" + printName name + "'.")
-          else if !builtins.head sameName ? default
-          then abort ("Option `" + printName name + "' has no default.")
-          else (builtins.head sameName).default;
-      in lib.getAttr name default config;
-  
-    printName = name: lib.concatStrings (lib.intersperse "." name);
-
   };
 
-
 }
diff --git a/configuration/config.nix b/configuration/config.nix
new file mode 100644
index 00000000000..705b44407af
--- /dev/null
+++ b/configuration/config.nix
@@ -0,0 +1,29 @@
+# Given a configuration, this function returns an object with a `get'
+# method for retrieving the values of options, falling back to the
+# defaults declared in options.nix if no value is given for an
+# option.
+
+lib: config:
+
+rec {
+
+  # The option declarations, i.e., option names with defaults and
+  # documentation.
+  declarations = import ./options.nix;
+
+  # Get the option named `name' from the user configuration, using
+  # its default value if it's not defined.
+  get = name:
+    let
+      sameName = lib.filter (opt: lib.eqLists opt.name name) declarations;
+      default =
+        if sameName == []
+        then abort ("Undeclared option `" + printName name + "'.")
+        else if !builtins.head sameName ? default
+        then abort ("Option `" + printName name + "' has no default.")
+        else (builtins.head sameName).default;
+    in lib.getAttr name default config;
+  
+  printName = name: lib.concatStrings (lib.intersperse "." name);
+
+}
-- 
GitLab


From 7573a88ca683f3715976765f21b7c1de29fbd1aa Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 11 Dec 2006 15:47:30 +0000
Subject: [PATCH 0297/5331] * More refactoring.

svn path=/nixos/trunk/; revision=7316
---
 configuration/boot-environment.nix | 20 +++++++++-----------
 1 file changed, 9 insertions(+), 11 deletions(-)

diff --git a/configuration/boot-environment.nix b/configuration/boot-environment.nix
index 4d7f9d38d7b..31af084695c 100644
--- a/configuration/boot-environment.nix
+++ b/configuration/boot-environment.nix
@@ -4,10 +4,16 @@
 , rootLabel ? ""
 , stage2Init
 , readOnlyRoot
+, configData ? {}
 }:
 
 rec {
 
+  # Make a configuration object from which we can retrieve option
+  # values.
+  config = import ./config.nix pkgs.library configData;
+  
+
   pkgs = import ../pkgs/top-level/all-packages.nix {inherit system;};
 
   pkgsDiet = import ../pkgs/top-level/all-packages.nix {
@@ -113,7 +119,9 @@ rec {
     inherit pkgs upstartJobs;
   };
 
-  
+
+  # The wrapper setuid programs (since we can't have setuid programs
+  # in the Nix store).  
   setuidWrapper = import ../helpers/setuid {
     inherit (pkgs) stdenv;
     wrapperDir = "/var/setuid-wrappers";
@@ -201,14 +209,4 @@ rec {
     ];
   };
 
-
-  config = import ./config.nix pkgs.library configData;
-
-  # The user configuration.
-  configData = {
-    networking = {
-      hostname = "nixos";
-    };
-  };
-
 }
-- 
GitLab


From 74783a4510bef6594da0c7aea69d25772344b5cb Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 11 Dec 2006 16:10:23 +0000
Subject: [PATCH 0298/5331] * More refactoring; move some of the boot time
 options into the   options framework.

svn path=/nixos/trunk/; revision=7317
---
 boot/boot-stage-1.nix                  |  7 ++-
 configuration/boot-environment.nix     | 16 +++---
 configuration/options.nix              | 72 ++++++++++++++++++++++++--
 configuration/system-configuration.nix | 22 ++++----
 test.sh                                |  2 +-
 5 files changed, 90 insertions(+), 29 deletions(-)

diff --git a/boot/boot-stage-1.nix b/boot/boot-stage-1.nix
index f8b84eb6fdb..63c562a13b9 100644
--- a/boot/boot-stage-1.nix
+++ b/boot/boot-stage-1.nix
@@ -21,14 +21,13 @@
   stage2Init ? "/init"
 }:
 
-assert !autoDetectRootDevice -> rootDevice != "";
-assert autoDetectRootDevice -> rootLabel != "";
-
 substituteAll {
   src = ./boot-stage-1-init.sh;
   isExecutable = true;
   inherit staticShell modules;
-  inherit autoDetectRootDevice rootDevice rootLabel;
+  inherit autoDetectRootDevice;
+  rootDevice = if !autoDetectRootDevice then rootDevice else "";
+  rootLabel = if autoDetectRootDevice then rootLabel else "";
   path = [
     staticTools
     module_init_tools
diff --git a/configuration/boot-environment.nix b/configuration/boot-environment.nix
index 31af084695c..762e2042401 100644
--- a/configuration/boot-environment.nix
+++ b/configuration/boot-environment.nix
@@ -1,17 +1,13 @@
 { system ? __currentSystem
-, autoDetectRootDevice ? false
-, rootDevice ? ""
-, rootLabel ? ""
 , stage2Init
-, readOnlyRoot
-, configData ? {}
+, configuration
 }:
 
 rec {
 
   # Make a configuration object from which we can retrieve option
   # values.
-  config = import ./config.nix pkgs.library configData;
+  config = import ./config.nix pkgs.library configuration;
   
 
   pkgs = import ../pkgs/top-level/all-packages.nix {inherit system;};
@@ -71,7 +67,9 @@ rec {
     inherit (pkgs) substituteAll;
     inherit (pkgsDiet) module_init_tools;
     inherit extraUtils;
-    inherit autoDetectRootDevice rootDevice rootLabel;
+    autoDetectRootDevice = config.get ["boot" "autoDetectRootDevice"];
+    rootDevice = config.get ["boot" "rootDevice"];
+    rootLabel = config.get ["boot" "rootLabel"];
     inherit stage2Init;
     modules = modulesClosure;
     staticShell = stdenvLinuxStuff.bootstrapTools.bash;
@@ -172,8 +170,8 @@ rec {
     isExecutable = true;
 
     inherit etc;
-    inherit readOnlyRoot;
     inherit (pkgs) kernel;
+    readOnlyRoot = config.get ["boot" "readOnlyRoot"];
     hostName = config.get ["networking" "hostname"];
     wrapperDir = setuidWrapper.wrapperDir;
     accounts = ../helpers/accounts.sh;
@@ -198,8 +196,8 @@ rec {
   bootStage2 = import ../boot/boot-stage-2.nix {
     inherit (pkgs) substituteAll coreutils 
       utillinux kernel udev upstart;
-    inherit readOnlyRoot;
     inherit activateConfiguration;
+    readOnlyRoot = config.get ["boot" "readOnlyRoot"];
     upstartPath = [
       pkgs.coreutils
       pkgs.findutils
diff --git a/configuration/options.nix b/configuration/options.nix
index 4cd2f3a7343..31842627bb5 100644
--- a/configuration/options.nix
+++ b/configuration/options.nix
@@ -1,11 +1,67 @@
-[        
+[
 
-  {
+
+  { 
     name = ["networking" "hostname"];
     default = "nixos";
     description = "The name of the machine.";
   }
 
+  
+  {
+    name = ["boot" "autoDetectRootDevice"];
+    default = false;
+    description = "
+      Whether to find the root device automatically by searching for a
+      device with the right label.  If this option is off, then
+      <option>boot.rootDevice</option> must be set.
+    ";
+  }
+
+
+  {
+    name = ["boot" "rootDevice"];
+    example = "/dev/hda1";
+    description = "
+      The device to be mounted on / at system startup.
+    ";
+  }
+
+
+  {
+    name = ["boot" "readOnlyRoot"];
+    default = false;
+    description = "
+      Whether the root device should be mounted writable.  This should
+      be set when booting from CD-ROM.
+    ";
+  }
+
+
+  {
+    name = ["boot" "rootLabel"];
+    description = "
+      When auto-detecting the root device (see
+      <option>boot.autoDetectRootDevice</option>), this option
+      specifies the label of the root device.  Right now, this is
+      merely a file name that should exist in the root directory of
+      the file system.  It is used to find the boot CD-ROM.
+    ";
+  }
+
+
+  {
+    name = ["boot" "grubDevice"];
+    default = "";
+    example = "/dev/hda";
+    description = "
+      The device on which the boot loader, Grub, will be installed.
+      If empty, Grub won't be installed and it's your responsibility
+      to make the system bootable.
+    ";
+  }
+
+
   {
     name = ["networking" "useDHCP"];
     default = true;
@@ -16,6 +72,7 @@
     ";
   }
 
+  
   {
     name = ["networking" "interfaces"];
     default = [];
@@ -33,6 +90,7 @@
     ";
   }
 
+  
   {
     name = ["filesystems" "mountPoints"];
     example = [
@@ -48,6 +106,7 @@
     ";
   }
 
+  
   {
     name = ["services" "syslogd" "tty"];
     default = 10;
@@ -56,7 +115,8 @@
       messages.
     ";
   }
-    
+
+      
   {
     name = ["services" "mingetty" "ttys"];
     default = [1 2 3 4 5 6];
@@ -65,7 +125,8 @@
       login prompt.
     ";
   }
-    
+
+      
   {
     name = ["services" "mingetty" "waitOnMounts"];
     default = false;
@@ -77,6 +138,7 @@
     ";
   }
 
+  
   {
     name = ["services" "sshd" "enable"];
     default = false;
@@ -86,6 +148,7 @@
     ";
   }
 
+  
   {
     name = ["services" "sshd" "forwardX11"];
     default = false;
@@ -94,4 +157,5 @@
     ";
   }
 
+  
 ]
diff --git a/configuration/system-configuration.nix b/configuration/system-configuration.nix
index 39b4f961f16..6e6b6bc6e0f 100644
--- a/configuration/system-configuration.nix
+++ b/configuration/system-configuration.nix
@@ -1,18 +1,18 @@
 let
 
-  # The root device.
-  rootDevice = "/dev/hda1";
-
-  # The device on which GRUB should be installed (leave empty if you
-  # don't want GRUB to be installed).
-  grubDevice = "/dev/hda";
+  configuration = {
+    boot = {
+      autoDetectRootDevice = false;
+      rootDevice = "/dev/hda1";
+      readOnlyRoot = false;
+      grubDevice = "/dev/hda";
+    };
+  };
 
   # Build boot scripts.
   bootEnv = import ./boot-environment.nix {
-    autoDetectRootDevice = false;
-    inherit rootDevice;
     stage2Init = ""; # Passed on the command line via Grub.
-    readOnlyRoot = false;
+    inherit configuration;
   };
 
   # Extra kernel command line arguments.
@@ -34,12 +34,12 @@ rec {
   inherit upstartJobs;
 
 
-  systemConfiguration = pkgs.stdenvNew.mkDerivation {
+  system = pkgs.stdenvNew.mkDerivation {
     name = "system-configuration";
     builder = ./system-configuration.sh;
     switchToConfiguration = ./switch-to-configuration.sh;
     inherit (pkgs) grub coreutils gnused gnugrep diffutils findutils;
-    inherit grubDevice;
+    grubDevice = "/dev/hda"; # !!!
     inherit bootStage2;
     inherit activateConfiguration;
     inherit grubMenuBuilder;
diff --git a/test.sh b/test.sh
index 6bb66bf742e..c50ebe907d1 100755
--- a/test.sh
+++ b/test.sh
@@ -1,4 +1,4 @@
 #! /bin/sh
 set -e
-nix-build configuration/system-configuration.nix -A systemConfiguration -K -k
+nix-build configuration/system-configuration.nix -A system -K -k
 ./result/bin/switch-to-configuration test
-- 
GitLab


From 2d0f190f20b0aadae208e60b99828e01c27d7f02 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 11 Dec 2006 17:36:57 +0000
Subject: [PATCH 0299/5331] * More refactoring: renamed boot-environment.nix to
 system.nix (since   it does a lot more than just booting), and merged  
 system-configuration.nix into system.nix.

svn path=/nixos/trunk/; revision=7318
---
 configuration/options.nix                     | 31 +++++++++
 configuration/system-configuration.nix        | 63 -------------------
 .../{boot-environment.nix => system.nix}      | 46 ++++++++++++--
 .../{system-configuration.sh => system.sh}    |  4 +-
 installer/grub-menu-builder.sh                |  4 ++
 instances/examples/basic.nix                  |  8 +++
 test.sh                                       |  4 +-
 upgrade.sh                                    |  4 +-
 8 files changed, 92 insertions(+), 72 deletions(-)
 delete mode 100644 configuration/system-configuration.nix
 rename configuration/{boot-environment.nix => system.nix} (78%)
 rename configuration/{system-configuration.sh => system.sh} (80%)
 create mode 100644 instances/examples/basic.nix

diff --git a/configuration/options.nix b/configuration/options.nix
index 31842627bb5..c8a2f07df01 100644
--- a/configuration/options.nix
+++ b/configuration/options.nix
@@ -62,6 +62,37 @@
   }
 
 
+  {
+    name = ["boot" "kernelParams"];
+    default = [
+      "selinux=0"
+      "apm=on"
+      "acpi=on"
+      "vga=0x317"
+      "console=tty1"
+      "splash=verbose"
+    ];
+    description = "
+      The kernel parameters.  If you want to add additional
+      parameters, it's best to set
+      <option>boot.extraKernelParams</options>.
+    ";
+  }
+
+
+  {
+    name = ["boot" "extraKernelParams"];
+    default = [
+    ];
+    example = [
+      "debugtrace"
+    ];
+    description = "
+      Additional user-defined kernel parameters.
+    ";
+  }
+
+
   {
     name = ["networking" "useDHCP"];
     default = true;
diff --git a/configuration/system-configuration.nix b/configuration/system-configuration.nix
deleted file mode 100644
index 6e6b6bc6e0f..00000000000
--- a/configuration/system-configuration.nix
+++ /dev/null
@@ -1,63 +0,0 @@
-let
-
-  configuration = {
-    boot = {
-      autoDetectRootDevice = false;
-      rootDevice = "/dev/hda1";
-      readOnlyRoot = false;
-      grubDevice = "/dev/hda";
-    };
-  };
-
-  # Build boot scripts.
-  bootEnv = import ./boot-environment.nix {
-    stage2Init = ""; # Passed on the command line via Grub.
-    inherit configuration;
-  };
-
-  # Extra kernel command line arguments.
-  extraKernelParams = [
-    "selinux=0"
-    "apm=on"
-    "acpi=on"
-    "vga=0x317"
-    "console=tty1"
-    "splash=verbose"
-  ];
-
-in
-
-with bootEnv;
-  
-rec {
-
-  inherit upstartJobs;
-
-
-  system = pkgs.stdenvNew.mkDerivation {
-    name = "system-configuration";
-    builder = ./system-configuration.sh;
-    switchToConfiguration = ./switch-to-configuration.sh;
-    inherit (pkgs) grub coreutils gnused gnugrep diffutils findutils;
-    grubDevice = "/dev/hda"; # !!!
-    inherit bootStage2;
-    inherit activateConfiguration;
-    inherit grubMenuBuilder;
-    inherit etc;
-    kernel = pkgs.kernel + "/vmlinuz";
-    initrd = initialRamdisk + "/initrd";
-    inherit extraKernelParams;
-    # Most of these are needed by grub-install.
-    path = [pkgs.coreutils pkgs.gnused pkgs.gnugrep pkgs.findutils pkgs.diffutils];
-  };
-
-
-  grubMenuBuilder = pkgs.substituteAll {
-    src = ../installer/grub-menu-builder.sh;
-    isExecutable = true;
-    inherit (pkgs) bash;
-    path = [pkgs.coreutils pkgs.gnused pkgs.gnugrep];
-  };
-
-
-}
diff --git a/configuration/boot-environment.nix b/configuration/system.nix
similarity index 78%
rename from configuration/boot-environment.nix
rename to configuration/system.nix
index 762e2042401..f030717491c 100644
--- a/configuration/boot-environment.nix
+++ b/configuration/system.nix
@@ -1,5 +1,5 @@
-{ system ? __currentSystem
-, stage2Init
+{ platform ? __currentSystem
+, stage2Init ? ""
 , configuration
 }:
 
@@ -10,15 +10,15 @@ rec {
   config = import ./config.nix pkgs.library configuration;
   
 
-  pkgs = import ../pkgs/top-level/all-packages.nix {inherit system;};
+  pkgs = import ../pkgs/top-level/all-packages.nix {system = platform;};
 
   pkgsDiet = import ../pkgs/top-level/all-packages.nix {
-    inherit system;
+    system = platform;
     bootStdenv = pkgs.useDietLibC pkgs.stdenv;
   };
 
   pkgsStatic = import ../pkgs/top-level/all-packages.nix {
-    inherit system;
+    system = platform;
     bootStdenv = pkgs.makeStaticBinaries pkgs.stdenv;
   };
 
@@ -207,4 +207,40 @@ rec {
     ];
   };
 
+
+  # Script to build the Grub menu containing the current and previous
+  # system configurations.
+  grubMenuBuilder = pkgs.substituteAll {
+    src = ../installer/grub-menu-builder.sh;
+    isExecutable = true;
+    inherit (pkgs) bash;
+    path = [pkgs.coreutils pkgs.gnused pkgs.gnugrep];
+  };
+
+
+  # Putting it all together.  This builds a store object containing
+  # symlinks to the various parts of the built configuration (the
+  # kernel, the Upstart services, the init scripts, etc.) as well as a
+  # script `switch-to-configuration' that activates the configuration
+  # and makes it bootable.
+  system = pkgs.stdenvNew.mkDerivation {
+    name = "system";
+    builder = ./system.sh;
+    switchToConfiguration = ./switch-to-configuration.sh;
+    inherit (pkgs) grub coreutils gnused gnugrep diffutils findutils;
+    grubDevice = config.get ["boot" "grubDevice"];
+    kernelParams =
+      (config.get ["boot" "kernelParams"]) ++
+      (config.get ["boot" "extraKernelParams"]);
+    inherit bootStage2;
+    inherit activateConfiguration;
+    inherit grubMenuBuilder;
+    inherit etc;
+    kernel = pkgs.kernel + "/vmlinuz";
+    initrd = initialRamdisk + "/initrd";
+    # Most of these are needed by grub-install.
+    path = [pkgs.coreutils pkgs.gnused pkgs.gnugrep pkgs.findutils pkgs.diffutils];
+  };
+
+
 }
diff --git a/configuration/system-configuration.sh b/configuration/system.sh
similarity index 80%
rename from configuration/system-configuration.sh
rename to configuration/system.sh
index e1f240e218f..c358e870572 100644
--- a/configuration/system-configuration.sh
+++ b/configuration/system.sh
@@ -9,10 +9,10 @@ ln -s $initrd $out/initrd
 ln -s $activateConfiguration $out/activate
 ln -s $etc/etc $out/etc
 
-echo "$extraKernelParams" > $out/kernel-params
+echo "$kernelParams" > $out/kernel-params
 
 cat > $out/menu.lst << GRUBEND
-kernel $kernel init=$bootStage2 $extraKernelParams
+kernel $kernel init=$bootStage2 $kernelParams
 initrd $initrd
 GRUBEND
 
diff --git a/installer/grub-menu-builder.sh b/installer/grub-menu-builder.sh
index cc678212a8c..06371d4af7e 100644
--- a/installer/grub-menu-builder.sh
+++ b/installer/grub-menu-builder.sh
@@ -23,6 +23,10 @@ addEntry() {
     name="$1"
     path="$2"
 
+    if ! test -e $path/menu.lst; then
+        return
+    fi
+
     cat >> $tmp << GRUBEND
 title $name
 GRUBEND
diff --git a/instances/examples/basic.nix b/instances/examples/basic.nix
new file mode 100644
index 00000000000..d5357785810
--- /dev/null
+++ b/instances/examples/basic.nix
@@ -0,0 +1,8 @@
+{
+  boot = {
+    autoDetectRootDevice = false;
+    rootDevice = "/dev/hda1";
+    readOnlyRoot = false;
+    grubDevice = "/dev/hda";
+  };
+}
diff --git a/test.sh b/test.sh
index c50ebe907d1..7411e3955f6 100755
--- a/test.sh
+++ b/test.sh
@@ -1,4 +1,6 @@
 #! /bin/sh
 set -e
-nix-build configuration/system-configuration.nix -A system -K -k
+nix-build configuration/system.nix \
+    --arg configuration 'import ./instances/example.nix' \
+    -A system -K -k
 ./result/bin/switch-to-configuration test
diff --git a/upgrade.sh b/upgrade.sh
index 961bc1959ef..1022564d9c1 100755
--- a/upgrade.sh
+++ b/upgrade.sh
@@ -1,4 +1,6 @@
 #! /bin/sh
 set -e
-nix-env -p /nix/var/nix/profiles/system -f configuration/system-configuration.nix -i -A systemConfiguration
+nix-env -p /nix/var/nix/profiles/system -f configuration/system.nix \
+    --arg configuration 'import ./instances/example.nix' \
+    -i -A system
 /nix/var/nix/profiles/system/bin/switch-to-configuration switch
-- 
GitLab


From 482a6625a9efb3ccf7a943871ac5d06b9b92a514 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 12 Dec 2006 00:08:26 +0000
Subject: [PATCH 0300/5331] * Use the configuration in
 /etc/nixos/configuration.nix by default.

svn path=/nixos/trunk/; revision=7319
---
 boot/boot-stage-2-init.sh | 2 ++
 test.sh                   | 8 +++++---
 upgrade.sh                | 8 +++++---
 3 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/boot/boot-stage-2-init.sh b/boot/boot-stage-2-init.sh
index c31b4620911..364c6b68242 100644
--- a/boot/boot-stage-2-init.sh
+++ b/boot/boot-stage-2-init.sh
@@ -41,6 +41,8 @@ test -e /etc/fstab || touch /etc/fstab # idem
 mount -n -t proc none /proc
 cat /proc/mounts > /etc/mtab
 
+mkdir -m 0755 -p /etc/nixos
+
 
 # Process the kernel command line.
 for o in $(cat /proc/cmdline); do
diff --git a/test.sh b/test.sh
index 7411e3955f6..cbb97bc700d 100755
--- a/test.sh
+++ b/test.sh
@@ -1,6 +1,8 @@
-#! /bin/sh
-set -e
+#! /bin/sh -e
+if test -z "$NIXOS_CONFIG"; then
+    NIXOS_CONFIG=/etc/nixos/configuration.nix
+fi
 nix-build configuration/system.nix \
-    --arg configuration 'import ./instances/example.nix' \
+    --arg configuration "import $NIXOS_CONFIG" \
     -A system -K -k
 ./result/bin/switch-to-configuration test
diff --git a/upgrade.sh b/upgrade.sh
index 1022564d9c1..19307ac1e1d 100755
--- a/upgrade.sh
+++ b/upgrade.sh
@@ -1,6 +1,8 @@
-#! /bin/sh
-set -e
+#! /bin/sh -e
+if test -z "$NIXOS_CONFIG"; then
+    NIXOS_CONFIG=/etc/nixos/configuration.nix
+fi
 nix-env -p /nix/var/nix/profiles/system -f configuration/system.nix \
-    --arg configuration 'import ./instances/example.nix' \
+    --arg configuration "import $NIXOS_CONFIG" \
     -i -A system
 /nix/var/nix/profiles/system/bin/switch-to-configuration switch
-- 
GitLab


From 4b5b0d2c6634b1e968e8dc54a27c80629abb499a Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 12 Dec 2006 15:32:28 +0000
Subject: [PATCH 0301/5331] * Purify the sshd configuration file (don't put it
 in /etc/ssh).

svn path=/nixos/trunk/; revision=7320
---
 configuration/etc.nix                           | 5 -----
 upstart-jobs/sshd.nix                           | 2 +-
 {configuration/etc => upstart-jobs}/sshd_config | 0
 3 files changed, 1 insertion(+), 6 deletions(-)
 rename {configuration/etc => upstart-jobs}/sshd_config (100%)

diff --git a/configuration/etc.nix b/configuration/etc.nix
index d8027c6873e..c65cafe33e4 100644
--- a/configuration/etc.nix
+++ b/configuration/etc.nix
@@ -41,11 +41,6 @@ import ../helpers/make-etc.nix {
       target = "login.defs";
     }
 
-    { # SSH daemon configuration.
-      source = ./etc/sshd_config;
-      target = "ssh/sshd_config";
-    }
-
     { # The Upstart events defined above.
       source = upstartJobs + "/etc/event.d";
       target = "event.d";
diff --git a/upstart-jobs/sshd.nix b/upstart-jobs/sshd.nix
index d3002f87e25..4aa35319a28 100644
--- a/upstart-jobs/sshd.nix
+++ b/upstart-jobs/sshd.nix
@@ -26,7 +26,7 @@ start script
 
 end script
 
-respawn ${openssh}/sbin/sshd -D -h /etc/ssh/ssh_host_dsa_key -f /etc/ssh/sshd_config
+respawn ${openssh}/sbin/sshd -D -h /etc/ssh/ssh_host_dsa_key -f ${./sshd_config}
   ";
   
 }
diff --git a/configuration/etc/sshd_config b/upstart-jobs/sshd_config
similarity index 100%
rename from configuration/etc/sshd_config
rename to upstart-jobs/sshd_config
-- 
GitLab


From 07627d8cdd1adff00e9f77a12b9a6498f7ad7dd4 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 13 Dec 2006 12:17:38 +0000
Subject: [PATCH 0302/5331] * Move starting of udevd (and udevtrigger/settle)
 into an Upstart   job.

svn path=/nixos/trunk/; revision=7330
---
 boot/boot-stage-2-init.sh      | 13 -------------
 configuration/upstart.nix      |  6 ++++++
 upstart-jobs/hardware-scan.nix |  2 +-
 upstart-jobs/syslogd.nix       |  2 +-
 upstart-jobs/udev.nix          | 31 +++++++++++++++++++++++++++++++
 5 files changed, 39 insertions(+), 15 deletions(-)
 create mode 100644 upstart-jobs/udev.nix

diff --git a/boot/boot-stage-2-init.sh b/boot/boot-stage-2-init.sh
index 364c6b68242..71d3fcc10b5 100644
--- a/boot/boot-stage-2-init.sh
+++ b/boot/boot-stage-2-init.sh
@@ -88,19 +88,6 @@ mknod -m 0666 /dev/null c 1 3
 export MODULE_DIR=@kernel@/lib/modules/
 
 
-# Start udev.
-udevd --daemon
-
-
-# Let udev create device nodes for all modules that have already been
-# loaded into the kernel (or for which support is built into the
-# kernel).
-udevtrigger
-udevsettle # wait for udev to finish
-
-chmod 666 /dev/null # grmbl
-
-
 # Start an interactive shell.
 #exec @shell@
 
diff --git a/configuration/upstart.nix b/configuration/upstart.nix
index 8efa0a4ca75..27696a2daa7 100644
--- a/configuration/upstart.nix
+++ b/configuration/upstart.nix
@@ -17,6 +17,12 @@ import ../upstart-jobs/gather.nix {
       inherit (pkgs) sysklogd;
     })
 
+    # The udev daemon creates devices nodes and runs programs when
+    # hardware events occur.
+    (import ../upstart-jobs/udev.nix {
+      inherit (pkgs) udev procps;
+    })
+      
     # Hardware scan; loads modules for PCI devices.
     (import ../upstart-jobs/hardware-scan.nix {
       inherit (pkgs) kernel module_init_tools;
diff --git a/upstart-jobs/hardware-scan.nix b/upstart-jobs/hardware-scan.nix
index 3ffd8f9223f..bfa44798bdb 100644
--- a/upstart-jobs/hardware-scan.nix
+++ b/upstart-jobs/hardware-scan.nix
@@ -5,7 +5,7 @@
   name = "hardware-scan";
   
   job = "
-start on startup
+start on udev
 
 script
     export MODULE_DIR=${kernel}/lib/modules/
diff --git a/upstart-jobs/syslogd.nix b/upstart-jobs/syslogd.nix
index 8f326b0d6cf..0fbc92e8731 100644
--- a/upstart-jobs/syslogd.nix
+++ b/upstart-jobs/syslogd.nix
@@ -3,7 +3,7 @@
 {
   name = "syslogd";
   job = "
-    start on startup
+    start on udev
     stop on shutdown
     respawn ${sysklogd}/sbin/syslogd -n
   ";
diff --git a/upstart-jobs/udev.nix b/upstart-jobs/udev.nix
new file mode 100644
index 00000000000..e218246c046
--- /dev/null
+++ b/upstart-jobs/udev.nix
@@ -0,0 +1,31 @@
+{udev, procps}:
+
+{
+  name = "udev";
+  
+  job = "
+start on startup
+stop on shutdown
+
+start script
+    echo '' > /proc/sys/kernel/hotplug
+
+    # Start udev.
+    ${udev}/sbin/udevd --daemon
+
+    # Let udev create device nodes for all modules that have already
+    # been loaded into the kernel (or for which support is built into
+    # the kernel).
+    ${udev}/sbin/udevtrigger
+    ${udev}/sbin/udevsettle # wait for udev to finish
+
+    # Kill udev, let Upstart restart and monitor it.  (This is nasty,
+    # but we have to run udevtrigger first.  Maybe we can use
+    # Upstart's `binary' keyword, but it isn't implemented yet.)
+    ${procps}/bin/pkill -u root '^udevd$'
+end script
+
+respawn ${udev}/sbin/udevd
+  ";
+
+}
-- 
GitLab


From d663f88c652ecd115a1c126aebbed2b51d51a432 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 13 Dec 2006 12:21:06 +0000
Subject: [PATCH 0303/5331] * Use nix-env --set.

svn path=/nixos/trunk/; revision=7331
---
 upgrade.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/upgrade.sh b/upgrade.sh
index 19307ac1e1d..7bd921f3d83 100755
--- a/upgrade.sh
+++ b/upgrade.sh
@@ -4,5 +4,5 @@ if test -z "$NIXOS_CONFIG"; then
 fi
 nix-env -p /nix/var/nix/profiles/system -f configuration/system.nix \
     --arg configuration "import $NIXOS_CONFIG" \
-    -i -A system
+    --set -A system
 /nix/var/nix/profiles/system/bin/switch-to-configuration switch
-- 
GitLab


From 0eb46ca4097f46b1fb2eb31c0c7902b35fa3fc97 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 13 Dec 2006 12:21:37 +0000
Subject: [PATCH 0304/5331] * Idem.

svn path=/nixos/trunk/; revision=7332
---
 installer/nixos-installer.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/installer/nixos-installer.sh b/installer/nixos-installer.sh
index eb524309046..28b9b48cac3 100644
--- a/installer/nixos-installer.sh
+++ b/installer/nixos-installer.sh
@@ -120,7 +120,7 @@ chroot $mountPoint @nix@/bin/nix-pull $nixpkgsURL/MANIFEST
 
 chroot $mountPoint @nix@/bin/nix-env \
     -p /nix/var/nix/profiles/system \
-    -f "/mnt/$nixExpr" -i -A systemConfiguration
+    -f "/mnt/$nixExpr" -i --set system
 
 
 # Grub needs a mtab.
-- 
GitLab


From f29c93830ecfbd28f52ea6a6d08e2ab79d4b2627 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 13 Dec 2006 13:09:20 +0000
Subject: [PATCH 0305/5331] * "set" -> "env".

svn path=/nixos/trunk/; revision=7333
---
 upstart-jobs/nix-daemon.nix | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/upstart-jobs/nix-daemon.nix b/upstart-jobs/nix-daemon.nix
index 84bbdea4f11..d761bcd85a9 100644
--- a/upstart-jobs/nix-daemon.nix
+++ b/upstart-jobs/nix-daemon.nix
@@ -6,10 +6,8 @@
   job = "
     start on startup
     stop on shutdown
-    script
-      export NIX_CONF_DIR=/nix/etc/nix
-      exec ${nix}/bin/nix-worker --daemon > /dev/null 2>&1
-    end script
+    env NIX_CONF_DIR=/nix/etc/nix
+    respawn ${nix}/bin/nix-worker --daemon > /dev/null 2>&1
   ";
 
 }
-- 
GitLab


From 57663aae6bec43303c671d57cfca94aa023219b6 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 13 Dec 2006 14:24:33 +0000
Subject: [PATCH 0306/5331] * Some basic udev rules: give the right permission
 to /dev/null etc.,   put input devices in /dev/input, and create a symlink
 /dev/cdrom for   CD-ROM devices.

svn path=/nixos/trunk/; revision=7335
---
 configuration/upstart.nix             |  2 +-
 upstart-jobs/udev-rules/50-udev.rules | 24 ++++++++++++++++++++++++
 upstart-jobs/udev.nix                 | 12 +++++++++++-
 3 files changed, 36 insertions(+), 2 deletions(-)
 create mode 100644 upstart-jobs/udev-rules/50-udev.rules

diff --git a/configuration/upstart.nix b/configuration/upstart.nix
index 27696a2daa7..256804ad5a4 100644
--- a/configuration/upstart.nix
+++ b/configuration/upstart.nix
@@ -20,7 +20,7 @@ import ../upstart-jobs/gather.nix {
     # The udev daemon creates devices nodes and runs programs when
     # hardware events occur.
     (import ../upstart-jobs/udev.nix {
-      inherit (pkgs) udev procps;
+      inherit (pkgs) writeText cleanSource udev procps;
     })
       
     # Hardware scan; loads modules for PCI devices.
diff --git a/upstart-jobs/udev-rules/50-udev.rules b/upstart-jobs/udev-rules/50-udev.rules
new file mode 100644
index 00000000000..06bf21707f1
--- /dev/null
+++ b/upstart-jobs/udev-rules/50-udev.rules
@@ -0,0 +1,24 @@
+# Miscellaneous devices.
+KERNEL=="mem|kmem",             GROUP="kmem", MODE="640"
+KERNEL=="port",                 GROUP="kmem", MODE="640"
+KERNEL=="nvram",                GROUP="kmem", MODE="600"
+KERNEL=="null",                 MODE="666"
+KERNEL=="zero",                 MODE="666"
+KERNEL=="full",                 MODE="622"
+KERNEL=="random",               MODE="666"
+KERNEL=="urandom",              MODE="644"
+KERNEL=="rtc",                  MODE="600"
+KERNEL=="sonypi",               MODE="0666"
+KERNEL=="agpgart",              MODE="0600", GROUP="video"
+
+
+# Input devices go under /dev/input.
+KERNEL=="mouse*|mice",          NAME="input/%k", MODE="0640"
+KERNEL=="event*",               NAME="input/%k", MODE="0640"
+KERNEL=="js*",                  NAME="input/%k", MODE="0644"
+KERNEL=="ts*",                  NAME="input/%k", MODE="0600"
+KERNEL=="uinput",               NAME="input/%k", MODE="0600"
+
+
+# Create a symlink for the CD-ROM device.
+KERNEL=="hd[a-z]", BUS=="ide", SYSFS{removable}=="1", SYSFS{device/media}=="cdrom", SYMLINK+="cdrom cdrom-%k"
diff --git a/upstart-jobs/udev.nix b/upstart-jobs/udev.nix
index e218246c046..892004c5d27 100644
--- a/upstart-jobs/udev.nix
+++ b/upstart-jobs/udev.nix
@@ -1,4 +1,12 @@
-{udev, procps}:
+{writeText, cleanSource, udev, procps}:
+
+let
+
+  conf = writeText "udev.conf" "
+    udev_rules=\"${cleanSource ./udev-rules}\"
+  ";
+
+in
 
 {
   name = "udev";
@@ -7,6 +15,8 @@
 start on startup
 stop on shutdown
 
+env UDEV_CONFIG_FILE=${conf}
+
 start script
     echo '' > /proc/sys/kernel/hotplug
 
-- 
GitLab


From 8f21b0119cdc252b44b1717cbce9541c668a5a4a Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sat, 16 Dec 2006 18:24:49 +0000
Subject: [PATCH 0307/5331] * Get the CD to build again.

svn path=/nixos/trunk/; revision=7356
---
 configuration/options.nix               |  9 ++++
 configuration/system.nix                |  2 +-
 configuration/upstart.nix               | 29 +++++++-----
 installer/nixos-installer.nix           |  8 +++-
 installer/nixos-installer.sh            |  5 +-
 instances/rescue-cd.nix                 | 63 +++++++++++++++----------
 upstart-jobs/tty-backgrounds-combine.sh |  6 +--
 7 files changed, 77 insertions(+), 45 deletions(-)

diff --git a/configuration/options.nix b/configuration/options.nix
index c8a2f07df01..54e0ea06227 100644
--- a/configuration/options.nix
+++ b/configuration/options.nix
@@ -189,4 +189,13 @@
   }
 
   
+  {
+    name = ["services" "xserver" "enable"];
+    default = false;
+    description = "
+      Whether to enable the X server.
+    ";
+  }
+
+  
 ]
diff --git a/configuration/system.nix b/configuration/system.nix
index f030717491c..dad9fe4d3a3 100644
--- a/configuration/system.nix
+++ b/configuration/system.nix
@@ -108,7 +108,7 @@ rec {
 
   # The services (Upstart) configuration for the system.
   upstartJobs = import ./upstart.nix {
-    inherit pkgs nix splashThemes;
+    inherit config pkgs nix splashThemes;
   };
 
 
diff --git a/configuration/upstart.nix b/configuration/upstart.nix
index 256804ad5a4..9f192bdd4a7 100644
--- a/configuration/upstart.nix
+++ b/configuration/upstart.nix
@@ -1,4 +1,4 @@
-{pkgs, nix, splashThemes}:
+{config, pkgs, nix, splashThemes}:
 
 let 
 
@@ -6,6 +6,9 @@ let
     inherit (pkgs) runCommand;
   };
 
+  optional = option: service:
+    if config.get option then [service] else [];
+
 in
 
 import ../upstart-jobs/gather.nix {
@@ -39,22 +42,11 @@ import ../upstart-jobs/gather.nix {
       dhcp = pkgs.dhcpWrapper;
     })
 
-    # SSH daemon.
-    (import ../upstart-jobs/sshd.nix {
-      inherit (pkgs) openssh;
-    })
-
     # Nix daemon - required for multi-user Nix.
     (import ../upstart-jobs/nix-daemon.nix {
       inherit nix;
     })
 
-    # X server.
-    (import ../upstart-jobs/xserver.nix {
-      inherit (pkgs) substituteAll;
-      inherit (pkgs.xorg) xorgserver xf86inputkeyboard xf86inputmouse xf86videovesa;
-    })
-
     # Transparent TTY backgrounds.
     (import ../upstart-jobs/tty-backgrounds.nix {
       inherit (pkgs) stdenv splashutils;
@@ -71,6 +63,19 @@ import ../upstart-jobs/gather.nix {
 
   ]
 
+  # SSH daemon.
+  ++ optional ["services" "sshd" "enable"]
+    (import ../upstart-jobs/sshd.nix {
+      inherit (pkgs) openssh;
+    })
+
+  # X server.
+  ++ optional ["services" "xserver" "enable"]
+    (import ../upstart-jobs/xserver.nix {
+      inherit (pkgs) substituteAll;
+      inherit (pkgs.xorg) xorgserver xf86inputkeyboard xf86inputmouse xf86videovesa;
+    })
+
   # Handles the reboot/halt events.
   ++ (map
     (event: makeJob (import ../upstart-jobs/halt.nix {
diff --git a/installer/nixos-installer.nix b/installer/nixos-installer.nix
index 651efeabeb5..fd77c713c21 100644
--- a/installer/nixos-installer.nix
+++ b/installer/nixos-installer.nix
@@ -1,10 +1,14 @@
-{stdenv, runCommand, substituteAll, nix}:
+{ stdenv, runCommand, substituteAll, nix
+, # URL of the Nixpkgs distribution that the installer will pull.
+  # Leave empty for a pure source distribution.
+  nixpkgsURL ? ""
+}:
 
 substituteAll {
   src = ./nixos-installer.sh;
   dir = "bin";
   isExecutable = true;
-  inherit nix;
+  inherit nix nixpkgsURL;
 
   pathsFromGraph = ../helpers/paths-from-graph.sh;
 
diff --git a/installer/nixos-installer.sh b/installer/nixos-installer.sh
index 28b9b48cac3..f356462369e 100644
--- a/installer/nixos-installer.sh
+++ b/installer/nixos-installer.sh
@@ -106,8 +106,9 @@ cp /etc/resolv.conf $mountPoint/etc/
 
 
 # Do a nix-pull to speed up building.
-nixpkgsURL=http://nix.cs.uu.nl/dist/nix/nixpkgs-0.11pre6984
-chroot $mountPoint @nix@/bin/nix-pull $nixpkgsURL/MANIFEST
+if test -n "@nixpkgsURL@"; then
+    chroot $mountPoint @nix@/bin/nix-pull @nixpkgsURL@/MANIFEST
+fi
 
 
 # Build the specified Nix expression in the target store and install
diff --git a/instances/rescue-cd.nix b/instances/rescue-cd.nix
index bfe4dca3fd1..9d89380c768 100644
--- a/instances/rescue-cd.nix
+++ b/instances/rescue-cd.nix
@@ -1,53 +1,66 @@
-let
+rec {
 
-  # The label used to identify the installation CD.
-  cdromLabel = "NIXOS";
+  
+  configuration = {
+    boot = {
+      autoDetectRootDevice = true;
+      readOnlyRoot = true;
+      # The label used to identify the installation CD.
+      rootLabel = "NIXOS";
+    };
+    services = {
+      sshd = {
+        enable = false;
+      };
+      xserver = {
+        enable = false;
+      };
+    };
+  };
 
-in
 
-  # Build boot scripts for the CD that find the CD-ROM automatically.
-  with import ../configuration/boot-environment.nix {
-    autoDetectRootDevice = true;
-    rootLabel = cdromLabel;
+  system = import ../configuration/system.nix {
+    inherit configuration;
     stage2Init = "/init";
-    readOnlyRoot = true;
   };
 
-  
-rec {
-
-  inherit nixosInstaller bootStage1 upstartJobs; # !!! debug
 
+  pkgs = system.pkgs;
+  
 
   # Since the CD is read-only, the mount points must be on disk.
   cdMountPoints = pkgs.runCommand "mount-points" {} "
     ensureDir $out
     cd $out
     mkdir proc sys tmp etc dev var mnt nix nix/var
-    touch $out/${cdromLabel}
+    touch $out/${configuration.boot.rootLabel}
   ";
 
 
   # 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.runCommand "tarball" "
+  makeTarball = tarName: input: pkgs.runCommand "tarball" {inherit tarName;} "
     ensureDir $out
     (cd ${input} && tar cvfj $out/${tarName} . \\
-      --exclude '*~' --exclude '.svn' \\
+      --exclude '*~' \\
       --exclude 'pkgs' --exclude 'result')
   ";
 
   
-  # Put the current directory in the tarball.  !!! This gives us a lot
-  # of crap (like .svn if this is a working copy).  An "svn export"
-  # would be better, but that's impure.
-  nixosTarball = makeTarball "nixos.tar.bz2" ./.;
+  # Put the current directory in a tarball (making sure to filter
+  # out crap like the .svn directories).
+  nixosTarball = makeTarball "nixos.tar.bz2" (builtins.filterSource
+    (name: let base = baseNameOf (toString name); in base != ".svn" && base != "result") ./..);
+
+
+  # Get a recent copy of Nixpkgs.
+  nixpkgsRel = "nixpkgs-0.11pre7355";
+  nixpkgsURL = http://nix.cs.uu.nl/dist/nix/ + nixpkgsRel;
 
-  
   nixpkgsTarball = pkgs.fetchurl {
-    url = http://nix.cs.uu.nl/dist/nix/nixpkgs-0.11pre7087/nixpkgs-0.11pre7087.tar.bz2;
-    md5 = "c5840fcd049d75e00ad856ecbbef6857";
+    url = nixpkgsURL + "/" + nixpkgsRel + ".tar.bz2";
+    md5 = "9d3e5e9f6ab64536803abf3f2e1c6056";
   };
 
 
@@ -68,7 +81,7 @@ rec {
       { source = pkgs.kernel + "/vmlinuz";
         target = "isolinux/vmlinuz";
       }
-      { source = initialRamdisk + "/initrd";
+      { source = system.initialRamdisk + "/initrd";
         target = "isolinux/initrd";
       }
       { source = cdMountPoints;
@@ -82,7 +95,7 @@ rec {
       }
     ];
 
-    init = bootStage2;
+    init = system.bootStage2;
     
     bootable = true;
     bootImage = "isolinux/isolinux.bin";
diff --git a/upstart-jobs/tty-backgrounds-combine.sh b/upstart-jobs/tty-backgrounds-combine.sh
index 894952d6940..66113864f7b 100644
--- a/upstart-jobs/tty-backgrounds-combine.sh
+++ b/upstart-jobs/tty-backgrounds-combine.sh
@@ -24,14 +24,14 @@ for ((n = 0; n < ${#ttys[*]}; n++)); do
     echo "TTY $tty -> $theme"
 
     themeName=$(cd $theme && ls | grep -v default)
-    
-    ln -sf $theme/$themeName $out/$themeName
+
+    ln -sfn $theme/$themeName $out/$themeName
 
     if test -e $out/$tty; then
         echo "Multiple themes defined for the same TTY!"
         exit 1
     fi
 
-    ln -sf $themeName $out/$tty
+    ln -sfn $themeName $out/$tty
     
 done
-- 
GitLab


From 3e7f4280df57ce69879bee643b10a6c8e8d1d4c4 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sat, 16 Dec 2006 21:48:12 +0000
Subject: [PATCH 0308/5331] * activate-configuration.sh: make sure that we're
 running on a NixOS   installation to prevent horrible accidents. * Add the
 kernel parameters to isolinux.cfg. * Use useradd/groupadd to create
 users/groups; use Glibc's getent to   check for existence. * Create the root
 account properly.

svn path=/nixos/trunk/; revision=7357
---
 boot/boot-stage-2-init.sh                |  2 +
 configuration/activate-configuration.sh  | 52 ++++++++++++------------
 configuration/etc.nix                    |  5 ++-
 configuration/etc/pam.d/login            |  2 +-
 configuration/etc/pam.d/shadow           |  6 +++
 configuration/switch-to-configuration.sh |  5 +++
 configuration/system.nix                 |  7 +++-
 helpers/isolinux.cfg                     |  6 ---
 installer/nixos-installer.sh             |  5 +++
 instances/rescue-cd.nix                  | 16 +++++++-
 upstart-jobs/udev.nix                    |  4 +-
 11 files changed, 69 insertions(+), 41 deletions(-)
 create mode 100644 configuration/etc/pam.d/shadow
 delete mode 100644 helpers/isolinux.cfg

diff --git a/boot/boot-stage-2-init.sh b/boot/boot-stage-2-init.sh
index 71d3fcc10b5..a29b874c032 100644
--- a/boot/boot-stage-2-init.sh
+++ b/boot/boot-stage-2-init.sh
@@ -69,6 +69,7 @@ mount -t tmpfs -o "mode=0755" none /dev
 needWritableDir /tmp 01777
 needWritableDir /var 0755
 needWritableDir /nix/var 0755
+needWritableDir /root 0700
 
 
 # Miscellaneous boot time cleanup.
@@ -77,6 +78,7 @@ rm -rf /var/run
 
 # Create the minimal device nodes needed before we run udev.
 mknod -m 0666 /dev/null c 1 3
+mknod -m 0644 /dev/urandom c 1 9 # needed for passwd
 
 
 # Run the script that performs all configuration activation that does
diff --git a/configuration/activate-configuration.sh b/configuration/activate-configuration.sh
index a6971c9f7fc..ca2f6963d76 100644
--- a/configuration/activate-configuration.sh
+++ b/configuration/activate-configuration.sh
@@ -1,7 +1,7 @@
 #! @shell@
 
 export PATH=/empty
-for i in @path@; do PATH=$PATH:$i/bin; done
+for i in @path@; do PATH=$PATH:$i/bin:$i/sbin; done
 
 
 # Set up the statically computed bits of /etc.
@@ -35,41 +35,42 @@ chmod 664 /var/run/utmp
 mkdir -m 0755 -p /var/log
 
 
-# Enable a password-less root login.
-source @accounts@
-
+# If there is no password file yet, create a root account with an
+# empty password.
 if ! test -e /etc/passwd; then
-    if test -n "@readOnlyRoot@"; then
-        rootHome=/
-    else
-        rootHome=/home/root
-        mkdir -p $rootHome
-    fi
-    createUser root '' 0 0 'System administrator' $rootHome/var/empty @shell@
-fi
-
-if ! test -e /etc/group; then
-    echo "root:*:0" > /etc/group
+    rootHome=/root
+    touch /etc/passwd; chmod 0755 /etc/passwd
+    touch /etc/group; chmod 0755 /etc/passwd
+    touch /etc/shadow; chmod 0700 /etc/passwd
+    # Can't use useradd, since it complain that it doesn't know us
+    # (bootstrap problem!). 
+    echo "root:x:0:0:System administrator:$rootHome:@shell@" >> /etc/passwd
+    echo "root::::::::" >> /etc/shadow
+    groupadd -g 0 root
+    echo | passwd --stdin root
 fi
 
 
 # Set up Nix accounts.
 if test -z "@readOnlyRoot@"; then
 
+    if ! getent group nixbld > /dev/null; then
+        groupadd -g 30000 nixbld
+    fi
+
+    if ! getent group nogroup > /dev/null; then
+        groupadd -g 65534 nogroup
+    fi
+
     for i in $(seq 1 10); do
         account=nixbld$i
-        if ! userExists $account; then
-            createUser $account x \
-                $((i + 30000)) 30000 \
-                'Nix build user' /var/empty /noshell
+        if ! getent passwd $account > /dev/null; then
+            useradd -u $((i + 30000)) -g nogroup -G nixbld \
+                -d /var/empty -s /noshell \
+                -c "Nix build user $i" $account
         fi
-        accounts="$accounts${accounts:+,}$account"
     done
 
-    if ! grep -q "^nixbld:" /etc/group; then
-        echo "nixbld:*:30000:$accounts" >> /etc/group
-    fi
-
     mkdir -p /nix/etc/nix
     cat > /nix/etc/nix/nix.conf <<EOF
 build-users-group = nixbld
@@ -108,9 +109,6 @@ mkdir -m 0755 -p /nix/var/nix/temproots
 
 ln -sf /nix/var/nix/profiles /nix/var/nix/gcroots/
 
-chown root.nixbld /nix/store
-chmod 1775 /nix/store
-
 
 # Make a few setuid programs work.
 wrapperDir=@wrapperDir@
diff --git a/configuration/etc.nix b/configuration/etc.nix
index c65cafe33e4..be3bcf7b980 100644
--- a/configuration/etc.nix
+++ b/configuration/etc.nix
@@ -66,10 +66,11 @@ import ../helpers/make-etc.nix {
     )
     [
       "login"
-      "sshd"
+      "other"
       "passwd"
+      "shadow"
+      "sshd"
       "useradd"
-      "other"
     ]
   );
 }
\ No newline at end of file
diff --git a/configuration/etc/pam.d/login b/configuration/etc/pam.d/login
index d3463aab5ae..83c1bcd2f34 100644
--- a/configuration/etc/pam.d/login
+++ b/configuration/etc/pam.d/login
@@ -1,4 +1,4 @@
-auth     required       @pam_unix2@/lib/security/pam_unix2.so
+auth     required       @pam_unix2@/lib/security/pam_unix2.so nullok
 account  required       @pam_unix2@/lib/security/pam_unix2.so
 password required       @pam_unix2@/lib/security/pam_unix2.so nullok
 session  required       @pam_unix2@/lib/security/pam_unix2.so
diff --git a/configuration/etc/pam.d/shadow b/configuration/etc/pam.d/shadow
new file mode 100644
index 00000000000..0148f1fea27
--- /dev/null
+++ b/configuration/etc/pam.d/shadow
@@ -0,0 +1,6 @@
+# Used by groupadd etc.
+auth     sufficient     pam_rootok.so
+auth     required       pam_permit.so
+account  required       pam_permit.so
+password required       pam_permit.so
+session  required       pam_deny.so
diff --git a/configuration/switch-to-configuration.sh b/configuration/switch-to-configuration.sh
index 8c03311a7c5..faf592834d9 100644
--- a/configuration/switch-to-configuration.sh
+++ b/configuration/switch-to-configuration.sh
@@ -5,6 +5,11 @@ export PATH=/empty
 for i in @path@; do PATH=$PATH:$i/bin; done
 action="$1"
 
+if ! test -e /etc/NIXOS; then
+    echo "This is not a NixOS installation (/etc/NIXOS) is missing!"
+    exit 1
+fi
+
 if test -z "$action"; then
     cat <<EOF
 Usage: $0 [switch|boot|test]
diff --git a/configuration/system.nix b/configuration/system.nix
index dad9fe4d3a3..a78708e8e4a 100644
--- a/configuration/system.nix
+++ b/configuration/system.nix
@@ -174,9 +174,12 @@ rec {
     readOnlyRoot = config.get ["boot" "readOnlyRoot"];
     hostName = config.get ["networking" "hostname"];
     wrapperDir = setuidWrapper.wrapperDir;
-    accounts = ../helpers/accounts.sh;
 
-    path = [pkgs.coreutils pkgs.gnugrep pkgs.findutils];
+    path = [
+      pkgs.coreutils pkgs.gnugrep pkgs.findutils
+      pkgs.glibc # needed for getent
+      pkgs.pwdutils
+    ];
 
     # We don't want to put all of `startPath' and `path' in $PATH, since
     # then we get an embarrassingly long $PATH.  So use the user
diff --git a/helpers/isolinux.cfg b/helpers/isolinux.cfg
deleted file mode 100644
index ff19e84c098..00000000000
--- a/helpers/isolinux.cfg
+++ /dev/null
@@ -1,6 +0,0 @@
-default linux
-prompt 1
-timeout 60
-label linux
-  kernel vmlinuz
-  append initrd=initrd selinux=0 apm=on acpi=on
diff --git a/installer/nixos-installer.sh b/installer/nixos-installer.sh
index f356462369e..6b6878f987e 100644
--- a/installer/nixos-installer.sh
+++ b/installer/nixos-installer.sh
@@ -128,6 +128,11 @@ chroot $mountPoint @nix@/bin/nix-env \
 echo "$targetDevice / somefs rw 0 0" > $mountPoint/etc/mtab
 
 
+# Mark the target as a NixOS installation, otherwise
+# switch-to-configuration will chicken out.
+touch $mountPoint/etc/NIXOS
+
+
 # Switch to the new system configuration.  This will install Grub with
 # a menu default pointing at the kernel/initrd/etc of the new
 # configuration.
diff --git a/instances/rescue-cd.nix b/instances/rescue-cd.nix
index 9d89380c768..8e201762b74 100644
--- a/instances/rescue-cd.nix
+++ b/instances/rescue-cd.nix
@@ -32,7 +32,7 @@ rec {
   cdMountPoints = pkgs.runCommand "mount-points" {} "
     ensureDir $out
     cd $out
-    mkdir proc sys tmp etc dev var mnt nix nix/var
+    mkdir proc sys tmp etc dev var mnt nix nix/var root
     touch $out/${configuration.boot.rootLabel}
   ";
 
@@ -64,6 +64,18 @@ rec {
   };
 
 
+  # The configuration file for isolinux.
+  isolinuxCfg = pkgs.writeText "isolinux.cfg" "
+    default linux
+    prompt 1
+    timeout 60
+    label linux
+      kernel vmlinuz
+      append initrd=initrd ${toString (system.config.get ["boot" "kernelParams"])}
+  ";
+    
+
+
   # Create an ISO image containing the isolinux boot loader, the
   # kernel, the initrd produced above, and the closure of the stage 2
   # init.
@@ -75,7 +87,7 @@ rec {
       { source = pkgs.syslinux + "/lib/syslinux/isolinux.bin";
         target = "isolinux/isolinux.bin";
       }
-      { source = ../helpers/isolinux.cfg;
+      { source = isolinuxCfg;
         target = "isolinux/isolinux.cfg";
       }
       { source = pkgs.kernel + "/vmlinuz";
diff --git a/upstart-jobs/udev.nix b/upstart-jobs/udev.nix
index 892004c5d27..0da100f7a1b 100644
--- a/upstart-jobs/udev.nix
+++ b/upstart-jobs/udev.nix
@@ -32,7 +32,9 @@ start script
     # Kill udev, let Upstart restart and monitor it.  (This is nasty,
     # but we have to run udevtrigger first.  Maybe we can use
     # Upstart's `binary' keyword, but it isn't implemented yet.)
-    ${procps}/bin/pkill -u root '^udevd$'
+    if ${procps}/bin/pkill -u root '^udevd$'; then
+        echo \"couldn't stop udevd\"
+    fi
 end script
 
 respawn ${udev}/sbin/udevd
-- 
GitLab


From a0759a51e93349ea0c7b729a25ce10b4c5cb1bcc Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sat, 16 Dec 2006 23:50:10 +0000
Subject: [PATCH 0309/5331] * Some installer fixes. * Readme.

svn path=/nixos/trunk/; revision=7358
---
 README                       | 80 ++++++++++++++++++++++++++++++++----
 installer/nixos-installer.sh | 22 +++++++---
 2 files changed, 88 insertions(+), 14 deletions(-)

diff --git a/README b/README
index e2f76b08301..ca045e89342 100644
--- a/README
+++ b/README
@@ -1,19 +1,81 @@
-To get a Stage 1 shell:
+*** Building the installation CD ***
 
-Add "debug1" to the kernel command line.
+- Make sure that you have a very recent Nix.
 
+- Pull from the Nixpkgs channel to speed up building.
 
-Switching to maintenance mode:
+- Check out https://svn.cs.uu.nl:12443/repos/trace/nixos/trunk/.
 
-$ shutdown now
+- Build the ISO image:
 
-To get out of maintenance mode:
+  $ nix-build instances/rescue-cd.nix -A rescueCD
+
+  This gives you an image in result/iso/nixos.iso.
+
+- Burn the ISO image or attach it to a CD-ROM drive in VMware.
+
+
+*** Installation ***
+
+- Boot from the CD.
+
+- The CD contains a pretty complete NixOS installation.  When it's
+  finished booting, it should have detected most of your hardware and
+  brought up networking (check ifconfig).  Networking is necessary for
+  the installer.  It's best if you have a DHCP server on your
+  network.  Otherwise configure manually.
+
+- Login as "root", empty password.
+
+- The NixOS installer doesn't do any partitioning or formatting yet,
+  so you need to that yourself.  Use "fdisk" and "e2fsck".
+
+- Unpack the NixOS and Nixpkgs sources:
+
+  $ tar xf /nixos.tar.bz2
+  $ tar xf /nixpkgs.tar.bz2
+  $ ln -s nixpkgs-*/pkgs .
+
+  (TODO: do this automatically.)
+
+- The installation is declarative; you need to make a description of
+  the configuration that is to be built and activated.  The
+  configuration is specified in a Nix expression.  See
+  instances/examples for example machine configurations.  You can copy
+  and edit one of those (e.g., instances/examples/basic.nix to
+  my-config.nix).  See configuration/options.nix for available
+  configuration settings.  The text editor "nano" is available.
 
-$ initctl emit startup 
+  In particular you need to specify boot.rootDevice and
+  boot.grubDevice for the devices where the OS and Grub are to be
+  installed, respectively.
 
+- Do the installation:
 
-Updating the current system configuration:
+  $ nixos-installer.sh /dev/TARGET . my-config.nix
 
-$ nix-env -p /nix/var/nix/profiles/system -f system-configuration.nix -i -A systemConfiguration
-$ /nix/var/nix/profiles/system/bin/switch-to-configuration
+  where TARGET matched boot.rootDevice in your configuration.  (TODO:
+  this should be extracted automatically.)
+
+- If everything went well:
+
+  $ reboot
+
+  You should now be able to boot into the installed NixOS.
+  
+
+*** Troubleshooting ***        
+
+
+To get a Stage 1 shell:
+
+- Add "debug1" to the kernel command line.
+
+
+To switch to maintenance mode:
+
+  $ shutdown now
+
+To get out of maintenance mode:
 
+  $ initctl emit startup 
diff --git a/installer/nixos-installer.sh b/installer/nixos-installer.sh
index 6b6878f987e..e2ab51599f9 100644
--- a/installer/nixos-installer.sh
+++ b/installer/nixos-installer.sh
@@ -16,14 +16,16 @@
 set -e
 
 targetDevice="$1"
-nixExpr="$2"
+nixosDir="$2"
+configuration="$3"
 
-if test -z "$targetDevice" -o -z "$nixExpr"; then
-    echo "Syntax: installer.sh <targetDevice> <nixExpr>"
+if test -z "$targetDevice" -o -z "$nixosDir" -o -z "$configuration"; then
+    echo "Syntax: installer.sh <targetDevice> <nixosDir> <configuration>"
     exit 1
 fi
 
-nixExpr=$(readlink -f "$nixExpr")
+nixosDir=$(readlink -f "$nixosDir")
+configuration=$(readlink -f "$configuration")
 
 
 # Make sure that the target device isn't mounted.
@@ -121,7 +123,17 @@ fi
 
 chroot $mountPoint @nix@/bin/nix-env \
     -p /nix/var/nix/profiles/system \
-    -f "/mnt/$nixExpr" -i --set system
+    -f "/mnt/$nixosDir/configuration/system.nix" \
+    --arg configuration "import /mnt/$configuration" \
+    --set -A system
+
+
+# Copy the configuration to /etc/nixos.
+if test -e $mountPoint/etc/nixos/configuration.nix; then
+    mv $mountPoint/etc/nixos/configuration.nix \
+       $mountPoint/etc/nixos/configuration.backup-$(date "+%Y%m%d%H%M%S").nix
+fi
+cp $configuration $mountPoint/etc/nixos/configuration.nix
 
 
 # Grub needs a mtab.
-- 
GitLab


From c5ab0cec9f0a4622ba96a40bf2dc3c5e29e42d5b Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sun, 17 Dec 2006 00:10:28 +0000
Subject: [PATCH 0310/5331] * More installer fixes.

svn path=/nixos/trunk/; revision=7359
---
 installer/nixos-installer.sh | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/installer/nixos-installer.sh b/installer/nixos-installer.sh
index e2ab51599f9..c39d5ea698d 100644
--- a/installer/nixos-installer.sh
+++ b/installer/nixos-installer.sh
@@ -123,17 +123,17 @@ fi
 
 chroot $mountPoint @nix@/bin/nix-env \
     -p /nix/var/nix/profiles/system \
-    -f "/mnt/$nixosDir/configuration/system.nix" \
-    --arg configuration "import /mnt/$configuration" \
+    -f "/mnt$nixosDir/configuration/system.nix" \
+    --arg configuration "import /mnt$configuration" \
     --set -A system
 
 
 # Copy the configuration to /etc/nixos.
-if test -e $mountPoint/etc/nixos/configuration.nix; then
-    mv $mountPoint/etc/nixos/configuration.nix \
-       $mountPoint/etc/nixos/configuration.backup-$(date "+%Y%m%d%H%M%S").nix
+targetConfig=$mountPoint/etc/nixos/configuration.nix
+if test -e $targetConfig -o -L $targetConfig; then
+    mv $targetConfig $targetConfig.backup-$(date "+%Y%m%d%H%M%S")
 fi
-cp $configuration $mountPoint/etc/nixos/configuration.nix
+cp $configuration $targetConfig
 
 
 # Grub needs a mtab.
@@ -149,4 +149,5 @@ touch $mountPoint/etc/NIXOS
 # a menu default pointing at the kernel/initrd/etc of the new
 # configuration.
 echo "finalising the installation..."
-NIXOS_INSTALL_GRUB=1 chroot $mountPoint /nix/var/nix/profiles/system/bin/switch-to-configuration
+NIXOS_INSTALL_GRUB=1 chroot $mountPoint \
+    /nix/var/nix/profiles/system/bin/switch-to-configuration boot
-- 
GitLab


From 07c3eefe2795af8712b3a598d6fb53a3c5642dba Mon Sep 17 00:00:00 2001
From: Armijn Hemel <armijn@gpl-violations.org>
Date: Mon, 18 Dec 2006 00:12:45 +0000
Subject: [PATCH 0311/5331] add instruction to add symlink to nixpkgs

svn path=/nixos/trunk/; revision=7361
---
 README | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/README b/README
index ca045e89342..2bb57388c48 100644
--- a/README
+++ b/README
@@ -6,6 +6,8 @@
 
 - Check out https://svn.cs.uu.nl:12443/repos/trace/nixos/trunk/.
 
+- make a symbolic link called "pkgs" to the location of Nixpkgs
+
 - Build the ISO image:
 
   $ nix-build instances/rescue-cd.nix -A rescueCD
-- 
GitLab


From 1852d493f453e5c850ef5e13c4b7bb4e2954e194 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 18 Dec 2006 15:16:20 +0000
Subject: [PATCH 0312/5331] * Fix the sshd and xserver jobs.

svn path=/nixos/trunk/; revision=7379
---
 configuration/upstart.nix    | 2 +-
 instances/examples/basic.nix | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/configuration/upstart.nix b/configuration/upstart.nix
index 9f192bdd4a7..3373ca335c4 100644
--- a/configuration/upstart.nix
+++ b/configuration/upstart.nix
@@ -7,7 +7,7 @@ let
   };
 
   optional = option: service:
-    if config.get option then [service] else [];
+    if config.get option then [(makeJob service)] else [];
 
 in
 
diff --git a/instances/examples/basic.nix b/instances/examples/basic.nix
index d5357785810..eedfa5f74b6 100644
--- a/instances/examples/basic.nix
+++ b/instances/examples/basic.nix
@@ -5,4 +5,9 @@
     readOnlyRoot = false;
     grubDevice = "/dev/hda";
   };
+  services = {
+    sshd = {
+      enable = true;
+    };
+  };
 }
-- 
GitLab


From 4ae268739d8cf4493186850b9b22e0c0738fd25c Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 18 Dec 2006 15:41:18 +0000
Subject: [PATCH 0313/5331] * Use services.mingetty.ttys.

svn path=/nixos/trunk/; revision=7381
---
 configuration/upstart.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/configuration/upstart.nix b/configuration/upstart.nix
index 3373ca335c4..ea1ce4a443f 100644
--- a/configuration/upstart.nix
+++ b/configuration/upstart.nix
@@ -91,7 +91,7 @@ import ../upstart-jobs/gather.nix {
       inherit (pkgs) mingetty pam_login;
       inherit ttyNumber;
     }))
-    [1 2 3 4 5 6]
+    (config.get ["services" "mingetty" "ttys"])
   )
 
   # For the builtin logd job.
-- 
GitLab


From 87e24568145174920b3dc7be840899738a342aee Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 18 Dec 2006 15:48:29 +0000
Subject: [PATCH 0314/5331] * Use getenv/useradd.

svn path=/nixos/trunk/; revision=7382
---
 configuration/upstart.nix |  2 +-
 helpers/accounts.sh       | 20 --------------------
 upstart-jobs/sshd.nix     | 10 ++++------
 3 files changed, 5 insertions(+), 27 deletions(-)
 delete mode 100644 helpers/accounts.sh

diff --git a/configuration/upstart.nix b/configuration/upstart.nix
index ea1ce4a443f..583b93a3930 100644
--- a/configuration/upstart.nix
+++ b/configuration/upstart.nix
@@ -66,7 +66,7 @@ import ../upstart-jobs/gather.nix {
   # SSH daemon.
   ++ optional ["services" "sshd" "enable"]
     (import ../upstart-jobs/sshd.nix {
-      inherit (pkgs) openssh;
+      inherit (pkgs) openssh glibc pwdutils;
     })
 
   # X server.
diff --git a/helpers/accounts.sh b/helpers/accounts.sh
deleted file mode 100644
index 1e189c56e7f..00000000000
--- a/helpers/accounts.sh
+++ /dev/null
@@ -1,20 +0,0 @@
-userExists() {
-    local name="$1"
-    if id -u "$name" > /dev/null 2>&1; then
-        return 0 # true
-    else
-        return 1 # false
-    fi
-}
-
-
-createUser() {
-    local name="$1"
-    local password="$2"
-    local uid="$3"
-    local gid="$4"
-    local gecos="$5"
-    local homedir="$6"
-    local shell="$7"
-    echo "$name:$password:$uid:$gid:$gecos:$homedir:$shell" >> /etc/passwd
-}
diff --git a/upstart-jobs/sshd.nix b/upstart-jobs/sshd.nix
index 4aa35319a28..ad530a60fa4 100644
--- a/upstart-jobs/sshd.nix
+++ b/upstart-jobs/sshd.nix
@@ -1,4 +1,4 @@
-{openssh}:
+{openssh, glibc, pwdutils}:
 
 {
   name = "sshd";
@@ -10,8 +10,6 @@ start on network-interfaces/started
 stop on network-interfaces/stop
 
 start script
-    source ${../helpers/accounts.sh}
-
     mkdir -m 0555 -p /var/empty
 
     mkdir -m 0755 -p /etc/ssh
@@ -20,10 +18,10 @@ start script
         ${openssh}/bin/ssh-keygen -t dsa -b 1024 -f /etc/ssh/ssh_host_dsa_key -N ''
     fi
 
-    if ! userExists sshd; then
-        createUser sshd x 74 74 'SSH privilege separation user' /var/empty /noshell
+    if ! {glibc}/bin/getent passwd sshd > /dev/null; then
+        ${pwdutils}/sbin/useradd -g nogroup -d /var/empty -s /noshell \\
+            -c 'SSH privilege separation user' sshd
     fi
-
 end script
 
 respawn ${openssh}/sbin/sshd -D -h /etc/ssh/ssh_host_dsa_key -f ${./sshd_config}
-- 
GitLab


From 84f1e01646220cc1cf790da3456fea78f1e1f093 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 18 Dec 2006 15:52:43 +0000
Subject: [PATCH 0315/5331] * Doh.

svn path=/nixos/trunk/; revision=7384
---
 upstart-jobs/sshd.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/upstart-jobs/sshd.nix b/upstart-jobs/sshd.nix
index ad530a60fa4..7f4104625b9 100644
--- a/upstart-jobs/sshd.nix
+++ b/upstart-jobs/sshd.nix
@@ -18,7 +18,7 @@ start script
         ${openssh}/bin/ssh-keygen -t dsa -b 1024 -f /etc/ssh/ssh_host_dsa_key -N ''
     fi
 
-    if ! {glibc}/bin/getent passwd sshd > /dev/null; then
+    if ! ${glibc}/bin/getent passwd sshd > /dev/null; then
         ${pwdutils}/sbin/useradd -g nogroup -d /var/empty -s /noshell \\
             -c 'SSH privilege separation user' sshd
     fi
-- 
GitLab


From 37c17d760129be116cca67661acc947ce43be522 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 18 Dec 2006 16:27:56 +0000
Subject: [PATCH 0316/5331] * When runtime switching to a new configuration,
 stop/start/restart   Upstart jobs as appropriate.  I.e., if a job exists in
 the old but   not the new configuration, stop it; if it exists in the new but
 not   the old, start it; and most interesting, if it exists in both but   its
 store paths differ, restart it.  So the purely functional model   combined
 cryptographic hashing allows us to precisely identify how   two
 configurations differ from each other

svn path=/nixos/trunk/; revision=7385
---
 configuration/switch-to-configuration.sh | 39 ++++++++++++++++++++++--
 configuration/system.nix                 |  9 +++++-
 2 files changed, 45 insertions(+), 3 deletions(-)

diff --git a/configuration/switch-to-configuration.sh b/configuration/switch-to-configuration.sh
index faf592834d9..11a5ccb5367 100644
--- a/configuration/switch-to-configuration.sh
+++ b/configuration/switch-to-configuration.sh
@@ -2,7 +2,7 @@
 
 set -e
 export PATH=/empty
-for i in @path@; do PATH=$PATH:$i/bin; done
+for i in @path@; do PATH=$PATH:$i/bin:$i/sbin; done
 action="$1"
 
 if ! test -e /etc/NIXOS; then
@@ -34,9 +34,44 @@ if test "$action" = "switch" -o "$action" = "boot"; then
 fi
 
 if test "$action" = "switch" -o "$action" = "test"; then
+
+    oldEvents=$(readlink -f /etc/event.d || true)
+    newEvents=$(readlink -f @out@/etc/event.d)
+
+    echo "old: $oldEvents"
+    echo "new: $newEvents"
+
+    # Stop all services that are not in the new Upstart
+    # configuration.
+    for event in $(cd $oldEvents && ls); do
+        if ! test -e "$newEvents/$event"; then
+            echo "stopping $event..."
+            initctl stop "$event"
+        fi
+    done
+
+    # Activate the new configuration (i.e., update /etc, make
+    # accounts, and so on).
     echo "Activating the configuration..."
     @out@/activate
-    kill -TERM 1 # make Upstart reload its events    
+
+    # Make Upstart reload its events.  !!! Should wait until it has
+    # finished processing its stop events.
+    kill -TERM 1 
+
+    # Start all new services and restart all changed services.
+    for event in $(cd $newEvents && ls); do
+        if ! test -e "$oldEvents/$event"; then
+            echo "starting $event..."
+            initctl start "$event"
+        elif test "$(readlink "$oldEvents/$event")" != "$(readlink "$newEvents/$event")"; then
+            echo "restarting $event..."
+            initctl stop "$event"
+            initctl start "$event"
+        else
+            echo "unchanged $event"
+        fi
+    done
 fi
 
 sync
diff --git a/configuration/system.nix b/configuration/system.nix
index a78708e8e4a..5a91c38e95b 100644
--- a/configuration/system.nix
+++ b/configuration/system.nix
@@ -242,7 +242,14 @@ rec {
     kernel = pkgs.kernel + "/vmlinuz";
     initrd = initialRamdisk + "/initrd";
     # Most of these are needed by grub-install.
-    path = [pkgs.coreutils pkgs.gnused pkgs.gnugrep pkgs.findutils pkgs.diffutils];
+    path = [
+      pkgs.coreutils
+      pkgs.gnused
+      pkgs.gnugrep
+      pkgs.findutils
+      pkgs.diffutils
+      pkgs.upstart # for initctl
+    ];
   };
 
 
-- 
GitLab


From 1604d2fa815e62f5d29dcc59bed8196e9d5a510c Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 18 Dec 2006 17:41:46 +0000
Subject: [PATCH 0317/5331] svn path=/nixos/trunk/; revision=7387

---
 configuration/upstart.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/configuration/upstart.nix b/configuration/upstart.nix
index 583b93a3930..210ea6a5f40 100644
--- a/configuration/upstart.nix
+++ b/configuration/upstart.nix
@@ -94,6 +94,9 @@ import ../upstart-jobs/gather.nix {
     (config.get ["services" "mingetty" "ttys"])
   )
 
+  # User-defined events.
+  ++ (map makeJob (config.get ["services" "extraJobs"]))
+
   # For the builtin logd job.
   ++ [pkgs.upstart];
 }
-- 
GitLab


From 8293f1eb61bdd782193505708067e5dd3e44432c Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 18 Dec 2006 17:41:57 +0000
Subject: [PATCH 0318/5331] svn path=/nixos/trunk/; revision=7388

---
 configuration/options.nix | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/configuration/options.nix b/configuration/options.nix
index 54e0ea06227..3dc02e6c14d 100644
--- a/configuration/options.nix
+++ b/configuration/options.nix
@@ -137,6 +137,15 @@
     ";
   }
 
+
+  {
+    name = ["services" "extraJobs"];
+    default = [];
+    description = "
+      Additional Upstart jobs.
+    ";
+  }
+
   
   {
     name = ["services" "syslogd" "tty"];
-- 
GitLab


From 70f929a0a5bdc5bc0db38542abc1303f4265e4ca Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 18 Dec 2006 19:20:03 +0000
Subject: [PATCH 0319/5331] * Upstart job for Apache.

svn path=/nixos/trunk/; revision=7391
---
 configuration/options.nix |  9 +++++++
 configuration/upstart.nix |  7 ++++++
 upstart-jobs/httpd.nix    | 50 +++++++++++++++++++++++++++++++++++++++
 3 files changed, 66 insertions(+)
 create mode 100644 upstart-jobs/httpd.nix

diff --git a/configuration/options.nix b/configuration/options.nix
index 3dc02e6c14d..bcad035849f 100644
--- a/configuration/options.nix
+++ b/configuration/options.nix
@@ -207,4 +207,13 @@
   }
 
   
+  {
+    name = ["services" "httpd" "enable"];
+    default = false;
+    description = "
+      Whether to enable the Apache httpd server.
+    ";
+  }
+
+  
 ]
diff --git a/configuration/upstart.nix b/configuration/upstart.nix
index 210ea6a5f40..4a7e124c271 100644
--- a/configuration/upstart.nix
+++ b/configuration/upstart.nix
@@ -76,6 +76,13 @@ import ../upstart-jobs/gather.nix {
       inherit (pkgs.xorg) xorgserver xf86inputkeyboard xf86inputmouse xf86videovesa;
     })
 
+  # Apache httpd.
+  ++ optional ["services" "httpd" "enable"]
+    (import ../upstart-jobs/httpd.nix {
+      inherit pkgs;
+      inherit (pkgs) glibc pwdutils;
+    })
+
   # Handles the reboot/halt events.
   ++ (map
     (event: makeJob (import ../upstart-jobs/halt.nix {
diff --git a/upstart-jobs/httpd.nix b/upstart-jobs/httpd.nix
new file mode 100644
index 00000000000..80f24a01766
--- /dev/null
+++ b/upstart-jobs/httpd.nix
@@ -0,0 +1,50 @@
+{pkgs, glibc, pwdutils}:
+
+let
+
+  user = "wwwrun";
+  group = "wwwrun";
+
+  webServer = import ../services/apache-httpd {
+    inherit (pkgs) apacheHttpd coreutils;
+    stdenv = pkgs.stdenvNew;
+
+    hostName = "localhost";
+    httpPort = 80;
+
+    inherit user group;
+    
+    adminAddr = "eelco@cs.uu.nl";
+
+    logDir = "/var/log/httpd";
+    stateDir = "/var/run/httpd";
+
+    subServices = [];
+  };
+
+in
+
+{
+  name = "httpd";
+  
+  job = "
+description \"Apache HTTPD\"
+
+start on network-interfaces/started
+stop on network-interfaces/stop
+
+start script
+    if ! ${glibc}/bin/getent group ${group} > /dev/null; then
+        ${pwdutils}/sbin/groupadd ${group}
+    fi
+
+    if ! ${glibc}/bin/getent passwd ${user} > /dev/null; then
+        ${pwdutils}/sbin/useradd -g ${group} -d /var/empty -s /noshell \\
+            -c 'Apache httpd user' ${user}
+    fi
+end script
+
+exec ${webServer}/bin/control start
+  ";
+  
+}
-- 
GitLab


From 9f479291385e087afabc91eee7682eed87f2b65c Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 18 Dec 2006 19:46:48 +0000
Subject: [PATCH 0320/5331] * Apache configuration.

svn path=/nixos/trunk/; revision=7393
---
 configuration/options.nix | 78 ++++++++++++++++++++++++++++++++++++++-
 configuration/system.nix  |  2 +-
 configuration/upstart.nix |  5 ++-
 upstart-jobs/httpd.nix    | 23 +++++++-----
 4 files changed, 95 insertions(+), 13 deletions(-)

diff --git a/configuration/options.nix b/configuration/options.nix
index bcad035849f..fa05d544307 100644
--- a/configuration/options.nix
+++ b/configuration/options.nix
@@ -2,7 +2,7 @@
 
 
   { 
-    name = ["networking" "hostname"];
+    name = ["networking" "hostName"];
     default = "nixos";
     description = "The name of the machine.";
   }
@@ -216,4 +216,80 @@
   }
 
   
+  {
+    name = ["services" "httpd" "user"];
+    default = "wwwrun";
+    description = "
+      User account under which httpd runs.  The account is created
+      automatically if it doesn't exist.
+    ";
+  }
+
+  
+  {
+    name = ["services" "httpd" "group"];
+    default = "wwwrun";
+    description = "
+      Group under which httpd runs.  The account is created
+      automatically if it doesn't exist.
+    ";
+  }
+
+  
+  {
+    name = ["services" "httpd" "hostName"];
+    default = "localhost";
+    description = "
+      Canonical hostname for the server.
+    ";
+  }
+
+  
+  {
+    name = ["services" "httpd" "httpPort"];
+    default = 80;
+    description = "
+      Port for unencrypted HTTP requests.
+    ";
+  }
+
+  
+  {
+    name = ["services" "httpd" "httpsPort"];
+    default = 443;
+    description = "
+      Port for encrypted HTTP requests.
+    ";
+  }
+
+  
+  {
+    name = ["services" "httpd" "adminAddr"];
+    example = "admin@example.org";
+    description = "
+      E-mail address of the server administrator.
+    ";
+  }
+
+  
+  {
+    name = ["services" "httpd" "logDir"];
+    default = "/var/log/httpd";
+    description = "
+      Directory for Apache's log files.  It is created automatically.
+    ";
+  }
+
+  
+  {
+    name = ["services" "httpd" "stateDir"];
+    default = "/var/run/httpd";
+    description = "
+      Directory for Apache's transient runtime state (such as PID
+      files).  It is created automatically.  Note that the default,
+      /var/run/httpd, is deleted at boot time.
+    ";
+  }
+
+  
 ]
diff --git a/configuration/system.nix b/configuration/system.nix
index 5a91c38e95b..fddb0e4c41f 100644
--- a/configuration/system.nix
+++ b/configuration/system.nix
@@ -172,7 +172,7 @@ rec {
     inherit etc;
     inherit (pkgs) kernel;
     readOnlyRoot = config.get ["boot" "readOnlyRoot"];
-    hostName = config.get ["networking" "hostname"];
+    hostName = config.get ["networking" "hostName"];
     wrapperDir = setuidWrapper.wrapperDir;
 
     path = [
diff --git a/configuration/upstart.nix b/configuration/upstart.nix
index 4a7e124c271..d6249fc0294 100644
--- a/configuration/upstart.nix
+++ b/configuration/upstart.nix
@@ -79,7 +79,7 @@ import ../upstart-jobs/gather.nix {
   # Apache httpd.
   ++ optional ["services" "httpd" "enable"]
     (import ../upstart-jobs/httpd.nix {
-      inherit pkgs;
+      inherit config pkgs;
       inherit (pkgs) glibc pwdutils;
     })
 
@@ -104,6 +104,7 @@ import ../upstart-jobs/gather.nix {
   # User-defined events.
   ++ (map makeJob (config.get ["services" "extraJobs"]))
 
-  # For the builtin logd job.
+  # For the built-in logd job.
   ++ [pkgs.upstart];
+  
 }
diff --git a/upstart-jobs/httpd.nix b/upstart-jobs/httpd.nix
index 80f24a01766..4167343b6ad 100644
--- a/upstart-jobs/httpd.nix
+++ b/upstart-jobs/httpd.nix
@@ -1,23 +1,26 @@
-{pkgs, glibc, pwdutils}:
+{config, pkgs, glibc, pwdutils}:
 
 let
 
-  user = "wwwrun";
-  group = "wwwrun";
+  getCfg = option: config.get ["services" "httpd" option];
+
+  user = getCfg "user";
+  group = getCfg "group";
 
   webServer = import ../services/apache-httpd {
     inherit (pkgs) apacheHttpd coreutils;
     stdenv = pkgs.stdenvNew;
 
-    hostName = "localhost";
-    httpPort = 80;
+    hostName = getCfg "hostName";
+    httpPort = getCfg "httpPort";
+    httpsPort = getCfg "httpsPort";
 
     inherit user group;
     
-    adminAddr = "eelco@cs.uu.nl";
+    adminAddr = getCfg "adminAddr";
 
-    logDir = "/var/log/httpd";
-    stateDir = "/var/run/httpd";
+    logDir = getCfg "logDir";
+    stateDir = getCfg "stateDir";
 
     subServices = [];
   };
@@ -42,9 +45,11 @@ start script
         ${pwdutils}/sbin/useradd -g ${group} -d /var/empty -s /noshell \\
             -c 'Apache httpd user' ${user}
     fi
+
+    ${webServer}/bin/control prepare    
 end script
 
-exec ${webServer}/bin/control start
+respawn ${webServer}/bin/control run
   ";
   
 }
-- 
GitLab


From af1c54fbdc92a687d00bc42b47fc5a6b0cf093d7 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 19 Dec 2006 01:03:15 +0000
Subject: [PATCH 0321/5331] * Subversion subservice. * Example of a NixOS
 configuration for a Subversion server.

svn path=/nixos/trunk/; revision=7412
---
 configuration/options.nix         | 31 +++++++++++++++++++
 instances/examples/svn-server.nix | 33 ++++++++++++++++++++
 upstart-jobs/httpd.nix            | 50 +++++++++++++++++++++++++------
 3 files changed, 105 insertions(+), 9 deletions(-)
 create mode 100644 instances/examples/svn-server.nix

diff --git a/configuration/options.nix b/configuration/options.nix
index fa05d544307..4ed40d97a1f 100644
--- a/configuration/options.nix
+++ b/configuration/options.nix
@@ -292,4 +292,35 @@
   }
 
   
+  {
+    name = ["services" "httpd" "subservices" "subversion" "enable"];
+    default = false;
+    description = "
+      Whether to enable the Subversion subservice in the webserver.
+    ";
+  }
+
+  
+  {
+    name = ["services" "httpd" "subservices" "subversion" "notificationSender"];
+    example = "svn-server@example.org";
+    description = "
+      The email address used in the Sender field of commit
+      notification messages sent by the Subversion subservice.
+    ";
+  }
+
+  
+  {
+    name = ["services" "httpd" "subservices" "subversion" "autoVersioning"];
+    default = false;
+    description = "
+      Whether you want the Subversion subservice to support
+      auto-versioning, which enables Subversion repositories to be
+      mounted as read/writable file systems on operating systems that
+      support WebDAV.
+    ";
+  }
+
+  
 ]
diff --git a/instances/examples/svn-server.nix b/instances/examples/svn-server.nix
new file mode 100644
index 00000000000..33006d7edd6
--- /dev/null
+++ b/instances/examples/svn-server.nix
@@ -0,0 +1,33 @@
+{
+  boot = {
+    autoDetectRootDevice = false;
+    rootDevice = "/dev/hda1";
+    readOnlyRoot = false;
+    grubDevice = "/dev/hda";
+  };
+  
+  services = {
+  
+    sshd = {
+      enable = true;
+    };
+
+    httpd = {
+      enable = true;
+      adminAddr = "admin@example.org";
+
+      subservices = {
+
+        subversion = {
+          enable = true;
+          dataDir = "/data/subversion";
+          notificationSender = "svn@example.org";
+        };
+
+      };
+      
+    };
+    
+  };
+  
+}
diff --git a/upstart-jobs/httpd.nix b/upstart-jobs/httpd.nix
index 4167343b6ad..6a0f7daa372 100644
--- a/upstart-jobs/httpd.nix
+++ b/upstart-jobs/httpd.nix
@@ -3,28 +3,60 @@
 let
 
   getCfg = option: config.get ["services" "httpd" option];
+  getCfgSvn = option: config.get ["services" "httpd" "subservices" "subversion" option];
 
+  optional = conf: subService:
+    if conf then [subService] else [];
+
+    
+  hostName = getCfg "hostName";
+  httpPort = getCfg "httpPort";
+  httpsPort = getCfg "httpsPort";
   user = getCfg "user";
   group = getCfg "group";
+  adminAddr = getCfg "adminAddr";
+  logDir = getCfg "logDir";
+  stateDir = getCfg "stateDir";
+  enableSSL = false;
 
+  
   webServer = import ../services/apache-httpd {
     inherit (pkgs) apacheHttpd coreutils;
     stdenv = pkgs.stdenvNew;
 
-    hostName = getCfg "hostName";
-    httpPort = getCfg "httpPort";
-    httpsPort = getCfg "httpsPort";
-
-    inherit user group;
+    inherit hostName httpPort httpsPort
+      user group adminAddr logDir stateDir;
+    
+    subServices =
     
-    adminAddr = getCfg "adminAddr";
+      # The Subversion subservice.
+      optional (getCfgSvn "enable") (
+        let dataDir = getCfgSvn "dataDir"; in
+        import ../services/subversion {
+          reposDir = dataDir + "/repos";
+          dbDir = dataDir + "/db";
+          distsDir = dataDir + "/dist";
+          backupsDir = dataDir + "/backup";
+          tmpDir = dataDir + "/tmp";
+          
+          inherit logDir adminAddr;
+          
+          canonicalName =
+            if webServer.enableSSL then
+              "https://" + hostName + ":" + (toString httpsPort)
+            else
+              "http://" + hostName + ":" + (toString httpPort);
 
-    logDir = getCfg "logDir";
-    stateDir = getCfg "stateDir";
+          notificationSender = getCfgSvn "notificationSender";
+          autoVersioning = getCfgSvn "autoVersioning";
 
-    subServices = [];
+          inherit pkgs;
+        })
+        
+      ;
   };
 
+  
 in
 
 {
-- 
GitLab


From a630a314f2e6fc64f45b07f0822cea615c336708 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 19 Dec 2006 01:34:09 +0000
Subject: [PATCH 0322/5331] * Wait for jobs to finish.

svn path=/nixos/trunk/; revision=7418
---
 configuration/switch-to-configuration.sh | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/configuration/switch-to-configuration.sh b/configuration/switch-to-configuration.sh
index 11a5ccb5367..1a83f380a77 100644
--- a/configuration/switch-to-configuration.sh
+++ b/configuration/switch-to-configuration.sh
@@ -41,12 +41,21 @@ if test "$action" = "switch" -o "$action" = "test"; then
     echo "old: $oldEvents"
     echo "new: $newEvents"
 
+    stopJob() {
+        local job=$1
+        initctl stop "$job"
+        while ! initctl list 2>&1 | grep -q "initctl: $job (stop)"; do
+            echo "waiting for $job..."
+            sleep 1
+        done
+    }
+
     # Stop all services that are not in the new Upstart
     # configuration.
     for event in $(cd $oldEvents && ls); do
         if ! test -e "$newEvents/$event"; then
             echo "stopping $event..."
-            initctl stop "$event"
+            stopJob $event
         fi
     done
 
@@ -66,7 +75,7 @@ if test "$action" = "switch" -o "$action" = "test"; then
             initctl start "$event"
         elif test "$(readlink "$oldEvents/$event")" != "$(readlink "$newEvents/$event")"; then
             echo "restarting $event..."
-            initctl stop "$event"
+            stopJob $event
             initctl start "$event"
         else
             echo "unchanged $event"
-- 
GitLab


From 2d6e8e63ae5fec5cb364edd7456bdaef1e82b82a Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 19 Dec 2006 21:31:19 +0000
Subject: [PATCH 0323/5331] * Forgot to commit.

svn path=/nixos/trunk/; revision=7430
---
 upstart-jobs/httpd.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/upstart-jobs/httpd.nix b/upstart-jobs/httpd.nix
index 6a0f7daa372..d89e10efd77 100644
--- a/upstart-jobs/httpd.nix
+++ b/upstart-jobs/httpd.nix
@@ -39,7 +39,7 @@ let
           backupsDir = dataDir + "/backup";
           tmpDir = dataDir + "/tmp";
           
-          inherit logDir adminAddr;
+          inherit user group logDir adminAddr;
           
           canonicalName =
             if webServer.enableSSL then
-- 
GitLab


From f9d67afce0618029f900d0f92ea72767dba6e257 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 19 Dec 2006 22:12:44 +0000
Subject: [PATCH 0324/5331] * Options for overriding the set of kernel modules
 in the initrd.

svn path=/nixos/trunk/; revision=7432
---
 boot/boot-stage-1-init.sh |  8 ++++----
 boot/boot-stage-1.nix     |  4 ++--
 configuration/options.nix | 27 +++++++++++++++++++++++++++
 configuration/system.nix  | 10 ++++++++--
 4 files changed, 41 insertions(+), 8 deletions(-)

diff --git a/boot/boot-stage-1-init.sh b/boot/boot-stage-1-init.sh
index e3b26127d46..f1cad685e35 100644
--- a/boot/boot-stage-1-init.sh
+++ b/boot/boot-stage-1-init.sh
@@ -56,10 +56,10 @@ source @makeDevices@
 
 
 # Load some kernel modules.
-export MODULE_DIR=@modules@/lib/modules/
-modprobe ide-generic
-modprobe ide-disk
-modprobe ide-cd
+export MODULE_DIR=@modulesDir@/lib/modules/
+for i in @modules@; do
+    modprobe $i
+done
 
 
 # Try to find and mount the root device.
diff --git a/boot/boot-stage-1.nix b/boot/boot-stage-1.nix
index 63c562a13b9..e33178f6881 100644
--- a/boot/boot-stage-1.nix
+++ b/boot/boot-stage-1.nix
@@ -5,7 +5,7 @@
 # is supposed to be put into an initial RAM disk (initrd).
 
 { substituteAll, staticShell, staticTools
-, module_init_tools, extraUtils, modules
+, module_init_tools, extraUtils, modules, modulesDir
 
 , # Whether to find root device automatically using its label.
   autoDetectRootDevice
@@ -24,7 +24,7 @@
 substituteAll {
   src = ./boot-stage-1-init.sh;
   isExecutable = true;
-  inherit staticShell modules;
+  inherit staticShell modules modulesDir;
   inherit autoDetectRootDevice;
   rootDevice = if !autoDetectRootDevice then rootDevice else "";
   rootLabel = if autoDetectRootDevice then rootLabel else "";
diff --git a/configuration/options.nix b/configuration/options.nix
index 4ed40d97a1f..cd7f2a929d8 100644
--- a/configuration/options.nix
+++ b/configuration/options.nix
@@ -93,6 +93,33 @@
   }
 
 
+  {
+    name = ["boot" "initrd" "kernelModules"];
+    default = ["ide-cd" "ide-disk" "ide-generic" "ext3"];
+    description = "
+      The set of kernel modules in the initial ramdisk used during the
+      boot process.  This set must include all modules necessary for
+      mounting the root device.  That is, it should include modules
+      for the physical device (e.g., SCSI drivers) and for the file
+      system (e.g., ext3).  The set specified here is automatically
+      closed under the module dependency relation, i.e., all
+      dependencies of the modules list here are included
+      automatically.  If you want to add additional
+      modules, it's best to set
+      <option>boot.initrd.extraKernelModules</options>.
+    ";
+  }
+
+
+  {
+    name = ["boot" "initrd" "extraKernelModules"];
+    default = [];
+    description = "
+      Additional kernel modules for the initial ramdisk.
+    ";
+  }
+
+
   {
     name = ["networking" "useDHCP"];
     default = true;
diff --git a/configuration/system.nix b/configuration/system.nix
index fddb0e4c41f..133c12b935c 100644
--- a/configuration/system.nix
+++ b/configuration/system.nix
@@ -36,10 +36,15 @@ rec {
   };
 
 
+  rootModules = 
+    (config.get ["boot" "initrd" "kernelModules"]) ++
+    (config.get ["boot" "initrd" "extraKernelModules"]);
+
+
   # Determine the set of modules that we need to mount the root FS.
   modulesClosure = import ../helpers/modules-closure.nix {
     inherit (pkgs) stdenv kernel module_init_tools;
-    rootModules = ["ide-cd" "ide-disk" "ide-generic"];
+    inherit rootModules;
   };
 
 
@@ -71,7 +76,8 @@ rec {
     rootDevice = config.get ["boot" "rootDevice"];
     rootLabel = config.get ["boot" "rootLabel"];
     inherit stage2Init;
-    modules = modulesClosure;
+    modulesDir = modulesClosure;
+    modules = rootModules;
     staticShell = stdenvLinuxStuff.bootstrapTools.bash;
     staticTools = stdenvLinuxStuff.staticTools;
   };
-- 
GitLab


From e060b99c52911a97e4b1c518e2e90517a6e22677 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 21 Dec 2006 00:16:20 +0000
Subject: [PATCH 0325/5331] * Removed boot.rootDevice, instead obtain the root
 device from the   filesystems option (specifically the file system with
 mountPoint ==   "/").

svn path=/nixos/trunk/; revision=7447
---
 configuration/config.nix     | 11 +++++-----
 configuration/options.nix    | 41 ++++++++++++++++++++----------------
 configuration/system.nix     |  5 ++++-
 instances/examples/basic.nix |  8 ++++++-
 4 files changed, 40 insertions(+), 25 deletions(-)

diff --git a/configuration/config.nix b/configuration/config.nix
index 705b44407af..46b9b1e76b8 100644
--- a/configuration/config.nix
+++ b/configuration/config.nix
@@ -15,13 +15,14 @@ rec {
   # its default value if it's not defined.
   get = name:
     let
-      sameName = lib.filter (opt: lib.eqLists opt.name name) declarations;
+      decl =
+        lib.findSingle (decl: lib.eqLists decl.name name)
+          (abort ("Undeclared option `" + printName name + "'."))
+          declarations;
       default =
-        if sameName == []
-        then abort ("Undeclared option `" + printName name + "'.")
-        else if !builtins.head sameName ? default
+        if !decl ? default
         then abort ("Option `" + printName name + "' has no default.")
-        else (builtins.head sameName).default;
+        else decl.default;
     in lib.getAttr name default config;
   
   printName = name: lib.concatStrings (lib.intersperse "." name);
diff --git a/configuration/options.nix b/configuration/options.nix
index cd7f2a929d8..ec4bc85b9c4 100644
--- a/configuration/options.nix
+++ b/configuration/options.nix
@@ -13,17 +13,8 @@
     default = false;
     description = "
       Whether to find the root device automatically by searching for a
-      device with the right label.  If this option is off, then
-      <option>boot.rootDevice</option> must be set.
-    ";
-  }
-
-
-  {
-    name = ["boot" "rootDevice"];
-    example = "/dev/hda1";
-    description = "
-      The device to be mounted on / at system startup.
+      device with the right label.  If this option is off, then a root
+      file system must be specified using <option>filesystems</option>.
     ";
   }
 
@@ -150,17 +141,31 @@
 
   
   {
-    name = ["filesystems" "mountPoints"];
+    name = ["filesystems"];
     example = [
-      { device = "/dev/hda2";
-        mountPoint = "/";
+      { mountPoint = "/";
+        device = "/dev/hda1";
+      }
+      { mountPoint = "/data";
+        device = "/dev/hda2";
+        filesystem = "ext3";
+        autoMount = true;
+        options = "data=journal";
       }
     ];
     description = "
-      The file systems to be mounted by NixOS.  It must include an
-      entry for the root directory (<literal>mountPoint =
-      \"/\"</literal>).  This is the file system on which NixOS is (to
-      be) installed..
+      The file systems to be mounted.  It must include an entry for
+      the root directory (<literal>mountPoint = \"/\"</literal>).
+      Each entry in the list is an attribute set with the following
+      fields: <literal>mountPoint</literal>,
+      <literal>device</literal>, <literal>filesystem</literal> (a file
+      system type recognised by <command>mount</command>; defaults to
+      <literal>\"auto\"</literal>), <literal>autoMount</literal> (a
+      boolean indicating whether the file system is mounted
+      automatically; defaults to <literal>true</literal>) and
+      <literal>options</literal> (the mount options passed to
+      <command>mount</command> using the <option>-o</option> flag;
+      defaults to <literal>\"\"</literal>).
     ";
   }
 
diff --git a/configuration/system.nix b/configuration/system.nix
index 133c12b935c..090ecc9b3a5 100644
--- a/configuration/system.nix
+++ b/configuration/system.nix
@@ -73,7 +73,10 @@ rec {
     inherit (pkgsDiet) module_init_tools;
     inherit extraUtils;
     autoDetectRootDevice = config.get ["boot" "autoDetectRootDevice"];
-    rootDevice = config.get ["boot" "rootDevice"];
+    rootDevice =
+      (pkgs.library.findSingle (fs: fs.mountPoint == "/")
+        (abort "No root mount point declared.")
+        (config.get ["filesystems"])).device;
     rootLabel = config.get ["boot" "rootLabel"];
     inherit stage2Init;
     modulesDir = modulesClosure;
diff --git a/instances/examples/basic.nix b/instances/examples/basic.nix
index eedfa5f74b6..f77b8101bb7 100644
--- a/instances/examples/basic.nix
+++ b/instances/examples/basic.nix
@@ -1,10 +1,16 @@
 {
   boot = {
     autoDetectRootDevice = false;
-    rootDevice = "/dev/hda1";
     readOnlyRoot = false;
     grubDevice = "/dev/hda";
   };
+
+  filesystems = [
+    { mountPoint = "/";
+      device = "/dev/hda1";
+    }
+  ];
+  
   services = {
     sshd = {
       enable = true;
-- 
GitLab


From c78a1d97814325b257c29a7482306a90ce75ec65 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 21 Dec 2006 01:07:23 +0000
Subject: [PATCH 0326/5331] * Upstart job to start swapping to the devices or
 files listed in the   swapDevices option.

svn path=/nixos/trunk/; revision=7448
---
 configuration/options.nix    | 27 ++++++++++++++++++++-------
 configuration/system.nix     |  2 +-
 configuration/upstart.nix    |  6 ++++++
 instances/examples/basic.nix |  4 +++-
 upstart-jobs/swap.nix        | 29 +++++++++++++++++++++++++++++
 5 files changed, 59 insertions(+), 9 deletions(-)
 create mode 100644 upstart-jobs/swap.nix

diff --git a/configuration/options.nix b/configuration/options.nix
index ec4bc85b9c4..ffcd0b61f9e 100644
--- a/configuration/options.nix
+++ b/configuration/options.nix
@@ -14,7 +14,7 @@
     description = "
       Whether to find the root device automatically by searching for a
       device with the right label.  If this option is off, then a root
-      file system must be specified using <option>filesystems</option>.
+      file system must be specified using <option>fileSystems</option>.
     ";
   }
 
@@ -141,7 +141,8 @@
 
   
   {
-    name = ["filesystems"];
+    name = ["fileSystems"];
+    default = [];
     example = [
       { mountPoint = "/";
         device = "/dev/hda1";
@@ -155,11 +156,12 @@
     ];
     description = "
       The file systems to be mounted.  It must include an entry for
-      the root directory (<literal>mountPoint = \"/\"</literal>).
-      Each entry in the list is an attribute set with the following
-      fields: <literal>mountPoint</literal>,
-      <literal>device</literal>, <literal>filesystem</literal> (a file
-      system type recognised by <command>mount</command>; defaults to
+      the root directory (<literal>mountPoint = \"/\"</literal>) if
+      <literal>boot.autoDetectRootDevice</literal> is not set.  Each
+      entry in the list is an attribute set with the following fields:
+      <literal>mountPoint</literal>, <literal>device</literal>,
+      <literal>filesystem</literal> (a file system type recognised by
+      <command>mount</command>; defaults to
       <literal>\"auto\"</literal>), <literal>autoMount</literal> (a
       boolean indicating whether the file system is mounted
       automatically; defaults to <literal>true</literal>) and
@@ -170,6 +172,17 @@
   }
 
 
+  {
+    name = ["swapDevices"];
+    default = [];
+    example = ["/dev/hda7" "/dev/hdb3" "/var/swapfile"];
+    description = "
+      The swap devices and swap files.  These must have been
+      initialised using <command>mkswap</command>.
+    ";
+  }
+
+
   {
     name = ["services" "extraJobs"];
     default = [];
diff --git a/configuration/system.nix b/configuration/system.nix
index 090ecc9b3a5..e4b102d8f0c 100644
--- a/configuration/system.nix
+++ b/configuration/system.nix
@@ -76,7 +76,7 @@ rec {
     rootDevice =
       (pkgs.library.findSingle (fs: fs.mountPoint == "/")
         (abort "No root mount point declared.")
-        (config.get ["filesystems"])).device;
+        (config.get ["fileSystems"])).device;
     rootLabel = config.get ["boot" "rootLabel"];
     inherit stage2Init;
     modulesDir = modulesClosure;
diff --git a/configuration/upstart.nix b/configuration/upstart.nix
index d6249fc0294..5de0164b062 100644
--- a/configuration/upstart.nix
+++ b/configuration/upstart.nix
@@ -31,6 +31,12 @@ import ../upstart-jobs/gather.nix {
       inherit (pkgs) kernel module_init_tools;
     })
       
+    # Swapping.
+    (import ../upstart-jobs/swap.nix {
+      inherit (pkgs) utillinux;
+      swapDevices = config.get ["swapDevices"];
+    })
+
     # Network interfaces.
     (import ../upstart-jobs/network-interfaces.nix {
       inherit (pkgs) nettools kernel module_init_tools;
diff --git a/instances/examples/basic.nix b/instances/examples/basic.nix
index f77b8101bb7..b72f3f64d48 100644
--- a/instances/examples/basic.nix
+++ b/instances/examples/basic.nix
@@ -5,11 +5,13 @@
     grubDevice = "/dev/hda";
   };
 
-  filesystems = [
+  fileSystems = [
     { mountPoint = "/";
       device = "/dev/hda1";
     }
   ];
+
+  swapDevices = ["/dev/hdb1"];
   
   services = {
     sshd = {
diff --git a/upstart-jobs/swap.nix b/upstart-jobs/swap.nix
new file mode 100644
index 00000000000..b7487da7784
--- /dev/null
+++ b/upstart-jobs/swap.nix
@@ -0,0 +1,29 @@
+{utillinux, swapDevices}:
+
+{
+  name = "swap";
+  
+  job = "
+start on startup
+
+script
+    for device in ${toString swapDevices}; do
+        # !!! Check whether we are already swapping to $device.
+        ${utillinux}/sbin/swapon \"$device\" || true
+    done
+
+    # Remove swap devices not listed in swapDevices.
+    for used in $(cat /proc/swaps | grep '^/' | sed 's/ .*//'); do
+        found=
+        for device in ${toString swapDevices}; do
+            if test \"$used\" = \"$device\"; then found=1; fi
+        done
+        if test -z \"$found\"; then
+            ${utillinux}/sbin/swapoff \"$used\" || true
+        fi
+    done
+    
+end script
+  ";
+
+}
-- 
GitLab


From b363fc4c5731f3c085eb88a8e699483625bffbfc Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 21 Dec 2006 14:22:40 +0000
Subject: [PATCH 0327/5331] * Mount all file systems in the fileSystems option.

svn path=/nixos/trunk/; revision=7449
---
 configuration/upstart.nix    |  6 +++++
 upstart-jobs/filesystems.nix | 45 ++++++++++++++++++++++++++++++++++++
 2 files changed, 51 insertions(+)
 create mode 100644 upstart-jobs/filesystems.nix

diff --git a/configuration/upstart.nix b/configuration/upstart.nix
index 5de0164b062..f0870159ead 100644
--- a/configuration/upstart.nix
+++ b/configuration/upstart.nix
@@ -31,6 +31,12 @@ import ../upstart-jobs/gather.nix {
       inherit (pkgs) kernel module_init_tools;
     })
       
+    # Mount file systems.
+    (import ../upstart-jobs/filesystems.nix {
+      inherit (pkgs) utillinux;
+      fileSystems = config.get ["fileSystems"];
+    })
+
     # Swapping.
     (import ../upstart-jobs/swap.nix {
       inherit (pkgs) utillinux;
diff --git a/upstart-jobs/filesystems.nix b/upstart-jobs/filesystems.nix
new file mode 100644
index 00000000000..0c581db9634
--- /dev/null
+++ b/upstart-jobs/filesystems.nix
@@ -0,0 +1,45 @@
+{utillinux, fileSystems}:
+
+let
+
+  # !!! use XML
+  mountPoints = map (fs: fs.mountPoint) fileSystems;
+  devices = map (fs: fs.device) fileSystems;
+
+in 
+
+{
+  name = "filesystems";
+  
+  job = "
+start on startup
+start on new-devices
+
+script
+    mountPoints=(${toString mountPoints})  
+    devices=(${toString devices})
+
+    for ((n = 0; n < \${#mountPoints[*]}; n++)); do
+        mountPoint=\${mountPoints[$n]}
+        device=\${devices[$n]}
+
+        # If $device is already mounted somewhere else, unmount it first.
+        prevMountPoint=$(cat /proc/mounts | grep \"^$device \" | sed 's|^[^ ]\\+ \\+\\([^ ]\\+\\).*|\\1|')
+
+        if test \"$prevMountPoint\" = \"$mountPoint\"; then continue; fi
+
+        if test -n \"$prevMountPoint\"; then
+            echo \"unmount $device from $prevMountPoint\"
+            ${utillinux}/bin/umount \"$prevMountPoint\" || true
+        fi
+
+        echo \"mounting $device on $mountPoint\"
+
+        mkdir -p \"$mountPoint\" || true
+        ${utillinux}/bin/mount \"$device\" \"$mountPoint\" || true
+    done
+
+end script
+  ";
+
+}
-- 
GitLab


From 42cf9a9050b557ba15c3e77c055310b58cccb099 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 21 Dec 2006 14:44:22 +0000
Subject: [PATCH 0328/5331] * Respect the options and fsType attributes. *
 Remount file systems to allow mount options to be changed   dynamically.

svn path=/nixos/trunk/; revision=7450
---
 configuration/activate-configuration.sh |  4 ++++
 configuration/options.nix               | 14 +++++---------
 upstart-jobs/filesystems.nix            | 14 ++++++++++++--
 3 files changed, 21 insertions(+), 11 deletions(-)

diff --git a/configuration/activate-configuration.sh b/configuration/activate-configuration.sh
index ca2f6963d76..680af9570ec 100644
--- a/configuration/activate-configuration.sh
+++ b/configuration/activate-configuration.sh
@@ -4,6 +4,10 @@ export PATH=/empty
 for i in @path@; do PATH=$PATH:$i/bin:$i/sbin; done
 
 
+# Needed by some programs.
+ln -sfn /proc/self/fd /dev/fd
+
+
 # Set up the statically computed bits of /etc.
 staticEtc=/etc/static
 rm -f $staticEtc
diff --git a/configuration/options.nix b/configuration/options.nix
index ffcd0b61f9e..ead48d030aa 100644
--- a/configuration/options.nix
+++ b/configuration/options.nix
@@ -149,8 +149,7 @@
       }
       { mountPoint = "/data";
         device = "/dev/hda2";
-        filesystem = "ext3";
-        autoMount = true;
+        fsType = "ext3";
         options = "data=journal";
       }
     ];
@@ -160,14 +159,11 @@
       <literal>boot.autoDetectRootDevice</literal> is not set.  Each
       entry in the list is an attribute set with the following fields:
       <literal>mountPoint</literal>, <literal>device</literal>,
-      <literal>filesystem</literal> (a file system type recognised by
+      <literal>fsType</literal> (a file system type recognised by
       <command>mount</command>; defaults to
-      <literal>\"auto\"</literal>), <literal>autoMount</literal> (a
-      boolean indicating whether the file system is mounted
-      automatically; defaults to <literal>true</literal>) and
-      <literal>options</literal> (the mount options passed to
-      <command>mount</command> using the <option>-o</option> flag;
-      defaults to <literal>\"\"</literal>).
+      <literal>\"auto\"</literal>), and <literal>options</literal>
+      (the mount options passed to <command>mount</command> using the
+      <option>-o</option> flag; defaults to <literal>\"defaults\"</literal>).
     ";
   }
 
diff --git a/upstart-jobs/filesystems.nix b/upstart-jobs/filesystems.nix
index 0c581db9634..7b3ffc4f4e4 100644
--- a/upstart-jobs/filesystems.nix
+++ b/upstart-jobs/filesystems.nix
@@ -5,6 +5,8 @@ let
   # !!! use XML
   mountPoints = map (fs: fs.mountPoint) fileSystems;
   devices = map (fs: fs.device) fileSystems;
+  fsTypes = map (fs: if fs ? fsType then fs.fsType else "auto") fileSystems;
+  optionss = map (fs: if fs ? options then fs.options else "defaults") fileSystems;
 
 in 
 
@@ -18,15 +20,23 @@ start on new-devices
 script
     mountPoints=(${toString mountPoints})  
     devices=(${toString devices})
+    fsTypes=(${toString fsTypes})
+    optionss=(${toString optionss})
 
     for ((n = 0; n < \${#mountPoints[*]}; n++)); do
         mountPoint=\${mountPoints[$n]}
         device=\${devices[$n]}
+        fsType=\${fsTypes[$n]}
+        options=\${optionss[$n]}
 
         # If $device is already mounted somewhere else, unmount it first.
         prevMountPoint=$(cat /proc/mounts | grep \"^$device \" | sed 's|^[^ ]\\+ \\+\\([^ ]\\+\\).*|\\1|')
 
-        if test \"$prevMountPoint\" = \"$mountPoint\"; then continue; fi
+        if test \"$prevMountPoint\" = \"$mountPoint\"; then
+             echo \"remounting $device on $mountPoint\"
+             ${utillinux}/bin/mount -t \"$fsType\" -o remount,\"$options\" \"$device\" \"$mountPoint\" || true
+             continue
+        fi
 
         if test -n \"$prevMountPoint\"; then
             echo \"unmount $device from $prevMountPoint\"
@@ -36,7 +46,7 @@ script
         echo \"mounting $device on $mountPoint\"
 
         mkdir -p \"$mountPoint\" || true
-        ${utillinux}/bin/mount \"$device\" \"$mountPoint\" || true
+        ${utillinux}/bin/mount -t \"$fsType\" -o \"$options\" \"$device\" \"$mountPoint\" || true
     done
 
 end script
-- 
GitLab


From 78fcb0a356c39e744b6697b214208300e6a19a45 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 21 Dec 2006 18:08:29 +0000
Subject: [PATCH 0329/5331] * Skip the sys-* events, otherwise we reboot
 accidentally.

svn path=/nixos/trunk/; revision=7451
---
 configuration/switch-to-configuration.sh | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/configuration/switch-to-configuration.sh b/configuration/switch-to-configuration.sh
index 1a83f380a77..b0c412e546a 100644
--- a/configuration/switch-to-configuration.sh
+++ b/configuration/switch-to-configuration.sh
@@ -70,6 +70,10 @@ if test "$action" = "switch" -o "$action" = "test"; then
 
     # Start all new services and restart all changed services.
     for event in $(cd $newEvents && ls); do
+
+        # Hack: skip the sys-* events.
+        if echo "$event" | grep -q "^sys-"; then continue; fi
+    
         if ! test -e "$oldEvents/$event"; then
             echo "starting $event..."
             initctl start "$event"
-- 
GitLab


From f89f3c0643d00f11b3a04d12cf460d8c22aa598f Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 21 Dec 2006 18:09:10 +0000
Subject: [PATCH 0330/5331] * Emit the new-devices event to cause the
 filesystems job to be   rerun.

svn path=/nixos/trunk/; revision=7452
---
 upstart-jobs/udev.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/upstart-jobs/udev.nix b/upstart-jobs/udev.nix
index 0da100f7a1b..a801e8d3e47 100644
--- a/upstart-jobs/udev.nix
+++ b/upstart-jobs/udev.nix
@@ -35,6 +35,8 @@ start script
     if ${procps}/bin/pkill -u root '^udevd$'; then
         echo \"couldn't stop udevd\"
     fi
+
+    initctl emit new-devices
 end script
 
 respawn ${udev}/sbin/udevd
-- 
GitLab


From bf8e19f6dbd1db886002e74d1e181fd318e034d0 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 21 Dec 2006 18:10:33 +0000
Subject: [PATCH 0331/5331] * Mount file systems until a fixpoint is reached. *
 Work properly for loopback mounts.

svn path=/nixos/trunk/; revision=7453
---
 upstart-jobs/filesystems.nix | 70 +++++++++++++++++++++++-------------
 1 file changed, 46 insertions(+), 24 deletions(-)

diff --git a/upstart-jobs/filesystems.nix b/upstart-jobs/filesystems.nix
index 7b3ffc4f4e4..6dcb8b3f2cf 100644
--- a/upstart-jobs/filesystems.nix
+++ b/upstart-jobs/filesystems.nix
@@ -23,30 +23,52 @@ script
     fsTypes=(${toString fsTypes})
     optionss=(${toString optionss})
 
-    for ((n = 0; n < \${#mountPoints[*]}; n++)); do
-        mountPoint=\${mountPoints[$n]}
-        device=\${devices[$n]}
-        fsType=\${fsTypes[$n]}
-        options=\${optionss[$n]}
-
-        # If $device is already mounted somewhere else, unmount it first.
-        prevMountPoint=$(cat /proc/mounts | grep \"^$device \" | sed 's|^[^ ]\\+ \\+\\([^ ]\\+\\).*|\\1|')
-
-        if test \"$prevMountPoint\" = \"$mountPoint\"; then
-             echo \"remounting $device on $mountPoint\"
-             ${utillinux}/bin/mount -t \"$fsType\" -o remount,\"$options\" \"$device\" \"$mountPoint\" || true
-             continue
-        fi
-
-        if test -n \"$prevMountPoint\"; then
-            echo \"unmount $device from $prevMountPoint\"
-            ${utillinux}/bin/umount \"$prevMountPoint\" || true
-        fi
-
-        echo \"mounting $device on $mountPoint\"
-
-        mkdir -p \"$mountPoint\" || true
-        ${utillinux}/bin/mount -t \"$fsType\" -o \"$options\" \"$device\" \"$mountPoint\" || true
+    newDevices=1
+
+    # If we mount any file system, we repeat this loop, because new
+    # mount opportunities may have become available (such as images
+    # for loopback mounts).
+    
+    while test -n \"$newDevices\"; do
+
+        newDevices=
+
+        for ((n = 0; n < \${#mountPoints[*]}; n++)); do
+            mountPoint=\${mountPoints[$n]}
+            device=\${devices[$n]}
+            fsType=\${fsTypes[$n]}
+            options=\${optionss[$n]}
+
+            # If $device is already mounted somewhere else, unmount it first.
+            # !!! Note: we use /etc/mtab, not /proc/mounts, because mtab
+            # contains more accurate info when using loop devices.
+            prevMountPoint=$(
+                cat /etc/mtab \\
+                | grep \"^$device \" \\
+                | sed 's|^[^ ]\\+ \\+\\([^ ]\\+\\).*|\\1|' \\
+            )
+
+            if test \"$prevMountPoint\" = \"$mountPoint\"; then
+                 echo \"remounting $device on $mountPoint\"
+                 ${utillinux}/bin/mount -t \"$fsType\" \\
+                     -o remount,\"$options\" \\
+                     \"$device\" \"$mountPoint\" || true
+                 continue
+            fi
+
+            if test -n \"$prevMountPoint\"; then
+                echo \"unmount $device from $prevMountPoint\"
+                ${utillinux}/bin/umount \"$prevMountPoint\" || true
+            fi
+
+            echo \"mounting $device on $mountPoint\"
+
+            if ${utillinux}/bin/mount -t \"$fsType\" -o \"$options\" \"$device\" \"$mountPoint\"; then
+                newDevices=1
+            fi
+        
+        done
+
     done
 
 end script
-- 
GitLab


From 896a935de1324f537a703a55796a160662476f45 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 21 Dec 2006 18:12:19 +0000
Subject: [PATCH 0332/5331] * Repeatedly unmount file systems until a fixpoint
 is reached (no more   file systems can be unmounted). * Remount all
 un-unmountable file systems as read-only. * Explicitly call losetup to get
 rid of loopback devices to work   around a bug in mount.

svn path=/nixos/trunk/; revision=7454
---
 upstart-jobs/halt.nix | 45 ++++++++++++++++++++++++++++++++++++++-----
 1 file changed, 40 insertions(+), 5 deletions(-)

diff --git a/upstart-jobs/halt.nix b/upstart-jobs/halt.nix
index 6e4e833f643..f24904e723b 100644
--- a/upstart-jobs/halt.nix
+++ b/upstart-jobs/halt.nix
@@ -17,16 +17,51 @@ script
     echo \"<<< SYSTEM SHUTDOWN >>>\"
     echo \"\"
 
-    export PATH=${utillinux}/bin:$PATH
+    export PATH=${utillinux}/bin:${utillinux}/sbin:$PATH
 
     # Do an initial sync just in case.
     sync || true
 
-    # Unmount file systems.
-    umount -n -a || true
+    getMountPoints() {
+        cat /proc/mounts \\
+        | grep -v '^rootfs' \\
+        | sed 's|^[^ ]\\+ \\+\\([^ ]\\+\\).*|\\1|' \\
+        | grep -v '/proc\\|/sys\\|/dev'
+    }
 
-    # Remount / read-only
-    mount -n -o remount,ro /dontcare / || true
+    getDevice() {
+        local mountPoint=$1
+        cat /proc/mounts \\
+        | grep -v '^rootfs' \\
+        | grep \"^[^ ]\\+ \\+$mountPoint \\+\" \\
+        | sed 's|^\\([^ ]\\+\\).*|\\1|'
+    }
+
+    # Unmount file systems.  We repeat this until no more file systems
+    # can be unmounted.  This is to handle loopback devices, file
+    # systems  mounted on other file systems and so on.
+    tryAgain=1
+    while test -n \"$tryAgain\"; do
+        tryAgain=
+
+        for mp in $(getMountPoints); do
+            device=$(getDevice $mp)
+            echo \"unmounting $mp...\"
+            if umount -n -r \"$mp\"; then
+                if test \"$mp\" != /; then tryAgain=1; fi
+            fi
+
+            # Hack: work around a bug in mount (mount -o remount on a
+            # loop device forgets the loop=/dev/loopN entry in
+            # /etc/mtab).
+            if echo \"$device\" | grep -q '/dev/loop'; then
+                echo \"removing loop device $device...\"
+                losetup -d \"$device\" || true
+            fi
+        done
+    done
+
+    cat /proc/mounts
 
     # Final sync.
     sync || true
-- 
GitLab


From 3b9a7c747edb2b41fa98946df87a71f4c0f83a3d Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 21 Dec 2006 19:21:36 +0000
Subject: [PATCH 0333/5331] * Trigger swap on new-devices.

svn path=/nixos/trunk/; revision=7455
---
 upstart-jobs/swap.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/upstart-jobs/swap.nix b/upstart-jobs/swap.nix
index b7487da7784..54756072bc2 100644
--- a/upstart-jobs/swap.nix
+++ b/upstart-jobs/swap.nix
@@ -5,6 +5,7 @@
   
   job = "
 start on startup
+start on new-devices
 
 script
     for device in ${toString swapDevices}; do
-- 
GitLab


From d54b0a0749bfb99dbb20cffcbce0bdc2ed42a785 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 21 Dec 2006 19:22:06 +0000
Subject: [PATCH 0334/5331] * Don't refer to non-existent groups.

svn path=/nixos/trunk/; revision=7456
---
 upstart-jobs/udev-rules/50-udev.rules | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/upstart-jobs/udev-rules/50-udev.rules b/upstart-jobs/udev-rules/50-udev.rules
index 06bf21707f1..2bf58c19a13 100644
--- a/upstart-jobs/udev-rules/50-udev.rules
+++ b/upstart-jobs/udev-rules/50-udev.rules
@@ -1,15 +1,15 @@
 # Miscellaneous devices.
-KERNEL=="mem|kmem",             GROUP="kmem", MODE="640"
-KERNEL=="port",                 GROUP="kmem", MODE="640"
-KERNEL=="nvram",                GROUP="kmem", MODE="600"
-KERNEL=="null",                 MODE="666"
-KERNEL=="zero",                 MODE="666"
-KERNEL=="full",                 MODE="622"
-KERNEL=="random",               MODE="666"
-KERNEL=="urandom",              MODE="644"
-KERNEL=="rtc",                  MODE="600"
+KERNEL=="mem|kmem",             MODE="0600"
+KERNEL=="port",                 MODE="0600"
+KERNEL=="nvram",                MODE="0600"
+KERNEL=="null",                 MODE="0666"
+KERNEL=="zero",                 MODE="0666"
+KERNEL=="full",                 MODE="0622"
+KERNEL=="random",               MODE="0666"
+KERNEL=="urandom",              MODE="0644"
+KERNEL=="rtc",                  MODE="0600"
 KERNEL=="sonypi",               MODE="0666"
-KERNEL=="agpgart",              MODE="0600", GROUP="video"
+KERNEL=="agpgart",              MODE="0600"
 
 
 # Input devices go under /dev/input.
-- 
GitLab


From e3acce2f4f491c2a7240c24f674d18c5e3306fa8 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 21 Dec 2006 20:07:46 +0000
Subject: [PATCH 0335/5331] * Wait until the temporary udevd is gone.

svn path=/nixos/trunk/; revision=7457
---
 upstart-jobs/udev.nix | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/upstart-jobs/udev.nix b/upstart-jobs/udev.nix
index a801e8d3e47..8ef4a43fe8c 100644
--- a/upstart-jobs/udev.nix
+++ b/upstart-jobs/udev.nix
@@ -20,6 +20,9 @@ env UDEV_CONFIG_FILE=${conf}
 start script
     echo '' > /proc/sys/kernel/hotplug
 
+    # Get rid of possible old udev processes.
+    ${procps}/bin/pkill -u root '^udevd$' || true
+
     # Start udev.
     ${udev}/sbin/udevd --daemon
 
@@ -32,10 +35,14 @@ start script
     # Kill udev, let Upstart restart and monitor it.  (This is nasty,
     # but we have to run udevtrigger first.  Maybe we can use
     # Upstart's `binary' keyword, but it isn't implemented yet.)
-    if ${procps}/bin/pkill -u root '^udevd$'; then
+    if ! ${procps}/bin/pkill -u root '^udevd$'; then
         echo \"couldn't stop udevd\"
     fi
 
+    while ${procps}/bin/pgrep -u root '^udevd$'; do
+        sleep 1
+    done
+
     initctl emit new-devices
 end script
 
-- 
GitLab


From 647db4dd2a56345dfbae067eda926769c012e5f8 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 21 Dec 2006 20:08:15 +0000
Subject: [PATCH 0336/5331] * Don't try to mount when the mount point isn't
 there yet. * Run fsck.

svn path=/nixos/trunk/; revision=7458
---
 configuration/upstart.nix    |  2 +-
 upstart-jobs/filesystems.nix | 12 +++++++++++-
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/configuration/upstart.nix b/configuration/upstart.nix
index f0870159ead..4065a030593 100644
--- a/configuration/upstart.nix
+++ b/configuration/upstart.nix
@@ -33,7 +33,7 @@ import ../upstart-jobs/gather.nix {
       
     # Mount file systems.
     (import ../upstart-jobs/filesystems.nix {
-      inherit (pkgs) utillinux;
+      inherit (pkgs) utillinux e2fsprogs;
       fileSystems = config.get ["fileSystems"];
     })
 
diff --git a/upstart-jobs/filesystems.nix b/upstart-jobs/filesystems.nix
index 6dcb8b3f2cf..c001bf14d8d 100644
--- a/upstart-jobs/filesystems.nix
+++ b/upstart-jobs/filesystems.nix
@@ -1,4 +1,4 @@
-{utillinux, fileSystems}:
+{utillinux, e2fsprogs, fileSystems}:
 
 let
 
@@ -18,6 +18,8 @@ start on startup
 start on new-devices
 
 script
+    PATH=${e2fsprogs}/sbin:$PATH
+
     mountPoints=(${toString mountPoints})  
     devices=(${toString devices})
     fsTypes=(${toString fsTypes})
@@ -39,6 +41,11 @@ script
             fsType=\${fsTypes[$n]}
             options=\${optionss[$n]}
 
+            if ! test -e \"$device\"; then
+                echo \"skipping $device, doesn't exist (yet)\"
+                continue
+            fi
+
             # If $device is already mounted somewhere else, unmount it first.
             # !!! Note: we use /etc/mtab, not /proc/mounts, because mtab
             # contains more accurate info when using loop devices.
@@ -63,6 +70,9 @@ script
 
             echo \"mounting $device on $mountPoint\"
 
+            # !!! should do something with the result; also prevent repeated fscks.
+            fsck -a \"$device\" || true
+
             if ${utillinux}/bin/mount -t \"$fsType\" -o \"$options\" \"$device\" \"$mountPoint\"; then
                 newDevices=1
             fi
-- 
GitLab


From 617ebcbccead26ac77bf79ac866ff7abb8599185 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 21 Dec 2006 23:43:17 +0000
Subject: [PATCH 0337/5331] * Job for ntpd.  Doesn't seem to work quite right,
 but that might be a   VMware problem.

svn path=/nixos/trunk/; revision=7460
---
 configuration/options.nix | 23 ++++++++++++++++++++
 configuration/upstart.nix |  7 ++++++
 upstart-jobs/ntpd.nix     | 45 +++++++++++++++++++++++++++++++++++++++
 3 files changed, 75 insertions(+)
 create mode 100644 upstart-jobs/ntpd.nix

diff --git a/configuration/options.nix b/configuration/options.nix
index ead48d030aa..d128f6c8e33 100644
--- a/configuration/options.nix
+++ b/configuration/options.nix
@@ -239,6 +239,29 @@
   }
 
   
+  {
+    name = ["services" "ntp" "enable"];
+    default = true;
+    description = "
+      Whether to synchronise your machine's time using the NTP
+      protocol.
+    ";
+  }
+
+  
+  {
+    name = ["services" "ntp" "servers"];
+    default = [
+      "0.pool.ntp.org"
+      "1.pool.ntp.org"
+      "2.pool.ntp.org"
+    ];
+    description = "
+      The set of NTP servers from which to synchronise.
+    ";
+  }
+
+  
   {
     name = ["services" "xserver" "enable"];
     default = false;
diff --git a/configuration/upstart.nix b/configuration/upstart.nix
index 4065a030593..46e6ea3aa6a 100644
--- a/configuration/upstart.nix
+++ b/configuration/upstart.nix
@@ -81,6 +81,13 @@ import ../upstart-jobs/gather.nix {
       inherit (pkgs) openssh glibc pwdutils;
     })
 
+  # NTP daemon.
+  ++ optional ["services" "ntp" "enable"]
+    (import ../upstart-jobs/ntpd.nix {
+      inherit (pkgs) ntp glibc pwdutils writeText;
+      servers = config.get ["services" "ntp" "servers"];
+    })
+
   # X server.
   ++ optional ["services" "xserver" "enable"]
     (import ../upstart-jobs/xserver.nix {
diff --git a/upstart-jobs/ntpd.nix b/upstart-jobs/ntpd.nix
new file mode 100644
index 00000000000..a8c90c31fd0
--- /dev/null
+++ b/upstart-jobs/ntpd.nix
@@ -0,0 +1,45 @@
+{ntp, glibc, pwdutils, writeText, servers}:
+
+let
+
+  stateDir = "/var/lib/ntp";
+
+  ntpUser = "ntp";
+
+  config = writeText "ntp.conf" "
+    driftfile ${stateDir}/ntp.drift
+
+    ${toString (map (server: "server " + server + "\n") servers)}
+  ";
+
+in
+
+{
+  name = "ntpd";
+  
+  job = "
+description \"NTP daemon\"
+
+start on network-interfaces/started
+stop on network-interfaces/stop
+
+start script
+
+    if ! ${glibc}/bin/getent passwd ${ntpUser} > /dev/null; then
+        ${pwdutils}/sbin/useradd -g nogroup -d ${stateDir} -s /noshell \\
+            -c 'NTP daemon user' ${ntpUser}
+    fi
+
+    mkdir -m 0755 -p ${stateDir}
+    chown ${ntpUser} ${stateDir}
+
+    date
+    ${ntp}/bin/ntpd -ddd -c ${config} -q -g
+    date
+    
+end script
+
+respawn ${ntp}/bin/ntpd -ddd -n -c ${config}
+  ";
+  
+}
-- 
GitLab


From f037f6fbd40272031743885909ecac7ffaca5bdd Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 22 Dec 2006 17:28:25 +0000
Subject: [PATCH 0338/5331] * Emit ip-up / ip-down events when we get or lose a
 DHCP lease. * ntpd: start on ip-up, not when the network interfaces are up,  
 otherwise it will fail because it can't find any servers right   away.

svn path=/nixos/trunk/; revision=7461
---
 configuration/etc.nix                 |  7 +++++++
 configuration/etc/dhclient-exit-hooks | 10 ++++++++++
 upstart-jobs/ntpd.nix                 |  9 +++++----
 3 files changed, 22 insertions(+), 4 deletions(-)
 create mode 100644 configuration/etc/dhclient-exit-hooks

diff --git a/configuration/etc.nix b/configuration/etc.nix
index be3bcf7b980..cddae796a9b 100644
--- a/configuration/etc.nix
+++ b/configuration/etc.nix
@@ -52,6 +52,13 @@ import ../helpers/make-etc.nix {
       target = "default/passwd";
     }
 
+    { # Dhclient hooks for emitting ip-up/ip-down events.
+      source = pkgs.substituteAll {
+        src = ./etc/dhclient-exit-hooks;
+        inherit (pkgs) upstart;
+      };
+      target = "dhclient-exit-hooks";
+    }
   ]
 
   # A bunch of PAM configuration files for various programs.
diff --git a/configuration/etc/dhclient-exit-hooks b/configuration/etc/dhclient-exit-hooks
new file mode 100644
index 00000000000..50463edb4c9
--- /dev/null
+++ b/configuration/etc/dhclient-exit-hooks
@@ -0,0 +1,10 @@
+echo "$reason" >> /tmp/dhcp-exit
+echo "$exit_status" >> /tmp/dhcp-exit
+
+if test "$reason" = BOUND -o "$reason" = REBOOT; then
+    @upstart@/sbin/initctl emit ip-up
+fi
+
+if test "$reason" = EXPIRE -o "$reason" = RELEASE; then
+    @upstart@/sbin/initctl emit ip-down
+fi
diff --git a/upstart-jobs/ntpd.nix b/upstart-jobs/ntpd.nix
index a8c90c31fd0..3f1d12b3c04 100644
--- a/upstart-jobs/ntpd.nix
+++ b/upstart-jobs/ntpd.nix
@@ -20,8 +20,9 @@ in
   job = "
 description \"NTP daemon\"
 
-start on network-interfaces/started
-stop on network-interfaces/stop
+start on ip-up
+stop on ip-down
+stop on shutdown
 
 start script
 
@@ -34,12 +35,12 @@ start script
     chown ${ntpUser} ${stateDir}
 
     date
-    ${ntp}/bin/ntpd -ddd -c ${config} -q -g
+    ${ntp}/bin/ntpd -c ${config} -q -g
     date
     
 end script
 
-respawn ${ntp}/bin/ntpd -ddd -n -c ${config}
+respawn ${ntp}/bin/ntpd -n -c ${config}
   ";
   
 }
-- 
GitLab


From 2d605d70415cb97821e316880fe1c877979e9592 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 22 Dec 2006 19:23:19 +0000
Subject: [PATCH 0339/5331] * Don't run ntpd as root.

svn path=/nixos/trunk/; revision=7463
---
 configuration/upstart.nix |  2 +-
 upstart-jobs/ntpd.nix     | 14 +++++++++-----
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/configuration/upstart.nix b/configuration/upstart.nix
index 46e6ea3aa6a..e3e2dabadcc 100644
--- a/configuration/upstart.nix
+++ b/configuration/upstart.nix
@@ -84,7 +84,7 @@ import ../upstart-jobs/gather.nix {
   # NTP daemon.
   ++ optional ["services" "ntp" "enable"]
     (import ../upstart-jobs/ntpd.nix {
-      inherit (pkgs) ntp glibc pwdutils writeText;
+      inherit (pkgs) ntp kernel module_init_tools glibc pwdutils writeText;
       servers = config.get ["services" "ntp" "servers"];
     })
 
diff --git a/upstart-jobs/ntpd.nix b/upstart-jobs/ntpd.nix
index 3f1d12b3c04..2f66ac4e8a1 100644
--- a/upstart-jobs/ntpd.nix
+++ b/upstart-jobs/ntpd.nix
@@ -1,4 +1,4 @@
-{ntp, glibc, pwdutils, writeText, servers}:
+{ntp, kernel, module_init_tools, glibc, pwdutils, writeText, servers}:
 
 let
 
@@ -12,6 +12,8 @@ let
     ${toString (map (server: "server " + server + "\n") servers)}
   ";
 
+  ntpFlags = "-c ${config} -u ${ntpUser}:nogroup";
+
 in
 
 {
@@ -34,13 +36,15 @@ start script
     mkdir -m 0755 -p ${stateDir}
     chown ${ntpUser} ${stateDir}
 
-    date
-    ${ntp}/bin/ntpd -c ${config} -q -g
-    date
+    # Needed to run ntpd as an unprivileged user.
+    export MODULE_DIR=${kernel}/lib/modules/
+    ${module_init_tools}/sbin/modprobe capability
+
+    ${ntp}/bin/ntpd -q -g ${ntpFlags}
     
 end script
 
-respawn ${ntp}/bin/ntpd -n -c ${config}
+respawn ${ntp}/bin/ntpd -n ${ntpFlags}
   ";
   
 }
-- 
GitLab


From 75e1652f05832959ca9f80e2004b81e21be9e26d Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 22 Dec 2006 19:29:18 +0000
Subject: [PATCH 0340/5331] * Chroot ntpd.

svn path=/nixos/trunk/; revision=7464
---
 upstart-jobs/ntpd.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/upstart-jobs/ntpd.nix b/upstart-jobs/ntpd.nix
index 2f66ac4e8a1..39e5eb9023f 100644
--- a/upstart-jobs/ntpd.nix
+++ b/upstart-jobs/ntpd.nix
@@ -12,7 +12,7 @@ let
     ${toString (map (server: "server " + server + "\n") servers)}
   ";
 
-  ntpFlags = "-c ${config} -u ${ntpUser}:nogroup";
+  ntpFlags = "-c ${config} -u ${ntpUser}:nogroup -i ${stateDir}";
 
 in
 
-- 
GitLab


From f25ce41c1854dbf1fcfec084c45c364ee76796c1 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 22 Dec 2006 23:34:42 +0000
Subject: [PATCH 0341/5331] * Option boot.doHardwareScan to disable the
 hardware scan.  Also, if   the flag "safemode" is specified on the kernel
 command line, also   disable the hardware scan. * Option boot.kernelModules
 to specify a set of modules to be loaded   in stage 2 (in addition to the
 initrd modules in   boot.initrd.kernelModules).

svn path=/nixos/trunk/; revision=7466
---
 boot/boot-stage-2-init.sh      |  7 +++++++
 configuration/options.nix      | 32 +++++++++++++++++++++++++++++++-
 configuration/system.nix       |  4 ++--
 configuration/upstart.nix      |  2 ++
 upstart-jobs/hardware-scan.nix | 23 ++++++++++++++++-------
 5 files changed, 58 insertions(+), 10 deletions(-)

diff --git a/boot/boot-stage-2-init.sh b/boot/boot-stage-2-init.sh
index a29b874c032..02e33b91912 100644
--- a/boot/boot-stage-2-init.sh
+++ b/boot/boot-stage-2-init.sh
@@ -59,6 +59,9 @@ for o in $(cat /proc/cmdline); do
             # !!! argh, can't pass a startup event to Upstart yet.
             exec @shell@
             ;;
+        safemode)
+            safeMode=1
+            ;;
     esac
 done
 
@@ -75,6 +78,10 @@ needWritableDir /root 0700
 # Miscellaneous boot time cleanup.
 rm -rf /var/run
 
+if test -n "$safeMode"; then
+    touch /var/run/safemode
+fi
+
 
 # Create the minimal device nodes needed before we run udev.
 mknod -m 0666 /dev/null c 1 3
diff --git a/configuration/options.nix b/configuration/options.nix
index d128f6c8e33..aaafca84e99 100644
--- a/configuration/options.nix
+++ b/configuration/options.nix
@@ -84,6 +84,33 @@
   }
 
 
+  {
+    name = ["boot" "hardwareScan"];
+    default = true;
+    description = "
+      Whether to try to load kernel modules for all detected hardware.
+      Usually this does a good job of providing you with the modules
+      you need, but sometimes it can crash the system or cause other
+      nasty effects.  If the hardware scan is turned on, it can be
+      disabled at boot time by adding the <literal>safemode</literal>
+      parameter to the kernel command line.
+    ";
+  }
+
+
+  {
+    name = ["boot" "kernelModules"];
+    default = [];
+    description = "
+      The set of kernel modules to be loaded in the second stage of
+      the boot process.  That is, these modules are not included in
+      the initial ramdisk, so they'd better not be required for
+      mounting the root file system.  Add them to
+      <option>boot.initrd.extraKernelModules</options> if they are.
+    ";
+  }
+
+
   {
     name = ["boot" "initrd" "kernelModules"];
     default = ["ide-cd" "ide-disk" "ide-generic" "ext3"];
@@ -106,7 +133,10 @@
     name = ["boot" "initrd" "extraKernelModules"];
     default = [];
     description = "
-      Additional kernel modules for the initial ramdisk.
+      Additional kernel modules for the initial ramdisk.  These are
+      loaded before the modules listed in
+      <option>boot.initrd.kernelModules</options>, so they take
+      precedence.
     ";
   }
 
diff --git a/configuration/system.nix b/configuration/system.nix
index e4b102d8f0c..385800bf936 100644
--- a/configuration/system.nix
+++ b/configuration/system.nix
@@ -37,8 +37,8 @@ rec {
 
 
   rootModules = 
-    (config.get ["boot" "initrd" "kernelModules"]) ++
-    (config.get ["boot" "initrd" "extraKernelModules"]);
+    (config.get ["boot" "initrd" "extraKernelModules"]) ++
+    (config.get ["boot" "initrd" "kernelModules"]);
 
 
   # Determine the set of modules that we need to mount the root FS.
diff --git a/configuration/upstart.nix b/configuration/upstart.nix
index e3e2dabadcc..bf2120968de 100644
--- a/configuration/upstart.nix
+++ b/configuration/upstart.nix
@@ -29,6 +29,8 @@ import ../upstart-jobs/gather.nix {
     # Hardware scan; loads modules for PCI devices.
     (import ../upstart-jobs/hardware-scan.nix {
       inherit (pkgs) kernel module_init_tools;
+      doHardwareScan = config.get ["boot" "hardwareScan"];
+      kernelModules = config.get ["boot" "kernelModules"];
     })
       
     # Mount file systems.
diff --git a/upstart-jobs/hardware-scan.nix b/upstart-jobs/hardware-scan.nix
index bfa44798bdb..6cca5f7562f 100644
--- a/upstart-jobs/hardware-scan.nix
+++ b/upstart-jobs/hardware-scan.nix
@@ -1,5 +1,5 @@
 # !!! Don't like it that I have to pass the kernel here.
-{kernel, module_init_tools}:
+{kernel, module_init_tools, doHardwareScan, kernelModules}:
 
 {
   name = "hardware-scan";
@@ -9,13 +9,22 @@ start on udev
 
 script
     export MODULE_DIR=${kernel}/lib/modules/
-    
-    # Try to load modules for all PCI devices.
-    for i in /sys/bus/pci/devices/*/modalias; do
-        echo \"Trying to load a module for $(basename $(dirname $i))...\"
-        ${module_init_tools}/sbin/modprobe $(cat $i) || true
-        echo \"\"
+
+    for i in ${toString kernelModules}; do
+        echo \"Loading kernel module $i...\"
+        ${module_init_tools}/sbin/modprobe $i || true
     done
+
+    if test -n \"${toString doHardwareScan}\" -a ! -e /var/run/safemode; then
+    
+        # Try to load modules for all PCI devices.
+        for i in /sys/bus/pci/devices/*/modalias; do
+            echo \"Trying to load a module for $(basename $(dirname $i))...\"
+            ${module_init_tools}/sbin/modprobe $(cat $i) || true
+            echo \"\"
+        done
+
+    fi
 end script
 
   ";
-- 
GitLab


From 8d09b9066c4f0eb4a0e29aa3e491ca7c7142dc9f Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 22 Dec 2006 23:51:18 +0000
Subject: [PATCH 0342/5331] * Purity: don't access /etc/modules.conf.

svn path=/nixos/trunk/; revision=7467
---
 helpers/modules-closure.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/helpers/modules-closure.sh b/helpers/modules-closure.sh
index c5fcbba87f1..a9b36709607 100644
--- a/helpers/modules-closure.sh
+++ b/helpers/modules-closure.sh
@@ -14,7 +14,7 @@ export MODULE_DIR=$kernel/lib/modules/
 closure=
 for module in $rootModules; do
     echo "root module: $module"
-    deps=$(modprobe --set-version "$version" --show-depends "$module" \
+    deps=$(modprobe --config /dev/null --set-version "$version" --show-depends "$module" \
         | sed 's/^insmod //')
     for i in $deps; do echo $i; done
     closure="$closure $deps"
-- 
GitLab


From 444d6b7583aa2b3c7a8f19572ad03a4390d5447a Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sat, 23 Dec 2006 00:13:22 +0000
Subject: [PATCH 0343/5331] * Add some SATA / SCSI related drivers to the
 initrd.

svn path=/nixos/trunk/; revision=7468
---
 configuration/options.nix | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/configuration/options.nix b/configuration/options.nix
index aaafca84e99..a9693e4d1d5 100644
--- a/configuration/options.nix
+++ b/configuration/options.nix
@@ -113,7 +113,15 @@
 
   {
     name = ["boot" "initrd" "kernelModules"];
-    default = ["ide-cd" "ide-disk" "ide-generic" "ext3"];
+    default = [
+      "ahci"
+      "ata_piix"
+      "sr_mod"
+      "ide-cd"
+      "ide-disk"
+      "ide-generic"
+      "ext3"
+    ];
     description = "
       The set of kernel modules in the initial ramdisk used during the
       boot process.  This set must include all modules necessary for
-- 
GitLab


From 07db057cbc30190685630389fb5f2b8329aaacc6 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sat, 23 Dec 2006 00:26:35 +0000
Subject: [PATCH 0344/5331] * Make sure that nogroup exists.

svn path=/nixos/trunk/; revision=7469
---
 configuration/activate-configuration.sh | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/configuration/activate-configuration.sh b/configuration/activate-configuration.sh
index 680af9570ec..4a64be2cd4b 100644
--- a/configuration/activate-configuration.sh
+++ b/configuration/activate-configuration.sh
@@ -55,6 +55,12 @@ if ! test -e /etc/passwd; then
 fi
 
 
+# Some more required accounts/groups.
+if ! getent group nogroup > /dev/null; then
+    groupadd -g 65534 nogroup
+fi
+
+
 # Set up Nix accounts.
 if test -z "@readOnlyRoot@"; then
 
@@ -62,10 +68,6 @@ if test -z "@readOnlyRoot@"; then
         groupadd -g 30000 nixbld
     fi
 
-    if ! getent group nogroup > /dev/null; then
-        groupadd -g 65534 nogroup
-    fi
-
     for i in $(seq 1 10); do
         account=nixbld$i
         if ! getent passwd $account > /dev/null; then
-- 
GitLab


From af49eda93fdb80ab68aa08d6f71aff591175f001 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sat, 23 Dec 2006 00:27:39 +0000
Subject: [PATCH 0345/5331] * Doh.

svn path=/nixos/trunk/; revision=7470
---
 boot/boot-stage-2-init.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/boot/boot-stage-2-init.sh b/boot/boot-stage-2-init.sh
index 02e33b91912..b7a95cae9f1 100644
--- a/boot/boot-stage-2-init.sh
+++ b/boot/boot-stage-2-init.sh
@@ -79,6 +79,7 @@ needWritableDir /root 0700
 rm -rf /var/run
 
 if test -n "$safeMode"; then
+    mkdir -m 0755 -p /var/run
     touch /var/run/safemode
 fi
 
-- 
GitLab


From 46f1c1987c3e584278b6e5f05d59082f5d3ada8e Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sat, 23 Dec 2006 00:59:14 +0000
Subject: [PATCH 0346/5331] * Add sd_mod.

svn path=/nixos/trunk/; revision=7471
---
 configuration/options.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/configuration/options.nix b/configuration/options.nix
index a9693e4d1d5..585d879c1e6 100644
--- a/configuration/options.nix
+++ b/configuration/options.nix
@@ -116,6 +116,7 @@
     default = [
       "ahci"
       "ata_piix"
+      "sd_mod"
       "sr_mod"
       "ide-cd"
       "ide-disk"
-- 
GitLab


From 6afa8d776ddee3dc335659651152b0c7ab0bf354 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sat, 23 Dec 2006 01:02:45 +0000
Subject: [PATCH 0347/5331] * Create some SCSI devices.  We should really just
 run udev in the   initrd...

svn path=/nixos/trunk/; revision=7472
---
 boot/make-devices.sh | 21 +++++----------------
 1 file changed, 5 insertions(+), 16 deletions(-)

diff --git a/boot/make-devices.sh b/boot/make-devices.sh
index 1e9f9719ea4..406aeacbe50 100644
--- a/boot/make-devices.sh
+++ b/boot/make-devices.sh
@@ -13,17 +13,6 @@ mknod -m 0600 /dev/tty c 5 0
 if ! test -e /dev/console; then
     mknod -m 0600 /dev/console c 5 1
 fi
-for i in $(seq 0 10); do
-    mknod -m 0600 /dev/tty$i c 4 $i
-done
-
-mkdir -m 0755 /dev/pts
-mknod -m 0666 /dev/ptmx c 5 2
-
-# random
-
-mknod -m 0644 /dev/random c 1 8
-mknod -m 0644 /dev/urandom c 1 9
 
 mknod -m 0660 /dev/hda b 3 0
 mknod -m 0660 /dev/hda1 b 3 1
@@ -45,9 +34,9 @@ mknod -m 0660 /dev/hdd1 b 22 65
 mknod -m 0660 /dev/hdd2 b 22 66
 mknod -m 0660 /dev/hdd3 b 22 67
 
-#mknod -m 0660 /dev/sda b 8 0
-#mknod -m 0660 /dev/sda1 b 8 1
-#mknod -m 0660 /dev/sda2 b 8 2
-#mknod -m 0660 /dev/sda3 b 8 3
+mknod -m 0660 /dev/sda b 8 0
+mknod -m 0660 /dev/sda1 b 8 1
+mknod -m 0660 /dev/sda2 b 8 2
+mknod -m 0660 /dev/sda3 b 8 3
 
-mknod -m 0600 /dev/initctl p
+mknod -m 0660 /dev/sr0 b 11 0
-- 
GitLab


From 11e4d36db10bccb865346a7a869aaae3ad9bb5c1 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sat, 23 Dec 2006 01:16:39 +0000
Subject: [PATCH 0348/5331] * Look for the CD-ROM in /sys/block, not
 /sys/devices.  Don't look for   a "media" file since SCSI CD-ROM drives don't
 have it (and   supposedly it's going away in IDE too). * Create the device
 node automatically from the "dev" file in   /sys/block/$bla.

svn path=/nixos/trunk/; revision=7473
---
 boot/boot-stage-1-init.sh | 17 +++++++++++------
 boot/make-devices.sh      | 27 ---------------------------
 2 files changed, 11 insertions(+), 33 deletions(-)

diff --git a/boot/boot-stage-1-init.sh b/boot/boot-stage-1-init.sh
index f1cad685e35..3e024d17ccf 100644
--- a/boot/boot-stage-1-init.sh
+++ b/boot/boot-stage-1-init.sh
@@ -73,15 +73,20 @@ if test -n "@autoDetectRootDevice@"; then
     # Look for the root device by label.
     echo "probing for the NixOS installation CD..."
 
-    for i in /sys/devices/*/*/media; do
-        if test "$(cat $i)" = "cdrom"; then
+    for i in /sys/block/*; do
+        if test "$(cat $i/removable)" = "1"; then
 
-            # Hopefully `drivename' matches the device created in /dev.
-            devName=/dev/$(cat $(dirname $i)/drivename)
+            echo "  in $(basename $i)..."
 
-            echo "  in $devName..."
+            set -- $(IFS=: ; echo $(cat $i/dev))
+            major="$1"
+            minor="$2"
 
-            if mount -n -o ro -t iso9660 $devName /mnt/root; then
+            # Create a device node for this device.
+            rm -f /dev/tmpdev
+            mknod /dev/tmpdev b "$major" "$minor"
+
+            if mount -n -o ro -t iso9660 /dev/tmpdev /mnt/root; then
                 if test -e "/mnt/root/@rootLabel@"; then
                     found=1
                     break
diff --git a/boot/make-devices.sh b/boot/make-devices.sh
index 406aeacbe50..4e4f80b3fb3 100644
--- a/boot/make-devices.sh
+++ b/boot/make-devices.sh
@@ -13,30 +13,3 @@ mknod -m 0600 /dev/tty c 5 0
 if ! test -e /dev/console; then
     mknod -m 0600 /dev/console c 5 1
 fi
-
-mknod -m 0660 /dev/hda b 3 0
-mknod -m 0660 /dev/hda1 b 3 1
-mknod -m 0660 /dev/hda2 b 3 2
-mknod -m 0660 /dev/hda3 b 3 3
-
-mknod -m 0660 /dev/hdb b 3 64
-mknod -m 0660 /dev/hdb1 b 3 65
-mknod -m 0660 /dev/hdb2 b 3 66
-mknod -m 0660 /dev/hdb3 b 3 67
-
-mknod -m 0660 /dev/hdc b 22 0
-mknod -m 0660 /dev/hdc1 b 22 1
-mknod -m 0660 /dev/hdc2 b 22 2
-mknod -m 0660 /dev/hdc3 b 22 3
-
-mknod -m 0660 /dev/hdd b 22 64
-mknod -m 0660 /dev/hdd1 b 22 65
-mknod -m 0660 /dev/hdd2 b 22 66
-mknod -m 0660 /dev/hdd3 b 22 67
-
-mknod -m 0660 /dev/sda b 8 0
-mknod -m 0660 /dev/sda1 b 8 1
-mknod -m 0660 /dev/sda2 b 8 2
-mknod -m 0660 /dev/sda3 b 8 3
-
-mknod -m 0660 /dev/sr0 b 11 0
-- 
GitLab


From e81f1b4334411c26fd9c08e8d38f0b40d9fe6d32 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sat, 23 Dec 2006 22:43:39 +0000
Subject: [PATCH 0349/5331] * Add glibc, ntp to the path.

svn path=/nixos/trunk/; revision=7474
---
 configuration/system.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/configuration/system.nix b/configuration/system.nix
index 385800bf936..bd35f29c05b 100644
--- a/configuration/system.nix
+++ b/configuration/system.nix
@@ -144,6 +144,7 @@ rec {
     pkgs.curl
     pkgs.e2fsprogs
     pkgs.findutils
+    pkgs.glibc # for ldd, getent
     pkgs.gnugrep
     pkgs.gnused
     pkgs.gnutar
@@ -155,6 +156,7 @@ rec {
     pkgs.nano
     pkgs.netcat
     pkgs.nettools
+    pkgs.ntp
     pkgs.perl
     pkgs.procps
     pkgs.pwdutils
-- 
GitLab


From bed8b44dc8b359bff7ee1af33d2d934514683cbb Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sat, 23 Dec 2006 23:38:34 +0000
Subject: [PATCH 0350/5331] * We do need some devices in /dev when not
 auto-detecting the root   device.

svn path=/nixos/trunk/; revision=7476
---
 boot/make-devices.sh | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)

diff --git a/boot/make-devices.sh b/boot/make-devices.sh
index 4e4f80b3fb3..406aeacbe50 100644
--- a/boot/make-devices.sh
+++ b/boot/make-devices.sh
@@ -13,3 +13,30 @@ mknod -m 0600 /dev/tty c 5 0
 if ! test -e /dev/console; then
     mknod -m 0600 /dev/console c 5 1
 fi
+
+mknod -m 0660 /dev/hda b 3 0
+mknod -m 0660 /dev/hda1 b 3 1
+mknod -m 0660 /dev/hda2 b 3 2
+mknod -m 0660 /dev/hda3 b 3 3
+
+mknod -m 0660 /dev/hdb b 3 64
+mknod -m 0660 /dev/hdb1 b 3 65
+mknod -m 0660 /dev/hdb2 b 3 66
+mknod -m 0660 /dev/hdb3 b 3 67
+
+mknod -m 0660 /dev/hdc b 22 0
+mknod -m 0660 /dev/hdc1 b 22 1
+mknod -m 0660 /dev/hdc2 b 22 2
+mknod -m 0660 /dev/hdc3 b 22 3
+
+mknod -m 0660 /dev/hdd b 22 64
+mknod -m 0660 /dev/hdd1 b 22 65
+mknod -m 0660 /dev/hdd2 b 22 66
+mknod -m 0660 /dev/hdd3 b 22 67
+
+mknod -m 0660 /dev/sda b 8 0
+mknod -m 0660 /dev/sda1 b 8 1
+mknod -m 0660 /dev/sda2 b 8 2
+mknod -m 0660 /dev/sda3 b 8 3
+
+mknod -m 0660 /dev/sr0 b 11 0
-- 
GitLab


From cb4e81d38f3eb502fd3c0b1ab40aab250c51915d Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sun, 24 Dec 2006 00:54:52 +0000
Subject: [PATCH 0351/5331] * Handle devices that are symlinks.

svn path=/nixos/trunk/; revision=7477
---
 upstart-jobs/filesystems.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/upstart-jobs/filesystems.nix b/upstart-jobs/filesystems.nix
index c001bf14d8d..14ae17bb10c 100644
--- a/upstart-jobs/filesystems.nix
+++ b/upstart-jobs/filesystems.nix
@@ -46,6 +46,8 @@ script
                 continue
             fi
 
+            device=$(readlink -f \"$device\")
+
             # If $device is already mounted somewhere else, unmount it first.
             # !!! Note: we use /etc/mtab, not /proc/mounts, because mtab
             # contains more accurate info when using loop devices.
-- 
GitLab


From 162181ffba4e6128c26781375d44bff0852b691b Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sun, 24 Dec 2006 01:07:28 +0000
Subject: [PATCH 0352/5331] * LVM support (in stage 2; having / on LVM is not
 yet supported).  LVM   triggers a new-devices event so that the filesystems
 job mounts file   systems on the logical volumes.

svn path=/nixos/trunk/; revision=7478
---
 configuration/system.nix  |  1 +
 configuration/upstart.nix |  5 +++++
 upstart-jobs/lvm.nix      | 30 ++++++++++++++++++++++++++++++
 3 files changed, 36 insertions(+)
 create mode 100644 upstart-jobs/lvm.nix

diff --git a/configuration/system.nix b/configuration/system.nix
index bd35f29c05b..5015f2d0d23 100644
--- a/configuration/system.nix
+++ b/configuration/system.nix
@@ -152,6 +152,7 @@ rec {
     pkgs.gzip
     pkgs.iputils
     pkgs.less
+    pkgs.lvm2
     pkgs.module_init_tools
     pkgs.nano
     pkgs.netcat
diff --git a/configuration/upstart.nix b/configuration/upstart.nix
index bf2120968de..d89788ff7b7 100644
--- a/configuration/upstart.nix
+++ b/configuration/upstart.nix
@@ -26,6 +26,11 @@ import ../upstart-jobs/gather.nix {
       inherit (pkgs) writeText cleanSource udev procps;
     })
       
+    # Makes LVM logical volumes available. 
+    (import ../upstart-jobs/lvm.nix {
+      inherit (pkgs) kernel module_init_tools lvm2;
+    })
+      
     # Hardware scan; loads modules for PCI devices.
     (import ../upstart-jobs/hardware-scan.nix {
       inherit (pkgs) kernel module_init_tools;
diff --git a/upstart-jobs/lvm.nix b/upstart-jobs/lvm.nix
new file mode 100644
index 00000000000..558b80cd651
--- /dev/null
+++ b/upstart-jobs/lvm.nix
@@ -0,0 +1,30 @@
+{kernel, module_init_tools, lvm2}:
+
+{
+  name = "lvm";
+  
+  job = "
+start on udev
+#start on new-devices
+
+script
+
+    # Load the device mapper.
+    export MODULE_DIR=${kernel}/lib/modules/
+    ${module_init_tools}/sbin/modprobe dm_mod || true
+
+    # Scan for block devices that might contain LVM physical volumes
+    # and volume groups.
+    #${lvm2}/sbin/vgscan
+
+    # Make all logical volumes on all volume groups available, i.e.,
+    # make them appear in /dev.
+    ${lvm2}/sbin/vgchange --available y
+
+    initctl emit new-devices
+    
+end script
+
+  ";
+
+}
-- 
GitLab


From 936fa69912bb150998b3db6b8f793bfadaed9272 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 25 Dec 2006 19:32:31 +0000
Subject: [PATCH 0353/5331] * Doh.

svn path=/nixos/trunk/; revision=7479
---
 configuration/activate-configuration.sh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/configuration/activate-configuration.sh b/configuration/activate-configuration.sh
index 4a64be2cd4b..36dfade4769 100644
--- a/configuration/activate-configuration.sh
+++ b/configuration/activate-configuration.sh
@@ -43,9 +43,9 @@ mkdir -m 0755 -p /var/log
 # empty password.
 if ! test -e /etc/passwd; then
     rootHome=/root
-    touch /etc/passwd; chmod 0755 /etc/passwd
-    touch /etc/group; chmod 0755 /etc/passwd
-    touch /etc/shadow; chmod 0700 /etc/passwd
+    touch /etc/passwd; chmod 0644 /etc/passwd
+    touch /etc/group; chmod 0644 /etc/group
+    touch /etc/shadow; chmod 0600 /etc/shadow
     # Can't use useradd, since it complain that it doesn't know us
     # (bootstrap problem!). 
     echo "root:x:0:0:System administrator:$rootHome:@shell@" >> /etc/passwd
-- 
GitLab


From 231b46918837350562a068b0df03f24d45ac1466 Mon Sep 17 00:00:00 2001
From: Armijn Hemel <armijn@gpl-violations.org>
Date: Mon, 25 Dec 2006 19:55:40 +0000
Subject: [PATCH 0354/5331] use mkfs.ext2 for making filesystems, not e2fsck

svn path=/nixos/trunk/; revision=7480
---
 README | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README b/README
index 2bb57388c48..4409f77bd1d 100644
--- a/README
+++ b/README
@@ -30,7 +30,7 @@
 - Login as "root", empty password.
 
 - The NixOS installer doesn't do any partitioning or formatting yet,
-  so you need to that yourself.  Use "fdisk" and "e2fsck".
+  so you need to that yourself.  Use "fdisk", "mkfs.ext2" and "tune2fs".
 
 - Unpack the NixOS and Nixpkgs sources:
 
-- 
GitLab


From acacfda1b25700c946d2cae85e36d7f67174284e Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 4 Jan 2007 10:21:25 +0000
Subject: [PATCH 0355/5331] * Remove references to stdenvNew.

svn path=/nixos/trunk/; revision=7532
---
 configuration/system.nix     | 2 +-
 instances/examples/basic.nix | 2 --
 upstart-jobs/httpd.nix       | 3 +--
 3 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/configuration/system.nix b/configuration/system.nix
index 5015f2d0d23..2b5c098c8b2 100644
--- a/configuration/system.nix
+++ b/configuration/system.nix
@@ -238,7 +238,7 @@ rec {
   # kernel, the Upstart services, the init scripts, etc.) as well as a
   # script `switch-to-configuration' that activates the configuration
   # and makes it bootable.
-  system = pkgs.stdenvNew.mkDerivation {
+  system = pkgs.stdenv.mkDerivation {
     name = "system";
     builder = ./system.sh;
     switchToConfiguration = ./switch-to-configuration.sh;
diff --git a/instances/examples/basic.nix b/instances/examples/basic.nix
index b72f3f64d48..430ed8de1d5 100644
--- a/instances/examples/basic.nix
+++ b/instances/examples/basic.nix
@@ -1,7 +1,5 @@
 {
   boot = {
-    autoDetectRootDevice = false;
-    readOnlyRoot = false;
     grubDevice = "/dev/hda";
   };
 
diff --git a/upstart-jobs/httpd.nix b/upstart-jobs/httpd.nix
index d89e10efd77..e9434d7f0e8 100644
--- a/upstart-jobs/httpd.nix
+++ b/upstart-jobs/httpd.nix
@@ -21,8 +21,7 @@ let
 
   
   webServer = import ../services/apache-httpd {
-    inherit (pkgs) apacheHttpd coreutils;
-    stdenv = pkgs.stdenvNew;
+    inherit (pkgs) stdenv apacheHttpd coreutils;
 
     inherit hostName httpPort httpsPort
       user group adminAddr logDir stateDir;
-- 
GitLab


From b6b5bafa221ee9eb8a4a22929afd1845ee7e660b Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 4 Jan 2007 10:29:40 +0000
Subject: [PATCH 0356/5331] * Refactoring.

svn path=/nixos/trunk/; revision=7533
---
 {configuration => system}/activate-configuration.sh  | 0
 {configuration => system}/config.nix                 | 0
 {configuration => system}/etc.nix                    | 0
 {configuration => system}/etc/default/passwd         | 0
 {configuration => system}/etc/dhclient-exit-hooks    | 0
 {configuration => system}/etc/hosts                  | 0
 {configuration => system}/etc/issue                  | 0
 {configuration => system}/etc/login.defs             | 0
 {configuration => system}/etc/nsswitch.conf          | 0
 {configuration => system}/etc/pam.d/login            | 0
 {configuration => system}/etc/pam.d/other            | 0
 {configuration => system}/etc/pam.d/passwd           | 0
 {configuration => system}/etc/pam.d/shadow           | 0
 {configuration => system}/etc/pam.d/sshd             | 0
 {configuration => system}/etc/pam.d/useradd          | 0
 {configuration => system}/etc/syslog.conf            | 0
 {configuration => system}/options.nix                | 0
 {configuration => system}/splash-themes.nix          | 0
 {configuration => system}/switch-to-configuration.sh | 0
 {configuration => system}/system.nix                 | 0
 {configuration => system}/system.sh                  | 0
 {configuration => system}/upstart.nix                | 0
 test.sh                                              | 2 +-
 upgrade.sh                                           | 2 +-
 24 files changed, 2 insertions(+), 2 deletions(-)
 rename {configuration => system}/activate-configuration.sh (100%)
 rename {configuration => system}/config.nix (100%)
 rename {configuration => system}/etc.nix (100%)
 rename {configuration => system}/etc/default/passwd (100%)
 rename {configuration => system}/etc/dhclient-exit-hooks (100%)
 rename {configuration => system}/etc/hosts (100%)
 rename {configuration => system}/etc/issue (100%)
 rename {configuration => system}/etc/login.defs (100%)
 rename {configuration => system}/etc/nsswitch.conf (100%)
 rename {configuration => system}/etc/pam.d/login (100%)
 rename {configuration => system}/etc/pam.d/other (100%)
 rename {configuration => system}/etc/pam.d/passwd (100%)
 rename {configuration => system}/etc/pam.d/shadow (100%)
 rename {configuration => system}/etc/pam.d/sshd (100%)
 rename {configuration => system}/etc/pam.d/useradd (100%)
 rename {configuration => system}/etc/syslog.conf (100%)
 rename {configuration => system}/options.nix (100%)
 rename {configuration => system}/splash-themes.nix (100%)
 rename {configuration => system}/switch-to-configuration.sh (100%)
 rename {configuration => system}/system.nix (100%)
 rename {configuration => system}/system.sh (100%)
 rename {configuration => system}/upstart.nix (100%)

diff --git a/configuration/activate-configuration.sh b/system/activate-configuration.sh
similarity index 100%
rename from configuration/activate-configuration.sh
rename to system/activate-configuration.sh
diff --git a/configuration/config.nix b/system/config.nix
similarity index 100%
rename from configuration/config.nix
rename to system/config.nix
diff --git a/configuration/etc.nix b/system/etc.nix
similarity index 100%
rename from configuration/etc.nix
rename to system/etc.nix
diff --git a/configuration/etc/default/passwd b/system/etc/default/passwd
similarity index 100%
rename from configuration/etc/default/passwd
rename to system/etc/default/passwd
diff --git a/configuration/etc/dhclient-exit-hooks b/system/etc/dhclient-exit-hooks
similarity index 100%
rename from configuration/etc/dhclient-exit-hooks
rename to system/etc/dhclient-exit-hooks
diff --git a/configuration/etc/hosts b/system/etc/hosts
similarity index 100%
rename from configuration/etc/hosts
rename to system/etc/hosts
diff --git a/configuration/etc/issue b/system/etc/issue
similarity index 100%
rename from configuration/etc/issue
rename to system/etc/issue
diff --git a/configuration/etc/login.defs b/system/etc/login.defs
similarity index 100%
rename from configuration/etc/login.defs
rename to system/etc/login.defs
diff --git a/configuration/etc/nsswitch.conf b/system/etc/nsswitch.conf
similarity index 100%
rename from configuration/etc/nsswitch.conf
rename to system/etc/nsswitch.conf
diff --git a/configuration/etc/pam.d/login b/system/etc/pam.d/login
similarity index 100%
rename from configuration/etc/pam.d/login
rename to system/etc/pam.d/login
diff --git a/configuration/etc/pam.d/other b/system/etc/pam.d/other
similarity index 100%
rename from configuration/etc/pam.d/other
rename to system/etc/pam.d/other
diff --git a/configuration/etc/pam.d/passwd b/system/etc/pam.d/passwd
similarity index 100%
rename from configuration/etc/pam.d/passwd
rename to system/etc/pam.d/passwd
diff --git a/configuration/etc/pam.d/shadow b/system/etc/pam.d/shadow
similarity index 100%
rename from configuration/etc/pam.d/shadow
rename to system/etc/pam.d/shadow
diff --git a/configuration/etc/pam.d/sshd b/system/etc/pam.d/sshd
similarity index 100%
rename from configuration/etc/pam.d/sshd
rename to system/etc/pam.d/sshd
diff --git a/configuration/etc/pam.d/useradd b/system/etc/pam.d/useradd
similarity index 100%
rename from configuration/etc/pam.d/useradd
rename to system/etc/pam.d/useradd
diff --git a/configuration/etc/syslog.conf b/system/etc/syslog.conf
similarity index 100%
rename from configuration/etc/syslog.conf
rename to system/etc/syslog.conf
diff --git a/configuration/options.nix b/system/options.nix
similarity index 100%
rename from configuration/options.nix
rename to system/options.nix
diff --git a/configuration/splash-themes.nix b/system/splash-themes.nix
similarity index 100%
rename from configuration/splash-themes.nix
rename to system/splash-themes.nix
diff --git a/configuration/switch-to-configuration.sh b/system/switch-to-configuration.sh
similarity index 100%
rename from configuration/switch-to-configuration.sh
rename to system/switch-to-configuration.sh
diff --git a/configuration/system.nix b/system/system.nix
similarity index 100%
rename from configuration/system.nix
rename to system/system.nix
diff --git a/configuration/system.sh b/system/system.sh
similarity index 100%
rename from configuration/system.sh
rename to system/system.sh
diff --git a/configuration/upstart.nix b/system/upstart.nix
similarity index 100%
rename from configuration/upstart.nix
rename to system/upstart.nix
diff --git a/test.sh b/test.sh
index cbb97bc700d..af9cb3c81e4 100755
--- a/test.sh
+++ b/test.sh
@@ -2,7 +2,7 @@
 if test -z "$NIXOS_CONFIG"; then
     NIXOS_CONFIG=/etc/nixos/configuration.nix
 fi
-nix-build configuration/system.nix \
+nix-build system/system.nix \
     --arg configuration "import $NIXOS_CONFIG" \
     -A system -K -k
 ./result/bin/switch-to-configuration test
diff --git a/upgrade.sh b/upgrade.sh
index 7bd921f3d83..259e30fe31e 100755
--- a/upgrade.sh
+++ b/upgrade.sh
@@ -2,7 +2,7 @@
 if test -z "$NIXOS_CONFIG"; then
     NIXOS_CONFIG=/etc/nixos/configuration.nix
 fi
-nix-env -p /nix/var/nix/profiles/system -f configuration/system.nix \
+nix-env -p /nix/var/nix/profiles/system -f system/system.nix \
     --arg configuration "import $NIXOS_CONFIG" \
     --set -A system
 /nix/var/nix/profiles/system/bin/switch-to-configuration switch
-- 
GitLab


From 966f6e0fb061c9664769fec341f28949cc098b6f Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 4 Jan 2007 10:31:36 +0000
Subject: [PATCH 0357/5331] * More refactoring.

svn path=/nixos/trunk/; revision=7534
---
 README                                               | 8 ++++----
 {instances => configuration}/examples/basic.nix      | 0
 {instances => configuration}/examples/svn-server.nix | 0
 {instances => configuration}/rescue-cd.nix           | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)
 rename {instances => configuration}/examples/basic.nix (100%)
 rename {instances => configuration}/examples/svn-server.nix (100%)
 rename {instances => configuration}/rescue-cd.nix (98%)

diff --git a/README b/README
index 4409f77bd1d..406a95871a3 100644
--- a/README
+++ b/README
@@ -10,7 +10,7 @@
 
 - Build the ISO image:
 
-  $ nix-build instances/rescue-cd.nix -A rescueCD
+  $ nix-build configuration/rescue-cd.nix -A rescueCD
 
   This gives you an image in result/iso/nixos.iso.
 
@@ -43,9 +43,9 @@
 - The installation is declarative; you need to make a description of
   the configuration that is to be built and activated.  The
   configuration is specified in a Nix expression.  See
-  instances/examples for example machine configurations.  You can copy
-  and edit one of those (e.g., instances/examples/basic.nix to
-  my-config.nix).  See configuration/options.nix for available
+  configuration/examples for example machine configurations.  You can
+  copy and edit one of those (e.g., configuration/examples/basic.nix
+  to my-config.nix).  See system/options.nix for available
   configuration settings.  The text editor "nano" is available.
 
   In particular you need to specify boot.rootDevice and
diff --git a/instances/examples/basic.nix b/configuration/examples/basic.nix
similarity index 100%
rename from instances/examples/basic.nix
rename to configuration/examples/basic.nix
diff --git a/instances/examples/svn-server.nix b/configuration/examples/svn-server.nix
similarity index 100%
rename from instances/examples/svn-server.nix
rename to configuration/examples/svn-server.nix
diff --git a/instances/rescue-cd.nix b/configuration/rescue-cd.nix
similarity index 98%
rename from instances/rescue-cd.nix
rename to configuration/rescue-cd.nix
index 8e201762b74..20284c0ac9b 100644
--- a/instances/rescue-cd.nix
+++ b/configuration/rescue-cd.nix
@@ -19,7 +19,7 @@ rec {
   };
 
 
-  system = import ../configuration/system.nix {
+  system = import ../system/system.nix {
     inherit configuration;
     stage2Init = "/init";
   };
-- 
GitLab


From 1a592f3a4e40940f6645298e01a9597c36e4925c Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 5 Jan 2007 00:28:48 +0000
Subject: [PATCH 0358/5331] * hda is called sda now.

svn path=/nixos/trunk/; revision=7535
---
 configuration/examples/basic.nix      |  6 +++---
 configuration/examples/svn-server.nix | 11 +++++++----
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/configuration/examples/basic.nix b/configuration/examples/basic.nix
index 430ed8de1d5..0676f6e39fc 100644
--- a/configuration/examples/basic.nix
+++ b/configuration/examples/basic.nix
@@ -1,15 +1,15 @@
 {
   boot = {
-    grubDevice = "/dev/hda";
+    grubDevice = "/dev/sda";
   };
 
   fileSystems = [
     { mountPoint = "/";
-      device = "/dev/hda1";
+      device = "/dev/sda1";
     }
   ];
 
-  swapDevices = ["/dev/hdb1"];
+  swapDevices = ["/dev/sdb1"];
   
   services = {
     sshd = {
diff --git a/configuration/examples/svn-server.nix b/configuration/examples/svn-server.nix
index 33006d7edd6..7f2dafe16ad 100644
--- a/configuration/examples/svn-server.nix
+++ b/configuration/examples/svn-server.nix
@@ -1,11 +1,14 @@
 {
   boot = {
-    autoDetectRootDevice = false;
-    rootDevice = "/dev/hda1";
-    readOnlyRoot = false;
-    grubDevice = "/dev/hda";
+    grubDevice = "/dev/sda";
   };
   
+  fileSystems = [
+    { mountPoint = "/";
+      device = "/dev/sda1";
+    }
+  ];
+
   services = {
   
     sshd = {
-- 
GitLab


From b7f11ad98b3a9a5305eb9c259746adc56c73680e Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sun, 7 Jan 2007 10:19:16 +0000
Subject: [PATCH 0359/5331] * Generate sshd_config to set XAuthLocation if X11
 forwarding is   enabled.

svn path=/nixos/trunk/; revision=7548
---
 system/options.nix       |  2 +-
 system/upstart.nix       |  4 +++-
 upstart-jobs/sshd.nix    | 18 ++++++++++++++++--
 upstart-jobs/sshd_config |  2 --
 4 files changed, 20 insertions(+), 6 deletions(-)
 delete mode 100644 upstart-jobs/sshd_config

diff --git a/system/options.nix b/system/options.nix
index 585d879c1e6..80ae8ead0a7 100644
--- a/system/options.nix
+++ b/system/options.nix
@@ -271,7 +271,7 @@
   
   {
     name = ["services" "sshd" "forwardX11"];
-    default = false;
+    default = true;
     description = "
       Whether to enable sshd to forward X11 connections.
     ";
diff --git a/system/upstart.nix b/system/upstart.nix
index d89788ff7b7..8c134a2f0b8 100644
--- a/system/upstart.nix
+++ b/system/upstart.nix
@@ -85,7 +85,9 @@ import ../upstart-jobs/gather.nix {
   # SSH daemon.
   ++ optional ["services" "sshd" "enable"]
     (import ../upstart-jobs/sshd.nix {
-      inherit (pkgs) openssh glibc pwdutils;
+      inherit (pkgs) writeText openssh glibc pwdutils;
+      inherit (pkgs.xorg) xauth;
+      forwardX11 = config.get ["services" "sshd" "forwardX11"];
     })
 
   # NTP daemon.
diff --git a/upstart-jobs/sshd.nix b/upstart-jobs/sshd.nix
index 7f4104625b9..4988158caa1 100644
--- a/upstart-jobs/sshd.nix
+++ b/upstart-jobs/sshd.nix
@@ -1,4 +1,18 @@
-{openssh, glibc, pwdutils}:
+{writeText, openssh, glibc, pwdutils, xauth, forwardX11}:
+
+let
+
+  sshdConfig = writeText "sshd_config" "
+    UsePAM yes
+    ${if forwardX11 then "
+      X11Forwarding yes
+      XAuthLocation ${xauth}/bin/xauth
+    " else "
+      X11Forwarding no
+    "}
+  ";
+
+in
 
 {
   name = "sshd";
@@ -24,7 +38,7 @@ start script
     fi
 end script
 
-respawn ${openssh}/sbin/sshd -D -h /etc/ssh/ssh_host_dsa_key -f ${./sshd_config}
+respawn ${openssh}/sbin/sshd -D -h /etc/ssh/ssh_host_dsa_key -f ${sshdConfig}
   ";
   
 }
diff --git a/upstart-jobs/sshd_config b/upstart-jobs/sshd_config
deleted file mode 100644
index 994042bc78f..00000000000
--- a/upstart-jobs/sshd_config
+++ /dev/null
@@ -1,2 +0,0 @@
-X11Forwarding yes
-UsePAM yes
-- 
GitLab


From 873a8de2ad923bd5e41131a21cbd4598ac8be700 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 8 Jan 2007 21:25:06 +0000
Subject: [PATCH 0360/5331] * Don't emit ctrl-alt-delete.

svn path=/nixos/trunk/; revision=7574
---
 system/switch-to-configuration.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/system/switch-to-configuration.sh b/system/switch-to-configuration.sh
index b0c412e546a..c199b083263 100644
--- a/system/switch-to-configuration.sh
+++ b/system/switch-to-configuration.sh
@@ -71,8 +71,8 @@ if test "$action" = "switch" -o "$action" = "test"; then
     # Start all new services and restart all changed services.
     for event in $(cd $newEvents && ls); do
 
-        # Hack: skip the sys-* events.
-        if echo "$event" | grep -q "^sys-"; then continue; fi
+        # Hack: skip the sys-* and ctrl-alt-delete events.
+        if echo "$event" | grep -q "^sys-\|^ctrl-"; then continue; fi
     
         if ! test -e "$oldEvents/$event"; then
             echo "starting $event..."
-- 
GitLab


From 56da3e78875f783db7451229bf55aa755c386c94 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 8 Jan 2007 21:34:30 +0000
Subject: [PATCH 0361/5331] * Allow any login program to be specified.

svn path=/nixos/trunk/; revision=7575
---
 system/upstart.nix        | 3 ++-
 upstart-jobs/mingetty.nix | 4 ++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/system/upstart.nix b/system/upstart.nix
index 8c134a2f0b8..f93098478b7 100644
--- a/system/upstart.nix
+++ b/system/upstart.nix
@@ -123,8 +123,9 @@ import ../upstart-jobs/gather.nix {
   # The terminals on ttyX.
   ++ (map 
     (ttyNumber: makeJob (import ../upstart-jobs/mingetty.nix {
-      inherit (pkgs) mingetty pam_login;
+      inherit (pkgs) mingetty;
       inherit ttyNumber;
+      loginProgram = "${pkgs.pam_login}/bin/login";
     }))
     (config.get ["services" "mingetty" "ttys"])
   )
diff --git a/upstart-jobs/mingetty.nix b/upstart-jobs/mingetty.nix
index f67a8ced92c..1d821e789b7 100644
--- a/upstart-jobs/mingetty.nix
+++ b/upstart-jobs/mingetty.nix
@@ -1,10 +1,10 @@
-{mingetty, pam_login, ttyNumber}:
+{mingetty, ttyNumber, loginProgram}:
 
 {
   name = "tty" + toString ttyNumber;
   job = "
     start on startup
     stop on shutdown
-    respawn ${mingetty}/sbin/mingetty --loginprog=${pam_login}/bin/login --noclear tty${toString ttyNumber}
+    respawn ${mingetty}/sbin/mingetty --loginprog=${loginProgram} --noclear tty${toString ttyNumber}
   ";
 }
-- 
GitLab


From 2148123b9ca44f7d0df5d24fe22493237f1323d2 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 8 Jan 2007 22:41:41 +0000
Subject: [PATCH 0362/5331] * Merge splash-themes.nix into the regular options
 infrastructure.

svn path=/nixos/trunk/; revision=7576
---
 system/config.nix        |  6 ++--
 system/options.nix       | 59 ++++++++++++++++++++++++++++++++++++++++
 system/splash-themes.nix | 58 ---------------------------------------
 system/system.nix        | 12 ++------
 system/upstart.nix       | 48 +++++++++++++++++++++++++-------
 5 files changed, 104 insertions(+), 79 deletions(-)
 delete mode 100644 system/splash-themes.nix

diff --git a/system/config.nix b/system/config.nix
index 46b9b1e76b8..7092ef6813c 100644
--- a/system/config.nix
+++ b/system/config.nix
@@ -3,13 +3,15 @@
 # defaults declared in options.nix if no value is given for an
 # option.
 
-lib: config:
+pkgs: config:
+
+let lib = pkgs.library; in
 
 rec {
 
   # The option declarations, i.e., option names with defaults and
   # documentation.
-  declarations = import ./options.nix;
+  declarations = import ./options.nix {inherit pkgs;};
 
   # Get the option named `name' from the user configuration, using
   # its default value if it's not defined.
diff --git a/system/options.nix b/system/options.nix
index 80ae8ead0a7..a1420c7037a 100644
--- a/system/options.nix
+++ b/system/options.nix
@@ -1,3 +1,5 @@
+{pkgs}:
+
 [
 
 
@@ -237,6 +239,63 @@
   }
 
       
+  {
+    name = ["services" "ttyBackgrounds" "enable"];
+    default = true;
+    description = "
+      Whether to enable graphical backgrounds for the virtual consoles.
+    ";
+  }
+
+      
+  {
+    name = ["services" "ttyBackgrounds" "defaultTheme"];
+    default = pkgs.fetchurl {
+      url = http://www.bootsplash.de/files/themes/Theme-BabyTux.tar.bz2;
+      md5 = "a6d89d1c1cff3b6a08e2f526f2eab4e0";
+    };
+    description = "
+      The default theme for the virtual consoles.  Themes can be found
+      at http://www.bootsplash.de/.
+    ";
+  }
+
+      
+  {
+    name = ["services" "ttyBackgrounds" "defaultSpecificThemes"];
+    default = [
+      { tty = 6;
+        theme = pkgs.fetchurl { # Yeah!
+          url = http://www.bootsplash.de/files/themes/Theme-Pativo.tar.bz2;
+          md5 = "9e13beaaadf88d43a5293e7ab757d569";
+        };
+      }
+      { tty = 10;
+        theme = pkgs.fetchurl {
+          url = http://www.bootsplash.de/files/themes/Theme-GNU.tar.bz2;
+          md5 = "61969309d23c631e57b0a311102ef034";
+        };
+      }
+    ];
+    description = "
+      This option sets specific themes for virtual consoles.  If you
+      just want to set themes for additional consoles, use
+      <option>services.ttyBackgrounds.specificThemes</option>.
+    ";
+  }
+
+      
+  {
+    name = ["services" "ttyBackgrounds" "specificThemes"];
+    default = [
+    ];
+    description = "
+      This option allows you to set specific themes for virtual
+      consoles.
+    ";
+  }
+
+      
   {
     name = ["services" "mingetty" "ttys"];
     default = [1 2 3 4 5 6];
diff --git a/system/splash-themes.nix b/system/splash-themes.nix
deleted file mode 100644
index 25be6168b37..00000000000
--- a/system/splash-themes.nix
+++ /dev/null
@@ -1,58 +0,0 @@
-{fetchurl}:
-
-rec {
-
-  # Some themes.
-  
-  themeBabyTux = fetchurl {
-    url = http://www.bootsplash.de/files/themes/Theme-BabyTux.tar.bz2;
-    md5 = "a6d89d1c1cff3b6a08e2f526f2eab4e0";
-  };
-
-  themeFrozenBubble = fetchurl {
-    url = http://www.bootsplash.de/files/themes/Theme-FrozenBubble.tar.bz2;
-    md5 = "da49f04988ab04b7e0de117b0d25061a";
-  };
-
-  themePativo = fetchurl { # Yeah!
-    url = http://www.bootsplash.de/files/themes/Theme-Pativo.tar.bz2;
-    md5 = "9e13beaaadf88d43a5293e7ab757d569";
-  };
-
-  themeGNU = fetchurl {
-    url = http://www.bootsplash.de/files/themes/Theme-GNU.tar.bz2;
-    md5 = "61969309d23c631e57b0a311102ef034";
-  };
-
-
-  # The splash screen.
-  
-  splashScreen = themeBabyTux;
-
-
-  # The themes to use for each tty.  For each tty except the first
-  # entry in the list, you can omit `theme' to get the same theme as
-  # the first one.  If a tty does not appear, it doesn't get a
-  # theme (i.e., it will keep a black background).
-  
-  ttyBackgrounds = [
-    { tty = 1;
-      theme = themeBabyTux;
-    }
-    { tty = 2;
-    }
-    { tty = 3;
-      theme = themeGNU;
-    }
-    { tty = 4;
-      theme = themeGNU;
-    }
-    { tty = 5;
-      theme = themePativo;
-    }
-    { tty = 10; # logging console
-      theme = themeGNU;
-    }
-  ];
-  
-}
diff --git a/system/system.nix b/system/system.nix
index 2b5c098c8b2..9089f451395 100644
--- a/system/system.nix
+++ b/system/system.nix
@@ -7,7 +7,7 @@ rec {
 
   # Make a configuration object from which we can retrieve option
   # values.
-  config = import ./config.nix pkgs.library configuration;
+  config = import ./config.nix pkgs configuration;
   
 
   pkgs = import ../pkgs/top-level/all-packages.nix {system = platform;};
@@ -30,12 +30,6 @@ rec {
   nix = pkgs.nixUnstable; # we need the exportReferencesGraph feature
 
 
-  # Splash configuration.
-  splashThemes = import ./splash-themes.nix {
-    inherit (pkgs) fetchurl;
-  };
-
-
   rootModules = 
     (config.get ["boot" "initrd" "extraKernelModules"]) ++
     (config.get ["boot" "initrd" "kernelModules"]);
@@ -100,7 +94,7 @@ rec {
       }
       { object = import ../helpers/unpack-theme.nix {
           inherit (pkgs) stdenv;
-          theme = splashThemes.splashScreen;
+          theme = config.get ["services" "ttyBackgrounds" "defaultTheme"];
         };
         symlink = "/etc/splash";
       }
@@ -117,7 +111,7 @@ rec {
 
   # The services (Upstart) configuration for the system.
   upstartJobs = import ./upstart.nix {
-    inherit config pkgs nix splashThemes;
+    inherit config pkgs nix;
   };
 
 
diff --git a/system/upstart.nix b/system/upstart.nix
index f93098478b7..f2227a729cd 100644
--- a/system/upstart.nix
+++ b/system/upstart.nix
@@ -1,4 +1,4 @@
-{config, pkgs, nix, splashThemes}:
+{config, pkgs, nix}:
 
 let 
 
@@ -66,12 +66,6 @@ import ../upstart-jobs/gather.nix {
       inherit nix;
     })
 
-    # Transparent TTY backgrounds.
-    (import ../upstart-jobs/tty-backgrounds.nix {
-      inherit (pkgs) stdenv splashutils;
-      backgrounds = splashThemes.ttyBackgrounds;
-    })
-
     # Handles the maintenance/stalled event (single-user shell).
     (import ../upstart-jobs/maintenance-shell.nix {
       inherit (pkgs) bash;
@@ -123,13 +117,47 @@ import ../upstart-jobs/gather.nix {
   # The terminals on ttyX.
   ++ (map 
     (ttyNumber: makeJob (import ../upstart-jobs/mingetty.nix {
-      inherit (pkgs) mingetty;
-      inherit ttyNumber;
-      loginProgram = "${pkgs.pam_login}/bin/login";
+        inherit (pkgs) mingetty;
+        inherit ttyNumber;
+        loginProgram = "${pkgs.pam_login}/bin/login";
     }))
     (config.get ["services" "mingetty" "ttys"])
   )
 
+  # Transparent TTY backgrounds.
+  ++ optional ["services" "ttyBackgrounds" "enable"]
+    (import ../upstart-jobs/tty-backgrounds.nix {
+      inherit (pkgs) stdenv splashutils;
+      
+      backgrounds =
+      
+        let
+        
+          specificThemes =
+            config.get ["services" "ttyBackgrounds" "defaultSpecificThemes"]
+            ++ config.get ["services" "ttyBackgrounds" "specificThemes"];
+            
+          overridenTTYs = map (x: x.tty) specificThemes;
+
+          requiredTTYs =
+            (config.get ["services" "mingetty" "ttys"])
+            ++ [10] /* !!! sync with syslog.conf */ ;
+
+          # Use the default theme for all the mingetty ttys and for the
+          # syslog tty, except those for which a specific theme is
+          # specified.
+          defaultTTYs =
+            pkgs.library.filter (x: !(pkgs.library.elem x overridenTTYs)) requiredTTYs;
+
+        in      
+          (map (ttyNumber: {
+            tty = ttyNumber;
+            theme = config.get ["services" "ttyBackgrounds" "defaultTheme"];
+          }) defaultTTYs)
+          ++ specificThemes;
+          
+    })
+
   # User-defined events.
   ++ (map makeJob (config.get ["services" "extraJobs"]))
 
-- 
GitLab


From c4df455e813b2a96d456b94dee7fee86ae274eee Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 8 Jan 2007 23:10:29 +0000
Subject: [PATCH 0363/5331] * Allow the user to do something useful on tty8
 while waiting for the   installation to finish.

svn path=/nixos/trunk/; revision=7578
---
 configuration/rescue-cd.nix | 30 ++++++++++++++++++++++++++++++
 1 file changed, 30 insertions(+)

diff --git a/configuration/rescue-cd.nix b/configuration/rescue-cd.nix
index 20284c0ac9b..a8453f1f619 100644
--- a/configuration/rescue-cd.nix
+++ b/configuration/rescue-cd.nix
@@ -2,20 +2,50 @@ rec {
 
   
   configuration = {
+  
     boot = {
       autoDetectRootDevice = true;
       readOnlyRoot = true;
       # The label used to identify the installation CD.
       rootLabel = "NIXOS";
     };
+    
     services = {
+    
       sshd = {
         enable = false;
       };
+      
       xserver = {
         enable = false;
       };
+
+      # Allow the user to do something useful on tty8 while waiting
+      # for the installation to finish.
+      extraJobs = [
+        { name = "rogue";
+          job = "
+            start on udev
+            stop on shutdown
+            respawn ${pkgs.rogue}/bin/rogue < /dev/tty8 > /dev/tty8 2>&1
+          ";
+        }
+      ];
+
+      # And a background to go with that.
+      ttyBackgrounds = {
+        specificThemes = [
+          { tty = 8;
+            theme = pkgs.fetchurl {
+              url = http://www.bootsplash.de/files/themes/Theme-GNU.tar.bz2;
+              md5 = "61969309d23c631e57b0a311102ef034";
+            };
+          }
+        ];
+      };
+      
     };
+    
   };
 
 
-- 
GitLab


From 2d20b19e5bc6c5c6ebeb1937f63b6a625b5f0e5b Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 9 Jan 2007 09:52:16 +0000
Subject: [PATCH 0364/5331] * Don't get stuck in an infinite unmount loop on
 shutdown.

svn path=/nixos/trunk/; revision=7580
---
 upstart-jobs/halt.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/upstart-jobs/halt.nix b/upstart-jobs/halt.nix
index f24904e723b..719b01258ff 100644
--- a/upstart-jobs/halt.nix
+++ b/upstart-jobs/halt.nix
@@ -47,8 +47,10 @@ script
         for mp in $(getMountPoints); do
             device=$(getDevice $mp)
             echo \"unmounting $mp...\"
-            if umount -n -r \"$mp\"; then
+            if umount -n \"$mp\"; then
                 if test \"$mp\" != /; then tryAgain=1; fi
+            else
+                mount -n -o remount,ro \"$mp\"
             fi
 
             # Hack: work around a bug in mount (mount -o remount on a
-- 
GitLab


From 835bb2b880038aec0e2027bb38cc3ec9df1c9048 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 9 Jan 2007 12:12:06 +0000
Subject: [PATCH 0365/5331] * Use the latest Nixpkgs.

svn path=/nixos/trunk/; revision=7582
---
 README                      | 4 +++-
 configuration/rescue-cd.nix | 4 ++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/README b/README
index 406a95871a3..44d67eabd75 100644
--- a/README
+++ b/README
@@ -1,12 +1,14 @@
 *** Building the installation CD ***
 
+(Or just grab an ISO from http://nix.cs.uu.nl/dist/nix/.)
+
 - Make sure that you have a very recent Nix.
 
 - Pull from the Nixpkgs channel to speed up building.
 
 - Check out https://svn.cs.uu.nl:12443/repos/trace/nixos/trunk/.
 
-- make a symbolic link called "pkgs" to the location of Nixpkgs
+- Make a symbolic link called "pkgs" to the location of Nixpkgs.
 
 - Build the ISO image:
 
diff --git a/configuration/rescue-cd.nix b/configuration/rescue-cd.nix
index a8453f1f619..2fd1f0b9945 100644
--- a/configuration/rescue-cd.nix
+++ b/configuration/rescue-cd.nix
@@ -85,12 +85,12 @@ rec {
 
 
   # Get a recent copy of Nixpkgs.
-  nixpkgsRel = "nixpkgs-0.11pre7355";
+  nixpkgsRel = "nixpkgs-0.11pre7577";
   nixpkgsURL = http://nix.cs.uu.nl/dist/nix/ + nixpkgsRel;
 
   nixpkgsTarball = pkgs.fetchurl {
     url = nixpkgsURL + "/" + nixpkgsRel + ".tar.bz2";
-    md5 = "9d3e5e9f6ab64536803abf3f2e1c6056";
+    md5 = "0949415aa342679f206fdb7ee9b04b46";
   };
 
 
-- 
GitLab


From 47761d0bd07175bd3102ad4594383ec5c351e7e8 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 9 Jan 2007 13:15:13 +0000
Subject: [PATCH 0366/5331] * Make some more SCSI device nodes.  Quick hack to
 get NixOS running   on itchy.  We really should run udevd in boot stage 1.

svn path=/nixos/trunk/; revision=7583
---
 boot/make-devices.sh | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/boot/make-devices.sh b/boot/make-devices.sh
index 406aeacbe50..9e313a01164 100644
--- a/boot/make-devices.sh
+++ b/boot/make-devices.sh
@@ -38,5 +38,9 @@ mknod -m 0660 /dev/sda b 8 0
 mknod -m 0660 /dev/sda1 b 8 1
 mknod -m 0660 /dev/sda2 b 8 2
 mknod -m 0660 /dev/sda3 b 8 3
+mknod -m 0660 /dev/sda4 b 8 4
+mknod -m 0660 /dev/sda5 b 8 5
+mknod -m 0660 /dev/sda6 b 8 6
+mknod -m 0660 /dev/sda7 b 8 7
 
 mknod -m 0660 /dev/sr0 b 11 0
-- 
GitLab


From fb2d9f83479f4a8038a5bbab480c5cd8a52b7a65 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 9 Jan 2007 13:56:54 +0000
Subject: [PATCH 0367/5331] * Race condition: splash_util fails if the virtual
 console doesn't   exist yet (e.g., because mingetty hasn't started yet), so
 make sure   it exists.

svn path=/nixos/trunk/; revision=7584
---
 upstart-jobs/tty-backgrounds.nix | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/upstart-jobs/tty-backgrounds.nix b/upstart-jobs/tty-backgrounds.nix
index abe6f52305a..3956d9fb8b4 100644
--- a/upstart-jobs/tty-backgrounds.nix
+++ b/upstart-jobs/tty-backgrounds.nix
@@ -27,9 +27,13 @@ start script
     # this program every time we switch between consoles.
     echo ${splashutils}/bin/splash_helper > /proc/sys/kernel/fbsplash
 
-    # Set the theme for each console, as determined by
-    # tty-backgrounds-combine.sh above.
+    # For each console...
     for tty in ${toString (map (x: x.tty) backgrounds)}; do
+        # Make sure that the console exists.
+        echo -n '' > /dev/tty$tty 
+
+	# Set the theme as determined by tty-backgrounds-combine.sh
+        # above.
         theme=$(readlink ${themesUnpacked}/$tty)
         ${splashutils}/bin/splash_util --tty $tty -c setcfg -t $theme || true
         ${splashutils}/bin/splash_util --tty $tty -c setpic -t $theme || true
-- 
GitLab


From 1bcf53d58f2724f83b0849b2bdd080120c7d606a Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 9 Jan 2007 14:26:01 +0000
Subject: [PATCH 0368/5331] * Script to check out NixOS.

svn path=/nixos/trunk/; revision=7585
---
 checkout-nixos.sh | 7 +++++++
 1 file changed, 7 insertions(+)
 create mode 100755 checkout-nixos.sh

diff --git a/checkout-nixos.sh b/checkout-nixos.sh
new file mode 100755
index 00000000000..3cf8af38541
--- /dev/null
+++ b/checkout-nixos.sh
@@ -0,0 +1,7 @@
+#! /bin/sh
+nix-channel --add http://nix.cs.uu.nl/dist/nix/channels-v3/nixpkgs-unstable
+nix-channel --update
+nix-env -i subversion
+svn co https://svn.cs.uu.nl:12443/repos/trace/nixos/trunk nixos
+svn co https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk nixpkgs
+ln -s ../nixpkgs/pkgs nixos/pkgs
-- 
GitLab


From c9c5e920c913c83247eda2ad2d2fcb88879045bb Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 9 Jan 2007 14:57:06 +0000
Subject: [PATCH 0369/5331] * Info on updating NixOS.

svn path=/nixos/trunk/; revision=7586
---
 README | 33 ++++++++++++++++++++++++++++++++-
 1 file changed, 32 insertions(+), 1 deletion(-)

diff --git a/README b/README
index 44d67eabd75..aaf0239edb1 100644
--- a/README
+++ b/README
@@ -66,7 +66,38 @@
   $ reboot
 
   You should now be able to boot into the installed NixOS.
-  
+
+
+*** Updating NixOS ***
+
+- In NixOS, login as root, then do
+
+  $ checkout-nixos.sh  # !!! should be added to the installation
+
+  This gives you a working copy of NixOS and NixPkgs in nixos/ and
+  nixpkgs/, respectively.  You only need to do this once; you can use
+  "svn up" afterwards.
+
+- The system configuration is in /etc/nixos/configuration.nix.
+
+- To upgrade to a new configuration:
+
+  $ cd nixos
+  $ ./upgrade.sh
+
+  The new configuration is activated immediately (e.g., services may
+  be restarted if necessary), but some changes may require a reboot.
+
+- You can also test a new configuration:
+
+  $ cd nixos
+  $ ./test.sh
+
+  This is like ./upgrade.sh, only the new configuration won't be
+  installed in the system profile so the system will continue to boot
+  from the previous configuration.
+
+
 
 *** Troubleshooting ***        
 
-- 
GitLab


From 60e4da4a9b5607090be1c1501caa142b94aef698 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 9 Jan 2007 16:29:27 +0000
Subject: [PATCH 0370/5331] * Hacked up support for volume labels.

svn path=/nixos/trunk/; revision=7587
---
 upstart-jobs/filesystems.nix | 47 +++++++++++++++++++++---------------
 1 file changed, 28 insertions(+), 19 deletions(-)

diff --git a/upstart-jobs/filesystems.nix b/upstart-jobs/filesystems.nix
index 14ae17bb10c..23849db7886 100644
--- a/upstart-jobs/filesystems.nix
+++ b/upstart-jobs/filesystems.nix
@@ -41,33 +41,42 @@ script
             fsType=\${fsTypes[$n]}
             options=\${optionss[$n]}
 
-            if ! test -e \"$device\"; then
+            isLabel=
+            if echo \"$device\" | grep -q '^LABEL='; then isLabel=1; fi
+
+            if ! test -n \"$isLabel\" -o -e \"$device\"; then
                 echo \"skipping $device, doesn't exist (yet)\"
                 continue
             fi
 
-            device=$(readlink -f \"$device\")
-
             # If $device is already mounted somewhere else, unmount it first.
             # !!! Note: we use /etc/mtab, not /proc/mounts, because mtab
             # contains more accurate info when using loop devices.
-            prevMountPoint=$(
-                cat /etc/mtab \\
-                | grep \"^$device \" \\
-                | sed 's|^[^ ]\\+ \\+\\([^ ]\\+\\).*|\\1|' \\
-            )
-
-            if test \"$prevMountPoint\" = \"$mountPoint\"; then
-                 echo \"remounting $device on $mountPoint\"
-                 ${utillinux}/bin/mount -t \"$fsType\" \\
-                     -o remount,\"$options\" \\
-                     \"$device\" \"$mountPoint\" || true
-                 continue
-            fi
 
-            if test -n \"$prevMountPoint\"; then
-                echo \"unmount $device from $prevMountPoint\"
-                ${utillinux}/bin/umount \"$prevMountPoint\" || true
+            # !!! not very smart about labels yet; should resolve the label somehow.
+            if test -z \"$isLabel\"; then
+
+                device=$(readlink -f \"$device\")
+
+                prevMountPoint=$(
+                    cat /etc/mtab \\
+                    | grep \"^$device \" \\
+                    | sed 's|^[^ ]\\+ \\+\\([^ ]\\+\\).*|\\1|' \\
+                )
+
+                if test \"$prevMountPoint\" = \"$mountPoint\"; then
+                     echo \"remounting $device on $mountPoint\"
+                     ${utillinux}/bin/mount -t \"$fsType\" \\
+                         -o remount,\"$options\" \\
+                         \"$device\" \"$mountPoint\" || true
+                     continue
+                fi
+
+                if test -n \"$prevMountPoint\"; then
+                    echo \"unmount $device from $prevMountPoint\"
+                    ${utillinux}/bin/umount \"$prevMountPoint\" || true
+                fi
+
             fi
 
             echo \"mounting $device on $mountPoint\"
-- 
GitLab


From d4183887a84668987abde72e9ed57ee946a42836 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 9 Jan 2007 17:27:26 +0000
Subject: [PATCH 0371/5331] * Add man to the initial path.

svn path=/nixos/trunk/; revision=7591
---
 system/activate-configuration.sh | 1 +
 system/system.nix                | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/system/activate-configuration.sh b/system/activate-configuration.sh
index 36dfade4769..d00bba5d442 100644
--- a/system/activate-configuration.sh
+++ b/system/activate-configuration.sh
@@ -94,6 +94,7 @@ cat > /etc/profile <<EOF
 export PATH=$PATH
 export MODULE_DIR=@kernel@/lib/modules
 export NIX_CONF_DIR=/nix/etc/nix
+export PAGER=less
 if test "\$USER" != root; then
     export NIX_REMOTE=daemon
 fi
diff --git a/system/system.nix b/system/system.nix
index 9089f451395..a45f08c7e9f 100644
--- a/system/system.nix
+++ b/system/system.nix
@@ -147,6 +147,7 @@ rec {
     pkgs.iputils
     pkgs.less
     pkgs.lvm2
+    pkgs.man
     pkgs.module_init_tools
     pkgs.nano
     pkgs.netcat
@@ -194,7 +195,7 @@ rec {
     fullPath = pkgs.buildEnv {
       name = "boot-stage-2-path";
       paths = fullPath;
-      pathsToLink = ["/bin" "/sbin" "/man/man1" "/share/man/man1"];
+      pathsToLink = ["/bin" "/sbin" "/man" "/share"];
       ignoreCollisions = true;
     };
   };
-- 
GitLab


From cbe4c2e0b879860fdf406ab2e039e0aeb2237257 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 9 Jan 2007 21:19:06 +0000
Subject: [PATCH 0372/5331] * Installer: pull the manifest properly.

svn path=/nixos/trunk/; revision=7594
---
 configuration/rescue-cd.nix | 12 ++++++++----
 system/options.nix          | 11 +++++++++++
 system/system.nix           |  1 +
 3 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/configuration/rescue-cd.nix b/configuration/rescue-cd.nix
index 2fd1f0b9945..dc7fb066caa 100644
--- a/configuration/rescue-cd.nix
+++ b/configuration/rescue-cd.nix
@@ -1,6 +1,9 @@
 rec {
 
   
+  nixpkgsRel = "nixpkgs-0.11pre7577";
+
+
   configuration = {
   
     boot = {
@@ -45,6 +48,10 @@ rec {
       };
       
     };
+
+    installer = {
+      nixpkgsURL = http://nix.cs.uu.nl/dist/nix/ + nixpkgsRel;
+    };
     
   };
 
@@ -85,11 +92,8 @@ rec {
 
 
   # Get a recent copy of Nixpkgs.
-  nixpkgsRel = "nixpkgs-0.11pre7577";
-  nixpkgsURL = http://nix.cs.uu.nl/dist/nix/ + nixpkgsRel;
-
   nixpkgsTarball = pkgs.fetchurl {
-    url = nixpkgsURL + "/" + nixpkgsRel + ".tar.bz2";
+    url = configuration.installer.nixpkgsURL + "/" + nixpkgsRel + ".tar.bz2";
     md5 = "0949415aa342679f206fdb7ee9b04b46";
   };
 
diff --git a/system/options.nix b/system/options.nix
index a1420c7037a..21c2c7b2493 100644
--- a/system/options.nix
+++ b/system/options.nix
@@ -485,4 +485,15 @@
   }
 
   
+  {
+    name = ["installer" "nixpkgsURL"];
+    default = "";
+    example = http://nix.cs.uu.nl/dist/nix/nixpkgs-0.11pre7577;
+    description = "
+      URL of the Nixpkgs distribution to use when building the
+      installation CD.
+    ";
+  }
+
+  
 ]
diff --git a/system/system.nix b/system/system.nix
index a45f08c7e9f..acd8225d732 100644
--- a/system/system.nix
+++ b/system/system.nix
@@ -106,6 +106,7 @@ rec {
   nixosInstaller = import ../installer/nixos-installer.nix {
     inherit (pkgs) stdenv runCommand substituteAll;
     inherit nix;
+    nixpkgsURL = config.get ["installer" "nixpkgsURL"];
   };
 
 
-- 
GitLab


From 37ab8be36f663b90b10c49eabacce15747c67831 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 9 Jan 2007 21:19:53 +0000
Subject: [PATCH 0373/5331] * Doh.

svn path=/nixos/trunk/; revision=7595
---
 installer/nixos-installer.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/installer/nixos-installer.sh b/installer/nixos-installer.sh
index c39d5ea698d..b3889cac166 100644
--- a/installer/nixos-installer.sh
+++ b/installer/nixos-installer.sh
@@ -123,7 +123,7 @@ fi
 
 chroot $mountPoint @nix@/bin/nix-env \
     -p /nix/var/nix/profiles/system \
-    -f "/mnt$nixosDir/configuration/system.nix" \
+    -f "/mnt$nixosDir/system/system.nix" \
     --arg configuration "import /mnt$configuration" \
     --set -A system
 
-- 
GitLab


From 5b5b6f9f635adf88c2a1a3d4f60f87f2d4af9a4b Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 9 Jan 2007 21:25:53 +0000
Subject: [PATCH 0374/5331] * Use a shell in the closure we just copied to the
 target.

svn path=/nixos/trunk/; revision=7596
---
 installer/nixos-installer.sh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/installer/nixos-installer.sh b/installer/nixos-installer.sh
index b3889cac166..dabf2452e95 100644
--- a/installer/nixos-installer.sh
+++ b/installer/nixos-installer.sh
@@ -99,7 +99,8 @@ chroot $mountPoint @nix@/bin/nix-store --register-validity < @nixClosure@
 # Create the required /bin/sh symlink; otherwise lots of things
 # (notably the system() function) won't work.
 mkdir -m 0755 -p $mountPoint/bin
-ln -sf $(type -tp sh) $mountPoint/bin/sh
+# !!! assuming that @shell@ is in the closure
+ln -sf @shell@ $mountPoint/bin/sh
 
 
 # Enable networking in the chroot.
-- 
GitLab


From efefd93551f8431600e62997c0ae2afa0ec7ebb4 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 9 Jan 2007 21:28:08 +0000
Subject: [PATCH 0375/5331] * Create /etc/nixos if it doesn't exist.

svn path=/nixos/trunk/; revision=7597
---
 installer/nixos-installer.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/installer/nixos-installer.sh b/installer/nixos-installer.sh
index dabf2452e95..07b708eb179 100644
--- a/installer/nixos-installer.sh
+++ b/installer/nixos-installer.sh
@@ -131,6 +131,7 @@ chroot $mountPoint @nix@/bin/nix-env \
 
 # Copy the configuration to /etc/nixos.
 targetConfig=$mountPoint/etc/nixos/configuration.nix
+mkdir -p $(dirname $targetConfig)
 if test -e $targetConfig -o -L $targetConfig; then
     mv $targetConfig $targetConfig.backup-$(date "+%Y%m%d%H%M%S")
 fi
-- 
GitLab


From fd4c1a2c43260548674d94e6b4cae984f812ab75 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 9 Jan 2007 23:12:41 +0000
Subject: [PATCH 0376/5331] * The user should mount the target file system.

svn path=/nixos/trunk/; revision=7598
---
 README                       |  8 +++++---
 configuration/rescue-cd.nix  |  4 ++--
 installer/nixos-installer.sh | 33 ++++++++++++---------------------
 3 files changed, 19 insertions(+), 26 deletions(-)

diff --git a/README b/README
index aaf0239edb1..8a5ad4105c0 100644
--- a/README
+++ b/README
@@ -34,6 +34,8 @@
 - The NixOS installer doesn't do any partitioning or formatting yet,
   so you need to that yourself.  Use "fdisk", "mkfs.ext2" and "tune2fs".
 
+- Mount the target root device, e.g., under /mnt.
+
 - Unpack the NixOS and Nixpkgs sources:
 
   $ tar xf /nixos.tar.bz2
@@ -56,10 +58,10 @@
 
 - Do the installation:
 
-  $ nixos-installer.sh /dev/TARGET . my-config.nix
+  $ nixos-installer.sh ROOTDIR . my-config.nix
 
-  where TARGET matched boot.rootDevice in your configuration.  (TODO:
-  this should be extracted automatically.)
+  where ROOTDIR is the mount point of the target root device (i.e.,
+  boot.rootDevice in your configuration).
 
 - If everything went well:
 
diff --git a/configuration/rescue-cd.nix b/configuration/rescue-cd.nix
index dc7fb066caa..333d6154b11 100644
--- a/configuration/rescue-cd.nix
+++ b/configuration/rescue-cd.nix
@@ -1,7 +1,7 @@
 rec {
 
   
-  nixpkgsRel = "nixpkgs-0.11pre7577";
+  nixpkgsRel = "nixpkgs-0.11pre7593";
 
 
   configuration = {
@@ -94,7 +94,7 @@ rec {
   # Get a recent copy of Nixpkgs.
   nixpkgsTarball = pkgs.fetchurl {
     url = configuration.installer.nixpkgsURL + "/" + nixpkgsRel + ".tar.bz2";
-    md5 = "0949415aa342679f206fdb7ee9b04b46";
+    md5 = "fd443fb8b1c4d352d9a8b7d19dfb7c49";
   };
 
 
diff --git a/installer/nixos-installer.sh b/installer/nixos-installer.sh
index 07b708eb179..c70e1d0cabe 100644
--- a/installer/nixos-installer.sh
+++ b/installer/nixos-installer.sh
@@ -1,7 +1,7 @@
 #! @shell@
 
 # Syntax: installer.sh <DEVICE> <NIX-EXPR>
-# (e.g., installer.sh /dev/hda1 ./my-machine.nix)
+# (e.g., installer.sh /mnt/root ./my-machine.nix)
 
 # - mount target device
 # - make Nix store etc.
@@ -15,12 +15,12 @@
 
 set -e
 
-targetDevice="$1"
+mountPoint="$1"
 nixosDir="$2"
 configuration="$3"
 
-if test -z "$targetDevice" -o -z "$nixosDir" -o -z "$configuration"; then
-    echo "Syntax: installer.sh <targetDevice> <nixosDir> <configuration>"
+if test ! -e "$mountPoint" -o ! -e "$nixosDir" -o ! -e "$configuration"; then
+    echo "Syntax: installer.sh <targetRootDir> <nixosDir> <configuration>"
     exit 1
 fi
 
@@ -28,19 +28,7 @@ nixosDir=$(readlink -f "$nixosDir")
 configuration=$(readlink -f "$configuration")
 
 
-# Make sure that the target device isn't mounted.
-umount "$targetDevice" 2> /dev/null || true
-
-
-# Check it.
-fsck -n "$targetDevice"
-
-
-# Mount the target device.
-mountPoint=/tmp/inst-mnt
-mkdir -p $mountPoint
-mount "$targetDevice" $mountPoint
-
+# Mount some stuff in the target root directory.
 mkdir -m 0755 -p $mountPoint/dev $mountPoint/proc $mountPoint/sys $mountPoint/mnt
 mount --rbind / $mountPoint/mnt
 mount --bind /dev $mountPoint/dev
@@ -48,6 +36,7 @@ mount --bind /proc $mountPoint/proc
 mount --bind /sys $mountPoint/sys
 
 cleanup() {
+    # !!! don't umount any we didn't mount ourselves
     for i in $(grep -F "$mountPoint" /proc/mounts \
         | perl -e 'while (<>) { /^\S+\s+(\S+)\s+/; print "$1\n"; }' \
         | sort -r);
@@ -81,7 +70,7 @@ mkdir -m 1777 -p \
 storePaths=$(@shell@ @pathsFromGraph@ @nixClosure@)
 
 # Copy Nix to the Nix store on the target device.
-echo "copying Nix to $targetDevice...."
+echo "copying Nix to $mountPoint...."
 for i in $storePaths; do
     echo "  $i"
     rsync -a $i $mountPoint/nix/store/
@@ -133,13 +122,15 @@ chroot $mountPoint @nix@/bin/nix-env \
 targetConfig=$mountPoint/etc/nixos/configuration.nix
 mkdir -p $(dirname $targetConfig)
 if test -e $targetConfig -o -L $targetConfig; then
-    mv $targetConfig $targetConfig.backup-$(date "+%Y%m%d%H%M%S")
+    cp -f $targetConfig $targetConfig.backup-$(date "+%Y%m%d%H%M%S")
 fi
-cp $configuration $targetConfig
+if 
+cp -f $configuration $targetConfig
 
 
 # Grub needs a mtab.
-echo "$targetDevice / somefs rw 0 0" > $mountPoint/etc/mtab
+rootDevice=$(df $mountPoint | grep '^/' | sed 's^ .*^^')
+echo "$rootDevice / somefs rw 0 0" > $mountPoint/etc/mtab
 
 
 # Mark the target as a NixOS installation, otherwise
-- 
GitLab


From 95ee289c9fe8f55ae722d003ab2d65ee4709a33f Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 10 Jan 2007 12:29:10 +0000
Subject: [PATCH 0377/5331] * Some hacking info.

svn path=/nixos/trunk/; revision=7607
---
 README | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/README b/README
index 8a5ad4105c0..1a0e9df24c4 100644
--- a/README
+++ b/README
@@ -116,3 +116,15 @@ To switch to maintenance mode:
 To get out of maintenance mode:
 
   $ initctl emit startup 
+
+
+
+*** Development ***
+
+- Building specific parts of NixOS:
+
+  $ nix-build system/system.nix \
+      --arg configuration "import /etc/nixos/configuration.nix" \
+      -A ATTR
+
+  where ATTR is an attribute in system/system.nix (e.g., bootStage1).
-- 
GitLab


From cb1036483866af08142ff6d6e01e1700dfead4f9 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 10 Jan 2007 12:42:28 +0000
Subject: [PATCH 0378/5331] * Use a diet udev in boot stage 1 to create the
 device nodes in /dev.

svn path=/nixos/trunk/; revision=7608
---
 boot/boot-stage-1-init.sh | 13 +++++++----
 boot/boot-stage-1.nix     |  1 -
 boot/make-devices.sh      | 46 ---------------------------------------
 system/system.nix         |  3 +++
 4 files changed, 12 insertions(+), 51 deletions(-)
 delete mode 100644 boot/make-devices.sh

diff --git a/boot/boot-stage-1-init.sh b/boot/boot-stage-1-init.sh
index 3e024d17ccf..9703ac7a8bc 100644
--- a/boot/boot-stage-1-init.sh
+++ b/boot/boot-stage-1-init.sh
@@ -51,10 +51,6 @@ for o in $(cat /proc/cmdline); do
 done
 
 
-# Create device nodes in /dev.
-source @makeDevices@
-
-
 # Load some kernel modules.
 export MODULE_DIR=@modulesDir@/lib/modules/
 for i in @modules@; do
@@ -62,6 +58,15 @@ for i in @modules@; do
 done
 
 
+# Create device nodes in /dev.
+mknod -m 0666 /dev/null c 1 3
+export UDEV_CONFIG_FILE=/udev.conf
+echo 'udev_rules="/no-rules"' > $UDEV_CONFIG_FILE
+udevd --daemon
+udevtrigger
+udevsettle
+
+
 # Try to find and mount the root device.
 mkdir /mnt
 mkdir /mnt/root
diff --git a/boot/boot-stage-1.nix b/boot/boot-stage-1.nix
index e33178f6881..8a21d87bf61 100644
--- a/boot/boot-stage-1.nix
+++ b/boot/boot-stage-1.nix
@@ -33,7 +33,6 @@ substituteAll {
     module_init_tools
     extraUtils
   ];
-  makeDevices = ./make-devices.sh;
 
   # We only want the path of the stage 2 init, we don't want it as a
   # dependency (since then it the stage 2 init would end up in the
diff --git a/boot/make-devices.sh b/boot/make-devices.sh
deleted file mode 100644
index 9e313a01164..00000000000
--- a/boot/make-devices.sh
+++ /dev/null
@@ -1,46 +0,0 @@
-mknod -m 0600 /dev/ttyS0 c 4 64
-mknod -m 0600 /dev/ttyS1 c 4 65
-mknod -m 0600 /dev/ttyS2 c 4 66
-mknod -m 0600 /dev/ttyS3 c 4 67
-
-# base UNIX devices
-mknod -m 0600 /dev/mem c 1 1
-mknod -m 0666 /dev/null c 1 3
-mknod -m 0666 /dev/zero c 1 5
-
-# tty
-mknod -m 0600 /dev/tty c 5 0
-if ! test -e /dev/console; then
-    mknod -m 0600 /dev/console c 5 1
-fi
-
-mknod -m 0660 /dev/hda b 3 0
-mknod -m 0660 /dev/hda1 b 3 1
-mknod -m 0660 /dev/hda2 b 3 2
-mknod -m 0660 /dev/hda3 b 3 3
-
-mknod -m 0660 /dev/hdb b 3 64
-mknod -m 0660 /dev/hdb1 b 3 65
-mknod -m 0660 /dev/hdb2 b 3 66
-mknod -m 0660 /dev/hdb3 b 3 67
-
-mknod -m 0660 /dev/hdc b 22 0
-mknod -m 0660 /dev/hdc1 b 22 1
-mknod -m 0660 /dev/hdc2 b 22 2
-mknod -m 0660 /dev/hdc3 b 22 3
-
-mknod -m 0660 /dev/hdd b 22 64
-mknod -m 0660 /dev/hdd1 b 22 65
-mknod -m 0660 /dev/hdd2 b 22 66
-mknod -m 0660 /dev/hdd3 b 22 67
-
-mknod -m 0660 /dev/sda b 8 0
-mknod -m 0660 /dev/sda1 b 8 1
-mknod -m 0660 /dev/sda2 b 8 2
-mknod -m 0660 /dev/sda3 b 8 3
-mknod -m 0660 /dev/sda4 b 8 4
-mknod -m 0660 /dev/sda5 b 8 5
-mknod -m 0660 /dev/sda6 b 8 6
-mknod -m 0660 /dev/sda7 b 8 7
-
-mknod -m 0660 /dev/sr0 b 11 0
diff --git a/system/system.nix b/system/system.nix
index acd8225d732..12d345bd2d5 100644
--- a/system/system.nix
+++ b/system/system.nix
@@ -48,14 +48,17 @@ rec {
   extraUtils = pkgs.runCommand "extra-utils"
     { buildInputs = [pkgs.nukeReferences];
       inherit (pkgsStatic) utillinux;
+      inherit (pkgsDiet) udev;
       inherit (pkgs) splashutils;
       e2fsprogs = pkgs.e2fsprogsDiet;
+      allowedReferences = []; # prevent accidents like glibc being included in the initrd
     }
     "
       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
+      cp $udev/sbin/udevd $udev/sbin/udevtrigger $udev/sbin/udevsettle $out/bin
       nuke-refs $out/bin/*
     ";
   
-- 
GitLab


From 24e34612e3e3d7f074be45c37147a2f68cb2a542 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 10 Jan 2007 13:07:57 +0000
Subject: [PATCH 0379/5331] * Allow swap devices to be specified by label.

svn path=/nixos/trunk/; revision=7609
---
 configuration/examples/basic.nix |  4 +++-
 system/options.nix               | 13 +++++++++--
 system/upstart.nix               |  2 +-
 upstart-jobs/swap.nix            | 38 ++++++++++++++++++++++----------
 4 files changed, 41 insertions(+), 16 deletions(-)

diff --git a/configuration/examples/basic.nix b/configuration/examples/basic.nix
index 0676f6e39fc..718cfb7f83c 100644
--- a/configuration/examples/basic.nix
+++ b/configuration/examples/basic.nix
@@ -9,7 +9,9 @@
     }
   ];
 
-  swapDevices = ["/dev/sdb1"];
+  swapDevices = [
+    { device = "/dev/sdb1"; }
+  ];
   
   services = {
     sshd = {
diff --git a/system/options.nix b/system/options.nix
index 21c2c7b2493..5828beb097d 100644
--- a/system/options.nix
+++ b/system/options.nix
@@ -212,10 +212,19 @@
   {
     name = ["swapDevices"];
     default = [];
-    example = ["/dev/hda7" "/dev/hdb3" "/var/swapfile"];
+    example = [
+      {device="/dev/hda7";}
+      {device="/var/swapfile";}
+      {label="bigswap";}
+    ];
     description = "
       The swap devices and swap files.  These must have been
-      initialised using <command>mkswap</command>.
+      initialised using <command>mkswap</command>.  Each element
+      should be an attribute set specifying either the path of the
+      swap device or file (<literal>device</literal>) or the label
+      of the swap device (<literal>label</literal>, see
+      <command>mkswap -L</command</command>).  Using a label is
+      recommended.
     ";
   }
 
diff --git a/system/upstart.nix b/system/upstart.nix
index f2227a729cd..d46c51f9dc2 100644
--- a/system/upstart.nix
+++ b/system/upstart.nix
@@ -46,7 +46,7 @@ import ../upstart-jobs/gather.nix {
 
     # Swapping.
     (import ../upstart-jobs/swap.nix {
-      inherit (pkgs) utillinux;
+      inherit (pkgs) utillinux library;
       swapDevices = config.get ["swapDevices"];
     })
 
diff --git a/upstart-jobs/swap.nix b/upstart-jobs/swap.nix
index 54756072bc2..e5938cb16da 100644
--- a/upstart-jobs/swap.nix
+++ b/upstart-jobs/swap.nix
@@ -1,4 +1,14 @@
-{utillinux, swapDevices}:
+{library, utillinux, swapDevices}:
+
+let
+
+  devicesByPath =
+    map (x: x.device) (library.filter (x: x ? device) swapDevices);
+    
+  devicesByLabel =
+    map (x: x.label) (library.filter (x: x ? label) swapDevices);
+
+in
 
 {
   name = "swap";
@@ -8,21 +18,25 @@ start on startup
 start on new-devices
 
 script
-    for device in ${toString swapDevices}; do
-        # !!! Check whether we are already swapping to $device.
+    for device in ${toString devicesByPath}; do
         ${utillinux}/sbin/swapon \"$device\" || true
     done
 
-    # Remove swap devices not listed in swapDevices.
-    for used in $(cat /proc/swaps | grep '^/' | sed 's/ .*//'); do
-        found=
-        for device in ${toString swapDevices}; do
-            if test \"$used\" = \"$device\"; then found=1; fi
-        done
-        if test -z \"$found\"; then
-            ${utillinux}/sbin/swapoff \"$used\" || true
-        fi
+    for label in ${toString devicesByLabel}; do
+        ${utillinux}/sbin/swapon -L \"$label\" || true
     done
+
+    # Remove swap devices not listed in swapDevices.
+    # !!! disabled because it doesn't work with labels
+    #for used in $(cat /proc/swaps | grep '^/' | sed 's/ .*//'); do
+    #    found=
+    #    for device in $ {toString swapDevices}; do
+    #        if test \"$used\" = \"$device\"; then found=1; fi
+    #    done
+    #    if test -z \"$found\"; then
+    #        ${utillinux}/sbin/swapoff \"$used\" || true
+    #    fi
+    #done
     
 end script
   ";
-- 
GitLab


From 7ba1682c051fe101bfbdfdef69fc15470c3013c0 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 10 Jan 2007 13:58:48 +0000
Subject: [PATCH 0380/5331] * In fileSystems: say `label = "FOO"' instead of
 `device = "LABEL=foo"'.

svn path=/nixos/trunk/; revision=7611
---
 system/options.nix           | 8 ++++++++
 upstart-jobs/filesystems.nix | 2 +-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/system/options.nix b/system/options.nix
index 5828beb097d..03ef575f437 100644
--- a/system/options.nix
+++ b/system/options.nix
@@ -193,6 +193,9 @@
         fsType = "ext3";
         options = "data=journal";
       }
+      { mountPoint = "/bigdisk";
+        label = "bigdisk";
+      }
     ];
     description = "
       The file systems to be mounted.  It must include an entry for
@@ -205,6 +208,11 @@
       <literal>\"auto\"</literal>), and <literal>options</literal>
       (the mount options passed to <command>mount</command> using the
       <option>-o</option> flag; defaults to <literal>\"defaults\"</literal>).
+
+      Instead of specifying <literal>device</literal>, you can also
+      specify a volume label (<literal>volume</literal>) for file
+      systems that support it, such as ext2/ext3 (see <command>mke2fs
+      -L</command>).
     ";
   }
 
diff --git a/upstart-jobs/filesystems.nix b/upstart-jobs/filesystems.nix
index 23849db7886..793bb47ba25 100644
--- a/upstart-jobs/filesystems.nix
+++ b/upstart-jobs/filesystems.nix
@@ -4,7 +4,7 @@ let
 
   # !!! use XML
   mountPoints = map (fs: fs.mountPoint) fileSystems;
-  devices = map (fs: fs.device) fileSystems;
+  devices = map (fs: if fs ? device then fs.device else "LABEL=" + fs.label) fileSystems;
   fsTypes = map (fs: if fs ? fsType then fs.fsType else "auto") fileSystems;
   optionss = map (fs: if fs ? options then fs.options else "defaults") fileSystems;
 
-- 
GitLab


From 774a0a397c82c6258de1dcacafa502175f44a6e1 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 10 Jan 2007 14:07:10 +0000
Subject: [PATCH 0381/5331] * Allow the root device to be specified by label.

svn path=/nixos/trunk/; revision=7612
---
 system/system.nix | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/system/system.nix b/system/system.nix
index 12d345bd2d5..d1f0164d314 100644
--- a/system/system.nix
+++ b/system/system.nix
@@ -71,9 +71,11 @@ rec {
     inherit extraUtils;
     autoDetectRootDevice = config.get ["boot" "autoDetectRootDevice"];
     rootDevice =
-      (pkgs.library.findSingle (fs: fs.mountPoint == "/")
-        (abort "No root mount point declared.")
-        (config.get ["fileSystems"])).device;
+      let rootFS = 
+        (pkgs.library.findSingle (fs: fs.mountPoint == "/")
+          (abort "No root mount point declared.")
+          (config.get ["fileSystems"]));
+      in if rootFS ? device then rootFS.device else "LABEL=" + rootFS.label;
     rootLabel = config.get ["boot" "rootLabel"];
     inherit stage2Init;
     modulesDir = modulesClosure;
-- 
GitLab


From a7644b88557645c6fd6f14ef94c3755498688868 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 10 Jan 2007 14:34:31 +0000
Subject: [PATCH 0382/5331] * Support NFS mounts.

svn path=/nixos/trunk/; revision=7615
---
 upstart-jobs/filesystems.nix | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/upstart-jobs/filesystems.nix b/upstart-jobs/filesystems.nix
index 793bb47ba25..440d0c36d07 100644
--- a/upstart-jobs/filesystems.nix
+++ b/upstart-jobs/filesystems.nix
@@ -44,7 +44,10 @@ script
             isLabel=
             if echo \"$device\" | grep -q '^LABEL='; then isLabel=1; fi
 
-            if ! test -n \"$isLabel\" -o -e \"$device\"; then
+            isPseudo=
+            if test \"$fsType\" = \"nfs\"; then isPseudo=1; fi
+
+            if ! test -n \"$isLabel\" -o -n \"$isPseudo\" -o -e \"$device\"; then
                 echo \"skipping $device, doesn't exist (yet)\"
                 continue
             fi
@@ -54,7 +57,7 @@ script
             # contains more accurate info when using loop devices.
 
             # !!! not very smart about labels yet; should resolve the label somehow.
-            if test -z \"$isLabel\"; then
+            if test -z \"$isLabel\" -a -z \"$isPseudo\"; then
 
                 device=$(readlink -f \"$device\")
 
@@ -82,7 +85,9 @@ script
             echo \"mounting $device on $mountPoint\"
 
             # !!! should do something with the result; also prevent repeated fscks.
-            fsck -a \"$device\" || true
+            if test -z \"$isPseudo\"; then
+                fsck -a \"$device\" || true
+            fi
 
             if ${utillinux}/bin/mount -t \"$fsType\" -o \"$options\" \"$device\" \"$mountPoint\"; then
                 newDevices=1
-- 
GitLab


From 99b24cf4d1e265935b60bb462abd7eccfd96ac7d Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 10 Jan 2007 17:07:21 +0000
Subject: [PATCH 0383/5331] * Mount file systems when an ip-up event occurs
 (e.g., for NFS mounts).

svn path=/nixos/trunk/; revision=7619
---
 upstart-jobs/filesystems.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/upstart-jobs/filesystems.nix b/upstart-jobs/filesystems.nix
index 440d0c36d07..b1b863c3701 100644
--- a/upstart-jobs/filesystems.nix
+++ b/upstart-jobs/filesystems.nix
@@ -16,6 +16,7 @@ in
   job = "
 start on startup
 start on new-devices
+start on ip-up
 
 script
     PATH=${e2fsprogs}/sbin:$PATH
-- 
GitLab


From 5b993b4ff5f956422c64a29d5595f197e31297aa Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 10 Jan 2007 17:08:34 +0000
Subject: [PATCH 0384/5331] * Quick hack to prevent the system from hanging in
 halt/reboot: force   NFS unmounts.  We have to do this because networking is
 already down   by the time we get to the unmounting.  It would be better to
 unmount   all remote file systems when an ip-down event occurs.

svn path=/nixos/trunk/; revision=7620
---
 upstart-jobs/halt.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/upstart-jobs/halt.nix b/upstart-jobs/halt.nix
index 719b01258ff..6c313ddf517 100644
--- a/upstart-jobs/halt.nix
+++ b/upstart-jobs/halt.nix
@@ -47,7 +47,7 @@ script
         for mp in $(getMountPoints); do
             device=$(getDevice $mp)
             echo \"unmounting $mp...\"
-            if umount -n \"$mp\"; then
+            if umount -f -n \"$mp\"; then
                 if test \"$mp\" != /; then tryAgain=1; fi
             else
                 mount -n -o remount,ro \"$mp\"
-- 
GitLab


From 866d87c60bf8f3348f433177ef445e6014dc1343 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 10 Jan 2007 17:09:00 +0000
Subject: [PATCH 0385/5331] * Start the cron daemon.

svn path=/nixos/trunk/; revision=7621
---
 system/system.nix     |  1 +
 system/upstart.nix    |  5 +++++
 upstart-jobs/cron.nix | 15 +++++++++++++++
 3 files changed, 21 insertions(+)
 create mode 100644 upstart-jobs/cron.nix

diff --git a/system/system.nix b/system/system.nix
index d1f0164d314..f03e32e1965 100644
--- a/system/system.nix
+++ b/system/system.nix
@@ -141,6 +141,7 @@ rec {
     pkgs.bzip2
     pkgs.coreutils
     pkgs.cpio
+    pkgs.cron
     pkgs.curl
     pkgs.e2fsprogs
     pkgs.findutils
diff --git a/system/upstart.nix b/system/upstart.nix
index d46c51f9dc2..7281e8d3e68 100644
--- a/system/upstart.nix
+++ b/system/upstart.nix
@@ -66,6 +66,11 @@ import ../upstart-jobs/gather.nix {
       inherit nix;
     })
 
+    # Cron daemon.
+    (import ../upstart-jobs/cron.nix {
+      inherit (pkgs) cron;
+    })
+
     # Handles the maintenance/stalled event (single-user shell).
     (import ../upstart-jobs/maintenance-shell.nix {
       inherit (pkgs) bash;
diff --git a/upstart-jobs/cron.nix b/upstart-jobs/cron.nix
new file mode 100644
index 00000000000..289fee630eb
--- /dev/null
+++ b/upstart-jobs/cron.nix
@@ -0,0 +1,15 @@
+{cron}:
+
+{
+  name = "cron";
+  
+  job = "
+description \"Cron daemon\"
+
+start on startup
+stop on shutdown
+
+respawn ${cron}/sbin/cron -n
+  ";
+  
+}
-- 
GitLab


From 158c303e2f6b0a2989ba1cd459368de9679866be Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 10 Jan 2007 17:19:17 +0000
Subject: [PATCH 0386/5331] * Enable SFTP support in sshd.

svn path=/nixos/trunk/; revision=7622
---
 system/options.nix    | 10 ++++++++++
 system/upstart.nix    |  1 +
 upstart-jobs/sshd.nix | 11 ++++++++++-
 3 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/system/options.nix b/system/options.nix
index 03ef575f437..b182e673b97 100644
--- a/system/options.nix
+++ b/system/options.nix
@@ -354,6 +354,16 @@
   }
 
   
+  {
+    name = ["services" "sshd" "allowSFTP"];
+    default = true;
+    description = "
+      Whether to enable the SFTP subsystem in the SSH daemon.  This
+      enables the use of commands such as sftp(1) and sshfs.
+    ";
+  }
+
+  
   {
     name = ["services" "ntp" "enable"];
     default = true;
diff --git a/system/upstart.nix b/system/upstart.nix
index 7281e8d3e68..c490bc7b2fa 100644
--- a/system/upstart.nix
+++ b/system/upstart.nix
@@ -87,6 +87,7 @@ import ../upstart-jobs/gather.nix {
       inherit (pkgs) writeText openssh glibc pwdutils;
       inherit (pkgs.xorg) xauth;
       forwardX11 = config.get ["services" "sshd" "forwardX11"];
+      allowSFTP = config.get ["services" "sshd" "allowSFTP"];
     })
 
   # NTP daemon.
diff --git a/upstart-jobs/sshd.nix b/upstart-jobs/sshd.nix
index 4988158caa1..69be033316d 100644
--- a/upstart-jobs/sshd.nix
+++ b/upstart-jobs/sshd.nix
@@ -1,15 +1,24 @@
-{writeText, openssh, glibc, pwdutils, xauth, forwardX11}:
+{ writeText, openssh, glibc, pwdutils, xauth
+, forwardX11, allowSFTP
+}:
 
 let
 
   sshdConfig = writeText "sshd_config" "
     UsePAM yes
+    
     ${if forwardX11 then "
       X11Forwarding yes
       XAuthLocation ${xauth}/bin/xauth
     " else "
       X11Forwarding no
     "}
+
+    ${if allowSFTP then "
+      Subsystem sftp ${openssh}/libexec/sftp-server
+    " else "
+    "}
+    
   ";
 
 in
-- 
GitLab


From c7c16f384a14d853d989523bde362510a85c9891 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 11 Jan 2007 00:06:46 +0000
Subject: [PATCH 0387/5331] * Fixed some installer bugs.

svn path=/nixos/trunk/; revision=7629
---
 configuration/rescue-cd.nix  |  4 ++--
 installer/nixos-installer.sh | 23 ++++++++++++++++++++---
 system/system.nix            |  1 +
 3 files changed, 23 insertions(+), 5 deletions(-)

diff --git a/configuration/rescue-cd.nix b/configuration/rescue-cd.nix
index 333d6154b11..b9b0ffaa028 100644
--- a/configuration/rescue-cd.nix
+++ b/configuration/rescue-cd.nix
@@ -1,7 +1,7 @@
 rec {
 
   
-  nixpkgsRel = "nixpkgs-0.11pre7593";
+  nixpkgsRel = "nixpkgs-0.11pre7628";
 
 
   configuration = {
@@ -94,7 +94,7 @@ rec {
   # Get a recent copy of Nixpkgs.
   nixpkgsTarball = pkgs.fetchurl {
     url = configuration.installer.nixpkgsURL + "/" + nixpkgsRel + ".tar.bz2";
-    md5 = "fd443fb8b1c4d352d9a8b7d19dfb7c49";
+    md5 = "e7fe1793e69ff5072eb5987e7b7ccd47";
   };
 
 
diff --git a/installer/nixos-installer.sh b/installer/nixos-installer.sh
index c70e1d0cabe..5e260128813 100644
--- a/installer/nixos-installer.sh
+++ b/installer/nixos-installer.sh
@@ -19,11 +19,27 @@ mountPoint="$1"
 nixosDir="$2"
 configuration="$3"
 
-if test ! -e "$mountPoint" -o ! -e "$nixosDir" -o ! -e "$configuration"; then
+if test -z "$mountPoint" -o -z "$nixosDir" -o -z "$configuration"; then
     echo "Syntax: installer.sh <targetRootDir> <nixosDir> <configuration>"
     exit 1
 fi
 
+if ! test -e "$mountPoint"; then
+    echo "mount point $mountPoint doesn't exist"
+    exit 1
+fi
+    
+if ! test -e "$nixosDir"; then
+    echo "NixOS source directory $nixosDir doesn't exist"
+    exit 1
+fi
+    
+if ! test -e "$configuration"; then
+    echo "configuration file $configuration doesn't exist"
+    exit 1
+fi
+    
+
 nixosDir=$(readlink -f "$nixosDir")
 configuration=$(readlink -f "$configuration")
 
@@ -124,8 +140,9 @@ mkdir -p $(dirname $targetConfig)
 if test -e $targetConfig -o -L $targetConfig; then
     cp -f $targetConfig $targetConfig.backup-$(date "+%Y%m%d%H%M%S")
 fi
-if 
-cp -f $configuration $targetConfig
+if test "$configuration" != "$targetConfig"; then
+    cp -f $configuration $targetConfig
+fi
 
 
 # Grub needs a mtab.
diff --git a/system/system.nix b/system/system.nix
index f03e32e1965..fdca1eee0fa 100644
--- a/system/system.nix
+++ b/system/system.nix
@@ -155,6 +155,7 @@ rec {
     pkgs.less
     pkgs.lvm2
     pkgs.man
+    pkgs.mdadm
     pkgs.module_init_tools
     pkgs.nano
     pkgs.netcat
-- 
GitLab


From 66d4c6c4e2a6f769c075a8245beecbbd652396b6 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 11 Jan 2007 00:40:08 +0000
Subject: [PATCH 0388/5331] * Ignore remount read-only errors.

svn path=/nixos/trunk/; revision=7630
---
 upstart-jobs/halt.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/upstart-jobs/halt.nix b/upstart-jobs/halt.nix
index 6c313ddf517..ce23e967e8b 100644
--- a/upstart-jobs/halt.nix
+++ b/upstart-jobs/halt.nix
@@ -50,7 +50,7 @@ script
             if umount -f -n \"$mp\"; then
                 if test \"$mp\" != /; then tryAgain=1; fi
             else
-                mount -n -o remount,ro \"$mp\"
+                mount -n -o remount,ro \"$mp\" || true
             fi
 
             # Hack: work around a bug in mount (mount -o remount on a
-- 
GitLab


From daa8ecfe7a2091accb93f962020e47ddf92b7b45 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 11 Jan 2007 00:40:28 +0000
Subject: [PATCH 0389/5331] * Activate software RAID arrays.

svn path=/nixos/trunk/; revision=7631
---
 system/upstart.nix      |  5 +++++
 upstart-jobs/swraid.nix | 36 ++++++++++++++++++++++++++++++++++++
 2 files changed, 41 insertions(+)
 create mode 100644 upstart-jobs/swraid.nix

diff --git a/system/upstart.nix b/system/upstart.nix
index c490bc7b2fa..dc89e62c098 100644
--- a/system/upstart.nix
+++ b/system/upstart.nix
@@ -31,6 +31,11 @@ import ../upstart-jobs/gather.nix {
       inherit (pkgs) kernel module_init_tools lvm2;
     })
       
+    # Activate software RAID arrays.
+    (import ../upstart-jobs/swraid.nix {
+      inherit (pkgs) kernel module_init_tools mdadm;
+    })
+      
     # Hardware scan; loads modules for PCI devices.
     (import ../upstart-jobs/hardware-scan.nix {
       inherit (pkgs) kernel module_init_tools;
diff --git a/upstart-jobs/swraid.nix b/upstart-jobs/swraid.nix
new file mode 100644
index 00000000000..f62bccbf967
--- /dev/null
+++ b/upstart-jobs/swraid.nix
@@ -0,0 +1,36 @@
+{kernel, module_init_tools, mdadm}:
+
+let
+
+  tempConf = "/var/state/mdadm.conf";
+
+in
+  
+{
+  name = "swraid";
+  
+  job = "
+start on udev
+#start on new-devices
+
+script
+
+    # Load the necessary RAID personalities.
+    export MODULE_DIR=${kernel}/lib/modules/
+    for mod in raid0 raid1 raid5; do
+        ${module_init_tools}/sbin/modprobe $mod || true
+    done
+
+    # Scan /proc/partitions for RAID devices.
+    ${mdadm}/sbin/mdadm --examine --brief --scan -c partitions > ${tempConf}
+
+    # Activate each device found.
+    ${mdadm}/sbin/mdadm --assemble -c ${tempConf} --scan
+
+    initctl emit new-devices
+    
+end script
+
+  ";
+
+}
-- 
GitLab


From 6b364875f96be6a888b5596aeddec8309dd896e3 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 11 Jan 2007 15:32:48 +0000
Subject: [PATCH 0390/5331] * Enable setuid su.

svn path=/nixos/trunk/; revision=7634
---
 system/etc.nix      | 1 +
 system/etc/pam.d/su | 5 +++++
 system/system.nix   | 1 +
 3 files changed, 7 insertions(+)
 create mode 100644 system/etc/pam.d/su

diff --git a/system/etc.nix b/system/etc.nix
index cddae796a9b..12f5b4371c9 100644
--- a/system/etc.nix
+++ b/system/etc.nix
@@ -73,6 +73,7 @@ import ../helpers/make-etc.nix {
     )
     [
       "login"
+      "su"
       "other"
       "passwd"
       "shadow"
diff --git a/system/etc/pam.d/su b/system/etc/pam.d/su
new file mode 100644
index 00000000000..3807b8a3d27
--- /dev/null
+++ b/system/etc/pam.d/su
@@ -0,0 +1,5 @@
+auth     sufficient     pam_rootok.so
+auth     required       @pam_unix2@/lib/security/pam_unix2.so nullok
+account  required       @pam_unix2@/lib/security/pam_unix2.so
+password required       @pam_unix2@/lib/security/pam_unix2.so nullok
+session  required       @pam_unix2@/lib/security/pam_unix2.so
diff --git a/system/system.nix b/system/system.nix
index fdca1eee0fa..2cfc6f2ee7c 100644
--- a/system/system.nix
+++ b/system/system.nix
@@ -166,6 +166,7 @@ rec {
     pkgs.pwdutils
     pkgs.rsync
     pkgs.strace
+    pkgs.su
     pkgs.sysklogd
     pkgs.udev
     pkgs.upstart
-- 
GitLab


From 580f98f1ed15f16bfa5f88cbe0331709c4075d45 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 11 Jan 2007 16:29:23 +0000
Subject: [PATCH 0391/5331] * Make the set of setuid programs configurable. *
 Make crontab setuid.

svn path=/nixos/trunk/; revision=7636
---
 system/activate-configuration.sh |  2 +-
 system/options.nix               | 10 ++++++++++
 system/system.nix                |  1 +
 3 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/system/activate-configuration.sh b/system/activate-configuration.sh
index d00bba5d442..647ba768d44 100644
--- a/system/activate-configuration.sh
+++ b/system/activate-configuration.sh
@@ -121,7 +121,7 @@ ln -sf /nix/var/nix/profiles /nix/var/nix/gcroots/
 wrapperDir=@wrapperDir@
 if test -d $wrapperDir; then rm -f $wrapperDir/*; fi
 mkdir -p $wrapperDir
-for i in passwd su; do
+for i in @setuidPrograms@; do
     program=$(type -tp $i)
     cp $(type -tp setuid-wrapper) $wrapperDir/$i
     echo -n $program > $wrapperDir/$i.real
diff --git a/system/options.nix b/system/options.nix
index b182e673b97..6216025c45b 100644
--- a/system/options.nix
+++ b/system/options.nix
@@ -523,4 +523,14 @@
   }
 
   
+  {
+    name = ["security" "setuidPrograms"];
+    default = ["passwd" "su" "crontab"];
+    description = "
+      Only the programs listed here will be made setuid root (through
+      a wrapper program).
+    ";
+  }
+
+  
 ]
diff --git a/system/system.nix b/system/system.nix
index 2cfc6f2ee7c..1cd6e8e5b69 100644
--- a/system/system.nix
+++ b/system/system.nix
@@ -189,6 +189,7 @@ rec {
     inherit (pkgs) kernel;
     readOnlyRoot = config.get ["boot" "readOnlyRoot"];
     hostName = config.get ["networking" "hostName"];
+    setuidPrograms = config.get ["security" "setuidPrograms"];
     wrapperDir = setuidWrapper.wrapperDir;
 
     path = [
-- 
GitLab


From e1b9efddcbed203e6688f6d246b6d7918648c491 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 11 Jan 2007 16:42:18 +0000
Subject: [PATCH 0392/5331] * Slurp in ~/.bashrc from /etc/profile (just like
 SUSE). * Set a nice prompt.

svn path=/nixos/trunk/; revision=7637
---
 system/activate-configuration.sh | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/system/activate-configuration.sh b/system/activate-configuration.sh
index 647ba768d44..57fbb950201 100644
--- a/system/activate-configuration.sh
+++ b/system/activate-configuration.sh
@@ -95,6 +95,13 @@ export PATH=$PATH
 export MODULE_DIR=@kernel@/lib/modules
 export NIX_CONF_DIR=/nix/etc/nix
 export PAGER=less
+
+PROMPT_COLOR="1;31m"
+PS1="\n\[\033[\$PROMPT_COLOR\][\u@\h:\w]\$\[\033[0m\] "
+if test "x\$TERM" == "xxterm"; then
+    PS1="\033]2;\h:\u:\w\007\033]1;\$PS1"
+fi
+
 if test "\$USER" != root; then
     export NIX_REMOTE=daemon
 fi
@@ -106,6 +113,8 @@ alias ll="ls -l"
 if test -f /etc/profile.local; then
     source /etc/profile.local
 fi
+
+test -r \$HOME/.bashrc && source \$HOME/.bashrc
 EOF
 
 
-- 
GitLab


From ebf72223a432c317d88ce198cd495f19937c3f59 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 11 Jan 2007 16:50:42 +0000
Subject: [PATCH 0393/5331] * Ugh.

svn path=/nixos/trunk/; revision=7638
---
 system/activate-configuration.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/system/activate-configuration.sh b/system/activate-configuration.sh
index 57fbb950201..266f1111fc7 100644
--- a/system/activate-configuration.sh
+++ b/system/activate-configuration.sh
@@ -108,6 +108,7 @@ fi
 
 source $(dirname $(readlink -f $(type -tp nix-env)))/../etc/profile.d/nix.sh
 
+alias ls="ls --color=tty"
 alias ll="ls -l"
 
 if test -f /etc/profile.local; then
-- 
GitLab


From 5acc5f6e28314cc8de4b5b818db28bccfdb90d4e Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 11 Jan 2007 16:53:44 +0000
Subject: [PATCH 0394/5331] * Finally.

svn path=/nixos/trunk/; revision=7639
---
 system/activate-configuration.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/system/activate-configuration.sh b/system/activate-configuration.sh
index 266f1111fc7..b29bedecda1 100644
--- a/system/activate-configuration.sh
+++ b/system/activate-configuration.sh
@@ -110,6 +110,7 @@ source $(dirname $(readlink -f $(type -tp nix-env)))/../etc/profile.d/nix.sh
 
 alias ls="ls --color=tty"
 alias ll="ls -l"
+alias which="type -p"
 
 if test -f /etc/profile.local; then
     source /etc/profile.local
-- 
GitLab


From 9963b263d3ac3ee2a4fa9fcc7efb9f97ad5d4b41 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 11 Jan 2007 23:55:25 +0000
Subject: [PATCH 0395/5331] * NSCD daemon.

svn path=/nixos/trunk/; revision=7645
---
 system/upstart.nix     |  5 +++++
 upstart-jobs/nscd.conf | 27 +++++++++++++++++++++++++++
 upstart-jobs/nscd.nix  | 29 +++++++++++++++++++++++++++++
 3 files changed, 61 insertions(+)
 create mode 100644 upstart-jobs/nscd.conf
 create mode 100644 upstart-jobs/nscd.nix

diff --git a/system/upstart.nix b/system/upstart.nix
index dc89e62c098..86ca22ca7d9 100644
--- a/system/upstart.nix
+++ b/system/upstart.nix
@@ -76,6 +76,11 @@ import ../upstart-jobs/gather.nix {
       inherit (pkgs) cron;
     })
 
+    # Name service cache daemon.
+    (import ../upstart-jobs/nscd.nix {
+      inherit (pkgs) glibc pwdutils;
+    })
+
     # Handles the maintenance/stalled event (single-user shell).
     (import ../upstart-jobs/maintenance-shell.nix {
       inherit (pkgs) bash;
diff --git a/upstart-jobs/nscd.conf b/upstart-jobs/nscd.conf
new file mode 100644
index 00000000000..786f5fdd8ac
--- /dev/null
+++ b/upstart-jobs/nscd.conf
@@ -0,0 +1,27 @@
+server-user             nscd
+paranoia                no
+debug-level             0
+
+enable-cache            passwd          yes
+positive-time-to-live   passwd          600
+negative-time-to-live   passwd          20
+suggested-size          passwd          211
+check-files             passwd          yes
+persistent              passwd          yes
+shared                  passwd          yes
+
+enable-cache            group           yes
+positive-time-to-live   group           3600
+negative-time-to-live   group           60
+suggested-size          group           211
+check-files             group           yes
+persistent              group           yes
+shared                  group           yes
+
+enable-cache            hosts           yes
+positive-time-to-live   hosts           600
+negative-time-to-live   hosts           5
+suggested-size          hosts           211
+check-files             hosts           yes
+persistent              hosts           no
+shared                  hosts           yes
diff --git a/upstart-jobs/nscd.nix b/upstart-jobs/nscd.nix
new file mode 100644
index 00000000000..1e6b39dd9b3
--- /dev/null
+++ b/upstart-jobs/nscd.nix
@@ -0,0 +1,29 @@
+{glibc, pwdutils}:
+
+{
+  name = "nscd";
+  
+  job = "
+description \"Name Service Cache Daemon\"
+
+start on startup
+stop on shutdown
+
+start script
+
+    if ! ${glibc}/bin/getent passwd nscd > /dev/null; then
+        ${pwdutils}/sbin/useradd -g nogroup -d /var/empty -s /noshell \\
+            -c 'Name service cache daemon user' nscd
+    fi
+
+    mkdir -m 0755 -p /var/run/nscd
+    mkdir -m 0755 -p /var/db/nscd
+    
+end script
+
+# !!! -d turns on debug info which probably makes nscd slower
+# 2>/dev/null is to make it shut up
+respawn ${glibc}/sbin/nscd -f ${./nscd.conf} -d 2> /dev/null
+  ";
+  
+}
-- 
GitLab


From d62029bc68de1f41e9b414810022ef4cd5aaee7d Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sun, 14 Jan 2007 16:15:51 +0000
Subject: [PATCH 0396/5331] * Set ACLOCAL_PATH.

svn path=/nixos/trunk/; revision=7661
---
 system/activate-configuration.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/system/activate-configuration.sh b/system/activate-configuration.sh
index b29bedecda1..f1a936fc64b 100644
--- a/system/activate-configuration.sh
+++ b/system/activate-configuration.sh
@@ -95,6 +95,7 @@ export PATH=$PATH
 export MODULE_DIR=@kernel@/lib/modules
 export NIX_CONF_DIR=/nix/etc/nix
 export PAGER=less
+export ACLOCAL_PATH=$HOME/.nix-profile/share/aclocal
 
 PROMPT_COLOR="1;31m"
 PS1="\n\[\033[\$PROMPT_COLOR\][\u@\h:\w]\$\[\033[0m\] "
-- 
GitLab


From ee55c0048bf68bd11a1af215f08006aaa3971323 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 15 Jan 2007 09:20:34 +0000
Subject: [PATCH 0397/5331] * Fix filterSource calls.

svn path=/nixos/trunk/; revision=7669
---
 configuration/rescue-cd.nix | 8 ++++++--
 system/upstart.nix          | 3 ++-
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/configuration/rescue-cd.nix b/configuration/rescue-cd.nix
index b9b0ffaa028..08dd2479149 100644
--- a/configuration/rescue-cd.nix
+++ b/configuration/rescue-cd.nix
@@ -87,8 +87,12 @@ rec {
   
   # Put the current directory in a tarball (making sure to filter
   # out crap like the .svn directories).
-  nixosTarball = makeTarball "nixos.tar.bz2" (builtins.filterSource
-    (name: let base = baseNameOf (toString name); in base != ".svn" && base != "result") ./..);
+  nixosTarball =
+    let filter = name: type:
+      let base = baseNameOf (toString name);
+      in base != ".svn" && base != "result";
+    in
+      makeTarball "nixos.tar.bz2" (builtins.filterSource filter ./..);
 
 
   # Get a recent copy of Nixpkgs.
diff --git a/system/upstart.nix b/system/upstart.nix
index 86ca22ca7d9..6ceb2c92163 100644
--- a/system/upstart.nix
+++ b/system/upstart.nix
@@ -23,7 +23,8 @@ import ../upstart-jobs/gather.nix {
     # The udev daemon creates devices nodes and runs programs when
     # hardware events occur.
     (import ../upstart-jobs/udev.nix {
-      inherit (pkgs) writeText cleanSource udev procps;
+      inherit (pkgs) writeText udev procps;
+      inherit (pkgs.lib) cleanSource;
     })
       
     # Makes LVM logical volumes available. 
-- 
GitLab


From 045d9fdc88cbaeadf0b2a9312860b78be1dc4835 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 15 Jan 2007 14:43:56 +0000
Subject: [PATCH 0398/5331] * Use /etc/profile into a separate file. *
 Automatically set up a per-user profile in  
 /nix/var/nix/profiles/per-user/$USER. * Initialise ~/.nix-defexpr and
 ~/.nix-profile.

svn path=/nixos/trunk/; revision=7680
---
 system/activate-configuration.sh | 39 +++-------------------
 system/etc.nix                   | 11 ++++++-
 system/etc/profile.sh            | 56 ++++++++++++++++++++++++++++++++
 system/system.nix                | 35 +++++++++++---------
 4 files changed, 89 insertions(+), 52 deletions(-)
 create mode 100644 system/etc/profile.sh

diff --git a/system/activate-configuration.sh b/system/activate-configuration.sh
index f1a936fc64b..f09a56e8b5d 100644
--- a/system/activate-configuration.sh
+++ b/system/activate-configuration.sh
@@ -87,55 +87,24 @@ EOF
 fi
 
 
-# Additional path for the interactive shell.
-PATH=@wrapperDir@:@fullPath@/bin:@fullPath@/sbin
-
-cat > /etc/profile <<EOF
-export PATH=$PATH
-export MODULE_DIR=@kernel@/lib/modules
-export NIX_CONF_DIR=/nix/etc/nix
-export PAGER=less
-export ACLOCAL_PATH=$HOME/.nix-profile/share/aclocal
-
-PROMPT_COLOR="1;31m"
-PS1="\n\[\033[\$PROMPT_COLOR\][\u@\h:\w]\$\[\033[0m\] "
-if test "x\$TERM" == "xxterm"; then
-    PS1="\033]2;\h:\u:\w\007\033]1;\$PS1"
-fi
-
-if test "\$USER" != root; then
-    export NIX_REMOTE=daemon
-fi
-
-source $(dirname $(readlink -f $(type -tp nix-env)))/../etc/profile.d/nix.sh
-
-alias ls="ls --color=tty"
-alias ll="ls -l"
-alias which="type -p"
-
-if test -f /etc/profile.local; then
-    source /etc/profile.local
-fi
-
-test -r \$HOME/.bashrc && source \$HOME/.bashrc
-EOF
-
-
 # Nix initialisation.
 mkdir -m 0755 -p /nix/var/nix/db
 mkdir -m 0755 -p /nix/var/nix/gcroots
 mkdir -m 0755 -p /nix/var/nix/temproots
+mkdir -m 0755 -p /nix/var/nix/profiles
+mkdir -m 1777 -p /nix/var/nix/profiles/per-user
 
 ln -sf /nix/var/nix/profiles /nix/var/nix/gcroots/
 
 
 # Make a few setuid programs work.
+PATH=@systemPath@/bin:@systemPath@/sbin:$PATH
 wrapperDir=@wrapperDir@
 if test -d $wrapperDir; then rm -f $wrapperDir/*; fi
 mkdir -p $wrapperDir
 for i in @setuidPrograms@; do
     program=$(type -tp $i)
-    cp $(type -tp setuid-wrapper) $wrapperDir/$i
+    cp "$(type -tp setuid-wrapper)" $wrapperDir/$i
     echo -n $program > $wrapperDir/$i.real
     chown root.root $wrapperDir/$i
     chmod 4755 $wrapperDir/$i
diff --git a/system/etc.nix b/system/etc.nix
index 12f5b4371c9..17ace6e1f99 100644
--- a/system/etc.nix
+++ b/system/etc.nix
@@ -1,4 +1,4 @@
-{pkgs, upstartJobs}:
+{pkgs, upstartJobs, systemPath, wrapperDir}:
 
 import ../helpers/make-etc.nix {
   inherit (pkgs) stdenv;
@@ -59,6 +59,15 @@ import ../helpers/make-etc.nix {
       };
       target = "dhclient-exit-hooks";
     }
+
+    { # Script executed when the shell starts.
+      source = pkgs.substituteAll {
+        src = ./etc/profile.sh;
+        inherit systemPath wrapperDir;
+        inherit (pkgs) kernel;
+      };
+      target = "profile";
+    }
   ]
 
   # A bunch of PAM configuration files for various programs.
diff --git a/system/etc/profile.sh b/system/etc/profile.sh
new file mode 100644
index 00000000000..039fe34a794
--- /dev/null
+++ b/system/etc/profile.sh
@@ -0,0 +1,56 @@
+export PATH=@wrapperDir@:@systemPath@/bin:@systemPath@/sbin
+export MODULE_DIR=@kernel@/lib/modules
+export NIX_CONF_DIR=/nix/etc/nix
+export PAGER=less
+
+PROMPT_COLOR="1;31m"
+PS1="\n\[\033[$PROMPT_COLOR\][\u@\h:\w]$\[\033[0m\] "
+if test "x$TERM" == "xxterm"; then
+    PS1="\033]2;\h:\u:\w\007\033]1;$PS1"
+fi
+
+if test "$USER" != root; then
+    export NIX_REMOTE=daemon
+fi
+
+
+# Set up the per-user profile.
+NIX_USER_PROFILE_DIR=/nix/var/nix/profiles/per-user/$USER
+mkdir -m 0755 -p $NIX_USER_PROFILE_DIR
+if test "$(stat --printf '%U' $NIX_USER_PROFILE_DIR)" != "$USER"; then
+    echo "WARNING: bad ownership on $_NIX_PROFILE_DIR" >&2
+fi
+
+if ! test -L $HOME/.nix-profile; then
+    echo "creating $HOME/.nix-profile" >&2
+    ln -s $NIX_USER_PROFILE_DIR/profile $HOME/.nix-profile
+fi
+
+NIX_PROFILES="/nix/var/nix/profiles/default $NIX_USER_PROFILE_DIR/profile"
+
+for i in $NIX_PROFILES; do # !!! reverse
+    export PATH=$i/bin:$PATH
+done
+
+
+# Set up a default Nix expression from which to install stuff.
+if ! test -L $HOME/.nix-defexpr; then
+    echo "creating $HOME/.nix-defexpr" >&2
+    ln -s /etc/nixos/install-source.nix $HOME/.nix-defexpr
+fi
+
+
+# Some aliases.
+alias ls="ls --color=tty"
+alias ll="ls -l"
+alias which="type -p"
+
+
+# Read system-wide modifications.
+if test -f /etc/profile.local; then
+    source /etc/profile.local
+fi
+
+
+# Read user modifications.
+test -r $HOME/.bashrc && source $HOME/.bashrc
diff --git a/system/system.nix b/system/system.nix
index 1cd6e8e5b69..fdf06eb5806 100644
--- a/system/system.nix
+++ b/system/system.nix
@@ -123,20 +123,22 @@ rec {
 
   # The static parts of /etc.
   etc = import ./etc.nix {
-    inherit pkgs upstartJobs;
+    inherit pkgs upstartJobs systemPath wrapperDir;
   };
 
 
   # The wrapper setuid programs (since we can't have setuid programs
-  # in the Nix store).  
+  # in the Nix store).
+  wrapperDir = "/var/setuid-wrappers";
+  
   setuidWrapper = import ../helpers/setuid {
     inherit (pkgs) stdenv;
-    wrapperDir = "/var/setuid-wrappers";
+    inherit wrapperDir;
   };
 
 
   # The packages you want in the boot environment.
-  fullPath = [
+  systemPathList = [
     pkgs.bash
     pkgs.bzip2
     pkgs.coreutils
@@ -178,6 +180,18 @@ rec {
   ];
 
 
+  # We don't want to put all of `startPath' and `path' in $PATH, since
+  # then we get an embarrassingly long $PATH.  So use the user
+  # environment builder to make a directory with symlinks to those
+  # packages.
+  systemPath = pkgs.buildEnv {
+    name = "system-path";
+    paths = systemPathList;
+    pathsToLink = ["/bin" "/sbin" "/man" "/share"];
+    ignoreCollisions = true;
+  };
+
+    
   # The script that activates the configuration, i.e., it sets up
   # /etc, accounts, etc.  It doesn't do anything that can only be done
   # at boot time (such as start `init').
@@ -185,12 +199,11 @@ rec {
     src = ./activate-configuration.sh;
     isExecutable = true;
 
-    inherit etc;
+    inherit etc wrapperDir systemPath;
     inherit (pkgs) kernel;
     readOnlyRoot = config.get ["boot" "readOnlyRoot"];
     hostName = config.get ["networking" "hostName"];
     setuidPrograms = config.get ["security" "setuidPrograms"];
-    wrapperDir = setuidWrapper.wrapperDir;
 
     path = [
       pkgs.coreutils pkgs.gnugrep pkgs.findutils
@@ -198,16 +211,6 @@ rec {
       pkgs.pwdutils
     ];
 
-    # We don't want to put all of `startPath' and `path' in $PATH, since
-    # then we get an embarrassingly long $PATH.  So use the user
-    # environment builder to make a directory with symlinks to those
-    # packages.
-    fullPath = pkgs.buildEnv {
-      name = "boot-stage-2-path";
-      paths = fullPath;
-      pathsToLink = ["/bin" "/sbin" "/man" "/share"];
-      ignoreCollisions = true;
-    };
   };
 
 
-- 
GitLab


From af19b39a4bb3b09c26594fa49287c61eb7b229bd Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 15 Jan 2007 17:16:49 +0000
Subject: [PATCH 0399/5331] * Create wtmp, lastlog.

svn path=/nixos/trunk/; revision=7683
---
 system/activate-configuration.sh | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/system/activate-configuration.sh b/system/activate-configuration.sh
index f09a56e8b5d..f10db49da3c 100644
--- a/system/activate-configuration.sh
+++ b/system/activate-configuration.sh
@@ -34,10 +34,16 @@ done
 mkdir -m 0755 -p /var/run
 
 echo -n > /var/run/utmp # must exist
-chmod 664 /var/run/utmp
+chmod 644 /var/run/utmp
 
 mkdir -m 0755 -p /var/log
 
+touch /var/log/wtmp # must exist
+chmod 644 /var/log/wtmp
+
+touch /var/log/lastlog
+chmod 644 /var/log/lastlog
+
 
 # If there is no password file yet, create a root account with an
 # empty password.
-- 
GitLab


From 554ae9908b4abd45c9769da023470ae2c12ebdfd Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 15 Jan 2007 17:19:41 +0000
Subject: [PATCH 0400/5331] * Some slightly hacky LDAP support.  The problem is
 that Glibc has to   be able to find the LDAP NSS module, which is normally
 installed in   Glibc's prefix (under /lib/libnss_ldap...).  Of course, we
 can't do   that; it wouldn't be pure.  As a workaround, we simply add
 nss_ldap   to the LD_LIBRARY_PATH of the nscd daemon, which every other
 program   uses for lookups.  So we don't have to put nss_ldap in the  
 LD_LIBRARY_PATH of every program.

svn path=/nixos/trunk/; revision=7684
---
 system/etc/nsswitch.conf | 5 +++--
 system/system.nix        | 9 ++++++++-
 system/upstart.nix       | 4 +++-
 upstart-jobs/nscd.nix    | 6 +++++-
 upstart-jobs/sshd.nix    | 3 +++
 5 files changed, 22 insertions(+), 5 deletions(-)

diff --git a/system/etc/nsswitch.conf b/system/etc/nsswitch.conf
index de9c533f07b..f557269d5bd 100644
--- a/system/etc/nsswitch.conf
+++ b/system/etc/nsswitch.conf
@@ -1,5 +1,6 @@
-passwd:         compat
-group:          compat
+passwd:         ldap files
+group:          ldap files
+shadow:         ldap files
 
 hosts:          files dns
 networks:       files dns
diff --git a/system/system.nix b/system/system.nix
index fdf06eb5806..94e28b21626 100644
--- a/system/system.nix
+++ b/system/system.nix
@@ -115,9 +115,16 @@ rec {
   };
 
 
+  # NSS modules.  Hacky!
+  nssModules = [pkgs.nss_ldap];
+
+  nssModulesPath = pkgs.lib.concatStrings (pkgs.lib.intersperse ":" 
+    (map (mod: mod + "/lib") nssModules));
+
+
   # The services (Upstart) configuration for the system.
   upstartJobs = import ./upstart.nix {
-    inherit config pkgs nix;
+    inherit config pkgs nix nssModulesPath;
   };
 
 
diff --git a/system/upstart.nix b/system/upstart.nix
index 6ceb2c92163..836a279346f 100644
--- a/system/upstart.nix
+++ b/system/upstart.nix
@@ -1,4 +1,4 @@
-{config, pkgs, nix}:
+{config, pkgs, nix, nssModulesPath}:
 
 let 
 
@@ -80,6 +80,7 @@ import ../upstart-jobs/gather.nix {
     # Name service cache daemon.
     (import ../upstart-jobs/nscd.nix {
       inherit (pkgs) glibc pwdutils;
+      inherit nssModulesPath;
     })
 
     # Handles the maintenance/stalled event (single-user shell).
@@ -97,6 +98,7 @@ import ../upstart-jobs/gather.nix {
     (import ../upstart-jobs/sshd.nix {
       inherit (pkgs) writeText openssh glibc pwdutils;
       inherit (pkgs.xorg) xauth;
+      inherit nssModulesPath;
       forwardX11 = config.get ["services" "sshd" "forwardX11"];
       allowSFTP = config.get ["services" "sshd" "allowSFTP"];
     })
diff --git a/upstart-jobs/nscd.nix b/upstart-jobs/nscd.nix
index 1e6b39dd9b3..2fcc86229b1 100644
--- a/upstart-jobs/nscd.nix
+++ b/upstart-jobs/nscd.nix
@@ -1,4 +1,4 @@
-{glibc, pwdutils}:
+{glibc, pwdutils, nssModulesPath}:
 
 {
   name = "nscd";
@@ -9,6 +9,8 @@ description \"Name Service Cache Daemon\"
 start on startup
 stop on shutdown
 
+env LD_LIBRARY_PATH=${nssModulesPath}
+
 start script
 
     if ! ${glibc}/bin/getent passwd nscd > /dev/null; then
@@ -18,6 +20,8 @@ start script
 
     mkdir -m 0755 -p /var/run/nscd
     mkdir -m 0755 -p /var/db/nscd
+
+    rm -f /var/db/nscd/* # for testing
     
 end script
 
diff --git a/upstart-jobs/sshd.nix b/upstart-jobs/sshd.nix
index 69be033316d..cc2c4ddea1b 100644
--- a/upstart-jobs/sshd.nix
+++ b/upstart-jobs/sshd.nix
@@ -1,4 +1,5 @@
 { writeText, openssh, glibc, pwdutils, xauth
+, nssModulesPath
 , forwardX11, allowSFTP
 }:
 
@@ -32,6 +33,8 @@ description \"SSH server\"
 start on network-interfaces/started
 stop on network-interfaces/stop
 
+env LD_LIBRARY_PATH=${nssModulesPath}
+
 start script
     mkdir -m 0555 -p /var/empty
 
-- 
GitLab


From 07506308d6b7e03944c96e84c4010a4fcbf46944 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 16 Jan 2007 13:30:59 +0000
Subject: [PATCH 0401/5331] * Support LDAP authentication. * Factor out the
 common parts of the PAM config files.

svn path=/nixos/trunk/; revision=7694
---
 system/etc.nix                   | 6 +++++-
 system/etc/pam.d/common-account  | 2 ++
 system/etc/pam.d/common-auth     | 3 +++
 system/etc/pam.d/common-password | 2 ++
 system/etc/pam.d/common-session  | 2 ++
 system/etc/pam.d/login           | 8 ++++----
 system/etc/pam.d/passwd          | 8 ++++----
 system/etc/pam.d/sshd            | 8 ++++----
 system/etc/pam.d/su              | 8 ++++----
 system/etc/profile.sh            | 4 ++--
 10 files changed, 32 insertions(+), 19 deletions(-)
 create mode 100644 system/etc/pam.d/common-account
 create mode 100644 system/etc/pam.d/common-auth
 create mode 100644 system/etc/pam.d/common-password
 create mode 100644 system/etc/pam.d/common-session

diff --git a/system/etc.nix b/system/etc.nix
index 17ace6e1f99..a850a19398b 100644
--- a/system/etc.nix
+++ b/system/etc.nix
@@ -75,7 +75,7 @@ import ../helpers/make-etc.nix {
     (program:
       { source = pkgs.substituteAll {
           src = ./etc/pam.d + ("/" + program);
-          inherit (pkgs) pam_unix2;
+          inherit (pkgs) pam_unix2 pam_ldap;
         };
         target = "pam.d/" + program;
       }
@@ -88,6 +88,10 @@ import ../helpers/make-etc.nix {
       "shadow"
       "sshd"
       "useradd"
+      "common-auth"
+      "common-account"
+      "common-password"
+      "common-session"
     ]
   );
 }
\ No newline at end of file
diff --git a/system/etc/pam.d/common-account b/system/etc/pam.d/common-account
new file mode 100644
index 00000000000..50d0a58134f
--- /dev/null
+++ b/system/etc/pam.d/common-account
@@ -0,0 +1,2 @@
+account  optional       @pam_ldap@/lib/security/pam_ldap.so 
+account  required       @pam_unix2@/lib/security/pam_unix2.so
diff --git a/system/etc/pam.d/common-auth b/system/etc/pam.d/common-auth
new file mode 100644
index 00000000000..ec5d5d889a5
--- /dev/null
+++ b/system/etc/pam.d/common-auth
@@ -0,0 +1,3 @@
+auth     sufficient     @pam_ldap@/lib/security/pam_ldap.so 
+auth     sufficient     @pam_unix2@/lib/security/pam_unix2.so
+auth     required       pam_deny.so
diff --git a/system/etc/pam.d/common-password b/system/etc/pam.d/common-password
new file mode 100644
index 00000000000..f0ec89f1291
--- /dev/null
+++ b/system/etc/pam.d/common-password
@@ -0,0 +1,2 @@
+password sufficient     @pam_ldap@/lib/security/pam_ldap.so 
+password sufficient     @pam_unix2@/lib/security/pam_unix2.so nullok
diff --git a/system/etc/pam.d/common-session b/system/etc/pam.d/common-session
new file mode 100644
index 00000000000..434fe930f77
--- /dev/null
+++ b/system/etc/pam.d/common-session
@@ -0,0 +1,2 @@
+auth     optional       @pam_ldap@/lib/security/pam_ldap.so 
+session  required       @pam_unix2@/lib/security/pam_unix2.so
diff --git a/system/etc/pam.d/login b/system/etc/pam.d/login
index 83c1bcd2f34..c3fad16bbef 100644
--- a/system/etc/pam.d/login
+++ b/system/etc/pam.d/login
@@ -1,4 +1,4 @@
-auth     required       @pam_unix2@/lib/security/pam_unix2.so nullok
-account  required       @pam_unix2@/lib/security/pam_unix2.so
-password required       @pam_unix2@/lib/security/pam_unix2.so nullok
-session  required       @pam_unix2@/lib/security/pam_unix2.so
+auth     include        common-auth
+account  include        common-account
+password include        common-password
+session  include        common-session
diff --git a/system/etc/pam.d/passwd b/system/etc/pam.d/passwd
index d3463aab5ae..c3fad16bbef 100644
--- a/system/etc/pam.d/passwd
+++ b/system/etc/pam.d/passwd
@@ -1,4 +1,4 @@
-auth     required       @pam_unix2@/lib/security/pam_unix2.so
-account  required       @pam_unix2@/lib/security/pam_unix2.so
-password required       @pam_unix2@/lib/security/pam_unix2.so nullok
-session  required       @pam_unix2@/lib/security/pam_unix2.so
+auth     include        common-auth
+account  include        common-account
+password include        common-password
+session  include        common-session
diff --git a/system/etc/pam.d/sshd b/system/etc/pam.d/sshd
index d3463aab5ae..c3fad16bbef 100644
--- a/system/etc/pam.d/sshd
+++ b/system/etc/pam.d/sshd
@@ -1,4 +1,4 @@
-auth     required       @pam_unix2@/lib/security/pam_unix2.so
-account  required       @pam_unix2@/lib/security/pam_unix2.so
-password required       @pam_unix2@/lib/security/pam_unix2.so nullok
-session  required       @pam_unix2@/lib/security/pam_unix2.so
+auth     include        common-auth
+account  include        common-account
+password include        common-password
+session  include        common-session
diff --git a/system/etc/pam.d/su b/system/etc/pam.d/su
index 3807b8a3d27..5fbdc16359a 100644
--- a/system/etc/pam.d/su
+++ b/system/etc/pam.d/su
@@ -1,5 +1,5 @@
 auth     sufficient     pam_rootok.so
-auth     required       @pam_unix2@/lib/security/pam_unix2.so nullok
-account  required       @pam_unix2@/lib/security/pam_unix2.so
-password required       @pam_unix2@/lib/security/pam_unix2.so nullok
-session  required       @pam_unix2@/lib/security/pam_unix2.so
+auth     include        common-auth
+account  include        common-account
+password include        common-password
+session  include        common-session
diff --git a/system/etc/profile.sh b/system/etc/profile.sh
index 039fe34a794..18f81f58c78 100644
--- a/system/etc/profile.sh
+++ b/system/etc/profile.sh
@@ -17,8 +17,8 @@ fi
 # Set up the per-user profile.
 NIX_USER_PROFILE_DIR=/nix/var/nix/profiles/per-user/$USER
 mkdir -m 0755 -p $NIX_USER_PROFILE_DIR
-if test "$(stat --printf '%U' $NIX_USER_PROFILE_DIR)" != "$USER"; then
-    echo "WARNING: bad ownership on $_NIX_PROFILE_DIR" >&2
+if test "$(stat --printf '%u' $NIX_USER_PROFILE_DIR)" != "$(id -u)"; then
+    echo "WARNING: bad ownership on $NIX_USER_PROFILE_DIR" >&2
 fi
 
 if ! test -L $HOME/.nix-profile; then
-- 
GitLab


From 9866132d81a9d0a20f9d12f1f1b1e66227057bc3 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 16 Jan 2007 16:09:43 +0000
Subject: [PATCH 0402/5331] * Generate the LDAP configuration automatically.

svn path=/nixos/trunk/; revision=7698
---
 system/activate-configuration.sh |  2 +-
 system/etc.nix                   | 25 ++++++++++++++++++--
 system/etc/ldap.conf.nix         | 18 +++++++++++++++
 system/options.nix               | 39 ++++++++++++++++++++++++++++++++
 system/system.nix                |  5 ++--
 5 files changed, 84 insertions(+), 5 deletions(-)
 create mode 100644 system/etc/ldap.conf.nix

diff --git a/system/activate-configuration.sh b/system/activate-configuration.sh
index f10db49da3c..16800cd8f3c 100644
--- a/system/activate-configuration.sh
+++ b/system/activate-configuration.sh
@@ -33,7 +33,7 @@ done
 # Various log directories.
 mkdir -m 0755 -p /var/run
 
-echo -n > /var/run/utmp # must exist
+touch /var/run/utmp # must exist
 chmod 644 /var/run/utmp
 
 mkdir -m 0755 -p /var/log
diff --git a/system/etc.nix b/system/etc.nix
index a850a19398b..d0978353d10 100644
--- a/system/etc.nix
+++ b/system/etc.nix
@@ -1,5 +1,12 @@
-{pkgs, upstartJobs, systemPath, wrapperDir}:
+{config, pkgs, upstartJobs, systemPath, wrapperDir}:
 
+let 
+
+  optional = option: file:
+    if config.get option then [file] else [];
+
+in
+    
 import ../helpers/make-etc.nix {
   inherit (pkgs) stdenv;
 
@@ -68,14 +75,28 @@ import ../helpers/make-etc.nix {
       };
       target = "profile";
     }
+
   ]
 
+  # LDAP configuration.
+  ++ (optional ["users" "ldap" "enable"] {
+    source = import etc/ldap.conf.nix {
+      inherit (pkgs) writeText;
+      inherit config;
+    };
+    target = "ldap.conf";
+  })
+    
   # A bunch of PAM configuration files for various programs.
   ++ (map
     (program:
       { source = pkgs.substituteAll {
           src = ./etc/pam.d + ("/" + program);
-          inherit (pkgs) pam_unix2 pam_ldap;
+          inherit (pkgs) pam_unix2;
+          pam_ldap =
+            if config.get ["users" "ldap" "enable"]
+            then pkgs.pam_ldap
+            else "/no-such-path";
         };
         target = "pam.d/" + program;
       }
diff --git a/system/etc/ldap.conf.nix b/system/etc/ldap.conf.nix
new file mode 100644
index 00000000000..5a3b227e2d5
--- /dev/null
+++ b/system/etc/ldap.conf.nix
@@ -0,0 +1,18 @@
+{writeText, config}:
+
+# Careful: OpenLDAP seems to be very picky about the indentation of
+# this file.  Directives HAVE to start in the first column!
+
+writeText "ldap.conf" "
+
+uri ${config.get ["users" "ldap" "server"]}
+base ${config.get ["users" "ldap" "base"]}
+  
+${
+if config.get ["users" "ldap" "useTLS"] then "
+ssl start_tls
+tls_checkpeer no
+" else ""
+}
+
+"
diff --git a/system/options.nix b/system/options.nix
index 6216025c45b..0debe2f83de 100644
--- a/system/options.nix
+++ b/system/options.nix
@@ -533,4 +533,43 @@
   }
 
   
+  {
+    name = ["users" "ldap" "enable"];
+    default = false;
+    description = "
+      Whether to enable authentication against an LDAP server.
+    ";
+  }
+
+  
+  {
+    name = ["users" "ldap" "server"];
+    example = "ldap://ldap.example.org/";
+    description = "
+      The URL of the LDAP server.
+    ";
+  }
+
+  
+  {
+    name = ["users" "ldap" "base"];
+    example = "dc=example,dc=org";
+    description = "
+      The distinguished name of the search base.
+    ";
+  }
+
+  
+  {
+    name = ["users" "ldap" "useTLS"];
+    default = false;
+    description = "
+      If enabled, use TLS (encryption) over an LDAP (port 389)
+      connection.  The alternative is to specify an LDAPS server (port
+      636) in <option>users.ldap.server</option> or to forego
+      security.
+    ";
+  }
+
+  
 ]
diff --git a/system/system.nix b/system/system.nix
index 94e28b21626..e5a30e0d07f 100644
--- a/system/system.nix
+++ b/system/system.nix
@@ -116,7 +116,8 @@ rec {
 
 
   # NSS modules.  Hacky!
-  nssModules = [pkgs.nss_ldap];
+  nssModules =
+    if config.get ["users" "ldap" "enable"] then [pkgs.nss_ldap] else [];
 
   nssModulesPath = pkgs.lib.concatStrings (pkgs.lib.intersperse ":" 
     (map (mod: mod + "/lib") nssModules));
@@ -130,7 +131,7 @@ rec {
 
   # The static parts of /etc.
   etc = import ./etc.nix {
-    inherit pkgs upstartJobs systemPath wrapperDir;
+    inherit config pkgs upstartJobs systemPath wrapperDir;
   };
 
 
-- 
GitLab


From 55e7f8f5dc7ac5a0620fbf5ca2f52da4dfc2abda Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 16 Jan 2007 22:25:28 +0000
Subject: [PATCH 0403/5331] * Use pam_xauth in su to pass the X cookies.

svn path=/nixos/trunk/; revision=7702
---
 system/etc.nix      | 1 +
 system/etc/pam.d/su | 1 +
 2 files changed, 2 insertions(+)

diff --git a/system/etc.nix b/system/etc.nix
index d0978353d10..d29c869ba97 100644
--- a/system/etc.nix
+++ b/system/etc.nix
@@ -97,6 +97,7 @@ import ../helpers/make-etc.nix {
             if config.get ["users" "ldap" "enable"]
             then pkgs.pam_ldap
             else "/no-such-path";
+          inherit (pkgs.xorg) xauth;
         };
         target = "pam.d/" + program;
       }
diff --git a/system/etc/pam.d/su b/system/etc/pam.d/su
index 5fbdc16359a..ca777155cc6 100644
--- a/system/etc/pam.d/su
+++ b/system/etc/pam.d/su
@@ -3,3 +3,4 @@ auth     include        common-auth
 account  include        common-account
 password include        common-password
 session  include        common-session
+session  optional       pam_xauth.so xauthpath=@xauth@/bin/xauth systemuser=99
-- 
GitLab


From cf9016d816b7fc607238203e3cf4ab9de921fe4a Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 16 Jan 2007 22:34:15 +0000
Subject: [PATCH 0404/5331] * Mount devpts. * Set the right permissions on
 /dev/tty and /dev/ptmx.

svn path=/nixos/trunk/; revision=7703
---
 boot/boot-stage-2-init.sh             | 2 ++
 upstart-jobs/udev-rules/50-udev.rules | 5 +++++
 2 files changed, 7 insertions(+)

diff --git a/boot/boot-stage-2-init.sh b/boot/boot-stage-2-init.sh
index b7a95cae9f1..5eab996beb2 100644
--- a/boot/boot-stage-2-init.sh
+++ b/boot/boot-stage-2-init.sh
@@ -69,6 +69,8 @@ done
 # More special file systems, initialise required directories.
 mount -t sysfs none /sys
 mount -t tmpfs -o "mode=0755" none /dev
+mkdir -m 0755 -p /dev/pts
+mount -t devpts none /dev/pts
 needWritableDir /tmp 01777
 needWritableDir /var 0755
 needWritableDir /nix/var 0755
diff --git a/upstart-jobs/udev-rules/50-udev.rules b/upstart-jobs/udev-rules/50-udev.rules
index 2bf58c19a13..b89ac321efb 100644
--- a/upstart-jobs/udev-rules/50-udev.rules
+++ b/upstart-jobs/udev-rules/50-udev.rules
@@ -12,6 +12,11 @@ KERNEL=="sonypi",               MODE="0666"
 KERNEL=="agpgart",              MODE="0600"
 
 
+# TTYs.
+KERNEL=="tty",                  NAME="%k", MODE="666", OPTIONS="last_rule"  # GROUP="tty"
+KERNEL=="ptmx",                 NAME="%k", MODE="666" # GROUP="tty"
+
+
 # Input devices go under /dev/input.
 KERNEL=="mouse*|mice",          NAME="input/%k", MODE="0640"
 KERNEL=="event*",               NAME="input/%k", MODE="0640"
-- 
GitLab


From afd36a88ebe962269d169402b78da4d1142805cd Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 17 Jan 2007 12:06:26 +0000
Subject: [PATCH 0405/5331] * Assume by default that the NixOS sources are in
 /etc/nixos.

svn path=/nixos/trunk/; revision=7705
---
 checkout-nixos.sh | 1 +
 test.sh           | 9 +++++----
 upgrade.sh        | 9 +++++----
 3 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/checkout-nixos.sh b/checkout-nixos.sh
index 3cf8af38541..662bd729818 100755
--- a/checkout-nixos.sh
+++ b/checkout-nixos.sh
@@ -2,6 +2,7 @@
 nix-channel --add http://nix.cs.uu.nl/dist/nix/channels-v3/nixpkgs-unstable
 nix-channel --update
 nix-env -i subversion
+cd /etc/nixos
 svn co https://svn.cs.uu.nl:12443/repos/trace/nixos/trunk nixos
 svn co https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk nixpkgs
 ln -s ../nixpkgs/pkgs nixos/pkgs
diff --git a/test.sh b/test.sh
index af9cb3c81e4..6ea5e055aa6 100755
--- a/test.sh
+++ b/test.sh
@@ -1,8 +1,9 @@
 #! /bin/sh -e
-if test -z "$NIXOS_CONFIG"; then
-    NIXOS_CONFIG=/etc/nixos/configuration.nix
-fi
-nix-build system/system.nix \
+
+if test -z "$NIXOS"; then NIXOS=/etc/nixos/nixos; fi
+if test -z "$NIXOS_CONFIG"; then NIXOS_CONFIG=/etc/nixos/configuration.nix; fi
+
+nix-build $NIXOS/system/system.nix \
     --arg configuration "import $NIXOS_CONFIG" \
     -A system -K -k
 ./result/bin/switch-to-configuration test
diff --git a/upgrade.sh b/upgrade.sh
index 259e30fe31e..5fb56387158 100755
--- a/upgrade.sh
+++ b/upgrade.sh
@@ -1,8 +1,9 @@
 #! /bin/sh -e
-if test -z "$NIXOS_CONFIG"; then
-    NIXOS_CONFIG=/etc/nixos/configuration.nix
-fi
-nix-env -p /nix/var/nix/profiles/system -f system/system.nix \
+
+if test -z "$NIXOS"; then NIXOS=/etc/nixos/nixos; fi
+if test -z "$NIXOS_CONFIG"; then NIXOS_CONFIG=/etc/nixos/configuration.nix; fi
+
+nix-env -p /nix/var/nix/profiles/system -f $NIXOS/system/system.nix \
     --arg configuration "import $NIXOS_CONFIG" \
     --set -A system
 /nix/var/nix/profiles/system/bin/switch-to-configuration switch
-- 
GitLab


From 02d3541a8be31b86eb372a06d6bf1af02ee1a4ea Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 17 Jan 2007 12:33:23 +0000
Subject: [PATCH 0406/5331] * Allow the time zone to be configured.

svn path=/nixos/trunk/; revision=7706
---
 system/etc.nix        | 1 +
 system/etc/profile.sh | 1 +
 system/options.nix    | 8 ++++++++
 3 files changed, 10 insertions(+)

diff --git a/system/etc.nix b/system/etc.nix
index d29c869ba97..da04d8d961e 100644
--- a/system/etc.nix
+++ b/system/etc.nix
@@ -72,6 +72,7 @@ import ../helpers/make-etc.nix {
         src = ./etc/profile.sh;
         inherit systemPath wrapperDir;
         inherit (pkgs) kernel;
+        timeZone = config.get ["time" "timeZone"];
       };
       target = "profile";
     }
diff --git a/system/etc/profile.sh b/system/etc/profile.sh
index 18f81f58c78..f2b8d3c8dcf 100644
--- a/system/etc/profile.sh
+++ b/system/etc/profile.sh
@@ -2,6 +2,7 @@ export PATH=@wrapperDir@:@systemPath@/bin:@systemPath@/sbin
 export MODULE_DIR=@kernel@/lib/modules
 export NIX_CONF_DIR=/nix/etc/nix
 export PAGER=less
+export TZ=@timeZone@
 
 PROMPT_COLOR="1;31m"
 PS1="\n\[\033[$PROMPT_COLOR\][\u@\h:\w]$\[\033[0m\] "
diff --git a/system/options.nix b/system/options.nix
index 0debe2f83de..311c9a7995b 100644
--- a/system/options.nix
+++ b/system/options.nix
@@ -9,6 +9,14 @@
     description = "The name of the machine.";
   }
 
+
+  {
+    name = ["time" "timeZone"];
+    default = "CET";
+    example = "America/New_York";
+    description = "The time zone used when displaying times and dates.";
+  }
+
   
   {
     name = ["boot" "autoDetectRootDevice"];
-- 
GitLab


From b53d7f2c6146d8a6e0243f3d72a91029fbe6e832 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 17 Jan 2007 14:36:24 +0000
Subject: [PATCH 0407/5331] * Create install-source.nix.

svn path=/nixos/trunk/; revision=7707
---
 checkout-nixos.sh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/checkout-nixos.sh b/checkout-nixos.sh
index 662bd729818..300deb196c6 100755
--- a/checkout-nixos.sh
+++ b/checkout-nixos.sh
@@ -5,4 +5,5 @@ nix-env -i subversion
 cd /etc/nixos
 svn co https://svn.cs.uu.nl:12443/repos/trace/nixos/trunk nixos
 svn co https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk nixpkgs
-ln -s ../nixpkgs/pkgs nixos/pkgs
+ln -sf ../nixpkgs/pkgs nixos/pkgs
+ln -sf nixpkgs/pkgs/top-level/all-packages.nix install-source.nix
-- 
GitLab


From ec3d2510c5f9045308826a11b36b1d4f4987cbbe Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 17 Jan 2007 17:44:57 +0000
Subject: [PATCH 0408/5331] * Quick hack to enable fontconfig to find fonts. 
 We look in the   default profile, in the user's profile, and in ~/.fonts.

svn path=/nixos/trunk/; revision=7709
---
 system/etc.nix              |  6 ++++++
 system/etc/fonts/fonts.conf | 10 ++++++++++
 system/etc/profile.sh       |  1 +
 3 files changed, 17 insertions(+)
 create mode 100644 system/etc/fonts/fonts.conf

diff --git a/system/etc.nix b/system/etc.nix
index da04d8d961e..917491fcb1d 100644
--- a/system/etc.nix
+++ b/system/etc.nix
@@ -77,6 +77,12 @@ import ../helpers/make-etc.nix {
       target = "profile";
     }
 
+    { # Configuration file for fontconfig used to locate
+      # (X11) client-rendered fonts.
+      source = ./etc/fonts/fonts.conf;
+      target = "fonts/fonts.conf";
+    }
+
   ]
 
   # LDAP configuration.
diff --git a/system/etc/fonts/fonts.conf b/system/etc/fonts/fonts.conf
new file mode 100644
index 00000000000..ff4a608e928
--- /dev/null
+++ b/system/etc/fonts/fonts.conf
@@ -0,0 +1,10 @@
+<?xml version="1.0"?>
+<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
+
+<fontconfig>
+
+  <dir>/nix/var/nix/profiles/default/lib/X11/fonts</dir>
+  <dir>~/.nix-profile/lib/X11/fonts</dir>
+  <dir>~/.fonts</dir>
+  
+</fontconfig>
diff --git a/system/etc/profile.sh b/system/etc/profile.sh
index f2b8d3c8dcf..738eb056ea7 100644
--- a/system/etc/profile.sh
+++ b/system/etc/profile.sh
@@ -3,6 +3,7 @@ export MODULE_DIR=@kernel@/lib/modules
 export NIX_CONF_DIR=/nix/etc/nix
 export PAGER=less
 export TZ=@timeZone@
+export FONTCONFIG_FILE=/etc/fonts/fonts.conf
 
 PROMPT_COLOR="1;31m"
 PS1="\n\[\033[$PROMPT_COLOR\][\u@\h:\w]$\[\033[0m\] "
-- 
GitLab


From 6db2c1814e0f23c6eaa936fd39a014b9df7e20d2 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 22 Jan 2007 15:00:18 +0000
Subject: [PATCH 0409/5331] * Generate the list of fonts in a Nix expression.

svn path=/nixos/trunk/; revision=7744
---
 system/etc.nix              | 13 ++++++++++++-
 system/etc/fonts/fonts.conf |  4 +---
 2 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/system/etc.nix b/system/etc.nix
index 917491fcb1d..5f5d1e8da59 100644
--- a/system/etc.nix
+++ b/system/etc.nix
@@ -79,7 +79,18 @@ import ../helpers/make-etc.nix {
 
     { # Configuration file for fontconfig used to locate
       # (X11) client-rendered fonts.
-      source = ./etc/fonts/fonts.conf;
+      source = pkgs.substituteAll {
+        src = ./etc/fonts/fonts.conf;
+        fontDirectories = map (dir: "<dir>${dir}</dir>")
+          [ # Search for fonts in...
+            # - the user's .fonts directory
+            "~/.fonts"
+            # - the user's current profile
+            "~/.nix-profile/lib/X11/fonts"
+            # - the default profile
+            "/nix/var/nix/profiles/default/lib/X11/fonts"
+          ];
+      };
       target = "fonts/fonts.conf";
     }
 
diff --git a/system/etc/fonts/fonts.conf b/system/etc/fonts/fonts.conf
index ff4a608e928..012a3008a57 100644
--- a/system/etc/fonts/fonts.conf
+++ b/system/etc/fonts/fonts.conf
@@ -3,8 +3,6 @@
 
 <fontconfig>
 
-  <dir>/nix/var/nix/profiles/default/lib/X11/fonts</dir>
-  <dir>~/.nix-profile/lib/X11/fonts</dir>
-  <dir>~/.fonts</dir>
+  @fontDirectories@
   
 </fontconfig>
-- 
GitLab


From eddd3a7e11629b5d4190a66b22b336fb9a6a652a Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 22 Jan 2007 16:05:37 +0000
Subject: [PATCH 0410/5331] * Provide a few fonts in a purely functional way,
 i.e., as part of the   system configuration.

svn path=/nixos/trunk/; revision=7748
---
 system/etc.nix              | 29 ++++++++++++++++++++---------
 system/etc/fonts/fonts.conf |  2 +-
 2 files changed, 21 insertions(+), 10 deletions(-)

diff --git a/system/etc.nix b/system/etc.nix
index 5f5d1e8da59..fd64411163b 100644
--- a/system/etc.nix
+++ b/system/etc.nix
@@ -81,15 +81,26 @@ import ../helpers/make-etc.nix {
       # (X11) client-rendered fonts.
       source = pkgs.substituteAll {
         src = ./etc/fonts/fonts.conf;
-        fontDirectories = map (dir: "<dir>${dir}</dir>")
-          [ # Search for fonts in...
-            # - the user's .fonts directory
-            "~/.fonts"
-            # - the user's current profile
-            "~/.nix-profile/lib/X11/fonts"
-            # - the default profile
-            "/nix/var/nix/profiles/default/lib/X11/fonts"
-          ];
+        fontDirectories =
+          let
+            # Search for fonts in...
+            runtimeDirs = [
+              # - the user's .fonts directory
+              "~/.fonts"
+              # - the user's current profile
+              "~/.nix-profile/lib/X11/fonts"
+              # - the default profile
+              "/nix/var/nix/profiles/default/lib/X11/fonts"
+            ];
+            systemFonts = [
+              # - a few statically built locations
+              pkgs.xorg.fontbhttf
+              pkgs.xorg.fontbh100dpi
+              pkgs.xorg.fontbhlucidatypewriter100dpi
+              pkgs.freefont_ttf
+            ];
+          in
+            map (dir: "<dir>${dir}</dir>") (runtimeDirs ++ systemFonts);
       };
       target = "fonts/fonts.conf";
     }
diff --git a/system/etc/fonts/fonts.conf b/system/etc/fonts/fonts.conf
index 012a3008a57..70d886e08cd 100644
--- a/system/etc/fonts/fonts.conf
+++ b/system/etc/fonts/fonts.conf
@@ -4,5 +4,5 @@
 <fontconfig>
 
   @fontDirectories@
-  
+
 </fontconfig>
-- 
GitLab


From 6cb01a0b2250e59a782a7d7446494da8a23e192f Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 22 Jan 2007 16:29:05 +0000
Subject: [PATCH 0411/5331] * Use a small XSLT script that copies the original
 fonts.conf from the   fontconfig distribution, but replaces all <dir> entries
 with the   directories specified in the $fontDirectories parameter.  This way
   we get all the font mapping rules from the original fonts.conf   (e.g.,
 aliases like "serif") and some other nice things.

svn path=/nixos/trunk/; revision=7749
---
 system/etc.nix                       | 45 ++++++++++++++--------------
 system/etc/fonts/fonts.conf          |  8 -----
 system/etc/fonts/make-fonts-conf.xsl | 32 ++++++++++++++++++++
 3 files changed, 54 insertions(+), 31 deletions(-)
 delete mode 100644 system/etc/fonts/fonts.conf
 create mode 100644 system/etc/fonts/make-fonts-conf.xsl

diff --git a/system/etc.nix b/system/etc.nix
index fd64411163b..4dec5ff61ea 100644
--- a/system/etc.nix
+++ b/system/etc.nix
@@ -79,29 +79,28 @@ import ../helpers/make-etc.nix {
 
     { # Configuration file for fontconfig used to locate
       # (X11) client-rendered fonts.
-      source = pkgs.substituteAll {
-        src = ./etc/fonts/fonts.conf;
-        fontDirectories =
-          let
-            # Search for fonts in...
-            runtimeDirs = [
-              # - the user's .fonts directory
-              "~/.fonts"
-              # - the user's current profile
-              "~/.nix-profile/lib/X11/fonts"
-              # - the default profile
-              "/nix/var/nix/profiles/default/lib/X11/fonts"
-            ];
-            systemFonts = [
-              # - a few statically built locations
-              pkgs.xorg.fontbhttf
-              pkgs.xorg.fontbh100dpi
-              pkgs.xorg.fontbhlucidatypewriter100dpi
-              pkgs.freefont_ttf
-            ];
-          in
-            map (dir: "<dir>${dir}</dir>") (runtimeDirs ++ systemFonts);
-      };
+      source = pkgs.runCommand "fonts.conf"
+        { 
+          fontDirectories = [
+            # - the user's .fonts directory
+            "~/.fonts"
+            # - the user's current profile
+            "~/.nix-profile/lib/X11/fonts"
+            # - the default profile
+            "/nix/var/nix/profiles/default/lib/X11/fonts"
+            # - a few statically built locations
+            pkgs.xorg.fontbhttf
+            pkgs.xorg.fontbh100dpi
+            pkgs.xorg.fontbhlucidatypewriter100dpi
+            pkgs.freefont_ttf
+          ];
+          buildInputs = [pkgs.libxslt];
+          inherit (pkgs) fontconfig;
+        }
+        "xsltproc --stringparam fontDirectories \"$fontDirectories\" \\
+            ${./etc/fonts/make-fonts-conf.xsl} $fontconfig/etc/fonts/fonts.conf \\
+            > $out
+        ";
       target = "fonts/fonts.conf";
     }
 
diff --git a/system/etc/fonts/fonts.conf b/system/etc/fonts/fonts.conf
deleted file mode 100644
index 70d886e08cd..00000000000
--- a/system/etc/fonts/fonts.conf
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
-
-<fontconfig>
-
-  @fontDirectories@
-
-</fontconfig>
diff --git a/system/etc/fonts/make-fonts-conf.xsl b/system/etc/fonts/make-fonts-conf.xsl
new file mode 100644
index 00000000000..22ecbc67039
--- /dev/null
+++ b/system/etc/fonts/make-fonts-conf.xsl
@@ -0,0 +1,32 @@
+<?xml version="1.0"?>
+
+<!--
+  This script copies the original fonts.conf from the fontconfig
+  distribution, but replaces all <dir> entries with the directories
+  specified in the $fontDirectories parameter.
+-->
+
+<xsl:stylesheet version="1.0"
+                xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+                xmlns:str="http://exslt.org/strings"
+                extension-element-prefixes="str"
+                >
+
+  <xsl:output method='xml' encoding="UTF-8" doctype-system="fonts.dtd" />
+
+  <xsl:param name="fontDirectories" />
+
+  <xsl:template match="/fontconfig">
+
+    <fontconfig>
+      <xsl:copy-of select="child::node()[name() != 'dir']" />
+
+      <xsl:for-each select="str:tokenize($fontDirectories)">
+        <dir><xsl:value-of select="." /></dir>
+      </xsl:for-each>
+      
+    </fontconfig>
+
+  </xsl:template>
+  
+</xsl:stylesheet>
\ No newline at end of file
-- 
GitLab


From 327cb83cf2fba4c368e4fc37463b1923691e0344 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 22 Jan 2007 16:42:29 +0000
Subject: [PATCH 0412/5331] * Make it possible to turn off the generation of
 fonts.conf.  This is   important for the installation CD, where we don't want
 a dependency   on all those fonts.  Of course, it's quite nice that turning
 off the   generation of a file automatically removes the dependencies on the 
  files referenced by that file.

svn path=/nixos/trunk/; revision=7750
---
 configuration/rescue-cd.nix |  6 +++-
 system/etc.nix              | 55 +++++++++++++++++++------------------
 system/options.nix          | 13 +++++++++
 3 files changed, 46 insertions(+), 28 deletions(-)

diff --git a/configuration/rescue-cd.nix b/configuration/rescue-cd.nix
index 08dd2479149..1da1b25fe25 100644
--- a/configuration/rescue-cd.nix
+++ b/configuration/rescue-cd.nix
@@ -49,10 +49,14 @@ rec {
       
     };
 
+    fonts = {
+      enableFontConfig = false;
+    };
+    
     installer = {
       nixpkgsURL = http://nix.cs.uu.nl/dist/nix/ + nixpkgsRel;
     };
-    
+
   };
 
 
diff --git a/system/etc.nix b/system/etc.nix
index 4dec5ff61ea..c1422f1ea9c 100644
--- a/system/etc.nix
+++ b/system/etc.nix
@@ -77,35 +77,36 @@ import ../helpers/make-etc.nix {
       target = "profile";
     }
 
-    { # Configuration file for fontconfig used to locate
-      # (X11) client-rendered fonts.
-      source = pkgs.runCommand "fonts.conf"
-        { 
-          fontDirectories = [
-            # - the user's .fonts directory
-            "~/.fonts"
-            # - the user's current profile
-            "~/.nix-profile/lib/X11/fonts"
-            # - the default profile
-            "/nix/var/nix/profiles/default/lib/X11/fonts"
-            # - a few statically built locations
-            pkgs.xorg.fontbhttf
-            pkgs.xorg.fontbh100dpi
-            pkgs.xorg.fontbhlucidatypewriter100dpi
-            pkgs.freefont_ttf
-          ];
-          buildInputs = [pkgs.libxslt];
-          inherit (pkgs) fontconfig;
-        }
-        "xsltproc --stringparam fontDirectories \"$fontDirectories\" \\
-            ${./etc/fonts/make-fonts-conf.xsl} $fontconfig/etc/fonts/fonts.conf \\
-            > $out
-        ";
-      target = "fonts/fonts.conf";
-    }
-
   ]
 
+  # Configuration file for fontconfig used to locate
+  # (X11) client-rendered fonts.
+  ++ (optional ["fonts" "enableFontConfig"] { 
+    source = pkgs.runCommand "fonts.conf"
+      { 
+        fontDirectories = [
+          # - the user's .fonts directory
+          "~/.fonts"
+          # - the user's current profile
+          "~/.nix-profile/lib/X11/fonts"
+          # - the default profile
+          "/nix/var/nix/profiles/default/lib/X11/fonts"
+          # - a few statically built locations
+          pkgs.xorg.fontbhttf
+          pkgs.xorg.fontbh100dpi
+          pkgs.xorg.fontbhlucidatypewriter100dpi
+          pkgs.freefont_ttf
+        ];
+        buildInputs = [pkgs.libxslt];
+        inherit (pkgs) fontconfig;
+      }
+      "xsltproc --stringparam fontDirectories \"$fontDirectories\" \\
+          ${./etc/fonts/make-fonts-conf.xsl} $fontconfig/etc/fonts/fonts.conf \\
+          > $out
+      ";
+    target = "fonts/fonts.conf";
+  })
+
   # LDAP configuration.
   ++ (optional ["users" "ldap" "enable"] {
     source = import etc/ldap.conf.nix {
diff --git a/system/options.nix b/system/options.nix
index 311c9a7995b..36c9084b8df 100644
--- a/system/options.nix
+++ b/system/options.nix
@@ -579,5 +579,18 @@
     ";
   }
 
+
+  {
+    name = ["fonts" "enableFontConfig"];
+    default = true;
+    description = "
+      If enabled, a fontconfig configuration file will be built
+      pointing to a set of default fonts.  If you don't care about
+      running X11 applications or any other program that uses
+      fontconfig, you can turn this option off and prevent a
+      dependency on all those fonts.
+    ";
+  }
+
   
 ]
-- 
GitLab


From 9c3a069326e6fb8fa8c7332272d680c0182b2e8f Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 22 Jan 2007 17:17:43 +0000
Subject: [PATCH 0413/5331] * Add .../share/fonts to the font search path.

svn path=/nixos/trunk/; revision=7752
---
 system/etc.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/system/etc.nix b/system/etc.nix
index c1422f1ea9c..aa93ad33edc 100644
--- a/system/etc.nix
+++ b/system/etc.nix
@@ -89,12 +89,15 @@ import ../helpers/make-etc.nix {
           "~/.fonts"
           # - the user's current profile
           "~/.nix-profile/lib/X11/fonts"
+          "~/.nix-profile/share/fonts"
           # - the default profile
           "/nix/var/nix/profiles/default/lib/X11/fonts"
+          "/nix/var/nix/profiles/default/share/fonts"
           # - a few statically built locations
           pkgs.xorg.fontbhttf
           pkgs.xorg.fontbh100dpi
           pkgs.xorg.fontbhlucidatypewriter100dpi
+          pkgs.ttf_bitstream_vera
           pkgs.freefont_ttf
         ];
         buildInputs = [pkgs.libxslt];
-- 
GitLab


From 340ff5200a99d57118254614e09ac6f305292c1d Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 22 Jan 2007 17:17:53 +0000
Subject: [PATCH 0414/5331] * Add a newline after each <dir>.

svn path=/nixos/trunk/; revision=7753
---
 system/etc/fonts/make-fonts-conf.xsl | 1 +
 1 file changed, 1 insertion(+)

diff --git a/system/etc/fonts/make-fonts-conf.xsl b/system/etc/fonts/make-fonts-conf.xsl
index 22ecbc67039..73deb41c65e 100644
--- a/system/etc/fonts/make-fonts-conf.xsl
+++ b/system/etc/fonts/make-fonts-conf.xsl
@@ -23,6 +23,7 @@
 
       <xsl:for-each select="str:tokenize($fontDirectories)">
         <dir><xsl:value-of select="." /></dir>
+        <xsl:text>&#0010;</xsl:text>
       </xsl:for-each>
       
     </fontconfig>
-- 
GitLab


From cdb98f8418aeb10171b6ab85277d435010a6343c Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 22 Jan 2007 18:58:04 +0000
Subject: [PATCH 0415/5331] * Option to disable the splash screen in the
 initrd.

svn path=/nixos/trunk/; revision=7755
---
 system/options.nix | 9 +++++++++
 system/system.nix  | 7 +++----
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/system/options.nix b/system/options.nix
index 36c9084b8df..b20ebf9eeca 100644
--- a/system/options.nix
+++ b/system/options.nix
@@ -160,6 +160,15 @@
   }
 
 
+  {
+    name = ["boot" "initrd" "enableSplashScreen"];
+    default = true;
+    description = "
+      Whether to show a nice splash screen while booting.
+    ";
+  }
+
+
   {
     name = ["networking" "useDHCP"];
     default = true;
diff --git a/system/system.nix b/system/system.nix
index e5a30e0d07f..13ecce79c87 100644
--- a/system/system.nix
+++ b/system/system.nix
@@ -49,7 +49,6 @@ rec {
     { buildInputs = [pkgs.nukeReferences];
       inherit (pkgsStatic) utillinux;
       inherit (pkgsDiet) udev;
-      inherit (pkgs) splashutils;
       e2fsprogs = pkgs.e2fsprogsDiet;
       allowedReferences = []; # prevent accidents like glibc being included in the initrd
     }
@@ -57,7 +56,6 @@ rec {
       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
       cp $udev/sbin/udevd $udev/sbin/udevtrigger $udev/sbin/udevsettle $out/bin
       nuke-refs $out/bin/*
     ";
@@ -93,7 +91,8 @@ rec {
       { object = bootStage1;
         symlink = "/init";
       }
-      { object = extraUtils;
+    ] ++ (if config.get ["boot" "initrd" "enableSplashScreen"] then [
+      { object = pkgs.splashutils;
         suffix = "/bin/splash_helper";
         symlink = "/sbin/splash_helper";
       }
@@ -103,7 +102,7 @@ rec {
         };
         symlink = "/etc/splash";
       }
-    ];
+    ] else []);
   };
 
 
-- 
GitLab


From c5326d8f00235c41d60797b0530ff27974e7575d Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 22 Jan 2007 22:22:37 +0000
Subject: [PATCH 0416/5331] * Don't use gensplash on x86_64 since it doesn't
 build and I'm too   lazy to fix it right now.

svn path=/nixos/trunk/; revision=7759
---
 configuration/rescue-cd.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/configuration/rescue-cd.nix b/configuration/rescue-cd.nix
index 1da1b25fe25..9fcc7ffd93f 100644
--- a/configuration/rescue-cd.nix
+++ b/configuration/rescue-cd.nix
@@ -11,6 +11,9 @@ rec {
       readOnlyRoot = true;
       # The label used to identify the installation CD.
       rootLabel = "NIXOS";
+      initrd = {
+        enableSplashScreen = pkgs.system != "x86_64-linux";
+      };
     };
     
     services = {
@@ -37,6 +40,7 @@ rec {
 
       # And a background to go with that.
       ttyBackgrounds = {
+        enable = pkgs.system != "x86_64-linux";
         specificThemes = [
           { tty = 8;
             theme = pkgs.fetchurl {
-- 
GitLab


From 836789a8a695a25fef409c4640cdcaf4141269b6 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 23 Jan 2007 09:41:19 +0000
Subject: [PATCH 0417/5331] * pkgs doesn't have a system attribute.

svn path=/nixos/trunk/; revision=7760
---
 configuration/rescue-cd.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/configuration/rescue-cd.nix b/configuration/rescue-cd.nix
index 9fcc7ffd93f..661bcdf33a5 100644
--- a/configuration/rescue-cd.nix
+++ b/configuration/rescue-cd.nix
@@ -12,7 +12,7 @@ rec {
       # The label used to identify the installation CD.
       rootLabel = "NIXOS";
       initrd = {
-        enableSplashScreen = pkgs.system != "x86_64-linux";
+        enableSplashScreen = pkgs.stdenv.system != "x86_64-linux";
       };
     };
     
@@ -40,7 +40,7 @@ rec {
 
       # And a background to go with that.
       ttyBackgrounds = {
-        enable = pkgs.system != "x86_64-linux";
+        enable = pkgs.stdenv.system != "x86_64-linux";
         specificThemes = [
           { tty = 8;
             theme = pkgs.fetchurl {
-- 
GitLab


From 5d883cbb857f064edb4ff6f2799fa90a72dbdd77 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 23 Jan 2007 10:22:00 +0000
Subject: [PATCH 0418/5331] * Flush the nscd hosts table after we've acquired
 an DHCP lease to   prevent problems with negative caching (NIXOS-45).

svn path=/nixos/trunk/; revision=7763
---
 system/etc.nix                 | 2 +-
 system/etc/dhclient-exit-hooks | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/system/etc.nix b/system/etc.nix
index aa93ad33edc..8d023dff05c 100644
--- a/system/etc.nix
+++ b/system/etc.nix
@@ -62,7 +62,7 @@ import ../helpers/make-etc.nix {
     { # Dhclient hooks for emitting ip-up/ip-down events.
       source = pkgs.substituteAll {
         src = ./etc/dhclient-exit-hooks;
-        inherit (pkgs) upstart;
+        inherit (pkgs) upstart glibc;
       };
       target = "dhclient-exit-hooks";
     }
diff --git a/system/etc/dhclient-exit-hooks b/system/etc/dhclient-exit-hooks
index 50463edb4c9..94523313055 100644
--- a/system/etc/dhclient-exit-hooks
+++ b/system/etc/dhclient-exit-hooks
@@ -2,6 +2,7 @@ echo "$reason" >> /tmp/dhcp-exit
 echo "$exit_status" >> /tmp/dhcp-exit
 
 if test "$reason" = BOUND -o "$reason" = REBOOT; then
+    @glibc@/sbin/nscd --invalidate hosts
     @upstart@/sbin/initctl emit ip-up
 fi
 
-- 
GitLab


From 3034daabb782da459c0f315f90d60333ecf86b72 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 23 Jan 2007 10:52:51 +0000
Subject: [PATCH 0419/5331] * Generate DocBook documentation on the available
 options from the Nix   expression.

svn path=/nixos/trunk/; revision=7764
---
 doc/manual/Makefile               | 20 ++++++++++++++
 doc/manual/options-to-docbook.xsl | 45 +++++++++++++++++++++++++++++++
 2 files changed, 65 insertions(+)
 create mode 100644 doc/manual/Makefile
 create mode 100644 doc/manual/options-to-docbook.xsl

diff --git a/doc/manual/Makefile b/doc/manual/Makefile
new file mode 100644
index 00000000000..2d619680814
--- /dev/null
+++ b/doc/manual/Makefile
@@ -0,0 +1,20 @@
+XMLLINT = xmllint --catalogs
+XSLTPROC = xsltproc --catalogs \
+ --param section.autolabel 1 \
+ --param section.label.includes.component.label 1 \
+ --param html.stylesheet \'style.css\' \
+ --param xref.with.number.and.title 1 \
+ --param toc.section.depth 3 \
+ --param admon.style \'\' \
+ --param callout.graphics.extension \'.gif\'
+
+options.html: options-db.xml
+	$(XSLTPROC) --nonet --xinclude --output $@ \
+	  $(docbookxsl)/html/docbook.xsl options-db.xml
+
+options-db.xml: options.xml options-to-docbook.xsl
+	xsltproc -o options-db.xml options-to-docbook.xsl options.xml 
+
+options.xml: ../../system/options.nix
+	echo 'import ../../system/options.nix {pkgs = import ../../pkgs/top-level/all-packages.nix {};}' | \
+	    nix-instantiate --eval-only --xml --strict - > options.xml || (rm options.xml && false)
diff --git a/doc/manual/options-to-docbook.xsl b/doc/manual/options-to-docbook.xsl
new file mode 100644
index 00000000000..bad74c3f59d
--- /dev/null
+++ b/doc/manual/options-to-docbook.xsl
@@ -0,0 +1,45 @@
+<?xml version="1.0"?>
+
+<xsl:stylesheet version="1.0"
+                xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+                xmlns:str="http://exslt.org/strings"
+                xmlns="http://docbook.org/ns/docbook"
+                extension-element-prefixes="str"
+                >
+
+  <xsl:output method='xml' encoding="UTF-8" />
+
+  <xsl:template match="/expr/list">
+
+    <chapter>
+      <title>List of Options</title>
+
+      <variablelist>
+
+        <xsl:for-each select="attrs">
+
+          <varlistentry>
+             <term>
+               <option>
+                 <xsl:for-each select="attr[@name = 'name']/list/string">
+                   <xsl:value-of select="@value" />
+                   <xsl:if test="position() != last()">.</xsl:if> 
+                 </xsl:for-each>
+               </option>
+             </term>
+
+             <listitem><para>
+               <xsl:value-of select="attr[@name = 'description']/string/@value" />
+             </para></listitem>
+
+          </varlistentry>
+
+        </xsl:for-each>
+
+      </variablelist>
+
+    </chapter>
+
+  </xsl:template>
+  
+</xsl:stylesheet>
-- 
GitLab


From 8e0f2fd7c683de38f9c6fe48f742bd4e5c13f7df Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 23 Jan 2007 11:06:31 +0000
Subject: [PATCH 0420/5331] * Properly render DocBook in option descriptions.

svn path=/nixos/trunk/; revision=7765
---
 doc/manual/options-to-docbook.xsl |  4 +++-
 system/options.nix                | 17 +++++++++--------
 2 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/doc/manual/options-to-docbook.xsl b/doc/manual/options-to-docbook.xsl
index bad74c3f59d..5ed80f10bda 100644
--- a/doc/manual/options-to-docbook.xsl
+++ b/doc/manual/options-to-docbook.xsl
@@ -3,6 +3,7 @@
 <xsl:stylesheet version="1.0"
                 xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
                 xmlns:str="http://exslt.org/strings"
+                xmlns:xlink="http://www.w3.org/1999/xlink"
                 xmlns="http://docbook.org/ns/docbook"
                 extension-element-prefixes="str"
                 >
@@ -29,7 +30,8 @@
              </term>
 
              <listitem><para>
-               <xsl:value-of select="attr[@name = 'description']/string/@value" />
+               <xsl:value-of disable-output-escaping="yes"
+                             select="attr[@name = 'description']/string/@value" />
              </para></listitem>
 
           </varlistentry>
diff --git a/system/options.nix b/system/options.nix
index b20ebf9eeca..827c50eef5a 100644
--- a/system/options.nix
+++ b/system/options.nix
@@ -76,7 +76,7 @@
     description = "
       The kernel parameters.  If you want to add additional
       parameters, it's best to set
-      <option>boot.extraKernelParams</options>.
+      <option>boot.extraKernelParams</option>.
     ";
   }
 
@@ -116,7 +116,7 @@
       the boot process.  That is, these modules are not included in
       the initial ramdisk, so they'd better not be required for
       mounting the root file system.  Add them to
-      <option>boot.initrd.extraKernelModules</options> if they are.
+      <option>boot.initrd.extraKernelModules</option> if they are.
     ";
   }
 
@@ -143,7 +143,7 @@
       dependencies of the modules list here are included
       automatically.  If you want to add additional
       modules, it's best to set
-      <option>boot.initrd.extraKernelModules</options>.
+      <option>boot.initrd.extraKernelModules</option>.
     ";
   }
 
@@ -154,7 +154,7 @@
     description = "
       Additional kernel modules for the initial ramdisk.  These are
       loaded before the modules listed in
-      <option>boot.initrd.kernelModules</options>, so they take
+      <option>boot.initrd.kernelModules</option>, so they take
       precedence.
     ";
   }
@@ -248,7 +248,7 @@
       should be an attribute set specifying either the path of the
       swap device or file (<literal>device</literal>) or the label
       of the swap device (<literal>label</literal>, see
-      <command>mkswap -L</command</command>).  Using a label is
+      <command>mkswap -L</command>).  Using a label is
       recommended.
     ";
   }
@@ -290,7 +290,7 @@
     };
     description = "
       The default theme for the virtual consoles.  Themes can be found
-      at http://www.bootsplash.de/.
+      at <link xlink:href='http://www.bootsplash.de/' />.
     ";
   }
 
@@ -376,7 +376,8 @@
     default = true;
     description = "
       Whether to enable the SFTP subsystem in the SSH daemon.  This
-      enables the use of commands such as sftp(1) and sshfs.
+      enables the use of commands such as <command>sftp</command> and
+      <command>sshfs</command>.
     ";
   }
 
@@ -493,7 +494,7 @@
     description = "
       Directory for Apache's transient runtime state (such as PID
       files).  It is created automatically.  Note that the default,
-      /var/run/httpd, is deleted at boot time.
+      <filename>/var/run/httpd</filename>, is deleted at boot time.
     ";
   }
 
-- 
GitLab


From d674ec122328a8d47a880829dbe56f3cfd3b4330 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 23 Jan 2007 11:11:58 +0000
Subject: [PATCH 0421/5331] * Add a top-level book. * Copy the stylesheet from
 the Nix manual.  We should really put this   somewhere central.

svn path=/nixos/trunk/; revision=7766
---
 doc/manual/Makefile   |   6 +-
 doc/manual/manual.xml |  24 ++++
 doc/manual/style.css  | 283 ++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 311 insertions(+), 2 deletions(-)
 create mode 100644 doc/manual/manual.xml
 create mode 100644 doc/manual/style.css

diff --git a/doc/manual/Makefile b/doc/manual/Makefile
index 2d619680814..a8c2456c46d 100644
--- a/doc/manual/Makefile
+++ b/doc/manual/Makefile
@@ -8,9 +8,11 @@ XSLTPROC = xsltproc --catalogs \
  --param admon.style \'\' \
  --param callout.graphics.extension \'.gif\'
 
-options.html: options-db.xml
+docbookxsl = $(HOME)/.nix-profile/xml/xsl/docbook
+
+manual.html: manual.xml options-db.xml
 	$(XSLTPROC) --nonet --xinclude --output $@ \
-	  $(docbookxsl)/html/docbook.xsl options-db.xml
+	  $(docbookxsl)/html/docbook.xsl manual.xml
 
 options-db.xml: options.xml options-to-docbook.xsl
 	xsltproc -o options-db.xml options-to-docbook.xsl options.xml 
diff --git a/doc/manual/manual.xml b/doc/manual/manual.xml
new file mode 100644
index 00000000000..a20c8e93a33
--- /dev/null
+++ b/doc/manual/manual.xml
@@ -0,0 +1,24 @@
+<book xmlns="http://docbook.org/ns/docbook"
+      xmlns:xi="http://www.w3.org/2001/XInclude">
+
+  <info>
+
+    <title>NixOS Manual</title>
+
+    <author>
+      <personname>
+        <firstname>Eelco</firstname>
+        <surname>Dolstra</surname>
+      </personname>
+    </author>
+
+    <copyright>
+      <year>2007</year>
+      <holder>Eelco Dolstra</holder>
+    </copyright>
+    
+  </info>
+
+  <xi:include href="options-db.xml" />
+
+</book>
\ No newline at end of file
diff --git a/doc/manual/style.css b/doc/manual/style.css
new file mode 100644
index 00000000000..e992a9a85dd
--- /dev/null
+++ b/doc/manual/style.css
@@ -0,0 +1,283 @@
+/* Copied from http://bakefile.sourceforge.net/, which appears
+   licensed under the GNU GPL. */
+
+
+/***************************************************************************
+                             Basic headers and text:
+ ***************************************************************************/
+
+body
+{
+    font-family: sans-serif;
+    background: white;
+    margin: 2em 1em 2em 1em;
+}
+
+h1,h2,h3
+{
+    color: #005aa0;
+    text-align: left;
+}
+
+h1 /* title */
+{
+    font-size: 200%;
+}
+
+h2 /* chapters, appendices, subtitle */
+{
+    font-size: 180%;
+}
+
+/* Extra space between chapters, appendices. */
+div.chapter > div.titlepage h2, div.appendix > div.titlepage h2 
+{ 
+    margin-top: 1.5em;
+}
+
+div.section > div.titlepage h2 /* sections */
+{
+    font-size: 150%;
+    margin-top: 1.5em;
+}
+
+h3 /* subsections */
+{
+    font-size: 125%;
+}
+
+div.appendix h3
+{
+    font-size: 150%;
+    margin-top: 1.5em;
+}
+
+div.refnamediv h2, div.refsynopsisdiv h2, div.refsection h2 /* refentry parts */
+{
+    margin-top: 1.4em;
+    font-size: 125%;
+}
+
+div.refsection h3
+{
+    font-size: 110%;
+}
+
+
+/***************************************************************************
+                               Examples:
+ ***************************************************************************/
+
+div.example
+{
+    border: 1px solid #6185a0;
+    padding: 6px 6px;
+    margin-left: 1.5em;
+    margin-right: 1.5em;
+    background: #f4f4f8;
+}
+
+div.example p.title
+{
+    margin-top: 0em;
+}
+
+
+/***************************************************************************
+                            Screen dumps:
+ ***************************************************************************/
+
+pre.screen, pre.programlisting
+{
+    border: 1px solid #6185a0;
+    padding: 3px 3px;
+    margin-left: 1.5em;
+    margin-right: 1.5em;
+    color: #600000;
+    background: #f4f4f8;
+    font-family: monospace;
+    /* font-size: 90%; */
+}
+
+div.example pre.programlisting
+{
+    border: 0px;
+    padding: 0 0;
+    margin: 0 0 0 0;
+}
+
+
+/***************************************************************************
+                               Notes, warnings etc:
+ ***************************************************************************/
+
+.note, .warning
+{
+    border: 1px solid #6185a0;
+    padding: 3px 3px;
+    margin-left: 1.5em;
+    margin-right: 1.5em;
+    margin-bottom: 1em;
+    padding: 0.3em 0.3em 0.3em 0.3em;
+    background: #fffff5;
+}
+
+div.note, div.warning
+{
+    font-style: italic;
+}
+
+div.note h3, div.warning h3
+{
+    color: red;
+    font-size: 100%;
+//    margin: 0 0 0 0;
+    padding-right: 0.5em;
+    display: inline;
+}
+
+div.note p, div.warning p
+{
+    margin-bottom: 0em;
+}
+
+div.note h3 + p, div.warning h3 + p
+{
+    display: inline;
+}
+
+div.note h3
+{
+    color: blue;
+    font-size: 100%;
+}
+
+div.navfooter *
+{
+    font-size: 90%;
+}
+
+
+/***************************************************************************
+                        Links colors and highlighting: 
+ ***************************************************************************/
+
+a:link { color: #0048b3; }
+a:visited { color: #002a6a; }
+a:hover { background: #ffffcd; }
+
+
+/***************************************************************************
+                              Table of contents:
+ ***************************************************************************/
+
+.toc
+{
+    font-size: 90%;
+}
+
+
+
+/***************************************************************************
+                               Special elements:
+ ***************************************************************************/
+
+tt, code
+{
+    color: #400000;
+}
+
+.term
+{
+    font-weight: bold;
+    
+}
+
+div.variablelist dd p, div.glosslist dd p
+{
+    margin-top: 0em;
+}
+
+div.variablelist dd, div.glosslist dd
+{
+    margin-left: 1.5em;
+}
+
+div.glosslist dt
+{
+    font-style: italic;
+}
+
+.default
+{
+    font-style: italic;
+}
+
+.availability
+{
+    font-style: italic;
+}
+
+.varname
+{
+    color: #400000;
+}
+
+
+div.informaltable table
+{
+  border: 1px solid #6185a0;
+  width: 100%;
+}
+
+div.informaltable td
+{
+  border: 0;
+  padding: 5px;
+}
+
+div.informaltable td.default
+{
+  text-align: right;
+}
+
+div.informaltable th
+{
+  text-align: left;
+  color: #005aa0;
+  border: 0;
+  padding: 5px;
+  background: #fffff5;
+  font-weight: normal;
+  font-style: italic;
+}
+
+td.varname, td.tagname, td.paramname
+{
+  font-weight: bold;
+  vertical-align: top;
+}
+
+div.epigraph
+{
+    font-style: italic;
+    text-align: right;
+}
+
+table.productionset table.productionset
+{
+    font-family: monospace;
+}
+
+strong.command
+{
+//    font-family: monospace;
+//    font-style: italic;
+//    font-weight: normal;
+    color: #400000;
+}
+
+div.calloutlist td
+{
+    padding-bottom: 1em;
+}
-- 
GitLab


From e3c5b9e752848e8dc86c59dacb3c7cb16dce0162 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 23 Jan 2007 11:18:23 +0000
Subject: [PATCH 0422/5331] svn path=/nixos/trunk/; revision=7767

---
 doc/manual/options-to-docbook.xsl | 2 +-
 system/options.nix                | 6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/doc/manual/options-to-docbook.xsl b/doc/manual/options-to-docbook.xsl
index 5ed80f10bda..2e139378e1d 100644
--- a/doc/manual/options-to-docbook.xsl
+++ b/doc/manual/options-to-docbook.xsl
@@ -24,7 +24,7 @@
                <option>
                  <xsl:for-each select="attr[@name = 'name']/list/string">
                    <xsl:value-of select="@value" />
-                   <xsl:if test="position() != last()">.</xsl:if> 
+                   <xsl:if test="position() != last()">.</xsl:if>
                  </xsl:for-each>
                </option>
              </term>
diff --git a/system/options.nix b/system/options.nix
index 827c50eef5a..2bef61323d4 100644
--- a/system/options.nix
+++ b/system/options.nix
@@ -227,7 +227,7 @@
       <option>-o</option> flag; defaults to <literal>\"defaults\"</literal>).
 
       Instead of specifying <literal>device</literal>, you can also
-      specify a volume label (<literal>volume</literal>) for file
+      specify a volume label (<literal>label</literal>) for file
       systems that support it, such as ext2/ext3 (see <command>mke2fs
       -L</command>).
     ";
@@ -339,7 +339,8 @@
     ";
   }
 
-      
+
+  /*      
   {
     name = ["services" "mingetty" "waitOnMounts"];
     default = false;
@@ -350,6 +351,7 @@
       separate partition, you may want to turn this on.
     ";
   }
+  */
 
   
   {
-- 
GitLab


From a7d81141becfe9f9be9a0a4f8255443ff3943224 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 23 Jan 2007 11:39:02 +0000
Subject: [PATCH 0423/5331] * Prettyprint the option defaults and examples.

svn path=/nixos/trunk/; revision=7768
---
 doc/manual/options-to-docbook.xsl | 92 +++++++++++++++++++++++++++++--
 1 file changed, 88 insertions(+), 4 deletions(-)

diff --git a/doc/manual/options-to-docbook.xsl b/doc/manual/options-to-docbook.xsl
index 2e139378e1d..71844cbd2b7 100644
--- a/doc/manual/options-to-docbook.xsl
+++ b/doc/manual/options-to-docbook.xsl
@@ -10,6 +10,7 @@
 
   <xsl:output method='xml' encoding="UTF-8" />
 
+  
   <xsl:template match="/expr/list">
 
     <chapter>
@@ -29,10 +30,37 @@
                </option>
              </term>
 
-             <listitem><para>
-               <xsl:value-of disable-output-escaping="yes"
-                             select="attr[@name = 'description']/string/@value" />
-             </para></listitem>
+             <listitem>
+
+               <para>
+                 <xsl:value-of disable-output-escaping="yes"
+                               select="attr[@name = 'description']/string/@value" />
+               </para>
+
+               <para>
+                 <emphasis>Default:</emphasis>
+                 <xsl:choose>
+                   <xsl:when test="attr[@name = 'default']">
+                     <literal>
+                       <xsl:apply-templates select="attr[@name = 'default']" />
+                     </literal>
+                   </xsl:when>
+                   <xsl:otherwise>
+                     none
+                   </xsl:otherwise>
+                 </xsl:choose>
+               </para>
+
+               <xsl:if test="attr[@name = 'example']">
+                 <para>
+                   <emphasis>Example:</emphasis>
+                   <literal>
+                     <xsl:apply-templates select="attr[@name = 'example']" />
+                   </literal>
+                 </para>
+               </xsl:if>
+               
+             </listitem>
 
           </varlistentry>
 
@@ -43,5 +71,61 @@
     </chapter>
 
   </xsl:template>
+
+
+  <xsl:template match="string">
+    <!-- !!! escaping -->
+    "<xsl:value-of select="@value" />"
+  </xsl:template>
+  
+  
+  <xsl:template match="int">
+    <xsl:value-of select="@value" />
+  </xsl:template>
+  
+  
+  <xsl:template match="bool[@value = 'true']">
+    true
+  </xsl:template>
+  
+  
+  <xsl:template match="bool[@value = 'false']">
+    false
+  </xsl:template>
+  
+  
+  <xsl:template match="list">
+    [
+    <xsl:for-each select="*">
+      <xsl:apply-templates select="." />
+      <xsl:text> </xsl:text>
+    </xsl:for-each>
+    ]
+  </xsl:template>
+  
+  
+  <xsl:template match="attrs">
+    {
+    <xsl:for-each select="attr">
+      <xsl:value-of select="@name" />
+      <xsl:text> = </xsl:text>
+      <xsl:apply-templates select="*" />
+      <xsl:text>; </xsl:text>
+    </xsl:for-each>
+    }
+  </xsl:template>
+  
+  
+  <xsl:template match="derivation">
+    <xsl:choose>
+      <xsl:when test="attr[@name = 'url']/string/@value">
+        <emphasis>(download of <xsl:value-of select="attr[@name = 'url']/string/@value" />)</emphasis>
+      </xsl:when>
+      <xsl:otherwise>
+        <emphasis>(build of <xsl:value-of select="attr[@name = 'name']/string/@value" />)</emphasis>
+      </xsl:otherwise>
+    </xsl:choose>
+  </xsl:template>
+  
   
 </xsl:stylesheet>
-- 
GitLab


From 668c146e33291e933ccfb19fd39fab9cd2b7900d Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 23 Jan 2007 13:44:41 +0000
Subject: [PATCH 0424/5331] * Doh!  Make sure that we put *only* splash_helper
 in the initrd and   not all of splashutils, otherwise we get Glibc in the
 initrd.

svn path=/nixos/trunk/; revision=7771
---
 configuration/rescue-cd.nix    | 10 +++++++--
 doc/manual/manual.xml          |  1 +
 helpers/make-iso9660-image.nix | 33 +++++++++++++++--------------
 helpers/make-iso9660-image.sh  | 38 ++++++++++++++++++++++++++--------
 system/system.nix              |  5 ++++-
 upstart-jobs/nscd.conf         |  5 +++--
 6 files changed, 63 insertions(+), 29 deletions(-)

diff --git a/configuration/rescue-cd.nix b/configuration/rescue-cd.nix
index 661bcdf33a5..52bd0888f7d 100644
--- a/configuration/rescue-cd.nix
+++ b/configuration/rescue-cd.nix
@@ -128,7 +128,8 @@ rec {
   rescueCD = import ../helpers/make-iso9660-image.nix {
     inherit (pkgs) stdenv cdrtools;
     isoName = "nixos.iso";
-    
+
+    # Single files to be copied to fixed locations on the CD.
     contents = [
       { source = pkgs.syslinux + "/lib/syslinux/isolinux.bin";
         target = "isolinux/isolinux.bin";
@@ -153,7 +154,12 @@ rec {
       }
     ];
 
-    init = system.bootStage2;
+    # Closures to be copied to the Nix store on the CD.
+    storeContents = [
+      { object = system.bootStage2;
+        symlink = "/init";
+      }
+    ];
     
     bootable = true;
     bootImage = "isolinux/isolinux.bin";
diff --git a/doc/manual/manual.xml b/doc/manual/manual.xml
index a20c8e93a33..96368ed6876 100644
--- a/doc/manual/manual.xml
+++ b/doc/manual/manual.xml
@@ -19,6 +19,7 @@
     
   </info>
 
+  <xi:include href="installation.xml" />
   <xi:include href="options-db.xml" />
 
 </book>
\ No newline at end of file
diff --git a/helpers/make-iso9660-image.nix b/helpers/make-iso9660-image.nix
index e98de8ffcb4..3cecb6106e5 100644
--- a/helpers/make-iso9660-image.nix
+++ b/helpers/make-iso9660-image.nix
@@ -9,16 +9,12 @@
   # grafted in the file system at path `target'.
   contents
 
-/*
 , # In addition to `contents', the closure of the store paths listed
-  # in `packages' are also placed in the file system.
-  packages ? []
-*/
-
-, # `init' should be a store path, the closure of which is added to
-  # the image, just like `packages'.  However, in addition, a symlink
-  # `/init' to `init' will be created.
-  init ? null
+  # in `packages' are also placed in the Nix store of the CD.  This is
+  # a list of attribute sets {source, target} where `source' if a
+  # store path whose closure will be copied, and `target' is a symlink
+  # to `source' that will be added to the CD.
+  storeContents ? []
 
   # Whether this should be an El-Torito bootable CD.
 , bootable ? false
@@ -34,11 +30,18 @@ stdenv.mkDerivation {
   name = "iso9660-image";
   builder = ./make-iso9660-image.sh;
   buildInputs = [cdrtools];
-  inherit isoName init bootable bootImage;
-  sources = map ({source, target}: source) contents;
-  targets = map ({source, target}: target) contents;
-
-  # For obtaining the closure of `init'.
-  exportReferencesGraph = ["init-closure" init];
+  inherit isoName bootable bootImage;
+
+  # !!! should use XML.
+  sources = map (x: x.source) contents;
+  targets = map (x: x.target) contents;
+
+  # !!! should use XML.
+  objects = map (x: x.object) storeContents;
+  symlinks = map (x: x.symlink) storeContents;
+  
+  # For obtaining the closure of `storeContents'.
+  exportReferencesGraph =
+    map (x: [("closure-" + baseNameOf x.symlink) x.object]) storeContents;
   pathsFromGraph = ./paths-from-graph.sh;
 }
diff --git a/helpers/make-iso9660-image.sh b/helpers/make-iso9660-image.sh
index 9a8bef7416d..1fa04aef7b2 100644
--- a/helpers/make-iso9660-image.sh
+++ b/helpers/make-iso9660-image.sh
@@ -1,26 +1,46 @@
 source $stdenv/setup
 
+sources_=($sources)
+targets_=($targets)
+
+objects=($objects)
+symlinks=($symlinks)
+
+
 if test -n "$bootable"; then
     bootFlags="-b $bootImage -c boot.cat -no-emul-boot -boot-load-size 4"
 fi
 
+
 graftList=
-sources_=($sources)
-targets_=($targets)
 for ((i = 0; i < ${#targets_[@]}; i++)); do
     graftList="$graftList ${targets_[$i]}=$(readlink -f ${sources_[$i]})"
 done
 
-storePaths=$($SHELL $pathsFromGraph ./init-closure)
 
-for i in $storePaths; do
-    graftList="$graftList ${i:1}=$i"
+for ((n = 0; n < ${#objects[*]}; n++)); do
+    object=${objects[$n]}
+    symlink=${symlinks[$n]}
+
+    # Get the paths in the closure of `object'.
+    closure=closure-$(basename $symlink)
+    if ! test -e $closure; then
+        echo 'Your Nix installation is too old! Upgrade to nix-0.11pre7038 or newer.'
+        exit 1
+    fi
+    storePaths=$($SHELL $pathsFromGraph $closure)
+
+    for i in $storePaths; do
+        graftList="$graftList ${i:1}=$i"
+    done
+
+    if test "$symlink" != "none"; then
+        mkdir -p $(dirname ./$symlink)
+        ln -s $object ./$symlink
+        graftList="$graftList $symlink=./$symlink"
+    fi
 done
 
-if test -n "$init"; then
-    ln -s $init init
-    graftList="$graftList init=init"
-fi
 
 # !!! -f is a quick hack.
 ensureDir $out/iso
diff --git a/system/system.nix b/system/system.nix
index 13ecce79c87..b63e48ce201 100644
--- a/system/system.nix
+++ b/system/system.nix
@@ -92,7 +92,10 @@ rec {
         symlink = "/init";
       }
     ] ++ (if config.get ["boot" "initrd" "enableSplashScreen"] then [
-      { object = pkgs.splashutils;
+      { object = pkgs.runCommand "splashutils" {} "
+          ensureDir $out/bin
+          cp ${pkgs.splashutils}/bin/splash_helper $out/bin
+        ";
         suffix = "/bin/splash_helper";
         symlink = "/sbin/splash_helper";
       }
diff --git a/upstart-jobs/nscd.conf b/upstart-jobs/nscd.conf
index 786f5fdd8ac..6d0dcacf977 100644
--- a/upstart-jobs/nscd.conf
+++ b/upstart-jobs/nscd.conf
@@ -1,4 +1,5 @@
 server-user             nscd
+threads                 1
 paranoia                no
 debug-level             0
 
@@ -7,7 +8,7 @@ positive-time-to-live   passwd          600
 negative-time-to-live   passwd          20
 suggested-size          passwd          211
 check-files             passwd          yes
-persistent              passwd          yes
+persistent              passwd          no
 shared                  passwd          yes
 
 enable-cache            group           yes
@@ -15,7 +16,7 @@ positive-time-to-live   group           3600
 negative-time-to-live   group           60
 suggested-size          group           211
 check-files             group           yes
-persistent              group           yes
+persistent              group           no
 shared                  group           yes
 
 enable-cache            hosts           yes
-- 
GitLab


From 903a64c87dffab61bdc15e7aed4127585635ca84 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 23 Jan 2007 14:34:44 +0000
Subject: [PATCH 0425/5331] * Some things are best done in Perl.

svn path=/nixos/trunk/; revision=7773
---
 helpers/make-iso9660-image.nix |  8 ++++----
 helpers/make-iso9660-image.sh  | 22 +++++++++-------------
 helpers/paths-from-graph.pl    | 26 ++++++++++++++++++++++++++
 3 files changed, 39 insertions(+), 17 deletions(-)
 create mode 100644 helpers/paths-from-graph.pl

diff --git a/helpers/make-iso9660-image.nix b/helpers/make-iso9660-image.nix
index 3cecb6106e5..c16d5413896 100644
--- a/helpers/make-iso9660-image.nix
+++ b/helpers/make-iso9660-image.nix
@@ -1,4 +1,4 @@
-{ stdenv, cdrtools
+{ stdenv, perl, cdrtools
 
   # The file name of the resulting ISO image.
 , isoName ? "cd.iso"
@@ -29,7 +29,7 @@ assert bootable -> bootImage != "";
 stdenv.mkDerivation {
   name = "iso9660-image";
   builder = ./make-iso9660-image.sh;
-  buildInputs = [cdrtools];
+  buildInputs = [perl cdrtools];
   inherit isoName bootable bootImage;
 
   # !!! should use XML.
@@ -42,6 +42,6 @@ stdenv.mkDerivation {
   
   # For obtaining the closure of `storeContents'.
   exportReferencesGraph =
-    map (x: [("closure-" + baseNameOf x.symlink) x.object]) storeContents;
-  pathsFromGraph = ./paths-from-graph.sh;
+    map (x: [("closure-" + baseNameOf x.object) x.object]) storeContents;
+  pathsFromGraph = ./paths-from-graph.pl;
 }
diff --git a/helpers/make-iso9660-image.sh b/helpers/make-iso9660-image.sh
index 1fa04aef7b2..6ce205adc2a 100644
--- a/helpers/make-iso9660-image.sh
+++ b/helpers/make-iso9660-image.sh
@@ -12,28 +12,24 @@ if test -n "$bootable"; then
 fi
 
 
+# Add the individual files.
 graftList=
 for ((i = 0; i < ${#targets_[@]}; i++)); do
     graftList="$graftList ${targets_[$i]}=$(readlink -f ${sources_[$i]})"
 done
 
 
+# Add the closures of the top-level store objects.
+storePaths=$(perl $pathsFromGraph closure-*)
+for i in $storePaths; do
+    graftList="$graftList ${i:1}=$i"
+done
+
+
+# Add symlinks to the top-level store objects.
 for ((n = 0; n < ${#objects[*]}; n++)); do
     object=${objects[$n]}
     symlink=${symlinks[$n]}
-
-    # Get the paths in the closure of `object'.
-    closure=closure-$(basename $symlink)
-    if ! test -e $closure; then
-        echo 'Your Nix installation is too old! Upgrade to nix-0.11pre7038 or newer.'
-        exit 1
-    fi
-    storePaths=$($SHELL $pathsFromGraph $closure)
-
-    for i in $storePaths; do
-        graftList="$graftList ${i:1}=$i"
-    done
-
     if test "$symlink" != "none"; then
         mkdir -p $(dirname ./$symlink)
         ln -s $object ./$symlink
diff --git a/helpers/paths-from-graph.pl b/helpers/paths-from-graph.pl
new file mode 100644
index 00000000000..a4faa36d00f
--- /dev/null
+++ b/helpers/paths-from-graph.pl
@@ -0,0 +1,26 @@
+use strict;
+
+my %storePaths;
+
+foreach my $graph (@ARGV) {
+    open GRAPH, "<$graph" or die;
+
+    while (<GRAPH>) {
+        chomp;
+        my $storePath = "$_";
+        $storePaths{$storePath} = 1;
+
+        my $deriver = <GRAPH>; chomp $deriver;
+        my $count = <GRAPH>; chomp $count;
+
+        for (my $i = 0; $i < $count; ++$i) {
+            my $ref = <GRAPH>;
+        }
+    }
+    
+    close GRAPH;
+}
+
+foreach my $storePath (sort (keys %storePaths)) {
+    print "$storePath\n";
+}
-- 
GitLab


From d197a0f2cce293f391736ae33c15f2448e52c386 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 23 Jan 2007 14:37:42 +0000
Subject: [PATCH 0426/5331] * Use the Perl version of paths-from-graphs
 everywhere.

svn path=/nixos/trunk/; revision=7774
---
 boot/make-initrd.nix        |  6 +++---
 boot/make-initrd.sh         | 21 +++++++++------------
 helpers/paths-from-graph.sh | 10 ----------
 system/system.nix           |  2 +-
 4 files changed, 13 insertions(+), 26 deletions(-)
 delete mode 100644 helpers/paths-from-graph.sh

diff --git a/boot/make-initrd.nix b/boot/make-initrd.nix
index b737b2f9779..3e5133be08b 100644
--- a/boot/make-initrd.nix
+++ b/boot/make-initrd.nix
@@ -12,12 +12,12 @@
 # `contents = {object = ...; symlink = /init;}' is a typical
 # argument.
 
-{stdenv, cpio, contents}:
+{stdenv, perl, cpio, contents}:
 
 stdenv.mkDerivation {
   name = "initrd";
   builder = ./make-initrd.sh;
-  buildInputs = [cpio];
+  buildInputs = [perl cpio];
 
   # !!! should use XML.
   objects = map (x: x.object) contents;
@@ -27,5 +27,5 @@ stdenv.mkDerivation {
   # For obtaining the closure of `contents'.
   exportReferencesGraph =
     map (x: [("closure-" + baseNameOf x.symlink) x.object]) contents;
-  pathsFromGraph = ../helpers/paths-from-graph.sh;
+  pathsFromGraph = ../helpers/paths-from-graph.pl;
 }
diff --git a/boot/make-initrd.sh b/boot/make-initrd.sh
index 45ee036e4e8..d930e51a03f 100644
--- a/boot/make-initrd.sh
+++ b/boot/make-initrd.sh
@@ -20,23 +20,20 @@ for ((n = 0; n < ${#objects[*]}; n++)); do
     suffix=${suffices[$n]}
     if test "$suffix" = none; then suffix=; fi
 
-    # Get the paths in the closure of `object'.
-    closure=closure-$(basename $symlink)
-    if ! test -e $closure; then
-        echo 'Your Nix installation is too old! Upgrade to nix-0.11pre7038 or newer.'
-        exit 1
-    fi
-    storePaths=$($SHELL $pathsFromGraph $closure)
-
-    # Paths in cpio archives *must* be relative, otherwise the kernel
-    # won't unpack 'em.
-    (cd root && cp -prd --parents $storePaths .)
-
     mkdir -p $(dirname root/$symlink)
     ln -s $object$suffix root/$symlink
 done
 
 
+# Get the paths in the closure of `object'.
+storePaths=$(perl $pathsFromGraph closure-*)
+
+
+# Paths in cpio archives *must* be relative, otherwise the kernel
+# won't unpack 'em.
+(cd root && cp -prd --parents $storePaths .)
+
+
 # Put the closure in a gzipped cpio archive.
 ensureDir $out
 (cd root && find * -print0 | cpio -ov -H newc --null | gzip -9 > $out/initrd)
diff --git a/helpers/paths-from-graph.sh b/helpers/paths-from-graph.sh
deleted file mode 100644
index 4a134cb3165..00000000000
--- a/helpers/paths-from-graph.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-graph="$1"
-
-while read storePath; do
-    echo $storePath
-    read deriver
-    read count
-    for ((i = 0; i < $count; i++)); do
-        read ref
-    done
-done < $graph
diff --git a/system/system.nix b/system/system.nix
index b63e48ce201..4f272d8d7a5 100644
--- a/system/system.nix
+++ b/system/system.nix
@@ -86,7 +86,7 @@ rec {
   # The closure of the init script of boot stage 1 is what we put in
   # the initial RAM disk.
   initialRamdisk = import ../boot/make-initrd.nix {
-    inherit (pkgs) stdenv cpio;
+    inherit (pkgs) perl stdenv cpio;
     contents = [
       { object = bootStage1;
         symlink = "/init";
-- 
GitLab


From 2554337f826add1005eaacd7aec17a3eaa2eb563 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 23 Jan 2007 14:38:15 +0000
Subject: [PATCH 0427/5331] * Put the closure of stdenv on the CD to speed up
 the installation.

svn path=/nixos/trunk/; revision=7775
---
 configuration/rescue-cd.nix | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/configuration/rescue-cd.nix b/configuration/rescue-cd.nix
index 52bd0888f7d..72d3bcad380 100644
--- a/configuration/rescue-cd.nix
+++ b/configuration/rescue-cd.nix
@@ -126,7 +126,7 @@ rec {
   # kernel, the initrd produced above, and the closure of the stage 2
   # init.
   rescueCD = import ../helpers/make-iso9660-image.nix {
-    inherit (pkgs) stdenv cdrtools;
+    inherit (pkgs) stdenv perl cdrtools;
     isoName = "nixos.iso";
 
     # Single files to be copied to fixed locations on the CD.
@@ -159,6 +159,10 @@ rec {
       { object = system.bootStage2;
         symlink = "/init";
       }
+      # To speed up the installation, provide the full stdenv.
+      { object = pkgs.stdenv;
+        symlink = "none";
+      }
     ];
     
     bootable = true;
-- 
GitLab


From d883483a0eac031292bad64e80d1a08636cba0a6 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 23 Jan 2007 15:07:30 +0000
Subject: [PATCH 0428/5331] * Use paths-from-graph.pl.

svn path=/nixos/trunk/; revision=7776
---
 installer/nixos-installer.nix | 6 +++---
 installer/nixos-installer.sh  | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/installer/nixos-installer.nix b/installer/nixos-installer.nix
index fd77c713c21..ab1cd1d4627 100644
--- a/installer/nixos-installer.nix
+++ b/installer/nixos-installer.nix
@@ -1,4 +1,4 @@
-{ stdenv, runCommand, substituteAll, nix
+{ stdenv, perl, runCommand, substituteAll, nix
 , # URL of the Nixpkgs distribution that the installer will pull.
   # Leave empty for a pure source distribution.
   nixpkgsURL ? ""
@@ -8,9 +8,9 @@ substituteAll {
   src = ./nixos-installer.sh;
   dir = "bin";
   isExecutable = true;
-  inherit nix nixpkgsURL;
+  inherit nix nixpkgsURL perl;
 
-  pathsFromGraph = ../helpers/paths-from-graph.sh;
+  pathsFromGraph = ../helpers/paths-from-graph.pl;
 
   nixClosure = runCommand "closure"
     {exportReferencesGraph = ["refs" nix];}
diff --git a/installer/nixos-installer.sh b/installer/nixos-installer.sh
index 5e260128813..16797ea6c32 100644
--- a/installer/nixos-installer.sh
+++ b/installer/nixos-installer.sh
@@ -54,7 +54,7 @@ mount --bind /sys $mountPoint/sys
 cleanup() {
     # !!! don't umount any we didn't mount ourselves
     for i in $(grep -F "$mountPoint" /proc/mounts \
-        | perl -e 'while (<>) { /^\S+\s+(\S+)\s+/; print "$1\n"; }' \
+        | @perl@/bin/perl -e 'while (<>) { /^\S+\s+(\S+)\s+/; print "$1\n"; }' \
         | sort -r);
     do
         umount $i
@@ -83,7 +83,7 @@ mkdir -m 1777 -p \
 
 
 # Get the store paths to copy from the references graph.
-storePaths=$(@shell@ @pathsFromGraph@ @nixClosure@)
+storePaths=$(@perl@/bin/perl @pathsFromGraph@ @nixClosure@)
 
 # Copy Nix to the Nix store on the target device.
 echo "copying Nix to $mountPoint...."
-- 
GitLab


From 995b749f70c22640682e449d7f386221105e7a42 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 23 Jan 2007 15:08:00 +0000
Subject: [PATCH 0429/5331] * Put a nix-pull manifest of the Nix store on the
 CD.

svn path=/nixos/trunk/; revision=7777
---
 helpers/make-iso9660-image.sh |  4 ++++
 helpers/paths-from-graph.pl   | 32 +++++++++++++++++++++++++++++---
 system/system.nix             |  2 +-
 3 files changed, 34 insertions(+), 4 deletions(-)

diff --git a/helpers/make-iso9660-image.sh b/helpers/make-iso9660-image.sh
index 6ce205adc2a..00ce36b8a77 100644
--- a/helpers/make-iso9660-image.sh
+++ b/helpers/make-iso9660-image.sh
@@ -26,6 +26,10 @@ for i in $storePaths; do
 done
 
 
+# Also put a nix-pull manifest of the closures on the CD.
+printManifest=1 perl $pathsFromGraph closure-* > MANIFEST
+
+
 # Add symlinks to the top-level store objects.
 for ((n = 0; n < ${#objects[*]}; n++)); do
     object=${objects[$n]}
diff --git a/helpers/paths-from-graph.pl b/helpers/paths-from-graph.pl
index a4faa36d00f..522c86be2d9 100644
--- a/helpers/paths-from-graph.pl
+++ b/helpers/paths-from-graph.pl
@@ -1,6 +1,7 @@
 use strict;
 
 my %storePaths;
+my %refs;
 
 foreach my $graph (@ARGV) {
     open GRAPH, "<$graph" or die;
@@ -13,14 +14,39 @@ foreach my $graph (@ARGV) {
         my $deriver = <GRAPH>; chomp $deriver;
         my $count = <GRAPH>; chomp $count;
 
+        my @refs = ();
         for (my $i = 0; $i < $count; ++$i) {
-            my $ref = <GRAPH>;
+            my $ref = <GRAPH>; chomp $ref;
+            push @refs, $ref;
         }
+        $refs{$storePath} = \@refs;
+        
     }
     
     close GRAPH;
 }
 
-foreach my $storePath (sort (keys %storePaths)) {
-    print "$storePath\n";
+
+if ($ENV{"printManifest"} eq "1") {
+    print "version {\n";
+    print "  ManifestVersion: 3\n";
+    print "}\n";
+
+    foreach my $storePath (sort (keys %storePaths)) {
+        print "{\n";
+        print "  StorePath: $storePath\n";
+        print "  CopyFrom: /tmp/inst-store$storePath\n";
+        print "  References: ";
+        foreach my $ref (@{$refs{$storePath}}) {
+            print "$ref ";
+        }
+        print "\n";
+        print "}\n";
+    }
+}
+
+else {
+    foreach my $storePath (sort (keys %storePaths)) {
+        print "$storePath\n";
+    }
 }
diff --git a/system/system.nix b/system/system.nix
index 4f272d8d7a5..7587c7fa831 100644
--- a/system/system.nix
+++ b/system/system.nix
@@ -111,7 +111,7 @@ rec {
 
   # The installer.
   nixosInstaller = import ../installer/nixos-installer.nix {
-    inherit (pkgs) stdenv runCommand substituteAll;
+    inherit (pkgs) stdenv perl runCommand substituteAll;
     inherit nix;
     nixpkgsURL = config.get ["installer" "nixpkgsURL"];
   };
-- 
GitLab


From c56d3a8ce40da5b103c8884bd8a6121f8f4ad514 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 23 Jan 2007 16:48:27 +0000
Subject: [PATCH 0430/5331] * Actually put the manifest on the CD.

svn path=/nixos/trunk/; revision=7780
---
 helpers/make-iso9660-image.sh | 1 +
 helpers/paths-from-graph.pl   | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/helpers/make-iso9660-image.sh b/helpers/make-iso9660-image.sh
index 00ce36b8a77..910417cde47 100644
--- a/helpers/make-iso9660-image.sh
+++ b/helpers/make-iso9660-image.sh
@@ -28,6 +28,7 @@ done
 
 # Also put a nix-pull manifest of the closures on the CD.
 printManifest=1 perl $pathsFromGraph closure-* > MANIFEST
+graftList="$graftList MANIFEST=MANIFEST"
 
 
 # Add symlinks to the top-level store objects.
diff --git a/helpers/paths-from-graph.pl b/helpers/paths-from-graph.pl
index 522c86be2d9..a5ef9c63916 100644
--- a/helpers/paths-from-graph.pl
+++ b/helpers/paths-from-graph.pl
@@ -33,7 +33,7 @@ if ($ENV{"printManifest"} eq "1") {
     print "}\n";
 
     foreach my $storePath (sort (keys %storePaths)) {
-        print "{\n";
+        print "localPath {\n";
         print "  StorePath: $storePath\n";
         print "  CopyFrom: /tmp/inst-store$storePath\n";
         print "  References: ";
-- 
GitLab


From 241b28d1014d94ba765e08a6e3209c24140570a8 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 23 Jan 2007 17:17:10 +0000
Subject: [PATCH 0431/5331] * Register everything in the Nix store on the
 installation CD as a   substitute to speed up installation.

svn path=/nixos/trunk/; revision=7783
---
 helpers/paths-from-graph.pl  |  4 +++-
 installer/nixos-installer.sh | 18 +++++++++++-------
 2 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/helpers/paths-from-graph.pl b/helpers/paths-from-graph.pl
index a5ef9c63916..bede974cb76 100644
--- a/helpers/paths-from-graph.pl
+++ b/helpers/paths-from-graph.pl
@@ -1,4 +1,5 @@
 use strict;
+use File::Basename;
 
 my %storePaths;
 my %refs;
@@ -33,9 +34,10 @@ if ($ENV{"printManifest"} eq "1") {
     print "}\n";
 
     foreach my $storePath (sort (keys %storePaths)) {
+        my $base = basename $storePath;
         print "localPath {\n";
         print "  StorePath: $storePath\n";
-        print "  CopyFrom: /tmp/inst-store$storePath\n";
+        print "  CopyFrom: /tmp/inst-store/$base\n";
         print "  References: ";
         foreach my $ref (@{$refs{$storePath}}) {
             print "$ref ";
diff --git a/installer/nixos-installer.sh b/installer/nixos-installer.sh
index 16797ea6c32..0032cce3507 100644
--- a/installer/nixos-installer.sh
+++ b/installer/nixos-installer.sh
@@ -113,20 +113,24 @@ mkdir -m 0755 -p $mountPoint/etc
 cp /etc/resolv.conf $mountPoint/etc/
 
 
+# Pull the manifest on the CD so that everything in the Nix store on
+# the CD can be copied directly.
+echo "registering substitutes to speed up builds..."
+chroot $mountPoint @nix@/bin/nix-store --clear-substitutes
+chroot $mountPoint @nix@/bin/nix-pull /mnt/MANIFEST
+rm -f $mountPoint/tmp/inst-store
+ln -s /mnt/nix/store $mountPoint/tmp/inst-store
+
+
 # Do a nix-pull to speed up building.
 if test -n "@nixpkgsURL@"; then
-    chroot $mountPoint @nix@/bin/nix-pull @nixpkgsURL@/MANIFEST
+    chroot $mountPoint @nix@/bin/nix-pull @nixpkgsURL@/MANIFEST || true
 fi
 
 
 # Build the specified Nix expression in the target store and install
 # it into the system configuration profile.
-
-#rm -rf $mountPoint/scratch
-#mkdir $mountPoint/scratch
-#curl $nixpkgsURL/nixexprs.tar.bz2 | tar xj -C $mountPoint/scratch
-#nixpkgsName=$(cd $mountPoint/scratch && ls)
-
+echo "building the system configuration..."
 chroot $mountPoint @nix@/bin/nix-env \
     -p /nix/var/nix/profiles/system \
     -f "/mnt$nixosDir/system/system.nix" \
-- 
GitLab


From 0685f2495795e65d462df84c7c86b677b346dc21 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 23 Jan 2007 20:09:06 +0000
Subject: [PATCH 0432/5331] svn path=/nixos/trunk/; revision=7786

---
 configuration/rescue-cd.nix  | 4 ++--
 installer/nixos-installer.sh | 4 ++--
 upstart-jobs/swraid.nix      | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/configuration/rescue-cd.nix b/configuration/rescue-cd.nix
index 72d3bcad380..e580343baad 100644
--- a/configuration/rescue-cd.nix
+++ b/configuration/rescue-cd.nix
@@ -1,7 +1,7 @@
 rec {
 
   
-  nixpkgsRel = "nixpkgs-0.11pre7628";
+  nixpkgsRel = "nixpkgs-0.11pre7785";
 
 
   configuration = {
@@ -106,7 +106,7 @@ rec {
   # Get a recent copy of Nixpkgs.
   nixpkgsTarball = pkgs.fetchurl {
     url = configuration.installer.nixpkgsURL + "/" + nixpkgsRel + ".tar.bz2";
-    md5 = "e7fe1793e69ff5072eb5987e7b7ccd47";
+    md5 = "0f554f092d94cc2cb7fe1e5c09f26adc";
   };
 
 
diff --git a/installer/nixos-installer.sh b/installer/nixos-installer.sh
index 0032cce3507..ac62d81bd13 100644
--- a/installer/nixos-installer.sh
+++ b/installer/nixos-installer.sh
@@ -20,7 +20,7 @@ nixosDir="$2"
 configuration="$3"
 
 if test -z "$mountPoint" -o -z "$nixosDir" -o -z "$configuration"; then
-    echo "Syntax: installer.sh <targetRootDir> <nixosDir> <configuration>"
+    echo "Syntax: nixos-installer.sh <targetRootDir> <nixosDir> <configuration>"
     exit 1
 fi
 
@@ -117,7 +117,7 @@ cp /etc/resolv.conf $mountPoint/etc/
 # the CD can be copied directly.
 echo "registering substitutes to speed up builds..."
 chroot $mountPoint @nix@/bin/nix-store --clear-substitutes
-chroot $mountPoint @nix@/bin/nix-pull /mnt/MANIFEST
+chroot $mountPoint @nix@/bin/nix-pull file:///mnt/MANIFEST
 rm -f $mountPoint/tmp/inst-store
 ln -s /mnt/nix/store $mountPoint/tmp/inst-store
 
diff --git a/upstart-jobs/swraid.nix b/upstart-jobs/swraid.nix
index f62bccbf967..3a3328eb1f0 100644
--- a/upstart-jobs/swraid.nix
+++ b/upstart-jobs/swraid.nix
@@ -2,7 +2,7 @@
 
 let
 
-  tempConf = "/var/state/mdadm.conf";
+  tempConf = "/var/run/mdadm.conf";
 
 in
   
-- 
GitLab


From a1f512ede348aed01d27053253a1c0a25de9cafc Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 24 Jan 2007 11:50:38 +0000
Subject: [PATCH 0433/5331] * Another example: NixOS on x86_64 on a USB stick.

svn path=/nixos/trunk/; revision=7787
---
 configuration/examples/x86_64-usbstick.nix | 27 ++++++++++++++++++++++
 1 file changed, 27 insertions(+)
 create mode 100644 configuration/examples/x86_64-usbstick.nix

diff --git a/configuration/examples/x86_64-usbstick.nix b/configuration/examples/x86_64-usbstick.nix
new file mode 100644
index 00000000000..0ce79ae86dc
--- /dev/null
+++ b/configuration/examples/x86_64-usbstick.nix
@@ -0,0 +1,27 @@
+# Configuration file used to install NixOS-x86_64 on a USB stick.
+
+{
+  boot = {
+    grubDevice = "/dev/sda";
+    initrd = {
+      extraKernelModules = ["usb_storage" "ehci_hcd" "ohci_hcd"];
+      enableSplashScreen = false;
+    };
+  };
+
+  fileSystems = [
+    { mountPoint = "/";
+      label = "nixos-usb";
+    }
+  ];
+
+  services = {
+    ttyBackgrounds = {
+      enable = false;
+    };
+  };
+
+  fonts = {
+    enableFontConfig = false;
+  };
+}
-- 
GitLab


From b01ef924375332b3cf8842d17fff24c4116b637f Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 26 Jan 2007 15:32:49 +0000
Subject: [PATCH 0434/5331] * Use pam_env to set the PATH for SSH logins.  This
 allows   non-interactive ssh sessions (such as "ssh host command") to work  
 properly.  This should probably be used for other kinds of logins as   well.

svn path=/nixos/trunk/; revision=7799
---
 system/etc.nix        | 6 ++++++
 system/etc/pam.d/sshd | 1 +
 2 files changed, 7 insertions(+)

diff --git a/system/etc.nix b/system/etc.nix
index 8d023dff05c..029f651c5e2 100644
--- a/system/etc.nix
+++ b/system/etc.nix
@@ -5,6 +5,10 @@ let
   optional = option: file:
     if config.get option then [file] else [];
 
+  defaultEnv = pkgs.writeText "environment" "
+    PATH=${systemPath}/bin:${systemPath}/sbin
+  ";
+
 in
     
 import ../helpers/make-etc.nix {
@@ -98,6 +102,7 @@ import ../helpers/make-etc.nix {
           pkgs.xorg.fontbh100dpi
           pkgs.xorg.fontbhlucidatypewriter100dpi
           pkgs.ttf_bitstream_vera
+          pkgs.corefonts
           pkgs.freefont_ttf
         ];
         buildInputs = [pkgs.libxslt];
@@ -130,6 +135,7 @@ import ../helpers/make-etc.nix {
             then pkgs.pam_ldap
             else "/no-such-path";
           inherit (pkgs.xorg) xauth;
+          inherit defaultEnv;
         };
         target = "pam.d/" + program;
       }
diff --git a/system/etc/pam.d/sshd b/system/etc/pam.d/sshd
index c3fad16bbef..e77a987ea2a 100644
--- a/system/etc/pam.d/sshd
+++ b/system/etc/pam.d/sshd
@@ -2,3 +2,4 @@ auth     include        common-auth
 account  include        common-account
 password include        common-password
 session  include        common-session
+session  optional       pam_env.so envfile=@defaultEnv@
-- 
GitLab


From b0b776c04ac67bacbda0242e247c6bbf20457b97 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 30 Jan 2007 12:49:18 +0000
Subject: [PATCH 0435/5331] * Add support for USB keyboards in stage 1.

svn path=/nixos/trunk/; revision=7811
---
 system/options.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/system/options.nix b/system/options.nix
index 2bef61323d4..28cfd0a85d9 100644
--- a/system/options.nix
+++ b/system/options.nix
@@ -132,6 +132,11 @@
       "ide-disk"
       "ide-generic"
       "ext3"
+      # Support USB keyboards, in case the boot fails and we only have
+      # a USB keyboard.
+      "ehci_hcd"
+      "ohci_hcd"
+      "usbhid"
     ];
     description = "
       The set of kernel modules in the initial ramdisk used during the
-- 
GitLab


From 2c41edd1bc5a6079fa301fddf74b8bf62b1d82f0 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 30 Jan 2007 14:58:04 +0000
Subject: [PATCH 0436/5331] * Turn on pam_env for everything.

svn path=/nixos/trunk/; revision=7817
---
 system/etc.nix                  | 4 ++--
 system/etc/pam.d/common-session | 1 +
 system/etc/pam.d/sshd           | 1 -
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/system/etc.nix b/system/etc.nix
index 029f651c5e2..953cdc96498 100644
--- a/system/etc.nix
+++ b/system/etc.nix
@@ -5,7 +5,7 @@ let
   optional = option: file:
     if config.get option then [file] else [];
 
-  defaultEnv = pkgs.writeText "environment" "
+  envConf = pkgs.writeText "environment" "
     PATH=${systemPath}/bin:${systemPath}/sbin
   ";
 
@@ -135,7 +135,7 @@ import ../helpers/make-etc.nix {
             then pkgs.pam_ldap
             else "/no-such-path";
           inherit (pkgs.xorg) xauth;
-          inherit defaultEnv;
+          inherit envConf;
         };
         target = "pam.d/" + program;
       }
diff --git a/system/etc/pam.d/common-session b/system/etc/pam.d/common-session
index 434fe930f77..971774033f0 100644
--- a/system/etc/pam.d/common-session
+++ b/system/etc/pam.d/common-session
@@ -1,2 +1,3 @@
 auth     optional       @pam_ldap@/lib/security/pam_ldap.so 
 session  required       @pam_unix2@/lib/security/pam_unix2.so
+session  optional       pam_env.so envfile=@envConf@
diff --git a/system/etc/pam.d/sshd b/system/etc/pam.d/sshd
index e77a987ea2a..c3fad16bbef 100644
--- a/system/etc/pam.d/sshd
+++ b/system/etc/pam.d/sshd
@@ -2,4 +2,3 @@ auth     include        common-auth
 account  include        common-account
 password include        common-password
 session  include        common-session
-session  optional       pam_env.so envfile=@defaultEnv@
-- 
GitLab


From 6fcd79d2ce6ece8c089a4237e88bb782b1a71dab Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 30 Jan 2007 15:03:43 +0000
Subject: [PATCH 0437/5331] * Merge the common-* files.

svn path=/nixos/trunk/; revision=7818
---
 system/etc.nix                   |  5 +----
 system/etc/pam.d/common          | 13 +++++++++++++
 system/etc/pam.d/common-account  |  2 --
 system/etc/pam.d/common-auth     |  3 ---
 system/etc/pam.d/common-password |  2 --
 system/etc/pam.d/common-session  |  3 ---
 system/etc/pam.d/login           |  8 ++++----
 system/etc/pam.d/passwd          |  8 ++++----
 system/etc/pam.d/sshd            |  8 ++++----
 system/etc/pam.d/su              |  8 ++++----
 10 files changed, 30 insertions(+), 30 deletions(-)
 create mode 100644 system/etc/pam.d/common
 delete mode 100644 system/etc/pam.d/common-account
 delete mode 100644 system/etc/pam.d/common-auth
 delete mode 100644 system/etc/pam.d/common-password
 delete mode 100644 system/etc/pam.d/common-session

diff --git a/system/etc.nix b/system/etc.nix
index 953cdc96498..a5482827d02 100644
--- a/system/etc.nix
+++ b/system/etc.nix
@@ -148,10 +148,7 @@ import ../helpers/make-etc.nix {
       "shadow"
       "sshd"
       "useradd"
-      "common-auth"
-      "common-account"
-      "common-password"
-      "common-session"
+      "common"
     ]
   );
 }
\ No newline at end of file
diff --git a/system/etc/pam.d/common b/system/etc/pam.d/common
new file mode 100644
index 00000000000..ad460a0feb9
--- /dev/null
+++ b/system/etc/pam.d/common
@@ -0,0 +1,13 @@
+auth     sufficient     @pam_ldap@/lib/security/pam_ldap.so 
+auth     sufficient     @pam_unix2@/lib/security/pam_unix2.so
+auth     required       pam_deny.so
+
+account  optional       @pam_ldap@/lib/security/pam_ldap.so 
+account  required       @pam_unix2@/lib/security/pam_unix2.so
+
+password sufficient     @pam_ldap@/lib/security/pam_ldap.so 
+password sufficient     @pam_unix2@/lib/security/pam_unix2.so nullok
+
+session  optional       @pam_ldap@/lib/security/pam_ldap.so 
+session  required       @pam_unix2@/lib/security/pam_unix2.so
+session  optional       pam_env.so envfile=@envConf@
diff --git a/system/etc/pam.d/common-account b/system/etc/pam.d/common-account
deleted file mode 100644
index 50d0a58134f..00000000000
--- a/system/etc/pam.d/common-account
+++ /dev/null
@@ -1,2 +0,0 @@
-account  optional       @pam_ldap@/lib/security/pam_ldap.so 
-account  required       @pam_unix2@/lib/security/pam_unix2.so
diff --git a/system/etc/pam.d/common-auth b/system/etc/pam.d/common-auth
deleted file mode 100644
index ec5d5d889a5..00000000000
--- a/system/etc/pam.d/common-auth
+++ /dev/null
@@ -1,3 +0,0 @@
-auth     sufficient     @pam_ldap@/lib/security/pam_ldap.so 
-auth     sufficient     @pam_unix2@/lib/security/pam_unix2.so
-auth     required       pam_deny.so
diff --git a/system/etc/pam.d/common-password b/system/etc/pam.d/common-password
deleted file mode 100644
index f0ec89f1291..00000000000
--- a/system/etc/pam.d/common-password
+++ /dev/null
@@ -1,2 +0,0 @@
-password sufficient     @pam_ldap@/lib/security/pam_ldap.so 
-password sufficient     @pam_unix2@/lib/security/pam_unix2.so nullok
diff --git a/system/etc/pam.d/common-session b/system/etc/pam.d/common-session
deleted file mode 100644
index 971774033f0..00000000000
--- a/system/etc/pam.d/common-session
+++ /dev/null
@@ -1,3 +0,0 @@
-auth     optional       @pam_ldap@/lib/security/pam_ldap.so 
-session  required       @pam_unix2@/lib/security/pam_unix2.so
-session  optional       pam_env.so envfile=@envConf@
diff --git a/system/etc/pam.d/login b/system/etc/pam.d/login
index c3fad16bbef..50f3cc5ce60 100644
--- a/system/etc/pam.d/login
+++ b/system/etc/pam.d/login
@@ -1,4 +1,4 @@
-auth     include        common-auth
-account  include        common-account
-password include        common-password
-session  include        common-session
+auth     include        common
+account  include        common
+password include        common
+session  include        common
diff --git a/system/etc/pam.d/passwd b/system/etc/pam.d/passwd
index c3fad16bbef..50f3cc5ce60 100644
--- a/system/etc/pam.d/passwd
+++ b/system/etc/pam.d/passwd
@@ -1,4 +1,4 @@
-auth     include        common-auth
-account  include        common-account
-password include        common-password
-session  include        common-session
+auth     include        common
+account  include        common
+password include        common
+session  include        common
diff --git a/system/etc/pam.d/sshd b/system/etc/pam.d/sshd
index c3fad16bbef..50f3cc5ce60 100644
--- a/system/etc/pam.d/sshd
+++ b/system/etc/pam.d/sshd
@@ -1,4 +1,4 @@
-auth     include        common-auth
-account  include        common-account
-password include        common-password
-session  include        common-session
+auth     include        common
+account  include        common
+password include        common
+session  include        common
diff --git a/system/etc/pam.d/su b/system/etc/pam.d/su
index ca777155cc6..ad62e2241b7 100644
--- a/system/etc/pam.d/su
+++ b/system/etc/pam.d/su
@@ -1,6 +1,6 @@
 auth     sufficient     pam_rootok.so
-auth     include        common-auth
-account  include        common-account
-password include        common-password
-session  include        common-session
+auth     include        common
+account  include        common
+password include        common
+session  include        common
 session  optional       pam_xauth.so xauthpath=@xauth@/bin/xauth systemuser=99
-- 
GitLab


From 4b7e9b54017aadf66c71028a2d6059af29961e2d Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 5 Feb 2007 15:12:47 +0000
Subject: [PATCH 0438/5331] * Instructions on testing the installer without
 having to make an ISO   / burn a CD, namely by making a loopback target file
 system. * Installer: continue if the MANIFEST on the CD is missing (useful if
   we're not actually installing from a CD).

svn path=/nixos/trunk/; revision=7843
---
 README                        | 8 ++++++++
 doc/manual/Makefile           | 2 +-
 installer/nixos-installer.nix | 1 +
 installer/nixos-installer.sh  | 4 +++-
 4 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/README b/README
index 1a0e9df24c4..4175c303360 100644
--- a/README
+++ b/README
@@ -128,3 +128,11 @@ To get out of maintenance mode:
       -A ATTR
 
   where ATTR is an attribute in system/system.nix (e.g., bootStage1).
+
+- Testing the installer:
+
+  $ dd if=/dev/zero of=diskimage seek=2G count=0 bs=1
+  $ yes | mke2fs -j diskimage
+  $ mount -o loop diskimage /mnt
+  $ nixos-installer /mnt /etc/nixos/nixos/ /etc/nixos/configuration.nix
+
diff --git a/doc/manual/Makefile b/doc/manual/Makefile
index a8c2456c46d..c6998f6e8e5 100644
--- a/doc/manual/Makefile
+++ b/doc/manual/Makefile
@@ -10,7 +10,7 @@ XSLTPROC = xsltproc --catalogs \
 
 docbookxsl = $(HOME)/.nix-profile/xml/xsl/docbook
 
-manual.html: manual.xml options-db.xml
+manual.html: *.xml options-db.xml
 	$(XSLTPROC) --nonet --xinclude --output $@ \
 	  $(docbookxsl)/html/docbook.xsl manual.xml
 
diff --git a/installer/nixos-installer.nix b/installer/nixos-installer.nix
index ab1cd1d4627..66320e51c34 100644
--- a/installer/nixos-installer.nix
+++ b/installer/nixos-installer.nix
@@ -5,6 +5,7 @@
 }:
 
 substituteAll {
+  name = "nixos-installer";
   src = ./nixos-installer.sh;
   dir = "bin";
   isExecutable = true;
diff --git a/installer/nixos-installer.sh b/installer/nixos-installer.sh
index ac62d81bd13..73f654716eb 100644
--- a/installer/nixos-installer.sh
+++ b/installer/nixos-installer.sh
@@ -117,7 +117,9 @@ cp /etc/resolv.conf $mountPoint/etc/
 # the CD can be copied directly.
 echo "registering substitutes to speed up builds..."
 chroot $mountPoint @nix@/bin/nix-store --clear-substitutes
-chroot $mountPoint @nix@/bin/nix-pull file:///mnt/MANIFEST
+if test -e /mnt/MANIFEST; then
+    chroot $mountPoint @nix@/bin/nix-pull file:///mnt/MANIFEST
+fi
 rm -f $mountPoint/tmp/inst-store
 ln -s /mnt/nix/store $mountPoint/tmp/inst-store
 
-- 
GitLab


From 82067ff5bd49723dfc5381ab761061afc0c1f7ba Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 5 Feb 2007 15:20:39 +0000
Subject: [PATCH 0439/5331] * Better instructions.

svn path=/nixos/trunk/; revision=7844
---
 README                      | 3 ++-
 configuration/rescue-cd.nix | 4 ++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/README b/README
index 4175c303360..b9304886b7d 100644
--- a/README
+++ b/README
@@ -131,8 +131,9 @@ To get out of maintenance mode:
 
 - Testing the installer:
 
+  $ nix-build configuration/rescue-cd.nix -A system.nixosInstaller
   $ dd if=/dev/zero of=diskimage seek=2G count=0 bs=1
   $ yes | mke2fs -j diskimage
   $ mount -o loop diskimage /mnt
-  $ nixos-installer /mnt /etc/nixos/nixos/ /etc/nixos/configuration.nix
+  $ ./result/bin/nixos-installer /mnt /etc/nixos/nixos/ /etc/nixos/configuration.nix
 
diff --git a/configuration/rescue-cd.nix b/configuration/rescue-cd.nix
index e580343baad..27a906716a8 100644
--- a/configuration/rescue-cd.nix
+++ b/configuration/rescue-cd.nix
@@ -1,7 +1,7 @@
 rec {
 
   
-  nixpkgsRel = "nixpkgs-0.11pre7785";
+  nixpkgsRel = "nixpkgs-0.11pre7834";
 
 
   configuration = {
@@ -106,7 +106,7 @@ rec {
   # Get a recent copy of Nixpkgs.
   nixpkgsTarball = pkgs.fetchurl {
     url = configuration.installer.nixpkgsURL + "/" + nixpkgsRel + ".tar.bz2";
-    md5 = "0f554f092d94cc2cb7fe1e5c09f26adc";
+    md5 = "844df61d5a1d02ca7de7af691a6279b5";
   };
 
 
-- 
GitLab


From 4f640752152b5b446ed9eb8bb4f73eeda74f2f21 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 5 Feb 2007 15:52:55 +0000
Subject: [PATCH 0440/5331] * Installer: defaults for all arguments.  The NixOS
 sources are   assumed to be in /etc/nixos/nixos and the system configuration
 in   /etc/nixos/configuration.nix.  This is overridable through a few  
 environment variables. * Installer: check that the mount point does in fact
 have a file   system mounted on it (so that we don't install in an empty
 /mnt),   and don't unmount afterwards for symmetry.

svn path=/nixos/trunk/; revision=7845
---
 installer/nixos-installer.sh | 50 ++++++++++++++++++++----------------
 1 file changed, 28 insertions(+), 22 deletions(-)

diff --git a/installer/nixos-installer.sh b/installer/nixos-installer.sh
index 73f654716eb..5b7277511c2 100644
--- a/installer/nixos-installer.sh
+++ b/installer/nixos-installer.sh
@@ -1,47 +1,51 @@
 #! @shell@
 
-# Syntax: installer.sh <DEVICE> <NIX-EXPR>
-# (e.g., installer.sh /mnt/root ./my-machine.nix)
-
-# - mount target device
+# - [mount target device] <- currently disabled
 # - make Nix store etc.
-# - copy closure of rescue env to target device
+# - copy closure of Nix to target device
 # - register validity
-# - start the "target" installer in a chroot to the target device
+# - with a chroot to the target device:
 #   * do a nix-pull
-#   * nix-env -p system-profile -i <nix-expr for the configuration>
-#   * run hook scripts provided by packages in the configuration?
-# - install/update grub
+#   * nix-env -p /nix/var/nix/profiles/system -i <nix-expr for the configuration>
+#   * run the activation script of the configuration (also installs Grub)
 
 set -e
 
-mountPoint="$1"
-nixosDir="$2"
-configuration="$3"
+if test -z "$mountPoint"; then
+    mountPoint=/mnt
+fi
 
-if test -z "$mountPoint" -o -z "$nixosDir" -o -z "$configuration"; then
-    echo "Syntax: nixos-installer.sh <targetRootDir> <nixosDir> <configuration>"
-    exit 1
+if test -z "$nixosDir"; then
+    nixosDir=/etc/nixos/nixos
+fi
+
+if test -z "$nixosConfiguration"; then
+    nixosConfiguration=/etc/nixos/configuration.nix
 fi
 
 if ! test -e "$mountPoint"; then
     echo "mount point $mountPoint doesn't exist"
     exit 1
 fi
+
+if ! fgrep -q " $mountPoint " /proc/mounts; then
+    echo "$mountPoint doesn't appear to be a mount point"
+    exit 1
+fi
     
 if ! test -e "$nixosDir"; then
     echo "NixOS source directory $nixosDir doesn't exist"
     exit 1
 fi
     
-if ! test -e "$configuration"; then
-    echo "configuration file $configuration doesn't exist"
+if ! test -e "$nixosConfiguration"; then
+    echo "configuration file $nixosConfiguration doesn't exist"
     exit 1
 fi
     
 
 nixosDir=$(readlink -f "$nixosDir")
-configuration=$(readlink -f "$configuration")
+nixosConfiguration=$(readlink -f "$nixosConfiguration")
 
 
 # Mount some stuff in the target root directory.
@@ -57,7 +61,9 @@ cleanup() {
         | @perl@/bin/perl -e 'while (<>) { /^\S+\s+(\S+)\s+/; print "$1\n"; }' \
         | sort -r);
     do
-        umount $i
+        if test "$i" != "$mountPoint"; then
+            umount $i
+        fi
     done
 }
 
@@ -136,7 +142,7 @@ echo "building the system configuration..."
 chroot $mountPoint @nix@/bin/nix-env \
     -p /nix/var/nix/profiles/system \
     -f "/mnt$nixosDir/system/system.nix" \
-    --arg configuration "import /mnt$configuration" \
+    --arg configuration "import /mnt$nixosConfiguration" \
     --set -A system
 
 
@@ -146,8 +152,8 @@ mkdir -p $(dirname $targetConfig)
 if test -e $targetConfig -o -L $targetConfig; then
     cp -f $targetConfig $targetConfig.backup-$(date "+%Y%m%d%H%M%S")
 fi
-if test "$configuration" != "$targetConfig"; then
-    cp -f $configuration $targetConfig
+if test "$nixosConfiguration" != "$targetConfig"; then
+    cp -f $nixosConfiguration $targetConfig
 fi
 
 
-- 
GitLab


From 62912813587cfcd6fb1e9902eb50bee14b775210 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 5 Feb 2007 16:23:19 +0000
Subject: [PATCH 0441/5331] * Copy the NixOS/Nixpkgs sources to /etc/nixos on
 the target.

svn path=/nixos/trunk/; revision=7846
---
 installer/nixos-installer.sh | 24 +++++++++++++++++++++++-
 1 file changed, 23 insertions(+), 1 deletion(-)

diff --git a/installer/nixos-installer.sh b/installer/nixos-installer.sh
index 5b7277511c2..aa76ad4bdc5 100644
--- a/installer/nixos-installer.sh
+++ b/installer/nixos-installer.sh
@@ -147,16 +147,38 @@ chroot $mountPoint @nix@/bin/nix-env \
 
 
 # Copy the configuration to /etc/nixos.
+backupTimestamp=$(date "+%Y%m%d%H%M%S")
 targetConfig=$mountPoint/etc/nixos/configuration.nix
 mkdir -p $(dirname $targetConfig)
 if test -e $targetConfig -o -L $targetConfig; then
-    cp -f $targetConfig $targetConfig.backup-$(date "+%Y%m%d%H%M%S")
+    cp -f $targetConfig $targetConfig.backup-$backupTimestamp
 fi
 if test "$nixosConfiguration" != "$targetConfig"; then
     cp -f $nixosConfiguration $targetConfig
 fi
 
 
+# Make a backup of the old NixOS/Nixpkgs sources.
+echo "copying NixOS/Nixpkgs sources to /etc/nixos...."
+
+targetNixos=$mountPoint/etc/nixos/nixos
+if test -e $targetNixos; then
+    mv $targetNixos $targetNixos.backup-$backupTimestamp
+fi
+
+targetNixpkgs=$mountPoint/etc/nixos/nixpkgs
+if test -e $targetNixpkgs; then
+    mv $targetNixpkgs $targetNixpkgs.backup-$backupTimestamp
+fi
+
+
+# Copy the NixOS/Nixpkgs sources to the target.
+cp -prd $nixosDir $targetNixos
+if test -e /etc/nixos/nixpkgs; then
+    cp -prd /etc/nixos/nixpkgs $targetNixpkgs
+fi
+
+
 # Grub needs a mtab.
 rootDevice=$(df $mountPoint | grep '^/' | sed 's^ .*^^')
 echo "$rootDevice / somefs rw 0 0" > $mountPoint/etc/mtab
-- 
GitLab


From ea41e46e6dc66ac30aa767ff4b4d27138597aa5b Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 5 Feb 2007 16:52:13 +0000
Subject: [PATCH 0442/5331] * Unpack the NixOS/Nixpkgs sources automatically
 when booting from the   installation CD.

svn path=/nixos/trunk/; revision=7847
---
 configuration/rescue-cd.nix | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

diff --git a/configuration/rescue-cd.nix b/configuration/rescue-cd.nix
index 27a906716a8..4011191ab66 100644
--- a/configuration/rescue-cd.nix
+++ b/configuration/rescue-cd.nix
@@ -26,9 +26,23 @@ rec {
         enable = false;
       };
 
-      # Allow the user to do something useful on tty8 while waiting
-      # for the installation to finish.
       extraJobs = [
+        # Unpack the NixOS/Nixpkgs sources to /etc/nixos.
+        { name = "unpack-sources";
+          job = "
+            start on startup
+            script
+              mkdir -p /etc/nixos/nixos
+              tar xjf /nixos.tar.bz2 -C /etc/nixos/nixos
+              tar xjf /nixpkgs.tar.bz2 -C /etc/nixos
+              mv /etc/nixos/nixpkgs-* /etc/nixos/nixpkgs
+              ln -sfn ../nixpkgs/pkgs /etc/nixos/nixos/pkgs
+            end script
+          ";
+        }
+      
+        # Allow the user to do something useful on tty8 while waiting
+        # for the installation to finish.
         { name = "rogue";
           job = "
             start on udev
-- 
GitLab


From b674f74c2dbfe219e5829ebf619a67fa5b1dc77e Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 5 Feb 2007 21:06:59 +0000
Subject: [PATCH 0443/5331] * Installer fixes.

svn path=/nixos/trunk/; revision=7848
---
 configuration/rescue-cd.nix  | 1 +
 installer/nixos-installer.sh | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/configuration/rescue-cd.nix b/configuration/rescue-cd.nix
index 4011191ab66..65a99c7bbea 100644
--- a/configuration/rescue-cd.nix
+++ b/configuration/rescue-cd.nix
@@ -32,6 +32,7 @@ rec {
           job = "
             start on startup
             script
+              export PATH=${pkgs.gnutar}/bin:${pkgs.bzip2}/bin:$PATH
               mkdir -p /etc/nixos/nixos
               tar xjf /nixos.tar.bz2 -C /etc/nixos/nixos
               tar xjf /nixpkgs.tar.bz2 -C /etc/nixos
diff --git a/installer/nixos-installer.sh b/installer/nixos-installer.sh
index aa76ad4bdc5..7f0a5dbd77f 100644
--- a/installer/nixos-installer.sh
+++ b/installer/nixos-installer.sh
@@ -28,7 +28,7 @@ if ! test -e "$mountPoint"; then
     exit 1
 fi
 
-if ! fgrep -q " $mountPoint " /proc/mounts; then
+if ! grep -F -q " $mountPoint " /proc/mounts; then
     echo "$mountPoint doesn't appear to be a mount point"
     exit 1
 fi
-- 
GitLab


From ea9a82042c9f0bb65feb639345f3424da2189877 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 5 Feb 2007 21:18:02 +0000
Subject: [PATCH 0444/5331] * Set ownership.

svn path=/nixos/trunk/; revision=7849
---
 configuration/rescue-cd.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/configuration/rescue-cd.nix b/configuration/rescue-cd.nix
index 65a99c7bbea..8ee8708e55f 100644
--- a/configuration/rescue-cd.nix
+++ b/configuration/rescue-cd.nix
@@ -38,6 +38,7 @@ rec {
               tar xjf /nixpkgs.tar.bz2 -C /etc/nixos
               mv /etc/nixos/nixpkgs-* /etc/nixos/nixpkgs
               ln -sfn ../nixpkgs/pkgs /etc/nixos/nixos/pkgs
+              chown -R root.root /etc/nixos
             end script
           ";
         }
-- 
GitLab


From 6c4701f7cc8616989b6ef76b0ea6030a34117ac8 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 6 Feb 2007 10:17:13 +0000
Subject: [PATCH 0445/5331] * Quick hack to get scp to work again.

svn path=/nixos/trunk/; revision=7850
---
 system/etc.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/system/etc.nix b/system/etc.nix
index a5482827d02..792b6b6a489 100644
--- a/system/etc.nix
+++ b/system/etc.nix
@@ -6,8 +6,8 @@ let
     if config.get option then [file] else [];
 
   envConf = pkgs.writeText "environment" "
-    PATH=${systemPath}/bin:${systemPath}/sbin
-  ";
+    PATH=${systemPath}/bin:${systemPath}/sbin:${pkgs.openssh}/bin
+  " /* ${pkgs.openssh}/bin is a hack to get remote scp to work */; 
 
 in
     
-- 
GitLab


From 3481970525d7f962fd1cb2c2a680d797b58e897d Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 6 Feb 2007 10:41:04 +0000
Subject: [PATCH 0446/5331] * Consistent naming.

svn path=/nixos/trunk/; revision=7851
---
 README                       |  2 +-
 installer/nixos-installer.sh | 30 +++++++++++++++---------------
 2 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/README b/README
index b9304886b7d..6cd19f3414b 100644
--- a/README
+++ b/README
@@ -135,5 +135,5 @@ To get out of maintenance mode:
   $ dd if=/dev/zero of=diskimage seek=2G count=0 bs=1
   $ yes | mke2fs -j diskimage
   $ mount -o loop diskimage /mnt
-  $ ./result/bin/nixos-installer /mnt /etc/nixos/nixos/ /etc/nixos/configuration.nix
+  $ ./result/bin/nixos-installer
 
diff --git a/installer/nixos-installer.sh b/installer/nixos-installer.sh
index 7f0a5dbd77f..3ee54fe9c68 100644
--- a/installer/nixos-installer.sh
+++ b/installer/nixos-installer.sh
@@ -15,12 +15,12 @@ if test -z "$mountPoint"; then
     mountPoint=/mnt
 fi
 
-if test -z "$nixosDir"; then
-    nixosDir=/etc/nixos/nixos
+if test -z "$NIXOS"; then
+    NIXOS=/etc/nixos/nixos
 fi
 
-if test -z "$nixosConfiguration"; then
-    nixosConfiguration=/etc/nixos/configuration.nix
+if test -z "$NIXOS_CONFIG"; then
+    NIXOS_CONFIG=/etc/nixos/configuration.nix
 fi
 
 if ! test -e "$mountPoint"; then
@@ -33,19 +33,19 @@ if ! grep -F -q " $mountPoint " /proc/mounts; then
     exit 1
 fi
     
-if ! test -e "$nixosDir"; then
-    echo "NixOS source directory $nixosDir doesn't exist"
+if ! test -e "$NIXOS"; then
+    echo "NixOS source directory $NIXOS doesn't exist"
     exit 1
 fi
     
-if ! test -e "$nixosConfiguration"; then
-    echo "configuration file $nixosConfiguration doesn't exist"
+if ! test -e "$NIXOS_CONFIG"; then
+    echo "configuration file $NIXOS_CONFIG doesn't exist"
     exit 1
 fi
     
 
-nixosDir=$(readlink -f "$nixosDir")
-nixosConfiguration=$(readlink -f "$nixosConfiguration")
+NIXOS=$(readlink -f "$NIXOS")
+NIXOS_CONFIG=$(readlink -f "$NIXOS_CONFIG")
 
 
 # Mount some stuff in the target root directory.
@@ -141,8 +141,8 @@ fi
 echo "building the system configuration..."
 chroot $mountPoint @nix@/bin/nix-env \
     -p /nix/var/nix/profiles/system \
-    -f "/mnt$nixosDir/system/system.nix" \
-    --arg configuration "import /mnt$nixosConfiguration" \
+    -f "/mnt$NIXOS/system/system.nix" \
+    --arg configuration "import /mnt$NIXOS_CONFIG" \
     --set -A system
 
 
@@ -153,8 +153,8 @@ mkdir -p $(dirname $targetConfig)
 if test -e $targetConfig -o -L $targetConfig; then
     cp -f $targetConfig $targetConfig.backup-$backupTimestamp
 fi
-if test "$nixosConfiguration" != "$targetConfig"; then
-    cp -f $nixosConfiguration $targetConfig
+if test "$NIXOS_CONFIG" != "$targetConfig"; then
+    cp -f $NIXOS_CONFIG $targetConfig
 fi
 
 
@@ -173,7 +173,7 @@ fi
 
 
 # Copy the NixOS/Nixpkgs sources to the target.
-cp -prd $nixosDir $targetNixos
+cp -prd $NIXOS $targetNixos
 if test -e /etc/nixos/nixpkgs; then
     cp -prd /etc/nixos/nixpkgs $targetNixpkgs
 fi
-- 
GitLab


From 25684805d5f15bef2af1845596c63add2dcab437 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 6 Feb 2007 10:46:36 +0000
Subject: [PATCH 0447/5331] * nixos-installer -> nixos-install.

svn path=/nixos/trunk/; revision=7852
---
 README                                               | 6 +++---
 installer/{nixos-installer.nix => nixos-install.nix} | 4 ++--
 installer/{nixos-installer.sh => nixos-install.sh}   | 0
 system/system.nix                                    | 4 ++--
 4 files changed, 7 insertions(+), 7 deletions(-)
 rename installer/{nixos-installer.nix => nixos-install.nix} (87%)
 rename installer/{nixos-installer.sh => nixos-install.sh} (100%)

diff --git a/README b/README
index 6cd19f3414b..ecb67a871ae 100644
--- a/README
+++ b/README
@@ -58,7 +58,7 @@
 
 - Do the installation:
 
-  $ nixos-installer.sh ROOTDIR . my-config.nix
+  $ nixos-install.sh ROOTDIR . my-config.nix
 
   where ROOTDIR is the mount point of the target root device (i.e.,
   boot.rootDevice in your configuration).
@@ -131,9 +131,9 @@ To get out of maintenance mode:
 
 - Testing the installer:
 
-  $ nix-build configuration/rescue-cd.nix -A system.nixosInstaller
+  $ nix-build configuration/rescue-cd.nix -A system.nixosInstall
   $ dd if=/dev/zero of=diskimage seek=2G count=0 bs=1
   $ yes | mke2fs -j diskimage
   $ mount -o loop diskimage /mnt
-  $ ./result/bin/nixos-installer
+  $ ./result/bin/nixos-install
 
diff --git a/installer/nixos-installer.nix b/installer/nixos-install.nix
similarity index 87%
rename from installer/nixos-installer.nix
rename to installer/nixos-install.nix
index 66320e51c34..8e3eff4d947 100644
--- a/installer/nixos-installer.nix
+++ b/installer/nixos-install.nix
@@ -5,8 +5,8 @@
 }:
 
 substituteAll {
-  name = "nixos-installer";
-  src = ./nixos-installer.sh;
+  name = "nixos-install";
+  src = ./nixos-install.sh;
   dir = "bin";
   isExecutable = true;
   inherit nix nixpkgsURL perl;
diff --git a/installer/nixos-installer.sh b/installer/nixos-install.sh
similarity index 100%
rename from installer/nixos-installer.sh
rename to installer/nixos-install.sh
diff --git a/system/system.nix b/system/system.nix
index 7587c7fa831..58b638ea463 100644
--- a/system/system.nix
+++ b/system/system.nix
@@ -110,7 +110,7 @@ rec {
 
 
   # The installer.
-  nixosInstaller = import ../installer/nixos-installer.nix {
+  nixosInstall = import ../installer/nixos-install.nix {
     inherit (pkgs) stdenv perl runCommand substituteAll;
     inherit nix;
     nixpkgsURL = config.get ["installer" "nixpkgsURL"];
@@ -185,7 +185,7 @@ rec {
     pkgs.utillinux
 #    pkgs.vim
     nix
-    nixosInstaller
+    nixosInstall
     setuidWrapper
   ];
 
-- 
GitLab


From 08ad51690d8d4380aad198f6a08f2f695cec2151 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 6 Feb 2007 13:09:25 +0000
Subject: [PATCH 0448/5331] * Merge the test and upgrade scripts into a program
 "nixos-rebuild"   which is included in the system path.

svn path=/nixos/trunk/; revision=7853
---
 installer/nixos-install.nix |  2 +-
 installer/nixos-rebuild.nix |  9 +++++++
 installer/nixos-rebuild.sh  | 49 +++++++++++++++++++++++++++++++++++++
 system/system.nix           |  8 +++++-
 test.sh                     |  9 -------
 upgrade.sh                  |  9 -------
 6 files changed, 66 insertions(+), 20 deletions(-)
 create mode 100644 installer/nixos-rebuild.nix
 create mode 100644 installer/nixos-rebuild.sh
 delete mode 100755 test.sh
 delete mode 100755 upgrade.sh

diff --git a/installer/nixos-install.nix b/installer/nixos-install.nix
index 8e3eff4d947..298bf594c44 100644
--- a/installer/nixos-install.nix
+++ b/installer/nixos-install.nix
@@ -1,4 +1,4 @@
-{ stdenv, perl, runCommand, substituteAll, nix
+{ perl, runCommand, substituteAll, nix
 , # URL of the Nixpkgs distribution that the installer will pull.
   # Leave empty for a pure source distribution.
   nixpkgsURL ? ""
diff --git a/installer/nixos-rebuild.nix b/installer/nixos-rebuild.nix
new file mode 100644
index 00000000000..52cc939eabf
--- /dev/null
+++ b/installer/nixos-rebuild.nix
@@ -0,0 +1,9 @@
+{substituteAll, nix}:
+
+substituteAll {
+  name = "nixos-rebuild";
+  src = ./nixos-rebuild.sh;
+  dir = "bin";
+  isExecutable = true;
+  inherit nix;
+}
diff --git a/installer/nixos-rebuild.sh b/installer/nixos-rebuild.sh
new file mode 100644
index 00000000000..12404f8d4af
--- /dev/null
+++ b/installer/nixos-rebuild.sh
@@ -0,0 +1,49 @@
+#! @shell@ -e
+
+
+# What are we supposed to do?
+action="$1"
+
+if test -z "$action"; then
+    # !!! more or less cut&paste from
+    # system/switch-to-configuration.sh (which we call, of course).
+    cat <<EOF
+Usage: $0 [switch|boot|test|build]
+
+switch: make the configuration the boot default and activate now
+boot:   make the configuration the boot default
+test:   activate the configuration, but don't make it the boot default
+build:  build the configuration, but don't make it the default or
+        activate it
+EOF
+    exit 1
+fi
+
+
+# Allow the location of NixOS sources and the system configuration
+# file to be overridden.
+if test -z "$NIXOS"; then NIXOS=/etc/nixos/nixos; fi
+if test -z "$NIXOS_CONFIG"; then NIXOS_CONFIG=/etc/nixos/configuration.nix; fi
+
+
+# Either upgrade the configuration in the system profile (for "switch"
+# or "boot"), or just build it and create a symlink "result" in the
+# current directory (for "build" and "test").
+if test "$action" = "switch" -o "$action" = "boot"; then
+    nix-env -p /nix/var/nix/profiles/system -f $NIXOS/system/system.nix \
+        --arg configuration "import $NIXOS_CONFIG" \
+        --set -A system
+    pathToConfig=/nix/var/nix/profiles/system
+else
+    nix-build $NIXOS/system/system.nix \
+        --arg configuration "import $NIXOS_CONFIG" \
+        -A system -K -k
+    pathToConfig=./result
+fi
+
+
+# If we're not just building, then make the new configuration the boot
+# default and/or activate it now.
+if test "$action" = "switch" -o "$action" = "boot" -o "$action" = "test"; then
+    $pathToConfig/bin/switch-to-configuration "$action"
+fi
diff --git a/system/system.nix b/system/system.nix
index 58b638ea463..1b5069b014a 100644
--- a/system/system.nix
+++ b/system/system.nix
@@ -111,11 +111,16 @@ rec {
 
   # The installer.
   nixosInstall = import ../installer/nixos-install.nix {
-    inherit (pkgs) stdenv perl runCommand substituteAll;
+    inherit (pkgs) perl runCommand substituteAll;
     inherit nix;
     nixpkgsURL = config.get ["installer" "nixpkgsURL"];
   };
 
+  nixosRebuild = import ../installer/nixos-rebuild.nix {
+    inherit (pkgs) substituteAll;
+    inherit nix;
+  };
+
 
   # NSS modules.  Hacky!
   nssModules =
@@ -186,6 +191,7 @@ rec {
 #    pkgs.vim
     nix
     nixosInstall
+    nixosRebuild
     setuidWrapper
   ];
 
diff --git a/test.sh b/test.sh
deleted file mode 100755
index 6ea5e055aa6..00000000000
--- a/test.sh
+++ /dev/null
@@ -1,9 +0,0 @@
-#! /bin/sh -e
-
-if test -z "$NIXOS"; then NIXOS=/etc/nixos/nixos; fi
-if test -z "$NIXOS_CONFIG"; then NIXOS_CONFIG=/etc/nixos/configuration.nix; fi
-
-nix-build $NIXOS/system/system.nix \
-    --arg configuration "import $NIXOS_CONFIG" \
-    -A system -K -k
-./result/bin/switch-to-configuration test
diff --git a/upgrade.sh b/upgrade.sh
deleted file mode 100755
index 5fb56387158..00000000000
--- a/upgrade.sh
+++ /dev/null
@@ -1,9 +0,0 @@
-#! /bin/sh -e
-
-if test -z "$NIXOS"; then NIXOS=/etc/nixos/nixos; fi
-if test -z "$NIXOS_CONFIG"; then NIXOS_CONFIG=/etc/nixos/configuration.nix; fi
-
-nix-env -p /nix/var/nix/profiles/system -f $NIXOS/system/system.nix \
-    --arg configuration "import $NIXOS_CONFIG" \
-    --set -A system
-/nix/var/nix/profiles/system/bin/switch-to-configuration switch
-- 
GitLab


From 5d0f7bdadd9f5b26230ee616a6ea1de417c2e6db Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 6 Feb 2007 13:12:10 +0000
Subject: [PATCH 0449/5331] * Better checking.

svn path=/nixos/trunk/; revision=7854
---
 installer/nixos-rebuild.sh | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/installer/nixos-rebuild.sh b/installer/nixos-rebuild.sh
index 12404f8d4af..f63264cedae 100644
--- a/installer/nixos-rebuild.sh
+++ b/installer/nixos-rebuild.sh
@@ -4,7 +4,7 @@
 # What are we supposed to do?
 action="$1"
 
-if test -z "$action"; then
+showSyntax() {
     # !!! more or less cut&paste from
     # system/switch-to-configuration.sh (which we call, of course).
     cat <<EOF
@@ -17,7 +17,9 @@ build:  build the configuration, but don't make it the default or
         activate it
 EOF
     exit 1
-fi
+}
+
+if test -z "$action"; then showSyntax; fi
 
 
 # Allow the location of NixOS sources and the system configuration
@@ -34,11 +36,13 @@ if test "$action" = "switch" -o "$action" = "boot"; then
         --arg configuration "import $NIXOS_CONFIG" \
         --set -A system
     pathToConfig=/nix/var/nix/profiles/system
-else
+elif test "$action" = "test" -o "$action" = "build"; then
     nix-build $NIXOS/system/system.nix \
         --arg configuration "import $NIXOS_CONFIG" \
         -A system -K -k
     pathToConfig=./result
+else
+    showSyntax
 fi
 
 
-- 
GitLab


From 42bcb9a2a794ce523c9049b46dac7ef4cdf7a2fa Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 6 Feb 2007 13:15:52 +0000
Subject: [PATCH 0450/5331] * Recreate the /bin/sh symlink.

svn path=/nixos/trunk/; revision=7855
---
 system/activate-configuration.sh | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/system/activate-configuration.sh b/system/activate-configuration.sh
index 16800cd8f3c..7054a40e5c4 100644
--- a/system/activate-configuration.sh
+++ b/system/activate-configuration.sh
@@ -30,6 +30,12 @@ for i in $(find /etc/ -type l); do
 done
 
 
+# Create the required /bin/sh symlink; otherwise lots of things
+# (notably the system() function) won't work.
+mkdir -m 0755 -p $mountPoint/bin
+ln -sfn @shell@ $mountPoint/bin/sh
+
+
 # Various log directories.
 mkdir -m 0755 -p /var/run
 
-- 
GitLab


From b044899891aada13b7a5f6f53daa2ffd4d887b66 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 6 Feb 2007 13:20:53 +0000
Subject: [PATCH 0451/5331] * A helpful warning.

svn path=/nixos/trunk/; revision=7856
---
 installer/nixos-rebuild.sh | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/installer/nixos-rebuild.sh b/installer/nixos-rebuild.sh
index f63264cedae..12fae0cc80a 100644
--- a/installer/nixos-rebuild.sh
+++ b/installer/nixos-rebuild.sh
@@ -51,3 +51,13 @@ fi
 if test "$action" = "switch" -o "$action" = "boot" -o "$action" = "test"; then
     $pathToConfig/bin/switch-to-configuration "$action"
 fi
+
+
+if test "$action" = "test"; then
+    cat >&2 <<EOF
+
+Warning: if you remove the symlink \`$pathToConfig', the active system
+configuration may be garbage collected!  This may render the system
+inoperable (though a reboot will fix things).
+EOF
+fi
-- 
GitLab


From 1551c50a205cafe025389d7a54fa071c0ae2d44d Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 6 Feb 2007 13:21:15 +0000
Subject: [PATCH 0452/5331] svn path=/nixos/trunk/; revision=7857

---
 installer/nixos-rebuild.sh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/installer/nixos-rebuild.sh b/installer/nixos-rebuild.sh
index 12fae0cc80a..0552c9baaf0 100644
--- a/installer/nixos-rebuild.sh
+++ b/installer/nixos-rebuild.sh
@@ -56,8 +56,8 @@ fi
 if test "$action" = "test"; then
     cat >&2 <<EOF
 
-Warning: if you remove the symlink \`$pathToConfig', the active system
-configuration may be garbage collected!  This may render the system
-inoperable (though a reboot will fix things).
+Warning: if you remove or overwrite the symlink \`$pathToConfig', the
+active system configuration may be garbage collected!  This may render
+the system inoperable (though a reboot will fix things).
 EOF
 fi
-- 
GitLab


From 97aa1faa330de58f9d903077f31f1a72ab3f5444 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 6 Feb 2007 14:06:42 +0000
Subject: [PATCH 0453/5331] * Create /etc/nixos/install-source.nix.

svn path=/nixos/trunk/; revision=7858
---
 installer/nixos-install.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/installer/nixos-install.sh b/installer/nixos-install.sh
index 3ee54fe9c68..1dae5d74fdb 100644
--- a/installer/nixos-install.sh
+++ b/installer/nixos-install.sh
@@ -177,6 +177,7 @@ cp -prd $NIXOS $targetNixos
 if test -e /etc/nixos/nixpkgs; then
     cp -prd /etc/nixos/nixpkgs $targetNixpkgs
 fi
+ln -sfn nixpkgs/pkgs/top-level/all-packages.nix $mountPoint/etc/nixos/install-source.nix
 
 
 # Grub needs a mtab.
-- 
GitLab


From 923348b490cfec291a0377e7b4befd24f2b3de17 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 6 Feb 2007 14:13:12 +0000
Subject: [PATCH 0454/5331] * Provide a script "nixos-checkout" to replace the
 NixOS/Nixpkgs   sources in /etc/nixos with a Subversion checkout of those
 trees.   This should be run after a successful installation if you want to  
 keep NixOS up to date from Subversion.

svn path=/nixos/trunk/; revision=7859
---
 checkout-nixos.sh            |  9 ---------
 installer/nixos-checkout.nix |  8 ++++++++
 installer/nixos-checkout.sh  | 28 ++++++++++++++++++++++++++++
 installer/nixos-rebuild.nix  |  3 +--
 system/system.nix            |  6 +++++-
 5 files changed, 42 insertions(+), 12 deletions(-)
 delete mode 100755 checkout-nixos.sh
 create mode 100644 installer/nixos-checkout.nix
 create mode 100644 installer/nixos-checkout.sh

diff --git a/checkout-nixos.sh b/checkout-nixos.sh
deleted file mode 100755
index 300deb196c6..00000000000
--- a/checkout-nixos.sh
+++ /dev/null
@@ -1,9 +0,0 @@
-#! /bin/sh
-nix-channel --add http://nix.cs.uu.nl/dist/nix/channels-v3/nixpkgs-unstable
-nix-channel --update
-nix-env -i subversion
-cd /etc/nixos
-svn co https://svn.cs.uu.nl:12443/repos/trace/nixos/trunk nixos
-svn co https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk nixpkgs
-ln -sf ../nixpkgs/pkgs nixos/pkgs
-ln -sf nixpkgs/pkgs/top-level/all-packages.nix install-source.nix
diff --git a/installer/nixos-checkout.nix b/installer/nixos-checkout.nix
new file mode 100644
index 00000000000..ce8038fffed
--- /dev/null
+++ b/installer/nixos-checkout.nix
@@ -0,0 +1,8 @@
+{substituteAll}:
+
+substituteAll {
+  name = "nixos-checkout";
+  src = ./nixos-checkout.sh;
+  dir = "bin";
+  isExecutable = true;
+}
diff --git a/installer/nixos-checkout.sh b/installer/nixos-checkout.sh
new file mode 100644
index 00000000000..8d1a13cafc2
--- /dev/null
+++ b/installer/nixos-checkout.sh
@@ -0,0 +1,28 @@
+#! @shell@ -e
+set -x
+
+# Obtain Subversion.
+nix-channel --add http://nix.cs.uu.nl/dist/nix/channels-v3/nixpkgs-unstable
+nix-channel --update
+nix-env -i subversion
+
+cd /etc/nixos
+
+# Move any old nixos or nixpkgs directories out of the way.
+backupTimestamp=$(date "+%Y%m%d%H%M%S")
+
+if test -e nixos -a ! -e nixos/.svn; then
+    mv nixos nixos-$backupTimestamp
+fi
+
+if test -e nixpkgs -a ! -e nixpkgs/.svn; then
+    mv nixpkgs nixpkgs-$backupTimestamp
+fi
+
+# Check out the NixOS and Nixpkgs sources.
+svn co https://svn.cs.uu.nl:12443/repos/trace/nixos/trunk nixos
+svn co https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk nixpkgs
+
+# A few symlink.
+ln -sfn ../nixpkgs/pkgs nixos/pkgs
+ln -sfn nixpkgs/pkgs/top-level/all-packages.nix install-source.nix
diff --git a/installer/nixos-rebuild.nix b/installer/nixos-rebuild.nix
index 52cc939eabf..2c8371a597c 100644
--- a/installer/nixos-rebuild.nix
+++ b/installer/nixos-rebuild.nix
@@ -1,9 +1,8 @@
-{substituteAll, nix}:
+{substituteAll}:
 
 substituteAll {
   name = "nixos-rebuild";
   src = ./nixos-rebuild.sh;
   dir = "bin";
   isExecutable = true;
-  inherit nix;
 }
diff --git a/system/system.nix b/system/system.nix
index 1b5069b014a..b3a888e6590 100644
--- a/system/system.nix
+++ b/system/system.nix
@@ -118,7 +118,10 @@ rec {
 
   nixosRebuild = import ../installer/nixos-rebuild.nix {
     inherit (pkgs) substituteAll;
-    inherit nix;
+  };
+
+  nixosCheckout = import ../installer/nixos-checkout.nix {
+    inherit (pkgs) substituteAll;
   };
 
 
@@ -192,6 +195,7 @@ rec {
     nix
     nixosInstall
     nixosRebuild
+    nixosCheckout
     setuidWrapper
   ];
 
-- 
GitLab


From 8cf1eceb0a0470311dac60955d72deb1246efdaa Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 6 Feb 2007 16:53:36 +0000
Subject: [PATCH 0455/5331] * Allow multiple file systems to be mounted in
 stage 1 (i.e., from the   initrd).  This is useful if /nix (which is
 necessary for stage 2) is   on a different file system than /.

svn path=/nixos/trunk/; revision=7862
---
 boot/boot-stage-1-init.sh | 108 +++++++++++++++++++++++++++-----------
 boot/boot-stage-1.nix     |  26 +++++++--
 system/system.nix         |  10 ++--
 3 files changed, 103 insertions(+), 41 deletions(-)

diff --git a/boot/boot-stage-1-init.sh b/boot/boot-stage-1-init.sh
index 9703ac7a8bc..c57aec96048 100644
--- a/boot/boot-stage-1-init.sh
+++ b/boot/boot-stage-1-init.sh
@@ -3,6 +3,7 @@
 fail() {
     # If starting stage 2 failed, start an interactive shell.
     echo "Stage 2 failed, starting emergency shell..."
+    echo "(Stage 1 init script is $stage2Init)"
     exec @staticShell@
 }
 
@@ -67,12 +68,55 @@ udevtrigger
 udevsettle
 
 
+# Function for mounting a file system.
+mountFS() {
+    local device="$1"
+    local mountPoint="$2"
+    local options="$3"
+
+    # Check the root device, if .
+    mustCheck=
+    if test -b "$device"; then
+        mustCheck=1
+    else
+        case $device in
+            LABEL=*)
+                mustCheck=1
+                ;;
+        esac
+    fi
+
+    if test -n "$mustCheck"; then
+        fsck -C -a "$device"
+        fsckResult=$?
+
+        if test $(($fsckResult | 2)) = $fsckResult; then
+            echo "fsck finished, rebooting..."
+            sleep 3
+            # reboot -f -d !!! don't have reboot yet
+            fail
+        fi
+
+        if test $(($fsckResult | 4)) = $fsckResult; then
+            echo "$device has unrepaired errors, please fix them manually."
+            fail
+        fi
+
+        if test $fsckResult -ge 8; then
+            echo "fsck on $device failed."
+            fail
+        fi
+    fi
+
+    # Mount read-writable.
+    mount -n -o "$options" "$device" /mnt/root$mountPoint || fail
+}
+
+
 # Try to find and mount the root device.
 mkdir /mnt
 mkdir /mnt/root
 
-echo "mounting the root device..."
-
 if test -n "@autoDetectRootDevice@"; then
 
     # Look for the root device by label.
@@ -109,33 +153,37 @@ if test -n "@autoDetectRootDevice@"; then
 
 else
 
-    # Hard-coded root device.
-    rootDevice="@rootDevice@"
-
-    # Check the root device.
-    fsck -C -a "$rootDevice"
-    fsckResult=$?
-
-    if test $(($fsckResult | 2)) = $fsckResult; then
-        echo "fsck finished, rebooting..."
-        sleep 3
-        # reboot -f -d !!! don't have reboot yet
-        fail
-    fi
-
-    if test $(($fsckResult | 4)) = $fsckResult; then
-        echo "$rootDevice has unrepaired errors, please fix them manually."
-        fail
-    fi
-
-    if test $fsckResult -ge 8; then
-        echo "fsck on $rootDevice failed."
-        fail
-    fi
-
-    # Mount read-writable.
-    mount -n -o rw "$rootDevice" /mnt/root || fail
-
+    # Hard-coded root device(s).
+    mountPoints=(@mountPoints@)
+    devices=(@devices@)
+    fsTypes=(@fsTypes@)
+    optionss=(@optionss@)
+
+    for ((n = 0; n < ${#mountPoints[*]}; n++)); do
+        mountPoint=${mountPoints[$n]}
+        device=${devices[$n]}
+        fsType=${fsTypes[$n]}
+        options=${optionss[$n]}
+
+        # !!! Really quick hack to support bind mounts, i.e., where
+        # the "device" should be taken relative to /mnt/root, not /.
+        # Assume that every device that doesn't start with /dev or
+        # LABEL= is a bind mount.
+        case $device in
+            /dev/*)
+                ;;
+            LABEL=*)
+                ;;
+            *)
+                device=/mnt/root$device
+                ;;
+        esac
+
+        echo "mounting $device on $mountPoint..."
+
+        mountFS "$device" "$mountPoint" "$options"
+    done
+    
 fi
 
 
@@ -148,8 +196,6 @@ mount --move . /
 umount /proc # cleanup
 umount /sys
 
-echo "INIT = $stage2Init"
-
 if test -z "$stage2Init"; then fail; fi
 
 exec chroot . $stage2Init
diff --git a/boot/boot-stage-1.nix b/boot/boot-stage-1.nix
index 8a21d87bf61..49c53e1ed72 100644
--- a/boot/boot-stage-1.nix
+++ b/boot/boot-stage-1.nix
@@ -10,8 +10,15 @@
 , # Whether to find root device automatically using its label.
   autoDetectRootDevice
   
-, # If not scanning, the root must be specified explicitly.
-  rootDevice
+, # If not scanning, the root must be specified explicitly.  Actually,
+  # stage 1 can mount multiple file systems.  This is necessary if,
+  # for instance, /nix (necessary for stage 2) is on a different file
+  # system than /.
+  #
+  # This is a list of {mountPoint, device|label} attribute sets, i.e.,
+  # the format used by the fileSystems configuration option.  There
+  # must at least be a file system for the / mount point in this list.
+  fileSystems ? []
 
   # If scanning, we need a disk label.
 , rootLabel
@@ -21,12 +28,23 @@
   stage2Init ? "/init"
 }:
 
+let
+
+  # !!! use XML; copy&pasted from upstart-jobs/filesystems.nix.
+  mountPoints = map (fs: fs.mountPoint) fileSystems;
+  devices = map (fs: if fs ? device then fs.device else "LABEL=" + fs.label) fileSystems;
+  fsTypes = map (fs: if fs ? fsType then fs.fsType else "auto") fileSystems;
+  optionss = map (fs: if fs ? options then fs.options else "defaults") fileSystems;
+
+in
+
+assert autoDetectRootDevice -> mountPoints != [];
+
 substituteAll {
   src = ./boot-stage-1-init.sh;
   isExecutable = true;
   inherit staticShell modules modulesDir;
-  inherit autoDetectRootDevice;
-  rootDevice = if !autoDetectRootDevice then rootDevice else "";
+  inherit autoDetectRootDevice mountPoints devices fsTypes optionss;
   rootLabel = if autoDetectRootDevice then rootLabel else "";
   path = [
     staticTools
diff --git a/system/system.nix b/system/system.nix
index b3a888e6590..c29d6100c98 100644
--- a/system/system.nix
+++ b/system/system.nix
@@ -68,12 +68,10 @@ rec {
     inherit (pkgsDiet) module_init_tools;
     inherit extraUtils;
     autoDetectRootDevice = config.get ["boot" "autoDetectRootDevice"];
-    rootDevice =
-      let rootFS = 
-        (pkgs.library.findSingle (fs: fs.mountPoint == "/")
-          (abort "No root mount point declared.")
-          (config.get ["fileSystems"]));
-      in if rootFS ? device then rootFS.device else "LABEL=" + rootFS.label;
+    fileSystems =
+      pkgs.lib.filter
+        (fs: fs.mountPoint == "/" || (fs ? neededForBoot && fs.neededForBoot))
+        (config.get ["fileSystems"]);
     rootLabel = config.get ["boot" "rootLabel"];
     inherit stage2Init;
     modulesDir = modulesClosure;
-- 
GitLab


From f2e85499f3e89531eae6b9d4186131064f8feec6 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 6 Feb 2007 18:29:20 +0000
Subject: [PATCH 0456/5331] * Doh.

svn path=/nixos/trunk/; revision=7864
---
 boot/boot-stage-1.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/boot/boot-stage-1.nix b/boot/boot-stage-1.nix
index 49c53e1ed72..7417ab5b2cf 100644
--- a/boot/boot-stage-1.nix
+++ b/boot/boot-stage-1.nix
@@ -38,7 +38,7 @@ let
 
 in
 
-assert autoDetectRootDevice -> mountPoints != [];
+assert !autoDetectRootDevice -> mountPoints != [];
 
 substituteAll {
   src = ./boot-stage-1-init.sh;
-- 
GitLab


From 98a3eaf6b7622a04506d1b5dfb5db484f71e57bf Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 6 Feb 2007 18:31:32 +0000
Subject: [PATCH 0457/5331] svn path=/nixos/trunk/; revision=7865

---
 configuration/rescue-cd.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/configuration/rescue-cd.nix b/configuration/rescue-cd.nix
index 8ee8708e55f..262529551bb 100644
--- a/configuration/rescue-cd.nix
+++ b/configuration/rescue-cd.nix
@@ -1,7 +1,7 @@
 rec {
 
   
-  nixpkgsRel = "nixpkgs-0.11pre7834";
+  nixpkgsRel = "nixpkgs-0.11pre7861";
 
 
   configuration = {
@@ -122,7 +122,7 @@ rec {
   # Get a recent copy of Nixpkgs.
   nixpkgsTarball = pkgs.fetchurl {
     url = configuration.installer.nixpkgsURL + "/" + nixpkgsRel + ".tar.bz2";
-    md5 = "844df61d5a1d02ca7de7af691a6279b5";
+    md5 = "f88f686e7bbe33065b3c9f3ce5224fea";
   };
 
 
-- 
GitLab


From 9759134665df615c560d1d7503cd6f0ebd92e3b8 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 6 Feb 2007 21:14:02 +0000
Subject: [PATCH 0458/5331] * Manual.

svn path=/nixos/trunk/; revision=7868
---
 doc/manual/installation.xml       | 241 ++++++++++++++++++++++++++++++
 doc/manual/manual.xml             |  16 ++
 doc/manual/options-to-docbook.xsl |   2 +-
 3 files changed, 258 insertions(+), 1 deletion(-)
 create mode 100644 doc/manual/installation.xml

diff --git a/doc/manual/installation.xml b/doc/manual/installation.xml
new file mode 100644
index 00000000000..fe3a1a7e72e
--- /dev/null
+++ b/doc/manual/installation.xml
@@ -0,0 +1,241 @@
+<chapter xmlns="http://docbook.org/ns/docbook"
+         xmlns:xlink="http://www.w3.org/1999/xlink">
+
+<title>Installation</title>
+
+
+<!--===============================================================-->
+
+<section>
+
+<title>Building the installation CD</title>
+
+<para>Instead of building an installation CD, you could just download
+one from <link xlink:href="http://nix.cs.uu.nl/nixos/"/>.  If you want
+(or need) to build it yourself:
+
+<orderedlist>
+
+  <listitem><para>Make sure that you have a <emphasis>very</emphasis>
+  recent pre-release version of Nix installed (<link
+  xlink:href="http://nix.cs.uu.nl/dist/nix/nix-unstable-latest/"/>).
+  The NixOS Nix expressions frequently use bleading-edge features.  If
+  you get any kind of expression evaluation error, try to upgrade your
+  Nix.</para></listitem>
+
+  <listitem><para>Optional but strongly recommended (and currently
+  <emphasis>required</emphasis> for building the
+  <literal>x86_64</literal> ISO): subscribe/pull from the Nixpkgs
+  channel to speed up building, i.e.,
+
+<screen>
+$ nix-channel --add http://nix.cs.uu.nl/dist/nix/channels-v3/nixpkgs-unstable
+$ nix-channel --update</screen>
+
+  </para></listitem>
+
+  <listitem><para>Check out NixOS from <link
+  xlink:href="https://svn.cs.uu.nl:12443/repos/trace/nixos/trunk"/> as
+  <literal>nixos</literal>.</para></listitem>
+
+  <listitem><para>If you don’t already have Nixpkgs checkout, Check
+  out Nixpkgs from <link
+  xlink:href="https://svn.cs.uu.nl:12443/repos/trace/nixos/trunk"/> as
+  <literal>nixpkgs</literal>.</para></listitem>
+
+  <listitem><para>In the directory <literal>nixos</literal>, make a
+  symbolic link <literal>pkgs</literal> to the <literal>pkgs</literal>
+  directory of the Nixpkgs tree, e.g.,
+
+<screen>
+$ ln -s nixpkgs/pkgs nixos/</screen>
+
+  </para></listitem>
+
+  <listitem><para>Build the ISO image:
+
+<screen>
+$ nix-build configuration/rescue-cd.nix -A rescueCD</screen>
+
+  If everything goes well, you’ll end up with an ISO image in
+  <filename>./result/iso/nixos.iso</filename>.</para></listitem>
+
+  <listitem><para>Burn the ISO image
+  <filename>./result/iso/nixos.iso</filename> onto a CD or DVD or
+  attach it to a CD-ROM drive in VMware.</para></listitem>
+
+</orderedlist>
+  
+</para>
+
+</section>
+
+
+<!--===============================================================-->
+
+<section>
+
+<title>Installation</title>
+
+<orderedlist>
+
+  <listitem><para>Boot from the CD.</para></listitem>
+
+  <listitem><para>The CD contains a basic NixOS installation.  When
+  it’s finished booting, it should have detected most of your hardware
+  and brought up networking (check <command>ifconfig</command>).
+  Networking is necessary for the installer, since it will download
+  lots of stuff (such as source tarballs or Nixpkgs channel binaries).
+  It’s best if you have a DHCP server on your network.  Otherwise
+  configure manually.</para></listitem>
+
+  <listitem><para>Login as <literal>root</literal>, empty
+  password.</para></listitem>
+
+  <listitem><para>The NixOS installer doesn’t do any partitioning or
+  formatting yet, so you need to that yourself.  Use the following
+  commands:
+
+  <itemizedlist>
+
+    <listitem><para>For partitioning:
+    <command>fdisk</command>.</para></listitem>
+    
+    <listitem><para>For initialising Ext2/Ext3 partitions:
+    <command>mke2fs</command>.  Ext3 is recommended; use the
+    <option>-j</option> to create a journalled file system.  It is
+    also recommended that you assign a unique symbolic label to the
+    file system using the option <option>-L
+    <replaceable>label</replaceable></option>.  This will make the
+    file system configuration independent from device
+    changes.</para></listitem>
+
+    <listitem><para>For creating swap partitions:
+    <command>mkswap</command>.  Again it’s recommended to assign a
+    label to the swap partition: <option>-L
+    <replaceable>label</replaceable></option>.</para></listitem>
+    
+    <listitem><para>For creating LVM volumes, the LVM commands, e.g.,
+
+<screen>
+$ pvcreate /dev/sda1 /dev/sdb1
+$ vgcreate MyVolGroup /dev/sda1 /dev/sdb1
+$ lvcreate --size 2G --name bigdisk MyVolGroup 
+$ lvcreate --size 1G --name smalldisk MyVolGroup</screen>
+
+    Possibly you’ll need to do <userinput>initctl start
+    lvm</userinput> after this (TODO: check whether this is
+    needed).</para></listitem>
+
+    <listitem><para>For creating software RAID devices:
+    <command>mdadm</command>.</para></listitem>
+
+    <listitem><para>Mount the target file system on
+    <filename>/mnt</filename>.</para></listitem>
+
+    <listitem><para>The installation is declarative; you need to write
+    a description of the configuration that you want to be built and
+    activated.  The configuration is specified in a Nix expression and
+    should be stored in
+    <filename>/etc/nixos/configuration.nix</filename>.  See
+    <filename>/etc/nixos/nixos/configuration/examples</filename> for
+    example machine configurations.  You can copy and edit one of
+    those (e.g., copy
+    <filename>/etc/nixos/nixos/configuration/examples/basic.nix</filename>
+    to <filename>/etc/nixos/configuration.nix</filename>).  See <xref
+    linkend="sec-options"/> for a list of the available configuration
+    options.  The text editor <command>nano</command> is
+    available.</para>
+
+    <para>In particular you need to specify a root file system in
+    <option>fileSystems</option> and the target device for the Grub
+    boot loader in <option>boot.grubDevice</option>.</para>
+
+    <para>More examples of NixOS configurations for some actual
+    machines can be found at <link
+    xlink:href="https://svn.cs.uu.nl:12443/repos/trace/configurations/trunk/"/>.</para>
+
+    </listitem>
+
+    <listitem><para>Do the installation:
+
+<screen>
+$ nixos-install</screen>
+
+    Cross fingers.</para></listitem>
+
+    <listitem><para>If everything went well:
+
+<screen>
+$ reboot</screen>
+
+    You should now be able to boot into the installed NixOS.  The Grub
+    boot menu shows a list of <emphasis>available
+    configurations</emphasis> (initially just one).  Every time you
+    change the NixOS configuration, a new item appears in the menu.
+    This allows you to go back easily to another configuration if
+    something goes wrong.</para>
+
+    <para>You should log in and change the <literal>root</literal>
+    password with <command>passwd</command>.</para></listitem>
+
+  </itemizedlist>
+
+  </para></listitem>
+    
+</orderedlist>
+
+</section>
+
+
+
+<!--===============================================================-->
+
+<section>
+
+<title>Changing the configuration</title>
+
+<para>The file <filename>/etc/nixos/configuration.nix</filename>
+contains the current configuration of your machine.  Whenever you’ve
+changed something to that file, or to the NixOS/Nixpkgs sources in
+<filename>/etc/nixos/nixos</filename> and
+<filename>/etc/nixos/nixpkgs</filename>, respectively, you should do
+
+<screen>
+$ nixos-rebuild switch</screen>
+
+to build the new configuration, make it the default configuration for
+booting, and try to effect the configuration in the running system
+(e.g., by restarting system services).</para>
+
+<para>You can also do 
+
+<screen>
+$ nixos-rebuild test</screen>
+
+to build the configuration and switch the running system to it, but
+without making it the boot default.  So if (say) the configuration
+locks up your machine, you can just reboot to get back to a working
+configuration.</para>
+
+<para>There is also 
+
+<screen>
+$ nixos-rebuild boot</screen>
+
+to build the configuration and make it the boot default, but not
+switch to it now (so it will only take effect after the next
+reboot).</para>
+
+<para>Finally, you can do 
+
+<screen>
+$ nixos-rebuild build</screen>
+
+to build the configuration but nothing more.  This is useful to see
+whether everything compiles cleanly.</para>
+
+</section>
+
+
+</chapter>
\ No newline at end of file
diff --git a/doc/manual/manual.xml b/doc/manual/manual.xml
index 96368ed6876..51834234fb8 100644
--- a/doc/manual/manual.xml
+++ b/doc/manual/manual.xml
@@ -1,4 +1,5 @@
 <book xmlns="http://docbook.org/ns/docbook"
+      xmlns:xlink="http://www.w3.org/1999/xlink"
       xmlns:xi="http://www.w3.org/2001/XInclude">
 
   <info>
@@ -19,6 +20,21 @@
     
   </info>
 
+  
+  <preface>
+    <title>Preface</title>
+
+    <para>This manual is very sketchy.  It gives basic information on
+    how to get NixOS up and running, but since NixOS is very much a
+    work in progress, you are likely to encounter problems here and
+    there.  Extensive familiarity with Linux is recommended.  If you
+    encounter problems, please report them on the
+    <literal>nix-dev@cs.uu.nl</literal> mailing list or on <link
+    xlink:href="irc://irc.freenode.net/#trace" />.</para>
+    
+  </preface>
+  
+
   <xi:include href="installation.xml" />
   <xi:include href="options-db.xml" />
 
diff --git a/doc/manual/options-to-docbook.xsl b/doc/manual/options-to-docbook.xsl
index 71844cbd2b7..5f83cca474b 100644
--- a/doc/manual/options-to-docbook.xsl
+++ b/doc/manual/options-to-docbook.xsl
@@ -13,7 +13,7 @@
   
   <xsl:template match="/expr/list">
 
-    <chapter>
+    <chapter xml:id="sec-options">
       <title>List of Options</title>
 
       <variablelist>
-- 
GitLab


From 5aed111620111f585789d96f489378d06abd237a Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 6 Feb 2007 21:25:36 +0000
Subject: [PATCH 0459/5331] * More manual.

svn path=/nixos/trunk/; revision=7869
---
 doc/manual/development.xml        | 47 +++++++++++++++++++++++++++++++
 doc/manual/installation.xml       | 34 ++++++++++++++++++++--
 doc/manual/manual.xml             |  1 +
 doc/manual/options-to-docbook.xsl |  2 +-
 4 files changed, 81 insertions(+), 3 deletions(-)
 create mode 100644 doc/manual/development.xml

diff --git a/doc/manual/development.xml b/doc/manual/development.xml
new file mode 100644
index 00000000000..58924658ca6
--- /dev/null
+++ b/doc/manual/development.xml
@@ -0,0 +1,47 @@
+<chapter xmlns="http://docbook.org/ns/docbook"
+         xmlns:xlink="http://www.w3.org/1999/xlink">
+
+<title>Development</title>
+
+<para>This chapter has some random notes on hacking on
+NixOS.</para>
+
+
+<section>
+
+<title>Building specific parts of NixOS</title>
+
+<para>
+
+<screen>
+$ nix-build system/system.nix \
+    --arg configuration "import /etc/nixos/configuration.nix" \
+    -A <replaceable>attr</replaceable></screen>
+
+where <replaceable>attr</replaceable> is an attribute in
+system/system.nix (e.g., <literal>bootStage1</literal>).</para>
+
+</section>
+
+
+<section>
+
+<title>Testing the installer</title>
+
+<para>Building, burning, and booting from an installation CD is rather
+tedious, so here is a quick way to see if the installer works
+properly:
+
+<screen>
+$ nix-build .../nixos/configuration/rescue-cd.nix -A system.nixosInstall
+$ dd if=/dev/zero of=diskimage seek=2G count=0 bs=1
+$ yes | mke2fs -j diskimage
+$ mount -o loop diskimage /mnt
+$ ./result/bin/nixos-install</screen>
+
+</para>
+
+</section>
+
+
+</chapter>
diff --git a/doc/manual/installation.xml b/doc/manual/installation.xml
index fe3a1a7e72e..f9c7743b23a 100644
--- a/doc/manual/installation.xml
+++ b/doc/manual/installation.xml
@@ -143,7 +143,7 @@ $ lvcreate --size 1G --name smalldisk MyVolGroup</screen>
     those (e.g., copy
     <filename>/etc/nixos/nixos/configuration/examples/basic.nix</filename>
     to <filename>/etc/nixos/configuration.nix</filename>).  See <xref
-    linkend="sec-options"/> for a list of the available configuration
+    linkend="ch-options"/> for a list of the available configuration
     options.  The text editor <command>nano</command> is
     available.</para>
 
@@ -191,7 +191,7 @@ $ reboot</screen>
 
 <!--===============================================================-->
 
-<section>
+<section xml:id="sec-changing-config">
 
 <title>Changing the configuration</title>
 
@@ -238,4 +238,34 @@ whether everything compiles cleanly.</para>
 </section>
 
 
+
+<!--===============================================================-->
+
+<section>
+
+<title>Keeping NixOS up to date</title>
+
+<para>The currently best way to keep your NixOS installation up to
+date is to track the NixOS Subversion repository.  You should replace
+the static NixOS/Nixpkgs sources installed in
+<filename>/etc/nixos</filename> with a Subversion checkout.  The
+program <command>nixos-checkout</command> does that for you (and it
+also installs Subversion into your current profile).</para>
+
+<para>To build the latest and greatest, do
+
+<screen>
+$ svn up /etc/nixos/nixos
+$ svn up /etc/nixos/nixpkgs
+$ nixos-rebuild switch</screen>
+
+(Or instead of <literal>switch</literal>, use any of the alternatives
+shown in <xref linkend="sec-changing-config"/>.)</para>
+
+
+</section>
+
+
+
+
 </chapter>
\ No newline at end of file
diff --git a/doc/manual/manual.xml b/doc/manual/manual.xml
index 51834234fb8..52313de1d8d 100644
--- a/doc/manual/manual.xml
+++ b/doc/manual/manual.xml
@@ -36,6 +36,7 @@
   
 
   <xi:include href="installation.xml" />
+  <xi:include href="development.xml" />
   <xi:include href="options-db.xml" />
 
 </book>
\ No newline at end of file
diff --git a/doc/manual/options-to-docbook.xsl b/doc/manual/options-to-docbook.xsl
index 5f83cca474b..3516a043900 100644
--- a/doc/manual/options-to-docbook.xsl
+++ b/doc/manual/options-to-docbook.xsl
@@ -13,7 +13,7 @@
   
   <xsl:template match="/expr/list">
 
-    <chapter xml:id="sec-options">
+    <chapter xml:id="ch-options">
       <title>List of Options</title>
 
       <variablelist>
-- 
GitLab


From 56f813a0fed951505b37918d11e9d37cdd740a0e Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 6 Feb 2007 21:38:59 +0000
Subject: [PATCH 0460/5331] * Readme is obsolete now.

svn path=/nixos/trunk/; revision=7870
---
 README                         | 142 +--------------------------------
 doc/manual/manual.xml          |  15 ++--
 doc/manual/troubleshooting.xml |  64 +++++++++++++++
 3 files changed, 78 insertions(+), 143 deletions(-)
 create mode 100644 doc/manual/troubleshooting.xml

diff --git a/README b/README
index ecb67a871ae..acb8af73c4d 100644
--- a/README
+++ b/README
@@ -1,139 +1,5 @@
-*** Building the installation CD ***
-
-(Or just grab an ISO from http://nix.cs.uu.nl/dist/nix/.)
-
-- Make sure that you have a very recent Nix.
-
-- Pull from the Nixpkgs channel to speed up building.
-
-- Check out https://svn.cs.uu.nl:12443/repos/trace/nixos/trunk/.
-
-- Make a symbolic link called "pkgs" to the location of Nixpkgs.
-
-- Build the ISO image:
-
-  $ nix-build configuration/rescue-cd.nix -A rescueCD
-
-  This gives you an image in result/iso/nixos.iso.
-
-- Burn the ISO image or attach it to a CD-ROM drive in VMware.
-
-
-*** Installation ***
-
-- Boot from the CD.
-
-- The CD contains a pretty complete NixOS installation.  When it's
-  finished booting, it should have detected most of your hardware and
-  brought up networking (check ifconfig).  Networking is necessary for
-  the installer.  It's best if you have a DHCP server on your
-  network.  Otherwise configure manually.
-
-- Login as "root", empty password.
-
-- The NixOS installer doesn't do any partitioning or formatting yet,
-  so you need to that yourself.  Use "fdisk", "mkfs.ext2" and "tune2fs".
-
-- Mount the target root device, e.g., under /mnt.
-
-- Unpack the NixOS and Nixpkgs sources:
-
-  $ tar xf /nixos.tar.bz2
-  $ tar xf /nixpkgs.tar.bz2
-  $ ln -s nixpkgs-*/pkgs .
-
-  (TODO: do this automatically.)
-
-- The installation is declarative; you need to make a description of
-  the configuration that is to be built and activated.  The
-  configuration is specified in a Nix expression.  See
-  configuration/examples for example machine configurations.  You can
-  copy and edit one of those (e.g., configuration/examples/basic.nix
-  to my-config.nix).  See system/options.nix for available
-  configuration settings.  The text editor "nano" is available.
-
-  In particular you need to specify boot.rootDevice and
-  boot.grubDevice for the devices where the OS and Grub are to be
-  installed, respectively.
-
-- Do the installation:
-
-  $ nixos-install.sh ROOTDIR . my-config.nix
-
-  where ROOTDIR is the mount point of the target root device (i.e.,
-  boot.rootDevice in your configuration).
-
-- If everything went well:
-
-  $ reboot
-
-  You should now be able to boot into the installed NixOS.
-
-
-*** Updating NixOS ***
-
-- In NixOS, login as root, then do
-
-  $ checkout-nixos.sh  # !!! should be added to the installation
-
-  This gives you a working copy of NixOS and NixPkgs in nixos/ and
-  nixpkgs/, respectively.  You only need to do this once; you can use
-  "svn up" afterwards.
-
-- The system configuration is in /etc/nixos/configuration.nix.
-
-- To upgrade to a new configuration:
-
-  $ cd nixos
-  $ ./upgrade.sh
-
-  The new configuration is activated immediately (e.g., services may
-  be restarted if necessary), but some changes may require a reboot.
-
-- You can also test a new configuration:
-
-  $ cd nixos
-  $ ./test.sh
-
-  This is like ./upgrade.sh, only the new configuration won't be
-  installed in the system profile so the system will continue to boot
-  from the previous configuration.
-
-
-
-*** Troubleshooting ***        
-
-
-To get a Stage 1 shell:
-
-- Add "debug1" to the kernel command line.
-
-
-To switch to maintenance mode:
-
-  $ shutdown now
-
-To get out of maintenance mode:
-
-  $ initctl emit startup 
-
-
-
-*** Development ***
-
-- Building specific parts of NixOS:
-
-  $ nix-build system/system.nix \
-      --arg configuration "import /etc/nixos/configuration.nix" \
-      -A ATTR
-
-  where ATTR is an attribute in system/system.nix (e.g., bootStage1).
-
-- Testing the installer:
-
-  $ nix-build configuration/rescue-cd.nix -A system.nixosInstall
-  $ dd if=/dev/zero of=diskimage seek=2G count=0 bs=1
-  $ yes | mke2fs -j diskimage
-  $ mount -o loop diskimage /mnt
-  $ ./result/bin/nixos-install
+*** NixOS ***
 
+NixOS is a Linux distribution based on the purely functional package
+management system Nix.  More information can be found at
+http://nix.cs.uu.nl/nixos and in the manual in doc/manual.
diff --git a/doc/manual/manual.xml b/doc/manual/manual.xml
index 52313de1d8d..65c2a81bb90 100644
--- a/doc/manual/manual.xml
+++ b/doc/manual/manual.xml
@@ -24,11 +24,15 @@
   <preface>
     <title>Preface</title>
 
-    <para>This manual is very sketchy.  It gives basic information on
-    how to get NixOS up and running, but since NixOS is very much a
-    work in progress, you are likely to encounter problems here and
-    there.  Extensive familiarity with Linux is recommended.  If you
-    encounter problems, please report them on the
+    <para>This manual describes NixOS, a Linux distribution based on
+    the purely functional package management system Nix.</para>
+    
+    <para>NixOS is rather bleeding edge, and this manual is
+    correspondingly sketchy and quite possibly out of date.  It gives
+    basic information on how to get NixOS up and running, but since
+    NixOS is very much a work in progress, you are likely to encounter
+    problems here and there.  Extensive familiarity with Linux is
+    recommended.  If you encounter problems, please report them on the
     <literal>nix-dev@cs.uu.nl</literal> mailing list or on <link
     xlink:href="irc://irc.freenode.net/#trace" />.</para>
     
@@ -36,6 +40,7 @@
   
 
   <xi:include href="installation.xml" />
+  <xi:include href="troubleshooting.xml" />
   <xi:include href="development.xml" />
   <xi:include href="options-db.xml" />
 
diff --git a/doc/manual/troubleshooting.xml b/doc/manual/troubleshooting.xml
new file mode 100644
index 00000000000..66de9795b59
--- /dev/null
+++ b/doc/manual/troubleshooting.xml
@@ -0,0 +1,64 @@
+<chapter xmlns="http://docbook.org/ns/docbook"
+         xmlns:xlink="http://www.w3.org/1999/xlink">
+
+<title>Troubleshooting</title>
+
+
+<section>
+  
+<title>Debugging the boot process</title>
+
+<para>To get a Stage 1 shell (i.e., a shell in the initial ramdisk),
+add <literal>debug1</literal> to the kernel command line.  The shell
+gets started before anything useful has been done.  That is, no
+modules have been loaded and no file systems have been mounted, except
+for <filename>/proc</filename> and <filename>/sys</filename>.</para>
+
+<para>To get a Stage 2 shell (i.e., a shell in the actual root file
+system), add <literal>debug2</literal> to the kernel command
+line.  This shell is started right after stage 1 calls the stage 2
+<literal>init</literal> script, so the root file system is there but
+no services have been started.</para>
+
+</section>
+
+
+
+<section>
+  
+<title>Safe mode</title>
+
+<para>If the hardware autodetection (in
+<filename>upstart-jobs/hardware-scan</filename>) causes problems, add
+<literal>safemode</literal> to the kernel command line.  This will
+disable auto-loading of modules for your PCI devices.  However, you
+will probably need to explicitly add modules to
+<option>boot.extraKernelModules</option> to get network support
+etc.</para>
+
+</section>
+
+
+<section>
+  
+<title>Maintenance mode</title>
+
+<para>You can go to maintenance mode by doing
+
+<screen>
+$ shutdown now</screen>
+
+This will eventually give you a single-user root shell.
+
+To get out of maintenance mode, do
+
+<screen>
+$ initctl emit startup</screen>
+
+</para>
+
+</section>
+
+
+
+</chapter>
-- 
GitLab


From 06853a60836820c253462b14900cc734927f6e1a Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 6 Feb 2007 22:23:56 +0000
Subject: [PATCH 0461/5331] svn path=/nixos/trunk/; revision=7872

---
 configuration/rescue-cd.nix | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/configuration/rescue-cd.nix b/configuration/rescue-cd.nix
index 262529551bb..48a76cb0746 100644
--- a/configuration/rescue-cd.nix
+++ b/configuration/rescue-cd.nix
@@ -1,7 +1,7 @@
 rec {
 
   
-  nixpkgsRel = "nixpkgs-0.11pre7861";
+  nixpkgsRel = "nixpkgs-0.11pre7871";
 
 
   configuration = {
@@ -11,9 +11,6 @@ rec {
       readOnlyRoot = true;
       # The label used to identify the installation CD.
       rootLabel = "NIXOS";
-      initrd = {
-        enableSplashScreen = pkgs.stdenv.system != "x86_64-linux";
-      };
     };
     
     services = {
@@ -122,7 +119,7 @@ rec {
   # Get a recent copy of Nixpkgs.
   nixpkgsTarball = pkgs.fetchurl {
     url = configuration.installer.nixpkgsURL + "/" + nixpkgsRel + ".tar.bz2";
-    md5 = "f88f686e7bbe33065b3c9f3ce5224fea";
+    md5 = "262eadc0c4d1d954cf0ac8b03a9edfef";
   };
 
 
-- 
GitLab


From 5d02654a3c09460a845ea7bd205be587b892f20c Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 6 Feb 2007 22:49:20 +0000
Subject: [PATCH 0462/5331] * Splashutils now works on x86_64.

svn path=/nixos/trunk/; revision=7873
---
 configuration/rescue-cd.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/configuration/rescue-cd.nix b/configuration/rescue-cd.nix
index 48a76cb0746..3cae68f0c48 100644
--- a/configuration/rescue-cd.nix
+++ b/configuration/rescue-cd.nix
@@ -53,7 +53,6 @@ rec {
 
       # And a background to go with that.
       ttyBackgrounds = {
-        enable = pkgs.stdenv.system != "x86_64-linux";
         specificThemes = [
           { tty = 8;
             theme = pkgs.fetchurl {
-- 
GitLab


From 6c529fac777dc2880aead3a1d325532dcc89c879 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 7 Feb 2007 15:23:19 +0000
Subject: [PATCH 0463/5331] * Very naughty of me not to use -boot-info-table. 
 Now I know better.

svn path=/nixos/trunk/; revision=7875
---
 helpers/make-iso9660-image.sh | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/helpers/make-iso9660-image.sh b/helpers/make-iso9660-image.sh
index 910417cde47..942e782dbad 100644
--- a/helpers/make-iso9660-image.sh
+++ b/helpers/make-iso9660-image.sh
@@ -8,7 +8,20 @@ symlinks=($symlinks)
 
 
 if test -n "$bootable"; then
-    bootFlags="-b $bootImage -c boot.cat -no-emul-boot -boot-load-size 4"
+
+    # The -boot-info-table option modifies the $bootImage file, so
+    # find it in `contents' and make a copy of it (since the original
+    # is read-only in the Nix store...).
+    for ((i = 0; i < ${#targets_[@]}; i++)); do
+        if test "${targets_[$i]}" = "$bootImage"; then
+            echo "copying the boot image ${sources_[$i]}"
+            cp "${sources_[$i]}" boot.img
+            chmod u+w boot.img
+            sources_[$i]=boot.img
+        fi
+    done
+
+    bootFlags="-b $bootImage -c boot.cat -no-emul-boot -boot-load-size 4 -boot-info-table"
 fi
 
 
-- 
GitLab


From 2f6810d4af732009a8a23c63771fe35e70f772be Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 7 Feb 2007 16:10:37 +0000
Subject: [PATCH 0464/5331] svn path=/nixos/trunk/; revision=7878

---
 system/options.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/system/options.nix b/system/options.nix
index 28cfd0a85d9..1cdf3d04157 100644
--- a/system/options.nix
+++ b/system/options.nix
@@ -126,6 +126,7 @@
     default = [
       "ahci"
       "ata_piix"
+      "pata_marvell"
       "sd_mod"
       "sr_mod"
       "ide-cd"
-- 
GitLab


From 56576e7c280e30c574bf716545a04c77b61e5066 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 8 Feb 2007 15:24:13 +0000
Subject: [PATCH 0465/5331] * Prevent repeated mounting.

svn path=/nixos/trunk/; revision=7882
---
 upstart-jobs/filesystems.nix | 20 +++++++++++++++-----
 1 file changed, 15 insertions(+), 5 deletions(-)

diff --git a/upstart-jobs/filesystems.nix b/upstart-jobs/filesystems.nix
index b1b863c3701..cda4e76f5d0 100644
--- a/upstart-jobs/filesystems.nix
+++ b/upstart-jobs/filesystems.nix
@@ -53,6 +53,16 @@ script
                 continue
             fi
 
+            # !!! quick hack: if mount point already exists, try a
+            # remount to change the options but nothing else.
+            if cat /proc/mounts | grep -F -q \" $mountPoint \"; then
+                echo \"remounting $device on $mountPoint\"
+                ${utillinux}/bin/mount -t \"$fsType\" \\
+                    -o remount,\"$options\" \\
+                    \"$device\" \"$mountPoint\" || true
+                continue
+            fi
+
             # If $device is already mounted somewhere else, unmount it first.
             # !!! Note: we use /etc/mtab, not /proc/mounts, because mtab
             # contains more accurate info when using loop devices.
@@ -69,11 +79,11 @@ script
                 )
 
                 if test \"$prevMountPoint\" = \"$mountPoint\"; then
-                     echo \"remounting $device on $mountPoint\"
-                     ${utillinux}/bin/mount -t \"$fsType\" \\
-                         -o remount,\"$options\" \\
-                         \"$device\" \"$mountPoint\" || true
-                     continue
+                    echo \"remounting $device on $mountPoint\"
+                    ${utillinux}/bin/mount -t \"$fsType\" \\
+                        -o remount,\"$options\" \\
+                        \"$device\" \"$mountPoint\" || true
+                    continue
                 fi
 
                 if test -n \"$prevMountPoint\"; then
-- 
GitLab


From 7fac47a98bf93bde6151316ad87251054afc5ae6 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 8 Feb 2007 18:23:57 +0000
Subject: [PATCH 0466/5331] svn path=/nixos/trunk/; revision=7884

---
 configuration/rescue-cd.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/configuration/rescue-cd.nix b/configuration/rescue-cd.nix
index 3cae68f0c48..1243a05525e 100644
--- a/configuration/rescue-cd.nix
+++ b/configuration/rescue-cd.nix
@@ -1,7 +1,7 @@
 rec {
 
   
-  nixpkgsRel = "nixpkgs-0.11pre7871";
+  nixpkgsRel = "nixpkgs-0.11pre7883";
 
 
   configuration = {
@@ -118,7 +118,7 @@ rec {
   # Get a recent copy of Nixpkgs.
   nixpkgsTarball = pkgs.fetchurl {
     url = configuration.installer.nixpkgsURL + "/" + nixpkgsRel + ".tar.bz2";
-    md5 = "262eadc0c4d1d954cf0ac8b03a9edfef";
+    md5 = "ed4a3b5b0acd39be511381a81787b0c0";
   };
 
 
-- 
GitLab


From 7ac8157fed8f045299abab6d2b536808b51d6278 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 8 Feb 2007 19:51:36 +0000
Subject: [PATCH 0467/5331] * Doh!

svn path=/nixos/trunk/; revision=7885
---
 installer/nixos-install.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/installer/nixos-install.sh b/installer/nixos-install.sh
index 1dae5d74fdb..abf99cc60f1 100644
--- a/installer/nixos-install.sh
+++ b/installer/nixos-install.sh
@@ -123,7 +123,7 @@ cp /etc/resolv.conf $mountPoint/etc/
 # the CD can be copied directly.
 echo "registering substitutes to speed up builds..."
 chroot $mountPoint @nix@/bin/nix-store --clear-substitutes
-if test -e /mnt/MANIFEST; then
+if test -e /MANIFEST; then
     chroot $mountPoint @nix@/bin/nix-pull file:///mnt/MANIFEST
 fi
 rm -f $mountPoint/tmp/inst-store
-- 
GitLab


From 2c62eac3a1c6ad268125ebabff15dabfece993d6 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 8 Feb 2007 19:53:21 +0000
Subject: [PATCH 0468/5331] * Check if Subversion is already installed.

svn path=/nixos/trunk/; revision=7886
---
 installer/nixos-checkout.sh | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/installer/nixos-checkout.sh b/installer/nixos-checkout.sh
index 8d1a13cafc2..a1defc3f1ce 100644
--- a/installer/nixos-checkout.sh
+++ b/installer/nixos-checkout.sh
@@ -2,9 +2,11 @@
 set -x
 
 # Obtain Subversion.
-nix-channel --add http://nix.cs.uu.nl/dist/nix/channels-v3/nixpkgs-unstable
-nix-channel --update
-nix-env -i subversion
+if test -z "$(type -tp svn)"; then
+    nix-channel --add http://nix.cs.uu.nl/dist/nix/channels-v3/nixpkgs-unstable
+    nix-channel --update
+    nix-env -i subversion
+fi
 
 cd /etc/nixos
 
-- 
GitLab


From 582abdaae2b0be2a959dc87b5ff748ddee186647 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 9 Feb 2007 16:19:29 +0000
Subject: [PATCH 0469/5331] * Option boot.copyKernels to copy all kernels and
 initrd to   /boot/kernels.  This is necessary if /nix is on a different file 
  system than /.  (And it will allow us to support a separate /boot  
 partition too.)

svn path=/nixos/trunk/; revision=7887
---
 installer/grub-menu-builder.sh | 36 +++++++++++++++++++++++++++-------
 system/options.nix             | 11 +++++++++++
 system/system.nix              |  1 +
 3 files changed, 41 insertions(+), 7 deletions(-)

diff --git a/installer/grub-menu-builder.sh b/installer/grub-menu-builder.sh
index 06371d4af7e..078d2c09d07 100644
--- a/installer/grub-menu-builder.sh
+++ b/installer/grub-menu-builder.sh
@@ -19,22 +19,45 @@ default=0
 timeout=5
 GRUBEND
 
+
+
 addEntry() {
-    name="$1"
-    path="$2"
+    local name="$1"
+    local path="$2"
 
-    if ! test -e $path/menu.lst; then
+    if ! test -e $path/kernel -a -e $path/initrd; then
         return
     fi
 
+    local kernel=$(readlink -f $path/kernel)
+    local initrd=$(readlink -f $path/initrd)
+
+    if test -n "@copyKernels@"; then
+        local kernel2=/boot/kernels/$(echo $kernel | sed 's^/^-^g')
+        if ! test -e $kernel2; then
+            cp $kernel $kernel2
+        fi
+        kernel=$kernel2
+
+        local initrd2=/boot/kernels/$(echo $initrd | sed 's^/^-^g')
+        if ! test -e $initrd2; then
+            cp $initrd $initrd2
+        fi
+        initrd=$initrd2
+    fi
+    
     cat >> $tmp << GRUBEND
 title $name
+  kernel $kernel init=$(readlink -f $path/init) $(cat $path/kernel-params)
+  initrd $initrd
 GRUBEND
+}
 
-    #cat $path/menu.lst >> $tmp
 
-    grep -v "title \|default=\|timeout=" < $path/menu.lst >> $tmp
-}
+rm -rf /boot/kernels
+if test -n "@copyKernels@"; then
+    mkdir -p /boot/kernels
+fi
 
 
 if test -n "$tmp"; then
@@ -52,7 +75,6 @@ for generation in $(
     link=/nix/var/nix/profiles/system-$generation-link
     date=$(stat --printf="%y\n" $link | sed 's/\..*//')
     addEntry "NixOS - Configuration $generation ($date)" $link
-        
 done
 
 
diff --git a/system/options.nix b/system/options.nix
index 1cdf3d04157..6c0322aa70c 100644
--- a/system/options.nix
+++ b/system/options.nix
@@ -175,6 +175,17 @@
   }
 
 
+  {
+    name = ["boot" "copyKernels"];
+    default = false;
+    description = "
+      Whether the Grub menu builder should copy kernels and initial
+      ramdisks to /boot.  This is necessary when /nix is on a
+      different file system than /.
+    ";
+  }
+
+
   {
     name = ["networking" "useDHCP"];
     default = true;
diff --git a/system/system.nix b/system/system.nix
index c29d6100c98..0fbe3ad7c65 100644
--- a/system/system.nix
+++ b/system/system.nix
@@ -256,6 +256,7 @@ rec {
     isExecutable = true;
     inherit (pkgs) bash;
     path = [pkgs.coreutils pkgs.gnused pkgs.gnugrep];
+    copyKernels = config.get ["boot" "copyKernels"];
   };
 
 
-- 
GitLab


From ac93023f351eae3b6186ac140346ee3d2105f1b6 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 12 Feb 2007 11:57:18 +0000
Subject: [PATCH 0470/5331] * Pass userCreationDomain.

svn path=/nixos/trunk/; revision=7891
---
 system/options.nix     | 11 +++++++++++
 upstart-jobs/httpd.nix |  1 +
 2 files changed, 12 insertions(+)

diff --git a/system/options.nix b/system/options.nix
index 6c0322aa70c..1a2c80f3403 100644
--- a/system/options.nix
+++ b/system/options.nix
@@ -537,6 +537,17 @@
   }
 
   
+  {
+    name = ["services" "httpd" "subservices" "subversion" "userCreationDomain"];
+    example = "example.org";
+    description = "
+      The domain from which user creation is allowed.  A client can
+      only create a new user account if its IP address resolves to
+      this domain.
+    ";
+  }
+
+  
   {
     name = ["services" "httpd" "subservices" "subversion" "autoVersioning"];
     default = false;
diff --git a/upstart-jobs/httpd.nix b/upstart-jobs/httpd.nix
index e9434d7f0e8..c930dcb3caa 100644
--- a/upstart-jobs/httpd.nix
+++ b/upstart-jobs/httpd.nix
@@ -48,6 +48,7 @@ let
 
           notificationSender = getCfgSvn "notificationSender";
           autoVersioning = getCfgSvn "autoVersioning";
+          userCreationDomain = getCfgSvn "userCreationDomain";
 
           inherit pkgs;
         })
-- 
GitLab


From d4c172469d4185328872725ddb8f8c3598fdbe07 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 12 Feb 2007 15:29:43 +0000
Subject: [PATCH 0471/5331] * Add $profile/sbin to the PATH.

svn path=/nixos/trunk/; revision=7896
---
 system/etc/profile.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/system/etc/profile.sh b/system/etc/profile.sh
index 738eb056ea7..b858f9e74b0 100644
--- a/system/etc/profile.sh
+++ b/system/etc/profile.sh
@@ -31,7 +31,7 @@ fi
 NIX_PROFILES="/nix/var/nix/profiles/default $NIX_USER_PROFILE_DIR/profile"
 
 for i in $NIX_PROFILES; do # !!! reverse
-    export PATH=$i/bin:$PATH
+    export PATH=$i/bin:$i/sbin:$PATH
 done
 
 
-- 
GitLab


From 06a6116c44717561d011d1d448961249d104289f Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 12 Feb 2007 16:00:55 +0000
Subject: [PATCH 0472/5331] * Allow manual network configuration, i.e.,
 specificying the IP   address, gateway, and nameservers in the system
 configuration.

svn path=/nixos/trunk/; revision=7898
---
 system/options.nix                  | 23 ++++++++++++++++--
 system/upstart.nix                  | 16 ++++++++-----
 upstart-jobs/network-interfaces.nix | 36 ++++++++++++++++++++++++++++-
 3 files changed, 66 insertions(+), 9 deletions(-)

diff --git a/system/options.nix b/system/options.nix
index 1a2c80f3403..56bb1fb6763 100644
--- a/system/options.nix
+++ b/system/options.nix
@@ -201,10 +201,9 @@
     name = ["networking" "interfaces"];
     default = [];
     example = [
-      { interface = "eth0";
+      { name = "eth0";
         ipAddress = "131.211.84.78";
         netmask = "255.255.255.128";
-        gateway = "131.211.84.1";
       }
     ];
     description = "
@@ -215,6 +214,26 @@
   }
 
   
+  {
+    name = ["networking" "defaultGateway"];
+    default = "";
+    example = "131.211.84.1";
+    description = "
+      The default gateway.  It can be left empty if it is auto-detected through DHCP.
+    ";
+  }
+
+  
+  {
+    name = ["networking" "nameservers"];
+    default = [];
+    example = ["130.161.158.4" "130.161.33.17"];
+    description = "
+      The list of nameservers.  It can be left empty if it is auto-detected through DHCP.
+    ";
+  }
+
+  
   {
     name = ["fileSystems"];
     default = [];
diff --git a/system/upstart.nix b/system/upstart.nix
index 836a279346f..4e81e10f930 100644
--- a/system/upstart.nix
+++ b/system/upstart.nix
@@ -59,14 +59,11 @@ import ../upstart-jobs/gather.nix {
     # Network interfaces.
     (import ../upstart-jobs/network-interfaces.nix {
       inherit (pkgs) nettools kernel module_init_tools;
+      nameservers = config.get ["networking" "nameservers"];
+      defaultGateway = config.get ["networking" "defaultGateway"];
+      interfaces = config.get ["networking" "interfaces"];
     })
       
-    # DHCP client.
-    (import ../upstart-jobs/dhclient.nix {
-      inherit (pkgs) nettools;
-      dhcp = pkgs.dhcpWrapper;
-    })
-
     # Nix daemon - required for multi-user Nix.
     (import ../upstart-jobs/nix-daemon.nix {
       inherit nix;
@@ -93,6 +90,13 @@ import ../upstart-jobs/gather.nix {
 
   ]
 
+  # DHCP client.
+  ++ optional ["networking" "useDHCP"]
+    (import ../upstart-jobs/dhclient.nix {
+      inherit (pkgs) nettools;
+      dhcp = pkgs.dhcpWrapper;
+    })
+
   # SSH daemon.
   ++ optional ["services" "sshd" "enable"]
     (import ../upstart-jobs/sshd.nix {
diff --git a/upstart-jobs/network-interfaces.nix b/upstart-jobs/network-interfaces.nix
index d85c7e02001..350bd6f6c90 100644
--- a/upstart-jobs/network-interfaces.nix
+++ b/upstart-jobs/network-interfaces.nix
@@ -1,5 +1,15 @@
 # !!! Don't like it that I have to pass the kernel here.
-{nettools, kernel, module_init_tools}:
+{ nettools, kernel, module_init_tools
+, nameservers, defaultGateway, interfaces
+}:
+
+let
+
+  # !!! use XML
+  names = map (i: i.name) interfaces;
+  ipAddresses = map (i: i.ipAddress) interfaces;
+
+in 
 
 {
   name = "network-interfaces";
@@ -18,6 +28,30 @@ start script
         ${nettools}/sbin/ifconfig $i up || true
     done
 
+    # Configure the manually specified interfaces.
+    names=(${toString names})
+    ipAddresses=(${toString ipAddresses})
+    
+    for ((n = 0; n < \${#names[*]}; n++)); do
+        name=\${names[$n]}
+        ipAddress=\${ipAddresses[$n]}
+        echo \"Configuring interface $i...\"
+        ${nettools}/sbin/ifconfig \"$name\" up \"$ipAddress\" || true
+    done
+
+    # Set the nameservers.
+    if test -n \"${toString nameservers}\"; then
+        rm -f /etc/resolv.conf
+        for i in ${toString nameservers}; do
+            echo \"nameserver $i\" >> /etc/resolv.conf
+        done
+    fi
+
+    # Set the default gateway.
+    if test -n \"${defaultGateway}\"; then
+        ${nettools}/sbin/route add default gw \"${defaultGateway}\" || true
+    fi
+
 end script
 
 # Hack: Upstart doesn't yet support what we want: a service that
-- 
GitLab


From 17cc5ecc474d86e2c00eaef8e7e4ea7002e30096 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 19 Feb 2007 22:33:44 +0000
Subject: [PATCH 0473/5331] * Add OpenSSH and pciutils to the boot environment.

svn path=/nixos/trunk/; revision=7918
---
 doc/manual/development.xml | 3 ++-
 system/options.nix         | 4 ++--
 system/system.nix          | 2 ++
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/doc/manual/development.xml b/doc/manual/development.xml
index 58924658ca6..6f61068d0b6 100644
--- a/doc/manual/development.xml
+++ b/doc/manual/development.xml
@@ -19,7 +19,8 @@ $ nix-build system/system.nix \
     -A <replaceable>attr</replaceable></screen>
 
 where <replaceable>attr</replaceable> is an attribute in
-system/system.nix (e.g., <literal>bootStage1</literal>).</para>
+<filename>system/system.nix</filename> (e.g.,
+<literal>bootStage1</literal>).</para>
 
 </section>
 
diff --git a/system/options.nix b/system/options.nix
index 56bb1fb6763..65eeda5eb92 100644
--- a/system/options.nix
+++ b/system/options.nix
@@ -33,8 +33,8 @@
     name = ["boot" "readOnlyRoot"];
     default = false;
     description = "
-      Whether the root device should be mounted writable.  This should
-      be set when booting from CD-ROM.
+      Whether the root device is read-only.  This should be set when
+      booting from CD-ROM.
     ";
   }
 
diff --git a/system/system.nix b/system/system.nix
index 0fbe3ad7c65..02410482e8e 100644
--- a/system/system.nix
+++ b/system/system.nix
@@ -179,6 +179,8 @@ rec {
     pkgs.netcat
     pkgs.nettools
     pkgs.ntp
+    pkgs.openssh
+    pkgs.pciutils
     pkgs.perl
     pkgs.procps
     pkgs.pwdutils
-- 
GitLab


From 619c3e0465cad9fe1600344300e3b5ced4f6b6c9 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 20 Feb 2007 14:20:33 +0000
Subject: [PATCH 0474/5331] * Don't use the DHCP wrapper.

svn path=/nixos/trunk/; revision=7921
---
 system/upstart.nix        | 3 +--
 upstart-jobs/dhclient.nix | 2 ++
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/system/upstart.nix b/system/upstart.nix
index 4e81e10f930..71affda04ac 100644
--- a/system/upstart.nix
+++ b/system/upstart.nix
@@ -93,8 +93,7 @@ import ../upstart-jobs/gather.nix {
   # DHCP client.
   ++ optional ["networking" "useDHCP"]
     (import ../upstart-jobs/dhclient.nix {
-      inherit (pkgs) nettools;
-      dhcp = pkgs.dhcpWrapper;
+      inherit (pkgs) nettools dhcp;
     })
 
   # SSH daemon.
diff --git a/upstart-jobs/dhclient.nix b/upstart-jobs/dhclient.nix
index 3b8161820d8..f4d4ab17cc6 100644
--- a/upstart-jobs/dhclient.nix
+++ b/upstart-jobs/dhclient.nix
@@ -9,6 +9,8 @@ description \"DHCP client\"
 start on network-interfaces/started
 stop on network-interfaces/stop
 
+env PATH_DHCLIENT_SCRIPT=${dhcp}/sbin/dhclient-script
+
 script
     # Determine the interface on which to start dhclient.
     interfaces=
-- 
GitLab


From 66a9cfbcdcbe057acda5526c7926a526723a09c7 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 20 Feb 2007 14:30:05 +0000
Subject: [PATCH 0475/5331] * Give everybody access to /dev/kvm.  I *think*
 that's safe...

svn path=/nixos/trunk/; revision=7923
---
 upstart-jobs/udev-rules/50-udev.rules | 1 +
 1 file changed, 1 insertion(+)

diff --git a/upstart-jobs/udev-rules/50-udev.rules b/upstart-jobs/udev-rules/50-udev.rules
index b89ac321efb..ff2ed86888b 100644
--- a/upstart-jobs/udev-rules/50-udev.rules
+++ b/upstart-jobs/udev-rules/50-udev.rules
@@ -10,6 +10,7 @@ KERNEL=="urandom",              MODE="0644"
 KERNEL=="rtc",                  MODE="0600"
 KERNEL=="sonypi",               MODE="0666"
 KERNEL=="agpgart",              MODE="0600"
+KERNEL=="kvm",                  MODE="0666"
 
 
 # TTYs.
-- 
GitLab


From ef8e5716cb77dbc61d313924d3cd318addd24e6c Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 20 Feb 2007 14:59:29 +0000
Subject: [PATCH 0476/5331] * Set the right PATH for dhclient.

svn path=/nixos/trunk/; revision=7925
---
 upstart-jobs/dhclient.nix | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/upstart-jobs/dhclient.nix b/upstart-jobs/dhclient.nix
index f4d4ab17cc6..dd3a41e2ef8 100644
--- a/upstart-jobs/dhclient.nix
+++ b/upstart-jobs/dhclient.nix
@@ -12,6 +12,8 @@ stop on network-interfaces/stop
 env PATH_DHCLIENT_SCRIPT=${dhcp}/sbin/dhclient-script
 
 script
+    export PATH=${nettools}/sbin:$PATH
+
     # Determine the interface on which to start dhclient.
     interfaces=
 
@@ -25,7 +27,7 @@ script
     #    fi
     #done
 
-    for i in $(${nettools}/sbin/ifconfig | grep '^[^ ]' | sed 's/ .*//'); do
+    for i in $(ifconfig | grep '^[^ ]' | sed 's/ .*//'); do
         if test \"$i\" != \"lo\"; then
             interfaces=\"$interfaces $i\"
         fi
@@ -38,7 +40,7 @@ script
 
     mkdir -m 755 -p /var/state/dhcp
 
-    exec ${dhcp}/sbin/dhclient -d $interfaces
+    exec ${dhcp}/sbin/dhclient -d $interfaces -e \"PATH=$PATH\"
 end script
   ";
   
-- 
GitLab


From eeee6ea1e2593b669aa944fdbe5922a7390de023 Mon Sep 17 00:00:00 2001
From: Martin Bravenboer <martin.bravenboer@logicblox.com>
Date: Tue, 20 Feb 2007 15:11:49 +0000
Subject: [PATCH 0477/5331] added configuration option for extraSubservices,
 which allows you to plugin an arbitrary service into the webserver.

svn path=/nixos/trunk/; revision=7926
---
 system/options.nix     | 17 ++++++++++++++++-
 upstart-jobs/httpd.nix | 12 +++++++++---
 2 files changed, 25 insertions(+), 4 deletions(-)

diff --git a/system/options.nix b/system/options.nix
index 65eeda5eb92..7ebe9217ee3 100644
--- a/system/options.nix
+++ b/system/options.nix
@@ -578,7 +578,22 @@
     ";
   }
 
-  
+  {
+    name = ["services" "httpd" "extraSubservices" "enable"];
+    default = false;
+    description = "
+      Whether to enable the extra subservices in the webserver.
+    ";
+  }
+
+  {
+    name = ["services" "httpd" "extraSubservices" "services"];
+    default = false;
+    description = "
+      Extra subservices to enable in the webserver.
+    ";
+  }
+
   {
     name = ["installer" "nixpkgsURL"];
     default = "";
diff --git a/upstart-jobs/httpd.nix b/upstart-jobs/httpd.nix
index c930dcb3caa..59f08898cff 100644
--- a/upstart-jobs/httpd.nix
+++ b/upstart-jobs/httpd.nix
@@ -3,6 +3,7 @@
 let
 
   getCfg = option: config.get ["services" "httpd" option];
+  getCfgs = options: config.get (["services" "httpd"] ++ options); 
   getCfgSvn = option: config.get ["services" "httpd" "subservices" "subversion" option];
 
   optional = conf: subService:
@@ -29,7 +30,7 @@ let
     subServices =
     
       # The Subversion subservice.
-      optional (getCfgSvn "enable") (
+      (optional (getCfgSvn "enable") (
         let dataDir = getCfgSvn "dataDir"; in
         import ../services/subversion {
           reposDir = dataDir + "/repos";
@@ -52,10 +53,15 @@ let
 
           inherit pkgs;
         })
-        
+      )
+      ++
+
+      (optional (getCfgs ["extraSubservices" "enable"]) (
+        (getCfgs ["extraSubservices" "services"]) webServer pkgs
+        )
+      )
       ;
   };
-
   
 in
 
-- 
GitLab


From 454716ef4f213a918299beb46928f4797ee94a9c Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 20 Feb 2007 15:14:48 +0000
Subject: [PATCH 0478/5331] * Typo.

svn path=/nixos/trunk/; revision=7928
---
 upstart-jobs/network-interfaces.nix | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/upstart-jobs/network-interfaces.nix b/upstart-jobs/network-interfaces.nix
index 350bd6f6c90..161ba506882 100644
--- a/upstart-jobs/network-interfaces.nix
+++ b/upstart-jobs/network-interfaces.nix
@@ -31,11 +31,11 @@ start script
     # Configure the manually specified interfaces.
     names=(${toString names})
     ipAddresses=(${toString ipAddresses})
-    
+
     for ((n = 0; n < \${#names[*]}; n++)); do
         name=\${names[$n]}
         ipAddress=\${ipAddresses[$n]}
-        echo \"Configuring interface $i...\"
+        echo \"Configuring interface $name...\"
         ${nettools}/sbin/ifconfig \"$name\" up \"$ipAddress\" || true
     done
 
@@ -52,6 +52,10 @@ start script
         ${nettools}/sbin/route add default gw \"${defaultGateway}\" || true
     fi
 
+    # Restart dhclient.
+    #initctl stop dhclient || true
+    #initctl start dhclient || true
+
 end script
 
 # Hack: Upstart doesn't yet support what we want: a service that
-- 
GitLab


From a17b1d5c5f47b5ee1a945fe7705adf1a64ac6f7c Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 20 Feb 2007 15:51:13 +0000
Subject: [PATCH 0479/5331] * Kill all processes during shutdown so that we can
 unmount   filesystems cleanly.

svn path=/nixos/trunk/; revision=7930
---
 upstart-jobs/halt.nix | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/upstart-jobs/halt.nix b/upstart-jobs/halt.nix
index ce23e967e8b..4da444774a2 100644
--- a/upstart-jobs/halt.nix
+++ b/upstart-jobs/halt.nix
@@ -19,9 +19,22 @@ script
 
     export PATH=${utillinux}/bin:${utillinux}/sbin:$PATH
 
+
     # Do an initial sync just in case.
     sync || true
 
+
+    # Kill all remaining processes except init and this one.
+    echo \"Sending the TERM signal to all processes...\"
+    kill -TERM -1
+
+    sleep 1 # wait briefly
+
+    echo \"Sending the KILL signal to all processes...\"
+    kill -KILL -1
+
+
+    # Unmount helper functions.
     getMountPoints() {
         cat /proc/mounts \\
         | grep -v '^rootfs' \\
-- 
GitLab


From e99ffcbe712605ebd717b66fae8ea12b8b18e4b0 Mon Sep 17 00:00:00 2001
From: Martin Bravenboer <martin.bravenboer@logicblox.com>
Date: Tue, 20 Feb 2007 15:57:15 +0000
Subject: [PATCH 0480/5331] changed the extraSubservices to a list of functions

svn path=/nixos/trunk/; revision=7931
---
 system/options.nix     | 2 +-
 upstart-jobs/httpd.nix | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/system/options.nix b/system/options.nix
index 7ebe9217ee3..bbbd2c06a2a 100644
--- a/system/options.nix
+++ b/system/options.nix
@@ -588,7 +588,7 @@
 
   {
     name = ["services" "httpd" "extraSubservices" "services"];
-    default = false;
+    default = [];
     description = "
       Extra subservices to enable in the webserver.
     ";
diff --git a/upstart-jobs/httpd.nix b/upstart-jobs/httpd.nix
index 59f08898cff..d39a8206324 100644
--- a/upstart-jobs/httpd.nix
+++ b/upstart-jobs/httpd.nix
@@ -19,7 +19,6 @@ let
   logDir = getCfg "logDir";
   stateDir = getCfg "stateDir";
   enableSSL = false;
-
   
   webServer = import ../services/apache-httpd {
     inherit (pkgs) stdenv apacheHttpd coreutils;
@@ -56,8 +55,9 @@ let
       )
       ++
 
-      (optional (getCfgs ["extraSubservices" "enable"]) (
-        (getCfgs ["extraSubservices" "services"]) webServer pkgs
+      (optional (getCfgs ["extraSubservices" "enable"])
+        (map (service : service webServer pkgs)
+          (getCfgs ["extraSubservices" "services"])
         )
       )
       ;
-- 
GitLab


From 1dd2eb58bebac567b1ae665c3edcb0eaf374acaa Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 20 Feb 2007 16:25:49 +0000
Subject: [PATCH 0481/5331] * Set the hardware clock when shutting down.

svn path=/nixos/trunk/; revision=7933
---
 upstart-jobs/halt.nix | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/upstart-jobs/halt.nix b/upstart-jobs/halt.nix
index 4da444774a2..9e6c798ea86 100644
--- a/upstart-jobs/halt.nix
+++ b/upstart-jobs/halt.nix
@@ -12,6 +12,8 @@ assert event == "reboot"
 start on ${event}
 
 script
+    set +e # continue in case of errors
+
     exec < /dev/tty1 > /dev/tty1 2>&1
     echo \"\"
     echo \"<<< SYSTEM SHUTDOWN >>>\"
@@ -20,18 +22,23 @@ script
     export PATH=${utillinux}/bin:${utillinux}/sbin:$PATH
 
 
+    # Set the hardware clock to the system time.
+    echo \"Setting the hardware clock...\"
+    hwclock --systohc --utc || true
+
+
     # Do an initial sync just in case.
     sync || true
 
 
     # Kill all remaining processes except init and this one.
     echo \"Sending the TERM signal to all processes...\"
-    kill -TERM -1
+    kill -TERM -1 || true
 
     sleep 1 # wait briefly
 
     echo \"Sending the KILL signal to all processes...\"
-    kill -KILL -1
+    kill -KILL -1 || true
 
 
     # Unmount helper functions.
@@ -78,15 +85,18 @@ script
 
     cat /proc/mounts
 
+
     # Final sync.
     sync || true
 
+
     # Right now all events above power off the system.
     if test ${event} = reboot; then
         exec reboot -f
     else
         exec halt -f -p
     fi
+
 end script
   ";
   
-- 
GitLab


From 312e3d0e6b9eb86df5fa839b7ef8ccbdc3bb1b4e Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 21 Feb 2007 14:42:56 +0000
Subject: [PATCH 0482/5331] * Make ping setuid root.

svn path=/nixos/trunk/; revision=7970
---
 system/options.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/system/options.nix b/system/options.nix
index bbbd2c06a2a..d5f0ea6e860 100644
--- a/system/options.nix
+++ b/system/options.nix
@@ -607,7 +607,7 @@
   
   {
     name = ["security" "setuidPrograms"];
-    default = ["passwd" "su" "crontab"];
+    default = ["passwd" "su" "crontab" "ping" "ping6"];
     description = "
       Only the programs listed here will be made setuid root (through
       a wrapper program).
-- 
GitLab


From 8e6c1ba85d9bf15a600904afd71fcebec40b6415 Mon Sep 17 00:00:00 2001
From: Martin Bravenboer <martin.bravenboer@logicblox.com>
Date: Thu, 22 Feb 2007 10:55:58 +0000
Subject: [PATCH 0483/5331] Support organization configuration for subversion

svn path=/nixos/trunk/; revision=8006
---
 system/options.nix     | 24 ++++++++++++++++++++++++
 upstart-jobs/httpd.nix | 17 +++++++++++++++--
 2 files changed, 39 insertions(+), 2 deletions(-)

diff --git a/system/options.nix b/system/options.nix
index d5f0ea6e860..f468b804744 100644
--- a/system/options.nix
+++ b/system/options.nix
@@ -578,6 +578,30 @@
     ";
   }
 
+  {
+    name = ["services" "httpd" "subservices" "subversion" "organization" "name"];
+    default = null;
+    description = "
+      Name of the organization hosting the Subversion service.
+    ";
+  }
+
+  {
+    name = ["services" "httpd" "subservices" "subversion" "organization" "url"];
+    default = null;
+    description = "
+      URL of the website of the organization hosting the Subversion service.
+    ";
+  }
+
+  {
+    name = ["services" "httpd" "subservices" "subversion" "organization" "logo"];
+    default = null;
+    description = "
+      Logo the organization hosting the Subversion service.
+    ";
+  }
+
   {
     name = ["services" "httpd" "extraSubservices" "enable"];
     default = false;
diff --git a/upstart-jobs/httpd.nix b/upstart-jobs/httpd.nix
index d39a8206324..20c6cb7a331 100644
--- a/upstart-jobs/httpd.nix
+++ b/upstart-jobs/httpd.nix
@@ -5,6 +5,7 @@ let
   getCfg = option: config.get ["services" "httpd" option];
   getCfgs = options: config.get (["services" "httpd"] ++ options); 
   getCfgSvn = option: config.get ["services" "httpd" "subservices" "subversion" option];
+  getCfgsSvn = options: config.get (["services" "httpd" "subservices" "subversion"] ++ options);
 
   optional = conf: subService:
     if conf then [subService] else [];
@@ -31,7 +32,7 @@ let
       # The Subversion subservice.
       (optional (getCfgSvn "enable") (
         let dataDir = getCfgSvn "dataDir"; in
-        import ../services/subversion {
+        import ../services/subversion ({
           reposDir = dataDir + "/repos";
           dbDir = dataDir + "/db";
           distsDir = dataDir + "/dist";
@@ -51,7 +52,19 @@ let
           userCreationDomain = getCfgSvn "userCreationDomain";
 
           inherit pkgs;
-        })
+        } //
+          ( if getCfgsSvn ["organization" "name"] != null then
+              {
+                orgName = getCfgsSvn ["organization" "name"];
+                orgLogoFile = getCfgsSvn ["organization" "logo"];
+                orgUrl = getCfgsSvn ["organization" "url"];
+              }
+            else
+              # use the default from the subversion service
+              {} 
+          )
+        )
+        )
       )
       ++
 
-- 
GitLab


From e576209a61403e0046c257f7260d95c5163ccc54 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 22 Feb 2007 14:00:22 +0000
Subject: [PATCH 0484/5331] * ifconfig up -> ifconfig.

svn path=/nixos/trunk/; revision=8011
---
 upstart-jobs/network-interfaces.nix | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/upstart-jobs/network-interfaces.nix b/upstart-jobs/network-interfaces.nix
index 161ba506882..7ed68d7a7b2 100644
--- a/upstart-jobs/network-interfaces.nix
+++ b/upstart-jobs/network-interfaces.nix
@@ -36,7 +36,7 @@ start script
         name=\${names[$n]}
         ipAddress=\${ipAddresses[$n]}
         echo \"Configuring interface $name...\"
-        ${nettools}/sbin/ifconfig \"$name\" up \"$ipAddress\" || true
+        ${nettools}/sbin/ifconfig \"$name\" \"$ipAddress\" || true
     done
 
     # Set the nameservers.
@@ -52,10 +52,6 @@ start script
         ${nettools}/sbin/route add default gw \"${defaultGateway}\" || true
     fi
 
-    # Restart dhclient.
-    #initctl stop dhclient || true
-    #initctl start dhclient || true
-
 end script
 
 # Hack: Upstart doesn't yet support what we want: a service that
-- 
GitLab


From e23de214abe2367f18a31e47a4125f6104068b90 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 22 Feb 2007 14:06:15 +0000
Subject: [PATCH 0485/5331] * Only start dhclient on real network interfaces
 like eth0, not aliases like eth0:0.

svn path=/nixos/trunk/; revision=8012
---
 upstart-jobs/dhclient.nix | 13 ++-----------
 1 file changed, 2 insertions(+), 11 deletions(-)

diff --git a/upstart-jobs/dhclient.nix b/upstart-jobs/dhclient.nix
index dd3a41e2ef8..73f80528c55 100644
--- a/upstart-jobs/dhclient.nix
+++ b/upstart-jobs/dhclient.nix
@@ -17,18 +17,9 @@ script
     # Determine the interface on which to start dhclient.
     interfaces=
 
-    # !!! apparent race; operstate seems to have a slight delay, so
-    # if dhclient is started right after network-interfaces, we don't
-    # always see all the interfaces.
-
-    #for i in $(cd /sys/class/net && ls -d *); do
-    #    if test \"$i\" != \"lo\" -a \"$(cat /sys/class/net/$i/operstate)\" != 'down'; then
-    #        interfaces=\"$interfaces $i\"
-    #    fi
-    #done
-
-    for i in $(ifconfig | grep '^[^ ]' | sed 's/ .*//'); do
+    for i in $(cd /sys/class/net && ls -d *); do
         if test \"$i\" != \"lo\"; then
+            echo \"Running dhclient on $i\"
             interfaces=\"$interfaces $i\"
         fi
     done
-- 
GitLab


From ed36857d5ee71c11a0856a643a21eeb881a16d27 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 22 Feb 2007 14:26:53 +0000
Subject: [PATCH 0486/5331] * Don't start dhclient on interfaces that are
 explicitly configured.

svn path=/nixos/trunk/; revision=8014
---
 system/upstart.nix        |  3 ++-
 upstart-jobs/dhclient.nix | 12 ++++++++++--
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/system/upstart.nix b/system/upstart.nix
index 71affda04ac..194b6bdb8e1 100644
--- a/system/upstart.nix
+++ b/system/upstart.nix
@@ -93,7 +93,8 @@ import ../upstart-jobs/gather.nix {
   # DHCP client.
   ++ optional ["networking" "useDHCP"]
     (import ../upstart-jobs/dhclient.nix {
-      inherit (pkgs) nettools dhcp;
+      inherit (pkgs) nettools dhcp lib;
+      interfaces = config.get ["networking" "interfaces"];
     })
 
   # SSH daemon.
diff --git a/upstart-jobs/dhclient.nix b/upstart-jobs/dhclient.nix
index 73f80528c55..41fa887f7c6 100644
--- a/upstart-jobs/dhclient.nix
+++ b/upstart-jobs/dhclient.nix
@@ -1,4 +1,12 @@
-{dhcp, nettools}:
+{dhcp, nettools, interfaces, lib}:
+
+let 
+
+  # Don't start dhclient on explicitly configured interfaces.
+  ignoredInterfaces = ["lo"] ++
+    map (i: i.name) (lib.filter (i: i ? ipAddress) interfaces);
+
+in
 
 {
   name = "dhclient";
@@ -18,7 +26,7 @@ script
     interfaces=
 
     for i in $(cd /sys/class/net && ls -d *); do
-        if test \"$i\" != \"lo\"; then
+        if ! for j in ${toString ignoredInterfaces}; do echo $j; done | grep -F -x -q \"$i\"; then
             echo \"Running dhclient on $i\"
             interfaces=\"$interfaces $i\"
         fi
-- 
GitLab


From 0ee31b29efdc6a021b46acd81559107a90cda706 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 22 Feb 2007 18:04:18 +0000
Subject: [PATCH 0487/5331] * The daemon needs OpenSSH to be in the PATH for
 signing/verifying.

svn path=/nixos/trunk/; revision=8025
---
 system/upstart.nix          | 1 +
 upstart-jobs/nix-daemon.nix | 8 ++++++--
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/system/upstart.nix b/system/upstart.nix
index 194b6bdb8e1..68dc1e730c3 100644
--- a/system/upstart.nix
+++ b/system/upstart.nix
@@ -67,6 +67,7 @@ import ../upstart-jobs/gather.nix {
     # Nix daemon - required for multi-user Nix.
     (import ../upstart-jobs/nix-daemon.nix {
       inherit nix;
+      inherit (pkgs) openssl;
     })
 
     # Cron daemon.
diff --git a/upstart-jobs/nix-daemon.nix b/upstart-jobs/nix-daemon.nix
index d761bcd85a9..acf85c70c9c 100644
--- a/upstart-jobs/nix-daemon.nix
+++ b/upstart-jobs/nix-daemon.nix
@@ -1,4 +1,4 @@
-{nix}:
+{nix, openssl}:
 
 {
   name = "nix-daemon";
@@ -7,7 +7,11 @@
     start on startup
     stop on shutdown
     env NIX_CONF_DIR=/nix/etc/nix
-    respawn ${nix}/bin/nix-worker --daemon > /dev/null 2>&1
+    respawn
+    script
+        export PATH=${openssl}/bin:$PATH
+        exec ${nix}/bin/nix-worker --daemon > /dev/null 2>&1
+    end script
   ";
 
 }
-- 
GitLab


From 0828400b36d370493eece5a2967b64a45d674ff1 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 23 Feb 2007 21:50:32 +0000
Subject: [PATCH 0488/5331] svn path=/nixos/trunk/; revision=8036

---
 configuration/rescue-cd.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/configuration/rescue-cd.nix b/configuration/rescue-cd.nix
index 1243a05525e..1cbccf9ee33 100644
--- a/configuration/rescue-cd.nix
+++ b/configuration/rescue-cd.nix
@@ -1,7 +1,7 @@
 rec {
 
   
-  nixpkgsRel = "nixpkgs-0.11pre7883";
+  nixpkgsRel = "nixpkgs-0.11pre8027";
 
 
   configuration = {
@@ -118,7 +118,7 @@ rec {
   # Get a recent copy of Nixpkgs.
   nixpkgsTarball = pkgs.fetchurl {
     url = configuration.installer.nixpkgsURL + "/" + nixpkgsRel + ".tar.bz2";
-    md5 = "ed4a3b5b0acd39be511381a81787b0c0";
+    md5 = "3beb348da52f4bd86af28f82f375e0ec";
   };
 
 
-- 
GitLab


From 3ad2c9193968e2cbecaedb4869bba783baddb9c5 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sun, 25 Feb 2007 15:53:57 +0000
Subject: [PATCH 0489/5331] * Pure X server.  All fonts are now in the Nix
 store.

svn path=/nixos/trunk/; revision=8041
---
 system/etc.nix            | 18 +-----------------
 system/fonts.nix          | 22 ++++++++++++++++++++++
 system/upstart.nix        |  3 ++-
 upstart-jobs/xserver.conf |  1 +
 upstart-jobs/xserver.nix  | 24 ++++++++++++++++++++----
 5 files changed, 46 insertions(+), 22 deletions(-)
 create mode 100644 system/fonts.nix

diff --git a/system/etc.nix b/system/etc.nix
index 792b6b6a489..420ff1ff5c3 100644
--- a/system/etc.nix
+++ b/system/etc.nix
@@ -88,23 +88,7 @@ import ../helpers/make-etc.nix {
   ++ (optional ["fonts" "enableFontConfig"] { 
     source = pkgs.runCommand "fonts.conf"
       { 
-        fontDirectories = [
-          # - the user's .fonts directory
-          "~/.fonts"
-          # - the user's current profile
-          "~/.nix-profile/lib/X11/fonts"
-          "~/.nix-profile/share/fonts"
-          # - the default profile
-          "/nix/var/nix/profiles/default/lib/X11/fonts"
-          "/nix/var/nix/profiles/default/share/fonts"
-          # - a few statically built locations
-          pkgs.xorg.fontbhttf
-          pkgs.xorg.fontbh100dpi
-          pkgs.xorg.fontbhlucidatypewriter100dpi
-          pkgs.ttf_bitstream_vera
-          pkgs.corefonts
-          pkgs.freefont_ttf
-        ];
+        fontDirectories = import ./fonts.nix {inherit pkgs;};
         buildInputs = [pkgs.libxslt];
         inherit (pkgs) fontconfig;
       }
diff --git a/system/fonts.nix b/system/fonts.nix
new file mode 100644
index 00000000000..a909ba6de5d
--- /dev/null
+++ b/system/fonts.nix
@@ -0,0 +1,22 @@
+{pkgs}:
+
+[
+  # - the user's .fonts directory
+  "~/.fonts"
+  # - the user's current profile
+  "~/.nix-profile/lib/X11/fonts"
+  "~/.nix-profile/share/fonts"
+  # - the default profile
+  "/nix/var/nix/profiles/default/lib/X11/fonts"
+  "/nix/var/nix/profiles/default/share/fonts"
+  # - a few statically built locations
+  pkgs.xorg.fontbhttf
+  pkgs.xorg.fontbhlucidatypewriter100dpi
+  pkgs.ttf_bitstream_vera
+  pkgs.corefonts
+  pkgs.freefont_ttf
+  pkgs.xorg.fontbh100dpi
+  pkgs.xorg.fontmiscmisc
+  pkgs.xorg.fontalias
+  pkgs.xorg.fontcursormisc
+]
diff --git a/system/upstart.nix b/system/upstart.nix
index 68dc1e730c3..5f70d8e228f 100644
--- a/system/upstart.nix
+++ b/system/upstart.nix
@@ -118,8 +118,9 @@ import ../upstart-jobs/gather.nix {
   # X server.
   ++ optional ["services" "xserver" "enable"]
     (import ../upstart-jobs/xserver.nix {
-      inherit (pkgs) substituteAll;
+      inherit (pkgs) stdenv lib;
       inherit (pkgs.xorg) xorgserver xf86inputkeyboard xf86inputmouse xf86videovesa;
+      fontDirectories = import ./fonts.nix {inherit pkgs;};
     })
 
   # Apache httpd.
diff --git a/upstart-jobs/xserver.conf b/upstart-jobs/xserver.conf
index 48a89781ec5..b244530147a 100644
--- a/upstart-jobs/xserver.conf
+++ b/upstart-jobs/xserver.conf
@@ -1,4 +1,5 @@
 Section "Files"
+  @fontPaths@
 EndSection
 
 
diff --git a/upstart-jobs/xserver.nix b/upstart-jobs/xserver.nix
index 8979092cbc2..ffce0f74a6a 100644
--- a/upstart-jobs/xserver.nix
+++ b/upstart-jobs/xserver.nix
@@ -1,4 +1,6 @@
-{ substituteAll
+{ stdenv
+
+, lib
 
 , xorgserver
 
@@ -14,13 +16,29 @@
 , # X display number.
   display ? 0
 
+, # List of font directories.
+  fontDirectories
+
 }:
 
 let
 
-  config = substituteAll {
+  config = stdenv.mkDerivation {
     name = "xserver.conf";
     src = ./xserver.conf;
+    inherit fontDirectories;
+    buildCommand = "
+      buildCommand= # urgh, don't substitute this
+      export fontPaths=
+      for i in $fontDirectories; do
+        if test \"\${i:0:\${#NIX_STORE}}\" == \"$NIX_STORE\"; then
+          for j in $(find $i -name fonts.dir); do
+            fontPaths=\"\${fontPaths}FontPath \\\"$(dirname $j)\\\"\\n\"
+          done
+        fi
+      done
+      substituteAll $src $out
+    ";
   };
 
 in
@@ -39,11 +57,9 @@ end script
 exec ${xorgserver}/bin/X \\
     -ac -nolisten tcp -terminate \\
     -logfile /var/log/X.${toString display}.log \\
-    -fp /var/fonts \\
     -modulepath ${xorgserver}/lib/xorg/modules,${xf86inputkeyboard}/lib/xorg/modules/input,${xf86inputmouse}/lib/xorg/modules/input,${xf86videovesa}/lib/xorg/modules/drivers \\
     -config ${config} \\
     :${toString display} vt${toString tty}
-
   ";
   
 }
-- 
GitLab


From 426a8b806b2eadef8cb4920ef4475d04102c43ca Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sun, 25 Feb 2007 16:20:14 +0000
Subject: [PATCH 0490/5331] * Use xinit to start the X server plus some initial
 clients (twm + xterm).

svn path=/nixos/trunk/; revision=8043
---
 system/upstart.nix        |  5 +++--
 upstart-jobs/xserver.conf |  4 ++--
 upstart-jobs/xserver.nix  | 14 ++++++++++++--
 3 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/system/upstart.nix b/system/upstart.nix
index 5f70d8e228f..fb7526afc87 100644
--- a/system/upstart.nix
+++ b/system/upstart.nix
@@ -118,8 +118,9 @@ import ../upstart-jobs/gather.nix {
   # X server.
   ++ optional ["services" "xserver" "enable"]
     (import ../upstart-jobs/xserver.nix {
-      inherit (pkgs) stdenv lib;
-      inherit (pkgs.xorg) xorgserver xf86inputkeyboard xf86inputmouse xf86videovesa;
+      inherit (pkgs) stdenv writeText lib xterm;
+      inherit (pkgs.xorg) xorgserver xinit twm
+        xf86inputkeyboard xf86inputmouse xf86videovesa;
       fontDirectories = import ./fonts.nix {inherit pkgs;};
     })
 
diff --git a/upstart-jobs/xserver.conf b/upstart-jobs/xserver.conf
index b244530147a..d6d0cd4265e 100644
--- a/upstart-jobs/xserver.conf
+++ b/upstart-jobs/xserver.conf
@@ -4,7 +4,7 @@ EndSection
 
 
 Section "ServerFlags"
-  Option       "AllowMouseOpenFail" "on"
+  Option "AllowMouseOpenFail" "on"
   Option "DontVTSwitch" "off"
 EndSection
 
@@ -26,7 +26,7 @@ EndSection
 Section "InputDevice"
   Driver       "mouse"
   Identifier   "Mouse[0]"
-  Option       "Device" "/dev/mice"
+  Option       "Device" "/dev/input/mice"
 EndSection
 
 
diff --git a/upstart-jobs/xserver.nix b/upstart-jobs/xserver.nix
index ffce0f74a6a..a92cdbb251e 100644
--- a/upstart-jobs/xserver.nix
+++ b/upstart-jobs/xserver.nix
@@ -1,9 +1,14 @@
-{ stdenv
+{ stdenv, writeText
 
 , lib
 
 , xorgserver
 
+, xinit
+
+, # Initial client/window manager.
+  twm, xterm
+
 , xf86inputkeyboard
 
 , xf86inputmouse
@@ -41,6 +46,11 @@ let
     ";
   };
 
+  clientScript = writeText "xclient" "
+    ${twm}/bin/twm &
+    ${xterm}/bin/xterm -ls
+  ";
+
 in
 
 rec {
@@ -54,7 +64,7 @@ start script
 end script
 
 # !!! -ac is a bad idea.
-exec ${xorgserver}/bin/X \\
+exec ${xinit}/bin/xinit ${stdenv.bash}/bin/sh ${clientScript} -- ${xorgserver}/bin/X \\
     -ac -nolisten tcp -terminate \\
     -logfile /var/log/X.${toString display}.log \\
     -modulepath ${xorgserver}/lib/xorg/modules,${xf86inputkeyboard}/lib/xorg/modules/input,${xf86inputmouse}/lib/xorg/modules/input,${xf86videovesa}/lib/xorg/modules/drivers \\
-- 
GitLab


From ef6b45d92433ee450f24f688d514b071ba06a5f2 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sun, 25 Feb 2007 22:27:17 +0000
Subject: [PATCH 0491/5331] * Start a display manager (SLiM).

svn path=/nixos/trunk/; revision=8045
---
 system/upstart.nix       |  4 ++--
 upstart-jobs/xserver.nix | 32 +++++++++++++++++++++++++-------
 2 files changed, 27 insertions(+), 9 deletions(-)

diff --git a/system/upstart.nix b/system/upstart.nix
index fb7526afc87..0b50053e1ab 100644
--- a/system/upstart.nix
+++ b/system/upstart.nix
@@ -118,8 +118,8 @@ import ../upstart-jobs/gather.nix {
   # X server.
   ++ optional ["services" "xserver" "enable"]
     (import ../upstart-jobs/xserver.nix {
-      inherit (pkgs) stdenv writeText lib xterm;
-      inherit (pkgs.xorg) xorgserver xinit twm
+      inherit (pkgs) stdenv writeText lib xterm slim;
+      inherit (pkgs.xorg) xorgserver xinit twm xauth
         xf86inputkeyboard xf86inputmouse xf86videovesa;
       fontDirectories = import ./fonts.nix {inherit pkgs;};
     })
diff --git a/upstart-jobs/xserver.nix b/upstart-jobs/xserver.nix
index a92cdbb251e..71ffd1dbe2e 100644
--- a/upstart-jobs/xserver.nix
+++ b/upstart-jobs/xserver.nix
@@ -9,6 +9,9 @@
 , # Initial client/window manager.
   twm, xterm
 
+, # Needed for the display manager (SLiM).
+  slim, xauth
+
 , xf86inputkeyboard
 
 , xf86inputmouse
@@ -51,6 +54,24 @@ let
     ${xterm}/bin/xterm -ls
   ";
 
+  xserverArgs = [
+    "-ac"
+    "-nolisten tcp"
+    "-terminate"
+    "-logfile" "/var/log/X.${toString display}.log"
+    "-modulepath" "${xorgserver}/lib/xorg/modules,${xf86inputkeyboard}/lib/xorg/modules/input,${xf86inputmouse}/lib/xorg/modules/input,${xf86videovesa}/lib/xorg/modules/drivers"
+    "-config ${config}"
+    ":${toString display}" "vt${toString tty}"
+  ];
+
+  # Note: lines must not be indented.
+  slimConfig = writeText "slim.cfg" "
+xauth_path ${xauth}/bin/xauth
+default_xserver ${xorgserver}/bin/X
+xserver_arguments ${toString xserverArgs}
+login_cmd exec ${stdenv.bash}/bin/sh ${clientScript}
+  ";
+
 in
 
 rec {
@@ -63,13 +84,10 @@ start script
 
 end script
 
-# !!! -ac is a bad idea.
-exec ${xinit}/bin/xinit ${stdenv.bash}/bin/sh ${clientScript} -- ${xorgserver}/bin/X \\
-    -ac -nolisten tcp -terminate \\
-    -logfile /var/log/X.${toString display}.log \\
-    -modulepath ${xorgserver}/lib/xorg/modules,${xf86inputkeyboard}/lib/xorg/modules/input,${xf86inputmouse}/lib/xorg/modules/input,${xf86videovesa}/lib/xorg/modules/drivers \\
-    -config ${config} \\
-    :${toString display} vt${toString tty}
+env SLIM_CFGFILE=${slimConfig}
+env FONTCONFIG_FILE=/etc/fonts/fonts.conf # !!! cleanup
+
+exec ${slim}/bin/slim
   ";
   
 }
-- 
GitLab


From cc79d8f301b78b51a61ed98f010eeb264a8075a9 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sun, 25 Feb 2007 22:27:45 +0000
Subject: [PATCH 0492/5331] * Set the password hash to md5 for now - SLiM
 doesn't support   blowfish.  Of course, it should really use PAM.

svn path=/nixos/trunk/; revision=8046
---
 system/etc/default/passwd | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/system/etc/default/passwd b/system/etc/default/passwd
index 5804e28c38b..fe83ceb209c 100644
--- a/system/etc/default/passwd
+++ b/system/etc/default/passwd
@@ -4,7 +4,7 @@ CRYPT=des
 
 # for local files, use a more secure hash. We
 # don't need to be portable here:
-CRYPT_FILES=blowfish
+CRYPT_FILES=md5
 
 # sometimes we need to specify special options for
 # a hash (variable is prepended by the name of the
-- 
GitLab


From ef92ce06cb5bc9402ef4c146aa99c3caa763821b Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 26 Feb 2007 21:18:13 +0000
Subject: [PATCH 0493/5331] * PAM file for chsh.

svn path=/nixos/trunk/; revision=8057
---
 system/etc.nix        | 3 ++-
 system/etc/pam.d/chsh | 5 +++++
 2 files changed, 7 insertions(+), 1 deletion(-)
 create mode 100644 system/etc/pam.d/chsh

diff --git a/system/etc.nix b/system/etc.nix
index 420ff1ff5c3..c4f69ffd76d 100644
--- a/system/etc.nix
+++ b/system/etc.nix
@@ -132,7 +132,8 @@ import ../helpers/make-etc.nix {
       "shadow"
       "sshd"
       "useradd"
+      "chsh"
       "common"
     ]
   );
-}
\ No newline at end of file
+}
diff --git a/system/etc/pam.d/chsh b/system/etc/pam.d/chsh
new file mode 100644
index 00000000000..b4aac2aba95
--- /dev/null
+++ b/system/etc/pam.d/chsh
@@ -0,0 +1,5 @@
+auth     sufficient     pam_rootok.so
+auth     required       pam_permit.so
+account  required       pam_permit.so
+password required       pam_permit.so
+session  required       pam_permit.so
-- 
GitLab


From 4164a4ff3ebab94b281b0a22e6339e453544bfb7 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 26 Feb 2007 21:39:07 +0000
Subject: [PATCH 0494/5331] * Construct the module path dynamically.

svn path=/nixos/trunk/; revision=8059
---
 system/upstart.nix        |  4 +---
 upstart-jobs/xserver.conf |  4 ++++
 upstart-jobs/xserver.nix  | 43 ++++++++++++++++++---------------------
 3 files changed, 25 insertions(+), 26 deletions(-)

diff --git a/system/upstart.nix b/system/upstart.nix
index 0b50053e1ab..b295e14c3e5 100644
--- a/system/upstart.nix
+++ b/system/upstart.nix
@@ -118,9 +118,7 @@ import ../upstart-jobs/gather.nix {
   # X server.
   ++ optional ["services" "xserver" "enable"]
     (import ../upstart-jobs/xserver.nix {
-      inherit (pkgs) stdenv writeText lib xterm slim;
-      inherit (pkgs.xorg) xorgserver xinit twm xauth
-        xf86inputkeyboard xf86inputmouse xf86videovesa;
+      inherit (pkgs) stdenv writeText lib xterm slim xorg;
       fontDirectories = import ./fonts.nix {inherit pkgs;};
     })
 
diff --git a/upstart-jobs/xserver.conf b/upstart-jobs/xserver.conf
index d6d0cd4265e..17aa3d3fd88 100644
--- a/upstart-jobs/xserver.conf
+++ b/upstart-jobs/xserver.conf
@@ -1,5 +1,9 @@
 Section "Files"
+  # Font directories.
   @fontPaths@
+
+  # Module (driver) directories.
+  @modulePaths@
 EndSection
 
 
diff --git a/upstart-jobs/xserver.nix b/upstart-jobs/xserver.nix
index 71ffd1dbe2e..1eae577f162 100644
--- a/upstart-jobs/xserver.nix
+++ b/upstart-jobs/xserver.nix
@@ -1,22 +1,4 @@
-{ stdenv, writeText
-
-, lib
-
-, xorgserver
-
-, xinit
-
-, # Initial client/window manager.
-  twm, xterm
-
-, # Needed for the display manager (SLiM).
-  slim, xauth
-
-, xf86inputkeyboard
-
-, xf86inputmouse
-
-, xf86videovesa
+{ stdenv, writeText, lib, xorg, xterm, slim
 
 , # Virtual console for the X server.
   tty ? 7
@@ -31,12 +13,20 @@
 
 let
 
+  drivers = [
+    xorg.xorgserver
+    xorg.xf86inputkeyboard
+    xorg.xf86inputmouse
+    xorg.xf86videovesa
+  ];
+
   config = stdenv.mkDerivation {
     name = "xserver.conf";
     src = ./xserver.conf;
     inherit fontDirectories;
     buildCommand = "
       buildCommand= # urgh, don't substitute this
+
       export fontPaths=
       for i in $fontDirectories; do
         if test \"\${i:0:\${#NIX_STORE}}\" == \"$NIX_STORE\"; then
@@ -45,12 +35,20 @@ let
           done
         fi
       done
+
+      export modulePaths=
+      for i in $(find ${toString drivers} -type d); do
+        if ls $i/*.so 2> /dev/null; then
+          modulePaths=\"\${modulePaths}ModulePath \\\"$i\\\"\\n\"
+        fi
+      done
+
       substituteAll $src $out
     ";
   };
 
   clientScript = writeText "xclient" "
-    ${twm}/bin/twm &
+    ${xorg.twm}/bin/twm &
     ${xterm}/bin/xterm -ls
   ";
 
@@ -59,15 +57,14 @@ let
     "-nolisten tcp"
     "-terminate"
     "-logfile" "/var/log/X.${toString display}.log"
-    "-modulepath" "${xorgserver}/lib/xorg/modules,${xf86inputkeyboard}/lib/xorg/modules/input,${xf86inputmouse}/lib/xorg/modules/input,${xf86videovesa}/lib/xorg/modules/drivers"
     "-config ${config}"
     ":${toString display}" "vt${toString tty}"
   ];
 
   # Note: lines must not be indented.
   slimConfig = writeText "slim.cfg" "
-xauth_path ${xauth}/bin/xauth
-default_xserver ${xorgserver}/bin/X
+xauth_path ${xorg.xauth}/bin/xauth
+default_xserver ${xorg.xorgserver}/bin/X
 xserver_arguments ${toString xserverArgs}
 login_cmd exec ${stdenv.bash}/bin/sh ${clientScript}
   ";
-- 
GitLab


From fdb5a06fa4a88383e9943e5c5c918888f265a761 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 26 Feb 2007 23:11:32 +0000
Subject: [PATCH 0495/5331] * Specify the resolution and the video driver name
 in the configuration file.

svn path=/nixos/trunk/; revision=8061
---
 system/options.nix        | 21 +++++++++++++++++++++
 system/upstart.nix        |  1 +
 upstart-jobs/xserver.conf | 14 ++++----------
 upstart-jobs/xserver.nix  | 32 +++++++++++++++++++++++++-------
 4 files changed, 51 insertions(+), 17 deletions(-)

diff --git a/system/options.nix b/system/options.nix
index f468b804744..622388d3532 100644
--- a/system/options.nix
+++ b/system/options.nix
@@ -452,6 +452,25 @@
   }
 
   
+  {
+    name = ["services" "xserver" "resolutions"];
+    default = [{x = 1024; y = 768;} {x = 800; y = 600;} {x = 640; y = 480;}];
+    description = "
+      The screen resolutions for the X server.  The first element is the default resolution.
+    ";
+  }
+
+  
+  {
+    name = ["services" "xserver" "videoDriver"];
+    default = "vesa";
+    example = "i810";
+    description = "
+      The name of the video driver for your graphics card.
+    ";
+  }
+
+
   {
     name = ["services" "httpd" "enable"];
     default = false;
@@ -461,6 +480,7 @@
   }
 
   
+  /*  
   {
     name = ["services" "httpd" "user"];
     default = "wwwrun";
@@ -617,6 +637,7 @@
       Extra subservices to enable in the webserver.
     ";
   }
+  */
 
   {
     name = ["installer" "nixpkgsURL"];
diff --git a/system/upstart.nix b/system/upstart.nix
index b295e14c3e5..dac913d4e57 100644
--- a/system/upstart.nix
+++ b/system/upstart.nix
@@ -118,6 +118,7 @@ import ../upstart-jobs/gather.nix {
   # X server.
   ++ optional ["services" "xserver" "enable"]
     (import ../upstart-jobs/xserver.nix {
+      inherit config;
       inherit (pkgs) stdenv writeText lib xterm slim xorg;
       fontDirectories = import ./fonts.nix {inherit pkgs;};
     })
diff --git a/upstart-jobs/xserver.conf b/upstart-jobs/xserver.conf
index 17aa3d3fd88..d092464d8a3 100644
--- a/upstart-jobs/xserver.conf
+++ b/upstart-jobs/xserver.conf
@@ -9,7 +9,6 @@ EndSection
 
 Section "ServerFlags"
   Option "AllowMouseOpenFail" "on"
-  Option "DontVTSwitch" "off"
 EndSection
 
 
@@ -37,12 +36,8 @@ EndSection
 Section "Monitor"
   Identifier   "Monitor[0]"
   Option       "DPMS"
-  UseModes     "Modes[0]"
-EndSection
-
-
-Section "Modes"
-  Identifier   "Modes[0]"
+  HorizSync    28-49
+  VertRefresh  43-75
 EndSection
 
 
@@ -53,14 +48,14 @@ Section "Screen"
   DefaultDepth 16
   SubSection "Display"
     Depth      16
-    Modes      "1024x768"
+    Modes      @resolutions@
   EndSubSection
 EndSection
 
 
 Section "Device"
   Identifier   "Device[0]"
-  Driver       "vesa"
+  Driver       "@videoDriver@"
 EndSection
 
 
@@ -70,4 +65,3 @@ Section "ServerLayout"
   InputDevice  "Mouse[0]" "CorePointer"
   Screen       "Screen[0]"
 EndSection
-
diff --git a/upstart-jobs/xserver.nix b/upstart-jobs/xserver.nix
index 1eae577f162..f5482013714 100644
--- a/upstart-jobs/xserver.nix
+++ b/upstart-jobs/xserver.nix
@@ -1,5 +1,7 @@
 { stdenv, writeText, lib, xorg, xterm, slim
 
+, config
+
 , # Virtual console for the X server.
   tty ? 7
 
@@ -13,17 +15,29 @@
 
 let
 
-  drivers = [
+  getCfg = option: config.get ["services" "xserver" option];
+
+  optional = condition: x: if condition then [x] else [];
+
+
+  videoDriver = getCfg "videoDriver";
+
+  resolutions = map (res: "\"${toString res.x}x${toString res.y}\"") (getCfg "resolutions");
+
+
+  modules = [
     xorg.xorgserver
     xorg.xf86inputkeyboard
     xorg.xf86inputmouse
-    xorg.xf86videovesa
-  ];
+  ] 
+  ++ optional (videoDriver == "vesa") xorg.xf86videovesa
+  ++ optional (videoDriver == "i810") xorg.xf86videoi810;
+
 
-  config = stdenv.mkDerivation {
+  configFile = stdenv.mkDerivation {
     name = "xserver.conf";
     src = ./xserver.conf;
-    inherit fontDirectories;
+    inherit fontDirectories videoDriver resolutions;
     buildCommand = "
       buildCommand= # urgh, don't substitute this
 
@@ -37,7 +51,7 @@ let
       done
 
       export modulePaths=
-      for i in $(find ${toString drivers} -type d); do
+      for i in $(find ${toString modules} -type d); do
         if ls $i/*.so 2> /dev/null; then
           modulePaths=\"\${modulePaths}ModulePath \\\"$i\\\"\\n\"
         fi
@@ -47,17 +61,19 @@ let
     ";
   };
 
+
   clientScript = writeText "xclient" "
     ${xorg.twm}/bin/twm &
     ${xterm}/bin/xterm -ls
   ";
 
+
   xserverArgs = [
     "-ac"
     "-nolisten tcp"
     "-terminate"
     "-logfile" "/var/log/X.${toString display}.log"
-    "-config ${config}"
+    "-config ${configFile}"
     ":${toString display}" "vt${toString tty}"
   ];
 
@@ -69,8 +85,10 @@ xserver_arguments ${toString xserverArgs}
 login_cmd exec ${stdenv.bash}/bin/sh ${clientScript}
   ";
 
+
 in
 
+
 rec {
   name = "xserver";
 
-- 
GitLab


From a50097b9ca2fc07ce193004a8788091b5c7bc378 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 27 Feb 2007 00:31:04 +0000
Subject: [PATCH 0496/5331] * Enable DRI support in the X server.

svn path=/nixos/trunk/; revision=8067
---
 system/options.nix       | 10 ++++++++++
 system/upstart.nix       |  2 +-
 upstart-jobs/xserver.nix |  6 +++++-
 3 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/system/options.nix b/system/options.nix
index 622388d3532..f2718151f04 100644
--- a/system/options.nix
+++ b/system/options.nix
@@ -471,6 +471,16 @@
   }
 
 
+  {
+    name = ["services" "xserver" "driSupport"];
+    default = false;
+    description = "
+      Whether to enable accelerated OpenGL rendering through the
+      Direct Rendering Interface (DRI).
+    ";
+  }
+
+  
   {
     name = ["services" "httpd" "enable"];
     default = false;
diff --git a/system/upstart.nix b/system/upstart.nix
index dac913d4e57..eea9b26b3b9 100644
--- a/system/upstart.nix
+++ b/system/upstart.nix
@@ -119,7 +119,7 @@ import ../upstart-jobs/gather.nix {
   ++ optional ["services" "xserver" "enable"]
     (import ../upstart-jobs/xserver.nix {
       inherit config;
-      inherit (pkgs) stdenv writeText lib xterm slim xorg;
+      inherit (pkgs) stdenv writeText lib xterm slim xorg mesa;
       fontDirectories = import ./fonts.nix {inherit pkgs;};
     })
 
diff --git a/upstart-jobs/xserver.nix b/upstart-jobs/xserver.nix
index f5482013714..6d13dd69deb 100644
--- a/upstart-jobs/xserver.nix
+++ b/upstart-jobs/xserver.nix
@@ -1,4 +1,4 @@
-{ stdenv, writeText, lib, xorg, xterm, slim
+{ stdenv, writeText, lib, xorg, mesa, xterm, slim
 
 , config
 
@@ -102,6 +102,10 @@ end script
 env SLIM_CFGFILE=${slimConfig}
 env FONTCONFIG_FILE=/etc/fonts/fonts.conf # !!! cleanup
 
+${if getCfg "driSupport"
+then "env XORG_DRI_DRIVER_PATH=${mesa}/lib/modules/dri"
+else ""}
+
 exec ${slim}/bin/slim
   ";
   
-- 
GitLab


From 94393dbd20f3c18381e18d8fb70c9fcde7693ea3 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 27 Feb 2007 00:50:22 +0000
Subject: [PATCH 0497/5331] * Create /var/state/opengl-driver.

svn path=/nixos/trunk/; revision=8069
---
 upstart-jobs/xserver.nix | 23 +++++++++++++----------
 1 file changed, 13 insertions(+), 10 deletions(-)

diff --git a/upstart-jobs/xserver.nix b/upstart-jobs/xserver.nix
index 6d13dd69deb..d5270c0273d 100644
--- a/upstart-jobs/xserver.nix
+++ b/upstart-jobs/xserver.nix
@@ -93,20 +93,23 @@ rec {
   name = "xserver";
 
   job = "
-#start on network-interfaces
+    #start on network-interfaces
 
-start script
+    start script
+      rm -f /var/state/opengl-driver
+      ${if getCfg "driSupport"
+      then "ln -sf ${mesa} /var/state/opengl-driver"
+      else ""}
+    end script
 
-end script
+    env SLIM_CFGFILE=${slimConfig}
+    env FONTCONFIG_FILE=/etc/fonts/fonts.conf # !!! cleanup
 
-env SLIM_CFGFILE=${slimConfig}
-env FONTCONFIG_FILE=/etc/fonts/fonts.conf # !!! cleanup
+    ${if getCfg "driSupport"
+    then "env XORG_DRI_DRIVER_PATH=${mesa}/lib/modules/dri"
+    else ""}
 
-${if getCfg "driSupport"
-then "env XORG_DRI_DRIVER_PATH=${mesa}/lib/modules/dri"
-else ""}
-
-exec ${slim}/bin/slim
+    exec ${slim}/bin/slim
   ";
   
 }
-- 
GitLab


From 52c9a6c7562134c0e9537c1d25887202f5af2de7 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 27 Feb 2007 19:04:30 +0000
Subject: [PATCH 0498/5331] svn path=/nixos/trunk/; revision=8078

---
 system/options.nix | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/system/options.nix b/system/options.nix
index f2718151f04..8bfe656c5dc 100644
--- a/system/options.nix
+++ b/system/options.nix
@@ -489,8 +489,7 @@
     ";
   }
 
-  
-  /*  
+
   {
     name = ["services" "httpd" "user"];
     default = "wwwrun";
@@ -555,7 +554,7 @@
     ";
   }
 
-  
+
   {
     name = ["services" "httpd" "stateDir"];
     default = "/var/run/httpd";
@@ -616,6 +615,7 @@
     ";
   }
 
+  
   {
     name = ["services" "httpd" "subservices" "subversion" "organization" "url"];
     default = null;
@@ -624,6 +624,7 @@
     ";
   }
 
+  
   {
     name = ["services" "httpd" "subservices" "subversion" "organization" "logo"];
     default = null;
@@ -632,6 +633,7 @@
     ";
   }
 
+  
   {
     name = ["services" "httpd" "extraSubservices" "enable"];
     default = false;
@@ -640,6 +642,7 @@
     ";
   }
 
+  
   {
     name = ["services" "httpd" "extraSubservices" "services"];
     default = [];
@@ -647,8 +650,8 @@
       Extra subservices to enable in the webserver.
     ";
   }
-  */
 
+  
   {
     name = ["installer" "nixpkgsURL"];
     default = "";
-- 
GitLab


From 36d4802ea676f7b313de20c81adf0e596c2c2684 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 28 Feb 2007 00:51:14 +0000
Subject: [PATCH 0499/5331] * Doesn't do anything.

svn path=/nixos/trunk/; revision=8091
---
 system/fonts.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/system/fonts.nix b/system/fonts.nix
index a909ba6de5d..6ddfc264889 100644
--- a/system/fonts.nix
+++ b/system/fonts.nix
@@ -17,6 +17,5 @@
   pkgs.freefont_ttf
   pkgs.xorg.fontbh100dpi
   pkgs.xorg.fontmiscmisc
-  pkgs.xorg.fontalias
   pkgs.xorg.fontcursormisc
 ]
-- 
GitLab


From 935042365cfeca3781842f76836fdb12fb2a35e1 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 28 Feb 2007 14:19:20 +0000
Subject: [PATCH 0500/5331] * Allow a netmask to be specified for each
 interface.

svn path=/nixos/trunk/; revision=8099
---
 system/options.nix                  | 2 +-
 upstart-jobs/network-interfaces.nix | 9 ++++++++-
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/system/options.nix b/system/options.nix
index 8bfe656c5dc..95345faf47c 100644
--- a/system/options.nix
+++ b/system/options.nix
@@ -203,7 +203,7 @@
     example = [
       { name = "eth0";
         ipAddress = "131.211.84.78";
-        netmask = "255.255.255.128";
+        subnetMask = "255.255.255.128";
       }
     ];
     description = "
diff --git a/upstart-jobs/network-interfaces.nix b/upstart-jobs/network-interfaces.nix
index 7ed68d7a7b2..5e85401422c 100644
--- a/upstart-jobs/network-interfaces.nix
+++ b/upstart-jobs/network-interfaces.nix
@@ -8,6 +8,7 @@ let
   # !!! use XML
   names = map (i: i.name) interfaces;
   ipAddresses = map (i: i.ipAddress) interfaces;
+  subnetMasks = map (i: if i ? subnetMask then i.subnetMask else "default") interfaces;
 
 in 
 
@@ -31,12 +32,18 @@ start script
     # Configure the manually specified interfaces.
     names=(${toString names})
     ipAddresses=(${toString ipAddresses})
+    subnetMasks=(${toString subnetMasks})
 
     for ((n = 0; n < \${#names[*]}; n++)); do
         name=\${names[$n]}
         ipAddress=\${ipAddresses[$n]}
+        subnetMask=\${subnetMasks[$n]}
         echo \"Configuring interface $name...\"
-        ${nettools}/sbin/ifconfig \"$name\" \"$ipAddress\" || true
+	extraFlags=
+        if test \"$subnetMask\" != default; then
+	    extraFlags=\"$extraFlags netmask $subnetMask\"
+        fi
+        ${nettools}/sbin/ifconfig \"$name\" \"$ipAddress\" $extraFlags || true
     done
 
     # Set the nameservers.
-- 
GitLab


From 31d91b4ec10ff6842a3bf996f06e82ec7d04d785 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 28 Feb 2007 16:58:35 +0000
Subject: [PATCH 0501/5331] * Set build-max-jobs in the Nix configuration file
 from the NixOS   configuration file.

svn path=/nixos/trunk/; revision=8109
---
 system/activate-configuration.sh |  2 ++
 system/options.nix               | 13 +++++++++++++
 system/system.nix                |  2 +-
 3 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/system/activate-configuration.sh b/system/activate-configuration.sh
index 7054a40e5c4..addeeb2f820 100644
--- a/system/activate-configuration.sh
+++ b/system/activate-configuration.sh
@@ -91,7 +91,9 @@ if test -z "@readOnlyRoot@"; then
 
     mkdir -p /nix/etc/nix
     cat > /nix/etc/nix/nix.conf <<EOF
+# WARNING: this file is generated.
 build-users-group = nixbld
+build-max-jobs = @maxJobs@
 EOF
 
     chown root.nixbld /nix/store
diff --git a/system/options.nix b/system/options.nix
index 95345faf47c..10f6032ad1a 100644
--- a/system/options.nix
+++ b/system/options.nix
@@ -663,6 +663,19 @@
   }
 
   
+  {
+    name = ["nix" "maxJobs"];
+    default = 1;
+    example = 2;
+    description = "
+      This option defines the maximum number of jobs that Nix will try
+      to build in parallel.  The default is 1.  You should generally
+      set it to the number of CPUs in your system (e.g., 2 on a Athlon
+      64 X2).
+    ";
+  }
+
+  
   {
     name = ["security" "setuidPrograms"];
     default = ["passwd" "su" "crontab" "ping" "ping6"];
diff --git a/system/system.nix b/system/system.nix
index 02410482e8e..b68ca907032 100644
--- a/system/system.nix
+++ b/system/system.nix
@@ -224,13 +224,13 @@ rec {
     readOnlyRoot = config.get ["boot" "readOnlyRoot"];
     hostName = config.get ["networking" "hostName"];
     setuidPrograms = config.get ["security" "setuidPrograms"];
+    maxJobs = config.get ["nix" "maxJobs"];
 
     path = [
       pkgs.coreutils pkgs.gnugrep pkgs.findutils
       pkgs.glibc # needed for getent
       pkgs.pwdutils
     ];
-
   };
 
 
-- 
GitLab


From f948c109998c75e906792c2d986a2efef457c8de Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 28 Feb 2007 22:59:39 +0000
Subject: [PATCH 0502/5331] * Enable compositing in the X server.

svn path=/nixos/trunk/; revision=8118
---
 upstart-jobs/xserver.conf | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/upstart-jobs/xserver.conf b/upstart-jobs/xserver.conf
index d092464d8a3..34f507a2c35 100644
--- a/upstart-jobs/xserver.conf
+++ b/upstart-jobs/xserver.conf
@@ -50,6 +50,14 @@ Section "Screen"
     Depth      16
     Modes      @resolutions@
   EndSubSection
+  SubSection "Display"
+    Depth      24
+    Modes      @resolutions@
+  EndSubSection
+  SubSection "Display"
+    Depth      32
+    Modes      @resolutions@
+  EndSubSection
 EndSection
 
 
@@ -65,3 +73,8 @@ Section "ServerLayout"
   InputDevice  "Mouse[0]" "CorePointer"
   Screen       "Screen[0]"
 EndSection
+
+
+Section "Extensions"
+  Option       "Composite" "Enable"
+EndSection
-- 
GitLab


From 8960f038ddc37e1204ab4ac5f4f46cf8ae23aa3c Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 28 Feb 2007 23:00:09 +0000
Subject: [PATCH 0503/5331] * Allow metacity as the window manager.

svn path=/nixos/trunk/; revision=8119
---
 system/options.nix       | 11 +++++++++++
 system/upstart.nix       |  1 +
 upstart-jobs/xserver.nix |  8 +++++++-
 3 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/system/options.nix b/system/options.nix
index 10f6032ad1a..8987ab2969a 100644
--- a/system/options.nix
+++ b/system/options.nix
@@ -481,6 +481,17 @@
   }
 
   
+  {
+    name = ["services" "xserver" "windowManager"];
+    default = "metacity";
+    description = "
+      This option selects the window manager.  Available values are
+      <literal>twm</literal> (extremely primitive),
+      <literal>metacity</literal>, and <literal>compiz</literal>.
+    ";
+  }
+
+  
   {
     name = ["services" "httpd" "enable"];
     default = false;
diff --git a/system/upstart.nix b/system/upstart.nix
index eea9b26b3b9..29c55362b15 100644
--- a/system/upstart.nix
+++ b/system/upstart.nix
@@ -120,6 +120,7 @@ import ../upstart-jobs/gather.nix {
     (import ../upstart-jobs/xserver.nix {
       inherit config;
       inherit (pkgs) stdenv writeText lib xterm slim xorg mesa;
+      inherit (pkgs.gnome) metacity;
       fontDirectories = import ./fonts.nix {inherit pkgs;};
     })
 
diff --git a/upstart-jobs/xserver.nix b/upstart-jobs/xserver.nix
index d5270c0273d..b1743cecf93 100644
--- a/upstart-jobs/xserver.nix
+++ b/upstart-jobs/xserver.nix
@@ -1,4 +1,4 @@
-{ stdenv, writeText, lib, xorg, mesa, xterm, slim
+{ stdenv, writeText, lib, xorg, mesa, xterm, slim, metacity
 
 , config
 
@@ -24,6 +24,8 @@ let
 
   resolutions = map (res: "\"${toString res.x}x${toString res.y}\"") (getCfg "resolutions");
 
+  windowManager = getCfg "windowManager";
+
 
   modules = [
     xorg.xorgserver
@@ -63,7 +65,11 @@ let
 
 
   clientScript = writeText "xclient" "
+    ${if windowManager == "twm" then "
     ${xorg.twm}/bin/twm &
+    " else if windowManager == "metacity" then "
+    ${metacity}/bin/metacity &
+    " else abort ("unknown window manager "+ windowManager)}
     ${xterm}/bin/xterm -ls
   ";
 
-- 
GitLab


From 5799fe7382530bc53d12ef1210116d37ed82525a Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 28 Feb 2007 23:18:16 +0000
Subject: [PATCH 0504/5331] * Some hackery to get Metacity to find its default
 settings.  GConf is   really evil: it requires applications to install their
 GConf schemas   into one of a fixed set of directories that gconfd searches. 
 This   is of course rather imperative.

svn path=/nixos/trunk/; revision=8120
---
 system/upstart.nix       | 2 +-
 upstart-jobs/xserver.nix | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/system/upstart.nix b/system/upstart.nix
index 29c55362b15..83d4663563a 100644
--- a/system/upstart.nix
+++ b/system/upstart.nix
@@ -120,7 +120,7 @@ import ../upstart-jobs/gather.nix {
     (import ../upstart-jobs/xserver.nix {
       inherit config;
       inherit (pkgs) stdenv writeText lib xterm slim xorg mesa;
-      inherit (pkgs.gnome) metacity;
+      inherit (pkgs.gnome) metacity GConf;
       fontDirectories = import ./fonts.nix {inherit pkgs;};
     })
 
diff --git a/upstart-jobs/xserver.nix b/upstart-jobs/xserver.nix
index b1743cecf93..33c42648113 100644
--- a/upstart-jobs/xserver.nix
+++ b/upstart-jobs/xserver.nix
@@ -1,4 +1,4 @@
-{ stdenv, writeText, lib, xorg, mesa, xterm, slim, metacity
+{ stdenv, writeText, lib, xorg, mesa, xterm, slim, metacity, GConf
 
 , config
 
@@ -68,6 +68,8 @@ let
     ${if windowManager == "twm" then "
     ${xorg.twm}/bin/twm &
     " else if windowManager == "metacity" then "
+    # !!! Hack: load the schemas for Metacity.
+    GCONF_CONFIG_SOURCE=xml::~/.gconf ${GConf}/bin/gconftool-2 --makefile-install-rule ${metacity}/etc/gconf/schemas/*.schemas
     ${metacity}/bin/metacity &
     " else abort ("unknown window manager "+ windowManager)}
     ${xterm}/bin/xterm -ls
-- 
GitLab


From a177575779ece032710f2af45dc066e0fcf34c2b Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 1 Mar 2007 00:00:16 +0000
Subject: [PATCH 0505/5331] * Handle windowManager == "compiz".  Load Compiz's
 GConf settings   automatically and turn on most plugins.

svn path=/nixos/trunk/; revision=8122
---
 system/upstart.nix       |  2 +-
 upstart-jobs/xserver.nix | 19 ++++++++++++++++---
 2 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/system/upstart.nix b/system/upstart.nix
index 83d4663563a..7cd384ede53 100644
--- a/system/upstart.nix
+++ b/system/upstart.nix
@@ -119,7 +119,7 @@ import ../upstart-jobs/gather.nix {
   ++ optional ["services" "xserver" "enable"]
     (import ../upstart-jobs/xserver.nix {
       inherit config;
-      inherit (pkgs) stdenv writeText lib xterm slim xorg mesa;
+      inherit (pkgs) stdenv writeText lib xterm slim xorg mesa compiz;
       inherit (pkgs.gnome) metacity GConf;
       fontDirectories = import ./fonts.nix {inherit pkgs;};
     })
diff --git a/upstart-jobs/xserver.nix b/upstart-jobs/xserver.nix
index 33c42648113..b06decf06e4 100644
--- a/upstart-jobs/xserver.nix
+++ b/upstart-jobs/xserver.nix
@@ -1,4 +1,4 @@
-{ stdenv, writeText, lib, xorg, mesa, xterm, slim, metacity, GConf
+{ stdenv, writeText, lib, xorg, mesa, xterm, slim, metacity, GConf, compiz
 
 , config
 
@@ -67,11 +67,24 @@ let
   clientScript = writeText "xclient" "
     ${if windowManager == "twm" then "
     ${xorg.twm}/bin/twm &
-    " else if windowManager == "metacity" then "
+    "
+
+    else if windowManager == "metacity" then "
     # !!! Hack: load the schemas for Metacity.
     GCONF_CONFIG_SOURCE=xml::~/.gconf ${GConf}/bin/gconftool-2 --makefile-install-rule ${metacity}/etc/gconf/schemas/*.schemas
     ${metacity}/bin/metacity &
-    " else abort ("unknown window manager "+ windowManager)}
+    "
+
+    else if windowManager == "compiz" then "
+    # !!! Hack: load the schemas for Compiz.
+    GCONF_CONFIG_SOURCE=xml::~/.gconf ${GConf}/bin/gconftool-2 --makefile-install-rule ${compiz}/etc/gconf/schemas/*.schemas
+    ${GConf}/bin/gconftool-2 -t list --list-type=string --set /apps/compiz/general/allscreens/options/active_plugins [gconf,png,decoration,fade,minimize,move,resize,cube,switcher,rotate,place,scale,water,wobbly,zoom]
+    ${compiz}/bin/compiz gconf &
+    /nix/store/n4wkqkl9l1bikdq39hcxg1rwywavzzh9-compiz-0.3.6/bin/gtk-window-decorator &
+    "
+
+    else abort ("unknown window manager "+ windowManager)}
+    
     ${xterm}/bin/xterm -ls
   ";
 
-- 
GitLab


From ba5655198654bcf65ee6d13f4b5f34786ca6a26e Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 1 Mar 2007 00:36:00 +0000
Subject: [PATCH 0506/5331] * ALSA support: save/restore the volume settings,
 create device nodes   in /dev/snd.

svn path=/nixos/trunk/; revision=8124
---
 system/options.nix                    |  9 +++++++
 system/system.nix                     |  3 ++-
 system/upstart.nix                    |  6 +++++
 upstart-jobs/alsa.nix                 | 38 +++++++++++++++++++++++++++
 upstart-jobs/udev-rules/50-udev.rules |  9 +++++++
 5 files changed, 64 insertions(+), 1 deletion(-)
 create mode 100644 upstart-jobs/alsa.nix

diff --git a/system/options.nix b/system/options.nix
index 8987ab2969a..b422815c33f 100644
--- a/system/options.nix
+++ b/system/options.nix
@@ -749,4 +749,13 @@
   }
 
   
+  {
+    name = ["sound" "enable"];
+    default = true;
+    description = "
+      Whether to enable ALSA sound.
+    ";
+  }
+
+  
 ]
diff --git a/system/system.nix b/system/system.nix
index b68ca907032..e032bad07ab 100644
--- a/system/system.nix
+++ b/system/system.nix
@@ -197,7 +197,8 @@ rec {
     nixosRebuild
     nixosCheckout
     setuidWrapper
-  ];
+  ]
+  ++ (if config.get ["sound" "enable"] then [pkgs.alsaUtils] else []);
 
 
   # We don't want to put all of `startPath' and `path' in $PATH, since
diff --git a/system/upstart.nix b/system/upstart.nix
index 7cd384ede53..3fa061e41c4 100644
--- a/system/upstart.nix
+++ b/system/upstart.nix
@@ -131,6 +131,12 @@ import ../upstart-jobs/gather.nix {
       inherit (pkgs) glibc pwdutils;
     })
 
+  # ALSA sound support.
+  ++ optional ["sound" "enable"]
+    (import ../upstart-jobs/alsa.nix {
+      inherit (pkgs) kernel module_init_tools alsaUtils;
+    })
+
   # Handles the reboot/halt events.
   ++ (map
     (event: makeJob (import ../upstart-jobs/halt.nix {
diff --git a/upstart-jobs/alsa.nix b/upstart-jobs/alsa.nix
new file mode 100644
index 00000000000..620401de914
--- /dev/null
+++ b/upstart-jobs/alsa.nix
@@ -0,0 +1,38 @@
+{kernel, module_init_tools, alsaUtils}:
+
+let
+
+  soundState = "/var/state/asound.state";
+
+in
+  
+{
+  name = "alsa";
+  
+  job = "
+start on hardware-scan
+stop on shutdown
+
+script
+
+    # Load some additional modules.
+    export MODULE_DIR=${kernel}/lib/modules/
+    for mod in snd_pcm_oss; do
+        ${module_init_tools}/sbin/modprobe $mod || true
+    done
+
+    # Restore the sound state.
+    ${alsaUtils}/sbin/alsactl -f ${soundState} restore
+
+end script
+
+stop script
+
+    # Save the sound state.
+    ${alsaUtils}/sbin/alsactl -f ${soundState} store
+
+end script
+
+  ";
+
+}
diff --git a/upstart-jobs/udev-rules/50-udev.rules b/upstart-jobs/udev-rules/50-udev.rules
index ff2ed86888b..a4f1d73250a 100644
--- a/upstart-jobs/udev-rules/50-udev.rules
+++ b/upstart-jobs/udev-rules/50-udev.rules
@@ -28,3 +28,12 @@ KERNEL=="uinput",               NAME="input/%k", MODE="0600"
 
 # Create a symlink for the CD-ROM device.
 KERNEL=="hd[a-z]", BUS=="ide", SYSFS{removable}=="1", SYSFS{device/media}=="cdrom", SYMLINK+="cdrom cdrom-%k"
+
+
+# ALSA sound devices.
+KERNEL=="controlC[0-9]*",       NAME="snd/%k"
+KERNEL=="hwC[D0-9]*",           NAME="snd/%k"
+KERNEL=="pcmC[D0-9cp]*",        NAME="snd/%k"
+KERNEL=="midiC[D0-9]*",         NAME="snd/%k"
+KERNEL=="timer",                NAME="snd/%k"
+KERNEL=="seq",                  NAME="snd/%k"
-- 
GitLab


From fb2a9d91a1c8276e7f60b6fdd535916dd8df795c Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 1 Mar 2007 00:50:17 +0000
Subject: [PATCH 0507/5331] * Make sure the stop script gets executed on
 shutdown.

svn path=/nixos/trunk/; revision=8126
---
 upstart-jobs/alsa.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/upstart-jobs/alsa.nix b/upstart-jobs/alsa.nix
index 620401de914..de258a8770b 100644
--- a/upstart-jobs/alsa.nix
+++ b/upstart-jobs/alsa.nix
@@ -13,7 +13,7 @@ in
 start on hardware-scan
 stop on shutdown
 
-script
+start script
 
     # Load some additional modules.
     export MODULE_DIR=${kernel}/lib/modules/
@@ -26,6 +26,8 @@ script
 
 end script
 
+respawn sleep 1000000 # !!! hack
+
 stop script
 
     # Save the sound state.
-- 
GitLab


From 1a66b71e2dc259318620ca650e7cb9419bd1cf9d Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 1 Mar 2007 15:31:05 +0000
Subject: [PATCH 0508/5331] * Set NIX_REMOTE when logging in through SSH. 
 Quick hack.  Should really   figure out why the environment isn't initialised
 properly in   non-interactive SSH logins.

svn path=/nixos/trunk/; revision=8136
---
 system/etc.nix        | 1 +
 system/etc/profile.sh | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/system/etc.nix b/system/etc.nix
index c4f69ffd76d..4f94b904ecd 100644
--- a/system/etc.nix
+++ b/system/etc.nix
@@ -7,6 +7,7 @@ let
 
   envConf = pkgs.writeText "environment" "
     PATH=${systemPath}/bin:${systemPath}/sbin:${pkgs.openssh}/bin
+    NIX_REMOTE=daemon
   " /* ${pkgs.openssh}/bin is a hack to get remote scp to work */; 
 
 in
diff --git a/system/etc/profile.sh b/system/etc/profile.sh
index b858f9e74b0..ae29c857294 100644
--- a/system/etc/profile.sh
+++ b/system/etc/profile.sh
@@ -13,6 +13,8 @@ fi
 
 if test "$USER" != root; then
     export NIX_REMOTE=daemon
+else
+    export NIX_REMOTE=
 fi
 
 
-- 
GitLab


From 1a9f5e455ead4474afb5f59088c2a8bd06054346 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sat, 3 Mar 2007 23:18:56 +0000
Subject: [PATCH 0509/5331] * Don't restart the X server if the xserver job
 changes, as that would   kill the X clients.

svn path=/nixos/trunk/; revision=8161
---
 system/switch-to-configuration.sh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/system/switch-to-configuration.sh b/system/switch-to-configuration.sh
index c199b083263..206ac29d812 100644
--- a/system/switch-to-configuration.sh
+++ b/system/switch-to-configuration.sh
@@ -72,7 +72,8 @@ if test "$action" = "switch" -o "$action" = "test"; then
     for event in $(cd $newEvents && ls); do
 
         # Hack: skip the sys-* and ctrl-alt-delete events.
-        if echo "$event" | grep -q "^sys-\|^ctrl-"; then continue; fi
+        # Another hack: don't restart the X server (that would kill all the clients).
+        if echo "$event" | grep -q "^sys-\|^ctrl-|^xserver"; then continue; fi
     
         if ! test -e "$oldEvents/$event"; then
             echo "starting $event..."
-- 
GitLab


From 2bff886ae1d0725b1876c20c80e4a9200c291727 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sat, 3 Mar 2007 23:20:08 +0000
Subject: [PATCH 0510/5331] * Udev rules/script to load device firmware
 automatically.  The udev   job takes a list of firmware directories in which
 to search for   firmware files.  Right now this is just the Intel 2200
 firmware (if   enabled).

svn path=/nixos/trunk/; revision=8162
---
 system/options.nix                    | 27 +++++++++++++++++-------
 system/upstart.nix                    |  4 +++-
 upstart-jobs/udev-firmware-loader.sh  | 30 +++++++++++++++++++++++++++
 upstart-jobs/udev-rules/50-udev.rules |  6 +++++-
 upstart-jobs/udev.nix                 | 24 +++++++++++++++++++--
 5 files changed, 80 insertions(+), 11 deletions(-)
 create mode 100755 upstart-jobs/udev-firmware-loader.sh

diff --git a/system/options.nix b/system/options.nix
index b422815c33f..9115cedc7b1 100644
--- a/system/options.nix
+++ b/system/options.nix
@@ -3,13 +3,6 @@
 [
 
 
-  { 
-    name = ["networking" "hostName"];
-    default = "nixos";
-    description = "The name of the machine.";
-  }
-
-
   {
     name = ["time" "timeZone"];
     default = "CET";
@@ -186,6 +179,13 @@
   }
 
 
+  { 
+    name = ["networking" "hostName"];
+    default = "nixos";
+    description = "The name of the machine.";
+  }
+
+
   {
     name = ["networking" "useDHCP"];
     default = true;
@@ -234,6 +234,19 @@
   }
 
   
+  {
+    name = ["networking" "enableIntel2200BGFirmware"];
+    default = false;
+    description = "
+      Turn on this option if you want firmware for the Intel
+      PRO/Wireless 2200BG to be loaded automatically.  This is
+      required if you want to use this device.  Intel requires you to
+      accept the license for this firmware, see
+      <link xlink:href='http://ipw2200.sourceforge.net/firmware.php?fid=7'/>.
+    ";
+  }
+
+  
   {
     name = ["fileSystems"];
     default = [];
diff --git a/system/upstart.nix b/system/upstart.nix
index 3fa061e41c4..626e82fcd0c 100644
--- a/system/upstart.nix
+++ b/system/upstart.nix
@@ -23,8 +23,10 @@ import ../upstart-jobs/gather.nix {
     # The udev daemon creates devices nodes and runs programs when
     # hardware events occur.
     (import ../upstart-jobs/udev.nix {
-      inherit (pkgs) writeText udev procps;
+      inherit (pkgs) stdenv writeText substituteAll udev procps;
       inherit (pkgs.lib) cleanSource;
+      firmwareDirs =
+        (if config.get ["networking" "enableIntel2200BGFirmware"] then [pkgs.ipw2200fw] else []);
     })
       
     # Makes LVM logical volumes available. 
diff --git a/upstart-jobs/udev-firmware-loader.sh b/upstart-jobs/udev-firmware-loader.sh
new file mode 100755
index 00000000000..03f0290fd33
--- /dev/null
+++ b/upstart-jobs/udev-firmware-loader.sh
@@ -0,0 +1,30 @@
+#! @shell@
+
+export PATH="@path@"
+
+exec > /var/log/udev-fw 2>&1
+
+if test "$ACTION" = "add"; then
+
+    ls -l /sys/$DEVPATH >> /tmp/fw 2>&1
+
+    if ! test -e /sys/$DEVPATH/loading; then
+        echo "Firmware loading is not supported by device \`DEVPATH'."
+        exit 1
+    fi
+
+    for dir in @firmwareDirs@; do
+        if test -e "$dir/$FIRMWARE"; then
+            echo "Loading \`$FIRMWARE' for device \`$DEVPATH' from $dir."
+            echo 1 > /sys/$DEVPATH/loading
+            cat "$dir/$FIRMWARE" > /sys/$DEVPATH/data
+            echo 0 > /sys/$DEVPATH/loading
+            exit 0
+        fi
+    done
+
+    echo "Firmware \`$FIRMWARE' for device \`$DEVPATH' not found."
+    echo -1 > /sys/$DEVPATH/loading
+    exit 1
+
+fi
diff --git a/upstart-jobs/udev-rules/50-udev.rules b/upstart-jobs/udev-rules/50-udev.rules
index a4f1d73250a..9b12e9b3e38 100644
--- a/upstart-jobs/udev-rules/50-udev.rules
+++ b/upstart-jobs/udev-rules/50-udev.rules
@@ -14,7 +14,7 @@ KERNEL=="kvm",                  MODE="0666"
 
 
 # TTYs.
-KERNEL=="tty",                  NAME="%k", MODE="666", OPTIONS="last_rule"  # GROUP="tty"
+KERNEL=="tty",                  NAME="%k", MODE="666", OPTIONS="last_rule" # GROUP="tty"
 KERNEL=="ptmx",                 NAME="%k", MODE="666" # GROUP="tty"
 
 
@@ -37,3 +37,7 @@ KERNEL=="pcmC[D0-9cp]*",        NAME="snd/%k"
 KERNEL=="midiC[D0-9]*",         NAME="snd/%k"
 KERNEL=="timer",                NAME="snd/%k"
 KERNEL=="seq",                  NAME="snd/%k"
+
+
+# Firmware loading.
+SUBSYSTEM=="firmware", ACTION=="add", RUN+="@firmwareLoader@"
diff --git a/upstart-jobs/udev.nix b/upstart-jobs/udev.nix
index 8ef4a43fe8c..7f84ed8e539 100644
--- a/upstart-jobs/udev.nix
+++ b/upstart-jobs/udev.nix
@@ -1,9 +1,29 @@
-{writeText, cleanSource, udev, procps}:
+{stdenv, writeText, substituteAll, cleanSource, udev, procps, firmwareDirs}:
 
 let
 
+  # Perform substitutions in all udev rules files.
+  udevRules = stdenv.mkDerivation {
+    name = "udev-rules";
+    src = cleanSource ./udev-rules;
+    firmwareLoader = substituteAll {
+      src = ./udev-firmware-loader.sh;
+      path = "${stdenv.coreutils}/bin";
+      isExecutable = true;
+      inherit firmwareDirs;
+    };
+    buildCommand = "
+      buildCommand= # urgh
+      ensureDir $out
+      for i in $src/*; do
+        substituteAll $i $out/$(basename $i)
+      done
+    ";
+  };
+
+  # The udev configuration file
   conf = writeText "udev.conf" "
-    udev_rules=\"${cleanSource ./udev-rules}\"
+    udev_rules=\"${udevRules}\"
   ";
 
 in
-- 
GitLab


From 90f1dbe548533f2bc284f8a055a43200906790ac Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sun, 4 Mar 2007 00:40:59 +0000
Subject: [PATCH 0511/5331] * Set some wireless settings (ESSID, WEP key).

svn path=/nixos/trunk/; revision=8163
---
 system/upstart.nix                  |  2 +-
 upstart-jobs/network-interfaces.nix | 34 +++++++++++++++++++++++------
 2 files changed, 28 insertions(+), 8 deletions(-)

diff --git a/system/upstart.nix b/system/upstart.nix
index 626e82fcd0c..fc694eefc13 100644
--- a/system/upstart.nix
+++ b/system/upstart.nix
@@ -60,7 +60,7 @@ import ../upstart-jobs/gather.nix {
 
     # Network interfaces.
     (import ../upstart-jobs/network-interfaces.nix {
-      inherit (pkgs) nettools kernel module_init_tools;
+      inherit (pkgs) nettools kernel module_init_tools wirelesstools;
       nameservers = config.get ["networking" "nameservers"];
       defaultGateway = config.get ["networking" "defaultGateway"];
       interfaces = config.get ["networking" "interfaces"];
diff --git a/upstart-jobs/network-interfaces.nix b/upstart-jobs/network-interfaces.nix
index 5e85401422c..66548b1354d 100644
--- a/upstart-jobs/network-interfaces.nix
+++ b/upstart-jobs/network-interfaces.nix
@@ -1,5 +1,5 @@
 # !!! Don't like it that I have to pass the kernel here.
-{ nettools, kernel, module_init_tools
+{ nettools, kernel, module_init_tools, wirelesstools
 , nameservers, defaultGateway, interfaces
 }:
 
@@ -7,8 +7,10 @@ let
 
   # !!! use XML
   names = map (i: i.name) interfaces;
-  ipAddresses = map (i: i.ipAddress) interfaces;
+  ipAddresses = map (i: if i ? ipAddress then i.ipAddress else "dhcp") interfaces;
   subnetMasks = map (i: if i ? subnetMask then i.subnetMask else "default") interfaces;
+  essids = map (i: if i ? essid then i.essid else "default") interfaces;
+  wepKeys = map (i: if i ? wepKey then i.wepKey else "nokey") interfaces;
 
 in 
 
@@ -33,17 +35,35 @@ start script
     names=(${toString names})
     ipAddresses=(${toString ipAddresses})
     subnetMasks=(${toString subnetMasks})
+    essids=(${toString essids})
+    wepKeys=(${toString wepKeys})
 
     for ((n = 0; n < \${#names[*]}; n++)); do
         name=\${names[$n]}
         ipAddress=\${ipAddresses[$n]}
         subnetMask=\${subnetMasks[$n]}
-        echo \"Configuring interface $name...\"
-	extraFlags=
-        if test \"$subnetMask\" != default; then
-	    extraFlags=\"$extraFlags netmask $subnetMask\"
+        essid=\${essids[$n]}
+        wepKey=\${wepKeys[$n]}
+
+        # Set wireless networking stuff.
+        if test \"$essid\" != dhcp; then
+            ${wirelesstools}/sbin/iwconfig \"$name\" essid \"$essid\"
+        fi
+        
+        if test \"$wepKey\" != nokey; then
+            ${wirelesstools}/sbin/iwconfig \"$name\" key \"$(cat \"$wepKey\")\"
+        fi
+        
+        # Set IP address / netmask.        
+        if test \"$ipAddress\" != dhcp; then
+            echo \"Configuring interface $name...\"
+	    extraFlags=
+            if test \"$subnetMask\" != default; then
+	        extraFlags=\"$extraFlags netmask $subnetMask\"
+            fi
+            ${nettools}/sbin/ifconfig \"$name\" \"$ipAddress\" $extraFlags || true
         fi
-        ${nettools}/sbin/ifconfig \"$name\" \"$ipAddress\" $extraFlags || true
+        
     done
 
     # Set the nameservers.
-- 
GitLab


From 119df37858b853440f9ff4827563813997006b23 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sun, 4 Mar 2007 01:16:24 +0000
Subject: [PATCH 0512/5331] * Generate a wrapper around modprobe that sets
 MODULE_DIR.  This is   important for /proc/sys/kernel/modprobe, i.e.,
 modprobing by the   kernel.

svn path=/nixos/trunk/; revision=8164
---
 system/activate-configuration.sh    |  8 ++++++++
 system/modprobe                     |  3 +++
 system/system.nix                   | 14 ++++++++++++--
 system/upstart.nix                  | 19 ++++++++++++-------
 upstart-jobs/alsa.nix               |  5 ++---
 upstart-jobs/hardware-scan.nix      |  9 +++------
 upstart-jobs/lvm.nix                |  5 ++---
 upstart-jobs/network-interfaces.nix |  7 ++-----
 upstart-jobs/ntpd.nix               |  5 ++---
 upstart-jobs/swraid.nix             |  6 +++---
 10 files changed, 49 insertions(+), 32 deletions(-)
 create mode 100644 system/modprobe

diff --git a/system/activate-configuration.sh b/system/activate-configuration.sh
index addeeb2f820..d7360f27486 100644
--- a/system/activate-configuration.sh
+++ b/system/activate-configuration.sh
@@ -36,6 +36,14 @@ mkdir -m 0755 -p $mountPoint/bin
 ln -sfn @shell@ $mountPoint/bin/sh
 
 
+# Allow the kernel to find our wrapped modprobe (which searches in the
+# right location in the Nix store for kernel modules).  We need this
+# when the kernel (or some module) auto-loads a module.
+# !!! maybe this should only happen at boot time, since we shouldn't
+# use modules that don't match the running kernel.
+echo @modprobe@/sbin/modprobe > /proc/sys/kernel/modprobe
+
+
 # Various log directories.
 mkdir -m 0755 -p /var/run
 
diff --git a/system/modprobe b/system/modprobe
new file mode 100644
index 00000000000..5971880f064
--- /dev/null
+++ b/system/modprobe
@@ -0,0 +1,3 @@
+#! @shell@
+export MODULE_DIR=@kernel@/lib/modules
+exec @module_init_tools@/sbin/modprobe "$@"
diff --git a/system/system.nix b/system/system.nix
index e032bad07ab..03ec3b1c3a4 100644
--- a/system/system.nix
+++ b/system/system.nix
@@ -131,9 +131,18 @@ rec {
     (map (mod: mod + "/lib") nssModules));
 
 
+  # Wrapper around modprobe to set the path to the modules.
+  modprobe = pkgs.substituteAll {
+    dir = "sbin";
+    src = ./modprobe;
+    isExecutable = true;
+    inherit (pkgs) kernel module_init_tools;
+  };
+
+
   # The services (Upstart) configuration for the system.
   upstartJobs = import ./upstart.nix {
-    inherit config pkgs nix nssModulesPath;
+    inherit config pkgs nix modprobe nssModulesPath;
   };
 
 
@@ -155,6 +164,7 @@ rec {
 
   # The packages you want in the boot environment.
   systemPathList = [
+    modprobe # must take precedence over module_init_tools
     pkgs.bash
     pkgs.bzip2
     pkgs.coreutils
@@ -220,7 +230,7 @@ rec {
     src = ./activate-configuration.sh;
     isExecutable = true;
 
-    inherit etc wrapperDir systemPath;
+    inherit etc wrapperDir systemPath modprobe;
     inherit (pkgs) kernel;
     readOnlyRoot = config.get ["boot" "readOnlyRoot"];
     hostName = config.get ["networking" "hostName"];
diff --git a/system/upstart.nix b/system/upstart.nix
index fc694eefc13..eb185a2b204 100644
--- a/system/upstart.nix
+++ b/system/upstart.nix
@@ -1,4 +1,4 @@
-{config, pkgs, nix, nssModulesPath}:
+{config, pkgs, nix, modprobe, nssModulesPath}:
 
 let 
 
@@ -31,17 +31,19 @@ import ../upstart-jobs/gather.nix {
       
     # Makes LVM logical volumes available. 
     (import ../upstart-jobs/lvm.nix {
-      inherit (pkgs) kernel module_init_tools lvm2;
+      inherit modprobe;
+      inherit (pkgs) lvm2;
     })
       
     # Activate software RAID arrays.
     (import ../upstart-jobs/swraid.nix {
-      inherit (pkgs) kernel module_init_tools mdadm;
+      inherit modprobe;
+      inherit (pkgs) mdadm;
     })
       
     # Hardware scan; loads modules for PCI devices.
     (import ../upstart-jobs/hardware-scan.nix {
-      inherit (pkgs) kernel module_init_tools;
+      inherit modprobe;
       doHardwareScan = config.get ["boot" "hardwareScan"];
       kernelModules = config.get ["boot" "kernelModules"];
     })
@@ -60,7 +62,8 @@ import ../upstart-jobs/gather.nix {
 
     # Network interfaces.
     (import ../upstart-jobs/network-interfaces.nix {
-      inherit (pkgs) nettools kernel module_init_tools wirelesstools;
+      inherit modprobe;
+      inherit (pkgs) nettools wirelesstools;
       nameservers = config.get ["networking" "nameservers"];
       defaultGateway = config.get ["networking" "defaultGateway"];
       interfaces = config.get ["networking" "interfaces"];
@@ -113,7 +116,8 @@ import ../upstart-jobs/gather.nix {
   # NTP daemon.
   ++ optional ["services" "ntp" "enable"]
     (import ../upstart-jobs/ntpd.nix {
-      inherit (pkgs) ntp kernel module_init_tools glibc pwdutils writeText;
+      inherit modprobe;
+      inherit (pkgs) ntp glibc pwdutils writeText;
       servers = config.get ["services" "ntp" "servers"];
     })
 
@@ -136,7 +140,8 @@ import ../upstart-jobs/gather.nix {
   # ALSA sound support.
   ++ optional ["sound" "enable"]
     (import ../upstart-jobs/alsa.nix {
-      inherit (pkgs) kernel module_init_tools alsaUtils;
+      inherit modprobe;
+      inherit (pkgs) alsaUtils;
     })
 
   # Handles the reboot/halt events.
diff --git a/upstart-jobs/alsa.nix b/upstart-jobs/alsa.nix
index de258a8770b..1b018b2259a 100644
--- a/upstart-jobs/alsa.nix
+++ b/upstart-jobs/alsa.nix
@@ -1,4 +1,4 @@
-{kernel, module_init_tools, alsaUtils}:
+{modprobe, alsaUtils}:
 
 let
 
@@ -16,9 +16,8 @@ stop on shutdown
 start script
 
     # Load some additional modules.
-    export MODULE_DIR=${kernel}/lib/modules/
     for mod in snd_pcm_oss; do
-        ${module_init_tools}/sbin/modprobe $mod || true
+        ${modprobe}/sbin/modprobe $mod || true
     done
 
     # Restore the sound state.
diff --git a/upstart-jobs/hardware-scan.nix b/upstart-jobs/hardware-scan.nix
index 6cca5f7562f..80b7f440b76 100644
--- a/upstart-jobs/hardware-scan.nix
+++ b/upstart-jobs/hardware-scan.nix
@@ -1,5 +1,4 @@
-# !!! Don't like it that I have to pass the kernel here.
-{kernel, module_init_tools, doHardwareScan, kernelModules}:
+{modprobe, doHardwareScan, kernelModules}:
 
 {
   name = "hardware-scan";
@@ -8,11 +7,9 @@
 start on udev
 
 script
-    export MODULE_DIR=${kernel}/lib/modules/
-
     for i in ${toString kernelModules}; do
         echo \"Loading kernel module $i...\"
-        ${module_init_tools}/sbin/modprobe $i || true
+        ${modprobe}/sbin/modprobe $i || true
     done
 
     if test -n \"${toString doHardwareScan}\" -a ! -e /var/run/safemode; then
@@ -20,7 +17,7 @@ script
         # Try to load modules for all PCI devices.
         for i in /sys/bus/pci/devices/*/modalias; do
             echo \"Trying to load a module for $(basename $(dirname $i))...\"
-            ${module_init_tools}/sbin/modprobe $(cat $i) || true
+            ${modprobe}/sbin/modprobe $(cat $i) || true
             echo \"\"
         done
 
diff --git a/upstart-jobs/lvm.nix b/upstart-jobs/lvm.nix
index 558b80cd651..ee6e842564c 100644
--- a/upstart-jobs/lvm.nix
+++ b/upstart-jobs/lvm.nix
@@ -1,4 +1,4 @@
-{kernel, module_init_tools, lvm2}:
+{modprobe, lvm2}:
 
 {
   name = "lvm";
@@ -10,8 +10,7 @@ start on udev
 script
 
     # Load the device mapper.
-    export MODULE_DIR=${kernel}/lib/modules/
-    ${module_init_tools}/sbin/modprobe dm_mod || true
+    ${modprobe}/sbin/modprobe dm_mod || true
 
     # Scan for block devices that might contain LVM physical volumes
     # and volume groups.
diff --git a/upstart-jobs/network-interfaces.nix b/upstart-jobs/network-interfaces.nix
index 66548b1354d..a40ced8a90c 100644
--- a/upstart-jobs/network-interfaces.nix
+++ b/upstart-jobs/network-interfaces.nix
@@ -1,5 +1,4 @@
-# !!! Don't like it that I have to pass the kernel here.
-{ nettools, kernel, module_init_tools, wirelesstools
+{ nettools, modprobe, wirelesstools
 , nameservers, defaultGateway, interfaces
 }:
 
@@ -22,9 +21,7 @@ start on hardware-scan
 stop on shutdown
 
 start script
-    export MODULE_DIR=${kernel}/lib/modules/
-
-    ${module_init_tools}/sbin/modprobe af_packet
+    ${modprobe}/sbin/modprobe af_packet
 
     for i in $(cd /sys/class/net && ls -d *); do
         echo \"Bringing up network device $i...\"
diff --git a/upstart-jobs/ntpd.nix b/upstart-jobs/ntpd.nix
index 39e5eb9023f..1a043106d17 100644
--- a/upstart-jobs/ntpd.nix
+++ b/upstart-jobs/ntpd.nix
@@ -1,4 +1,4 @@
-{ntp, kernel, module_init_tools, glibc, pwdutils, writeText, servers}:
+{ntp, modprobe, glibc, pwdutils, writeText, servers}:
 
 let
 
@@ -37,8 +37,7 @@ start script
     chown ${ntpUser} ${stateDir}
 
     # Needed to run ntpd as an unprivileged user.
-    export MODULE_DIR=${kernel}/lib/modules/
-    ${module_init_tools}/sbin/modprobe capability
+    ${modprobe}/sbin/modprobe capability
 
     ${ntp}/bin/ntpd -q -g ${ntpFlags}
     
diff --git a/upstart-jobs/swraid.nix b/upstart-jobs/swraid.nix
index 3a3328eb1f0..5cf7d82e383 100644
--- a/upstart-jobs/swraid.nix
+++ b/upstart-jobs/swraid.nix
@@ -1,4 +1,4 @@
-{kernel, module_init_tools, mdadm}:
+{modprobe, mdadm}:
 
 let
 
@@ -16,9 +16,9 @@ start on udev
 script
 
     # Load the necessary RAID personalities.
-    export MODULE_DIR=${kernel}/lib/modules/
+    # !!! hm, doesn't the kernel load these automatically?
     for mod in raid0 raid1 raid5; do
-        ${module_init_tools}/sbin/modprobe $mod || true
+        ${modprobe}/sbin/modprobe $mod || true
     done
 
     # Scan /proc/partitions for RAID devices.
-- 
GitLab


From 797524528b36280729e14dcca28412040b1b9ce5 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sun, 4 Mar 2007 13:15:11 +0000
Subject: [PATCH 0513/5331] * Doh.

svn path=/nixos/trunk/; revision=8168
---
 system/switch-to-configuration.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/system/switch-to-configuration.sh b/system/switch-to-configuration.sh
index 206ac29d812..f3b61ded26a 100644
--- a/system/switch-to-configuration.sh
+++ b/system/switch-to-configuration.sh
@@ -73,7 +73,7 @@ if test "$action" = "switch" -o "$action" = "test"; then
 
         # Hack: skip the sys-* and ctrl-alt-delete events.
         # Another hack: don't restart the X server (that would kill all the clients).
-        if echo "$event" | grep -q "^sys-\|^ctrl-|^xserver"; then continue; fi
+        if echo "$event" | grep -q "^sys-\|^ctrl-\|^xserver"; then continue; fi
     
         if ! test -e "$oldEvents/$event"; then
             echo "starting $event..."
-- 
GitLab


From 5ea2541f058e68d9c080ab5a1daa1b6c2b3da6a9 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sun, 4 Mar 2007 13:15:30 +0000
Subject: [PATCH 0514/5331] * Put compiz plugins in the right order.

svn path=/nixos/trunk/; revision=8169
---
 upstart-jobs/xserver.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/upstart-jobs/xserver.nix b/upstart-jobs/xserver.nix
index b06decf06e4..e02e19bac5c 100644
--- a/upstart-jobs/xserver.nix
+++ b/upstart-jobs/xserver.nix
@@ -78,7 +78,7 @@ let
     else if windowManager == "compiz" then "
     # !!! Hack: load the schemas for Compiz.
     GCONF_CONFIG_SOURCE=xml::~/.gconf ${GConf}/bin/gconftool-2 --makefile-install-rule ${compiz}/etc/gconf/schemas/*.schemas
-    ${GConf}/bin/gconftool-2 -t list --list-type=string --set /apps/compiz/general/allscreens/options/active_plugins [gconf,png,decoration,fade,minimize,move,resize,cube,switcher,rotate,place,scale,water,wobbly,zoom]
+    ${GConf}/bin/gconftool-2 -t list --list-type=string --set /apps/compiz/general/allscreens/options/active_plugins [gconf,png,decoration,wobbly,fade,minimize,move,resize,cube,switcher,rotate,place,scale,water,zoom]
     ${compiz}/bin/compiz gconf &
     /nix/store/n4wkqkl9l1bikdq39hcxg1rwywavzzh9-compiz-0.3.6/bin/gtk-window-decorator &
     "
-- 
GitLab


From ba845b19fb731fe266c10efe5c8d6c5d9114122c Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sun, 4 Mar 2007 21:25:32 +0000
Subject: [PATCH 0515/5331] * Doh.

svn path=/nixos/trunk/; revision=8170
---
 upstart-jobs/xserver.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/upstart-jobs/xserver.nix b/upstart-jobs/xserver.nix
index e02e19bac5c..f97c4f00174 100644
--- a/upstart-jobs/xserver.nix
+++ b/upstart-jobs/xserver.nix
@@ -80,7 +80,7 @@ let
     GCONF_CONFIG_SOURCE=xml::~/.gconf ${GConf}/bin/gconftool-2 --makefile-install-rule ${compiz}/etc/gconf/schemas/*.schemas
     ${GConf}/bin/gconftool-2 -t list --list-type=string --set /apps/compiz/general/allscreens/options/active_plugins [gconf,png,decoration,wobbly,fade,minimize,move,resize,cube,switcher,rotate,place,scale,water,zoom]
     ${compiz}/bin/compiz gconf &
-    /nix/store/n4wkqkl9l1bikdq39hcxg1rwywavzzh9-compiz-0.3.6/bin/gtk-window-decorator &
+    ${compiz}/bin/gtk-window-decorator &
     "
 
     else abort ("unknown window manager "+ windowManager)}
-- 
GitLab


From 8d731dacadd9be6701d3371a9b0bfa435f5ba404 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 6 Mar 2007 00:07:00 +0000
Subject: [PATCH 0516/5331] * X session script:   - Set the desktop background
 to the image ~/.background-image.   - Depending on
 services.xserver.sessionType, start an xterm or a     gnome-terminal as the
 "desktop" :-)

* Upstart jobs can now declare extra packages to be added to the
  system path through the `extraPath' attribute.  For instance, the
  ALSA job adds alsa-utils, and the X server job adds lots of stuff
  depending on the X configuration (e.g., xrandr, gnome-terminal,
  twm).

* Create a cdrom/dvd symlink for SCSI sr? devices.

svn path=/nixos/trunk/; revision=8221
---
 system/options.nix                    | 24 ++++++++
 system/system.nix                     |  2 +-
 system/upstart.nix                    |  8 ++-
 upstart-jobs/alsa.nix                 |  2 +
 upstart-jobs/make-job.nix             | 14 ++++-
 upstart-jobs/udev-rules/50-udev.rules |  1 +
 upstart-jobs/xserver.conf             |  5 ++
 upstart-jobs/xserver.nix              | 88 +++++++++++++++++++++++----
 8 files changed, 125 insertions(+), 19 deletions(-)

diff --git a/system/options.nix b/system/options.nix
index 9115cedc7b1..fa3a6f07744 100644
--- a/system/options.nix
+++ b/system/options.nix
@@ -505,6 +505,30 @@
   }
 
   
+  {
+    name = ["services" "xserver" "sessionType"];
+    default = "gnome";
+    example = "xterm";
+    description = "
+      The kind of session to start after login.  Current possibilies
+      are <literal>gnome</literal> (which starts
+      <command>gnome-terminal</command>) and <literal>xterm</literal>
+      (which starts <command>xterm</command>).
+    ";
+  }
+
+  
+  {
+    name = ["services" "xserver" "sessionStarter"];
+    example = "${pkgs.xterm}/bin/xterm -ls";
+    description = "
+      The command executed after login and after the window manager
+      has been started.  Used if
+      <option>services.xserver.sessionType</option> is not empty.
+    ";
+  }
+
+  
   {
     name = ["services" "httpd" "enable"];
     default = false;
diff --git a/system/system.nix b/system/system.nix
index 03ec3b1c3a4..e4c093c5dd2 100644
--- a/system/system.nix
+++ b/system/system.nix
@@ -208,7 +208,7 @@ rec {
     nixosCheckout
     setuidWrapper
   ]
-  ++ (if config.get ["sound" "enable"] then [pkgs.alsaUtils] else []);
+  ++ pkgs.lib.concatLists (map (job: job.extraPath) upstartJobs.jobs);
 
 
   # We don't want to put all of `startPath' and `path' in $PATH, since
diff --git a/system/upstart.nix b/system/upstart.nix
index eb185a2b204..0a00a1ba31f 100644
--- a/system/upstart.nix
+++ b/system/upstart.nix
@@ -125,8 +125,8 @@ import ../upstart-jobs/gather.nix {
   ++ optional ["services" "xserver" "enable"]
     (import ../upstart-jobs/xserver.nix {
       inherit config;
-      inherit (pkgs) stdenv writeText lib xterm slim xorg mesa compiz;
-      inherit (pkgs.gnome) metacity GConf;
+      inherit (pkgs) stdenv writeText lib xterm slim xorg mesa
+        gnome compiz feh;
       fontDirectories = import ./fonts.nix {inherit pkgs;};
     })
 
@@ -201,6 +201,8 @@ import ../upstart-jobs/gather.nix {
   ++ (map makeJob (config.get ["services" "extraJobs"]))
 
   # For the built-in logd job.
-  ++ [pkgs.upstart];
+  ++ [
+    (pkgs.upstart // {extraPath = [];})
+  ];
   
 }
diff --git a/upstart-jobs/alsa.nix b/upstart-jobs/alsa.nix
index 1b018b2259a..ea6b1c557b2 100644
--- a/upstart-jobs/alsa.nix
+++ b/upstart-jobs/alsa.nix
@@ -8,6 +8,8 @@ in
   
 {
   name = "alsa";
+
+  extraPath = [alsaUtils];
   
   job = "
 start on hardware-scan
diff --git a/upstart-jobs/make-job.nix b/upstart-jobs/make-job.nix
index 630ae1d83e1..457336c8f20 100644
--- a/upstart-jobs/make-job.nix
+++ b/upstart-jobs/make-job.nix
@@ -1,4 +1,14 @@
 {runCommand}: job:
 
-runCommand job.name {inherit (job) job;}
-  "ensureDir $out/etc/event.d; echo \"$job\" > $out/etc/event.d/$name"
+(
+  runCommand job.name {inherit (job) job;}
+    "ensureDir $out/etc/event.d; echo \"$job\" > $out/etc/event.d/$name"
+)
+
+//
+
+# Allow jobs to declare extra packages that should be added to the
+# system path.
+{
+  extraPath = if job ? extraPath then job.extraPath else [];
+}
\ No newline at end of file
diff --git a/upstart-jobs/udev-rules/50-udev.rules b/upstart-jobs/udev-rules/50-udev.rules
index 9b12e9b3e38..cb375103de3 100644
--- a/upstart-jobs/udev-rules/50-udev.rules
+++ b/upstart-jobs/udev-rules/50-udev.rules
@@ -28,6 +28,7 @@ KERNEL=="uinput",               NAME="input/%k", MODE="0600"
 
 # Create a symlink for the CD-ROM device.
 KERNEL=="hd[a-z]", BUS=="ide", SYSFS{removable}=="1", SYSFS{device/media}=="cdrom", SYMLINK+="cdrom cdrom-%k"
+KERNEL=="sr[0-9]", BUS=="scsi", SYMLINK+="cdrom cdrom-%k"
 
 
 # ALSA sound devices.
diff --git a/upstart-jobs/xserver.conf b/upstart-jobs/xserver.conf
index 34f507a2c35..0a655dd5e86 100644
--- a/upstart-jobs/xserver.conf
+++ b/upstart-jobs/xserver.conf
@@ -78,3 +78,8 @@ EndSection
 Section "Extensions"
   Option       "Composite" "Enable"
 EndSection
+
+
+Section "DRI"
+  Mode         0666 # !!! FIX THIS!
+EndSection
diff --git a/upstart-jobs/xserver.nix b/upstart-jobs/xserver.nix
index f97c4f00174..810df848283 100644
--- a/upstart-jobs/xserver.nix
+++ b/upstart-jobs/xserver.nix
@@ -1,4 +1,5 @@
-{ stdenv, writeText, lib, xorg, mesa, xterm, slim, metacity, GConf, compiz
+{ stdenv, writeText, lib, xorg, mesa, xterm, slim, gnome
+, compiz, feh
 
 , config
 
@@ -20,11 +21,19 @@ let
   optional = condition: x: if condition then [x] else [];
 
 
+  # Get a bunch of user settings.
   videoDriver = getCfg "videoDriver";
-
   resolutions = map (res: "\"${toString res.x}x${toString res.y}\"") (getCfg "resolutions");
-
   windowManager = getCfg "windowManager";
+  sessionType = getCfg "sessionType";
+  sessionStarter = getCfg "sessionStarter";
+
+
+  sessionCmd =
+    if sessionType == "" then sessionStarter else
+    if sessionType == "xterm" then "${xterm}/bin/xterm -ls" else
+    if sessionType == "gnome" then "${gnome.gnometerminal}/bin/gnome-terminal" else
+    abort ("unknown session type "+ sessionType);
 
 
   modules = [
@@ -65,28 +74,54 @@ let
 
 
   clientScript = writeText "xclient" "
+
+    exec > $HOME/.Xerrors 2>&1
+  
+
+    ### Start a window manager.
+  
     ${if windowManager == "twm" then "
     ${xorg.twm}/bin/twm &
     "
 
     else if windowManager == "metacity" then "
     # !!! Hack: load the schemas for Metacity.
-    GCONF_CONFIG_SOURCE=xml::~/.gconf ${GConf}/bin/gconftool-2 --makefile-install-rule ${metacity}/etc/gconf/schemas/*.schemas
-    ${metacity}/bin/metacity &
+    GCONF_CONFIG_SOURCE=xml::~/.gconf ${gnome.GConf}/bin/gconftool-2 \\
+      --makefile-install-rule ${gnome.metacity}/etc/gconf/schemas/*.schemas
+    ${gnome.metacity}/bin/metacity &
     "
 
     else if windowManager == "compiz" then "
+    
     # !!! Hack: load the schemas for Compiz.
-    GCONF_CONFIG_SOURCE=xml::~/.gconf ${GConf}/bin/gconftool-2 --makefile-install-rule ${compiz}/etc/gconf/schemas/*.schemas
-    ${GConf}/bin/gconftool-2 -t list --list-type=string --set /apps/compiz/general/allscreens/options/active_plugins [gconf,png,decoration,wobbly,fade,minimize,move,resize,cube,switcher,rotate,place,scale,water,zoom]
+    GCONF_CONFIG_SOURCE=xml::~/.gconf ${gnome.GConf}/bin/gconftool-2 \\
+      --makefile-install-rule ${compiz}/etc/gconf/schemas/*.schemas
+
+    # !!! Hack: turn on most Compiz modules.
+    ${gnome.GConf}/bin/gconftool-2 -t list --list-type=string \\
+      --set /apps/compiz/general/allscreens/options/active_plugins \\
+      [gconf,png,decoration,wobbly,fade,minimize,move,resize,cube,switcher,rotate,place,scale,water,zoom]
+
+    # Start Compiz and the GTK-style window decorator.
     ${compiz}/bin/compiz gconf &
     ${compiz}/bin/gtk-window-decorator &
     "
 
     else abort ("unknown window manager "+ windowManager)}
+
+
+    ### Show a background image.
+    if test -e $HOME/.background-image; then
+      ${feh}/bin/feh --bg-scale $HOME/.background-image
+    fi
     
-    ${xterm}/bin/xterm -ls
-  ";
+
+    ### Start a 'session' (right now, this is just a terminal).
+    # !!! yes, this means that you 'log out' by killing the X server.
+    while ${sessionCmd}; do
+      sleep 1  
+    done
+  "; # */ <- hack to fix syntax highlighting
 
 
   xserverArgs = [
@@ -98,6 +133,7 @@ let
     ":${toString display}" "vt${toString tty}"
   ];
 
+  
   # Note: lines must not be indented.
   slimConfig = writeText "slim.cfg" "
 xauth_path ${xorg.xauth}/bin/xauth
@@ -113,22 +149,48 @@ in
 rec {
   name = "xserver";
 
+  
+  extraPath = [
+    xorg.xrandr
+    feh
+  ]
+  ++ optional (windowManager == "twm") [
+    xorg.twm
+  ]
+  ++ optional (windowManager == "metacity") [
+    gnome.metacity
+  ]
+  ++ optional (windowManager == "compiz") [
+    compiz
+  ]
+  ++ optional (sessionType == "xterm") [
+    xterm
+  ]
+  ++ optional (sessionType == "gnome") [
+    gnome.gnometerminal
+    gnome.GConf
+    gnome.gconfeditor
+  ];
+
+    
   job = "
     #start on network-interfaces
 
     start script
       rm -f /var/state/opengl-driver
       ${if getCfg "driSupport"
-      then "ln -sf ${mesa} /var/state/opengl-driver"
-      else ""}
+        then "ln -sf ${mesa} /var/state/opengl-driver"
+        else ""
+      }
     end script
 
     env SLIM_CFGFILE=${slimConfig}
     env FONTCONFIG_FILE=/etc/fonts/fonts.conf # !!! cleanup
 
     ${if getCfg "driSupport"
-    then "env XORG_DRI_DRIVER_PATH=${mesa}/lib/modules/dri"
-    else ""}
+      then "env XORG_DRI_DRIVER_PATH=${mesa}/lib/modules/dri"
+      else ""
+    }
 
     exec ${slim}/bin/slim
   ";
-- 
GitLab


From 8851530afb57a97830a20f5290da64e76e0175e0 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 6 Mar 2007 00:45:33 +0000
Subject: [PATCH 0517/5331] * Setting boot.localCommands for anything you want
 to execute before   Upstart is started.

svn path=/nixos/trunk/; revision=8229
---
 boot/boot-stage-2-init.sh |  4 ++++
 boot/boot-stage-2.nix     |  6 +++++-
 system/options.nix        | 10 ++++++++++
 system/system.nix         |  3 ++-
 4 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/boot/boot-stage-2-init.sh b/boot/boot-stage-2-init.sh
index 5eab996beb2..7b0d48c73bc 100644
--- a/boot/boot-stage-2-init.sh
+++ b/boot/boot-stage-2-init.sh
@@ -100,6 +100,10 @@ mknod -m 0644 /dev/urandom c 1 9 # needed for passwd
 export MODULE_DIR=@kernel@/lib/modules/
 
 
+# Run any user-specified commands.
+@shell@ @bootLocal@
+
+
 # Start an interactive shell.
 #exec @shell@
 
diff --git a/boot/boot-stage-2.nix b/boot/boot-stage-2.nix
index 8772759aaf4..d5f4f4bacf6 100644
--- a/boot/boot-stage-2.nix
+++ b/boot/boot-stage-2.nix
@@ -1,4 +1,4 @@
-{ substituteAll, coreutils
+{ substituteAll, writeText, coreutils
 , utillinux, kernel, udev, upstart
 , activateConfiguration
 
@@ -8,6 +8,9 @@
 
 , # Path for Upstart jobs.  Should be quite minimal.
   upstartPath
+
+, # User-supplied command to be run just before Upstart is started.
+  bootLocal ? ""
 }:
 
 substituteAll {
@@ -20,4 +23,5 @@ substituteAll {
     udev
     upstart
   ];
+  bootLocal = writeText "boot.local" bootLocal;
 }
diff --git a/system/options.nix b/system/options.nix
index fa3a6f07744..5bc09612503 100644
--- a/system/options.nix
+++ b/system/options.nix
@@ -179,6 +179,16 @@
   }
 
 
+  {
+    name = ["boot" "localCommands"];
+    default = "";
+    example = "text=anything; echo You can put $text here.";
+    description = "
+      Shell commands to be executed just before Upstart is started.
+    ";
+  }
+
+
   { 
     name = ["networking" "hostName"];
     default = "nixos";
diff --git a/system/system.nix b/system/system.nix
index e4c093c5dd2..6b2c8000010 100644
--- a/system/system.nix
+++ b/system/system.nix
@@ -248,7 +248,7 @@ rec {
   # The init script of boot stage 2, which is supposed to do
   # everything else to bring up the system.
   bootStage2 = import ../boot/boot-stage-2.nix {
-    inherit (pkgs) substituteAll coreutils 
+    inherit (pkgs) substituteAll writeText coreutils 
       utillinux kernel udev upstart;
     inherit activateConfiguration;
     readOnlyRoot = config.get ["boot" "readOnlyRoot"];
@@ -259,6 +259,7 @@ rec {
       pkgs.gnused
       pkgs.upstart
     ];
+    bootLocal = config.get ["boot" "localCommands"];
   };
 
 
-- 
GitLab


From 4e292cb1aecae5ab630acdc4ed5cb3350c440333 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 13 Mar 2007 11:27:15 +0000
Subject: [PATCH 0518/5331] * Remove unnecessary control characters from PS1.

svn path=/nixos/trunk/; revision=8275
---
 system/etc/profile.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/system/etc/profile.sh b/system/etc/profile.sh
index ae29c857294..16a5efd7f7b 100644
--- a/system/etc/profile.sh
+++ b/system/etc/profile.sh
@@ -8,7 +8,7 @@ export FONTCONFIG_FILE=/etc/fonts/fonts.conf
 PROMPT_COLOR="1;31m"
 PS1="\n\[\033[$PROMPT_COLOR\][\u@\h:\w]$\[\033[0m\] "
 if test "x$TERM" == "xxterm"; then
-    PS1="\033]2;\h:\u:\w\007\033]1;$PS1"
+    PS1="\033]2;\h:\u:\w\007$PS1"
 fi
 
 if test "$USER" != root; then
-- 
GitLab


From b670a6d3d8ef1e69e992aa79158ba92b5cc269d1 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 13 Mar 2007 11:34:52 +0000
Subject: [PATCH 0519/5331] * Disable the zoom plugin.

svn path=/nixos/trunk/; revision=8277
---
 upstart-jobs/xserver.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/upstart-jobs/xserver.nix b/upstart-jobs/xserver.nix
index 810df848283..1ca2ea1fb85 100644
--- a/upstart-jobs/xserver.nix
+++ b/upstart-jobs/xserver.nix
@@ -100,7 +100,7 @@ let
     # !!! Hack: turn on most Compiz modules.
     ${gnome.GConf}/bin/gconftool-2 -t list --list-type=string \\
       --set /apps/compiz/general/allscreens/options/active_plugins \\
-      [gconf,png,decoration,wobbly,fade,minimize,move,resize,cube,switcher,rotate,place,scale,water,zoom]
+      [gconf,png,decoration,wobbly,fade,minimize,move,resize,cube,switcher,rotate,place,scale,water]
 
     # Start Compiz and the GTK-style window decorator.
     ${compiz}/bin/compiz gconf &
-- 
GitLab


From 1ca3258c3f818cae2559abc21cc9e968bb7627f9 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 16 Mar 2007 14:46:56 +0000
Subject: [PATCH 0520/5331] * More failure tolerance.

svn path=/nixos/trunk/; revision=8303
---
 upstart-jobs/network-interfaces.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/upstart-jobs/network-interfaces.nix b/upstart-jobs/network-interfaces.nix
index a40ced8a90c..4bfa1e97f25 100644
--- a/upstart-jobs/network-interfaces.nix
+++ b/upstart-jobs/network-interfaces.nix
@@ -21,7 +21,7 @@ start on hardware-scan
 stop on shutdown
 
 start script
-    ${modprobe}/sbin/modprobe af_packet
+    ${modprobe}/sbin/modprobe af_packet || true
 
     for i in $(cd /sys/class/net && ls -d *); do
         echo \"Bringing up network device $i...\"
@@ -44,11 +44,11 @@ start script
 
         # Set wireless networking stuff.
         if test \"$essid\" != dhcp; then
-            ${wirelesstools}/sbin/iwconfig \"$name\" essid \"$essid\"
+            ${wirelesstools}/sbin/iwconfig \"$name\" essid \"$essid\" || true
         fi
         
         if test \"$wepKey\" != nokey; then
-            ${wirelesstools}/sbin/iwconfig \"$name\" key \"$(cat \"$wepKey\")\"
+            ${wirelesstools}/sbin/iwconfig \"$name\" key \"$(cat \"$wepKey\")\" || true
         fi
         
         # Set IP address / netmask.        
-- 
GitLab


From 8452dd3cd0c32dee64f15088f8b0a37407f1277b Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 16 Mar 2007 16:41:38 +0000
Subject: [PATCH 0521/5331] * Upstart job for dhcpd.

svn path=/nixos/trunk/; revision=8311
---
 system/options.nix     | 26 ++++++++++++++++++++++++++
 system/upstart.nix     |  8 ++++++++
 upstart-jobs/dhcpd.nix | 17 +++++++++++++++++
 3 files changed, 51 insertions(+)
 create mode 100644 upstart-jobs/dhcpd.nix

diff --git a/system/options.nix b/system/options.nix
index 5bc09612503..789a00f58a2 100644
--- a/system/options.nix
+++ b/system/options.nix
@@ -413,6 +413,32 @@
   */
 
   
+  {
+    name = ["services" "dhcpd" "enable"];
+    default = false;
+    description = "
+      Whether to enable the DHCP server.
+    ";
+  }
+
+  
+  {
+    name = ["services" "dhcpd" "configFile"];
+    description = "
+      The path of the DHCP server configuration file.
+    ";
+  }
+
+  
+  {
+    name = ["services" "dhcpd" "interfaces"];
+    default = ["eth0"];
+    description = "
+      The interfaces on which the DHCP server should listen.
+    ";
+  }
+
+  
   {
     name = ["services" "sshd" "enable"];
     default = false;
diff --git a/system/upstart.nix b/system/upstart.nix
index 0a00a1ba31f..09c82fae53f 100644
--- a/system/upstart.nix
+++ b/system/upstart.nix
@@ -103,6 +103,14 @@ import ../upstart-jobs/gather.nix {
       interfaces = config.get ["networking" "interfaces"];
     })
 
+  # DHCP server.
+  ++ optional ["services" "dhcpd" "enable"]
+    (import ../upstart-jobs/dhcpd.nix {
+      inherit (pkgs) dhcp;
+      configFile = config.get ["services" "dhcpd" "configFile"];
+      interfaces = config.get ["services" "dhcpd" "interfaces"];
+    })
+
   # SSH daemon.
   ++ optional ["services" "sshd" "enable"]
     (import ../upstart-jobs/sshd.nix {
diff --git a/upstart-jobs/dhcpd.nix b/upstart-jobs/dhcpd.nix
new file mode 100644
index 00000000000..aa09c200901
--- /dev/null
+++ b/upstart-jobs/dhcpd.nix
@@ -0,0 +1,17 @@
+{dhcp, configFile, interfaces}:
+
+{
+  name = "dhcpd";
+  
+  job = "
+description \"DHCP server\"
+
+start on network-interfaces/started
+stop on network-interfaces/stop
+
+script
+    exec ${dhcp}/sbin/dhcpd -f -cf ${configFile} ${toString interfaces}
+end script
+  ";
+  
+}
-- 
GitLab


From 36f01930edcffa9075fee67facfcae1b5686ec0c Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 19 Mar 2007 20:28:09 +0000
Subject: [PATCH 0522/5331] * Take the target platform as a parameter. * Put
 the platform name in the name of the ISO image.

svn path=/nixos/trunk/; revision=8364
---
 configuration/rescue-cd.nix | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/configuration/rescue-cd.nix b/configuration/rescue-cd.nix
index 1cbccf9ee33..4884c48168c 100644
--- a/configuration/rescue-cd.nix
+++ b/configuration/rescue-cd.nix
@@ -1,3 +1,6 @@
+{ platform ? __currentSystem
+}:
+
 rec {
 
   
@@ -77,7 +80,7 @@ rec {
 
 
   system = import ../system/system.nix {
-    inherit configuration;
+    inherit configuration platform;
     stage2Init = "/init";
   };
 
@@ -139,7 +142,7 @@ rec {
   # init.
   rescueCD = import ../helpers/make-iso9660-image.nix {
     inherit (pkgs) stdenv perl cdrtools;
-    isoName = "nixos.iso";
+    isoName = "nixos-${platform}.iso";
 
     # Single files to be copied to fixed locations on the CD.
     contents = [
-- 
GitLab


From 3d85bc56ff923719c6077cf8ed88403cf364b414 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 19 Mar 2007 23:00:48 +0000
Subject: [PATCH 0523/5331] svn path=/nixos/trunk/; revision=8369

---
 configuration/rescue-cd.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/configuration/rescue-cd.nix b/configuration/rescue-cd.nix
index 4884c48168c..e76166826c1 100644
--- a/configuration/rescue-cd.nix
+++ b/configuration/rescue-cd.nix
@@ -4,7 +4,7 @@
 rec {
 
   
-  nixpkgsRel = "nixpkgs-0.11pre8027";
+  nixpkgsRel = "nixpkgs-0.11pre8366";
 
 
   configuration = {
@@ -121,7 +121,7 @@ rec {
   # Get a recent copy of Nixpkgs.
   nixpkgsTarball = pkgs.fetchurl {
     url = configuration.installer.nixpkgsURL + "/" + nixpkgsRel + ".tar.bz2";
-    md5 = "3beb348da52f4bd86af28f82f375e0ec";
+    md5 = "580487bfa326ad9c61c286774d1c301d";
   };
 
 
-- 
GitLab


From 9e9d6a4c620208efa15aba728f3a50e2da2942c0 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 20 Mar 2007 10:40:45 +0000
Subject: [PATCH 0524/5331] * Use a bash built with ncurses support for logins.

svn path=/nixos/trunk/; revision=8376
---
 system/activate-configuration.sh | 2 +-
 system/system.nix                | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/system/activate-configuration.sh b/system/activate-configuration.sh
index d7360f27486..2a39e5649a5 100644
--- a/system/activate-configuration.sh
+++ b/system/activate-configuration.sh
@@ -33,7 +33,7 @@ done
 # Create the required /bin/sh symlink; otherwise lots of things
 # (notably the system() function) won't work.
 mkdir -m 0755 -p $mountPoint/bin
-ln -sfn @shell@ $mountPoint/bin/sh
+ln -sfn @bash@/bin/sh $mountPoint/bin/sh
 
 
 # Allow the kernel to find our wrapped modprobe (which searches in the
diff --git a/system/system.nix b/system/system.nix
index 6b2c8000010..bec3adb943b 100644
--- a/system/system.nix
+++ b/system/system.nix
@@ -165,7 +165,7 @@ rec {
   # The packages you want in the boot environment.
   systemPathList = [
     modprobe # must take precedence over module_init_tools
-    pkgs.bash
+    pkgs.bashInteractive # bash with ncurses support
     pkgs.bzip2
     pkgs.coreutils
     pkgs.cpio
@@ -242,6 +242,8 @@ rec {
       pkgs.glibc # needed for getent
       pkgs.pwdutils
     ];
+
+    bash = pkgs.bashInteractive;
   };
 
 
-- 
GitLab


From 4f3b2290b25294986e906be972ffd8c2de0370f4 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 20 Mar 2007 11:04:45 +0000
Subject: [PATCH 0525/5331] * FHS compliance: put persistent state in /var/lib,
 not /var/state.

svn path=/nixos/trunk/; revision=8377
---
 upstart-jobs/alsa.nix     |  4 +++-
 upstart-jobs/dhclient.nix |  6 ++++--
 upstart-jobs/dhcpd.nix    | 10 +++++++++-
 3 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/upstart-jobs/alsa.nix b/upstart-jobs/alsa.nix
index ea6b1c557b2..1afca3c4554 100644
--- a/upstart-jobs/alsa.nix
+++ b/upstart-jobs/alsa.nix
@@ -2,7 +2,7 @@
 
 let
 
-  soundState = "/var/state/asound.state";
+  soundState = "/var/lib/alsa/asound.state";
 
 in
   
@@ -17,6 +17,8 @@ stop on shutdown
 
 start script
 
+    mkdir -m 0755 -p $(dirname ${soundState})
+
     # Load some additional modules.
     for mod in snd_pcm_oss; do
         ${modprobe}/sbin/modprobe $mod || true
diff --git a/upstart-jobs/dhclient.nix b/upstart-jobs/dhclient.nix
index 41fa887f7c6..f2ebc39190d 100644
--- a/upstart-jobs/dhclient.nix
+++ b/upstart-jobs/dhclient.nix
@@ -6,6 +6,8 @@ let
   ignoredInterfaces = ["lo"] ++
     map (i: i.name) (lib.filter (i: i ? ipAddress) interfaces);
 
+  stateDir = "/var/lib/dhcp"; # Don't use /var/state/dhcp; not FHS-compliant.
+
 in
 
 {
@@ -37,9 +39,9 @@ script
         exit 1
     fi
 
-    mkdir -m 755 -p /var/state/dhcp
+    mkdir -m 755 -p ${stateDir}
 
-    exec ${dhcp}/sbin/dhclient -d $interfaces -e \"PATH=$PATH\"
+    exec ${dhcp}/sbin/dhclient -d $interfaces -e \"PATH=$PATH\" -lf ${stateDir}/dhclient.leases
 end script
   ";
   
diff --git a/upstart-jobs/dhcpd.nix b/upstart-jobs/dhcpd.nix
index aa09c200901..b257eb8240b 100644
--- a/upstart-jobs/dhcpd.nix
+++ b/upstart-jobs/dhcpd.nix
@@ -1,5 +1,11 @@
 {dhcp, configFile, interfaces}:
 
+let
+
+  stateDir = "/var/lib/dhcp"; # Don't use /var/state/dhcp; not FHS-compliant.
+
+in
+  
 {
   name = "dhcpd";
   
@@ -10,7 +16,9 @@ start on network-interfaces/started
 stop on network-interfaces/stop
 
 script
-    exec ${dhcp}/sbin/dhcpd -f -cf ${configFile} ${toString interfaces}
+    exec ${dhcp}/sbin/dhcpd -f -cf ${configFile} \\
+        -lf ${stateDir}/dhcpd.leases \\
+        ${toString interfaces}
 end script
   ";
   
-- 
GitLab


From 80a09041961a50e9dd63d8a4604d60b0c44cf66e Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 20 Mar 2007 11:45:59 +0000
Subject: [PATCH 0526/5331] * Set /var/run/current-system to the currently
 active system   configuration, and use it as a garbage collection root to
 prevent   the current configuration from being GC'ed (which was previously  
 possible if the configuration was activated using "nixos-rebuild   test", or
 if the configuration's generation symlink had been removed   from the system
 profile).

  This isn't quite right yet due to a layering problem:
  activate-configuration.sh doesn't know the top-level store path of
  the configuration.

svn path=/nixos/trunk/; revision=8379
---
 system/activate-configuration.sh | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/system/activate-configuration.sh b/system/activate-configuration.sh
index 2a39e5649a5..766d75fa167 100644
--- a/system/activate-configuration.sh
+++ b/system/activate-configuration.sh
@@ -135,3 +135,10 @@ done
 
 # Set the host name.
 hostname @hostName@
+
+
+# Make this configuration the current configuration.
+ln -sfn @out@ /var/run/current-system
+
+# Prevent the current configuration from being garbage-collected.
+ln -sfn /var/run/current-system /nix/var/nix/gcroots/current-system
-- 
GitLab


From 8447e036fd9d3d72cceb4a2278bdd052bb0da1c3 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 20 Mar 2007 12:34:52 +0000
Subject: [PATCH 0527/5331] * Create dhcpd.leases, otherwise dhcpd won't start.

svn path=/nixos/trunk/; revision=8380
---
 upstart-jobs/dhcpd.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/upstart-jobs/dhcpd.nix b/upstart-jobs/dhcpd.nix
index b257eb8240b..5025f18e978 100644
--- a/upstart-jobs/dhcpd.nix
+++ b/upstart-jobs/dhcpd.nix
@@ -16,9 +16,15 @@ start on network-interfaces/started
 stop on network-interfaces/stop
 
 script
+
+    mkdir -m 755 -p ${stateDir}
+
+    touch ${stateDir}/dhcpd.leases
+
     exec ${dhcp}/sbin/dhcpd -f -cf ${configFile} \\
         -lf ${stateDir}/dhcpd.leases \\
         ${toString interfaces}
+
 end script
   ";
   
-- 
GitLab


From c10fe148a3d043dcb288117ad6385e7ec4e62957 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 20 Mar 2007 13:01:53 +0000
Subject: [PATCH 0528/5331] * /var/run/current-system symlinks to the top-level
 path of the system   configuration now. * /var/run/booted-system symlinks to
 the system configuration used at   boot time.

svn path=/nixos/trunk/; revision=8381
---
 boot/boot-stage-2-init.sh         | 16 +++++++++++-----
 installer/grub-menu-builder.sh    |  2 +-
 system/activate-configuration.sh  |  6 +++++-
 system/switch-to-configuration.sh |  2 +-
 system/system.nix                 |  1 +
 system/system.sh                  |  1 +
 6 files changed, 20 insertions(+), 8 deletions(-)

diff --git a/boot/boot-stage-2-init.sh b/boot/boot-stage-2-init.sh
index 7b0d48c73bc..5678c6d53d4 100644
--- a/boot/boot-stage-2-init.sh
+++ b/boot/boot-stage-2-init.sh
@@ -62,6 +62,10 @@ for o in $(cat /proc/cmdline); do
         safemode)
             safeMode=1
             ;;
+        systemConfig=*)
+            set -- $(IFS==; echo $o)
+            systemConfig=$2
+            ;;
     esac
 done
 
@@ -93,7 +97,13 @@ mknod -m 0644 /dev/urandom c 1 9 # needed for passwd
 
 # Run the script that performs all configuration activation that does
 # not have to be done at boot time.
-@activateConfiguration@
+@activateConfiguration@ "$systemConfig"
+
+
+# Record the boot configuration.  !!! Should this be a GC root?
+if test -n "$systemConfig"; then
+    ln -sfn "$systemConfig" /var/run/booted-system
+fi
 
 
 # Ensure that the module tools can find the kernel modules.
@@ -104,10 +114,6 @@ export MODULE_DIR=@kernel@/lib/modules/
 @shell@ @bootLocal@
 
 
-# Start an interactive shell.
-#exec @shell@
-
-
 # Start Upstart's init.
 export UPSTART_CFG_DIR=/etc/event.d
 setPath "@upstartPath@"
diff --git a/installer/grub-menu-builder.sh b/installer/grub-menu-builder.sh
index 078d2c09d07..50d8205f8ec 100644
--- a/installer/grub-menu-builder.sh
+++ b/installer/grub-menu-builder.sh
@@ -48,7 +48,7 @@ addEntry() {
     
     cat >> $tmp << GRUBEND
 title $name
-  kernel $kernel init=$(readlink -f $path/init) $(cat $path/kernel-params)
+  kernel $kernel systemConfig=$(readlink -f $path) init=$(readlink -f $path/init) $(cat $path/kernel-params)
   initrd $initrd
 GRUBEND
 }
diff --git a/system/activate-configuration.sh b/system/activate-configuration.sh
index 766d75fa167..553199269f9 100644
--- a/system/activate-configuration.sh
+++ b/system/activate-configuration.sh
@@ -1,5 +1,7 @@
 #! @shell@
 
+systemConfig="$1"
+
 export PATH=/empty
 for i in @path@; do PATH=$PATH:$i/bin:$i/sbin; done
 
@@ -138,7 +140,9 @@ hostname @hostName@
 
 
 # Make this configuration the current configuration.
-ln -sfn @out@ /var/run/current-system
+if test -n "$systemConfig"; then
+    ln -sfn "$systemConfig" /var/run/current-system
+fi
 
 # Prevent the current configuration from being garbage-collected.
 ln -sfn /var/run/current-system /nix/var/nix/gcroots/current-system
diff --git a/system/switch-to-configuration.sh b/system/switch-to-configuration.sh
index f3b61ded26a..a2bdb094d98 100644
--- a/system/switch-to-configuration.sh
+++ b/system/switch-to-configuration.sh
@@ -62,7 +62,7 @@ if test "$action" = "switch" -o "$action" = "test"; then
     # Activate the new configuration (i.e., update /etc, make
     # accounts, and so on).
     echo "Activating the configuration..."
-    @out@/activate
+    @out@/activate @out@
 
     # Make Upstart reload its events.  !!! Should wait until it has
     # finished processing its stop events.
diff --git a/system/system.nix b/system/system.nix
index bec3adb943b..482156a7ca9 100644
--- a/system/system.nix
+++ b/system/system.nix
@@ -294,6 +294,7 @@ rec {
     inherit activateConfiguration;
     inherit grubMenuBuilder;
     inherit etc;
+    inherit systemPath;
     kernel = pkgs.kernel + "/vmlinuz";
     initrd = initialRamdisk + "/initrd";
     # Most of these are needed by grub-install.
diff --git a/system/system.sh b/system/system.sh
index c358e870572..321260777e3 100644
--- a/system/system.sh
+++ b/system/system.sh
@@ -8,6 +8,7 @@ ln -s $bootStage2 $out/init
 ln -s $initrd $out/initrd
 ln -s $activateConfiguration $out/activate
 ln -s $etc/etc $out/etc
+ln -s $systemPath $out/sw
 
 echo "$kernelParams" > $out/kernel-params
 
-- 
GitLab


From be8bcebfe03955e21212f60e688b043852d689d1 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 20 Mar 2007 13:30:14 +0000
Subject: [PATCH 0529/5331] * Use /var/run/current-system/sw/bin/bash as the
 default shell for new   accounts.  Obviously we cannot put the store path of
 bash in   /etc/passwd since it's too fragile (it could be garbage collected),
   hence this indirection.

svn path=/nixos/trunk/; revision=8383
---
 system/activate-configuration.sh |  2 +-
 system/etc.nix                   | 10 +++++++++-
 system/etc/default/useradd       |  3 +++
 system/system.nix                |  7 +++++--
 4 files changed, 18 insertions(+), 4 deletions(-)
 create mode 100644 system/etc/default/useradd

diff --git a/system/activate-configuration.sh b/system/activate-configuration.sh
index 553199269f9..76c2782f623 100644
--- a/system/activate-configuration.sh
+++ b/system/activate-configuration.sh
@@ -70,7 +70,7 @@ if ! test -e /etc/passwd; then
     touch /etc/shadow; chmod 0600 /etc/shadow
     # Can't use useradd, since it complain that it doesn't know us
     # (bootstrap problem!). 
-    echo "root:x:0:0:System administrator:$rootHome:@shell@" >> /etc/passwd
+    echo "root:x:0:0:System administrator:$rootHome:@defaultShell@" >> /etc/passwd
     echo "root::::::::" >> /etc/shadow
     groupadd -g 0 root
     echo | passwd --stdin root
diff --git a/system/etc.nix b/system/etc.nix
index 4f94b904ecd..15314a3c57a 100644
--- a/system/etc.nix
+++ b/system/etc.nix
@@ -1,4 +1,4 @@
-{config, pkgs, upstartJobs, systemPath, wrapperDir}:
+{config, pkgs, upstartJobs, systemPath, wrapperDir, defaultShell}:
 
 let 
 
@@ -64,6 +64,14 @@ import ../helpers/make-etc.nix {
       target = "default/passwd";
     }
 
+    { # Configuration for useradd.
+      source = pkgs.substituteAll {
+        src = ./etc/default/useradd;
+        inherit defaultShell;
+      };
+      target = "default/useradd";
+    }
+
     { # Dhclient hooks for emitting ip-up/ip-down events.
       source = pkgs.substituteAll {
         src = ./etc/dhclient-exit-hooks;
diff --git a/system/etc/default/useradd b/system/etc/default/useradd
new file mode 100644
index 00000000000..df221d58511
--- /dev/null
+++ b/system/etc/default/useradd
@@ -0,0 +1,3 @@
+GROUP=100
+HOME=/home
+SHELL=@defaultShell@
diff --git a/system/system.nix b/system/system.nix
index 482156a7ca9..d04284f57dd 100644
--- a/system/system.nix
+++ b/system/system.nix
@@ -148,7 +148,7 @@ rec {
 
   # The static parts of /etc.
   etc = import ./etc.nix {
-    inherit config pkgs upstartJobs systemPath wrapperDir;
+    inherit config pkgs upstartJobs systemPath wrapperDir defaultShell;
   };
 
 
@@ -222,6 +222,9 @@ rec {
     ignoreCollisions = true;
   };
 
+
+  defaultShell = "/var/run/current-system/sw/bin/bash";
+
     
   # The script that activates the configuration, i.e., it sets up
   # /etc, accounts, etc.  It doesn't do anything that can only be done
@@ -230,7 +233,7 @@ rec {
     src = ./activate-configuration.sh;
     isExecutable = true;
 
-    inherit etc wrapperDir systemPath modprobe;
+    inherit etc wrapperDir systemPath modprobe defaultShell;
     inherit (pkgs) kernel;
     readOnlyRoot = config.get ["boot" "readOnlyRoot"];
     hostName = config.get ["networking" "hostName"];
-- 
GitLab


From 128660d8e2853c4099945e0dbdb54cbbe56bbd0d Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 20 Mar 2007 13:50:47 +0000
Subject: [PATCH 0530/5331] * Root installs in the system-wide profile  
 (/nix/var/nix/profiles/default) by default. * In /etc/profile, put
 /var/run/current-system/sw/[s]bin in $PATH, not   the targets of those
 symlink.  Otherwise users need to log out to   make configuration changes to
 the systemPath take effect.

svn path=/nixos/trunk/; revision=8384
---
 system/etc/profile.sh | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/system/etc/profile.sh b/system/etc/profile.sh
index 16a5efd7f7b..7ec0a535d21 100644
--- a/system/etc/profile.sh
+++ b/system/etc/profile.sh
@@ -1,16 +1,21 @@
-export PATH=@wrapperDir@:@systemPath@/bin:@systemPath@/sbin
+export PATH=@wrapperDir@:/var/run/current-system/sw/bin:/var/run/current-system/sw/sbin
 export MODULE_DIR=@kernel@/lib/modules
 export NIX_CONF_DIR=/nix/etc/nix
 export PAGER=less
 export TZ=@timeZone@
 export FONTCONFIG_FILE=/etc/fonts/fonts.conf
 
+
+# A nice prompt.
 PROMPT_COLOR="1;31m"
 PS1="\n\[\033[$PROMPT_COLOR\][\u@\h:\w]$\[\033[0m\] "
 if test "x$TERM" == "xxterm"; then
     PS1="\033]2;\h:\u:\w\007$PS1"
 fi
 
+
+# Set up secure multi-user builds: non-root users build through the
+# Nix daemon.
 if test "$USER" != root; then
     export NIX_REMOTE=daemon
 else
@@ -26,8 +31,13 @@ if test "$(stat --printf '%u' $NIX_USER_PROFILE_DIR)" != "$(id -u)"; then
 fi
 
 if ! test -L $HOME/.nix-profile; then
-    echo "creating $HOME/.nix-profile" >&2
-    ln -s $NIX_USER_PROFILE_DIR/profile $HOME/.nix-profile
+    echo "creating $HOME/.nix-profile" >&2 
+    if test "$USER" != root; then
+        ln -s $NIX_USER_PROFILE_DIR/profile $HOME/.nix-profile
+    else
+        # Root installs in the system-wide profile by default.
+        ln -s /nix/var/nix/profiles/default $HOME/.nix-profile
+    fi
 fi
 
 NIX_PROFILES="/nix/var/nix/profiles/default $NIX_USER_PROFILE_DIR/profile"
-- 
GitLab


From 5c984a7b991bd62dcfa52607d79761b25292fbd4 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 26 Mar 2007 08:54:11 +0000
Subject: [PATCH 0531/5331] * Don't include ~/.bashrc.

svn path=/nixos/trunk/; revision=8413
---
 system/etc/profile.sh | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/system/etc/profile.sh b/system/etc/profile.sh
index 7ec0a535d21..89af67ea668 100644
--- a/system/etc/profile.sh
+++ b/system/etc/profile.sh
@@ -64,7 +64,3 @@ alias which="type -p"
 if test -f /etc/profile.local; then
     source /etc/profile.local
 fi
-
-
-# Read user modifications.
-test -r $HOME/.bashrc && source $HOME/.bashrc
-- 
GitLab


From 603e598a844c080f2ed61424fa44028032b91b3a Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 28 Mar 2007 21:15:23 +0000
Subject: [PATCH 0532/5331] * Add wireless-tools to the system path.

svn path=/nixos/trunk/; revision=8471
---
 system/system.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/system/system.nix b/system/system.nix
index d04284f57dd..6341db298df 100644
--- a/system/system.nix
+++ b/system/system.nix
@@ -202,6 +202,7 @@ rec {
     pkgs.upstart
     pkgs.utillinux
 #    pkgs.vim
+    pkgs.wirelesstools
     nix
     nixosInstall
     nixosRebuild
-- 
GitLab


From 9cb9621fec0edbae5837d6a3e84146f3545023e2 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 28 Mar 2007 21:16:35 +0000
Subject: [PATCH 0533/5331] * Start KDE properly.  Make sure that some
 essential packages such as   iceauth are in the system path when we're using
 KDE.

svn path=/nixos/trunk/; revision=8472
---
 system/options.nix        |  28 ++++++-----
 system/upstart.nix        |   2 +-
 upstart-jobs/xserver.conf |   2 +
 upstart-jobs/xserver.nix  | 100 ++++++++++++++++++++++++++++----------
 4 files changed, 92 insertions(+), 40 deletions(-)

diff --git a/system/options.nix b/system/options.nix
index 789a00f58a2..cb1b4223901 100644
--- a/system/options.nix
+++ b/system/options.nix
@@ -530,30 +530,34 @@
   }
 
   
-  {
-    name = ["services" "xserver" "windowManager"];
-    default = "metacity";
-    description = "
-      This option selects the window manager.  Available values are
-      <literal>twm</literal> (extremely primitive),
-      <literal>metacity</literal>, and <literal>compiz</literal>.
-    ";
-  }
-
-  
   {
     name = ["services" "xserver" "sessionType"];
     default = "gnome";
     example = "xterm";
     description = "
       The kind of session to start after login.  Current possibilies
-      are <literal>gnome</literal> (which starts
+      are <literal>kde</literal> (which starts KDE),
+      <literal>gnome</literal> (which starts
       <command>gnome-terminal</command>) and <literal>xterm</literal>
       (which starts <command>xterm</command>).
     ";
   }
 
   
+  {
+    name = ["services" "xserver" "windowManager"];
+    default = "";
+    description = "
+      This option selects the window manager.  Available values are
+      <literal>twm</literal> (extremely primitive),
+      <literal>metacity</literal>, and <literal>compiz</literal>.  If
+      left empty, the <option>sessionType</option> determines the
+      window manager, e.g., Metacity for Gnome, and
+      <command>kwm</command> for KDE.
+    ";
+  }
+
+  
   {
     name = ["services" "xserver" "sessionStarter"];
     example = "${pkgs.xterm}/bin/xterm -ls";
diff --git a/system/upstart.nix b/system/upstart.nix
index 09c82fae53f..d835b794762 100644
--- a/system/upstart.nix
+++ b/system/upstart.nix
@@ -134,7 +134,7 @@ import ../upstart-jobs/gather.nix {
     (import ../upstart-jobs/xserver.nix {
       inherit config;
       inherit (pkgs) stdenv writeText lib xterm slim xorg mesa
-        gnome compiz feh;
+        gnome compiz feh kdebase kdelibs;
       fontDirectories = import ./fonts.nix {inherit pkgs;};
     })
 
diff --git a/upstart-jobs/xserver.conf b/upstart-jobs/xserver.conf
index 0a655dd5e86..ed624cf1720 100644
--- a/upstart-jobs/xserver.conf
+++ b/upstart-jobs/xserver.conf
@@ -64,6 +64,8 @@ EndSection
 Section "Device"
   Identifier   "Device[0]"
   Driver       "@videoDriver@"
+  Option       "Clone" "On"
+  Option       "MonitorLayout" "CRT,LFP"
 EndSection
 
 
diff --git a/upstart-jobs/xserver.nix b/upstart-jobs/xserver.nix
index 1ca2ea1fb85..a69db80a44c 100644
--- a/upstart-jobs/xserver.nix
+++ b/upstart-jobs/xserver.nix
@@ -1,5 +1,6 @@
 { stdenv, writeText, lib, xorg, mesa, xterm, slim, gnome
 , compiz, feh
+, kdelibs, kdebase
 
 , config
 
@@ -24,7 +25,6 @@ let
   # Get a bunch of user settings.
   videoDriver = getCfg "videoDriver";
   resolutions = map (res: "\"${toString res.x}x${toString res.y}\"") (getCfg "resolutions");
-  windowManager = getCfg "windowManager";
   sessionType = getCfg "sessionType";
   sessionStarter = getCfg "sessionStarter";
 
@@ -36,6 +36,14 @@ let
     abort ("unknown session type "+ sessionType);
 
 
+  windowManager =
+    let wm = getCfg "windowManager"; in
+    if wm != "" then wm else
+    if sessionType == "gnome" then "metacity" else
+    if sessionType == "kde" then "none" /* started by startkde */ else
+    "twm";
+
+    
   modules = [
     xorg.xorgserver
     xorg.xf86inputkeyboard
@@ -75,52 +83,84 @@ let
 
   clientScript = writeText "xclient" "
 
+    source /etc/profile
+
     exec > $HOME/.Xerrors 2>&1
   
 
     ### Start a window manager.
   
     ${if windowManager == "twm" then "
-    ${xorg.twm}/bin/twm &
+      ${xorg.twm}/bin/twm &
     "
 
     else if windowManager == "metacity" then "
-    # !!! Hack: load the schemas for Metacity.
-    GCONF_CONFIG_SOURCE=xml::~/.gconf ${gnome.GConf}/bin/gconftool-2 \\
-      --makefile-install-rule ${gnome.metacity}/etc/gconf/schemas/*.schemas
-    ${gnome.metacity}/bin/metacity &
+      # !!! Hack: load the schemas for Metacity.
+      GCONF_CONFIG_SOURCE=xml::~/.gconf ${gnome.GConf}/bin/gconftool-2 \\
+        --makefile-install-rule ${gnome.metacity}/etc/gconf/schemas/*.schemas
+      ${gnome.metacity}/bin/metacity &
+    "
+
+    else if windowManager == "kwm" then "
+      ${kdebase}/bin/kwin &
     "
 
     else if windowManager == "compiz" then "
     
-    # !!! Hack: load the schemas for Compiz.
-    GCONF_CONFIG_SOURCE=xml::~/.gconf ${gnome.GConf}/bin/gconftool-2 \\
-      --makefile-install-rule ${compiz}/etc/gconf/schemas/*.schemas
-
-    # !!! Hack: turn on most Compiz modules.
-    ${gnome.GConf}/bin/gconftool-2 -t list --list-type=string \\
-      --set /apps/compiz/general/allscreens/options/active_plugins \\
-      [gconf,png,decoration,wobbly,fade,minimize,move,resize,cube,switcher,rotate,place,scale,water]
-
-    # Start Compiz and the GTK-style window decorator.
-    ${compiz}/bin/compiz gconf &
-    ${compiz}/bin/gtk-window-decorator &
+      # !!! Hack: load the schemas for Compiz.
+      GCONF_CONFIG_SOURCE=xml::~/.gconf ${gnome.GConf}/bin/gconftool-2 \\
+        --makefile-install-rule ${compiz}/etc/gconf/schemas/*.schemas
+
+      # !!! Hack: turn on most Compiz modules.
+      ${gnome.GConf}/bin/gconftool-2 -t list --list-type=string \\
+        --set /apps/compiz/general/allscreens/options/active_plugins \\
+        [gconf,png,decoration,wobbly,fade,minimize,move,resize,cube,switcher,rotate,place,scale,water]
+
+      # Start Compiz and the GTK-style window decorator.
+      ${compiz}/bin/compiz gconf &
+      ${compiz}/bin/gtk-window-decorator &
+    "
+
+    else if windowManager == "none" then "
+
+      # The session starter will start the window manager.
+
     "
 
-    else abort ("unknown window manager "+ windowManager)}
+    else abort ("unknown window manager " + windowManager)}
 
 
     ### Show a background image.
-    if test -e $HOME/.background-image; then
-      ${feh}/bin/feh --bg-scale $HOME/.background-image
-    fi
+    # (but not if we're starting a full desktop environment that does it for us)
+    ${if sessionType != "kde" then "
     
+      if test -e $HOME/.background-image; then
+        ${feh}/bin/feh --bg-scale $HOME/.background-image
+      fi
+      
+    " else ""}
+    
+
+    ### Start the session.
+    ${if sessionType == "kde" then "
+
+      # Start KDE.
+      export KDEDIRS=${kdebase}:${kdelibs}
+      export XDG_CONFIG_DIRS=${kdebase}/etc/xdg:${kdelibs}/etc/xdg
+      export XDG_DATA_DIRS=${kdebase}/share
+      exec ${kdebase}/bin/startkde
+
+    " else "
 
-    ### Start a 'session' (right now, this is just a terminal).
-    # !!! yes, this means that you 'log out' by killing the X server.
-    while ${sessionCmd}; do
-      sleep 1  
-    done
+      # For all other session types, we currently just start a
+      # terminal of the kind indicated by sessionCmd.
+      # !!! yes, this means that you 'log out' by killing the X server.
+      while ${sessionCmd}; do
+        sleep 1  
+      done
+
+    "}
+    
   "; # */ <- hack to fix syntax highlighting
 
 
@@ -170,6 +210,12 @@ rec {
     gnome.gnometerminal
     gnome.GConf
     gnome.gconfeditor
+  ]
+  ++ optional (sessionType == "kde") [
+    kdelibs
+    kdebase
+    xorg.iceauth # absolutely required by dcopserver
+    xorg.xset # used by startkde, non-essential
   ];
 
     
-- 
GitLab


From 1bd112d4a72b0953c1e925fbc4cae09f320cff3e Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 29 Mar 2007 17:46:36 +0000
Subject: [PATCH 0534/5331] * Set the TZDIR variable so that the KDE clock can
 find the timezone   definitions (NIXOS-56).

svn path=/nixos/trunk/; revision=8488
---
 system/etc.nix        | 2 +-
 system/etc/profile.sh | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/system/etc.nix b/system/etc.nix
index 15314a3c57a..6d0bf80a240 100644
--- a/system/etc.nix
+++ b/system/etc.nix
@@ -84,7 +84,7 @@ import ../helpers/make-etc.nix {
       source = pkgs.substituteAll {
         src = ./etc/profile.sh;
         inherit systemPath wrapperDir;
-        inherit (pkgs) kernel;
+        inherit (pkgs) kernel glibc;
         timeZone = config.get ["time" "timeZone"];
       };
       target = "profile";
diff --git a/system/etc/profile.sh b/system/etc/profile.sh
index 89af67ea668..9235876c6bb 100644
--- a/system/etc/profile.sh
+++ b/system/etc/profile.sh
@@ -3,6 +3,7 @@ export MODULE_DIR=@kernel@/lib/modules
 export NIX_CONF_DIR=/nix/etc/nix
 export PAGER=less
 export TZ=@timeZone@
+export TZDIR=@glibc@/share/zoneinfo
 export FONTCONFIG_FILE=/etc/fonts/fonts.conf
 
 
-- 
GitLab


From 100efeeafe85741a5d4531da12fcb63e4e0ca5d0 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 30 Mar 2007 12:33:42 +0000
Subject: [PATCH 0535/5331] * Specify the location of XKeyboard related stuff.

svn path=/nixos/trunk/; revision=8501
---
 system/upstart.nix       |  2 +-
 upstart-jobs/xserver.nix | 11 +++++++++++
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/system/upstart.nix b/system/upstart.nix
index d835b794762..798df5b065b 100644
--- a/system/upstart.nix
+++ b/system/upstart.nix
@@ -134,7 +134,7 @@ import ../upstart-jobs/gather.nix {
     (import ../upstart-jobs/xserver.nix {
       inherit config;
       inherit (pkgs) stdenv writeText lib xterm slim xorg mesa
-        gnome compiz feh kdebase kdelibs;
+        gnome compiz feh kdebase kdelibs xkeyboard_config;
       fontDirectories = import ./fonts.nix {inherit pkgs;};
     })
 
diff --git a/upstart-jobs/xserver.nix b/upstart-jobs/xserver.nix
index a69db80a44c..f016035f463 100644
--- a/upstart-jobs/xserver.nix
+++ b/upstart-jobs/xserver.nix
@@ -1,6 +1,7 @@
 { stdenv, writeText, lib, xorg, mesa, xterm, slim, gnome
 , compiz, feh
 , kdelibs, kdebase
+, xkeyboard_config
 
 , config
 
@@ -86,6 +87,12 @@ let
     source /etc/profile
 
     exec > $HOME/.Xerrors 2>&1
+
+
+    # Load X defaults.
+    if test -e ~/.Xdefaults; then
+      ${xorg.xrdb}/bin/xrdb -merge ~/.Xdefaults
+    fi
   
 
     ### Start a window manager.
@@ -171,6 +178,7 @@ let
     "-logfile" "/var/log/X.${toString display}.log"
     "-config ${configFile}"
     ":${toString display}" "vt${toString tty}"
+    "-xkbdir" "${xkeyboard_config}/etc/X11/xkb"
   ];
 
   
@@ -192,6 +200,8 @@ rec {
   
   extraPath = [
     xorg.xrandr
+    xorg.xrdb
+    xorg.setxkbmap
     feh
   ]
   ++ optional (windowManager == "twm") [
@@ -232,6 +242,7 @@ rec {
 
     env SLIM_CFGFILE=${slimConfig}
     env FONTCONFIG_FILE=/etc/fonts/fonts.conf # !!! cleanup
+    env XKB_BINDIR=${xorg.xkbcomp}/bin # Needed for the Xkb extension.
 
     ${if getCfg "driSupport"
       then "env XORG_DRI_DRIVER_PATH=${mesa}/lib/modules/dri"
-- 
GitLab


From 5cf236ba040f0aa12287aeee2f29849cb14af1cf Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 30 Mar 2007 12:54:42 +0000
Subject: [PATCH 0536/5331] * Thsi shouldn't be here.

svn path=/nixos/trunk/; revision=8504
---
 upstart-jobs/xserver.conf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/upstart-jobs/xserver.conf b/upstart-jobs/xserver.conf
index ed624cf1720..81289cfefd7 100644
--- a/upstart-jobs/xserver.conf
+++ b/upstart-jobs/xserver.conf
@@ -45,7 +45,7 @@ Section "Screen"
   Identifier   "Screen[0]"
   Device       "Device[0]"
   Monitor      "Monitor[0]"
-  DefaultDepth 16
+  DefaultDepth 24
   SubSection "Display"
     Depth      16
     Modes      @resolutions@
-- 
GitLab


From bf92844f1650b98da7298642fca346020685e580 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 30 Mar 2007 12:55:09 +0000
Subject: [PATCH 0537/5331] * Allow Upstart jobs to declare additional /etc
 files.

svn path=/nixos/trunk/; revision=8505
---
 system/etc.nix            | 8 ++++++--
 system/system.nix         | 1 +
 system/upstart.nix        | 2 +-
 upstart-jobs/make-job.nix | 5 +++--
 upstart-jobs/xserver.nix  | 7 +++++++
 5 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/system/etc.nix b/system/etc.nix
index 6d0bf80a240..756450ebe23 100644
--- a/system/etc.nix
+++ b/system/etc.nix
@@ -1,4 +1,4 @@
-{config, pkgs, upstartJobs, systemPath, wrapperDir, defaultShell}:
+{config, pkgs, upstartJobs, systemPath, wrapperDir, defaultShell, extraEtc}:
 
 let 
 
@@ -144,5 +144,9 @@ import ../helpers/make-etc.nix {
       "chsh"
       "common"
     ]
-  );
+  )
+
+  # Additional /etc files declared by Upstart jobs.
+  ++ extraEtc;
+  
 }
diff --git a/system/system.nix b/system/system.nix
index 6341db298df..83d92958b16 100644
--- a/system/system.nix
+++ b/system/system.nix
@@ -149,6 +149,7 @@ rec {
   # The static parts of /etc.
   etc = import ./etc.nix {
     inherit config pkgs upstartJobs systemPath wrapperDir defaultShell;
+    extraEtc = pkgs.lib.concatLists (map (job: job.extraEtc) upstartJobs.jobs);
   };
 
 
diff --git a/system/upstart.nix b/system/upstart.nix
index 798df5b065b..6e4b9797d70 100644
--- a/system/upstart.nix
+++ b/system/upstart.nix
@@ -210,7 +210,7 @@ import ../upstart-jobs/gather.nix {
 
   # For the built-in logd job.
   ++ [
-    (pkgs.upstart // {extraPath = [];})
+    (pkgs.upstart // {extraPath = []; extraEtc = [];})
   ];
   
 }
diff --git a/upstart-jobs/make-job.nix b/upstart-jobs/make-job.nix
index 457336c8f20..d263a6d44f7 100644
--- a/upstart-jobs/make-job.nix
+++ b/upstart-jobs/make-job.nix
@@ -8,7 +8,8 @@
 //
 
 # Allow jobs to declare extra packages that should be added to the
-# system path.
+# system path, as well as extra files that should be added to /etc.
 {
   extraPath = if job ? extraPath then job.extraPath else [];
-}
\ No newline at end of file
+  extraEtc = if job ? extraEtc then job.extraEtc else [];
+}
diff --git a/upstart-jobs/xserver.nix b/upstart-jobs/xserver.nix
index f016035f463..69f1d834c4e 100644
--- a/upstart-jobs/xserver.nix
+++ b/upstart-jobs/xserver.nix
@@ -228,6 +228,13 @@ rec {
     xorg.xset # used by startkde, non-essential
   ];
 
+
+  extraEtc =
+    optional (sessionType == "kde")
+      { source = "${xkeyboard_config}/etc/X11/xkb";
+        target = "X11/xkb";
+      };
+
     
   job = "
     #start on network-interfaces
-- 
GitLab


From f10a95e88e8e01c5326435909f6cef799adccb24 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 30 Mar 2007 12:59:43 +0000
Subject: [PATCH 0538/5331] * Refactoring: move stuff around.

svn path=/nixos/trunk/; revision=8506
---
 system/etc.nix => etc/default.nix             | 24 +++++++++----------
 {system/etc => etc}/default/passwd            |  0
 {system/etc => etc}/default/useradd           |  0
 {system/etc => etc}/dhclient-exit-hooks       |  0
 {system/etc => etc}/fonts/make-fonts-conf.xsl |  0
 {system/etc => etc}/hosts                     |  0
 {system/etc => etc}/issue                     |  0
 {system/etc => etc}/ldap.conf.nix             |  0
 {system/etc => etc}/login.defs                |  0
 {system/etc => etc}/nsswitch.conf             |  0
 {system/etc => etc}/pam.d/chsh                |  0
 {system/etc => etc}/pam.d/common              |  0
 {system/etc => etc}/pam.d/login               |  0
 {system/etc => etc}/pam.d/other               |  0
 {system/etc => etc}/pam.d/passwd              |  0
 {system/etc => etc}/pam.d/shadow              |  0
 {system/etc => etc}/pam.d/sshd                |  0
 {system/etc => etc}/pam.d/su                  |  0
 {system/etc => etc}/pam.d/useradd             |  0
 {system/etc => etc}/profile.sh                |  0
 {system/etc => etc}/syslog.conf               |  0
 system/system.nix                             |  4 ++--
 .../upstart.nix => upstart-jobs/default.nix   |  2 +-
 23 files changed, 15 insertions(+), 15 deletions(-)
 rename system/etc.nix => etc/default.nix (86%)
 rename {system/etc => etc}/default/passwd (100%)
 rename {system/etc => etc}/default/useradd (100%)
 rename {system/etc => etc}/dhclient-exit-hooks (100%)
 rename {system/etc => etc}/fonts/make-fonts-conf.xsl (100%)
 rename {system/etc => etc}/hosts (100%)
 rename {system/etc => etc}/issue (100%)
 rename {system/etc => etc}/ldap.conf.nix (100%)
 rename {system/etc => etc}/login.defs (100%)
 rename {system/etc => etc}/nsswitch.conf (100%)
 rename {system/etc => etc}/pam.d/chsh (100%)
 rename {system/etc => etc}/pam.d/common (100%)
 rename {system/etc => etc}/pam.d/login (100%)
 rename {system/etc => etc}/pam.d/other (100%)
 rename {system/etc => etc}/pam.d/passwd (100%)
 rename {system/etc => etc}/pam.d/shadow (100%)
 rename {system/etc => etc}/pam.d/sshd (100%)
 rename {system/etc => etc}/pam.d/su (100%)
 rename {system/etc => etc}/pam.d/useradd (100%)
 rename {system/etc => etc}/profile.sh (100%)
 rename {system/etc => etc}/syslog.conf (100%)
 rename system/upstart.nix => upstart-jobs/default.nix (98%)

diff --git a/system/etc.nix b/etc/default.nix
similarity index 86%
rename from system/etc.nix
rename to etc/default.nix
index 756450ebe23..d95a3fc3d12 100644
--- a/system/etc.nix
+++ b/etc/default.nix
@@ -28,28 +28,28 @@ import ../helpers/make-etc.nix {
     }
 
     { # Hostname-to-IP mappings.
-      source = ./etc/hosts;
+      source = ./hosts;
       target = "hosts";
     }
 
     { # Name Service Switch configuration file.  Required by the C library.
-      source = ./etc/nsswitch.conf;
+      source = ./nsswitch.conf;
       target = "nsswitch.conf";
     }
 
     { # Configuration file for the system logging daemon.
-      source = ./etc/syslog.conf;
+      source = ./syslog.conf;
       target = "syslog.conf";
     }
 
     { # Friendly greeting on the virtual consoles.
-      source = ./etc/issue;
+      source = ./issue;
       target = "issue";
     }
 
     { # Configuration for pwdutils (login, passwd, useradd, etc.).
       # You cannot login without it!
-      source = ./etc/login.defs;
+      source = ./login.defs;
       target = "login.defs";
     }
 
@@ -60,13 +60,13 @@ import ../helpers/make-etc.nix {
 
     { # Configuration for passwd and friends (e.g., hash algorithm
       # for /etc/passwd).
-      source = ./etc/default/passwd;
+      source = ./default/passwd;
       target = "default/passwd";
     }
 
     { # Configuration for useradd.
       source = pkgs.substituteAll {
-        src = ./etc/default/useradd;
+        src = ./default/useradd;
         inherit defaultShell;
       };
       target = "default/useradd";
@@ -74,7 +74,7 @@ import ../helpers/make-etc.nix {
 
     { # Dhclient hooks for emitting ip-up/ip-down events.
       source = pkgs.substituteAll {
-        src = ./etc/dhclient-exit-hooks;
+        src = ./dhclient-exit-hooks;
         inherit (pkgs) upstart glibc;
       };
       target = "dhclient-exit-hooks";
@@ -82,7 +82,7 @@ import ../helpers/make-etc.nix {
 
     { # Script executed when the shell starts.
       source = pkgs.substituteAll {
-        src = ./etc/profile.sh;
+        src = ./profile.sh;
         inherit systemPath wrapperDir;
         inherit (pkgs) kernel glibc;
         timeZone = config.get ["time" "timeZone"];
@@ -97,12 +97,12 @@ import ../helpers/make-etc.nix {
   ++ (optional ["fonts" "enableFontConfig"] { 
     source = pkgs.runCommand "fonts.conf"
       { 
-        fontDirectories = import ./fonts.nix {inherit pkgs;};
+        fontDirectories = import ../system/fonts.nix {inherit pkgs;};
         buildInputs = [pkgs.libxslt];
         inherit (pkgs) fontconfig;
       }
       "xsltproc --stringparam fontDirectories \"$fontDirectories\" \\
-          ${./etc/fonts/make-fonts-conf.xsl} $fontconfig/etc/fonts/fonts.conf \\
+          ${./fonts/make-fonts-conf.xsl} $fontconfig/etc/fonts/fonts.conf \\
           > $out
       ";
     target = "fonts/fonts.conf";
@@ -121,7 +121,7 @@ import ../helpers/make-etc.nix {
   ++ (map
     (program:
       { source = pkgs.substituteAll {
-          src = ./etc/pam.d + ("/" + program);
+          src = ./pam.d + ("/" + program);
           inherit (pkgs) pam_unix2;
           pam_ldap =
             if config.get ["users" "ldap" "enable"]
diff --git a/system/etc/default/passwd b/etc/default/passwd
similarity index 100%
rename from system/etc/default/passwd
rename to etc/default/passwd
diff --git a/system/etc/default/useradd b/etc/default/useradd
similarity index 100%
rename from system/etc/default/useradd
rename to etc/default/useradd
diff --git a/system/etc/dhclient-exit-hooks b/etc/dhclient-exit-hooks
similarity index 100%
rename from system/etc/dhclient-exit-hooks
rename to etc/dhclient-exit-hooks
diff --git a/system/etc/fonts/make-fonts-conf.xsl b/etc/fonts/make-fonts-conf.xsl
similarity index 100%
rename from system/etc/fonts/make-fonts-conf.xsl
rename to etc/fonts/make-fonts-conf.xsl
diff --git a/system/etc/hosts b/etc/hosts
similarity index 100%
rename from system/etc/hosts
rename to etc/hosts
diff --git a/system/etc/issue b/etc/issue
similarity index 100%
rename from system/etc/issue
rename to etc/issue
diff --git a/system/etc/ldap.conf.nix b/etc/ldap.conf.nix
similarity index 100%
rename from system/etc/ldap.conf.nix
rename to etc/ldap.conf.nix
diff --git a/system/etc/login.defs b/etc/login.defs
similarity index 100%
rename from system/etc/login.defs
rename to etc/login.defs
diff --git a/system/etc/nsswitch.conf b/etc/nsswitch.conf
similarity index 100%
rename from system/etc/nsswitch.conf
rename to etc/nsswitch.conf
diff --git a/system/etc/pam.d/chsh b/etc/pam.d/chsh
similarity index 100%
rename from system/etc/pam.d/chsh
rename to etc/pam.d/chsh
diff --git a/system/etc/pam.d/common b/etc/pam.d/common
similarity index 100%
rename from system/etc/pam.d/common
rename to etc/pam.d/common
diff --git a/system/etc/pam.d/login b/etc/pam.d/login
similarity index 100%
rename from system/etc/pam.d/login
rename to etc/pam.d/login
diff --git a/system/etc/pam.d/other b/etc/pam.d/other
similarity index 100%
rename from system/etc/pam.d/other
rename to etc/pam.d/other
diff --git a/system/etc/pam.d/passwd b/etc/pam.d/passwd
similarity index 100%
rename from system/etc/pam.d/passwd
rename to etc/pam.d/passwd
diff --git a/system/etc/pam.d/shadow b/etc/pam.d/shadow
similarity index 100%
rename from system/etc/pam.d/shadow
rename to etc/pam.d/shadow
diff --git a/system/etc/pam.d/sshd b/etc/pam.d/sshd
similarity index 100%
rename from system/etc/pam.d/sshd
rename to etc/pam.d/sshd
diff --git a/system/etc/pam.d/su b/etc/pam.d/su
similarity index 100%
rename from system/etc/pam.d/su
rename to etc/pam.d/su
diff --git a/system/etc/pam.d/useradd b/etc/pam.d/useradd
similarity index 100%
rename from system/etc/pam.d/useradd
rename to etc/pam.d/useradd
diff --git a/system/etc/profile.sh b/etc/profile.sh
similarity index 100%
rename from system/etc/profile.sh
rename to etc/profile.sh
diff --git a/system/etc/syslog.conf b/etc/syslog.conf
similarity index 100%
rename from system/etc/syslog.conf
rename to etc/syslog.conf
diff --git a/system/system.nix b/system/system.nix
index 83d92958b16..d2eba92af6e 100644
--- a/system/system.nix
+++ b/system/system.nix
@@ -141,13 +141,13 @@ rec {
 
 
   # The services (Upstart) configuration for the system.
-  upstartJobs = import ./upstart.nix {
+  upstartJobs = import ../upstart-jobs/default.nix {
     inherit config pkgs nix modprobe nssModulesPath;
   };
 
 
   # The static parts of /etc.
-  etc = import ./etc.nix {
+  etc = import ../etc/default.nix {
     inherit config pkgs upstartJobs systemPath wrapperDir defaultShell;
     extraEtc = pkgs.lib.concatLists (map (job: job.extraEtc) upstartJobs.jobs);
   };
diff --git a/system/upstart.nix b/upstart-jobs/default.nix
similarity index 98%
rename from system/upstart.nix
rename to upstart-jobs/default.nix
index 6e4b9797d70..f844c1d6d7b 100644
--- a/system/upstart.nix
+++ b/upstart-jobs/default.nix
@@ -135,7 +135,7 @@ import ../upstart-jobs/gather.nix {
       inherit config;
       inherit (pkgs) stdenv writeText lib xterm slim xorg mesa
         gnome compiz feh kdebase kdelibs xkeyboard_config;
-      fontDirectories = import ./fonts.nix {inherit pkgs;};
+      fontDirectories = import ../system/fonts.nix {inherit pkgs;};
     })
 
   # Apache httpd.
-- 
GitLab


From 3f65f9ee55104e39e10ea6dda3836dc5441c440c Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 30 Mar 2007 13:08:01 +0000
Subject: [PATCH 0539/5331] * tty-backgrounds: declare /etc/splash properly.

svn path=/nixos/trunk/; revision=8507
---
 upstart-jobs/tty-backgrounds.nix | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/upstart-jobs/tty-backgrounds.nix b/upstart-jobs/tty-backgrounds.nix
index 3956d9fb8b4..6debe9e8f44 100644
--- a/upstart-jobs/tty-backgrounds.nix
+++ b/upstart-jobs/tty-backgrounds.nix
@@ -15,14 +15,17 @@ rec {
     themes = map (x: if x ? theme then (unpackTheme x.theme) else "default") backgrounds;
   };
 
+  extraEtc = [
+    { source = themesUnpacked;
+      target = "splash";
+    }
+  ];
+
   job = "
 start on hardware-scan
 
 start script
 
-    rm -f /etc/splash
-    ln -s ${themesUnpacked} /etc/splash
-
     # Critical: tell the kernel where to find splash_helper.  It calls
     # this program every time we switch between consoles.
     echo ${splashutils}/bin/splash_helper > /proc/sys/kernel/fbsplash
-- 
GitLab


From 3e71bd97316631d4f4a694906818a951d87823cc Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 2 Apr 2007 15:00:31 +0000
Subject: [PATCH 0540/5331] * Quick hack to prevent the udev job from messing
 up the device   ownership of logged-in users.

svn path=/nixos/trunk/; revision=8530
---
 upstart-jobs/udev.nix | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/upstart-jobs/udev.nix b/upstart-jobs/udev.nix
index 7f84ed8e539..0bdb9b9cb74 100644
--- a/upstart-jobs/udev.nix
+++ b/upstart-jobs/udev.nix
@@ -26,6 +26,15 @@ let
     udev_rules=\"${udevRules}\"
   ";
 
+  # Dummy file indicating whether we've run udevtrigger/udevsettle.
+  # Since that *recreates* all device nodes with default permissions,
+  # it's not nice to do that when a user is logged in (it messes up
+  # the permissions set by pam_devperm).
+  # !!! Actually, this makes the udev configuration less declarative;
+  # changes may not take effect until the user reboots.  We should
+  # find a better way to preserve the permissions of logged-in users.
+  devicesCreated = "/var/run/devices-created";
+
 in
 
 {
@@ -49,8 +58,11 @@ start script
     # Let udev create device nodes for all modules that have already
     # been loaded into the kernel (or for which support is built into
     # the kernel).
-    ${udev}/sbin/udevtrigger
-    ${udev}/sbin/udevsettle # wait for udev to finish
+    if ! test -e ${devicesCreated}; then
+        ${udev}/sbin/udevtrigger
+        ${udev}/sbin/udevsettle # wait for udev to finish
+        touch ${devicesCreated}
+    fi
 
     # Kill udev, let Upstart restart and monitor it.  (This is nasty,
     # but we have to run udevtrigger first.  Maybe we can use
-- 
GitLab


From e312a8ef64cce20bf68c6bbd661187fada5fc580 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 2 Apr 2007 15:01:09 +0000
Subject: [PATCH 0541/5331] * Start the SSH agent on X11 login.

svn path=/nixos/trunk/; revision=8531
---
 system/options.nix       | 12 ++++++++++++
 upstart-jobs/default.nix |  3 ++-
 upstart-jobs/xserver.nix | 10 +++++++++-
 3 files changed, 23 insertions(+), 2 deletions(-)

diff --git a/system/options.nix b/system/options.nix
index cb1b4223901..2dfbca44e7e 100644
--- a/system/options.nix
+++ b/system/options.nix
@@ -569,6 +569,18 @@
   }
 
   
+  {
+    name = ["services" "xserver" "startSSHAgent"];
+    default = true;
+    description = "
+      Whether to start the SSH agent when you log in.  The SSH agent
+      remembers private keys for you so that you don't have to type in
+      passphrases every time you make an SSH connection.  Use
+      <command>ssh-add</command> to add a key to the agent.
+    ";
+  }
+
+  
   {
     name = ["services" "httpd" "enable"];
     default = false;
diff --git a/upstart-jobs/default.nix b/upstart-jobs/default.nix
index f844c1d6d7b..c677cc3edd8 100644
--- a/upstart-jobs/default.nix
+++ b/upstart-jobs/default.nix
@@ -134,7 +134,8 @@ import ../upstart-jobs/gather.nix {
     (import ../upstart-jobs/xserver.nix {
       inherit config;
       inherit (pkgs) stdenv writeText lib xterm slim xorg mesa
-        gnome compiz feh kdebase kdelibs xkeyboard_config;
+        gnome compiz feh kdebase kdelibs xkeyboard_config
+        openssh x11_ssh_askpass;
       fontDirectories = import ../system/fonts.nix {inherit pkgs;};
     })
 
diff --git a/upstart-jobs/xserver.nix b/upstart-jobs/xserver.nix
index 69f1d834c4e..a6c6f152b45 100644
--- a/upstart-jobs/xserver.nix
+++ b/upstart-jobs/xserver.nix
@@ -2,6 +2,7 @@
 , compiz, feh
 , kdelibs, kdebase
 , xkeyboard_config
+, openssh, x11_ssh_askpass
 
 , config
 
@@ -89,10 +90,17 @@ let
     exec > $HOME/.Xerrors 2>&1
 
 
-    # Load X defaults.
+    ### Load X defaults.
     if test -e ~/.Xdefaults; then
       ${xorg.xrdb}/bin/xrdb -merge ~/.Xdefaults
     fi
+
+
+    ${if getCfg "startSSHAgent" then "
+      ### Start the SSH agent.
+      export SSH_ASKPASS=${x11_ssh_askpass}/libexec/x11-ssh-askpass
+      eval $(${openssh}/bin/ssh-agent)
+    " else ""}
   
 
     ### Start a window manager.
-- 
GitLab


From a9635d3b738fda7740c817fb53a6ed3e2d2c8664 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 2 Apr 2007 17:31:58 +0000
Subject: [PATCH 0542/5331] * Upstart job for the CUPS daemon.

svn path=/nixos/trunk/; revision=8534
---
 system/options.nix       |  9 ++++
 upstart-jobs/cupsd.nix   | 94 ++++++++++++++++++++++++++++++++++++++++
 upstart-jobs/default.nix |  6 +++
 3 files changed, 109 insertions(+)
 create mode 100644 upstart-jobs/cupsd.nix

diff --git a/system/options.nix b/system/options.nix
index 2dfbca44e7e..76aebb102d0 100644
--- a/system/options.nix
+++ b/system/options.nix
@@ -752,6 +752,15 @@
   }
 
   
+  {
+    name = ["services" "printing" "enable"];
+    default = false;
+    description = "
+      Whether to enable printing support through the CUPS daemon.
+    ";
+  }
+
+  
   {
     name = ["installer" "nixpkgsURL"];
     default = "";
diff --git a/upstart-jobs/cupsd.nix b/upstart-jobs/cupsd.nix
new file mode 100644
index 00000000000..1b561bec5e2
--- /dev/null
+++ b/upstart-jobs/cupsd.nix
@@ -0,0 +1,94 @@
+{ writeText, cups
+}:
+
+let
+
+  logDir = "/var/log/cups";
+
+  cupsdConfig = writeText "cupsd.conf" "
+    LogLevel info
+
+    SystemGroup root
+
+    Listen localhost:631
+    Listen /var/run/cups/cups.sock
+
+    ServerRoot ${cups}/etc/cups
+
+    AccessLog ${logDir}/access_log
+    ErrorLog ${logDir}/access_log
+    PageLog ${logDir}/page_log
+
+    TempDir /tmp
+
+    Browsing On
+    BrowseOrder allow,deny
+    BrowseAllow @LOCAL
+
+    DefaultAuthType Basic
+
+    <Location />
+      Order allow,deny
+      Allow localhost
+    </Location>
+    
+    <Location /admin>
+      Order allow,deny
+      Allow localhost
+    </Location>
+    
+    <Location /admin/conf>
+      AuthType Basic
+      Require user @SYSTEM
+      Order allow,deny
+      Allow localhost
+    </Location>
+
+    <Policy default>
+      <Limit Send-Document Send-URI Hold-Job Release-Job Restart-Job Purge-Jobs Set-Job-Attributes Create-Job-Subscription Renew-Subscription Cancel-Subscription Get-Notifications Reprocess-Job Cancel-Current-Job Suspend-Current-Job Resume-Job CUPS-Move-Job>
+        Require user @OWNER @SYSTEM
+        Order deny,allow
+      </Limit>
+
+      <Limit Pause-Printer Resume-Printer Set-Printer-Attributes Enable-Printer Disable-Printer Pause-Printer-After-Current-Job Hold-New-Jobs Release-Held-New-Jobs Deactivate-Printer Activate-Printer Restart-Printer Shutdown-Printer Startup-Printer Promote-Job Schedule-Job-After CUPS-Add-Printer CUPS-Delete-Printer CUPS-Add-Class CUPS-Delete-Class CUPS-Accept-Jobs CUPS-Reject-Jobs CUPS-Set-Default>
+        AuthType Basic
+        Require user @SYSTEM
+        Order deny,allow
+      </Limit>
+
+      <Limit Cancel-Job CUPS-Authenticate-Job>
+        Require user @OWNER @SYSTEM
+        Order deny,allow
+      </Limit>
+
+      <Limit All>
+        Order deny,allow
+      </Limit>
+    </Policy>
+  ";
+
+in
+
+{
+  name = "cupsd";
+
+  extraPath = [
+    cups
+  ];
+  
+  job = "
+description \"CUPS daemon\"
+
+start on network-interfaces/started
+stop on network-interfaces/stop
+
+start script
+    mkdir -m 0755 -p ${logDir}
+    mkdir -m 0700 -p /var/cache/cups
+    mkdir -m 0700 -p /var/spool/cups
+end script
+    
+respawn ${cups}/sbin/cupsd -c ${cupsdConfig} -F
+  ";
+  
+}
diff --git a/upstart-jobs/default.nix b/upstart-jobs/default.nix
index c677cc3edd8..4056e27e9ec 100644
--- a/upstart-jobs/default.nix
+++ b/upstart-jobs/default.nix
@@ -146,6 +146,12 @@ import ../upstart-jobs/gather.nix {
       inherit (pkgs) glibc pwdutils;
     })
 
+  # CUPS (printing) daemon.
+  ++ optional ["services" "printing" "enable"]
+    (import ../upstart-jobs/cupsd.nix {
+      inherit (pkgs) writeText cups;
+    })
+
   # ALSA sound support.
   ++ optional ["sound" "enable"]
     (import ../upstart-jobs/alsa.nix {
-- 
GitLab


From 464d252d5532be119337b0005c0fb6d25f9c6244 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 4 Apr 2007 13:47:54 +0000
Subject: [PATCH 0543/5331] * Set the LANG environment variable (default is
 en_US.UTF-8,   can be overriden through the system configuration).

svn path=/nixos/trunk/; revision=8541
---
 etc/default.nix    |  1 +
 etc/profile.sh     |  1 +
 system/options.nix | 12 ++++++++++++
 3 files changed, 14 insertions(+)

diff --git a/etc/default.nix b/etc/default.nix
index d95a3fc3d12..20caa8c3c50 100644
--- a/etc/default.nix
+++ b/etc/default.nix
@@ -86,6 +86,7 @@ import ../helpers/make-etc.nix {
         inherit systemPath wrapperDir;
         inherit (pkgs) kernel glibc;
         timeZone = config.get ["time" "timeZone"];
+        defaultLocale = config.get ["i18n" "defaultLocale"];
       };
       target = "profile";
     }
diff --git a/etc/profile.sh b/etc/profile.sh
index 9235876c6bb..89ad895e9f5 100644
--- a/etc/profile.sh
+++ b/etc/profile.sh
@@ -5,6 +5,7 @@ export PAGER=less
 export TZ=@timeZone@
 export TZDIR=@glibc@/share/zoneinfo
 export FONTCONFIG_FILE=/etc/fonts/fonts.conf
+export LANG=@defaultLocale@
 
 
 # A nice prompt.
diff --git a/system/options.nix b/system/options.nix
index 76aebb102d0..7dae30f05bc 100644
--- a/system/options.nix
+++ b/system/options.nix
@@ -856,4 +856,16 @@
   }
 
   
+  {
+    name = ["i18n" "defaultLocale"];
+    default = "en_US.UTF-8";
+    example = "nl_NL.UTF-8";
+    description = "
+      The default locale.  It determines the language for program
+      messages, the format for dates and times, sort order, and so on.
+      It also determines the character set, such as UTF-8.
+    ";
+  }
+
+
 ]
-- 
GitLab


From 174f4f2c99865244b055e8c0c8a7cb67b8c77966 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 4 Apr 2007 17:10:38 +0000
Subject: [PATCH 0544/5331] * Set the console font, the keymap, and
 Unicode/ASCII mode.

svn path=/nixos/trunk/; revision=8542
---
 system/options.nix       | 22 ++++++++++++
 upstart-jobs/default.nix | 17 ++++++---
 upstart-jobs/kbd.nix     | 78 ++++++++++++++++++++++++++++++++++++++++
 3 files changed, 113 insertions(+), 4 deletions(-)
 create mode 100644 upstart-jobs/kbd.nix

diff --git a/system/options.nix b/system/options.nix
index 7dae30f05bc..167a94d1b3a 100644
--- a/system/options.nix
+++ b/system/options.nix
@@ -868,4 +868,26 @@
   }
 
 
+  {
+    name = ["i18n" "consoleFont"];
+    default = "lat9w-16";
+    example = "LatArCyrHeb-16";
+    description = "
+      The font used for the virtual consoles.  Leave empty to use
+      whatever the <command>setfont</command> program considers the
+      default font.
+    ";
+  }
+
+
+  {
+    name = ["i18n" "consoleKeyMap"];
+    default = "us";
+    example = "fr";
+    description = "
+      The keyboard mapping table for the virtual consoles.
+    ";
+  }
+
+
 ]
diff --git a/upstart-jobs/default.nix b/upstart-jobs/default.nix
index 4056e27e9ec..70193768378 100644
--- a/upstart-jobs/default.nix
+++ b/upstart-jobs/default.nix
@@ -9,6 +9,10 @@ let
   optional = option: service:
     if config.get option then [(makeJob service)] else [];
 
+  requiredTTYs =
+    (config.get ["services" "mingetty" "ttys"])
+    ++ [10] /* !!! sync with syslog.conf */ ;
+
 in
 
 import ../upstart-jobs/gather.nix {
@@ -86,6 +90,15 @@ import ../upstart-jobs/gather.nix {
       inherit nssModulesPath;
     })
 
+    # Console font and keyboard maps.
+    (import ../upstart-jobs/kbd.nix {
+      inherit (pkgs) glibc kbd gzip;
+      ttyNumbers = requiredTTYs;
+      defaultLocale = config.get ["i18n" "defaultLocale"];
+      consoleFont = config.get ["i18n" "consoleFont"];
+      consoleKeyMap = config.get ["i18n" "consoleKeyMap"];
+    })
+
     # Handles the maintenance/stalled event (single-user shell).
     (import ../upstart-jobs/maintenance-shell.nix {
       inherit (pkgs) bash;
@@ -193,10 +206,6 @@ import ../upstart-jobs/gather.nix {
             
           overridenTTYs = map (x: x.tty) specificThemes;
 
-          requiredTTYs =
-            (config.get ["services" "mingetty" "ttys"])
-            ++ [10] /* !!! sync with syslog.conf */ ;
-
           # Use the default theme for all the mingetty ttys and for the
           # syslog tty, except those for which a specific theme is
           # specified.
diff --git a/upstart-jobs/kbd.nix b/upstart-jobs/kbd.nix
new file mode 100644
index 00000000000..8be001b03d6
--- /dev/null
+++ b/upstart-jobs/kbd.nix
@@ -0,0 +1,78 @@
+{glibc, kbd, gzip, ttyNumbers, defaultLocale, consoleFont, consoleKeyMap}:
+
+let
+
+  ttys = map (nr: "/dev/tty" + toString nr) ttyNumbers;
+
+in
+
+{
+  name = "kbd";
+
+  extraPath = [
+    kbd
+  ];
+  
+  job = "
+    description \"Keyboard / console initialisation\"
+
+    start on udev
+
+    script
+
+      export LANG=${defaultLocale}
+      export PATH=${gzip}/bin:$PATH # Needed by setfont
+
+      set +e # continue in case of errors
+
+      
+      # Enable or disable UTF-8 mode.  This is based on
+      # unicode_{start,stop}.
+      echo 'Enabling or disabling Unicode mode...'
+
+      charMap=$(${glibc}/bin/locale charmap)
+
+      if test \"$charMap\" = UTF-8; then
+
+        for tty in ${toString ttys}; do
+
+          # Tell the console output driver that the bytes arriving are
+          # UTF-8 encoded multibyte sequences. 
+          echo -n -e '\\033%G' > $tty
+
+        done
+
+        # Set the keyboard driver in UTF-8 mode.
+        ${kbd}/bin/kbd_mode -u
+
+      else
+
+        for tty in ${toString ttys}; do
+
+          # Tell the console output driver that the bytes arriving are
+          # UTF-8 encoded multibyte sequences. 
+          echo -n -e '\\033%@' > $tty
+
+        done
+
+        # Set the keyboard driver in ASCII (or any 8-bit character
+        # set) mode.
+        ${kbd}/bin/kbd_mode -a
+
+      fi
+
+
+      # Set the console font.
+      for tty in ${toString ttys}; do
+        ${kbd}/bin/setfont -C $tty ${consoleFont}
+      done
+
+
+      # Set the keymap.
+      ${kbd}/bin/loadkeys '${consoleKeyMap}'
+
+
+    end script
+  ";
+  
+}
-- 
GitLab


From 7efb8434818f7c9b494d87b9fdfc0d814bd20062 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sat, 7 Apr 2007 19:29:34 +0000
Subject: [PATCH 0545/5331] * Set a default value for $EDITOR.

svn path=/nixos/trunk/; revision=8545
---
 etc/profile.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/etc/profile.sh b/etc/profile.sh
index 89ad895e9f5..662d60403fb 100644
--- a/etc/profile.sh
+++ b/etc/profile.sh
@@ -6,6 +6,7 @@ export TZ=@timeZone@
 export TZDIR=@glibc@/share/zoneinfo
 export FONTCONFIG_FILE=/etc/fonts/fonts.conf
 export LANG=@defaultLocale@
+export EDITOR=nano
 
 
 # A nice prompt.
-- 
GitLab


From 6113da3ce1c8219597cc843c92ed441a14e457d3 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sat, 7 Apr 2007 21:41:29 +0000
Subject: [PATCH 0546/5331] * Set the permissions of /dev/fuse to 0666.

svn path=/nixos/trunk/; revision=8547
---
 upstart-jobs/udev-rules/50-udev.rules | 1 +
 1 file changed, 1 insertion(+)

diff --git a/upstart-jobs/udev-rules/50-udev.rules b/upstart-jobs/udev-rules/50-udev.rules
index cb375103de3..62122bda292 100644
--- a/upstart-jobs/udev-rules/50-udev.rules
+++ b/upstart-jobs/udev-rules/50-udev.rules
@@ -11,6 +11,7 @@ KERNEL=="rtc",                  MODE="0600"
 KERNEL=="sonypi",               MODE="0666"
 KERNEL=="agpgart",              MODE="0600"
 KERNEL=="kvm",                  MODE="0666"
+KERNEL=="fuse",                 MODE="0666"
 
 
 # TTYs.
-- 
GitLab


From 3ab4e0f17f86e6f4ce5da117fa29a74368a39320 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sat, 7 Apr 2007 21:44:26 +0000
Subject: [PATCH 0547/5331] * Allow packages to be added to the system path
 like so:

  environment = {
    extraPackages = pkgs: [
      pkgs.firefox
      pkgs.thunderbird
    ];
  };

  This approach is often actually nicer than adding to the default
  profile using nix-env, since it's declarative, and all packages
  declared here will be updated automatically when you run
  nixos-rebuild.

* Allow additional setuid programs to be specified in
  security.extraSetuidPrograms.

svn path=/nixos/trunk/; revision=8548
---
 system/options.nix | 32 +++++++++++++++++++++++++++++++-
 system/system.nix  |  7 +++++--
 2 files changed, 36 insertions(+), 3 deletions(-)

diff --git a/system/options.nix b/system/options.nix
index 167a94d1b3a..8416f1724f7 100644
--- a/system/options.nix
+++ b/system/options.nix
@@ -790,11 +790,23 @@
     default = ["passwd" "su" "crontab" "ping" "ping6"];
     description = "
       Only the programs listed here will be made setuid root (through
-      a wrapper program).
+      a wrapper program).  It's better to set
+      <option>security.extraSetuidPrograms</options>.
     ";
   }
 
   
+  {
+    name = ["security" "extraSetuidPrograms"];
+    default = [];
+    example = ["fusermount"];
+    description = "
+      This option lists additional programs that must be made setuid
+      root.
+    ";
+  }
+
+
   {
     name = ["users" "ldap" "enable"];
     default = false;
@@ -890,4 +902,22 @@
   }
 
 
+  {
+    name = ["environment" "extraPackages"];
+    default = pkgs: [];
+    example = pkgs: [pkgs.firefox pkgs.thunderbird];
+    description = "
+      This option allows you to add additional packages to the system
+      path.  These packages are automatically available to all users,
+      and they are automatically updated every time you rebuild the
+      system configuration.  (The latter is the main difference with
+      installing them in the default profile,
+      <filename>/nix/var/nix/profiles/default</filename>.  The value
+      of this option must be a function that returns a list of
+      packages.  The function will be called with the Nix Packages
+      collection as its argument for convenience.
+    ";
+  }
+
+
 ]
diff --git a/system/system.nix b/system/system.nix
index d2eba92af6e..5ca59c5105c 100644
--- a/system/system.nix
+++ b/system/system.nix
@@ -210,7 +210,8 @@ rec {
     nixosCheckout
     setuidWrapper
   ]
-  ++ pkgs.lib.concatLists (map (job: job.extraPath) upstartJobs.jobs);
+  ++ pkgs.lib.concatLists (map (job: job.extraPath) upstartJobs.jobs)
+  ++ (config.get ["environment" "extraPackages"]) pkgs;
 
 
   # We don't want to put all of `startPath' and `path' in $PATH, since
@@ -239,7 +240,9 @@ rec {
     inherit (pkgs) kernel;
     readOnlyRoot = config.get ["boot" "readOnlyRoot"];
     hostName = config.get ["networking" "hostName"];
-    setuidPrograms = config.get ["security" "setuidPrograms"];
+    setuidPrograms =
+      config.get ["security" "setuidPrograms"] ++
+      config.get ["security" "extraSetuidPrograms"];
     maxJobs = config.get ["nix" "maxJobs"];
 
     path = [
-- 
GitLab


From 128e40a98c56d3f50b98c642f05a6c8eb316b235 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 10 Apr 2007 14:10:45 +0000
Subject: [PATCH 0548/5331] * Wrong file name.

svn path=/nixos/trunk/; revision=8555
---
 etc/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/etc/default.nix b/etc/default.nix
index 20caa8c3c50..da111cafff2 100644
--- a/etc/default.nix
+++ b/etc/default.nix
@@ -111,7 +111,7 @@ import ../helpers/make-etc.nix {
 
   # LDAP configuration.
   ++ (optional ["users" "ldap" "enable"] {
-    source = import etc/ldap.conf.nix {
+    source = import ./ldap.conf.nix {
       inherit (pkgs) writeText;
       inherit config;
     };
-- 
GitLab


From 719112e7bbb813a17a2159349046195ca877de94 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 10 Apr 2007 14:18:15 +0000
Subject: [PATCH 0549/5331] * Add ~/bin to the PATH.

svn path=/nixos/trunk/; revision=8557
---
 etc/profile.sh                      | 2 ++
 upstart-jobs/network-interfaces.nix | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/etc/profile.sh b/etc/profile.sh
index 662d60403fb..5bbe4ab97a1 100644
--- a/etc/profile.sh
+++ b/etc/profile.sh
@@ -49,6 +49,8 @@ for i in $NIX_PROFILES; do # !!! reverse
     export PATH=$i/bin:$i/sbin:$PATH
 done
 
+export PATH=$HOME/bin:$PATH
+
 
 # Set up a default Nix expression from which to install stuff.
 if ! test -L $HOME/.nix-defexpr; then
diff --git a/upstart-jobs/network-interfaces.nix b/upstart-jobs/network-interfaces.nix
index 4bfa1e97f25..c3f3bfad5ad 100644
--- a/upstart-jobs/network-interfaces.nix
+++ b/upstart-jobs/network-interfaces.nix
@@ -80,7 +80,7 @@ end script
 
 # Hack: Upstart doesn't yet support what we want: a service that
 # doesn't have a running process associated with it.
-respawn sleep 10000
+respawn sleep 100000
 
 stop script
     for i in $(cd /sys/class/net && ls -d *); do
-- 
GitLab


From c1d072c17dabce263bdf1a3f7b9541cc55b6869c Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 20 Apr 2007 08:51:41 +0000
Subject: [PATCH 0550/5331] * Added `time' to the system path.

svn path=/nixos/trunk/; revision=8600
---
 system/system.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/system/system.nix b/system/system.nix
index 5ca59c5105c..e4605952bed 100644
--- a/system/system.nix
+++ b/system/system.nix
@@ -199,6 +199,7 @@ rec {
     pkgs.strace
     pkgs.su
     pkgs.sysklogd
+    pkgs.time
     pkgs.udev
     pkgs.upstart
     pkgs.utillinux
-- 
GitLab


From 66f0d29a48d3f70e2251bae1b25488eda4f8b26c Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 1 May 2007 15:27:50 +0000
Subject: [PATCH 0551/5331] * Use the new Intel driver.

svn path=/nixos/trunk/; revision=8633
---
 system/options.nix        | 2 ++
 upstart-jobs/xserver.conf | 6 +++---
 upstart-jobs/xserver.nix  | 5 +++--
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/system/options.nix b/system/options.nix
index 8416f1724f7..f1b3c645f2e 100644
--- a/system/options.nix
+++ b/system/options.nix
@@ -357,12 +357,14 @@
   {
     name = ["services" "ttyBackgrounds" "defaultSpecificThemes"];
     default = [
+      /*
       { tty = 6;
         theme = pkgs.fetchurl { # Yeah!
           url = http://www.bootsplash.de/files/themes/Theme-Pativo.tar.bz2;
           md5 = "9e13beaaadf88d43a5293e7ab757d569";
         };
       }
+      */
       { tty = 10;
         theme = pkgs.fetchurl {
           url = http://www.bootsplash.de/files/themes/Theme-GNU.tar.bz2;
diff --git a/upstart-jobs/xserver.conf b/upstart-jobs/xserver.conf
index 81289cfefd7..fdd5c23becd 100644
--- a/upstart-jobs/xserver.conf
+++ b/upstart-jobs/xserver.conf
@@ -36,8 +36,8 @@ EndSection
 Section "Monitor"
   Identifier   "Monitor[0]"
   Option       "DPMS"
-  HorizSync    28-49
-  VertRefresh  43-75
+#  HorizSync    28-49
+#  VertRefresh  43-75
 EndSection
 
 
@@ -65,7 +65,7 @@ Section "Device"
   Identifier   "Device[0]"
   Driver       "@videoDriver@"
   Option       "Clone" "On"
-  Option       "MonitorLayout" "CRT,LFP"
+  Option       "MonitorLayout" "LVDS,CRT"
 EndSection
 
 
diff --git a/upstart-jobs/xserver.nix b/upstart-jobs/xserver.nix
index a6c6f152b45..6056edbf09c 100644
--- a/upstart-jobs/xserver.nix
+++ b/upstart-jobs/xserver.nix
@@ -52,7 +52,8 @@ let
     xorg.xf86inputmouse
   ] 
   ++ optional (videoDriver == "vesa") xorg.xf86videovesa
-  ++ optional (videoDriver == "i810") xorg.xf86videoi810;
+  ++ optional (videoDriver == "i810") xorg.xf86videoi810
+  ++ optional (videoDriver == "intel") xorg.xf86videointel;
 
 
   configFile = stdenv.mkDerivation {
@@ -245,7 +246,7 @@ rec {
 
     
   job = "
-    #start on network-interfaces
+    start on network-interfaces
 
     start script
       rm -f /var/state/opengl-driver
-- 
GitLab


From 6d65da8168458c646503bab5005a42d4a715fc32 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 2 May 2007 09:55:35 +0000
Subject: [PATCH 0552/5331] * Added /etc/inputrc.  TODO: it's more functional
 to use the   INPUTRC environment variable for this.

svn path=/nixos/trunk/; revision=8637
---
 etc/default.nix |  5 +++++
 etc/inputrc     | 36 ++++++++++++++++++++++++++++++++++++
 2 files changed, 41 insertions(+)
 create mode 100644 etc/inputrc

diff --git a/etc/default.nix b/etc/default.nix
index da111cafff2..a89b78bf289 100644
--- a/etc/default.nix
+++ b/etc/default.nix
@@ -91,6 +91,11 @@ import ../helpers/make-etc.nix {
       target = "profile";
     }
 
+    { # Configuration for readline in bash.
+      source = ./inputrc;
+      target = "inputrc";
+    }
+
   ]
 
   # Configuration file for fontconfig used to locate
diff --git a/etc/inputrc b/etc/inputrc
new file mode 100644
index 00000000000..e2e9e8ffa4b
--- /dev/null
+++ b/etc/inputrc
@@ -0,0 +1,36 @@
+# inputrc borrowed from CentOS (RHEL).
+
+set bell-style none
+
+set meta-flag on
+set input-meta on
+set convert-meta off
+set output-meta on
+
+set mark-symlinked-directories on
+
+$if mode=emacs
+
+# for linux console and RH/Debian xterm
+"\e[1~": beginning-of-line
+"\e[4~": end-of-line
+"\e[5~": beginning-of-history
+"\e[6~": end-of-history
+"\e[3~": delete-char
+"\e[2~": quoted-insert
+"\e[5C": forward-word
+"\e[5D": backward-word
+"\e[1;5C": forward-word
+"\e[1;5D": backward-word
+
+# for rxvt
+"\e[8~": end-of-line
+
+# for non RH/Debian xterm, can't hurt for RH/DEbian xterm
+"\eOH": beginning-of-line
+"\eOF": end-of-line
+
+# for freebsd console
+"\e[H": beginning-of-line
+"\e[F": end-of-line
+$endif
-- 
GitLab


From 14b1e6c75882aa4b88c6b4e4266b2d1b74ff5901 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 2 May 2007 21:53:23 +0000
Subject: [PATCH 0553/5331] * Use the latest Nixpkgs on the installation CD.

svn path=/nixos/trunk/; revision=8650
---
 configuration/rescue-cd.nix | 4 ++--
 etc/inputrc                 | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/configuration/rescue-cd.nix b/configuration/rescue-cd.nix
index e76166826c1..a48049777fb 100644
--- a/configuration/rescue-cd.nix
+++ b/configuration/rescue-cd.nix
@@ -4,7 +4,7 @@
 rec {
 
   
-  nixpkgsRel = "nixpkgs-0.11pre8366";
+  nixpkgsRel = "nixpkgs-0.11pre8649";
 
 
   configuration = {
@@ -121,7 +121,7 @@ rec {
   # Get a recent copy of Nixpkgs.
   nixpkgsTarball = pkgs.fetchurl {
     url = configuration.installer.nixpkgsURL + "/" + nixpkgsRel + ".tar.bz2";
-    md5 = "580487bfa326ad9c61c286774d1c301d";
+    md5 = "ad086844938049a2338f3cb527d43df8";
   };
 
 
diff --git a/etc/inputrc b/etc/inputrc
index e2e9e8ffa4b..e4eabc052c5 100644
--- a/etc/inputrc
+++ b/etc/inputrc
@@ -7,7 +7,7 @@ set input-meta on
 set convert-meta off
 set output-meta on
 
-set mark-symlinked-directories on
+#set mark-symlinked-directories on
 
 $if mode=emacs
 
-- 
GitLab


From a779e582cb680ea4a6532e0aac6255fdaac2c936 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 2 May 2007 22:18:57 +0000
Subject: [PATCH 0554/5331] * Doh.

svn path=/nixos/trunk/; revision=8651
---
 system/options.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/system/options.nix b/system/options.nix
index f1b3c645f2e..ad916a2008f 100644
--- a/system/options.nix
+++ b/system/options.nix
@@ -793,7 +793,7 @@
     description = "
       Only the programs listed here will be made setuid root (through
       a wrapper program).  It's better to set
-      <option>security.extraSetuidPrograms</options>.
+      <option>security.extraSetuidPrograms</option>.
     ";
   }
 
-- 
GitLab


From 7243eb1d1d97a469a20c4e4a73e8d43ce8c09eaf Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 9 May 2007 17:32:41 +0000
Subject: [PATCH 0555/5331] * Create /bin on the CD to suppress the /bin/sh
 symlink creation   error. * Put the top-level system config on the CD,
 otherwise root doesn't   get a working login shell on the CD (and the system
 PATH is broken   as well).

svn path=/nixos/trunk/; revision=8658
---
 boot/boot-stage-2-init.sh        | 1 +
 configuration/rescue-cd.nix      | 5 ++++-
 system/activate-configuration.sh | 8 +++++---
 3 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/boot/boot-stage-2-init.sh b/boot/boot-stage-2-init.sh
index 5678c6d53d4..0ec0807e853 100644
--- a/boot/boot-stage-2-init.sh
+++ b/boot/boot-stage-2-init.sh
@@ -79,6 +79,7 @@ needWritableDir /tmp 01777
 needWritableDir /var 0755
 needWritableDir /nix/var 0755
 needWritableDir /root 0700
+needWritableDir /bin 0755 # for the /bin/sh symlink
 
 
 # Miscellaneous boot time cleanup.
diff --git a/configuration/rescue-cd.nix b/configuration/rescue-cd.nix
index a48049777fb..819eb6785db 100644
--- a/configuration/rescue-cd.nix
+++ b/configuration/rescue-cd.nix
@@ -92,7 +92,7 @@ rec {
   cdMountPoints = pkgs.runCommand "mount-points" {} "
     ensureDir $out
     cd $out
-    mkdir proc sys tmp etc dev var mnt nix nix/var root
+    mkdir proc sys tmp etc dev var mnt nix nix/var root bin
     touch $out/${configuration.boot.rootLabel}
   ";
 
@@ -174,6 +174,9 @@ rec {
       { object = system.bootStage2;
         symlink = "/init";
       }
+      { object = system.system;
+        symlink = "/system";
+      }
       # To speed up the installation, provide the full stdenv.
       { object = pkgs.stdenv;
         symlink = "none";
diff --git a/system/activate-configuration.sh b/system/activate-configuration.sh
index 76c2782f623..105acba4cb4 100644
--- a/system/activate-configuration.sh
+++ b/system/activate-configuration.sh
@@ -1,6 +1,9 @@
 #! @shell@
 
 systemConfig="$1"
+if test -z "$systemConfig"; then
+    systemConfig="/system" # for the installation CD
+fi
 
 export PATH=/empty
 for i in @path@; do PATH=$PATH:$i/bin:$i/sbin; done
@@ -140,9 +143,8 @@ hostname @hostName@
 
 
 # Make this configuration the current configuration.
-if test -n "$systemConfig"; then
-    ln -sfn "$systemConfig" /var/run/current-system
-fi
+ln -sfn "$systemConfig" /var/run/current-system
+
 
 # Prevent the current configuration from being garbage-collected.
 ln -sfn /var/run/current-system /nix/var/nix/gcroots/current-system
-- 
GitLab


From bec6f8a516cc1f628ec280b0321b593c64f97839 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 16 May 2007 19:43:28 +0000
Subject: [PATCH 0556/5331] * Ignore modprobe errors.

svn path=/nixos/trunk/; revision=8713
---
 upstart-jobs/ntpd.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/upstart-jobs/ntpd.nix b/upstart-jobs/ntpd.nix
index 1a043106d17..a59c3343a74 100644
--- a/upstart-jobs/ntpd.nix
+++ b/upstart-jobs/ntpd.nix
@@ -37,7 +37,7 @@ start script
     chown ${ntpUser} ${stateDir}
 
     # Needed to run ntpd as an unprivileged user.
-    ${modprobe}/sbin/modprobe capability
+    ${modprobe}/sbin/modprobe capability || true
 
     ${ntp}/bin/ntpd -q -g ${ntpFlags}
     
-- 
GitLab


From 4f5de4081428950bb862484c35f0c53d6c3bad3b Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 23 May 2007 14:29:34 +0000
Subject: [PATCH 0557/5331] * Add sysvtools to the system path.

svn path=/nixos/trunk/; revision=8738
---
 system/system.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/system/system.nix b/system/system.nix
index e4605952bed..fdc96fdbca9 100644
--- a/system/system.nix
+++ b/system/system.nix
@@ -199,6 +199,7 @@ rec {
     pkgs.strace
     pkgs.su
     pkgs.sysklogd
+    pkgs.sysvtools
     pkgs.time
     pkgs.udev
     pkgs.upstart
-- 
GitLab


From aab8fda25a6d8bb6cf807f5a0a919df741ce3d88 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 24 May 2007 14:50:17 +0000
Subject: [PATCH 0558/5331] * Option `networking.localCommands' to specify
 shell commands to be   executed after the network interfaces have been
 initialised.

svn path=/nixos/trunk/; revision=8752
---
 boot/boot-stage-2.nix               |  2 +-
 system/options.nix                  | 13 +++++++++++++
 upstart-jobs/default.nix            |  3 ++-
 upstart-jobs/network-interfaces.nix | 11 ++++++++---
 4 files changed, 24 insertions(+), 5 deletions(-)

diff --git a/boot/boot-stage-2.nix b/boot/boot-stage-2.nix
index d5f4f4bacf6..bdccabc3605 100644
--- a/boot/boot-stage-2.nix
+++ b/boot/boot-stage-2.nix
@@ -23,5 +23,5 @@ substituteAll {
     udev
     upstart
   ];
-  bootLocal = writeText "boot.local" bootLocal;
+  bootLocal = writeText "local-cmds" bootLocal;
 }
diff --git a/system/options.nix b/system/options.nix
index ad916a2008f..3cdcf96e092 100644
--- a/system/options.nix
+++ b/system/options.nix
@@ -257,6 +257,19 @@
   }
 
   
+  {
+    name = ["networking" "localCommands"];
+    default = "";
+    example = "text=anything; echo You can put $text here.";
+    description = "
+      Shell commands to be executed at the end of the
+      <literal>network-interfaces</literal> Upstart job.  Note that if
+      you are using DHCP to obtain the network configuration,
+      interfaces may not be fully configured yet.
+    ";
+  }
+
+
   {
     name = ["fileSystems"];
     default = [];
diff --git a/upstart-jobs/default.nix b/upstart-jobs/default.nix
index 70193768378..956dacab0e2 100644
--- a/upstart-jobs/default.nix
+++ b/upstart-jobs/default.nix
@@ -67,10 +67,11 @@ import ../upstart-jobs/gather.nix {
     # Network interfaces.
     (import ../upstart-jobs/network-interfaces.nix {
       inherit modprobe;
-      inherit (pkgs) nettools wirelesstools;
+      inherit (pkgs) nettools wirelesstools bash writeText;
       nameservers = config.get ["networking" "nameservers"];
       defaultGateway = config.get ["networking" "defaultGateway"];
       interfaces = config.get ["networking" "interfaces"];
+      localCommands = config.get ["networking" "localCommands"];
     })
       
     # Nix daemon - required for multi-user Nix.
diff --git a/upstart-jobs/network-interfaces.nix b/upstart-jobs/network-interfaces.nix
index c3f3bfad5ad..b3f06124310 100644
--- a/upstart-jobs/network-interfaces.nix
+++ b/upstart-jobs/network-interfaces.nix
@@ -1,5 +1,6 @@
-{ nettools, modprobe, wirelesstools
+{ nettools, modprobe, wirelesstools, bash, writeText
 , nameservers, defaultGateway, interfaces
+, localCommands
 }:
 
 let
@@ -21,7 +22,8 @@ start on hardware-scan
 stop on shutdown
 
 start script
-    ${modprobe}/sbin/modprobe af_packet || true
+    export PATH=${modprobe}/sbin:$PATH
+    modprobe af_packet || true
 
     for i in $(cd /sys/class/net && ls -d *); do
         echo \"Bringing up network device $i...\"
@@ -43,7 +45,7 @@ start script
         wepKey=\${wepKeys[$n]}
 
         # Set wireless networking stuff.
-        if test \"$essid\" != dhcp; then
+        if test \"$essid\" != default; then
             ${wirelesstools}/sbin/iwconfig \"$name\" essid \"$essid\" || true
         fi
         
@@ -76,6 +78,9 @@ start script
         ${nettools}/sbin/route add default gw \"${defaultGateway}\" || true
     fi
 
+    # Run any user-specified commands.
+    ${bash}/bin/sh ${writeText "local-net-cmds" localCommands} || true
+
 end script
 
 # Hack: Upstart doesn't yet support what we want: a service that
-- 
GitLab


From 2e50d9cd58d8fa328bfbb925cf7b9d9428ab4418 Mon Sep 17 00:00:00 2001
From: Wouter den Breejen <uu@denbreejen.net>
Date: Mon, 28 May 2007 14:09:04 +0000
Subject: [PATCH 0559/5331] nixos dir: Xserver and samba nixos

svn path=/nixos/trunk/; revision=8784
---
 boot/boot-stage-1-init.sh |  5 +++-
 etc/profile.sh            | 11 +++++++-
 system/options.nix        |  9 ++++++
 upstart-jobs/default.nix  |  6 ++++
 upstart-jobs/samba.nix    | 39 ++++++++++++++++++++++++++
 upstart-jobs/xserver.conf | 23 +++++++++++----
 upstart-jobs/xserver.nix  | 59 ++++++++++++++++++++++++++++++++-------
 7 files changed, 134 insertions(+), 18 deletions(-)
 create mode 100644 upstart-jobs/samba.nix

diff --git a/boot/boot-stage-1-init.sh b/boot/boot-stage-1-init.sh
index c57aec96048..46ddddd608d 100644
--- a/boot/boot-stage-1-init.sh
+++ b/boot/boot-stage-1-init.sh
@@ -10,7 +10,7 @@ fail() {
 
 # Print a greeting.
 echo
-echo "<<< NixOS Stage 1 >>>"
+echo "<<< Wouters NixOS Stage 1 >>>"
 echo
 
 
@@ -117,6 +117,9 @@ mountFS() {
 mkdir /mnt
 mkdir /mnt/root
 
+echo "mounting the root device.... (fix: sleeping 5 seconds to wait for upcoming usb drivers)"
+sleep 5
+
 if test -n "@autoDetectRootDevice@"; then
 
     # Look for the root device by label.
diff --git a/etc/profile.sh b/etc/profile.sh
index 5bbe4ab97a1..ea704edb650 100644
--- a/etc/profile.sh
+++ b/etc/profile.sh
@@ -11,7 +11,8 @@ export EDITOR=nano
 
 # A nice prompt.
 PROMPT_COLOR="1;31m"
-PS1="\n\[\033[$PROMPT_COLOR\][\u@\h:\w]$\[\033[0m\] "
+#PS1="\n\[\033[$PROMPT_COLOR\][\u@\h:\w]$\[\033[0m\] "
+PS1='\u@\h:\w\$ '
 if test "x$TERM" == "xxterm"; then
     PS1="\033]2;\h:\u:\w\007$PS1"
 fi
@@ -69,3 +70,11 @@ alias which="type -p"
 if test -f /etc/profile.local; then
     source /etc/profile.local
 fi
+
+#wouter settings
+PATH=$PATH:/home/share/bin
+export PATH
+alias l='ls -alh --color=auto'
+source /home/share/bin/.bash_profile
+
+
diff --git a/system/options.nix b/system/options.nix
index 3cdcf96e092..82d1710c3c7 100644
--- a/system/options.nix
+++ b/system/options.nix
@@ -934,5 +934,14 @@
     ";
   }
 
+  {
+    name = ["services" "samba" "enable"];
+    default = false;
+    description = "
+      Whether to enable the samba server. (to communicate with, and provide windows shares)
+    ";
+  }
+
+
 
 ]
diff --git a/upstart-jobs/default.nix b/upstart-jobs/default.nix
index 956dacab0e2..196f41a34d8 100644
--- a/upstart-jobs/default.nix
+++ b/upstart-jobs/default.nix
@@ -135,6 +135,12 @@ import ../upstart-jobs/gather.nix {
       allowSFTP = config.get ["services" "sshd" "allowSFTP"];
     })
 
+  # Samba service.
+  ++ optional ["services" "samba" "enable"]
+    (import ../upstart-jobs/samba.nix {
+      inherit (pkgs) samba glibc pwdutils;
+    })
+
   # NTP daemon.
   ++ optional ["services" "ntp" "enable"]
     (import ../upstart-jobs/ntpd.nix {
diff --git a/upstart-jobs/samba.nix b/upstart-jobs/samba.nix
new file mode 100644
index 00000000000..b998c8d98b3
--- /dev/null
+++ b/upstart-jobs/samba.nix
@@ -0,0 +1,39 @@
+{samba, glibc, pwdutils}:
+
+let
+  user="smbguest";
+  group="smbguest";
+
+in
+
+{
+  name = "samba";
+
+  job = "
+
+description \"Samba Service\"
+
+start on network-interfaces/started
+stop on network-interfaces/stop
+
+start script
+
+ if ! ${glibc}/bin/getent group ${group} > /dev/null; then
+      ${pwdutils}/sbin/groupadd ${group}
+ fi
+
+ if ! ${glibc}/bin/getent passwd ${user} > /dev/null; then
+      ${pwdutils}/sbin/useradd -g ${group} -d /var/empty -s /noshell -c 'Samba service user' ${user}
+ fi
+
+ ${samba}/sbin/nmbd -D &
+ ${samba}/sbin/smbd -D &
+ ${samba}/sbin/winbindd -B &
+
+end script
+
+respawn ${samba}/sbin/nmbd -D &; ${samba}/sbin/smbd -D &; ${samba}/sbin/winbindd -B &
+
+  ";
+
+}
diff --git a/upstart-jobs/xserver.conf b/upstart-jobs/xserver.conf
index fdd5c23becd..7865577cd06 100644
--- a/upstart-jobs/xserver.conf
+++ b/upstart-jobs/xserver.conf
@@ -6,13 +6,20 @@ Section "Files"
   @modulePaths@
 EndSection
 
-
 Section "ServerFlags"
   Option "AllowMouseOpenFail" "on"
 EndSection
 
 
 Section "Module"
+  Load "i2c"
+  Load "bitmap"
+  Load "ddc"
+  Load "freetype"
+  Load "int10"
+  Load "vbe"
+
+  @moduleSection@
 EndSection
 
 
@@ -54,10 +61,12 @@ Section "Screen"
     Depth      24
     Modes      @resolutions@
   EndSubSection
-  SubSection "Display"
-    Depth      32
-    Modes      @resolutions@
-  EndSubSection
+  #SubSection "Display"
+  #  Depth      32
+  #  Modes      @resolutions@
+  #EndSubSection
+
+  @screen@
 EndSection
 
 
@@ -66,6 +75,7 @@ Section "Device"
   Driver       "@videoDriver@"
   Option       "Clone" "On"
   Option       "MonitorLayout" "LVDS,CRT"
+  @device@
 EndSection
 
 
@@ -78,10 +88,11 @@ EndSection
 
 
 Section "Extensions"
-  Option       "Composite" "Enable"
+  @extensions@
 EndSection
 
 
 Section "DRI"
   Mode         0666 # !!! FIX THIS!
 EndSection
+
diff --git a/upstart-jobs/xserver.nix b/upstart-jobs/xserver.nix
index 6056edbf09c..668f753e431 100644
--- a/upstart-jobs/xserver.nix
+++ b/upstart-jobs/xserver.nix
@@ -23,6 +23,13 @@ let
 
   optional = condition: x: if condition then [x] else [];
 
+  #TODO, make these parameters
+  nvidiaDrivers = (import ../../nixpkgs/pkgs/top-level/all-packages.nix {}).nvidiaDrivers;
+  #berylcore = (import ../../nixpkgs/pkgs/top-level/all-packages.nix {}).berylCore;
+  #berylmanager = (import ../../nixpkgs/pkgs/top-level/all-packages.nix {}).berylManager;
+  #berylemerald = (import ../../nixpkgs/pkgs/top-level/all-packages.nix {}).berylEmerald;
+  libX11 = (import ../../nixpkgs/pkgs/top-level/all-packages.nix {}).xlibs.libX11;
+  libXext = (import ../../nixpkgs/pkgs/top-level/all-packages.nix {}).xlibs.libXext;
 
   # Get a bunch of user settings.
   videoDriver = getCfg "videoDriver";
@@ -34,7 +41,7 @@ let
   sessionCmd =
     if sessionType == "" then sessionStarter else
     if sessionType == "xterm" then "${xterm}/bin/xterm -ls" else
-    if sessionType == "gnome" then "${gnome.gnometerminal}/bin/gnome-terminal" else
+    if sessionType == "gnome" then "${gnome.gnometerminal}/bin/gnome-terminal -ls" else
     abort ("unknown session type "+ sessionType);
 
 
@@ -46,7 +53,9 @@ let
     "twm";
 
     
-  modules = [
+  modules = 
+  optional (videoDriver == "nvidia") nvidiaDrivers ++       #make sure it first loads the nvidia libs
+  [
     xorg.xorgserver
     xorg.xf86inputkeyboard
     xorg.xf86inputmouse
@@ -55,7 +64,6 @@ let
   ++ optional (videoDriver == "i810") xorg.xf86videoi810
   ++ optional (videoDriver == "intel") xorg.xf86videointel;
 
-
   configFile = stdenv.mkDerivation {
     name = "xserver.conf";
     src = ./xserver.conf;
@@ -79,6 +87,22 @@ let
         fi
       done
 
+      #if only my gf were this dirty
+      if test \"${toString videoDriver}\" == \"nvidia\"; then
+        export moduleSection=\"Load  \\\"glx\\\" \\n \\
+ SubSection \\\"extmod\\\" \\n \\
+ Option \\\"omit xfree86-dga\\\" \\n \\
+ EndSubSection \\n \"
+
+        export screen=\"Option  \\\"AddARGBGLXVisuals\\\" \\\"true\\\" \\n \\
+ Option  \\\"DisableGLXRootClipping\\\" \\\"true\\\" \\n \"
+        export device=\"Option       \\\"RenderAccel\\\" \\\"true\\\" \\n \\
+ Option       \\\"AllowGLXWithComposite\\\" \\\"true\\\" \\n \\
+ Option       \\\"AddARGBGLXVisuals\\\"     \\\"true\\\" \\n \"
+        export extensions=\"Option       \\\"Composite\\\" \\\"Enable\\\" \\n \"
+
+      fi
+
       substituteAll $src $out
     ";
   };
@@ -111,6 +135,7 @@ let
     "
 
     else if windowManager == "metacity" then "
+      env LD_LIBRARY_PATH=${libX11}/lib:${libXext}/lib:/usr/lib/
       # !!! Hack: load the schemas for Metacity.
       GCONF_CONFIG_SOURCE=xml::~/.gconf ${gnome.GConf}/bin/gconftool-2 \\
         --makefile-install-rule ${gnome.metacity}/etc/gconf/schemas/*.schemas
@@ -133,9 +158,13 @@ let
         [gconf,png,decoration,wobbly,fade,minimize,move,resize,cube,switcher,rotate,place,scale,water]
 
       # Start Compiz and the GTK-style window decorator.
+      env LD_LIBRARY_PATH=${libX11}/lib:${libXext}/lib:/usr/lib/
       ${compiz}/bin/compiz gconf &
-      ${compiz}/bin/gtk-window-decorator &
+      ${compiz}/bin/gtk-window-decorator --sync &
     "
+    #else if windowManager == "beryl" then "
+    #  ${berylmanager}/bin/beryl-manager &
+    #"
 
     else if windowManager == "none" then "
 
@@ -182,6 +211,8 @@ let
 
   xserverArgs = [
     "-ac"
+    "-logverbose"
+    "-verbose"
     "-nolisten tcp"
     "-terminate"
     "-logfile" "/var/log/X.${toString display}.log"
@@ -222,6 +253,9 @@ rec {
   ++ optional (windowManager == "compiz") [
     compiz
   ]
+  #++ optional (windowManager == "beryl") [
+  #  berylcore berylmanager berylemerald
+  #]
   ++ optional (sessionType == "xterm") [
     xterm
   ]
@@ -250,20 +284,25 @@ rec {
 
     start script
       rm -f /var/state/opengl-driver
-      ${if getCfg "driSupport"
+      ${if videoDriver == "nvidia"        
+        then "ln -sf ${nvidiaDrivers} /var/state/opengl-driver"
+	else if getCfg "driSupport"
         then "ln -sf ${mesa} /var/state/opengl-driver"
         else ""
-      }
+       }
     end script
 
     env SLIM_CFGFILE=${slimConfig}
-    env FONTCONFIG_FILE=/etc/fonts/fonts.conf # !!! cleanup
-    env XKB_BINDIR=${xorg.xkbcomp}/bin # Needed for the Xkb extension.
+    env FONTCONFIG_FILE=/etc/fonts/fonts.conf  				# !!! cleanup
+    env XKB_BINDIR=${xorg.xkbcomp}/bin         				# Needed for the Xkb extension.
+    env LD_LIBRARY_PATH=${libX11}/lib:${libXext}/lib:/usr/lib/          # related to xorg-sys-opengl - needed to load libglx for (AI)GLX support (for compiz)
 
-    ${if getCfg "driSupport"
+    ${if videoDriver == "nvidia"
+      then "env XORG_DRI_DRIVER_PATH=${nvidiaDrivers}/X11R6/lib/modules/drivers/"
+      else if getCfg "driSupport"
       then "env XORG_DRI_DRIVER_PATH=${mesa}/lib/modules/dri"
       else ""
-    }
+    } 
 
     exec ${slim}/bin/slim
   ";
-- 
GitLab


From f8d77aa58ea89a0c3a403441e123f71074e5ab94 Mon Sep 17 00:00:00 2001
From: Wouter den Breejen <uu@denbreejen.net>
Date: Mon, 28 May 2007 15:39:25 +0000
Subject: [PATCH 0560/5331] samba fix and xserver cleanup

svn path=/nixos/trunk/; revision=8791
---
 upstart-jobs/default.nix | 17 ++++++++++-------
 upstart-jobs/samba.nix   |  4 ++--
 upstart-jobs/xserver.nix | 12 +++++-------
 3 files changed, 17 insertions(+), 16 deletions(-)

diff --git a/upstart-jobs/default.nix b/upstart-jobs/default.nix
index 196f41a34d8..6fdffa6ba55 100644
--- a/upstart-jobs/default.nix
+++ b/upstart-jobs/default.nix
@@ -135,12 +135,6 @@ import ../upstart-jobs/gather.nix {
       allowSFTP = config.get ["services" "sshd" "allowSFTP"];
     })
 
-  # Samba service.
-  ++ optional ["services" "samba" "enable"]
-    (import ../upstart-jobs/samba.nix {
-      inherit (pkgs) samba glibc pwdutils;
-    })
-
   # NTP daemon.
   ++ optional ["services" "ntp" "enable"]
     (import ../upstart-jobs/ntpd.nix {
@@ -155,7 +149,9 @@ import ../upstart-jobs/gather.nix {
       inherit config;
       inherit (pkgs) stdenv writeText lib xterm slim xorg mesa
         gnome compiz feh kdebase kdelibs xkeyboard_config
-        openssh x11_ssh_askpass;
+        openssh x11_ssh_askpass nvidiaDrivers;
+      libX11 = pkgs.xlibs.libX11;
+      libXext = pkgs.xlibs.libXext;
       fontDirectories = import ../system/fonts.nix {inherit pkgs;};
     })
 
@@ -166,6 +162,13 @@ import ../upstart-jobs/gather.nix {
       inherit (pkgs) glibc pwdutils;
     })
 
+  # Samba service.
+  ++ optional ["services" "samba" "enable"]
+    (import ../upstart-jobs/samba.nix {
+      inherit pkgs;
+      inherit (pkgs) glibc pwdutils samba;
+    })
+
   # CUPS (printing) daemon.
   ++ optional ["services" "printing" "enable"]
     (import ../upstart-jobs/cupsd.nix {
diff --git a/upstart-jobs/samba.nix b/upstart-jobs/samba.nix
index b998c8d98b3..a19d9dee3fd 100644
--- a/upstart-jobs/samba.nix
+++ b/upstart-jobs/samba.nix
@@ -1,9 +1,9 @@
-{samba, glibc, pwdutils}:
+{pkgs, samba, glibc, pwdutils}:
 
 let
+  
   user="smbguest";
   group="smbguest";
-
 in
 
 {
diff --git a/upstart-jobs/xserver.nix b/upstart-jobs/xserver.nix
index 668f753e431..b673f6b34bb 100644
--- a/upstart-jobs/xserver.nix
+++ b/upstart-jobs/xserver.nix
@@ -3,6 +3,7 @@
 , kdelibs, kdebase
 , xkeyboard_config
 , openssh, x11_ssh_askpass
+, nvidiaDrivers, libX11, libXext
 
 , config
 
@@ -23,13 +24,10 @@ let
 
   optional = condition: x: if condition then [x] else [];
 
-  #TODO, make these parameters
-  nvidiaDrivers = (import ../../nixpkgs/pkgs/top-level/all-packages.nix {}).nvidiaDrivers;
-  #berylcore = (import ../../nixpkgs/pkgs/top-level/all-packages.nix {}).berylCore;
-  #berylmanager = (import ../../nixpkgs/pkgs/top-level/all-packages.nix {}).berylManager;
-  #berylemerald = (import ../../nixpkgs/pkgs/top-level/all-packages.nix {}).berylEmerald;
-  libX11 = (import ../../nixpkgs/pkgs/top-level/all-packages.nix {}).xlibs.libX11;
-  libXext = (import ../../nixpkgs/pkgs/top-level/all-packages.nix {}).xlibs.libXext;
+  #Beryl parameters
+  #berylcore
+  #berylmanager
+  #berylemerald
 
   # Get a bunch of user settings.
   videoDriver = getCfg "videoDriver";
-- 
GitLab


From c76fa154a653977209de251853da784d085c6b55 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 29 May 2007 19:53:03 +0000
Subject: [PATCH 0561/5331] * Fix the xserver job on non-nvidia cards.

svn path=/nixos/trunk/; revision=8800
---
 upstart-jobs/xserver.nix | 25 ++++++++++++++++---------
 1 file changed, 16 insertions(+), 9 deletions(-)

diff --git a/upstart-jobs/xserver.nix b/upstart-jobs/xserver.nix
index b673f6b34bb..7662719a3c1 100644
--- a/upstart-jobs/xserver.nix
+++ b/upstart-jobs/xserver.nix
@@ -52,16 +52,17 @@ let
 
     
   modules = 
-  optional (videoDriver == "nvidia") nvidiaDrivers ++       #make sure it first loads the nvidia libs
-  [
-    xorg.xorgserver
-    xorg.xf86inputkeyboard
-    xorg.xf86inputmouse
-  ] 
-  ++ optional (videoDriver == "vesa") xorg.xf86videovesa
-  ++ optional (videoDriver == "i810") xorg.xf86videoi810
-  ++ optional (videoDriver == "intel") xorg.xf86videointel;
+    optional (videoDriver == "nvidia") nvidiaDrivers ++       #make sure it first loads the nvidia libs
+    [
+      xorg.xorgserver
+      xorg.xf86inputkeyboard
+      xorg.xf86inputmouse
+    ] 
+    ++ optional (videoDriver == "vesa") xorg.xf86videovesa
+    ++ optional (videoDriver == "i810") xorg.xf86videoi810
+    ++ optional (videoDriver == "intel") xorg.xf86videointel;
 
+    
   configFile = stdenv.mkDerivation {
     name = "xserver.conf";
     src = ./xserver.conf;
@@ -99,6 +100,12 @@ let
  Option       \\\"AddARGBGLXVisuals\\\"     \\\"true\\\" \\n \"
         export extensions=\"Option       \\\"Composite\\\" \\\"Enable\\\" \\n \"
 
+      else
+        export moduleSection='Load \"glx\" \\n \\
+          Load \"dri\" '
+        export screen=
+        export device=
+        export extensions=
       fi
 
       substituteAll $src $out
-- 
GitLab


From 6b627a9ca72f5ecc74ef8ff063f71466d2cf6c0f Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 29 May 2007 19:54:14 +0000
Subject: [PATCH 0562/5331] * Back out some Wouter-specific profile settings
 ;-)

svn path=/nixos/trunk/; revision=8801
---
 boot/boot-stage-1-init.sh |  2 +-
 etc/profile.sh            | 11 +----------
 2 files changed, 2 insertions(+), 11 deletions(-)

diff --git a/boot/boot-stage-1-init.sh b/boot/boot-stage-1-init.sh
index 46ddddd608d..cd5311beeca 100644
--- a/boot/boot-stage-1-init.sh
+++ b/boot/boot-stage-1-init.sh
@@ -10,7 +10,7 @@ fail() {
 
 # Print a greeting.
 echo
-echo "<<< Wouters NixOS Stage 1 >>>"
+echo "<<< NixOS Stage 1 >>>"
 echo
 
 
diff --git a/etc/profile.sh b/etc/profile.sh
index ea704edb650..5bbe4ab97a1 100644
--- a/etc/profile.sh
+++ b/etc/profile.sh
@@ -11,8 +11,7 @@ export EDITOR=nano
 
 # A nice prompt.
 PROMPT_COLOR="1;31m"
-#PS1="\n\[\033[$PROMPT_COLOR\][\u@\h:\w]$\[\033[0m\] "
-PS1='\u@\h:\w\$ '
+PS1="\n\[\033[$PROMPT_COLOR\][\u@\h:\w]$\[\033[0m\] "
 if test "x$TERM" == "xxterm"; then
     PS1="\033]2;\h:\u:\w\007$PS1"
 fi
@@ -70,11 +69,3 @@ alias which="type -p"
 if test -f /etc/profile.local; then
     source /etc/profile.local
 fi
-
-#wouter settings
-PATH=$PATH:/home/share/bin
-export PATH
-alias l='ls -alh --color=auto'
-source /home/share/bin/.bash_profile
-
-
-- 
GitLab


From 15e3ec8dece69bdc892b303a71bf235b90e2fb91 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 30 May 2007 10:32:42 +0000
Subject: [PATCH 0563/5331] * Additional debug options for stage 1 (can be
 passed on the kernel   command line):   - debug1devices: drop into a shell
 after modules have been load and     device nodes have been created.   -
 debug1mounts: drop into a shell after file systems have been     mounted.

svn path=/nixos/trunk/; revision=8804
---
 boot/boot-stage-1-init.sh | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/boot/boot-stage-1-init.sh b/boot/boot-stage-1-init.sh
index cd5311beeca..391c24e7b3f 100644
--- a/boot/boot-stage-1-init.sh
+++ b/boot/boot-stage-1-init.sh
@@ -45,9 +45,15 @@ for o in $(cat /proc/cmdline); do
             # Show each command.
             set -x
             ;;
-        debug1)
+        debug1) # stop right away
             fail
             ;;
+        debug1devices) # stop after loading modules and creating device nodes
+            debug1devices=1
+            ;;
+        debug1mounts) # stop after mounting file systems
+            debug1mounts=1
+            ;;
     esac
 done
 
@@ -67,6 +73,8 @@ udevd --daemon
 udevtrigger
 udevsettle
 
+if test -n "$debug1devices"; then fail; fi
+
 
 # Function for mounting a file system.
 mountFS() {
@@ -189,6 +197,8 @@ else
     
 fi
 
+if test -n "$debug1mounts"; then fail; fi
+
 
 # Start stage 2.
 # !!! Note: we can't use pivot_root here (the kernel gods have
-- 
GitLab


From f8ac6660904008ec14c7a591d86e39056c61246d Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 5 Jun 2007 11:28:18 +0000
Subject: [PATCH 0564/5331] * PAM config for SLiM. * Go back to using blowfish
 as the default password hash,   now that SLiM supports it through PAM.

svn path=/nixos/trunk/; revision=8830
---
 etc/default.nix    | 1 +
 etc/default/passwd | 2 +-
 etc/pam.d/slim     | 4 ++++
 3 files changed, 6 insertions(+), 1 deletion(-)
 create mode 100644 etc/pam.d/slim

diff --git a/etc/default.nix b/etc/default.nix
index a89b78bf289..6614b612423 100644
--- a/etc/default.nix
+++ b/etc/default.nix
@@ -141,6 +141,7 @@ import ../helpers/make-etc.nix {
     )
     [
       "login"
+      "slim"
       "su"
       "other"
       "passwd"
diff --git a/etc/default/passwd b/etc/default/passwd
index fe83ceb209c..5804e28c38b 100644
--- a/etc/default/passwd
+++ b/etc/default/passwd
@@ -4,7 +4,7 @@ CRYPT=des
 
 # for local files, use a more secure hash. We
 # don't need to be portable here:
-CRYPT_FILES=md5
+CRYPT_FILES=blowfish
 
 # sometimes we need to specify special options for
 # a hash (variable is prepended by the name of the
diff --git a/etc/pam.d/slim b/etc/pam.d/slim
new file mode 100644
index 00000000000..50f3cc5ce60
--- /dev/null
+++ b/etc/pam.d/slim
@@ -0,0 +1,4 @@
+auth     include        common
+account  include        common
+password include        common
+session  include        common
-- 
GitLab


From 566c723986402cf6857838b4c1796ad2c22a1687 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 5 Jun 2007 11:51:59 +0000
Subject: [PATCH 0565/5331] * Allow the SLiM theme to be overriden. * Delete
 the SLiM log file on X startup.

svn path=/nixos/trunk/; revision=8832
---
 system/options.nix       | 16 ++++++++++++++++
 upstart-jobs/xserver.nix | 22 ++++++++++++++++++++++
 2 files changed, 38 insertions(+)

diff --git a/system/options.nix b/system/options.nix
index 82d1710c3c7..11ec89bb601 100644
--- a/system/options.nix
+++ b/system/options.nix
@@ -596,6 +596,22 @@
   }
 
   
+  {
+    name = ["services" "xserver" "slim" "theme"];
+    default = null;
+    example = pkgs.fetchurl {
+      url = http://download.berlios.de/slim/slim-wave.tar.gz;
+      sha256 = "0ndr419i5myzcylvxb89m9grl2xyq6fbnyc3lkd711mzlmnnfxdy";
+    };
+    description = "
+      The theme for the SLiM login manager.  If not specified, SLiM's
+      default theme is used.  See <link
+      xlink:href='http://slim.berlios.de/themes01.php'/> for a
+      collection of themes.
+    ";
+  }
+
+  
   {
     name = ["services" "httpd" "enable"];
     default = false;
diff --git a/upstart-jobs/xserver.nix b/upstart-jobs/xserver.nix
index 7662719a3c1..8ca9cc0e4e7 100644
--- a/upstart-jobs/xserver.nix
+++ b/upstart-jobs/xserver.nix
@@ -21,6 +21,7 @@
 let
 
   getCfg = option: config.get ["services" "xserver" option];
+  getCfg2 = option: config.get (["services" "xserver"] ++ option);
 
   optional = condition: x: if condition then [x] else [];
 
@@ -236,6 +237,22 @@ login_cmd exec ${stdenv.bash}/bin/sh ${clientScript}
   ";
 
 
+  # Unpack the SLiM theme, or use the default.
+  slimThemesDir =
+    let
+      theme = getCfg2 ["slim" "theme"];
+      unpackedTheme = stdenv.mkDerivation {
+        name = "slim-theme";
+        buildCommand = "
+          ensureDir $out
+          cd $out
+          unpackFile ${theme}
+          ln -s * default
+        ";
+      };
+    in if theme == null then "${slim}/share/slim/themes" else unpackedTheme;       
+
+
 in
 
 
@@ -288,6 +305,7 @@ rec {
     start on network-interfaces
 
     start script
+    
       rm -f /var/state/opengl-driver
       ${if videoDriver == "nvidia"        
         then "ln -sf ${nvidiaDrivers} /var/state/opengl-driver"
@@ -295,9 +313,13 @@ rec {
         then "ln -sf ${mesa} /var/state/opengl-driver"
         else ""
        }
+
+       rm -f /var/log/slim.log
+       
     end script
 
     env SLIM_CFGFILE=${slimConfig}
+    env SLIM_THEMESDIR=${slimThemesDir}
     env FONTCONFIG_FILE=/etc/fonts/fonts.conf  				# !!! cleanup
     env XKB_BINDIR=${xorg.xkbcomp}/bin         				# Needed for the Xkb extension.
     env LD_LIBRARY_PATH=${libX11}/lib:${libXext}/lib:/usr/lib/          # related to xorg-sys-opengl - needed to load libglx for (AI)GLX support (for compiz)
-- 
GitLab


From 29c5178bdfb2b851f2a19a62d95c93a2dfec7ed1 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 8 Jun 2007 15:41:12 +0000
Subject: [PATCH 0566/5331] * Declarative specification of user accounts.  Jobs
 can now specify a   list of user accounts that the job needs to run.  For
 instance, the   SSH daemon job says:

    { name = "sshd";
      uid = (import ../system/ids.nix).uids.sshd;
      description = "SSH privilege separation user";
      home = "/var/empty";
    }

  The activation script creates the system users/groups and updates
  them as well.  So a change in the Nix expression can be realised in
  /etc/{group,passwd} by running nixos-rebuild.

svn path=/nixos/trunk/; revision=8846
---
 helpers/create-users-groups.sh   | 60 ++++++++++++++++++++++++++
 system/activate-configuration.sh | 28 ++++---------
 system/ids.nix                   | 21 ++++++++++
 system/system.nix                |  5 +++
 system/users-groups.nix          | 72 ++++++++++++++++++++++++++++++++
 upstart-jobs/default.nix         |  4 +-
 upstart-jobs/httpd.nix           | 11 ++---
 upstart-jobs/make-job.nix        | 18 ++++++--
 upstart-jobs/nscd.nix            | 12 +++---
 upstart-jobs/ntpd.nix            | 13 +++---
 upstart-jobs/samba.nix           | 28 +++++++------
 upstart-jobs/sshd.nix            | 17 ++++----
 12 files changed, 228 insertions(+), 61 deletions(-)
 create mode 100644 helpers/create-users-groups.sh
 create mode 100644 system/ids.nix
 create mode 100644 system/users-groups.nix

diff --git a/helpers/create-users-groups.sh b/helpers/create-users-groups.sh
new file mode 100644
index 00000000000..da168650897
--- /dev/null
+++ b/helpers/create-users-groups.sh
@@ -0,0 +1,60 @@
+cat "$2" | while true; do
+    read name || break
+    read gid
+
+    if ! curEnt=$(getent group "$name"); then
+        echo "creating group $name..."
+        groupadd --system \
+            "$name" \
+            ${gid:+--gid $gid}
+    else
+        echo "updating group $name..."
+        oldIFS="$IFS"; IFS=:; set -- $curEnt; IFS="$oldIFS"
+        prevGid=$3
+        if test "$prevGid" != "$gid"; then
+            groupmod "$name" --gid $gid
+        fi
+    fi
+done
+
+
+cat "$1" | while true; do
+    read name || break
+    read description
+    read uid
+    read group
+    read extraGroups
+    read home
+    read shell
+
+    if ! curEnt=$(getent passwd "$name"); then
+        echo "creating user $name..."
+        useradd --system \
+            "$name" \
+            --comment "$description" \
+            ${uid:+--uid $uid} \
+            --gid "$group" \
+            --groups "$extraGroups" \
+            --home "$home" \
+            --shell "$shell"
+    else
+        echo "updating user $name..."
+        oldIFS="$IFS"; IFS=:; set -- $curEnt; IFS="$oldIFS"
+        prevUid=$3
+        prevHome=$6
+        # Don't change the UID if it's the same, otherwise usermod
+        # will complain.
+        if test "$prevUid" = "$uid"; then unset uid; fi
+        # Don't change the home directory if it's the same to prevent
+        # unnecessary warnings about logged in users.
+        if test "$prevHome" = "$home"; then unset home; fi
+        usermod \
+            "$name" \
+            --comment "$description" \
+            ${uid:+--uid $uid} \
+            --gid "$group" \
+            --groups "$extraGroups" \
+            ${home:+--home "$home"} \
+            --shell "$shell"
+    fi
+done
diff --git a/system/activate-configuration.sh b/system/activate-configuration.sh
index 105acba4cb4..3dbae8faec0 100644
--- a/system/activate-configuration.sh
+++ b/system/activate-configuration.sh
@@ -64,6 +64,10 @@ touch /var/log/lastlog
 chmod 644 /var/log/lastlog
 
 
+# Empty, read-only home directory of many system accounts.
+mkdir -m 0555 -p /var/empty
+
+
 # If there is no password file yet, create a root account with an
 # empty password.
 if ! test -e /etc/passwd; then
@@ -71,37 +75,21 @@ if ! test -e /etc/passwd; then
     touch /etc/passwd; chmod 0644 /etc/passwd
     touch /etc/group; chmod 0644 /etc/group
     touch /etc/shadow; chmod 0600 /etc/shadow
-    # Can't use useradd, since it complain that it doesn't know us
+    # Can't use useradd, since it complains that it doesn't know us
     # (bootstrap problem!). 
     echo "root:x:0:0:System administrator:$rootHome:@defaultShell@" >> /etc/passwd
     echo "root::::::::" >> /etc/shadow
-    groupadd -g 0 root
     echo | passwd --stdin root
 fi
 
 
-# Some more required accounts/groups.
-if ! getent group nogroup > /dev/null; then
-    groupadd -g 65534 nogroup
-fi
+# Create system users and groups.
+@shell@ @createUsersGroups@ @usersList@ @groupsList@
 
 
-# Set up Nix accounts.
+# Set up Nix.
 if test -z "@readOnlyRoot@"; then
 
-    if ! getent group nixbld > /dev/null; then
-        groupadd -g 30000 nixbld
-    fi
-
-    for i in $(seq 1 10); do
-        account=nixbld$i
-        if ! getent passwd $account > /dev/null; then
-            useradd -u $((i + 30000)) -g nogroup -G nixbld \
-                -d /var/empty -s /noshell \
-                -c "Nix build user $i" $account
-        fi
-    done
-
     mkdir -p /nix/etc/nix
     cat > /nix/etc/nix/nix.conf <<EOF
 # WARNING: this file is generated.
diff --git a/system/ids.nix b/system/ids.nix
new file mode 100644
index 00000000000..08b387feabe
--- /dev/null
+++ b/system/ids.nix
@@ -0,0 +1,21 @@
+{
+
+  uids = {
+    root = 0;
+    nscd = 1;
+    sshd = 2;
+    ntp = 3;
+    messagebus = 4; # D-Bus
+    haldaemon = 5;
+    nixbld = 30000; # start of range of uids
+    nobody = 65534;
+  };
+
+  gids = {
+    root = 0;
+    users = 100;
+    nixbld = 30000;
+    nogroup = 65534;
+  };
+
+}
diff --git a/system/system.nix b/system/system.nix
index fdc96fdbca9..42d560493ae 100644
--- a/system/system.nix
+++ b/system/system.nix
@@ -228,6 +228,9 @@ rec {
   };
 
 
+  usersGroups = import ./users-groups.nix { inherit pkgs upstartJobs defaultShell; };
+
+
   defaultShell = "/var/run/current-system/sw/bin/bash";
 
     
@@ -247,6 +250,8 @@ rec {
       config.get ["security" "extraSetuidPrograms"];
     maxJobs = config.get ["nix" "maxJobs"];
 
+    inherit (usersGroups) createUsersGroups usersList groupsList;
+
     path = [
       pkgs.coreutils pkgs.gnugrep pkgs.findutils
       pkgs.glibc # needed for getent
diff --git a/system/users-groups.nix b/system/users-groups.nix
new file mode 100644
index 00000000000..dc51fceaec4
--- /dev/null
+++ b/system/users-groups.nix
@@ -0,0 +1,72 @@
+{pkgs, upstartJobs, defaultShell}:
+
+let ids = import ./ids.nix; in
+
+rec {
+
+  # System user accounts.
+  systemUsers =
+    let
+      jobUsers = pkgs.lib.concatLists (map (job: job.users) upstartJobs.jobs);
+      
+      defaultUsers =
+        [
+          { name = "root";
+            uid = ids.uids.root;
+            description = "System administrator";
+            home = "/root";
+            shell = defaultShell;
+          }
+          { name = "nobody";
+            uid = ids.uids.nobody;
+            description = "Unprivileged account (don't use!)";
+          }
+        ];
+      
+      makeNixBuildUser = nr:
+        { name = "nixbld${toString nr}";
+          description = "Nix build user ${toString nr}";
+          uid = builtins.add ids.uids.nixbld nr;
+          extraGroups = ["nixbld"];
+        };
+        
+      nixBuildUsers = map makeNixBuildUser (pkgs.lib.range 1 10);
+      
+      addAttrs =
+        { name
+        , description
+        , uid ? ""
+        , group ? "nogroup"
+        , extraGroups ? []
+        , home ? "/var/empty"
+        , shell ? "/noshell"
+        }:
+        { inherit name description uid group extraGroups home shell; };
+
+    in map addAttrs (defaultUsers ++ jobUsers ++ nixBuildUsers);
+
+
+  # System groups.
+  systemGroups =
+    [
+      { name = "root";
+        gid = ids.gids.root;
+      }
+      { name = "nogroup";
+        gid = ids.gids.nogroup;
+      }
+      { name = "users";
+        gid = ids.gids.users;
+      }
+      { name = "nixbld";
+        gid = ids.gids.nixbld;
+      }
+    ];
+
+
+  # Awful hackery necessary to pass the users/groups to the activation script.
+  createUsersGroups = ../helpers/create-users-groups.sh;
+  usersList = pkgs.writeText "users" (pkgs.lib.concatStrings (map (u: "${u.name}\n${u.description}\n${toString u.uid}\n${u.group}\n${toString u.extraGroups}\n${u.home}\n${u.shell}\n") systemUsers));
+  groupsList = pkgs.writeText "groups" (pkgs.lib.concatStrings (map (g: "${g.name}\n${toString g.gid}\n") systemGroups));
+    
+}
\ No newline at end of file
diff --git a/upstart-jobs/default.nix b/upstart-jobs/default.nix
index 6fdffa6ba55..91267d89b6a 100644
--- a/upstart-jobs/default.nix
+++ b/upstart-jobs/default.nix
@@ -235,8 +235,6 @@ import ../upstart-jobs/gather.nix {
   ++ (map makeJob (config.get ["services" "extraJobs"]))
 
   # For the built-in logd job.
-  ++ [
-    (pkgs.upstart // {extraPath = []; extraEtc = [];})
-  ];
+  ++ [(makeJob { jobDrv = pkgs.upstart; })];
   
 }
diff --git a/upstart-jobs/httpd.nix b/upstart-jobs/httpd.nix
index 20c6cb7a331..1dcd6b1ba71 100644
--- a/upstart-jobs/httpd.nix
+++ b/upstart-jobs/httpd.nix
@@ -81,6 +81,12 @@ in
 {
   name = "httpd";
   
+  users = [
+    { name = user;
+      description = "Apache httpd user";
+    }
+  ];
+  
   job = "
 description \"Apache HTTPD\"
 
@@ -92,11 +98,6 @@ start script
         ${pwdutils}/sbin/groupadd ${group}
     fi
 
-    if ! ${glibc}/bin/getent passwd ${user} > /dev/null; then
-        ${pwdutils}/sbin/useradd -g ${group} -d /var/empty -s /noshell \\
-            -c 'Apache httpd user' ${user}
-    fi
-
     ${webServer}/bin/control prepare    
 end script
 
diff --git a/upstart-jobs/make-job.nix b/upstart-jobs/make-job.nix
index d263a6d44f7..f6841ad26a1 100644
--- a/upstart-jobs/make-job.nix
+++ b/upstart-jobs/make-job.nix
@@ -1,15 +1,25 @@
 {runCommand}: job:
 
 (
-  runCommand job.name {inherit (job) job;}
-    "ensureDir $out/etc/event.d; echo \"$job\" > $out/etc/event.d/$name"
+  if job ? jobDrv then
+    job.jobDrv
+  else
+    (
+      runCommand job.name {inherit (job) job;}
+        "ensureDir $out/etc/event.d; echo \"$job\" > $out/etc/event.d/$name"
+    )
 )
 
 //
 
-# Allow jobs to declare extra packages that should be added to the
-# system path, as well as extra files that should be added to /etc.
 {
+  # Allow jobs to declare extra packages that should be added to the
+  # system path.
   extraPath = if job ? extraPath then job.extraPath else [];
+
+  # Allow jobs to declare extra files that should be added to /etc.
   extraEtc = if job ? extraEtc then job.extraEtc else [];
+
+  # Allow jobs to declare user accounts that should be created.
+  users = if job ? users then job.users else [];
 }
diff --git a/upstart-jobs/nscd.nix b/upstart-jobs/nscd.nix
index 2fcc86229b1..b2a01cc5c4d 100644
--- a/upstart-jobs/nscd.nix
+++ b/upstart-jobs/nscd.nix
@@ -3,6 +3,13 @@
 {
   name = "nscd";
   
+  users = [
+    { name = "nscd";
+      uid = (import ../system/ids.nix).uids.nscd;
+      description = "Name service cache daemon user";
+    }
+  ];
+  
   job = "
 description \"Name Service Cache Daemon\"
 
@@ -13,11 +20,6 @@ env LD_LIBRARY_PATH=${nssModulesPath}
 
 start script
 
-    if ! ${glibc}/bin/getent passwd nscd > /dev/null; then
-        ${pwdutils}/sbin/useradd -g nogroup -d /var/empty -s /noshell \\
-            -c 'Name service cache daemon user' nscd
-    fi
-
     mkdir -m 0755 -p /var/run/nscd
     mkdir -m 0755 -p /var/db/nscd
 
diff --git a/upstart-jobs/ntpd.nix b/upstart-jobs/ntpd.nix
index a59c3343a74..1cd1c9eb7b5 100644
--- a/upstart-jobs/ntpd.nix
+++ b/upstart-jobs/ntpd.nix
@@ -19,6 +19,14 @@ in
 {
   name = "ntpd";
   
+  users = [
+    { name = ntpUser;
+      uid = (import ../system/ids.nix).uids.ntp;
+      description = "NTP daemon user";
+      home = stateDir;
+    }
+  ];
+  
   job = "
 description \"NTP daemon\"
 
@@ -28,11 +36,6 @@ stop on shutdown
 
 start script
 
-    if ! ${glibc}/bin/getent passwd ${ntpUser} > /dev/null; then
-        ${pwdutils}/sbin/useradd -g nogroup -d ${stateDir} -s /noshell \\
-            -c 'NTP daemon user' ${ntpUser}
-    fi
-
     mkdir -m 0755 -p ${stateDir}
     chown ${ntpUser} ${stateDir}
 
diff --git a/upstart-jobs/samba.nix b/upstart-jobs/samba.nix
index a19d9dee3fd..69a9b51c4a2 100644
--- a/upstart-jobs/samba.nix
+++ b/upstart-jobs/samba.nix
@@ -2,13 +2,21 @@
 
 let
   
-  user="smbguest";
-  group="smbguest";
+  user = "smbguest";
+  group = "smbguest";
+  
 in
 
 {
   name = "samba";
 
+  users = [
+    { name = user;
+      description = "Samba service user";
+      group = group;
+    }
+  ];
+  
   job = "
 
 description \"Samba Service\"
@@ -18,17 +26,13 @@ stop on network-interfaces/stop
 
 start script
 
- if ! ${glibc}/bin/getent group ${group} > /dev/null; then
-      ${pwdutils}/sbin/groupadd ${group}
- fi
-
- if ! ${glibc}/bin/getent passwd ${user} > /dev/null; then
-      ${pwdutils}/sbin/useradd -g ${group} -d /var/empty -s /noshell -c 'Samba service user' ${user}
- fi
+  if ! ${glibc}/bin/getent group ${group} > /dev/null; then
+       ${pwdutils}/sbin/groupadd ${group}
+  fi
 
- ${samba}/sbin/nmbd -D &
- ${samba}/sbin/smbd -D &
- ${samba}/sbin/winbindd -B &
+  ${samba}/sbin/nmbd -D &
+  ${samba}/sbin/smbd -D &
+  ${samba}/sbin/winbindd -B &
 
 end script
 
diff --git a/upstart-jobs/sshd.nix b/upstart-jobs/sshd.nix
index cc2c4ddea1b..d5b4da33c21 100644
--- a/upstart-jobs/sshd.nix
+++ b/upstart-jobs/sshd.nix
@@ -22,10 +22,20 @@ let
     
   ";
 
+  sshdUid = (import ../system/ids.nix).uids.sshd;
+
 in
 
 {
   name = "sshd";
+
+  users = [
+    { name = "sshd";
+      uid = (import ../system/ids.nix).uids.sshd;
+      description = "SSH privilege separation user";
+      home = "/var/empty";
+    }
+  ];
   
   job = "
 description \"SSH server\"
@@ -36,18 +46,11 @@ stop on network-interfaces/stop
 env LD_LIBRARY_PATH=${nssModulesPath}
 
 start script
-    mkdir -m 0555 -p /var/empty
-
     mkdir -m 0755 -p /etc/ssh
 
     if ! test -f /etc/ssh/ssh_host_dsa_key; then
         ${openssh}/bin/ssh-keygen -t dsa -b 1024 -f /etc/ssh/ssh_host_dsa_key -N ''
     fi
-
-    if ! ${glibc}/bin/getent passwd sshd > /dev/null; then
-        ${pwdutils}/sbin/useradd -g nogroup -d /var/empty -s /noshell \\
-            -c 'SSH privilege separation user' sshd
-    fi
 end script
 
 respawn ${openssh}/sbin/sshd -D -h /etc/ssh/ssh_host_dsa_key -f ${sshdConfig}
-- 
GitLab


From f70df0b275b21700371994fef9c5bfc358c14bbf Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 8 Jun 2007 18:56:55 +0000
Subject: [PATCH 0567/5331] * Added a job to start the D-Bus system-wide
 message bus daemon.

svn path=/nixos/trunk/; revision=8848
---
 system/options.nix       | 10 +++++++
 upstart-jobs/dbus.nix    | 56 ++++++++++++++++++++++++++++++++++++++++
 upstart-jobs/default.nix |  6 +++++
 3 files changed, 72 insertions(+)
 create mode 100644 upstart-jobs/dbus.nix

diff --git a/system/options.nix b/system/options.nix
index 11ec89bb601..2364d91c9e0 100644
--- a/system/options.nix
+++ b/system/options.nix
@@ -792,6 +792,16 @@
   }
 
   
+  {
+    name = ["services" "dbus" "enable"];
+    default = true;
+    description = "
+      Whether to start the D-Bus message bus daemon.  It is required
+      by the HAL service.
+    ";
+  }
+
+  
   {
     name = ["installer" "nixpkgsURL"];
     default = "";
diff --git a/upstart-jobs/dbus.nix b/upstart-jobs/dbus.nix
new file mode 100644
index 00000000000..58357ad1aab
--- /dev/null
+++ b/upstart-jobs/dbus.nix
@@ -0,0 +1,56 @@
+{stdenv, dbus}:
+
+let
+
+  homeDir = "/var/run/dbus";
+
+  # Take the standard system configuration file, except that we don't
+  # want to fork (Upstart will monitor the daemon).
+  configFile = stdenv.mkDerivation {
+    name = "dbus-conf";
+    buildCommand = "
+      ensureDir $out
+      ensureDir $out/system.d
+      substitute ${dbus}/etc/dbus-1/system.conf $out/system.conf \\
+        --replace '<fork/>' ''
+    ";
+  };
+
+in
+
+{
+  name = "dbus";
+  
+  users = [
+    { name = "messagebus";
+      uid = (import ../system/ids.nix).uids.messagebus;
+      description = "D-Bus system message bus daemon user";
+      home = homeDir;
+    }
+  ];
+  
+  job = "
+description \"D-Bus system message bus daemon\"
+
+start on startup
+stop on shutdown
+
+start script
+
+    mkdir -m 0755 -p ${homeDir}
+    chown messagebus ${homeDir}
+
+    mkdir -m 0755 -p /var/lib/dbus
+    ${dbus}/bin/dbus-uuidgen --ensure
+
+end script
+
+respawn
+
+script
+    rm -f ${homeDir}/pid
+    exec ${dbus}/bin/dbus-daemon --config-file=${configFile}/system.conf
+end script
+  ";
+  
+}
diff --git a/upstart-jobs/default.nix b/upstart-jobs/default.nix
index 91267d89b6a..9cab516539d 100644
--- a/upstart-jobs/default.nix
+++ b/upstart-jobs/default.nix
@@ -182,6 +182,12 @@ import ../upstart-jobs/gather.nix {
       inherit (pkgs) alsaUtils;
     })
 
+  # D-Bus system-wide daemon.
+  ++ optional ["services"  "dbus" "enable"]
+    (import ../upstart-jobs/dbus.nix {
+      inherit (pkgs) stdenv dbus;
+    })
+
   # Handles the reboot/halt events.
   ++ (map
     (event: makeJob (import ../upstart-jobs/halt.nix {
-- 
GitLab


From 02514fc802f0f86d9d3dadef677444cfc8bba54f Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sat, 9 Jun 2007 19:46:57 +0000
Subject: [PATCH 0568/5331] * /var/state -> /var/run.

svn path=/nixos/trunk/; revision=8852
---
 upstart-jobs/xserver.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/upstart-jobs/xserver.nix b/upstart-jobs/xserver.nix
index 8ca9cc0e4e7..edd224bcfa4 100644
--- a/upstart-jobs/xserver.nix
+++ b/upstart-jobs/xserver.nix
@@ -306,11 +306,11 @@ rec {
 
     start script
     
-      rm -f /var/state/opengl-driver
+      rm -f /var/run/opengl-driver
       ${if videoDriver == "nvidia"        
-        then "ln -sf ${nvidiaDrivers} /var/state/opengl-driver"
+        then "ln -sf ${nvidiaDrivers} /var/run/opengl-driver"
 	else if getCfg "driSupport"
-        then "ln -sf ${mesa} /var/state/opengl-driver"
+        then "ln -sf ${mesa} /var/run/opengl-driver"
         else ""
        }
 
-- 
GitLab


From 258ef4bf19aa64d59a2cefcc1e3618c280b64943 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sat, 9 Jun 2007 20:05:04 +0000
Subject: [PATCH 0569/5331] * Upstart job for HAL.

svn path=/nixos/trunk/; revision=8854
---
 system/options.nix       |  9 +++++++++
 upstart-jobs/dbus.nix    | 10 ++++++++--
 upstart-jobs/default.nix |  8 ++++++++
 upstart-jobs/hal.nix     | 37 +++++++++++++++++++++++++++++++++++++
 4 files changed, 62 insertions(+), 2 deletions(-)
 create mode 100644 upstart-jobs/hal.nix

diff --git a/system/options.nix b/system/options.nix
index 2364d91c9e0..49ad563b925 100644
--- a/system/options.nix
+++ b/system/options.nix
@@ -802,6 +802,15 @@
   }
 
   
+  {
+    name = ["services" "hal" "enable"];
+    default = true;
+    description = "
+      Whether to start the HAL daemon.
+    ";
+  }
+
+  
   {
     name = ["installer" "nixpkgsURL"];
     default = "";
diff --git a/upstart-jobs/dbus.nix b/upstart-jobs/dbus.nix
index 58357ad1aab..d57b032524d 100644
--- a/upstart-jobs/dbus.nix
+++ b/upstart-jobs/dbus.nix
@@ -1,4 +1,4 @@
-{stdenv, dbus}:
+{stdenv, dbus, dbusServices ? []}:
 
 let
 
@@ -10,9 +10,13 @@ let
     name = "dbus-conf";
     buildCommand = "
       ensureDir $out
-      ensureDir $out/system.d
       substitute ${dbus}/etc/dbus-1/system.conf $out/system.conf \\
         --replace '<fork/>' ''
+
+      ensureDir $out/system.d
+      for i in ${toString dbusServices}; do
+        ln -s $i/etc/dbus-1/system.d/* $out/system.d/
+      done
     ";
   };
 
@@ -29,6 +33,8 @@ in
     }
   ];
   
+  extraPath = [dbus];
+  
   job = "
 description \"D-Bus system message bus daemon\"
 
diff --git a/upstart-jobs/default.nix b/upstart-jobs/default.nix
index 9cab516539d..e4a804ba3a2 100644
--- a/upstart-jobs/default.nix
+++ b/upstart-jobs/default.nix
@@ -186,6 +186,14 @@ import ../upstart-jobs/gather.nix {
   ++ optional ["services"  "dbus" "enable"]
     (import ../upstart-jobs/dbus.nix {
       inherit (pkgs) stdenv dbus;
+      dbusServices =
+        pkgs.lib.optional (config.get ["services"  "hal" "enable"]) pkgs.hal;
+    })
+
+  # HAL daemon.
+  ++ optional ["services"  "hal" "enable"]
+    (import ../upstart-jobs/hal.nix {
+      inherit (pkgs) stdenv hal;
     })
 
   # Handles the reboot/halt events.
diff --git a/upstart-jobs/hal.nix b/upstart-jobs/hal.nix
new file mode 100644
index 00000000000..097722d0641
--- /dev/null
+++ b/upstart-jobs/hal.nix
@@ -0,0 +1,37 @@
+{stdenv, hal}:
+
+let
+
+  homeDir = "/var/run/dbus";
+
+in
+
+{
+  name = "hal";
+  
+  users = [
+    { name = "haldaemon";
+      uid = (import ../system/ids.nix).uids.haldaemon;
+      description = "HAL daemon user";
+#      home = homeDir;
+    }
+  ];
+
+  extraPath = [hal];
+  
+  job = "
+description \"HAL daemon\"
+
+start on dbus
+stop on shutdown
+
+start script
+
+    mkdir -m 0755 -p /var/cache/hald
+
+end script
+
+respawn ${hal}/sbin/hald --daemon=no --verbose=yes
+  ";
+  
+}
-- 
GitLab


From ea9e6bdbaceef805f3a9636ee5d6e4e43f810bd6 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sat, 9 Jun 2007 21:12:48 +0000
Subject: [PATCH 0570/5331] * Re-enable some essential X server modules (in
 particular   extmod, which contains XVideo).

svn path=/nixos/trunk/; revision=8857
---
 upstart-jobs/xserver.conf | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/upstart-jobs/xserver.conf b/upstart-jobs/xserver.conf
index 7865577cd06..d8f6cb0f905 100644
--- a/upstart-jobs/xserver.conf
+++ b/upstart-jobs/xserver.conf
@@ -12,13 +12,13 @@ EndSection
 
 
 Section "Module"
-  Load "i2c"
   Load "bitmap"
-  Load "ddc"
+  Load "dbe"
+  Load "extmod"
   Load "freetype"
   Load "int10"
+  Load "type1"
   Load "vbe"
-
   @moduleSection@
 EndSection
 
@@ -74,6 +74,7 @@ Section "Device"
   Identifier   "Device[0]"
   Driver       "@videoDriver@"
   Option       "Clone" "On"
+  #Option       "MonitorLayout" "CRT,LFP"
   Option       "MonitorLayout" "LVDS,CRT"
   @device@
 EndSection
-- 
GitLab


From 1f1db4c48f2e00f600c6136dcb8ba93cce25d5cb Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sun, 10 Jun 2007 20:02:07 +0000
Subject: [PATCH 0571/5331] * Use pam_console to change the ownership of
 various devices (sound,   CD-ROM drive, etc.) to the logged in user.  Woohoo!
  Finally, no   more chown /dev/snd/*. * Get rid of spurious error messages
 about pam_ldap when we're not   using LDAP.

svn path=/nixos/trunk/; revision=8861
---
 etc/default.nix                  | 28 +++++++++--
 etc/pam.d/common                 |  8 ++--
 etc/pam.d/common-console         |  1 +
 etc/pam.d/login                  |  1 +
 etc/pam.d/slim                   |  1 +
 etc/security/console.perms       | 79 ++++++++++++++++++++++++++++++++
 system/activate-configuration.sh |  3 +-
 7 files changed, 112 insertions(+), 9 deletions(-)
 create mode 100644 etc/pam.d/common-console
 create mode 100644 etc/security/console.perms

diff --git a/etc/default.nix b/etc/default.nix
index 6614b612423..46874f162ba 100644
--- a/etc/default.nix
+++ b/etc/default.nix
@@ -2,15 +2,32 @@
 
 let 
 
+
   optional = option: file:
     if config.get option then [file] else [];
 
+
+  # !!! ugh, these files shouldn't be created here.
+    
+    
   envConf = pkgs.writeText "environment" "
     PATH=${systemPath}/bin:${systemPath}/sbin:${pkgs.openssh}/bin
     NIX_REMOTE=daemon
-  " /* ${pkgs.openssh}/bin is a hack to get remote scp to work */; 
+  " /* ${pkgs.openssh}/bin is a hack to get remote scp to work */;
+
+
+  # Don't indent this file!
+  pamConsoleHandlers = pkgs.writeText "console.handlers" "
+console consoledevs /dev/tty[0-9][0-9]* :[0-9]\.[0-9] :[0-9]
+${pkgs.pam_console}/sbin/pam_console_apply lock logfail wait -t tty -s -c ${pamConsolePerms}
+${pkgs.pam_console}/sbin/pam_console_apply unlock logfail wait -r -t tty -s -c ${pamConsolePerms}
+";
+
+  pamConsolePerms = ./security/console.perms;
+
 
 in
+
     
 import ../helpers/make-etc.nix {
   inherit (pkgs) stdenv;
@@ -126,15 +143,17 @@ import ../helpers/make-etc.nix {
   # A bunch of PAM configuration files for various programs.
   ++ (map
     (program:
+      let isLDAPEnabled = config.get ["users" "ldap" "enable"]; in
       { source = pkgs.substituteAll {
           src = ./pam.d + ("/" + program);
-          inherit (pkgs) pam_unix2;
+          inherit (pkgs) pam_unix2 pam_console;
           pam_ldap =
-            if config.get ["users" "ldap" "enable"]
+            if isLDAPEnabled
             then pkgs.pam_ldap
             else "/no-such-path";
           inherit (pkgs.xorg) xauth;
-          inherit envConf;
+          inherit envConf pamConsoleHandlers;
+          isLDAPEnabled = if isLDAPEnabled then "" else "#";
         };
         target = "pam.d/" + program;
       }
@@ -150,6 +169,7 @@ import ../helpers/make-etc.nix {
       "useradd"
       "chsh"
       "common"
+      "common-console" # shared stuff for interactive local sessions
     ]
   )
 
diff --git a/etc/pam.d/common b/etc/pam.d/common
index ad460a0feb9..146dc1c0e16 100644
--- a/etc/pam.d/common
+++ b/etc/pam.d/common
@@ -1,13 +1,13 @@
-auth     sufficient     @pam_ldap@/lib/security/pam_ldap.so 
+@isLDAPEnabled@  auth     sufficient     @pam_ldap@/lib/security/pam_ldap.so 
 auth     sufficient     @pam_unix2@/lib/security/pam_unix2.so
 auth     required       pam_deny.so
 
-account  optional       @pam_ldap@/lib/security/pam_ldap.so 
+@isLDAPEnabled@  account  optional       @pam_ldap@/lib/security/pam_ldap.so 
 account  required       @pam_unix2@/lib/security/pam_unix2.so
 
-password sufficient     @pam_ldap@/lib/security/pam_ldap.so 
+@isLDAPEnabled@  password sufficient     @pam_ldap@/lib/security/pam_ldap.so 
 password sufficient     @pam_unix2@/lib/security/pam_unix2.so nullok
 
-session  optional       @pam_ldap@/lib/security/pam_ldap.so 
+@isLDAPEnabled@  session  optional       @pam_ldap@/lib/security/pam_ldap.so 
 session  required       @pam_unix2@/lib/security/pam_unix2.so
 session  optional       pam_env.so envfile=@envConf@
diff --git a/etc/pam.d/common-console b/etc/pam.d/common-console
new file mode 100644
index 00000000000..1534ac15401
--- /dev/null
+++ b/etc/pam.d/common-console
@@ -0,0 +1 @@
+session  optional       @pam_console@/lib/security/pam_console.so debug handlersfile=@pamConsoleHandlers@
diff --git a/etc/pam.d/login b/etc/pam.d/login
index 50f3cc5ce60..dac4fec866c 100644
--- a/etc/pam.d/login
+++ b/etc/pam.d/login
@@ -2,3 +2,4 @@ auth     include        common
 account  include        common
 password include        common
 session  include        common
+session  include        common-console
diff --git a/etc/pam.d/slim b/etc/pam.d/slim
index 50f3cc5ce60..dac4fec866c 100644
--- a/etc/pam.d/slim
+++ b/etc/pam.d/slim
@@ -2,3 +2,4 @@ auth     include        common
 account  include        common
 password include        common
 session  include        common
+session  include        common-console
diff --git a/etc/security/console.perms b/etc/security/console.perms
new file mode 100644
index 00000000000..c5d9b4aa693
--- /dev/null
+++ b/etc/security/console.perms
@@ -0,0 +1,79 @@
+# This file determines the permissions that will be given to priviledged
+# users of the console at login time, and the permissions to which to
+# revert when the users log out.
+
+# format is:
+#   <class>=list of regexps specifying consoles or globs specifying files
+#   file-glob|<class> perm dev-regex|<dev-class> \
+#     revert-mode revert-owner[.revert-group]
+# the revert-mode, revert-owner, and revert-group are optional, and default
+# to 0600, root, and root, respectively.
+#
+# For more information:
+# man 5 console.perms
+
+# file classes -- these are regular expressions
+<console>=/dev/tty[0-9][0-9]* :[0-9]\.[0-9] :[0-9]
+<xconsole>=:[0-9]\.[0-9] :[0-9]
+
+# device classes -- these are shell-style globs
+<floppy>=/dev/fd[0-1]* \
+	 /dev/floppy* /mnt/floppy*
+<sound>=/dev/dsp* /dev/audio* /dev/midi* \
+	/dev/mixer* /dev/sequencer* \
+	/dev/sound/* /dev/beep \
+	/dev/snd/* 
+<cdrom>=/dev/cdrom* /dev/cdroms/* /dev/cdwriter* /mnt/cdrom*
+<pilot>=/dev/pilot
+<jaz>=/mnt/jaz*
+<zip>=/mnt/pocketzip* /mnt/zip* /dev/zip*
+<ls120>=/dev/ls120 /mnt/ls120*
+<scanner>=/dev/scanner* /dev/usb/scanner*
+<rio500>=/dev/usb/rio500
+<camera>=/mnt/camera* /dev/usb/dc2xx* /dev/usb/mdc800*
+<memstick>=/mnt/memstick*
+<flash>=/mnt/flash* /dev/flash*
+<diskonkey>=/mnt/diskonkey*
+<rem_ide>=/mnt/microdrive*
+<fb>=/dev/fb /dev/fb[0-9]* \
+     /dev/fb/*
+<kbd>=/dev/kbd
+<joystick>=/dev/js[0-9]*
+<v4l>=/dev/video* /dev/radio* /dev/winradio* /dev/vtx* /dev/vbi* \
+      /dev/video/*
+<gpm>=/dev/gpmctl
+<dri>=/dev/nvidia* /dev/3dfx* /dev/dri/card*
+<mainboard>=/dev/apm_bios
+<pmu>=/dev/pmu
+<bluetooth>=/dev/rfcomm*
+<raw1394>=/dev/raw1394
+<irda>=/dev/ircomm*
+
+# permission definitions
+<console>  0660 <floppy>
+<console>  0600 <sound>
+<console>  0600 <cdrom>
+<console>  0600 <pilot>
+<console>  0600 <jaz>
+<console>  0600 <zip>
+<console>  0600 <ls120>
+<console>  0600 <scanner>
+<console>  0600 <camera>
+<console>  0600 <memstick>
+<console>  0600 <flash>
+<console>  0600 <diskonkey>
+<console>  0600 <rem_ide>
+<console>  0600 <fb>
+<console>  0600 <kbd>
+<console>  0600 <joystick>
+<console>  0600 <v4l>
+<console>  0700 <gpm>
+<console>  0600 <mainboard>
+<console>  0600 <rio500>
+<console>  0600 <pmu>
+<console>  0600 <bluetooth>
+<console>  0600 <raw1394>
+<console>  0600 <irda>
+
+<xconsole> 0600 /dev/console
+<console>  0600 <dri>
diff --git a/system/activate-configuration.sh b/system/activate-configuration.sh
index 3dbae8faec0..cd80ec502a7 100644
--- a/system/activate-configuration.sh
+++ b/system/activate-configuration.sh
@@ -49,8 +49,9 @@ ln -sfn @bash@/bin/sh $mountPoint/bin/sh
 echo @modprobe@/sbin/modprobe > /proc/sys/kernel/modprobe
 
 
-# Various log directories.
+# Various log/runtime directories.
 mkdir -m 0755 -p /var/run
+mkdir -m 0755 -p /var/run/console # for pam_console
 
 touch /var/run/utmp # must exist
 chmod 644 /var/run/utmp
-- 
GitLab


From 4d4387a70e12a30edc45d8b2690b7455baeb1b18 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sun, 10 Jun 2007 20:13:12 +0000
Subject: [PATCH 0572/5331] * Allow jobs to specify groups.

svn path=/nixos/trunk/; revision=8862
---
 system/ids.nix            |  1 +
 system/users-groups.nix   | 38 ++++++++++++++++++++++++--------------
 upstart-jobs/default.nix  | 10 +++++-----
 upstart-jobs/hal.nix      | 13 ++++++-------
 upstart-jobs/httpd.nix    | 11 ++++++-----
 upstart-jobs/make-job.nix |  3 +++
 upstart-jobs/nscd.nix     |  2 +-
 upstart-jobs/ntpd.nix     |  2 +-
 upstart-jobs/samba.nix    | 11 ++++++-----
 upstart-jobs/sshd.nix     |  2 +-
 10 files changed, 54 insertions(+), 39 deletions(-)

diff --git a/system/ids.nix b/system/ids.nix
index 08b387feabe..90fcda5199d 100644
--- a/system/ids.nix
+++ b/system/ids.nix
@@ -13,6 +13,7 @@
 
   gids = {
     root = 0;
+    haldaemon = 5;
     users = 100;
     nixbld = 30000;
     nogroup = 65534;
diff --git a/system/users-groups.nix b/system/users-groups.nix
index dc51fceaec4..62c2a9d626d 100644
--- a/system/users-groups.nix
+++ b/system/users-groups.nix
@@ -48,20 +48,30 @@ rec {
 
   # System groups.
   systemGroups =
-    [
-      { name = "root";
-        gid = ids.gids.root;
-      }
-      { name = "nogroup";
-        gid = ids.gids.nogroup;
-      }
-      { name = "users";
-        gid = ids.gids.users;
-      }
-      { name = "nixbld";
-        gid = ids.gids.nixbld;
-      }
-    ];
+    let
+      jobGroups = pkgs.lib.concatLists (map (job: job.groups) upstartJobs.jobs);
+
+      defaultGroups = 
+        [
+          { name = "root";
+            gid = ids.gids.root;
+          }
+          { name = "nogroup";
+            gid = ids.gids.nogroup;
+          }
+          { name = "users";
+            gid = ids.gids.users;
+          }
+          { name = "nixbld";
+            gid = ids.gids.nixbld;
+          }
+        ];
+
+      addAttrs =
+        { name, gid ? "" }:
+        { inherit name gid; };
+
+    in map addAttrs (defaultGroups ++ jobGroups);
 
 
   # Awful hackery necessary to pass the users/groups to the activation script.
diff --git a/upstart-jobs/default.nix b/upstart-jobs/default.nix
index e4a804ba3a2..6e12233c97b 100644
--- a/upstart-jobs/default.nix
+++ b/upstart-jobs/default.nix
@@ -87,7 +87,7 @@ import ../upstart-jobs/gather.nix {
 
     # Name service cache daemon.
     (import ../upstart-jobs/nscd.nix {
-      inherit (pkgs) glibc pwdutils;
+      inherit (pkgs) glibc;
       inherit nssModulesPath;
     })
 
@@ -128,7 +128,7 @@ import ../upstart-jobs/gather.nix {
   # SSH daemon.
   ++ optional ["services" "sshd" "enable"]
     (import ../upstart-jobs/sshd.nix {
-      inherit (pkgs) writeText openssh glibc pwdutils;
+      inherit (pkgs) writeText openssh glibc;
       inherit (pkgs.xorg) xauth;
       inherit nssModulesPath;
       forwardX11 = config.get ["services" "sshd" "forwardX11"];
@@ -139,7 +139,7 @@ import ../upstart-jobs/gather.nix {
   ++ optional ["services" "ntp" "enable"]
     (import ../upstart-jobs/ntpd.nix {
       inherit modprobe;
-      inherit (pkgs) ntp glibc pwdutils writeText;
+      inherit (pkgs) ntp glibc writeText;
       servers = config.get ["services" "ntp" "servers"];
     })
 
@@ -159,14 +159,14 @@ import ../upstart-jobs/gather.nix {
   ++ optional ["services" "httpd" "enable"]
     (import ../upstart-jobs/httpd.nix {
       inherit config pkgs;
-      inherit (pkgs) glibc pwdutils;
+      inherit (pkgs) glibc;
     })
 
   # Samba service.
   ++ optional ["services" "samba" "enable"]
     (import ../upstart-jobs/samba.nix {
       inherit pkgs;
-      inherit (pkgs) glibc pwdutils samba;
+      inherit (pkgs) glibc samba;
     })
 
   # CUPS (printing) daemon.
diff --git a/upstart-jobs/hal.nix b/upstart-jobs/hal.nix
index 097722d0641..0770ba3ce31 100644
--- a/upstart-jobs/hal.nix
+++ b/upstart-jobs/hal.nix
@@ -1,11 +1,5 @@
 {stdenv, hal}:
 
-let
-
-  homeDir = "/var/run/dbus";
-
-in
-
 {
   name = "hal";
   
@@ -13,7 +7,12 @@ in
     { name = "haldaemon";
       uid = (import ../system/ids.nix).uids.haldaemon;
       description = "HAL daemon user";
-#      home = homeDir;
+    }
+  ];
+
+  groups = [
+    { name = "haldaemon";
+      gid = (import ../system/ids.nix).gids.haldaemon;
     }
   ];
 
diff --git a/upstart-jobs/httpd.nix b/upstart-jobs/httpd.nix
index 1dcd6b1ba71..864b0ee9bdf 100644
--- a/upstart-jobs/httpd.nix
+++ b/upstart-jobs/httpd.nix
@@ -1,4 +1,4 @@
-{config, pkgs, glibc, pwdutils}:
+{config, pkgs, glibc}:
 
 let
 
@@ -86,6 +86,11 @@ in
       description = "Apache httpd user";
     }
   ];
+
+  groups = [
+    { name = group;
+    }
+  ];
   
   job = "
 description \"Apache HTTPD\"
@@ -94,10 +99,6 @@ start on network-interfaces/started
 stop on network-interfaces/stop
 
 start script
-    if ! ${glibc}/bin/getent group ${group} > /dev/null; then
-        ${pwdutils}/sbin/groupadd ${group}
-    fi
-
     ${webServer}/bin/control prepare    
 end script
 
diff --git a/upstart-jobs/make-job.nix b/upstart-jobs/make-job.nix
index f6841ad26a1..faffc0cdcff 100644
--- a/upstart-jobs/make-job.nix
+++ b/upstart-jobs/make-job.nix
@@ -22,4 +22,7 @@
 
   # Allow jobs to declare user accounts that should be created.
   users = if job ? users then job.users else [];
+  
+  # Allow jobs to declare groups that should be created.
+  groups = if job ? groups then job.groups else [];
 }
diff --git a/upstart-jobs/nscd.nix b/upstart-jobs/nscd.nix
index b2a01cc5c4d..c88c219c63b 100644
--- a/upstart-jobs/nscd.nix
+++ b/upstart-jobs/nscd.nix
@@ -1,4 +1,4 @@
-{glibc, pwdutils, nssModulesPath}:
+{glibc, nssModulesPath}:
 
 {
   name = "nscd";
diff --git a/upstart-jobs/ntpd.nix b/upstart-jobs/ntpd.nix
index 1cd1c9eb7b5..d03d6a2cf7f 100644
--- a/upstart-jobs/ntpd.nix
+++ b/upstart-jobs/ntpd.nix
@@ -1,4 +1,4 @@
-{ntp, modprobe, glibc, pwdutils, writeText, servers}:
+{ntp, modprobe, glibc, writeText, servers}:
 
 let
 
diff --git a/upstart-jobs/samba.nix b/upstart-jobs/samba.nix
index 69a9b51c4a2..fa4cbf70859 100644
--- a/upstart-jobs/samba.nix
+++ b/upstart-jobs/samba.nix
@@ -1,4 +1,4 @@
-{pkgs, samba, glibc, pwdutils}:
+{pkgs, samba, glibc}:
 
 let
   
@@ -17,6 +17,11 @@ in
     }
   ];
   
+  groups = [
+    { name = group;
+    }
+  ];
+  
   job = "
 
 description \"Samba Service\"
@@ -26,10 +31,6 @@ stop on network-interfaces/stop
 
 start script
 
-  if ! ${glibc}/bin/getent group ${group} > /dev/null; then
-       ${pwdutils}/sbin/groupadd ${group}
-  fi
-
   ${samba}/sbin/nmbd -D &
   ${samba}/sbin/smbd -D &
   ${samba}/sbin/winbindd -B &
diff --git a/upstart-jobs/sshd.nix b/upstart-jobs/sshd.nix
index d5b4da33c21..4e3ac2b7d02 100644
--- a/upstart-jobs/sshd.nix
+++ b/upstart-jobs/sshd.nix
@@ -1,4 +1,4 @@
-{ writeText, openssh, glibc, pwdutils, xauth
+{ writeText, openssh, glibc, xauth
 , nssModulesPath
 , forwardX11, allowSFTP
 }:
-- 
GitLab


From f3f16dc16911fead6c3a2eb5514059c0117d4615 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sun, 10 Jun 2007 20:17:51 +0000
Subject: [PATCH 0573/5331] * ALSA requires a group named "audio".

svn path=/nixos/trunk/; revision=8863
---
 system/ids.nix        |  1 +
 upstart-jobs/alsa.nix | 10 +++++++++-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/system/ids.nix b/system/ids.nix
index 90fcda5199d..cb48ffd10f8 100644
--- a/system/ids.nix
+++ b/system/ids.nix
@@ -14,6 +14,7 @@
   gids = {
     root = 0;
     haldaemon = 5;
+    audio = 17;
     users = 100;
     nixbld = 30000;
     nogroup = 65534;
diff --git a/upstart-jobs/alsa.nix b/upstart-jobs/alsa.nix
index 1afca3c4554..319918117da 100644
--- a/upstart-jobs/alsa.nix
+++ b/upstart-jobs/alsa.nix
@@ -10,7 +10,15 @@ in
   name = "alsa";
 
   extraPath = [alsaUtils];
-  
+
+  # Alsalib seems to require the existence of this group, even if it's
+  # not used (e.g., doesn't own any devices).
+  groups = [
+    { name = "audio";
+      gid = (import ../system/ids.nix).gids.audio;
+    }
+  ];
+
   job = "
 start on hardware-scan
 stop on shutdown
-- 
GitLab


From c819d76ec70ba31c901da5898fe9d0fa17526d50 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 15 Jun 2007 11:40:57 +0000
Subject: [PATCH 0574/5331] * Option boot.extraGrubEntries to add arbitrary
 text to Grub's menu.lst.

svn path=/nixos/trunk/; revision=8883
---
 installer/grub-menu-builder.sh |  8 ++++++++
 system/options.nix             | 13 +++++++++++++
 system/system.nix              |  1 +
 3 files changed, 22 insertions(+)

diff --git a/installer/grub-menu-builder.sh b/installer/grub-menu-builder.sh
index 50d8205f8ec..a1afcf63bf2 100644
--- a/installer/grub-menu-builder.sh
+++ b/installer/grub-menu-builder.sh
@@ -65,6 +65,14 @@ if test -n "$tmp"; then
 fi
 
 
+# Additional entries specified verbatim by the configuration.
+cat >> $tmp <<EOF
+
+@extraGrubEntries@
+
+EOF
+
+
 # Add all generations of the system profile to the menu, in reverse
 # (most recent to least recent) order.
 for generation in $(
diff --git a/system/options.nix b/system/options.nix
index 49ad563b925..99df9153ac5 100644
--- a/system/options.nix
+++ b/system/options.nix
@@ -189,6 +189,19 @@
   }
 
 
+  {
+    name = ["boot" "extraGrubEntries"];
+    default = "";
+    example = "
+      title Windows
+        chainloader (hd0,1)+1
+    ";
+    description = "
+      Any additional entries you want added to the Grub boot menu.
+    ";
+  }
+
+
   { 
     name = ["networking" "hostName"];
     default = "nixos";
diff --git a/system/system.nix b/system/system.nix
index 42d560493ae..14bb3f5a708 100644
--- a/system/system.nix
+++ b/system/system.nix
@@ -288,6 +288,7 @@ rec {
     inherit (pkgs) bash;
     path = [pkgs.coreutils pkgs.gnused pkgs.gnugrep];
     copyKernels = config.get ["boot" "copyKernels"];
+    extraGrubEntries = config.get ["boot" "extraGrubEntries"];
   };
 
 
-- 
GitLab


From 9ad649ea369ed881c5ed779a7a2e7a050673776b Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Mon, 18 Jun 2007 20:33:30 +0000
Subject: [PATCH 0575/5331] Added services tree checkout - needed, for example,
 for apache-httpd

svn path=/nixos/trunk/; revision=8890
---
 installer/nixos-checkout.sh | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/installer/nixos-checkout.sh b/installer/nixos-checkout.sh
index a1defc3f1ce..b4767d292e1 100644
--- a/installer/nixos-checkout.sh
+++ b/installer/nixos-checkout.sh
@@ -21,9 +21,14 @@ if test -e nixpkgs -a ! -e nixpkgs/.svn; then
     mv nixpkgs nixpkgs-$backupTimestamp
 fi
 
+if test -e nixos/services -a ! -e nixos/services/.svn; then
+    mv nixos/services services-$backupTimestamp
+fi
+
 # Check out the NixOS and Nixpkgs sources.
 svn co https://svn.cs.uu.nl:12443/repos/trace/nixos/trunk nixos
 svn co https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk nixpkgs
+svn co https://svn.cs.uu.nl:12443/repos/trace/services/trunk nixos/services
 
 # A few symlink.
 ln -sfn ../nixpkgs/pkgs nixos/pkgs
-- 
GitLab


From 0e92d411245d4f2c269cad45d6d7059d4d1f9413 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Thu, 21 Jun 2007 17:14:33 +0000
Subject: [PATCH 0576/5331] Added configuration.nix option to add entries into
 nix.conf .

svn path=/nixos/trunk/; revision=8910
---
 system/activate-configuration.sh |  3 +++
 system/options.nix               | 11 +++++++++++
 system/system.nix                |  1 +
 3 files changed, 15 insertions(+)

diff --git a/system/activate-configuration.sh b/system/activate-configuration.sh
index cd80ec502a7..e0527962369 100644
--- a/system/activate-configuration.sh
+++ b/system/activate-configuration.sh
@@ -96,6 +96,9 @@ if test -z "@readOnlyRoot@"; then
 # WARNING: this file is generated.
 build-users-group = nixbld
 build-max-jobs = @maxJobs@
+
+@extraNixOptions@
+
 EOF
 
     chown root.nixbld /nix/store
diff --git a/system/options.nix b/system/options.nix
index 99df9153ac5..5bbc1e99707 100644
--- a/system/options.nix
+++ b/system/options.nix
@@ -847,6 +847,17 @@
     ";
   }
 
+  {
+    name = ["nix" "extraOptions"];
+    default = "";
+    example = "
+	gc-keep-outputs = true
+	gc-keep-derivations = true
+    ";
+    description = "
+	This option allows to append lines to nix.conf. 
+    ";
+  }
   
   {
     name = ["security" "setuidPrograms"];
diff --git a/system/system.nix b/system/system.nix
index 14bb3f5a708..e1371d68f4a 100644
--- a/system/system.nix
+++ b/system/system.nix
@@ -249,6 +249,7 @@ rec {
       config.get ["security" "setuidPrograms"] ++
       config.get ["security" "extraSetuidPrograms"];
     maxJobs = config.get ["nix" "maxJobs"];
+    extraNixOptions = config.get ["nix" "extraOptions"];
 
     inherit (usersGroups) createUsersGroups usersList groupsList;
 
-- 
GitLab


From f0d157037792a8f695b173be7f3cfeb60f0a8e66 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Sat, 23 Jun 2007 15:48:09 +0000
Subject: [PATCH 0577/5331] Added kernel selection parameter, boot.useKernel

svn path=/nixos/trunk/; revision=8914
---
 system/options.nix | 10 ++++++++++
 system/system.nix  | 14 +++++++++-----
 2 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/system/options.nix b/system/options.nix
index 5bbc1e99707..8c276ae24cf 100644
--- a/system/options.nix
+++ b/system/options.nix
@@ -55,6 +55,16 @@
     ";
   }
 
+  {
+	name = ["boot" "useKernel"];
+	default = pkgs :(pkgs.kernel);
+	description = "
+	Function that takes package collection and returns kernel 
+	package. Do not collect old generations after changing it
+	until you get to boot successfully. In principle, you can 
+	specify a kernel that will build, but not boot.
+	";
+  }
 
   {
     name = ["boot" "kernelParams"];
diff --git a/system/system.nix b/system/system.nix
index e1371d68f4a..75630e44777 100644
--- a/system/system.nix
+++ b/system/system.nix
@@ -29,6 +29,7 @@ rec {
 
   nix = pkgs.nixUnstable; # we need the exportReferencesGraph feature
 
+  useKernel = (config.get ["boot" "useKernel"]) pkgs;
 
   rootModules = 
     (config.get ["boot" "initrd" "extraKernelModules"]) ++
@@ -37,7 +38,8 @@ rec {
 
   # Determine the set of modules that we need to mount the root FS.
   modulesClosure = import ../helpers/modules-closure.nix {
-    inherit (pkgs) stdenv kernel module_init_tools;
+    inherit (pkgs) stdenv module_init_tools;
+    kernel = useKernel;
     inherit rootModules;
   };
 
@@ -136,7 +138,8 @@ rec {
     dir = "sbin";
     src = ./modprobe;
     isExecutable = true;
-    inherit (pkgs) kernel module_init_tools;
+    inherit (pkgs) module_init_tools;
+    kernel = useKernel;
   };
 
 
@@ -242,7 +245,7 @@ rec {
     isExecutable = true;
 
     inherit etc wrapperDir systemPath modprobe defaultShell;
-    inherit (pkgs) kernel;
+    kernel = useKernel;
     readOnlyRoot = config.get ["boot" "readOnlyRoot"];
     hostName = config.get ["networking" "hostName"];
     setuidPrograms =
@@ -267,7 +270,8 @@ rec {
   # everything else to bring up the system.
   bootStage2 = import ../boot/boot-stage-2.nix {
     inherit (pkgs) substituteAll writeText coreutils 
-      utillinux kernel udev upstart;
+      utillinux udev upstart;
+    kernel = useKernel;
     inherit activateConfiguration;
     readOnlyRoot = config.get ["boot" "readOnlyRoot"];
     upstartPath = [
@@ -312,7 +316,7 @@ rec {
     inherit grubMenuBuilder;
     inherit etc;
     inherit systemPath;
-    kernel = pkgs.kernel + "/vmlinuz";
+    kernel = useKernel + "/vmlinuz";
     initrd = initialRamdisk + "/initrd";
     # Most of these are needed by grub-install.
     path = [
-- 
GitLab


From 58b29cd5655e0698464a8f92566f5f267b7a2f5b Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Sat, 23 Jun 2007 16:09:05 +0000
Subject: [PATCH 0578/5331] Added possibility to give configurations custom
 names.

svn path=/nixos/trunk/; revision=8915
---
 installer/grub-menu-builder.sh | 12 ++++++++++--
 system/options.nix             |  9 +++++++++
 system/system.nix              |  1 +
 system/system.sh               |  1 +
 4 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/installer/grub-menu-builder.sh b/installer/grub-menu-builder.sh
index a1afcf63bf2..7e1e6b4cad1 100644
--- a/installer/grub-menu-builder.sh
+++ b/installer/grub-menu-builder.sh
@@ -24,6 +24,7 @@ GRUBEND
 addEntry() {
     local name="$1"
     local path="$2"
+    local shortSuffix="$3"
 
     if ! test -e $path/kernel -a -e $path/initrd; then
         return
@@ -46,6 +47,13 @@ addEntry() {
         initrd=$initrd2
     fi
     
+    local confName=$(if test -e $path/configuration-name; then 
+	cat $path/configuration-name; 
+    fi);
+    if test -n "$confName" ; then
+	name="$confName $3";
+    fi;
+
     cat >> $tmp << GRUBEND
 title $name
   kernel $kernel systemConfig=$(readlink -f $path) init=$(readlink -f $path/init) $(cat $path/kernel-params)
@@ -61,7 +69,7 @@ fi
 
 
 if test -n "$tmp"; then
-    addEntry "NixOS - Default" $default
+    addEntry "NixOS - Default" $default ""
 fi
 
 
@@ -82,7 +90,7 @@ for generation in $(
     echo $generation
     link=/nix/var/nix/profiles/system-$generation-link
     date=$(stat --printf="%y\n" $link | sed 's/\..*//')
-    addEntry "NixOS - Configuration $generation ($date)" $link
+    addEntry "NixOS - Configuration $generation ($date)" $link "$generation ($date)"
 done
 
 
diff --git a/system/options.nix b/system/options.nix
index 8c276ae24cf..2379fa0aaf0 100644
--- a/system/options.nix
+++ b/system/options.nix
@@ -66,6 +66,15 @@
 	";
   }
 
+  {
+	name = ["boot" "configurationName"];
+        default = "";
+        example = "Stable 2.6.21";
+        description = "
+	Grub entry name instead of default.
+	";
+  }
+
   {
     name = ["boot" "kernelParams"];
     default = [
diff --git a/system/system.nix b/system/system.nix
index 75630e44777..a5a44f04015 100644
--- a/system/system.nix
+++ b/system/system.nix
@@ -327,6 +327,7 @@ rec {
       pkgs.diffutils
       pkgs.upstart # for initctl
     ];
+    configurationName = config.get ["boot" "configurationName"];
   };
 
 
diff --git a/system/system.sh b/system/system.sh
index 321260777e3..0df4273e5a2 100644
--- a/system/system.sh
+++ b/system/system.sh
@@ -11,6 +11,7 @@ ln -s $etc/etc $out/etc
 ln -s $systemPath $out/sw
 
 echo "$kernelParams" > $out/kernel-params
+echo "$configurationName" > $out/configuration-name
 
 cat > $out/menu.lst << GRUBEND
 kernel $kernel init=$bootStage2 $kernelParams
-- 
GitLab


From cd1023c50dea75a44fcb9335b1aa4e159abc2dda Mon Sep 17 00:00:00 2001
From: "Yury G. Kudryashov" <urkud.urkud@gmail.com>
Date: Thu, 28 Jun 2007 09:57:36 +0000
Subject: [PATCH 0579/5331] * Added boot.initrd.lvm flag for use NixOS with
 LVM2 root partition. * Added sis support for xserver.

svn path=/nixos/trunk/; revision=8924
---
 boot/boot-stage-1-init.sh | 7 +++++++
 system/options.nix        | 8 ++++++++
 system/system.nix         | 8 ++++++++
 upstart-jobs/default.nix  | 2 +-
 upstart-jobs/lvm.nix      | 5 +++--
 upstart-jobs/xserver.nix  | 1 +
 6 files changed, 28 insertions(+), 3 deletions(-)

diff --git a/boot/boot-stage-1-init.sh b/boot/boot-stage-1-init.sh
index 391c24e7b3f..3b1d4d6a9fa 100644
--- a/boot/boot-stage-1-init.sh
+++ b/boot/boot-stage-1-init.sh
@@ -73,6 +73,13 @@ udevd --daemon
 udevtrigger
 udevsettle
 
+if type -p dmsetup > /dev/null; then
+  echo "dmsetup found, starting device mapper and lvm"
+  dmsetup mknodes
+  vgscan --ignorelockingfailure
+  vgchange -ay --ignorelockingfailure
+fi
+
 if test -n "$debug1devices"; then fail; fi
 
 
diff --git a/system/options.nix b/system/options.nix
index 2379fa0aaf0..da07cd1011d 100644
--- a/system/options.nix
+++ b/system/options.nix
@@ -177,6 +177,14 @@
     ";
   }
 
+  {
+    name = ["boot" "initrd" "lvm"];
+    default = false;
+    description = "
+      Whether to include lvm in the initial ramdisk. You should use this option
+      if your ROOT device is on lvm volume.
+    ";
+  }
 
   {
     name = ["boot" "initrd" "enableSplashScreen"];
diff --git a/system/system.nix b/system/system.nix
index a5a44f04015..c094cdf2676 100644
--- a/system/system.nix
+++ b/system/system.nix
@@ -52,10 +52,18 @@ rec {
       inherit (pkgsStatic) utillinux;
       inherit (pkgsDiet) udev;
       e2fsprogs = pkgs.e2fsprogsDiet;
+      devicemapper = if config.get ["boot" "initrd" "lvm"] then pkgs.devicemapperStatic else null;
+      lvm2 = if config.get ["boot" "initrd" "lvm"] then pkgs.lvm2Static else null;
       allowedReferences = []; # prevent accidents like glibc being included in the initrd
     }
     "
       ensureDir $out/bin
+      if [ -n $devicemapper ]; then
+        cp $devicemapper/sbin/dmsetup.static $out/bin/dmsetup
+        cp $lvm2/sbin/lvm.static $out/bin/lvm
+        ln -s lvm $out/bin/vgscan
+        ln -s lvm $out/bin/vgchange
+      fi
       cp $utillinux/bin/mount $utillinux/bin/umount $utillinux/sbin/pivot_root $out/bin
       cp -p $e2fsprogs/sbin/fsck* $e2fsprogs/sbin/e2fsck $out/bin
       cp $udev/sbin/udevd $udev/sbin/udevtrigger $udev/sbin/udevsettle $out/bin
diff --git a/upstart-jobs/default.nix b/upstart-jobs/default.nix
index 6e12233c97b..4a47034be74 100644
--- a/upstart-jobs/default.nix
+++ b/upstart-jobs/default.nix
@@ -36,7 +36,7 @@ import ../upstart-jobs/gather.nix {
     # Makes LVM logical volumes available. 
     (import ../upstart-jobs/lvm.nix {
       inherit modprobe;
-      inherit (pkgs) lvm2;
+      inherit (pkgs) lvm2 devicemapper;
     })
       
     # Activate software RAID arrays.
diff --git a/upstart-jobs/lvm.nix b/upstart-jobs/lvm.nix
index ee6e842564c..d860224685e 100644
--- a/upstart-jobs/lvm.nix
+++ b/upstart-jobs/lvm.nix
@@ -1,4 +1,4 @@
-{modprobe, lvm2}:
+{modprobe, lvm2, devicemapper}:
 
 {
   name = "lvm";
@@ -12,9 +12,10 @@ script
     # Load the device mapper.
     ${modprobe}/sbin/modprobe dm_mod || true
 
+    ${devicemapper}/sbin/dmsetup mknodes
     # Scan for block devices that might contain LVM physical volumes
     # and volume groups.
-    #${lvm2}/sbin/vgscan
+    ${lvm2}/sbin/vgscan --mknodes
 
     # Make all logical volumes on all volume groups available, i.e.,
     # make them appear in /dev.
diff --git a/upstart-jobs/xserver.nix b/upstart-jobs/xserver.nix
index edd224bcfa4..beb50eac45d 100644
--- a/upstart-jobs/xserver.nix
+++ b/upstart-jobs/xserver.nix
@@ -60,6 +60,7 @@ let
       xorg.xf86inputmouse
     ] 
     ++ optional (videoDriver == "vesa") xorg.xf86videovesa
+    ++ optional (videoDriver == "sis") xorg.xf86videosis
     ++ optional (videoDriver == "i810") xorg.xf86videoi810
     ++ optional (videoDriver == "intel") xorg.xf86videointel;
 
-- 
GitLab


From 2cfd8c9a3a4510fa4bf9802ee855c22b177b5931 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 5 Jul 2007 14:19:48 +0000
Subject: [PATCH 0580/5331] * Work properly when lvm is disabled.

svn path=/nixos/trunk/; revision=8947
---
 system/system.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/system/system.nix b/system/system.nix
index c094cdf2676..a2a677d8e47 100644
--- a/system/system.nix
+++ b/system/system.nix
@@ -58,7 +58,7 @@ rec {
     }
     "
       ensureDir $out/bin
-      if [ -n $devicemapper ]; then
+      if test -n \"$devicemapper\"; then
         cp $devicemapper/sbin/dmsetup.static $out/bin/dmsetup
         cp $lvm2/sbin/lvm.static $out/bin/lvm
         ln -s lvm $out/bin/vgscan
-- 
GitLab


From bf1033d2cb520d412a0752c24093db6f8e06db13 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Mon, 9 Jul 2007 11:21:04 +0000
Subject: [PATCH 0581/5331] Added Gateway6 upstart-job and options for it. Sudo
 configuration for PAM is added (it is needed anyway), but still only NOPASSWD
 entries work.

svn path=/nixos/trunk/; revision=8966
---
 etc/default.nix          |  1 +
 etc/pam.d/sudo           |  4 ++++
 system/options.nix       | 31 +++++++++++++++++++++++++++++++
 upstart-jobs/default.nix |  7 +++++++
 upstart-jobs/gw6c.nix    | 25 +++++++++++++++++++++++++
 5 files changed, 68 insertions(+)
 create mode 100644 etc/pam.d/sudo
 create mode 100644 upstart-jobs/gw6c.nix

diff --git a/etc/default.nix b/etc/default.nix
index 46874f162ba..c61e87c4c7e 100644
--- a/etc/default.nix
+++ b/etc/default.nix
@@ -162,6 +162,7 @@ import ../helpers/make-etc.nix {
       "login"
       "slim"
       "su"
+      "sudo"
       "other"
       "passwd"
       "shadow"
diff --git a/etc/pam.d/sudo b/etc/pam.d/sudo
new file mode 100644
index 00000000000..50f3cc5ce60
--- /dev/null
+++ b/etc/pam.d/sudo
@@ -0,0 +1,4 @@
+auth     include        common
+account  include        common
+password include        common
+session  include        common
diff --git a/system/options.nix b/system/options.nix
index da07cd1011d..d421e8d767b 100644
--- a/system/options.nix
+++ b/system/options.nix
@@ -1028,6 +1028,37 @@
     ";
   }
 
+  {
+	name = ["services" "gw6c" "enable"];
+	default = false;
+	description = "
+	Whether to enable Gateway6 client (IPv6 tunnel).
+";
+  }
+
+  {
+	name = ["services" "gw6c" "username"];
+	default = "";
+	description = "
+	Your Gateway6 login name, if any.
+";
+  }
 
+  {
+	name = ["services" "gw6c" "password"];
+	default = "";
+	description = "
+	Your Gateway6 password, if any.
+";
+  }
 
+  {
+	name = ["services" "gw6c" "server"];
+	default = "anon.freenet6.net";
+	example = "broker.freenet6.net";
+	description = "
+	Used Gateway6 server.
+";
+  }
+  
 ]
diff --git a/upstart-jobs/default.nix b/upstart-jobs/default.nix
index 4a47034be74..2f59794d5bb 100644
--- a/upstart-jobs/default.nix
+++ b/upstart-jobs/default.nix
@@ -175,6 +175,13 @@ import ../upstart-jobs/gather.nix {
       inherit (pkgs) writeText cups;
     })
 
+  # Gateway6
+  ++ optional ["services" "gw6c" "enable"]
+    (import ../upstart-jobs/gw6c.nix {
+      inherit config pkgs;
+    })
+
+
   # ALSA sound support.
   ++ optional ["sound" "enable"]
     (import ../upstart-jobs/alsa.nix {
diff --git a/upstart-jobs/gw6c.nix b/upstart-jobs/gw6c.nix
new file mode 100644
index 00000000000..faf1519d2a9
--- /dev/null
+++ b/upstart-jobs/gw6c.nix
@@ -0,0 +1,25 @@
+{config, pkgs}:
+let
+	getCfg = option: config.get ["services" "gw6c" option];
+	procps = pkgs.procps;
+	gw6cService = import ../services/gw6c {
+		inherit (pkgs) stdenv gw6c coreutils 
+		procps upstart nettools;
+		username = getCfg "username";
+		password = getCfg "password";
+		server = getCfg "server";
+	};
+in
+{
+	name = "gw6c";
+	users = [];
+	groups = [];
+	job = "
+description \"Gateway6 client\"
+
+start on network/interfaces started
+stop on network/interfaces stop
+
+respawn ${gw6cService}/bin/control start
+";
+}
-- 
GitLab


From 055a950331634cd0b86d4209f4a5f081e0f744d4 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Sun, 15 Jul 2007 11:16:01 +0000
Subject: [PATCH 0582/5331] Apache httpd customization - extraDirectories &
 noUserDir .

svn path=/nixos/trunk/; revision=8985
---
 system/options.nix     | 22 ++++++++++++++++++++++
 upstart-jobs/httpd.nix |  8 ++++++--
 2 files changed, 28 insertions(+), 2 deletions(-)

diff --git a/system/options.nix b/system/options.nix
index d421e8d767b..7496c910de5 100644
--- a/system/options.nix
+++ b/system/options.nix
@@ -736,6 +736,28 @@
     ";
   }
 
+  {
+    name = ["services" "httpd" "noUserDir"];
+    default = true;
+    description = "
+	Set to false to let users to publish ~/public_html as /~user.
+";
+  }
+
+  {
+    name = ["services" "httpd" "extraDirectories"];
+    default = "";
+    example = "
+	<Directory /home>
+		Options FollowSymlinks
+		AllowOverride All
+	</Directory>
+";
+    description = "
+	These lines go to httpd.conf verbatim. They will go after
+	directories and directory aliases defined by default.
+";
+  }
   
   {
     name = ["services" "httpd" "subservices" "subversion" "enable"];
diff --git a/upstart-jobs/httpd.nix b/upstart-jobs/httpd.nix
index 864b0ee9bdf..276df7971fd 100644
--- a/upstart-jobs/httpd.nix
+++ b/upstart-jobs/httpd.nix
@@ -20,12 +20,16 @@ let
   logDir = getCfg "logDir";
   stateDir = getCfg "stateDir";
   enableSSL = false;
+  noUserDir = getCfg "noUserDir";
+  extraDirectories = getCfg "extraDirectories";
   
   webServer = import ../services/apache-httpd {
-    inherit (pkgs) stdenv apacheHttpd coreutils;
+    inherit (pkgs) apacheHttpd coreutils;
+    stdenv = pkgs.stdenvNewSetupScript;
 
     inherit hostName httpPort httpsPort
-      user group adminAddr logDir stateDir;
+      user group adminAddr logDir stateDir
+      noUserDir extraDirectories;
     
     subServices =
     
-- 
GitLab


From 13f94dacc5b9f966a29b5b175670d3399e39ab3b Mon Sep 17 00:00:00 2001
From: Wouter den Breejen <uu@denbreejen.net>
Date: Fri, 20 Jul 2007 12:33:46 +0000
Subject: [PATCH 0583/5331] Added mirrors for bootsplash.de files

svn path=/nixos/trunk/; revision=9008
---
 system/options.nix | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/system/options.nix b/system/options.nix
index 7496c910de5..5d4128231f7 100644
--- a/system/options.nix
+++ b/system/options.nix
@@ -397,7 +397,8 @@
   {
     name = ["services" "ttyBackgrounds" "defaultTheme"];
     default = pkgs.fetchurl {
-      url = http://www.bootsplash.de/files/themes/Theme-BabyTux.tar.bz2;
+      #url = http://www.bootsplash.de/files/themes/Theme-BabyTux.tar.bz2;
+      url = http://www.mirrorservice.org/sites/www.ibiblio.org/gentoo/distfiles/Theme-BabyTux.tar.bz2;
       md5 = "a6d89d1c1cff3b6a08e2f526f2eab4e0";
     };
     description = "
@@ -420,7 +421,8 @@
       */
       { tty = 10;
         theme = pkgs.fetchurl {
-          url = http://www.bootsplash.de/files/themes/Theme-GNU.tar.bz2;
+          #url = http://www.bootsplash.de/files/themes/Theme-GNU.tar.bz2;
+          url = http://www.mirrorservice.org/sites/www.ibiblio.org/gentoo/distfiles/Theme-GNU.tar.bz2;
           md5 = "61969309d23c631e57b0a311102ef034";
         };
       }
-- 
GitLab


From 333d0dfe17a111345607c3838d8a19f1b5ad2c1a Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sun, 22 Jul 2007 02:07:02 +0000
Subject: [PATCH 0584/5331] * Forward udev events to HAL.

svn path=/nixos/trunk/; revision=9016
---
 upstart-jobs/default.nix |  6 ++++--
 upstart-jobs/udev.nix    | 10 +++++++++-
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/upstart-jobs/default.nix b/upstart-jobs/default.nix
index 2f59794d5bb..0b16a98cf5d 100644
--- a/upstart-jobs/default.nix
+++ b/upstart-jobs/default.nix
@@ -30,7 +30,9 @@ import ../upstart-jobs/gather.nix {
       inherit (pkgs) stdenv writeText substituteAll udev procps;
       inherit (pkgs.lib) cleanSource;
       firmwareDirs =
-        (if config.get ["networking" "enableIntel2200BGFirmware"] then [pkgs.ipw2200fw] else []);
+        pkgs.lib.optional (config.get ["networking" "enableIntel2200BGFirmware"]) pkgs.ipw2200fw;
+      extraUdevPkgs =
+        pkgs.lib.optional (config.get ["services" "hal" "enable"]) pkgs.hal;
     })
       
     # Makes LVM logical volumes available. 
@@ -194,7 +196,7 @@ import ../upstart-jobs/gather.nix {
     (import ../upstart-jobs/dbus.nix {
       inherit (pkgs) stdenv dbus;
       dbusServices =
-        pkgs.lib.optional (config.get ["services"  "hal" "enable"]) pkgs.hal;
+        pkgs.lib.optional (config.get ["services" "hal" "enable"]) pkgs.hal;
     })
 
   # HAL daemon.
diff --git a/upstart-jobs/udev.nix b/upstart-jobs/udev.nix
index 0bdb9b9cb74..c29c4b5c5eb 100644
--- a/upstart-jobs/udev.nix
+++ b/upstart-jobs/udev.nix
@@ -1,4 +1,6 @@
-{stdenv, writeText, substituteAll, cleanSource, udev, procps, firmwareDirs}:
+{ stdenv, writeText, substituteAll, cleanSource, udev, procps, firmwareDirs
+, extraUdevPkgs ? []
+}:
 
 let
 
@@ -18,6 +20,12 @@ let
       for i in $src/*; do
         substituteAll $i $out/$(basename $i)
       done
+      shopt -s nullglob
+      for i in ${toString extraUdevPkgs}; do
+        for j in $i/etc/udev/rules.d/*; do
+          ln -s $j $out/$(basename $j)
+        done
+      done
     ";
   };
 
-- 
GitLab


From 8843f3c287bb686570b64023611a1ac6f2cfa73d Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Thu, 2 Aug 2007 21:26:38 +0000
Subject: [PATCH 0585/5331] Corrected dependencies for gw6c; also made httpd
 depend on gw6c if needed.

svn path=/nixos/trunk/; revision=9029
---
 upstart-jobs/gw6c.nix  | 4 ++--
 upstart-jobs/httpd.nix | 7 +++++--
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/upstart-jobs/gw6c.nix b/upstart-jobs/gw6c.nix
index faf1519d2a9..812d4081bab 100644
--- a/upstart-jobs/gw6c.nix
+++ b/upstart-jobs/gw6c.nix
@@ -17,8 +17,8 @@ in
 	job = "
 description \"Gateway6 client\"
 
-start on network/interfaces started
-stop on network/interfaces stop
+start on network-interfaces/started
+stop on network-interfaces/stop
 
 respawn ${gw6cService}/bin/control start
 ";
diff --git a/upstart-jobs/httpd.nix b/upstart-jobs/httpd.nix
index 276df7971fd..eec1583293a 100644
--- a/upstart-jobs/httpd.nix
+++ b/upstart-jobs/httpd.nix
@@ -22,6 +22,9 @@ let
   enableSSL = false;
   noUserDir = getCfg "noUserDir";
   extraDirectories = getCfg "extraDirectories";
+
+  startingDependency = if (config.get [ "services" "gw6c" "enable" ]) 
+	then "gw6c" else "network-interfaces";
   
   webServer = import ../services/apache-httpd {
     inherit (pkgs) apacheHttpd coreutils;
@@ -99,8 +102,8 @@ in
   job = "
 description \"Apache HTTPD\"
 
-start on network-interfaces/started
-stop on network-interfaces/stop
+start on ${startingDependency}/started
+stop on ${startingDependency}/stop
 
 start script
     ${webServer}/bin/control prepare    
-- 
GitLab


From bb25a6ef96f2af632a306ebabc682d741928f4c7 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Wed, 8 Aug 2007 20:42:25 +0000
Subject: [PATCH 0586/5331] Added short keep-alive period to gw6c, added
 ircd-hybrid service.

svn path=/nixos/trunk/; revision=9071
---
 etc/profile.sh               |  1 +
 system/options.nix           | 87 +++++++++++++++++++++++++++++++++++-
 upstart-jobs/default.nix     |  5 +++
 upstart-jobs/gw6c.nix        |  4 +-
 upstart-jobs/ircd-hybrid.nix | 37 +++++++++++++++
 5 files changed, 132 insertions(+), 2 deletions(-)
 create mode 100644 upstart-jobs/ircd-hybrid.nix

diff --git a/etc/profile.sh b/etc/profile.sh
index 5bbe4ab97a1..b6ba962efe6 100644
--- a/etc/profile.sh
+++ b/etc/profile.sh
@@ -1,6 +1,7 @@
 export PATH=@wrapperDir@:/var/run/current-system/sw/bin:/var/run/current-system/sw/sbin
 export MODULE_DIR=@kernel@/lib/modules
 export NIX_CONF_DIR=/nix/etc/nix
+export NIXPKGS_CONFIG=/nix/etc/config.nix
 export PAGER=less
 export TZ=@timeZone@
 export TZDIR=@glibc@/share/zoneinfo
diff --git a/system/options.nix b/system/options.nix
index 5d4128231f7..81e4ec9efbf 100644
--- a/system/options.nix
+++ b/system/options.nix
@@ -1084,5 +1084,90 @@
 	Used Gateway6 server.
 ";
   }
-  
+
+  {
+	name = ["services" "gw6c" "keepAlive"];
+	default = "30";
+	example = "2";
+	description = "
+	Gateway6 keep-alive period.
+";
+  }
+
+	{
+		name = ["services" "ircdHybrid" "enable"];
+		default = false;
+		description = "
+	Enable IRCD.
+";
+	}
+
+   	{
+		name = ["services" "ircdHybrid" "serverName"];
+		default = "hades.arpa";
+		description = "
+	IRCD server name.
+";
+	}
+
+   	{
+		name = ["services" "ircdHybrid" "sid"];
+		default = "0NL";
+		description = "
+	IRCD server unique ID in a net of servers.
+";
+	}
+
+   	{
+		name = ["services" "ircdHybrid" "description"];
+		default = "Hybrid-7 IRC server.";
+		description = "
+	IRCD server description.
+";
+	}
+ 
+   	{
+		name = ["services" "ircdHybrid" "rsaKey"];
+		default = null;
+		example = /root/certificates/irc.key;
+		description = "
+	IRCD server RSA key. 
+";
+	}
+ 
+   	{
+		name = ["services" "ircdHybrid" "certificate"];
+		default = null;
+		example = /root/certificates/irc.pem;
+		description = "
+	IRCD server SSL certificate. There are some limitations - read manual.
+";
+	}
+ 
+   	{
+		name = ["services" "ircdHybrid" "adminEmail"];
+		default = "<bit-bucket@example.com>";
+		example = "<name@domain.tld>";
+		description = "
+	IRCD server administrator e-mail. 
+";
+	}
+	 
+   	{
+		name = ["services" "ircdHybrid" "extraIPs"];
+		default = [];
+		example = ["127.0.0.1"];
+		description = "
+	Extra IP's to bind.
+";
+	}
+	 
+   	{
+		name = ["services" "ircdHybrid" "extraPort"];
+		default = "7117";
+		description = "
+	Extra port to avoid filtering.
+";
+	}
+	
 ]
diff --git a/upstart-jobs/default.nix b/upstart-jobs/default.nix
index 0b16a98cf5d..f1e0a2e959f 100644
--- a/upstart-jobs/default.nix
+++ b/upstart-jobs/default.nix
@@ -183,6 +183,11 @@ import ../upstart-jobs/gather.nix {
       inherit config pkgs;
     })
 
+  ++ optional ["services" "ircdHybrid" "enable"]
+    (import ../upstart-jobs/ircd-hybrid.nix {
+      inherit config pkgs;
+    })
+
 
   # ALSA sound support.
   ++ optional ["sound" "enable"]
diff --git a/upstart-jobs/gw6c.nix b/upstart-jobs/gw6c.nix
index 812d4081bab..4304846a807 100644
--- a/upstart-jobs/gw6c.nix
+++ b/upstart-jobs/gw6c.nix
@@ -4,10 +4,12 @@ let
 	procps = pkgs.procps;
 	gw6cService = import ../services/gw6c {
 		inherit (pkgs) stdenv gw6c coreutils 
-		procps upstart nettools;
+		procps upstart iputils gnused 
+		gnugrep;
 		username = getCfg "username";
 		password = getCfg "password";
 		server = getCfg "server";
+		keepAlive = getCfg "keepAlive";
 	};
 in
 {
diff --git a/upstart-jobs/ircd-hybrid.nix b/upstart-jobs/ircd-hybrid.nix
new file mode 100644
index 00000000000..7de44f55db3
--- /dev/null
+++ b/upstart-jobs/ircd-hybrid.nix
@@ -0,0 +1,37 @@
+{config, pkgs}:
+let
+	getCfg = option: config.get ["services" "ircdHybrid" option];
+	ircdService = import ../services/ircd-hybrid {
+		stdenv = pkgs.stdenvNewSetupScript;
+		inherit (pkgs) ircdHybrid coreutils 
+			su;
+		serverName = getCfg "serverName";
+		sid = getCfg "sid";
+		description = getCfg "description";
+		rsaKey = getCfg "rsaKey";
+		certificate = getCfg "certificate";
+		adminEmail = getCfg "adminEmail";
+		extraIPs = getCfg "extraIPs";
+		extraPort = getCfg "extraPort";
+	};
+
+  startingDependency = if (config.get [ "services" "gw6c" "enable" ]) 
+	then "gw6c" else "network-interfaces";
+
+in
+{
+	name = "ircd-hybrid";
+	users = [ {
+			name = "ircd"; 
+			description = "IRCD owner.";
+		} ];
+	groups = [{name = "ircd";}];
+	job = "
+description = \"IRCD Hybrid server.\"
+
+start on ${startingDependency}/started
+stop on ${startingDependency}/stop
+
+respawn ${ircdService}/bin/control start
+";
+}
-- 
GitLab


From 9cb48342704f35208b2a39fe2e8540415746ce6c Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 9 Aug 2007 19:59:48 +0000
Subject: [PATCH 0587/5331] * Add the default profile and the user's profile to
 $KDEDIRS.   This is necessary for some KDE applications.

svn path=/nixos/trunk/; revision=9087
---
 upstart-jobs/xserver.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/upstart-jobs/xserver.nix b/upstart-jobs/xserver.nix
index beb50eac45d..4d8e9e400e7 100644
--- a/upstart-jobs/xserver.nix
+++ b/upstart-jobs/xserver.nix
@@ -197,7 +197,7 @@ let
     ${if sessionType == "kde" then "
 
       # Start KDE.
-      export KDEDIRS=${kdebase}:${kdelibs}
+      export KDEDIRS=$HOME/.nix-profile:/nix/var/nix/profiles/default:${kdebase}:${kdelibs}
       export XDG_CONFIG_DIRS=${kdebase}/etc/xdg:${kdelibs}/etc/xdg
       export XDG_DATA_DIRS=${kdebase}/share
       exec ${kdebase}/bin/startkde
-- 
GitLab


From 05e9b2952584f6fca8f4399dbf5b791a9801f787 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 9 Aug 2007 23:54:23 +0000
Subject: [PATCH 0588/5331] * Search /nix/var/nix/manifests for GC roots under
 NixOS.

svn path=/nixos/trunk/; revision=9090
---
 system/activate-configuration.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/system/activate-configuration.sh b/system/activate-configuration.sh
index e0527962369..124ab24459d 100644
--- a/system/activate-configuration.sh
+++ b/system/activate-configuration.sh
@@ -114,6 +114,7 @@ mkdir -m 0755 -p /nix/var/nix/profiles
 mkdir -m 1777 -p /nix/var/nix/profiles/per-user
 
 ln -sf /nix/var/nix/profiles /nix/var/nix/gcroots/
+ln -sf /nix/var/nix/manifests /nix/var/nix/gcroots/
 
 
 # Make a few setuid programs work.
-- 
GitLab


From 02c3fc72d8743d915d3f31697236396e87a16445 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Fri, 10 Aug 2007 18:52:35 +0000
Subject: [PATCH 0589/5331] Made ircd-hybrid wait gw6c coming up if it is
 enabled at all.

svn path=/nixos/trunk/; revision=9096
---
 upstart-jobs/ircd-hybrid.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/upstart-jobs/ircd-hybrid.nix b/upstart-jobs/ircd-hybrid.nix
index 7de44f55db3..aa21d98bf28 100644
--- a/upstart-jobs/ircd-hybrid.nix
+++ b/upstart-jobs/ircd-hybrid.nix
@@ -4,7 +4,7 @@ let
 	ircdService = import ../services/ircd-hybrid {
 		stdenv = pkgs.stdenvNewSetupScript;
 		inherit (pkgs) ircdHybrid coreutils 
-			su;
+			su iproute;
 		serverName = getCfg "serverName";
 		sid = getCfg "sid";
 		description = getCfg "description";
@@ -13,6 +13,7 @@ let
 		adminEmail = getCfg "adminEmail";
 		extraIPs = getCfg "extraIPs";
 		extraPort = getCfg "extraPort";
+		gw6cEnabled = config.get ["services" "gw6c" "enable"];
 	};
 
   startingDependency = if (config.get [ "services" "gw6c" "enable" ]) 
-- 
GitLab


From db3e598ba9270e1114d7865fd3f384e73af90055 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Sat, 11 Aug 2007 21:48:08 +0000
Subject: [PATCH 0590/5331] Corrected IRCD.

svn path=/nixos/trunk/; revision=9103
---
 upstart-jobs/ircd-hybrid.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/upstart-jobs/ircd-hybrid.nix b/upstart-jobs/ircd-hybrid.nix
index aa21d98bf28..de10fa8f502 100644
--- a/upstart-jobs/ircd-hybrid.nix
+++ b/upstart-jobs/ircd-hybrid.nix
@@ -4,7 +4,7 @@ let
 	ircdService = import ../services/ircd-hybrid {
 		stdenv = pkgs.stdenvNewSetupScript;
 		inherit (pkgs) ircdHybrid coreutils 
-			su iproute;
+			su iproute gnugrep;
 		serverName = getCfg "serverName";
 		sid = getCfg "sid";
 		description = getCfg "description";
-- 
GitLab


From 45c9f350b166d26190428c7c0d2fb8591655a0c5 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Mon, 13 Aug 2007 10:45:16 +0000
Subject: [PATCH 0591/5331] Corrected ircd-hybrid to fix the problem with
 finishing terminal-keeping thread.

svn path=/nixos/trunk/; revision=9107
---
 upstart-jobs/ircd-hybrid.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/upstart-jobs/ircd-hybrid.nix b/upstart-jobs/ircd-hybrid.nix
index de10fa8f502..5c172fb8a4e 100644
--- a/upstart-jobs/ircd-hybrid.nix
+++ b/upstart-jobs/ircd-hybrid.nix
@@ -4,7 +4,7 @@ let
 	ircdService = import ../services/ircd-hybrid {
 		stdenv = pkgs.stdenvNewSetupScript;
 		inherit (pkgs) ircdHybrid coreutils 
-			su iproute gnugrep;
+			su iproute gnugrep procps;
 		serverName = getCfg "serverName";
 		sid = getCfg "sid";
 		description = getCfg "description";
-- 
GitLab


From cc3803f207c17224138427d44707c4a3e72655be Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 14 Aug 2007 16:43:56 +0000
Subject: [PATCH 0592/5331] * An Upstart job for ifplugd, which monitors
 Ethernet interfaces   for cables being plugged in or unplugged.  When this
 occurs, the   dhclient service is restarted to automatically obtain a new IP 
  address.  This is useful for roaming users (laptops).

svn path=/nixos/trunk/; revision=9124
---
 system/options.nix        | 23 +++++++++++++++++++++++
 upstart-jobs/default.nix  |  7 +++++++
 upstart-jobs/dhclient.nix |  2 ++
 upstart-jobs/ifplugd.nix  | 34 ++++++++++++++++++++++++++++++++++
 4 files changed, 66 insertions(+)
 create mode 100644 upstart-jobs/ifplugd.nix

diff --git a/system/options.nix b/system/options.nix
index 81e4ec9efbf..bc694312231 100644
--- a/system/options.nix
+++ b/system/options.nix
@@ -310,6 +310,29 @@
   }
 
 
+  {
+    name = ["networking" "interfaceMonitor" "enable"];
+    default = false;
+    description = "
+      If <literal>true</literal>, monitor Ethernet interfaces for
+      cables being plugged in or unplugged.  When this occurs, the
+      <optional>dhclient</optional> service is restarted to
+      automatically obtain a new IP address.  This is useful for
+      roaming users (laptops).
+    ";
+  }
+
+
+  {
+    name = ["networking" "interfaceMonitor" "beep"];
+    default = false;
+    description = "
+      If <literal>true</literal>, beep when an Ethernet cable is
+      plugged in or unplugged.
+    ";
+  }
+
+
   {
     name = ["fileSystems"];
     default = [];
diff --git a/upstart-jobs/default.nix b/upstart-jobs/default.nix
index f1e0a2e959f..f74fedcce1e 100644
--- a/upstart-jobs/default.nix
+++ b/upstart-jobs/default.nix
@@ -119,6 +119,13 @@ import ../upstart-jobs/gather.nix {
       interfaces = config.get ["networking" "interfaces"];
     })
 
+  # ifplugd daemon for monitoring Ethernet cables.
+  ++ optional ["networking" "interfaceMonitor" "enable"]
+    (import ../upstart-jobs/ifplugd.nix {
+      inherit (pkgs) ifplugd writeScript bash;
+      inherit config;
+    })
+
   # DHCP server.
   ++ optional ["services" "dhcpd" "enable"]
     (import ../upstart-jobs/dhcpd.nix {
diff --git a/upstart-jobs/dhclient.nix b/upstart-jobs/dhclient.nix
index f2ebc39190d..3f198d44d2d 100644
--- a/upstart-jobs/dhclient.nix
+++ b/upstart-jobs/dhclient.nix
@@ -12,6 +12,8 @@ in
 
 {
   name = "dhclient";
+
+  extraPath = [dhcp];
   
   job = "
 description \"DHCP client\"
diff --git a/upstart-jobs/ifplugd.nix b/upstart-jobs/ifplugd.nix
new file mode 100644
index 00000000000..b3f4b811c33
--- /dev/null
+++ b/upstart-jobs/ifplugd.nix
@@ -0,0 +1,34 @@
+{ifplugd, config, writeScript, bash}:
+
+let
+
+  # The ifplugd action script, which is called whenever the link
+  # status changes (i.e., a cable is plugged in or unplugged).  We do
+  # nothing when a cable is unplugged.  When a cable is plugged in, we
+  # restart dhclient, which will hopefully give us a new IP address
+  # if appropriate.
+  plugScript = writeScript "ifplugd.action" "#! ${bash}/bin/sh
+    if test \"$2\" = up; then
+      initctl stop dhclient
+      initctl start dhclient
+    fi
+  ";
+
+in 
+
+{
+  name = "ifplugd";
+
+  extraPath = [ifplugd];
+  
+  job = "
+description \"Network interface connectivity monitor\"
+
+start on network-interfaces/started
+stop on network-interfaces/stop
+
+respawn ${ifplugd}/sbin/ifplugd --no-daemon --no-startup --no-shutdown \\
+    ${if config.get ["networking" "interfaceMonitor" "beep"] then "" else "--no-beep"} \\
+    --run ${plugScript}";
+  
+}
-- 
GitLab


From cc4d0d118aaddaebbf16aa1f39b3181cbcc00633 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 15 Aug 2007 09:30:28 +0000
Subject: [PATCH 0593/5331] * Remove old manifests in the installer.

svn path=/nixos/trunk/; revision=9130
---
 installer/nixos-install.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/installer/nixos-install.sh b/installer/nixos-install.sh
index abf99cc60f1..07e7360ce92 100644
--- a/installer/nixos-install.sh
+++ b/installer/nixos-install.sh
@@ -122,7 +122,7 @@ cp /etc/resolv.conf $mountPoint/etc/
 # Pull the manifest on the CD so that everything in the Nix store on
 # the CD can be copied directly.
 echo "registering substitutes to speed up builds..."
-chroot $mountPoint @nix@/bin/nix-store --clear-substitutes
+rm -f $mountPoint/nix/var/nix/manifests/*
 if test -e /MANIFEST; then
     chroot $mountPoint @nix@/bin/nix-pull file:///mnt/MANIFEST
 fi
-- 
GitLab


From ad22e587ab9901f978b31d1f84e239c7b40e7d65 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 15 Aug 2007 12:01:20 +0000
Subject: [PATCH 0594/5331] * nixos-rebuild: do a nix-pull on the Nixpkgs
 channel manifest.  I.e., you   don't need to be subscribed to the Nixpkgs
 channel to get binary downloads.   This is possible because nix-pull is now
 pretty fast.

svn path=/nixos/trunk/; revision=9133
---
 installer/nixos-rebuild.sh | 13 +++++++++++++
 system/options.nix         | 14 ++++++++++++++
 system/system.nix          |  2 ++
 upstart-jobs/ifplugd.nix   |  1 +
 4 files changed, 30 insertions(+)

diff --git a/installer/nixos-rebuild.sh b/installer/nixos-rebuild.sh
index 0552c9baaf0..33639daa568 100644
--- a/installer/nixos-rebuild.sh
+++ b/installer/nixos-rebuild.sh
@@ -28,6 +28,19 @@ if test -z "$NIXOS"; then NIXOS=/etc/nixos/nixos; fi
 if test -z "$NIXOS_CONFIG"; then NIXOS_CONFIG=/etc/nixos/configuration.nix; fi
 
 
+# Pull the manifests defined in the configuration (the "manifests"
+# attribute).  Wonderfully hacky.
+manifests=$(nix-instantiate --eval-only --xml --strict \
+    $NIXOS/system/system.nix \
+    --arg configuration "import $NIXOS_CONFIG" \
+    -A manifests \
+    | grep '<string'  | sed 's^.*"\(.*\)".*^\1^g')
+    
+for i in $manifests; do
+    NIX_DOWNLOAD_CACHE=/nix/var/nix/channel-cache nix-pull $i || true
+done
+
+
 # Either upgrade the configuration in the system profile (for "switch"
 # or "boot"), or just build it and create a symlink "result" in the
 # current directory (for "build" and "test").
diff --git a/system/options.nix b/system/options.nix
index bc694312231..04965de59f0 100644
--- a/system/options.nix
+++ b/system/options.nix
@@ -909,6 +909,20 @@
   }
 
   
+  {
+    name = ["installer" "manifests"];
+    default = [http://nix.cs.uu.nl/dist/nix/channels-v3/nixpkgs-unstable/MANIFEST];
+    example =
+      [ http://nix.cs.uu.nl/dist/nix/channels-v3/nixpkgs-unstable/MANIFEST
+        http://nix.cs.uu.nl/dist/nix/channels-v3/nixpkgs-stable/MANIFEST
+      ];
+    description = "
+      URLs of manifests to be downloaded when you run
+      <command>nixos-rebuild</command> to speed up builds.
+    ";
+  }
+
+  
   {
     name = ["nix" "maxJobs"];
     default = 1;
diff --git a/system/system.nix b/system/system.nix
index a2a677d8e47..d8d7d6e85ab 100644
--- a/system/system.nix
+++ b/system/system.nix
@@ -27,6 +27,8 @@ rec {
     allPackages = import ../pkgs/top-level/all-packages.nix;
   };
 
+  manifests = config.get ["installer" "manifests"]; # exported here because nixos-rebuild uses it
+
   nix = pkgs.nixUnstable; # we need the exportReferencesGraph feature
 
   useKernel = (config.get ["boot" "useKernel"]) pkgs;
diff --git a/upstart-jobs/ifplugd.nix b/upstart-jobs/ifplugd.nix
index b3f4b811c33..a1b755a7ad6 100644
--- a/upstart-jobs/ifplugd.nix
+++ b/upstart-jobs/ifplugd.nix
@@ -10,6 +10,7 @@ let
   plugScript = writeScript "ifplugd.action" "#! ${bash}/bin/sh
     if test \"$2\" = up; then
       initctl stop dhclient
+      sleep 1
       initctl start dhclient
     fi
   ";
-- 
GitLab


From 2a4417d637acb0769bdd9525a3f6881b6ad85384 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 16 Aug 2007 15:09:06 +0000
Subject: [PATCH 0595/5331] * make-etc / activate-configuration: allow /etc
 files to be installed   as regular files instead of symlinks to the store. *
 Sudo configuration, enabled through security.sudo.enable (on by   default). 
 The contents of the sudoers file is specified in   security.sudo.configFile. 
 The default sudoers file allows members   of the new "wheel" group to run any
 command.

svn path=/nixos/trunk/; revision=9138
---
 configuration/rescue-cd.nix      |  5 +++++
 etc/default.nix                  | 11 +++++++++++
 helpers/make-etc.nix             |  1 +
 helpers/make-etc.sh              |  4 ++++
 installer/nixos-rebuild.sh       | 18 ++++++++++--------
 system/activate-configuration.sh | 10 +++++++++-
 system/ids.nix                   |  1 +
 system/options.nix               | 31 +++++++++++++++++++++++++++++++
 system/system.nix                |  4 +++-
 system/users-groups.nix          |  3 +++
 10 files changed, 78 insertions(+), 10 deletions(-)

diff --git a/configuration/rescue-cd.nix b/configuration/rescue-cd.nix
index 819eb6785db..5aa860ef9fb 100644
--- a/configuration/rescue-cd.nix
+++ b/configuration/rescue-cd.nix
@@ -76,6 +76,11 @@ rec {
       nixpkgsURL = http://nix.cs.uu.nl/dist/nix/ + nixpkgsRel;
     };
 
+    security = {
+      sudo = {
+        enable = false;
+      };
+    };
   };
 
 
diff --git a/etc/default.nix b/etc/default.nix
index c61e87c4c7e..33f85cb67a0 100644
--- a/etc/default.nix
+++ b/etc/default.nix
@@ -140,6 +140,17 @@ import ../helpers/make-etc.nix {
     target = "ldap.conf";
   })
     
+  # "sudo" configuration.
+  ++ (optional ["security" "sudo" "enable"] {
+    source = pkgs.runCommand "sudoers"
+      { src = pkgs.writeText "sudoers-in" (config.get ["security" "sudo" "configFile"]);
+      }
+      # Make sure that the sudoers file is syntactically valid.
+      "${pkgs.sudo}/sbin/visudo -f $src -c && cp $src $out";
+    target = "sudoers";
+    mode = "0440";
+  })
+    
   # A bunch of PAM configuration files for various programs.
   ++ (map
     (program:
diff --git a/helpers/make-etc.nix b/helpers/make-etc.nix
index 9785823248a..94ea248f669 100644
--- a/helpers/make-etc.nix
+++ b/helpers/make-etc.nix
@@ -8,4 +8,5 @@ stdenv.mkDerivation {
   /* !!! Use toXML. */
   sources = map (x: x.source) configFiles;
   targets = map (x: x.target) configFiles;
+  modes = map (x: if x ? mode then x.mode else "symlink") configFiles;
 }
diff --git a/helpers/make-etc.sh b/helpers/make-etc.sh
index 7834d553fdc..a7643b63c5b 100644
--- a/helpers/make-etc.sh
+++ b/helpers/make-etc.sh
@@ -4,7 +4,11 @@ ensureDir $out/etc
 
 sources_=($sources)
 targets_=($targets)
+modes_=($modes)
 for ((i = 0; i < ${#targets_[@]}; i++)); do
     ensureDir $out/etc/$(dirname ${targets_[$i]})
     ln -s ${sources_[$i]} $out/etc/${targets_[$i]}
+    if test "${modes_[$i]}" != symlink; then
+        echo "${modes_[$i]}" > $out/etc/${targets_[$i]}.mode
+    fi
 done
diff --git a/installer/nixos-rebuild.sh b/installer/nixos-rebuild.sh
index 33639daa568..190e21d371c 100644
--- a/installer/nixos-rebuild.sh
+++ b/installer/nixos-rebuild.sh
@@ -30,15 +30,17 @@ if test -z "$NIXOS_CONFIG"; then NIXOS_CONFIG=/etc/nixos/configuration.nix; fi
 
 # Pull the manifests defined in the configuration (the "manifests"
 # attribute).  Wonderfully hacky.
-manifests=$(nix-instantiate --eval-only --xml --strict \
-    $NIXOS/system/system.nix \
-    --arg configuration "import $NIXOS_CONFIG" \
-    -A manifests \
-    | grep '<string'  | sed 's^.*"\(.*\)".*^\1^g')
+if test -z "$NIXOS_NO_PULL"; then
+    manifests=$(nix-instantiate --eval-only --xml --strict \
+        $NIXOS/system/system.nix \
+        --arg configuration "import $NIXOS_CONFIG" \
+        -A manifests \
+        | grep '<string'  | sed 's^.*"\(.*\)".*^\1^g')
     
-for i in $manifests; do
-    NIX_DOWNLOAD_CACHE=/nix/var/nix/channel-cache nix-pull $i || true
-done
+    for i in $manifests; do
+        NIX_DOWNLOAD_CACHE=/nix/var/nix/channel-cache nix-pull $i || true
+    done
+fi
 
 
 # Either upgrade the configuration in the system profile (for "switch"
diff --git a/system/activate-configuration.sh b/system/activate-configuration.sh
index 124ab24459d..917d0b44b0b 100644
--- a/system/activate-configuration.sh
+++ b/system/activate-configuration.sh
@@ -20,7 +20,15 @@ ln -s @etc@/etc $staticEtc
 for i in $(cd $staticEtc && find * -type l); do
     mkdir -p /etc/$(dirname $i)
     rm -f /etc/$i
-    ln -s $staticEtc/$i /etc/$i
+    if test -e "$staticEtc/$i.mode"; then
+        # Create a regular file in /etc.
+        cp $staticEtc/$i /etc/$i
+        chown root.root /etc/$i
+        chmod "$(cat "$staticEtc/$i.mode")" /etc/$i
+    else
+        # Create a symlink in /etc.
+        ln -s $staticEtc/$i /etc/$i
+    fi
 done
 
 
diff --git a/system/ids.nix b/system/ids.nix
index cb48ffd10f8..8c8d44cddf4 100644
--- a/system/ids.nix
+++ b/system/ids.nix
@@ -13,6 +13,7 @@
 
   gids = {
     root = 0;
+    wheel = 1;
     haldaemon = 5;
     audio = 17;
     users = 100;
diff --git a/system/options.nix b/system/options.nix
index 04965de59f0..3130f6b5d5b 100644
--- a/system/options.nix
+++ b/system/options.nix
@@ -969,6 +969,37 @@
   }
 
 
+  {
+    name = ["security" "sudo" "enable"];
+    default = true;
+    description = "
+      Whether to enable the <command>sudo</command> command, which
+      allows non-root users to execute commands as root.
+    ";
+  }
+
+
+  {
+    name = ["security" "sudo" "configFile"];
+    default = "
+# WARNING: do not edit this file directly or with \"visudo\".  Instead,
+# edit the source file in /etc/nixos/nixos/etc/sudoers.
+
+# \"root\" is allowed to do anything.
+root        ALL=(ALL) SETENV: ALL
+
+# Users in the \"wheel\" group can do anything.
+%wheel      ALL=(ALL) SETENV: ALL
+    ";
+    description = "
+      This string contains the contents of the
+      <filename>sudoers</filename> file.  If syntax errors are
+      detected in this file, the NixOS configuration will fail to
+      build. 
+    ";
+  }
+
+
   {
     name = ["users" "ldap" "enable"];
     default = false;
diff --git a/system/system.nix b/system/system.nix
index d8d7d6e85ab..2f9104e2155 100644
--- a/system/system.nix
+++ b/system/system.nix
@@ -225,6 +225,7 @@ rec {
     nixosCheckout
     setuidWrapper
   ]
+  ++ pkgs.lib.optional (config.get ["security" "sudo" "enable"]) pkgs.sudo
   ++ pkgs.lib.concatLists (map (job: job.extraPath) upstartJobs.jobs)
   ++ (config.get ["environment" "extraPackages"]) pkgs;
 
@@ -260,7 +261,8 @@ rec {
     hostName = config.get ["networking" "hostName"];
     setuidPrograms =
       config.get ["security" "setuidPrograms"] ++
-      config.get ["security" "extraSetuidPrograms"];
+      config.get ["security" "extraSetuidPrograms"] ++
+      pkgs.lib.optional (config.get ["security" "sudo" "enable"]) "sudo";
     maxJobs = config.get ["nix" "maxJobs"];
     extraNixOptions = config.get ["nix" "extraOptions"];
 
diff --git a/system/users-groups.nix b/system/users-groups.nix
index 62c2a9d626d..1a77d302c5a 100644
--- a/system/users-groups.nix
+++ b/system/users-groups.nix
@@ -56,6 +56,9 @@ rec {
           { name = "root";
             gid = ids.gids.root;
           }
+          { name = "wheel";
+            gid = ids.gids.wheel;
+          }
           { name = "nogroup";
             gid = ids.gids.nogroup;
           }
-- 
GitLab


From f7d2ccdb87a701490d83ce021058b09504a21050 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Sat, 18 Aug 2007 15:19:27 +0000
Subject: [PATCH 0596/5331] Added mod_php option for httpd.

svn path=/nixos/trunk/; revision=9155
---
 system/options.nix     | 6 ++++++
 upstart-jobs/httpd.nix | 1 +
 2 files changed, 7 insertions(+)

diff --git a/system/options.nix b/system/options.nix
index 3130f6b5d5b..8815a1a2209 100644
--- a/system/options.nix
+++ b/system/options.nix
@@ -783,6 +783,12 @@
 	directories and directory aliases defined by default.
 ";
   }
+
+  {
+    name = ["services" "httpd" "mod_php"];
+    default = false;
+    description = "Whether to enable php module.";
+  }
   
   {
     name = ["services" "httpd" "subservices" "subversion" "enable"];
diff --git a/upstart-jobs/httpd.nix b/upstart-jobs/httpd.nix
index eec1583293a..080f3440373 100644
--- a/upstart-jobs/httpd.nix
+++ b/upstart-jobs/httpd.nix
@@ -29,6 +29,7 @@ let
   webServer = import ../services/apache-httpd {
     inherit (pkgs) apacheHttpd coreutils;
     stdenv = pkgs.stdenvNewSetupScript;
+    php = if getCfg "mod_php" then pkgs.php else null;
 
     inherit hostName httpPort httpsPort
       user group adminAddr logDir stateDir
-- 
GitLab


From 475ee4548dca6a67709ef582f7bf4e309d48160e Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 22 Aug 2007 14:58:51 +0000
Subject: [PATCH 0597/5331] * Create /nix/var/nix/gcroots/per-user.

svn path=/nixos/trunk/; revision=9189
---
 etc/profile.sh                   | 8 ++++++++
 system/activate-configuration.sh | 1 +
 2 files changed, 9 insertions(+)

diff --git a/etc/profile.sh b/etc/profile.sh
index b6ba962efe6..81ce4693bee 100644
--- a/etc/profile.sh
+++ b/etc/profile.sh
@@ -53,6 +53,14 @@ done
 export PATH=$HOME/bin:$PATH
 
 
+# Create the per-user garbage collector roots directory.
+NIX_USER_GCROOTS_DIR=/nix/var/nix/gcroots/per-user/$USER
+mkdir -m 0755 -p $NIX_USER_GCROOTS_DIR
+if test "$(stat --printf '%u' $NIX_USER_GCROOTS_DIR)" != "$(id -u)"; then
+    echo "WARNING: bad ownership on $NIX_USER_GCROOTS_DIR" >&2
+fi
+
+
 # Set up a default Nix expression from which to install stuff.
 if ! test -L $HOME/.nix-defexpr; then
     echo "creating $HOME/.nix-defexpr" >&2
diff --git a/system/activate-configuration.sh b/system/activate-configuration.sh
index 917d0b44b0b..5474dd905cb 100644
--- a/system/activate-configuration.sh
+++ b/system/activate-configuration.sh
@@ -117,6 +117,7 @@ fi
 # Nix initialisation.
 mkdir -m 0755 -p /nix/var/nix/db
 mkdir -m 0755 -p /nix/var/nix/gcroots
+mkdir -m 1777 -p /nix/var/nix/gcroots/per-user
 mkdir -m 0755 -p /nix/var/nix/temproots
 mkdir -m 0755 -p /nix/var/nix/profiles
 mkdir -m 1777 -p /nix/var/nix/profiles/per-user
-- 
GitLab


From 0c4a936419ca7c68bd6d0b5eb3d2292d421205b7 Mon Sep 17 00:00:00 2001
From: "Yury G. Kudryashov" <urkud.urkud@gmail.com>
Date: Sat, 1 Sep 2007 17:57:04 +0000
Subject: [PATCH 0598/5331] Added .xsession support

If user have ~/.xsession file it will be sourced.

svn path=/nixos/trunk/; revision=9231
---
 upstart-jobs/xserver.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/upstart-jobs/xserver.nix b/upstart-jobs/xserver.nix
index 4d8e9e400e7..8181e7443df 100644
--- a/upstart-jobs/xserver.nix
+++ b/upstart-jobs/xserver.nix
@@ -133,6 +133,11 @@ let
       export SSH_ASKPASS=${x11_ssh_askpass}/libexec/x11-ssh-askpass
       eval $(${openssh}/bin/ssh-agent)
     " else ""}
+
+    ### Allow user to override system-wide configuration
+    if test -f ~/.xsession; then
+        source ~/.xsession;
+    fi
   
 
     ### Start a window manager.
-- 
GitLab


From 394491685696699a27db00505c9e562c43e0b7f3 Mon Sep 17 00:00:00 2001
From: "Yury G. Kudryashov" <urkud.urkud@gmail.com>
Date: Sat, 1 Sep 2007 17:59:00 +0000
Subject: [PATCH 0599/5331] Support for mounting pseudo-felisystems during
 stage1

Don't ignore fsType field, don't add /mnt/root to device names not starting with
'/'.

svn path=/nixos/trunk/; revision=9232
---
 boot/boot-stage-1-init.sh | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/boot/boot-stage-1-init.sh b/boot/boot-stage-1-init.sh
index 3b1d4d6a9fa..e2171dc3a71 100644
--- a/boot/boot-stage-1-init.sh
+++ b/boot/boot-stage-1-init.sh
@@ -88,6 +88,7 @@ mountFS() {
     local device="$1"
     local mountPoint="$2"
     local options="$3"
+    local fsType="$4"
 
     # Check the root device, if .
     mustCheck=
@@ -124,7 +125,7 @@ mountFS() {
     fi
 
     # Mount read-writable.
-    mount -n -o "$options" "$device" /mnt/root$mountPoint || fail
+    mount -n -t "$fsType" -o "$options" "$device" /mnt/root$mountPoint || fail
 }
 
 
@@ -185,21 +186,21 @@ else
 
         # !!! Really quick hack to support bind mounts, i.e., where
         # the "device" should be taken relative to /mnt/root, not /.
-        # Assume that every device that doesn't start with /dev or
-        # LABEL= is a bind mount.
+        # Assume that every device that start with / but doesn't
+        # start with /dev or LABEL= is a bind mount.
         case $device in
             /dev/*)
                 ;;
             LABEL=*)
                 ;;
-            *)
+            /*)
                 device=/mnt/root$device
                 ;;
         esac
 
         echo "mounting $device on $mountPoint..."
 
-        mountFS "$device" "$mountPoint" "$options"
+        mountFS "$device" "$mountPoint" "$options" "$fsType"
     done
     
 fi
-- 
GitLab


From 867d814d277d8153e91cf5d63b43f8815d0410a6 Mon Sep 17 00:00:00 2001
From: "Yury G. Kudryashov" <urkud.urkud@gmail.com>
Date: Sat, 1 Sep 2007 18:05:46 +0000
Subject: [PATCH 0600/5331] Remove unneeded copy of lvm in initrd.

Something replaces symlinks in initrd with copies. Removed symlinks to lvm and
changed syntax (vgscan -> lvm vgscan).

svn path=/nixos/trunk/; revision=9233
---
 boot/boot-stage-1-init.sh | 4 ++--
 system/system.nix         | 2 --
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/boot/boot-stage-1-init.sh b/boot/boot-stage-1-init.sh
index e2171dc3a71..68a8b236afd 100644
--- a/boot/boot-stage-1-init.sh
+++ b/boot/boot-stage-1-init.sh
@@ -76,8 +76,8 @@ udevsettle
 if type -p dmsetup > /dev/null; then
   echo "dmsetup found, starting device mapper and lvm"
   dmsetup mknodes
-  vgscan --ignorelockingfailure
-  vgchange -ay --ignorelockingfailure
+  lvm vgscan --ignorelockingfailure
+  lvm vgchange -ay --ignorelockingfailure
 fi
 
 if test -n "$debug1devices"; then fail; fi
diff --git a/system/system.nix b/system/system.nix
index 2f9104e2155..082af065d02 100644
--- a/system/system.nix
+++ b/system/system.nix
@@ -63,8 +63,6 @@ rec {
       if test -n \"$devicemapper\"; then
         cp $devicemapper/sbin/dmsetup.static $out/bin/dmsetup
         cp $lvm2/sbin/lvm.static $out/bin/lvm
-        ln -s lvm $out/bin/vgscan
-        ln -s lvm $out/bin/vgchange
       fi
       cp $utillinux/bin/mount $utillinux/bin/umount $utillinux/sbin/pivot_root $out/bin
       cp -p $e2fsprogs/sbin/fsck* $e2fsprogs/sbin/e2fsck $out/bin
-- 
GitLab


From 53a8d28f067739506520f9e5b37cadde6af0b897 Mon Sep 17 00:00:00 2001
From: Marc Weber <marco-oweber@gmx.de>
Date: Tue, 4 Sep 2007 13:44:26 +0000
Subject: [PATCH 0601/5331] added udev rule to move /dev/tun to the place
 /dev/net/tun which most distros are using by default as well as tunctl

svn path=/nixos/trunk/; revision=9252
---
 upstart-jobs/udev-rules/50-udev.rules | 1 +
 1 file changed, 1 insertion(+)

diff --git a/upstart-jobs/udev-rules/50-udev.rules b/upstart-jobs/udev-rules/50-udev.rules
index 62122bda292..400bf225903 100644
--- a/upstart-jobs/udev-rules/50-udev.rules
+++ b/upstart-jobs/udev-rules/50-udev.rules
@@ -12,6 +12,7 @@ KERNEL=="sonypi",               MODE="0666"
 KERNEL=="agpgart",              MODE="0600"
 KERNEL=="kvm",                  MODE="0666"
 KERNEL=="fuse",                 MODE="0666"
+KERNEL=="tun",  NAME="net/%k",  MODE="0666" 
 
 
 # TTYs.
-- 
GitLab


From 0d1aa83fea8c13bbaf8fa13ee85396f645a22f03 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 6 Sep 2007 21:10:15 +0000
Subject: [PATCH 0602/5331] svn path=/nixos/trunk/; revision=9275

---
 configuration/rescue-cd.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/configuration/rescue-cd.nix b/configuration/rescue-cd.nix
index 5aa860ef9fb..5ba75e760e8 100644
--- a/configuration/rescue-cd.nix
+++ b/configuration/rescue-cd.nix
@@ -4,7 +4,7 @@
 rec {
 
   
-  nixpkgsRel = "nixpkgs-0.11pre8649";
+  nixpkgsRel = "nixpkgs-0.11pre9274";
 
 
   configuration = {
@@ -126,7 +126,7 @@ rec {
   # Get a recent copy of Nixpkgs.
   nixpkgsTarball = pkgs.fetchurl {
     url = configuration.installer.nixpkgsURL + "/" + nixpkgsRel + ".tar.bz2";
-    md5 = "ad086844938049a2338f3cb527d43df8";
+    md5 = "5cd0f41665dee8f04f00d2d5e514021f";
   };
 
 
-- 
GitLab


From f2780fdc6219deb248f01ed3b2d5068f1cfa328d Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 18 Sep 2007 15:06:24 +0000
Subject: [PATCH 0603/5331] * Add a top-level default.nix for NixOS which has
 attributes useful   for building parts of the system.  E.g.

  $ nix-build /etc/nixos/nixos -A upstartJobs.xserver

  to build the Upstart job for the X server, or

  $ nix-build /etc/nixos/nixos -A kernel

  to build the NixOS kernel.

* /etc/profile.sh: if ~/.nix-defexpr doesn't exist yet, create it as a
  directory and add links to root's channels, /etc/nixos/nixos and
  /etc/nixos/install-source.nix (as "nixpkgs_sys").

* boot.useKernel -> boot.kernel.

svn path=/nixos/trunk/; revision=9334
---
 default.nix                | 40 ++++++++++++++++++++++++++++++++++++++
 etc/profile.sh             | 10 ++++++++--
 installer/nixos-rebuild.sh | 13 +++----------
 system/options.nix         | 16 +++++++--------
 system/system.nix          | 15 ++++++--------
 upstart-jobs/make-job.nix  |  4 ++--
 6 files changed, 67 insertions(+), 31 deletions(-)
 create mode 100644 default.nix

diff --git a/default.nix b/default.nix
new file mode 100644
index 00000000000..90aa4d33ad9
--- /dev/null
+++ b/default.nix
@@ -0,0 +1,40 @@
+let
+
+  configFileName =
+    let env = builtins.getEnv "NIXOS_CONFIG"; in
+    if env == "" then /etc/nixos/configuration.nix else env;
+
+  system = import system/system.nix {configuration = import configFileName;};
+
+in
+
+{ inherit (system)
+    activateConfiguration
+    bootStage1
+    bootStage2
+    etc
+    extraUtils
+    grubMenuBuilder
+    initialRamdisk
+    kernel
+    nix
+    nixosCheckout
+    nixosInstall
+    nixosRebuild
+    system
+    systemPath
+    config
+    ;
+
+  manifests = system.config.get ["installer" "manifests"]; # exported here because nixos-rebuild uses it
+
+  upstartJobsCombined = system.upstartJobs;
+
+  # Make it easier to build individual Upstart jobs (e.g., "nix-build
+  # /etc/nixos/nixos -A upstartJobs.xserver").  
+  upstartJobs = { recurseForDerivations = true; } //
+    builtins.listToAttrs (map (job:
+      { attr = if job ? jobName then job.jobName else job.name; value = job; }
+    ) system.upstartJobs.jobs);
+
+}
diff --git a/etc/profile.sh b/etc/profile.sh
index 81ce4693bee..ad9629c1bd6 100644
--- a/etc/profile.sh
+++ b/etc/profile.sh
@@ -62,9 +62,15 @@ fi
 
 
 # Set up a default Nix expression from which to install stuff.
-if ! test -L $HOME/.nix-defexpr; then
+if test ! -e $HOME/.nix-defexpr -o -L $HOME/.nix-defexpr; then
     echo "creating $HOME/.nix-defexpr" >&2
-    ln -s /etc/nixos/install-source.nix $HOME/.nix-defexpr
+    rm -f $HOME/.nix-defexpr
+    mkdir $HOME/.nix-defexpr
+    ln -s /etc/nixos/install-source.nix $HOME/.nix-defexpr/nixpkgs_sys
+    ln -s /etc/nixos/nixos $HOME/.nix-defexpr/nixos
+    if test "$USER" != root; then
+        ln -s /nix/var/nix/gcroots/per-user/root/channels $HOME/.nix-defexpr/channels_root
+    fi
 fi
 
 
diff --git a/installer/nixos-rebuild.sh b/installer/nixos-rebuild.sh
index 190e21d371c..94ef51ee468 100644
--- a/installer/nixos-rebuild.sh
+++ b/installer/nixos-rebuild.sh
@@ -31,10 +31,7 @@ if test -z "$NIXOS_CONFIG"; then NIXOS_CONFIG=/etc/nixos/configuration.nix; fi
 # Pull the manifests defined in the configuration (the "manifests"
 # attribute).  Wonderfully hacky.
 if test -z "$NIXOS_NO_PULL"; then
-    manifests=$(nix-instantiate --eval-only --xml --strict \
-        $NIXOS/system/system.nix \
-        --arg configuration "import $NIXOS_CONFIG" \
-        -A manifests \
+    manifests=$(nix-instantiate --eval-only --xml --strict $NIXOS -A manifests \
         | grep '<string'  | sed 's^.*"\(.*\)".*^\1^g')
     
     for i in $manifests; do
@@ -47,14 +44,10 @@ fi
 # or "boot"), or just build it and create a symlink "result" in the
 # current directory (for "build" and "test").
 if test "$action" = "switch" -o "$action" = "boot"; then
-    nix-env -p /nix/var/nix/profiles/system -f $NIXOS/system/system.nix \
-        --arg configuration "import $NIXOS_CONFIG" \
-        --set -A system
+    nix-env -p /nix/var/nix/profiles/system -f $NIXOS --set -A system
     pathToConfig=/nix/var/nix/profiles/system
 elif test "$action" = "test" -o "$action" = "build"; then
-    nix-build $NIXOS/system/system.nix \
-        --arg configuration "import $NIXOS_CONFIG" \
-        -A system -K -k
+    nix-build $NIXOS -A system -K -k
     pathToConfig=./result
 else
     showSyntax
diff --git a/system/options.nix b/system/options.nix
index 8815a1a2209..abe1d248259 100644
--- a/system/options.nix
+++ b/system/options.nix
@@ -56,14 +56,14 @@
   }
 
   {
-	name = ["boot" "useKernel"];
-	default = pkgs :(pkgs.kernel);
-	description = "
-	Function that takes package collection and returns kernel 
-	package. Do not collect old generations after changing it
-	until you get to boot successfully. In principle, you can 
-	specify a kernel that will build, but not boot.
-	";
+    name = ["boot" "kernel"];
+    default = pkgs: pkgs.kernel;
+    description = "
+      Function that takes package collection and returns kernel 
+      package. Do not collect old generations after changing it
+      until you get to boot successfully. In principle, you can 
+      specify a kernel that will build, but not boot.
+    ";
   }
 
   {
diff --git a/system/system.nix b/system/system.nix
index 082af065d02..974071c7bf4 100644
--- a/system/system.nix
+++ b/system/system.nix
@@ -31,7 +31,7 @@ rec {
 
   nix = pkgs.nixUnstable; # we need the exportReferencesGraph feature
 
-  useKernel = (config.get ["boot" "useKernel"]) pkgs;
+  kernel = (config.get ["boot" "kernel"]) pkgs;
 
   rootModules = 
     (config.get ["boot" "initrd" "extraKernelModules"]) ++
@@ -41,8 +41,7 @@ rec {
   # Determine the set of modules that we need to mount the root FS.
   modulesClosure = import ../helpers/modules-closure.nix {
     inherit (pkgs) stdenv module_init_tools;
-    kernel = useKernel;
-    inherit rootModules;
+    inherit kernel rootModules;
   };
 
 
@@ -147,7 +146,7 @@ rec {
     src = ./modprobe;
     isExecutable = true;
     inherit (pkgs) module_init_tools;
-    kernel = useKernel;
+    inherit kernel;
   };
 
 
@@ -253,8 +252,7 @@ rec {
     src = ./activate-configuration.sh;
     isExecutable = true;
 
-    inherit etc wrapperDir systemPath modprobe defaultShell;
-    kernel = useKernel;
+    inherit etc wrapperDir systemPath modprobe defaultShell kernel;
     readOnlyRoot = config.get ["boot" "readOnlyRoot"];
     hostName = config.get ["networking" "hostName"];
     setuidPrograms =
@@ -281,8 +279,7 @@ rec {
   bootStage2 = import ../boot/boot-stage-2.nix {
     inherit (pkgs) substituteAll writeText coreutils 
       utillinux udev upstart;
-    kernel = useKernel;
-    inherit activateConfiguration;
+    inherit kernel activateConfiguration;
     readOnlyRoot = config.get ["boot" "readOnlyRoot"];
     upstartPath = [
       pkgs.coreutils
@@ -326,7 +323,7 @@ rec {
     inherit grubMenuBuilder;
     inherit etc;
     inherit systemPath;
-    kernel = useKernel + "/vmlinuz";
+    kernel = kernel + "/vmlinuz";
     initrd = initialRamdisk + "/initrd";
     # Most of these are needed by grub-install.
     path = [
diff --git a/upstart-jobs/make-job.nix b/upstart-jobs/make-job.nix
index faffc0cdcff..e6c92bb4d3a 100644
--- a/upstart-jobs/make-job.nix
+++ b/upstart-jobs/make-job.nix
@@ -5,8 +5,8 @@
     job.jobDrv
   else
     (
-      runCommand job.name {inherit (job) job;}
-        "ensureDir $out/etc/event.d; echo \"$job\" > $out/etc/event.d/$name"
+      runCommand ("upstart-" + job.name) {inherit (job) job; jobName = job.name;}
+        "ensureDir $out/etc/event.d; echo \"$job\" > $out/etc/event.d/$jobName"
     )
 )
 
-- 
GitLab


From b9dd7509b62dbc7b5e401cc5441f2a0e81616eae Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 18 Sep 2007 15:38:05 +0000
Subject: [PATCH 0604/5331] * nixos-rebuild: before building NixOS, first build
 the latest Nix and   use that one to build NixOS.  This will make it easier
 to use   bleeding-edge features in the NixOS expressions.

svn path=/nixos/trunk/; revision=9336
---
 default.nix                |  2 ++
 installer/nixos-rebuild.sh | 10 ++++++++++
 2 files changed, 12 insertions(+)

diff --git a/default.nix b/default.nix
index 90aa4d33ad9..889d2ca873f 100644
--- a/default.nix
+++ b/default.nix
@@ -26,6 +26,8 @@ in
     config
     ;
 
+  nixFallback = system.nix;
+
   manifests = system.config.get ["installer" "manifests"]; # exported here because nixos-rebuild uses it
 
   upstartJobsCombined = system.upstartJobs;
diff --git a/installer/nixos-rebuild.sh b/installer/nixos-rebuild.sh
index 94ef51ee468..fbbd3e691f7 100644
--- a/installer/nixos-rebuild.sh
+++ b/installer/nixos-rebuild.sh
@@ -40,6 +40,13 @@ if test -z "$NIXOS_NO_PULL"; then
 fi
 
 
+# First build Nix, since NixOS may require a newer version than the
+# current one.  Of course, the same goes for Nixpkgs, but Nixpkgs is
+# more conservative.
+nix-build $NIXOS -A nixFallback -o $HOME/nix-tmp
+PATH=$HOME/nix-tmp/bin:$PATH
+
+
 # Either upgrade the configuration in the system profile (for "switch"
 # or "boot"), or just build it and create a symlink "result" in the
 # current directory (for "build" and "test").
@@ -69,3 +76,6 @@ active system configuration may be garbage collected!  This may render
 the system inoperable (though a reboot will fix things).
 EOF
 fi
+
+
+rm -f $HOME/nix-tmp
-- 
GitLab


From 8f126de2fb69fba582b5df7e01ae2f7a6e05ddf5 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Mon, 24 Sep 2007 05:16:15 +0000
Subject: [PATCH 0605/5331] Changed X server upstart expression a bit, now
 works for my Intel 915GM notebook (with vesa at least).

svn path=/nixos/trunk/; revision=9364
---
 system/options.nix        | 10 ++++++++++
 upstart-jobs/default.nix  |  1 +
 upstart-jobs/xserver.conf |  2 +-
 upstart-jobs/xserver.nix  | 12 +++++++-----
 4 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/system/options.nix b/system/options.nix
index abe1d248259..faf171d5866 100644
--- a/system/options.nix
+++ b/system/options.nix
@@ -676,6 +676,16 @@
     ";
   }
 
+  {
+    name = ["services" "xserver" "isClone"];
+    default = "on";
+    example = "off";
+    description = "
+      Whether to enable the X server clone mode for dual-head.
+    ";
+  }
+
+
   
   {
     name = ["services" "httpd" "enable"];
diff --git a/upstart-jobs/default.nix b/upstart-jobs/default.nix
index f74fedcce1e..2c509c69885 100644
--- a/upstart-jobs/default.nix
+++ b/upstart-jobs/default.nix
@@ -162,6 +162,7 @@ import ../upstart-jobs/gather.nix {
       libX11 = pkgs.xlibs.libX11;
       libXext = pkgs.xlibs.libXext;
       fontDirectories = import ../system/fonts.nix {inherit pkgs;};
+	isClone = config.get ["services" "xserver" "isClone"];
     })
 
   # Apache httpd.
diff --git a/upstart-jobs/xserver.conf b/upstart-jobs/xserver.conf
index d8f6cb0f905..dea1ed7c12b 100644
--- a/upstart-jobs/xserver.conf
+++ b/upstart-jobs/xserver.conf
@@ -73,7 +73,7 @@ EndSection
 Section "Device"
   Identifier   "Device[0]"
   Driver       "@videoDriver@"
-  Option       "Clone" "On"
+  Option       "Clone" "@isClone@"
   #Option       "MonitorLayout" "CRT,LFP"
   Option       "MonitorLayout" "LVDS,CRT"
   @device@
diff --git a/upstart-jobs/xserver.nix b/upstart-jobs/xserver.nix
index 8181e7443df..c76957601c3 100644
--- a/upstart-jobs/xserver.nix
+++ b/upstart-jobs/xserver.nix
@@ -16,6 +16,8 @@
 , # List of font directories.
   fontDirectories
 
+, # Is Clone mode on?
+  isClone ? "on"
 }:
 
 let
@@ -68,7 +70,7 @@ let
   configFile = stdenv.mkDerivation {
     name = "xserver.conf";
     src = ./xserver.conf;
-    inherit fontDirectories videoDriver resolutions;
+    inherit fontDirectories videoDriver resolutions isClone;
     buildCommand = "
       buildCommand= # urgh, don't substitute this
 
@@ -76,7 +78,7 @@ let
       for i in $fontDirectories; do
         if test \"\${i:0:\${#NIX_STORE}}\" == \"$NIX_STORE\"; then
           for j in $(find $i -name fonts.dir); do
-            fontPaths=\"\${fontPaths}FontPath \\\"$(dirname $j)\\\"\\n\"
+            fontPaths=\"\${fontPaths}FontPath \\\"$(dirname $j)\\\"\n\"
           done
         fi
       done
@@ -84,13 +86,13 @@ let
       export modulePaths=
       for i in $(find ${toString modules} -type d); do
         if ls $i/*.so 2> /dev/null; then
-          modulePaths=\"\${modulePaths}ModulePath \\\"$i\\\"\\n\"
+          modulePaths=\"\${modulePaths}ModulePath \\\"$i\\\"\n\"
         fi
       done
 
       #if only my gf were this dirty
       if test \"${toString videoDriver}\" == \"nvidia\"; then
-        export moduleSection=\"Load  \\\"glx\\\" \\n \\
+        export moduleSection=\"Load  \\\"glx\\\" \\
  SubSection \\\"extmod\\\" \\n \\
  Option \\\"omit xfree86-dga\\\" \\n \\
  EndSubSection \\n \"
@@ -103,7 +105,7 @@ let
         export extensions=\"Option       \\\"Composite\\\" \\\"Enable\\\" \\n \"
 
       else
-        export moduleSection='Load \"glx\" \\n \\
+        export moduleSection='Load \"glx\" 
           Load \"dri\" '
         export screen=
         export device=
-- 
GitLab


From a34885af7e27ab1829f09b3cef95b856b7af8c15 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Mon, 24 Sep 2007 09:02:43 +0000
Subject: [PATCH 0606/5331] Added synaptics support to xserver upstart-job.

svn path=/nixos/trunk/; revision=9366
---
 system/options.nix        | 18 ++++++++++++++++++
 upstart-jobs/default.nix  |  2 +-
 upstart-jobs/xserver.conf |  3 ++-
 upstart-jobs/xserver.nix  | 36 +++++++++++++++++++++++++++++++++---
 4 files changed, 54 insertions(+), 5 deletions(-)

diff --git a/system/options.nix b/system/options.nix
index faf171d5866..ae4c30c9c06 100644
--- a/system/options.nix
+++ b/system/options.nix
@@ -686,6 +686,24 @@
   }
 
 
+  {
+    name = ["services" "xserver" "isSynaptics"];
+    default = false;
+    example = true;
+    description = "
+      Whether to replace mouse with touchpad.
+    ";
+  }
+  
+  { 
+    name = ["services" "xserver" "devSynaptics"];
+    default = "/dev/input/event0";
+    description = "
+      Event device for Synaptics touchpad.
+    ";
+  }
+  
+
   
   {
     name = ["services" "httpd" "enable"];
diff --git a/upstart-jobs/default.nix b/upstart-jobs/default.nix
index 2c509c69885..0793b4e07b7 100644
--- a/upstart-jobs/default.nix
+++ b/upstart-jobs/default.nix
@@ -158,7 +158,7 @@ import ../upstart-jobs/gather.nix {
       inherit config;
       inherit (pkgs) stdenv writeText lib xterm slim xorg mesa
         gnome compiz feh kdebase kdelibs xkeyboard_config
-        openssh x11_ssh_askpass nvidiaDrivers;
+        openssh x11_ssh_askpass nvidiaDrivers synaptics;
       libX11 = pkgs.xlibs.libX11;
       libXext = pkgs.xlibs.libXext;
       fontDirectories = import ../system/fonts.nix {inherit pkgs;};
diff --git a/upstart-jobs/xserver.conf b/upstart-jobs/xserver.conf
index dea1ed7c12b..58618a8fd9e 100644
--- a/upstart-jobs/xserver.conf
+++ b/upstart-jobs/xserver.conf
@@ -39,6 +39,7 @@ Section "InputDevice"
   Option       "Device" "/dev/input/mice"
 EndSection
 
+@synapticsInputDevice@
 
 Section "Monitor"
   Identifier   "Monitor[0]"
@@ -83,7 +84,7 @@ EndSection
 Section "ServerLayout"
   Identifier   "Layout[all]"
   InputDevice  "Keyboard[0]" "CoreKeyboard"
-  InputDevice  "Mouse[0]" "CorePointer"
+  InputDevice  "@corePointer@" "CorePointer"
   Screen       "Screen[0]"
 EndSection
 
diff --git a/upstart-jobs/xserver.nix b/upstart-jobs/xserver.nix
index c76957601c3..ff4532b778f 100644
--- a/upstart-jobs/xserver.nix
+++ b/upstart-jobs/xserver.nix
@@ -4,6 +4,7 @@
 , xkeyboard_config
 , openssh, x11_ssh_askpass
 , nvidiaDrivers, libX11, libXext
+, synaptics
 
 , config
 
@@ -64,13 +65,42 @@ let
     ++ optional (videoDriver == "vesa") xorg.xf86videovesa
     ++ optional (videoDriver == "sis") xorg.xf86videosis
     ++ optional (videoDriver == "i810") xorg.xf86videoi810
-    ++ optional (videoDriver == "intel") xorg.xf86videointel;
-
+    ++ optional (videoDriver == "intel") xorg.xf86videointel
+    ++ (optional (getCfg "isSynaptics") [(synaptics+"/"+xorg.xorgserver) xorg.xf86inputevdev]);
     
   configFile = stdenv.mkDerivation {
     name = "xserver.conf";
     src = ./xserver.conf;
-    inherit fontDirectories videoDriver resolutions isClone;
+    inherit fontDirectories videoDriver resolutions isClone synaptics;
+
+	synapticsInputDevice = (if getCfg "isSynaptics" then "
+	Section \"InputDevice\"
+	 Identifier \"Touchpad[0]\"
+	 Driver \"synaptics\"
+	 Option \"Device\" \""+(getCfg "devSynaptics")+"\"
+	 Option \"Protocol\" \"PS/2\"
+	 Option \"LeftEdge\" \"1700\"
+	 Option \"RightEdge\" \"5300\"
+	 Option \"TopEdge\" \"1700\"
+	 Option \"BottomEdge\" \"4200\"
+	 Option \"FingerLow\" \"25\"
+	 Option \"FingerHigh\" \"30\"
+	 Option \"MaxTapTime\" \"180\"
+	 Option \"MaxTapMove\" \"220\"
+	 Option \"VertScrollDelta\" \"100\"
+	 Option \"MinSpeed\" \"0.06\"
+	 Option \"MaxSpeed\" \"0.12\"
+	 Option \"AccelFactor\" \"0.0010\"
+	 Option \"SHMConfig\" \"on\"
+	 Option \"Repeater\" \"/dev/input/mice\"
+	 Option \"TapButton1\" \"1\"
+	 Option \"TapButton2\" \"2\"
+	 Option \"TapButton3\" \"3\"
+	EndSection " else "");
+
+	corePointer = (if getCfg "isSynaptics" then "Touchpad[0]" else "Mouse[0]");
+
+
     buildCommand = "
       buildCommand= # urgh, don't substitute this
 
-- 
GitLab


From 2cf1edf3656c2eecf88613060557ffaffcde796d Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Mon, 24 Sep 2007 09:19:34 +0000
Subject: [PATCH 0607/5331] Added language switch support to xserver.nix

svn path=/nixos/trunk/; revision=9367
---
 system/options.nix        | 18 +++++++++++++++++-
 upstart-jobs/xserver.conf |  3 ++-
 upstart-jobs/xserver.nix  |  5 +++++
 3 files changed, 24 insertions(+), 2 deletions(-)

diff --git a/system/options.nix b/system/options.nix
index ae4c30c9c06..5971f10d20e 100644
--- a/system/options.nix
+++ b/system/options.nix
@@ -702,7 +702,23 @@
       Event device for Synaptics touchpad.
     ";
   }
-  
+
+  {
+	name = ["services" "xserver" "layout"];
+	default = "us";
+	description ="
+	Keyboard layout.
+	";
+  }  
+
+  {
+	name = ["services" "xserver" "xkbOptions"];
+	default = "";
+	example = "grp:caps_toggle, grp_led:scroll";
+	description ="
+	X keyboard options; layout switching goes here.
+	";
+  }  
 
   
   {
diff --git a/upstart-jobs/xserver.conf b/upstart-jobs/xserver.conf
index 58618a8fd9e..0a801217888 100644
--- a/upstart-jobs/xserver.conf
+++ b/upstart-jobs/xserver.conf
@@ -27,9 +27,10 @@ Section "InputDevice"
   Driver       "kbd"
   Identifier   "Keyboard[0]"
   Option       "Protocol" "Standard"
-  Option       "XkbLayout" "us"
+  Option       "XkbLayout" "@layout@"
   Option       "XkbModel" "pc104"
   Option       "XkbRules" "xfree86"
+  @xkbOptions@
 EndSection
 
 
diff --git a/upstart-jobs/xserver.nix b/upstart-jobs/xserver.nix
index ff4532b778f..d77d5c04f70 100644
--- a/upstart-jobs/xserver.nix
+++ b/upstart-jobs/xserver.nix
@@ -98,6 +98,11 @@ let
 	 Option \"TapButton3\" \"3\"
 	EndSection " else "");
 
+	xkbOptions = (if (getCfg "xkbOptions") == "" then "" else 
+		"  Option \"XkbOptions\" \""+(getCfg "xkbOptions")+"\"");
+
+	layout = getCfg "layout";
+
 	corePointer = (if getCfg "isSynaptics" then "Touchpad[0]" else "Mouse[0]");
 
 
-- 
GitLab


From 07fd13f20e19f15237253c80aa10ca2f607eb026 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Mon, 24 Sep 2007 19:32:21 +0000
Subject: [PATCH 0608/5331] Added keyboard layout to options and internal
 AGPGART option

svn path=/nixos/trunk/; revision=9369
---
 system/options.nix        | 17 +++++++++++++++++
 upstart-jobs/xserver.conf |  1 +
 upstart-jobs/xserver.nix  |  6 ++++++
 3 files changed, 24 insertions(+)

diff --git a/system/options.nix b/system/options.nix
index 5971f10d20e..4e45f34d08c 100644
--- a/system/options.nix
+++ b/system/options.nix
@@ -720,6 +720,23 @@
 	";
   }  
 
+  {
+	name = ["services" "xserver" "layout"];
+	default = "us";
+	description ="
+	Keyboard layout.
+	";
+  }  
+
+  {
+	name = ["services" "xserver" "useInternalAGPGART"];
+	default = "";
+	example = "no";
+	description ="
+	Just the wrapper for an xorg.conf option.
+	";
+  }  
+
   
   {
     name = ["services" "httpd" "enable"];
diff --git a/upstart-jobs/xserver.conf b/upstart-jobs/xserver.conf
index 0a801217888..52b04f38f0f 100644
--- a/upstart-jobs/xserver.conf
+++ b/upstart-jobs/xserver.conf
@@ -79,6 +79,7 @@ Section "Device"
   #Option       "MonitorLayout" "CRT,LFP"
   Option       "MonitorLayout" "LVDS,CRT"
   @device@
+  @internalAGPGART@
 EndSection
 
 
diff --git a/upstart-jobs/xserver.nix b/upstart-jobs/xserver.nix
index d77d5c04f70..c55f19cc5dc 100644
--- a/upstart-jobs/xserver.nix
+++ b/upstart-jobs/xserver.nix
@@ -105,6 +105,12 @@ let
 
 	corePointer = (if getCfg "isSynaptics" then "Touchpad[0]" else "Mouse[0]");
 
+	internalAGPGART = (if (getCfg "useInternalAGPGART") == "yes" then
+		"  Option \"UseInternalAGPGART\" \"yes\"" else 
+		if (getCfg "useInternalAGPGART") == "no" then
+		"  Option \"UseInternalAGPGART\" \"no\"" else 
+		"    ");
+
 
     buildCommand = "
       buildCommand= # urgh, don't substitute this
-- 
GitLab


From 51626b0b6602a0be53df471d778ef9d04f45a65c Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Tue, 25 Sep 2007 19:00:20 +0000
Subject: [PATCH 0609/5331] Added checking of unkonwn options in
 configuration.nix and a system-wide font set changer.

svn path=/nixos/trunk/; revision=9370
---
 etc/default.nix          | 2 +-
 system/fonts.nix         | 6 ++++--
 system/options.nix       | 9 +++++++++
 system/system.nix        | 7 +++----
 upstart-jobs/default.nix | 2 +-
 5 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/etc/default.nix b/etc/default.nix
index 33f85cb67a0..8b3ee316884 100644
--- a/etc/default.nix
+++ b/etc/default.nix
@@ -120,7 +120,7 @@ import ../helpers/make-etc.nix {
   ++ (optional ["fonts" "enableFontConfig"] { 
     source = pkgs.runCommand "fonts.conf"
       { 
-        fontDirectories = import ../system/fonts.nix {inherit pkgs;};
+        fontDirectories = import ../system/fonts.nix {inherit pkgs config;};
         buildInputs = [pkgs.libxslt];
         inherit (pkgs) fontconfig;
       }
diff --git a/system/fonts.nix b/system/fonts.nix
index 6ddfc264889..2e6f5ee3d2e 100644
--- a/system/fonts.nix
+++ b/system/fonts.nix
@@ -1,4 +1,4 @@
-{pkgs}:
+{pkgs , config}:
 
 [
   # - the user's .fonts directory
@@ -18,4 +18,6 @@
   pkgs.xorg.fontbh100dpi
   pkgs.xorg.fontmiscmisc
   pkgs.xorg.fontcursormisc
-]
+] ++
+((config.get ["fonts" "extraFonts"]) pkgs)
+
diff --git a/system/options.nix b/system/options.nix
index 4e45f34d08c..dffa513008a 100644
--- a/system/options.nix
+++ b/system/options.nix
@@ -1118,6 +1118,15 @@ root        ALL=(ALL) SETENV: ALL
     ";
   }
 
+  {
+    name = ["fonts" "extraFonts"];
+    default = pkgs:[];
+    description = "
+	Function, returning list of additional fonts.
+    ";
+  }
+
+ 
   
   {
     name = ["sound" "enable"];
diff --git a/system/system.nix b/system/system.nix
index 974071c7bf4..b9fbefff44f 100644
--- a/system/system.nix
+++ b/system/system.nix
@@ -309,7 +309,7 @@ rec {
   # kernel, the Upstart services, the init scripts, etc.) as well as a
   # script `switch-to-configuration' that activates the configuration
   # and makes it bootable.
-  system = pkgs.stdenv.mkDerivation {
+  system = pkgs.checker (pkgs.stdenv.mkDerivation {
     name = "system";
     builder = ./system.sh;
     switchToConfiguration = ./switch-to-configuration.sh;
@@ -335,7 +335,6 @@ rec {
       pkgs.upstart # for initctl
     ];
     configurationName = config.get ["boot" "configurationName"];
-  };
-
-
+  }) (pkgs.getConfig ["checkConfigurationOptions"] false) 
+	config.declarations configuration ;
 }
diff --git a/upstart-jobs/default.nix b/upstart-jobs/default.nix
index 0793b4e07b7..f602081262a 100644
--- a/upstart-jobs/default.nix
+++ b/upstart-jobs/default.nix
@@ -161,7 +161,7 @@ import ../upstart-jobs/gather.nix {
         openssh x11_ssh_askpass nvidiaDrivers synaptics;
       libX11 = pkgs.xlibs.libX11;
       libXext = pkgs.xlibs.libXext;
-      fontDirectories = import ../system/fonts.nix {inherit pkgs;};
+      fontDirectories = import ../system/fonts.nix {inherit pkgs config;};
 	isClone = config.get ["services" "xserver" "isClone"];
     })
 
-- 
GitLab


From c43dc7b01362235140ec4c87c7236fb93a9aee15 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 27 Sep 2007 12:24:05 +0000
Subject: [PATCH 0610/5331] * Allow Upstart's init to be upgraded in a running
 system.

svn path=/nixos/trunk/; revision=9375
---
 boot/boot-stage-2-init.sh | 7 +++++--
 system/system.nix         | 2 +-
 system/system.sh          | 1 +
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/boot/boot-stage-2-init.sh b/boot/boot-stage-2-init.sh
index 0ec0807e853..2e19f23cb85 100644
--- a/boot/boot-stage-2-init.sh
+++ b/boot/boot-stage-2-init.sh
@@ -115,7 +115,10 @@ export MODULE_DIR=@kernel@/lib/modules/
 @shell@ @bootLocal@
 
 
-# Start Upstart's init.
+# Start Upstart's init.  We start it through the
+# /var/run/current-system symlink indirection so that we can upgrade
+# init in a running system by changing the symlink and sending init a
+# HUP signal.
 export UPSTART_CFG_DIR=/etc/event.d
 setPath "@upstartPath@"
-exec @upstart@/sbin/init -v
+exec /var/run/current-system/upstart/sbin/init -v
diff --git a/system/system.nix b/system/system.nix
index b9fbefff44f..05e131f5dcd 100644
--- a/system/system.nix
+++ b/system/system.nix
@@ -313,7 +313,7 @@ rec {
     name = "system";
     builder = ./system.sh;
     switchToConfiguration = ./switch-to-configuration.sh;
-    inherit (pkgs) grub coreutils gnused gnugrep diffutils findutils;
+    inherit (pkgs) grub coreutils gnused gnugrep diffutils findutils upstart;
     grubDevice = config.get ["boot" "grubDevice"];
     kernelParams =
       (config.get ["boot" "kernelParams"]) ++
diff --git a/system/system.sh b/system/system.sh
index 0df4273e5a2..080ad1c13c7 100644
--- a/system/system.sh
+++ b/system/system.sh
@@ -9,6 +9,7 @@ ln -s $initrd $out/initrd
 ln -s $activateConfiguration $out/activate
 ln -s $etc/etc $out/etc
 ln -s $systemPath $out/sw
+ln -s $upstart $out/upstart
 
 echo "$kernelParams" > $out/kernel-params
 echo "$configurationName" > $out/configuration-name
-- 
GitLab


From cf1140ee119e44e73e8c586b9757b21859c0bf7e Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Fri, 28 Sep 2007 07:58:40 +0000
Subject: [PATCH 0611/5331] Added option for external firmware.

svn path=/nixos/trunk/; revision=9379
---
 system/options.nix       | 10 ++++++++++
 upstart-jobs/default.nix |  4 +++-
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/system/options.nix b/system/options.nix
index dffa513008a..cb8359d41ab 100644
--- a/system/options.nix
+++ b/system/options.nix
@@ -964,6 +964,16 @@
     ";
   }
 
+  {
+	name = ["services" "udev" "addFirmware"];
+	default = [];
+	example = ["/mnt/big-storage/firmware/"];
+	description = "
+	To specify firmware that is not too spread to ensure 
+	a package, or have an interactive process of extraction
+	and cannot be redistributed.
+";
+  }
   
   {
     name = ["installer" "nixpkgsURL"];
diff --git a/upstart-jobs/default.nix b/upstart-jobs/default.nix
index f602081262a..3f66f7e137e 100644
--- a/upstart-jobs/default.nix
+++ b/upstart-jobs/default.nix
@@ -30,7 +30,9 @@ import ../upstart-jobs/gather.nix {
       inherit (pkgs) stdenv writeText substituteAll udev procps;
       inherit (pkgs.lib) cleanSource;
       firmwareDirs =
-        pkgs.lib.optional (config.get ["networking" "enableIntel2200BGFirmware"]) pkgs.ipw2200fw;
+        pkgs.lib.optional (config.get ["networking" "enableIntel2200BGFirmware"]) pkgs.ipw2200fw
+	++
+	(config.get ["services" "udev" "addFirmware"]);
       extraUdevPkgs =
         pkgs.lib.optional (config.get ["services" "hal" "enable"]) pkgs.hal;
     })
-- 
GitLab


From 2c49ef1934a0a34a464f7b33687d065e92a948b0 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Fri, 28 Sep 2007 09:38:40 +0000
Subject: [PATCH 0612/5331] Corrected MODULE_DIR in profile.sh. It also means
 that there is no more a dependency on unused kernel - basic system now
 requires only one kernel with 2_6_22.

svn path=/nixos/trunk/; revision=9380
---
 etc/profile.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/etc/profile.sh b/etc/profile.sh
index ad9629c1bd6..f51aa9ac655 100644
--- a/etc/profile.sh
+++ b/etc/profile.sh
@@ -1,5 +1,5 @@
 export PATH=@wrapperDir@:/var/run/current-system/sw/bin:/var/run/current-system/sw/sbin
-export MODULE_DIR=@kernel@/lib/modules
+export MODULE_DIR=@systemKernel@/lib/modules
 export NIX_CONF_DIR=/nix/etc/nix
 export NIXPKGS_CONFIG=/nix/etc/config.nix
 export PAGER=less
-- 
GitLab


From 39429f04410829a4c7eac750471f6b628b3de3bb Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Fri, 28 Sep 2007 11:14:39 +0000
Subject: [PATCH 0613/5331] A small correction.. Now linux-2.6.21.7 doesn't
 show up even in derivation dependedncies.

svn path=/nixos/trunk/; revision=9382
---
 etc/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/etc/default.nix b/etc/default.nix
index 8b3ee316884..b09f8ca794f 100644
--- a/etc/default.nix
+++ b/etc/default.nix
@@ -101,7 +101,7 @@ import ../helpers/make-etc.nix {
       source = pkgs.substituteAll {
         src = ./profile.sh;
         inherit systemPath wrapperDir;
-        inherit (pkgs) kernel glibc;
+        inherit (pkgs) systemKernel glibc;
         timeZone = config.get ["time" "timeZone"];
         defaultLocale = config.get ["i18n" "defaultLocale"];
       };
-- 
GitLab


From 33aa5d2d74f646df2a52c35c25d223e32cb572df Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Sun, 30 Sep 2007 21:10:11 +0000
Subject: [PATCH 0614/5331] Separated keep-alive and additional keep-alive ping
 frequency.

svn path=/nixos/trunk/; revision=9384
---
 system/options.nix    | 10 ++++++++++
 upstart-jobs/gw6c.nix |  1 +
 2 files changed, 11 insertions(+)

diff --git a/system/options.nix b/system/options.nix
index cb8359d41ab..2ec872db51c 100644
--- a/system/options.nix
+++ b/system/options.nix
@@ -1248,6 +1248,16 @@ root        ALL=(ALL) SETENV: ALL
 ";
   }
 
+  {
+	name = ["services" "gw6c" "everPing"];
+	default = "1000000";
+	example = "2";
+	description = "
+	Gateway6 manual ping period.
+";
+  }
+
+
 	{
 		name = ["services" "ircdHybrid" "enable"];
 		default = false;
diff --git a/upstart-jobs/gw6c.nix b/upstart-jobs/gw6c.nix
index 4304846a807..65884770bfe 100644
--- a/upstart-jobs/gw6c.nix
+++ b/upstart-jobs/gw6c.nix
@@ -10,6 +10,7 @@ let
 		password = getCfg "password";
 		server = getCfg "server";
 		keepAlive = getCfg "keepAlive";
+		everPing = getCfg "everPing";
 	};
 in
 {
-- 
GitLab


From f402fd73f24a926e12de57ca68f67ee0943648cc Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 3 Oct 2007 13:27:45 +0000
Subject: [PATCH 0615/5331] * Print a sensible error message if there are
 multiple declarations   for an option. * Removed double declaration for
 services.xserver.layout.

svn path=/nixos/trunk/; revision=9398
---
 system/config.nix  | 1 +
 system/options.nix | 8 --------
 2 files changed, 1 insertion(+), 8 deletions(-)

diff --git a/system/config.nix b/system/config.nix
index 7092ef6813c..dad42cbad0e 100644
--- a/system/config.nix
+++ b/system/config.nix
@@ -20,6 +20,7 @@ rec {
       decl =
         lib.findSingle (decl: lib.eqLists decl.name name)
           (abort ("Undeclared option `" + printName name + "'."))
+          (abort ("Multiple declarations for option `" + printName name + "'."))
           declarations;
       default =
         if !decl ? default
diff --git a/system/options.nix b/system/options.nix
index 2ec872db51c..2ee61a00de0 100644
--- a/system/options.nix
+++ b/system/options.nix
@@ -720,14 +720,6 @@
 	";
   }  
 
-  {
-	name = ["services" "xserver" "layout"];
-	default = "us";
-	description ="
-	Keyboard layout.
-	";
-  }  
-
   {
 	name = ["services" "xserver" "useInternalAGPGART"];
 	default = "";
-- 
GitLab


From 48acdef3c9c24cb090c4ff4945085fd2e0e0972d Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 3 Oct 2007 14:48:41 +0000
Subject: [PATCH 0616/5331] * Use the stdenv that does support \n in
 replacements.

svn path=/nixos/trunk/; revision=9399
---
 upstart-jobs/default.nix |  5 +++--
 upstart-jobs/xserver.nix | 38 +++++++++++++++++++++++++-------------
 2 files changed, 28 insertions(+), 15 deletions(-)

diff --git a/upstart-jobs/default.nix b/upstart-jobs/default.nix
index 3f66f7e137e..2baedf3ccbb 100644
--- a/upstart-jobs/default.nix
+++ b/upstart-jobs/default.nix
@@ -158,13 +158,14 @@ import ../upstart-jobs/gather.nix {
   ++ optional ["services" "xserver" "enable"]
     (import ../upstart-jobs/xserver.nix {
       inherit config;
-      inherit (pkgs) stdenv writeText lib xterm slim xorg mesa
+      inherit (pkgs) writeText lib xterm slim xorg mesa
         gnome compiz feh kdebase kdelibs xkeyboard_config
         openssh x11_ssh_askpass nvidiaDrivers synaptics;
+      stdenv = pkgs.stdenvNewSetupScript;
       libX11 = pkgs.xlibs.libX11;
       libXext = pkgs.xlibs.libXext;
       fontDirectories = import ../system/fonts.nix {inherit pkgs config;};
-	isClone = config.get ["services" "xserver" "isClone"];
+      isClone = config.get ["services" "xserver" "isClone"];
     })
 
   # Apache httpd.
diff --git a/upstart-jobs/xserver.nix b/upstart-jobs/xserver.nix
index c55f19cc5dc..87df40ef206 100644
--- a/upstart-jobs/xserver.nix
+++ b/upstart-jobs/xserver.nix
@@ -133,21 +133,33 @@ let
 
       #if only my gf were this dirty
       if test \"${toString videoDriver}\" == \"nvidia\"; then
-        export moduleSection=\"Load  \\\"glx\\\" \\
- SubSection \\\"extmod\\\" \\n \\
- Option \\\"omit xfree86-dga\\\" \\n \\
- EndSubSection \\n \"
-
-        export screen=\"Option  \\\"AddARGBGLXVisuals\\\" \\\"true\\\" \\n \\
- Option  \\\"DisableGLXRootClipping\\\" \\\"true\\\" \\n \"
-        export device=\"Option       \\\"RenderAccel\\\" \\\"true\\\" \\n \\
- Option       \\\"AllowGLXWithComposite\\\" \\\"true\\\" \\n \\
- Option       \\\"AddARGBGLXVisuals\\\"     \\\"true\\\" \\n \"
-        export extensions=\"Option       \\\"Composite\\\" \\\"Enable\\\" \\n \"
+        export moduleSection='
+          Load \"glx\"
+          SubSection \"extmod\"
+            Option \"omit xfree86-dga\"
+          EndSubSection
+        '
+
+        export screen='
+          Option \"AddARGBGLXVisuals\" \"true\"
+          Option \"DisableGLXRootClipping\" \"true\"
+        '
+        
+        export device='
+          Option \"RenderAccel\" \"true\"
+          Option \"AllowGLXWithComposite\" \"true\"
+          Option \"AddARGBGLXVisuals\" \"true\"
+        '
+        
+        export extensions='
+          Option \"Composite\" \"Enable\"
+        '
 
       else
-        export moduleSection='Load \"glx\" 
-          Load \"dri\" '
+        export moduleSection='
+          Load \"glx\"
+          Load \"dri\"
+        '
         export screen=
         export device=
         export extensions=
-- 
GitLab


From 94b7b9377ce6c25ac64bef7982a31d5f6c15ff8d Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 3 Oct 2007 15:44:30 +0000
Subject: [PATCH 0617/5331] * Option fonts.enableGhostscriptFonts to make the
 Ghostscript fonts   available to X11 apps.

svn path=/nixos/trunk/; revision=9401
---
 system/fonts.nix   |  8 +++++---
 system/options.nix | 17 ++++++++++++++---
 2 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/system/fonts.nix b/system/fonts.nix
index 2e6f5ee3d2e..75906d3e8c7 100644
--- a/system/fonts.nix
+++ b/system/fonts.nix
@@ -1,4 +1,4 @@
-{pkgs , config}:
+{pkgs, config}:
 
 [
   # - the user's .fonts directory
@@ -18,6 +18,8 @@
   pkgs.xorg.fontbh100dpi
   pkgs.xorg.fontmiscmisc
   pkgs.xorg.fontcursormisc
-] ++
-((config.get ["fonts" "extraFonts"]) pkgs)
+]
 
+++ pkgs.lib.optional (config.get ["fonts" "enableGhostscriptFonts"]) "${pkgs.ghostscript}/share/ghostscript/fonts"
+
+++ ((config.get ["fonts" "extraFonts"]) pkgs)
diff --git a/system/options.nix b/system/options.nix
index 2ee61a00de0..4da6eb290a9 100644
--- a/system/options.nix
+++ b/system/options.nix
@@ -1109,17 +1109,28 @@ root        ALL=(ALL) SETENV: ALL
 
 
   {
-    name = ["fonts" "enableFontConfig"];
+    name = ["fonts" "enableFontConfig"]; # !!! should be enableFontconfig
     default = true;
     description = "
-      If enabled, a fontconfig configuration file will be built
+      If enabled, a Fontconfig configuration file will be built
       pointing to a set of default fonts.  If you don't care about
       running X11 applications or any other program that uses
-      fontconfig, you can turn this option off and prevent a
+      Fontconfig, you can turn this option off and prevent a
       dependency on all those fonts.
     ";
   }
 
+  {
+    name = ["fonts" "enableGhostscriptFonts"];
+    default = false;
+    description = "
+      Whether to add the fonts provided by Ghostscript (such as
+      various URW fonts and the “Base-14” Postscript fonts) to the
+      list of system fonts, making them available to X11
+      applications.
+    ";
+  }
+
   {
     name = ["fonts" "extraFonts"];
     default = pkgs:[];
-- 
GitLab


From 44d09afffb37f399486e7f375cc1484c774b2db3 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Fri, 5 Oct 2007 07:25:13 +0000
Subject: [PATCH 0618/5331] Added dir option to link all fonts into share.

svn path=/nixos/trunk/; revision=9407
---
 system/fontdir.nix | 20 ++++++++++++++++++++
 system/options.nix |  9 +++++++++
 system/system.nix  |  7 +++++++
 3 files changed, 36 insertions(+)
 create mode 100644 system/fontdir.nix

diff --git a/system/fontdir.nix b/system/fontdir.nix
new file mode 100644
index 00000000000..05aa67232ed
--- /dev/null
+++ b/system/fontdir.nix
@@ -0,0 +1,20 @@
+args:
+	with args;
+stdenv.mkDerivation
+{
+	name="X11-fonts";
+	phases="installPhase";
+	fontDirs = import ./fonts.nix {inherit pkgs config;};	
+	installPhase = "
+		mkdir -p \$out/share/X11-fonts/; 
+		for i in \$fontDirs; do
+			if ! echo \$i | egrep '~|/nix/var/nix/profiles' &>/dev/null; then
+				j=\${i#/nix/store/}
+				j=\${j%%/*}
+				if ! test -e \$out/share/X11-fonts/\${g}; then
+					ln -s \$i \$out/share/X11-fonts/\${j};
+				fi;
+			fi;
+		done;
+	";
+}
diff --git a/system/options.nix b/system/options.nix
index 4da6eb290a9..33e2fd87dbe 100644
--- a/system/options.nix
+++ b/system/options.nix
@@ -1130,6 +1130,15 @@ root        ALL=(ALL) SETENV: ALL
       applications.
     ";
   }
+	{
+		name=["fonts" "enableFontDir"];
+		default = false;
+		description = "
+	Whether to create a directory with links to all fonts in share - 
+	so user can configure vncserver script one time (I mean per-user 
+	vncserver, so global service is not a good solution).
+";
+	}
 
   {
     name = ["fonts" "extraFonts"];
diff --git a/system/system.nix b/system/system.nix
index 05e131f5dcd..2f18bc327e6 100644
--- a/system/system.nix
+++ b/system/system.nix
@@ -162,6 +162,11 @@ rec {
     extraEtc = pkgs.lib.concatLists (map (job: job.extraEtc) upstartJobs.jobs);
   };
 
+  # Font aggregation
+	fontDir = import ./fontdir.nix {
+		inherit (pkgs) stdenv;
+		inherit pkgs config;
+	};
 
   # The wrapper setuid programs (since we can't have setuid programs
   # in the Nix store).
@@ -322,6 +327,8 @@ rec {
     inherit activateConfiguration;
     inherit grubMenuBuilder;
     inherit etc;
+	fontDir = (if config.get ["fonts" "enableFontDir"] then
+		fontDir else null);
     inherit systemPath;
     kernel = kernel + "/vmlinuz";
     initrd = initialRamdisk + "/initrd";
-- 
GitLab


From 9ce2dbf8d3c35a56c5e97e018909f4d31ebff3ea Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Fri, 5 Oct 2007 07:45:56 +0000
Subject: [PATCH 0619/5331] Corrected X11-fonts, now it is linked in
 /var/run/current-system

svn path=/nixos/trunk/; revision=9409
---
 system/fontdir.nix | 4 ++--
 system/system.nix  | 5 ++---
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/system/fontdir.nix b/system/fontdir.nix
index 05aa67232ed..dc8874410fb 100644
--- a/system/fontdir.nix
+++ b/system/fontdir.nix
@@ -5,13 +5,13 @@ stdenv.mkDerivation
 	name="X11-fonts";
 	phases="installPhase";
 	fontDirs = import ./fonts.nix {inherit pkgs config;};	
-	installPhase = "
+	installCommand = "
 		mkdir -p \$out/share/X11-fonts/; 
 		for i in \$fontDirs; do
 			if ! echo \$i | egrep '~|/nix/var/nix/profiles' &>/dev/null; then
 				j=\${i#/nix/store/}
 				j=\${j%%/*}
-				if ! test -e \$out/share/X11-fonts/\${g}; then
+				if ! test -e \$out/share/X11-fonts/\${j}; then
 					ln -s \$i \$out/share/X11-fonts/\${j};
 				fi;
 			fi;
diff --git a/system/system.nix b/system/system.nix
index 2f18bc327e6..faa79f4c2a1 100644
--- a/system/system.nix
+++ b/system/system.nix
@@ -229,7 +229,8 @@ rec {
   ]
   ++ pkgs.lib.optional (config.get ["security" "sudo" "enable"]) pkgs.sudo
   ++ pkgs.lib.concatLists (map (job: job.extraPath) upstartJobs.jobs)
-  ++ (config.get ["environment" "extraPackages"]) pkgs;
+  ++ (config.get ["environment" "extraPackages"]) pkgs
+  ++ pkgs.lib.optional (config.get ["fonts" "enableFontDir"]) fontDir;
 
 
   # We don't want to put all of `startPath' and `path' in $PATH, since
@@ -327,8 +328,6 @@ rec {
     inherit activateConfiguration;
     inherit grubMenuBuilder;
     inherit etc;
-	fontDir = (if config.get ["fonts" "enableFontDir"] then
-		fontDir else null);
     inherit systemPath;
     kernel = kernel + "/vmlinuz";
     initrd = initialRamdisk + "/initrd";
-- 
GitLab


From 5c08d306e535523c8fec1cebbf79886ab5a9deee Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Fri, 5 Oct 2007 12:51:05 +0000
Subject: [PATCH 0620/5331] Some more corrections to fontDir; now suitable as
 fontPath for Xvnc

svn path=/nixos/trunk/; revision=9410
---
 system/fontdir.nix | 30 +++++++++++++++++++++++-------
 system/system.nix  |  1 +
 2 files changed, 24 insertions(+), 7 deletions(-)

diff --git a/system/fontdir.nix b/system/fontdir.nix
index dc8874410fb..846bfd5388d 100644
--- a/system/fontdir.nix
+++ b/system/fontdir.nix
@@ -5,16 +5,32 @@ stdenv.mkDerivation
 	name="X11-fonts";
 	phases="installPhase";
 	fontDirs = import ./fonts.nix {inherit pkgs config;};	
+	buildInputs = [mkfontdir mkfontscale];
+	inherit fontalias;
 	installCommand = "
+		list='';
+		for i in \$fontDirs ; do
+			if [ -d \$i/ ]; then
+				list=\"\$list \$i\";
+			fi;
+		done
+		list=\$(find \$list -name fonts.dir);
+		fontDirs='';
+		for i in \$list ; do
+			fontDirs=\"\$fontDirs \$(dirname \$i)\";
+		done;
 		mkdir -p \$out/share/X11-fonts/; 
-		for i in \$fontDirs; do
-			if ! echo \$i | egrep '~|/nix/var/nix/profiles' &>/dev/null; then
-				j=\${i#/nix/store/}
-				j=\${j%%/*}
-				if ! test -e \$out/share/X11-fonts/\${j}; then
-					ln -s \$i \$out/share/X11-fonts/\${j};
-				fi;
+		for i in \$(find \$fontDirs -type f); do
+			j=\${i##*/}
+			if ! test -e \$out/share/X11-fonts/\${j}; then
+				ln -s \$i \$out/share/X11-fonts/\${j};
 			fi;
 		done;
+		cd \$out/share/X11-fonts/
+		rm fonts.dir
+		rm fonts.scale
+		mkfontdir
+		mkfontscale
+		cat \$( find \$fontalias/ -name fonts.alias) >fonts.alias
 	";
 }
diff --git a/system/system.nix b/system/system.nix
index faa79f4c2a1..0aa5ad01bbf 100644
--- a/system/system.nix
+++ b/system/system.nix
@@ -166,6 +166,7 @@ rec {
 	fontDir = import ./fontdir.nix {
 		inherit (pkgs) stdenv;
 		inherit pkgs config;
+		inherit (pkgs.xorg) mkfontdir mkfontscale fontalias;
 	};
 
   # The wrapper setuid programs (since we can't have setuid programs
-- 
GitLab


From 073c0fec9fb8a5b531a12f3ea9ecc75ea491259c Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 5 Oct 2007 12:56:44 +0000
Subject: [PATCH 0621/5331] * Include the conf.d directory shipped in the
 fontconfig distribution. * Don't use $fontconfig/var/cache/fontconfig as a
 cache (when running   as root), instead use /var/cache/fontconfig.

svn path=/nixos/trunk/; revision=9411
---
 etc/default.nix               |  1 +
 etc/fonts/make-fonts-conf.xsl | 11 +++++++++--
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/etc/default.nix b/etc/default.nix
index b09f8ca794f..f9d567d20a9 100644
--- a/etc/default.nix
+++ b/etc/default.nix
@@ -125,6 +125,7 @@ import ../helpers/make-etc.nix {
         inherit (pkgs) fontconfig;
       }
       "xsltproc --stringparam fontDirectories \"$fontDirectories\" \\
+          --stringparam fontconfig \"$fontconfig\" \\
           ${./fonts/make-fonts-conf.xsl} $fontconfig/etc/fonts/fonts.conf \\
           > $out
       ";
diff --git a/etc/fonts/make-fonts-conf.xsl b/etc/fonts/make-fonts-conf.xsl
index 73deb41c65e..f716700d98e 100644
--- a/etc/fonts/make-fonts-conf.xsl
+++ b/etc/fonts/make-fonts-conf.xsl
@@ -15,12 +15,19 @@
   <xsl:output method='xml' encoding="UTF-8" doctype-system="fonts.dtd" />
 
   <xsl:param name="fontDirectories" />
+  <xsl:param name="fontconfig" />
 
   <xsl:template match="/fontconfig">
 
     <fontconfig>
-      <xsl:copy-of select="child::node()[name() != 'dir']" />
+      <xsl:copy-of select="child::node()[name() != 'dir' and name() != 'cachedir' and name() != 'include']" />
 
+      <include xml:space="preserve"><xsl:value-of select="$fontconfig" />/etc/fonts/conf.d</include>
+      <include ignore_missing="yes" xml:space="preserve">/etc/fonts/conf.d</include>
+      
+      <cachedir xml:space="preserve">/var/cache/fontconfig</cachedir>
+      <cachedir xml:space="preserve">~/.fontconfig</cachedir>
+      
       <xsl:for-each select="str:tokenize($fontDirectories)">
         <dir><xsl:value-of select="." /></dir>
         <xsl:text>&#0010;</xsl:text>
@@ -30,4 +37,4 @@
 
   </xsl:template>
   
-</xsl:stylesheet>
\ No newline at end of file
+</xsl:stylesheet>
-- 
GitLab


From 2cc89b09e63d11d9183373f0138a2c0ae4305b11 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sat, 6 Oct 2007 18:53:50 +0000
Subject: [PATCH 0622/5331] * Create /dev/{stdin,stdout,stderr}.

svn path=/nixos/trunk/; revision=9416
---
 system/activate-configuration.sh | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/system/activate-configuration.sh b/system/activate-configuration.sh
index 5474dd905cb..7aba11b2642 100644
--- a/system/activate-configuration.sh
+++ b/system/activate-configuration.sh
@@ -11,6 +11,9 @@ for i in @path@; do PATH=$PATH:$i/bin:$i/sbin; done
 
 # Needed by some programs.
 ln -sfn /proc/self/fd /dev/fd
+ln -sfn /proc/self/fd/0 /dev/stdin
+ln -sfn /proc/self/fd/1 /dev/stdout
+ln -sfn /proc/self/fd/2 /dev/stderr
 
 
 # Set up the statically computed bits of /etc.
-- 
GitLab


From 6d65f0ae03ae14f3e978d89959253d9a8f5e0ec1 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 10 Oct 2007 14:28:40 +0000
Subject: [PATCH 0623/5331] * Disable the check on sudoers (NIXOS-66).

svn path=/nixos/trunk/; revision=9438
---
 etc/default.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/etc/default.nix b/etc/default.nix
index f9d567d20a9..450d96efc49 100644
--- a/etc/default.nix
+++ b/etc/default.nix
@@ -147,7 +147,9 @@ import ../helpers/make-etc.nix {
       { src = pkgs.writeText "sudoers-in" (config.get ["security" "sudo" "configFile"]);
       }
       # Make sure that the sudoers file is syntactically valid.
-      "${pkgs.sudo}/sbin/visudo -f $src -c && cp $src $out";
+      # (currently disabled - NIXOS-66)
+      #"${pkgs.sudo}/sbin/visudo -f $src -c && cp $src $out";
+      "cp $src $out";
     target = "sudoers";
     mode = "0440";
   })
-- 
GitLab


From ee2b3dccd86da59590752a4cc2a57fbdffb5c70a Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 19 Oct 2007 11:55:24 +0000
Subject: [PATCH 0624/5331] * Use the latest Nixpkgs for the CD.

svn path=/nixos/trunk/; revision=9480
---
 configuration/rescue-cd.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/configuration/rescue-cd.nix b/configuration/rescue-cd.nix
index 5ba75e760e8..59f0ed59e22 100644
--- a/configuration/rescue-cd.nix
+++ b/configuration/rescue-cd.nix
@@ -4,7 +4,7 @@
 rec {
 
   
-  nixpkgsRel = "nixpkgs-0.11pre9274";
+  nixpkgsRel = "nixpkgs-0.12pre9479";
 
 
   configuration = {
@@ -126,7 +126,7 @@ rec {
   # Get a recent copy of Nixpkgs.
   nixpkgsTarball = pkgs.fetchurl {
     url = configuration.installer.nixpkgsURL + "/" + nixpkgsRel + ".tar.bz2";
-    md5 = "5cd0f41665dee8f04f00d2d5e514021f";
+    md5 = "1b78724c2f2d93c4f4f4477a22f6eda5";
   };
 
 
-- 
GitLab


From 8f7d294cdc43256ea205ce7e17dd9d6d55ad1da6 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 19 Oct 2007 15:09:34 +0000
Subject: [PATCH 0625/5331] svn path=/nixos/trunk/; revision=9488

---
 configuration/rescue-cd.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/configuration/rescue-cd.nix b/configuration/rescue-cd.nix
index 59f0ed59e22..b576caede2f 100644
--- a/configuration/rescue-cd.nix
+++ b/configuration/rescue-cd.nix
@@ -4,7 +4,7 @@
 rec {
 
   
-  nixpkgsRel = "nixpkgs-0.12pre9479";
+  nixpkgsRel = "nixpkgs-0.12pre9486";
 
 
   configuration = {
@@ -126,7 +126,7 @@ rec {
   # Get a recent copy of Nixpkgs.
   nixpkgsTarball = pkgs.fetchurl {
     url = configuration.installer.nixpkgsURL + "/" + nixpkgsRel + ".tar.bz2";
-    md5 = "1b78724c2f2d93c4f4f4477a22f6eda5";
+    md5 = "22deefec0696d2fb263864b97e2238d3";
   };
 
 
-- 
GitLab


From 607a32c86fef5ccea0c461cb582f11a2989b77bb Mon Sep 17 00:00:00 2001
From: "Yury G. Kudryashov" <urkud.urkud@gmail.com>
Date: Fri, 19 Oct 2007 19:15:48 +0000
Subject: [PATCH 0626/5331] Fixed typo in options.nix

svn path=/nixos/trunk/; revision=9494
---
 system/options.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/system/options.nix b/system/options.nix
index 33e2fd87dbe..aa2c207704e 100644
--- a/system/options.nix
+++ b/system/options.nix
@@ -201,7 +201,7 @@
     description = "
       Whether the Grub menu builder should copy kernels and initial
       ramdisks to /boot.  This is necessary when /nix is on a
-      different file system than /.
+      different file system than /boot.
     ";
   }
 
-- 
GitLab


From 662b487e7768b2259101595e0616fd8a71f8d833 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 19 Oct 2007 19:33:15 +0000
Subject: [PATCH 0627/5331] * Doh doh doh!

svn path=/nixos/trunk/; revision=9497
---
 default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/default.nix b/default.nix
index 889d2ca873f..9fb40052084 100644
--- a/default.nix
+++ b/default.nix
@@ -36,7 +36,7 @@ in
   # /etc/nixos/nixos -A upstartJobs.xserver").  
   upstartJobs = { recurseForDerivations = true; } //
     builtins.listToAttrs (map (job:
-      { attr = if job ? jobName then job.jobName else job.name; value = job; }
+      { name = if job ? jobName then job.jobName else job.name; value = job; }
     ) system.upstartJobs.jobs);
 
 }
-- 
GitLab


From d2f337c87284e23cd6a8256859beeacc128d9dfa Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 23 Oct 2007 16:42:10 +0000
Subject: [PATCH 0628/5331] * Set $ASPELL_EXTRA_DICT_DIRS so that Aspell
 dictionaries   installed with nix-env are found automatically.

svn path=/nixos/trunk/; revision=9514
---
 etc/profile.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/etc/profile.sh b/etc/profile.sh
index f51aa9ac655..cb915a7f7c4 100644
--- a/etc/profile.sh
+++ b/etc/profile.sh
@@ -48,6 +48,7 @@ NIX_PROFILES="/nix/var/nix/profiles/default $NIX_USER_PROFILE_DIR/profile"
 
 for i in $NIX_PROFILES; do # !!! reverse
     export PATH=$i/bin:$i/sbin:$PATH
+    export ASPELL_EXTRA_DICT_DIRS="$i/lib/aspell${ASPELL_EXTRA_DICT_DIRS:+,}$ASPELL_EXTRA_DICT_DIRS"
 done
 
 export PATH=$HOME/bin:$PATH
-- 
GitLab


From e4626e0f0d7c667591f39a399e71b0eb289784fd Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Fri, 26 Oct 2007 04:28:01 +0000
Subject: [PATCH 0629/5331] Added some options for manual text insertion into
 xorg.conf . Removed (commented out) MonitorLayout by default. It was the
 thing that prevents i915GM on laptops from working. Those who need it can add
 it back in extraDeviceOptions.

svn path=/nixos/trunk/; revision=9527
---
 system/options.nix        | 50 ++++++++++++++++++++++++++++++++++++++-
 upstart-jobs/xserver.conf |  8 +++++--
 upstart-jobs/xserver.nix  |  6 +++++
 3 files changed, 61 insertions(+), 3 deletions(-)

diff --git a/system/options.nix b/system/options.nix
index aa2c207704e..182653a1e6c 100644
--- a/system/options.nix
+++ b/system/options.nix
@@ -729,7 +729,55 @@
 	";
   }  
 
-  
+  {
+	name = ["services" "xserver" "extraDeviceConfig"];
+	default = "";
+	example = "VideoRAM 131072";
+	description ="
+	Just anything to add into Device section.
+	";
+  }  
+
+  {
+	name = ["services" "xserver" "extraMonitorSettings"];
+	default = "";
+	example = "HorizSync 28-49";
+	description ="
+	Just anything to add into Monitor section.
+	";
+  }  
+
+  {
+	name = ["services" "xserver" "extraModules"];
+	default = "";
+	example = "SubSection \"extmod\"
+			EndSubsection";
+	description ="
+	Just anything to add into Modules section.
+	";
+  }  
+
+  {
+	name = ["services" "xserver" "serverLayoutOptions"];
+	default = "";
+	example = "
+	Option \"AIGLX\" \"true\"
+";
+	description ="
+	Just anything to add into Monitor section.
+	";
+  }  
+
+  {
+	name = ["services" "xserver" "defaultDepth"];
+	default = 24;
+	example = 8;
+	description ="
+	Default colour depth.
+	";
+  }  
+
+
   {
     name = ["services" "httpd" "enable"];
     default = false;
diff --git a/upstart-jobs/xserver.conf b/upstart-jobs/xserver.conf
index 52b04f38f0f..a7defb98431 100644
--- a/upstart-jobs/xserver.conf
+++ b/upstart-jobs/xserver.conf
@@ -20,6 +20,7 @@ Section "Module"
   Load "type1"
   Load "vbe"
   @moduleSection@
+	@extraModules@
 EndSection
 
 
@@ -47,6 +48,7 @@ Section "Monitor"
   Option       "DPMS"
 #  HorizSync    28-49
 #  VertRefresh  43-75
+	@extraMonitorSettings@
 EndSection
 
 
@@ -54,7 +56,7 @@ Section "Screen"
   Identifier   "Screen[0]"
   Device       "Device[0]"
   Monitor      "Monitor[0]"
-  DefaultDepth 24
+  DefaultDepth @defaultDepth@
   SubSection "Display"
     Depth      16
     Modes      @resolutions@
@@ -77,9 +79,10 @@ Section "Device"
   Driver       "@videoDriver@"
   Option       "Clone" "@isClone@"
   #Option       "MonitorLayout" "CRT,LFP"
-  Option       "MonitorLayout" "LVDS,CRT"
+  #Option       "MonitorLayout" "LVDS,CRT"
   @device@
   @internalAGPGART@
+  @extraDeviceConfig@
 EndSection
 
 
@@ -88,6 +91,7 @@ Section "ServerLayout"
   InputDevice  "Keyboard[0]" "CoreKeyboard"
   InputDevice  "@corePointer@" "CorePointer"
   Screen       "Screen[0]"
+	@serverLayoutOptions@
 EndSection
 
 
diff --git a/upstart-jobs/xserver.nix b/upstart-jobs/xserver.nix
index 87df40ef206..32810b79c5b 100644
--- a/upstart-jobs/xserver.nix
+++ b/upstart-jobs/xserver.nix
@@ -63,6 +63,7 @@ let
       xorg.xf86inputmouse
     ] 
     ++ optional (videoDriver == "vesa") xorg.xf86videovesa
+    ++ optional (videoDriver == "vga") xorg.xf86videovga
     ++ optional (videoDriver == "sis") xorg.xf86videosis
     ++ optional (videoDriver == "i810") xorg.xf86videoi810
     ++ optional (videoDriver == "intel") xorg.xf86videointel
@@ -111,6 +112,11 @@ let
 		"  Option \"UseInternalAGPGART\" \"no\"" else 
 		"    ");
 
+	extraDeviceConfig = getCfg "extraDeviceConfig"; 
+	extraMonitorSettings = getCfg "extraMonitorSettings"; 
+	extraModules = getCfg "extraModules"; 
+	serverLayoutOptions = getCfg "serverLayoutOptions"; 
+	defaultDepth = getCfg "defaultDepth"; 
 
     buildCommand = "
       buildCommand= # urgh, don't substitute this
-- 
GitLab


From b4be8e3b9270f5ed5e993cab4cc7ce4ee7a05647 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Fri, 26 Oct 2007 04:49:44 +0000
Subject: [PATCH 0630/5331] Added a way to add arbitrary entries in /etc/hosts
 .

svn path=/nixos/trunk/; revision=9528
---
 etc/default.nix    | 5 ++++-
 etc/hosts          | 1 +
 system/options.nix | 6 ++++++
 3 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/etc/default.nix b/etc/default.nix
index 450d96efc49..1e7f3dc7dd9 100644
--- a/etc/default.nix
+++ b/etc/default.nix
@@ -45,7 +45,10 @@ import ../helpers/make-etc.nix {
     }
 
     { # Hostname-to-IP mappings.
-      source = ./hosts;
+      source = pkgs.substituteAll{
+	src = ./hosts;
+	extraHosts = config.get ["networking" "extraHosts"];
+	};
       target = "hosts";
     }
 
diff --git a/etc/hosts b/etc/hosts
index 75721cd5afd..2774e092d85 100644
--- a/etc/hosts
+++ b/etc/hosts
@@ -1 +1,2 @@
 127.0.0.1 localhost
+@extraHosts@
diff --git a/system/options.nix b/system/options.nix
index 182653a1e6c..4e28b48d413 100644
--- a/system/options.nix
+++ b/system/options.nix
@@ -235,6 +235,12 @@
     description = "The name of the machine.";
   }
 
+  {
+	name = ["networking" "extraHosts"];
+	default = "";
+	example = "192.168.0.1 lanlocalhost";
+	description = "Pasted verbatim into /etc/hosts.";
+  }
 
   {
     name = ["networking" "useDHCP"];
-- 
GitLab


From fc31c8c9b53be130fc7e5afd0ddd3359b84af8ae Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Fri, 26 Oct 2007 05:02:50 +0000
Subject: [PATCH 0631/5331] Allowed overriding 127.0.0.1

svn path=/nixos/trunk/; revision=9529
---
 etc/hosts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/etc/hosts b/etc/hosts
index 2774e092d85..71dd03ed229 100644
--- a/etc/hosts
+++ b/etc/hosts
@@ -1,2 +1,2 @@
-127.0.0.1 localhost
 @extraHosts@
+127.0.0.1 localhost
-- 
GitLab


From 0ff3fc188227f9ac57604547b3958a570a7b5b75 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Fri, 26 Oct 2007 05:52:35 +0000
Subject: [PATCH 0632/5331] Added option tcpEnable for X server. Needed for
 xmove.

svn path=/nixos/trunk/; revision=9532
---
 system/options.nix       | 9 ++++++++-
 upstart-jobs/xserver.nix | 4 ++--
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/system/options.nix b/system/options.nix
index 4e28b48d413..75ddec16cc4 100644
--- a/system/options.nix
+++ b/system/options.nix
@@ -586,7 +586,14 @@
     ";
   }
 
-  
+  {
+    name = ["services" "xserver" "tcpEnable"];
+    default = false;
+    description = "
+      Whether to enable TCP socket for the X server.
+    ";
+  }
+
   {
     name = ["services" "xserver" "resolutions"];
     default = [{x = 1024; y = 768;} {x = 800; y = 600;} {x = 640; y = 480;}];
diff --git a/upstart-jobs/xserver.nix b/upstart-jobs/xserver.nix
index 32810b79c5b..8b1d59ea40f 100644
--- a/upstart-jobs/xserver.nix
+++ b/upstart-jobs/xserver.nix
@@ -286,13 +286,13 @@ let
     "-ac"
     "-logverbose"
     "-verbose"
-    "-nolisten tcp"
     "-terminate"
     "-logfile" "/var/log/X.${toString display}.log"
     "-config ${configFile}"
     ":${toString display}" "vt${toString tty}"
     "-xkbdir" "${xkeyboard_config}/etc/X11/xkb"
-  ];
+  ] ++ (if ! config.get ["services" "xserver" "tcpEnable"]
+	then ["-nolisten tcp"] else []);
 
   
   # Note: lines must not be indented.
-- 
GitLab


From 8881c10ca416765a7d4dcf8cf2f2ea6ea368968a Mon Sep 17 00:00:00 2001
From: Wouter den Breejen <uu@denbreejen.net>
Date: Sat, 27 Oct 2007 13:04:00 +0000
Subject: [PATCH 0633/5331] Dont let the 'normal' fsck check a ext3cow
 partitions anymore since it thinks it fixes inodes but it will actually cause
 ext3cow to loose data .....

svn path=/nixos/trunk/; revision=9537
---
 upstart-jobs/filesystems.nix | 2 +-
 upstart-jobs/xserver.conf    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/upstart-jobs/filesystems.nix b/upstart-jobs/filesystems.nix
index cda4e76f5d0..b8d1fd9dab5 100644
--- a/upstart-jobs/filesystems.nix
+++ b/upstart-jobs/filesystems.nix
@@ -46,7 +46,7 @@ script
             if echo \"$device\" | grep -q '^LABEL='; then isLabel=1; fi
 
             isPseudo=
-            if test \"$fsType\" = \"nfs\"; then isPseudo=1; fi
+            if test \"$fsType\" = \"nfs\" || test \"$fsType\" = \"ext3cow\"; then isPseudo=1; fi
 
             if ! test -n \"$isLabel\" -o -n \"$isPseudo\" -o -e \"$device\"; then
                 echo \"skipping $device, doesn't exist (yet)\"
diff --git a/upstart-jobs/xserver.conf b/upstart-jobs/xserver.conf
index a7defb98431..dba567a9e7e 100644
--- a/upstart-jobs/xserver.conf
+++ b/upstart-jobs/xserver.conf
@@ -48,7 +48,7 @@ Section "Monitor"
   Option       "DPMS"
 #  HorizSync    28-49
 #  VertRefresh  43-75
-	@extraMonitorSettings@
+  @extraMonitorSettings@
 EndSection
 
 
-- 
GitLab


From a357a601bf1cd5035076f51f41ecfed096d87a99 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Sat, 27 Oct 2007 17:47:54 +0000
Subject: [PATCH 0634/5331] Enable composite extension for i810.

svn path=/nixos/trunk/; revision=9541
---
 upstart-jobs/xserver.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/upstart-jobs/xserver.nix b/upstart-jobs/xserver.nix
index 8b1d59ea40f..ce0ed82c1d8 100644
--- a/upstart-jobs/xserver.nix
+++ b/upstart-jobs/xserver.nix
@@ -170,6 +170,12 @@ let
         export device=
         export extensions=
       fi
+	
+	if [ \"${toString videoDriver}\" = i810 ]; then
+		extensions='
+	Option \"Composite\" \"Enable\"
+';
+	fi;
 
       substituteAll $src $out
     ";
-- 
GitLab


From f7fd4c9a6da8a17752fad97a45de467555a6799e Mon Sep 17 00:00:00 2001
From: Wouter den Breejen <uu@denbreejen.net>
Date: Mon, 29 Oct 2007 14:24:24 +0000
Subject: [PATCH 0635/5331] Fixed ../ to ../../services reference

svn path=/nixos/trunk/; revision=9552
---
 upstart-jobs/httpd.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/upstart-jobs/httpd.nix b/upstart-jobs/httpd.nix
index 080f3440373..4829a3ebef2 100644
--- a/upstart-jobs/httpd.nix
+++ b/upstart-jobs/httpd.nix
@@ -26,7 +26,7 @@ let
   startingDependency = if (config.get [ "services" "gw6c" "enable" ]) 
 	then "gw6c" else "network-interfaces";
   
-  webServer = import ../services/apache-httpd {
+  webServer = import ../../services/apache-httpd {
     inherit (pkgs) apacheHttpd coreutils;
     stdenv = pkgs.stdenvNewSetupScript;
     php = if getCfg "mod_php" then pkgs.php else null;
@@ -40,7 +40,7 @@ let
       # The Subversion subservice.
       (optional (getCfgSvn "enable") (
         let dataDir = getCfgSvn "dataDir"; in
-        import ../services/subversion ({
+        import ../../services/subversion ({
           reposDir = dataDir + "/repos";
           dbDir = dataDir + "/db";
           distsDir = dataDir + "/dist";
-- 
GitLab


From 79c7f2cecc27cf8e801448b6b7265553c8f551c7 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 1 Nov 2007 15:58:01 +0000
Subject: [PATCH 0636/5331] * Make fsck shut up about missing fstab. 
 Contributed   by Nicolas Pierron.

svn path=/nixos/trunk/; revision=9571
---
 boot/boot-stage-1-init.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/boot/boot-stage-1-init.sh b/boot/boot-stage-1-init.sh
index 68a8b236afd..79c1c3ff418 100644
--- a/boot/boot-stage-1-init.sh
+++ b/boot/boot-stage-1-init.sh
@@ -103,7 +103,7 @@ mountFS() {
     fi
 
     if test -n "$mustCheck"; then
-        fsck -C -a "$device"
+        FSTAB_FILE="/etc/mtab" fsck -C -a "$device"
         fsckResult=$?
 
         if test $(($fsckResult | 2)) = $fsckResult; then
-- 
GitLab


From b494c20cb5c35a3fb95b62bea754efc00a630c04 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Mon, 5 Nov 2007 08:33:12 +0000
Subject: [PATCH 0637/5331] Small correction to xserver.nix for compiz; also
 nixos-checkout now creates services where it should be.

svn path=/nixos/trunk/; revision=9578
---
 installer/nixos-checkout.sh | 5 +++--
 system/options.nix          | 8 ++++++++
 upstart-jobs/xserver.nix    | 3 ++-
 3 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/installer/nixos-checkout.sh b/installer/nixos-checkout.sh
index b4767d292e1..c9658f66c6d 100644
--- a/installer/nixos-checkout.sh
+++ b/installer/nixos-checkout.sh
@@ -21,14 +21,15 @@ if test -e nixpkgs -a ! -e nixpkgs/.svn; then
     mv nixpkgs nixpkgs-$backupTimestamp
 fi
 
-if test -e nixos/services -a ! -e nixos/services/.svn; then
+if test -e services -a ! -e services/.svn; then
     mv nixos/services services-$backupTimestamp
 fi
 
 # Check out the NixOS and Nixpkgs sources.
 svn co https://svn.cs.uu.nl:12443/repos/trace/nixos/trunk nixos
 svn co https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk nixpkgs
-svn co https://svn.cs.uu.nl:12443/repos/trace/services/trunk nixos/services
+svn co https://svn.cs.uu.nl:12443/repos/trace/services/trunk services
+ln -sf services nixos/services
 
 # A few symlink.
 ln -sfn ../nixpkgs/pkgs nixos/pkgs
diff --git a/system/options.nix b/system/options.nix
index 75ddec16cc4..c43c91098fc 100644
--- a/system/options.nix
+++ b/system/options.nix
@@ -650,6 +650,14 @@
     ";
   }
 
+	{
+		name = ["services" "xserver" "renderingFlag"];
+		default = "";
+		example = "--indirect-rendering";
+		description = "
+			Possibly pass --indierct-rendering to Compiz.
+		";
+	}
   
   {
     name = ["services" "xserver" "sessionStarter"];
diff --git a/upstart-jobs/xserver.nix b/upstart-jobs/xserver.nix
index ce0ed82c1d8..06f9492e243 100644
--- a/upstart-jobs/xserver.nix
+++ b/upstart-jobs/xserver.nix
@@ -38,6 +38,7 @@ let
   resolutions = map (res: "\"${toString res.x}x${toString res.y}\"") (getCfg "resolutions");
   sessionType = getCfg "sessionType";
   sessionStarter = getCfg "sessionStarter";
+  renderingFlag = getCfg "renderingFlag";
 
 
   sessionCmd =
@@ -238,7 +239,7 @@ let
 
       # Start Compiz and the GTK-style window decorator.
       env LD_LIBRARY_PATH=${libX11}/lib:${libXext}/lib:/usr/lib/
-      ${compiz}/bin/compiz gconf &
+      ${compiz}/bin/compiz gconf ${renderingFlag}&
       ${compiz}/bin/gtk-window-decorator --sync &
     "
     #else if windowManager == "beryl" then "
-- 
GitLab


From 8c9d312e21177c2853f10db29d262bab3fa26d25 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Mon, 5 Nov 2007 08:54:30 +0000
Subject: [PATCH 0638/5331] Added xfs; fixed nixos-checkout

svn path=/nixos/trunk/; revision=9579
---
 installer/nixos-checkout.sh |  2 +-
 system/options.nix          |  9 +++++++++
 upstart-jobs/default.nix    |  6 ++++++
 upstart-jobs/xfs.conf       | 15 +++++++++++++++
 upstart-jobs/xfs.nix        | 20 ++++++++++++++++++++
 5 files changed, 51 insertions(+), 1 deletion(-)
 create mode 100644 upstart-jobs/xfs.conf
 create mode 100644 upstart-jobs/xfs.nix

diff --git a/installer/nixos-checkout.sh b/installer/nixos-checkout.sh
index c9658f66c6d..d5a393a7eb6 100644
--- a/installer/nixos-checkout.sh
+++ b/installer/nixos-checkout.sh
@@ -29,7 +29,7 @@ fi
 svn co https://svn.cs.uu.nl:12443/repos/trace/nixos/trunk nixos
 svn co https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk nixpkgs
 svn co https://svn.cs.uu.nl:12443/repos/trace/services/trunk services
-ln -sf services nixos/services
+ln -sfn ../services nixos/services
 
 # A few symlink.
 ln -sfn ../nixpkgs/pkgs nixos/pkgs
diff --git a/system/options.nix b/system/options.nix
index c43c91098fc..44543996cd4 100644
--- a/system/options.nix
+++ b/system/options.nix
@@ -1415,4 +1415,13 @@ root        ALL=(ALL) SETENV: ALL
 ";
 	}
 	
+	{
+	name = ["services" "xfs" "enable"];
+	default = false;
+	description = "
+	Whether to enable X Font Server.
+";
+  }
+
+
 ]
diff --git a/upstart-jobs/default.nix b/upstart-jobs/default.nix
index 2baedf3ccbb..7ac0e5d9503 100644
--- a/upstart-jobs/default.nix
+++ b/upstart-jobs/default.nix
@@ -194,6 +194,12 @@ import ../upstart-jobs/gather.nix {
       inherit config pkgs;
     })
 
+  # X Font Server
+  ++ optional ["services" "xfs" "enable"]
+  (import ../upstart-jobs/xfs.nix {
+  	inherit config pkgs;
+  })
+
   ++ optional ["services" "ircdHybrid" "enable"]
     (import ../upstart-jobs/ircd-hybrid.nix {
       inherit config pkgs;
diff --git a/upstart-jobs/xfs.conf b/upstart-jobs/xfs.conf
new file mode 100644
index 00000000000..5352d74faa0
--- /dev/null
+++ b/upstart-jobs/xfs.conf
@@ -0,0 +1,15 @@
+# font server configuration file
+# $Xorg: config.cpp,v 1.3 2000/08/17 19:54:19 cpqbld Exp $
+
+clone-self = on
+use-syslog = off
+error-file = /var/log/xfs.log
+# in decipoints
+default-point-size = 120
+default-resolutions = 75,75,100,100
+
+# font cache control, specified in KB
+cache-hi-mark = 2048
+cache-low-mark = 1433
+cache-balance = 70
+catalogue = /var/run/current-system/sw/share/X11-fonts/
diff --git a/upstart-jobs/xfs.nix b/upstart-jobs/xfs.nix
new file mode 100644
index 00000000000..19f7f6d4db4
--- /dev/null
+++ b/upstart-jobs/xfs.nix
@@ -0,0 +1,20 @@
+{
+	pkgs, config
+}:
+let
+	configFile = ./xfs.conf;
+  startingDependency = if (config.get [ "services" "gw6c" "enable" ]) 
+	then "gw6c" else "network-interfaces";
+in
+rec {
+	name = "xfs";
+	groups = [];
+	users = [];
+	job = "
+		description = \"X Font Server\"
+		start on ${startingDependency}/started
+		stop on ${startingDependency}/stop
+
+		respawn ${pkgs.xorg.xfs}/bin/xfs -config ${configFile}
+	";
+}
-- 
GitLab


From 81c7e17e0291b57b434b82b4ed1970b18de6f3ca Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 5 Nov 2007 11:19:51 +0000
Subject: [PATCH 0639/5331] * An option nix.useChroot to enable chroot builds
 in NixOS.

svn path=/nixos/trunk/; revision=9583
---
 etc/default.nix                  | 11 +++++++++++
 system/activate-configuration.sh | 11 +----------
 system/options.nix               | 18 +++++++++++++++---
 system/system.nix                |  2 --
 4 files changed, 27 insertions(+), 15 deletions(-)

diff --git a/etc/default.nix b/etc/default.nix
index 1e7f3dc7dd9..414b4ccde72 100644
--- a/etc/default.nix
+++ b/etc/default.nix
@@ -116,6 +116,17 @@ import ../helpers/make-etc.nix {
       target = "inputrc";
     }
 
+    { # Nix configuration.
+      source = pkgs.writeText "nix.conf" "
+        # WARNING: this file is generated.
+        build-users-group = nixbld
+        build-max-jobs = ${toString (config.get ["nix" "maxJobs"])}
+        build-use-chroot = ${if config.get ["nix" "useChroot"] then "true" else "false"}
+        build-chroot-dirs = /dev /proc /bin /etc
+        ${config.get ["nix" "extraOptions"]}
+      ";
+      target = "nix.conf"; # will be symlinked from /nix/etc/nix/nix.conf in activate-configuration.sh.
+    }
   ]
 
   # Configuration file for fontconfig used to locate
diff --git a/system/activate-configuration.sh b/system/activate-configuration.sh
index 7aba11b2642..fecfa7cb5a3 100644
--- a/system/activate-configuration.sh
+++ b/system/activate-configuration.sh
@@ -101,17 +101,8 @@ fi
 
 # Set up Nix.
 if test -z "@readOnlyRoot@"; then
-
     mkdir -p /nix/etc/nix
-    cat > /nix/etc/nix/nix.conf <<EOF
-# WARNING: this file is generated.
-build-users-group = nixbld
-build-max-jobs = @maxJobs@
-
-@extraNixOptions@
-
-EOF
-
+    ln -sfn /etc/nix.conf /nix/etc/nix/nix.conf
     chown root.nixbld /nix/store
     chmod 1775 /nix/store
 fi
diff --git a/system/options.nix b/system/options.nix
index 44543996cd4..7c5744e1093 100644
--- a/system/options.nix
+++ b/system/options.nix
@@ -1073,15 +1073,27 @@
     ";
   }
 
+  {
+    name = ["nix" "useChroot"];
+    default = false;
+    example = true;
+    description = "
+      If set, Nix will perform builds in a chroot-environment that it
+      will set up automatically for each build.  This prevents
+      impurities in builds by disallowing access to dependencies
+      outside of the Nix store.
+    ";
+  }
+  
   {
     name = ["nix" "extraOptions"];
     default = "";
     example = "
-	gc-keep-outputs = true
-	gc-keep-derivations = true
+      gc-keep-outputs = true
+      gc-keep-derivations = true
     ";
     description = "
-	This option allows to append lines to nix.conf. 
+      This option allows to append lines to nix.conf. 
     ";
   }
   
diff --git a/system/system.nix b/system/system.nix
index 0aa5ad01bbf..c005f79e639 100644
--- a/system/system.nix
+++ b/system/system.nix
@@ -266,8 +266,6 @@ rec {
       config.get ["security" "setuidPrograms"] ++
       config.get ["security" "extraSetuidPrograms"] ++
       pkgs.lib.optional (config.get ["security" "sudo" "enable"]) "sudo";
-    maxJobs = config.get ["nix" "maxJobs"];
-    extraNixOptions = config.get ["nix" "extraOptions"];
 
     inherit (usersGroups) createUsersGroups usersList groupsList;
 
-- 
GitLab


From 5459a5c007eefa442bc11729a5913ebddc49f504 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Mon, 5 Nov 2007 21:17:16 +0000
Subject: [PATCH 0640/5331] Added user configuration chapter - currently about
 Compiz.

svn path=/nixos/trunk/; revision=9589
---
 doc/manual/installation.xml      |  4 +--
 doc/manual/manual.xml            |  3 +-
 doc/manual/userconfiguration.xml | 48 ++++++++++++++++++++++++++++++++
 3 files changed, 52 insertions(+), 3 deletions(-)
 create mode 100644 doc/manual/userconfiguration.xml

diff --git a/doc/manual/installation.xml b/doc/manual/installation.xml
index f9c7743b23a..6a56b3b874a 100644
--- a/doc/manual/installation.xml
+++ b/doc/manual/installation.xml
@@ -19,7 +19,7 @@ one from <link xlink:href="http://nix.cs.uu.nl/nixos/"/>.  If you want
   <listitem><para>Make sure that you have a <emphasis>very</emphasis>
   recent pre-release version of Nix installed (<link
   xlink:href="http://nix.cs.uu.nl/dist/nix/nix-unstable-latest/"/>).
-  The NixOS Nix expressions frequently use bleading-edge features.  If
+  The NixOS Nix expressions frequently use bleeding-edge features.  If
   you get any kind of expression evaluation error, try to upgrade your
   Nix.</para></listitem>
 
@@ -268,4 +268,4 @@ shown in <xref linkend="sec-changing-config"/>.)</para>
 
 
 
-</chapter>
\ No newline at end of file
+</chapter>
diff --git a/doc/manual/manual.xml b/doc/manual/manual.xml
index 65c2a81bb90..55adf3e647d 100644
--- a/doc/manual/manual.xml
+++ b/doc/manual/manual.xml
@@ -40,8 +40,9 @@
   
 
   <xi:include href="installation.xml" />
+  <xi:include href="userconfiguration.xml" />
   <xi:include href="troubleshooting.xml" />
   <xi:include href="development.xml" />
   <xi:include href="options-db.xml" />
 
-</book>
\ No newline at end of file
+</book>
diff --git a/doc/manual/userconfiguration.xml b/doc/manual/userconfiguration.xml
new file mode 100644
index 00000000000..6e20afec9ab
--- /dev/null
+++ b/doc/manual/userconfiguration.xml
@@ -0,0 +1,48 @@
+<chapter xmlns="http://docbook.org/ns/docbook"
+         xmlns:xlink="http://www.w3.org/1999/xlink">
+
+<title>Configuration in home directory</title>
+
+
+<!--===============================================================-->
+
+<section>
+<title>Compiz Fusion</title>
+<para>
+	Compiz Fusion is just a set of plugins fr Compiz. Your best interest is to have 
+	them found both by Compiz and by Compiz Configuration Settings (also in Compiz Fusion
+	distribution). By default they look in Compiz installation path and in home directory.
+	You do not need to track /nix/store manually - everything is already in 
+	/var/run/current-system/sw/share.
+
+	<orderedlist>
+	<listitem><para><filename>$HOME/.compiz/plugins</filename> 
+	should contain plugins you want to load. All the installed 
+	plugins are available in 
+	<filename>/var/run/current-system/sw/share/compiz-plugins/compiz/</filename>,
+	so you can use symlinks to this directory.
+	</para></listitem>
+
+	<listitem><para><filename>$HOME/.compiz/metadata</filename> 
+	should contain metadata (definition of configuration options) for plugins 
+	you want to load. All the installed metadata is available in 
+	<filename>/var/run/current-system/sw/share/compiz/</filename>,
+	so you can use symlinks to this directory.
+	</para></listitem>
+
+	<listitem><para>
+	Probably a way to load <literal>GConf</literal> configuration backend by default 
+	should be found, but if you run <literal>Compiz</literal> with 
+	<literal>GConf</literal> configuration (default for <literal>X server</literal> job
+	for now), you have to link 
+	<filename>/var/run/current-system/sw/share/compizconfig/backends/libgconf.so</filename>
+	into <filename>$HOME/.compizconfig/backends</filename> directory.
+	</para></listitem>
+
+	</orderedlist>
+
+	Now you can launch <literal>ccsm</literal> and configure everything.
+</para>
+</section>
+
+</chapter>
-- 
GitLab


From e6b8dd5b25beb48d3c52fba60afd8a06b896559a Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 6 Nov 2007 00:00:29 +0000
Subject: [PATCH 0641/5331] * Cleanup.

svn path=/nixos/trunk/; revision=9593
---
 upstart-jobs/xserver.nix | 91 ++++++++++++++++++++--------------------
 1 file changed, 46 insertions(+), 45 deletions(-)

diff --git a/upstart-jobs/xserver.nix b/upstart-jobs/xserver.nix
index 06f9492e243..bec803296ec 100644
--- a/upstart-jobs/xserver.nix
+++ b/upstart-jobs/xserver.nix
@@ -73,51 +73,52 @@ let
   configFile = stdenv.mkDerivation {
     name = "xserver.conf";
     src = ./xserver.conf;
-    inherit fontDirectories videoDriver resolutions isClone synaptics;
-
-	synapticsInputDevice = (if getCfg "isSynaptics" then "
-	Section \"InputDevice\"
-	 Identifier \"Touchpad[0]\"
-	 Driver \"synaptics\"
-	 Option \"Device\" \""+(getCfg "devSynaptics")+"\"
-	 Option \"Protocol\" \"PS/2\"
-	 Option \"LeftEdge\" \"1700\"
-	 Option \"RightEdge\" \"5300\"
-	 Option \"TopEdge\" \"1700\"
-	 Option \"BottomEdge\" \"4200\"
-	 Option \"FingerLow\" \"25\"
-	 Option \"FingerHigh\" \"30\"
-	 Option \"MaxTapTime\" \"180\"
-	 Option \"MaxTapMove\" \"220\"
-	 Option \"VertScrollDelta\" \"100\"
-	 Option \"MinSpeed\" \"0.06\"
-	 Option \"MaxSpeed\" \"0.12\"
-	 Option \"AccelFactor\" \"0.0010\"
-	 Option \"SHMConfig\" \"on\"
-	 Option \"Repeater\" \"/dev/input/mice\"
-	 Option \"TapButton1\" \"1\"
-	 Option \"TapButton2\" \"2\"
-	 Option \"TapButton3\" \"3\"
-	EndSection " else "");
-
-	xkbOptions = (if (getCfg "xkbOptions") == "" then "" else 
-		"  Option \"XkbOptions\" \""+(getCfg "xkbOptions")+"\"");
-
-	layout = getCfg "layout";
-
-	corePointer = (if getCfg "isSynaptics" then "Touchpad[0]" else "Mouse[0]");
-
-	internalAGPGART = (if (getCfg "useInternalAGPGART") == "yes" then
-		"  Option \"UseInternalAGPGART\" \"yes\"" else 
-		if (getCfg "useInternalAGPGART") == "no" then
-		"  Option \"UseInternalAGPGART\" \"no\"" else 
-		"    ");
-
-	extraDeviceConfig = getCfg "extraDeviceConfig"; 
-	extraMonitorSettings = getCfg "extraMonitorSettings"; 
-	extraModules = getCfg "extraModules"; 
-	serverLayoutOptions = getCfg "serverLayoutOptions"; 
-	defaultDepth = getCfg "defaultDepth"; 
+    inherit fontDirectories videoDriver resolutions isClone;
+
+    synapticsInputDevice = (if getCfg "isSynaptics" then "
+      Section \"InputDevice\"
+        Identifier \"Touchpad[0]\"
+        Driver \"synaptics\"
+        Option \"Device\" \"${getCfg "devSynaptics"}\"
+        Option \"Protocol\" \"PS/2\"
+        Option \"LeftEdge\" \"1700\"
+        Option \"RightEdge\" \"5300\"
+        Option \"TopEdge\" \"1700\"
+        Option \"BottomEdge\" \"4200\"
+        Option \"FingerLow\" \"25\"
+        Option \"FingerHigh\" \"30\"
+        Option \"MaxTapTime\" \"180\"
+        Option \"MaxTapMove\" \"220\"
+        Option \"VertScrollDelta\" \"100\"
+        Option \"MinSpeed\" \"0.06\"
+        Option \"MaxSpeed\" \"0.12\"
+        Option \"AccelFactor\" \"0.0010\"
+        Option \"SHMConfig\" \"on\"
+        Option \"Repeater\" \"/dev/input/mice\"
+        Option \"TapButton1\" \"1\"
+        Option \"TapButton2\" \"2\"
+        Option \"TapButton3\" \"3\"
+      EndSection " else "");
+
+    xkbOptions = if (getCfg "xkbOptions") == "" then "" else 
+      "  Option \"XkbOptions\" \"${getCfg "xkbOptions"}\"";
+
+    layout = getCfg "layout";
+
+    corePointer = if getCfg "isSynaptics" then "Touchpad[0]" else "Mouse[0]";
+
+    internalAGPGART =
+      if (getCfg "useInternalAGPGART") == "yes" then
+        "  Option \"UseInternalAGPGART\" \"yes\""
+      else if (getCfg "useInternalAGPGART") == "no" then
+	"  Option \"UseInternalAGPGART\" \"no\""
+      else "    ";
+
+    extraDeviceConfig = getCfg "extraDeviceConfig"; 
+    extraMonitorSettings = getCfg "extraMonitorSettings"; 
+    extraModules = getCfg "extraModules"; 
+    serverLayoutOptions = getCfg "serverLayoutOptions"; 
+    defaultDepth = getCfg "defaultDepth"; 
 
     buildCommand = "
       buildCommand= # urgh, don't substitute this
-- 
GitLab


From 89670079abbca3a84061064389f140fb4438ff38 Mon Sep 17 00:00:00 2001
From: Marc Weber <marco-oweber@gmx.de>
Date: Wed, 7 Nov 2007 22:00:05 +0000
Subject: [PATCH 0642/5331] vimDiet and reiserfsprogs added to systemPathList

svn path=/nixos/trunk/; revision=9600
---
 system/system.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/system/system.nix b/system/system.nix
index c005f79e639..ab9527015e5 100644
--- a/system/system.nix
+++ b/system/system.nix
@@ -211,6 +211,7 @@ rec {
     pkgs.perl
     pkgs.procps
     pkgs.pwdutils
+    pkgs.reiserfsprogs
     pkgs.rsync
     pkgs.strace
     pkgs.su
@@ -220,7 +221,7 @@ rec {
     pkgs.udev
     pkgs.upstart
     pkgs.utillinux
-#    pkgs.vim
+    pkgs.vimDiet
     pkgs.wirelesstools
     nix
     nixosInstall
-- 
GitLab


From 5bb4e343b4321b2aee8f2965a81fbcf7a6b9371c Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 8 Nov 2007 18:15:12 +0000
Subject: [PATCH 0643/5331] * Configuration options
 networking.defaultMailServer to enable direct mail   delivery without a local
 mail server (via ssmtp). * Add vimDiet to the CD, not the system path in
 general.

svn path=/nixos/trunk/; revision=9607
---
 configuration/rescue-cd.nix |  7 +++++
 etc/default.nix             | 12 ++++++++
 system/options.nix          | 60 +++++++++++++++++++++++++++++++++----
 system/system.nix           |  2 +-
 4 files changed, 75 insertions(+), 6 deletions(-)

diff --git a/configuration/rescue-cd.nix b/configuration/rescue-cd.nix
index b576caede2f..6f1a8a73924 100644
--- a/configuration/rescue-cd.nix
+++ b/configuration/rescue-cd.nix
@@ -81,6 +81,13 @@ rec {
         enable = false;
       };
     };
+ 
+    environment = {
+      extraPackages = pkgs: [
+        pkgs.vimDiet
+      ];
+    };
+   
   };
 
 
diff --git a/etc/default.nix b/etc/default.nix
index 414b4ccde72..d1946df6d91 100644
--- a/etc/default.nix
+++ b/etc/default.nix
@@ -127,8 +127,20 @@ import ../helpers/make-etc.nix {
       ";
       target = "nix.conf"; # will be symlinked from /nix/etc/nix/nix.conf in activate-configuration.sh.
     }
+
   ]
 
+  # Configuration for ssmtp.
+  ++ (optional ["networking" "defaultMailServer" "directDelivery"] { 
+    source = pkgs.writeText "ssmtp.conf" "
+mailhub=${config.get ["networking" "defaultMailServer" "hostName"]}
+UseTLS=${if config.get ["networking" "defaultMailServer" "useTLS"] then "YES" else "NO"}
+UseSTARTTLS=${if config.get ["networking" "defaultMailServer" "useSTARTTLS"] then "YES" else "NO"}
+#Debug=YES
+      ";
+    target = "ssmtp/ssmtp.conf";
+  })
+    
   # Configuration file for fontconfig used to locate
   # (X11) client-rendered fonts.
   ++ (optional ["fonts" "enableFontConfig"] { 
diff --git a/system/options.nix b/system/options.nix
index 7c5744e1093..432582d5bd9 100644
--- a/system/options.nix
+++ b/system/options.nix
@@ -236,10 +236,10 @@
   }
 
   {
-	name = ["networking" "extraHosts"];
-	default = "";
-	example = "192.168.0.1 lanlocalhost";
-	description = "Pasted verbatim into /etc/hosts.";
+    name = ["networking" "extraHosts"];
+    default = "";
+    example = "192.168.0.1 lanlocalhost";
+    description = "Pasted verbatim into /etc/hosts.";
   }
 
   {
@@ -322,7 +322,7 @@
     description = "
       If <literal>true</literal>, monitor Ethernet interfaces for
       cables being plugged in or unplugged.  When this occurs, the
-      <optional>dhclient</optional> service is restarted to
+      <command>dhclient</command> service is restarted to
       automatically obtain a new IP address.  This is useful for
       roaming users (laptops).
     ";
@@ -339,6 +339,56 @@
   }
 
 
+  {
+    name = ["networking" "defaultMailServer" "directDelivery"];
+    default = false;
+    example = true;
+    description = "
+      Use the trivial Mail Transfer Agent (MTA)
+      <command>ssmtp</command> package to allow programs to send
+      e-mail.  If you don't want to run a “real” MTA like
+      <command>sendmail</command> or <command>postfix</command> on
+      your machine, set this option to <literal>true</literal>, and
+      set the option
+      <option>networking.defaultMailServer.hostName</option> to the
+      host name of your preferred mail server.
+    ";
+  }
+
+
+  {
+    name = ["networking" "defaultMailServer" "hostName"];
+    example = "mail.example.org";
+    description = "
+      The host name of the default mail server to use to deliver
+      e-mail.
+    ";
+  }
+
+
+  {
+    name = ["networking" "defaultMailServer" "useTLS"];
+    default = false;
+    example = true;
+    description = "
+      Whether TLS should be used to connect to the default mail
+      server.
+    ";
+  }
+
+
+  {
+    name = ["networking" "defaultMailServer" "useSTARTTLS"];
+    default = false;
+    example = true;
+    description = "
+      Whether the STARTTLS should be used to connect to the default
+      mail server.  (This is needed for TLS-capable mail servers
+      running on the default SMTP port 25.)
+    ";
+  }
+
+
   {
     name = ["fileSystems"];
     default = [];
diff --git a/system/system.nix b/system/system.nix
index ab9527015e5..9a7399699d4 100644
--- a/system/system.nix
+++ b/system/system.nix
@@ -221,7 +221,6 @@ rec {
     pkgs.udev
     pkgs.upstart
     pkgs.utillinux
-    pkgs.vimDiet
     pkgs.wirelesstools
     nix
     nixosInstall
@@ -230,6 +229,7 @@ rec {
     setuidWrapper
   ]
   ++ pkgs.lib.optional (config.get ["security" "sudo" "enable"]) pkgs.sudo
+  ++ pkgs.lib.optional (config.get ["networking" "defaultMailServer" "directDelivery"]) pkgs.ssmtp
   ++ pkgs.lib.concatLists (map (job: job.extraPath) upstartJobs.jobs)
   ++ (config.get ["environment" "extraPackages"]) pkgs
   ++ pkgs.lib.optional (config.get ["fonts" "enableFontDir"]) fontDir;
-- 
GitLab


From c4ad7b56d11f71a3a089951df88ca453d141a563 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Fri, 9 Nov 2007 13:55:07 +0000
Subject: [PATCH 0644/5331] Added a silent mention of evdev in xorg.conf, but
 removed actual dependency on it.

svn path=/nixos/trunk/; revision=9614
---
 upstart-jobs/xserver.conf | 1 +
 upstart-jobs/xserver.nix  | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/upstart-jobs/xserver.conf b/upstart-jobs/xserver.conf
index dba567a9e7e..80d265ff5b4 100644
--- a/upstart-jobs/xserver.conf
+++ b/upstart-jobs/xserver.conf
@@ -19,6 +19,7 @@ Section "Module"
   Load "int10"
   Load "type1"
   Load "vbe"
+  #Load "evdev"
   @moduleSection@
 	@extraModules@
 EndSection
diff --git a/upstart-jobs/xserver.nix b/upstart-jobs/xserver.nix
index bec803296ec..aa82cb1e0a4 100644
--- a/upstart-jobs/xserver.nix
+++ b/upstart-jobs/xserver.nix
@@ -68,7 +68,7 @@ let
     ++ optional (videoDriver == "sis") xorg.xf86videosis
     ++ optional (videoDriver == "i810") xorg.xf86videoi810
     ++ optional (videoDriver == "intel") xorg.xf86videointel
-    ++ (optional (getCfg "isSynaptics") [(synaptics+"/"+xorg.xorgserver) xorg.xf86inputevdev]);
+    ++ (optional (getCfg "isSynaptics") [(synaptics+"/"+xorg.xorgserver) /*xorg.xf86inputevdev*/]);
     
   configFile = stdenv.mkDerivation {
     name = "xserver.conf";
-- 
GitLab


From 62c1f0ddccb724bd7cb53d0a8df91904ccdccea8 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 9 Nov 2007 18:12:23 +0000
Subject: [PATCH 0645/5331] * Converted the option declarations in options.nix
 to nested attribute   sets that match the hierarchical structure of the
 options.  So   instead of

    {
      name = ["time" "timeZone"];
      default = "CET";
      example = "America/New_York";
      description = "The time zone used when displaying times and dates.";
    }

  we have

    time = {
      timeZone = {
        default = "CET";
        example = "America/New_York";
        description = "The time zone used when displaying times and dates.";
      };
    };

  And instead of `config.get ["time" "timeZone"]' you can now just say
  `config.time.timeZone'.  Furthermore, this option representation
  will allow option structures with repetition (such as in
  networking.interfaces or services.httpd.subservices) to be defined.

svn path=/nixos/trunk/; revision=9618
---
 system/config.nix  |   15 +-
 system/options.nix | 2599 ++++++++++++++++++++++----------------------
 system/system.nix  |    6 +-
 3 files changed, 1295 insertions(+), 1325 deletions(-)

diff --git a/system/config.nix b/system/config.nix
index dad42cbad0e..e058959dfc5 100644
--- a/system/config.nix
+++ b/system/config.nix
@@ -5,17 +5,20 @@
 
 pkgs: config:
 
-let lib = pkgs.library; in
+let
 
-rec {
+  lib = pkgs.library;
 
   # The option declarations, i.e., option names with defaults and
   # documentation.
-  declarations = import ./options.nix {inherit pkgs;};
+  declarations = import ./options.nix {inherit pkgs; inherit (lib) mkOption;};
+
+  configFilled = lib.addDefaultOptionValues declarations config;
 
   # Get the option named `name' from the user configuration, using
   # its default value if it's not defined.
   get = name:
+    /*
     let
       decl =
         lib.findSingle (decl: lib.eqLists decl.name name)
@@ -27,7 +30,11 @@ rec {
         then abort ("Option `" + printName name + "' has no default.")
         else decl.default;
     in lib.getAttr name default config;
+    */
+    let
+      default = abort ("Undeclared option `" + printName name + "'.");
+    in lib.getAttr name default configFilled;
   
   printName = name: lib.concatStrings (lib.intersperse "." name);
 
-}
+in configFilled // {inherit get;}
diff --git a/system/options.nix b/system/options.nix
index 432582d5bd9..a7ab7dee979 100644
--- a/system/options.nix
+++ b/system/options.nix
@@ -1,396 +1,365 @@
-{pkgs}:
+{pkgs, mkOption}:
 
-[
+{
 
 
-  {
-    name = ["time" "timeZone"];
-    default = "CET";
-    example = "America/New_York";
-    description = "The time zone used when displaying times and dates.";
-  }
-
-  
-  {
-    name = ["boot" "autoDetectRootDevice"];
-    default = false;
-    description = "
-      Whether to find the root device automatically by searching for a
-      device with the right label.  If this option is off, then a root
-      file system must be specified using <option>fileSystems</option>.
-    ";
-  }
-
-
-  {
-    name = ["boot" "readOnlyRoot"];
-    default = false;
-    description = "
-      Whether the root device is read-only.  This should be set when
-      booting from CD-ROM.
-    ";
-  }
-
-
-  {
-    name = ["boot" "rootLabel"];
-    description = "
-      When auto-detecting the root device (see
-      <option>boot.autoDetectRootDevice</option>), this option
-      specifies the label of the root device.  Right now, this is
-      merely a file name that should exist in the root directory of
-      the file system.  It is used to find the boot CD-ROM.
-    ";
-  }
-
-
-  {
-    name = ["boot" "grubDevice"];
-    default = "";
-    example = "/dev/hda";
-    description = "
-      The device on which the boot loader, Grub, will be installed.
-      If empty, Grub won't be installed and it's your responsibility
-      to make the system bootable.
-    ";
-  }
-
-  {
-    name = ["boot" "kernel"];
-    default = pkgs: pkgs.kernel;
-    description = "
-      Function that takes package collection and returns kernel 
-      package. Do not collect old generations after changing it
-      until you get to boot successfully. In principle, you can 
-      specify a kernel that will build, but not boot.
-    ";
-  }
-
-  {
-	name = ["boot" "configurationName"];
-        default = "";
-        example = "Stable 2.6.21";
-        description = "
-	Grub entry name instead of default.
-	";
-  }
-
-  {
-    name = ["boot" "kernelParams"];
-    default = [
-      "selinux=0"
-      "apm=on"
-      "acpi=on"
-      "vga=0x317"
-      "console=tty1"
-      "splash=verbose"
-    ];
-    description = "
-      The kernel parameters.  If you want to add additional
-      parameters, it's best to set
-      <option>boot.extraKernelParams</option>.
-    ";
-  }
-
-
-  {
-    name = ["boot" "extraKernelParams"];
-    default = [
-    ];
-    example = [
-      "debugtrace"
-    ];
-    description = "
-      Additional user-defined kernel parameters.
-    ";
-  }
+  time = {
 
+    timeZone = mkOption {
+      default = "CET";
+      example = "America/New_York";
+      description = "The time zone used when displaying times and dates.";
+    };
 
-  {
-    name = ["boot" "hardwareScan"];
-    default = true;
-    description = "
-      Whether to try to load kernel modules for all detected hardware.
-      Usually this does a good job of providing you with the modules
-      you need, but sometimes it can crash the system or cause other
-      nasty effects.  If the hardware scan is turned on, it can be
-      disabled at boot time by adding the <literal>safemode</literal>
-      parameter to the kernel command line.
-    ";
-  }
+  };
 
+  
+  boot = {
+
+    autoDetectRootDevice = mkOption {
+      default = false;
+      description = "
+        Whether to find the root device automatically by searching for a
+        device with the right label.  If this option is off, then a root
+        file system must be specified using <option>fileSystems</option>.
+      ";
+    };
 
-  {
-    name = ["boot" "kernelModules"];
-    default = [];
-    description = "
-      The set of kernel modules to be loaded in the second stage of
-      the boot process.  That is, these modules are not included in
-      the initial ramdisk, so they'd better not be required for
-      mounting the root file system.  Add them to
-      <option>boot.initrd.extraKernelModules</option> if they are.
-    ";
-  }
-
-
-  {
-    name = ["boot" "initrd" "kernelModules"];
-    default = [
-      "ahci"
-      "ata_piix"
-      "pata_marvell"
-      "sd_mod"
-      "sr_mod"
-      "ide-cd"
-      "ide-disk"
-      "ide-generic"
-      "ext3"
-      # Support USB keyboards, in case the boot fails and we only have
-      # a USB keyboard.
-      "ehci_hcd"
-      "ohci_hcd"
-      "usbhid"
-    ];
-    description = "
-      The set of kernel modules in the initial ramdisk used during the
-      boot process.  This set must include all modules necessary for
-      mounting the root device.  That is, it should include modules
-      for the physical device (e.g., SCSI drivers) and for the file
-      system (e.g., ext3).  The set specified here is automatically
-      closed under the module dependency relation, i.e., all
-      dependencies of the modules list here are included
-      automatically.  If you want to add additional
-      modules, it's best to set
-      <option>boot.initrd.extraKernelModules</option>.
-    ";
-  }
+    readOnlyRoot = mkOption {
+      default = false;
+      description = "
+        Whether the root device is read-only.  This should be set when
+        booting from CD-ROM.
+      ";
+    };
 
+    rootLabel = mkOption {
+      description = "
+        When auto-detecting the root device (see
+        <option>boot.autoDetectRootDevice</option>), this option
+        specifies the label of the root device.  Right now, this is
+        merely a file name that should exist in the root directory of
+        the file system.  It is used to find the boot CD-ROM.
+      ";
+    };
 
-  {
-    name = ["boot" "initrd" "extraKernelModules"];
-    default = [];
-    description = "
-      Additional kernel modules for the initial ramdisk.  These are
-      loaded before the modules listed in
-      <option>boot.initrd.kernelModules</option>, so they take
-      precedence.
-    ";
-  }
+    grubDevice = mkOption {
+      default = "";
+      example = "/dev/hda";
+      description = "
+        The device on which the boot loader, Grub, will be installed.
+        If empty, Grub won't be installed and it's your responsibility
+        to make the system bootable.
+      ";
+    };
 
-  {
-    name = ["boot" "initrd" "lvm"];
-    default = false;
-    description = "
-      Whether to include lvm in the initial ramdisk. You should use this option
-      if your ROOT device is on lvm volume.
-    ";
-  }
+    kernel = mkOption {
+      default = pkgs: pkgs.kernel;
+      description = "
+        Function that takes package collection and returns kernel 
+        package. Do not collect old generations after changing it
+        until you get to boot successfully. In principle, you can 
+        specify a kernel that will build, but not boot.
+      ";
+    };
 
-  {
-    name = ["boot" "initrd" "enableSplashScreen"];
-    default = true;
-    description = "
-      Whether to show a nice splash screen while booting.
-    ";
-  }
+    configurationName = mkOption {
+      default = "";
+      example = "Stable 2.6.21";
+      description = "
+        Grub entry name instead of default.
+      ";
+    };
 
+    kernelParams = mkOption {
+      default = [
+        "selinux=0"
+        "apm=on"
+        "acpi=on"
+        "vga=0x317"
+        "console=tty1"
+        "splash=verbose"
+      ];
+      description = "
+        The kernel parameters.  If you want to add additional
+        parameters, it's best to set
+        <option>boot.extraKernelParams</option>.
+      ";
+    };
 
-  {
-    name = ["boot" "copyKernels"];
-    default = false;
-    description = "
-      Whether the Grub menu builder should copy kernels and initial
-      ramdisks to /boot.  This is necessary when /nix is on a
-      different file system than /boot.
-    ";
-  }
+    extraKernelParams = mkOption {
+      default = [
+      ];
+      example = [
+        "debugtrace"
+      ];
+      description = "
+        Additional user-defined kernel parameters.
+      ";
+    };
 
+    hardwareScan = mkOption {
+      default = true;
+      description = "
+        Whether to try to load kernel modules for all detected hardware.
+        Usually this does a good job of providing you with the modules
+        you need, but sometimes it can crash the system or cause other
+        nasty effects.  If the hardware scan is turned on, it can be
+        disabled at boot time by adding the <literal>safemode</literal>
+        parameter to the kernel command line.
+      ";
+    };
 
-  {
-    name = ["boot" "localCommands"];
-    default = "";
-    example = "text=anything; echo You can put $text here.";
-    description = "
-      Shell commands to be executed just before Upstart is started.
-    ";
-  }
+    kernelModules = mkOption {
+      default = [];
+      description = "
+        The set of kernel modules to be loaded in the second stage of
+        the boot process.  That is, these modules are not included in
+        the initial ramdisk, so they'd better not be required for
+        mounting the root file system.  Add them to
+        <option>boot.initrd.extraKernelModules</option> if they are.
+      ";
+    };
 
+    initrd = {
+
+      kernelModules = mkOption {
+        default = [
+          "ahci"
+          "ata_piix"
+          "pata_marvell"
+          "sd_mod"
+          "sr_mod"
+          "ide-cd"
+          "ide-disk"
+          "ide-generic"
+          "ext3"
+          # Support USB keyboards, in case the boot fails and we only have
+          # a USB keyboard.
+          "ehci_hcd"
+          "ohci_hcd"
+          "usbhid"
+        ];
+        description = "
+          The set of kernel modules in the initial ramdisk used during the
+          boot process.  This set must include all modules necessary for
+          mounting the root device.  That is, it should include modules
+          for the physical device (e.g., SCSI drivers) and for the file
+          system (e.g., ext3).  The set specified here is automatically
+          closed under the module dependency relation, i.e., all
+          dependencies of the modules list here are included
+          automatically.  If you want to add additional
+          modules, it's best to set
+          <option>boot.initrd.extraKernelModules</option>.
+        ";
+      };
+
+      extraKernelModules = mkOption {
+        default = [];
+        description = "
+          Additional kernel modules for the initial ramdisk.  These are
+          loaded before the modules listed in
+          <option>boot.initrd.kernelModules</option>, so they take
+          precedence.
+        ";
+      };
+
+      lvm = mkOption {
+        default = false;
+        description = "
+          Whether to include lvm in the initial ramdisk. You should use this option
+          if your ROOT device is on lvm volume.
+        ";
+      };
 
-  {
-    name = ["boot" "extraGrubEntries"];
-    default = "";
-    example = "
-      title Windows
-        chainloader (hd0,1)+1
-    ";
-    description = "
-      Any additional entries you want added to the Grub boot menu.
-    ";
-  }
+      enableSplashScreen = mkOption {
+        default = true;
+        description = "
+          Whether to show a nice splash screen while booting.
+        ";
+      };
 
+    };
+    
+    copyKernels = mkOption {
+      default = false;
+      description = "
+        Whether the Grub menu builder should copy kernels and initial
+        ramdisks to /boot.  This is necessary when /nix is on a
+        different file system than /boot.
+      ";
+    };
 
-  { 
-    name = ["networking" "hostName"];
-    default = "nixos";
-    description = "The name of the machine.";
-  }
+    localCommands = mkOption {
+      default = "";
+      example = "text=anything; echo You can put $text here.";
+      description = "
+        Shell commands to be executed just before Upstart is started.
+      ";
+    };
 
-  {
-    name = ["networking" "extraHosts"];
-    default = "";
-    example = "192.168.0.1 lanlocalhost";
-    description = "Pasted verbatim into /etc/hosts.";
-  }
+    extraGrubEntries = mkOption {
+      default = "";
+      example = "
+        title Windows
+          chainloader (hd0,1)+1
+      ";
+      description = "
+        Any additional entries you want added to the Grub boot menu.
+      ";
+    };
 
-  {
-    name = ["networking" "useDHCP"];
-    default = true;
-    description = "
-      Whether to use DHCP to obtain an IP adress and other
-      configuration for all network interfaces that are not manually
-      configured.
-    ";
-  }
+  };
 
-  
-  {
-    name = ["networking" "interfaces"];
-    default = [];
-    example = [
-      { name = "eth0";
-        ipAddress = "131.211.84.78";
-        subnetMask = "255.255.255.128";
-      }
-    ];
-    description = "
-      The configuration for each network interface.  If
-      <option>networking.useDHCP</option> is true, then each interface
-      not listed here will be configured using DHCP.
-    ";
-  }
 
-  
-  {
-    name = ["networking" "defaultGateway"];
-    default = "";
-    example = "131.211.84.1";
-    description = "
-      The default gateway.  It can be left empty if it is auto-detected through DHCP.
-    ";
-  }
+  networking = {
 
-  
-  {
-    name = ["networking" "nameservers"];
-    default = [];
-    example = ["130.161.158.4" "130.161.33.17"];
-    description = "
-      The list of nameservers.  It can be left empty if it is auto-detected through DHCP.
-    ";
-  }
+    hostName = mkOption {
+      default = "nixos";
+      description = "The name of the machine.";
+    };
 
-  
-  {
-    name = ["networking" "enableIntel2200BGFirmware"];
-    default = false;
-    description = "
-      Turn on this option if you want firmware for the Intel
-      PRO/Wireless 2200BG to be loaded automatically.  This is
-      required if you want to use this device.  Intel requires you to
-      accept the license for this firmware, see
-      <link xlink:href='http://ipw2200.sourceforge.net/firmware.php?fid=7'/>.
-    ";
-  }
+    extraHosts = mkOption {
+      default = "";
+      example = "192.168.0.1 lanlocalhost";
+      description = "Pasted verbatim into /etc/hosts.";
+    };
 
-  
-  {
-    name = ["networking" "localCommands"];
-    default = "";
-    example = "text=anything; echo You can put $text here.";
-    description = "
-      Shell commands to be executed at the end of the
-      <literal>network-interfaces</literal> Upstart job.  Note that if
-      you are using DHCP to obtain the network configuration,
-      interfaces may not be fully configured yet.
-    ";
-  }
+    useDHCP = mkOption {
+      default = true;
+      description = "
+        Whether to use DHCP to obtain an IP adress and other
+        configuration for all network interfaces that are not manually
+        configured.
+      ";
+    };
 
+    interfaces = mkOption {
+      default = [];
+      example = [
+        { name = "eth0";
+          ipAddress = "131.211.84.78";
+          subnetMask = "255.255.255.128";
+        }
+      ];
+      description = "
+        The configuration for each network interface.  If
+        <option>networking.useDHCP</option> is true, then each interface
+        not listed here will be configured using DHCP.
+      ";
+    };
 
-  {
-    name = ["networking" "interfaceMonitor" "enable"];
-    default = false;
-    description = "
-      If <literal>true</literal>, monitor Ethernet interfaces for
-      cables being plugged in or unplugged.  When this occurs, the
-      <command>dhclient</command> service is restarted to
-      automatically obtain a new IP address.  This is useful for
-      roaming users (laptops).
-    ";
-  }
+    defaultGateway = mkOption {
+      default = "";
+      example = "131.211.84.1";
+      description = "
+        The default gateway.  It can be left empty if it is auto-detected through DHCP.
+      ";
+    };
 
+    nameservers = mkOption {
+      default = [];
+      example = ["130.161.158.4" "130.161.33.17"];
+      description = "
+        The list of nameservers.  It can be left empty if it is auto-detected through DHCP.
+      ";
+    };
 
-  {
-    name = ["networking" "interfaceMonitor" "beep"];
-    default = false;
-    description = "
-      If <literal>true</literal>, beep when an Ethernet cable is
-      plugged in or unplugged.
-    ";
-  }
+    enableIntel2200BGFirmware = mkOption {
+      default = false;
+      description = "
+        Turn on this option if you want firmware for the Intel
+        PRO/Wireless 2200BG to be loaded automatically.  This is
+        required if you want to use this device.  Intel requires you to
+        accept the license for this firmware, see
+        <link xlink:href='http://ipw2200.sourceforge.net/firmware.php?fid=7'/>.
+      ";
+    };
 
+    localCommands = mkOption {
+      default = "";
+      example = "text=anything; echo You can put $text here.";
+      description = "
+        Shell commands to be executed at the end of the
+        <literal>network-interfaces</literal> Upstart job.  Note that if
+        you are using DHCP to obtain the network configuration,
+        interfaces may not be fully configured yet.
+      ";
+    };
 
-  {
-    name = ["networking" "defaultMailServer" "directDelivery"];
-    default = false;
-    example = true;
-    description = "
-      Use the trivial Mail Transfer Agent (MTA)
-      <command>ssmtp</command> package to allow programs to send
-      e-mail.  If you don't want to run a “real” MTA like
-      <command>sendmail</command> or <command>postfix</command> on
-      your machine, set this option to <literal>true</literal>, and
-      set the option
-      <option>networking.defaultMailServer.hostName</option> to the
-      host name of your preferred mail server.
-    ";
-  }
+    interfaceMonitor = {
 
+      enable = mkOption {
+        default = false;
+        description = "
+          If <literal>true</literal>, monitor Ethernet interfaces for
+          cables being plugged in or unplugged.  When this occurs, the
+          <command>dhclient</command> service is restarted to
+          automatically obtain a new IP address.  This is useful for
+          roaming users (laptops).
+        ";
+      };
+
+      beep = mkOption {
+        default = false;
+        description = "
+          If <literal>true</literal>, beep when an Ethernet cable is
+          plugged in or unplugged.
+        ";
+      };
 
-  {
-    name = ["networking" "defaultMailServer" "hostName"];
-    example = "mail.example.org";
-    description = "
-      The host name of the default mail server to use to deliver
-      e-mail.
-    ";
-  }
+    };
 
+    defaultMailServer = {
 
-  {
-    name = ["networking" "defaultMailServer" "useTLS"];
-    default = false;
-    example = true;
-    description = "
-      Whether TLS should be used to connect to the default mail
-      server.
-    ";
-  }
+      directDelivery = mkOption {
+        default = false;
+        example = true;
+        description = "
+          Use the trivial Mail Transfer Agent (MTA)
+          <command>ssmtp</command> package to allow programs to send
+          e-mail.  If you don't want to run a “real” MTA like
+          <command>sendmail</command> or <command>postfix</command> on
+          your machine, set this option to <literal>true</literal>, and
+          set the option
+          <option>networking.defaultMailServer.hostName</option> to the
+          host name of your preferred mail server.
+        ";
+      };
+
+      hostName = mkOption {
+        example = "mail.example.org";
+        description = "
+          The host name of the default mail server to use to deliver
+          e-mail.
+        ";
+      };
+
+      useTLS = mkOption {
+        default = false;
+        example = true;
+        description = "
+          Whether TLS should be used to connect to the default mail
+          server.
+        ";
+      };
+
+      useSTARTTLS = mkOption {
+        default = false;
+        example = true;
+        description = "
+          Whether the STARTTLS should be used to connect to the default
+          mail server.  (This is needed for TLS-capable mail servers
+          running on the default SMTP port 25.)
+        ";
+      };
 
+    };
 
-  {
-    name = ["networking" "defaultMailServer" "useSTARTTLS"];
-    default = false;
-    example = true;
-    description = "
-      Whether the STARTTLS should be used to connect to the default
-      mail server.  (This is needed for TLS-capable mail servers
-      running on the default SMTP port 25.)
-    ";
-  }
+  };
 
 
-  {
-    name = ["fileSystems"];
+  fileSystems = mkOption {
     default = [];
     example = [
       { mountPoint = "/";
@@ -422,16 +391,15 @@
       systems that support it, such as ext2/ext3 (see <command>mke2fs
       -L</command>).
     ";
-  }
+  };
 
 
-  {
-    name = ["swapDevices"];
+  swapDevices = mkOption {
     default = [];
     example = [
-      {device="/dev/hda7";}
-      {device="/var/swapfile";}
-      {label="bigswap";}
+      { device = "/dev/hda7"; }
+      { device = "/var/swapfile"; }
+      { label = "bigswap"; }
     ];
     description = "
       The swap devices and swap files.  These must have been
@@ -442,746 +410,875 @@
       <command>mkswap -L</command>).  Using a label is
       recommended.
     ";
-  }
+  };
 
 
-  {
-    name = ["services" "extraJobs"];
-    default = [];
-    description = "
-      Additional Upstart jobs.
-    ";
-  }
+  services = {
 
-  
-  {
-    name = ["services" "syslogd" "tty"];
-    default = 10;
-    description = "
-      The tty device on which syslogd will print important log
-      messages.
-    ";
-  }
 
-      
-  {
-    name = ["services" "ttyBackgrounds" "enable"];
-    default = true;
-    description = "
-      Whether to enable graphical backgrounds for the virtual consoles.
-    ";
-  }
-
-      
-  {
-    name = ["services" "ttyBackgrounds" "defaultTheme"];
-    default = pkgs.fetchurl {
-      #url = http://www.bootsplash.de/files/themes/Theme-BabyTux.tar.bz2;
-      url = http://www.mirrorservice.org/sites/www.ibiblio.org/gentoo/distfiles/Theme-BabyTux.tar.bz2;
-      md5 = "a6d89d1c1cff3b6a08e2f526f2eab4e0";
+    extraJobs = mkOption {
+      default = [];
+      description = "
+        Additional Upstart jobs.
+      ";
     };
-    description = "
-      The default theme for the virtual consoles.  Themes can be found
-      at <link xlink:href='http://www.bootsplash.de/' />.
-    ";
-  }
-
-      
-  {
-    name = ["services" "ttyBackgrounds" "defaultSpecificThemes"];
-    default = [
-      /*
-      { tty = 6;
-        theme = pkgs.fetchurl { # Yeah!
-          url = http://www.bootsplash.de/files/themes/Theme-Pativo.tar.bz2;
-          md5 = "9e13beaaadf88d43a5293e7ab757d569";
-        };
-      }
-      */
-      { tty = 10;
-        theme = pkgs.fetchurl {
-          #url = http://www.bootsplash.de/files/themes/Theme-GNU.tar.bz2;
-          url = http://www.mirrorservice.org/sites/www.ibiblio.org/gentoo/distfiles/Theme-GNU.tar.bz2;
-          md5 = "61969309d23c631e57b0a311102ef034";
-        };
-      }
-    ];
-    description = "
-      This option sets specific themes for virtual consoles.  If you
-      just want to set themes for additional consoles, use
-      <option>services.ttyBackgrounds.specificThemes</option>.
-    ";
-  }
 
-      
-  {
-    name = ["services" "ttyBackgrounds" "specificThemes"];
-    default = [
-    ];
-    description = "
-      This option allows you to set specific themes for virtual
-      consoles.
-    ";
-  }
+  
+    syslogd = {
 
-      
-  {
-    name = ["services" "mingetty" "ttys"];
-    default = [1 2 3 4 5 6];
-    description = "
-      The list of tty (virtual console) devices on which to start a
-      login prompt.
-    ";
-  }
+      tty = mkOption {
+        default = 10;
+        description = "
+          The tty device on which syslogd will print important log
+          messages.
+        ";
+      };
+    
+    };
 
 
-  /*      
-  {
-    name = ["services" "mingetty" "waitOnMounts"];
-    default = false;
-    description = "
-      Whether the login prompts on the virtual consoles will be
-      started before or after all file systems have been mounted.  By
-      default we don't wait, but if for example your /home is on a
-      separate partition, you may want to turn this on.
-    ";
-  }
-  */
+    ttyBackgrounds = {
 
-  
-  {
-    name = ["services" "dhcpd" "enable"];
-    default = false;
-    description = "
-      Whether to enable the DHCP server.
-    ";
-  }
+      enable = mkOption {
+        default = true;
+        description = "
+          Whether to enable graphical backgrounds for the virtual consoles.
+        ";
+      };
+
+      defaultTheme = mkOption {
+        default = pkgs.fetchurl {
+          #url = http://www.bootsplash.de/files/themes/Theme-BabyTux.tar.bz2;
+          url = http://www.mirrorservice.org/sites/www.ibiblio.org/gentoo/distfiles/Theme-BabyTux.tar.bz2;
+          md5 = "a6d89d1c1cff3b6a08e2f526f2eab4e0";
+        };
+        description = "
+          The default theme for the virtual consoles.  Themes can be found
+          at <link xlink:href='http://www.bootsplash.de/' />.
+        ";
+      };
+
+      defaultSpecificThemes = mkOption {
+        default = [
+          /*
+          { tty = 6;
+            theme = pkgs.fetchurl { # Yeah!
+              url = http://www.bootsplash.de/files/themes/Theme-Pativo.tar.bz2;
+              md5 = "9e13beaaadf88d43a5293e7ab757d569";
+            };
+          }
+          */
+          { tty = 10;
+            theme = pkgs.fetchurl {
+              #url = http://www.bootsplash.de/files/themes/Theme-GNU.tar.bz2;
+              url = http://www.mirrorservice.org/sites/www.ibiblio.org/gentoo/distfiles/Theme-GNU.tar.bz2;
+              md5 = "61969309d23c631e57b0a311102ef034";
+            };
+          }
+        ];
+        description = "
+          This option sets specific themes for virtual consoles.  If you
+          just want to set themes for additional consoles, use
+          <option>services.ttyBackgrounds.specificThemes</option>.
+        ";
+      };
+
+      specificThemes = mkOption {
+        default = [
+        ];
+        description = "
+          This option allows you to set specific themes for virtual
+          consoles.
+        ";
+      };
 
-  
-  {
-    name = ["services" "dhcpd" "configFile"];
-    description = "
-      The path of the DHCP server configuration file.
-    ";
-  }
+    };
 
-  
-  {
-    name = ["services" "dhcpd" "interfaces"];
-    default = ["eth0"];
-    description = "
-      The interfaces on which the DHCP server should listen.
-    ";
-  }
 
-  
-  {
-    name = ["services" "sshd" "enable"];
-    default = false;
-    description = "
-      Whether to enable the Secure Shell daemon, which allows secure
-      remote logins.
-    ";
-  }
+    mingetty = {
 
-  
-  {
-    name = ["services" "sshd" "forwardX11"];
-    default = true;
-    description = "
-      Whether to enable sshd to forward X11 connections.
-    ";
-  }
+      ttys = mkOption {
+        default = [1 2 3 4 5 6];
+        description = "
+          The list of tty (virtual console) devices on which to start a
+          login prompt.
+        ";
+      };
 
-  
-  {
-    name = ["services" "sshd" "allowSFTP"];
-    default = true;
-    description = "
-      Whether to enable the SFTP subsystem in the SSH daemon.  This
-      enables the use of commands such as <command>sftp</command> and
-      <command>sshfs</command>.
-    ";
-  }
+      waitOnMounts = mkOption {
+        default = false;
+        description = "
+          Whether the login prompts on the virtual consoles will be
+          started before or after all file systems have been mounted.  By
+          default we don't wait, but if for example your /home is on a
+          separate partition, you may want to turn this on.
+        ";
+      };
 
-  
-  {
-    name = ["services" "ntp" "enable"];
-    default = true;
-    description = "
-      Whether to synchronise your machine's time using the NTP
-      protocol.
-    ";
-  }
+    };
 
-  
-  {
-    name = ["services" "ntp" "servers"];
-    default = [
-      "0.pool.ntp.org"
-      "1.pool.ntp.org"
-      "2.pool.ntp.org"
-    ];
-    description = "
-      The set of NTP servers from which to synchronise.
-    ";
-  }
 
-  
-  {
-    name = ["services" "xserver" "enable"];
-    default = false;
-    description = "
-      Whether to enable the X server.
-    ";
-  }
+    dhcpd = {
 
-  {
-    name = ["services" "xserver" "tcpEnable"];
-    default = false;
-    description = "
-      Whether to enable TCP socket for the X server.
-    ";
-  }
+      enable = mkOption {
+        default = false;
+        description = "
+          Whether to enable the DHCP server.
+        ";
+      };
 
-  {
-    name = ["services" "xserver" "resolutions"];
-    default = [{x = 1024; y = 768;} {x = 800; y = 600;} {x = 640; y = 480;}];
-    description = "
-      The screen resolutions for the X server.  The first element is the default resolution.
-    ";
-  }
+      configFile = mkOption {
+        description = "
+          The path of the DHCP server configuration file.
+        ";
+      };
 
-  
-  {
-    name = ["services" "xserver" "videoDriver"];
-    default = "vesa";
-    example = "i810";
-    description = "
-      The name of the video driver for your graphics card.
-    ";
-  }
+      interfaces = mkOption {
+        default = ["eth0"];
+        description = "
+          The interfaces on which the DHCP server should listen.
+        ";
+      };
 
+    };
 
-  {
-    name = ["services" "xserver" "driSupport"];
-    default = false;
-    description = "
-      Whether to enable accelerated OpenGL rendering through the
-      Direct Rendering Interface (DRI).
-    ";
-  }
 
-  
-  {
-    name = ["services" "xserver" "sessionType"];
-    default = "gnome";
-    example = "xterm";
-    description = "
-      The kind of session to start after login.  Current possibilies
-      are <literal>kde</literal> (which starts KDE),
-      <literal>gnome</literal> (which starts
-      <command>gnome-terminal</command>) and <literal>xterm</literal>
-      (which starts <command>xterm</command>).
-    ";
-  }
+    sshd = {
 
-  
-  {
-    name = ["services" "xserver" "windowManager"];
-    default = "";
-    description = "
-      This option selects the window manager.  Available values are
-      <literal>twm</literal> (extremely primitive),
-      <literal>metacity</literal>, and <literal>compiz</literal>.  If
-      left empty, the <option>sessionType</option> determines the
-      window manager, e.g., Metacity for Gnome, and
-      <command>kwm</command> for KDE.
-    ";
-  }
-
-	{
-		name = ["services" "xserver" "renderingFlag"];
-		default = "";
-		example = "--indirect-rendering";
-		description = "
-			Possibly pass --indierct-rendering to Compiz.
-		";
-	}
-  
-  {
-    name = ["services" "xserver" "sessionStarter"];
-    example = "${pkgs.xterm}/bin/xterm -ls";
-    description = "
-      The command executed after login and after the window manager
-      has been started.  Used if
-      <option>services.xserver.sessionType</option> is not empty.
-    ";
-  }
+      enable = mkOption {
+        default = false;
+        description = "
+          Whether to enable the Secure Shell daemon, which allows secure
+          remote logins.
+        ";
+      };
 
-  
-  {
-    name = ["services" "xserver" "startSSHAgent"];
-    default = true;
-    description = "
-      Whether to start the SSH agent when you log in.  The SSH agent
-      remembers private keys for you so that you don't have to type in
-      passphrases every time you make an SSH connection.  Use
-      <command>ssh-add</command> to add a key to the agent.
-    ";
-  }
+      forwardX11 = mkOption {
+        default = true;
+        description = "
+          Whether to enable sshd to forward X11 connections.
+        ";
+      };
+
+      allowSFTP = mkOption {
+        default = true;
+        description = "
+          Whether to enable the SFTP subsystem in the SSH daemon.  This
+          enables the use of commands such as <command>sftp</command> and
+          <command>sshfs</command>.
+        ";
+      };
 
-  
-  {
-    name = ["services" "xserver" "slim" "theme"];
-    default = null;
-    example = pkgs.fetchurl {
-      url = http://download.berlios.de/slim/slim-wave.tar.gz;
-      sha256 = "0ndr419i5myzcylvxb89m9grl2xyq6fbnyc3lkd711mzlmnnfxdy";
     };
-    description = "
-      The theme for the SLiM login manager.  If not specified, SLiM's
-      default theme is used.  See <link
-      xlink:href='http://slim.berlios.de/themes01.php'/> for a
-      collection of themes.
-    ";
-  }
 
-  {
-    name = ["services" "xserver" "isClone"];
-    default = "on";
-    example = "off";
-    description = "
-      Whether to enable the X server clone mode for dual-head.
-    ";
-  }
 
+    ntp = {
 
-  {
-    name = ["services" "xserver" "isSynaptics"];
-    default = false;
-    example = true;
-    description = "
-      Whether to replace mouse with touchpad.
-    ";
-  }
-  
-  { 
-    name = ["services" "xserver" "devSynaptics"];
-    default = "/dev/input/event0";
-    description = "
-      Event device for Synaptics touchpad.
-    ";
-  }
-
-  {
-	name = ["services" "xserver" "layout"];
-	default = "us";
-	description ="
-	Keyboard layout.
-	";
-  }  
-
-  {
-	name = ["services" "xserver" "xkbOptions"];
-	default = "";
-	example = "grp:caps_toggle, grp_led:scroll";
-	description ="
-	X keyboard options; layout switching goes here.
-	";
-  }  
-
-  {
-	name = ["services" "xserver" "useInternalAGPGART"];
-	default = "";
-	example = "no";
-	description ="
-	Just the wrapper for an xorg.conf option.
-	";
-  }  
-
-  {
-	name = ["services" "xserver" "extraDeviceConfig"];
-	default = "";
-	example = "VideoRAM 131072";
-	description ="
-	Just anything to add into Device section.
-	";
-  }  
-
-  {
-	name = ["services" "xserver" "extraMonitorSettings"];
-	default = "";
-	example = "HorizSync 28-49";
-	description ="
-	Just anything to add into Monitor section.
-	";
-  }  
-
-  {
-	name = ["services" "xserver" "extraModules"];
-	default = "";
-	example = "SubSection \"extmod\"
-			EndSubsection";
-	description ="
-	Just anything to add into Modules section.
-	";
-  }  
-
-  {
-	name = ["services" "xserver" "serverLayoutOptions"];
-	default = "";
-	example = "
-	Option \"AIGLX\" \"true\"
-";
-	description ="
-	Just anything to add into Monitor section.
-	";
-  }  
-
-  {
-	name = ["services" "xserver" "defaultDepth"];
-	default = 24;
-	example = 8;
-	description ="
-	Default colour depth.
-	";
-  }  
-
-
-  {
-    name = ["services" "httpd" "enable"];
-    default = false;
-    description = "
-      Whether to enable the Apache httpd server.
-    ";
-  }
+      enable = mkOption {
+        default = true;
+        description = "
+          Whether to synchronise your machine's time using the NTP
+          protocol.
+        ";
+      };
+
+      servers = mkOption {
+        default = [
+          "0.pool.ntp.org"
+          "1.pool.ntp.org"
+          "2.pool.ntp.org"
+        ];
+        description = "
+          The set of NTP servers from which to synchronise.
+        ";
+      };
 
+    };
 
-  {
-    name = ["services" "httpd" "user"];
-    default = "wwwrun";
-    description = "
-      User account under which httpd runs.  The account is created
-      automatically if it doesn't exist.
-    ";
-  }
 
-  
-  {
-    name = ["services" "httpd" "group"];
-    default = "wwwrun";
-    description = "
-      Group under which httpd runs.  The account is created
-      automatically if it doesn't exist.
-    ";
-  }
+    xserver = {
 
-  
-  {
-    name = ["services" "httpd" "hostName"];
-    default = "localhost";
-    description = "
-      Canonical hostname for the server.
-    ";
-  }
+      enable = mkOption {
+        default = false;
+        description = "
+          Whether to enable the X server.
+        ";
+      };
 
-  
-  {
-    name = ["services" "httpd" "httpPort"];
-    default = 80;
-    description = "
-      Port for unencrypted HTTP requests.
-    ";
-  }
+      tcpEnable = mkOption {
+        default = false;
+        description = "
+          Whether to enable TCP socket for the X server.
+        ";
+      };
 
-  
-  {
-    name = ["services" "httpd" "httpsPort"];
-    default = 443;
-    description = "
-      Port for encrypted HTTP requests.
-    ";
-  }
+      resolutions = mkOption {
+        default = [{x = 1024; y = 768;} {x = 800; y = 600;} {x = 640; y = 480;}];
+        description = "
+          The screen resolutions for the X server.  The first element is the default resolution.
+        ";
+      };
 
-  
-  {
-    name = ["services" "httpd" "adminAddr"];
-    example = "admin@example.org";
-    description = "
-      E-mail address of the server administrator.
-    ";
-  }
+      videoDriver = mkOption {
+        default = "vesa";
+        example = "i810";
+        description = "
+          The name of the video driver for your graphics card.
+        ";
+      };
 
-  
-  {
-    name = ["services" "httpd" "logDir"];
-    default = "/var/log/httpd";
-    description = "
-      Directory for Apache's log files.  It is created automatically.
-    ";
-  }
+      driSupport = mkOption {
+        default = false;
+        description = "
+          Whether to enable accelerated OpenGL rendering through the
+          Direct Rendering Interface (DRI).
+        ";
+      };
+
+      sessionType = mkOption {
+        default = "gnome";
+        example = "xterm";
+        description = "
+          The kind of session to start after login.  Current possibilies
+          are <literal>kde</literal> (which starts KDE),
+          <literal>gnome</literal> (which starts
+          <command>gnome-terminal</command>) and <literal>xterm</literal>
+          (which starts <command>xterm</command>).
+        ";
+      };
+
+      windowManager = mkOption {
+        default = "";
+        description = "
+          This option selects the window manager.  Available values are
+          <literal>twm</literal> (extremely primitive),
+          <literal>metacity</literal>, and <literal>compiz</literal>.  If
+          left empty, the <option>sessionType</option> determines the
+          window manager, e.g., Metacity for Gnome, and
+          <command>kwm</command> for KDE.
+        ";
+      };
+
+      renderingFlag = mkOption {
+        default = "";
+        example = "--indirect-rendering";
+        description = "
+          Possibly pass --indierct-rendering to Compiz.
+        ";
+      };
 
+      sessionStarter = mkOption {
+        example = "${pkgs.xterm}/bin/xterm -ls";
+        description = "
+          The command executed after login and after the window manager
+          has been started.  Used if
+          <option>services.xserver.sessionType</option> is not empty.
+        ";
+      };
+
+      startSSHAgent = mkOption {
+        default = true;
+        description = "
+          Whether to start the SSH agent when you log in.  The SSH agent
+          remembers private keys for you so that you don't have to type in
+          passphrases every time you make an SSH connection.  Use
+          <command>ssh-add</command> to add a key to the agent.
+        ";
+      };
+
+      slim = {
+
+        theme = mkOption {
+          default = null;
+          example = pkgs.fetchurl {
+            url = http://download.berlios.de/slim/slim-wave.tar.gz;
+            sha256 = "0ndr419i5myzcylvxb89m9grl2xyq6fbnyc3lkd711mzlmnnfxdy";
+          };
+          description = "
+            The theme for the SLiM login manager.  If not specified, SLiM's
+            default theme is used.  See <link
+            xlink:href='http://slim.berlios.de/themes01.php'/> for a
+            collection of themes.
+          ";
+        };
 
-  {
-    name = ["services" "httpd" "stateDir"];
-    default = "/var/run/httpd";
-    description = "
-      Directory for Apache's transient runtime state (such as PID
-      files).  It is created automatically.  Note that the default,
-      <filename>/var/run/httpd</filename>, is deleted at boot time.
-    ";
-  }
+      };
 
-  {
-    name = ["services" "httpd" "noUserDir"];
-    default = true;
-    description = "
-	Set to false to let users to publish ~/public_html as /~user.
-";
-  }
-
-  {
-    name = ["services" "httpd" "extraDirectories"];
-    default = "";
-    example = "
-	<Directory /home>
-		Options FollowSymlinks
-		AllowOverride All
-	</Directory>
-";
-    description = "
-	These lines go to httpd.conf verbatim. They will go after
-	directories and directory aliases defined by default.
-";
-  }
-
-  {
-    name = ["services" "httpd" "mod_php"];
-    default = false;
-    description = "Whether to enable php module.";
-  }
-  
-  {
-    name = ["services" "httpd" "subservices" "subversion" "enable"];
-    default = false;
-    description = "
-      Whether to enable the Subversion subservice in the webserver.
-    ";
-  }
+      isClone = mkOption {
+        default = "on";
+        example = "off";
+        description = "
+          Whether to enable the X server clone mode for dual-head.
+        ";
+      };
 
-  
-  {
-    name = ["services" "httpd" "subservices" "subversion" "notificationSender"];
-    example = "svn-server@example.org";
-    description = "
-      The email address used in the Sender field of commit
-      notification messages sent by the Subversion subservice.
-    ";
-  }
+      isSynaptics = mkOption {
+        default = false;
+        example = true;
+        description = "
+          Whether to replace mouse with touchpad.
+        ";
+      };
 
-  
-  {
-    name = ["services" "httpd" "subservices" "subversion" "userCreationDomain"];
-    example = "example.org";
-    description = "
-      The domain from which user creation is allowed.  A client can
-      only create a new user account if its IP address resolves to
-      this domain.
-    ";
-  }
+      devSynaptics = mkOption {
+        default = "/dev/input/event0";
+        description = "
+          Event device for Synaptics touchpad.
+        ";
+      };
 
-  
-  {
-    name = ["services" "httpd" "subservices" "subversion" "autoVersioning"];
-    default = false;
-    description = "
-      Whether you want the Subversion subservice to support
-      auto-versioning, which enables Subversion repositories to be
-      mounted as read/writable file systems on operating systems that
-      support WebDAV.
-    ";
-  }
+      layout = mkOption {
+        default = "us";
+        description = "
+          Keyboard layout.
+        ";
+      };
 
-  {
-    name = ["services" "httpd" "subservices" "subversion" "organization" "name"];
-    default = null;
-    description = "
-      Name of the organization hosting the Subversion service.
-    ";
-  }
+      xkbOptions = mkOption {
+        default = "";
+        example = "grp:caps_toggle, grp_led:scroll";
+        description = "
+          X keyboard options; layout switching goes here.
+        ";
+      };
 
-  
-  {
-    name = ["services" "httpd" "subservices" "subversion" "organization" "url"];
-    default = null;
-    description = "
-      URL of the website of the organization hosting the Subversion service.
-    ";
-  }
+      useInternalAGPGART = mkOption {
+        default = "";
+        example = "no";
+        description = "
+          Just the wrapper for an xorg.conf option.
+        ";
+      };
 
-  
-  {
-    name = ["services" "httpd" "subservices" "subversion" "organization" "logo"];
-    default = null;
-    description = "
-      Logo the organization hosting the Subversion service.
-    ";
-  }
+      extraDeviceConfig = mkOption {
+        default = "";
+        example = "VideoRAM 131072";
+        description = "
+          Just anything to add into Device section.
+        ";
+      };
 
-  
-  {
-    name = ["services" "httpd" "extraSubservices" "enable"];
-    default = false;
-    description = "
-      Whether to enable the extra subservices in the webserver.
-    ";
-  }
+      extraMonitorSettings = mkOption {
+        default = "";
+        example = "HorizSync 28-49";
+        description = "
+          Just anything to add into Monitor section.
+        ";
+      };
 
-  
-  {
-    name = ["services" "httpd" "extraSubservices" "services"];
-    default = [];
-    description = "
-      Extra subservices to enable in the webserver.
-    ";
-  }
+      extraModules = mkOption {
+        default = "";
+        example = "
+          SubSection \"extmod\"
+          EndSubsection
+        ";
+        description = "
+          Just anything to add into Modules section.
+        ";
+      };
 
-  
-  {
-    name = ["services" "printing" "enable"];
-    default = false;
-    description = "
-      Whether to enable printing support through the CUPS daemon.
-    ";
-  }
+      serverLayoutOptions = mkOption {
+        default = "";
+        example = "
+          Option \"AIGLX\" \"true\"
+        ";
+        description = "
+          Just anything to add into Monitor section.
+        ";
+      };
 
-  
-  {
-    name = ["services" "dbus" "enable"];
-    default = true;
-    description = "
-      Whether to start the D-Bus message bus daemon.  It is required
-      by the HAL service.
-    ";
-  }
+      defaultDepth = mkOption {
+        default = 24;
+        example = 8;
+        description = "
+          Default colour depth.
+        ";
+      };
 
-  
-  {
-    name = ["services" "hal" "enable"];
-    default = true;
-    description = "
-      Whether to start the HAL daemon.
-    ";
-  }
-
-  {
-	name = ["services" "udev" "addFirmware"];
-	default = [];
-	example = ["/mnt/big-storage/firmware/"];
-	description = "
-	To specify firmware that is not too spread to ensure 
-	a package, or have an interactive process of extraction
-	and cannot be redistributed.
-";
-  }
-  
-  {
-    name = ["installer" "nixpkgsURL"];
-    default = "";
-    example = http://nix.cs.uu.nl/dist/nix/nixpkgs-0.11pre7577;
-    description = "
-      URL of the Nixpkgs distribution to use when building the
-      installation CD.
-    ";
-  }
+    };
 
-  
-  {
-    name = ["installer" "manifests"];
-    default = [http://nix.cs.uu.nl/dist/nix/channels-v3/nixpkgs-unstable/MANIFEST];
-    example =
-      [ http://nix.cs.uu.nl/dist/nix/channels-v3/nixpkgs-unstable/MANIFEST
-        http://nix.cs.uu.nl/dist/nix/channels-v3/nixpkgs-stable/MANIFEST
-      ];
-    description = "
-      URLs of manifests to be downloaded when you run
-      <command>nixos-rebuild</command> to speed up builds.
-    ";
-  }
 
-  
-  {
-    name = ["nix" "maxJobs"];
-    default = 1;
-    example = 2;
-    description = "
-      This option defines the maximum number of jobs that Nix will try
-      to build in parallel.  The default is 1.  You should generally
-      set it to the number of CPUs in your system (e.g., 2 on a Athlon
-      64 X2).
-    ";
-  }
+    httpd = {
 
-  {
-    name = ["nix" "useChroot"];
-    default = false;
-    example = true;
-    description = "
-      If set, Nix will perform builds in a chroot-environment that it
-      will set up automatically for each build.  This prevents
-      impurities in builds by disallowing access to dependencies
-      outside of the Nix store.
-    ";
-  }
-  
-  {
-    name = ["nix" "extraOptions"];
-    default = "";
-    example = "
-      gc-keep-outputs = true
-      gc-keep-derivations = true
-    ";
-    description = "
-      This option allows to append lines to nix.conf. 
-    ";
-  }
-  
-  {
-    name = ["security" "setuidPrograms"];
-    default = ["passwd" "su" "crontab" "ping" "ping6"];
-    description = "
-      Only the programs listed here will be made setuid root (through
-      a wrapper program).  It's better to set
-      <option>security.extraSetuidPrograms</option>.
-    ";
-  }
+      enable = mkOption {
+        default = false;
+        description = "
+          Whether to enable the Apache httpd server.
+        ";
+      };
 
-  
-  {
-    name = ["security" "extraSetuidPrograms"];
-    default = [];
-    example = ["fusermount"];
-    description = "
-      This option lists additional programs that must be made setuid
-      root.
-    ";
-  }
+      user = mkOption {
+        default = "wwwrun";
+        description = "
+          User account under which httpd runs.  The account is created
+          automatically if it doesn't exist.
+        ";
+      };
 
+      group = mkOption {
+        default = "wwwrun";
+        description = "
+          Group under which httpd runs.  The account is created
+          automatically if it doesn't exist.
+        ";
+      };
 
-  {
-    name = ["security" "sudo" "enable"];
-    default = true;
-    description = "
-      Whether to enable the <command>sudo</command> command, which
-      allows non-root users to execute commands as root.
-    ";
-  }
+      hostName = mkOption {
+        default = "localhost";
+        description = "
+          Canonical hostname for the server.
+        ";
+      };
+
+      httpPort = mkOption {
+        default = 80;
+        description = "
+          Port for unencrypted HTTP requests.
+        ";
+      };
+
+      httpsPort = mkOption {
+        default = 443;
+        description = "
+          Port for encrypted HTTP requests.
+        ";
+      };
+
+      adminAddr = mkOption {
+        example = "admin@example.org";
+        description = "
+          E-mail address of the server administrator.
+        ";
+      };
+
+      logDir = mkOption {
+        default = "/var/log/httpd";
+        description = "
+          Directory for Apache's log files.  It is created automatically.
+        ";
+      };
+
+      stateDir = mkOption {
+        default = "/var/run/httpd";
+        description = "
+          Directory for Apache's transient runtime state (such as PID
+          files).  It is created automatically.  Note that the default,
+          <filename>/var/run/httpd</filename>, is deleted at boot time.
+        ";
+      };
+
+      noUserDir = mkOption {
+        default = true;
+        description = "
+          Set to false to let users to publish ~/public_html as /~user.
+        ";
+      };
+
+      extraDirectories = mkOption {
+        default = "";
+        example = "
+          <Directory /home>
+            Options FollowSymlinks
+            AllowOverride All
+          </Directory>
+        ";
+        description = "
+          These lines go to httpd.conf verbatim. They will go after
+          directories and directory aliases defined by default.
+        ";
+      };
+
+      mod_php = mkOption {
+        default = false;
+        description = "Whether to enable the PHP module.";
+      };
+
+
+      subservices = {
+
+        subversion = {
+
+          enable = mkOption {
+            default = false;
+            description = "
+              Whether to enable the Subversion subservice in the webserver.
+            ";
+          };
+
+          notificationSender = mkOption {
+            example = "svn-server@example.org";
+            description = "
+              The email address used in the Sender field of commit
+              notification messages sent by the Subversion subservice.
+            ";
+          };
+
+          userCreationDomain = mkOption {
+            example = "example.org";
+            description = "
+              The domain from which user creation is allowed.  A client can
+              only create a new user account if its IP address resolves to
+              this domain.
+            ";
+          };
+
+          autoVersioning = mkOption {
+            default = false;
+            description = "
+              Whether you want the Subversion subservice to support
+              auto-versioning, which enables Subversion repositories to be
+              mounted as read/writable file systems on operating systems that
+              support WebDAV.
+            ";
+          };
+
+          organization = {
+
+            name = mkOption {
+              default = null;
+              description = "
+                Name of the organization hosting the Subversion service.
+              ";
+            };
+
+            url = mkOption {
+              default = null;
+              description = "
+                URL of the website of the organization hosting the Subversion service.
+              ";
+            };
+
+            logo = mkOption {
+              default = null;
+              description = "
+                Logo the organization hosting the Subversion service.
+              ";
+            };
+
+          };
+
+        };
+
+      };
+
+      extraSubservices = {
+
+        enable = mkOption {
+          default = false;
+          description = "
+            Whether to enable the extra subservices in the webserver.
+          ";
+        };
+
+        services = mkOption {
+          default = [];
+          description = "
+            Extra subservices to enable in the webserver.
+          ";
+        };
+
+      };
+
+    };
+
+
+    printing = {
+
+      enable = mkOption {
+        default = false;
+        description = "
+          Whether to enable printing support through the CUPS daemon.
+        ";
+      };
+
+    };
+
+
+    dbus = {
+
+      enable = mkOption {
+        default = true;
+        description = "
+          Whether to start the D-Bus message bus daemon.  It is required
+          by the HAL service.
+        ";
+      };
+
+    };
+
+
+    hal = {
+
+      enable = mkOption {
+        default = true;
+        description = "
+          Whether to start the HAL daemon.
+        ";
+      };
+
+    };
+
+
+    udev = {
+
+      addFirmware = mkOption {
+        default = [];
+        example = ["/mnt/big-storage/firmware/"];
+        description = "
+          To specify firmware that is not too spread to ensure 
+          a package, or have an interactive process of extraction
+          and cannot be redistributed.
+        ";
+      };
+
+    };
+
+
+    samba = {
+
+      enable = mkOption {
+        default = false;
+        description = "
+          Whether to enable the samba server. (to communicate with, and provide windows shares)
+        ";
+      };
+
+    };
+
+
+    gw6c = {
+
+      enable = mkOption {
+        default = false;
+        description = "
+          Whether to enable Gateway6 client (IPv6 tunnel).
+        ";
+      };
+
+      username = mkOption {
+        default = "";
+        description = "
+          Your Gateway6 login name, if any.
+        ";
+      };
+
+      password = mkOption {
+        default = "";
+        description = "
+          Your Gateway6 password, if any.
+        ";
+      };
+
+      server = mkOption {
+        default = "anon.freenet6.net";
+        example = "broker.freenet6.net";
+        description = "
+          Used Gateway6 server.
+        ";
+      };
+
+      keepAlive = mkOption {
+        default = "30";
+        example = "2";
+        description = "
+          Gateway6 keep-alive period.
+        ";
+      };
+
+      everPing = mkOption {
+        default = "1000000";
+        example = "2";
+        description = "
+          Gateway6 manual ping period.
+        ";
+      };
+
+    };
+
+
+    ircdHybrid = {
+
+      enable = mkOption {
+        default = false;
+        description = "
+          Enable IRCD.
+        ";
+      };
+
+      serverName = mkOption {
+        default = "hades.arpa";
+        description = "
+          IRCD server name.
+        ";
+      };
+
+      sid = mkOption {
+        default = "0NL";
+        description = "
+          IRCD server unique ID in a net of servers.
+        ";
+      };
+
+      description = mkOption {
+        default = "Hybrid-7 IRC server.";
+        description = "
+          IRCD server description.
+        ";
+      };
+
+      rsaKey = mkOption {
+        default = null;
+        example = /root/certificates/irc.key;
+        description = "
+          IRCD server RSA key. 
+        ";
+      };
+
+      certificate = mkOption {
+        default = null;
+        example = /root/certificates/irc.pem;
+        description = "
+          IRCD server SSL certificate. There are some limitations - read manual.
+        ";
+      };
+
+      adminEmail = mkOption {
+        default = "<bit-bucket@example.com>";
+        example = "<name@domain.tld>";
+        description = "
+          IRCD server administrator e-mail. 
+        ";
+      };
+
+      extraIPs = mkOption {
+        default = [];
+        example = ["127.0.0.1"];
+        description = "
+          Extra IP's to bind.
+        ";
+      };
+
+      extraPort = mkOption {
+        default = "7117";
+        description = "
+          Extra port to avoid filtering.
+        ";
+      };
+
+    };
+
+
+    xfs = {
+
+      enable = mkOption {
+        default = false;
+        description = "
+          Whether to enable the X Font Server.
+        ";
+      };
+
+    };
+
+
+  };
+
+
+  installer = {
+
+    nixpkgsURL = mkOption {
+      default = "";
+      example = http://nix.cs.uu.nl/dist/nix/nixpkgs-0.11pre7577;
+      description = "
+        URL of the Nixpkgs distribution to use when building the
+        installation CD.
+      ";
+    };
+
+    manifests = mkOption {
+      default = [http://nix.cs.uu.nl/dist/nix/channels-v3/nixpkgs-unstable/MANIFEST];
+      example =
+        [ http://nix.cs.uu.nl/dist/nix/channels-v3/nixpkgs-unstable/MANIFEST
+          http://nix.cs.uu.nl/dist/nix/channels-v3/nixpkgs-stable/MANIFEST
+        ];
+      description = "
+        URLs of manifests to be downloaded when you run
+        <command>nixos-rebuild</command> to speed up builds.
+      ";
+    };
+
+  };
+
+
+  nix = {
+
+    maxJobs = mkOption {
+      default = 1;
+      example = 2;
+      description = "
+        This option defines the maximum number of jobs that Nix will try
+        to build in parallel.  The default is 1.  You should generally
+        set it to the number of CPUs in your system (e.g., 2 on a Athlon
+        64 X2).
+      ";
+    };
+
+    useChroot = mkOption {
+      default = false;
+      example = true;
+      description = "
+        If set, Nix will perform builds in a chroot-environment that it
+        will set up automatically for each build.  This prevents
+        impurities in builds by disallowing access to dependencies
+        outside of the Nix store.
+      ";
+    };
+
+    extraOptions = mkOption {
+      default = "";
+      example = "
+        gc-keep-outputs = true
+        gc-keep-derivations = true
+      ";
+      description = "
+        This option allows to append lines to nix.conf. 
+      ";
+    };
+
+  };
 
 
-  {
-    name = ["security" "sudo" "configFile"];
-    default = "
+  security = {
+
+    setuidPrograms = mkOption {
+      default = ["passwd" "su" "crontab" "ping" "ping6"];
+      description = "
+        Only the programs listed here will be made setuid root (through
+        a wrapper program).  It's better to set
+        <option>security.extraSetuidPrograms</option>.
+      ";
+    };
+
+    extraSetuidPrograms = mkOption {
+      default = [];
+      example = ["fusermount"];
+      description = "
+        This option lists additional programs that must be made setuid
+        root.
+      ";
+    };
+
+    sudo = {
+
+      enable = mkOption {
+        default = true;
+        description = "
+          Whether to enable the <command>sudo</command> command, which
+          allows non-root users to execute commands as root.
+        ";
+      };
+
+      configFile = mkOption {
+        default = "
 # WARNING: do not edit this file directly or with \"visudo\".  Instead,
 # edit the source file in /etc/nixos/nixos/etc/sudoers.
 
@@ -1190,300 +1287,166 @@ root        ALL=(ALL) SETENV: ALL
 
 # Users in the \"wheel\" group can do anything.
 %wheel      ALL=(ALL) SETENV: ALL
-    ";
-    description = "
-      This string contains the contents of the
-      <filename>sudoers</filename> file.  If syntax errors are
-      detected in this file, the NixOS configuration will fail to
-      build. 
-    ";
-  }
+        ";
+        description = "
+          This string contains the contents of the
+          <filename>sudoers</filename> file.  If syntax errors are
+          detected in this file, the NixOS configuration will fail to
+          build. 
+        ";
+      };
 
+    };
 
-  {
-    name = ["users" "ldap" "enable"];
-    default = false;
-    description = "
-      Whether to enable authentication against an LDAP server.
-    ";
-  }
+  };
 
-  
-  {
-    name = ["users" "ldap" "server"];
-    example = "ldap://ldap.example.org/";
-    description = "
-      The URL of the LDAP server.
-    ";
-  }
 
-  
-  {
-    name = ["users" "ldap" "base"];
-    example = "dc=example,dc=org";
-    description = "
-      The distinguished name of the search base.
-    ";
-  }
+  users = {
 
-  
-  {
-    name = ["users" "ldap" "useTLS"];
-    default = false;
-    description = "
-      If enabled, use TLS (encryption) over an LDAP (port 389)
-      connection.  The alternative is to specify an LDAPS server (port
-      636) in <option>users.ldap.server</option> or to forego
-      security.
-    ";
-  }
+    ldap = {
 
+      enable = mkOption {
+        default = false;
+        description = "
+          Whether to enable authentication against an LDAP server.
+        ";
+      };
 
-  {
-    name = ["fonts" "enableFontConfig"]; # !!! should be enableFontconfig
-    default = true;
-    description = "
-      If enabled, a Fontconfig configuration file will be built
-      pointing to a set of default fonts.  If you don't care about
-      running X11 applications or any other program that uses
-      Fontconfig, you can turn this option off and prevent a
-      dependency on all those fonts.
-    ";
-  }
+      server = mkOption {
+        example = "ldap://ldap.example.org/";
+        description = "
+          The URL of the LDAP server.
+        ";
+      };
 
-  {
-    name = ["fonts" "enableGhostscriptFonts"];
-    default = false;
-    description = "
-      Whether to add the fonts provided by Ghostscript (such as
-      various URW fonts and the “Base-14” Postscript fonts) to the
-      list of system fonts, making them available to X11
-      applications.
-    ";
-  }
-	{
-		name=["fonts" "enableFontDir"];
-		default = false;
-		description = "
-	Whether to create a directory with links to all fonts in share - 
-	so user can configure vncserver script one time (I mean per-user 
-	vncserver, so global service is not a good solution).
-";
-	}
-
-  {
-    name = ["fonts" "extraFonts"];
-    default = pkgs:[];
-    description = "
-	Function, returning list of additional fonts.
-    ";
-  }
+      base = mkOption {
+        example = "dc=example,dc=org";
+        description = "
+          The distinguished name of the search base.
+        ";
+      };
 
- 
-  
-  {
-    name = ["sound" "enable"];
-    default = true;
-    description = "
-      Whether to enable ALSA sound.
-    ";
-  }
+      useTLS = mkOption {
+        default = false;
+        description = "
+          If enabled, use TLS (encryption) over an LDAP (port 389)
+          connection.  The alternative is to specify an LDAPS server (port
+          636) in <option>users.ldap.server</option> or to forego
+          security.
+        ";
+      };
 
-  
-  {
-    name = ["i18n" "defaultLocale"];
-    default = "en_US.UTF-8";
-    example = "nl_NL.UTF-8";
-    description = "
-      The default locale.  It determines the language for program
-      messages, the format for dates and times, sort order, and so on.
-      It also determines the character set, such as UTF-8.
-    ";
-  }
+    };
 
+  };
 
-  {
-    name = ["i18n" "consoleFont"];
-    default = "lat9w-16";
-    example = "LatArCyrHeb-16";
-    description = "
-      The font used for the virtual consoles.  Leave empty to use
-      whatever the <command>setfont</command> program considers the
-      default font.
-    ";
-  }
 
+  fonts = {
 
-  {
-    name = ["i18n" "consoleKeyMap"];
-    default = "us";
-    example = "fr";
-    description = "
-      The keyboard mapping table for the virtual consoles.
-    ";
-  }
+    enableFontConfig = mkOption { # !!! should be enableFontconfig
+      default = true;
+      description = "
+        If enabled, a Fontconfig configuration file will be built
+        pointing to a set of default fonts.  If you don't care about
+        running X11 applications or any other program that uses
+        Fontconfig, you can turn this option off and prevent a
+        dependency on all those fonts.
+      ";
+    };
 
+    enableGhostscriptFonts = mkOption {
+      default = false;
+      description = "
+        Whether to add the fonts provided by Ghostscript (such as
+        various URW fonts and the “Base-14” Postscript fonts) to the
+        list of system fonts, making them available to X11
+        applications.
+      ";
+    };
 
-  {
-    name = ["environment" "extraPackages"];
-    default = pkgs: [];
-    example = pkgs: [pkgs.firefox pkgs.thunderbird];
-    description = "
-      This option allows you to add additional packages to the system
-      path.  These packages are automatically available to all users,
-      and they are automatically updated every time you rebuild the
-      system configuration.  (The latter is the main difference with
-      installing them in the default profile,
-      <filename>/nix/var/nix/profiles/default</filename>.  The value
-      of this option must be a function that returns a list of
-      packages.  The function will be called with the Nix Packages
-      collection as its argument for convenience.
-    ";
-  }
+    enableFontDir = mkOption {
+      default = false;
+      description = "
+        Whether to create a directory with links to all fonts in share - 
+        so user can configure vncserver script one time (I mean per-user 
+        vncserver, so global service is not a good solution).
+      ";
+    };
 
-  {
-    name = ["services" "samba" "enable"];
-    default = false;
-    description = "
-      Whether to enable the samba server. (to communicate with, and provide windows shares)
-    ";
-  }
-
-  {
-	name = ["services" "gw6c" "enable"];
-	default = false;
-	description = "
-	Whether to enable Gateway6 client (IPv6 tunnel).
-";
-  }
-
-  {
-	name = ["services" "gw6c" "username"];
-	default = "";
-	description = "
-	Your Gateway6 login name, if any.
-";
-  }
-
-  {
-	name = ["services" "gw6c" "password"];
-	default = "";
-	description = "
-	Your Gateway6 password, if any.
-";
-  }
-
-  {
-	name = ["services" "gw6c" "server"];
-	default = "anon.freenet6.net";
-	example = "broker.freenet6.net";
-	description = "
-	Used Gateway6 server.
-";
-  }
-
-  {
-	name = ["services" "gw6c" "keepAlive"];
-	default = "30";
-	example = "2";
-	description = "
-	Gateway6 keep-alive period.
-";
-  }
-
-  {
-	name = ["services" "gw6c" "everPing"];
-	default = "1000000";
-	example = "2";
-	description = "
-	Gateway6 manual ping period.
-";
-  }
-
-
-	{
-		name = ["services" "ircdHybrid" "enable"];
-		default = false;
-		description = "
-	Enable IRCD.
-";
-	}
-
-   	{
-		name = ["services" "ircdHybrid" "serverName"];
-		default = "hades.arpa";
-		description = "
-	IRCD server name.
-";
-	}
-
-   	{
-		name = ["services" "ircdHybrid" "sid"];
-		default = "0NL";
-		description = "
-	IRCD server unique ID in a net of servers.
-";
-	}
-
-   	{
-		name = ["services" "ircdHybrid" "description"];
-		default = "Hybrid-7 IRC server.";
-		description = "
-	IRCD server description.
-";
-	}
- 
-   	{
-		name = ["services" "ircdHybrid" "rsaKey"];
-		default = null;
-		example = /root/certificates/irc.key;
-		description = "
-	IRCD server RSA key. 
-";
-	}
- 
-   	{
-		name = ["services" "ircdHybrid" "certificate"];
-		default = null;
-		example = /root/certificates/irc.pem;
-		description = "
-	IRCD server SSL certificate. There are some limitations - read manual.
-";
-	}
- 
-   	{
-		name = ["services" "ircdHybrid" "adminEmail"];
-		default = "<bit-bucket@example.com>";
-		example = "<name@domain.tld>";
-		description = "
-	IRCD server administrator e-mail. 
-";
-	}
-	 
-   	{
-		name = ["services" "ircdHybrid" "extraIPs"];
-		default = [];
-		example = ["127.0.0.1"];
-		description = "
-	Extra IP's to bind.
-";
-	}
-	 
-   	{
-		name = ["services" "ircdHybrid" "extraPort"];
-		default = "7117";
-		description = "
-	Extra port to avoid filtering.
-";
-	}
-	
-	{
-	name = ["services" "xfs" "enable"];
-	default = false;
-	description = "
-	Whether to enable X Font Server.
-";
-  }
-
-
-]
+    extraFonts = mkOption {
+      default = pkgs: [];
+      description = "
+          Function, returning list of additional fonts.
+      ";
+    };
+
+  };
+
+
+  sound = {
+
+    enable = mkOption {
+      default = true;
+      description = "
+        Whether to enable ALSA sound.
+      ";
+    };
+
+  };
+
+
+  i18n = {
+
+    defaultLocale = mkOption {
+      default = "en_US.UTF-8";
+      example = "nl_NL.UTF-8";
+      description = "
+        The default locale.  It determines the language for program
+        messages, the format for dates and times, sort order, and so on.
+        It also determines the character set, such as UTF-8.
+      ";
+    };
+
+    consoleFont = mkOption {
+      default = "lat9w-16";
+      example = "LatArCyrHeb-16";
+      description = "
+        The font used for the virtual consoles.  Leave empty to use
+        whatever the <command>setfont</command> program considers the
+        default font.
+      ";
+    };
+
+    consoleKeyMap = mkOption {
+      default = "us";
+      example = "fr";
+      description = "
+        The keyboard mapping table for the virtual consoles.
+      ";
+    };
+
+  };
+
+
+  environment = {
+
+    extraPackages = mkOption {
+      default = pkgs: [];
+      example = pkgs: [pkgs.firefox pkgs.thunderbird];
+      description = "
+        This option allows you to add additional packages to the system
+        path.  These packages are automatically available to all users,
+        and they are automatically updated every time you rebuild the
+        system configuration.  (The latter is the main difference with
+        installing them in the default profile,
+        <filename>/nix/var/nix/profiles/default</filename>.  The value
+        of this option must be a function that returns a list of
+        packages.  The function will be called with the Nix Packages
+        collection as its argument for convenience.
+      ";
+    };
+
+  };
+
+
+}
diff --git a/system/system.nix b/system/system.nix
index 9a7399699d4..63decdf97dd 100644
--- a/system/system.nix
+++ b/system/system.nix
@@ -31,11 +31,11 @@ rec {
 
   nix = pkgs.nixUnstable; # we need the exportReferencesGraph feature
 
-  kernel = (config.get ["boot" "kernel"]) pkgs;
+  kernel = config.boot.kernel pkgs;
 
   rootModules = 
-    (config.get ["boot" "initrd" "extraKernelModules"]) ++
-    (config.get ["boot" "initrd" "kernelModules"]);
+    config.boot.initrd.extraKernelModules ++
+    config.boot.initrd.kernelModules;
 
 
   # Determine the set of modules that we need to mount the root FS.
-- 
GitLab


From 2fc94b76fe49a609a4c8fb174a594feabd52d3ea Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 9 Nov 2007 18:49:45 +0000
Subject: [PATCH 0646/5331] * Eliminate all calls to config.get.

svn path=/nixos/trunk/; revision=9619
---
 configuration/rescue-cd.nix  |  2 +-
 default.nix                  |  2 +-
 etc/default.nix              | 41 ++++++++--------
 etc/ldap.conf.nix            |  6 +--
 helpers/setuid/default.nix   |  2 +-
 system/config.nix            | 40 ----------------
 system/fonts.nix             |  4 +-
 system/system.nix            | 60 ++++++++++++------------
 system/users-groups.nix      |  2 +-
 upstart-jobs/default.nix     | 91 ++++++++++++++++++------------------
 upstart-jobs/gw6c.nix        | 12 ++---
 upstart-jobs/httpd.nix       | 61 +++++++++++-------------
 upstart-jobs/ifplugd.nix     |  2 +-
 upstart-jobs/ircd-hybrid.nix | 23 +++++----
 upstart-jobs/xfs.nix         |  3 +-
 upstart-jobs/xserver.nix     | 56 +++++++++++-----------
 16 files changed, 178 insertions(+), 229 deletions(-)
 delete mode 100644 system/config.nix

diff --git a/configuration/rescue-cd.nix b/configuration/rescue-cd.nix
index 6f1a8a73924..51128301e97 100644
--- a/configuration/rescue-cd.nix
+++ b/configuration/rescue-cd.nix
@@ -144,7 +144,7 @@ rec {
     timeout 60
     label linux
       kernel vmlinuz
-      append initrd=initrd ${toString (system.config.get ["boot" "kernelParams"])}
+      append initrd=initrd ${toString (system.config.boot.kernelParams)}
   ";
     
 
diff --git a/default.nix b/default.nix
index 9fb40052084..09c9a1569d8 100644
--- a/default.nix
+++ b/default.nix
@@ -28,7 +28,7 @@ in
 
   nixFallback = system.nix;
 
-  manifests = system.config.get ["installer" "manifests"]; # exported here because nixos-rebuild uses it
+  manifests = system.config.installer.manifests; # exported here because nixos-rebuild uses it
 
   upstartJobsCombined = system.upstartJobs;
 
diff --git a/etc/default.nix b/etc/default.nix
index d1946df6d91..01b79872efe 100644
--- a/etc/default.nix
+++ b/etc/default.nix
@@ -3,8 +3,7 @@
 let 
 
 
-  optional = option: file:
-    if config.get option then [file] else [];
+  optional = pkgs.lib.optional;
 
 
   # !!! ugh, these files shouldn't be created here.
@@ -47,7 +46,7 @@ import ../helpers/make-etc.nix {
     { # Hostname-to-IP mappings.
       source = pkgs.substituteAll{
 	src = ./hosts;
-	extraHosts = config.get ["networking" "extraHosts"];
+	extraHosts = config.networking.extraHosts;
 	};
       target = "hosts";
     }
@@ -105,8 +104,8 @@ import ../helpers/make-etc.nix {
         src = ./profile.sh;
         inherit systemPath wrapperDir;
         inherit (pkgs) systemKernel glibc;
-        timeZone = config.get ["time" "timeZone"];
-        defaultLocale = config.get ["i18n" "defaultLocale"];
+        timeZone = config.time.timeZone;
+        defaultLocale = config.i18n.defaultLocale;
       };
       target = "profile";
     }
@@ -120,10 +119,10 @@ import ../helpers/make-etc.nix {
       source = pkgs.writeText "nix.conf" "
         # WARNING: this file is generated.
         build-users-group = nixbld
-        build-max-jobs = ${toString (config.get ["nix" "maxJobs"])}
-        build-use-chroot = ${if config.get ["nix" "useChroot"] then "true" else "false"}
+        build-max-jobs = ${toString (config.nix.maxJobs)}
+        build-use-chroot = ${if config.nix.useChroot then "true" else "false"}
         build-chroot-dirs = /dev /proc /bin /etc
-        ${config.get ["nix" "extraOptions"]}
+        ${config.nix.extraOptions}
       ";
       target = "nix.conf"; # will be symlinked from /nix/etc/nix/nix.conf in activate-configuration.sh.
     }
@@ -131,19 +130,19 @@ import ../helpers/make-etc.nix {
   ]
 
   # Configuration for ssmtp.
-  ++ (optional ["networking" "defaultMailServer" "directDelivery"] { 
+  ++ optional config.networking.defaultMailServer.directDelivery { 
     source = pkgs.writeText "ssmtp.conf" "
-mailhub=${config.get ["networking" "defaultMailServer" "hostName"]}
-UseTLS=${if config.get ["networking" "defaultMailServer" "useTLS"] then "YES" else "NO"}
-UseSTARTTLS=${if config.get ["networking" "defaultMailServer" "useSTARTTLS"] then "YES" else "NO"}
+mailhub=${config.networking.defaultMailServer.hostName}
+UseTLS=${if config.networking.defaultMailServer.useTLS then "YES" else "NO"}
+UseSTARTTLS=${if config.networking.defaultMailServer.useSTARTTLS then "YES" else "NO"}
 #Debug=YES
       ";
     target = "ssmtp/ssmtp.conf";
-  })
+  }
     
   # Configuration file for fontconfig used to locate
   # (X11) client-rendered fonts.
-  ++ (optional ["fonts" "enableFontConfig"] { 
+  ++ optional config.fonts.enableFontConfig { 
     source = pkgs.runCommand "fonts.conf"
       { 
         fontDirectories = import ../system/fonts.nix {inherit pkgs config;};
@@ -156,21 +155,21 @@ UseSTARTTLS=${if config.get ["networking" "defaultMailServer" "useSTARTTLS"] the
           > $out
       ";
     target = "fonts/fonts.conf";
-  })
+  }
 
   # LDAP configuration.
-  ++ (optional ["users" "ldap" "enable"] {
+  ++ optional config.users.ldap.enable {
     source = import ./ldap.conf.nix {
       inherit (pkgs) writeText;
       inherit config;
     };
     target = "ldap.conf";
-  })
+  }
     
   # "sudo" configuration.
-  ++ (optional ["security" "sudo" "enable"] {
+  ++ optional config.security.sudo.enable {
     source = pkgs.runCommand "sudoers"
-      { src = pkgs.writeText "sudoers-in" (config.get ["security" "sudo" "configFile"]);
+      { src = pkgs.writeText "sudoers-in" (config.security.sudo.configFile);
       }
       # Make sure that the sudoers file is syntactically valid.
       # (currently disabled - NIXOS-66)
@@ -178,12 +177,12 @@ UseSTARTTLS=${if config.get ["networking" "defaultMailServer" "useSTARTTLS"] the
       "cp $src $out";
     target = "sudoers";
     mode = "0440";
-  })
+  }
     
   # A bunch of PAM configuration files for various programs.
   ++ (map
     (program:
-      let isLDAPEnabled = config.get ["users" "ldap" "enable"]; in
+      let isLDAPEnabled = config.users.ldap.enable; in
       { source = pkgs.substituteAll {
           src = ./pam.d + ("/" + program);
           inherit (pkgs) pam_unix2 pam_console;
diff --git a/etc/ldap.conf.nix b/etc/ldap.conf.nix
index 5a3b227e2d5..b4113b80ec0 100644
--- a/etc/ldap.conf.nix
+++ b/etc/ldap.conf.nix
@@ -5,11 +5,11 @@
 
 writeText "ldap.conf" "
 
-uri ${config.get ["users" "ldap" "server"]}
-base ${config.get ["users" "ldap" "base"]}
+uri ${config.users.ldap.server}
+base ${config.users.ldap.base}
   
 ${
-if config.get ["users" "ldap" "useTLS"] then "
+if config.users.ldap.useTLS then "
 ssl start_tls
 tls_checkpeer no
 " else ""
diff --git a/helpers/setuid/default.nix b/helpers/setuid/default.nix
index 412b5ed2208..559ecca162f 100644
--- a/helpers/setuid/default.nix
+++ b/helpers/setuid/default.nix
@@ -5,4 +5,4 @@ stdenv.mkDerivation {
   builder = ./builder.sh;
   setuidWrapper = ./setuid-wrapper.c;
   inherit wrapperDir;
-}
\ No newline at end of file
+}
diff --git a/system/config.nix b/system/config.nix
deleted file mode 100644
index e058959dfc5..00000000000
--- a/system/config.nix
+++ /dev/null
@@ -1,40 +0,0 @@
-# Given a configuration, this function returns an object with a `get'
-# method for retrieving the values of options, falling back to the
-# defaults declared in options.nix if no value is given for an
-# option.
-
-pkgs: config:
-
-let
-
-  lib = pkgs.library;
-
-  # The option declarations, i.e., option names with defaults and
-  # documentation.
-  declarations = import ./options.nix {inherit pkgs; inherit (lib) mkOption;};
-
-  configFilled = lib.addDefaultOptionValues declarations config;
-
-  # Get the option named `name' from the user configuration, using
-  # its default value if it's not defined.
-  get = name:
-    /*
-    let
-      decl =
-        lib.findSingle (decl: lib.eqLists decl.name name)
-          (abort ("Undeclared option `" + printName name + "'."))
-          (abort ("Multiple declarations for option `" + printName name + "'."))
-          declarations;
-      default =
-        if !decl ? default
-        then abort ("Option `" + printName name + "' has no default.")
-        else decl.default;
-    in lib.getAttr name default config;
-    */
-    let
-      default = abort ("Undeclared option `" + printName name + "'.");
-    in lib.getAttr name default configFilled;
-  
-  printName = name: lib.concatStrings (lib.intersperse "." name);
-
-in configFilled // {inherit get;}
diff --git a/system/fonts.nix b/system/fonts.nix
index 75906d3e8c7..f63735c698d 100644
--- a/system/fonts.nix
+++ b/system/fonts.nix
@@ -20,6 +20,6 @@
   pkgs.xorg.fontcursormisc
 ]
 
-++ pkgs.lib.optional (config.get ["fonts" "enableGhostscriptFonts"]) "${pkgs.ghostscript}/share/ghostscript/fonts"
+++ pkgs.lib.optional (config.fonts.enableGhostscriptFonts) "${pkgs.ghostscript}/share/ghostscript/fonts"
 
-++ ((config.get ["fonts" "extraFonts"]) pkgs)
+++ ((config.fonts.extraFonts) pkgs)
diff --git a/system/system.nix b/system/system.nix
index 63decdf97dd..4ae2f091456 100644
--- a/system/system.nix
+++ b/system/system.nix
@@ -7,8 +7,10 @@ rec {
 
   # Make a configuration object from which we can retrieve option
   # values.
-  config = import ./config.nix pkgs configuration;
-  
+  config = pkgs.lib.addDefaultOptionValues optionDeclarations configuration;
+
+  optionDeclarations = import ./options.nix {inherit pkgs; inherit (pkgs.lib) mkOption;};
+    
 
   pkgs = import ../pkgs/top-level/all-packages.nix {system = platform;};
 
@@ -27,7 +29,7 @@ rec {
     allPackages = import ../pkgs/top-level/all-packages.nix;
   };
 
-  manifests = config.get ["installer" "manifests"]; # exported here because nixos-rebuild uses it
+  manifests = config.installer.manifests; # exported here because nixos-rebuild uses it
 
   nix = pkgs.nixUnstable; # we need the exportReferencesGraph feature
 
@@ -53,8 +55,8 @@ rec {
       inherit (pkgsStatic) utillinux;
       inherit (pkgsDiet) udev;
       e2fsprogs = pkgs.e2fsprogsDiet;
-      devicemapper = if config.get ["boot" "initrd" "lvm"] then pkgs.devicemapperStatic else null;
-      lvm2 = if config.get ["boot" "initrd" "lvm"] then pkgs.lvm2Static else null;
+      devicemapper = if config.boot.initrd.lvm then pkgs.devicemapperStatic else null;
+      lvm2 = if config.boot.initrd.lvm then pkgs.lvm2Static else null;
       allowedReferences = []; # prevent accidents like glibc being included in the initrd
     }
     "
@@ -76,12 +78,12 @@ rec {
     inherit (pkgs) substituteAll;
     inherit (pkgsDiet) module_init_tools;
     inherit extraUtils;
-    autoDetectRootDevice = config.get ["boot" "autoDetectRootDevice"];
+    autoDetectRootDevice = config.boot.autoDetectRootDevice;
     fileSystems =
       pkgs.lib.filter
         (fs: fs.mountPoint == "/" || (fs ? neededForBoot && fs.neededForBoot))
-        (config.get ["fileSystems"]);
-    rootLabel = config.get ["boot" "rootLabel"];
+        (config.fileSystems);
+    rootLabel = config.boot.rootLabel;
     inherit stage2Init;
     modulesDir = modulesClosure;
     modules = rootModules;
@@ -98,7 +100,7 @@ rec {
       { object = bootStage1;
         symlink = "/init";
       }
-    ] ++ (if config.get ["boot" "initrd" "enableSplashScreen"] then [
+    ] ++ (if config.boot.initrd.enableSplashScreen then [
       { object = pkgs.runCommand "splashutils" {} "
           ensureDir $out/bin
           cp ${pkgs.splashutils}/bin/splash_helper $out/bin
@@ -108,7 +110,7 @@ rec {
       }
       { object = import ../helpers/unpack-theme.nix {
           inherit (pkgs) stdenv;
-          theme = config.get ["services" "ttyBackgrounds" "defaultTheme"];
+          theme = config.services.ttyBackgrounds.defaultTheme;
         };
         symlink = "/etc/splash";
       }
@@ -120,7 +122,7 @@ rec {
   nixosInstall = import ../installer/nixos-install.nix {
     inherit (pkgs) perl runCommand substituteAll;
     inherit nix;
-    nixpkgsURL = config.get ["installer" "nixpkgsURL"];
+    nixpkgsURL = config.installer.nixpkgsURL;
   };
 
   nixosRebuild = import ../installer/nixos-rebuild.nix {
@@ -134,7 +136,7 @@ rec {
 
   # NSS modules.  Hacky!
   nssModules =
-    if config.get ["users" "ldap" "enable"] then [pkgs.nss_ldap] else [];
+    if config.users.ldap.enable then [pkgs.nss_ldap] else [];
 
   nssModulesPath = pkgs.lib.concatStrings (pkgs.lib.intersperse ":" 
     (map (mod: mod + "/lib") nssModules));
@@ -228,11 +230,11 @@ rec {
     nixosCheckout
     setuidWrapper
   ]
-  ++ pkgs.lib.optional (config.get ["security" "sudo" "enable"]) pkgs.sudo
-  ++ pkgs.lib.optional (config.get ["networking" "defaultMailServer" "directDelivery"]) pkgs.ssmtp
+  ++ pkgs.lib.optional (config.security.sudo.enable) pkgs.sudo
+  ++ pkgs.lib.optional (config.networking.defaultMailServer.directDelivery) pkgs.ssmtp
   ++ pkgs.lib.concatLists (map (job: job.extraPath) upstartJobs.jobs)
-  ++ (config.get ["environment" "extraPackages"]) pkgs
-  ++ pkgs.lib.optional (config.get ["fonts" "enableFontDir"]) fontDir;
+  ++ (config.environment.extraPackages) pkgs
+  ++ pkgs.lib.optional (config.fonts.enableFontDir) fontDir;
 
 
   # We don't want to put all of `startPath' and `path' in $PATH, since
@@ -261,12 +263,12 @@ rec {
     isExecutable = true;
 
     inherit etc wrapperDir systemPath modprobe defaultShell kernel;
-    readOnlyRoot = config.get ["boot" "readOnlyRoot"];
-    hostName = config.get ["networking" "hostName"];
+    readOnlyRoot = config.boot.readOnlyRoot;
+    hostName = config.networking.hostName;
     setuidPrograms =
-      config.get ["security" "setuidPrograms"] ++
-      config.get ["security" "extraSetuidPrograms"] ++
-      pkgs.lib.optional (config.get ["security" "sudo" "enable"]) "sudo";
+      config.security.setuidPrograms ++
+      config.security.extraSetuidPrograms ++
+      pkgs.lib.optional (config.security.sudo.enable) "sudo";
 
     inherit (usersGroups) createUsersGroups usersList groupsList;
 
@@ -286,7 +288,7 @@ rec {
     inherit (pkgs) substituteAll writeText coreutils 
       utillinux udev upstart;
     inherit kernel activateConfiguration;
-    readOnlyRoot = config.get ["boot" "readOnlyRoot"];
+    readOnlyRoot = config.boot.readOnlyRoot;
     upstartPath = [
       pkgs.coreutils
       pkgs.findutils
@@ -294,7 +296,7 @@ rec {
       pkgs.gnused
       pkgs.upstart
     ];
-    bootLocal = config.get ["boot" "localCommands"];
+    bootLocal = config.boot.localCommands;
   };
 
 
@@ -305,8 +307,8 @@ rec {
     isExecutable = true;
     inherit (pkgs) bash;
     path = [pkgs.coreutils pkgs.gnused pkgs.gnugrep];
-    copyKernels = config.get ["boot" "copyKernels"];
-    extraGrubEntries = config.get ["boot" "extraGrubEntries"];
+    copyKernels = config.boot.copyKernels;
+    extraGrubEntries = config.boot.extraGrubEntries;
   };
 
 
@@ -320,10 +322,10 @@ rec {
     builder = ./system.sh;
     switchToConfiguration = ./switch-to-configuration.sh;
     inherit (pkgs) grub coreutils gnused gnugrep diffutils findutils upstart;
-    grubDevice = config.get ["boot" "grubDevice"];
+    grubDevice = config.boot.grubDevice;
     kernelParams =
-      (config.get ["boot" "kernelParams"]) ++
-      (config.get ["boot" "extraKernelParams"]);
+      (config.boot.kernelParams) ++
+      (config.boot.extraKernelParams);
     inherit bootStage2;
     inherit activateConfiguration;
     inherit grubMenuBuilder;
@@ -340,7 +342,7 @@ rec {
       pkgs.diffutils
       pkgs.upstart # for initctl
     ];
-    configurationName = config.get ["boot" "configurationName"];
+    configurationName = config.boot.configurationName;
   }) (pkgs.getConfig ["checkConfigurationOptions"] false) 
 	config.declarations configuration ;
 }
diff --git a/system/users-groups.nix b/system/users-groups.nix
index 1a77d302c5a..ebbc308c4f0 100644
--- a/system/users-groups.nix
+++ b/system/users-groups.nix
@@ -82,4 +82,4 @@ rec {
   usersList = pkgs.writeText "users" (pkgs.lib.concatStrings (map (u: "${u.name}\n${u.description}\n${toString u.uid}\n${u.group}\n${toString u.extraGroups}\n${u.home}\n${u.shell}\n") systemUsers));
   groupsList = pkgs.writeText "groups" (pkgs.lib.concatStrings (map (g: "${g.name}\n${toString g.gid}\n") systemGroups));
     
-}
\ No newline at end of file
+}
diff --git a/upstart-jobs/default.nix b/upstart-jobs/default.nix
index 7ac0e5d9503..06131fab725 100644
--- a/upstart-jobs/default.nix
+++ b/upstart-jobs/default.nix
@@ -6,11 +6,10 @@ let
     inherit (pkgs) runCommand;
   };
 
-  optional = option: service:
-    if config.get option then [(makeJob service)] else [];
+  optional = cond: service: pkgs.lib.optional cond (makeJob service);
 
   requiredTTYs =
-    (config.get ["services" "mingetty" "ttys"])
+    (config.services.mingetty.ttys)
     ++ [10] /* !!! sync with syslog.conf */ ;
 
 in
@@ -30,11 +29,11 @@ import ../upstart-jobs/gather.nix {
       inherit (pkgs) stdenv writeText substituteAll udev procps;
       inherit (pkgs.lib) cleanSource;
       firmwareDirs =
-        pkgs.lib.optional (config.get ["networking" "enableIntel2200BGFirmware"]) pkgs.ipw2200fw
+        pkgs.lib.optional (config.networking.enableIntel2200BGFirmware) pkgs.ipw2200fw
 	++
-	(config.get ["services" "udev" "addFirmware"]);
+	(config.services.udev.addFirmware);
       extraUdevPkgs =
-        pkgs.lib.optional (config.get ["services" "hal" "enable"]) pkgs.hal;
+        pkgs.lib.optional (config.services.hal.enable) pkgs.hal;
     })
       
     # Makes LVM logical volumes available. 
@@ -52,30 +51,30 @@ import ../upstart-jobs/gather.nix {
     # Hardware scan; loads modules for PCI devices.
     (import ../upstart-jobs/hardware-scan.nix {
       inherit modprobe;
-      doHardwareScan = config.get ["boot" "hardwareScan"];
-      kernelModules = config.get ["boot" "kernelModules"];
+      doHardwareScan = config.boot.hardwareScan;
+      kernelModules = config.boot.kernelModules;
     })
       
     # Mount file systems.
     (import ../upstart-jobs/filesystems.nix {
       inherit (pkgs) utillinux e2fsprogs;
-      fileSystems = config.get ["fileSystems"];
+      fileSystems = config.fileSystems;
     })
 
     # Swapping.
     (import ../upstart-jobs/swap.nix {
       inherit (pkgs) utillinux library;
-      swapDevices = config.get ["swapDevices"];
+      swapDevices = config.swapDevices;
     })
 
     # Network interfaces.
     (import ../upstart-jobs/network-interfaces.nix {
       inherit modprobe;
       inherit (pkgs) nettools wirelesstools bash writeText;
-      nameservers = config.get ["networking" "nameservers"];
-      defaultGateway = config.get ["networking" "defaultGateway"];
-      interfaces = config.get ["networking" "interfaces"];
-      localCommands = config.get ["networking" "localCommands"];
+      nameservers = config.networking.nameservers;
+      defaultGateway = config.networking.defaultGateway;
+      interfaces = config.networking.interfaces;
+      localCommands = config.networking.localCommands;
     })
       
     # Nix daemon - required for multi-user Nix.
@@ -99,9 +98,9 @@ import ../upstart-jobs/gather.nix {
     (import ../upstart-jobs/kbd.nix {
       inherit (pkgs) glibc kbd gzip;
       ttyNumbers = requiredTTYs;
-      defaultLocale = config.get ["i18n" "defaultLocale"];
-      consoleFont = config.get ["i18n" "consoleFont"];
-      consoleKeyMap = config.get ["i18n" "consoleKeyMap"];
+      defaultLocale = config.i18n.defaultLocale;
+      consoleFont = config.i18n.consoleFont;
+      consoleKeyMap = config.i18n.consoleKeyMap;
     })
 
     # Handles the maintenance/stalled event (single-user shell).
@@ -115,47 +114,47 @@ import ../upstart-jobs/gather.nix {
   ]
 
   # DHCP client.
-  ++ optional ["networking" "useDHCP"]
+  ++ optional config.networking.useDHCP
     (import ../upstart-jobs/dhclient.nix {
       inherit (pkgs) nettools dhcp lib;
-      interfaces = config.get ["networking" "interfaces"];
+      interfaces = config.networking.interfaces;
     })
 
   # ifplugd daemon for monitoring Ethernet cables.
-  ++ optional ["networking" "interfaceMonitor" "enable"]
+  ++ optional config.networking.interfaceMonitor.enable
     (import ../upstart-jobs/ifplugd.nix {
       inherit (pkgs) ifplugd writeScript bash;
       inherit config;
     })
 
   # DHCP server.
-  ++ optional ["services" "dhcpd" "enable"]
+  ++ optional config.services.dhcpd.enable
     (import ../upstart-jobs/dhcpd.nix {
       inherit (pkgs) dhcp;
-      configFile = config.get ["services" "dhcpd" "configFile"];
-      interfaces = config.get ["services" "dhcpd" "interfaces"];
+      configFile = config.services.dhcpd.configFile;
+      interfaces = config.services.dhcpd.interfaces;
     })
 
   # SSH daemon.
-  ++ optional ["services" "sshd" "enable"]
+  ++ optional config.services.sshd.enable
     (import ../upstart-jobs/sshd.nix {
       inherit (pkgs) writeText openssh glibc;
       inherit (pkgs.xorg) xauth;
       inherit nssModulesPath;
-      forwardX11 = config.get ["services" "sshd" "forwardX11"];
-      allowSFTP = config.get ["services" "sshd" "allowSFTP"];
+      forwardX11 = config.services.sshd.forwardX11;
+      allowSFTP = config.services.sshd.allowSFTP;
     })
 
   # NTP daemon.
-  ++ optional ["services" "ntp" "enable"]
+  ++ optional config.services.ntp.enable
     (import ../upstart-jobs/ntpd.nix {
       inherit modprobe;
       inherit (pkgs) ntp glibc writeText;
-      servers = config.get ["services" "ntp" "servers"];
+      servers = config.services.ntp.servers;
     })
 
   # X server.
-  ++ optional ["services" "xserver" "enable"]
+  ++ optional config.services.xserver.enable
     (import ../upstart-jobs/xserver.nix {
       inherit config;
       inherit (pkgs) writeText lib xterm slim xorg mesa
@@ -165,64 +164,64 @@ import ../upstart-jobs/gather.nix {
       libX11 = pkgs.xlibs.libX11;
       libXext = pkgs.xlibs.libXext;
       fontDirectories = import ../system/fonts.nix {inherit pkgs config;};
-      isClone = config.get ["services" "xserver" "isClone"];
+      isClone = config.services.xserver.isClone;
     })
 
   # Apache httpd.
-  ++ optional ["services" "httpd" "enable"]
+  ++ optional config.services.httpd.enable
     (import ../upstart-jobs/httpd.nix {
       inherit config pkgs;
       inherit (pkgs) glibc;
     })
 
   # Samba service.
-  ++ optional ["services" "samba" "enable"]
+  ++ optional config.services.samba.enable
     (import ../upstart-jobs/samba.nix {
       inherit pkgs;
       inherit (pkgs) glibc samba;
     })
 
   # CUPS (printing) daemon.
-  ++ optional ["services" "printing" "enable"]
+  ++ optional config.services.printing.enable
     (import ../upstart-jobs/cupsd.nix {
       inherit (pkgs) writeText cups;
     })
 
   # Gateway6
-  ++ optional ["services" "gw6c" "enable"]
+  ++ optional config.services.gw6c.enable
     (import ../upstart-jobs/gw6c.nix {
       inherit config pkgs;
     })
 
   # X Font Server
-  ++ optional ["services" "xfs" "enable"]
+  ++ optional config.services.xfs.enable
   (import ../upstart-jobs/xfs.nix {
   	inherit config pkgs;
   })
 
-  ++ optional ["services" "ircdHybrid" "enable"]
+  ++ optional config.services.ircdHybrid.enable
     (import ../upstart-jobs/ircd-hybrid.nix {
       inherit config pkgs;
     })
 
 
   # ALSA sound support.
-  ++ optional ["sound" "enable"]
+  ++ optional config.sound.enable
     (import ../upstart-jobs/alsa.nix {
       inherit modprobe;
       inherit (pkgs) alsaUtils;
     })
 
   # D-Bus system-wide daemon.
-  ++ optional ["services"  "dbus" "enable"]
+  ++ optional config.services.dbus.enable
     (import ../upstart-jobs/dbus.nix {
       inherit (pkgs) stdenv dbus;
       dbusServices =
-        pkgs.lib.optional (config.get ["services" "hal" "enable"]) pkgs.hal;
+        pkgs.lib.optional (config.services.hal.enable) pkgs.hal;
     })
 
   # HAL daemon.
-  ++ optional ["services"  "hal" "enable"]
+  ++ optional config.services.hal.enable
     (import ../upstart-jobs/hal.nix {
       inherit (pkgs) stdenv hal;
     })
@@ -243,11 +242,11 @@ import ../upstart-jobs/gather.nix {
         inherit ttyNumber;
         loginProgram = "${pkgs.pam_login}/bin/login";
     }))
-    (config.get ["services" "mingetty" "ttys"])
+    (config.services.mingetty.ttys)
   )
 
   # Transparent TTY backgrounds.
-  ++ optional ["services" "ttyBackgrounds" "enable"]
+  ++ optional config.services.ttyBackgrounds.enable
     (import ../upstart-jobs/tty-backgrounds.nix {
       inherit (pkgs) stdenv splashutils;
       
@@ -256,8 +255,8 @@ import ../upstart-jobs/gather.nix {
         let
         
           specificThemes =
-            config.get ["services" "ttyBackgrounds" "defaultSpecificThemes"]
-            ++ config.get ["services" "ttyBackgrounds" "specificThemes"];
+            config.services.ttyBackgrounds.defaultSpecificThemes
+            ++ config.services.ttyBackgrounds.specificThemes;
             
           overridenTTYs = map (x: x.tty) specificThemes;
 
@@ -270,14 +269,14 @@ import ../upstart-jobs/gather.nix {
         in      
           (map (ttyNumber: {
             tty = ttyNumber;
-            theme = config.get ["services" "ttyBackgrounds" "defaultTheme"];
+            theme = config.services.ttyBackgrounds.defaultTheme;
           }) defaultTTYs)
           ++ specificThemes;
           
     })
 
   # User-defined events.
-  ++ (map makeJob (config.get ["services" "extraJobs"]))
+  ++ (map makeJob (config.services.extraJobs))
 
   # For the built-in logd job.
   ++ [(makeJob { jobDrv = pkgs.upstart; })];
diff --git a/upstart-jobs/gw6c.nix b/upstart-jobs/gw6c.nix
index 65884770bfe..416bcd91841 100644
--- a/upstart-jobs/gw6c.nix
+++ b/upstart-jobs/gw6c.nix
@@ -1,16 +1,16 @@
 {config, pkgs}:
 let
-	getCfg = option: config.get ["services" "gw6c" option];
+	cfg = config.services.gw6c;
 	procps = pkgs.procps;
 	gw6cService = import ../services/gw6c {
 		inherit (pkgs) stdenv gw6c coreutils 
 		procps upstart iputils gnused 
 		gnugrep;
-		username = getCfg "username";
-		password = getCfg "password";
-		server = getCfg "server";
-		keepAlive = getCfg "keepAlive";
-		everPing = getCfg "everPing";
+		username = cfg.username;
+		password = cfg.password;
+		server = cfg.server;
+		keepAlive = cfg.keepAlive;
+		everPing = cfg.everPing;
 	};
 in
 {
diff --git a/upstart-jobs/httpd.nix b/upstart-jobs/httpd.nix
index 4829a3ebef2..fcc89740b5a 100644
--- a/upstart-jobs/httpd.nix
+++ b/upstart-jobs/httpd.nix
@@ -2,34 +2,30 @@
 
 let
 
-  getCfg = option: config.get ["services" "httpd" option];
-  getCfgs = options: config.get (["services" "httpd"] ++ options); 
-  getCfgSvn = option: config.get ["services" "httpd" "subservices" "subversion" option];
-  getCfgsSvn = options: config.get (["services" "httpd" "subservices" "subversion"] ++ options);
+  cfg = config.services.httpd;
+  cfgSvn = cfg.subservices.subversion;
 
-  optional = conf: subService:
-    if conf then [subService] else [];
+  optional = pkgs.lib.optional;
 
     
-  hostName = getCfg "hostName";
-  httpPort = getCfg "httpPort";
-  httpsPort = getCfg "httpsPort";
-  user = getCfg "user";
-  group = getCfg "group";
-  adminAddr = getCfg "adminAddr";
-  logDir = getCfg "logDir";
-  stateDir = getCfg "stateDir";
+  hostName = cfg.hostName;
+  httpPort = cfg.httpPort;
+  httpsPort = cfg.httpsPort;
+  user = cfg.user;
+  group = cfg.group;
+  adminAddr = cfg.adminAddr;
+  logDir = cfg.logDir;
+  stateDir = cfg.stateDir;
   enableSSL = false;
-  noUserDir = getCfg "noUserDir";
-  extraDirectories = getCfg "extraDirectories";
+  noUserDir = cfg.noUserDir;
+  extraDirectories = cfg.extraDirectories;
 
-  startingDependency = if (config.get [ "services" "gw6c" "enable" ]) 
-	then "gw6c" else "network-interfaces";
+  startingDependency = if config.services.gw6c.enable then "gw6c" else "network-interfaces";
   
   webServer = import ../../services/apache-httpd {
     inherit (pkgs) apacheHttpd coreutils;
     stdenv = pkgs.stdenvNewSetupScript;
-    php = if getCfg "mod_php" then pkgs.php else null;
+    php = if cfg.mod_php then pkgs.php else null;
 
     inherit hostName httpPort httpsPort
       user group adminAddr logDir stateDir
@@ -38,8 +34,8 @@ let
     subServices =
     
       # The Subversion subservice.
-      (optional (getCfgSvn "enable") (
-        let dataDir = getCfgSvn "dataDir"; in
+      (optional cfgSvn.enable (
+        let dataDir = cfgSvn.dataDir; in
         import ../../services/subversion ({
           reposDir = dataDir + "/repos";
           dbDir = dataDir + "/db";
@@ -55,17 +51,17 @@ let
             else
               "http://" + hostName + ":" + (toString httpPort);
 
-          notificationSender = getCfgSvn "notificationSender";
-          autoVersioning = getCfgSvn "autoVersioning";
-          userCreationDomain = getCfgSvn "userCreationDomain";
+          notificationSender = cfgSvn.notificationSender;
+          autoVersioning = cfgSvn.autoVersioning;
+          userCreationDomain = cfgSvn.userCreationDomain;
 
           inherit pkgs;
         } //
-          ( if getCfgsSvn ["organization" "name"] != null then
+          ( if cfgSvn.organization.name != null then
               {
-                orgName = getCfgsSvn ["organization" "name"];
-                orgLogoFile = getCfgsSvn ["organization" "logo"];
-                orgUrl = getCfgsSvn ["organization" "url"];
+                orgName = cfgSvn.organization.name;
+                orgLogoFile = cfgSvn.organization.logo;
+                orgUrl = cfgSvn.organization.url;
               }
             else
               # use the default from the subversion service
@@ -76,12 +72,9 @@ let
       )
       ++
 
-      (optional (getCfgs ["extraSubservices" "enable"])
-        (map (service : service webServer pkgs)
-          (getCfgs ["extraSubservices" "services"])
-        )
-      )
-      ;
+      (optional cfg.extraSubservices.enable
+        (map (service : service webServer pkgs) cfg.extraSubservices.services)
+      );
   };
   
 in
diff --git a/upstart-jobs/ifplugd.nix b/upstart-jobs/ifplugd.nix
index a1b755a7ad6..4536ee8b41e 100644
--- a/upstart-jobs/ifplugd.nix
+++ b/upstart-jobs/ifplugd.nix
@@ -29,7 +29,7 @@ start on network-interfaces/started
 stop on network-interfaces/stop
 
 respawn ${ifplugd}/sbin/ifplugd --no-daemon --no-startup --no-shutdown \\
-    ${if config.get ["networking" "interfaceMonitor" "beep"] then "" else "--no-beep"} \\
+    ${if config.networking.interfaceMonitor.beep then "" else "--no-beep"} \\
     --run ${plugScript}";
   
 }
diff --git a/upstart-jobs/ircd-hybrid.nix b/upstart-jobs/ircd-hybrid.nix
index 5c172fb8a4e..77639d95042 100644
--- a/upstart-jobs/ircd-hybrid.nix
+++ b/upstart-jobs/ircd-hybrid.nix
@@ -1,23 +1,22 @@
 {config, pkgs}:
 let
-	getCfg = option: config.get ["services" "ircdHybrid" option];
+	cfg = config.services.ircdHybrid;
 	ircdService = import ../services/ircd-hybrid {
 		stdenv = pkgs.stdenvNewSetupScript;
 		inherit (pkgs) ircdHybrid coreutils 
 			su iproute gnugrep procps;
-		serverName = getCfg "serverName";
-		sid = getCfg "sid";
-		description = getCfg "description";
-		rsaKey = getCfg "rsaKey";
-		certificate = getCfg "certificate";
-		adminEmail = getCfg "adminEmail";
-		extraIPs = getCfg "extraIPs";
-		extraPort = getCfg "extraPort";
-		gw6cEnabled = config.get ["services" "gw6c" "enable"];
+		serverName = cfg.serverName;
+		sid = cfg.sid;
+		description = cfg.description;
+		rsaKey = cfg.rsaKey;
+		certificate = cfg.certificate;
+		adminEmail = cfg.adminEmail;
+		extraIPs = cfg.extraIPs;
+		extraPort = cfg.extraPort;
+		gw6cEnabled = config.services.gw6c.enable;
 	};
 
-  startingDependency = if (config.get [ "services" "gw6c" "enable" ]) 
-	then "gw6c" else "network-interfaces";
+  startingDependency = if config.services.gw6c.enable then "gw6c" else "network-interfaces";
 
 in
 {
diff --git a/upstart-jobs/xfs.nix b/upstart-jobs/xfs.nix
index 19f7f6d4db4..59468c30f4d 100644
--- a/upstart-jobs/xfs.nix
+++ b/upstart-jobs/xfs.nix
@@ -3,8 +3,7 @@
 }:
 let
 	configFile = ./xfs.conf;
-  startingDependency = if (config.get [ "services" "gw6c" "enable" ]) 
-	then "gw6c" else "network-interfaces";
+  startingDependency = if config.services.gw6c.enable then "gw6c" else "network-interfaces";
 in
 rec {
 	name = "xfs";
diff --git a/upstart-jobs/xserver.nix b/upstart-jobs/xserver.nix
index aa82cb1e0a4..88b13ffb4f8 100644
--- a/upstart-jobs/xserver.nix
+++ b/upstart-jobs/xserver.nix
@@ -23,8 +23,7 @@
 
 let
 
-  getCfg = option: config.get ["services" "xserver" option];
-  getCfg2 = option: config.get (["services" "xserver"] ++ option);
+  cfg = config.services.xserver;
 
   optional = condition: x: if condition then [x] else [];
 
@@ -34,11 +33,11 @@ let
   #berylemerald
 
   # Get a bunch of user settings.
-  videoDriver = getCfg "videoDriver";
-  resolutions = map (res: "\"${toString res.x}x${toString res.y}\"") (getCfg "resolutions");
-  sessionType = getCfg "sessionType";
-  sessionStarter = getCfg "sessionStarter";
-  renderingFlag = getCfg "renderingFlag";
+  videoDriver = cfg.videoDriver;
+  resolutions = map (res: "\"${toString res.x}x${toString res.y}\"") (cfg.resolutions);
+  sessionType = cfg.sessionType;
+  sessionStarter = cfg.sessionStarter;
+  renderingFlag = cfg.renderingFlag;
 
 
   sessionCmd =
@@ -49,7 +48,7 @@ let
 
 
   windowManager =
-    let wm = getCfg "windowManager"; in
+    let wm = cfg.windowManager; in
     if wm != "" then wm else
     if sessionType == "gnome" then "metacity" else
     if sessionType == "kde" then "none" /* started by startkde */ else
@@ -68,18 +67,18 @@ let
     ++ optional (videoDriver == "sis") xorg.xf86videosis
     ++ optional (videoDriver == "i810") xorg.xf86videoi810
     ++ optional (videoDriver == "intel") xorg.xf86videointel
-    ++ (optional (getCfg "isSynaptics") [(synaptics+"/"+xorg.xorgserver) /*xorg.xf86inputevdev*/]);
+    ++ (optional (cfg.isSynaptics) [(synaptics+"/"+xorg.xorgserver) /*xorg.xf86inputevdev*/]);
     
   configFile = stdenv.mkDerivation {
     name = "xserver.conf";
     src = ./xserver.conf;
     inherit fontDirectories videoDriver resolutions isClone;
 
-    synapticsInputDevice = (if getCfg "isSynaptics" then "
+    synapticsInputDevice = (if cfg.isSynaptics then "
       Section \"InputDevice\"
         Identifier \"Touchpad[0]\"
         Driver \"synaptics\"
-        Option \"Device\" \"${getCfg "devSynaptics"}\"
+        Option \"Device\" \"${cfg.devSynaptics}\"
         Option \"Protocol\" \"PS/2\"
         Option \"LeftEdge\" \"1700\"
         Option \"RightEdge\" \"5300\"
@@ -100,25 +99,25 @@ let
         Option \"TapButton3\" \"3\"
       EndSection " else "");
 
-    xkbOptions = if (getCfg "xkbOptions") == "" then "" else 
-      "  Option \"XkbOptions\" \"${getCfg "xkbOptions"}\"";
+    xkbOptions = if (cfg.xkbOptions) == "" then "" else 
+      "  Option \"XkbOptions\" \"${cfg.xkbOptions}\"";
 
-    layout = getCfg "layout";
+    layout = cfg.layout;
 
-    corePointer = if getCfg "isSynaptics" then "Touchpad[0]" else "Mouse[0]";
+    corePointer = if cfg.isSynaptics then "Touchpad[0]" else "Mouse[0]";
 
     internalAGPGART =
-      if (getCfg "useInternalAGPGART") == "yes" then
+      if (cfg.useInternalAGPGART) == "yes" then
         "  Option \"UseInternalAGPGART\" \"yes\""
-      else if (getCfg "useInternalAGPGART") == "no" then
+      else if (cfg.useInternalAGPGART) == "no" then
 	"  Option \"UseInternalAGPGART\" \"no\""
       else "    ";
 
-    extraDeviceConfig = getCfg "extraDeviceConfig"; 
-    extraMonitorSettings = getCfg "extraMonitorSettings"; 
-    extraModules = getCfg "extraModules"; 
-    serverLayoutOptions = getCfg "serverLayoutOptions"; 
-    defaultDepth = getCfg "defaultDepth"; 
+    extraDeviceConfig = cfg.extraDeviceConfig; 
+    extraMonitorSettings = cfg.extraMonitorSettings; 
+    extraModules = cfg.extraModules; 
+    serverLayoutOptions = cfg.serverLayoutOptions; 
+    defaultDepth = cfg.defaultDepth; 
 
     buildCommand = "
       buildCommand= # urgh, don't substitute this
@@ -197,7 +196,7 @@ let
     fi
 
 
-    ${if getCfg "startSSHAgent" then "
+    ${if cfg.startSSHAgent then "
       ### Start the SSH agent.
       export SSH_ASKPASS=${x11_ssh_askpass}/libexec/x11-ssh-askpass
       eval $(${openssh}/bin/ssh-agent)
@@ -299,7 +298,7 @@ let
     "-config ${configFile}"
     ":${toString display}" "vt${toString tty}"
     "-xkbdir" "${xkeyboard_config}/etc/X11/xkb"
-  ] ++ (if ! config.get ["services" "xserver" "tcpEnable"]
+  ] ++ (if ! config.services.xserver.tcpEnable
 	then ["-nolisten tcp"] else []);
 
   
@@ -315,17 +314,16 @@ login_cmd exec ${stdenv.bash}/bin/sh ${clientScript}
   # Unpack the SLiM theme, or use the default.
   slimThemesDir =
     let
-      theme = getCfg2 ["slim" "theme"];
       unpackedTheme = stdenv.mkDerivation {
         name = "slim-theme";
         buildCommand = "
           ensureDir $out
           cd $out
-          unpackFile ${theme}
+          unpackFile ${cfg.slim.theme}
           ln -s * default
         ";
       };
-    in if theme == null then "${slim}/share/slim/themes" else unpackedTheme;       
+    in if cfg.slim.theme == null then "${slim}/share/slim/themes" else unpackedTheme;       
 
 
 in
@@ -384,7 +382,7 @@ rec {
       rm -f /var/run/opengl-driver
       ${if videoDriver == "nvidia"        
         then "ln -sf ${nvidiaDrivers} /var/run/opengl-driver"
-	else if getCfg "driSupport"
+	else if cfg.driSupport
         then "ln -sf ${mesa} /var/run/opengl-driver"
         else ""
        }
@@ -401,7 +399,7 @@ rec {
 
     ${if videoDriver == "nvidia"
       then "env XORG_DRI_DRIVER_PATH=${nvidiaDrivers}/X11R6/lib/modules/drivers/"
-      else if getCfg "driSupport"
+      else if cfg.driSupport
       then "env XORG_DRI_DRIVER_PATH=${mesa}/lib/modules/dri"
       else ""
     } 
-- 
GitLab


From 7d94e2ed4d870d1e4b09d1cdfc226807576820a5 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Sat, 10 Nov 2007 13:35:15 +0000
Subject: [PATCH 0647/5331] Removed bad characters in descriptions, changed
 system.nix checker invokation

svn path=/nixos/trunk/; revision=9620
---
 system/options.nix | 4 ++--
 system/system.nix  | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/system/options.nix b/system/options.nix
index a7ab7dee979..8cbd1171db7 100644
--- a/system/options.nix
+++ b/system/options.nix
@@ -318,7 +318,7 @@
         description = "
           Use the trivial Mail Transfer Agent (MTA)
           <command>ssmtp</command> package to allow programs to send
-          e-mail.  If you don't want to run a “real” MTA like
+          e-mail.  If you don't want to run a ``real'' MTA like
           <command>sendmail</command> or <command>postfix</command> on
           your machine, set this option to <literal>true</literal>, and
           set the option
@@ -1358,7 +1358,7 @@ root        ALL=(ALL) SETENV: ALL
       default = false;
       description = "
         Whether to add the fonts provided by Ghostscript (such as
-        various URW fonts and the “Base-14” Postscript fonts) to the
+        various URW fonts and the ``Base-14'' Postscript fonts) to the
         list of system fonts, making them available to X11
         applications.
       ";
diff --git a/system/system.nix b/system/system.nix
index 4ae2f091456..e5d3ca618f7 100644
--- a/system/system.nix
+++ b/system/system.nix
@@ -344,5 +344,5 @@ rec {
     ];
     configurationName = config.boot.configurationName;
   }) (pkgs.getConfig ["checkConfigurationOptions"] false) 
-	config.declarations configuration ;
+	optionDeclarations configuration ;
 }
-- 
GitLab


From 8a887b6a941487c0a0f21fdbf8f8026c731b483d Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Sun, 11 Nov 2007 09:10:56 +0000
Subject: [PATCH 0648/5331] Added Pidgin-LaTeX configuration section after
 pidgin-latex update; fixed the build process

svn path=/nixos/trunk/; revision=9625
---
 doc/manual/Makefile              |  2 +-
 doc/manual/userconfiguration.xml | 26 ++++++++++++++++++++++++++
 2 files changed, 27 insertions(+), 1 deletion(-)

diff --git a/doc/manual/Makefile b/doc/manual/Makefile
index c6998f6e8e5..cd9a00e074b 100644
--- a/doc/manual/Makefile
+++ b/doc/manual/Makefile
@@ -18,5 +18,5 @@ options-db.xml: options.xml options-to-docbook.xsl
 	xsltproc -o options-db.xml options-to-docbook.xsl options.xml 
 
 options.xml: ../../system/options.nix
-	echo 'import ../../system/options.nix {pkgs = import ../../pkgs/top-level/all-packages.nix {};}' | \
+	echo 'let pkgs = import ../../pkgs/top-level/all-packages.nix {}; in pkgs.lib.optionAttrSetToDocList (import ../../system/options.nix rec {pkgs = pkgs {}; mkOption = pkgs.lib.mkOption; })' | \
 	    nix-instantiate --eval-only --xml --strict - > options.xml || (rm options.xml && false)
diff --git a/doc/manual/userconfiguration.xml b/doc/manual/userconfiguration.xml
index 6e20afec9ab..5c74c05e879 100644
--- a/doc/manual/userconfiguration.xml
+++ b/doc/manual/userconfiguration.xml
@@ -45,4 +45,30 @@
 </para>
 </section>
 
+<section>
+<title>Pidgin-LaTeX</title>
+<para>
+	To have pidgin-latex plugin working after installation, you need the following:
+	<orderedlist>
+	<listitem>
+	Symlink <filename>/var/run/current-system/sw/share/pidgin-latex/pidgin-latex.so</filename>
+	to <filename>$HOME/.purple/plugins/pidgin-latex.so</filename>
+	</listitem>
+	<listitem>
+	Enable smileys. If you do not want to, you can create 
+	<filename>$HOME/.purple/smileys/empty/theme</filename> with the following contents: 
+	<programlisting>
+	Name=Empty
+	Description=No predefined smileys
+	Author=Nobody
+	</programlisting>	
+	Enabling this theme will enable smileys, but define none.
+	</listitem>
+	<listitem>
+	Enable the plugin.
+	</listitem>	
+	</orderedlist>	
+	</para>
+	</section>
+
 </chapter>
-- 
GitLab


From 2f49250b8da31fc79ac198504ed3dd1404297a4d Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Sun, 11 Nov 2007 09:30:01 +0000
Subject: [PATCH 0649/5331] Now nearly builds docbook section on options; skips
 names however.

svn path=/nixos/trunk/; revision=9627
---
 doc/manual/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/manual/Makefile b/doc/manual/Makefile
index cd9a00e074b..3ac2d0dcd4d 100644
--- a/doc/manual/Makefile
+++ b/doc/manual/Makefile
@@ -18,5 +18,5 @@ options-db.xml: options.xml options-to-docbook.xsl
 	xsltproc -o options-db.xml options-to-docbook.xsl options.xml 
 
 options.xml: ../../system/options.nix
-	echo 'let pkgs = import ../../pkgs/top-level/all-packages.nix {}; in pkgs.lib.optionAttrSetToDocList (import ../../system/options.nix rec {pkgs = pkgs {}; mkOption = pkgs.lib.mkOption; })' | \
+	echo '((pkgs:(pkgs.lib.optionAttrSetToDocList "" (import ../../system/options.nix {pkgs = pkgs; mkOption = pkgs.lib.mkOption; }))) (import ../../pkgs/top-level/all-packages.nix {}))' | \
 	    nix-instantiate --eval-only --xml --strict - > options.xml || (rm options.xml && false)
-- 
GitLab


From edf5ce8d7523cdbe4404ef6f57e484018d1f5777 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Sun, 11 Nov 2007 10:46:26 +0000
Subject: [PATCH 0650/5331] Fixed docbook build for NixOS

svn path=/nixos/trunk/; revision=9628
---
 doc/manual/options-to-docbook.xsl | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/doc/manual/options-to-docbook.xsl b/doc/manual/options-to-docbook.xsl
index 3516a043900..696c16c8648 100644
--- a/doc/manual/options-to-docbook.xsl
+++ b/doc/manual/options-to-docbook.xsl
@@ -23,9 +23,9 @@
           <varlistentry>
              <term>
                <option>
-                 <xsl:for-each select="attr[@name = 'name']/list/string">
+                 <xsl:for-each select="attr[@name = 'name']/string">
                    <xsl:value-of select="@value" />
-                   <xsl:if test="position() != last()">.</xsl:if>
+		   <xsl:if test="position() != last()">.</xsl:if>
                  </xsl:for-each>
                </option>
              </term>
-- 
GitLab


From a0f5a93229ce71ade24a5b89545f9cee7d90ff30 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 12 Nov 2007 14:45:26 +0000
Subject: [PATCH 0651/5331] * Create /var/tmp.

svn path=/nixos/trunk/; revision=9653
---
 system/activate-configuration.sh | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/system/activate-configuration.sh b/system/activate-configuration.sh
index fecfa7cb5a3..3767fc91d49 100644
--- a/system/activate-configuration.sh
+++ b/system/activate-configuration.sh
@@ -75,6 +75,8 @@ chmod 644 /var/log/wtmp
 touch /var/log/lastlog
 chmod 644 /var/log/lastlog
 
+mkdir -m 1777 -p /var/tmp
+
 
 # Empty, read-only home directory of many system accounts.
 mkdir -m 0555 -p /var/empty
-- 
GitLab


From 646c2e4dec62d1fca120e68a9772b28e7e89ecc5 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 12 Nov 2007 14:59:23 +0000
Subject: [PATCH 0652/5331] * Put user "root" in the group "root".

svn path=/nixos/trunk/; revision=9654
---
 system/users-groups.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/system/users-groups.nix b/system/users-groups.nix
index ebbc308c4f0..b156ac5591e 100644
--- a/system/users-groups.nix
+++ b/system/users-groups.nix
@@ -16,6 +16,7 @@ rec {
             description = "System administrator";
             home = "/root";
             shell = defaultShell;
+            group = "root";
           }
           { name = "nobody";
             uid = ids.uids.nobody;
-- 
GitLab


From 8b85db0728255b15e53a3a655a249f5750a238ea Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 12 Nov 2007 16:43:35 +0000
Subject: [PATCH 0653/5331] * Upstart job for Nagios (system/network monitoring
 daemon).

svn path=/nixos/trunk/; revision=9658
---
 system/ids.nix                            |  1 +
 system/options.nix                        | 30 ++++++++
 upstart-jobs/default.nix                  |  6 ++
 upstart-jobs/make-job.nix                 |  8 ++-
 upstart-jobs/nagios/commands.cfg          | 34 +++++++++
 upstart-jobs/nagios/default.nix           | 87 +++++++++++++++++++++++
 upstart-jobs/nagios/host-templates.cfg    | 27 +++++++
 upstart-jobs/nagios/service-templates.cfg | 32 +++++++++
 upstart-jobs/nagios/timeperiods.cfg       | 11 +++
 9 files changed, 234 insertions(+), 2 deletions(-)
 create mode 100644 upstart-jobs/nagios/commands.cfg
 create mode 100644 upstart-jobs/nagios/default.nix
 create mode 100644 upstart-jobs/nagios/host-templates.cfg
 create mode 100644 upstart-jobs/nagios/service-templates.cfg
 create mode 100644 upstart-jobs/nagios/timeperiods.cfg

diff --git a/system/ids.nix b/system/ids.nix
index 8c8d44cddf4..abbd5c58c6e 100644
--- a/system/ids.nix
+++ b/system/ids.nix
@@ -7,6 +7,7 @@
     ntp = 3;
     messagebus = 4; # D-Bus
     haldaemon = 5;
+    nagios = 6;
     nixbld = 30000; # start of range of uids
     nobody = 65534;
   };
diff --git a/system/options.nix b/system/options.nix
index 8cbd1171db7..bfad4e37305 100644
--- a/system/options.nix
+++ b/system/options.nix
@@ -1180,6 +1180,36 @@
     };
 
 
+    nagios = {
+
+      enable = mkOption {
+        default = false;
+        description = "
+          Whether to use <link
+          xlink:href='http://www.nagios.org/'>Nagios</link> to monitor
+          your system or network.
+        ";
+      };
+
+      objectDefs = mkOption {
+        description = "
+          A list of Nagios object configuration files that must define
+          the hosts, host groups, services and contacts for the
+          network that you want Nagios to monitor.
+        ";
+      };
+
+      plugins = mkOption {
+        default = [pkgs.nagiosPluginsOfficial pkgs.ssmtp];
+        description = "
+          Packages to be added to the Nagios <envar>PATH</envar>.
+          Typically used to add plugins, but can be anything.
+        ";
+      };
+
+    };
+
+
   };
 
 
diff --git a/upstart-jobs/default.nix b/upstart-jobs/default.nix
index 06131fab725..040119ecc73 100644
--- a/upstart-jobs/default.nix
+++ b/upstart-jobs/default.nix
@@ -226,6 +226,12 @@ import ../upstart-jobs/gather.nix {
       inherit (pkgs) stdenv hal;
     })
 
+  # Nagios system/network monitoring daemon.
+  ++ optional config.services.nagios.enable
+    (import ../upstart-jobs/nagios {
+      inherit config pkgs;
+    })
+
   # Handles the reboot/halt events.
   ++ (map
     (event: makeJob (import ../upstart-jobs/halt.nix {
diff --git a/upstart-jobs/make-job.nix b/upstart-jobs/make-job.nix
index e6c92bb4d3a..14f48ae04d6 100644
--- a/upstart-jobs/make-job.nix
+++ b/upstart-jobs/make-job.nix
@@ -5,8 +5,12 @@
     job.jobDrv
   else
     (
-      runCommand ("upstart-" + job.name) {inherit (job) job; jobName = job.name;}
-        "ensureDir $out/etc/event.d; echo \"$job\" > $out/etc/event.d/$jobName"
+      runCommand ("upstart-" + job.name)
+        { inherit (job) job;
+          jobName = job.name;
+          buildHook = if job ? buildHook then job.buildHook else "true";
+        }
+        "eval \"$buildHook\"; ensureDir $out/etc/event.d; echo \"$job\" > $out/etc/event.d/$jobName"
     )
 )
 
diff --git a/upstart-jobs/nagios/commands.cfg b/upstart-jobs/nagios/commands.cfg
new file mode 100644
index 00000000000..feeb0155932
--- /dev/null
+++ b/upstart-jobs/nagios/commands.cfg
@@ -0,0 +1,34 @@
+define command {
+    command_name host-notify-by-email
+    command_line printf "%b" "Subject: [Nagios] Host $HOSTSTATE$ alert for $HOSTNAME$\n\n***** Nagios *****\n\nNotification Type: $NOTIFICATIONTYPE$\nHost: $HOSTNAME$\nState: $HOSTSTATE$\nAddress: $HOSTADDRESS$\nInfo: $HOSTOUTPUT$\n\nDate/Time: $LONGDATETIME$\n" | sendmail $CONTACTEMAIL$
+}
+
+
+define command{
+    command_name notify-by-email
+    command_line printf "%b" "Subject: [Nagios] $NOTIFICATIONTYPE$ alert - $HOSTALIAS$/$SERVICEDESC$ is $SERVICESTATE$\n\n***** Nagios *****\n\nNotification Type: $NOTIFICATIONTYPE$\nService: $SERVICEDESC$\nHost: $HOSTALIAS$\nAddress: $HOSTADDRESS$\nState: $SERVICESTATE$\n\nDate/Time: $LONGDATETIME$\n\nAdditional Info:\n\n$SERVICEOUTPUT$" | sendmail $CONTACTEMAIL$
+}
+
+
+define command {
+    command_name dummy-ok
+    command_line true
+}
+
+
+define command {
+    command_name check-host-alive
+    command_line check_ping -H $HOSTADDRESS$ -w 3000.0,80% -c 5000.0,100% -p 1
+}
+
+
+define command {
+    command_name check_local_disk
+    command_line check_disk -w $ARG1$ -c $ARG2$ -p $ARG3$
+}
+
+
+define command {
+    command_name check_ssh
+    command_line check_ssh $HOSTADDRESS$
+}
diff --git a/upstart-jobs/nagios/default.nix b/upstart-jobs/nagios/default.nix
new file mode 100644
index 00000000000..0dc31feaf61
--- /dev/null
+++ b/upstart-jobs/nagios/default.nix
@@ -0,0 +1,87 @@
+{config, pkgs}:
+
+let
+
+  nagiosUser = "nagios";
+  nagiosGroup = "nogroup";
+
+  nagiosState = "/var/lib/nagios";
+  nagiosLogDir = "/var/log/nagios";
+
+  nagiosObjectDefs = [
+    ./timeperiods.cfg
+    ./host-templates.cfg
+    ./service-templates.cfg
+    ./commands.cfg
+  ] ++ config.services.nagios.objectDefs;
+
+  nagiosObjectDefsDir = pkgs.runCommand "nagios-objects" {}
+    "ensureDir $out; ln -s ${toString nagiosObjectDefs} $out/";
+
+  nagiosCfgFile = pkgs.writeText "nagios.cfg" "
+  
+    # Paths for state and logs.
+    log_file=${nagiosLogDir}/current
+    log_archive_path=${nagiosLogDir}/archive
+    status_file=${nagiosState}/status.dat
+    object_cache_file=${nagiosState}/objects.cache
+    comment_file=${nagiosState}/comment.dat
+    downtime_file=${nagiosState}/downtime.dat
+    temp_file=${nagiosState}/nagios.tmp
+    lock_file=/var/run/nagios.lock # Not used I think.
+    state_retention_file=${nagiosState}/retention.dat
+
+    # Configuration files.
+    #resource_file=resource.cfg
+    cfg_dir=${nagiosObjectDefsDir}
+
+    # Uid/gid that the daemon runs under.
+    nagios_user=${nagiosUser}
+    nagios_group=${nagiosGroup}
+
+    # Misc. options.
+    illegal_macro_output_chars=`~$&|'\"<>
+    retain_state_information=1
+    
+  ";
+
+in
+
+{
+  name = "nagios";
+  
+  users = [
+    { name = nagiosUser;
+      uid = (import ../../system/ids.nix).uids.nagios;
+      description = "Nagios monitoring daemon";
+      home = nagiosState;
+    }
+  ];
+
+  # Run `nagios -v' to check the validity of the configuration file so
+  # that a nixos-rebuild fails *before* we kill the running Nagios
+  # daemon.
+  buildHook = "${pkgs.nagios}/bin/nagios -v ${nagiosCfgFile}";
+
+  job = "
+    description \"Nagios monitoring daemon\"
+
+    start on network-interfaces/started
+    stop on network-interfaces/stop
+
+    start script
+      mkdir -m 0755 -p ${nagiosState} ${nagiosLogDir}
+      chown ${nagiosUser} ${nagiosState} ${nagiosLogDir}
+    end script
+
+    respawn
+
+    script
+      for i in ${toString config.services.nagios.plugins}; do
+        export PATH=$i/bin:$i/sbin:$i/libexec:$PATH
+      done
+      exec ${pkgs.nagios}/bin/nagios ${nagiosCfgFile}
+    end script
+  ";
+  
+}
diff --git a/upstart-jobs/nagios/host-templates.cfg b/upstart-jobs/nagios/host-templates.cfg
new file mode 100644
index 00000000000..3a4c269e257
--- /dev/null
+++ b/upstart-jobs/nagios/host-templates.cfg
@@ -0,0 +1,27 @@
+define host {
+    name                            generic-host
+    notifications_enabled           1
+    event_handler_enabled           1
+    flap_detection_enabled          1
+    failure_prediction_enabled      1
+    process_perf_data               1
+    retain_status_information       1
+    retain_nonstatus_information    1
+    notification_period             24x7
+    register                        0
+}
+
+
+define host {
+    name                            generic-server
+    use                             generic-host
+    check_period                    24x7
+    max_check_attempts              10
+    check_command                   check-host-alive
+    notification_period             24x7
+    notification_interval           120
+    notification_options            d,u,r
+    contact_groups                  admins
+    register                        0
+    #check_interval                 1
+}
diff --git a/upstart-jobs/nagios/service-templates.cfg b/upstart-jobs/nagios/service-templates.cfg
new file mode 100644
index 00000000000..e729ea77675
--- /dev/null
+++ b/upstart-jobs/nagios/service-templates.cfg
@@ -0,0 +1,32 @@
+define service {
+    name                            generic-service
+    active_checks_enabled           1
+    passive_checks_enabled          1
+    parallelize_check               1
+    obsess_over_service             1
+    check_freshness                 0
+    notifications_enabled           1
+    event_handler_enabled           1
+    flap_detection_enabled          1
+    failure_prediction_enabled      1
+    process_perf_data               1
+    retain_status_information       1
+    retain_nonstatus_information    1
+    is_volatile                     0
+    register                        0
+}
+
+
+define service {
+    name                            local-service
+    use                             generic-service
+    check_period                    24x7
+    max_check_attempts              4
+    normal_check_interval           5
+    retry_check_interval            1
+    contact_groups                  admins
+    notification_options            w,u,c,r
+    notification_interval           0 # notify only once
+    notification_period             24x7
+    register                        0
+}
diff --git a/upstart-jobs/nagios/timeperiods.cfg b/upstart-jobs/nagios/timeperiods.cfg
new file mode 100644
index 00000000000..2669be54d3d
--- /dev/null
+++ b/upstart-jobs/nagios/timeperiods.cfg
@@ -0,0 +1,11 @@
+define timeperiod {
+    timeperiod_name 24x7
+    alias           24 Hours A Day, 7 Days A Week
+    sunday          00:00-24:00
+    monday          00:00-24:00
+    tuesday         00:00-24:00
+    wednesday       00:00-24:00
+    thursday        00:00-24:00
+    friday          00:00-24:00
+    saturday        00:00-24:00
+}
-- 
GitLab


From de01f56b428512a4bf5db769311c016d74e2b0d7 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Tue, 13 Nov 2007 15:51:24 +0000
Subject: [PATCH 0654/5331] Corrected some SVN service glitches; added
 switchable Nix

svn path=/nixos/trunk/; revision=9662
---
 system/options.nix | 17 +++++++++++++++++
 system/system.nix  |  4 +++-
 2 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/system/options.nix b/system/options.nix
index bfad4e37305..2aa64fedd8c 100644
--- a/system/options.nix
+++ b/system/options.nix
@@ -906,6 +906,7 @@
           };
 
           notificationSender = mkOption {
+            default = "svn-server@example.org";
             example = "svn-server@example.org";
             description = "
               The email address used in the Sender field of commit
@@ -914,6 +915,7 @@
           };
 
           userCreationDomain = mkOption {
+	    default = "example.org"; 
             example = "example.org";
             description = "
               The domain from which user creation is allowed.  A client can
@@ -931,6 +933,13 @@
               support WebDAV.
             ";
           };
+	  
+	  dataDir = mkOption {
+	    default = "/no/such/path/exists";
+	    description = "
+	      Place to put SVN repository.
+	    ";
+	  };
 
           organization = {
 
@@ -1476,6 +1485,14 @@ root        ALL=(ALL) SETENV: ALL
       ";
     };
 
+    nix = mkOption {
+        default = pkgs: pkgs.nixUnstable;
+        example = pkgs: pkgs.nixCustomFun /root/nix.tar.gz;
+        description = "
+          Use non-default Nix easily. Be careful, though, not to break everything.
+        ";
+    };
+
   };
 
 
diff --git a/system/system.nix b/system/system.nix
index e5d3ca618f7..2745388e0d4 100644
--- a/system/system.nix
+++ b/system/system.nix
@@ -31,7 +31,8 @@ rec {
 
   manifests = config.installer.manifests; # exported here because nixos-rebuild uses it
 
-  nix = pkgs.nixUnstable; # we need the exportReferencesGraph feature
+  /*nix = pkgs.nixUnstable; # we need the exportReferencesGraph feature*/
+  nix = config.environment.nix pkgs;
 
   kernel = config.boot.kernel pkgs;
 
@@ -225,6 +226,7 @@ rec {
     pkgs.utillinux
     pkgs.wirelesstools
     nix
+    (pkgs.lowPrio (pkgs.nixUnstable)) /* Better safe than sorry */
     nixosInstall
     nixosRebuild
     nixosCheckout
-- 
GitLab


From 14c2bb437dc12faedc5d4e9d54ff8f18da684faa Mon Sep 17 00:00:00 2001
From: Wouter den Breejen <uu@denbreejen.net>
Date: Tue, 13 Nov 2007 16:38:39 +0000
Subject: [PATCH 0655/5331] svn path=/nixos/trunk/; revision=9665

---
 upstart-jobs/xserver.nix | 14 +-------------
 1 file changed, 1 insertion(+), 13 deletions(-)

diff --git a/upstart-jobs/xserver.nix b/upstart-jobs/xserver.nix
index 88b13ffb4f8..ad91e524004 100644
--- a/upstart-jobs/xserver.nix
+++ b/upstart-jobs/xserver.nix
@@ -27,11 +27,6 @@ let
 
   optional = condition: x: if condition then [x] else [];
 
-  #Beryl parameters
-  #berylcore
-  #berylmanager
-  #berylemerald
-
   # Get a bunch of user settings.
   videoDriver = cfg.videoDriver;
   resolutions = map (res: "\"${toString res.x}x${toString res.y}\"") (cfg.resolutions);
@@ -242,10 +237,6 @@ let
       ${compiz}/bin/compiz gconf ${renderingFlag}&
       ${compiz}/bin/gtk-window-decorator --sync &
     "
-    #else if windowManager == "beryl" then "
-    #  ${berylmanager}/bin/beryl-manager &
-    #"
-
     else if windowManager == "none" then "
 
       # The session starter will start the window manager.
@@ -348,9 +339,6 @@ rec {
   ++ optional (windowManager == "compiz") [
     compiz
   ]
-  #++ optional (windowManager == "beryl") [
-  #  berylcore berylmanager berylemerald
-  #]
   ++ optional (sessionType == "xterm") [
     xterm
   ]
@@ -399,7 +387,7 @@ rec {
 
     ${if videoDriver == "nvidia"
       then "env XORG_DRI_DRIVER_PATH=${nvidiaDrivers}/X11R6/lib/modules/drivers/"
-      else if cfg.driSupport
+    else if cfg.driSupport
       then "env XORG_DRI_DRIVER_PATH=${mesa}/lib/modules/dri"
       else ""
     } 
-- 
GitLab


From f6fd10cbd8493a42821a182adcb59e63d21e1e2b Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 15 Nov 2007 17:16:16 +0000
Subject: [PATCH 0656/5331] * Support for system-wide distributed /
 multi-platform builds.   Just set nix.distributedBuilds to true and
 nix.buildMachines   to a list of machines that can perform Nix builds via
 SSH,   and local builds will be forwarded appropriately.  So now   any user
 can say something like

    nix-build /etc/nixos/nixpkgs/ --arg system '"powerpc-linux"' -A libxml2

  and the build for powerpc-linux will be forwarded to a machine
  of that type.

svn path=/nixos/trunk/; revision=9696
---
 etc/default.nix                  | 15 ++++++++++-
 etc/profile.sh                   |  5 +++-
 system/activate-configuration.sh |  2 ++
 system/options.nix               | 46 ++++++++++++++++++++++++++++++++
 system/system.nix                | 25 ++++++++++++-----
 upstart-jobs/default.nix         |  5 ++--
 upstart-jobs/nix-daemon.nix      |  8 +++---
 7 files changed, 90 insertions(+), 16 deletions(-)

diff --git a/etc/default.nix b/etc/default.nix
index 01b79872efe..5d230ff893b 100644
--- a/etc/default.nix
+++ b/etc/default.nix
@@ -1,4 +1,6 @@
-{config, pkgs, upstartJobs, systemPath, wrapperDir, defaultShell, extraEtc}:
+{ config, pkgs, upstartJobs, systemPath, wrapperDir
+, defaultShell, extraEtc, nixEnvVars
+}:
 
 let 
 
@@ -106,6 +108,7 @@ import ../helpers/make-etc.nix {
         inherit (pkgs) systemKernel glibc;
         timeZone = config.time.timeZone;
         defaultLocale = config.i18n.defaultLocale;
+        inherit nixEnvVars;
       };
       target = "profile";
     }
@@ -213,6 +216,16 @@ UseSTARTTLS=${if config.networking.defaultMailServer.useSTARTTLS then "YES" else
     ]
   )
 
+  # List of machines for distributed Nix builds in the format expected
+  # by build-remote.pl.
+  ++ optional config.nix.distributedBuilds {
+    source = pkgs.writeText "nix.machines"
+      (pkgs.lib.concatStrings (map (machine:
+        "${machine.sshUser}@${machine.hostName} ${machine.system} ${machine.sshKey} ${toString machine.maxJobs}\n"
+      ) config.nix.buildMachines));
+    target = "nix.machines";
+  }
+    
   # Additional /etc files declared by Upstart jobs.
   ++ extraEtc;
   
diff --git a/etc/profile.sh b/etc/profile.sh
index cb915a7f7c4..992f23afaba 100644
--- a/etc/profile.sh
+++ b/etc/profile.sh
@@ -1,6 +1,5 @@
 export PATH=@wrapperDir@:/var/run/current-system/sw/bin:/var/run/current-system/sw/sbin
 export MODULE_DIR=@systemKernel@/lib/modules
-export NIX_CONF_DIR=/nix/etc/nix
 export NIXPKGS_CONFIG=/nix/etc/config.nix
 export PAGER=less
 export TZ=@timeZone@
@@ -27,6 +26,10 @@ else
 fi
 
 
+# Set up the environment variables for running Nix.
+@nixEnvVars@
+
+
 # Set up the per-user profile.
 NIX_USER_PROFILE_DIR=/nix/var/nix/profiles/per-user/$USER
 mkdir -m 0755 -p $NIX_USER_PROFILE_DIR
diff --git a/system/activate-configuration.sh b/system/activate-configuration.sh
index 3767fc91d49..962be60b2a3 100644
--- a/system/activate-configuration.sh
+++ b/system/activate-configuration.sh
@@ -67,6 +67,8 @@ mkdir -m 0755 -p /var/run/console # for pam_console
 touch /var/run/utmp # must exist
 chmod 644 /var/run/utmp
 
+mkdir -m 0755 -p /var/run/nix/current-load # for distributed builds
+
 mkdir -m 0755 -p /var/log
 
 touch /var/log/wtmp # must exist
diff --git a/system/options.nix b/system/options.nix
index 2aa64fedd8c..6d5a0c967a0 100644
--- a/system/options.nix
+++ b/system/options.nix
@@ -1283,6 +1283,52 @@
       ";
     };
 
+    distributedBuilds = mkOption {
+      default = false;
+      description = "
+        Whether to distribute builds to the machines listed in
+        <option>nix.buildMachines</option>.
+      ";
+    };
+
+    buildMachines = mkOption {
+      example = [
+        { hostName = "voila.labs.cs.uu.nl";
+          sshUser = "nix";
+          sshKey = "/root/.ssh/id_buildfarm";
+          system = "powerpc-darwin";
+          maxJobs = 1;
+        }
+        { hostName = "linux64.example.org";
+          sshUser = "buildfarm";
+          sshKey = "/root/.ssh/id_buildfarm";
+          system = "x86_64-linux";
+          maxJobs = 2;
+        }
+      ];
+      description = "
+        This option lists the machines to be used if distributed
+        builds are enabled (see
+        <option>nix.distributedBuilds</option>).  Nix will perform
+        derivations on those machines via SSh by copying the inputs to
+        the Nix store on the remote machine, starting the build, then
+        copying the output back to the local Nix store.  Each element
+        of the list should be an attribute set containing the
+        machine's host name (<varname>hostname</varname>), the user
+        name to be used for the SSH connection
+        (<varname>sshUser</varname>), the Nix system type
+        (<varname>system</varname>, e.g.,
+        <literal>\"i686-linux\"</literal>), the maximum number of jobs
+        to be run in parallel on that machine
+        (<varname>maxJobs</varname>), and the path to the SSH private
+        key to be used to connect (<varname>sshKey</varname>).  The
+        SSH private key should not have a passphrase, and the
+        corresponding public key should be added to
+        <filename>~<replaceable>sshUser<replaceable>/authorized_keys</filename>
+        on the remote machine.
+      ";
+    };
+
   };
 
 
diff --git a/system/system.nix b/system/system.nix
index 2745388e0d4..b07636e7347 100644
--- a/system/system.nix
+++ b/system/system.nix
@@ -153,24 +153,35 @@ rec {
   };
 
 
+  # Environment variables for running Nix.
+  nixEnvVars =
+    "export NIX_CONF_DIR=/nix/etc/nix\n" +
+    (if config.nix.distributedBuilds then
+      "export NIX_BUILD_HOOK=${nix}/libexec/nix/build-remote.pl\n" +
+      "export NIX_REMOTE_SYSTEMS=/etc/nix.machines\n" +
+      "export NIX_CURRENT_LOAD=/var/run/nix/current-load\n"
+    else "");
+
+              
   # The services (Upstart) configuration for the system.
   upstartJobs = import ../upstart-jobs/default.nix {
-    inherit config pkgs nix modprobe nssModulesPath;
+    inherit config pkgs nix modprobe nssModulesPath nixEnvVars;
   };
 
 
   # The static parts of /etc.
   etc = import ../etc/default.nix {
-    inherit config pkgs upstartJobs systemPath wrapperDir defaultShell;
+    inherit config pkgs upstartJobs systemPath wrapperDir
+      defaultShell nixEnvVars;
     extraEtc = pkgs.lib.concatLists (map (job: job.extraEtc) upstartJobs.jobs);
   };
 
   # Font aggregation
-	fontDir = import ./fontdir.nix {
-		inherit (pkgs) stdenv;
-		inherit pkgs config;
-		inherit (pkgs.xorg) mkfontdir mkfontscale fontalias;
-	};
+  fontDir = import ./fontdir.nix {
+    inherit (pkgs) stdenv;
+    inherit pkgs config;
+    inherit (pkgs.xorg) mkfontdir mkfontscale fontalias;
+  };
 
   # The wrapper setuid programs (since we can't have setuid programs
   # in the Nix store).
diff --git a/upstart-jobs/default.nix b/upstart-jobs/default.nix
index 040119ecc73..42fc4c0b7d4 100644
--- a/upstart-jobs/default.nix
+++ b/upstart-jobs/default.nix
@@ -1,4 +1,4 @@
-{config, pkgs, nix, modprobe, nssModulesPath}:
+{config, pkgs, nix, modprobe, nssModulesPath, nixEnvVars}:
 
 let 
 
@@ -79,8 +79,7 @@ import ../upstart-jobs/gather.nix {
       
     # Nix daemon - required for multi-user Nix.
     (import ../upstart-jobs/nix-daemon.nix {
-      inherit nix;
-      inherit (pkgs) openssl;
+      inherit config pkgs nix nixEnvVars;
     })
 
     # Cron daemon.
diff --git a/upstart-jobs/nix-daemon.nix b/upstart-jobs/nix-daemon.nix
index acf85c70c9c..553c1c93533 100644
--- a/upstart-jobs/nix-daemon.nix
+++ b/upstart-jobs/nix-daemon.nix
@@ -1,4 +1,4 @@
-{nix, openssl}:
+{config, pkgs, nix, nixEnvVars}:
 
 {
   name = "nix-daemon";
@@ -6,11 +6,11 @@
   job = "
     start on startup
     stop on shutdown
-    env NIX_CONF_DIR=/nix/etc/nix
     respawn
     script
-        export PATH=${openssl}/bin:$PATH
-        exec ${nix}/bin/nix-worker --daemon > /dev/null 2>&1
+      export PATH=${if config.nix.distributedBuilds then "${pkgs.openssh}/bin:" else ""}${pkgs.openssl}/bin:${nix}/bin:$PATH
+      ${nixEnvVars}
+      exec ${nix}/bin/nix-worker --daemon > /dev/null 2>&1
     end script
   ";
 
-- 
GitLab


From 94854926fb6a36ba9b5b66fc7c4539f43cdddf81 Mon Sep 17 00:00:00 2001
From: Wouter den Breejen <uu@denbreejen.net>
Date: Thu, 15 Nov 2007 18:31:31 +0000
Subject: [PATCH 0657/5331] Made the docs to install compiz fusion a little bit
 more clear. All credits go to Michael raskin.

svn path=/nixos/trunk/; revision=9698
---
 doc/manual/userconfiguration.xml | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/doc/manual/userconfiguration.xml b/doc/manual/userconfiguration.xml
index 5c74c05e879..b231cd1eadc 100644
--- a/doc/manual/userconfiguration.xml
+++ b/doc/manual/userconfiguration.xml
@@ -35,13 +35,19 @@
 	should be found, but if you run <literal>Compiz</literal> with 
 	<literal>GConf</literal> configuration (default for <literal>X server</literal> job
 	for now), you have to link 
-	<filename>/var/run/current-system/sw/share/compizconfig/backends/libgconf.so</filename>
+	<filename>/var/run/current-system/sw/share/compizconfig/backends/</filename>
 	into <filename>$HOME/.compizconfig/backends</filename> directory.
 	</para></listitem>
 
 	</orderedlist>
 
-	Now you can launch <literal>ccsm</literal> and configure everything.
+        To summarize the above, these are the commands you have to execute
+        <command>ln -s /var/run/current-system/sw/share/compiz/ $HOME/.compiz/metadata</command>
+        <command>ln -s /var/run/current-system/sw/share/compiz-plugins/compiz/ $HOME/.compiz/plugins</command>
+        <command>ln -s /var/run/current-system/sw/share/compizconfig/backends/ $HOME/.compizconfig/backends</command>
+
+	Now you can launch <literal>ccsm</literal> and configure everything. You should select
+	GConf as a backend in the preferences menu of <literal>ccsm</literal>
 </para>
 </section>
 
-- 
GitLab


From d7eb1006bb4c2c9d830495b830218acad59a177b Mon Sep 17 00:00:00 2001
From: Marc Weber <marco-oweber@gmx.de>
Date: Thu, 15 Nov 2007 23:52:53 +0000
Subject: [PATCH 0658/5331] added driver nv as suggested by niksnut

svn path=/nixos/trunk/; revision=9700
---
 upstart-jobs/xserver.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/upstart-jobs/xserver.nix b/upstart-jobs/xserver.nix
index ad91e524004..c30e1e94e6d 100644
--- a/upstart-jobs/xserver.nix
+++ b/upstart-jobs/xserver.nix
@@ -62,6 +62,7 @@ let
     ++ optional (videoDriver == "sis") xorg.xf86videosis
     ++ optional (videoDriver == "i810") xorg.xf86videoi810
     ++ optional (videoDriver == "intel") xorg.xf86videointel
+    ++ optional (videoDriver == "nv") xorg.xf86videonv;
     ++ (optional (cfg.isSynaptics) [(synaptics+"/"+xorg.xorgserver) /*xorg.xf86inputevdev*/]);
     
   configFile = stdenv.mkDerivation {
-- 
GitLab


From bb08b8ff484ffa4e49b8b385924dc56f3ff660fa Mon Sep 17 00:00:00 2001
From: Marc Weber <marco-oweber@gmx.de>
Date: Thu, 15 Nov 2007 23:57:20 +0000
Subject: [PATCH 0659/5331] ; bug fix

svn path=/nixos/trunk/; revision=9701
---
 upstart-jobs/xserver.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/upstart-jobs/xserver.nix b/upstart-jobs/xserver.nix
index c30e1e94e6d..cb9c08f542d 100644
--- a/upstart-jobs/xserver.nix
+++ b/upstart-jobs/xserver.nix
@@ -62,7 +62,7 @@ let
     ++ optional (videoDriver == "sis") xorg.xf86videosis
     ++ optional (videoDriver == "i810") xorg.xf86videoi810
     ++ optional (videoDriver == "intel") xorg.xf86videointel
-    ++ optional (videoDriver == "nv") xorg.xf86videonv;
+    ++ optional (videoDriver == "nv") xorg.xf86videonv
     ++ (optional (cfg.isSynaptics) [(synaptics+"/"+xorg.xorgserver) /*xorg.xf86inputevdev*/]);
     
   configFile = stdenv.mkDerivation {
-- 
GitLab


From b8806478701ded66fa5a6151f6aaf2140dafb024 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 16 Nov 2007 13:26:34 +0000
Subject: [PATCH 0660/5331] * Options users.extraUsers and users.extraGroups to
 specify additional   users and groups that the system should create
 automatically.

svn path=/nixos/trunk/; revision=9705
---
 helpers/create-users-groups.sh |  4 +++-
 system/options.nix             | 29 +++++++++++++++++++++++++++++
 system/system.nix              |  2 +-
 system/users-groups.nix        | 24 +++++++++++++-----------
 4 files changed, 46 insertions(+), 13 deletions(-)

diff --git a/helpers/create-users-groups.sh b/helpers/create-users-groups.sh
index da168650897..cb68d23cb59 100644
--- a/helpers/create-users-groups.sh
+++ b/helpers/create-users-groups.sh
@@ -26,6 +26,7 @@ cat "$1" | while true; do
     read extraGroups
     read home
     read shell
+    read createHome
 
     if ! curEnt=$(getent passwd "$name"); then
         echo "creating user $name..."
@@ -36,7 +37,8 @@ cat "$1" | while true; do
             --gid "$group" \
             --groups "$extraGroups" \
             --home "$home" \
-            --shell "$shell"
+            --shell "$shell" \
+            ${createHome:+--create-home}
     else
         echo "updating user $name..."
         oldIFS="$IFS"; IFS=:; set -- $curEnt; IFS="$oldIFS"
diff --git a/system/options.nix b/system/options.nix
index 6d5a0c967a0..9fe8aaa577e 100644
--- a/system/options.nix
+++ b/system/options.nix
@@ -1388,6 +1388,35 @@ root        ALL=(ALL) SETENV: ALL
 
   users = {
 
+    extraUsers = mkOption {
+      default = [];
+      example = [
+        { name = "alice";
+          uid = 1234;
+          description = "Alice";
+          home = "/home/alice";
+          createHome = true;
+          group = "users";
+          extraGroups = ["wheel"];
+        }
+      ];
+      description = "
+        Additional user accounts to be created automatically by the system.
+      ";
+    };
+
+    extraGroups = mkOption {
+      default = [];
+      example = [
+        { name = "students";
+          gid = 1001;
+        }
+      ];
+      description = "
+        Additional groups to be created automatically by the system.
+      ";
+    };
+
     ldap = {
 
       enable = mkOption {
diff --git a/system/system.nix b/system/system.nix
index b07636e7347..9e67236522d 100644
--- a/system/system.nix
+++ b/system/system.nix
@@ -262,7 +262,7 @@ rec {
   };
 
 
-  usersGroups = import ./users-groups.nix { inherit pkgs upstartJobs defaultShell; };
+  usersGroups = import ./users-groups.nix { inherit pkgs config upstartJobs defaultShell; };
 
 
   defaultShell = "/var/run/current-system/sw/bin/bash";
diff --git a/system/users-groups.nix b/system/users-groups.nix
index b156ac5591e..9235fe11c18 100644
--- a/system/users-groups.nix
+++ b/system/users-groups.nix
@@ -1,11 +1,11 @@
-{pkgs, upstartJobs, defaultShell}:
+{pkgs, config, upstartJobs, defaultShell}:
 
 let ids = import ./ids.nix; in
 
 rec {
 
-  # System user accounts.
-  systemUsers =
+  # User accounts to be created/updated by NixOS.
+  users =
     let
       jobUsers = pkgs.lib.concatLists (map (job: job.users) upstartJobs.jobs);
       
@@ -40,15 +40,17 @@ rec {
         , group ? "nogroup"
         , extraGroups ? []
         , home ? "/var/empty"
-        , shell ? "/noshell"
+        , shell ? (if useDefaultShell then defaultShell else "/noshell")
+        , createHome ? false
+        , useDefaultShell ? false
         }:
-        { inherit name description uid group extraGroups home shell; };
+        { inherit name description uid group extraGroups home shell createHome; };
 
-    in map addAttrs (defaultUsers ++ jobUsers ++ nixBuildUsers);
+    in map addAttrs (defaultUsers ++ jobUsers ++ nixBuildUsers ++ config.users.extraUsers);
 
 
-  # System groups.
-  systemGroups =
+  # Groups to be created/updated by NixOS.
+  groups =
     let
       jobGroups = pkgs.lib.concatLists (map (job: job.groups) upstartJobs.jobs);
 
@@ -75,12 +77,12 @@ rec {
         { name, gid ? "" }:
         { inherit name gid; };
 
-    in map addAttrs (defaultGroups ++ jobGroups);
+    in map addAttrs (defaultGroups ++ jobGroups ++ config.users.extraGroups);
 
 
   # Awful hackery necessary to pass the users/groups to the activation script.
   createUsersGroups = ../helpers/create-users-groups.sh;
-  usersList = pkgs.writeText "users" (pkgs.lib.concatStrings (map (u: "${u.name}\n${u.description}\n${toString u.uid}\n${u.group}\n${toString u.extraGroups}\n${u.home}\n${u.shell}\n") systemUsers));
-  groupsList = pkgs.writeText "groups" (pkgs.lib.concatStrings (map (g: "${g.name}\n${toString g.gid}\n") systemGroups));
+  usersList = pkgs.writeText "users" (pkgs.lib.concatStrings (map (u: "${u.name}\n${u.description}\n${toString u.uid}\n${u.group}\n${toString u.extraGroups}\n${u.home}\n${u.shell}\n${toString u.createHome}\n") users));
+  groupsList = pkgs.writeText "groups" (pkgs.lib.concatStrings (map (g: "${g.name}\n${toString g.gid}\n") groups));
     
 }
-- 
GitLab


From d53c726cbbc397cc500b1a3d94e21d53608059d6 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 19 Nov 2007 15:31:28 +0000
Subject: [PATCH 0661/5331] * Make the Nagios configuration visible in
 /etc/nagios.cfg.

svn path=/nixos/trunk/; revision=9753
---
 upstart-jobs/nagios/default.nix | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/upstart-jobs/nagios/default.nix b/upstart-jobs/nagios/default.nix
index 0dc31feaf61..5cafee64375 100644
--- a/upstart-jobs/nagios/default.nix
+++ b/upstart-jobs/nagios/default.nix
@@ -58,6 +58,16 @@ in
     }
   ];
 
+  extraPath = [pkgs.nagios];
+
+  # This isn't needed, it's just so that the user can type "nagiostats
+  # -c /etc/nagios.cfg".
+  extraEtc = [
+    { source = nagiosCfgFile;
+      target = "nagios.cfg";
+    }
+  ];
+
   # Run `nagios -v' to check the validity of the configuration file so
   # that a nixos-rebuild fails *before* we kill the running Nagios
   # daemon.
-- 
GitLab


From 4de273e376c696792df16f917e7142aaead95a07 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 19 Nov 2007 15:50:02 +0000
Subject: [PATCH 0662/5331] * Set the To: field. * Doh! copy the actual Nagios
 config files to the store,   not symlinks to the sources outside of the
 store.

svn path=/nixos/trunk/; revision=9755
---
 upstart-jobs/nagios/commands.cfg | 7 +++----
 upstart-jobs/nagios/default.nix  | 4 ++--
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/upstart-jobs/nagios/commands.cfg b/upstart-jobs/nagios/commands.cfg
index feeb0155932..337ed240128 100644
--- a/upstart-jobs/nagios/commands.cfg
+++ b/upstart-jobs/nagios/commands.cfg
@@ -1,12 +1,11 @@
 define command {
     command_name host-notify-by-email
-    command_line printf "%b" "Subject: [Nagios] Host $HOSTSTATE$ alert for $HOSTNAME$\n\n***** Nagios *****\n\nNotification Type: $NOTIFICATIONTYPE$\nHost: $HOSTNAME$\nState: $HOSTSTATE$\nAddress: $HOSTADDRESS$\nInfo: $HOSTOUTPUT$\n\nDate/Time: $LONGDATETIME$\n" | sendmail $CONTACTEMAIL$
+    command_line printf "%b" "To: $CONTACTEMAIL$\nSubject: [Nagios] Host $HOSTSTATE$ alert for $HOSTNAME$\n\n***** Nagios *****\n\nNotification Type: $NOTIFICATIONTYPE$\nHost: $HOSTNAME$\nState: $HOSTSTATE$\nAddress: $HOSTADDRESS$\nInfo: $HOSTOUTPUT$\n\nDate/Time: $LONGDATETIME$\n" | sendmail $CONTACTEMAIL$
 }
 
-
-define command{
+define command {
     command_name notify-by-email
-    command_line printf "%b" "Subject: [Nagios] $NOTIFICATIONTYPE$ alert - $HOSTALIAS$/$SERVICEDESC$ is $SERVICESTATE$\n\n***** Nagios *****\n\nNotification Type: $NOTIFICATIONTYPE$\nService: $SERVICEDESC$\nHost: $HOSTALIAS$\nAddress: $HOSTADDRESS$\nState: $SERVICESTATE$\n\nDate/Time: $LONGDATETIME$\n\nAdditional Info:\n\n$SERVICEOUTPUT$" | sendmail $CONTACTEMAIL$
+    command_line printf "%b" "To: $CONTACTEMAIL$\nSubject: [Nagios] $NOTIFICATIONTYPE$ alert - $HOSTALIAS$/$SERVICEDESC$ is $SERVICESTATE$\n\n***** Nagios *****\n\nNotification Type: $NOTIFICATIONTYPE$\nService: $SERVICEDESC$\nHost: $HOSTALIAS$\nAddress: $HOSTADDRESS$\nState: $SERVICESTATE$\n\nDate/Time: $LONGDATETIME$\n\nAdditional Info:\n\n$SERVICEOUTPUT$" | sendmail $CONTACTEMAIL$
 }
 
 
diff --git a/upstart-jobs/nagios/default.nix b/upstart-jobs/nagios/default.nix
index 5cafee64375..a9ad05055f5 100644
--- a/upstart-jobs/nagios/default.nix
+++ b/upstart-jobs/nagios/default.nix
@@ -15,8 +15,8 @@ let
     ./commands.cfg
   ] ++ config.services.nagios.objectDefs;
 
-  nagiosObjectDefsDir = pkgs.runCommand "nagios-objects" {}
-    "ensureDir $out; ln -s ${toString nagiosObjectDefs} $out/";
+  nagiosObjectDefsDir = pkgs.runCommand "nagios-objects" {inherit nagiosObjectDefs;}
+    "ensureDir $out; ln -s $nagiosObjectDefs $out/";
 
   nagiosCfgFile = pkgs.writeText "nagios.cfg" "
   
-- 
GitLab


From 524f1fa3769a49b21892e8753cc80ac71d80f23b Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 19 Nov 2007 15:50:26 +0000
Subject: [PATCH 0663/5331] svn path=/nixos/trunk/; revision=9756

---
 upstart-jobs/nagios/commands.cfg | 1 +
 1 file changed, 1 insertion(+)

diff --git a/upstart-jobs/nagios/commands.cfg b/upstart-jobs/nagios/commands.cfg
index 337ed240128..6efdefcd37d 100644
--- a/upstart-jobs/nagios/commands.cfg
+++ b/upstart-jobs/nagios/commands.cfg
@@ -3,6 +3,7 @@ define command {
     command_line printf "%b" "To: $CONTACTEMAIL$\nSubject: [Nagios] Host $HOSTSTATE$ alert for $HOSTNAME$\n\n***** Nagios *****\n\nNotification Type: $NOTIFICATIONTYPE$\nHost: $HOSTNAME$\nState: $HOSTSTATE$\nAddress: $HOSTADDRESS$\nInfo: $HOSTOUTPUT$\n\nDate/Time: $LONGDATETIME$\n" | sendmail $CONTACTEMAIL$
 }
 
+
 define command {
     command_name notify-by-email
     command_line printf "%b" "To: $CONTACTEMAIL$\nSubject: [Nagios] $NOTIFICATIONTYPE$ alert - $HOSTALIAS$/$SERVICEDESC$ is $SERVICESTATE$\n\n***** Nagios *****\n\nNotification Type: $NOTIFICATIONTYPE$\nService: $SERVICEDESC$\nHost: $HOSTALIAS$\nAddress: $HOSTADDRESS$\nState: $SERVICESTATE$\n\nDate/Time: $LONGDATETIME$\n\nAdditional Info:\n\n$SERVICEOUTPUT$" | sendmail $CONTACTEMAIL$
-- 
GitLab


From 4b1ed0ded2e355df594a8a7314afb50c6225cdaf Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 19 Nov 2007 16:56:40 +0000
Subject: [PATCH 0664/5331] * Don't complain about groups with no gid.

svn path=/nixos/trunk/; revision=9757
---
 helpers/create-users-groups.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/helpers/create-users-groups.sh b/helpers/create-users-groups.sh
index cb68d23cb59..bdb1a91f0ed 100644
--- a/helpers/create-users-groups.sh
+++ b/helpers/create-users-groups.sh
@@ -11,7 +11,7 @@ cat "$2" | while true; do
         echo "updating group $name..."
         oldIFS="$IFS"; IFS=:; set -- $curEnt; IFS="$oldIFS"
         prevGid=$3
-        if test "$prevGid" != "$gid"; then
+        if test -n "$gid" -a "$prevGid" != "$gid"; then
             groupmod "$name" --gid $gid
         fi
     fi
-- 
GitLab


From 1089c1f7fa6f1ae24f1c3396c2a0ef86e3861440 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 21 Nov 2007 14:39:52 +0000
Subject: [PATCH 0665/5331] * Fix the manual.

svn path=/nixos/trunk/; revision=9769
---
 doc/manual/options-to-docbook.xsl | 9 ++++-----
 system/options.nix                | 2 +-
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/doc/manual/options-to-docbook.xsl b/doc/manual/options-to-docbook.xsl
index 696c16c8648..1496daf30c6 100644
--- a/doc/manual/options-to-docbook.xsl
+++ b/doc/manual/options-to-docbook.xsl
@@ -75,7 +75,7 @@
 
   <xsl:template match="string">
     <!-- !!! escaping -->
-    "<xsl:value-of select="@value" />"
+    <xsl:text>"</xsl:text><xsl:value-of select="@value" /><xsl:text>"</xsl:text>
   </xsl:template>
   
   
@@ -85,12 +85,12 @@
   
   
   <xsl:template match="bool[@value = 'true']">
-    true
+    <xsl:text>true</xsl:text>
   </xsl:template>
   
   
   <xsl:template match="bool[@value = 'false']">
-    false
+    <xsl:text>false</xsl:text>
   </xsl:template>
   
   
@@ -109,8 +109,7 @@
     <xsl:for-each select="attr">
       <xsl:value-of select="@name" />
       <xsl:text> = </xsl:text>
-      <xsl:apply-templates select="*" />
-      <xsl:text>; </xsl:text>
+      <xsl:apply-templates select="*" /><xsl:text>; </xsl:text>
     </xsl:for-each>
     }
   </xsl:template>
diff --git a/system/options.nix b/system/options.nix
index 9fe8aaa577e..78128a03f22 100644
--- a/system/options.nix
+++ b/system/options.nix
@@ -1324,7 +1324,7 @@
         key to be used to connect (<varname>sshKey</varname>).  The
         SSH private key should not have a passphrase, and the
         corresponding public key should be added to
-        <filename>~<replaceable>sshUser<replaceable>/authorized_keys</filename>
+        <filename>~<replaceable>sshUser</replaceable>/authorized_keys</filename>
         on the remote machine.
       ";
     };
-- 
GitLab


From e7e685e4ce8709f075450427b9208d983ffc085b Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 23 Nov 2007 10:56:12 +0000
Subject: [PATCH 0666/5331] * Allow Upstart jobs to declare extra configuration
 for Apache.   Did this for Nagios.  Soon we can rename upstart-jobs to  
 services/plugins/whatever (i.e. an Upstart job will just be   one kind of
 configuration item that a plugin can declare).

svn path=/nixos/trunk/; revision=9778
---
 system/options.nix              | 18 +++++++++++++++++
 upstart-jobs/default.nix        | 13 +++++++------
 upstart-jobs/httpd.nix          |  4 ++--
 upstart-jobs/make-job.nix       |  4 ++++
 upstart-jobs/nagios/default.nix | 34 +++++++++++++++++++++++++++++++++
 5 files changed, 65 insertions(+), 8 deletions(-)

diff --git a/system/options.nix b/system/options.nix
index 78128a03f22..d525136b5a8 100644
--- a/system/options.nix
+++ b/system/options.nix
@@ -874,6 +874,7 @@
         ";
       };
 
+      # !!! this is a mis-nomer, should be "extraConfig" or something.
       extraDirectories = mkOption {
         default = "";
         example = "
@@ -1216,6 +1217,23 @@
         ";
       };
 
+      enableWebInterface = mkOption {
+        default = false;
+        description = "
+          Whether to enable the Nagios web interface.  You should also
+          enable Apache (<option>services.httpd.enable</option>).
+        ";
+      };
+
+      urlPath = mkOption {
+        default = "/nagios";
+        description = "
+          The URL path under which the Nagios web interface appears.
+          That is, you can access the Nagios web interface through
+          <literal>http://<replaceable>server</replaceable>/<replaceable>urlPath</replaceable></literal>.
+        ";
+      };
+
     };
 
 
diff --git a/upstart-jobs/default.nix b/upstart-jobs/default.nix
index 42fc4c0b7d4..a4ab27e001f 100644
--- a/upstart-jobs/default.nix
+++ b/upstart-jobs/default.nix
@@ -12,11 +12,7 @@ let
     (config.services.mingetty.ttys)
     ++ [10] /* !!! sync with syslog.conf */ ;
 
-in
-
-import ../upstart-jobs/gather.nix {
-  inherit (pkgs) runCommand;
-
+    
   jobs = map makeJob [
     # Syslogd.
     (import ../upstart-jobs/syslogd.nix {
@@ -171,6 +167,8 @@ import ../upstart-jobs/gather.nix {
     (import ../upstart-jobs/httpd.nix {
       inherit config pkgs;
       inherit (pkgs) glibc;
+      extraConfig = pkgs.lib.concatStringsSep "\n"
+        (map (job: job.extraHttpdConfig) jobs);
     })
 
   # Samba service.
@@ -203,7 +201,6 @@ import ../upstart-jobs/gather.nix {
       inherit config pkgs;
     })
 
-
   # ALSA sound support.
   ++ optional config.sound.enable
     (import ../upstart-jobs/alsa.nix {
@@ -285,5 +282,9 @@ import ../upstart-jobs/gather.nix {
 
   # For the built-in logd job.
   ++ [(makeJob { jobDrv = pkgs.upstart; })];
+
   
+in import ../upstart-jobs/gather.nix {
+  inherit (pkgs) runCommand;
+  inherit jobs;
 }
diff --git a/upstart-jobs/httpd.nix b/upstart-jobs/httpd.nix
index fcc89740b5a..a8f00552fc8 100644
--- a/upstart-jobs/httpd.nix
+++ b/upstart-jobs/httpd.nix
@@ -1,4 +1,4 @@
-{config, pkgs, glibc}:
+{config, pkgs, glibc, extraConfig}:
 
 let
 
@@ -18,7 +18,7 @@ let
   stateDir = cfg.stateDir;
   enableSSL = false;
   noUserDir = cfg.noUserDir;
-  extraDirectories = cfg.extraDirectories;
+  extraDirectories = cfg.extraDirectories + extraConfig;
 
   startingDependency = if config.services.gw6c.enable then "gw6c" else "network-interfaces";
   
diff --git a/upstart-jobs/make-job.nix b/upstart-jobs/make-job.nix
index 14f48ae04d6..5523ad5af93 100644
--- a/upstart-jobs/make-job.nix
+++ b/upstart-jobs/make-job.nix
@@ -24,6 +24,10 @@
   # Allow jobs to declare extra files that should be added to /etc.
   extraEtc = if job ? extraEtc then job.extraEtc else [];
 
+  # Allow jobs to declare extra configuration for Apache (e.g. Nagios
+  # declaring its web interface).
+  extraHttpdConfig = if job ? extraHttpdConfig then job.extraHttpdConfig else "";
+
   # Allow jobs to declare user accounts that should be created.
   users = if job ? users then job.users else [];
   
diff --git a/upstart-jobs/nagios/default.nix b/upstart-jobs/nagios/default.nix
index a9ad05055f5..256693ba072 100644
--- a/upstart-jobs/nagios/default.nix
+++ b/upstart-jobs/nagios/default.nix
@@ -45,6 +45,37 @@ let
     
   ";
 
+  # Plain configuration for the Nagios web-interface with no
+  # authentication.
+  nagiosCGICfgFile = pkgs.writeText "nagios.cgi.conf" "
+    main_config_file=${nagiosCfgFile}
+    use_authentication=0
+    url_html_path=/nagios
+  ";
+
+  urlPath = config.services.nagios.urlPath;
+
+  extraHttpdConfig = "
+    ScriptAlias ${urlPath}/cgi-bin ${pkgs.nagios}/sbin
+
+    <Directory \"${pkgs.nagios}/sbin\">
+      Options ExecCGI
+      AllowOverride None
+      Order allow,deny
+      Allow from all
+      SetEnv NAGIOS_CGI_CONFIG ${nagiosCGICfgFile}
+    </Directory>
+
+    Alias ${urlPath} ${pkgs.nagios}/share
+
+    <Directory \"${pkgs.nagios}/share\">
+      Options None
+      AllowOverride None
+      Order allow,deny
+      Allow from all
+    </Directory>
+  ";
+    
 in
 
 {
@@ -68,6 +99,9 @@ in
     }
   ];
 
+  extraHttpdConfig =
+    if config.services.nagios.enableWebInterface then extraHttpdConfig else "";
+  
   # Run `nagios -v' to check the validity of the configuration file so
   # that a nixos-rebuild fails *before* we kill the running Nagios
   # daemon.
-- 
GitLab


From 9dd7891820a9a3e37896bc86f1cc26a8dddbba1d Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 23 Nov 2007 17:12:37 +0000
Subject: [PATCH 0667/5331] * Options for configuring the (mail) domain.

svn path=/nixos/trunk/; revision=9785
---
 etc/default.nix                     |  9 +++++----
 system/options.nix                  | 16 +++++++++++++++
 upstart-jobs/default.nix            |  6 +-----
 upstart-jobs/network-interfaces.nix | 30 +++++++++++++++--------------
 4 files changed, 38 insertions(+), 23 deletions(-)

diff --git a/etc/default.nix b/etc/default.nix
index 5d230ff893b..a43bcf7fe6f 100644
--- a/etc/default.nix
+++ b/etc/default.nix
@@ -134,10 +134,11 @@ import ../helpers/make-etc.nix {
 
   # Configuration for ssmtp.
   ++ optional config.networking.defaultMailServer.directDelivery { 
-    source = pkgs.writeText "ssmtp.conf" "
-mailhub=${config.networking.defaultMailServer.hostName}
-UseTLS=${if config.networking.defaultMailServer.useTLS then "YES" else "NO"}
-UseSTARTTLS=${if config.networking.defaultMailServer.useSTARTTLS then "YES" else "NO"}
+    source = let cfg = config.networking.defaultMailServer; in pkgs.writeText "ssmtp.conf" "
+mailhub=${cfg.hostName}
+${if cfg.domain != "" then "rewriteDomain=${cfg.domain}" else ""}
+UseTLS=${if cfg.useTLS then "YES" else "NO"}
+UseSTARTTLS=${if cfg.useSTARTTLS then "YES" else "NO"}
 #Debug=YES
       ";
     target = "ssmtp/ssmtp.conf";
diff --git a/system/options.nix b/system/options.nix
index d525136b5a8..fee70d3311e 100644
--- a/system/options.nix
+++ b/system/options.nix
@@ -265,6 +265,14 @@
       ";
     };
 
+    domain = mkOption {
+      default = "";
+      example = "home";
+      description = "
+        The domain.  It can be left empty if it is auto-detected through DHCP.
+      ";
+    };
+
     enableIntel2200BGFirmware = mkOption {
       default = false;
       description = "
@@ -335,6 +343,14 @@
         ";
       };
 
+      domain = mkOption {
+        default = "";
+        example = "example.org";
+        description = "
+          The domain from which mail will appear to be sent.
+        ";
+      };
+
       useTLS = mkOption {
         default = false;
         example = true;
diff --git a/upstart-jobs/default.nix b/upstart-jobs/default.nix
index a4ab27e001f..85358be096b 100644
--- a/upstart-jobs/default.nix
+++ b/upstart-jobs/default.nix
@@ -65,12 +65,8 @@ let
 
     # Network interfaces.
     (import ../upstart-jobs/network-interfaces.nix {
-      inherit modprobe;
+      inherit modprobe config;
       inherit (pkgs) nettools wirelesstools bash writeText;
-      nameservers = config.networking.nameservers;
-      defaultGateway = config.networking.defaultGateway;
-      interfaces = config.networking.interfaces;
-      localCommands = config.networking.localCommands;
     })
       
     # Nix daemon - required for multi-user Nix.
diff --git a/upstart-jobs/network-interfaces.nix b/upstart-jobs/network-interfaces.nix
index b3f06124310..610ff550536 100644
--- a/upstart-jobs/network-interfaces.nix
+++ b/upstart-jobs/network-interfaces.nix
@@ -1,16 +1,15 @@
-{ nettools, modprobe, wirelesstools, bash, writeText
-, nameservers, defaultGateway, interfaces
-, localCommands
-}:
+{nettools, modprobe, wirelesstools, bash, writeText, config}:
 
 let
 
+  cfg = config.networking;
+
   # !!! use XML
-  names = map (i: i.name) interfaces;
-  ipAddresses = map (i: if i ? ipAddress then i.ipAddress else "dhcp") interfaces;
-  subnetMasks = map (i: if i ? subnetMask then i.subnetMask else "default") interfaces;
-  essids = map (i: if i ? essid then i.essid else "default") interfaces;
-  wepKeys = map (i: if i ? wepKey then i.wepKey else "nokey") interfaces;
+  names = map (i: i.name) cfg.interfaces;
+  ipAddresses = map (i: if i ? ipAddress then i.ipAddress else "dhcp") cfg.interfaces;
+  subnetMasks = map (i: if i ? subnetMask then i.subnetMask else "default") cfg.interfaces;
+  essids = map (i: if i ? essid then i.essid else "default") cfg.interfaces;
+  wepKeys = map (i: if i ? wepKey then i.wepKey else "nokey") cfg.interfaces;
 
 in 
 
@@ -66,20 +65,23 @@ start script
     done
 
     # Set the nameservers.
-    if test -n \"${toString nameservers}\"; then
+    if test -n \"${toString cfg.nameservers}\"; then
         rm -f /etc/resolv.conf
-        for i in ${toString nameservers}; do
+        if test -n \"${cfg.domain}\"; then
+	    echo \"domain ${cfg.domain}\" >> /etc/resolv.conf
+        fi
+        for i in ${toString cfg.nameservers}; do
             echo \"nameserver $i\" >> /etc/resolv.conf
         done
     fi
 
     # Set the default gateway.
-    if test -n \"${defaultGateway}\"; then
-        ${nettools}/sbin/route add default gw \"${defaultGateway}\" || true
+    if test -n \"${cfg.defaultGateway}\"; then
+        ${nettools}/sbin/route add default gw \"${cfg.defaultGateway}\" || true
     fi
 
     # Run any user-specified commands.
-    ${bash}/bin/sh ${writeText "local-net-cmds" localCommands} || true
+    ${bash}/bin/sh ${writeText "local-net-cmds" cfg.localCommands} || true
 
 end script
 
-- 
GitLab


From 5cd638aad8ca339ee415d9ad0daf53358713fb89 Mon Sep 17 00:00:00 2001
From: "Yury G. Kudryashov" <urkud.urkud@gmail.com>
Date: Sat, 1 Dec 2007 20:44:27 +0000
Subject: [PATCH 0668/5331] new option: paths to link to
 /var/run/current-system/sw

svn path=/nixos/trunk/; revision=9828
---
 system/options.nix | 8 ++++++++
 system/system.nix  | 2 +-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/system/options.nix b/system/options.nix
index fee70d3311e..9232e9a8c52 100644
--- a/system/options.nix
+++ b/system/options.nix
@@ -1578,6 +1578,14 @@ root        ALL=(ALL) SETENV: ALL
 
   environment = {
 
+    pathsToLink = mkOption {
+      default = ["/bin" "/sbin" "/share"];
+      example = ["/"];
+      description = "
+        This allows to symlink more directories in /var/run/current-system/sw
+      ";
+    };
+
     extraPackages = mkOption {
       default = pkgs: [];
       example = pkgs: [pkgs.firefox pkgs.thunderbird];
diff --git a/system/system.nix b/system/system.nix
index 9e67236522d..311ddaf0a1e 100644
--- a/system/system.nix
+++ b/system/system.nix
@@ -257,7 +257,7 @@ rec {
   systemPath = pkgs.buildEnv {
     name = "system-path";
     paths = systemPathList;
-    pathsToLink = ["/bin" "/sbin" "/man" "/share"];
+    inherit (config.environment) pathsToLink;
     ignoreCollisions = true;
   };
 
-- 
GitLab


From aeced64d0e8268271edda3486259b36abf8c09f1 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Mon, 3 Dec 2007 04:48:31 +0000
Subject: [PATCH 0669/5331] Added PostgreSQL job.

svn path=/nixos/trunk/; revision=9830
---
 system/options.nix          | 46 +++++++++++++++++++++++++++++++++++++
 upstart-jobs/default.nix    |  8 +++++++
 upstart-jobs/postgresql.nix | 30 ++++++++++++++++++++++++
 3 files changed, 84 insertions(+)
 create mode 100644 upstart-jobs/postgresql.nix

diff --git a/system/options.nix b/system/options.nix
index 9232e9a8c52..dae2763943d 100644
--- a/system/options.nix
+++ b/system/options.nix
@@ -1252,6 +1252,52 @@
 
     };
 
+    postgresql = {
+      enable = mkOption {
+        default = false;
+	description = "
+	  Whether to run PostgreSQL.
+	";
+      };
+      port = mkOption {
+        default = "5432";
+	description = "
+	  Port for PostgreSQL.
+	";
+      };
+      logDir = mkOption {
+        default = "/var/log/postgresql";
+	description = "
+	  Log directory for PostgreSQL.
+	";
+      };
+      dataDir = mkOption {
+        default = "/var/db/postgresql";
+	description = "
+	  Data directory for PostgreSQL.
+	";
+      };
+      subServices = mkOption {
+        default = [];
+	description = "
+	  Subservices list. As it is already implememnted, 
+	  here is an interface...
+	";
+      };
+      allowedHosts = mkOption {
+        default = [];
+	description = "
+	  Hosts (except localhost), who you allow to connect.
+	";
+      };
+      authMethod = mkOption {
+        default = " ident sameuser ";
+	description = "
+	  How to authorize users. 
+	  Note: ident needs absolute trust to all allowed client hosts.";
+      };
+    };
+
 
   };
 
diff --git a/upstart-jobs/default.nix b/upstart-jobs/default.nix
index 85358be096b..993fb12528a 100644
--- a/upstart-jobs/default.nix
+++ b/upstart-jobs/default.nix
@@ -167,6 +167,14 @@ let
         (map (job: job.extraHttpdConfig) jobs);
     })
 
+  # Postgres SQL server
+  ++ optional config.services.postgresql.enable
+    (import ../upstart-jobs/postgresql.nix {
+      inherit config pkgs;
+      startDependency = if config.services.gw6c.enable then 
+        "gw6c" else "network-interfaces";
+    })
+
   # Samba service.
   ++ optional config.services.samba.enable
     (import ../upstart-jobs/samba.nix {
diff --git a/upstart-jobs/postgresql.nix b/upstart-jobs/postgresql.nix
new file mode 100644
index 00000000000..9b74c76befc
--- /dev/null
+++ b/upstart-jobs/postgresql.nix
@@ -0,0 +1,30 @@
+args: with args;
+
+let
+
+cfg = config.services.postgresql;
+postgresqlService = import ../services/postgresql {
+	inherit (pkgs) stdenv postgresql su;
+	inherit (cfg) port logDir dataDir
+		subServices allowedHosts
+		authMethod;
+	serverUser = "postgres";
+};
+
+in
+{
+	name = "postgresql";
+	users = [ {
+		name = "postgres";
+		description = "PostgreSQL server user";
+	} ];
+	groups = [{name = "postgres";}];
+	job = "
+description \"PostgreSQL server\"
+
+start on ${startDependency}/started
+stop on ${startDependency}/stop
+
+respawn ${postgresqlService}/bin/control start
+	";
+}
-- 
GitLab


From d2377fae72cc52f3005616b415e38b89d0f7fcae Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 4 Dec 2007 12:31:00 +0000
Subject: [PATCH 0670/5331] * Make sure that /nix/var/nix/channel-cache exists.

svn path=/nixos/trunk/; revision=9854
---
 installer/nixos-rebuild.sh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/installer/nixos-rebuild.sh b/installer/nixos-rebuild.sh
index fbbd3e691f7..4330295bc4e 100644
--- a/installer/nixos-rebuild.sh
+++ b/installer/nixos-rebuild.sh
@@ -33,7 +33,8 @@ if test -z "$NIXOS_CONFIG"; then NIXOS_CONFIG=/etc/nixos/configuration.nix; fi
 if test -z "$NIXOS_NO_PULL"; then
     manifests=$(nix-instantiate --eval-only --xml --strict $NIXOS -A manifests \
         | grep '<string'  | sed 's^.*"\(.*\)".*^\1^g')
-    
+
+    mkdir -p /nix/var/nix/channel-cache
     for i in $manifests; do
         NIX_DOWNLOAD_CACHE=/nix/var/nix/channel-cache nix-pull $i || true
     done
-- 
GitLab


From d987b16112651e65baa2dbf9b5597b6cf9fe8a55 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 4 Dec 2007 14:53:37 +0000
Subject: [PATCH 0671/5331] * More declarative specification of the DHCPD
 config.

svn path=/nixos/trunk/; revision=9856
---
 system/options.nix       | 38 +++++++++++++++++++++++++++++++++++++-
 upstart-jobs/default.nix |  4 +---
 upstart-jobs/dhcpd.nix   | 24 +++++++++++++++++++++---
 3 files changed, 59 insertions(+), 7 deletions(-)

diff --git a/system/options.nix b/system/options.nix
index dae2763943d..e06b4c2197b 100644
--- a/system/options.nix
+++ b/system/options.nix
@@ -543,9 +543,31 @@
         ";
       };
 
+      extraConfig = mkOption {
+        default = "";
+        example = "
+          option subnet-mask 255.255.255.0;
+          option broadcast-address 192.168.1.255;
+          option routers 192.168.1.5;
+          option domain-name-servers 130.161.158.4, 130.161.33.17, 130.161.180.1;
+          option domain-name \"example.org\";
+          subnet 192.168.1.0 netmask 255.255.255.0 {
+            range 192.168.1.100 192.168.1.200;
+          }
+        ";
+        description = "
+          Extra text to be appended to the DHCP server configuration
+          file.  Currently, you almost certainly need to specify
+          something here, such as the options specifying the subnet
+          mask, DNS servers, etc.
+        ";
+      };
+
       configFile = mkOption {
+        default = null;
         description = "
-          The path of the DHCP server configuration file.
+          The path of the DHCP server configuration file.  If no file
+          is specified, a file is generated using the other options.
         ";
       };
 
@@ -556,6 +578,20 @@
         ";
       };
 
+      machines = mkOption {
+        default = [];
+        example = [
+          { hostName = "foo";
+            ethernetAddress = "00:16:76:9a:32:1d";
+            ipAddress = "192.168.1.10";
+          }
+          { hostName = "bar";
+            ethernetAddress = "00:19:d1:1d:c4:9a";
+            ipAddress = "192.168.1.11";
+          }
+        ];
+      };
+
     };
 
 
diff --git a/upstart-jobs/default.nix b/upstart-jobs/default.nix
index 993fb12528a..d0677b66e0c 100644
--- a/upstart-jobs/default.nix
+++ b/upstart-jobs/default.nix
@@ -121,9 +121,7 @@ let
   # DHCP server.
   ++ optional config.services.dhcpd.enable
     (import ../upstart-jobs/dhcpd.nix {
-      inherit (pkgs) dhcp;
-      configFile = config.services.dhcpd.configFile;
-      interfaces = config.services.dhcpd.interfaces;
+      inherit pkgs config;
     })
 
   # SSH daemon.
diff --git a/upstart-jobs/dhcpd.nix b/upstart-jobs/dhcpd.nix
index 5025f18e978..95040b3a3d4 100644
--- a/upstart-jobs/dhcpd.nix
+++ b/upstart-jobs/dhcpd.nix
@@ -1,9 +1,27 @@
-{dhcp, configFile, interfaces}:
+{pkgs, config}:
 
 let
 
+  cfg = config.services.dhcpd;
+
   stateDir = "/var/lib/dhcp"; # Don't use /var/state/dhcp; not FHS-compliant.
 
+  machines = pkgs.lib.concatStrings (map (machine: "
+    host ${machine.hostName} {
+      hardware ethernet ${machine.ethernetAddress};
+      fixed-address ${machine.ipAddress};
+    }
+  ") cfg.machines);
+
+  configFile = if cfg.configFile != null then cfg.configFile else pkgs.writeText "dhcpd.conf" "
+    default-lease-time 600;
+    max-lease-time 7200;
+    authoritative;
+    ddns-update-style ad-hoc;
+    ${cfg.extraConfig}
+    ${machines}
+  ";
+
 in
   
 {
@@ -21,9 +39,9 @@ script
 
     touch ${stateDir}/dhcpd.leases
 
-    exec ${dhcp}/sbin/dhcpd -f -cf ${configFile} \\
+    exec ${pkgs.dhcp}/sbin/dhcpd -f -cf ${configFile} \\
         -lf ${stateDir}/dhcpd.leases \\
-        ${toString interfaces}
+        ${toString cfg.interfaces}
 
 end script
   ";
-- 
GitLab


From becb4b69c13946bec535b8e0a0c64e9b661c699f Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 4 Dec 2007 15:02:48 +0000
Subject: [PATCH 0672/5331] Allow the hostname to be empty (to obtain it using
 dhcp).

svn path=/nixos/trunk/; revision=9857
---
 system/activate-configuration.sh | 14 ++++++++++++--
 system/options.nix               |  5 ++++-
 2 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/system/activate-configuration.sh b/system/activate-configuration.sh
index 962be60b2a3..2ed025e1803 100644
--- a/system/activate-configuration.sh
+++ b/system/activate-configuration.sh
@@ -119,6 +119,7 @@ mkdir -m 1777 -p /nix/var/nix/gcroots/per-user
 mkdir -m 0755 -p /nix/var/nix/temproots
 mkdir -m 0755 -p /nix/var/nix/profiles
 mkdir -m 1777 -p /nix/var/nix/profiles/per-user
+mkdir -m 0755 -p /nix/var/nix/channel-cache
 
 ln -sf /nix/var/nix/profiles /nix/var/nix/gcroots/
 ln -sf /nix/var/nix/manifests /nix/var/nix/gcroots/
@@ -138,8 +139,17 @@ for i in @setuidPrograms@; do
 done
 
 
-# Set the host name.
-hostname @hostName@
+# Set the host name.  Don't clear it if it's not configured in the
+# NixOS configuration, since it may have been set by dhclient in the
+# meantime.
+if test -n "@hostName@"; then
+    hostname @hostName@
+else
+    # dhclient won't do anything if the hostname isn't empty.
+    if test "$(hostname)" = "(none)"; then
+	hostname ''
+    fi
+fi
 
 
 # Make this configuration the current configuration.
diff --git a/system/options.nix b/system/options.nix
index e06b4c2197b..974034648f9 100644
--- a/system/options.nix
+++ b/system/options.nix
@@ -216,7 +216,10 @@
 
     hostName = mkOption {
       default = "nixos";
-      description = "The name of the machine.";
+      description = "
+        The name of the machine.  Leave it empty if you want to obtain
+        it from a DHCP server (if using DHCP).
+      ";
     };
 
     extraHosts = mkOption {
-- 
GitLab


From 3ba09e40043bdb28294f8fa367ad70c9e9be341b Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Thu, 6 Dec 2007 03:50:15 +0000
Subject: [PATCH 0673/5331] Changed Postgresql upstart job not to stop on
 network down

svn path=/nixos/trunk/; revision=9867
---
 upstart-jobs/postgresql.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/upstart-jobs/postgresql.nix b/upstart-jobs/postgresql.nix
index 9b74c76befc..48076ae0fe3 100644
--- a/upstart-jobs/postgresql.nix
+++ b/upstart-jobs/postgresql.nix
@@ -23,7 +23,7 @@ in
 description \"PostgreSQL server\"
 
 start on ${startDependency}/started
-stop on ${startDependency}/stop
+stop on shutdown
 
 respawn ${postgresqlService}/bin/control start
 	";
-- 
GitLab


From 6f5da7233798dcd46f4f83acbd86d01e72c2c639 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 12 Dec 2007 13:58:15 +0000
Subject: [PATCH 0674/5331] * Start of a nicer Apache configuration than the
 old stuff in the   services tree.  This one does the generation of httpd.conf
 in   the Nix expression language instead of in a builder.

svn path=/nixos/trunk/; revision=9926
---
 system/options.nix                    |   7 +
 upstart-jobs/apache-httpd/default.nix | 200 ++++++++++++++++++++++++++
 2 files changed, 207 insertions(+)
 create mode 100644 upstart-jobs/apache-httpd/default.nix

diff --git a/system/options.nix b/system/options.nix
index 974034648f9..30475fd6bcb 100644
--- a/system/options.nix
+++ b/system/options.nix
@@ -899,6 +899,13 @@
         ";
       };
 
+      enableSSL = mkOption {
+        default = false;
+        description = "
+          Whether to enable SSL (https) support.
+        ";
+      };
+
       adminAddr = mkOption {
         example = "admin@example.org";
         description = "
diff --git a/upstart-jobs/apache-httpd/default.nix b/upstart-jobs/apache-httpd/default.nix
new file mode 100644
index 00000000000..feec4f7f000
--- /dev/null
+++ b/upstart-jobs/apache-httpd/default.nix
@@ -0,0 +1,200 @@
+{config, pkgs}:
+
+let
+
+  cfg = config.services.httpd;
+  
+  startingDependency = if config.services.gw6c.enable then "gw6c" else "network-interfaces";
+
+  httpd = pkgs.apacheHttpd;
+
+
+  documentRoot = "/etc";
+
+
+  # Names of modules from ${httpd}/modules that we want to load.
+  apacheModules = 
+    [ # HTTP authentication mechanisms: basic and digest.
+      "auth_basic" "auth_digest"
+
+      # Authentication: is the user who he claims to be?
+      "authn_file" "authn_dbm" "authn_anon" "authn_alias"
+
+      # Authorization: is the user allowed access?
+      "authz_user" "authz_groupfile" "authz_host"
+
+      # Other modules.
+      "ext_filter" "include" "log_config" "env" "mime_magic"
+      "cern_meta" "expires" "headers" "usertrack" "unique_id" "setenvif"
+      "mime" "dav" "status" "autoindex" "asis" "info" "cgi" "dav_fs"
+      "vhost_alias" "negotiation" "dir" "imagemap" "actions" "speling"
+      "userdir" "alias" "rewrite"
+    ] ++ pkgs.lib.optional cfg.enableSSL "ssl_module";
+    
+
+  loggingConf = ''
+    ErrorLog ${cfg.logDir}/error_log
+
+    LogLevel notice
+
+    LogFormat "%h %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\"" combined
+    LogFormat "%h %l %u %t \"%r\" %>s %b" common
+    LogFormat "%{Referer}i -> %U" referer
+    LogFormat "%{User-agent}i" agent
+
+    CustomLog ${cfg.logDir}/access_log common
+  '';
+
+
+  browserHacks = ''
+    BrowserMatch "Mozilla/2" nokeepalive
+    BrowserMatch "MSIE 4\.0b2;" nokeepalive downgrade-1.0 force-response-1.0
+    BrowserMatch "RealPlayer 4\.0" force-response-1.0
+    BrowserMatch "Java/1\.0" force-response-1.0
+    BrowserMatch "JDK/1\.0" force-response-1.0
+    BrowserMatch "Microsoft Data Access Internet Publishing Provider" redirect-carefully
+    BrowserMatch "^WebDrive" redirect-carefully
+    BrowserMatch "^WebDAVFS/1.[012]" redirect-carefully
+    BrowserMatch "^gnome-vfs" redirect-carefully
+  '';
+
+
+  sslConf = ''
+    Listen ${toString cfg.httpsPort}
+
+    SSLSessionCache dbm:${cfg.stateDir}/ssl_scache
+
+    SSLMutex  file:${cfg.stateDir}/ssl_mutex
+
+    SSLRandomSeed startup builtin
+    SSLRandomSeed connect builtin
+
+    <VirtualHost _default_:${toString cfg.httpsPort}>
+
+        SSLEngine on
+
+        SSLCipherSuite ALL:!ADH:!EXPORT56:RC4+RSA:+HIGH:+MEDIUM:+LOW:+SSLv2:+EXP:+eNULL
+
+        SSLCertificateFile @sslServerCert@
+        SSLCertificateKeyFile @sslServerKey@
+
+        #   MSIE compatability.
+        SetEnvIf User-Agent ".*MSIE.*" \
+                 nokeepalive ssl-unclean-shutdown \
+                 downgrade-1.0 force-response-1.0
+
+    </VirtualHost>
+  '';
+
+
+  mimeConf = ''
+    TypesConfig ${httpd}/conf/mime.types
+
+    AddType application/x-x509-ca-cert .crt
+    AddType application/x-pkcs7-crl    .crl
+
+    <IfModule mod_mime_magic.c>
+        MIMEMagicFile ${httpd}/conf/magic
+    </IfModule>
+
+    AddEncoding x-compress Z
+    AddEncoding x-gzip gz tgz
+  '';
+
+
+  documentRootConf = ''
+    DocumentRoot "${documentRoot}"
+
+    <Directory "${documentRoot}">
+        Options Indexes FollowSymLinks
+        AllowOverride None
+        Order allow,deny
+        Allow from all
+    </Directory>
+  '';
+
+  
+  httpdConf = pkgs.writeText "httpd.conf" ''
+  
+    ServerRoot ${httpd}
+
+    ServerAdmin ${cfg.adminAddr}
+
+    ServerName ${cfg.hostName}:${toString cfg.httpPort}
+
+    PidFile ${cfg.stateDir}/httpd.pid
+
+    <IfModule prefork.c>
+        MaxClients           150
+        MaxRequestsPerChild  0
+    </IfModule>
+
+    Listen ${toString cfg.httpPort}
+
+    User ${cfg.user}
+    Group ${cfg.group}
+
+    ${let f = name: "LoadModule ${name}_module ${httpd}/modules/mod_${name}.so\n";
+      in pkgs.lib.concatStrings (map f apacheModules)
+    }
+
+    # !!! is this a good idea?
+    UseCanonicalName Off
+
+    ServerSignature On
+
+    ${if cfg.noUserDir then "" else "UserDir public_html"}
+
+    AddHandler type-map var
+
+    <Files ~ "^\.ht">
+        Order allow,deny
+        Deny from all
+    </Files>
+
+    ${mimeConf}
+    ${loggingConf}
+    ${browserHacks}
+
+    Include ${httpd}/conf/extra/httpd-autoindex.conf
+    Include ${httpd}/conf/extra/httpd-multilang-errordoc.conf
+    Include ${httpd}/conf/extra/httpd-languages.conf
+    
+    ${if cfg.enableSSL then sslConf else ""}
+
+    <Directory />
+        Options FollowSymLinks
+        AllowOverride None
+    </Directory>
+
+    ${documentRootConf}
+  '';
+
+    
+in
+
+{
+
+  name = "httpd";
+  
+  users = [
+    { name = cfg.user;
+      description = "Apache httpd user";
+    }
+  ];
+
+  groups = [
+    { name = cfg.group;
+    }
+  ];
+
+  job = ''
+    description "Apache HTTPD"
+
+    start on ${startingDependency}/started
+    stop on ${startingDependency}/stop
+
+    respawn ${httpd}/bin/httpd -f ${httpdConf} -DNO_DETACH
+  '';
+
+}
-- 
GitLab


From 4ef15fc0950aab587158766f7828591c4e7f15f8 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 12 Dec 2007 15:30:17 +0000
Subject: [PATCH 0675/5331] * Statically check whether the generated httpd.conf
 is correct. * Option `noUserDir' -> `enableUserDir', negatives are bad :-)

svn path=/nixos/trunk/; revision=9927
---
 system/options.nix                    | 28 +++++++++++++++--
 upstart-jobs/apache-httpd/default.nix | 44 ++++++++++++++++++++++-----
 upstart-jobs/httpd.nix                |  4 +--
 3 files changed, 64 insertions(+), 12 deletions(-)

diff --git a/system/options.nix b/system/options.nix
index 30475fd6bcb..75459045c48 100644
--- a/system/options.nix
+++ b/system/options.nix
@@ -929,10 +929,32 @@
         ";
       };
 
-      noUserDir = mkOption {
-        default = true;
+      enableUserDir = mkOption {
+        default = false;
+        description = "
+          Whether to enable serving <filename>~/public_html</filename> as
+          <literal>/~<replaceable>username</replaceable></literal>.
+        ";
+      };
+
+      documentRoot = mkOption {
+        default = null;
+        example = "/data/webserver/docs";
+        description = "
+          The path of Apache's document root directory.  If left undefined,
+          an empty directory in the Nix store will be used as root.
+        ";
+      };
+
+      servedDirs = mkOption {
+        default = [];
+        example = [
+          { urlPath = "/nix";
+            dir = "/home/eelco/Dev/nix-homepage";
+          }
+        ];
         description = "
-          Set to false to let users to publish ~/public_html as /~user.
+          This option provides a simple way to serve static directories.
         ";
       };
 
diff --git a/upstart-jobs/apache-httpd/default.nix b/upstart-jobs/apache-httpd/default.nix
index feec4f7f000..2dc6f11b651 100644
--- a/upstart-jobs/apache-httpd/default.nix
+++ b/upstart-jobs/apache-httpd/default.nix
@@ -9,7 +9,8 @@ let
   httpd = pkgs.apacheHttpd;
 
 
-  documentRoot = "/etc";
+  documentRoot = if cfg.documentRoot != null then cfg.documentRoot else
+    pkgs.runCommand "empty" {} "ensureDir $out";
 
 
   # Names of modules from ${httpd}/modules that we want to load.
@@ -138,12 +139,24 @@ let
       in pkgs.lib.concatStrings (map f apacheModules)
     }
 
-    # !!! is this a good idea?
-    UseCanonicalName Off
-
-    ServerSignature On
-
-    ${if cfg.noUserDir then "" else "UserDir public_html"}
+    ${if cfg.enableUserDir then ''
+    
+      UserDir public_html
+      
+      <Directory "/home/*/public_html">
+          AllowOverride FileInfo AuthConfig Limit Indexes
+          Options MultiViews Indexes SymLinksIfOwnerMatch IncludesNoExec
+          <Limit GET POST OPTIONS>
+              Order allow,deny
+              Allow from all
+          </Limit>
+          <LimitExcept GET POST OPTIONS>
+              Order deny,allow
+              Deny from all
+          </LimitExcept>
+      </Directory>
+      
+    '' else ""}
 
     AddHandler type-map var
 
@@ -156,6 +169,7 @@ let
     ${loggingConf}
     ${browserHacks}
 
+    Include ${httpd}/conf/extra/httpd-default.conf
     Include ${httpd}/conf/extra/httpd-autoindex.conf
     Include ${httpd}/conf/extra/httpd-multilang-errordoc.conf
     Include ${httpd}/conf/extra/httpd-languages.conf
@@ -168,6 +182,18 @@ let
     </Directory>
 
     ${documentRootConf}
+
+    ${
+      let makeDirConf = elem: ''
+            Alias ${elem.urlPath} ${elem.dir}/
+            <Directory ${elem.dir}>
+                Order allow,deny
+                Allow from all
+                AllowOverride None
+            </Directory>
+          '';
+      in pkgs.lib.concatStrings (map makeDirConf cfg.servedDirs)
+    }
   '';
 
     
@@ -188,6 +214,10 @@ in
     }
   ];
 
+  # Statically verify the syntactic correctness of the generated
+  # httpd.conf.
+  buildHook = "${httpd}/bin/httpd -f ${httpdConf} -t";
+
   job = ''
     description "Apache HTTPD"
 
diff --git a/upstart-jobs/httpd.nix b/upstart-jobs/httpd.nix
index a8f00552fc8..20d0f834fac 100644
--- a/upstart-jobs/httpd.nix
+++ b/upstart-jobs/httpd.nix
@@ -17,7 +17,6 @@ let
   logDir = cfg.logDir;
   stateDir = cfg.stateDir;
   enableSSL = false;
-  noUserDir = cfg.noUserDir;
   extraDirectories = cfg.extraDirectories + extraConfig;
 
   startingDependency = if config.services.gw6c.enable then "gw6c" else "network-interfaces";
@@ -29,7 +28,8 @@ let
 
     inherit hostName httpPort httpsPort
       user group adminAddr logDir stateDir
-      noUserDir extraDirectories;
+      extraDirectories;
+    noUserDir = !cfg.enableUserDir;
     
     subServices =
     
-- 
GitLab


From 189a608cf5056df9228a7a7b4557eb5d4718e1ff Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Sun, 16 Dec 2007 18:56:36 +0000
Subject: [PATCH 0676/5331] Now copyKernels allows both /nix/store and /boot be
 on separate partitions (you need to specify where /boot is for this).

svn path=/nixos/trunk/; revision=9949
---
 installer/grub-menu-builder.sh |  5 +++++
 system/options.nix             | 11 +++++++++++
 system/system.nix              |  1 +
 3 files changed, 17 insertions(+)

diff --git a/installer/grub-menu-builder.sh b/installer/grub-menu-builder.sh
index 7e1e6b4cad1..be4e5d26a5e 100644
--- a/installer/grub-menu-builder.sh
+++ b/installer/grub-menu-builder.sh
@@ -45,6 +45,11 @@ addEntry() {
             cp $initrd $initrd2
         fi
         initrd=$initrd2
+
+        if test -n "@bootMount@"; then
+          kernel=$(echo $kernel2 | sed -e 's^/boot^@bootMount@^')
+          initrd=$(echo $initrd2 | sed -e 's^/boot^@bootMount@^')
+        fi
     fi
     
     local confName=$(if test -e $path/configuration-name; then 
diff --git a/system/options.nix b/system/options.nix
index 75459045c48..fc0484bd239 100644
--- a/system/options.nix
+++ b/system/options.nix
@@ -53,6 +53,17 @@
       ";
     };
 
+    bootMount = mkOption {
+      default = "";
+      example = "(hd0,0)";
+      description = "
+        If the system partition may be wiped on reinstall, it is better
+        to have /boot on a small partition. To do it, we need to explain
+        to GRUB where the kernels live. Specify the partition here (in 
+        GRUB notation.
+      ";
+    };
+
     kernel = mkOption {
       default = pkgs: pkgs.kernel;
       description = "
diff --git a/system/system.nix b/system/system.nix
index 311ddaf0a1e..922e14476d5 100644
--- a/system/system.nix
+++ b/system/system.nix
@@ -322,6 +322,7 @@ rec {
     path = [pkgs.coreutils pkgs.gnused pkgs.gnugrep];
     copyKernels = config.boot.copyKernels;
     extraGrubEntries = config.boot.extraGrubEntries;
+    bootMount = config.boot.bootMount;
   };
 
 
-- 
GitLab


From 4892139b387afda068462fe50ccbd90439124165 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Tue, 18 Dec 2007 22:43:17 +0000
Subject: [PATCH 0677/5331] Added ATI card support to xserver.conf

svn path=/nixos/trunk/; revision=9951
---
 upstart-jobs/xserver.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/upstart-jobs/xserver.nix b/upstart-jobs/xserver.nix
index cb9c08f542d..42d8280e067 100644
--- a/upstart-jobs/xserver.nix
+++ b/upstart-jobs/xserver.nix
@@ -63,6 +63,7 @@ let
     ++ optional (videoDriver == "i810") xorg.xf86videoi810
     ++ optional (videoDriver == "intel") xorg.xf86videointel
     ++ optional (videoDriver == "nv") xorg.xf86videonv
+    ++ optional (videoDriver == "ati") xorg.xf86videoati
     ++ (optional (cfg.isSynaptics) [(synaptics+"/"+xorg.xorgserver) /*xorg.xf86inputevdev*/]);
     
   configFile = stdenv.mkDerivation {
-- 
GitLab


From 6733486ec8e33bf923b95e2ca5dfe4c7b2ea8777 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Thu, 20 Dec 2007 04:36:30 +0000
Subject: [PATCH 0678/5331] Corrected fontDir builder; beginning of changes to
 allow configuration having multiple variaions in GRUB menu/

svn path=/nixos/trunk/; revision=9957
---
 installer/grub-menu-builder.sh | 2 ++
 system/system.nix              | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/installer/grub-menu-builder.sh b/installer/grub-menu-builder.sh
index be4e5d26a5e..6fe5c8dd149 100644
--- a/installer/grub-menu-builder.sh
+++ b/installer/grub-menu-builder.sh
@@ -89,6 +89,8 @@ EOF
 # Add all generations of the system profile to the menu, in reverse
 # (most recent to least recent) order.
 for generation in $(
+	(cd $default/fine-tune && ls -d *) \
+    | sort -n) $(
     (cd /nix/var/nix/profiles && ls -d system-*-link) \
     | sed 's/system-\([0-9]\+\)-link/\1/' \
     | sort -n -r); do
diff --git a/system/system.nix b/system/system.nix
index 922e14476d5..6388906f705 100644
--- a/system/system.nix
+++ b/system/system.nix
@@ -178,7 +178,7 @@ rec {
 
   # Font aggregation
   fontDir = import ./fontdir.nix {
-    inherit (pkgs) stdenv;
+    stdenv = pkgs.stdenvUsingSetupNew2;
     inherit pkgs config;
     inherit (pkgs.xorg) mkfontdir mkfontscale fontalias;
   };
-- 
GitLab


From f81bebe2d7471031688a2e65701648df2ea191cf Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Thu, 20 Dec 2007 11:36:30 +0000
Subject: [PATCH 0679/5331] Added possibility of building multiple
 configurations by one nixos-rebuild.

svn path=/nixos/trunk/; revision=9959
---
 installer/grub-menu-builder.sh |  8 ++++++--
 system/options.nix             | 10 +++++++++-
 system/system.nix              |  3 +++
 system/system.sh               |  7 +++++++
 4 files changed, 25 insertions(+), 3 deletions(-)

diff --git a/installer/grub-menu-builder.sh b/installer/grub-menu-builder.sh
index 6fe5c8dd149..9c76fbb6f6f 100644
--- a/installer/grub-menu-builder.sh
+++ b/installer/grub-menu-builder.sh
@@ -88,9 +88,13 @@ EOF
 
 # Add all generations of the system profile to the menu, in reverse
 # (most recent to least recent) order.
+for link in $(
+	(ls -d $default/fine-tune/* ) \
+	| sort -n); do
+    date=$(stat --printf="%y\n" $link | sed 's/\..*//')
+    addEntry "NixOS - variation" $link ""
+done
 for generation in $(
-	(cd $default/fine-tune && ls -d *) \
-    | sort -n) $(
     (cd /nix/var/nix/profiles && ls -d system-*-link) \
     | sed 's/system-\([0-9]\+\)-link/\1/' \
     | sort -n -r); do
diff --git a/system/options.nix b/system/options.nix
index fc0484bd239..5ade1e81805 100644
--- a/system/options.nix
+++ b/system/options.nix
@@ -1736,6 +1736,14 @@ root        ALL=(ALL) SETENV: ALL
     };
 
   };
-
+  
+  nesting = {
+	  children = mkOption {
+	      default = [];
+	      description = "
+		Additional configurations to build.
+	      ";
+	  };
+  };
 
 }
diff --git a/system/system.nix b/system/system.nix
index 6388906f705..b1657f74138 100644
--- a/system/system.nix
+++ b/system/system.nix
@@ -356,6 +356,9 @@ rec {
       pkgs.diffutils
       pkgs.upstart # for initctl
     ];
+    children = map (x: ((import ./system.nix) 
+      {inherit platform stage2Init; configuration = x;}).system) 
+      config.nesting.children; 
     configurationName = config.boot.configurationName;
   }) (pkgs.getConfig ["checkConfigurationOptions"] false) 
 	optionDeclarations configuration ;
diff --git a/system/system.sh b/system/system.sh
index 080ad1c13c7..95f650f39aa 100644
--- a/system/system.sh
+++ b/system/system.sh
@@ -14,6 +14,13 @@ ln -s $upstart $out/upstart
 echo "$kernelParams" > $out/kernel-params
 echo "$configurationName" > $out/configuration-name
 
+mkdir $out/fine-tune
+ChildCount=0;
+for i in $children; do 
+	ChildCount=$(( ChildCount + 1 ));
+	ln -s $i $out/fine-tune/child-$ChildCount;
+done
+
 cat > $out/menu.lst << GRUBEND
 kernel $kernel init=$bootStage2 $kernelParams
 initrd $initrd
-- 
GitLab


From ba09f592c8ee7dc388eb63223bbbd7002eb803bc Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Thu, 20 Dec 2007 21:33:45 +0000
Subject: [PATCH 0680/5331] Added TuxOnIce support to initscripts

svn path=/nixos/trunk/; revision=9960
---
 boot/boot-stage-1-init.sh | 5 ++++-
 boot/boot-stage-2-init.sh | 1 +
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/boot/boot-stage-1-init.sh b/boot/boot-stage-1-init.sh
index 79c1c3ff418..b7b558971a6 100644
--- a/boot/boot-stage-1-init.sh
+++ b/boot/boot-stage-1-init.sh
@@ -32,7 +32,6 @@ mount -t proc none /proc
 mkdir -p /sys
 mount -t sysfs none /sys
 
-
 # Process the kernel command line.
 stage2Init=@stage2Init@
 for o in $(cat /proc/cmdline); do
@@ -64,6 +63,10 @@ for i in @modules@; do
     modprobe $i
 done
 
+# Try to resume - all modules are loaded now
+echo 0 > /sys/power/tuxonice/user_interface/enabled
+echo 1 > /sys/power/tuxonice/do_resume || echo Failed to resume..;
+
 
 # Create device nodes in /dev.
 mknod -m 0666 /dev/null c 1 3
diff --git a/boot/boot-stage-2-init.sh b/boot/boot-stage-2-init.sh
index 2e19f23cb85..a76873fc52c 100644
--- a/boot/boot-stage-2-init.sh
+++ b/boot/boot-stage-2-init.sh
@@ -114,6 +114,7 @@ export MODULE_DIR=@kernel@/lib/modules/
 # Run any user-specified commands.
 @shell@ @bootLocal@
 
+mkswap $(cat /sys/power/tuxonice/resume) || echo 'Failed to clear saved image.'
 
 # Start Upstart's init.  We start it through the
 # /var/run/current-system symlink indirection so that we can upgrade
-- 
GitLab


From b3fa4f1e4e1f168dc1fa84a98c47c22892881b0d Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Tue, 25 Dec 2007 12:16:38 +0000
Subject: [PATCH 0681/5331] Added some xfs and general font changes.

svn path=/nixos/trunk/; revision=9966
---
 system/fontdir.nix                    | 3 ++-
 system/options.nix                    | 8 ++++++++
 upstart-jobs/apache-httpd/default.nix | 2 +-
 upstart-jobs/xfs.nix                  | 2 +-
 upstart-jobs/xserver.conf             | 1 +
 upstart-jobs/xserver.nix              | 3 +++
 6 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/system/fontdir.nix b/system/fontdir.nix
index 846bfd5388d..ee5f965034d 100644
--- a/system/fontdir.nix
+++ b/system/fontdir.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation
 			fontDirs=\"\$fontDirs \$(dirname \$i)\";
 		done;
 		mkdir -p \$out/share/X11-fonts/; 
-		for i in \$(find \$fontDirs -type f); do
+		for i in \$(find \$fontDirs -type f -o -type l); do
 			j=\${i##*/}
 			if ! test -e \$out/share/X11-fonts/\${j}; then
 				ln -s \$i \$out/share/X11-fonts/\${j};
@@ -29,6 +29,7 @@ stdenv.mkDerivation
 		cd \$out/share/X11-fonts/
 		rm fonts.dir
 		rm fonts.scale
+		rm fonts.alias
 		mkfontdir
 		mkfontscale
 		cat \$( find \$fontalias/ -name fonts.alias) >fonts.alias
diff --git a/system/options.nix b/system/options.nix
index 5ade1e81805..3b5353d0807 100644
--- a/system/options.nix
+++ b/system/options.nix
@@ -860,6 +860,14 @@
           Default colour depth.
         ";
       };
+      
+      useXFS = mkOption {
+        default = false;
+	example = "unix/:7100";
+	description = "
+	  Way to access the X Font Server to use.
+	";
+      };
 
     };
 
diff --git a/upstart-jobs/apache-httpd/default.nix b/upstart-jobs/apache-httpd/default.nix
index 2dc6f11b651..937f7ce1817 100644
--- a/upstart-jobs/apache-httpd/default.nix
+++ b/upstart-jobs/apache-httpd/default.nix
@@ -222,7 +222,7 @@ in
     description "Apache HTTPD"
 
     start on ${startingDependency}/started
-    stop on ${startingDependency}/stop
+    stop on shutdown
 
     respawn ${httpd}/bin/httpd -f ${httpdConf} -DNO_DETACH
   '';
diff --git a/upstart-jobs/xfs.nix b/upstart-jobs/xfs.nix
index 59468c30f4d..20975622ccc 100644
--- a/upstart-jobs/xfs.nix
+++ b/upstart-jobs/xfs.nix
@@ -12,7 +12,7 @@ rec {
 	job = "
 		description = \"X Font Server\"
 		start on ${startingDependency}/started
-		stop on ${startingDependency}/stop
+		stop on shutdown
 
 		respawn ${pkgs.xorg.xfs}/bin/xfs -config ${configFile}
 	";
diff --git a/upstart-jobs/xserver.conf b/upstart-jobs/xserver.conf
index 80d265ff5b4..14fe98b13a0 100644
--- a/upstart-jobs/xserver.conf
+++ b/upstart-jobs/xserver.conf
@@ -1,5 +1,6 @@
 Section "Files"
   # Font directories.
+  @xfs@
   @fontPaths@
 
   # Module (driver) directories.
diff --git a/upstart-jobs/xserver.nix b/upstart-jobs/xserver.nix
index 42d8280e067..06bf572df99 100644
--- a/upstart-jobs/xserver.nix
+++ b/upstart-jobs/xserver.nix
@@ -116,6 +116,9 @@ let
     serverLayoutOptions = cfg.serverLayoutOptions; 
     defaultDepth = cfg.defaultDepth; 
 
+    xfs = (if cfg.useXFS == false then "" else 
+      "FontPath \"${toString cfg.useXFS}\"");
+
     buildCommand = "
       buildCommand= # urgh, don't substitute this
 
-- 
GitLab


From d4168a89b1a1c8cc1a9a179e70136089230a5657 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 25 Dec 2007 16:07:55 +0000
Subject: [PATCH 0682/5331] * Get rid of some spurious error messages.

svn path=/nixos/trunk/; revision=9968
---
 boot/boot-stage-1-init.sh      | 7 +++++--
 boot/boot-stage-2-init.sh      | 5 ++++-
 installer/grub-menu-builder.sh | 6 +++---
 3 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/boot/boot-stage-1-init.sh b/boot/boot-stage-1-init.sh
index b7b558971a6..e4975981413 100644
--- a/boot/boot-stage-1-init.sh
+++ b/boot/boot-stage-1-init.sh
@@ -63,9 +63,12 @@ for i in @modules@; do
     modprobe $i
 done
 
+
 # Try to resume - all modules are loaded now
-echo 0 > /sys/power/tuxonice/user_interface/enabled
-echo 1 > /sys/power/tuxonice/do_resume || echo Failed to resume..;
+if test -n "$(cat /sys/power/tuxonice/resume)"; then
+    echo 0 > /sys/power/tuxonice/user_interface/enabled
+    echo 1 > /sys/power/tuxonice/do_resume || echo "Failed to resume..."
+fi
 
 
 # Create device nodes in /dev.
diff --git a/boot/boot-stage-2-init.sh b/boot/boot-stage-2-init.sh
index a76873fc52c..f6b74543d8f 100644
--- a/boot/boot-stage-2-init.sh
+++ b/boot/boot-stage-2-init.sh
@@ -114,7 +114,10 @@ export MODULE_DIR=@kernel@/lib/modules/
 # Run any user-specified commands.
 @shell@ @bootLocal@
 
-mkswap $(cat /sys/power/tuxonice/resume) || echo 'Failed to clear saved image.'
+resumeDevice="$(cat /sys/power/tuxonice/resume)"
+if test -n "$resumeDevice"; then
+    mkswap "$resumeDevice" || echo 'Failed to clear saved image.'
+fi
 
 # Start Upstart's init.  We start it through the
 # /var/run/current-system symlink indirection so that we can upgrade
diff --git a/installer/grub-menu-builder.sh b/installer/grub-menu-builder.sh
index 9c76fbb6f6f..ddcec0e93d5 100644
--- a/installer/grub-menu-builder.sh
+++ b/installer/grub-menu-builder.sh
@@ -1,5 +1,7 @@
 #! @bash@/bin/sh -e
 
+shopt -s nullglob
+
 export PATH=/empty
 for i in @path@; do PATH=$PATH:$i/bin; done
 
@@ -88,9 +90,7 @@ EOF
 
 # Add all generations of the system profile to the menu, in reverse
 # (most recent to least recent) order.
-for link in $(
-	(ls -d $default/fine-tune/* ) \
-	| sort -n); do
+for link in $((ls -d $default/fine-tune/* ) | sort -n); do
     date=$(stat --printf="%y\n" $link | sed 's/\..*//')
     addEntry "NixOS - variation" $link ""
 done
-- 
GitLab


From 8ffef5e73af66747f8cb92b0068beac798b0987f Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Sun, 30 Dec 2007 09:38:04 +0000
Subject: [PATCH 0683/5331] Started doing LiveDVD - a complete system on disk,
 capable to install itself without Internet.

svn path=/nixos/trunk/; revision=9970
---
 configuration/live-dvd.nix | 205 +++++++++++++++++++++++++++++++++++++
 1 file changed, 205 insertions(+)
 create mode 100644 configuration/live-dvd.nix

diff --git a/configuration/live-dvd.nix b/configuration/live-dvd.nix
new file mode 100644
index 00000000000..91d366a9cff
--- /dev/null
+++ b/configuration/live-dvd.nix
@@ -0,0 +1,205 @@
+{ platform ? __currentSystem
+}:
+
+rec {
+
+  
+  nixpkgsRel = "nixpkgs";
+
+
+  configuration = {
+  
+    boot = {
+      autoDetectRootDevice = true;
+      readOnlyRoot = true;
+      # The label used to identify the installation CD.
+      rootLabel = "NIXOS";
+    };
+    
+    services = {
+    
+      sshd = {
+        enable = false;
+      };
+      
+      xserver = {
+        enable = false;
+      };
+
+      extraJobs = [
+        # Unpack the NixOS/Nixpkgs sources to /etc/nixos.
+        { name = "unpack-sources";
+          job = "
+            start on startup
+            script
+              export PATH=${pkgs.gnutar}/bin:${pkgs.bzip2}/bin:$PATH
+              mkdir -p /etc/nixos/nixos
+              tar xjf /nixos.tar.bz2 -C /etc/nixos/nixos
+              tar xjf /nixpkgs.tar.bz2 -C /etc/nixos
+              mv /etc/nixos/nixpkgs-* /etc/nixos/nixpkgs
+              ln -sfn ../nixpkgs/pkgs /etc/nixos/nixos/pkgs
+              chown -R root.root /etc/nixos
+            end script
+          ";
+        }
+      
+        # Allow the user to do something useful on tty8 while waiting
+        # for the installation to finish.
+        { name = "rogue";
+          job = "
+            start on udev
+            stop on shutdown
+            respawn ${pkgs.rogue}/bin/rogue < /dev/tty8 > /dev/tty8 2>&1
+          ";
+        }
+      ];
+
+      # And a background to go with that.
+      ttyBackgrounds = {
+        specificThemes = [
+          { tty = 8;
+            theme = pkgs.fetchurl {
+              url = http://www.bootsplash.de/files/themes/Theme-GNU.tar.bz2;
+              md5 = "61969309d23c631e57b0a311102ef034";
+            };
+          }
+        ];
+      };
+      
+    };
+
+    fonts = {
+      enableFontConfig = false;
+    };
+    
+    installer = {
+      nixpkgsURL = file:///root/ ;
+    };
+
+    security = {
+      sudo = {
+        enable = false;
+      };
+    };
+ 
+    environment = {
+      extraPackages = pkgs: [
+        pkgs.vimDiet
+      ];
+    };
+   
+  };
+
+
+  system = import ../system/system.nix {
+    inherit configuration platform;
+    stage2Init = "/init";
+  };
+
+
+  pkgs = system.pkgs;
+  
+
+  # Since the CD is read-only, the mount points must be on disk.
+  cdMountPoints = pkgs.runCommand "mount-points" {} "
+    ensureDir $out
+    cd $out
+    mkdir proc sys tmp etc dev var mnt nix nix/var root bin
+    touch $out/${configuration.boot.rootLabel}
+  ";
+
+
+  # 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.runCommand "tarball" {inherit tarName;} "
+    ensureDir $out
+    (cd ${input} && tar cvfj $out/${tarName} . \\
+      --exclude '*~' \\
+      --exclude 'pkgs' --exclude 'result')
+  ";
+
+  
+  # Put the current directory in a tarball (making sure to filter
+  # out crap like the .svn directories).
+  nixosTarball =
+    let filter = name: type:
+      let base = baseNameOf (toString name);
+      in base != ".svn" && base != "result";
+    in
+      makeTarball "nixos.tar.bz2" (builtins.filterSource filter ./..);
+
+
+  # Get a recent copy of Nixpkgs.
+  nixpkgsTarball = /root/nixpkgs.tar.bz2;
+
+  # The configuration file for isolinux.
+  isolinuxCfg = pkgs.writeText "isolinux.cfg" "
+    default linux
+    prompt 1
+    timeout 60
+    label linux
+      kernel vmlinuz
+      append initrd=initrd ${toString (system.config.boot.kernelParams)}
+  ";
+    
+
+
+  # Create an ISO image containing the isolinux boot loader, the
+  # kernel, the initrd produced above, and the closure of the stage 2
+  # init.
+  rescueCD = import ../helpers/make-iso9660-image.nix {
+    inherit (pkgs) stdenv perl cdrtools;
+    isoName = "nixos-${platform}.iso";
+
+    # Single files to be copied to fixed locations on the CD.
+    contents = [
+      { source = pkgs.syslinux + "/lib/syslinux/isolinux.bin";
+        target = "isolinux/isolinux.bin";
+      }
+      { source = isolinuxCfg;
+        target = "isolinux/isolinux.cfg";
+      }
+      { source = pkgs.kernel + "/vmlinuz";
+        target = "isolinux/vmlinuz";
+      }
+      { source = system.initialRamdisk + "/initrd";
+        target = "isolinux/initrd";
+      }
+      { source = cdMountPoints;
+        target = "/";
+      }
+      { source = nixosTarball + "/" + nixosTarball.tarName;
+        target = "/" + nixosTarball.tarName;
+      }
+      { source = nixpkgsTarball;
+        target = "/nixpkgs.tar.bz2";
+      }
+    ];
+
+    # Closures to be copied to the Nix store on the CD.
+    storeContents = [
+      { object = system.bootStage2;
+        symlink = "/init";
+      }
+      { object = system.system;
+        symlink = "/system";
+      }
+      # To speed up the installation, provide the full stdenv.
+      { object = pkgs.stdenv;
+        symlink = "none";
+      }
+    ];
+    buildStoreContents = [
+      {
+        object = system.system.drvPath;
+	symlink = "none";
+      }
+    ];
+    
+    bootable = true;
+    bootImage = "isolinux/isolinux.bin";
+  };
+
+
+}
-- 
GitLab


From ae6104ae59feaa4924628fb489ba78ed13b7b640 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Mon, 31 Dec 2007 08:52:59 +0000
Subject: [PATCH 0684/5331] Fixed a bit about child configurations, added an
 option to not run X job, but create it, and to export configuration files
 from it.

svn path=/nixos/trunk/; revision=9986
---
 system/options.nix | 19 +++++++++++++++++++
 system/system.nix  |  3 ++-
 2 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/system/options.nix b/system/options.nix
index 3b5353d0807..0e607a5dd74 100644
--- a/system/options.nix
+++ b/system/options.nix
@@ -420,6 +420,9 @@
       specify a volume label (<literal>label</literal>) for file
       systems that support it, such as ext2/ext3 (see <command>mke2fs
       -L</command>).
+
+      <literal>autocreate</literal> forces <literal>mountPoint</literal> to be created with 
+      <command>mkdir -p</command> .
     ";
   };
 
@@ -671,6 +674,22 @@
         ";
       };
 
+      autorun = mkOption {
+        default = true;
+	description = "
+	  Switch to false to create upstart-job and configuration, 
+	  but not run it automatically
+	";
+      };
+
+      exportConfiguration = mkOption {
+        default = false;
+	description = "
+	  Create /etc/X11/xorg.conf and a file with environment
+	  variables
+	";
+      };
+
       tcpEnable = mkOption {
         default = false;
         description = "
diff --git a/system/system.nix b/system/system.nix
index b1657f74138..c0edff9778d 100644
--- a/system/system.nix
+++ b/system/system.nix
@@ -357,7 +357,8 @@ rec {
       pkgs.upstart # for initctl
     ];
     children = map (x: ((import ./system.nix) 
-      {inherit platform stage2Init; configuration = x;}).system) 
+      {inherit platform stage2Init; 
+        configuration = x//{boot=((x.boot)//{grubDevice = "";});};}).system) 
       config.nesting.children; 
     configurationName = config.boot.configurationName;
   }) (pkgs.getConfig ["checkConfigurationOptions"] false) 
-- 
GitLab


From 55b977dcbf97619c2c6e5d68c0c361df1b66091f Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Mon, 31 Dec 2007 08:55:40 +0000
Subject: [PATCH 0685/5331] Changes to xserver to export configuration and to
 allow not to run the job on boot, changes to filesystems job to autocreate
 some mountpoints (/dev/shm..)

svn path=/nixos/trunk/; revision=9987
---
 upstart-jobs/default.nix     |  2 ++
 upstart-jobs/filesystems.nix |  8 +++++++-
 upstart-jobs/xserver.nix     | 17 +++++++++++++++--
 3 files changed, 24 insertions(+), 3 deletions(-)

diff --git a/upstart-jobs/default.nix b/upstart-jobs/default.nix
index d0677b66e0c..7b7c64af36f 100644
--- a/upstart-jobs/default.nix
+++ b/upstart-jobs/default.nix
@@ -154,6 +154,8 @@ let
       libXext = pkgs.xlibs.libXext;
       fontDirectories = import ../system/fonts.nix {inherit pkgs config;};
       isClone = config.services.xserver.isClone;
+      autorun = config.services.xserver.autorun;
+      exportConfiguration = config.services.xserver.exportConfiguration;
     })
 
   # Apache httpd.
diff --git a/upstart-jobs/filesystems.nix b/upstart-jobs/filesystems.nix
index b8d1fd9dab5..ac0abaf3770 100644
--- a/upstart-jobs/filesystems.nix
+++ b/upstart-jobs/filesystems.nix
@@ -7,6 +7,7 @@ let
   devices = map (fs: if fs ? device then fs.device else "LABEL=" + fs.label) fileSystems;
   fsTypes = map (fs: if fs ? fsType then fs.fsType else "auto") fileSystems;
   optionss = map (fs: if fs ? options then fs.options else "defaults") fileSystems;
+  autocreates = map (fs: if fs ? autocreate then fs.autocreate else "0") fileSystems;
 
 in 
 
@@ -25,6 +26,7 @@ script
     devices=(${toString devices})
     fsTypes=(${toString fsTypes})
     optionss=(${toString optionss})
+    autocreates=(${toString autocreates})
 
     newDevices=1
 
@@ -41,12 +43,14 @@ script
             device=\${devices[$n]}
             fsType=\${fsTypes[$n]}
             options=\${optionss[$n]}
+            autocreate=\${autocreates[$n]}
 
             isLabel=
             if echo \"$device\" | grep -q '^LABEL='; then isLabel=1; fi
 
             isPseudo=
-            if test \"$fsType\" = \"nfs\" || test \"$fsType\" = \"ext3cow\"; then isPseudo=1; fi
+            if test \"$fsType\" = \"nfs\" || test \"$fsType\" = \"tmpfs\" ||
+	      test \"$fsType\" = \"ext3cow\"; then isPseudo=1; fi
 
             if ! test -n \"$isLabel\" -o -n \"$isPseudo\" -o -e \"$device\"; then
                 echo \"skipping $device, doesn't exist (yet)\"
@@ -100,6 +104,8 @@ script
                 fsck -a \"$device\" || true
             fi
 
+            if test \"\$autocreate\" = 1; then mkdir -p \"\$mountPoint\"; fi
+
             if ${utillinux}/bin/mount -t \"$fsType\" -o \"$options\" \"$device\" \"$mountPoint\"; then
                 newDevices=1
             fi
diff --git a/upstart-jobs/xserver.nix b/upstart-jobs/xserver.nix
index 06bf572df99..989460a46c6 100644
--- a/upstart-jobs/xserver.nix
+++ b/upstart-jobs/xserver.nix
@@ -19,6 +19,12 @@
 
 , # Is Clone mode on?
   isClone ? "on"
+
+, # Do we want it to run or just to prepare everything?
+  autorun ? true
+
+, # Create unneeded links in /etc? 
+  exportConfiguration ? false
 }:
 
 let
@@ -364,11 +370,18 @@ rec {
     optional (sessionType == "kde")
       { source = "${xkeyboard_config}/etc/X11/xkb";
         target = "X11/xkb";
-      };
+      }
+    ++
+    optional (exportConfiguration) 
+    {
+      source = "${configFile}";
+      target = "X11/xorg.conf";
+    }
+      ;
 
     
   job = "
-    start on network-interfaces
+    start on ${if autorun then "network-interfaces" else "never"}
 
     start script
     
-- 
GitLab


From 05d23c076bb0f28764266b87e9c540d066e34ba5 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Mon, 31 Dec 2007 14:15:34 +0000
Subject: [PATCH 0686/5331] I hope it is the final LiveDVD

svn path=/nixos/trunk/; revision=9988
---
 configuration/live-dvd.nix     | 76 ++++++++++++++++++++++++++++++----
 helpers/make-iso9660-image.nix |  5 +++
 2 files changed, 73 insertions(+), 8 deletions(-)

diff --git a/configuration/live-dvd.nix b/configuration/live-dvd.nix
index 91d366a9cff..03143803e6a 100644
--- a/configuration/live-dvd.nix
+++ b/configuration/live-dvd.nix
@@ -35,10 +35,12 @@ rec {
               export PATH=${pkgs.gnutar}/bin:${pkgs.bzip2}/bin:$PATH
               mkdir -p /etc/nixos/nixos
               tar xjf /nixos.tar.bz2 -C /etc/nixos/nixos
-              tar xjf /nixpkgs.tar.bz2 -C /etc/nixos
-              mv /etc/nixos/nixpkgs-* /etc/nixos/nixpkgs
+              mkdir -p /etc/nixos/nixpkgs
+              tar xjf /nixpkgs.tar.bz2 -C /etc/nixos/nixpkgs
+              mv /etc/nixos/nixpkgs-* /etc/nixos/nixpkgs || test -e /etc/nixos/nixpkgs
               ln -sfn ../nixpkgs/pkgs /etc/nixos/nixos/pkgs
               chown -R root.root /etc/nixos
+	      touch /etc/resolv.conf
             end script
           ";
         }
@@ -69,11 +71,12 @@ rec {
     };
 
     fonts = {
-      enableFontConfig = false;
+      enableFontConfig = true;
     };
     
     installer = {
-      nixpkgsURL = file:///root/ ;
+      manifests = [ file:///mnt/MANIFEST ];
+      nixpkgsURL = file:///mnt/ ;
     };
 
     security = {
@@ -85,6 +88,51 @@ rec {
     environment = {
       extraPackages = pkgs: [
         pkgs.vimDiet
+	pkgs.irssi
+	pkgs.elinks
+	pkgs.ltrace
+	pkgs.subversion
+        pkgs.which
+	pkgs.file
+	pkgs.zip
+	pkgs.unzip
+	pkgs.unrar
+	pkgs.usbutils
+	pkgs.bc
+	pkgs.cpio
+	pkgs.ncat
+	pkgs.patch
+	pkgs.fuse
+	pkgs.indent
+	pkgs.zsh
+	pkgs.hddtemp
+	pkgs.hdparm
+	pkgs.sdparm
+	pkgs.sqlite
+	pkgs.wpa_supplicant
+	pkgs.lynx
+	pkgs.db4
+	pkgs.rogue
+	pkgs.attr
+	pkgs.acl
+	pkgs.automake
+	pkgs.autoconf
+	pkgs.libtool
+	pkgs.gnupg
+	pkgs.openssl
+	pkgs.units
+	pkgs.gnumake
+	pkgs.manpages
+	pkgs.cabextract
+	pkgs.upstartJobControl
+	pkgs.fpc
+	pkgs.python
+	pkgs.perl
+	pkgs.lftp
+	pkgs.wget
+	pkgs.guile
+	pkgs.utillinuxCurses
+	pkgs.emacs
       ];
     };
    
@@ -113,6 +161,12 @@ rec {
   # 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.runCommand "tarball" {inherit tarName;} "
+    ensureDir $out
+    (cd ${input} && tar cvfj $out/${tarName} . \\
+      --exclude '*~' \\
+      --exclude 'result')
+  ";
+  makeTarballNixos = tarName: input: pkgs.runCommand "tarball" {inherit tarName;} "
     ensureDir $out
     (cd ${input} && tar cvfj $out/${tarName} . \\
       --exclude '*~' \\
@@ -125,13 +179,19 @@ rec {
   nixosTarball =
     let filter = name: type:
       let base = baseNameOf (toString name);
-      in base != ".svn" && base != "result";
+      in base != "result";
     in
-      makeTarball "nixos.tar.bz2" (builtins.filterSource filter ./..);
+      makeTarballNixos "nixos.tar.bz2" (builtins.filterSource filter ./..);
 
 
   # Get a recent copy of Nixpkgs.
-  nixpkgsTarball = /root/nixpkgs.tar.bz2;
+  nixpkgsTarball = /* /root/nixpkgs.tar.bz2; */
+    let filter = name: type:
+      let base = baseNameOf (toString name);
+      in base != "result";
+    in
+      makeTarball "nixpkgs.tar.bz2" (builtins.filterSource filter /etc/nixos/nixpkgs);
+
 
   # The configuration file for isolinux.
   isolinuxCfg = pkgs.writeText "isolinux.cfg" "
@@ -172,7 +232,7 @@ rec {
       { source = nixosTarball + "/" + nixosTarball.tarName;
         target = "/" + nixosTarball.tarName;
       }
-      { source = nixpkgsTarball;
+      { source = nixpkgsTarball + "/" +nixpkgsTarball.tarName;
         target = "/nixpkgs.tar.bz2";
       }
     ];
diff --git a/helpers/make-iso9660-image.nix b/helpers/make-iso9660-image.nix
index c16d5413896..8bf3467b7fd 100644
--- a/helpers/make-iso9660-image.nix
+++ b/helpers/make-iso9660-image.nix
@@ -16,6 +16,9 @@
   # to `source' that will be added to the CD.
   storeContents ? []
 
+, 
+  buildStoreContents ? []
+
   # Whether this should be an El-Torito bootable CD.
 , bootable ? false
 
@@ -43,5 +46,7 @@ stdenv.mkDerivation {
   # For obtaining the closure of `storeContents'.
   exportReferencesGraph =
     map (x: [("closure-" + baseNameOf x.object) x.object]) storeContents;
+  exportBuildReferencesGraph =
+    map (x: [("closure-build-" + baseNameOf x.object) x.object]) buildStoreContents;
   pathsFromGraph = ./paths-from-graph.pl;
 }
-- 
GitLab


From 78b288e98af280a4f0295df843f75df71d09d1e9 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Mon, 31 Dec 2007 15:53:42 +0000
Subject: [PATCH 0687/5331] Allowed sudo for LiveDVD. No point in it, but it
 gets cached on DVD in this case

svn path=/nixos/trunk/; revision=9989
---
 configuration/live-dvd.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/configuration/live-dvd.nix b/configuration/live-dvd.nix
index 03143803e6a..6956eedb407 100644
--- a/configuration/live-dvd.nix
+++ b/configuration/live-dvd.nix
@@ -81,7 +81,7 @@ rec {
 
     security = {
       sudo = {
-        enable = false;
+        enable = true;
       };
     };
  
-- 
GitLab


From 0b4ee455d9d2110be16f437979eac4a3ccf5d434 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Tue, 1 Jan 2008 15:47:35 +0000
Subject: [PATCH 0688/5331] A bit extended LiveDVD

svn path=/nixos/trunk/; revision=10042
---
 configuration/live-dvd.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/configuration/live-dvd.nix b/configuration/live-dvd.nix
index 6956eedb407..4e4c1c6e4bc 100644
--- a/configuration/live-dvd.nix
+++ b/configuration/live-dvd.nix
@@ -133,6 +133,11 @@ rec {
 	pkgs.guile
 	pkgs.utillinuxCurses
 	pkgs.emacs
+	pkgs.iproute
+	pkgs.MPlayer
+	pkgs.diffutils
+	pkgs.pciutils
+	pkgs.lsof
       ];
     };
    
-- 
GitLab


From 27d5e9392046d0a5a62f1ed710b5d7de9d393835 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Wed, 2 Jan 2008 10:07:52 +0000
Subject: [PATCH 0689/5331] Added choice of sound devices mode.

svn path=/nixos/trunk/; revision=10045
---
 system/options.nix                    | 11 ++++++++++-
 upstart-jobs/default.nix              |  1 +
 upstart-jobs/udev-rules/50-udev.rules | 12 ++++++------
 upstart-jobs/udev.nix                 |  2 ++
 4 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/system/options.nix b/system/options.nix
index 0e607a5dd74..1ea25cb21cd 100644
--- a/system/options.nix
+++ b/system/options.nix
@@ -1162,7 +1162,16 @@
           and cannot be redistributed.
         ";
       };
-
+      
+      sndMode = mkOption {
+        default = "0600";
+	example = "0666";
+	description = "
+	  Permissions for /dev/snd/*, in case you have multiple 
+	  logged in users or if the devices belong to root for 
+	  some reason.
+	";
+      };
     };
 
 
diff --git a/upstart-jobs/default.nix b/upstart-jobs/default.nix
index 7b7c64af36f..cdeb5806369 100644
--- a/upstart-jobs/default.nix
+++ b/upstart-jobs/default.nix
@@ -30,6 +30,7 @@ let
 	(config.services.udev.addFirmware);
       extraUdevPkgs =
         pkgs.lib.optional (config.services.hal.enable) pkgs.hal;
+	sndMode = config.services.udev.sndMode;
     })
       
     # Makes LVM logical volumes available. 
diff --git a/upstart-jobs/udev-rules/50-udev.rules b/upstart-jobs/udev-rules/50-udev.rules
index 400bf225903..02ce5920411 100644
--- a/upstart-jobs/udev-rules/50-udev.rules
+++ b/upstart-jobs/udev-rules/50-udev.rules
@@ -34,12 +34,12 @@ KERNEL=="sr[0-9]", BUS=="scsi", SYMLINK+="cdrom cdrom-%k"
 
 
 # ALSA sound devices.
-KERNEL=="controlC[0-9]*",       NAME="snd/%k"
-KERNEL=="hwC[D0-9]*",           NAME="snd/%k"
-KERNEL=="pcmC[D0-9cp]*",        NAME="snd/%k"
-KERNEL=="midiC[D0-9]*",         NAME="snd/%k"
-KERNEL=="timer",                NAME="snd/%k"
-KERNEL=="seq",                  NAME="snd/%k"
+KERNEL=="controlC[0-9]*",       NAME="snd/%k", MODE="@sndMode@"
+KERNEL=="hwC[D0-9]*",           NAME="snd/%k", MODE="@sndMode@"
+KERNEL=="pcmC[D0-9cp]*",        NAME="snd/%k", MODE="@sndMode@"
+KERNEL=="midiC[D0-9]*",         NAME="snd/%k", MODE="@sndMode@"
+KERNEL=="timer",                NAME="snd/%k", MODE="@sndMode@"
+KERNEL=="seq",                  NAME="snd/%k", MODE="@sndMode@"
 
 
 # Firmware loading.
diff --git a/upstart-jobs/udev.nix b/upstart-jobs/udev.nix
index c29c4b5c5eb..e006db3587d 100644
--- a/upstart-jobs/udev.nix
+++ b/upstart-jobs/udev.nix
@@ -1,5 +1,6 @@
 { stdenv, writeText, substituteAll, cleanSource, udev, procps, firmwareDirs
 , extraUdevPkgs ? []
+, sndMode ? "0600"
 }:
 
 let
@@ -14,6 +15,7 @@ let
       isExecutable = true;
       inherit firmwareDirs;
     };
+    inherit sndMode;
     buildCommand = "
       buildCommand= # urgh
       ensureDir $out
-- 
GitLab


From 0cb6f3e5c3aeec9c0dc5e85e0ea76ebee7e04722 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 2 Jan 2008 12:50:46 +0000
Subject: [PATCH 0690/5331] * Missing description.

svn path=/nixos/trunk/; revision=10047
---
 system/options.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/system/options.nix b/system/options.nix
index 1ea25cb21cd..9c903433e1e 100644
--- a/system/options.nix
+++ b/system/options.nix
@@ -607,6 +607,10 @@
             ipAddress = "192.168.1.11";
           }
         ];
+        description = ''
+          A list mapping ethernet addresses to IP addresses for the
+          DHCP server.
+        '';
       };
 
     };
-- 
GitLab


From 5ec82632f2f7b7af054cee545fadb1c69c927aa6 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 2 Jan 2008 13:05:24 +0000
Subject: [PATCH 0691/5331] * Use Nix 0.11.

svn path=/nixos/trunk/; revision=10048
---
 system/options.nix | 22 +++++++++++-----------
 system/system.nix  |  2 --
 2 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/system/options.nix b/system/options.nix
index 9c903433e1e..0059011f28f 100644
--- a/system/options.nix
+++ b/system/options.nix
@@ -1768,22 +1768,22 @@ root        ALL=(ALL) SETENV: ALL
     };
 
     nix = mkOption {
-        default = pkgs: pkgs.nixUnstable;
-        example = pkgs: pkgs.nixCustomFun /root/nix.tar.gz;
-        description = "
-          Use non-default Nix easily. Be careful, though, not to break everything.
-        ";
+      default = pkgs: pkgs.nix;
+      example = pkgs: pkgs.nixCustomFun /root/nix.tar.gz;
+      description = ''
+        Use non-default Nix easily. Be careful, though, not to break everything.
+      '';
     };
 
   };
   
   nesting = {
-	  children = mkOption {
-	      default = [];
-	      description = "
-		Additional configurations to build.
-	      ";
-	  };
+    children = mkOption {
+      default = [];
+      description = ''
+        Additional configurations to build.
+      '';
+    };
   };
 
 }
diff --git a/system/system.nix b/system/system.nix
index c0edff9778d..825fbf4a434 100644
--- a/system/system.nix
+++ b/system/system.nix
@@ -31,7 +31,6 @@ rec {
 
   manifests = config.installer.manifests; # exported here because nixos-rebuild uses it
 
-  /*nix = pkgs.nixUnstable; # we need the exportReferencesGraph feature*/
   nix = config.environment.nix pkgs;
 
   kernel = config.boot.kernel pkgs;
@@ -237,7 +236,6 @@ rec {
     pkgs.utillinux
     pkgs.wirelesstools
     nix
-    (pkgs.lowPrio (pkgs.nixUnstable)) /* Better safe than sorry */
     nixosInstall
     nixosRebuild
     nixosCheckout
-- 
GitLab


From 35f5252630ac4bc4cfe376f050953e1599d63527 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 2 Jan 2008 15:30:31 +0000
Subject: [PATCH 0692/5331] * If building nixFallback fails, use nixUnstable
 from Nixpkgs as   a last-chance fallback.

svn path=/nixos/trunk/; revision=10050
---
 installer/nixos-rebuild.sh | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/installer/nixos-rebuild.sh b/installer/nixos-rebuild.sh
index 4330295bc4e..6a3b3a40050 100644
--- a/installer/nixos-rebuild.sh
+++ b/installer/nixos-rebuild.sh
@@ -44,7 +44,9 @@ fi
 # First build Nix, since NixOS may require a newer version than the
 # current one.  Of course, the same goes for Nixpkgs, but Nixpkgs is
 # more conservative.
-nix-build $NIXOS -A nixFallback -o $HOME/nix-tmp
+if ! nix-build $NIXOS -A nixFallback -o $HOME/nix-tmp; then
+    nix-build /etc/nixos/nixpkgs -A nixUnstable -o $HOME/nix-tmp
+fi
 PATH=$HOME/nix-tmp/bin:$PATH
 
 
-- 
GitLab


From 90a0d64bcd768c4abfc85056fd37433022c1a261 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 2 Jan 2008 15:31:04 +0000
Subject: [PATCH 0693/5331] svn path=/nixos/trunk/; revision=10051

---
 system/options.nix | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/system/options.nix b/system/options.nix
index 0059011f28f..7ae100632b8 100644
--- a/system/options.nix
+++ b/system/options.nix
@@ -607,10 +607,10 @@
             ipAddress = "192.168.1.11";
           }
         ];
-        description = ''
+        description = "
           A list mapping ethernet addresses to IP addresses for the
           DHCP server.
-        '';
+        ";
       };
 
     };
@@ -1770,9 +1770,9 @@ root        ALL=(ALL) SETENV: ALL
     nix = mkOption {
       default = pkgs: pkgs.nix;
       example = pkgs: pkgs.nixCustomFun /root/nix.tar.gz;
-      description = ''
+      description = "
         Use non-default Nix easily. Be careful, though, not to break everything.
-      '';
+      ";
     };
 
   };
@@ -1780,9 +1780,9 @@ root        ALL=(ALL) SETENV: ALL
   nesting = {
     children = mkOption {
       default = [];
-      description = ''
+      description = "
         Additional configurations to build.
-      '';
+      ";
     };
   };
 
-- 
GitLab


From c00448493bac03ea7aaada2beabf780c4f0e887e Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 2 Jan 2008 16:09:55 +0000
Subject: [PATCH 0694/5331] * Use vim instead of vimDiet on the CD because
 ncurses on dietlibc is   broken on x86_64 (apparently because dietlibc on
 x86_64 doesn't have   sin() / cos()).

svn path=/nixos/trunk/; revision=10052
---
 configuration/rescue-cd.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/configuration/rescue-cd.nix b/configuration/rescue-cd.nix
index 51128301e97..92369fa866e 100644
--- a/configuration/rescue-cd.nix
+++ b/configuration/rescue-cd.nix
@@ -84,7 +84,7 @@ rec {
  
     environment = {
       extraPackages = pkgs: [
-        pkgs.vimDiet
+        pkgs.vim
       ];
     };
    
-- 
GitLab


From c6cf1481b0d2164d627047d7c9f2fbbab301b285 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Wed, 2 Jan 2008 17:03:10 +0000
Subject: [PATCH 0695/5331] Duplicated rescue-cd.nix change in live-dvd.nix

svn path=/nixos/trunk/; revision=10054
---
 configuration/live-dvd.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/configuration/live-dvd.nix b/configuration/live-dvd.nix
index 4e4c1c6e4bc..f07da3ec2fa 100644
--- a/configuration/live-dvd.nix
+++ b/configuration/live-dvd.nix
@@ -87,7 +87,6 @@ rec {
  
     environment = {
       extraPackages = pkgs: [
-        pkgs.vimDiet
 	pkgs.irssi
 	pkgs.elinks
 	pkgs.ltrace
@@ -138,6 +137,7 @@ rec {
 	pkgs.diffutils
 	pkgs.pciutils
 	pkgs.lsof
+	pkgs.vim
       ];
     };
    
-- 
GitLab


From 598848d6afbf487055890cc257d73fcc306f7e46 Mon Sep 17 00:00:00 2001
From: Marc Weber <marco-oweber@gmx.de>
Date: Wed, 2 Jan 2008 21:16:58 +0000
Subject: [PATCH 0696/5331] patches provided by Tobias Hammerschmidt

svn path=/nixos/trunk/; revision=10055
---
 system/options.nix        | 8 ++++++++
 upstart-jobs/xserver.conf | 3 +++
 upstart-jobs/xserver.nix  | 1 +
 3 files changed, 12 insertions(+)

diff --git a/system/options.nix b/system/options.nix
index 7ae100632b8..0a24134a30e 100644
--- a/system/options.nix
+++ b/system/options.nix
@@ -855,6 +855,14 @@
         ";
       };
 
+      extraDisplaySettings = mkOption {
+        default = "";
+        example = "Virtual 2048 2048";
+        description = "
+          Just anything to add into Display subsection (located in Screen section).
+        ";
+      };
+ 
       extraModules = mkOption {
         default = "";
         example = "
diff --git a/upstart-jobs/xserver.conf b/upstart-jobs/xserver.conf
index 14fe98b13a0..e3c29cec375 100644
--- a/upstart-jobs/xserver.conf
+++ b/upstart-jobs/xserver.conf
@@ -62,14 +62,17 @@ Section "Screen"
   SubSection "Display"
     Depth      16
     Modes      @resolutions@
+    @extraDisplaySettings@
   EndSubSection
   SubSection "Display"
     Depth      24
     Modes      @resolutions@
+    @extraDisplaySettings@
   EndSubSection
   #SubSection "Display"
   #  Depth      32
   #  Modes      @resolutions@
+  #  @extraDisplaySettings@
   #EndSubSection
 
   @screen@
diff --git a/upstart-jobs/xserver.nix b/upstart-jobs/xserver.nix
index 989460a46c6..bdc758f1a45 100644
--- a/upstart-jobs/xserver.nix
+++ b/upstart-jobs/xserver.nix
@@ -118,6 +118,7 @@ let
 
     extraDeviceConfig = cfg.extraDeviceConfig; 
     extraMonitorSettings = cfg.extraMonitorSettings; 
+    extraDisplaySettings = cfg.extraDisplaySettings;
     extraModules = cfg.extraModules; 
     serverLayoutOptions = cfg.serverLayoutOptions; 
     defaultDepth = cfg.defaultDepth; 
-- 
GitLab


From 93efa40b587d43fb0106897cc835dd0baa6ed8cc Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 3 Jan 2008 13:34:16 +0000
Subject: [PATCH 0697/5331] * Put Subversion on the installation CD so that the
 user can run   "nixos-checkout" to use the latest NixOS/Nixpkgs expressions
 (rather   than what's on the CD).

svn path=/nixos/trunk/; revision=10057
---
 configuration/rescue-cd.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/configuration/rescue-cd.nix b/configuration/rescue-cd.nix
index 92369fa866e..9573753ef68 100644
--- a/configuration/rescue-cd.nix
+++ b/configuration/rescue-cd.nix
@@ -4,7 +4,7 @@
 rec {
 
   
-  nixpkgsRel = "nixpkgs-0.12pre9486";
+  nixpkgsRel = "nixpkgs-0.12pre10056";
 
 
   configuration = {
@@ -85,6 +85,7 @@ rec {
     environment = {
       extraPackages = pkgs: [
         pkgs.vim
+        pkgs.subversion # for nixos-checkout
       ];
     };
    
@@ -133,7 +134,7 @@ rec {
   # Get a recent copy of Nixpkgs.
   nixpkgsTarball = pkgs.fetchurl {
     url = configuration.installer.nixpkgsURL + "/" + nixpkgsRel + ".tar.bz2";
-    md5 = "22deefec0696d2fb263864b97e2238d3";
+    md5 = "a25cd6eb5e753703823fdd3ae86e9f25";
   };
 
 
-- 
GitLab


From dc9b332fcd0a48117a6c4de95527e5cb1854535e Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 3 Jan 2008 15:06:55 +0000
Subject: [PATCH 0698/5331] * Use Grub instead of isolinux on the boot CD.

svn path=/nixos/trunk/; revision=10058
---
 configuration/rescue-cd.nix | 41 +++++++++++++++++--------------------
 1 file changed, 19 insertions(+), 22 deletions(-)

diff --git a/configuration/rescue-cd.nix b/configuration/rescue-cd.nix
index 9573753ef68..cb08ebc7f04 100644
--- a/configuration/rescue-cd.nix
+++ b/configuration/rescue-cd.nix
@@ -138,38 +138,35 @@ rec {
   };
 
 
-  # The configuration file for isolinux.
-  isolinuxCfg = pkgs.writeText "isolinux.cfg" "
-    default linux
-    prompt 1
-    timeout 60
-    label linux
-      kernel vmlinuz
-      append initrd=initrd ${toString (system.config.boot.kernelParams)}
-  ";
-    
-
-
-  # Create an ISO image containing the isolinux boot loader, the
-  # kernel, the initrd produced above, and the closure of the stage 2
-  # init.
+  # The configuration file for Grub.
+  grubCfg = pkgs.writeText "menu.lst" ''
+    default=0
+    timeout=5
+    title NixOS Installer / Rescue
+      kernel /boot/vmlinuz ${toString system.config.boot.kernelParams}
+      initrd /boot/initrd
+  '';
+
+
+  # Create an ISO image containing the Grub boot loader, the kernel,
+  # the initrd produced above, and the closure of the stage 2 init.
   rescueCD = import ../helpers/make-iso9660-image.nix {
     inherit (pkgs) stdenv perl cdrtools;
     isoName = "nixos-${platform}.iso";
 
     # Single files to be copied to fixed locations on the CD.
     contents = [
-      { source = pkgs.syslinux + "/lib/syslinux/isolinux.bin";
-        target = "isolinux/isolinux.bin";
+      { source = "${pkgs.grub}/lib/grub/i386-pc/stage2_eltorito";
+        target = "boot/grub/stage2_eltorito";
       }
-      { source = isolinuxCfg;
-        target = "isolinux/isolinux.cfg";
+      { source = grubCfg;
+        target = "boot/grub/menu.lst";
       }
       { source = pkgs.kernel + "/vmlinuz";
-        target = "isolinux/vmlinuz";
+        target = "boot/vmlinuz";
       }
       { source = system.initialRamdisk + "/initrd";
-        target = "isolinux/initrd";
+        target = "boot/initrd";
       }
       { source = cdMountPoints;
         target = "/";
@@ -197,7 +194,7 @@ rec {
     ];
     
     bootable = true;
-    bootImage = "isolinux/isolinux.bin";
+    bootImage = "boot/grub/stage2_eltorito";
   };
 
 
-- 
GitLab


From 4760aa9d4c5b78c7e6107e82685230c108fdbe5f Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 3 Jan 2008 15:24:34 +0000
Subject: [PATCH 0699/5331] * Add Memtest86+ to the CD - useful.

svn path=/nixos/trunk/; revision=10060
---
 configuration/rescue-cd.nix | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/configuration/rescue-cd.nix b/configuration/rescue-cd.nix
index cb08ebc7f04..90278a375e9 100644
--- a/configuration/rescue-cd.nix
+++ b/configuration/rescue-cd.nix
@@ -141,10 +141,14 @@ rec {
   # The configuration file for Grub.
   grubCfg = pkgs.writeText "menu.lst" ''
     default=0
-    timeout=5
+    timeout=10
+    
     title NixOS Installer / Rescue
       kernel /boot/vmlinuz ${toString system.config.boot.kernelParams}
       initrd /boot/initrd
+
+    title Memtest86+
+      kernel /boot/memtest.bin
   '';
 
 
@@ -168,6 +172,9 @@ rec {
       { source = system.initialRamdisk + "/initrd";
         target = "boot/initrd";
       }
+      { source = pkgs.memtest86 + "/memtest.bin";
+        target = "boot/memtest.bin";
+      }
       { source = cdMountPoints;
         target = "/";
       }
-- 
GitLab


From 6ef8fe2a31412e390877e481ef32269a0e5b0eaa Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 3 Jan 2008 16:03:11 +0000
Subject: [PATCH 0700/5331] * Use unpackFile so that gzipped themes also work.

svn path=/nixos/trunk/; revision=10061
---
 helpers/unpack-theme.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/helpers/unpack-theme.sh b/helpers/unpack-theme.sh
index 6eda7bcfbd4..ca6e0b88ab9 100644
--- a/helpers/unpack-theme.sh
+++ b/helpers/unpack-theme.sh
@@ -2,7 +2,7 @@ source $stdenv/setup
 
 ensureDir $out
 
-tar xvfj $theme -C $out
+(cd $out && unpackFile $theme)
 
 themeName=$(cd $out && ls)
 
-- 
GitLab


From fddddb3f35a71b0ac8d8980f2187636d8363accd Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 3 Jan 2008 17:07:28 +0000
Subject: [PATCH 0701/5331] * Add a Grub splash screen.

svn path=/nixos/trunk/; revision=10063
---
 configuration/rescue-cd.nix | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/configuration/rescue-cd.nix b/configuration/rescue-cd.nix
index 90278a375e9..433c137156e 100644
--- a/configuration/rescue-cd.nix
+++ b/configuration/rescue-cd.nix
@@ -140,8 +140,9 @@ rec {
 
   # The configuration file for Grub.
   grubCfg = pkgs.writeText "menu.lst" ''
-    default=0
-    timeout=10
+    default 0
+    timeout 10
+    splashimage /boot/background.xpm.gz
     
     title NixOS Installer / Rescue
       kernel /boot/vmlinuz ${toString system.config.boot.kernelParams}
@@ -175,6 +176,12 @@ rec {
       { source = pkgs.memtest86 + "/memtest.bin";
         target = "boot/memtest.bin";
       }
+      { source = pkgs.fetchurl {
+          url = http://www.gnome-look.org/CONTENT/content-files/36909-soft-tux.xpm.gz;
+          sha256 = "14kqdx2lfqvh40h6fjjzqgff1mwk74dmbjvmqphi6azzra7z8d59";
+        };
+        target = "boot/background.xpm.gz";
+      }
       { source = cdMountPoints;
         target = "/";
       }
-- 
GitLab


From 3da504ab6a400641f8518ef573c750082bf04d91 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 3 Jan 2008 17:11:36 +0000
Subject: [PATCH 0702/5331] * Disable mod_unique_id because it fails when the
 machine doesn't have   an IP address yet. * Create /var/run/httpd,
 /var/log/httpd automatically.

svn path=/nixos/trunk/; revision=10064
---
 upstart-jobs/apache-httpd/default.nix | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/upstart-jobs/apache-httpd/default.nix b/upstart-jobs/apache-httpd/default.nix
index 937f7ce1817..0273497d912 100644
--- a/upstart-jobs/apache-httpd/default.nix
+++ b/upstart-jobs/apache-httpd/default.nix
@@ -26,7 +26,7 @@ let
 
       # Other modules.
       "ext_filter" "include" "log_config" "env" "mime_magic"
-      "cern_meta" "expires" "headers" "usertrack" "unique_id" "setenvif"
+      "cern_meta" "expires" "headers" "usertrack" /* "unique_id" */ "setenvif"
       "mime" "dav" "status" "autoindex" "asis" "info" "cgi" "dav_fs"
       "vhost_alias" "negotiation" "dir" "imagemap" "actions" "speling"
       "userdir" "alias" "rewrite"
@@ -224,6 +224,11 @@ in
     start on ${startingDependency}/started
     stop on shutdown
 
+    start script
+      mkdir -m 0700 -p ${cfg.stateDir}
+      mkdir -m 0700 -p ${cfg.logDir}
+    end script
+
     respawn ${httpd}/bin/httpd -f ${httpdConf} -DNO_DETACH
   '';
 
-- 
GitLab


From 48142d81359a4c6c159e753923d47d9140278513 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 4 Jan 2008 10:28:12 +0000
Subject: [PATCH 0703/5331] * Use the '' string syntax, it cleans up
 xserver.nix a lot.

svn path=/nixos/trunk/; revision=10066
---
 upstart-jobs/xserver.conf |   4 +-
 upstart-jobs/xserver.nix  | 203 +++++++++++++++++++-------------------
 2 files changed, 101 insertions(+), 106 deletions(-)

diff --git a/upstart-jobs/xserver.conf b/upstart-jobs/xserver.conf
index e3c29cec375..e35199e8d5d 100644
--- a/upstart-jobs/xserver.conf
+++ b/upstart-jobs/xserver.conf
@@ -20,9 +20,8 @@ Section "Module"
   Load "int10"
   Load "type1"
   Load "vbe"
-  #Load "evdev"
   @moduleSection@
-	@extraModules@
+  @extraModules@
 EndSection
 
 
@@ -84,7 +83,6 @@ Section "Device"
   Driver       "@videoDriver@"
   Option       "Clone" "@isClone@"
   #Option       "MonitorLayout" "CRT,LFP"
-  #Option       "MonitorLayout" "LVDS,CRT"
   @device@
   @internalAGPGART@
   @extraDeviceConfig@
diff --git a/upstart-jobs/xserver.nix b/upstart-jobs/xserver.nix
index bdc758f1a45..e0cdb6b2f9e 100644
--- a/upstart-jobs/xserver.nix
+++ b/upstart-jobs/xserver.nix
@@ -35,7 +35,7 @@ let
 
   # Get a bunch of user settings.
   videoDriver = cfg.videoDriver;
-  resolutions = map (res: "\"${toString res.x}x${toString res.y}\"") (cfg.resolutions);
+  resolutions = map (res: ''"${toString res.x}x${toString res.y}"'') (cfg.resolutions);
   sessionType = cfg.sessionType;
   sessionStarter = cfg.sessionStarter;
   renderingFlag = cfg.renderingFlag;
@@ -71,50 +71,53 @@ let
     ++ optional (videoDriver == "nv") xorg.xf86videonv
     ++ optional (videoDriver == "ati") xorg.xf86videoati
     ++ (optional (cfg.isSynaptics) [(synaptics+"/"+xorg.xorgserver) /*xorg.xf86inputevdev*/]);
-    
+
+        
   configFile = stdenv.mkDerivation {
     name = "xserver.conf";
     src = ./xserver.conf;
     inherit fontDirectories videoDriver resolutions isClone;
 
-    synapticsInputDevice = (if cfg.isSynaptics then "
-      Section \"InputDevice\"
-        Identifier \"Touchpad[0]\"
-        Driver \"synaptics\"
-        Option \"Device\" \"${cfg.devSynaptics}\"
-        Option \"Protocol\" \"PS/2\"
-        Option \"LeftEdge\" \"1700\"
-        Option \"RightEdge\" \"5300\"
-        Option \"TopEdge\" \"1700\"
-        Option \"BottomEdge\" \"4200\"
-        Option \"FingerLow\" \"25\"
-        Option \"FingerHigh\" \"30\"
-        Option \"MaxTapTime\" \"180\"
-        Option \"MaxTapMove\" \"220\"
-        Option \"VertScrollDelta\" \"100\"
-        Option \"MinSpeed\" \"0.06\"
-        Option \"MaxSpeed\" \"0.12\"
-        Option \"AccelFactor\" \"0.0010\"
-        Option \"SHMConfig\" \"on\"
-        Option \"Repeater\" \"/dev/input/mice\"
-        Option \"TapButton1\" \"1\"
-        Option \"TapButton2\" \"2\"
-        Option \"TapButton3\" \"3\"
-      EndSection " else "");
-
-    xkbOptions = if (cfg.xkbOptions) == "" then "" else 
-      "  Option \"XkbOptions\" \"${cfg.xkbOptions}\"";
+    synapticsInputDevice = if cfg.isSynaptics then ''
+      Section "InputDevice"
+        Identifier "Touchpad[0]"
+        Driver "synaptics"
+        Option "Device" "${cfg.devSynaptics}"
+        Option "Protocol" "PS/2"
+        Option "LeftEdge" "1700"
+        Option "RightEdge" "5300"
+        Option "TopEdge" "1700"
+        Option "BottomEdge" "4200"
+        Option "FingerLow" "25"
+        Option "FingerHigh" "30"
+        Option "MaxTapTime" "180"
+        Option "MaxTapMove" "220"
+        Option "VertScrollDelta" "100"
+        Option "MinSpeed" "0.06"
+        Option "MaxSpeed" "0.12"
+        Option "AccelFactor" "0.0010"
+        Option "SHMConfig" "on"
+        Option "Repeater" "/dev/input/mice"
+        Option "TapButton1" "1"
+        Option "TapButton2" "2"
+        Option "TapButton3" "3"
+      EndSection
+    '' else "";
+
+    xkbOptions = if cfg.xkbOptions == "" then "" else  ''
+      Option "XkbOptions" "${cfg.xkbOptions}"
+    '';
 
     layout = cfg.layout;
 
     corePointer = if cfg.isSynaptics then "Touchpad[0]" else "Mouse[0]";
 
     internalAGPGART =
-      if (cfg.useInternalAGPGART) == "yes" then
-        "  Option \"UseInternalAGPGART\" \"yes\""
-      else if (cfg.useInternalAGPGART) == "no" then
-	"  Option \"UseInternalAGPGART\" \"no\""
-      else "    ";
+      if cfg.useInternalAGPGART == "yes" then
+        ''  Option "UseInternalAGPGART" "yes"''
+      else if cfg.useInternalAGPGART == "no" then
+	''  Option "UseInternalAGPGART" "no"''
+      else "";
 
     extraDeviceConfig = cfg.extraDeviceConfig; 
     extraMonitorSettings = cfg.extraMonitorSettings; 
@@ -123,17 +126,17 @@ let
     serverLayoutOptions = cfg.serverLayoutOptions; 
     defaultDepth = cfg.defaultDepth; 
 
-    xfs = (if cfg.useXFS == false then "" else 
-      "FontPath \"${toString cfg.useXFS}\"");
+    xfs = if cfg.useXFS == false then "" else 
+      ''FontPath "${toString cfg.useXFS}"'';
 
-    buildCommand = "
+    buildCommand = ''
       buildCommand= # urgh, don't substitute this
 
       export fontPaths=
       for i in $fontDirectories; do
-        if test \"\${i:0:\${#NIX_STORE}}\" == \"$NIX_STORE\"; then
+        if test "''${i:0:''${#NIX_STORE}}" == "$NIX_STORE"; then
           for j in $(find $i -name fonts.dir); do
-            fontPaths=\"\${fontPaths}FontPath \\\"$(dirname $j)\\\"\n\"
+            fontPaths="''${fontPaths}FontPath \"$(dirname $j)\"''\n"
           done
         fi
       done
@@ -141,56 +144,56 @@ let
       export modulePaths=
       for i in $(find ${toString modules} -type d); do
         if ls $i/*.so 2> /dev/null; then
-          modulePaths=\"\${modulePaths}ModulePath \\\"$i\\\"\n\"
+          modulePaths="''${modulePaths}ModulePath \"$i\"''\n"
         fi
       done
 
       #if only my gf were this dirty
-      if test \"${toString videoDriver}\" == \"nvidia\"; then
+      if test "${toString videoDriver}" == "nvidia"; then
         export moduleSection='
-          Load \"glx\"
-          SubSection \"extmod\"
-            Option \"omit xfree86-dga\"
+          Load "glx"
+          SubSection "extmod"
+            Option "omit xfree86-dga"
           EndSubSection
         '
 
         export screen='
-          Option \"AddARGBGLXVisuals\" \"true\"
-          Option \"DisableGLXRootClipping\" \"true\"
+          Option "AddARGBGLXVisuals" "true"
+          Option "DisableGLXRootClipping" "true"
         '
         
         export device='
-          Option \"RenderAccel\" \"true\"
-          Option \"AllowGLXWithComposite\" \"true\"
-          Option \"AddARGBGLXVisuals\" \"true\"
+          Option "RenderAccel" "true"
+          Option "AllowGLXWithComposite" "true"
+          Option "AddARGBGLXVisuals" "true"
         '
         
         export extensions='
-          Option \"Composite\" \"Enable\"
+          Option "Composite" "Enable"
         '
 
       else
         export moduleSection='
-          Load \"glx\"
-          Load \"dri\"
+          Load "glx"
+          Load "dri"
         '
         export screen=
         export device=
         export extensions=
       fi
 	
-	if [ \"${toString videoDriver}\" = i810 ]; then
-		extensions='
-	Option \"Composite\" \"Enable\"
-';
-	fi;
+      if [ "${toString videoDriver}" = i810 ]; then
+        export extensions='
+          Option "Composite" "Enable"
+        ';
+      fi;
 
       substituteAll $src $out
-    ";
+    '';
   };
 
 
-  clientScript = writeText "xclient" "
+  clientScript = writeText "xclient" ''
 
     source /etc/profile
 
@@ -203,11 +206,11 @@ let
     fi
 
 
-    ${if cfg.startSSHAgent then "
+    ${if cfg.startSSHAgent then ''
       ### Start the SSH agent.
       export SSH_ASKPASS=${x11_ssh_askpass}/libexec/x11-ssh-askpass
       eval $(${openssh}/bin/ssh-agent)
-    " else ""}
+    '' else ""}
 
     ### Allow user to override system-wide configuration
     if test -f ~/.xsession; then
@@ -217,60 +220,58 @@ let
 
     ### Start a window manager.
   
-    ${if windowManager == "twm" then "
+    ${if windowManager == "twm" then ''
       ${xorg.twm}/bin/twm &
-    "
+    ''
 
-    else if windowManager == "metacity" then "
+    else if windowManager == "metacity" then ''
       env LD_LIBRARY_PATH=${libX11}/lib:${libXext}/lib:/usr/lib/
       # !!! Hack: load the schemas for Metacity.
-      GCONF_CONFIG_SOURCE=xml::~/.gconf ${gnome.GConf}/bin/gconftool-2 \\
+      GCONF_CONFIG_SOURCE=xml::~/.gconf ${gnome.GConf}/bin/gconftool-2 \
         --makefile-install-rule ${gnome.metacity}/etc/gconf/schemas/*.schemas
       ${gnome.metacity}/bin/metacity &
-    "
+    ''
 
-    else if windowManager == "kwm" then "
+    else if windowManager == "kwm" then ''
       ${kdebase}/bin/kwin &
-    "
+    ''
 
-    else if windowManager == "compiz" then "
-    
+    else if windowManager == "compiz" then ''
       # !!! Hack: load the schemas for Compiz.
-      GCONF_CONFIG_SOURCE=xml::~/.gconf ${gnome.GConf}/bin/gconftool-2 \\
+      GCONF_CONFIG_SOURCE=xml::~/.gconf ${gnome.GConf}/bin/gconftool-2 \
         --makefile-install-rule ${compiz}/etc/gconf/schemas/*.schemas
 
       # !!! Hack: turn on most Compiz modules.
-      ${gnome.GConf}/bin/gconftool-2 -t list --list-type=string \\
-        --set /apps/compiz/general/allscreens/options/active_plugins \\
+      ${gnome.GConf}/bin/gconftool-2 -t list --list-type=string \
+        --set /apps/compiz/general/allscreens/options/active_plugins \
         [gconf,png,decoration,wobbly,fade,minimize,move,resize,cube,switcher,rotate,place,scale,water]
 
       # Start Compiz and the GTK-style window decorator.
       env LD_LIBRARY_PATH=${libX11}/lib:${libXext}/lib:/usr/lib/
       ${compiz}/bin/compiz gconf ${renderingFlag}&
       ${compiz}/bin/gtk-window-decorator --sync &
-    "
-    else if windowManager == "none" then "
-
+    ''
+    
+    else if windowManager == "none" then ''
       # The session starter will start the window manager.
-
-    "
+    ''
 
     else abort ("unknown window manager " + windowManager)}
 
 
     ### Show a background image.
     # (but not if we're starting a full desktop environment that does it for us)
-    ${if sessionType != "kde" then "
+    ${if sessionType != "kde" then ''
     
       if test -e $HOME/.background-image; then
         ${feh}/bin/feh --bg-scale $HOME/.background-image
       fi
       
-    " else ""}
+    '' else ""}
     
 
     ### Start the session.
-    ${if sessionType == "kde" then "
+    ${if sessionType == "kde" then ''
 
       # Start KDE.
       export KDEDIRS=$HOME/.nix-profile:/nix/var/nix/profiles/default:${kdebase}:${kdelibs}
@@ -278,7 +279,7 @@ let
       export XDG_DATA_DIRS=${kdebase}/share
       exec ${kdebase}/bin/startkde
 
-    " else "
+    '' else ''
 
       # For all other session types, we currently just start a
       # terminal of the kind indicated by sessionCmd.
@@ -287,9 +288,9 @@ let
         sleep 1  
       done
 
-    "}
+    ''}
     
-  "; # */ <- hack to fix syntax highlighting
+  '';
 
 
   xserverArgs = [
@@ -301,17 +302,15 @@ let
     "-config ${configFile}"
     ":${toString display}" "vt${toString tty}"
     "-xkbdir" "${xkeyboard_config}/etc/X11/xkb"
-  ] ++ (if ! config.services.xserver.tcpEnable
-	then ["-nolisten tcp"] else []);
+  ] ++ optional (!config.services.xserver.tcpEnable) "-nolisten tcp";
 
   
-  # Note: lines must not be indented.
-  slimConfig = writeText "slim.cfg" "
-xauth_path ${xorg.xauth}/bin/xauth
-default_xserver ${xorg.xorgserver}/bin/X
-xserver_arguments ${toString xserverArgs}
-login_cmd exec ${stdenv.bash}/bin/sh ${clientScript}
-  ";
+  slimConfig = writeText "slim.cfg" ''
+    xauth_path ${xorg.xauth}/bin/xauth
+    default_xserver ${xorg.xorgserver}/bin/X
+    xserver_arguments ${toString xserverArgs}
+    login_cmd exec ${stdenv.bash}/bin/sh ${clientScript}
+  '';
 
 
   # Unpack the SLiM theme, or use the default.
@@ -319,12 +318,12 @@ login_cmd exec ${stdenv.bash}/bin/sh ${clientScript}
     let
       unpackedTheme = stdenv.mkDerivation {
         name = "slim-theme";
-        buildCommand = "
+        buildCommand = ''
           ensureDir $out
           cd $out
           unpackFile ${cfg.slim.theme}
           ln -s * default
-        ";
+        '';
       };
     in if cfg.slim.theme == null then "${slim}/share/slim/themes" else unpackedTheme;       
 
@@ -374,14 +373,12 @@ rec {
       }
     ++
     optional (exportConfiguration) 
-    {
-      source = "${configFile}";
-      target = "X11/xorg.conf";
-    }
-      ;
+      { source = "${configFile}";
+        target = "X11/xorg.conf";
+      };
 
     
-  job = "
+  job = ''
     start on ${if autorun then "network-interfaces" else "never"}
 
     start script
@@ -394,7 +391,7 @@ rec {
         else ""
        }
 
-       rm -f /var/log/slim.log
+      rm -f /var/log/slim.log
        
     end script
 
@@ -412,6 +409,6 @@ rec {
     } 
 
     exec ${slim}/bin/slim
-  ";
+  '';
   
 }
-- 
GitLab


From b73424833aefea0641f30ce216b1695a7deeb9ab Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 4 Jan 2008 10:36:14 +0000
Subject: [PATCH 0704/5331] * xserver.nix: remove some unnecessary function
 arguments. * isClone: changed into a boolean rather than a string "on" or
 "off".

svn path=/nixos/trunk/; revision=10067
---
 system/options.nix       |  4 ++--
 upstart-jobs/default.nix | 11 ++++++++---
 upstart-jobs/xserver.nix | 20 ++++++--------------
 3 files changed, 16 insertions(+), 19 deletions(-)

diff --git a/system/options.nix b/system/options.nix
index 0a24134a30e..f22f1ee42ec 100644
--- a/system/options.nix
+++ b/system/options.nix
@@ -794,8 +794,8 @@
       };
 
       isClone = mkOption {
-        default = "on";
-        example = "off";
+        default = true;
+        example = false;
         description = "
           Whether to enable the X server clone mode for dual-head.
         ";
diff --git a/upstart-jobs/default.nix b/upstart-jobs/default.nix
index cdeb5806369..e6cb2a61580 100644
--- a/upstart-jobs/default.nix
+++ b/upstart-jobs/default.nix
@@ -154,9 +154,6 @@ let
       libX11 = pkgs.xlibs.libX11;
       libXext = pkgs.xlibs.libXext;
       fontDirectories = import ../system/fonts.nix {inherit pkgs config;};
-      isClone = config.services.xserver.isClone;
-      autorun = config.services.xserver.autorun;
-      exportConfiguration = config.services.xserver.exportConfiguration;
     })
 
   # Apache httpd.
@@ -168,6 +165,14 @@ let
         (map (job: job.extraHttpdConfig) jobs);
     })
 
+  # Apache httpd (new style).
+  /*
+  ++ optional config.services.httpd.enable
+    (import ../upstart-jobs/apache-httpd {
+      inherit config pkgs;
+    })
+  */
+
   # Postgres SQL server
   ++ optional config.services.postgresql.enable
     (import ../upstart-jobs/postgresql.nix {
diff --git a/upstart-jobs/xserver.nix b/upstart-jobs/xserver.nix
index e0cdb6b2f9e..2d45f0015e8 100644
--- a/upstart-jobs/xserver.nix
+++ b/upstart-jobs/xserver.nix
@@ -16,15 +16,6 @@
 
 , # List of font directories.
   fontDirectories
-
-, # Is Clone mode on?
-  isClone ? "on"
-
-, # Do we want it to run or just to prepare everything?
-  autorun ? true
-
-, # Create unneeded links in /etc? 
-  exportConfiguration ? false
 }:
 
 let
@@ -76,7 +67,8 @@ let
   configFile = stdenv.mkDerivation {
     name = "xserver.conf";
     src = ./xserver.conf;
-    inherit fontDirectories videoDriver resolutions isClone;
+    inherit fontDirectories videoDriver resolutions;
+    isClone = if cfg.isClone then "on" else "off";
 
     synapticsInputDevice = if cfg.isSynaptics then ''
       Section "InputDevice"
@@ -189,7 +181,7 @@ let
       fi;
 
       substituteAll $src $out
-    '';
+    ''; # */
   };
 
 
@@ -290,7 +282,7 @@ let
 
     ''}
     
-  '';
+  ''; # */
 
 
   xserverArgs = [
@@ -372,14 +364,14 @@ rec {
         target = "X11/xkb";
       }
     ++
-    optional (exportConfiguration) 
+    optional cfg.exportConfiguration
       { source = "${configFile}";
         target = "X11/xorg.conf";
       };
 
     
   job = ''
-    start on ${if autorun then "network-interfaces" else "never"}
+    start on ${if cfg.autorun then "network-interfaces" else "never"}
 
     start script
     
-- 
GitLab


From 8f0e88d4e50767e309396d62b4fccaf5f48999fd Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 4 Jan 2008 10:54:33 +0000
Subject: [PATCH 0705/5331] * Just pass all of Nixpkgs to xserver.nix.

svn path=/nixos/trunk/; revision=10068
---
 system/options.nix       | 16 +++++++
 upstart-jobs/default.nix | 14 ++----
 upstart-jobs/xserver.nix | 98 ++++++++++++++++++----------------------
 3 files changed, 64 insertions(+), 64 deletions(-)

diff --git a/system/options.nix b/system/options.nix
index f22f1ee42ec..5b441148933 100644
--- a/system/options.nix
+++ b/system/options.nix
@@ -900,6 +900,22 @@
 	";
       };
 
+      tty = mkOption {
+        default = 7;
+        example = 9;
+        description = "
+          Virtual console for the X server.
+        ";
+      };
+
+      display = mkOption {
+        default = 0;
+        example = 1;
+        description = "
+          Display number for the X server.
+        ";
+      };
+
     };
 
 
diff --git a/upstart-jobs/default.nix b/upstart-jobs/default.nix
index e6cb2a61580..24511ddb72e 100644
--- a/upstart-jobs/default.nix
+++ b/upstart-jobs/default.nix
@@ -146,13 +146,7 @@ let
   # X server.
   ++ optional config.services.xserver.enable
     (import ../upstart-jobs/xserver.nix {
-      inherit config;
-      inherit (pkgs) writeText lib xterm slim xorg mesa
-        gnome compiz feh kdebase kdelibs xkeyboard_config
-        openssh x11_ssh_askpass nvidiaDrivers synaptics;
-      stdenv = pkgs.stdenvNewSetupScript;
-      libX11 = pkgs.xlibs.libX11;
-      libXext = pkgs.xlibs.libXext;
+      inherit config pkgs;
       fontDirectories = import ../system/fonts.nix {inherit pkgs config;};
     })
 
@@ -202,9 +196,9 @@ let
 
   # X Font Server
   ++ optional config.services.xfs.enable
-  (import ../upstart-jobs/xfs.nix {
-  	inherit config pkgs;
-  })
+    (import ../upstart-jobs/xfs.nix {
+      inherit config pkgs;
+    })
 
   ++ optional config.services.ircdHybrid.enable
     (import ../upstart-jobs/ircd-hybrid.nix {
diff --git a/upstart-jobs/xserver.nix b/upstart-jobs/xserver.nix
index 2d45f0015e8..b7bbaa11055 100644
--- a/upstart-jobs/xserver.nix
+++ b/upstart-jobs/xserver.nix
@@ -1,18 +1,4 @@
-{ stdenv, writeText, lib, xorg, mesa, xterm, slim, gnome
-, compiz, feh
-, kdelibs, kdebase
-, xkeyboard_config
-, openssh, x11_ssh_askpass
-, nvidiaDrivers, libX11, libXext
-, synaptics
-
-, config
-
-, # Virtual console for the X server.
-  tty ? 7
-
-, # X display number.
-  display ? 0
+{ config, pkgs
 
 , # List of font directories.
   fontDirectories
@@ -20,10 +6,14 @@
 
 let
 
-  cfg = config.services.xserver;
-
   optional = condition: x: if condition then [x] else [];
 
+  # Abbreviations.
+  cfg = config.services.xserver;
+  xorg = pkgs.xorg;
+  gnome = pkgs.gnome;
+  stdenv = pkgs.stdenvNewSetupScript;
+
   # Get a bunch of user settings.
   videoDriver = cfg.videoDriver;
   resolutions = map (res: ''"${toString res.x}x${toString res.y}"'') (cfg.resolutions);
@@ -34,7 +24,7 @@ let
 
   sessionCmd =
     if sessionType == "" then sessionStarter else
-    if sessionType == "xterm" then "${xterm}/bin/xterm -ls" else
+    if sessionType == "xterm" then "${pkgs.xterm}/bin/xterm -ls" else
     if sessionType == "gnome" then "${gnome.gnometerminal}/bin/gnome-terminal -ls" else
     abort ("unknown session type "+ sessionType);
 
@@ -48,7 +38,7 @@ let
 
     
   modules = 
-    optional (videoDriver == "nvidia") nvidiaDrivers ++       #make sure it first loads the nvidia libs
+    optional (videoDriver == "nvidia") pkgs.nvidiaDrivers ++       #make sure it first loads the nvidia libs
     [
       xorg.xorgserver
       xorg.xf86inputkeyboard
@@ -61,9 +51,9 @@ let
     ++ optional (videoDriver == "intel") xorg.xf86videointel
     ++ optional (videoDriver == "nv") xorg.xf86videonv
     ++ optional (videoDriver == "ati") xorg.xf86videoati
-    ++ (optional (cfg.isSynaptics) [(synaptics+"/"+xorg.xorgserver) /*xorg.xf86inputevdev*/]);
+    ++ (optional cfg.isSynaptics ["${pkgs.synaptics}/${xorg.xorgserver}" /*xorg.xf86inputevdev*/]);
+
 
-        
   configFile = stdenv.mkDerivation {
     name = "xserver.conf";
     src = ./xserver.conf;
@@ -185,7 +175,7 @@ let
   };
 
 
-  clientScript = writeText "xclient" ''
+  clientScript = pkgs.writeText "xclient" ''
 
     source /etc/profile
 
@@ -200,8 +190,8 @@ let
 
     ${if cfg.startSSHAgent then ''
       ### Start the SSH agent.
-      export SSH_ASKPASS=${x11_ssh_askpass}/libexec/x11-ssh-askpass
-      eval $(${openssh}/bin/ssh-agent)
+      export SSH_ASKPASS=${pkgs.x11_ssh_askpass}/libexec/x11-ssh-askpass
+      eval $(${pkgs.openssh}/bin/ssh-agent)
     '' else ""}
 
     ### Allow user to override system-wide configuration
@@ -217,7 +207,7 @@ let
     ''
 
     else if windowManager == "metacity" then ''
-      env LD_LIBRARY_PATH=${libX11}/lib:${libXext}/lib:/usr/lib/
+      env LD_LIBRARY_PATH=${xorg.libX11}/lib:${xorg.libXext}/lib:/usr/lib/
       # !!! Hack: load the schemas for Metacity.
       GCONF_CONFIG_SOURCE=xml::~/.gconf ${gnome.GConf}/bin/gconftool-2 \
         --makefile-install-rule ${gnome.metacity}/etc/gconf/schemas/*.schemas
@@ -225,13 +215,13 @@ let
     ''
 
     else if windowManager == "kwm" then ''
-      ${kdebase}/bin/kwin &
+      ${pkgs.kdebase}/bin/kwin &
     ''
 
     else if windowManager == "compiz" then ''
       # !!! Hack: load the schemas for Compiz.
       GCONF_CONFIG_SOURCE=xml::~/.gconf ${gnome.GConf}/bin/gconftool-2 \
-        --makefile-install-rule ${compiz}/etc/gconf/schemas/*.schemas
+        --makefile-install-rule ${pkgs.compiz}/etc/gconf/schemas/*.schemas
 
       # !!! Hack: turn on most Compiz modules.
       ${gnome.GConf}/bin/gconftool-2 -t list --list-type=string \
@@ -239,9 +229,9 @@ let
         [gconf,png,decoration,wobbly,fade,minimize,move,resize,cube,switcher,rotate,place,scale,water]
 
       # Start Compiz and the GTK-style window decorator.
-      env LD_LIBRARY_PATH=${libX11}/lib:${libXext}/lib:/usr/lib/
-      ${compiz}/bin/compiz gconf ${renderingFlag}&
-      ${compiz}/bin/gtk-window-decorator --sync &
+      env LD_LIBRARY_PATH=${xorg.libX11}/lib:${xorg.libXext}/lib:/usr/lib/
+      ${pkgs.compiz}/bin/compiz gconf ${renderingFlag}&
+      ${pkgs.compiz}/bin/gtk-window-decorator --sync &
     ''
     
     else if windowManager == "none" then ''
@@ -256,7 +246,7 @@ let
     ${if sessionType != "kde" then ''
     
       if test -e $HOME/.background-image; then
-        ${feh}/bin/feh --bg-scale $HOME/.background-image
+        ${pkgs.feh}/bin/feh --bg-scale $HOME/.background-image
       fi
       
     '' else ""}
@@ -266,10 +256,10 @@ let
     ${if sessionType == "kde" then ''
 
       # Start KDE.
-      export KDEDIRS=$HOME/.nix-profile:/nix/var/nix/profiles/default:${kdebase}:${kdelibs}
-      export XDG_CONFIG_DIRS=${kdebase}/etc/xdg:${kdelibs}/etc/xdg
-      export XDG_DATA_DIRS=${kdebase}/share
-      exec ${kdebase}/bin/startkde
+      export KDEDIRS=$HOME/.nix-profile:/nix/var/nix/profiles/default:${pkgs.kdebase}:${pkgs.kdelibs}
+      export XDG_CONFIG_DIRS=${pkgs.kdebase}/etc/xdg:${pkgs.kdelibs}/etc/xdg
+      export XDG_DATA_DIRS=${pkgs.kdebase}/share
+      exec ${pkgs.kdebase}/bin/startkde
 
     '' else ''
 
@@ -290,14 +280,14 @@ let
     "-logverbose"
     "-verbose"
     "-terminate"
-    "-logfile" "/var/log/X.${toString display}.log"
+    "-logfile" "/var/log/X.${toString cfg.display}.log"
     "-config ${configFile}"
-    ":${toString display}" "vt${toString tty}"
-    "-xkbdir" "${xkeyboard_config}/etc/X11/xkb"
+    ":${toString cfg.display}" "vt${toString cfg.tty}"
+    "-xkbdir" "${pkgs.xkeyboard_config}/etc/X11/xkb"
   ] ++ optional (!config.services.xserver.tcpEnable) "-nolisten tcp";
 
   
-  slimConfig = writeText "slim.cfg" ''
+  slimConfig = pkgs.writeText "slim.cfg" ''
     xauth_path ${xorg.xauth}/bin/xauth
     default_xserver ${xorg.xorgserver}/bin/X
     xserver_arguments ${toString xserverArgs}
@@ -317,7 +307,7 @@ let
           ln -s * default
         '';
       };
-    in if cfg.slim.theme == null then "${slim}/share/slim/themes" else unpackedTheme;       
+    in if cfg.slim.theme == null then "${pkgs.slim}/share/slim/themes" else unpackedTheme;       
 
 
 in
@@ -331,7 +321,7 @@ rec {
     xorg.xrandr
     xorg.xrdb
     xorg.setxkbmap
-    feh
+    pkgs.feh
   ]
   ++ optional (windowManager == "twm") [
     xorg.twm
@@ -340,10 +330,10 @@ rec {
     gnome.metacity
   ]
   ++ optional (windowManager == "compiz") [
-    compiz
+    pkgs.compiz
   ]
   ++ optional (sessionType == "xterm") [
-    xterm
+    pkgs.xterm
   ]
   ++ optional (sessionType == "gnome") [
     gnome.gnometerminal
@@ -351,8 +341,8 @@ rec {
     gnome.gconfeditor
   ]
   ++ optional (sessionType == "kde") [
-    kdelibs
-    kdebase
+    pkgs.kdelibs
+    pkgs.kdebase
     xorg.iceauth # absolutely required by dcopserver
     xorg.xset # used by startkde, non-essential
   ];
@@ -360,7 +350,7 @@ rec {
 
   extraEtc =
     optional (sessionType == "kde")
-      { source = "${xkeyboard_config}/etc/X11/xkb";
+      { source = "${pkgs.xkeyboard_config}/etc/X11/xkb";
         target = "X11/xkb";
       }
     ++
@@ -377,9 +367,9 @@ rec {
     
       rm -f /var/run/opengl-driver
       ${if videoDriver == "nvidia"        
-        then "ln -sf ${nvidiaDrivers} /var/run/opengl-driver"
+        then "ln -sf ${pkgs.nvidiaDrivers} /var/run/opengl-driver"
 	else if cfg.driSupport
-        then "ln -sf ${mesa} /var/run/opengl-driver"
+        then "ln -sf ${pkgs.mesa} /var/run/opengl-driver"
         else ""
        }
 
@@ -389,18 +379,18 @@ rec {
 
     env SLIM_CFGFILE=${slimConfig}
     env SLIM_THEMESDIR=${slimThemesDir}
-    env FONTCONFIG_FILE=/etc/fonts/fonts.conf  				# !!! cleanup
-    env XKB_BINDIR=${xorg.xkbcomp}/bin         				# Needed for the Xkb extension.
-    env LD_LIBRARY_PATH=${libX11}/lib:${libXext}/lib:/usr/lib/          # related to xorg-sys-opengl - needed to load libglx for (AI)GLX support (for compiz)
+    env FONTCONFIG_FILE=/etc/fonts/fonts.conf # !!! cleanup
+    env XKB_BINDIR=${xorg.xkbcomp}/bin # Needed for the Xkb extension.
+    env LD_LIBRARY_PATH=${xorg.libX11}/lib:${xorg.libXext}/lib:/usr/lib/ # related to xorg-sys-opengl - needed to load libglx for (AI)GLX support (for compiz)
 
     ${if videoDriver == "nvidia"
-      then "env XORG_DRI_DRIVER_PATH=${nvidiaDrivers}/X11R6/lib/modules/drivers/"
+      then "env XORG_DRI_DRIVER_PATH=${pkgs.nvidiaDrivers}/X11R6/lib/modules/drivers/"
     else if cfg.driSupport
-      then "env XORG_DRI_DRIVER_PATH=${mesa}/lib/modules/dri"
+      then "env XORG_DRI_DRIVER_PATH=${pkgs.mesa}/lib/modules/dri"
       else ""
     } 
 
-    exec ${slim}/bin/slim
+    exec ${pkgs.slim}/bin/slim
   '';
   
 }
-- 
GitLab


From e9a7f80681e3005c6edfdfcdf11099d544cc515a Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 4 Jan 2008 14:24:42 +0000
Subject: [PATCH 0706/5331] * Build the Nix manual in a Nix expression instead
 of a Makefile so   that it becomes easier to include it on the CD.

svn path=/nixos/trunk/; revision=10070
---
 doc/manual/Makefile    | 22 ----------------------
 doc/manual/default.nix | 42 ++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 42 insertions(+), 22 deletions(-)
 delete mode 100644 doc/manual/Makefile
 create mode 100644 doc/manual/default.nix

diff --git a/doc/manual/Makefile b/doc/manual/Makefile
deleted file mode 100644
index 3ac2d0dcd4d..00000000000
--- a/doc/manual/Makefile
+++ /dev/null
@@ -1,22 +0,0 @@
-XMLLINT = xmllint --catalogs
-XSLTPROC = xsltproc --catalogs \
- --param section.autolabel 1 \
- --param section.label.includes.component.label 1 \
- --param html.stylesheet \'style.css\' \
- --param xref.with.number.and.title 1 \
- --param toc.section.depth 3 \
- --param admon.style \'\' \
- --param callout.graphics.extension \'.gif\'
-
-docbookxsl = $(HOME)/.nix-profile/xml/xsl/docbook
-
-manual.html: *.xml options-db.xml
-	$(XSLTPROC) --nonet --xinclude --output $@ \
-	  $(docbookxsl)/html/docbook.xsl manual.xml
-
-options-db.xml: options.xml options-to-docbook.xsl
-	xsltproc -o options-db.xml options-to-docbook.xsl options.xml 
-
-options.xml: ../../system/options.nix
-	echo '((pkgs:(pkgs.lib.optionAttrSetToDocList "" (import ../../system/options.nix {pkgs = pkgs; mkOption = pkgs.lib.mkOption; }))) (import ../../pkgs/top-level/all-packages.nix {}))' | \
-	    nix-instantiate --eval-only --xml --strict - > options.xml || (rm options.xml && false)
diff --git a/doc/manual/default.nix b/doc/manual/default.nix
new file mode 100644
index 00000000000..a42b947cd59
--- /dev/null
+++ b/doc/manual/default.nix
@@ -0,0 +1,42 @@
+let
+
+  pkgs = import ../../pkgs/top-level/all-packages.nix {};
+
+  options = builtins.toFile "options.xml" (builtins.unsafeDiscardStringContext
+    (builtins.toXML (pkgs.lib.optionAttrSetToDocList ""
+      (import ../../system/options.nix {pkgs = pkgs; mkOption = pkgs.lib.mkOption;}))));
+
+  optionsDocBook = pkgs.runCommand "options-db.xml" {} ''
+    ${pkgs.libxslt}/bin/xsltproc -o $out ${./options-to-docbook.xsl} ${options} 
+  '';
+    
+  manual = pkgs.stdenv.mkDerivation {
+    name = "nixos-manual";
+
+    sources = pkgs.lib.sourceFilesBySuffices ./. [".xml"];
+
+    buildInputs = [pkgs.libxslt];
+
+    xsltFlags = ''
+      --param section.autolabel 1
+      --param section.label.includes.component.label 1
+      --param html.stylesheet 'style.css'
+      --param xref.with.number.and.title 1
+      --param toc.section.depth 3
+      --param admon.style '''
+      --param callout.graphics.extension '.gif'
+    '';
+
+    buildCommand = ''
+      ensureDir $out
+      ln -s $sources/*.xml .
+      ln -s ${optionsDocBook} options-db.xml
+      xsltproc $xsltFlags --nonet --xinclude \
+        --output $out/manual.html \
+        ${pkgs.docbook5_xsl}/xml/xsl/docbook/html/docbook.xsl \
+        ./manual.xml
+      cp ${./style.css} $out/style.css
+    '';
+  };
+
+in manual
-- 
GitLab


From f4399a1883a1684eeb27a75cea2590422489013f Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 4 Jan 2008 15:02:31 +0000
Subject: [PATCH 0707/5331] * Option to set the Grub background image.  To  
 get the background image to work, you may need   to set NIXOS_INSTALL_GRUB=1
 when calling   nixos-rebuild to force Grub to be reinstalled   with
 splashimage support.

svn path=/nixos/trunk/; revision=10071
---
 installer/grub-menu-builder.sh | 24 +++++++++++++++++++-----
 system/options.nix             | 14 ++++++++++++++
 system/system.nix              |  5 ++---
 3 files changed, 35 insertions(+), 8 deletions(-)

diff --git a/installer/grub-menu-builder.sh b/installer/grub-menu-builder.sh
index ddcec0e93d5..779dba30c19 100644
--- a/installer/grub-menu-builder.sh
+++ b/installer/grub-menu-builder.sh
@@ -11,17 +11,30 @@ if test -z "$1"; then
     exit 1
 fi
 
+bootMount=@bootMount@
+if test -z "$bootMount"; then bootMount=/boot; fi
+
 
 target=/boot/grub/menu.lst
 tmp=$target.tmp
 
 cat > $tmp << GRUBEND
 # Automatically generated.  DO NOT EDIT THIS FILE!
-default=0
-timeout=5
+default 0
+timeout 5
 GRUBEND
 
 
+if test -n "@grubSplashImage@"; then
+    splashLocation=@grubSplashImage@
+    # !!! image in /nix/store doesn't seem to work
+    #if test -n "@copyKernels@"; then
+	cp -f $splashLocation /boot/background.xpm.gz
+	splashLocation=$bootMount/background.xpm.gz
+    #fi
+    echo "splashimage $splashLocation" >> $tmp
+fi
+
 
 addEntry() {
     local name="$1"
@@ -48,9 +61,9 @@ addEntry() {
         fi
         initrd=$initrd2
 
-        if test -n "@bootMount@"; then
-          kernel=$(echo $kernel2 | sed -e 's^/boot^@bootMount@^')
-          initrd=$(echo $initrd2 | sed -e 's^/boot^@bootMount@^')
+        if test -n "$bootMount"; then
+          kernel=$(echo $kernel2 | sed -e "s^/boot^$bootMount^")
+          initrd=$(echo $initrd2 | sed -e "s^/boot^$bootMount^")
         fi
     fi
     
@@ -62,6 +75,7 @@ addEntry() {
     fi;
 
     cat >> $tmp << GRUBEND
+
 title $name
   kernel $kernel systemConfig=$(readlink -f $path) init=$(readlink -f $path/init) $(cat $path/kernel-params)
   initrd $initrd
diff --git a/system/options.nix b/system/options.nix
index 5b441148933..e99ab54d2b0 100644
--- a/system/options.nix
+++ b/system/options.nix
@@ -220,6 +220,20 @@
       ";
     };
 
+    grubSplashImage = mkOption {
+      default = pkgs.fetchurl {
+        url = http://www.gnome-look.org/CONTENT/content-files/36909-soft-tux.xpm.gz;
+        sha256 = "14kqdx2lfqvh40h6fjjzqgff1mwk74dmbjvmqphi6azzra7z8d59";
+      };
+      example = null;
+      description = "
+        Background image used for Grub.  It must be a 640x480,
+        14-colour image in XPM format, optionally compressed with
+        <command>gzip</command> or <command>bzip2</command>.  Set to
+        <literal>null</literal> to run Grub in text mode.
+      ";
+    };
+
   };
 
 
diff --git a/system/system.nix b/system/system.nix
index 825fbf4a434..9dbfef0c0b3 100644
--- a/system/system.nix
+++ b/system/system.nix
@@ -318,9 +318,8 @@ rec {
     isExecutable = true;
     inherit (pkgs) bash;
     path = [pkgs.coreutils pkgs.gnused pkgs.gnugrep];
-    copyKernels = config.boot.copyKernels;
-    extraGrubEntries = config.boot.extraGrubEntries;
-    bootMount = config.boot.bootMount;
+    inherit (config.boot) copyKernels extraGrubEntries
+      grubSplashImage bootMount;
   };
 
 
-- 
GitLab


From f499a74998850743444bd1e32ed66acb383f3e73 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 4 Jan 2008 15:17:54 +0000
Subject: [PATCH 0708/5331] * Use cdrkit instead of cdrtools.

svn path=/nixos/trunk/; revision=10073
---
 configuration/rescue-cd.nix    | 2 +-
 helpers/make-iso9660-image.nix | 4 ++--
 helpers/make-iso9660-image.sh  | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/configuration/rescue-cd.nix b/configuration/rescue-cd.nix
index 433c137156e..6ec96175645 100644
--- a/configuration/rescue-cd.nix
+++ b/configuration/rescue-cd.nix
@@ -156,7 +156,7 @@ rec {
   # Create an ISO image containing the Grub boot loader, the kernel,
   # the initrd produced above, and the closure of the stage 2 init.
   rescueCD = import ../helpers/make-iso9660-image.nix {
-    inherit (pkgs) stdenv perl cdrtools;
+    inherit (pkgs) stdenv perl cdrkit;
     isoName = "nixos-${platform}.iso";
 
     # Single files to be copied to fixed locations on the CD.
diff --git a/helpers/make-iso9660-image.nix b/helpers/make-iso9660-image.nix
index 8bf3467b7fd..c4ddfe6bceb 100644
--- a/helpers/make-iso9660-image.nix
+++ b/helpers/make-iso9660-image.nix
@@ -1,4 +1,4 @@
-{ stdenv, perl, cdrtools
+{ stdenv, perl, cdrkit
 
   # The file name of the resulting ISO image.
 , isoName ? "cd.iso"
@@ -32,7 +32,7 @@ assert bootable -> bootImage != "";
 stdenv.mkDerivation {
   name = "iso9660-image";
   builder = ./make-iso9660-image.sh;
-  buildInputs = [perl cdrtools];
+  buildInputs = [perl cdrkit];
   inherit isoName bootable bootImage;
 
   # !!! should use XML.
diff --git a/helpers/make-iso9660-image.sh b/helpers/make-iso9660-image.sh
index 942e782dbad..5506161b051 100644
--- a/helpers/make-iso9660-image.sh
+++ b/helpers/make-iso9660-image.sh
@@ -58,7 +58,7 @@ done
 
 # !!! -f is a quick hack.
 ensureDir $out/iso
-mkisofs -r -J -o $out/iso/$isoName $bootFlags \
+genisoimage -r -J -o $out/iso/$isoName $bootFlags \
     -graft-points $graftList
 
 ensureDir $out/nix-support
-- 
GitLab


From 3abf5072ce45d8e90dc7b162f1fcf84cec20a88e Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 4 Jan 2008 16:11:12 +0000
Subject: [PATCH 0709/5331] * Installation CD: start a web browser showing the
 NixOS manual on   tty7. * Add w3m to the installation CD's path since it's
 needed for the   manual anyway.

svn path=/nixos/trunk/; revision=10074
---
 configuration/rescue-cd.nix | 25 ++++++++++++++++++++-----
 system/options.nix          | 13 +++++++++++++
 upstart-jobs/default.nix    |  5 +++--
 3 files changed, 36 insertions(+), 7 deletions(-)

diff --git a/configuration/rescue-cd.nix b/configuration/rescue-cd.nix
index 6ec96175645..5640777bada 100644
--- a/configuration/rescue-cd.nix
+++ b/configuration/rescue-cd.nix
@@ -14,6 +14,7 @@ rec {
       readOnlyRoot = true;
       # The label used to identify the installation CD.
       rootLabel = "NIXOS";
+      extraTTYs = [7 8]; # manual, rogue
     };
     
     services = {
@@ -43,6 +44,15 @@ rec {
           ";
         }
       
+        # Show the NixOS manual on tty7.
+        { name = "manual";
+          job = "
+            start on udev
+            stop on shutdown
+            respawn ${pkgs.w3m}/bin/w3m ${import ../doc/manual}/manual.html < /dev/tty7 > /dev/tty7 2>&1
+          ";
+        }
+
         # Allow the user to do something useful on tty8 while waiting
         # for the installation to finish.
         { name = "rogue";
@@ -57,6 +67,13 @@ rec {
       # And a background to go with that.
       ttyBackgrounds = {
         specificThemes = [
+          { tty = 7;
+            # Theme is GPL according to http://kde-look.org/content/show.php/Green?content=58501.
+            theme = pkgs.fetchurl {
+              url = http://www.kde-look.org/CONTENT/content-files/58501-green.tar.gz;
+              sha256 = "0sdykpziij1f3w4braq8r8nqg4lnsd7i7gi1k5d7c31m2q3b9a7r";
+            };
+          }
           { tty = 8;
             theme = pkgs.fetchurl {
               url = http://www.bootsplash.de/files/themes/Theme-GNU.tar.bz2;
@@ -86,6 +103,7 @@ rec {
       extraPackages = pkgs: [
         pkgs.vim
         pkgs.subversion # for nixos-checkout
+        pkgs.w3m # needed for the manual anyway
       ];
     };
    
@@ -99,7 +117,7 @@ rec {
 
 
   pkgs = system.pkgs;
-  
+
 
   # Since the CD is read-only, the mount points must be on disk.
   cdMountPoints = pkgs.runCommand "mount-points" {} "
@@ -176,10 +194,7 @@ rec {
       { source = pkgs.memtest86 + "/memtest.bin";
         target = "boot/memtest.bin";
       }
-      { source = pkgs.fetchurl {
-          url = http://www.gnome-look.org/CONTENT/content-files/36909-soft-tux.xpm.gz;
-          sha256 = "14kqdx2lfqvh40h6fjjzqgff1mwk74dmbjvmqphi6azzra7z8d59";
-        };
+      { source = system.config.boot.grubSplashImage;
         target = "boot/background.xpm.gz";
       }
       { source = cdMountPoints;
diff --git a/system/options.nix b/system/options.nix
index e99ab54d2b0..177d223d9f6 100644
--- a/system/options.nix
+++ b/system/options.nix
@@ -234,6 +234,19 @@
       ";
     };
 
+    extraTTYs = mkOption {
+      default = [];
+      example = [8 9];
+      description = "
+        Tty (virtual console) devices, in addition to the consoles on
+        which mingetty and syslogd run, that must be initialised.
+        Only useful if you have some program that you want to run on
+        some fixed console.  For example, the NixOS installation CD
+        opens the manual in a web browser on console 7, so it sets
+        <option>boot.extraTTYs</option> to <literal>[7]</literal>.
+      ";
+    };
+
   };
 
 
diff --git a/upstart-jobs/default.nix b/upstart-jobs/default.nix
index 24511ddb72e..6fceee08cfe 100644
--- a/upstart-jobs/default.nix
+++ b/upstart-jobs/default.nix
@@ -9,8 +9,9 @@ let
   optional = cond: service: pkgs.lib.optional cond (makeJob service);
 
   requiredTTYs =
-    (config.services.mingetty.ttys)
-    ++ [10] /* !!! sync with syslog.conf */ ;
+    config.services.mingetty.ttys
+    ++ config.boot.extraTTYs
+    ++ [config.services.syslogd.tty];
 
     
   jobs = map makeJob [
-- 
GitLab


From 56107c81b049cf6bde4cdf3c0bec590d883ce05c Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 4 Jan 2008 17:05:48 +0000
Subject: [PATCH 0710/5331] * Put some help text in /etc/issue on the CD.

svn path=/nixos/trunk/; revision=10076
---
 configuration/rescue-cd.nix |  7 ++++++
 etc/default.nix             | 48 ++++++++++++++++++++-----------------
 system/options.nix          | 16 +++++++++++++
 3 files changed, 49 insertions(+), 22 deletions(-)

diff --git a/configuration/rescue-cd.nix b/configuration/rescue-cd.nix
index 5640777bada..68e3123438a 100644
--- a/configuration/rescue-cd.nix
+++ b/configuration/rescue-cd.nix
@@ -82,6 +82,13 @@ rec {
           }
         ];
       };
+
+      mingetty = {
+        helpLine = ''
+        
+          Log in as "root" with an empty password.  Press <Alt-F7> for help.
+        '';
+      };
       
     };
 
diff --git a/etc/default.nix b/etc/default.nix
index a43bcf7fe6f..499376d1e8f 100644
--- a/etc/default.nix
+++ b/etc/default.nix
@@ -11,18 +11,17 @@ let
   # !!! ugh, these files shouldn't be created here.
     
     
-  envConf = pkgs.writeText "environment" "
+  envConf = pkgs.writeText "environment" ''
     PATH=${systemPath}/bin:${systemPath}/sbin:${pkgs.openssh}/bin
     NIX_REMOTE=daemon
-  " /* ${pkgs.openssh}/bin is a hack to get remote scp to work */;
+  '' /* ${pkgs.openssh}/bin is a hack to get remote scp to work */;
 
 
-  # Don't indent this file!
-  pamConsoleHandlers = pkgs.writeText "console.handlers" "
-console consoledevs /dev/tty[0-9][0-9]* :[0-9]\.[0-9] :[0-9]
-${pkgs.pam_console}/sbin/pam_console_apply lock logfail wait -t tty -s -c ${pamConsolePerms}
-${pkgs.pam_console}/sbin/pam_console_apply unlock logfail wait -r -t tty -s -c ${pamConsolePerms}
-";
+  pamConsoleHandlers = pkgs.writeText "console.handlers" ''
+    console consoledevs /dev/tty[0-9][0-9]* :[0-9]\.[0-9] :[0-9]
+    ${pkgs.pam_console}/sbin/pam_console_apply lock logfail wait -t tty -s -c ${pamConsolePerms}
+    ${pkgs.pam_console}/sbin/pam_console_apply unlock logfail wait -r -t tty -s -c ${pamConsolePerms}
+  '';
 
   pamConsolePerms = ./security/console.perms;
 
@@ -46,10 +45,10 @@ import ../helpers/make-etc.nix {
     }
 
     { # Hostname-to-IP mappings.
-      source = pkgs.substituteAll{
-	src = ./hosts;
-	extraHosts = config.networking.extraHosts;
-	};
+      source = pkgs.substituteAll {
+        src = ./hosts;
+        extraHosts = config.networking.extraHosts;
+      };
       target = "hosts";
     }
 
@@ -64,7 +63,12 @@ import ../helpers/make-etc.nix {
     }
 
     { # Friendly greeting on the virtual consoles.
-      source = ./issue;
+      source = pkgs.writeText "issue" ''
+      
+        ${config.services.mingetty.greetingLine}
+        ${config.services.mingetty.helpLine}
+        
+      '';
       target = "issue";
     }
 
@@ -119,14 +123,14 @@ import ../helpers/make-etc.nix {
     }
 
     { # Nix configuration.
-      source = pkgs.writeText "nix.conf" "
+      source = pkgs.writeText "nix.conf" ''
         # WARNING: this file is generated.
         build-users-group = nixbld
         build-max-jobs = ${toString (config.nix.maxJobs)}
         build-use-chroot = ${if config.nix.useChroot then "true" else "false"}
         build-chroot-dirs = /dev /proc /bin /etc
         ${config.nix.extraOptions}
-      ";
+      '';
       target = "nix.conf"; # will be symlinked from /nix/etc/nix/nix.conf in activate-configuration.sh.
     }
 
@@ -134,13 +138,13 @@ import ../helpers/make-etc.nix {
 
   # Configuration for ssmtp.
   ++ optional config.networking.defaultMailServer.directDelivery { 
-    source = let cfg = config.networking.defaultMailServer; in pkgs.writeText "ssmtp.conf" "
-mailhub=${cfg.hostName}
-${if cfg.domain != "" then "rewriteDomain=${cfg.domain}" else ""}
-UseTLS=${if cfg.useTLS then "YES" else "NO"}
-UseSTARTTLS=${if cfg.useSTARTTLS then "YES" else "NO"}
-#Debug=YES
-      ";
+    source = let cfg = config.networking.defaultMailServer; in pkgs.writeText "ssmtp.conf" ''
+      mailhub=${cfg.hostName}
+      ${if cfg.domain != "" then "rewriteDomain=${cfg.domain}" else ""}
+      UseTLS=${if cfg.useTLS then "YES" else "NO"}
+      UseSTARTTLS=${if cfg.useSTARTTLS then "YES" else "NO"}
+      #Debug=YES
+    '';
     target = "ssmtp/ssmtp.conf";
   }
     
diff --git a/system/options.nix b/system/options.nix
index 177d223d9f6..7eb54817b16 100644
--- a/system/options.nix
+++ b/system/options.nix
@@ -575,6 +575,22 @@
         ";
       };
 
+      greetingLine = mkOption {
+        default = ''<<< Welcome to NixOS (\m) - Kernel \r (\l) >>>'';
+        description = "
+          Welcome line printed by mingetty.
+        ";
+      };
+
+      helpLine = mkOption {
+        default = "";
+        description = "
+          Help line printed by mingetty below the welcome line.
+          Used by the installation CD to give some hints on
+          how to proceed.
+        ";
+      };
+
     };
 
 
-- 
GitLab


From 808f4ad7816e0aa6c571aad7e5218cd07726eea2 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Fri, 4 Jan 2008 17:06:14 +0000
Subject: [PATCH 0711/5331] LiveDVD synchronized with rescue CD.

svn path=/nixos/trunk/; revision=10077
---
 configuration/live-dvd.nix | 49 +++++++++++++++++++++++---------------
 1 file changed, 30 insertions(+), 19 deletions(-)

diff --git a/configuration/live-dvd.nix b/configuration/live-dvd.nix
index f07da3ec2fa..e876247df8c 100644
--- a/configuration/live-dvd.nix
+++ b/configuration/live-dvd.nix
@@ -198,38 +198,49 @@ rec {
       makeTarball "nixpkgs.tar.bz2" (builtins.filterSource filter /etc/nixos/nixpkgs);
 
 
-  # The configuration file for isolinux.
-  isolinuxCfg = pkgs.writeText "isolinux.cfg" "
-    default linux
-    prompt 1
-    timeout 60
-    label linux
-      kernel vmlinuz
-      append initrd=initrd ${toString (system.config.boot.kernelParams)}
-  ";
+  # The configuration file for Grub.
+  grubCfg = pkgs.writeText "menu.lst" ''
+    default 0
+    timeout 10
+    splashimage /boot/background.xpm.gz
     
+    title NixOS Installer / Rescue
+      kernel /boot/vmlinuz ${toString system.config.boot.kernelParams}
+      initrd /boot/initrd
+
+    title Memtest86+
+      kernel /boot/memtest.bin
+  '';
 
 
-  # Create an ISO image containing the isolinux boot loader, the
-  # kernel, the initrd produced above, and the closure of the stage 2
-  # init.
+  # Create an ISO image containing the Grub boot loader, the kernel,
+  # the initrd produced above, and the closure of the stage 2 init.
   rescueCD = import ../helpers/make-iso9660-image.nix {
     inherit (pkgs) stdenv perl cdrtools;
     isoName = "nixos-${platform}.iso";
 
     # Single files to be copied to fixed locations on the CD.
     contents = [
-      { source = pkgs.syslinux + "/lib/syslinux/isolinux.bin";
-        target = "isolinux/isolinux.bin";
+      { source = "${pkgs.grub}/lib/grub/i386-pc/stage2_eltorito";
+        target = "boot/grub/stage2_eltorito";
       }
-      { source = isolinuxCfg;
-        target = "isolinux/isolinux.cfg";
+      { source = grubCfg;
+        target = "boot/grub/menu.lst";
       }
       { source = pkgs.kernel + "/vmlinuz";
-        target = "isolinux/vmlinuz";
+        target = "boot/vmlinuz";
       }
       { source = system.initialRamdisk + "/initrd";
-        target = "isolinux/initrd";
+        target = "boot/initrd";
+      }
+      { source = pkgs.memtest86 + "/memtest.bin";
+        target = "boot/memtest.bin";
+      }
+      { source = pkgs.fetchurl {
+          url = http://www.gnome-look.org/CONTENT/content-files/36909-soft-tux.xpm.gz;
+          sha256 = "14kqdx2lfqvh40h6fjjzqgff1mwk74dmbjvmqphi6azzra7z8d59";
+        };
+        target = "boot/background.xpm.gz";
       }
       { source = cdMountPoints;
         target = "/";
@@ -263,7 +274,7 @@ rec {
     ];
     
     bootable = true;
-    bootImage = "isolinux/isolinux.bin";
+    bootImage = "boot/grub/stage2_eltorito";
   };
 
 
-- 
GitLab


From 7ea8d224f431c61d8dd08a0d97e8ac8162b6bbfb Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 4 Jan 2008 17:26:04 +0000
Subject: [PATCH 0712/5331] svn path=/nixos/trunk/; revision=10078

---
 configuration/rescue-cd.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/configuration/rescue-cd.nix b/configuration/rescue-cd.nix
index 68e3123438a..75da817481f 100644
--- a/configuration/rescue-cd.nix
+++ b/configuration/rescue-cd.nix
@@ -4,7 +4,7 @@
 rec {
 
   
-  nixpkgsRel = "nixpkgs-0.12pre10056";
+  nixpkgsRel = "nixpkgs-0.12pre10072";
 
 
   configuration = {
@@ -159,7 +159,7 @@ rec {
   # Get a recent copy of Nixpkgs.
   nixpkgsTarball = pkgs.fetchurl {
     url = configuration.installer.nixpkgsURL + "/" + nixpkgsRel + ".tar.bz2";
-    md5 = "a25cd6eb5e753703823fdd3ae86e9f25";
+    md5 = "6a793b877e2a4fa79827515902e1dfd8";
   };
 
 
-- 
GitLab


From af75f317a4330b550b91e86b95e049e26329e8e5 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sat, 5 Jan 2008 23:27:15 +0000
Subject: [PATCH 0713/5331] * Compatibility hack for building the ISO on Nix <=
 0.11.

svn path=/nixos/trunk/; revision=10080
---
 configuration/rescue-cd.nix | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/configuration/rescue-cd.nix b/configuration/rescue-cd.nix
index 75da817481f..755cbf0da82 100644
--- a/configuration/rescue-cd.nix
+++ b/configuration/rescue-cd.nix
@@ -49,7 +49,7 @@ rec {
           job = "
             start on udev
             stop on shutdown
-            respawn ${pkgs.w3m}/bin/w3m ${import ../doc/manual}/manual.html < /dev/tty7 > /dev/tty7 2>&1
+            respawn ${pkgs.w3m}/bin/w3m ${manual} < /dev/tty7 > /dev/tty7 2>&1
           ";
         }
 
@@ -126,6 +126,14 @@ rec {
   pkgs = system.pkgs;
 
 
+  # The NixOS manual, with a backward compatibility hack for Nix <=
+  # 0.11 (you won't get the manual).
+  manual =
+    if builtins ? unsafeDiscardStringContext
+    then "${import ../doc/manual}/manual.html"
+    else pkgs.writeText "dummy-manual" "Manual not included in this build!";
+
+
   # Since the CD is read-only, the mount points must be on disk.
   cdMountPoints = pkgs.runCommand "mount-points" {} "
     ensureDir $out
-- 
GitLab


From 9e00dfe107c727c6f4c78d89da53f67a4e1d49e7 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sun, 6 Jan 2008 00:51:07 +0000
Subject: [PATCH 0714/5331] * Add a bunch of common SATA modules to the default
 initrd.

svn path=/nixos/trunk/; revision=10083
---
 system/options.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/system/options.nix b/system/options.nix
index 7eb54817b16..c3d86fcdb34 100644
--- a/system/options.nix
+++ b/system/options.nix
@@ -137,6 +137,10 @@
       kernelModules = mkOption {
         default = [
           "ahci"
+          "sata_nv"
+          "sata_via"
+          "sata_sis"
+          "sata_uli"
           "ata_piix"
           "pata_marvell"
           "sd_mod"
-- 
GitLab


From 5a29acf6a0c5258d641d5cff47e089768bbdf287 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Sun, 6 Jan 2008 18:45:13 +0000
Subject: [PATCH 0715/5331] Added module aggregation, also changed non-root
 shell prompt colour to green

svn path=/nixos/trunk/; revision=10084
---
 configuration/live-dvd.nix | 41 ++++++++++++++++++++++++++++++++------
 etc/default.nix            |  6 ++++--
 etc/profile.sh             |  1 +
 system/system.nix          |  1 +
 4 files changed, 41 insertions(+), 8 deletions(-)

diff --git a/configuration/live-dvd.nix b/configuration/live-dvd.nix
index e876247df8c..17ffc5d6358 100644
--- a/configuration/live-dvd.nix
+++ b/configuration/live-dvd.nix
@@ -14,6 +14,7 @@ rec {
       readOnlyRoot = true;
       # The label used to identify the installation CD.
       rootLabel = "NIXOS";
+      extraTTYs = [7 8]; # manual, rogue
     };
     
     services = {
@@ -45,6 +46,15 @@ rec {
           ";
         }
       
+        # Show the NixOS manual on tty7.
+        { name = "manual";
+          job = "
+            start on udev
+            stop on shutdown
+            respawn ${pkgs.w3m}/bin/w3m ${manual} < /dev/tty7 > /dev/tty7 2>&1
+          ";
+        }
+
         # Allow the user to do something useful on tty8 while waiting
         # for the installation to finish.
         { name = "rogue";
@@ -59,6 +69,13 @@ rec {
       # And a background to go with that.
       ttyBackgrounds = {
         specificThemes = [
+          { tty = 7;
+            # Theme is GPL according to http://kde-look.org/content/show.php/Green?content=58501.
+            theme = pkgs.fetchurl {
+              url = http://www.kde-look.org/CONTENT/content-files/58501-green.tar.gz;
+              sha256 = "0sdykpziij1f3w4braq8r8nqg4lnsd7i7gi1k5d7c31m2q3b9a7r";
+            };
+          }
           { tty = 8;
             theme = pkgs.fetchurl {
               url = http://www.bootsplash.de/files/themes/Theme-GNU.tar.bz2;
@@ -67,6 +84,13 @@ rec {
           }
         ];
       };
+
+      mingetty = {
+        helpLine = ''
+        
+          Log in as "root" with an empty password.  Press <Alt-F7> for help.
+        '';
+      };
       
     };
 
@@ -151,7 +175,15 @@ rec {
 
 
   pkgs = system.pkgs;
-  
+
+
+  # The NixOS manual, with a backward compatibility hack for Nix <=
+  # 0.11 (you won't get the manual).
+  manual =
+    if builtins ? unsafeDiscardStringContext
+    then "${import ../doc/manual}/manual.html"
+    else pkgs.writeText "dummy-manual" "Manual not included in this build!";
+
 
   # Since the CD is read-only, the mount points must be on disk.
   cdMountPoints = pkgs.runCommand "mount-points" {} "
@@ -216,7 +248,7 @@ rec {
   # Create an ISO image containing the Grub boot loader, the kernel,
   # the initrd produced above, and the closure of the stage 2 init.
   rescueCD = import ../helpers/make-iso9660-image.nix {
-    inherit (pkgs) stdenv perl cdrtools;
+    inherit (pkgs) stdenv perl cdrkit;
     isoName = "nixos-${platform}.iso";
 
     # Single files to be copied to fixed locations on the CD.
@@ -236,10 +268,7 @@ rec {
       { source = pkgs.memtest86 + "/memtest.bin";
         target = "boot/memtest.bin";
       }
-      { source = pkgs.fetchurl {
-          url = http://www.gnome-look.org/CONTENT/content-files/36909-soft-tux.xpm.gz;
-          sha256 = "14kqdx2lfqvh40h6fjjzqgff1mwk74dmbjvmqphi6azzra7z8d59";
-        };
+      { source = system.config.boot.grubSplashImage;
         target = "boot/background.xpm.gz";
       }
       { source = cdMountPoints;
diff --git a/etc/default.nix b/etc/default.nix
index 499376d1e8f..6bf0b42c9e4 100644
--- a/etc/default.nix
+++ b/etc/default.nix
@@ -1,5 +1,6 @@
 { config, pkgs, upstartJobs, systemPath, wrapperDir
 , defaultShell, extraEtc, nixEnvVars
+, kernel ? null
 }:
 
 let 
@@ -25,7 +26,6 @@ let
 
   pamConsolePerms = ./security/console.perms;
 
-
 in
 
     
@@ -109,10 +109,12 @@ import ../helpers/make-etc.nix {
       source = pkgs.substituteAll {
         src = ./profile.sh;
         inherit systemPath wrapperDir;
-        inherit (pkgs) systemKernel glibc;
+        inherit (pkgs) glibc;
         timeZone = config.time.timeZone;
         defaultLocale = config.i18n.defaultLocale;
         inherit nixEnvVars;
+	systemKernel = (if kernel == null then 
+		pkgs.systemKernel else kernel);
       };
       target = "profile";
     }
diff --git a/etc/profile.sh b/etc/profile.sh
index 992f23afaba..832ea5cccb0 100644
--- a/etc/profile.sh
+++ b/etc/profile.sh
@@ -11,6 +11,7 @@ export EDITOR=nano
 
 # A nice prompt.
 PROMPT_COLOR="1;31m"
+let $UID && PROMPT_COLOR="1;32m"
 PS1="\n\[\033[$PROMPT_COLOR\][\u@\h:\w]$\[\033[0m\] "
 if test "x$TERM" == "xxterm"; then
     PS1="\033]2;\h:\u:\w\007$PS1"
diff --git a/system/system.nix b/system/system.nix
index 9dbfef0c0b3..9b655e0a495 100644
--- a/system/system.nix
+++ b/system/system.nix
@@ -172,6 +172,7 @@ rec {
   etc = import ../etc/default.nix {
     inherit config pkgs upstartJobs systemPath wrapperDir
       defaultShell nixEnvVars;
+    inherit kernel;
     extraEtc = pkgs.lib.concatLists (map (job: job.extraEtc) upstartJobs.jobs);
   };
 
-- 
GitLab


From a00f463ffa683b1f7339019df37ee7c10da47250 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 7 Jan 2008 11:24:02 +0000
Subject: [PATCH 0716/5331] * Symlink /man in /var/run/current-system/sw so
 that for   example "man bash" works.  Ideally of course all packages   should
 put their man pages under $out/share/man.

svn path=/nixos/trunk/; revision=10086
---
 system/options.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/system/options.nix b/system/options.nix
index c3d86fcdb34..3ed50ce34ff 100644
--- a/system/options.nix
+++ b/system/options.nix
@@ -1815,7 +1815,7 @@ root        ALL=(ALL) SETENV: ALL
   environment = {
 
     pathsToLink = mkOption {
-      default = ["/bin" "/sbin" "/share"];
+      default = ["/bin" "/sbin" "/share" "/man"];
       example = ["/"];
       description = "
         This allows to symlink more directories in /var/run/current-system/sw
-- 
GitLab


From fec916552c934314ba19ab9d09522d206a215d40 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 7 Jan 2008 11:46:17 +0000
Subject: [PATCH 0717/5331] * Add $prefix/info, set $INFOPATH.

svn path=/nixos/trunk/; revision=10087
---
 etc/profile.sh     | 2 ++
 system/options.nix | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/etc/profile.sh b/etc/profile.sh
index 832ea5cccb0..aa164b2de9b 100644
--- a/etc/profile.sh
+++ b/etc/profile.sh
@@ -7,6 +7,7 @@ export TZDIR=@glibc@/share/zoneinfo
 export FONTCONFIG_FILE=/etc/fonts/fonts.conf
 export LANG=@defaultLocale@
 export EDITOR=nano
+export INFOPATH=/var/run/current-system/sw/info:/var/run/current-system/sw/share/info
 
 
 # A nice prompt.
@@ -52,6 +53,7 @@ NIX_PROFILES="/nix/var/nix/profiles/default $NIX_USER_PROFILE_DIR/profile"
 
 for i in $NIX_PROFILES; do # !!! reverse
     export PATH=$i/bin:$i/sbin:$PATH
+    export INFOPATH=$i/info:$i/share/info:$INFOPATH
     export ASPELL_EXTRA_DICT_DIRS="$i/lib/aspell${ASPELL_EXTRA_DICT_DIRS:+,}$ASPELL_EXTRA_DICT_DIRS"
 done
 
diff --git a/system/options.nix b/system/options.nix
index 3ed50ce34ff..f002168ab8e 100644
--- a/system/options.nix
+++ b/system/options.nix
@@ -1815,7 +1815,7 @@ root        ALL=(ALL) SETENV: ALL
   environment = {
 
     pathsToLink = mkOption {
-      default = ["/bin" "/sbin" "/share" "/man"];
+      default = ["/bin" "/sbin" "/share" "/man" "/info"];
       example = ["/"];
       description = "
         This allows to symlink more directories in /var/run/current-system/sw
-- 
GitLab


From db4cef85a39c50b900e7c00f248908cb62b7bd79 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Mon, 7 Jan 2008 18:33:07 +0000
Subject: [PATCH 0718/5331] Added configurable Rescue CD expression. Untested.
 Testing and fixes extremely welcome.

svn path=/nixos/trunk/; revision=10090
---
 configuration/rescue-cd-configurable.nix | 308 +++++++++++++++++++++++
 1 file changed, 308 insertions(+)
 create mode 100644 configuration/rescue-cd-configurable.nix

diff --git a/configuration/rescue-cd-configurable.nix b/configuration/rescue-cd-configurable.nix
new file mode 100644
index 00000000000..3576a2cad77
--- /dev/null
+++ b/configuration/rescue-cd-configurable.nix
@@ -0,0 +1,308 @@
+/*
+platform ? __currentSystem
+lib
+*/
+args: with args;
+
+let
+	arg = name: def: lib.getAttr [name] def args;
+	platform = arg "platform" __currentSystem;
+	networkNixpkgs = arg "networkNixpkgs" "";
+	nixpkgsMd5 = arg "nixpkgsMd5" "";
+	manualEnabled = arg "manualEnabled" true;
+	rogueEnabled = arg "rogueEnabled" true;
+	ttyCount = lib.fold builtins.add 0 [
+	  (if rogueEnabled then 1 else 0)
+	  (if manualEnabled then 1 else 0)
+	];
+	sshdEnabled = arg "sshdEnabled" false;
+	fontConfigEnabled = arg "fontConfigEnabled" false;
+	sudoEnable = arg "sudoEnable" false;
+	packages = arg "packages" [];
+	includeMemtest = arg "includeMemtest" true;
+	includeStdenv = arg "includeStdenv" true;
+	includeBuildDeps = arg "includeBuildDeps" false;
+in
+
+rec {
+
+  
+  nixpkgsRel = "nixpkgs" + (if networkNixpkgs != "" then "-" + networkNixpkgs else "");
+
+
+  configuration = {
+  
+    boot = {
+      autoDetectRootDevice = true;
+      readOnlyRoot = true;
+      # The label used to identify the installation CD.
+      rootLabel = "NIXOS";
+      extraTTYs = [] ++ (lib.optional manualEnabled 7) ++
+        (lib.optional rogueEnabled 8);
+    };
+    
+    services = {
+    
+      sshd = {
+        enable = sshdEnabled;
+      };
+      
+      xserver = {
+        enable = false;
+      };
+
+      extraJobs = [
+        # Unpack the NixOS/Nixpkgs sources to /etc/nixos.
+        { name = "unpack-sources";
+          job = "
+            start on startup
+            script
+              export PATH=${pkgs.gnutar}/bin:${pkgs.bzip2}/bin:$PATH
+              mkdir -p /etc/nixos/nixos
+              tar xjf /nixos.tar.bz2 -C /etc/nixos/nixos
+              tar xjf /nixpkgs.tar.bz2 -C /etc/nixos
+              mv /etc/nixos/nixpkgs-* /etc/nixos/nixpkgs || true
+              ln -sfn ../nixpkgs/pkgs /etc/nixos/nixos/pkgs
+              chown -R root.root /etc/nixos
+            end script
+          ";
+        }] 
+	
+	++ 
+      
+        (lib.optional manualEnabled 
+        # Show the NixOS manual on tty7.
+        { name = "manual";
+          job = "
+            start on udev
+            stop on shutdown
+            respawn ${pkgs.w3m}/bin/w3m ${manual} < /dev/tty7 > /dev/tty7 2>&1
+          ";
+        })
+
+	++
+
+        (lib.optional rogueEnabled
+        # Allow the user to do something useful on tty8 while waiting
+        # for the installation to finish.
+        { name = "rogue";
+          job = "
+            start on udev
+            stop on shutdown
+            respawn ${pkgs.rogue}/bin/rogue < /dev/tty8 > /dev/tty8 2>&1
+          ";
+        })
+      ;
+
+      # And a background to go with that.
+      ttyBackgrounds = {
+        specificThemes = []
+	++
+	  (lib.optional manualEnabled
+          { tty = 7;
+            # Theme is GPL according to http://kde-look.org/content/show.php/Green?content=58501.
+            theme = pkgs.fetchurl {
+              url = http://www.kde-look.org/CONTENT/content-files/58501-green.tar.gz;
+              sha256 = "0sdykpziij1f3w4braq8r8nqg4lnsd7i7gi1k5d7c31m2q3b9a7r";
+            };
+          })
+	++
+	  (lib.optional rogueEnabled 
+          { tty = 8;
+            theme = pkgs.fetchurl {
+              url = http://www.bootsplash.de/files/themes/Theme-GNU.tar.bz2;
+              md5 = "61969309d23c631e57b0a311102ef034";
+            };
+          })
+        ;
+      };
+
+      mingetty = {
+        helpLine = ''
+        
+          Log in as "root" with an empty password. 
+        ''+(if manualEnabled then " Press <Alt-F7> for help." else "");
+      };
+      
+    };
+
+    fonts = {
+      enableFontConfig = fontConfigEnabled;
+    };
+    
+    installer = {
+      nixpkgsURL = 
+      (if networkNixpkgs != "" then http://nix.cs.uu.nl/dist/nix/ + nixpkgsRel
+        else file:///mnt/ );
+    };
+
+    security = {
+      sudo = {
+        enable = sudoEnable;
+      };
+    };
+ 
+    environment = {
+      extraPackages = pkgs: [
+        pkgs.vim
+        pkgs.subversion # for nixos-checkout
+        pkgs.w3m # needed for the manual anyway
+      ] ++ packages;
+    };
+   
+  };
+
+
+  system = import ../system/system.nix {
+    inherit configuration platform;
+    stage2Init = "/init";
+  };
+
+
+  pkgs = system.pkgs;
+
+
+  # The NixOS manual, with a backward compatibility hack for Nix <=
+  # 0.11 (you won't get the manual).
+  manual =
+    if builtins ? unsafeDiscardStringContext
+    then "${import ../doc/manual}/manual.html"
+    else pkgs.writeText "dummy-manual" "Manual not included in this build!";
+
+
+  # Since the CD is read-only, the mount points must be on disk.
+  cdMountPoints = pkgs.runCommand "mount-points" {} "
+    ensureDir $out
+    cd $out
+    mkdir proc sys tmp etc dev var mnt nix nix/var root bin
+    touch $out/${configuration.boot.rootLabel}
+  ";
+
+
+  # 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.runCommand "tarball" {inherit tarName;} "
+    ensureDir $out
+    (cd ${input} && tar cvfj $out/${tarName} . \\
+      --exclude '*~' \\
+      --exclude 'pkgs' --exclude 'result')
+  ";
+
+  makeNixPkgsTarball = tarName: input: ((pkgs.runCommand "tarball" {inherit tarName;} "
+    ensureDir $out
+    (cd ${input}/.. && tar cvfj $out/${tarName} nixpkgs \\
+      --exclude '*~' \\
+      --exclude 'result')
+  ")+"/${tarName}");
+
+
+  
+  # Put the current directory in a tarball (making sure to filter
+  # out crap like the .svn directories).
+  nixosTarball =
+    let filter = name: type:
+      let base = baseNameOf (toString name);
+      in base != ".svn" && base != "result";
+    in
+      makeTarball "nixos.tar.bz2" (builtins.filterSource filter ./..);
+
+
+  # Get a recent copy of Nixpkgs.
+  nixpkgsTarball = if networkNixpkgs != "" then  pkgs.fetchurl {
+    url = configuration.installer.nixpkgsURL + "/" + nixpkgsRel + ".tar.bz2";
+    md5 = "6a793b877e2a4fa79827515902e1dfd8";
+  } else makeNixPkgsTarball "nixpkgs.tar.bz2" /etc/nixos/nixpkgs;
+
+
+  # The configuration file for Grub.
+  grubCfg = pkgs.writeText "menu.lst" ''
+    default 0
+    timeout 10
+    splashimage /boot/background.xpm.gz
+    
+    title NixOS Installer / Rescue
+      kernel /boot/vmlinuz ${toString system.config.boot.kernelParams}
+      initrd /boot/initrd
+  ''
+  + (if includeMemtest then
+  ''
+
+    title Memtest86+
+      kernel /boot/memtest.bin
+  '' else "");
+
+
+  # Create an ISO image containing the Grub boot loader, the kernel,
+  # the initrd produced above, and the closure of the stage 2 init.
+  rescueCD = import ../helpers/make-iso9660-image.nix {
+    inherit (pkgs) stdenv perl cdrkit;
+    isoName = "nixos-${platform}.iso";
+
+    # Single files to be copied to fixed locations on the CD.
+    contents = [
+      { source = "${pkgs.grub}/lib/grub/i386-pc/stage2_eltorito";
+        target = "boot/grub/stage2_eltorito";
+      }
+      { source = grubCfg;
+        target = "boot/grub/menu.lst";
+      }
+      { source = pkgs.kernel + "/vmlinuz";
+        target = "boot/vmlinuz";
+      }
+      { source = system.initialRamdisk + "/initrd";
+        target = "boot/initrd";
+      }
+      { source = system.config.boot.grubSplashImage;
+        target = "boot/background.xpm.gz";
+      }
+      { source = cdMountPoints;
+        target = "/";
+      }
+      { source = nixosTarball + "/" + nixosTarball.tarName;
+        target = "/" + nixosTarball.tarName;
+      }
+      { source = nixpkgsTarball;
+        target = "/nixpkgs.tar.bz2";
+      }
+    ]
+    ++
+    (lib.optional includeMemtest 
+      { source = pkgs.memtest86 + "/memtest.bin";
+        target = "boot/memtest.bin";
+      }
+    )
+    ;
+
+    # Closures to be copied to the Nix store on the CD.
+    storeContents = [
+      { object = system.bootStage2;
+        symlink = "/init";
+      }
+      { object = system.system;
+        symlink = "/system";
+      }
+    ] 
+    ++
+    (lib.optional includeStdenv 
+      # To speed up the installation, provide the full stdenv.
+      { object = pkgs.stdenv;
+        symlink = "none";
+      }
+    )
+    ;
+
+    buildStoreContents = []
+    ++
+    (lib.optional includeBuildDeps
+      {
+        object = system.system.drvPath;
+	symlink = "none";
+      }
+    )
+    
+    bootable = true;
+    bootImage = "boot/grub/stage2_eltorito";
+  };
+
+}
-- 
GitLab


From 9da275c388b570c4778b80d44082f9b711481639 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 7 Jan 2008 22:24:00 +0000
Subject: [PATCH 0719/5331] * nixos-checkout: don't subscribe to the Nixpkgs
 channel anymore,   it's not really needed.  (Suggested by Cyril Romain.)

svn path=/nixos/trunk/; revision=10093
---
 installer/nixos-checkout.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/installer/nixos-checkout.sh b/installer/nixos-checkout.sh
index d5a393a7eb6..d6c3d535d83 100644
--- a/installer/nixos-checkout.sh
+++ b/installer/nixos-checkout.sh
@@ -3,8 +3,8 @@ set -x
 
 # Obtain Subversion.
 if test -z "$(type -tp svn)"; then
-    nix-channel --add http://nix.cs.uu.nl/dist/nix/channels-v3/nixpkgs-unstable
-    nix-channel --update
+    #nix-channel --add http://nix.cs.uu.nl/dist/nix/channels-v3/nixpkgs-unstable
+    #nix-channel --update
     nix-env -i subversion
 fi
 
-- 
GitLab


From c71e8dc314ad172de6d46a4fd27a349ae8b3a820 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 7 Jan 2008 22:56:16 +0000
Subject: [PATCH 0720/5331] * Load the NVIDIA kernel module automatically and
 some more cleanups.

svn path=/nixos/trunk/; revision=10095
---
 upstart-jobs/xserver.nix | 27 ++++++++++++++++++---------
 1 file changed, 18 insertions(+), 9 deletions(-)

diff --git a/upstart-jobs/xserver.nix b/upstart-jobs/xserver.nix
index b7bbaa11055..8a3547f2a9f 100644
--- a/upstart-jobs/xserver.nix
+++ b/upstart-jobs/xserver.nix
@@ -38,8 +38,8 @@ let
 
     
   modules = 
-    optional (videoDriver == "nvidia") pkgs.nvidiaDrivers ++       #make sure it first loads the nvidia libs
-    [
+    optional (videoDriver == "nvidia") pkgs.nvidiaDrivers #make sure it first loads the nvidia libs
+    ++ [
       xorg.xorgserver
       xorg.xf86inputkeyboard
       xorg.xf86inputmouse
@@ -125,7 +125,7 @@ let
 
       export modulePaths=
       for i in $(find ${toString modules} -type d); do
-        if ls $i/*.so 2> /dev/null; then
+        if ls $i/*.so* > /dev/null 2>&1; then
           modulePaths="''${modulePaths}ModulePath \"$i\"''\n"
         fi
       done
@@ -345,6 +345,9 @@ rec {
     pkgs.kdebase
     xorg.iceauth # absolutely required by dcopserver
     xorg.xset # used by startkde, non-essential
+  ]
+  ++ optional (videoDriver == "nvidia") [
+    pkgs.nvidiaDrivers
   ];
 
 
@@ -367,7 +370,11 @@ rec {
     
       rm -f /var/run/opengl-driver
       ${if videoDriver == "nvidia"        
-        then "ln -sf ${pkgs.nvidiaDrivers} /var/run/opengl-driver"
+        then ''
+          ln -sf ${pkgs.nvidiaDrivers} /var/run/opengl-driver
+          # Ideally, the nvidia driver would be somewhere where modprobe looks for it...
+          ${pkgs.module_init_tools}/sbin/insmod ${pkgs.nvidiaDrivers}/lib/nvidia.ko || true
+        ''
 	else if cfg.driSupport
         then "ln -sf ${pkgs.mesa} /var/run/opengl-driver"
         else ""
@@ -381,14 +388,16 @@ rec {
     env SLIM_THEMESDIR=${slimThemesDir}
     env FONTCONFIG_FILE=/etc/fonts/fonts.conf # !!! cleanup
     env XKB_BINDIR=${xorg.xkbcomp}/bin # Needed for the Xkb extension.
-    env LD_LIBRARY_PATH=${xorg.libX11}/lib:${xorg.libXext}/lib:/usr/lib/ # related to xorg-sys-opengl - needed to load libglx for (AI)GLX support (for compiz)
 
-    ${if videoDriver == "nvidia"
-      then "env XORG_DRI_DRIVER_PATH=${pkgs.nvidiaDrivers}/X11R6/lib/modules/drivers/"
-    else if cfg.driSupport
+    ${if videoDriver == "nvidia" 
+      then "env LD_LIBRARY_PATH=${xorg.libX11}/lib:${xorg.libXext}/lib:${pkgs.nvidiaDrivers}/lib" 
+      else ""
+    }
+
+    ${if videoDriver != "nvidia"
       then "env XORG_DRI_DRIVER_PATH=${pkgs.mesa}/lib/modules/dri"
       else ""
-    } 
+    }
 
     exec ${pkgs.slim}/bin/slim
   '';
-- 
GitLab


From a2c1282ebc8a72ce096e98727ebc11f8fa86fa3f Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 7 Jan 2008 23:12:02 +0000
Subject: [PATCH 0721/5331] * Get rid of some unnecessary xorg.conf statements.

svn path=/nixos/trunk/; revision=10096
---
 upstart-jobs/xserver.conf |  4 ----
 upstart-jobs/xserver.nix  | 25 ++++++++-----------------
 2 files changed, 8 insertions(+), 21 deletions(-)

diff --git a/upstart-jobs/xserver.conf b/upstart-jobs/xserver.conf
index e35199e8d5d..2535f194a5d 100644
--- a/upstart-jobs/xserver.conf
+++ b/upstart-jobs/xserver.conf
@@ -14,11 +14,7 @@ EndSection
 
 Section "Module"
   Load "bitmap"
-  Load "dbe"
-  Load "extmod"
-  Load "freetype"
   Load "int10"
-  Load "type1"
   Load "vbe"
   @moduleSection@
   @extraModules@
diff --git a/upstart-jobs/xserver.nix b/upstart-jobs/xserver.nix
index 8a3547f2a9f..f62f02ece6d 100644
--- a/upstart-jobs/xserver.nix
+++ b/upstart-jobs/xserver.nix
@@ -130,18 +130,18 @@ let
         fi
       done
 
+      export moduleSection=""
+      export screen=""
+      export device=""
+      export extensions=""
+
+
       #if only my gf were this dirty
       if test "${toString videoDriver}" == "nvidia"; then
-        export moduleSection='
-          Load "glx"
-          SubSection "extmod"
-            Option "omit xfree86-dga"
-          EndSubSection
-        '
-
         export screen='
           Option "AddARGBGLXVisuals" "true"
           Option "DisableGLXRootClipping" "true"
+	  Option "RandRRotation" "on"
         '
         
         export device='
@@ -153,15 +153,6 @@ let
         export extensions='
           Option "Composite" "Enable"
         '
-
-      else
-        export moduleSection='
-          Load "glx"
-          Load "dri"
-        '
-        export screen=
-        export device=
-        export extensions=
       fi
 	
       if [ "${toString videoDriver}" = i810 ]; then
@@ -230,7 +221,7 @@ let
 
       # Start Compiz and the GTK-style window decorator.
       env LD_LIBRARY_PATH=${xorg.libX11}/lib:${xorg.libXext}/lib:/usr/lib/
-      ${pkgs.compiz}/bin/compiz gconf ${renderingFlag}&
+      ${pkgs.compiz}/bin/compiz gconf ${renderingFlag} &
       ${pkgs.compiz}/bin/gtk-window-decorator --sync &
     ''
     
-- 
GitLab


From a4ff40b1582bb00e6d4835e8c9828dfd21fd7462 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Tue, 8 Jan 2008 00:16:49 +0000
Subject: [PATCH 0722/5331] Added kqemu 0666 permissions

svn path=/nixos/trunk/; revision=10097
---
 upstart-jobs/udev-rules/50-udev.rules | 1 +
 1 file changed, 1 insertion(+)

diff --git a/upstart-jobs/udev-rules/50-udev.rules b/upstart-jobs/udev-rules/50-udev.rules
index 02ce5920411..fde4e868772 100644
--- a/upstart-jobs/udev-rules/50-udev.rules
+++ b/upstart-jobs/udev-rules/50-udev.rules
@@ -41,6 +41,7 @@ KERNEL=="midiC[D0-9]*",         NAME="snd/%k", MODE="@sndMode@"
 KERNEL=="timer",                NAME="snd/%k", MODE="@sndMode@"
 KERNEL=="seq",                  NAME="snd/%k", MODE="@sndMode@"
 
+KERNEL=="kqemu",		NAME="%k", MODE="0666"
 
 # Firmware loading.
 SUBSYSTEM=="firmware", ACTION=="add", RUN+="@firmwareLoader@"
-- 
GitLab


From 020f035a5d24275f7f2a0a67e9d500ccf5a2d2bd Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Wed, 9 Jan 2008 05:36:40 +0000
Subject: [PATCH 0723/5331] Made grub-menu-builder write (hd0,0) instead of
 hd0,0

svn path=/nixos/trunk/; revision=10101
---
 installer/grub-menu-builder.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/installer/grub-menu-builder.sh b/installer/grub-menu-builder.sh
index 779dba30c19..4ad99bebb56 100644
--- a/installer/grub-menu-builder.sh
+++ b/installer/grub-menu-builder.sh
@@ -11,7 +11,7 @@ if test -z "$1"; then
     exit 1
 fi
 
-bootMount=@bootMount@
+bootMount="@bootMount@"
 if test -z "$bootMount"; then bootMount=/boot; fi
 
 
@@ -30,7 +30,7 @@ if test -n "@grubSplashImage@"; then
     # !!! image in /nix/store doesn't seem to work
     #if test -n "@copyKernels@"; then
 	cp -f $splashLocation /boot/background.xpm.gz
-	splashLocation=$bootMount/background.xpm.gz
+	splashLocation="$bootMount/background.xpm.gz"
     #fi
     echo "splashimage $splashLocation" >> $tmp
 fi
-- 
GitLab


From df0879e105e26385179686861b65e9288da17fde Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Wed, 9 Jan 2008 08:51:25 +0000
Subject: [PATCH 0724/5331] Made small bootable (qemu-tested) CD with
 rescue-cd-configurable.nix ; strangely enough it includes stdenv though.

svn path=/nixos/trunk/; revision=10102
---
 configuration/rescue-cd-configurable.nix |  4 ++--
 configuration/rescue-cd-minimal.nix      | 18 ++++++++++++++++++
 2 files changed, 20 insertions(+), 2 deletions(-)
 create mode 100644 configuration/rescue-cd-minimal.nix

diff --git a/configuration/rescue-cd-configurable.nix b/configuration/rescue-cd-configurable.nix
index 3576a2cad77..5fe4f70f0f3 100644
--- a/configuration/rescue-cd-configurable.nix
+++ b/configuration/rescue-cd-configurable.nix
@@ -212,7 +212,7 @@ rec {
   nixpkgsTarball = if networkNixpkgs != "" then  pkgs.fetchurl {
     url = configuration.installer.nixpkgsURL + "/" + nixpkgsRel + ".tar.bz2";
     md5 = "6a793b877e2a4fa79827515902e1dfd8";
-  } else makeNixPkgsTarball "nixpkgs.tar.bz2" /etc/nixos/nixpkgs;
+  } else makeNixPkgsTarball "nixpkgs.tar.bz2" "/etc/nixos/nixpkgs";
 
 
   # The configuration file for Grub.
@@ -299,7 +299,7 @@ rec {
         object = system.system.drvPath;
 	symlink = "none";
       }
-    )
+    );
     
     bootable = true;
     bootImage = "boot/grub/stage2_eltorito";
diff --git a/configuration/rescue-cd-minimal.nix b/configuration/rescue-cd-minimal.nix
new file mode 100644
index 00000000000..c96e651cb53
--- /dev/null
+++ b/configuration/rescue-cd-minimal.nix
@@ -0,0 +1,18 @@
+{platform ? __currentSystem} : 
+let 
+  isoFun = import ./rescue-cd-configurable.nix;
+in 
+(isoFun {
+	inherit platform;
+	lib = (import ../pkgs/lib);
+
+	networkNixpkgs = "";
+	manualEnabled = false;
+	rogueEnabled = false;
+	sshdEnabled = false;
+	fontConfigEnabled = false;
+	sudoEnable = false;
+	includeMemtest = false;
+	includeStdenv = false;
+	includeBuildDeps = false;
+}).rescueCD
-- 
GitLab


From fb92b4666da82e5f15ce9d762be051d07c380b2d Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Wed, 9 Jan 2008 14:33:41 +0000
Subject: [PATCH 0725/5331] Fixed some bugs in rescue-cd-configurable, fixed
 live-dvd. Tested: QEmu + kQemu + no networking installs OK

svn path=/nixos/trunk/; revision=10104
---
 configuration/live-dvd.nix               | 387 +++++------------------
 configuration/rescue-cd-configurable.nix |  11 +-
 2 files changed, 84 insertions(+), 314 deletions(-)

diff --git a/configuration/live-dvd.nix b/configuration/live-dvd.nix
index 17ffc5d6358..df644a522ca 100644
--- a/configuration/live-dvd.nix
+++ b/configuration/live-dvd.nix
@@ -1,310 +1,77 @@
-{ platform ? __currentSystem
-}:
-
-rec {
-
-  
-  nixpkgsRel = "nixpkgs";
-
-
-  configuration = {
-  
-    boot = {
-      autoDetectRootDevice = true;
-      readOnlyRoot = true;
-      # The label used to identify the installation CD.
-      rootLabel = "NIXOS";
-      extraTTYs = [7 8]; # manual, rogue
-    };
-    
-    services = {
-    
-      sshd = {
-        enable = false;
-      };
-      
-      xserver = {
-        enable = false;
-      };
-
-      extraJobs = [
-        # Unpack the NixOS/Nixpkgs sources to /etc/nixos.
-        { name = "unpack-sources";
-          job = "
-            start on startup
-            script
-              export PATH=${pkgs.gnutar}/bin:${pkgs.bzip2}/bin:$PATH
-              mkdir -p /etc/nixos/nixos
-              tar xjf /nixos.tar.bz2 -C /etc/nixos/nixos
-              mkdir -p /etc/nixos/nixpkgs
-              tar xjf /nixpkgs.tar.bz2 -C /etc/nixos/nixpkgs
-              mv /etc/nixos/nixpkgs-* /etc/nixos/nixpkgs || test -e /etc/nixos/nixpkgs
-              ln -sfn ../nixpkgs/pkgs /etc/nixos/nixos/pkgs
-              chown -R root.root /etc/nixos
-	      touch /etc/resolv.conf
-            end script
-          ";
-        }
-      
-        # Show the NixOS manual on tty7.
-        { name = "manual";
-          job = "
-            start on udev
-            stop on shutdown
-            respawn ${pkgs.w3m}/bin/w3m ${manual} < /dev/tty7 > /dev/tty7 2>&1
-          ";
-        }
-
-        # Allow the user to do something useful on tty8 while waiting
-        # for the installation to finish.
-        { name = "rogue";
-          job = "
-            start on udev
-            stop on shutdown
-            respawn ${pkgs.rogue}/bin/rogue < /dev/tty8 > /dev/tty8 2>&1
-          ";
-        }
-      ];
-
-      # And a background to go with that.
-      ttyBackgrounds = {
-        specificThemes = [
-          { tty = 7;
-            # Theme is GPL according to http://kde-look.org/content/show.php/Green?content=58501.
-            theme = pkgs.fetchurl {
-              url = http://www.kde-look.org/CONTENT/content-files/58501-green.tar.gz;
-              sha256 = "0sdykpziij1f3w4braq8r8nqg4lnsd7i7gi1k5d7c31m2q3b9a7r";
-            };
-          }
-          { tty = 8;
-            theme = pkgs.fetchurl {
-              url = http://www.bootsplash.de/files/themes/Theme-GNU.tar.bz2;
-              md5 = "61969309d23c631e57b0a311102ef034";
-            };
-          }
-        ];
-      };
-
-      mingetty = {
-        helpLine = ''
-        
-          Log in as "root" with an empty password.  Press <Alt-F7> for help.
-        '';
-      };
-      
-    };
-
-    fonts = {
-      enableFontConfig = true;
-    };
-    
-    installer = {
-      manifests = [ file:///mnt/MANIFEST ];
-      nixpkgsURL = file:///mnt/ ;
-    };
-
-    security = {
-      sudo = {
-        enable = true;
-      };
-    };
- 
-    environment = {
-      extraPackages = pkgs: [
-	pkgs.irssi
-	pkgs.elinks
-	pkgs.ltrace
-	pkgs.subversion
-        pkgs.which
-	pkgs.file
-	pkgs.zip
-	pkgs.unzip
-	pkgs.unrar
-	pkgs.usbutils
-	pkgs.bc
-	pkgs.cpio
-	pkgs.ncat
-	pkgs.patch
-	pkgs.fuse
-	pkgs.indent
-	pkgs.zsh
-	pkgs.hddtemp
-	pkgs.hdparm
-	pkgs.sdparm
-	pkgs.sqlite
-	pkgs.wpa_supplicant
-	pkgs.lynx
-	pkgs.db4
-	pkgs.rogue
-	pkgs.attr
-	pkgs.acl
-	pkgs.automake
-	pkgs.autoconf
-	pkgs.libtool
-	pkgs.gnupg
-	pkgs.openssl
-	pkgs.units
-	pkgs.gnumake
-	pkgs.manpages
-	pkgs.cabextract
-	pkgs.upstartJobControl
-	pkgs.fpc
-	pkgs.python
-	pkgs.perl
-	pkgs.lftp
-	pkgs.wget
-	pkgs.guile
-	pkgs.utillinuxCurses
-	pkgs.emacs
-	pkgs.iproute
-	pkgs.MPlayer
-	pkgs.diffutils
-	pkgs.pciutils
-	pkgs.lsof
-	pkgs.vim
-      ];
-    };
-   
-  };
-
-
-  system = import ../system/system.nix {
-    inherit configuration platform;
-    stage2Init = "/init";
-  };
-
-
-  pkgs = system.pkgs;
-
-
-  # The NixOS manual, with a backward compatibility hack for Nix <=
-  # 0.11 (you won't get the manual).
-  manual =
-    if builtins ? unsafeDiscardStringContext
-    then "${import ../doc/manual}/manual.html"
-    else pkgs.writeText "dummy-manual" "Manual not included in this build!";
-
-
-  # Since the CD is read-only, the mount points must be on disk.
-  cdMountPoints = pkgs.runCommand "mount-points" {} "
-    ensureDir $out
-    cd $out
-    mkdir proc sys tmp etc dev var mnt nix nix/var root bin
-    touch $out/${configuration.boot.rootLabel}
-  ";
-
-
-  # 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.runCommand "tarball" {inherit tarName;} "
-    ensureDir $out
-    (cd ${input} && tar cvfj $out/${tarName} . \\
-      --exclude '*~' \\
-      --exclude 'result')
-  ";
-  makeTarballNixos = tarName: input: pkgs.runCommand "tarball" {inherit tarName;} "
-    ensureDir $out
-    (cd ${input} && tar cvfj $out/${tarName} . \\
-      --exclude '*~' \\
-      --exclude 'pkgs' --exclude 'result')
-  ";
-
-  
-  # Put the current directory in a tarball (making sure to filter
-  # out crap like the .svn directories).
-  nixosTarball =
-    let filter = name: type:
-      let base = baseNameOf (toString name);
-      in base != "result";
-    in
-      makeTarballNixos "nixos.tar.bz2" (builtins.filterSource filter ./..);
-
-
-  # Get a recent copy of Nixpkgs.
-  nixpkgsTarball = /* /root/nixpkgs.tar.bz2; */
-    let filter = name: type:
-      let base = baseNameOf (toString name);
-      in base != "result";
-    in
-      makeTarball "nixpkgs.tar.bz2" (builtins.filterSource filter /etc/nixos/nixpkgs);
-
-
-  # The configuration file for Grub.
-  grubCfg = pkgs.writeText "menu.lst" ''
-    default 0
-    timeout 10
-    splashimage /boot/background.xpm.gz
-    
-    title NixOS Installer / Rescue
-      kernel /boot/vmlinuz ${toString system.config.boot.kernelParams}
-      initrd /boot/initrd
-
-    title Memtest86+
-      kernel /boot/memtest.bin
-  '';
-
-
-  # Create an ISO image containing the Grub boot loader, the kernel,
-  # the initrd produced above, and the closure of the stage 2 init.
-  rescueCD = import ../helpers/make-iso9660-image.nix {
-    inherit (pkgs) stdenv perl cdrkit;
-    isoName = "nixos-${platform}.iso";
-
-    # Single files to be copied to fixed locations on the CD.
-    contents = [
-      { source = "${pkgs.grub}/lib/grub/i386-pc/stage2_eltorito";
-        target = "boot/grub/stage2_eltorito";
-      }
-      { source = grubCfg;
-        target = "boot/grub/menu.lst";
-      }
-      { source = pkgs.kernel + "/vmlinuz";
-        target = "boot/vmlinuz";
-      }
-      { source = system.initialRamdisk + "/initrd";
-        target = "boot/initrd";
-      }
-      { source = pkgs.memtest86 + "/memtest.bin";
-        target = "boot/memtest.bin";
-      }
-      { source = system.config.boot.grubSplashImage;
-        target = "boot/background.xpm.gz";
-      }
-      { source = cdMountPoints;
-        target = "/";
-      }
-      { source = nixosTarball + "/" + nixosTarball.tarName;
-        target = "/" + nixosTarball.tarName;
-      }
-      { source = nixpkgsTarball + "/" +nixpkgsTarball.tarName;
-        target = "/nixpkgs.tar.bz2";
-      }
-    ];
-
-    # Closures to be copied to the Nix store on the CD.
-    storeContents = [
-      { object = system.bootStage2;
-        symlink = "/init";
-      }
-      { object = system.system;
-        symlink = "/system";
-      }
-      # To speed up the installation, provide the full stdenv.
-      { object = pkgs.stdenv;
-        symlink = "none";
-      }
-    ];
-    buildStoreContents = [
-      {
-        object = system.system.drvPath;
-	symlink = "none";
-      }
-    ];
-    
-    bootable = true;
-    bootImage = "boot/grub/stage2_eltorito";
-  };
-
-
-}
+{platform ? __currentSystem} : 
+let 
+  isoFun = import ./rescue-cd-configurable.nix;
+in 
+(isoFun {
+	inherit platform;
+	lib = (import ../pkgs/lib);
+
+	networkNixpkgs = "";
+	manualEnabled = true;
+	rogueEnabled = true;
+	sshdEnabled = true;
+	fontConfigEnabled = true;
+	sudoEnable = true;
+	includeMemtest = true;
+	includeStdenv = true;
+	includeBuildDeps = true;
+
+	kernel = pkgs: (
+		pkgs.module_aggregation 
+		[pkgs.kernel]
+	);
+
+	packages = pkgs : [
+		pkgs.irssi
+		pkgs.elinks
+		pkgs.ltrace
+		pkgs.subversion
+		pkgs.which
+		pkgs.file
+		pkgs.zip
+		pkgs.unzip
+		pkgs.unrar
+		pkgs.usbutils
+		pkgs.bc
+		pkgs.cpio
+		pkgs.ncat
+		pkgs.patch
+		pkgs.fuse
+		pkgs.indent
+		pkgs.zsh
+		pkgs.hddtemp
+		pkgs.hdparm
+		pkgs.sdparm
+		pkgs.sqlite
+		pkgs.wpa_supplicant
+		pkgs.lynx
+		pkgs.db4
+		pkgs.rogue
+		pkgs.attr
+		pkgs.acl
+		pkgs.automake
+		pkgs.autoconf
+		pkgs.libtool
+		pkgs.gnupg
+		pkgs.openssl
+		pkgs.units
+		pkgs.gnumake
+		pkgs.manpages
+		pkgs.cabextract
+		pkgs.upstartJobControl
+		pkgs.fpc
+		pkgs.python
+		pkgs.perl
+		pkgs.lftp
+		pkgs.wget
+		pkgs.guile
+		pkgs.utillinuxCurses
+		pkgs.emacs
+		pkgs.iproute
+		pkgs.MPlayer
+		pkgs.diffutils
+		pkgs.pciutils
+		pkgs.lsof
+		pkgs.vimHugeX
+	];
+}).rescueCD
diff --git a/configuration/rescue-cd-configurable.nix b/configuration/rescue-cd-configurable.nix
index 5fe4f70f0f3..753a1b2ccbc 100644
--- a/configuration/rescue-cd-configurable.nix
+++ b/configuration/rescue-cd-configurable.nix
@@ -18,10 +18,11 @@ let
 	sshdEnabled = arg "sshdEnabled" false;
 	fontConfigEnabled = arg "fontConfigEnabled" false;
 	sudoEnable = arg "sudoEnable" false;
-	packages = arg "packages" [];
+	packages = arg "packages" (pkgs : []);
 	includeMemtest = arg "includeMemtest" true;
 	includeStdenv = arg "includeStdenv" true;
 	includeBuildDeps = arg "includeBuildDeps" false;
+	kernel = arg "kernel" (pkgs : pkgs.kernel);
 in
 
 rec {
@@ -39,6 +40,7 @@ rec {
       rootLabel = "NIXOS";
       extraTTYs = [] ++ (lib.optional manualEnabled 7) ++
         (lib.optional rogueEnabled 8);
+      inherit kernel;
     };
     
     services = {
@@ -64,6 +66,7 @@ rec {
               mv /etc/nixos/nixpkgs-* /etc/nixos/nixpkgs || true
               ln -sfn ../nixpkgs/pkgs /etc/nixos/nixos/pkgs
               chown -R root.root /etc/nixos
+	      touch /etc/resolv.conf
             end script
           ";
         }] 
@@ -147,7 +150,7 @@ rec {
         pkgs.vim
         pkgs.subversion # for nixos-checkout
         pkgs.w3m # needed for the manual anyway
-      ] ++ packages;
+      ] ++ (packages pkgs);
     };
    
   };
@@ -216,7 +219,7 @@ rec {
 
 
   # The configuration file for Grub.
-  grubCfg = pkgs.writeText "menu.lst" ''
+  grubCfg = pkgs.writeText "menu.lst" (''
     default 0
     timeout 10
     splashimage /boot/background.xpm.gz
@@ -230,7 +233,7 @@ rec {
 
     title Memtest86+
       kernel /boot/memtest.bin
-  '' else "");
+  '' else ""));
 
 
   # Create an ISO image containing the Grub boot loader, the kernel,
-- 
GitLab


From f667e947529239f5b748d2e695ba299eac7c7494 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Wed, 9 Jan 2008 16:08:15 +0000
Subject: [PATCH 0726/5331] Now configuration.nix is copied into shared.

svn path=/nixos/trunk/; revision=10105
---
 default.nix       | 3 ++-
 system/system.nix | 6 +++++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/default.nix b/default.nix
index 09c9a1569d8..481202b75ca 100644
--- a/default.nix
+++ b/default.nix
@@ -4,7 +4,8 @@ let
     let env = builtins.getEnv "NIXOS_CONFIG"; in
     if env == "" then /etc/nixos/configuration.nix else env;
 
-  system = import system/system.nix {configuration = import configFileName;};
+  system = import system/system.nix {configuration = import configFileName; 
+    inherit configFileName; };
 
 in
 
diff --git a/system/system.nix b/system/system.nix
index 9b655e0a495..d159458701f 100644
--- a/system/system.nix
+++ b/system/system.nix
@@ -1,6 +1,7 @@
 { platform ? __currentSystem
 , stage2Init ? ""
 , configuration
+, configFileName ? ""
 }:
 
 rec {
@@ -246,7 +247,10 @@ rec {
   ++ pkgs.lib.optional (config.networking.defaultMailServer.directDelivery) pkgs.ssmtp
   ++ pkgs.lib.concatLists (map (job: job.extraPath) upstartJobs.jobs)
   ++ (config.environment.extraPackages) pkgs
-  ++ pkgs.lib.optional (config.fonts.enableFontDir) fontDir;
+  ++ pkgs.lib.optional (config.fonts.enableFontDir) fontDir
+  ++ pkgs.lib.optional (configFileName != "" ) 
+    (pkgs.runCommand "configuration" {} '' mkdir -p $out/share && cp "${configFileName}" $out/share/configuration.nix '')
+  ;
 
 
   # We don't want to put all of `startPath' and `path' in $PATH, since
-- 
GitLab


From 99a2f550c05e115b050d11d95b5c7a5ff7fed044 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Thu, 10 Jan 2008 04:43:19 +0000
Subject: [PATCH 0727/5331] Modifications to grub-menu-builder: copy default
 kernel and initrd to /boot/nixos-.. , limit menu size

svn path=/nixos/trunk/; revision=10106
---
 installer/grub-menu-builder.sh | 16 ++++++++++++++++
 system/options.nix             |  9 +++++++++
 system/system.nix              |  2 +-
 3 files changed, 26 insertions(+), 1 deletion(-)

diff --git a/installer/grub-menu-builder.sh b/installer/grub-menu-builder.sh
index 4ad99bebb56..6b5614e9a57 100644
--- a/installer/grub-menu-builder.sh
+++ b/installer/grub-menu-builder.sh
@@ -35,12 +35,18 @@ if test -n "@grubSplashImage@"; then
     echo "splashimage $splashLocation" >> $tmp
 fi
 
+configurationCounter=0;
 
 addEntry() {
     local name="$1"
     local path="$2"
     local shortSuffix="$3"
 
+    configurationCounter=$((configurationCounter + 1))
+    if test $configurationCounter -gt @configurationLimit@ ; then
+	    return
+    fi;
+
     if ! test -e $path/kernel -a -e $path/initrd; then
         return
     fi
@@ -48,6 +54,16 @@ addEntry() {
     local kernel=$(readlink -f $path/kernel)
     local initrd=$(readlink -f $path/initrd)
 
+    if test "$path" = "$default"; then
+	    cp "$kernel" /boot/nixos-kernel
+	    cp "$initrd" /boot/nixos-initrd
+	    cp "$(readlink -f "$path/init")" /boot/nixos-init
+	    cat > /boot/nixos-grub-config <<EOF
+	kernel ${bootMount:-/boot}/nixos-kernel systemConfig=$(readlink -f "$path") init=${bootMount:-/boot}/nixos-init $(cat "$path/kernel-params")
+	initrd ${bootMount:-/boot}/nixos-initrd
+EOF
+    fi
+
     if test -n "@copyKernels@"; then
         local kernel2=/boot/kernels/$(echo $kernel | sed 's^/^-^g')
         if ! test -e $kernel2; then
diff --git a/system/options.nix b/system/options.nix
index f002168ab8e..8275db54af9 100644
--- a/system/options.nix
+++ b/system/options.nix
@@ -251,6 +251,15 @@
       ";
     };
 
+    configurationLimit = mkOption {
+      default = 100;
+      example = 120;
+      description = "
+        Maximum of configurations in boot menu. GRUB has problems when
+	there are too many entries.
+      ";
+    };
+
   };
 
 
diff --git a/system/system.nix b/system/system.nix
index d159458701f..a1ceb345ccd 100644
--- a/system/system.nix
+++ b/system/system.nix
@@ -324,7 +324,7 @@ rec {
     inherit (pkgs) bash;
     path = [pkgs.coreutils pkgs.gnused pkgs.gnugrep];
     inherit (config.boot) copyKernels extraGrubEntries
-      grubSplashImage bootMount;
+      grubSplashImage bootMount configurationLimit;
   };
 
 
-- 
GitLab


From ad2ecc2cb565a89b38ef437a441206851b5587a9 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Thu, 10 Jan 2008 05:50:58 +0000
Subject: [PATCH 0728/5331] Changed GRUB failure backups a bit after testing

svn path=/nixos/trunk/; revision=10108
---
 installer/grub-menu-builder.sh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/installer/grub-menu-builder.sh b/installer/grub-menu-builder.sh
index 6b5614e9a57..f24e1085e06 100644
--- a/installer/grub-menu-builder.sh
+++ b/installer/grub-menu-builder.sh
@@ -59,7 +59,8 @@ addEntry() {
 	    cp "$initrd" /boot/nixos-initrd
 	    cp "$(readlink -f "$path/init")" /boot/nixos-init
 	    cat > /boot/nixos-grub-config <<EOF
-	kernel ${bootMount:-/boot}/nixos-kernel systemConfig=$(readlink -f "$path") init=${bootMount:-/boot}/nixos-init $(cat "$path/kernel-params")
+	title Emergency boot
+	kernel ${bootMount:-/boot}/nixos-kernel systemConfig=$(readlink -f "$path") init=/boot/nixos-init $(cat "$path/kernel-params")
 	initrd ${bootMount:-/boot}/nixos-initrd
 EOF
     fi
-- 
GitLab


From 8eeb6a0a91fcd92a408fa92cd334436db201fe29 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Thu, 10 Jan 2008 12:28:01 +0000
Subject: [PATCH 0729/5331] 'As GRUB limit on x86 is probably 191 entries, make
 sure we don't get more than 190 (one for safety)'

svn path=/nixos/trunk/; revision=10110
---
 installer/grub-menu-builder.sh | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/installer/grub-menu-builder.sh b/installer/grub-menu-builder.sh
index f24e1085e06..7d0e241e526 100644
--- a/installer/grub-menu-builder.sh
+++ b/installer/grub-menu-builder.sh
@@ -35,7 +35,15 @@ if test -n "@grubSplashImage@"; then
     echo "splashimage $splashLocation" >> $tmp
 fi
 
-configurationCounter=0;
+configurationCounter=0
+configurationLimit="@configurationLimit@"
+numAlienEntries=$(cat <<EOF | egrep '^[[:space:]]*title' | wc -l
+@extraGrubEntries@
+EOF)
+
+if test $((configurationLimit+numAlienEntries)) -gt 190; then
+	configurationLimit=$((190-numAlienEntries));
+fi
 
 addEntry() {
     local name="$1"
-- 
GitLab


From a11779f912d08961beb9cffdacee4997ccbf8ca0 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Fri, 11 Jan 2008 06:36:15 +0000
Subject: [PATCH 0730/5331] Gw6c now can be configured not to start
 automatically

svn path=/nixos/trunk/; revision=10116
---
 configuration/live-dvd-X.nix | 77 ++++++++++++++++++++++++++++++++++++
 system/options.nix           |  8 ++++
 upstart-jobs/gw6c.nix        |  2 +-
 3 files changed, 86 insertions(+), 1 deletion(-)
 create mode 100644 configuration/live-dvd-X.nix

diff --git a/configuration/live-dvd-X.nix b/configuration/live-dvd-X.nix
new file mode 100644
index 00000000000..df644a522ca
--- /dev/null
+++ b/configuration/live-dvd-X.nix
@@ -0,0 +1,77 @@
+{platform ? __currentSystem} : 
+let 
+  isoFun = import ./rescue-cd-configurable.nix;
+in 
+(isoFun {
+	inherit platform;
+	lib = (import ../pkgs/lib);
+
+	networkNixpkgs = "";
+	manualEnabled = true;
+	rogueEnabled = true;
+	sshdEnabled = true;
+	fontConfigEnabled = true;
+	sudoEnable = true;
+	includeMemtest = true;
+	includeStdenv = true;
+	includeBuildDeps = true;
+
+	kernel = pkgs: (
+		pkgs.module_aggregation 
+		[pkgs.kernel]
+	);
+
+	packages = pkgs : [
+		pkgs.irssi
+		pkgs.elinks
+		pkgs.ltrace
+		pkgs.subversion
+		pkgs.which
+		pkgs.file
+		pkgs.zip
+		pkgs.unzip
+		pkgs.unrar
+		pkgs.usbutils
+		pkgs.bc
+		pkgs.cpio
+		pkgs.ncat
+		pkgs.patch
+		pkgs.fuse
+		pkgs.indent
+		pkgs.zsh
+		pkgs.hddtemp
+		pkgs.hdparm
+		pkgs.sdparm
+		pkgs.sqlite
+		pkgs.wpa_supplicant
+		pkgs.lynx
+		pkgs.db4
+		pkgs.rogue
+		pkgs.attr
+		pkgs.acl
+		pkgs.automake
+		pkgs.autoconf
+		pkgs.libtool
+		pkgs.gnupg
+		pkgs.openssl
+		pkgs.units
+		pkgs.gnumake
+		pkgs.manpages
+		pkgs.cabextract
+		pkgs.upstartJobControl
+		pkgs.fpc
+		pkgs.python
+		pkgs.perl
+		pkgs.lftp
+		pkgs.wget
+		pkgs.guile
+		pkgs.utillinuxCurses
+		pkgs.emacs
+		pkgs.iproute
+		pkgs.MPlayer
+		pkgs.diffutils
+		pkgs.pciutils
+		pkgs.lsof
+		pkgs.vimHugeX
+	];
+}).rescueCD
diff --git a/system/options.nix b/system/options.nix
index 8275db54af9..ad98359ab14 100644
--- a/system/options.nix
+++ b/system/options.nix
@@ -1280,6 +1280,14 @@
         ";
       };
 
+      autorun = mkOption {
+        default = true;
+	description = "
+	  Switch to false to create upstart-job and configuration, 
+	  but not run it automatically
+	";
+      };
+
       username = mkOption {
         default = "";
         description = "
diff --git a/upstart-jobs/gw6c.nix b/upstart-jobs/gw6c.nix
index 416bcd91841..6f2a7db3027 100644
--- a/upstart-jobs/gw6c.nix
+++ b/upstart-jobs/gw6c.nix
@@ -20,7 +20,7 @@ in
 	job = "
 description \"Gateway6 client\"
 
-start on network-interfaces/started
+start on ${ if cfg.autorun then "network-interfaces/started" else "never" }
 stop on network-interfaces/stop
 
 respawn ${gw6cService}/bin/control start
-- 
GitLab


From 4475a74fb8a6142a495cc97edc340dd81078eb4c Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Fri, 11 Jan 2008 16:59:39 +0000
Subject: [PATCH 0731/5331] LiveDVD with X and sources made.

svn path=/nixos/trunk/; revision=10119
---
 boot/boot-stage-2-init.sh                |   4 +-
 configuration/live-dvd-X-no-soft.nix     | 122 ++++++++++++++++
 configuration/live-dvd-X.nix             | 138 +++++++++++++++++-
 configuration/rescue-cd-configurable.nix | 169 ++++++++++++++++-------
 helpers/make-iso9660-image.sh            |   2 -
 system/options.nix                       |   1 +
 system/users-groups.nix                  |   2 +-
 upstart-jobs/ircd-hybrid.nix             |   3 +-
 8 files changed, 387 insertions(+), 54 deletions(-)
 create mode 100644 configuration/live-dvd-X-no-soft.nix

diff --git a/boot/boot-stage-2-init.sh b/boot/boot-stage-2-init.sh
index f6b74543d8f..9aa2aec7d9f 100644
--- a/boot/boot-stage-2-init.sh
+++ b/boot/boot-stage-2-init.sh
@@ -80,7 +80,9 @@ needWritableDir /var 0755
 needWritableDir /nix/var 0755
 needWritableDir /root 0700
 needWritableDir /bin 0755 # for the /bin/sh symlink
-
+if test -d /home ; then
+	needWritableDir /home 0777
+fi
 
 # Miscellaneous boot time cleanup.
 rm -rf /var/run
diff --git a/configuration/live-dvd-X-no-soft.nix b/configuration/live-dvd-X-no-soft.nix
new file mode 100644
index 00000000000..d9dad878fc1
--- /dev/null
+++ b/configuration/live-dvd-X-no-soft.nix
@@ -0,0 +1,122 @@
+{platform ? __currentSystem} : 
+let 
+  isoFun = import ./rescue-cd-configurable.nix;
+  xResolutions = [
+  	{ x = 2048; y = 1536; }
+	{ x = 1920; y = 1024; }
+  	{ x = 1280; y = 800; }
+  	{ x = 1024; y = 768; }
+  	{ x = 800; y = 600; }
+  	{ x = 640; y = 480; }
+  ];
+  xConfiguration = {
+	enable = true;
+	exportConfiguration = true;
+	tcpEnable = true;
+	resolutions = xResolutions;
+	sessionType = "xterm";
+	windowManager = "twm";
+	tty = "9";
+  };
+
+  theKernel = pkgs: let baseKernel=pkgs.kernel; 
+	in (pkgs.module_aggregation 
+    		[
+		baseKernel
+		(pkgs.kqemuFunCurrent baseKernel)
+		(pkgs.atherosFun {
+			kernel = baseKernel;
+			version = "r2756";
+			pci001c_rev01 = true;
+		} null)
+		]);
+
+
+in 
+(isoFun {
+	inherit platform;
+	lib = (import ../pkgs/lib);
+
+	networkNixpkgs = "";
+	manualEnabled = true;
+	rogueEnabled = true;
+	sshdEnabled = true;
+	fontConfigEnabled = true;
+	sudoEnable = true;
+	includeMemtest = true;
+	includeStdenv = true;
+	includeBuildDeps = true;
+	addUsers = ["nixos" "livecd" "livedvd" 
+		"user" "guest" "nix"];
+
+	kernel = pkgs: (
+		pkgs.module_aggregation 
+		[pkgs.kernel]
+	);
+
+	packages = pkgs : [
+		pkgs.which
+		pkgs.file
+		pkgs.zip
+		pkgs.unzip
+		pkgs.unrar
+		pkgs.db4
+		pkgs.attr
+		pkgs.acl
+		pkgs.manpages
+		pkgs.cabextract
+		pkgs.upstartJobControl
+		pkgs.utillinuxCurses
+		pkgs.emacs
+		pkgs.lsof
+		pkgs.vimHugeX
+		pkgs.firefoxWrapper
+		pkgs.xlaunch
+		pkgs.ratpoison
+		pkgs.xorg.twm
+		pkgs.xorg.xorgserver
+		pkgs.xorg.xhost
+		pkgs.xorg.xfontsel
+		pkgs.xlaunch
+		pkgs.xorg.xauth
+		pkgs.xorg.xset
+		pkgs.xterm
+		pkgs.xorg.xev
+		pkgs.xorg.xmodmap
+		pkgs.xorg.xkbcomp
+		pkgs.xorg.setxkbmap
+	];
+
+	configList = configuration : [
+	{
+		suffix = "X-vesa";
+		configuration = (configuration // 
+		{
+			boot=configuration.boot // {configurationName = "X with vesa";};
+			services = configuration.services // {
+				xserver = xConfiguration // {videoDriver = "vesa";};
+			};
+		});
+	}
+	{
+		suffix = "X-Intel";
+		configuration = (configuration // 
+		{
+			boot=configuration.boot // {configurationName = "X with Intel graphic card";};
+			services = configuration.services // {
+				xserver = xConfiguration // {videoDriver = "intel"; driSupport = true;};
+			};
+		});
+	}
+	{
+		suffix = "X-ATI";
+		configuration = (configuration // 
+		{
+			boot=configuration.boot // {configurationName = "X with ATI graphic card";};
+			services = configuration.services // {
+				xserver = xConfiguration // {videoDriver = "ati"; driSupport = true;};
+			};
+		});
+	}
+	];
+}).rescueCD
diff --git a/configuration/live-dvd-X.nix b/configuration/live-dvd-X.nix
index df644a522ca..d6de3842401 100644
--- a/configuration/live-dvd-X.nix
+++ b/configuration/live-dvd-X.nix
@@ -1,6 +1,37 @@
 {platform ? __currentSystem} : 
 let 
   isoFun = import ./rescue-cd-configurable.nix;
+  xResolutions = [
+  	{ x = 2048; y = 1536; }
+	{ x = 1920; y = 1024; }
+  	{ x = 1280; y = 800; }
+  	{ x = 1024; y = 768; }
+  	{ x = 800; y = 600; }
+  	{ x = 640; y = 480; }
+  ];
+  xConfiguration = {
+	enable = true;
+	exportConfiguration = true;
+	tcpEnable = true;
+	resolutions = xResolutions;
+	sessionType = "xterm";
+	windowManager = "twm";
+	tty = "9";
+  };
+
+  theKernel = pkgs: let baseKernel=pkgs.kernel; 
+	in (pkgs.module_aggregation 
+    		[
+		baseKernel
+		(pkgs.kqemuFunCurrent baseKernel)
+		(pkgs.atherosFun {
+			kernel = baseKernel;
+			version = "r2756";
+			pci001c_rev01 = true;
+		} null)
+		]);
+
+
 in 
 (isoFun {
 	inherit platform;
@@ -15,6 +46,8 @@ in
 	includeMemtest = true;
 	includeStdenv = true;
 	includeBuildDeps = true;
+	addUsers = ["nixos" "livecd" "livedvd" 
+		"user" "guest" "nix"];
 
 	kernel = pkgs: (
 		pkgs.module_aggregation 
@@ -23,7 +56,6 @@ in
 
 	packages = pkgs : [
 		pkgs.irssi
-		pkgs.elinks
 		pkgs.ltrace
 		pkgs.subversion
 		pkgs.which
@@ -73,5 +105,109 @@ in
 		pkgs.pciutils
 		pkgs.lsof
 		pkgs.vimHugeX
+		pkgs.xpdf
+		pkgs.ghostscript
+		pkgs.gv
+		pkgs.firefoxWrapper
+		pkgs.xlaunch
+		pkgs.wirelesstools
+		pkgs.usbutils
+		pkgs.dmidecode
+		pkgs.sdparm
+		pkgs.hdparm
+		pkgs.hddtemp
+		(theKernel pkgs)
+		pkgs.sshfsFuse
+		pkgs.ratpoison
+		pkgs.xorg.twm
+		pkgs.binutils
+		pkgs.xorg.lndir
+		pkgs.pstree
+		pkgs.psmisc
+		pkgs.aspell
+		pkgs.gettext
+		pkgs.xorg.xorgserver
+		pkgs.xorg.xsetroot
+		pkgs.xorg.xhost
+		pkgs.xorg.xwd
+		pkgs.xorg.xfontsel
+		pkgs.xorg.xwud
+		pkgs.xlaunch
+		pkgs.xsel
+		pkgs.xorg.xmessage
+		pkgs.xorg.xauth
+		pkgs.keynav
+		pkgs.xorg.xset
+		pkgs.xterm
+		pkgs.xmove
+		pkgs.xorg.xev
+		pkgs.xorg.xmodmap
+		pkgs.xorg.xkbcomp
+		pkgs.xorg.setxkbmap
+
+		/*
+		pkgs.elinks
+		pkgs.clisp
+		pkgs.djvulibre
+		pkgs.imagemagick
+		*/
+
+		/*
+		pkgs.pidgin
+		pkgs.pidginotr
+		pkgs.gdmap
+		pkgs.sox
+		pkgs.timidity
+		pkgs.xscreensaver
+		pkgs.thunderbird
+		pkgs.graphviz
+		pkgs.tetex
+		pkgs.pidginlatex
+		pkgs.openoffice
+		pkgs.wv
+		pkgs.maxima
+		pkgs.jre
+		pkgs.wine
+		pkgs.qemu
+		pkgs.qemuImage
+		pkgs.wireshark
+		pkgs.gimp
+		pkgs.audacity
+		pkgs.tightvnc
+		pkgs.bittornado
+		*/
+	];
+
+	configList = configuration : [
+	{
+		suffix = "X-vesa";
+		configuration = (configuration // 
+		{
+			boot=configuration.boot // {configurationName = "X with vesa";};
+			services = configuration.services // {
+				xserver = xConfiguration // {videoDriver = "vesa";};
+			};
+		});
+	}
+	{
+		suffix = "X-Intel";
+		configuration = (configuration // 
+		{
+			boot=configuration.boot // {configurationName = "X with Intel graphic card";};
+			services = configuration.services // {
+				xserver = xConfiguration // {videoDriver = "intel"; driSupport = true;};
+			};
+		});
+	}
+	{
+		suffix = "X-ATI";
+		configuration = (configuration // 
+		{
+			boot=configuration.boot // {configurationName = "X with ATI graphic card";};
+			services = configuration.services // {
+				xserver = xConfiguration // {videoDriver = "ati"; driSupport = true;};
+			};
+		});
+	}
 	];
 }).rescueCD
diff --git a/configuration/rescue-cd-configurable.nix b/configuration/rescue-cd-configurable.nix
index 753a1b2ccbc..987185cc85a 100644
--- a/configuration/rescue-cd-configurable.nix
+++ b/configuration/rescue-cd-configurable.nix
@@ -23,6 +23,72 @@ let
 	includeStdenv = arg "includeStdenv" true;
 	includeBuildDeps = arg "includeBuildDeps" false;
 	kernel = arg "kernel" (pkgs : pkgs.kernel);
+	addUsers = arg "addUsers" [];
+
+	/* Should return list of {configuration, suffix} attrsets.
+	{configuration=configuration; suffix=""} is always prepended.
+	*/
+	configList = arg "configList" (configuration : []); 
+in 
+let
+
+	systemPackBuilder = {suffix, configuration} : { 
+		system = (import ../system/system.nix) {
+			inherit configuration platform; /* To refactor later - x86+x86_64 DVD */
+			stage2Init = "/init"+suffix;
+		};
+		inherit suffix configuration;
+	};
+
+	systemPackGrubEntry = systemPack : (''
+
+          title NixOS Installer / Rescue ${systemPack.system.config.boot.configurationName}
+            kernel /boot/vmlinuz${systemPack.suffix} ${toString systemPack.system.config.boot.kernelParams} systemConfig=/system${systemPack.suffix}
+            initrd /boot/initrd${systemPack.suffix}
+
+	'');
+
+	systemPackInstallRootList = systemPack : [
+	      { source = systemPack.system.kernel + "/vmlinuz";
+		target = "boot/vmlinuz${systemPack.suffix}";
+	      }
+	      { source = systemPack.system.initialRamdisk + "/initrd";
+		target = "boot/initrd${systemPack.suffix}";
+	      }
+	];
+	systemPackInstallClosures = systemPack : ([
+	      { object = systemPack.system.bootStage2;
+		symlink = "/init${systemPack.suffix}";
+	      }
+	      { object = systemPack.system.system;
+		symlink = "/system${systemPack.suffix}";
+	      }
+	]
+	++
+	    (lib.optional includeStdenv 
+	      # To speed up the installation, provide the full stdenv.
+	      { object = systemPack.system.pkgs.stdenv;
+		symlink = "none";
+	      }
+	    )
+	);
+	systemPackInstallBuildClosure = systemPack : ([
+		{
+			object = systemPack.system.system.drvPath;
+			symlink = "none";
+		}
+	]);
+
+
+	userEntry = user : {
+		name = user;
+		description = "NixOS Live Disk non-root user";
+		home = "/home/${user}";
+		createHome = true;
+		group = "users";
+		extraGroups = ["wheel" "audio"];
+		shell = "/bin/sh";
+	};
 in
 
 rec {
@@ -95,6 +161,22 @@ rec {
             respawn ${pkgs.rogue}/bin/rogue < /dev/tty8 > /dev/tty8 2>&1
           ";
         })
+
+	++
+
+	(lib.optional (addUsers != [])
+	# Set empty passwords
+	{
+		name = "clear-passwords";
+		job = '' 
+                  start on startup
+                  script 
+                        for i in ${lib.concatStringsSep " " addUsers}; do
+                            echo | ${pkgs.pwdutils}/bin/passwd --stdin $i
+                        done
+                  end script
+		'';
+	})
       ;
 
       # And a background to go with that.
@@ -124,7 +206,11 @@ rec {
         helpLine = ''
         
           Log in as "root" with an empty password. 
-        ''+(if manualEnabled then " Press <Alt-F7> for help." else "");
+        ''
+	+(if addUsers != [] then '' These users also have empty passwords:
+	${lib.concatStringsSep " " addUsers }
+	'' else "")
+	+(if manualEnabled then " Press <Alt-F7> for help." else "");
       };
       
     };
@@ -152,17 +238,21 @@ rec {
         pkgs.w3m # needed for the manual anyway
       ] ++ (packages pkgs);
     };
-   
-  };
 
-
-  system = import ../system/system.nix {
-    inherit configuration platform;
-    stage2Init = "/init";
+    users = {
+      extraUsers = map userEntry addUsers;
+    };
+ 
   };
 
+  configurations = [{
+    inherit configuration;
+    suffix = "";
+  }] ++ (configList configuration);
+  systemPacks = map systemPackBuilder configurations;
 
-  pkgs = system.pkgs;
+  system = (builtins.head systemPacks).system; /* I hope this is unneeded */
+  pkgs = system.pkgs; /* Nothing non-fixed should be built from it */
 
 
   # The NixOS manual, with a backward compatibility hack for Nix <=
@@ -177,7 +267,7 @@ rec {
   cdMountPoints = pkgs.runCommand "mount-points" {} "
     ensureDir $out
     cd $out
-    mkdir proc sys tmp etc dev var mnt nix nix/var root bin
+    mkdir proc sys tmp etc dev var mnt nix nix/var root bin ${if addUsers != "" then "home" else ""}
     touch $out/${configuration.boot.rootLabel}
   ";
 
@@ -192,7 +282,7 @@ rec {
       --exclude 'pkgs' --exclude 'result')
   ";
 
-  makeNixPkgsTarball = tarName: input: ((pkgs.runCommand "tarball" {inherit tarName;} "
+  makeNixPkgsTarball = tarName: input: ((pkgs.runCommand "tarball-nixpkgs" {inherit tarName;} "
     ensureDir $out
     (cd ${input}/.. && tar cvfj $out/${tarName} nixpkgs \\
       --exclude '*~' \\
@@ -223,11 +313,8 @@ rec {
     default 0
     timeout 10
     splashimage /boot/background.xpm.gz
-    
-    title NixOS Installer / Rescue
-      kernel /boot/vmlinuz ${toString system.config.boot.kernelParams}
-      initrd /boot/initrd
-  ''
+  ''+
+  (lib.concatStrings (map systemPackGrubEntry systemPacks))
   + (if includeMemtest then
   ''
 
@@ -243,20 +330,18 @@ rec {
     isoName = "nixos-${platform}.iso";
 
     # Single files to be copied to fixed locations on the CD.
-    contents = [
+    contents = lib.uniqList {inputList =
+    [
       { source = "${pkgs.grub}/lib/grub/i386-pc/stage2_eltorito";
         target = "boot/grub/stage2_eltorito";
       }
       { source = grubCfg;
         target = "boot/grub/menu.lst";
-      }
-      { source = pkgs.kernel + "/vmlinuz";
-        target = "boot/vmlinuz";
-      }
-      { source = system.initialRamdisk + "/initrd";
-        target = "boot/initrd";
-      }
-      { source = system.config.boot.grubSplashImage;
+      }]
+      ++ 
+      (lib.concatLists (map systemPackInstallRootList systemPacks))
+      ++
+      [{ source = system.config.boot.grubSplashImage;
         target = "boot/background.xpm.gz";
       }
       { source = cdMountPoints;
@@ -275,34 +360,22 @@ rec {
         target = "boot/memtest.bin";
       }
     )
-    ;
+    ;};
 
     # Closures to be copied to the Nix store on the CD.
-    storeContents = [
-      { object = system.bootStage2;
-        symlink = "/init";
-      }
-      { object = system.system;
-        symlink = "/system";
-      }
-    ] 
-    ++
-    (lib.optional includeStdenv 
-      # To speed up the installation, provide the full stdenv.
-      { object = pkgs.stdenv;
-        symlink = "none";
-      }
-    )
-    ;
+    storeContents = lib.uniqListExt {
+    	inputList= lib.concatLists 
+		(map systemPackInstallClosures systemPacks);
+	getter = x : x.object.drvPath;
+	compare = lib.eqStrings;
+    };
 
-    buildStoreContents = []
+    buildStoreContents = lib.uniqList {inputList=([]
     ++
-    (lib.optional includeBuildDeps
-      {
-        object = system.system.drvPath;
-	symlink = "none";
-      }
-    );
+    (if includeBuildDeps then lib.concatLists 
+    	(map systemPackInstallBuildClosure systemPacks)
+	else [])
+    );};
     
     bootable = true;
     bootImage = "boot/grub/stage2_eltorito";
diff --git a/helpers/make-iso9660-image.sh b/helpers/make-iso9660-image.sh
index 5506161b051..d9bd6752d18 100644
--- a/helpers/make-iso9660-image.sh
+++ b/helpers/make-iso9660-image.sh
@@ -6,7 +6,6 @@ targets_=($targets)
 objects=($objects)
 symlinks=($symlinks)
 
-
 if test -n "$bootable"; then
 
     # The -boot-info-table option modifies the $bootImage file, so
@@ -55,7 +54,6 @@ for ((n = 0; n < ${#objects[*]}; n++)); do
     fi
 done
 
-
 # !!! -f is a quick hack.
 ensureDir $out/iso
 genisoimage -r -J -o $out/iso/$isoName $bootFlags \
diff --git a/system/options.nix b/system/options.nix
index ad98359ab14..8511e65a066 100644
--- a/system/options.nix
+++ b/system/options.nix
@@ -1685,6 +1685,7 @@ root        ALL=(ALL) SETENV: ALL
           createHome = true;
           group = "users";
           extraGroups = ["wheel"];
+	  shell = "/bin/sh";
         }
       ];
       description = "
diff --git a/system/users-groups.nix b/system/users-groups.nix
index 9235fe11c18..19a8ff9c972 100644
--- a/system/users-groups.nix
+++ b/system/users-groups.nix
@@ -82,7 +82,7 @@ rec {
 
   # Awful hackery necessary to pass the users/groups to the activation script.
   createUsersGroups = ../helpers/create-users-groups.sh;
-  usersList = pkgs.writeText "users" (pkgs.lib.concatStrings (map (u: "${u.name}\n${u.description}\n${toString u.uid}\n${u.group}\n${toString u.extraGroups}\n${u.home}\n${u.shell}\n${toString u.createHome}\n") users));
+  usersList = pkgs.writeText "users" (pkgs.lib.concatStrings (map (u: "${u.name}\n${u.description}\n${toString u.uid}\n${u.group}\n${toString (pkgs.lib.concatStringsSep "," u.extraGroups)}\n${u.home}\n${u.shell}\n${toString u.createHome}\n") users));
   groupsList = pkgs.writeText "groups" (pkgs.lib.concatStrings (map (g: "${g.name}\n${toString g.gid}\n") groups));
     
 }
diff --git a/upstart-jobs/ircd-hybrid.nix b/upstart-jobs/ircd-hybrid.nix
index 77639d95042..ce2d5ba7fca 100644
--- a/upstart-jobs/ircd-hybrid.nix
+++ b/upstart-jobs/ircd-hybrid.nix
@@ -13,7 +13,8 @@ let
 		adminEmail = cfg.adminEmail;
 		extraIPs = cfg.extraIPs;
 		extraPort = cfg.extraPort;
-		gw6cEnabled = config.services.gw6c.enable;
+		gw6cEnabled = (config.services.gw6c.enable) &&
+			(config.services.gw6c.autorun);
 	};
 
   startingDependency = if config.services.gw6c.enable then "gw6c" else "network-interfaces";
-- 
GitLab


From cfed953b5f304164a66d42e55f51d02cff793f77 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sat, 12 Jan 2008 22:53:13 +0000
Subject: [PATCH 0732/5331] * Option to enable the Intel 3945 firmware.  (It's
 enabled by   default since it doesn't seem to have the legal issues of   the
 Intel 2200 firmware.) * Firmware loader: don't write in /tmp.  Also a hack to
 quickly   test new firmwares. * Revert r10105 since the build fails if
 configuration.nix   is a symlink.  Anyway copying configuration.nix does not 
  necessarily make sense since it can import other expressions,   which would
 also have to be copied.  Perhaps a better   approach would be to write a
 serialisation of the config   to a file (maybe with builtins.toXML).

svn path=/nixos/trunk/; revision=10127
---
 default.nix                          |  3 +--
 system/options.nix                   |  8 ++++++++
 system/system.nix                    |  6 +-----
 upstart-jobs/default.nix             | 10 +++++-----
 upstart-jobs/udev-firmware-loader.sh |  6 ++++--
 5 files changed, 19 insertions(+), 14 deletions(-)

diff --git a/default.nix b/default.nix
index 481202b75ca..09c9a1569d8 100644
--- a/default.nix
+++ b/default.nix
@@ -4,8 +4,7 @@ let
     let env = builtins.getEnv "NIXOS_CONFIG"; in
     if env == "" then /etc/nixos/configuration.nix else env;
 
-  system = import system/system.nix {configuration = import configFileName; 
-    inherit configFileName; };
+  system = import system/system.nix {configuration = import configFileName;};
 
 in
 
diff --git a/system/options.nix b/system/options.nix
index 8511e65a066..bf571d56635 100644
--- a/system/options.nix
+++ b/system/options.nix
@@ -338,6 +338,14 @@
       ";
     };
 
+    enableIntel3945ABGFirmware = mkOption {
+      default = true;
+      description = "
+        This option enables automatic loading of the firmware for the Intel
+        PRO/Wireless 3945ABG.
+      ";
+    };
+
     localCommands = mkOption {
       default = "";
       example = "text=anything; echo You can put $text here.";
diff --git a/system/system.nix b/system/system.nix
index a1ceb345ccd..5b6f23749f0 100644
--- a/system/system.nix
+++ b/system/system.nix
@@ -1,7 +1,6 @@
 { platform ? __currentSystem
 , stage2Init ? ""
 , configuration
-, configFileName ? ""
 }:
 
 rec {
@@ -247,10 +246,7 @@ rec {
   ++ pkgs.lib.optional (config.networking.defaultMailServer.directDelivery) pkgs.ssmtp
   ++ pkgs.lib.concatLists (map (job: job.extraPath) upstartJobs.jobs)
   ++ (config.environment.extraPackages) pkgs
-  ++ pkgs.lib.optional (config.fonts.enableFontDir) fontDir
-  ++ pkgs.lib.optional (configFileName != "" ) 
-    (pkgs.runCommand "configuration" {} '' mkdir -p $out/share && cp "${configFileName}" $out/share/configuration.nix '')
-  ;
+  ++ pkgs.lib.optional (config.fonts.enableFontDir) fontDir;
 
 
   # We don't want to put all of `startPath' and `path' in $PATH, since
diff --git a/upstart-jobs/default.nix b/upstart-jobs/default.nix
index 6fceee08cfe..7fe6d45dfe6 100644
--- a/upstart-jobs/default.nix
+++ b/upstart-jobs/default.nix
@@ -26,12 +26,12 @@ let
       inherit (pkgs) stdenv writeText substituteAll udev procps;
       inherit (pkgs.lib) cleanSource;
       firmwareDirs =
-        pkgs.lib.optional (config.networking.enableIntel2200BGFirmware) pkgs.ipw2200fw
-	++
-	(config.services.udev.addFirmware);
+           pkgs.lib.optional config.networking.enableIntel2200BGFirmware pkgs.ipw2200fw
+        ++ pkgs.lib.optional config.networking.enableIntel3945ABGFirmware pkgs.iwlwifi3945ucode
+	++ config.services.udev.addFirmware;
       extraUdevPkgs =
-        pkgs.lib.optional (config.services.hal.enable) pkgs.hal;
-	sndMode = config.services.udev.sndMode;
+        pkgs.lib.optional config.services.hal.enable pkgs.hal;
+      sndMode = config.services.udev.sndMode;
     })
       
     # Makes LVM logical volumes available. 
diff --git a/upstart-jobs/udev-firmware-loader.sh b/upstart-jobs/udev-firmware-loader.sh
index 03f0290fd33..3592e72bb13 100755
--- a/upstart-jobs/udev-firmware-loader.sh
+++ b/upstart-jobs/udev-firmware-loader.sh
@@ -6,14 +6,16 @@ exec > /var/log/udev-fw 2>&1
 
 if test "$ACTION" = "add"; then
 
-    ls -l /sys/$DEVPATH >> /tmp/fw 2>&1
+    ls -l /sys/$DEVPATH
 
     if ! test -e /sys/$DEVPATH/loading; then
         echo "Firmware loading is not supported by device \`DEVPATH'."
         exit 1
     fi
 
-    for dir in @firmwareDirs@; do
+    # /root/test-firmware is an impure location allowing quick testing
+    # of firmwares.
+    for dir in /root/test-firmware @firmwareDirs@; do
         if test -e "$dir/$FIRMWARE"; then
             echo "Loading \`$FIRMWARE' for device \`$DEVPATH' from $dir."
             echo 1 > /sys/$DEVPATH/loading
-- 
GitLab


From 26e0f711a955f2ce105d4afa76ed18967d56fca4 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sat, 12 Jan 2008 23:37:17 +0000
Subject: [PATCH 0733/5331] * Use the aggregator to combine the kernel modules
 tree with   externally-built modules so that (e.g.) "modprobe nvidia" Just  
 Works.

svn path=/nixos/trunk/; revision=10129
---
 etc/default.nix          |  7 ++-----
 etc/profile.sh           |  2 +-
 system/modprobe          |  2 +-
 system/system.nix        | 16 +++++++++++++---
 upstart-jobs/xserver.nix |  2 --
 5 files changed, 17 insertions(+), 12 deletions(-)

diff --git a/etc/default.nix b/etc/default.nix
index 6bf0b42c9e4..d30c797c44e 100644
--- a/etc/default.nix
+++ b/etc/default.nix
@@ -1,6 +1,5 @@
 { config, pkgs, upstartJobs, systemPath, wrapperDir
-, defaultShell, extraEtc, nixEnvVars
-, kernel ? null
+, defaultShell, extraEtc, nixEnvVars, modulesTree
 }:
 
 let 
@@ -108,13 +107,11 @@ import ../helpers/make-etc.nix {
     { # Script executed when the shell starts.
       source = pkgs.substituteAll {
         src = ./profile.sh;
-        inherit systemPath wrapperDir;
+        inherit systemPath wrapperDir modulesTree;
         inherit (pkgs) glibc;
         timeZone = config.time.timeZone;
         defaultLocale = config.i18n.defaultLocale;
         inherit nixEnvVars;
-	systemKernel = (if kernel == null then 
-		pkgs.systemKernel else kernel);
       };
       target = "profile";
     }
diff --git a/etc/profile.sh b/etc/profile.sh
index aa164b2de9b..27d265f74ac 100644
--- a/etc/profile.sh
+++ b/etc/profile.sh
@@ -1,5 +1,5 @@
 export PATH=@wrapperDir@:/var/run/current-system/sw/bin:/var/run/current-system/sw/sbin
-export MODULE_DIR=@systemKernel@/lib/modules
+export MODULE_DIR=@modulesTree@/lib/modules
 export NIXPKGS_CONFIG=/nix/etc/config.nix
 export PAGER=less
 export TZ=@timeZone@
diff --git a/system/modprobe b/system/modprobe
index 5971880f064..293d9bbfd5f 100644
--- a/system/modprobe
+++ b/system/modprobe
@@ -1,3 +1,3 @@
 #! @shell@
-export MODULE_DIR=@kernel@/lib/modules
+export MODULE_DIR=@modulesTree@/lib/modules
 exec @module_init_tools@/sbin/modprobe "$@"
diff --git a/system/system.nix b/system/system.nix
index 5b6f23749f0..21e8c06a8be 100644
--- a/system/system.nix
+++ b/system/system.nix
@@ -142,13 +142,24 @@ rec {
     (map (mod: mod + "/lib") nssModules));
 
 
+  # Tree of kernel modules.  This includes the kernel, plus modules
+  # built outside of the kernel.  We have to combine these into a
+  # single tree of symlinks because modprobe only supports one
+  # directory.
+  modulesTree = pkgs.module_aggregation (
+    [kernel pkgs.iwlwifi]
+    # !!! this should be declared by the xserver Upstart job.
+    ++ pkgs.lib.optional (config.services.xserver.enable && config.services.xserver.videoDriver == "nvidia") pkgs.nvidiaDrivers
+  );
+
+  
   # Wrapper around modprobe to set the path to the modules.
   modprobe = pkgs.substituteAll {
     dir = "sbin";
     src = ./modprobe;
     isExecutable = true;
     inherit (pkgs) module_init_tools;
-    inherit kernel;
+    inherit modulesTree;
   };
 
 
@@ -171,8 +182,7 @@ rec {
   # The static parts of /etc.
   etc = import ../etc/default.nix {
     inherit config pkgs upstartJobs systemPath wrapperDir
-      defaultShell nixEnvVars;
-    inherit kernel;
+      defaultShell nixEnvVars modulesTree;
     extraEtc = pkgs.lib.concatLists (map (job: job.extraEtc) upstartJobs.jobs);
   };
 
diff --git a/upstart-jobs/xserver.nix b/upstart-jobs/xserver.nix
index f62f02ece6d..b7ef28943a5 100644
--- a/upstart-jobs/xserver.nix
+++ b/upstart-jobs/xserver.nix
@@ -363,8 +363,6 @@ rec {
       ${if videoDriver == "nvidia"        
         then ''
           ln -sf ${pkgs.nvidiaDrivers} /var/run/opengl-driver
-          # Ideally, the nvidia driver would be somewhere where modprobe looks for it...
-          ${pkgs.module_init_tools}/sbin/insmod ${pkgs.nvidiaDrivers}/lib/nvidia.ko || true
         ''
 	else if cfg.driSupport
         then "ln -sf ${pkgs.mesa} /var/run/opengl-driver"
-- 
GitLab


From 18ed3e20d16f9f2254df3166f5c8a2e4943e45e5 Mon Sep 17 00:00:00 2001
From: Wouter den Breejen <uu@denbreejen.net>
Date: Sun, 13 Jan 2008 17:29:06 +0000
Subject: [PATCH 0734/5331] Added NVIDIA option to Live-dvd-X

svn path=/nixos/trunk/; revision=10137
---
 configuration/live-dvd-X.nix | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/configuration/live-dvd-X.nix b/configuration/live-dvd-X.nix
index d6de3842401..f0e925b9115 100644
--- a/configuration/live-dvd-X.nix
+++ b/configuration/live-dvd-X.nix
@@ -209,5 +209,15 @@ in
 			};
 		});
 	}
+        {
+                suffix = "X-NVIDIA";
+                configuration = (configuration //
+                {
+                        boot=configuration.boot // {configurationName = "X with NVIDIA graphic card";};
+                        services = configuration.services // {
+                                xserver = xConfiguration // {videoDriver = "nvidia"; driSupport = true;};
+                        };
+                });
+        }
 	];
 }).rescueCD
-- 
GitLab


From e8ddb6fd2d483b8e96a8230252e7f5cb0e1e5991 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Mon, 14 Jan 2008 11:24:36 +0000
Subject: [PATCH 0735/5331] Samba service; httpd/xfs dependencies changed to
 know about gw6c.autorun option.

svn path=/nixos/trunk/; revision=10140
---
 upstart-jobs/httpd.nix |  2 +-
 upstart-jobs/samba.nix | 22 +++++++++++++++++-----
 upstart-jobs/smb.conf  | 10 ++++++++++
 upstart-jobs/xfs.nix   |  2 +-
 4 files changed, 29 insertions(+), 7 deletions(-)
 create mode 100644 upstart-jobs/smb.conf

diff --git a/upstart-jobs/httpd.nix b/upstart-jobs/httpd.nix
index 20d0f834fac..0e1703b08ac 100644
--- a/upstart-jobs/httpd.nix
+++ b/upstart-jobs/httpd.nix
@@ -19,7 +19,7 @@ let
   enableSSL = false;
   extraDirectories = cfg.extraDirectories + extraConfig;
 
-  startingDependency = if config.services.gw6c.enable then "gw6c" else "network-interfaces";
+  startingDependency = if config.services.gw6c.enable && config.services.gw6c.autorun then "gw6c" else "network-interfaces";
   
   webServer = import ../../services/apache-httpd {
     inherit (pkgs) apacheHttpd coreutils;
diff --git a/upstart-jobs/samba.nix b/upstart-jobs/samba.nix
index fa4cbf70859..08af9dec747 100644
--- a/upstart-jobs/samba.nix
+++ b/upstart-jobs/samba.nix
@@ -4,7 +4,9 @@ let
   
   user = "smbguest";
   group = "smbguest";
-  
+ 
+  smbConfig = ./smb.conf ;
+
 in
 
 {
@@ -31,13 +33,23 @@ stop on network-interfaces/stop
 
 start script
 
-  ${samba}/sbin/nmbd -D &
-  ${samba}/sbin/smbd -D &
-  ${samba}/sbin/winbindd -B &
+  if ! test -d /home/smbd ; then 
+    mkdir -p /home/smbd
+    chown ${user} /home/smbd
+    chmod a+rwx /home/smbd
+  fi
+
+  if ! test -d /var/samba ; then
+    mkdir -p /var/samba/locks /var/samba/cores/nmbd  /var/samba/cores/smbd /var/samba/cores/winbindd
+  fi
+
+  ${samba}/sbin/nmbd -D  -s ${smbConfig} &
+  ${samba}/sbin/smbd -D  -s ${smbConfig} &
+  ${samba}/sbin/winbindd -B -s ${smbConfig} &
 
 end script
 
-respawn ${samba}/sbin/nmbd -D &; ${samba}/sbin/smbd -D &; ${samba}/sbin/winbindd -B &
+respawn ${samba}/sbin/nmbd -D -s ${smbConfig} &; ${samba}/sbin/smbd -D -s ${smbConfig} &; ${samba}/sbin/winbindd -B &
 
   ";
 
diff --git a/upstart-jobs/smb.conf b/upstart-jobs/smb.conf
new file mode 100644
index 00000000000..69d5b41f706
--- /dev/null
+++ b/upstart-jobs/smb.conf
@@ -0,0 +1,10 @@
+[global]
+  workgroup = Users
+  security = share
+  server string = %h
+  comment = Samba
+  local master = no
+[default]
+  path = /home/smbd
+  read only = no
+  guest ok = yes
diff --git a/upstart-jobs/xfs.nix b/upstart-jobs/xfs.nix
index 20975622ccc..8b9b795d195 100644
--- a/upstart-jobs/xfs.nix
+++ b/upstart-jobs/xfs.nix
@@ -3,7 +3,7 @@
 }:
 let
 	configFile = ./xfs.conf;
-  startingDependency = if config.services.gw6c.enable then "gw6c" else "network-interfaces";
+  startingDependency = if config.services.gw6c.enable && config.services.gw6c.autorun then "gw6c" else "network-interfaces";
 in
 rec {
 	name = "xfs";
-- 
GitLab


From ec727d660a5ba3f3747930a664ac00ca99ca409a Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Tue, 15 Jan 2008 15:39:34 +0000
Subject: [PATCH 0736/5331] Corrections to make-iso9660-image.sh for bigger
 path lists.

svn path=/nixos/trunk/; revision=10156
---
 configuration/rescue-cd-closed.nix | 18 ++++++++++++++++++
 helpers/make-iso9660-image.sh      | 14 ++++++++------
 2 files changed, 26 insertions(+), 6 deletions(-)
 create mode 100644 configuration/rescue-cd-closed.nix

diff --git a/configuration/rescue-cd-closed.nix b/configuration/rescue-cd-closed.nix
new file mode 100644
index 00000000000..b6c1df04b63
--- /dev/null
+++ b/configuration/rescue-cd-closed.nix
@@ -0,0 +1,18 @@
+{platform ? __currentSystem} : 
+let 
+  isoFun = import ./rescue-cd-configurable.nix;
+in 
+(isoFun {
+	inherit platform;
+	lib = (import ../pkgs/lib);
+
+	networkNixpkgs = "";
+	manualEnabled = false;
+	rogueEnabled = false;
+	sshdEnabled = false;
+	fontConfigEnabled = false;
+	sudoEnable = false;
+	includeMemtest = false;
+	includeStdenv = false;
+	includeBuildDeps = true;
+}).rescueCD
diff --git a/helpers/make-iso9660-image.sh b/helpers/make-iso9660-image.sh
index d9bd6752d18..aa8cb291a3e 100644
--- a/helpers/make-iso9660-image.sh
+++ b/helpers/make-iso9660-image.sh
@@ -23,24 +23,24 @@ if test -n "$bootable"; then
     bootFlags="-b $bootImage -c boot.cat -no-emul-boot -boot-load-size 4 -boot-info-table"
 fi
 
+touch pathlist
 
 # Add the individual files.
-graftList=
 for ((i = 0; i < ${#targets_[@]}; i++)); do
-    graftList="$graftList ${targets_[$i]}=$(readlink -f ${sources_[$i]})"
+    echo "${targets_[$i]}=$(readlink -f ${sources_[$i]})" >> pathlist
 done
 
 
 # Add the closures of the top-level store objects.
 storePaths=$(perl $pathsFromGraph closure-*)
 for i in $storePaths; do
-    graftList="$graftList ${i:1}=$i"
+    echo "${i:1}=$i" >> pathlist
 done
 
 
 # Also put a nix-pull manifest of the closures on the CD.
 printManifest=1 perl $pathsFromGraph closure-* > MANIFEST
-graftList="$graftList MANIFEST=MANIFEST"
+echo "MANIFEST=MANIFEST" >> pathlist
 
 
 # Add symlinks to the top-level store objects.
@@ -50,14 +50,16 @@ for ((n = 0; n < ${#objects[*]}; n++)); do
     if test "$symlink" != "none"; then
         mkdir -p $(dirname ./$symlink)
         ln -s $object ./$symlink
-        graftList="$graftList $symlink=./$symlink"
+        echo "$symlink=./$symlink" >> pathlist
     fi
 done
 
+cat pathlist
+
 # !!! -f is a quick hack.
 ensureDir $out/iso
 genisoimage -r -J -o $out/iso/$isoName $bootFlags \
-    -graft-points $graftList
+    -graft-points -path-list pathlist
 
 ensureDir $out/nix-support
 echo $system > $out/nix-support/system
-- 
GitLab


From d69cc82771d47f330891b35f6b9df25a22df7d1a Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Tue, 15 Jan 2008 16:05:51 +0000
Subject: [PATCH 0737/5331] Moved configuration check option into
 configuration.nix (environment.checkConfigurationOptions)

svn path=/nixos/trunk/; revision=10157
---
 system/options.nix | 7 +++++++
 system/system.nix  | 6 ++++--
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/system/options.nix b/system/options.nix
index bf571d56635..ab39d15857c 100644
--- a/system/options.nix
+++ b/system/options.nix
@@ -1872,6 +1872,13 @@ root        ALL=(ALL) SETENV: ALL
       ";
     };
 
+    checkConfigurationOptions = mkOption {
+      default = false;
+      example = true;
+      description = "
+        If all configuration options must be checked. Non-existing options fail build.
+      ";
+    };
   };
   
   nesting = {
diff --git a/system/system.nix b/system/system.nix
index 21e8c06a8be..8978473c872 100644
--- a/system/system.nix
+++ b/system/system.nix
@@ -369,6 +369,8 @@ rec {
         configuration = x//{boot=((x.boot)//{grubDevice = "";});};}).system) 
       config.nesting.children; 
     configurationName = config.boot.configurationName;
-  }) (pkgs.getConfig ["checkConfigurationOptions"] false) 
-	optionDeclarations configuration ;
+  }) (pkgs.lib.getAttr ["environment" "checkConfigurationOptions"] 
+  	optionDeclarations.environment.checkConfigurationOptions.default
+	configuration) 
+		optionDeclarations configuration ;
 }
-- 
GitLab


From 622734b58b3f18da0d3cd0d83f7d3ec28dedaa39 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 16 Jan 2008 13:59:03 +0000
Subject: [PATCH 0738/5331] * Generate /etc/ssh/ssh_config, set ForwardX11 and
 XAuthLocation.

svn path=/nixos/trunk/; revision=10177
---
 configuration/rescue-cd.nix |  1 +
 etc/default.nix             | 13 +++++++++++++
 upstart-jobs/sshd.nix       |  5 +++--
 3 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/configuration/rescue-cd.nix b/configuration/rescue-cd.nix
index 755cbf0da82..25821fd20cb 100644
--- a/configuration/rescue-cd.nix
+++ b/configuration/rescue-cd.nix
@@ -21,6 +21,7 @@ rec {
     
       sshd = {
         enable = false;
+        forwardX11 = false;
       };
       
       xserver = {
diff --git a/etc/default.nix b/etc/default.nix
index d30c797c44e..6456e52f9d9 100644
--- a/etc/default.nix
+++ b/etc/default.nix
@@ -133,6 +133,19 @@ import ../helpers/make-etc.nix {
       target = "nix.conf"; # will be symlinked from /nix/etc/nix/nix.conf in activate-configuration.sh.
     }
 
+    { # SSH configuration.  Slight duplication of the sshd_config
+      # generation in the sshd service.
+      source = pkgs.writeText "ssh_config" ''
+        ${if config.services.sshd.forwardX11 then ''
+          ForwardX11 yes
+          XAuthLocation ${pkgs.xorg.xauth}/bin/xauth
+        '' else ''
+          ForwardX11 no
+        ''}
+      '';
+      target = "ssh/ssh_config";
+    }
+
   ]
 
   # Configuration for ssmtp.
diff --git a/upstart-jobs/sshd.nix b/upstart-jobs/sshd.nix
index 4e3ac2b7d02..be58b91351f 100644
--- a/upstart-jobs/sshd.nix
+++ b/upstart-jobs/sshd.nix
@@ -5,7 +5,8 @@
 
 let
 
-  sshdConfig = writeText "sshd_config" "
+  sshdConfig = writeText "sshd_config" ''
+  
     UsePAM yes
     
     ${if forwardX11 then "
@@ -20,7 +21,7 @@ let
     " else "
     "}
     
-  ";
+  '';
 
   sshdUid = (import ../system/ids.nix).uids.sshd;
 
-- 
GitLab


From d9ffa7f72ec905dc29fc73091d75e9ce848036ca Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 16 Jan 2008 15:33:09 +0000
Subject: [PATCH 0739/5331] * Manual bug.

svn path=/nixos/trunk/; revision=10179
---
 system/options.nix       | 2 +-
 upstart-jobs/xserver.nix | 8 +++-----
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/system/options.nix b/system/options.nix
index ab39d15857c..dc72a1d965e 100644
--- a/system/options.nix
+++ b/system/options.nix
@@ -825,7 +825,7 @@
         description = "
           The command executed after login and after the window manager
           has been started.  Used if
-          <option>services.xserver.sessionType</option> is not empty.
+          <option>services.xserver.sessionType</option> is empty.
         ";
       };
 
diff --git a/upstart-jobs/xserver.nix b/upstart-jobs/xserver.nix
index b7ef28943a5..e207c173202 100644
--- a/upstart-jobs/xserver.nix
+++ b/upstart-jobs/xserver.nix
@@ -18,15 +18,13 @@ let
   videoDriver = cfg.videoDriver;
   resolutions = map (res: ''"${toString res.x}x${toString res.y}"'') (cfg.resolutions);
   sessionType = cfg.sessionType;
-  sessionStarter = cfg.sessionStarter;
-  renderingFlag = cfg.renderingFlag;
 
 
   sessionCmd =
-    if sessionType == "" then sessionStarter else
+    if sessionType == "" then cfg.sessionStarter else
     if sessionType == "xterm" then "${pkgs.xterm}/bin/xterm -ls" else
     if sessionType == "gnome" then "${gnome.gnometerminal}/bin/gnome-terminal -ls" else
-    abort ("unknown session type "+ sessionType);
+    abort ("unknown session type ${sessionType}");
 
 
   windowManager =
@@ -221,7 +219,7 @@ let
 
       # Start Compiz and the GTK-style window decorator.
       env LD_LIBRARY_PATH=${xorg.libX11}/lib:${xorg.libXext}/lib:/usr/lib/
-      ${pkgs.compiz}/bin/compiz gconf ${renderingFlag} &
+      ${pkgs.compiz}/bin/compiz gconf ${cfg.renderingFlag} &
       ${pkgs.compiz}/bin/gtk-window-decorator --sync &
     ''
     
-- 
GitLab


From e893328176f1cb03adff570b4fcb98550d069434 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andres=20L=C3=B6h?= <mail@andres-loeh.de>
Date: Wed, 16 Jan 2008 16:49:22 +0000
Subject: [PATCH 0740/5331] * added xmonad to possible windowManager choices in
 xserver.nix

svn path=/nixos/trunk/; revision=10180
---
 upstart-jobs/xserver.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/upstart-jobs/xserver.nix b/upstart-jobs/xserver.nix
index e207c173202..ffcd6485762 100644
--- a/upstart-jobs/xserver.nix
+++ b/upstart-jobs/xserver.nix
@@ -222,6 +222,10 @@ let
       ${pkgs.compiz}/bin/compiz gconf ${cfg.renderingFlag} &
       ${pkgs.compiz}/bin/gtk-window-decorator --sync &
     ''
+
+    else if windowManager == "xmonad" then ''
+      ${pkgs.xmonad}/bin/xmonad &
+    ''
     
     else if windowManager == "none" then ''
       # The session starter will start the window manager.
-- 
GitLab


From 563a6240a3e84fda3720e76ea86874d31a865fc1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andres=20L=C3=B6h?= <mail@andres-loeh.de>
Date: Wed, 16 Jan 2008 16:53:32 +0000
Subject: [PATCH 0741/5331] * updated docs to reflect new xmonad choice

svn path=/nixos/trunk/; revision=10181
---
 system/options.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/system/options.nix b/system/options.nix
index dc72a1d965e..da741b044b6 100644
--- a/system/options.nix
+++ b/system/options.nix
@@ -805,7 +805,8 @@
         description = "
           This option selects the window manager.  Available values are
           <literal>twm</literal> (extremely primitive),
-          <literal>metacity</literal>, and <literal>compiz</literal>.  If
+          <literal>metacity</literal>, <literal>xmonad</literal>
+          and <literal>compiz</literal>.  If
           left empty, the <option>sessionType</option> determines the
           window manager, e.g., Metacity for Gnome, and
           <command>kwm</command> for KDE.
-- 
GitLab


From 7749d93524acc5b0fdf87d7b8955207f6f2e3e71 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Wed, 16 Jan 2008 21:56:31 +0000
Subject: [PATCH 0742/5331] Added extraInitrdKernelModules option to CD

svn path=/nixos/trunk/; revision=10182
---
 configuration/rescue-cd-configurable.nix | 5 +++++
 upstart-jobs/samba.nix                   | 2 ++
 2 files changed, 7 insertions(+)

diff --git a/configuration/rescue-cd-configurable.nix b/configuration/rescue-cd-configurable.nix
index 987185cc85a..67282ba03bd 100644
--- a/configuration/rescue-cd-configurable.nix
+++ b/configuration/rescue-cd-configurable.nix
@@ -24,6 +24,7 @@ let
 	includeBuildDeps = arg "includeBuildDeps" false;
 	kernel = arg "kernel" (pkgs : pkgs.kernel);
 	addUsers = arg "addUsers" [];
+	extraInitrdKernelModules = arg "extraInitrdKernelModules" [];
 
 	/* Should return list of {configuration, suffix} attrsets.
 	{configuration=configuration; suffix=""} is always prepended.
@@ -107,6 +108,9 @@ rec {
       extraTTYs = [] ++ (lib.optional manualEnabled 7) ++
         (lib.optional rogueEnabled 8);
       inherit kernel;
+      initrd = {
+        extraKernelModules = extraInitrdKernelModules;
+      };
     };
     
     services = {
@@ -237,6 +241,7 @@ rec {
         pkgs.subversion # for nixos-checkout
         pkgs.w3m # needed for the manual anyway
       ] ++ (packages pkgs);
+      checkConfigurationOptions = true;
     };
 
     users = {
diff --git a/upstart-jobs/samba.nix b/upstart-jobs/samba.nix
index 08af9dec747..b1371c6f0f5 100644
--- a/upstart-jobs/samba.nix
+++ b/upstart-jobs/samba.nix
@@ -47,6 +47,8 @@ start script
   ${samba}/sbin/smbd -D  -s ${smbConfig} &
   ${samba}/sbin/winbindd -B -s ${smbConfig} &
 
+  ln -fs ${smbConfig} /var/samba/config
+
 end script
 
 respawn ${samba}/sbin/nmbd -D -s ${smbConfig} &; ${samba}/sbin/smbd -D -s ${smbConfig} &; ${samba}/sbin/winbindd -B &
-- 
GitLab


From 86484779c7b00050704bc9dd670b377ccb0d191d Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 18 Jan 2008 15:18:32 +0000
Subject: [PATCH 0743/5331] * Mount usbfs on /proc/bus/usb.

svn path=/nixos/trunk/; revision=10220
---
 boot/boot-stage-2-init.sh | 1 +
 system/system.nix         | 1 +
 2 files changed, 2 insertions(+)

diff --git a/boot/boot-stage-2-init.sh b/boot/boot-stage-2-init.sh
index 9aa2aec7d9f..2c7e3532006 100644
--- a/boot/boot-stage-2-init.sh
+++ b/boot/boot-stage-2-init.sh
@@ -75,6 +75,7 @@ mount -t sysfs none /sys
 mount -t tmpfs -o "mode=0755" none /dev
 mkdir -m 0755 -p /dev/pts
 mount -t devpts none /dev/pts
+mount -t usbfs none /proc/bus/usb
 needWritableDir /tmp 01777
 needWritableDir /var 0755
 needWritableDir /nix/var 0755
diff --git a/system/system.nix b/system/system.nix
index 8978473c872..516e69a6ec7 100644
--- a/system/system.nix
+++ b/system/system.nix
@@ -244,6 +244,7 @@ rec {
     pkgs.time
     pkgs.udev
     pkgs.upstart
+    pkgs.usbutils
     pkgs.utillinux
     pkgs.wirelesstools
     nix
-- 
GitLab


From fcef0545be053ea69d6a4ea9bf60da477eecb51a Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 18 Jan 2008 16:17:48 +0000
Subject: [PATCH 0744/5331] * A program for generating the hardware-specific
 bits of   configuration.nix.  Right now it finds out the following:

  - How many CPUs the machine has (for nix.maxJobs).
  - Whether to load KVM support (either kvm-intel or kvm-amd).
  - The modules necessary for the initrd by scanning the PCI and USB
    busses.  Only mass-storage and HID related modules are added.

svn path=/nixos/trunk/; revision=10221
---
 installer/nixos-hardware-scan.sh | 144 +++++++++++++++++++++++++++++++
 1 file changed, 144 insertions(+)
 create mode 100644 installer/nixos-hardware-scan.sh

diff --git a/installer/nixos-hardware-scan.sh b/installer/nixos-hardware-scan.sh
new file mode 100644
index 00000000000..06fbb11dfa1
--- /dev/null
+++ b/installer/nixos-hardware-scan.sh
@@ -0,0 +1,144 @@
+#! @shell@ -e
+
+
+kernelModules=
+initrdKernelModules=
+
+hasCPUFeature() {
+    local feature="$1"
+    cat /proc/cpuinfo | grep -q "^flags.* $feature\( \|$\)"
+}
+
+needKernelModule() {
+    kernelModules="$kernelModules \"$1\""
+}
+
+needInitrdKernelModule() {
+    initrdKernelModules="$initrdKernelModules \"$1\""
+}
+
+
+# Detect the number of CPU cores.
+cpus="$(cat /proc/cpuinfo | grep '^processor' | wc -l)"
+
+
+# CPU frequency scaling.  Not sure about this test.
+if hasCPUFeature "acpi"; then
+    needKernelModule "acpi-cpufreq"
+fi
+
+
+# Virtualization support?
+if hasCPUFeature "vmx"; then
+    needKernelModule "kvm-intel"
+fi
+
+if hasCPUFeature "svm"; then
+    needKernelModule "kvm-amd"
+fi
+
+
+# Look at the PCI devices and add necessary modules.  Note that most
+# modules are auto-detected so we don't need to list them here.
+# However, some are needed in the initrd to boot the system.
+
+pciCheck() {
+    local path="$1"
+    local vendor="$(cat $path/vendor)" 
+    local device="$(cat $path/device)"
+    local class="$(cat $path/class)"
+
+    local module
+    if test -e "$path/driver/module"; then
+        module=$(basename $(readlink -f $path/driver/module))
+    fi
+
+    echo "$path: $vendor $device $class $module"
+
+    if test -n "$module"; then
+        # See the bottom of http://pciids.sourceforge.net/pci.ids for
+        # device classes.
+        case $class in
+            0x01*)
+                # Mass-storage controller.  Definitely important.
+                needInitrdKernelModule $module
+                ;;
+            0x0c00*)
+                # Firewire controller.  A disk might be attached.
+                needInitrdKernelModule $module
+                ;;
+            0x0c03*)
+                # USB controller.  Needed if we want to use the
+                # keyboard when things go wrong in the initrd.
+                needInitrdKernelModule $module
+                ;;
+        esac
+    fi        
+}
+
+for path in /sys/bus/pci/devices/*; do
+    pciCheck "$path"
+done
+
+
+# Idem for USB devices.
+
+usbCheck() {
+    local path="$1"
+    local class="$(cat $path/bInterfaceClass)" 
+    local subclass="$(cat $path/bInterfaceSubClass)"
+    local protocol="$(cat $path/bInterfaceProtocol)"
+
+    local module
+    if test -e "$path/driver/module"; then
+        module=$(basename $(readlink -f $path/driver/module))
+    fi
+
+    echo "$path: $class $subclass $protocol $module"
+
+    if test -n "$module"; then
+        # See http://www.linux-usb.org/usb.ids for
+        # classes/subclasses/protocols.
+        case $class:$subclass:$protocol in
+            08:*)
+                # Mass-storage controller.  Definitely important.
+                needInitrdKernelModule $module
+                ;;
+            03:*:01)
+                # Keyboard.  Needed if we want to use the
+                # keyboard when things go wrong in the initrd.
+                needInitrdKernelModule $module
+                ;;
+        esac
+    fi        
+}
+
+for path in /sys/bus/usb/devices/*; do
+    if test -e "$path/bInterfaceClass"; then
+        usbCheck "$path"
+    fi
+done
+
+
+# Remove duplicate modules.  !!! preserve order
+kernelModules=$(for i in $kernelModules; do echo $i; done | sort | uniq)
+initrdKernelModules=$(for i in $initrdKernelModules; do echo $i; done | sort | uniq)
+
+
+# Generation the configuration file.
+cat <<EOF
+# This is a generated file.  Do not modify!
+# Make changes to /etc/nixos/configuration.nix instead.
+{
+  boot = {
+    initrd = {
+      extraKernelModules = [ $(echo $initrdKernelModules) ];
+    };
+    kernelModules = [ $(echo $kernelModules) ];
+  };
+
+  nix = {
+    maxJobs = $cpus;
+  };
+}
+EOF
-- 
GitLab


From ca2b1e3b779fa5fa107ed4f39e887a5b4176e5d8 Mon Sep 17 00:00:00 2001
From: Wouter den Breejen <uu@denbreejen.net>
Date: Sat, 19 Jan 2008 13:47:49 +0000
Subject: [PATCH 0745/5331] Added boot.kernelModules argument to rescue-cd

svn path=/nixos/trunk/; revision=10227
---
 configuration/rescue-cd-configurable.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/configuration/rescue-cd-configurable.nix b/configuration/rescue-cd-configurable.nix
index 67282ba03bd..01e7ca86d0d 100644
--- a/configuration/rescue-cd-configurable.nix
+++ b/configuration/rescue-cd-configurable.nix
@@ -25,6 +25,7 @@ let
 	kernel = arg "kernel" (pkgs : pkgs.kernel);
 	addUsers = arg "addUsers" [];
 	extraInitrdKernelModules = arg "extraInitrdKernelModules" [];
+	bootKernelModules = arg "bootKernelModules" [];
 
 	/* Should return list of {configuration, suffix} attrsets.
 	{configuration=configuration; suffix=""} is always prepended.
@@ -111,6 +112,7 @@ rec {
       initrd = {
         extraKernelModules = extraInitrdKernelModules;
       };
+      kernelModules = bootKernelModules;
     };
     
     services = {
-- 
GitLab


From 7fa31be4402a9ecd42b79dd860e068d614ca8f5c Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Tue, 22 Jan 2008 17:55:57 +0000
Subject: [PATCH 0746/5331] Tried to do offline install CD, not DVD. Failure,
 but some parts could be useful.

svn path=/nixos/trunk/; revision=10248
---
 configuration/rescue-cd-configurable.nix |  9 ++++--
 configuration/rescue-cd-offline.nix      | 36 ++++++++++++++++++++++++
 system/options.nix                       | 12 ++++++++
 system/system.nix                        | 18 ++++++++++--
 4 files changed, 69 insertions(+), 6 deletions(-)
 create mode 100644 configuration/rescue-cd-offline.nix

diff --git a/configuration/rescue-cd-configurable.nix b/configuration/rescue-cd-configurable.nix
index 01e7ca86d0d..e1b0e7088ee 100644
--- a/configuration/rescue-cd-configurable.nix
+++ b/configuration/rescue-cd-configurable.nix
@@ -26,6 +26,8 @@ let
 	addUsers = arg "addUsers" [];
 	extraInitrdKernelModules = arg "extraInitrdKernelModules" [];
 	bootKernelModules = arg "bootKernelModules" [];
+	arbitraryOverrides = arg "arbitraryOverrides" (config:{});
+	cleanStart = arg "cleanStart" false;
 
 	/* Should return list of {configuration, suffix} attrsets.
 	{configuration=configuration; suffix=""} is always prepended.
@@ -99,7 +101,7 @@ rec {
   nixpkgsRel = "nixpkgs" + (if networkNixpkgs != "" then "-" + networkNixpkgs else "");
 
 
-  configuration = {
+  configuration = let preConfiguration ={
   
     boot = {
       autoDetectRootDevice = true;
@@ -238,19 +240,20 @@ rec {
     };
  
     environment = {
-      extraPackages = pkgs: [
+      extraPackages = if cleanStart then pkgs:[] else pkgs: [
         pkgs.vim
         pkgs.subversion # for nixos-checkout
         pkgs.w3m # needed for the manual anyway
       ] ++ (packages pkgs);
       checkConfigurationOptions = true;
+      cleanStart = cleanStart;
     };
 
     users = {
       extraUsers = map userEntry addUsers;
     };
  
-  };
+  }; in preConfiguration // (arbitraryOverrides preConfiguration);
 
   configurations = [{
     inherit configuration;
diff --git a/configuration/rescue-cd-offline.nix b/configuration/rescue-cd-offline.nix
new file mode 100644
index 00000000000..ab650f65938
--- /dev/null
+++ b/configuration/rescue-cd-offline.nix
@@ -0,0 +1,36 @@
+{platform ? __currentSystem} : 
+let 
+  isoFun = import ./rescue-cd-configurable.nix;
+in 
+(isoFun {
+	inherit platform;
+	lib = (import ../pkgs/lib);
+
+	networkNixpkgs = "";
+	manualEnabled = false;
+	rogueEnabled = false;
+	sshdEnabled = false;
+	fontConfigEnabled = false;
+	sudoEnable = false;
+	includeMemtest = false;
+	includeStdenv = false;
+	includeBuildDeps = true;
+	cleanStart = true;
+	packages = pkgs: with pkgs; [
+		bashInteractive
+		bzip2
+		coreutils
+		curl
+		e2fsprogs
+		gnutar
+		grub
+		gzip
+		less
+		module_init_tools
+		nano
+		su
+		udev
+		upstart
+		utillinux
+	];
+}).rescueCD
diff --git a/system/options.nix b/system/options.nix
index da741b044b6..fc5c5c116dd 100644
--- a/system/options.nix
+++ b/system/options.nix
@@ -1849,6 +1849,18 @@ root        ALL=(ALL) SETENV: ALL
       ";
     };
 
+    cleanStart = mkOption {
+      default = false;
+      example = true;
+      description = "
+        There are some times when you want really small system for specific 
+	purpose and do not want default package list. Setting 
+	<varname>cleanStart<varname> to <literal>true</literal> allows you 
+	to create a system with empty path - only extraPackages will be 
+	included..
+      ";
+    };
+
     extraPackages = mkOption {
       default = pkgs: [];
       example = pkgs: [pkgs.firefox pkgs.thunderbird];
diff --git a/system/system.nix b/system/system.nix
index 516e69a6ec7..d4c4cc505c3 100644
--- a/system/system.nix
+++ b/system/system.nix
@@ -204,7 +204,19 @@ rec {
 
 
   # The packages you want in the boot environment.
-  systemPathList = [
+  systemPathList = (if config.environment.cleanStart then 
+  [
+    # Better leave them here - they are small, needed,
+    # and hard to refer from anywhere outside.
+    modprobe 
+    nix
+    nixosInstall
+    nixosRebuild
+    nixosCheckout
+    setuidWrapper
+  ]
+  else
+  [
     modprobe # must take precedence over module_init_tools
     pkgs.bashInteractive # bash with ncurses support
     pkgs.bzip2
@@ -252,9 +264,9 @@ rec {
     nixosRebuild
     nixosCheckout
     setuidWrapper
-  ]
+  ])
   ++ pkgs.lib.optional (config.security.sudo.enable) pkgs.sudo
-  ++ pkgs.lib.optional (config.networking.defaultMailServer.directDelivery) pkgs.ssmtp
+  ++ pkgs.lib.optional (config.networking.defaultMailServer.directDelivery) pkgs.ssmtp 
   ++ pkgs.lib.concatLists (map (job: job.extraPath) upstartJobs.jobs)
   ++ (config.environment.extraPackages) pkgs
   ++ pkgs.lib.optional (config.fonts.enableFontDir) fontDir;
-- 
GitLab


From 49e882905368f495bf984b7e3b18eec869f842bc Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 24 Jan 2008 16:56:09 +0000
Subject: [PATCH 0747/5331] * Use unionfs to provide a real Live CD, i.e., the
 files on the CD   appear writable (though all writes go to a tmpfs).  This
 allows you   to run Nix operations on the Live CD.  However, we're not quite 
  there yet since the CD doesn't have a valid Nix database.  So for   instance
 a garbage collect will cause everything to be deleted,   hanging the system.

svn path=/nixos/trunk/; revision=10276
---
 boot/boot-stage-1-init.sh        | 15 ++++++++++++++-
 boot/boot-stage-1.nix            | 10 +++++++---
 boot/boot-stage-2-init.sh        | 33 ++++++++++++--------------------
 boot/boot-stage-2.nix            |  8 ++++----
 configuration/rescue-cd.nix      | 25 ++++++++++++------------
 helpers/make-iso9660-image.sh    |  4 ++--
 system/activate-configuration.sh | 24 ++++++++++++-----------
 system/options.nix               |  8 +++++---
 system/system.nix                |  8 +++-----
 9 files changed, 72 insertions(+), 63 deletions(-)

diff --git a/boot/boot-stage-1-init.sh b/boot/boot-stage-1-init.sh
index e4975981413..02de35e0cee 100644
--- a/boot/boot-stage-1-init.sh
+++ b/boot/boot-stage-1-init.sh
@@ -211,6 +211,19 @@ else
     
 fi
 
+
+# If this is a live-CD/DVD, then union-mount a tmpfs on top of the
+# original root.
+targetRoot=/mnt/root
+if test -n "@isLiveCD@"; then
+    mkdir /mnt/tmpfs
+    mount -n -t tmpfs -o "mode=755" none /mnt/tmpfs
+    mkdir /mnt/union
+    mount -t unionfs -o dirs=/mnt/tmpfs=rw:$targetRoot=ro none /mnt/union
+    targetRoot=/mnt/union
+fi
+
+
 if test -n "$debug1mounts"; then fail; fi
 
 
@@ -218,7 +231,7 @@ if test -n "$debug1mounts"; then fail; fi
 # !!! Note: we can't use pivot_root here (the kernel gods have
 # decreed), but we could use run-init from klibc, which deletes all
 # files in the initramfs, remounts the target root on /, and chroots.
-cd /mnt/root
+cd "$targetRoot"
 mount --move . /
 umount /proc # cleanup
 umount /sys
diff --git a/boot/boot-stage-1.nix b/boot/boot-stage-1.nix
index 7417ab5b2cf..0c504e86469 100644
--- a/boot/boot-stage-1.nix
+++ b/boot/boot-stage-1.nix
@@ -20,8 +20,12 @@
   # must at least be a file system for the / mount point in this list.
   fileSystems ? []
 
-  # If scanning, we need a disk label.
-, rootLabel
+, # If scanning, we need a disk label.
+  rootLabel
+
+, # Whether the root device is read-only and should be made writable
+  # through a unionfs.
+  isLiveCD
 
 , # The path of the stage 2 init to call once we've mounted the root
   # device.
@@ -44,7 +48,7 @@ substituteAll {
   src = ./boot-stage-1-init.sh;
   isExecutable = true;
   inherit staticShell modules modulesDir;
-  inherit autoDetectRootDevice mountPoints devices fsTypes optionss;
+  inherit autoDetectRootDevice isLiveCD mountPoints devices fsTypes optionss;
   rootLabel = if autoDetectRootDevice then rootLabel else "";
   path = [
     staticTools
diff --git a/boot/boot-stage-2-init.sh b/boot/boot-stage-2-init.sh
index 2c7e3532006..5e2754fcdd7 100644
--- a/boot/boot-stage-2-init.sh
+++ b/boot/boot-stage-2-init.sh
@@ -25,19 +25,9 @@ setPath "@path@"
 
 
 # Mount special file systems.
-
-needWritableDir() {
-    if test -n "@readOnlyRoot@"; then
-        mount -t tmpfs -o "mode=$2" none $1 $3
-    else
-        mkdir -m $2 -p $1
-    fi
-}
-
-needWritableDir /etc 0755 -n # to shut up mount
-
-test -e /etc/fstab || touch /etc/fstab # idem
-
+mkdir -m 0755 -p /etc
+test -e /etc/fstab || touch /etc/fstab # to shut up mount
+mkdir -m 0755 -p /proc
 mount -n -t proc none /proc
 cat /proc/mounts > /etc/mtab
 
@@ -71,19 +61,20 @@ done
 
 
 # More special file systems, initialise required directories.
+mkdir -m 0755 -p /sys 
 mount -t sysfs none /sys
+mkdir -m 0755 -p /dev
 mount -t tmpfs -o "mode=0755" none /dev
 mkdir -m 0755 -p /dev/pts
 mount -t devpts none /dev/pts
 mount -t usbfs none /proc/bus/usb
-needWritableDir /tmp 01777
-needWritableDir /var 0755
-needWritableDir /nix/var 0755
-needWritableDir /root 0700
-needWritableDir /bin 0755 # for the /bin/sh symlink
-if test -d /home ; then
-	needWritableDir /home 0777
-fi
+mkdir -m 01777 /tmp 
+mkdir -m 0755 /var
+mkdir -m 0755 /nix/var
+mkdir -m 0700 /root
+mkdir -m 0755 /bin # for the /bin/sh symlink
+mkdir -m 0755 /home
+
 
 # Miscellaneous boot time cleanup.
 rm -rf /var/run
diff --git a/boot/boot-stage-2.nix b/boot/boot-stage-2.nix
index bdccabc3605..5d0ac24be6f 100644
--- a/boot/boot-stage-2.nix
+++ b/boot/boot-stage-2.nix
@@ -2,9 +2,9 @@
 , utillinux, kernel, udev, upstart
 , activateConfiguration
 
-, # Whether the root device is root only.  If so, we'll mount a
-  # ramdisk on /etc, /var and so on.
-  readOnlyRoot
+, # Whether the root device is read-only and should be made writable
+  # through a unionfs.
+  isLiveCD
 
 , # Path for Upstart jobs.  Should be quite minimal.
   upstartPath
@@ -16,7 +16,7 @@
 substituteAll {
   src = ./boot-stage-2-init.sh;
   isExecutable = true;
-  inherit kernel upstart readOnlyRoot activateConfiguration upstartPath;
+  inherit kernel upstart isLiveCD activateConfiguration upstartPath;
   path = [
     coreutils
     utillinux
diff --git a/configuration/rescue-cd.nix b/configuration/rescue-cd.nix
index 25821fd20cb..435da04db16 100644
--- a/configuration/rescue-cd.nix
+++ b/configuration/rescue-cd.nix
@@ -11,10 +11,15 @@ rec {
   
     boot = {
       autoDetectRootDevice = true;
-      readOnlyRoot = true;
+      isLiveCD = true;
       # The label used to identify the installation CD.
       rootLabel = "NIXOS";
       extraTTYs = [7 8]; # manual, rogue
+      initrd = {
+        extraKernelModules = [
+          "unionfs" # needed for live-CD operation
+        ];
+      };
     };
     
     services = {
@@ -48,6 +53,7 @@ rec {
         # Show the NixOS manual on tty7.
         { name = "manual";
           job = "
+            env HOME=/root
             start on udev
             stop on shutdown
             respawn ${pkgs.w3m}/bin/w3m ${manual} < /dev/tty7 > /dev/tty7 2>&1
@@ -58,6 +64,7 @@ rec {
         # for the installation to finish.
         { name = "rogue";
           job = "
+            env HOME=/root
             start on udev
             stop on shutdown
             respawn ${pkgs.rogue}/bin/rogue < /dev/tty8 > /dev/tty8 2>&1
@@ -112,6 +119,7 @@ rec {
         pkgs.vim
         pkgs.subversion # for nixos-checkout
         pkgs.w3m # needed for the manual anyway
+        pkgs.gdb # for debugging Nix
       ];
     };
    
@@ -135,15 +143,6 @@ rec {
     else pkgs.writeText "dummy-manual" "Manual not included in this build!";
 
 
-  # Since the CD is read-only, the mount points must be on disk.
-  cdMountPoints = pkgs.runCommand "mount-points" {} "
-    ensureDir $out
-    cd $out
-    mkdir proc sys tmp etc dev var mnt nix nix/var root bin
-    touch $out/${configuration.boot.rootLabel}
-  ";
-
-
   # 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.
@@ -213,15 +212,15 @@ rec {
       { source = system.config.boot.grubSplashImage;
         target = "boot/background.xpm.gz";
       }
-      { source = cdMountPoints;
-        target = "/";
-      }
       { source = nixosTarball + "/" + nixosTarball.tarName;
         target = "/" + nixosTarball.tarName;
       }
       { source = nixpkgsTarball;
         target = "/nixpkgs.tar.bz2";
       }
+      { source = pkgs.writeText "label" "";
+        target = "/${configuration.boot.rootLabel}";
+      }
     ];
 
     # Closures to be copied to the Nix store on the CD.
diff --git a/helpers/make-iso9660-image.sh b/helpers/make-iso9660-image.sh
index aa8cb291a3e..6f18f0e3e5b 100644
--- a/helpers/make-iso9660-image.sh
+++ b/helpers/make-iso9660-image.sh
@@ -20,7 +20,7 @@ if test -n "$bootable"; then
         fi
     done
 
-    bootFlags="-b $bootImage -c boot.cat -no-emul-boot -boot-load-size 4 -boot-info-table"
+    bootFlags="-b $bootImage -c .boot.cat -no-emul-boot -boot-load-size 4 -boot-info-table"
 fi
 
 touch pathlist
@@ -59,7 +59,7 @@ cat pathlist
 # !!! -f is a quick hack.
 ensureDir $out/iso
 genisoimage -r -J -o $out/iso/$isoName $bootFlags \
-    -graft-points -path-list pathlist
+    -hide-rr-moved -graft-points -path-list pathlist
 
 ensureDir $out/nix-support
 echo $system > $out/nix-support/system
diff --git a/system/activate-configuration.sh b/system/activate-configuration.sh
index 2ed025e1803..4e35785f981 100644
--- a/system/activate-configuration.sh
+++ b/system/activate-configuration.sh
@@ -104,22 +104,24 @@ fi
 
 
 # Set up Nix.
-if test -z "@readOnlyRoot@"; then
-    mkdir -p /nix/etc/nix
-    ln -sfn /etc/nix.conf /nix/etc/nix/nix.conf
-    chown root.nixbld /nix/store
-    chmod 1775 /nix/store
-fi
+mkdir -p /nix/etc/nix
+ln -sfn /etc/nix.conf /nix/etc/nix/nix.conf
+chown root.nixbld /nix/store
+chmod 1775 /nix/store
 
 
 # Nix initialisation.
-mkdir -m 0755 -p /nix/var/nix/db
-mkdir -m 0755 -p /nix/var/nix/gcroots
+mkdir -m 0755 -p \
+    /nix/var/nix/gcroots \
+    /nix/var/nix/temproots \
+    /nix/var/nix/manifests \
+    /nix/var/nix/userpool \
+    /nix/var/nix/profiles \
+    /nix/var/nix/db \
+    /nix/var/log/nix/drvs \
+    /nix/var/nix/channel-cache
 mkdir -m 1777 -p /nix/var/nix/gcroots/per-user
-mkdir -m 0755 -p /nix/var/nix/temproots
-mkdir -m 0755 -p /nix/var/nix/profiles
 mkdir -m 1777 -p /nix/var/nix/profiles/per-user
-mkdir -m 0755 -p /nix/var/nix/channel-cache
 
 ln -sf /nix/var/nix/profiles /nix/var/nix/gcroots/
 ln -sf /nix/var/nix/manifests /nix/var/nix/gcroots/
diff --git a/system/options.nix b/system/options.nix
index fc5c5c116dd..3f2197a40d4 100644
--- a/system/options.nix
+++ b/system/options.nix
@@ -25,11 +25,13 @@
       ";
     };
 
-    readOnlyRoot = mkOption {
+    isLiveCD = mkOption {
       default = false;
       description = "
-        Whether the root device is read-only.  This should be set when
-        booting from CD-ROM.
+        If set to true, the root device will be mounted read-only and
+        a ramdisk will be mounted on top of it using unionfs to
+        provide a writable root.  This is used for the NixOS
+        Live-CD/DVD.
       ";
     };
 
diff --git a/system/system.nix b/system/system.nix
index d4c4cc505c3..72cd8dfedc8 100644
--- a/system/system.nix
+++ b/system/system.nix
@@ -78,7 +78,7 @@ rec {
     inherit (pkgs) substituteAll;
     inherit (pkgsDiet) module_init_tools;
     inherit extraUtils;
-    autoDetectRootDevice = config.boot.autoDetectRootDevice;
+    inherit (config.boot) autoDetectRootDevice isLiveCD;
     fileSystems =
       pkgs.lib.filter
         (fs: fs.mountPoint == "/" || (fs ? neededForBoot && fs.neededForBoot))
@@ -298,7 +298,6 @@ rec {
     isExecutable = true;
 
     inherit etc wrapperDir systemPath modprobe defaultShell kernel;
-    readOnlyRoot = config.boot.readOnlyRoot;
     hostName = config.networking.hostName;
     setuidPrograms =
       config.security.setuidPrograms ++
@@ -323,7 +322,7 @@ rec {
     inherit (pkgs) substituteAll writeText coreutils 
       utillinux udev upstart;
     inherit kernel activateConfiguration;
-    readOnlyRoot = config.boot.readOnlyRoot;
+    inherit (config.boot) isLiveCD;
     upstartPath = [
       pkgs.coreutils
       pkgs.findutils
@@ -359,8 +358,7 @@ rec {
     inherit (pkgs) grub coreutils gnused gnugrep diffutils findutils upstart;
     grubDevice = config.boot.grubDevice;
     kernelParams =
-      (config.boot.kernelParams) ++
-      (config.boot.extraKernelParams);
+      config.boot.kernelParams ++ config.boot.extraKernelParams;
     inherit bootStage2;
     inherit activateConfiguration;
     inherit grubMenuBuilder;
-- 
GitLab


From 8f503d73028aae69f0ec02f8fadd33bc2b9a0f84 Mon Sep 17 00:00:00 2001
From: "Yury G. Kudryashov" <urkud.urkud@gmail.com>
Date: Thu, 24 Jan 2008 20:37:27 +0000
Subject: [PATCH 0748/5331] typo in upstart-jobs/xfs.nix fixed

svn path=/nixos/trunk/; revision=10278
---
 upstart-jobs/xfs.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/upstart-jobs/xfs.nix b/upstart-jobs/xfs.nix
index 8b9b795d195..bab02a411fc 100644
--- a/upstart-jobs/xfs.nix
+++ b/upstart-jobs/xfs.nix
@@ -10,7 +10,7 @@ rec {
 	groups = [];
 	users = [];
 	job = "
-		description = \"X Font Server\"
+		description \"X Font Server\"
 		start on ${startingDependency}/started
 		stop on shutdown
 
-- 
GitLab


From 01004362f2d63210ddc6e51e779491e98b85685c Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Thu, 24 Jan 2008 21:35:24 +0000
Subject: [PATCH 0749/5331] Now xfs job fails without enableFontDir.

svn path=/nixos/trunk/; revision=10279
---
 upstart-jobs/xfs.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/upstart-jobs/xfs.nix b/upstart-jobs/xfs.nix
index bab02a411fc..b887e3fc334 100644
--- a/upstart-jobs/xfs.nix
+++ b/upstart-jobs/xfs.nix
@@ -1,6 +1,7 @@
 {
 	pkgs, config
 }:
+if ! config.fonts.enableFontDir then abort "Please enable fontDir (fonts.enableFontDir) to use xfs." else
 let
 	configFile = ./xfs.conf;
   startingDependency = if config.services.gw6c.enable && config.services.gw6c.autorun then "gw6c" else "network-interfaces";
-- 
GitLab


From 3166d9f687cffe0aacc1b13163bb57503854d5e9 Mon Sep 17 00:00:00 2001
From: "Yury G. Kudryashov" <urkud.urkud@gmail.com>
Date: Fri, 25 Jan 2008 12:54:27 +0000
Subject: [PATCH 0750/5331] Made iwlwifi optional, with false default

svn path=/nixos/trunk/; revision=10288
---
 system/options.nix | 2 +-
 system/system.nix  | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/system/options.nix b/system/options.nix
index 3f2197a40d4..d3679bc0bf7 100644
--- a/system/options.nix
+++ b/system/options.nix
@@ -341,7 +341,7 @@
     };
 
     enableIntel3945ABGFirmware = mkOption {
-      default = true;
+      default = false;
       description = "
         This option enables automatic loading of the firmware for the Intel
         PRO/Wireless 3945ABG.
diff --git a/system/system.nix b/system/system.nix
index 72cd8dfedc8..6943b97edc9 100644
--- a/system/system.nix
+++ b/system/system.nix
@@ -147,7 +147,8 @@ rec {
   # single tree of symlinks because modprobe only supports one
   # directory.
   modulesTree = pkgs.module_aggregation (
-    [kernel pkgs.iwlwifi]
+    [kernel]
+	++ pkgs.lib.optional config.networking.enableIntel3945ABGFirmware pkgs.iwlwifi
     # !!! this should be declared by the xserver Upstart job.
     ++ pkgs.lib.optional (config.services.xserver.enable && config.services.xserver.videoDriver == "nvidia") pkgs.nvidiaDrivers
   );
-- 
GitLab


From e914d28638450f1a85293b6778acff8facd0c55d Mon Sep 17 00:00:00 2001
From: "Yury G. Kudryashov" <urkud.urkud@gmail.com>
Date: Fri, 25 Jan 2008 12:54:32 +0000
Subject: [PATCH 0751/5331] Using default stdenv in fontdir.nix

svn path=/nixos/trunk/; revision=10289
---
 system/system.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/system/system.nix b/system/system.nix
index 6943b97edc9..4d27c722425 100644
--- a/system/system.nix
+++ b/system/system.nix
@@ -189,7 +189,7 @@ rec {
 
   # Font aggregation
   fontDir = import ./fontdir.nix {
-    stdenv = pkgs.stdenvUsingSetupNew2;
+    stdenv = pkgs.stdenv;
     inherit pkgs config;
     inherit (pkgs.xorg) mkfontdir mkfontscale fontalias;
   };
-- 
GitLab


From e5025996ca5780dbe9d6b1ec10de2fc071e51dd1 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Fri, 25 Jan 2008 13:31:59 +0000
Subject: [PATCH 0752/5331] fontDir compatible with both trunk and (hopefully)
 stdenv-updates

svn path=/nixos/trunk/; revision=10293
---
 system/fontdir.nix | 36 +++++++++++++++++++++++-------------
 system/system.nix  |  4 ++--
 2 files changed, 25 insertions(+), 15 deletions(-)

diff --git a/system/fontdir.nix b/system/fontdir.nix
index ee5f965034d..c33c627ba63 100644
--- a/system/fontdir.nix
+++ b/system/fontdir.nix
@@ -1,15 +1,13 @@
-args:
-	with args;
-stdenv.mkDerivation
-{
-	name="X11-fonts";
-	phases="installPhase";
-	fontDirs = import ./fonts.nix {inherit pkgs config;};	
-	buildInputs = [mkfontdir mkfontscale];
-	inherit fontalias;
-	installCommand = "
+args : with args; with builderDefs {src="";} null;
+	let localDefs = builderDefs rec {
+		src = "";/* put a fetchurl here */
+
+		buildInputs = [mkfontdir mkfontscale];
+		configureFlags = [];
+		fontDirs = import ./fonts.nix {inherit pkgs config;};
+		installPhase = FullDepEntry ("
 		list='';
-		for i in \$fontDirs ; do
+		for i in ${toString fontDirs} ; do
 			if [ -d \$i/ ]; then
 				list=\"\$list \$i\";
 			fi;
@@ -32,6 +30,18 @@ stdenv.mkDerivation
 		rm fonts.alias
 		mkfontdir
 		mkfontscale
-		cat \$( find \$fontalias/ -name fonts.alias) >fonts.alias
-	";
+		cat \$( find ${fontalias}/ -name fonts.alias) >fonts.alias
+	") ["minInit" "addInputs"];
+	} null; /* null is a terminator for sumArgs */
+	in with localDefs;
+stdenv.mkDerivation rec {
+	name = "X11-fonts";
+	builder = writeScript (name + "-builder")
+		(textClosure localDefs 
+			[installPhase doForceShare doPropagate]);
+	meta = {
+		description = "
+		Directory to contain all X11 fonts requested.
+";
+	};
 }
diff --git a/system/system.nix b/system/system.nix
index 4d27c722425..732ae7b8aa9 100644
--- a/system/system.nix
+++ b/system/system.nix
@@ -189,8 +189,8 @@ rec {
 
   # Font aggregation
   fontDir = import ./fontdir.nix {
-    stdenv = pkgs.stdenv;
-    inherit pkgs config;
+    inherit config pkgs ;
+    inherit (pkgs) builderDefs ;
     inherit (pkgs.xorg) mkfontdir mkfontscale fontalias;
   };
 
-- 
GitLab


From a73c26875a978af52c7390c734b3c9b17d22495a Mon Sep 17 00:00:00 2001
From: Sander van der Burg <s.vanderburg@tudelft.nl>
Date: Mon, 28 Jan 2008 14:30:18 +0000
Subject: [PATCH 0753/5331] Added MySQL service to NixOS

svn path=/nixos/trunk/; revision=10305
---
 system/options.nix       | 34 ++++++++++++++++++++++++++++++++++
 upstart-jobs/default.nix |  6 ++++++
 2 files changed, 40 insertions(+)

diff --git a/system/options.nix b/system/options.nix
index d3679bc0bf7..7fad6af33c6 100644
--- a/system/options.nix
+++ b/system/options.nix
@@ -1519,6 +1519,40 @@
 
   };
 
+  mysql = {
+      enable = mkOption {
+        default = false;
+	description = "
+	  Whether to enable the MySQL server.
+	";
+      };
+      
+      port = mkOption {
+        default = "3306";
+	description = "Port of MySQL"; 
+      };
+      
+      user = mkOption {
+        default = "nobody";
+	description = "User account under which MySQL runs";
+      };
+      
+      datadir = mkOption {
+        default = "/var/mysql";
+	description = "Location where MySQL stores its table files";
+      };
+      
+      log_error = mkOption {
+        default = "/var/log/mysql_err.log";
+	description = "Location of the MySQL error logfile";
+      };
+      
+      pid_file = mkOption {
+        default = "/var/mysql/mysql.pid";
+	description = "Location of the file which stores the PID of the MySQL server";
+      };
+    };
+
 
   installer = {
 
diff --git a/upstart-jobs/default.nix b/upstart-jobs/default.nix
index 7fe6d45dfe6..dc049f36812 100644
--- a/upstart-jobs/default.nix
+++ b/upstart-jobs/default.nix
@@ -168,6 +168,12 @@ let
     })
   */
 
+  # MySQL server
+  ++ optional config.services.mysql.enable
+    (import ../upstart-jobs/mysql.nix {
+      inherit config pkgs;
+    })
+
   # Postgres SQL server
   ++ optional config.services.postgresql.enable
     (import ../upstart-jobs/postgresql.nix {
-- 
GitLab


From f38ed802a61382989eed1b551cabac39a4360251 Mon Sep 17 00:00:00 2001
From: Sander van der Burg <s.vanderburg@tudelft.nl>
Date: Mon, 28 Jan 2008 14:34:29 +0000
Subject: [PATCH 0754/5331] Added MySQL to NixOS

svn path=/nixos/trunk/; revision=10306
---
 upstart-jobs/mysql.nix | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)
 create mode 100644 upstart-jobs/mysql.nix

diff --git a/upstart-jobs/mysql.nix b/upstart-jobs/mysql.nix
new file mode 100644
index 00000000000..311f6747acf
--- /dev/null
+++ b/upstart-jobs/mysql.nix
@@ -0,0 +1,22 @@
+args: with args;
+
+let
+
+cfg = config.services.mysql;
+mysqlService = import ../services/mysql {
+	inherit (pkgs) stdenv mysql;
+	inherit (cfg) port user datadir
+		log_error pid_file;
+};
+
+in
+{
+	name = "mysql";
+	job = "
+description \"MySQL server\"
+
+stop on shutdown
+
+respawn ${mysqlService}/bin/control start
+	";
+}
-- 
GitLab


From 4341ef80d8b2195e84ae4d2c47d2298edab0ba32 Mon Sep 17 00:00:00 2001
From: Sander van der Burg <s.vanderburg@tudelft.nl>
Date: Mon, 28 Jan 2008 14:55:12 +0000
Subject: [PATCH 0755/5331] Fixed MySQL option

svn path=/nixos/trunk/; revision=10307
---
 system/options.nix | 69 +++++++++++++++++++++++-----------------------
 1 file changed, 34 insertions(+), 35 deletions(-)

diff --git a/system/options.nix b/system/options.nix
index 7fad6af33c6..332ae0217a1 100644
--- a/system/options.nix
+++ b/system/options.nix
@@ -1470,6 +1470,40 @@
 
     };
 
+    mysql = {
+      enable = mkOption {
+        default = false;
+	description = "
+	  Whether to enable the MySQL server.
+	";
+      };
+      
+      port = mkOption {
+        default = "3306";
+	description = "Port of MySQL"; 
+      };
+      
+      user = mkOption {
+        default = "nobody";
+	description = "User account under which MySQL runs";
+      };
+      
+      datadir = mkOption {
+        default = "/var/mysql";
+	description = "Location where MySQL stores its table files";
+      };
+      
+      log_error = mkOption {
+        default = "/var/log/mysql_err.log";
+	description = "Location of the MySQL error logfile";
+      };
+      
+      pid_file = mkOption {
+        default = "/var/mysql/mysql.pid";
+	description = "Location of the file which stores the PID of the MySQL server";
+      };
+    };
+
     postgresql = {
       enable = mkOption {
         default = false;
@@ -1519,41 +1553,6 @@
 
   };
 
-  mysql = {
-      enable = mkOption {
-        default = false;
-	description = "
-	  Whether to enable the MySQL server.
-	";
-      };
-      
-      port = mkOption {
-        default = "3306";
-	description = "Port of MySQL"; 
-      };
-      
-      user = mkOption {
-        default = "nobody";
-	description = "User account under which MySQL runs";
-      };
-      
-      datadir = mkOption {
-        default = "/var/mysql";
-	description = "Location where MySQL stores its table files";
-      };
-      
-      log_error = mkOption {
-        default = "/var/log/mysql_err.log";
-	description = "Location of the MySQL error logfile";
-      };
-      
-      pid_file = mkOption {
-        default = "/var/mysql/mysql.pid";
-	description = "Location of the file which stores the PID of the MySQL server";
-      };
-    };
-
-
   installer = {
 
     nixpkgsURL = mkOption {
-- 
GitLab


From 8d5884e01fb134dd1412dac77e8302d7a921d4b5 Mon Sep 17 00:00:00 2001
From: Sander van der Burg <s.vanderburg@tudelft.nl>
Date: Mon, 28 Jan 2008 15:16:14 +0000
Subject: [PATCH 0756/5331] Added JBoss service

svn path=/nixos/trunk/; revision=10309
---
 system/options.nix       | 36 ++++++++++++++++++++++++++++++++++++
 upstart-jobs/default.nix |  6 ++++++
 upstart-jobs/jboss.nix   | 21 +++++++++++++++++++++
 3 files changed, 63 insertions(+)
 create mode 100644 upstart-jobs/jboss.nix

diff --git a/system/options.nix b/system/options.nix
index 332ae0217a1..02f03d8f4aa 100644
--- a/system/options.nix
+++ b/system/options.nix
@@ -985,6 +985,42 @@
 
     };
 
+    jboss = {
+      tempDir = mkOption {
+        default = "/tmp";
+	description = "Location where JBoss stores its temp files";
+      };
+      
+      logDir = mkOption {
+        default = "/var/log/jboss";
+	description = "Location of the logfile directory of JBoss";
+      };
+      
+      serverDir = mkOption {
+        description = "Location of the server instance files";
+	default = "/var/jboss/server";
+      };
+      
+      deployDir = mkOption {
+        description = "Location of the deployment files";
+        default = "/nix/var/nix/profiles/default/server/default/deploy/";
+      };
+      
+      libUrl = mkOption {
+        default = "file:///nix/var/nix/profiles/default/server/default/lib";
+	description = "Location where the shared library JARs are stored";
+      };
+      
+      user = mkOption {
+        default = "nobody";
+	description = "User account under which jboss runs.";
+      };
+      
+      useJK = mkOption {
+        default = false;
+	description = "Whether to use to connector to the Apache HTTP server";
+      };
+    };
 
     httpd = {
 
diff --git a/upstart-jobs/default.nix b/upstart-jobs/default.nix
index dc049f36812..5d5d24ec61f 100644
--- a/upstart-jobs/default.nix
+++ b/upstart-jobs/default.nix
@@ -182,6 +182,12 @@ let
         "gw6c" else "network-interfaces";
     })
 
+  # JBoss service
+  ++ optional config.services.jboss.enable
+    (import ../upstart-jobs/jboss.nix {
+      inherit config pkgs;
+    })  
+
   # Samba service.
   ++ optional config.services.samba.enable
     (import ../upstart-jobs/samba.nix {
diff --git a/upstart-jobs/jboss.nix b/upstart-jobs/jboss.nix
new file mode 100644
index 00000000000..f3a4025a904
--- /dev/null
+++ b/upstart-jobs/jboss.nix
@@ -0,0 +1,21 @@
+args: with args;
+
+let
+
+cfg = config.services.jboss;
+jbossService = import ../services/jboss {
+	inherit (pkgs) stdenv jboss su;
+	inherit (cfg) tempDir logDir libUrl deployDir serverDir user useJK;
+};
+
+in
+{
+	name = "jboss";
+	job = "
+description \"JBoss server\"
+
+stop on shutdown
+
+respawn ${jbossService}/bin/control start
+	";
+}
-- 
GitLab


From 1727c4bd3bc3e4b935623bea01a1c8710a9cfac7 Mon Sep 17 00:00:00 2001
From: Sander van der Burg <s.vanderburg@tudelft.nl>
Date: Mon, 28 Jan 2008 15:40:29 +0000
Subject: [PATCH 0757/5331] Added mod_jk module to apache httpd

svn path=/nixos/trunk/; revision=10310
---
 system/options.nix     | 10 ++++++++++
 upstart-jobs/httpd.nix |  6 ++++--
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/system/options.nix b/system/options.nix
index 02f03d8f4aa..1abc7a309e2 100644
--- a/system/options.nix
+++ b/system/options.nix
@@ -1147,6 +1147,16 @@
         description = "Whether to enable the PHP module.";
       };
 
+      mod_jk = {
+        enable = mkOption {
+          default = false;
+	  description = "Whether to enable the Apache Tomcat connector.";
+        };
+	
+	applicationMappings = mkOption {
+	  default = [];
+	  description = "List of Java webapplications that should be mapped to the servlet container (Tomcat/JBoss)";
+	};
 
       subservices = {
 
diff --git a/upstart-jobs/httpd.nix b/upstart-jobs/httpd.nix
index 0e1703b08ac..afafcf4f173 100644
--- a/upstart-jobs/httpd.nix
+++ b/upstart-jobs/httpd.nix
@@ -18,17 +18,19 @@ let
   stateDir = cfg.stateDir;
   enableSSL = false;
   extraDirectories = cfg.extraDirectories + extraConfig;
-
+  applicationMappings = cfg.mod_jk.applicationMappings;
+  
   startingDependency = if config.services.gw6c.enable && config.services.gw6c.autorun then "gw6c" else "network-interfaces";
   
   webServer = import ../../services/apache-httpd {
     inherit (pkgs) apacheHttpd coreutils;
     stdenv = pkgs.stdenvNewSetupScript;
     php = if cfg.mod_php then pkgs.php else null;
+    tomcat_connectors = if cfg.mod_jk.enable then pkgs.tomcat_connectors else null;
 
     inherit hostName httpPort httpsPort
       user group adminAddr logDir stateDir
-      extraDirectories;
+      extraDirectories applicationMappings;
     noUserDir = !cfg.enableUserDir;
     
     subServices =
-- 
GitLab


From 6e96e0a87d7fad358b7d4574834beb8a47d622de Mon Sep 17 00:00:00 2001
From: Sander van der Burg <s.vanderburg@tudelft.nl>
Date: Mon, 28 Jan 2008 15:44:59 +0000
Subject: [PATCH 0758/5331] Fixed syntax error

svn path=/nixos/trunk/; revision=10311
---
 system/options.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/system/options.nix b/system/options.nix
index 1abc7a309e2..3426c92356b 100644
--- a/system/options.nix
+++ b/system/options.nix
@@ -1157,7 +1157,8 @@
 	  default = [];
 	  description = "List of Java webapplications that should be mapped to the servlet container (Tomcat/JBoss)";
 	};
-
+      };
+      
       subservices = {
 
         subversion = {
-- 
GitLab


From 6f0772d9f0e94730845171ac50b4d1b2c9044c5d Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Mon, 28 Jan 2008 20:04:48 +0000
Subject: [PATCH 0759/5331] JBoss job fix

svn path=/nixos/trunk/; revision=10367
---
 system/options.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/system/options.nix b/system/options.nix
index 3426c92356b..bf7c38d4dc8 100644
--- a/system/options.nix
+++ b/system/options.nix
@@ -986,6 +986,11 @@
     };
 
     jboss = {
+      enable = mkOption {
+        default = false;
+	description = "Whether to enable jboss";
+      };
+
       tempDir = mkOption {
         default = "/tmp";
 	description = "Location where JBoss stores its temp files";
-- 
GitLab


From 2da50038e41858cfca404b784a1087bbbb869982 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 29 Jan 2008 18:53:15 +0000
Subject: [PATCH 0760/5331] * Use aufs instead of unionfs, it seems to be more
 stable.

svn path=/nixos/trunk/; revision=10390
---
 boot/boot-stage-1-init.sh   | 2 +-
 configuration/rescue-cd.nix | 3 ++-
 system/options.nix          | 8 ++++++++
 system/system.nix           | 6 ++++--
 4 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/boot/boot-stage-1-init.sh b/boot/boot-stage-1-init.sh
index 02de35e0cee..3bde517a937 100644
--- a/boot/boot-stage-1-init.sh
+++ b/boot/boot-stage-1-init.sh
@@ -219,7 +219,7 @@ if test -n "@isLiveCD@"; then
     mkdir /mnt/tmpfs
     mount -n -t tmpfs -o "mode=755" none /mnt/tmpfs
     mkdir /mnt/union
-    mount -t unionfs -o dirs=/mnt/tmpfs=rw:$targetRoot=ro none /mnt/union
+    mount -t aufs -o dirs=/mnt/tmpfs=rw:$targetRoot=ro none /mnt/union
     targetRoot=/mnt/union
 fi
 
diff --git a/configuration/rescue-cd.nix b/configuration/rescue-cd.nix
index 435da04db16..2edfe78d9e9 100644
--- a/configuration/rescue-cd.nix
+++ b/configuration/rescue-cd.nix
@@ -15,9 +15,10 @@ rec {
       # The label used to identify the installation CD.
       rootLabel = "NIXOS";
       extraTTYs = [7 8]; # manual, rogue
+      extraModulePackages = [pkgs.aufs];
       initrd = {
         extraKernelModules = [
-          "unionfs" # needed for live-CD operation
+          "aufs" # needed for live-CD operation
         ];
       };
     };
diff --git a/system/options.nix b/system/options.nix
index bf7c38d4dc8..a50ab43929f 100644
--- a/system/options.nix
+++ b/system/options.nix
@@ -123,6 +123,14 @@
       ";
     };
 
+    extraModulePackages = mkOption {
+      default = [];
+      example = [pkgs.aufs pkgs.nvidiaDriver];
+      description = ''
+        A list of additional packages supplying kernel modules.
+      '';
+    };
+
     kernelModules = mkOption {
       default = [];
       description = "
diff --git a/system/system.nix b/system/system.nix
index 732ae7b8aa9..4bc22890cb1 100644
--- a/system/system.nix
+++ b/system/system.nix
@@ -43,7 +43,8 @@ rec {
   # Determine the set of modules that we need to mount the root FS.
   modulesClosure = import ../helpers/modules-closure.nix {
     inherit (pkgs) stdenv module_init_tools;
-    inherit kernel rootModules;
+    inherit rootModules;
+    kernel = modulesTree;
   };
 
 
@@ -148,9 +149,10 @@ rec {
   # directory.
   modulesTree = pkgs.module_aggregation (
     [kernel]
-	++ pkgs.lib.optional config.networking.enableIntel3945ABGFirmware pkgs.iwlwifi
+    ++ pkgs.lib.optional config.networking.enableIntel3945ABGFirmware pkgs.iwlwifi
     # !!! this should be declared by the xserver Upstart job.
     ++ pkgs.lib.optional (config.services.xserver.enable && config.services.xserver.videoDriver == "nvidia") pkgs.nvidiaDrivers
+    ++ config.boot.extraModulePackages
   );
 
   
-- 
GitLab


From 76a64981960ccb22eb3aa44a76ed26cf5dd1eb14 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Tue, 29 Jan 2008 22:37:24 +0000
Subject: [PATCH 0761/5331] Catching up with rescue-cd.nix

svn path=/nixos/trunk/; revision=10391
---
 configuration/rescue-cd-configurable.nix | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/configuration/rescue-cd-configurable.nix b/configuration/rescue-cd-configurable.nix
index e1b0e7088ee..b556608c561 100644
--- a/configuration/rescue-cd-configurable.nix
+++ b/configuration/rescue-cd-configurable.nix
@@ -33,6 +33,7 @@ let
 	{configuration=configuration; suffix=""} is always prepended.
 	*/
 	configList = arg "configList" (configuration : []); 
+	aufs = arg "aufs" true;
 in 
 let
 
@@ -104,17 +105,22 @@ rec {
   configuration = let preConfiguration ={
   
     boot = {
+      isLiveCD = true;
       autoDetectRootDevice = true;
-      readOnlyRoot = true;
       # The label used to identify the installation CD.
       rootLabel = "NIXOS";
       extraTTYs = [] ++ (lib.optional manualEnabled 7) ++
         (lib.optional rogueEnabled 8);
       inherit kernel;
       initrd = {
-        extraKernelModules = extraInitrdKernelModules;
+        extraKernelModules = extraInitrdKernelModules
+	++ (if aufs then ["aufs"] else [])
+	;
       };
       kernelModules = bootKernelModules;
+      extraModulePackages = []
+      ++(if aufs then [pkgs.aufs] else [])
+      ;
     };
     
     services = {
-- 
GitLab


From 34e63da53bb96ddd896397af304c777266ba821e Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 30 Jan 2008 01:14:03 +0000
Subject: [PATCH 0762/5331] * Make nixUnstable the default again.

svn path=/nixos/trunk/; revision=10398
---
 system/options.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/system/options.nix b/system/options.nix
index a50ab43929f..a403ca81c00 100644
--- a/system/options.nix
+++ b/system/options.nix
@@ -1973,7 +1973,7 @@ root        ALL=(ALL) SETENV: ALL
     };
 
     nix = mkOption {
-      default = pkgs: pkgs.nix;
+      default = pkgs: pkgs.nixUnstable;
       example = pkgs: pkgs.nixCustomFun /root/nix.tar.gz;
       description = "
         Use non-default Nix easily. Be careful, though, not to break everything.
-- 
GitLab


From 9fd5d70968ef031f9c95b80ef56a19cd8fe391cf Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 30 Jan 2008 01:28:56 +0000
Subject: [PATCH 0763/5331] * The CD is now a true live CD: you can run Nix
 operations in it   thanks to unionfs.  For instance, nix-env and
 nixos-rebuild work.   The tricky part was to build a Nix database (in the
 tmpfs/unionfs)   which is now necessary to prevent store paths on the CD from
 being   deleted right away because they otherwise wouldn't be valid.

* nixos-install: use the /etc/nixos/configuration.nix from the target
  file system (don't copy it anymore).  Since the user is supposed to
  mount the target file system on /mnt anyway, we may as well require
  that configuration.nix is placed in /mnt/etc/nixos.  This also makes
  upgrading / reinstalling much easier, since it will automatically
  use the right configuration.nix.

svn path=/nixos/trunk/; revision=10399
---
 configuration/rescue-cd.nix      | 13 +++++++++----
 etc/profile.sh                   |  2 +-
 helpers/make-iso9660-image.sh    |  4 ++--
 helpers/paths-from-graph.pl      | 14 ++++++++++++++
 installer/nixos-checkout.sh      |  5 ++---
 installer/nixos-install.sh       | 21 ++++-----------------
 system/activate-configuration.sh |  5 ++++-
 7 files changed, 36 insertions(+), 28 deletions(-)

diff --git a/configuration/rescue-cd.nix b/configuration/rescue-cd.nix
index 2edfe78d9e9..2d9fa54b318 100644
--- a/configuration/rescue-cd.nix
+++ b/configuration/rescue-cd.nix
@@ -36,14 +36,18 @@ rec {
 
       extraJobs = [
         # Unpack the NixOS/Nixpkgs sources to /etc/nixos.
+        # !!! run this synchronously
         { name = "unpack-sources";
           job = "
             start on startup
             script
               export PATH=${pkgs.gnutar}/bin:${pkgs.bzip2}/bin:$PATH
+
+              ${system.nix}/bin/nix-store --load-db < /nix-path-registration
+
               mkdir -p /etc/nixos/nixos
-              tar xjf /nixos.tar.bz2 -C /etc/nixos/nixos
-              tar xjf /nixpkgs.tar.bz2 -C /etc/nixos
+              tar xjf /install/nixos.tar.bz2 -C /etc/nixos/nixos
+              tar xjf /install/nixpkgs.tar.bz2 -C /etc/nixos
               mv /etc/nixos/nixpkgs-* /etc/nixos/nixpkgs
               ln -sfn ../nixpkgs/pkgs /etc/nixos/nixos/pkgs
               chown -R root.root /etc/nixos
@@ -66,6 +70,7 @@ rec {
         { name = "rogue";
           job = "
             env HOME=/root
+            chdir /root
             start on udev
             stop on shutdown
             respawn ${pkgs.rogue}/bin/rogue < /dev/tty8 > /dev/tty8 2>&1
@@ -214,10 +219,10 @@ rec {
         target = "boot/background.xpm.gz";
       }
       { source = nixosTarball + "/" + nixosTarball.tarName;
-        target = "/" + nixosTarball.tarName;
+        target = "/install/" + nixosTarball.tarName;
       }
       { source = nixpkgsTarball;
-        target = "/nixpkgs.tar.bz2";
+        target = "/install/nixpkgs.tar.bz2";
       }
       { source = pkgs.writeText "label" "";
         target = "/${configuration.boot.rootLabel}";
diff --git a/etc/profile.sh b/etc/profile.sh
index 27d265f74ac..99f7d7c1e8b 100644
--- a/etc/profile.sh
+++ b/etc/profile.sh
@@ -73,7 +73,7 @@ if test ! -e $HOME/.nix-defexpr -o -L $HOME/.nix-defexpr; then
     echo "creating $HOME/.nix-defexpr" >&2
     rm -f $HOME/.nix-defexpr
     mkdir $HOME/.nix-defexpr
-    ln -s /etc/nixos/install-source.nix $HOME/.nix-defexpr/nixpkgs_sys
+    ln -s /etc/nixos/nixpkgs $HOME/.nix-defexpr/nixpkgs_sys
     ln -s /etc/nixos/nixos $HOME/.nix-defexpr/nixos
     if test "$USER" != root; then
         ln -s /nix/var/nix/gcroots/per-user/root/channels $HOME/.nix-defexpr/channels_root
diff --git a/helpers/make-iso9660-image.sh b/helpers/make-iso9660-image.sh
index 6f18f0e3e5b..586cfb8deb4 100644
--- a/helpers/make-iso9660-image.sh
+++ b/helpers/make-iso9660-image.sh
@@ -39,8 +39,8 @@ done
 
 
 # Also put a nix-pull manifest of the closures on the CD.
-printManifest=1 perl $pathsFromGraph closure-* > MANIFEST
-echo "MANIFEST=MANIFEST" >> pathlist
+printRegistration=1 perl $pathsFromGraph closure-* > nix-path-registration
+echo "nix-path-registration=nix-path-registration" >> pathlist
 
 
 # Add symlinks to the top-level store objects.
diff --git a/helpers/paths-from-graph.pl b/helpers/paths-from-graph.pl
index bede974cb76..43ce4e68db4 100644
--- a/helpers/paths-from-graph.pl
+++ b/helpers/paths-from-graph.pl
@@ -47,6 +47,20 @@ if ($ENV{"printManifest"} eq "1") {
     }
 }
 
+elsif ($ENV{"printRegistration"} eq "1") {
+    # This is the format used by `nix-store --register-validity
+    # --hash-given' / `nix-store --load-db'.
+    foreach my $storePath (sort (keys %storePaths)) {
+        print "$storePath\n";
+        print "0000000000000000000000000000000000000000000000000000000000000000\n"; # !!! fix
+        print "\n"; # don't care about preserving the deriver
+        print scalar(@{$refs{$storePath}}), "\n";
+        foreach my $ref (@{$refs{$storePath}}) {
+            print "$ref\n";
+        }
+    }
+}
+
 else {
     foreach my $storePath (sort (keys %storePaths)) {
         print "$storePath\n";
diff --git a/installer/nixos-checkout.sh b/installer/nixos-checkout.sh
index d6c3d535d83..339beeecacd 100644
--- a/installer/nixos-checkout.sh
+++ b/installer/nixos-checkout.sh
@@ -29,8 +29,7 @@ fi
 svn co https://svn.cs.uu.nl:12443/repos/trace/nixos/trunk nixos
 svn co https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk nixpkgs
 svn co https://svn.cs.uu.nl:12443/repos/trace/services/trunk services
-ln -sfn ../services nixos/services
 
-# A few symlink.
+# Add a few required symlink.
+ln -sfn ../services nixos/services
 ln -sfn ../nixpkgs/pkgs nixos/pkgs
-ln -sfn nixpkgs/pkgs/top-level/all-packages.nix install-source.nix
diff --git a/installer/nixos-install.sh b/installer/nixos-install.sh
index 07e7360ce92..e7794f720a3 100644
--- a/installer/nixos-install.sh
+++ b/installer/nixos-install.sh
@@ -19,6 +19,7 @@ if test -z "$NIXOS"; then
     NIXOS=/etc/nixos/nixos
 fi
 
+# NIXOS_CONFIG is interpreted relative to $mountPoint.
 if test -z "$NIXOS_CONFIG"; then
     NIXOS_CONFIG=/etc/nixos/configuration.nix
 fi
@@ -38,14 +39,13 @@ if ! test -e "$NIXOS"; then
     exit 1
 fi
     
-if ! test -e "$NIXOS_CONFIG"; then
-    echo "configuration file $NIXOS_CONFIG doesn't exist"
+if ! test -e "$mountPoint/$NIXOS_CONFIG"; then
+    echo "configuration file $mountPoint/$NIXOS_CONFIG doesn't exist"
     exit 1
 fi
     
 
 NIXOS=$(readlink -f "$NIXOS")
-NIXOS_CONFIG=$(readlink -f "$NIXOS_CONFIG")
 
 
 # Mount some stuff in the target root directory.
@@ -142,22 +142,10 @@ echo "building the system configuration..."
 chroot $mountPoint @nix@/bin/nix-env \
     -p /nix/var/nix/profiles/system \
     -f "/mnt$NIXOS/system/system.nix" \
-    --arg configuration "import /mnt$NIXOS_CONFIG" \
+    --arg configuration "import $NIXOS_CONFIG" \
     --set -A system
 
 
-# Copy the configuration to /etc/nixos.
-backupTimestamp=$(date "+%Y%m%d%H%M%S")
-targetConfig=$mountPoint/etc/nixos/configuration.nix
-mkdir -p $(dirname $targetConfig)
-if test -e $targetConfig -o -L $targetConfig; then
-    cp -f $targetConfig $targetConfig.backup-$backupTimestamp
-fi
-if test "$NIXOS_CONFIG" != "$targetConfig"; then
-    cp -f $NIXOS_CONFIG $targetConfig
-fi
-
-
 # Make a backup of the old NixOS/Nixpkgs sources.
 echo "copying NixOS/Nixpkgs sources to /etc/nixos...."
 
@@ -177,7 +165,6 @@ cp -prd $NIXOS $targetNixos
 if test -e /etc/nixos/nixpkgs; then
     cp -prd /etc/nixos/nixpkgs $targetNixpkgs
 fi
-ln -sfn nixpkgs/pkgs/top-level/all-packages.nix $mountPoint/etc/nixos/install-source.nix
 
 
 # Grub needs a mtab.
diff --git a/system/activate-configuration.sh b/system/activate-configuration.sh
index 4e35785f981..e07e8d295af 100644
--- a/system/activate-configuration.sh
+++ b/system/activate-configuration.sh
@@ -155,7 +155,10 @@ fi
 
 
 # Make this configuration the current configuration.
-ln -sfn "$systemConfig" /var/run/current-system
+# The readlink is there to ensure that when $systemConfig = /system
+# (which is a symlink to the store), /var/run/current-system is still
+# used as a garbage collection root.
+ln -sfn "$(readlink -f "$systemConfig")" /var/run/current-system
 
 
 # Prevent the current configuration from being garbage-collected.
-- 
GitLab


From b8cc335fbb20807d3105466880549308d88329ea Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Wed, 30 Jan 2008 09:42:48 +0000
Subject: [PATCH 0764/5331] Reformatted rescue-cd-configurable.nix

svn path=/nixos/trunk/; revision=10401
---
 configuration/rescue-cd-configurable.nix | 553 ++++++++++++-----------
 1 file changed, 287 insertions(+), 266 deletions(-)

diff --git a/configuration/rescue-cd-configurable.nix b/configuration/rescue-cd-configurable.nix
index b556608c561..7df6747d7fa 100644
--- a/configuration/rescue-cd-configurable.nix
+++ b/configuration/rescue-cd-configurable.nix
@@ -1,121 +1,123 @@
-/*
-platform ? __currentSystem
-lib
-*/
-args: with args;
-
-let
-	arg = name: def: lib.getAttr [name] def args;
-	platform = arg "platform" __currentSystem;
-	networkNixpkgs = arg "networkNixpkgs" "";
-	nixpkgsMd5 = arg "nixpkgsMd5" "";
-	manualEnabled = arg "manualEnabled" true;
-	rogueEnabled = arg "rogueEnabled" true;
-	ttyCount = lib.fold builtins.add 0 [
-	  (if rogueEnabled then 1 else 0)
-	  (if manualEnabled then 1 else 0)
-	];
-	sshdEnabled = arg "sshdEnabled" false;
-	fontConfigEnabled = arg "fontConfigEnabled" false;
-	sudoEnable = arg "sudoEnable" false;
-	packages = arg "packages" (pkgs : []);
-	includeMemtest = arg "includeMemtest" true;
-	includeStdenv = arg "includeStdenv" true;
-	includeBuildDeps = arg "includeBuildDeps" false;
-	kernel = arg "kernel" (pkgs : pkgs.kernel);
-	addUsers = arg "addUsers" [];
-	extraInitrdKernelModules = arg "extraInitrdKernelModules" [];
-	bootKernelModules = arg "bootKernelModules" [];
-	arbitraryOverrides = arg "arbitraryOverrides" (config:{});
-	cleanStart = arg "cleanStart" false;
-
-	/* Should return list of {configuration, suffix} attrsets.
-	{configuration=configuration; suffix=""} is always prepended.
-	*/
-	configList = arg "configList" (configuration : []); 
-	aufs = arg "aufs" true;
-in 
+{
+   lib
+  ,platform ? __currentSystem
+  ,networkNixpkgs ? ""
+  ,nixpkgsMd5 ? ""
+  ,manualEnabled ? true
+  ,rogueEnabled ? true
+  ,sshdEnabled ? false
+  ,fontConfigEnabled ? false
+  ,sudoEnable ? false
+  ,packages ? (pkgs : [])
+  ,includeMemtest ? true
+  ,includeStdenv ? true
+  ,includeBuildDeps ? false
+  ,kernel ? (pkgs : pkgs.kernel)
+  ,addUsers ? []
+  ,extraInitrdKernelModules ? []
+  ,bootKernelModules ? []
+  ,arbitraryOverrides ? (config:{})
+  ,cleanStart ? false
+
+   /* Should return list of {configuration, suffix} attrsets.
+   {configuration=configuration; suffix=""} is always prepended.
+   */
+  ,configList ? (configuration : [])
+  ,aufs ? true
+}:
 let
+  ttyCount = lib.fold builtins.add 0 [
+    (if rogueEnabled then 1 else 0)
+    (if manualEnabled then 1 else 0)
+  ];
+ 
+  systemPackBuilder = {suffix, configuration} : 
+  { 
+    system = (import ../system/system.nix) {
+      inherit configuration platform; /* To refactor later - x86+x86_64 DVD */
+      stage2Init = "/init"+suffix;
+    };
+    inherit suffix configuration;
+  };
+ 
+  systemPackGrubEntry = systemPack : 
+  (''
 
-	systemPackBuilder = {suffix, configuration} : { 
-		system = (import ../system/system.nix) {
-			inherit configuration platform; /* To refactor later - x86+x86_64 DVD */
-			stage2Init = "/init"+suffix;
-		};
-		inherit suffix configuration;
-	};
-
-	systemPackGrubEntry = systemPack : (''
-
-          title NixOS Installer / Rescue ${systemPack.system.config.boot.configurationName}
-            kernel /boot/vmlinuz${systemPack.suffix} ${toString systemPack.system.config.boot.kernelParams} systemConfig=/system${systemPack.suffix}
-            initrd /boot/initrd${systemPack.suffix}
-
-	'');
-
-	systemPackInstallRootList = systemPack : [
-	      { source = systemPack.system.kernel + "/vmlinuz";
-		target = "boot/vmlinuz${systemPack.suffix}";
-	      }
-	      { source = systemPack.system.initialRamdisk + "/initrd";
-		target = "boot/initrd${systemPack.suffix}";
-	      }
-	];
-	systemPackInstallClosures = systemPack : ([
-	      { object = systemPack.system.bootStage2;
-		symlink = "/init${systemPack.suffix}";
-	      }
-	      { object = systemPack.system.system;
-		symlink = "/system${systemPack.suffix}";
-	      }
-	]
-	++
-	    (lib.optional includeStdenv 
-	      # To speed up the installation, provide the full stdenv.
-	      { object = systemPack.system.pkgs.stdenv;
-		symlink = "none";
-	      }
-	    )
-	);
-	systemPackInstallBuildClosure = systemPack : ([
-		{
-			object = systemPack.system.system.drvPath;
-			symlink = "none";
-		}
-	]);
-
-
-	userEntry = user : {
-		name = user;
-		description = "NixOS Live Disk non-root user";
-		home = "/home/${user}";
-		createHome = true;
-		group = "users";
-		extraGroups = ["wheel" "audio"];
-		shell = "/bin/sh";
-	};
+      title NixOS Installer / Rescue ${systemPack.system.config.boot.configurationName}
+      kernel /boot/vmlinuz${systemPack.suffix} ${toString systemPack.system.config.boot.kernelParams} systemConfig=/system${systemPack.suffix}
+      initrd /boot/initrd${systemPack.suffix}
+ 
+  '');
+ 
+  systemPackInstallRootList = systemPack : 
+  [
+    { 
+      source = systemPack.system.kernel + "/vmlinuz";
+      target = "boot/vmlinuz${systemPack.suffix}";
+    }
+    { 
+      source = systemPack.system.initialRamdisk + "/initrd";
+      target = "boot/initrd${systemPack.suffix}";
+    }
+  ];
+  systemPackInstallClosures = systemPack : 
+  ([
+    { 
+      object = systemPack.system.bootStage2;
+      symlink = "/init${systemPack.suffix}";
+    }
+    { 
+      object = systemPack.system.system;
+      symlink = "/system${systemPack.suffix}";
+    }
+  ]
+  ++
+  (lib.optional includeStdenv 
+  # To speed up the installation, provide the full stdenv.
+    { 
+      object = systemPack.system.pkgs.stdenv;
+      symlink = "none";
+    }
+  )
+  );
+  systemPackInstallBuildClosure = systemPack : 
+  ([
+    {
+      object = systemPack.system.system.drvPath;
+      symlink = "none";
+    }
+  ]);
+ 
+ 
+  userEntry = user : 
+  {
+    name = user;
+    description = "NixOS Live Disk non-root user";
+    home = "/home/${user}";
+    createHome = true;
+    group = "users";
+    extraGroups = ["wheel" "audio"];
+    shell = "/bin/sh";
+  };
 in
 
 rec {
-
-  
   nixpkgsRel = "nixpkgs" + (if networkNixpkgs != "" then "-" + networkNixpkgs else "");
-
-
+ 
   configuration = let preConfiguration ={
-  
     boot = {
       isLiveCD = true;
       autoDetectRootDevice = true;
       # The label used to identify the installation CD.
       rootLabel = "NIXOS";
-      extraTTYs = [] ++ (lib.optional manualEnabled 7) ++
-        (lib.optional rogueEnabled 8);
+      extraTTYs = [] 
+        ++ (lib.optional manualEnabled 7) 
+        ++ (lib.optional rogueEnabled 8);
       inherit kernel;
       initrd = {
-        extraKernelModules = extraInitrdKernelModules
-	++ (if aufs then ["aufs"] else [])
-	;
+      extraKernelModules = extraInitrdKernelModules
+      ++ (if aufs then ["aufs"] else [])
+      ;
       };
       kernelModules = bootKernelModules;
       extraModulePackages = []
@@ -124,127 +126,134 @@ rec {
     };
     
     services = {
-    
-      sshd = {
-        enable = sshdEnabled;
-      };
       
-      xserver = {
-        enable = false;
-      };
-
+      sshd = { enable = sshdEnabled; };
+      
+      xserver = { enable = false; };
+   
       extraJobs = [
         # Unpack the NixOS/Nixpkgs sources to /etc/nixos.
-        { name = "unpack-sources";
-          job = "
+        { 
+          name = "unpack-sources";
+          job = ''
             start on startup
             script
-              export PATH=${pkgs.gnutar}/bin:${pkgs.bzip2}/bin:$PATH
-              mkdir -p /etc/nixos/nixos
-              tar xjf /nixos.tar.bz2 -C /etc/nixos/nixos
-              tar xjf /nixpkgs.tar.bz2 -C /etc/nixos
-              mv /etc/nixos/nixpkgs-* /etc/nixos/nixpkgs || true
-              ln -sfn ../nixpkgs/pkgs /etc/nixos/nixos/pkgs
-              chown -R root.root /etc/nixos
-	      touch /etc/resolv.conf
+            export PATH=${pkgs.gnutar}/bin:${pkgs.bzip2}/bin:$PATH
+        
+            ${system.nix}/bin/nix-store --load-db < /nix-path-registration
+        
+            mkdir -p /etc/nixos/nixos
+            tar xjf /install/nixos.tar.bz2 -C /etc/nixos/nixos
+            tar xjf /install/nixpkgs.tar.bz2 -C /etc/nixos
+            mv /etc/nixos/nixpkgs-* /etc/nixos/nixpkgs || true
+            ln -sfn ../nixpkgs/pkgs /etc/nixos/nixos/pkgs
+            chown -R root.root /etc/nixos
+            touch /etc/resolv.conf
             end script
-          ";
-        }] 
-	
-	++ 
-      
-        (lib.optional manualEnabled 
+          '';
+        }
+      ] 
+        
+      ++ 
+        
+      (lib.optional manualEnabled 
         # Show the NixOS manual on tty7.
-        { name = "manual";
-          job = "
+        { 
+          name = "manual";
+          job = ''
             start on udev
             stop on shutdown
             respawn ${pkgs.w3m}/bin/w3m ${manual} < /dev/tty7 > /dev/tty7 2>&1
-          ";
-        })
-
-	++
-
-        (lib.optional rogueEnabled
+          '';
+        }
+      )
+       
+      ++
+       
+      (lib.optional rogueEnabled
         # Allow the user to do something useful on tty8 while waiting
         # for the installation to finish.
-        { name = "rogue";
-          job = "
+        { 
+          name = "rogue";
+          job = ''
             start on udev
             stop on shutdown
             respawn ${pkgs.rogue}/bin/rogue < /dev/tty8 > /dev/tty8 2>&1
-          ";
-        })
-
-	++
-
-	(lib.optional (addUsers != [])
-	# Set empty passwords
-	{
-		name = "clear-passwords";
-		job = '' 
-                  start on startup
-                  script 
-                        for i in ${lib.concatStringsSep " " addUsers}; do
-                            echo | ${pkgs.pwdutils}/bin/passwd --stdin $i
-                        done
-                  end script
-		'';
-	})
+          '';
+        }
+      )
+       
+      ++
+       
+      (lib.optional (addUsers != [])
+        # Set empty passwords
+        {
+          name = "clear-passwords";
+          job = '' 
+            start on startup
+            script 
+              for i in ${lib.concatStringsSep " " addUsers}; do
+                  echo | ${pkgs.pwdutils}/bin/passwd --stdin $i
+              done
+            end script
+          '';
+        }
+      )
       ;
-
+       
       # And a background to go with that.
       ttyBackgrounds = {
         specificThemes = []
-	++
-	  (lib.optional manualEnabled
-          { tty = 7;
+        ++
+        (lib.optional manualEnabled
+          { 
+            tty = 7;
             # Theme is GPL according to http://kde-look.org/content/show.php/Green?content=58501.
             theme = pkgs.fetchurl {
               url = http://www.kde-look.org/CONTENT/content-files/58501-green.tar.gz;
               sha256 = "0sdykpziij1f3w4braq8r8nqg4lnsd7i7gi1k5d7c31m2q3b9a7r";
             };
-          })
-	++
-	  (lib.optional rogueEnabled 
-          { tty = 8;
+          }
+        )
+        ++
+        (lib.optional rogueEnabled 
+          { 
+            tty = 8;
             theme = pkgs.fetchurl {
               url = http://www.bootsplash.de/files/themes/Theme-GNU.tar.bz2;
               md5 = "61969309d23c631e57b0a311102ef034";
             };
-          })
+          }
+        )
         ;
       };
-
+   
       mingetty = {
-        helpLine = ''
-        
+        helpLine = ''     
           Log in as "root" with an empty password. 
         ''
-	+(if addUsers != [] then '' These users also have empty passwords:
-	${lib.concatStringsSep " " addUsers }
-	'' else "")
-	+(if manualEnabled then " Press <Alt-F7> for help." else "");
+        +(if addUsers != [] then 
+          '' These users also have empty passwords:
+            ${lib.concatStringsSep " " addUsers }
+          '' 
+        else "")
+        +(if manualEnabled then " Press <Alt-F7> for help." else "");
       };
       
     };
-
-    fonts = {
-      enableFontConfig = fontConfigEnabled;
-    };
+  
+    fonts = { enableFontConfig = fontConfigEnabled; };
     
     installer = {
       nixpkgsURL = 
-      (if networkNixpkgs != "" then http://nix.cs.uu.nl/dist/nix/ + nixpkgsRel
-        else file:///mnt/ );
+        (if networkNixpkgs != "" then http://nix.cs.uu.nl/dist/nix/ + nixpkgsRel
+          else file:///mnt/ );
     };
-
+  
     security = {
-      sudo = {
-        enable = sudoEnable;
-      };
+      sudo = { enable = sudoEnable; };
     };
- 
+    
     environment = {
       extraPackages = if cleanStart then pkgs:[] else pkgs: [
         pkgs.vim
@@ -254,76 +263,75 @@ rec {
       checkConfigurationOptions = true;
       cleanStart = cleanStart;
     };
-
+  
     users = {
       extraUsers = map userEntry addUsers;
     };
- 
+    
   }; in preConfiguration // (arbitraryOverrides preConfiguration);
-
+ 
   configurations = [{
     inherit configuration;
     suffix = "";
   }] ++ (configList configuration);
   systemPacks = map systemPackBuilder configurations;
-
+ 
   system = (builtins.head systemPacks).system; /* I hope this is unneeded */
   pkgs = system.pkgs; /* Nothing non-fixed should be built from it */
-
-
+ 
+ 
   # The NixOS manual, with a backward compatibility hack for Nix <=
   # 0.11 (you won't get the manual).
-  manual =
-    if builtins ? unsafeDiscardStringContext
+  manual = if builtins ? unsafeDiscardStringContext
     then "${import ../doc/manual}/manual.html"
     else pkgs.writeText "dummy-manual" "Manual not included in this build!";
-
-
+ 
+ 
   # Since the CD is read-only, the mount points must be on disk.
-  cdMountPoints = pkgs.runCommand "mount-points" {} "
+  cdMountPoints = pkgs.runCommand "mount-points" {} ''
     ensureDir $out
     cd $out
     mkdir proc sys tmp etc dev var mnt nix nix/var root bin ${if addUsers != "" then "home" else ""}
     touch $out/${configuration.boot.rootLabel}
-  ";
-
-
+  '';
+ 
+ 
   # 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
+  # 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.runCommand "tarball" {inherit tarName;} "
+  makeTarball = tarName: input: pkgs.runCommand "tarball" {inherit tarName;} ''
     ensureDir $out
-    (cd ${input} && tar cvfj $out/${tarName} . \\
-      --exclude '*~' \\
-      --exclude 'pkgs' --exclude 'result')
-  ";
-
-  makeNixPkgsTarball = tarName: input: ((pkgs.runCommand "tarball-nixpkgs" {inherit tarName;} "
-    ensureDir $out
-    (cd ${input}/.. && tar cvfj $out/${tarName} nixpkgs \\
-      --exclude '*~' \\
-      --exclude 'result')
-  ")+"/${tarName}");
-
-
+    (cd ${input} && tar cvfj $out/${tarName} . \
+        --exclude '*~' \
+        --exclude 'pkgs' --exclude 'result')
+  '';
+ 
+  makeNixPkgsTarball = tarName: input: ((pkgs.runCommand "tarball-nixpkgs" {inherit tarName;} ''
+  ensureDir $out
+    (cd ${input}/.. && tar cvfj $out/${tarName} nixpkgs \
+        --exclude '*~' \
+        --exclude 'result')
+  '')+"/${tarName}");
+ 
+ 
   
   # Put the current directory in a tarball (making sure to filter
   # out crap like the .svn directories).
   nixosTarball =
     let filter = name: type:
-      let base = baseNameOf (toString name);
-      in base != ".svn" && base != "result";
+    let base = baseNameOf (toString name);
+    in base != ".svn" && base != "result";
     in
-      makeTarball "nixos.tar.bz2" (builtins.filterSource filter ./..);
-
-
+    makeTarball "nixos.tar.bz2" (builtins.filterSource filter ./..);
+ 
+ 
   # Get a recent copy of Nixpkgs.
-  nixpkgsTarball = if networkNixpkgs != "" then  pkgs.fetchurl {
+  nixpkgsTarball = if networkNixpkgs != "" then pkgs.fetchurl {
     url = configuration.installer.nixpkgsURL + "/" + nixpkgsRel + ".tar.bz2";
     md5 = "6a793b877e2a4fa79827515902e1dfd8";
   } else makeNixPkgsTarball "nixpkgs.tar.bz2" "/etc/nixos/nixpkgs";
-
-
+ 
+ 
   # The configuration file for Grub.
   grubCfg = pkgs.writeText "menu.lst" (''
     default 0
@@ -333,68 +341,81 @@ rec {
   (lib.concatStrings (map systemPackGrubEntry systemPacks))
   + (if includeMemtest then
   ''
-
+ 
     title Memtest86+
-      kernel /boot/memtest.bin
+    kernel /boot/memtest.bin
   '' else ""));
-
-
+ 
+ 
   # Create an ISO image containing the Grub boot loader, the kernel,
   # the initrd produced above, and the closure of the stage 2 init.
   rescueCD = import ../helpers/make-iso9660-image.nix {
     inherit (pkgs) stdenv perl cdrkit;
     isoName = "nixos-${platform}.iso";
-
+  
     # Single files to be copied to fixed locations on the CD.
-    contents = lib.uniqList {inputList =
-    [
-      { source = "${pkgs.grub}/lib/grub/i386-pc/stage2_eltorito";
-        target = "boot/grub/stage2_eltorito";
-      }
-      { source = grubCfg;
-        target = "boot/grub/menu.lst";
-      }]
+    contents = lib.uniqList {
+      inputList = [
+        { 
+          source = "${pkgs.grub}/lib/grub/i386-pc/stage2_eltorito";
+          target = "boot/grub/stage2_eltorito";
+        }
+        { 
+          source = grubCfg;
+          target = "boot/grub/menu.lst";
+        }
+      ]
       ++ 
       (lib.concatLists (map systemPackInstallRootList systemPacks))
       ++
-      [{ source = system.config.boot.grubSplashImage;
-        target = "boot/background.xpm.gz";
-      }
-      { source = cdMountPoints;
-        target = "/";
-      }
-      { source = nixosTarball + "/" + nixosTarball.tarName;
-        target = "/" + nixosTarball.tarName;
-      }
-      { source = nixpkgsTarball;
-        target = "/nixpkgs.tar.bz2";
-      }
-    ]
-    ++
-    (lib.optional includeMemtest 
-      { source = pkgs.memtest86 + "/memtest.bin";
-        target = "boot/memtest.bin";
-      }
-    )
-    ;};
-
+      [
+        { 
+          source = system.config.boot.grubSplashImage;
+          target = "boot/background.xpm.gz";
+        }
+        { 
+          source = cdMountPoints;
+          target = "/";
+        }
+        { 
+          source = nixosTarball + "/" + nixosTarball.tarName;
+          target = "/install/" + nixosTarball.tarName;
+        }
+        {
+          source = nixpkgsTarball;
+          target = "/install/nixpkgs.tar.bz2";
+        }
+      ]
+      ++
+      (lib.optional includeMemtest 
+        { 
+          source = pkgs.memtest86 + "/memtest.bin";
+          target = "boot/memtest.bin";
+        }
+      )
+      ;
+    };
+  
     # Closures to be copied to the Nix store on the CD.
     storeContents = lib.uniqListExt {
-    	inputList= lib.concatLists 
-		(map systemPackInstallClosures systemPacks);
-	getter = x : x.object.drvPath;
-	compare = lib.eqStrings;
+      inputList= lib.concatLists 
+        (map systemPackInstallClosures systemPacks);
+      getter = x : x.object.drvPath;
+      compare = lib.eqStrings;
+    };
+  
+    buildStoreContents = lib.uniqList 
+    {
+      inputList=([]
+      ++
+      (if includeBuildDeps then lib.concatLists 
+        (map systemPackInstallBuildClosure systemPacks)
+      else [])
+      );
     };
-
-    buildStoreContents = lib.uniqList {inputList=([]
-    ++
-    (if includeBuildDeps then lib.concatLists 
-    	(map systemPackInstallBuildClosure systemPacks)
-	else [])
-    );};
     
     bootable = true;
     bootImage = "boot/grub/stage2_eltorito";
   };
-
+ 
 }
-- 
GitLab


From b3ff0f8a595813c199a279fdb0c704f71844d7a8 Mon Sep 17 00:00:00 2001
From: Sander van der Burg <s.vanderburg@tudelft.nl>
Date: Wed, 30 Jan 2008 11:00:00 +0000
Subject: [PATCH 0765/5331] Added tomcat service to NixOS

svn path=/nixos/trunk/; revision=10402
---
 system/options.nix       | 17 +++++++++++++++++
 upstart-jobs/default.nix |  6 ++++++
 2 files changed, 23 insertions(+)

diff --git a/system/options.nix b/system/options.nix
index a403ca81c00..d0a26fd9937 100644
--- a/system/options.nix
+++ b/system/options.nix
@@ -1035,6 +1035,23 @@
       };
     };
 
+    tomcat = {
+      enable = mkOption {
+        default = false;
+	description = "Whether to enable Apache Tomcat";
+      };
+      
+      baseDir = mkOption {
+        default = "/var/tomcat";
+	description = "Location where Tomcat stores configuration files, webapplications and logfiles";
+      };
+      
+      user = mkOption {
+        default = "nobody";
+	description = "User account under which Apache Tomcat runs.";
+      };      
+    };
+
     httpd = {
 
       enable = mkOption {
diff --git a/upstart-jobs/default.nix b/upstart-jobs/default.nix
index 5d5d24ec61f..017c1c3fda0 100644
--- a/upstart-jobs/default.nix
+++ b/upstart-jobs/default.nix
@@ -188,6 +188,12 @@ let
       inherit config pkgs;
     })  
 
+  # Apache Tomcat service
+  ++ optional config.services.tomcat.enable
+    (import ../upstart-jobs/tomcat.nix {
+      inherit config pkgs;
+    })
+
   # Samba service.
   ++ optional config.services.samba.enable
     (import ../upstart-jobs/samba.nix {
-- 
GitLab


From c1f619a08780901def3f81f352a29f0711af0623 Mon Sep 17 00:00:00 2001
From: Sander van der Burg <s.vanderburg@tudelft.nl>
Date: Wed, 30 Jan 2008 11:00:59 +0000
Subject: [PATCH 0766/5331] Added tomcat service to NixOS

svn path=/nixos/trunk/; revision=10403
---
 upstart-jobs/tomcat.nix | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)
 create mode 100644 upstart-jobs/tomcat.nix

diff --git a/upstart-jobs/tomcat.nix b/upstart-jobs/tomcat.nix
new file mode 100644
index 00000000000..eb3ecb74443
--- /dev/null
+++ b/upstart-jobs/tomcat.nix
@@ -0,0 +1,21 @@
+args: with args;
+
+let
+
+cfg = config.services.tomcat;
+tomcatService = import ../services/tomcat {
+	inherit (pkgs) stdenv jdk tomcat6 su;
+	inherit (cfg) baseDir user;
+};
+
+in
+{
+	name = "tomcat";
+	job = "
+description \"Apache Tomcat server\"
+
+stop on shutdown
+
+respawn ${tomcatService}/bin/control start
+	";
+}
-- 
GitLab


From 7363895f6d4e3e0806280b6548c706a19e7ab114 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 30 Jan 2008 14:16:38 +0000
Subject: [PATCH 0767/5331] * Rewrote the hardware scanner in Perl.

svn path=/nixos/trunk/; revision=10405
---
 installer/nixos-hardware-scan.pl | 174 +++++++++++++++++++++++++++++++
 installer/nixos-hardware-scan.sh | 144 -------------------------
 2 files changed, 174 insertions(+), 144 deletions(-)
 create mode 100644 installer/nixos-hardware-scan.pl
 delete mode 100644 installer/nixos-hardware-scan.sh

diff --git a/installer/nixos-hardware-scan.pl b/installer/nixos-hardware-scan.pl
new file mode 100644
index 00000000000..5b2f6692d86
--- /dev/null
+++ b/installer/nixos-hardware-scan.pl
@@ -0,0 +1,174 @@
+#! @perl@ -w
+
+use File::Spec;
+use File::Basename;
+
+
+my @kernelModules = ();
+my @initrdKernelModules = ();
+
+
+# Read a file, returning undef if the file cannot be opened.
+sub readFile {
+    my $filename = shift;
+    my $res;
+    if (open FILE, "<$filename") {
+        my $prev = $/;
+        undef $/;
+        $res = <FILE>;
+        $/ = $prev;
+        close FILE;
+        chomp $res;
+    }
+    return $res;
+}
+
+
+my $cpuinfo = readFile "/proc/cpuinfo";
+
+
+sub hasCPUFeature {
+    my $feature = shift;
+    return $cpuinfo =~ /^flags\s*:.* $feature( |$)/m;
+}
+
+
+# Detect the number of CPU cores.
+my $cpus = scalar (grep {/^processor\s*:/} (split '\n', $cpuinfo));
+
+
+# CPU frequency scaling.  Not sure about this test.
+push @kernelModules, "acpi-cpufreq" if hasCPUFeature "acpi";
+
+
+# Virtualization support?
+push @kernelModules, "kvm-intel" if hasCPUFeature "vmx";
+push @kernelModules, "kvm-amd" if hasCPUFeature "svm";
+
+
+# Look at the PCI devices and add necessary modules.  Note that most
+# modules are auto-detected so we don't need to list them here.
+# However, some are needed in the initrd to boot the system.
+
+sub pciCheck {
+    my $path = shift;
+    my $vendor = readFile "$path/vendor";
+    my $device = readFile "$path/device";
+    my $class = readFile "$path/class";
+    
+    my $module;
+    if (-e "$path/driver/module") {
+        $module = basename `readlink -f $path/driver/module`;
+        chomp $module;
+    }
+    
+    print "$path: $vendor $device $class";
+    print " $module" if defined $module;
+    print "\n";
+
+    if (defined $module) {
+        # See the bottom of http://pciids.sourceforge.net/pci.ids for
+        # device classes.
+        if (# Mass-storage controller.  Definitely important.
+            $class =~ /^0x01/ ||
+
+            # Firewire controller.  A disk might be attached.
+            $class =~ /^0x0c00/ ||
+
+            # USB controller.  Needed if we want to use the
+            # keyboard when things go wrong in the initrd.
+            $class =~ /^0x0c03/
+            )
+        {
+            push @initrdKernelModules, $module;
+        }
+    }        
+}
+
+foreach my $path (glob "/sys/bus/pci/devices/*") {
+    pciCheck $path;
+}
+
+
+# Idem for USB devices.
+
+sub usbCheck {
+    my $path = shift;
+    my $class = readFile "$path/bInterfaceClass";
+    my $subclass = readFile "$path/bInterfaceSubClass";
+    my $protocol = readFile "$path/bInterfaceProtocol";
+
+    my $module;
+    if (-e "$path/driver/module") {
+        $module = basename `readlink -f $path/driver/module`;
+        chomp $module;
+    }
+    
+    print "$path: $class $subclass $protocol";
+    print " $module" if defined $module;
+    print "\n";
+ 
+    if (defined $module) {
+        if (# Mass-storage controller.  Definitely important.
+            $class eq "08" ||
+
+            # Keyboard.  Needed if we want to use the
+            # keyboard when things go wrong in the initrd.
+            ($class eq "03" && $protocol eq "01")
+            )
+        {
+            push @initrdKernelModules, $module;
+        }
+    }
+}
+
+foreach my $path (glob "/sys/bus/usb/devices/*") {
+    if (-e "$path/bInterfaceClass") {
+        usbCheck $path;
+    }
+}
+
+
+
+# Generate the configuration file.
+
+sub removeDups {
+    my %seen;
+    my @res = ();
+    foreach my $s (@_) {
+        if (!defined $seen{$s}) {
+            $seen{$s} = "";
+            push @res, $s;
+        }
+    }
+    return @res;
+}
+
+sub toNixExpr {
+    my $res = "";
+    foreach my $s (@_) {
+        $res .= " \"$s\"";
+    }
+    return $res;
+}
+
+my $initrdKernelModules = toNixExpr(removeDups @initrdKernelModules);
+my $kernelModules = toNixExpr(removeDups @kernelModules);
+ 
+
+print <<EOF ;
+# This is a generated file.  Do not modify!
+# Make changes to /etc/nixos/configuration.nix instead.
+{
+  boot = {
+    initrd = {
+      extraKernelModules = [ $initrdKernelModules ];
+    };
+    kernelModules = [ $kernelModules ];
+  };
+
+  nix = {
+    maxJobs = $cpus;
+  };
+}
+EOF
diff --git a/installer/nixos-hardware-scan.sh b/installer/nixos-hardware-scan.sh
deleted file mode 100644
index 06fbb11dfa1..00000000000
--- a/installer/nixos-hardware-scan.sh
+++ /dev/null
@@ -1,144 +0,0 @@
-#! @shell@ -e
-
-
-kernelModules=
-initrdKernelModules=
-
-hasCPUFeature() {
-    local feature="$1"
-    cat /proc/cpuinfo | grep -q "^flags.* $feature\( \|$\)"
-}
-
-needKernelModule() {
-    kernelModules="$kernelModules \"$1\""
-}
-
-needInitrdKernelModule() {
-    initrdKernelModules="$initrdKernelModules \"$1\""
-}
-
-
-# Detect the number of CPU cores.
-cpus="$(cat /proc/cpuinfo | grep '^processor' | wc -l)"
-
-
-# CPU frequency scaling.  Not sure about this test.
-if hasCPUFeature "acpi"; then
-    needKernelModule "acpi-cpufreq"
-fi
-
-
-# Virtualization support?
-if hasCPUFeature "vmx"; then
-    needKernelModule "kvm-intel"
-fi
-
-if hasCPUFeature "svm"; then
-    needKernelModule "kvm-amd"
-fi
-
-
-# Look at the PCI devices and add necessary modules.  Note that most
-# modules are auto-detected so we don't need to list them here.
-# However, some are needed in the initrd to boot the system.
-
-pciCheck() {
-    local path="$1"
-    local vendor="$(cat $path/vendor)" 
-    local device="$(cat $path/device)"
-    local class="$(cat $path/class)"
-
-    local module
-    if test -e "$path/driver/module"; then
-        module=$(basename $(readlink -f $path/driver/module))
-    fi
-
-    echo "$path: $vendor $device $class $module"
-
-    if test -n "$module"; then
-        # See the bottom of http://pciids.sourceforge.net/pci.ids for
-        # device classes.
-        case $class in
-            0x01*)
-                # Mass-storage controller.  Definitely important.
-                needInitrdKernelModule $module
-                ;;
-            0x0c00*)
-                # Firewire controller.  A disk might be attached.
-                needInitrdKernelModule $module
-                ;;
-            0x0c03*)
-                # USB controller.  Needed if we want to use the
-                # keyboard when things go wrong in the initrd.
-                needInitrdKernelModule $module
-                ;;
-        esac
-    fi        
-}
-
-for path in /sys/bus/pci/devices/*; do
-    pciCheck "$path"
-done
-
-
-# Idem for USB devices.
-
-usbCheck() {
-    local path="$1"
-    local class="$(cat $path/bInterfaceClass)" 
-    local subclass="$(cat $path/bInterfaceSubClass)"
-    local protocol="$(cat $path/bInterfaceProtocol)"
-
-    local module
-    if test -e "$path/driver/module"; then
-        module=$(basename $(readlink -f $path/driver/module))
-    fi
-
-    echo "$path: $class $subclass $protocol $module"
-
-    if test -n "$module"; then
-        # See http://www.linux-usb.org/usb.ids for
-        # classes/subclasses/protocols.
-        case $class:$subclass:$protocol in
-            08:*)
-                # Mass-storage controller.  Definitely important.
-                needInitrdKernelModule $module
-                ;;
-            03:*:01)
-                # Keyboard.  Needed if we want to use the
-                # keyboard when things go wrong in the initrd.
-                needInitrdKernelModule $module
-                ;;
-        esac
-    fi        
-}
-
-for path in /sys/bus/usb/devices/*; do
-    if test -e "$path/bInterfaceClass"; then
-        usbCheck "$path"
-    fi
-done
-
-
-# Remove duplicate modules.  !!! preserve order
-kernelModules=$(for i in $kernelModules; do echo $i; done | sort | uniq)
-initrdKernelModules=$(for i in $initrdKernelModules; do echo $i; done | sort | uniq)
-
-
-# Generation the configuration file.
-cat <<EOF
-# This is a generated file.  Do not modify!
-# Make changes to /etc/nixos/configuration.nix instead.
-{
-  boot = {
-    initrd = {
-      extraKernelModules = [ $(echo $initrdKernelModules) ];
-    };
-    kernelModules = [ $(echo $kernelModules) ];
-  };
-
-  nix = {
-    maxJobs = $cpus;
-  };
-}
-EOF
-- 
GitLab


From 92fffa1ee8ee18ad6ac5084edb22731dfff99c88 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 30 Jan 2008 14:32:02 +0000
Subject: [PATCH 0768/5331] * Detect the networking.enableIntel2200BGFirmware
 option.

svn path=/nixos/trunk/; revision=10406
---
 installer/nixos-hardware-scan.pl | 30 ++++++++++++++++++++++--------
 1 file changed, 22 insertions(+), 8 deletions(-)

diff --git a/installer/nixos-hardware-scan.pl b/installer/nixos-hardware-scan.pl
index 5b2f6692d86..4c704862ae8 100644
--- a/installer/nixos-hardware-scan.pl
+++ b/installer/nixos-hardware-scan.pl
@@ -50,6 +50,8 @@ push @kernelModules, "kvm-amd" if hasCPUFeature "svm";
 # modules are auto-detected so we don't need to list them here.
 # However, some are needed in the initrd to boot the system.
 
+my $enableIntel2200BGFirmware = "false";
+
 sub pciCheck {
     my $path = shift;
     my $vendor = readFile "$path/vendor";
@@ -62,9 +64,9 @@ sub pciCheck {
         chomp $module;
     }
     
-    print "$path: $vendor $device $class";
-    print " $module" if defined $module;
-    print "\n";
+    print STDERR "$path: $vendor $device $class";
+    print STDERR " $module" if defined $module;
+    print STDERR "\n";
 
     if (defined $module) {
         # See the bottom of http://pciids.sourceforge.net/pci.ids for
@@ -82,7 +84,14 @@ sub pciCheck {
         {
             push @initrdKernelModules, $module;
         }
-    }        
+    }
+
+    # Can't rely on $module here, since the module may not be loaded
+    # due to missing firmware.  Ideally we would check modules.pcimap
+    # here.
+    $enableIntel2200BGFirmware = "true" if $vendor eq "0x8086" &&
+        ($device eq "0x1043" || $device eq "0x104f" || $device eq "0x4220" ||
+         $device eq "0x4221" || $device eq "0x4223" || $device eq "0x4224");
 }
 
 foreach my $path (glob "/sys/bus/pci/devices/*") {
@@ -104,9 +113,9 @@ sub usbCheck {
         chomp $module;
     }
     
-    print "$path: $class $subclass $protocol";
-    print " $module" if defined $module;
-    print "\n";
+    print STDERR "$path: $class $subclass $protocol";
+    print STDERR " $module" if defined $module;
+    print STDERR "\n";
  
     if (defined $module) {
         if (# Mass-storage controller.  Definitely important.
@@ -129,7 +138,6 @@ foreach my $path (glob "/sys/bus/usb/devices/*") {
 }
 
 
-
 # Generate the configuration file.
 
 sub removeDups {
@@ -170,5 +178,11 @@ print <<EOF ;
   nix = {
     maxJobs = $cpus;
   };
+
+  networking = {
+    # Warning: setting this option to `true' requires acceptance of the
+    # firmware license, see http://ipw2200.sourceforge.net/firmware.php?fid=7.
+    enableIntel2200BGFirmware = $enableIntel2200BGFirmware;
+  };
 }
 EOF
-- 
GitLab


From 406d3aafc55186db8acd59d5c2031d837efdd5c6 Mon Sep 17 00:00:00 2001
From: Sander van der Burg <s.vanderburg@tudelft.nl>
Date: Wed, 30 Jan 2008 14:38:27 +0000
Subject: [PATCH 0769/5331] Added deploydir to tomcat service

svn path=/nixos/trunk/; revision=10407
---
 system/options.nix      | 5 +++++
 upstart-jobs/tomcat.nix | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/system/options.nix b/system/options.nix
index d0a26fd9937..1bb75e0d5a4 100644
--- a/system/options.nix
+++ b/system/options.nix
@@ -1050,6 +1050,11 @@
         default = "nobody";
 	description = "User account under which Apache Tomcat runs.";
       };      
+      
+      deployFrom = mkOption {
+        default = "";
+	description = "Location where webapplications are stored. Leave empty to use the baseDir.";
+      };
     };
 
     httpd = {
diff --git a/upstart-jobs/tomcat.nix b/upstart-jobs/tomcat.nix
index eb3ecb74443..f336acf6564 100644
--- a/upstart-jobs/tomcat.nix
+++ b/upstart-jobs/tomcat.nix
@@ -5,7 +5,7 @@ let
 cfg = config.services.tomcat;
 tomcatService = import ../services/tomcat {
 	inherit (pkgs) stdenv jdk tomcat6 su;
-	inherit (cfg) baseDir user;
+	inherit (cfg) baseDir user deployFrom;
 };
 
 in
-- 
GitLab


From 8e94f3ad67536c26a4ba19aa4da5a5b8a3609386 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 30 Jan 2008 14:50:25 +0000
Subject: [PATCH 0770/5331] * First attempt at detecting
 services.xserver.videoDriver.

svn path=/nixos/trunk/; revision=10408
---
 installer/nixos-hardware-scan.pl | 29 +++++++++++++++++++++++++++++
 1 file changed, 29 insertions(+)

diff --git a/installer/nixos-hardware-scan.pl b/installer/nixos-hardware-scan.pl
index 4c704862ae8..e96b5b44ee4 100644
--- a/installer/nixos-hardware-scan.pl
+++ b/installer/nixos-hardware-scan.pl
@@ -51,6 +51,7 @@ push @kernelModules, "kvm-amd" if hasCPUFeature "svm";
 # However, some are needed in the initrd to boot the system.
 
 my $enableIntel2200BGFirmware = "false";
+my $videoDriver = "vesa";
 
 sub pciCheck {
     my $path = shift;
@@ -92,6 +93,26 @@ sub pciCheck {
     $enableIntel2200BGFirmware = "true" if $vendor eq "0x8086" &&
         ($device eq "0x1043" || $device eq "0x104f" || $device eq "0x4220" ||
          $device eq "0x4221" || $device eq "0x4223" || $device eq "0x4224");
+
+    # Hm, can we extract the PCI ids supported by X drivers somehow?
+    # cf. http://www.calel.org/pci-devices/xorg-device-list.html
+    $videoDriver = "i810" if $vendor eq "0x8086" &&
+        ($device eq "0x1132" ||
+         $device eq "0x2572" ||
+         $device eq "0x2592" ||
+         $device eq "0x2772" ||
+         $device eq "0x2776" ||
+         $device eq "0x2782" ||
+         $device eq "0x2792" ||
+         $device eq "0x2792" ||
+         $device eq "0x27a2" ||
+         $device eq "0x27a6" ||
+         $device eq "0x3582" ||
+         $device eq "0x7121" ||
+         $device eq "0x7123" ||
+         $device eq "0x7125" ||
+         $device eq "0x7128"
+        );
 }
 
 foreach my $path (glob "/sys/bus/pci/devices/*") {
@@ -184,5 +205,13 @@ print <<EOF ;
     # firmware license, see http://ipw2200.sourceforge.net/firmware.php?fid=7.
     enableIntel2200BGFirmware = $enableIntel2200BGFirmware;
   };
+
+  services = {
+
+    xserver = {
+      videoDriver = "$videoDriver";
+    };
+      
+  };
 }
 EOF
-- 
GitLab


From 8ea2ce37c8c857914fb1d95142396ccad03f7cfa Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 30 Jan 2008 14:53:06 +0000
Subject: [PATCH 0771/5331] * NVIDIA support.

svn path=/nixos/trunk/; revision=10409
---
 installer/nixos-hardware-scan.pl | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/installer/nixos-hardware-scan.pl b/installer/nixos-hardware-scan.pl
index e96b5b44ee4..ae9d53bbf49 100644
--- a/installer/nixos-hardware-scan.pl
+++ b/installer/nixos-hardware-scan.pl
@@ -113,6 +113,10 @@ sub pciCheck {
          $device eq "0x7125" ||
          $device eq "0x7128"
         );
+
+    # Assume that all NVIDIA cards are supported by the NVIDIA driver.
+    # There may be exceptions (e.g. old cards).
+    $videoDriver = "nvidia" if $vendor eq "0x10de" && $class =~ /^0x03/;
 }
 
 foreach my $path (glob "/sys/bus/pci/devices/*") {
-- 
GitLab


From 7521d6c49ae329106ffb6396a88881a4fb63c0a3 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 30 Jan 2008 14:57:13 +0000
Subject: [PATCH 0772/5331] * Add the Intel 82G965.

svn path=/nixos/trunk/; revision=10410
---
 installer/nixos-hardware-scan.pl | 1 +
 1 file changed, 1 insertion(+)

diff --git a/installer/nixos-hardware-scan.pl b/installer/nixos-hardware-scan.pl
index ae9d53bbf49..a30f70584f9 100644
--- a/installer/nixos-hardware-scan.pl
+++ b/installer/nixos-hardware-scan.pl
@@ -107,6 +107,7 @@ sub pciCheck {
          $device eq "0x2792" ||
          $device eq "0x27a2" ||
          $device eq "0x27a6" ||
+         $device eq "0x29a2" ||
          $device eq "0x3582" ||
          $device eq "0x7121" ||
          $device eq "0x7123" ||
-- 
GitLab


From 9f62e1a6a57dc160fef8bea363369b6b0ac20a2e Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 1 Feb 2008 12:01:27 +0000
Subject: [PATCH 0773/5331] * Declarative specification of the system cron
 jobs.  Ideally   this would abstract over the Crontab syntax though.

svn path=/nixos/trunk/; revision=10447
---
 system/options.nix       | 18 ++++++++++++++++++
 upstart-jobs/cron.nix    | 36 ++++++++++++++++++++++++++++--------
 upstart-jobs/default.nix |  2 +-
 3 files changed, 47 insertions(+), 9 deletions(-)

diff --git a/system/options.nix b/system/options.nix
index 1bb75e0d5a4..8f482de5ebf 100644
--- a/system/options.nix
+++ b/system/options.nix
@@ -528,6 +528,24 @@
     };
 
 
+    cron = {
+
+      systemCronJobs = mkOption {
+        default = [];
+        example = [
+          "* * * * *  test   ls -l / > /tmp/cronout 2>&1"
+          "* * * * *  eelco  echo Hello World > /home/eelco/cronout"
+        ];
+        description = ''
+          A list of Cron jobs to be appended to the system-wide
+          crontab.  See the manual page for crontab for the expected
+          format.
+        '';
+      };
+
+    };
+
+
     ttyBackgrounds = {
 
       enable = mkOption {
diff --git a/upstart-jobs/cron.nix b/upstart-jobs/cron.nix
index 289fee630eb..a7145f1d284 100644
--- a/upstart-jobs/cron.nix
+++ b/upstart-jobs/cron.nix
@@ -1,15 +1,35 @@
-{cron}:
+{pkgs, config}:
 
+let
+
+  systemCronJobs = config.services.cron.systemCronJobs;
+
+  systemCronJobsFile = pkgs.writeText "system-crontab" ''
+    SHELL=${pkgs.bash}/bin/sh
+    PATH=${pkgs.coreutils}/bin
+    MAILTO=
+    ${pkgs.lib.concatStrings (map (job: job + "\n") systemCronJobs)}
+  '';
+
+in
+  
 {
   name = "cron";
   
-  job = "
-description \"Cron daemon\"
+  extraEtc = [
+    # The system-wide crontab.
+    { source = systemCronJobsFile;
+      target = "crontab";
+      mode = "0600"; # Cron requires this.
+    }
+  ];
 
-start on startup
-stop on shutdown
+  job = ''
+    description "Cron daemon"
 
-respawn ${cron}/sbin/cron -n
-  ";
-  
+    start on startup
+    stop on shutdown
+
+    respawn ${pkgs.cron}/sbin/cron -n
+  '';
 }
diff --git a/upstart-jobs/default.nix b/upstart-jobs/default.nix
index 017c1c3fda0..c2af3fff345 100644
--- a/upstart-jobs/default.nix
+++ b/upstart-jobs/default.nix
@@ -78,7 +78,7 @@ let
 
     # Cron daemon.
     (import ../upstart-jobs/cron.nix {
-      inherit (pkgs) cron;
+      inherit config pkgs;
     })
 
     # Name service cache daemon.
-- 
GitLab


From 0d50031a0a0922b9e3a7b6d54491154b8824ac1b Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 1 Feb 2008 12:35:51 +0000
Subject: [PATCH 0774/5331] * Periodically update the locate database from cron
 when   config.services.locate.enable is set.

svn path=/nixos/trunk/; revision=10448
---
 etc/profile.sh        |  1 +
 system/options.nix    | 23 +++++++++++++++++++++++
 upstart-jobs/cron.nix | 17 +++++++++++++++--
 3 files changed, 39 insertions(+), 2 deletions(-)

diff --git a/etc/profile.sh b/etc/profile.sh
index 99f7d7c1e8b..e070222e666 100644
--- a/etc/profile.sh
+++ b/etc/profile.sh
@@ -8,6 +8,7 @@ export FONTCONFIG_FILE=/etc/fonts/fonts.conf
 export LANG=@defaultLocale@
 export EDITOR=nano
 export INFOPATH=/var/run/current-system/sw/info:/var/run/current-system/sw/share/info
+export LOCATE_PATH=/var/cache/locatedb
 
 
 # A nice prompt.
diff --git a/system/options.nix b/system/options.nix
index 8f482de5ebf..4fee59cc4ea 100644
--- a/system/options.nix
+++ b/system/options.nix
@@ -546,6 +546,29 @@
     };
 
 
+    locate = {
+
+      enable = mkOption {
+        default = false;
+        example = true;
+        description = ''
+          If enabled, NixOS will periodically update the database of
+          files used by the <command>locate</command> command.
+        '';
+      };
+
+      period = mkOption {
+        default = "15 02 * * *";
+        description = ''
+          This option defines (in the format used by cron) when the
+          locate database is updated.
+          The default is to update at 02:15 (at night) every day.
+        '';
+      };
+
+    };
+
+
     ttyBackgrounds = {
 
       enable = mkOption {
diff --git a/upstart-jobs/cron.nix b/upstart-jobs/cron.nix
index a7145f1d284..847ca2728dc 100644
--- a/upstart-jobs/cron.nix
+++ b/upstart-jobs/cron.nix
@@ -2,11 +2,24 @@
 
 let
 
-  systemCronJobs = config.services.cron.systemCronJobs;
+  # !!! This should be defined somewhere else.
+  locatedb = "/var/cache/locatedb";
+  
+  updatedbCmd =
+    "${config.services.locate.period}  root  " +
+    "mkdir -m 0755 -p $(dirname ${locatedb}) && " +
+    "nice -n 19 ${pkgs.utillinux}/bin/ionice -c 3 " +
+    "updatedb --localuser=nobody --output=${locatedb} > /var/log/updatedb 2>&1";
+  
+
+  # Put all the system cronjobs together.
+  systemCronJobs =
+    config.services.cron.systemCronJobs ++
+    pkgs.lib.optional config.services.locate.enable updatedbCmd;
 
   systemCronJobsFile = pkgs.writeText "system-crontab" ''
     SHELL=${pkgs.bash}/bin/sh
-    PATH=${pkgs.coreutils}/bin
+    PATH=${pkgs.coreutils}/bin:${pkgs.findutils}/bin:${pkgs.gnused}/bin:${pkgs.su}/bin
     MAILTO=
     ${pkgs.lib.concatStrings (map (job: job + "\n") systemCronJobs)}
   '';
-- 
GitLab


From b078ef6c7015fec28e0d0135dbadbbcf79b3f376 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 1 Feb 2008 13:56:36 +0000
Subject: [PATCH 0775/5331] * Cron: set TZ.

svn path=/nixos/trunk/; revision=10449
---
 upstart-jobs/cron.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/upstart-jobs/cron.nix b/upstart-jobs/cron.nix
index 847ca2728dc..e2212b4c575 100644
--- a/upstart-jobs/cron.nix
+++ b/upstart-jobs/cron.nix
@@ -43,6 +43,9 @@ in
     start on startup
     stop on shutdown
 
+    # Needed to interpret times in the local timezone.
+    env TZ=${config.time.timeZone}
+
     respawn ${pkgs.cron}/sbin/cron -n
   '';
 }
-- 
GitLab


From 9802ed58eed0175fea39bc93ed0af521c43b965e Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 1 Feb 2008 21:50:29 +0000
Subject: [PATCH 0776/5331] * hardware-scan: load modules for all supported USB
 devices   automatically.  Of course this should be triggered when   a USB
 device is plugged in (from udev).

svn path=/nixos/trunk/; revision=10451
---
 upstart-jobs/hardware-scan.nix | 35 +++++++++++++++++-----------------
 1 file changed, 17 insertions(+), 18 deletions(-)

diff --git a/upstart-jobs/hardware-scan.nix b/upstart-jobs/hardware-scan.nix
index 80b7f440b76..f5f45b0787b 100644
--- a/upstart-jobs/hardware-scan.nix
+++ b/upstart-jobs/hardware-scan.nix
@@ -3,27 +3,26 @@
 {
   name = "hardware-scan";
   
-  job = "
-start on udev
+  job = ''
+    start on udev
 
-script
-    for i in ${toString kernelModules}; do
-        echo \"Loading kernel module $i...\"
-        ${modprobe}/sbin/modprobe $i || true
-    done
-
-    if test -n \"${toString doHardwareScan}\" -a ! -e /var/run/safemode; then
-    
-        # Try to load modules for all PCI devices.
-        for i in /sys/bus/pci/devices/*/modalias; do
-            echo \"Trying to load a module for $(basename $(dirname $i))...\"
-            ${modprobe}/sbin/modprobe $(cat $i) || true
-            echo \"\"
+    script
+        for i in ${toString kernelModules}; do
+            echo "Loading kernel module $i..."
+            ${modprobe}/sbin/modprobe $i || true
         done
 
-    fi
-end script
+        if test -n "${toString doHardwareScan}" -a ! -e /var/run/safemode; then
+
+            # Try to load modules for all PCI and USB devices.
+            for i in /sys/bus/pci/devices/*/modalias /sys/bus/usb/devices/*/modalias; do
+                echo "Trying to load a module for $(basename $(dirname $i))..."
+                ${modprobe}/sbin/modprobe $(cat $i) || true
+                echo ""
+            done
 
-  ";
+        fi
+    end script
+  '';
 
 }
-- 
GitLab


From 57a01e77333fcce5cafd0cbfa10153914cdb92e5 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 4 Feb 2008 10:20:38 +0000
Subject: [PATCH 0777/5331] * Prevent warnings about existing directories.

svn path=/nixos/trunk/; revision=10489
---
 boot/boot-stage-2-init.sh | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/boot/boot-stage-2-init.sh b/boot/boot-stage-2-init.sh
index 5e2754fcdd7..eafd64a8dcd 100644
--- a/boot/boot-stage-2-init.sh
+++ b/boot/boot-stage-2-init.sh
@@ -68,12 +68,12 @@ mount -t tmpfs -o "mode=0755" none /dev
 mkdir -m 0755 -p /dev/pts
 mount -t devpts none /dev/pts
 mount -t usbfs none /proc/bus/usb
-mkdir -m 01777 /tmp 
-mkdir -m 0755 /var
-mkdir -m 0755 /nix/var
-mkdir -m 0700 /root
-mkdir -m 0755 /bin # for the /bin/sh symlink
-mkdir -m 0755 /home
+mkdir -m 01777 -p /tmp 
+mkdir -m 0755 -p /var
+mkdir -m 0755 -p /nix/var
+mkdir -m 0700 -p /root
+mkdir -m 0755 -p /bin # for the /bin/sh symlink
+mkdir -m 0755 -p /home
 
 
 # Miscellaneous boot time cleanup.
-- 
GitLab


From c30e7b0f13fd9a6b342cdaa636da7bde53812518 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 4 Feb 2008 10:39:06 +0000
Subject: [PATCH 0778/5331] * Determine networking.enableIntel3945ABGFirmware.

svn path=/nixos/trunk/; revision=10490
---
 installer/nixos-hardware-scan.pl | 7 +++++++
 system/options.nix               | 2 +-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/installer/nixos-hardware-scan.pl b/installer/nixos-hardware-scan.pl
index a30f70584f9..00470a6e2fd 100644
--- a/installer/nixos-hardware-scan.pl
+++ b/installer/nixos-hardware-scan.pl
@@ -51,6 +51,7 @@ push @kernelModules, "kvm-amd" if hasCPUFeature "svm";
 # However, some are needed in the initrd to boot the system.
 
 my $enableIntel2200BGFirmware = "false";
+my $enableIntel3945ABGFirmware = "false";
 my $videoDriver = "vesa";
 
 sub pciCheck {
@@ -94,6 +95,10 @@ sub pciCheck {
         ($device eq "0x1043" || $device eq "0x104f" || $device eq "0x4220" ||
          $device eq "0x4221" || $device eq "0x4223" || $device eq "0x4224");
 
+    $enableIntel3945ABGFirmware = "true" if $vendor eq "0x8086" &&
+        ($device eq "0x4229" || $device eq "0x4230" ||
+         $device eq "0x4222" || $device eq "0x4227");
+
     # Hm, can we extract the PCI ids supported by X drivers somehow?
     # cf. http://www.calel.org/pci-devices/xorg-device-list.html
     $videoDriver = "i810" if $vendor eq "0x8086" &&
@@ -206,6 +211,8 @@ print <<EOF ;
   };
 
   networking = {
+    enableIntel3945ABGFirmware = $enableIntel3945ABGFirmware;
+    
     # Warning: setting this option to `true' requires acceptance of the
     # firmware license, see http://ipw2200.sourceforge.net/firmware.php?fid=7.
     enableIntel2200BGFirmware = $enableIntel2200BGFirmware;
diff --git a/system/options.nix b/system/options.nix
index 4fee59cc4ea..98fc589b675 100644
--- a/system/options.nix
+++ b/system/options.nix
@@ -352,7 +352,7 @@
       default = false;
       description = "
         This option enables automatic loading of the firmware for the Intel
-        PRO/Wireless 3945ABG.
+        PRO/Wireless 3945ABG / 4965AGN.
       ";
     };
 
-- 
GitLab


From 707e515f828c0c44ed11d6af3784e8442c67ac04 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 4 Feb 2008 10:52:58 +0000
Subject: [PATCH 0779/5331] * Option to enable support for the WIS GO7007.

svn path=/nixos/trunk/; revision=10491
---
 configuration/rescue-cd.nix           |  4 ++++
 system/options.nix                    | 22 ++++++++++++++++++++++
 system/system.nix                     |  1 +
 upstart-jobs/default.nix              |  9 ++++-----
 upstart-jobs/udev-rules/50-udev.rules |  1 +
 upstart-jobs/udev.nix                 |  7 ++++---
 6 files changed, 36 insertions(+), 8 deletions(-)

diff --git a/configuration/rescue-cd.nix b/configuration/rescue-cd.nix
index 2d9fa54b318..7aca76d0257 100644
--- a/configuration/rescue-cd.nix
+++ b/configuration/rescue-cd.nix
@@ -22,6 +22,10 @@ rec {
         ];
       };
     };
+
+    networking = {
+      enableIntel3945ABGFirmware = true;
+    };
     
     services = {
     
diff --git a/system/options.nix b/system/options.nix
index 98fc589b675..f3c683220ac 100644
--- a/system/options.nix
+++ b/system/options.nix
@@ -273,6 +273,21 @@
   };
 
 
+  # Hm, this sounds like a catch-all...
+  hardware = {
+
+    enableGo7007 = mkOption {
+      default = false;
+      description = ''
+        Enable this option to get support for the WIS GO7007SB
+        multi-format video encoder, which is used in a number of
+        devices such as the Plextor ConvertX TV402U USB TV device.
+      '';
+    };
+  
+  };
+
+
   networking = {
 
     hostName = mkOption {
@@ -1107,6 +1122,13 @@
         ";
       };
 
+      experimental = mkOption {
+        default = false;
+        description = "
+          Whether to use the new-style Apache configuration.
+        ";
+      };
+
       user = mkOption {
         default = "wwwrun";
         description = "
diff --git a/system/system.nix b/system/system.nix
index 4bc22890cb1..4e793a5c039 100644
--- a/system/system.nix
+++ b/system/system.nix
@@ -152,6 +152,7 @@ rec {
     ++ pkgs.lib.optional config.networking.enableIntel3945ABGFirmware pkgs.iwlwifi
     # !!! this should be declared by the xserver Upstart job.
     ++ pkgs.lib.optional (config.services.xserver.enable && config.services.xserver.videoDriver == "nvidia") pkgs.nvidiaDrivers
+    ++ pkgs.lib.optional config.hardware.enableGo7007 pkgs.wis_go7007
     ++ config.boot.extraModulePackages
   );
 
diff --git a/upstart-jobs/default.nix b/upstart-jobs/default.nix
index c2af3fff345..0e1dfbf506a 100644
--- a/upstart-jobs/default.nix
+++ b/upstart-jobs/default.nix
@@ -30,7 +30,8 @@ let
         ++ pkgs.lib.optional config.networking.enableIntel3945ABGFirmware pkgs.iwlwifi3945ucode
 	++ config.services.udev.addFirmware;
       extraUdevPkgs =
-        pkgs.lib.optional config.services.hal.enable pkgs.hal;
+           pkgs.lib.optional config.services.hal.enable pkgs.hal
+        ++ pkgs.lib.optional config.hardware.enableGo7007 pkgs.wis_go7007;
       sndMode = config.services.udev.sndMode;
     })
       
@@ -152,7 +153,7 @@ let
     })
 
   # Apache httpd.
-  ++ optional config.services.httpd.enable
+  ++ optional (config.services.httpd.enable && !config.services.httpd.experimental)
     (import ../upstart-jobs/httpd.nix {
       inherit config pkgs;
       inherit (pkgs) glibc;
@@ -161,12 +162,10 @@ let
     })
 
   # Apache httpd (new style).
-  /*
-  ++ optional config.services.httpd.enable
+  ++ optional (config.services.httpd.enable && config.services.httpd.experimental)
     (import ../upstart-jobs/apache-httpd {
       inherit config pkgs;
     })
-  */
 
   # MySQL server
   ++ optional config.services.mysql.enable
diff --git a/upstart-jobs/udev-rules/50-udev.rules b/upstart-jobs/udev-rules/50-udev.rules
index fde4e868772..f6ac572cedb 100644
--- a/upstart-jobs/udev-rules/50-udev.rules
+++ b/upstart-jobs/udev-rules/50-udev.rules
@@ -43,5 +43,6 @@ KERNEL=="seq",                  NAME="snd/%k", MODE="@sndMode@"
 
 KERNEL=="kqemu",		NAME="%k", MODE="0666"
 
+
 # Firmware loading.
 SUBSYSTEM=="firmware", ACTION=="add", RUN+="@firmwareLoader@"
diff --git a/upstart-jobs/udev.nix b/upstart-jobs/udev.nix
index e006db3587d..3baf8053327 100644
--- a/upstart-jobs/udev.nix
+++ b/upstart-jobs/udev.nix
@@ -32,9 +32,10 @@ let
   };
 
   # The udev configuration file
-  conf = writeText "udev.conf" "
-    udev_rules=\"${udevRules}\"
-  ";
+  conf = writeText "udev.conf" ''
+    udev_rules="${udevRules}"
+    #udev_log="debug"
+  '';
 
   # Dummy file indicating whether we've run udevtrigger/udevsettle.
   # Since that *recreates* all device nodes with default permissions,
-- 
GitLab


From 90f34e204d795cfbbf87239677e3b2ab6d2fcaac Mon Sep 17 00:00:00 2001
From: Sander van der Burg <s.vanderburg@tudelft.nl>
Date: Mon, 4 Feb 2008 13:40:01 +0000
Subject: [PATCH 0780/5331] Added ejabberd service

svn path=/nixos/trunk/; revision=10495
---
 system/options.nix        | 12 ++++++++++++
 upstart-jobs/default.nix  |  6 ++++++
 upstart-jobs/ejabberd.nix | 22 ++++++++++++++++++++++
 3 files changed, 40 insertions(+)
 create mode 100644 upstart-jobs/ejabberd.nix

diff --git a/system/options.nix b/system/options.nix
index f3c683220ac..e449a036cad 100644
--- a/system/options.nix
+++ b/system/options.nix
@@ -1049,6 +1049,18 @@
 
     };
 
+    ejabberd = {
+      enable = mkOption {
+        default = false;
+	description = "Whether to enable ejabberd server";
+      };
+      
+      user = mkOption {
+        default = "nobody";
+	description = "User account under which ejabberd runs.";
+      };
+    };
+
     jboss = {
       enable = mkOption {
         default = false;
diff --git a/upstart-jobs/default.nix b/upstart-jobs/default.nix
index 0e1dfbf506a..a926233afa0 100644
--- a/upstart-jobs/default.nix
+++ b/upstart-jobs/default.nix
@@ -181,6 +181,12 @@ let
         "gw6c" else "network-interfaces";
     })
 
+  # EJabberd service
+  ++ optional config.services.ejabberd.enable
+    (import ../upstart-jobs/ejabberd.nix {
+      inherit config pkgs;
+    })  
+
   # JBoss service
   ++ optional config.services.jboss.enable
     (import ../upstart-jobs/jboss.nix {
diff --git a/upstart-jobs/ejabberd.nix b/upstart-jobs/ejabberd.nix
new file mode 100644
index 00000000000..1bc607e3632
--- /dev/null
+++ b/upstart-jobs/ejabberd.nix
@@ -0,0 +1,22 @@
+args: with args;
+
+let
+
+cfg = config.services.ejabberd;
+
+ejabberdService = import ../services/ejabberd {
+        inherit (cfg) user;
+	inherit (pkgs) stdenv erlang ejabberd su;
+};
+
+in
+{
+	name = "ejabberd";
+	job = "
+description \"EJabberd server\"
+
+stop on shutdown
+
+respawn ${ejabberdService}/bin/control start
+	";
+}
-- 
GitLab


From 65c1f9882cad9a000014336655aebc721ff8df8c Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 5 Feb 2008 14:33:21 +0000
Subject: [PATCH 0781/5331] * Less verbosity.

svn path=/nixos/trunk/; revision=10506
---
 helpers/create-users-groups.sh    | 4 ++--
 system/switch-to-configuration.sh | 2 --
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/helpers/create-users-groups.sh b/helpers/create-users-groups.sh
index bdb1a91f0ed..81aaacacd80 100644
--- a/helpers/create-users-groups.sh
+++ b/helpers/create-users-groups.sh
@@ -8,7 +8,7 @@ cat "$2" | while true; do
             "$name" \
             ${gid:+--gid $gid}
     else
-        echo "updating group $name..."
+        #echo "updating group $name..."
         oldIFS="$IFS"; IFS=:; set -- $curEnt; IFS="$oldIFS"
         prevGid=$3
         if test -n "$gid" -a "$prevGid" != "$gid"; then
@@ -40,7 +40,7 @@ cat "$1" | while true; do
             --shell "$shell" \
             ${createHome:+--create-home}
     else
-        echo "updating user $name..."
+        #echo "updating user $name..."
         oldIFS="$IFS"; IFS=:; set -- $curEnt; IFS="$oldIFS"
         prevUid=$3
         prevHome=$6
diff --git a/system/switch-to-configuration.sh b/system/switch-to-configuration.sh
index a2bdb094d98..3fd038e20f8 100644
--- a/system/switch-to-configuration.sh
+++ b/system/switch-to-configuration.sh
@@ -82,8 +82,6 @@ if test "$action" = "switch" -o "$action" = "test"; then
             echo "restarting $event..."
             stopJob $event
             initctl start "$event"
-        else
-            echo "unchanged $event"
         fi
     done
 fi
-- 
GitLab


From 8bf1cade680e69b6468569fd7ec24feaa80d3913 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 5 Feb 2008 16:25:07 +0000
Subject: [PATCH 0782/5331] * New-style Subversion server configuration.

svn path=/nixos/trunk/; revision=10508
---
 upstart-jobs/apache-httpd/default.nix    |  63 ++++++-
 upstart-jobs/apache-httpd/subversion.nix | 213 +++++++++++++++++++++++
 2 files changed, 273 insertions(+), 3 deletions(-)
 create mode 100644 upstart-jobs/apache-httpd/subversion.nix

diff --git a/upstart-jobs/apache-httpd/default.nix b/upstart-jobs/apache-httpd/default.nix
index 0273497d912..0aa8d622cf4 100644
--- a/upstart-jobs/apache-httpd/default.nix
+++ b/upstart-jobs/apache-httpd/default.nix
@@ -9,6 +9,15 @@ let
   httpd = pkgs.apacheHttpd;
 
 
+  subservices = [
+    (import ./subversion.nix {inherit config pkgs;})
+  ];
+
+
+  writeTextInDir = name: text:
+    pkgs.runCommand name {inherit text;} "ensureDir $out; echo -n \"$text\" > $out/$name";
+  
+
   documentRoot = if cfg.documentRoot != null then cfg.documentRoot else
     pkgs.runCommand "empty" {} "ensureDir $out";
 
@@ -93,6 +102,7 @@ let
 
     AddType application/x-x509-ca-cert .crt
     AddType application/x-pkcs7-crl    .crl
+    AddType application/x-httpd-php    .php .phtml
 
     <IfModule mod_mime_magic.c>
         MIMEMagicFile ${httpd}/conf/magic
@@ -114,6 +124,20 @@ let
     </Directory>
   '';
 
+
+  robotsTxt = writeTextInDir "robots.txt" ''
+    ${pkgs.lib.concatStrings (map (svc: svc.robotsEntries) subservices)}
+  '';
+  
+  robotsConf = ''
+    Alias /robots.txt ${robotsTxt}/robots.txt
+
+    <Directory ${robotsTxt}>
+        Order allow,deny
+        Allow from all
+    </Directory>
+  '';
+
   
   httpdConf = pkgs.writeText "httpd.conf" ''
   
@@ -135,8 +159,13 @@ let
     User ${cfg.user}
     Group ${cfg.group}
 
-    ${let f = name: "LoadModule ${name}_module ${httpd}/modules/mod_${name}.so\n";
-      in pkgs.lib.concatStrings (map f apacheModules)
+    ${let
+        load = {name, path}: "LoadModule ${name}_module ${path}\n";
+        allModules =
+          pkgs.lib.concatMap (svc: svc.extraModulesPre) subservices ++
+          map (name: {inherit name; path = "${httpd}/modules/mod_${name}.so";}) apacheModules ++
+          pkgs.lib.concatMap (svc: svc.extraModules) subservices;
+      in pkgs.lib.concatStrings (map load allModules)
     }
 
     ${if cfg.enableUserDir then ''
@@ -176,9 +205,13 @@ let
     
     ${if cfg.enableSSL then sslConf else ""}
 
+    # Fascist default - deny access to everything.
+    # !!!
     <Directory />
         Options FollowSymLinks
         AllowOverride None
+#        Order deny,allow
+#        Deny from all
     </Directory>
 
     ${documentRootConf}
@@ -194,6 +227,10 @@ let
           '';
       in pkgs.lib.concatStrings (map makeDirConf cfg.servedDirs)
     }
+
+    ${pkgs.lib.concatStrings (map (svc: svc.extraConfig) subservices)}
+
+    ${robotsConf}
   '';
 
     
@@ -216,7 +253,11 @@ in
 
   # Statically verify the syntactic correctness of the generated
   # httpd.conf.
-  buildHook = "${httpd}/bin/httpd -f ${httpdConf} -t";
+  buildHook = ''
+    echo
+    echo '=== Checking the generated Apache configuration file ==='
+    ${httpd}/bin/httpd -f ${httpdConf} -t
+  '';
 
   job = ''
     description "Apache HTTPD"
@@ -227,8 +268,24 @@ in
     start script
       mkdir -m 0700 -p ${cfg.stateDir}
       mkdir -m 0700 -p ${cfg.logDir}
+
+      # Get rid of old semaphores.  These tend to accumulate across
+      # server restarts, eventually preventing it from restarting
+      # succesfully.
+      for i in $(${pkgs.utillinux}/bin/ipcs -s | grep ' wwwrun ' | cut -f2 -d ' '); do
+        ${pkgs.utillinux}/bin/ipcrm -s $i
+      done
     end script
 
+    ${
+      let f = {name, value}: "env ${name}=${value}\n";
+      in pkgs.lib.concatStrings (map f (pkgs.lib.concatMap (svc: svc.globalEnvVars) subservices))
+    }
+
+    env PATH=${pkgs.coreutils}/bin:${pkgs.gnugrep}/bin:${pkgs.lib.concatStringsSep ":" (pkgs.lib.concatMap (svc: svc.extraPath) subservices)}
+
+    ${pkgs.diffutils}/bin:${pkgs.gnused}/bin
+
     respawn ${httpd}/bin/httpd -f ${httpdConf} -DNO_DETACH
   '';
 
diff --git a/upstart-jobs/apache-httpd/subversion.nix b/upstart-jobs/apache-httpd/subversion.nix
new file mode 100644
index 00000000000..cbfc9846ed2
--- /dev/null
+++ b/upstart-jobs/apache-httpd/subversion.nix
@@ -0,0 +1,213 @@
+{config, pkgs}:
+
+let
+
+  prefix = "/svn";
+  dbDir = "/tmp/svn/db";
+  reposDir = "/tmp/svn/repos";
+  backupsDir = "/tmp/svn/backup";
+  tmpDir = "/tmp/svn/tmp";
+  adminAddr = "eelco@cs.uu.nl";
+
+
+  # Build a Subversion instance with Apache modules and Swig/Python bindings.
+  subversion = import ../../../nixpkgs/pkgs/applications/version-management/subversion-1.4.x {
+    inherit (pkgs) fetchurl stdenv apr aprutil neon expat swig zlib;
+    bdbSupport = true;
+    httpServer = true;
+    sslSupport = true;
+    compressionSupport = true;
+    pythonBindings = true;
+    httpd = pkgs.apacheHttpd;
+  };
+
+  
+  # Build our custom authentication modules.
+  authModules = import ../../../services/subversion/src/auth {
+    inherit (pkgs) stdenv apacheHttpd;
+  };
+
+
+  # Access controls for /repos and /repos-xml. 
+  reposConfig = dirName: ''
+    AuthType Basic
+    AuthName "Subversion repositories"
+    AuthBasicProvider auth-against-db
+
+    AuthAllowNone on
+
+    AuthzRepoPrefix ${prefix}/${dirName}/
+    AuthzRepoDBType DB
+    AuthzRepoReaders ${dbDir}/svn-readers
+    AuthzRepoWriters ${dbDir}/svn-writers
+
+    <LimitExcept GET PROPFIND OPTIONS REPORT>
+        Require repo-writer
+    </LimitExcept>
+
+    <Limit GET PROPFIND OPTIONS REPORT>
+        Require repo-reader
+    </Limit>
+
+    DAV svn
+    SVNParentPath ${reposDir}
+    #SVNAutoversioning @autoVersioning@
+  '';
+
+
+  # Build ViewVC.
+  viewvc = import ../../../services/subversion/src/viewvc {
+    inherit (pkgs) fetchurl stdenv python enscript;
+    inherit reposDir adminAddr subversion;
+    urlPrefix = prefix;
+  };
+
+
+  viewerConfig = dirName: ''
+    AuthType Basic
+    AuthName "Subversion repositories"
+    AuthBasicProvider auth-against-db
+    AuthAllowNone on
+    AuthzRepoPrefix ${prefix}/${dirName}/
+    AuthzRepoDBType DB
+    AuthzRepoReaders ${dbDir}/svn-readers
+    Require repo-reader
+  '';
+
+
+  viewvcConfig = ''
+    ScriptAlias ${prefix}/viewvc ${viewvc}/viewvc/bin/mod_python/viewvc.py
+
+    <Location ${prefix}/viewvc>
+        AddHandler python-program .py
+        # Note: we write \" instead of ' to work around a lexer bug in Nix 0.11.
+        PythonPath "[\"${viewvc}/viewvc/bin/mod_python\", \"${subversion}/lib/python2.4/site-packages\"] + sys.path"
+        PythonHandler handler
+        ${viewerConfig "viewvc"}
+    </Location>
+
+    Alias ${prefix}/viewvc-doc ${viewvc}/viewvc/templates/docroot
+
+    #Redirect permanent /viewcvs @canonicalName@/viewvc
+  '';
+
+
+  # Build WebSVN.
+  websvn = import ../../../services/subversion/src/websvn {
+    inherit (pkgs) fetchurl stdenv writeText enscript gnused diffutils;
+    inherit reposDir subversion;
+    cacheDir = tmpDir;
+    urlPrefix = prefix;
+  };
+
+  
+  websvnConfig = ''
+    Alias ${prefix}/websvn ${websvn}/wsvn.php
+    Alias ${prefix}/templates ${websvn}/templates
+
+    <Location ${prefix}/websvn>
+        ${viewerConfig "websvn"}
+    </Location>
+
+    <Directory ${websvn}/templates>
+        Order allow,deny
+        Allow from all
+    </Directory>
+  '';
+
+
+  # Build Repoman.
+    
+  repoman = pkgs.substituteAll {
+    src = ../../../services/subversion/src/repoman/repoman.pl.in;
+    dir = "/";
+    name = "repoman.pl";
+    isExecutable = true;
+    perl = "${pkgs.perl}/bin/perl";
+    defaultPath = "";
+    staticPrefix = prefix;
+    orgUrl = "http://example.org/";
+    orgLogoUrl = "http://example.org/";
+    orgName = "Example Org";
+    canonicalName = "http://localhost/";
+    userCreationDomain = "localhost";
+    fsType = "fsfs";
+    inherit adminAddr reposDir backupsDir dbDir subversion;
+
+    # Urgh, most of these are dependencies of Email::Send, should figure them out automatically.
+    perlFlags = "-I${pkgs.perlBerkeleyDB}/lib/site_perl -I${pkgs.perlEmailSend}/lib/site_perl -I${pkgs.perlEmailSimple}/lib/site_perl -I${pkgs.perlModulePluggable}/lib/site_perl -I${pkgs.perlReturnValue}/lib/site_perl -I${pkgs.perlEmailAddress}/lib/site_perl";
+  };
+
+  repomanConfig = ''
+    ScriptAlias ${prefix}/repoman ${repoman}/repoman.pl
+  '';
+
+  
+  # !!!
+  writeTextInDir = name: text:
+    pkgs.runCommand name {inherit text;} "ensureDir $out; echo -n \"$text\" > $out/$name";
+    
+in
+
+{
+
+  extraModulesPre = [
+    # Allow anonymous access to repositories that are world-readable
+    # without prompting for a username/password.
+    { name = "authn_noauth"; path = "${authModules}/modules/mod_authn_noauth.so"; }
+    # Check whether the user is allowed read or write access to a
+    # repository.
+    { name = "authz_dyn";    path = "${authModules}/modules/mod_authz_dyn.so"; }
+  ];
+
+  extraModules = [
+    { name = "python";  path = "${pkgs.mod_python}/modules/mod_python.so"; }
+    { name = "php5";    path = "${pkgs.php}/modules/libphp5.so"; }
+    { name = "dav_svn"; path = "${subversion}/modules/mod_dav_svn.so"; }
+  ];
+
+  extraConfig = ''
+  
+    <AuthnProviderAlias dbm auth-against-db>
+        AuthDBMType DB
+        AuthDBMUserFile ${dbDir}/svn-users
+    </AuthnProviderAlias>
+
+    <Location ${prefix}/repos>
+      ${reposConfig "repos"}
+    </Location>
+    
+    <Location ${prefix}/repos-xml>
+      ${reposConfig "repos-xml"}
+      SVNIndexXSLT "@staticPrefix@/xsl/svnindex.xsl"
+    </Location>
+
+    ${viewvcConfig}
+
+    ${websvnConfig}
+
+    ${repomanConfig}
+        
+  '';
+
+  robotsEntries = ''
+    User-agent: *
+    Disallow: ${prefix}/viewcvs/
+    Disallow: ${prefix}/viewvc/
+    Disallow: ${prefix}/websvn/
+    Disallow: ${prefix}/repos-xml/
+  '';
+
+  # mod_python's own Python modules must be in the initial Python
+  # path, they cannot be set through the PythonPath directive.
+  globalEnvVars = [
+    { name = "PYTHONPATH"; value = "${pkgs.mod_python}/lib/python2.4/site-packages"; }
+  ];
+
+  extraPath = [
+    # Needed for ViewVC.
+    "${pkgs.diffutils}/bin"
+    "${pkgs.gnused}/bin"
+  ];
+  
+}
-- 
GitLab


From 76897682c4d812da1343d427974ae221685f9467 Mon Sep 17 00:00:00 2001
From: Sander van der Burg <s.vanderburg@tudelft.nl>
Date: Thu, 7 Feb 2008 12:41:18 +0000
Subject: [PATCH 0783/5331] Added vsftpd upstart job

svn path=/nixos/trunk/; revision=10540
---
 system/ids.nix           |  4 +++
 system/options.nix       | 17 +++++++++++-
 upstart-jobs/default.nix |  7 +++++
 upstart-jobs/vsftpd.nix  | 57 ++++++++++++++++++++++++++++++++++++++++
 4 files changed, 84 insertions(+), 1 deletion(-)
 create mode 100644 upstart-jobs/vsftpd.nix

diff --git a/system/ids.nix b/system/ids.nix
index abbd5c58c6e..fd6ff9f6a15 100644
--- a/system/ids.nix
+++ b/system/ids.nix
@@ -8,6 +8,8 @@
     messagebus = 4; # D-Bus
     haldaemon = 5;
     nagios = 6;
+    vsftpd = 7;
+    ftp = 8;
     nixbld = 30000; # start of range of uids
     nobody = 65534;
   };
@@ -16,6 +18,8 @@
     root = 0;
     wheel = 1;
     haldaemon = 5;
+    vsftpd = 7;
+    ftp = 8;
     audio = 17;
     users = 100;
     nixbld = 30000;
diff --git a/system/options.nix b/system/options.nix
index e449a036cad..caa1ec4e19c 100644
--- a/system/options.nix
+++ b/system/options.nix
@@ -1365,7 +1365,22 @@
 
     };
 
-
+    vsftpd = {
+      enable = mkOption {
+        default = false;
+	description = "
+	  Whether to enable the vsftpd FTP server.
+	";
+      };
+      
+      anonymous_user = mkOption {
+        default = false;
+	description = "
+	  Whether to enable the anonymous FTP user.
+	";
+      };
+    };
+    
     printing = {
 
       enable = mkOption {
diff --git a/upstart-jobs/default.nix b/upstart-jobs/default.nix
index a926233afa0..83b36350338 100644
--- a/upstart-jobs/default.nix
+++ b/upstart-jobs/default.nix
@@ -218,6 +218,13 @@ let
       inherit config pkgs;
     })
 
+  # VSFTPd server
+  ++ optional config.services.vsftpd.enable
+    (import ../upstart-jobs/vsftpd.nix {
+      inherit (pkgs) vsftpd;
+      inherit (config.services.vsftpd) anonymous_user;
+    })
+
   # X Font Server
   ++ optional config.services.xfs.enable
     (import ../upstart-jobs/xfs.nix {
diff --git a/upstart-jobs/vsftpd.nix b/upstart-jobs/vsftpd.nix
new file mode 100644
index 00000000000..adbc3f82e61
--- /dev/null
+++ b/upstart-jobs/vsftpd.nix
@@ -0,0 +1,57 @@
+{ vsftpd, anonymous_user }:
+
+{
+  name = "vsftpd";
+
+  groups = [
+    { name = "ftp";
+      gid = (import ../system/ids.nix).gids.ftp;
+    }
+  ];
+  
+  users = [
+    { name = "vsftpd";
+      uid = (import ../system/ids.nix).uids.vsftpd;
+      description = "VSFTPD user";
+      home = "/homeless-shelter";
+    }
+  ] ++
+  (if anonymous_user then [
+    { name = "ftp";
+      uid = (import ../system/ids.nix).uids.ftp;
+      group = "ftp";
+      description = "Anonymous ftp user";
+      home = "/home/ftp";
+    } 
+  ]
+  else
+  []);
+  
+  job = "
+description \"vsftpd server\"
+
+start on network-interfaces/started
+stop on network-interfaces/stop
+
+start script
+    cat > /etc/vsftpd.conf <<EOF
+" + 
+    (if anonymous_user then 
+"anonymous_enable=YES"
+    else
+"anonymous_enable=NO") +
+"
+background=NO
+listen=YES
+nopriv_user=vsftpd
+secure_chroot_dir=/var/ftp/empty
+EOF
+
+    mkdir -p /home/ftp &&
+    chown -R ftp:ftp /home/ftp
+end script
+
+respawn ${vsftpd}/sbin/vsftpd /etc/vsftpd.conf
+  ";
+  
+}
-- 
GitLab


From 7fad8dc1b96a797ae748adcc78497941a4d72fab Mon Sep 17 00:00:00 2001
From: Sander van der Burg <s.vanderburg@tudelft.nl>
Date: Thu, 7 Feb 2008 13:37:20 +0000
Subject: [PATCH 0784/5331] Changed some variable names to follow the standard
 convention

svn path=/nixos/trunk/; revision=10542
---
 system/options.nix       | 2 +-
 upstart-jobs/default.nix | 2 +-
 upstart-jobs/vsftpd.nix  | 6 +++---
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/system/options.nix b/system/options.nix
index caa1ec4e19c..b3ccfa0b01e 100644
--- a/system/options.nix
+++ b/system/options.nix
@@ -1373,7 +1373,7 @@
 	";
       };
       
-      anonymous_user = mkOption {
+      anonymousUser = mkOption {
         default = false;
 	description = "
 	  Whether to enable the anonymous FTP user.
diff --git a/upstart-jobs/default.nix b/upstart-jobs/default.nix
index 83b36350338..a8d74d4c2fb 100644
--- a/upstart-jobs/default.nix
+++ b/upstart-jobs/default.nix
@@ -222,7 +222,7 @@ let
   ++ optional config.services.vsftpd.enable
     (import ../upstart-jobs/vsftpd.nix {
       inherit (pkgs) vsftpd;
-      inherit (config.services.vsftpd) anonymous_user;
+      inherit (config.services.vsftpd) anonymousUser;
     })
 
   # X Font Server
diff --git a/upstart-jobs/vsftpd.nix b/upstart-jobs/vsftpd.nix
index adbc3f82e61..67a11e77b2f 100644
--- a/upstart-jobs/vsftpd.nix
+++ b/upstart-jobs/vsftpd.nix
@@ -1,4 +1,4 @@
-{ vsftpd, anonymous_user }:
+{ vsftpd, anonymousUser }:
 
 {
   name = "vsftpd";
@@ -16,7 +16,7 @@
       home = "/homeless-shelter";
     }
   ] ++
-  (if anonymous_user then [
+  (if anonymousUser then [
     { name = "ftp";
       uid = (import ../system/ids.nix).uids.ftp;
       group = "ftp";
@@ -36,7 +36,7 @@ stop on network-interfaces/stop
 start script
     cat > /etc/vsftpd.conf <<EOF
 " + 
-    (if anonymous_user then 
+    (if anonymousUser then 
 "anonymous_enable=YES"
     else
 "anonymous_enable=NO") +
-- 
GitLab


From 390d2adb91c9d9564e1001e44643c15c7c6affd3 Mon Sep 17 00:00:00 2001
From: Sander van der Burg <s.vanderburg@tudelft.nl>
Date: Thu, 7 Feb 2008 14:02:38 +0000
Subject: [PATCH 0785/5331] Modified variable names to follow the standard
 convention

svn path=/nixos/trunk/; revision=10544
---
 system/options.nix     | 6 +++---
 upstart-jobs/mysql.nix | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/system/options.nix b/system/options.nix
index b3ccfa0b01e..116dd4bb30f 100644
--- a/system/options.nix
+++ b/system/options.nix
@@ -1660,17 +1660,17 @@
 	description = "User account under which MySQL runs";
       };
       
-      datadir = mkOption {
+      dataDir = mkOption {
         default = "/var/mysql";
 	description = "Location where MySQL stores its table files";
       };
       
-      log_error = mkOption {
+      logError = mkOption {
         default = "/var/log/mysql_err.log";
 	description = "Location of the MySQL error logfile";
       };
       
-      pid_file = mkOption {
+      pidFile = mkOption {
         default = "/var/mysql/mysql.pid";
 	description = "Location of the file which stores the PID of the MySQL server";
       };
diff --git a/upstart-jobs/mysql.nix b/upstart-jobs/mysql.nix
index 311f6747acf..8a8f924bf17 100644
--- a/upstart-jobs/mysql.nix
+++ b/upstart-jobs/mysql.nix
@@ -5,8 +5,8 @@ let
 cfg = config.services.mysql;
 mysqlService = import ../services/mysql {
 	inherit (pkgs) stdenv mysql;
-	inherit (cfg) port user datadir
-		log_error pid_file;
+	inherit (cfg) port user dataDir
+		logError pidFile;
 };
 
 in
-- 
GitLab


From b510189674613d0342155cc26e6a07d71f998ee5 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 7 Feb 2008 14:15:13 +0000
Subject: [PATCH 0786/5331] svn path=/nixos/trunk/; revision=10545

---
 system/system.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/system/system.nix b/system/system.nix
index 4e793a5c039..cb448136da4 100644
--- a/system/system.nix
+++ b/system/system.nix
@@ -239,7 +239,7 @@ rec {
     pkgs.iputils
     pkgs.less
     pkgs.lvm2
-    pkgs.man
+    pkgs.man_db
     pkgs.mdadm
     pkgs.module_init_tools
     pkgs.nano
-- 
GitLab


From 1f81bcae40cec8ffeb08aff1746388ec69466666 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 7 Feb 2008 14:39:32 +0000
Subject: [PATCH 0787/5331] svn path=/nixos/trunk/; revision=10548

---
 etc/profile.sh     | 2 +-
 system/options.nix | 2 +-
 system/system.nix  | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/etc/profile.sh b/etc/profile.sh
index e070222e666..3b448940187 100644
--- a/etc/profile.sh
+++ b/etc/profile.sh
@@ -1,7 +1,7 @@
 export PATH=@wrapperDir@:/var/run/current-system/sw/bin:/var/run/current-system/sw/sbin
 export MODULE_DIR=@modulesTree@/lib/modules
 export NIXPKGS_CONFIG=/nix/etc/config.nix
-export PAGER=less
+export PAGER="less -R"
 export TZ=@timeZone@
 export TZDIR=@glibc@/share/zoneinfo
 export FONTCONFIG_FILE=/etc/fonts/fonts.conf
diff --git a/system/options.nix b/system/options.nix
index 116dd4bb30f..b2b7152d161 100644
--- a/system/options.nix
+++ b/system/options.nix
@@ -2064,7 +2064,7 @@ root        ALL=(ALL) SETENV: ALL
 	purpose and do not want default package list. Setting 
 	<varname>cleanStart<varname> to <literal>true</literal> allows you 
 	to create a system with empty path - only extraPackages will be 
-	included..
+	included.
       ";
     };
 
diff --git a/system/system.nix b/system/system.nix
index cb448136da4..4e793a5c039 100644
--- a/system/system.nix
+++ b/system/system.nix
@@ -239,7 +239,7 @@ rec {
     pkgs.iputils
     pkgs.less
     pkgs.lvm2
-    pkgs.man_db
+    pkgs.man
     pkgs.mdadm
     pkgs.module_init_tools
     pkgs.nano
-- 
GitLab


From ce250ffb37ec6fc6059c38fa4f23f598f0f50350 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 8 Feb 2008 15:59:15 +0000
Subject: [PATCH 0788/5331] * Installation CD: include a lot of modules (SATA,
 PATA, Firewire,   USB, some SCSI controllers) in the initrd for mounting the
 CD. * Add nix-hardware-scan to the system. * Upstart: don't use the -v flag.
 * Include the NixOS version in the ISO image filename. * Include testdisk and
 ms-sys in the CD. * Some bugfixes in the installer.

svn path=/nixos/trunk/; revision=10556
---
 boot/boot-stage-1-init.sh        |  1 +
 boot/boot-stage-1.nix            |  2 +-
 boot/boot-stage-2-init.sh        |  2 +-
 configuration/rescue-cd.nix      | 57 +++++++++++++++++++++++++++++---
 default.nix                      | 10 ++++--
 installer/default.nix            | 45 +++++++++++++++++++++++++
 installer/nixos-checkout.nix     |  8 -----
 installer/nixos-checkout.sh      | 13 ++++++++
 installer/nixos-hardware-scan.pl | 24 +++++++++-----
 installer/nixos-install.nix      | 19 -----------
 installer/nixos-install.sh       |  8 +++--
 installer/nixos-rebuild.nix      |  8 -----
 system/activate-configuration.sh |  2 +-
 system/options.nix               | 17 +++++++---
 system/system.nix                | 47 +++++++++-----------------
 15 files changed, 170 insertions(+), 93 deletions(-)
 create mode 100644 installer/default.nix
 delete mode 100644 installer/nixos-checkout.nix
 delete mode 100644 installer/nixos-install.nix
 delete mode 100644 installer/nixos-rebuild.nix

diff --git a/boot/boot-stage-1-init.sh b/boot/boot-stage-1-init.sh
index 3bde517a937..d412b31715a 100644
--- a/boot/boot-stage-1-init.sh
+++ b/boot/boot-stage-1-init.sh
@@ -60,6 +60,7 @@ done
 # Load some kernel modules.
 export MODULE_DIR=@modulesDir@/lib/modules/
 for i in @modules@; do
+    echo "trying to load $i..."
     modprobe $i
 done
 
diff --git a/boot/boot-stage-1.nix b/boot/boot-stage-1.nix
index 0c504e86469..a53b9d6c86b 100644
--- a/boot/boot-stage-1.nix
+++ b/boot/boot-stage-1.nix
@@ -42,7 +42,7 @@ let
 
 in
 
-assert !autoDetectRootDevice -> mountPoints != [];
+if !autoDetectRootDevice && mountPoints == [] then abort "You must specify the fileSystems option!" else
 
 substituteAll {
   src = ./boot-stage-1-init.sh;
diff --git a/boot/boot-stage-2-init.sh b/boot/boot-stage-2-init.sh
index eafd64a8dcd..e298a0d1c8b 100644
--- a/boot/boot-stage-2-init.sh
+++ b/boot/boot-stage-2-init.sh
@@ -119,4 +119,4 @@ fi
 # HUP signal.
 export UPSTART_CFG_DIR=/etc/event.d
 setPath "@upstartPath@"
-exec /var/run/current-system/upstart/sbin/init -v
+exec /var/run/current-system/upstart/sbin/init
diff --git a/configuration/rescue-cd.nix b/configuration/rescue-cd.nix
index 7aca76d0257..ebba167c6de 100644
--- a/configuration/rescue-cd.nix
+++ b/configuration/rescue-cd.nix
@@ -1,10 +1,14 @@
 { platform ? __currentSystem
+, relName ?
+    if builtins.pathExists ../relname
+    then builtins.readFile ../relname
+    else "nixos-${builtins.readFile ../VERSION}"
 }:
 
 rec {
 
   
-  nixpkgsRel = "nixpkgs-0.12pre10072";
+  nixpkgsRel = "nixpkgs-0.12pre10553";
 
 
   configuration = {
@@ -16,9 +20,50 @@ rec {
       rootLabel = "NIXOS";
       extraTTYs = [7 8]; # manual, rogue
       extraModulePackages = [pkgs.aufs];
+      
       initrd = {
         extraKernelModules = [
-          "aufs" # needed for live-CD operation
+          # The initrd should contain any modules necessary for
+          # mounting the CD.
+        
+          # SATA/PATA support.
+          "ahci"
+
+          "ata_piix"
+          
+          "sata_inic162x" "sata_nv" "sata_promise" "sata_qstor"
+          "sata_sil" "sata_sil24" "sata_sis" "sata_svw" "sata_sx4"
+          "sata_uli" "sata_via" "sata_vsc"
+
+          "pata_ali" "pata_amd" "pata_artop" "pata_atiixp"
+          "pata_cs5520" "pata_cs5530" "pata_cs5535" "pata_efar"
+          "pata_hpt366" "pata_hpt37x" "pata_hpt3x2n" "pata_hpt3x3"
+          "pata_it8213" "pata_it821x" "pata_jmicron" "pata_marvell"
+          "pata_mpiix" "pata_netcell" "pata_ns87410" "pata_oldpiix"
+          "pata_pcmcia" "pata_pdc2027x" "pata_qdi" "pata_rz1000"
+          "pata_sc1200" "pata_serverworks" "pata_sil680" "pata_sis"
+          "pata_sl82c105" "pata_triflex" "pata_via"
+          # "pata_winbond" <-- causes timeouts in sd_mod
+
+          # SCSI support (incomplete).
+          "3w-9xxx" "3w-xxxx" "aic79xx" "aic7xxx" "arcmsr" 
+        
+          # USB support, especially for booting from USB CD-ROM
+          # drives.  Also include USB keyboard support for when
+          # something goes wrong in stage 1.
+          "ehci_hcd"
+          "ohci_hcd"
+          "usbhid"
+          "usb_storage"
+
+          # Firewire support.  Not tested.
+          "ohci1394" "sbp2"
+
+          # Wait for SCSI devices to appear.
+          "scsi_wait_scan"
+
+          # Needed for live-CD operation.
+          "aufs"
         ];
       };
     };
@@ -47,6 +92,8 @@ rec {
             script
               export PATH=${pkgs.gnutar}/bin:${pkgs.bzip2}/bin:$PATH
 
+              mkdir -p /mnt
+
               ${system.nix}/bin/nix-store --load-db < /nix-path-registration
 
               mkdir -p /etc/nixos/nixos
@@ -130,6 +177,8 @@ rec {
         pkgs.subversion # for nixos-checkout
         pkgs.w3m # needed for the manual anyway
         pkgs.gdb # for debugging Nix
+        pkgs.testdisk # useful for repairing boot problems
+        pkgs.mssys # for writing Microsoft boot sectors / MBRs
       ];
     };
    
@@ -177,7 +226,7 @@ rec {
   # Get a recent copy of Nixpkgs.
   nixpkgsTarball = pkgs.fetchurl {
     url = configuration.installer.nixpkgsURL + "/" + nixpkgsRel + ".tar.bz2";
-    md5 = "6a793b877e2a4fa79827515902e1dfd8";
+    md5 = "a6f1cd8486b7d588ecc7d98f5baf6a73";
   };
 
 
@@ -200,7 +249,7 @@ rec {
   # the initrd produced above, and the closure of the stage 2 init.
   rescueCD = import ../helpers/make-iso9660-image.nix {
     inherit (pkgs) stdenv perl cdrkit;
-    isoName = "nixos-${platform}.iso";
+    isoName = "${relName}-${platform}.iso";
 
     # Single files to be copied to fixed locations on the CD.
     contents = [
diff --git a/default.nix b/default.nix
index 09c9a1569d8..fcf12b80479 100644
--- a/default.nix
+++ b/default.nix
@@ -18,14 +18,18 @@ in
     initialRamdisk
     kernel
     nix
-    nixosCheckout
-    nixosInstall
-    nixosRebuild
     system
     systemPath
     config
     ;
 
+  inherit (system.nixosTools)
+    nixosCheckout
+    nixosHardwareScan
+    nixosInstall
+    nixosRebuild
+    ;    
+    
   nixFallback = system.nix;
 
   manifests = system.config.installer.manifests; # exported here because nixos-rebuild uses it
diff --git a/installer/default.nix b/installer/default.nix
new file mode 100644
index 00000000000..314902e9aa2
--- /dev/null
+++ b/installer/default.nix
@@ -0,0 +1,45 @@
+{pkgs, config, nix}:
+
+let
+
+  makeProg = args: pkgs.substituteAll (args // {
+    dir = "bin";
+    isExecutable = true;
+  });
+
+in
+
+{
+
+  nixosInstall = makeProg {
+    name = "nixos-install";
+    src = ./nixos-install.sh;
+
+    inherit (pkgs) perl;
+    inherit nix;
+    nixpkgsURL = config.installer.nixpkgsURL;
+
+    pathsFromGraph = ../helpers/paths-from-graph.pl;
+
+    nixClosure = pkgs.runCommand "closure"
+      {exportReferencesGraph = ["refs" nix];}
+      "cp refs $out";
+  };
+
+  nixosRebuild = makeProg {
+    name = "nixos-rebuild";
+    src = ./nixos-rebuild.sh;
+  };
+
+  nixosCheckout = makeProg {
+    name = "nixos-checkout";
+    src = ./nixos-checkout.sh;
+   };
+
+  nixosHardwareScan = makeProg {
+    name = "nixos-hardware-scan";
+    src = ./nixos-hardware-scan.pl;
+    inherit (pkgs) perl;
+  };
+
+}
diff --git a/installer/nixos-checkout.nix b/installer/nixos-checkout.nix
deleted file mode 100644
index ce8038fffed..00000000000
--- a/installer/nixos-checkout.nix
+++ /dev/null
@@ -1,8 +0,0 @@
-{substituteAll}:
-
-substituteAll {
-  name = "nixos-checkout";
-  src = ./nixos-checkout.sh;
-  dir = "bin";
-  isExecutable = true;
-}
diff --git a/installer/nixos-checkout.sh b/installer/nixos-checkout.sh
index 339beeecacd..1551f009de2 100644
--- a/installer/nixos-checkout.sh
+++ b/installer/nixos-checkout.sh
@@ -1,6 +1,19 @@
 #! @shell@ -e
 set -x
 
+# Pull the manifests defined in the configuration (the "manifests"
+# attribute).  Wonderfully hacky *and* cut&pasted from nixos-installer.sh!!!
+if test -z "$NIXOS"; then NIXOS=/etc/nixos/nixos; fi
+if test -z "$NIXOS_NO_PULL"; then
+    manifests=$(nix-instantiate --eval-only --xml --strict $NIXOS -A manifests \
+        | grep '<string'  | sed 's^.*"\(.*\)".*^\1^g')
+
+    mkdir -p /nix/var/nix/channel-cache
+    for i in $manifests; do
+        NIX_DOWNLOAD_CACHE=/nix/var/nix/channel-cache nix-pull $i || true
+    done
+fi
+
 # Obtain Subversion.
 if test -z "$(type -tp svn)"; then
     #nix-channel --add http://nix.cs.uu.nl/dist/nix/channels-v3/nixpkgs-unstable
diff --git a/installer/nixos-hardware-scan.pl b/installer/nixos-hardware-scan.pl
index 00470a6e2fd..e3277fa035d 100644
--- a/installer/nixos-hardware-scan.pl
+++ b/installer/nixos-hardware-scan.pl
@@ -1,4 +1,4 @@
-#! @perl@ -w
+#! @perl@/bin/perl -w
 
 use File::Spec;
 use File::Basename;
@@ -8,6 +8,12 @@ my @kernelModules = ();
 my @initrdKernelModules = ();
 
 
+sub debug {
+    return unless defined $ENV{"DEBUG"};
+    print STDERR @_;
+}
+
+
 # Read a file, returning undef if the file cannot be opened.
 sub readFile {
     my $filename = shift;
@@ -66,9 +72,9 @@ sub pciCheck {
         chomp $module;
     }
     
-    print STDERR "$path: $vendor $device $class";
-    print STDERR " $module" if defined $module;
-    print STDERR "\n";
+    debug "$path: $vendor $device $class";
+    debug " $module" if defined $module;
+    debug "\n";
 
     if (defined $module) {
         # See the bottom of http://pciids.sourceforge.net/pci.ids for
@@ -144,9 +150,9 @@ sub usbCheck {
         chomp $module;
     }
     
-    print STDERR "$path: $class $subclass $protocol";
-    print STDERR " $module" if defined $module;
-    print STDERR "\n";
+    debug "$path: $class $subclass $protocol";
+    debug " $module" if defined $module;
+    debug "\n";
  
     if (defined $module) {
         if (# Mass-storage controller.  Definitely important.
@@ -195,9 +201,9 @@ my $initrdKernelModules = toNixExpr(removeDups @initrdKernelModules);
 my $kernelModules = toNixExpr(removeDups @kernelModules);
  
 
+## This is a generated file.  Do not modify!
+## Make changes to /etc/nixos/configuration.nix instead.
 print <<EOF ;
-# This is a generated file.  Do not modify!
-# Make changes to /etc/nixos/configuration.nix instead.
 {
   boot = {
     initrd = {
diff --git a/installer/nixos-install.nix b/installer/nixos-install.nix
deleted file mode 100644
index 298bf594c44..00000000000
--- a/installer/nixos-install.nix
+++ /dev/null
@@ -1,19 +0,0 @@
-{ perl, runCommand, substituteAll, nix
-, # URL of the Nixpkgs distribution that the installer will pull.
-  # Leave empty for a pure source distribution.
-  nixpkgsURL ? ""
-}:
-
-substituteAll {
-  name = "nixos-install";
-  src = ./nixos-install.sh;
-  dir = "bin";
-  isExecutable = true;
-  inherit nix nixpkgsURL perl;
-
-  pathsFromGraph = ../helpers/paths-from-graph.pl;
-
-  nixClosure = runCommand "closure"
-    {exportReferencesGraph = ["refs" nix];}
-    "cp refs $out";
-}
diff --git a/installer/nixos-install.sh b/installer/nixos-install.sh
index e7794f720a3..3686bc3147d 100644
--- a/installer/nixos-install.sh
+++ b/installer/nixos-install.sh
@@ -56,13 +56,13 @@ mount --bind /proc $mountPoint/proc
 mount --bind /sys $mountPoint/sys
 
 cleanup() {
-    # !!! don't umount any we didn't mount ourselves
+    # !!! don't umount anything we didn't mount ourselves
     for i in $(grep -F "$mountPoint" /proc/mounts \
         | @perl@/bin/perl -e 'while (<>) { /^\S+\s+(\S+)\s+/; print "$1\n"; }' \
         | sort -r);
     do
-        if test "$i" != "$mountPoint"; then
-            umount $i
+        if test "$i" != "$mountPoint" -a "$i" != / -a -e "$i"; then
+            umount $i || true
         fi
     done
 }
@@ -149,6 +149,8 @@ chroot $mountPoint @nix@/bin/nix-env \
 # Make a backup of the old NixOS/Nixpkgs sources.
 echo "copying NixOS/Nixpkgs sources to /etc/nixos...."
 
+backupTimestamp=$(date "+%Y%m%d%H%M%S")
+
 targetNixos=$mountPoint/etc/nixos/nixos
 if test -e $targetNixos; then
     mv $targetNixos $targetNixos.backup-$backupTimestamp
diff --git a/installer/nixos-rebuild.nix b/installer/nixos-rebuild.nix
deleted file mode 100644
index 2c8371a597c..00000000000
--- a/installer/nixos-rebuild.nix
+++ /dev/null
@@ -1,8 +0,0 @@
-{substituteAll}:
-
-substituteAll {
-  name = "nixos-rebuild";
-  src = ./nixos-rebuild.sh;
-  dir = "bin";
-  isExecutable = true;
-}
diff --git a/system/activate-configuration.sh b/system/activate-configuration.sh
index e07e8d295af..1e2eb44acad 100644
--- a/system/activate-configuration.sh
+++ b/system/activate-configuration.sh
@@ -26,7 +26,7 @@ for i in $(cd $staticEtc && find * -type l); do
     if test -e "$staticEtc/$i.mode"; then
         # Create a regular file in /etc.
         cp $staticEtc/$i /etc/$i
-        chown root.root /etc/$i
+        chown 0.0 /etc/$i
         chmod "$(cat "$staticEtc/$i.mode")" /etc/$i
     else
         # Create a symlink in /etc.
diff --git a/system/options.nix b/system/options.nix
index b2b7152d161..892003cf019 100644
--- a/system/options.nix
+++ b/system/options.nix
@@ -125,7 +125,7 @@
 
     extraModulePackages = mkOption {
       default = [];
-      example = [pkgs.aufs pkgs.nvidiaDriver];
+      example = [pkgs.aufs pkgs.nvidiaDrivers];
       description = ''
         A list of additional packages supplying kernel modules.
       '';
@@ -146,6 +146,12 @@
 
       kernelModules = mkOption {
         default = [
+          # Note: most of these (especially the SATA/PATA modules)
+          # shouldn't be included by default since nixos-hardware-scan
+          # detects them, but I'm keeping them for now for backwards
+          # compatibility.
+          
+          # Some SATA/PATA stuff.        
           "ahci"
           "sata_nv"
           "sata_via"
@@ -153,11 +159,14 @@
           "sata_uli"
           "ata_piix"
           "pata_marvell"
+          # Standard SCSI stuff.
           "sd_mod"
           "sr_mod"
-          "ide-cd"
-          "ide-disk"
-          "ide-generic"
+          # Standard IDE stuff.
+          "ide_cd"
+          "ide_disk"
+          "ide_generic"
+          # Filesystems.
           "ext3"
           # Support USB keyboards, in case the boot fails and we only have
           # a USB keyboard.
diff --git a/system/system.nix b/system/system.nix
index 4e793a5c039..3d4722cacb3 100644
--- a/system/system.nix
+++ b/system/system.nix
@@ -119,19 +119,9 @@ rec {
   };
 
 
-  # The installer.
-  nixosInstall = import ../installer/nixos-install.nix {
-    inherit (pkgs) perl runCommand substituteAll;
-    inherit nix;
-    nixpkgsURL = config.installer.nixpkgsURL;
-  };
-
-  nixosRebuild = import ../installer/nixos-rebuild.nix {
-    inherit (pkgs) substituteAll;
-  };
-
-  nixosCheckout = import ../installer/nixos-checkout.nix {
-    inherit (pkgs) substituteAll;
+  # NixOS installation/updating tools.
+  nixosTools = import ../installer {
+    inherit pkgs config nix;
   };
 
 
@@ -208,20 +198,18 @@ rec {
 
 
   # The packages you want in the boot environment.
-  systemPathList = (if config.environment.cleanStart then 
-  [
+  systemPathList = [
     # Better leave them here - they are small, needed,
     # and hard to refer from anywhere outside.
-    modprobe 
+    modprobe # must take precedence over module_init_tools
     nix
-    nixosInstall
-    nixosRebuild
-    nixosCheckout
+    nixosTools.nixosInstall
+    nixosTools.nixosRebuild
+    nixosTools.nixosCheckout
+    nixosTools.nixosHardwareScan
     setuidWrapper
   ]
-  else
-  [
-    modprobe # must take precedence over module_init_tools
+  ++ pkgs.lib.optionals (!config.environment.cleanStart) [
     pkgs.bashInteractive # bash with ncurses support
     pkgs.bzip2
     pkgs.coreutils
@@ -263,17 +251,12 @@ rec {
     pkgs.usbutils
     pkgs.utillinux
     pkgs.wirelesstools
-    nix
-    nixosInstall
-    nixosRebuild
-    nixosCheckout
-    setuidWrapper
-  ])
-  ++ pkgs.lib.optional (config.security.sudo.enable) pkgs.sudo
-  ++ pkgs.lib.optional (config.networking.defaultMailServer.directDelivery) pkgs.ssmtp 
+  ]
+  ++ pkgs.lib.optional config.security.sudo.enable pkgs.sudo
+  ++ pkgs.lib.optional config.networking.defaultMailServer.directDelivery pkgs.ssmtp 
   ++ pkgs.lib.concatLists (map (job: job.extraPath) upstartJobs.jobs)
-  ++ (config.environment.extraPackages) pkgs
-  ++ pkgs.lib.optional (config.fonts.enableFontDir) fontDir;
+  ++ config.environment.extraPackages pkgs
+  ++ pkgs.lib.optional config.fonts.enableFontDir fontDir;
 
 
   # We don't want to put all of `startPath' and `path' in $PATH, since
-- 
GitLab


From 067db8fa72afe7a3dcbaf62a561be53fd39a4f5f Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Fri, 8 Feb 2008 19:13:29 +0000
Subject: [PATCH 0789/5331] Modifications to nixos-checkout for multi-branch
 support.

svn path=/nixos/trunk/; revision=10558
---
 installer/nixos-checkout.sh | 23 +++++++++++++++++------
 1 file changed, 17 insertions(+), 6 deletions(-)

diff --git a/installer/nixos-checkout.sh b/installer/nixos-checkout.sh
index 1551f009de2..7c8f329b658 100644
--- a/installer/nixos-checkout.sh
+++ b/installer/nixos-checkout.sh
@@ -23,15 +23,26 @@ fi
 
 cd /etc/nixos
 
+if test -n "$NIXOS" && test "$NIXOS_BRANCH" = 1 && test -z "$CHECKOUT_BRANCH" && ! test "$NIXOS" = "/etc/nixos/nixos"; then
+	CHECKOUT_BRANCH=${NIXOS##*/}
+	CHECKOUT_BRANCH=${CHECKOUT_BRANCH#nixos-}
+	CHECKOUT_BRANCH=branches/${CHECKOUT_BRANCH}
+	CHECKOUT_SUFFIX=-${CHECKOUT_BRANCH##*/}
+fi
+
+if test -n "${CHECKOUT_BRANCH}" && test -z "${CHECKOUT_SUFFIX}" ; then
+	CHECKOUT_SUFFIX=-${CHECKOUT_BRANCH##*/}
+fi;
+
 # Move any old nixos or nixpkgs directories out of the way.
 backupTimestamp=$(date "+%Y%m%d%H%M%S")
 
 if test -e nixos -a ! -e nixos/.svn; then
-    mv nixos nixos-$backupTimestamp
+    mv nixos${CHECKOUT_SUFFIX} nixos-$backupTimestamp
 fi
 
 if test -e nixpkgs -a ! -e nixpkgs/.svn; then
-    mv nixpkgs nixpkgs-$backupTimestamp
+    mv nixpkgs${CHECKOUT_SUFFIX} nixpkgs-$backupTimestamp
 fi
 
 if test -e services -a ! -e services/.svn; then
@@ -39,10 +50,10 @@ if test -e services -a ! -e services/.svn; then
 fi
 
 # Check out the NixOS and Nixpkgs sources.
-svn co https://svn.cs.uu.nl:12443/repos/trace/nixos/trunk nixos
-svn co https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk nixpkgs
+svn co https://svn.cs.uu.nl:12443/repos/trace/nixos/trunk nixos${CHECKOUT_SUFFIX}
+svn co https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/${CHECKOUT_BRANCH:-trunk} nixpkgs${CHECKOUT_SUFFIX}
 svn co https://svn.cs.uu.nl:12443/repos/trace/services/trunk services
 
 # Add a few required symlink.
-ln -sfn ../services nixos/services
-ln -sfn ../nixpkgs/pkgs nixos/pkgs
+ln -sfn ../services nixos${CHECKOUT_SUFFIX}/services
+ln -sfn ../nixpkgs${CHECKOUT_SUFFIX}/pkgs nixos${CHECKOUT_SUFFIX}/pkgs
-- 
GitLab


From c21ba2d99e5a97e55d69ec52cdfb123e3508c3a0 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Fri, 8 Feb 2008 19:31:41 +0000
Subject: [PATCH 0790/5331] Created expression to keep in sync with
 rescue-cd.nix; I do not want to make creating smaller CD images more
 difficult.

svn path=/nixos/trunk/; revision=10559
---
 configuration/rescue-cd-configurable.nix | 15 +----
 configuration/rescue-cd-replacement.nix  | 70 ++++++++++++++++++++++++
 2 files changed, 72 insertions(+), 13 deletions(-)
 create mode 100644 configuration/rescue-cd-replacement.nix

diff --git a/configuration/rescue-cd-configurable.nix b/configuration/rescue-cd-configurable.nix
index 7df6747d7fa..047e14525da 100644
--- a/configuration/rescue-cd-configurable.nix
+++ b/configuration/rescue-cd-configurable.nix
@@ -139,6 +139,8 @@ rec {
             start on startup
             script
             export PATH=${pkgs.gnutar}/bin:${pkgs.bzip2}/bin:$PATH
+
+	    mkdir -p /mnt
         
             ${system.nix}/bin/nix-store --load-db < /nix-path-registration
         
@@ -287,15 +289,6 @@ rec {
     else pkgs.writeText "dummy-manual" "Manual not included in this build!";
  
  
-  # Since the CD is read-only, the mount points must be on disk.
-  cdMountPoints = pkgs.runCommand "mount-points" {} ''
-    ensureDir $out
-    cd $out
-    mkdir proc sys tmp etc dev var mnt nix nix/var root bin ${if addUsers != "" then "home" else ""}
-    touch $out/${configuration.boot.rootLabel}
-  '';
- 
- 
   # 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.
@@ -373,10 +366,6 @@ rec {
           source = system.config.boot.grubSplashImage;
           target = "boot/background.xpm.gz";
         }
-        { 
-          source = cdMountPoints;
-          target = "/";
-        }
         { 
           source = nixosTarball + "/" + nixosTarball.tarName;
           target = "/install/" + nixosTarball.tarName;
diff --git a/configuration/rescue-cd-replacement.nix b/configuration/rescue-cd-replacement.nix
new file mode 100644
index 00000000000..ad14447cbd9
--- /dev/null
+++ b/configuration/rescue-cd-replacement.nix
@@ -0,0 +1,70 @@
+{platform ? __currentSystem} : 
+let 
+  isoFun = import ./rescue-cd-configurable.nix;
+in (isoFun {
+   inherit platform;
+   lib = (import ../pkgs/lib);
+
+   networkNixpkgs = "";
+   manualEnabled = false;
+   rogueEnabled = false;
+   sshdEnabled = false;
+   fontConfigEnabled = false;
+   sudoEnable = false;
+   includeMemtest = false;
+   includeStdenv = false;
+   includeBuildDeps = false;
+
+   extraInitrdKernelModules = [
+     # The initrd should contain any modules necessary for
+     # mounting the CD.
+
+     # SATA/PATA support.
+     "ahci"
+    
+     "ata_piix"
+    
+     "sata_inic162x" "sata_nv" "sata_promise" "sata_qstor"
+     "sata_sil" "sata_sil24" "sata_sis" "sata_svw" "sata_sx4"
+     "sata_uli" "sata_via" "sata_vsc"
+    
+     "pata_ali" "pata_amd" "pata_artop" "pata_atiixp"
+     "pata_cs5520" "pata_cs5530" "pata_cs5535" "pata_efar"
+     "pata_hpt366" "pata_hpt37x" "pata_hpt3x2n" "pata_hpt3x3"
+     "pata_it8213" "pata_it821x" "pata_jmicron" "pata_marvell"
+     "pata_mpiix" "pata_netcell" "pata_ns87410" "pata_oldpiix"
+     "pata_pcmcia" "pata_pdc2027x" "pata_qdi" "pata_rz1000"
+     "pata_sc1200" "pata_serverworks" "pata_sil680" "pata_sis"
+     "pata_sl82c105" "pata_triflex" "pata_via"
+     # "pata_winbond" <-- causes timeouts in sd_mod
+
+     # SCSI support (incomplete).
+     "3w-9xxx" "3w-xxxx" "aic79xx" "aic7xxx" "arcmsr" 
+
+     # USB support, especially for booting from USB CD-ROM
+     # drives.  Also include USB keyboard support for when
+     # something goes wrong in stage 1.
+     "ehci_hcd"
+     "ohci_hcd"
+     "usbhid"
+     "usb_storage"
+
+     # Firewire support.  Not tested.
+     "ohci1394" "sbp2"
+
+     # Wait for SCSI devices to appear.
+     "scsi_wait_scan"
+
+     # Needed for live-CD operation.
+     "aufs"
+   ];
+  packages = pkgs: [
+    pkgs.vim
+    pkgs.subversion # for nixos-checkout
+    pkgs.w3m # needed for the manual anyway
+    pkgs.gdb # for debugging Nix
+    pkgs.testdisk # useful for repairing boot problems
+    pkgs.mssys # for writing Microsoft boot sectors / MBRs
+  ];
+
+}).rescueCD
-- 
GitLab


From 0efc29afa4b3fd83949c97f1f457761904faef6f Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 8 Feb 2008 22:43:59 +0000
Subject: [PATCH 0791/5331] * Manual updates.

svn path=/nixos/trunk/; revision=10560
---
 doc/manual/development.xml       |  46 +++++++-
 doc/manual/installation.xml      | 181 +++++++++++++++++++++++++------
 doc/manual/userconfiguration.xml |  12 +-
 system/options.nix               |   2 +-
 4 files changed, 198 insertions(+), 43 deletions(-)

diff --git a/doc/manual/development.xml b/doc/manual/development.xml
index 6f61068d0b6..71072f0db2a 100644
--- a/doc/manual/development.xml
+++ b/doc/manual/development.xml
@@ -14,13 +14,49 @@ NixOS.</para>
 <para>
 
 <screen>
-$ nix-build system/system.nix \
-    --arg configuration "import /etc/nixos/configuration.nix" \
-    -A <replaceable>attr</replaceable></screen>
+$ nix-build /etc/nixos/nixos <replaceable>attr</replaceable></screen>
 
 where <replaceable>attr</replaceable> is an attribute in
-<filename>system/system.nix</filename> (e.g.,
-<literal>bootStage1</literal>).</para>
+<filename>/etc/nixos/nixos/default.nix</filename>.  Attributes of interest include:
+
+<variablelist>
+
+  <varlistentry>
+    <term><varname>kernel</varname></term>
+    <listitem><para>The kernel.</para></listitem>
+  </varlistentry>
+
+  <varlistentry>
+    <term><varname>initialRamdisk</varname></term>
+    <listitem><para>The initial ramdisk (initrd) for this configuration.</para></listitem>
+  </varlistentry>
+
+  <varlistentry>
+    <term><varname>bootStage1</varname></term>
+    <listitem><para>The stage 1 (initrd) init script.</para></listitem>
+  </varlistentry>
+
+  <varlistentry>
+    <term><varname>bootStage2</varname></term>
+    <listitem><para>The stage 2 init script.</para></listitem>
+  </varlistentry>
+
+  <varlistentry>
+    <term><varname>etc</varname></term>
+    <listitem><para>The statically computed parts of <filename>/etc</filename>.</para></listitem>
+  </varlistentry>
+
+  <varlistentry>
+    <term><varname>upstartJobs</varname></term>
+    <listitem><para>An attribute set containing the Upstart jobs.  For
+    instance, the <varname>sshd</varname> Upstart job can be built by
+    doing <literal>nix-build /etc/nixos/nixos -A
+    upstartJobs.sshd</literal>.</para></listitem>
+  </varlistentry>
+
+</variablelist>
+
+</para>
 
 </section>
 
diff --git a/doc/manual/installation.xml b/doc/manual/installation.xml
index 6a56b3b874a..1daf6c6d692 100644
--- a/doc/manual/installation.xml
+++ b/doc/manual/installation.xml
@@ -58,11 +58,9 @@ $ ln -s nixpkgs/pkgs nixos/</screen>
 $ nix-build configuration/rescue-cd.nix -A rescueCD</screen>
 
   If everything goes well, you’ll end up with an ISO image in
-  <filename>./result/iso/nixos.iso</filename>.</para></listitem>
-
-  <listitem><para>Burn the ISO image
-  <filename>./result/iso/nixos.iso</filename> onto a CD or DVD or
-  attach it to a CD-ROM drive in VMware.</para></listitem>
+  <filename>./result/iso/nixos-<replaceable>version</replaceable>-<replaceable>platform</replaceable>.iso</filename>
+  that you can burn onto a CD or attach to a virtual CD-ROM drive in
+  your favourite virtual machine software.</para></listitem>
 
 </orderedlist>
   
@@ -81,13 +79,18 @@ $ nix-build configuration/rescue-cd.nix -A rescueCD</screen>
 
   <listitem><para>Boot from the CD.</para></listitem>
 
-  <listitem><para>The CD contains a basic NixOS installation.  When
-  it’s finished booting, it should have detected most of your hardware
-  and brought up networking (check <command>ifconfig</command>).
-  Networking is necessary for the installer, since it will download
-  lots of stuff (such as source tarballs or Nixpkgs channel binaries).
-  It’s best if you have a DHCP server on your network.  Otherwise
-  configure manually.</para></listitem>
+  <listitem><para>The CD contains a basic NixOS installation.  (It
+  also contain Memtest86+, useful if you want to test new hardware.)
+  When it’s finished booting, it should have detected most of your
+  hardware and brought up networking (check
+  <command>ifconfig</command>).  Networking is necessary for the
+  installer, since it will download lots of stuff (such as source
+  tarballs or Nixpkgs channel binaries).  It’s best if you have a DHCP
+  server on your network.  Otherwise configure
+  manually.</para></listitem>
+
+  <listitem><para>The NixOS manual is available on virtual console 7
+  (press Alt+F7 to access).</para></listitem>
 
   <listitem><para>Login as <literal>root</literal>, empty
   password.</para></listitem>
@@ -130,34 +133,77 @@ $ lvcreate --size 1G --name smalldisk MyVolGroup</screen>
     <listitem><para>For creating software RAID devices:
     <command>mdadm</command>.</para></listitem>
 
-    <listitem><para>Mount the target file system on
-    <filename>/mnt</filename>.</para></listitem>
+  </itemizedlist>
+
+  </para></listitem>
+    
+  <listitem><para>Mount the target file system on
+  <filename>/mnt</filename>.</para></listitem>
 
-    <listitem><para>The installation is declarative; you need to write
-    a description of the configuration that you want to be built and
+  <listitem>
+
+    <para>The installation is declarative; you need to write a
+    description of the configuration that you want to be built and
     activated.  The configuration is specified in a Nix expression and
-    should be stored in
-    <filename>/etc/nixos/configuration.nix</filename>.  See
+    must be stored <emphasis>on the target file system</emphasis> in
+    <filename>/mnt/etc/nixos/configuration.nix</filename>.  See
     <filename>/etc/nixos/nixos/configuration/examples</filename> for
     example machine configurations.  You can copy and edit one of
     those (e.g., copy
     <filename>/etc/nixos/nixos/configuration/examples/basic.nix</filename>
-    to <filename>/etc/nixos/configuration.nix</filename>).  See <xref
-    linkend="ch-options"/> for a list of the available configuration
-    options.  The text editor <command>nano</command> is
-    available.</para>
+    to <filename>/mnt/etc/nixos/configuration.nix</filename>).  See
+    <xref linkend="ch-options"/> for a list of the available
+    configuration options.  The text editors <command>nano</command>
+    and <command>vim</command> are available.</para>
 
     <para>In particular you need to specify a root file system in
     <option>fileSystems</option> and the target device for the Grub
     boot loader in <option>boot.grubDevice</option>.</para>
 
+    <para>The command <command>nixos-hardware-scan</command> can
+    generate an initial configuration file for you, i.e.,
+
+<screen>
+$ mkdir -p /mnt/etc/nixos
+$ nixos-hardware-scan > /mnt/etc/nixos/configuration.nix</screen>
+
+    It tries to figure out the modules necessary for mounting the root
+    device, as well as various other hardware characteristics.
+    However, it doesn’t try to figure out the
+    <option>fileSystems</option> option yet.</para>
+
     <para>More examples of NixOS configurations for some actual
     machines can be found at <link
     xlink:href="https://svn.cs.uu.nl:12443/repos/trace/configurations/trunk/"/>.</para>
 
-    </listitem>
+    <note><para>It is very important that you specify in the option
+    <option>boot.initrd.extraKernelModules</option> all kernel modules
+    that are necessary for mounting the root file system, otherwise
+    the installed system will not be able to boot.  (If this happens,
+    boot from CD again, mount the target file system on
+    <filename>/mnt</filename>, fix
+    <filename>/mnt/etc/nixos/configuration.nix</filename> and rerun
+    <filename>nixos-install</filename>.)
+    <command>nixos-hardware-scan</command> should figure out the
+    required modules in most cases.</para></note>
 
-    <listitem><para>Do the installation:
+  </listitem>
+
+  <listitem><para>If your machine has a limited amount of memory, you
+  may want to activate swap devices now (<command>swapon
+  <replaceable>device</replaceable></command>).  The installer (or
+  rather, the build actions that it may spawn) may need quite a bit of
+  RAM, depending on your configuration.</para></listitem>
+
+  <listitem><para>Optionally, you can run
+
+<screen>
+$ nixos-checkout</screen>
+
+  to make the installer use the latest NixOS/Nixpkgs sources from the
+  Subversion repository, rather than the sources on CD.</para></listitem>
+
+  <listitem><para>Do the installation:
 
 <screen>
 $ nixos-install</screen>
@@ -169,22 +215,95 @@ $ nixos-install</screen>
 <screen>
 $ reboot</screen>
 
-    You should now be able to boot into the installed NixOS.  The Grub
-    boot menu shows a list of <emphasis>available
+  </para></listitem>
+
+  <listitem>
+
+    <para>You should now be able to boot into the installed NixOS.
+    The Grub boot menu shows a list of <emphasis>available
     configurations</emphasis> (initially just one).  Every time you
-    change the NixOS configuration, a new item appears in the menu.
+    change the NixOS configuration (see <xref
+    linkend="sec-changing-config" />), a new item appears in the menu.
     This allows you to go back easily to another configuration if
     something goes wrong.</para>
 
     <para>You should log in and change the <literal>root</literal>
-    password with <command>passwd</command>.</para></listitem>
+    password with <command>passwd</command>.</para>
 
-  </itemizedlist>
+    <para>You’ll probably want to create some user accounts as well,
+    which can be done with <command>useradd</command>:
+
+<screen>
+$ useradd -c 'Eelco Dolstra' -m eelco
+$ passwd eelco</screen>
+
+    </para>
+
+    <para>You may also want to install some software.  For instance,
+
+<screen>
+$ nix-env -qa \*</screen>
+
+    shows what packages are available, and
+
+<screen>    
+$ nix-env -i w3m</screen>
+
+    install the <literal>w3m</literal> browser.</para>
+
+  </listitem>
 
-  </para></listitem>
-    
 </orderedlist>
 
+<para><xref linkend="ex-install-sequence" /> shows a typical sequence
+of commands for installing NixOS on an empty hard drive (here
+<filename>/dev/sda).  <xref linkend="ex-config" /> shows a
+corresponding configuration Nix expression.</filename>
+
+</para>
+
+<example xml:id='ex-install-sequence'><title>Commands for installing NixOS on <filename>/dev/sda</filename></title>
+<screen>
+$ fdisk /dev/sda <lineannotation>(or whatever device you want to install on)</lineannotation>
+$ mke2fs -j -L nixos /dev/sda1 <lineannotation>(idem)</lineannotation>
+$ mkswap -L swap /dev/sda2 <lineannotation>(idem)</lineannotation>
+$ mount LABEL=nixos /mnt
+$ mkdir -p /mnt/etc/nixos
+$ nixos-hardware-scan > /mnt/etc/nixos/configuration.nix
+$ nano /mnt/etc/nixos/configuration.nix
+<lineannotation>(in particular, set the fileSystems and swapDevices options)</lineannotation>
+$ nixos-install
+$ reboot</screen>
+</example>
+
+<example xml:id='ex-config'><title>NixOS configuration</title>
+<screen>
+{
+  boot = {
+    initrd = {
+      extraKernelModules = [ "ata_piix" ];
+    };
+    grubDevice = "/dev/sda";
+  };
+
+  fileSystems = [
+    { mountPoint = "/";
+      label = "nixos";
+    }
+  ];
+
+  swapDevices = [
+    { label = "swap"; }
+  ];
+  
+  services = {
+    sshd = {
+      enable = true;
+    };
+  };
+}</screen>
+</example>
+
 </section>
 
 
diff --git a/doc/manual/userconfiguration.xml b/doc/manual/userconfiguration.xml
index b231cd1eadc..a285532d520 100644
--- a/doc/manual/userconfiguration.xml
+++ b/doc/manual/userconfiguration.xml
@@ -56,11 +56,11 @@
 <para>
 	To have pidgin-latex plugin working after installation, you need the following:
 	<orderedlist>
-	<listitem>
+	<listitem><para>
 	Symlink <filename>/var/run/current-system/sw/share/pidgin-latex/pidgin-latex.so</filename>
 	to <filename>$HOME/.purple/plugins/pidgin-latex.so</filename>
-	</listitem>
-	<listitem>
+	</para></listitem>
+	<listitem><para>
 	Enable smileys. If you do not want to, you can create 
 	<filename>$HOME/.purple/smileys/empty/theme</filename> with the following contents: 
 	<programlisting>
@@ -69,10 +69,10 @@
 	Author=Nobody
 	</programlisting>	
 	Enabling this theme will enable smileys, but define none.
-	</listitem>
-	<listitem>
+	</para></listitem>
+	<listitem><para>
 	Enable the plugin.
-	</listitem>	
+	</para></listitem>	
 	</orderedlist>	
 	</para>
 	</section>
diff --git a/system/options.nix b/system/options.nix
index 892003cf019..eed01824bf5 100644
--- a/system/options.nix
+++ b/system/options.nix
@@ -2071,7 +2071,7 @@ root        ALL=(ALL) SETENV: ALL
       description = "
         There are some times when you want really small system for specific 
 	purpose and do not want default package list. Setting 
-	<varname>cleanStart<varname> to <literal>true</literal> allows you 
+	<varname>cleanStart</varname> to <literal>true</literal> allows you 
 	to create a system with empty path - only extraPackages will be 
 	included.
       ";
-- 
GitLab


From 666d0bde09a286659c5f6652f3fa56a3caef9c14 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 8 Feb 2008 23:51:43 +0000
Subject: [PATCH 0792/5331] * Disable modules missing on x86_64.

svn path=/nixos/trunk/; revision=10563
---
 configuration/rescue-cd.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/configuration/rescue-cd.nix b/configuration/rescue-cd.nix
index ebba167c6de..112b2d539c8 100644
--- a/configuration/rescue-cd.nix
+++ b/configuration/rescue-cd.nix
@@ -36,11 +36,11 @@ rec {
           "sata_uli" "sata_via" "sata_vsc"
 
           "pata_ali" "pata_amd" "pata_artop" "pata_atiixp"
-          "pata_cs5520" "pata_cs5530" "pata_cs5535" "pata_efar"
+          "pata_cs5520" "pata_cs5530" /* "pata_cs5535" */ "pata_efar"
           "pata_hpt366" "pata_hpt37x" "pata_hpt3x2n" "pata_hpt3x3"
           "pata_it8213" "pata_it821x" "pata_jmicron" "pata_marvell"
           "pata_mpiix" "pata_netcell" "pata_ns87410" "pata_oldpiix"
-          "pata_pcmcia" "pata_pdc2027x" "pata_qdi" "pata_rz1000"
+          "pata_pcmcia" "pata_pdc2027x" /* "pata_qdi" */ "pata_rz1000"
           "pata_sc1200" "pata_serverworks" "pata_sil680" "pata_sis"
           "pata_sl82c105" "pata_triflex" "pata_via"
           # "pata_winbond" <-- causes timeouts in sd_mod
-- 
GitLab


From eca9242918205e973cb168795105f647d4a00451 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 11 Feb 2008 11:51:51 +0000
Subject: [PATCH 0793/5331] svn path=/nixos/trunk/; revision=10624

---
 upstart-jobs/apache-httpd/default.nix    | 15 ++++--
 upstart-jobs/apache-httpd/subversion.nix | 63 +++++++++++++++++++-----
 upstart-jobs/default.nix                 |  4 +-
 upstart-jobs/swap.nix                    |  6 +--
 4 files changed, 68 insertions(+), 20 deletions(-)

diff --git a/upstart-jobs/apache-httpd/default.nix b/upstart-jobs/apache-httpd/default.nix
index 0aa8d622cf4..922f68868a8 100644
--- a/upstart-jobs/apache-httpd/default.nix
+++ b/upstart-jobs/apache-httpd/default.nix
@@ -9,8 +9,17 @@ let
   httpd = pkgs.apacheHttpd;
 
 
+  serverInfo = {
+    # Canonical name must not include a trailing slash.
+    canonicalName =
+      "http://" +
+      cfg.hostName +
+      (if cfg.httpPort != 80 then ":${toString cfg.httpPort}" else "");
+  };
+
+
   subservices = [
-    (import ./subversion.nix {inherit config pkgs;})
+    (import ./subversion.nix {inherit config pkgs serverInfo;})
   ];
 
 
@@ -74,7 +83,7 @@ let
 
     SSLSessionCache dbm:${cfg.stateDir}/ssl_scache
 
-    SSLMutex  file:${cfg.stateDir}/ssl_mutex
+    SSLMutex file:${cfg.stateDir}/ssl_mutex
 
     SSLRandomSeed startup builtin
     SSLRandomSeed connect builtin
@@ -145,7 +154,7 @@ let
 
     ServerAdmin ${cfg.adminAddr}
 
-    ServerName ${cfg.hostName}:${toString cfg.httpPort}
+    ServerName ${serverInfo.canonicalName}
 
     PidFile ${cfg.stateDir}/httpd.pid
 
diff --git a/upstart-jobs/apache-httpd/subversion.nix b/upstart-jobs/apache-httpd/subversion.nix
index cbfc9846ed2..b03ab3ebfd1 100644
--- a/upstart-jobs/apache-httpd/subversion.nix
+++ b/upstart-jobs/apache-httpd/subversion.nix
@@ -1,4 +1,5 @@
-{config, pkgs}:
+{ config, pkgs, serverInfo
+}:
 
 let
 
@@ -8,6 +9,7 @@ let
   backupsDir = "/tmp/svn/backup";
   tmpDir = "/tmp/svn/tmp";
   adminAddr = "eelco@cs.uu.nl";
+  userCreationDomain = "10.0.0.0/8";
 
 
   # Build a Subversion instance with Apache modules and Swig/Python bindings.
@@ -28,11 +30,16 @@ let
   };
 
 
-  # Access controls for /repos and /repos-xml. 
-  reposConfig = dirName: ''
+  commonAuth = ''
     AuthType Basic
     AuthName "Subversion repositories"
     AuthBasicProvider auth-against-db
+  '';
+  
+
+  # Access controls for /repos and /repos-xml. 
+  reposConfig = dirName: ''
+    ${commonAuth}
 
     AuthAllowNone on
 
@@ -64,9 +71,7 @@ let
 
 
   viewerConfig = dirName: ''
-    AuthType Basic
-    AuthName "Subversion repositories"
-    AuthBasicProvider auth-against-db
+    ${commonAuth}
     AuthAllowNone on
     AuthzRepoPrefix ${prefix}/${dirName}/
     AuthzRepoDBType DB
@@ -88,7 +93,7 @@ let
 
     Alias ${prefix}/viewvc-doc ${viewvc}/viewvc/templates/docroot
 
-    #Redirect permanent /viewcvs @canonicalName@/viewvc
+    Redirect permanent ${prefix}/viewcvs ${serverInfo.canonicalName}/${prefix}/viewvc
   '';
 
 
@@ -125,14 +130,13 @@ let
     isExecutable = true;
     perl = "${pkgs.perl}/bin/perl";
     defaultPath = "";
-    staticPrefix = prefix;
+    urlPrefix = prefix;
     orgUrl = "http://example.org/";
     orgLogoUrl = "http://example.org/";
     orgName = "Example Org";
-    canonicalName = "http://localhost/";
-    userCreationDomain = "localhost";
+    inherit (serverInfo) canonicalName;
     fsType = "fsfs";
-    inherit adminAddr reposDir backupsDir dbDir subversion;
+    inherit adminAddr reposDir backupsDir dbDir subversion userCreationDomain;
 
     # Urgh, most of these are dependencies of Email::Send, should figure them out automatically.
     perlFlags = "-I${pkgs.perlBerkeleyDB}/lib/site_perl -I${pkgs.perlEmailSend}/lib/site_perl -I${pkgs.perlEmailSimple}/lib/site_perl -I${pkgs.perlModulePluggable}/lib/site_perl -I${pkgs.perlReturnValue}/lib/site_perl -I${pkgs.perlEmailAddress}/lib/site_perl";
@@ -140,6 +144,41 @@ let
 
   repomanConfig = ''
     ScriptAlias ${prefix}/repoman ${repoman}/repoman.pl
+
+    <Location ${prefix}/repoman/listdetails>
+        ${commonAuth}    
+        Require valid-user
+    </Location>
+
+    <Location ${prefix}/repoman/adduser>
+        Order deny,allow
+        Deny from all
+        Allow from 127.0.0.1
+        Allow from ${userCreationDomain}
+    </Location>
+
+    <Location ${prefix}/repoman/edituser>
+        ${commonAuth}    
+        Require valid-user
+    </Location>
+
+    <Location ${prefix}/repoman/create>
+        ${commonAuth}    
+        Require valid-user
+        Order deny,allow
+        Deny from all
+        Allow from 127.0.0.1
+        Allow from ${userCreationDomain}
+    </Location>
+
+    <Location ${prefix}/repoman/update>
+        ${commonAuth}    
+        Require valid-user
+    </Location>
+
+    <Location ${prefix}/repoman/dump>
+        ${viewerConfig "repoman/dump"}
+    </Location>
   '';
 
   
@@ -179,7 +218,7 @@ in
     
     <Location ${prefix}/repos-xml>
       ${reposConfig "repos-xml"}
-      SVNIndexXSLT "@staticPrefix@/xsl/svnindex.xsl"
+      SVNIndexXSLT "${prefix}/xsl/svnindex.xsl"
     </Location>
 
     ${viewvcConfig}
diff --git a/upstart-jobs/default.nix b/upstart-jobs/default.nix
index a8d74d4c2fb..7731b5d6752 100644
--- a/upstart-jobs/default.nix
+++ b/upstart-jobs/default.nix
@@ -62,7 +62,7 @@ let
 
     # Swapping.
     (import ../upstart-jobs/swap.nix {
-      inherit (pkgs) utillinux library;
+      inherit (pkgs) utillinux lib;
       swapDevices = config.swapDevices;
     })
 
@@ -301,7 +301,7 @@ let
           # syslog tty, except those for which a specific theme is
           # specified.
           defaultTTYs =
-            pkgs.library.filter (x: !(pkgs.library.elem x overridenTTYs)) requiredTTYs;
+            pkgs.lib.filter (x: !(pkgs.lib.elem x overridenTTYs)) requiredTTYs;
 
         in      
           (map (ttyNumber: {
diff --git a/upstart-jobs/swap.nix b/upstart-jobs/swap.nix
index e5938cb16da..cd640b5060e 100644
--- a/upstart-jobs/swap.nix
+++ b/upstart-jobs/swap.nix
@@ -1,12 +1,12 @@
-{library, utillinux, swapDevices}:
+{lib, utillinux, swapDevices}:
 
 let
 
   devicesByPath =
-    map (x: x.device) (library.filter (x: x ? device) swapDevices);
+    map (x: x.device) (lib.filter (x: x ? device) swapDevices);
     
   devicesByLabel =
-    map (x: x.label) (library.filter (x: x ? label) swapDevices);
+    map (x: x.label) (lib.filter (x: x ? label) swapDevices);
 
 in
 
-- 
GitLab


From 6e06b110975d3d2c91507079f273d64765838a23 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 12 Feb 2008 12:56:39 +0000
Subject: [PATCH 0794/5331] svn path=/nixos/trunk/; revision=10643

---
 upstart-jobs/apache-httpd/default.nix    |   6 +-
 upstart-jobs/apache-httpd/subversion.nix | 141 +++++++++++++++++++----
 2 files changed, 121 insertions(+), 26 deletions(-)

diff --git a/upstart-jobs/apache-httpd/default.nix b/upstart-jobs/apache-httpd/default.nix
index 922f68868a8..320f8cdb65c 100644
--- a/upstart-jobs/apache-httpd/default.nix
+++ b/upstart-jobs/apache-httpd/default.nix
@@ -260,6 +260,8 @@ in
     }
   ];
 
+  extraPath = [httpd] ++ pkgs.lib.concatMap (svc: svc.extraPath) subservices;
+
   # Statically verify the syntactic correctness of the generated
   # httpd.conf.
   buildHook = ''
@@ -281,7 +283,7 @@ in
       # Get rid of old semaphores.  These tend to accumulate across
       # server restarts, eventually preventing it from restarting
       # succesfully.
-      for i in $(${pkgs.utillinux}/bin/ipcs -s | grep ' wwwrun ' | cut -f2 -d ' '); do
+      for i in $(${pkgs.utillinux}/bin/ipcs -s | grep ' ${cfg.user} ' | cut -f2 -d ' '); do
         ${pkgs.utillinux}/bin/ipcrm -s $i
       done
     end script
@@ -291,7 +293,7 @@ in
       in pkgs.lib.concatStrings (map f (pkgs.lib.concatMap (svc: svc.globalEnvVars) subservices))
     }
 
-    env PATH=${pkgs.coreutils}/bin:${pkgs.gnugrep}/bin:${pkgs.lib.concatStringsSep ":" (pkgs.lib.concatMap (svc: svc.extraPath) subservices)}
+    env PATH=${pkgs.coreutils}/bin:${pkgs.gnugrep}/bin:${pkgs.lib.concatStringsSep ":" (pkgs.lib.concatMap (svc: svc.extraServerPath) subservices)}
 
     ${pkgs.diffutils}/bin:${pkgs.gnused}/bin
 
diff --git a/upstart-jobs/apache-httpd/subversion.nix b/upstart-jobs/apache-httpd/subversion.nix
index b03ab3ebfd1..4589256f0ca 100644
--- a/upstart-jobs/apache-httpd/subversion.nix
+++ b/upstart-jobs/apache-httpd/subversion.nix
@@ -7,9 +7,19 @@ let
   dbDir = "/tmp/svn/db";
   reposDir = "/tmp/svn/repos";
   backupsDir = "/tmp/svn/backup";
+  distsDir = "/tmp/svn/dist";
   tmpDir = "/tmp/svn/tmp";
+  logDir = "/tmp/svn/log";
   adminAddr = "eelco@cs.uu.nl";
   userCreationDomain = "10.0.0.0/8";
+  orgUrl = "http://www.cs.uu.nl/";
+  orgLogoUrl = "${prefix}/UU_merk.gif";
+  orgName = "Utrecht University";
+  postCommitHook = "/var/run/current-system/sw/bin/svn-server-post-commit-hook";
+  autoVersioning = true;
+  notificationSender = "root@buildfarm.st.ewi.tudelft.nl";
+  fsType = "fsfs";
+  smtpHost = "mail.st.ewi.tudelft.nl";
 
 
   # Build a Subversion instance with Apache modules and Swig/Python bindings.
@@ -23,6 +33,40 @@ let
     httpd = pkgs.apacheHttpd;
   };
 
+
+  # Build the maintenance scripts and commit hooks.
+  scripts = substituteInAll {
+    name = "svn-server-scripts";
+    src = pkgs.lib.cleanSource ../../../services/subversion/src/scripts;
+
+    # The variables to substitute:
+    
+    inherit reposDir dbDir logDir distsDir backupsDir tmpDir
+      adminAddr notificationSender userCreationDomain fsType
+      subversion orgUrl orgLogoUrl orgName smtpHost
+      postCommitHook;
+      
+    perl = "${pkgs.perl}/bin/perl";
+
+    sendmail = "${pkgs.ssmtp}/sbin/sendmail";
+    
+    urlPrefix = prefix;
+    
+    inherit (pkgs) libxslt enscript db4 coreutils bzip2;
+
+    inherit (serverInfo) canonicalName;
+    
+    # Urgh, most of these are dependencies of Email::Send, should figure them out automatically.
+    perlFlags = map (x: "-I${x}/lib/site_perl") [
+      pkgs.perlBerkeleyDB pkgs.perlEmailSend pkgs.perlEmailSimple
+      pkgs.perlModulePluggable pkgs.perlReturnValue pkgs.perlEmailAddress
+      pkgs.perlCryptPasswordMD5 pkgs.perlStringMkPasswd
+    ];
+
+    # Do a syntax check on the generated file.
+    postInstall = "$perl -c -T $out/cgi-bin/repoman.pl; $perl -c $out/bin/svn-server-create-user.pl";
+  };
+
   
   # Build our custom authentication modules.
   authModules = import ../../../services/subversion/src/auth {
@@ -58,7 +102,7 @@ let
 
     DAV svn
     SVNParentPath ${reposDir}
-    #SVNAutoversioning @autoVersioning@
+    SVNAutoversioning ${if autoVersioning then "on" else "off"}
   '';
 
 
@@ -121,29 +165,27 @@ let
   '';
 
 
-  # Build Repoman.
-    
-  repoman = pkgs.substituteAll {
-    src = ../../../services/subversion/src/repoman/repoman.pl.in;
-    dir = "/";
-    name = "repoman.pl";
-    isExecutable = true;
-    perl = "${pkgs.perl}/bin/perl";
-    defaultPath = "";
-    urlPrefix = prefix;
-    orgUrl = "http://example.org/";
-    orgLogoUrl = "http://example.org/";
-    orgName = "Example Org";
-    inherit (serverInfo) canonicalName;
-    fsType = "fsfs";
-    inherit adminAddr reposDir backupsDir dbDir subversion userCreationDomain;
+  distConfig = ''
+    Alias ${prefix}/dist ${distsDir}
 
-    # Urgh, most of these are dependencies of Email::Send, should figure them out automatically.
-    perlFlags = "-I${pkgs.perlBerkeleyDB}/lib/site_perl -I${pkgs.perlEmailSend}/lib/site_perl -I${pkgs.perlEmailSimple}/lib/site_perl -I${pkgs.perlModulePluggable}/lib/site_perl -I${pkgs.perlReturnValue}/lib/site_perl -I${pkgs.perlEmailAddress}/lib/site_perl";
-  };
+    <Directory "${distsDir}">
+        AllowOverride None
+        Options Indexes FollowSymLinks
+        Order allow,deny
+        Allow from all
+        IndexOptions +SuppressDescription +NameWidth=*
+        IndexIgnore *.rev *.lock
+        IndexStyleSheet ${prefix}/style.css
+    </Directory>
+
+    <Location ${prefix}/dist>
+        ${viewerConfig "dist"}
+    </Location>
+  '';
+  
 
   repomanConfig = ''
-    ScriptAlias ${prefix}/repoman ${repoman}/repoman.pl
+    ScriptAlias ${prefix}/repoman ${scripts}/cgi-bin/repoman.pl
 
     <Location ${prefix}/repoman/listdetails>
         ${commonAuth}    
@@ -181,10 +223,53 @@ let
     </Location>
   '';
 
+
+  staticFiles = substituteInSome {
+    name = "svn-static-files";
+    src = pkgs.lib.cleanSource ../../../services/subversion/root;
+    urlPrefix = prefix;
+    files = ["xsl/svnindex.xsl"];
+  };
+
+  staticFilesConfig = ''
+    Alias ${prefix} ${staticFiles}
+    <Directory ${staticFiles}>
+        Order allow,deny
+        Allow from all
+        AllowOverride None
+        DirectoryIndex repoman
+    </Directory>
+  '';
+
   
-  # !!!
+  # !!! should be in Nixpkgs.
   writeTextInDir = name: text:
-    pkgs.runCommand name {inherit text;} "ensureDir $out; echo -n \"$text\" > $out/$name";
+    pkgs.runCommand name {inherit text;} ''ensureDir $out; echo -n "$text" > $out/$name'';
+
+  substituteInSome = args: pkgs.stdenv.mkDerivation ({
+    buildCommand = ''
+      buildCommand= # ugh, hack to prevent sed errors
+      ensureDir $out
+      cp -prd $src/* $out
+      chmod -R u+w $out
+      for i in $files; do
+        substituteAll $out/$i $out/$i
+      done
+    '';
+  } // args); # */
+    
+  substituteInAll = args: pkgs.stdenv.mkDerivation ({
+    buildCommand = ''
+      buildCommand= # ugh, hack to prevent sed errors
+      ensureDir $out
+      cp -prd $src/* $out
+      chmod -R u+w $out
+      find $out -type f -print | while read fn; do
+        substituteAll $fn $fn
+      done
+      eval "$postInstall"
+    '';
+  } // args); # */
     
 in
 
@@ -206,6 +291,8 @@ in
   ];
 
   extraConfig = ''
+
+    #RedirectPermanent ^${prefix}$ ${prefix}/repoman
   
     <AuthnProviderAlias dbm auth-against-db>
         AuthDBMType DB
@@ -226,6 +313,10 @@ in
     ${websvnConfig}
 
     ${repomanConfig}
+
+    ${distConfig}
+
+    ${staticFilesConfig}
         
   '';
 
@@ -243,10 +334,12 @@ in
     { name = "PYTHONPATH"; value = "${pkgs.mod_python}/lib/python2.4/site-packages"; }
   ];
 
-  extraPath = [
+  extraServerPath = [
     # Needed for ViewVC.
     "${pkgs.diffutils}/bin"
     "${pkgs.gnused}/bin"
   ];
+
+  extraPath = [scripts];
   
 }
-- 
GitLab


From 18123c08ca6bd90f4a20c5fd9b0a8a2b54dddb01 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 14 Feb 2008 07:42:52 +0000
Subject: [PATCH 0795/5331] * Refactoring.

svn path=/nixos/trunk/; revision=10671
---
 etc/default.nix                          |  2 +-
 system/options.nix                       | 23 ++++++--------------
 upstart-jobs/apache-httpd/default.nix    | 27 ++++++++++++------------
 upstart-jobs/apache-httpd/subversion.nix | 10 ++++-----
 upstart-jobs/xserver.conf                |  3 +--
 5 files changed, 27 insertions(+), 38 deletions(-)

diff --git a/etc/default.nix b/etc/default.nix
index 6456e52f9d9..599ee33944f 100644
--- a/etc/default.nix
+++ b/etc/default.nix
@@ -162,7 +162,7 @@ import ../helpers/make-etc.nix {
     
   # Configuration file for fontconfig used to locate
   # (X11) client-rendered fonts.
-  ++ optional config.fonts.enableFontConfig { 
+  ++ optional config.fonts.enableFontConfig {
     source = pkgs.runCommand "fonts.conf"
       { 
         fontDirectories = import ../system/fonts.nix {inherit pkgs config;};
diff --git a/system/options.nix b/system/options.nix
index eed01824bf5..723bf475900 100644
--- a/system/options.nix
+++ b/system/options.nix
@@ -1277,7 +1277,7 @@
 	  description = "List of Java webapplications that should be mapped to the servlet container (Tomcat/JBoss)";
 	};
       };
-      
+
       subservices = {
 
         subversion = {
@@ -1354,22 +1354,11 @@
 
       };
 
-      extraSubservices = {
-
-        enable = mkOption {
-          default = false;
-          description = "
-            Whether to enable the extra subservices in the webserver.
-          ";
-        };
-
-        services = mkOption {
-          default = [];
-          description = "
-            Extra subservices to enable in the webserver.
-          ";
-        };
-
+      extraSubservices = mkOption {
+        default = [];
+        description = "
+          Extra subservices to enable in the webserver.
+        ";
       };
 
     };
diff --git a/upstart-jobs/apache-httpd/default.nix b/upstart-jobs/apache-httpd/default.nix
index 320f8cdb65c..9d72896c772 100644
--- a/upstart-jobs/apache-httpd/default.nix
+++ b/upstart-jobs/apache-httpd/default.nix
@@ -18,11 +18,10 @@ let
   };
 
 
-  subservices = [
-    (import ./subversion.nix {inherit config pkgs serverInfo;})
-  ];
+  subservices = map (svc: svc {inherit config pkgs serverInfo;}) cfg.extraSubservices;
 
 
+  # !!! should be in lib
   writeTextInDir = name: text:
     pkgs.runCommand name {inherit text;} "ensureDir $out; echo -n \"$text\" > $out/$name";
   
@@ -134,17 +133,12 @@ let
   '';
 
 
-  robotsTxt = writeTextInDir "robots.txt" ''
+  robotsTxt = pkgs.writeText "robots.txt" ''
     ${pkgs.lib.concatStrings (map (svc: svc.robotsEntries) subservices)}
   '';
   
   robotsConf = ''
-    Alias /robots.txt ${robotsTxt}/robots.txt
-
-    <Directory ${robotsTxt}>
-        Order allow,deny
-        Allow from all
-    </Directory>
+    Alias /robots.txt ${robotsTxt}
   '';
 
   
@@ -215,12 +209,19 @@ let
     ${if cfg.enableSSL then sslConf else ""}
 
     # Fascist default - deny access to everything.
-    # !!!
     <Directory />
         Options FollowSymLinks
         AllowOverride None
-#        Order deny,allow
-#        Deny from all
+        Order deny,allow
+        Deny from all
+    </Directory>
+
+    # But do allow access to files in the store so that we don't have
+    # to generate <Directory> clauses for every generated file that we
+    # want to serve.
+    <Directory /nix/store>
+        Order allow,deny
+        Allow from all
     </Directory>
 
     ${documentRootConf}
diff --git a/upstart-jobs/apache-httpd/subversion.nix b/upstart-jobs/apache-httpd/subversion.nix
index 4589256f0ca..bcc95e00941 100644
--- a/upstart-jobs/apache-httpd/subversion.nix
+++ b/upstart-jobs/apache-httpd/subversion.nix
@@ -64,7 +64,9 @@ let
     ];
 
     # Do a syntax check on the generated file.
-    postInstall = "$perl -c -T $out/cgi-bin/repoman.pl; $perl -c $out/bin/svn-server-create-user.pl";
+    postInstall = ''
+      $perl -c -T $out/cgi-bin/repoman.pl; $perl -c $out/bin/svn-server-create-user.pl
+    '';
   };
 
   
@@ -246,9 +248,8 @@ let
   writeTextInDir = name: text:
     pkgs.runCommand name {inherit text;} ''ensureDir $out; echo -n "$text" > $out/$name'';
 
-  substituteInSome = args: pkgs.stdenv.mkDerivation ({
+  substituteInSome = args: pkgs.stdenvUsingSetupNew2.mkDerivation ({
     buildCommand = ''
-      buildCommand= # ugh, hack to prevent sed errors
       ensureDir $out
       cp -prd $src/* $out
       chmod -R u+w $out
@@ -258,9 +259,8 @@ let
     '';
   } // args); # */
     
-  substituteInAll = args: pkgs.stdenv.mkDerivation ({
+  substituteInAll = args: pkgs.stdenvUsingSetupNew2.mkDerivation ({
     buildCommand = ''
-      buildCommand= # ugh, hack to prevent sed errors
       ensureDir $out
       cp -prd $src/* $out
       chmod -R u+w $out
diff --git a/upstart-jobs/xserver.conf b/upstart-jobs/xserver.conf
index 2535f194a5d..d3fc22278c5 100644
--- a/upstart-jobs/xserver.conf
+++ b/upstart-jobs/xserver.conf
@@ -78,7 +78,6 @@ Section "Device"
   Identifier   "Device[0]"
   Driver       "@videoDriver@"
   Option       "Clone" "@isClone@"
-  #Option       "MonitorLayout" "CRT,LFP"
   @device@
   @internalAGPGART@
   @extraDeviceConfig@
@@ -90,7 +89,7 @@ Section "ServerLayout"
   InputDevice  "Keyboard[0]" "CoreKeyboard"
   InputDevice  "@corePointer@" "CorePointer"
   Screen       "Screen[0]"
-	@serverLayoutOptions@
+  @serverLayoutOptions@
 EndSection
 
 
-- 
GitLab


From 33f34e2092434556c284e128403c99d79786a1dc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Thu, 14 Feb 2008 09:41:34 +0000
Subject: [PATCH 0796/5331] Don't define `ASPELL_EXTRA_DICT_DIRS', use
 `ASPELL_CONF' instead.

svn path=/nixos/trunk/; revision=10673
---
 etc/profile.sh | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/etc/profile.sh b/etc/profile.sh
index 3b448940187..2e533a7457f 100644
--- a/etc/profile.sh
+++ b/etc/profile.sh
@@ -55,9 +55,11 @@ NIX_PROFILES="/nix/var/nix/profiles/default $NIX_USER_PROFILE_DIR/profile"
 for i in $NIX_PROFILES; do # !!! reverse
     export PATH=$i/bin:$i/sbin:$PATH
     export INFOPATH=$i/info:$i/share/info:$INFOPATH
-    export ASPELL_EXTRA_DICT_DIRS="$i/lib/aspell${ASPELL_EXTRA_DICT_DIRS:+,}$ASPELL_EXTRA_DICT_DIRS"
 done
 
+# Search directory for Aspell dictionaries.
+export ASPELL_CONF="dict-dir $NIX_USER_PROFILE_DIR/profile/lib/aspell"
+
 export PATH=$HOME/bin:$PATH
 
 
-- 
GitLab


From f6fce91cb20643ec4a3ed0c1e07dc8967c75e5b3 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 14 Feb 2008 09:54:25 +0000
Subject: [PATCH 0797/5331] * Allow httpd subservices to declare options
 locally. * Allow multiple instantiations of a subservice (for instance,  
 multiple Subversion subservices in the same Apache server).

svn path=/nixos/trunk/; revision=10675
---
 system/options.nix                       |  13 ++
 upstart-jobs/apache-httpd/default.nix    |  21 ++-
 upstart-jobs/apache-httpd/subversion.nix | 210 +++++++++++++++--------
 3 files changed, 168 insertions(+), 76 deletions(-)

diff --git a/system/options.nix b/system/options.nix
index 723bf475900..7c452d02435 100644
--- a/system/options.nix
+++ b/system/options.nix
@@ -1246,6 +1246,18 @@
         ";
       };
 
+      servedFiles = mkOption {
+        default = [];
+        example = [
+          { urlPath = "/foo/bar.png";
+            dir = "/home/eelco/some-file.png";
+          }
+        ];
+        description = "
+          This option provides a simple way to serve individual, static files.
+        ";
+      };
+
       # !!! this is a mis-nomer, should be "extraConfig" or something.
       extraDirectories = mkOption {
         default = "";
@@ -1280,6 +1292,7 @@
 
       subservices = {
 
+        # !!! remove this
         subversion = {
 
           enable = mkOption {
diff --git a/upstart-jobs/apache-httpd/default.nix b/upstart-jobs/apache-httpd/default.nix
index 9d72896c772..69d50757bf1 100644
--- a/upstart-jobs/apache-httpd/default.nix
+++ b/upstart-jobs/apache-httpd/default.nix
@@ -15,10 +15,17 @@ let
       "http://" +
       cfg.hostName +
       (if cfg.httpPort != 80 then ":${toString cfg.httpPort}" else "");
+    serverConfig = cfg;
+    fullConfig = config; # machine config
   };
 
 
-  subservices = map (svc: svc {inherit config pkgs serverInfo;}) cfg.extraSubservices;
+  subservices =
+    let f = svc:
+      let config = pkgs.lib.addDefaultOptionValues res.options svc.config;
+          res = svc.function {inherit config pkgs serverInfo;};
+      in res;
+    in map f cfg.extraSubservices;
 
 
   # !!! should be in lib
@@ -174,6 +181,7 @@ let
     ${if cfg.enableUserDir then ''
     
       UserDir public_html
+      UserDir disabled root
       
       <Directory "/home/*/public_html">
           AllowOverride FileInfo AuthConfig Limit Indexes
@@ -224,6 +232,8 @@ let
         Allow from all
     </Directory>
 
+    ${robotsConf}
+    
     ${documentRootConf}
 
     ${
@@ -238,9 +248,14 @@ let
       in pkgs.lib.concatStrings (map makeDirConf cfg.servedDirs)
     }
 
-    ${pkgs.lib.concatStrings (map (svc: svc.extraConfig) subservices)}
+    ${
+      let makeFileConf = elem: ''
+            Alias ${elem.urlPath} ${elem.file}
+          '';
+      in pkgs.lib.concatStrings (map makeFileConf cfg.servedFiles)
+    }
 
-    ${robotsConf}
+    ${pkgs.lib.concatStrings (map (svc: svc.extraConfig) subservices)}
   '';
 
     
diff --git a/upstart-jobs/apache-httpd/subversion.nix b/upstart-jobs/apache-httpd/subversion.nix
index bcc95e00941..ae78f90e22c 100644
--- a/upstart-jobs/apache-httpd/subversion.nix
+++ b/upstart-jobs/apache-httpd/subversion.nix
@@ -1,25 +1,20 @@
-{ config, pkgs, serverInfo
-}:
+{config, pkgs, serverInfo}:
 
 let
 
-  prefix = "/svn";
-  dbDir = "/tmp/svn/db";
-  reposDir = "/tmp/svn/repos";
-  backupsDir = "/tmp/svn/backup";
-  distsDir = "/tmp/svn/dist";
-  tmpDir = "/tmp/svn/tmp";
-  logDir = "/tmp/svn/log";
-  adminAddr = "eelco@cs.uu.nl";
-  userCreationDomain = "10.0.0.0/8";
-  orgUrl = "http://www.cs.uu.nl/";
-  orgLogoUrl = "${prefix}/UU_merk.gif";
-  orgName = "Utrecht University";
+  inherit (pkgs.lib) mkOption;
+
+  urlPrefix = config.urlPrefix;
+  dbDir = "${config.dataDir}/db";
+  reposDir = "${config.dataDir}/repos";
+  backupsDir = "${config.dataDir}/backup";
+  distsDir = "${config.dataDir}/dist";
+  tmpDir = "${config.dataDir}/tmp";
+  logDir = "${config.dataDir}/log";
   postCommitHook = "/var/run/current-system/sw/bin/svn-server-post-commit-hook";
-  autoVersioning = true;
-  notificationSender = "root@buildfarm.st.ewi.tudelft.nl";
   fsType = "fsfs";
-  smtpHost = "mail.st.ewi.tudelft.nl";
+  adminAddr = serverInfo.serverConfig.adminAddr;
+  
 
 
   # Build a Subversion instance with Apache modules and Swig/Python bindings.
@@ -42,16 +37,16 @@ let
     # The variables to substitute:
     
     inherit reposDir dbDir logDir distsDir backupsDir tmpDir
-      adminAddr notificationSender userCreationDomain fsType
-      subversion orgUrl orgLogoUrl orgName smtpHost
-      postCommitHook;
+      urlPrefix adminAddr fsType subversion postCommitHook;
+    inherit (config) notificationSender userCreationDomain;
+    orgUrl = config.organisation.url;
+    orgLogoUrl = config.organisation.logo;
+    orgName = config.organisation.name;
       
     perl = "${pkgs.perl}/bin/perl";
 
     sendmail = "${pkgs.ssmtp}/sbin/sendmail";
     
-    urlPrefix = prefix;
-    
     inherit (pkgs) libxslt enscript db4 coreutils bzip2;
 
     inherit (serverInfo) canonicalName;
@@ -65,7 +60,8 @@ let
 
     # Do a syntax check on the generated file.
     postInstall = ''
-      $perl -c -T $out/cgi-bin/repoman.pl; $perl -c $out/bin/svn-server-create-user.pl
+      $perl -c -T $out/cgi-bin/repoman.pl
+      $perl -c $out/bin/svn-server-create-user.pl
     '';
   };
 
@@ -79,7 +75,9 @@ let
   commonAuth = ''
     AuthType Basic
     AuthName "Subversion repositories"
-    AuthBasicProvider auth-against-db
+    AuthBasicProvider dbm
+    AuthDBMType DB
+    AuthDBMUserFile ${dbDir}/svn-users
   '';
   
 
@@ -89,7 +87,7 @@ let
 
     AuthAllowNone on
 
-    AuthzRepoPrefix ${prefix}/${dirName}/
+    AuthzRepoPrefix ${urlPrefix}/${dirName}/
     AuthzRepoDBType DB
     AuthzRepoReaders ${dbDir}/svn-readers
     AuthzRepoWriters ${dbDir}/svn-writers
@@ -104,22 +102,21 @@ let
 
     DAV svn
     SVNParentPath ${reposDir}
-    SVNAutoversioning ${if autoVersioning then "on" else "off"}
+    SVNAutoversioning ${if config.autoVersioning then "on" else "off"}
   '';
 
 
   # Build ViewVC.
   viewvc = import ../../../services/subversion/src/viewvc {
     inherit (pkgs) fetchurl stdenv python enscript;
-    inherit reposDir adminAddr subversion;
-    urlPrefix = prefix;
+    inherit urlPrefix reposDir adminAddr subversion;
   };
 
 
   viewerConfig = dirName: ''
     ${commonAuth}
     AuthAllowNone on
-    AuthzRepoPrefix ${prefix}/${dirName}/
+    AuthzRepoPrefix ${urlPrefix}/${dirName}/
     AuthzRepoDBType DB
     AuthzRepoReaders ${dbDir}/svn-readers
     Require repo-reader
@@ -127,9 +124,9 @@ let
 
 
   viewvcConfig = ''
-    ScriptAlias ${prefix}/viewvc ${viewvc}/viewvc/bin/mod_python/viewvc.py
+    ScriptAlias ${urlPrefix}/viewvc ${viewvc}/viewvc/bin/mod_python/viewvc.py
 
-    <Location ${prefix}/viewvc>
+    <Location ${urlPrefix}/viewvc>
         AddHandler python-program .py
         # Note: we write \" instead of ' to work around a lexer bug in Nix 0.11.
         PythonPath "[\"${viewvc}/viewvc/bin/mod_python\", \"${subversion}/lib/python2.4/site-packages\"] + sys.path"
@@ -137,26 +134,25 @@ let
         ${viewerConfig "viewvc"}
     </Location>
 
-    Alias ${prefix}/viewvc-doc ${viewvc}/viewvc/templates/docroot
+    Alias ${urlPrefix}/viewvc-doc ${viewvc}/viewvc/templates/docroot
 
-    Redirect permanent ${prefix}/viewcvs ${serverInfo.canonicalName}/${prefix}/viewvc
+    Redirect permanent ${urlPrefix}/viewcvs ${serverInfo.canonicalName}/${urlPrefix}/viewvc
   '';
 
 
   # Build WebSVN.
   websvn = import ../../../services/subversion/src/websvn {
     inherit (pkgs) fetchurl stdenv writeText enscript gnused diffutils;
-    inherit reposDir subversion;
+    inherit urlPrefix reposDir subversion;
     cacheDir = tmpDir;
-    urlPrefix = prefix;
   };
 
   
   websvnConfig = ''
-    Alias ${prefix}/websvn ${websvn}/wsvn.php
-    Alias ${prefix}/templates ${websvn}/templates
+    Alias ${urlPrefix}/websvn ${websvn}/wsvn.php
+    Alias ${urlPrefix}/templates ${websvn}/templates
 
-    <Location ${prefix}/websvn>
+    <Location ${urlPrefix}/websvn>
         ${viewerConfig "websvn"}
     </Location>
 
@@ -168,7 +164,7 @@ let
 
 
   distConfig = ''
-    Alias ${prefix}/dist ${distsDir}
+    Alias ${urlPrefix}/dist ${distsDir}
 
     <Directory "${distsDir}">
         AllowOverride None
@@ -177,50 +173,50 @@ let
         Allow from all
         IndexOptions +SuppressDescription +NameWidth=*
         IndexIgnore *.rev *.lock
-        IndexStyleSheet ${prefix}/style.css
+        IndexStyleSheet ${urlPrefix}/style.css
     </Directory>
 
-    <Location ${prefix}/dist>
+    <Location ${urlPrefix}/dist>
         ${viewerConfig "dist"}
     </Location>
   '';
   
 
   repomanConfig = ''
-    ScriptAlias ${prefix}/repoman ${scripts}/cgi-bin/repoman.pl
+    ScriptAlias ${urlPrefix}/repoman ${scripts}/cgi-bin/repoman.pl
 
-    <Location ${prefix}/repoman/listdetails>
+    <Location ${urlPrefix}/repoman/listdetails>
         ${commonAuth}    
         Require valid-user
     </Location>
 
-    <Location ${prefix}/repoman/adduser>
+    <Location ${urlPrefix}/repoman/adduser>
         Order deny,allow
         Deny from all
         Allow from 127.0.0.1
-        Allow from ${userCreationDomain}
+        Allow from ${config.userCreationDomain}
     </Location>
 
-    <Location ${prefix}/repoman/edituser>
+    <Location ${urlPrefix}/repoman/edituser>
         ${commonAuth}    
         Require valid-user
     </Location>
 
-    <Location ${prefix}/repoman/create>
+    <Location ${urlPrefix}/repoman/create>
         ${commonAuth}    
         Require valid-user
         Order deny,allow
         Deny from all
         Allow from 127.0.0.1
-        Allow from ${userCreationDomain}
+        Allow from ${config.userCreationDomain}
     </Location>
 
-    <Location ${prefix}/repoman/update>
+    <Location ${urlPrefix}/repoman/update>
         ${commonAuth}    
         Require valid-user
     </Location>
 
-    <Location ${prefix}/repoman/dump>
+    <Location ${urlPrefix}/repoman/dump>
         ${viewerConfig "repoman/dump"}
     </Location>
   '';
@@ -229,25 +225,22 @@ let
   staticFiles = substituteInSome {
     name = "svn-static-files";
     src = pkgs.lib.cleanSource ../../../services/subversion/root;
-    urlPrefix = prefix;
     files = ["xsl/svnindex.xsl"];
+    inherit urlPrefix;
   };
 
   staticFilesConfig = ''
-    Alias ${prefix} ${staticFiles}
+    # !!! this breaks UserDir if urlPrefix == ""
+    Alias ${if urlPrefix == "" then "/" else urlPrefix} ${staticFiles}/
     <Directory ${staticFiles}>
         Order allow,deny
         Allow from all
-        AllowOverride None
         DirectoryIndex repoman
     </Directory>
   '';
 
   
   # !!! should be in Nixpkgs.
-  writeTextInDir = name: text:
-    pkgs.runCommand name {inherit text;} ''ensureDir $out; echo -n "$text" > $out/$name'';
-
   substituteInSome = args: pkgs.stdenvUsingSetupNew2.mkDerivation ({
     buildCommand = ''
       ensureDir $out
@@ -270,10 +263,9 @@ let
       eval "$postInstall"
     '';
   } // args); # */
-    
-in
 
-{
+      
+in {
 
   extraModulesPre = [
     # Allow anonymous access to repositories that are world-readable
@@ -290,22 +282,16 @@ in
     { name = "dav_svn"; path = "${subversion}/modules/mod_dav_svn.so"; }
   ];
 
+  
   extraConfig = ''
-
-    #RedirectPermanent ^${prefix}$ ${prefix}/repoman
   
-    <AuthnProviderAlias dbm auth-against-db>
-        AuthDBMType DB
-        AuthDBMUserFile ${dbDir}/svn-users
-    </AuthnProviderAlias>
-
-    <Location ${prefix}/repos>
+    <Location ${urlPrefix}/repos>
       ${reposConfig "repos"}
     </Location>
     
-    <Location ${prefix}/repos-xml>
+    <Location ${urlPrefix}/repos-xml>
       ${reposConfig "repos-xml"}
-      SVNIndexXSLT "${prefix}/xsl/svnindex.xsl"
+      SVNIndexXSLT "${urlPrefix}/xsl/svnindex.xsl"
     </Location>
 
     ${viewvcConfig}
@@ -320,26 +306,104 @@ in
         
   '';
 
+  
   robotsEntries = ''
     User-agent: *
-    Disallow: ${prefix}/viewcvs/
-    Disallow: ${prefix}/viewvc/
-    Disallow: ${prefix}/websvn/
-    Disallow: ${prefix}/repos-xml/
+    Disallow: ${urlPrefix}/viewcvs/
+    Disallow: ${urlPrefix}/viewvc/
+    Disallow: ${urlPrefix}/websvn/
+    Disallow: ${urlPrefix}/repos-xml/
   '';
 
+  
   # mod_python's own Python modules must be in the initial Python
   # path, they cannot be set through the PythonPath directive.
   globalEnvVars = [
     { name = "PYTHONPATH"; value = "${pkgs.mod_python}/lib/python2.4/site-packages"; }
   ];
 
+  
   extraServerPath = [
     # Needed for ViewVC.
     "${pkgs.diffutils}/bin"
     "${pkgs.gnused}/bin"
   ];
 
+  
   extraPath = [scripts];
   
+
+  options = {
+
+    urlPrefix = mkOption {
+      default = "/subversion";
+      description = "
+        The URL prefix under which the Subversion service appears.
+        Use the empty string to have it appear in the server root.
+      ";
+    };
+
+    notificationSender = mkOption {
+      default = "svn-server@example.org";
+      example = "svn-server@example.org";
+      description = "
+        The email address used in the Sender field of commit
+        notification messages sent by the Subversion subservice.
+      ";
+    };
+
+    userCreationDomain = mkOption {
+      default = "example.org"; 
+      example = "example.org";
+      description = "
+        The domain from which user creation is allowed.  A client can
+        only create a new user account if its IP address resolves to
+        this domain.
+      ";
+    };
+
+    autoVersioning = mkOption {
+      default = false;
+      description = "
+        Whether you want the Subversion subservice to support
+        auto-versioning, which enables Subversion repositories to be
+        mounted as read/writable file systems on operating systems that
+        support WebDAV.
+      ";
+    };
+
+    dataDir = mkOption {
+      default = "/no/such/path/exists";
+      description = "
+        Place to put SVN repository.
+      ";
+    };
+
+    organisation = {
+
+      name = mkOption {
+        default = null;
+        description = "
+          Name of the organization hosting the Subversion service.
+        ";
+      };
+
+      url = mkOption {
+        default = null;
+        description = "
+          URL of the website of the organization hosting the Subversion service.
+        ";
+      };
+
+      logo = mkOption {
+        default = null;
+        description = "
+          Logo the organization hosting the Subversion service.
+        ";
+      };
+
+    };
+
+  };  
+  
 }
-- 
GitLab


From a05d8425754119d2923c34d90a6bfe17264616a4 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 14 Feb 2008 10:56:14 +0000
Subject: [PATCH 0798/5331] * Close fdSelf.

svn path=/nixos/trunk/; revision=10678
---
 helpers/setuid/setuid-wrapper.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/helpers/setuid/setuid-wrapper.c b/helpers/setuid/setuid-wrapper.c
index 805ede7e2dd..4eeeb258e34 100644
--- a/helpers/setuid/setuid-wrapper.c
+++ b/helpers/setuid/setuid-wrapper.c
@@ -68,6 +68,8 @@ int main(int argc, char * * argv)
     if (len == -1) abort();
     if (len == sizeof(real)) abort();
     real[len] = 0;
+
+    close(fdSelf);
     
     //printf("real = %s, len = %d\n", real, len);
 
-- 
GitLab


From bdc729ea6c375265d7a459b71ad1d03e629552d6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Thu, 14 Feb 2008 11:08:06 +0000
Subject: [PATCH 0799/5331] Use `assert (!C)' instead of `if (C) abort ();' in
 setuid wrappers.

svn path=/nixos/trunk/; revision=10679
---
 helpers/setuid/setuid-wrapper.c | 42 +++++++++++++++------------------
 1 file changed, 19 insertions(+), 23 deletions(-)

diff --git a/helpers/setuid/setuid-wrapper.c b/helpers/setuid/setuid-wrapper.c
index 4eeeb258e34..142dc2331a7 100644
--- a/helpers/setuid/setuid-wrapper.c
+++ b/helpers/setuid/setuid-wrapper.c
@@ -6,6 +6,10 @@
 #include <sys/stat.h>
 #include <fcntl.h>
 #include <dirent.h>
+#include <assert.h>
+
+/* Make sure assertions are not compiled out.  */
+#undef NDEBUG
 
 extern char **environ;
 
@@ -14,24 +18,19 @@ static char * wrapperDir = WRAPPER_DIR;
 int main(int argc, char * * argv)
 {
     char self[PATH_MAX];
-    
+
     int len = readlink("/proc/self/exe", self, sizeof(self) - 1);
-    if (len == -1) abort();
+    assert (len > 0);
     self[len] = 0;
 
-    //printf("self = %s, ch = %c\n", self, self[strlen(wrapperDir)]);
-
-    
     /* Make sure that we are being executed from the right location,
        i.e., `wrapperDir'.  This is to prevent someone from
        creating hard link `X' from some other location, along with a
        false `X.real' file, to allow arbitrary programs from being
-       executed setuid. */
-    if ((strncmp(self, wrapperDir, sizeof(wrapperDir)) != 0) ||
-        (self[strlen(wrapperDir)] != '/'))
-        abort();
+       executed setuid.  */
+    assert ((strncmp(self, wrapperDir, sizeof(wrapperDir)) == 0) &&
+	    (self[strlen(wrapperDir)] == '/'));
 
-    
     /* Make *really* *really* sure that we were executed as `self',
        and not, say, as some other setuid program.  That is, our
        effective uid/gid should match the uid/gid of `self'. */
@@ -42,31 +41,28 @@ int main(int argc, char * * argv)
 
     //printf("%d %d\n", st.st_uid, st.st_gid);
     
-    if ((st.st_mode & S_ISUID) != 0 &&
-        st.st_uid != geteuid())
-        abort();
+    assert ((st.st_mode & S_ISUID) == 0 ||
+	    (st.st_uid == geteuid()));
 
-    if ((st.st_mode & S_ISGID) != 0 &&
-        st.st_gid != getegid())
-        abort();
+    assert ((st.st_mode & S_ISGID) == 0 ||
+	    st.st_gid == getegid());
 
     /* And, of course, we shouldn't be writable. */
-    if (st.st_mode & (S_IWGRP | S_IWOTH))
-        abort();
+    assert (!(st.st_mode & (S_IWGRP | S_IWOTH)));
 
 
     /* Read the path of the real (wrapped) program from <self>.real. */
     char realFN[PATH_MAX + 10];
-    if (snprintf(realFN, sizeof(realFN), "%s.real", self) >= sizeof(realFN))
-        abort();
+    int realFNSize = snprintf (realFN, sizeof(realFN), "%s.real", self);
+    assert (realFNSize < sizeof(realFN));
 
     int fdSelf = open(realFN, O_RDONLY);
-    if (fdSelf == -1) abort();
+    assert (fdSelf != -1);
 
     char real[PATH_MAX];
     len = read(fdSelf, real, PATH_MAX);
-    if (len == -1) abort();
-    if (len == sizeof(real)) abort();
+    assert (len != -1);
+    assert (len < sizeof (real));
     real[len] = 0;
 
     close(fdSelf);
-- 
GitLab


From bfbe92236afef0db62e116d2d5f445f635e7aecb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Thu, 14 Feb 2008 11:44:54 +0000
Subject: [PATCH 0800/5331] Remove remaining `abort ()'.

svn path=/nixos/trunk/; revision=10680
---
 helpers/setuid/setuid-wrapper.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/helpers/setuid/setuid-wrapper.c b/helpers/setuid/setuid-wrapper.c
index 142dc2331a7..30452fc7b7b 100644
--- a/helpers/setuid/setuid-wrapper.c
+++ b/helpers/setuid/setuid-wrapper.c
@@ -37,7 +37,7 @@ int main(int argc, char * * argv)
     //printf("%d %d\n", geteuid(), getegid());
 
     struct stat st;
-    if (lstat(self, &st) == -1) abort();
+    assert (lstat(self, &st) != -1);
 
     //printf("%d %d\n", st.st_uid, st.st_gid);
     
-- 
GitLab


From 94937ba2aad159d68d2b2860165bb7f378448147 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 14 Feb 2008 13:20:26 +0000
Subject: [PATCH 0801/5331] * Support for declaring virtual hosts, like

    httpd = {
      ...
      virtualHosts = [
        { hostName = "foo";
          documentRoot = "/data/webroot-foo";
          ...
        }
        { hostName = "bar";
          documentRoot = "/data/webroot-bar";
          ...
        }
      ];
    };

  Each virtual host can specify almost any option also permitted in
  the top-level httpd configuration.

svn path=/nixos/trunk/; revision=10682
---
 system/options.nix                            |  68 +-------
 upstart-jobs/apache-httpd/default.nix         | 146 +++++++++++-------
 .../apache-httpd/per-server-options.nix       |  86 +++++++++++
 upstart-jobs/apache-httpd/subversion.nix      |   2 +-
 4 files changed, 184 insertions(+), 118 deletions(-)
 create mode 100644 upstart-jobs/apache-httpd/per-server-options.nix

diff --git a/system/options.nix b/system/options.nix
index 7c452d02435..3e802253d07 100644
--- a/system/options.nix
+++ b/system/options.nix
@@ -1194,13 +1194,6 @@
         ";
       };
 
-      adminAddr = mkOption {
-        example = "admin@example.org";
-        description = "
-          E-mail address of the server administrator.
-        ";
-      };
-
       logDir = mkOption {
         default = "/var/log/httpd";
         description = "
@@ -1225,54 +1218,6 @@
         ";
       };
 
-      documentRoot = mkOption {
-        default = null;
-        example = "/data/webserver/docs";
-        description = "
-          The path of Apache's document root directory.  If left undefined,
-          an empty directory in the Nix store will be used as root.
-        ";
-      };
-
-      servedDirs = mkOption {
-        default = [];
-        example = [
-          { urlPath = "/nix";
-            dir = "/home/eelco/Dev/nix-homepage";
-          }
-        ];
-        description = "
-          This option provides a simple way to serve static directories.
-        ";
-      };
-
-      servedFiles = mkOption {
-        default = [];
-        example = [
-          { urlPath = "/foo/bar.png";
-            dir = "/home/eelco/some-file.png";
-          }
-        ];
-        description = "
-          This option provides a simple way to serve individual, static files.
-        ";
-      };
-
-      # !!! this is a mis-nomer, should be "extraConfig" or something.
-      extraDirectories = mkOption {
-        default = "";
-        example = "
-          <Directory /home>
-            Options FollowSymlinks
-            AllowOverride All
-          </Directory>
-        ";
-        description = "
-          These lines go to httpd.conf verbatim. They will go after
-          directories and directory aliases defined by default.
-        ";
-      };
-
       mod_php = mkOption {
         default = false;
         description = "Whether to enable the PHP module.";
@@ -1367,14 +1312,11 @@
 
       };
 
-      extraSubservices = mkOption {
-        default = [];
-        description = "
-          Extra subservices to enable in the webserver.
-        ";
-      };
-
-    };
+    } // # Include the options shared between the main server and virtual hosts.
+    (import ../upstart-jobs/apache-httpd/per-server-options.nix {
+      inherit mkOption;
+      forMainServer = true;
+    });
 
     vsftpd = {
       enable = mkOption {
diff --git a/upstart-jobs/apache-httpd/default.nix b/upstart-jobs/apache-httpd/default.nix
index 69d50757bf1..aff915e4a2b 100644
--- a/upstart-jobs/apache-httpd/default.nix
+++ b/upstart-jobs/apache-httpd/default.nix
@@ -9,23 +9,25 @@ let
   httpd = pkgs.apacheHttpd;
 
 
-  serverInfo = {
+  makeServerInfo = cfg: {
     # Canonical name must not include a trailing slash.
     canonicalName =
-      "http://" +
-      cfg.hostName +
+      "http://${cfg.hostName}" +
       (if cfg.httpPort != 80 then ":${toString cfg.httpPort}" else "");
     serverConfig = cfg;
     fullConfig = config; # machine config
   };
 
 
-  subservices =
+  callSubservices = serverInfo: defs:
     let f = svc:
       let config = pkgs.lib.addDefaultOptionValues res.options svc.config;
           res = svc.function {inherit config pkgs serverInfo;};
       in res;
-    in map f cfg.extraSubservices;
+    in map f defs;
+
+
+  allSubservices = callSubservices (makeServerInfo cfg) cfg.extraSubservices;
 
 
   # !!! should be in lib
@@ -33,10 +35,6 @@ let
     pkgs.runCommand name {inherit text;} "ensureDir $out; echo -n \"$text\" > $out/$name";
   
 
-  documentRoot = if cfg.documentRoot != null then cfg.documentRoot else
-    pkgs.runCommand "empty" {} "ensureDir $out";
-
-
   # Names of modules from ${httpd}/modules that we want to load.
   apacheModules = 
     [ # HTTP authentication mechanisms: basic and digest.
@@ -84,6 +82,7 @@ let
   '';
 
 
+  # !!! integrate with virtual hosting below
   sslConf = ''
     Listen ${toString cfg.httpsPort}
 
@@ -128,24 +127,65 @@ let
   '';
 
 
-  documentRootConf = ''
-    DocumentRoot "${documentRoot}"
+  perServerConf = isMainServer: cfg: let
 
-    <Directory "${documentRoot}">
-        Options Indexes FollowSymLinks
-        AllowOverride None
-        Order allow,deny
-        Allow from all
-    </Directory>
-  '';
+    serverInfo = makeServerInfo cfg;
 
+    subservices = callSubservices serverInfo cfg.extraSubservices;
 
-  robotsTxt = pkgs.writeText "robots.txt" ''
-    ${pkgs.lib.concatStrings (map (svc: svc.robotsEntries) subservices)}
-  '';
-  
-  robotsConf = ''
-    Alias /robots.txt ${robotsTxt}
+    documentRoot = if cfg.documentRoot != null then cfg.documentRoot else
+      pkgs.runCommand "empty" {} "ensureDir $out";
+
+    documentRootConf = ''
+      DocumentRoot "${documentRoot}"
+
+      <Directory "${documentRoot}">
+          Options Indexes FollowSymLinks
+          AllowOverride None
+          Order allow,deny
+          Allow from all
+      </Directory>
+    '';
+
+    robotsTxt = pkgs.writeText "robots.txt" ''
+      ${concatMapStrings (svc: svc.robotsEntries) subservices}
+    '';
+
+    robotsConf = ''
+      Alias /robots.txt ${robotsTxt}
+    '';
+
+  in ''
+    ServerName ${serverInfo.canonicalName}
+
+    ${if isMainServer || cfg.adminAddr != "" then ''
+      ServerAdmin ${cfg.adminAddr}
+    '' else ""}
+
+    ${robotsConf}
+
+    ${if isMainServer || cfg.documentRoot != null then documentRootConf else ""}
+
+    ${
+      let makeDirConf = elem: ''
+            Alias ${elem.urlPath} ${elem.dir}/
+            <Directory ${elem.dir}>
+                Order allow,deny
+                Allow from all
+                AllowOverride None
+            </Directory>
+          '';
+      in concatMapStrings makeDirConf cfg.servedDirs
+    }
+
+    ${
+      let makeFileConf = elem: ''
+            Alias ${elem.urlPath} ${elem.file}
+          '';
+      in concatMapStrings makeFileConf cfg.servedFiles
+    }
+
+    ${concatMapStrings (svc: svc.extraConfig) subservices}
   '';
 
   
@@ -153,10 +193,6 @@ let
   
     ServerRoot ${httpd}
 
-    ServerAdmin ${cfg.adminAddr}
-
-    ServerName ${serverInfo.canonicalName}
-
     PidFile ${cfg.stateDir}/httpd.pid
 
     <IfModule prefork.c>
@@ -172,10 +208,10 @@ let
     ${let
         load = {name, path}: "LoadModule ${name}_module ${path}\n";
         allModules =
-          pkgs.lib.concatMap (svc: svc.extraModulesPre) subservices ++
+          pkgs.lib.concatMap (svc: svc.extraModulesPre) allSubservices ++
           map (name: {inherit name; path = "${httpd}/modules/mod_${name}.so";}) apacheModules ++
-          pkgs.lib.concatMap (svc: svc.extraModules) subservices;
-      in pkgs.lib.concatStrings (map load allModules)
+          pkgs.lib.concatMap (svc: svc.extraModules) allSubservices;
+      in concatMapStrings load allModules
     }
 
     ${if cfg.enableUserDir then ''
@@ -232,30 +268,32 @@ let
         Allow from all
     </Directory>
 
-    ${robotsConf}
+    # Generate directives for the main server.
+    ${perServerConf true cfg}
     
-    ${documentRootConf}
+    # Always enable virtual hosts; it doesn't seem to hurt.
+    NameVirtualHost *:*
 
-    ${
-      let makeDirConf = elem: ''
-            Alias ${elem.urlPath} ${elem.dir}/
-            <Directory ${elem.dir}>
-                Order allow,deny
-                Allow from all
-                AllowOverride None
-            </Directory>
-          '';
-      in pkgs.lib.concatStrings (map makeDirConf cfg.servedDirs)
-    }
+    # Catch-all: since this is the first virtual host, any
+    # non-matching requests will use the main server configuration.
+    <VirtualHost *:*>
+    </VirtualHost>
 
-    ${
-      let makeFileConf = elem: ''
-            Alias ${elem.urlPath} ${elem.file}
+    ${let
+        perServerOptions = import ./per-server-options.nix {
+          inherit (pkgs.lib) mkOption;
+          forMainServer = false;
+        };
+        makeVirtualHost = vhostIn:
+          let
+            # Fill in defaults for missing options.
+            vhost = pkgs.lib.addDefaultOptionValues perServerOptions vhostIn;
+          in ''
+            <VirtualHost *:*>
+                ${perServerConf false vhost}
+            </VirtualHost>
           '';
-      in pkgs.lib.concatStrings (map makeFileConf cfg.servedFiles)
-    }
-
-    ${pkgs.lib.concatStrings (map (svc: svc.extraConfig) subservices)}
+      in concatMapStrings makeVirtualHost cfg.virtualHosts}
   '';
 
     
@@ -276,7 +314,7 @@ in
     }
   ];
 
-  extraPath = [httpd] ++ pkgs.lib.concatMap (svc: svc.extraPath) subservices;
+  extraPath = [httpd] ++ pkgs.lib.concatMap (svc: svc.extraPath) allSubservices;
 
   # Statically verify the syntactic correctness of the generated
   # httpd.conf.
@@ -306,10 +344,10 @@ in
 
     ${
       let f = {name, value}: "env ${name}=${value}\n";
-      in pkgs.lib.concatStrings (map f (pkgs.lib.concatMap (svc: svc.globalEnvVars) subservices))
+      in pkgs.lib.concatStrings (map f (pkgs.lib.concatMap (svc: svc.globalEnvVars) allSubservices))
     }
 
-    env PATH=${pkgs.coreutils}/bin:${pkgs.gnugrep}/bin:${pkgs.lib.concatStringsSep ":" (pkgs.lib.concatMap (svc: svc.extraServerPath) subservices)}
+    env PATH=${pkgs.coreutils}/bin:${pkgs.gnugrep}/bin:${pkgs.lib.concatStringsSep ":" (pkgs.lib.concatMap (svc: svc.extraServerPath) allSubservices)}
 
     ${pkgs.diffutils}/bin:${pkgs.gnused}/bin
 
diff --git a/upstart-jobs/apache-httpd/per-server-options.nix b/upstart-jobs/apache-httpd/per-server-options.nix
new file mode 100644
index 00000000000..08f60b2cc6d
--- /dev/null
+++ b/upstart-jobs/apache-httpd/per-server-options.nix
@@ -0,0 +1,86 @@
+# This file defines the options that can be used both for the Apache
+# main server configuration, and for the virtual hosts.  (The latter
+# has additional options that affect the web server as a whole, like
+# the user/group to run under.)
+
+{forMainServer, mkOption}:
+
+{
+
+  hostName = mkOption {
+    default = "localhost";
+    description = "
+      Canonical hostname for the server.
+    ";
+  };
+
+  httpPort = mkOption {
+    default = 80;
+    description = "
+      Port for unencrypted HTTP requests.
+    ";
+  };
+
+  adminAddr = mkOption ({
+    example = "admin@example.org";
+    description = "
+      E-mail address of the server administrator.
+    ";
+  } // (if forMainServer then {} else {default = "";}));
+
+  documentRoot = mkOption {
+    default = null;
+    example = "/data/webserver/docs";
+    description = "
+      The path of Apache's document root directory.  If left undefined,
+      an empty directory in the Nix store will be used as root.
+    ";
+  };
+
+  servedDirs = mkOption {
+    default = [];
+    example = [
+      { urlPath = "/nix";
+        dir = "/home/eelco/Dev/nix-homepage";
+      }
+    ];
+    description = "
+      This option provides a simple way to serve static directories.
+    ";
+  };
+
+  servedFiles = mkOption {
+    default = [];
+    example = [
+      { urlPath = "/foo/bar.png";
+        dir = "/home/eelco/some-file.png";
+      }
+    ];
+    description = "
+      This option provides a simple way to serve individual, static files.
+    ";
+  };
+
+  # !!! this is a mis-nomer, should be "extraConfig" or something.
+  extraDirectories = mkOption {
+    default = "";
+    example = "
+      <Directory /home>
+        Options FollowSymlinks
+        AllowOverride All
+      </Directory>
+    ";
+    description = "
+      These lines go to httpd.conf verbatim. They will go after
+      directories and directory aliases defined by default.
+    ";
+  };
+
+  extraSubservices = mkOption {
+    default = [];
+    description = "
+      Extra subservices to enable in the webserver.
+    ";
+  };
+
+}
diff --git a/upstart-jobs/apache-httpd/subversion.nix b/upstart-jobs/apache-httpd/subversion.nix
index ae78f90e22c..60c3d71c62d 100644
--- a/upstart-jobs/apache-httpd/subversion.nix
+++ b/upstart-jobs/apache-httpd/subversion.nix
@@ -404,6 +404,6 @@ in {
 
     };
 
-  };  
+  };
   
 }
-- 
GitLab


From 44fceb9c4de685b92607d7fff9097aef3f636e92 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 14 Feb 2008 13:37:09 +0000
Subject: [PATCH 0802/5331] svn path=/nixos/trunk/; revision=10686

---
 upstart-jobs/apache-httpd/default.nix | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/upstart-jobs/apache-httpd/default.nix b/upstart-jobs/apache-httpd/default.nix
index aff915e4a2b..b04e12c9e31 100644
--- a/upstart-jobs/apache-httpd/default.nix
+++ b/upstart-jobs/apache-httpd/default.nix
@@ -8,6 +8,8 @@ let
 
   httpd = pkgs.apacheHttpd;
 
+  inherit (pkgs.lib) addDefaultOptionValues optional concatMap concatMapStrings;
+  
 
   makeServerInfo = cfg: {
     # Canonical name must not include a trailing slash.
@@ -21,7 +23,7 @@ let
 
   callSubservices = serverInfo: defs:
     let f = svc:
-      let config = pkgs.lib.addDefaultOptionValues res.options svc.config;
+      let config = addDefaultOptionValues res.options svc.config;
           res = svc.function {inherit config pkgs serverInfo;};
       in res;
     in map f defs;
@@ -52,7 +54,7 @@ let
       "mime" "dav" "status" "autoindex" "asis" "info" "cgi" "dav_fs"
       "vhost_alias" "negotiation" "dir" "imagemap" "actions" "speling"
       "userdir" "alias" "rewrite"
-    ] ++ pkgs.lib.optional cfg.enableSSL "ssl_module";
+    ] ++ optional cfg.enableSSL "ssl_module";
     
 
   loggingConf = ''
@@ -208,9 +210,9 @@ let
     ${let
         load = {name, path}: "LoadModule ${name}_module ${path}\n";
         allModules =
-          pkgs.lib.concatMap (svc: svc.extraModulesPre) allSubservices ++
+          concatMap (svc: svc.extraModulesPre) allSubservices ++
           map (name: {inherit name; path = "${httpd}/modules/mod_${name}.so";}) apacheModules ++
-          pkgs.lib.concatMap (svc: svc.extraModules) allSubservices;
+          concatMap (svc: svc.extraModules) allSubservices;
       in concatMapStrings load allModules
     }
 
@@ -287,7 +289,7 @@ let
         makeVirtualHost = vhostIn:
           let
             # Fill in defaults for missing options.
-            vhost = pkgs.lib.addDefaultOptionValues perServerOptions vhostIn;
+            vhost = addDefaultOptionValues perServerOptions vhostIn;
           in ''
             <VirtualHost *:*>
                 ${perServerConf false vhost}
@@ -314,7 +316,7 @@ in
     }
   ];
 
-  extraPath = [httpd] ++ pkgs.lib.concatMap (svc: svc.extraPath) allSubservices;
+  extraPath = [httpd] ++ concatMap (svc: svc.extraPath) allSubservices;
 
   # Statically verify the syntactic correctness of the generated
   # httpd.conf.
@@ -344,7 +346,7 @@ in
 
     ${
       let f = {name, value}: "env ${name}=${value}\n";
-      in pkgs.lib.concatStrings (map f (pkgs.lib.concatMap (svc: svc.globalEnvVars) allSubservices))
+      in concatMapStrings f (pkgs.lib.concatMap (svc: svc.globalEnvVars) allSubservices)
     }
 
     env PATH=${pkgs.coreutils}/bin:${pkgs.gnugrep}/bin:${pkgs.lib.concatStringsSep ":" (pkgs.lib.concatMap (svc: svc.extraServerPath) allSubservices)}
-- 
GitLab


From b9d01830d381a608641f51c34f2e3b6081221e75 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 14 Feb 2008 14:14:39 +0000
Subject: [PATCH 0803/5331] * In a vhost, merge in the robots.txt for the main
 server.

svn path=/nixos/trunk/; revision=10688
---
 system/options.nix                    | 32 +++++++++++++++------------
 upstart-jobs/apache-httpd/default.nix | 12 +++++-----
 2 files changed, 24 insertions(+), 20 deletions(-)

diff --git a/system/options.nix b/system/options.nix
index 3e802253d07..71cb1a4e305 100644
--- a/system/options.nix
+++ b/system/options.nix
@@ -1166,20 +1166,6 @@
         ";
       };
 
-      hostName = mkOption {
-        default = "localhost";
-        description = "
-          Canonical hostname for the server.
-        ";
-      };
-
-      httpPort = mkOption {
-        default = 80;
-        description = "
-          Port for unencrypted HTTP requests.
-        ";
-      };
-
       httpsPort = mkOption {
         default = 443;
         description = "
@@ -1235,6 +1221,24 @@
 	};
       };
 
+      virtualHosts = mkOption {
+        default = [];
+        example = [
+          { hostName = "foo";
+            documentRoot = "/data/webroot-foo";
+          }
+          { hostName = "bar";
+            documentRoot = "/data/webroot-bar";
+          }
+        ];
+        description = ''
+          Specification of the virtual hosts served by Apache.  Each
+          element should be an attribute set specifying the
+          configuration of the virtual host.  The available options
+          are the non-global options permissible for the main host.
+        '';
+      };
+
       subservices = {
 
         # !!! remove this
diff --git a/upstart-jobs/apache-httpd/default.nix b/upstart-jobs/apache-httpd/default.nix
index b04e12c9e31..4586bad5ff1 100644
--- a/upstart-jobs/apache-httpd/default.nix
+++ b/upstart-jobs/apache-httpd/default.nix
@@ -29,7 +29,9 @@ let
     in map f defs;
 
 
-  allSubservices = callSubservices (makeServerInfo cfg) cfg.extraSubservices;
+  mainSubservices = callSubservices (makeServerInfo cfg) cfg.extraSubservices;
+
+  allSubservices = mainSubservices;
 
 
   # !!! should be in lib
@@ -150,6 +152,9 @@ let
     '';
 
     robotsTxt = pkgs.writeText "robots.txt" ''
+      ${# If this is a vhost, the include the entries for the main server as well.
+        if isMainServer then ""
+        else concatMapStrings (svc: svc.robotsEntries) mainSubservices}
       ${concatMapStrings (svc: svc.robotsEntries) subservices}
     '';
 
@@ -276,11 +281,6 @@ let
     # Always enable virtual hosts; it doesn't seem to hurt.
     NameVirtualHost *:*
 
-    # Catch-all: since this is the first virtual host, any
-    # non-matching requests will use the main server configuration.
-    <VirtualHost *:*>
-    </VirtualHost>
-
     ${let
         perServerOptions = import ./per-server-options.nix {
           inherit (pkgs.lib) mkOption;
-- 
GitLab


From ffd96f07fe0cded03d26b4f82bf379d2685b92f8 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 14 Feb 2008 14:29:21 +0000
Subject: [PATCH 0804/5331] svn path=/nixos/trunk/; revision=10689

---
 upstart-jobs/apache-httpd/dist-manager.nix | 102 +++++++++++++++++++++
 1 file changed, 102 insertions(+)
 create mode 100644 upstart-jobs/apache-httpd/dist-manager.nix

diff --git a/upstart-jobs/apache-httpd/dist-manager.nix b/upstart-jobs/apache-httpd/dist-manager.nix
new file mode 100644
index 00000000000..543f075d17e
--- /dev/null
+++ b/upstart-jobs/apache-httpd/dist-manager.nix
@@ -0,0 +1,102 @@
+{config, pkgs, serverInfo}:
+
+let
+
+  inherit (pkgs.lib) mkOption;
+
+  urlPrefix = "/release";
+  distDir = "/tmp/dist";
+  distConfDir = "/tmp/dist-conf";
+
+  staticFiles = substituteInAll {
+    name = "svn-server-scripts";
+    src = pkgs.lib.cleanSource ../../../services/dist-manager/files;
+
+    perl = "${pkgs.perl}/bin/perl";
+
+    inherit (serverInfo) canonicalName;
+
+    inherit urlPrefix;
+
+    defaultPath = ""; # !!!
+    
+    # Do a syntax check on the generated file.
+    postInstall = ''
+      $perl -c $out/cgi-bin/create-dist.pl # !!! should use -T
+    '';
+  };
+
+  # !!! cut&paste
+  substituteInAll = args: pkgs.stdenvUsingSetupNew2.mkDerivation ({
+    buildCommand = ''
+      ensureDir $out
+      cp -prd $src/* $out
+      chmod -R u+w $out
+      find $out -type f -print | while read fn; do
+        substituteAll $fn $fn
+      done
+      eval "$postInstall"
+    '';
+  } // args); # */
+
+in {
+
+  extraConfig = ''
+
+    Alias ${urlPrefix}/css ${staticFiles}/css
+
+
+    ScriptAlias ${urlPrefix}/cgi-bin ${staticFiles}/cgi-bin
+
+    <Directory ${staticFiles}/cgi-bin>
+        AllowOverride FileInfo AuthConfig Limit
+        Options MultiViews SymLinksIfOwnerMatch ExecCGI
+        SetHandler cgi-script
+
+        # !!! this shouldn't be here
+        Order allow,deny
+        Allow from 131.211.0.0/255.255.0.0 # *.cs.uu.nl
+        Allow from 130.145.0.0/255.255.0.0 # philips.com
+        Allow from 130.161.158.181 # TUD supervisor
+        Allow from 192.168.1.0/24 # TUD builders
+        Allow from 127.0.0.1
+
+        Require valid-user
+        AuthType Basic
+        AuthName "Nix Upload"
+        AuthUserFile ${distConfDir}/upload_passwords
+    </Directory>
+
+
+    Alias ${urlPrefix} ${distDir}/
+
+    <Location ${urlPrefix}>
+        Options +Indexes
+
+        RewriteEngine on
+        RewriteRule ^${distDir}/(.*)/create-dist/(.*) ${urlPrefix}/cgi-bin/create-dist.pl/$1/$2
+
+        AddType application/nix-package .nixpkg
+    </Location>
+
+    <Directory ${distDir}>
+        AllowOverride FileInfo AuthConfig Limit
+        Order allow,deny
+        Allow from all
+    </Directory>
+
+  '';
+
+  # !!! should not be needed
+  extraModulesPre = [];
+  extraModules = [];
+  robotsEntries = "";
+  globalEnvVars = [];
+  extraServerPath = [];
+  extraPath = [];
+
+  options = {
+
+  };  
+
+}
\ No newline at end of file
-- 
GitLab


From a06b51f8951ab01b7cafee2bb2e6901eeea66a73 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 14 Feb 2008 19:47:17 +0000
Subject: [PATCH 0805/5331] svn path=/nixos/trunk/; revision=10692

---
 upstart-jobs/apache-httpd/dist-manager.nix | 46 ++++++++++++++--------
 1 file changed, 30 insertions(+), 16 deletions(-)

diff --git a/upstart-jobs/apache-httpd/dist-manager.nix b/upstart-jobs/apache-httpd/dist-manager.nix
index 543f075d17e..e4a85cbe58c 100644
--- a/upstart-jobs/apache-httpd/dist-manager.nix
+++ b/upstart-jobs/apache-httpd/dist-manager.nix
@@ -6,20 +6,42 @@ let
 
   urlPrefix = "/release";
   distDir = "/tmp/dist";
-  distConfDir = "/tmp/dist-conf";
+  distPasswords = "/tmp/dist-conf/upload_passwords";
+
+  directoriesConf = pkgs.writeText "directories.conf" ''
+    nix          ${distDir}/nix          nix-upload
+    nix-cache    ${distDir}/nix-cache    nix-upload stratego-upload autobundle-upload swe-upload meta-environment-upload hut-upload
+    test         ${distDir}/test         test-upload nix-upload
+    test-cache   ${distDir}/test-cache   test-upload nix-upload
+    stratego     ${distDir}/stratego     stratego-upload
+    autobundle   ${distDir}/autobundle   autobundle-upload
+    courses      ${distDir}/courses      swe-upload
+    meta-environment ${distDir}/meta-environment meta-environment-upload
+    hut          ${distDir}/hut          hut-upload
+  '';
+
+  uploaderIPs = [
+    "127.0.0.1"
+    "10.0.0.0/255.0.0.0"
+    "131.211.0.0/255.255.0.0" # *.cs.uu.nl
+    "130.145.0.0/255.255.0.0" # philips.com
+    "130.161.158.181" # TUD supervisor
+  ];
 
   staticFiles = substituteInAll {
-    name = "svn-server-scripts";
+    name = "dist-manager-files";
     src = pkgs.lib.cleanSource ../../../services/dist-manager/files;
 
     perl = "${pkgs.perl}/bin/perl";
 
     inherit (serverInfo) canonicalName;
 
-    inherit urlPrefix;
+    inherit urlPrefix directoriesConf;
+
+    defaultPath = "${pkgs.coreutils}/bin:${pkgs.findutils}/bin";
+
+    saxon8 = pkgs.saxonb;
 
-    defaultPath = ""; # !!!
-    
     # Do a syntax check on the generated file.
     postInstall = ''
       $perl -c $out/cgi-bin/create-dist.pl # !!! should use -T
@@ -45,29 +67,21 @@ in {
 
     Alias ${urlPrefix}/css ${staticFiles}/css
 
-
     ScriptAlias ${urlPrefix}/cgi-bin ${staticFiles}/cgi-bin
 
     <Directory ${staticFiles}/cgi-bin>
-        AllowOverride FileInfo AuthConfig Limit
-        Options MultiViews SymLinksIfOwnerMatch ExecCGI
+        Options SymLinksIfOwnerMatch ExecCGI
         SetHandler cgi-script
 
-        # !!! this shouldn't be here
         Order allow,deny
-        Allow from 131.211.0.0/255.255.0.0 # *.cs.uu.nl
-        Allow from 130.145.0.0/255.255.0.0 # philips.com
-        Allow from 130.161.158.181 # TUD supervisor
-        Allow from 192.168.1.0/24 # TUD builders
-        Allow from 127.0.0.1
+        ${pkgs.lib.concatMapStrings (ip: "Allow from ${ip}\n") uploaderIPs}
 
         Require valid-user
         AuthType Basic
         AuthName "Nix Upload"
-        AuthUserFile ${distConfDir}/upload_passwords
+        AuthUserFile ${distPasswords}
     </Directory>
 
-
     Alias ${urlPrefix} ${distDir}/
 
     <Location ${urlPrefix}>
-- 
GitLab


From 7563d6e1448b7d71d62e505b7868a3ea9c4510ee Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 14 Feb 2008 20:14:57 +0000
Subject: [PATCH 0806/5331] svn path=/nixos/trunk/; revision=10693

---
 upstart-jobs/apache-httpd/dist-manager.nix | 75 ++++++++++++++--------
 upstart-jobs/apache-httpd/subversion.nix   |  4 +-
 2 files changed, 49 insertions(+), 30 deletions(-)

diff --git a/upstart-jobs/apache-httpd/dist-manager.nix b/upstart-jobs/apache-httpd/dist-manager.nix
index e4a85cbe58c..58db2b5ff86 100644
--- a/upstart-jobs/apache-httpd/dist-manager.nix
+++ b/upstart-jobs/apache-httpd/dist-manager.nix
@@ -3,31 +3,8 @@
 let
 
   inherit (pkgs.lib) mkOption;
-
-  urlPrefix = "/release";
-  distDir = "/tmp/dist";
-  distPasswords = "/tmp/dist-conf/upload_passwords";
-
-  directoriesConf = pkgs.writeText "directories.conf" ''
-    nix          ${distDir}/nix          nix-upload
-    nix-cache    ${distDir}/nix-cache    nix-upload stratego-upload autobundle-upload swe-upload meta-environment-upload hut-upload
-    test         ${distDir}/test         test-upload nix-upload
-    test-cache   ${distDir}/test-cache   test-upload nix-upload
-    stratego     ${distDir}/stratego     stratego-upload
-    autobundle   ${distDir}/autobundle   autobundle-upload
-    courses      ${distDir}/courses      swe-upload
-    meta-environment ${distDir}/meta-environment meta-environment-upload
-    hut          ${distDir}/hut          hut-upload
-  '';
-
-  uploaderIPs = [
-    "127.0.0.1"
-    "10.0.0.0/255.0.0.0"
-    "131.211.0.0/255.255.0.0" # *.cs.uu.nl
-    "130.145.0.0/255.255.0.0" # philips.com
-    "130.161.158.181" # TUD supervisor
-  ];
-
+  inherit (config) urlPrefix distDir;
+  
   staticFiles = substituteInAll {
     name = "dist-manager-files";
     src = pkgs.lib.cleanSource ../../../services/dist-manager/files;
@@ -36,7 +13,9 @@ let
 
     inherit (serverInfo) canonicalName;
 
-    inherit urlPrefix directoriesConf;
+    inherit urlPrefix;
+
+    directoriesConf = pkgs.writeText "directories.conf" config.directoriesConf;
 
     defaultPath = "${pkgs.coreutils}/bin:${pkgs.findutils}/bin";
 
@@ -74,12 +53,12 @@ in {
         SetHandler cgi-script
 
         Order allow,deny
-        ${pkgs.lib.concatMapStrings (ip: "Allow from ${ip}\n") uploaderIPs}
+        ${pkgs.lib.concatMapStrings (ip: "Allow from ${ip}\n") config.uploaderIPs}
 
         Require valid-user
         AuthType Basic
         AuthName "Nix Upload"
-        AuthUserFile ${distPasswords}
+        AuthUserFile ${config.distPasswords}
     </Directory>
 
     Alias ${urlPrefix} ${distDir}/
@@ -111,6 +90,46 @@ in {
 
   options = {
 
+    urlPrefix = mkOption {
+      default = "/dist";
+      description = ''
+        The URL prefix under which the release pages appear.
+      '';
+    };
+
+    distDir = mkOption {
+      example = "/data/dist";
+      description = ''
+        Path to the top-level release directory.
+      '';
+    };
+
+    distPasswords = mkOption {
+      example = "/data/dist-passwords";
+      description = ''
+        Location of the password file for the uploading of releases.
+      '';
+    };
+
+    uploaderIPs = mkOption {
+      default = [];
+      example = ["127.0.0.1" "192.168.1.0/255.255.255.0"];
+      description = ''
+        IP address or address ranges of the machines that are allowed to upload releases.
+      '';
+    };
+
+    directoriesConf = mkOption {
+      example = ''
+        fnord /data/dist/fnord fnord-upload
+      '';
+      description = ''
+        The per-project release directories, with each line containing
+        the project name, the corresponding release directory, and the
+        users that can upload to that directory.
+      '';
+    };
+
   };  
 
 }
\ No newline at end of file
diff --git a/upstart-jobs/apache-httpd/subversion.nix b/upstart-jobs/apache-httpd/subversion.nix
index 60c3d71c62d..08ed6ce93e7 100644
--- a/upstart-jobs/apache-httpd/subversion.nix
+++ b/upstart-jobs/apache-httpd/subversion.nix
@@ -373,9 +373,9 @@ in {
     };
 
     dataDir = mkOption {
-      default = "/no/such/path/exists";
+      example = "/data/subversion";
       description = "
-        Place to put SVN repository.
+        Path to the directory that holds the repositories, user database, etc.
       ";
     };
 
-- 
GitLab


From a9281eae6360d4969e468016408021ac9b9f0d1d Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 14 Feb 2008 20:59:04 +0000
Subject: [PATCH 0807/5331] * Put the static files for the Subversion service
 in a separate directory.

svn path=/nixos/trunk/; revision=10697
---
 default.nix                              | 1 +
 upstart-jobs/apache-httpd/subversion.nix | 6 ++----
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/default.nix b/default.nix
index fcf12b80479..d4638506543 100644
--- a/default.nix
+++ b/default.nix
@@ -17,6 +17,7 @@ in
     grubMenuBuilder
     initialRamdisk
     kernel
+    modulesTree
     nix
     system
     systemPath
diff --git a/upstart-jobs/apache-httpd/subversion.nix b/upstart-jobs/apache-httpd/subversion.nix
index 08ed6ce93e7..3d28d4850ae 100644
--- a/upstart-jobs/apache-httpd/subversion.nix
+++ b/upstart-jobs/apache-httpd/subversion.nix
@@ -230,12 +230,10 @@ let
   };
 
   staticFilesConfig = ''
-    # !!! this breaks UserDir if urlPrefix == ""
-    Alias ${if urlPrefix == "" then "/" else urlPrefix} ${staticFiles}/
+    Alias ${urlPrefix}/svn-files ${staticFiles}/
     <Directory ${staticFiles}>
         Order allow,deny
         Allow from all
-        DirectoryIndex repoman
     </Directory>
   '';
 
@@ -291,7 +289,7 @@ in {
     
     <Location ${urlPrefix}/repos-xml>
       ${reposConfig "repos-xml"}
-      SVNIndexXSLT "${urlPrefix}/xsl/svnindex.xsl"
+      SVNIndexXSLT "${urlPrefix}/svn-files/xsl/svnindex.xsl"
     </Location>
 
     ${viewvcConfig}
-- 
GitLab


From b98cb9a77081538678c9201bf91b5b9d5ba49d3c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Mon, 18 Feb 2008 09:15:10 +0000
Subject: [PATCH 0808/5331] Add BitlBee Upstart job in deamon mode.

svn path=/nixos/trunk/; revision=10720
---
 system/ids.nix           |  1 +
 system/options.nix       | 28 ++++++++++++++++++++++++++++
 upstart-jobs/bitlbee.nix | 30 ++++++++++++++++++++++++++++++
 upstart-jobs/default.nix |  6 ++++++
 4 files changed, 65 insertions(+)
 create mode 100644 upstart-jobs/bitlbee.nix

diff --git a/system/ids.nix b/system/ids.nix
index fd6ff9f6a15..b83f9a531c5 100644
--- a/system/ids.nix
+++ b/system/ids.nix
@@ -10,6 +10,7 @@
     nagios = 6;
     vsftpd = 7;
     ftp = 8;
+    bitlbee = 9;
     nixbld = 30000; # start of range of uids
     nobody = 65534;
   };
diff --git a/system/options.nix b/system/options.nix
index 71cb1a4e305..7ee54f955c2 100644
--- a/system/options.nix
+++ b/system/options.nix
@@ -807,6 +807,34 @@
 
     };
 
+    bitlbee = {
+
+      enable = mkOption {
+        default = false;
+        description = ''
+          Whether the run the BitlBee IRC to other chat network gateway.
+          Running it allows you to access the MSN, Jabber, Yahoo! and ICQ chat
+          networks via an IRC client.
+        '';
+      };
+
+      interface = mkOption {
+        default = "127.0.0.1";
+        description = ''
+          The interface the BitlBee deamon will be listening to.  If `127.0.0.1',
+          only clients on the local host can connect to it; if `0.0.0.0', clients
+          can access it from any network interface.
+        '';
+      };
+
+      portNumber = mkOption {
+        default = "6667";
+        description = ''
+          Number of the port BitlBee will be listening to.
+        '';
+      };
+
+    };
 
     xserver = {
 
diff --git a/upstart-jobs/bitlbee.nix b/upstart-jobs/bitlbee.nix
new file mode 100644
index 00000000000..dca737d3a0b
--- /dev/null
+++ b/upstart-jobs/bitlbee.nix
@@ -0,0 +1,30 @@
+args: with args;
+{
+  name = "bitlbee";
+
+  users = [
+    { name = "bitlbee";
+      uid = (import ../system/ids.nix).uids.bitlbee;
+      description = "BitlBee user";
+      home = "/var/empty";
+    }
+  ];
+  
+  job = "
+description \"BitlBee IRC to other chat networks gateway\"
+
+start on network-interfaces/started
+stop on network-interfaces/stop
+
+start script
+    if ! test -d /var/lib/bitlbee
+    then
+        mkdir -p /var/lib/bitlbee
+    fi
+end script
+
+# FIXME: Eventually we want to use inetd instead of using `-D'.
+respawn ${bitlbee}/sbin/bitlbee -D -p ${portNumber} -i ${interface}
+  ";
+  
+}
diff --git a/upstart-jobs/default.nix b/upstart-jobs/default.nix
index 7731b5d6752..161e1b90ab4 100644
--- a/upstart-jobs/default.nix
+++ b/upstart-jobs/default.nix
@@ -236,6 +236,12 @@ let
       inherit config pkgs;
     })
 
+  ++ optional config.services.bitlbee.enable
+    (import ../upstart-jobs/bitlbee.nix {
+      inherit (pkgs) bitlbee;
+      inherit (config.services.bitlbee) portNumber interface;
+    })
+
   # ALSA sound support.
   ++ optional config.sound.enable
     (import ../upstart-jobs/alsa.nix {
-- 
GitLab


From 8a1d362447ccf0b6b50d30cc174cb7c5abfc19d5 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 18 Feb 2008 11:56:43 +0000
Subject: [PATCH 0809/5331] * Postgres job: start postgres directly, don't use
 the old control   script from the services tree.

svn path=/nixos/trunk/; revision=10722
---
 system/options.nix          | 11 +++++++
 upstart-jobs/default.nix    |  2 --
 upstart-jobs/postgresql.nix | 64 ++++++++++++++++++++++++-------------
 3 files changed, 52 insertions(+), 25 deletions(-)

diff --git a/system/options.nix b/system/options.nix
index 7ee54f955c2..ed4fc3d0c78 100644
--- a/system/options.nix
+++ b/system/options.nix
@@ -1693,6 +1693,17 @@
 	  here is an interface...
 	";
       };
+      authentication = mkOption {
+        default = ''
+          # Generated file; do not edit!
+          local all all ident sameuser
+          host  all all 127.0.0.1/32 md5
+          host  all all ::1/128      md5
+        '';
+	description = "
+	  Hosts (except localhost), who you allow to connect.
+	";
+      };
       allowedHosts = mkOption {
         default = [];
 	description = "
diff --git a/upstart-jobs/default.nix b/upstart-jobs/default.nix
index 161e1b90ab4..63779263f4e 100644
--- a/upstart-jobs/default.nix
+++ b/upstart-jobs/default.nix
@@ -177,8 +177,6 @@ let
   ++ optional config.services.postgresql.enable
     (import ../upstart-jobs/postgresql.nix {
       inherit config pkgs;
-      startDependency = if config.services.gw6c.enable then 
-        "gw6c" else "network-interfaces";
     })
 
   # EJabberd service
diff --git a/upstart-jobs/postgresql.nix b/upstart-jobs/postgresql.nix
index 48076ae0fe3..8979239fc56 100644
--- a/upstart-jobs/postgresql.nix
+++ b/upstart-jobs/postgresql.nix
@@ -1,30 +1,48 @@
-args: with args;
+{pkgs, config}:
 
 let
 
-cfg = config.services.postgresql;
-postgresqlService = import ../services/postgresql {
-	inherit (pkgs) stdenv postgresql su;
-	inherit (cfg) port logDir dataDir
-		subServices allowedHosts
-		authMethod;
-	serverUser = "postgres";
-};
+  cfg = config.services.postgresql;
+
+  postgresql = pkgs.postgresql;
+
+  startDependency = if config.services.gw6c.enable then 
+    "gw6c" else "network-interfaces";
+
+  run = "${pkgs.su}/bin/su -s ${pkgs.bash}/bin/sh postgres";
 
 in
+
 {
-	name = "postgresql";
-	users = [ {
-		name = "postgres";
-		description = "PostgreSQL server user";
-	} ];
-	groups = [{name = "postgres";}];
-	job = "
-description \"PostgreSQL server\"
-
-start on ${startDependency}/started
-stop on shutdown
-
-respawn ${postgresqlService}/bin/control start
-	";
+  name = "postgresql";
+
+  users = [
+    { name = "postgres";
+      description = "PostgreSQL server user";
+    }
+  ];
+
+  groups = [
+    { name = "postgres"; }
+  ];
+
+  extraPath = [postgresql];
+
+  job = ''
+    description "PostgreSQL server"
+
+    start on ${startDependency}/started
+    stop on shutdown
+    
+    start script
+        if ! test -e ${cfg.dataDir}; then
+    	    mkdir -m 0700 -p ${cfg.dataDir}
+            chown -R postgres ${cfg.dataDir}
+            ${run} -c '${postgresql}/bin/initdb -D ${cfg.dataDir} -U root'
+        fi
+        cp -f ${pkgs.writeText "pg_hba.conf" cfg.authentication} ${cfg.dataDir}/pg_hba.conf
+    end script
+
+    respawn ${run} -c '${postgresql}/bin/postgres -D ${cfg.dataDir}'
+  '';
 }
-- 
GitLab


From bbbef0f2fa01b926e51aa20ad7bb1f502551771c Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 18 Feb 2008 15:00:26 +0000
Subject: [PATCH 0810/5331] * extraDirectores -> extraConfig.

svn path=/nixos/trunk/; revision=10731
---
 upstart-jobs/apache-httpd/default.nix            | 4 +++-
 upstart-jobs/apache-httpd/per-server-options.nix | 7 +++----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/upstart-jobs/apache-httpd/default.nix b/upstart-jobs/apache-httpd/default.nix
index 4586bad5ff1..77f49f4152a 100644
--- a/upstart-jobs/apache-httpd/default.nix
+++ b/upstart-jobs/apache-httpd/default.nix
@@ -55,7 +55,7 @@ let
       "cern_meta" "expires" "headers" "usertrack" /* "unique_id" */ "setenvif"
       "mime" "dav" "status" "autoindex" "asis" "info" "cgi" "dav_fs"
       "vhost_alias" "negotiation" "dir" "imagemap" "actions" "speling"
-      "userdir" "alias" "rewrite"
+      "userdir" "alias" "rewrite" "proxy" "proxy_http"
     ] ++ optional cfg.enableSSL "ssl_module";
     
 
@@ -193,6 +193,8 @@ let
     }
 
     ${concatMapStrings (svc: svc.extraConfig) subservices}
+
+    ${cfg.extraConfig}
   '';
 
   
diff --git a/upstart-jobs/apache-httpd/per-server-options.nix b/upstart-jobs/apache-httpd/per-server-options.nix
index 08f60b2cc6d..f98412b0a90 100644
--- a/upstart-jobs/apache-httpd/per-server-options.nix
+++ b/upstart-jobs/apache-httpd/per-server-options.nix
@@ -61,15 +61,14 @@
     ";
   };
 
-  # !!! this is a mis-nomer, should be "extraConfig" or something.
-  extraDirectories = mkOption {
+  extraConfig = mkOption {
     default = "";
-    example = "
+    example = ''
       <Directory /home>
         Options FollowSymlinks
         AllowOverride All
       </Directory>
-    ";
+    '';
     description = "
       These lines go to httpd.conf verbatim. They will go after
       directories and directory aliases defined by default.
-- 
GitLab


From 51226335926fdab35f81733d7abe6caef450a32b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Mon, 18 Feb 2008 16:50:08 +0000
Subject: [PATCH 0811/5331] Add support for Intel's 4965AGN firmware.

svn path=/nixos/trunk/; revision=10735
---
 system/options.nix       | 10 +++++++++-
 system/system.nix        |  1 +
 upstart-jobs/default.nix |  1 +
 3 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/system/options.nix b/system/options.nix
index ed4fc3d0c78..645ca81cd07 100644
--- a/system/options.nix
+++ b/system/options.nix
@@ -376,7 +376,15 @@
       default = false;
       description = "
         This option enables automatic loading of the firmware for the Intel
-        PRO/Wireless 3945ABG / 4965AGN.
+        PRO/Wireless 3945ABG.
+      ";
+    };
+
+    enableIntel4965AGNFirmware = mkOption {
+      default = false;
+      description = "
+        This option enables automatic loading of the firmware for the Intel
+        PRO/Wireless 4965AGN.
       ";
     };
 
diff --git a/system/system.nix b/system/system.nix
index 3d4722cacb3..7aef99efe93 100644
--- a/system/system.nix
+++ b/system/system.nix
@@ -140,6 +140,7 @@ rec {
   modulesTree = pkgs.module_aggregation (
     [kernel]
     ++ pkgs.lib.optional config.networking.enableIntel3945ABGFirmware pkgs.iwlwifi
+    ++ pkgs.lib.optional config.networking.enableIntel4965AGNFirmware pkgs.iwlwifi
     # !!! this should be declared by the xserver Upstart job.
     ++ pkgs.lib.optional (config.services.xserver.enable && config.services.xserver.videoDriver == "nvidia") pkgs.nvidiaDrivers
     ++ pkgs.lib.optional config.hardware.enableGo7007 pkgs.wis_go7007
diff --git a/upstart-jobs/default.nix b/upstart-jobs/default.nix
index 63779263f4e..d450f368638 100644
--- a/upstart-jobs/default.nix
+++ b/upstart-jobs/default.nix
@@ -28,6 +28,7 @@ let
       firmwareDirs =
            pkgs.lib.optional config.networking.enableIntel2200BGFirmware pkgs.ipw2200fw
         ++ pkgs.lib.optional config.networking.enableIntel3945ABGFirmware pkgs.iwlwifi3945ucode
+        ++ pkgs.lib.optional config.networking.enableIntel4965AGNFirmware pkgs.iwlwifi4965ucode
 	++ config.services.udev.addFirmware;
       extraUdevPkgs =
            pkgs.lib.optional config.services.hal.enable pkgs.hal
-- 
GitLab


From d7dd9179cec036620a0ad02c5038402250c0fc5b Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 19 Feb 2008 14:41:20 +0000
Subject: [PATCH 0812/5331] * Allow aliases for each virtual host.

svn path=/nixos/trunk/; revision=10754
---
 upstart-jobs/apache-httpd/default.nix            | 2 ++
 upstart-jobs/apache-httpd/per-server-options.nix | 8 ++++++++
 2 files changed, 10 insertions(+)

diff --git a/upstart-jobs/apache-httpd/default.nix b/upstart-jobs/apache-httpd/default.nix
index 77f49f4152a..9afe278398c 100644
--- a/upstart-jobs/apache-httpd/default.nix
+++ b/upstart-jobs/apache-httpd/default.nix
@@ -165,6 +165,8 @@ let
   in ''
     ServerName ${serverInfo.canonicalName}
 
+    ${concatMapStrings (alias: "ServerAlias ${alias}\n") cfg.serverAliases}
+
     ${if isMainServer || cfg.adminAddr != "" then ''
       ServerAdmin ${cfg.adminAddr}
     '' else ""}
diff --git a/upstart-jobs/apache-httpd/per-server-options.nix b/upstart-jobs/apache-httpd/per-server-options.nix
index f98412b0a90..dbc422ec0cd 100644
--- a/upstart-jobs/apache-httpd/per-server-options.nix
+++ b/upstart-jobs/apache-httpd/per-server-options.nix
@@ -14,6 +14,14 @@
     ";
   };
 
+  serverAliases = mkOption {
+    default = [];
+    example = ["www.example.org" "www.example.org:8080" "example.org"];
+    description = "
+      Additional names of virtual hosts served by this virtual host configuration.
+    ";
+  };
+
   httpPort = mkOption {
     default = 80;
     description = "
-- 
GitLab


From a2c20a9d2919e2260f5b7712ee59f23df6711181 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 19 Feb 2008 14:54:19 +0000
Subject: [PATCH 0813/5331] * Virtual hosts: inherit adminAddr from the main
 server.

svn path=/nixos/trunk/; revision=10756
---
 upstart-jobs/apache-httpd/default.nix    | 7 +++++++
 upstart-jobs/apache-httpd/subversion.nix | 2 +-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/upstart-jobs/apache-httpd/default.nix b/upstart-jobs/apache-httpd/default.nix
index 9afe278398c..5c93a674da1 100644
--- a/upstart-jobs/apache-httpd/default.nix
+++ b/upstart-jobs/apache-httpd/default.nix
@@ -3,6 +3,8 @@
 let
 
   cfg = config.services.httpd;
+
+  mainCfg = cfg;
   
   startingDependency = if config.services.gw6c.enable then "gw6c" else "network-interfaces";
 
@@ -16,6 +18,11 @@ let
     canonicalName =
       "http://${cfg.hostName}" +
       (if cfg.httpPort != 80 then ":${toString cfg.httpPort}" else "");
+
+    # Admin address: inherit from the main server if not specified for
+    # a virtual host.
+    adminAddr = if cfg.adminAddr != "" then cfg.adminAddr else mainCfg.adminAddr;
+
     serverConfig = cfg;
     fullConfig = config; # machine config
   };
diff --git a/upstart-jobs/apache-httpd/subversion.nix b/upstart-jobs/apache-httpd/subversion.nix
index 3d28d4850ae..d561cd4c652 100644
--- a/upstart-jobs/apache-httpd/subversion.nix
+++ b/upstart-jobs/apache-httpd/subversion.nix
@@ -13,7 +13,7 @@ let
   logDir = "${config.dataDir}/log";
   postCommitHook = "/var/run/current-system/sw/bin/svn-server-post-commit-hook";
   fsType = "fsfs";
-  adminAddr = serverInfo.serverConfig.adminAddr;
+  adminAddr = serverInfo.adminAddr;
   
 
 
-- 
GitLab


From 20881fe84bf50085dbbdc31bb3e5663c50ec8a98 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 19 Feb 2008 16:52:08 +0000
Subject: [PATCH 0814/5331] * Indentation.

svn path=/nixos/trunk/; revision=10757
---
 upstart-jobs/tomcat.nix | 24 +++++++++++++-----------
 1 file changed, 13 insertions(+), 11 deletions(-)

diff --git a/upstart-jobs/tomcat.nix b/upstart-jobs/tomcat.nix
index f336acf6564..e5b7d1d2b21 100644
--- a/upstart-jobs/tomcat.nix
+++ b/upstart-jobs/tomcat.nix
@@ -2,20 +2,22 @@ args: with args;
 
 let
 
-cfg = config.services.tomcat;
-tomcatService = import ../services/tomcat {
-	inherit (pkgs) stdenv jdk tomcat6 su;
-	inherit (cfg) baseDir user deployFrom;
-};
+  cfg = config.services.tomcat;
+
+  tomcatService = import ../services/tomcat {
+    inherit (pkgs) stdenv jdk tomcat6 su;
+    inherit (cfg) baseDir user deployFrom;
+  };
 
 in
+
 {
-	name = "tomcat";
-	job = "
-description \"Apache Tomcat server\"
+  name = "tomcat";
+  job = ''
+    description "Apache Tomcat server"
 
-stop on shutdown
+    stop on shutdown
 
-respawn ${tomcatService}/bin/control start
-	";
+    respawn ${tomcatService}/bin/control start
+  '';
 }
-- 
GitLab


From 5d2435d4600f02d70fe1c4fa66c502b9f17d7cd9 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 19 Feb 2008 16:52:24 +0000
Subject: [PATCH 0815/5331] * Top-level redirect to the repoman.

svn path=/nixos/trunk/; revision=10758
---
 upstart-jobs/apache-httpd/subversion.nix | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/upstart-jobs/apache-httpd/subversion.nix b/upstart-jobs/apache-httpd/subversion.nix
index d561cd4c652..d75e69c5524 100644
--- a/upstart-jobs/apache-httpd/subversion.nix
+++ b/upstart-jobs/apache-httpd/subversion.nix
@@ -301,6 +301,12 @@ in {
     ${distConfig}
 
     ${staticFilesConfig}
+
+    ${if config.toplevelRedirect then ''
+        <Location />
+            DirectoryIndex repoman
+        </Location>
+      '' else ""}
         
   '';
 
@@ -341,6 +347,15 @@ in {
       ";
     };
 
+    toplevelRedirect = mkOption {
+      default = true;
+      description = "
+        Whether <varname>urlPrefix</varname> without any suffix
+        (except a slash) should redirect to
+        <varname>urlPrefix</varname><literal>/repoman</literal>.
+      ";
+    };
+
     notificationSender = mkOption {
       default = "svn-server@example.org";
       example = "svn-server@example.org";
-- 
GitLab


From 8b165fc1f4f664074d344b1b6afc0ebcaecbeab0 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 19 Feb 2008 17:37:05 +0000
Subject: [PATCH 0816/5331] * Allow subservices to declare a script that will
 be run before   the server start.  Useful to initialise necessary state.

svn path=/nixos/trunk/; revision=10761
---
 upstart-jobs/apache-httpd/default.nix      | 52 ++++++++++++++--------
 upstart-jobs/apache-httpd/dist-manager.nix |  1 +
 upstart-jobs/apache-httpd/subversion.nix   |  5 +++
 3 files changed, 40 insertions(+), 18 deletions(-)

diff --git a/upstart-jobs/apache-httpd/default.nix b/upstart-jobs/apache-httpd/default.nix
index 5c93a674da1..3efa1fc1a0c 100644
--- a/upstart-jobs/apache-httpd/default.nix
+++ b/upstart-jobs/apache-httpd/default.nix
@@ -23,11 +23,26 @@ let
     # a virtual host.
     adminAddr = if cfg.adminAddr != "" then cfg.adminAddr else mainCfg.adminAddr;
 
-    serverConfig = cfg;
+    vhostConfig = cfg;
+    serverConfig = mainCfg;
     fullConfig = config; # machine config
   };
 
 
+  vhostOptions = import ./per-server-options.nix {
+    inherit (pkgs.lib) mkOption;
+    forMainServer = false;
+  };
+
+  vhosts = let
+    makeVirtualHost = cfgIn: 
+      let
+        # Fill in defaults for missing options.
+        cfg = addDefaultOptionValues vhostOptions cfgIn;
+      in cfg;
+    in map makeVirtualHost cfg.virtualHosts;
+
+
   callSubservices = serverInfo: defs:
     let f = svc:
       let config = addDefaultOptionValues res.options svc.config;
@@ -36,9 +51,12 @@ let
     in map f defs;
 
 
-  mainSubservices = callSubservices (makeServerInfo cfg) cfg.extraSubservices;
+  # !!! callSubservices is expensive   
+  subservicesFor = cfg: callSubservices (makeServerInfo cfg) cfg.extraSubservices;
 
-  allSubservices = mainSubservices;
+  mainSubservices = subservicesFor mainCfg;
+
+  allSubservices = mainSubservices ++ pkgs.lib.concatMap subservicesFor vhosts;
 
 
   # !!! should be in lib
@@ -293,20 +311,12 @@ let
     NameVirtualHost *:*
 
     ${let
-        perServerOptions = import ./per-server-options.nix {
-          inherit (pkgs.lib) mkOption;
-          forMainServer = false;
-        };
-        makeVirtualHost = vhostIn:
-          let
-            # Fill in defaults for missing options.
-            vhost = addDefaultOptionValues perServerOptions vhostIn;
-          in ''
-            <VirtualHost *:*>
-                ${perServerConf false vhost}
-            </VirtualHost>
-          '';
-      in concatMapStrings makeVirtualHost cfg.virtualHosts}
+        makeVirtualHost = cfg: ''
+          <VirtualHost *:*>
+              ${perServerConf false cfg}
+          </VirtualHost>
+        '';
+      in concatMapStrings makeVirtualHost vhosts}
   '';
 
     
@@ -351,7 +361,13 @@ in
       # server restarts, eventually preventing it from restarting
       # succesfully.
       for i in $(${pkgs.utillinux}/bin/ipcs -s | grep ' ${cfg.user} ' | cut -f2 -d ' '); do
-        ${pkgs.utillinux}/bin/ipcrm -s $i
+          ${pkgs.utillinux}/bin/ipcrm -s $i
+      done
+
+      # Run the startup hooks for the subservices.
+      for i in ${toString (map (svn: svn.startupScript) allSubservices)}; do
+          echo Running Apache startup hook $i...
+          $i
       done
     end script
 
diff --git a/upstart-jobs/apache-httpd/dist-manager.nix b/upstart-jobs/apache-httpd/dist-manager.nix
index 58db2b5ff86..966fdab9b85 100644
--- a/upstart-jobs/apache-httpd/dist-manager.nix
+++ b/upstart-jobs/apache-httpd/dist-manager.nix
@@ -87,6 +87,7 @@ in {
   globalEnvVars = [];
   extraServerPath = [];
   extraPath = [];
+  startupScript = null;
 
   options = {
 
diff --git a/upstart-jobs/apache-httpd/subversion.nix b/upstart-jobs/apache-httpd/subversion.nix
index d75e69c5524..f11f1af77dc 100644
--- a/upstart-jobs/apache-httpd/subversion.nix
+++ b/upstart-jobs/apache-httpd/subversion.nix
@@ -50,6 +50,8 @@ let
     inherit (pkgs) libxslt enscript db4 coreutils bzip2;
 
     inherit (serverInfo) canonicalName;
+
+    inherit (serverInfo.serverConfig) user group;    
     
     # Urgh, most of these are dependencies of Email::Send, should figure them out automatically.
     perlFlags = map (x: "-I${x}/lib/site_perl") [
@@ -335,6 +337,9 @@ in {
 
   
   extraPath = [scripts];
+
+
+  startupScript = "${scripts}/bin/svn-server-startup-hook.sh";
   
 
   options = {
-- 
GitLab


From 672d293c2b13f64bdaf04dcbb7121c63be11d1a6 Mon Sep 17 00:00:00 2001
From: Tobias Hammerschmidt <tobias.hammerschmidt@gmx.de>
Date: Wed, 20 Feb 2008 09:01:26 +0000
Subject: [PATCH 0817/5331] Added support for the Zydas zd1211 firmware.

svn path=/nixos/trunk/; revision=10763
---
 system/options.nix       | 8 ++++++++
 upstart-jobs/default.nix | 1 +
 2 files changed, 9 insertions(+)

diff --git a/system/options.nix b/system/options.nix
index 645ca81cd07..4f6ead3d32b 100644
--- a/system/options.nix
+++ b/system/options.nix
@@ -388,6 +388,14 @@
       ";
     };
 
+    enableZydasZD1211Firmware = mkOption {
+      default = false;
+      description = "
+        This option enables automatic loading of the firmware for the Zydas
+        ZyDAS ZD1211(b) 802.11a/b/g USB WLAN chip.
+      ";
+    };
+
     localCommands = mkOption {
       default = "";
       example = "text=anything; echo You can put $text here.";
diff --git a/upstart-jobs/default.nix b/upstart-jobs/default.nix
index d450f368638..c1d73f6e656 100644
--- a/upstart-jobs/default.nix
+++ b/upstart-jobs/default.nix
@@ -29,6 +29,7 @@ let
            pkgs.lib.optional config.networking.enableIntel2200BGFirmware pkgs.ipw2200fw
         ++ pkgs.lib.optional config.networking.enableIntel3945ABGFirmware pkgs.iwlwifi3945ucode
         ++ pkgs.lib.optional config.networking.enableIntel4965AGNFirmware pkgs.iwlwifi4965ucode
+        ++ pkgs.lib.optional config.networking.enableZydasZD1211Firmware pkgs.zd1211fw
 	++ config.services.udev.addFirmware;
       extraUdevPkgs =
            pkgs.lib.optional config.services.hal.enable pkgs.hal
-- 
GitLab


From 724ff442bac9e07f85b2e380c50ecede2d234b9b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Wed, 20 Feb 2008 10:35:49 +0000
Subject: [PATCH 0818/5331] Export `$EMACSLOADPATH'.

svn path=/nixos/trunk/; revision=10768
---
 etc/profile.sh | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/etc/profile.sh b/etc/profile.sh
index 2e533a7457f..e780b12988f 100644
--- a/etc/profile.sh
+++ b/etc/profile.sh
@@ -60,6 +60,12 @@ done
 # Search directory for Aspell dictionaries.
 export ASPELL_CONF="dict-dir $NIX_USER_PROFILE_DIR/profile/lib/aspell"
 
+# Search path for Emacs Lisp code.
+export EMACSLOADPATH=""
+for i in $NIX_PROFILES; do
+    export EMACSLOADPATH="$i/share/emacs/site-lisp:$EMACSLOADPATH"
+done
+
 export PATH=$HOME/bin:$PATH
 
 
-- 
GitLab


From 705c2d36db7de57097edfe397a0727cb4fcfc7e7 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 20 Feb 2008 12:54:17 +0000
Subject: [PATCH 0819/5331] svn path=/nixos/trunk/; revision=10777

---
 upstart-jobs/apache-httpd/dist-manager.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/upstart-jobs/apache-httpd/dist-manager.nix b/upstart-jobs/apache-httpd/dist-manager.nix
index 966fdab9b85..a6523c73214 100644
--- a/upstart-jobs/apache-httpd/dist-manager.nix
+++ b/upstart-jobs/apache-httpd/dist-manager.nix
@@ -21,6 +21,8 @@ let
 
     saxon8 = pkgs.saxonb;
 
+    logFile = "${serverInfo.serverConfig.logDir}/release";
+
     # Do a syntax check on the generated file.
     postInstall = ''
       $perl -c $out/cgi-bin/create-dist.pl # !!! should use -T
-- 
GitLab


From 063fd9eeb6948351cf774b72e8db659010855e86 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Wed, 20 Feb 2008 13:18:41 +0000
Subject: [PATCH 0820/5331] Install BitlBee if enabled.

svn path=/nixos/trunk/; revision=10780
---
 system/system.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/system/system.nix b/system/system.nix
index 7aef99efe93..79624d66c07 100644
--- a/system/system.nix
+++ b/system/system.nix
@@ -254,6 +254,7 @@ rec {
     pkgs.wirelesstools
   ]
   ++ pkgs.lib.optional config.security.sudo.enable pkgs.sudo
+  ++ pkgs.lib.optional config.networking.bitlbee.enable pkgs.bitlbee
   ++ pkgs.lib.optional config.networking.defaultMailServer.directDelivery pkgs.ssmtp 
   ++ pkgs.lib.concatLists (map (job: job.extraPath) upstartJobs.jobs)
   ++ config.environment.extraPackages pkgs
-- 
GitLab


From 50800ad3b558d469a5488eeac06594ae7dd7884b Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 20 Feb 2008 13:29:08 +0000
Subject: [PATCH 0821/5331] svn path=/nixos/trunk/; revision=10781

---
 system/options.nix                    | 10 ++++++++++
 upstart-jobs/apache-httpd/default.nix |  5 +++++
 2 files changed, 15 insertions(+)

diff --git a/system/options.nix b/system/options.nix
index 4f6ead3d32b..4b8face4306 100644
--- a/system/options.nix
+++ b/system/options.nix
@@ -1194,6 +1194,16 @@
         ";
       };
 
+      logPerVirtualHost = mkOption {
+        default = false;
+        description = "
+          If enabled, each virtual host gets its own
+          <filename>access_log</filename> and
+          <filename>error_log</filename>, namely suffixed by the
+          <option>hostName</option> of the virtual host.
+        ";
+      };
+
       user = mkOption {
         default = "wwwrun";
         description = "
diff --git a/upstart-jobs/apache-httpd/default.nix b/upstart-jobs/apache-httpd/default.nix
index 3efa1fc1a0c..9d3a614c329 100644
--- a/upstart-jobs/apache-httpd/default.nix
+++ b/upstart-jobs/apache-httpd/default.nix
@@ -196,6 +196,11 @@ let
       ServerAdmin ${cfg.adminAddr}
     '' else ""}
 
+    ${if !isMainServer && mainCfg.logPerVirtualHost then ''
+      ErrorLog ${mainCfg.logDir}/error_log-${cfg.hostName}
+      CustomLog ${mainCfg.logDir}/access_log-${cfg.hostName} common
+    '' else ""}
+
     ${robotsConf}
 
     ${if isMainServer || cfg.documentRoot != null then documentRootConf else ""}
-- 
GitLab


From ebea2dafa13be99e240820a6c5d468ea32ae81f5 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 20 Feb 2008 17:03:48 +0000
Subject: [PATCH 0822/5331] * Quick hack to get the old Apache job working.

svn path=/nixos/trunk/; revision=10785
---
 upstart-jobs/httpd.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/upstart-jobs/httpd.nix b/upstart-jobs/httpd.nix
index afafcf4f173..88eee31926f 100644
--- a/upstart-jobs/httpd.nix
+++ b/upstart-jobs/httpd.nix
@@ -17,7 +17,6 @@ let
   logDir = cfg.logDir;
   stateDir = cfg.stateDir;
   enableSSL = false;
-  extraDirectories = cfg.extraDirectories + extraConfig;
   applicationMappings = cfg.mod_jk.applicationMappings;
   
   startingDependency = if config.services.gw6c.enable && config.services.gw6c.autorun then "gw6c" else "network-interfaces";
@@ -30,8 +29,9 @@ let
 
     inherit hostName httpPort httpsPort
       user group adminAddr logDir stateDir
-      extraDirectories applicationMappings;
+      applicationMappings;
     noUserDir = !cfg.enableUserDir;
+    extraDirectories = extraConfig + cfg.extraConfig;
     
     subServices =
     
@@ -72,11 +72,11 @@ let
         )
         )
       )
-      ++
+      /* ++
 
       (optional cfg.extraSubservices.enable
         (map (service : service webServer pkgs) cfg.extraSubservices.services)
-      );
+      ) */;
   };
   
 in
-- 
GitLab


From 17d527a540308885e5ea37d21e993d7ef534bd25 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Wed, 20 Feb 2008 22:46:53 +0000
Subject: [PATCH 0823/5331] Fix typo related to BitlBee.

svn path=/nixos/trunk/; revision=10791
---
 system/system.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/system/system.nix b/system/system.nix
index 79624d66c07..ee8663b5ccc 100644
--- a/system/system.nix
+++ b/system/system.nix
@@ -254,7 +254,7 @@ rec {
     pkgs.wirelesstools
   ]
   ++ pkgs.lib.optional config.security.sudo.enable pkgs.sudo
-  ++ pkgs.lib.optional config.networking.bitlbee.enable pkgs.bitlbee
+  ++ pkgs.lib.optional config.services.bitlbee.enable pkgs.bitlbee
   ++ pkgs.lib.optional config.networking.defaultMailServer.directDelivery pkgs.ssmtp 
   ++ pkgs.lib.concatLists (map (job: job.extraPath) upstartJobs.jobs)
   ++ config.environment.extraPackages pkgs
-- 
GitLab


From b81baa3e9ab164f7f9d89e21158fb247c2c97df7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Wed, 20 Feb 2008 22:58:50 +0000
Subject: [PATCH 0824/5331] Revert `$EMACSLOADPATH' trick: it doesn't work
 because the value of `$EMACSLOADPATH' overrides Emacs's default `load-path',
 which contains useful directories like `$EMACS/share/emacs/22.1/lisp', etc.

svn path=/nixos/trunk/; revision=10792
---
 etc/profile.sh | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/etc/profile.sh b/etc/profile.sh
index e780b12988f..2e533a7457f 100644
--- a/etc/profile.sh
+++ b/etc/profile.sh
@@ -60,12 +60,6 @@ done
 # Search directory for Aspell dictionaries.
 export ASPELL_CONF="dict-dir $NIX_USER_PROFILE_DIR/profile/lib/aspell"
 
-# Search path for Emacs Lisp code.
-export EMACSLOADPATH=""
-for i in $NIX_PROFILES; do
-    export EMACSLOADPATH="$i/share/emacs/site-lisp:$EMACSLOADPATH"
-done
-
 export PATH=$HOME/bin:$PATH
 
 
-- 
GitLab


From 59ea75d88e1d3145267470f492d063c2a31fc9cc Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Fri, 22 Feb 2008 03:08:26 +0000
Subject: [PATCH 0825/5331] !!! Important notice. This commit should be already
 done at the time of nixpkgs-stdenv-updates-merge going to trunk. This commit
 should be reverted if you are using old nixpkgs trunk. I hope there will be
 no commits to nixos/ before merger...

svn path=/nixos/trunk/; revision=10824
---
 upstart-jobs/httpd.nix       | 2 +-
 upstart-jobs/ircd-hybrid.nix | 2 +-
 upstart-jobs/xserver.nix     | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/upstart-jobs/httpd.nix b/upstart-jobs/httpd.nix
index 88eee31926f..1a10f5444d6 100644
--- a/upstart-jobs/httpd.nix
+++ b/upstart-jobs/httpd.nix
@@ -23,7 +23,7 @@ let
   
   webServer = import ../../services/apache-httpd {
     inherit (pkgs) apacheHttpd coreutils;
-    stdenv = pkgs.stdenvNewSetupScript;
+    stdenv = pkgs.stdenv;
     php = if cfg.mod_php then pkgs.php else null;
     tomcat_connectors = if cfg.mod_jk.enable then pkgs.tomcat_connectors else null;
 
diff --git a/upstart-jobs/ircd-hybrid.nix b/upstart-jobs/ircd-hybrid.nix
index ce2d5ba7fca..5c117ae55a3 100644
--- a/upstart-jobs/ircd-hybrid.nix
+++ b/upstart-jobs/ircd-hybrid.nix
@@ -2,7 +2,7 @@
 let
 	cfg = config.services.ircdHybrid;
 	ircdService = import ../services/ircd-hybrid {
-		stdenv = pkgs.stdenvNewSetupScript;
+		stdenv = pkgs.stdenv;
 		inherit (pkgs) ircdHybrid coreutils 
 			su iproute gnugrep procps;
 		serverName = cfg.serverName;
diff --git a/upstart-jobs/xserver.nix b/upstart-jobs/xserver.nix
index ffcd6485762..2852f23666a 100644
--- a/upstart-jobs/xserver.nix
+++ b/upstart-jobs/xserver.nix
@@ -12,7 +12,7 @@ let
   cfg = config.services.xserver;
   xorg = pkgs.xorg;
   gnome = pkgs.gnome;
-  stdenv = pkgs.stdenvNewSetupScript;
+  stdenv = pkgs.stdenv;
 
   # Get a bunch of user settings.
   videoDriver = cfg.videoDriver;
-- 
GitLab


From 3dcd0cc7a4e509b807a031ade5b52f379297df48 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 25 Feb 2008 12:43:38 +0000
Subject: [PATCH 0826/5331] * stdenvUsingSetupNew2 -> stdenv.

svn path=/nixos/trunk/; revision=10850
---
 upstart-jobs/apache-httpd/dist-manager.nix | 2 +-
 upstart-jobs/apache-httpd/subversion.nix   | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/upstart-jobs/apache-httpd/dist-manager.nix b/upstart-jobs/apache-httpd/dist-manager.nix
index a6523c73214..e4aca9324aa 100644
--- a/upstart-jobs/apache-httpd/dist-manager.nix
+++ b/upstart-jobs/apache-httpd/dist-manager.nix
@@ -30,7 +30,7 @@ let
   };
 
   # !!! cut&paste
-  substituteInAll = args: pkgs.stdenvUsingSetupNew2.mkDerivation ({
+  substituteInAll = args: pkgs.stdenv.mkDerivation ({
     buildCommand = ''
       ensureDir $out
       cp -prd $src/* $out
diff --git a/upstart-jobs/apache-httpd/subversion.nix b/upstart-jobs/apache-httpd/subversion.nix
index f11f1af77dc..32522c1c953 100644
--- a/upstart-jobs/apache-httpd/subversion.nix
+++ b/upstart-jobs/apache-httpd/subversion.nix
@@ -241,7 +241,7 @@ let
 
   
   # !!! should be in Nixpkgs.
-  substituteInSome = args: pkgs.stdenvUsingSetupNew2.mkDerivation ({
+  substituteInSome = args: pkgs.stdenv.mkDerivation ({
     buildCommand = ''
       ensureDir $out
       cp -prd $src/* $out
@@ -252,7 +252,7 @@ let
     '';
   } // args); # */
     
-  substituteInAll = args: pkgs.stdenvUsingSetupNew2.mkDerivation ({
+  substituteInAll = args: pkgs.stdenv.mkDerivation ({
     buildCommand = ''
       ensureDir $out
       cp -prd $src/* $out
-- 
GitLab


From d5c09f9b61af1014ded2e28c289bcab912243083 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 25 Feb 2008 13:20:00 +0000
Subject: [PATCH 0827/5331] * Clear args (NIXPKGS-86).

svn path=/nixos/trunk/; revision=10852
---
 upstart-jobs/apache-httpd/subversion.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/upstart-jobs/apache-httpd/subversion.nix b/upstart-jobs/apache-httpd/subversion.nix
index 32522c1c953..0c7cd76e51c 100644
--- a/upstart-jobs/apache-httpd/subversion.nix
+++ b/upstart-jobs/apache-httpd/subversion.nix
@@ -247,6 +247,7 @@ let
       cp -prd $src/* $out
       chmod -R u+w $out
       for i in $files; do
+        args=
         substituteAll $out/$i $out/$i
       done
     '';
@@ -258,6 +259,7 @@ let
       cp -prd $src/* $out
       chmod -R u+w $out
       find $out -type f -print | while read fn; do
+        args=
         substituteAll $fn $fn
       done
       eval "$postInstall"
-- 
GitLab


From c4617e5b04ea446d098a5d3166413bf17e7009bd Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 25 Feb 2008 13:30:23 +0000
Subject: [PATCH 0828/5331] svn path=/nixos/trunk/; revision=10853

---
 upstart-jobs/apache-httpd/subversion.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/upstart-jobs/apache-httpd/subversion.nix b/upstart-jobs/apache-httpd/subversion.nix
index 0c7cd76e51c..753f7892d67 100644
--- a/upstart-jobs/apache-httpd/subversion.nix
+++ b/upstart-jobs/apache-httpd/subversion.nix
@@ -307,7 +307,7 @@ in {
     ${staticFilesConfig}
 
     ${if config.toplevelRedirect then ''
-        <Location />
+        <Location ${urlPrefix}/>
             DirectoryIndex repoman
         </Location>
       '' else ""}
-- 
GitLab


From 4b8b296c308f0ecd3a8b628cea8512513ee3eb03 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Thu, 28 Feb 2008 09:59:01 +0000
Subject: [PATCH 0829/5331] Some changes (at least wipe resume image securely
 even without TuxOnIce)

svn path=/nixos/trunk/; revision=10881
---
 boot/boot-stage-1-init.sh | 3 ++-
 boot/boot-stage-2-init.sh | 5 ++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/boot/boot-stage-1-init.sh b/boot/boot-stage-1-init.sh
index d412b31715a..3c9b35d0da2 100644
--- a/boot/boot-stage-1-init.sh
+++ b/boot/boot-stage-1-init.sh
@@ -70,7 +70,8 @@ if test -n "$(cat /sys/power/tuxonice/resume)"; then
     echo 0 > /sys/power/tuxonice/user_interface/enabled
     echo 1 > /sys/power/tuxonice/do_resume || echo "Failed to resume..."
 fi
-
+    echo 1 > /sys/power/resume || echo "Failed to resume..."
+    echo shutdown >/sys/power/disk
 
 # Create device nodes in /dev.
 mknod -m 0666 /dev/null c 1 3
diff --git a/boot/boot-stage-2-init.sh b/boot/boot-stage-2-init.sh
index e298a0d1c8b..2d90147dd1e 100644
--- a/boot/boot-stage-2-init.sh
+++ b/boot/boot-stage-2-init.sh
@@ -108,7 +108,10 @@ export MODULE_DIR=@kernel@/lib/modules/
 # Run any user-specified commands.
 @shell@ @bootLocal@
 
-resumeDevice="$(cat /sys/power/tuxonice/resume)"
+resumeDevice="$(cat /proc/cmdline)"
+resumeDevice="${resumeDevice##* resume=}"
+resumeDevice="${resumeDevice%% *}"
+echo "$resumeDevice"
 if test -n "$resumeDevice"; then
     mkswap "$resumeDevice" || echo 'Failed to clear saved image.'
 fi
-- 
GitLab


From 3e2ed65cf93505ec576e3b82aa85f948a8bcc896 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Thu, 28 Feb 2008 10:19:27 +0000
Subject: [PATCH 0830/5331] Fixed rescue-cd-configurable.nix

svn path=/nixos/trunk/; revision=10883
---
 configuration/rescue-cd-configurable.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/configuration/rescue-cd-configurable.nix b/configuration/rescue-cd-configurable.nix
index 047e14525da..b8438f1dbb0 100644
--- a/configuration/rescue-cd-configurable.nix
+++ b/configuration/rescue-cd-configurable.nix
@@ -374,6 +374,10 @@ rec {
           source = nixpkgsTarball;
           target = "/install/nixpkgs.tar.bz2";
         }
+        { 
+          source = pkgs.writeText "label" "";
+          target = "/${configuration.boot.rootLabel}";
+        }
       ]
       ++
       (lib.optional includeMemtest 
-- 
GitLab


From e4215fe020f33941aa7767840fd0a962ed2434a7 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Thu, 28 Feb 2008 11:42:53 +0000
Subject: [PATCH 0831/5331] Updates to LiveDVD

svn path=/nixos/trunk/; revision=10884
---
 configuration/live-dvd-X-no-soft.nix | 46 ++++++++++++++++++++++++++++
 helpers/make-iso9660-image.sh        |  3 ++
 2 files changed, 49 insertions(+)

diff --git a/configuration/live-dvd-X-no-soft.nix b/configuration/live-dvd-X-no-soft.nix
index d9dad878fc1..b65187f6712 100644
--- a/configuration/live-dvd-X-no-soft.nix
+++ b/configuration/live-dvd-X-no-soft.nix
@@ -53,6 +53,49 @@ in
 		pkgs.module_aggregation 
 		[pkgs.kernel]
 	);
+	extraInitrdKernelModules = [
+		# The initrd should contain any modules necessary for
+		# mounting the CD.
+
+		# SATA/PATA support.
+		"ahci"
+		
+		"ata_piix"
+		
+		"sata_inic162x" "sata_nv" "sata_promise" "sata_qstor"
+		"sata_sil" "sata_sil24" "sata_sis" "sata_svw" "sata_sx4"
+		"sata_uli" "sata_via" "sata_vsc"
+		
+		"pata_ali" "pata_amd" "pata_artop" "pata_atiixp"
+		"pata_cs5520" "pata_cs5530" "pata_cs5535" "pata_efar"
+		"pata_hpt366" "pata_hpt37x" "pata_hpt3x2n" "pata_hpt3x3"
+		"pata_it8213" "pata_it821x" "pata_jmicron" "pata_marvell"
+		"pata_mpiix" "pata_netcell" "pata_ns87410" "pata_oldpiix"
+		"pata_pcmcia" "pata_pdc2027x" "pata_qdi" "pata_rz1000"
+		"pata_sc1200" "pata_serverworks" "pata_sil680" "pata_sis"
+		"pata_sl82c105" "pata_triflex" "pata_via"
+		# "pata_winbond" <-- causes timeouts in sd_mod
+
+		# SCSI support (incomplete).
+		"3w-9xxx" "3w-xxxx" "aic79xx" "aic7xxx" "arcmsr" 
+
+		# USB support, especially for booting from USB CD-ROM
+		# drives.	Also include USB keyboard support for when
+		# something goes wrong in stage 1.
+		"ehci_hcd"
+		"ohci_hcd"
+		"usbhid"
+		"usb_storage"
+
+		# Firewire support.	Not tested.
+		"ohci1394" "sbp2"
+
+		# Wait for SCSI devices to appear.
+		"scsi_wait_scan"
+
+		# Needed for live-CD operation.
+		"aufs"
+	];
 
 	packages = pkgs : [
 		pkgs.which
@@ -85,6 +128,9 @@ in
 		pkgs.xorg.xmodmap
 		pkgs.xorg.xkbcomp
 		pkgs.xorg.setxkbmap
+		pkgs.mssys
+		pkgs.testdisk
+		pkgs.gdb
 	];
 
 	configList = configuration : [
diff --git a/helpers/make-iso9660-image.sh b/helpers/make-iso9660-image.sh
index 586cfb8deb4..12e2f3031ed 100644
--- a/helpers/make-iso9660-image.sh
+++ b/helpers/make-iso9660-image.sh
@@ -42,6 +42,9 @@ done
 printRegistration=1 perl $pathsFromGraph closure-* > nix-path-registration
 echo "nix-path-registration=nix-path-registration" >> pathlist
 
+printManifest=1 perl $pathsFromGraph closure-* > MANIFEST
+echo "MANIFEST=MANIFEST" >> pathlist
+
 
 # Add symlinks to the top-level store objects.
 for ((n = 0; n < ${#objects[*]}; n++)); do
-- 
GitLab


From 0d5c0f946fe5ef292a18a68108ae85652f4828ec Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Thu, 28 Feb 2008 12:10:05 +0000
Subject: [PATCH 0832/5331] Moved module list in a separat eexpression for
 easier maintenance

svn path=/nixos/trunk/; revision=10885
---
 configuration/live-dvd-X-no-soft.nix    | 45 ++-----------------------
 configuration/live-dvd-X.nix            |  3 ++
 configuration/moduleList.nix            | 43 +++++++++++++++++++++++
 configuration/rescue-cd-replacement.nix | 45 ++-----------------------
 4 files changed, 50 insertions(+), 86 deletions(-)
 create mode 100644 configuration/moduleList.nix

diff --git a/configuration/live-dvd-X-no-soft.nix b/configuration/live-dvd-X-no-soft.nix
index b65187f6712..2c69051a08f 100644
--- a/configuration/live-dvd-X-no-soft.nix
+++ b/configuration/live-dvd-X-no-soft.nix
@@ -53,49 +53,8 @@ in
 		pkgs.module_aggregation 
 		[pkgs.kernel]
 	);
-	extraInitrdKernelModules = [
-		# The initrd should contain any modules necessary for
-		# mounting the CD.
-
-		# SATA/PATA support.
-		"ahci"
-		
-		"ata_piix"
-		
-		"sata_inic162x" "sata_nv" "sata_promise" "sata_qstor"
-		"sata_sil" "sata_sil24" "sata_sis" "sata_svw" "sata_sx4"
-		"sata_uli" "sata_via" "sata_vsc"
-		
-		"pata_ali" "pata_amd" "pata_artop" "pata_atiixp"
-		"pata_cs5520" "pata_cs5530" "pata_cs5535" "pata_efar"
-		"pata_hpt366" "pata_hpt37x" "pata_hpt3x2n" "pata_hpt3x3"
-		"pata_it8213" "pata_it821x" "pata_jmicron" "pata_marvell"
-		"pata_mpiix" "pata_netcell" "pata_ns87410" "pata_oldpiix"
-		"pata_pcmcia" "pata_pdc2027x" "pata_qdi" "pata_rz1000"
-		"pata_sc1200" "pata_serverworks" "pata_sil680" "pata_sis"
-		"pata_sl82c105" "pata_triflex" "pata_via"
-		# "pata_winbond" <-- causes timeouts in sd_mod
-
-		# SCSI support (incomplete).
-		"3w-9xxx" "3w-xxxx" "aic79xx" "aic7xxx" "arcmsr" 
-
-		# USB support, especially for booting from USB CD-ROM
-		# drives.	Also include USB keyboard support for when
-		# something goes wrong in stage 1.
-		"ehci_hcd"
-		"ohci_hcd"
-		"usbhid"
-		"usb_storage"
-
-		# Firewire support.	Not tested.
-		"ohci1394" "sbp2"
-
-		# Wait for SCSI devices to appear.
-		"scsi_wait_scan"
-
-		# Needed for live-CD operation.
-		"aufs"
-	];
+	extraInitrdKernelModules = 
+		import ./moduleList.nix;
 
 	packages = pkgs : [
 		pkgs.which
diff --git a/configuration/live-dvd-X.nix b/configuration/live-dvd-X.nix
index f0e925b9115..e7b7e9b2ad3 100644
--- a/configuration/live-dvd-X.nix
+++ b/configuration/live-dvd-X.nix
@@ -54,6 +54,9 @@ in
 		[pkgs.kernel]
 	);
 
+	extraInitrdKernelModules = 
+		import ./moduleList.nix;
+
 	packages = pkgs : [
 		pkgs.irssi
 		pkgs.ltrace
diff --git a/configuration/moduleList.nix b/configuration/moduleList.nix
new file mode 100644
index 00000000000..0ae686811b0
--- /dev/null
+++ b/configuration/moduleList.nix
@@ -0,0 +1,43 @@
+[
+  # The initrd should contain any modules necessary for
+  # mounting the CD.
+  
+  # SATA/PATA support.
+  "ahci"
+  
+  "ata_piix"
+  
+  "sata_inic162x" "sata_nv" "sata_promise" "sata_qstor"
+  "sata_sil" "sata_sil24" "sata_sis" "sata_svw" "sata_sx4"
+  "sata_uli" "sata_via" "sata_vsc"
+  
+  "pata_ali" "pata_amd" "pata_artop" "pata_atiixp"
+  "pata_cs5520" "pata_cs5530" "pata_cs5535" "pata_efar"
+  "pata_hpt366" "pata_hpt37x" "pata_hpt3x2n" "pata_hpt3x3"
+  "pata_it8213" "pata_it821x" "pata_jmicron" "pata_marvell"
+  "pata_mpiix" "pata_netcell" "pata_ns87410" "pata_oldpiix"
+  "pata_pcmcia" "pata_pdc2027x" "pata_qdi" "pata_rz1000"
+  "pata_sc1200" "pata_serverworks" "pata_sil680" "pata_sis"
+  "pata_sl82c105" "pata_triflex" "pata_via"
+  # "pata_winbond" <-- causes timeouts in sd_mod
+  
+  # SCSI support (incomplete).
+  "3w-9xxx" "3w-xxxx" "aic79xx" "aic7xxx" "arcmsr" 
+  
+  # USB support, especially for booting from USB CD-ROM
+  # drives.	Also include USB keyboard support for when
+  # something goes wrong in stage 1.
+  "ehci_hcd"
+  "ohci_hcd"
+  "usbhid"
+  "usb_storage"
+  
+  # Firewire support.	Not tested.
+  "ohci1394" "sbp2"
+  
+  # Wait for SCSI devices to appear.
+  "scsi_wait_scan"
+  
+  # Needed for live-CD operation.
+  "aufs"
+]
diff --git a/configuration/rescue-cd-replacement.nix b/configuration/rescue-cd-replacement.nix
index ad14447cbd9..5d9571a0082 100644
--- a/configuration/rescue-cd-replacement.nix
+++ b/configuration/rescue-cd-replacement.nix
@@ -15,49 +15,8 @@ in (isoFun {
    includeStdenv = false;
    includeBuildDeps = false;
 
-   extraInitrdKernelModules = [
-     # The initrd should contain any modules necessary for
-     # mounting the CD.
-
-     # SATA/PATA support.
-     "ahci"
-    
-     "ata_piix"
-    
-     "sata_inic162x" "sata_nv" "sata_promise" "sata_qstor"
-     "sata_sil" "sata_sil24" "sata_sis" "sata_svw" "sata_sx4"
-     "sata_uli" "sata_via" "sata_vsc"
-    
-     "pata_ali" "pata_amd" "pata_artop" "pata_atiixp"
-     "pata_cs5520" "pata_cs5530" "pata_cs5535" "pata_efar"
-     "pata_hpt366" "pata_hpt37x" "pata_hpt3x2n" "pata_hpt3x3"
-     "pata_it8213" "pata_it821x" "pata_jmicron" "pata_marvell"
-     "pata_mpiix" "pata_netcell" "pata_ns87410" "pata_oldpiix"
-     "pata_pcmcia" "pata_pdc2027x" "pata_qdi" "pata_rz1000"
-     "pata_sc1200" "pata_serverworks" "pata_sil680" "pata_sis"
-     "pata_sl82c105" "pata_triflex" "pata_via"
-     # "pata_winbond" <-- causes timeouts in sd_mod
-
-     # SCSI support (incomplete).
-     "3w-9xxx" "3w-xxxx" "aic79xx" "aic7xxx" "arcmsr" 
-
-     # USB support, especially for booting from USB CD-ROM
-     # drives.  Also include USB keyboard support for when
-     # something goes wrong in stage 1.
-     "ehci_hcd"
-     "ohci_hcd"
-     "usbhid"
-     "usb_storage"
-
-     # Firewire support.  Not tested.
-     "ohci1394" "sbp2"
-
-     # Wait for SCSI devices to appear.
-     "scsi_wait_scan"
-
-     # Needed for live-CD operation.
-     "aufs"
-   ];
+   extraInitrdKernelModules = 
+     import ./moduleList.nix;
   packages = pkgs: [
     pkgs.vim
     pkgs.subversion # for nixos-checkout
-- 
GitLab


From 16a8462820f338cc42c32b5bda2460f4e4545d67 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Sun, 2 Mar 2008 18:46:57 +0000
Subject: [PATCH 0833/5331] Changed FontDir to also handle TTF.

svn path=/nixos/trunk/; revision=10912
---
 system/fontdir.nix | 9 ++++++++-
 system/system.nix  | 2 +-
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/system/fontdir.nix b/system/fontdir.nix
index c33c627ba63..adb6cd64df0 100644
--- a/system/fontdir.nix
+++ b/system/fontdir.nix
@@ -2,7 +2,7 @@ args : with args; with builderDefs {src="";} null;
 	let localDefs = builderDefs rec {
 		src = "";/* put a fetchurl here */
 
-		buildInputs = [mkfontdir mkfontscale];
+		buildInputs = [mkfontdir mkfontscale ttmkfdir];
 		configureFlags = [];
 		fontDirs = import ./fonts.nix {inherit pkgs config;};
 		installPhase = FullDepEntry ("
@@ -30,6 +30,13 @@ args : with args; with builderDefs {src="";} null;
 		rm fonts.alias
 		mkfontdir
 		mkfontscale
+		mv fonts.scale fonts.scale.old
+		mv fonts.dir fonts.dir.old
+		ttmkfdir
+		cat fonts.scale.old >> fonts.scale
+		cat fonts.dir.old >> fonts.dir
+		rm fonts.dir.old
+		rm fonts.scale.old
 		cat \$( find ${fontalias}/ -name fonts.alias) >fonts.alias
 	") ["minInit" "addInputs"];
 	} null; /* null is a terminator for sumArgs */
diff --git a/system/system.nix b/system/system.nix
index ee8663b5ccc..2a37622b6c0 100644
--- a/system/system.nix
+++ b/system/system.nix
@@ -184,7 +184,7 @@ rec {
   # Font aggregation
   fontDir = import ./fontdir.nix {
     inherit config pkgs ;
-    inherit (pkgs) builderDefs ;
+    inherit (pkgs) builderDefs ttmkfdir;
     inherit (pkgs.xorg) mkfontdir mkfontscale fontalias;
   };
 
-- 
GitLab


From c0dd88a97326c47277000a85227d1b0cc99a5e10 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Mon, 3 Mar 2008 19:28:10 +0000
Subject: [PATCH 0834/5331] Added openfire upstart job. Note: after enabling it
 first time, go 127.0.0.1:9090 to configure it!

svn path=/nixos/trunk/; revision=10930
---
 system/options.nix        | 14 ++++++++++++++
 upstart-jobs/default.nix  |  6 ++++++
 upstart-jobs/openfire.nix | 28 ++++++++++++++++++++++++++++
 3 files changed, 48 insertions(+)
 create mode 100644 upstart-jobs/openfire.nix

diff --git a/system/options.nix b/system/options.nix
index 4b8face4306..9244d54d3b2 100644
--- a/system/options.nix
+++ b/system/options.nix
@@ -1744,6 +1744,20 @@
       };
     };
 
+    openfire = {
+      enable = mkOption {
+        default = false;
+	description = "
+	  Whether to enable OpenFire XMPP server.
+	";
+      };
+      usePostgreSQL = mkOption {
+        default = true;
+	description = "
+	  Whether you use PostgreSQL service for your storage back-end.
+	";
+      };
+    };
 
   };
 
diff --git a/upstart-jobs/default.nix b/upstart-jobs/default.nix
index c1d73f6e656..fab5f8fe537 100644
--- a/upstart-jobs/default.nix
+++ b/upstart-jobs/default.nix
@@ -187,6 +187,12 @@ let
       inherit config pkgs;
     })  
 
+  # OpenFire XMPP server
+  ++ optional config.services.openfire.enable
+    (import ../upstart-jobs/openfire.nix {
+      inherit config pkgs;
+    })
+
   # JBoss service
   ++ optional config.services.jboss.enable
     (import ../upstart-jobs/jboss.nix {
diff --git a/upstart-jobs/openfire.nix b/upstart-jobs/openfire.nix
new file mode 100644
index 00000000000..495934e0be2
--- /dev/null
+++ b/upstart-jobs/openfire.nix
@@ -0,0 +1,28 @@
+{pkgs, config}:
+
+assert config.services.openfire.usePostgreSQL -> config.services.postgresql.enable;
+let
+  startDependency = if config.services.openfire.usePostgreSQL then 
+    "postgresql"
+  else
+    if config.services.gw6c.enable then 
+      "gw6c" 
+    else 
+      "network-interfaces";
+in
+with pkgs;
+{
+  name = "openfire";
+  job = ''
+    description "OpenFire XMPP server"
+
+    start on ${startDependency}/started
+    stop on shutdown
+
+    script 
+      export PATH=${jre}/bin:${openfire}/bin:${coreutils}/bin:${which}/bin:${gnugrep}/bin:${gawk}/bin:${gnused}/bin
+      export HOME=/tmp
+      openfire start
+    end script
+  '';
+}
-- 
GitLab


From 6d07b2a545919ed19b8581524684f919c6de666d Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Mon, 3 Mar 2008 23:30:49 +0000
Subject: [PATCH 0835/5331] Added seccureUser to default environment (it is the
 encryption tool I hope to use for configuration files), made
 checkConfigurationOptions on by default, added nixos-gen-seccure-keys to
 nixosTools

svn path=/nixos/trunk/; revision=10935
---
 system/options.nix | 4 ++--
 system/system.nix  | 2 ++
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/system/options.nix b/system/options.nix
index 9244d54d3b2..131daa14876 100644
--- a/system/options.nix
+++ b/system/options.nix
@@ -2129,8 +2129,8 @@ root        ALL=(ALL) SETENV: ALL
     };
 
     checkConfigurationOptions = mkOption {
-      default = false;
-      example = true;
+      default = true;
+      example = false;
       description = "
         If all configuration options must be checked. Non-existing options fail build.
       ";
diff --git a/system/system.nix b/system/system.nix
index 2a37622b6c0..b1a2a91d3f1 100644
--- a/system/system.nix
+++ b/system/system.nix
@@ -208,6 +208,7 @@ rec {
     nixosTools.nixosRebuild
     nixosTools.nixosCheckout
     nixosTools.nixosHardwareScan
+    nixosTools.nixosGenSeccureKeys
     setuidWrapper
   ]
   ++ pkgs.lib.optionals (!config.environment.cleanStart) [
@@ -242,6 +243,7 @@ rec {
     pkgs.pwdutils
     pkgs.reiserfsprogs
     pkgs.rsync
+    pkgs.seccureUser
     pkgs.strace
     pkgs.su
     pkgs.sysklogd
-- 
GitLab


From 4b31843e64fb28297da5863ba7c7599784290b31 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Mon, 3 Mar 2008 23:31:48 +0000
Subject: [PATCH 0836/5331] Added nixos-gen-seccure-keys and modified
 nixos-checkout to store /etc/nixos/version.nix with string representing
 checkout version.

svn path=/nixos/trunk/; revision=10936
---
 installer/default.nix               |  5 +++++
 installer/nixos-checkout.sh         |  4 ++++
 installer/nixos-gen-seccure-keys.sh | 13 +++++++++++++
 3 files changed, 22 insertions(+)
 create mode 100644 installer/nixos-gen-seccure-keys.sh

diff --git a/installer/default.nix b/installer/default.nix
index 314902e9aa2..617210f4487 100644
--- a/installer/default.nix
+++ b/installer/default.nix
@@ -31,6 +31,11 @@ in
     src = ./nixos-rebuild.sh;
   };
 
+  nixosGenSeccureKeys = makeProg {
+    name = "nixos-gen-seccure-keys";
+    src = ./nixos-gen-seccure-keys.sh;
+  };
+
   nixosCheckout = makeProg {
     name = "nixos-checkout";
     src = ./nixos-checkout.sh;
diff --git a/installer/nixos-checkout.sh b/installer/nixos-checkout.sh
index 7c8f329b658..bd530aab4f9 100644
--- a/installer/nixos-checkout.sh
+++ b/installer/nixos-checkout.sh
@@ -57,3 +57,7 @@ svn co https://svn.cs.uu.nl:12443/repos/trace/services/trunk services
 # Add a few required symlink.
 ln -sfn ../services nixos${CHECKOUT_SUFFIX}/services
 ln -sfn ../nixpkgs${CHECKOUT_SUFFIX}/pkgs nixos${CHECKOUT_SUFFIX}/pkgs
+
+REVISION=$(svn info nixpkgs${CHECKOUT_SUFFIX} | egrep '^Revision: ');
+REVISION=${REVISION#Revision: };
+echo "\"$REVISION\"" > version.nix
diff --git a/installer/nixos-gen-seccure-keys.sh b/installer/nixos-gen-seccure-keys.sh
new file mode 100644
index 00000000000..a97eef672f7
--- /dev/null
+++ b/installer/nixos-gen-seccure-keys.sh
@@ -0,0 +1,13 @@
+#! @shell@ -e
+
+mkdir -p /var/elliptic-keys
+chmod 0755 /var/elliptic-keys
+cd /var/elliptic-keys
+touch private
+chmod 0700 private
+dd if=/dev/urandom bs=128 count=1 of=private
+chmod 0500 private
+public=$(seccure-key -F private 2>&1)
+echo ${public#*The public key is: } > public
+chmod 0555 public
+
-- 
GitLab


From 6a84e72db6bbec85e1cf798e30b7e62c0c3d0759 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Mon, 3 Mar 2008 23:32:17 +0000
Subject: [PATCH 0837/5331] Added nixos-gen-seccure-keys to nixosTools

svn path=/nixos/trunk/; revision=10937
---
 default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/default.nix b/default.nix
index d4638506543..a52fd94b78a 100644
--- a/default.nix
+++ b/default.nix
@@ -29,6 +29,7 @@ in
     nixosHardwareScan
     nixosInstall
     nixosRebuild
+    nixosGenSeccureKeys
     ;    
     
   nixFallback = system.nix;
-- 
GitLab


From 8b98c3b1254f52ca735c6413826a4d503b573eaa Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 4 Mar 2008 13:37:52 +0000
Subject: [PATCH 0838/5331] svn path=/nixos/trunk/; revision=10947

---
 upstart-jobs/apache-httpd/dist-manager.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/upstart-jobs/apache-httpd/dist-manager.nix b/upstart-jobs/apache-httpd/dist-manager.nix
index e4aca9324aa..b3064560f77 100644
--- a/upstart-jobs/apache-httpd/dist-manager.nix
+++ b/upstart-jobs/apache-httpd/dist-manager.nix
@@ -17,7 +17,9 @@ let
 
     directoriesConf = pkgs.writeText "directories.conf" config.directoriesConf;
 
-    defaultPath = "${pkgs.coreutils}/bin:${pkgs.findutils}/bin";
+    defaultPath = "${pkgs.coreutils}/bin:${pkgs.findutils}/bin:${pkgs.gnutar}/bin";
+
+    inherit (pkgs) gnutar bzip2;
 
     saxon8 = pkgs.saxonb;
 
@@ -36,6 +38,7 @@ let
       cp -prd $src/* $out
       chmod -R u+w $out
       find $out -type f -print | while read fn; do
+        args=
         substituteAll $fn $fn
       done
       eval "$postInstall"
-- 
GitLab


From 65deea661027b80ea6098956eeb0a91a6da8f522 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 4 Mar 2008 14:58:48 +0000
Subject: [PATCH 0839/5331] * dbus-uuidgen is now in dbus.tools.  Also, a quick
 hack to get   DBus clients working again: they expect dbus-launch in the  
 dbus.daemon prefix, where it no longer is.  Fortunately they   also search in
 the path.  But a better fix is to move dbus-launch   to dbus.daemon.

svn path=/nixos/trunk/; revision=10951
---
 upstart-jobs/dbus.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/upstart-jobs/dbus.nix b/upstart-jobs/dbus.nix
index d57b032524d..a2893d42ecf 100644
--- a/upstart-jobs/dbus.nix
+++ b/upstart-jobs/dbus.nix
@@ -33,7 +33,7 @@ in
     }
   ];
   
-  extraPath = [dbus];
+  extraPath = [dbus.daemon dbus.tools];
   
   job = "
 description \"D-Bus system message bus daemon\"
@@ -47,7 +47,7 @@ start script
     chown messagebus ${homeDir}
 
     mkdir -m 0755 -p /var/lib/dbus
-    ${dbus}/bin/dbus-uuidgen --ensure
+    ${dbus.tools}/bin/dbus-uuidgen --ensure
 
 end script
 
-- 
GitLab


From e48a01523fecc47556ab2cd4e90554296549b5e5 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Tue, 4 Mar 2008 15:30:54 +0000
Subject: [PATCH 0840/5331] Gateway6 upstart job update.

svn path=/nixos/trunk/; revision=10953
---
 upstart-jobs/gw6c.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/upstart-jobs/gw6c.nix b/upstart-jobs/gw6c.nix
index 6f2a7db3027..97b9c9da5d0 100644
--- a/upstart-jobs/gw6c.nix
+++ b/upstart-jobs/gw6c.nix
@@ -5,7 +5,7 @@ let
 	gw6cService = import ../services/gw6c {
 		inherit (pkgs) stdenv gw6c coreutils 
 		procps upstart iputils gnused 
-		gnugrep;
+		gnugrep seccureUser writeScript;
 		username = cfg.username;
 		password = cfg.password;
 		server = cfg.server;
-- 
GitLab


From cedc8aaf5814d624279d234881a7b268ee356ca3 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Tue, 4 Mar 2008 16:06:33 +0000
Subject: [PATCH 0841/5331] Now public key is copied to store (and its hash
 affects derivation hash)

svn path=/nixos/trunk/; revision=10954
---
 system/options.nix    | 16 ++++++++++++++++
 upstart-jobs/gw6c.nix |  2 ++
 2 files changed, 18 insertions(+)

diff --git a/system/options.nix b/system/options.nix
index 131daa14876..98362e68182 100644
--- a/system/options.nix
+++ b/system/options.nix
@@ -1891,6 +1891,22 @@
       ";
     };
 
+    seccureKeys = {
+      public = mkOption {
+        default = /var/elliptic-keys/public;
+	description = "
+	  Public key. Make it path argument, so it is copied into store and
+	  hashed.
+	";
+      };
+      private = mkOption {
+        default = "/var/elliptic-keys/private";
+	description = "
+	  Private key. Make it string argument, so it is not copied into store.
+	";
+      };
+    };
+
     sudo = {
 
       enable = mkOption {
diff --git a/upstart-jobs/gw6c.nix b/upstart-jobs/gw6c.nix
index 97b9c9da5d0..0f3d007e416 100644
--- a/upstart-jobs/gw6c.nix
+++ b/upstart-jobs/gw6c.nix
@@ -11,6 +11,8 @@ let
 		server = cfg.server;
 		keepAlive = cfg.keepAlive;
 		everPing = cfg.everPing;
+
+		seccureKeys = config.security.seccureKeys;
 	};
 in
 {
-- 
GitLab


From cf28e6d3411c7e5fa5ec5ba2e1960809c1c2c417 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Wed, 5 Mar 2008 14:30:19 +0000
Subject: [PATCH 0842/5331] MS Core Fonts are now optional

svn path=/nixos/trunk/; revision=10962
---
 system/fonts.nix   | 3 ++-
 system/options.nix | 7 +++++++
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/system/fonts.nix b/system/fonts.nix
index f63735c698d..16b37b251a0 100644
--- a/system/fonts.nix
+++ b/system/fonts.nix
@@ -13,13 +13,14 @@
   pkgs.xorg.fontbhttf
   pkgs.xorg.fontbhlucidatypewriter100dpi
   pkgs.ttf_bitstream_vera
-  pkgs.corefonts
   pkgs.freefont_ttf
   pkgs.xorg.fontbh100dpi
   pkgs.xorg.fontmiscmisc
   pkgs.xorg.fontcursormisc
 ]
 
+++ (pkgs.lib.optional (config.fonts.enableCoreFonts) pkgs.corefonts)
+
 ++ pkgs.lib.optional (config.fonts.enableGhostscriptFonts) "${pkgs.ghostscript}/share/ghostscript/fonts"
 
 ++ ((config.fonts.extraFonts) pkgs)
diff --git a/system/options.nix b/system/options.nix
index 98362e68182..414bd90939b 100644
--- a/system/options.nix
+++ b/system/options.nix
@@ -2050,6 +2050,13 @@ root        ALL=(ALL) SETENV: ALL
       ";
     };
 
+    enableCoreFonts = mkOption {
+      default = true;
+      description = "
+        Whether to include MS Core Fonts (redistributable, but only verbatim).
+      ";
+    };
+
   };
 
 
-- 
GitLab


From 3cde6bd187697235d5f652bc660d384678ec405d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Wed, 5 Mar 2008 16:03:09 +0000
Subject: [PATCH 0843/5331] Add support for lshd (SSH2 daemon of GNU lsh).

svn path=/nixos/trunk/; revision=10969
---
 system/options.nix       | 91 ++++++++++++++++++++++++++++++++++++++++
 upstart-jobs/default.nix | 10 +++++
 upstart-jobs/lshd.nix    | 53 +++++++++++++++++++++++
 3 files changed, 154 insertions(+)
 create mode 100644 upstart-jobs/lshd.nix

diff --git a/system/options.nix b/system/options.nix
index 414bd90939b..11b4e90a426 100644
--- a/system/options.nix
+++ b/system/options.nix
@@ -799,6 +799,97 @@
 
     };
 
+    lshd = {
+
+      enable = mkOption {
+        default = false;
+	description = ''
+	  Whether to enable the GNU lshd SSH2 daemon, which allows
+          secure remote login.
+	'';
+      };
+
+      portNumber = mkOption {
+        default = 22;
+	description = ''
+	  The port on which to listen for connections.
+	'';
+      };
+
+      interfaces = mkOption {
+        default = [];
+	description = ''
+	  List of network interfaces where listening for connections.
+          When providing the empty list, `[]', lshd listens on all
+          network interfaces.
+	'';
+	example = [ "localhost" "1.2.3.4:443" ];
+      };
+
+      hostKey = mkOption {
+        default = "/etc/lsh/host-key";
+	description = ''
+	  Path to the server's private key.  Note that this key must
+          have been created, e.g., using "lsh-keygen --server |
+          lsh-writekey --server", so that you can run lshd.
+	'';
+      };
+
+      syslog = mkOption {
+        default = true;
+	description = ''Whether to enable syslog output.'';
+      };
+
+      passwordAuthentication = mkOption {
+        default = true;
+	description = ''Whether to enable password authentication.'';
+      };
+
+      publicKeyAuthentication = mkOption {
+        default = true;
+	description = ''Whether to enable public key authentication.'';
+      };
+
+      rootLogin = mkOption {
+        default = false;
+	description = ''Whether to enable remote root login.'';
+      };
+
+      loginShell = mkOption {
+        default = null;
+	description = ''
+	  If non-null, override the default login shell with the
+	  specified value.
+	'';
+	example = "/nix/store/xyz-bash-10.0/bin/bash10";
+      };
+
+      srpKeyExchange = mkOption {
+        default = false;
+	description = ''
+	  Whether to enable SRP key exchange and user authentication.
+	'';
+      };
+
+      tcpForwarding = mkOption {
+        default = true;
+	description = ''Whether to enable TCP/IP forwarding.'';
+      };
+
+      x11Forwarding = mkOption {
+        default = true;
+	description = ''Whether to enable X11 forwarding.'';
+      };
+
+      subsystems = mkOption {
+        default = [ ["sftp" "${pkgs.lsh}/sbin/sftp-server"] ];
+	description = ''
+	  List of subsystem-path pairs, where the head of the pair
+          denotes the subsystem name, and the tail denotes the path to
+          an executable implementing it.
+	'';
+      };
+    };
 
     ntp = {
 
diff --git a/upstart-jobs/default.nix b/upstart-jobs/default.nix
index fab5f8fe537..065e8cda08a 100644
--- a/upstart-jobs/default.nix
+++ b/upstart-jobs/default.nix
@@ -139,6 +139,16 @@ let
       allowSFTP = config.services.sshd.allowSFTP;
     })
 
+  # GNU lshd SSH2 deamon.
+  ++ optional config.services.lshd.enable
+    (import ../upstart-jobs/lshd.nix {
+      inherit (pkgs) lib;
+      inherit (pkgs) lsh;
+      inherit (pkgs.xorg) xauth;
+      inherit nssModulesPath;
+      lshdConfig = config.services.lshd;
+    })
+
   # NTP daemon.
   ++ optional config.services.ntp.enable
     (import ../upstart-jobs/ntpd.nix {
diff --git a/upstart-jobs/lshd.nix b/upstart-jobs/lshd.nix
new file mode 100644
index 00000000000..b85eeb038c7
--- /dev/null
+++ b/upstart-jobs/lshd.nix
@@ -0,0 +1,53 @@
+{lsh, xauth, lib, nssModulesPath, lshdConfig}:
+
+with builtins;
+with lib;
+
+{
+  name = "lshd";
+  
+  job = with lshdConfig; ''
+description "GNU lshd SSH2 daemon"
+
+start on network-interfaces/started
+stop on network-interfaces/stop
+
+env LD_LIBRARY_PATH=${nssModulesPath}
+
+start script
+    test -d /etc/lsh || mkdir -m 0755 -p /etc/lsh
+    test -d /var/spool/lsh || mkdir -m 0755 -p /var/spool/lsh
+
+    if ! test -f /var/spool/lsh/yarrow-seed-file
+    then
+        ${lsh}/bin/lsh-make-seed -o /var/spool/lsh/yarrow-seed-file
+    fi
+
+    if ! test -f "${hostKey}"
+    then
+        ${lsh}/bin/lsh-keygen --server | \
+	${lsh}/bin/lsh-writekey --server -o "${hostKey}"
+    fi
+end script
+
+respawn ${lsh}/sbin/lshd --daemonic \
+   -p ${toString portNumber} \
+   ${if interfaces == [] then ""
+     else (concatStrings (map (i: "--interface=\"${i}\"")
+                              interfaces))} \
+   -h "${hostKey}" \
+   ${if !syslog then "--no-syslog" else ""} \
+   ${if !passwordAuthentication then "--no-password" else ""} \
+   ${if !publicKeyAuthentication then "--no-publickey" else ""} \
+   ${if rootLogin then "--root-login" else ""} \
+   ${if loginShell != null then "--login-shell=\"${loginShell}\"" else "" } \
+   ${if srpKeyExchange then "--srp-keyexchange" else "" } \
+   ${if !tcpForwarding then "--no-tcpip-forward" else "--tcpip-forward"} \
+   ${if x11Forwarding then "--x11-forward" else "--no-x11-forward" } \
+   --subsystems=${concatStringsSep ","
+                                   (map (pair: (head pair) + "=" +
+                                               (head (tail pair)))
+				        subsystems)}
+'';
+  
+}
-- 
GitLab


From 89f86847f6f59fc17ff05a4ba49d8d1940b2f09b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Wed, 5 Mar 2008 19:26:15 +0000
Subject: [PATCH 0844/5331] Setup `$PKG_CONFIG_PATH' in `/etc/profile'.

svn path=/nixos/trunk/; revision=10971
---
 etc/profile.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/etc/profile.sh b/etc/profile.sh
index 2e533a7457f..1ac34ed4fb8 100644
--- a/etc/profile.sh
+++ b/etc/profile.sh
@@ -55,6 +55,7 @@ NIX_PROFILES="/nix/var/nix/profiles/default $NIX_USER_PROFILE_DIR/profile"
 for i in $NIX_PROFILES; do # !!! reverse
     export PATH=$i/bin:$i/sbin:$PATH
     export INFOPATH=$i/info:$i/share/info:$INFOPATH
+    export PKG_CONFIG_PATH="$i/lib/pkgconfig:$PKG_CONFIG_PATH"
 done
 
 # Search directory for Aspell dictionaries.
-- 
GitLab


From f2b3ff2fce73d4bce7d93093207c16ff09127bf4 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 6 Mar 2008 13:52:10 +0000
Subject: [PATCH 0845/5331] * PAM config for xlock.

svn path=/nixos/trunk/; revision=10987
---
 etc/default.nix | 1 +
 etc/pam.d/xlock | 4 ++++
 2 files changed, 5 insertions(+)
 create mode 100644 etc/pam.d/xlock

diff --git a/etc/default.nix b/etc/default.nix
index 599ee33944f..f0042f68255 100644
--- a/etc/default.nix
+++ b/etc/default.nix
@@ -228,6 +228,7 @@ import ../helpers/make-etc.nix {
       "sshd"
       "useradd"
       "chsh"
+      "xlock"
       "common"
       "common-console" # shared stuff for interactive local sessions
     ]
diff --git a/etc/pam.d/xlock b/etc/pam.d/xlock
new file mode 100644
index 00000000000..50f3cc5ce60
--- /dev/null
+++ b/etc/pam.d/xlock
@@ -0,0 +1,4 @@
+auth     include        common
+account  include        common
+password include        common
+session  include        common
-- 
GitLab


From c0dc904b90d3f6df0e00ee2a192e52cdfa062179 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Thu, 6 Mar 2008 14:38:17 +0000
Subject: [PATCH 0846/5331] Add a PAM config file for lshd (doesn't seem to
 work, though).

svn path=/nixos/trunk/; revision=10988
---
 etc/default.nix | 1 +
 etc/pam.d/lshd  | 4 ++++
 2 files changed, 5 insertions(+)
 create mode 100644 etc/pam.d/lshd

diff --git a/etc/default.nix b/etc/default.nix
index f0042f68255..305012020b5 100644
--- a/etc/default.nix
+++ b/etc/default.nix
@@ -226,6 +226,7 @@ import ../helpers/make-etc.nix {
       "passwd"
       "shadow"
       "sshd"
+      "lshd"
       "useradd"
       "chsh"
       "xlock"
diff --git a/etc/pam.d/lshd b/etc/pam.d/lshd
new file mode 100644
index 00000000000..50f3cc5ce60
--- /dev/null
+++ b/etc/pam.d/lshd
@@ -0,0 +1,4 @@
+auth     include        common
+account  include        common
+password include        common
+session  include        common
-- 
GitLab


From 2b1a2d2415334e0bc7950004bb1c46ad713fcda2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Thu, 6 Mar 2008 14:49:06 +0000
Subject: [PATCH 0847/5331] Add PAM config file for `lsh-pam-checkpw'.

svn path=/nixos/trunk/; revision=10989
---
 etc/default.nix           | 1 +
 etc/pam.d/lsh-pam-checkpw | 4 ++++
 2 files changed, 5 insertions(+)
 create mode 100644 etc/pam.d/lsh-pam-checkpw

diff --git a/etc/default.nix b/etc/default.nix
index 305012020b5..0286517927a 100644
--- a/etc/default.nix
+++ b/etc/default.nix
@@ -227,6 +227,7 @@ import ../helpers/make-etc.nix {
       "shadow"
       "sshd"
       "lshd"
+      "lsh-pam-checkpw"
       "useradd"
       "chsh"
       "xlock"
diff --git a/etc/pam.d/lsh-pam-checkpw b/etc/pam.d/lsh-pam-checkpw
new file mode 100644
index 00000000000..50f3cc5ce60
--- /dev/null
+++ b/etc/pam.d/lsh-pam-checkpw
@@ -0,0 +1,4 @@
+auth     include        common
+account  include        common
+password include        common
+session  include        common
-- 
GitLab


From ad1b5aca82195c6b0f622cba2441c5e0b15e183c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Thu, 6 Mar 2008 14:56:10 +0000
Subject: [PATCH 0848/5331] Set `$ACLOCAL_PATH' in `/etc/profile'.

This variable is not honored by `aclocal' itself but by the wrapper that's
installed for `aclocal' by the `automake' package.

svn path=/nixos/trunk/; revision=10990
---
 etc/profile.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/etc/profile.sh b/etc/profile.sh
index 1ac34ed4fb8..a1bfb52485a 100644
--- a/etc/profile.sh
+++ b/etc/profile.sh
@@ -56,6 +56,7 @@ for i in $NIX_PROFILES; do # !!! reverse
     export PATH=$i/bin:$i/sbin:$PATH
     export INFOPATH=$i/info:$i/share/info:$INFOPATH
     export PKG_CONFIG_PATH="$i/lib/pkgconfig:$PKG_CONFIG_PATH"
+    export ACLOCAL_PATH="$i/share/aclocal:$ACLOCAL_PATH"
 done
 
 # Search directory for Aspell dictionaries.
-- 
GitLab


From 43a4353c67188825b8ecdd0fa24ba914171affd6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Thu, 6 Mar 2008 17:11:22 +0000
Subject: [PATCH 0849/5331] Add support for the Avahi daemon.

The daemon starts correctly but, for some reason, clients fail
to connect to it.

svn path=/nixos/trunk/; revision=10999
---
 system/ids.nix                |  4 +++
 system/options.nix            | 47 ++++++++++++++++++++++++++++++++++-
 upstart-jobs/avahi-daemon.nix | 44 ++++++++++++++++++++++++++++++++
 upstart-jobs/default.nix      |  7 ++++++
 4 files changed, 101 insertions(+), 1 deletion(-)
 create mode 100644 upstart-jobs/avahi-daemon.nix

diff --git a/system/ids.nix b/system/ids.nix
index b83f9a531c5..fee56a5303b 100644
--- a/system/ids.nix
+++ b/system/ids.nix
@@ -11,6 +11,8 @@
     vsftpd = 7;
     ftp = 8;
     bitlbee = 9;
+    avahi = 10;
+
     nixbld = 30000; # start of range of uids
     nobody = 65534;
   };
@@ -21,7 +23,9 @@
     haldaemon = 5;
     vsftpd = 7;
     ftp = 8;
+    avahi = 10;
     audio = 17;
+
     users = 100;
     nixbld = 30000;
     nogroup = 65534;
diff --git a/system/options.nix b/system/options.nix
index 11b4e90a426..0689789c27d 100644
--- a/system/options.nix
+++ b/system/options.nix
@@ -914,12 +914,57 @@
 
     };
 
+    avahi = {
+
+      enable = mkOption {
+        default = false;
+	description = ''
+	  Whether to run the Avahi daemon, which allows Avahi clients
+	  to use Avahi's service discovery facilities and also allows
+	  the local machine to advertise its presence and services
+	  (through the mDNS responder implemented by `avahi-daemon').
+	'';
+      };
+
+      hostName = mkOption {
+        default = "nixos";  # XXX: Would be nice to use `networking.hostName'.
+	description = ''Host name advertised on the LAN.'';
+      };
+
+      browseDomains = mkOption {
+        default = [ "0pointer.de" "zeroconf.org" ];
+	description = ''
+	  List of non-local DNS domains to be browsed.
+	'';
+      };
+
+      ipv4 = mkOption {
+        default = true;
+	description = ''Whether to use IPv4'';
+      };
+
+      ipv6 = mkOption {
+        default = false;
+	description = ''Whether to use IPv6'';
+      };
+
+      wideArea = mkOption {
+        default = true;
+	description = ''Whether to enable wide-area service discovery.'';
+      };
+
+      publishing = mkOption {
+        default = true;
+	description = ''Whether to allow publishing.'';
+      };
+    };
+
     bitlbee = {
 
       enable = mkOption {
         default = false;
         description = ''
-          Whether the run the BitlBee IRC to other chat network gateway.
+          Whether to run the BitlBee IRC to other chat network gateway.
           Running it allows you to access the MSN, Jabber, Yahoo! and ICQ chat
           networks via an IRC client.
         '';
diff --git a/upstart-jobs/avahi-daemon.nix b/upstart-jobs/avahi-daemon.nix
new file mode 100644
index 00000000000..481bdb712bb
--- /dev/null
+++ b/upstart-jobs/avahi-daemon.nix
@@ -0,0 +1,44 @@
+{avahi, config, writeText, lib}:
+
+let
+
+  avahiDaemonConf = with config; writeText "avahi-daemon.conf" ''
+    [server]
+    host-name=${hostName}
+    browse-domains=${lib.concatStringsSep ", " browseDomains}
+    use-ipv4=${if ipv4 then "yes" else "no"}
+    use-ipv6=${if ipv6 then "yes" else "no"}
+
+    [wide-area]
+    enable-wide-area=${if wideArea then "yes" else "no"}
+
+    [publish]
+    disable-publishing=${if publishing then "no" else "yes"}
+  '';
+
+  avahiUid = (import ../system/ids.nix).uids.avahi;
+
+in
+
+{
+  name = "avahi-daemon";
+  
+  users = [
+    { name = "avahi";
+      uid = (import ../system/ids.nix).uids.avahi;
+      description = "`avahi-daemon' privilege separation user";
+      home = "/var/empty";
+    }
+  ];
+
+  job = ''
+    start on startup
+    stop on shutdown
+    respawn
+    script
+      export PATH="${avahi}/bin:${avahi}/sbin:$PATH"
+      exec ${avahi}/sbin/avahi-daemon --daemonize -f "${avahiDaemonConf}"
+    end script
+  '';
+
+}
diff --git a/upstart-jobs/default.nix b/upstart-jobs/default.nix
index 065e8cda08a..fcf15c74a5d 100644
--- a/upstart-jobs/default.nix
+++ b/upstart-jobs/default.nix
@@ -157,6 +157,13 @@ let
       servers = config.services.ntp.servers;
     })
 
+  # Avahi daemon.
+  ++ optional config.services.avahi.enable
+    (import ../upstart-jobs/avahi-daemon.nix {
+      inherit (pkgs) avahi writeText lib;
+      config = config.services.avahi;
+    })
+
   # X server.
   ++ optional config.services.xserver.enable
     (import ../upstart-jobs/xserver.nix {
-- 
GitLab


From 9650b0859eb17279060f3db1d9f123dd58f4050b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Thu, 6 Mar 2008 20:56:50 +0000
Subject: [PATCH 0850/5331] Fix `avahi-daemon' Upstart job.

svn path=/nixos/trunk/; revision=11002
---
 upstart-jobs/avahi-daemon.nix | 8 ++++++--
 upstart-jobs/default.nix      | 3 ++-
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/upstart-jobs/avahi-daemon.nix b/upstart-jobs/avahi-daemon.nix
index 481bdb712bb..8ec26c9826e 100644
--- a/upstart-jobs/avahi-daemon.nix
+++ b/upstart-jobs/avahi-daemon.nix
@@ -16,8 +16,6 @@ let
     disable-publishing=${if publishing then "no" else "yes"}
   '';
 
-  avahiUid = (import ../system/ids.nix).uids.avahi;
-
 in
 
 {
@@ -31,6 +29,12 @@ in
     }
   ];
 
+  groups = [
+    { name = "avahi";
+      gid = (import ../system/ids.nix).gids.avahi;
+    }
+  ];
+
   job = ''
     start on startup
     stop on shutdown
diff --git a/upstart-jobs/default.nix b/upstart-jobs/default.nix
index fcf15c74a5d..fd132621b82 100644
--- a/upstart-jobs/default.nix
+++ b/upstart-jobs/default.nix
@@ -277,7 +277,8 @@ let
     (import ../upstart-jobs/dbus.nix {
       inherit (pkgs) stdenv dbus;
       dbusServices =
-        pkgs.lib.optional (config.services.hal.enable) pkgs.hal;
+        pkgs.lib.optional (config.services.hal.enable) pkgs.hal ++
+	pkgs.lib.optional (config.services.avahi.enable) pkgs.avahi;
     })
 
   # HAL daemon.
-- 
GitLab


From 37eaa53007d3c74227110ee562f963913294672d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Fri, 7 Mar 2008 13:06:40 +0000
Subject: [PATCH 0851/5331] Add handy `rpcgen' alias in `/etc/profile'.

svn path=/nixos/trunk/; revision=11013
---
 etc/profile.sh | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/etc/profile.sh b/etc/profile.sh
index a1bfb52485a..c88d6e83f9b 100644
--- a/etc/profile.sh
+++ b/etc/profile.sh
@@ -91,6 +91,9 @@ alias ls="ls --color=tty"
 alias ll="ls -l"
 alias which="type -p"
 
+# Help `rpcgen' find `cpp', assuming it's installed in the user's environment.
+alias rpcgen="rpcgen -Y $HOME/.nix-profile/bin"
+
 
 # Read system-wide modifications.
 if test -f /etc/profile.local; then
-- 
GitLab


From 5240c13bd2cfbe2f3e64510a726ad0acd10733b8 Mon Sep 17 00:00:00 2001
From: Nicolas Pierron <nicolas.b.pierron@gmail.com>
Date: Mon, 10 Mar 2008 17:27:37 +0000
Subject: [PATCH 0852/5331] * Enable halting and rebooting with slim. (type
 halt or reboot as login and the root password)

svn path=/nixos/trunk/; revision=11040
---
 upstart-jobs/xserver.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/upstart-jobs/xserver.nix b/upstart-jobs/xserver.nix
index 2852f23666a..12591118f0d 100644
--- a/upstart-jobs/xserver.nix
+++ b/upstart-jobs/xserver.nix
@@ -285,6 +285,8 @@ let
     default_xserver ${xorg.xorgserver}/bin/X
     xserver_arguments ${toString xserverArgs}
     login_cmd exec ${stdenv.bash}/bin/sh ${clientScript}
+    halt_cmd ${pkgs.upstart}/sbin/shutdown -h now
+    reboot_cmd ${pkgs.upstart}/sbin/shutdown -r now
   '';
 
 
-- 
GitLab


From 58240dc30da4868697193be902855e718bbeda93 Mon Sep 17 00:00:00 2001
From: Nicolas Pierron <nicolas.b.pierron@gmail.com>
Date: Mon, 10 Mar 2008 17:33:13 +0000
Subject: [PATCH 0853/5331] Add the option xkbModel in the xserver.

svn path=/nixos/trunk/; revision=11041
---
 system/options.nix        | 8 ++++++++
 upstart-jobs/xserver.conf | 2 +-
 upstart-jobs/xserver.nix  | 1 +
 3 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/system/options.nix b/system/options.nix
index 0689789c27d..9b500a20e92 100644
--- a/system/options.nix
+++ b/system/options.nix
@@ -1143,6 +1143,14 @@
         ";
       };
 
+      xkbModel = mkOption {
+        default = "pc104";
+        example = "presario";
+        description = "
+          Keyboard model.
+        ";
+      };
+
       xkbOptions = mkOption {
         default = "";
         example = "grp:caps_toggle, grp_led:scroll";
diff --git a/upstart-jobs/xserver.conf b/upstart-jobs/xserver.conf
index d3fc22278c5..98f98f481f9 100644
--- a/upstart-jobs/xserver.conf
+++ b/upstart-jobs/xserver.conf
@@ -26,7 +26,7 @@ Section "InputDevice"
   Identifier   "Keyboard[0]"
   Option       "Protocol" "Standard"
   Option       "XkbLayout" "@layout@"
-  Option       "XkbModel" "pc104"
+  Option       "XkbModel" "@xkbModel@"
   Option       "XkbRules" "xfree86"
   @xkbOptions@
 EndSection
diff --git a/upstart-jobs/xserver.nix b/upstart-jobs/xserver.nix
index 12591118f0d..4030e137832 100644
--- a/upstart-jobs/xserver.nix
+++ b/upstart-jobs/xserver.nix
@@ -88,6 +88,7 @@ let
       Option "XkbOptions" "${cfg.xkbOptions}"
     '';
 
+    xkbModel = cfg.xkbModel;
     layout = cfg.layout;
 
     corePointer = if cfg.isSynaptics then "Touchpad[0]" else "Mouse[0]";
-- 
GitLab


From b615a392a2a9651a9e0474f3d6d150e0ae464461 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Mon, 10 Mar 2008 20:19:33 +0000
Subject: [PATCH 0854/5331] Some updates to Live DVD building

svn path=/nixos/trunk/; revision=11044
---
 configuration/live-dvd-X-medium.nix  | 207 +++++++++++++++++++++++++++
 configuration/live-dvd-X-no-soft.nix |  10 ++
 configuration/live-dvd-X.nix         |  12 ++
 helpers/make-iso9660-image.sh        |   4 +-
 4 files changed, 231 insertions(+), 2 deletions(-)
 create mode 100644 configuration/live-dvd-X-medium.nix

diff --git a/configuration/live-dvd-X-medium.nix b/configuration/live-dvd-X-medium.nix
new file mode 100644
index 00000000000..97eb364c15a
--- /dev/null
+++ b/configuration/live-dvd-X-medium.nix
@@ -0,0 +1,207 @@
+{platform ? __currentSystem} : 
+let 
+  isoFun = import ./rescue-cd-configurable.nix;
+  xResolutions = [
+  	{ x = 2048; y = 1536; }
+	{ x = 1920; y = 1024; }
+  	{ x = 1280; y = 800; }
+  	{ x = 1024; y = 768; }
+  	{ x = 800; y = 600; }
+  	{ x = 640; y = 480; }
+  ];
+  xConfiguration = {
+	enable = true;
+	exportConfiguration = true;
+	tcpEnable = true;
+	resolutions = xResolutions;
+	sessionType = "xterm";
+	windowManager = "twm";
+	tty = "9";
+  };
+
+  theKernel = pkgs: let baseKernel=pkgs.kernel; 
+	in (pkgs.module_aggregation 
+    		[
+		baseKernel
+		(pkgs.kqemuFunCurrent baseKernel)
+		(pkgs.atherosFun {
+			kernel = baseKernel;
+			version = "r2756";
+			pci001c_rev01 = true;
+		} null)
+		]);
+
+
+in 
+(isoFun {
+	inherit platform;
+	lib = (import ../pkgs/lib);
+
+	networkNixpkgs = "";
+	manualEnabled = true;
+	rogueEnabled = true;
+	sshdEnabled = true;
+	fontConfigEnabled = true;
+	sudoEnable = true;
+	includeMemtest = true;
+	includeStdenv = true;
+	includeBuildDeps = true;
+	addUsers = ["nixos" "livecd" "livedvd" 
+		"user" "guest" "nix"];
+
+	kernel = pkgs: (
+		pkgs.module_aggregation 
+		[pkgs.kernel]
+	);
+
+	extraInitrdKernelModules = 
+		import ./moduleList.nix;
+
+	arbitraryOverrides = config : config // {
+		services = config.services // {
+			gw6c = {
+				enable = true;
+				autorun = false;
+			};
+		};
+	};
+
+	packages = pkgs : [
+		pkgs.irssi
+		pkgs.ltrace
+		pkgs.subversion
+		pkgs.which
+		pkgs.file
+		pkgs.zip
+		pkgs.unzip
+		pkgs.unrar
+		pkgs.usbutils
+		pkgs.bc
+		pkgs.cpio
+		pkgs.ncat
+		pkgs.patch
+		pkgs.fuse
+		pkgs.indent
+		pkgs.zsh
+		pkgs.hddtemp
+		pkgs.hdparm
+		pkgs.sdparm
+		pkgs.sqlite
+		pkgs.wpa_supplicant
+		pkgs.lynx
+		pkgs.db4
+		pkgs.rogue
+		pkgs.attr
+		pkgs.acl
+		pkgs.automake
+		pkgs.autoconf
+		pkgs.libtool
+		pkgs.gnupg
+		pkgs.openssl
+		pkgs.gnumake
+		pkgs.manpages
+		pkgs.cabextract
+		pkgs.upstartJobControl
+		pkgs.fpc
+		pkgs.perl
+		pkgs.lftp
+		pkgs.wget
+		pkgs.utillinuxCurses
+		pkgs.iproute
+		pkgs.diffutils
+		pkgs.pciutils
+		pkgs.lsof
+		pkgs.vimHugeX
+		pkgs.xpdf
+		pkgs.ghostscript
+		pkgs.gv
+		pkgs.firefoxWrapper
+		pkgs.xlaunch
+		pkgs.wirelesstools
+		pkgs.usbutils
+		pkgs.dmidecode
+		(theKernel pkgs)
+		pkgs.sshfsFuse
+		pkgs.ratpoison
+		pkgs.xorg.twm
+		pkgs.binutils
+		pkgs.xorg.lndir
+		pkgs.pstree
+		pkgs.psmisc
+		pkgs.aspell
+		pkgs.gettext
+		pkgs.xorg.xorgserver
+		pkgs.xorg.xsetroot
+		pkgs.xorg.xhost
+		pkgs.xorg.xwd
+		pkgs.xorg.xfontsel
+		pkgs.xorg.xwud
+		pkgs.xlaunch
+		pkgs.xsel
+		pkgs.xorg.xmessage
+		pkgs.xorg.xauth
+		pkgs.keynav
+		pkgs.xorg.xset
+		pkgs.xterm
+		pkgs.xmove
+		pkgs.xorg.xev
+		pkgs.xorg.xmodmap
+		pkgs.xorg.xkbcomp
+		pkgs.xorg.setxkbmap
+		pkgs.mssys
+		pkgs.testdisk
+		pkgs.gdb
+		pkgs.pidgin
+		pkgs.pidginotr
+		pkgs.gdmap
+		pkgs.thunderbird
+		pkgs.wv
+		pkgs.tightvnc
+		pkgs.bittornado
+		pkgs.wireshark
+		pkgs.smbfsFuse
+	];
+
+	configList = configuration : [
+	{
+		suffix = "X-vesa";
+		configuration = (configuration // 
+		{
+			boot=configuration.boot // {configurationName = "X with vesa";};
+			services = configuration.services // {
+				xserver = xConfiguration // {videoDriver = "vesa";};
+			};
+		});
+	}
+	{
+		suffix = "X-Intel";
+		configuration = (configuration // 
+		{
+			boot=configuration.boot // {configurationName = "X with Intel graphic card";};
+			services = configuration.services // {
+				xserver = xConfiguration // {videoDriver = "intel"; driSupport = true;};
+			};
+		});
+	}
+	{
+		suffix = "X-ATI";
+		configuration = (configuration // 
+		{
+			boot=configuration.boot // {configurationName = "X with ATI graphic card";};
+			services = configuration.services // {
+				xserver = xConfiguration // {videoDriver = "ati"; driSupport = true;};
+			};
+		});
+	}
+        {
+                suffix = "X-NVIDIA";
+                configuration = (configuration //
+                {
+                        boot=configuration.boot // {configurationName = "X with NVIDIA graphic card";};
+                        services = configuration.services // {
+                                xserver = xConfiguration // {videoDriver = "nvidia"; driSupport = true;};
+                        };
+                });
+        }
+	];
+}).rescueCD
diff --git a/configuration/live-dvd-X-no-soft.nix b/configuration/live-dvd-X-no-soft.nix
index 2c69051a08f..5b5c8d96829 100644
--- a/configuration/live-dvd-X-no-soft.nix
+++ b/configuration/live-dvd-X-no-soft.nix
@@ -123,5 +123,15 @@ in
 			};
 		});
 	}
+        {
+                suffix = "X-NVIDIA";
+                configuration = (configuration //
+                {
+                        boot=configuration.boot // {configurationName = "X with NVIDIA graphic card";};
+                        services = configuration.services // {
+                                xserver = xConfiguration // {videoDriver = "nvidia"; driSupport = true;};
+                        };
+                });
+        }
 	];
 }).rescueCD
diff --git a/configuration/live-dvd-X.nix b/configuration/live-dvd-X.nix
index e7b7e9b2ad3..18d0e600dd3 100644
--- a/configuration/live-dvd-X.nix
+++ b/configuration/live-dvd-X.nix
@@ -57,6 +57,15 @@ in
 	extraInitrdKernelModules = 
 		import ./moduleList.nix;
 
+	arbitraryOverrides = config : config // {
+		services = config.services // {
+			gw6c = {
+				enable = true;
+				autorun = false;
+			};
+		};
+	};
+
 	packages = pkgs : [
 		pkgs.irssi
 		pkgs.ltrace
@@ -147,6 +156,9 @@ in
 		pkgs.xorg.xmodmap
 		pkgs.xorg.xkbcomp
 		pkgs.xorg.setxkbmap
+		pkgs.mssys
+		pkgs.testdisk
+		pkgs.gdb
 
 		/*
 		pkgs.elinks
diff --git a/helpers/make-iso9660-image.sh b/helpers/make-iso9660-image.sh
index 12e2f3031ed..5ad8cb475de 100644
--- a/helpers/make-iso9660-image.sh
+++ b/helpers/make-iso9660-image.sh
@@ -57,12 +57,12 @@ for ((n = 0; n < ${#objects[*]}; n++)); do
     fi
 done
 
-cat pathlist
+cat pathlist | sed -e 's/=\(.*\)=\(.*\)=/\\=\1=\2\\=/' | tee pathlist.safer
 
 # !!! -f is a quick hack.
 ensureDir $out/iso
 genisoimage -r -J -o $out/iso/$isoName $bootFlags \
-    -hide-rr-moved -graft-points -path-list pathlist
+    -hide-rr-moved -graft-points -path-list pathlist.safer
 
 ensureDir $out/nix-support
 echo $system > $out/nix-support/system
-- 
GitLab


From 9ffb0e8ec4036b064f1d78138400f2f30f60c627 Mon Sep 17 00:00:00 2001
From: Sander van der Burg <s.vanderburg@tudelft.nl>
Date: Wed, 12 Mar 2008 10:18:11 +0000
Subject: [PATCH 0855/5331] Added bashrc files to make dircolors/prompt working
 on xterm/konsole etc.

svn path=/nixos/trunk/; revision=11072
---
 etc/default.nix | 14 +++++++++++---
 etc/profile.sh  | 19 ++-----------------
 2 files changed, 13 insertions(+), 20 deletions(-)

diff --git a/etc/default.nix b/etc/default.nix
index 0286517927a..bcd8b57fe58 100644
--- a/etc/default.nix
+++ b/etc/default.nix
@@ -32,7 +32,6 @@ import ../helpers/make-etc.nix {
   inherit (pkgs) stdenv;
 
   configFiles = [
-
     { # TCP/UDP port assignments.
       source = pkgs.iana_etc + "/etc/services";
       target = "services";
@@ -104,7 +103,12 @@ import ../helpers/make-etc.nix {
       target = "dhclient-exit-hooks";
     }
 
-    { # Script executed when the shell starts.
+    { # Script executed when the shell starts as a non-login shell (system-wide version).
+      source = ./bashrc;
+      target = "bashrc";      
+    }
+
+    { # Script executed when the shell starts as a login shell.
       source = pkgs.substituteAll {
         src = ./profile.sh;
         inherit systemPath wrapperDir modulesTree;
@@ -133,6 +137,11 @@ import ../helpers/make-etc.nix {
       target = "nix.conf"; # will be symlinked from /nix/etc/nix/nix.conf in activate-configuration.sh.
     }
 
+    { # Script executed when the shell starts as a non-login shell (user version).
+      source = ./skel/bashrc;
+      target = "skel/.bashrc";      
+    }    
+
     { # SSH configuration.  Slight duplication of the sshd_config
       # generation in the sshd service.
       source = pkgs.writeText "ssh_config" ''
@@ -145,7 +154,6 @@ import ../helpers/make-etc.nix {
       '';
       target = "ssh/ssh_config";
     }
-
   ]
 
   # Configuration for ssmtp.
diff --git a/etc/profile.sh b/etc/profile.sh
index c88d6e83f9b..9f98d4f7461 100644
--- a/etc/profile.sh
+++ b/etc/profile.sh
@@ -11,15 +11,6 @@ export INFOPATH=/var/run/current-system/sw/info:/var/run/current-system/sw/share
 export LOCATE_PATH=/var/cache/locatedb
 
 
-# A nice prompt.
-PROMPT_COLOR="1;31m"
-let $UID && PROMPT_COLOR="1;32m"
-PS1="\n\[\033[$PROMPT_COLOR\][\u@\h:\w]$\[\033[0m\] "
-if test "x$TERM" == "xxterm"; then
-    PS1="\033]2;\h:\u:\w\007$PS1"
-fi
-
-
 # Set up secure multi-user builds: non-root users build through the
 # Nix daemon.
 if test "$USER" != root; then
@@ -85,15 +76,9 @@ if test ! -e $HOME/.nix-defexpr -o -L $HOME/.nix-defexpr; then
     fi
 fi
 
+# Include bashrc settings
 
-# Some aliases.
-alias ls="ls --color=tty"
-alias ll="ls -l"
-alias which="type -p"
-
-# Help `rpcgen' find `cpp', assuming it's installed in the user's environment.
-alias rpcgen="rpcgen -Y $HOME/.nix-profile/bin"
-
+source /etc/bashrc
 
 # Read system-wide modifications.
 if test -f /etc/profile.local; then
-- 
GitLab


From 7c93a71468e7d5813e589798d515da4bc9f50bf9 Mon Sep 17 00:00:00 2001
From: Sander van der Burg <s.vanderburg@tudelft.nl>
Date: Wed, 12 Mar 2008 10:18:26 +0000
Subject: [PATCH 0856/5331] Added bashrc files to make dircolors/prompt working
 on xterm/konsole etc.

svn path=/nixos/trunk/; revision=11073
---
 etc/bashrc      | 17 +++++++++++++++++
 etc/skel/bashrc |  6 ++++++
 2 files changed, 23 insertions(+)
 create mode 100644 etc/bashrc
 create mode 100644 etc/skel/bashrc

diff --git a/etc/bashrc b/etc/bashrc
new file mode 100644
index 00000000000..4b3234d89f7
--- /dev/null
+++ b/etc/bashrc
@@ -0,0 +1,17 @@
+#!/bin/sh
+
+# A nice prompt.
+PROMPT_COLOR="1;31m"
+let $UID && PROMPT_COLOR="1;32m"
+PS1="\n\[\033[$PROMPT_COLOR\][\u@\h:\w]$\[\033[0m\] "
+if test "x$TERM" == "xxterm"; then
+    PS1="\033]2;\h:\u:\w\007$PS1"
+fi
+
+# Some aliases.
+alias ls="ls --color=tty"
+alias ll="ls -l"
+alias which="type -p"
+
+# Help `rpcgen' find `cpp', assuming it's installed in the user's environment.
+alias rpcgen="rpcgen -Y $HOME/.nix-profile/bin"
diff --git a/etc/skel/bashrc b/etc/skel/bashrc
new file mode 100644
index 00000000000..ef536c132c9
--- /dev/null
+++ b/etc/skel/bashrc
@@ -0,0 +1,6 @@
+#!/bin/sh
+
+if [ -f /etc/bashrc ]
+then
+    source /etc/bashrc
+fi
-- 
GitLab


From 1e5f26537d296a8a8a81cb3212ae3506abdc5c60 Mon Sep 17 00:00:00 2001
From: Sander van der Burg <s.vanderburg@tudelft.nl>
Date: Wed, 12 Mar 2008 11:18:43 +0000
Subject: [PATCH 0857/5331] Fixed PS1 to show a # for the root-user

svn path=/nixos/trunk/; revision=11077
---
 etc/bashrc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/etc/bashrc b/etc/bashrc
index 4b3234d89f7..1027d96e039 100644
--- a/etc/bashrc
+++ b/etc/bashrc
@@ -3,7 +3,7 @@
 # A nice prompt.
 PROMPT_COLOR="1;31m"
 let $UID && PROMPT_COLOR="1;32m"
-PS1="\n\[\033[$PROMPT_COLOR\][\u@\h:\w]$\[\033[0m\] "
+PS1="\n\[\033[$PROMPT_COLOR\][\u@\h:\w]\\$\[\033[0m\] "
 if test "x$TERM" == "xxterm"; then
     PS1="\033]2;\h:\u:\w\007$PS1"
 fi
-- 
GitLab


From 1b89e8a55ba48ed36e99f2d68d9878a1e311e405 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 12 Mar 2008 12:16:32 +0000
Subject: [PATCH 0858/5331] * Write a partial ordering of modules to
 $out/insmod-list (for when we   don't have modprobe in the initrd).

svn path=/nixos/trunk/; revision=11079
---
 helpers/modules-closure.sh | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/helpers/modules-closure.sh b/helpers/modules-closure.sh
index a9b36709607..d16ff46ecb9 100644
--- a/helpers/modules-closure.sh
+++ b/helpers/modules-closure.sh
@@ -16,22 +16,21 @@ for module in $rootModules; do
     echo "root module: $module"
     deps=$(modprobe --config /dev/null --set-version "$version" --show-depends "$module" \
         | sed 's/^insmod //')
-    for i in $deps; do echo $i; done
+    #for i in $deps; do echo $i; done
     closure="$closure $deps"
 done
 
-# Remove duplicates.
-closure=$(for i in $closure; do echo $i; done | sort | uniq)
-
 echo "closure:"
 ensureDir $out
 for module in $closure; do
-    echo $module
     target=$(echo $module | sed "s^$kernel^$out^")
+    if test -e "$target"; then continue; fi
+    echo $module
     mkdir -p $(dirname $target)
     cp $module $target
     grep "^$module" $kernel/lib/modules/$version/modules.dep \
         | sed "s^$kernel^$out^g" \
         >> $out/lib/modules/$version/modules.dep
+    echo $target >> $out/insmod-list
 done
 
-- 
GitLab


From 5005c49e45b025c92e539efcf4efbcc7c5bb9662 Mon Sep 17 00:00:00 2001
From: Sander van der Burg <s.vanderburg@tudelft.nl>
Date: Wed, 12 Mar 2008 12:21:12 +0000
Subject: [PATCH 0859/5331] Added forgotten documentRoot variable

svn path=/nixos/trunk/; revision=11081
---
 upstart-jobs/httpd.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/upstart-jobs/httpd.nix b/upstart-jobs/httpd.nix
index 1a10f5444d6..58e993a556c 100644
--- a/upstart-jobs/httpd.nix
+++ b/upstart-jobs/httpd.nix
@@ -8,6 +8,7 @@ let
   optional = pkgs.lib.optional;
 
     
+  documentRoot = cfg.documentRoot;
   hostName = cfg.hostName;
   httpPort = cfg.httpPort;
   httpsPort = cfg.httpsPort;
@@ -27,7 +28,7 @@ let
     php = if cfg.mod_php then pkgs.php else null;
     tomcat_connectors = if cfg.mod_jk.enable then pkgs.tomcat_connectors else null;
 
-    inherit hostName httpPort httpsPort
+    inherit documentRoot hostName httpPort httpsPort
       user group adminAddr logDir stateDir
       applicationMappings;
     noUserDir = !cfg.enableUserDir;
-- 
GitLab


From 8389cc378a42baa1be52a03e89f7560d099c6b7e Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 13 Mar 2008 10:15:12 +0000
Subject: [PATCH 0860/5331] * Hack: don't restart dbus automatically, it kills
 the X server.   Apparantly the cause was not the upgrade to DBus 1.1.20 but  
 something else.

svn path=/nixos/trunk/; revision=11095
---
 system/switch-to-configuration.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/system/switch-to-configuration.sh b/system/switch-to-configuration.sh
index 3fd038e20f8..e3fd59910cb 100644
--- a/system/switch-to-configuration.sh
+++ b/system/switch-to-configuration.sh
@@ -73,7 +73,7 @@ if test "$action" = "switch" -o "$action" = "test"; then
 
         # Hack: skip the sys-* and ctrl-alt-delete events.
         # Another hack: don't restart the X server (that would kill all the clients).
-        if echo "$event" | grep -q "^sys-\|^ctrl-\|^xserver"; then continue; fi
+        if echo "$event" | grep -q "^sys-\|^ctrl-\|^xserver|^dbus"; then continue; fi
     
         if ! test -e "$oldEvents/$event"; then
             echo "starting $event..."
-- 
GitLab


From 95d41d5e279ba0597262403ef73443bd4799cf54 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 13 Mar 2008 10:17:42 +0000
Subject: [PATCH 0861/5331] * Allow the location of Nixpkgs to be specified
 through $NIXPKGS. * $NIXOS_NO_PULL: changed to $NIXOS_PULL (which should be
 set to "0"   to disable pulling). * New variable $NIXOS_BUILD_NIX, which can
 be set to "0" to disable   building nixUnstable from Nixpkgs.

svn path=/nixos/trunk/; revision=11096
---
 installer/nixos-rebuild.sh | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/installer/nixos-rebuild.sh b/installer/nixos-rebuild.sh
index 6a3b3a40050..c1df6e5613c 100644
--- a/installer/nixos-rebuild.sh
+++ b/installer/nixos-rebuild.sh
@@ -24,13 +24,14 @@ if test -z "$action"; then showSyntax; fi
 
 # Allow the location of NixOS sources and the system configuration
 # file to be overridden.
-if test -z "$NIXOS"; then NIXOS=/etc/nixos/nixos; fi
-if test -z "$NIXOS_CONFIG"; then NIXOS_CONFIG=/etc/nixos/configuration.nix; fi
+NIXOS=${NIXOS:-/etc/nixos/nixos}
+NIXPKGS=${NIXPKG:-/etc/nixos/nixpkgs}
+NIXOS_CONFIG=${NIXOS_CONFIG:-/etc/nixos/configuration.nix}
 
 
 # Pull the manifests defined in the configuration (the "manifests"
 # attribute).  Wonderfully hacky.
-if test -z "$NIXOS_NO_PULL"; then
+if test "${NIXOS_PULL:-1}" != 0; then
     manifests=$(nix-instantiate --eval-only --xml --strict $NIXOS -A manifests \
         | grep '<string'  | sed 's^.*"\(.*\)".*^\1^g')
 
@@ -44,10 +45,12 @@ fi
 # First build Nix, since NixOS may require a newer version than the
 # current one.  Of course, the same goes for Nixpkgs, but Nixpkgs is
 # more conservative.
-if ! nix-build $NIXOS -A nixFallback -o $HOME/nix-tmp; then
-    nix-build /etc/nixos/nixpkgs -A nixUnstable -o $HOME/nix-tmp
+if test "${NIXOS_BUILD_NIX:-1}" != 0; then
+    if ! nix-build $NIXOS -A nixFallback -o $HOME/nix-tmp; then
+        nix-build $NIXPKGS -A nixUnstable -o $HOME/nix-tmp
+    fi
+    PATH=$HOME/nix-tmp/bin:$PATH
 fi
-PATH=$HOME/nix-tmp/bin:$PATH
 
 
 # Either upgrade the configuration in the system profile (for "switch"
-- 
GitLab


From 6c8bae53c14ac45f0ef5b4b25f34e90aa4e1454a Mon Sep 17 00:00:00 2001
From: Sander van der Burg <s.vanderburg@tudelft.nl>
Date: Fri, 14 Mar 2008 12:53:14 +0000
Subject: [PATCH 0862/5331] Added PermitRootLogin option for sshd

svn path=/nixos/trunk/; revision=11121
---
 system/options.nix       | 9 +++++++++
 upstart-jobs/default.nix | 1 +
 upstart-jobs/sshd.nix    | 9 ++++++++-
 3 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/system/options.nix b/system/options.nix
index 9b500a20e92..a5bc2f1608d 100644
--- a/system/options.nix
+++ b/system/options.nix
@@ -797,6 +797,15 @@
         ";
       };
 
+      permitRootLogin = mkOption {
+        default = "yes";
+	description = "
+	  Whether the root user can login using ssh. Valid options
+	  are <command>yes</command>, <command>without-password</command>,
+	  <command>forced-commands-only</command> or
+	  <command>no</command>
+	";
+      };
     };
 
     lshd = {
diff --git a/upstart-jobs/default.nix b/upstart-jobs/default.nix
index fd132621b82..708e14d2894 100644
--- a/upstart-jobs/default.nix
+++ b/upstart-jobs/default.nix
@@ -137,6 +137,7 @@ let
       inherit nssModulesPath;
       forwardX11 = config.services.sshd.forwardX11;
       allowSFTP = config.services.sshd.allowSFTP;
+      permitRootLogin = config.services.sshd.permitRootLogin;
     })
 
   # GNU lshd SSH2 deamon.
diff --git a/upstart-jobs/sshd.nix b/upstart-jobs/sshd.nix
index be58b91351f..f8a2f46646f 100644
--- a/upstart-jobs/sshd.nix
+++ b/upstart-jobs/sshd.nix
@@ -1,8 +1,13 @@
 { writeText, openssh, glibc, xauth
 , nssModulesPath
-, forwardX11, allowSFTP
+, forwardX11, allowSFTP, permitRootLogin
 }:
 
+assert permitRootLogin == "yes" ||
+       permitRootLogin == "without-password" ||
+       permitRootLogin == "forced-commands-only" ||
+       permitRootLogin == "no";
+       
 let
 
   sshdConfig = writeText "sshd_config" ''
@@ -21,6 +26,8 @@ let
     " else "
     "}
     
+    PermitRootLogin ${permitRootLogin}
+    
   '';
 
   sshdUid = (import ../system/ids.nix).uids.sshd;
-- 
GitLab


From 522939961785cd611ad1e7195af6bce154706bc6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Fri, 14 Mar 2008 13:10:30 +0000
Subject: [PATCH 0863/5331] setuid-wrapper: Disallow empty `.real' files.

svn path=/nixos/trunk/; revision=11122
---
 helpers/setuid/setuid-wrapper.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/helpers/setuid/setuid-wrapper.c b/helpers/setuid/setuid-wrapper.c
index 30452fc7b7b..32965d40c11 100644
--- a/helpers/setuid/setuid-wrapper.c
+++ b/helpers/setuid/setuid-wrapper.c
@@ -63,6 +63,7 @@ int main(int argc, char * * argv)
     len = read(fdSelf, real, PATH_MAX);
     assert (len != -1);
     assert (len < sizeof (real));
+    assert (len > 0);
     real[len] = 0;
 
     close(fdSelf);
-- 
GitLab


From cf16b3acfea8e6662ec47a3edd404e3e386559f0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Sat, 15 Mar 2008 23:40:44 +0000
Subject: [PATCH 0864/5331] Add `portmap' job.

svn path=/nixos/trunk/; revision=11140
---
 system/ids.nix           |  2 ++
 system/options.nix       | 12 ++++++++++++
 upstart-jobs/default.nix |  6 ++++++
 upstart-jobs/portmap.nix | 35 +++++++++++++++++++++++++++++++++++
 4 files changed, 55 insertions(+)
 create mode 100644 upstart-jobs/portmap.nix

diff --git a/system/ids.nix b/system/ids.nix
index fee56a5303b..73fa8c8a0bb 100644
--- a/system/ids.nix
+++ b/system/ids.nix
@@ -12,6 +12,7 @@
     ftp = 8;
     bitlbee = 9;
     avahi = 10;
+    portmap = 11;
 
     nixbld = 30000; # start of range of uids
     nobody = 65534;
@@ -24,6 +25,7 @@
     vsftpd = 7;
     ftp = 8;
     avahi = 10;
+    portmap = 11;
     audio = 17;
 
     users = 100;
diff --git a/system/options.nix b/system/options.nix
index a5bc2f1608d..098f28848c8 100644
--- a/system/options.nix
+++ b/system/options.nix
@@ -923,6 +923,18 @@
 
     };
 
+    portmap = {
+
+      enable = mkOption {
+        default = false;
+	description = ''
+	  Whether to enable `portmap', an ONC RPC directory service
+	  notably used by NFS and NIS, and which can be queried
+	  using the rpcinfo(1) command.
+	'';
+      };
+    };
+
     avahi = {
 
       enable = mkOption {
diff --git a/upstart-jobs/default.nix b/upstart-jobs/default.nix
index 708e14d2894..1cb50903005 100644
--- a/upstart-jobs/default.nix
+++ b/upstart-jobs/default.nix
@@ -158,6 +158,12 @@ let
       servers = config.services.ntp.servers;
     })
 
+  # portmap daemon.
+  ++ optional config.services.portmap.enable
+    (import ../upstart-jobs/portmap.nix {
+      inherit (pkgs) makePortmap;
+     })
+
   # Avahi daemon.
   ++ optional config.services.avahi.enable
     (import ../upstart-jobs/avahi-daemon.nix {
diff --git a/upstart-jobs/portmap.nix b/upstart-jobs/portmap.nix
new file mode 100644
index 00000000000..18ff06dc1af
--- /dev/null
+++ b/upstart-jobs/portmap.nix
@@ -0,0 +1,35 @@
+{ makePortmap }:
+
+let uid = (import ../system/ids.nix).uids.portmap;
+    gid = (import ../system/ids.nix).gids.portmap;
+in
+{
+  name = "portmap";
+  
+  users = [
+    { name = "portmap";
+      inherit uid;
+      description = "portmap daemon user";
+      home = "/var/empty";
+    }
+  ];
+
+  groups = [
+    { name = "portmap";
+      inherit gid;
+    }
+  ];
+
+  job =
+    let portmap = makePortmap { daemonUID = uid; daemonGID = gid; };
+    in
+       ''
+description "ONC RPC portmap"
+
+start on network-interfaces/started
+stop on network-interfaces/stop
+
+respawn ${portmap}/sbin/portmap
+'';
+  
+}
-- 
GitLab


From 40d9d628790f0e1fee9666dd4e22cd8420f558cd Mon Sep 17 00:00:00 2001
From: Marc Weber <marco-oweber@gmx.de>
Date: Sun, 16 Mar 2008 01:05:40 +0000
Subject: [PATCH 0865/5331] added mkOption extraConfig for httpd apache service
     ( added \n in config concatenation as well ) added serviceProposal,
 examples see upstart-jobs/newProposal/*.nix   enhancement: everything
 belonging to one job is within the same file   (was:
 upstart-jobs/default.nix, options.nix and the job file)   drawback: options
 won't be included within the manual             (can be fixed see comments in
 options.nix)   comment: looking at the funtion newProposalJobs maybe it's
 overkill?            Hope it pays off if we start having dozens of small
 different services..

svn path=/nixos/trunk/; revision=11141
---
 system/options.nix       | 15 ++++++++++
 system/system.nix        |  2 +-
 upstart-jobs/default.nix | 64 ++++++++++++++++++++++++++++++++++++++--
 upstart-jobs/httpd.nix   |  2 +-
 4 files changed, 78 insertions(+), 5 deletions(-)

diff --git a/system/options.nix b/system/options.nix
index 098f28848c8..409cbba3906 100644
--- a/system/options.nix
+++ b/system/options.nix
@@ -543,6 +543,14 @@
     ";
   };
 
+  servicesProposal = {
+    # see upstart-jobs/default.nix 
+    # the option declarations can be found in the upstart-jobs/newProposal/*.nix files
+    # one way to include the declarations here is adding kind of glob "*.nix"
+    # file function to builtins to get all jobs
+    # then the checking in upstart-jobs/default.nix can be removed again (together with passing arg optionDeclarations)
+  };
+
 
   services = {
 
@@ -1359,6 +1367,13 @@
         ";
       };
 
+      extraConfig = mkOption {
+        default = "";
+        description = "
+          These configuration lines will be passed verbatim to the apache config
+        ";
+      };
+
       logPerVirtualHost = mkOption {
         default = false;
         description = "
diff --git a/system/system.nix b/system/system.nix
index b1a2a91d3f1..d6ea63aee57 100644
--- a/system/system.nix
+++ b/system/system.nix
@@ -170,7 +170,7 @@ rec {
               
   # The services (Upstart) configuration for the system.
   upstartJobs = import ../upstart-jobs/default.nix {
-    inherit config pkgs nix modprobe nssModulesPath nixEnvVars;
+    inherit config pkgs nix modprobe nssModulesPath nixEnvVars optionDeclarations;
   };
 
 
diff --git a/upstart-jobs/default.nix b/upstart-jobs/default.nix
index 1cb50903005..7c855c9485f 100644
--- a/upstart-jobs/default.nix
+++ b/upstart-jobs/default.nix
@@ -1,4 +1,4 @@
-{config, pkgs, nix, modprobe, nssModulesPath, nixEnvVars}:
+{config, pkgs, nix, modprobe, nssModulesPath, nixEnvVars, optionDeclarations}:
 
 let 
 
@@ -13,8 +13,66 @@ let
     ++ config.boot.extraTTYs
     ++ [config.services.syslogd.tty];
 
+  # looks for a job file foreach attr name found in services from config
+  # passes { thisConfig, config, pkgs }
+  # a job must return { options = {}; job =; }
+  # options is the same format as options.nix, but only contains documentation for this job
+  # TODO check validation
+  newProposalJobs =
+  __trace (pkgs.lib.whatis config) ( 
+  let
+    inherit (pkgs.lib) getAttr; 
+    inherit (builtins) attrNames pathExists map;
+    services = pkgs.lib.traceWhatis ( getAttr [ "servicesProposal" ] {} config);
+    nameToJobs = name : (
+      __trace ("name : ${name}") (
+      let p = ./newProposal + "/${name}.nix";
+          p2 = ./newProposal + "/${name}/default.nix";
+          thisConfig = getAttr [ name ] {} services;
+          path = [name];
+          args = confgiV : {
+            inherit config pkgs thisConfig path;
+            lib = pkgs.lib;
+            upstartHelpers = { # some useful functions 
+              inherit configV; # the first time a error function is passed to get the option list
+                               # the second time a function is passed getting the option for you automatically,
+                               # either returning the default option or the user supplied value (the function apply is applied when given)
+                               # maybe this is complicated, but easy to use (IMHO)
+              mkOption = pkgs.lib.mkOption; # the same function used in options.nix
+              autoGeneratedEtcFile = { name, commentChar ? "#", content } :
+                 { source = pkgs.writeText name 
+                     ("${commentChar} nixos autogenerated etc file based on /etc/nixos/configuration.nix\n" + content);
+                   target = name;
+                 };
+            };
+          };
+          jobFunc = if pathExists p  
+                    then import p
+                    else if pathExists p2 then import p2 
+                        else abort "service ${name} requested but there is no ${p}.nix or ${p}/default.nix file!";
+          options = (jobFunc (args (abort "you can't use configV within options!"))).options;
+          errorWhere = "${name} of service ${builtins.toString path}";
+          configV = name : if (__hasAttr name options ) then
+                             let opt = (__getAttr name options ); # this config option description
+                             in if (__hasAttr name thisConfig )
+                                then let v = (__getAttr name thisConfig); in if opt ? apply then opt.apply v else v
+                                else if opt ? default then opt.default else abort "you need to specify the configuration option ${errorWhere}"
+                           else abort "unkown option ${errorWhere}";
+          checkConfig = (pkgs.lib.getAttr ["environment" "checkConfigurationOptions"] 
+                  optionDeclarations.environment.checkConfigurationOptions.default
+                  config);
+      in # TODO: pass path to checker so it can show full path in the abort case
+          pkgs.checker ( (jobFunc (args configV)).jobs )
+                      checkConfig
+                      options
+                      thisConfig
+
+      ));
+  in pkgs.lib.concatLists ( map nameToJobs (attrNames services)));
     
-  jobs = map makeJob [
+  jobs = map makeJob
+    ( newProposalJobs ++ 
+    [
     # Syslogd.
     (import ../upstart-jobs/syslogd.nix {
       inherit (pkgs) sysklogd;
@@ -107,7 +165,7 @@ let
     # Ctrl-alt-delete action.
     (import ../upstart-jobs/ctrl-alt-delete.nix)
 
-  ]
+  ])
 
   # DHCP client.
   ++ optional config.networking.useDHCP
diff --git a/upstart-jobs/httpd.nix b/upstart-jobs/httpd.nix
index 58e993a556c..45ac26610e6 100644
--- a/upstart-jobs/httpd.nix
+++ b/upstart-jobs/httpd.nix
@@ -32,7 +32,7 @@ let
       user group adminAddr logDir stateDir
       applicationMappings;
     noUserDir = !cfg.enableUserDir;
-    extraDirectories = extraConfig + cfg.extraConfig;
+    extraDirectories = extraConfig + "\n" + cfg.extraConfig;
     
     subServices =
     
-- 
GitLab


From e4757b33b129298701a5527286a4ad5554bef929 Mon Sep 17 00:00:00 2001
From: Marc Weber <marco-oweber@gmx.de>
Date: Sun, 16 Mar 2008 11:03:03 +0000
Subject: [PATCH 0866/5331] removed trace lines, Thanks raskin

svn path=/nixos/trunk/; revision=11144
---
 upstart-jobs/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/upstart-jobs/default.nix b/upstart-jobs/default.nix
index 7c855c9485f..09ecf3d6b54 100644
--- a/upstart-jobs/default.nix
+++ b/upstart-jobs/default.nix
@@ -19,13 +19,13 @@ let
   # options is the same format as options.nix, but only contains documentation for this job
   # TODO check validation
   newProposalJobs =
-  __trace (pkgs.lib.whatis config) ( 
+  (
   let
     inherit (pkgs.lib) getAttr; 
     inherit (builtins) attrNames pathExists map;
-    services = pkgs.lib.traceWhatis ( getAttr [ "servicesProposal" ] {} config);
+    services = getAttr [ "servicesProposal" ] {} config;
     nameToJobs = name : (
-      __trace ("name : ${name}") (
+      (
       let p = ./newProposal + "/${name}.nix";
           p2 = ./newProposal + "/${name}/default.nix";
           thisConfig = getAttr [ name ] {} services;
-- 
GitLab


From 465a66ab3f5b571ff39381647c1113063f9b86dc Mon Sep 17 00:00:00 2001
From: Marc Weber <marco-oweber@gmx.de>
Date: Sun, 16 Mar 2008 15:52:52 +0000
Subject: [PATCH 0867/5331] renamed newProposal directory added two example
 jobs

svn path=/nixos/trunk/; revision=11146
---
 upstart-jobs/default.nix               |  4 +-
 upstart-jobs/new-proposal/synergyc.nix | 31 ++++++++++++
 upstart-jobs/new-proposal/synergys.nix | 69 ++++++++++++++++++++++++++
 3 files changed, 102 insertions(+), 2 deletions(-)
 create mode 100644 upstart-jobs/new-proposal/synergyc.nix
 create mode 100644 upstart-jobs/new-proposal/synergys.nix

diff --git a/upstart-jobs/default.nix b/upstart-jobs/default.nix
index 09ecf3d6b54..9e2b8281fd8 100644
--- a/upstart-jobs/default.nix
+++ b/upstart-jobs/default.nix
@@ -26,8 +26,8 @@ let
     services = getAttr [ "servicesProposal" ] {} config;
     nameToJobs = name : (
       (
-      let p = ./newProposal + "/${name}.nix";
-          p2 = ./newProposal + "/${name}/default.nix";
+      let p = ./new-proposal + "/${name}.nix";
+          p2 = ./new-proposal + "/${name}/default.nix";
           thisConfig = getAttr [ name ] {} services;
           path = [name];
           args = confgiV : {
diff --git a/upstart-jobs/new-proposal/synergyc.nix b/upstart-jobs/new-proposal/synergyc.nix
new file mode 100644
index 00000000000..bc880dbdc2c
--- /dev/null
+++ b/upstart-jobs/new-proposal/synergyc.nix
@@ -0,0 +1,31 @@
+{ path, thisConfig, config, lib, pkgs, upstartHelpers } : with upstartHelpers; {
+  options = {
+    description = "synergy client lets you use a shared keyboard, mouse and clipboard";
+    screenName = mkOption {
+      default = "";
+      description = " 
+        use screen-name instead the hostname to identify
+        ourselfs to the server.
+        ";
+      apply = x: "-n '${x}'";
+    };
+    address = mkOption {
+      default = "";
+      description = "server address to connect to";
+    };
+  };
+  jobs = [ ( rec {
+    name = "synergyc";
+
+    # TODO start only when X Server has started as well
+    job = "
+description \"${name}\"
+
+start on network-interfaces/started
+stop on network-interfaces/stop
+
+exec ${pkgs.synergy}/bin/synergyc -f ${configV "adress"} ${configV "screenName"}
+  ";
+  
+} ) ];
+}
diff --git a/upstart-jobs/new-proposal/synergys.nix b/upstart-jobs/new-proposal/synergys.nix
new file mode 100644
index 00000000000..8c320a07d6f
--- /dev/null
+++ b/upstart-jobs/new-proposal/synergys.nix
@@ -0,0 +1,69 @@
+{ path, thisConfig, config, lib, pkgs, upstartHelpers } : with upstartHelpers; {
+  options = {
+    description = "synergy client lets you use a shared keyboard, mouse and clipboard";
+
+    configuration = mkOption {
+      description = "
+        The synergy server configuration file
+      ";
+    };
+    screenName = mkOption {
+      default = "";
+      description = " 
+        use screen-name instead the hostname to identify
+        this screen in the configuration.
+        ";
+      apply = x: "-n '${x}'";
+    };
+    address = mkOption {
+      default = "";
+      description = "listen for clients on the given address";
+      apply = x: "-a '${x}'";
+    };
+  };
+
+  jobs =
+    [ ( rec {
+      name = "synergys";
+
+      extraEtc = [ (autoGeneratedEtcFile { name = name + ".conf"; content = thisConfig.configuration; }) ];
+
+      # TODO start only when X Server has started as well
+  job = "
+description \"${name}\"
+
+start on network-interfaces/started and xserver/started
+stop on network-interfaces/stop or xserver/stop
+
+exec ${pkgs.synergy}/bin/synergys -c /etc/${name}.conf -f ${configV "address"} ${configV "screenName"}
+  ";
+  
+} ) ];
+}
+
+/* Example configuration
+
+section: screens
+  laptop:
+  dm:
+  win:
+end
+section: aliases
+    laptop: 
+      192.168.5.5
+    dm:
+      192.168.5.78
+    win:
+      192.168.5.54
+end
+section: links
+   laptop:
+       left = dm
+   dm:
+       right = laptop
+       left = win
+  win:
+      right = dm
+end
+
+*/
-- 
GitLab


From 5568ef6e8d4363ea76ff03862fa78d763afea87e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Mon, 17 Mar 2008 10:11:48 +0000
Subject: [PATCH 0868/5331] activate-configuration: Report it if a setuid
 program was not found.

svn path=/nixos/trunk/; revision=11152
---
 system/activate-configuration.sh | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/system/activate-configuration.sh b/system/activate-configuration.sh
index 1e2eb44acad..e2e6ddcbbb6 100644
--- a/system/activate-configuration.sh
+++ b/system/activate-configuration.sh
@@ -135,6 +135,15 @@ mkdir -p $wrapperDir
 for i in @setuidPrograms@; do
     program=$(type -tp $i)
     cp "$(type -tp setuid-wrapper)" $wrapperDir/$i
+
+    if [ -z "$program" ]
+    then
+	# XXX: It would be preferable to detect this problem before
+	# `activate-configuration' is invoked.
+	echo "WARNING: No executable named \`$i' was found" >&2
+	echo "WARNING: but \`$i' was specified as a setuid program." >&2
+    fi
+
     echo -n $program > $wrapperDir/$i.real
     chown root.root $wrapperDir/$i
     chmod 4755 $wrapperDir/$i
-- 
GitLab


From 6354623143d6a79cb463c720527acb9e2ae3e4ce Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Mon, 17 Mar 2008 10:31:40 +0000
Subject: [PATCH 0869/5331] Add known setuid programs to the `path' variable
 passed to `activate-configuration'.

This is really a hack since programs not known to `system.nix' will not be in the path
of `activate-configuration', which consequently creates empty `.real' files under
`/var/setuid-wrappers'.  I don't know what the best way to address this is: let admins
write `.real' files by hand?  Add a `setuidPackages' attribute, listing the names of
packages that contain the binaries listed in `setuidPrograms'?

svn path=/nixos/trunk/; revision=11153
---
 system/system.nix | 19 ++++++++++++++-----
 1 file changed, 14 insertions(+), 5 deletions(-)

diff --git a/system/system.nix b/system/system.nix
index d6ea63aee57..87792041295 100644
--- a/system/system.nix
+++ b/system/system.nix
@@ -284,7 +284,7 @@ rec {
   # The script that activates the configuration, i.e., it sets up
   # /etc, accounts, etc.  It doesn't do anything that can only be done
   # at boot time (such as start `init').
-  activateConfiguration = pkgs.substituteAll {
+  activateConfiguration = pkgs.substituteAll rec {
     src = ./activate-configuration.sh;
     isExecutable = true;
 
@@ -298,10 +298,19 @@ rec {
     inherit (usersGroups) createUsersGroups usersList groupsList;
 
     path = [
-      pkgs.coreutils pkgs.gnugrep pkgs.findutils
-      pkgs.glibc # needed for getent
-      pkgs.pwdutils
-    ];
+        pkgs.coreutils pkgs.gnugrep pkgs.findutils
+        pkgs.glibc # needed for getent
+        pkgs.pwdutils
+      ]
+
+      # XXX: Hack to recognize common setuid programs.
+      ++ pkgs.lib.optional (pkgs.lib.any (x: x == "xlock") setuidPrograms)
+                           pkgs.xlockmore
+      ++ pkgs.lib.optional (pkgs.lib.any (x: x == "xscreensaver")
+                                         setuidPrograms)
+                           pkgs.xscreensaver
+      ++ pkgs.lib.optional (pkgs.lib.any (x: x == "xlaunch") setuidPrograms)
+                           pkgs.xlaunch;
 
     bash = pkgs.bashInteractive;
   };
-- 
GitLab


From 52aed402db97aa644b13ca6979286cbf82e63d55 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 17 Mar 2008 10:51:09 +0000
Subject: [PATCH 0870/5331] * Moved to Nixpkgs.

svn path=/nixos/trunk/; revision=11155
---
 boot/make-initrd.nix           | 31 ----------------
 boot/make-initrd.sh            | 39 -------------------
 helpers/make-iso9660-image.nix |  2 +-
 helpers/modules-closure.nix    | 13 -------
 helpers/modules-closure.sh     | 36 ------------------
 helpers/paths-from-graph.pl    | 68 ----------------------------------
 installer/default.nix          |  2 +-
 system/system.nix              | 16 ++++----
 8 files changed, 9 insertions(+), 198 deletions(-)
 delete mode 100644 boot/make-initrd.nix
 delete mode 100644 boot/make-initrd.sh
 delete mode 100644 helpers/modules-closure.nix
 delete mode 100644 helpers/modules-closure.sh
 delete mode 100644 helpers/paths-from-graph.pl

diff --git a/boot/make-initrd.nix b/boot/make-initrd.nix
deleted file mode 100644
index 3e5133be08b..00000000000
--- a/boot/make-initrd.nix
+++ /dev/null
@@ -1,31 +0,0 @@
-# Create an initial ramdisk containing the closure of the specified
-# file system objects.  An initial ramdisk is used during the initial
-# stages of booting a Linux system.  It is loaded by the boot loader
-# along with the kernel image.  It's supposed to contain everything
-# (such as kernel modules) necessary to allow us to mount the root
-# file system.  Once the root file system is mounted, the `real' boot
-# script can be called.
-#
-# An initrd is really just a gzipped cpio archive.
-#
-# Symlinks are created for each top-level file system object.  E.g.,
-# `contents = {object = ...; symlink = /init;}' is a typical
-# argument.
-
-{stdenv, perl, cpio, contents}:
-
-stdenv.mkDerivation {
-  name = "initrd";
-  builder = ./make-initrd.sh;
-  buildInputs = [perl cpio];
-
-  # !!! should use XML.
-  objects = map (x: x.object) contents;
-  symlinks = map (x: x.symlink) contents;
-  suffices = map (x: if x ? suffix then x.suffix else "none") contents;
-  
-  # For obtaining the closure of `contents'.
-  exportReferencesGraph =
-    map (x: [("closure-" + baseNameOf x.symlink) x.object]) contents;
-  pathsFromGraph = ../helpers/paths-from-graph.pl;
-}
diff --git a/boot/make-initrd.sh b/boot/make-initrd.sh
deleted file mode 100644
index d930e51a03f..00000000000
--- a/boot/make-initrd.sh
+++ /dev/null
@@ -1,39 +0,0 @@
-source $stdenv/setup
-
-set -o pipefail
-
-objects=($objects)
-symlinks=($symlinks)
-suffices=($suffices)
-
-mkdir root
-
-# Needed for splash_helper, which gets run before init.
-mkdir root/dev
-mkdir root/sys
-mkdir root/proc
-
-
-for ((n = 0; n < ${#objects[*]}; n++)); do
-    object=${objects[$n]}
-    symlink=${symlinks[$n]}
-    suffix=${suffices[$n]}
-    if test "$suffix" = none; then suffix=; fi
-
-    mkdir -p $(dirname root/$symlink)
-    ln -s $object$suffix root/$symlink
-done
-
-
-# Get the paths in the closure of `object'.
-storePaths=$(perl $pathsFromGraph closure-*)
-
-
-# Paths in cpio archives *must* be relative, otherwise the kernel
-# won't unpack 'em.
-(cd root && cp -prd --parents $storePaths .)
-
-
-# Put the closure in a gzipped cpio archive.
-ensureDir $out
-(cd root && find * -print0 | cpio -ov -H newc --null | gzip -9 > $out/initrd)
diff --git a/helpers/make-iso9660-image.nix b/helpers/make-iso9660-image.nix
index c4ddfe6bceb..d2ecf5e1a90 100644
--- a/helpers/make-iso9660-image.nix
+++ b/helpers/make-iso9660-image.nix
@@ -48,5 +48,5 @@ stdenv.mkDerivation {
     map (x: [("closure-" + baseNameOf x.object) x.object]) storeContents;
   exportBuildReferencesGraph =
     map (x: [("closure-build-" + baseNameOf x.object) x.object]) buildStoreContents;
-  pathsFromGraph = ./paths-from-graph.pl;
+  pathsFromGraph = ../../nixpkgs/pkgs/build-support/kernel/paths-from-graph.pl;
 }
diff --git a/helpers/modules-closure.nix b/helpers/modules-closure.nix
deleted file mode 100644
index 86015a8b182..00000000000
--- a/helpers/modules-closure.nix
+++ /dev/null
@@ -1,13 +0,0 @@
-# Given a kernel build (with modules in $kernel/lib/modules/VERSION),
-# produce a module tree in $out/lib/modules/VERSION that contains only
-# the modules identified by `rootModules', plus their dependencies.
-# Also generate an appropriate modules.dep.
-
-{stdenv, kernel, rootModules, module_init_tools}:
-
-stdenv.mkDerivation {
-  name = kernel.name + "-shrunk";
-  builder = ./modules-closure.sh;
-  inherit kernel rootModules module_init_tools;
-  allowedReferences = ["out"];
-}
diff --git a/helpers/modules-closure.sh b/helpers/modules-closure.sh
deleted file mode 100644
index d16ff46ecb9..00000000000
--- a/helpers/modules-closure.sh
+++ /dev/null
@@ -1,36 +0,0 @@
-source $stdenv/setup
-
-set -o pipefail
-
-PATH=$module_init_tools/sbin:$PATH
-
-version=$(cd $kernel/lib/modules && ls -d *)
-
-echo "kernel version is $version"
-
-export MODULE_DIR=$kernel/lib/modules/
-
-# Determine the dependencies of each root module.
-closure=
-for module in $rootModules; do
-    echo "root module: $module"
-    deps=$(modprobe --config /dev/null --set-version "$version" --show-depends "$module" \
-        | sed 's/^insmod //')
-    #for i in $deps; do echo $i; done
-    closure="$closure $deps"
-done
-
-echo "closure:"
-ensureDir $out
-for module in $closure; do
-    target=$(echo $module | sed "s^$kernel^$out^")
-    if test -e "$target"; then continue; fi
-    echo $module
-    mkdir -p $(dirname $target)
-    cp $module $target
-    grep "^$module" $kernel/lib/modules/$version/modules.dep \
-        | sed "s^$kernel^$out^g" \
-        >> $out/lib/modules/$version/modules.dep
-    echo $target >> $out/insmod-list
-done
-
diff --git a/helpers/paths-from-graph.pl b/helpers/paths-from-graph.pl
deleted file mode 100644
index 43ce4e68db4..00000000000
--- a/helpers/paths-from-graph.pl
+++ /dev/null
@@ -1,68 +0,0 @@
-use strict;
-use File::Basename;
-
-my %storePaths;
-my %refs;
-
-foreach my $graph (@ARGV) {
-    open GRAPH, "<$graph" or die;
-
-    while (<GRAPH>) {
-        chomp;
-        my $storePath = "$_";
-        $storePaths{$storePath} = 1;
-
-        my $deriver = <GRAPH>; chomp $deriver;
-        my $count = <GRAPH>; chomp $count;
-
-        my @refs = ();
-        for (my $i = 0; $i < $count; ++$i) {
-            my $ref = <GRAPH>; chomp $ref;
-            push @refs, $ref;
-        }
-        $refs{$storePath} = \@refs;
-        
-    }
-    
-    close GRAPH;
-}
-
-
-if ($ENV{"printManifest"} eq "1") {
-    print "version {\n";
-    print "  ManifestVersion: 3\n";
-    print "}\n";
-
-    foreach my $storePath (sort (keys %storePaths)) {
-        my $base = basename $storePath;
-        print "localPath {\n";
-        print "  StorePath: $storePath\n";
-        print "  CopyFrom: /tmp/inst-store/$base\n";
-        print "  References: ";
-        foreach my $ref (@{$refs{$storePath}}) {
-            print "$ref ";
-        }
-        print "\n";
-        print "}\n";
-    }
-}
-
-elsif ($ENV{"printRegistration"} eq "1") {
-    # This is the format used by `nix-store --register-validity
-    # --hash-given' / `nix-store --load-db'.
-    foreach my $storePath (sort (keys %storePaths)) {
-        print "$storePath\n";
-        print "0000000000000000000000000000000000000000000000000000000000000000\n"; # !!! fix
-        print "\n"; # don't care about preserving the deriver
-        print scalar(@{$refs{$storePath}}), "\n";
-        foreach my $ref (@{$refs{$storePath}}) {
-            print "$ref\n";
-        }
-    }
-}
-
-else {
-    foreach my $storePath (sort (keys %storePaths)) {
-        print "$storePath\n";
-    }
-}
diff --git a/installer/default.nix b/installer/default.nix
index 617210f4487..2196890f842 100644
--- a/installer/default.nix
+++ b/installer/default.nix
@@ -19,7 +19,7 @@ in
     inherit nix;
     nixpkgsURL = config.installer.nixpkgsURL;
 
-    pathsFromGraph = ../helpers/paths-from-graph.pl;
+    pathsFromGraph = ../../nixpkgs/pkgs/build-support/kernel/paths-from-graph.pl;
 
     nixClosure = pkgs.runCommand "closure"
       {exportReferencesGraph = ["refs" nix];}
diff --git a/system/system.nix b/system/system.nix
index 87792041295..24806222772 100644
--- a/system/system.nix
+++ b/system/system.nix
@@ -41,8 +41,7 @@ rec {
 
 
   # Determine the set of modules that we need to mount the root FS.
-  modulesClosure = import ../helpers/modules-closure.nix {
-    inherit (pkgs) stdenv module_init_tools;
+  modulesClosure = pkgs.makeModulesClosure {
     inherit rootModules;
     kernel = modulesTree;
   };
@@ -60,9 +59,9 @@ rec {
       lvm2 = if config.boot.initrd.lvm then pkgs.lvm2Static else null;
       allowedReferences = []; # prevent accidents like glibc being included in the initrd
     }
-    "
+    ''
       ensureDir $out/bin
-      if test -n \"$devicemapper\"; then
+      if test -n "$devicemapper"; then
         cp $devicemapper/sbin/dmsetup.static $out/bin/dmsetup
         cp $lvm2/sbin/lvm.static $out/bin/lvm
       fi
@@ -70,7 +69,7 @@ rec {
       cp -p $e2fsprogs/sbin/fsck* $e2fsprogs/sbin/e2fsck $out/bin
       cp $udev/sbin/udevd $udev/sbin/udevtrigger $udev/sbin/udevsettle $out/bin
       nuke-refs $out/bin/*
-    ";
+    '';
   
 
   # The init script of boot stage 1 (loading kernel modules for
@@ -95,17 +94,16 @@ rec {
 
   # The closure of the init script of boot stage 1 is what we put in
   # the initial RAM disk.
-  initialRamdisk = import ../boot/make-initrd.nix {
-    inherit (pkgs) perl stdenv cpio;
+  initialRamdisk = pkgs.makeInitrd {
     contents = [
       { object = bootStage1;
         symlink = "/init";
       }
     ] ++ (if config.boot.initrd.enableSplashScreen then [
-      { object = pkgs.runCommand "splashutils" {} "
+      { object = pkgs.runCommand "splashutils" {} ''
           ensureDir $out/bin
           cp ${pkgs.splashutils}/bin/splash_helper $out/bin
-        ";
+        '';
         suffix = "/bin/splash_helper";
         symlink = "/sbin/splash_helper";
       }
-- 
GitLab


From 7390b6e5bd1a32a145d7095bb67b31c9b1f2586c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Mon, 17 Mar 2008 12:33:21 +0000
Subject: [PATCH 0871/5331] Build `/etc/rpc' from Glibc, used by `rpcinfo(1)',
 for instance.

svn path=/nixos/trunk/; revision=11159
---
 etc/default.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/etc/default.nix b/etc/default.nix
index bcd8b57fe58..244f32fb5df 100644
--- a/etc/default.nix
+++ b/etc/default.nix
@@ -42,6 +42,11 @@ import ../helpers/make-etc.nix {
       target = "protocols";
     }
 
+    { # RPC program numbers.
+      source = pkgs.glibc + "/etc/rpc";
+      target = "rpc";
+    }
+
     { # Hostname-to-IP mappings.
       source = pkgs.substituteAll {
         src = ./hosts;
-- 
GitLab


From d1f29d328d16885187579c575d4ba1f3059d6094 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Mon, 17 Mar 2008 13:58:57 +0000
Subject: [PATCH 0872/5331] Add support for `nss-mdns'.

Currently, the solution is a bit hackish since running applications
will not work after a `nixos-rebuild' because `libnss_mdns' is not
in their `LD_LIBRARY_PATH'.

svn path=/nixos/trunk/; revision=11162
---
 etc/default.nix        |  8 +++++---
 etc/nsswitch-mdns.conf | 11 +++++++++++
 etc/profile.sh         |  1 +
 system/options.nix     | 15 +++++++++++++++
 system/system.nix      |  7 +++++--
 5 files changed, 37 insertions(+), 5 deletions(-)
 create mode 100644 etc/nsswitch-mdns.conf

diff --git a/etc/default.nix b/etc/default.nix
index 244f32fb5df..e8b44f553b9 100644
--- a/etc/default.nix
+++ b/etc/default.nix
@@ -1,5 +1,5 @@
 { config, pkgs, upstartJobs, systemPath, wrapperDir
-, defaultShell, extraEtc, nixEnvVars, modulesTree
+, defaultShell, extraEtc, nixEnvVars, modulesTree, nssModulesPath
 }:
 
 let 
@@ -56,7 +56,9 @@ import ../helpers/make-etc.nix {
     }
 
     { # Name Service Switch configuration file.  Required by the C library.
-      source = ./nsswitch.conf;
+      source = if config.services.avahi.nssmdns
+               then (assert config.services.avahi.enable; ./nsswitch-mdns.conf)
+	       else ./nsswitch.conf;
       target = "nsswitch.conf";
     }
 
@@ -116,7 +118,7 @@ import ../helpers/make-etc.nix {
     { # Script executed when the shell starts as a login shell.
       source = pkgs.substituteAll {
         src = ./profile.sh;
-        inherit systemPath wrapperDir modulesTree;
+        inherit systemPath wrapperDir modulesTree nssModulesPath;
         inherit (pkgs) glibc;
         timeZone = config.time.timeZone;
         defaultLocale = config.i18n.defaultLocale;
diff --git a/etc/nsswitch-mdns.conf b/etc/nsswitch-mdns.conf
new file mode 100644
index 00000000000..eefbd0c4203
--- /dev/null
+++ b/etc/nsswitch-mdns.conf
@@ -0,0 +1,11 @@
+# NSS configuration files with mDNS enabled (requires running Avahi daemon).
+
+passwd:         ldap files
+group:          ldap files
+shadow:         ldap files
+
+hosts:          files mdns4_minimal [NOTFOUND=return] dns mdns4
+networks:       files dns
+
+services:       files
+protocols:      files
diff --git a/etc/profile.sh b/etc/profile.sh
index 9f98d4f7461..2aed1f949f4 100644
--- a/etc/profile.sh
+++ b/etc/profile.sh
@@ -1,4 +1,5 @@
 export PATH=@wrapperDir@:/var/run/current-system/sw/bin:/var/run/current-system/sw/sbin
+export LD_LIBRARY_PATH=@nssModulesPath@
 export MODULE_DIR=@modulesTree@/lib/modules
 export NIXPKGS_CONFIG=/nix/etc/config.nix
 export PAGER="less -R"
diff --git a/system/options.nix b/system/options.nix
index 409cbba3906..0d4d9e01257 100644
--- a/system/options.nix
+++ b/system/options.nix
@@ -986,6 +986,21 @@
         default = true;
 	description = ''Whether to allow publishing.'';
       };
+
+      nssmdns = mkOption {
+        default = false;
+	description = ''
+	  Whether to enable the mDNS NSS (Name Service Switch) plug-in.
+	  Enabling it allows applications to resolve names in the `.local'
+	  domain by transparently querying the Avahi daemon.
+
+	  Warning: Currently, enabling this option breaks DNS lookups after
+	  a `nixos-rebuild'.  This is because `/etc/nsswitch.conf' is
+	  updated to use `nss-mdns' but `libnss_mdns' is not in
+	  applications' `LD_LIBRARY_PATH'.  The next time `/etc/profile' is
+	  sourced, it will set up an appropriate `LD_LIBRARY_PATH', though.
+	'';
+      };
     };
 
     bitlbee = {
diff --git a/system/system.nix b/system/system.nix
index 24806222772..3843b484a2e 100644
--- a/system/system.nix
+++ b/system/system.nix
@@ -125,7 +125,8 @@ rec {
 
   # NSS modules.  Hacky!
   nssModules =
-    if config.users.ldap.enable then [pkgs.nss_ldap] else [];
+       pkgs.lib.optional config.users.ldap.enable pkgs.nss_ldap
+    ++ pkgs.lib.optional config.services.avahi.nssmdns pkgs.nssmdns;
 
   nssModulesPath = pkgs.lib.concatStrings (pkgs.lib.intersperse ":" 
     (map (mod: mod + "/lib") nssModules));
@@ -175,7 +176,7 @@ rec {
   # The static parts of /etc.
   etc = import ../etc/default.nix {
     inherit config pkgs upstartJobs systemPath wrapperDir
-      defaultShell nixEnvVars modulesTree;
+      defaultShell nixEnvVars modulesTree nssModulesPath;
     extraEtc = pkgs.lib.concatLists (map (job: job.extraEtc) upstartJobs.jobs);
   };
 
@@ -255,6 +256,8 @@ rec {
   ]
   ++ pkgs.lib.optional config.security.sudo.enable pkgs.sudo
   ++ pkgs.lib.optional config.services.bitlbee.enable pkgs.bitlbee
+  ++ pkgs.lib.optional config.services.avahi.enable pkgs.avahi
+  ++ pkgs.lib.optional config.services.avahi.nssmdns pkgs.nssmdns
   ++ pkgs.lib.optional config.networking.defaultMailServer.directDelivery pkgs.ssmtp 
   ++ pkgs.lib.concatLists (map (job: job.extraPath) upstartJobs.jobs)
   ++ config.environment.extraPackages pkgs
-- 
GitLab


From 473d75fc4657c384de4411cacf8923a1264544f1 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 19 Mar 2008 12:21:09 +0000
Subject: [PATCH 0873/5331] * Typo.

svn path=/nixos/trunk/; revision=11199
---
 installer/nixos-rebuild.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/installer/nixos-rebuild.sh b/installer/nixos-rebuild.sh
index c1df6e5613c..0691f5ccfbd 100644
--- a/installer/nixos-rebuild.sh
+++ b/installer/nixos-rebuild.sh
@@ -25,7 +25,7 @@ if test -z "$action"; then showSyntax; fi
 # Allow the location of NixOS sources and the system configuration
 # file to be overridden.
 NIXOS=${NIXOS:-/etc/nixos/nixos}
-NIXPKGS=${NIXPKG:-/etc/nixos/nixpkgs}
+NIXPKGS=${NIXPKGS:-/etc/nixos/nixpkgs}
 NIXOS_CONFIG=${NIXOS_CONFIG:-/etc/nixos/configuration.nix}
 
 
-- 
GitLab


From 3a973ab55cd982f3579b130a3e77a40c35ce8cbe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Wed, 19 Mar 2008 12:27:30 +0000
Subject: [PATCH 0874/5331] nixos-rebuild: Determine `$NIXPKGS' from `$NIXOS'
 by default.

svn path=/nixos/trunk/; revision=11200
---
 installer/nixos-rebuild.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/installer/nixos-rebuild.sh b/installer/nixos-rebuild.sh
index 0691f5ccfbd..4183741b202 100644
--- a/installer/nixos-rebuild.sh
+++ b/installer/nixos-rebuild.sh
@@ -25,7 +25,7 @@ if test -z "$action"; then showSyntax; fi
 # Allow the location of NixOS sources and the system configuration
 # file to be overridden.
 NIXOS=${NIXOS:-/etc/nixos/nixos}
-NIXPKGS=${NIXPKGS:-/etc/nixos/nixpkgs}
+NIXPKGS=${NIXPKGS:-$NIXOS/pkgs}
 NIXOS_CONFIG=${NIXOS_CONFIG:-/etc/nixos/configuration.nix}
 
 
-- 
GitLab


From 79ffaeb2e7de233002bf9ea96f2766a6d632f068 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Wed, 19 Mar 2008 12:34:39 +0000
Subject: [PATCH 0875/5331] activate-configuration: Look for setuid executables
 in the default profile.

svn path=/nixos/trunk/; revision=11202
---
 system/activate-configuration.sh |  7 +++++++
 system/system.nix                | 11 +----------
 2 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/system/activate-configuration.sh b/system/activate-configuration.sh
index e2e6ddcbbb6..47fe684a8aa 100644
--- a/system/activate-configuration.sh
+++ b/system/activate-configuration.sh
@@ -129,6 +129,12 @@ ln -sf /nix/var/nix/manifests /nix/var/nix/gcroots/
 
 # Make a few setuid programs work.
 PATH=@systemPath@/bin:@systemPath@/sbin:$PATH
+save_PATH="$PATH"
+
+# Add the default profile to the search path for setuid executables.
+PATH="/nix/var/nix/profiles/default/sbin:$PATH"
+PATH="/nix/var/nix/profiles/default/bin:$PATH"
+
 wrapperDir=@wrapperDir@
 if test -d $wrapperDir; then rm -f $wrapperDir/*; fi
 mkdir -p $wrapperDir
@@ -149,6 +155,7 @@ for i in @setuidPrograms@; do
     chmod 4755 $wrapperDir/$i
 done
 
+PATH="$save_PATH"
 
 # Set the host name.  Don't clear it if it's not configured in the
 # NixOS configuration, since it may have been set by dhclient in the
diff --git a/system/system.nix b/system/system.nix
index 3843b484a2e..6f3ed231671 100644
--- a/system/system.nix
+++ b/system/system.nix
@@ -302,16 +302,7 @@ rec {
         pkgs.coreutils pkgs.gnugrep pkgs.findutils
         pkgs.glibc # needed for getent
         pkgs.pwdutils
-      ]
-
-      # XXX: Hack to recognize common setuid programs.
-      ++ pkgs.lib.optional (pkgs.lib.any (x: x == "xlock") setuidPrograms)
-                           pkgs.xlockmore
-      ++ pkgs.lib.optional (pkgs.lib.any (x: x == "xscreensaver")
-                                         setuidPrograms)
-                           pkgs.xscreensaver
-      ++ pkgs.lib.optional (pkgs.lib.any (x: x == "xlaunch") setuidPrograms)
-                           pkgs.xlaunch;
+      ];
 
     bash = pkgs.bashInteractive;
   };
-- 
GitLab


From e32a8437d59e0c480ab52f752503a9d7b3ba39a5 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 19 Mar 2008 12:58:14 +0000
Subject: [PATCH 0876/5331] svn path=/nixos/trunk/; revision=11203

---
 configuration/rescue-cd.nix    | 4 ++++
 helpers/make-iso9660-image.nix | 2 +-
 installer/default.nix          | 2 +-
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/configuration/rescue-cd.nix b/configuration/rescue-cd.nix
index 112b2d539c8..407dfa9ad4b 100644
--- a/configuration/rescue-cd.nix
+++ b/configuration/rescue-cd.nix
@@ -235,6 +235,10 @@ rec {
     default 0
     timeout 10
     splashimage /boot/background.xpm.gz
+
+    title Boot from hard disk
+      root (hd0)
+      chainloader +1
     
     title NixOS Installer / Rescue
       kernel /boot/vmlinuz ${toString system.config.boot.kernelParams}
diff --git a/helpers/make-iso9660-image.nix b/helpers/make-iso9660-image.nix
index d2ecf5e1a90..5e0bca4c630 100644
--- a/helpers/make-iso9660-image.nix
+++ b/helpers/make-iso9660-image.nix
@@ -48,5 +48,5 @@ stdenv.mkDerivation {
     map (x: [("closure-" + baseNameOf x.object) x.object]) storeContents;
   exportBuildReferencesGraph =
     map (x: [("closure-build-" + baseNameOf x.object) x.object]) buildStoreContents;
-  pathsFromGraph = ../../nixpkgs/pkgs/build-support/kernel/paths-from-graph.pl;
+  pathsFromGraph = ../pkgs/build-support/kernel/paths-from-graph.pl;
 }
diff --git a/installer/default.nix b/installer/default.nix
index 2196890f842..ef2f4fd678f 100644
--- a/installer/default.nix
+++ b/installer/default.nix
@@ -19,7 +19,7 @@ in
     inherit nix;
     nixpkgsURL = config.installer.nixpkgsURL;
 
-    pathsFromGraph = ../../nixpkgs/pkgs/build-support/kernel/paths-from-graph.pl;
+    pathsFromGraph = ../pkgs/build-support/kernel/paths-from-graph.pl;
 
     nixClosure = pkgs.runCommand "closure"
       {exportReferencesGraph = ["refs" nix];}
-- 
GitLab


From 2cc28315636a3871898df0c53665b4ba7cdf4787 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 20 Mar 2008 14:38:49 +0000
Subject: [PATCH 0877/5331] * Indentation.

svn path=/nixos/trunk/; revision=11231
---
 upstart-jobs/ntpd.nix | 34 +++++++++++++++++-----------------
 1 file changed, 17 insertions(+), 17 deletions(-)

diff --git a/upstart-jobs/ntpd.nix b/upstart-jobs/ntpd.nix
index d03d6a2cf7f..4bfcfe115cb 100644
--- a/upstart-jobs/ntpd.nix
+++ b/upstart-jobs/ntpd.nix
@@ -6,11 +6,11 @@ let
 
   ntpUser = "ntp";
 
-  config = writeText "ntp.conf" "
+  config = writeText "ntp.conf" ''
     driftfile ${stateDir}/ntp.drift
 
     ${toString (map (server: "server " + server + "\n") servers)}
-  ";
+  '';
 
   ntpFlags = "-c ${config} -u ${ntpUser}:nogroup -i ${stateDir}";
 
@@ -27,26 +27,26 @@ in
     }
   ];
   
-  job = "
-description \"NTP daemon\"
+  job = ''
+    description "NTP daemon"
 
-start on ip-up
-stop on ip-down
-stop on shutdown
+    start on ip-up
+    stop on ip-down
+    stop on shutdown
 
-start script
+    start script
 
-    mkdir -m 0755 -p ${stateDir}
-    chown ${ntpUser} ${stateDir}
+        mkdir -m 0755 -p ${stateDir}
+        chown ${ntpUser} ${stateDir}
 
-    # Needed to run ntpd as an unprivileged user.
-    ${modprobe}/sbin/modprobe capability || true
+        # Needed to run ntpd as an unprivileged user.
+        ${modprobe}/sbin/modprobe capability || true
 
-    ${ntp}/bin/ntpd -q -g ${ntpFlags}
-    
-end script
+        ${ntp}/bin/ntpd -q -g ${ntpFlags}
 
-respawn ${ntp}/bin/ntpd -n ${ntpFlags}
-  ";
+    end script
+
+    respawn ${ntp}/bin/ntpd -n ${ntpFlags}
+  '';
   
 }
-- 
GitLab


From 047241dd5d0e999e2edb624d9e10cb11f5ad5bff Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 20 Mar 2008 14:44:36 +0000
Subject: [PATCH 0878/5331] * When restarting a job, *really* wait until the
 job has   stopped before starting it again.

svn path=/nixos/trunk/; revision=11232
---
 system/switch-to-configuration.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/system/switch-to-configuration.sh b/system/switch-to-configuration.sh
index e3fd59910cb..98a2775c7a7 100644
--- a/system/switch-to-configuration.sh
+++ b/system/switch-to-configuration.sh
@@ -44,8 +44,8 @@ if test "$action" = "switch" -o "$action" = "test"; then
     stopJob() {
         local job=$1
         initctl stop "$job"
-        while ! initctl list 2>&1 | grep -q "initctl: $job (stop)"; do
-            echo "waiting for $job..."
+        while ! initctl status "$job" 2>&1 | grep -q "(stop) waiting"; do
+            echo "waiting for $job to stop..."
             sleep 1
         done
     }
-- 
GitLab


From 3afeae0c006210d2d6a5c65a43d1d3ce211f2862 Mon Sep 17 00:00:00 2001
From: Marc Weber <marco-oweber@gmx.de>
Date: Thu, 20 Mar 2008 18:34:14 +0000
Subject: [PATCH 0879/5331] tightvnc service (there might still be some things
 to improve.. I can run it - has xfs check :)

svn path=/nixos/trunk/; revision=11243
---
 upstart-jobs/new-proposal/tightvnc.nix | 89 ++++++++++++++++++++++++++
 1 file changed, 89 insertions(+)
 create mode 100644 upstart-jobs/new-proposal/tightvnc.nix

diff --git a/upstart-jobs/new-proposal/tightvnc.nix b/upstart-jobs/new-proposal/tightvnc.nix
new file mode 100644
index 00000000000..054828a5230
--- /dev/null
+++ b/upstart-jobs/new-proposal/tightvnc.nix
@@ -0,0 +1,89 @@
+{ path, thisConfig, config, lib, pkgs, upstartHelpers } : with upstartHelpers; rec {
+  options = {
+    description = "tightvnc vnc server (share virtual desktop over network";
+
+    geometry = mkOption {
+      default = "-geometry 800x600";
+      example = "800x600";
+      description = ''
+        size of virtual screen
+      '';
+      apply = x :  "-geometry '${x}'";
+    };
+    depth = mkOption {
+      default = "-depth 24";
+      description = ''
+        use screen-name instead the hostname to identify
+        this screen in the configuration.
+        value must be something between 8 and 32
+        '';
+      apply = x: "-depth '${x}'";
+      check = x: (__lessThan x 33) && (7 __lessThan x); # not yet used
+    };
+    display = mkOption {
+      default = ":8";
+      example = 8;
+      description = "display to use";
+      apply = x: ":${builtins.toString x}";
+    };
+    authFile = mkOption {
+      default = "-auth /etc/tightvnc-pwd";
+      description = ''
+        The file containing authentication passwords.
+        Can be created using vncpasswd
+      '';
+      apply = x: "-auth '${x}'";
+      check = __pathExists;
+    };
+    httpPort = mkOption {
+      default = "-httpport 5900";
+      example = 5901;
+      description = "http port to listen to (Java applet remote interface)";
+      apply = x: "-httpport '${builtins.toString x}'";
+    };
+    desktopName = mkOption {
+      description = ''
+        Set VNC desktop name ("x11" by default)
+      '';
+      apply = x: "-desktop '${x}'";
+    };
+    viewOnly = mkOption {
+      default = "";
+      description = ''
+        Don't accept keboard and pointer events from clients. All clients will be able to see
+        the desktop but won't be able to control it.
+      '';
+      apply = x: "-viewonly '${x}'";
+    };
+    interface = mkOption {
+      default = "";
+      description = ''
+        Listen for client connections only on the network interface with given ipaddr
+      '';
+      apply = x: "-interface '${x}'";
+    };
+    extras = mkOption {
+      default = "";
+      description = ''
+        additional params, see man Xvnc
+      '';
+    };
+  };
+
+  jobs = if (lib.getAttr ["services" "xfs" "enable"] false config) != true
+    then abort "you need to enable xfs services = { xfs = { enable = true; }; } within your nixos/configuration.nix file"
+    else
+    [ ( rec {
+      name = "tightvnc";
+
+  job = "
+description \"${name}\"
+
+start on network-interfaces/started and xserver/started
+stop on network-interfaces/stop or xserver/stop
+
+exec ${pkgs.tightvnc}/bin/Xvnc -fp unix/:7100 ${lib.concatStringsSep " " (lib.mapIf (x : x != "description") configV (__attrNames options ) ) }
+  ";
+} ) ];
+}
+# 
-- 
GitLab


From 5d7f0e79673ce471accd853ce1af4059cd3909b2 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sat, 22 Mar 2008 16:02:57 +0000
Subject: [PATCH 0880/5331] * Suppress some errors if tuxonice isn't loaded.

svn path=/nixos/trunk/; revision=11259
---
 boot/boot-stage-1-init.sh | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/boot/boot-stage-1-init.sh b/boot/boot-stage-1-init.sh
index 3c9b35d0da2..92407d09743 100644
--- a/boot/boot-stage-1-init.sh
+++ b/boot/boot-stage-1-init.sh
@@ -32,6 +32,7 @@ mount -t proc none /proc
 mkdir -p /sys
 mount -t sysfs none /sys
 
+
 # Process the kernel command line.
 stage2Init=@stage2Init@
 for o in $(cat /proc/cmdline); do
@@ -65,13 +66,17 @@ for i in @modules@; do
 done
 
 
-# Try to resume - all modules are loaded now
-if test -n "$(cat /sys/power/tuxonice/resume)"; then
-    echo 0 > /sys/power/tuxonice/user_interface/enabled
-    echo 1 > /sys/power/tuxonice/do_resume || echo "Failed to resume..."
+# Try to resume - all modules are loaded now.
+if test -e /sys/power/tuxonice/resume; then
+    if test -n "$(cat /sys/power/tuxonice/resume)"; then
+        echo 0 > /sys/power/tuxonice/user_interface/enabled
+        echo 1 > /sys/power/tuxonice/do_resume || echo "Failed to resume..."
+    fi
 fi
-    echo 1 > /sys/power/resume || echo "Failed to resume..."
-    echo shutdown >/sys/power/disk
+
+echo 1 > /sys/power/resume || echo "Failed to resume..."
+echo shutdown > /sys/power/disk
+
 
 # Create device nodes in /dev.
 mknod -m 0666 /dev/null c 1 3
-- 
GitLab


From 249fc3c1351761d9349095885659ba2cf4309d4d Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sat, 22 Mar 2008 16:03:43 +0000
Subject: [PATCH 0881/5331] * Fix weird "systemConfig=blabla" errors due to
 wrong parsing   of the resume= kernel parameter.

svn path=/nixos/trunk/; revision=11260
---
 boot/boot-stage-2-init.sh | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/boot/boot-stage-2-init.sh b/boot/boot-stage-2-init.sh
index 2d90147dd1e..59f56a06e96 100644
--- a/boot/boot-stage-2-init.sh
+++ b/boot/boot-stage-2-init.sh
@@ -30,7 +30,6 @@ test -e /etc/fstab || touch /etc/fstab # to shut up mount
 mkdir -m 0755 -p /proc
 mount -n -t proc none /proc
 cat /proc/mounts > /etc/mtab
-
 mkdir -m 0755 -p /etc/nixos
 
 
@@ -56,6 +55,10 @@ for o in $(cat /proc/cmdline); do
             set -- $(IFS==; echo $o)
             systemConfig=$2
             ;;
+        resume=*)
+            set -- $(IFS==; echo $o)
+            resumeDevice=$2
+            ;;
     esac
 done
 
@@ -90,6 +93,12 @@ mknod -m 0666 /dev/null c 1 3
 mknod -m 0644 /dev/urandom c 1 9 # needed for passwd
 
 
+# Clear the resume device.
+if test -n "$resumeDevice"; then
+    mkswap "$resumeDevice" || echo 'Failed to clear saved image.'
+fi
+
+
 # Run the script that performs all configuration activation that does
 # not have to be done at boot time.
 @activateConfiguration@ "$systemConfig"
@@ -108,13 +117,6 @@ export MODULE_DIR=@kernel@/lib/modules/
 # Run any user-specified commands.
 @shell@ @bootLocal@
 
-resumeDevice="$(cat /proc/cmdline)"
-resumeDevice="${resumeDevice##* resume=}"
-resumeDevice="${resumeDevice%% *}"
-echo "$resumeDevice"
-if test -n "$resumeDevice"; then
-    mkswap "$resumeDevice" || echo 'Failed to clear saved image.'
-fi
 
 # Start Upstart's init.  We start it through the
 # /var/run/current-system symlink indirection so that we can upgrade
-- 
GitLab


From d6e1828c13bb3f0c1b1b0d31fdabce9eb3647b1e Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sat, 22 Mar 2008 16:04:38 +0000
Subject: [PATCH 0882/5331] * Speed up activating the configuration: don't do a
 find   on all of /etc, skip /etc/nixos.  (Actually, the NixOS/Nixpkgs  
 sources probably shouldn't be stored in /etc...)

svn path=/nixos/trunk/; revision=11261
---
 system/activate-configuration.sh | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/system/activate-configuration.sh b/system/activate-configuration.sh
index 47fe684a8aa..fd901c8aca6 100644
--- a/system/activate-configuration.sh
+++ b/system/activate-configuration.sh
@@ -37,8 +37,9 @@ done
 
 # Remove dangling symlinks that point to /etc/static.  These are
 # configuration files that existed in a previous configuration but not
-# in the current one.
-for i in $(find /etc/ -type l); do
+# in the current one.  For efficiency, don't look under /etc/nixos
+# (where all the NixOS sources live).
+for i in $(find /etc/ \( -path /etc/nixos -prune \) -o -type l); do
     target=$(readlink "$i")
     if test "${target:0:${#staticEtc}}" = "$staticEtc" -a ! -e "$i"; then
         rm -f "$i"
-- 
GitLab


From 3703cd13a2bc3d0f8ddde4ffebf7150342fe360c Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sat, 22 Mar 2008 16:05:01 +0000
Subject: [PATCH 0883/5331] * Quick hack to make HAL start properly.

svn path=/nixos/trunk/; revision=11262
---
 upstart-jobs/dbus.nix | 32 ++++++++++++++++----------------
 upstart-jobs/hal.nix  | 21 ++++++++++++---------
 2 files changed, 28 insertions(+), 25 deletions(-)

diff --git a/upstart-jobs/dbus.nix b/upstart-jobs/dbus.nix
index a2893d42ecf..a8ce1fddf06 100644
--- a/upstart-jobs/dbus.nix
+++ b/upstart-jobs/dbus.nix
@@ -35,28 +35,28 @@ in
   
   extraPath = [dbus.daemon dbus.tools];
   
-  job = "
-description \"D-Bus system message bus daemon\"
+  job = ''
+    description "D-Bus system message bus daemon"
 
-start on startup
-stop on shutdown
+    start on startup
+    stop on shutdown
 
-start script
+    start script
 
-    mkdir -m 0755 -p ${homeDir}
-    chown messagebus ${homeDir}
+        mkdir -m 0755 -p ${homeDir}
+        chown messagebus ${homeDir}
 
-    mkdir -m 0755 -p /var/lib/dbus
-    ${dbus.tools}/bin/dbus-uuidgen --ensure
+        mkdir -m 0755 -p /var/lib/dbus
+        ${dbus.tools}/bin/dbus-uuidgen --ensure
 
-end script
+    end script
 
-respawn
+    respawn
 
-script
-    rm -f ${homeDir}/pid
-    exec ${dbus}/bin/dbus-daemon --config-file=${configFile}/system.conf
-end script
-  ";
+    script
+        rm -f ${homeDir}/pid
+        exec ${dbus}/bin/dbus-daemon --config-file=${configFile}/system.conf
+    end script
+  '';
   
 }
diff --git a/upstart-jobs/hal.nix b/upstart-jobs/hal.nix
index 0770ba3ce31..d6094d5bfa3 100644
--- a/upstart-jobs/hal.nix
+++ b/upstart-jobs/hal.nix
@@ -18,19 +18,22 @@
 
   extraPath = [hal];
   
-  job = "
-description \"HAL daemon\"
+  job = ''
+    description "HAL daemon"
 
-start on dbus
-stop on shutdown
+    start on dbus
+    stop on shutdown
 
-start script
+    start script
 
-    mkdir -m 0755 -p /var/cache/hald
+        # !!! quick hack: wait until dbus has started
+        sleep 3
 
-end script
+        mkdir -m 0755 -p /var/cache/hald
 
-respawn ${hal}/sbin/hald --daemon=no --verbose=yes
-  ";
+    end script
+
+    respawn ${hal}/sbin/hald --daemon=no --verbose=yes
+  '';
   
 }
-- 
GitLab


From 060533c8a1761922ea3307e57a776d4085b06f81 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Sat, 22 Mar 2008 17:54:13 +0000
Subject: [PATCH 0884/5331] Fixes to OpenFire

svn path=/nixos/trunk/; revision=11264
---
 upstart-jobs/openfire.nix | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/upstart-jobs/openfire.nix b/upstart-jobs/openfire.nix
index 495934e0be2..e816b08347a 100644
--- a/upstart-jobs/openfire.nix
+++ b/upstart-jobs/openfire.nix
@@ -22,6 +22,13 @@ with pkgs;
     script 
       export PATH=${jre}/bin:${openfire}/bin:${coreutils}/bin:${which}/bin:${gnugrep}/bin:${gawk}/bin:${gnused}/bin
       export HOME=/tmp
+      mkdir /var/log/openfire || true 
+      mkdir /etc/openfire || true 
+      for i in ${openfire}/conf.inst/*; do
+          if ! test -f /etc/openfire/$(basename $i); then
+	      cp $i /etc/openfire/
+	  fi
+      done
       openfire start
     end script
   '';
-- 
GitLab


From 9ab654a6c41b68d83358efe7fd641063b7dd404c Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Sat, 22 Mar 2008 18:53:55 +0000
Subject: [PATCH 0885/5331] Fix regexp to determine xserver and dbus correctly

svn path=/nixos/trunk/; revision=11265
---
 system/switch-to-configuration.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/system/switch-to-configuration.sh b/system/switch-to-configuration.sh
index 98a2775c7a7..ef1893880e2 100644
--- a/system/switch-to-configuration.sh
+++ b/system/switch-to-configuration.sh
@@ -73,7 +73,7 @@ if test "$action" = "switch" -o "$action" = "test"; then
 
         # Hack: skip the sys-* and ctrl-alt-delete events.
         # Another hack: don't restart the X server (that would kill all the clients).
-        if echo "$event" | grep -q "^sys-\|^ctrl-\|^xserver|^dbus"; then continue; fi
+        if echo "$event" | grep -q "^sys-\|^ctrl-\|^xserver\|^dbus"; then continue; fi
     
         if ! test -e "$oldEvents/$event"; then
             echo "starting $event..."
-- 
GitLab


From dc27e80fadaa203be57538e0bc6aed18085c6f4f Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Mon, 24 Mar 2008 19:37:32 +0000
Subject: [PATCH 0886/5331] Changes to support swsusp and custom kernels.

svn path=/nixos/trunk/; revision=11272
---
 boot/boot-stage-1-init.sh |  2 +-
 boot/boot-stage-1.nix     |  5 ++++-
 system/options.nix        | 18 ++++++++++++++++++
 system/system.nix         |  2 ++
 4 files changed, 25 insertions(+), 2 deletions(-)

diff --git a/boot/boot-stage-1-init.sh b/boot/boot-stage-1-init.sh
index 92407d09743..8ed3887cc35 100644
--- a/boot/boot-stage-1-init.sh
+++ b/boot/boot-stage-1-init.sh
@@ -74,7 +74,7 @@ if test -e /sys/power/tuxonice/resume; then
     fi
 fi
 
-echo 1 > /sys/power/resume || echo "Failed to resume..."
+echo "@resumeDevice@" > /sys/power/resume || echo "Failed to resume..."
 echo shutdown > /sys/power/disk
 
 
diff --git a/boot/boot-stage-1.nix b/boot/boot-stage-1.nix
index a53b9d6c86b..6cd0e7f6a2a 100644
--- a/boot/boot-stage-1.nix
+++ b/boot/boot-stage-1.nix
@@ -30,6 +30,9 @@
 , # The path of the stage 2 init to call once we've mounted the root
   # device.
   stage2Init ? "/init"
+
+, # Resume device. [major]:[minor]
+  resumeDevice ? "ignore-this"
 }:
 
 let
@@ -48,7 +51,7 @@ substituteAll {
   src = ./boot-stage-1-init.sh;
   isExecutable = true;
   inherit staticShell modules modulesDir;
-  inherit autoDetectRootDevice isLiveCD mountPoints devices fsTypes optionss;
+  inherit autoDetectRootDevice isLiveCD mountPoints devices fsTypes optionss resumeDevice;
   rootLabel = if autoDetectRootDevice then rootLabel else "";
   path = [
     staticTools
diff --git a/system/options.nix b/system/options.nix
index 0d4d9e01257..3f5605862fb 100644
--- a/system/options.nix
+++ b/system/options.nix
@@ -66,6 +66,15 @@
       ";
     };
 
+    resumeDevice = mkOption {
+      default = "";
+      example = "0:0";
+      description = "
+        Device for manual resume attempt during boot. Looks like 
+	major:minor .
+      ";
+    };
+
     kernel = mkOption {
       default = pkgs: pkgs.kernel;
       description = "
@@ -198,6 +207,15 @@
         ";
       };
 
+      allowMissing = mkOption {
+        default = false;
+	description = ''
+	  Allow some initrd components to be missing. Useful for
+	  custom kernel that are changed too often to track needed
+	  kernelModules.
+	'';
+      };
+
       lvm = mkOption {
         default = false;
         description = "
diff --git a/system/system.nix b/system/system.nix
index 6f3ed231671..45175ff5701 100644
--- a/system/system.nix
+++ b/system/system.nix
@@ -44,6 +44,7 @@ rec {
   modulesClosure = pkgs.makeModulesClosure {
     inherit rootModules;
     kernel = modulesTree;
+    allowMissing = config.boot.initrd.allowMissing;
   };
 
 
@@ -89,6 +90,7 @@ rec {
     modules = rootModules;
     staticShell = stdenvLinuxStuff.bootstrapTools.bash;
     staticTools = stdenvLinuxStuff.staticTools;
+    resumeDevice = config.boot.resumeDevice;
   };
   
 
-- 
GitLab


From 0fbd66414ab260561e37303e56194772ba81ec3f Mon Sep 17 00:00:00 2001
From: Marc Weber <marco-oweber@gmx.de>
Date: Tue, 25 Mar 2008 00:06:58 +0000
Subject: [PATCH 0887/5331] enhanced error reporting missing config attr (new
 job proposal)

svn path=/nixos/trunk/; revision=11279
---
 upstart-jobs/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/upstart-jobs/default.nix b/upstart-jobs/default.nix
index 9e2b8281fd8..23339a570ae 100644
--- a/upstart-jobs/default.nix
+++ b/upstart-jobs/default.nix
@@ -51,13 +51,13 @@ let
                     else if pathExists p2 then import p2 
                         else abort "service ${name} requested but there is no ${p}.nix or ${p}/default.nix file!";
           options = (jobFunc (args (abort "you can't use configV within options!"))).options;
-          errorWhere = "${name} of service ${builtins.toString path}";
+          errorWhere = name : "${name} of service ${builtins.toString path}";
           configV = name : if (__hasAttr name options ) then
                              let opt = (__getAttr name options ); # this config option description
                              in if (__hasAttr name thisConfig )
                                 then let v = (__getAttr name thisConfig); in if opt ? apply then opt.apply v else v
-                                else if opt ? default then opt.default else abort "you need to specify the configuration option ${errorWhere}"
-                           else abort "unkown option ${errorWhere}";
+                                else if opt ? default then opt.default else abort "you need to specify the configuration option ${errorWhere name}"
+                           else abort "unkown option ${errorWhere name}";
           checkConfig = (pkgs.lib.getAttr ["environment" "checkConfigurationOptions"] 
                   optionDeclarations.environment.checkConfigurationOptions.default
                   config);
-- 
GitLab


From 3b603a2281a84d0511cb530c405831f9f548156c Mon Sep 17 00:00:00 2001
From: Marc Weber <marco-oweber@gmx.de>
Date: Tue, 25 Mar 2008 00:14:05 +0000
Subject: [PATCH 0888/5331] synergyc ip last arg fix

svn path=/nixos/trunk/; revision=11280
---
 upstart-jobs/new-proposal/synergyc.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/upstart-jobs/new-proposal/synergyc.nix b/upstart-jobs/new-proposal/synergyc.nix
index bc880dbdc2c..57da073cd75 100644
--- a/upstart-jobs/new-proposal/synergyc.nix
+++ b/upstart-jobs/new-proposal/synergyc.nix
@@ -24,7 +24,7 @@ description \"${name}\"
 start on network-interfaces/started
 stop on network-interfaces/stop
 
-exec ${pkgs.synergy}/bin/synergyc -f ${configV "adress"} ${configV "screenName"}
+exec ${pkgs.synergy}/bin/synergyc -f ${configV "screenName"} ${configV "address"}
   ";
   
 } ) ];
-- 
GitLab


From 6ce57e311732356861e2d1ec18dd873635348e8a Mon Sep 17 00:00:00 2001
From: Tobias Hammerschmidt <tobias.hammerschmidt@gmx.de>
Date: Wed, 26 Mar 2008 07:42:44 +0000
Subject: [PATCH 0889/5331] use new ForkDaemon mode (introduced in bitlbee 1.2)
 instead of Daemon mode

svn path=/nixos/trunk/; revision=11284
---
 upstart-jobs/bitlbee.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/upstart-jobs/bitlbee.nix b/upstart-jobs/bitlbee.nix
index dca737d3a0b..b28d3d05561 100644
--- a/upstart-jobs/bitlbee.nix
+++ b/upstart-jobs/bitlbee.nix
@@ -23,8 +23,8 @@ start script
     fi
 end script
 
-# FIXME: Eventually we want to use inetd instead of using `-D'.
-respawn ${bitlbee}/sbin/bitlbee -D -p ${portNumber} -i ${interface}
+# FIXME: Eventually we want to use inetd instead of using `-F'.
+respawn ${bitlbee}/sbin/bitlbee -F -p ${portNumber} -i ${interface}
   ";
   
 }
-- 
GitLab


From 1a75f0a5a8974c7185f86e470766eb447cdcc7f4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Wed, 26 Mar 2008 16:23:52 +0000
Subject: [PATCH 0890/5331] Add `nssModules' to `systemPathsList', add `/lib'
 to `systemPath', and add `/var/run/current-system/sw/lib' to
 `LD_LIBRARY_PATH'.  This should allow NSS modules to be added and taken into
 account by applications without the need to reboot.

svn path=/nixos/trunk/; revision=11290
---
 etc/profile.sh     |  2 +-
 system/options.nix |  4 ++--
 system/system.nix  | 12 ++++++++++--
 3 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/etc/profile.sh b/etc/profile.sh
index 2aed1f949f4..30fc8217fdf 100644
--- a/etc/profile.sh
+++ b/etc/profile.sh
@@ -1,5 +1,5 @@
 export PATH=@wrapperDir@:/var/run/current-system/sw/bin:/var/run/current-system/sw/sbin
-export LD_LIBRARY_PATH=@nssModulesPath@
+export LD_LIBRARY_PATH=@nssModulesPath@:/var/run/current-system/sw/lib
 export MODULE_DIR=@modulesTree@/lib/modules
 export NIXPKGS_CONFIG=/nix/etc/config.nix
 export PAGER="less -R"
diff --git a/system/options.nix b/system/options.nix
index 3f5605862fb..f62bcd82d8d 100644
--- a/system/options.nix
+++ b/system/options.nix
@@ -2321,10 +2321,10 @@ root        ALL=(ALL) SETENV: ALL
   environment = {
 
     pathsToLink = mkOption {
-      default = ["/bin" "/sbin" "/share" "/man" "/info"];
+      default = ["/bin" "/sbin" "/lib" "/share" "/man" "/info"];
       example = ["/"];
       description = "
-        This allows to symlink more directories in /var/run/current-system/sw
+        Lists directories to be symlinked in `/var/run/current-system/sw'.
       ";
     };
 
diff --git a/system/system.nix b/system/system.nix
index 45175ff5701..9d733d804d0 100644
--- a/system/system.nix
+++ b/system/system.nix
@@ -259,12 +259,16 @@ rec {
   ++ pkgs.lib.optional config.security.sudo.enable pkgs.sudo
   ++ pkgs.lib.optional config.services.bitlbee.enable pkgs.bitlbee
   ++ pkgs.lib.optional config.services.avahi.enable pkgs.avahi
-  ++ pkgs.lib.optional config.services.avahi.nssmdns pkgs.nssmdns
   ++ pkgs.lib.optional config.networking.defaultMailServer.directDelivery pkgs.ssmtp 
   ++ pkgs.lib.concatLists (map (job: job.extraPath) upstartJobs.jobs)
   ++ config.environment.extraPackages pkgs
-  ++ pkgs.lib.optional config.fonts.enableFontDir fontDir;
+  ++ pkgs.lib.optional config.fonts.enableFontDir fontDir
 
+  # NSS modules need to be in `systemPath' so that (i) the builder
+  # chroot gets to seem them, and (ii) applications can benefit from
+  # changes in the list of NSS modules at run-time, without requiring
+  # a reboot.
+  ++ nssModules;
 
   # We don't want to put all of `startPath' and `path' in $PATH, since
   # then we get an embarrassingly long $PATH.  So use the user
@@ -273,7 +277,11 @@ rec {
   systemPath = pkgs.buildEnv {
     name = "system-path";
     paths = systemPathList;
+
+    # Note: We need `/lib' to be among `pathsToLink' for NSS modules
+    # to work.
     inherit (config.environment) pathsToLink;
+
     ignoreCollisions = true;
   };
 
-- 
GitLab


From f9cbd6e640f7f6f1cc862bce852ee76db56af290 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Wed, 26 Mar 2008 16:41:31 +0000
Subject: [PATCH 0891/5331] avahi-daemon: Start on
 `network-interfaces/started'.

svn path=/nixos/trunk/; revision=11291
---
 upstart-jobs/avahi-daemon.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/upstart-jobs/avahi-daemon.nix b/upstart-jobs/avahi-daemon.nix
index 8ec26c9826e..5b5ae2d2f65 100644
--- a/upstart-jobs/avahi-daemon.nix
+++ b/upstart-jobs/avahi-daemon.nix
@@ -36,8 +36,8 @@ in
   ];
 
   job = ''
-    start on startup
-    stop on shutdown
+    start on network-interfaces/started
+    stop on network-interfaces/stop
     respawn
     script
       export PATH="${avahi}/bin:${avahi}/sbin:$PATH"
-- 
GitLab


From 3957962cf9bd1062a683e765521518f70d79ee8c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Wed, 26 Mar 2008 16:42:57 +0000
Subject: [PATCH 0892/5331] BitlBee: Run as `bitlbee' instead of `root'.

svn path=/nixos/trunk/; revision=11292
---
 system/ids.nix           |  1 +
 system/options.nix       |  2 +-
 upstart-jobs/bitlbee.nix | 22 ++++++++++++++++------
 3 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/system/ids.nix b/system/ids.nix
index 73fa8c8a0bb..b0ce6e28591 100644
--- a/system/ids.nix
+++ b/system/ids.nix
@@ -24,6 +24,7 @@
     haldaemon = 5;
     vsftpd = 7;
     ftp = 8;
+    bitlbee = 9;
     avahi = 10;
     portmap = 11;
     audio = 17;
diff --git a/system/options.nix b/system/options.nix
index f62bcd82d8d..f8d3e302e72 100644
--- a/system/options.nix
+++ b/system/options.nix
@@ -1042,7 +1042,7 @@
       };
 
       portNumber = mkOption {
-        default = "6667";
+        default = 6667;
         description = ''
           Number of the port BitlBee will be listening to.
         '';
diff --git a/upstart-jobs/bitlbee.nix b/upstart-jobs/bitlbee.nix
index b28d3d05561..d9956230aa0 100644
--- a/upstart-jobs/bitlbee.nix
+++ b/upstart-jobs/bitlbee.nix
@@ -1,17 +1,27 @@
 args: with args;
+
+let
+  bitlbeeUid = (import ../system/ids.nix).uids.bitlbee;
+in
 {
   name = "bitlbee";
 
   users = [
     { name = "bitlbee";
-      uid = (import ../system/ids.nix).uids.bitlbee;
+      uid = bitlbeeUid;
       description = "BitlBee user";
       home = "/var/empty";
     }
   ];
   
-  job = "
-description \"BitlBee IRC to other chat networks gateway\"
+  groups = [
+    { name = "bitlbee";
+      gid = (import ../system/ids.nix).gids.bitlbee;
+    }
+  ];
+
+  job = ''
+description "BitlBee IRC to other chat networks gateway"
 
 start on network-interfaces/started
 stop on network-interfaces/stop
@@ -23,8 +33,8 @@ start script
     fi
 end script
 
-# FIXME: Eventually we want to use inetd instead of using `-F'.
-respawn ${bitlbee}/sbin/bitlbee -F -p ${portNumber} -i ${interface}
-  ";
+respawn ${bitlbee}/sbin/bitlbee -F -p ${toString portNumber} \
+        -i ${interface} -u bitlbee
+  '';
   
 }
-- 
GitLab


From 8fcba9ffaa49649f1663798780f17047efaeafc0 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Fri, 28 Mar 2008 08:06:07 +0000
Subject: [PATCH 0893/5331] Shamelessly added xfs and jfs support utilities to
 a pair of disk images

svn path=/nixos/trunk/; revision=11317
---
 configuration/live-dvd-X-medium.nix     | 25 +++++++++++++++++++++++++
 configuration/rescue-cd-replacement.nix |  2 ++
 2 files changed, 27 insertions(+)

diff --git a/configuration/live-dvd-X-medium.nix b/configuration/live-dvd-X-medium.nix
index 97eb364c15a..cb495f9a296 100644
--- a/configuration/live-dvd-X-medium.nix
+++ b/configuration/live-dvd-X-medium.nix
@@ -160,6 +160,31 @@ in
 		pkgs.bittornado
 		pkgs.wireshark
 		pkgs.smbfsFuse
+		pkgs.xfsProgs
+		pkgs.jfsUtils
+		pkgs.x11vnc
+		pkgs.lzma
+		pkgs.dict 
+		pkgs.apacheHttpd
+		pkgs.xneur
+		(with pkgs.aspellDicts; [en fr ru])
+		(pkgs.dictDBCollector {
+			dictlist = with pkgs.dictdDBs; map 
+			(x:{
+				name = x.dbName;
+				filename = x.outPath;
+				locale = x.locale;
+			})
+			[ 
+				eng2fra fra2eng eng2nld
+				nld2eng eng2rus
+				mueller_enru_abbr
+				mueller_enru_base
+				mueller_enru_dict
+				mueller_enru_geo
+				mueller_enru_names
+			];
+		})
 	];
 
 	configList = configuration : [
diff --git a/configuration/rescue-cd-replacement.nix b/configuration/rescue-cd-replacement.nix
index 5d9571a0082..ed91888887e 100644
--- a/configuration/rescue-cd-replacement.nix
+++ b/configuration/rescue-cd-replacement.nix
@@ -24,6 +24,8 @@ in (isoFun {
     pkgs.gdb # for debugging Nix
     pkgs.testdisk # useful for repairing boot problems
     pkgs.mssys # for writing Microsoft boot sectors / MBRs
+    pkgs.xfsProgs
+    pkgs.jfsUtils
   ];
 
 }).rescueCD
-- 
GitLab


From 2c7d02288f046ef082234141e8ceb33966a0525b Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Fri, 28 Mar 2008 12:01:59 +0000
Subject: [PATCH 0894/5331] Let us have ddrescue on rescue disks. Like
 umbrella. Having it reduces chances of its use - and this is very good.

svn path=/nixos/trunk/; revision=11322
---
 configuration/live-dvd-X.nix            | 3 +++
 configuration/rescue-cd-replacement.nix | 1 +
 2 files changed, 4 insertions(+)

diff --git a/configuration/live-dvd-X.nix b/configuration/live-dvd-X.nix
index 18d0e600dd3..ee5187b673b 100644
--- a/configuration/live-dvd-X.nix
+++ b/configuration/live-dvd-X.nix
@@ -159,6 +159,9 @@ in
 		pkgs.mssys
 		pkgs.testdisk
 		pkgs.gdb
+		pkgs.xfsProgs
+		pkgs.jfsUtils
+		pkgs.ddrescue
 
 		/*
 		pkgs.elinks
diff --git a/configuration/rescue-cd-replacement.nix b/configuration/rescue-cd-replacement.nix
index ed91888887e..d40e23221ef 100644
--- a/configuration/rescue-cd-replacement.nix
+++ b/configuration/rescue-cd-replacement.nix
@@ -26,6 +26,7 @@ in (isoFun {
     pkgs.mssys # for writing Microsoft boot sectors / MBRs
     pkgs.xfsProgs
     pkgs.jfsUtils
+    pkgs.ddrescue
   ];
 
 }).rescueCD
-- 
GitLab


From a0fc21eda38427f300cabb834d3ec6259196c18d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Tue, 1 Apr 2008 10:16:35 +0000
Subject: [PATCH 0895/5331] Add `atd' Upstart job.

svn path=/nixos/trunk/; revision=11435
---
 etc/default.nix          |  1 +
 etc/pam.d/atd            |  4 +++
 system/ids.nix           |  3 ++
 system/options.nix       |  9 ++++++
 system/system.nix        |  4 ++-
 upstart-jobs/atd.nix     | 64 ++++++++++++++++++++++++++++++++++++++++
 upstart-jobs/default.nix |  6 ++++
 7 files changed, 90 insertions(+), 1 deletion(-)
 create mode 100644 etc/pam.d/atd
 create mode 100644 upstart-jobs/atd.nix

diff --git a/etc/default.nix b/etc/default.nix
index e8b44f553b9..1e924e0f7f4 100644
--- a/etc/default.nix
+++ b/etc/default.nix
@@ -233,6 +233,7 @@ import ../helpers/make-etc.nix {
       }
     )
     [
+      "atd"
       "login"
       "slim"
       "su"
diff --git a/etc/pam.d/atd b/etc/pam.d/atd
new file mode 100644
index 00000000000..50f3cc5ce60
--- /dev/null
+++ b/etc/pam.d/atd
@@ -0,0 +1,4 @@
+auth     include        common
+account  include        common
+password include        common
+session  include        common
diff --git a/system/ids.nix b/system/ids.nix
index b0ce6e28591..6c6df24dd90 100644
--- a/system/ids.nix
+++ b/system/ids.nix
@@ -13,6 +13,7 @@
     bitlbee = 9;
     avahi = 10;
     portmap = 11;
+    atd = 12;
 
     nixbld = 30000; # start of range of uids
     nobody = 65534;
@@ -27,6 +28,8 @@
     bitlbee = 9;
     avahi = 10;
     portmap = 11;
+    atd = 12;
+
     audio = 17;
 
     users = 100;
diff --git a/system/options.nix b/system/options.nix
index f8d3e302e72..44b40dc5683 100644
--- a/system/options.nix
+++ b/system/options.nix
@@ -611,6 +611,15 @@
 
     };
 
+    atd = {
+
+      enable = mkOption {
+        default = true;
+	description = ''
+	  Whether to enable the `at' daemon, a command scheduler.
+	'';
+      };
+    };
 
     locate = {
 
diff --git a/system/system.nix b/system/system.nix
index 9d733d804d0..03142fde25c 100644
--- a/system/system.nix
+++ b/system/system.nix
@@ -257,6 +257,7 @@ rec {
     pkgs.wirelesstools
   ]
   ++ pkgs.lib.optional config.security.sudo.enable pkgs.sudo
+  ++ pkgs.lib.optional config.services.atd.enable pkgs.at
   ++ pkgs.lib.optional config.services.bitlbee.enable pkgs.bitlbee
   ++ pkgs.lib.optional config.services.avahi.enable pkgs.avahi
   ++ pkgs.lib.optional config.networking.defaultMailServer.directDelivery pkgs.ssmtp 
@@ -304,7 +305,8 @@ rec {
     setuidPrograms =
       config.security.setuidPrograms ++
       config.security.extraSetuidPrograms ++
-      pkgs.lib.optional (config.security.sudo.enable) "sudo";
+      pkgs.lib.optional (config.security.sudo.enable) "sudo" ++
+      (if (config.services.atd.enable) then [ "at" "atq" "atrm" ] else []);
 
     inherit (usersGroups) createUsersGroups usersList groupsList;
 
diff --git a/upstart-jobs/atd.nix b/upstart-jobs/atd.nix
new file mode 100644
index 00000000000..260c3001c35
--- /dev/null
+++ b/upstart-jobs/atd.nix
@@ -0,0 +1,64 @@
+{ at }:
+
+let uid = (import ../system/ids.nix).uids.atd;
+    gid = (import ../system/ids.nix).gids.atd;
+in
+{
+  name = "atd";
+  
+  users = [
+    { name = "atd";
+      inherit uid;
+      description = "atd user";
+      home = "/var/empty";
+    }
+  ];
+
+  groups = [
+    { name = "atd";
+      inherit gid;
+    }
+  ];
+
+  job = ''
+description "at daemon (atd)"
+
+start on startup
+stop on shutdown
+
+start script
+   # Snippets taken and adapted from the original `install' rule of
+   # the makefile.
+
+   # We assume these values are those actually used in Nixpkgs for
+   # `at'.
+   spooldir=/var/spool/atspool
+   jobdir=/var/spool/atjobs
+   etcdir=/etc/at
+
+   for dir in "$spooldir" "$jobdir" "$etcdir"
+   do
+     if [ ! -d "$dir" ]
+     then
+         mkdir "$dir" && chown atd:atd "$dir"
+     fi
+   done
+   chmod 1770 "$spooldir" "$jobdir"
+   if [ ! -f "$etcdir"/at.deny ]
+   then
+       touch "$etcdir"/at.deny && \
+       chown root:root "$etcdir"/at.deny && \
+       chmod 640 "$etcdir"/at.deny
+   fi
+   if [ ! -f "$jobdir"/.SEQ ]
+   then
+       touch "$jobdir"/.SEQ && \
+       chown atd:atd "$jobdir"/.SEQ && \
+       chmod 600 "$jobdir"/.SEQ
+   fi
+end script
+
+respawn ${at}/sbin/atd
+'';
+  
+}
diff --git a/upstart-jobs/default.nix b/upstart-jobs/default.nix
index 23339a570ae..5ccb79f663a 100644
--- a/upstart-jobs/default.nix
+++ b/upstart-jobs/default.nix
@@ -167,6 +167,12 @@ let
 
   ])
 
+  # At daemon.
+  ++ optional config.services.atd.enable
+    (import ../upstart-jobs/atd.nix {
+      at = pkgs.at;
+     })
+
   # DHCP client.
   ++ optional config.networking.useDHCP
     (import ../upstart-jobs/dhclient.nix {
-- 
GitLab


From 3979844e229d46b48b2699fec63f7b60a20bf238 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 1 Apr 2008 12:50:47 +0000
Subject: [PATCH 0896/5331] * Purify syslog.conf (it doesn't have to be in
 /etc).

svn path=/nixos/trunk/; revision=11436
---
 etc/default.nix          |  5 -----
 etc/syslog.conf          |  3 ---
 upstart-jobs/default.nix |  2 +-
 upstart-jobs/syslogd.nix | 18 ++++++++++++++++--
 4 files changed, 17 insertions(+), 11 deletions(-)
 delete mode 100644 etc/syslog.conf

diff --git a/etc/default.nix b/etc/default.nix
index 1e924e0f7f4..e169b806e31 100644
--- a/etc/default.nix
+++ b/etc/default.nix
@@ -62,11 +62,6 @@ import ../helpers/make-etc.nix {
       target = "nsswitch.conf";
     }
 
-    { # Configuration file for the system logging daemon.
-      source = ./syslog.conf;
-      target = "syslog.conf";
-    }
-
     { # Friendly greeting on the virtual consoles.
       source = pkgs.writeText "issue" ''
       
diff --git a/etc/syslog.conf b/etc/syslog.conf
deleted file mode 100644
index f89bcc6b2ad..00000000000
--- a/etc/syslog.conf
+++ /dev/null
@@ -1,3 +0,0 @@
-*.* /dev/tty10
-
-*.* -/var/log/messages
diff --git a/upstart-jobs/default.nix b/upstart-jobs/default.nix
index 5ccb79f663a..557652156f5 100644
--- a/upstart-jobs/default.nix
+++ b/upstart-jobs/default.nix
@@ -75,7 +75,7 @@ let
     [
     # Syslogd.
     (import ../upstart-jobs/syslogd.nix {
-      inherit (pkgs) sysklogd;
+      inherit (pkgs) sysklogd writeText;
     })
 
     # The udev daemon creates devices nodes and runs programs when
diff --git a/upstart-jobs/syslogd.nix b/upstart-jobs/syslogd.nix
index 0fbc92e8731..ef5de195f61 100644
--- a/upstart-jobs/syslogd.nix
+++ b/upstart-jobs/syslogd.nix
@@ -1,10 +1,24 @@
-{sysklogd}:
+{sysklogd, writeText}:
+
+let
+
+  syslogConf = writeText "syslog.conf" ''
+    *.*                /dev/tty10
+
+    *.=warning;*.=err -/var/log/warn
+    *.crit             /var/log/warn
+
+
+    *.*               -/var/log/messages
+  '';
+
+in
 
 {
   name = "syslogd";
   job = "
     start on udev
     stop on shutdown
-    respawn ${sysklogd}/sbin/syslogd -n
+    respawn ${sysklogd}/sbin/syslogd -n -f ${syslogConf}
   ";
 }
-- 
GitLab


From 8c4ebbd24ac15a6433206d10ac56c5172b8547fc Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Tue, 8 Apr 2008 21:41:01 +0000
Subject: [PATCH 0897/5331] Some tweaks for Gateway6 job

svn path=/nixos/trunk/; revision=11496
---
 system/options.nix    | 8 ++++++++
 upstart-jobs/gw6c.nix | 2 ++
 2 files changed, 10 insertions(+)

diff --git a/system/options.nix b/system/options.nix
index 44b40dc5683..0e6f4bc0e93 100644
--- a/system/options.nix
+++ b/system/options.nix
@@ -1742,6 +1742,14 @@
         ";
       };
 
+      waitPingableBroker = mkOption {
+        default = true;
+	example = false;
+	description = "
+	  Whether to wait until tunnel broker returns ICMP echo.
+	";
+      };
+
     };
 
 
diff --git a/upstart-jobs/gw6c.nix b/upstart-jobs/gw6c.nix
index 0f3d007e416..f2586526dd2 100644
--- a/upstart-jobs/gw6c.nix
+++ b/upstart-jobs/gw6c.nix
@@ -13,6 +13,8 @@ let
 		everPing = cfg.everPing;
 
 		seccureKeys = config.security.seccureKeys;
+
+		waitPingableBroker = cfg.waitPingableBroker;
 	};
 in
 {
-- 
GitLab


From 99480990f6a89fa950bd0eae97fd0ea5b14492cc Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 10 Apr 2008 07:43:49 +0000
Subject: [PATCH 0898/5331] * Added ncurses to the system path (mostly for the
 "clear" and "reset" commands).

svn path=/nixos/trunk/; revision=11528
---
 system/system.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/system/system.nix b/system/system.nix
index 03142fde25c..87fcb630f0e 100644
--- a/system/system.nix
+++ b/system/system.nix
@@ -234,6 +234,7 @@ rec {
     pkgs.mdadm
     pkgs.module_init_tools
     pkgs.nano
+    pkgs.ncurses
     pkgs.netcat
     pkgs.nettools
     pkgs.ntp
-- 
GitLab


From 10cc22203e8e7cdddc45899d2adc547dc6215b7e Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 10 Apr 2008 09:14:55 +0000
Subject: [PATCH 0899/5331] * No longer needed.

svn path=/nixos/trunk/; revision=11538
---
 upstart-jobs/apache-httpd/dist-manager.nix | 141 ---------------------
 1 file changed, 141 deletions(-)
 delete mode 100644 upstart-jobs/apache-httpd/dist-manager.nix

diff --git a/upstart-jobs/apache-httpd/dist-manager.nix b/upstart-jobs/apache-httpd/dist-manager.nix
deleted file mode 100644
index b3064560f77..00000000000
--- a/upstart-jobs/apache-httpd/dist-manager.nix
+++ /dev/null
@@ -1,141 +0,0 @@
-{config, pkgs, serverInfo}:
-
-let
-
-  inherit (pkgs.lib) mkOption;
-  inherit (config) urlPrefix distDir;
-  
-  staticFiles = substituteInAll {
-    name = "dist-manager-files";
-    src = pkgs.lib.cleanSource ../../../services/dist-manager/files;
-
-    perl = "${pkgs.perl}/bin/perl";
-
-    inherit (serverInfo) canonicalName;
-
-    inherit urlPrefix;
-
-    directoriesConf = pkgs.writeText "directories.conf" config.directoriesConf;
-
-    defaultPath = "${pkgs.coreutils}/bin:${pkgs.findutils}/bin:${pkgs.gnutar}/bin";
-
-    inherit (pkgs) gnutar bzip2;
-
-    saxon8 = pkgs.saxonb;
-
-    logFile = "${serverInfo.serverConfig.logDir}/release";
-
-    # Do a syntax check on the generated file.
-    postInstall = ''
-      $perl -c $out/cgi-bin/create-dist.pl # !!! should use -T
-    '';
-  };
-
-  # !!! cut&paste
-  substituteInAll = args: pkgs.stdenv.mkDerivation ({
-    buildCommand = ''
-      ensureDir $out
-      cp -prd $src/* $out
-      chmod -R u+w $out
-      find $out -type f -print | while read fn; do
-        args=
-        substituteAll $fn $fn
-      done
-      eval "$postInstall"
-    '';
-  } // args); # */
-
-in {
-
-  extraConfig = ''
-
-    Alias ${urlPrefix}/css ${staticFiles}/css
-
-    ScriptAlias ${urlPrefix}/cgi-bin ${staticFiles}/cgi-bin
-
-    <Directory ${staticFiles}/cgi-bin>
-        Options SymLinksIfOwnerMatch ExecCGI
-        SetHandler cgi-script
-
-        Order allow,deny
-        ${pkgs.lib.concatMapStrings (ip: "Allow from ${ip}\n") config.uploaderIPs}
-
-        Require valid-user
-        AuthType Basic
-        AuthName "Nix Upload"
-        AuthUserFile ${config.distPasswords}
-    </Directory>
-
-    Alias ${urlPrefix} ${distDir}/
-
-    <Location ${urlPrefix}>
-        Options +Indexes
-
-        RewriteEngine on
-        RewriteRule ^${distDir}/(.*)/create-dist/(.*) ${urlPrefix}/cgi-bin/create-dist.pl/$1/$2
-
-        AddType application/nix-package .nixpkg
-    </Location>
-
-    <Directory ${distDir}>
-        AllowOverride FileInfo AuthConfig Limit
-        Order allow,deny
-        Allow from all
-    </Directory>
-
-  '';
-
-  # !!! should not be needed
-  extraModulesPre = [];
-  extraModules = [];
-  robotsEntries = "";
-  globalEnvVars = [];
-  extraServerPath = [];
-  extraPath = [];
-  startupScript = null;
-
-  options = {
-
-    urlPrefix = mkOption {
-      default = "/dist";
-      description = ''
-        The URL prefix under which the release pages appear.
-      '';
-    };
-
-    distDir = mkOption {
-      example = "/data/dist";
-      description = ''
-        Path to the top-level release directory.
-      '';
-    };
-
-    distPasswords = mkOption {
-      example = "/data/dist-passwords";
-      description = ''
-        Location of the password file for the uploading of releases.
-      '';
-    };
-
-    uploaderIPs = mkOption {
-      default = [];
-      example = ["127.0.0.1" "192.168.1.0/255.255.255.0"];
-      description = ''
-        IP address or address ranges of the machines that are allowed to upload releases.
-      '';
-    };
-
-    directoriesConf = mkOption {
-      example = ''
-        fnord /data/dist/fnord fnord-upload
-      '';
-      description = ''
-        The per-project release directories, with each line containing
-        the project name, the corresponding release directory, and the
-        users that can upload to that directory.
-      '';
-    };
-
-  };  
-
-}
\ No newline at end of file
-- 
GitLab


From 036e00a16dc68ba80059ba0378ed90f6a9196cd4 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 10 Apr 2008 12:14:15 +0000
Subject: [PATCH 0900/5331] * Don't add nssModulePath when it's empty, because
 then we get   an empty element in the LD_LIBRARY_PATH, which means search  
 for libraries in the current directory.

svn path=/nixos/trunk/; revision=11545
---
 etc/profile.sh | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/etc/profile.sh b/etc/profile.sh
index 30fc8217fdf..3696012f61b 100644
--- a/etc/profile.sh
+++ b/etc/profile.sh
@@ -1,5 +1,8 @@
 export PATH=@wrapperDir@:/var/run/current-system/sw/bin:/var/run/current-system/sw/sbin
-export LD_LIBRARY_PATH=@nssModulesPath@:/var/run/current-system/sw/lib
+export LD_LIBRARY_PATH=/var/run/current-system/sw/lib
+if test -n "@nssModulesPath@"; then
+    LD_LIBRARY_PATH=@nssModulesPath@:$LD_LIBRARY_PATH
+fi
 export MODULE_DIR=@modulesTree@/lib/modules
 export NIXPKGS_CONFIG=/nix/etc/config.nix
 export PAGER="less -R"
-- 
GitLab


From bfa0e51ee56ec4989efbab1b60665ba3d6b0fcef Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Fri, 11 Apr 2008 09:20:39 +0000
Subject: [PATCH 0901/5331] Added possibility to modify Xorg passed to
 upstart-job and xlaunch

svn path=/nixos/trunk/; revision=11555
---
 system/options.nix       | 8 ++++++++
 upstart-jobs/xserver.nix | 8 +++++++-
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/system/options.nix b/system/options.nix
index 0e6f4bc0e93..495938ba15b 100644
--- a/system/options.nix
+++ b/system/options.nix
@@ -1315,6 +1315,14 @@
         ";
       };
 
+      packageFun = mkOption {
+        default = pkgs: pkgs.xorg;
+	description = "
+	  Alternative X.org package to use. For 
+	  example, you can replace individual drivers.
+	";
+      };
+
     };
 
     ejabberd = {
diff --git a/upstart-jobs/xserver.nix b/upstart-jobs/xserver.nix
index 4030e137832..38f4149d4fe 100644
--- a/upstart-jobs/xserver.nix
+++ b/upstart-jobs/xserver.nix
@@ -10,7 +10,7 @@ let
 
   # Abbreviations.
   cfg = config.services.xserver;
-  xorg = pkgs.xorg;
+  xorg = cfg.packageFun pkgs;
   gnome = pkgs.gnome;
   stdenv = pkgs.stdenv;
 
@@ -160,6 +160,12 @@ let
         ';
       fi;
 
+      if [ "${toString videoDriver}" = ati ]; then
+        export extensions='
+          Option "Composite" "Enable"
+        ';
+      fi;
+
       substituteAll $src $out
     ''; # */
   };
-- 
GitLab


From 5e1ee10f3c8dfa2a47a72866d9f99cf5cf791aa1 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Sat, 12 Apr 2008 20:08:35 +0000
Subject: [PATCH 0902/5331] HTTPS support in httpd upstart job fixed.

svn path=/nixos/trunk/; revision=11613
---
 system/options.nix                    | 16 ++++++++++++++++
 upstart-jobs/apache-httpd/default.nix |  8 +++++---
 2 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/system/options.nix b/system/options.nix
index 495938ba15b..b27f74b9234 100644
--- a/system/options.nix
+++ b/system/options.nix
@@ -1464,6 +1464,22 @@
         ";
       };
 
+      sslServerCert = mkOption {
+        default = "";
+	example = /var/host.cert;
+	description = "
+	  Path to server SSL certificate.
+	";
+      };
+
+      sslServerKey = mkOption {
+        default = "";
+	example = /var/host.key;
+	description = "
+	  Path to server SSL certificate key.
+	";
+      };
+
       logDir = mkOption {
         default = "/var/log/httpd";
         description = "
diff --git a/upstart-jobs/apache-httpd/default.nix b/upstart-jobs/apache-httpd/default.nix
index 9d3a614c329..b3f3d0518e6 100644
--- a/upstart-jobs/apache-httpd/default.nix
+++ b/upstart-jobs/apache-httpd/default.nix
@@ -58,6 +58,8 @@ let
 
   allSubservices = mainSubservices ++ pkgs.lib.concatMap subservicesFor vhosts;
 
+  sslServerCert = cfg.sslServerCert;
+  sslServerKey = cfg.sslServerKey;
 
   # !!! should be in lib
   writeTextInDir = name: text:
@@ -81,7 +83,7 @@ let
       "mime" "dav" "status" "autoindex" "asis" "info" "cgi" "dav_fs"
       "vhost_alias" "negotiation" "dir" "imagemap" "actions" "speling"
       "userdir" "alias" "rewrite" "proxy" "proxy_http"
-    ] ++ optional cfg.enableSSL "ssl_module";
+    ] ++ optional cfg.enableSSL "ssl";
     
 
   loggingConf = ''
@@ -128,8 +130,8 @@ let
 
         SSLCipherSuite ALL:!ADH:!EXPORT56:RC4+RSA:+HIGH:+MEDIUM:+LOW:+SSLv2:+EXP:+eNULL
 
-        SSLCertificateFile @sslServerCert@
-        SSLCertificateKeyFile @sslServerKey@
+        SSLCertificateFile ${sslServerCert}
+        SSLCertificateKeyFile ${sslServerKey}
 
         #   MSIE compatability.
         SetEnvIf User-Agent ".*MSIE.*" \
-- 
GitLab


From 02decddeb1389d151ba3317bbaa47de624aab74c Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Sun, 13 Apr 2008 09:35:18 +0000
Subject: [PATCH 0903/5331] Added possibility to use names instead of full
 paths in httpd subservices. Yes, the same dirty hack again

svn path=/nixos/trunk/; revision=11615
---
 upstart-jobs/apache-httpd/default.nix | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/upstart-jobs/apache-httpd/default.nix b/upstart-jobs/apache-httpd/default.nix
index b3f3d0518e6..78a6d085f88 100644
--- a/upstart-jobs/apache-httpd/default.nix
+++ b/upstart-jobs/apache-httpd/default.nix
@@ -45,8 +45,11 @@ let
 
   callSubservices = serverInfo: defs:
     let f = svc:
-      let config = addDefaultOptionValues res.options svc.config;
-          res = svc.function {inherit config pkgs serverInfo;};
+      let 
+        svcFunction = if svc ? function then 
+          svc.function else (import ( ./noDir/.. + ("/" + svc.serviceName + ".nix")));
+        config = addDefaultOptionValues res.options svc.config;
+        res = svcFunction {inherit config pkgs serverInfo;};
       in res;
     in map f defs;
 
-- 
GitLab


From 8fd2404adf9512de7df1c42624edd622e5ad93d6 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Sat, 19 Apr 2008 10:21:42 +0000
Subject: [PATCH 0904/5331] Lots of fixes to Apache HTTPD configuration. Net
 result: I can have SSL-only SVN repository on :12443 and SSL-enabled http
 server with userDirs.

svn path=/nixos/trunk/; revision=11660
---
 upstart-jobs/apache-httpd/default.nix         | 38 +++++++++++++++----
 .../apache-httpd/per-server-options.nix       | 21 ++++++++++
 2 files changed, 51 insertions(+), 8 deletions(-)

diff --git a/upstart-jobs/apache-httpd/default.nix b/upstart-jobs/apache-httpd/default.nix
index 78a6d085f88..acb6c2654cb 100644
--- a/upstart-jobs/apache-httpd/default.nix
+++ b/upstart-jobs/apache-httpd/default.nix
@@ -118,8 +118,6 @@ let
 
   # !!! integrate with virtual hosting below
   sslConf = ''
-    Listen ${toString cfg.httpsPort}
-
     SSLSessionCache dbm:${cfg.stateDir}/ssl_scache
 
     SSLMutex file:${cfg.stateDir}/ssl_mutex
@@ -127,6 +125,8 @@ let
     SSLRandomSeed startup builtin
     SSLRandomSeed connect builtin
 
+    NameVirtualHost *:${toString cfg.httpsPort}
+
     <VirtualHost _default_:${toString cfg.httpsPort}>
 
         SSLEngine on
@@ -246,7 +246,20 @@ let
         MaxRequestsPerChild  0
     </IfModule>
 
-    Listen ${toString cfg.httpPort}
+    ${let
+        ports = pkgs.lib.uniqList {  
+	  inputList=(concatMap (localCfg: 
+	    (pkgs.lib.optional localCfg.enableHttp localCfg.httpPort) 
+	    ++
+	    (pkgs.lib.optional localCfg.enableHttps localCfg.httpsPort) 
+	  ) vhosts)
+	  ++
+	  (pkgs.lib.optional cfg.enableSSL cfg.httpsPort)
+	  ++
+	  [cfg.httpPort];
+	};
+	in concatMapStrings (port: "Listen ${toString port}\n") ports
+    }
 
     User ${cfg.user}
     Group ${cfg.group}
@@ -318,14 +331,23 @@ let
     ${perServerConf true cfg}
     
     # Always enable virtual hosts; it doesn't seem to hurt.
-    NameVirtualHost *:*
+    NameVirtualHost *:${toString cfg.httpPort}
 
     ${let
-        makeVirtualHost = cfg: ''
-          <VirtualHost *:*>
-              ${perServerConf false cfg}
+        makeVirtualHost = localCfg: (if localCfg.enableHttp then ''
+          <VirtualHost *:${toString localCfg.httpPort}>
+              ${perServerConf false localCfg}
+          </VirtualHost>
+        '' else "") + ( if localCfg.enableHttps then ''
+          <VirtualHost *:${toString localCfg.httpsPort}>
+	      SSLEngine on
+
+              SSLCertificateFile ${sslServerCert}
+              SSLCertificateKeyFile ${sslServerKey}
+
+              ${perServerConf false localCfg}
           </VirtualHost>
-        '';
+	'' else "");
       in concatMapStrings makeVirtualHost vhosts}
   '';
 
diff --git a/upstart-jobs/apache-httpd/per-server-options.nix b/upstart-jobs/apache-httpd/per-server-options.nix
index dbc422ec0cd..91516196f1f 100644
--- a/upstart-jobs/apache-httpd/per-server-options.nix
+++ b/upstart-jobs/apache-httpd/per-server-options.nix
@@ -29,6 +29,27 @@
     ";
   };
 
+  httpsPort = mkOption {
+    default = 443;
+    description = "
+      Port for encrypted HTTPS requests.
+    ";
+  };
+
+  enableHttp = mkOption {
+    default = true;
+    description = "
+      Whether to listen on unencrypted HTTP.
+    ";
+  };
+
+  enableHttps = mkOption {
+    default = false;
+    description = "
+      Whether to listen on encrypted HTTPS.
+    ";
+  };
+
   adminAddr = mkOption ({
     example = "admin@example.org";
     description = "
-- 
GitLab


From 38874d802530d952d4acd67925bf443f9f4ae4e5 Mon Sep 17 00:00:00 2001
From: Nicolas Pierron <nicolas.b.pierron@gmail.com>
Date: Mon, 21 Apr 2008 13:05:35 +0000
Subject: [PATCH 0905/5331] Add options to hide the cursor and define the
 default user.

svn path=/nixos/trunk/; revision=11664
---
 system/options.nix       | 17 +++++++++++++++++
 upstart-jobs/xserver.nix |  2 ++
 2 files changed, 19 insertions(+)

diff --git a/system/options.nix b/system/options.nix
index b27f74b9234..d0e5a6e1b26 100644
--- a/system/options.nix
+++ b/system/options.nix
@@ -1182,6 +1182,23 @@
           ";
         };
 
+        defaultUser = mkOption {
+          default = "";
+          example = "login";
+          description = "
+            The default user to load. If you put a username here you
+            get it automatically loaded into the username field, and
+            the focus is placed on the password.
+          ";
+        };
+
+        hideCursor = mkOption {
+          default = false;
+          example = true;
+          description = "
+            Hide the mouse cursor on the login screen.
+          ";
+        };
       };
 
       isClone = mkOption {
diff --git a/upstart-jobs/xserver.nix b/upstart-jobs/xserver.nix
index 38f4149d4fe..8ef8619f4c3 100644
--- a/upstart-jobs/xserver.nix
+++ b/upstart-jobs/xserver.nix
@@ -294,6 +294,8 @@ let
     login_cmd exec ${stdenv.bash}/bin/sh ${clientScript}
     halt_cmd ${pkgs.upstart}/sbin/shutdown -h now
     reboot_cmd ${pkgs.upstart}/sbin/shutdown -r now
+    ${if cfg.slim.defaultUser != "" then "default_user " + cfg.slim.defaultUser else ""}
+    ${if cfg.slim.hideCursor then "hidecursor true" else ""}
   '';
 
 
-- 
GitLab


From fc236567c25a40b6bddacaec4e545dc177fce728 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 24 Apr 2008 11:40:11 +0000
Subject: [PATCH 0906/5331] * Forgot to add (even though the twiki config is
 not general enough yet).

svn path=/nixos/trunk/; revision=11700
---
 upstart-jobs/apache-httpd/twiki.nix | 113 ++++++++++++++++++++++++++++
 1 file changed, 113 insertions(+)
 create mode 100644 upstart-jobs/apache-httpd/twiki.nix

diff --git a/upstart-jobs/apache-httpd/twiki.nix b/upstart-jobs/apache-httpd/twiki.nix
new file mode 100644
index 00000000000..0a84f13ba7c
--- /dev/null
+++ b/upstart-jobs/apache-httpd/twiki.nix
@@ -0,0 +1,113 @@
+{config, pkgs, serverInfo}:
+
+let
+
+  inherit (pkgs.lib) mkOption;
+  inherit (config) urlPrefix distDir;
+
+  dataDir = "/data/pt-wiki/data";
+  pubDir = "/data/pt-wiki/pub";
+
+  scriptUrlPath = "/bin";
+  pubUrlPath    = "/pub";
+  absHostPath   = "/";
+
+  # Hacks for proxying and rewriting
+  dispPubUrlPath    = "/pub";
+  dispScriptUrlPath = "";
+  dispViewPath      = "";
+
+  twikiName = "Program Transformation Wiki";
+  startWeb = config.startWeb;
+  registrationDomain = "ewi.tudelft.nl";
+  defaultUrlHost = "";
+
+  # Build the TWiki CGI and configuration files.
+  twikiRoot = (import /etc/nixos/services/twiki/twiki-instance.nix).twiki {
+    name = "pt-wiki";
+    pubdir = pubDir;
+    datadir = dataDir;
+    inherit twikiName scriptUrlPath pubUrlPath absHostPath
+      dispPubUrlPath dispScriptUrlPath dispViewPath
+      registrationDomain defaultUrlHost;
+  };
+
+  plugins = import /etc/nixos/services/twiki/server-pkgs/twiki-plugins.nix;
+
+in {
+
+  extraConfig = ''
+
+    ScriptAlias ${scriptUrlPath} "${twikiRoot}/bin"
+    Alias ${pubUrlPath} "${pubDir}"
+
+    <Directory "${twikiRoot}/bin">
+       Options +ExecCGI
+       SetHandler cgi-script
+       AllowOverride All
+       Allow from all
+    </Directory>
+    <Directory "${twikiRoot}/templates">
+       deny from all
+    </Directory>
+    <Directory "${twikiRoot}/lib">
+       deny from all
+    </Directory>
+    <Directory "${pubDir}">
+       Options None
+       AllowOverride None
+       Allow from all
+       # Hardening suggested by http://twiki.org/cgi-bin/view/Codev/SecurityAlertSecureFileUploads.
+       php_admin_flag engine off
+       AddType text/plain .html .htm .shtml .php .php3 .phtml .phtm .pl .py .cgi
+    </Directory>
+    <Directory "${dataDir}">
+       deny from all
+    </Directory>
+
+    Alias ${absHostPath} ${twikiRoot}/rewritestub/
+
+    <Directory "${twikiRoot}/rewritestub">
+      RewriteEngine On
+      RewriteBase ${absHostPath}
+
+      # complete bin path
+      RewriteRule ^bin(.*)  bin/$1 [L]
+
+      #@customRewriteRules@
+
+      # Hack for restricted webs.
+      RewriteRule ^pt/(.*)  $1
+
+      # action / web / whatever
+      RewriteRule ^([a-z]+)/([A-Z][^/]+)/(.*)  bin/$1/$2/$3 [L]
+
+      # web / topic
+      RewriteRule ^([A-Z][^/]+)/([^/]+)   bin/view/$1/$2 [L]
+
+      # web
+      RewriteRule ^([A-Z][^/]+)           bin/view/$1/WebHome [L]
+
+      # web/
+      RewriteRule ^([A-Z][^/]+)/          bin/view/$1/WebHome [L]
+
+      RewriteRule ^index.html$            bin/view/${startWeb} [L]
+
+      RewriteRule ^$                      bin/view/${startWeb} [L]
+    </Directory>
+
+  '';
+
+  # !!! should not be needed
+  extraModulesPre = [];
+  extraModules = [];
+  robotsEntries = "";
+  globalEnvVars = [];
+  extraServerPath = [];
+  extraPath = [];
+  startupScript = null;
+
+  options = {
+  };  
+
+}
\ No newline at end of file
-- 
GitLab


From 10bdceaaadb442d345ea450f53ee8e5b92d56306 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 24 Apr 2008 11:42:50 +0000
Subject: [PATCH 0907/5331] * Allow disambiguation between the admin scripts of
 multiple   Subversion service instances.

svn path=/nixos/trunk/; revision=11701
---
 upstart-jobs/apache-httpd/subversion.nix | 22 ++++++++++++++++++++--
 1 file changed, 20 insertions(+), 2 deletions(-)

diff --git a/upstart-jobs/apache-httpd/subversion.nix b/upstart-jobs/apache-httpd/subversion.nix
index 753f7892d67..e4c3692df94 100644
--- a/upstart-jobs/apache-httpd/subversion.nix
+++ b/upstart-jobs/apache-httpd/subversion.nix
@@ -11,7 +11,8 @@ let
   distsDir = "${config.dataDir}/dist";
   tmpDir = "${config.dataDir}/tmp";
   logDir = "${config.dataDir}/log";
-  postCommitHook = "/var/run/current-system/sw/bin/svn-server-post-commit-hook";
+  idString = if config.id == "" then "" else "${config.id}-";
+  postCommitHook = "/var/run/current-system/sw/bin/svn-server-${idString}post-commit-hook";
   fsType = "fsfs";
   adminAddr = serverInfo.adminAddr;
   
@@ -64,6 +65,11 @@ let
     postInstall = ''
       $perl -c -T $out/cgi-bin/repoman.pl
       $perl -c $out/bin/svn-server-create-user.pl
+      if test -n "${config.id}"; then
+        for i in $(cd $out/bin && echo *); do
+          mv "$out/bin/$i" "$out/bin/$(echo $i | sed s^svn-server-^svn-server-${config.id}-^)"
+        done
+      fi
     '';
   };
 
@@ -341,11 +347,23 @@ in {
   extraPath = [scripts];
 
 
-  startupScript = "${scripts}/bin/svn-server-startup-hook.sh";
+  startupScript = "${scripts}/bin/svn-server-${idString}startup-hook.sh";
   
 
   options = {
 
+    id = mkOption {
+      default = "";
+      example = "test";
+      description = "
+        A unique identifier necessary to keep multiple Subversion server
+        instances on the same machine apart.  This is used to
+        disambiguate the administrative scripts, which get names like
+        svn-server-<id>-delete-repo.pl.  In particular it keeps
+        the post-commit hooks of different instances apart.
+      ";
+    };
+
     urlPrefix = mkOption {
       default = "/subversion";
       description = "
-- 
GitLab


From 5dbe45bfea22b778870fe76296751021baf9e844 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 24 Apr 2008 11:56:38 +0000
Subject: [PATCH 0908/5331] * Modified the SSL configuration a bit.  Instead of
 having a httpPort   and a httpsPort, there are now options "port" and
 "enableSSL".  So   to get https you should typically set up a vhost like
 this:

    virtualHosts = [
      { hostName = "foo.example.org";
        enableSSL = true;
        sslServerCert = "...";
        sslServerKey = "...";
      }
    ];

* sslServerCert and sslServerKey can be set per vhost.  This is
  currently only useful when doing IP-based vhosting.

* enableUserDir is now a per-vhost setting, as it should be.

* Convenience option globalRedirect to redirect the entire host to
  some URL.

svn path=/nixos/trunk/; revision=11704
---
 system/options.nix                            |  38 ----
 upstart-jobs/apache-httpd/default.nix         | 195 +++++++++---------
 .../apache-httpd/per-server-options.nix       |  48 +++--
 3 files changed, 128 insertions(+), 153 deletions(-)

diff --git a/system/options.nix b/system/options.nix
index d0e5a6e1b26..b34249d8126 100644
--- a/system/options.nix
+++ b/system/options.nix
@@ -1467,36 +1467,6 @@
         ";
       };
 
-      httpsPort = mkOption {
-        default = 443;
-        description = "
-          Port for encrypted HTTP requests.
-        ";
-      };
-
-      enableSSL = mkOption {
-        default = false;
-        description = "
-          Whether to enable SSL (https) support.
-        ";
-      };
-
-      sslServerCert = mkOption {
-        default = "";
-	example = /var/host.cert;
-	description = "
-	  Path to server SSL certificate.
-	";
-      };
-
-      sslServerKey = mkOption {
-        default = "";
-	example = /var/host.key;
-	description = "
-	  Path to server SSL certificate key.
-	";
-      };
-
       logDir = mkOption {
         default = "/var/log/httpd";
         description = "
@@ -1513,14 +1483,6 @@
         ";
       };
 
-      enableUserDir = mkOption {
-        default = false;
-        description = "
-          Whether to enable serving <filename>~/public_html</filename> as
-          <literal>/~<replaceable>username</replaceable></literal>.
-        ";
-      };
-
       mod_php = mkOption {
         default = false;
         description = "Whether to enable the PHP module.";
diff --git a/upstart-jobs/apache-httpd/default.nix b/upstart-jobs/apache-httpd/default.nix
index acb6c2654cb..8ae1db72058 100644
--- a/upstart-jobs/apache-httpd/default.nix
+++ b/upstart-jobs/apache-httpd/default.nix
@@ -2,22 +2,24 @@
 
 let
 
-  cfg = config.services.httpd;
-
-  mainCfg = cfg;
+  mainCfg = config.services.httpd;
   
   startingDependency = if config.services.gw6c.enable then "gw6c" else "network-interfaces";
 
   httpd = pkgs.apacheHttpd;
 
   inherit (pkgs.lib) addDefaultOptionValues optional concatMap concatMapStrings;
+
+
+  getPort = cfg: if cfg.port != 0 then cfg.port else if cfg.enableSSL then 443 else 80;
   
 
   makeServerInfo = cfg: {
     # Canonical name must not include a trailing slash.
     canonicalName =
-      "http://${cfg.hostName}" +
-      (if cfg.httpPort != 80 then ":${toString cfg.httpPort}" else "");
+      (if cfg.enableSSL then "https" else "http") + "://" +
+      cfg.hostName +
+      (if getPort cfg != (if cfg.enableSSL then 443 else 80) then ":${toString getPort cfg}" else "");
 
     # Admin address: inherit from the main server if not specified for
     # a virtual host.
@@ -40,14 +42,18 @@ let
         # Fill in defaults for missing options.
         cfg = addDefaultOptionValues vhostOptions cfgIn;
       in cfg;
-    in map makeVirtualHost cfg.virtualHosts;
+    in map makeVirtualHost mainCfg.virtualHosts;
 
 
+  allHosts = [mainCfg] ++ vhosts;
+    
+
   callSubservices = serverInfo: defs:
     let f = svc:
       let 
-        svcFunction = if svc ? function then 
-          svc.function else (import ( ./noDir/.. + ("/" + svc.serviceName + ".nix")));
+        svcFunction =
+          if svc ? function then svc.function
+          else import (./noDir/.. + ("/" + svc.serviceName + ".nix"));
         config = addDefaultOptionValues res.options svc.config;
         res = svcFunction {inherit config pkgs serverInfo;};
       in res;
@@ -61,12 +67,13 @@ let
 
   allSubservices = mainSubservices ++ pkgs.lib.concatMap subservicesFor vhosts;
 
-  sslServerCert = cfg.sslServerCert;
-  sslServerKey = cfg.sslServerKey;
 
   # !!! should be in lib
   writeTextInDir = name: text:
     pkgs.runCommand name {inherit text;} "ensureDir $out; echo -n \"$text\" > $out/$name";
+
+
+  enableSSL = pkgs.lib.any (vhost: vhost.enableSSL) allHosts;
   
 
   # Names of modules from ${httpd}/modules that we want to load.
@@ -86,11 +93,11 @@ let
       "mime" "dav" "status" "autoindex" "asis" "info" "cgi" "dav_fs"
       "vhost_alias" "negotiation" "dir" "imagemap" "actions" "speling"
       "userdir" "alias" "rewrite" "proxy" "proxy_http"
-    ] ++ optional cfg.enableSSL "ssl";
+    ] ++ optional enableSSL "ssl";
     
 
   loggingConf = ''
-    ErrorLog ${cfg.logDir}/error_log
+    ErrorLog ${mainCfg.logDir}/error_log
 
     LogLevel notice
 
@@ -99,7 +106,7 @@ let
     LogFormat "%{Referer}i -> %U" referer
     LogFormat "%{User-agent}i" agent
 
-    CustomLog ${cfg.logDir}/access_log common
+    CustomLog ${mainCfg.logDir}/access_log common
   '';
 
 
@@ -116,32 +123,13 @@ let
   '';
 
 
-  # !!! integrate with virtual hosting below
   sslConf = ''
-    SSLSessionCache dbm:${cfg.stateDir}/ssl_scache
+    SSLSessionCache dbm:${mainCfg.stateDir}/ssl_scache
 
-    SSLMutex file:${cfg.stateDir}/ssl_mutex
+    SSLMutex file:${mainCfg.stateDir}/ssl_mutex
 
     SSLRandomSeed startup builtin
     SSLRandomSeed connect builtin
-
-    NameVirtualHost *:${toString cfg.httpsPort}
-
-    <VirtualHost _default_:${toString cfg.httpsPort}>
-
-        SSLEngine on
-
-        SSLCipherSuite ALL:!ADH:!EXPORT56:RC4+RSA:+HIGH:+MEDIUM:+LOW:+SSLv2:+EXP:+eNULL
-
-        SSLCertificateFile ${sslServerCert}
-        SSLCertificateKeyFile ${sslServerKey}
-
-        #   MSIE compatability.
-        SetEnvIf User-Agent ".*MSIE.*" \
-                 nokeepalive ssl-unclean-shutdown \
-                 downgrade-1.0 force-response-1.0
-
-    </VirtualHost>
   '';
 
 
@@ -197,6 +185,18 @@ let
 
     ${concatMapStrings (alias: "ServerAlias ${alias}\n") cfg.serverAliases}
 
+    ${if cfg.sslServerCert != "" then ''
+      SSLCertificateFile ${cfg.sslServerCert}
+      SSLCertificateKeyFile ${cfg.sslServerKey}
+    '' else ""}
+    
+    ${if cfg.enableSSL then ''
+      SSLEngine on
+    '' else if enableSSL then /* i.e., SSL is enabled for some host, but not this one */
+    ''
+      SSLEngine off
+    '' else ""}
+
     ${if isMainServer || cfg.adminAddr != "" then ''
       ServerAdmin ${cfg.adminAddr}
     '' else ""}
@@ -210,25 +210,50 @@ let
 
     ${if isMainServer || cfg.documentRoot != null then documentRootConf else ""}
 
+    ${if cfg.enableUserDir then ''
+    
+      UserDir public_html
+      UserDir disabled root
+      
+      <Directory "/home/*/public_html">
+          AllowOverride FileInfo AuthConfig Limit Indexes
+          Options MultiViews Indexes SymLinksIfOwnerMatch IncludesNoExec
+          <Limit GET POST OPTIONS>
+              Order allow,deny
+              Allow from all
+          </Limit>
+          <LimitExcept GET POST OPTIONS>
+              Order deny,allow
+              Deny from all
+          </LimitExcept>
+      </Directory>
+      
+    '' else ""}
+
+    ${if cfg.globalRedirect != "" then ''
+      RedirectPermanent / ${cfg.globalRedirect}
+    '' else ""}
+
+    ${
+      let makeFileConf = elem: ''
+            Alias ${elem.urlPath} ${elem.file}
+          '';
+      in concatMapStrings makeFileConf cfg.servedFiles
+    }
+
     ${
       let makeDirConf = elem: ''
             Alias ${elem.urlPath} ${elem.dir}/
             <Directory ${elem.dir}>
+                Options +Indexes
                 Order allow,deny
                 Allow from all
-                AllowOverride None
+                AllowOverride All
             </Directory>
           '';
       in concatMapStrings makeDirConf cfg.servedDirs
     }
 
-    ${
-      let makeFileConf = elem: ''
-            Alias ${elem.urlPath} ${elem.file}
-          '';
-      in concatMapStrings makeFileConf cfg.servedFiles
-    }
-
     ${concatMapStrings (svc: svc.extraConfig) subservices}
 
     ${cfg.extraConfig}
@@ -239,7 +264,7 @@ let
   
     ServerRoot ${httpd}
 
-    PidFile ${cfg.stateDir}/httpd.pid
+    PidFile ${mainCfg.stateDir}/httpd.pid
 
     <IfModule prefork.c>
         MaxClients           150
@@ -247,22 +272,13 @@ let
     </IfModule>
 
     ${let
-        ports = pkgs.lib.uniqList {  
-	  inputList=(concatMap (localCfg: 
-	    (pkgs.lib.optional localCfg.enableHttp localCfg.httpPort) 
-	    ++
-	    (pkgs.lib.optional localCfg.enableHttps localCfg.httpsPort) 
-	  ) vhosts)
-	  ++
-	  (pkgs.lib.optional cfg.enableSSL cfg.httpsPort)
-	  ++
-	  [cfg.httpPort];
-	};
-	in concatMapStrings (port: "Listen ${toString port}\n") ports
+        ports = map getPort allHosts;
+        uniquePorts = pkgs.lib.uniqList {inputList = ports;};
+      in concatMapStrings (port: "Listen ${toString port}\n") uniquePorts
     }
 
-    User ${cfg.user}
-    Group ${cfg.group}
+    User ${mainCfg.user}
+    Group ${mainCfg.group}
 
     ${let
         load = {name, path}: "LoadModule ${name}_module ${path}\n";
@@ -273,26 +289,6 @@ let
       in concatMapStrings load allModules
     }
 
-    ${if cfg.enableUserDir then ''
-    
-      UserDir public_html
-      UserDir disabled root
-      
-      <Directory "/home/*/public_html">
-          AllowOverride FileInfo AuthConfig Limit Indexes
-          Options MultiViews Indexes SymLinksIfOwnerMatch IncludesNoExec
-          <Limit GET POST OPTIONS>
-              Order allow,deny
-              Allow from all
-          </Limit>
-          <LimitExcept GET POST OPTIONS>
-              Order deny,allow
-              Deny from all
-          </LimitExcept>
-      </Directory>
-      
-    '' else ""}
-
     AddHandler type-map var
 
     <Files ~ "^\.ht">
@@ -309,7 +305,7 @@ let
     Include ${httpd}/conf/extra/httpd-multilang-errordoc.conf
     Include ${httpd}/conf/extra/httpd-languages.conf
     
-    ${if cfg.enableSSL then sslConf else ""}
+    ${if enableSSL then sslConf else ""}
 
     # Fascist default - deny access to everything.
     <Directory />
@@ -328,27 +324,20 @@ let
     </Directory>
 
     # Generate directives for the main server.
-    ${perServerConf true cfg}
+    ${perServerConf true mainCfg}
     
     # Always enable virtual hosts; it doesn't seem to hurt.
-    NameVirtualHost *:${toString cfg.httpPort}
+    NameVirtualHost *:80
+    NameVirtualHost *:443
 
     ${let
-        makeVirtualHost = localCfg: (if localCfg.enableHttp then ''
-          <VirtualHost *:${toString localCfg.httpPort}>
-              ${perServerConf false localCfg}
+        makeVirtualHost = vhost: ''
+          <VirtualHost *:${toString (getPort vhost)}>
+              ${perServerConf false vhost}
           </VirtualHost>
-        '' else "") + ( if localCfg.enableHttps then ''
-          <VirtualHost *:${toString localCfg.httpsPort}>
-	      SSLEngine on
-
-              SSLCertificateFile ${sslServerCert}
-              SSLCertificateKeyFile ${sslServerKey}
-
-              ${perServerConf false localCfg}
-          </VirtualHost>
-	'' else "");
-      in concatMapStrings makeVirtualHost vhosts}
+        '';
+      in concatMapStrings makeVirtualHost vhosts
+    }
   '';
 
     
@@ -359,24 +348,26 @@ in
   name = "httpd";
   
   users = [
-    { name = cfg.user;
+    { name = mainCfg.user;
       description = "Apache httpd user";
     }
   ];
 
   groups = [
-    { name = cfg.group;
+    { name = mainCfg.group;
     }
   ];
 
   extraPath = [httpd] ++ concatMap (svc: svc.extraPath) allSubservices;
 
   # Statically verify the syntactic correctness of the generated
-  # httpd.conf.
+  # httpd.conf.  !!! this is impure!  It doesn't just check for
+  # syntax, but also whether the Apache user/group exist, whether SSL
+  # keys exist, etc.
   buildHook = ''
     echo
     echo '=== Checking the generated Apache configuration file ==='
-    ${httpd}/bin/httpd -f ${httpdConf} -t
+    ${httpd}/bin/httpd -f ${httpdConf} -t || true
   '';
 
   job = ''
@@ -386,13 +377,13 @@ in
     stop on shutdown
 
     start script
-      mkdir -m 0700 -p ${cfg.stateDir}
-      mkdir -m 0700 -p ${cfg.logDir}
+      mkdir -m 0700 -p ${mainCfg.stateDir}
+      mkdir -m 0700 -p ${mainCfg.logDir}
 
       # Get rid of old semaphores.  These tend to accumulate across
       # server restarts, eventually preventing it from restarting
       # succesfully.
-      for i in $(${pkgs.utillinux}/bin/ipcs -s | grep ' ${cfg.user} ' | cut -f2 -d ' '); do
+      for i in $(${pkgs.utillinux}/bin/ipcs -s | grep ' ${mainCfg.user} ' | cut -f2 -d ' '); do
           ${pkgs.utillinux}/bin/ipcrm -s $i
       done
 
@@ -410,8 +401,6 @@ in
 
     env PATH=${pkgs.coreutils}/bin:${pkgs.gnugrep}/bin:${pkgs.lib.concatStringsSep ":" (pkgs.lib.concatMap (svc: svc.extraServerPath) allSubservices)}
 
-    ${pkgs.diffutils}/bin:${pkgs.gnused}/bin
-
     respawn ${httpd}/bin/httpd -f ${httpdConf} -DNO_DETACH
   '';
 
diff --git a/upstart-jobs/apache-httpd/per-server-options.nix b/upstart-jobs/apache-httpd/per-server-options.nix
index 91516196f1f..8a2ee0e849a 100644
--- a/upstart-jobs/apache-httpd/per-server-options.nix
+++ b/upstart-jobs/apache-httpd/per-server-options.nix
@@ -22,31 +22,38 @@
     ";
   };
 
-  httpPort = mkOption {
-    default = 80;
+  port = mkOption {
+    default = 0;
     description = "
-      Port for unencrypted HTTP requests.
+      Port for the server.  0 means use the default port: 80 for http
+      and 443 for https (i.e. when enableSSL is set).
     ";
   };
 
-  httpsPort = mkOption {
-    default = 443;
+  enableSSL = mkOption {
+    default = false;
     description = "
-      Port for encrypted HTTPS requests.
+      Whether to enable SSL (https) support.
     ";
   };
 
-  enableHttp = mkOption {
-    default = true;
+  # Note: sslServerCert and sslServerKey can be left empty, but this
+  # only makes sense for virtual hosts (they will inherit from the
+  # main server).
+  
+  sslServerCert = mkOption {
+    default = ""; 
+    example = "/var/host.cert";
     description = "
-      Whether to listen on unencrypted HTTP.
+      Path to server SSL certificate.
     ";
   };
 
-  enableHttps = mkOption {
-    default = false;
+  sslServerKey = mkOption {
+    default = "";
+    example = "/var/host.key";
     description = "
-      Whether to listen on encrypted HTTPS.
+      Path to server SSL certificate key.
     ";
   };
 
@@ -111,4 +118,21 @@
     ";
   };
 
+  enableUserDir = mkOption {
+    default = false;
+    description = "
+      Whether to enable serving <filename>~/public_html</filename> as
+      <literal>/~<replaceable>username</replaceable></literal>.
+    ";
+  };
+
+  globalRedirect = mkOption {
+    default = "";
+    example = http://newserver.example.org/;
+    description = "
+      If set, all requests for this host are redirected permanently to
+      the given URL.
+    ";
+  };
+
 }
-- 
GitLab


From f2598a9ca54bb453d983952396265266662b6cf4 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 24 Apr 2008 12:36:50 +0000
Subject: [PATCH 0909/5331] * In ssmtp, keep the From line if set explicitly in
 a mail.

svn path=/nixos/trunk/; revision=11706
---
 etc/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/etc/default.nix b/etc/default.nix
index e169b806e31..3015c34926d 100644
--- a/etc/default.nix
+++ b/etc/default.nix
@@ -161,7 +161,8 @@ import ../helpers/make-etc.nix {
   # Configuration for ssmtp.
   ++ optional config.networking.defaultMailServer.directDelivery { 
     source = let cfg = config.networking.defaultMailServer; in pkgs.writeText "ssmtp.conf" ''
-      mailhub=${cfg.hostName}
+      MailHub=${cfg.hostName}
+      FromLineOverride=YES
       ${if cfg.domain != "" then "rewriteDomain=${cfg.domain}" else ""}
       UseTLS=${if cfg.useTLS then "YES" else "NO"}
       UseSTARTTLS=${if cfg.useSTARTTLS then "YES" else "NO"}
-- 
GitLab


From 7ee619f83d8e3930f3c5d75fabd70a7a2fb23c24 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Thu, 24 Apr 2008 18:32:05 +0000
Subject: [PATCH 0910/5331] Typo fix & NameVirtualHost generation

svn path=/nixos/trunk/; revision=11710
---
 upstart-jobs/apache-httpd/default.nix | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/upstart-jobs/apache-httpd/default.nix b/upstart-jobs/apache-httpd/default.nix
index 8ae1db72058..d2298987131 100644
--- a/upstart-jobs/apache-httpd/default.nix
+++ b/upstart-jobs/apache-httpd/default.nix
@@ -19,7 +19,7 @@ let
     canonicalName =
       (if cfg.enableSSL then "https" else "http") + "://" +
       cfg.hostName +
-      (if getPort cfg != (if cfg.enableSSL then 443 else 80) then ":${toString getPort cfg}" else "");
+      (if getPort cfg != (if cfg.enableSSL then 443 else 80) then ":${toString (getPort cfg)}" else "");
 
     # Admin address: inherit from the main server if not specified for
     # a virtual host.
@@ -327,8 +327,11 @@ let
     ${perServerConf true mainCfg}
     
     # Always enable virtual hosts; it doesn't seem to hurt.
-    NameVirtualHost *:80
-    NameVirtualHost *:443
+    ${let
+        ports = map getPort allHosts;
+        uniquePorts = pkgs.lib.uniqList {inputList = ports;};
+      in concatMapStrings (port: "NameVirtualHost *:${toString port}\n") uniquePorts
+    }
 
     ${let
         makeVirtualHost = vhost: ''
-- 
GitLab


From 228792a70d314c788b5cff16cf60d0df2fa46f1e Mon Sep 17 00:00:00 2001
From: Tobias Hammerschmidt <tobias.hammerschmidt@gmx.de>
Date: Fri, 25 Apr 2008 20:28:39 +0000
Subject: [PATCH 0911/5331] updated svn repositories

svn path=/nixos/trunk/; revision=11721
---
 installer/nixos-checkout.sh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/installer/nixos-checkout.sh b/installer/nixos-checkout.sh
index bd530aab4f9..1289a04b5a9 100644
--- a/installer/nixos-checkout.sh
+++ b/installer/nixos-checkout.sh
@@ -50,9 +50,9 @@ if test -e services -a ! -e services/.svn; then
 fi
 
 # Check out the NixOS and Nixpkgs sources.
-svn co https://svn.cs.uu.nl:12443/repos/trace/nixos/trunk nixos${CHECKOUT_SUFFIX}
-svn co https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/${CHECKOUT_BRANCH:-trunk} nixpkgs${CHECKOUT_SUFFIX}
-svn co https://svn.cs.uu.nl:12443/repos/trace/services/trunk services
+svn co https://svn.nixos.org/repos/nix/nixos/trunk nixos${CHECKOUT_SUFFIX}
+svn co https://svn.nixos.org/repos/nix/nixpkgs/${CHECKOUT_BRANCH:-trunk} nixpkgs${CHECKOUT_SUFFIX}
+svn co https://svn.nixos.org/repos/nix/services/trunk services
 
 # Add a few required symlink.
 ln -sfn ../services nixos${CHECKOUT_SUFFIX}/services
-- 
GitLab


From 7a7582ec01c4d78a3908a5d7963761479366b369 Mon Sep 17 00:00:00 2001
From: Marc Weber <marco-oweber@gmx.de>
Date: Sun, 27 Apr 2008 23:56:51 +0000
Subject: [PATCH 0912/5331] * added extraModules apache configuration option

Eelco, can your review this patch ?
I hope it fits your design - if not revert it
This way we can drop the mod_php option (See example)

svn path=/nixos/trunk/; revision=11734
---
 system/options.nix                    | 9 +++++++++
 upstart-jobs/apache-httpd/default.nix | 3 ++-
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/system/options.nix b/system/options.nix
index b34249d8126..b8f378002f7 100644
--- a/system/options.nix
+++ b/system/options.nix
@@ -1441,6 +1441,15 @@
         ";
       };
 
+      extraModules = mkOption {
+        default = pkgs : [];
+        description = ''
+          used to add additional modules
+          Example for PHP:
+          pkgs : [ { name = "php5_module"; path = "${pkgs.php}/modules/libphp5.so" } ]
+        '';
+      };
+
       logPerVirtualHost = mkOption {
         default = false;
         description = "
diff --git a/upstart-jobs/apache-httpd/default.nix b/upstart-jobs/apache-httpd/default.nix
index d2298987131..7d53706c60e 100644
--- a/upstart-jobs/apache-httpd/default.nix
+++ b/upstart-jobs/apache-httpd/default.nix
@@ -285,7 +285,8 @@ let
         allModules =
           concatMap (svc: svc.extraModulesPre) allSubservices ++
           map (name: {inherit name; path = "${httpd}/modules/mod_${name}.so";}) apacheModules ++
-          concatMap (svc: svc.extraModules) allSubservices;
+          concatMap (svc: svc.extraModules) allSubservices ++
+          (pkgs.lib.getAttr ["extraModules"] (x:[]) mainCfg) pkgs;
       in concatMapStrings load allModules
     }
 
-- 
GitLab


From 32e3f4918273770271936fa6b8dfb00d51c4413b Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 28 Apr 2008 08:08:44 +0000
Subject: [PATCH 0913/5331] * Updated the Nixpkgs URL.

svn path=/nixos/trunk/; revision=11737
---
 configuration/rescue-cd.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/configuration/rescue-cd.nix b/configuration/rescue-cd.nix
index 407dfa9ad4b..be96b1981cc 100644
--- a/configuration/rescue-cd.nix
+++ b/configuration/rescue-cd.nix
@@ -8,7 +8,7 @@
 rec {
 
   
-  nixpkgsRel = "nixpkgs-0.12pre10553";
+  nixpkgsRel = "nixpkgs-0.12pre11712-4lrp7j8x";
 
 
   configuration = {
@@ -162,7 +162,7 @@ rec {
     };
     
     installer = {
-      nixpkgsURL = http://nix.cs.uu.nl/dist/nix/ + nixpkgsRel;
+      nixpkgsURL = http://nixos.org/releases/nixpkgs/ + nixpkgsRel;
     };
 
     security = {
@@ -225,8 +225,8 @@ rec {
 
   # Get a recent copy of Nixpkgs.
   nixpkgsTarball = pkgs.fetchurl {
-    url = configuration.installer.nixpkgsURL + "/" + nixpkgsRel + ".tar.bz2";
-    md5 = "a6f1cd8486b7d588ecc7d98f5baf6a73";
+    url = configuration.installer.nixpkgsURL + "/nixexprs.tar.bz2";
+    sha256 = "af5983ce0ac4bb5ad7786905d20fe4ae6bd4c43f6c831baa42bf15f09535dba4";
   };
 
 
-- 
GitLab


From 5d5f48af83da18968f3ee97275498dfc8a933274 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 6 May 2008 08:04:28 +0000
Subject: [PATCH 0914/5331] * Some robots blocks.

svn path=/nixos/trunk/; revision=11762
---
 upstart-jobs/apache-httpd/twiki.nix | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/upstart-jobs/apache-httpd/twiki.nix b/upstart-jobs/apache-httpd/twiki.nix
index 0a84f13ba7c..f72e92c84ea 100644
--- a/upstart-jobs/apache-httpd/twiki.nix
+++ b/upstart-jobs/apache-httpd/twiki.nix
@@ -98,10 +98,22 @@ in {
 
   '';
 
+  robotsEntries = ''
+    User-agent: *
+    Disallow: /rdiff/
+    Disallow: /rename/
+    Disallow: /edit/
+    Disallow: /bin/
+    Disallow: /oops/
+    Disallow: /view/
+    Disallow: /search/
+    Disallow: /attach/
+    Disallow: /pt/bin/
+  '';
+
   # !!! should not be needed
   extraModulesPre = [];
   extraModules = [];
-  robotsEntries = "";
   globalEnvVars = [];
   extraServerPath = [];
   extraPath = [];
-- 
GitLab


From 6f64c4ee0d430612d69192722d4af22b8e5c9c29 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 8 May 2008 12:27:01 +0000
Subject: [PATCH 0915/5331] * syslogd: print messages in the local time zone. *
 dhcpd: log to facility "local1". * syslogd: send "local1" messages to
 /var/log/dhcpd, and "mail"   messages to /var/log/mail.

svn path=/nixos/trunk/; revision=11780
---
 upstart-jobs/default.nix |  5 +++--
 upstart-jobs/dhcpd.nix   | 33 +++++++++++++++++----------------
 upstart-jobs/syslogd.nix | 21 ++++++++++++++-------
 3 files changed, 34 insertions(+), 25 deletions(-)

diff --git a/upstart-jobs/default.nix b/upstart-jobs/default.nix
index 557652156f5..2e86c780237 100644
--- a/upstart-jobs/default.nix
+++ b/upstart-jobs/default.nix
@@ -71,11 +71,12 @@ let
   in pkgs.lib.concatLists ( map nameToJobs (attrNames services)));
     
   jobs = map makeJob
-    ( newProposalJobs ++ 
-    [
+    (newProposalJobs ++ [
+    
     # Syslogd.
     (import ../upstart-jobs/syslogd.nix {
       inherit (pkgs) sysklogd writeText;
+      inherit config;
     })
 
     # The udev daemon creates devices nodes and runs programs when
diff --git a/upstart-jobs/dhcpd.nix b/upstart-jobs/dhcpd.nix
index 95040b3a3d4..d1f0a9626d5 100644
--- a/upstart-jobs/dhcpd.nix
+++ b/upstart-jobs/dhcpd.nix
@@ -6,44 +6,45 @@ let
 
   stateDir = "/var/lib/dhcp"; # Don't use /var/state/dhcp; not FHS-compliant.
 
-  machines = pkgs.lib.concatStrings (map (machine: "
+  machines = pkgs.lib.concatMapStrings (machine: ''
     host ${machine.hostName} {
       hardware ethernet ${machine.ethernetAddress};
       fixed-address ${machine.ipAddress};
     }
-  ") cfg.machines);
+  '') cfg.machines;
 
-  configFile = if cfg.configFile != null then cfg.configFile else pkgs.writeText "dhcpd.conf" "
+  configFile = if cfg.configFile != null then cfg.configFile else pkgs.writeText "dhcpd.conf" ''
     default-lease-time 600;
     max-lease-time 7200;
     authoritative;
     ddns-update-style ad-hoc;
+    log-facility local1; # see dhcpd.nix
     ${cfg.extraConfig}
     ${machines}
-  ";
+  '';
 
 in
   
 {
   name = "dhcpd";
   
-  job = "
-description \"DHCP server\"
+  job = ''
+    description "DHCP server"
 
-start on network-interfaces/started
-stop on network-interfaces/stop
+    start on network-interfaces/started
+    stop on network-interfaces/stop
 
-script
+    script
 
-    mkdir -m 755 -p ${stateDir}
+        mkdir -m 755 -p ${stateDir}
 
-    touch ${stateDir}/dhcpd.leases
+        touch ${stateDir}/dhcpd.leases
 
-    exec ${pkgs.dhcp}/sbin/dhcpd -f -cf ${configFile} \\
-        -lf ${stateDir}/dhcpd.leases \\
-        ${toString cfg.interfaces}
+        exec ${pkgs.dhcp}/sbin/dhcpd -f -cf ${configFile} \
+            -lf ${stateDir}/dhcpd.leases \
+            ${toString cfg.interfaces}
 
-end script
-  ";
+    end script
+  '';
   
 }
diff --git a/upstart-jobs/syslogd.nix b/upstart-jobs/syslogd.nix
index ef5de195f61..3b1c9ea59e7 100644
--- a/upstart-jobs/syslogd.nix
+++ b/upstart-jobs/syslogd.nix
@@ -1,24 +1,31 @@
-{sysklogd, writeText}:
+{sysklogd, writeText, config}:
 
 let
 
   syslogConf = writeText "syslog.conf" ''
-    *.*                /dev/tty10
+    *.*                           /dev/tty10
 
-    *.=warning;*.=err -/var/log/warn
-    *.crit             /var/log/warn
+    # "local1" is used for dhcpd messages.
+    local1.*                     -/var/log/dhcpd
 
+    mail.*                       -/var/log/mail
 
-    *.*               -/var/log/messages
+    *.=warning;*.=err            -/var/log/warn
+    *.crit                        /var/log/warn
+
+    *.*;mail.none;local1.none    -/var/log/messages
   '';
 
 in
 
 {
   name = "syslogd";
-  job = "
+  job = ''
     start on udev
     stop on shutdown
+
+    env TZ=${config.time.timeZone}
+    
     respawn ${sysklogd}/sbin/syslogd -n -f ${syslogConf}
-  ";
+  '';
 }
-- 
GitLab


From c44475b085de6dcb1eeb365198269e33f06799c5 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 8 May 2008 13:47:44 +0000
Subject: [PATCH 0916/5331] * Start klogd to send kernel log messages to
 syslogd.

svn path=/nixos/trunk/; revision=11781
---
 upstart-jobs/default.nix |  6 ++++++
 upstart-jobs/klogd.nix   | 26 ++++++++++++++++++++++++++
 upstart-jobs/syslogd.nix |  8 +++++++-
 3 files changed, 39 insertions(+), 1 deletion(-)
 create mode 100644 upstart-jobs/klogd.nix

diff --git a/upstart-jobs/default.nix b/upstart-jobs/default.nix
index 2e86c780237..d1ea5b25508 100644
--- a/upstart-jobs/default.nix
+++ b/upstart-jobs/default.nix
@@ -79,6 +79,12 @@ let
       inherit config;
     })
 
+    # Klogd.
+    (import ../upstart-jobs/klogd.nix {
+      inherit (pkgs) sysklogd writeText;
+      inherit config;
+    })
+
     # The udev daemon creates devices nodes and runs programs when
     # hardware events occur.
     (import ../upstart-jobs/udev.nix {
diff --git a/upstart-jobs/klogd.nix b/upstart-jobs/klogd.nix
new file mode 100644
index 00000000000..35207b339bd
--- /dev/null
+++ b/upstart-jobs/klogd.nix
@@ -0,0 +1,26 @@
+{sysklogd, writeText, config}:
+
+let
+
+  klogdCmd = "${sysklogd}/sbin/klogd -c 1 -2 -k $(dirname $(readlink -f /var/run/booted-system/kernel))/System.map";
+
+in
+
+{
+  name = "klogd";
+  
+  job = ''
+    description "Kernel log daemon"
+  
+    start on syslogd
+    stop on shutdown
+
+    start script
+      # !!! this hangs for some reason (it blocks reading from
+      # /proc/kmsg).
+      #${klogdCmd} -o
+    end script
+
+    respawn ${klogdCmd} -n
+  '';
+}
diff --git a/upstart-jobs/syslogd.nix b/upstart-jobs/syslogd.nix
index 3b1c9ea59e7..c255eb0d9a8 100644
--- a/upstart-jobs/syslogd.nix
+++ b/upstart-jobs/syslogd.nix
@@ -3,7 +3,10 @@
 let
 
   syslogConf = writeText "syslog.conf" ''
-    *.*                           /dev/tty10
+    kern.warning;*.err;authpriv.none /dev/tty10
+
+    # Send emergency messages to all users.
+    *.emerg                       *
 
     # "local1" is used for dhcpd messages.
     local1.*                     -/var/log/dhcpd
@@ -20,7 +23,10 @@ in
 
 {
   name = "syslogd";
+  
   job = ''
+    description "Syslog daemon"
+  
     start on udev
     stop on shutdown
 
-- 
GitLab


From 828305a5ace0b82f7ca1fa7e5b0e6f274483d208 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 8 May 2008 14:29:00 +0000
Subject: [PATCH 0917/5331] * Prevent warnings about protocol version 1 being
 disabled.

svn path=/nixos/trunk/; revision=11782
---
 upstart-jobs/sshd.nix | 30 ++++++++++++++++--------------
 1 file changed, 16 insertions(+), 14 deletions(-)

diff --git a/upstart-jobs/sshd.nix b/upstart-jobs/sshd.nix
index f8a2f46646f..c64c4eb49a5 100644
--- a/upstart-jobs/sshd.nix
+++ b/upstart-jobs/sshd.nix
@@ -11,7 +11,9 @@ assert permitRootLogin == "yes" ||
 let
 
   sshdConfig = writeText "sshd_config" ''
-  
+
+    Protocol 2
+    
     UsePAM yes
     
     ${if forwardX11 then "
@@ -45,23 +47,23 @@ in
     }
   ];
   
-  job = "
-description \"SSH server\"
+  job = ''
+    description "SSH server"
 
-start on network-interfaces/started
-stop on network-interfaces/stop
+    start on network-interfaces/started
+    stop on network-interfaces/stop
 
-env LD_LIBRARY_PATH=${nssModulesPath}
+    env LD_LIBRARY_PATH=${nssModulesPath}
 
-start script
-    mkdir -m 0755 -p /etc/ssh
+    start script
+        mkdir -m 0755 -p /etc/ssh
 
-    if ! test -f /etc/ssh/ssh_host_dsa_key; then
-        ${openssh}/bin/ssh-keygen -t dsa -b 1024 -f /etc/ssh/ssh_host_dsa_key -N ''
-    fi
-end script
+        if ! test -f /etc/ssh/ssh_host_dsa_key; then
+            ${openssh}/bin/ssh-keygen -t dsa -b 1024 -f /etc/ssh/ssh_host_dsa_key -N ""
+        fi
+    end script
 
-respawn ${openssh}/sbin/sshd -D -h /etc/ssh/ssh_host_dsa_key -f ${sshdConfig}
-  ";
+    respawn ${openssh}/sbin/sshd -D -h /etc/ssh/ssh_host_dsa_key -f ${sshdConfig}
+  '';
   
 }
-- 
GitLab


From 6d2c1eb83832119710aa62921bd291464d9ae467 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 8 May 2008 15:36:56 +0000
Subject: [PATCH 0918/5331] * module_aggregation -> aggregateModules (naming
 convention).

svn path=/nixos/trunk/; revision=11785
---
 system/system.nix | 32 ++++++++++++++++----------------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/system/system.nix b/system/system.nix
index 87fcb630f0e..e65aef0a427 100644
--- a/system/system.nix
+++ b/system/system.nix
@@ -40,6 +40,21 @@ rec {
     config.boot.initrd.kernelModules;
 
 
+  # Tree of kernel modules.  This includes the kernel, plus modules
+  # built outside of the kernel.  We have to combine these into a
+  # single tree of symlinks because modprobe only supports one
+  # directory.
+  modulesTree = pkgs.aggregateModules (
+    [kernel]
+    ++ pkgs.lib.optional config.networking.enableIntel3945ABGFirmware pkgs.iwlwifi
+    ++ pkgs.lib.optional config.networking.enableIntel4965AGNFirmware pkgs.iwlwifi
+    # !!! this should be declared by the xserver Upstart job.
+    ++ pkgs.lib.optional (config.services.xserver.enable && config.services.xserver.videoDriver == "nvidia") pkgs.nvidiaDrivers
+    ++ pkgs.lib.optional config.hardware.enableGo7007 pkgs.wis_go7007
+    ++ config.boot.extraModulePackages
+  );
+
+  
   # Determine the set of modules that we need to mount the root FS.
   modulesClosure = pkgs.makeModulesClosure {
     inherit rootModules;
@@ -70,7 +85,7 @@ rec {
       cp -p $e2fsprogs/sbin/fsck* $e2fsprogs/sbin/e2fsck $out/bin
       cp $udev/sbin/udevd $udev/sbin/udevtrigger $udev/sbin/udevsettle $out/bin
       nuke-refs $out/bin/*
-    '';
+    ''; # */
   
 
   # The init script of boot stage 1 (loading kernel modules for
@@ -134,21 +149,6 @@ rec {
     (map (mod: mod + "/lib") nssModules));
 
 
-  # Tree of kernel modules.  This includes the kernel, plus modules
-  # built outside of the kernel.  We have to combine these into a
-  # single tree of symlinks because modprobe only supports one
-  # directory.
-  modulesTree = pkgs.module_aggregation (
-    [kernel]
-    ++ pkgs.lib.optional config.networking.enableIntel3945ABGFirmware pkgs.iwlwifi
-    ++ pkgs.lib.optional config.networking.enableIntel4965AGNFirmware pkgs.iwlwifi
-    # !!! this should be declared by the xserver Upstart job.
-    ++ pkgs.lib.optional (config.services.xserver.enable && config.services.xserver.videoDriver == "nvidia") pkgs.nvidiaDrivers
-    ++ pkgs.lib.optional config.hardware.enableGo7007 pkgs.wis_go7007
-    ++ config.boot.extraModulePackages
-  );
-
-  
   # Wrapper around modprobe to set the path to the modules.
   modprobe = pkgs.substituteAll {
     dir = "sbin";
-- 
GitLab


From 1042e4affe4e37162f387de0419aa3069512aaba Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 8 May 2008 16:03:18 +0000
Subject: [PATCH 0919/5331] svn path=/nixos/trunk/; revision=11786

---
 configuration/rescue-cd.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/configuration/rescue-cd.nix b/configuration/rescue-cd.nix
index be96b1981cc..e799c26efd3 100644
--- a/configuration/rescue-cd.nix
+++ b/configuration/rescue-cd.nix
@@ -8,7 +8,7 @@
 rec {
 
   
-  nixpkgsRel = "nixpkgs-0.12pre11712-4lrp7j8x";
+  nixpkgsRel = "nixpkgs-0.12pre11779-p80g4123";
 
 
   configuration = {
@@ -226,7 +226,7 @@ rec {
   # Get a recent copy of Nixpkgs.
   nixpkgsTarball = pkgs.fetchurl {
     url = configuration.installer.nixpkgsURL + "/nixexprs.tar.bz2";
-    sha256 = "af5983ce0ac4bb5ad7786905d20fe4ae6bd4c43f6c831baa42bf15f09535dba4";
+    sha256 = "008e8a5c44b30b8aae8c5c776547a2d9f62778fd06ad625ed1efe1367d456fda";
   };
 
 
-- 
GitLab


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 0920/5331] 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]
 	);
 
-- 
GitLab


From 98748a319a3f484750b7051b363ade280ab710cf Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Fri, 9 May 2008 05:58:21 +0000
Subject: [PATCH 0921/5331] I have probably fixed the "separate /boot" problem.
 Tested in Qemu, it worked

svn path=/nixos/trunk/; revision=11789
---
 configuration/rescue-cd-configurable.nix | 15 ++++++++--
 installer/nixos-install.sh               | 35 ++++++++++++++++--------
 2 files changed, 35 insertions(+), 15 deletions(-)

diff --git a/configuration/rescue-cd-configurable.nix b/configuration/rescue-cd-configurable.nix
index b8438f1dbb0..1bf185d2c5a 100644
--- a/configuration/rescue-cd-configurable.nix
+++ b/configuration/rescue-cd-configurable.nix
@@ -147,8 +147,12 @@ rec {
             mkdir -p /etc/nixos/nixos
             tar xjf /install/nixos.tar.bz2 -C /etc/nixos/nixos
             tar xjf /install/nixpkgs.tar.bz2 -C /etc/nixos
+	    tar xjf /install/nixos-services.tar.bz2 -C /etc/nixos
             mv /etc/nixos/nixpkgs-* /etc/nixos/nixpkgs || true
+            mv /etc/nixos/*-nixpkgs /etc/nixos/nixpkgs || true
+            mv /etc/nixos/*-services /etc/nixos/services || true
             ln -sfn ../nixpkgs/pkgs /etc/nixos/nixos/pkgs
+            ln -sfn ../services /etc/nixos/services
             chown -R root.root /etc/nixos
             touch /etc/resolv.conf
             end script
@@ -301,7 +305,7 @@ rec {
  
   makeNixPkgsTarball = tarName: input: ((pkgs.runCommand "tarball-nixpkgs" {inherit tarName;} ''
   ensureDir $out
-    (cd ${input}/.. && tar cvfj $out/${tarName} nixpkgs \
+    (cd ${input}/.. && tar cvfj $out/${tarName} $(basename ${input}) \
         --exclude '*~' \
         --exclude 'result')
   '')+"/${tarName}");
@@ -322,8 +326,9 @@ rec {
   nixpkgsTarball = if networkNixpkgs != "" then pkgs.fetchurl {
     url = configuration.installer.nixpkgsURL + "/" + nixpkgsRel + ".tar.bz2";
     md5 = "6a793b877e2a4fa79827515902e1dfd8";
-  } else makeNixPkgsTarball "nixpkgs.tar.bz2" "/etc/nixos/nixpkgs";
- 
+  } else makeNixPkgsTarball "nixpkgs.tar.bz2" ("" + ./../../nixpkgs);
+
+  nixosServicesTarball = makeNixPkgsTarball "nixos-services.tar.bz2" ("" + ./../../services);
  
   # The configuration file for Grub.
   grubCfg = pkgs.writeText "menu.lst" (''
@@ -374,6 +379,10 @@ rec {
           source = nixpkgsTarball;
           target = "/install/nixpkgs.tar.bz2";
         }
+        {
+          source = nixosServicesTarball;
+          target = "/install/nixos-services.tar.bz2";
+        }
         { 
           source = pkgs.writeText "label" "";
           target = "/${configuration.boot.rootLabel}";
diff --git a/installer/nixos-install.sh b/installer/nixos-install.sh
index 3686bc3147d..c40558df6a8 100644
--- a/installer/nixos-install.sh
+++ b/installer/nixos-install.sh
@@ -48,13 +48,27 @@ fi
 NIXOS=$(readlink -f "$NIXOS")
 
 
+# Enable networking in the chroot.
+mkdir -m 0755 -p $mountPoint/etc
+touch /etc/resolv.conf 
+cp /etc/resolv.conf $mountPoint/etc/
+
 # Mount some stuff in the target root directory.
 mkdir -m 0755 -p $mountPoint/dev $mountPoint/proc $mountPoint/sys $mountPoint/mnt
-mount --rbind / $mountPoint/mnt
 mount --bind /dev $mountPoint/dev
 mount --bind /proc $mountPoint/proc
 mount --bind /sys $mountPoint/sys
 
+# Grub needs a mtab. Make a proper one..
+chroot $mountPoint \
+    /nix/var/nix/profiles/system/sw/bin/cat /proc/mounts > /etc/mtab 
+
+echo "/etc/mtab: "
+cat /mnt/etc/mtab 
+
+# That could spoil mtab with litter.
+mount --rbind / $mountPoint/mnt
+
 cleanup() {
     # !!! don't umount anything we didn't mount ourselves
     for i in $(grep -F "$mountPoint" /proc/mounts \
@@ -114,11 +128,6 @@ mkdir -m 0755 -p $mountPoint/bin
 ln -sf @shell@ $mountPoint/bin/sh
 
 
-# Enable networking in the chroot.
-mkdir -m 0755 -p $mountPoint/etc
-cp /etc/resolv.conf $mountPoint/etc/
-
-
 # Pull the manifest on the CD so that everything in the Nix store on
 # the CD can be copied directly.
 echo "registering substitutes to speed up builds..."
@@ -161,24 +170,26 @@ if test -e $targetNixpkgs; then
     mv $targetNixpkgs $targetNixpkgs.backup-$backupTimestamp
 fi
 
+targetServices=$mountPoint/etc/nixos/services
+if test -e $targetServices; then
+    mv $targetServices $targetServices.backup-$backupTimestamp
+fi
+
 
 # Copy the NixOS/Nixpkgs sources to the target.
 cp -prd $NIXOS $targetNixos
 if test -e /etc/nixos/nixpkgs; then
     cp -prd /etc/nixos/nixpkgs $targetNixpkgs
 fi
-
-
-# Grub needs a mtab.
-rootDevice=$(df $mountPoint | grep '^/' | sed 's^ .*^^')
-echo "$rootDevice / somefs rw 0 0" > $mountPoint/etc/mtab
+if test -e /etc/nixos/services; then
+    cp -prd /etc/nixos/services $targetServices
+fi
 
 
 # Mark the target as a NixOS installation, otherwise
 # switch-to-configuration will chicken out.
 touch $mountPoint/etc/NIXOS
 
-
 # Switch to the new system configuration.  This will install Grub with
 # a menu default pointing at the kernel/initrd/etc of the new
 # configuration.
-- 
GitLab


From 728a27864164954ea1f589885cce2399b2e8ae3f Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 9 May 2008 09:32:31 +0000
Subject: [PATCH 0922/5331] * Unmount only the filesystems that the installer
 actually mounted.   So if the user mounted /mnt/boot or something, don't
 unmount it.

svn path=/nixos/trunk/; revision=11792
---
 installer/nixos-install.sh | 21 +++++++++++++--------
 1 file changed, 13 insertions(+), 8 deletions(-)

diff --git a/installer/nixos-install.sh b/installer/nixos-install.sh
index c40558df6a8..24ef5a512f2 100644
--- a/installer/nixos-install.sh
+++ b/installer/nixos-install.sh
@@ -61,26 +61,31 @@ mount --bind /sys $mountPoint/sys
 
 # Grub needs a mtab. Make a proper one..
 chroot $mountPoint \
-    /nix/var/nix/profiles/system/sw/bin/cat /proc/mounts > /etc/mtab 
-
+    /nix/var/nix/profiles/system/sw/bin/cat /proc/mounts > /etc/mtab
+    
 echo "/etc/mtab: "
 cat /mnt/etc/mtab 
 
 # That could spoil mtab with litter.
 mount --rbind / $mountPoint/mnt
 
-cleanup() {
-    # !!! don't umount anything we didn't mount ourselves
-    for i in $(grep -F "$mountPoint" /proc/mounts \
+umountUnder() {
+    local dir="$1"
+    for i in $(grep -F " $dir" /proc/mounts \
         | @perl@/bin/perl -e 'while (<>) { /^\S+\s+(\S+)\s+/; print "$1\n"; }' \
         | sort -r);
     do
-        if test "$i" != "$mountPoint" -a "$i" != / -a -e "$i"; then
-            umount $i || true
-        fi
+	umount $i || true
     done
 }
 
+cleanup() {
+    umountUnder $mountPoint/mnt
+    umountUnder $mountPoint/dev
+    umountUnder $mountPoint/proc
+    umountUnder $mountPoint/sys
+}
+
 trap "cleanup" EXIT
 
 mkdir -m 01777 -p $mountPoint/tmp
-- 
GitLab


From 5feff6f5d43be60b5fe12f6d7340ceed0b3acb96 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 9 May 2008 10:08:02 +0000
Subject: [PATCH 0923/5331] * Symlink $mountPoint/etc/mtab to /proc/mounts.

svn path=/nixos/trunk/; revision=11793
---
 installer/nixos-install.sh | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

diff --git a/installer/nixos-install.sh b/installer/nixos-install.sh
index 24ef5a512f2..44fdf2d3337 100644
--- a/installer/nixos-install.sh
+++ b/installer/nixos-install.sh
@@ -58,15 +58,6 @@ mkdir -m 0755 -p $mountPoint/dev $mountPoint/proc $mountPoint/sys $mountPoint/mn
 mount --bind /dev $mountPoint/dev
 mount --bind /proc $mountPoint/proc
 mount --bind /sys $mountPoint/sys
-
-# Grub needs a mtab. Make a proper one..
-chroot $mountPoint \
-    /nix/var/nix/profiles/system/sw/bin/cat /proc/mounts > /etc/mtab
-    
-echo "/etc/mtab: "
-cat /mnt/etc/mtab 
-
-# That could spoil mtab with litter.
 mount --rbind / $mountPoint/mnt
 
 umountUnder() {
@@ -191,10 +182,15 @@ if test -e /etc/nixos/services; then
 fi
 
 
+# Grub needs an mtab.
+ln -sfn /proc/mounts $mountPoint/etc/mtab
+
+
 # Mark the target as a NixOS installation, otherwise
 # switch-to-configuration will chicken out.
 touch $mountPoint/etc/NIXOS
 
+
 # Switch to the new system configuration.  This will install Grub with
 # a menu default pointing at the kernel/initrd/etc of the new
 # configuration.
-- 
GitLab


From 8583c52c2cab09286dd307e9133524bb23a757a2 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 9 May 2008 10:08:21 +0000
Subject: [PATCH 0924/5331] * Enable lvm by default.

svn path=/nixos/trunk/; revision=11794
---
 system/options.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/system/options.nix b/system/options.nix
index b8f378002f7..798cb506353 100644
--- a/system/options.nix
+++ b/system/options.nix
@@ -134,7 +134,7 @@
 
     extraModulePackages = mkOption {
       default = [];
-      example = [pkgs.aufs pkgs.nvidiaDrivers];
+      # !!! example = [pkgs.aufs pkgs.nvidiaDrivers];
       description = ''
         A list of additional packages supplying kernel modules.
       '';
@@ -217,7 +217,7 @@
       };
 
       lvm = mkOption {
-        default = false;
+        default = true;
         description = "
           Whether to include lvm in the initial ramdisk. You should use this option
           if your ROOT device is on lvm volume.
-- 
GitLab


From 3e087c0f7377c6e3c8d31089dbc7ea0d333281de Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 9 May 2008 10:46:10 +0000
Subject: [PATCH 0925/5331] * Include "dm_mod" in the initrd by default for LVM
 users.

svn path=/nixos/trunk/; revision=11795
---
 system/options.nix | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/system/options.nix b/system/options.nix
index 798cb506353..7c45d21ef2c 100644
--- a/system/options.nix
+++ b/system/options.nix
@@ -168,20 +168,27 @@
           "sata_uli"
           "ata_piix"
           "pata_marvell"
+          
           # Standard SCSI stuff.
           "sd_mod"
           "sr_mod"
+          
           # Standard IDE stuff.
           "ide_cd"
           "ide_disk"
           "ide_generic"
+          
           # Filesystems.
           "ext3"
+          
           # Support USB keyboards, in case the boot fails and we only have
           # a USB keyboard.
           "ehci_hcd"
           "ohci_hcd"
           "usbhid"
+
+          # LVM.
+          "dm_mod"
         ];
         description = "
           The set of kernel modules in the initial ramdisk used during the
-- 
GitLab


From aea8ac58525e669b8fa177887b1908bcb4228c52 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 9 May 2008 11:14:44 +0000
Subject: [PATCH 0926/5331] * A root on LVM example.

svn path=/nixos/trunk/; revision=11796
---
 configuration/examples/root-on-lvm.nix | 36 ++++++++++++++++++++++++++
 1 file changed, 36 insertions(+)
 create mode 100644 configuration/examples/root-on-lvm.nix

diff --git a/configuration/examples/root-on-lvm.nix b/configuration/examples/root-on-lvm.nix
new file mode 100644
index 00000000000..6ee1da32c44
--- /dev/null
+++ b/configuration/examples/root-on-lvm.nix
@@ -0,0 +1,36 @@
+# This configuration has / on a LVM volume.  Since Grub
+# doesn't know about LVM, a separate /boot is therefore
+# needed.  In particular you need to set "copyKernels"
+# to tell NixOS to copy kernels and initrds from /nix/store
+# to /boot, and "bootMount" to tell Grub the /boot device
+# in Grub syntax (e.g. (hd0,0) for /dev/sda1).
+#
+# In this example, labels are used for file systems and
+# swap devices: "boot" might be /dev/sda1, "root" might be
+# /dev/my-volume-group/root, and "swap" might be /dev/sda2.
+# In particular there is no specific reference to the fact
+# that / is on LVM; that's figured out automatically.
+
+{
+  boot = {
+    grubDevice = "/dev/sda";
+    initrd = {
+      extraKernelModules = ["ata_piix"];
+    };
+    copyKernels = true;
+    bootMount = "(hd0,0)";
+  };
+
+  fileSystems = [
+    { mountPoint = "/";
+      label = "root";
+    }
+    { mountPoint = "/boot";
+      label = "boot";
+    }
+  ];
+
+  swapDevices = [
+    { label = "swap"; }
+  ];
+}
-- 
GitLab


From c612af35649bdaf973690107db082cc2e5b92c6e Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 9 May 2008 11:28:03 +0000
Subject: [PATCH 0927/5331] svn path=/nixos/trunk/; revision=11797

---
 configuration/rescue-cd.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/configuration/rescue-cd.nix b/configuration/rescue-cd.nix
index e799c26efd3..3c4b67e189c 100644
--- a/configuration/rescue-cd.nix
+++ b/configuration/rescue-cd.nix
@@ -8,7 +8,7 @@
 rec {
 
   
-  nixpkgsRel = "nixpkgs-0.12pre11779-p80g4123";
+  nixpkgsRel = "nixpkgs-0.12pre11791-xl06i469";
 
 
   configuration = {
@@ -226,7 +226,7 @@ rec {
   # Get a recent copy of Nixpkgs.
   nixpkgsTarball = pkgs.fetchurl {
     url = configuration.installer.nixpkgsURL + "/nixexprs.tar.bz2";
-    sha256 = "008e8a5c44b30b8aae8c5c776547a2d9f62778fd06ad625ed1efe1367d456fda";
+    sha256 = "267c45134eee9a8a93812589e5bd45333c5061a8047b41f3bf27ed76a1461750";
   };
 
 
-- 
GitLab


From cc7f3c7aaaee4745fe56d199decfc88329d71e94 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 9 May 2008 15:08:43 +0000
Subject: [PATCH 0928/5331] * URL updates.

svn path=/nixos/trunk/; revision=11801
---
 README                      |  2 +-
 doc/manual/installation.xml | 12 ++++++------
 installer/nixos-checkout.sh |  2 +-
 system/options.nix          |  8 ++++----
 4 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/README b/README
index acb8af73c4d..4ecf648a930 100644
--- a/README
+++ b/README
@@ -2,4 +2,4 @@
 
 NixOS is a Linux distribution based on the purely functional package
 management system Nix.  More information can be found at
-http://nix.cs.uu.nl/nixos and in the manual in doc/manual.
+http://nixos.org/nixos and in the manual in doc/manual.
diff --git a/doc/manual/installation.xml b/doc/manual/installation.xml
index 1daf6c6d692..ac4fd98713b 100644
--- a/doc/manual/installation.xml
+++ b/doc/manual/installation.xml
@@ -11,14 +11,14 @@
 <title>Building the installation CD</title>
 
 <para>Instead of building an installation CD, you could just download
-one from <link xlink:href="http://nix.cs.uu.nl/nixos/"/>.  If you want
+one from <link xlink:href="http://nixos.org/nixos/"/>.  If you want
 (or need) to build it yourself:
 
 <orderedlist>
 
   <listitem><para>Make sure that you have a <emphasis>very</emphasis>
   recent pre-release version of Nix installed (<link
-  xlink:href="http://nix.cs.uu.nl/dist/nix/nix-unstable-latest/"/>).
+  xlink:href="http://nixos.org/releases/nix/nix-unstable/"/>).
   The NixOS Nix expressions frequently use bleeding-edge features.  If
   you get any kind of expression evaluation error, try to upgrade your
   Nix.</para></listitem>
@@ -29,18 +29,18 @@ one from <link xlink:href="http://nix.cs.uu.nl/nixos/"/>.  If you want
   channel to speed up building, i.e.,
 
 <screen>
-$ nix-channel --add http://nix.cs.uu.nl/dist/nix/channels-v3/nixpkgs-unstable
+$ nix-channel --add http://nixos.org/releases/nixpkgs/channels/nixpkgs-unstable
 $ nix-channel --update</screen>
 
   </para></listitem>
 
   <listitem><para>Check out NixOS from <link
-  xlink:href="https://svn.cs.uu.nl:12443/repos/trace/nixos/trunk"/> as
+  xlink:href="https://svn.nixos.org/repos/nix/nixos/trunk"/> as
   <literal>nixos</literal>.</para></listitem>
 
   <listitem><para>If you don’t already have Nixpkgs checkout, Check
   out Nixpkgs from <link
-  xlink:href="https://svn.cs.uu.nl:12443/repos/trace/nixos/trunk"/> as
+  xlink:href="https://svn.nixos.org/repos/nix/nixos/trunk"/> as
   <literal>nixpkgs</literal>.</para></listitem>
 
   <listitem><para>In the directory <literal>nixos</literal>, make a
@@ -174,7 +174,7 @@ $ nixos-hardware-scan > /mnt/etc/nixos/configuration.nix</screen>
 
     <para>More examples of NixOS configurations for some actual
     machines can be found at <link
-    xlink:href="https://svn.cs.uu.nl:12443/repos/trace/configurations/trunk/"/>.</para>
+    xlink:href="https://svn.nixos.org/repos/nix/configurations/trunk/"/>.</para>
 
     <note><para>It is very important that you specify in the option
     <option>boot.initrd.extraKernelModules</option> all kernel modules
diff --git a/installer/nixos-checkout.sh b/installer/nixos-checkout.sh
index 1289a04b5a9..12595ad61c3 100644
--- a/installer/nixos-checkout.sh
+++ b/installer/nixos-checkout.sh
@@ -16,7 +16,7 @@ fi
 
 # Obtain Subversion.
 if test -z "$(type -tp svn)"; then
-    #nix-channel --add http://nix.cs.uu.nl/dist/nix/channels-v3/nixpkgs-unstable
+    #nix-channel --add http://nixos.org/releases/nixpkgs/channels/nixpkgs-unstable
     #nix-channel --update
     nix-env -i subversion
 fi
diff --git a/system/options.nix b/system/options.nix
index 7c45d21ef2c..1830a287952 100644
--- a/system/options.nix
+++ b/system/options.nix
@@ -2014,7 +2014,7 @@
 
     nixpkgsURL = mkOption {
       default = "";
-      example = http://nix.cs.uu.nl/dist/nix/nixpkgs-0.11pre7577;
+      example = http://nixos.org/releases/nix/nixpkgs-0.11pre7577;
       description = "
         URL of the Nixpkgs distribution to use when building the
         installation CD.
@@ -2022,10 +2022,10 @@
     };
 
     manifests = mkOption {
-      default = [http://nix.cs.uu.nl/dist/nix/channels-v3/nixpkgs-unstable/MANIFEST];
+      default = [http://nixos.org/releases/nixpkgs/channels/nixpkgs-unstable/MANIFEST];
       example =
-        [ http://nix.cs.uu.nl/dist/nix/channels-v3/nixpkgs-unstable/MANIFEST
-          http://nix.cs.uu.nl/dist/nix/channels-v3/nixpkgs-stable/MANIFEST
+        [ http://nixos.org/releases/nixpkgs/channels/nixpkgs-unstable/MANIFEST
+          http://nixos.org/releases/nixpkgs/channels/nixpkgs-stable/MANIFEST
         ];
       description = "
         URLs of manifests to be downloaded when you run
-- 
GitLab


From 1a6e1a43dc0000acc67c64c7be80046c64644182 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Mon, 12 May 2008 07:12:18 +0000
Subject: [PATCH 0929/5331] Added closed-install example of configurable Live
 DVD. Tested: virtual network of two QEmu-s, one is booted from that LiveDVD,
 another executes one scripted process and forces first to install NixOS.

svn path=/nixos/trunk/; revision=11816
---
 configuration/closed-install.nix              | 57 +++++++++++++++++++
 .../examples/closed-install-configuration.nix | 32 +++++++++++
 configuration/rescue-cd-configurable.nix      | 31 ++++++++++
 3 files changed, 120 insertions(+)
 create mode 100644 configuration/closed-install.nix
 create mode 100644 configuration/examples/closed-install-configuration.nix

diff --git a/configuration/closed-install.nix b/configuration/closed-install.nix
new file mode 100644
index 00000000000..16d65142346
--- /dev/null
+++ b/configuration/closed-install.nix
@@ -0,0 +1,57 @@
+{platform ? __currentSystem} : 
+let 
+  isoFun = import ./rescue-cd-configurable.nix;
+in 
+(isoFun {
+	inherit platform;
+	lib = (import ../pkgs/lib);
+
+	networkNixpkgs = "";
+	manualEnabled = true;
+	rogueEnabled = false;
+	sshdEnabled = true;
+	fontConfigEnabled = false;
+	sudoEnable = true;
+	includeMemtest = false;
+	includeStdenv = true;
+	includeBuildDeps = true;
+
+	/*
+		If anyone uses that DVD on live
+		computer, use DHCP; but also add
+		a rogue address for tests in virtual
+		networks without DHCP at all.
+	*/
+	addIP = "10.0.253.251";
+	netmask = "255.255.0.0";
+
+	kernel = pkgs: (
+		pkgs.aggregateModules 
+		[pkgs.kernel]
+	);
+
+	packages = pkgs : [
+		pkgs.patch
+		pkgs.irssi
+		pkgs.subversion
+		pkgs.w3m
+		pkgs.utillinuxCurses
+		pkgs.wpa_supplicant
+		pkgs.emacs
+		pkgs.vimHugeX
+	];
+
+	/* 
+		The goal is remotely controlled 
+		installation (maybe over virtual
+		networking with QEmu without human
+		interaction), so let's make ssh 
+		work without manual password entry
+	*/
+	additionalFiles = [
+		{
+			source = /var/certs/ssh/id_livedvd.pub;
+			target = "/root/.ssh/authorized_keys";
+		}
+	];
+}).rescueCD
diff --git a/configuration/examples/closed-install-configuration.nix b/configuration/examples/closed-install-configuration.nix
new file mode 100644
index 00000000000..807bf73d0e6
--- /dev/null
+++ b/configuration/examples/closed-install-configuration.nix
@@ -0,0 +1,32 @@
+{
+  boot = {
+    grubDevice = "/dev/sda";
+    copyKernels = true;
+    bootMount = "(hd0,0)";
+  };
+
+  fileSystems = [
+    { mountPoint = "/";
+      device = "/dev/sda3";
+    }
+    { mountPoint = "/boot";
+      device = "/dev/sda1";
+      neededForBoot = true;
+    }
+  ];
+
+  swapDevices = [
+    { device = "/dev/sda2"; }
+  ];
+  
+  services = {
+    sshd = {
+      enable = true;
+    };
+  };
+
+  fonts = { 
+    enableFontConfig = false; 
+  };
+
+}
diff --git a/configuration/rescue-cd-configurable.nix b/configuration/rescue-cd-configurable.nix
index 1bf185d2c5a..9488254755e 100644
--- a/configuration/rescue-cd-configurable.nix
+++ b/configuration/rescue-cd-configurable.nix
@@ -24,6 +24,20 @@
    */
   ,configList ? (configuration : [])
   ,aufs ? true
+
+  /*
+  	Address/netmask to be always added, whatever 
+	network-interfaces configure is kept
+  */
+  ,addIP ? ""
+  ,netmask ? "255.255.255.0"
+  /* To select interface to bind address to */
+  ,ifName ? "eth0"
+
+  /* 
+  	list of: {source, target}
+  */
+  ,additionalFiles ? []
 }:
 let
   ttyCount = lib.fold builtins.add 0 [
@@ -205,6 +219,21 @@ rec {
           '';
         }
       )
+
+      ++
+
+      (lib.optional (addIP != "")
+        {
+	  name = "add-IP-adress";
+	  job = ''
+	    start on network-interfaces/started
+	    script
+	      ${pkgs.nettools}/sbin/ifconfig ${ifName} add ${addIP} up
+	      ${pkgs.nettools}/sbin/ifconfig ${ifName}:0 netmask ${netmask} up 
+	    end script
+	  '';
+	}
+      )
       ;
        
       # And a background to go with that.
@@ -395,6 +424,8 @@ rec {
           target = "boot/memtest.bin";
         }
       )
+      ++
+      additionalFiles
       ;
     };
   
-- 
GitLab


From ad3dc29f6dbd10fe4f36efe2da661a87253987e3 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Mon, 12 May 2008 07:23:55 +0000
Subject: [PATCH 0930/5331] Added scripts used for remote installation

svn path=/nixos/trunk/; revision=11817
---
 .../remote-install-scripts/install-launch.sh  | 10 ++++
 .../remote-install-scripts/install-script.sh  | 53 +++++++++++++++++++
 .../remote-install-scripts/install-start.sh   |  8 +++
 3 files changed, 71 insertions(+)
 create mode 100755 configuration/remote-install-scripts/install-launch.sh
 create mode 100755 configuration/remote-install-scripts/install-script.sh
 create mode 100755 configuration/remote-install-scripts/install-start.sh

diff --git a/configuration/remote-install-scripts/install-launch.sh b/configuration/remote-install-scripts/install-launch.sh
new file mode 100755
index 00000000000..ed2b81b90c5
--- /dev/null
+++ b/configuration/remote-install-scripts/install-launch.sh
@@ -0,0 +1,10 @@
+#! /bin/sh
+
+stop dhclient
+ifconfig eth0 10.0.253.250 netmask 255.255.0.0 up
+
+chmod a+x install-script.sh install-start.sh
+scp -i id_livedvd -o StrictHostKeyChecking=no install-script.sh 10.0.253.251: 
+scp -i id_livedvd -o StrictHostKeyChecking=no install-start.sh 10.0.253.251: 
+ssh -i id_livedvd -o StrictHostKeyChecking=no 10.0.253.251 bash ./install-start.sh 
+
diff --git a/configuration/remote-install-scripts/install-script.sh b/configuration/remote-install-scripts/install-script.sh
new file mode 100755
index 00000000000..2c1d116533a
--- /dev/null
+++ b/configuration/remote-install-scripts/install-script.sh
@@ -0,0 +1,53 @@
+dd if=/dev/zero of=/dev/sda bs=1048576 count=1
+
+sfdisk /dev/sda -uM << EOF
+,512,L
+,1024,S
+,,L
+EOF
+
+mkfs.ext3 /dev/sda1 ; mkswap /dev/sda2 ; mkfs.ext3 /dev/sda3
+
+mount /dev/sda3 /mnt ; mkdir /mnt/boot ; mount /dev/sda1 /mnt/boot
+
+mkdir -p /mnt/etc/nixos
+
+cat > /mnt/etc/nixos/configuration.nix <<EOF
+
+{
+  boot = {
+    grubDevice = "/dev/sda";
+    copyKernels = true;
+    bootMount = "(hd0,0)";
+  };
+
+  fileSystems = [
+    { mountPoint = "/";
+      device = "/dev/sda3";
+    }
+    { mountPoint = "/boot";
+      device = "/dev/sda1";
+      neededForBoot = true;
+    }
+  ];
+
+  swapDevices = [
+    { device = "/dev/sda2"; }
+  ];
+  
+  services = {
+    sshd = {
+      enable = true;
+    };
+  };
+
+  fonts = { 
+    enableFontConfig = false; 
+  };
+
+}
+
+EOF
+
+nixos-install
+
diff --git a/configuration/remote-install-scripts/install-start.sh b/configuration/remote-install-scripts/install-start.sh
new file mode 100755
index 00000000000..6deb806cfd0
--- /dev/null
+++ b/configuration/remote-install-scripts/install-start.sh
@@ -0,0 +1,8 @@
+#! /bin/sh
+
+nohup bash -c 'NIX_REMOTE= ./install-script.sh &>/dev/tty11' &
+
+disown 
+
+exit
+
-- 
GitLab


From b5451023a216576a4703823a0f02047a4a4c1d1d Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Fri, 16 May 2008 07:32:00 +0000
Subject: [PATCH 0931/5331] Applied patch sent by justbeingglad long ago..

svn path=/nixos/trunk/; revision=11833
---
 system/options.nix       | 33 ++++++++++++++++++++-------------
 upstart-jobs/xserver.nix | 12 ++++++------
 2 files changed, 26 insertions(+), 19 deletions(-)

diff --git a/system/options.nix b/system/options.nix
index 1830a287952..e5c64fa96b0 100644
--- a/system/options.nix
+++ b/system/options.nix
@@ -1216,19 +1216,26 @@
         ";
       };
 
-      isSynaptics = mkOption {
-        default = false;
-        example = true;
-        description = "
-          Whether to replace mouse with touchpad.
-        ";
-      };
-
-      devSynaptics = mkOption {
-        default = "/dev/input/event0";
-        description = "
-          Event device for Synaptics touchpad.
-        ";
+      synaptics = {
+        enable = mkOption {
+          default = false;
+          example = true;
+          description = "
+            Whether to replace mouse with touchpad.
+          ";
+        };
+	dev = mkOption {
+          default = "/dev/input/event0";
+          description = "
+            Event device for Synaptics touchpad.
+          ";
+        };
+	minSpeed = mkOption {
+	  default = "0.06";
+	};
+	maxSpeed = mkOption {
+	  default = "0.12";
+	};
       };
 
       layout = mkOption {
diff --git a/upstart-jobs/xserver.nix b/upstart-jobs/xserver.nix
index 8ef8619f4c3..8a4dd90e958 100644
--- a/upstart-jobs/xserver.nix
+++ b/upstart-jobs/xserver.nix
@@ -49,7 +49,7 @@ let
     ++ optional (videoDriver == "intel") xorg.xf86videointel
     ++ optional (videoDriver == "nv") xorg.xf86videonv
     ++ optional (videoDriver == "ati") xorg.xf86videoati
-    ++ (optional cfg.isSynaptics ["${pkgs.synaptics}/${xorg.xorgserver}" /*xorg.xf86inputevdev*/]);
+    ++ (optional cfg.synaptics.enable ["${pkgs.synaptics}/${xorg.xorgserver}" /*xorg.xf86inputevdev*/]);
 
 
   configFile = stdenv.mkDerivation {
@@ -58,11 +58,11 @@ let
     inherit fontDirectories videoDriver resolutions;
     isClone = if cfg.isClone then "on" else "off";
 
-    synapticsInputDevice = if cfg.isSynaptics then ''
+    synapticsInputDevice = if cfg.synaptics.enable then ''
       Section "InputDevice"
         Identifier "Touchpad[0]"
         Driver "synaptics"
-        Option "Device" "${cfg.devSynaptics}"
+        Option "Device" "${cfg.synaptics.dev}"
         Option "Protocol" "PS/2"
         Option "LeftEdge" "1700"
         Option "RightEdge" "5300"
@@ -73,8 +73,8 @@ let
         Option "MaxTapTime" "180"
         Option "MaxTapMove" "220"
         Option "VertScrollDelta" "100"
-        Option "MinSpeed" "0.06"
-        Option "MaxSpeed" "0.12"
+        Option "MinSpeed" "${cfg.synaptics.minSpeed}"
+        Option "MaxSpeed" "${cfg.synaptics.maxSpeed}"
         Option "AccelFactor" "0.0010"
         Option "SHMConfig" "on"
         Option "Repeater" "/dev/input/mice"
@@ -91,7 +91,7 @@ let
     xkbModel = cfg.xkbModel;
     layout = cfg.layout;
 
-    corePointer = if cfg.isSynaptics then "Touchpad[0]" else "Mouse[0]";
+    corePointer = if cfg.synaptics.enable then "Touchpad[0]" else "Mouse[0]";
 
     internalAGPGART =
       if cfg.useInternalAGPGART == "yes" then
-- 
GitLab


From 3ed80192c03f5c713fabaee9efd99d2c1409c8bc Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 20 May 2008 14:53:55 +0000
Subject: [PATCH 0932/5331] * Every option needs a description, otherwise the
 manual can't be   built...

svn path=/nixos/trunk/; revision=11856
---
 system/options.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/system/options.nix b/system/options.nix
index e5c64fa96b0..fe3a1fc3800 100644
--- a/system/options.nix
+++ b/system/options.nix
@@ -1232,9 +1232,11 @@
         };
 	minSpeed = mkOption {
 	  default = "0.06";
+          description = "TODO";
 	};
 	maxSpeed = mkOption {
 	  default = "0.12";
+          description = "TODO";
 	};
       };
 
-- 
GitLab


From 27fced519e2067935f20eeada140e2d69ee0d4bb Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Tue, 20 May 2008 14:59:27 +0000
Subject: [PATCH 0933/5331] Forgot description is mandatory for all options.
 Added description to synaptics fine-tune settings.

svn path=/nixos/trunk/; revision=11857
---
 system/options.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/system/options.nix b/system/options.nix
index fe3a1fc3800..c60044e85ae 100644
--- a/system/options.nix
+++ b/system/options.nix
@@ -1232,11 +1232,11 @@
         };
 	minSpeed = mkOption {
 	  default = "0.06";
-          description = "TODO";
+          description = "Cursor speed factor for precision finger motion";
 	};
 	maxSpeed = mkOption {
 	  default = "0.12";
-          description = "TODO";
+          description = "Cursor speed factor for highest-speed finger motion";
 	};
       };
 
-- 
GitLab


From bb1ee3f19065811700d4565849c2a6725fc96008 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 22 May 2008 11:59:46 +0000
Subject: [PATCH 0934/5331] * boot.kernel renamed to boot.kernelPackages (see
 the help for a   description) to allow all kernel-related packages to be
 overriden   easily.  For instance, you can now say in configuration.nix

    boot = {
      kernelPackages = pkgs: pkgs.kernelPackages_2_6_25;
    };

  to use Linux 2.6.25.x.  Externel kernel module packages (like
  the NVIDIA drivers) appropriate for this kernel will then be used
  automatically.

svn path=/nixos/trunk/; revision=11880
---
 configuration/rescue-cd.nix |  6 +++--
 system/options.nix          | 19 ++++++++++-----
 system/system.nix           | 48 +++++++++++++++++++++----------------
 upstart-jobs/default.nix    |  7 +++---
 4 files changed, 48 insertions(+), 32 deletions(-)

diff --git a/configuration/rescue-cd.nix b/configuration/rescue-cd.nix
index 3c4b67e189c..a69832d8269 100644
--- a/configuration/rescue-cd.nix
+++ b/configuration/rescue-cd.nix
@@ -19,7 +19,9 @@ rec {
       # The label used to identify the installation CD.
       rootLabel = "NIXOS";
       extraTTYs = [7 8]; # manual, rogue
-      extraModulePackages = [pkgs.aufs];
+      extraModulePackages = [system.kernelPackages.aufs];
+      
+      #kernelPackages = pkgs: pkgs.kernelPackages_2_6_25;
       
       initrd = {
         extraKernelModules = [
@@ -263,7 +265,7 @@ rec {
       { source = grubCfg;
         target = "boot/grub/menu.lst";
       }
-      { source = pkgs.kernel + "/vmlinuz";
+      { source = system.kernel + "/vmlinuz";
         target = "boot/vmlinuz";
       }
       { source = system.initialRamdisk + "/initrd";
diff --git a/system/options.nix b/system/options.nix
index c60044e85ae..37d6023eef3 100644
--- a/system/options.nix
+++ b/system/options.nix
@@ -75,13 +75,20 @@
       ";
     };
 
-    kernel = mkOption {
-      default = pkgs: pkgs.kernel;
+    kernelPackages = mkOption {
+      default = pkgs: pkgs.kernelPackages;
+      example = pkgs: pkgs.kernelPackages_2_6_25;
       description = "
-        Function that takes package collection and returns kernel 
-        package. Do not collect old generations after changing it
-        until you get to boot successfully. In principle, you can 
-        specify a kernel that will build, but not boot.
+        This option allows you to override the Linux kernel used by
+        NixOS.  Since things like external kernel module packages are
+        tied to the kernel you're using, it also overrides those.
+        This option is a function that takes Nixpkgs as an argument
+        (as a convenience), and returns an attribute set containing at
+        the very least an attribute <varname>kernel</varname>.
+        Additional attributes may be needed depending on your
+        configuration.  For instance, if you use the NVIDIA X driver,
+        then it also needs to contain an attribute
+        <varname>nvidiaDrivers</varname>.
       ";
     };
 
diff --git a/system/system.nix b/system/system.nix
index e65aef0a427..c55e31914af 100644
--- a/system/system.nix
+++ b/system/system.nix
@@ -33,24 +33,26 @@ rec {
 
   nix = config.environment.nix pkgs;
 
-  kernel = config.boot.kernel pkgs;
+  kernelPackages = config.boot.kernelPackages pkgs;
+
+  kernel = kernelPackages.kernel;
 
   rootModules = 
     config.boot.initrd.extraKernelModules ++
     config.boot.initrd.kernelModules;
 
 
+
   # Tree of kernel modules.  This includes the kernel, plus modules
   # built outside of the kernel.  We have to combine these into a
   # single tree of symlinks because modprobe only supports one
   # directory.
   modulesTree = pkgs.aggregateModules (
     [kernel]
-    ++ pkgs.lib.optional config.networking.enableIntel3945ABGFirmware pkgs.iwlwifi
-    ++ pkgs.lib.optional config.networking.enableIntel4965AGNFirmware pkgs.iwlwifi
+    ++ pkgs.lib.optional ((config.networking.enableIntel3945ABGFirmware || config.networking.enableIntel4965AGNFirmware) && !kernel.features ? iwlwifi) kernelPackages.iwlwifi
     # !!! this should be declared by the xserver Upstart job.
-    ++ pkgs.lib.optional (config.services.xserver.enable && config.services.xserver.videoDriver == "nvidia") pkgs.nvidiaDrivers
-    ++ pkgs.lib.optional config.hardware.enableGo7007 pkgs.wis_go7007
+    ++ pkgs.lib.optional (config.services.xserver.enable && config.services.xserver.videoDriver == "nvidia") kernelPackages.nvidiaDrivers
+    ++ pkgs.lib.optional config.hardware.enableGo7007 kernelPackages.wis_go7007
     ++ config.boot.extraModulePackages
   );
 
@@ -116,21 +118,24 @@ rec {
       { object = bootStage1;
         symlink = "/init";
       }
-    ] ++ (if config.boot.initrd.enableSplashScreen then [
-      { object = pkgs.runCommand "splashutils" {} ''
-          ensureDir $out/bin
-          cp ${pkgs.splashutils}/bin/splash_helper $out/bin
-        '';
-        suffix = "/bin/splash_helper";
-        symlink = "/sbin/splash_helper";
-      }
-      { object = import ../helpers/unpack-theme.nix {
-          inherit (pkgs) stdenv;
-          theme = config.services.ttyBackgrounds.defaultTheme;
-        };
-        symlink = "/etc/splash";
-      }
-    ] else []);
+    ] ++
+      pkgs.lib.optionals
+        (config.boot.initrd.enableSplashScreen && kernelPackages.kernel.features ? fbSplash)
+        [
+          { object = pkgs.runCommand "splashutils" {} ''
+              ensureDir $out/bin
+              cp ${kernelPackages.splashutils}/bin/splash_helper $out/bin
+            '';
+            suffix = "/bin/splash_helper";
+            symlink = "/sbin/splash_helper";
+          }
+          { object = import ../helpers/unpack-theme.nix {
+              inherit (pkgs) stdenv;
+              theme = config.services.ttyBackgrounds.defaultTheme;
+            };
+            symlink = "/etc/splash";
+          }
+        ];
   };
 
 
@@ -171,7 +176,8 @@ rec {
               
   # The services (Upstart) configuration for the system.
   upstartJobs = import ../upstart-jobs/default.nix {
-    inherit config pkgs nix modprobe nssModulesPath nixEnvVars optionDeclarations;
+    inherit config pkgs nix modprobe nssModulesPath nixEnvVars
+      optionDeclarations kernelPackages;
   };
 
 
diff --git a/upstart-jobs/default.nix b/upstart-jobs/default.nix
index d1ea5b25508..9f2c0f1b14d 100644
--- a/upstart-jobs/default.nix
+++ b/upstart-jobs/default.nix
@@ -1,4 +1,4 @@
-{config, pkgs, nix, modprobe, nssModulesPath, nixEnvVars, optionDeclarations}:
+{config, pkgs, nix, modprobe, nssModulesPath, nixEnvVars, optionDeclarations, kernelPackages}:
 
 let 
 
@@ -391,9 +391,10 @@ let
   )
 
   # Transparent TTY backgrounds.
-  ++ optional config.services.ttyBackgrounds.enable
+  ++ optional (config.services.ttyBackgrounds.enable && kernelPackages.kernel.features ? fbSplash)
     (import ../upstart-jobs/tty-backgrounds.nix {
-      inherit (pkgs) stdenv splashutils;
+      inherit (pkgs) stdenv;
+      inherit (kernelPackages) splashutils;
       
       backgrounds =
       
-- 
GitLab


From ecef3b1f617e2db6e8ad1e13cc620a4de5f56299 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Thu, 22 May 2008 19:30:00 +0000
Subject: [PATCH 0935/5331] Passing packages list to extraModulePackages

svn path=/nixos/trunk/; revision=11884
---
 configuration/rescue-cd.nix | 2 +-
 system/options.nix          | 4 ++--
 system/system.nix           | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/configuration/rescue-cd.nix b/configuration/rescue-cd.nix
index a69832d8269..05420975d5f 100644
--- a/configuration/rescue-cd.nix
+++ b/configuration/rescue-cd.nix
@@ -19,7 +19,7 @@ rec {
       # The label used to identify the installation CD.
       rootLabel = "NIXOS";
       extraTTYs = [7 8]; # manual, rogue
-      extraModulePackages = [system.kernelPackages.aufs];
+      extraModulePackages = pkgs: [system.kernelPackages.aufs];
       
       #kernelPackages = pkgs: pkgs.kernelPackages_2_6_25;
       
diff --git a/system/options.nix b/system/options.nix
index 37d6023eef3..69f4971e833 100644
--- a/system/options.nix
+++ b/system/options.nix
@@ -140,8 +140,8 @@
     };
 
     extraModulePackages = mkOption {
-      default = [];
-      # !!! example = [pkgs.aufs pkgs.nvidiaDrivers];
+      default = pkgs: [];
+      # !!! example = pkgs: [pkgs.aufs pkgs.nvidiaDrivers];
       description = ''
         A list of additional packages supplying kernel modules.
       '';
diff --git a/system/system.nix b/system/system.nix
index c55e31914af..47b3f5d1ab0 100644
--- a/system/system.nix
+++ b/system/system.nix
@@ -53,7 +53,7 @@ rec {
     # !!! this should be declared by the xserver Upstart job.
     ++ pkgs.lib.optional (config.services.xserver.enable && config.services.xserver.videoDriver == "nvidia") kernelPackages.nvidiaDrivers
     ++ pkgs.lib.optional config.hardware.enableGo7007 kernelPackages.wis_go7007
-    ++ config.boot.extraModulePackages
+    ++ (config.boot.extraModulePackages pkgs)
   );
 
   
-- 
GitLab


From da13d7ed13819be1c76c71a488ebdaa78e32ef44 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Fri, 23 May 2008 06:40:16 +0000
Subject: [PATCH 0936/5331] Fixed instantiation errors after kernel changes...

svn path=/nixos/trunk/; revision=11886
---
 configuration/closed-install.nix         |  5 -----
 configuration/live-dvd-X-medium.nix      | 25 +++---------------------
 configuration/live-dvd-X-no-soft.nix     | 18 +----------------
 configuration/live-dvd-X.nix             | 19 +-----------------
 configuration/live-dvd.nix               |  5 -----
 configuration/rescue-cd-configurable.nix | 11 ++++++-----
 upstart-jobs/xserver.nix                 |  9 +++++----
 7 files changed, 16 insertions(+), 76 deletions(-)

diff --git a/configuration/closed-install.nix b/configuration/closed-install.nix
index 16d65142346..c78fadd1632 100644
--- a/configuration/closed-install.nix
+++ b/configuration/closed-install.nix
@@ -25,11 +25,6 @@ in
 	addIP = "10.0.253.251";
 	netmask = "255.255.0.0";
 
-	kernel = pkgs: (
-		pkgs.aggregateModules 
-		[pkgs.kernel]
-	);
-
 	packages = pkgs : [
 		pkgs.patch
 		pkgs.irssi
diff --git a/configuration/live-dvd-X-medium.nix b/configuration/live-dvd-X-medium.nix
index d6532581017..ec0089ded56 100644
--- a/configuration/live-dvd-X-medium.nix
+++ b/configuration/live-dvd-X-medium.nix
@@ -19,21 +19,8 @@ let
 	tty = "9";
   };
 
-  theKernel = pkgs: let baseKernel=pkgs.kernel; 
-	in (pkgs.aggregateModules 
-    		[
-		baseKernel
-		(pkgs.kqemuFunCurrent baseKernel)
-		(pkgs.atherosFun {
-			kernel = baseKernel;
-			version = "r2756";
-			pci001c_rev01 = true;
-		} null)
-		]);
-
-
 in 
-(isoFun {
+(isoFun (rec {
 	inherit platform;
 	lib = (import ../pkgs/lib);
 
@@ -48,12 +35,7 @@ in
 	includeBuildDeps = true;
 	addUsers = ["nixos" "livecd" "livedvd" 
 		"user" "guest" "nix"];
-
-	kernel = pkgs: (
-		pkgs.aggregateModules 
-		[pkgs.kernel]
-	);
-
+	
 	extraInitrdKernelModules = 
 		import ./moduleList.nix;
 
@@ -120,7 +102,6 @@ in
 		pkgs.wirelesstools
 		pkgs.usbutils
 		pkgs.dmidecode
-		(theKernel pkgs)
 		pkgs.sshfsFuse
 		pkgs.ratpoison
 		pkgs.xorg.twm
@@ -229,4 +210,4 @@ in
                 });
         }
 	];
-}).rescueCD
+})).rescueCD
diff --git a/configuration/live-dvd-X-no-soft.nix b/configuration/live-dvd-X-no-soft.nix
index fbde2a33274..2afe37aa5f8 100644
--- a/configuration/live-dvd-X-no-soft.nix
+++ b/configuration/live-dvd-X-no-soft.nix
@@ -19,19 +19,6 @@ let
 	tty = "9";
   };
 
-  theKernel = pkgs: let baseKernel=pkgs.kernel; 
-	in (pkgs.aggregateModules 
-    		[
-		baseKernel
-		(pkgs.kqemuFunCurrent baseKernel)
-		(pkgs.atherosFun {
-			kernel = baseKernel;
-			version = "r2756";
-			pci001c_rev01 = true;
-		} null)
-		]);
-
-
 in 
 (isoFun {
 	inherit platform;
@@ -49,10 +36,7 @@ in
 	addUsers = ["nixos" "livecd" "livedvd" 
 		"user" "guest" "nix"];
 
-	kernel = pkgs: (
-		pkgs.aggregateModules 
-		[pkgs.kernel]
-	);
+	extraModulePackages = pkgs: [pkgs.kernelPackages.kqemu];
 	extraInitrdKernelModules = 
 		import ./moduleList.nix;
 
diff --git a/configuration/live-dvd-X.nix b/configuration/live-dvd-X.nix
index b133b674267..e9b3c2df2eb 100644
--- a/configuration/live-dvd-X.nix
+++ b/configuration/live-dvd-X.nix
@@ -19,19 +19,6 @@ let
 	tty = "9";
   };
 
-  theKernel = pkgs: let baseKernel=pkgs.kernel; 
-	in (pkgs.aggregateModules 
-    		[
-		baseKernel
-		(pkgs.kqemuFunCurrent baseKernel)
-		(pkgs.atherosFun {
-			kernel = baseKernel;
-			version = "r2756";
-			pci001c_rev01 = true;
-		} null)
-		]);
-
-
 in 
 (isoFun {
 	inherit platform;
@@ -49,10 +36,7 @@ in
 	addUsers = ["nixos" "livecd" "livedvd" 
 		"user" "guest" "nix"];
 
-	kernel = pkgs: (
-		pkgs.aggregateModules 
-		[pkgs.kernel]
-	);
+	extraModulePackages = pkgs: [pkgs.kernelPackages.kqemu];
 
 	extraInitrdKernelModules = 
 		import ./moduleList.nix;
@@ -128,7 +112,6 @@ in
 		pkgs.sdparm
 		pkgs.hdparm
 		pkgs.hddtemp
-		(theKernel pkgs)
 		pkgs.sshfsFuse
 		pkgs.ratpoison
 		pkgs.xorg.twm
diff --git a/configuration/live-dvd.nix b/configuration/live-dvd.nix
index 53a690f4366..f4bdab1ac4c 100644
--- a/configuration/live-dvd.nix
+++ b/configuration/live-dvd.nix
@@ -16,11 +16,6 @@ in
 	includeStdenv = true;
 	includeBuildDeps = true;
 
-	kernel = pkgs: (
-		pkgs.aggregateModules 
-		[pkgs.kernel]
-	);
-
 	packages = pkgs : [
 		pkgs.irssi
 		pkgs.elinks
diff --git a/configuration/rescue-cd-configurable.nix b/configuration/rescue-cd-configurable.nix
index 9488254755e..c8ec9875805 100644
--- a/configuration/rescue-cd-configurable.nix
+++ b/configuration/rescue-cd-configurable.nix
@@ -12,7 +12,8 @@
   ,includeMemtest ? true
   ,includeStdenv ? true
   ,includeBuildDeps ? false
-  ,kernel ? (pkgs : pkgs.kernel)
+  ,kernelPackages ? (pkgs : pkgs.kernelPackages)
+  ,extraModulePackages ? (pkgs : [])
   ,addUsers ? []
   ,extraInitrdKernelModules ? []
   ,bootKernelModules ? []
@@ -127,16 +128,16 @@ rec {
       extraTTYs = [] 
         ++ (lib.optional manualEnabled 7) 
         ++ (lib.optional rogueEnabled 8);
-      inherit kernel;
+      inherit kernelPackages;
       initrd = {
       extraKernelModules = extraInitrdKernelModules
       ++ (if aufs then ["aufs"] else [])
       ;
       };
       kernelModules = bootKernelModules;
-      extraModulePackages = []
-      ++(if aufs then [pkgs.aufs] else [])
-      ;
+      extraModulePackages = pkgs: ((extraModulePackages pkgs)
+      ++(if aufs then [(kernelPackages pkgs).aufs] else [])
+      );
     };
     
     services = {
diff --git a/upstart-jobs/xserver.nix b/upstart-jobs/xserver.nix
index 8a4dd90e958..29ae21ac076 100644
--- a/upstart-jobs/xserver.nix
+++ b/upstart-jobs/xserver.nix
@@ -36,7 +36,7 @@ let
 
     
   modules = 
-    optional (videoDriver == "nvidia") pkgs.nvidiaDrivers #make sure it first loads the nvidia libs
+    optional (videoDriver == "nvidia") nvidiaDrivers #make sure it first loads the nvidia libs
     ++ [
       xorg.xorgserver
       xorg.xf86inputkeyboard
@@ -313,6 +313,7 @@ let
       };
     in if cfg.slim.theme == null then "${pkgs.slim}/share/slim/themes" else unpackedTheme;       
 
+    nvidiaDrivers = (config.boot.kernelPackages pkgs).nvidiaDrivers;
 
 in
 
@@ -351,7 +352,7 @@ rec {
     xorg.xset # used by startkde, non-essential
   ]
   ++ optional (videoDriver == "nvidia") [
-    pkgs.nvidiaDrivers
+    nvidiaDrivers
   ];
 
 
@@ -375,7 +376,7 @@ rec {
       rm -f /var/run/opengl-driver
       ${if videoDriver == "nvidia"        
         then ''
-          ln -sf ${pkgs.nvidiaDrivers} /var/run/opengl-driver
+          ln -sf ${nvidiaDrivers} /var/run/opengl-driver
         ''
 	else if cfg.driSupport
         then "ln -sf ${pkgs.mesa} /var/run/opengl-driver"
@@ -392,7 +393,7 @@ rec {
     env XKB_BINDIR=${xorg.xkbcomp}/bin # Needed for the Xkb extension.
 
     ${if videoDriver == "nvidia" 
-      then "env LD_LIBRARY_PATH=${xorg.libX11}/lib:${xorg.libXext}/lib:${pkgs.nvidiaDrivers}/lib" 
+      then "env LD_LIBRARY_PATH=${xorg.libX11}/lib:${xorg.libXext}/lib:${nvidiaDrivers}/lib" 
       else ""
     }
 
-- 
GitLab


From eff945115b0658a7794bec156998367c29ae898c Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Tue, 3 Jun 2008 07:06:35 +0000
Subject: [PATCH 0937/5331] Added gpm service

svn path=/nixos/trunk/; revision=11952
---
 system/options.nix       | 15 +++++++++++++++
 upstart-jobs/default.nix |  6 ++++++
 upstart-jobs/gpm.nix     | 17 +++++++++++++++++
 3 files changed, 38 insertions(+)
 create mode 100644 upstart-jobs/gpm.nix

diff --git a/system/options.nix b/system/options.nix
index 69f4971e833..9be4ce1c384 100644
--- a/system/options.nix
+++ b/system/options.nix
@@ -2024,6 +2024,21 @@
       };
     };
 
+    gpm = {
+      enable = mkOption {
+        default = false;
+	description = "
+	  Whether to enable general purpose mouse daemon.
+	";
+      };
+      protocol = mkOption {
+        default = "ps/2";
+	description = "
+	  Mouse protocol to use.
+	";
+      };
+    };
+
   };
 
   installer = {
diff --git a/upstart-jobs/default.nix b/upstart-jobs/default.nix
index 9f2c0f1b14d..d16b5b16084 100644
--- a/upstart-jobs/default.nix
+++ b/upstart-jobs/default.nix
@@ -365,6 +365,12 @@ let
       inherit (pkgs) stdenv hal;
     })
 
+  ++ optional config.services.gpm.enable 
+    (import ../upstart-jobs/gpm.nix {
+      inherit (pkgs) gpm;
+      gpmConfig = config.services.gpm;
+    })
+
   # Nagios system/network monitoring daemon.
   ++ optional config.services.nagios.enable
     (import ../upstart-jobs/nagios {
diff --git a/upstart-jobs/gpm.nix b/upstart-jobs/gpm.nix
new file mode 100644
index 00000000000..798ad4041eb
--- /dev/null
+++ b/upstart-jobs/gpm.nix
@@ -0,0 +1,17 @@
+{gpm, gpmConfig}:
+
+let 
+  gpmBin = "${gpm}/sbin/gpm";
+
+in
+{
+  name = "gpm";
+  job = ''
+    description = "General purpose mouse"
+
+    start on udev
+    stop on shutdown
+
+    respawn ${gpmBin} -m /dev/input/mice -t ${gpmConfig.protocol} -D &>/dev/null
+  '';
+}
-- 
GitLab


From 33aae3136a6edf909d9bd0986887bf2a902e1413 Mon Sep 17 00:00:00 2001
From: Sander van der Burg <s.vanderburg@tudelft.nl>
Date: Tue, 3 Jun 2008 13:30:37 +0000
Subject: [PATCH 0938/5331] Make old http service working again

svn path=/nixos/trunk/; revision=11956
---
 upstart-jobs/httpd.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/upstart-jobs/httpd.nix b/upstart-jobs/httpd.nix
index 45ac26610e6..f9613f931ff 100644
--- a/upstart-jobs/httpd.nix
+++ b/upstart-jobs/httpd.nix
@@ -10,8 +10,8 @@ let
     
   documentRoot = cfg.documentRoot;
   hostName = cfg.hostName;
-  httpPort = cfg.httpPort;
-  httpsPort = cfg.httpsPort;
+  httpPort = cfg.port;
+  httpsPort = 443;
   user = cfg.user;
   group = cfg.group;
   adminAddr = cfg.adminAddr;
-- 
GitLab


From bd33b3e756ffe6320e592d83cc5879d0eab68956 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 4 Jun 2008 09:01:54 +0000
Subject: [PATCH 0939/5331] * Build through the Nix daemon if it's running.

svn path=/nixos/trunk/; revision=11966
---
 installer/nixos-rebuild.sh | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/installer/nixos-rebuild.sh b/installer/nixos-rebuild.sh
index 4183741b202..f36d22c0e4d 100644
--- a/installer/nixos-rebuild.sh
+++ b/installer/nixos-rebuild.sh
@@ -29,6 +29,17 @@ NIXPKGS=${NIXPKGS:-$NIXOS/pkgs}
 NIXOS_CONFIG=${NIXOS_CONFIG:-/etc/nixos/configuration.nix}
 
 
+# If the Nix daemon is running, then use it.  This allows us to use
+# the latest Nix from Nixpkgs (below) for expression evaluation, while
+# still using the old Nix (via the daemon) for actual store access.
+# This matters if the new Nix in Nixpkgs has a schema change.  It
+# would upgrade the schema, which should only happen once we actually
+# switch to the new configuration.
+if initctl status nix-daemonn 2>&1 | grep -q ' running'; then
+    export NIX_REMOTE=${NIX_REMOTE:-daemon}
+fi
+
+
 # Pull the manifests defined in the configuration (the "manifests"
 # attribute).  Wonderfully hacky.
 if test "${NIXOS_PULL:-1}" != 0; then
-- 
GitLab


From df241fd6edf486675008e9b2d22206319a7674d4 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 4 Jun 2008 09:11:47 +0000
Subject: [PATCH 0940/5331] * Don't include /var/run/current-system/sw/lib in
 the LD_LIBRARY_PATH   by default since this can really make the functioning
 of   applications unpredictable as they can pick up arbitrary   library
 versions from that directory.  LD_LIBRARY_PATH should only   contain very
 specific paths (like /var/run/opengl-driver/lib for   overriding the system
 OpenGL implementation, or the NSS module   path).  This is even more
 important given that the stdenv-updates   branch uses RUNPATHs instead of
 RPATHs, so *all* libraries are   overridable by LD_LIBRARY_PATH.

svn path=/nixos/trunk/; revision=11967
---
 etc/profile.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/etc/profile.sh b/etc/profile.sh
index 3696012f61b..d03a4dd4e49 100644
--- a/etc/profile.sh
+++ b/etc/profile.sh
@@ -1,7 +1,7 @@
 export PATH=@wrapperDir@:/var/run/current-system/sw/bin:/var/run/current-system/sw/sbin
-export LD_LIBRARY_PATH=/var/run/current-system/sw/lib
+export LD_LIBRARY_PATH=/var/run/opengl-driver/lib
 if test -n "@nssModulesPath@"; then
-    LD_LIBRARY_PATH=@nssModulesPath@:$LD_LIBRARY_PATH
+    LD_LIBRARY_PATH=@nssModulesPath@$:$LD_LIBRARY_PATH
 fi
 export MODULE_DIR=@modulesTree@/lib/modules
 export NIXPKGS_CONFIG=/nix/etc/config.nix
-- 
GitLab


From e7494da962a5882aecfd654117a0748a67936a37 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 5 Jun 2008 13:42:18 +0000
Subject: [PATCH 0941/5331] * Allow compression of ISO images.

svn path=/nixos/trunk/; revision=11987
---
 configuration/rescue-cd.nix    |  3 +++
 helpers/make-iso9660-image.nix |  5 ++++-
 helpers/make-iso9660-image.sh  | 11 ++++++++---
 3 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/configuration/rescue-cd.nix b/configuration/rescue-cd.nix
index 05420975d5f..a429304071d 100644
--- a/configuration/rescue-cd.nix
+++ b/configuration/rescue-cd.nix
@@ -3,6 +3,7 @@
     if builtins.pathExists ../relname
     then builtins.readFile ../relname
     else "nixos-${builtins.readFile ../VERSION}"
+, compressImage ? false
 }:
 
 rec {
@@ -304,6 +305,8 @@ rec {
     
     bootable = true;
     bootImage = "boot/grub/stage2_eltorito";
+
+    inherit compressImage;
   };
 
 
diff --git a/helpers/make-iso9660-image.nix b/helpers/make-iso9660-image.nix
index 5e0bca4c630..076820bb5c2 100644
--- a/helpers/make-iso9660-image.nix
+++ b/helpers/make-iso9660-image.nix
@@ -25,6 +25,9 @@
   # The path (in the ISO file system) of the boot image.
 , bootImage ? ""
 
+, # Whether to compress the resulting ISO image with bzip2.
+  compressImage ? false
+
 }:
 
 assert bootable -> bootImage != "";
@@ -33,7 +36,7 @@ stdenv.mkDerivation {
   name = "iso9660-image";
   builder = ./make-iso9660-image.sh;
   buildInputs = [perl cdrkit];
-  inherit isoName bootable bootImage;
+  inherit isoName bootable bootImage compressImage;
 
   # !!! should use XML.
   sources = map (x: x.source) contents;
diff --git a/helpers/make-iso9660-image.sh b/helpers/make-iso9660-image.sh
index 5ad8cb475de..9330002f0b4 100644
--- a/helpers/make-iso9660-image.sh
+++ b/helpers/make-iso9660-image.sh
@@ -59,10 +59,15 @@ done
 
 cat pathlist | sed -e 's/=\(.*\)=\(.*\)=/\\=\1=\2\\=/' | tee pathlist.safer
 
-# !!! -f is a quick hack.
+
 ensureDir $out/iso
-genisoimage -r -J -o $out/iso/$isoName $bootFlags \
-    -hide-rr-moved -graft-points -path-list pathlist.safer
+genCommand="genisoimage -r -J $bootFlags -hide-rr-moved -graft-points -path-list pathlist.safer"
+if test -z "$compressImage"; then
+    $genCommand -o $out/iso/$isoName
+else
+    $genCommand | bzip2 > $out/iso/$isoName.bz2
+fi
+    
 
 ensureDir $out/nix-support
 echo $system > $out/nix-support/system
-- 
GitLab


From ebb43a3f6717d6e7204daa36235f1915cd4e60c5 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 5 Jun 2008 15:33:17 +0000
Subject: [PATCH 0942/5331] * Make the location of Nixpkgs a function argument
 (defaulting   to ../../nixpkgs).  This makes the "pkgs" symlink under the  
 nixos checkout unnecessary.

svn path=/nixos/trunk/; revision=11989
---
 configuration/rescue-cd.nix    | 40 +++++++++++++++-------------------
 doc/manual/default.nix         |  4 +++-
 helpers/make-iso9660-image.nix |  4 ++--
 installer/default.nix          |  4 ++--
 installer/nixos-checkout.sh    | 11 +++++-----
 system/system.nix              | 13 ++++++-----
 6 files changed, 36 insertions(+), 40 deletions(-)

diff --git a/configuration/rescue-cd.nix b/configuration/rescue-cd.nix
index a429304071d..27ba51cf11f 100644
--- a/configuration/rescue-cd.nix
+++ b/configuration/rescue-cd.nix
@@ -4,14 +4,12 @@
     then builtins.readFile ../relname
     else "nixos-${builtins.readFile ../VERSION}"
 , compressImage ? false
+, nixpkgsPath ? ../../nixpkgs
 }:
 
 rec {
 
   
-  nixpkgsRel = "nixpkgs-0.12pre11791-xl06i469";
-
-
   configuration = {
   
     boot = {
@@ -101,9 +99,7 @@ rec {
 
               mkdir -p /etc/nixos/nixos
               tar xjf /install/nixos.tar.bz2 -C /etc/nixos/nixos
-              tar xjf /install/nixpkgs.tar.bz2 -C /etc/nixos
-              mv /etc/nixos/nixpkgs-* /etc/nixos/nixpkgs
-              ln -sfn ../nixpkgs/pkgs /etc/nixos/nixos/pkgs
+              tar xjf /install/nixpkgs.tar.bz2 -C /etc/nixos/nixpkgs
               chown -R root.root /etc/nixos
             end script
           ";
@@ -165,7 +161,7 @@ rec {
     };
     
     installer = {
-      nixpkgsURL = http://nixos.org/releases/nixpkgs/ + nixpkgsRel;
+      nixpkgsURL = http://nixos.org/releases/nixpkgs/unstable;
     };
 
     security = {
@@ -189,7 +185,7 @@ rec {
 
 
   system = import ../system/system.nix {
-    inherit configuration platform;
+    inherit configuration platform nixpkgsPath;
     stage2Init = "/init";
   };
 
@@ -201,7 +197,7 @@ rec {
   # 0.11 (you won't get the manual).
   manual =
     if builtins ? unsafeDiscardStringContext
-    then "${import ../doc/manual}/manual.html"
+    then "${import ../doc/manual {inherit nixpkgsPath;}}/manual.html"
     else pkgs.writeText "dummy-manual" "Manual not included in this build!";
 
 
@@ -218,19 +214,16 @@ rec {
   
   # Put the current directory in a tarball (making sure to filter
   # out crap like the .svn directories).
-  nixosTarball =
-    let filter = name: type:
-      let base = baseNameOf (toString name);
-      in base != ".svn" && base != "result";
-    in
-      makeTarball "nixos.tar.bz2" (builtins.filterSource filter ./..);
-
-
-  # Get a recent copy of Nixpkgs.
-  nixpkgsTarball = pkgs.fetchurl {
-    url = configuration.installer.nixpkgsURL + "/nixexprs.tar.bz2";
-    sha256 = "267c45134eee9a8a93812589e5bd45333c5061a8047b41f3bf27ed76a1461750";
-  };
+  nixosTarball =makeTarball "nixos.tar.bz2" (builtins.filterSource svnFilter ./..);
+
+  svnFilter = name: type:
+    let base = baseNameOf (toString name);
+    in base != ".svn" && base != "result";
+
+
+  # Put Nixpkgs in a tarball
+  nixpkgsTarball = makeTarball "nixpkgs.tar.bz2"
+    (builtins.filterSource svnFilter nixpkgsPath);
 
 
   # The configuration file for Grub.
@@ -255,6 +248,7 @@ rec {
   # Create an ISO image containing the Grub boot loader, the kernel,
   # the initrd produced above, and the closure of the stage 2 init.
   rescueCD = import ../helpers/make-iso9660-image.nix {
+    inherit nixpkgsPath;
     inherit (pkgs) stdenv perl cdrkit;
     isoName = "${relName}-${platform}.iso";
 
@@ -281,7 +275,7 @@ rec {
       { source = nixosTarball + "/" + nixosTarball.tarName;
         target = "/install/" + nixosTarball.tarName;
       }
-      { source = nixpkgsTarball;
+      { source = nixpkgsTarball + "/nixpkgs.tar.bz2";
         target = "/install/nixpkgs.tar.bz2";
       }
       { source = pkgs.writeText "label" "";
diff --git a/doc/manual/default.nix b/doc/manual/default.nix
index a42b947cd59..b83a4ce5dce 100644
--- a/doc/manual/default.nix
+++ b/doc/manual/default.nix
@@ -1,6 +1,8 @@
+{nixpkgsPath ? ../../../nixpkgs}:
+
 let
 
-  pkgs = import ../../pkgs/top-level/all-packages.nix {};
+  pkgs = import "${nixpkgsPath}/pkgs/top-level/all-packages.nix" {};
 
   options = builtins.toFile "options.xml" (builtins.unsafeDiscardStringContext
     (builtins.toXML (pkgs.lib.optionAttrSetToDocList ""
diff --git a/helpers/make-iso9660-image.nix b/helpers/make-iso9660-image.nix
index 076820bb5c2..fbabb7c0f49 100644
--- a/helpers/make-iso9660-image.nix
+++ b/helpers/make-iso9660-image.nix
@@ -1,4 +1,4 @@
-{ stdenv, perl, cdrkit
+{ stdenv, perl, cdrkit, nixpkgsPath
 
   # The file name of the resulting ISO image.
 , isoName ? "cd.iso"
@@ -51,5 +51,5 @@ stdenv.mkDerivation {
     map (x: [("closure-" + baseNameOf x.object) x.object]) storeContents;
   exportBuildReferencesGraph =
     map (x: [("closure-build-" + baseNameOf x.object) x.object]) buildStoreContents;
-  pathsFromGraph = ../pkgs/build-support/kernel/paths-from-graph.pl;
+  pathsFromGraph = "${nixpkgsPath}/pkgs/build-support/kernel/paths-from-graph.pl";
 }
diff --git a/installer/default.nix b/installer/default.nix
index ef2f4fd678f..46a1c941c8c 100644
--- a/installer/default.nix
+++ b/installer/default.nix
@@ -1,4 +1,4 @@
-{pkgs, config, nix}:
+{pkgs, config, nix, nixpkgsPath}:
 
 let
 
@@ -19,7 +19,7 @@ in
     inherit nix;
     nixpkgsURL = config.installer.nixpkgsURL;
 
-    pathsFromGraph = ../pkgs/build-support/kernel/paths-from-graph.pl;
+    pathsFromGraph = "${nixpkgsPath}/pkgs/build-support/kernel/paths-from-graph.pl";
 
     nixClosure = pkgs.runCommand "closure"
       {exportReferencesGraph = ["refs" nix];}
diff --git a/installer/nixos-checkout.sh b/installer/nixos-checkout.sh
index 12595ad61c3..0457f4d7cb7 100644
--- a/installer/nixos-checkout.sh
+++ b/installer/nixos-checkout.sh
@@ -24,14 +24,14 @@ fi
 cd /etc/nixos
 
 if test -n "$NIXOS" && test "$NIXOS_BRANCH" = 1 && test -z "$CHECKOUT_BRANCH" && ! test "$NIXOS" = "/etc/nixos/nixos"; then
-	CHECKOUT_BRANCH=${NIXOS##*/}
-	CHECKOUT_BRANCH=${CHECKOUT_BRANCH#nixos-}
-	CHECKOUT_BRANCH=branches/${CHECKOUT_BRANCH}
-	CHECKOUT_SUFFIX=-${CHECKOUT_BRANCH##*/}
+    CHECKOUT_BRANCH=${NIXOS##*/}
+    CHECKOUT_BRANCH=${CHECKOUT_BRANCH#nixos-}
+    CHECKOUT_BRANCH=branches/${CHECKOUT_BRANCH}
+    CHECKOUT_SUFFIX=-${CHECKOUT_BRANCH##*/}
 fi
 
 if test -n "${CHECKOUT_BRANCH}" && test -z "${CHECKOUT_SUFFIX}" ; then
-	CHECKOUT_SUFFIX=-${CHECKOUT_BRANCH##*/}
+    CHECKOUT_SUFFIX=-${CHECKOUT_BRANCH##*/}
 fi;
 
 # Move any old nixos or nixpkgs directories out of the way.
@@ -56,7 +56,6 @@ svn co https://svn.nixos.org/repos/nix/services/trunk services
 
 # Add a few required symlink.
 ln -sfn ../services nixos${CHECKOUT_SUFFIX}/services
-ln -sfn ../nixpkgs${CHECKOUT_SUFFIX}/pkgs nixos${CHECKOUT_SUFFIX}/pkgs
 
 REVISION=$(svn info nixpkgs${CHECKOUT_SUFFIX} | egrep '^Revision: ');
 REVISION=${REVISION#Revision: };
diff --git a/system/system.nix b/system/system.nix
index 47b3f5d1ab0..590189f9abb 100644
--- a/system/system.nix
+++ b/system/system.nix
@@ -1,6 +1,7 @@
 { platform ? __currentSystem
 , stage2Init ? ""
 , configuration
+, nixpkgsPath ? ../../nixpkgs
 }:
 
 rec {
@@ -12,21 +13,21 @@ rec {
   optionDeclarations = import ./options.nix {inherit pkgs; inherit (pkgs.lib) mkOption;};
     
 
-  pkgs = import ../pkgs/top-level/all-packages.nix {system = platform;};
+  pkgs = import "${nixpkgsPath}/pkgs/top-level/all-packages.nix" {system = platform;};
 
-  pkgsDiet = import ../pkgs/top-level/all-packages.nix {
+  pkgsDiet = import "${nixpkgsPath}/pkgs/top-level/all-packages.nix" {
     system = platform;
     bootStdenv = pkgs.useDietLibC pkgs.stdenv;
   };
 
-  pkgsStatic = import ../pkgs/top-level/all-packages.nix {
+  pkgsStatic = import "${nixpkgsPath}/pkgs/top-level/all-packages.nix" {
     system = platform;
     bootStdenv = pkgs.makeStaticBinaries pkgs.stdenv;
   };
 
-  stdenvLinuxStuff = import ../pkgs/stdenv/linux {
+  stdenvLinuxStuff = import "${nixpkgsPath}/pkgs/stdenv/linux" {
     system = pkgs.stdenv.system;
-    allPackages = import ../pkgs/top-level/all-packages.nix;
+    allPackages = import "${nixpkgsPath}/pkgs/top-level/all-packages.nix";
   };
 
   manifests = config.installer.manifests; # exported here because nixos-rebuild uses it
@@ -141,7 +142,7 @@ rec {
 
   # NixOS installation/updating tools.
   nixosTools = import ../installer {
-    inherit pkgs config nix;
+    inherit pkgs config nix nixpkgsPath;
   };
 
 
-- 
GitLab


From 96a8dbfd5829951aa1c246ef2e70ede6edccc8c3 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 6 Jun 2008 09:13:16 +0000
Subject: [PATCH 0943/5331] * Upstart jobs for the Zabbix agent and server
 daemons.

svn path=/nixos/trunk/; revision=11998
---
 system/ids.nix                 |  1 +
 system/options.nix             | 26 ++++++++++++++
 upstart-jobs/default.nix       | 14 +++++++-
 upstart-jobs/xserver.nix       | 10 +++---
 upstart-jobs/zabbix-agent.nix  | 60 +++++++++++++++++++++++++++++++
 upstart-jobs/zabbix-server.nix | 66 ++++++++++++++++++++++++++++++++++
 6 files changed, 171 insertions(+), 6 deletions(-)
 create mode 100644 upstart-jobs/zabbix-agent.nix
 create mode 100644 upstart-jobs/zabbix-server.nix

diff --git a/system/ids.nix b/system/ids.nix
index 6c6df24dd90..473f8202e68 100644
--- a/system/ids.nix
+++ b/system/ids.nix
@@ -14,6 +14,7 @@
     avahi = 10;
     portmap = 11;
     atd = 12;
+    zabbix = 13;
 
     nixbld = 30000; # start of range of uids
     nobody = 65534;
diff --git a/system/options.nix b/system/options.nix
index 9be4ce1c384..d216c58f994 100644
--- a/system/options.nix
+++ b/system/options.nix
@@ -1918,6 +1918,7 @@
 
     };
 
+    
     mysql = {
       enable = mkOption {
         default = false;
@@ -1952,6 +1953,7 @@
       };
     };
 
+    
     postgresql = {
       enable = mkOption {
         default = false;
@@ -2009,6 +2011,7 @@
       };
     };
 
+    
     openfire = {
       enable = mkOption {
         default = false;
@@ -2024,6 +2027,7 @@
       };
     };
 
+    
     gpm = {
       enable = mkOption {
         default = false;
@@ -2039,6 +2043,28 @@
       };
     };
 
+
+    zabbixAgent = {
+      enable = mkOption {
+        default = false;
+	description = "
+	  Whether to run the Zabbix monitoring agent on this machine.
+          It will send monitoring data to a Zabbix server.
+	";
+      };
+    };
+    
+
+    zabbixServer = {
+      enable = mkOption {
+        default = false;
+	description = "
+	  Whether to run the Zabbix server on this machine.
+	";
+      };
+    };
+    
+
   };
 
   installer = {
diff --git a/upstart-jobs/default.nix b/upstart-jobs/default.nix
index d16b5b16084..f7117f616ae 100644
--- a/upstart-jobs/default.nix
+++ b/upstart-jobs/default.nix
@@ -245,7 +245,7 @@ let
   # X server.
   ++ optional config.services.xserver.enable
     (import ../upstart-jobs/xserver.nix {
-      inherit config pkgs;
+      inherit config pkgs kernelPackages;
       fontDirectories = import ../system/fonts.nix {inherit pkgs config;};
     })
 
@@ -377,6 +377,18 @@ let
       inherit config pkgs;
     })
 
+  # Zabbix agent daemon.
+  ++ optional config.services.zabbixAgent.enable
+    (import ../upstart-jobs/zabbix-agent.nix {
+      inherit config pkgs;
+    })
+
+  # Zabbix server daemon.
+  ++ optional config.services.zabbixServer.enable
+    (import ../upstart-jobs/zabbix-server.nix {
+      inherit config pkgs;
+    })
+
   # Handles the reboot/halt events.
   ++ (map
     (event: makeJob (import ../upstart-jobs/halt.nix {
diff --git a/upstart-jobs/xserver.nix b/upstart-jobs/xserver.nix
index 29ae21ac076..182996a9dd9 100644
--- a/upstart-jobs/xserver.nix
+++ b/upstart-jobs/xserver.nix
@@ -1,4 +1,4 @@
-{ config, pkgs
+{ config, pkgs, kernelPackages
 
 , # List of font directories.
   fontDirectories
@@ -36,7 +36,7 @@ let
 
     
   modules = 
-    optional (videoDriver == "nvidia") nvidiaDrivers #make sure it first loads the nvidia libs
+    optional (videoDriver == "nvidia") kernelPackages.nvidiaDrivers #make sure it first loads the nvidia libs
     ++ [
       xorg.xorgserver
       xorg.xf86inputkeyboard
@@ -352,7 +352,7 @@ rec {
     xorg.xset # used by startkde, non-essential
   ]
   ++ optional (videoDriver == "nvidia") [
-    nvidiaDrivers
+    kernelPackages.nvidiaDrivers
   ];
 
 
@@ -376,7 +376,7 @@ rec {
       rm -f /var/run/opengl-driver
       ${if videoDriver == "nvidia"        
         then ''
-          ln -sf ${nvidiaDrivers} /var/run/opengl-driver
+          ln -sf ${kernelPackages.nvidiaDrivers} /var/run/opengl-driver
         ''
 	else if cfg.driSupport
         then "ln -sf ${pkgs.mesa} /var/run/opengl-driver"
@@ -393,7 +393,7 @@ rec {
     env XKB_BINDIR=${xorg.xkbcomp}/bin # Needed for the Xkb extension.
 
     ${if videoDriver == "nvidia" 
-      then "env LD_LIBRARY_PATH=${xorg.libX11}/lib:${xorg.libXext}/lib:${nvidiaDrivers}/lib" 
+      then "env LD_LIBRARY_PATH=${xorg.libX11}/lib:${xorg.libXext}/lib:${kernelPackages.nvidiaDrivers}/lib" 
       else ""
     }
 
diff --git a/upstart-jobs/zabbix-agent.nix b/upstart-jobs/zabbix-agent.nix
new file mode 100644
index 00000000000..83c0562e317
--- /dev/null
+++ b/upstart-jobs/zabbix-agent.nix
@@ -0,0 +1,60 @@
+{config, pkgs}:
+
+let
+
+  stateDir = "/var/run/zabbix";
+
+  logDir = "/var/log/zabbix";
+
+  pidFile = "${stateDir}/zabbix_agentd.pid";
+
+  configFile = pkgs.writeText "zabbix_agentd.conf" ''
+    Server = 127.0.0.1
+
+    LogFile = ${logDir}/zabbix_agentd
+  
+    DebugLevel = 4
+
+    PidFile = ${pidFile}
+
+    StartAgents = 1
+  '';
+
+in
+
+{
+  name = "zabbix-agent";
+  
+  users = [
+    { name = "zabbix";
+      uid = (import ../system/ids.nix).uids.zabbix;
+      description = "Zabbix daemon user";
+    }
+  ];
+
+  job = ''
+    description "Zabbix agent daemon"
+
+    start script
+      mkdir -m 0755 -p ${stateDir} ${logDir}
+      chown zabbix ${stateDir} ${logDir}
+      
+      export PATH=${pkgs.nettools}/bin:$PATH
+      ${pkgs.zabbixAgent}/sbin/zabbix_agentd --config ${configFile}
+    end script
+
+    respawn sleep 100000
+    
+    stop script
+      # !!! this seems to leave processes behind.
+      #pid=$(cat ${pidFile})
+      #if test -n "$pid"; then
+      #  kill $pid 
+      #fi
+
+      # So instead kill the agent in a brutal fashion.
+      while ${pkgs.procps}/bin/pkill -u zabbix zabbix_agentd; do true; done
+    end script
+  '';
+  
+}
diff --git a/upstart-jobs/zabbix-server.nix b/upstart-jobs/zabbix-server.nix
new file mode 100644
index 00000000000..7cd0d6e7c20
--- /dev/null
+++ b/upstart-jobs/zabbix-server.nix
@@ -0,0 +1,66 @@
+{config, pkgs}:
+
+let
+
+  stateDir = "/var/run/zabbix";
+
+  logDir = "/var/log/zabbix";
+
+  libDir = "/var/lib/zabbix";
+
+  pidFile = "${stateDir}/zabbix_server.pid";
+
+  configFile = pkgs.writeText "zabbix_server.conf" ''
+    LogFile = ${logDir}/zabbix_server
+  
+    DebugLevel = 4
+
+    PidFile = ${pidFile}
+
+    DBName = zabbix
+
+    DBUser = zabbix
+  '';
+
+in
+
+{
+  name = "zabbix-server";
+  
+  users = [
+    { name = "zabbix";
+      uid = (import ../system/ids.nix).uids.zabbix;
+      description = "Zabbix daemon user";
+    }
+  ];
+
+  job = ''
+    description "Zabbix server daemon"
+
+    start on postgresql/started
+    stop on shutdown
+
+    start script
+      mkdir -m 0755 -p ${stateDir} ${logDir} ${libDir}
+      chown zabbix ${stateDir} ${logDir} ${libDir}
+
+      if ! test -e "${libDir}/db-created"; then
+          ${pkgs.postgresql}/bin/createuser --no-superuser --no-createdb --no-createrole zabbix || true
+          ${pkgs.postgresql}/bin/createdb --owner zabbix zabbix || true
+          cat ${pkgs.zabbixServer}/share/zabbix/db/schema/postgresql.sql | ${pkgs.su}/bin/su -s "$SHELL" zabbix -c 'psql zabbix'
+          cat ${pkgs.zabbixServer}/share/zabbix/db/data/data.sql | ${pkgs.su}/bin/su -s "$SHELL" zabbix -c 'psql zabbix'
+          cat ${pkgs.zabbixServer}/share/zabbix/db/data/images_pgsql.sql | ${pkgs.su}/bin/su -s "$SHELL" zabbix -c 'psql zabbix'
+      fi
+      
+      export PATH=${pkgs.nettools}/bin:$PATH
+      ${pkgs.zabbixServer}/sbin/zabbix_server --config ${configFile}
+    end script
+
+    respawn sleep 100000
+    
+    stop script
+      while ${pkgs.procps}/bin/pkill -u zabbix zabbix_server; do true; done
+    end script
+  '';
+  
+}
-- 
GitLab


From 120ee1d150ab215a5810fc6eb419902067988bf1 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Fri, 6 Jun 2008 10:04:27 +0000
Subject: [PATCH 0944/5331] Fixed rescue-cd-configurable.nix

svn path=/nixos/trunk/; revision=11999
---
 configuration/closed-install.nix         |  1 -
 configuration/rescue-cd-configurable.nix | 16 ++++++++++++----
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/configuration/closed-install.nix b/configuration/closed-install.nix
index c78fadd1632..2a1f1c89ab7 100644
--- a/configuration/closed-install.nix
+++ b/configuration/closed-install.nix
@@ -4,7 +4,6 @@ let
 in 
 (isoFun {
 	inherit platform;
-	lib = (import ../pkgs/lib);
 
 	networkNixpkgs = "";
 	manualEnabled = true;
diff --git a/configuration/rescue-cd-configurable.nix b/configuration/rescue-cd-configurable.nix
index c8ec9875805..3efbd99a3b5 100644
--- a/configuration/rescue-cd-configurable.nix
+++ b/configuration/rescue-cd-configurable.nix
@@ -1,5 +1,5 @@
 {
-   lib
+   lib ? null
   ,platform ? __currentSystem
   ,networkNixpkgs ? ""
   ,nixpkgsMd5 ? ""
@@ -39,8 +39,15 @@
   	list of: {source, target}
   */
   ,additionalFiles ? []
+  ,compressImage ? false
+  ,nixpkgsPath ? ../../nixpkgs
 }:
+let 
+  realLib = if lib != null then lib else (import (nixpkgsPath+"/pkgs/lib"));
+in
 let
+  lib = realLib;
+
   ttyCount = lib.fold builtins.add 0 [
     (if rogueEnabled then 1 else 0)
     (if manualEnabled then 1 else 0)
@@ -49,7 +56,7 @@ let
   systemPackBuilder = {suffix, configuration} : 
   { 
     system = (import ../system/system.nix) {
-      inherit configuration platform; /* To refactor later - x86+x86_64 DVD */
+      inherit configuration platform nixpkgsPath; /* To refactor later - x86+x86_64 DVD */
       stage2Init = "/init"+suffix;
     };
     inherit suffix configuration;
@@ -319,7 +326,7 @@ rec {
   # The NixOS manual, with a backward compatibility hack for Nix <=
   # 0.11 (you won't get the manual).
   manual = if builtins ? unsafeDiscardStringContext
-    then "${import ../doc/manual}/manual.html"
+    then "${import ../doc/manual {inherit nixpkgsPath;}}/manual.html"
     else pkgs.writeText "dummy-manual" "Manual not included in this build!";
  
  
@@ -356,7 +363,7 @@ rec {
   nixpkgsTarball = if networkNixpkgs != "" then pkgs.fetchurl {
     url = configuration.installer.nixpkgsURL + "/" + nixpkgsRel + ".tar.bz2";
     md5 = "6a793b877e2a4fa79827515902e1dfd8";
-  } else makeNixPkgsTarball "nixpkgs.tar.bz2" ("" + ./../../nixpkgs);
+  } else makeNixPkgsTarball "nixpkgs.tar.bz2" ("" + nixpkgsPath);
 
   nixosServicesTarball = makeNixPkgsTarball "nixos-services.tar.bz2" ("" + ./../../services);
  
@@ -379,6 +386,7 @@ rec {
   # the initrd produced above, and the closure of the stage 2 init.
   rescueCD = import ../helpers/make-iso9660-image.nix {
     inherit (pkgs) stdenv perl cdrkit;
+    inherit compressImage nixpkgsPath;
     isoName = "nixos-${platform}.iso";
   
     # Single files to be copied to fixed locations on the CD.
-- 
GitLab


From b8aa6c6f3123fa36c0c1fbec946aba5f095ea9aa Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 6 Jun 2008 12:38:40 +0000
Subject: [PATCH 0945/5331] svn path=/nixos/trunk/; revision=12001

---
 upstart-jobs/zabbix-agent.nix  | 2 +-
 upstart-jobs/zabbix-server.nix | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/upstart-jobs/zabbix-agent.nix b/upstart-jobs/zabbix-agent.nix
index 83c0562e317..78d21d3f96d 100644
--- a/upstart-jobs/zabbix-agent.nix
+++ b/upstart-jobs/zabbix-agent.nix
@@ -17,7 +17,7 @@ let
 
     PidFile = ${pidFile}
 
-    StartAgents = 1
+    StartAgents = 5
   '';
 
 in
diff --git a/upstart-jobs/zabbix-server.nix b/upstart-jobs/zabbix-server.nix
index 7cd0d6e7c20..3e693a3ce07 100644
--- a/upstart-jobs/zabbix-server.nix
+++ b/upstart-jobs/zabbix-server.nix
@@ -50,6 +50,7 @@ in
           cat ${pkgs.zabbixServer}/share/zabbix/db/schema/postgresql.sql | ${pkgs.su}/bin/su -s "$SHELL" zabbix -c 'psql zabbix'
           cat ${pkgs.zabbixServer}/share/zabbix/db/data/data.sql | ${pkgs.su}/bin/su -s "$SHELL" zabbix -c 'psql zabbix'
           cat ${pkgs.zabbixServer}/share/zabbix/db/data/images_pgsql.sql | ${pkgs.su}/bin/su -s "$SHELL" zabbix -c 'psql zabbix'
+          touch "${libDir}/db-created"
       fi
       
       export PATH=${pkgs.nettools}/bin:$PATH
-- 
GitLab


From ae4ead1a33c71f9aebf897021dce9bc6849a19e1 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Sat, 7 Jun 2008 10:52:44 +0000
Subject: [PATCH 0946/5331] Added install-test.sh - automatic verification of
 rescue-cd-configurable.nix (currently it passes)

svn path=/nixos/trunk/; revision=12006
---
 configuration/closed-install.nix              | 19 ++++-
 .../remote-install-scripts/install-script.sh  | 30 ++++++++
 .../remote-install-scripts/install-start.sh   |  4 ++
 .../remote-install-scripts/install-test.sh    | 69 +++++++++++++++++++
 configuration/rescue-cd-configurable.nix      |  3 +
 5 files changed, 124 insertions(+), 1 deletion(-)
 create mode 100755 configuration/remote-install-scripts/install-test.sh

diff --git a/configuration/closed-install.nix b/configuration/closed-install.nix
index 2a1f1c89ab7..db02ddd4d8c 100644
--- a/configuration/closed-install.nix
+++ b/configuration/closed-install.nix
@@ -1,4 +1,7 @@
-{platform ? __currentSystem} : 
+{
+	platform ? __currentSystem
+	,hostConnectPort ? "3737"
+} : 
 let 
   isoFun = import ./rescue-cd-configurable.nix;
 in 
@@ -33,6 +36,7 @@ in
 		pkgs.wpa_supplicant
 		pkgs.emacs
 		pkgs.vimHugeX
+		pkgs.socat
 	];
 
 	/* 
@@ -48,4 +52,17 @@ in
 			target = "/root/.ssh/authorized_keys";
 		}
 	];
+
+	additionalJobs = [
+		{
+			name = "Socat-ssh-proxy";
+			job = ''
+				start on sshd/started
+				script
+					sleep 5
+					/var/run/current-system/sw/bin/socat tcp:10.0.2.2:${hostConnectPort} tcp:127.0.0.1:22
+				end script
+			'';
+		}
+	];
 }).rescueCD
diff --git a/configuration/remote-install-scripts/install-script.sh b/configuration/remote-install-scripts/install-script.sh
index 2c1d116533a..b6becd432f8 100755
--- a/configuration/remote-install-scripts/install-script.sh
+++ b/configuration/remote-install-scripts/install-script.sh
@@ -39,15 +39,45 @@ cat > /mnt/etc/nixos/configuration.nix <<EOF
     sshd = {
       enable = true;
     };
+
+    extraJobs = [
+      {
+        name = "Host-call-back";
+        job = ''
+          start on network-interfaces/started
+          script
+            while ! /var/run/current-system/sw/sbin/ifconfig eth0 | 
+                /var/run/current-system/sw/bin/grep "inet addr:" &>/dev/null; do
+                    sleep 1;
+            done
+            echo -e "Installation finished\nOK" | /var/run/current-system/sw/bin/socat stdio tcp:10.0.2.2:4424 | {
+                read;
+                if [ "\\\$REPLY" = "reboot" ] ; then 
+                        /var/run/current-system/sw/sbin/start ctrl-alt-delete;
+                fi;
+            }
+          end script
+        '';
+      }
+    ];
   };
 
   fonts = { 
     enableFontConfig = false; 
   };
 
+  environment = {
+    extraPackages = pkgs: [
+      pkgs.socat
+    ];
+  };
 }
 
 EOF
 
 nixos-install
 
+echo Installation finished
+
+start ctrl-alt-delete
+
diff --git a/configuration/remote-install-scripts/install-start.sh b/configuration/remote-install-scripts/install-start.sh
index 6deb806cfd0..a8cb4baa422 100755
--- a/configuration/remote-install-scripts/install-start.sh
+++ b/configuration/remote-install-scripts/install-start.sh
@@ -2,6 +2,10 @@
 
 nohup bash -c 'NIX_REMOTE= ./install-script.sh &>/dev/tty11' &
 
+sleep 1;
+
+chvt 11 || true;
+
 disown 
 
 exit
diff --git a/configuration/remote-install-scripts/install-test.sh b/configuration/remote-install-scripts/install-test.sh
new file mode 100755
index 00000000000..0d7d553a81a
--- /dev/null
+++ b/configuration/remote-install-scripts/install-test.sh
@@ -0,0 +1,69 @@
+#! /bin/sh -i 
+
+if test -z "$INSTALL_TEST_RUNNING" ; then
+    export INSTALL_TEST_RUNNING=1;
+    export ORIGINAL_NAME="$0";
+    sh -i < "$ORIGINAL_NAME";
+    exit;
+fi;
+
+if ! eval ' ( sleep 0.1; exit 0; ) & fg ' ; then
+    echo "Failing job control test";
+    exit;
+fi;
+
+set -x 
+
+echo "Installation starting.." > report
+
+nix-build -o socat /etc/nixos/nixpkgs -A socat 
+nix-build -o qemu /etc/nixos/nixpkgs -A qemu 
+
+echo "reboot" | ./socat/bin/socat tcp-listen:4424 stdio >> report &  
+
+if ( ! [ -d dvd/iso ] ) || ( [ -z "$USE_LEFTOVER_DVD" ] ); then
+    rm dvd
+    nix-build -o dvd /etc/nixos/nixos/configuration/closed-install.nix
+fi;
+
+if ( ! [ -f install-test.img ] ) || ( [ -z "$JUST_BOOT" ] ); then
+    rm install-test.img
+    ./qemu/bin/qemu-img create -f qcow2 install-test.img 5G
+
+    ./qemu/bin/qemu --kernel-kqemu -m 512 -cdrom dvd/iso/nixos-*.iso -hda install-test.img -boot d -no-reboot &
+    ./socat/bin/socat tcp-listen:4425 tcp-listen:3737 &
+    sleep 1;
+
+    sed -e '/^127[.]0[.]0[.]1/d; /^\[127[.]0[.]0[.]1/d' -i ~/.ssh/known_hosts || true;
+
+    (
+        echo "cat > install-script.sh <<BIGEOF"
+        cat $(dirname "$ORIGINAL_NAME")/install-script.sh
+        echo BIGEOF
+
+        echo "cat > install-start.sh <<BIGEOF"
+        cat $(dirname "$ORIGINAL_NAME")/install-start.sh 
+        echo BIGEOF
+
+        echo 'chmod a+x *.sh'
+        echo './install-start.sh'
+    ) | ssh -l root -i /var/certs/ssh/id_livedvd -o StrictHostKeyChecking=no 127.0.0.1 -p 4425
+fi;
+
+./qemu/bin/qemu --kernel-kqemu -m 512 install-test.img -no-reboot 
+
+echo "Report contains: "
+cat report
+
+set +x
+
+if [ -n "$GC_DVD" ] ; then 
+    rm dvd; nix-store --delete $(readlink -f dvd);
+fi;
+
+if [ -n "$DO_CLEANUP" ]; then
+    rm dvd ; rm socat ; rm qemu ; rm install-test.img ;
+fi;
+
+test OK = "$(tail -1 report)";
+
diff --git a/configuration/rescue-cd-configurable.nix b/configuration/rescue-cd-configurable.nix
index 3efbd99a3b5..ff42d22f973 100644
--- a/configuration/rescue-cd-configurable.nix
+++ b/configuration/rescue-cd-configurable.nix
@@ -41,6 +41,7 @@
   ,additionalFiles ? []
   ,compressImage ? false
   ,nixpkgsPath ? ../../nixpkgs
+  ,additionalJobs ? []
 }:
 let 
   realLib = if lib != null then lib else (import (nixpkgsPath+"/pkgs/lib"));
@@ -182,6 +183,8 @@ rec {
         }
       ] 
         
+      ++ additionalJobs
+
       ++ 
         
       (lib.optional manualEnabled 
-- 
GitLab


From 6d380a8ce8c5241e09cdf8cb887bd60cb8b54c07 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sun, 8 Jun 2008 22:21:56 +0000
Subject: [PATCH 0947/5331] * Option to set the Zabbix server IP.

svn path=/nixos/trunk/; revision=12012
---
 system/options.nix            | 9 +++++++++
 upstart-jobs/zabbix-agent.nix | 4 +++-
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/system/options.nix b/system/options.nix
index d216c58f994..862a8224fbf 100644
--- a/system/options.nix
+++ b/system/options.nix
@@ -2045,6 +2045,7 @@
 
 
     zabbixAgent = {
+
       enable = mkOption {
         default = false;
 	description = "
@@ -2052,6 +2053,14 @@
           It will send monitoring data to a Zabbix server.
 	";
       };
+
+      server = mkOption {
+        default = "127.0.0.1";
+        description = ''
+          The IP address or hostname of the Zabbix server to connect to.
+        '';
+      };
+
     };
     
 
diff --git a/upstart-jobs/zabbix-agent.nix b/upstart-jobs/zabbix-agent.nix
index 78d21d3f96d..3fde1a62f62 100644
--- a/upstart-jobs/zabbix-agent.nix
+++ b/upstart-jobs/zabbix-agent.nix
@@ -2,6 +2,8 @@
 
 let
 
+  cfg = config.services.zabbixAgent;
+
   stateDir = "/var/run/zabbix";
 
   logDir = "/var/log/zabbix";
@@ -9,7 +11,7 @@ let
   pidFile = "${stateDir}/zabbix_agentd.pid";
 
   configFile = pkgs.writeText "zabbix_agentd.conf" ''
-    Server = 127.0.0.1
+    Server = ${cfg.server}
 
     LogFile = ${logDir}/zabbix_agentd
   
-- 
GitLab


From 8cad20e1c9812cee2e6afacf7206aaa8ae4efcfa Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 9 Jun 2008 11:14:28 +0000
Subject: [PATCH 0948/5331] * Doh!

svn path=/nixos/trunk/; revision=12016
---
 installer/nixos-rebuild.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/installer/nixos-rebuild.sh b/installer/nixos-rebuild.sh
index f36d22c0e4d..c7db828cd45 100644
--- a/installer/nixos-rebuild.sh
+++ b/installer/nixos-rebuild.sh
@@ -35,7 +35,7 @@ NIXOS_CONFIG=${NIXOS_CONFIG:-/etc/nixos/configuration.nix}
 # This matters if the new Nix in Nixpkgs has a schema change.  It
 # would upgrade the schema, which should only happen once we actually
 # switch to the new configuration.
-if initctl status nix-daemonn 2>&1 | grep -q ' running'; then
+if initctl status nix-daemon 2>&1 | grep -q ' running'; then
     export NIX_REMOTE=${NIX_REMOTE:-daemon}
 fi
 
-- 
GitLab


From 0b068f504c416cb5b737151a85ca156e140f53c6 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 9 Jun 2008 11:14:43 +0000
Subject: [PATCH 0949/5331] * Less verbosity.

svn path=/nixos/trunk/; revision=12017
---
 upstart-jobs/zabbix-agent.nix  | 2 --
 upstart-jobs/zabbix-server.nix | 2 --
 2 files changed, 4 deletions(-)

diff --git a/upstart-jobs/zabbix-agent.nix b/upstart-jobs/zabbix-agent.nix
index 3fde1a62f62..fdfb2f3005d 100644
--- a/upstart-jobs/zabbix-agent.nix
+++ b/upstart-jobs/zabbix-agent.nix
@@ -15,8 +15,6 @@ let
 
     LogFile = ${logDir}/zabbix_agentd
   
-    DebugLevel = 4
-
     PidFile = ${pidFile}
 
     StartAgents = 5
diff --git a/upstart-jobs/zabbix-server.nix b/upstart-jobs/zabbix-server.nix
index 3e693a3ce07..a2095269590 100644
--- a/upstart-jobs/zabbix-server.nix
+++ b/upstart-jobs/zabbix-server.nix
@@ -13,8 +13,6 @@ let
   configFile = pkgs.writeText "zabbix_server.conf" ''
     LogFile = ${logDir}/zabbix_server
   
-    DebugLevel = 4
-
     PidFile = ${pidFile}
 
     DBName = zabbix
-- 
GitLab


From deaf99ca9219c2a0880ae76ca2b92a6b5f035b08 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 9 Jun 2008 15:52:02 +0000
Subject: [PATCH 0950/5331] * Added a subservices for the Zabbix PHP frontend.
 * Apache subservices: missing declarations are filled in with defaults.

svn path=/nixos/trunk/; revision=12022
---
 system/options.nix                    |  2 +-
 upstart-jobs/apache-httpd/default.nix | 13 +++++-
 upstart-jobs/apache-httpd/twiki.nix   | 11 -----
 upstart-jobs/apache-httpd/zabbix.nix  | 58 +++++++++++++++++++++++++++
 4 files changed, 71 insertions(+), 13 deletions(-)
 create mode 100644 upstart-jobs/apache-httpd/zabbix.nix

diff --git a/system/options.nix b/system/options.nix
index 862a8224fbf..1e9081e0e3b 100644
--- a/system/options.nix
+++ b/system/options.nix
@@ -1989,7 +1989,7 @@
       authentication = mkOption {
         default = ''
           # Generated file; do not edit!
-          local all all ident sameuser
+          local all all              ident sameuser
           host  all all 127.0.0.1/32 md5
           host  all all ::1/128      md5
         '';
diff --git a/upstart-jobs/apache-httpd/default.nix b/upstart-jobs/apache-httpd/default.nix
index 7d53706c60e..8bcd2c7aaa9 100644
--- a/upstart-jobs/apache-httpd/default.nix
+++ b/upstart-jobs/apache-httpd/default.nix
@@ -55,7 +55,18 @@ let
           if svc ? function then svc.function
           else import (./noDir/.. + ("/" + svc.serviceName + ".nix"));
         config = addDefaultOptionValues res.options svc.config;
-        res = svcFunction {inherit config pkgs serverInfo;};
+        defaults = {
+          extraConfig = "";
+          extraModules = [];
+          extraModulesPre = [];
+          extraPath = [];
+          extraServerPath = [];
+          globalEnvVars = [];
+          robotsEntries = "";
+          startupScript = "";
+          options = {};
+        };
+        res = defaults // svcFunction {inherit config pkgs serverInfo;};
       in res;
     in map f defs;
 
diff --git a/upstart-jobs/apache-httpd/twiki.nix b/upstart-jobs/apache-httpd/twiki.nix
index f72e92c84ea..54614aca24c 100644
--- a/upstart-jobs/apache-httpd/twiki.nix
+++ b/upstart-jobs/apache-httpd/twiki.nix
@@ -111,15 +111,4 @@ in {
     Disallow: /pt/bin/
   '';
 
-  # !!! should not be needed
-  extraModulesPre = [];
-  extraModules = [];
-  globalEnvVars = [];
-  extraServerPath = [];
-  extraPath = [];
-  startupScript = null;
-
-  options = {
-  };  
-
 }
\ No newline at end of file
diff --git a/upstart-jobs/apache-httpd/zabbix.nix b/upstart-jobs/apache-httpd/zabbix.nix
new file mode 100644
index 00000000000..c7f48fe7df6
--- /dev/null
+++ b/upstart-jobs/apache-httpd/zabbix.nix
@@ -0,0 +1,58 @@
+{config, pkgs, serverInfo}:
+
+let
+
+  # The Zabbix PHP frontend needs to be able to write its
+  # configuration settings (the connection info to the database) to
+  # the "conf" subdirectory.  So symlink $out/conf to some directory
+  # outside of the Nix store where we want to keep this stateful info.
+  # Note that different instances of the frontend will therefore end
+  # up with their own copies of the PHP sources.  !!! Alternatively,
+  # we could generate zabbix.conf.php declaratively.
+  zabbixPHP = pkgs.runCommand "${pkgs.zabbixServer.name}-php" {} ''
+    cp -rs ${pkgs.zabbixServer}/share/zabbix/php $out
+    chmod -R u+w $out
+    #rm -rf $out/conf
+    ln -s ${config.stateDir}/zabbix.conf.php $out/conf/zabbix.conf.php
+  '';
+
+in
+
+{
+
+  extraConfig = ''
+    Alias ${config.urlPrefix}/ ${zabbixPHP}/
+    
+    <Directory ${zabbixPHP}>
+      DirectoryIndex index.php
+      Order deny,allow
+      Allow from *
+    </Directory>
+  '';
+
+  startupScript = pkgs.writeScript "zabbix-startup-hook" ''
+    mkdir -p ${config.stateDir}
+    chown -R ${serverInfo.serverConfig.user} ${config.stateDir}
+  '';
+
+  options = {
+
+    urlPrefix = pkgs.lib.mkOption {
+      default = "/zabbix";
+      description = "
+        The URL prefix under which the Zabbix service appears.
+        Use the empty string to have it appear in the server root.
+      ";
+    };
+
+    stateDir = pkgs.lib.mkOption {
+      default = "/var/lib/zabbix/frontend";
+      description = "
+        Directory where the dynamically generated configuration data
+        of the PHP frontend will be stored.
+      ";
+    };
+
+  };
+
+}
-- 
GitLab


From f17f9e301f4ab9c1ac66a595d848a827963b3328 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 9 Jun 2008 16:02:38 +0000
Subject: [PATCH 0951/5331] svn path=/nixos/trunk/; revision=12023

---
 upstart-jobs/apache-httpd/zabbix.nix | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/upstart-jobs/apache-httpd/zabbix.nix b/upstart-jobs/apache-httpd/zabbix.nix
index c7f48fe7df6..de597f6c4da 100644
--- a/upstart-jobs/apache-httpd/zabbix.nix
+++ b/upstart-jobs/apache-httpd/zabbix.nix
@@ -20,6 +20,13 @@ in
 
 {
 
+  extraModules = [
+    { name = "php5"; path = "${pkgs.php}/modules/libphp5.so"; }
+  ];
+
+  # !!! should also declare PHP options that Zabbix needs like the
+  # timezone and timeout.
+  
   extraConfig = ''
     Alias ${config.urlPrefix}/ ${zabbixPHP}/
     
@@ -35,6 +42,9 @@ in
     chown -R ${serverInfo.serverConfig.user} ${config.stateDir}
   '';
 
+  # The frontend needs "ps" to find out whether zabbix_server is running.
+  extraServerPath = ["${pkgs.procps}/bin"];
+
   options = {
 
     urlPrefix = pkgs.lib.mkOption {
-- 
GitLab


From 5235acb1d7c7a84d842938f292f1630996d75c22 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 9 Jun 2008 16:35:24 +0000
Subject: [PATCH 0952/5331] * extraSubservices: the subservice config no longer
 needs to be   in a `config' attribute.  So instead of

    extraSubservices = [
      { serviceName = "foo";
        config = {
          bla = ...;
        };
      }
    ];

  you can write

    extraSubservices = [
      { serviceName = "foo";
        bla = ...;
      }
    ];

svn path=/nixos/trunk/; revision=12024
---
 upstart-jobs/apache-httpd/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/upstart-jobs/apache-httpd/default.nix b/upstart-jobs/apache-httpd/default.nix
index 8bcd2c7aaa9..0d40d4fd3e5 100644
--- a/upstart-jobs/apache-httpd/default.nix
+++ b/upstart-jobs/apache-httpd/default.nix
@@ -54,7 +54,8 @@ let
         svcFunction =
           if svc ? function then svc.function
           else import (./noDir/.. + ("/" + svc.serviceName + ".nix"));
-        config = addDefaultOptionValues res.options svc.config;
+        config = addDefaultOptionValues res.options
+          (if svc ? config then svc.config else svc);
         defaults = {
           extraConfig = "";
           extraModules = [];
-- 
GitLab


From a49eb4d1f9568302d5808828daff97b846fc5256 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 9 Jun 2008 16:41:41 +0000
Subject: [PATCH 0953/5331] * extraSubservices: renamed `serviceName' to
 `serviceType' which is more   correct.

svn path=/nixos/trunk/; revision=12026
---
 upstart-jobs/apache-httpd/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/upstart-jobs/apache-httpd/default.nix b/upstart-jobs/apache-httpd/default.nix
index 0d40d4fd3e5..6a4e9116dc9 100644
--- a/upstart-jobs/apache-httpd/default.nix
+++ b/upstart-jobs/apache-httpd/default.nix
@@ -53,7 +53,7 @@ let
       let 
         svcFunction =
           if svc ? function then svc.function
-          else import (./noDir/.. + ("/" + svc.serviceName + ".nix"));
+          else import "${./.}/${if svc ? serviceType then svc.serviceType else svc.serviceName}.nix";
         config = addDefaultOptionValues res.options
           (if svc ? config then svc.config else svc);
         defaults = {
-- 
GitLab


From a20f4aff60248484ebe15cc66007dfb4e4e60287 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 10 Jun 2008 16:10:23 +0000
Subject: [PATCH 0954/5331] * Updated the splash screen support for Linux >=
 2.6.25.

svn path=/nixos/trunk/; revision=12030
---
 system/system.nix                |  9 +++--
 upstart-jobs/default.nix         |  2 +-
 upstart-jobs/tty-backgrounds.nix | 67 ++++++++++++++++----------------
 3 files changed, 39 insertions(+), 39 deletions(-)

diff --git a/system/system.nix b/system/system.nix
index 590189f9abb..7a40ba7c885 100644
--- a/system/system.nix
+++ b/system/system.nix
@@ -121,14 +121,15 @@ rec {
       }
     ] ++
       pkgs.lib.optionals
-        (config.boot.initrd.enableSplashScreen && kernelPackages.kernel.features ? fbSplash)
+        (config.boot.initrd.enableSplashScreen && kernelPackages.splashutils != null)
         [
-          { object = pkgs.runCommand "splashutils" {} ''
+          { object = pkgs.runCommand "splashutils" {allowedReferences = []; buildInputs = [pkgs.nukeReferences];} ''
               ensureDir $out/bin
-              cp ${kernelPackages.splashutils}/bin/splash_helper $out/bin
+              cp ${kernelPackages.splashutils}/${kernelPackages.splashutils.helperName} $out/bin/splash_helper
+              nuke-refs $out/bin/*
             '';
             suffix = "/bin/splash_helper";
-            symlink = "/sbin/splash_helper";
+            symlink = "/${kernelPackages.splashutils.helperName}";
           }
           { object = import ../helpers/unpack-theme.nix {
               inherit (pkgs) stdenv;
diff --git a/upstart-jobs/default.nix b/upstart-jobs/default.nix
index f7117f616ae..0169b8b13c0 100644
--- a/upstart-jobs/default.nix
+++ b/upstart-jobs/default.nix
@@ -409,7 +409,7 @@ let
   )
 
   # Transparent TTY backgrounds.
-  ++ optional (config.services.ttyBackgrounds.enable && kernelPackages.kernel.features ? fbSplash)
+  ++ optional (config.services.ttyBackgrounds.enable && kernelPackages.splashutils != null)
     (import ../upstart-jobs/tty-backgrounds.nix {
       inherit (pkgs) stdenv;
       inherit (kernelPackages) splashutils;
diff --git a/upstart-jobs/tty-backgrounds.nix b/upstart-jobs/tty-backgrounds.nix
index 6debe9e8f44..d83291d7a05 100644
--- a/upstart-jobs/tty-backgrounds.nix
+++ b/upstart-jobs/tty-backgrounds.nix
@@ -21,39 +21,38 @@ rec {
     }
   ];
 
-  job = "
-start on hardware-scan
-
-start script
-
-    # Critical: tell the kernel where to find splash_helper.  It calls
-    # this program every time we switch between consoles.
-    echo ${splashutils}/bin/splash_helper > /proc/sys/kernel/fbsplash
-
-    # For each console...
-    for tty in ${toString (map (x: x.tty) backgrounds)}; do
-        # Make sure that the console exists.
-        echo -n '' > /dev/tty$tty 
-
-	# Set the theme as determined by tty-backgrounds-combine.sh
-        # above.
-        theme=$(readlink ${themesUnpacked}/$tty)
-        ${splashutils}/bin/splash_util --tty $tty -c setcfg -t $theme || true
-        ${splashutils}/bin/splash_util --tty $tty -c setpic -t $theme || true
-        ${splashutils}/bin/splash_util --tty $tty -c on || true
-    done
-
-end script
-
-respawn sleep 10000 # !!! Hack
-
-stop script
-    # Disable the theme on each console.
-    for tty in ${toString (map (x: x.tty) backgrounds)}; do
-        ${splashutils}/bin/splash_util --tty $tty -c off || true
-    done
-end script
-
-  ";
+  job = ''
+    start on hardware-scan
+
+    start script
+
+	# Critical: tell the kernel where to find splash_helper.  It calls
+	# this program every time we switch between consoles.
+	echo ${splashutils}/${splashutils.helperName} > ${splashutils.helperProcFile}
+
+	# For each console...
+	for tty in ${toString (map (x: x.tty) backgrounds)}; do
+	    # Make sure that the console exists.
+	    echo -n "" > /dev/tty$tty 
+
+	    # Set the theme as determined by tty-backgrounds-combine.sh
+	    # above.
+	    theme=$(readlink ${themesUnpacked}/$tty)
+	    ${splashutils}/${splashutils.controlName} --tty $tty -c setcfg -t $theme || true
+	    ${splashutils}/${splashutils.controlName} --tty $tty -c setpic -t $theme || true
+	    ${splashutils}/${splashutils.controlName} --tty $tty -c on || true
+	done
+
+    end script
+
+    respawn sleep 10000 # !!! Hack
+
+    stop script
+	# Disable the theme on each console.
+	for tty in ${toString (map (x: x.tty) backgrounds)}; do
+	    ${splashutils}/${splashutils.controlName} --tty $tty -c off || true
+	done
+    end script
+  '';
   
 }
-- 
GitLab


From d28ecc593f7de9d7d0b05665b27e8379ac9fe82a Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 10 Jun 2008 16:15:37 +0000
Subject: [PATCH 0955/5331] * hal: less verbosity.

svn path=/nixos/trunk/; revision=12031
---
 upstart-jobs/hal.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/upstart-jobs/hal.nix b/upstart-jobs/hal.nix
index d6094d5bfa3..90e8c49521b 100644
--- a/upstart-jobs/hal.nix
+++ b/upstart-jobs/hal.nix
@@ -33,7 +33,7 @@
 
     end script
 
-    respawn ${hal}/sbin/hald --daemon=no --verbose=yes
+    respawn ${hal}/sbin/hald --daemon=no
   '';
   
 }
-- 
GitLab


From 216e3b73f4e593e449497049add9aacbbd5d1621 Mon Sep 17 00:00:00 2001
From: Marc Weber <marco-oweber@gmx.de>
Date: Wed, 11 Jun 2008 23:06:53 +0000
Subject: [PATCH 0956/5331] added support for unixODBC in configuration.nix
 writing /etc/odbcinst.ini

svn path=/nixos/trunk/; revision=12045
---
 etc/default.nix    | 9 ++++++++-
 system/options.nix | 7 +++++++
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/etc/default.nix b/etc/default.nix
index 3015c34926d..9f2056f679f 100644
--- a/etc/default.nix
+++ b/etc/default.nix
@@ -258,7 +258,14 @@ import ../helpers/make-etc.nix {
     target = "nix.machines";
   }
     
+  # unixODBC drivers (this solution is not perfect.. Because the user has to
+  # ask the admin to add a driver.. but it's an easy solution which works)
+  ++ (let inis = config.environment.unixODBCDrivers pkgs;
+      in optional ((pkgs.lib.traceWhatis inis) != [] ) {
+        source = pkgs.writeText "odbcinst.ini" (pkgs.lib.concatStringsSep "\n" inis);
+        target = "odbcinst.ini";
+      })
+
   # Additional /etc files declared by Upstart jobs.
   ++ extraEtc;
-  
 }
diff --git a/system/options.nix b/system/options.nix
index 1e9081e0e3b..28c9e15c58f 100644
--- a/system/options.nix
+++ b/system/options.nix
@@ -2473,6 +2473,13 @@ root        ALL=(ALL) SETENV: ALL
         If all configuration options must be checked. Non-existing options fail build.
       ";
     };
+
+    unixODBCDrivers = mkOption {
+      default = pkgs : [];
+      example = "pkgs : map (x : x.ini) (with pkgs.unixODBCDrivers; [ mysql psql psqlng ] )";
+      description = "specifies unix odbc drivers to be registered at /etc/odbcinst.ini";
+    };
+
   };
   
   nesting = {
-- 
GitLab


From afed669a5a3b0e763296c33e27e977b32dd5bf8c Mon Sep 17 00:00:00 2001
From: Marc Weber <marco-oweber@gmx.de>
Date: Thu, 12 Jun 2008 12:19:47 +0000
Subject: [PATCH 0957/5331] removed debug trace command

svn path=/nixos/trunk/; revision=12055
---
 etc/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/etc/default.nix b/etc/default.nix
index 9f2056f679f..3a4e2bdecac 100644
--- a/etc/default.nix
+++ b/etc/default.nix
@@ -261,7 +261,7 @@ import ../helpers/make-etc.nix {
   # unixODBC drivers (this solution is not perfect.. Because the user has to
   # ask the admin to add a driver.. but it's an easy solution which works)
   ++ (let inis = config.environment.unixODBCDrivers pkgs;
-      in optional ((pkgs.lib.traceWhatis inis) != [] ) {
+      in optional (inis != [] ) {
         source = pkgs.writeText "odbcinst.ini" (pkgs.lib.concatStringsSep "\n" inis);
         target = "odbcinst.ini";
       })
-- 
GitLab


From 0739332a6c173f1aed6db0fef48ed95361711235 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 16 Jun 2008 19:06:59 +0000
Subject: [PATCH 0958/5331] * Create /etc/nixos/nixpkgs, otherwise unpacking  
 /install/nixpkgs.tar.bz2 fails (but that file appears   to be broken
 anyway...).

svn path=/nixos/trunk/; revision=12125
---
 configuration/rescue-cd.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/configuration/rescue-cd.nix b/configuration/rescue-cd.nix
index 27ba51cf11f..cc08ab6bc22 100644
--- a/configuration/rescue-cd.nix
+++ b/configuration/rescue-cd.nix
@@ -99,6 +99,7 @@ rec {
 
               mkdir -p /etc/nixos/nixos
               tar xjf /install/nixos.tar.bz2 -C /etc/nixos/nixos
+              mkdir -p /etc/nixos/nixpkgs
               tar xjf /install/nixpkgs.tar.bz2 -C /etc/nixos/nixpkgs
               chown -R root.root /etc/nixos
             end script
-- 
GitLab


From 8c7859f7fb004016b5500bfd53c9a9fb15199f5e Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 20 Jun 2008 13:32:39 +0000
Subject: [PATCH 0959/5331] * Make kdesktop_lock work by providing a PAM
 configuration for KDE   and making kcheckpass setuid root.

svn path=/nixos/trunk/; revision=12166
---
 etc/default.nix   | 1 +
 etc/pam.d/kde     | 4 ++++
 system/system.nix | 5 +++--
 3 files changed, 8 insertions(+), 2 deletions(-)
 create mode 100644 etc/pam.d/kde

diff --git a/etc/default.nix b/etc/default.nix
index 3a4e2bdecac..e9de343f9c3 100644
--- a/etc/default.nix
+++ b/etc/default.nix
@@ -243,6 +243,7 @@ import ../helpers/make-etc.nix {
       "useradd"
       "chsh"
       "xlock"
+      "kde"
       "common"
       "common-console" # shared stuff for interactive local sessions
     ]
diff --git a/etc/pam.d/kde b/etc/pam.d/kde
new file mode 100644
index 00000000000..50f3cc5ce60
--- /dev/null
+++ b/etc/pam.d/kde
@@ -0,0 +1,4 @@
+auth     include        common
+account  include        common
+password include        common
+session  include        common
diff --git a/system/system.nix b/system/system.nix
index 7a40ba7c885..9a2bda52963 100644
--- a/system/system.nix
+++ b/system/system.nix
@@ -314,8 +314,9 @@ rec {
     setuidPrograms =
       config.security.setuidPrograms ++
       config.security.extraSetuidPrograms ++
-      pkgs.lib.optional (config.security.sudo.enable) "sudo" ++
-      (if (config.services.atd.enable) then [ "at" "atq" "atrm" ] else []);
+      pkgs.lib.optional config.security.sudo.enable "sudo" ++
+      pkgs.lib.optionals config.services.atd.enable ["at" "atq" "atrm"] ++
+      pkgs.lib.optional (config.services.xserver.sessionType == "kde") "kcheckpass";
 
     inherit (usersGroups) createUsersGroups usersList groupsList;
 
-- 
GitLab


From 1ec810f84453533db989688933c69d9692fd96f4 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 20 Jun 2008 16:09:48 +0000
Subject: [PATCH 0960/5331] * Clean up indentation.

svn path=/nixos/trunk/; revision=12169
---
 upstart-jobs/udev.nix | 80 +++++++++++++++++++++----------------------
 1 file changed, 40 insertions(+), 40 deletions(-)

diff --git a/upstart-jobs/udev.nix b/upstart-jobs/udev.nix
index 3baf8053327..13ac6fd3a13 100644
--- a/upstart-jobs/udev.nix
+++ b/upstart-jobs/udev.nix
@@ -51,45 +51,45 @@ in
 {
   name = "udev";
   
-  job = "
-start on startup
-stop on shutdown
-
-env UDEV_CONFIG_FILE=${conf}
-
-start script
-    echo '' > /proc/sys/kernel/hotplug
-
-    # Get rid of possible old udev processes.
-    ${procps}/bin/pkill -u root '^udevd$' || true
-
-    # Start udev.
-    ${udev}/sbin/udevd --daemon
-
-    # Let udev create device nodes for all modules that have already
-    # been loaded into the kernel (or for which support is built into
-    # the kernel).
-    if ! test -e ${devicesCreated}; then
-        ${udev}/sbin/udevtrigger
-        ${udev}/sbin/udevsettle # wait for udev to finish
-        touch ${devicesCreated}
-    fi
-
-    # Kill udev, let Upstart restart and monitor it.  (This is nasty,
-    # but we have to run udevtrigger first.  Maybe we can use
-    # Upstart's `binary' keyword, but it isn't implemented yet.)
-    if ! ${procps}/bin/pkill -u root '^udevd$'; then
-        echo \"couldn't stop udevd\"
-    fi
-
-    while ${procps}/bin/pgrep -u root '^udevd$'; do
-        sleep 1
-    done
-
-    initctl emit new-devices
-end script
-
-respawn ${udev}/sbin/udevd
-  ";
+  job = ''
+    start on startup
+    stop on shutdown
+
+    env UDEV_CONFIG_FILE=${conf}
+
+    start script
+	echo "" > /proc/sys/kernel/hotplug
+
+	# Get rid of possible old udev processes.
+	${procps}/bin/pkill -u root "^udevd$" || true
+
+	# Start udev.
+	${udev}/sbin/udevd --daemon
+
+	# Let udev create device nodes for all modules that have already
+	# been loaded into the kernel (or for which support is built into
+	# the kernel).
+	if ! test -e ${devicesCreated}; then
+	    ${udev}/sbin/udevtrigger
+	    ${udev}/sbin/udevsettle # wait for udev to finish
+	    touch ${devicesCreated}
+	fi
+
+	# Kill udev, let Upstart restart and monitor it.  (This is nasty,
+	# but we have to run udevtrigger first.  Maybe we can use
+	# Upstart's `binary' keyword, but it isn't implemented yet.)
+	if ! ${procps}/bin/pkill -u root "^udevd$"; then
+	    echo "couldn't stop udevd"
+	fi
+
+	while ${procps}/bin/pgrep -u root "^udevd$"; do
+	    sleep 1
+	done
+
+	initctl emit new-devices
+    end script
+
+    respawn ${udev}/sbin/udevd
+  '';
 
 }
-- 
GitLab


From 91e2083d327b025708113b02ef9c42aa055ef493 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 20 Jun 2008 16:10:20 +0000
Subject: [PATCH 0961/5331] * Load the wis-go7007 firmware automatically.

svn path=/nixos/trunk/; revision=12170
---
 system/system.nix        | 2 +-
 upstart-jobs/default.nix | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/system/system.nix b/system/system.nix
index 9a2bda52963..5d9b3d772dc 100644
--- a/system/system.nix
+++ b/system/system.nix
@@ -54,7 +54,7 @@ rec {
     # !!! this should be declared by the xserver Upstart job.
     ++ pkgs.lib.optional (config.services.xserver.enable && config.services.xserver.videoDriver == "nvidia") kernelPackages.nvidiaDrivers
     ++ pkgs.lib.optional config.hardware.enableGo7007 kernelPackages.wis_go7007
-    ++ (config.boot.extraModulePackages pkgs)
+    ++ config.boot.extraModulePackages pkgs
   );
 
   
diff --git a/upstart-jobs/default.nix b/upstart-jobs/default.nix
index 0169b8b13c0..4eed586c298 100644
--- a/upstart-jobs/default.nix
+++ b/upstart-jobs/default.nix
@@ -95,10 +95,11 @@ let
         ++ pkgs.lib.optional config.networking.enableIntel3945ABGFirmware pkgs.iwlwifi3945ucode
         ++ pkgs.lib.optional config.networking.enableIntel4965AGNFirmware pkgs.iwlwifi4965ucode
         ++ pkgs.lib.optional config.networking.enableZydasZD1211Firmware pkgs.zd1211fw
+        ++ pkgs.lib.optional config.hardware.enableGo7007 "${kernelPackages.wis_go7007}/firmware"
 	++ config.services.udev.addFirmware;
       extraUdevPkgs =
            pkgs.lib.optional config.services.hal.enable pkgs.hal
-        ++ pkgs.lib.optional config.hardware.enableGo7007 pkgs.wis_go7007;
+        ++ pkgs.lib.optional config.hardware.enableGo7007 kernelPackages.wis_go7007;
       sndMode = config.services.udev.sndMode;
     })
       
-- 
GitLab


From 314ab9774fd3818130be4b011ece6c18a1a0156b Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 20 Jun 2008 18:17:51 +0000
Subject: [PATCH 0962/5331] * Put gorecord in PATH.

svn path=/nixos/trunk/; revision=12173
---
 system/system.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/system/system.nix b/system/system.nix
index 5d9b3d772dc..d8c27dd4514 100644
--- a/system/system.nix
+++ b/system/system.nix
@@ -130,7 +130,7 @@ rec {
             '';
             suffix = "/bin/splash_helper";
             symlink = "/${kernelPackages.splashutils.helperName}";
-          }
+          } # */
           { object = import ../helpers/unpack-theme.nix {
               inherit (pkgs) stdenv;
               theme = config.services.ttyBackgrounds.defaultTheme;
@@ -273,6 +273,7 @@ rec {
   ++ pkgs.lib.concatLists (map (job: job.extraPath) upstartJobs.jobs)
   ++ config.environment.extraPackages pkgs
   ++ pkgs.lib.optional config.fonts.enableFontDir fontDir
+  ++ pkgs.lib.optional config.hardware.enableGo7007 kernelPackages.wis_go7007
 
   # NSS modules need to be in `systemPath' so that (i) the builder
   # chroot gets to seem them, and (ii) applications can benefit from
-- 
GitLab


From 90acbf9509c11a0f5c6a5809435be7eca2bc5501 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 25 Jun 2008 21:58:51 +0000
Subject: [PATCH 0963/5331] * mysql: merged the mysql expression in the
 services tree. * mysql: run under a separate user ("mysql"), not under
 "nobody". * mysql: put the PID under /var/run.

svn path=/nixos/trunk/; revision=12189
---
 system/options.nix     |  6 ++---
 upstart-jobs/mysql.nix | 56 ++++++++++++++++++++++++++++++++----------
 2 files changed, 46 insertions(+), 16 deletions(-)

diff --git a/system/options.nix b/system/options.nix
index 28c9e15c58f..07f17cb98e9 100644
--- a/system/options.nix
+++ b/system/options.nix
@@ -1933,7 +1933,7 @@
       };
       
       user = mkOption {
-        default = "nobody";
+        default = "mysql";
 	description = "User account under which MySQL runs";
       };
       
@@ -1947,8 +1947,8 @@
 	description = "Location of the MySQL error logfile";
       };
       
-      pidFile = mkOption {
-        default = "/var/mysql/mysql.pid";
+      pidDir = mkOption {
+        default = "/var/run/mysql";
 	description = "Location of the file which stores the PID of the MySQL server";
       };
     };
diff --git a/upstart-jobs/mysql.nix b/upstart-jobs/mysql.nix
index 8a8f924bf17..6756891321b 100644
--- a/upstart-jobs/mysql.nix
+++ b/upstart-jobs/mysql.nix
@@ -1,22 +1,52 @@
-args: with args;
+{pkgs, config}:
 
 let
 
-cfg = config.services.mysql;
-mysqlService = import ../services/mysql {
-	inherit (pkgs) stdenv mysql;
-	inherit (cfg) port user dataDir
-		logError pidFile;
-};
+  cfg = config.services.mysql;
+
+  mysql = pkgs.mysql;
+
+  pidFile = "${cfg.pidDir}/mysqld.pid";
+
+  mysqldOptions =
+    "--user=${cfg.user} --datadir=${cfg.dataDir} " +
+    "--log-error=${cfg.logError} --pid-file=${pidFile}";
 
 in
+
 {
-	name = "mysql";
-	job = "
-description \"MySQL server\"
+  name = "mysql";
+  
+  users = [
+    { name = "mysql";
+      description = "MySQL server user";
+    }
+  ];
+
+  extraPath = [mysql];
+  
+  job = ''
+    description "MySQL server"
+
+    stop on shutdown
+
+    start script
+        if ! test -e ${cfg.dataDir}; then
+            mkdir -m 0700 -p ${cfg.dataDir}
+            chown -R ${cfg.user} ${cfg.dataDir}
+            ${mysql}/bin/mysql_install_db ${mysqldOptions}
+        fi
+
+        mkdir -m 0700 -p ${cfg.pidDir}
+        chown -R ${cfg.user} ${cfg.pidDir}
+    end script
 
-stop on shutdown
+    respawn ${mysql}/bin/mysqld ${mysqldOptions}
 
-respawn ${mysqlService}/bin/control start
-	";
+    stop script
+        pid=$(cat ${pidFile})
+        kill "$pid"
+        ${mysql}/bin/mysql_waitpid "$pid" 1000
+    end script
+  '';
 }
-- 
GitLab


From 27b329abe20b9805c57c03eb9faaa0bae687267c Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 27 Jun 2008 12:28:43 +0000
Subject: [PATCH 0964/5331] * Doh! Include the pkgs subdirectory of nixpkgs on
 the CD.

svn path=/nixos/trunk/; revision=12198
---
 configuration/rescue-cd.nix | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/configuration/rescue-cd.nix b/configuration/rescue-cd.nix
index cc08ab6bc22..f54aa5bf66a 100644
--- a/configuration/rescue-cd.nix
+++ b/configuration/rescue-cd.nix
@@ -208,14 +208,13 @@ rec {
   makeTarball = tarName: input: pkgs.runCommand "tarball" {inherit tarName;} "
     ensureDir $out
     (cd ${input} && tar cvfj $out/${tarName} . \\
-      --exclude '*~' \\
-      --exclude 'pkgs' --exclude 'result')
+      --exclude '*~' --exclude 'result')
   ";
 
   
   # Put the current directory in a tarball (making sure to filter
   # out crap like the .svn directories).
-  nixosTarball =makeTarball "nixos.tar.bz2" (builtins.filterSource svnFilter ./..);
+  nixosTarball = makeTarball "nixos.tar.bz2" (builtins.filterSource svnFilter ./..);
 
   svnFilter = name: type:
     let base = baseNameOf (toString name);
-- 
GitLab


From 60d37c75f9704cdf5f1e57cff3d29982c65f3024 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Sat, 28 Jun 2008 07:46:50 +0000
Subject: [PATCH 0965/5331] Added radeonhd support to xserver job

svn path=/nixos/trunk/; revision=12206
---
 upstart-jobs/xserver.nix | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/upstart-jobs/xserver.nix b/upstart-jobs/xserver.nix
index 182996a9dd9..2d81d25c225 100644
--- a/upstart-jobs/xserver.nix
+++ b/upstart-jobs/xserver.nix
@@ -49,6 +49,7 @@ let
     ++ optional (videoDriver == "intel") xorg.xf86videointel
     ++ optional (videoDriver == "nv") xorg.xf86videonv
     ++ optional (videoDriver == "ati") xorg.xf86videoati
+    ++ optional (videoDriver == "radeonhd") xorg.xf86videoradeonhd
     ++ (optional cfg.synaptics.enable ["${pkgs.synaptics}/${xorg.xorgserver}" /*xorg.xf86inputevdev*/]);
 
 
@@ -166,6 +167,12 @@ let
         ';
       fi;
 
+      if [ "${toString videoDriver}" = radeonhd ]; then
+        export extensions='
+          Option "Composite" "Enable"
+        ';
+      fi;
+
       substituteAll $src $out
     ''; # */
   };
-- 
GitLab


From c341a03404a9466e150cd035b8cf8df6f7158da1 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sun, 29 Jun 2008 22:18:39 +0000
Subject: [PATCH 0966/5331] * A little script to test changes to individual
 Upstart jobs,   i.e., only the specified jobs are rebuilt and restarted.  
 Example:

  $ test/test-upstart-job.sh udev

  will rebuild and restart just the udev service.  This is useful
  e.g. when making changes to the udev package, which would
  normally entail rebuilding lots of other services as well
  (e.g. the X service might depend on KDE, which depends on HAL,
  which depends on udev...).

  It's implemented by making a copy of the current /etc/event.d
  in /tmp/event.d, then replacing only those jobs indicated on the
  command line, symlinking /etc/event.d to /tmp/event.d, and
  restarting init.

svn path=/nixos/trunk/; revision=12217
---
 test/test-upstart-job.sh | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)
 create mode 100755 test/test-upstart-job.sh

diff --git a/test/test-upstart-job.sh b/test/test-upstart-job.sh
new file mode 100755
index 00000000000..626aed806ae
--- /dev/null
+++ b/test/test-upstart-job.sh
@@ -0,0 +1,25 @@
+#! /bin/sh -e
+
+tmpDir=/tmp/event.d
+
+rm -rf $tmpDir
+
+cp -prd $(readlink -f /etc/event.d) /tmp/event.d
+
+for i in $*; do
+    echo "building job $i..."
+    nix-build /etc/nixos/nixos -A "upstartJobs.$i" -o $tmpDir/.result
+    ln -sfn $(readlink -f $tmpDir/.result)/etc/event.d/* /tmp/event.d/
+done
+
+ln -sfn /tmp/event.d /etc/event.d
+
+echo "restarting init..."
+kill -TERM 1 
+
+for i in $*; do
+    echo "restarting job $i..."
+    initctl stop "$i"
+    sleep 1
+    initctl start "$i"
+done    
-- 
GitLab


From eb79938997e004902ab1b58134197f888e7c7c20 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Mon, 30 Jun 2008 15:13:02 +0000
Subject: [PATCH 0967/5331] Added Postfix; handles at least local delivery with
 maildir/

svn path=/nixos/trunk/; revision=12221
---
 system/activate-configuration.sh |   2 +
 system/ids.nix                   |   3 +
 system/options.nix               | 136 +++++++++++++++++++++++++++-
 system/system.nix                |  15 ++++
 upstart-jobs/default.nix         |   6 ++
 upstart-jobs/postfix.nix         | 146 +++++++++++++++++++++++++++++++
 6 files changed, 307 insertions(+), 1 deletion(-)
 create mode 100644 upstart-jobs/postfix.nix

diff --git a/system/activate-configuration.sh b/system/activate-configuration.sh
index fd901c8aca6..b58eb8c15d0 100644
--- a/system/activate-configuration.sh
+++ b/system/activate-configuration.sh
@@ -156,6 +156,8 @@ for i in @setuidPrograms@; do
     chmod 4755 $wrapperDir/$i
 done
 
+@adjustSetuidOwner@ 
+
 PATH="$save_PATH"
 
 # Set the host name.  Don't clear it if it's not configured in the
diff --git a/system/ids.nix b/system/ids.nix
index 473f8202e68..a704ef163ea 100644
--- a/system/ids.nix
+++ b/system/ids.nix
@@ -15,6 +15,7 @@
     portmap = 11;
     atd = 12;
     zabbix = 13;
+    postfix = 14;
 
     nixbld = 30000; # start of range of uids
     nobody = 65534;
@@ -30,6 +31,8 @@
     avahi = 10;
     portmap = 11;
     atd = 12;
+    postfix = 13;
+    postdrop = 14;
 
     audio = 17;
 
diff --git a/system/options.nix b/system/options.nix
index 07f17cb98e9..e63531f577c 100644
--- a/system/options.nix
+++ b/system/options.nix
@@ -339,6 +339,14 @@
       ";
     };
 
+    nativeIPv6 = mkOption {
+      default = false;
+      description = "
+        Whether to use IPv6 even though gw6c is not used. For example, 
+	for Postfix.
+      ";
+    };
+
     extraHosts = mkOption {
       default = "";
       example = "192.168.0.1 lanlocalhost";
@@ -2072,7 +2080,116 @@
 	";
       };
     };
-    
+   
+    postfix = {
+      enable = mkOption {
+        default = false;
+	description ="
+	  Whether to run the Postfix mail server.
+	";
+      };
+      user = mkOption {
+        default = "postfix";
+	description = "
+	  How to call postfix user (must be used only for postfix).
+	";
+      };
+      group = mkOption {
+        default = "postfix";
+	description = "
+	  How to call postfix group (must be used only for postfix).
+	";
+      };
+      setgidGroup = mkOption {
+        default = "postdrop";
+	description = "
+	  How to call postfix setgid group (for postdrop). Should 
+	  be uniquely used group.
+	";
+      };
+      networks = mkOption {
+        default = null;
+	example = ["192.168.0.1/24"];
+	description = "
+	  Net masks for trusted - allowed to relay mail to third parties - 
+	  hosts. Leave empty to use mynetworks_style configuration or use 
+	  default (localhost-only).
+	";
+      };
+      networksStyle = mkOption {
+        default = "";
+	description = "
+	  Name of standard way of trusted network specification to use,
+	  leave blank if you specify it explicitly or if you want to use 
+	  default (localhost-only).
+	";
+      };
+      hostname = mkOption {
+        default = "";
+	description ="
+	  Hostname to use. Leave blank to use just the hostname of machine.
+	  It should be FQDN.
+	";
+      };
+      domain = mkOption {
+        default = "";
+	description ="
+	  Domain to use. Leave blank to use hostname minus first component.
+	";
+      };
+      origin = mkOption {
+        default = "";
+	description ="
+	  Origin to use in outgoing e-mail. Leave blank to use hostname.
+	";
+      };
+      destination = mkOption {
+        default = null;
+        example = ["localhost"];
+        description = "
+	  Full (!) list of domains we deliver locally. Leave blank for 
+	  acceptable Postfix default.
+	";
+      };
+      relayDomains = mkOption {
+        default = null;
+	example = ["localdomain"];
+	description = "
+	  List of domains we agree to relay to. Default is the same as 
+	  destination.
+	";
+      };
+      relayHost = mkOption {
+        default = "";
+	description = "
+	  Mail relay for outbound mail.
+	";
+      };
+      lookupMX = mkOption {
+        default = false;
+	description = "
+	  Whether relay specified is just domain whose MX must be used.
+	";
+      };
+      postmasterAlias = mkOption {
+        default = "root";
+	description = "
+	  Who should receive postmaster e-mail.
+	";
+      };
+      rootAlias = mkOption {
+        default = "";
+	description = "
+	  Who should receive root e-mail. Blank for no redirection.
+	";
+      };
+      extraAliases = mkOption {
+        default = "";
+	description = "
+	  Additional entries to put verbatim into aliases file.
+	";
+      };
+    };
 
   };
 
@@ -2206,6 +2323,23 @@
       ";
     };
 
+    setuidOwners = mkOption {
+      default = [];
+      example = [{
+        program = "sendmail";
+	owner = "nodody";
+	group = "postdrop";
+	setuid = false;
+	setgid = true;
+      }];
+      description = ''
+        List of non-trivial setuid programs, like Postfix sendmail. Default 
+	should probably be nobody:nogroup:false:false - if you are bothering
+	doing anything with a setuid program, "root.root u+s g-s" is not what
+	you are aiming at..
+      '';
+    };
+
     seccureKeys = {
       public = mkOption {
         default = /var/elliptic-keys/public;
diff --git a/system/system.nix b/system/system.nix
index d8c27dd4514..a2001ebf390 100644
--- a/system/system.nix
+++ b/system/system.nix
@@ -328,6 +328,21 @@ rec {
       ];
 
     bash = pkgs.bashInteractive;
+
+    adjustSetuidOwner = pkgs.lib.concatStrings (map 
+      (_entry:let entry = {
+        owner = "nobody";
+	group = "nogroup";
+	setuid = false;
+	setgid = false;
+      } //_entry; in
+      ''
+        chown ${entry.owner}.${entry.group} $wrapperDir/${entry.program}
+	chmod u${if entry.setuid then "+" else "-"}s $wrapperDir/${entry.program} 
+	chmod g${if entry.setgid then "+" else "-"}s $wrapperDir/${entry.program} 
+
+      '') 
+      config.security.setuidOwners);
   };
 
 
diff --git a/upstart-jobs/default.nix b/upstart-jobs/default.nix
index 4eed586c298..08afd46449a 100644
--- a/upstart-jobs/default.nix
+++ b/upstart-jobs/default.nix
@@ -389,6 +389,12 @@ let
     (import ../upstart-jobs/zabbix-server.nix {
       inherit config pkgs;
     })
+  
+  # Postfix mail server.
+  ++ optional config.services.postfix.enable
+    (import ../upstart-jobs/postfix.nix {
+      inherit config pkgs;
+    })
 
   # Handles the reboot/halt events.
   ++ (map
diff --git a/upstart-jobs/postfix.nix b/upstart-jobs/postfix.nix
new file mode 100644
index 00000000000..9b85969692d
--- /dev/null
+++ b/upstart-jobs/postfix.nix
@@ -0,0 +1,146 @@
+{config, pkgs} : 
+let
+  startingDependency = if config.services.gw6c.enable then "gw6c" else "network-interfaces";
+
+  cfg = config.services.postfix;
+  user = cfg.user;
+  group = cfg.group;
+  setgidGroup = cfg.setgidGroup;
+  idList = import ../system/ids.nix;
+
+  optionalString = pkgs.lib.optionalString;
+  mainCf = 
+  ''
+    queue_directory = /var/postfix/queue
+    command_directory = ${pkgs.postfix}/sbin
+    daemon_directory = ${pkgs.postfix}/libexec/postfix
+
+    mail_owner = ${user}
+    default_privs = nobody
+
+  ''
+  + optionalString (config.services.gw6c.enable || config.networking.nativeIPv6) (''
+    inet_protocols = all
+  '')
+  +
+  (if cfg.networks!=null then
+    (''
+      mynetworks = ${toString cfg.networks}
+    '') 
+  else if (cfg.networksStyle != "") then
+    (''
+      mynetworks_style = ${cfg.networksStyle} 
+    '')
+  else
+    # Postfix default is subnet, but let's play safe
+    (''
+      mynetworks_style = host
+    '')
+  )
+  + optionalString (cfg.hostname != "") (''
+    myhostname = ${cfg.hostname}
+  '')
+  + optionalString (cfg.domain != "") (''
+    mydomain = ${cfg.domain}
+  '')
+  + optionalString (cfg.origin != "") (''
+    myorigin = ${cfg.origin}
+  '')
+  + optionalString (cfg.destination != null) (''
+    mydestination = ${toString cfg.destination}
+  '')
+  + optionalString (cfg.relayDomains != null) (''
+    relay_domains = ${toString cfg.relayDomains}
+  '')
+  + ''
+    local_recipient_maps = 
+  ''
+  + (''
+    relayhost = ${if cfg.lookupMX || cfg.relayHost == "" then 
+        cfg.relayHost 
+      else 
+        "[" + cfg.relayHost + "]"}
+  '')
+  + (''
+    alias_maps = hash:/var/postfix/conf/aliases
+
+    mail_spool_directory = /var/spool/mail/
+
+    setgid_group = ${setgidGroup}
+  '')
+  ;
+
+  aliases = 
+    (optionalString (cfg.postmasterAlias != "") (''
+      postmaster: ${cfg.postmasterAlias}
+    ''))
+    +
+    (optionalString (cfg.rootAlias != "") (''
+      root: ${cfg.rootAlias}
+    ''))
+    + cfg.extraAliases
+  ;
+
+  aliasesFile = pkgs.writeText "postfix-aliases" aliases;
+  mainCfFile = pkgs.writeText "postfix-main.cf" mainCf;
+ 
+in
+{
+  name = "postfix";
+  users = [
+    { name = user;
+      description = "Postfix mail server user";
+      uid = idList.uids.postfix;
+      group = group;
+    }
+  ];
+
+  groups = [
+    { name = group; 
+      gid = idList.gids.postfix;
+    }
+    { name = setgidGroup; 
+      gid = idList.gids.postdrop;
+    }
+  ];
+
+
+  # I copy _lots_ of shipped configuration filed 
+  # that can be left as is. I am afraid the exact
+  # will list slightly change in next Postfix 
+  # release, so listing them all one-by-one in an 
+  # accurate way is unlikely to be better.
+  job = ''
+    description "Postfix mail server job"
+
+    start on ${startingDependency}/started
+    stop on never
+
+    script 
+        if ! [ -d /var/spool/postfix ]; then
+          ${pkgs.coreutils}/bin/mkdir -p /var/spool/mail /var/postfix/conf /var/postfix/queue
+        fi
+          
+	${pkgs.coreutils}/bin/chown -R ${user}:${group} /var/postfix 
+	${pkgs.coreutils}/bin/chown -R ${user}:${setgidGroup} /var/postfix/queue 
+	${pkgs.coreutils}/bin/chmod -R ug+rwX /var/postfix/queue 
+	${pkgs.coreutils}/bin/chown -R root:root /var/spool/mail
+	${pkgs.coreutils}/bin/chmod a+rwxt /var/spool/mail
+        
+	ln -sf ${pkgs.postfix}/share/postfix/conf/* /var/postfix/conf
+
+        ln -sf ${aliasesFile} /var/postfix/conf/aliases
+        ln -sf ${mainCfFile} /var/postfix/conf/main.cf
+
+        ${pkgs.postfix}/sbin/postalias -c /var/postfix/conf /var/postfix/conf/aliases
+        
+        ${pkgs.postfix}/sbin/postfix -c /var/postfix/conf start 
+    end script
+  '';
+
+  extraEtc = [
+    { source = "/var/postfix/conf";
+      target = "postfix";
+    }
+  ];
+}
-- 
GitLab


From 2025d58c2a3359aa367862cecad28e87f65eec98 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Mon, 30 Jun 2008 21:12:02 +0000
Subject: [PATCH 0968/5331] At least dovecot and postfix work together and with
 Thunderbird

svn path=/nixos/trunk/; revision=12223
---
 system/ids.nix           |  2 +
 system/options.nix       | 57 ++++++++++++++++++++++++++
 upstart-jobs/default.nix |  6 +++
 upstart-jobs/dovecot.nix | 87 ++++++++++++++++++++++++++++++++++++++++
 upstart-jobs/postfix.nix | 23 +++++++++--
 5 files changed, 172 insertions(+), 3 deletions(-)
 create mode 100644 upstart-jobs/dovecot.nix

diff --git a/system/ids.nix b/system/ids.nix
index a704ef163ea..71f8a6d583c 100644
--- a/system/ids.nix
+++ b/system/ids.nix
@@ -16,6 +16,7 @@
     atd = 12;
     zabbix = 13;
     postfix = 14;
+    dovecot = 15;
 
     nixbld = 30000; # start of range of uids
     nobody = 65534;
@@ -33,6 +34,7 @@
     atd = 12;
     postfix = 13;
     postdrop = 14;
+    dovecot = 15;
 
     audio = 17;
 
diff --git a/system/options.nix b/system/options.nix
index e63531f577c..8279949b3cb 100644
--- a/system/options.nix
+++ b/system/options.nix
@@ -2189,6 +2189,63 @@
 	  Additional entries to put verbatim into aliases file.
 	";
       };
+
+      sslCert = mkOption {
+        default = "";
+	description = "
+	  SSL certificate to use.
+	";
+      };
+      sslCACert = mkOption {
+        default = "";
+	description = "
+	  SSL certificate of CA.
+	";
+      };
+      sslKey = mkOption {
+        default = "";
+	description ="
+	  SSL key to use.
+	";
+      };
+
+      recipientDelimiter = mkOption {
+        default = "";
+	example = "+";
+	description = "
+          Delimiter for address extension: so mail to user+test can be handled by ~user/.forward+test
+	";
+      };
+
+    };
+
+    dovecot = {
+      enable = mkOption {
+        default = false;
+	description = "Whether to enable dovecot POP3/IMAP server.";
+      };
+
+      user = mkOption {
+        default = "dovecot";
+	description = "dovecot user name";
+      };
+      group = mkOption {
+        default = "dovecot";
+	description = "dovecot group name";
+      };
+
+      sslServerCert = mkOption {
+        default = "";
+	description = "Server certificate";
+      };
+      sslCACert = mkOption {
+        default = "";
+	description = "CA certificate used by server certificate";
+      };
+      sslServerKey = mkOption {
+        default = "";
+	description = "Server key";
+      };
     };
 
   };
diff --git a/upstart-jobs/default.nix b/upstart-jobs/default.nix
index 08afd46449a..1e0df9cb64a 100644
--- a/upstart-jobs/default.nix
+++ b/upstart-jobs/default.nix
@@ -396,6 +396,12 @@ let
       inherit config pkgs;
     })
 
+  # Dovecot POP3/IMAP server.
+  ++ optional config.services.dovecot.enable
+    (import ../upstart-jobs/dovecot.nix {
+      inherit config pkgs;
+    })
+
   # Handles the reboot/halt events.
   ++ (map
     (event: makeJob (import ../upstart-jobs/halt.nix {
diff --git a/upstart-jobs/dovecot.nix b/upstart-jobs/dovecot.nix
new file mode 100644
index 00000000000..349775635c0
--- /dev/null
+++ b/upstart-jobs/dovecot.nix
@@ -0,0 +1,87 @@
+{config, pkgs}:
+let 
+  startingDependency = if config.services.gw6c.enable then "gw6c" else "network-interfaces";
+
+  cfg = config.services.dovecot;
+  idList = import ../system/ids.nix;
+
+  dovecotConf = 
+  ''
+    base_dir = /var/run/dovecot/ 
+
+    protocols = imap imaps pop3 pop3s
+  ''
+  + (if cfg.sslServerCert!="" then
+  ''
+    ssl_cert_file = ${cfg.sslServerCert}
+    ssl_key_file = ${cfg.sslServerKey}
+    ssl_ca_file = ${cfg.sslCACert}
+  '' else ''
+    ssl_disable = yes
+    disable_plaintext_auth = no
+  '')
+
+
+  + ''
+    login_user = ${cfg.user}
+    login_chroot = no
+
+    mail_location = maildir:/var/spool/mail/%u
+
+    maildir_copy_with_hardlinks = yes
+
+    auth default {
+      mechanisms = plain login 
+      userdb passwd {
+      }
+      passdb pam {
+      }
+      user = root 
+    }
+    auth_debug = yes
+    auth_verbose = yes
+
+    pop3_uidl_format = %08Xv%08Xu
+  ''
+  ;
+  confFile = pkgs.writeText "dovecot.conf" dovecotConf;
+
+  pamdFile = pkgs.writeText "dovecot.pam" ''
+    auth	include	common
+    account	include common
+  '';
+
+in
+{
+  name = "dovecot";
+  users = [{
+    name = cfg.user;
+    uid = idList.uids.dovecot;
+    description = "Dovecot user";
+    group = cfg.group;
+  }];
+  groups = [{
+    name = cfg.group;
+    gid = idList.gids.dovecot;
+  }];
+
+  job = ''
+    description "Dovecot IMAP/POP3 server"
+
+    start on ${startingDependency}/started
+    stop on never
+
+    start script
+      ${pkgs.coreutils}/bin/mkdir -p /var/run/dovecot /var/run/dovecot/login 
+      ${pkgs.coreutils}/bin/chown -R ${cfg.user}.${cfg.group} /var/run/dovecot
+    end script 
+
+    respawn ${pkgs.dovecot}/sbin/dovecot -F -c ${confFile}
+  '';
+
+  extraEtc = [{ 
+    source = pamdFile;
+    target = "pam.d/dovecot";
+  }];
+}
+
diff --git a/upstart-jobs/postfix.nix b/upstart-jobs/postfix.nix
index 9b85969692d..c4765f29c43 100644
--- a/upstart-jobs/postfix.nix
+++ b/upstart-jobs/postfix.nix
@@ -68,6 +68,23 @@ let
 
     setgid_group = ${setgidGroup}
   '')
+  + optionalString (cfg.sslCert != "") (''
+
+    smtp_tls_CAfile = ${cfg.sslCACert}
+    smtp_tls_cert_file = ${cfg.sslCert}
+    smtp_tls_key_file = ${cfg.sslKey}
+
+    smtp_use_tls = yes
+
+    smtpd_tls_CAfile = ${cfg.sslCACert}
+    smtpd_tls_cert_file = ${cfg.sslCert}
+    smtpd_tls_key_file = ${cfg.sslKey}
+
+    smtpd_use_tls = yes 
+
+    recipientDelimiter = ${cfg.recipientDelimiter}
+
+  '')
   ;
 
   aliases = 
@@ -121,10 +138,10 @@ in
           ${pkgs.coreutils}/bin/mkdir -p /var/spool/mail /var/postfix/conf /var/postfix/queue
         fi
           
-	${pkgs.coreutils}/bin/chown -R ${user}:${group} /var/postfix 
-	${pkgs.coreutils}/bin/chown -R ${user}:${setgidGroup} /var/postfix/queue 
+	${pkgs.coreutils}/bin/chown -R ${user}.${group} /var/postfix 
+	${pkgs.coreutils}/bin/chown -R ${user}.${setgidGroup} /var/postfix/queue 
 	${pkgs.coreutils}/bin/chmod -R ug+rwX /var/postfix/queue 
-	${pkgs.coreutils}/bin/chown -R root:root /var/spool/mail
+	${pkgs.coreutils}/bin/chown -R root.root /var/spool/mail
 	${pkgs.coreutils}/bin/chmod a+rwxt /var/spool/mail
         
 	ln -sf ${pkgs.postfix}/share/postfix/conf/* /var/postfix/conf
-- 
GitLab


From fc877a99a7523707aa6ef0465f3834d6e1a83526 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Mon, 30 Jun 2008 21:34:41 +0000
Subject: [PATCH 0969/5331] Silly mistake fixed - chowned maildirs on start

svn path=/nixos/trunk/; revision=12225
---
 upstart-jobs/postfix.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/upstart-jobs/postfix.nix b/upstart-jobs/postfix.nix
index c4765f29c43..ebc6f79c85a 100644
--- a/upstart-jobs/postfix.nix
+++ b/upstart-jobs/postfix.nix
@@ -141,7 +141,7 @@ in
 	${pkgs.coreutils}/bin/chown -R ${user}.${group} /var/postfix 
 	${pkgs.coreutils}/bin/chown -R ${user}.${setgidGroup} /var/postfix/queue 
 	${pkgs.coreutils}/bin/chmod -R ug+rwX /var/postfix/queue 
-	${pkgs.coreutils}/bin/chown -R root.root /var/spool/mail
+	${pkgs.coreutils}/bin/chown root.root /var/spool/mail
 	${pkgs.coreutils}/bin/chmod a+rwxt /var/spool/mail
         
 	ln -sf ${pkgs.postfix}/share/postfix/conf/* /var/postfix/conf
-- 
GitLab


From eaf6b8eb18b3b29f424e000c22bf6cc6dc6d00d4 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 1 Jul 2008 08:28:56 +0000
Subject: [PATCH 0970/5331] * udevtrigger / udevsettle -> udevadm.

svn path=/nixos/trunk/; revision=12229
---
 boot/boot-stage-1-init.sh | 6 +++---
 system/system.nix         | 2 +-
 upstart-jobs/udev.nix     | 6 +++---
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/boot/boot-stage-1-init.sh b/boot/boot-stage-1-init.sh
index 8ed3887cc35..95ae1e34d7a 100644
--- a/boot/boot-stage-1-init.sh
+++ b/boot/boot-stage-1-init.sh
@@ -83,8 +83,8 @@ mknod -m 0666 /dev/null c 1 3
 export UDEV_CONFIG_FILE=/udev.conf
 echo 'udev_rules="/no-rules"' > $UDEV_CONFIG_FILE
 udevd --daemon
-udevtrigger
-udevsettle
+udevadm trigger
+udevadm settle
 
 if type -p dmsetup > /dev/null; then
   echo "dmsetup found, starting device mapper and lvm"
@@ -116,7 +116,7 @@ mountFS() {
     fi
 
     if test -n "$mustCheck"; then
-        FSTAB_FILE="/etc/mtab" fsck -C -a "$device"
+        FSTAB_FILE="/etc/mtab" fsck -V -v -C -a "$device"
         fsckResult=$?
 
         if test $(($fsckResult | 2)) = $fsckResult; then
diff --git a/system/system.nix b/system/system.nix
index a2001ebf390..74bbf5d2b0e 100644
--- a/system/system.nix
+++ b/system/system.nix
@@ -86,7 +86,7 @@ rec {
       fi
       cp $utillinux/bin/mount $utillinux/bin/umount $utillinux/sbin/pivot_root $out/bin
       cp -p $e2fsprogs/sbin/fsck* $e2fsprogs/sbin/e2fsck $out/bin
-      cp $udev/sbin/udevd $udev/sbin/udevtrigger $udev/sbin/udevsettle $out/bin
+      cp $udev/sbin/udevd $udev/sbin/udevadm $out/bin
       nuke-refs $out/bin/*
     ''; # */
   
diff --git a/upstart-jobs/udev.nix b/upstart-jobs/udev.nix
index 13ac6fd3a13..c4dce484fd5 100644
--- a/upstart-jobs/udev.nix
+++ b/upstart-jobs/udev.nix
@@ -70,13 +70,13 @@ in
 	# been loaded into the kernel (or for which support is built into
 	# the kernel).
 	if ! test -e ${devicesCreated}; then
-	    ${udev}/sbin/udevtrigger
-	    ${udev}/sbin/udevsettle # wait for udev to finish
+	    ${udev}/sbin/udevadm trigger
+	    ${udev}/sbin/udevadm settle # wait for udev to finish
 	    touch ${devicesCreated}
 	fi
 
 	# Kill udev, let Upstart restart and monitor it.  (This is nasty,
-	# but we have to run udevtrigger first.  Maybe we can use
+	# but we have to run `udevadm trigger' first.  Maybe we can use
 	# Upstart's `binary' keyword, but it isn't implemented yet.)
 	if ! ${procps}/bin/pkill -u root "^udevd$"; then
 	    echo "couldn't stop udevd"
-- 
GitLab


From 700fa49f93f56a34c15d7fe27c9a819ffd9be560 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Tue, 1 Jul 2008 10:50:38 +0000
Subject: [PATCH 0971/5331] Separate dovecot log

svn path=/nixos/trunk/; revision=12232
---
 upstart-jobs/dovecot.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/upstart-jobs/dovecot.nix b/upstart-jobs/dovecot.nix
index 349775635c0..dca75dab1a5 100644
--- a/upstart-jobs/dovecot.nix
+++ b/upstart-jobs/dovecot.nix
@@ -42,6 +42,8 @@ let
     auth_verbose = yes
 
     pop3_uidl_format = %08Xv%08Xu
+
+    log_path = /var/log/dovecot.log
   ''
   ;
   confFile = pkgs.writeText "dovecot.conf" dovecotConf;
-- 
GitLab


From 7699aaad79f00fbfbaac690797e6d2eba581bfa9 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Tue, 1 Jul 2008 12:15:56 +0000
Subject: [PATCH 0972/5331] Added BIND

svn path=/nixos/trunk/; revision=12233
---
 system/options.nix       | 36 +++++++++++++++++++++++
 upstart-jobs/bind.nix    | 63 ++++++++++++++++++++++++++++++++++++++++
 upstart-jobs/default.nix |  6 ++++
 3 files changed, 105 insertions(+)
 create mode 100644 upstart-jobs/bind.nix

diff --git a/system/options.nix b/system/options.nix
index 8279949b3cb..1a9ac26e434 100644
--- a/system/options.nix
+++ b/system/options.nix
@@ -2248,6 +2248,42 @@
       };
     };
 
+    bind = {
+      enable = mkOption {
+        default = false;
+	description = "
+	  Whether to enable BIND domain name server.
+	";
+      };
+      cacheNetworks = mkOption {
+        default = ["127.0.0.0/24"];
+	description = "
+	  What networks are allowed to use us as a resolver.
+	";
+      };
+      blockedNetworks = mkOption {
+        default = [];
+	description = "
+	  What networks are just blocked.
+	";
+      };
+      zones = mkOption {
+        default = [];
+	description = "
+	  List of zones we claim authority over.
+	    master=false means slave server; slaves means addresses 
+	   who may request zone transfer.
+	";
+	example = [{
+	  name = "example.com";
+	  master = false;
+	  file = "/var/dns/example.com";
+	  masters = ["192.168.0.1"];
+	  slaves = [];
+	}];
+      };
+    };
+
   };
 
   installer = {
diff --git a/upstart-jobs/bind.nix b/upstart-jobs/bind.nix
new file mode 100644
index 00000000000..f1d0e6b0cf6
--- /dev/null
+++ b/upstart-jobs/bind.nix
@@ -0,0 +1,63 @@
+{config, pkgs}: 
+let
+  startingDependency = if config.services.gw6c.enable then "gw6c" else "network-interfaces";
+  cfg = config.services.bind;
+  concatMapStrings = pkgs.lib.concatMapStrings;
+
+  namedConf = 
+  (''
+    acl cachenetworks { ${concatMapStrings (entry: " ${entry}; ") cfg.cacheNetworks} };
+    acl badnetworks { ${concatMapStrings (entry: " ${entry}; ") cfg.blockedNetworks} };
+
+    options {
+      allow-query { cachenetworks; };
+      blackhole { badnetworks; };
+      forward first;
+      forwarders { ${concatMapStrings (entry: " ${entry}; ") config.networking.nameservers} };
+      directory "/var/run/named";
+      pid-file "/var/run/named/named.pid";
+    };
+
+  '')
+  + 
+  (concatMapStrings 
+    (_entry:let entry={master=true;slaves=[];masters=[];}//_entry; in
+      ''
+        zone "${entry.name}" {
+	  type ${if entry.master then "master" else "slave"};
+	  file "${entry.file}";
+	  ${ if entry.master then
+	     ''
+	       allow-transfer {
+	         ${concatMapStrings (ip: ip+";\n") entry.slaves}
+	       };
+	     ''
+	     else
+	     ''
+	       masters {
+	         ${concatMapStrings (ip: ip+";\n") entry.masters}
+	       };
+	     ''
+	  }
+	};
+      ''
+    )
+    cfg.zones
+  )
+  ;
+
+  confFile = pkgs.writeText "named.conf" namedConf;
+
+in
+{
+  name = "bind";
+  job = ''
+    description "BIND name server job"
+
+    start script
+      ${pkgs.coreutils}/bin/mkdir -p /var/run/named
+    end script
+
+    respawn ${pkgs.bind}/sbin/named -c ${confFile} -f 
+  '';
+} 
diff --git a/upstart-jobs/default.nix b/upstart-jobs/default.nix
index 1e0df9cb64a..e603f5ec953 100644
--- a/upstart-jobs/default.nix
+++ b/upstart-jobs/default.nix
@@ -402,6 +402,12 @@ let
       inherit config pkgs;
     })
 
+  # ISC BIND domain name server.
+  ++ optional config.services.bind.enable
+    (import ../upstart-jobs/bind.nix {
+      inherit config pkgs;
+    })
+
   # Handles the reboot/halt events.
   ++ (map
     (event: makeJob (import ../upstart-jobs/halt.nix {
-- 
GitLab


From 4d0645acb11d0e4ea930a0faa9a81cdfef117ac7 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Tue, 1 Jul 2008 12:31:47 +0000
Subject: [PATCH 0973/5331] Fixed authoritative zone ACL, enabled IPv6

svn path=/nixos/trunk/; revision=12234
---
 upstart-jobs/bind.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/upstart-jobs/bind.nix b/upstart-jobs/bind.nix
index f1d0e6b0cf6..bea47a14a9f 100644
--- a/upstart-jobs/bind.nix
+++ b/upstart-jobs/bind.nix
@@ -10,6 +10,8 @@ let
     acl badnetworks { ${concatMapStrings (entry: " ${entry}; ") cfg.blockedNetworks} };
 
     options {
+      listen-on {any;};
+      listen-on-v6 {any;};
       allow-query { cachenetworks; };
       blackhole { badnetworks; };
       forward first;
@@ -39,6 +41,7 @@ let
 	       };
 	     ''
 	  }
+	  allow-query { any; };
 	};
       ''
     )
-- 
GitLab


From ed1029092bfde7d90033cef3fd71e1fcf702c6f7 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 2 Jul 2008 18:02:24 +0000
Subject: [PATCH 0974/5331] * Udev jobs can now declare a passthru attribute
 which is   useful for testing the building of specific parts of   a service,
 e.g. you can do

    $ nix-build /etc/nixos/nixos/ -A upstartJobs.udev.passthru.udevRules

  to build the udev rules directory of the udev service.

svn path=/nixos/trunk/; revision=12243
---
 upstart-jobs/make-job.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/upstart-jobs/make-job.nix b/upstart-jobs/make-job.nix
index 5523ad5af93..df56b5dee29 100644
--- a/upstart-jobs/make-job.nix
+++ b/upstart-jobs/make-job.nix
@@ -33,4 +33,6 @@
   
   # Allow jobs to declare groups that should be created.
   groups = if job ? groups then job.groups else [];
+
+  passthru = if job ? passthru then job.passthru else {};
 }
-- 
GitLab


From 1c0aa0fb75a45d4d0da76f86971ce1c83bc82654 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 2 Jul 2008 18:03:43 +0000
Subject: [PATCH 0975/5331] * Create some groups ("disk", "kmem", "tty", ...)
 that the default   udev rules expect.

svn path=/nixos/trunk/; revision=12244
---
 system/ids.nix          |  7 ++++++-
 system/users-groups.nix | 18 ++++++++++++++++++
 2 files changed, 24 insertions(+), 1 deletion(-)

diff --git a/system/ids.nix b/system/ids.nix
index 71f8a6d583c..312fd94e351 100644
--- a/system/ids.nix
+++ b/system/ids.nix
@@ -25,7 +25,10 @@
   gids = {
     root = 0;
     wheel = 1;
+    kmem = 2;
+    tty = 3;
     haldaemon = 5;
+    disk = 6;
     vsftpd = 7;
     ftp = 8;
     bitlbee = 9;
@@ -35,8 +38,10 @@
     postfix = 13;
     postdrop = 14;
     dovecot = 15;
-
     audio = 17;
+    floppy = 18;
+    uucp = 19;
+    lp = 20;
 
     users = 100;
     nixbld = 30000;
diff --git a/system/users-groups.nix b/system/users-groups.nix
index 19a8ff9c972..7aeeddaa3a1 100644
--- a/system/users-groups.nix
+++ b/system/users-groups.nix
@@ -62,6 +62,24 @@ rec {
           { name = "wheel";
             gid = ids.gids.wheel;
           }
+          { name = "disk";
+            gid = ids.gids.disk;
+          }
+          { name = "kmem";
+            gid = ids.gids.kmem;
+          }
+          { name = "tty";
+            gid = ids.gids.tty;
+          }
+          { name = "floppy";
+            gid = ids.gids.floppy;
+          }
+          { name = "uucp";
+            gid = ids.gids.uucp;
+          }
+          { name = "lp";
+            gid = ids.gids.lp;
+          }
           { name = "nogroup";
             gid = ids.gids.nogroup;
           }
-- 
GitLab


From 938c76d5c0672f68de0b1deacadf01024bf9dc8a Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 2 Jul 2008 18:04:15 +0000
Subject: [PATCH 0976/5331] * Fix doing repeated tests.

svn path=/nixos/trunk/; revision=12245
---
 test/test-upstart-job.sh | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/test/test-upstart-job.sh b/test/test-upstart-job.sh
index 626aed806ae..39d60d76178 100755
--- a/test/test-upstart-job.sh
+++ b/test/test-upstart-job.sh
@@ -2,9 +2,11 @@
 
 tmpDir=/tmp/event.d
 
-rm -rf $tmpDir
+mkdir -p /tmp/event.d
 
-cp -prd $(readlink -f /etc/event.d) /tmp/event.d
+if test "$(readlink -f /etc/event.d)" != /tmp/event.d; then 
+    cp -prd "$(readlink -f /etc/event.d)"/* /tmp/event.d/
+fi
 
 for i in $*; do
     echo "building job $i..."
-- 
GitLab


From 49b9662e314f7ad3496e300872e98fe5c340ff3d Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 2 Jul 2008 18:06:34 +0000
Subject: [PATCH 0977/5331] * Use most of the default rules from the udev
 distribution   rather than supplying our own (less maintenance...).   This
 takes care, among other things, of populating   /dev/disk, which is useful.

svn path=/nixos/trunk/; revision=12246
---
 upstart-jobs/udev-rules/50-udev.rules | 48 ------------------------
 upstart-jobs/udev.nix                 | 53 ++++++++++++++++++++-------
 upstart-jobs/xserver.conf             |  1 +
 upstart-jobs/xserver.nix              |  1 +
 4 files changed, 41 insertions(+), 62 deletions(-)
 delete mode 100644 upstart-jobs/udev-rules/50-udev.rules

diff --git a/upstart-jobs/udev-rules/50-udev.rules b/upstart-jobs/udev-rules/50-udev.rules
deleted file mode 100644
index f6ac572cedb..00000000000
--- a/upstart-jobs/udev-rules/50-udev.rules
+++ /dev/null
@@ -1,48 +0,0 @@
-# Miscellaneous devices.
-KERNEL=="mem|kmem",             MODE="0600"
-KERNEL=="port",                 MODE="0600"
-KERNEL=="nvram",                MODE="0600"
-KERNEL=="null",                 MODE="0666"
-KERNEL=="zero",                 MODE="0666"
-KERNEL=="full",                 MODE="0622"
-KERNEL=="random",               MODE="0666"
-KERNEL=="urandom",              MODE="0644"
-KERNEL=="rtc",                  MODE="0600"
-KERNEL=="sonypi",               MODE="0666"
-KERNEL=="agpgart",              MODE="0600"
-KERNEL=="kvm",                  MODE="0666"
-KERNEL=="fuse",                 MODE="0666"
-KERNEL=="tun",  NAME="net/%k",  MODE="0666" 
-
-
-# TTYs.
-KERNEL=="tty",                  NAME="%k", MODE="666", OPTIONS="last_rule" # GROUP="tty"
-KERNEL=="ptmx",                 NAME="%k", MODE="666" # GROUP="tty"
-
-
-# Input devices go under /dev/input.
-KERNEL=="mouse*|mice",          NAME="input/%k", MODE="0640"
-KERNEL=="event*",               NAME="input/%k", MODE="0640"
-KERNEL=="js*",                  NAME="input/%k", MODE="0644"
-KERNEL=="ts*",                  NAME="input/%k", MODE="0600"
-KERNEL=="uinput",               NAME="input/%k", MODE="0600"
-
-
-# Create a symlink for the CD-ROM device.
-KERNEL=="hd[a-z]", BUS=="ide", SYSFS{removable}=="1", SYSFS{device/media}=="cdrom", SYMLINK+="cdrom cdrom-%k"
-KERNEL=="sr[0-9]", BUS=="scsi", SYMLINK+="cdrom cdrom-%k"
-
-
-# ALSA sound devices.
-KERNEL=="controlC[0-9]*",       NAME="snd/%k", MODE="@sndMode@"
-KERNEL=="hwC[D0-9]*",           NAME="snd/%k", MODE="@sndMode@"
-KERNEL=="pcmC[D0-9cp]*",        NAME="snd/%k", MODE="@sndMode@"
-KERNEL=="midiC[D0-9]*",         NAME="snd/%k", MODE="@sndMode@"
-KERNEL=="timer",                NAME="snd/%k", MODE="@sndMode@"
-KERNEL=="seq",                  NAME="snd/%k", MODE="@sndMode@"
-
-KERNEL=="kqemu",		NAME="%k", MODE="0666"
-
-
-# Firmware loading.
-SUBSYSTEM=="firmware", ACTION=="add", RUN+="@firmwareLoader@"
diff --git a/upstart-jobs/udev.nix b/upstart-jobs/udev.nix
index c4dce484fd5..9c8e6f9b3fb 100644
--- a/upstart-jobs/udev.nix
+++ b/upstart-jobs/udev.nix
@@ -5,30 +5,54 @@
 
 let
 
+  firmwareLoader = substituteAll {
+    src = ./udev-firmware-loader.sh;
+    path = "${stdenv.coreutils}/bin";
+    isExecutable = true;
+    inherit firmwareDirs;
+  };
+    
+  nixRules = writeText "10-nix.rules" ''
+  
+    # Miscellaneous devices.
+    KERNEL=="sonypi",               MODE="0666"
+    KERNEL=="kvm",                  MODE="0666"
+    KERNEL=="kqemu",		    NAME="%k", MODE="0666"
+
+    # Create a symlink for the CD-ROM device.
+    #KERNEL=="hd[a-z]", BUS=="ide", SYSFS{removable}=="1", SYSFS{device/media}=="cdrom", SYMLINK+="cdrom cdrom-%k"
+    #KERNEL=="sr[0-9]", BUS=="scsi", SYMLINK+="cdrom cdrom-%k"
+
+    # ALSA sound devices.
+    KERNEL=="controlC[0-9]*",       NAME="snd/%k", MODE="${sndMode}"
+    KERNEL=="hwC[D0-9]*",           NAME="snd/%k", MODE="${sndMode}"
+    KERNEL=="pcmC[D0-9cp]*",        NAME="snd/%k", MODE="${sndMode}"
+    KERNEL=="midiC[D0-9]*",         NAME="snd/%k", MODE="${sndMode}"
+    KERNEL=="timer",                NAME="snd/%k", MODE="${sndMode}"
+    KERNEL=="seq",                  NAME="snd/%k", MODE="${sndMode}"
+
+    # Firmware loading.
+    SUBSYSTEM=="firmware",          ACTION=="add", RUN+="${firmwareLoader}"
+    
+  '';
+  
   # Perform substitutions in all udev rules files.
   udevRules = stdenv.mkDerivation {
     name = "udev-rules";
-    src = cleanSource ./udev-rules;
-    firmwareLoader = substituteAll {
-      src = ./udev-firmware-loader.sh;
-      path = "${stdenv.coreutils}/bin";
-      isExecutable = true;
-      inherit firmwareDirs;
-    };
-    inherit sndMode;
-    buildCommand = "
-      buildCommand= # urgh
+    #src = cleanSource ./udev-rules;
+    buildCommand = ''
       ensureDir $out
-      for i in $src/*; do
-        substituteAll $i $out/$(basename $i)
-      done
+      ln -s ${nixRules} $out/${nixRules.name}
       shopt -s nullglob
+      cp ${udev}/etc/udev/rules.d/50-udev-default.rules $out/
+      cp ${udev}/etc/udev/rules.d/60-persistent-storage.rules $out/
+      cp ${udev}/etc/udev/rules.d/95-udev-late.rules $out/
       for i in ${toString extraUdevPkgs}; do
         for j in $i/etc/udev/rules.d/*; do
           ln -s $j $out/$(basename $j)
         done
       done
-    ";
+    ''; # */
   };
 
   # The udev configuration file
@@ -92,4 +116,5 @@ in
     respawn ${udev}/sbin/udevd
   '';
 
+  passthru = {inherit udevRules;};
 }
diff --git a/upstart-jobs/xserver.conf b/upstart-jobs/xserver.conf
index 98f98f481f9..a1f6f3552d9 100644
--- a/upstart-jobs/xserver.conf
+++ b/upstart-jobs/xserver.conf
@@ -16,6 +16,7 @@ Section "Module"
   Load "bitmap"
   Load "int10"
   Load "vbe"
+  Load "v4l"
   @moduleSection@
   @extraModules@
 EndSection
diff --git a/upstart-jobs/xserver.nix b/upstart-jobs/xserver.nix
index 2d81d25c225..c18d4f9690c 100644
--- a/upstart-jobs/xserver.nix
+++ b/upstart-jobs/xserver.nix
@@ -41,6 +41,7 @@ let
       xorg.xorgserver
       xorg.xf86inputkeyboard
       xorg.xf86inputmouse
+      xorg.xf86videov4l
     ] 
     ++ optional (videoDriver == "vesa") xorg.xf86videovesa
     ++ optional (videoDriver == "vga") xorg.xf86videovga
-- 
GitLab


From 96cfd4105e8c5ab7d205548baa0216715c0202c2 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 2 Jul 2008 21:16:29 +0000
Subject: [PATCH 0978/5331] * Revert accidental commit.

svn path=/nixos/trunk/; revision=12247
---
 upstart-jobs/xserver.conf | 1 -
 upstart-jobs/xserver.nix  | 1 -
 2 files changed, 2 deletions(-)

diff --git a/upstart-jobs/xserver.conf b/upstart-jobs/xserver.conf
index a1f6f3552d9..98f98f481f9 100644
--- a/upstart-jobs/xserver.conf
+++ b/upstart-jobs/xserver.conf
@@ -16,7 +16,6 @@ Section "Module"
   Load "bitmap"
   Load "int10"
   Load "vbe"
-  Load "v4l"
   @moduleSection@
   @extraModules@
 EndSection
diff --git a/upstart-jobs/xserver.nix b/upstart-jobs/xserver.nix
index c18d4f9690c..2d81d25c225 100644
--- a/upstart-jobs/xserver.nix
+++ b/upstart-jobs/xserver.nix
@@ -41,7 +41,6 @@ let
       xorg.xorgserver
       xorg.xf86inputkeyboard
       xorg.xf86inputmouse
-      xorg.xf86videov4l
     ] 
     ++ optional (videoDriver == "vesa") xorg.xf86videovesa
     ++ optional (videoDriver == "vga") xorg.xf86videovga
-- 
GitLab


From 5f60393ffe1d7406bc2754c4469b50b96e08b496 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 2 Jul 2008 21:19:04 +0000
Subject: [PATCH 0979/5331] * Let udev call modprobe to load modules for all
 known hardware.  This   makes the `hardware-scan' job unnecessary.  (In fact
 the new   approach appears to be more thorough; it loads some drivers that  
 were not previously loaded.)

svn path=/nixos/trunk/; revision=12248
---
 upstart-jobs/alsa.nix               |  37 ++++---
 upstart-jobs/default.nix            |   8 +-
 upstart-jobs/hardware-scan.nix      |  28 ------
 upstart-jobs/network-interfaces.nix | 145 ++++++++++++++--------------
 upstart-jobs/tty-backgrounds.nix    |   2 +-
 upstart-jobs/udev.nix               |   8 +-
 6 files changed, 96 insertions(+), 132 deletions(-)
 delete mode 100644 upstart-jobs/hardware-scan.nix

diff --git a/upstart-jobs/alsa.nix b/upstart-jobs/alsa.nix
index 319918117da..df6f632973c 100644
--- a/upstart-jobs/alsa.nix
+++ b/upstart-jobs/alsa.nix
@@ -19,33 +19,32 @@ in
     }
   ];
 
-  job = "
-start on hardware-scan
-stop on shutdown
+  job = ''
+    start on udev
+    stop on shutdown
 
-start script
+    start script
 
-    mkdir -m 0755 -p $(dirname ${soundState})
+        mkdir -m 0755 -p $(dirname ${soundState})
 
-    # Load some additional modules.
-    for mod in snd_pcm_oss; do
-        ${modprobe}/sbin/modprobe $mod || true
-    done
+        # Load some additional modules.
+        for mod in snd_pcm_oss; do
+            ${modprobe}/sbin/modprobe $mod || true
+        done
 
-    # Restore the sound state.
-    ${alsaUtils}/sbin/alsactl -f ${soundState} restore
+        # Restore the sound state.
+        ${alsaUtils}/sbin/alsactl -f ${soundState} restore
 
-end script
+    end script
 
-respawn sleep 1000000 # !!! hack
+    respawn sleep 1000000 # !!! hack
 
-stop script
+    stop script
 
-    # Save the sound state.
-    ${alsaUtils}/sbin/alsactl -f ${soundState} store
+        # Save the sound state.
+        ${alsaUtils}/sbin/alsactl -f ${soundState} store
 
-end script
-
-  ";
+    end script
+  '';
 
 }
diff --git a/upstart-jobs/default.nix b/upstart-jobs/default.nix
index e603f5ec953..a3e988eab76 100644
--- a/upstart-jobs/default.nix
+++ b/upstart-jobs/default.nix
@@ -88,6 +88,7 @@ let
     # The udev daemon creates devices nodes and runs programs when
     # hardware events occur.
     (import ../upstart-jobs/udev.nix {
+      inherit modprobe;
       inherit (pkgs) stdenv writeText substituteAll udev procps;
       inherit (pkgs.lib) cleanSource;
       firmwareDirs =
@@ -115,13 +116,6 @@ let
       inherit (pkgs) mdadm;
     })
       
-    # Hardware scan; loads modules for PCI devices.
-    (import ../upstart-jobs/hardware-scan.nix {
-      inherit modprobe;
-      doHardwareScan = config.boot.hardwareScan;
-      kernelModules = config.boot.kernelModules;
-    })
-      
     # Mount file systems.
     (import ../upstart-jobs/filesystems.nix {
       inherit (pkgs) utillinux e2fsprogs;
diff --git a/upstart-jobs/hardware-scan.nix b/upstart-jobs/hardware-scan.nix
deleted file mode 100644
index f5f45b0787b..00000000000
--- a/upstart-jobs/hardware-scan.nix
+++ /dev/null
@@ -1,28 +0,0 @@
-{modprobe, doHardwareScan, kernelModules}:
-
-{
-  name = "hardware-scan";
-  
-  job = ''
-    start on udev
-
-    script
-        for i in ${toString kernelModules}; do
-            echo "Loading kernel module $i..."
-            ${modprobe}/sbin/modprobe $i || true
-        done
-
-        if test -n "${toString doHardwareScan}" -a ! -e /var/run/safemode; then
-
-            # Try to load modules for all PCI and USB devices.
-            for i in /sys/bus/pci/devices/*/modalias /sys/bus/usb/devices/*/modalias; do
-                echo "Trying to load a module for $(basename $(dirname $i))..."
-                ${modprobe}/sbin/modprobe $(cat $i) || true
-                echo ""
-            done
-
-        fi
-    end script
-  '';
-
-}
diff --git a/upstart-jobs/network-interfaces.nix b/upstart-jobs/network-interfaces.nix
index 610ff550536..61469fffbd6 100644
--- a/upstart-jobs/network-interfaces.nix
+++ b/upstart-jobs/network-interfaces.nix
@@ -16,86 +16,85 @@ in
 {
   name = "network-interfaces";
   
-  job = "
-start on hardware-scan
-stop on shutdown
-
-start script
-    export PATH=${modprobe}/sbin:$PATH
-    modprobe af_packet || true
-
-    for i in $(cd /sys/class/net && ls -d *); do
-        echo \"Bringing up network device $i...\"
-        ${nettools}/sbin/ifconfig $i up || true
-    done
-
-    # Configure the manually specified interfaces.
-    names=(${toString names})
-    ipAddresses=(${toString ipAddresses})
-    subnetMasks=(${toString subnetMasks})
-    essids=(${toString essids})
-    wepKeys=(${toString wepKeys})
-
-    for ((n = 0; n < \${#names[*]}; n++)); do
-        name=\${names[$n]}
-        ipAddress=\${ipAddresses[$n]}
-        subnetMask=\${subnetMasks[$n]}
-        essid=\${essids[$n]}
-        wepKey=\${wepKeys[$n]}
-
-        # Set wireless networking stuff.
-        if test \"$essid\" != default; then
-            ${wirelesstools}/sbin/iwconfig \"$name\" essid \"$essid\" || true
-        fi
-        
-        if test \"$wepKey\" != nokey; then
-            ${wirelesstools}/sbin/iwconfig \"$name\" key \"$(cat \"$wepKey\")\" || true
-        fi
-        
-        # Set IP address / netmask.        
-        if test \"$ipAddress\" != dhcp; then
-            echo \"Configuring interface $name...\"
-	    extraFlags=
-            if test \"$subnetMask\" != default; then
-	        extraFlags=\"$extraFlags netmask $subnetMask\"
+  job = ''
+    start on udev
+    stop on shutdown
+
+    start script
+        export PATH=${modprobe}/sbin:$PATH
+        modprobe af_packet || true
+
+        for i in $(cd /sys/class/net && ls -d *); do
+            echo "Bringing up network device $i..."
+            ${nettools}/sbin/ifconfig $i up || true
+        done
+
+        # Configure the manually specified interfaces.
+        names=(${toString names})
+        ipAddresses=(${toString ipAddresses})
+        subnetMasks=(${toString subnetMasks})
+        essids=(${toString essids})
+        wepKeys=(${toString wepKeys})
+
+        for ((n = 0; n < ''${#names[*]}; n++)); do
+            name=''${names[$n]}
+            ipAddress=''${ipAddresses[$n]}
+            subnetMask=''${subnetMasks[$n]}
+            essid=''${essids[$n]}
+            wepKey=''${wepKeys[$n]}
+
+            # Set wireless networking stuff.
+            if test "$essid" != default; then
+                ${wirelesstools}/sbin/iwconfig "$name" essid "$essid" || true
             fi
-            ${nettools}/sbin/ifconfig \"$name\" \"$ipAddress\" $extraFlags || true
-        fi
-        
-    done
-
-    # Set the nameservers.
-    if test -n \"${toString cfg.nameservers}\"; then
-        rm -f /etc/resolv.conf
-        if test -n \"${cfg.domain}\"; then
-	    echo \"domain ${cfg.domain}\" >> /etc/resolv.conf
-        fi
-        for i in ${toString cfg.nameservers}; do
-            echo \"nameserver $i\" >> /etc/resolv.conf
+
+            if test "$wepKey" != nokey; then
+                ${wirelesstools}/sbin/iwconfig "$name" key "$(cat "$wepKey")" || true
+            fi
+
+            # Set IP address / netmask.        
+            if test "$ipAddress" != dhcp; then
+                echo "Configuring interface $name..."
+                extraFlags=
+                if test "$subnetMask" != default; then
+                    extraFlags="$extraFlags netmask $subnetMask"
+                fi
+                ${nettools}/sbin/ifconfig "$name" "$ipAddress" $extraFlags || true
+            fi
+
         done
-    fi
 
-    # Set the default gateway.
-    if test -n \"${cfg.defaultGateway}\"; then
-        ${nettools}/sbin/route add default gw \"${cfg.defaultGateway}\" || true
-    fi
+        # Set the nameservers.
+        if test -n "${toString cfg.nameservers}"; then
+            rm -f /etc/resolv.conf
+            if test -n "${cfg.domain}"; then
+                echo "domain ${cfg.domain}" >> /etc/resolv.conf
+            fi
+            for i in ${toString cfg.nameservers}; do
+                echo "nameserver $i" >> /etc/resolv.conf
+            done
+        fi
 
-    # Run any user-specified commands.
-    ${bash}/bin/sh ${writeText "local-net-cmds" cfg.localCommands} || true
+        # Set the default gateway.
+        if test -n "${cfg.defaultGateway}"; then
+            ${nettools}/sbin/route add default gw "${cfg.defaultGateway}" || true
+        fi
 
-end script
+        # Run any user-specified commands.
+        ${bash}/bin/sh ${writeText "local-net-cmds" cfg.localCommands} || true
 
-# Hack: Upstart doesn't yet support what we want: a service that
-# doesn't have a running process associated with it.
-respawn sleep 100000
+    end script
 
-stop script
-    for i in $(cd /sys/class/net && ls -d *); do
-        echo \"Taking down network device $i...\"
-        ${nettools}/sbin/ifconfig $i down || true
-    done
-end script
+    # Hack: Upstart doesn't yet support what we want: a service that
+    # doesn't have a running process associated with it.
+    respawn sleep 100000
 
-  ";
+    stop script
+        for i in $(cd /sys/class/net && ls -d *); do
+            echo "Taking down network device $i..."
+            ${nettools}/sbin/ifconfig $i down || true
+        done
+    end script
+  '';
   
 }
diff --git a/upstart-jobs/tty-backgrounds.nix b/upstart-jobs/tty-backgrounds.nix
index d83291d7a05..a567e21ed31 100644
--- a/upstart-jobs/tty-backgrounds.nix
+++ b/upstart-jobs/tty-backgrounds.nix
@@ -22,7 +22,7 @@ rec {
   ];
 
   job = ''
-    start on hardware-scan
+    start on udev
 
     start script
 
diff --git a/upstart-jobs/udev.nix b/upstart-jobs/udev.nix
index 9c8e6f9b3fb..5d8e8269cea 100644
--- a/upstart-jobs/udev.nix
+++ b/upstart-jobs/udev.nix
@@ -1,4 +1,4 @@
-{ stdenv, writeText, substituteAll, cleanSource, udev, procps, firmwareDirs
+{ stdenv, writeText, substituteAll, cleanSource, udev, procps, firmwareDirs, modprobe
 , extraUdevPkgs ? []
 , sndMode ? "0600"
 }:
@@ -44,9 +44,9 @@ let
       ensureDir $out
       ln -s ${nixRules} $out/${nixRules.name}
       shopt -s nullglob
-      cp ${udev}/etc/udev/rules.d/50-udev-default.rules $out/
-      cp ${udev}/etc/udev/rules.d/60-persistent-storage.rules $out/
-      cp ${udev}/etc/udev/rules.d/95-udev-late.rules $out/
+      cp ${udev}/etc/udev/rules.d/*.rules $out/
+      substituteInPlace $out/80-drivers.rules \
+        --replace /sbin/modprobe ${modprobe}/sbin/modprobe
       for i in ${toString extraUdevPkgs}; do
         for j in $i/etc/udev/rules.d/*; do
           ln -s $j $out/$(basename $j)
-- 
GitLab


From 6ed65c2d95420705163c152b4dcb7a9057463b87 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 3 Jul 2008 10:45:14 +0000
Subject: [PATCH 0980/5331] * Removing hardware-scan.nix also removed the
 loading of the   kernel modules listed in config.boot.kernelModules.  So do  
 that in the udev job for lack of a better place.

svn path=/nixos/trunk/; revision=12249
---
 upstart-jobs/default.nix |  3 +--
 upstart-jobs/udev.nix    | 23 ++++++++++++++++-------
 2 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/upstart-jobs/default.nix b/upstart-jobs/default.nix
index a3e988eab76..147dded26b1 100644
--- a/upstart-jobs/default.nix
+++ b/upstart-jobs/default.nix
@@ -88,7 +88,7 @@ let
     # The udev daemon creates devices nodes and runs programs when
     # hardware events occur.
     (import ../upstart-jobs/udev.nix {
-      inherit modprobe;
+      inherit modprobe config;
       inherit (pkgs) stdenv writeText substituteAll udev procps;
       inherit (pkgs.lib) cleanSource;
       firmwareDirs =
@@ -101,7 +101,6 @@ let
       extraUdevPkgs =
            pkgs.lib.optional config.services.hal.enable pkgs.hal
         ++ pkgs.lib.optional config.hardware.enableGo7007 kernelPackages.wis_go7007;
-      sndMode = config.services.udev.sndMode;
     })
       
     # Makes LVM logical volumes available. 
diff --git a/upstart-jobs/udev.nix b/upstart-jobs/udev.nix
index 5d8e8269cea..f2235a7b481 100644
--- a/upstart-jobs/udev.nix
+++ b/upstart-jobs/udev.nix
@@ -1,10 +1,12 @@
 { stdenv, writeText, substituteAll, cleanSource, udev, procps, firmwareDirs, modprobe
 , extraUdevPkgs ? []
-, sndMode ? "0600"
+, config
 }:
 
 let
 
+  cfg = config.services.udev;
+
   firmwareLoader = substituteAll {
     src = ./udev-firmware-loader.sh;
     path = "${stdenv.coreutils}/bin";
@@ -24,12 +26,12 @@ let
     #KERNEL=="sr[0-9]", BUS=="scsi", SYMLINK+="cdrom cdrom-%k"
 
     # ALSA sound devices.
-    KERNEL=="controlC[0-9]*",       NAME="snd/%k", MODE="${sndMode}"
-    KERNEL=="hwC[D0-9]*",           NAME="snd/%k", MODE="${sndMode}"
-    KERNEL=="pcmC[D0-9cp]*",        NAME="snd/%k", MODE="${sndMode}"
-    KERNEL=="midiC[D0-9]*",         NAME="snd/%k", MODE="${sndMode}"
-    KERNEL=="timer",                NAME="snd/%k", MODE="${sndMode}"
-    KERNEL=="seq",                  NAME="snd/%k", MODE="${sndMode}"
+    KERNEL=="controlC[0-9]*",       NAME="snd/%k", MODE="${cfg.sndMode}"
+    KERNEL=="hwC[D0-9]*",           NAME="snd/%k", MODE="${cfg.sndMode}"
+    KERNEL=="pcmC[D0-9cp]*",        NAME="snd/%k", MODE="${cfg.sndMode}"
+    KERNEL=="midiC[D0-9]*",         NAME="snd/%k", MODE="${cfg.sndMode}"
+    KERNEL=="timer",                NAME="snd/%k", MODE="${cfg.sndMode}"
+    KERNEL=="seq",                  NAME="snd/%k", MODE="${cfg.sndMode}"
 
     # Firmware loading.
     SUBSYSTEM=="firmware",          ACTION=="add", RUN+="${firmwareLoader}"
@@ -87,6 +89,13 @@ in
 	# Get rid of possible old udev processes.
 	${procps}/bin/pkill -u root "^udevd$" || true
 
+        # Do the loading of additional stage 2 kernel modules.
+        # Maybe this isn't the best place...
+        for i in ${toString config.boot.kernelModules}; do
+            echo "Loading kernel module $i..."
+            ${modprobe}/sbin/modprobe $i || true
+        done
+
 	# Start udev.
 	${udev}/sbin/udevd --daemon
 
-- 
GitLab


From 9b55a5c178b74157137b3fcc6b2dd61723b11354 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 3 Jul 2008 14:35:02 +0000
Subject: [PATCH 0981/5331] * Generation of /etc/fonts/fonts.conf: moved to
 Nixpkgs.

svn path=/nixos/trunk/; revision=12252
---
 etc/default.nix               | 14 +++---------
 etc/fonts/make-fonts-conf.xsl | 40 -----------------------------------
 2 files changed, 3 insertions(+), 51 deletions(-)
 delete mode 100644 etc/fonts/make-fonts-conf.xsl

diff --git a/etc/default.nix b/etc/default.nix
index e9de343f9c3..bee21c69766 100644
--- a/etc/default.nix
+++ b/etc/default.nix
@@ -174,17 +174,9 @@ import ../helpers/make-etc.nix {
   # Configuration file for fontconfig used to locate
   # (X11) client-rendered fonts.
   ++ optional config.fonts.enableFontConfig {
-    source = pkgs.runCommand "fonts.conf"
-      { 
-        fontDirectories = import ../system/fonts.nix {inherit pkgs config;};
-        buildInputs = [pkgs.libxslt];
-        inherit (pkgs) fontconfig;
-      }
-      "xsltproc --stringparam fontDirectories \"$fontDirectories\" \\
-          --stringparam fontconfig \"$fontconfig\" \\
-          ${./fonts/make-fonts-conf.xsl} $fontconfig/etc/fonts/fonts.conf \\
-          > $out
-      ";
+    source = pkgs.makeFontsConf {
+      fontDirectories = import ../system/fonts.nix {inherit pkgs config;};
+    };
     target = "fonts/fonts.conf";
   }
 
diff --git a/etc/fonts/make-fonts-conf.xsl b/etc/fonts/make-fonts-conf.xsl
deleted file mode 100644
index f716700d98e..00000000000
--- a/etc/fonts/make-fonts-conf.xsl
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0"?>
-
-<!--
-  This script copies the original fonts.conf from the fontconfig
-  distribution, but replaces all <dir> entries with the directories
-  specified in the $fontDirectories parameter.
--->
-
-<xsl:stylesheet version="1.0"
-                xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-                xmlns:str="http://exslt.org/strings"
-                extension-element-prefixes="str"
-                >
-
-  <xsl:output method='xml' encoding="UTF-8" doctype-system="fonts.dtd" />
-
-  <xsl:param name="fontDirectories" />
-  <xsl:param name="fontconfig" />
-
-  <xsl:template match="/fontconfig">
-
-    <fontconfig>
-      <xsl:copy-of select="child::node()[name() != 'dir' and name() != 'cachedir' and name() != 'include']" />
-
-      <include xml:space="preserve"><xsl:value-of select="$fontconfig" />/etc/fonts/conf.d</include>
-      <include ignore_missing="yes" xml:space="preserve">/etc/fonts/conf.d</include>
-      
-      <cachedir xml:space="preserve">/var/cache/fontconfig</cachedir>
-      <cachedir xml:space="preserve">~/.fontconfig</cachedir>
-      
-      <xsl:for-each select="str:tokenize($fontDirectories)">
-        <dir><xsl:value-of select="." /></dir>
-        <xsl:text>&#0010;</xsl:text>
-      </xsl:for-each>
-      
-    </fontconfig>
-
-  </xsl:template>
-  
-</xsl:stylesheet>
-- 
GitLab


From 2c56d137eec7f6fefd3664b3e9f1486d6710356d Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Thu, 3 Jul 2008 18:54:16 +0000
Subject: [PATCH 0982/5331] I hope that hardwareScan = false now works as
 expected again...

svn path=/nixos/trunk/; revision=12253
---
 upstart-jobs/udev.nix | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/upstart-jobs/udev.nix b/upstart-jobs/udev.nix
index f2235a7b481..01a3f88bb37 100644
--- a/upstart-jobs/udev.nix
+++ b/upstart-jobs/udev.nix
@@ -47,8 +47,16 @@ let
       ln -s ${nixRules} $out/${nixRules.name}
       shopt -s nullglob
       cp ${udev}/etc/udev/rules.d/*.rules $out/
-      substituteInPlace $out/80-drivers.rules \
-        --replace /sbin/modprobe ${modprobe}/sbin/modprobe
+      ${if config.boot.hardwareScan then
+        ''
+          substituteInPlace $out/80-drivers.rules \
+            --replace /sbin/modprobe ${modprobe}/sbin/modprobe
+	''
+	else
+	''
+	  rm $out/80-drivers.rules
+	''
+      }
       for i in ${toString extraUdevPkgs}; do
         for j in $i/etc/udev/rules.d/*; do
           ln -s $j $out/$(basename $j)
-- 
GitLab


From ab41596a7ff31cb2ea607ecdd3cb3a0006ea4002 Mon Sep 17 00:00:00 2001
From: Wouter den Breejen <uu@denbreejen.net>
Date: Sat, 5 Jul 2008 00:16:39 +0000
Subject: [PATCH 0983/5331] Added option
 boot.extraGrubEntriesBeforeNixos=true/false to boot by default into
 nixos-default or into your extraGrubEntries

svn path=/nixos/trunk/; revision=12263
---
 etc/bashrc                     |  1 +
 installer/grub-menu-builder.sh | 21 ++++++++++++---------
 system/options.nix             |  7 +++++++
 system/system.nix              |  2 +-
 4 files changed, 21 insertions(+), 10 deletions(-)

diff --git a/etc/bashrc b/etc/bashrc
index 1027d96e039..0b1cd516428 100644
--- a/etc/bashrc
+++ b/etc/bashrc
@@ -11,6 +11,7 @@ fi
 # Some aliases.
 alias ls="ls --color=tty"
 alias ll="ls -l"
+alias l="ls -alh"
 alias which="type -p"
 
 # Help `rpcgen' find `cpp', assuming it's installed in the user's environment.
diff --git a/installer/grub-menu-builder.sh b/installer/grub-menu-builder.sh
index 7d0e241e526..61a21128333 100644
--- a/installer/grub-menu-builder.sh
+++ b/installer/grub-menu-builder.sh
@@ -113,19 +113,22 @@ if test -n "@copyKernels@"; then
     mkdir -p /boot/kernels
 fi
 
-
-if test -n "$tmp"; then
-    addEntry "NixOS - Default" $default ""
-fi
-
-
 # Additional entries specified verbatim by the configuration.
-cat >> $tmp <<EOF
-
+extraGrubEntries=$(cat >> $tmp <<EOF
 @extraGrubEntries@
+EOF)
 
-EOF
+if test -n "@extraGrubEntriesBeforeNixos@"; then 
+  $extraGrubEntries
+fi
+
+if test -n "$tmp"; then
+   addEntry "NixOS - Default" $default ""
+fi
 
+if test -n "@extraGrubEntriesBeforeNixos@"; then 
+  $extraGrubEntries
+fi
 
 # Add all generations of the system profile to the menu, in reverse
 # (most recent to least recent) order.
diff --git a/system/options.nix b/system/options.nix
index 1a9ac26e434..0bdbe392135 100644
--- a/system/options.nix
+++ b/system/options.nix
@@ -275,6 +275,13 @@
       ";
     };
 
+    extraGrubEntriesBeforeNixos = mkOption {
+      default = false;
+      description = "
+	Wheter extraGrubEntries are put before the Nixos-default option
+      ";
+    };
+
     grubSplashImage = mkOption {
       default = pkgs.fetchurl {
         url = http://www.gnome-look.org/CONTENT/content-files/36909-soft-tux.xpm.gz;
diff --git a/system/system.nix b/system/system.nix
index 74bbf5d2b0e..cc10120f155 100644
--- a/system/system.nix
+++ b/system/system.nix
@@ -371,7 +371,7 @@ rec {
     isExecutable = true;
     inherit (pkgs) bash;
     path = [pkgs.coreutils pkgs.gnused pkgs.gnugrep];
-    inherit (config.boot) copyKernels extraGrubEntries
+    inherit (config.boot) copyKernels extraGrubEntries extraGrubEntriesBeforeNixos
       grubSplashImage bootMount configurationLimit;
   };
 
-- 
GitLab


From 7813be5e54bac085bd125591f72f44c7d12db2da Mon Sep 17 00:00:00 2001
From: Sander van der Burg <s.vanderburg@tudelft.nl>
Date: Sat, 5 Jul 2008 22:27:36 +0000
Subject: [PATCH 0984/5331] Updated tomcat service with a more sophisticated
 model

svn path=/nixos/trunk/; revision=12268
---
 system/ids.nix          |  4 ++-
 system/options.nix      |  2 +-
 upstart-jobs/tomcat.nix | 70 +++++++++++++++++++++++++++++++++++------
 3 files changed, 64 insertions(+), 12 deletions(-)

diff --git a/system/ids.nix b/system/ids.nix
index 312fd94e351..4a94179eea6 100644
--- a/system/ids.nix
+++ b/system/ids.nix
@@ -17,6 +17,7 @@
     zabbix = 13;
     postfix = 14;
     dovecot = 15;
+    tomcat = 16;
 
     nixbld = 30000; # start of range of uids
     nobody = 65534;
@@ -42,7 +43,8 @@
     floppy = 18;
     uucp = 19;
     lp = 20;
-
+    tomcat = 21;
+    
     users = 100;
     nixbld = 30000;
     nogroup = 65534;
diff --git a/system/options.nix b/system/options.nix
index 0bdbe392135..378c4279289 100644
--- a/system/options.nix
+++ b/system/options.nix
@@ -1446,7 +1446,7 @@
       };
       
       user = mkOption {
-        default = "nobody";
+        default = "tomcat";
 	description = "User account under which Apache Tomcat runs.";
       };      
       
diff --git a/upstart-jobs/tomcat.nix b/upstart-jobs/tomcat.nix
index e5b7d1d2b21..f595ad19972 100644
--- a/upstart-jobs/tomcat.nix
+++ b/upstart-jobs/tomcat.nix
@@ -1,23 +1,73 @@
 args: with args;
 
 let
-
   cfg = config.services.tomcat;
-
-  tomcatService = import ../services/tomcat {
-    inherit (pkgs) stdenv jdk tomcat6 su;
-    inherit (cfg) baseDir user deployFrom;
-  };
-
 in
 
 {
   name = "tomcat";
+  
+  groups = [
+    { name = "tomcat";
+      gid = (import ../system/ids.nix).gids.tomcat;
+    }
+  ];
+  
+  users = [
+    { name = "tomcat";
+      uid = (import ../system/ids.nix).uids.tomcat;
+      description = "Tomcat user";
+      home = "/homeless-shelter";
+    }
+  ];
+  
   job = ''
     description "Apache Tomcat server"
 
-    stop on shutdown
-
-    respawn ${tomcatService}/bin/control start
+    start on network-interface/started
+    stop on network-interfaces/stop
+    
+    start script
+	# Create initial state data
+	
+	if ! test -d ${cfg.baseDir}
+	then    
+    	    mkdir -p ${cfg.baseDir}/webapps
+	    cp -av ${pkgs.tomcat6}/{conf,temp,logs} ${cfg.baseDir}
+	fi
+	
+	# Deploy all webapplications
+	
+	if ! test "${cfg.deployFrom}" = ""
+	then
+	    rm -rf ${cfg.baseDir}/webapps
+	    mkdir -p ${cfg.baseDir}/webapps
+	    for i in ${cfg.deployFrom}/*
+	    do
+		cp -rL $i ${cfg.baseDir}/webapps
+	    done
+	fi
+	
+	# Fix permissions
+	
+	chown -R ${cfg.user} ${cfg.baseDir}
+	
+	for i in `find ${cfg.baseDir} -type d`
+	do
+	    chmod -v 755 $i
+	done
+	
+	for i in `find ${cfg.baseDir} -type f`
+	do
+	    chmod -v 644 $i
+	done
+    end script
+    
+    respawn ${pkgs.su}/bin/su -s ${pkgs.bash}/bin/sh ${cfg.user} -c 'CATALINA_BASE=${cfg.baseDir} JAVA_HOME=${pkgs.jdk} ${pkgs.tomcat6}/bin/startup.sh; sleep 1d'
+    
+    stop script
+	echo "Stopping tomcat..."
+	CATALINA_BASE=${cfg.baseDir} JAVA_HOME=${pkgs.jdk} ${pkgs.su}/bin/su -s ${pkgs.bash}/bin/sh ${cfg.user} -c ${pkgs.tomcat6}/bin/shutdown.sh
+    end script
   '';
 }
-- 
GitLab


From 045ae06092cbdb9c31ed471a3a0430415a0cc622 Mon Sep 17 00:00:00 2001
From: Sander van der Burg <s.vanderburg@tudelft.nl>
Date: Sun, 6 Jul 2008 10:30:53 +0000
Subject: [PATCH 0985/5331] Updated ejabberd service to make it work

svn path=/nixos/trunk/; revision=12270
---
 system/options.nix        | 11 ++++++++---
 upstart-jobs/ejabberd.nix | 35 +++++++++++++++++++++++------------
 2 files changed, 31 insertions(+), 15 deletions(-)

diff --git a/system/options.nix b/system/options.nix
index 378c4279289..7c8db46d5e4 100644
--- a/system/options.nix
+++ b/system/options.nix
@@ -1385,10 +1385,15 @@
         default = false;
 	description = "Whether to enable ejabberd server";
       };
+            
+      spoolDir = mkOption {
+        default = "/var/lib/ejabberd";
+	description = "Location of the spooldir of ejabberd";
+      };
       
-      user = mkOption {
-        default = "nobody";
-	description = "User account under which ejabberd runs.";
+      logsDir = mkOption {
+        default = "/var/log/ejabberd";
+	description = "Location of the logfile directory of ejabberd";
       };
     };
 
diff --git a/upstart-jobs/ejabberd.nix b/upstart-jobs/ejabberd.nix
index 1bc607e3632..58fc3c8d849 100644
--- a/upstart-jobs/ejabberd.nix
+++ b/upstart-jobs/ejabberd.nix
@@ -4,19 +4,30 @@ let
 
 cfg = config.services.ejabberd;
 
-ejabberdService = import ../services/ejabberd {
-        inherit (cfg) user;
-	inherit (pkgs) stdenv erlang ejabberd su;
-};
-
 in
 {
-	name = "ejabberd";
-	job = "
-description \"EJabberd server\"
-
-stop on shutdown
+    name = "ejabberd";
+	
+    job = ''
+      description "EJabberd server"
 
-respawn ${ejabberdService}/bin/control start
-	";
+      start on network-interface/started
+      stop on network-interfaces/stop
+    
+      start script
+	    # Initialise state data
+	    mkdir -p ${cfg.logsDir}
+	    
+	    if ! test -d ${cfg.spoolDir}
+	    then
+		cp -av ${pkgs.ejabberd}/var/lib/ejabberd /var/lib
+	    fi
+      end script
+      
+      respawn ${pkgs.bash}/bin/sh -c 'export PATH=$PATH:${pkgs.ejabberd}/sbin; cd ~; ejabberdctl --logs ${cfg.logsDir} --spool ${cfg.spoolDir} start; sleep 1d'
+      
+      stop script
+          ${pkgs.ejabberd}/sbin/ejabberdctl stop
+      end script
+    '';
 }
-- 
GitLab


From 6df19e0cbb3564992abac4aa6ad409ba35ac4700 Mon Sep 17 00:00:00 2001
From: Sander van der Burg <s.vanderburg@tudelft.nl>
Date: Sun, 6 Jul 2008 18:34:03 +0000
Subject: [PATCH 0986/5331] Added disnix

svn path=/nixos/trunk/; revision=12282
---
 system/options.nix | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/system/options.nix b/system/options.nix
index 7c8db46d5e4..44b3c771bf3 100644
--- a/system/options.nix
+++ b/system/options.nix
@@ -1461,8 +1461,15 @@
       };
     };
 
+    disnix = {
+      enable = mkOption {
+        default = false;
+	description = "Whether to enable Disnix";
+      };
+    };
+    
     httpd = {
-
+    
       enable = mkOption {
         default = false;
         description = "
-- 
GitLab


From 82ddadc27caa6a8d74f539682bbd17d8478e61df Mon Sep 17 00:00:00 2001
From: Sander van der Burg <s.vanderburg@tudelft.nl>
Date: Sun, 6 Jul 2008 18:34:19 +0000
Subject: [PATCH 0987/5331] Added disnix service

svn path=/nixos/trunk/; revision=12283
---
 upstart-jobs/default.nix | 10 +++++++++-
 upstart-jobs/disnix.nix  | 24 ++++++++++++++++++++++++
 2 files changed, 33 insertions(+), 1 deletion(-)
 create mode 100644 upstart-jobs/disnix.nix

diff --git a/upstart-jobs/default.nix b/upstart-jobs/default.nix
index 147dded26b1..d48a01b7afb 100644
--- a/upstart-jobs/default.nix
+++ b/upstart-jobs/default.nix
@@ -350,7 +350,9 @@ let
       inherit (pkgs) stdenv dbus;
       dbusServices =
         pkgs.lib.optional (config.services.hal.enable) pkgs.hal ++
-	pkgs.lib.optional (config.services.avahi.enable) pkgs.avahi;
+	pkgs.lib.optional (config.services.avahi.enable) pkgs.avahi ++
+	pkgs.lib.optional (config.services.disnix.enable) pkgs.disnix
+	;
     })
 
   # HAL daemon.
@@ -401,6 +403,12 @@ let
       inherit config pkgs;
     })
 
+  # Disnix server
+  ++ optional config.services.disnix.enable
+    (import ../upstart-jobs/disnix.nix {
+      inherit config pkgs;
+    })
+
   # Handles the reboot/halt events.
   ++ (map
     (event: makeJob (import ../upstart-jobs/halt.nix {
diff --git a/upstart-jobs/disnix.nix b/upstart-jobs/disnix.nix
new file mode 100644
index 00000000000..49dfe2f4d3f
--- /dev/null
+++ b/upstart-jobs/disnix.nix
@@ -0,0 +1,24 @@
+args: with args;
+
+let
+
+cfg = config.services.disnix;
+
+in
+{
+    name = "disnix";
+	
+    job = ''
+      description "Disnix server"
+
+      start on dbus
+      stop on shutdown	
+          
+      start script
+        # !!! quick hack: wait until dbus has started
+        sleep 3
+      end script
+      
+      respawn ${pkgs.bash}/bin/sh -c 'export PATH=/var/run/current-system/sw/bin:$PATH; export HOME=/root; ${pkgs.disnix}/bin/disnix-service'
+    '';
+}
-- 
GitLab


From 6a2600c0a24e127965a94a98794a78456b4d0ab2 Mon Sep 17 00:00:00 2001
From: Sander van der Burg <s.vanderburg@tudelft.nl>
Date: Sun, 6 Jul 2008 19:55:34 +0000
Subject: [PATCH 0988/5331] Added some more features to the tomcat service

svn path=/nixos/trunk/; revision=12284
---
 system/options.nix      | 10 ++++++++++
 upstart-jobs/tomcat.nix | 12 +++++++++++-
 2 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/system/options.nix b/system/options.nix
index 44b3c771bf3..cbea9b26d96 100644
--- a/system/options.nix
+++ b/system/options.nix
@@ -1459,6 +1459,16 @@
         default = "";
 	description = "Location where webapplications are stored. Leave empty to use the baseDir.";
       };
+      
+      javaOpts = mkOption {
+        default = "";
+	description = "Parameters to pass to the Java Virtual Machine which spawns Apache Tomcat";
+      };
+      
+      sharedLibFrom = mkOption {
+        default = "";
+	description ="Location where shared libraries are stored. Leave empty to use the baseDir.";
+      };
     };
 
     disnix = {
diff --git a/upstart-jobs/tomcat.nix b/upstart-jobs/tomcat.nix
index f595ad19972..91bfb3176e5 100644
--- a/upstart-jobs/tomcat.nix
+++ b/upstart-jobs/tomcat.nix
@@ -33,6 +33,7 @@ in
 	if ! test -d ${cfg.baseDir}
 	then    
     	    mkdir -p ${cfg.baseDir}/webapps
+	    mkdir -p ${cfg.baseDir}/shared
 	    cp -av ${pkgs.tomcat6}/{conf,temp,logs} ${cfg.baseDir}
 	fi
 	
@@ -61,9 +62,18 @@ in
 	do
 	    chmod -v 644 $i
 	done
+
+	# Deploy all shared libraries
+	
+	if ! test "${cfg.sharedLibFrom}" = ""
+	then
+	    rm -f ${cfg.baseDir}/shared/lib
+	    ln -s ${cfg.sharedLibFrom} ${cfg.baseDir}/shared/lib
+	fi
+
     end script
     
-    respawn ${pkgs.su}/bin/su -s ${pkgs.bash}/bin/sh ${cfg.user} -c 'CATALINA_BASE=${cfg.baseDir} JAVA_HOME=${pkgs.jdk} ${pkgs.tomcat6}/bin/startup.sh; sleep 1d'
+    respawn ${pkgs.su}/bin/su -s ${pkgs.bash}/bin/sh ${cfg.user} -c 'CATALINA_BASE=${cfg.baseDir} JAVA_HOME=${pkgs.jdk} JAVA_OPTS="${cfg.javaOpts}" ${pkgs.tomcat6}/bin/startup.sh; sleep 1d'
     
     stop script
 	echo "Stopping tomcat..."
-- 
GitLab


From 8eb0444ab85797de2c94a3130234fc23f48a354d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Tue, 8 Jul 2008 07:24:28 +0000
Subject: [PATCH 0989/5331] lshd: Explicitly pass all options to the daemon.

svn path=/nixos/trunk/; revision=12319
---
 upstart-jobs/lshd.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/upstart-jobs/lshd.nix b/upstart-jobs/lshd.nix
index b85eeb038c7..d9ff79a90b4 100644
--- a/upstart-jobs/lshd.nix
+++ b/upstart-jobs/lshd.nix
@@ -37,11 +37,11 @@ respawn ${lsh}/sbin/lshd --daemonic \
                               interfaces))} \
    -h "${hostKey}" \
    ${if !syslog then "--no-syslog" else ""} \
-   ${if !passwordAuthentication then "--no-password" else ""} \
-   ${if !publicKeyAuthentication then "--no-publickey" else ""} \
-   ${if rootLogin then "--root-login" else ""} \
+   ${if passwordAuthentication then "--password" else "--no-password" } \
+   ${if publicKeyAuthentication then "--publickey" else "--no-publickey" } \
+   ${if rootLogin then "--root-login" else "--no-root-login" } \
    ${if loginShell != null then "--login-shell=\"${loginShell}\"" else "" } \
-   ${if srpKeyExchange then "--srp-keyexchange" else "" } \
+   ${if srpKeyExchange then "--srp-keyexchange" else "--no-srp-keyexchange" } \
    ${if !tcpForwarding then "--no-tcpip-forward" else "--tcpip-forward"} \
    ${if x11Forwarding then "--x11-forward" else "--no-x11-forward" } \
    --subsystems=${concatStringsSep ","
-- 
GitLab


From 48ec05d257a58d22a134652d2fc4ece40e9dae58 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Thu, 10 Jul 2008 13:45:12 +0000
Subject: [PATCH 0990/5331] Fix typo in `/etc/profile' that led to a wrong
 `LD_LIBRARY_PATH'.

svn path=/nixos/trunk/; revision=12332
---
 etc/profile.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/etc/profile.sh b/etc/profile.sh
index d03a4dd4e49..7858a9ee7b2 100644
--- a/etc/profile.sh
+++ b/etc/profile.sh
@@ -1,7 +1,7 @@
 export PATH=@wrapperDir@:/var/run/current-system/sw/bin:/var/run/current-system/sw/sbin
 export LD_LIBRARY_PATH=/var/run/opengl-driver/lib
 if test -n "@nssModulesPath@"; then
-    LD_LIBRARY_PATH=@nssModulesPath@$:$LD_LIBRARY_PATH
+    LD_LIBRARY_PATH=@nssModulesPath@:$LD_LIBRARY_PATH
 fi
 export MODULE_DIR=@modulesTree@/lib/modules
 export NIXPKGS_CONFIG=/nix/etc/config.nix
-- 
GitLab


From 0ac32cbb99ea49a9110bf5b2e00f2563a3095751 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Fri, 11 Jul 2008 08:01:09 +0000
Subject: [PATCH 0991/5331] Added comments about seccureKeys for configuration
 files encryption

svn path=/nixos/trunk/; revision=12342
---
 system/options.nix | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/system/options.nix b/system/options.nix
index cbea9b26d96..7e232c24231 100644
--- a/system/options.nix
+++ b/system/options.nix
@@ -2467,7 +2467,13 @@
         default = /var/elliptic-keys/public;
 	description = "
 	  Public key. Make it path argument, so it is copied into store and
-	  hashed.
+	  hashed. 
+
+	  The key is used to encrypt Gateway 6 configuration in store, as it
+	  contains a password for external service. Unfortunately, 
+	  derivation file should be protected by other means. For example, 
+	  nix-http-export.cgi will happily export any non-derivation path,
+	  but not a derivation.
 	";
       };
       private = mkOption {
-- 
GitLab


From 088b09f401116c6341148c7d7cbd8f6feecfdec1 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 16 Jul 2008 16:01:09 +0000
Subject: [PATCH 0992/5331] * Move most bash initialisation to /etc/bashrc. 
 Now finally ssh   commands like "ssh -t host command" initialise the
 environment   properly.

svn path=/nixos/trunk/; revision=12366
---
 etc/bashrc       | 18 -------------
 etc/bashrc.sh    | 70 ++++++++++++++++++++++++++++++++++++++++++++++++
 etc/default.nix  | 21 ++++++---------
 etc/pam.d/common |  1 -
 etc/profile.sh   | 50 ++++------------------------------
 5 files changed, 83 insertions(+), 77 deletions(-)
 delete mode 100644 etc/bashrc
 create mode 100644 etc/bashrc.sh

diff --git a/etc/bashrc b/etc/bashrc
deleted file mode 100644
index 0b1cd516428..00000000000
--- a/etc/bashrc
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/bin/sh
-
-# A nice prompt.
-PROMPT_COLOR="1;31m"
-let $UID && PROMPT_COLOR="1;32m"
-PS1="\n\[\033[$PROMPT_COLOR\][\u@\h:\w]\\$\[\033[0m\] "
-if test "x$TERM" == "xxterm"; then
-    PS1="\033]2;\h:\u:\w\007$PS1"
-fi
-
-# Some aliases.
-alias ls="ls --color=tty"
-alias ll="ls -l"
-alias l="ls -alh"
-alias which="type -p"
-
-# Help `rpcgen' find `cpp', assuming it's installed in the user's environment.
-alias rpcgen="rpcgen -Y $HOME/.nix-profile/bin"
diff --git a/etc/bashrc.sh b/etc/bashrc.sh
new file mode 100644
index 00000000000..66f6c57869e
--- /dev/null
+++ b/etc/bashrc.sh
@@ -0,0 +1,70 @@
+# Initialise a bunch of environment variables.
+export PATH=/var/run/current-system/sw/bin:/var/run/current-system/sw/sbin
+export LD_LIBRARY_PATH=/var/run/opengl-driver/lib
+if test -n "@nssModulesPath@"; then
+    LD_LIBRARY_PATH=@nssModulesPath@:$LD_LIBRARY_PATH
+fi
+export MODULE_DIR=@modulesTree@/lib/modules
+export NIXPKGS_CONFIG=/nix/etc/config.nix
+export PAGER="less -R"
+export TZ=@timeZone@
+export TZDIR=@glibc@/share/zoneinfo
+export FONTCONFIG_FILE=/etc/fonts/fonts.conf
+export LANG=@defaultLocale@
+export EDITOR=nano
+export INFOPATH=/var/run/current-system/sw/info:/var/run/current-system/sw/share/info
+export LOCATE_PATH=/var/cache/locatedb
+
+
+# Set up secure multi-user builds: non-root users build through the
+# Nix daemon.
+if test "$USER" != root; then
+    export NIX_REMOTE=daemon
+else
+    export NIX_REMOTE=
+fi
+
+
+# Set up the environment variables for running Nix.
+@nixEnvVars@
+
+
+# Include the various profiles in the appropriate environment variables.
+NIX_USER_PROFILE_DIR=/nix/var/nix/profiles/per-user/$USER
+
+NIX_PROFILES="/nix/var/nix/profiles/default $NIX_USER_PROFILE_DIR/profile"
+
+for i in $NIX_PROFILES; do # !!! reverse
+    export PATH=$i/bin:$i/sbin:$PATH
+    export INFOPATH=$i/info:$i/share/info:$INFOPATH
+    export PKG_CONFIG_PATH="$i/lib/pkgconfig:$PKG_CONFIG_PATH"
+    export ACLOCAL_PATH="$i/share/aclocal:$ACLOCAL_PATH"
+done
+
+
+# Search directory for Aspell dictionaries.
+export ASPELL_CONF="dict-dir $NIX_USER_PROFILE_DIR/profile/lib/aspell"
+
+
+# ~/bin and the setuid wrappers override other bin directories.
+export PATH=$HOME/bin:@wrapperDir@:$PATH
+
+
+# Provide a nice prompt.
+PROMPT_COLOR="1;31m"
+let $UID && PROMPT_COLOR="1;32m"
+PS1="\n\[\033[$PROMPT_COLOR\][\u@\h:\w]\\$\[\033[0m\] "
+if test "$TERM" = "xterm"; then
+    PS1="\033]2;\h:\u:\w\007$PS1"
+fi
+
+
+# Some aliases.
+alias ls="ls --color=tty"
+alias ll="ls -l"
+alias l="ls -alh"
+alias which="type -p"
+
+
+# Help `rpcgen' find `cpp', assuming it's installed in the user's environment.
+alias rpcgen="rpcgen -Y $HOME/.nix-profile/bin"
diff --git a/etc/default.nix b/etc/default.nix
index bee21c69766..67765978489 100644
--- a/etc/default.nix
+++ b/etc/default.nix
@@ -11,12 +11,6 @@ let
   # !!! ugh, these files shouldn't be created here.
     
     
-  envConf = pkgs.writeText "environment" ''
-    PATH=${systemPath}/bin:${systemPath}/sbin:${pkgs.openssh}/bin
-    NIX_REMOTE=daemon
-  '' /* ${pkgs.openssh}/bin is a hack to get remote scp to work */;
-
-
   pamConsoleHandlers = pkgs.writeText "console.handlers" ''
     console consoledevs /dev/tty[0-9][0-9]* :[0-9]\.[0-9] :[0-9]
     ${pkgs.pam_console}/sbin/pam_console_apply lock logfail wait -t tty -s -c ${pamConsolePerms}
@@ -25,6 +19,7 @@ let
 
   pamConsolePerms = ./security/console.perms;
 
+  
 in
 
     
@@ -106,19 +101,19 @@ import ../helpers/make-etc.nix {
     }
 
     { # Script executed when the shell starts as a non-login shell (system-wide version).
-      source = ./bashrc;
-      target = "bashrc";      
-    }
-
-    { # Script executed when the shell starts as a login shell.
       source = pkgs.substituteAll {
-        src = ./profile.sh;
+        src = ./bashrc.sh;
         inherit systemPath wrapperDir modulesTree nssModulesPath;
         inherit (pkgs) glibc;
         timeZone = config.time.timeZone;
         defaultLocale = config.i18n.defaultLocale;
         inherit nixEnvVars;
       };
+      target = "bashrc";      
+    }
+
+    { # Script executed when the shell starts as a login shell.
+      source = ./profile.sh;
       target = "profile";
     }
 
@@ -214,7 +209,7 @@ import ../helpers/make-etc.nix {
             then pkgs.pam_ldap
             else "/no-such-path";
           inherit (pkgs.xorg) xauth;
-          inherit envConf pamConsoleHandlers;
+          inherit pamConsoleHandlers;
           isLDAPEnabled = if isLDAPEnabled then "" else "#";
         };
         target = "pam.d/" + program;
diff --git a/etc/pam.d/common b/etc/pam.d/common
index 146dc1c0e16..8497f65f303 100644
--- a/etc/pam.d/common
+++ b/etc/pam.d/common
@@ -10,4 +10,3 @@ password sufficient     @pam_unix2@/lib/security/pam_unix2.so nullok
 
 @isLDAPEnabled@  session  optional       @pam_ldap@/lib/security/pam_ldap.so 
 session  required       @pam_unix2@/lib/security/pam_unix2.so
-session  optional       pam_env.so envfile=@envConf@
diff --git a/etc/profile.sh b/etc/profile.sh
index 7858a9ee7b2..8718f8087fc 100644
--- a/etc/profile.sh
+++ b/etc/profile.sh
@@ -1,35 +1,12 @@
-export PATH=@wrapperDir@:/var/run/current-system/sw/bin:/var/run/current-system/sw/sbin
-export LD_LIBRARY_PATH=/var/run/opengl-driver/lib
-if test -n "@nssModulesPath@"; then
-    LD_LIBRARY_PATH=@nssModulesPath@:$LD_LIBRARY_PATH
-fi
-export MODULE_DIR=@modulesTree@/lib/modules
-export NIXPKGS_CONFIG=/nix/etc/config.nix
-export PAGER="less -R"
-export TZ=@timeZone@
-export TZDIR=@glibc@/share/zoneinfo
-export FONTCONFIG_FILE=/etc/fonts/fonts.conf
-export LANG=@defaultLocale@
-export EDITOR=nano
-export INFOPATH=/var/run/current-system/sw/info:/var/run/current-system/sw/share/info
-export LOCATE_PATH=/var/cache/locatedb
-
-
-# Set up secure multi-user builds: non-root users build through the
-# Nix daemon.
-if test "$USER" != root; then
-    export NIX_REMOTE=daemon
-else
-    export NIX_REMOTE=
-fi
-
+# This file is executed by all login shells.  Don't ask what a login
+# shell is, nobody knows.  Most global environment variables should go
+# in /etc/bashrc, which is by default included by non-login shells,
+# but which we include here as well.
 
-# Set up the environment variables for running Nix.
-@nixEnvVars@
+source /etc/bashrc
 
 
 # Set up the per-user profile.
-NIX_USER_PROFILE_DIR=/nix/var/nix/profiles/per-user/$USER
 mkdir -m 0755 -p $NIX_USER_PROFILE_DIR
 if test "$(stat --printf '%u' $NIX_USER_PROFILE_DIR)" != "$(id -u)"; then
     echo "WARNING: bad ownership on $NIX_USER_PROFILE_DIR" >&2
@@ -45,20 +22,6 @@ if ! test -L $HOME/.nix-profile; then
     fi
 fi
 
-NIX_PROFILES="/nix/var/nix/profiles/default $NIX_USER_PROFILE_DIR/profile"
-
-for i in $NIX_PROFILES; do # !!! reverse
-    export PATH=$i/bin:$i/sbin:$PATH
-    export INFOPATH=$i/info:$i/share/info:$INFOPATH
-    export PKG_CONFIG_PATH="$i/lib/pkgconfig:$PKG_CONFIG_PATH"
-    export ACLOCAL_PATH="$i/share/aclocal:$ACLOCAL_PATH"
-done
-
-# Search directory for Aspell dictionaries.
-export ASPELL_CONF="dict-dir $NIX_USER_PROFILE_DIR/profile/lib/aspell"
-
-export PATH=$HOME/bin:$PATH
-
 
 # Create the per-user garbage collector roots directory.
 NIX_USER_GCROOTS_DIR=/nix/var/nix/gcroots/per-user/$USER
@@ -80,9 +43,6 @@ if test ! -e $HOME/.nix-defexpr -o -L $HOME/.nix-defexpr; then
     fi
 fi
 
-# Include bashrc settings
-
-source /etc/bashrc
 
 # Read system-wide modifications.
 if test -f /etc/profile.local; then
-- 
GitLab


From a66248e2a2f97d482a3bd64e60e41cc7c7102212 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 23 Jul 2008 09:10:19 +0000
Subject: [PATCH 0993/5331] * Fix extraGrubEntriesBeforeNixos, it always placed
 the extra entries   before the default (so I suddenly found myself booting
 into   Windows...).  BTW it would be better to have string-valued options  
 like extraGrubEntriesBefore / extraGrubEntriesAfter or something   like that.

svn path=/nixos/trunk/; revision=12401
---
 installer/grub-menu-builder.sh | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/installer/grub-menu-builder.sh b/installer/grub-menu-builder.sh
index 61a21128333..41481ffeb1d 100644
--- a/installer/grub-menu-builder.sh
+++ b/installer/grub-menu-builder.sh
@@ -114,20 +114,19 @@ if test -n "@copyKernels@"; then
 fi
 
 # Additional entries specified verbatim by the configuration.
-extraGrubEntries=$(cat >> $tmp <<EOF
+extraGrubEntries=$(cat <<EOF
 @extraGrubEntries@
-EOF)
+EOF
+)
 
 if test -n "@extraGrubEntriesBeforeNixos@"; then 
-  $extraGrubEntries
+    echo "$extraGrubEntries" >> $tmp
 fi
 
-if test -n "$tmp"; then
-   addEntry "NixOS - Default" $default ""
-fi
+addEntry "NixOS - Default" $default ""
 
-if test -n "@extraGrubEntriesBeforeNixos@"; then 
-  $extraGrubEntries
+if test -z "@extraGrubEntriesBeforeNixos@"; then 
+    echo "$extraGrubEntries" >> $tmp
 fi
 
 # Add all generations of the system profile to the menu, in reverse
-- 
GitLab


From cc902c638cf8f2758e027279a14eca68a5412c03 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 23 Jul 2008 13:47:32 +0000
Subject: [PATCH 0994/5331] svn path=/nixos/trunk/; revision=12406

---
 system/system.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/system/system.nix b/system/system.nix
index cc10120f155..c9932d5ec1b 100644
--- a/system/system.nix
+++ b/system/system.nix
@@ -101,7 +101,7 @@ rec {
     fileSystems =
       pkgs.lib.filter
         (fs: fs.mountPoint == "/" || (fs ? neededForBoot && fs.neededForBoot))
-        (config.fileSystems);
+        config.fileSystems;
     rootLabel = config.boot.rootLabel;
     inherit stage2Init;
     modulesDir = modulesClosure;
-- 
GitLab


From 5ec1fa20609db74f5983ce4f6bc44c8a13ed36e2 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 23 Jul 2008 14:13:27 +0000
Subject: [PATCH 0995/5331] * Tabs considered harmful.

svn path=/nixos/trunk/; revision=12407
---
 etc/default.nix                  |   2 +-
 system/options.nix               | 646 +++++++++++++++----------------
 system/system.nix                |  21 +-
 upstart-jobs/bind.nix            |  34 +-
 upstart-jobs/default.nix         |  10 +-
 upstart-jobs/disnix.nix          |   4 +-
 upstart-jobs/dovecot.nix         |   4 +-
 upstart-jobs/ejabberd.nix        |  16 +-
 upstart-jobs/filesystems.nix     |   2 +-
 upstart-jobs/gw6c.nix            |  36 +-
 upstart-jobs/ircd-hybrid.nix     |  46 +--
 upstart-jobs/jboss.nix           |  10 +-
 upstart-jobs/lshd.nix            |   4 +-
 upstart-jobs/openfire.nix        |   4 +-
 upstart-jobs/postfix.nix         |  12 +-
 upstart-jobs/postgresql.nix      |   2 +-
 upstart-jobs/tomcat.nix          |  86 ++--
 upstart-jobs/tty-backgrounds.nix |  40 +-
 upstart-jobs/udev.nix            |  66 ++--
 upstart-jobs/xfs.nix             |  22 +-
 upstart-jobs/xserver.nix         |   8 +-
 21 files changed, 537 insertions(+), 538 deletions(-)

diff --git a/etc/default.nix b/etc/default.nix
index 67765978489..93f4951bf2b 100644
--- a/etc/default.nix
+++ b/etc/default.nix
@@ -53,7 +53,7 @@ import ../helpers/make-etc.nix {
     { # Name Service Switch configuration file.  Required by the C library.
       source = if config.services.avahi.nssmdns
                then (assert config.services.avahi.enable; ./nsswitch-mdns.conf)
-	       else ./nsswitch.conf;
+               else ./nsswitch.conf;
       target = "nsswitch.conf";
     }
 
diff --git a/system/options.nix b/system/options.nix
index 7e232c24231..35f6f27319c 100644
--- a/system/options.nix
+++ b/system/options.nix
@@ -71,7 +71,7 @@
       example = "0:0";
       description = "
         Device for manual resume attempt during boot. Looks like 
-	major:minor .
+        major:minor .
       ";
     };
 
@@ -223,11 +223,11 @@
 
       allowMissing = mkOption {
         default = false;
-	description = ''
-	  Allow some initrd components to be missing. Useful for
-	  custom kernel that are changed too often to track needed
-	  kernelModules.
-	'';
+        description = ''
+          Allow some initrd components to be missing. Useful for
+          custom kernel that are changed too often to track needed
+          kernelModules.
+        '';
       };
 
       lvm = mkOption {
@@ -278,7 +278,7 @@
     extraGrubEntriesBeforeNixos = mkOption {
       default = false;
       description = "
-	Wheter extraGrubEntries are put before the Nixos-default option
+        Wheter extraGrubEntries are put before the Nixos-default option
       ";
     };
 
@@ -314,7 +314,7 @@
       example = 120;
       description = "
         Maximum of configurations in boot menu. GRUB has problems when
-	there are too many entries.
+        there are too many entries.
       ";
     };
 
@@ -350,7 +350,7 @@
       default = false;
       description = "
         Whether to use IPv6 even though gw6c is not used. For example, 
-	for Postfix.
+        for Postfix.
       ";
     };
 
@@ -644,9 +644,9 @@
 
       enable = mkOption {
         default = true;
-	description = ''
-	  Whether to enable the `at' daemon, a command scheduler.
-	'';
+        description = ''
+          Whether to enable the `at' daemon, a command scheduler.
+        '';
       };
     };
 
@@ -863,12 +863,12 @@
 
       permitRootLogin = mkOption {
         default = "yes";
-	description = "
-	  Whether the root user can login using ssh. Valid options
-	  are <command>yes</command>, <command>without-password</command>,
-	  <command>forced-commands-only</command> or
-	  <command>no</command>
-	";
+        description = "
+          Whether the root user can login using ssh. Valid options
+          are <command>yes</command>, <command>without-password</command>,
+          <command>forced-commands-only</command> or
+          <command>no</command>
+        ";
       };
     };
 
@@ -876,91 +876,91 @@
 
       enable = mkOption {
         default = false;
-	description = ''
-	  Whether to enable the GNU lshd SSH2 daemon, which allows
+        description = ''
+          Whether to enable the GNU lshd SSH2 daemon, which allows
           secure remote login.
-	'';
+        '';
       };
 
       portNumber = mkOption {
         default = 22;
-	description = ''
-	  The port on which to listen for connections.
-	'';
+        description = ''
+          The port on which to listen for connections.
+        '';
       };
 
       interfaces = mkOption {
         default = [];
-	description = ''
-	  List of network interfaces where listening for connections.
+        description = ''
+          List of network interfaces where listening for connections.
           When providing the empty list, `[]', lshd listens on all
           network interfaces.
-	'';
-	example = [ "localhost" "1.2.3.4:443" ];
+        '';
+        example = [ "localhost" "1.2.3.4:443" ];
       };
 
       hostKey = mkOption {
         default = "/etc/lsh/host-key";
-	description = ''
-	  Path to the server's private key.  Note that this key must
+        description = ''
+          Path to the server's private key.  Note that this key must
           have been created, e.g., using "lsh-keygen --server |
           lsh-writekey --server", so that you can run lshd.
-	'';
+        '';
       };
 
       syslog = mkOption {
         default = true;
-	description = ''Whether to enable syslog output.'';
+        description = ''Whether to enable syslog output.'';
       };
 
       passwordAuthentication = mkOption {
         default = true;
-	description = ''Whether to enable password authentication.'';
+        description = ''Whether to enable password authentication.'';
       };
 
       publicKeyAuthentication = mkOption {
         default = true;
-	description = ''Whether to enable public key authentication.'';
+        description = ''Whether to enable public key authentication.'';
       };
 
       rootLogin = mkOption {
         default = false;
-	description = ''Whether to enable remote root login.'';
+        description = ''Whether to enable remote root login.'';
       };
 
       loginShell = mkOption {
         default = null;
-	description = ''
-	  If non-null, override the default login shell with the
-	  specified value.
-	'';
-	example = "/nix/store/xyz-bash-10.0/bin/bash10";
+        description = ''
+          If non-null, override the default login shell with the
+          specified value.
+        '';
+        example = "/nix/store/xyz-bash-10.0/bin/bash10";
       };
 
       srpKeyExchange = mkOption {
         default = false;
-	description = ''
-	  Whether to enable SRP key exchange and user authentication.
-	'';
+        description = ''
+          Whether to enable SRP key exchange and user authentication.
+        '';
       };
 
       tcpForwarding = mkOption {
         default = true;
-	description = ''Whether to enable TCP/IP forwarding.'';
+        description = ''Whether to enable TCP/IP forwarding.'';
       };
 
       x11Forwarding = mkOption {
         default = true;
-	description = ''Whether to enable X11 forwarding.'';
+        description = ''Whether to enable X11 forwarding.'';
       };
 
       subsystems = mkOption {
         default = [ ["sftp" "${pkgs.lsh}/sbin/sftp-server"] ];
-	description = ''
-	  List of subsystem-path pairs, where the head of the pair
+        description = ''
+          List of subsystem-path pairs, where the head of the pair
           denotes the subsystem name, and the tail denotes the path to
           an executable implementing it.
-	'';
+        '';
       };
     };
 
@@ -991,11 +991,11 @@
 
       enable = mkOption {
         default = false;
-	description = ''
-	  Whether to enable `portmap', an ONC RPC directory service
-	  notably used by NFS and NIS, and which can be queried
-	  using the rpcinfo(1) command.
-	'';
+        description = ''
+          Whether to enable `portmap', an ONC RPC directory service
+          notably used by NFS and NIS, and which can be queried
+          using the rpcinfo(1) command.
+        '';
       };
     };
 
@@ -1003,59 +1003,59 @@
 
       enable = mkOption {
         default = false;
-	description = ''
-	  Whether to run the Avahi daemon, which allows Avahi clients
-	  to use Avahi's service discovery facilities and also allows
-	  the local machine to advertise its presence and services
-	  (through the mDNS responder implemented by `avahi-daemon').
-	'';
+        description = ''
+          Whether to run the Avahi daemon, which allows Avahi clients
+          to use Avahi's service discovery facilities and also allows
+          the local machine to advertise its presence and services
+          (through the mDNS responder implemented by `avahi-daemon').
+        '';
       };
 
       hostName = mkOption {
         default = "nixos";  # XXX: Would be nice to use `networking.hostName'.
-	description = ''Host name advertised on the LAN.'';
+        description = ''Host name advertised on the LAN.'';
       };
 
       browseDomains = mkOption {
         default = [ "0pointer.de" "zeroconf.org" ];
-	description = ''
-	  List of non-local DNS domains to be browsed.
-	'';
+        description = ''
+          List of non-local DNS domains to be browsed.
+        '';
       };
 
       ipv4 = mkOption {
         default = true;
-	description = ''Whether to use IPv4'';
+        description = ''Whether to use IPv4'';
       };
 
       ipv6 = mkOption {
         default = false;
-	description = ''Whether to use IPv6'';
+        description = ''Whether to use IPv6'';
       };
 
       wideArea = mkOption {
         default = true;
-	description = ''Whether to enable wide-area service discovery.'';
+        description = ''Whether to enable wide-area service discovery.'';
       };
 
       publishing = mkOption {
         default = true;
-	description = ''Whether to allow publishing.'';
+        description = ''Whether to allow publishing.'';
       };
 
       nssmdns = mkOption {
         default = false;
-	description = ''
-	  Whether to enable the mDNS NSS (Name Service Switch) plug-in.
-	  Enabling it allows applications to resolve names in the `.local'
-	  domain by transparently querying the Avahi daemon.
-
-	  Warning: Currently, enabling this option breaks DNS lookups after
-	  a `nixos-rebuild'.  This is because `/etc/nsswitch.conf' is
-	  updated to use `nss-mdns' but `libnss_mdns' is not in
-	  applications' `LD_LIBRARY_PATH'.  The next time `/etc/profile' is
-	  sourced, it will set up an appropriate `LD_LIBRARY_PATH', though.
-	'';
+        description = ''
+          Whether to enable the mDNS NSS (Name Service Switch) plug-in.
+          Enabling it allows applications to resolve names in the `.local'
+          domain by transparently querying the Avahi daemon.
+
+          Warning: Currently, enabling this option breaks DNS lookups after
+          a `nixos-rebuild'.  This is because `/etc/nsswitch.conf' is
+          updated to use `nss-mdns' but `libnss_mdns' is not in
+          applications' `LD_LIBRARY_PATH'.  The next time `/etc/profile' is
+          sourced, it will set up an appropriate `LD_LIBRARY_PATH', though.
+        '';
       };
     };
 
@@ -1099,18 +1099,18 @@
 
       autorun = mkOption {
         default = true;
-	description = "
-	  Switch to false to create upstart-job and configuration, 
-	  but not run it automatically
-	";
+        description = "
+          Switch to false to create upstart-job and configuration, 
+          but not run it automatically
+        ";
       };
 
       exportConfiguration = mkOption {
         default = false;
-	description = "
-	  Create /etc/X11/xorg.conf and a file with environment
-	  variables
-	";
+        description = "
+          Create /etc/X11/xorg.conf and a file with environment
+          variables
+        ";
       };
 
       tcpEnable = mkOption {
@@ -1246,20 +1246,20 @@
             Whether to replace mouse with touchpad.
           ";
         };
-	dev = mkOption {
+        dev = mkOption {
           default = "/dev/input/event0";
           description = "
             Event device for Synaptics touchpad.
           ";
         };
-	minSpeed = mkOption {
-	  default = "0.06";
+        minSpeed = mkOption {
+          default = "0.06";
           description = "Cursor speed factor for precision finger motion";
-	};
-	maxSpeed = mkOption {
-	  default = "0.12";
+        };
+        maxSpeed = mkOption {
+          default = "0.12";
           description = "Cursor speed factor for highest-speed finger motion";
-	};
+        };
       };
 
       layout = mkOption {
@@ -1348,10 +1348,10 @@
       
       useXFS = mkOption {
         default = false;
-	example = "unix/:7100";
-	description = "
-	  Way to access the X Font Server to use.
-	";
+        example = "unix/:7100";
+        description = "
+          Way to access the X Font Server to use.
+        ";
       };
 
       tty = mkOption {
@@ -1372,10 +1372,10 @@
 
       packageFun = mkOption {
         default = pkgs: pkgs.xorg;
-	description = "
-	  Alternative X.org package to use. For 
-	  example, you can replace individual drivers.
-	";
+        description = "
+          Alternative X.org package to use. For 
+          example, you can replace individual drivers.
+        ";
       };
 
     };
@@ -1383,39 +1383,39 @@
     ejabberd = {
       enable = mkOption {
         default = false;
-	description = "Whether to enable ejabberd server";
+        description = "Whether to enable ejabberd server";
       };
             
       spoolDir = mkOption {
         default = "/var/lib/ejabberd";
-	description = "Location of the spooldir of ejabberd";
+        description = "Location of the spooldir of ejabberd";
       };
       
       logsDir = mkOption {
         default = "/var/log/ejabberd";
-	description = "Location of the logfile directory of ejabberd";
+        description = "Location of the logfile directory of ejabberd";
       };
     };
 
     jboss = {
       enable = mkOption {
         default = false;
-	description = "Whether to enable jboss";
+        description = "Whether to enable jboss";
       };
 
       tempDir = mkOption {
         default = "/tmp";
-	description = "Location where JBoss stores its temp files";
+        description = "Location where JBoss stores its temp files";
       };
       
       logDir = mkOption {
         default = "/var/log/jboss";
-	description = "Location of the logfile directory of JBoss";
+        description = "Location of the logfile directory of JBoss";
       };
       
       serverDir = mkOption {
         description = "Location of the server instance files";
-	default = "/var/jboss/server";
+        default = "/var/jboss/server";
       };
       
       deployDir = mkOption {
@@ -1425,56 +1425,56 @@
       
       libUrl = mkOption {
         default = "file:///nix/var/nix/profiles/default/server/default/lib";
-	description = "Location where the shared library JARs are stored";
+        description = "Location where the shared library JARs are stored";
       };
       
       user = mkOption {
         default = "nobody";
-	description = "User account under which jboss runs.";
+        description = "User account under which jboss runs.";
       };
       
       useJK = mkOption {
         default = false;
-	description = "Whether to use to connector to the Apache HTTP server";
+        description = "Whether to use to connector to the Apache HTTP server";
       };
     };
 
     tomcat = {
       enable = mkOption {
         default = false;
-	description = "Whether to enable Apache Tomcat";
+        description = "Whether to enable Apache Tomcat";
       };
       
       baseDir = mkOption {
         default = "/var/tomcat";
-	description = "Location where Tomcat stores configuration files, webapplications and logfiles";
+        description = "Location where Tomcat stores configuration files, webapplications and logfiles";
       };
       
       user = mkOption {
         default = "tomcat";
-	description = "User account under which Apache Tomcat runs.";
+        description = "User account under which Apache Tomcat runs.";
       };      
       
       deployFrom = mkOption {
         default = "";
-	description = "Location where webapplications are stored. Leave empty to use the baseDir.";
+        description = "Location where webapplications are stored. Leave empty to use the baseDir.";
       };
       
       javaOpts = mkOption {
         default = "";
-	description = "Parameters to pass to the Java Virtual Machine which spawns Apache Tomcat";
+        description = "Parameters to pass to the Java Virtual Machine which spawns Apache Tomcat";
       };
       
       sharedLibFrom = mkOption {
         default = "";
-	description ="Location where shared libraries are stored. Leave empty to use the baseDir.";
+        description ="Location where shared libraries are stored. Leave empty to use the baseDir.";
       };
     };
 
     disnix = {
       enable = mkOption {
         default = false;
-	description = "Whether to enable Disnix";
+        description = "Whether to enable Disnix";
       };
     };
     
@@ -1560,13 +1560,13 @@
       mod_jk = {
         enable = mkOption {
           default = false;
-	  description = "Whether to enable the Apache Tomcat connector.";
+          description = "Whether to enable the Apache Tomcat connector.";
+        };
+        
+        applicationMappings = mkOption {
+          default = [];
+          description = "List of Java webapplications that should be mapped to the servlet container (Tomcat/JBoss)";
         };
-	
-	applicationMappings = mkOption {
-	  default = [];
-	  description = "List of Java webapplications that should be mapped to the servlet container (Tomcat/JBoss)";
-	};
       };
 
       virtualHosts = mkOption {
@@ -1609,7 +1609,7 @@
           };
 
           userCreationDomain = mkOption {
-	    default = "example.org"; 
+            default = "example.org"; 
             example = "example.org";
             description = "
               The domain from which user creation is allowed.  A client can
@@ -1627,13 +1627,13 @@
               support WebDAV.
             ";
           };
-	  
-	  dataDir = mkOption {
-	    default = "/no/such/path/exists";
-	    description = "
-	      Place to put SVN repository.
-	    ";
-	  };
+          
+          dataDir = mkOption {
+            default = "/no/such/path/exists";
+            description = "
+              Place to put SVN repository.
+            ";
+          };
 
           organization = {
 
@@ -1673,16 +1673,16 @@
     vsftpd = {
       enable = mkOption {
         default = false;
-	description = "
-	  Whether to enable the vsftpd FTP server.
-	";
+        description = "
+          Whether to enable the vsftpd FTP server.
+        ";
       };
       
       anonymousUser = mkOption {
         default = false;
-	description = "
-	  Whether to enable the anonymous FTP user.
-	";
+        description = "
+          Whether to enable the anonymous FTP user.
+        ";
       };
     };
     
@@ -1737,12 +1737,12 @@
       
       sndMode = mkOption {
         default = "0600";
-	example = "0666";
-	description = "
-	  Permissions for /dev/snd/*, in case you have multiple 
-	  logged in users or if the devices belong to root for 
-	  some reason.
-	";
+        example = "0666";
+        description = "
+          Permissions for /dev/snd/*, in case you have multiple 
+          logged in users or if the devices belong to root for 
+          some reason.
+        ";
       };
     };
 
@@ -1770,10 +1770,10 @@
 
       autorun = mkOption {
         default = true;
-	description = "
-	  Switch to false to create upstart-job and configuration, 
-	  but not run it automatically
-	";
+        description = "
+          Switch to false to create upstart-job and configuration, 
+          but not run it automatically
+        ";
       };
 
       username = mkOption {
@@ -1816,10 +1816,10 @@
 
       waitPingableBroker = mkOption {
         default = true;
-	example = false;
-	description = "
-	  Whether to wait until tunnel broker returns ICMP echo.
-	";
+        example = false;
+        description = "
+          Whether to wait until tunnel broker returns ICMP echo.
+        ";
       };
 
     };
@@ -1959,34 +1959,34 @@
     mysql = {
       enable = mkOption {
         default = false;
-	description = "
-	  Whether to enable the MySQL server.
-	";
+        description = "
+          Whether to enable the MySQL server.
+        ";
       };
       
       port = mkOption {
         default = "3306";
-	description = "Port of MySQL"; 
+        description = "Port of MySQL"; 
       };
       
       user = mkOption {
         default = "mysql";
-	description = "User account under which MySQL runs";
+        description = "User account under which MySQL runs";
       };
       
       dataDir = mkOption {
         default = "/var/mysql";
-	description = "Location where MySQL stores its table files";
+        description = "Location where MySQL stores its table files";
       };
       
       logError = mkOption {
         default = "/var/log/mysql_err.log";
-	description = "Location of the MySQL error logfile";
+        description = "Location of the MySQL error logfile";
       };
       
       pidDir = mkOption {
         default = "/var/run/mysql";
-	description = "Location of the file which stores the PID of the MySQL server";
+        description = "Location of the file which stores the PID of the MySQL server";
       };
     };
 
@@ -1994,34 +1994,34 @@
     postgresql = {
       enable = mkOption {
         default = false;
-	description = "
-	  Whether to run PostgreSQL.
-	";
+        description = "
+          Whether to run PostgreSQL.
+        ";
       };
       port = mkOption {
         default = "5432";
-	description = "
-	  Port for PostgreSQL.
-	";
+        description = "
+          Port for PostgreSQL.
+        ";
       };
       logDir = mkOption {
         default = "/var/log/postgresql";
-	description = "
-	  Log directory for PostgreSQL.
-	";
+        description = "
+          Log directory for PostgreSQL.
+        ";
       };
       dataDir = mkOption {
         default = "/var/db/postgresql";
-	description = "
-	  Data directory for PostgreSQL.
-	";
+        description = "
+          Data directory for PostgreSQL.
+        ";
       };
       subServices = mkOption {
         default = [];
-	description = "
-	  Subservices list. As it is already implememnted, 
-	  here is an interface...
-	";
+        description = "
+          Subservices list. As it is already implememnted, 
+          here is an interface...
+        ";
       };
       authentication = mkOption {
         default = ''
@@ -2030,21 +2030,21 @@
           host  all all 127.0.0.1/32 md5
           host  all all ::1/128      md5
         '';
-	description = "
-	  Hosts (except localhost), who you allow to connect.
-	";
+        description = "
+          Hosts (except localhost), who you allow to connect.
+        ";
       };
       allowedHosts = mkOption {
         default = [];
-	description = "
-	  Hosts (except localhost), who you allow to connect.
-	";
+        description = "
+          Hosts (except localhost), who you allow to connect.
+        ";
       };
       authMethod = mkOption {
         default = " ident sameuser ";
-	description = "
-	  How to authorize users. 
-	  Note: ident needs absolute trust to all allowed client hosts.";
+        description = "
+          How to authorize users. 
+          Note: ident needs absolute trust to all allowed client hosts.";
       };
     };
 
@@ -2052,15 +2052,15 @@
     openfire = {
       enable = mkOption {
         default = false;
-	description = "
-	  Whether to enable OpenFire XMPP server.
-	";
+        description = "
+          Whether to enable OpenFire XMPP server.
+        ";
       };
       usePostgreSQL = mkOption {
         default = true;
-	description = "
-	  Whether you use PostgreSQL service for your storage back-end.
-	";
+        description = "
+          Whether you use PostgreSQL service for your storage back-end.
+        ";
       };
     };
 
@@ -2068,15 +2068,15 @@
     gpm = {
       enable = mkOption {
         default = false;
-	description = "
-	  Whether to enable general purpose mouse daemon.
-	";
+        description = "
+          Whether to enable general purpose mouse daemon.
+        ";
       };
       protocol = mkOption {
         default = "ps/2";
-	description = "
-	  Mouse protocol to use.
-	";
+        description = "
+          Mouse protocol to use.
+        ";
       };
     };
 
@@ -2085,10 +2085,10 @@
 
       enable = mkOption {
         default = false;
-	description = "
-	  Whether to run the Zabbix monitoring agent on this machine.
+        description = "
+          Whether to run the Zabbix monitoring agent on this machine.
           It will send monitoring data to a Zabbix server.
-	";
+        ";
       };
 
       server = mkOption {
@@ -2104,146 +2104,146 @@
     zabbixServer = {
       enable = mkOption {
         default = false;
-	description = "
-	  Whether to run the Zabbix server on this machine.
-	";
+        description = "
+          Whether to run the Zabbix server on this machine.
+        ";
       };
     };
    
     postfix = {
       enable = mkOption {
         default = false;
-	description ="
-	  Whether to run the Postfix mail server.
-	";
+        description ="
+          Whether to run the Postfix mail server.
+        ";
       };
       user = mkOption {
         default = "postfix";
-	description = "
-	  How to call postfix user (must be used only for postfix).
-	";
+        description = "
+          How to call postfix user (must be used only for postfix).
+        ";
       };
       group = mkOption {
         default = "postfix";
-	description = "
-	  How to call postfix group (must be used only for postfix).
-	";
+        description = "
+          How to call postfix group (must be used only for postfix).
+        ";
       };
       setgidGroup = mkOption {
         default = "postdrop";
-	description = "
-	  How to call postfix setgid group (for postdrop). Should 
-	  be uniquely used group.
-	";
+        description = "
+          How to call postfix setgid group (for postdrop). Should 
+          be uniquely used group.
+        ";
       };
       networks = mkOption {
         default = null;
-	example = ["192.168.0.1/24"];
-	description = "
-	  Net masks for trusted - allowed to relay mail to third parties - 
-	  hosts. Leave empty to use mynetworks_style configuration or use 
-	  default (localhost-only).
-	";
+        example = ["192.168.0.1/24"];
+        description = "
+          Net masks for trusted - allowed to relay mail to third parties - 
+          hosts. Leave empty to use mynetworks_style configuration or use 
+          default (localhost-only).
+        ";
       };
       networksStyle = mkOption {
         default = "";
-	description = "
-	  Name of standard way of trusted network specification to use,
-	  leave blank if you specify it explicitly or if you want to use 
-	  default (localhost-only).
-	";
+        description = "
+          Name of standard way of trusted network specification to use,
+          leave blank if you specify it explicitly or if you want to use 
+          default (localhost-only).
+        ";
       };
       hostname = mkOption {
         default = "";
-	description ="
-	  Hostname to use. Leave blank to use just the hostname of machine.
-	  It should be FQDN.
-	";
+        description ="
+          Hostname to use. Leave blank to use just the hostname of machine.
+          It should be FQDN.
+        ";
       };
       domain = mkOption {
         default = "";
-	description ="
-	  Domain to use. Leave blank to use hostname minus first component.
-	";
+        description ="
+          Domain to use. Leave blank to use hostname minus first component.
+        ";
       };
       origin = mkOption {
         default = "";
-	description ="
-	  Origin to use in outgoing e-mail. Leave blank to use hostname.
-	";
+        description ="
+          Origin to use in outgoing e-mail. Leave blank to use hostname.
+        ";
       };
       destination = mkOption {
         default = null;
         example = ["localhost"];
         description = "
-	  Full (!) list of domains we deliver locally. Leave blank for 
-	  acceptable Postfix default.
-	";
+          Full (!) list of domains we deliver locally. Leave blank for 
+          acceptable Postfix default.
+        ";
       };
       relayDomains = mkOption {
         default = null;
-	example = ["localdomain"];
-	description = "
-	  List of domains we agree to relay to. Default is the same as 
-	  destination.
-	";
+        example = ["localdomain"];
+        description = "
+          List of domains we agree to relay to. Default is the same as 
+          destination.
+        ";
       };
       relayHost = mkOption {
         default = "";
-	description = "
-	  Mail relay for outbound mail.
-	";
+        description = "
+          Mail relay for outbound mail.
+        ";
       };
       lookupMX = mkOption {
         default = false;
-	description = "
-	  Whether relay specified is just domain whose MX must be used.
-	";
+        description = "
+          Whether relay specified is just domain whose MX must be used.
+        ";
       };
       postmasterAlias = mkOption {
         default = "root";
-	description = "
-	  Who should receive postmaster e-mail.
-	";
+        description = "
+          Who should receive postmaster e-mail.
+        ";
       };
       rootAlias = mkOption {
         default = "";
-	description = "
-	  Who should receive root e-mail. Blank for no redirection.
-	";
+        description = "
+          Who should receive root e-mail. Blank for no redirection.
+        ";
       };
       extraAliases = mkOption {
         default = "";
-	description = "
-	  Additional entries to put verbatim into aliases file.
-	";
+        description = "
+          Additional entries to put verbatim into aliases file.
+        ";
       };
 
       sslCert = mkOption {
         default = "";
-	description = "
-	  SSL certificate to use.
-	";
+        description = "
+          SSL certificate to use.
+        ";
       };
       sslCACert = mkOption {
         default = "";
-	description = "
-	  SSL certificate of CA.
-	";
+        description = "
+          SSL certificate of CA.
+        ";
       };
       sslKey = mkOption {
         default = "";
-	description ="
-	  SSL key to use.
-	";
+        description ="
+          SSL key to use.
+        ";
       };
 
       recipientDelimiter = mkOption {
         default = "";
-	example = "+";
-	description = "
+        example = "+";
+        description = "
           Delimiter for address extension: so mail to user+test can be handled by ~user/.forward+test
-	";
+        ";
       };
 
     };
@@ -2251,65 +2251,65 @@
     dovecot = {
       enable = mkOption {
         default = false;
-	description = "Whether to enable dovecot POP3/IMAP server.";
+        description = "Whether to enable dovecot POP3/IMAP server.";
       };
 
       user = mkOption {
         default = "dovecot";
-	description = "dovecot user name";
+        description = "dovecot user name";
       };
       group = mkOption {
         default = "dovecot";
-	description = "dovecot group name";
+        description = "dovecot group name";
       };
 
       sslServerCert = mkOption {
         default = "";
-	description = "Server certificate";
+        description = "Server certificate";
       };
       sslCACert = mkOption {
         default = "";
-	description = "CA certificate used by server certificate";
+        description = "CA certificate used by server certificate";
       };
       sslServerKey = mkOption {
         default = "";
-	description = "Server key";
+        description = "Server key";
       };
     };
 
     bind = {
       enable = mkOption {
         default = false;
-	description = "
-	  Whether to enable BIND domain name server.
-	";
+        description = "
+          Whether to enable BIND domain name server.
+        ";
       };
       cacheNetworks = mkOption {
         default = ["127.0.0.0/24"];
-	description = "
-	  What networks are allowed to use us as a resolver.
-	";
+        description = "
+          What networks are allowed to use us as a resolver.
+        ";
       };
       blockedNetworks = mkOption {
         default = [];
-	description = "
-	  What networks are just blocked.
-	";
+        description = "
+          What networks are just blocked.
+        ";
       };
       zones = mkOption {
         default = [];
-	description = "
-	  List of zones we claim authority over.
-	    master=false means slave server; slaves means addresses 
-	   who may request zone transfer.
-	";
-	example = [{
-	  name = "example.com";
-	  master = false;
-	  file = "/var/dns/example.com";
-	  masters = ["192.168.0.1"];
-	  slaves = [];
-	}];
+        description = "
+          List of zones we claim authority over.
+            master=false means slave server; slaves means addresses 
+           who may request zone transfer.
+        ";
+        example = [{
+          name = "example.com";
+          master = false;
+          file = "/var/dns/example.com";
+          masters = ["192.168.0.1"];
+          slaves = [];
+        }];
       };
     };
 
@@ -2449,38 +2449,38 @@
       default = [];
       example = [{
         program = "sendmail";
-	owner = "nodody";
-	group = "postdrop";
-	setuid = false;
-	setgid = true;
+        owner = "nodody";
+        group = "postdrop";
+        setuid = false;
+        setgid = true;
       }];
       description = ''
         List of non-trivial setuid programs, like Postfix sendmail. Default 
-	should probably be nobody:nogroup:false:false - if you are bothering
-	doing anything with a setuid program, "root.root u+s g-s" is not what
-	you are aiming at..
+        should probably be nobody:nogroup:false:false - if you are bothering
+        doing anything with a setuid program, "root.root u+s g-s" is not what
+        you are aiming at..
       '';
     };
 
     seccureKeys = {
       public = mkOption {
         default = /var/elliptic-keys/public;
-	description = "
-	  Public key. Make it path argument, so it is copied into store and
-	  hashed. 
+        description = "
+          Public key. Make it path argument, so it is copied into store and
+          hashed. 
 
-	  The key is used to encrypt Gateway 6 configuration in store, as it
-	  contains a password for external service. Unfortunately, 
-	  derivation file should be protected by other means. For example, 
-	  nix-http-export.cgi will happily export any non-derivation path,
-	  but not a derivation.
-	";
+          The key is used to encrypt Gateway 6 configuration in store, as it
+          contains a password for external service. Unfortunately, 
+          derivation file should be protected by other means. For example, 
+          nix-http-export.cgi will happily export any non-derivation path,
+          but not a derivation.
+        ";
       };
       private = mkOption {
         default = "/var/elliptic-keys/private";
-	description = "
-	  Private key. Make it string argument, so it is not copied into store.
-	";
+        description = "
+          Private key. Make it string argument, so it is not copied into store.
+        ";
       };
     };
 
@@ -2530,7 +2530,7 @@ root        ALL=(ALL) SETENV: ALL
           createHome = true;
           group = "users";
           extraGroups = ["wheel"];
-	  shell = "/bin/sh";
+          shell = "/bin/sh";
         }
       ];
       description = "
@@ -2697,10 +2697,10 @@ root        ALL=(ALL) SETENV: ALL
       example = true;
       description = "
         There are some times when you want really small system for specific 
-	purpose and do not want default package list. Setting 
-	<varname>cleanStart</varname> to <literal>true</literal> allows you 
-	to create a system with empty path - only extraPackages will be 
-	included.
+        purpose and do not want default package list. Setting 
+        <varname>cleanStart</varname> to <literal>true</literal> allows you 
+        to create a system with empty path - only extraPackages will be 
+        included.
       ";
     };
 
diff --git a/system/system.nix b/system/system.nix
index c9932d5ec1b..256eeeeb1dc 100644
--- a/system/system.nix
+++ b/system/system.nix
@@ -192,7 +192,7 @@ rec {
 
   # Font aggregation
   fontDir = import ./fontdir.nix {
-    inherit config pkgs ;
+    inherit config pkgs;
     inherit (pkgs) builderDefs ttmkfdir;
     inherit (pkgs.xorg) mkfontdir mkfontscale fontalias;
   };
@@ -330,17 +330,16 @@ rec {
     bash = pkgs.bashInteractive;
 
     adjustSetuidOwner = pkgs.lib.concatStrings (map 
-      (_entry:let entry = {
+      (_entry: let entry = {
         owner = "nobody";
-	group = "nogroup";
-	setuid = false;
-	setgid = false;
+        group = "nogroup";
+        setuid = false;
+        setgid = false;
       } //_entry; in
       ''
         chown ${entry.owner}.${entry.group} $wrapperDir/${entry.program}
-	chmod u${if entry.setuid then "+" else "-"}s $wrapperDir/${entry.program} 
-	chmod g${if entry.setgid then "+" else "-"}s $wrapperDir/${entry.program} 
-
+        chmod u${if entry.setuid then "+" else "-"}s $wrapperDir/${entry.program} 
+        chmod g${if entry.setgid then "+" else "-"}s $wrapperDir/${entry.program} 
       '') 
       config.security.setuidOwners);
   };
@@ -411,7 +410,7 @@ rec {
       config.nesting.children; 
     configurationName = config.boot.configurationName;
   }) (pkgs.lib.getAttr ["environment" "checkConfigurationOptions"] 
-  	optionDeclarations.environment.checkConfigurationOptions.default
-	configuration) 
-		optionDeclarations configuration ;
+        optionDeclarations.environment.checkConfigurationOptions.default
+        configuration) 
+      optionDeclarations configuration;
 }
diff --git a/upstart-jobs/bind.nix b/upstart-jobs/bind.nix
index bea47a14a9f..f645abc9340 100644
--- a/upstart-jobs/bind.nix
+++ b/upstart-jobs/bind.nix
@@ -26,23 +26,23 @@ let
     (_entry:let entry={master=true;slaves=[];masters=[];}//_entry; in
       ''
         zone "${entry.name}" {
-	  type ${if entry.master then "master" else "slave"};
-	  file "${entry.file}";
-	  ${ if entry.master then
-	     ''
-	       allow-transfer {
-	         ${concatMapStrings (ip: ip+";\n") entry.slaves}
-	       };
-	     ''
-	     else
-	     ''
-	       masters {
-	         ${concatMapStrings (ip: ip+";\n") entry.masters}
-	       };
-	     ''
-	  }
-	  allow-query { any; };
-	};
+          type ${if entry.master then "master" else "slave"};
+          file "${entry.file}";
+          ${ if entry.master then
+             ''
+               allow-transfer {
+                 ${concatMapStrings (ip: ip+";\n") entry.slaves}
+               };
+             ''
+             else
+             ''
+               masters {
+                 ${concatMapStrings (ip: ip+";\n") entry.masters}
+               };
+             ''
+          }
+          allow-query { any; };
+        };
       ''
     )
     cfg.zones
diff --git a/upstart-jobs/default.nix b/upstart-jobs/default.nix
index d48a01b7afb..2b851d051af 100644
--- a/upstart-jobs/default.nix
+++ b/upstart-jobs/default.nix
@@ -97,7 +97,7 @@ let
         ++ pkgs.lib.optional config.networking.enableIntel4965AGNFirmware pkgs.iwlwifi4965ucode
         ++ pkgs.lib.optional config.networking.enableZydasZD1211Firmware pkgs.zd1211fw
         ++ pkgs.lib.optional config.hardware.enableGo7007 "${kernelPackages.wis_go7007}/firmware"
-	++ config.services.udev.addFirmware;
+        ++ config.services.udev.addFirmware;
       extraUdevPkgs =
            pkgs.lib.optional config.services.hal.enable pkgs.hal
         ++ pkgs.lib.optional config.hardware.enableGo7007 kernelPackages.wis_go7007;
@@ -349,10 +349,10 @@ let
     (import ../upstart-jobs/dbus.nix {
       inherit (pkgs) stdenv dbus;
       dbusServices =
-        pkgs.lib.optional (config.services.hal.enable) pkgs.hal ++
-	pkgs.lib.optional (config.services.avahi.enable) pkgs.avahi ++
-	pkgs.lib.optional (config.services.disnix.enable) pkgs.disnix
-	;
+        pkgs.lib.optional config.services.hal.enable pkgs.hal ++
+        pkgs.lib.optional config.services.avahi.enable pkgs.avahi ++
+        pkgs.lib.optional config.services.disnix.enable pkgs.disnix
+        ;
     })
 
   # HAL daemon.
diff --git a/upstart-jobs/disnix.nix b/upstart-jobs/disnix.nix
index 49dfe2f4d3f..a952f5beab1 100644
--- a/upstart-jobs/disnix.nix
+++ b/upstart-jobs/disnix.nix
@@ -7,12 +7,12 @@ cfg = config.services.disnix;
 in
 {
     name = "disnix";
-	
+        
     job = ''
       description "Disnix server"
 
       start on dbus
-      stop on shutdown	
+      stop on shutdown  
           
       start script
         # !!! quick hack: wait until dbus has started
diff --git a/upstart-jobs/dovecot.nix b/upstart-jobs/dovecot.nix
index dca75dab1a5..d7d74261e13 100644
--- a/upstart-jobs/dovecot.nix
+++ b/upstart-jobs/dovecot.nix
@@ -49,8 +49,8 @@ let
   confFile = pkgs.writeText "dovecot.conf" dovecotConf;
 
   pamdFile = pkgs.writeText "dovecot.pam" ''
-    auth	include	common
-    account	include common
+    auth        include common
+    account     include common
   '';
 
 in
diff --git a/upstart-jobs/ejabberd.nix b/upstart-jobs/ejabberd.nix
index 58fc3c8d849..f1f24962a6a 100644
--- a/upstart-jobs/ejabberd.nix
+++ b/upstart-jobs/ejabberd.nix
@@ -7,7 +7,7 @@ cfg = config.services.ejabberd;
 in
 {
     name = "ejabberd";
-	
+        
     job = ''
       description "EJabberd server"
 
@@ -15,13 +15,13 @@ in
       stop on network-interfaces/stop
     
       start script
-	    # Initialise state data
-	    mkdir -p ${cfg.logsDir}
-	    
-	    if ! test -d ${cfg.spoolDir}
-	    then
-		cp -av ${pkgs.ejabberd}/var/lib/ejabberd /var/lib
-	    fi
+            # Initialise state data
+            mkdir -p ${cfg.logsDir}
+            
+            if ! test -d ${cfg.spoolDir}
+            then
+                cp -av ${pkgs.ejabberd}/var/lib/ejabberd /var/lib
+            fi
       end script
       
       respawn ${pkgs.bash}/bin/sh -c 'export PATH=$PATH:${pkgs.ejabberd}/sbin; cd ~; ejabberdctl --logs ${cfg.logsDir} --spool ${cfg.spoolDir} start; sleep 1d'
diff --git a/upstart-jobs/filesystems.nix b/upstart-jobs/filesystems.nix
index ac0abaf3770..1713f6c098a 100644
--- a/upstart-jobs/filesystems.nix
+++ b/upstart-jobs/filesystems.nix
@@ -50,7 +50,7 @@ script
 
             isPseudo=
             if test \"$fsType\" = \"nfs\" || test \"$fsType\" = \"tmpfs\" ||
-	      test \"$fsType\" = \"ext3cow\"; then isPseudo=1; fi
+              test \"$fsType\" = \"ext3cow\"; then isPseudo=1; fi
 
             if ! test -n \"$isLabel\" -o -n \"$isPseudo\" -o -e \"$device\"; then
                 echo \"skipping $device, doesn't exist (yet)\"
diff --git a/upstart-jobs/gw6c.nix b/upstart-jobs/gw6c.nix
index f2586526dd2..f3332f9e8f3 100644
--- a/upstart-jobs/gw6c.nix
+++ b/upstart-jobs/gw6c.nix
@@ -1,27 +1,27 @@
 {config, pkgs}:
 let
-	cfg = config.services.gw6c;
-	procps = pkgs.procps;
-	gw6cService = import ../services/gw6c {
-		inherit (pkgs) stdenv gw6c coreutils 
-		procps upstart iputils gnused 
-		gnugrep seccureUser writeScript;
-		username = cfg.username;
-		password = cfg.password;
-		server = cfg.server;
-		keepAlive = cfg.keepAlive;
-		everPing = cfg.everPing;
+        cfg = config.services.gw6c;
+        procps = pkgs.procps;
+        gw6cService = import ../services/gw6c {
+                inherit (pkgs) stdenv gw6c coreutils 
+                procps upstart iputils gnused 
+                gnugrep seccureUser writeScript;
+                username = cfg.username;
+                password = cfg.password;
+                server = cfg.server;
+                keepAlive = cfg.keepAlive;
+                everPing = cfg.everPing;
 
-		seccureKeys = config.security.seccureKeys;
+                seccureKeys = config.security.seccureKeys;
 
-		waitPingableBroker = cfg.waitPingableBroker;
-	};
+                waitPingableBroker = cfg.waitPingableBroker;
+        };
 in
 {
-	name = "gw6c";
-	users = [];
-	groups = [];
-	job = "
+        name = "gw6c";
+        users = [];
+        groups = [];
+        job = "
 description \"Gateway6 client\"
 
 start on ${ if cfg.autorun then "network-interfaces/started" else "never" }
diff --git a/upstart-jobs/ircd-hybrid.nix b/upstart-jobs/ircd-hybrid.nix
index 5c117ae55a3..4183673cef8 100644
--- a/upstart-jobs/ircd-hybrid.nix
+++ b/upstart-jobs/ircd-hybrid.nix
@@ -1,33 +1,33 @@
 {config, pkgs}:
 let
-	cfg = config.services.ircdHybrid;
-	ircdService = import ../services/ircd-hybrid {
-		stdenv = pkgs.stdenv;
-		inherit (pkgs) ircdHybrid coreutils 
-			su iproute gnugrep procps;
-		serverName = cfg.serverName;
-		sid = cfg.sid;
-		description = cfg.description;
-		rsaKey = cfg.rsaKey;
-		certificate = cfg.certificate;
-		adminEmail = cfg.adminEmail;
-		extraIPs = cfg.extraIPs;
-		extraPort = cfg.extraPort;
-		gw6cEnabled = (config.services.gw6c.enable) &&
-			(config.services.gw6c.autorun);
-	};
+        cfg = config.services.ircdHybrid;
+        ircdService = import ../services/ircd-hybrid {
+                stdenv = pkgs.stdenv;
+                inherit (pkgs) ircdHybrid coreutils 
+                        su iproute gnugrep procps;
+                serverName = cfg.serverName;
+                sid = cfg.sid;
+                description = cfg.description;
+                rsaKey = cfg.rsaKey;
+                certificate = cfg.certificate;
+                adminEmail = cfg.adminEmail;
+                extraIPs = cfg.extraIPs;
+                extraPort = cfg.extraPort;
+                gw6cEnabled = (config.services.gw6c.enable) &&
+                        (config.services.gw6c.autorun);
+        };
 
   startingDependency = if config.services.gw6c.enable then "gw6c" else "network-interfaces";
 
 in
 {
-	name = "ircd-hybrid";
-	users = [ {
-			name = "ircd"; 
-			description = "IRCD owner.";
-		} ];
-	groups = [{name = "ircd";}];
-	job = "
+        name = "ircd-hybrid";
+        users = [ {
+                        name = "ircd"; 
+                        description = "IRCD owner.";
+                } ];
+        groups = [{name = "ircd";}];
+        job = "
 description = \"IRCD Hybrid server.\"
 
 start on ${startingDependency}/started
diff --git a/upstart-jobs/jboss.nix b/upstart-jobs/jboss.nix
index f3a4025a904..6c35fe06436 100644
--- a/upstart-jobs/jboss.nix
+++ b/upstart-jobs/jboss.nix
@@ -4,18 +4,18 @@ let
 
 cfg = config.services.jboss;
 jbossService = import ../services/jboss {
-	inherit (pkgs) stdenv jboss su;
-	inherit (cfg) tempDir logDir libUrl deployDir serverDir user useJK;
+        inherit (pkgs) stdenv jboss su;
+        inherit (cfg) tempDir logDir libUrl deployDir serverDir user useJK;
 };
 
 in
 {
-	name = "jboss";
-	job = "
+        name = "jboss";
+        job = "
 description \"JBoss server\"
 
 stop on shutdown
 
 respawn ${jbossService}/bin/control start
-	";
+        ";
 }
diff --git a/upstart-jobs/lshd.nix b/upstart-jobs/lshd.nix
index d9ff79a90b4..e2a61eed387 100644
--- a/upstart-jobs/lshd.nix
+++ b/upstart-jobs/lshd.nix
@@ -26,7 +26,7 @@ start script
     if ! test -f "${hostKey}"
     then
         ${lsh}/bin/lsh-keygen --server | \
-	${lsh}/bin/lsh-writekey --server -o "${hostKey}"
+        ${lsh}/bin/lsh-writekey --server -o "${hostKey}"
     fi
 end script
 
@@ -47,7 +47,7 @@ respawn ${lsh}/sbin/lshd --daemonic \
    --subsystems=${concatStringsSep ","
                                    (map (pair: (head pair) + "=" +
                                                (head (tail pair)))
-				        subsystems)}
+                                        subsystems)}
 '';
   
 }
diff --git a/upstart-jobs/openfire.nix b/upstart-jobs/openfire.nix
index e816b08347a..45338c793e7 100644
--- a/upstart-jobs/openfire.nix
+++ b/upstart-jobs/openfire.nix
@@ -26,8 +26,8 @@ with pkgs;
       mkdir /etc/openfire || true 
       for i in ${openfire}/conf.inst/*; do
           if ! test -f /etc/openfire/$(basename $i); then
-	      cp $i /etc/openfire/
-	  fi
+              cp $i /etc/openfire/
+          fi
       done
       openfire start
     end script
diff --git a/upstart-jobs/postfix.nix b/upstart-jobs/postfix.nix
index ebc6f79c85a..7b011cd1a0e 100644
--- a/upstart-jobs/postfix.nix
+++ b/upstart-jobs/postfix.nix
@@ -138,13 +138,13 @@ in
           ${pkgs.coreutils}/bin/mkdir -p /var/spool/mail /var/postfix/conf /var/postfix/queue
         fi
           
-	${pkgs.coreutils}/bin/chown -R ${user}.${group} /var/postfix 
-	${pkgs.coreutils}/bin/chown -R ${user}.${setgidGroup} /var/postfix/queue 
-	${pkgs.coreutils}/bin/chmod -R ug+rwX /var/postfix/queue 
-	${pkgs.coreutils}/bin/chown root.root /var/spool/mail
-	${pkgs.coreutils}/bin/chmod a+rwxt /var/spool/mail
+        ${pkgs.coreutils}/bin/chown -R ${user}.${group} /var/postfix 
+        ${pkgs.coreutils}/bin/chown -R ${user}.${setgidGroup} /var/postfix/queue 
+        ${pkgs.coreutils}/bin/chmod -R ug+rwX /var/postfix/queue 
+        ${pkgs.coreutils}/bin/chown root.root /var/spool/mail
+        ${pkgs.coreutils}/bin/chmod a+rwxt /var/spool/mail
         
-	ln -sf ${pkgs.postfix}/share/postfix/conf/* /var/postfix/conf
+        ln -sf ${pkgs.postfix}/share/postfix/conf/* /var/postfix/conf
 
         ln -sf ${aliasesFile} /var/postfix/conf/aliases
         ln -sf ${mainCfFile} /var/postfix/conf/main.cf
diff --git a/upstart-jobs/postgresql.nix b/upstart-jobs/postgresql.nix
index 8979239fc56..a37780678fc 100644
--- a/upstart-jobs/postgresql.nix
+++ b/upstart-jobs/postgresql.nix
@@ -36,7 +36,7 @@ in
     
     start script
         if ! test -e ${cfg.dataDir}; then
-    	    mkdir -m 0700 -p ${cfg.dataDir}
+            mkdir -m 0700 -p ${cfg.dataDir}
             chown -R postgres ${cfg.dataDir}
             ${run} -c '${postgresql}/bin/initdb -D ${cfg.dataDir} -U root'
         fi
diff --git a/upstart-jobs/tomcat.nix b/upstart-jobs/tomcat.nix
index 91bfb3176e5..6ebdf0069ff 100644
--- a/upstart-jobs/tomcat.nix
+++ b/upstart-jobs/tomcat.nix
@@ -28,56 +28,56 @@ in
     stop on network-interfaces/stop
     
     start script
-	# Create initial state data
-	
-	if ! test -d ${cfg.baseDir}
-	then    
-    	    mkdir -p ${cfg.baseDir}/webapps
-	    mkdir -p ${cfg.baseDir}/shared
-	    cp -av ${pkgs.tomcat6}/{conf,temp,logs} ${cfg.baseDir}
-	fi
-	
-	# Deploy all webapplications
-	
-	if ! test "${cfg.deployFrom}" = ""
-	then
-	    rm -rf ${cfg.baseDir}/webapps
-	    mkdir -p ${cfg.baseDir}/webapps
-	    for i in ${cfg.deployFrom}/*
-	    do
-		cp -rL $i ${cfg.baseDir}/webapps
-	    done
-	fi
-	
-	# Fix permissions
-	
-	chown -R ${cfg.user} ${cfg.baseDir}
-	
-	for i in `find ${cfg.baseDir} -type d`
-	do
-	    chmod -v 755 $i
-	done
-	
-	for i in `find ${cfg.baseDir} -type f`
-	do
-	    chmod -v 644 $i
-	done
+        # Create initial state data
+        
+        if ! test -d ${cfg.baseDir}
+        then    
+            mkdir -p ${cfg.baseDir}/webapps
+            mkdir -p ${cfg.baseDir}/shared
+            cp -av ${pkgs.tomcat6}/{conf,temp,logs} ${cfg.baseDir}
+        fi
+        
+        # Deploy all webapplications
+        
+        if ! test "${cfg.deployFrom}" = ""
+        then
+            rm -rf ${cfg.baseDir}/webapps
+            mkdir -p ${cfg.baseDir}/webapps
+            for i in ${cfg.deployFrom}/*
+            do
+                cp -rL $i ${cfg.baseDir}/webapps
+            done
+        fi
+        
+        # Fix permissions
+        
+        chown -R ${cfg.user} ${cfg.baseDir}
+        
+        for i in `find ${cfg.baseDir} -type d`
+        do
+            chmod -v 755 $i
+        done
+        
+        for i in `find ${cfg.baseDir} -type f`
+        do
+            chmod -v 644 $i
+        done
 
-	# Deploy all shared libraries
-	
-	if ! test "${cfg.sharedLibFrom}" = ""
-	then
-	    rm -f ${cfg.baseDir}/shared/lib
-	    ln -s ${cfg.sharedLibFrom} ${cfg.baseDir}/shared/lib
-	fi
+        # Deploy all shared libraries
+        
+        if ! test "${cfg.sharedLibFrom}" = ""
+        then
+            rm -f ${cfg.baseDir}/shared/lib
+            ln -s ${cfg.sharedLibFrom} ${cfg.baseDir}/shared/lib
+        fi
 
     end script
     
     respawn ${pkgs.su}/bin/su -s ${pkgs.bash}/bin/sh ${cfg.user} -c 'CATALINA_BASE=${cfg.baseDir} JAVA_HOME=${pkgs.jdk} JAVA_OPTS="${cfg.javaOpts}" ${pkgs.tomcat6}/bin/startup.sh; sleep 1d'
     
     stop script
-	echo "Stopping tomcat..."
-	CATALINA_BASE=${cfg.baseDir} JAVA_HOME=${pkgs.jdk} ${pkgs.su}/bin/su -s ${pkgs.bash}/bin/sh ${cfg.user} -c ${pkgs.tomcat6}/bin/shutdown.sh
+        echo "Stopping tomcat..."
+        CATALINA_BASE=${cfg.baseDir} JAVA_HOME=${pkgs.jdk} ${pkgs.su}/bin/su -s ${pkgs.bash}/bin/sh ${cfg.user} -c ${pkgs.tomcat6}/bin/shutdown.sh
     end script
   '';
 }
diff --git a/upstart-jobs/tty-backgrounds.nix b/upstart-jobs/tty-backgrounds.nix
index a567e21ed31..6e51208d686 100644
--- a/upstart-jobs/tty-backgrounds.nix
+++ b/upstart-jobs/tty-backgrounds.nix
@@ -26,32 +26,32 @@ rec {
 
     start script
 
-	# Critical: tell the kernel where to find splash_helper.  It calls
-	# this program every time we switch between consoles.
-	echo ${splashutils}/${splashutils.helperName} > ${splashutils.helperProcFile}
-
-	# For each console...
-	for tty in ${toString (map (x: x.tty) backgrounds)}; do
-	    # Make sure that the console exists.
-	    echo -n "" > /dev/tty$tty 
-
-	    # Set the theme as determined by tty-backgrounds-combine.sh
-	    # above.
-	    theme=$(readlink ${themesUnpacked}/$tty)
-	    ${splashutils}/${splashutils.controlName} --tty $tty -c setcfg -t $theme || true
-	    ${splashutils}/${splashutils.controlName} --tty $tty -c setpic -t $theme || true
-	    ${splashutils}/${splashutils.controlName} --tty $tty -c on || true
-	done
+        # Critical: tell the kernel where to find splash_helper.  It calls
+        # this program every time we switch between consoles.
+        echo ${splashutils}/${splashutils.helperName} > ${splashutils.helperProcFile}
+
+        # For each console...
+        for tty in ${toString (map (x: x.tty) backgrounds)}; do
+            # Make sure that the console exists.
+            echo -n "" > /dev/tty$tty 
+
+            # Set the theme as determined by tty-backgrounds-combine.sh
+            # above.
+            theme=$(readlink ${themesUnpacked}/$tty)
+            ${splashutils}/${splashutils.controlName} --tty $tty -c setcfg -t $theme || true
+            ${splashutils}/${splashutils.controlName} --tty $tty -c setpic -t $theme || true
+            ${splashutils}/${splashutils.controlName} --tty $tty -c on || true
+        done
 
     end script
 
     respawn sleep 10000 # !!! Hack
 
     stop script
-	# Disable the theme on each console.
-	for tty in ${toString (map (x: x.tty) backgrounds)}; do
-	    ${splashutils}/${splashutils.controlName} --tty $tty -c off || true
-	done
+        # Disable the theme on each console.
+        for tty in ${toString (map (x: x.tty) backgrounds)}; do
+            ${splashutils}/${splashutils.controlName} --tty $tty -c off || true
+        done
     end script
   '';
   
diff --git a/upstart-jobs/udev.nix b/upstart-jobs/udev.nix
index 01a3f88bb37..2fcb1a53488 100644
--- a/upstart-jobs/udev.nix
+++ b/upstart-jobs/udev.nix
@@ -19,7 +19,7 @@ let
     # Miscellaneous devices.
     KERNEL=="sonypi",               MODE="0666"
     KERNEL=="kvm",                  MODE="0666"
-    KERNEL=="kqemu",		    NAME="%k", MODE="0666"
+    KERNEL=="kqemu",                NAME="%k", MODE="0666"
 
     # Create a symlink for the CD-ROM device.
     #KERNEL=="hd[a-z]", BUS=="ide", SYSFS{removable}=="1", SYSFS{device/media}=="cdrom", SYMLINK+="cdrom cdrom-%k"
@@ -51,11 +51,11 @@ let
         ''
           substituteInPlace $out/80-drivers.rules \
             --replace /sbin/modprobe ${modprobe}/sbin/modprobe
-	''
-	else
-	''
-	  rm $out/80-drivers.rules
-	''
+        ''
+        else
+        ''
+          rm $out/80-drivers.rules
+        ''
       }
       for i in ${toString extraUdevPkgs}; do
         for j in $i/etc/udev/rules.d/*; do
@@ -92,10 +92,10 @@ in
     env UDEV_CONFIG_FILE=${conf}
 
     start script
-	echo "" > /proc/sys/kernel/hotplug
+        echo "" > /proc/sys/kernel/hotplug
 
-	# Get rid of possible old udev processes.
-	${procps}/bin/pkill -u root "^udevd$" || true
+        # Get rid of possible old udev processes.
+        ${procps}/bin/pkill -u root "^udevd$" || true
 
         # Do the loading of additional stage 2 kernel modules.
         # Maybe this isn't the best place...
@@ -104,30 +104,30 @@ in
             ${modprobe}/sbin/modprobe $i || true
         done
 
-	# Start udev.
-	${udev}/sbin/udevd --daemon
-
-	# Let udev create device nodes for all modules that have already
-	# been loaded into the kernel (or for which support is built into
-	# the kernel).
-	if ! test -e ${devicesCreated}; then
-	    ${udev}/sbin/udevadm trigger
-	    ${udev}/sbin/udevadm settle # wait for udev to finish
-	    touch ${devicesCreated}
-	fi
-
-	# Kill udev, let Upstart restart and monitor it.  (This is nasty,
-	# but we have to run `udevadm trigger' first.  Maybe we can use
-	# Upstart's `binary' keyword, but it isn't implemented yet.)
-	if ! ${procps}/bin/pkill -u root "^udevd$"; then
-	    echo "couldn't stop udevd"
-	fi
-
-	while ${procps}/bin/pgrep -u root "^udevd$"; do
-	    sleep 1
-	done
-
-	initctl emit new-devices
+        # Start udev.
+        ${udev}/sbin/udevd --daemon
+
+        # Let udev create device nodes for all modules that have already
+        # been loaded into the kernel (or for which support is built into
+        # the kernel).
+        if ! test -e ${devicesCreated}; then
+            ${udev}/sbin/udevadm trigger
+            ${udev}/sbin/udevadm settle # wait for udev to finish
+            touch ${devicesCreated}
+        fi
+
+        # Kill udev, let Upstart restart and monitor it.  (This is nasty,
+        # but we have to run `udevadm trigger' first.  Maybe we can use
+        # Upstart's `binary' keyword, but it isn't implemented yet.)
+        if ! ${procps}/bin/pkill -u root "^udevd$"; then
+            echo "couldn't stop udevd"
+        fi
+
+        while ${procps}/bin/pgrep -u root "^udevd$"; do
+            sleep 1
+        done
+
+        initctl emit new-devices
     end script
 
     respawn ${udev}/sbin/udevd
diff --git a/upstart-jobs/xfs.nix b/upstart-jobs/xfs.nix
index b887e3fc334..1b36002a348 100644
--- a/upstart-jobs/xfs.nix
+++ b/upstart-jobs/xfs.nix
@@ -1,20 +1,20 @@
 {
-	pkgs, config
+        pkgs, config
 }:
 if ! config.fonts.enableFontDir then abort "Please enable fontDir (fonts.enableFontDir) to use xfs." else
 let
-	configFile = ./xfs.conf;
+        configFile = ./xfs.conf;
   startingDependency = if config.services.gw6c.enable && config.services.gw6c.autorun then "gw6c" else "network-interfaces";
 in
 rec {
-	name = "xfs";
-	groups = [];
-	users = [];
-	job = "
-		description \"X Font Server\"
-		start on ${startingDependency}/started
-		stop on shutdown
+        name = "xfs";
+        groups = [];
+        users = [];
+        job = "
+                description \"X Font Server\"
+                start on ${startingDependency}/started
+                stop on shutdown
 
-		respawn ${pkgs.xorg.xfs}/bin/xfs -config ${configFile}
-	";
+                respawn ${pkgs.xorg.xfs}/bin/xfs -config ${configFile}
+        ";
 }
diff --git a/upstart-jobs/xserver.nix b/upstart-jobs/xserver.nix
index 2d81d25c225..0191773555b 100644
--- a/upstart-jobs/xserver.nix
+++ b/upstart-jobs/xserver.nix
@@ -98,7 +98,7 @@ let
       if cfg.useInternalAGPGART == "yes" then
         ''  Option "UseInternalAGPGART" "yes"''
       else if cfg.useInternalAGPGART == "no" then
-	''  Option "UseInternalAGPGART" "no"''
+        ''  Option "UseInternalAGPGART" "no"''
       else "";
 
     extraDeviceConfig = cfg.extraDeviceConfig; 
@@ -141,7 +141,7 @@ let
         export screen='
           Option "AddARGBGLXVisuals" "true"
           Option "DisableGLXRootClipping" "true"
-	  Option "RandRRotation" "on"
+          Option "RandRRotation" "on"
         '
         
         export device='
@@ -154,7 +154,7 @@ let
           Option "Composite" "Enable"
         '
       fi
-	
+        
       if [ "${toString videoDriver}" = i810 ]; then
         export extensions='
           Option "Composite" "Enable"
@@ -385,7 +385,7 @@ rec {
         then ''
           ln -sf ${kernelPackages.nvidiaDrivers} /var/run/opengl-driver
         ''
-	else if cfg.driSupport
+        else if cfg.driSupport
         then "ln -sf ${pkgs.mesa} /var/run/opengl-driver"
         else ""
        }
-- 
GitLab


From 3e8be34fccf84c9e72d9ee525118d6c19b29d9f8 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 23 Jul 2008 16:06:03 +0000
Subject: [PATCH 0996/5331] * Set $NIX_OTHER_STORES to
 /var/run/nix/remote-stores to make   automatic copying of build results from
 remote Nix stores work   more-or-less automatically.  All you have to do is
 mount the remote   FS on a subdirectory of /var/run/nix/remote-stores, e.g.

    $ sshfs remote_machine:/ /var/run/nix/remote-stores/foo

* Set $NIXPKGS_ALL.

svn path=/nixos/trunk/; revision=12411
---
 etc/bashrc.sh     |  1 +
 system/system.nix | 19 +++++++++++++++----
 2 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/etc/bashrc.sh b/etc/bashrc.sh
index 66f6c57869e..a396a7c302d 100644
--- a/etc/bashrc.sh
+++ b/etc/bashrc.sh
@@ -6,6 +6,7 @@ if test -n "@nssModulesPath@"; then
 fi
 export MODULE_DIR=@modulesTree@/lib/modules
 export NIXPKGS_CONFIG=/nix/etc/config.nix
+export NIXPKGS_ALL=/etc/nixos/nixpkgs
 export PAGER="less -R"
 export TZ=@timeZone@
 export TZDIR=@glibc@/share/zoneinfo
diff --git a/system/system.nix b/system/system.nix
index 256eeeeb1dc..bc83b355ed9 100644
--- a/system/system.nix
+++ b/system/system.nix
@@ -168,11 +168,22 @@ rec {
 
   # Environment variables for running Nix.
   nixEnvVars =
-    "export NIX_CONF_DIR=/nix/etc/nix\n" +
+    ''
+      export NIX_CONF_DIR=/nix/etc/nix
+
+      # Enable the copy-from-other-stores substituter, which allows builds
+      # to be sped up by copying build results from remote Nix stores.  To
+      # do this, mount the remote file system on a subdirectory of
+      # /var/run/nix/remote-stores.
+      export NIX_OTHER_STORES=/var/run/nix/remote-stores/*/nix
+      
+    '' + # */
     (if config.nix.distributedBuilds then
-      "export NIX_BUILD_HOOK=${nix}/libexec/nix/build-remote.pl\n" +
-      "export NIX_REMOTE_SYSTEMS=/etc/nix.machines\n" +
-      "export NIX_CURRENT_LOAD=/var/run/nix/current-load\n"
+      ''
+        export NIX_BUILD_HOOK=${nix}/libexec/nix/build-remote.pl
+        export NIX_REMOTE_SYSTEMS=/etc/nix.machines
+        export NIX_CURRENT_LOAD=/var/run/nix/current-load
+      ''
     else "");
 
               
-- 
GitLab


From 339839a1342cd18d5830efa569e027a23c5ffad6 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 25 Jul 2008 13:33:10 +0000
Subject: [PATCH 0997/5331] * Some more programs to make setuid by default.

svn path=/nixos/trunk/; revision=12427
---
 system/options.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/system/options.nix b/system/options.nix
index 35f6f27319c..77c1f2f970b 100644
--- a/system/options.nix
+++ b/system/options.nix
@@ -2428,7 +2428,10 @@
   security = {
 
     setuidPrograms = mkOption {
-      default = ["passwd" "su" "crontab" "ping" "ping6"];
+      default = [
+        "passwd" "su" "crontab" "ping" "ping6"
+        "fusermount" "wodim" "cdrdao"
+      ];
       description = "
         Only the programs listed here will be made setuid root (through
         a wrapper program).  It's better to set
-- 
GitLab


From 02be8958205a7de898f2b670208b0c64bf75c368 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 25 Jul 2008 13:33:42 +0000
Subject: [PATCH 0998/5331] * Inline the builder.

svn path=/nixos/trunk/; revision=12428
---
 helpers/setuid/builder.sh  | 7 -------
 helpers/setuid/default.nix | 8 +++++---
 2 files changed, 5 insertions(+), 10 deletions(-)
 delete mode 100644 helpers/setuid/builder.sh

diff --git a/helpers/setuid/builder.sh b/helpers/setuid/builder.sh
deleted file mode 100644
index 574a73ac11c..00000000000
--- a/helpers/setuid/builder.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-source $stdenv/setup
-
-ensureDir $out/bin
-
-gcc -Wall -O2 -DWRAPPER_DIR=\"$wrapperDir\" $setuidWrapper -o $out/bin/setuid-wrapper
-
-strip -s $out/bin/setuid-wrapper
diff --git a/helpers/setuid/default.nix b/helpers/setuid/default.nix
index 559ecca162f..362bd937cc4 100644
--- a/helpers/setuid/default.nix
+++ b/helpers/setuid/default.nix
@@ -2,7 +2,9 @@
 
 stdenv.mkDerivation {
   name = "setuid-wrapper";
-  builder = ./builder.sh;
-  setuidWrapper = ./setuid-wrapper.c;
-  inherit wrapperDir;
+  buildCommand = ''
+    ensureDir $out/bin
+    gcc -Wall -O2 -DWRAPPER_DIR=\"${wrapperDir}\" ${./setuid-wrapper.c} -o $out/bin/setuid-wrapper
+    strip -s $out/bin/setuid-wrapper
+  '';
 }
-- 
GitLab


From 274c67a363d7249f952177b7f0f91278c3b2bc53 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 25 Jul 2008 13:34:00 +0000
Subject: [PATCH 0999/5331] * Don't create a setuid wrapper for programs that
 don't exist.

svn path=/nixos/trunk/; revision=12429
---
 system/activate-configuration.sh | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/system/activate-configuration.sh b/system/activate-configuration.sh
index b58eb8c15d0..c7b1b412841 100644
--- a/system/activate-configuration.sh
+++ b/system/activate-configuration.sh
@@ -69,6 +69,7 @@ touch /var/run/utmp # must exist
 chmod 644 /var/run/utmp
 
 mkdir -m 0755 -p /var/run/nix/current-load # for distributed builds
+mkdir -m 0700 -p /var/run/nix/remote-stores
 
 mkdir -m 0755 -p /var/log
 
@@ -141,19 +142,17 @@ if test -d $wrapperDir; then rm -f $wrapperDir/*; fi
 mkdir -p $wrapperDir
 for i in @setuidPrograms@; do
     program=$(type -tp $i)
-    cp "$(type -tp setuid-wrapper)" $wrapperDir/$i
-
-    if [ -z "$program" ]
-    then
+    if test -z "$program"; then
 	# XXX: It would be preferable to detect this problem before
 	# `activate-configuration' is invoked.
 	echo "WARNING: No executable named \`$i' was found" >&2
 	echo "WARNING: but \`$i' was specified as a setuid program." >&2
+    else
+        cp "$(type -tp setuid-wrapper)" $wrapperDir/$i
+        echo -n "$program" > $wrapperDir/$i.real
+        chown root.root $wrapperDir/$i
+        chmod 4755 $wrapperDir/$i
     fi
-
-    echo -n $program > $wrapperDir/$i.real
-    chown root.root $wrapperDir/$i
-    chmod 4755 $wrapperDir/$i
 done
 
 @adjustSetuidOwner@ 
-- 
GitLab


From e40d6858d9b14bab57dfa285276febfb098296af Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 31 Jul 2008 14:13:35 +0000
Subject: [PATCH 1000/5331] * udev: create symlinks /dev/{cd,dvd,cdrw,dvdrw}.

svn path=/nixos/trunk/; revision=12456
---
 upstart-jobs/udev.nix | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/upstart-jobs/udev.nix b/upstart-jobs/udev.nix
index 2fcb1a53488..43cad5bc4db 100644
--- a/upstart-jobs/udev.nix
+++ b/upstart-jobs/udev.nix
@@ -14,17 +14,19 @@ let
     inherit firmwareDirs;
   };
     
-  nixRules = writeText "10-nix.rules" ''
+  nixRules = writeText "90-nix.rules" ''
   
     # Miscellaneous devices.
     KERNEL=="sonypi",               MODE="0666"
     KERNEL=="kvm",                  MODE="0666"
     KERNEL=="kqemu",                NAME="%k", MODE="0666"
 
-    # Create a symlink for the CD-ROM device.
-    #KERNEL=="hd[a-z]", BUS=="ide", SYSFS{removable}=="1", SYSFS{device/media}=="cdrom", SYMLINK+="cdrom cdrom-%k"
-    #KERNEL=="sr[0-9]", BUS=="scsi", SYMLINK+="cdrom cdrom-%k"
-
+    # Create symlinks for CD/DVD devices.
+    ACTION=="add", SUBSYSTEM=="block", ENV{ID_CDROM}=="?*", SYMLINK+="cdrom cdrom-%k"
+    ACTION=="add", SUBSYSTEM=="block", ENV{ID_CDROM_CD_RW}=="?*", SYMLINK+="cdrw cdrw-%k"
+    ACTION=="add", SUBSYSTEM=="block", ENV{ID_CDROM_DVD}=="?*", SYMLINK+="dvd dvd-%k"
+    ACTION=="add", SUBSYSTEM=="block", ENV{ID_CDROM_DVD_RW}=="?*", SYMLINK+="dvdrw dvdrw-%k"
+    
     # ALSA sound devices.
     KERNEL=="controlC[0-9]*",       NAME="snd/%k", MODE="${cfg.sndMode}"
     KERNEL=="hwC[D0-9]*",           NAME="snd/%k", MODE="${cfg.sndMode}"
@@ -46,7 +48,8 @@ let
       ensureDir $out
       ln -s ${nixRules} $out/${nixRules.name}
       shopt -s nullglob
-      cp ${udev}/etc/udev/rules.d/*.rules $out/
+      cp ${udev}/*/udev/rules.d/*.rules $out/
+      
       ${if config.boot.hardwareScan then
         ''
           substituteInPlace $out/80-drivers.rules \
@@ -58,7 +61,7 @@ let
         ''
       }
       for i in ${toString extraUdevPkgs}; do
-        for j in $i/etc/udev/rules.d/*; do
+        for j in $i/*/udev/rules.d/*; do
           ln -s $j $out/$(basename $j)
         done
       done
-- 
GitLab


From 3721828bc65261c8f17a1a02ca50f71990bd4fad Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Fri, 1 Aug 2008 09:17:23 +0000
Subject: [PATCH 1001/5331] Using ISO 9660:1999 for live optical disks..

svn path=/nixos/trunk/; revision=12460
---
 helpers/make-iso9660-image.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/helpers/make-iso9660-image.sh b/helpers/make-iso9660-image.sh
index 9330002f0b4..e4997c8112a 100644
--- a/helpers/make-iso9660-image.sh
+++ b/helpers/make-iso9660-image.sh
@@ -61,7 +61,7 @@ cat pathlist | sed -e 's/=\(.*\)=\(.*\)=/\\=\1=\2\\=/' | tee pathlist.safer
 
 
 ensureDir $out/iso
-genCommand="genisoimage -r -J $bootFlags -hide-rr-moved -graft-points -path-list pathlist.safer"
+genCommand="genisoimage -iso-level 4 -r -J $bootFlags -hide-rr-moved -graft-points -path-list pathlist.safer"
 if test -z "$compressImage"; then
     $genCommand -o $out/iso/$isoName
 else
-- 
GitLab


From cb8067cdb5c827f4969e1ac95978b17036750fda Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Mon, 4 Aug 2008 09:36:11 +0000
Subject: [PATCH 1002/5331] More configuratbility for vsFTPd upstart job.

svn path=/nixos/trunk/; revision=12472
---
 system/options.nix       | 21 +++++++++++++++++++++
 upstart-jobs/default.nix |  3 ++-
 upstart-jobs/vsftpd.nix  | 25 ++++++++++++++++++++++++-
 3 files changed, 47 insertions(+), 2 deletions(-)

diff --git a/system/options.nix b/system/options.nix
index 77c1f2f970b..b2b907733c9 100644
--- a/system/options.nix
+++ b/system/options.nix
@@ -1684,6 +1684,27 @@
           Whether to enable the anonymous FTP user.
         ";
       };
+
+      writeEnable = mkOption {
+        default = false;
+	description = "
+	  Whether any write activity is permitted to users.
+	";
+      };
+
+      anonymousUploadEnable = mkOption {
+        default = false;
+	description = "
+	  Whether any uploads are permitted to anonymous users.
+	";
+      };
+
+      anonymousMkdirEnable = mkOption {
+        default = false;
+	description = "
+	  Whether mkdir is permitted to anonymous users.
+	";
+      };
     };
     
     printing = {
diff --git a/upstart-jobs/default.nix b/upstart-jobs/default.nix
index 2b851d051af..ce2cf17060d 100644
--- a/upstart-jobs/default.nix
+++ b/upstart-jobs/default.nix
@@ -317,7 +317,8 @@ let
   ++ optional config.services.vsftpd.enable
     (import ../upstart-jobs/vsftpd.nix {
       inherit (pkgs) vsftpd;
-      inherit (config.services.vsftpd) anonymousUser;
+      inherit (config.services.vsftpd) anonymousUser 
+        writeEnable anonymousUploadEnable anonymousMkdirEnable;
     })
 
   # X Font Server
diff --git a/upstart-jobs/vsftpd.nix b/upstart-jobs/vsftpd.nix
index 67a11e77b2f..01a509ea679 100644
--- a/upstart-jobs/vsftpd.nix
+++ b/upstart-jobs/vsftpd.nix
@@ -1,4 +1,6 @@
-{ vsftpd, anonymousUser }:
+{ vsftpd, anonymousUser
+, anonymousUploadEnable, anonymousMkdirEnable, writeEnable
+}:
 
 {
   name = "vsftpd";
@@ -40,6 +42,27 @@ start script
 "anonymous_enable=YES"
     else
 "anonymous_enable=NO") +
+(if writeEnable then 
+"
+write_enable=YES"
+else
+"
+write_enable=NO"
+) +
+(if anonymousUploadEnable then 
+"
+anon_upload_enable=YES"
+else
+"
+anon_upload_enable=NO"
+) +
+(if anonymousMkdirEnable then 
+"
+anon_mkdir_write_enable=YES"
+else
+"
+anon_mkdir_write_enable=NO"
+) +
 "
 background=NO
 listen=YES
-- 
GitLab


From 3ea5264b1b613aff41b4bfb42d76f10fa007abae Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 4 Aug 2008 14:58:26 +0000
Subject: [PATCH 1003/5331] * Option `--dry-run' to see what's going to be
 built. * Properly parse the command line arguments before doing anything  
 (reported by Andres).

svn path=/nixos/trunk/; revision=12486
---
 installer/nixos-rebuild.sh | 29 ++++++++++++++++++++++++-----
 1 file changed, 24 insertions(+), 5 deletions(-)

diff --git a/installer/nixos-rebuild.sh b/installer/nixos-rebuild.sh
index c7db828cd45..9bb4b00a670 100644
--- a/installer/nixos-rebuild.sh
+++ b/installer/nixos-rebuild.sh
@@ -1,9 +1,6 @@
 #! @shell@ -e
 
 
-# What are we supposed to do?
-action="$1"
-
 showSyntax() {
     # !!! more or less cut&paste from
     # system/switch-to-configuration.sh (which we call, of course).
@@ -19,8 +16,30 @@ EOF
     exit 1
 }
 
+
+# Parse the command line.
+extraBuildFlags=
+dryRun=
+action=
+
+for i in "$@"; do
+    if test "$i" = "--help"; then
+        showSyntax
+    elif test "$i" = "--dry-run"; then
+        extraBuildFlags="$extraBuildFlags --dry-run"
+        dryRun=1
+    elif test "$i" = "switch" -o "$i" = "boot" -o "$i" = "test" -o "$i" = "build"; then
+        action="$i"
+    else
+        echo "$0: unknown option \`$i'"
+        exit 1
+    fi
+done
+
 if test -z "$action"; then showSyntax; fi
 
+if test -n "$dryRun"; then action=build; fi
+
 
 # Allow the location of NixOS sources and the system configuration
 # file to be overridden.
@@ -68,10 +87,10 @@ fi
 # or "boot"), or just build it and create a symlink "result" in the
 # current directory (for "build" and "test").
 if test "$action" = "switch" -o "$action" = "boot"; then
-    nix-env -p /nix/var/nix/profiles/system -f $NIXOS --set -A system
+    nix-env -p /nix/var/nix/profiles/system -f $NIXOS --set -A system $extraBuildFlags
     pathToConfig=/nix/var/nix/profiles/system
 elif test "$action" = "test" -o "$action" = "build"; then
-    nix-build $NIXOS -A system -K -k
+    nix-build $NIXOS -A system -K -k $extraBuildFlags
     pathToConfig=./result
 else
     showSyntax
-- 
GitLab


From 64fc690afaf83b3458e5de41b893327a4f628a17 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 4 Aug 2008 15:04:06 +0000
Subject: [PATCH 1004/5331] * Make that `dry-run' (as an action) instead of
 `--dry-run'.

svn path=/nixos/trunk/; revision=12488
---
 installer/nixos-rebuild.sh | 31 +++++++++++++++----------------
 1 file changed, 15 insertions(+), 16 deletions(-)

diff --git a/installer/nixos-rebuild.sh b/installer/nixos-rebuild.sh
index 9bb4b00a670..5ee1d29dd9c 100644
--- a/installer/nixos-rebuild.sh
+++ b/installer/nixos-rebuild.sh
@@ -5,13 +5,14 @@ showSyntax() {
     # !!! more or less cut&paste from
     # system/switch-to-configuration.sh (which we call, of course).
     cat <<EOF
-Usage: $0 [switch|boot|test|build]
-
-switch: make the configuration the boot default and activate now
-boot:   make the configuration the boot default
-test:   activate the configuration, but don't make it the boot default
-build:  build the configuration, but don't make it the default or
-        activate it
+Usage: $0 [switch|boot|test|build|dry-run]
+
+switch:  make the configuration the boot default and activate now
+boot:    make the configuration the boot default
+test:    activate the configuration, but don't make it the boot default
+build:   build the configuration, but don't make it the default or
+         activate it
+dry-run: just show what store paths would be built/downloaded
 EOF
     exit 1
 }
@@ -19,16 +20,12 @@ EOF
 
 # Parse the command line.
 extraBuildFlags=
-dryRun=
 action=
 
 for i in "$@"; do
     if test "$i" = "--help"; then
         showSyntax
-    elif test "$i" = "--dry-run"; then
-        extraBuildFlags="$extraBuildFlags --dry-run"
-        dryRun=1
-    elif test "$i" = "switch" -o "$i" = "boot" -o "$i" = "test" -o "$i" = "build"; then
+    elif test "$i" = switch -o "$i" = boot -o "$i" = test -o "$i" = build -o "$i" = dry-run; then
         action="$i"
     else
         echo "$0: unknown option \`$i'"
@@ -38,7 +35,9 @@ done
 
 if test -z "$action"; then showSyntax; fi
 
-if test -n "$dryRun"; then action=build; fi
+if test "$action" = dry-run; then
+    extraBuildFlags="$extraBuildFlags --dry-run"
+fi
 
 
 # Allow the location of NixOS sources and the system configuration
@@ -86,10 +85,10 @@ fi
 # Either upgrade the configuration in the system profile (for "switch"
 # or "boot"), or just build it and create a symlink "result" in the
 # current directory (for "build" and "test").
-if test "$action" = "switch" -o "$action" = "boot"; then
+if test "$action" = switch -o "$action" = boot; then
     nix-env -p /nix/var/nix/profiles/system -f $NIXOS --set -A system $extraBuildFlags
     pathToConfig=/nix/var/nix/profiles/system
-elif test "$action" = "test" -o "$action" = "build"; then
+elif test "$action" = test -o "$action" = build -o "$action" = dry-run; then
     nix-build $NIXOS -A system -K -k $extraBuildFlags
     pathToConfig=./result
 else
@@ -99,7 +98,7 @@ fi
 
 # If we're not just building, then make the new configuration the boot
 # default and/or activate it now.
-if test "$action" = "switch" -o "$action" = "boot" -o "$action" = "test"; then
+if test "$action" = switch -o "$action" = boot -o "$action" = test; then
     $pathToConfig/bin/switch-to-configuration "$action"
 fi
 
-- 
GitLab


From afdfff7ed8957c6b3601e70184cf633ff82bce1d Mon Sep 17 00:00:00 2001
From: Sander van der Burg <s.vanderburg@tudelft.nl>
Date: Wed, 6 Aug 2008 13:41:08 +0000
Subject: [PATCH 1005/5331] Added common lib support for tomcat

svn path=/nixos/trunk/; revision=12511
---
 system/options.nix      |  5 +++++
 upstart-jobs/tomcat.nix | 19 ++++++++++++++++++-
 2 files changed, 23 insertions(+), 1 deletion(-)

diff --git a/system/options.nix b/system/options.nix
index b2b907733c9..551d4f5d3a2 100644
--- a/system/options.nix
+++ b/system/options.nix
@@ -1469,6 +1469,11 @@
         default = "";
         description ="Location where shared libraries are stored. Leave empty to use the baseDir.";
       };
+      
+      commonLibFrom = mkOption {
+        default = "";
+        description ="Location where common libraries are stored. Leave empty to use the baseDir.";
+      };
     };
 
     disnix = {
diff --git a/upstart-jobs/tomcat.nix b/upstart-jobs/tomcat.nix
index 6ebdf0069ff..6ad47607c21 100644
--- a/upstart-jobs/tomcat.nix
+++ b/upstart-jobs/tomcat.nix
@@ -34,6 +34,7 @@ in
         then    
             mkdir -p ${cfg.baseDir}/webapps
             mkdir -p ${cfg.baseDir}/shared
+	    mkdir -p ${cfg.baseDir}/lib
             cp -av ${pkgs.tomcat6}/{conf,temp,logs} ${cfg.baseDir}
         fi
         
@@ -48,7 +49,7 @@ in
                 cp -rL $i ${cfg.baseDir}/webapps
             done
         fi
-        
+	
         # Fix permissions
         
         chown -R ${cfg.user} ${cfg.baseDir}
@@ -63,6 +64,22 @@ in
             chmod -v 644 $i
         done
 
+	# Deploy all common libraries
+		
+	rm -rf ${cfg.baseDir}/lib/*
+	
+	if test "${cfg.commonLibFrom}" = ""
+	then
+	    commonLibFrom="${pkgs.tomcat6}/lib";
+	else
+	    commonLibFrom="${cfg.commonLibFrom}";
+	fi
+	
+	for i in $commonLibFrom/*.jar
+	do
+	    ln -s $i ${cfg.baseDir}/lib
+	done
+
         # Deploy all shared libraries
         
         if ! test "${cfg.sharedLibFrom}" = ""
-- 
GitLab


From f652a0836a3714e29f7349ec247a2cd567b1357f Mon Sep 17 00:00:00 2001
From: Sander van der Burg <s.vanderburg@tudelft.nl>
Date: Wed, 6 Aug 2008 15:07:29 +0000
Subject: [PATCH 1006/5331] Added support for custom context.xml

svn path=/nixos/trunk/; revision=12513
---
 system/options.nix      | 9 +++++++--
 upstart-jobs/tomcat.nix | 9 +++++++++
 2 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/system/options.nix b/system/options.nix
index 551d4f5d3a2..5fd90329e2b 100644
--- a/system/options.nix
+++ b/system/options.nix
@@ -1467,12 +1467,17 @@
       
       sharedLibFrom = mkOption {
         default = "";
-        description ="Location where shared libraries are stored. Leave empty to use the baseDir.";
+        description = "Location where shared libraries are stored. Leave empty to use the baseDir.";
       };
       
       commonLibFrom = mkOption {
         default = "";
-        description ="Location where common libraries are stored. Leave empty to use the baseDir.";
+        description = "Location where common libraries are stored. Leave empty to use the baseDir.";
+      };
+      
+      contextXML = mkOption {
+        default = "";
+	description = "Location of the context.xml to use. Leave empty to use the default.";
       };
     };
 
diff --git a/upstart-jobs/tomcat.nix b/upstart-jobs/tomcat.nix
index 6ad47607c21..503d1cf3963 100644
--- a/upstart-jobs/tomcat.nix
+++ b/upstart-jobs/tomcat.nix
@@ -38,6 +38,15 @@ in
             cp -av ${pkgs.tomcat6}/{conf,temp,logs} ${cfg.baseDir}
         fi
         
+	# Deploy context.xml
+	
+	if test "${cfg.contextXML}" = ""
+	then
+	    cp ${pkgs.tomcat6}/conf/context.xml.default ${cfg.baseDir}/conf/context.xml
+	else
+	    cp ${cfg.contextXML} ${cfg.baseDir}/conf/context.xml
+	fi
+		
         # Deploy all webapplications
         
         if ! test "${cfg.deployFrom}" = ""
-- 
GitLab


From f5e61dfa0cb877adcfc50d41df674980dc6f2945 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 6 Aug 2008 15:48:12 +0000
Subject: [PATCH 1007/5331] * Provide a mount command that knows how to mount
 ntfs-3g and cifs   file systems.  The main advantage is that this allows
 mounting of   such file systems from the `filesystems' configuration option
 at   boot time, e.g.

    fileSystems = [
      ...
      { mountPoint = "/windows";
        device = "/dev/disk/by-uuid/9EA4B22EA4B208B3";
        fsType = "ntfs-3g";
      }
    ];

  The list of file system helpers should of course be made
  configurable.

svn path=/nixos/trunk/; revision=12516
---
 system/system.nix | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/system/system.nix b/system/system.nix
index bc83b355ed9..830fd924e9c 100644
--- a/system/system.nix
+++ b/system/system.nix
@@ -218,11 +218,29 @@ rec {
   };
 
 
+  # A patched `mount' command that looks in a directory in the Nix
+  # store instead of in /sbin for mount helpers (like mount.ntfs-3g or
+  # mount.cifs).
+  mount = import "${nixpkgsPath}/pkgs/os-specific/linux/util-linux" {
+    inherit (pkgs) fetchurl stdenv;
+    buildMountOnly = true;
+    mountHelpers = pkgs.buildEnv {
+      name = "mount-helpers";
+      paths = [
+        pkgs.ntfs3g
+        pkgs.mount_cifs
+      ];
+      pathsToLink = "/sbin";
+    } + "/sbin";
+  };
+  
+
   # The packages you want in the boot environment.
   systemPathList = [
     # Better leave them here - they are small, needed,
     # and hard to refer from anywhere outside.
     modprobe # must take precedence over module_init_tools
+    mount # must take precedence over util-linux
     nix
     nixosTools.nixosInstall
     nixosTools.nixosRebuild
-- 
GitLab


From 92560a1dc094f10ede2fc2841409c77532c231e8 Mon Sep 17 00:00:00 2001
From: Nicolas Pierron <nicolas.b.pierron@gmail.com>
Date: Wed, 6 Aug 2008 17:39:05 +0000
Subject: [PATCH 1008/5331] Use the new scheme of configuration evaluation.

svn path=/nixos/trunk/; revision=12519
---
 system/system.nix | 22 +++++++++++++++-------
 1 file changed, 15 insertions(+), 7 deletions(-)

diff --git a/system/system.nix b/system/system.nix
index 830fd924e9c..a8e84caebfa 100644
--- a/system/system.nix
+++ b/system/system.nix
@@ -5,13 +5,23 @@
 }:
 
 rec {
+  configComponents = [
+    configuration
+    optionDeclarations
+  ];
+
+  noOption = name: values:
+    abort "${name}: Used without option declaration.";
 
   # Make a configuration object from which we can retrieve option
   # values.
-  config = pkgs.lib.addDefaultOptionValues optionDeclarations configuration;
+  config =
+    pkgs.lib.finalReferenceOptionSets
+      (pkgs.lib.mergeOptionSets noOption)
+      pkgs configComponents;
 
-  optionDeclarations = import ./options.nix {inherit pkgs; inherit (pkgs.lib) mkOption;};
-    
+  optionDeclarations =
+    import ./options.nix {inherit pkgs; inherit (pkgs.lib) mkOption;};
 
   pkgs = import "${nixpkgsPath}/pkgs/top-level/all-packages.nix" {system = platform;};
 
@@ -438,8 +448,6 @@ rec {
         configuration = x//{boot=((x.boot)//{grubDevice = "";});};}).system) 
       config.nesting.children; 
     configurationName = config.boot.configurationName;
-  }) (pkgs.lib.getAttr ["environment" "checkConfigurationOptions"] 
-        optionDeclarations.environment.checkConfigurationOptions.default
-        configuration) 
-      optionDeclarations configuration;
+  }) config.environment.checkConfigurationOptions
+     optionDeclarations config;
 }
-- 
GitLab


From 53bdeb43e3d1bf1518974739cfd662d65f108913 Mon Sep 17 00:00:00 2001
From: Nicolas Pierron <nicolas.b.pierron@gmail.com>
Date: Wed, 6 Aug 2008 18:43:53 +0000
Subject: [PATCH 1009/5331] Rewrite the optionDeclarations to collect all
 options definitions.

svn path=/nixos/trunk/; revision=12521
---
 system/system.nix | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/system/system.nix b/system/system.nix
index a8e84caebfa..59646637339 100644
--- a/system/system.nix
+++ b/system/system.nix
@@ -7,7 +7,7 @@
 rec {
   configComponents = [
     configuration
-    optionDeclarations
+    (import ./options.nix {inherit pkgs; inherit (pkgs.lib) mkOption;})
   ];
 
   noOption = name: values:
@@ -21,7 +21,10 @@ rec {
       pkgs configComponents;
 
   optionDeclarations =
-    import ./options.nix {inherit pkgs; inherit (pkgs.lib) mkOption;};
+    pkgs.lib.finalOptionSetsFun
+      pkgs.lib.filterOptionSets
+      pkgs configComponents
+      config;
 
   pkgs = import "${nixpkgsPath}/pkgs/top-level/all-packages.nix" {system = platform;};
 
-- 
GitLab


From 791d8bbc66889edb67f021e0ddb0849d14c6f6c9 Mon Sep 17 00:00:00 2001
From: Nicolas Pierron <nicolas.b.pierron@gmail.com>
Date: Wed, 6 Aug 2008 19:26:47 +0000
Subject: [PATCH 1010/5331] Add udev extra option (addUdevPkgs). Add some merge
 functions.

svn path=/nixos/trunk/; revision=12523
---
 system/options.nix       | 13 +++++++++++++
 upstart-jobs/default.nix |  3 ++-
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/system/options.nix b/system/options.nix
index 5fd90329e2b..ac1262d7f9b 100644
--- a/system/options.nix
+++ b/system/options.nix
@@ -145,6 +145,8 @@
       description = ''
         A list of additional packages supplying kernel modules.
       '';
+      merge = name: list:
+        pkgsArg: pkgs.lib.concatMap (f: f pkgsArg) list;
     };
 
     kernelModules = mkOption {
@@ -1764,6 +1766,15 @@
           a package, or have an interactive process of extraction
           and cannot be redistributed.
         ";
+        merge = pkgs.lib.mergeListOption;
+      };
+
+      addUdevPkgs = mkOption {
+        default = [];
+        description = "
+          List of packages containing udev rules.
+        ";
+        merge = pkgs.lib.mergeListOption;
       };
       
       sndMode = mkOption {
@@ -2752,6 +2763,8 @@ root        ALL=(ALL) SETENV: ALL
         packages.  The function will be called with the Nix Packages
         collection as its argument for convenience.
       ";
+      merge = name: list:
+        pkgsArg: pkgs.lib.concatMap (f: f pkgsArg) list;
     };
 
     nix = mkOption {
diff --git a/upstart-jobs/default.nix b/upstart-jobs/default.nix
index ce2cf17060d..9882c590930 100644
--- a/upstart-jobs/default.nix
+++ b/upstart-jobs/default.nix
@@ -100,7 +100,8 @@ let
         ++ config.services.udev.addFirmware;
       extraUdevPkgs =
            pkgs.lib.optional config.services.hal.enable pkgs.hal
-        ++ pkgs.lib.optional config.hardware.enableGo7007 kernelPackages.wis_go7007;
+        ++ pkgs.lib.optional config.hardware.enableGo7007 kernelPackages.wis_go7007
+        ++ config.services.udev.addUdevPkgs;
     })
       
     # Makes LVM logical volumes available. 
-- 
GitLab


From 014b33637c41c38c49454f9c4ca91a02eda3562a Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Thu, 7 Aug 2008 10:09:17 +0000
Subject: [PATCH 1011/5331] Added an option to easily allow everyone to use
 "at".

svn path=/nixos/trunk/; revision=12531
---
 system/options.nix       | 8 ++++++++
 upstart-jobs/atd.nix     | 3 ++-
 upstart-jobs/default.nix | 1 +
 3 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/system/options.nix b/system/options.nix
index ac1262d7f9b..af8217ff9af 100644
--- a/system/options.nix
+++ b/system/options.nix
@@ -650,6 +650,14 @@
           Whether to enable the `at' daemon, a command scheduler.
         '';
       };
+
+      allowEveryone = mkOption {
+        default = false;
+	description = ''
+	  Whether to make /var/spool/at{jobs,spool} writeable 
+	  by everyone (and sticky).
+	'';
+      };
     };
 
     locate = {
diff --git a/upstart-jobs/atd.nix b/upstart-jobs/atd.nix
index 260c3001c35..8a775d0c5d7 100644
--- a/upstart-jobs/atd.nix
+++ b/upstart-jobs/atd.nix
@@ -1,4 +1,4 @@
-{ at }:
+{ at, config }:
 
 let uid = (import ../system/ids.nix).uids.atd;
     gid = (import ../system/ids.nix).gids.atd;
@@ -44,6 +44,7 @@ start script
      fi
    done
    chmod 1770 "$spooldir" "$jobdir"
+   ${if config.allowEveryone then ''chmod a+rwxt "$spooldir" "$jobdir" '' else ""}
    if [ ! -f "$etcdir"/at.deny ]
    then
        touch "$etcdir"/at.deny && \
diff --git a/upstart-jobs/default.nix b/upstart-jobs/default.nix
index 9882c590930..fb2e6f5ed60 100644
--- a/upstart-jobs/default.nix
+++ b/upstart-jobs/default.nix
@@ -173,6 +173,7 @@ let
   ++ optional config.services.atd.enable
     (import ../upstart-jobs/atd.nix {
       at = pkgs.at;
+      config = config.services.atd;
      })
 
   # DHCP client.
-- 
GitLab


From 2bcb5a8efe8b16ce71053070cd57fdfaad9b38b7 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Thu, 7 Aug 2008 10:23:20 +0000
Subject: [PATCH 1012/5331] Removed tabs in nix-expressions introduced by me in
 nixos/ tree.

svn path=/nixos/trunk/; revision=12532
---
 system/fontdir.nix | 98 +++++++++++++++++++++++-----------------------
 system/options.nix | 28 ++++++-------
 2 files changed, 63 insertions(+), 63 deletions(-)

diff --git a/system/fontdir.nix b/system/fontdir.nix
index adb6cd64df0..42a1360cdb3 100644
--- a/system/fontdir.nix
+++ b/system/fontdir.nix
@@ -1,54 +1,54 @@
 args : with args; with builderDefs {src="";} null;
-	let localDefs = builderDefs rec {
-		src = "";/* put a fetchurl here */
+  let localDefs = builderDefs rec {
+    src = "";/* put a fetchurl here */
 
-		buildInputs = [mkfontdir mkfontscale ttmkfdir];
-		configureFlags = [];
-		fontDirs = import ./fonts.nix {inherit pkgs config;};
-		installPhase = FullDepEntry ("
-		list='';
-		for i in ${toString fontDirs} ; do
-			if [ -d \$i/ ]; then
-				list=\"\$list \$i\";
-			fi;
-		done
-		list=\$(find \$list -name fonts.dir);
-		fontDirs='';
-		for i in \$list ; do
-			fontDirs=\"\$fontDirs \$(dirname \$i)\";
-		done;
-		mkdir -p \$out/share/X11-fonts/; 
-		for i in \$(find \$fontDirs -type f -o -type l); do
-			j=\${i##*/}
-			if ! test -e \$out/share/X11-fonts/\${j}; then
-				ln -s \$i \$out/share/X11-fonts/\${j};
-			fi;
-		done;
-		cd \$out/share/X11-fonts/
-		rm fonts.dir
-		rm fonts.scale
-		rm fonts.alias
-		mkfontdir
-		mkfontscale
-		mv fonts.scale fonts.scale.old
-		mv fonts.dir fonts.dir.old
-		ttmkfdir
-		cat fonts.scale.old >> fonts.scale
-		cat fonts.dir.old >> fonts.dir
-		rm fonts.dir.old
-		rm fonts.scale.old
-		cat \$( find ${fontalias}/ -name fonts.alias) >fonts.alias
-	") ["minInit" "addInputs"];
-	} null; /* null is a terminator for sumArgs */
-	in with localDefs;
+    buildInputs = [mkfontdir mkfontscale ttmkfdir];
+    configureFlags = [];
+    fontDirs = import ./fonts.nix {inherit pkgs config;};
+    installPhase = FullDepEntry ("
+    list='';
+    for i in ${toString fontDirs} ; do
+      if [ -d \$i/ ]; then
+        list=\"\$list \$i\";
+      fi;
+    done
+    list=\$(find \$list -name fonts.dir);
+    fontDirs='';
+    for i in \$list ; do
+      fontDirs=\"\$fontDirs \$(dirname \$i)\";
+    done;
+    mkdir -p \$out/share/X11-fonts/; 
+    for i in \$(find \$fontDirs -type f -o -type l); do
+      j=\${i##*/}
+      if ! test -e \$out/share/X11-fonts/\${j}; then
+        ln -s \$i \$out/share/X11-fonts/\${j};
+      fi;
+    done;
+    cd \$out/share/X11-fonts/
+    rm fonts.dir
+    rm fonts.scale
+    rm fonts.alias
+    mkfontdir
+    mkfontscale
+    mv fonts.scale fonts.scale.old
+    mv fonts.dir fonts.dir.old
+    ttmkfdir
+    cat fonts.scale.old >> fonts.scale
+    cat fonts.dir.old >> fonts.dir
+    rm fonts.dir.old
+    rm fonts.scale.old
+    cat \$( find ${fontalias}/ -name fonts.alias) >fonts.alias
+  ") ["minInit" "addInputs"];
+  } null; /* null is a terminator for sumArgs */
+  in with localDefs;
 stdenv.mkDerivation rec {
-	name = "X11-fonts";
-	builder = writeScript (name + "-builder")
-		(textClosure localDefs 
-			[installPhase doForceShare doPropagate]);
-	meta = {
-		description = "
-		Directory to contain all X11 fonts requested.
+  name = "X11-fonts";
+  builder = writeScript (name + "-builder")
+    (textClosure localDefs 
+      [installPhase doForceShare doPropagate]);
+  meta = {
+    description = "
+    Directory to contain all X11 fonts requested.
 ";
-	};
+  };
 }
diff --git a/system/options.nix b/system/options.nix
index af8217ff9af..a5e51a68ae6 100644
--- a/system/options.nix
+++ b/system/options.nix
@@ -653,10 +653,10 @@
 
       allowEveryone = mkOption {
         default = false;
-	description = ''
-	  Whether to make /var/spool/at{jobs,spool} writeable 
-	  by everyone (and sticky).
-	'';
+        description = ''
+          Whether to make /var/spool/at{jobs,spool} writeable 
+          by everyone (and sticky).
+        '';
       };
     };
 
@@ -1487,7 +1487,7 @@
       
       contextXML = mkOption {
         default = "";
-	description = "Location of the context.xml to use. Leave empty to use the default.";
+        description = "Location of the context.xml to use. Leave empty to use the default.";
       };
     };
 
@@ -1707,23 +1707,23 @@
 
       writeEnable = mkOption {
         default = false;
-	description = "
-	  Whether any write activity is permitted to users.
-	";
+        description = "
+          Whether any write activity is permitted to users.
+        ";
       };
 
       anonymousUploadEnable = mkOption {
         default = false;
-	description = "
-	  Whether any uploads are permitted to anonymous users.
-	";
+        description = "
+          Whether any uploads are permitted to anonymous users.
+        ";
       };
 
       anonymousMkdirEnable = mkOption {
         default = false;
-	description = "
-	  Whether mkdir is permitted to anonymous users.
-	";
+        description = "
+          Whether mkdir is permitted to anonymous users.
+        ";
       };
     };
     
-- 
GitLab


From 4d6548e94cf77c18747ee3fbfe85d36ad652d6f3 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 8 Aug 2008 15:49:57 +0000
Subject: [PATCH 1013/5331] * Use the tools from klibc in the initrd instead of
 the static-tools.   This makes the initrd a few megabytes smaller. * Use
 run-init from klibc to delete everything in the initrd ramfs   prior to
 switching to the real root FS. * Removed the stage2Init argument.

svn path=/nixos/trunk/; revision=12544
---
 boot/boot-stage-1-init.sh   | 68 +++++++++++++++++++------------------
 boot/boot-stage-1.nix       | 20 +++++------
 configuration/rescue-cd.nix |  5 ++-
 system/system.nix           |  7 ++--
 4 files changed, 48 insertions(+), 52 deletions(-)

diff --git a/boot/boot-stage-1-init.sh b/boot/boot-stage-1-init.sh
index 95ae1e34d7a..f992637184c 100644
--- a/boot/boot-stage-1-init.sh
+++ b/boot/boot-stage-1-init.sh
@@ -26,7 +26,7 @@ done
 
 # Mount special file systems.
 mkdir -p /etc # to shut up mount
-touch /etc/fstab # idem
+echo -n > /etc/fstab # idem
 mkdir -p /proc
 mount -t proc none /proc
 mkdir -p /sys
@@ -34,7 +34,7 @@ mount -t sysfs none /sys
 
 
 # Process the kernel command line.
-stage2Init=@stage2Init@
+stage2Init=
 for o in $(cat /proc/cmdline); do
     case $o in
         init=*)
@@ -66,6 +66,10 @@ for i in @modules@; do
 done
 
 
+# Create /dev/null.
+mknod /dev/null c 1 3
+
+
 # Try to resume - all modules are loaded now.
 if test -e /sys/power/tuxonice/resume; then
     if test -n "$(cat /sys/power/tuxonice/resume)"; then
@@ -74,14 +78,14 @@ if test -e /sys/power/tuxonice/resume; then
     fi
 fi
 
-echo "@resumeDevice@" > /sys/power/resume || echo "Failed to resume..."
+echo "@resumeDevice@" > /sys/power/resume 2> /dev/null || echo "Failed to resume..."
 echo shutdown > /sys/power/disk
 
 
 # Create device nodes in /dev.
-mknod -m 0666 /dev/null c 1 3
 export UDEV_CONFIG_FILE=/udev.conf
 echo 'udev_rules="/no-rules"' > $UDEV_CONFIG_FILE
+echo -n > /no-rules
 udevd --daemon
 udevadm trigger
 udevadm settle
@@ -122,8 +126,7 @@ mountFS() {
         if test $(($fsckResult | 2)) = $fsckResult; then
             echo "fsck finished, rebooting..."
             sleep 3
-            # reboot -f -d !!! don't have reboot yet
-            fail
+            reboot
         fi
 
         if test $(($fsckResult | 4)) = $fsckResult; then
@@ -138,13 +141,12 @@ mountFS() {
     fi
 
     # Mount read-writable.
-    mount -n -t "$fsType" -o "$options" "$device" /mnt/root$mountPoint || fail
+    mount -t "$fsType" -o "$options" "$device" /mnt-root$mountPoint || fail
 }
 
 
 # Try to find and mount the root device.
-mkdir /mnt
-mkdir /mnt/root
+mkdir /mnt-root
 
 echo "mounting the root device.... (fix: sleeping 5 seconds to wait for upcoming usb drivers)"
 sleep 5
@@ -157,22 +159,22 @@ if test -n "@autoDetectRootDevice@"; then
     for i in /sys/block/*; do
         if test "$(cat $i/removable)" = "1"; then
 
-            echo "  in $(basename $i)..."
+            echo "  in $i..."
 
             set -- $(IFS=: ; echo $(cat $i/dev))
             major="$1"
             minor="$2"
 
             # Create a device node for this device.
-            rm -f /dev/tmpdev
+            nuke /dev/tmpdev # don't have `rm' in klibc
             mknod /dev/tmpdev b "$major" "$minor"
 
-            if mount -n -o ro -t iso9660 /dev/tmpdev /mnt/root; then
-                if test -e "/mnt/root/@rootLabel@"; then
+            if mount -o ro -t iso9660 /dev/tmpdev /mnt-root; then
+                if test -e "/mnt-root/@rootLabel@"; then
                     found=1
                     break
                 fi
-                umount /mnt/root
+                umount /mnt-root
             fi
         
         fi
@@ -198,7 +200,7 @@ else
         options=${optionss[$n]}
 
         # !!! Really quick hack to support bind mounts, i.e., where
-        # the "device" should be taken relative to /mnt/root, not /.
+        # the "device" should be taken relative to /mnt-root, not /.
         # Assume that every device that start with / but doesn't
         # start with /dev or LABEL= is a bind mount.
         case $device in
@@ -207,7 +209,7 @@ else
             LABEL=*)
                 ;;
             /*)
-                device=/mnt/root$device
+                device=/mnt-root$device
                 ;;
         esac
 
@@ -221,30 +223,30 @@ fi
 
 # If this is a live-CD/DVD, then union-mount a tmpfs on top of the
 # original root.
-targetRoot=/mnt/root
+targetRoot=/mnt-root
 if test -n "@isLiveCD@"; then
-    mkdir /mnt/tmpfs
-    mount -n -t tmpfs -o "mode=755" none /mnt/tmpfs
-    mkdir /mnt/union
-    mount -t aufs -o dirs=/mnt/tmpfs=rw:$targetRoot=ro none /mnt/union
-    targetRoot=/mnt/union
+    mkdir /mnt-tmpfs
+    mount -t tmpfs -o "mode=755" none /mnt-tmpfs
+    mkdir /mnt-union
+    mount -t aufs -o dirs=/mnt-tmpfs=rw:$targetRoot=ro none /mnt-union
+    targetRoot=/mnt-union
 fi
 
 
 if test -n "$debug1mounts"; then fail; fi
 
 
-# Start stage 2.
-# !!! Note: we can't use pivot_root here (the kernel gods have
-# decreed), but we could use run-init from klibc, which deletes all
-# files in the initramfs, remounts the target root on /, and chroots.
-cd "$targetRoot"
-mount --move . /
-umount /proc # cleanup
-umount /sys
-
-if test -z "$stage2Init"; then fail; fi
+# `run-init' needs a /dev/console on the target FS.
+if ! test -e $targetRoot/dev/console; then
+    mkdir -p $targetRoot/dev
+    mknod $targetRoot/dev/console c 5 1
+fi
 
-exec chroot . $stage2Init
 
+# Start stage 2.  `run-init' deletes all files in the ramfs on the
+# current /.
+if test -z "$stage2Init"; then fail; fi
+umount /sys
+umount /proc
+exec run-init "$targetRoot" "$stage2Init"
 fail
diff --git a/boot/boot-stage-1.nix b/boot/boot-stage-1.nix
index 6cd0e7f6a2a..d5ab319894a 100644
--- a/boot/boot-stage-1.nix
+++ b/boot/boot-stage-1.nix
@@ -4,7 +4,7 @@
 # the second boot stage.  The closure of the result of this expression
 # is supposed to be put into an initial RAM disk (initrd).
 
-{ substituteAll, staticShell, staticTools
+{ substituteAll, staticShell, klibcShrunk
 , module_init_tools, extraUtils, modules, modulesDir
 
 , # Whether to find root device automatically using its label.
@@ -27,10 +27,6 @@
   # through a unionfs.
   isLiveCD
 
-, # The path of the stage 2 init to call once we've mounted the root
-  # device.
-  stage2Init ? "/init"
-
 , # Resume device. [major]:[minor]
   resumeDevice ? "ignore-this"
 }:
@@ -49,18 +45,18 @@ if !autoDetectRootDevice && mountPoints == [] then abort "You must specify the f
 
 substituteAll {
   src = ./boot-stage-1-init.sh;
+  
   isExecutable = true;
+  
   inherit staticShell modules modulesDir;
+  
   inherit autoDetectRootDevice isLiveCD mountPoints devices fsTypes optionss resumeDevice;
+  
   rootLabel = if autoDetectRootDevice then rootLabel else "";
+  
   path = [
-    staticTools
-    module_init_tools
     extraUtils
+    module_init_tools
+    klibcShrunk
   ];
-
-  # We only want the path of the stage 2 init, we don't want it as a
-  # dependency (since then it the stage 2 init would end up in the
-  # initrd).
-  stage2Init = toString stage2Init; # !!! doesn't work
 }
diff --git a/configuration/rescue-cd.nix b/configuration/rescue-cd.nix
index f54aa5bf66a..488b2a73c88 100644
--- a/configuration/rescue-cd.nix
+++ b/configuration/rescue-cd.nix
@@ -20,7 +20,7 @@ rec {
       extraTTYs = [7 8]; # manual, rogue
       extraModulePackages = pkgs: [system.kernelPackages.aufs];
       
-      #kernelPackages = pkgs: pkgs.kernelPackages_2_6_25;
+      kernelPackages = pkgs: pkgs.kernelPackages_2_6_25;
       
       initrd = {
         extraKernelModules = [
@@ -187,7 +187,6 @@ rec {
 
   system = import ../system/system.nix {
     inherit configuration platform nixpkgsPath;
-    stage2Init = "/init";
   };
 
 
@@ -237,7 +236,7 @@ rec {
       chainloader +1
     
     title NixOS Installer / Rescue
-      kernel /boot/vmlinuz ${toString system.config.boot.kernelParams}
+      kernel /boot/vmlinuz init=/init ${toString system.config.boot.kernelParams}
       initrd /boot/initrd
 
     title Memtest86+
diff --git a/system/system.nix b/system/system.nix
index 59646637339..654a6b3181d 100644
--- a/system/system.nix
+++ b/system/system.nix
@@ -1,5 +1,4 @@
 { platform ? __currentSystem
-, stage2Init ? ""
 , configuration
 , nixpkgsPath ? ../../nixpkgs
 }:
@@ -110,17 +109,16 @@ rec {
     inherit (pkgs) substituteAll;
     inherit (pkgsDiet) module_init_tools;
     inherit extraUtils;
+    inherit (kernelPackages) klibcShrunk;
     inherit (config.boot) autoDetectRootDevice isLiveCD;
     fileSystems =
       pkgs.lib.filter
         (fs: fs.mountPoint == "/" || (fs ? neededForBoot && fs.neededForBoot))
         config.fileSystems;
     rootLabel = config.boot.rootLabel;
-    inherit stage2Init;
     modulesDir = modulesClosure;
     modules = rootModules;
     staticShell = stdenvLinuxStuff.bootstrapTools.bash;
-    staticTools = stdenvLinuxStuff.staticTools;
     resumeDevice = config.boot.resumeDevice;
   };
   
@@ -446,8 +444,9 @@ rec {
       pkgs.diffutils
       pkgs.upstart # for initctl
     ];
+    # !!! wtf does this do???
     children = map (x: ((import ./system.nix) 
-      {inherit platform stage2Init; 
+      { inherit platform; 
         configuration = x//{boot=((x.boot)//{grubDevice = "";});};}).system) 
       config.nesting.children; 
     configurationName = config.boot.configurationName;
-- 
GitLab


From abbe260a80eab87ab9a9fff763c7b61703302345 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 8 Aug 2008 17:07:04 +0000
Subject: [PATCH 1014/5331] * Don't use modprobe but insmod in the initrd. 
 This means we don't   need module-init-tools in the initrd, since insmod is
 in klibc. * Give the installation CD a label.

svn path=/nixos/trunk/; revision=12545
---
 boot/boot-stage-1-init.sh      | 23 ++++++++++++++++-------
 boot/boot-stage-1.nix          |  5 ++---
 configuration/rescue-cd.nix    |  2 ++
 helpers/make-iso9660-image.nix | 21 ++++++++++++---------
 helpers/make-iso9660-image.sh  |  4 ++--
 system/system.nix              |  5 +----
 6 files changed, 35 insertions(+), 25 deletions(-)

diff --git a/boot/boot-stage-1-init.sh b/boot/boot-stage-1-init.sh
index f992637184c..a3f8f8ef7e3 100644
--- a/boot/boot-stage-1-init.sh
+++ b/boot/boot-stage-1-init.sh
@@ -8,6 +8,16 @@ fail() {
 }
 
 
+# Poor man's `basename'.
+basename() {
+    local s="$1"
+    set -- $(IFS=/; echo $s)
+    local res
+    while test $# != 0; do res=$1; shift; done
+    echo $res
+}
+
+
 # Print a greeting.
 echo
 echo "<<< NixOS Stage 1 >>>"
@@ -34,7 +44,7 @@ mount -t sysfs none /sys
 
 
 # Process the kernel command line.
-stage2Init=
+stage2Init=/init
 for o in $(cat /proc/cmdline); do
     case $o in
         init=*)
@@ -59,10 +69,9 @@ done
 
 
 # Load some kernel modules.
-export MODULE_DIR=@modulesDir@/lib/modules/
-for i in @modules@; do
-    echo "trying to load $i..."
-    modprobe $i
+for i in $(cat @modulesClosure@/insmod-list); do
+    echo "loading module $(basename $i)..."
+    insmod $i
 done
 
 
@@ -84,8 +93,8 @@ echo shutdown > /sys/power/disk
 
 # Create device nodes in /dev.
 export UDEV_CONFIG_FILE=/udev.conf
-echo 'udev_rules="/no-rules"' > $UDEV_CONFIG_FILE
-echo -n > /no-rules
+echo 'udev_rules="/rules"' > $UDEV_CONFIG_FILE
+mkdir /rules
 udevd --daemon
 udevadm trigger
 udevadm settle
diff --git a/boot/boot-stage-1.nix b/boot/boot-stage-1.nix
index d5ab319894a..edb8dab10da 100644
--- a/boot/boot-stage-1.nix
+++ b/boot/boot-stage-1.nix
@@ -5,7 +5,7 @@
 # is supposed to be put into an initial RAM disk (initrd).
 
 { substituteAll, staticShell, klibcShrunk
-, module_init_tools, extraUtils, modules, modulesDir
+, extraUtils, modulesClosure
 
 , # Whether to find root device automatically using its label.
   autoDetectRootDevice
@@ -48,7 +48,7 @@ substituteAll {
   
   isExecutable = true;
   
-  inherit staticShell modules modulesDir;
+  inherit staticShell modulesClosure;
   
   inherit autoDetectRootDevice isLiveCD mountPoints devices fsTypes optionss resumeDevice;
   
@@ -56,7 +56,6 @@ substituteAll {
   
   path = [
     extraUtils
-    module_init_tools
     klibcShrunk
   ];
 }
diff --git a/configuration/rescue-cd.nix b/configuration/rescue-cd.nix
index 488b2a73c88..ee2c7c2a510 100644
--- a/configuration/rescue-cd.nix
+++ b/configuration/rescue-cd.nix
@@ -300,6 +300,8 @@ rec {
     bootImage = "boot/grub/stage2_eltorito";
 
     inherit compressImage;
+
+    volumeID = "NIXOS_INSTALLATION_CD";
   };
 
 
diff --git a/helpers/make-iso9660-image.nix b/helpers/make-iso9660-image.nix
index fbabb7c0f49..0262bc653bb 100644
--- a/helpers/make-iso9660-image.nix
+++ b/helpers/make-iso9660-image.nix
@@ -1,7 +1,7 @@
 { stdenv, perl, cdrkit, nixpkgsPath
 
-  # The file name of the resulting ISO image.
-, isoName ? "cd.iso"
+, # The file name of the resulting ISO image.
+  isoName ? "cd.iso"
 
 , # The files and directories to be placed in the ISO file system.
   # This is a list of attribute sets {source, target} where `source'
@@ -16,18 +16,20 @@
   # to `source' that will be added to the CD.
   storeContents ? []
 
-, 
-  buildStoreContents ? []
+, buildStoreContents ? []
 
-  # Whether this should be an El-Torito bootable CD.
-, bootable ? false
+, # Whether this should be an El-Torito bootable CD.
+  bootable ? false
 
-  # The path (in the ISO file system) of the boot image.
-, bootImage ? ""
+, # The path (in the ISO file system) of the boot image.
+  bootImage ? ""
 
 , # Whether to compress the resulting ISO image with bzip2.
   compressImage ? false
 
+, # The volume ID.
+  volumeID ? ""
+
 }:
 
 assert bootable -> bootImage != "";
@@ -36,7 +38,8 @@ stdenv.mkDerivation {
   name = "iso9660-image";
   builder = ./make-iso9660-image.sh;
   buildInputs = [perl cdrkit];
-  inherit isoName bootable bootImage compressImage;
+  
+  inherit isoName bootable bootImage compressImage volumeID;
 
   # !!! should use XML.
   sources = map (x: x.source) contents;
diff --git a/helpers/make-iso9660-image.sh b/helpers/make-iso9660-image.sh
index e4997c8112a..03f4208375c 100644
--- a/helpers/make-iso9660-image.sh
+++ b/helpers/make-iso9660-image.sh
@@ -61,13 +61,13 @@ cat pathlist | sed -e 's/=\(.*\)=\(.*\)=/\\=\1=\2\\=/' | tee pathlist.safer
 
 
 ensureDir $out/iso
-genCommand="genisoimage -iso-level 4 -r -J $bootFlags -hide-rr-moved -graft-points -path-list pathlist.safer"
+genCommand="genisoimage -iso-level 4 -r -J $bootFlags -hide-rr-moved -graft-points -path-list pathlist.safer ${volumeID:+-V $volumeID}"
 if test -z "$compressImage"; then
     $genCommand -o $out/iso/$isoName
 else
     $genCommand | bzip2 > $out/iso/$isoName.bz2
 fi
-    
+
 
 ensureDir $out/nix-support
 echo $system > $out/nix-support/system
diff --git a/system/system.nix b/system/system.nix
index 654a6b3181d..b4c7078b4cd 100644
--- a/system/system.nix
+++ b/system/system.nix
@@ -107,8 +107,7 @@ rec {
   # mounting the root FS).
   bootStage1 = import ../boot/boot-stage-1.nix {
     inherit (pkgs) substituteAll;
-    inherit (pkgsDiet) module_init_tools;
-    inherit extraUtils;
+    inherit extraUtils modulesClosure;
     inherit (kernelPackages) klibcShrunk;
     inherit (config.boot) autoDetectRootDevice isLiveCD;
     fileSystems =
@@ -116,8 +115,6 @@ rec {
         (fs: fs.mountPoint == "/" || (fs ? neededForBoot && fs.neededForBoot))
         config.fileSystems;
     rootLabel = config.boot.rootLabel;
-    modulesDir = modulesClosure;
-    modules = rootModules;
     staticShell = stdenvLinuxStuff.bootstrapTools.bash;
     resumeDevice = config.boot.resumeDevice;
   };
-- 
GitLab


From e7438b3525ebbb1e93fae5d0237107e95439f4cf Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Fri, 8 Aug 2008 17:13:46 +0000
Subject: [PATCH 1015/5331] Ported disk labelling.

svn path=/nixos/trunk/; revision=12546
---
 configuration/rescue-cd-configurable.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/configuration/rescue-cd-configurable.nix b/configuration/rescue-cd-configurable.nix
index ff42d22f973..c0f8d2e6637 100644
--- a/configuration/rescue-cd-configurable.nix
+++ b/configuration/rescue-cd-configurable.nix
@@ -461,6 +461,8 @@ rec {
     
     bootable = true;
     bootImage = "boot/grub/stage2_eltorito";
+    
+    volumeID = "NIXOS_INSTALLATION_CD";
   };
  
 }
-- 
GitLab


From 63e316ecac95d05ca19a6d1760c5d4c0e7e62047 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 8 Aug 2008 17:34:30 +0000
Subject: [PATCH 1016/5331] * Refactoring: move all the initrd-generation
 related stuff to   boot-stage-1.nix in order to unclutter system.nix.

svn path=/nixos/trunk/; revision=12547
---
 boot/boot-stage-1.nix | 164 +++++++++++++++++++++++++++++-------------
 system/system.nix     |  99 ++-----------------------
 2 files changed, 120 insertions(+), 143 deletions(-)

diff --git a/boot/boot-stage-1.nix b/boot/boot-stage-1.nix
index edb8dab10da..fd87e5246d3 100644
--- a/boot/boot-stage-1.nix
+++ b/boot/boot-stage-1.nix
@@ -1,61 +1,129 @@
-# This Nix expression builds the script that performs the first stage
-# of booting the system: it loads the modules necessary to mount the
-# root file system, then calls /init in the root file system to start
-# the second boot stage.  The closure of the result of this expression
-# is supposed to be put into an initial RAM disk (initrd).
+# This Nix expression builds the initial ramdisk, which contains an
+# init script that performs the first stage of booting the system: it
+# loads the modules necessary to mount the root file system, then
+# calls the init in the root file system to start the second boot
+# stage.
 
-{ substituteAll, staticShell, klibcShrunk
-, extraUtils, modulesClosure
+{ pkgs, config, nixpkgsPath, kernelPackages, modulesTree }:
 
-, # Whether to find root device automatically using its label.
-  autoDetectRootDevice
+rec {
+
+  pkgsDiet = import "${nixpkgsPath}/pkgs/top-level/all-packages.nix" {
+    system = pkgs.stdenv.system;
+    bootStdenv = pkgs.useDietLibC pkgs.stdenv;
+  };
+
+  pkgsStatic = import "${nixpkgsPath}/pkgs/top-level/all-packages.nix" {
+    system = pkgs.stdenv.system;
+    bootStdenv = pkgs.makeStaticBinaries pkgs.stdenv;
+  };
+
+  stdenvLinuxStuff = import "${nixpkgsPath}/pkgs/stdenv/linux" {
+    system = pkgs.stdenv.system;
+    allPackages = import "${nixpkgsPath}/pkgs/top-level/all-packages.nix";
+  };
   
-, # If not scanning, the root must be specified explicitly.  Actually,
-  # stage 1 can mount multiple file systems.  This is necessary if,
-  # for instance, /nix (necessary for stage 2) is on a different file
-  # system than /.
-  #
-  # This is a list of {mountPoint, device|label} attribute sets, i.e.,
-  # the format used by the fileSystems configuration option.  There
-  # must at least be a file system for the / mount point in this list.
-  fileSystems ? []
 
-, # If scanning, we need a disk label.
-  rootLabel
+  # Determine the set of modules that we need to mount the root FS.
+  modulesClosure = pkgs.makeModulesClosure {
+    rootModules =
+      config.boot.initrd.extraKernelModules ++
+      config.boot.initrd.kernelModules;
+    kernel = modulesTree;
+    allowMissing = config.boot.initrd.allowMissing;
+  };
 
-, # Whether the root device is read-only and should be made writable
-  # through a unionfs.
-  isLiveCD
 
-, # Resume device. [major]:[minor]
-  resumeDevice ? "ignore-this"
-}:
+  # 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.runCommand "extra-utils"
+    { buildInputs = [pkgs.nukeReferences];
+      inherit (pkgsStatic) utillinux;
+      inherit (pkgsDiet) udev;
+      e2fsprogs = pkgs.e2fsprogsDiet;
+      devicemapper = if config.boot.initrd.lvm then pkgs.devicemapperStatic else null;
+      lvm2 = if config.boot.initrd.lvm then pkgs.lvm2Static else null;
+      allowedReferences = []; # prevent accidents like glibc being included in the initrd
+    }
+    ''
+      ensureDir $out/bin
+      if test -n "$devicemapper"; then
+        cp $devicemapper/sbin/dmsetup.static $out/bin/dmsetup
+        cp $lvm2/sbin/lvm.static $out/bin/lvm
+      fi
+      cp $utillinux/bin/mount $utillinux/bin/umount $utillinux/sbin/pivot_root $out/bin
+      cp -p $e2fsprogs/sbin/fsck* $e2fsprogs/sbin/e2fsck $out/bin
+      cp $udev/sbin/udevd $udev/sbin/udevadm $out/bin
+      nuke-refs $out/bin/*
+    ''; # */
+  
 
-let
+  # The initrd only has to mount / or any FS marked as necessary for
+  # booting (such as the FS containing /nix/store, or an FS needed for
+  # mounting /, like / on a loopback).
+  fileSystems = pkgs.lib.filter
+    (fs: fs.mountPoint == "/" || (fs ? neededForBoot && fs.neededForBoot))
+    config.fileSystems;
 
-  # !!! use XML; copy&pasted from upstart-jobs/filesystems.nix.
-  mountPoints = map (fs: fs.mountPoint) fileSystems;
-  devices = map (fs: if fs ? device then fs.device else "LABEL=" + fs.label) fileSystems;
-  fsTypes = map (fs: if fs ? fsType then fs.fsType else "auto") fileSystems;
-  optionss = map (fs: if fs ? options then fs.options else "defaults") fileSystems;
+    
+  # The init script of boot stage 1 (loading kernel modules for
+  # mounting the root FS).
+  bootStage1 = pkgs.substituteAll {
+    src = ./boot-stage-1-init.sh;
 
-in
+    isExecutable = true;
 
-if !autoDetectRootDevice && mountPoints == [] then abort "You must specify the fileSystems option!" else
+    staticShell = stdenvLinuxStuff.bootstrapTools.bash;
+    
+    inherit modulesClosure;
+    
+    inherit (config.boot) autoDetectRootDevice isLiveCD resumeDevice;
 
-substituteAll {
-  src = ./boot-stage-1-init.sh;
-  
-  isExecutable = true;
-  
-  inherit staticShell modulesClosure;
-  
-  inherit autoDetectRootDevice isLiveCD mountPoints devices fsTypes optionss resumeDevice;
-  
-  rootLabel = if autoDetectRootDevice then rootLabel else "";
+    # !!! copy&pasted from upstart-jobs/filesystems.nix.
+    mountPoints =
+      if !config.boot.autoDetectRootDevice && fileSystems == []
+      then abort "You must specify the fileSystems option!"
+      else map (fs: fs.mountPoint) fileSystems;
+    devices = map (fs: if fs ? device then fs.device else "LABEL=" + fs.label) fileSystems;
+    fsTypes = map (fs: if fs ? fsType then fs.fsType else "auto") fileSystems;
+    optionss = map (fs: if fs ? options then fs.options else "defaults") fileSystems;
+
+    rootLabel = if config.boot.autoDetectRootDevice then config.boot.rootLabel else "";
+
+    path = [
+      extraUtils
+      kernelPackages.klibcShrunk
+    ];
+  };
+
+
+  # The closure of the init script of boot stage 1 is what we put in
+  # the initial RAM disk.
+  initialRamdisk = pkgs.makeInitrd {
+    contents = [
+      { object = bootStage1;
+        symlink = "/init";
+      }
+    ] ++
+      pkgs.lib.optionals
+        (config.boot.initrd.enableSplashScreen && kernelPackages.splashutils != null)
+        [
+          { object = pkgs.runCommand "splashutils" {allowedReferences = []; buildInputs = [pkgs.nukeReferences];} ''
+              ensureDir $out/bin
+              cp ${kernelPackages.splashutils}/${kernelPackages.splashutils.helperName} $out/bin/splash_helper
+              nuke-refs $out/bin/*
+            '';
+            suffix = "/bin/splash_helper";
+            symlink = "/${kernelPackages.splashutils.helperName}";
+          } # */
+          { object = import ../helpers/unpack-theme.nix {
+              inherit (pkgs) stdenv;
+              theme = config.services.ttyBackgrounds.defaultTheme;
+            };
+            symlink = "/etc/splash";
+          }
+        ];
+  };
   
-  path = [
-    extraUtils
-    klibcShrunk
-  ];
 }
diff --git a/system/system.nix b/system/system.nix
index b4c7078b4cd..3c4eb87e943 100644
--- a/system/system.nix
+++ b/system/system.nix
@@ -27,21 +27,6 @@ rec {
 
   pkgs = import "${nixpkgsPath}/pkgs/top-level/all-packages.nix" {system = platform;};
 
-  pkgsDiet = import "${nixpkgsPath}/pkgs/top-level/all-packages.nix" {
-    system = platform;
-    bootStdenv = pkgs.useDietLibC pkgs.stdenv;
-  };
-
-  pkgsStatic = import "${nixpkgsPath}/pkgs/top-level/all-packages.nix" {
-    system = platform;
-    bootStdenv = pkgs.makeStaticBinaries pkgs.stdenv;
-  };
-
-  stdenvLinuxStuff = import "${nixpkgsPath}/pkgs/stdenv/linux" {
-    system = pkgs.stdenv.system;
-    allPackages = import "${nixpkgsPath}/pkgs/top-level/all-packages.nix";
-  };
-
   manifests = config.installer.manifests; # exported here because nixos-rebuild uses it
 
   nix = config.environment.nix pkgs;
@@ -50,11 +35,6 @@ rec {
 
   kernel = kernelPackages.kernel;
 
-  rootModules = 
-    config.boot.initrd.extraKernelModules ++
-    config.boot.initrd.kernelModules;
-
-
 
   # Tree of kernel modules.  This includes the kernel, plus modules
   # built outside of the kernel.  We have to combine these into a
@@ -69,84 +49,13 @@ rec {
     ++ config.boot.extraModulePackages pkgs
   );
 
-  
-  # Determine the set of modules that we need to mount the root FS.
-  modulesClosure = pkgs.makeModulesClosure {
-    inherit rootModules;
-    kernel = modulesTree;
-    allowMissing = config.boot.initrd.allowMissing;
-  };
-
-
-  # 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.runCommand "extra-utils"
-    { buildInputs = [pkgs.nukeReferences];
-      inherit (pkgsStatic) utillinux;
-      inherit (pkgsDiet) udev;
-      e2fsprogs = pkgs.e2fsprogsDiet;
-      devicemapper = if config.boot.initrd.lvm then pkgs.devicemapperStatic else null;
-      lvm2 = if config.boot.initrd.lvm then pkgs.lvm2Static else null;
-      allowedReferences = []; # prevent accidents like glibc being included in the initrd
-    }
-    ''
-      ensureDir $out/bin
-      if test -n "$devicemapper"; then
-        cp $devicemapper/sbin/dmsetup.static $out/bin/dmsetup
-        cp $lvm2/sbin/lvm.static $out/bin/lvm
-      fi
-      cp $utillinux/bin/mount $utillinux/bin/umount $utillinux/sbin/pivot_root $out/bin
-      cp -p $e2fsprogs/sbin/fsck* $e2fsprogs/sbin/e2fsck $out/bin
-      cp $udev/sbin/udevd $udev/sbin/udevadm $out/bin
-      nuke-refs $out/bin/*
-    ''; # */
-  
 
-  # The init script of boot stage 1 (loading kernel modules for
-  # mounting the root FS).
-  bootStage1 = import ../boot/boot-stage-1.nix {
-    inherit (pkgs) substituteAll;
-    inherit extraUtils modulesClosure;
-    inherit (kernelPackages) klibcShrunk;
-    inherit (config.boot) autoDetectRootDevice isLiveCD;
-    fileSystems =
-      pkgs.lib.filter
-        (fs: fs.mountPoint == "/" || (fs ? neededForBoot && fs.neededForBoot))
-        config.fileSystems;
-    rootLabel = config.boot.rootLabel;
-    staticShell = stdenvLinuxStuff.bootstrapTools.bash;
-    resumeDevice = config.boot.resumeDevice;
+  # The initial ramdisk.
+  initialRamdiskStuff = import ../boot/boot-stage-1.nix {
+    inherit pkgs config nixpkgsPath kernelPackages modulesTree;
   };
-  
 
-  # The closure of the init script of boot stage 1 is what we put in
-  # the initial RAM disk.
-  initialRamdisk = pkgs.makeInitrd {
-    contents = [
-      { object = bootStage1;
-        symlink = "/init";
-      }
-    ] ++
-      pkgs.lib.optionals
-        (config.boot.initrd.enableSplashScreen && kernelPackages.splashutils != null)
-        [
-          { object = pkgs.runCommand "splashutils" {allowedReferences = []; buildInputs = [pkgs.nukeReferences];} ''
-              ensureDir $out/bin
-              cp ${kernelPackages.splashutils}/${kernelPackages.splashutils.helperName} $out/bin/splash_helper
-              nuke-refs $out/bin/*
-            '';
-            suffix = "/bin/splash_helper";
-            symlink = "/${kernelPackages.splashutils.helperName}";
-          } # */
-          { object = import ../helpers/unpack-theme.nix {
-              inherit (pkgs) stdenv;
-              theme = config.services.ttyBackgrounds.defaultTheme;
-            };
-            symlink = "/etc/splash";
-          }
-        ];
-  };
+  initialRamdisk = initialRamdiskStuff.initialRamdisk;
 
 
   # NixOS installation/updating tools.
-- 
GitLab


From b8ff944cd2086ab22ffc257e97d534623b0cdeef Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Fri, 8 Aug 2008 18:51:32 +0000
Subject: [PATCH 1017/5331] Postfix list separator fix

svn path=/nixos/trunk/; revision=12548
---
 upstart-jobs/postfix.nix | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/upstart-jobs/postfix.nix b/upstart-jobs/postfix.nix
index 7b011cd1a0e..e72f12ea842 100644
--- a/upstart-jobs/postfix.nix
+++ b/upstart-jobs/postfix.nix
@@ -9,6 +9,7 @@ let
   idList = import ../system/ids.nix;
 
   optionalString = pkgs.lib.optionalString;
+  concatStringsSep = pkgs.lib.concatStringsSep;
   mainCf = 
   ''
     queue_directory = /var/postfix/queue
@@ -25,7 +26,7 @@ let
   +
   (if cfg.networks!=null then
     (''
-      mynetworks = ${toString cfg.networks}
+      mynetworks = ${concatStringsSep ", " cfg.networks}
     '') 
   else if (cfg.networksStyle != "") then
     (''
@@ -47,10 +48,10 @@ let
     myorigin = ${cfg.origin}
   '')
   + optionalString (cfg.destination != null) (''
-    mydestination = ${toString cfg.destination}
+    mydestination = ${concatStringsSep ", " cfg.destination}
   '')
   + optionalString (cfg.relayDomains != null) (''
-    relay_domains = ${toString cfg.relayDomains}
+    relay_domains = ${concatStringsSep ", " cfg.relayDomains}
   '')
   + ''
     local_recipient_maps = 
-- 
GitLab


From d63bfe3c3175819240ea4d41dd31b47985a55ad6 Mon Sep 17 00:00:00 2001
From: Nicolas Pierron <nicolas.b.pierron@gmail.com>
Date: Fri, 8 Aug 2008 18:56:58 +0000
Subject: [PATCH 1018/5331] Use the new configuration scheme for system's
 options.

svn path=/nixos/trunk/; revision=12549
---
 system/options.nix | 6 +++++-
 system/system.nix  | 2 +-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/system/options.nix b/system/options.nix
index a5e51a68ae6..3d1f61d11cf 100644
--- a/system/options.nix
+++ b/system/options.nix
@@ -1,4 +1,8 @@
-{pkgs, mkOption}:
+pkgs: config:
+
+let
+  inherit (pkgs.lib) mkOption;
+in
 
 {
 
diff --git a/system/system.nix b/system/system.nix
index 3c4eb87e943..ec1d0407835 100644
--- a/system/system.nix
+++ b/system/system.nix
@@ -6,7 +6,7 @@
 rec {
   configComponents = [
     configuration
-    (import ./options.nix {inherit pkgs; inherit (pkgs.lib) mkOption;})
+    (import ./options.nix)
   ];
 
   noOption = name: values:
-- 
GitLab


From 9fc41fc64f7e19b742ba625978832416c40bba5b Mon Sep 17 00:00:00 2001
From: Nicolas Pierron <nicolas.b.pierron@gmail.com>
Date: Fri, 8 Aug 2008 18:57:04 +0000
Subject: [PATCH 1019/5331] Prepare the removal of pkgs arguments. If user
 options are using pkgs arguments, these would be replaced by the pkgs
 argument given to the whole option component expression instead of the pkgs
 argument given to the option.

svn path=/nixos/trunk/; revision=12550
---
 system/options.nix | 32 ++++++++++++++++++++++++++++----
 1 file changed, 28 insertions(+), 4 deletions(-)

diff --git a/system/options.nix b/system/options.nix
index 3d1f61d11cf..7526ba03a3e 100644
--- a/system/options.nix
+++ b/system/options.nix
@@ -2,6 +2,28 @@ pkgs: config:
 
 let
   inherit (pkgs.lib) mkOption;
+  inherit (builtins) head tail;
+
+  # temporary modifications.
+  # backward here means that expression could either be a value or a
+  # function which expects to have a pkgs argument.  Old merges are
+  # currently used while removing pkgs arguments.
+  optionalPkgs = x:
+    if __isFunction x then x pkgs else x;
+
+  backwardPkgsFunListOldMerge = name: list: ignorePkgs:
+    backwardPkgsFunListNewMerge name list;
+
+  backwardPkgsFunListNewMerge = name: list:
+    pkgs.lib.concatMap optionalPkgs list;
+
+  backwardPkgsFunOldMerge = name: list: ignorePkgs:
+    backwardPkgsFunNewMerge name list;
+
+  backwardPkgsFunNewMerge = name: list:
+    if list != [] && tail list == []
+    then optionalPkgs (head list)
+    else abort "${name}: Defined at least twice.";
 in
 
 {
@@ -82,6 +104,7 @@ in
     kernelPackages = mkOption {
       default = pkgs: pkgs.kernelPackages;
       example = pkgs: pkgs.kernelPackages_2_6_25;
+      merge = backwardPkgsFunOldMerge;
       description = "
         This option allows you to override the Linux kernel used by
         NixOS.  Since things like external kernel module packages are
@@ -149,8 +172,7 @@ in
       description = ''
         A list of additional packages supplying kernel modules.
       '';
-      merge = name: list:
-        pkgsArg: pkgs.lib.concatMap (f: f pkgsArg) list;
+      merge = backwardPkgsFunListOldMerge;
     };
 
     kernelModules = mkOption {
@@ -1386,6 +1408,7 @@ in
 
       packageFun = mkOption {
         default = pkgs: pkgs.xorg;
+        merge = backwardPkgsFunOldMerge;
         description = "
           Alternative X.org package to use. For 
           example, you can replace individual drivers.
@@ -2679,6 +2702,7 @@ root        ALL=(ALL) SETENV: ALL
 
     extraFonts = mkOption {
       default = pkgs: [];
+      merge = backwardPkgsFunListOldMerge;
       description = "
           Function, returning list of additional fonts.
       ";
@@ -2764,6 +2788,7 @@ root        ALL=(ALL) SETENV: ALL
     extraPackages = mkOption {
       default = pkgs: [];
       example = pkgs: [pkgs.firefox pkgs.thunderbird];
+      merge = backwardPkgsFunListOldMerge;
       description = "
         This option allows you to add additional packages to the system
         path.  These packages are automatically available to all users,
@@ -2775,13 +2800,12 @@ root        ALL=(ALL) SETENV: ALL
         packages.  The function will be called with the Nix Packages
         collection as its argument for convenience.
       ";
-      merge = name: list:
-        pkgsArg: pkgs.lib.concatMap (f: f pkgsArg) list;
     };
 
     nix = mkOption {
       default = pkgs: pkgs.nixUnstable;
       example = pkgs: pkgs.nixCustomFun /root/nix.tar.gz;
+      merge = backwardPkgsFunOldMerge;
       description = "
         Use non-default Nix easily. Be careful, though, not to break everything.
       ";
-- 
GitLab


From 51210b1904af8f5f4a031c828459bd5bd8fb3158 Mon Sep 17 00:00:00 2001
From: Nicolas Pierron <nicolas.b.pierron@gmail.com>
Date: Fri, 8 Aug 2008 18:57:07 +0000
Subject: [PATCH 1020/5331] Remove pkgs argument of: - boot.kernelPackages -
 boot.extraModulePackages - services.xserver.packageFun (should be renamed) -
 fonts.extraFonts - environment.extraPackages - environment.nix

These options still accept the previous style.

svn path=/nixos/trunk/; revision=12551
---
 system/fonts.nix         |  2 +-
 system/options.nix       | 47 +++++++++++++++++-----------------------
 system/system.nix        |  8 +++----
 upstart-jobs/xserver.nix |  2 +-
 4 files changed, 26 insertions(+), 33 deletions(-)

diff --git a/system/fonts.nix b/system/fonts.nix
index 16b37b251a0..0a2b1487982 100644
--- a/system/fonts.nix
+++ b/system/fonts.nix
@@ -23,4 +23,4 @@
 
 ++ pkgs.lib.optional (config.fonts.enableGhostscriptFonts) "${pkgs.ghostscript}/share/ghostscript/fonts"
 
-++ ((config.fonts.extraFonts) pkgs)
+++ config.fonts.extraFonts
diff --git a/system/options.nix b/system/options.nix
index 7526ba03a3e..24b14bd19f4 100644
--- a/system/options.nix
+++ b/system/options.nix
@@ -6,21 +6,14 @@ let
 
   # temporary modifications.
   # backward here means that expression could either be a value or a
-  # function which expects to have a pkgs argument.  Old merges are
-  # currently used while removing pkgs arguments.
+  # function which expects to have a pkgs argument.
   optionalPkgs = x:
     if __isFunction x then x pkgs else x;
 
-  backwardPkgsFunListOldMerge = name: list: ignorePkgs:
-    backwardPkgsFunListNewMerge name list;
-
-  backwardPkgsFunListNewMerge = name: list:
+  backwardPkgsFunListMerge = name: list:
     pkgs.lib.concatMap optionalPkgs list;
 
-  backwardPkgsFunOldMerge = name: list: ignorePkgs:
-    backwardPkgsFunNewMerge name list;
-
-  backwardPkgsFunNewMerge = name: list:
+  backwardPkgsFunMerge = name: list:
     if list != [] && tail list == []
     then optionalPkgs (head list)
     else abort "${name}: Defined at least twice.";
@@ -102,9 +95,9 @@ in
     };
 
     kernelPackages = mkOption {
-      default = pkgs: pkgs.kernelPackages;
-      example = pkgs: pkgs.kernelPackages_2_6_25;
-      merge = backwardPkgsFunOldMerge;
+      default = pkgs.kernelPackages;
+      example = pkgs.kernelPackages_2_6_25;
+      merge = backwardPkgsFunMerge;
       description = "
         This option allows you to override the Linux kernel used by
         NixOS.  Since things like external kernel module packages are
@@ -167,12 +160,12 @@ in
     };
 
     extraModulePackages = mkOption {
-      default = pkgs: [];
-      # !!! example = pkgs: [pkgs.aufs pkgs.nvidiaDrivers];
+      default = [];
+      # !!! example = [pkgs.aufs pkgs.nvidiaDrivers];
       description = ''
         A list of additional packages supplying kernel modules.
       '';
-      merge = backwardPkgsFunListOldMerge;
+      merge = backwardPkgsFunListMerge;
     };
 
     kernelModules = mkOption {
@@ -1407,8 +1400,8 @@ in
       };
 
       packageFun = mkOption {
-        default = pkgs: pkgs.xorg;
-        merge = backwardPkgsFunOldMerge;
+        default = pkgs.xorg;
+        merge = backwardPkgsFunMerge;
         description = "
           Alternative X.org package to use. For 
           example, you can replace individual drivers.
@@ -2701,10 +2694,10 @@ root        ALL=(ALL) SETENV: ALL
     };
 
     extraFonts = mkOption {
-      default = pkgs: [];
-      merge = backwardPkgsFunListOldMerge;
+      default = [];
+      merge = backwardPkgsFunListMerge;
       description = "
-          Function, returning list of additional fonts.
+        Function, returning list of additional fonts.
       ";
     };
 
@@ -2786,9 +2779,9 @@ root        ALL=(ALL) SETENV: ALL
     };
 
     extraPackages = mkOption {
-      default = pkgs: [];
-      example = pkgs: [pkgs.firefox pkgs.thunderbird];
-      merge = backwardPkgsFunListOldMerge;
+      default = [];
+      example = [pkgs.firefox pkgs.thunderbird];
+      merge = backwardPkgsFunListMerge;
       description = "
         This option allows you to add additional packages to the system
         path.  These packages are automatically available to all users,
@@ -2803,9 +2796,9 @@ root        ALL=(ALL) SETENV: ALL
     };
 
     nix = mkOption {
-      default = pkgs: pkgs.nixUnstable;
-      example = pkgs: pkgs.nixCustomFun /root/nix.tar.gz;
-      merge = backwardPkgsFunOldMerge;
+      default = pkgs.nixUnstable;
+      example = pkgs.nixCustomFun /root/nix.tar.gz;
+      merge = backwardPkgsFunMerge;
       description = "
         Use non-default Nix easily. Be careful, though, not to break everything.
       ";
diff --git a/system/system.nix b/system/system.nix
index ec1d0407835..8a3f962b396 100644
--- a/system/system.nix
+++ b/system/system.nix
@@ -29,9 +29,9 @@ rec {
 
   manifests = config.installer.manifests; # exported here because nixos-rebuild uses it
 
-  nix = config.environment.nix pkgs;
+  nix = config.environment.nix;
 
-  kernelPackages = config.boot.kernelPackages pkgs;
+  kernelPackages = config.boot.kernelPackages;
 
   kernel = kernelPackages.kernel;
 
@@ -46,7 +46,7 @@ rec {
     # !!! this should be declared by the xserver Upstart job.
     ++ pkgs.lib.optional (config.services.xserver.enable && config.services.xserver.videoDriver == "nvidia") kernelPackages.nvidiaDrivers
     ++ pkgs.lib.optional config.hardware.enableGo7007 kernelPackages.wis_go7007
-    ++ config.boot.extraModulePackages pkgs
+    ++ config.boot.extraModulePackages
   );
 
 
@@ -217,7 +217,7 @@ rec {
   ++ pkgs.lib.optional config.services.avahi.enable pkgs.avahi
   ++ pkgs.lib.optional config.networking.defaultMailServer.directDelivery pkgs.ssmtp 
   ++ pkgs.lib.concatLists (map (job: job.extraPath) upstartJobs.jobs)
-  ++ config.environment.extraPackages pkgs
+  ++ config.environment.extraPackages
   ++ pkgs.lib.optional config.fonts.enableFontDir fontDir
   ++ pkgs.lib.optional config.hardware.enableGo7007 kernelPackages.wis_go7007
 
diff --git a/upstart-jobs/xserver.nix b/upstart-jobs/xserver.nix
index 0191773555b..9218c80d2b0 100644
--- a/upstart-jobs/xserver.nix
+++ b/upstart-jobs/xserver.nix
@@ -10,7 +10,7 @@ let
 
   # Abbreviations.
   cfg = config.services.xserver;
-  xorg = cfg.packageFun pkgs;
+  xorg = cfg.packageFun;
   gnome = pkgs.gnome;
   stdenv = pkgs.stdenv;
 
-- 
GitLab


From 3fd58f8a03154859a4184eedccf6d654533db8cf Mon Sep 17 00:00:00 2001
From: Nicolas Pierron <nicolas.b.pierron@gmail.com>
Date: Fri, 8 Aug 2008 18:57:09 +0000
Subject: [PATCH 1021/5331] Declare obsolete: hardware option; options with
 arguments.

svn path=/nixos/trunk/; revision=12552
---
 system/options.nix | 24 ++++++++++++++++++++----
 1 file changed, 20 insertions(+), 4 deletions(-)

diff --git a/system/options.nix b/system/options.nix
index 24b14bd19f4..8ef10f42f2a 100644
--- a/system/options.nix
+++ b/system/options.nix
@@ -4,19 +4,30 @@ let
   inherit (pkgs.lib) mkOption;
   inherit (builtins) head tail;
 
+  obsolete = what: f: name:
+    if builtins ? trace then
+      builtins.trace "${name}: Obsolete ${what}." f name
+    else f name;
+
+  obsoleteMerge =
+    obsolete "option" pkgs.lib.mergeDefaultOption;
+
   # temporary modifications.
   # backward here means that expression could either be a value or a
   # function which expects to have a pkgs argument.
-  optionalPkgs = x:
-    if __isFunction x then x pkgs else x;
+  optionalPkgs = name: x:
+    if __isFunction x
+    then obsolete "notation" (name: x pkgs) name
+    else x;
 
   backwardPkgsFunListMerge = name: list:
-    pkgs.lib.concatMap optionalPkgs list;
+    pkgs.lib.concatMap (optionalPkgs name) list;
 
   backwardPkgsFunMerge = name: list:
     if list != [] && tail list == []
-    then optionalPkgs (head list)
+    then optionalPkgs name (head list)
     else abort "${name}: Defined at least twice.";
+
 in
 
 {
@@ -347,6 +358,7 @@ in
 
     enableGo7007 = mkOption {
       default = false;
+      merge = obsoleteMerge;
       description = ''
         Enable this option to get support for the WIS GO7007SB
         multi-format video encoder, which is used in a number of
@@ -431,6 +443,7 @@ in
 
     enableIntel2200BGFirmware = mkOption {
       default = false;
+      merge = obsoleteMerge;
       description = "
         Turn on this option if you want firmware for the Intel
         PRO/Wireless 2200BG to be loaded automatically.  This is
@@ -442,6 +455,7 @@ in
 
     enableIntel3945ABGFirmware = mkOption {
       default = false;
+      merge = obsoleteMerge;
       description = "
         This option enables automatic loading of the firmware for the Intel
         PRO/Wireless 3945ABG.
@@ -450,6 +464,7 @@ in
 
     enableIntel4965AGNFirmware = mkOption {
       default = false;
+      merge = obsoleteMerge;
       description = "
         This option enables automatic loading of the firmware for the Intel
         PRO/Wireless 4965AGN.
@@ -458,6 +473,7 @@ in
 
     enableZydasZD1211Firmware = mkOption {
       default = false;
+      merge = obsoleteMerge;
       description = "
         This option enables automatic loading of the firmware for the Zydas
         ZyDAS ZD1211(b) 802.11a/b/g USB WLAN chip.
-- 
GitLab


From 2e9dc1ea47180caf35f3ddcad2e305684611a83a Mon Sep 17 00:00:00 2001
From: Nicolas Pierron <nicolas.b.pierron@gmail.com>
Date: Fri, 8 Aug 2008 18:57:11 +0000
Subject: [PATCH 1022/5331] Rename option: services.xserver.packageFun ->
 .package

svn path=/nixos/trunk/; revision=12553
---
 system/options.nix       | 7 ++++++-
 upstart-jobs/xserver.nix | 2 +-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/system/options.nix b/system/options.nix
index 8ef10f42f2a..df30b8e011a 100644
--- a/system/options.nix
+++ b/system/options.nix
@@ -1417,7 +1417,12 @@ in
 
       packageFun = mkOption {
         default = pkgs.xorg;
-        merge = backwardPkgsFunMerge;
+        merge = obsolete "option" backwardPkgsFunMerge;
+        description = "Obsolete: use 'package' instead.";
+      };
+
+      package = mkOption {
+        default = config.services.xserver.packageFun; # pkgs.xorg;
         description = "
           Alternative X.org package to use. For 
           example, you can replace individual drivers.
diff --git a/upstart-jobs/xserver.nix b/upstart-jobs/xserver.nix
index 9218c80d2b0..a528952c6b1 100644
--- a/upstart-jobs/xserver.nix
+++ b/upstart-jobs/xserver.nix
@@ -10,7 +10,7 @@ let
 
   # Abbreviations.
   cfg = config.services.xserver;
-  xorg = cfg.packageFun;
+  xorg = cfg.package;
   gnome = pkgs.gnome;
   stdenv = pkgs.stdenv;
 
-- 
GitLab


From a33d2f3adc3b63220aed240f29a03c685ef23cd4 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 8 Aug 2008 19:07:07 +0000
Subject: [PATCH 1023/5331] * Use a klibc-based udev.  Hopefully this fixes the
 problems   encountered on x86-64 when udev is compiled against dietlibc.

svn path=/nixos/trunk/; revision=12555
---
 boot/boot-stage-1.nix | 16 ++++++++++++----
 system/system.nix     |  5 +++++
 2 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/boot/boot-stage-1.nix b/boot/boot-stage-1.nix
index fd87e5246d3..b97de3c4e95 100644
--- a/boot/boot-stage-1.nix
+++ b/boot/boot-stage-1.nix
@@ -13,6 +13,11 @@ rec {
     bootStdenv = pkgs.useDietLibC pkgs.stdenv;
   };
 
+  pkgsKlibc = import "${nixpkgsPath}/pkgs/top-level/all-packages.nix" {
+    system = pkgs.stdenv.system;
+    bootStdenv = pkgs.useKlibc pkgs.stdenv kernelPackages.klibc;
+  };
+
   pkgsStatic = import "${nixpkgsPath}/pkgs/top-level/all-packages.nix" {
     system = pkgs.stdenv.system;
     bootStdenv = pkgs.makeStaticBinaries pkgs.stdenv;
@@ -40,10 +45,10 @@ rec {
   extraUtils = pkgs.runCommand "extra-utils"
     { buildInputs = [pkgs.nukeReferences];
       inherit (pkgsStatic) utillinux;
-      inherit (pkgsDiet) udev;
-      e2fsprogs = pkgs.e2fsprogsDiet;
-      devicemapper = if config.boot.initrd.lvm then pkgs.devicemapperStatic else null;
-      lvm2 = if config.boot.initrd.lvm then pkgs.lvm2Static else null;
+      inherit (pkgsKlibc) udev;
+      e2fsprogs = pkgsDiet.e2fsprogs;
+      devicemapper = if config.boot.initrd.lvm then pkgsStatic.devicemapper else null;
+      lvm2 = if config.boot.initrd.lvm then pkgsStatic.lvm2 else null;
       allowedReferences = []; # prevent accidents like glibc being included in the initrd
     }
     ''
@@ -92,6 +97,9 @@ rec {
     rootLabel = if config.boot.autoDetectRootDevice then config.boot.rootLabel else "";
 
     path = [
+      # `extraUtils' comes first because it overrides the `mount'
+      # command provided by klibc (which isn't capable of
+      # auto-detecting FS types).
       extraUtils
       kernelPackages.klibcShrunk
     ];
diff --git a/system/system.nix b/system/system.nix
index 8a3f962b396..5f957b7634a 100644
--- a/system/system.nix
+++ b/system/system.nix
@@ -4,6 +4,7 @@
 }:
 
 rec {
+
   configComponents = [
     configuration
     (import ./options.nix)
@@ -118,6 +119,7 @@ rec {
     extraEtc = pkgs.lib.concatLists (map (job: job.extraEtc) upstartJobs.jobs);
   };
 
+  
   # Font aggregation
   fontDir = import ./fontdir.nix {
     inherit config pkgs;
@@ -125,6 +127,7 @@ rec {
     inherit (pkgs.xorg) mkfontdir mkfontscale fontalias;
   };
 
+  
   # The wrapper setuid programs (since we can't have setuid programs
   # in the Nix store).
   wrapperDir = "/var/setuid-wrappers";
@@ -227,6 +230,7 @@ rec {
   # a reboot.
   ++ nssModules;
 
+  
   # We don't want to put all of `startPath' and `path' in $PATH, since
   # then we get an embarrassingly long $PATH.  So use the user
   # environment builder to make a directory with symlinks to those
@@ -358,4 +362,5 @@ rec {
     configurationName = config.boot.configurationName;
   }) config.environment.checkConfigurationOptions
      optionDeclarations config;
+
 }
-- 
GitLab


From a662f1c47379094b11a9edc58e7faff33c084b8a Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 8 Aug 2008 19:25:31 +0000
Subject: [PATCH 1024/5331] * Fix building the manual.

svn path=/nixos/trunk/; revision=12556
---
 doc/manual/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/manual/default.nix b/doc/manual/default.nix
index b83a4ce5dce..e6f9b84329f 100644
--- a/doc/manual/default.nix
+++ b/doc/manual/default.nix
@@ -6,7 +6,7 @@ let
 
   options = builtins.toFile "options.xml" (builtins.unsafeDiscardStringContext
     (builtins.toXML (pkgs.lib.optionAttrSetToDocList ""
-      (import ../../system/options.nix {pkgs = pkgs; mkOption = pkgs.lib.mkOption;}))));
+      (import ../../system/system.nix {inherit nixpkgsPath; configuration = {};}).optionDeclarations)));
 
   optionsDocBook = pkgs.runCommand "options-db.xml" {} ''
     ${pkgs.libxslt}/bin/xsltproc -o $out ${./options-to-docbook.xsl} ${options} 
-- 
GitLab


From 1c2d81d93d01b256d3bd95de95fe3c4dd02eb05a Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 8 Aug 2008 19:40:19 +0000
Subject: [PATCH 1025/5331] * Remove "obsolete" notation.

svn path=/nixos/trunk/; revision=12557
---
 configuration/rescue-cd.nix | 6 +++---
 system/options.nix          | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/configuration/rescue-cd.nix b/configuration/rescue-cd.nix
index ee2c7c2a510..9a28e671989 100644
--- a/configuration/rescue-cd.nix
+++ b/configuration/rescue-cd.nix
@@ -18,9 +18,9 @@ rec {
       # The label used to identify the installation CD.
       rootLabel = "NIXOS";
       extraTTYs = [7 8]; # manual, rogue
-      extraModulePackages = pkgs: [system.kernelPackages.aufs];
+      extraModulePackages = [system.kernelPackages.aufs];
       
-      kernelPackages = pkgs: pkgs.kernelPackages_2_6_25;
+      kernelPackages = pkgs.kernelPackages_2_6_25;
       
       initrd = {
         extraKernelModules = [
@@ -172,7 +172,7 @@ rec {
     };
  
     environment = {
-      extraPackages = pkgs: [
+      extraPackages = [
         pkgs.vim
         pkgs.subversion # for nixos-checkout
         pkgs.w3m # needed for the manual anyway
diff --git a/system/options.nix b/system/options.nix
index df30b8e011a..4df60a5150c 100644
--- a/system/options.nix
+++ b/system/options.nix
@@ -16,7 +16,7 @@ let
   # backward here means that expression could either be a value or a
   # function which expects to have a pkgs argument.
   optionalPkgs = name: x:
-    if __isFunction x
+    if builtins.isFunction x
     then obsolete "notation" (name: x pkgs) name
     else x;
 
-- 
GitLab


From b760a4b8d97af5d408399b892bddb7f52870e075 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 8 Aug 2008 22:44:45 +0000
Subject: [PATCH 1026/5331] * Use the persistent storage udev rules in the
 initrd so that we can   use /dev/disk/by-{label,id,...} names for the root
 FS. * Kill udevd at the end of stage 1.  Don't know how it got killed  
 previously...

svn path=/nixos/trunk/; revision=12560
---
 boot/boot-stage-1-init.sh |  8 +++++---
 boot/boot-stage-1.nix     | 32 +++++++++++++++++++++++++++++---
 upstart-jobs/udev.nix     |  2 +-
 3 files changed, 35 insertions(+), 7 deletions(-)

diff --git a/boot/boot-stage-1-init.sh b/boot/boot-stage-1-init.sh
index a3f8f8ef7e3..126761f2192 100644
--- a/boot/boot-stage-1-init.sh
+++ b/boot/boot-stage-1-init.sh
@@ -92,9 +92,7 @@ echo shutdown > /sys/power/disk
 
 
 # Create device nodes in /dev.
-export UDEV_CONFIG_FILE=/udev.conf
-echo 'udev_rules="/rules"' > $UDEV_CONFIG_FILE
-mkdir /rules
+export UDEV_CONFIG_FILE=@udevConf@
 udevd --daemon
 udevadm trigger
 udevadm settle
@@ -242,6 +240,10 @@ if test -n "@isLiveCD@"; then
 fi
 
 
+# Stop udevd.
+kill $(minips -C udevd -o pid=)
+
+
 if test -n "$debug1mounts"; then fail; fi
 
 
diff --git a/boot/boot-stage-1.nix b/boot/boot-stage-1.nix
index b97de3c4e95..3195ca81a0a 100644
--- a/boot/boot-stage-1.nix
+++ b/boot/boot-stage-1.nix
@@ -39,13 +39,16 @@ rec {
   };
 
 
+  udev = pkgsKlibc.udev;
+
+    
   # 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.runCommand "extra-utils"
     { buildInputs = [pkgs.nukeReferences];
       inherit (pkgsStatic) utillinux;
-      inherit (pkgsKlibc) udev;
+      inherit udev;
       e2fsprogs = pkgsDiet.e2fsprogs;
       devicemapper = if config.boot.initrd.lvm then pkgsStatic.devicemapper else null;
       lvm2 = if config.boot.initrd.lvm then pkgsStatic.lvm2 else null;
@@ -60,6 +63,7 @@ rec {
       cp $utillinux/bin/mount $utillinux/bin/umount $utillinux/sbin/pivot_root $out/bin
       cp -p $e2fsprogs/sbin/fsck* $e2fsprogs/sbin/e2fsck $out/bin
       cp $udev/sbin/udevd $udev/sbin/udevadm $out/bin
+      cp $udev/lib/udev/*_id $out/bin
       nuke-refs $out/bin/*
     ''; # */
   
@@ -71,7 +75,29 @@ rec {
     (fs: fs.mountPoint == "/" || (fs ? neededForBoot && fs.neededForBoot))
     config.fileSystems;
 
-    
+
+  udevRules = pkgs.stdenv.mkDerivation {
+    name = "udev-rules";
+    buildCommand = ''
+      ensureDir $out
+      cp ${udev}/*/udev/rules.d/60-persistent-storage.rules $out/
+      substituteInPlace $out/60-persistent-storage.rules \
+        --replace ata_id ${extraUtils}/bin/ata_id \
+        --replace usb_id ${extraUtils}/bin/usb_id \
+        --replace scsi_id ${extraUtils}/bin/scsi_id \
+        --replace path_id ${extraUtils}/bin/path_id \
+        --replace vol_id ${extraUtils}/bin/vol_id
+    ''; # */
+  };
+
+  
+  # The udev configuration file for in the initrd.
+  udevConf = pkgs.writeText "udev-initrd.conf" ''
+    udev_rules="${udevRules}"
+    #udev_log="debug"
+  '';
+  
+
   # The init script of boot stage 1 (loading kernel modules for
   # mounting the root FS).
   bootStage1 = pkgs.substituteAll {
@@ -81,7 +107,7 @@ rec {
 
     staticShell = stdenvLinuxStuff.bootstrapTools.bash;
     
-    inherit modulesClosure;
+    inherit modulesClosure udevConf;
     
     inherit (config.boot) autoDetectRootDevice isLiveCD resumeDevice;
 
diff --git a/upstart-jobs/udev.nix b/upstart-jobs/udev.nix
index 43cad5bc4db..4662adde222 100644
--- a/upstart-jobs/udev.nix
+++ b/upstart-jobs/udev.nix
@@ -68,7 +68,7 @@ let
     ''; # */
   };
 
-  # The udev configuration file
+  # The udev configuration file.
   conf = writeText "udev.conf" ''
     udev_rules="${udevRules}"
     #udev_log="debug"
-- 
GitLab


From a83becdee89dbb6fca3cf886526b6ba35b401c52 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 8 Aug 2008 23:01:30 +0000
Subject: [PATCH 1027/5331] * When booting from the installation CD, just mount
   /dev/disk/by-label/<label>.  This makes the whole  
 autoDetectRootDevice/rootLabel machinery unnecessary.

svn path=/nixos/trunk/; revision=12561
---
 boot/boot-stage-1-init.sh   | 92 +++++++++++--------------------------
 boot/boot-stage-1.nix       |  8 ++--
 configuration/rescue-cd.nix | 17 ++++---
 system/options.nix          | 22 +--------
 4 files changed, 40 insertions(+), 99 deletions(-)

diff --git a/boot/boot-stage-1-init.sh b/boot/boot-stage-1-init.sh
index 126761f2192..83a06c7d7dd 100644
--- a/boot/boot-stage-1-init.sh
+++ b/boot/boot-stage-1-init.sh
@@ -158,74 +158,34 @@ mkdir /mnt-root
 echo "mounting the root device.... (fix: sleeping 5 seconds to wait for upcoming usb drivers)"
 sleep 5
 
-if test -n "@autoDetectRootDevice@"; then
-
-    # Look for the root device by label.
-    echo "probing for the NixOS installation CD..."
-
-    for i in /sys/block/*; do
-        if test "$(cat $i/removable)" = "1"; then
-
-            echo "  in $i..."
-
-            set -- $(IFS=: ; echo $(cat $i/dev))
-            major="$1"
-            minor="$2"
-
-            # Create a device node for this device.
-            nuke /dev/tmpdev # don't have `rm' in klibc
-            mknod /dev/tmpdev b "$major" "$minor"
-
-            if mount -o ro -t iso9660 /dev/tmpdev /mnt-root; then
-                if test -e "/mnt-root/@rootLabel@"; then
-                    found=1
-                    break
-                fi
-                umount /mnt-root
-            fi
-        
-        fi
-    done
-
-    if test -z "$found"; then
-        echo "CD not found!"
-        fail
-    fi
-
-else
-
-    # Hard-coded root device(s).
-    mountPoints=(@mountPoints@)
-    devices=(@devices@)
-    fsTypes=(@fsTypes@)
-    optionss=(@optionss@)
-
-    for ((n = 0; n < ${#mountPoints[*]}; n++)); do
-        mountPoint=${mountPoints[$n]}
-        device=${devices[$n]}
-        fsType=${fsTypes[$n]}
-        options=${optionss[$n]}
-
-        # !!! Really quick hack to support bind mounts, i.e., where
-        # the "device" should be taken relative to /mnt-root, not /.
-        # Assume that every device that start with / but doesn't
-        # start with /dev or LABEL= is a bind mount.
-        case $device in
-            /dev/*)
-                ;;
-            LABEL=*)
-                ;;
-            /*)
-                device=/mnt-root$device
-                ;;
-        esac
+# Hard-coded root device(s).
+mountPoints=(@mountPoints@)
+devices=(@devices@)
+fsTypes=(@fsTypes@)
+optionss=(@optionss@)
+
+for ((n = 0; n < ${#mountPoints[*]}; n++)); do
+    mountPoint=${mountPoints[$n]}
+    device=${devices[$n]}
+    fsType=${fsTypes[$n]}
+    options=${optionss[$n]}
+
+    # !!! Really quick hack to support bind mounts, i.e., where the
+    # "device" should be taken relative to /mnt-root, not /.  Assume
+    # that every device that start with / but doesn't start with /dev
+    # or LABEL= is a bind mount.
+    case $device in
+        /dev/*)
+            ;;
+        /*)
+            device=/mnt-root$device
+            ;;
+    esac
 
-        echo "mounting $device on $mountPoint..."
+    echo "mounting $device on $mountPoint..."
 
-        mountFS "$device" "$mountPoint" "$options" "$fsType"
-    done
-    
-fi
+    mountFS "$device" "$mountPoint" "$options" "$fsType"
+done
 
 
 # If this is a live-CD/DVD, then union-mount a tmpfs on top of the
diff --git a/boot/boot-stage-1.nix b/boot/boot-stage-1.nix
index 3195ca81a0a..3e707f9e141 100644
--- a/boot/boot-stage-1.nix
+++ b/boot/boot-stage-1.nix
@@ -109,19 +109,17 @@ rec {
     
     inherit modulesClosure udevConf;
     
-    inherit (config.boot) autoDetectRootDevice isLiveCD resumeDevice;
+    inherit (config.boot) isLiveCD resumeDevice;
 
     # !!! copy&pasted from upstart-jobs/filesystems.nix.
     mountPoints =
-      if !config.boot.autoDetectRootDevice && fileSystems == []
+      if fileSystems == []
       then abort "You must specify the fileSystems option!"
       else map (fs: fs.mountPoint) fileSystems;
-    devices = map (fs: if fs ? device then fs.device else "LABEL=" + fs.label) fileSystems;
+    devices = map (fs: if fs ? device then fs.device else "/dev/disk/by-label/${fs.label}") fileSystems;
     fsTypes = map (fs: if fs ? fsType then fs.fsType else "auto") fileSystems;
     optionss = map (fs: if fs ? options then fs.options else "defaults") fileSystems;
 
-    rootLabel = if config.boot.autoDetectRootDevice then config.boot.rootLabel else "";
-
     path = [
       # `extraUtils' comes first because it overrides the `mount'
       # command provided by klibc (which isn't capable of
diff --git a/configuration/rescue-cd.nix b/configuration/rescue-cd.nix
index 9a28e671989..f3d9822ad83 100644
--- a/configuration/rescue-cd.nix
+++ b/configuration/rescue-cd.nix
@@ -9,14 +9,14 @@
 
 rec {
 
+
+  cdLabel = "NIXOS_INSTALLATION_CD";
+
   
   configuration = {
   
     boot = {
-      autoDetectRootDevice = true;
       isLiveCD = true;
-      # The label used to identify the installation CD.
-      rootLabel = "NIXOS";
       extraTTYs = [7 8]; # manual, rogue
       extraModulePackages = [system.kernelPackages.aufs];
       
@@ -69,6 +69,12 @@ rec {
       };
     };
 
+    fileSystems = [
+      { mountPoint = "/";
+        label = cdLabel;
+      }
+    ];
+
     networking = {
       enableIntel3945ABGFirmware = true;
     };
@@ -277,9 +283,6 @@ rec {
       { source = nixpkgsTarball + "/nixpkgs.tar.bz2";
         target = "/install/nixpkgs.tar.bz2";
       }
-      { source = pkgs.writeText "label" "";
-        target = "/${configuration.boot.rootLabel}";
-      }
     ];
 
     # Closures to be copied to the Nix store on the CD.
@@ -301,7 +304,7 @@ rec {
 
     inherit compressImage;
 
-    volumeID = "NIXOS_INSTALLATION_CD";
+    volumeID = cdLabel;
   };
 
 
diff --git a/system/options.nix b/system/options.nix
index 4df60a5150c..70f7bcb5faf 100644
--- a/system/options.nix
+++ b/system/options.nix
@@ -46,15 +46,6 @@ in
   
   boot = {
 
-    autoDetectRootDevice = mkOption {
-      default = false;
-      description = "
-        Whether to find the root device automatically by searching for a
-        device with the right label.  If this option is off, then a root
-        file system must be specified using <option>fileSystems</option>.
-      ";
-    };
-
     isLiveCD = mkOption {
       default = false;
       description = "
@@ -65,16 +56,6 @@ in
       ";
     };
 
-    rootLabel = mkOption {
-      description = "
-        When auto-detecting the root device (see
-        <option>boot.autoDetectRootDevice</option>), this option
-        specifies the label of the root device.  Right now, this is
-        merely a file name that should exist in the root directory of
-        the file system.  It is used to find the boot CD-ROM.
-      ";
-    };
-
     grubDevice = mkOption {
       default = "";
       example = "/dev/hda";
@@ -588,8 +569,7 @@ in
     ];
     description = "
       The file systems to be mounted.  It must include an entry for
-      the root directory (<literal>mountPoint = \"/\"</literal>) if
-      <literal>boot.autoDetectRootDevice</literal> is not set.  Each
+      the root directory (<literal>mountPoint = \"/\"</literal>).  Each
       entry in the list is an attribute set with the following fields:
       <literal>mountPoint</literal>, <literal>device</literal>,
       <literal>fsType</literal> (a file system type recognised by
-- 
GitLab


From 2783f96ce7727fd1ed7d256825a3c133016286d9 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 8 Aug 2008 23:15:36 +0000
Subject: [PATCH 1028/5331] * Remove the sleep-5-seconds hack in the initrd,
 instead loop until   the device to mount appears.  This wasn't previously
 possible   because of root devices specified by label (mounted via "mount  
 LABEL=foo ..."), but now we use /dev/disk/by-label so we can easily   test
 whether the device already exists.

svn path=/nixos/trunk/; revision=12562
---
 boot/boot-stage-1-init.sh | 20 ++++++++++++++++----
 1 file changed, 16 insertions(+), 4 deletions(-)

diff --git a/boot/boot-stage-1-init.sh b/boot/boot-stage-1-init.sh
index 83a06c7d7dd..9bef32dcaf4 100644
--- a/boot/boot-stage-1-init.sh
+++ b/boot/boot-stage-1-init.sh
@@ -155,10 +155,6 @@ mountFS() {
 # Try to find and mount the root device.
 mkdir /mnt-root
 
-echo "mounting the root device.... (fix: sleeping 5 seconds to wait for upcoming usb drivers)"
-sleep 5
-
-# Hard-coded root device(s).
 mountPoints=(@mountPoints@)
 devices=(@devices@)
 fsTypes=(@fsTypes@)
@@ -182,6 +178,22 @@ for ((n = 0; n < ${#mountPoints[*]}; n++)); do
             ;;
     esac
 
+    # USB storage devices tend to appear with some delay.  It would be
+    # great if we had a way to synchronously wait for them, but
+    # alas...  So just wait for a few seconds for the device to
+    # appear.  If it doesn't appear, try to mount it anyway (and
+    # probably fail).  This is a fallback for non-device "devices"
+    # that we don't properly recognise (like NFS mounts).
+    if ! test -e $device; then
+        echo -n "waiting for device $device to appear..."
+        for ((try = 0; try < 10; try++)); do
+            sleep 1
+            if test -e $device; then break; fi
+            echo -n "."
+        done
+        echo
+    fi
+
     echo "mounting $device on $mountPoint..."
 
     mountFS "$device" "$mountPoint" "$options" "$fsType"
-- 
GitLab


From ffe45949e8fa0acc58ce1b873dcb8a542b8dee6c Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sat, 9 Aug 2008 12:03:08 +0000
Subject: [PATCH 1029/5331] * Use the right mount command in the filesystems
 job so that   NTFS-3G works properly.

svn path=/nixos/trunk/; revision=12565
---
 system/options.nix           |  4 +++-
 system/system.nix            |  2 +-
 upstart-jobs/default.nix     |  3 ++-
 upstart-jobs/filesystems.nix | 10 +++++-----
 4 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/system/options.nix b/system/options.nix
index 70f7bcb5faf..1f4b13300ca 100644
--- a/system/options.nix
+++ b/system/options.nix
@@ -371,7 +371,9 @@ in
     extraHosts = mkOption {
       default = "";
       example = "192.168.0.1 lanlocalhost";
-      description = "Pasted verbatim into /etc/hosts.";
+      description = ''
+        Additional entries to be appended to <filename>/etc/hosts</filename>.
+      '';
     };
 
     useDHCP = mkOption {
diff --git a/system/system.nix b/system/system.nix
index 5f957b7634a..a5059797735 100644
--- a/system/system.nix
+++ b/system/system.nix
@@ -108,7 +108,7 @@ rec {
   # The services (Upstart) configuration for the system.
   upstartJobs = import ../upstart-jobs/default.nix {
     inherit config pkgs nix modprobe nssModulesPath nixEnvVars
-      optionDeclarations kernelPackages;
+      optionDeclarations kernelPackages mount;
   };
 
 
diff --git a/upstart-jobs/default.nix b/upstart-jobs/default.nix
index fb2e6f5ed60..4957482ae9e 100644
--- a/upstart-jobs/default.nix
+++ b/upstart-jobs/default.nix
@@ -1,4 +1,4 @@
-{config, pkgs, nix, modprobe, nssModulesPath, nixEnvVars, optionDeclarations, kernelPackages}:
+{config, pkgs, nix, modprobe, nssModulesPath, nixEnvVars, optionDeclarations, kernelPackages, mount}:
 
 let 
 
@@ -118,6 +118,7 @@ let
       
     # Mount file systems.
     (import ../upstart-jobs/filesystems.nix {
+      inherit mount;
       inherit (pkgs) utillinux e2fsprogs;
       fileSystems = config.fileSystems;
     })
diff --git a/upstart-jobs/filesystems.nix b/upstart-jobs/filesystems.nix
index 1713f6c098a..24569db11b4 100644
--- a/upstart-jobs/filesystems.nix
+++ b/upstart-jobs/filesystems.nix
@@ -1,4 +1,4 @@
-{utillinux, e2fsprogs, fileSystems}:
+{utillinux, e2fsprogs, fileSystems, mount}:
 
 let
 
@@ -61,7 +61,7 @@ script
             # remount to change the options but nothing else.
             if cat /proc/mounts | grep -F -q \" $mountPoint \"; then
                 echo \"remounting $device on $mountPoint\"
-                ${utillinux}/bin/mount -t \"$fsType\" \\
+                ${mount}/bin/mount -t \"$fsType\" \\
                     -o remount,\"$options\" \\
                     \"$device\" \"$mountPoint\" || true
                 continue
@@ -84,7 +84,7 @@ script
 
                 if test \"$prevMountPoint\" = \"$mountPoint\"; then
                     echo \"remounting $device on $mountPoint\"
-                    ${utillinux}/bin/mount -t \"$fsType\" \\
+                    ${mount}/bin/mount -t \"$fsType\" \\
                         -o remount,\"$options\" \\
                         \"$device\" \"$mountPoint\" || true
                     continue
@@ -92,7 +92,7 @@ script
 
                 if test -n \"$prevMountPoint\"; then
                     echo \"unmount $device from $prevMountPoint\"
-                    ${utillinux}/bin/umount \"$prevMountPoint\" || true
+                    ${mount}/bin/umount \"$prevMountPoint\" || true
                 fi
 
             fi
@@ -106,7 +106,7 @@ script
 
             if test \"\$autocreate\" = 1; then mkdir -p \"\$mountPoint\"; fi
 
-            if ${utillinux}/bin/mount -t \"$fsType\" -o \"$options\" \"$device\" \"$mountPoint\"; then
+            if ${mount}/bin/mount -t \"$fsType\" -o \"$options\" \"$device\" \"$mountPoint\"; then
                 newDevices=1
             fi
         
-- 
GitLab


From 23144fee75e25ab0f6404d189710f417cee2ed38 Mon Sep 17 00:00:00 2001
From: Marc Weber <marco-oweber@gmx.de>
Date: Sat, 9 Aug 2008 23:26:37 +0000
Subject: [PATCH 1030/5331] added "from system path" hint to description of
 setuid options

svn path=/nixos/trunk/; revision=12568
---
 system/options.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/system/options.nix b/system/options.nix
index 1f4b13300ca..f76ce08438f 100644
--- a/system/options.nix
+++ b/system/options.nix
@@ -2506,8 +2506,8 @@ in
         "fusermount" "wodim" "cdrdao"
       ];
       description = "
-        Only the programs listed here will be made setuid root (through
-        a wrapper program).  It's better to set
+        Only the programs from system path listed her will be made setuid root
+        (through a wrapper program).  It's better to set
         <option>security.extraSetuidPrograms</option>.
       ";
     };
@@ -2531,7 +2531,7 @@ in
         setgid = true;
       }];
       description = ''
-        List of non-trivial setuid programs, like Postfix sendmail. Default 
+        List of non-trivial setuid programs from ssystem path, like Postfix sendmail. Default 
         should probably be nobody:nogroup:false:false - if you are bothering
         doing anything with a setuid program, "root.root u+s g-s" is not what
         you are aiming at..
-- 
GitLab


From acda0c6b27fe5464522e56f465fe6ad31f3572f4 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Sun, 10 Aug 2008 05:44:25 +0000
Subject: [PATCH 1031/5331] Typo fix

svn path=/nixos/trunk/; revision=12569
---
 system/options.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/system/options.nix b/system/options.nix
index f76ce08438f..9380d8252c8 100644
--- a/system/options.nix
+++ b/system/options.nix
@@ -2531,7 +2531,7 @@ in
         setgid = true;
       }];
       description = ''
-        List of non-trivial setuid programs from ssystem path, like Postfix sendmail. Default 
+        List of non-trivial setuid programs from system path, like Postfix sendmail. Default 
         should probably be nobody:nogroup:false:false - if you are bothering
         doing anything with a setuid program, "root.root u+s g-s" is not what
         you are aiming at..
-- 
GitLab


From 2eb6597bd328affe7dc1dfc8024cb6b7e136b74e Mon Sep 17 00:00:00 2001
From: Marc Weber <marco-oweber@gmx.de>
Date: Sun, 10 Aug 2008 12:23:28 +0000
Subject: [PATCH 1032/5331] remove maybe existing /etc/mtab symlink and only
 mount usb if kernel supports it

svn path=/nixos/trunk/; revision=12570
---
 boot/boot-stage-2-init.sh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/boot/boot-stage-2-init.sh b/boot/boot-stage-2-init.sh
index 59f56a06e96..e79f9992734 100644
--- a/boot/boot-stage-2-init.sh
+++ b/boot/boot-stage-2-init.sh
@@ -29,6 +29,7 @@ mkdir -m 0755 -p /etc
 test -e /etc/fstab || touch /etc/fstab # to shut up mount
 mkdir -m 0755 -p /proc
 mount -n -t proc none /proc
+[ -s /etc/mtab ] && rm /etc/mtab # while installing a symlink is created (see man mount), if it's still there for whateever reason remove it
 cat /proc/mounts > /etc/mtab
 mkdir -m 0755 -p /etc/nixos
 
@@ -70,7 +71,7 @@ mkdir -m 0755 -p /dev
 mount -t tmpfs -o "mode=0755" none /dev
 mkdir -m 0755 -p /dev/pts
 mount -t devpts none /dev/pts
-mount -t usbfs none /proc/bus/usb
+[ -e /proc/bus/usb ] && mount -t usbfs none /proc/bus/usb # uml doesn't have usb by default
 mkdir -m 01777 -p /tmp 
 mkdir -m 0755 -p /var
 mkdir -m 0755 -p /nix/var
-- 
GitLab


From 44134d90cbabc7398d12fb6d482ceb6f0176d97e Mon Sep 17 00:00:00 2001
From: Marc Weber <marco-oweber@gmx.de>
Date: Sun, 10 Aug 2008 13:48:21 +0000
Subject: [PATCH 1033/5331] added example for extraJobs

svn path=/nixos/trunk/; revision=12572
---
 system/options.nix | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/system/options.nix b/system/options.nix
index 9380d8252c8..ab69d803539 100644
--- a/system/options.nix
+++ b/system/options.nix
@@ -623,6 +623,16 @@ in
 
     extraJobs = mkOption {
       default = [];
+      example = [
+           { name = "test-job";
+             job = ''
+               description "nc"
+               start on started network-interfaces
+               respawn
+               env PATH=/var/run/current-system/sw/bin
+               exec sh -c "echo "hello world" | ${pkgs.netcat}/bin/nc -l -p 9000
+               '';
+           } ];
       description = "
         Additional Upstart jobs.
       ";
-- 
GitLab


From 5dc694d39a281872cd29c2da41a82b107a6ac358 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 11 Aug 2008 11:37:56 +0000
Subject: [PATCH 1034/5331] * Fixed references to values moved to
 boot-stage-1.nix.

svn path=/nixos/trunk/; revision=12582
---
 default.nix | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/default.nix b/default.nix
index a52fd94b78a..57b326437ec 100644
--- a/default.nix
+++ b/default.nix
@@ -10,12 +10,9 @@ in
 
 { inherit (system)
     activateConfiguration
-    bootStage1
     bootStage2
     etc
-    extraUtils
     grubMenuBuilder
-    initialRamdisk
     kernel
     modulesTree
     nix
@@ -30,7 +27,14 @@ in
     nixosInstall
     nixosRebuild
     nixosGenSeccureKeys
-    ;    
+    ;
+
+  inherit (system.initialRamdiskStuff)
+    bootStage1
+    extraUtils
+    initialRamdisk
+    modulesClosure
+    ;
     
   nixFallback = system.nix;
 
-- 
GitLab


From 4c3627f16e1a41c522d47fb51a71cd147a3f94c8 Mon Sep 17 00:00:00 2001
From: Sander van der Burg <s.vanderburg@tudelft.nl>
Date: Mon, 11 Aug 2008 21:35:45 +0000
Subject: [PATCH 1035/5331] Added CATALINA_OPTS parameter

svn path=/nixos/trunk/; revision=12588
---
 system/options.nix      | 5 +++++
 upstart-jobs/tomcat.nix | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/system/options.nix b/system/options.nix
index ab69d803539..1689b45f414 100644
--- a/system/options.nix
+++ b/system/options.nix
@@ -1508,6 +1508,11 @@ in
         description = "Parameters to pass to the Java Virtual Machine which spawns Apache Tomcat";
       };
       
+      catalinaOpts = mkOption {
+        default = "";
+        description = "Parameters to pass to the Java Virtual Machine which spawns the Catalina servlet container";
+      };
+      
       sharedLibFrom = mkOption {
         default = "";
         description = "Location where shared libraries are stored. Leave empty to use the baseDir.";
diff --git a/upstart-jobs/tomcat.nix b/upstart-jobs/tomcat.nix
index 503d1cf3963..ad4736386d9 100644
--- a/upstart-jobs/tomcat.nix
+++ b/upstart-jobs/tomcat.nix
@@ -99,7 +99,7 @@ in
 
     end script
     
-    respawn ${pkgs.su}/bin/su -s ${pkgs.bash}/bin/sh ${cfg.user} -c 'CATALINA_BASE=${cfg.baseDir} JAVA_HOME=${pkgs.jdk} JAVA_OPTS="${cfg.javaOpts}" ${pkgs.tomcat6}/bin/startup.sh; sleep 1d'
+    respawn ${pkgs.su}/bin/su -s ${pkgs.bash}/bin/sh ${cfg.user} -c 'CATALINA_BASE=${cfg.baseDir} JAVA_HOME=${pkgs.jdk} JAVA_OPTS="${cfg.javaOpts}" CATALINA_OPTS="${cfg.catalinaOpts}" ${pkgs.tomcat6}/bin/startup.sh; sleep 1d'
     
     stop script
         echo "Stopping tomcat..."
-- 
GitLab


From c5fea583e296b40fb05b8b1a4216d18dc0e4e7f4 Mon Sep 17 00:00:00 2001
From: Sander van der Burg <s.vanderburg@tudelft.nl>
Date: Tue, 12 Aug 2008 13:16:12 +0000
Subject: [PATCH 1036/5331] Added disnix hook options

svn path=/nixos/trunk/; revision=12596
---
 system/options.nix      | 10 ++++++++++
 upstart-jobs/disnix.nix |  2 +-
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/system/options.nix b/system/options.nix
index 1689b45f414..8db9703c09b 100644
--- a/system/options.nix
+++ b/system/options.nix
@@ -1534,6 +1534,16 @@ in
         default = false;
         description = "Whether to enable Disnix";
       };
+      
+      activateHook = mkOption {
+        default = "";
+        description = "Custom script or executable that activates services through Disnix";
+      };
+
+      deactivateHook = mkOption {
+        default = "";
+        description = "Custom script or executable that deactivates services through Disnix";
+      };      
     };
     
     httpd = {
diff --git a/upstart-jobs/disnix.nix b/upstart-jobs/disnix.nix
index a952f5beab1..706b9d14d76 100644
--- a/upstart-jobs/disnix.nix
+++ b/upstart-jobs/disnix.nix
@@ -19,6 +19,6 @@ in
         sleep 3
       end script
       
-      respawn ${pkgs.bash}/bin/sh -c 'export PATH=/var/run/current-system/sw/bin:$PATH; export HOME=/root; ${pkgs.disnix}/bin/disnix-service'
+      respawn ${pkgs.bash}/bin/sh -c 'export PATH=/var/run/current-system/sw/bin:$PATH; export HOME=/root; export DISNIX_ACTIVATE=${cfg.activateHook}; export DISNIX_DEACTIVATE_HOOK=${cfg.deactivateHook}; ${pkgs.disnix}/bin/disnix-service'
     '';
 }
-- 
GitLab


From fdc362a72646a9d26a22c0d75f40e61ef5a4055a Mon Sep 17 00:00:00 2001
From: Sander van der Burg <s.vanderburg@tudelft.nl>
Date: Wed, 13 Aug 2008 09:44:40 +0000
Subject: [PATCH 1037/5331] Fixed a very stupid bug

svn path=/nixos/trunk/; revision=12611
---
 upstart-jobs/disnix.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/upstart-jobs/disnix.nix b/upstart-jobs/disnix.nix
index 706b9d14d76..2f64afbc4b9 100644
--- a/upstart-jobs/disnix.nix
+++ b/upstart-jobs/disnix.nix
@@ -19,6 +19,6 @@ in
         sleep 3
       end script
       
-      respawn ${pkgs.bash}/bin/sh -c 'export PATH=/var/run/current-system/sw/bin:$PATH; export HOME=/root; export DISNIX_ACTIVATE=${cfg.activateHook}; export DISNIX_DEACTIVATE_HOOK=${cfg.deactivateHook}; ${pkgs.disnix}/bin/disnix-service'
+      respawn ${pkgs.bash}/bin/sh -c 'export PATH=/var/run/current-system/sw/bin:$PATH; export HOME=/root; export DISNIX_ACTIVATE_HOOK=${cfg.activateHook}; export DISNIX_DEACTIVATE_HOOK=${cfg.deactivateHook}; ${pkgs.disnix}/bin/disnix-service'
     '';
 }
-- 
GitLab


From d74caf133adfe4dff3b2755ca3c8d6f5721a482e Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 15 Aug 2008 14:15:25 +0000
Subject: [PATCH 1038/5331] * Idem.

svn path=/nixos/trunk/; revision=12634
---
 boot/boot-stage-1.nix | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/boot/boot-stage-1.nix b/boot/boot-stage-1.nix
index 3e707f9e141..c26c8d1a096 100644
--- a/boot/boot-stage-1.nix
+++ b/boot/boot-stage-1.nix
@@ -50,8 +50,14 @@ rec {
       inherit (pkgsStatic) utillinux;
       inherit udev;
       e2fsprogs = pkgsDiet.e2fsprogs;
-      devicemapper = if config.boot.initrd.lvm then pkgsStatic.devicemapper else null;
-      lvm2 = if config.boot.initrd.lvm then pkgsStatic.lvm2 else null;
+      devicemapper =
+        if config.boot.initrd.lvm
+        then assert pkgs.devicemapper.enableStatic; pkgs.devicemapper
+        else null;
+      lvm2 =
+        if config.boot.initrd.lvm
+        then assert pkgs.lvm2.enableStatic; pkgs.lvm2
+        else null;
       allowedReferences = []; # prevent accidents like glibc being included in the initrd
     }
     ''
-- 
GitLab


From 27df3ed624e0d6ea2aba02259385fc657f9278cb Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 15 Aug 2008 14:28:52 +0000
Subject: [PATCH 1039/5331] * stage2_eltorito is in a different place on
 x86_64.

svn path=/nixos/trunk/; revision=12636
---
 configuration/rescue-cd.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/configuration/rescue-cd.nix b/configuration/rescue-cd.nix
index f3d9822ad83..19c47b625ad 100644
--- a/configuration/rescue-cd.nix
+++ b/configuration/rescue-cd.nix
@@ -259,7 +259,7 @@ rec {
 
     # Single files to be copied to fixed locations on the CD.
     contents = [
-      { source = "${pkgs.grub}/lib/grub/i386-pc/stage2_eltorito";
+      { source = "${pkgs.grub}/lib/grub/${if platform == "i686-linux" then "i386-pc" else "x86_64-unknown"}/stage2_eltorito";
         target = "boot/grub/stage2_eltorito";
       }
       { source = grubCfg;
-- 
GitLab


From a6fb8cb2587e354e098903e9726d607236a777f7 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Fri, 15 Aug 2008 15:03:50 +0000
Subject: [PATCH 1040/5331] Ported ISO image grub-related update

svn path=/nixos/trunk/; revision=12637
---
 configuration/rescue-cd-configurable.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/configuration/rescue-cd-configurable.nix b/configuration/rescue-cd-configurable.nix
index c0f8d2e6637..1cb255badd2 100644
--- a/configuration/rescue-cd-configurable.nix
+++ b/configuration/rescue-cd-configurable.nix
@@ -396,7 +396,8 @@ rec {
     contents = lib.uniqList {
       inputList = [
         { 
-          source = "${pkgs.grub}/lib/grub/i386-pc/stage2_eltorito";
+          source = 
+	    "${pkgs.grub}/lib/grub/${if platform == "i686-linux" then "i386-pc" else "x86_64-unknown"}/stage2_eltorito";
           target = "boot/grub/stage2_eltorito";
         }
         { 
-- 
GitLab


From b69efea5a75acc4fce72a1e0f079bcb90341e376 Mon Sep 17 00:00:00 2001
From: Marc Weber <marco-oweber@gmx.de>
Date: Sat, 16 Aug 2008 00:59:12 +0000
Subject: [PATCH 1041/5331] reworked error handling on startup (stage-1) on any
 error you'll be asked to run (interactive/ final) shell or continue ignoring
 the error

svn path=/nixos/trunk/; revision=12639
---
 boot/boot-stage-1-init.sh | 40 ++++++++++++++++++++++++++++++++++-----
 1 file changed, 35 insertions(+), 5 deletions(-)

diff --git a/boot/boot-stage-1-init.sh b/boot/boot-stage-1-init.sh
index 9bef32dcaf4..dd8047b14ef 100644
--- a/boot/boot-stage-1-init.sh
+++ b/boot/boot-stage-1-init.sh
@@ -1,11 +1,36 @@
 #! @staticShell@
 
-fail() {
+targetRoot=/mnt/root
+dialog(){
+    timeout=15
+    echo
+    echo "Press within $timeout seconds:"
+    echo "  f) to switch finally to an interactive shell having pid 1"
+    echo "     (you'll need this to start stage2 / upstart)"
+    echo "  i) to launch an intercative shell"
+    echo "  *) to continue immediately (ignoring the failing command)"
+    read -t $timeout reply
+    case $reply in
+      f) exec @staticShell@;;
+      i) echo
+         echo "Quit interactive shell with exit status of"
+         echo " 0        : to continue"
+         echo " non zero : to get this dialog again (eg to switch to interactive shell with pid 1"
+        @staticShell@ || fail
+      ;;
+      *) echo continuing ignoring error;;
+    esac
+}
+
+fail(){
     # If starting stage 2 failed, start an interactive shell.
-    echo "Stage 2 failed, starting emergency shell..."
-    echo "(Stage 1 init script is $stage2Init)"
-    exec @staticShell@
+    echo "error while running Stage 1"
+    echo "Stage 1 should mount the root partition containing the nix store on \`$targetRoot'";
+    echo
+    dialog
 }
+trap 'fail' ERR;
+
 
 
 # Poor man's `basename'.
@@ -232,4 +257,9 @@ if test -z "$stage2Init"; then fail; fi
 umount /sys
 umount /proc
 exec run-init "$targetRoot" "$stage2Init"
-fail
+
+echo
+echo $1 failed running "$stage2Init"
+echo "It's your last chance to fix things manually without rebooting"
+echo "finally switching to interactive shell pid 1"
+export $stage2Init; exec @staticShell@
-- 
GitLab


From f1be382d71f0f7a5be4f3ed63189d408e0d82d75 Mon Sep 17 00:00:00 2001
From: Marc Weber <marco-oweber@gmx.de>
Date: Sat, 16 Aug 2008 00:59:23 +0000
Subject: [PATCH 1042/5331] add setuidOwners programs automatically to setuid
 list It should be enough to specify them once

svn path=/nixos/trunk/; revision=12640
---
 system/system.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/system/system.nix b/system/system.nix
index a5059797735..3c3cc21de57 100644
--- a/system/system.nix
+++ b/system/system.nix
@@ -267,7 +267,8 @@ rec {
       config.security.extraSetuidPrograms ++
       pkgs.lib.optional config.security.sudo.enable "sudo" ++
       pkgs.lib.optionals config.services.atd.enable ["at" "atq" "atrm"] ++
-      pkgs.lib.optional (config.services.xserver.sessionType == "kde") "kcheckpass";
+      pkgs.lib.optional (config.services.xserver.sessionType == "kde") "kcheckpass" ++
+      map ( x : x.program ) config.security.setuidOwners;
 
     inherit (usersGroups) createUsersGroups usersList groupsList;
 
-- 
GitLab


From 67b1b9af805d17d2ddd8cb60a33002a4acf23343 Mon Sep 17 00:00:00 2001
From: Marc Weber <marco-oweber@gmx.de>
Date: Sun, 17 Aug 2008 01:11:57 +0000
Subject: [PATCH 1043/5331] rewritten nixos-checkout code. You can now define
 multiple repositories. See options.nix

svn path=/nixos/trunk/; revision=12645
---
 installer/default.nix       | 83 ++++++++++++++++++++++++++++++++++++-
 installer/nixos-checkout.sh | 62 ---------------------------
 installer/nixos-rebuild.sh  |  4 +-
 system/options.nix          | 46 ++++++++++++++++++++
 4 files changed, 129 insertions(+), 66 deletions(-)
 delete mode 100644 installer/nixos-checkout.sh

diff --git a/installer/default.nix b/installer/default.nix
index 46a1c941c8c..6eb94bc3fc3 100644
--- a/installer/default.nix
+++ b/installer/default.nix
@@ -7,6 +7,56 @@ let
     isExecutable = true;
   });
 
+  inherit (pkgs.lib) id all whatis escapeShellArg concatMapStrings concatMap
+  mapAttrs concatLists flattenAttrs filter;
+
+  # f adds svn defaults
+  # returns in any case:
+  # { type = git/svn; 
+  #   target = path;
+  #   initialize = cmd; # must create target dir, dirname target will exist
+  #   update = cmd;     # pwd will be target
+  #   default = true/false;
+  # }
+  f = repo : attrs :
+    assert (__isAttrs attrs);
+    assert (repo + "" == repo);
+    if (! (attrs ? type)) then 
+      throw "repo type is missing of : ${whatis attrs}"
+    else if attrs.type == "svn" then
+      let a = { # add svn defaults
+                url = "https://svn.nixos.org/repos/nix/${repo}/trunk";
+                target = "/etc/nixos/${repo}";
+              } // attrs; in
+      rec { 
+        inherit (a) type target;
+        default =  if a ? default then a.default else false;
+        initialize = "svn co ${a.url} ${a.target}"; 
+        update = initialize; # co is just as fine as svn update
+     }
+    else  if attrs.type == "git" then # sanity check for existing attrs
+      assert (all id (map ( attr : if __hasAttr attr attrs then true 
+                                     else throw "git repository item is missing attribute ${attr}")
+                          [ "target" "initialize" "update" ]
+                      ));
+    let t = escapeShellArg attrs.target; in
+    rec {
+      inherit (attrs) type target;
+      default =  if attrs ? default then attrs.default else false;
+      update = "cd ${t}; ${attrs.update}";
+      initialize =  ''
+    cd $(dirname ${t}); ${attrs.initialize}
+    [ -d ${t} ] || { echo "git initialize failed to create target directory ${t}"; exit 1; }
+    ${update}'';
+    }
+    else throw "unkown repo type ${attrs.type}"; in
+
+    # apply f on each repo definition
+    let repos = mapAttrs ( repo : list : map (x : (f repo x) // { inherit repo; } ) list ) config.installer.repos;
+
+    defaultRepo = list : __head ( (filter ( attrs : attrs ? default && attrs.default == true ) list)
+                                ++ list );
+
 in
 
 {
@@ -27,6 +77,8 @@ in
   };
 
   nixosRebuild = makeProg {
+    defaultNIXOS   = (defaultRepo repos.nixos  ).target;
+    defaultNIXPKGS = (defaultRepo repos.nixpkgs).target;
     name = "nixos-rebuild";
     src = ./nixos-rebuild.sh;
   };
@@ -36,9 +88,36 @@ in
     src = ./nixos-gen-seccure-keys.sh;
   };
 
-  nixosCheckout = makeProg {
+  nixosCheckout =
+    makeProg {
     name = "nixos-checkout";
-    src = ./nixos-checkout.sh;
+    src = pkgs.writeScript "nixos-checkout" (''
+          #! @shell@ -e
+          # this file is automatically generated from nixos configuration file settings (installer.repos)
+          backupTimestamp=$(date "+%Y%m%d%H%M%S")
+          '' + concatMapStrings ( attrs :
+                let repoType = __getAttr attrs.type config.installer.repoTypes; 
+                    target = escapeShellArg attrs.target; in
+                ''
+                  # ${attrs.type} repo ${target}
+                  PATH=
+                  for path in ${builtins.toString repoType.env}; do
+                    PATH=$PATH:$path/bin:$path/sbin
+                  done
+                  if [ -d  ${target} ] && { cd ${target} && { ${ repoType.valid}; }; }; then
+                      echo; echo '>>  ' updating ${attrs.type} repo ${target}
+                      set -x; ${attrs.update}; set +x
+                  else # [ make backup and ] initialize
+                      [ -e ${target} ] && mv ${target} ${target}-$backupTimestamp
+                      target=${target}
+                      [ -d "$(dirname ${target})" ] || mkdir -p  "$(dirname ${target})"
+                      echo; echo '>>  'initializing ${attrs.type} repo ${target}
+                      set -x; ${attrs.initialize}; set +x
+                  fi
+                ''
+              ) # flatten all repo definition to one list adding the repository
+               ( concatLists  (flattenAttrs repos) )
+      );
    };
 
   nixosHardwareScan = makeProg {
diff --git a/installer/nixos-checkout.sh b/installer/nixos-checkout.sh
deleted file mode 100644
index 0457f4d7cb7..00000000000
--- a/installer/nixos-checkout.sh
+++ /dev/null
@@ -1,62 +0,0 @@
-#! @shell@ -e
-set -x
-
-# Pull the manifests defined in the configuration (the "manifests"
-# attribute).  Wonderfully hacky *and* cut&pasted from nixos-installer.sh!!!
-if test -z "$NIXOS"; then NIXOS=/etc/nixos/nixos; fi
-if test -z "$NIXOS_NO_PULL"; then
-    manifests=$(nix-instantiate --eval-only --xml --strict $NIXOS -A manifests \
-        | grep '<string'  | sed 's^.*"\(.*\)".*^\1^g')
-
-    mkdir -p /nix/var/nix/channel-cache
-    for i in $manifests; do
-        NIX_DOWNLOAD_CACHE=/nix/var/nix/channel-cache nix-pull $i || true
-    done
-fi
-
-# Obtain Subversion.
-if test -z "$(type -tp svn)"; then
-    #nix-channel --add http://nixos.org/releases/nixpkgs/channels/nixpkgs-unstable
-    #nix-channel --update
-    nix-env -i subversion
-fi
-
-cd /etc/nixos
-
-if test -n "$NIXOS" && test "$NIXOS_BRANCH" = 1 && test -z "$CHECKOUT_BRANCH" && ! test "$NIXOS" = "/etc/nixos/nixos"; then
-    CHECKOUT_BRANCH=${NIXOS##*/}
-    CHECKOUT_BRANCH=${CHECKOUT_BRANCH#nixos-}
-    CHECKOUT_BRANCH=branches/${CHECKOUT_BRANCH}
-    CHECKOUT_SUFFIX=-${CHECKOUT_BRANCH##*/}
-fi
-
-if test -n "${CHECKOUT_BRANCH}" && test -z "${CHECKOUT_SUFFIX}" ; then
-    CHECKOUT_SUFFIX=-${CHECKOUT_BRANCH##*/}
-fi;
-
-# Move any old nixos or nixpkgs directories out of the way.
-backupTimestamp=$(date "+%Y%m%d%H%M%S")
-
-if test -e nixos -a ! -e nixos/.svn; then
-    mv nixos${CHECKOUT_SUFFIX} nixos-$backupTimestamp
-fi
-
-if test -e nixpkgs -a ! -e nixpkgs/.svn; then
-    mv nixpkgs${CHECKOUT_SUFFIX} nixpkgs-$backupTimestamp
-fi
-
-if test -e services -a ! -e services/.svn; then
-    mv nixos/services services-$backupTimestamp
-fi
-
-# Check out the NixOS and Nixpkgs sources.
-svn co https://svn.nixos.org/repos/nix/nixos/trunk nixos${CHECKOUT_SUFFIX}
-svn co https://svn.nixos.org/repos/nix/nixpkgs/${CHECKOUT_BRANCH:-trunk} nixpkgs${CHECKOUT_SUFFIX}
-svn co https://svn.nixos.org/repos/nix/services/trunk services
-
-# Add a few required symlink.
-ln -sfn ../services nixos${CHECKOUT_SUFFIX}/services
-
-REVISION=$(svn info nixpkgs${CHECKOUT_SUFFIX} | egrep '^Revision: ');
-REVISION=${REVISION#Revision: };
-echo "\"$REVISION\"" > version.nix
diff --git a/installer/nixos-rebuild.sh b/installer/nixos-rebuild.sh
index 5ee1d29dd9c..c173787d585 100644
--- a/installer/nixos-rebuild.sh
+++ b/installer/nixos-rebuild.sh
@@ -42,8 +42,8 @@ fi
 
 # Allow the location of NixOS sources and the system configuration
 # file to be overridden.
-NIXOS=${NIXOS:-/etc/nixos/nixos}
-NIXPKGS=${NIXPKGS:-$NIXOS/pkgs}
+NIXOS=${NIXOS:-@defaultNIXOS@}
+NIXPKGS=${NIXPKGS:-@defaultNIXPKGS@}
 NIXOS_CONFIG=${NIXOS_CONFIG:-/etc/nixos/configuration.nix}
 
 
diff --git a/system/options.nix b/system/options.nix
index 8db9703c09b..bea68e5283b 100644
--- a/system/options.nix
+++ b/system/options.nix
@@ -2424,6 +2424,52 @@ in
       ";
     };
 
+    repos = {
+      nixos = mkOption {
+        default = [ { type  = "svn"; }  ];
+        example = [ { type = "svn"; url = "https://svn.nixos.org/repos/nix/nixos/branches/stdenv-updates"; target = "/etc/nixos/nixos-stdenv-updates"; }
+                    { type = "git"; initialize = ''git clone git://mawercer.de/nixos $target''; update = "git pull origin"; target = "/etc/nixos/nixos-git"; }
+                  ];
+        description = "The nixos repository from which the system will be build. 
+                       nixos-checkout will update all defined repositories,
+                       nixos-rebuild will use the the first item which has
+                       the attribute default = true falling back to the
+                       first item. the type defines the repository tool added
+                       to the path. It also defines a \"valid\" repository.
+                       If the target directory already exists and it's not
+                       valid it will be moved to the backup location
+                       <filename>\${dir}-date</filename>.
+                       For svn the default target and repositories are
+                       <filename>/etc/nixos/nixos</filename> and
+                       <filename>https://svn.nixos.org/repos/nix/nixos/trunk</filename>.
+                       For git repositories update is called after
+                       initialization when the repo is initialized.
+                       The initialize code is run from working directory
+                       dirname \$target and should create the directory
+                       <filename>\$target<filename>. (<command>git clone url nixos/nixpkgs/services</command> should do)
+                       ";
+      };
+
+      nixpkgs = mkOption {
+        default = [ { type  = "svn"; }  ];
+        description = "same as <option>repos.nixos</option>";
+      };
+
+      services = mkOption {
+        default = [ { type  = "svn"; } ];
+        description = "same as <option>repos.nixos</option>";
+      };
+    };
+
+    repoTypes = mkOption {
+        default = {
+          svn = { valid = "[ -d .svn ]"; env = [ pkgs.coreutils pkgs.subversion ]; };
+          git = { valid = "[ -d .git ]"; env = [ pkgs.coreutils pkgs.git pkgs.gnused /*  FIXME: use full path to sed in nix-pull */ ]; };
+        };
+        description = "defines PATH environment and when directory is considered beeing a valid repository.
+              If it's not it's moved to a backup directory";
+    };
+
     manifests = mkOption {
       default = [http://nixos.org/releases/nixpkgs/channels/nixpkgs-unstable/MANIFEST];
       example =
-- 
GitLab


From 545406b2e2b593dbecbf5dc56558e6361823c098 Mon Sep 17 00:00:00 2001
From: Sander van der Burg <s.vanderburg@tudelft.nl>
Date: Mon, 18 Aug 2008 14:48:55 +0000
Subject: [PATCH 1044/5331] Added support for ejabberd virtualhosts

svn path=/nixos/trunk/; revision=12648
---
 system/options.nix        | 10 ++++++++++
 upstart-jobs/ejabberd.nix |  5 ++++-
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/system/options.nix b/system/options.nix
index bea68e5283b..2804e723a60 100644
--- a/system/options.nix
+++ b/system/options.nix
@@ -1438,6 +1438,16 @@ in
         default = "/var/log/ejabberd";
         description = "Location of the logfile directory of ejabberd";
       };
+      
+      confDir = mkOption {
+        default = "/var/ejabberd";
+	description = "Location of the config directory of ejabberd";
+      };
+      
+      virtualHosts = mkOption {
+        default = "\"localhost\"";
+        description = "Virtualhosts that ejabberd should host. Hostnames are surrounded with doublequotes and separated by commas";
+      };
     };
 
     jboss = {
diff --git a/upstart-jobs/ejabberd.nix b/upstart-jobs/ejabberd.nix
index f1f24962a6a..d2a5084068f 100644
--- a/upstart-jobs/ejabberd.nix
+++ b/upstart-jobs/ejabberd.nix
@@ -22,9 +22,12 @@ in
             then
                 cp -av ${pkgs.ejabberd}/var/lib/ejabberd /var/lib
             fi
+	    
+	    mkdir -p ${cfg.confDir}
+	    sed -e 's|{hosts, \["localhost"\]}.|{hosts, \[${cfg.virtualHosts}\]}.|' ${pkgs.ejabberd}/etc/ejabberd/ejabberd.cfg > ${cfg.confDir}/ejabberd.cfg
       end script
       
-      respawn ${pkgs.bash}/bin/sh -c 'export PATH=$PATH:${pkgs.ejabberd}/sbin; cd ~; ejabberdctl --logs ${cfg.logsDir} --spool ${cfg.spoolDir} start; sleep 1d'
+      respawn ${pkgs.bash}/bin/sh -c 'export PATH=$PATH:${pkgs.ejabberd}/sbin; cd ~; ejabberdctl --logs ${cfg.logsDir} --spool ${cfg.spoolDir} --config ${cfg.confDir}/ejabberd.cfg start; sleep 1d'
       
       stop script
           ${pkgs.ejabberd}/sbin/ejabberdctl stop
-- 
GitLab


From fe28b75fdd62e2387dfd2f3b00ce981c1f5b4832 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Tue, 19 Aug 2008 05:55:00 +0000
Subject: [PATCH 1045/5331] Updated fontdir to match builderDefs changes.

svn path=/nixos/trunk/; revision=12656
---
 system/fontdir.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/system/fontdir.nix b/system/fontdir.nix
index 42a1360cdb3..032785291ad 100644
--- a/system/fontdir.nix
+++ b/system/fontdir.nix
@@ -1,5 +1,5 @@
-args : with args; with builderDefs {src="";} null;
-  let localDefs = builderDefs rec {
+args : with args; with builderDefs;
+  let localDefs = builderDefs.meta.function rec {
     src = "";/* put a fetchurl here */
 
     buildInputs = [mkfontdir mkfontscale ttmkfdir];
@@ -39,7 +39,7 @@ args : with args; with builderDefs {src="";} null;
     rm fonts.scale.old
     cat \$( find ${fontalias}/ -name fonts.alias) >fonts.alias
   ") ["minInit" "addInputs"];
-  } null; /* null is a terminator for sumArgs */
+  };
   in with localDefs;
 stdenv.mkDerivation rec {
   name = "X11-fonts";
-- 
GitLab


From 15e77dfb1c1e32a3ebfc006034047ad756ed7538 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 25 Aug 2008 09:07:42 +0000
Subject: [PATCH 1046/5331] * Add some ugly fonts (like adobe-helvetica)
 required by some   primitive applications.

svn path=/nixos/trunk/; revision=12700
---
 system/fonts.nix | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/system/fonts.nix b/system/fonts.nix
index 0a2b1487982..b9cf5710301 100644
--- a/system/fonts.nix
+++ b/system/fonts.nix
@@ -12,6 +12,9 @@
   # - a few statically built locations
   pkgs.xorg.fontbhttf
   pkgs.xorg.fontbhlucidatypewriter100dpi
+  pkgs.xorg.fontbhlucidatypewriter75dpi
+  pkgs.xorg.fontadobe100dpi
+  pkgs.xorg.fontadobe75dpi
   pkgs.ttf_bitstream_vera
   pkgs.freefont_ttf
   pkgs.xorg.fontbh100dpi
@@ -19,8 +22,8 @@
   pkgs.xorg.fontcursormisc
 ]
 
-++ (pkgs.lib.optional (config.fonts.enableCoreFonts) pkgs.corefonts)
+++ pkgs.lib.optional config.fonts.enableCoreFonts pkgs.corefonts
 
-++ pkgs.lib.optional (config.fonts.enableGhostscriptFonts) "${pkgs.ghostscript}/share/ghostscript/fonts"
+++ pkgs.lib.optional config.fonts.enableGhostscriptFonts "${pkgs.ghostscript}/share/ghostscript/fonts"
 
 ++ config.fonts.extraFonts
-- 
GitLab


From ff6a662f6e0824f3fc51c97912a8db615c3822a9 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 26 Aug 2008 12:45:36 +0000
Subject: [PATCH 1047/5331] * Fixed some typos, cleaned up the indentation.

svn path=/nixos/trunk/; revision=12720
---
 boot/boot-stage-1-init.sh | 34 ++++++++++++++++++++--------------
 1 file changed, 20 insertions(+), 14 deletions(-)

diff --git a/boot/boot-stage-1-init.sh b/boot/boot-stage-1-init.sh
index dd8047b14ef..de86c4c74f3 100644
--- a/boot/boot-stage-1-init.sh
+++ b/boot/boot-stage-1-init.sh
@@ -1,33 +1,39 @@
 #! @staticShell@
 
 targetRoot=/mnt/root
-dialog(){
+
+
+errorDialog() {
     timeout=15
     echo
     echo "Press within $timeout seconds:"
-    echo "  f) to switch finally to an interactive shell having pid 1"
-    echo "     (you'll need this to start stage2 / upstart)"
-    echo "  i) to launch an intercative shell"
+    echo "  i) to launch an interactive shell"
+    echo "  f) to start an interactive shell having pid 1"
+    echo "     (needed if you want to start Stage 2 manually)"
     echo "  *) to continue immediately (ignoring the failing command)"
     read -t $timeout reply
     case $reply in
-      f) exec @staticShell@;;
-      i) echo
-         echo "Quit interactive shell with exit status of"
-         echo " 0        : to continue"
-         echo " non zero : to get this dialog again (eg to switch to interactive shell with pid 1"
-        @staticShell@ || fail
-      ;;
-      *) echo continuing ignoring error;;
+        f)
+            exec @staticShell@;;
+        i)
+            echo
+            echo "Quit interactive shell with exit status of"
+            echo "  0        : to continue"
+            echo "  non-zero : to get this dialog again"
+            @staticShell@ || fail
+            ;;
+        *)
+            echo continuing ignoring error;;
     esac
 }
 
-fail(){
+
+fail() {
     # If starting stage 2 failed, start an interactive shell.
     echo "error while running Stage 1"
     echo "Stage 1 should mount the root partition containing the nix store on \`$targetRoot'";
     echo
-    dialog
+    errorDialog
 }
 trap 'fail' ERR;
 
-- 
GitLab


From 3116621c4657317c78c4607cab989938720d9343 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 26 Aug 2008 12:48:27 +0000
Subject: [PATCH 1048/5331] * Document testing the initrd.

svn path=/nixos/trunk/; revision=12721
---
 doc/manual/development.xml | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/doc/manual/development.xml b/doc/manual/development.xml
index 71072f0db2a..3c48acfa57b 100644
--- a/doc/manual/development.xml
+++ b/doc/manual/development.xml
@@ -81,4 +81,23 @@ $ ./result/bin/nixos-install</screen>
 </section>
 
 
+<section>
+
+<title>Testing the <literal>initrd</literal></title>
+
+<para>A quick way to test whether the kernel and the initial ramdisk
+boot correctly is to use QEMU’s <option>-kernel</option> and
+<option>-initrd</option> options:
+
+<screen>
+$ nix-build /etc/nixos/nixos -A initialRamdisk -o initrd
+$ nix-build /etc/nixos/nixos -A kernel -o kernel
+$ qemu-system-x86_64 -kernel ./kernel/vmlinuz -initrd ./initrd/initrd -hda /dev/null
+</screen>
+
+</para>
+
+</section>
+
+
 </chapter>
-- 
GitLab


From 8c2fd764e2b98e383cfe18f09f2556fd89c3b2b8 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 26 Aug 2008 13:01:16 +0000
Subject: [PATCH 1049/5331] * Move the configuration examples to doc/.

svn path=/nixos/trunk/; revision=12723
---
 {configuration/examples => doc/config-examples}/basic.nix     | 0
 .../config-examples}/closed-install-configuration.nix         | 0
 .../examples => doc/config-examples}/root-on-lvm.nix          | 0
 .../examples => doc/config-examples}/svn-server.nix           | 0
 .../examples => doc/config-examples}/x86_64-usbstick.nix      | 0
 doc/manual/installation.xml                                   | 4 ++--
 6 files changed, 2 insertions(+), 2 deletions(-)
 rename {configuration/examples => doc/config-examples}/basic.nix (100%)
 rename {configuration/examples => doc/config-examples}/closed-install-configuration.nix (100%)
 rename {configuration/examples => doc/config-examples}/root-on-lvm.nix (100%)
 rename {configuration/examples => doc/config-examples}/svn-server.nix (100%)
 rename {configuration/examples => doc/config-examples}/x86_64-usbstick.nix (100%)

diff --git a/configuration/examples/basic.nix b/doc/config-examples/basic.nix
similarity index 100%
rename from configuration/examples/basic.nix
rename to doc/config-examples/basic.nix
diff --git a/configuration/examples/closed-install-configuration.nix b/doc/config-examples/closed-install-configuration.nix
similarity index 100%
rename from configuration/examples/closed-install-configuration.nix
rename to doc/config-examples/closed-install-configuration.nix
diff --git a/configuration/examples/root-on-lvm.nix b/doc/config-examples/root-on-lvm.nix
similarity index 100%
rename from configuration/examples/root-on-lvm.nix
rename to doc/config-examples/root-on-lvm.nix
diff --git a/configuration/examples/svn-server.nix b/doc/config-examples/svn-server.nix
similarity index 100%
rename from configuration/examples/svn-server.nix
rename to doc/config-examples/svn-server.nix
diff --git a/configuration/examples/x86_64-usbstick.nix b/doc/config-examples/x86_64-usbstick.nix
similarity index 100%
rename from configuration/examples/x86_64-usbstick.nix
rename to doc/config-examples/x86_64-usbstick.nix
diff --git a/doc/manual/installation.xml b/doc/manual/installation.xml
index ac4fd98713b..8dbeb0cf446 100644
--- a/doc/manual/installation.xml
+++ b/doc/manual/installation.xml
@@ -147,10 +147,10 @@ $ lvcreate --size 1G --name smalldisk MyVolGroup</screen>
     activated.  The configuration is specified in a Nix expression and
     must be stored <emphasis>on the target file system</emphasis> in
     <filename>/mnt/etc/nixos/configuration.nix</filename>.  See
-    <filename>/etc/nixos/nixos/configuration/examples</filename> for
+    <filename>/etc/nixos/nixos/doc/config-examples</filename> for
     example machine configurations.  You can copy and edit one of
     those (e.g., copy
-    <filename>/etc/nixos/nixos/configuration/examples/basic.nix</filename>
+    <filename>/etc/nixos/nixos/doc/config-examples/basic.nix</filename>
     to <filename>/mnt/etc/nixos/configuration.nix</filename>).  See
     <xref linkend="ch-options"/> for a list of the available
     configuration options.  The text editors <command>nano</command>
-- 
GitLab


From 90198db08c8169a9cc42fdac887d44038f1660a3 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Tue, 26 Aug 2008 13:58:59 +0000
Subject: [PATCH 1050/5331] Made new-style ISO image expression buildable
 again.

svn path=/nixos/trunk/; revision=12725
---
 .../remote-install-scripts/install-test.sh    |  7 ++--
 configuration/rescue-cd-configurable.nix      | 32 ++++++++++++-------
 2 files changed, 24 insertions(+), 15 deletions(-)

diff --git a/configuration/remote-install-scripts/install-test.sh b/configuration/remote-install-scripts/install-test.sh
index 0d7d553a81a..d1bef4123be 100755
--- a/configuration/remote-install-scripts/install-test.sh
+++ b/configuration/remote-install-scripts/install-test.sh
@@ -16,14 +16,15 @@ set -x
 
 echo "Installation starting.." > report
 
-nix-build -o socat /etc/nixos/nixpkgs -A socat 
-nix-build -o qemu /etc/nixos/nixpkgs -A qemu 
+nix-build -o socat /etc/nixos/nixpkgs -A socat || { echo "Failed to build socat" >&2 ;  exit 2; };
+nix-build -o qemu /etc/nixos/nixpkgs -A qemu || { echo "Failed to build qemu" >&2 ;  exit 2; };
 
 echo "reboot" | ./socat/bin/socat tcp-listen:4424 stdio >> report &  
 
 if ( ! [ -d dvd/iso ] ) || ( [ -z "$USE_LEFTOVER_DVD" ] ); then
     rm dvd
-    nix-build -o dvd /etc/nixos/nixos/configuration/closed-install.nix
+    nix-build -o dvd /etc/nixos/nixos/configuration/closed-install.nix || 
+      { echo "Failed to build LiveDVD" >&2 ;  exit 2; };
 fi;
 
 if ( ! [ -f install-test.img ] ) || ( [ -z "$JUST_BOOT" ] ); then
diff --git a/configuration/rescue-cd-configurable.nix b/configuration/rescue-cd-configurable.nix
index 1cb255badd2..ce4d3ff6567 100644
--- a/configuration/rescue-cd-configurable.nix
+++ b/configuration/rescue-cd-configurable.nix
@@ -42,6 +42,8 @@
   ,compressImage ? false
   ,nixpkgsPath ? ../../nixpkgs
   ,additionalJobs ? []
+  ,intel3945FWEnable ? false
+  ,cdLabel ? "NIXOS_INSTALLATION_CD"
 }:
 let 
   realLib = if lib != null then lib else (import (nixpkgsPath+"/pkgs/lib"));
@@ -58,7 +60,6 @@ let
   { 
     system = (import ../system/system.nix) {
       inherit configuration platform nixpkgsPath; /* To refactor later - x86+x86_64 DVD */
-      stage2Init = "/init"+suffix;
     };
     inherit suffix configuration;
   };
@@ -125,25 +126,26 @@ let
 in
 
 rec {
+
+  inherit cdLabel;
+
   nixpkgsRel = "nixpkgs" + (if networkNixpkgs != "" then "-" + networkNixpkgs else "");
  
-  configuration = let preConfiguration ={
+  configuration = pkgs: final_configuration: let preConfiguration ={
     boot = {
       isLiveCD = true;
-      autoDetectRootDevice = true;
       # The label used to identify the installation CD.
-      rootLabel = "NIXOS";
       extraTTYs = [] 
         ++ (lib.optional manualEnabled 7) 
         ++ (lib.optional rogueEnabled 8);
-      inherit kernelPackages;
+      kernelPackages = kernelPackages pkgs;
       initrd = {
       extraKernelModules = extraInitrdKernelModules
       ++ (if aufs then ["aufs"] else [])
       ;
       };
       kernelModules = bootKernelModules;
-      extraModulePackages = pkgs: ((extraModulePackages pkgs)
+      extraModulePackages = ((extraModulePackages pkgs)
       ++(if aufs then [(kernelPackages pkgs).aufs] else [])
       );
     };
@@ -301,7 +303,7 @@ rec {
     };
     
     environment = {
-      extraPackages = if cleanStart then pkgs:[] else pkgs: [
+      extraPackages = if cleanStart then [] else [
         pkgs.vim
         pkgs.subversion # for nixos-checkout
         pkgs.w3m # needed for the manual anyway
@@ -314,6 +316,16 @@ rec {
       extraUsers = map userEntry addUsers;
     };
     
+    fileSystems = [
+      { mountPoint = "/";
+        label = cdLabel;
+      }
+    ];
+    
+    networking = {
+      enableIntel3945ABGFirmware = intel3945FWEnable;
+    };
+
   }; in preConfiguration // (arbitraryOverrides preConfiguration);
  
   configurations = [{
@@ -425,10 +437,6 @@ rec {
           source = nixosServicesTarball;
           target = "/install/nixos-services.tar.bz2";
         }
-        { 
-          source = pkgs.writeText "label" "";
-          target = "/${configuration.boot.rootLabel}";
-        }
       ]
       ++
       (lib.optional includeMemtest 
@@ -463,7 +471,7 @@ rec {
     bootable = true;
     bootImage = "boot/grub/stage2_eltorito";
     
-    volumeID = "NIXOS_INSTALLATION_CD";
+    volumeID = cdLabel;
   };
  
 }
-- 
GitLab


From b0b4c0e2b3622494c9ddbe1bc6cc99e17ba90885 Mon Sep 17 00:00:00 2001
From: Marc Weber <marco-oweber@gmx.de>
Date: Tue, 26 Aug 2008 19:44:54 +0000
Subject: [PATCH 1051/5331] echo working copies beeing used when calling
 showSyntax (help output)

svn path=/nixos/trunk/; revision=12729
---
 installer/nixos-rebuild.sh | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/installer/nixos-rebuild.sh b/installer/nixos-rebuild.sh
index c173787d585..80ed41c7d95 100644
--- a/installer/nixos-rebuild.sh
+++ b/installer/nixos-rebuild.sh
@@ -1,5 +1,10 @@
 #! @shell@ -e
 
+# Allow the location of NixOS sources and the system configuration
+# file to be overridden.
+NIXOS=${NIXOS:-@defaultNIXOS@}
+NIXPKGS=${NIXPKGS:-@defaultNIXPKGS@}
+NIXOS_CONFIG=${NIXOS_CONFIG:-/etc/nixos/configuration.nix}
 
 showSyntax() {
     # !!! more or less cut&paste from
@@ -13,6 +18,13 @@ test:    activate the configuration, but don't make it the boot default
 build:   build the configuration, but don't make it the default or
          activate it
 dry-run: just show what store paths would be built/downloaded
+
+by env overridable settings:
+NIXOS=${NIXOS}
+NIXPKGS=${NIXPKGS}
+NIXOS_CONFIG=${NIXOS_CONFIG}
+"
+
 EOF
     exit 1
 }
@@ -40,13 +52,6 @@ if test "$action" = dry-run; then
 fi
 
 
-# Allow the location of NixOS sources and the system configuration
-# file to be overridden.
-NIXOS=${NIXOS:-@defaultNIXOS@}
-NIXPKGS=${NIXPKGS:-@defaultNIXPKGS@}
-NIXOS_CONFIG=${NIXOS_CONFIG:-/etc/nixos/configuration.nix}
-
-
 # If the Nix daemon is running, then use it.  This allows us to use
 # the latest Nix from Nixpkgs (below) for expression evaluation, while
 # still using the old Nix (via the daemon) for actual store access.
-- 
GitLab


From 4eceb15830bb27219dcb7401a27fa249a31034c1 Mon Sep 17 00:00:00 2001
From: Marc Weber <marco-oweber@gmx.de>
Date: Tue, 26 Aug 2008 19:45:06 +0000
Subject: [PATCH 1052/5331] fix typos, moved nixos-checkout code into its own
 file following some other suggestions made by niksnut added further PATH hint
 in repos description of options.nix

svn path=/nixos/trunk/; revision=12730
---
 installer/default.nix       | 89 ++++--------------------------------
 installer/nixosCheckout.nix | 91 +++++++++++++++++++++++++++++++++++++
 system/options.nix          |  9 ++--
 3 files changed, 104 insertions(+), 85 deletions(-)
 create mode 100644 installer/nixosCheckout.nix

diff --git a/installer/default.nix b/installer/default.nix
index 6eb94bc3fc3..a2633155836 100644
--- a/installer/default.nix
+++ b/installer/default.nix
@@ -7,55 +7,11 @@ let
     isExecutable = true;
   });
 
-  inherit (pkgs.lib) id all whatis escapeShellArg concatMapStrings concatMap
-  mapAttrs concatLists flattenAttrs filter;
-
-  # f adds svn defaults
-  # returns in any case:
-  # { type = git/svn; 
-  #   target = path;
-  #   initialize = cmd; # must create target dir, dirname target will exist
-  #   update = cmd;     # pwd will be target
-  #   default = true/false;
-  # }
-  f = repo : attrs :
-    assert (__isAttrs attrs);
-    assert (repo + "" == repo);
-    if (! (attrs ? type)) then 
-      throw "repo type is missing of : ${whatis attrs}"
-    else if attrs.type == "svn" then
-      let a = { # add svn defaults
-                url = "https://svn.nixos.org/repos/nix/${repo}/trunk";
-                target = "/etc/nixos/${repo}";
-              } // attrs; in
-      rec { 
-        inherit (a) type target;
-        default =  if a ? default then a.default else false;
-        initialize = "svn co ${a.url} ${a.target}"; 
-        update = initialize; # co is just as fine as svn update
-     }
-    else  if attrs.type == "git" then # sanity check for existing attrs
-      assert (all id (map ( attr : if __hasAttr attr attrs then true 
-                                     else throw "git repository item is missing attribute ${attr}")
-                          [ "target" "initialize" "update" ]
-                      ));
-    let t = escapeShellArg attrs.target; in
-    rec {
-      inherit (attrs) type target;
-      default =  if attrs ? default then attrs.default else false;
-      update = "cd ${t}; ${attrs.update}";
-      initialize =  ''
-    cd $(dirname ${t}); ${attrs.initialize}
-    [ -d ${t} ] || { echo "git initialize failed to create target directory ${t}"; exit 1; }
-    ${update}'';
-    }
-    else throw "unkown repo type ${attrs.type}"; in
-
-    # apply f on each repo definition
-    let repos = mapAttrs ( repo : list : map (x : (f repo x) // { inherit repo; } ) list ) config.installer.repos;
-
-    defaultRepo = list : __head ( (filter ( attrs : attrs ? default && attrs.default == true ) list)
-                                ++ list );
+
+  nixosCheckout = (import ./nixosCheckout.nix){ 
+    inherit pkgs config makeProg;
+  };
+
 
 in
 
@@ -76,7 +32,8 @@ in
       "cp refs $out";
   };
 
-  nixosRebuild = makeProg {
+  nixosRebuild = let inherit (nixosCheckout) repos defaultRepo;
+                 in makeProg {
     defaultNIXOS   = (defaultRepo repos.nixos  ).target;
     defaultNIXPKGS = (defaultRepo repos.nixpkgs).target;
     name = "nixos-rebuild";
@@ -88,37 +45,7 @@ in
     src = ./nixos-gen-seccure-keys.sh;
   };
 
-  nixosCheckout =
-    makeProg {
-    name = "nixos-checkout";
-    src = pkgs.writeScript "nixos-checkout" (''
-          #! @shell@ -e
-          # this file is automatically generated from nixos configuration file settings (installer.repos)
-          backupTimestamp=$(date "+%Y%m%d%H%M%S")
-          '' + concatMapStrings ( attrs :
-                let repoType = __getAttr attrs.type config.installer.repoTypes; 
-                    target = escapeShellArg attrs.target; in
-                ''
-                  # ${attrs.type} repo ${target}
-                  PATH=
-                  for path in ${builtins.toString repoType.env}; do
-                    PATH=$PATH:$path/bin:$path/sbin
-                  done
-                  if [ -d  ${target} ] && { cd ${target} && { ${ repoType.valid}; }; }; then
-                      echo; echo '>>  ' updating ${attrs.type} repo ${target}
-                      set -x; ${attrs.update}; set +x
-                  else # [ make backup and ] initialize
-                      [ -e ${target} ] && mv ${target} ${target}-$backupTimestamp
-                      target=${target}
-                      [ -d "$(dirname ${target})" ] || mkdir -p  "$(dirname ${target})"
-                      echo; echo '>>  'initializing ${attrs.type} repo ${target}
-                      set -x; ${attrs.initialize}; set +x
-                  fi
-                ''
-              ) # flatten all repo definition to one list adding the repository
-               ( concatLists  (flattenAttrs repos) )
-      );
-   };
+  inherit (nixosCheckout) nixosCheckout;
 
   nixosHardwareScan = makeProg {
     name = "nixos-hardware-scan";
diff --git a/installer/nixosCheckout.nix b/installer/nixosCheckout.nix
new file mode 100644
index 00000000000..4fedbd4d9c7
--- /dev/null
+++ b/installer/nixosCheckout.nix
@@ -0,0 +1,91 @@
+args : with args;
+let 
+    inherit (pkgs.lib) id all whatis escapeShellArg concatMapStrings concatMap
+      mapAttrs concatLists flattenAttrs filter;
+    inherit (builtins) getAttr hasAttr head isAttrs;
+in
+
+rec {
+  # prepareRepoAttrs adds svn defaults and preparse the repo attribute sets so that they
+  # returns in any case:
+  # { type = git/svn; 
+  #   target = path;
+  #   initialize = cmd; # must create target dir, dirname target will exist
+  #   update = cmd;     # pwd will be target
+  #   default = true/false;
+  # }
+  prepareRepoAttrs = repo : attrs :
+    assert (isAttrs attrs);
+    assert (repo + "" == repo); # assert repo is a string
+    if (! (attrs ? type)) then 
+      throw "repo type is missing of : ${whatis attrs}"
+    # prepare svn repo
+    else if attrs.type == "svn" then
+      let a = { # add svn defaults
+                url = "https://svn.nixos.org/repos/nix/${repo}/trunk";
+                target = "/etc/nixos/${repo}";
+              } // attrs; in
+      rec { 
+        inherit (a) type target;
+        default =  if a ? default then a.default else false;
+        initialize = "svn co ${a.url} ${a.target}"; 
+        update = initialize; # co is just as fine as svn update
+     }
+    # prepare git repo
+    else  if attrs.type == "git" then # sanity check for existing attrs
+      assert (all id (map ( attr : if hasAttr attr attrs then true 
+                                     else throw "git repository item is missing attribute ${attr}")
+                          [ "target" "initialize" "update" ]
+                      ));
+    let t = escapeShellArg attrs.target; in
+    rec {
+      inherit (attrs) type target;
+      default =  if attrs ? default then attrs.default else false;
+      update = "cd ${t}; ${attrs.update}";
+      initialize =  ''
+    cd $(dirname ${t}); ${attrs.initialize}
+    [ -d ${t} ] || { echo "git initialize failed to create target directory ${t}"; exit 1; }
+    ${update}'';
+    }
+    else throw "unkown repo type ${attrs.type}";
+
+  # apply prepareRepoAttrs on each repo definition
+  repos = mapAttrs ( repo : list : map (x : (prepareRepoAttrs repo x) // { inherit repo; } ) list ) config.installer.repos;
+
+  # function returning the default repo (first one having attribute default or head of list)
+  defaultRepo = list : head ( (filter ( attrs : attrs ? default && attrs.default == true ) list)
+                              ++ list );
+
+  # creates the nixos-checkout script 
+  nixosCheckout =
+    makeProg {
+    name = "nixos-checkout";
+    src = pkgs.writeScript "nixos-checkout" (''
+          #! @shell@ -e
+          # this file is automatically generated from nixos configuration file settings (installer.repos)
+          backupTimestamp=$(date "+%Y%m%d%H%M%S")
+          '' + concatMapStrings ( attrs :
+                let repoType = getAttr attrs.type config.installer.repoTypes; 
+                    target = escapeShellArg attrs.target; in
+                ''
+                  # ${attrs.type} repo ${target}
+                  PATH=
+                  for path in ${builtins.toString repoType.env}; do
+                    PATH=$PATH:$path/bin:$path/sbin
+                  done
+                  if [ -d  ${target} ] && { cd ${target} && { ${ repoType.valid}; }; }; then
+                      echo; echo '>>  ' updating ${attrs.type} repo ${target}
+                      set -x; ${attrs.update}; set +x
+                  else # [ make backup and ] initialize
+                      [ -e ${target} ] && mv ${target} ${target}-$backupTimestamp
+                      target=${target}
+                      [ -d "$(dirname ${target})" ] || mkdir -p  "$(dirname ${target})"
+                      echo; echo '>>  'initializing ${attrs.type} repo ${target}
+                      set -x; ${attrs.initialize}; set +x
+                  fi
+                ''
+              ) # flatten all repo definition to one list adding the repository
+               ( concatLists  (flattenAttrs repos) )
+      );
+   };
+}
diff --git a/system/options.nix b/system/options.nix
index 2804e723a60..029fba8157c 100644
--- a/system/options.nix
+++ b/system/options.nix
@@ -2440,11 +2440,11 @@ in
         example = [ { type = "svn"; url = "https://svn.nixos.org/repos/nix/nixos/branches/stdenv-updates"; target = "/etc/nixos/nixos-stdenv-updates"; }
                     { type = "git"; initialize = ''git clone git://mawercer.de/nixos $target''; update = "git pull origin"; target = "/etc/nixos/nixos-git"; }
                   ];
-        description = "The nixos repository from which the system will be build. 
-                       nixos-checkout will update all defined repositories,
-                       nixos-rebuild will use the the first item which has
+        description = "The NixOS repository from which the system will be build. 
+                       nixos-checkout will update all working copies of the given repositories,
+                       nixos-rebuild will use the first item which has
                        the attribute default = true falling back to the
-                       first item. the type defines the repository tool added
+                       first item. The type defines the repository tool added
                        to the path. It also defines a \"valid\" repository.
                        If the target directory already exists and it's not
                        valid it will be moved to the backup location
@@ -2457,6 +2457,7 @@ in
                        The initialize code is run from working directory
                        dirname \$target and should create the directory
                        <filename>\$target<filename>. (<command>git clone url nixos/nixpkgs/services</command> should do)
+                       For the executables beeing used see <option>repoTypes</option>
                        ";
       };
 
-- 
GitLab


From c34c7030406a23245c9603a2598e7e6ad883a231 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 27 Aug 2008 09:37:44 +0000
Subject: [PATCH 1053/5331] * Don't use camel case for filenames. * "by env
 overridable settings" is not good English :-)

svn path=/nixos/trunk/; revision=12732
---
 installer/default.nix                               | 2 +-
 installer/{nixosCheckout.nix => nixos-checkout.nix} | 0
 installer/nixos-rebuild.sh                          | 9 +++++----
 3 files changed, 6 insertions(+), 5 deletions(-)
 rename installer/{nixosCheckout.nix => nixos-checkout.nix} (100%)

diff --git a/installer/default.nix b/installer/default.nix
index a2633155836..bf6f6ee81b9 100644
--- a/installer/default.nix
+++ b/installer/default.nix
@@ -8,7 +8,7 @@ let
   });
 
 
-  nixosCheckout = (import ./nixosCheckout.nix){ 
+  nixosCheckout = (import ./nixos-checkout.nix) {
     inherit pkgs config makeProg;
   };
 
diff --git a/installer/nixosCheckout.nix b/installer/nixos-checkout.nix
similarity index 100%
rename from installer/nixosCheckout.nix
rename to installer/nixos-checkout.nix
diff --git a/installer/nixos-rebuild.sh b/installer/nixos-rebuild.sh
index 80ed41c7d95..5bf6834c74c 100644
--- a/installer/nixos-rebuild.sh
+++ b/installer/nixos-rebuild.sh
@@ -19,10 +19,11 @@ build:   build the configuration, but don't make it the default or
          activate it
 dry-run: just show what store paths would be built/downloaded
 
-by env overridable settings:
-NIXOS=${NIXOS}
-NIXPKGS=${NIXPKGS}
-NIXOS_CONFIG=${NIXOS_CONFIG}
+Environment variables affecting nixos-rebuild:
+
+  Path to NixOS:         NIXOS=${NIXOS}
+  Path to Nixpkgs:       NIXPKGS=${NIXPKGS}
+  Path to configuration: NIXOS_CONFIG=${NIXOS_CONFIG}
 "
 
 EOF
-- 
GitLab


From bdb29c0bcceaf332772da3fdc547729367999c64 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 27 Aug 2008 09:49:26 +0000
Subject: [PATCH 1054/5331] * Don't need/want /etc anymore in the chroot.

svn path=/nixos/trunk/; revision=12734
---
 etc/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/etc/default.nix b/etc/default.nix
index 93f4951bf2b..6ca5dbf428a 100644
--- a/etc/default.nix
+++ b/etc/default.nix
@@ -128,7 +128,7 @@ import ../helpers/make-etc.nix {
         build-users-group = nixbld
         build-max-jobs = ${toString (config.nix.maxJobs)}
         build-use-chroot = ${if config.nix.useChroot then "true" else "false"}
-        build-chroot-dirs = /dev /proc /bin /etc
+        build-chroot-dirs = /dev /proc /bin
         ${config.nix.extraOptions}
       '';
       target = "nix.conf"; # will be symlinked from /nix/etc/nix/nix.conf in activate-configuration.sh.
-- 
GitLab


From 618b726542fc610d5592ba45b5e0b80d9226847e Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 27 Aug 2008 10:00:49 +0000
Subject: [PATCH 1055/5331] * Don't put the Adobe bitmap fonts in the
 fontconfig search path   because then Helvetica looks horrible.

svn path=/nixos/trunk/; revision=12736
---
 system/fonts.nix         |  2 --
 upstart-jobs/xserver.nix | 13 +++++++++++++
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/system/fonts.nix b/system/fonts.nix
index b9cf5710301..f0be6dd1de0 100644
--- a/system/fonts.nix
+++ b/system/fonts.nix
@@ -13,8 +13,6 @@
   pkgs.xorg.fontbhttf
   pkgs.xorg.fontbhlucidatypewriter100dpi
   pkgs.xorg.fontbhlucidatypewriter75dpi
-  pkgs.xorg.fontadobe100dpi
-  pkgs.xorg.fontadobe75dpi
   pkgs.ttf_bitstream_vera
   pkgs.freefont_ttf
   pkgs.xorg.fontbh100dpi
diff --git a/upstart-jobs/xserver.nix b/upstart-jobs/xserver.nix
index a528952c6b1..ff068a04a15 100644
--- a/upstart-jobs/xserver.nix
+++ b/upstart-jobs/xserver.nix
@@ -53,6 +53,19 @@ let
     ++ (optional cfg.synaptics.enable ["${pkgs.synaptics}/${xorg.xorgserver}" /*xorg.xf86inputevdev*/]);
 
 
+  fontsForXServer =
+    fontDirectories ++
+    # We don't want these fonts in fonts.conf, because then modern,
+    # fontconfig-based applications will get horrible bitmapped
+    # Helvetica fonts.  It's better to get a substitution (like Nimbus
+    # Sans) than that horror.  But we do need the Adobe fonts for some
+    # old non-fontconfig applications.  (Possibly this could be done
+    # better using a fontconfig rule.)
+    [ pkgs.xorg.fontadobe100dpi
+      pkgs.xorg.fontadobe75dpi
+    ];
+    
+
   configFile = stdenv.mkDerivation {
     name = "xserver.conf";
     src = ./xserver.conf;
-- 
GitLab


From 1e33c98258c1434b5bd93a4a0ede82cbea1ae854 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 27 Aug 2008 10:06:25 +0000
Subject: [PATCH 1056/5331] * Doh.

svn path=/nixos/trunk/; revision=12737
---
 upstart-jobs/xserver.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/upstart-jobs/xserver.nix b/upstart-jobs/xserver.nix
index ff068a04a15..d78c0471f90 100644
--- a/upstart-jobs/xserver.nix
+++ b/upstart-jobs/xserver.nix
@@ -69,7 +69,7 @@ let
   configFile = stdenv.mkDerivation {
     name = "xserver.conf";
     src = ./xserver.conf;
-    inherit fontDirectories videoDriver resolutions;
+    inherit fontsForXServer videoDriver resolutions;
     isClone = if cfg.isClone then "on" else "off";
 
     synapticsInputDevice = if cfg.synaptics.enable then ''
@@ -128,7 +128,7 @@ let
       buildCommand= # urgh, don't substitute this
 
       export fontPaths=
-      for i in $fontDirectories; do
+      for i in $fontsForXServer; do
         if test "''${i:0:''${#NIX_STORE}}" == "$NIX_STORE"; then
           for j in $(find $i -name fonts.dir); do
             fontPaths="''${fontPaths}FontPath \"$(dirname $j)\"''\n"
-- 
GitLab


From 5cc80c8e5118d06ff89f9d3f58b81363f9870dda Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Wed, 27 Aug 2008 10:20:07 +0000
Subject: [PATCH 1057/5331] Reduce dependency of generated image on host
 configuration.

svn path=/nixos/trunk/; revision=12738
---
 configuration/remote-install-scripts/install-test.sh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/configuration/remote-install-scripts/install-test.sh b/configuration/remote-install-scripts/install-test.sh
index d1bef4123be..1bf02e531b0 100755
--- a/configuration/remote-install-scripts/install-test.sh
+++ b/configuration/remote-install-scripts/install-test.sh
@@ -23,7 +23,8 @@ echo "reboot" | ./socat/bin/socat tcp-listen:4424 stdio >> report &
 
 if ( ! [ -d dvd/iso ] ) || ( [ -z "$USE_LEFTOVER_DVD" ] ); then
     rm dvd
-    nix-build -o dvd /etc/nixos/nixos/configuration/closed-install.nix || 
+    # unset NIXPKGS_CONFIG to reduce host -> image configuration leak
+    NIXPKGS_CONFIG= nix-build -o dvd /etc/nixos/nixos/configuration/closed-install.nix || 
       { echo "Failed to build LiveDVD" >&2 ;  exit 2; };
 fi;
 
-- 
GitLab


From 6e6f867a0a0da3fca2be1a1f555ad84e0d69fa65 Mon Sep 17 00:00:00 2001
From: Nicolas Pierron <nicolas.b.pierron@gmail.com>
Date: Wed, 27 Aug 2008 14:01:17 +0000
Subject: [PATCH 1058/5331] Add pcmcia job. Test the new option style.

svn path=/nixos/trunk/; revision=12742
---
 system/options.nix      |  3 ++
 upstart-jobs/pcmcia.nix | 68 +++++++++++++++++++++++++++++++++++++++++
 2 files changed, 71 insertions(+)
 create mode 100644 upstart-jobs/pcmcia.nix

diff --git a/system/options.nix b/system/options.nix
index 029fba8157c..3f0da62724a 100644
--- a/system/options.nix
+++ b/system/options.nix
@@ -2914,4 +2914,7 @@ root        ALL=(ALL) SETENV: ALL
     };
   };
 
+  require = [
+    (import ../upstart-jobs/pcmcia.nix)
+  ];
 }
diff --git a/upstart-jobs/pcmcia.nix b/upstart-jobs/pcmcia.nix
new file mode 100644
index 00000000000..38effdc8a29
--- /dev/null
+++ b/upstart-jobs/pcmcia.nix
@@ -0,0 +1,68 @@
+pkgs: config:
+
+###### interface
+let
+  inherit (pkgs.lib) mkOption
+    mergeEnableOption mergeListOption;
+
+  options = {
+    hardware = {
+      pcmcia = {
+        enable = mkOption {
+          default = false;
+          merge = mergeEnableOption;
+          description = ''
+            Enable this option to support PCMCIA card.
+          '';
+        };
+
+        firmware = mkOption {
+          default = [];
+          merge = mergeListOption;
+          description = ''
+            List of firmware used to handle specific PCMCIA card.
+          '';
+        };
+
+        config = mkOption {
+          default = null;
+          decription = ''
+            Path to the configuration file which map the memory, irq
+            and ports used by the PCMCIA hardware.
+          '';
+        };
+      };
+    };
+  };
+in
+
+###### implementation
+let
+  ifEnable = arg:
+    if config.hardware.pcmcia.enable then arg
+    else if builtins.isList arg then []
+    else if builtins.isAttrs arg then {}
+    else null;
+
+  pcmciaUtils = pkgs.pcmciaUtils.meta.function {
+    inherit (config.hardware.pcmcia) firmware config;
+  };
+in
+
+{
+  require = options;
+
+  boot = {
+    kernelModules = ifEnable [ "pcmcia" ];
+  };
+
+  services = {
+    udev = {
+      addUdevPkgs = ifEnable [ pcmciaUtils ];
+    };
+  };
+
+  environment = {
+    extraPackages = ifEnable [ pcmciaUtils ];
+  };
+}
-- 
GitLab


From 385ffce14d8a88687d17a9a2b1625d8e84ab3b07 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Wed, 27 Aug 2008 21:03:26 +0000
Subject: [PATCH 1059/5331] Added possibility to customize key location for
 closed-install.nix

svn path=/nixos/trunk/; revision=12755
---
 configuration/closed-install.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/configuration/closed-install.nix b/configuration/closed-install.nix
index db02ddd4d8c..7ea2460ad98 100644
--- a/configuration/closed-install.nix
+++ b/configuration/closed-install.nix
@@ -1,6 +1,7 @@
 {
 	platform ? __currentSystem
 	,hostConnectPort ? "3737"
+	,sshPubKey ? /var/certs/ssh/id_livedvd.pub
 } : 
 let 
   isoFun = import ./rescue-cd-configurable.nix;
@@ -48,7 +49,7 @@ in
 	*/
 	additionalFiles = [
 		{
-			source = /var/certs/ssh/id_livedvd.pub;
+			source = sshPubKey;
 			target = "/root/.ssh/authorized_keys";
 		}
 	];
-- 
GitLab


From 0d3cee6247d6c34b888cf94387c714935a67fd6f Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Wed, 27 Aug 2008 21:22:49 +0000
Subject: [PATCH 1060/5331] Typo fixed

svn path=/nixos/trunk/; revision=12757
---
 upstart-jobs/pcmcia.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/upstart-jobs/pcmcia.nix b/upstart-jobs/pcmcia.nix
index 38effdc8a29..b084f47beb4 100644
--- a/upstart-jobs/pcmcia.nix
+++ b/upstart-jobs/pcmcia.nix
@@ -26,7 +26,7 @@ let
 
         config = mkOption {
           default = null;
-          decription = ''
+          description = ''
             Path to the configuration file which map the memory, irq
             and ports used by the PCMCIA hardware.
           '';
-- 
GitLab


From 5fb3cdc82bda28d61b796a4d0b95da2ac9cf621b Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 29 Aug 2008 09:26:30 +0000
Subject: [PATCH 1061/5331] * Typo.

svn path=/nixos/trunk/; revision=12762
---
 installer/nixos-rebuild.sh | 2 --
 1 file changed, 2 deletions(-)

diff --git a/installer/nixos-rebuild.sh b/installer/nixos-rebuild.sh
index 5bf6834c74c..b8deee2f18e 100644
--- a/installer/nixos-rebuild.sh
+++ b/installer/nixos-rebuild.sh
@@ -24,8 +24,6 @@ Environment variables affecting nixos-rebuild:
   Path to NixOS:         NIXOS=${NIXOS}
   Path to Nixpkgs:       NIXPKGS=${NIXPKGS}
   Path to configuration: NIXOS_CONFIG=${NIXOS_CONFIG}
-"
-
 EOF
     exit 1
 }
-- 
GitLab


From ab80a34ea45b060ce3a83c27ca995a300a442e91 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 2 Sep 2008 09:51:44 +0000
Subject: [PATCH 1062/5331] * Quick workaround for tty-backgrounds not working
 on Linux 2.6.26:   /proc/sys/kernel/fbcondecor is now suddenly named
 /proc/sys/fbcondecor.   Might be a bug.

svn path=/nixos/trunk/; revision=12784
---
 upstart-jobs/tty-backgrounds.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/upstart-jobs/tty-backgrounds.nix b/upstart-jobs/tty-backgrounds.nix
index 6e51208d686..60408530870 100644
--- a/upstart-jobs/tty-backgrounds.nix
+++ b/upstart-jobs/tty-backgrounds.nix
@@ -28,7 +28,9 @@ rec {
 
         # Critical: tell the kernel where to find splash_helper.  It calls
         # this program every time we switch between consoles.
-        echo ${splashutils}/${splashutils.helperName} > ${splashutils.helperProcFile}
+        helperProcFile=${splashutils.helperProcFile}
+        if test -e /proc/sys/fbcondecor; then helperProcFile=/proc/sys/fbcondecor; fi
+        echo ${splashutils}/${splashutils.helperName} > $helperProcFile
 
         # For each console...
         for tty in ${toString (map (x: x.tty) backgrounds)}; do
-- 
GitLab


From e15ffa9e3c5a1059b8840338ffc33dda46f28c4e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Thu, 4 Sep 2008 20:28:02 +0000
Subject: [PATCH 1063/5331] Add `gnunetd' Upstart job.

svn path=/nixos/trunk/; revision=12802
---
 system/ids.nix           |   1 +
 system/options.nix       | 136 +++++++++++++++++++++++++++++++++++++++
 upstart-jobs/default.nix |   7 ++
 upstart-jobs/gnunet.nix  |  64 ++++++++++++++++++
 4 files changed, 208 insertions(+)
 create mode 100644 upstart-jobs/gnunet.nix

diff --git a/system/ids.nix b/system/ids.nix
index 4a94179eea6..3838f7138f2 100644
--- a/system/ids.nix
+++ b/system/ids.nix
@@ -18,6 +18,7 @@
     postfix = 14;
     dovecot = 15;
     tomcat = 16;
+    gnunetd = 17;
 
     nixbld = 30000; # start of range of uids
     nobody = 65534;
diff --git a/system/options.nix b/system/options.nix
index 3f0da62724a..e17e587430c 100644
--- a/system/options.nix
+++ b/system/options.nix
@@ -1125,6 +1125,142 @@ in
 
     };
 
+    gnunet = {
+    
+      enable = mkOption {
+        default = false;
+        description = ''
+          Whether to run the GNUnet daemon.  GNUnet is GNU's anonymous
+          peer-to-peer communication and file sharing framework.
+        '';
+      };
+
+      home = mkOption {
+        default = "/var/lib/gnunet";
+        description = ''
+          Directory where the GNUnet daemon will store its data.
+        '';
+      };
+
+      debug = mkOption {
+        default = false;
+        description = ''
+          When true, run in debug mode; gnunetd will not daemonize and
+          error messages will be written to stderr instead of a
+          logfile.
+        '';
+      };
+
+      logLevel = mkOption {
+        default = "ERROR";
+        example = "INFO";
+        description = ''
+          Log level of the deamon (see `gnunetd(1)' for details).
+        '';
+      };
+
+      hostLists = mkOption {
+        default = [
+          "http://gnunet.org/hostlist.php"
+          "http://gnunet.mine.nu:8081/hostlist"
+          "http://vserver1236.vserver-on.de/hostlist-074"
+        ];
+        description = ''
+          URLs of host lists.
+        '';
+      };
+
+
+      applications = mkOption {
+        default = [ "advertising" "getoption" "fs" "stats" "traffic" ];
+        example = [ "chat" "fs" ];
+        description = ''
+          List of GNUnet applications supported by the daemon.  Note that
+          `fs', which means "file sharing", is probably the one you want.
+        '';
+      };
+
+      transports = mkOption {
+        default = [ "udp" "tcp" "http" "nat" ];
+        example = [ "smtp" "http" ];
+        description = ''
+          List of transport methods used by the server.
+        '';
+      };
+
+      fileSharing = {
+        quota = mkOption {
+          default = 1024;
+          description = ''
+            Maximum file system usage (in MiB) for file sharing.
+          '';
+        };
+
+        activeMigration = mkOption {
+          default = false;
+          description = ''
+            Whether to allow active migration of content originating
+            from other nodes.
+          '';
+        };
+      };
+
+      load = {
+        maxNetDownBandwidth = mkOption {
+          default = 50000;
+          description = ''
+            Maximum bandwidth usage (in bits per second) for GNUnet
+            when downloading data.
+          '';
+        };
+
+        maxNetUpBandwidth = mkOption {
+          default = 50000;
+          description = ''
+            Maximum bandwidth usage (in bits per second) for GNUnet
+            when downloading data.
+          '';
+        };
+
+        hardNetUpBandwidth = mkOption {
+          default = 0;
+          description = ''
+            Hard bandwidth limit (in bits per second) when uploading
+            data.
+          '';
+        };
+
+        maxCPULoad = mkOption {
+          default = 100;
+          description = ''
+            Maximum CPU load (percentage) authorized for the GNUnet
+            daemon.
+          '';
+        };
+
+        interfaces = mkOption {
+          default = [ "eth0" ];
+          example = [ "wlan0" "eth1" ];
+          description = ''
+            List of network interfaces to use.
+          '';
+        };
+      };
+
+      extraOptions = mkOption {
+        default = "";
+        example = ''
+          [NETWORK]
+          INTERFACE = eth3
+        '';
+        description = ''
+          Additional options that will be copied verbatim in `gnunetd.conf'.
+          See `gnunetd.conf(5)' for details.
+        '';
+      };
+    };
+
+
     xserver = {
 
       enable = mkOption {
diff --git a/upstart-jobs/default.nix b/upstart-jobs/default.nix
index 4957482ae9e..8700b323fb9 100644
--- a/upstart-jobs/default.nix
+++ b/upstart-jobs/default.nix
@@ -218,6 +218,13 @@ let
       lshdConfig = config.services.lshd;
     })
 
+  # GNUnet daemon.
+  ++ optional config.services.gnunet.enable
+    (import ../upstart-jobs/gnunet.nix {
+      inherit (pkgs) gnunet lib writeText;
+      gnunetConfig = config.services.gnunet;
+    })
+
   # NTP daemon.
   ++ optional config.services.ntp.enable
     (import ../upstart-jobs/ntpd.nix {
diff --git a/upstart-jobs/gnunet.nix b/upstart-jobs/gnunet.nix
new file mode 100644
index 00000000000..3b3de2d97b3
--- /dev/null
+++ b/upstart-jobs/gnunet.nix
@@ -0,0 +1,64 @@
+{ gnunet, gnunetConfig, lib, writeText }:
+
+assert gnunetConfig.enable;
+
+{
+  name = "gnunetd";
+
+  users = [
+    { name = "gnunetd";
+      uid = (import ../system/ids.nix).uids.gnunetd;
+      description = "GNUnet Daemon User";
+      home = "/var/empty";
+    }
+  ];
+
+  job =
+    with gnunetConfig;
+    let configFile = writeText "gnunetd.conf" ''
+      [PATHS]
+      GNUNETD_HOME = ${home}
+
+      [GNUNETD]
+      HOSTLISTURL = ${lib.concatStringsSep " " hostLists}
+      APPLICATIONS = ${lib.concatStringsSep " " applications}
+      TRANSPORTS = ${lib.concatStringsSep " " transports}
+
+      [LOAD]
+      MAXNETDOWNBPSTOTAL = ${toString load.maxNetDownBandwidth}
+      MAXNETUPBPSTOTAL = ${toString load.maxNetUpBandwidth}
+      HARDUPLIMIT = ${toString load.hardNetUpBandwidth}
+      MAXCPULOAD = ${toString load.maxCPULoad}
+      INTERFACES = ${lib.concatStringsSep " " load.interfaces}
+
+      [FS]
+      QUOTA = ${toString fileSharing.quota}
+      ACTIVEMIGRATION = ${if fileSharing.activeMigration then "YES" else "NO"}
+
+      [MODULES]
+      sqstore = sqstore_sqlite
+      dstore = dstore_sqlite
+      topology = topology_default
+
+      ${extraOptions}
+    '';
+
+    in ''
+description "The GNUnet Daemon"
+
+start on network-interfaces/started
+stop on network-interfaces/stop
+
+start script
+    test -d "${home}" || \
+    ( mkdir -m 755 -p "${home}" && chown -R gnunetd:users "${home}")
+end script
+
+respawn ${gnunet}/bin/gnunetd                   \
+  ${if debug then "--debug" else "" }           \
+  --user="gnunetd"                              \
+  --config="${configFile}"                      \
+  --log="${logLevel}"
+'';
+
+}
-- 
GitLab


From 21ee887b75e751a9610b275cbe194c4c7272bc3f Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 8 Sep 2008 08:51:09 +0000
Subject: [PATCH 1064/5331] * Renamed `configuration' to something more
 descriptive.

svn path=/nixos/trunk/; revision=12822
---
 {configuration => installer/cd-dvd}/closed-install.nix            | 0
 {configuration => installer/cd-dvd}/live-dvd-X-medium.nix         | 0
 {configuration => installer/cd-dvd}/live-dvd-X-no-soft.nix        | 0
 {configuration => installer/cd-dvd}/live-dvd-X.nix                | 0
 {configuration => installer/cd-dvd}/live-dvd.nix                  | 0
 {configuration => installer/cd-dvd}/moduleList.nix                | 0
 .../cd-dvd}/remote-install-scripts/install-launch.sh              | 0
 .../cd-dvd}/remote-install-scripts/install-script.sh              | 0
 .../cd-dvd}/remote-install-scripts/install-start.sh               | 0
 .../cd-dvd}/remote-install-scripts/install-test.sh                | 0
 {configuration => installer/cd-dvd}/rescue-cd-closed.nix          | 0
 {configuration => installer/cd-dvd}/rescue-cd-configurable.nix    | 0
 {configuration => installer/cd-dvd}/rescue-cd-minimal.nix         | 0
 {configuration => installer/cd-dvd}/rescue-cd-offline.nix         | 0
 {configuration => installer/cd-dvd}/rescue-cd-replacement.nix     | 0
 {configuration => installer/cd-dvd}/rescue-cd.nix                 | 0
 16 files changed, 0 insertions(+), 0 deletions(-)
 rename {configuration => installer/cd-dvd}/closed-install.nix (100%)
 rename {configuration => installer/cd-dvd}/live-dvd-X-medium.nix (100%)
 rename {configuration => installer/cd-dvd}/live-dvd-X-no-soft.nix (100%)
 rename {configuration => installer/cd-dvd}/live-dvd-X.nix (100%)
 rename {configuration => installer/cd-dvd}/live-dvd.nix (100%)
 rename {configuration => installer/cd-dvd}/moduleList.nix (100%)
 rename {configuration => installer/cd-dvd}/remote-install-scripts/install-launch.sh (100%)
 rename {configuration => installer/cd-dvd}/remote-install-scripts/install-script.sh (100%)
 rename {configuration => installer/cd-dvd}/remote-install-scripts/install-start.sh (100%)
 rename {configuration => installer/cd-dvd}/remote-install-scripts/install-test.sh (100%)
 rename {configuration => installer/cd-dvd}/rescue-cd-closed.nix (100%)
 rename {configuration => installer/cd-dvd}/rescue-cd-configurable.nix (100%)
 rename {configuration => installer/cd-dvd}/rescue-cd-minimal.nix (100%)
 rename {configuration => installer/cd-dvd}/rescue-cd-offline.nix (100%)
 rename {configuration => installer/cd-dvd}/rescue-cd-replacement.nix (100%)
 rename {configuration => installer/cd-dvd}/rescue-cd.nix (100%)

diff --git a/configuration/closed-install.nix b/installer/cd-dvd/closed-install.nix
similarity index 100%
rename from configuration/closed-install.nix
rename to installer/cd-dvd/closed-install.nix
diff --git a/configuration/live-dvd-X-medium.nix b/installer/cd-dvd/live-dvd-X-medium.nix
similarity index 100%
rename from configuration/live-dvd-X-medium.nix
rename to installer/cd-dvd/live-dvd-X-medium.nix
diff --git a/configuration/live-dvd-X-no-soft.nix b/installer/cd-dvd/live-dvd-X-no-soft.nix
similarity index 100%
rename from configuration/live-dvd-X-no-soft.nix
rename to installer/cd-dvd/live-dvd-X-no-soft.nix
diff --git a/configuration/live-dvd-X.nix b/installer/cd-dvd/live-dvd-X.nix
similarity index 100%
rename from configuration/live-dvd-X.nix
rename to installer/cd-dvd/live-dvd-X.nix
diff --git a/configuration/live-dvd.nix b/installer/cd-dvd/live-dvd.nix
similarity index 100%
rename from configuration/live-dvd.nix
rename to installer/cd-dvd/live-dvd.nix
diff --git a/configuration/moduleList.nix b/installer/cd-dvd/moduleList.nix
similarity index 100%
rename from configuration/moduleList.nix
rename to installer/cd-dvd/moduleList.nix
diff --git a/configuration/remote-install-scripts/install-launch.sh b/installer/cd-dvd/remote-install-scripts/install-launch.sh
similarity index 100%
rename from configuration/remote-install-scripts/install-launch.sh
rename to installer/cd-dvd/remote-install-scripts/install-launch.sh
diff --git a/configuration/remote-install-scripts/install-script.sh b/installer/cd-dvd/remote-install-scripts/install-script.sh
similarity index 100%
rename from configuration/remote-install-scripts/install-script.sh
rename to installer/cd-dvd/remote-install-scripts/install-script.sh
diff --git a/configuration/remote-install-scripts/install-start.sh b/installer/cd-dvd/remote-install-scripts/install-start.sh
similarity index 100%
rename from configuration/remote-install-scripts/install-start.sh
rename to installer/cd-dvd/remote-install-scripts/install-start.sh
diff --git a/configuration/remote-install-scripts/install-test.sh b/installer/cd-dvd/remote-install-scripts/install-test.sh
similarity index 100%
rename from configuration/remote-install-scripts/install-test.sh
rename to installer/cd-dvd/remote-install-scripts/install-test.sh
diff --git a/configuration/rescue-cd-closed.nix b/installer/cd-dvd/rescue-cd-closed.nix
similarity index 100%
rename from configuration/rescue-cd-closed.nix
rename to installer/cd-dvd/rescue-cd-closed.nix
diff --git a/configuration/rescue-cd-configurable.nix b/installer/cd-dvd/rescue-cd-configurable.nix
similarity index 100%
rename from configuration/rescue-cd-configurable.nix
rename to installer/cd-dvd/rescue-cd-configurable.nix
diff --git a/configuration/rescue-cd-minimal.nix b/installer/cd-dvd/rescue-cd-minimal.nix
similarity index 100%
rename from configuration/rescue-cd-minimal.nix
rename to installer/cd-dvd/rescue-cd-minimal.nix
diff --git a/configuration/rescue-cd-offline.nix b/installer/cd-dvd/rescue-cd-offline.nix
similarity index 100%
rename from configuration/rescue-cd-offline.nix
rename to installer/cd-dvd/rescue-cd-offline.nix
diff --git a/configuration/rescue-cd-replacement.nix b/installer/cd-dvd/rescue-cd-replacement.nix
similarity index 100%
rename from configuration/rescue-cd-replacement.nix
rename to installer/cd-dvd/rescue-cd-replacement.nix
diff --git a/configuration/rescue-cd.nix b/installer/cd-dvd/rescue-cd.nix
similarity index 100%
rename from configuration/rescue-cd.nix
rename to installer/cd-dvd/rescue-cd.nix
-- 
GitLab


From 5e88ff8269b070a3971c66e0cf2d902b1033ce9a Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 8 Sep 2008 09:36:54 +0000
Subject: [PATCH 1065/5331] * Fix relative paths.

svn path=/nixos/trunk/; revision=12823
---
 installer/cd-dvd/rescue-cd.nix | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/installer/cd-dvd/rescue-cd.nix b/installer/cd-dvd/rescue-cd.nix
index 19c47b625ad..427d21e523c 100644
--- a/installer/cd-dvd/rescue-cd.nix
+++ b/installer/cd-dvd/rescue-cd.nix
@@ -1,10 +1,10 @@
 { platform ? __currentSystem
 , relName ?
-    if builtins.pathExists ../relname
-    then builtins.readFile ../relname
-    else "nixos-${builtins.readFile ../VERSION}"
+    if builtins.pathExists ../../relname
+    then builtins.readFile ../../relname
+    else "nixos-${builtins.readFile ../../VERSION}"
 , compressImage ? false
-, nixpkgsPath ? ../../nixpkgs
+, nixpkgsPath ? ../../../nixpkgs
 }:
 
 rec {
@@ -191,7 +191,7 @@ rec {
   };
 
 
-  system = import ../system/system.nix {
+  system = import ../../system/system.nix {
     inherit configuration platform nixpkgsPath;
   };
 
@@ -203,7 +203,7 @@ rec {
   # 0.11 (you won't get the manual).
   manual =
     if builtins ? unsafeDiscardStringContext
-    then "${import ../doc/manual {inherit nixpkgsPath;}}/manual.html"
+    then "${import ../../doc/manual {inherit nixpkgsPath;}}/manual.html"
     else pkgs.writeText "dummy-manual" "Manual not included in this build!";
 
 
@@ -219,7 +219,7 @@ rec {
   
   # Put the current directory in a tarball (making sure to filter
   # out crap like the .svn directories).
-  nixosTarball = makeTarball "nixos.tar.bz2" (builtins.filterSource svnFilter ./..);
+  nixosTarball = makeTarball "nixos.tar.bz2" (builtins.filterSource svnFilter ./../..);
 
   svnFilter = name: type:
     let base = baseNameOf (toString name);
@@ -252,7 +252,7 @@ rec {
 
   # Create an ISO image containing the Grub boot loader, the kernel,
   # the initrd produced above, and the closure of the stage 2 init.
-  rescueCD = import ../helpers/make-iso9660-image.nix {
+  rescueCD = import ../../helpers/make-iso9660-image.nix {
     inherit nixpkgsPath;
     inherit (pkgs) stdenv perl cdrkit;
     isoName = "${relName}-${platform}.iso";
-- 
GitLab


From 212d5ceff572d058d5417e6823cc7efc61e8e67d Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 8 Sep 2008 12:40:05 +0000
Subject: [PATCH 1066/5331] * Don't generate a manifest for the CD anymore,
 just use the   copy-from-other-stores substituter to copy paths directly from
 the   Nix store on the CD.

svn path=/nixos/trunk/; revision=12826
---
 helpers/make-iso9660-image.sh     |  3 ---
 installer/cd-dvd/rescue-cd.nix    |  3 +++
 installer/nixos-install.sh        | 13 ++++---------
 system/switch-to-configuration.sh |  2 +-
 4 files changed, 8 insertions(+), 13 deletions(-)

diff --git a/helpers/make-iso9660-image.sh b/helpers/make-iso9660-image.sh
index 03f4208375c..5ba133b6890 100644
--- a/helpers/make-iso9660-image.sh
+++ b/helpers/make-iso9660-image.sh
@@ -42,9 +42,6 @@ done
 printRegistration=1 perl $pathsFromGraph closure-* > nix-path-registration
 echo "nix-path-registration=nix-path-registration" >> pathlist
 
-printManifest=1 perl $pathsFromGraph closure-* > MANIFEST
-echo "MANIFEST=MANIFEST" >> pathlist
-
 
 # Add symlinks to the top-level store objects.
 for ((n = 0; n < ${#objects[*]}; n++)); do
diff --git a/installer/cd-dvd/rescue-cd.nix b/installer/cd-dvd/rescue-cd.nix
index 427d21e523c..c34fc259340 100644
--- a/installer/cd-dvd/rescue-cd.nix
+++ b/installer/cd-dvd/rescue-cd.nix
@@ -60,6 +60,9 @@ rec {
           # Firewire support.  Not tested.
           "ohci1394" "sbp2"
 
+          # Virtio (QEMU, KVM etc.) support.
+          "virtio_net" "virtio_pci" "virtio_blk" "virtio_balloon"
+
           # Wait for SCSI devices to appear.
           "scsi_wait_scan"
 
diff --git a/installer/nixos-install.sh b/installer/nixos-install.sh
index 44fdf2d3337..1288304cbe0 100644
--- a/installer/nixos-install.sh
+++ b/installer/nixos-install.sh
@@ -101,6 +101,7 @@ mkdir -m 1777 -p \
 # Get the store paths to copy from the references graph.
 storePaths=$(@perl@/bin/perl @pathsFromGraph@ @nixClosure@)
 
+
 # Copy Nix to the Nix store on the target device.
 echo "copying Nix to $mountPoint...."
 for i in $storePaths; do
@@ -124,15 +125,9 @@ mkdir -m 0755 -p $mountPoint/bin
 ln -sf @shell@ $mountPoint/bin/sh
 
 
-# Pull the manifest on the CD so that everything in the Nix store on
-# the CD can be copied directly.
-echo "registering substitutes to speed up builds..."
-rm -f $mountPoint/nix/var/nix/manifests/*
-if test -e /MANIFEST; then
-    chroot $mountPoint @nix@/bin/nix-pull file:///mnt/MANIFEST
-fi
-rm -f $mountPoint/tmp/inst-store
-ln -s /mnt/nix/store $mountPoint/tmp/inst-store
+# Make the build below copy paths from the CD if possible.  Note that
+# /mnt in the chroot is the root of the CD.
+export NIX_OTHER_STORES=/mnt/nix:$NIX_OTHER_STORES
 
 
 # Do a nix-pull to speed up building.
diff --git a/system/switch-to-configuration.sh b/system/switch-to-configuration.sh
index ef1893880e2..593dd61714e 100644
--- a/system/switch-to-configuration.sh
+++ b/system/switch-to-configuration.sh
@@ -29,7 +29,7 @@ if test "$action" = "switch" -o "$action" = "boot"; then
             @grub@/sbin/grub-install "@grubDevice@" --no-floppy --recheck
         fi
     else
-        echo "Warning: don't know how to make this configuration bootable" 1>&2
+        echo "Warning: don't know how to make this configuration bootable; please set \`boot.grubDevice'." 1>&2
     fi
 fi
 
-- 
GitLab


From 75dc712c5908bbc0c83e414ca32535ca6decfe26 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Mon, 8 Sep 2008 21:07:49 +0000
Subject: [PATCH 1067/5331] Added virtio modules to module list for rescue CD
 variations.

svn path=/nixos/trunk/; revision=12828
---
 installer/cd-dvd/moduleList.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/installer/cd-dvd/moduleList.nix b/installer/cd-dvd/moduleList.nix
index 0ae686811b0..a2e8cb94306 100644
--- a/installer/cd-dvd/moduleList.nix
+++ b/installer/cd-dvd/moduleList.nix
@@ -40,4 +40,7 @@
   
   # Needed for live-CD operation.
   "aufs"
+
+  # Virtio (QEMU, KVM etc.) support.
+  "virtio_net" "virtio_pci" "virtio_blk" "virtio_balloon"
 ]
-- 
GitLab


From 88be528d9de957258adfa47e0ff7f026c331ab01 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Mon, 8 Sep 2008 21:08:20 +0000
Subject: [PATCH 1068/5331] Updating rescue-cd-configurable to match
 rescue-cd.nix updates

svn path=/nixos/trunk/; revision=12829
---
 installer/cd-dvd/rescue-cd-configurable.nix | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/installer/cd-dvd/rescue-cd-configurable.nix b/installer/cd-dvd/rescue-cd-configurable.nix
index ce4d3ff6567..f660a7fe303 100644
--- a/installer/cd-dvd/rescue-cd-configurable.nix
+++ b/installer/cd-dvd/rescue-cd-configurable.nix
@@ -44,6 +44,10 @@
   ,additionalJobs ? []
   ,intel3945FWEnable ? false
   ,cdLabel ? "NIXOS_INSTALLATION_CD"
+  ,relName ?
+    if builtins.pathExists ../../relname
+    then builtins.readFile ../../relname
+    else "nixos-${builtins.readFile ../../VERSION}"
 }:
 let 
   realLib = if lib != null then lib else (import (nixpkgsPath+"/pkgs/lib"));
@@ -58,7 +62,7 @@ let
  
   systemPackBuilder = {suffix, configuration} : 
   { 
-    system = (import ../system/system.nix) {
+    system = (import ../../system/system.nix) {
       inherit configuration platform nixpkgsPath; /* To refactor later - x86+x86_64 DVD */
     };
     inherit suffix configuration;
@@ -341,7 +345,7 @@ rec {
   # The NixOS manual, with a backward compatibility hack for Nix <=
   # 0.11 (you won't get the manual).
   manual = if builtins ? unsafeDiscardStringContext
-    then "${import ../doc/manual {inherit nixpkgsPath;}}/manual.html"
+    then "${import ../../doc/manual {inherit nixpkgsPath;}}/manual.html"
     else pkgs.writeText "dummy-manual" "Manual not included in this build!";
  
  
@@ -371,7 +375,7 @@ rec {
     let base = baseNameOf (toString name);
     in base != ".svn" && base != "result";
     in
-    makeTarball "nixos.tar.bz2" (builtins.filterSource filter ./..);
+    makeTarball "nixos.tar.bz2" (builtins.filterSource filter ./../..);
  
  
   # Get a recent copy of Nixpkgs.
@@ -380,7 +384,7 @@ rec {
     md5 = "6a793b877e2a4fa79827515902e1dfd8";
   } else makeNixPkgsTarball "nixpkgs.tar.bz2" ("" + nixpkgsPath);
 
-  nixosServicesTarball = makeNixPkgsTarball "nixos-services.tar.bz2" ("" + ./../../services);
+  nixosServicesTarball = makeNixPkgsTarball "nixos-services.tar.bz2" ("" + ./../../../services);
  
   # The configuration file for Grub.
   grubCfg = pkgs.writeText "menu.lst" (''
@@ -399,10 +403,10 @@ rec {
  
   # Create an ISO image containing the Grub boot loader, the kernel,
   # the initrd produced above, and the closure of the stage 2 init.
-  rescueCD = import ../helpers/make-iso9660-image.nix {
+  rescueCD = import ../../helpers/make-iso9660-image.nix {
     inherit (pkgs) stdenv perl cdrkit;
     inherit compressImage nixpkgsPath;
-    isoName = "nixos-${platform}.iso";
+    isoName = "nixos-${relName}-${platform}.iso";
   
     # Single files to be copied to fixed locations on the CD.
     contents = lib.uniqList {
-- 
GitLab


From f03fed54e0918912367c19c0e633b4366ab5093c Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Mon, 8 Sep 2008 22:36:11 +0000
Subject: [PATCH 1069/5331] Now automated test runs - installs and boots NixOS
 - on my computer. Some minor issue with socat transferring report from
 virtual machine to host, though.

svn path=/nixos/trunk/; revision=12830
---
 installer/cd-dvd/closed-install.nix           |  4 ++++
 .../remote-install-scripts/install-script.sh  | 10 +++++++---
 .../remote-install-scripts/install-test.sh    |  4 ++--
 installer/cd-dvd/rescue-cd-configurable.nix   | 19 +++++++++++++------
 4 files changed, 26 insertions(+), 11 deletions(-)

diff --git a/installer/cd-dvd/closed-install.nix b/installer/cd-dvd/closed-install.nix
index 7ea2460ad98..d7544ff22b8 100644
--- a/installer/cd-dvd/closed-install.nix
+++ b/installer/cd-dvd/closed-install.nix
@@ -66,4 +66,8 @@ in
 			'';
 		}
 	];
+        nix = pkgs: pkgs.nixCustomFun (pkgs.nixUnstable.src)
+          ""
+          ["nix-reduce-build" "nix-http-export.cgi"]
+          ["--with-docbook-xsl=\\\${pkgs.docbook5_xsl}/xml/xsl/docbook/"];
 }).rescueCD
diff --git a/installer/cd-dvd/remote-install-scripts/install-script.sh b/installer/cd-dvd/remote-install-scripts/install-script.sh
index b6becd432f8..fbacf6ff6a5 100755
--- a/installer/cd-dvd/remote-install-scripts/install-script.sh
+++ b/installer/cd-dvd/remote-install-scripts/install-script.sh
@@ -14,7 +14,7 @@ mkdir -p /mnt/etc/nixos
 
 cat > /mnt/etc/nixos/configuration.nix <<EOF
 
-{
+pkgs: full_configuration: {
   boot = {
     grubDevice = "/dev/sda";
     copyKernels = true;
@@ -67,9 +67,13 @@ cat > /mnt/etc/nixos/configuration.nix <<EOF
   };
 
   environment = {
-    extraPackages = pkgs: [
-      pkgs.socat
+    extraPackages = [
+      pkgs.socat (pkgs.lowPrio pkgs.nixUnstable)
     ];
+    nix = pkgs.nixCustomFun (pkgs.nixUnstable.src)
+      ""
+      ["nix-reduce-build" "nix-http-export.cgi"]
+      ["--with-docbook-xsl=\\\${pkgs.docbook5_xsl}/xml/xsl/docbook/"];
   };
 }
 
diff --git a/installer/cd-dvd/remote-install-scripts/install-test.sh b/installer/cd-dvd/remote-install-scripts/install-test.sh
index 1bf02e531b0..b9c135b8865 100755
--- a/installer/cd-dvd/remote-install-scripts/install-test.sh
+++ b/installer/cd-dvd/remote-install-scripts/install-test.sh
@@ -24,7 +24,7 @@ echo "reboot" | ./socat/bin/socat tcp-listen:4424 stdio >> report &
 if ( ! [ -d dvd/iso ] ) || ( [ -z "$USE_LEFTOVER_DVD" ] ); then
     rm dvd
     # unset NIXPKGS_CONFIG to reduce host -> image configuration leak
-    NIXPKGS_CONFIG= nix-build -o dvd /etc/nixos/nixos/configuration/closed-install.nix || 
+    NIXPKGS_CONFIG= nix-build -o dvd /etc/nixos/nixos/installer/cd-dvd/closed-install.nix || 
       { echo "Failed to build LiveDVD" >&2 ;  exit 2; };
 fi;
 
@@ -52,7 +52,7 @@ if ( ! [ -f install-test.img ] ) || ( [ -z "$JUST_BOOT" ] ); then
     ) | ssh -l root -i /var/certs/ssh/id_livedvd -o StrictHostKeyChecking=no 127.0.0.1 -p 4425
 fi;
 
-./qemu/bin/qemu --kernel-kqemu -m 512 install-test.img -no-reboot 
+./qemu/bin/qemu --kernel-kqemu -m 128 install-test.img -no-reboot 
 
 echo "Report contains: "
 cat report
diff --git a/installer/cd-dvd/rescue-cd-configurable.nix b/installer/cd-dvd/rescue-cd-configurable.nix
index f660a7fe303..a00164a2088 100644
--- a/installer/cd-dvd/rescue-cd-configurable.nix
+++ b/installer/cd-dvd/rescue-cd-configurable.nix
@@ -40,14 +40,16 @@
   */
   ,additionalFiles ? []
   ,compressImage ? false
-  ,nixpkgsPath ? ../../nixpkgs
+  ,nixpkgsPath ? ../../../nixpkgs
   ,additionalJobs ? []
-  ,intel3945FWEnable ? false
+  ,intel3945FWEnable ? true
+  ,intel4965FWEnable ? true
   ,cdLabel ? "NIXOS_INSTALLATION_CD"
   ,relName ?
     if builtins.pathExists ../../relname
     then builtins.readFile ../../relname
     else "nixos-${builtins.readFile ../../VERSION}"
+  ,nix ? pkgs: pkgs.nix
 }:
 let 
   realLib = if lib != null then lib else (import (nixpkgsPath+"/pkgs/lib"));
@@ -151,6 +153,7 @@ rec {
       kernelModules = bootKernelModules;
       extraModulePackages = ((extraModulePackages pkgs)
       ++(if aufs then [(kernelPackages pkgs).aufs] else [])
+      ++(pkgs.lib.optional intel3945FWEnable (kernelPackages pkgs).iwlwifi)
       );
     };
     
@@ -159,6 +162,13 @@ rec {
       sshd = { enable = sshdEnabled; };
       
       xserver = { enable = false; };
+
+      udev = {
+        addFirmware = []
+	  ++ (pkgs.lib.optional intel3945FWEnable pkgs.iwlwifi3945ucode)
+	  ++ (pkgs.lib.optional intel4965FWEnable pkgs.iwlwifi4965ucode)
+	  ;
+      };
    
       extraJobs = [
         # Unpack the NixOS/Nixpkgs sources to /etc/nixos.
@@ -314,6 +324,7 @@ rec {
       ] ++ (packages pkgs);
       checkConfigurationOptions = true;
       cleanStart = cleanStart;
+      nix = nix pkgs;
     };
   
     users = {
@@ -326,10 +337,6 @@ rec {
       }
     ];
     
-    networking = {
-      enableIntel3945ABGFirmware = intel3945FWEnable;
-    };
-
   }; in preConfiguration // (arbitraryOverrides preConfiguration);
  
   configurations = [{
-- 
GitLab


From d5da3185fe3b6015b104a3ad0065541f697e129c Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 12 Sep 2008 16:31:39 +0000
Subject: [PATCH 1070/5331] svn path=/nixos/trunk/; revision=12853

---
 upstart-jobs/zabbix-agent.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/upstart-jobs/zabbix-agent.nix b/upstart-jobs/zabbix-agent.nix
index fdfb2f3005d..8d57c6fbd50 100644
--- a/upstart-jobs/zabbix-agent.nix
+++ b/upstart-jobs/zabbix-agent.nix
@@ -33,6 +33,9 @@ in
   ];
 
   job = ''
+    start on network-interfaces/started
+    stop on network-interfaces/stop
+
     description "Zabbix agent daemon"
 
     start script
-- 
GitLab


From ca031ce720b3d39c0d6869af0fbd79551cc79176 Mon Sep 17 00:00:00 2001
From: Marc Weber <marco-oweber@gmx.de>
Date: Sun, 14 Sep 2008 01:30:45 +0000
Subject: [PATCH 1071/5331] httpd.extraModules: now accpets string items
 loading modules beeing distributed by apache removed pkgs : arg

svn path=/nixos/trunk/; revision=12861
---
 system/options.nix                    |  9 +++++----
 upstart-jobs/apache-httpd/default.nix | 10 ++++++----
 2 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/system/options.nix b/system/options.nix
index e17e587430c..5c51d777b98 100644
--- a/system/options.nix
+++ b/system/options.nix
@@ -1716,11 +1716,12 @@ in
       };
 
       extraModules = mkOption {
-        default = pkgs : [];
+        default = [];
+        example = [ "proxy_connect" { name = "php5_module"; path = "${pkgs.php}/modules/libphp5.so"; } ];
         description = ''
-          used to add additional modules
-          Example for PHP:
-          pkgs : [ { name = "php5_module"; path = "${pkgs.php}/modules/libphp5.so" } ]
+          Loads additional modules either beeing distributed with apache.
+          If the module is contained in a foreign package (such as php5_module)
+          kse an attrset as given in the example.
         '';
       };
 
diff --git a/upstart-jobs/apache-httpd/default.nix b/upstart-jobs/apache-httpd/default.nix
index 6a4e9116dc9..7cc23e5cfce 100644
--- a/upstart-jobs/apache-httpd/default.nix
+++ b/upstart-jobs/apache-httpd/default.nix
@@ -12,7 +12,10 @@ let
 
 
   getPort = cfg: if cfg.port != 0 then cfg.port else if cfg.enableSSL then 443 else 80;
-  
+
+  extraModules = pkgs.lib.traceWhatis ( pkgs.lib.getAttr ["extraModules"] [] mainCfg;
+  extraForeignModules = pkgs.lib.filter builtins.isAttrs extraModules;
+  extraApachaModules = pkgs.lib.filter (x :! (builtins.isAttrs x)) extraModules; # I'd prefer using builtins.isString here, but doesn't exist yet
 
   makeServerInfo = cfg: {
     # Canonical name must not include a trailing slash.
@@ -105,7 +108,7 @@ let
       "mime" "dav" "status" "autoindex" "asis" "info" "cgi" "dav_fs"
       "vhost_alias" "negotiation" "dir" "imagemap" "actions" "speling"
       "userdir" "alias" "rewrite" "proxy" "proxy_http"
-    ] ++ optional enableSSL "ssl";
+    ] ++ optional enableSSL "ssl" ++ extraApachaModules;
     
 
   loggingConf = ''
@@ -297,8 +300,7 @@ let
         allModules =
           concatMap (svc: svc.extraModulesPre) allSubservices ++
           map (name: {inherit name; path = "${httpd}/modules/mod_${name}.so";}) apacheModules ++
-          concatMap (svc: svc.extraModules) allSubservices ++
-          (pkgs.lib.getAttr ["extraModules"] (x:[]) mainCfg) pkgs;
+          concatMap (svc: svc.extraModules) allSubservices ++ extraForeignModules;
       in concatMapStrings load allModules
     }
 
-- 
GitLab


From 77d1d30e9740125f4de2ee9ba7a6b37a9bcee8d7 Mon Sep 17 00:00:00 2001
From: Marc Weber <marco-oweber@gmx.de>
Date: Sun, 14 Sep 2008 13:29:09 +0000
Subject: [PATCH 1072/5331] doh, removed debug statement and superfluous wrong
 character

svn path=/nixos/trunk/; revision=12862
---
 upstart-jobs/apache-httpd/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/upstart-jobs/apache-httpd/default.nix b/upstart-jobs/apache-httpd/default.nix
index 7cc23e5cfce..ee15dc06f01 100644
--- a/upstart-jobs/apache-httpd/default.nix
+++ b/upstart-jobs/apache-httpd/default.nix
@@ -13,7 +13,7 @@ let
 
   getPort = cfg: if cfg.port != 0 then cfg.port else if cfg.enableSSL then 443 else 80;
 
-  extraModules = pkgs.lib.traceWhatis ( pkgs.lib.getAttr ["extraModules"] [] mainCfg;
+  extraModules = pkgs.lib.getAttr ["extraModules"] [] mainCfg;
   extraForeignModules = pkgs.lib.filter builtins.isAttrs extraModules;
   extraApachaModules = pkgs.lib.filter (x :! (builtins.isAttrs x)) extraModules; # I'd prefer using builtins.isString here, but doesn't exist yet
 
-- 
GitLab


From e89cdc0de79057272bb85a4764a8d7a3bb38978e Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Wed, 1 Oct 2008 15:56:01 +0000
Subject: [PATCH 1073/5331] Found it useful to have a place to export assorted
 things from system configuration..

svn path=/nixos/trunk/; revision=12932
---
 system/options.nix | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/system/options.nix b/system/options.nix
index 5c51d777b98..40e169c7a90 100644
--- a/system/options.nix
+++ b/system/options.nix
@@ -3051,6 +3051,15 @@ root        ALL=(ALL) SETENV: ALL
     };
   };
 
+  passthru = mkOption {
+    default = {};
+    description = "
+      Additional parameters. Ignored. When you want to be sure that 
+      /etc/nixos/nixos -A config.passthru.* is that same thing the 
+      system rebuild will use.
+    ";
+  };
+
   require = [
     (import ../upstart-jobs/pcmcia.nix)
   ];
-- 
GitLab


From ec1d1ef851e439c675d5897e3172efb2fac0ba46 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 6 Oct 2008 13:40:14 +0000
Subject: [PATCH 1074/5331] * Urgh, there's got to be a more generic way of
 dealing   with the Python version...

svn path=/nixos/trunk/; revision=12972
---
 upstart-jobs/apache-httpd/subversion.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/upstart-jobs/apache-httpd/subversion.nix b/upstart-jobs/apache-httpd/subversion.nix
index e4c3692df94..3b86a1507ea 100644
--- a/upstart-jobs/apache-httpd/subversion.nix
+++ b/upstart-jobs/apache-httpd/subversion.nix
@@ -137,7 +137,7 @@ let
     <Location ${urlPrefix}/viewvc>
         AddHandler python-program .py
         # Note: we write \" instead of ' to work around a lexer bug in Nix 0.11.
-        PythonPath "[\"${viewvc}/viewvc/bin/mod_python\", \"${subversion}/lib/python2.4/site-packages\"] + sys.path"
+        PythonPath "[\"${viewvc}/viewvc/bin/mod_python\", \"${subversion}/lib/python2.5/site-packages\"] + sys.path"
         PythonHandler handler
         ${viewerConfig "viewvc"}
     </Location>
@@ -333,7 +333,7 @@ in {
   # mod_python's own Python modules must be in the initial Python
   # path, they cannot be set through the PythonPath directive.
   globalEnvVars = [
-    { name = "PYTHONPATH"; value = "${pkgs.mod_python}/lib/python2.4/site-packages"; }
+    { name = "PYTHONPATH"; value = "${pkgs.mod_python}/lib/python2.5/site-packages"; }
   ];
 
   
-- 
GitLab


From 5ea24925b5f4216b6ba3134065eb80ba65352064 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 6 Oct 2008 23:02:20 +0000
Subject: [PATCH 1075/5331] * Use Subversion 1.5.

svn path=/nixos/trunk/; revision=12980
---
 upstart-jobs/apache-httpd/subversion.nix | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/upstart-jobs/apache-httpd/subversion.nix b/upstart-jobs/apache-httpd/subversion.nix
index 3b86a1507ea..5baecc83723 100644
--- a/upstart-jobs/apache-httpd/subversion.nix
+++ b/upstart-jobs/apache-httpd/subversion.nix
@@ -19,15 +19,13 @@ let
 
 
   # Build a Subversion instance with Apache modules and Swig/Python bindings.
-  subversion = import ../../../nixpkgs/pkgs/applications/version-management/subversion-1.4.x {
-    inherit (pkgs) fetchurl stdenv apr aprutil neon expat swig zlib;
+  subversion = pkgs.subversion15.function (origArgs: {
     bdbSupport = true;
     httpServer = true;
     sslSupport = true;
     compressionSupport = true;
     pythonBindings = true;
-    httpd = pkgs.apacheHttpd;
-  };
+  });
 
 
   # Build the maintenance scripts and commit hooks.
-- 
GitLab


From d438b972b1210b93e1ae9314efa2028f2c3a769d Mon Sep 17 00:00:00 2001
From: Marc Weber <marco-oweber@gmx.de>
Date: Mon, 6 Oct 2008 23:23:28 +0000
Subject: [PATCH 1076/5331] nixos-rebuild: take NIXPKGS location from env, too

svn path=/nixos/trunk/; revision=12981
---
 default.nix                | 10 ++++++----
 installer/nixos-rebuild.sh |  1 +
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/default.nix b/default.nix
index 57b326437ec..3923cb9592b 100644
--- a/default.nix
+++ b/default.nix
@@ -1,10 +1,12 @@
 let
 
-  configFileName =
-    let env = builtins.getEnv "NIXOS_CONFIG"; in
-    if env == "" then /etc/nixos/configuration.nix else env;
+  fromEnv = name : default :
+    let env = builtins.getEnv name; in
+    if env == "" then default else env;
+  configuration = import (fromEnv "NIXOS_CONFIG" /etc/nixos/configuration.nix);
+  nixpkgsPath   =         fromEnv "NIXPKGS"      /etc/nixos/nixpkgs;
 
-  system = import system/system.nix {configuration = import configFileName;};
+  system = import system/system.nix { inherit configuration nixpkgsPath; };
 
 in
 
diff --git a/installer/nixos-rebuild.sh b/installer/nixos-rebuild.sh
index b8deee2f18e..06a7a4d39fc 100644
--- a/installer/nixos-rebuild.sh
+++ b/installer/nixos-rebuild.sh
@@ -5,6 +5,7 @@
 NIXOS=${NIXOS:-@defaultNIXOS@}
 NIXPKGS=${NIXPKGS:-@defaultNIXPKGS@}
 NIXOS_CONFIG=${NIXOS_CONFIG:-/etc/nixos/configuration.nix}
+export NIXPKGS # must be exported so that a non default location is passed to nixos/default.nix
 
 showSyntax() {
     # !!! more or less cut&paste from
-- 
GitLab


From f7770a6b63f94c1a649b43ac0575dee058a5208e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Thu, 9 Oct 2008 19:58:11 +0000
Subject: [PATCH 1077/5331] In `bashrc', don't add non-existent directories to
 `ACLOCAL_PATH'.

svn path=/nixos/trunk/; revision=13033
---
 etc/bashrc.sh | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/etc/bashrc.sh b/etc/bashrc.sh
index a396a7c302d..0a4195a56d1 100644
--- a/etc/bashrc.sh
+++ b/etc/bashrc.sh
@@ -39,7 +39,13 @@ for i in $NIX_PROFILES; do # !!! reverse
     export PATH=$i/bin:$i/sbin:$PATH
     export INFOPATH=$i/info:$i/share/info:$INFOPATH
     export PKG_CONFIG_PATH="$i/lib/pkgconfig:$PKG_CONFIG_PATH"
-    export ACLOCAL_PATH="$i/share/aclocal:$ACLOCAL_PATH"
+
+    # Automake's `aclocal' bails out if it finds non-existent directories
+    # in its path.
+    if [ -d "$i/share/aclocal" ]
+    then
+	export ACLOCAL_PATH="$i/share/aclocal:$ACLOCAL_PATH"
+    fi
 done
 
 
-- 
GitLab


From 4891014cca35fb4b2309f9fa9a3284436367119b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Thu, 9 Oct 2008 20:05:52 +0000
Subject: [PATCH 1078/5331] boot-stage-2-init.sh: Delete files under `/tmp'.

svn path=/nixos/trunk/; revision=13034
---
 boot/boot-stage-2-init.sh | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/boot/boot-stage-2-init.sh b/boot/boot-stage-2-init.sh
index e79f9992734..3ae40824285 100644
--- a/boot/boot-stage-2-init.sh
+++ b/boot/boot-stage-2-init.sh
@@ -82,6 +82,9 @@ mkdir -m 0755 -p /home
 
 # Miscellaneous boot time cleanup.
 rm -rf /var/run
+echo -n "cleaning \`/tmp'..."
+rm -rf --one-file-system /tmp/*
+echo " done"
 
 if test -n "$safeMode"; then
     mkdir -m 0755 -p /var/run
-- 
GitLab


From a99b82b987912337e2041d3717fb36f7da89a529 Mon Sep 17 00:00:00 2001
From: Marc Weber <marco-oweber@gmx.de>
Date: Fri, 10 Oct 2008 16:45:56 +0000
Subject: [PATCH 1079/5331] Misspelling the video driver name results in a
 thrown message now small refactorings, list of known drivers is an attr set,
 optional is imported from lib etc

svn path=/nixos/trunk/; revision=13048
---
 upstart-jobs/xserver.nix | 27 ++++++++++++++++-----------
 1 file changed, 16 insertions(+), 11 deletions(-)

diff --git a/upstart-jobs/xserver.nix b/upstart-jobs/xserver.nix
index d78c0471f90..caf842a8e45 100644
--- a/upstart-jobs/xserver.nix
+++ b/upstart-jobs/xserver.nix
@@ -6,19 +6,30 @@
 
 let
 
-  optional = condition: x: if condition then [x] else [];
-
+  inherit (pkgs.lib) optional isInList getAttr;
   # Abbreviations.
   cfg = config.services.xserver;
   xorg = cfg.package;
   gnome = pkgs.gnome;
   stdenv = pkgs.stdenv;
 
+  knownVideoDrivers = {
+    nvidia = { modulesFirst = [ kernelPackages.nvidiaDrivers ]; };  #make sure it first loads the nvidia libs
+    vesa =  { modules = [xorg.xf86videovesa]; };
+    vga =   { modules = [xorg.xf86videovga]; };
+    sis =   { modules = [xorg.xf86videosis]; };
+    i810 =  { modules = [xorg.xf86videoi810]; };
+    intel = { modules = [xorg.xf86videointel]; };
+    nv =    { modules = [xorg.xf86videonv]; };
+    ati =   { modules = [xorg.xf86videoati]; };
+  };
+
   # Get a bunch of user settings.
   videoDriver = cfg.videoDriver;
   resolutions = map (res: ''"${toString res.x}x${toString res.y}"'') (cfg.resolutions);
   sessionType = cfg.sessionType;
 
+  videoDriverModules = getAttr [ videoDriver ] (throw "unkown video driver : \"${videoDriver}\"") knownVideoDrivers;
 
   sessionCmd =
     if sessionType == "" then cfg.sessionStarter else
@@ -36,20 +47,14 @@ let
 
     
   modules = 
-    optional (videoDriver == "nvidia") kernelPackages.nvidiaDrivers #make sure it first loads the nvidia libs
+
+    getAttr ["modulesFirst"] [] videoDriverModules
     ++ [
       xorg.xorgserver
       xorg.xf86inputkeyboard
       xorg.xf86inputmouse
     ] 
-    ++ optional (videoDriver == "vesa") xorg.xf86videovesa
-    ++ optional (videoDriver == "vga") xorg.xf86videovga
-    ++ optional (videoDriver == "sis") xorg.xf86videosis
-    ++ optional (videoDriver == "i810") xorg.xf86videoi810
-    ++ optional (videoDriver == "intel") xorg.xf86videointel
-    ++ optional (videoDriver == "nv") xorg.xf86videonv
-    ++ optional (videoDriver == "ati") xorg.xf86videoati
-    ++ optional (videoDriver == "radeonhd") xorg.xf86videoradeonhd
+    ++ getAttr ["modules"] [] videoDriverModules
     ++ (optional cfg.synaptics.enable ["${pkgs.synaptics}/${xorg.xorgserver}" /*xorg.xf86inputevdev*/]);
 
 
-- 
GitLab


From 1d55390e1c3bd2f6af58d5b92f7150412f9e4713 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Fri, 24 Oct 2008 10:30:38 +0000
Subject: [PATCH 1080/5331] An option for XRandr support. Use it for dualhead
 ATi (and probably Intel) cards.

svn path=/nixos/trunk/; revision=13109
---
 installer/cd-dvd/live-dvd-X-no-soft.nix |  3 ++-
 system/options.nix                      | 10 ++++++++++
 upstart-jobs/xserver.conf               |  2 ++
 upstart-jobs/xserver.nix                |  3 +++
 4 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/installer/cd-dvd/live-dvd-X-no-soft.nix b/installer/cd-dvd/live-dvd-X-no-soft.nix
index 2afe37aa5f8..7111107b675 100644
--- a/installer/cd-dvd/live-dvd-X-no-soft.nix
+++ b/installer/cd-dvd/live-dvd-X-no-soft.nix
@@ -18,11 +18,12 @@ let
 	windowManager = "twm";
 	tty = "9";
   };
+  pkgs
 
 in 
 (isoFun {
 	inherit platform;
-	lib = (import ../pkgs/lib);
+	lib = (import ../../pkgs/lib);
 
 	networkNixpkgs = "";
 	manualEnabled = true;
diff --git a/system/options.nix b/system/options.nix
index 40e169c7a90..d15c2164545 100644
--- a/system/options.nix
+++ b/system/options.nix
@@ -1557,6 +1557,16 @@ in
         ";
       };
 
+      virtualScreen = mkOption {
+        default = null;
+	example = {
+	  x=2048;
+	  y=2048;
+	};
+	description = "
+	  Virtual screen size for Xrandr
+	";
+      };
     };
 
     ejabberd = {
diff --git a/upstart-jobs/xserver.conf b/upstart-jobs/xserver.conf
index 98f98f481f9..36e9da8bf0f 100644
--- a/upstart-jobs/xserver.conf
+++ b/upstart-jobs/xserver.conf
@@ -58,11 +58,13 @@ Section "Screen"
     Depth      16
     Modes      @resolutions@
     @extraDisplaySettings@
+    @virtualScreen@
   EndSubSection
   SubSection "Display"
     Depth      24
     Modes      @resolutions@
     @extraDisplaySettings@
+    @virtualScreen@
   EndSubSection
   #SubSection "Display"
   #  Depth      32
diff --git a/upstart-jobs/xserver.nix b/upstart-jobs/xserver.nix
index caf842a8e45..7c82d63b8c6 100644
--- a/upstart-jobs/xserver.nix
+++ b/upstart-jobs/xserver.nix
@@ -125,6 +125,9 @@ let
     extraModules = cfg.extraModules; 
     serverLayoutOptions = cfg.serverLayoutOptions; 
     defaultDepth = cfg.defaultDepth; 
+    virtualScreen = if cfg.virtualScreen != null then 
+        "Virtual ${toString cfg.virtualScreen.x} ${toString cfg.virtualScreen.y}" 
+      else "";
 
     xfs = if cfg.useXFS == false then "" else 
       ''FontPath "${toString cfg.useXFS}"'';
-- 
GitLab


From 32b263e4296a64410d874866de73092bfd20f26e Mon Sep 17 00:00:00 2001
From: Marc Weber <marco-oweber@gmx.de>
Date: Sat, 25 Oct 2008 22:03:12 +0000
Subject: [PATCH 1081/5331] added system cron mailto option

svn path=/nixos/trunk/; revision=13114
---
 system/options.nix    | 8 +++++++-
 upstart-jobs/cron.nix | 2 +-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/system/options.nix b/system/options.nix
index d15c2164545..3e8828fdb73 100644
--- a/system/options.nix
+++ b/system/options.nix
@@ -654,6 +654,11 @@ in
 
     cron = {
 
+      mailto = mkOption {
+        default = "";
+        description = " The job output will be mailed to this email address. ";
+      };
+
       systemCronJobs = mkOption {
         default = [];
         example = [
@@ -663,7 +668,8 @@ in
         description = ''
           A list of Cron jobs to be appended to the system-wide
           crontab.  See the manual page for crontab for the expected
-          format.
+          format. If you want to get the results mailed you must setuid
+          sendmail. See <option>security.setuidOwners</option>
         '';
       };
 
diff --git a/upstart-jobs/cron.nix b/upstart-jobs/cron.nix
index e2212b4c575..209eb562fa9 100644
--- a/upstart-jobs/cron.nix
+++ b/upstart-jobs/cron.nix
@@ -20,7 +20,7 @@ let
   systemCronJobsFile = pkgs.writeText "system-crontab" ''
     SHELL=${pkgs.bash}/bin/sh
     PATH=${pkgs.coreutils}/bin:${pkgs.findutils}/bin:${pkgs.gnused}/bin:${pkgs.su}/bin
-    MAILTO=
+    MAILTO="${config.services.cron.mailto}"
     ${pkgs.lib.concatStrings (map (job: job + "\n") systemCronJobs)}
   '';
 
-- 
GitLab


From d146d9945b492e1d36c4b4a5da7df98a1d8244e4 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 29 Oct 2008 13:10:49 +0000
Subject: [PATCH 1082/5331] * Disable deleting /tmp at boot time.  This should
 be controlled   by an option (which should default to off, IMHO).  I was
 rather   surprised when I rebooted my system and it started deleting all   of
 /tmp (which, for instance, contained some test DB/repos for   the Subversion
 server)...

svn path=/nixos/trunk/; revision=13145
---
 boot/boot-stage-2-init.sh | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/boot/boot-stage-2-init.sh b/boot/boot-stage-2-init.sh
index 3ae40824285..01963d43cc1 100644
--- a/boot/boot-stage-2-init.sh
+++ b/boot/boot-stage-2-init.sh
@@ -82,9 +82,10 @@ mkdir -m 0755 -p /home
 
 # Miscellaneous boot time cleanup.
 rm -rf /var/run
-echo -n "cleaning \`/tmp'..."
-rm -rf --one-file-system /tmp/*
-echo " done"
+
+#echo -n "cleaning \`/tmp'..."
+#rm -rf --one-file-system /tmp/*
+#echo " done"
 
 if test -n "$safeMode"; then
     mkdir -m 0755 -p /var/run
-- 
GitLab


From 3a9700b2262867668637a4a56dd639d61b59ecc3 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 29 Oct 2008 13:24:00 +0000
Subject: [PATCH 1083/5331] * Include the kernel version in the description for
   each Grub menu entry.  (Ideally, we would show   what changed between each
 entry, e.g. "KDE upgraded to 4.1",   but that would be hard to do
 generically.)

svn path=/nixos/trunk/; revision=13146
---
 installer/grub-menu-builder.sh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/installer/grub-menu-builder.sh b/installer/grub-menu-builder.sh
index 41481ffeb1d..94175ac2ba2 100644
--- a/installer/grub-menu-builder.sh
+++ b/installer/grub-menu-builder.sh
@@ -142,7 +142,8 @@ for generation in $(
     echo $generation
     link=/nix/var/nix/profiles/system-$generation-link
     date=$(stat --printf="%y\n" $link | sed 's/\..*//')
-    addEntry "NixOS - Configuration $generation ($date)" $link "$generation ($date)"
+    kernelVersion=$(cd $(dirname $(readlink -f $link/kernel))/lib/modules && echo *)
+    addEntry "NixOS - Configuration $generation ($date - $kernelVersion)" $link "$generation ($date)"
 done
 
 
-- 
GitLab


From ea67a42d260cb9204f35dbf0382069934c405487 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 29 Oct 2008 13:38:43 +0000
Subject: [PATCH 1084/5331] * Continue booting when loading a kernel module
 fails.  For instance,   on my system when booting Linux 2.6.27, ide-generic
 fails with   "Cannot allocate memory" (maybe because ata_piix already claimed
 the   IDE devices?).

svn path=/nixos/trunk/; revision=13147
---
 boot/boot-stage-1-init.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/boot/boot-stage-1-init.sh b/boot/boot-stage-1-init.sh
index de86c4c74f3..0ddf6bb7eae 100644
--- a/boot/boot-stage-1-init.sh
+++ b/boot/boot-stage-1-init.sh
@@ -102,7 +102,7 @@ done
 # Load some kernel modules.
 for i in $(cat @modulesClosure@/insmod-list); do
     echo "loading module $(basename $i)..."
-    insmod $i
+    insmod $i || true
 done
 
 
-- 
GitLab


From 1ad599777646110d3789165839330a0c862aca20 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 29 Oct 2008 13:41:32 +0000
Subject: [PATCH 1085/5331] * Set $PERL5LIB.

svn path=/nixos/trunk/; revision=13148
---
 etc/bashrc.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/etc/bashrc.sh b/etc/bashrc.sh
index 0a4195a56d1..201ff4c6d01 100644
--- a/etc/bashrc.sh
+++ b/etc/bashrc.sh
@@ -46,6 +46,7 @@ for i in $NIX_PROFILES; do # !!! reverse
     then
 	export ACLOCAL_PATH="$i/share/aclocal:$ACLOCAL_PATH"
     fi
+    export PERL5LIB="$i/lib/site_perl:$PERL5LIB"
 done
 
 
-- 
GitLab


From 97f5a8eda7b27ccf5e38dbd5dabb5514b5f0c1fc Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 29 Oct 2008 15:42:44 +0000
Subject: [PATCH 1086/5331] * Mount /dev/pts in the chroot.

svn path=/nixos/trunk/; revision=13151
---
 etc/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/etc/default.nix b/etc/default.nix
index 6ca5dbf428a..a9ea0336ee0 100644
--- a/etc/default.nix
+++ b/etc/default.nix
@@ -128,7 +128,7 @@ import ../helpers/make-etc.nix {
         build-users-group = nixbld
         build-max-jobs = ${toString (config.nix.maxJobs)}
         build-use-chroot = ${if config.nix.useChroot then "true" else "false"}
-        build-chroot-dirs = /dev /proc /bin
+        build-chroot-dirs = /dev /dev/pts /proc /bin
         ${config.nix.extraOptions}
       '';
       target = "nix.conf"; # will be symlinked from /nix/etc/nix/nix.conf in activate-configuration.sh.
-- 
GitLab


From 4bd15378602162acacbf06c41e96e6311acc224f Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 29 Oct 2008 15:43:37 +0000
Subject: [PATCH 1087/5331] * Create /nix/var/nix/chroots in the activation
 script   and re-create it at boot time.

svn path=/nixos/trunk/; revision=13152
---
 boot/boot-stage-2-init.sh        | 6 ++++++
 system/activate-configuration.sh | 3 ++-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/boot/boot-stage-2-init.sh b/boot/boot-stage-2-init.sh
index 01963d43cc1..f5fd818d3c7 100644
--- a/boot/boot-stage-2-init.sh
+++ b/boot/boot-stage-2-init.sh
@@ -87,6 +87,12 @@ rm -rf /var/run
 #rm -rf --one-file-system /tmp/*
 #echo " done"
 
+# This is a good time to clean up /nix/var/nix/chroots.  Doing an `rm
+# -rf' on it isn't safe in general because it can contain bind mounts
+# to /nix/store and other places.  But after rebooting these are all
+# gone, of course.
+rm -rf /nix/var/nix/chroots # recreated in activate-configuration.sh
+
 if test -n "$safeMode"; then
     mkdir -m 0755 -p /var/run
     touch /var/run/safemode
diff --git a/system/activate-configuration.sh b/system/activate-configuration.sh
index c7b1b412841..6db13c6ab36 100644
--- a/system/activate-configuration.sh
+++ b/system/activate-configuration.sh
@@ -121,7 +121,8 @@ mkdir -m 0755 -p \
     /nix/var/nix/profiles \
     /nix/var/nix/db \
     /nix/var/log/nix/drvs \
-    /nix/var/nix/channel-cache
+    /nix/var/nix/channel-cache \
+    /nix/var/nix/chroots
 mkdir -m 1777 -p /nix/var/nix/gcroots/per-user
 mkdir -m 1777 -p /nix/var/nix/profiles/per-user
 
-- 
GitLab


From f549ee6009edfb8798730b3ee83f2c96f0307adc Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 29 Oct 2008 16:15:58 +0000
Subject: [PATCH 1088/5331] * Always add "iceauth" to the PATH (not just when
 sessionType ==   "kde") so that KDE applications work even when not running
 KDE.

svn path=/nixos/trunk/; revision=13154
---
 upstart-jobs/xserver.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/upstart-jobs/xserver.nix b/upstart-jobs/xserver.nix
index 7c82d63b8c6..157effcb530 100644
--- a/upstart-jobs/xserver.nix
+++ b/upstart-jobs/xserver.nix
@@ -354,6 +354,7 @@ rec {
     xorg.xrandr
     xorg.xrdb
     xorg.setxkbmap
+    xorg.iceauth # required for KDE applications (it's called by dcopserver)
     pkgs.feh
   ]
   ++ optional (windowManager == "twm") [
@@ -376,7 +377,6 @@ rec {
   ++ optional (sessionType == "kde") [
     pkgs.kdelibs
     pkgs.kdebase
-    xorg.iceauth # absolutely required by dcopserver
     xorg.xset # used by startkde, non-essential
   ]
   ++ optional (videoDriver == "nvidia") [
-- 
GitLab


From c76632804c8142be7e27e563202bcae93e2064f2 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Tue, 4 Nov 2008 21:24:58 +0000
Subject: [PATCH 1089/5331] meta.function -> passthru.function

svn path=/nixos/trunk/; revision=13191
---
 system/fontdir.nix      | 2 +-
 upstart-jobs/pcmcia.nix | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/system/fontdir.nix b/system/fontdir.nix
index 032785291ad..85227930988 100644
--- a/system/fontdir.nix
+++ b/system/fontdir.nix
@@ -1,5 +1,5 @@
 args : with args; with builderDefs;
-  let localDefs = builderDefs.meta.function rec {
+  let localDefs = builderDefs.passthru.function rec {
     src = "";/* put a fetchurl here */
 
     buildInputs = [mkfontdir mkfontscale ttmkfdir];
diff --git a/upstart-jobs/pcmcia.nix b/upstart-jobs/pcmcia.nix
index b084f47beb4..77db881856e 100644
--- a/upstart-jobs/pcmcia.nix
+++ b/upstart-jobs/pcmcia.nix
@@ -44,7 +44,7 @@ let
     else if builtins.isAttrs arg then {}
     else null;
 
-  pcmciaUtils = pkgs.pcmciaUtils.meta.function {
+  pcmciaUtils = pkgs.pcmciaUtils.passthru.function {
     inherit (config.hardware.pcmcia) firmware config;
   };
 in
-- 
GitLab


From d1cf5f164e4e724b42f0957fd87046336918b3ba Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 7 Nov 2008 11:51:17 +0000
Subject: [PATCH 1090/5331] * CUPS needs a PAM configuration file to allow
 users to authenticate   via the web interface (e.g. when adding printers).

svn path=/nixos/trunk/; revision=13214
---
 etc/default.nix | 1 +
 etc/pam.d/cups  | 4 ++++
 2 files changed, 5 insertions(+)
 create mode 100644 etc/pam.d/cups

diff --git a/etc/default.nix b/etc/default.nix
index a9ea0336ee0..6b8bc81503d 100644
--- a/etc/default.nix
+++ b/etc/default.nix
@@ -231,6 +231,7 @@ import ../helpers/make-etc.nix {
       "chsh"
       "xlock"
       "kde"
+      "cups"
       "common"
       "common-console" # shared stuff for interactive local sessions
     ]
diff --git a/etc/pam.d/cups b/etc/pam.d/cups
new file mode 100644
index 00000000000..50f3cc5ce60
--- /dev/null
+++ b/etc/pam.d/cups
@@ -0,0 +1,4 @@
+auth     include        common
+account  include        common
+password include        common
+session  include        common
-- 
GitLab


From 1573bdddfb043a71c1f563c629de39ae009698fb Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 7 Nov 2008 13:37:28 +0000
Subject: [PATCH 1091/5331] * CUPS: enabled support for printing via SMB.

svn path=/nixos/trunk/; revision=13218
---
 upstart-jobs/cupsd.nix   | 53 ++++++++++++++++++++++++++++------------
 upstart-jobs/default.nix |  2 +-
 2 files changed, 38 insertions(+), 17 deletions(-)

diff --git a/upstart-jobs/cupsd.nix b/upstart-jobs/cupsd.nix
index 1b561bec5e2..1afd9aae4c2 100644
--- a/upstart-jobs/cupsd.nix
+++ b/upstart-jobs/cupsd.nix
@@ -1,11 +1,30 @@
-{ writeText, cups
-}:
+{config, pkgs}:
 
 let
 
   logDir = "/var/log/cups";
 
-  cupsdConfig = writeText "cupsd.conf" "
+
+  inherit (pkgs) cups;
+
+
+  # Here we can enable additional backends, filters, etc. that are not
+  # part of CUPS itself, e.g. the SMB backend is part of Samba.  Since
+  # we can't update ${cups}/lib/cups itself, we create a symlink tree
+  # here and add the additional programs.  The ServerBin directive in
+  # cupsd.conf tells cupsd to use this tree.
+  bindir = pkgs.runCommand "cups-progs" {} ''
+    ensureDir $out/lib/cups
+    ln -s ${cups}/lib/cups/* $out/lib/cups/
+    
+    rm $out/lib/cups/backend
+    ensureDir $out/lib/cups/backend
+    ln -s ${cups}/lib/cups/backend/* $out/lib/cups/backend/
+    ln -s ${pkgs.samba}/bin/smbspool $out/lib/cups/backend/smb
+  ''; # */
+  
+
+  cupsdConfig = pkgs.writeText "cupsd.conf" ''
     LogLevel info
 
     SystemGroup root
@@ -15,6 +34,8 @@ let
 
     ServerRoot ${cups}/etc/cups
 
+    ServerBin ${bindir}/lib/cups
+
     AccessLog ${logDir}/access_log
     ErrorLog ${logDir}/access_log
     PageLog ${logDir}/page_log
@@ -65,7 +86,7 @@ let
         Order deny,allow
       </Limit>
     </Policy>
-  ";
+  '';
 
 in
 
@@ -76,19 +97,19 @@ in
     cups
   ];
   
-  job = "
-description \"CUPS daemon\"
+  job = ''
+    description "CUPS printing daemon"
 
-start on network-interfaces/started
-stop on network-interfaces/stop
+    start on network-interfaces/started
+    stop on network-interfaces/stop
 
-start script
-    mkdir -m 0755 -p ${logDir}
-    mkdir -m 0700 -p /var/cache/cups
-    mkdir -m 0700 -p /var/spool/cups
-end script
-    
-respawn ${cups}/sbin/cupsd -c ${cupsdConfig} -F
-  ";
+    start script
+        mkdir -m 0755 -p ${logDir}
+        mkdir -m 0700 -p /var/cache/cups
+        mkdir -m 0700 -p /var/spool/cups
+    end script
+
+    respawn ${cups}/sbin/cupsd -c ${cupsdConfig} -F
+  '';
   
 }
diff --git a/upstart-jobs/default.nix b/upstart-jobs/default.nix
index 8700b323fb9..b67cfa77ea7 100644
--- a/upstart-jobs/default.nix
+++ b/upstart-jobs/default.nix
@@ -314,7 +314,7 @@ let
   # CUPS (printing) daemon.
   ++ optional config.services.printing.enable
     (import ../upstart-jobs/cupsd.nix {
-      inherit (pkgs) writeText cups;
+      inherit config pkgs;
     })
 
   # Gateway6
-- 
GitLab


From 37b57e84cf8d88e15c8e3be0bae4b7e1abe0bc57 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 7 Nov 2008 13:38:05 +0000
Subject: [PATCH 1092/5331] * Disable the warning about missing wrapped setuid
 programs for now.

svn path=/nixos/trunk/; revision=13219
---
 system/activate-configuration.sh | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/system/activate-configuration.sh b/system/activate-configuration.sh
index 6db13c6ab36..fb4c6a91da6 100644
--- a/system/activate-configuration.sh
+++ b/system/activate-configuration.sh
@@ -146,8 +146,9 @@ for i in @setuidPrograms@; do
     if test -z "$program"; then
 	# XXX: It would be preferable to detect this problem before
 	# `activate-configuration' is invoked.
-	echo "WARNING: No executable named \`$i' was found" >&2
-	echo "WARNING: but \`$i' was specified as a setuid program." >&2
+	#echo "WARNING: No executable named \`$i' was found" >&2
+	#echo "WARNING: but \`$i' was specified as a setuid program." >&2
+        true
     else
         cp "$(type -tp setuid-wrapper)" $wrapperDir/$i
         echo -n "$program" > $wrapperDir/$i.real
-- 
GitLab


From 1ef6d0c61b0eaa0f149cfef6935d8833bdf0bbaf Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 7 Nov 2008 13:38:46 +0000
Subject: [PATCH 1093/5331] * growisofs needs to be setuid for high priority
 scheduling.

svn path=/nixos/trunk/; revision=13220
---
 system/options.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/system/options.nix b/system/options.nix
index 3e8828fdb73..d0831473ce7 100644
--- a/system/options.nix
+++ b/system/options.nix
@@ -2738,7 +2738,7 @@ in
     setuidPrograms = mkOption {
       default = [
         "passwd" "su" "crontab" "ping" "ping6"
-        "fusermount" "wodim" "cdrdao"
+        "fusermount" "wodim" "cdrdao" "growisofs"
       ];
       description = "
         Only the programs from system path listed her will be made setuid root
-- 
GitLab


From 4a936d51ae70ed89d66b83ac6dbc2a20934c7c00 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 7 Nov 2008 13:39:02 +0000
Subject: [PATCH 1094/5331] * Hack for testing.

svn path=/nixos/trunk/; revision=13221
---
 test/test-upstart-job.sh | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/test/test-upstart-job.sh b/test/test-upstart-job.sh
index 39d60d76178..83af32e7956 100755
--- a/test/test-upstart-job.sh
+++ b/test/test-upstart-job.sh
@@ -19,6 +19,8 @@ ln -sfn /tmp/event.d /etc/event.d
 echo "restarting init..."
 kill -TERM 1 
 
+sleep 1
+
 for i in $*; do
     echo "restarting job $i..."
     initctl stop "$i"
-- 
GitLab


From 4a55f02005e182bb0f4995902c506f029be78e4d Mon Sep 17 00:00:00 2001
From: Nicolas Pierron <nicolas.b.pierron@gmail.com>
Date: Sat, 8 Nov 2008 21:32:48 +0000
Subject: [PATCH 1095/5331] "dhclient.nix" is now a self-contained job.

svn path=/nixos/trunk/; revision=13228
---
 system/options.nix        | 29 +++--------------
 upstart-jobs/default.nix  |  7 ----
 upstart-jobs/dhclient.nix | 68 ++++++++++++++++++++++++++++++++++-----
 3 files changed, 64 insertions(+), 40 deletions(-)

diff --git a/system/options.nix b/system/options.nix
index d0831473ce7..4628fae2c54 100644
--- a/system/options.nix
+++ b/system/options.nix
@@ -31,7 +31,10 @@ let
 in
 
 {
-
+  require = [
+    # newtworking
+    (import ../upstart-jobs/dhclient.nix)
+  ]
 
   time = {
 
@@ -376,30 +379,6 @@ in
       '';
     };
 
-    useDHCP = mkOption {
-      default = true;
-      description = "
-        Whether to use DHCP to obtain an IP adress and other
-        configuration for all network interfaces that are not manually
-        configured.
-      ";
-    };
-
-    interfaces = mkOption {
-      default = [];
-      example = [
-        { name = "eth0";
-          ipAddress = "131.211.84.78";
-          subnetMask = "255.255.255.128";
-        }
-      ];
-      description = "
-        The configuration for each network interface.  If
-        <option>networking.useDHCP</option> is true, then each interface
-        not listed here will be configured using DHCP.
-      ";
-    };
-
     defaultGateway = mkOption {
       default = "";
       example = "131.211.84.1";
diff --git a/upstart-jobs/default.nix b/upstart-jobs/default.nix
index b67cfa77ea7..e7cf35133c6 100644
--- a/upstart-jobs/default.nix
+++ b/upstart-jobs/default.nix
@@ -177,13 +177,6 @@ let
       config = config.services.atd;
      })
 
-  # DHCP client.
-  ++ optional config.networking.useDHCP
-    (import ../upstart-jobs/dhclient.nix {
-      inherit (pkgs) nettools dhcp lib;
-      interfaces = config.networking.interfaces;
-    })
-
   # ifplugd daemon for monitoring Ethernet cables.
   ++ optional config.networking.interfaceMonitor.enable
     (import ../upstart-jobs/ifplugd.nix {
diff --git a/upstart-jobs/dhclient.nix b/upstart-jobs/dhclient.nix
index 3f198d44d2d..f72f2b7fe43 100644
--- a/upstart-jobs/dhclient.nix
+++ b/upstart-jobs/dhclient.nix
@@ -1,21 +1,71 @@
-{dhcp, nettools, interfaces, lib}:
+{pkgs, config, ...}:
 
-let 
+###### interface
+let
+  inherit (pkgs.lib) mkOption
+    mergeEnableOption mergeListOption;
+
+  options = {
+    networking = {
+      useDHCP = mkOption {
+        default = true;
+        merge = mergeEnableOption;
+        description = "
+          Whether to use DHCP to obtain an IP adress and other
+          configuration for all network interfaces that are not manually
+          configured.
+        ";
+      };
+  
+      interfaces = mkOption {
+        default = [];
+        merge = mergeListOption;
+        example = [
+          { name = "eth0";
+            ipAddress = "131.211.84.78";
+            subnetMask = "255.255.255.128";
+          }
+        ];
+        description = "
+          The configuration for each network interface.  If
+          <option>networking.useDHCP</option> is true, then each interface
+          not listed here will be configured using DHCP.
+        ";
+      };
+    };
+  };
+in
+
+###### implementation
+let
+  ifEnable = arg:
+    if config.networking.useDHCP then arg
+    else if builtins.isList arg then []
+    else if builtins.isAttrs arg then {}
+    else null;
+
+  inherit (pkgs) nettools dhcp lib;
 
   # Don't start dhclient on explicitly configured interfaces.
   ignoredInterfaces = ["lo"] ++
     map (i: i.name) (lib.filter (i: i ? ipAddress) interfaces);
 
   stateDir = "/var/lib/dhcp"; # Don't use /var/state/dhcp; not FHS-compliant.
-
 in
 
 {
-  name = "dhclient";
+  require = [
+    # (import ../upstart-jobs/default.nix)
+    options
+  ];
+
+  services = {
+    extraJobs = IfEnable [{
+      name = "dhclient";
 
-  extraPath = [dhcp];
+      extraPath = [dhcp];
   
-  job = "
+      job = "
 description \"DHCP client\"
 
 start on network-interfaces/started
@@ -45,6 +95,8 @@ script
 
     exec ${dhcp}/sbin/dhclient -d $interfaces -e \"PATH=$PATH\" -lf ${stateDir}/dhclient.leases
 end script
-  ";
-  
+      ";
+    }];
+  };
 }
+
-- 
GitLab


From b73a579d18b9b71b78169965dc0d034f440e247c Mon Sep 17 00:00:00 2001
From: Nicolas Pierron <nicolas.b.pierron@gmail.com>
Date: Sat, 8 Nov 2008 21:45:58 +0000
Subject: [PATCH 1096/5331] Fix previous commit.

svn path=/nixos/trunk/; revision=13229
---
 system/options.nix        | 7 +++----
 upstart-jobs/dhclient.nix | 7 ++++---
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/system/options.nix b/system/options.nix
index 4628fae2c54..9144492a539 100644
--- a/system/options.nix
+++ b/system/options.nix
@@ -31,10 +31,6 @@ let
 in
 
 {
-  require = [
-    # newtworking
-    (import ../upstart-jobs/dhclient.nix)
-  ]
 
   time = {
 
@@ -3056,6 +3052,9 @@ root        ALL=(ALL) SETENV: ALL
   };
 
   require = [
+    # newtworking
+    (import ../upstart-jobs/dhclient.nix)
+    # hardware
     (import ../upstart-jobs/pcmcia.nix)
   ];
 }
diff --git a/upstart-jobs/dhclient.nix b/upstart-jobs/dhclient.nix
index f72f2b7fe43..061af3d8f84 100644
--- a/upstart-jobs/dhclient.nix
+++ b/upstart-jobs/dhclient.nix
@@ -1,4 +1,5 @@
-{pkgs, config, ...}:
+{pkgs, config #, ...
+}:
 
 ###### interface
 let
@@ -48,7 +49,7 @@ let
 
   # Don't start dhclient on explicitly configured interfaces.
   ignoredInterfaces = ["lo"] ++
-    map (i: i.name) (lib.filter (i: i ? ipAddress) interfaces);
+    map (i: i.name) (lib.filter (i: i ? ipAddress) config.networking.interfaces);
 
   stateDir = "/var/lib/dhcp"; # Don't use /var/state/dhcp; not FHS-compliant.
 in
@@ -60,7 +61,7 @@ in
   ];
 
   services = {
-    extraJobs = IfEnable [{
+    extraJobs = ifEnable [{
       name = "dhclient";
 
       extraPath = [dhcp];
-- 
GitLab


From ed1df64e2a9b3dd77571b56d63217094ebd7580c Mon Sep 17 00:00:00 2001
From: Nicolas Pierron <nicolas.b.pierron@gmail.com>
Date: Sun, 9 Nov 2008 16:44:22 +0000
Subject: [PATCH 1097/5331] fix typo in the upstart jobs example.

svn path=/nixos/trunk/; revision=13232
---
 system/options.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/system/options.nix b/system/options.nix
index 9144492a539..4249065239c 100644
--- a/system/options.nix
+++ b/system/options.nix
@@ -605,7 +605,7 @@ in
                start on started network-interfaces
                respawn
                env PATH=/var/run/current-system/sw/bin
-               exec sh -c "echo "hello world" | ${pkgs.netcat}/bin/nc -l -p 9000
+               exec sh -c "echo 'hello world' | ${pkgs.netcat}/bin/nc -l -p 9000"
                '';
            } ];
       description = "
-- 
GitLab


From 92f790036ccd47d2ee088df73e1778cf31510bca Mon Sep 17 00:00:00 2001
From: Nicolas Pierron <nicolas.b.pierron@gmail.com>
Date: Sun, 9 Nov 2008 16:44:31 +0000
Subject: [PATCH 1098/5331] Replace obsolete name.

svn path=/nixos/trunk/; revision=13233
---
 system/system.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/system/system.nix b/system/system.nix
index 3c3cc21de57..95b85a83da2 100644
--- a/system/system.nix
+++ b/system/system.nix
@@ -16,12 +16,12 @@ rec {
   # Make a configuration object from which we can retrieve option
   # values.
   config =
-    pkgs.lib.finalReferenceOptionSets
+    pkgs.lib.fixOptionSets
       (pkgs.lib.mergeOptionSets noOption)
       pkgs configComponents;
 
   optionDeclarations =
-    pkgs.lib.finalOptionSetsFun
+    pkgs.lib.fixOptionSetsFun
       pkgs.lib.filterOptionSets
       pkgs configComponents
       config;
-- 
GitLab


From 2e6c2f9aaf8f7caeef859630c55df5b6bcbb3969 Mon Sep 17 00:00:00 2001
From: Nicolas Pierron <nicolas.b.pierron@gmail.com>
Date: Sun, 9 Nov 2008 16:44:37 +0000
Subject: [PATCH 1099/5331] Add config.etc option to add extra /etc/* files.

svn path=/nixos/trunk/; revision=13234
---
 system/options.nix | 15 ++++++++++++++-
 system/system.nix  |  4 +++-
 2 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/system/options.nix b/system/options.nix
index 4249065239c..d60a99d470a 100644
--- a/system/options.nix
+++ b/system/options.nix
@@ -592,7 +592,6 @@ in
     # then the checking in upstart-jobs/default.nix can be removed again (together with passing arg optionDeclarations)
   };
 
-
   services = {
 
 
@@ -3008,6 +3007,20 @@ root        ALL=(ALL) SETENV: ALL
       ";
     };
 
+    # should be moved to etc/default.nix
+    etc = mkOption {
+      default = [];
+      example = [
+        { source = "/nix/store/.../etc/dir/file.conf.example";
+          target = "dir/file.conf";
+          mode = "0440";
+        }
+      ];
+      description = "
+        List of files that have to be linked in /etc.
+      ";
+    };
+
     nix = mkOption {
       default = pkgs.nixUnstable;
       example = pkgs.nixCustomFun /root/nix.tar.gz;
diff --git a/system/system.nix b/system/system.nix
index 95b85a83da2..d0d1946038a 100644
--- a/system/system.nix
+++ b/system/system.nix
@@ -116,7 +116,9 @@ rec {
   etc = import ../etc/default.nix {
     inherit config pkgs upstartJobs systemPath wrapperDir
       defaultShell nixEnvVars modulesTree nssModulesPath;
-    extraEtc = pkgs.lib.concatLists (map (job: job.extraEtc) upstartJobs.jobs);
+    extraEtc =
+       (pkgs.lib.concatLists (map (job: job.extraEtc) upstartJobs.jobs))
+    ++ config.environment.etc;
   };
 
   
-- 
GitLab


From 866987a60ed197add209b618daaf8cccb52ed4a7 Mon Sep 17 00:00:00 2001
From: Nicolas Pierron <nicolas.b.pierron@gmail.com>
Date: Sun, 9 Nov 2008 16:44:43 +0000
Subject: [PATCH 1100/5331] cron.nix: Use the new option scheme.

svn path=/nixos/trunk/; revision=13235
---
 system/options.nix       | 27 ++-----------
 system/system.nix        |  1 -
 upstart-jobs/cron.nix    | 86 ++++++++++++++++++++++++++++++++--------
 upstart-jobs/default.nix |  5 ---
 4 files changed, 73 insertions(+), 46 deletions(-)

diff --git a/system/options.nix b/system/options.nix
index d60a99d470a..47f6a162140 100644
--- a/system/options.nix
+++ b/system/options.nix
@@ -626,29 +626,6 @@ in
     };
 
 
-    cron = {
-
-      mailto = mkOption {
-        default = "";
-        description = " The job output will be mailed to this email address. ";
-      };
-
-      systemCronJobs = mkOption {
-        default = [];
-        example = [
-          "* * * * *  test   ls -l / > /tmp/cronout 2>&1"
-          "* * * * *  eelco  echo Hello World > /home/eelco/cronout"
-        ];
-        description = ''
-          A list of Cron jobs to be appended to the system-wide
-          crontab.  See the manual page for crontab for the expected
-          format. If you want to get the results mailed you must setuid
-          sendmail. See <option>security.setuidOwners</option>
-        '';
-      };
-
-    };
-
     atd = {
 
       enable = mkOption {
@@ -3067,7 +3044,11 @@ root        ALL=(ALL) SETENV: ALL
   require = [
     # newtworking
     (import ../upstart-jobs/dhclient.nix)
+
     # hardware
     (import ../upstart-jobs/pcmcia.nix)
+
+    # services
+    (import ../upstart-jobs/cron.nix)
   ];
 }
diff --git a/system/system.nix b/system/system.nix
index d0d1946038a..eaa26cdea56 100644
--- a/system/system.nix
+++ b/system/system.nix
@@ -176,7 +176,6 @@ rec {
     pkgs.bzip2
     pkgs.coreutils
     pkgs.cpio
-    pkgs.cron
     pkgs.curl
     pkgs.e2fsprogs
     pkgs.findutils
diff --git a/upstart-jobs/cron.nix b/upstart-jobs/cron.nix
index 209eb562fa9..943c35f51d9 100644
--- a/upstart-jobs/cron.nix
+++ b/upstart-jobs/cron.nix
@@ -1,7 +1,39 @@
 {pkgs, config}:
 
+###### interface
 let
+  inherit (pkgs.lib) mkOption;
 
+  options = {
+    services = {
+      cron = {
+
+        mailto = mkOption {
+          default = "";
+          description = " The job output will be mailed to this email address. ";
+        };
+
+        systemCronJobs = mkOption {
+          default = [];
+          example = [
+            "* * * * *  test   ls -l / > /tmp/cronout 2>&1"
+            "* * * * *  eelco  echo Hello World > /home/eelco/cronout"
+          ];
+          description = ''
+            A list of Cron jobs to be appended to the system-wide
+            crontab.  See the manual page for crontab for the expected
+            format. If you want to get the results mailed you must setuid
+            sendmail. See <option>security.setuidOwners</option>
+          '';
+        };
+
+      };
+    };
+  };
+in
+
+###### implementation
+let
   # !!! This should be defined somewhere else.
   locatedb = "/var/cache/locatedb";
   
@@ -25,27 +57,47 @@ let
   '';
 
 in
-  
+
 {
-  name = "cron";
-  
-  extraEtc = [
-    # The system-wide crontab.
-    { source = systemCronJobsFile;
-      target = "crontab";
-      mode = "0600"; # Cron requires this.
-    }
+  require = [
+    # (import ../upstart-jobs/default.nix) # config.services.extraJobs
+    # (import ?) # config.time.timeZone
+    # (import ?) # config.environment.etc
+    # (import ?) # config.environment.extraPackages
+    # (import ?) # config.environment.cleanStart
+    options
   ];
 
-  job = ''
-    description "Cron daemon"
+  environment = {
+    etc = [
+      # The system-wide crontab.
+      { source = systemCronJobsFile;
+        target = "crontab";
+        mode = "0600"; # Cron requires this.
+      }
+    ];
 
-    start on startup
-    stop on shutdown
+    extraPackages =
+      pkgs.lib.optional
+        (!config.environment.cleanStart)
+        pkgs.cron;
+  };
 
-    # Needed to interpret times in the local timezone.
-    env TZ=${config.time.timeZone}
+  services = {
+    extraJobs = [{
+      name = "cron";
 
-    respawn ${pkgs.cron}/sbin/cron -n
-  '';
+      job = ''
+        description "Cron daemon"
+
+        start on startup
+        stop on shutdown
+
+        # Needed to interpret times in the local timezone.
+        env TZ=${config.time.timeZone}
+
+        respawn ${pkgs.cron}/sbin/cron -n
+      '';
+    }];
+  };
 }
diff --git a/upstart-jobs/default.nix b/upstart-jobs/default.nix
index e7cf35133c6..6bc7cff9ceb 100644
--- a/upstart-jobs/default.nix
+++ b/upstart-jobs/default.nix
@@ -140,11 +140,6 @@ let
       inherit config pkgs nix nixEnvVars;
     })
 
-    # Cron daemon.
-    (import ../upstart-jobs/cron.nix {
-      inherit config pkgs;
-    })
-
     # Name service cache daemon.
     (import ../upstart-jobs/nscd.nix {
       inherit (pkgs) glibc;
-- 
GitLab


From 2ed34fae67e7c61ea3c9d1b64d8cbcbc3ad0ab04 Mon Sep 17 00:00:00 2001
From: Nicolas Pierron <nicolas.b.pierron@gmail.com>
Date: Sun, 9 Nov 2008 16:44:53 +0000
Subject: [PATCH 1101/5331] Extract "locate" job from the "cron" job.

svn path=/nixos/trunk/; revision=13236
---
 system/options.nix           | 23 +-------------
 upstart-jobs/cron.nix        | 13 +-------
 upstart-jobs/cron/locate.nix | 60 ++++++++++++++++++++++++++++++++++++
 3 files changed, 62 insertions(+), 34 deletions(-)
 create mode 100644 upstart-jobs/cron/locate.nix

diff --git a/system/options.nix b/system/options.nix
index 47f6a162140..2d670e97200 100644
--- a/system/options.nix
+++ b/system/options.nix
@@ -644,28 +644,6 @@ in
       };
     };
 
-    locate = {
-
-      enable = mkOption {
-        default = false;
-        example = true;
-        description = ''
-          If enabled, NixOS will periodically update the database of
-          files used by the <command>locate</command> command.
-        '';
-      };
-
-      period = mkOption {
-        default = "15 02 * * *";
-        description = ''
-          This option defines (in the format used by cron) when the
-          locate database is updated.
-          The default is to update at 02:15 (at night) every day.
-        '';
-      };
-
-    };
-
 
     ttyBackgrounds = {
 
@@ -3050,5 +3028,6 @@ root        ALL=(ALL) SETENV: ALL
 
     # services
     (import ../upstart-jobs/cron.nix)
+    (import ../upstart-jobs/cron/locate.nix)
   ];
 }
diff --git a/upstart-jobs/cron.nix b/upstart-jobs/cron.nix
index 943c35f51d9..4220de6d647 100644
--- a/upstart-jobs/cron.nix
+++ b/upstart-jobs/cron.nix
@@ -34,20 +34,9 @@ in
 
 ###### implementation
 let
-  # !!! This should be defined somewhere else.
-  locatedb = "/var/cache/locatedb";
-  
-  updatedbCmd =
-    "${config.services.locate.period}  root  " +
-    "mkdir -m 0755 -p $(dirname ${locatedb}) && " +
-    "nice -n 19 ${pkgs.utillinux}/bin/ionice -c 3 " +
-    "updatedb --localuser=nobody --output=${locatedb} > /var/log/updatedb 2>&1";
-  
-
   # Put all the system cronjobs together.
   systemCronJobs =
-    config.services.cron.systemCronJobs ++
-    pkgs.lib.optional config.services.locate.enable updatedbCmd;
+    config.services.cron.systemCronJobs;
 
   systemCronJobsFile = pkgs.writeText "system-crontab" ''
     SHELL=${pkgs.bash}/bin/sh
diff --git a/upstart-jobs/cron/locate.nix b/upstart-jobs/cron/locate.nix
new file mode 100644
index 00000000000..2b26a10e91e
--- /dev/null
+++ b/upstart-jobs/cron/locate.nix
@@ -0,0 +1,60 @@
+{pkgs, config}:
+
+###### interface
+let
+  inherit (pkgs.lib) mkOption;
+
+  options = {
+    services = {
+      locate = {
+
+        enable = mkOption {
+          default = false;
+          example = true;
+          description = ''
+            If enabled, NixOS will periodically update the database of
+            files used by the <command>locate</command> command.
+          '';
+        };
+
+        period = mkOption {
+          default = "15 02 * * *";
+          description = ''
+            This option defines (in the format used by cron) when the
+            locate database is updated.
+            The default is to update at 02:15 (at night) every day.
+          '';
+        };
+
+      };
+
+    };
+  };
+in
+
+###### implementation
+let
+  locatedb = "/var/cache/locatedb";
+  
+  updatedbCmd =
+    "${config.services.locate.period}  root  " +
+    "mkdir -m 0755 -p $(dirname ${locatedb}) && " +
+    "nice -n 19 ${pkgs.utillinux}/bin/ionice -c 3 " +
+    "updatedb --localuser=nobody --output=${locatedb} > /var/log/updatedb 2>&1";
+in
+
+{
+  require = [
+    (import ../../upstart-jobs/cron.nix) # config.services.cron
+    options
+  ];
+
+  services = {
+    cron = {
+      systemCronJobs =
+        pkgs.lib.optional
+          config.services.locate.enable
+          updatedbCmd;
+    };
+  };
+}
-- 
GitLab


From d7c321c64a3ca420a23ba92f7de5eb34864a84f0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Tue, 11 Nov 2008 17:08:04 +0000
Subject: [PATCH 1102/5331] bashrc: Initialize `GST_PLUGIN_PATH' (GStreamer's
 plug-in search path).

svn path=/nixos/trunk/; revision=13254
---
 etc/bashrc.sh | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/etc/bashrc.sh b/etc/bashrc.sh
index 201ff4c6d01..4ec3b4ab415 100644
--- a/etc/bashrc.sh
+++ b/etc/bashrc.sh
@@ -47,6 +47,9 @@ for i in $NIX_PROFILES; do # !!! reverse
 	export ACLOCAL_PATH="$i/share/aclocal:$ACLOCAL_PATH"
     fi
     export PERL5LIB="$i/lib/site_perl:$PERL5LIB"
+
+    # GStreamer.
+    export GST_PLUGIN_PATH="$i/lib/gstreamer-0.10:$GST_PLUGIN_PATH"
 done
 
 
-- 
GitLab


From 892d12bccf381da48333c17f0f9d188da3f28060 Mon Sep 17 00:00:00 2001
From: Nicolas Pierron <nicolas.b.pierron@gmail.com>
Date: Tue, 18 Nov 2008 18:00:09 +0000
Subject: [PATCH 1103/5331] - Move some system configuration to options:   *
 system.nssModules   * system.modulesTree   * system.sbin.modprobe   *
 system.sbin.mount   * nix.envVars

- Remove Arguments that can be accessed either by "config" or "pkgs".

- Use the new scheme for upstart-jobs/default.nix.
This is now a configuration file which is imported by system/options.nix.

- Jobs can now include upstart-job/default.nix:
  * upstrat-jobs/cron.nix
  * upstart-jobs/dhclient.nix

=> No Nixos file refers to upstart-jobs/default.nix except if one of its options is require to define an extra job. (e.g.: cron, dhclient)

svn path=/nixos/branches/fix-style/; revision=13327
---
 default.nix                |  10 +--
 doc/manual/development.xml |   2 +-
 etc/default.nix            |   7 +-
 system/options.nix         | 137 ++++++++++++++++++++++++++++++++-----
 system/system.nix          |  77 +++------------------
 system/users-groups.nix    |  10 +--
 test/test-upstart-job.sh   |   2 +-
 upstart-jobs/cron.nix      |   2 +-
 upstart-jobs/default.nix   | 101 ++++++++++++++++++++++++---
 upstart-jobs/dhclient.nix  |   2 +-
 10 files changed, 228 insertions(+), 122 deletions(-)

diff --git a/default.nix b/default.nix
index 3923cb9592b..1a621c3457e 100644
--- a/default.nix
+++ b/default.nix
@@ -42,13 +42,5 @@ in
 
   manifests = system.config.installer.manifests; # exported here because nixos-rebuild uses it
 
-  upstartJobsCombined = system.upstartJobs;
-
-  # Make it easier to build individual Upstart jobs (e.g., "nix-build
-  # /etc/nixos/nixos -A upstartJobs.xserver").  
-  upstartJobs = { recurseForDerivations = true; } //
-    builtins.listToAttrs (map (job:
-      { name = if job ? jobName then job.jobName else job.name; value = job; }
-    ) system.upstartJobs.jobs);
-
+  tests = system.config.tests;
 }
diff --git a/doc/manual/development.xml b/doc/manual/development.xml
index 3c48acfa57b..f4d68526c5e 100644
--- a/doc/manual/development.xml
+++ b/doc/manual/development.xml
@@ -51,7 +51,7 @@ where <replaceable>attr</replaceable> is an attribute in
     <listitem><para>An attribute set containing the Upstart jobs.  For
     instance, the <varname>sshd</varname> Upstart job can be built by
     doing <literal>nix-build /etc/nixos/nixos -A
-    upstartJobs.sshd</literal>.</para></listitem>
+    tests.upstartJobs.sshd</literal>.</para></listitem>
   </varlistentry>
 
 </variablelist>
diff --git a/etc/default.nix b/etc/default.nix
index 6b8bc81503d..dd219dc74ef 100644
--- a/etc/default.nix
+++ b/etc/default.nix
@@ -1,4 +1,4 @@
-{ config, pkgs, upstartJobs, systemPath, wrapperDir
+{ config, pkgs, systemPath, wrapperDir
 , defaultShell, extraEtc, nixEnvVars, modulesTree, nssModulesPath
 }:
 
@@ -73,11 +73,6 @@ import ../helpers/make-etc.nix {
       target = "login.defs";
     }
 
-    { # The Upstart events defined above.
-      source = upstartJobs + "/etc/event.d";
-      target = "event.d";
-    }
-
     { # Configuration for passwd and friends (e.g., hash algorithm
       # for /etc/passwd).
       source = ./default/passwd;
diff --git a/system/options.nix b/system/options.nix
index 2d670e97200..014ae9da8bd 100644
--- a/system/options.nix
+++ b/system/options.nix
@@ -332,6 +332,92 @@ in
 
   };
 
+  system = {
+    # NSS modules.  Hacky!
+    nssModules = mkOption {
+      internal = true;
+      default = [];
+      description = "
+        Search path for NSS (Name Service Switch) modules.  This allows
+        several DNS resolution methods to be specified via
+        <filename>/etc/nsswitch.conf</filename>.
+      ";
+      merge = pkgs.lib.mergeListOption;
+      apply = list:
+        let
+          list2 =
+             list
+          ++ pkgs.lib.optional config.users.ldap.enable pkgs.nss_ldap
+          ++ pkgs.lib.optional config.services.avahi.nssmdns pkgs.nssmdns;
+        in {
+          list = list2;
+          path = pkgs.lib.makeLibraryPath list2;
+        };
+    };
+
+    modulesTree = mkOption {
+      internal = true;
+      default = [];
+      description = "
+        Tree of kernel modules.  This includes the kernel, plus modules
+        built outside of the kernel.  Combine these into a single tree of
+        symlinks because modprobe only supports one directory.
+      ";
+      merge = pkgs.lib.mergeListOption;
+
+      # Convert the list of path to only one path.
+      apply = list: pkgs.aggregateModules (
+        let
+          kernelPackages = config.boot.kernelPackages;
+          kernel = kernelPackages.kernel;
+        in
+        [ kernel ]
+        ++ pkgs.lib.optional ((config.networking.enableIntel3945ABGFirmware || config.networking.enableIntel4965AGNFirmware) && !kernel.features ? iwlwifi) kernelPackages.iwlwifi
+        # !!! this should be declared by the xserver Upstart job.
+        ++ pkgs.lib.optional (config.services.xserver.enable && config.services.xserver.videoDriver == "nvidia") kernelPackages.nvidiaDrivers
+        ++ pkgs.lib.optional config.hardware.enableGo7007 kernelPackages.wis_go7007
+        ++ config.boot.extraModulePackages
+        # should only keep this one, other have to be set by the option owners.
+        ++ list
+      );
+    };
+
+    sbin = {
+      modprobe = mkOption {
+        # should be moved in module-init-tools
+        internal = true;
+        default = pkgs.substituteAll {
+          dir = "sbin";
+          src = ./modprobe;
+          isExecutable = true;
+          inherit (pkgs) module_init_tools;
+          inherit (config.system) modulesTree;
+        };
+        description = "
+          Path to the modprobe binary used by the system.
+        ";
+      };
+
+      mount = mkOption {
+        internal = true;
+        default = pkgs.utillinux.passthru.function {
+          buildMountOnly = true;
+          mountHelpers = pkgs.buildEnv {
+            name = "mount-helpers";
+            paths = [
+              pkgs.ntfs3g
+              pkgs.mount_cifs
+            ];
+            pathsToLink = "/sbin";
+          } + "/sbin";
+        };
+        description = "
+          Install a special version of mount to search mount tools in
+          unusual path.
+        ";
+      };
+    };
+  };
 
   # Hm, this sounds like a catch-all...
   hardware = {
@@ -594,24 +680,6 @@ in
 
   services = {
 
-
-    extraJobs = mkOption {
-      default = [];
-      example = [
-           { name = "test-job";
-             job = ''
-               description "nc"
-               start on started network-interfaces
-               respawn
-               env PATH=/var/run/current-system/sw/bin
-               exec sh -c "echo 'hello world' | ${pkgs.netcat}/bin/nc -l -p 9000"
-               '';
-           } ];
-      description = "
-        Additional Upstart jobs.
-      ";
-    };
-
   
     syslogd = {
 
@@ -2659,6 +2727,36 @@ in
       ";
     };
 
+    # Environment variables for running Nix.
+    envVars = mkOption {
+      internal = true;
+      default = "";
+      description = "
+        Define the environment variables used by nix to 
+      ";
+
+      merge = pkgs.lib.mergeStringOption;
+
+      # other option should be used to define the content instead of using
+      # the apply function.
+      apply = conf: ''
+        export NIX_CONF_DIR=/nix/etc/nix
+
+        # Enable the copy-from-other-stores substituter, which allows builds
+        # to be sped up by copying build results from remote Nix stores.  To
+        # do this, mount the remote file system on a subdirectory of
+        # /var/run/nix/remote-stores.
+        export NIX_OTHER_STORES=/var/run/nix/remote-stores/*/nix
+        
+      '' + # */
+      (if config.nix.distributedBuilds then
+        ''
+          export NIX_BUILD_HOOK=${config.environment.nix}/libexec/nix/build-remote.pl
+          export NIX_REMOTE_SYSTEMS=/etc/nix.machines
+          export NIX_CURRENT_LOAD=/var/run/nix/current-load
+        ''
+      else "") + conf;
+    };
   };
 
 
@@ -3020,6 +3118,9 @@ root        ALL=(ALL) SETENV: ALL
   };
 
   require = [
+    # system
+    (import ../upstart-jobs/default.nix)
+
     # newtworking
     (import ../upstart-jobs/dhclient.nix)
 
diff --git a/system/system.nix b/system/system.nix
index eaa26cdea56..5e831f24425 100644
--- a/system/system.nix
+++ b/system/system.nix
@@ -36,19 +36,7 @@ rec {
 
   kernel = kernelPackages.kernel;
 
-
-  # Tree of kernel modules.  This includes the kernel, plus modules
-  # built outside of the kernel.  We have to combine these into a
-  # single tree of symlinks because modprobe only supports one
-  # directory.
-  modulesTree = pkgs.aggregateModules (
-    [kernel]
-    ++ pkgs.lib.optional ((config.networking.enableIntel3945ABGFirmware || config.networking.enableIntel4965AGNFirmware) && !kernel.features ? iwlwifi) kernelPackages.iwlwifi
-    # !!! this should be declared by the xserver Upstart job.
-    ++ pkgs.lib.optional (config.services.xserver.enable && config.services.xserver.videoDriver == "nvidia") kernelPackages.nvidiaDrivers
-    ++ pkgs.lib.optional config.hardware.enableGo7007 kernelPackages.wis_go7007
-    ++ config.boot.extraModulePackages
-  );
+  modulesTree = config.system.modulesTree;
 
 
   # The initial ramdisk.
@@ -66,59 +54,24 @@ rec {
 
 
   # NSS modules.  Hacky!
-  nssModules =
-       pkgs.lib.optional config.users.ldap.enable pkgs.nss_ldap
-    ++ pkgs.lib.optional config.services.avahi.nssmdns pkgs.nssmdns;
+  nssModules = config.system.nssModules.list;
 
-  nssModulesPath = pkgs.lib.concatStrings (pkgs.lib.intersperse ":" 
-    (map (mod: mod + "/lib") nssModules));
+  nssModulesPath = config.system.nssModules.path;
 
 
   # Wrapper around modprobe to set the path to the modules.
-  modprobe = pkgs.substituteAll {
-    dir = "sbin";
-    src = ./modprobe;
-    isExecutable = true;
-    inherit (pkgs) module_init_tools;
-    inherit modulesTree;
-  };
+  modprobe = config.system.sbin.modprobe;
 
 
   # Environment variables for running Nix.
-  nixEnvVars =
-    ''
-      export NIX_CONF_DIR=/nix/etc/nix
-
-      # Enable the copy-from-other-stores substituter, which allows builds
-      # to be sped up by copying build results from remote Nix stores.  To
-      # do this, mount the remote file system on a subdirectory of
-      # /var/run/nix/remote-stores.
-      export NIX_OTHER_STORES=/var/run/nix/remote-stores/*/nix
-      
-    '' + # */
-    (if config.nix.distributedBuilds then
-      ''
-        export NIX_BUILD_HOOK=${nix}/libexec/nix/build-remote.pl
-        export NIX_REMOTE_SYSTEMS=/etc/nix.machines
-        export NIX_CURRENT_LOAD=/var/run/nix/current-load
-      ''
-    else "");
+  nixEnvVars = config.nix.envVars;
 
               
-  # The services (Upstart) configuration for the system.
-  upstartJobs = import ../upstart-jobs/default.nix {
-    inherit config pkgs nix modprobe nssModulesPath nixEnvVars
-      optionDeclarations kernelPackages mount;
-  };
-
-
   # The static parts of /etc.
   etc = import ../etc/default.nix {
-    inherit config pkgs upstartJobs systemPath wrapperDir
+    inherit config pkgs systemPath wrapperDir
       defaultShell nixEnvVars modulesTree nssModulesPath;
-    extraEtc =
-       (pkgs.lib.concatLists (map (job: job.extraEtc) upstartJobs.jobs))
-    ++ config.environment.etc;
+    extraEtc = config.environment.etc;
   };
 
   
@@ -143,18 +96,7 @@ rec {
   # A patched `mount' command that looks in a directory in the Nix
   # store instead of in /sbin for mount helpers (like mount.ntfs-3g or
   # mount.cifs).
-  mount = import "${nixpkgsPath}/pkgs/os-specific/linux/util-linux" {
-    inherit (pkgs) fetchurl stdenv;
-    buildMountOnly = true;
-    mountHelpers = pkgs.buildEnv {
-      name = "mount-helpers";
-      paths = [
-        pkgs.ntfs3g
-        pkgs.mount_cifs
-      ];
-      pathsToLink = "/sbin";
-    } + "/sbin";
-  };
+  mount = config.system.sbin.mount;
   
 
   # The packages you want in the boot environment.
@@ -220,7 +162,6 @@ rec {
   ++ pkgs.lib.optional config.services.bitlbee.enable pkgs.bitlbee
   ++ pkgs.lib.optional config.services.avahi.enable pkgs.avahi
   ++ pkgs.lib.optional config.networking.defaultMailServer.directDelivery pkgs.ssmtp 
-  ++ pkgs.lib.concatLists (map (job: job.extraPath) upstartJobs.jobs)
   ++ config.environment.extraPackages
   ++ pkgs.lib.optional config.fonts.enableFontDir fontDir
   ++ pkgs.lib.optional config.hardware.enableGo7007 kernelPackages.wis_go7007
@@ -248,7 +189,7 @@ rec {
   };
 
 
-  usersGroups = import ./users-groups.nix { inherit pkgs config upstartJobs defaultShell; };
+  usersGroups = import ./users-groups.nix { inherit pkgs config defaultShell; };
 
 
   defaultShell = "/var/run/current-system/sw/bin/bash";
diff --git a/system/users-groups.nix b/system/users-groups.nix
index 7aeeddaa3a1..48c4db65bdf 100644
--- a/system/users-groups.nix
+++ b/system/users-groups.nix
@@ -1,4 +1,4 @@
-{pkgs, config, upstartJobs, defaultShell}:
+{pkgs, config, defaultShell}:
 
 let ids = import ./ids.nix; in
 
@@ -7,8 +7,6 @@ rec {
   # User accounts to be created/updated by NixOS.
   users =
     let
-      jobUsers = pkgs.lib.concatLists (map (job: job.users) upstartJobs.jobs);
-      
       defaultUsers =
         [
           { name = "root";
@@ -46,14 +44,12 @@ rec {
         }:
         { inherit name description uid group extraGroups home shell createHome; };
 
-    in map addAttrs (defaultUsers ++ jobUsers ++ nixBuildUsers ++ config.users.extraUsers);
+    in map addAttrs (defaultUsers ++ nixBuildUsers ++ config.users.extraUsers);
 
 
   # Groups to be created/updated by NixOS.
   groups =
     let
-      jobGroups = pkgs.lib.concatLists (map (job: job.groups) upstartJobs.jobs);
-
       defaultGroups = 
         [
           { name = "root";
@@ -95,7 +91,7 @@ rec {
         { name, gid ? "" }:
         { inherit name gid; };
 
-    in map addAttrs (defaultGroups ++ jobGroups ++ config.users.extraGroups);
+    in map addAttrs (defaultGroups ++ config.users.extraGroups);
 
 
   # Awful hackery necessary to pass the users/groups to the activation script.
diff --git a/test/test-upstart-job.sh b/test/test-upstart-job.sh
index 83af32e7956..86be01bf602 100755
--- a/test/test-upstart-job.sh
+++ b/test/test-upstart-job.sh
@@ -10,7 +10,7 @@ fi
 
 for i in $*; do
     echo "building job $i..."
-    nix-build /etc/nixos/nixos -A "upstartJobs.$i" -o $tmpDir/.result
+    nix-build /etc/nixos/nixos -A "tests.upstartJobs.$i" -o $tmpDir/.result
     ln -sfn $(readlink -f $tmpDir/.result)/etc/event.d/* /tmp/event.d/
 done
 
diff --git a/upstart-jobs/cron.nix b/upstart-jobs/cron.nix
index 4220de6d647..0876f776f47 100644
--- a/upstart-jobs/cron.nix
+++ b/upstart-jobs/cron.nix
@@ -49,7 +49,7 @@ in
 
 {
   require = [
-    # (import ../upstart-jobs/default.nix) # config.services.extraJobs
+    (import ../upstart-jobs/default.nix) # config.services.extraJobs
     # (import ?) # config.time.timeZone
     # (import ?) # config.environment.etc
     # (import ?) # config.environment.extraPackages
diff --git a/upstart-jobs/default.nix b/upstart-jobs/default.nix
index 6bc7cff9ceb..fce6b2520b3 100644
--- a/upstart-jobs/default.nix
+++ b/upstart-jobs/default.nix
@@ -1,6 +1,54 @@
-{config, pkgs, nix, modprobe, nssModulesPath, nixEnvVars, optionDeclarations, kernelPackages, mount}:
-
-let 
+{config, pkgs}:
+
+###### interface
+let
+  inherit (pkgs.lib) mkOption;
+
+  options = {
+    services = {
+      extraJobs = mkOption {
+        default = [];
+        example = [
+             { name = "test-job";
+               job = ''
+                 description "nc"
+                 start on started network-interfaces
+                 respawn
+                 env PATH=/var/run/current-system/sw/bin
+                 exec sh -c "echo 'hello world' | ${pkgs.netcat}/bin/nc -l -p 9000"
+                 '';
+             } ];
+        # should have some checks to everify the syntax
+        merge = pkgs.lib.mergeListOption;
+        description = "
+          Additional Upstart jobs.
+        ";
+      };
+    };
+
+    tests = {
+      upstartJobs = mkOption {
+        internal = true;
+        default = {};
+        description = "
+          Make it easier to build individual Upstart jobs. (e.g.,
+          <command>nix-build /etc/nixos/nixos -A
+          tests.upstartJobs.xserver</command>).
+        ";
+      };
+    };
+  };
+in
+
+###### implementation
+let
+  # should be moved to the corresponding jobs.
+  nix = config.environment.nix;
+  nixEnvVars = config.nix.envVars;
+  kernelPackages = config.boot.kernelPackages;
+  nssModulesPath = config.system.nssModules.path;
+  modprobe = config.system.sbin.modprobe;
+  mount = config.system.sbin.mount;
 
   makeJob = import ../upstart-jobs/make-job.nix {
     inherit (pkgs) runCommand;
@@ -58,9 +106,7 @@ let
                                 then let v = (__getAttr name thisConfig); in if opt ? apply then opt.apply v else v
                                 else if opt ? default then opt.default else abort "you need to specify the configuration option ${errorWhere name}"
                            else abort "unkown option ${errorWhere name}";
-          checkConfig = (pkgs.lib.getAttr ["environment" "checkConfigurationOptions"] 
-                  optionDeclarations.environment.checkConfigurationOptions.default
-                  config);
+          checkConfig = config.environment.checkConfigurationOptions;
       in # TODO: pass path to checker so it can show full path in the abort case
           pkgs.checker ( (jobFunc (args configV)).jobs )
                       checkConfig
@@ -464,8 +510,43 @@ let
   # For the built-in logd job.
   ++ [(makeJob { jobDrv = pkgs.upstart; })];
 
+
+  command = import ../upstart-jobs/gather.nix {
+    inherit (pkgs) runCommand;
+    inherit jobs;
+  };
   
-in import ../upstart-jobs/gather.nix {
-  inherit (pkgs) runCommand;
-  inherit jobs;
-}
+in 
+
+{
+  require = [
+    options
+  ];
+
+  environment = {
+    etc = [{ # The Upstart events defined above.
+      source = command + "/etc/event.d";
+      target = "event.d";
+    }]
+    ++ pkgs.lib.concatLists (map (job: job.extraEtc) jobs);
+
+    extraPackages =
+      pkgs.lib.concatLists (map (job: job.extraPath) jobs);
+  };
+
+  users = {
+    extraUsers =
+      pkgs.lib.concatLists (map (job: job.users) jobs);
+
+    extraGroups =
+      pkgs.lib.concatLists (map (job: job.groups) jobs);
+  };
+
+  tests = {
+    # see test/test-upstart-job.sh
+    upstartJobs = { recurseForDerivations = true; } //
+      builtins.listToAttrs (map (job:
+        { name = if job ? jobName then job.jobName else job.name; value = job; }
+      ) jobs);
+  };
+}
\ No newline at end of file
diff --git a/upstart-jobs/dhclient.nix b/upstart-jobs/dhclient.nix
index 061af3d8f84..5be6c6c0e54 100644
--- a/upstart-jobs/dhclient.nix
+++ b/upstart-jobs/dhclient.nix
@@ -56,7 +56,7 @@ in
 
 {
   require = [
-    # (import ../upstart-jobs/default.nix)
+    (import ../upstart-jobs/default.nix)
     options
   ];
 
-- 
GitLab


From 3a25babf1bceb31a03ee70e21f36a69af830af9a Mon Sep 17 00:00:00 2001
From: Nicolas Pierron <nicolas.b.pierron@gmail.com>
Date: Tue, 18 Nov 2008 18:00:15 +0000
Subject: [PATCH 1104/5331] Use the new scheme for disnix upstart-job.

svn path=/nixos/branches/fix-style/; revision=13328
---
 system/options.nix       | 18 +---------------
 upstart-jobs/default.nix |  6 ------
 upstart-jobs/disnix.nix  | 44 +++++++++++++++++++++++++++++++++++++---
 3 files changed, 42 insertions(+), 26 deletions(-)

diff --git a/system/options.nix b/system/options.nix
index 014ae9da8bd..1d5e333eee9 100644
--- a/system/options.nix
+++ b/system/options.nix
@@ -1688,23 +1688,6 @@ in
       };
     };
 
-    disnix = {
-      enable = mkOption {
-        default = false;
-        description = "Whether to enable Disnix";
-      };
-      
-      activateHook = mkOption {
-        default = "";
-        description = "Custom script or executable that activates services through Disnix";
-      };
-
-      deactivateHook = mkOption {
-        default = "";
-        description = "Custom script or executable that deactivates services through Disnix";
-      };      
-    };
-    
     httpd = {
     
       enable = mkOption {
@@ -3128,6 +3111,7 @@ root        ALL=(ALL) SETENV: ALL
     (import ../upstart-jobs/pcmcia.nix)
 
     # services
+    (import ../upstart-jobs/disnix.nix)
     (import ../upstart-jobs/cron.nix)
     (import ../upstart-jobs/cron/locate.nix)
   ];
diff --git a/upstart-jobs/default.nix b/upstart-jobs/default.nix
index fce6b2520b3..50f937e9ffa 100644
--- a/upstart-jobs/default.nix
+++ b/upstart-jobs/default.nix
@@ -448,12 +448,6 @@ let
       inherit config pkgs;
     })
 
-  # Disnix server
-  ++ optional config.services.disnix.enable
-    (import ../upstart-jobs/disnix.nix {
-      inherit config pkgs;
-    })
-
   # Handles the reboot/halt events.
   ++ (map
     (event: makeJob (import ../upstart-jobs/halt.nix {
diff --git a/upstart-jobs/disnix.nix b/upstart-jobs/disnix.nix
index 2f64afbc4b9..1d387d93b6d 100644
--- a/upstart-jobs/disnix.nix
+++ b/upstart-jobs/disnix.nix
@@ -1,11 +1,37 @@
-args: with args;
+# Disnix server
+{config, pkgs}:
 
+###### interface
 let
+  inherit (pkgs.lib) mkOption;
 
-cfg = config.services.disnix;
+  options = {
+    services = {
+      disnix = {
+        enable = mkOption {
+          default = false;
+          description = "Whether to enable Disnix";
+        };
+        
+        activateHook = mkOption {
+          default = "";
+          description = "Custom script or executable that activates services through Disnix";
+        };
 
+        deactivateHook = mkOption {
+          default = "";
+          description = "Custom script or executable that deactivates services through Disnix";
+        };
+      };
+    };
+  };
 in
-{
+
+###### implementation
+let
+  cfg = config.services.disnix;
+
+  job = {
     name = "disnix";
         
     job = ''
@@ -21,4 +47,16 @@ in
       
       respawn ${pkgs.bash}/bin/sh -c 'export PATH=/var/run/current-system/sw/bin:$PATH; export HOME=/root; export DISNIX_ACTIVATE_HOOK=${cfg.activateHook}; export DISNIX_DEACTIVATE_HOOK=${cfg.deactivateHook}; ${pkgs.disnix}/bin/disnix-service'
     '';
+  };
+in
+
+{
+  require = [
+    (import ../upstart-jobs/default.nix)
+    options
+  ];
+
+  services = {
+    extraJobs = pkgs.lib.optional cfg.enable job;
+  };
 }
-- 
GitLab


From 9c751d377de977eef53536d041707e3cd23c5f4b Mon Sep 17 00:00:00 2001
From: Nicolas Pierron <nicolas.b.pierron@gmail.com>
Date: Tue, 18 Nov 2008 18:00:21 +0000
Subject: [PATCH 1105/5331] Use the new scheme for zabbix upstart-job.

svn path=/nixos/branches/fix-style/; revision=13329
---
 system/options.nix             |  31 +--------
 upstart-jobs/default.nix       |  12 ----
 upstart-jobs/zabbix-agent.nix  | 113 +++++++++++++++++++++++----------
 upstart-jobs/zabbix-server.nix | 106 +++++++++++++++++++++----------
 4 files changed, 152 insertions(+), 110 deletions(-)

diff --git a/system/options.nix b/system/options.nix
index 1d5e333eee9..4bef45be83f 100644
--- a/system/options.nix
+++ b/system/options.nix
@@ -2320,37 +2320,8 @@ in
         ";
       };
     };
-
-
-    zabbixAgent = {
-
-      enable = mkOption {
-        default = false;
-        description = "
-          Whether to run the Zabbix monitoring agent on this machine.
-          It will send monitoring data to a Zabbix server.
-        ";
-      };
-
-      server = mkOption {
-        default = "127.0.0.1";
-        description = ''
-          The IP address or hostname of the Zabbix server to connect to.
-        '';
-      };
-
-    };
     
 
-    zabbixServer = {
-      enable = mkOption {
-        default = false;
-        description = "
-          Whether to run the Zabbix server on this machine.
-        ";
-      };
-    };
-   
     postfix = {
       enable = mkOption {
         default = false;
@@ -3111,6 +3082,8 @@ root        ALL=(ALL) SETENV: ALL
     (import ../upstart-jobs/pcmcia.nix)
 
     # services
+    (import ../upstart-jobs/zabbix-agent.nix)
+    (import ../upstart-jobs/zabbix-server.nix.nix)
     (import ../upstart-jobs/disnix.nix)
     (import ../upstart-jobs/cron.nix)
     (import ../upstart-jobs/cron/locate.nix)
diff --git a/upstart-jobs/default.nix b/upstart-jobs/default.nix
index 50f937e9ffa..a8c422e2427 100644
--- a/upstart-jobs/default.nix
+++ b/upstart-jobs/default.nix
@@ -418,18 +418,6 @@ let
       inherit config pkgs;
     })
 
-  # Zabbix agent daemon.
-  ++ optional config.services.zabbixAgent.enable
-    (import ../upstart-jobs/zabbix-agent.nix {
-      inherit config pkgs;
-    })
-
-  # Zabbix server daemon.
-  ++ optional config.services.zabbixServer.enable
-    (import ../upstart-jobs/zabbix-server.nix {
-      inherit config pkgs;
-    })
-  
   # Postfix mail server.
   ++ optional config.services.postfix.enable
     (import ../upstart-jobs/postfix.nix {
diff --git a/upstart-jobs/zabbix-agent.nix b/upstart-jobs/zabbix-agent.nix
index 8d57c6fbd50..cb3895f81f1 100644
--- a/upstart-jobs/zabbix-agent.nix
+++ b/upstart-jobs/zabbix-agent.nix
@@ -1,5 +1,35 @@
+# Zabbix agent daemon.
 {config, pkgs}:
 
+###### interface
+let
+  inherit (pkgs.lib) mkOption;
+
+  options = {
+    services = {
+      zabbixAgent = {
+
+        enable = mkOption {
+          default = false;
+          description = "
+            Whether to run the Zabbix monitoring agent on this machine.
+            It will send monitoring data to a Zabbix server.
+          ";
+        };
+
+        server = mkOption {
+          default = "127.0.0.1";
+          description = ''
+            The IP address or hostname of the Zabbix server to connect to.
+          '';
+        };
+
+      };
+    };
+  };
+in
+
+###### implementation
 let
 
   cfg = config.services.zabbixAgent;
@@ -20,44 +50,59 @@ let
     StartAgents = 5
   '';
 
-in
+  user = {
+    name = "zabbix";
+    uid = (import ../system/ids.nix).uids.zabbix;
+    description = "Zabbix daemon user";
+  };
 
-{
-  name = "zabbix-agent";
-  
-  users = [
-    { name = "zabbix";
-      uid = (import ../system/ids.nix).uids.zabbix;
-      description = "Zabbix daemon user";
-    }
-  ];
+  job = {
+    name = "zabbix-agent";
+    
+    job = ''
+      start on network-interfaces/started
+      stop on network-interfaces/stop
 
-  job = ''
-    start on network-interfaces/started
-    stop on network-interfaces/stop
+      description "Zabbix agent daemon"
 
-    description "Zabbix agent daemon"
+      start script
+        mkdir -m 0755 -p ${stateDir} ${logDir}
+        chown zabbix ${stateDir} ${logDir}
+        
+        export PATH=${pkgs.nettools}/bin:$PATH
+        ${pkgs.zabbixAgent}/sbin/zabbix_agentd --config ${configFile}
+      end script
 
-    start script
-      mkdir -m 0755 -p ${stateDir} ${logDir}
-      chown zabbix ${stateDir} ${logDir}
+      respawn sleep 100000
       
-      export PATH=${pkgs.nettools}/bin:$PATH
-      ${pkgs.zabbixAgent}/sbin/zabbix_agentd --config ${configFile}
-    end script
+      stop script
+        # !!! this seems to leave processes behind.
+        #pid=$(cat ${pidFile})
+        #if test -n "$pid"; then
+        #  kill $pid 
+        #fi
 
-    respawn sleep 100000
-    
-    stop script
-      # !!! this seems to leave processes behind.
-      #pid=$(cat ${pidFile})
-      #if test -n "$pid"; then
-      #  kill $pid 
-      #fi
-
-      # So instead kill the agent in a brutal fashion.
-      while ${pkgs.procps}/bin/pkill -u zabbix zabbix_agentd; do true; done
-    end script
-  '';
-  
+        # So instead kill the agent in a brutal fashion.
+        while ${pkgs.procps}/bin/pkill -u zabbix zabbix_agentd; do true; done
+      end script
+    '';
+  };
+
+  ifEnable = pkgs.lib.ifEnable cfg.enable;
+in
+
+{
+  require = [
+    (import ../upstart-jobs/default.nix)
+    # (import ../system/user.nix) # users = { .. }
+    options
+  ];
+
+  services = {
+    extraJobs = ifEnable [job];
+  };
+
+  users = {
+    extraUsers = ifEnable [user];
+  };
 }
diff --git a/upstart-jobs/zabbix-server.nix b/upstart-jobs/zabbix-server.nix
index a2095269590..5684413ba2e 100644
--- a/upstart-jobs/zabbix-server.nix
+++ b/upstart-jobs/zabbix-server.nix
@@ -1,5 +1,25 @@
+# Zabbix server daemon.
 {config, pkgs}:
 
+###### interface
+let
+  inherit (pkgs.lib) mkOption;
+
+  options = {
+    services = {
+      zabbixServer = {
+        enable = mkOption {
+          default = false;
+          description = "
+            Whether to run the Zabbix server on this machine.
+          ";
+        };
+      };
+    };
+  };
+in
+
+###### implementation
 let
 
   stateDir = "/var/run/zabbix";
@@ -20,46 +40,62 @@ let
     DBUser = zabbix
   '';
 
-in
+  user = {
+    name = "zabbix";
+    uid = (import ../system/ids.nix).uids.zabbix;
+    description = "Zabbix daemon user";
+  };
 
-{
-  name = "zabbix-server";
-  
-  users = [
-    { name = "zabbix";
-      uid = (import ../system/ids.nix).uids.zabbix;
-      description = "Zabbix daemon user";
-    }
-  ];
+  job = {
+    name = "zabbix-server";
 
-  job = ''
-    description "Zabbix server daemon"
+    job = ''
+      description "Zabbix server daemon"
 
-    start on postgresql/started
-    stop on shutdown
+      start on postgresql/started
+      stop on shutdown
 
-    start script
-      mkdir -m 0755 -p ${stateDir} ${logDir} ${libDir}
-      chown zabbix ${stateDir} ${logDir} ${libDir}
+      start script
+        mkdir -m 0755 -p ${stateDir} ${logDir} ${libDir}
+        chown zabbix ${stateDir} ${logDir} ${libDir}
 
-      if ! test -e "${libDir}/db-created"; then
-          ${pkgs.postgresql}/bin/createuser --no-superuser --no-createdb --no-createrole zabbix || true
-          ${pkgs.postgresql}/bin/createdb --owner zabbix zabbix || true
-          cat ${pkgs.zabbixServer}/share/zabbix/db/schema/postgresql.sql | ${pkgs.su}/bin/su -s "$SHELL" zabbix -c 'psql zabbix'
-          cat ${pkgs.zabbixServer}/share/zabbix/db/data/data.sql | ${pkgs.su}/bin/su -s "$SHELL" zabbix -c 'psql zabbix'
-          cat ${pkgs.zabbixServer}/share/zabbix/db/data/images_pgsql.sql | ${pkgs.su}/bin/su -s "$SHELL" zabbix -c 'psql zabbix'
-          touch "${libDir}/db-created"
-      fi
-      
-      export PATH=${pkgs.nettools}/bin:$PATH
-      ${pkgs.zabbixServer}/sbin/zabbix_server --config ${configFile}
-    end script
+        if ! test -e "${libDir}/db-created"; then
+            ${pkgs.postgresql}/bin/createuser --no-superuser --no-createdb --no-createrole zabbix || true
+            ${pkgs.postgresql}/bin/createdb --owner zabbix zabbix || true
+            cat ${pkgs.zabbixServer}/share/zabbix/db/schema/postgresql.sql | ${pkgs.su}/bin/su -s "$SHELL" zabbix -c 'psql zabbix'
+            cat ${pkgs.zabbixServer}/share/zabbix/db/data/data.sql | ${pkgs.su}/bin/su -s "$SHELL" zabbix -c 'psql zabbix'
+            cat ${pkgs.zabbixServer}/share/zabbix/db/data/images_pgsql.sql | ${pkgs.su}/bin/su -s "$SHELL" zabbix -c 'psql zabbix'
+            touch "${libDir}/db-created"
+        fi
+        
+        export PATH=${pkgs.nettools}/bin:$PATH
+        ${pkgs.zabbixServer}/sbin/zabbix_server --config ${configFile}
+      end script
 
-    respawn sleep 100000
+      respawn sleep 100000
+      
+      stop script
+        while ${pkgs.procps}/bin/pkill -u zabbix zabbix_server; do true; done
+      end script
+    '';
     
-    stop script
-      while ${pkgs.procps}/bin/pkill -u zabbix zabbix_server; do true; done
-    end script
-  '';
-  
+  };
+
+  ifEnable = pkgs.lib.ifEnable config.services.zabbixServer.enable
+in
+
+{
+  require = [
+    (import ../upstart-jobs/default.nix)
+    # (import ../system/user.nix) # users = { .. }
+    options
+  ];
+
+  services = {
+    extraJobs = ifEnable [job];
+  };
+
+  users = {
+    extraUsers = ifEnable [user];
+  };
 }
-- 
GitLab


From 80377e512e29de50cb8de015c42dedf0daccec37 Mon Sep 17 00:00:00 2001
From: Marc Weber <marco-oweber@gmx.de>
Date: Thu, 20 Nov 2008 23:47:05 +0000
Subject: [PATCH 1106/5331] added sshd GatwayPorts option

svn path=/nixos/trunk/; revision=13363
---
 system/options.nix       | 7 +++++++
 upstart-jobs/default.nix | 4 +---
 upstart-jobs/sshd.nix    | 3 ++-
 3 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/system/options.nix b/system/options.nix
index 2d670e97200..63bd0d663f7 100644
--- a/system/options.nix
+++ b/system/options.nix
@@ -842,6 +842,13 @@ in
           <command>no</command>
         ";
       };
+
+      gatewayPorts = mkOption {
+        default = "no";
+        description = "
+           Specifies  whether  remote hosts are allowed to connect to ports forwarded for the client. See man sshd_conf.
+          ";
+        };
     };
 
     lshd = {
diff --git a/upstart-jobs/default.nix b/upstart-jobs/default.nix
index 6bc7cff9ceb..87833f09ed9 100644
--- a/upstart-jobs/default.nix
+++ b/upstart-jobs/default.nix
@@ -191,9 +191,7 @@ let
       inherit (pkgs) writeText openssh glibc;
       inherit (pkgs.xorg) xauth;
       inherit nssModulesPath;
-      forwardX11 = config.services.sshd.forwardX11;
-      allowSFTP = config.services.sshd.allowSFTP;
-      permitRootLogin = config.services.sshd.permitRootLogin;
+      inherit (config.services.sshd) forwardX11 allowSFTP permitRootLogin gatewayPorts;
     })
 
   # GNU lshd SSH2 deamon.
diff --git a/upstart-jobs/sshd.nix b/upstart-jobs/sshd.nix
index c64c4eb49a5..e9b916e81d3 100644
--- a/upstart-jobs/sshd.nix
+++ b/upstart-jobs/sshd.nix
@@ -1,6 +1,6 @@
 { writeText, openssh, glibc, xauth
 , nssModulesPath
-, forwardX11, allowSFTP, permitRootLogin
+, forwardX11, allowSFTP, permitRootLogin, gatewayPorts
 }:
 
 assert permitRootLogin == "yes" ||
@@ -29,6 +29,7 @@ let
     "}
     
     PermitRootLogin ${permitRootLogin}
+    GatewayPorts ${gatewayPorts}
     
   '';
 
-- 
GitLab


From eea7e6c213e44ff3bc05ead14e8930d9636871c7 Mon Sep 17 00:00:00 2001
From: Marc Weber <marco-oweber@gmx.de>
Date: Sat, 22 Nov 2008 17:05:20 +0000
Subject: [PATCH 1107/5331] adding fcron daemon. I have only tested it with
 upstart 0.5, maybe you have to fix small things in the job description

svn path=/nixos/trunk/; revision=13369
---
 system/options.nix     |   1 +
 upstart-jobs/fcron.nix | 137 +++++++++++++++++++++++++++++++++++++++++
 2 files changed, 138 insertions(+)
 create mode 100644 upstart-jobs/fcron.nix

diff --git a/system/options.nix b/system/options.nix
index 63bd0d663f7..64bee0fa878 100644
--- a/system/options.nix
+++ b/system/options.nix
@@ -3035,6 +3035,7 @@ root        ALL=(ALL) SETENV: ALL
 
     # services
     (import ../upstart-jobs/cron.nix)
+    (import ../upstart-jobs/fcron.nix)
     (import ../upstart-jobs/cron/locate.nix)
   ];
 }
diff --git a/upstart-jobs/fcron.nix b/upstart-jobs/fcron.nix
new file mode 100644
index 00000000000..73fff134693
--- /dev/null
+++ b/upstart-jobs/fcron.nix
@@ -0,0 +1,137 @@
+{pkgs, config}:
+
+###### interface
+let
+  inherit (pkgs.lib) mkOption concatStringsSep;
+  inherit (pkgs) writeText;
+
+  options = {
+    services = {
+      fcron = {
+        enable = mkOption {
+          default = false;
+          description = ''Whether to enable the `fcron' daemon.
+            From its docs: "fcron does both the job of Vixie Cron and anacron, but does even more and better".
+            It can trigger actions even if the event has passed due to shutdown for example.
+            TODO: add supoprt for fcron.allow and fcron.deny
+            Of course on cron daemon is enough.. So if fcron works fine there should be a system option systemCron="fcron or cron"
+
+            There are (or have been) some security issues.
+            I haven't yet checked wether they have been resolved.
+            For now you should trust the users registering crontab files.
+            I think gentoo has them listed.
+          '';
+        };
+        allow = mkOption {
+          default = [];
+          description = ''
+            Users allowed to use fcrontab and fcrondyn (one name per line, special name "all" acts for everyone)
+            nix adds username "root" for you.
+          '';
+        };
+        deny = mkOption {
+          default = [];
+          description = " same as allow but deny ";
+        };
+        maxSerialJobs = mkOption {
+          default = 1;
+          description = "maximum number of serial jobs which can run simultaneously (-m)";
+        };
+        queuelen = mkOption {
+          default = "";
+          description = "number of jobs the serial queue and the lavg queue can contain - empty to net set this number (-q)";
+        };
+        systab = mkOption {
+          default = "";
+          description = ''
+            The "system" crontab contents..
+          '';
+        };
+      };
+    };
+  };
+in
+
+###### implementation
+let
+  # Put all the system cronjobs together.
+  # TODO allow using fcron only..
+  #systemCronJobs =
+  #  config.services.cron.systemCronJobs;
+  cfg = config.services.fcron;
+  queuelen = if cfg.queuelen == "" then "" else "-q ${toString cfg.queuelen}";
+
+  # shell is set to /sh in config..
+  # ${pkgs.lib.concatStrings (map (job: job + "\n") systemCronJobs)}
+  systemCronJobsFile = pkgs.writeText "fcron-systab" ''
+    SHELL=${pkgs.bash}/bin/sh
+    PATH=${pkgs.coreutils}/bin:${pkgs.findutils}/bin:${pkgs.gnused}/bin
+  '';
+
+  allowdeny = target: users : {
+    source = writeText "fcron.${target}" (concatStringsSep "\n" users);
+    target = "fcron.${target}";
+    mode = "600"; # fcron has some security issues.. So I guess this is most safe
+  };
+
+in
+
+{
+  require = [
+    # (import ../upstart-jobs/default.nix) # config.services.extraJobs
+    # (import ?) # config.time.timeZone
+    # (import ?) # config.environment.etc
+    # (import ?) # config.environment.extraPackages
+    # (import ?) # config.environment.cleanStart
+    options
+  ];
+
+  environment = {
+    etc = [
+      (allowdeny "allow" (["root"] ++ cfg.allow))
+      (allowdeny "deny" cfg.deny)
+      # see man 5 fcron.conf
+      { source = writeText "fcon.conf" ''
+          fcrontabs	=	/var/spool/fcron
+          pidfile	=	/var/run/fcron.pid
+          fifofile	=	/var/run/fcron.fifo
+          fcronallow	=	/etc/fcron.allow
+          fcrondeny	=	/etc/fcron.deny
+          shell		=	/bin/sh
+          sendmail	=	/var/setuid-wrappers/sendmail
+          editor	=	/var/run/current-system/sw/bin/vi
+       '';
+        target = "fcron.conf";
+        mode = "0600"; # max allowed is 644
+      }
+    ];
+
+    extraPackages =
+      pkgs.lib.optional
+        (!config.environment.cleanStart)
+        pkgs.fcron;
+  };
+
+  services = {
+    extraJobs = [{
+      name = "fcron";
+
+      job = ''
+        description "fcron daemon"
+
+        start on startup
+        stop on shutdown
+
+        env PATH=/var/run/current-system/sw/bin
+
+        start script
+            ${pkgs.coreutils}/bin/mkdir -m 0700 -p /var/spool/fcron
+            # load system crontab file
+            ${pkgs.fcron}/bin/fcrontab -u systab ${writeText "systab" cfg.systab}
+        end script
+
+        respawn ${pkgs.fcron}/sbin/fcron -f -m ${toString cfg.maxSerialJobs} ${queuelen}
+      '';
+    }];
+  };
+}
-- 
GitLab


From a63ea50ee9435fbc55db5cb83aafb14ce2a63f92 Mon Sep 17 00:00:00 2001
From: Nicolas Pierron <nicolas.b.pierron@gmail.com>
Date: Sun, 23 Nov 2008 01:28:25 +0000
Subject: [PATCH 1108/5331] Fix zabbix-server.nix.

svn path=/nixos/branches/fix-style/; revision=13374
---
 system/options.nix             | 2 +-
 upstart-jobs/zabbix-server.nix | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/system/options.nix b/system/options.nix
index 4bef45be83f..9eb92f7322f 100644
--- a/system/options.nix
+++ b/system/options.nix
@@ -3083,7 +3083,7 @@ root        ALL=(ALL) SETENV: ALL
 
     # services
     (import ../upstart-jobs/zabbix-agent.nix)
-    (import ../upstart-jobs/zabbix-server.nix.nix)
+    (import ../upstart-jobs/zabbix-server.nix)
     (import ../upstart-jobs/disnix.nix)
     (import ../upstart-jobs/cron.nix)
     (import ../upstart-jobs/cron/locate.nix)
diff --git a/upstart-jobs/zabbix-server.nix b/upstart-jobs/zabbix-server.nix
index 5684413ba2e..07a31e7d7d7 100644
--- a/upstart-jobs/zabbix-server.nix
+++ b/upstart-jobs/zabbix-server.nix
@@ -81,7 +81,7 @@ let
     
   };
 
-  ifEnable = pkgs.lib.ifEnable config.services.zabbixServer.enable
+  ifEnable = pkgs.lib.ifEnable config.services.zabbixServer.enable;
 in
 
 {
-- 
GitLab


From afe160c6b2c25bc5136ae678997807b8685cdf43 Mon Sep 17 00:00:00 2001
From: Nicolas Pierron <nicolas.b.pierron@gmail.com>
Date: Sun, 23 Nov 2008 01:28:34 +0000
Subject: [PATCH 1109/5331] Convert "nagios" upstart-job to the fix-style.

svn path=/nixos/branches/fix-style/; revision=13375
---
 system/options.nix              |  48 +--------
 upstart-jobs/default.nix        |   6 --
 upstart-jobs/nagios/default.nix | 180 +++++++++++++++++++++++---------
 3 files changed, 132 insertions(+), 102 deletions(-)

diff --git a/system/options.nix b/system/options.nix
index 9eb92f7322f..2fb33c40c2f 100644
--- a/system/options.nix
+++ b/system/options.nix
@@ -2150,53 +2150,6 @@ in
     };
 
 
-    nagios = {
-
-      enable = mkOption {
-        default = false;
-        description = "
-          Whether to use <link
-          xlink:href='http://www.nagios.org/'>Nagios</link> to monitor
-          your system or network.
-        ";
-      };
-
-      objectDefs = mkOption {
-        description = "
-          A list of Nagios object configuration files that must define
-          the hosts, host groups, services and contacts for the
-          network that you want Nagios to monitor.
-        ";
-      };
-
-      plugins = mkOption {
-        default = [pkgs.nagiosPluginsOfficial pkgs.ssmtp];
-        description = "
-          Packages to be added to the Nagios <envar>PATH</envar>.
-          Typically used to add plugins, but can be anything.
-        ";
-      };
-
-      enableWebInterface = mkOption {
-        default = false;
-        description = "
-          Whether to enable the Nagios web interface.  You should also
-          enable Apache (<option>services.httpd.enable</option>).
-        ";
-      };
-
-      urlPath = mkOption {
-        default = "/nagios";
-        description = "
-          The URL path under which the Nagios web interface appears.
-          That is, you can access the Nagios web interface through
-          <literal>http://<replaceable>server</replaceable>/<replaceable>urlPath</replaceable></literal>.
-        ";
-      };
-
-    };
-
-    
     mysql = {
       enable = mkOption {
         default = false;
@@ -3082,6 +3035,7 @@ root        ALL=(ALL) SETENV: ALL
     (import ../upstart-jobs/pcmcia.nix)
 
     # services
+    (import ../upstart-jobs/nagios/default.nix)
     (import ../upstart-jobs/zabbix-agent.nix)
     (import ../upstart-jobs/zabbix-server.nix)
     (import ../upstart-jobs/disnix.nix)
diff --git a/upstart-jobs/default.nix b/upstart-jobs/default.nix
index a8c422e2427..7604587fe1d 100644
--- a/upstart-jobs/default.nix
+++ b/upstart-jobs/default.nix
@@ -412,12 +412,6 @@ let
       gpmConfig = config.services.gpm;
     })
 
-  # Nagios system/network monitoring daemon.
-  ++ optional config.services.nagios.enable
-    (import ../upstart-jobs/nagios {
-      inherit config pkgs;
-    })
-
   # Postfix mail server.
   ++ optional config.services.postfix.enable
     (import ../upstart-jobs/postfix.nix {
diff --git a/upstart-jobs/nagios/default.nix b/upstart-jobs/nagios/default.nix
index 256693ba072..f8294b203c6 100644
--- a/upstart-jobs/nagios/default.nix
+++ b/upstart-jobs/nagios/default.nix
@@ -1,6 +1,64 @@
+# Nagios system/network monitoring daemon.
 {config, pkgs}:
 
+###### interface
 let
+  inherit (pkgs.lib) mkOption;
+
+  options = {
+    services = {
+      nagios = {
+
+        enable = mkOption {
+          default = false;
+          description = "
+            Whether to use <link
+            xlink:href='http://www.nagios.org/'>Nagios</link> to monitor
+            your system or network.
+          ";
+        };
+
+        objectDefs = mkOption {
+          description = "
+            A list of Nagios object configuration files that must define
+            the hosts, host groups, services and contacts for the
+            network that you want Nagios to monitor.
+          ";
+        };
+
+        plugins = mkOption {
+          default = [pkgs.nagiosPluginsOfficial pkgs.ssmtp];
+          description = "
+            Packages to be added to the Nagios <envar>PATH</envar>.
+            Typically used to add plugins, but can be anything.
+          ";
+        };
+
+        enableWebInterface = mkOption {
+          default = false;
+          description = "
+            Whether to enable the Nagios web interface.  You should also
+            enable Apache (<option>services.httpd.enable</option>).
+          ";
+        };
+
+        urlPath = mkOption {
+          default = "/nagios";
+          description = "
+            The URL path under which the Nagios web interface appears.
+            That is, you can access the Nagios web interface through
+            <literal>http://<replaceable>server</replaceable>/<replaceable>urlPath</replaceable></literal>.
+          ";
+        };
+
+      };
+    };
+  };
+in
+
+###### implementation
+let
+  cfg = config.services.nagios;
 
   nagiosUser = "nagios";
   nagiosGroup = "nogroup";
@@ -13,7 +71,7 @@ let
     ./host-templates.cfg
     ./service-templates.cfg
     ./commands.cfg
-  ] ++ config.services.nagios.objectDefs;
+  ] ++ cfg.objectDefs;
 
   nagiosObjectDefsDir = pkgs.runCommand "nagios-objects" {inherit nagiosObjectDefs;}
     "ensureDir $out; ln -s $nagiosObjectDefs $out/";
@@ -53,7 +111,7 @@ let
     url_html_path=/nagios
   ";
 
-  urlPath = config.services.nagios.urlPath;
+  urlPath = cfg.urlPath;
 
   extraHttpdConfig = "
     ScriptAlias ${urlPath}/cgi-bin ${pkgs.nagios}/sbin
@@ -75,57 +133,81 @@ let
       Allow from all
     </Directory>
   ";
+
+  user = {
+    name = nagiosUser;
+    uid = (import ../../system/ids.nix).uids.nagios;
+    description = "Nagios monitoring daemon";
+    home = nagiosState;
+  };
+
+  job = {
+    name = "nagios";
     
+    # Run `nagios -v' to check the validity of the configuration file so
+    # that a nixos-rebuild fails *before* we kill the running Nagios
+    # daemon.
+    buildHook = "${pkgs.nagios}/bin/nagios -v ${nagiosCfgFile}";
+
+    job = "
+      description \"Nagios monitoring daemon\"
+
+      start on network-interfaces/started
+      stop on network-interfaces/stop
+
+      start script
+        mkdir -m 0755 -p ${nagiosState} ${nagiosLogDir}
+        chown ${nagiosUser} ${nagiosState} ${nagiosLogDir}
+      end script
+
+      respawn
+
+      script
+        for i in ${toString config.services.nagios.plugins}; do
+          export PATH=$i/bin:$i/sbin:$i/libexec:$PATH
+        done
+        exec ${pkgs.nagios}/bin/nagios ${nagiosCfgFile}
+      end script
+    ";
+  };
+
+  ifEnable = pkgs.lib.ifEnable cfg.enable;
 in
 
 {
-  name = "nagios";
-  
-  users = [
-    { name = nagiosUser;
-      uid = (import ../../system/ids.nix).uids.nagios;
-      description = "Nagios monitoring daemon";
-      home = nagiosState;
-    }
+  require = [
+    (import ../../upstart-jobs/default.nix) # config.services.extraJobs
+    # (import ../../system/user.nix) # users = { .. }
+    # (import ?) # config.environment.etc
+    # (import ?) # config.environment.extraPackages
+    # (import ../../upstart-jobs/httpd.nix) # config.services.httpd
+    options
   ];
 
-  extraPath = [pkgs.nagios];
-
-  # This isn't needed, it's just so that the user can type "nagiostats
-  # -c /etc/nagios.cfg".
-  extraEtc = [
-    { source = nagiosCfgFile;
-      target = "nagios.cfg";
-    }
-  ];
-
-  extraHttpdConfig =
-    if config.services.nagios.enableWebInterface then extraHttpdConfig else "";
-  
-  # Run `nagios -v' to check the validity of the configuration file so
-  # that a nixos-rebuild fails *before* we kill the running Nagios
-  # daemon.
-  buildHook = "${pkgs.nagios}/bin/nagios -v ${nagiosCfgFile}";
-
-  job = "
-    description \"Nagios monitoring daemon\"
-
-    start on network-interfaces/started
-    stop on network-interfaces/stop
-
-    start script
-      mkdir -m 0755 -p ${nagiosState} ${nagiosLogDir}
-      chown ${nagiosUser} ${nagiosState} ${nagiosLogDir}
-    end script
-
-    respawn
-
-    script
-      for i in ${toString config.services.nagios.plugins}; do
-        export PATH=$i/bin:$i/sbin:$i/libexec:$PATH
-      done
-      exec ${pkgs.nagios}/bin/nagios ${nagiosCfgFile}
-    end script
-  ";
-  
+  environment = {
+    # This isn't needed, it's just so that the user can type "nagiostats
+    # -c /etc/nagios.cfg".
+    etc = ifEnable [
+      { source = nagiosCfgFile;
+        target = "nagios.cfg";
+      }
+    ];
+
+    extraPackages = ifEnable [pkgs.nagios];
+  };
+
+  users = {
+    extraUsers = ifEnable [user];
+  };
+
+  services = {
+    extraJobs = ifEnable [job];
+
+    httpd = {
+      extraConfig = # ifEnable does not handle strings yet.
+        if cfg.enable && cfg.enableWebInterface
+        then extraHttpdConfig
+        else "";
+    };
+  };
 }
-- 
GitLab


From 585fd9d911c5a4b33465363db63b8a61ba885983 Mon Sep 17 00:00:00 2001
From: Nicolas Pierron <nicolas.b.pierron@gmail.com>
Date: Sun, 23 Nov 2008 01:28:45 +0000
Subject: [PATCH 1110/5331] Convert "gpm" upstart-job to the fix-style.

svn path=/nixos/branches/fix-style/; revision=13376
---
 system/options.nix       | 17 +----------
 upstart-jobs/default.nix |  6 ----
 upstart-jobs/gpm.nix     | 61 +++++++++++++++++++++++++++++++++-------
 3 files changed, 52 insertions(+), 32 deletions(-)

diff --git a/system/options.nix b/system/options.nix
index 2fb33c40c2f..3ce8eb62414 100644
--- a/system/options.nix
+++ b/system/options.nix
@@ -2259,22 +2259,6 @@ in
     };
 
     
-    gpm = {
-      enable = mkOption {
-        default = false;
-        description = "
-          Whether to enable general purpose mouse daemon.
-        ";
-      };
-      protocol = mkOption {
-        default = "ps/2";
-        description = "
-          Mouse protocol to use.
-        ";
-      };
-    };
-    
-
     postfix = {
       enable = mkOption {
         default = false;
@@ -3035,6 +3019,7 @@ root        ALL=(ALL) SETENV: ALL
     (import ../upstart-jobs/pcmcia.nix)
 
     # services
+    (import ../upstart-jobs/gpm.nix)
     (import ../upstart-jobs/nagios/default.nix)
     (import ../upstart-jobs/zabbix-agent.nix)
     (import ../upstart-jobs/zabbix-server.nix)
diff --git a/upstart-jobs/default.nix b/upstart-jobs/default.nix
index 7604587fe1d..c63487c1b47 100644
--- a/upstart-jobs/default.nix
+++ b/upstart-jobs/default.nix
@@ -406,12 +406,6 @@ let
       inherit (pkgs) stdenv hal;
     })
 
-  ++ optional config.services.gpm.enable 
-    (import ../upstart-jobs/gpm.nix {
-      inherit (pkgs) gpm;
-      gpmConfig = config.services.gpm;
-    })
-
   # Postfix mail server.
   ++ optional config.services.postfix.enable
     (import ../upstart-jobs/postfix.nix {
diff --git a/upstart-jobs/gpm.nix b/upstart-jobs/gpm.nix
index 798ad4041eb..ca55f1c8362 100644
--- a/upstart-jobs/gpm.nix
+++ b/upstart-jobs/gpm.nix
@@ -1,17 +1,58 @@
-{gpm, gpmConfig}:
+{pkgs, config}:
 
-let 
+###### interface
+let
+  inherit (pkgs.lib) mkOption;
+
+  options = {
+    services = {
+      gpm = {
+        enable = mkOption {
+          default = false;
+          description = "
+            Whether to enable general purpose mouse daemon.
+          ";
+        };
+        protocol = mkOption {
+          default = "ps/2";
+          description = "
+            Mouse protocol to use.
+          ";
+        };
+      };
+    };
+  };
+in
+
+###### implementation
+let
+  cfg = config.services.gpm;
+  ifEnable = pkgs.lib.ifEnable cfg.enable;
+
+  gpm = pkgs.gpm;
   gpmBin = "${gpm}/sbin/gpm";
 
+  job = {
+    name = "gpm";
+    job = ''
+      description = "General purpose mouse"
+
+      start on udev
+      stop on shutdown
+
+      respawn ${gpmBin} -m /dev/input/mice -t ${cfg.protocol} -D &>/dev/null
+    '';
+  };
 in
-{
-  name = "gpm";
-  job = ''
-    description = "General purpose mouse"
 
-    start on udev
-    stop on shutdown
+{
+  require = [
+    (import ../upstart-jobs/default.nix) # config.services.extraJobs
+    # /etc/security/console.perms (should be generated ?)
+    options
+  ];
 
-    respawn ${gpmBin} -m /dev/input/mice -t ${gpmConfig.protocol} -D &>/dev/null
-  '';
+  services = {
+    extraJobs = ifEnable [job];
+  };
 }
-- 
GitLab


From dc634f52976e05b4f9fb6c8eeafa04a31862df3b Mon Sep 17 00:00:00 2001
From: Nicolas Pierron <nicolas.b.pierron@gmail.com>
Date: Sun, 23 Nov 2008 01:28:52 +0000
Subject: [PATCH 1111/5331] Convert "hal" upstart-job to the fix-style.

svn path=/nixos/branches/fix-style/; revision=13377
---
 system/options.nix       |  13 +----
 upstart-jobs/default.nix |  10 +---
 upstart-jobs/hal.nix     | 114 +++++++++++++++++++++++++++++----------
 3 files changed, 88 insertions(+), 49 deletions(-)

diff --git a/system/options.nix b/system/options.nix
index 3ce8eb62414..605eb3618ee 100644
--- a/system/options.nix
+++ b/system/options.nix
@@ -1943,18 +1943,6 @@ in
     };
 
 
-    hal = {
-
-      enable = mkOption {
-        default = true;
-        description = "
-          Whether to start the HAL daemon.
-        ";
-      };
-
-    };
-
-
     udev = {
 
       addFirmware = mkOption {
@@ -3019,6 +3007,7 @@ root        ALL=(ALL) SETENV: ALL
     (import ../upstart-jobs/pcmcia.nix)
 
     # services
+    (import ../upstart-jobs/hal.nix)
     (import ../upstart-jobs/gpm.nix)
     (import ../upstart-jobs/nagios/default.nix)
     (import ../upstart-jobs/zabbix-agent.nix)
diff --git a/upstart-jobs/default.nix b/upstart-jobs/default.nix
index c63487c1b47..cb2035c66dc 100644
--- a/upstart-jobs/default.nix
+++ b/upstart-jobs/default.nix
@@ -145,8 +145,7 @@ let
         ++ pkgs.lib.optional config.hardware.enableGo7007 "${kernelPackages.wis_go7007}/firmware"
         ++ config.services.udev.addFirmware;
       extraUdevPkgs =
-           pkgs.lib.optional config.services.hal.enable pkgs.hal
-        ++ pkgs.lib.optional config.hardware.enableGo7007 kernelPackages.wis_go7007
+           pkgs.lib.optional config.hardware.enableGo7007 kernelPackages.wis_go7007
         ++ config.services.udev.addUdevPkgs;
     })
       
@@ -394,18 +393,13 @@ let
     (import ../upstart-jobs/dbus.nix {
       inherit (pkgs) stdenv dbus;
       dbusServices =
+        # add config.services.dbus.services
         pkgs.lib.optional config.services.hal.enable pkgs.hal ++
         pkgs.lib.optional config.services.avahi.enable pkgs.avahi ++
         pkgs.lib.optional config.services.disnix.enable pkgs.disnix
         ;
     })
 
-  # HAL daemon.
-  ++ optional config.services.hal.enable
-    (import ../upstart-jobs/hal.nix {
-      inherit (pkgs) stdenv hal;
-    })
-
   # Postfix mail server.
   ++ optional config.services.postfix.enable
     (import ../upstart-jobs/postfix.nix {
diff --git a/upstart-jobs/hal.nix b/upstart-jobs/hal.nix
index 90e8c49521b..b3f4e56f577 100644
--- a/upstart-jobs/hal.nix
+++ b/upstart-jobs/hal.nix
@@ -1,39 +1,95 @@
-{stdenv, hal}:
+# HAL daemon.
+{pkgs, config}:
 
-{
-  name = "hal";
-  
-  users = [
-    { name = "haldaemon";
-      uid = (import ../system/ids.nix).uids.haldaemon;
-      description = "HAL daemon user";
-    }
-  ];
+###### interface
+let
+  inherit (pkgs.lib) mkOption;
+
+  options = {
+    services = {
+      hal = {
+        enable = mkOption {
+          default = true;
+          description = "
+            Whether to start the HAL daemon.
+          ";
+        };
+      };
+    };
+  };
+in
+
+###### implementation
+let
+  cfg = config.services.hal;
+  ifEnable = pkgs.lib.ifEnable cfg.enable;
+
+  inherit (pkgs) hal;
+
+  user = {
+    name = "haldaemon";
+    uid = (import ../system/ids.nix).uids.haldaemon;
+    description = "HAL daemon user";
+  };
+
+  group = {
+    name = "haldaemon";
+    gid = (import ../system/ids.nix).gids.haldaemon;
+  };
 
-  groups = [
-    { name = "haldaemon";
-      gid = (import ../system/ids.nix).gids.haldaemon;
-    }
-  ];
 
-  extraPath = [hal];
-  
-  job = ''
-    description "HAL daemon"
+  job = {
+    name = "hal";
+    
+    job = ''
+      description "HAL daemon"
 
-    start on dbus
-    stop on shutdown
+      start on dbus
+      stop on shutdown
+
+      start script
+
+          # !!! quick hack: wait until dbus has started
+          sleep 3
+
+          mkdir -m 0755 -p /var/cache/hald
+
+      end script
+
+      respawn ${hal}/sbin/hald --daemon=no
+    '';
+  };
+in
+
+{
+  require = [
+    (import ../upstart-jobs/default.nix) # config.services.extraJobs
+    # (import ../system/user.nix) # users.*
+    # (import ../upstart-jobs/udev.nix) # services.udev.*
+    # (import ../upstart-jobs/dbus.nix) # services.dbus.*
+    # (import ?) # config.environment.extraPackages
+    options
+  ];
 
-    start script
+  environment = {
+    extraPackages = ifEnable [hal];
+  };
 
-        # !!! quick hack: wait until dbus has started
-        sleep 3
+  users = {
+    extraUsers = ifEnable [user];
+    extraGroups = ifEnable [group];
+  };
 
-        mkdir -m 0755 -p /var/cache/hald
+  services = {
+    extraJobs = ifEnable [job];
 
-    end script
+    udev = {
+      addUdevPkgs = ifEnable [hal];
+    };
 
-    respawn ${hal}/sbin/hald --daemon=no
-  '';
-  
+    dbus = {
+      enable = cfg.enable;
+      # services = ifEnable [hal];
+    };
+  };
 }
-- 
GitLab


From 9c0eef3bae0465d8271ac735a45e49f751606f89 Mon Sep 17 00:00:00 2001
From: Nicolas Pierron <nicolas.b.pierron@gmail.com>
Date: Sun, 23 Nov 2008 01:28:58 +0000
Subject: [PATCH 1112/5331] Convert "dbus" & "avahi-deamon" upstart-job to the
 fix-style.

svn path=/nixos/branches/fix-style/; revision=13378
---
 etc/default.nix               |   7 --
 system/options.nix            |  78 +---------------
 system/system.nix             |   1 -
 upstart-jobs/avahi-daemon.nix | 166 +++++++++++++++++++++++++++++-----
 upstart-jobs/dbus.nix         | 115 ++++++++++++++++-------
 upstart-jobs/default.nix      |  19 ----
 upstart-jobs/disnix.nix       |   9 +-
 upstart-jobs/hal.nix          |   4 +-
 8 files changed, 237 insertions(+), 162 deletions(-)

diff --git a/etc/default.nix b/etc/default.nix
index dd219dc74ef..9a168f19f6a 100644
--- a/etc/default.nix
+++ b/etc/default.nix
@@ -50,13 +50,6 @@ import ../helpers/make-etc.nix {
       target = "hosts";
     }
 
-    { # Name Service Switch configuration file.  Required by the C library.
-      source = if config.services.avahi.nssmdns
-               then (assert config.services.avahi.enable; ./nsswitch-mdns.conf)
-               else ./nsswitch.conf;
-      target = "nsswitch.conf";
-    }
-
     { # Friendly greeting on the virtual consoles.
       source = pkgs.writeText "issue" ''
       
diff --git a/system/options.nix b/system/options.nix
index 605eb3618ee..7299af54443 100644
--- a/system/options.nix
+++ b/system/options.nix
@@ -347,8 +347,7 @@ in
         let
           list2 =
              list
-          ++ pkgs.lib.optional config.users.ldap.enable pkgs.nss_ldap
-          ++ pkgs.lib.optional config.services.avahi.nssmdns pkgs.nssmdns;
+          ++ pkgs.lib.optional config.users.ldap.enable pkgs.nss_ldap;
         in {
           list = list2;
           path = pkgs.lib.makeLibraryPath list2;
@@ -1039,66 +1038,6 @@ in
       };
     };
 
-    avahi = {
-
-      enable = mkOption {
-        default = false;
-        description = ''
-          Whether to run the Avahi daemon, which allows Avahi clients
-          to use Avahi's service discovery facilities and also allows
-          the local machine to advertise its presence and services
-          (through the mDNS responder implemented by `avahi-daemon').
-        '';
-      };
-
-      hostName = mkOption {
-        default = "nixos";  # XXX: Would be nice to use `networking.hostName'.
-        description = ''Host name advertised on the LAN.'';
-      };
-
-      browseDomains = mkOption {
-        default = [ "0pointer.de" "zeroconf.org" ];
-        description = ''
-          List of non-local DNS domains to be browsed.
-        '';
-      };
-
-      ipv4 = mkOption {
-        default = true;
-        description = ''Whether to use IPv4'';
-      };
-
-      ipv6 = mkOption {
-        default = false;
-        description = ''Whether to use IPv6'';
-      };
-
-      wideArea = mkOption {
-        default = true;
-        description = ''Whether to enable wide-area service discovery.'';
-      };
-
-      publishing = mkOption {
-        default = true;
-        description = ''Whether to allow publishing.'';
-      };
-
-      nssmdns = mkOption {
-        default = false;
-        description = ''
-          Whether to enable the mDNS NSS (Name Service Switch) plug-in.
-          Enabling it allows applications to resolve names in the `.local'
-          domain by transparently querying the Avahi daemon.
-
-          Warning: Currently, enabling this option breaks DNS lookups after
-          a `nixos-rebuild'.  This is because `/etc/nsswitch.conf' is
-          updated to use `nss-mdns' but `libnss_mdns' is not in
-          applications' `LD_LIBRARY_PATH'.  The next time `/etc/profile' is
-          sourced, it will set up an appropriate `LD_LIBRARY_PATH', though.
-        '';
-      };
-    };
-
     bitlbee = {
 
       enable = mkOption {
@@ -1930,19 +1869,6 @@ in
     };
 
 
-    dbus = {
-
-      enable = mkOption {
-        default = true;
-        description = "
-          Whether to start the D-Bus message bus daemon.  It is required
-          by the HAL service.
-        ";
-      };
-
-    };
-
-
     udev = {
 
       addFirmware = mkOption {
@@ -3007,6 +2933,8 @@ root        ALL=(ALL) SETENV: ALL
     (import ../upstart-jobs/pcmcia.nix)
 
     # services
+    (import ../upstart-jobs/avahi-daemon.nix)
+    (import ../upstart-jobs/dbus.nix)
     (import ../upstart-jobs/hal.nix)
     (import ../upstart-jobs/gpm.nix)
     (import ../upstart-jobs/nagios/default.nix)
diff --git a/system/system.nix b/system/system.nix
index 5e831f24425..a102b6f012b 100644
--- a/system/system.nix
+++ b/system/system.nix
@@ -160,7 +160,6 @@ rec {
   ++ pkgs.lib.optional config.security.sudo.enable pkgs.sudo
   ++ pkgs.lib.optional config.services.atd.enable pkgs.at
   ++ pkgs.lib.optional config.services.bitlbee.enable pkgs.bitlbee
-  ++ pkgs.lib.optional config.services.avahi.enable pkgs.avahi
   ++ pkgs.lib.optional config.networking.defaultMailServer.directDelivery pkgs.ssmtp 
   ++ config.environment.extraPackages
   ++ pkgs.lib.optional config.fonts.enableFontDir fontDir
diff --git a/upstart-jobs/avahi-daemon.nix b/upstart-jobs/avahi-daemon.nix
index 5b5ae2d2f65..45146d2a850 100644
--- a/upstart-jobs/avahi-daemon.nix
+++ b/upstart-jobs/avahi-daemon.nix
@@ -1,8 +1,83 @@
-{avahi, config, writeText, lib}:
+# Avahi daemon.
+{pkgs, config}:
 
+###### interface
 let
+  inherit (pkgs.lib) mkOption;
 
-  avahiDaemonConf = with config; writeText "avahi-daemon.conf" ''
+  options = {
+    services = {
+      avahi = {
+
+        enable = mkOption {
+          default = false;
+          description = ''
+            Whether to run the Avahi daemon, which allows Avahi clients
+            to use Avahi's service discovery facilities and also allows
+            the local machine to advertise its presence and services
+            (through the mDNS responder implemented by `avahi-daemon').
+          '';
+        };
+
+        hostName = mkOption {
+          default = "nixos";  # XXX: Would be nice to use `networking.hostName'.
+          description = ''Host name advertised on the LAN.'';
+        };
+
+        browseDomains = mkOption {
+          default = [ "0pointer.de" "zeroconf.org" ];
+          description = ''
+            List of non-local DNS domains to be browsed.
+          '';
+        };
+
+        ipv4 = mkOption {
+          default = true;
+          description = ''Whether to use IPv4'';
+        };
+
+        ipv6 = mkOption {
+          default = false;
+          description = ''Whether to use IPv6'';
+        };
+
+        wideArea = mkOption {
+          default = true;
+          description = ''Whether to enable wide-area service discovery.'';
+        };
+
+        publishing = mkOption {
+          default = true;
+          description = ''Whether to allow publishing.'';
+        };
+
+        nssmdns = mkOption {
+          default = false;
+          description = ''
+            Whether to enable the mDNS NSS (Name Service Switch) plug-in.
+            Enabling it allows applications to resolve names in the `.local'
+            domain by transparently querying the Avahi daemon.
+
+            Warning: Currently, enabling this option breaks DNS lookups after
+            a `nixos-rebuild'.  This is because `/etc/nsswitch.conf' is
+            updated to use `nss-mdns' but `libnss_mdns' is not in
+            applications' `LD_LIBRARY_PATH'.  The next time `/etc/profile' is
+            sourced, it will set up an appropriate `LD_LIBRARY_PATH', though.
+          '';
+        };
+      };
+    };
+  };
+in
+
+###### implementation
+let
+  cfg = config.services.avahi;
+  ifEnable = pkgs.lib.ifEnable cfg.enable;
+
+  inherit (pkgs) avahi writeText lib;
+
+  avahiDaemonConf = with cfg; writeText "avahi-daemon.conf" ''
     [server]
     host-name=${hostName}
     browse-domains=${lib.concatStringsSep ", " browseDomains}
@@ -16,33 +91,74 @@ let
     disable-publishing=${if publishing then "no" else "yes"}
   '';
 
+  user = {
+    name = "avahi";
+    uid = (import ../system/ids.nix).uids.avahi;
+    description = "`avahi-daemon' privilege separation user";
+    home = "/var/empty";
+  };
+
+  group = {
+    name = "avahi";
+    gid = (import ../system/ids.nix).gids.avahi;
+  };
+
+  job = {
+    name = "avahi-daemon";
+
+    job = ''
+      start on network-interfaces/started
+      stop on network-interfaces/stop
+      respawn
+      script
+        export PATH="${avahi}/bin:${avahi}/sbin:$PATH"
+        exec ${avahi}/sbin/avahi-daemon --daemonize -f "${avahiDaemonConf}"
+      end script
+    '';
+  };
 in
 
 {
-  name = "avahi-daemon";
-  
-  users = [
-    { name = "avahi";
-      uid = (import ../system/ids.nix).uids.avahi;
-      description = "`avahi-daemon' privilege separation user";
-      home = "/var/empty";
-    }
+  require = [
+    (import ../upstart-jobs/default.nix) # config.services.extraJobs
+    # (import ../system/?) # system.nssModules
+    # (import ?) # config.environment.etc
+    # (import ../system/user.nix) # users.*
+    # (import ../upstart-jobs/udev.nix) # services.udev.*
+    (import ../upstart-jobs/dbus.nix) # services.dbus.*
+    # (import ?) # config.environment.extraPackages
+    options
   ];
 
-  groups = [
-    { name = "avahi";
-      gid = (import ../system/ids.nix).gids.avahi;
-    }
-  ];
+  system = {
+    nssModules = ifEnable (pkgs.lib.optional
+      cfg.nssmdns pkgs.nssmdns
+    );
+  };
 
-  job = ''
-    start on network-interfaces/started
-    stop on network-interfaces/stop
-    respawn
-    script
-      export PATH="${avahi}/bin:${avahi}/sbin:$PATH"
-      exec ${avahi}/sbin/avahi-daemon --daemonize -f "${avahiDaemonConf}"
-    end script
-  '';
+  environment = {
+    extraPackages = ifEnable [avahi];
+
+    # Name Service Switch configuration file.  Required by the C library.
+    etc = [{
+      source = if cfg.nssmdns
+               then (assert cfg.enable; ../etc/nsswitch-mdns.conf)
+               else ../etc/nsswitch.conf;
+      target = "nsswitch.conf";
+    }];
+  };
+
+  users = {
+    extraUsers = ifEnable [user];
+    extraGroups = ifEnable [group];
+  };
+
+  services = {
+    extraJobs = ifEnable [job];
 
-}
+    dbus = {
+      enable = cfg.enable;
+      services = ifEnable [avahi];
+    };
+  };
+}
\ No newline at end of file
diff --git a/upstart-jobs/dbus.nix b/upstart-jobs/dbus.nix
index a8ce1fddf06..0edb1183bcf 100644
--- a/upstart-jobs/dbus.nix
+++ b/upstart-jobs/dbus.nix
@@ -1,6 +1,40 @@
-{stdenv, dbus, dbusServices ? []}:
+# D-Bus system-wide daemon.
+{pkgs, config}:
 
+###### interface
 let
+  inherit (pkgs.lib) mkOption;
+
+  options = {
+    services = {
+      dbus = {
+
+        enable = mkOption {
+          default = true;
+          description = "
+            Whether to start the D-Bus message bus daemon.  It is required
+            by the HAL service.
+          ";
+          merge = pkgs.lib.mergeEnableOption;
+        };
+
+        services = mkOption {
+          default = [];
+          description = ".. fill me ..";
+        };
+
+      };
+    };
+  };
+in
+
+###### implementation
+let
+  cfg = config.services.dbus;
+  ifEnable = pkgs.lib.ifEnable cfg.enable;
+  services = cfg.services;
+
+  inherit (pkgs) stdenv dbus;
 
   homeDir = "/var/run/dbus";
 
@@ -14,49 +48,66 @@ let
         --replace '<fork/>' ''
 
       ensureDir $out/system.d
-      for i in ${toString dbusServices}; do
+      for i in ${toString services}; do
         ln -s $i/etc/dbus-1/system.d/* $out/system.d/
       done
     ";
   };
 
-in
+  user = {
+    name = "messagebus";
+    uid = (import ../system/ids.nix).uids.messagebus;
+    description = "D-Bus system message bus daemon user";
+    home = homeDir;
+  };
 
-{
-  name = "dbus";
-  
-  users = [
-    { name = "messagebus";
-      uid = (import ../system/ids.nix).uids.messagebus;
-      description = "D-Bus system message bus daemon user";
-      home = homeDir;
-    }
-  ];
+  job = {
+    name = "dbus";
   
-  extraPath = [dbus.daemon dbus.tools];
-  
-  job = ''
-    description "D-Bus system message bus daemon"
+    job = ''
+      description "D-Bus system message bus daemon"
 
-    start on startup
-    stop on shutdown
+      start on startup
+      stop on shutdown
 
-    start script
+      start script
 
-        mkdir -m 0755 -p ${homeDir}
-        chown messagebus ${homeDir}
+          mkdir -m 0755 -p ${homeDir}
+          chown messagebus ${homeDir}
 
-        mkdir -m 0755 -p /var/lib/dbus
-        ${dbus.tools}/bin/dbus-uuidgen --ensure
+          mkdir -m 0755 -p /var/lib/dbus
+          ${dbus.tools}/bin/dbus-uuidgen --ensure
 
-    end script
+      end script
 
-    respawn
+      respawn
 
-    script
-        rm -f ${homeDir}/pid
-        exec ${dbus}/bin/dbus-daemon --config-file=${configFile}/system.conf
-    end script
-  '';
-  
+      script
+          rm -f ${homeDir}/pid
+          exec ${dbus}/bin/dbus-daemon --config-file=${configFile}/system.conf
+      end script
+    '';
+  };
+
+in
+
+{
+  require = [
+    (import ../upstart-jobs/default.nix) # config.services.extraJobs
+    # (import ../system/user.nix) # users.*
+    # (import ?) # config.environment.extraPackages
+    options
+  ];
+
+  environment = {
+    extraPackages = ifEnable [dbus.daemon dbus.tools];
+  };
+
+  users = {
+    extraUsers = ifEnable [user];
+  };
+
+  services = {
+    extraJobs = ifEnable [job];
+  };
 }
diff --git a/upstart-jobs/default.nix b/upstart-jobs/default.nix
index cb2035c66dc..490424b0c6d 100644
--- a/upstart-jobs/default.nix
+++ b/upstart-jobs/default.nix
@@ -272,13 +272,6 @@ let
       inherit (pkgs) makePortmap;
      })
 
-  # Avahi daemon.
-  ++ optional config.services.avahi.enable
-    (import ../upstart-jobs/avahi-daemon.nix {
-      inherit (pkgs) avahi writeText lib;
-      config = config.services.avahi;
-    })
-
   # X server.
   ++ optional config.services.xserver.enable
     (import ../upstart-jobs/xserver.nix {
@@ -388,18 +381,6 @@ let
       inherit (pkgs) alsaUtils;
     })
 
-  # D-Bus system-wide daemon.
-  ++ optional config.services.dbus.enable
-    (import ../upstart-jobs/dbus.nix {
-      inherit (pkgs) stdenv dbus;
-      dbusServices =
-        # add config.services.dbus.services
-        pkgs.lib.optional config.services.hal.enable pkgs.hal ++
-        pkgs.lib.optional config.services.avahi.enable pkgs.avahi ++
-        pkgs.lib.optional config.services.disnix.enable pkgs.disnix
-        ;
-    })
-
   # Postfix mail server.
   ++ optional config.services.postfix.enable
     (import ../upstart-jobs/postfix.nix {
diff --git a/upstart-jobs/disnix.nix b/upstart-jobs/disnix.nix
index 1d387d93b6d..19ad3d0dcf9 100644
--- a/upstart-jobs/disnix.nix
+++ b/upstart-jobs/disnix.nix
@@ -30,6 +30,7 @@ in
 ###### implementation
 let
   cfg = config.services.disnix;
+  ifEnable = pkgs.lib.ifEnable cfg.enable;
 
   job = {
     name = "disnix";
@@ -53,10 +54,16 @@ in
 {
   require = [
     (import ../upstart-jobs/default.nix)
+    (import ../upstart-jobs/dbus.nix) # services.dbus.*
     options
   ];
 
   services = {
-    extraJobs = pkgs.lib.optional cfg.enable job;
+    extraJobs = ifEnable [job];
+
+    dbus = {
+      enable = cfg.enable;
+      services = ifEnable [pkgs.disnix];
+    };
   };
 }
diff --git a/upstart-jobs/hal.nix b/upstart-jobs/hal.nix
index b3f4e56f577..cd9d751d81a 100644
--- a/upstart-jobs/hal.nix
+++ b/upstart-jobs/hal.nix
@@ -66,7 +66,7 @@ in
     (import ../upstart-jobs/default.nix) # config.services.extraJobs
     # (import ../system/user.nix) # users.*
     # (import ../upstart-jobs/udev.nix) # services.udev.*
-    # (import ../upstart-jobs/dbus.nix) # services.dbus.*
+    (import ../upstart-jobs/dbus.nix) # services.dbus.*
     # (import ?) # config.environment.extraPackages
     options
   ];
@@ -89,7 +89,7 @@ in
 
     dbus = {
       enable = cfg.enable;
-      # services = ifEnable [hal];
+      services = ifEnable [hal];
     };
   };
 }
-- 
GitLab


From 157bb2b71a790d6c1f104a6ca514ae1c14e447b9 Mon Sep 17 00:00:00 2001
From: Nicolas Pierron <nicolas.b.pierron@gmail.com>
Date: Sun, 23 Nov 2008 01:29:05 +0000
Subject: [PATCH 1113/5331] Convert "alsa" upstart-job to the fix-style.

svn path=/nixos/branches/fix-style/; revision=13379
---
 system/options.nix       |  15 ++----
 upstart-jobs/alsa.nix    | 100 +++++++++++++++++++++++++++------------
 upstart-jobs/default.nix |   7 ---
 3 files changed, 74 insertions(+), 48 deletions(-)

diff --git a/system/options.nix b/system/options.nix
index 7299af54443..7ad09b1deb3 100644
--- a/system/options.nix
+++ b/system/options.nix
@@ -2781,18 +2781,6 @@ root        ALL=(ALL) SETENV: ALL
   };
 
 
-  sound = {
-
-    enable = mkOption {
-      default = true;
-      description = "
-        Whether to enable ALSA sound.
-      ";
-    };
-
-  };
-
-
   i18n = {
 
     defaultLocale = mkOption {
@@ -2943,5 +2931,8 @@ root        ALL=(ALL) SETENV: ALL
     (import ../upstart-jobs/disnix.nix)
     (import ../upstart-jobs/cron.nix)
     (import ../upstart-jobs/cron/locate.nix)
+
+    # sound
+    (import ../upstart-jobs/alsa.nix)
   ];
 }
diff --git a/upstart-jobs/alsa.nix b/upstart-jobs/alsa.nix
index df6f632973c..d5cb327d611 100644
--- a/upstart-jobs/alsa.nix
+++ b/upstart-jobs/alsa.nix
@@ -1,50 +1,92 @@
-{modprobe, alsaUtils}:
+# ALSA sound support.
+{pkgs, config}:
 
+###### interface
 let
+  inherit (pkgs.lib) mkOption;
 
-  soundState = "/var/lib/alsa/asound.state";
+  options = {
+    sound = {
+
+      enable = mkOption {
+        default = true;
+        description = "
+          Whether to enable ALSA sound.
+        ";
+        merge = pkgs.lib.mergeEnableOption;
+      };
 
+    };
+  };
 in
-  
-{
-  name = "alsa";
 
-  extraPath = [alsaUtils];
+###### implementation
+let
+  ifEnable = pkgs.lib.ifEnable config.sound.enable;
+
+  # dangerous !
+  modprobe = config.system.sbin.modprobe;
+  inherit (pkgs) alsaUtils;
+
+  soundState = "/var/lib/alsa/asound.state";
 
   # Alsalib seems to require the existence of this group, even if it's
   # not used (e.g., doesn't own any devices).
-  groups = [
-    { name = "audio";
-      gid = (import ../system/ids.nix).gids.audio;
-    }
-  ];
+  group = {
+    name = "audio";
+    gid = (import ../system/ids.nix).gids.audio;
+  };
 
-  job = ''
-    start on udev
-    stop on shutdown
+  job = {
+    name = "alsa";
 
-    start script
+    job = ''
+      start on udev
+      stop on shutdown
 
-        mkdir -m 0755 -p $(dirname ${soundState})
+      start script
 
-        # Load some additional modules.
-        for mod in snd_pcm_oss; do
-            ${modprobe}/sbin/modprobe $mod || true
-        done
+          mkdir -m 0755 -p $(dirname ${soundState})
 
-        # Restore the sound state.
-        ${alsaUtils}/sbin/alsactl -f ${soundState} restore
+          # Load some additional modules.
+          for mod in snd_pcm_oss; do
+              ${modprobe}/sbin/modprobe $mod || true
+          done
 
-    end script
+          # Restore the sound state.
+          ${alsaUtils}/sbin/alsactl -f ${soundState} restore
 
-    respawn sleep 1000000 # !!! hack
+      end script
 
-    stop script
+      respawn sleep 1000000 # !!! hack
+
+      stop script
+
+          # Save the sound state.
+          ${alsaUtils}/sbin/alsactl -f ${soundState} store
+
+      end script
+    '';
+  };
+in
+
+{
+  require = [
+    (import ../upstart-jobs/default.nix) # config.services.extraJobs
+    # (import ../system/user.nix) # users.*
+    # (import ?) # config.environment.extraPackages
+    options
+  ];
 
-        # Save the sound state.
-        ${alsaUtils}/sbin/alsactl -f ${soundState} store
+  environment = {
+    extraPackages = ifEnable [alsaUtils];
+  };
 
-    end script
-  '';
+  users = {
+    extraGroups = ifEnable [group];
+  };
 
+  services = {
+    extraJobs = ifEnable [job];
+  };
 }
diff --git a/upstart-jobs/default.nix b/upstart-jobs/default.nix
index 490424b0c6d..fe1cad6195e 100644
--- a/upstart-jobs/default.nix
+++ b/upstart-jobs/default.nix
@@ -374,13 +374,6 @@ let
       inherit (config.services.bitlbee) portNumber interface;
     })
 
-  # ALSA sound support.
-  ++ optional config.sound.enable
-    (import ../upstart-jobs/alsa.nix {
-      inherit modprobe;
-      inherit (pkgs) alsaUtils;
-    })
-
   # Postfix mail server.
   ++ optional config.services.postfix.enable
     (import ../upstart-jobs/postfix.nix {
-- 
GitLab


From 3b2016569a5ff4fece1a7c0274386e3b47715d84 Mon Sep 17 00:00:00 2001
From: Nicolas Pierron <nicolas.b.pierron@gmail.com>
Date: Sun, 23 Nov 2008 01:29:13 +0000
Subject: [PATCH 1114/5331] Replace some ${nixpkgsPath}/pkgs by ${pkgs.path}.

svn path=/nixos/branches/fix-style/; revision=13380
---
 boot/boot-stage-1.nix | 12 ++++++------
 installer/default.nix |  4 ++--
 system/system.nix     |  4 ++--
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/boot/boot-stage-1.nix b/boot/boot-stage-1.nix
index c26c8d1a096..33fa668e080 100644
--- a/boot/boot-stage-1.nix
+++ b/boot/boot-stage-1.nix
@@ -4,28 +4,28 @@
 # calls the init in the root file system to start the second boot
 # stage.
 
-{ pkgs, config, nixpkgsPath, kernelPackages, modulesTree }:
+{ pkgs, config, kernelPackages, modulesTree }:
 
 rec {
 
-  pkgsDiet = import "${nixpkgsPath}/pkgs/top-level/all-packages.nix" {
+  pkgsDiet = import "${pkgs.path}/top-level/all-packages.nix" {
     system = pkgs.stdenv.system;
     bootStdenv = pkgs.useDietLibC pkgs.stdenv;
   };
 
-  pkgsKlibc = import "${nixpkgsPath}/pkgs/top-level/all-packages.nix" {
+  pkgsKlibc = import "${pkgs.path}/top-level/all-packages.nix" {
     system = pkgs.stdenv.system;
     bootStdenv = pkgs.useKlibc pkgs.stdenv kernelPackages.klibc;
   };
 
-  pkgsStatic = import "${nixpkgsPath}/pkgs/top-level/all-packages.nix" {
+  pkgsStatic = import "${pkgs.path}/top-level/all-packages.nix" {
     system = pkgs.stdenv.system;
     bootStdenv = pkgs.makeStaticBinaries pkgs.stdenv;
   };
 
-  stdenvLinuxStuff = import "${nixpkgsPath}/pkgs/stdenv/linux" {
+  stdenvLinuxStuff = import "${pkgs.path}/stdenv/linux" {
     system = pkgs.stdenv.system;
-    allPackages = import "${nixpkgsPath}/pkgs/top-level/all-packages.nix";
+    allPackages = import "${pkgs.path}/top-level/all-packages.nix";
   };
   
 
diff --git a/installer/default.nix b/installer/default.nix
index bf6f6ee81b9..dfa2ab38eeb 100644
--- a/installer/default.nix
+++ b/installer/default.nix
@@ -1,4 +1,4 @@
-{pkgs, config, nix, nixpkgsPath}:
+{pkgs, config, nix}:
 
 let
 
@@ -25,7 +25,7 @@ in
     inherit nix;
     nixpkgsURL = config.installer.nixpkgsURL;
 
-    pathsFromGraph = "${nixpkgsPath}/pkgs/build-support/kernel/paths-from-graph.pl";
+    pathsFromGraph = "${pkgs.path}/build-support/kernel/paths-from-graph.pl";
 
     nixClosure = pkgs.runCommand "closure"
       {exportReferencesGraph = ["refs" nix];}
diff --git a/system/system.nix b/system/system.nix
index a102b6f012b..b79278d2a72 100644
--- a/system/system.nix
+++ b/system/system.nix
@@ -41,7 +41,7 @@ rec {
 
   # The initial ramdisk.
   initialRamdiskStuff = import ../boot/boot-stage-1.nix {
-    inherit pkgs config nixpkgsPath kernelPackages modulesTree;
+    inherit pkgs config kernelPackages modulesTree;
   };
 
   initialRamdisk = initialRamdiskStuff.initialRamdisk;
@@ -49,7 +49,7 @@ rec {
 
   # NixOS installation/updating tools.
   nixosTools = import ../installer {
-    inherit pkgs config nix nixpkgsPath;
+    inherit pkgs config nix;
   };
 
 
-- 
GitLab


From 205a7431accc54aa97807dc8895a983b0d709e5a Mon Sep 17 00:00:00 2001
From: Nicolas Pierron <nicolas.b.pierron@gmail.com>
Date: Sun, 23 Nov 2008 01:29:20 +0000
Subject: [PATCH 1115/5331] Remove extra arguments comming from config.*.

svn path=/nixos/branches/fix-style/; revision=13381
---
 boot/boot-stage-1.nix | 7 ++++++-
 etc/default.nix       | 6 +++++-
 installer/default.nix | 4 +++-
 system/system.nix     | 7 +++----
 4 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/boot/boot-stage-1.nix b/boot/boot-stage-1.nix
index 33fa668e080..8a5b0a76a3a 100644
--- a/boot/boot-stage-1.nix
+++ b/boot/boot-stage-1.nix
@@ -4,7 +4,12 @@
 # calls the init in the root file system to start the second boot
 # stage.
 
-{ pkgs, config, kernelPackages, modulesTree }:
+{pkgs, config}:
+
+let
+  kernelPackages = config.boot.kernelPackages;
+  modulesTree = config.system.modulesTree;
+in
 
 rec {
 
diff --git a/etc/default.nix b/etc/default.nix
index 9a168f19f6a..de5d6bbd9ad 100644
--- a/etc/default.nix
+++ b/etc/default.nix
@@ -1,8 +1,12 @@
 { config, pkgs, systemPath, wrapperDir
-, defaultShell, extraEtc, nixEnvVars, modulesTree, nssModulesPath
+, defaultShell
 }:
 
 let 
+  extraEtc = config.environment.etc;
+  nixEnvVars = config.nix.envVars;
+  modulesTree = config.system.modulesTree;
+  nssModulesPath = config.system.nssModules.path;
 
 
   optional = pkgs.lib.optional;
diff --git a/installer/default.nix b/installer/default.nix
index dfa2ab38eeb..f6f1f920574 100644
--- a/installer/default.nix
+++ b/installer/default.nix
@@ -1,7 +1,9 @@
-{pkgs, config, nix}:
+{pkgs, config}:
 
 let
 
+  nix = config.environment.nix;
+
   makeProg = args: pkgs.substituteAll (args // {
     dir = "bin";
     isExecutable = true;
diff --git a/system/system.nix b/system/system.nix
index b79278d2a72..659b647829d 100644
--- a/system/system.nix
+++ b/system/system.nix
@@ -41,7 +41,7 @@ rec {
 
   # The initial ramdisk.
   initialRamdiskStuff = import ../boot/boot-stage-1.nix {
-    inherit pkgs config kernelPackages modulesTree;
+    inherit pkgs config;
   };
 
   initialRamdisk = initialRamdiskStuff.initialRamdisk;
@@ -49,7 +49,7 @@ rec {
 
   # NixOS installation/updating tools.
   nixosTools = import ../installer {
-    inherit pkgs config nix;
+    inherit pkgs config;
   };
 
 
@@ -70,8 +70,7 @@ rec {
   # The static parts of /etc.
   etc = import ../etc/default.nix {
     inherit config pkgs systemPath wrapperDir
-      defaultShell nixEnvVars modulesTree nssModulesPath;
-    extraEtc = config.environment.etc;
+      defaultShell;
   };
 
   
-- 
GitLab


From 1236cf61f42a3de41c520b5e06bec0a91c8fe593 Mon Sep 17 00:00:00 2001
From: Nicolas Pierron <nicolas.b.pierron@gmail.com>
Date: Sun, 23 Nov 2008 01:29:25 +0000
Subject: [PATCH 1116/5331] replace ifEnable by mkIf and mkThenElse.

svn path=/nixos/branches/fix-style/; revision=13382
---
 upstart-jobs/alsa.nix           | 10 ++++-----
 upstart-jobs/avahi-daemon.nix   | 39 ++++++++++++++++++---------------
 upstart-jobs/dbus.nix           | 10 ++++-----
 upstart-jobs/disnix.nix         | 10 ++++-----
 upstart-jobs/gpm.nix            |  6 ++---
 upstart-jobs/hal.nix            | 18 +++++++--------
 upstart-jobs/nagios/default.nix | 23 ++++++++++---------
 upstart-jobs/pcmcia.nix         | 21 +++++++++---------
 8 files changed, 70 insertions(+), 67 deletions(-)

diff --git a/upstart-jobs/alsa.nix b/upstart-jobs/alsa.nix
index d5cb327d611..08591d04fd7 100644
--- a/upstart-jobs/alsa.nix
+++ b/upstart-jobs/alsa.nix
@@ -22,7 +22,7 @@ in
 
 ###### implementation
 let
-  ifEnable = pkgs.lib.ifEnable config.sound.enable;
+  inherit (pkgs.lib) mkIf;
 
   # dangerous !
   modprobe = config.system.sbin.modprobe;
@@ -70,7 +70,7 @@ let
   };
 in
 
-{
+mkIf config.sound.enable {
   require = [
     (import ../upstart-jobs/default.nix) # config.services.extraJobs
     # (import ../system/user.nix) # users.*
@@ -79,14 +79,14 @@ in
   ];
 
   environment = {
-    extraPackages = ifEnable [alsaUtils];
+    extraPackages = [alsaUtils];
   };
 
   users = {
-    extraGroups = ifEnable [group];
+    extraGroups = [group];
   };
 
   services = {
-    extraJobs = ifEnable [job];
+    extraJobs = [job];
   };
 }
diff --git a/upstart-jobs/avahi-daemon.nix b/upstart-jobs/avahi-daemon.nix
index 45146d2a850..b3de2b52401 100644
--- a/upstart-jobs/avahi-daemon.nix
+++ b/upstart-jobs/avahi-daemon.nix
@@ -73,7 +73,7 @@ in
 ###### implementation
 let
   cfg = config.services.avahi;
-  ifEnable = pkgs.lib.ifEnable cfg.enable;
+  inherit (pkgs.lib) mkIf mkThenElse;
 
   inherit (pkgs) avahi writeText lib;
 
@@ -118,7 +118,7 @@ let
   };
 in
 
-{
+mkIf cfg.enable {
   require = [
     (import ../upstart-jobs/default.nix) # config.services.extraJobs
     # (import ../system/?) # system.nssModules
@@ -131,34 +131,37 @@ in
   ];
 
   system = {
-    nssModules = ifEnable (pkgs.lib.optional
-      cfg.nssmdns pkgs.nssmdns
-    );
+    nssModules = pkgs.lib.optional cfg.nssmdns pkgs.nssmdns;
   };
 
   environment = {
-    extraPackages = ifEnable [avahi];
+    extraPackages = [avahi];
 
     # Name Service Switch configuration file.  Required by the C library.
-    etc = [{
-      source = if cfg.nssmdns
-               then (assert cfg.enable; ../etc/nsswitch-mdns.conf)
-               else ../etc/nsswitch.conf;
-      target = "nsswitch.conf";
-    }];
+    etc = mkIf cfg.nssmdns (mkThenElse {
+      thenPart = [{
+        source = ../etc/nsswitch-mdns.conf;
+        target = "nsswitch.conf";
+      }];
+
+      elsePart = [{
+        source = ../etc/nsswitch.conf;
+        target = "nsswitch.conf";
+      }];
+    });
   };
 
   users = {
-    extraUsers = ifEnable [user];
-    extraGroups = ifEnable [group];
+    extraUsers = [user];
+    extraGroups = [group];
   };
 
   services = {
-    extraJobs = ifEnable [job];
+    extraJobs = [job];
 
     dbus = {
-      enable = cfg.enable;
-      services = ifEnable [avahi];
+      enable = true;
+      services = [avahi];
     };
   };
-}
\ No newline at end of file
+}
diff --git a/upstart-jobs/dbus.nix b/upstart-jobs/dbus.nix
index 0edb1183bcf..1b2b0d344f7 100644
--- a/upstart-jobs/dbus.nix
+++ b/upstart-jobs/dbus.nix
@@ -31,8 +31,8 @@ in
 ###### implementation
 let
   cfg = config.services.dbus;
-  ifEnable = pkgs.lib.ifEnable cfg.enable;
   services = cfg.services;
+  inherit (pkgs.lib) mkIf;
 
   inherit (pkgs) stdenv dbus;
 
@@ -91,7 +91,7 @@ let
 
 in
 
-{
+mkIf cfg.enable {
   require = [
     (import ../upstart-jobs/default.nix) # config.services.extraJobs
     # (import ../system/user.nix) # users.*
@@ -100,14 +100,14 @@ in
   ];
 
   environment = {
-    extraPackages = ifEnable [dbus.daemon dbus.tools];
+    extraPackages = [dbus.daemon dbus.tools];
   };
 
   users = {
-    extraUsers = ifEnable [user];
+    extraUsers = [user];
   };
 
   services = {
-    extraJobs = ifEnable [job];
+    extraJobs = [job];
   };
 }
diff --git a/upstart-jobs/disnix.nix b/upstart-jobs/disnix.nix
index 19ad3d0dcf9..b87784ec067 100644
--- a/upstart-jobs/disnix.nix
+++ b/upstart-jobs/disnix.nix
@@ -30,7 +30,7 @@ in
 ###### implementation
 let
   cfg = config.services.disnix;
-  ifEnable = pkgs.lib.ifEnable cfg.enable;
+  inherit (pkgs.lib) mkIf;
 
   job = {
     name = "disnix";
@@ -51,7 +51,7 @@ let
   };
 in
 
-{
+mkIf cfg.enable {
   require = [
     (import ../upstart-jobs/default.nix)
     (import ../upstart-jobs/dbus.nix) # services.dbus.*
@@ -59,11 +59,11 @@ in
   ];
 
   services = {
-    extraJobs = ifEnable [job];
+    extraJobs = [job];
 
     dbus = {
-      enable = cfg.enable;
-      services = ifEnable [pkgs.disnix];
+      enable = true;
+      services = [pkgs.disnix];
     };
   };
 }
diff --git a/upstart-jobs/gpm.nix b/upstart-jobs/gpm.nix
index ca55f1c8362..74aa8b84c8f 100644
--- a/upstart-jobs/gpm.nix
+++ b/upstart-jobs/gpm.nix
@@ -27,7 +27,7 @@ in
 ###### implementation
 let
   cfg = config.services.gpm;
-  ifEnable = pkgs.lib.ifEnable cfg.enable;
+  inherit (pkgs.lib) mkIf;
 
   gpm = pkgs.gpm;
   gpmBin = "${gpm}/sbin/gpm";
@@ -45,7 +45,7 @@ let
   };
 in
 
-{
+mkIf cfg.enable {
   require = [
     (import ../upstart-jobs/default.nix) # config.services.extraJobs
     # /etc/security/console.perms (should be generated ?)
@@ -53,6 +53,6 @@ in
   ];
 
   services = {
-    extraJobs = ifEnable [job];
+    extraJobs = [job];
   };
 }
diff --git a/upstart-jobs/hal.nix b/upstart-jobs/hal.nix
index cd9d751d81a..56e82a7c05e 100644
--- a/upstart-jobs/hal.nix
+++ b/upstart-jobs/hal.nix
@@ -22,7 +22,7 @@ in
 ###### implementation
 let
   cfg = config.services.hal;
-  ifEnable = pkgs.lib.ifEnable cfg.enable;
+  inherit (pkgs.lib) mkIf;
 
   inherit (pkgs) hal;
 
@@ -61,7 +61,7 @@ let
   };
 in
 
-{
+mkIf cfg.enable {
   require = [
     (import ../upstart-jobs/default.nix) # config.services.extraJobs
     # (import ../system/user.nix) # users.*
@@ -72,24 +72,24 @@ in
   ];
 
   environment = {
-    extraPackages = ifEnable [hal];
+    extraPackages = [hal];
   };
 
   users = {
-    extraUsers = ifEnable [user];
-    extraGroups = ifEnable [group];
+    extraUsers = [user];
+    extraGroups = [group];
   };
 
   services = {
-    extraJobs = ifEnable [job];
+    extraJobs = [job];
 
     udev = {
-      addUdevPkgs = ifEnable [hal];
+      addUdevPkgs = [hal];
     };
 
     dbus = {
-      enable = cfg.enable;
-      services = ifEnable [hal];
+      enable = true;
+      services = [hal];
     };
   };
 }
diff --git a/upstart-jobs/nagios/default.nix b/upstart-jobs/nagios/default.nix
index f8294b203c6..bbd56a89442 100644
--- a/upstart-jobs/nagios/default.nix
+++ b/upstart-jobs/nagios/default.nix
@@ -59,6 +59,7 @@ in
 ###### implementation
 let
   cfg = config.services.nagios;
+  inherit (pkgs.lib) mkIf mkThenElse;
 
   nagiosUser = "nagios";
   nagiosGroup = "nogroup";
@@ -170,11 +171,9 @@ let
       end script
     ";
   };
-
-  ifEnable = pkgs.lib.ifEnable cfg.enable;
 in
 
-{
+mkIf cfg.enable {
   require = [
     (import ../../upstart-jobs/default.nix) # config.services.extraJobs
     # (import ../../system/user.nix) # users = { .. }
@@ -187,27 +186,27 @@ in
   environment = {
     # This isn't needed, it's just so that the user can type "nagiostats
     # -c /etc/nagios.cfg".
-    etc = ifEnable [
+    etc = [
       { source = nagiosCfgFile;
         target = "nagios.cfg";
       }
     ];
 
-    extraPackages = ifEnable [pkgs.nagios];
+    extraPackages = [pkgs.nagios];
   };
 
   users = {
-    extraUsers = ifEnable [user];
+    extraUsers = [user];
   };
 
   services = {
-    extraJobs = ifEnable [job];
+    extraJobs = [job];
 
-    httpd = {
-      extraConfig = # ifEnable does not handle strings yet.
-        if cfg.enable && cfg.enableWebInterface
-        then extraHttpdConfig
-        else "";
+    httpd = mkIf cfg.enableWebInterface {
+      extraConfig = mkThenElse {
+        thenPart = extraHttpdConfig;
+        elsePart = "";
+      };
     };
   };
 }
diff --git a/upstart-jobs/pcmcia.nix b/upstart-jobs/pcmcia.nix
index 77db881856e..5b2d7a43d97 100644
--- a/upstart-jobs/pcmcia.nix
+++ b/upstart-jobs/pcmcia.nix
@@ -38,31 +38,32 @@ in
 
 ###### implementation
 let
-  ifEnable = arg:
-    if config.hardware.pcmcia.enable then arg
-    else if builtins.isList arg then []
-    else if builtins.isAttrs arg then {}
-    else null;
+  inherit (pkgs.lib) mkIf;
 
   pcmciaUtils = pkgs.pcmciaUtils.passthru.function {
     inherit (config.hardware.pcmcia) firmware config;
   };
 in
 
-{
-  require = options;
+
+mkIf config.hardware.pcmcia.enable {
+  require = [
+    # (import ../upstart-jobs/udev.nix)
+    # (import ?) # config.environment.extraPackages
+    options
+  ];
 
   boot = {
-    kernelModules = ifEnable [ "pcmcia" ];
+    kernelModules = [ "pcmcia" ];
   };
 
   services = {
     udev = {
-      addUdevPkgs = ifEnable [ pcmciaUtils ];
+      addUdevPkgs = [ pcmciaUtils ];
     };
   };
 
   environment = {
-    extraPackages = ifEnable [ pcmciaUtils ];
+    extraPackages = [ pcmciaUtils ];
   };
 }
-- 
GitLab


From 9fefbf137990bddfb23e2783cc48c2a2d2340a0c Mon Sep 17 00:00:00 2001
From: Marc Weber <marco-oweber@gmx.de>
Date: Mon, 24 Nov 2008 09:07:28 +0000
Subject: [PATCH 1117/5331] add ifEnable to fcron job

svn path=/nixos/trunk/; revision=13383
---
 upstart-jobs/fcron.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/upstart-jobs/fcron.nix b/upstart-jobs/fcron.nix
index 73fff134693..fd7f2f05360 100644
--- a/upstart-jobs/fcron.nix
+++ b/upstart-jobs/fcron.nix
@@ -59,6 +59,7 @@ let
   #systemCronJobs =
   #  config.services.cron.systemCronJobs;
   cfg = config.services.fcron;
+  ifEnabled = if cfg.enable then pkgs.lib.id else (x : []);
   queuelen = if cfg.queuelen == "" then "" else "-q ${toString cfg.queuelen}";
 
   # shell is set to /sh in config..
@@ -87,7 +88,7 @@ in
   ];
 
   environment = {
-    etc = [
+    etc = ifEnabled [
       (allowdeny "allow" (["root"] ++ cfg.allow))
       (allowdeny "deny" cfg.deny)
       # see man 5 fcron.conf
@@ -113,7 +114,7 @@ in
   };
 
   services = {
-    extraJobs = [{
+    extraJobs = ifEnabled [{
       name = "fcron";
 
       job = ''
-- 
GitLab


From e39be7a088a6af5922433a326a2cc560540ff0e4 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 25 Nov 2008 00:05:08 +0000
Subject: [PATCH 1118/5331] * Commented out the fcron job - for some reason it
 starts to build fcron   even though it should be disabled by default, and the
 build fails.   Strange...

svn path=/nixos/trunk/; revision=13394
---
 system/options.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/system/options.nix b/system/options.nix
index 64bee0fa878..3574d0fb8eb 100644
--- a/system/options.nix
+++ b/system/options.nix
@@ -3035,7 +3035,7 @@ root        ALL=(ALL) SETENV: ALL
 
     # services
     (import ../upstart-jobs/cron.nix)
-    (import ../upstart-jobs/fcron.nix)
+    #(import ../upstart-jobs/fcron.nix)
     (import ../upstart-jobs/cron/locate.nix)
   ];
 }
-- 
GitLab


From 23551d0a4dbf2419a3a4534bc77411c1acdb9e07 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Tue, 25 Nov 2008 18:00:25 +0000
Subject: [PATCH 1119/5331] some modules..

svn path=/nixos/trunk/; revision=13419
---
 installer/cd-dvd/closed-install.nix         | 1 +
 installer/cd-dvd/rescue-cd-configurable.nix | 1 -
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/installer/cd-dvd/closed-install.nix b/installer/cd-dvd/closed-install.nix
index d7544ff22b8..e7443719f60 100644
--- a/installer/cd-dvd/closed-install.nix
+++ b/installer/cd-dvd/closed-install.nix
@@ -70,4 +70,5 @@ in
           ""
           ["nix-reduce-build" "nix-http-export.cgi"]
           ["--with-docbook-xsl=\\\${pkgs.docbook5_xsl}/xml/xsl/docbook/"];
+	extraInitrdKernelModules = ["usb_storage" "ehci_hcd" "ohci_hcd" "iso9660" "ext3"];
 }).rescueCD
diff --git a/installer/cd-dvd/rescue-cd-configurable.nix b/installer/cd-dvd/rescue-cd-configurable.nix
index a00164a2088..e727d2d1f2d 100644
--- a/installer/cd-dvd/rescue-cd-configurable.nix
+++ b/installer/cd-dvd/rescue-cd-configurable.nix
@@ -153,7 +153,6 @@ rec {
       kernelModules = bootKernelModules;
       extraModulePackages = ((extraModulePackages pkgs)
       ++(if aufs then [(kernelPackages pkgs).aufs] else [])
-      ++(pkgs.lib.optional intel3945FWEnable (kernelPackages pkgs).iwlwifi)
       );
     };
     
-- 
GitLab


From be02b8a87a2c59b9ef5282f8567f15118f6ddf7f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Wed, 26 Nov 2008 13:16:59 +0000
Subject: [PATCH 1120/5331] Use `iwlwifi4965ucode' from `kernelPackages'.

svn path=/nixos/trunk/; revision=13430
---
 upstart-jobs/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/upstart-jobs/default.nix b/upstart-jobs/default.nix
index 87833f09ed9..ff5dc633323 100644
--- a/upstart-jobs/default.nix
+++ b/upstart-jobs/default.nix
@@ -94,7 +94,7 @@ let
       firmwareDirs =
            pkgs.lib.optional config.networking.enableIntel2200BGFirmware pkgs.ipw2200fw
         ++ pkgs.lib.optional config.networking.enableIntel3945ABGFirmware pkgs.iwlwifi3945ucode
-        ++ pkgs.lib.optional config.networking.enableIntel4965AGNFirmware pkgs.iwlwifi4965ucode
+        ++ pkgs.lib.optional config.networking.enableIntel4965AGNFirmware kernelPackages.iwlwifi4965ucode
         ++ pkgs.lib.optional config.networking.enableZydasZD1211Firmware pkgs.zd1211fw
         ++ pkgs.lib.optional config.hardware.enableGo7007 "${kernelPackages.wis_go7007}/firmware"
         ++ config.services.udev.addFirmware;
-- 
GitLab


From d02e5811920b60ea9ef5c95e882be1ab9f211fd2 Mon Sep 17 00:00:00 2001
From: Marc Weber <marco-oweber@gmx.de>
Date: Wed, 26 Nov 2008 14:38:35 +0000
Subject: [PATCH 1121/5331] fix: FCRON should no longer be build by default

svn path=/nixos/trunk/; revision=13436
---
 system/options.nix     | 2 +-
 upstart-jobs/fcron.nix | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/system/options.nix b/system/options.nix
index 3574d0fb8eb..64bee0fa878 100644
--- a/system/options.nix
+++ b/system/options.nix
@@ -3035,7 +3035,7 @@ root        ALL=(ALL) SETENV: ALL
 
     # services
     (import ../upstart-jobs/cron.nix)
-    #(import ../upstart-jobs/fcron.nix)
+    (import ../upstart-jobs/fcron.nix)
     (import ../upstart-jobs/cron/locate.nix)
   ];
 }
diff --git a/upstart-jobs/fcron.nix b/upstart-jobs/fcron.nix
index fd7f2f05360..97d259c65e1 100644
--- a/upstart-jobs/fcron.nix
+++ b/upstart-jobs/fcron.nix
@@ -107,10 +107,10 @@ in
       }
     ];
 
-    extraPackages =
+    extraPackages = ifEnabled (
       pkgs.lib.optional
         (!config.environment.cleanStart)
-        pkgs.fcron;
+        pkgs.fcron);
   };
 
   services = {
-- 
GitLab


From 3919a289719fd493f7f683ea0e5404f9c16c4136 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Thu, 27 Nov 2008 15:30:25 +0000
Subject: [PATCH 1122/5331] Add `host' to `systemPathList'.

svn path=/nixos/trunk/; revision=13462
---
 system/system.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/system/system.nix b/system/system.nix
index eaa26cdea56..9a17ef6fccd 100644
--- a/system/system.nix
+++ b/system/system.nix
@@ -185,6 +185,7 @@ rec {
     pkgs.gnutar
     pkgs.grub
     pkgs.gzip
+    pkgs.host
     pkgs.iputils
     pkgs.less
     pkgs.lvm2
-- 
GitLab


From 7ebc1821f932b2d808b373d7254b307a4db7f1aa Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Thu, 27 Nov 2008 20:35:26 +0000
Subject: [PATCH 1123/5331] Fixing build for new kernels when Intel WiFi
 firmware is used

svn path=/nixos/trunk/; revision=13470
---
 system/system.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/system/system.nix b/system/system.nix
index 9a17ef6fccd..fa49383e048 100644
--- a/system/system.nix
+++ b/system/system.nix
@@ -43,7 +43,8 @@ rec {
   # directory.
   modulesTree = pkgs.aggregateModules (
     [kernel]
-    ++ pkgs.lib.optional ((config.networking.enableIntel3945ABGFirmware || config.networking.enableIntel4965AGNFirmware) && !kernel.features ? iwlwifi) kernelPackages.iwlwifi
+    # Merged into mainline kernel
+    # ++ pkgs.lib.optional ((config.networking.enableIntel3945ABGFirmware || config.networking.enableIntel4965AGNFirmware) && !kernel.features ? iwlwifi) kernelPackages.iwlwifi
     # !!! this should be declared by the xserver Upstart job.
     ++ pkgs.lib.optional (config.services.xserver.enable && config.services.xserver.videoDriver == "nvidia") kernelPackages.nvidiaDrivers
     ++ pkgs.lib.optional config.hardware.enableGo7007 kernelPackages.wis_go7007
-- 
GitLab


From 477ea7015c8e50dc07fcb20af67c22152cf94470 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Fri, 28 Nov 2008 12:03:56 +0000
Subject: [PATCH 1124/5331] boot-stage-1: Don't run `fsck' when on battery
 power.

svn path=/nixos/trunk/; revision=13484
---
 boot/boot-stage-1-init.sh | 61 +++++++++++++++++++++++++++------------
 1 file changed, 43 insertions(+), 18 deletions(-)

diff --git a/boot/boot-stage-1-init.sh b/boot/boot-stage-1-init.sh
index 0ddf6bb7eae..c6d7214028c 100644
--- a/boot/boot-stage-1-init.sh
+++ b/boot/boot-stage-1-init.sh
@@ -138,6 +138,26 @@ fi
 if test -n "$debug1devices"; then fail; fi
 
 
+# Return true if the machine is on AC power, or if we can't determine
+# whether it's on AC power.
+onACPower () {
+    if test -d "/proc/acpi/battery"; then
+	if ls /proc/acpi/battery/BAT[0-9]* > /dev/null 2>&1; then
+	    if cat /proc/acpi/battery/BAT*/state	\
+	       | grep "^charging state"			\
+	       | grep -q "discharg" ; then
+		false
+	    else
+		true
+	    fi
+	else
+	    true
+	fi
+    else
+	true
+    fi
+}
+
 # Function for mounting a file system.
 mountFS() {
     local device="$1"
@@ -158,24 +178,29 @@ mountFS() {
     fi
 
     if test -n "$mustCheck"; then
-        FSTAB_FILE="/etc/mtab" fsck -V -v -C -a "$device"
-        fsckResult=$?
-
-        if test $(($fsckResult | 2)) = $fsckResult; then
-            echo "fsck finished, rebooting..."
-            sleep 3
-            reboot
-        fi
-
-        if test $(($fsckResult | 4)) = $fsckResult; then
-            echo "$device has unrepaired errors, please fix them manually."
-            fail
-        fi
-
-        if test $fsckResult -ge 8; then
-            echo "fsck on $device failed."
-            fail
-        fi
+	if onACPower; then
+            FSTAB_FILE="/etc/mtab" fsck -V -v -C -a "$device"
+            fsckResult=$?
+
+            if test $(($fsckResult | 2)) = $fsckResult; then
+		echo "fsck finished, rebooting..."
+		sleep 3
+		reboot
+            fi
+
+            if test $(($fsckResult | 4)) = $fsckResult; then
+		echo "$device has unrepaired errors, please fix them manually."
+		fail
+            fi
+
+            if test $fsckResult -ge 8; then
+		echo "fsck on $device failed."
+		fail
+            fi
+	else
+            # Don't run `fsck' if the machine is on battery power.
+	    echo "on battery power, so \`fsck' not run on \`$device'"
+	fi
     fi
 
     # Mount read-writable.
-- 
GitLab


From 730244f13df3055258ca1a2984073f9c0cce6530 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Fri, 28 Nov 2008 15:44:15 +0000
Subject: [PATCH 1125/5331] lshd: Use `lsh-pam-checkpw' as the password helper
 program.

This finally allows users to log in using password authentication.

svn path=/nixos/trunk/; revision=13490
---
 etc/default.nix           | 1 -
 etc/pam.d/lsh-pam-checkpw | 4 ----
 upstart-jobs/lshd.nix     | 1 +
 3 files changed, 1 insertion(+), 5 deletions(-)
 delete mode 100644 etc/pam.d/lsh-pam-checkpw

diff --git a/etc/default.nix b/etc/default.nix
index 6b8bc81503d..448fa993d73 100644
--- a/etc/default.nix
+++ b/etc/default.nix
@@ -226,7 +226,6 @@ import ../helpers/make-etc.nix {
       "shadow"
       "sshd"
       "lshd"
-      "lsh-pam-checkpw"
       "useradd"
       "chsh"
       "xlock"
diff --git a/etc/pam.d/lsh-pam-checkpw b/etc/pam.d/lsh-pam-checkpw
deleted file mode 100644
index 50f3cc5ce60..00000000000
--- a/etc/pam.d/lsh-pam-checkpw
+++ /dev/null
@@ -1,4 +0,0 @@
-auth     include        common
-account  include        common
-password include        common
-session  include        common
diff --git a/upstart-jobs/lshd.nix b/upstart-jobs/lshd.nix
index e2a61eed387..0a13d9ba7ee 100644
--- a/upstart-jobs/lshd.nix
+++ b/upstart-jobs/lshd.nix
@@ -31,6 +31,7 @@ start script
 end script
 
 respawn ${lsh}/sbin/lshd --daemonic \
+   --password-helper="${lsh}/sbin/lsh-pam-checkpw" \
    -p ${toString portNumber} \
    ${if interfaces == [] then ""
      else (concatStrings (map (i: "--interface=\"${i}\"")
-- 
GitLab


From 7a6df0a5a89dcf9f348365f9c47d8919312e2f67 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Sat, 29 Nov 2008 07:10:31 +0000
Subject: [PATCH 1126/5331] Create a low-priority section in system.nix; host
 goes there

svn path=/nixos/trunk/; revision=13513
---
 system/system.nix | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/system/system.nix b/system/system.nix
index fa49383e048..08422d5bd2d 100644
--- a/system/system.nix
+++ b/system/system.nix
@@ -186,7 +186,6 @@ rec {
     pkgs.gnutar
     pkgs.grub
     pkgs.gzip
-    pkgs.host
     pkgs.iputils
     pkgs.less
     pkgs.lvm2
@@ -231,7 +230,15 @@ rec {
   # chroot gets to seem them, and (ii) applications can benefit from
   # changes in the list of NSS modules at run-time, without requiring
   # a reboot.
-  ++ nssModules;
+  ++ nssModules
+
+  # These packages are nice fallbacks unless any of the more powerful 
+  # substitutes is present.
+  ++ [
+    # Use ISC BIND version of the host util if you don't mind installing BIND
+    pkgs.host
+  ]
+  ;
 
   
   # We don't want to put all of `startPath' and `path' in $PATH, since
-- 
GitLab


From 8373c890a8aa80b1626cf84b7fb812839b70b477 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Sat, 29 Nov 2008 17:36:00 +0000
Subject: [PATCH 1127/5331] atd: Make `at' and friends actually usable by
 regular users.

This patch makes the `at' commands setuid `atd' (instead of `root')
and fixes the ownership of `/etc/at/at.deny'.

svn path=/nixos/trunk/; revision=13515
---
 system/options.nix   |  3 ++-
 system/system.nix    | 10 +++++++++-
 upstart-jobs/atd.nix |  2 +-
 3 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/system/options.nix b/system/options.nix
index 64bee0fa878..05189dbd23b 100644
--- a/system/options.nix
+++ b/system/options.nix
@@ -639,7 +639,8 @@ in
         default = false;
         description = ''
           Whether to make /var/spool/at{jobs,spool} writeable 
-          by everyone (and sticky).
+          by everyone (and sticky).  This is normally not needed since
+          the `at' commands are setuid/setgid `atd'.
         '';
       };
     };
diff --git a/system/system.nix b/system/system.nix
index 08422d5bd2d..d4594a91b9c 100644
--- a/system/system.nix
+++ b/system/system.nix
@@ -302,7 +302,15 @@ rec {
         chmod u${if entry.setuid then "+" else "-"}s $wrapperDir/${entry.program} 
         chmod g${if entry.setgid then "+" else "-"}s $wrapperDir/${entry.program} 
       '') 
-      config.security.setuidOwners);
+      (config.security.setuidOwners ++
+
+       # The `at' commands must be setuid `atd' so they can access the files
+       # under `/etc/at', etc.
+       (if config.services.atd.enable
+        then (map (program: { inherit program; owner = "atd"; group = "atd";
+                             setuid = true; setgid = true; })
+                  [ "at" "atq" "atrm" ])
+        else [])));
   };
 
 
diff --git a/upstart-jobs/atd.nix b/upstart-jobs/atd.nix
index 8a775d0c5d7..310477d1994 100644
--- a/upstart-jobs/atd.nix
+++ b/upstart-jobs/atd.nix
@@ -48,7 +48,7 @@ start script
    if [ ! -f "$etcdir"/at.deny ]
    then
        touch "$etcdir"/at.deny && \
-       chown root:root "$etcdir"/at.deny && \
+       chown root:atd "$etcdir"/at.deny && \
        chmod 640 "$etcdir"/at.deny
    fi
    if [ ! -f "$jobdir"/.SEQ ]
-- 
GitLab


From 2f0e8e370a502ccc3a116aeccb8f4f105ce4649c Mon Sep 17 00:00:00 2001
From: Nicolas Pierron <nicolas.b.pierron@gmail.com>
Date: Thu, 4 Dec 2008 15:48:27 +0000
Subject: [PATCH 1128/5331] Update argument style.

svn path=/nixos/branches/fix-style/; revision=13584
---
 system/options.nix              | 2 +-
 upstart-jobs/alsa.nix           | 2 +-
 upstart-jobs/avahi-daemon.nix   | 2 +-
 upstart-jobs/cron.nix           | 2 +-
 upstart-jobs/cron/locate.nix    | 2 +-
 upstart-jobs/dbus.nix           | 2 +-
 upstart-jobs/default.nix        | 2 +-
 upstart-jobs/dhclient.nix       | 3 +--
 upstart-jobs/gpm.nix            | 2 +-
 upstart-jobs/hal.nix            | 2 +-
 upstart-jobs/nagios/default.nix | 2 +-
 upstart-jobs/pcmcia.nix         | 2 +-
 12 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/system/options.nix b/system/options.nix
index 7ad09b1deb3..2285f6f89ae 100644
--- a/system/options.nix
+++ b/system/options.nix
@@ -1,4 +1,4 @@
-pkgs: config:
+{pkgs, config, ...}:
 
 let
   inherit (pkgs.lib) mkOption;
diff --git a/upstart-jobs/alsa.nix b/upstart-jobs/alsa.nix
index 08591d04fd7..406c63720f6 100644
--- a/upstart-jobs/alsa.nix
+++ b/upstart-jobs/alsa.nix
@@ -1,5 +1,5 @@
 # ALSA sound support.
-{pkgs, config}:
+{pkgs, config, ...}:
 
 ###### interface
 let
diff --git a/upstart-jobs/avahi-daemon.nix b/upstart-jobs/avahi-daemon.nix
index b3de2b52401..c9c027fefee 100644
--- a/upstart-jobs/avahi-daemon.nix
+++ b/upstart-jobs/avahi-daemon.nix
@@ -1,5 +1,5 @@
 # Avahi daemon.
-{pkgs, config}:
+{pkgs, config, ...}:
 
 ###### interface
 let
diff --git a/upstart-jobs/cron.nix b/upstart-jobs/cron.nix
index 0876f776f47..2806ee92b96 100644
--- a/upstart-jobs/cron.nix
+++ b/upstart-jobs/cron.nix
@@ -1,4 +1,4 @@
-{pkgs, config}:
+{pkgs, config, ...}:
 
 ###### interface
 let
diff --git a/upstart-jobs/cron/locate.nix b/upstart-jobs/cron/locate.nix
index 2b26a10e91e..eace9f5129b 100644
--- a/upstart-jobs/cron/locate.nix
+++ b/upstart-jobs/cron/locate.nix
@@ -1,4 +1,4 @@
-{pkgs, config}:
+{pkgs, config, ...}:
 
 ###### interface
 let
diff --git a/upstart-jobs/dbus.nix b/upstart-jobs/dbus.nix
index 1b2b0d344f7..f98922a5b6e 100644
--- a/upstart-jobs/dbus.nix
+++ b/upstart-jobs/dbus.nix
@@ -1,5 +1,5 @@
 # D-Bus system-wide daemon.
-{pkgs, config}:
+{pkgs, config, ...}:
 
 ###### interface
 let
diff --git a/upstart-jobs/default.nix b/upstart-jobs/default.nix
index fe1cad6195e..fee24e3b5ec 100644
--- a/upstart-jobs/default.nix
+++ b/upstart-jobs/default.nix
@@ -1,4 +1,4 @@
-{config, pkgs}:
+{config, pkgs, ...}:
 
 ###### interface
 let
diff --git a/upstart-jobs/dhclient.nix b/upstart-jobs/dhclient.nix
index 5be6c6c0e54..db1c948072c 100644
--- a/upstart-jobs/dhclient.nix
+++ b/upstart-jobs/dhclient.nix
@@ -1,5 +1,4 @@
-{pkgs, config #, ...
-}:
+{pkgs, config, ...}:
 
 ###### interface
 let
diff --git a/upstart-jobs/gpm.nix b/upstart-jobs/gpm.nix
index 74aa8b84c8f..1247f1548f8 100644
--- a/upstart-jobs/gpm.nix
+++ b/upstart-jobs/gpm.nix
@@ -1,4 +1,4 @@
-{pkgs, config}:
+{pkgs, config, ...}:
 
 ###### interface
 let
diff --git a/upstart-jobs/hal.nix b/upstart-jobs/hal.nix
index 56e82a7c05e..181341fdcf4 100644
--- a/upstart-jobs/hal.nix
+++ b/upstart-jobs/hal.nix
@@ -1,5 +1,5 @@
 # HAL daemon.
-{pkgs, config}:
+{pkgs, config, ...}:
 
 ###### interface
 let
diff --git a/upstart-jobs/nagios/default.nix b/upstart-jobs/nagios/default.nix
index bbd56a89442..1b26231cf95 100644
--- a/upstart-jobs/nagios/default.nix
+++ b/upstart-jobs/nagios/default.nix
@@ -1,5 +1,5 @@
 # Nagios system/network monitoring daemon.
-{config, pkgs}:
+{config, pkgs, ...}:
 
 ###### interface
 let
diff --git a/upstart-jobs/pcmcia.nix b/upstart-jobs/pcmcia.nix
index 5b2d7a43d97..dcf881470b9 100644
--- a/upstart-jobs/pcmcia.nix
+++ b/upstart-jobs/pcmcia.nix
@@ -1,4 +1,4 @@
-pkgs: config:
+{pkgs, config, ...}:
 
 ###### interface
 let
-- 
GitLab


From b47e6675b838807a7a6cf63da08ce19ca21d8bcf Mon Sep 17 00:00:00 2001
From: Nicolas Pierron <nicolas.b.pierron@gmail.com>
Date: Sun, 7 Dec 2008 12:27:46 +0000
Subject: [PATCH 1129/5331] Use generated upstart-job's tags for cron.

svn path=/nixos/branches/fix-style/; revision=13593
---
 upstart-jobs/cron.nix    |  6 ++++--
 upstart-jobs/default.nix | 40 +++++++++++++++++++++++++++++++++++++++-
 2 files changed, 43 insertions(+), 3 deletions(-)

diff --git a/upstart-jobs/cron.nix b/upstart-jobs/cron.nix
index 2806ee92b96..45a3295f716 100644
--- a/upstart-jobs/cron.nix
+++ b/upstart-jobs/cron.nix
@@ -34,6 +34,8 @@ in
 
 ###### implementation
 let
+  inherit (config.services) jobsTags;
+
   # Put all the system cronjobs together.
   systemCronJobs =
     config.services.cron.systemCronJobs;
@@ -79,8 +81,8 @@ in
       job = ''
         description "Cron daemon"
 
-        start on startup
-        stop on shutdown
+        start on ${jobsTags.system.start}
+        stop on ${jobsTags.system.stop}
 
         # Needed to interpret times in the local timezone.
         env TZ=${config.time.timeZone}
diff --git a/upstart-jobs/default.nix b/upstart-jobs/default.nix
index fee24e3b5ec..4b42d8a7738 100644
--- a/upstart-jobs/default.nix
+++ b/upstart-jobs/default.nix
@@ -2,7 +2,19 @@
 
 ###### interface
 let
-  inherit (pkgs.lib) mkOption;
+  inherit (pkgs.lib) mkOption mapAttrs getAttr fold
+    mergeListOption mergeTypedOption mergeAttrsWithFunc;
+
+  mergeTags = mergeTypedOption "jobs tag" (x: true)
+    (fold (mergeAttrsWithFunc (a: b:
+      if builtins.lessThan a.priority b.priority then b else a
+    )) { priority = 100; });
+
+  applyTags = mapAttrs (attrName: value:
+    let name = getAttr ["name"] attrName value; in {
+    start = getAttr ["start"] (name + "/started") value;
+    stop = getAttr ["stop"] (name + "/stop") value;
+  });
 
   options = {
     services = {
@@ -24,6 +36,22 @@ let
           Additional Upstart jobs.
         ";
       };
+
+      # this attribute must be computed before extraJobs.
+      jobsTags = mkOption {
+        default = {};
+        example = {
+          newtworkInterface = {
+            name = "gw6c";
+            priority = 5;
+          };
+        };
+        description = "
+          Allow jobs to overload jobs tags used by upstart jobs.
+        ";
+        merge = mergeTags;
+        apply = applyTags;
+      };
     };
 
     tests = {
@@ -480,6 +508,16 @@ in
       pkgs.lib.concatLists (map (job: job.groups) jobs);
   };
 
+  services = {
+    jobsTags = {
+      system = {
+        priority = 0;
+        start = "startup";
+        stop = "shutdown";
+      };
+    };
+  };
+
   tests = {
     # see test/test-upstart-job.sh
     upstartJobs = { recurseForDerivations = true; } //
-- 
GitLab


From c155a3f46e44a08b1a2cca0ab5e3da9c39c685a1 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 15 Dec 2008 23:54:10 +0000
Subject: [PATCH 1130/5331] * When doing chroot builds, the `build-chroot-dirs'
 option should   include the closure of /bin/sh.  Otherwise all builders that
 call   /bin/sh will fail when using the new chroot implementation, which  
 only bind-mounts the inputs of a build rather than the whole Nix   store.

svn path=/nixos/trunk/; revision=13640
---
 default.nix                      |  2 +-
 etc/default.nix                  | 31 ++++++++++++++++++++++---------
 system/activate-configuration.sh |  2 +-
 system/system.nix                | 12 ++++++++----
 4 files changed, 32 insertions(+), 15 deletions(-)

diff --git a/default.nix b/default.nix
index 3923cb9592b..46f2d265216 100644
--- a/default.nix
+++ b/default.nix
@@ -1,6 +1,6 @@
 let
 
-  fromEnv = name : default :
+  fromEnv = name: default:
     let env = builtins.getEnv name; in
     if env == "" then default else env;
   configuration = import (fromEnv "NIXOS_CONFIG" /etc/nixos/configuration.nix);
diff --git a/etc/default.nix b/etc/default.nix
index 448fa993d73..c4cb68d9415 100644
--- a/etc/default.nix
+++ b/etc/default.nix
@@ -1,5 +1,5 @@
 { config, pkgs, upstartJobs, systemPath, wrapperDir
-, defaultShell, extraEtc, nixEnvVars, modulesTree, nssModulesPath
+, defaultShell, extraEtc, nixEnvVars, modulesTree, nssModulesPath, binsh
 }:
 
 let 
@@ -123,14 +123,27 @@ import ../helpers/make-etc.nix {
     }
 
     { # Nix configuration.
-      source = pkgs.writeText "nix.conf" ''
-        # WARNING: this file is generated.
-        build-users-group = nixbld
-        build-max-jobs = ${toString (config.nix.maxJobs)}
-        build-use-chroot = ${if config.nix.useChroot then "true" else "false"}
-        build-chroot-dirs = /dev /dev/pts /proc /bin
-        ${config.nix.extraOptions}
-      '';
+      source =
+        let
+          # Tricky: if we're using a chroot for builds, then we need
+          # /bin/sh in the chroot (our own compromise to purity).
+          # However, since /bin/sh is a symlink to some path in the
+          # Nix store, which furthermore has runtime dependencies on
+          # other paths in the store, we need the closure of /bin/sh
+          # in `build-chroot-dirs' - otherwise any builder that uses
+          # /bin/sh won't work.
+          refs = pkgs.writeReferencesToFile binsh;
+        in 
+          pkgs.runCommand "nix.conf" {} ''
+            cat > $out <<END
+            # WARNING: this file is generated.
+            build-users-group = nixbld
+            build-max-jobs = ${toString (config.nix.maxJobs)}
+            build-use-chroot = ${if config.nix.useChroot then "true" else "false"}
+            build-chroot-dirs = $(echo $(cat ${refs}))
+            ${config.nix.extraOptions}
+            END
+          '';
       target = "nix.conf"; # will be symlinked from /nix/etc/nix/nix.conf in activate-configuration.sh.
     }
 
diff --git a/system/activate-configuration.sh b/system/activate-configuration.sh
index fb4c6a91da6..e41e747e856 100644
--- a/system/activate-configuration.sh
+++ b/system/activate-configuration.sh
@@ -50,7 +50,7 @@ done
 # Create the required /bin/sh symlink; otherwise lots of things
 # (notably the system() function) won't work.
 mkdir -m 0755 -p $mountPoint/bin
-ln -sfn @bash@/bin/sh $mountPoint/bin/sh
+ln -sfn @binsh@/bin/sh $mountPoint/bin/sh
 
 
 # Allow the kernel to find our wrapped modprobe (which searches in the
diff --git a/system/system.nix b/system/system.nix
index d4594a91b9c..948b9a6a345 100644
--- a/system/system.nix
+++ b/system/system.nix
@@ -116,7 +116,7 @@ rec {
   # The static parts of /etc.
   etc = import ../etc/default.nix {
     inherit config pkgs upstartJobs systemPath wrapperDir
-      defaultShell nixEnvVars modulesTree nssModulesPath;
+      defaultShell nixEnvVars modulesTree nssModulesPath binsh;
     extraEtc =
        (pkgs.lib.concatLists (map (job: job.extraEtc) upstartJobs.jobs))
     ++ config.environment.etc;
@@ -262,6 +262,10 @@ rec {
 
   defaultShell = "/var/run/current-system/sw/bin/bash";
 
+
+  # The shell that we want to use for /bin/sh.
+  binsh = pkgs.bashInteractive;
+
     
   # The script that activates the configuration, i.e., it sets up
   # /etc, accounts, etc.  It doesn't do anything that can only be done
@@ -270,8 +274,10 @@ rec {
     src = ./activate-configuration.sh;
     isExecutable = true;
 
-    inherit etc wrapperDir systemPath modprobe defaultShell kernel;
+    inherit etc wrapperDir systemPath modprobe defaultShell kernel binsh;
+    
     hostName = config.networking.hostName;
+    
     setuidPrograms =
       config.security.setuidPrograms ++
       config.security.extraSetuidPrograms ++
@@ -288,8 +294,6 @@ rec {
         pkgs.pwdutils
       ];
 
-    bash = pkgs.bashInteractive;
-
     adjustSetuidOwner = pkgs.lib.concatStrings (map 
       (_entry: let entry = {
         owner = "nobody";
-- 
GitLab


From 2f4b7d3e09183811199d8b22af20c0c9a13fa392 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 16 Dec 2008 00:16:35 +0000
Subject: [PATCH 1131/5331] * Doh.

svn path=/nixos/trunk/; revision=13642
---
 etc/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/etc/default.nix b/etc/default.nix
index c4cb68d9415..0270e503326 100644
--- a/etc/default.nix
+++ b/etc/default.nix
@@ -140,7 +140,7 @@ import ../helpers/make-etc.nix {
             build-users-group = nixbld
             build-max-jobs = ${toString (config.nix.maxJobs)}
             build-use-chroot = ${if config.nix.useChroot then "true" else "false"}
-            build-chroot-dirs = $(echo $(cat ${refs}))
+            build-chroot-dirs = /dev /dev/pts /proc /bin $(echo $(cat ${refs}))
             ${config.nix.extraOptions}
             END
           '';
-- 
GitLab


From 43dc3f6baad3ce4a17b11204a892baf7c39ff12a Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 17 Dec 2008 13:06:48 +0000
Subject: [PATCH 1132/5331] * Fix grammar/spelling for some descriptions, and
 make them produce   well-formed XML in the manual again.

svn path=/nixos/trunk/; revision=13650
---
 system/options.nix | 67 +++++++++++++++++++++++++++-------------------
 1 file changed, 39 insertions(+), 28 deletions(-)

diff --git a/system/options.nix b/system/options.nix
index 05189dbd23b..6f445514857 100644
--- a/system/options.nix
+++ b/system/options.nix
@@ -1672,9 +1672,11 @@ in
         default = [];
         example = [ "proxy_connect" { name = "php5_module"; path = "${pkgs.php}/modules/libphp5.so"; } ];
         description = ''
-          Loads additional modules either beeing distributed with apache.
-          If the module is contained in a foreign package (such as php5_module)
-          kse an attrset as given in the example.
+          Specifies additional Apache modules.  These can be specified
+          as a string in the case of modules distributed with Apache,
+          or as an attribute set specifying the
+          <varname>name</varname> and <varname>path</varname> of the
+          module.
         '';
       };
 
@@ -2530,25 +2532,29 @@ in
         example = [ { type = "svn"; url = "https://svn.nixos.org/repos/nix/nixos/branches/stdenv-updates"; target = "/etc/nixos/nixos-stdenv-updates"; }
                     { type = "git"; initialize = ''git clone git://mawercer.de/nixos $target''; update = "git pull origin"; target = "/etc/nixos/nixos-git"; }
                   ];
-        description = "The NixOS repository from which the system will be build. 
-                       nixos-checkout will update all working copies of the given repositories,
-                       nixos-rebuild will use the first item which has
-                       the attribute default = true falling back to the
-                       first item. The type defines the repository tool added
-                       to the path. It also defines a \"valid\" repository.
-                       If the target directory already exists and it's not
-                       valid it will be moved to the backup location
-                       <filename>\${dir}-date</filename>.
-                       For svn the default target and repositories are
-                       <filename>/etc/nixos/nixos</filename> and
-                       <filename>https://svn.nixos.org/repos/nix/nixos/trunk</filename>.
-                       For git repositories update is called after
-                       initialization when the repo is initialized.
-                       The initialize code is run from working directory
-                       dirname \$target and should create the directory
-                       <filename>\$target<filename>. (<command>git clone url nixos/nixpkgs/services</command> should do)
-                       For the executables beeing used see <option>repoTypes</option>
-                       ";
+        description = ''
+          The NixOS repository from which the system will be built.
+          <command>nixos-checkout</command> will update all working
+          copies of the given repositories,
+          <command>nixos-rebuild</command> will use the first item
+          which has the attribute <literal>default = true</literal>
+          falling back to the first item. The type defines the
+          repository tool added to the path. It also defines a "valid"
+          repository.  If the target directory already exists and it's
+          not valid it will be moved to the backup location
+          <filename><replaceable>dir</replaceable>-date</filename>.
+          For svn the default target and repositories are
+          <filename>/etc/nixos/nixos</filename> and
+          <filename>https://svn.nixos.org/repos/nix/nixos/trunk</filename>.
+          For git repositories update is called after initialization
+          when the repo is initialized.  The initialize code is run
+          from working directory dirname
+          <replaceable>target</replaceable> and should create the
+          directory
+          <filename><replaceable>dir</replaceable></filename>. (<command>git
+          clone url nixos/nixpkgs/services</command> should do) For
+          the executables used see <option>repoTypes</option>.
+        '';
       };
 
       nixpkgs = mkOption {
@@ -2563,12 +2569,17 @@ in
     };
 
     repoTypes = mkOption {
-        default = {
-          svn = { valid = "[ -d .svn ]"; env = [ pkgs.coreutils pkgs.subversion ]; };
-          git = { valid = "[ -d .git ]"; env = [ pkgs.coreutils pkgs.git pkgs.gnused /*  FIXME: use full path to sed in nix-pull */ ]; };
-        };
-        description = "defines PATH environment and when directory is considered beeing a valid repository.
-              If it's not it's moved to a backup directory";
+      default = {
+        svn = { valid = "[ -d .svn ]"; env = [ pkgs.coreutils pkgs.subversion ]; };
+        git = { valid = "[ -d .git ]"; env = [ pkgs.coreutils pkgs.git pkgs.gnused /*  FIXME: use full path to sed in nix-pull */ ]; };
+      };
+      description = ''
+        Defines, for each supported version control system
+        (e.g. <literal>git</literal>), the dependencies for the
+        mechanism, as well as a test used to determine whether a
+        directory is a checkout created by that version control
+        system.
+      '';
     };
 
     manifests = mkOption {
-- 
GitLab


From 28979119159bd3dadabab64ab436570de109bdcb Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 17 Dec 2008 13:25:23 +0000
Subject: [PATCH 1133/5331] * Hydra release expression for building NixOS.

svn path=/nixos/trunk/; revision=13651
---
 doc/manual/default.nix |  2 ++
 doc/manual/manual.xml  |  1 +
 release.nix            | 59 ++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 62 insertions(+)
 create mode 100644 release.nix

diff --git a/doc/manual/default.nix b/doc/manual/default.nix
index e6f9b84329f..a7f51adf287 100644
--- a/doc/manual/default.nix
+++ b/doc/manual/default.nix
@@ -38,6 +38,8 @@ let
         ${pkgs.docbook5_xsl}/xml/xsl/docbook/html/docbook.xsl \
         ./manual.xml
       cp ${./style.css} $out/style.css
+      ensureDir $out/nix-support
+      echo "doc manual $out" >> $out/nix-support/hydra-build-products
     '';
   };
 
diff --git a/doc/manual/manual.xml b/doc/manual/manual.xml
index 55adf3e647d..9f79b6fdb6e 100644
--- a/doc/manual/manual.xml
+++ b/doc/manual/manual.xml
@@ -15,6 +15,7 @@
 
     <copyright>
       <year>2007</year>
+      <year>2008</year>
       <holder>Eelco Dolstra</holder>
     </copyright>
     
diff --git a/release.nix b/release.nix
new file mode 100644
index 00000000000..25d4aa3658c
--- /dev/null
+++ b/release.nix
@@ -0,0 +1,59 @@
+let 
+
+
+  jobs = rec {
+
+
+    tarball =
+      { nixosSrc ? {path = ./.; rev = 1234;}
+      , nixpkgs ? {path = ../nixpkgs-wc;}
+      , officialRelease ? false
+      }:
+
+      with import nixpkgs.path {};
+
+      releaseTools.makeSourceTarball {
+        name = "nixos-tarball";
+        src = nixosSrc;
+        inherit officialRelease;
+
+        distPhase = ''
+          releaseName=nixos-$(cat $src/VERSION)$VERSION_SUFFIX
+          ensureDir "$out/tarballs"
+          mkdir ../$releaseName
+          cp -prd . ../$releaseName
+          cd ..
+          tar cfvj $out/tarballs/$releaseName.tar.bz2 $releaseName
+        ''; # */
+      };
+
+
+    manual =
+      { nixosSrc ? {path = ./.; rev = 1234;}
+      , nixpkgs ? {path = ../nixpkgs-wc;}
+      , officialRelease ? false
+      }:
+
+      import "${nixosSrc.path}/doc/manual" {
+        nixpkgsPath = nixpkgs.path;
+      };
+
+
+    iso = 
+      { nixosSrc ? {path = ./.; rev = 1234;}
+      , nixpkgs ? {path = ../nixpkgs-wc;}
+      , officialRelease ? false
+      , system ? "i686-linux"
+      }:
+
+      (import "${nixosSrc.path}/installer/cd-dvd/rescue-cd.nix" {
+        platform = system;
+        compressImage = true;
+        nixpkgsPath = nixpkgs.path;
+      }).rescueCD;
+
+
+  };
+  
+
+in jobs
\ No newline at end of file
-- 
GitLab


From 9c0953b439f238e089b6675c6714b4cede71c043 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 17 Dec 2008 14:30:43 +0000
Subject: [PATCH 1134/5331] svn path=/nixos/trunk/; revision=13652

---
 installer/cd-dvd/rescue-cd.nix | 14 ++++----------
 release.nix                    | 22 +++++++++++++++++-----
 2 files changed, 21 insertions(+), 15 deletions(-)

diff --git a/installer/cd-dvd/rescue-cd.nix b/installer/cd-dvd/rescue-cd.nix
index c34fc259340..66c707c77a7 100644
--- a/installer/cd-dvd/rescue-cd.nix
+++ b/installer/cd-dvd/rescue-cd.nix
@@ -220,18 +220,12 @@ rec {
   ";
 
   
-  # Put the current directory in a tarball (making sure to filter
-  # out crap like the .svn directories).
-  nixosTarball = makeTarball "nixos.tar.bz2" (builtins.filterSource svnFilter ./../..);
+  # Put the current directory in a tarball.
+  nixosTarball = makeTarball "nixos.tar.bz2" ../..;
 
-  svnFilter = name: type:
-    let base = baseNameOf (toString name);
-    in base != ".svn" && base != "result";
 
-
-  # Put Nixpkgs in a tarball
-  nixpkgsTarball = makeTarball "nixpkgs.tar.bz2"
-    (builtins.filterSource svnFilter nixpkgsPath);
+  # Put Nixpkgs in a tarball.
+  nixpkgsTarball = makeTarball "nixpkgs.tar.bz2" nixpkgsPath;
 
 
   # The configuration file for Grub.
diff --git a/release.nix b/release.nix
index 25d4aa3658c..4e79ee27734 100644
--- a/release.nix
+++ b/release.nix
@@ -46,12 +46,24 @@ let
       , system ? "i686-linux"
       }:
 
-      (import "${nixosSrc.path}/installer/cd-dvd/rescue-cd.nix" {
-        platform = system;
-        compressImage = true;
-        nixpkgsPath = nixpkgs.path;
-      }).rescueCD;
+      with import nixpkgs.path {};
 
+      let
+
+        iso = (import "${nixosSrc.path}/installer/cd-dvd/rescue-cd.nix" {
+          platform = system;
+          compressImage = true;
+          nixpkgsPath = nixpkgs.path;
+        }).rescueCD;
+
+      in
+        # Declare the ISO as a build product so that it shows up in Hydra.
+        runCommand "nixos-iso" {}
+          ''
+            ensureDir $out/nix-support
+            echo "file iso" ${iso}/iso/*.iso* >> $out/nix-support/hydra-build-products
+          ''; # */
+      
 
   };
   
-- 
GitLab


From 8a5bcfb934324f0d3adeb87c2f0e3b343717c611 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 17 Dec 2008 14:43:14 +0000
Subject: [PATCH 1135/5331] svn path=/nixos/trunk/; revision=13653

---
 release.nix | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/release.nix b/release.nix
index 4e79ee27734..4612e94ded9 100644
--- a/release.nix
+++ b/release.nix
@@ -46,7 +46,7 @@ let
       , system ? "i686-linux"
       }:
 
-      with import nixpkgs.path {};
+      with import nixpkgs.path {inherit system;};
 
       let
 
@@ -58,7 +58,11 @@ let
 
       in
         # Declare the ISO as a build product so that it shows up in Hydra.
-        runCommand "nixos-iso" {}
+        runCommand "nixos-iso"
+          { meta = {
+              description = "NixOS installation CD ISO image for ${system}";
+            };
+          }
           ''
             ensureDir $out/nix-support
             echo "file iso" ${iso}/iso/*.iso* >> $out/nix-support/hydra-build-products
-- 
GitLab


From 67451c470b357bbbe670f97c2e921088b569f76e Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 19 Dec 2008 10:22:45 +0000
Subject: [PATCH 1136/5331] * Make sure that build-chroot-dirs only contains
 directories.

svn path=/nixos/trunk/; revision=13657
---
 etc/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/etc/default.nix b/etc/default.nix
index 0270e503326..88d4d39e21e 100644
--- a/etc/default.nix
+++ b/etc/default.nix
@@ -135,12 +135,13 @@ import ../helpers/make-etc.nix {
           refs = pkgs.writeReferencesToFile binsh;
         in 
           pkgs.runCommand "nix.conf" {} ''
+            binshDeps=$(for i in $(cat ${refs}); do if test -d $i; then echo $i; fi; done)
             cat > $out <<END
             # WARNING: this file is generated.
             build-users-group = nixbld
             build-max-jobs = ${toString (config.nix.maxJobs)}
             build-use-chroot = ${if config.nix.useChroot then "true" else "false"}
-            build-chroot-dirs = /dev /dev/pts /proc /bin $(echo $(cat ${refs}))
+            build-chroot-dirs = /dev /dev/pts /proc /bin $(echo $binshDeps)
             ${config.nix.extraOptions}
             END
           '';
-- 
GitLab


From d8c1734b9987345afe548a3986401325ef60ecb1 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Sat, 20 Dec 2008 14:29:52 +0000
Subject: [PATCH 1137/5331] Synaptics two-finger scrolling option

svn path=/nixos/trunk/; revision=13663
---
 system/options.nix       | 4 ++++
 upstart-jobs/xserver.nix | 2 ++
 2 files changed, 6 insertions(+)

diff --git a/system/options.nix b/system/options.nix
index 6f445514857..92d6288c597 100644
--- a/system/options.nix
+++ b/system/options.nix
@@ -1376,6 +1376,10 @@ in
           default = "0.12";
           description = "Cursor speed factor for highest-speed finger motion";
         };
+	twoFingerScroll = mkOption {
+	  default = false;
+	  description = "Whether to enable two-finger drag-scrolling";
+	};
       };
 
       layout = mkOption {
diff --git a/upstart-jobs/xserver.nix b/upstart-jobs/xserver.nix
index 157effcb530..58e8e434ddd 100644
--- a/upstart-jobs/xserver.nix
+++ b/upstart-jobs/xserver.nix
@@ -100,6 +100,8 @@ let
         Option "TapButton1" "1"
         Option "TapButton2" "2"
         Option "TapButton3" "3"
+	Option "VertTwoFingerScroll" "${if cfg.synaptics.twoFingerScroll then "1" else "0"}"
+	Option "HorizTwoFingerScroll" "${if cfg.synaptics.twoFingerScroll then "1" else "0"}"
       EndSection
     '' else "";
 
-- 
GitLab


From c787cb1a0a277bc3cf6ae28503a54a8fc8d14910 Mon Sep 17 00:00:00 2001
From: Nicolas Pierron <nicolas.b.pierron@gmail.com>
Date: Fri, 2 Jan 2009 16:06:41 +0000
Subject: [PATCH 1138/5331] Replace job tags by a library of function to build
 upstart jobs.

svn path=/nixos/branches/fix-style/; revision=13674
---
 upstart-jobs/cron.nix        |  5 ++--
 upstart-jobs/default.nix     | 49 ++++++++++--------------------------
 upstart-jobs/lib/default.nix | 36 ++++++++++++++++++++++++++
 3 files changed, 51 insertions(+), 39 deletions(-)
 create mode 100644 upstart-jobs/lib/default.nix

diff --git a/upstart-jobs/cron.nix b/upstart-jobs/cron.nix
index 45a3295f716..404fdd45b55 100644
--- a/upstart-jobs/cron.nix
+++ b/upstart-jobs/cron.nix
@@ -46,7 +46,6 @@ let
     MAILTO="${config.services.cron.mailto}"
     ${pkgs.lib.concatStrings (map (job: job + "\n") systemCronJobs)}
   '';
-
 in
 
 {
@@ -81,8 +80,8 @@ in
       job = ''
         description "Cron daemon"
 
-        start on ${jobsTags.system.start}
-        stop on ${jobsTags.system.stop}
+        start on startup
+        stop on shutdown
 
         # Needed to interpret times in the local timezone.
         env TZ=${config.time.timeZone}
diff --git a/upstart-jobs/default.nix b/upstart-jobs/default.nix
index 4b42d8a7738..47d2a0ec422 100644
--- a/upstart-jobs/default.nix
+++ b/upstart-jobs/default.nix
@@ -5,17 +5,6 @@ let
   inherit (pkgs.lib) mkOption mapAttrs getAttr fold
     mergeListOption mergeTypedOption mergeAttrsWithFunc;
 
-  mergeTags = mergeTypedOption "jobs tag" (x: true)
-    (fold (mergeAttrsWithFunc (a: b:
-      if builtins.lessThan a.priority b.priority then b else a
-    )) { priority = 100; });
-
-  applyTags = mapAttrs (attrName: value:
-    let name = getAttr ["name"] attrName value; in {
-    start = getAttr ["start"] (name + "/started") value;
-    stop = getAttr ["stop"] (name + "/stop") value;
-  });
-
   options = {
     services = {
       extraJobs = mkOption {
@@ -37,20 +26,13 @@ let
         ";
       };
 
-      # this attribute must be computed before extraJobs.
-      jobsTags = mkOption {
-        default = {};
-        example = {
-          newtworkInterface = {
-            name = "gw6c";
-            priority = 5;
-          };
+      tools = {
+        upstartJobs = mkOption {
+          default = {};
+          description = "
+            List of functions which can be used to create upstart-jobs.
+          ";
         };
-        description = "
-          Allow jobs to overload jobs tags used by upstart jobs.
-        ";
-        merge = mergeTags;
-        apply = applyTags;
       };
     };
 
@@ -471,22 +453,20 @@ let
     })
 
   # User-defined events.
-  ++ (map makeJob (config.services.extraJobs))
-
-  # For the built-in logd job.
-  ++ [(makeJob { jobDrv = pkgs.upstart; })];
+  ++ (map makeJob (config.services.extraJobs));
 
 
   command = import ../upstart-jobs/gather.nix {
     inherit (pkgs) runCommand;
     inherit jobs;
   };
-  
+
 in 
 
 {
   require = [
     options
+    (import ./lib/default.nix)
   ];
 
   environment = {
@@ -509,13 +489,10 @@ in
   };
 
   services = {
-    jobsTags = {
-      system = {
-        priority = 0;
-        start = "startup";
-        stop = "shutdown";
-      };
-    };
+    extraJobs = [
+      # For the built-in logd job.
+      { jobDrv = pkgs.upstart; }
+    ];
   };
 
   tests = {
diff --git a/upstart-jobs/lib/default.nix b/upstart-jobs/lib/default.nix
new file mode 100644
index 00000000000..e2adbd1d841
--- /dev/null
+++ b/upstart-jobs/lib/default.nix
@@ -0,0 +1,36 @@
+# This file defines functions to handle upstart-jobs.
+{pkgs, config, ...}:
+
+let
+  inherit (pkgs.lib) filter findSingle;
+  jobs = config.services.extraJobs;
+
+  primaryEvents = [
+    "startup"
+    "shutdown"
+    "never"
+  ];
+
+  upstartJobsTools = rec {
+    exists = name:
+      let
+        found = filter
+          (j: j ? name && j.name == name)
+          (jobs ++ map (name: {inherit name;}) primaryEvents);
+      in found != [];
+
+    check = name:
+      if exists name then
+        name
+      else
+        abort "Undefined upstart job name: ${name}.";
+  };
+in
+
+{
+  services = {
+    tools = {
+      upstartJobs = upstartJobsTools;
+    };
+  };
+}
-- 
GitLab


From e7e45dbd2c8c650c5a3a442b452a8b578c6b847f Mon Sep 17 00:00:00 2001
From: Nicolas Pierron <nicolas.b.pierron@gmail.com>
Date: Fri, 2 Jan 2009 16:06:46 +0000
Subject: [PATCH 1139/5331] Start moving the "activate configuration" script to
 be extensible.

svn path=/nixos/branches/fix-style/; revision=13675
---
 system/activate-configuration.nix | 43 +++++++++++++++++++++++++++
 system/activate-configuration.sh  | 16 +----------
 system/options.nix                |  2 ++
 system/system-options.nix         | 48 +++++++++++++++++++++++++++++++
 system/system.nix                 |  9 ++----
 5 files changed, 97 insertions(+), 21 deletions(-)
 create mode 100644 system/activate-configuration.nix
 create mode 100644 system/system-options.nix

diff --git a/system/activate-configuration.nix b/system/activate-configuration.nix
new file mode 100644
index 00000000000..65591c2d2b8
--- /dev/null
+++ b/system/activate-configuration.nix
@@ -0,0 +1,43 @@
+# generate the script used to activate the configuration.
+{pkgs, config, ...}:
+
+let
+  inherit (pkgs.stringsWithDeps) textClosureOverridable;
+  inherit (pkgs.lib) mkOption mergeTypedOption mergeAttrs mapRecordFlatten id;
+
+  textClosure = steps:
+    textClosureOverridable steps
+    (["#!/bin/sh"] ++ (mapRecordFlatten (a: v: v) steps));
+
+  aggregateScripts = name: steps:
+    pkgs.writeScript name (textClosure steps);
+in
+
+{
+  system = {
+    activationScripts = mkOption {
+      default = [];
+      example = {
+        stdio = {
+          text = "
+            # Needed by some programs.
+            ln -sfn /proc/self/fd /dev/fd
+            ln -sfn /proc/self/fd/0 /dev/stdin
+            ln -sfn /proc/self/fd/1 /dev/stdout
+            ln -sfn /proc/self/fd/2 /dev/stderr
+          ";
+          deps = [];
+        };
+      };
+      description = ''
+        Activate the new configuration (i.e., update /etc, make accounts,
+        and so on).
+      '';
+      merge = mergeTypedOption "script" builtins.isAttrs mergeAttrs;
+      apply = lib: {
+        inherit lib; # used to fetch dependencies.
+        script = aggregateScripts "activationScript" lib;
+      };
+    };
+  };
+}
diff --git a/system/activate-configuration.sh b/system/activate-configuration.sh
index fb4c6a91da6..ea329ce2365 100644
--- a/system/activate-configuration.sh
+++ b/system/activate-configuration.sh
@@ -1,20 +1,6 @@
 #! @shell@
 
-systemConfig="$1"
-if test -z "$systemConfig"; then
-    systemConfig="/system" # for the installation CD
-fi
-
-export PATH=/empty
-for i in @path@; do PATH=$PATH:$i/bin:$i/sbin; done
-
-
-# Needed by some programs.
-ln -sfn /proc/self/fd /dev/fd
-ln -sfn /proc/self/fd/0 /dev/stdin
-ln -sfn /proc/self/fd/1 /dev/stdout
-ln -sfn /proc/self/fd/2 /dev/stderr
-
+source @newActivationScript@
 
 # Set up the statically computed bits of /etc.
 staticEtc=/etc/static
diff --git a/system/options.nix b/system/options.nix
index 2285f6f89ae..ce7667b2fa8 100644
--- a/system/options.nix
+++ b/system/options.nix
@@ -2912,6 +2912,8 @@ root        ALL=(ALL) SETENV: ALL
 
   require = [
     # system
+    (import ../system/system-options.nix)
+    (import ../system/activate-configuration.nix)
     (import ../upstart-jobs/default.nix)
 
     # newtworking
diff --git a/system/system-options.nix b/system/system-options.nix
new file mode 100644
index 00000000000..1924db9aec8
--- /dev/null
+++ b/system/system-options.nix
@@ -0,0 +1,48 @@
+# this file contains all extendable options originally defined in system.nix
+{pkgs, config, ...}:
+
+let
+  inherit (pkgs.stringsWithDeps) noDepEntry FullDepEntry PackEntry;
+
+  activateLib = config.system.activationScripts.lib;
+in
+
+{
+  require = [
+    # config.system.activationScripts
+    (import ../system/activate-configuration.nix)
+  ];
+
+  system = {
+    activationScripts = {
+      systemConfig = noDepEntry ''
+        systemConfig="$1"
+        if test -z "$systemConfig"; then
+          systemConfig="/system" # for the installation CD
+        fi
+      '';
+
+      defaultPath =
+        let path = [
+          pkgs.coreutils pkgs.gnugrep pkgs.findutils
+          pkgs.glibc # needed for getent
+          pkgs.pwdutils
+        ]; in noDepEntry ''
+        export PATH=/empty
+        for i in ${toString path}; do
+          PATH=$PATH:$i/bin:$i/sbin;
+        done
+      '';
+
+      stdio = FullDepEntry ''
+        # Needed by some programs.
+        ln -sfn /proc/self/fd /dev/fd
+        ln -sfn /proc/self/fd/0 /dev/stdin
+        ln -sfn /proc/self/fd/1 /dev/stdout
+        ln -sfn /proc/self/fd/2 /dev/stderr
+      '' [
+        activateLib.defaultPath # path to ln
+      ];
+    };
+  };
+}
diff --git a/system/system.nix b/system/system.nix
index 659b647829d..5f05a4ddde8 100644
--- a/system/system.nix
+++ b/system/system.nix
@@ -196,10 +196,13 @@ rec {
   # The script that activates the configuration, i.e., it sets up
   # /etc, accounts, etc.  It doesn't do anything that can only be done
   # at boot time (such as start `init').
+  # DO NOT EXTEND THIS.  You should use the option system-option.nix
   activateConfiguration = pkgs.substituteAll rec {
     src = ./activate-configuration.sh;
     isExecutable = true;
 
+    newActivationScript = config.system.activationScripts.script;
+
     inherit etc wrapperDir systemPath modprobe defaultShell kernel;
     hostName = config.networking.hostName;
     setuidPrograms =
@@ -212,12 +215,6 @@ rec {
 
     inherit (usersGroups) createUsersGroups usersList groupsList;
 
-    path = [
-        pkgs.coreutils pkgs.gnugrep pkgs.findutils
-        pkgs.glibc # needed for getent
-        pkgs.pwdutils
-      ];
-
     bash = pkgs.bashInteractive;
 
     adjustSetuidOwner = pkgs.lib.concatStrings (map 
-- 
GitLab


From 1533dec09df60cbfc75e0b66336a15f91b29875c Mon Sep 17 00:00:00 2001
From: Nicolas Pierron <nicolas.b.pierron@gmail.com>
Date: Fri, 2 Jan 2009 16:06:52 +0000
Subject: [PATCH 1140/5331] * etc/default.nix is now a configuration file. *
 the script used to build the etc directory in stored in
 config.system.build.etc. * The activation script is defined inside
 etc/Default.nix instead of system/activate-configuration.sh

svn path=/nixos/branches/fix-style/; revision=13676
---
 etc/default.nix                  | 129 +++++++++++++++++++----
 system/activate-configuration.sh |  30 ------
 system/options.nix               |  17 +--
 system/system-options.nix        |  72 +++++++++++++
 system/system.nix                | 175 +++++++++++++++----------------
 5 files changed, 270 insertions(+), 153 deletions(-)

diff --git a/etc/default.nix b/etc/default.nix
index de5d6bbd9ad..53ab49d62bd 100644
--- a/etc/default.nix
+++ b/etc/default.nix
@@ -1,20 +1,42 @@
-{ config, pkgs, systemPath, wrapperDir
-, defaultShell
-}:
+# produce a script to generate /etc
+{config, pkgs, ...}:
 
-let 
-  extraEtc = config.environment.etc;
+###### interface
+let
+  inherit (pkgs.lib) mkOption;
+
+  option = {
+    environment = {
+      etc = mkOption {
+        default = [];
+        example = [
+          { source = "/nix/store/.../etc/dir/file.conf.example";
+            target = "dir/file.conf";
+            mode = "0440";
+          }
+        ];
+        description = "
+          List of files that have to be linked in /etc.
+        ";
+      };
+    };
+  };
+in
+
+###### implementation
+let
   nixEnvVars = config.nix.envVars;
   modulesTree = config.system.modulesTree;
   nssModulesPath = config.system.nssModules.path;
-
+  wrapperDir = config.system.wrapperDir;
+  systemPath = config.system.path;
 
   optional = pkgs.lib.optional;
 
 
   # !!! ugh, these files shouldn't be created here.
-    
-    
+
+
   pamConsoleHandlers = pkgs.writeText "console.handlers" ''
     console consoledevs /dev/tty[0-9][0-9]* :[0-9]\.[0-9] :[0-9]
     ${pkgs.pam_console}/sbin/pam_console_apply lock logfail wait -t tty -s -c ${pamConsolePerms}
@@ -23,13 +45,7 @@ let
 
   pamConsolePerms = ./security/console.perms;
 
-  
-in
-
-    
-import ../helpers/make-etc.nix {
-  inherit (pkgs) stdenv;
-
+  # These should be moved into the corresponding configuration files.
   configFiles = [
     { # TCP/UDP port assignments.
       source = pkgs.iana_etc + "/etc/services";
@@ -68,7 +84,7 @@ import ../helpers/make-etc.nix {
       # You cannot login without it!
       source = ./login.defs;
       target = "login.defs";
-    }
+    } 
 
     { # Configuration for passwd and friends (e.g., hash algorithm
       # for /etc/passwd).
@@ -79,7 +95,7 @@ import ../helpers/make-etc.nix {
     { # Configuration for useradd.
       source = pkgs.substituteAll {
         src = ./default/useradd;
-        inherit defaultShell;
+        defaultShell = config.system.shell;
       };
       target = "default/useradd";
     }
@@ -246,7 +262,82 @@ import ../helpers/make-etc.nix {
         source = pkgs.writeText "odbcinst.ini" (pkgs.lib.concatStringsSep "\n" inis);
         target = "odbcinst.ini";
       })
+  ;
+in
+
+let
+  inherit (pkgs.stringsWithDeps) noDepEntry FullDepEntry PackEntry;
+
+  activateLib = config.system.activationScripts.lib;
+
+  copyScript = {source, target, mode ? "644", own ? "root.root"}:
+    assert target != "nixos"; ''
+    source="${source}"
+    target="/etc/${target}"
+    mkdir -p $(dirname "$target")
+    test -e "$target" && rm -f "$target"
+    cp "$source" "$target"
+    chown ${own} "$target"
+    chmod ${mode} "$target"
+  '';
+
+  makeEtc = import ../helpers/make-etc.nix {
+    inherit (pkgs) stdenv;
+    configFiles = configFiles ++ config.environment.etc;
+  };
+in
 
-  # Additional /etc files declared by Upstart jobs.
-  ++ extraEtc;
+{
+  require = [
+    option
+
+    # config.system.build
+    (import ../system/system-options.nix)
+
+    # config.system.activationScripts
+    (import ../system/activate-configuration.nix)
+  ];
+
+  system = {
+    build = {
+      etc = makeEtc;
+    };
+
+    activationScripts = {
+      etc = FullDepEntry ''
+        # Set up the statically computed bits of /etc.
+        staticEtc=/etc/static
+        rm -f $staticEtc
+        ln -s ${makeEtc}/etc $staticEtc
+        for i in $(cd $staticEtc && find * -type l); do
+            mkdir -p /etc/$(dirname $i)
+            rm -f /etc/$i
+            if test -e "$staticEtc/$i.mode"; then
+                # Create a regular file in /etc.
+                cp $staticEtc/$i /etc/$i
+                chown 0.0 /etc/$i
+                chmod "$(cat "$staticEtc/$i.mode")" /etc/$i
+            else
+                # Create a symlink in /etc.
+                ln -s $staticEtc/$i /etc/$i
+            fi
+        done
+
+        # Remove dangling symlinks that point to /etc/static.  These are
+        # configuration files that existed in a previous configuration but not
+        # in the current one.  For efficiency, don't look under /etc/nixos
+        # (where all the NixOS sources live).
+        for i in $(find /etc/ \( -path /etc/nixos -prune \) -o -type l); do
+            target=$(readlink "$i")
+            if test "''${target:0:''${#staticEtc}}" = "$staticEtc" -a ! -e "$i"; then
+                rm -f "$i"
+            fi
+        done
+      '' [
+        activateLib.systemConfig
+        activateLib.defaultPath # path to cp, chmod, chown
+        activateLib.stdio
+      ];
+    };
+  };
 }
diff --git a/system/activate-configuration.sh b/system/activate-configuration.sh
index ea329ce2365..4d2bbc319af 100644
--- a/system/activate-configuration.sh
+++ b/system/activate-configuration.sh
@@ -2,36 +2,6 @@
 
 source @newActivationScript@
 
-# Set up the statically computed bits of /etc.
-staticEtc=/etc/static
-rm -f $staticEtc
-ln -s @etc@/etc $staticEtc
-for i in $(cd $staticEtc && find * -type l); do
-    mkdir -p /etc/$(dirname $i)
-    rm -f /etc/$i
-    if test -e "$staticEtc/$i.mode"; then
-        # Create a regular file in /etc.
-        cp $staticEtc/$i /etc/$i
-        chown 0.0 /etc/$i
-        chmod "$(cat "$staticEtc/$i.mode")" /etc/$i
-    else
-        # Create a symlink in /etc.
-        ln -s $staticEtc/$i /etc/$i
-    fi
-done
-
-
-# Remove dangling symlinks that point to /etc/static.  These are
-# configuration files that existed in a previous configuration but not
-# in the current one.  For efficiency, don't look under /etc/nixos
-# (where all the NixOS sources live).
-for i in $(find /etc/ \( -path /etc/nixos -prune \) -o -type l); do
-    target=$(readlink "$i")
-    if test "${target:0:${#staticEtc}}" = "$staticEtc" -a ! -e "$i"; then
-        rm -f "$i"
-    fi
-done
-
 
 # Create the required /bin/sh symlink; otherwise lots of things
 # (notably the system() function) won't work.
diff --git a/system/options.nix b/system/options.nix
index ce7667b2fa8..be544d80677 100644
--- a/system/options.nix
+++ b/system/options.nix
@@ -2853,20 +2853,6 @@ root        ALL=(ALL) SETENV: ALL
       ";
     };
 
-    # should be moved to etc/default.nix
-    etc = mkOption {
-      default = [];
-      example = [
-        { source = "/nix/store/.../etc/dir/file.conf.example";
-          target = "dir/file.conf";
-          mode = "0440";
-        }
-      ];
-      description = "
-        List of files that have to be linked in /etc.
-      ";
-    };
-
     nix = mkOption {
       default = pkgs.nixUnstable;
       example = pkgs.nixCustomFun /root/nix.tar.gz;
@@ -2916,6 +2902,9 @@ root        ALL=(ALL) SETENV: ALL
     (import ../system/activate-configuration.nix)
     (import ../upstart-jobs/default.nix)
 
+    # environment
+    (import ../etc/default.nix)
+
     # newtworking
     (import ../upstart-jobs/dhclient.nix)
 
diff --git a/system/system-options.nix b/system/system-options.nix
index 1924db9aec8..0514e87dc67 100644
--- a/system/system-options.nix
+++ b/system/system-options.nix
@@ -1,6 +1,76 @@
 # this file contains all extendable options originally defined in system.nix
 {pkgs, config, ...}:
 
+###### interface
+let
+  inherit (pkgs.lib) mkOption;
+
+  option = {
+    system = {
+      build = mkOption {
+        default = {};
+        description = ''
+          Attribute set of derivation used to setup the system.  The system
+          is built by aggregating all derivations.
+        '';
+        apply = components: components // {
+          # all components have to build directories
+          result = pkgs.buildEnv {
+            name = "system";
+            paths = pkgs.lib.mapRecordFlatten (n: v: v) components;
+          };
+        };
+      };
+
+      shell = mkOption {
+        default = "/var/run/current-system/sw/bin/bash";
+        description = ''
+          You should not redefine this option unless you want to change the
+          bash version for security issues.
+        '';
+        merge = list:
+          assert list != [] && builtins.tail list == [];
+          builtins.head list;
+      };
+
+      wrapperDir = mkOption {
+        default = "/var/setuid-wrappers";
+        description = ''
+          You should not redefine this option unless you want to change the
+          path for security issues.
+        '';
+      };
+
+      overridePath = mkOption {
+        default = [];
+        description = ''
+          You should not redefine this option unless you have trouble with a
+          package define in <varname>path</varname>.
+        '';
+      };
+
+      path = mkOption {
+        default = [];
+        description = ''
+          The packages you want in the boot environment.
+        '';
+        apply = list: pkgs.buildEnv {
+          name = "system-path";
+          paths = config.system.overridePath ++ list;
+
+          # Note: We need `/lib' to be among `pathsToLink' for NSS modules
+          # to work.
+          inherit (config.environment) pathsToLink;
+
+          ignoreCollisions = true;
+        };
+      };
+
+    };
+  };
+in
+
+###### implementation
 let
   inherit (pkgs.stringsWithDeps) noDepEntry FullDepEntry PackEntry;
 
@@ -9,6 +79,8 @@ in
 
 {
   require = [
+    option
+
     # config.system.activationScripts
     (import ../system/activate-configuration.nix)
   ];
diff --git a/system/system.nix b/system/system.nix
index 5f05a4ddde8..cf0ec45a9e4 100644
--- a/system/system.nix
+++ b/system/system.nix
@@ -8,6 +8,7 @@ rec {
   configComponents = [
     configuration
     (import ./options.nix)
+    systemPathList
   ];
 
   noOption = name: values:
@@ -66,12 +67,9 @@ rec {
   # Environment variables for running Nix.
   nixEnvVars = config.nix.envVars;
 
-              
+
   # The static parts of /etc.
-  etc = import ../etc/default.nix {
-    inherit config pkgs systemPath wrapperDir
-      defaultShell;
-  };
+  etc = config.system.build.etc;
 
   
   # Font aggregation
@@ -84,7 +82,7 @@ rec {
   
   # The wrapper setuid programs (since we can't have setuid programs
   # in the Nix store).
-  wrapperDir = "/var/setuid-wrappers";
+  wrapperDir = config.system.wrapperDir;
   
   setuidWrapper = import ../helpers/setuid {
     inherit (pkgs) stdenv;
@@ -99,100 +97,97 @@ rec {
   
 
   # The packages you want in the boot environment.
-  systemPathList = [
-    # Better leave them here - they are small, needed,
-    # and hard to refer from anywhere outside.
-    modprobe # must take precedence over module_init_tools
-    mount # must take precedence over util-linux
-    nix
-    nixosTools.nixosInstall
-    nixosTools.nixosRebuild
-    nixosTools.nixosCheckout
-    nixosTools.nixosHardwareScan
-    nixosTools.nixosGenSeccureKeys
-    setuidWrapper
-  ]
-  ++ pkgs.lib.optionals (!config.environment.cleanStart) [
-    pkgs.bashInteractive # bash with ncurses support
-    pkgs.bzip2
-    pkgs.coreutils
-    pkgs.cpio
-    pkgs.curl
-    pkgs.e2fsprogs
-    pkgs.findutils
-    pkgs.glibc # for ldd, getent
-    pkgs.gnugrep
-    pkgs.gnused
-    pkgs.gnutar
-    pkgs.grub
-    pkgs.gzip
-    pkgs.iputils
-    pkgs.less
-    pkgs.lvm2
-    pkgs.man
-    pkgs.mdadm
-    pkgs.module_init_tools
-    pkgs.nano
-    pkgs.ncurses
-    pkgs.netcat
-    pkgs.nettools
-    pkgs.ntp
-    pkgs.openssh
-    pkgs.pciutils
-    pkgs.perl
-    pkgs.procps
-    pkgs.pwdutils
-    pkgs.reiserfsprogs
-    pkgs.rsync
-    pkgs.seccureUser
-    pkgs.strace
-    pkgs.su
-    pkgs.sysklogd
-    pkgs.sysvtools
-    pkgs.time
-    pkgs.udev
-    pkgs.upstart
-    pkgs.usbutils
-    pkgs.utillinux
-    pkgs.wirelesstools
-  ]
-  ++ pkgs.lib.optional config.security.sudo.enable pkgs.sudo
-  ++ pkgs.lib.optional config.services.atd.enable pkgs.at
-  ++ pkgs.lib.optional config.services.bitlbee.enable pkgs.bitlbee
-  ++ pkgs.lib.optional config.networking.defaultMailServer.directDelivery pkgs.ssmtp 
-  ++ config.environment.extraPackages
-  ++ pkgs.lib.optional config.fonts.enableFontDir fontDir
-  ++ pkgs.lib.optional config.hardware.enableGo7007 kernelPackages.wis_go7007
-
-  # NSS modules need to be in `systemPath' so that (i) the builder
-  # chroot gets to seem them, and (ii) applications can benefit from
-  # changes in the list of NSS modules at run-time, without requiring
-  # a reboot.
-  ++ nssModules;
+  # This have to be split up.
+  systemPathList = {
+    system = {
+      overridePath = [
+        # Better leave them here - they are small, needed,
+        # and hard to refer from anywhere outside.
+        modprobe # must take precedence over module_init_tools
+        mount # must take precedence over util-linux
+        nix
+        nixosTools.nixosInstall
+        nixosTools.nixosRebuild
+        nixosTools.nixosCheckout
+        nixosTools.nixosHardwareScan
+        nixosTools.nixosGenSeccureKeys
+        setuidWrapper
+      ];
+      path =
+        pkgs.lib.optionals (!config.environment.cleanStart) [
+        pkgs.bashInteractive # bash with ncurses support
+        pkgs.bzip2
+        pkgs.coreutils
+        pkgs.cpio
+        pkgs.curl
+        pkgs.e2fsprogs
+        pkgs.findutils
+        pkgs.glibc # for ldd, getent
+        pkgs.gnugrep
+        pkgs.gnused
+        pkgs.gnutar
+        pkgs.grub
+        pkgs.gzip
+        pkgs.iputils
+        pkgs.less
+        pkgs.lvm2
+        pkgs.man
+        pkgs.mdadm
+        pkgs.module_init_tools
+        pkgs.nano
+        pkgs.ncurses
+        pkgs.netcat
+        pkgs.nettools
+        pkgs.ntp
+        pkgs.openssh
+        pkgs.pciutils
+        pkgs.perl
+        pkgs.procps
+        pkgs.pwdutils
+        pkgs.reiserfsprogs
+        pkgs.rsync
+        pkgs.seccureUser
+        pkgs.strace
+        pkgs.su
+        pkgs.sysklogd
+        pkgs.sysvtools
+        pkgs.time
+        pkgs.udev
+        pkgs.upstart
+        pkgs.usbutils
+        pkgs.utillinux
+        pkgs.wirelesstools
+      ]
+      ++ pkgs.lib.optional config.security.sudo.enable pkgs.sudo
+      ++ pkgs.lib.optional config.services.atd.enable pkgs.at
+      ++ pkgs.lib.optional config.services.bitlbee.enable pkgs.bitlbee
+      ++ pkgs.lib.optional config.networking.defaultMailServer.directDelivery pkgs.ssmtp 
+      ++ config.environment.extraPackages
+      ++ pkgs.lib.optional config.fonts.enableFontDir fontDir
+      ++ pkgs.lib.optional config.hardware.enableGo7007 kernelPackages.wis_go7007
+
+      # NSS modules need to be in `systemPath' so that (i) the builder
+      # chroot gets to seem them, and (ii) applications can benefit from
+      # changes in the list of NSS modules at run-time, without requiring
+      # a reboot.
+      ++ nssModules;
+    };
+  };
+
 
-  
   # We don't want to put all of `startPath' and `path' in $PATH, since
   # then we get an embarrassingly long $PATH.  So use the user
   # environment builder to make a directory with symlinks to those
   # packages.
-  systemPath = pkgs.buildEnv {
-    name = "system-path";
-    paths = systemPathList;
-
-    # Note: We need `/lib' to be among `pathsToLink' for NSS modules
-    # to work.
-    inherit (config.environment) pathsToLink;
-
-    ignoreCollisions = true;
-  };
+  systemPath = config.system.path;
 
 
   usersGroups = import ./users-groups.nix { inherit pkgs config defaultShell; };
 
 
-  defaultShell = "/var/run/current-system/sw/bin/bash";
+  defaultShell = config.system.shell;
+
 
-    
   # The script that activates the configuration, i.e., it sets up
   # /etc, accounts, etc.  It doesn't do anything that can only be done
   # at boot time (such as start `init').
@@ -203,7 +198,7 @@ rec {
 
     newActivationScript = config.system.activationScripts.script;
 
-    inherit etc wrapperDir systemPath modprobe defaultShell kernel;
+    inherit wrapperDir systemPath modprobe defaultShell kernel;
     hostName = config.networking.hostName;
     setuidPrograms =
       config.security.setuidPrograms ++
-- 
GitLab


From 8d5553a4d5b97880be0b1eddc9c826ef1e976dbe Mon Sep 17 00:00:00 2001
From: Nicolas Pierron <nicolas.b.pierron@gmail.com>
Date: Fri, 2 Jan 2009 16:06:56 +0000
Subject: [PATCH 1141/5331] move some command to activate the configuration
 from activate-configuration.sh to system-options.nix.

svn path=/nixos/branches/fix-style/; revision=13677
---
 system/activate-configuration.sh | 54 -------------------------
 system/system-options.nix        | 69 ++++++++++++++++++++++++++++++++
 2 files changed, 69 insertions(+), 54 deletions(-)

diff --git a/system/activate-configuration.sh b/system/activate-configuration.sh
index 4d2bbc319af..d71987ff9a7 100644
--- a/system/activate-configuration.sh
+++ b/system/activate-configuration.sh
@@ -3,60 +3,6 @@
 source @newActivationScript@
 
 
-# Create the required /bin/sh symlink; otherwise lots of things
-# (notably the system() function) won't work.
-mkdir -m 0755 -p $mountPoint/bin
-ln -sfn @bash@/bin/sh $mountPoint/bin/sh
-
-
-# Allow the kernel to find our wrapped modprobe (which searches in the
-# right location in the Nix store for kernel modules).  We need this
-# when the kernel (or some module) auto-loads a module.
-# !!! maybe this should only happen at boot time, since we shouldn't
-# use modules that don't match the running kernel.
-echo @modprobe@/sbin/modprobe > /proc/sys/kernel/modprobe
-
-
-# Various log/runtime directories.
-mkdir -m 0755 -p /var/run
-mkdir -m 0755 -p /var/run/console # for pam_console
-
-touch /var/run/utmp # must exist
-chmod 644 /var/run/utmp
-
-mkdir -m 0755 -p /var/run/nix/current-load # for distributed builds
-mkdir -m 0700 -p /var/run/nix/remote-stores
-
-mkdir -m 0755 -p /var/log
-
-touch /var/log/wtmp # must exist
-chmod 644 /var/log/wtmp
-
-touch /var/log/lastlog
-chmod 644 /var/log/lastlog
-
-mkdir -m 1777 -p /var/tmp
-
-
-# Empty, read-only home directory of many system accounts.
-mkdir -m 0555 -p /var/empty
-
-
-# If there is no password file yet, create a root account with an
-# empty password.
-if ! test -e /etc/passwd; then
-    rootHome=/root
-    touch /etc/passwd; chmod 0644 /etc/passwd
-    touch /etc/group; chmod 0644 /etc/group
-    touch /etc/shadow; chmod 0600 /etc/shadow
-    # Can't use useradd, since it complains that it doesn't know us
-    # (bootstrap problem!). 
-    echo "root:x:0:0:System administrator:$rootHome:@defaultShell@" >> /etc/passwd
-    echo "root::::::::" >> /etc/shadow
-    echo | passwd --stdin root
-fi
-
-
 # Create system users and groups.
 @shell@ @createUsersGroups@ @usersList@ @groupsList@
 
diff --git a/system/system-options.nix b/system/system-options.nix
index 0514e87dc67..ff1adfedd30 100644
--- a/system/system-options.nix
+++ b/system/system-options.nix
@@ -115,6 +115,75 @@ in
       '' [
         activateLib.defaultPath # path to ln
       ];
+
+      binsh = FullDepEntry ''
+        # Create the required /bin/sh symlink; otherwise lots of things
+        # (notably the system() function) won't work.
+        mkdir -m 0755 -p $mountPoint/bin
+        ln -sfn @bash@/bin/sh $mountPoint/bin/sh
+      '' [
+        activateLib.defaultPath # path to ln & mkdir
+        activateLib.stdio # ?
+      ];
+
+      modprobe = FullDepEntry ''
+        # Allow the kernel to find our wrapped modprobe (which searches in the
+        # right location in the Nix store for kernel modules).  We need this
+        # when the kernel (or some module) auto-loads a module.
+        # !!! maybe this should only happen at boot time, since we shouldn't
+        # use modules that don't match the running kernel.
+        echo @modprobe@/sbin/modprobe > /proc/sys/kernel/modprobe
+      '' [
+        # ?
+      ];
+
+      var = FullDepEntry ''
+        # Various log/runtime directories.
+        mkdir -m 0755 -p /var/run
+        mkdir -m 0755 -p /var/run/console # for pam_console
+
+        touch /var/run/utmp # must exist
+        chmod 644 /var/run/utmp
+
+        mkdir -m 0755 -p /var/run/nix/current-load # for distributed builds
+        mkdir -m 0700 -p /var/run/nix/remote-stores
+
+        mkdir -m 0755 -p /var/log
+
+        touch /var/log/wtmp # must exist
+        chmod 644 /var/log/wtmp
+
+        touch /var/log/lastlog
+        chmod 644 /var/log/lastlog
+
+        mkdir -m 1777 -p /var/tmp
+
+
+        # Empty, read-only home directory of many system accounts.
+        mkdir -m 0555 -p /var/empty
+      '' [
+        activateLib.defaultPath # path to mkdir & touch & chmod
+      ];
+
+      rootPasswd = FullDepEntry ''
+        # If there is no password file yet, create a root account with an
+        # empty password.
+        if ! test -e /etc/passwd; then
+            rootHome=/root
+            touch /etc/passwd; chmod 0644 /etc/passwd
+            touch /etc/group; chmod 0644 /etc/group
+            touch /etc/shadow; chmod 0600 /etc/shadow
+            # Can't use useradd, since it complains that it doesn't know us
+            # (bootstrap problem!).
+            echo "root:x:0:0:System administrator:$rootHome:@defaultShell@" >> /etc/passwd
+            echo "root::::::::" >> /etc/shadow
+            echo | passwd --stdin root
+        fi
+      '' [
+        activateLib.defaultPath # path to touch & passwd
+        activateLib.etc # for /etc
+        # ?
+      ];
     };
   };
 }
-- 
GitLab


From 145345c307fb77c321c319a7bb105a09e1ffab09 Mon Sep 17 00:00:00 2001
From: Nicolas Pierron <nicolas.b.pierron@gmail.com>
Date: Fri, 2 Jan 2009 16:07:01 +0000
Subject: [PATCH 1142/5331] system/users-groups.nix is now a configuration
 file. Remove user & group references from system/system.nix.

svn path=/nixos/branches/fix-style/; revision=13678
---
 helpers/create-users-groups.sh   |  62 -------------
 system/activate-configuration.sh |   4 -
 system/options.nix               |  33 +------
 system/system.nix                |   5 -
 system/users-groups.nix          | 152 +++++++++++++++++++++++++++++--
 5 files changed, 147 insertions(+), 109 deletions(-)
 delete mode 100644 helpers/create-users-groups.sh

diff --git a/helpers/create-users-groups.sh b/helpers/create-users-groups.sh
deleted file mode 100644
index 81aaacacd80..00000000000
--- a/helpers/create-users-groups.sh
+++ /dev/null
@@ -1,62 +0,0 @@
-cat "$2" | while true; do
-    read name || break
-    read gid
-
-    if ! curEnt=$(getent group "$name"); then
-        echo "creating group $name..."
-        groupadd --system \
-            "$name" \
-            ${gid:+--gid $gid}
-    else
-        #echo "updating group $name..."
-        oldIFS="$IFS"; IFS=:; set -- $curEnt; IFS="$oldIFS"
-        prevGid=$3
-        if test -n "$gid" -a "$prevGid" != "$gid"; then
-            groupmod "$name" --gid $gid
-        fi
-    fi
-done
-
-
-cat "$1" | while true; do
-    read name || break
-    read description
-    read uid
-    read group
-    read extraGroups
-    read home
-    read shell
-    read createHome
-
-    if ! curEnt=$(getent passwd "$name"); then
-        echo "creating user $name..."
-        useradd --system \
-            "$name" \
-            --comment "$description" \
-            ${uid:+--uid $uid} \
-            --gid "$group" \
-            --groups "$extraGroups" \
-            --home "$home" \
-            --shell "$shell" \
-            ${createHome:+--create-home}
-    else
-        #echo "updating user $name..."
-        oldIFS="$IFS"; IFS=:; set -- $curEnt; IFS="$oldIFS"
-        prevUid=$3
-        prevHome=$6
-        # Don't change the UID if it's the same, otherwise usermod
-        # will complain.
-        if test "$prevUid" = "$uid"; then unset uid; fi
-        # Don't change the home directory if it's the same to prevent
-        # unnecessary warnings about logged in users.
-        if test "$prevHome" = "$home"; then unset home; fi
-        usermod \
-            "$name" \
-            --comment "$description" \
-            ${uid:+--uid $uid} \
-            --gid "$group" \
-            --groups "$extraGroups" \
-            ${home:+--home "$home"} \
-            --shell "$shell"
-    fi
-done
diff --git a/system/activate-configuration.sh b/system/activate-configuration.sh
index d71987ff9a7..c9bb6f3b66a 100644
--- a/system/activate-configuration.sh
+++ b/system/activate-configuration.sh
@@ -3,10 +3,6 @@
 source @newActivationScript@
 
 
-# Create system users and groups.
-@shell@ @createUsersGroups@ @usersList@ @groupsList@
-
-
 # Set up Nix.
 mkdir -p /nix/etc/nix
 ln -sfn /etc/nix.conf /nix/etc/nix/nix.conf
diff --git a/system/options.nix b/system/options.nix
index be544d80677..a7fc27db90f 100644
--- a/system/options.nix
+++ b/system/options.nix
@@ -2663,36 +2663,6 @@ root        ALL=(ALL) SETENV: ALL
 
   users = {
 
-    extraUsers = mkOption {
-      default = [];
-      example = [
-        { name = "alice";
-          uid = 1234;
-          description = "Alice";
-          home = "/home/alice";
-          createHome = true;
-          group = "users";
-          extraGroups = ["wheel"];
-          shell = "/bin/sh";
-        }
-      ];
-      description = "
-        Additional user accounts to be created automatically by the system.
-      ";
-    };
-
-    extraGroups = mkOption {
-      default = [];
-      example = [
-        { name = "students";
-          gid = 1001;
-        }
-      ];
-      description = "
-        Additional groups to be created automatically by the system.
-      ";
-    };
-
     ldap = {
 
       enable = mkOption {
@@ -2905,6 +2875,9 @@ root        ALL=(ALL) SETENV: ALL
     # environment
     (import ../etc/default.nix)
 
+    # users
+    (import ../system/users-groups.nix)
+
     # newtworking
     (import ../upstart-jobs/dhclient.nix)
 
diff --git a/system/system.nix b/system/system.nix
index cf0ec45a9e4..7dda2b95002 100644
--- a/system/system.nix
+++ b/system/system.nix
@@ -182,9 +182,6 @@ rec {
   systemPath = config.system.path;
 
 
-  usersGroups = import ./users-groups.nix { inherit pkgs config defaultShell; };
-
-
   defaultShell = config.system.shell;
 
 
@@ -208,8 +205,6 @@ rec {
       pkgs.lib.optional (config.services.xserver.sessionType == "kde") "kcheckpass" ++
       map ( x : x.program ) config.security.setuidOwners;
 
-    inherit (usersGroups) createUsersGroups usersList groupsList;
-
     bash = pkgs.bashInteractive;
 
     adjustSetuidOwner = pkgs.lib.concatStrings (map 
diff --git a/system/users-groups.nix b/system/users-groups.nix
index 48c4db65bdf..f1bd59a2f36 100644
--- a/system/users-groups.nix
+++ b/system/users-groups.nix
@@ -1,8 +1,48 @@
-{pkgs, config, defaultShell}:
+{pkgs, config, ...}:
 
-let ids = import ./ids.nix; in
+###### interface
+let
+  inherit (pkgs.lib) mkOption;
 
-rec {
+  options = {
+    users = {
+      extraUsers = mkOption {
+        default = [];
+        example = [
+          { name = "alice";
+            uid = 1234;
+            description = "Alice";
+            home = "/home/alice";
+            createHome = true;
+            group = "users";
+            extraGroups = ["wheel"];
+            shell = "/bin/sh";
+          }
+        ];
+        description = "
+          Additional user accounts to be created automatically by the system.
+        ";
+      };
+
+      extraGroups = mkOption {
+        default = [];
+        example = [
+          { name = "students";
+            gid = 1001;
+          }
+        ];
+        description = "
+          Additional groups to be created automatically by the system.
+        ";
+      };
+    };
+  };
+in
+
+###### implementation
+let
+  ids = import ./ids.nix;
+  defaultShell = config.system.shell;
 
   # User accounts to be created/updated by NixOS.
   users =
@@ -93,10 +133,106 @@ rec {
 
     in map addAttrs (defaultGroups ++ config.users.extraGroups);
 
+  inherit (pkgs.lib) concatStringsSep;
+
+  serializedUser = u: "${u.name}\n${u.description}\n${toString u.uid}\n${u.group}\n${toString (concatStringsSep "," u.extraGroups)}\n${u.home}\n${u.shell}\n${toString u.createHome}";
+  serializedGroup = g: "${g.name}\n${toString g.gid}";
+in
+
+let
+  inherit (pkgs.stringsWithDeps) FullDepEntry;
+
+  activateLib = config.system.activationScripts.lib;
+in
+
+{
+  require = [
+    options
+
+    # config.system.activationScripts
+    (import ../system/activate-configuration.nix)
+  ];
+
+  system = {
+    activationScripts = {
+
+      users = FullDepEntry ''
+        while true; do
+            read name || break
+            read description
+            read uid
+            read group
+            read extraGroups
+            read home
+            read shell
+            read createHome
+
+            if ! curEnt=$(getent passwd "$name"); then
+                echo "creating user $name..."
+                useradd --system \
+                    "$name" \
+                    --comment "$description" \
+                    ''${uid:+--uid $uid} \
+                    --gid "$group" \
+                    --groups "$extraGroups" \
+                    --home "$home" \
+                    --shell "$shell" \
+                    ''${createHome:+--create-home}
+            else
+                #echo "updating user $name..."
+                oldIFS="$IFS"; IFS=:; set -- $curEnt; IFS="$oldIFS"
+                prevUid=$3
+                prevHome=$6
+                # Don't change the UID if it's the same, otherwise usermod
+                # will complain.
+                if test "$prevUid" = "$uid"; then unset uid; fi
+                # Don't change the home directory if it's the same to prevent
+                # unnecessary warnings about logged in users.
+                if test "$prevHome" = "$home"; then unset home; fi
+                usermod \
+                    "$name" \
+                    --comment "$description" \
+                    ''${uid:+--uid $uid} \
+                    --gid "$group" \
+                    --groups "$extraGroups" \
+                    ''${home:+--home "$home"} \
+                    --shell "$shell"
+            fi
+        done <<EndOfUserList
+        ${concatStringsSep "\n" (map serializedUser users)}
+        EndOfUserList
+      '' [
+        activateLib.groups
+      ];
+
+      groups = FullDepEntry ''
+        while true; do
+            read name || break
+            read gid
+
+            if ! curEnt=$(getent group "$name"); then
+                echo "creating group $name..."
+                groupadd --system \
+                    "$name" \
+                    ''${gid:+--gid $gid}
+            else
+                #echo "updating group $name..."
+                oldIFS="$IFS"; IFS=:; set -- $curEnt; IFS="$oldIFS"
+                prevGid=$3
+                if test -n "$gid" -a "$prevGid" != "$gid"; then
+                    groupmod "$name" --gid $gid
+                fi
+            fi
+        done <<EndOfGroupList
+        ${concatStringsSep "\n" (map serializedGroup groups)}
+        EndOfGroupList
+      '' [
+        activateLib.rootPasswd
+        activateLib.binsh
+        activateLib.etc
+        activateLib.var
+      ];
 
-  # Awful hackery necessary to pass the users/groups to the activation script.
-  createUsersGroups = ../helpers/create-users-groups.sh;
-  usersList = pkgs.writeText "users" (pkgs.lib.concatStrings (map (u: "${u.name}\n${u.description}\n${toString u.uid}\n${u.group}\n${toString (pkgs.lib.concatStringsSep "," u.extraGroups)}\n${u.home}\n${u.shell}\n${toString u.createHome}\n") users));
-  groupsList = pkgs.writeText "groups" (pkgs.lib.concatStrings (map (g: "${g.name}\n${toString g.gid}\n") groups));
-    
+    };
+  };
 }
-- 
GitLab


From 86ad3e36d515ac21a56406bd2381ba45c7df723b Mon Sep 17 00:00:00 2001
From: Nicolas Pierron <nicolas.b.pierron@gmail.com>
Date: Fri, 2 Jan 2009 16:07:05 +0000
Subject: [PATCH 1143/5331] Move Nix setup from system/active-configuration.sh
 to system/system-options.nix.

svn path=/nixos/branches/fix-style/; revision=13679
---
 system/activate-configuration.sh | 25 -------------------------
 system/system-options.nix        | 29 +++++++++++++++++++++++++++++
 2 files changed, 29 insertions(+), 25 deletions(-)

diff --git a/system/activate-configuration.sh b/system/activate-configuration.sh
index c9bb6f3b66a..7b3bf5d2532 100644
--- a/system/activate-configuration.sh
+++ b/system/activate-configuration.sh
@@ -3,31 +3,6 @@
 source @newActivationScript@
 
 
-# Set up Nix.
-mkdir -p /nix/etc/nix
-ln -sfn /etc/nix.conf /nix/etc/nix/nix.conf
-chown root.nixbld /nix/store
-chmod 1775 /nix/store
-
-
-# Nix initialisation.
-mkdir -m 0755 -p \
-    /nix/var/nix/gcroots \
-    /nix/var/nix/temproots \
-    /nix/var/nix/manifests \
-    /nix/var/nix/userpool \
-    /nix/var/nix/profiles \
-    /nix/var/nix/db \
-    /nix/var/log/nix/drvs \
-    /nix/var/nix/channel-cache \
-    /nix/var/nix/chroots
-mkdir -m 1777 -p /nix/var/nix/gcroots/per-user
-mkdir -m 1777 -p /nix/var/nix/profiles/per-user
-
-ln -sf /nix/var/nix/profiles /nix/var/nix/gcroots/
-ln -sf /nix/var/nix/manifests /nix/var/nix/gcroots/
-
-
 # Make a few setuid programs work.
 PATH=@systemPath@/bin:@systemPath@/sbin:$PATH
 save_PATH="$PATH"
diff --git a/system/system-options.nix b/system/system-options.nix
index ff1adfedd30..3ff76210b84 100644
--- a/system/system-options.nix
+++ b/system/system-options.nix
@@ -184,6 +184,35 @@ in
         activateLib.etc # for /etc
         # ?
       ];
+
+      nix = FullDepEntry ''
+        # Set up Nix.
+        mkdir -p /nix/etc/nix
+        ln -sfn /etc/nix.conf /nix/etc/nix/nix.conf
+        chown root.nixbld /nix/store
+        chmod 1775 /nix/store
+
+        # Nix initialisation.
+        mkdir -m 0755 -p \
+            /nix/var/nix/gcroots \
+            /nix/var/nix/temproots \
+            /nix/var/nix/manifests \
+            /nix/var/nix/userpool \
+            /nix/var/nix/profiles \
+            /nix/var/nix/db \
+            /nix/var/log/nix/drvs \
+            /nix/var/nix/channel-cache \
+            /nix/var/nix/chroots
+        mkdir -m 1777 -p /nix/var/nix/gcroots/per-user
+        mkdir -m 1777 -p /nix/var/nix/profiles/per-user
+
+        ln -sf /nix/var/nix/profiles /nix/var/nix/gcroots/
+        ln -sf /nix/var/nix/manifests /nix/var/nix/gcroots/
+      '' [
+        activateLib.defaultPath
+        activateLib.etc # /etc/nix.conf
+        activateLib.users # nixbld group
+      ];
     };
   };
 }
-- 
GitLab


From 79bfab0e07ddb5863fe5cf2ec9ba66ae1538309e Mon Sep 17 00:00:00 2001
From: Nicolas Pierron <nicolas.b.pierron@gmail.com>
Date: Fri, 2 Jan 2009 16:07:10 +0000
Subject: [PATCH 1144/5331] convert "upstart-jobs/atd.nix" to a configuration
 file.  Remove extra occurrences of "atd" from other files.

svn path=/nixos/branches/fix-style/; revision=13680
---
 etc/default.nix          |   1 -
 system/options.nix       |  20 +------
 system/system.nix        |   2 -
 upstart-jobs/atd.nix     | 110 ++++++++++++++++++++++++++++++++-------
 upstart-jobs/default.nix |   7 ---
 5 files changed, 91 insertions(+), 49 deletions(-)

diff --git a/etc/default.nix b/etc/default.nix
index 53ab49d62bd..d05ae3f6c87 100644
--- a/etc/default.nix
+++ b/etc/default.nix
@@ -224,7 +224,6 @@ let
       }
     )
     [
-      "atd"
       "login"
       "slim"
       "su"
diff --git a/system/options.nix b/system/options.nix
index a7fc27db90f..a85564aa62e 100644
--- a/system/options.nix
+++ b/system/options.nix
@@ -693,25 +693,6 @@ in
     };
 
 
-    atd = {
-
-      enable = mkOption {
-        default = true;
-        description = ''
-          Whether to enable the `at' daemon, a command scheduler.
-        '';
-      };
-
-      allowEveryone = mkOption {
-        default = false;
-        description = ''
-          Whether to make /var/spool/at{jobs,spool} writeable 
-          by everyone (and sticky).
-        '';
-      };
-    };
-
-
     ttyBackgrounds = {
 
       enable = mkOption {
@@ -2886,6 +2867,7 @@ root        ALL=(ALL) SETENV: ALL
 
     # services
     (import ../upstart-jobs/avahi-daemon.nix)
+    (import ../upstart-jobs/atd.nix)
     (import ../upstart-jobs/dbus.nix)
     (import ../upstart-jobs/hal.nix)
     (import ../upstart-jobs/gpm.nix)
diff --git a/system/system.nix b/system/system.nix
index 7dda2b95002..4ca281a9fc8 100644
--- a/system/system.nix
+++ b/system/system.nix
@@ -159,7 +159,6 @@ rec {
         pkgs.wirelesstools
       ]
       ++ pkgs.lib.optional config.security.sudo.enable pkgs.sudo
-      ++ pkgs.lib.optional config.services.atd.enable pkgs.at
       ++ pkgs.lib.optional config.services.bitlbee.enable pkgs.bitlbee
       ++ pkgs.lib.optional config.networking.defaultMailServer.directDelivery pkgs.ssmtp 
       ++ config.environment.extraPackages
@@ -201,7 +200,6 @@ rec {
       config.security.setuidPrograms ++
       config.security.extraSetuidPrograms ++
       pkgs.lib.optional config.security.sudo.enable "sudo" ++
-      pkgs.lib.optionals config.services.atd.enable ["at" "atq" "atrm"] ++
       pkgs.lib.optional (config.services.xserver.sessionType == "kde") "kcheckpass" ++
       map ( x : x.program ) config.security.setuidOwners;
 
diff --git a/upstart-jobs/atd.nix b/upstart-jobs/atd.nix
index 8a775d0c5d7..b477a38eee4 100644
--- a/upstart-jobs/atd.nix
+++ b/upstart-jobs/atd.nix
@@ -1,24 +1,50 @@
-{ at, config }:
+{pkgs, config, ...}:
 
-let uid = (import ../system/ids.nix).uids.atd;
-    gid = (import ../system/ids.nix).gids.atd;
+###### interface
+let
+  inherit (pkgs.lib) mkOption;
+
+  options = {
+    services = {
+      atd = {
+
+        enable = mkOption {
+          default = true;
+          description = ''
+            Whether to enable the `at' daemon, a command scheduler.
+          '';
+        };
+
+        allowEveryone = mkOption {
+          default = false;
+          description = ''
+            Whether to make /var/spool/at{jobs,spool} writeable 
+            by everyone (and sticky).
+          '';
+        };
+      };
+
+    };
+  };
 in
-{
-  name = "atd";
-  
-  users = [
-    { name = "atd";
-      inherit uid;
-      description = "atd user";
-      home = "/var/empty";
-    }
-  ];
 
-  groups = [
-    { name = "atd";
-      inherit gid;
-    }
-  ];
+###### implementation
+let
+  cfg = config.services.atd;
+  inherit (pkgs.lib) mkIf;
+  inherit (pkgs) at;
+
+  user = {
+    name = "atd";
+    uid = (import ../system/ids.nix).uids.atd;
+    description = "atd user";
+    home = "/var/empty";
+  };
+
+  group = {
+    name = "atd";
+    gid = (import ../system/ids.nix).gids.atd;
+  };
 
   job = ''
 description "at daemon (atd)"
@@ -44,7 +70,7 @@ start script
      fi
    done
    chmod 1770 "$spooldir" "$jobdir"
-   ${if config.allowEveryone then ''chmod a+rwxt "$spooldir" "$jobdir" '' else ""}
+   ${if cfg.allowEveryone then ''chmod a+rwxt "$spooldir" "$jobdir" '' else ""}
    if [ ! -f "$etcdir"/at.deny ]
    then
        touch "$etcdir"/at.deny && \
@@ -61,5 +87,49 @@ end script
 
 respawn ${at}/sbin/atd
 '';
-  
+in
+
+mkIf cfg.enable {
+  require = [
+    options
+
+    # config.services.extraJobs
+    (import ../upstart-jobs/default.nix)
+
+    # config.environment.etc
+    (import ../etc/default.nix)
+
+    # users.*
+    (import ../system/users-groups.nix)
+
+    # (import ?) # config.environment.extraPackages
+    # (import ?) # config.security.extraSetuidPrograms
+  ];
+
+  security = {
+    extraSetuidPrograms = [
+      "at" "atq" "atrm"
+    ];
+  };
+
+  environment = {
+    extraPackages = [ at ];
+
+    etc = [{
+      source = ../etc/pam.d/atd;
+      target = "pam.d/atd";
+    }];
+  };
+
+  users = {
+    extraUsers = [user];
+    extraGroups = [group];
+  };
+
+  services = {
+    extraJobs = [{
+      name = "atd";
+      inherit job;
+    }];
+  };
 }
diff --git a/upstart-jobs/default.nix b/upstart-jobs/default.nix
index 47d2a0ec422..f2f0c90a602 100644
--- a/upstart-jobs/default.nix
+++ b/upstart-jobs/default.nix
@@ -220,13 +220,6 @@ let
 
   ])
 
-  # At daemon.
-  ++ optional config.services.atd.enable
-    (import ../upstart-jobs/atd.nix {
-      at = pkgs.at;
-      config = config.services.atd;
-     })
-
   # ifplugd daemon for monitoring Ethernet cables.
   ++ optional config.networking.interfaceMonitor.enable
     (import ../upstart-jobs/ifplugd.nix {
-- 
GitLab


From 44f1d9f0bf880e386eb7ed9265c6701391685a5f Mon Sep 17 00:00:00 2001
From: Nicolas Pierron <nicolas.b.pierron@gmail.com>
Date: Fri, 2 Jan 2009 16:07:15 +0000
Subject: [PATCH 1145/5331] Extra sudo configuration file from: -
 system/options.nix - system/system.nix - etc/default.nix

svn path=/nixos/branches/fix-style/; revision=13681
---
 etc/default.nix    | 14 --------
 system/options.nix | 34 ++----------------
 system/sudo.nix    | 87 ++++++++++++++++++++++++++++++++++++++++++++++
 system/system.nix  |  2 --
 4 files changed, 90 insertions(+), 47 deletions(-)
 create mode 100644 system/sudo.nix

diff --git a/etc/default.nix b/etc/default.nix
index d05ae3f6c87..3fe44a2665f 100644
--- a/etc/default.nix
+++ b/etc/default.nix
@@ -192,19 +192,6 @@ let
     target = "ldap.conf";
   }
     
-  # "sudo" configuration.
-  ++ optional config.security.sudo.enable {
-    source = pkgs.runCommand "sudoers"
-      { src = pkgs.writeText "sudoers-in" (config.security.sudo.configFile);
-      }
-      # Make sure that the sudoers file is syntactically valid.
-      # (currently disabled - NIXOS-66)
-      #"${pkgs.sudo}/sbin/visudo -f $src -c && cp $src $out";
-      "cp $src $out";
-    target = "sudoers";
-    mode = "0440";
-  }
-    
   # A bunch of PAM configuration files for various programs.
   ++ (map
     (program:
@@ -227,7 +214,6 @@ let
       "login"
       "slim"
       "su"
-      "sudo"
       "other"
       "passwd"
       "shadow"
diff --git a/system/options.nix b/system/options.nix
index a85564aa62e..1d2a85f17cd 100644
--- a/system/options.nix
+++ b/system/options.nix
@@ -2608,37 +2608,6 @@ in
       };
     };
 
-    sudo = {
-
-      enable = mkOption {
-        default = true;
-        description = "
-          Whether to enable the <command>sudo</command> command, which
-          allows non-root users to execute commands as root.
-        ";
-      };
-
-      configFile = mkOption {
-        default = "
-# WARNING: do not edit this file directly or with \"visudo\".  Instead,
-# edit the source file in /etc/nixos/nixos/etc/sudoers.
-
-# \"root\" is allowed to do anything.
-root        ALL=(ALL) SETENV: ALL
-
-# Users in the \"wheel\" group can do anything.
-%wheel      ALL=(ALL) SETENV: ALL
-        ";
-        description = "
-          This string contains the contents of the
-          <filename>sudoers</filename> file.  If syntax errors are
-          detected in this file, the NixOS configuration will fail to
-          build. 
-        ";
-      };
-
-    };
-
   };
 
 
@@ -2853,6 +2822,9 @@ root        ALL=(ALL) SETENV: ALL
     (import ../system/activate-configuration.nix)
     (import ../upstart-jobs/default.nix)
 
+    # security
+    (import ../system/sudo.nix)
+
     # environment
     (import ../etc/default.nix)
 
diff --git a/system/sudo.nix b/system/sudo.nix
new file mode 100644
index 00000000000..c1a655e4557
--- /dev/null
+++ b/system/sudo.nix
@@ -0,0 +1,87 @@
+{pkgs, config, ...}:
+
+###### interface
+let
+  inherit (pkgs.lib) mkOption;
+
+  options = {
+    security = {
+      sudo = {
+
+        enable = mkOption {
+          default = true;
+          description = "
+            Whether to enable the <command>sudo</command> command, which
+            allows non-root users to execute commands as root.
+          ";
+        };
+
+        configFile = mkOption {
+          default = "
+# WARNING: do not edit this file directly or with \"visudo\".  Instead,
+# edit the source file in /etc/nixos/nixos/etc/sudoers.
+
+# \"root\" is allowed to do anything.
+root        ALL=(ALL) SETENV: ALL
+
+# Users in the \"wheel\" group can do anything.
+%wheel      ALL=(ALL) SETENV: ALL
+          ";
+          description = "
+            This string contains the contents of the
+            <filename>sudoers</filename> file.
+          ";
+          # If syntax errors are detected in this file, the NixOS
+          # configuration will fail to build.
+        };
+
+      };
+    };
+  };
+in
+
+###### implementation
+let
+  cfg = config.security.sudo;
+  inherit (pkgs.lib) mkIf;
+  inherit (pkgs) sudo;
+in
+
+mkIf cfg.enable {
+  require = [
+    options
+
+    # config.environment.etc
+    (import ../etc/default.nix)
+
+    # (import ?) # config.environment.extraPackages
+    # (import ?) # config.security.extraSetuidPrograms
+  ];
+
+  security = {
+    extraSetuidPrograms = [
+      "sudo"
+    ];
+  };
+
+  environment = {
+    extraPackages = [ sudo ];
+
+    etc = [
+      {
+        source = ../etc/pam.d/sudo;
+        target = "pam.d/sudo";
+      }
+      {
+        source = pkgs.runCommand "sudoers"
+          { src = pkgs.writeText "sudoers-in" cfg.configFile; }
+          # Make sure that the sudoers file is syntactically valid.
+          # (currently disabled - NIXOS-66)
+          #"${pkgs.sudo}/sbin/visudo -f $src -c && cp $src $out";
+          "cp $src $out";
+        target = "sudoers";
+        mode = "0440";
+      }
+    ];
+  };
+}
diff --git a/system/system.nix b/system/system.nix
index 4ca281a9fc8..f0b1fe849f0 100644
--- a/system/system.nix
+++ b/system/system.nix
@@ -158,7 +158,6 @@ rec {
         pkgs.utillinux
         pkgs.wirelesstools
       ]
-      ++ pkgs.lib.optional config.security.sudo.enable pkgs.sudo
       ++ pkgs.lib.optional config.services.bitlbee.enable pkgs.bitlbee
       ++ pkgs.lib.optional config.networking.defaultMailServer.directDelivery pkgs.ssmtp 
       ++ config.environment.extraPackages
@@ -199,7 +198,6 @@ rec {
     setuidPrograms =
       config.security.setuidPrograms ++
       config.security.extraSetuidPrograms ++
-      pkgs.lib.optional config.security.sudo.enable "sudo" ++
       pkgs.lib.optional (config.services.xserver.sessionType == "kde") "kcheckpass" ++
       map ( x : x.program ) config.security.setuidOwners;
 
-- 
GitLab


From 1b32260084ceb79dcc62cbafaa4adf07cd36cba7 Mon Sep 17 00:00:00 2001
From: Nicolas Pierron <nicolas.b.pierron@gmail.com>
Date: Fri, 2 Jan 2009 16:07:21 +0000
Subject: [PATCH 1146/5331] Convert "upstart-jobs/xserver.nix" to a
 configuration file.

svn path=/nixos/branches/fix-style/; revision=13682
---
 etc/default.nix          |   2 -
 system/options.nix       | 311 +------------------------------
 system/system.nix        |   1 -
 upstart-jobs/default.nix |   9 +-
 upstart-jobs/xserver.nix | 386 +++++++++++++++++++++++++++++++++++++--
 5 files changed, 376 insertions(+), 333 deletions(-)

diff --git a/etc/default.nix b/etc/default.nix
index 3fe44a2665f..c03b7819a76 100644
--- a/etc/default.nix
+++ b/etc/default.nix
@@ -212,7 +212,6 @@ let
     )
     [
       "login"
-      "slim"
       "su"
       "other"
       "passwd"
@@ -223,7 +222,6 @@ let
       "useradd"
       "chsh"
       "xlock"
-      "kde"
       "cups"
       "common"
       "common-console" # shared stuff for interactive local sessions
diff --git a/system/options.nix b/system/options.nix
index 1d2a85f17cd..ba3366ec5b0 100644
--- a/system/options.nix
+++ b/system/options.nix
@@ -372,8 +372,6 @@ in
         in
         [ kernel ]
         ++ pkgs.lib.optional ((config.networking.enableIntel3945ABGFirmware || config.networking.enableIntel4965AGNFirmware) && !kernel.features ? iwlwifi) kernelPackages.iwlwifi
-        # !!! this should be declared by the xserver Upstart job.
-        ++ pkgs.lib.optional (config.services.xserver.enable && config.services.xserver.videoDriver == "nvidia") kernelPackages.nvidiaDrivers
         ++ pkgs.lib.optional config.hardware.enableGo7007 kernelPackages.wis_go7007
         ++ config.boot.extraModulePackages
         # should only keep this one, other have to be set by the option owners.
@@ -1184,314 +1182,6 @@ in
     };
 
 
-    xserver = {
-
-      enable = mkOption {
-        default = false;
-        description = "
-          Whether to enable the X server.
-        ";
-      };
-
-      autorun = mkOption {
-        default = true;
-        description = "
-          Switch to false to create upstart-job and configuration, 
-          but not run it automatically
-        ";
-      };
-
-      exportConfiguration = mkOption {
-        default = false;
-        description = "
-          Create /etc/X11/xorg.conf and a file with environment
-          variables
-        ";
-      };
-
-      tcpEnable = mkOption {
-        default = false;
-        description = "
-          Whether to enable TCP socket for the X server.
-        ";
-      };
-
-      resolutions = mkOption {
-        default = [{x = 1024; y = 768;} {x = 800; y = 600;} {x = 640; y = 480;}];
-        description = "
-          The screen resolutions for the X server.  The first element is the default resolution.
-        ";
-      };
-
-      videoDriver = mkOption {
-        default = "vesa";
-        example = "i810";
-        description = "
-          The name of the video driver for your graphics card.
-        ";
-      };
-
-      driSupport = mkOption {
-        default = false;
-        description = "
-          Whether to enable accelerated OpenGL rendering through the
-          Direct Rendering Interface (DRI).
-        ";
-      };
-
-      sessionType = mkOption {
-        default = "gnome";
-        example = "xterm";
-        description = "
-          The kind of session to start after login.  Current possibilies
-          are <literal>kde</literal> (which starts KDE),
-          <literal>gnome</literal> (which starts
-          <command>gnome-terminal</command>) and <literal>xterm</literal>
-          (which starts <command>xterm</command>).
-        ";
-      };
-
-      windowManager = mkOption {
-        default = "";
-        description = "
-          This option selects the window manager.  Available values are
-          <literal>twm</literal> (extremely primitive),
-          <literal>metacity</literal>, <literal>xmonad</literal>
-          and <literal>compiz</literal>.  If
-          left empty, the <option>sessionType</option> determines the
-          window manager, e.g., Metacity for Gnome, and
-          <command>kwm</command> for KDE.
-        ";
-      };
-
-      renderingFlag = mkOption {
-        default = "";
-        example = "--indirect-rendering";
-        description = "
-          Possibly pass --indierct-rendering to Compiz.
-        ";
-      };
-
-      sessionStarter = mkOption {
-        example = "${pkgs.xterm}/bin/xterm -ls";
-        description = "
-          The command executed after login and after the window manager
-          has been started.  Used if
-          <option>services.xserver.sessionType</option> is empty.
-        ";
-      };
-
-      startSSHAgent = mkOption {
-        default = true;
-        description = "
-          Whether to start the SSH agent when you log in.  The SSH agent
-          remembers private keys for you so that you don't have to type in
-          passphrases every time you make an SSH connection.  Use
-          <command>ssh-add</command> to add a key to the agent.
-        ";
-      };
-
-      slim = {
-
-        theme = mkOption {
-          default = null;
-          example = pkgs.fetchurl {
-            url = http://download.berlios.de/slim/slim-wave.tar.gz;
-            sha256 = "0ndr419i5myzcylvxb89m9grl2xyq6fbnyc3lkd711mzlmnnfxdy";
-          };
-          description = "
-            The theme for the SLiM login manager.  If not specified, SLiM's
-            default theme is used.  See <link
-            xlink:href='http://slim.berlios.de/themes01.php'/> for a
-            collection of themes.
-          ";
-        };
-
-        defaultUser = mkOption {
-          default = "";
-          example = "login";
-          description = "
-            The default user to load. If you put a username here you
-            get it automatically loaded into the username field, and
-            the focus is placed on the password.
-          ";
-        };
-
-        hideCursor = mkOption {
-          default = false;
-          example = true;
-          description = "
-            Hide the mouse cursor on the login screen.
-          ";
-        };
-      };
-
-      isClone = mkOption {
-        default = true;
-        example = false;
-        description = "
-          Whether to enable the X server clone mode for dual-head.
-        ";
-      };
-
-      synaptics = {
-        enable = mkOption {
-          default = false;
-          example = true;
-          description = "
-            Whether to replace mouse with touchpad.
-          ";
-        };
-        dev = mkOption {
-          default = "/dev/input/event0";
-          description = "
-            Event device for Synaptics touchpad.
-          ";
-        };
-        minSpeed = mkOption {
-          default = "0.06";
-          description = "Cursor speed factor for precision finger motion";
-        };
-        maxSpeed = mkOption {
-          default = "0.12";
-          description = "Cursor speed factor for highest-speed finger motion";
-        };
-      };
-
-      layout = mkOption {
-        default = "us";
-        description = "
-          Keyboard layout.
-        ";
-      };
-
-      xkbModel = mkOption {
-        default = "pc104";
-        example = "presario";
-        description = "
-          Keyboard model.
-        ";
-      };
-
-      xkbOptions = mkOption {
-        default = "";
-        example = "grp:caps_toggle, grp_led:scroll";
-        description = "
-          X keyboard options; layout switching goes here.
-        ";
-      };
-
-      useInternalAGPGART = mkOption {
-        default = "";
-        example = "no";
-        description = "
-          Just the wrapper for an xorg.conf option.
-        ";
-      };
-
-      extraDeviceConfig = mkOption {
-        default = "";
-        example = "VideoRAM 131072";
-        description = "
-          Just anything to add into Device section.
-        ";
-      };
-
-      extraMonitorSettings = mkOption {
-        default = "";
-        example = "HorizSync 28-49";
-        description = "
-          Just anything to add into Monitor section.
-        ";
-      };
-
-      extraDisplaySettings = mkOption {
-        default = "";
-        example = "Virtual 2048 2048";
-        description = "
-          Just anything to add into Display subsection (located in Screen section).
-        ";
-      };
- 
-      extraModules = mkOption {
-        default = "";
-        example = "
-          SubSection \"extmod\"
-          EndSubsection
-        ";
-        description = "
-          Just anything to add into Modules section.
-        ";
-      };
-
-      serverLayoutOptions = mkOption {
-        default = "";
-        example = "
-          Option \"AIGLX\" \"true\"
-        ";
-        description = "
-          Just anything to add into Monitor section.
-        ";
-      };
-
-      defaultDepth = mkOption {
-        default = 24;
-        example = 8;
-        description = "
-          Default colour depth.
-        ";
-      };
-      
-      useXFS = mkOption {
-        default = false;
-        example = "unix/:7100";
-        description = "
-          Way to access the X Font Server to use.
-        ";
-      };
-
-      tty = mkOption {
-        default = 7;
-        example = 9;
-        description = "
-          Virtual console for the X server.
-        ";
-      };
-
-      display = mkOption {
-        default = 0;
-        example = 1;
-        description = "
-          Display number for the X server.
-        ";
-      };
-
-      packageFun = mkOption {
-        default = pkgs.xorg;
-        merge = obsolete "option" backwardPkgsFunMerge;
-        description = "Obsolete: use 'package' instead.";
-      };
-
-      package = mkOption {
-        default = config.services.xserver.packageFun; # pkgs.xorg;
-        description = "
-          Alternative X.org package to use. For 
-          example, you can replace individual drivers.
-        ";
-      };
-
-      virtualScreen = mkOption {
-        default = null;
-	example = {
-	  x=2048;
-	  y=2048;
-	};
-	description = "
-	  Virtual screen size for Xrandr
-	";
-      };
-    };
-
     ejabberd = {
       enable = mkOption {
         default = false;
@@ -2844,6 +2534,7 @@ in
     (import ../upstart-jobs/hal.nix)
     (import ../upstart-jobs/gpm.nix)
     (import ../upstart-jobs/nagios/default.nix)
+    (import ../upstart-jobs/xserver.nix)
     (import ../upstart-jobs/zabbix-agent.nix)
     (import ../upstart-jobs/zabbix-server.nix)
     (import ../upstart-jobs/disnix.nix)
diff --git a/system/system.nix b/system/system.nix
index f0b1fe849f0..6816f582edf 100644
--- a/system/system.nix
+++ b/system/system.nix
@@ -198,7 +198,6 @@ rec {
     setuidPrograms =
       config.security.setuidPrograms ++
       config.security.extraSetuidPrograms ++
-      pkgs.lib.optional (config.services.xserver.sessionType == "kde") "kcheckpass" ++
       map ( x : x.program ) config.security.setuidOwners;
 
     bash = pkgs.bashInteractive;
diff --git a/upstart-jobs/default.nix b/upstart-jobs/default.nix
index f2f0c90a602..f0862aaddec 100644
--- a/upstart-jobs/default.nix
+++ b/upstart-jobs/default.nix
@@ -275,13 +275,6 @@ let
       inherit (pkgs) makePortmap;
      })
 
-  # X server.
-  ++ optional config.services.xserver.enable
-    (import ../upstart-jobs/xserver.nix {
-      inherit config pkgs kernelPackages;
-      fontDirectories = import ../system/fonts.nix {inherit pkgs config;};
-    })
-
   # Apache httpd.
   ++ optional (config.services.httpd.enable && !config.services.httpd.experimental)
     (import ../upstart-jobs/httpd.nix {
@@ -495,4 +488,4 @@ in
         { name = if job ? jobName then job.jobName else job.name; value = job; }
       ) jobs);
   };
-}
\ No newline at end of file
+}
diff --git a/upstart-jobs/xserver.nix b/upstart-jobs/xserver.nix
index 157effcb530..dd8d6bed479 100644
--- a/upstart-jobs/xserver.nix
+++ b/upstart-jobs/xserver.nix
@@ -1,12 +1,325 @@
-{ config, pkgs, kernelPackages
+{config, pkgs, ...}:
+# TODO: this file need some make-up (Nicolas Pierron)
 
-, # List of font directories.
-  fontDirectories
-}:
+let
+  kernelPackages = config.boot.kernelPackages;
+  # List of font directories.
+  fontDirectories = import ../system/fonts.nix {inherit pkgs config;};
+
+  inherit (pkgs.lib) mkOption;
+
+  options = {
+    services = {
+
+      xserver = {
+
+        enable = mkOption {
+          default = false;
+          description = "
+            Whether to enable the X server.
+          ";
+        };
+
+        autorun = mkOption {
+          default = true;
+          description = "
+            Switch to false to create upstart-job and configuration, 
+            but not run it automatically
+          ";
+        };
+
+        exportConfiguration = mkOption {
+          default = false;
+          description = "
+            Create /etc/X11/xorg.conf and a file with environment
+            variables
+          ";
+        };
+
+        tcpEnable = mkOption {
+          default = false;
+          description = "
+            Whether to enable TCP socket for the X server.
+          ";
+        };
+
+        resolutions = mkOption {
+          default = [{x = 1024; y = 768;} {x = 800; y = 600;} {x = 640; y = 480;}];
+          description = "
+            The screen resolutions for the X server.  The first element is the default resolution.
+          ";
+        };
+
+        videoDriver = mkOption {
+          default = "vesa";
+          example = "i810";
+          description = "
+            The name of the video driver for your graphics card.
+          ";
+        };
+
+        driSupport = mkOption {
+          default = false;
+          description = "
+            Whether to enable accelerated OpenGL rendering through the
+            Direct Rendering Interface (DRI).
+          ";
+        };
+
+        sessionType = mkOption {
+          default = "gnome";
+          example = "xterm";
+          description = "
+            The kind of session to start after login.  Current possibilies
+            are <literal>kde</literal> (which starts KDE),
+            <literal>gnome</literal> (which starts
+            <command>gnome-terminal</command>) and <literal>xterm</literal>
+            (which starts <command>xterm</command>).
+          ";
+        };
+
+        windowManager = mkOption {
+          default = "";
+          description = "
+            This option selects the window manager.  Available values are
+            <literal>twm</literal> (extremely primitive),
+            <literal>metacity</literal>, <literal>xmonad</literal>
+            and <literal>compiz</literal>.  If
+            left empty, the <option>sessionType</option> determines the
+            window manager, e.g., Metacity for Gnome, and
+            <command>kwm</command> for KDE.
+          ";
+        };
+
+        renderingFlag = mkOption {
+          default = "";
+          example = "--indirect-rendering";
+          description = "
+            Possibly pass --indierct-rendering to Compiz.
+          ";
+        };
+
+        sessionStarter = mkOption {
+          example = "${pkgs.xterm}/bin/xterm -ls";
+          description = "
+            The command executed after login and after the window manager
+            has been started.  Used if
+            <option>services.xserver.sessionType</option> is empty.
+          ";
+        };
+
+        startSSHAgent = mkOption {
+          default = true;
+          description = "
+            Whether to start the SSH agent when you log in.  The SSH agent
+            remembers private keys for you so that you don't have to type in
+            passphrases every time you make an SSH connection.  Use
+            <command>ssh-add</command> to add a key to the agent.
+          ";
+        };
+
+        slim = {
+
+          theme = mkOption {
+            default = null;
+            example = pkgs.fetchurl {
+              url = http://download.berlios.de/slim/slim-wave.tar.gz;
+              sha256 = "0ndr419i5myzcylvxb89m9grl2xyq6fbnyc3lkd711mzlmnnfxdy";
+            };
+            description = "
+              The theme for the SLiM login manager.  If not specified, SLiM's
+              default theme is used.  See <link
+              xlink:href='http://slim.berlios.de/themes01.php'/> for a
+              collection of themes.
+            ";
+          };
+
+          defaultUser = mkOption {
+            default = "";
+            example = "login";
+            description = "
+              The default user to load. If you put a username here you
+              get it automatically loaded into the username field, and
+              the focus is placed on the password.
+            ";
+          };
+
+          hideCursor = mkOption {
+            default = false;
+            example = true;
+            description = "
+              Hide the mouse cursor on the login screen.
+            ";
+          };
+        };
+
+        isClone = mkOption {
+          default = true;
+          example = false;
+          description = "
+            Whether to enable the X server clone mode for dual-head.
+          ";
+        };
+
+        synaptics = {
+          enable = mkOption {
+            default = false;
+            example = true;
+            description = "
+              Whether to replace mouse with touchpad.
+            ";
+          };
+          dev = mkOption {
+            default = "/dev/input/event0";
+            description = "
+              Event device for Synaptics touchpad.
+            ";
+          };
+          minSpeed = mkOption {
+            default = "0.06";
+            description = "Cursor speed factor for precision finger motion";
+          };
+          maxSpeed = mkOption {
+            default = "0.12";
+            description = "Cursor speed factor for highest-speed finger motion";
+          };
+        };
+
+        layout = mkOption {
+          default = "us";
+          description = "
+            Keyboard layout.
+          ";
+        };
+
+        xkbModel = mkOption {
+          default = "pc104";
+          example = "presario";
+          description = "
+            Keyboard model.
+          ";
+        };
+
+        xkbOptions = mkOption {
+          default = "";
+          example = "grp:caps_toggle, grp_led:scroll";
+          description = "
+            X keyboard options; layout switching goes here.
+          ";
+        };
+
+        useInternalAGPGART = mkOption {
+          default = "";
+          example = "no";
+          description = "
+            Just the wrapper for an xorg.conf option.
+          ";
+        };
+
+        extraDeviceConfig = mkOption {
+          default = "";
+          example = "VideoRAM 131072";
+          description = "
+            Just anything to add into Device section.
+          ";
+        };
+
+        extraMonitorSettings = mkOption {
+          default = "";
+          example = "HorizSync 28-49";
+          description = "
+            Just anything to add into Monitor section.
+          ";
+        };
+
+        extraDisplaySettings = mkOption {
+          default = "";
+          example = "Virtual 2048 2048";
+          description = "
+            Just anything to add into Display subsection (located in Screen section).
+          ";
+        };
+   
+        extraModules = mkOption {
+          default = "";
+          example = "
+            SubSection \"extmod\"
+            EndSubsection
+          ";
+          description = "
+            Just anything to add into Modules section.
+          ";
+        };
+
+        serverLayoutOptions = mkOption {
+          default = "";
+          example = "
+            Option \"AIGLX\" \"true\"
+          ";
+          description = "
+            Just anything to add into Monitor section.
+          ";
+        };
+
+        defaultDepth = mkOption {
+          default = 24;
+          example = 8;
+          description = "
+            Default colour depth.
+          ";
+        };
+        
+        useXFS = mkOption {
+          default = false;
+          example = "unix/:7100";
+          description = "
+            Way to access the X Font Server to use.
+          ";
+        };
+
+        tty = mkOption {
+          default = 7;
+          example = 9;
+          description = "
+            Virtual console for the X server.
+          ";
+        };
+
+        display = mkOption {
+          default = 0;
+          example = 1;
+          description = "
+            Display number for the X server.
+          ";
+        };
+
+        package = mkOption {
+          default = pkgs.xorg;
+          description = "
+            Alternative X.org package to use. For 
+            example, you can replace individual drivers.
+          ";
+        };
+
+        virtualScreen = mkOption {
+          default = null;
+          example = {
+            x=2048;
+            y=2048;
+          };
+          description = "
+            Virtual screen size for Xrandr
+          ";
+        };
+      };
+
+    };
+  };
+in
 
 let
 
-  inherit (pkgs.lib) optional isInList getAttr;
+  inherit (pkgs.lib) optional isInList getAttr mkIf;
   # Abbreviations.
   cfg = config.services.xserver;
   xorg = cfg.package;
@@ -234,7 +547,7 @@ let
       env LD_LIBRARY_PATH=${xorg.libX11}/lib:${xorg.libXext}/lib:/usr/lib/
       # !!! Hack: load the schemas for Metacity.
       GCONF_CONFIG_SOURCE=xml::~/.gconf ${gnome.GConf}/bin/gconftool-2 \
-        --makefile-install-rule ${gnome.metacity}/etc/gconf/schemas/*.schemas
+        --makefile-install-rule ${gnome.metacity}/etc/gconf/schemas/*.schemas # */
       ${gnome.metacity}/bin/metacity &
     ''
 
@@ -245,7 +558,7 @@ let
     else if windowManager == "compiz" then ''
       # !!! Hack: load the schemas for Compiz.
       GCONF_CONFIG_SOURCE=xml::~/.gconf ${gnome.GConf}/bin/gconftool-2 \
-        --makefile-install-rule ${pkgs.compiz}/etc/gconf/schemas/*.schemas
+        --makefile-install-rule ${pkgs.compiz}/etc/gconf/schemas/*.schemas # */
 
       # !!! Hack: turn on most Compiz modules.
       ${gnome.GConf}/bin/gconftool-2 -t list --list-type=string \
@@ -295,12 +608,12 @@ let
       # terminal of the kind indicated by sessionCmd.
       # !!! yes, this means that you 'log out' by killing the X server.
       while ${sessionCmd}; do
-        sleep 1  
+        sleep 1
       done
 
     ''}
     
-  ''; # */
+  '';
 
 
   xserverArgs = [
@@ -343,10 +656,9 @@ let
 
     nvidiaDrivers = (config.boot.kernelPackages pkgs).nvidiaDrivers;
 
-in
+  oldJob = rec {
+  # Warning the indentation is wrong since here in order to don't produce noise in diffs.
 
-
-rec {
   name = "xserver";
 
   
@@ -433,4 +745,54 @@ rec {
     exec ${pkgs.slim}/bin/slim
   '';
   
+};
+
+in
+
+mkIf cfg.enable {
+  require = [
+    options
+
+    # services.extraJobs
+    (import ../upstart-jobs/default.nix)
+
+    # environment.etc
+    (import ../etc/default.nix)
+
+    # boot.extraModulePackages
+    # security.extraSetuidPrograms
+    # environment.extraPackages
+  ];
+
+  boot = {
+    extraModulePackages = mkIf (cfg.videoDriver == "nvidia") [
+      kernelPackages.nvidiaDrivers
+    ];
+  };
+
+  security = {
+    extraSetuidPrograms = mkIf (cfg.sessionType == "kde") [
+      "kcheckpass"
+    ];
+  };
+
+  environment = {
+    etc = [
+      { source = ../etc/pam.d/kde;
+        target = "pam.d/kde";
+      }
+      { source = ../etc/pam.d/slim;
+        target = "pam.d/slim";
+      }
+    ] ++ oldJob.extraEtc;
+
+    extraPackages =
+      oldJob.extraPath;
+  };
+
+  services = {
+    extraJobs = [{
+      inherit (oldJob) name job;
+    }];
+  };
 }
-- 
GitLab


From 7cdb7d38efb11850baf356351c02832774efcda5 Mon Sep 17 00:00:00 2001
From: Nicolas Pierron <nicolas.b.pierron@gmail.com>
Date: Fri, 2 Jan 2009 16:07:24 +0000
Subject: [PATCH 1147/5331] Replace the activation script by one which is
 completely generated.

svn path=/nixos/branches/fix-style/; revision=13683
---
 system/activate-configuration.nix |  21 ++++--
 system/activate-configuration.sh  |  58 -----------------
 system/system-options.nix         | 103 +++++++++++++++++++++++++++++-
 system/system.nix                 |  31 +--------
 4 files changed, 117 insertions(+), 96 deletions(-)
 delete mode 100644 system/activate-configuration.sh

diff --git a/system/activate-configuration.nix b/system/activate-configuration.nix
index 65591c2d2b8..25510aa26bd 100644
--- a/system/activate-configuration.nix
+++ b/system/activate-configuration.nix
@@ -2,15 +2,26 @@
 {pkgs, config, ...}:
 
 let
-  inherit (pkgs.stringsWithDeps) textClosureOverridable;
-  inherit (pkgs.lib) mkOption mergeTypedOption mergeAttrs mapRecordFlatten id;
+  inherit (pkgs.stringsWithDeps) textClosureOverridable noDepEntry;
+  inherit (pkgs.lib) mkOption mergeTypedOption mergeAttrs mapRecordFlatten mapAttrs;
 
   textClosure = steps:
-    textClosureOverridable steps
-    (["#!/bin/sh"] ++ (mapRecordFlatten (a: v: v) steps));
+    textClosureOverridable steps (
+       [(noDepEntry "#!/bin/sh")]
+    ++ (mapRecordFlatten (a: v: v) steps)
+    );
 
   aggregateScripts = name: steps:
     pkgs.writeScript name (textClosure steps);
+
+  addAttributeName = mapAttrs (a: v: {
+      text = ''
+        #### ${a} begin
+        ${v.text}
+        #### ${a} end
+      '';
+      inherit (v) deps;
+    });
 in
 
 {
@@ -34,7 +45,7 @@ in
         and so on).
       '';
       merge = mergeTypedOption "script" builtins.isAttrs mergeAttrs;
-      apply = lib: {
+      apply = set: let lib = addAttributeName set; in {
         inherit lib; # used to fetch dependencies.
         script = aggregateScripts "activationScript" lib;
       };
diff --git a/system/activate-configuration.sh b/system/activate-configuration.sh
deleted file mode 100644
index 7b3bf5d2532..00000000000
--- a/system/activate-configuration.sh
+++ /dev/null
@@ -1,58 +0,0 @@
-#! @shell@
-
-source @newActivationScript@
-
-
-# Make a few setuid programs work.
-PATH=@systemPath@/bin:@systemPath@/sbin:$PATH
-save_PATH="$PATH"
-
-# Add the default profile to the search path for setuid executables.
-PATH="/nix/var/nix/profiles/default/sbin:$PATH"
-PATH="/nix/var/nix/profiles/default/bin:$PATH"
-
-wrapperDir=@wrapperDir@
-if test -d $wrapperDir; then rm -f $wrapperDir/*; fi
-mkdir -p $wrapperDir
-for i in @setuidPrograms@; do
-    program=$(type -tp $i)
-    if test -z "$program"; then
-	# XXX: It would be preferable to detect this problem before
-	# `activate-configuration' is invoked.
-	#echo "WARNING: No executable named \`$i' was found" >&2
-	#echo "WARNING: but \`$i' was specified as a setuid program." >&2
-        true
-    else
-        cp "$(type -tp setuid-wrapper)" $wrapperDir/$i
-        echo -n "$program" > $wrapperDir/$i.real
-        chown root.root $wrapperDir/$i
-        chmod 4755 $wrapperDir/$i
-    fi
-done
-
-@adjustSetuidOwner@ 
-
-PATH="$save_PATH"
-
-# Set the host name.  Don't clear it if it's not configured in the
-# NixOS configuration, since it may have been set by dhclient in the
-# meantime.
-if test -n "@hostName@"; then
-    hostname @hostName@
-else
-    # dhclient won't do anything if the hostname isn't empty.
-    if test "$(hostname)" = "(none)"; then
-	hostname ''
-    fi
-fi
-
-
-# Make this configuration the current configuration.
-# The readlink is there to ensure that when $systemConfig = /system
-# (which is a symlink to the store), /var/run/current-system is still
-# used as a garbage collection root.
-ln -sfn "$(readlink -f "$systemConfig")" /var/run/current-system
-
-
-# Prevent the current configuration from being garbage-collected.
-ln -sfn /var/run/current-system /nix/var/nix/gcroots/current-system
diff --git a/system/system-options.nix b/system/system-options.nix
index 3ff76210b84..650a08e0a76 100644
--- a/system/system-options.nix
+++ b/system/system-options.nix
@@ -1,4 +1,5 @@
 # this file contains all extendable options originally defined in system.nix
+# TODO: split it to make it readable.
 {pkgs, config, ...}:
 
 ###### interface
@@ -73,6 +74,7 @@ in
 ###### implementation
 let
   inherit (pkgs.stringsWithDeps) noDepEntry FullDepEntry PackEntry;
+  inherit (pkgs.lib) mapRecordFlatten;
 
   activateLib = config.system.activationScripts.lib;
 in
@@ -120,7 +122,7 @@ in
         # Create the required /bin/sh symlink; otherwise lots of things
         # (notably the system() function) won't work.
         mkdir -m 0755 -p $mountPoint/bin
-        ln -sfn @bash@/bin/sh $mountPoint/bin/sh
+        ln -sfn ${pkgs.bash}/bin/sh $mountPoint/bin/sh
       '' [
         activateLib.defaultPath # path to ln & mkdir
         activateLib.stdio # ?
@@ -132,7 +134,7 @@ in
         # when the kernel (or some module) auto-loads a module.
         # !!! maybe this should only happen at boot time, since we shouldn't
         # use modules that don't match the running kernel.
-        echo @modprobe@/sbin/modprobe > /proc/sys/kernel/modprobe
+        echo ${config.system.sbin.modprobe}/sbin/modprobe > /proc/sys/kernel/modprobe
       '' [
         # ?
       ];
@@ -175,7 +177,7 @@ in
             touch /etc/shadow; chmod 0600 /etc/shadow
             # Can't use useradd, since it complains that it doesn't know us
             # (bootstrap problem!).
-            echo "root:x:0:0:System administrator:$rootHome:@defaultShell@" >> /etc/passwd
+            echo "root:x:0:0:System administrator:$rootHome:${config.system.shell}" >> /etc/passwd
             echo "root::::::::" >> /etc/shadow
             echo | passwd --stdin root
         fi
@@ -213,6 +215,101 @@ in
         activateLib.etc # /etc/nix.conf
         activateLib.users # nixbld group
       ];
+
+      path = FullDepEntry ''
+        PATH=${config.system.path}/bin:${config.system.path}/sbin:$PATH
+      '' [
+        activateLib.defaultPath
+      ];
+
+      setuid =
+        let
+          setuidPrograms = builtins.toString (
+            config.security.setuidPrograms ++
+            config.security.extraSetuidPrograms ++
+            map (x: x.program) config.security.setuidOwners
+          );
+
+          adjustSetuidOwner = pkgs.lib.concatStrings (map
+            (_entry: let entry = {
+              owner = "nobody";
+              group = "nogroup";
+              setuid = false;
+              setgid = false;
+            } //_entry; in
+            ''
+              chown ${entry.owner}.${entry.group} $wrapperDir/${entry.program}
+              chmod u${if entry.setuid then "+" else "-"}s $wrapperDir/${entry.program} 
+              chmod g${if entry.setgid then "+" else "-"}s $wrapperDir/${entry.program}
+            '')
+            config.security.setuidOwners);
+
+        in FullDepEntry ''
+        # Make a few setuid programs work.
+        save_PATH="$PATH"
+
+        # Add the default profile to the search path for setuid executables.
+        PATH="/nix/var/nix/profiles/default/sbin:$PATH"
+        PATH="/nix/var/nix/profiles/default/bin:$PATH"
+
+        wrapperDir=${config.system.wrapperDir}
+        if test -d $wrapperDir; then rm -f $wrapperDir/*; fi # */
+        mkdir -p $wrapperDir
+        for i in ${setuidPrograms}; do
+            program=$(type -tp $i)
+            if test -z "$program"; then
+        	# XXX: It would be preferable to detect this problem before
+        	# `activate-configuration' is invoked.
+        	#echo "WARNING: No executable named \`$i' was found" >&2
+        	#echo "WARNING: but \`$i' was specified as a setuid program." >&2
+                true
+            else
+                cp "$(type -tp setuid-wrapper)" $wrapperDir/$i
+                echo -n "$program" > $wrapperDir/$i.real
+                chown root.root $wrapperDir/$i
+                chmod 4755 $wrapperDir/$i
+            fi
+        done
+
+        ${adjustSetuidOwner}
+
+        PATH="$save_PATH"
+      '' [
+        activateLib.path
+        activateLib.users
+      ];
+
+      hostname = FullDepEntry ''
+        # Set the host name.  Don't clear it if it's not configured in the
+        # NixOS configuration, since it may have been set by dhclient in the
+        # meantime.
+        ${if config.networking.hostName == "" then
+            ''hostname "${config.networking.hostName}"''
+        else ''
+            # dhclient won't do anything if the hostname isn't empty.
+            if test "$(hostname)" = "(none)"; then
+              hostname ""
+            fi
+        ''}
+      '' [
+        activateLib.path
+      ];
+
+      # The activation have to be done at the end.  Therefore, this entry
+      # depends on all scripts declared in the activation library.
+      activate = FullDepEntry ''
+        # Make this configuration the current configuration.
+        # The readlink is there to ensure that when $systemConfig = /system
+        # (which is a symlink to the store), /var/run/current-system is still
+        # used as a garbage collection root.
+        ln -sfn "$(readlink -f "$systemConfig")" /var/run/current-system
+
+        # Prevent the current configuration from being garbage-collected.
+        ln -sfn /var/run/current-system /nix/var/nix/gcroots/current-system
+      '' (mapRecordFlatten (a: v: v)
+        # should be removed if this does not cause an infinite recursion.
+        (activateLib // { activate = { text = ""; deps = []; }; })
+      );
     };
   };
 }
diff --git a/system/system.nix b/system/system.nix
index 6816f582edf..e6dc5c6d53e 100644
--- a/system/system.nix
+++ b/system/system.nix
@@ -186,36 +186,7 @@ rec {
   # The script that activates the configuration, i.e., it sets up
   # /etc, accounts, etc.  It doesn't do anything that can only be done
   # at boot time (such as start `init').
-  # DO NOT EXTEND THIS.  You should use the option system-option.nix
-  activateConfiguration = pkgs.substituteAll rec {
-    src = ./activate-configuration.sh;
-    isExecutable = true;
-
-    newActivationScript = config.system.activationScripts.script;
-
-    inherit wrapperDir systemPath modprobe defaultShell kernel;
-    hostName = config.networking.hostName;
-    setuidPrograms =
-      config.security.setuidPrograms ++
-      config.security.extraSetuidPrograms ++
-      map ( x : x.program ) config.security.setuidOwners;
-
-    bash = pkgs.bashInteractive;
-
-    adjustSetuidOwner = pkgs.lib.concatStrings (map 
-      (_entry: let entry = {
-        owner = "nobody";
-        group = "nogroup";
-        setuid = false;
-        setgid = false;
-      } //_entry; in
-      ''
-        chown ${entry.owner}.${entry.group} $wrapperDir/${entry.program}
-        chmod u${if entry.setuid then "+" else "-"}s $wrapperDir/${entry.program} 
-        chmod g${if entry.setgid then "+" else "-"}s $wrapperDir/${entry.program} 
-      '') 
-      config.security.setuidOwners);
-  };
+  activateConfiguration = config.system.activationScripts.script;
 
 
   # The init script of boot stage 2, which is supposed to do
-- 
GitLab


From b67e2a12aaed280759bcb88ed0b3b946b79764f3 Mon Sep 17 00:00:00 2001
From: Nicolas Pierron <nicolas.b.pierron@gmail.com>
Date: Fri, 2 Jan 2009 16:07:30 +0000
Subject: [PATCH 1148/5331] Convert "boot/boot-stage-2.nix" to a configuration
 file.

svn path=/nixos/branches/fix-style/; revision=13684
---
 boot/boot-stage-2.nix | 74 ++++++++++++++++++++++++++++---------------
 system/options.nix    |  3 ++
 system/system.nix     | 15 +--------
 3 files changed, 53 insertions(+), 39 deletions(-)

diff --git a/boot/boot-stage-2.nix b/boot/boot-stage-2.nix
index 5d0ac24be6f..5de8135867a 100644
--- a/boot/boot-stage-2.nix
+++ b/boot/boot-stage-2.nix
@@ -1,27 +1,51 @@
-{ substituteAll, writeText, coreutils
-, utillinux, kernel, udev, upstart
-, activateConfiguration
-
-, # Whether the root device is read-only and should be made writable
-  # through a unionfs.
-  isLiveCD
-
-, # Path for Upstart jobs.  Should be quite minimal.
-  upstartPath
-
-, # User-supplied command to be run just before Upstart is started.
-  bootLocal ? ""
-}:
-
-substituteAll {
-  src = ./boot-stage-2-init.sh;
-  isExecutable = true;
-  inherit kernel upstart isLiveCD activateConfiguration upstartPath;
-  path = [
-    coreutils
-    utillinux
-    udev
-    upstart
+{pkgs, config, ...}:
+
+let
+  inherit (pkgs) substituteAll writeText coreutils utillinux udev upstart;
+  kernel = config.boot.kernelPackages.kernel;
+  activateConfiguration = config.system.activationScripts.script;
+  inherit (config.boot) isLiveCD;
+
+  # Path for Upstart jobs.  Should be quite minimal.
+  upstartPath = [
+    pkgs.coreutils
+    pkgs.findutils
+    pkgs.gnugrep
+    pkgs.gnused
+    pkgs.upstart
   ];
-  bootLocal = writeText "local-cmds" bootLocal;
+
+  bootLocal = config.boot.localCommands;
+
+  bootStage2 = substituteAll {
+    src = ./boot-stage-2-init.sh;
+    isExecutable = true;
+    inherit kernel upstart isLiveCD activateConfiguration upstartPath;
+    path = [
+      coreutils
+      utillinux
+      udev
+      upstart
+    ];
+    bootLocal = writeText "local-cmds" bootLocal;
+  };
+in
+
+{
+  require = [
+    # config.boot.localCommands
+    # config.boot.kernelPackages
+
+    # config.system.activationScripts
+    (import ../system/activate-configuration.nix)
+
+    # config.system.build
+    (import ../system/system-options.nix)
+  ];
+
+  system = {
+    build = {
+      inherit bootStage2;
+    };
+  };
 }
diff --git a/system/options.nix b/system/options.nix
index ba3366ec5b0..c52a2327463 100644
--- a/system/options.nix
+++ b/system/options.nix
@@ -2507,6 +2507,9 @@ in
   };
 
   require = [
+    # boot (is it the right place ?)
+    (import ../boot/boot-stage-2.nix)
+
     # system
     (import ../system/system-options.nix)
     (import ../system/activate-configuration.nix)
diff --git a/system/system.nix b/system/system.nix
index e6dc5c6d53e..8271b97371c 100644
--- a/system/system.nix
+++ b/system/system.nix
@@ -191,20 +191,7 @@ rec {
 
   # The init script of boot stage 2, which is supposed to do
   # everything else to bring up the system.
-  bootStage2 = import ../boot/boot-stage-2.nix {
-    inherit (pkgs) substituteAll writeText coreutils 
-      utillinux udev upstart;
-    inherit kernel activateConfiguration;
-    inherit (config.boot) isLiveCD;
-    upstartPath = [
-      pkgs.coreutils
-      pkgs.findutils
-      pkgs.gnugrep
-      pkgs.gnused
-      pkgs.upstart
-    ];
-    bootLocal = config.boot.localCommands;
-  };
+  bootStage2 = config.system.build.bootStage2;
 
 
   # Script to build the Grub menu containing the current and previous
-- 
GitLab


From e4b0134a43262a1ccd7ede3747aa2f38b7913ea5 Mon Sep 17 00:00:00 2001
From: Nicolas Pierron <nicolas.b.pierron@gmail.com>
Date: Fri, 2 Jan 2009 16:07:34 +0000
Subject: [PATCH 1149/5331] Add a grub configuration file.

svn path=/nixos/branches/fix-style/; revision=13685
---
 installer/grub.nix | 113 +++++++++++++++++++++++++++++++++++++++++++++
 system/options.nix |  71 +---------------------------
 system/system.nix  |   9 +---
 3 files changed, 115 insertions(+), 78 deletions(-)
 create mode 100644 installer/grub.nix

diff --git a/installer/grub.nix b/installer/grub.nix
new file mode 100644
index 00000000000..7ae2dd8e7a5
--- /dev/null
+++ b/installer/grub.nix
@@ -0,0 +1,113 @@
+{pkgs, config, ...}:
+
+###### interface
+let
+  inherit (pkgs.lib) mkOption;
+
+  options = {
+    boot = {
+
+      grubDevice = mkOption {
+        default = "";
+        example = "/dev/hda";
+        description = "
+          The device on which the boot loader, Grub, will be installed.
+          If empty, Grub won't be installed and it's your responsibility
+          to make the system bootable.
+        ";
+      };
+
+      bootMount = mkOption {
+        default = "";
+        example = "(hd0,0)";
+        description = "
+          If the system partition may be wiped on reinstall, it is better
+          to have /boot on a small partition. To do it, we need to explain
+          to GRUB where the kernels live. Specify the partition here (in 
+          GRUB notation.
+        ";
+      };
+
+      configurationName = mkOption {
+        default = "";
+        example = "Stable 2.6.21";
+        description = "
+          Grub entry name instead of default.
+        ";
+      };
+
+      extraGrubEntries = mkOption {
+        default = "";
+        example = "
+          title Windows
+            chainloader (hd0,1)+1
+        ";
+        description = "
+          Any additional entries you want added to the Grub boot menu.
+        ";
+      };
+
+      extraGrubEntriesBeforeNixos = mkOption {
+        default = false;
+        description = "
+          Wheter extraGrubEntries are put before the Nixos-default option
+        ";
+      };
+
+      grubSplashImage = mkOption {
+        default = pkgs.fetchurl {
+          url = http://www.gnome-look.org/CONTENT/content-files/36909-soft-tux.xpm.gz;
+          sha256 = "14kqdx2lfqvh40h6fjjzqgff1mwk74dmbjvmqphi6azzra7z8d59";
+        };
+        example = null;
+        description = "
+          Background image used for Grub.  It must be a 640x480,
+          14-colour image in XPM format, optionally compressed with
+          <command>gzip</command> or <command>bzip2</command>.  Set to
+          <literal>null</literal> to run Grub in text mode.
+        ";
+      };
+
+      configurationLimit = mkOption {
+        default = 100;
+        example = 120;
+        description = "
+          Maximum of configurations in boot menu. GRUB has problems when
+          there are too many entries.
+        ";
+      };
+
+    };
+  };
+in
+
+
+###### implementation
+let
+
+  grubMenuBuilder = pkgs.substituteAll {
+    src = ../installer/grub-menu-builder.sh;
+    isExecutable = true;
+    inherit (pkgs) bash;
+    path = [pkgs.coreutils pkgs.gnused pkgs.gnugrep];
+    inherit (config.boot) copyKernels extraGrubEntries extraGrubEntriesBeforeNixos
+      grubSplashImage bootMount configurationLimit;
+  };
+in
+
+{
+  require = [
+    options
+
+    # config.system.build
+    (import ../system/system-options.nix)
+  ];
+
+  system = {
+    build = {
+      inherit grubMenuBuilder;
+    };
+  };
+
+  # and many other things that have to be moved inside this file.
+}
diff --git a/system/options.nix b/system/options.nix
index c52a2327463..f9be98fdcc1 100644
--- a/system/options.nix
+++ b/system/options.nix
@@ -55,27 +55,6 @@ in
       ";
     };
 
-    grubDevice = mkOption {
-      default = "";
-      example = "/dev/hda";
-      description = "
-        The device on which the boot loader, Grub, will be installed.
-        If empty, Grub won't be installed and it's your responsibility
-        to make the system bootable.
-      ";
-    };
-
-    bootMount = mkOption {
-      default = "";
-      example = "(hd0,0)";
-      description = "
-        If the system partition may be wiped on reinstall, it is better
-        to have /boot on a small partition. To do it, we need to explain
-        to GRUB where the kernels live. Specify the partition here (in 
-        GRUB notation.
-      ";
-    };
-
     resumeDevice = mkOption {
       default = "";
       example = "0:0";
@@ -103,14 +82,6 @@ in
       ";
     };
 
-    configurationName = mkOption {
-      default = "";
-      example = "Stable 2.6.21";
-      description = "
-        Grub entry name instead of default.
-      ";
-    };
-
     kernelParams = mkOption {
       default = [
         "selinux=0"
@@ -276,38 +247,6 @@ in
       ";
     };
 
-    extraGrubEntries = mkOption {
-      default = "";
-      example = "
-        title Windows
-          chainloader (hd0,1)+1
-      ";
-      description = "
-        Any additional entries you want added to the Grub boot menu.
-      ";
-    };
-
-    extraGrubEntriesBeforeNixos = mkOption {
-      default = false;
-      description = "
-        Wheter extraGrubEntries are put before the Nixos-default option
-      ";
-    };
-
-    grubSplashImage = mkOption {
-      default = pkgs.fetchurl {
-        url = http://www.gnome-look.org/CONTENT/content-files/36909-soft-tux.xpm.gz;
-        sha256 = "14kqdx2lfqvh40h6fjjzqgff1mwk74dmbjvmqphi6azzra7z8d59";
-      };
-      example = null;
-      description = "
-        Background image used for Grub.  It must be a 640x480,
-        14-colour image in XPM format, optionally compressed with
-        <command>gzip</command> or <command>bzip2</command>.  Set to
-        <literal>null</literal> to run Grub in text mode.
-      ";
-    };
-
     extraTTYs = mkOption {
       default = [];
       example = [8 9];
@@ -321,15 +260,6 @@ in
       ";
     };
 
-    configurationLimit = mkOption {
-      default = 100;
-      example = 120;
-      description = "
-        Maximum of configurations in boot menu. GRUB has problems when
-        there are too many entries.
-      ";
-    };
-
   };
 
   system = {
@@ -2509,6 +2439,7 @@ in
   require = [
     # boot (is it the right place ?)
     (import ../boot/boot-stage-2.nix)
+    (import ../installer/grub.nix)
 
     # system
     (import ../system/system-options.nix)
diff --git a/system/system.nix b/system/system.nix
index 8271b97371c..0ef870b8806 100644
--- a/system/system.nix
+++ b/system/system.nix
@@ -196,14 +196,7 @@ rec {
 
   # Script to build the Grub menu containing the current and previous
   # system configurations.
-  grubMenuBuilder = pkgs.substituteAll {
-    src = ../installer/grub-menu-builder.sh;
-    isExecutable = true;
-    inherit (pkgs) bash;
-    path = [pkgs.coreutils pkgs.gnused pkgs.gnugrep];
-    inherit (config.boot) copyKernels extraGrubEntries extraGrubEntriesBeforeNixos
-      grubSplashImage bootMount configurationLimit;
-  };
+  grubMenuBuilder = config.system.build.grubMenuBuilder;
 
 
   # Putting it all together.  This builds a store object containing
-- 
GitLab


From d745c21aab86300793b746d7fec2ac364786dafa Mon Sep 17 00:00:00 2001
From: Nicolas Pierron <nicolas.b.pierron@gmail.com>
Date: Fri, 2 Jan 2009 16:07:39 +0000
Subject: [PATCH 1150/5331] Merge system/fontdir.nix and system/fonts.nix into
 a new configuration file.

svn path=/nixos/branches/fix-style/; revision=13686
---
 etc/default.nix          |   9 --
 system/fontdir.nix       |  54 -----------
 system/fonts.nix         | 205 +++++++++++++++++++++++++++++++++------
 system/options.nix       |  53 +---------
 system/system.nix        |   6 +-
 upstart-jobs/xserver.nix |   5 +-
 6 files changed, 186 insertions(+), 146 deletions(-)
 delete mode 100644 system/fontdir.nix

diff --git a/etc/default.nix b/etc/default.nix
index c03b7819a76..731558b67f2 100644
--- a/etc/default.nix
+++ b/etc/default.nix
@@ -173,15 +173,6 @@ let
     '';
     target = "ssmtp/ssmtp.conf";
   }
-    
-  # Configuration file for fontconfig used to locate
-  # (X11) client-rendered fonts.
-  ++ optional config.fonts.enableFontConfig {
-    source = pkgs.makeFontsConf {
-      fontDirectories = import ../system/fonts.nix {inherit pkgs config;};
-    };
-    target = "fonts/fonts.conf";
-  }
 
   # LDAP configuration.
   ++ optional config.users.ldap.enable {
diff --git a/system/fontdir.nix b/system/fontdir.nix
deleted file mode 100644
index 85227930988..00000000000
--- a/system/fontdir.nix
+++ /dev/null
@@ -1,54 +0,0 @@
-args : with args; with builderDefs;
-  let localDefs = builderDefs.passthru.function rec {
-    src = "";/* put a fetchurl here */
-
-    buildInputs = [mkfontdir mkfontscale ttmkfdir];
-    configureFlags = [];
-    fontDirs = import ./fonts.nix {inherit pkgs config;};
-    installPhase = FullDepEntry ("
-    list='';
-    for i in ${toString fontDirs} ; do
-      if [ -d \$i/ ]; then
-        list=\"\$list \$i\";
-      fi;
-    done
-    list=\$(find \$list -name fonts.dir);
-    fontDirs='';
-    for i in \$list ; do
-      fontDirs=\"\$fontDirs \$(dirname \$i)\";
-    done;
-    mkdir -p \$out/share/X11-fonts/; 
-    for i in \$(find \$fontDirs -type f -o -type l); do
-      j=\${i##*/}
-      if ! test -e \$out/share/X11-fonts/\${j}; then
-        ln -s \$i \$out/share/X11-fonts/\${j};
-      fi;
-    done;
-    cd \$out/share/X11-fonts/
-    rm fonts.dir
-    rm fonts.scale
-    rm fonts.alias
-    mkfontdir
-    mkfontscale
-    mv fonts.scale fonts.scale.old
-    mv fonts.dir fonts.dir.old
-    ttmkfdir
-    cat fonts.scale.old >> fonts.scale
-    cat fonts.dir.old >> fonts.dir
-    rm fonts.dir.old
-    rm fonts.scale.old
-    cat \$( find ${fontalias}/ -name fonts.alias) >fonts.alias
-  ") ["minInit" "addInputs"];
-  };
-  in with localDefs;
-stdenv.mkDerivation rec {
-  name = "X11-fonts";
-  builder = writeScript (name + "-builder")
-    (textClosure localDefs 
-      [installPhase doForceShare doPropagate]);
-  meta = {
-    description = "
-    Directory to contain all X11 fonts requested.
-";
-  };
-}
diff --git a/system/fonts.nix b/system/fonts.nix
index f0be6dd1de0..6afe44fe99a 100644
--- a/system/fonts.nix
+++ b/system/fonts.nix
@@ -1,27 +1,178 @@
-{pkgs, config}:
-
-[
-  # - the user's .fonts directory
-  "~/.fonts"
-  # - the user's current profile
-  "~/.nix-profile/lib/X11/fonts"
-  "~/.nix-profile/share/fonts"
-  # - the default profile
-  "/nix/var/nix/profiles/default/lib/X11/fonts"
-  "/nix/var/nix/profiles/default/share/fonts"
-  # - a few statically built locations
-  pkgs.xorg.fontbhttf
-  pkgs.xorg.fontbhlucidatypewriter100dpi
-  pkgs.xorg.fontbhlucidatypewriter75dpi
-  pkgs.ttf_bitstream_vera
-  pkgs.freefont_ttf
-  pkgs.xorg.fontbh100dpi
-  pkgs.xorg.fontmiscmisc
-  pkgs.xorg.fontcursormisc
-]
-
-++ pkgs.lib.optional config.fonts.enableCoreFonts pkgs.corefonts
-
-++ pkgs.lib.optional config.fonts.enableGhostscriptFonts "${pkgs.ghostscript}/share/ghostscript/fonts"
-
-++ config.fonts.extraFonts
+{pkgs, config, ...}:
+
+###### interface
+let
+  inherit (pkgs.lib) mkOption;
+
+  options = {
+
+    fonts = {
+
+      enableFontConfig = mkOption { # !!! should be enableFontconfig
+        default = true;
+        description = "
+          If enabled, a Fontconfig configuration file will be built
+          pointing to a set of default fonts.  If you don't care about
+          running X11 applications or any other program that uses
+          Fontconfig, you can turn this option off and prevent a
+          dependency on all those fonts.
+        ";
+      };
+
+      # should be move elsewhere.
+      enableGhostscriptFonts = mkOption {
+        default = false;
+        description = "
+          Whether to add the fonts provided by Ghostscript (such as
+          various URW fonts and the ``Base-14'' Postscript fonts) to the
+          list of system fonts, making them available to X11
+          applications.
+        ";
+      };
+
+      enableFontDir = mkOption {
+        default = false;
+        description = "
+          Whether to create a directory with links to all fonts in share - 
+          so user can configure vncserver script one time (I mean per-user 
+          vncserver, so global service is not a good solution).
+        ";
+      };
+
+      # TODO: find another name for it.
+      fonts = mkOption {
+        default = [
+          # - the user's .fonts directory
+          "~/.fonts"
+          # - the user's current profile
+          "~/.nix-profile/lib/X11/fonts"
+          "~/.nix-profile/share/fonts"
+          # - the default profile
+          "/nix/var/nix/profiles/default/lib/X11/fonts"
+          "/nix/var/nix/profiles/default/share/fonts"
+        ];
+        description = "
+          List of primary font paths.
+        ";
+        apply = list: list ++ [
+          # - a few statically built locations
+          pkgs.xorg.fontbhttf
+          pkgs.xorg.fontbhlucidatypewriter100dpi
+          pkgs.xorg.fontbhlucidatypewriter75dpi
+          pkgs.ttf_bitstream_vera
+          pkgs.freefont_ttf
+          pkgs.xorg.fontbh100dpi
+          pkgs.xorg.fontmiscmisc
+          pkgs.xorg.fontcursormisc
+        ]
+        ++ pkgs.lib.optional config.fonts.enableCoreFonts pkgs.corefonts
+        ++ pkgs.lib.optional config.fonts.enableGhostscriptFonts "${pkgs.ghostscript}/share/ghostscript/fonts"
+        ++ config.fonts.extraFonts;
+      };
+
+      extraFonts = mkOption {
+        default = [];
+        description = "
+          List of additional fonts.
+        ";
+      };
+
+      enableCoreFonts = mkOption {
+        default = true;
+        description = "
+          Whether to include MS Core Fonts (redistributable, but only verbatim).
+        ";
+      };
+
+    };
+
+  };
+in
+
+###### implementation
+let
+  inherit (pkgs) builderDefs ttmkfdir;
+  inherit (pkgs.xorg) mkfontdir mkfontscale fontalias;
+
+  fontDirs = config.fonts.fonts;
+
+
+  localDefs = with builderDefs; builderDefs.passthru.function rec {
+    src = "";/* put a fetchurl here */
+
+    buildInputs = [mkfontdir mkfontscale ttmkfdir];
+    configureFlags = [];
+    inherit fontDirs;
+    installPhase = FullDepEntry ("
+    list='';
+    for i in ${toString fontDirs} ; do
+      if [ -d \$i/ ]; then
+        list=\"\$list \$i\";
+      fi;
+    done
+    list=\$(find \$list -name fonts.dir);
+    fontDirs='';
+    for i in \$list ; do
+      fontDirs=\"\$fontDirs \$(dirname \$i)\";
+    done;
+    mkdir -p \$out/share/X11-fonts/; 
+    for i in \$(find \$fontDirs -type f -o -type l); do
+      j=\${i##*/}
+      if ! test -e \$out/share/X11-fonts/\${j}; then
+        ln -s \$i \$out/share/X11-fonts/\${j};
+      fi;
+    done;
+    cd \$out/share/X11-fonts/
+    rm fonts.dir
+    rm fonts.scale
+    rm fonts.alias
+    mkfontdir
+    mkfontscale
+    mv fonts.scale fonts.scale.old
+    mv fonts.dir fonts.dir.old
+    ttmkfdir
+    cat fonts.scale.old >> fonts.scale
+    cat fonts.dir.old >> fonts.dir
+    rm fonts.dir.old
+    rm fonts.scale.old
+    cat \$( find ${fontalias}/ -name fonts.alias) >fonts.alias
+  ") ["minInit" "addInputs"];
+  };
+
+  x11Fonts = with localDefs; stdenv.mkDerivation rec {
+    name = "X11-fonts";
+    builder = writeScript (name + "-builder")
+      (textClosure localDefs 
+        [installPhase doForceShare doPropagate]);
+    meta = {
+      description = "
+        Directory to contain all X11 fonts requested.
+      ";
+    };
+  };
+
+  inherit (pkgs.lib) mkIf;
+in
+
+{
+  require = [
+    options
+  ];
+
+  system = {
+    build = {
+      inherit x11Fonts;
+    };
+  };
+
+  environment = {
+    # Configuration file for fontconfig used to locate
+    # (X11) client-rendered fonts.
+    etc = mkIf config.fonts.enableFontConfig [{
+      source = pkgs.makeFontsConf {
+        fontDirectories = config.fonts.fonts;
+      };
+      target = "fonts/fonts.conf";
+    }];
+  };
+}
diff --git a/system/options.nix b/system/options.nix
index f9be98fdcc1..ad97565bb97 100644
--- a/system/options.nix
+++ b/system/options.nix
@@ -2271,56 +2271,6 @@ in
   };
 
 
-  fonts = {
-
-    enableFontConfig = mkOption { # !!! should be enableFontconfig
-      default = true;
-      description = "
-        If enabled, a Fontconfig configuration file will be built
-        pointing to a set of default fonts.  If you don't care about
-        running X11 applications or any other program that uses
-        Fontconfig, you can turn this option off and prevent a
-        dependency on all those fonts.
-      ";
-    };
-
-    enableGhostscriptFonts = mkOption {
-      default = false;
-      description = "
-        Whether to add the fonts provided by Ghostscript (such as
-        various URW fonts and the ``Base-14'' Postscript fonts) to the
-        list of system fonts, making them available to X11
-        applications.
-      ";
-    };
-
-    enableFontDir = mkOption {
-      default = false;
-      description = "
-        Whether to create a directory with links to all fonts in share - 
-        so user can configure vncserver script one time (I mean per-user 
-        vncserver, so global service is not a good solution).
-      ";
-    };
-
-    extraFonts = mkOption {
-      default = [];
-      merge = backwardPkgsFunListMerge;
-      description = "
-        Function, returning list of additional fonts.
-      ";
-    };
-
-    enableCoreFonts = mkOption {
-      default = true;
-      description = "
-        Whether to include MS Core Fonts (redistributable, but only verbatim).
-      ";
-    };
-
-  };
-
-
   i18n = {
 
     defaultLocale = mkOption {
@@ -2475,6 +2425,9 @@ in
     (import ../upstart-jobs/cron.nix)
     (import ../upstart-jobs/cron/locate.nix)
 
+    # fonts
+    (import ../system/fonts.nix)
+
     # sound
     (import ../upstart-jobs/alsa.nix)
   ];
diff --git a/system/system.nix b/system/system.nix
index 0ef870b8806..0eb86cc857d 100644
--- a/system/system.nix
+++ b/system/system.nix
@@ -73,11 +73,7 @@ rec {
 
   
   # Font aggregation
-  fontDir = import ./fontdir.nix {
-    inherit config pkgs;
-    inherit (pkgs) builderDefs ttmkfdir;
-    inherit (pkgs.xorg) mkfontdir mkfontscale fontalias;
-  };
+  fontDir = config.system.build.x11Fonts;
 
   
   # The wrapper setuid programs (since we can't have setuid programs
diff --git a/upstart-jobs/xserver.nix b/upstart-jobs/xserver.nix
index dd8d6bed479..231bcd943ad 100644
--- a/upstart-jobs/xserver.nix
+++ b/upstart-jobs/xserver.nix
@@ -4,7 +4,7 @@
 let
   kernelPackages = config.boot.kernelPackages;
   # List of font directories.
-  fontDirectories = import ../system/fonts.nix {inherit pkgs config;};
+  fontDirectories = config.fonts.fonts;
 
   inherit (pkgs.lib) mkOption;
 
@@ -759,6 +759,9 @@ mkIf cfg.enable {
     # environment.etc
     (import ../etc/default.nix)
 
+    # fonts.fonts
+    (import ../system/fonts.nix)
+
     # boot.extraModulePackages
     # security.extraSetuidPrograms
     # environment.extraPackages
-- 
GitLab


From 7aa27dfee2ea7ae571717493058ad3123ffdb445 Mon Sep 17 00:00:00 2001
From: Nicolas Pierron <nicolas.b.pierron@gmail.com>
Date: Fri, 2 Jan 2009 19:41:39 +0000
Subject: [PATCH 1151/5331] Merge branches 'fix-style' and 'master' into
 fix-style

svn path=/nixos/branches/fix-style/; revision=13688
---
 boot/boot-stage-1-init.sh                   |  61 ++++++---
 default.nix                                 |   2 +-
 doc/manual/default.nix                      |   2 +
 doc/manual/manual.xml                       |   1 +
 etc/default.nix                             |  34 +++--
 etc/pam.d/lsh-pam-checkpw                   |   4 -
 installer/cd-dvd/closed-install.nix         |   1 +
 installer/cd-dvd/rescue-cd-configurable.nix |   1 -
 installer/cd-dvd/rescue-cd.nix              |  14 +-
 release.nix                                 |  75 +++++++++++
 system/options.nix                          |  76 +++++++----
 system/system-options.nix                   |   6 +-
 system/system.nix                           |   3 +
 upstart-jobs/atd.nix                        |  15 ++-
 upstart-jobs/default.nix                    |   6 +-
 upstart-jobs/fcron.nix                      | 138 ++++++++++++++++++++
 upstart-jobs/lshd.nix                       |   1 +
 upstart-jobs/sshd.nix                       |   3 +-
 upstart-jobs/xserver.nix                    |   6 +
 19 files changed, 364 insertions(+), 85 deletions(-)
 delete mode 100644 etc/pam.d/lsh-pam-checkpw
 create mode 100644 release.nix
 create mode 100644 upstart-jobs/fcron.nix

diff --git a/boot/boot-stage-1-init.sh b/boot/boot-stage-1-init.sh
index 0ddf6bb7eae..c6d7214028c 100644
--- a/boot/boot-stage-1-init.sh
+++ b/boot/boot-stage-1-init.sh
@@ -138,6 +138,26 @@ fi
 if test -n "$debug1devices"; then fail; fi
 
 
+# Return true if the machine is on AC power, or if we can't determine
+# whether it's on AC power.
+onACPower () {
+    if test -d "/proc/acpi/battery"; then
+	if ls /proc/acpi/battery/BAT[0-9]* > /dev/null 2>&1; then
+	    if cat /proc/acpi/battery/BAT*/state	\
+	       | grep "^charging state"			\
+	       | grep -q "discharg" ; then
+		false
+	    else
+		true
+	    fi
+	else
+	    true
+	fi
+    else
+	true
+    fi
+}
+
 # Function for mounting a file system.
 mountFS() {
     local device="$1"
@@ -158,24 +178,29 @@ mountFS() {
     fi
 
     if test -n "$mustCheck"; then
-        FSTAB_FILE="/etc/mtab" fsck -V -v -C -a "$device"
-        fsckResult=$?
-
-        if test $(($fsckResult | 2)) = $fsckResult; then
-            echo "fsck finished, rebooting..."
-            sleep 3
-            reboot
-        fi
-
-        if test $(($fsckResult | 4)) = $fsckResult; then
-            echo "$device has unrepaired errors, please fix them manually."
-            fail
-        fi
-
-        if test $fsckResult -ge 8; then
-            echo "fsck on $device failed."
-            fail
-        fi
+	if onACPower; then
+            FSTAB_FILE="/etc/mtab" fsck -V -v -C -a "$device"
+            fsckResult=$?
+
+            if test $(($fsckResult | 2)) = $fsckResult; then
+		echo "fsck finished, rebooting..."
+		sleep 3
+		reboot
+            fi
+
+            if test $(($fsckResult | 4)) = $fsckResult; then
+		echo "$device has unrepaired errors, please fix them manually."
+		fail
+            fi
+
+            if test $fsckResult -ge 8; then
+		echo "fsck on $device failed."
+		fail
+            fi
+	else
+            # Don't run `fsck' if the machine is on battery power.
+	    echo "on battery power, so \`fsck' not run on \`$device'"
+	fi
     fi
 
     # Mount read-writable.
diff --git a/default.nix b/default.nix
index 1a621c3457e..86f437d3696 100644
--- a/default.nix
+++ b/default.nix
@@ -1,6 +1,6 @@
 let
 
-  fromEnv = name : default :
+  fromEnv = name: default:
     let env = builtins.getEnv name; in
     if env == "" then default else env;
   configuration = import (fromEnv "NIXOS_CONFIG" /etc/nixos/configuration.nix);
diff --git a/doc/manual/default.nix b/doc/manual/default.nix
index e6f9b84329f..a7f51adf287 100644
--- a/doc/manual/default.nix
+++ b/doc/manual/default.nix
@@ -38,6 +38,8 @@ let
         ${pkgs.docbook5_xsl}/xml/xsl/docbook/html/docbook.xsl \
         ./manual.xml
       cp ${./style.css} $out/style.css
+      ensureDir $out/nix-support
+      echo "doc manual $out" >> $out/nix-support/hydra-build-products
     '';
   };
 
diff --git a/doc/manual/manual.xml b/doc/manual/manual.xml
index 55adf3e647d..9f79b6fdb6e 100644
--- a/doc/manual/manual.xml
+++ b/doc/manual/manual.xml
@@ -15,6 +15,7 @@
 
     <copyright>
       <year>2007</year>
+      <year>2008</year>
       <holder>Eelco Dolstra</holder>
     </copyright>
     
diff --git a/etc/default.nix b/etc/default.nix
index 731558b67f2..fc07a39f9be 100644
--- a/etc/default.nix
+++ b/etc/default.nix
@@ -30,13 +30,12 @@ let
   nssModulesPath = config.system.nssModules.path;
   wrapperDir = config.system.wrapperDir;
   systemPath = config.system.path;
+  binsh = config.system.build.binsh;
 
   optional = pkgs.lib.optional;
 
 
   # !!! ugh, these files shouldn't be created here.
-
-
   pamConsoleHandlers = pkgs.writeText "console.handlers" ''
     console consoledevs /dev/tty[0-9][0-9]* :[0-9]\.[0-9] :[0-9]
     ${pkgs.pam_console}/sbin/pam_console_apply lock logfail wait -t tty -s -c ${pamConsolePerms}
@@ -131,14 +130,28 @@ let
     }
 
     { # Nix configuration.
-      source = pkgs.writeText "nix.conf" ''
-        # WARNING: this file is generated.
-        build-users-group = nixbld
-        build-max-jobs = ${toString (config.nix.maxJobs)}
-        build-use-chroot = ${if config.nix.useChroot then "true" else "false"}
-        build-chroot-dirs = /dev /dev/pts /proc /bin
-        ${config.nix.extraOptions}
-      '';
+      source =
+        let
+          # Tricky: if we're using a chroot for builds, then we need
+          # /bin/sh in the chroot (our own compromise to purity).
+          # However, since /bin/sh is a symlink to some path in the
+          # Nix store, which furthermore has runtime dependencies on
+          # other paths in the store, we need the closure of /bin/sh
+          # in `build-chroot-dirs' - otherwise any builder that uses
+          # /bin/sh won't work.
+          refs = pkgs.writeReferencesToFile binsh;
+        in 
+          pkgs.runCommand "nix.conf" {} ''
+            binshDeps=$(for i in $(cat ${refs}); do if test -d $i; then echo $i; fi; done)
+            cat > $out <<END
+            # WARNING: this file is generated.
+            build-users-group = nixbld
+            build-max-jobs = ${toString (config.nix.maxJobs)}
+            build-use-chroot = ${if config.nix.useChroot then "true" else "false"}
+            build-chroot-dirs = /dev /dev/pts /proc /bin $(echo $binshDeps)
+            ${config.nix.extraOptions}
+            END
+          '';
       target = "nix.conf"; # will be symlinked from /nix/etc/nix/nix.conf in activate-configuration.sh.
     }
 
@@ -209,7 +222,6 @@ let
       "shadow"
       "sshd"
       "lshd"
-      "lsh-pam-checkpw"
       "useradd"
       "chsh"
       "xlock"
diff --git a/etc/pam.d/lsh-pam-checkpw b/etc/pam.d/lsh-pam-checkpw
deleted file mode 100644
index 50f3cc5ce60..00000000000
--- a/etc/pam.d/lsh-pam-checkpw
+++ /dev/null
@@ -1,4 +0,0 @@
-auth     include        common
-account  include        common
-password include        common
-session  include        common
diff --git a/installer/cd-dvd/closed-install.nix b/installer/cd-dvd/closed-install.nix
index d7544ff22b8..e7443719f60 100644
--- a/installer/cd-dvd/closed-install.nix
+++ b/installer/cd-dvd/closed-install.nix
@@ -70,4 +70,5 @@ in
           ""
           ["nix-reduce-build" "nix-http-export.cgi"]
           ["--with-docbook-xsl=\\\${pkgs.docbook5_xsl}/xml/xsl/docbook/"];
+	extraInitrdKernelModules = ["usb_storage" "ehci_hcd" "ohci_hcd" "iso9660" "ext3"];
 }).rescueCD
diff --git a/installer/cd-dvd/rescue-cd-configurable.nix b/installer/cd-dvd/rescue-cd-configurable.nix
index a00164a2088..e727d2d1f2d 100644
--- a/installer/cd-dvd/rescue-cd-configurable.nix
+++ b/installer/cd-dvd/rescue-cd-configurable.nix
@@ -153,7 +153,6 @@ rec {
       kernelModules = bootKernelModules;
       extraModulePackages = ((extraModulePackages pkgs)
       ++(if aufs then [(kernelPackages pkgs).aufs] else [])
-      ++(pkgs.lib.optional intel3945FWEnable (kernelPackages pkgs).iwlwifi)
       );
     };
     
diff --git a/installer/cd-dvd/rescue-cd.nix b/installer/cd-dvd/rescue-cd.nix
index c34fc259340..66c707c77a7 100644
--- a/installer/cd-dvd/rescue-cd.nix
+++ b/installer/cd-dvd/rescue-cd.nix
@@ -220,18 +220,12 @@ rec {
   ";
 
   
-  # Put the current directory in a tarball (making sure to filter
-  # out crap like the .svn directories).
-  nixosTarball = makeTarball "nixos.tar.bz2" (builtins.filterSource svnFilter ./../..);
+  # Put the current directory in a tarball.
+  nixosTarball = makeTarball "nixos.tar.bz2" ../..;
 
-  svnFilter = name: type:
-    let base = baseNameOf (toString name);
-    in base != ".svn" && base != "result";
 
-
-  # Put Nixpkgs in a tarball
-  nixpkgsTarball = makeTarball "nixpkgs.tar.bz2"
-    (builtins.filterSource svnFilter nixpkgsPath);
+  # Put Nixpkgs in a tarball.
+  nixpkgsTarball = makeTarball "nixpkgs.tar.bz2" nixpkgsPath;
 
 
   # The configuration file for Grub.
diff --git a/release.nix b/release.nix
new file mode 100644
index 00000000000..4612e94ded9
--- /dev/null
+++ b/release.nix
@@ -0,0 +1,75 @@
+let 
+
+
+  jobs = rec {
+
+
+    tarball =
+      { nixosSrc ? {path = ./.; rev = 1234;}
+      , nixpkgs ? {path = ../nixpkgs-wc;}
+      , officialRelease ? false
+      }:
+
+      with import nixpkgs.path {};
+
+      releaseTools.makeSourceTarball {
+        name = "nixos-tarball";
+        src = nixosSrc;
+        inherit officialRelease;
+
+        distPhase = ''
+          releaseName=nixos-$(cat $src/VERSION)$VERSION_SUFFIX
+          ensureDir "$out/tarballs"
+          mkdir ../$releaseName
+          cp -prd . ../$releaseName
+          cd ..
+          tar cfvj $out/tarballs/$releaseName.tar.bz2 $releaseName
+        ''; # */
+      };
+
+
+    manual =
+      { nixosSrc ? {path = ./.; rev = 1234;}
+      , nixpkgs ? {path = ../nixpkgs-wc;}
+      , officialRelease ? false
+      }:
+
+      import "${nixosSrc.path}/doc/manual" {
+        nixpkgsPath = nixpkgs.path;
+      };
+
+
+    iso = 
+      { nixosSrc ? {path = ./.; rev = 1234;}
+      , nixpkgs ? {path = ../nixpkgs-wc;}
+      , officialRelease ? false
+      , system ? "i686-linux"
+      }:
+
+      with import nixpkgs.path {inherit system;};
+
+      let
+
+        iso = (import "${nixosSrc.path}/installer/cd-dvd/rescue-cd.nix" {
+          platform = system;
+          compressImage = true;
+          nixpkgsPath = nixpkgs.path;
+        }).rescueCD;
+
+      in
+        # Declare the ISO as a build product so that it shows up in Hydra.
+        runCommand "nixos-iso"
+          { meta = {
+              description = "NixOS installation CD ISO image for ${system}";
+            };
+          }
+          ''
+            ensureDir $out/nix-support
+            echo "file iso" ${iso}/iso/*.iso* >> $out/nix-support/hydra-build-products
+          ''; # */
+      
+
+  };
+  
+
+in jobs
\ No newline at end of file
diff --git a/system/options.nix b/system/options.nix
index ad97565bb97..fbb316dc53a 100644
--- a/system/options.nix
+++ b/system/options.nix
@@ -301,7 +301,6 @@ in
           kernel = kernelPackages.kernel;
         in
         [ kernel ]
-        ++ pkgs.lib.optional ((config.networking.enableIntel3945ABGFirmware || config.networking.enableIntel4965AGNFirmware) && !kernel.features ? iwlwifi) kernelPackages.iwlwifi
         ++ pkgs.lib.optional config.hardware.enableGo7007 kernelPackages.wis_go7007
         ++ config.boot.extraModulePackages
         # should only keep this one, other have to be set by the option owners.
@@ -818,6 +817,13 @@ in
           <command>no</command>
         ";
       };
+
+      gatewayPorts = mkOption {
+        default = "no";
+        description = "
+           Specifies  whether  remote hosts are allowed to connect to ports forwarded for the client. See man sshd_conf.
+          ";
+        };
     };
 
     lshd = {
@@ -1255,9 +1261,11 @@ in
         default = [];
         example = [ "proxy_connect" { name = "php5_module"; path = "${pkgs.php}/modules/libphp5.so"; } ];
         description = ''
-          Loads additional modules either beeing distributed with apache.
-          If the module is contained in a foreign package (such as php5_module)
-          kse an attrset as given in the example.
+          Specifies additional Apache modules.  These can be specified
+          as a string in the case of modules distributed with Apache,
+          or as an attribute set specifying the
+          <varname>name</varname> and <varname>path</varname> of the
+          module.
         '';
       };
 
@@ -1996,25 +2004,29 @@ in
         example = [ { type = "svn"; url = "https://svn.nixos.org/repos/nix/nixos/branches/stdenv-updates"; target = "/etc/nixos/nixos-stdenv-updates"; }
                     { type = "git"; initialize = ''git clone git://mawercer.de/nixos $target''; update = "git pull origin"; target = "/etc/nixos/nixos-git"; }
                   ];
-        description = "The NixOS repository from which the system will be build. 
-                       nixos-checkout will update all working copies of the given repositories,
-                       nixos-rebuild will use the first item which has
-                       the attribute default = true falling back to the
-                       first item. The type defines the repository tool added
-                       to the path. It also defines a \"valid\" repository.
-                       If the target directory already exists and it's not
-                       valid it will be moved to the backup location
-                       <filename>\${dir}-date</filename>.
-                       For svn the default target and repositories are
-                       <filename>/etc/nixos/nixos</filename> and
-                       <filename>https://svn.nixos.org/repos/nix/nixos/trunk</filename>.
-                       For git repositories update is called after
-                       initialization when the repo is initialized.
-                       The initialize code is run from working directory
-                       dirname \$target and should create the directory
-                       <filename>\$target<filename>. (<command>git clone url nixos/nixpkgs/services</command> should do)
-                       For the executables beeing used see <option>repoTypes</option>
-                       ";
+        description = ''
+          The NixOS repository from which the system will be built.
+          <command>nixos-checkout</command> will update all working
+          copies of the given repositories,
+          <command>nixos-rebuild</command> will use the first item
+          which has the attribute <literal>default = true</literal>
+          falling back to the first item. The type defines the
+          repository tool added to the path. It also defines a "valid"
+          repository.  If the target directory already exists and it's
+          not valid it will be moved to the backup location
+          <filename><replaceable>dir</replaceable>-date</filename>.
+          For svn the default target and repositories are
+          <filename>/etc/nixos/nixos</filename> and
+          <filename>https://svn.nixos.org/repos/nix/nixos/trunk</filename>.
+          For git repositories update is called after initialization
+          when the repo is initialized.  The initialize code is run
+          from working directory dirname
+          <replaceable>target</replaceable> and should create the
+          directory
+          <filename><replaceable>dir</replaceable></filename>. (<command>git
+          clone url nixos/nixpkgs/services</command> should do) For
+          the executables used see <option>repoTypes</option>.
+        '';
       };
 
       nixpkgs = mkOption {
@@ -2029,12 +2041,17 @@ in
     };
 
     repoTypes = mkOption {
-        default = {
-          svn = { valid = "[ -d .svn ]"; env = [ pkgs.coreutils pkgs.subversion ]; };
-          git = { valid = "[ -d .git ]"; env = [ pkgs.coreutils pkgs.git pkgs.gnused /*  FIXME: use full path to sed in nix-pull */ ]; };
-        };
-        description = "defines PATH environment and when directory is considered beeing a valid repository.
-              If it's not it's moved to a backup directory";
+      default = {
+        svn = { valid = "[ -d .svn ]"; env = [ pkgs.coreutils pkgs.subversion ]; };
+        git = { valid = "[ -d .git ]"; env = [ pkgs.coreutils pkgs.git pkgs.gnused /*  FIXME: use full path to sed in nix-pull */ ]; };
+      };
+      description = ''
+        Defines, for each supported version control system
+        (e.g. <literal>git</literal>), the dependencies for the
+        mechanism, as well as a test used to determine whether a
+        directory is a checkout created by that version control
+        system.
+      '';
     };
 
     manifests = mkOption {
@@ -2423,6 +2440,7 @@ in
     (import ../upstart-jobs/zabbix-server.nix)
     (import ../upstart-jobs/disnix.nix)
     (import ../upstart-jobs/cron.nix)
+    (import ../upstart-jobs/fcron.nix)
     (import ../upstart-jobs/cron/locate.nix)
 
     # fonts
diff --git a/system/system-options.nix b/system/system-options.nix
index 650a08e0a76..97a9e05d4f5 100644
--- a/system/system-options.nix
+++ b/system/system-options.nix
@@ -88,6 +88,10 @@ in
   ];
 
   system = {
+    build = {
+      binsh = pkgs.bashInteractive;
+    };
+
     activationScripts = {
       systemConfig = noDepEntry ''
         systemConfig="$1"
@@ -122,7 +126,7 @@ in
         # Create the required /bin/sh symlink; otherwise lots of things
         # (notably the system() function) won't work.
         mkdir -m 0755 -p $mountPoint/bin
-        ln -sfn ${pkgs.bash}/bin/sh $mountPoint/bin/sh
+        ln -sfn ${config.system.build.binsh}/bin/sh $mountPoint/bin/sh
       '' [
         activateLib.defaultPath # path to ln & mkdir
         activateLib.stdio # ?
diff --git a/system/system.nix b/system/system.nix
index 0eb86cc857d..75087708b83 100644
--- a/system/system.nix
+++ b/system/system.nix
@@ -184,6 +184,9 @@ rec {
   # at boot time (such as start `init').
   activateConfiguration = config.system.activationScripts.script;
 
+  # The shell that we want to use for /bin/sh.
+  binsh = pkgs.bashInteractive;
+
 
   # The init script of boot stage 2, which is supposed to do
   # everything else to bring up the system.
diff --git a/upstart-jobs/atd.nix b/upstart-jobs/atd.nix
index b477a38eee4..cfdbeb67915 100644
--- a/upstart-jobs/atd.nix
+++ b/upstart-jobs/atd.nix
@@ -19,7 +19,8 @@ let
           default = false;
           description = ''
             Whether to make /var/spool/at{jobs,spool} writeable 
-            by everyone (and sticky).
+            by everyone (and sticky).  This is normally not needed since
+            the `at' commands are setuid/setgid `atd'.
           '';
         };
       };
@@ -74,7 +75,7 @@ start script
    if [ ! -f "$etcdir"/at.deny ]
    then
        touch "$etcdir"/at.deny && \
-       chown root:root "$etcdir"/at.deny && \
+       chown root:atd "$etcdir"/at.deny && \
        chmod 640 "$etcdir"/at.deny
    fi
    if [ ! -f "$jobdir"/.SEQ ]
@@ -107,9 +108,13 @@ mkIf cfg.enable {
   ];
 
   security = {
-    extraSetuidPrograms = [
-      "at" "atq" "atrm"
-    ];
+    setuidOwners = map (program: {
+        inherit program;
+        owner = "atd";
+        group = "atd";
+        setuid = true;
+        setgid = true;
+      }) [ "at" "atq" "atrm" ];
   };
 
   environment = {
diff --git a/upstart-jobs/default.nix b/upstart-jobs/default.nix
index f0862aaddec..3633dee63e7 100644
--- a/upstart-jobs/default.nix
+++ b/upstart-jobs/default.nix
@@ -150,7 +150,7 @@ let
       firmwareDirs =
            pkgs.lib.optional config.networking.enableIntel2200BGFirmware pkgs.ipw2200fw
         ++ pkgs.lib.optional config.networking.enableIntel3945ABGFirmware pkgs.iwlwifi3945ucode
-        ++ pkgs.lib.optional config.networking.enableIntel4965AGNFirmware pkgs.iwlwifi4965ucode
+        ++ pkgs.lib.optional config.networking.enableIntel4965AGNFirmware kernelPackages.iwlwifi4965ucode
         ++ pkgs.lib.optional config.networking.enableZydasZD1211Firmware pkgs.zd1211fw
         ++ pkgs.lib.optional config.hardware.enableGo7007 "${kernelPackages.wis_go7007}/firmware"
         ++ config.services.udev.addFirmware;
@@ -239,9 +239,7 @@ let
       inherit (pkgs) writeText openssh glibc;
       inherit (pkgs.xorg) xauth;
       inherit nssModulesPath;
-      forwardX11 = config.services.sshd.forwardX11;
-      allowSFTP = config.services.sshd.allowSFTP;
-      permitRootLogin = config.services.sshd.permitRootLogin;
+      inherit (config.services.sshd) forwardX11 allowSFTP permitRootLogin gatewayPorts;
     })
 
   # GNU lshd SSH2 deamon.
diff --git a/upstart-jobs/fcron.nix b/upstart-jobs/fcron.nix
new file mode 100644
index 00000000000..97d259c65e1
--- /dev/null
+++ b/upstart-jobs/fcron.nix
@@ -0,0 +1,138 @@
+{pkgs, config}:
+
+###### interface
+let
+  inherit (pkgs.lib) mkOption concatStringsSep;
+  inherit (pkgs) writeText;
+
+  options = {
+    services = {
+      fcron = {
+        enable = mkOption {
+          default = false;
+          description = ''Whether to enable the `fcron' daemon.
+            From its docs: "fcron does both the job of Vixie Cron and anacron, but does even more and better".
+            It can trigger actions even if the event has passed due to shutdown for example.
+            TODO: add supoprt for fcron.allow and fcron.deny
+            Of course on cron daemon is enough.. So if fcron works fine there should be a system option systemCron="fcron or cron"
+
+            There are (or have been) some security issues.
+            I haven't yet checked wether they have been resolved.
+            For now you should trust the users registering crontab files.
+            I think gentoo has them listed.
+          '';
+        };
+        allow = mkOption {
+          default = [];
+          description = ''
+            Users allowed to use fcrontab and fcrondyn (one name per line, special name "all" acts for everyone)
+            nix adds username "root" for you.
+          '';
+        };
+        deny = mkOption {
+          default = [];
+          description = " same as allow but deny ";
+        };
+        maxSerialJobs = mkOption {
+          default = 1;
+          description = "maximum number of serial jobs which can run simultaneously (-m)";
+        };
+        queuelen = mkOption {
+          default = "";
+          description = "number of jobs the serial queue and the lavg queue can contain - empty to net set this number (-q)";
+        };
+        systab = mkOption {
+          default = "";
+          description = ''
+            The "system" crontab contents..
+          '';
+        };
+      };
+    };
+  };
+in
+
+###### implementation
+let
+  # Put all the system cronjobs together.
+  # TODO allow using fcron only..
+  #systemCronJobs =
+  #  config.services.cron.systemCronJobs;
+  cfg = config.services.fcron;
+  ifEnabled = if cfg.enable then pkgs.lib.id else (x : []);
+  queuelen = if cfg.queuelen == "" then "" else "-q ${toString cfg.queuelen}";
+
+  # shell is set to /sh in config..
+  # ${pkgs.lib.concatStrings (map (job: job + "\n") systemCronJobs)}
+  systemCronJobsFile = pkgs.writeText "fcron-systab" ''
+    SHELL=${pkgs.bash}/bin/sh
+    PATH=${pkgs.coreutils}/bin:${pkgs.findutils}/bin:${pkgs.gnused}/bin
+  '';
+
+  allowdeny = target: users : {
+    source = writeText "fcron.${target}" (concatStringsSep "\n" users);
+    target = "fcron.${target}";
+    mode = "600"; # fcron has some security issues.. So I guess this is most safe
+  };
+
+in
+
+{
+  require = [
+    # (import ../upstart-jobs/default.nix) # config.services.extraJobs
+    # (import ?) # config.time.timeZone
+    # (import ?) # config.environment.etc
+    # (import ?) # config.environment.extraPackages
+    # (import ?) # config.environment.cleanStart
+    options
+  ];
+
+  environment = {
+    etc = ifEnabled [
+      (allowdeny "allow" (["root"] ++ cfg.allow))
+      (allowdeny "deny" cfg.deny)
+      # see man 5 fcron.conf
+      { source = writeText "fcon.conf" ''
+          fcrontabs	=	/var/spool/fcron
+          pidfile	=	/var/run/fcron.pid
+          fifofile	=	/var/run/fcron.fifo
+          fcronallow	=	/etc/fcron.allow
+          fcrondeny	=	/etc/fcron.deny
+          shell		=	/bin/sh
+          sendmail	=	/var/setuid-wrappers/sendmail
+          editor	=	/var/run/current-system/sw/bin/vi
+       '';
+        target = "fcron.conf";
+        mode = "0600"; # max allowed is 644
+      }
+    ];
+
+    extraPackages = ifEnabled (
+      pkgs.lib.optional
+        (!config.environment.cleanStart)
+        pkgs.fcron);
+  };
+
+  services = {
+    extraJobs = ifEnabled [{
+      name = "fcron";
+
+      job = ''
+        description "fcron daemon"
+
+        start on startup
+        stop on shutdown
+
+        env PATH=/var/run/current-system/sw/bin
+
+        start script
+            ${pkgs.coreutils}/bin/mkdir -m 0700 -p /var/spool/fcron
+            # load system crontab file
+            ${pkgs.fcron}/bin/fcrontab -u systab ${writeText "systab" cfg.systab}
+        end script
+
+        respawn ${pkgs.fcron}/sbin/fcron -f -m ${toString cfg.maxSerialJobs} ${queuelen}
+      '';
+    }];
+  };
+}
diff --git a/upstart-jobs/lshd.nix b/upstart-jobs/lshd.nix
index e2a61eed387..0a13d9ba7ee 100644
--- a/upstart-jobs/lshd.nix
+++ b/upstart-jobs/lshd.nix
@@ -31,6 +31,7 @@ start script
 end script
 
 respawn ${lsh}/sbin/lshd --daemonic \
+   --password-helper="${lsh}/sbin/lsh-pam-checkpw" \
    -p ${toString portNumber} \
    ${if interfaces == [] then ""
      else (concatStrings (map (i: "--interface=\"${i}\"")
diff --git a/upstart-jobs/sshd.nix b/upstart-jobs/sshd.nix
index c64c4eb49a5..e9b916e81d3 100644
--- a/upstart-jobs/sshd.nix
+++ b/upstart-jobs/sshd.nix
@@ -1,6 +1,6 @@
 { writeText, openssh, glibc, xauth
 , nssModulesPath
-, forwardX11, allowSFTP, permitRootLogin
+, forwardX11, allowSFTP, permitRootLogin, gatewayPorts
 }:
 
 assert permitRootLogin == "yes" ||
@@ -29,6 +29,7 @@ let
     "}
     
     PermitRootLogin ${permitRootLogin}
+    GatewayPorts ${gatewayPorts}
     
   '';
 
diff --git a/upstart-jobs/xserver.nix b/upstart-jobs/xserver.nix
index 231bcd943ad..0e204282c14 100644
--- a/upstart-jobs/xserver.nix
+++ b/upstart-jobs/xserver.nix
@@ -183,6 +183,10 @@ let
             default = "0.12";
             description = "Cursor speed factor for highest-speed finger motion";
           };
+          twoFingerScroll = mkOption {
+            default = false;
+            description = "Whether to enable two-finger drag-scrolling";
+          };
         };
 
         layout = mkOption {
@@ -413,6 +417,8 @@ let
         Option "TapButton1" "1"
         Option "TapButton2" "2"
         Option "TapButton3" "3"
+        Option "VertTwoFingerScroll" "${if cfg.synaptics.twoFingerScroll then "1" else "0"}"
+        Option "HorizTwoFingerScroll" "${if cfg.synaptics.twoFingerScroll then "1" else "0"}"
       EndSection
     '' else "";
 
-- 
GitLab


From 32adf2c5219c88d7b1fbc567bfc17ab89cc09142 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Sat, 3 Jan 2009 09:07:52 +0000
Subject: [PATCH 1152/5331] Option for proxy usage in Nix daemon

svn path=/nixos/trunk/; revision=13689
---
 system/options.nix | 10 ++++++++++
 system/system.nix  | 10 +++++++++-
 2 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/system/options.nix b/system/options.nix
index 92d6288c597..c6f9e9a0e0f 100644
--- a/system/options.nix
+++ b/system/options.nix
@@ -2682,6 +2682,16 @@ in
       ";
     };
 
+    proxy = mkOption {
+        default = "";
+	description = "
+	  This option specifies the proxy to use for fetchurl. The real effect 
+	  is just exporting http_proxy, https_proxy and ftp_proxy with that
+	  value.
+	";
+	example = "http://127.0.0.1:3128";
+    };
+
   };
 
 
diff --git a/system/system.nix b/system/system.nix
index 948b9a6a345..3cbbc8ddfee 100644
--- a/system/system.nix
+++ b/system/system.nix
@@ -103,7 +103,15 @@ rec {
         export NIX_REMOTE_SYSTEMS=/etc/nix.machines
         export NIX_CURRENT_LOAD=/var/run/nix/current-load
       ''
-    else "");
+    else "")
+    +
+    (if config.nix.proxy != "" then
+    ''
+        export http_proxy=${config.nix.proxy}
+        export https_proxy=${config.nix.proxy}
+        export ftp_proxy=${config.nix.proxy}
+    '' else "")
+    ;
 
               
   # The services (Upstart) configuration for the system.
-- 
GitLab


From aa393f816c0647d889818879792b7b298b4a109b Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Thu, 8 Jan 2009 21:50:27 +0000
Subject: [PATCH 1153/5331] Allowing direct package use in manual expression

svn path=/nixos/trunk/; revision=13724
---
 doc/manual/default.nix | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/doc/manual/default.nix b/doc/manual/default.nix
index a7f51adf287..56657aec2e2 100644
--- a/doc/manual/default.nix
+++ b/doc/manual/default.nix
@@ -1,8 +1,10 @@
-{nixpkgsPath ? ../../../nixpkgs}:
+{nixpkgsPath ? ../../../nixpkgs, pkgs ? null}:
 
 let
 
-  pkgs = import "${nixpkgsPath}/pkgs/top-level/all-packages.nix" {};
+  pkgs = if pkgs == null then 
+    import "${nixpkgsPath}/pkgs/top-level/all-packages.nix" {}
+  else pkgs;
 
   options = builtins.toFile "options.xml" (builtins.unsafeDiscardStringContext
     (builtins.toXML (pkgs.lib.optionAttrSetToDocList ""
-- 
GitLab


From 0a1f41c7427a5e376cf02c27b6c16f61c416a303 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Thu, 8 Jan 2009 23:30:23 +0000
Subject: [PATCH 1154/5331] An upstart job to display manual

svn path=/nixos/trunk/; revision=13728
---
 doc/manual/default.nix  |  6 +--
 system/options.nix      |  1 +
 system/system.nix       |  5 ++-
 upstart-jobs/manual.nix | 87 +++++++++++++++++++++++++++++++++++++++++
 4 files changed, 95 insertions(+), 4 deletions(-)
 create mode 100644 upstart-jobs/manual.nix

diff --git a/doc/manual/default.nix b/doc/manual/default.nix
index 56657aec2e2..c46e89d0fa1 100644
--- a/doc/manual/default.nix
+++ b/doc/manual/default.nix
@@ -1,10 +1,10 @@
-{nixpkgsPath ? ../../../nixpkgs, pkgs ? null}:
+{nixpkgsPath ? ../../../nixpkgs, nixpkgs ? null}:
 
 let
 
-  pkgs = if pkgs == null then 
+  pkgs = if nixpkgs == null then 
     import "${nixpkgsPath}/pkgs/top-level/all-packages.nix" {}
-  else pkgs;
+  else nixpkgs;
 
   options = builtins.toFile "options.xml" (builtins.unsafeDiscardStringContext
     (builtins.toXML (pkgs.lib.optionAttrSetToDocList ""
diff --git a/system/options.nix b/system/options.nix
index c6f9e9a0e0f..1a70a2f951c 100644
--- a/system/options.nix
+++ b/system/options.nix
@@ -3063,5 +3063,6 @@ root        ALL=(ALL) SETENV: ALL
     (import ../upstart-jobs/cron.nix)
     (import ../upstart-jobs/fcron.nix)
     (import ../upstart-jobs/cron/locate.nix)
+    (import ../upstart-jobs/manual.nix)
   ];
 }
diff --git a/system/system.nix b/system/system.nix
index 3cbbc8ddfee..bbb7d83f543 100644
--- a/system/system.nix
+++ b/system/system.nix
@@ -1,6 +1,7 @@
 { platform ? __currentSystem
 , configuration
 , nixpkgsPath ? ../../nixpkgs
+, nixpkgs ? null
 }:
 
 rec {
@@ -26,7 +27,9 @@ rec {
       pkgs configComponents
       config;
 
-  pkgs = import "${nixpkgsPath}/pkgs/top-level/all-packages.nix" {system = platform;};
+  pkgs = if nixpkgs == null then 
+    import "${nixpkgsPath}/pkgs/top-level/all-packages.nix" {system = platform;}
+  else nixpkgs;
 
   manifests = config.installer.manifests; # exported here because nixos-rebuild uses it
 
diff --git a/upstart-jobs/manual.nix b/upstart-jobs/manual.nix
new file mode 100644
index 00000000000..5d658ce7681
--- /dev/null
+++ b/upstart-jobs/manual.nix
@@ -0,0 +1,87 @@
+{pkgs, config}: 
+
+# Show the NixOS manual on tty7
+# Originally used only by installation CD
+
+let
+  inherit (pkgs.lib) mkOption;
+  options = {
+    services = {
+      showManual = {
+        enable = mkOption {
+	  default = false;
+	  description = "
+	    Whether to show the NixOS manual on the tty7
+	  ";
+	};
+	ttyNumber = mkOption {
+	  default = "7";
+	  description = "
+	    TTY number name to show the manual on
+	  ";
+	};
+	browserPackage = mkOption {
+	  default = pkgs.w3m;
+	  description = "
+	    Package containing the browser to be used
+	  ";
+	};
+	browserCommand = mkOption {
+	  default = "bin/w3m";
+	  description = "
+	    Command (command path is relative to browserPackage) to run the browser
+	  ";
+	};
+	manualFile = mkOption {
+	  default = null; 
+	  description = "
+	    NixOS manual HTML file
+	  ";
+	};
+      };
+    };
+  };
+
+inherit(pkgs.lib) optional;
+
+inherit (config.services.showManual) enable ttyNumber browserPackage browserCommand 
+  manualFile;
+	  
+realManualFile = if manualFile == null then 
+  (import ../doc/manual {nixpkgs = pkgs;})+"/manual.html"
+else manualFile;
+
+in
+
+{
+  require = [
+    options
+  ];
+
+  boot = {
+    extraTTYs = optional enable ttyNumber;
+  };
+  
+  services = {
+    extraJobs = optional enable {
+      name = "showManual";
+
+      job = ''
+        description "NixOS manual"
+	
+	start on udev
+	stop on shutdown
+	respawn ${browserPackage}/${browserCommand} ${realManualFile} < /dev/tty${toString ttyNumber} > /dev/tty${toString ttyNumber} 2>&1
+      '';
+    };
+    ttyBackgrounds = {
+      specificThemes = optional enable {
+        tty = ttyNumber;
+	theme = pkgs.themes "green";
+      };
+    };
+    mingetty = {
+      helpLine = if enable then "\nPress <Alt-F${toString ttyNumber}> for NixOS manual." else "";
+    };
+  };
+}
-- 
GitLab


From 9a46e71e7b49937c7c19c7d39d1ec5254bad450a Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Thu, 8 Jan 2009 23:49:22 +0000
Subject: [PATCH 1155/5331] Added rogue job used by CD

svn path=/nixos/trunk/; revision=13730
---
 system/options.nix     |  1 +
 upstart-jobs/rogue.nix | 64 ++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 65 insertions(+)
 create mode 100644 upstart-jobs/rogue.nix

diff --git a/system/options.nix b/system/options.nix
index 1a70a2f951c..e70bb51628c 100644
--- a/system/options.nix
+++ b/system/options.nix
@@ -3064,5 +3064,6 @@ root        ALL=(ALL) SETENV: ALL
     (import ../upstart-jobs/fcron.nix)
     (import ../upstart-jobs/cron/locate.nix)
     (import ../upstart-jobs/manual.nix)
+    (import ../upstart-jobs/rogue.nix)
   ];
 }
diff --git a/upstart-jobs/rogue.nix b/upstart-jobs/rogue.nix
new file mode 100644
index 00000000000..75b1a0a9882
--- /dev/null
+++ b/upstart-jobs/rogue.nix
@@ -0,0 +1,64 @@
+{pkgs, config}: 
+
+# Show rogue game on tty8
+# Originally used only by installation CD
+
+let
+  inherit (pkgs.lib) mkOption;
+  options = {
+    services = {
+      rogue = {
+        enable = mkOption {
+	  default = false;
+	  description = "
+	    Whether to run rogue
+	  ";
+	};
+	ttyNumber = mkOption {
+	  default = "8";
+	  description = "
+	    TTY number name to show the manual on
+	  ";
+	};
+      };
+    };
+  };
+
+inherit (pkgs.lib) optional;
+
+inherit (config.services.rogue) enable ttyNumber;
+
+in
+
+{
+  require = [
+    options
+  ];
+
+  boot = {
+    extraTTYs = optional enable ttyNumber;
+  };
+  
+  services = {
+    extraJobs = optional enable {
+      name = "rogue";
+
+      job = ''
+        description "rogue game"
+	
+	start on udev
+	stop on shutdown
+	respawn ${pkgs.rogue}/bin/rogue < /dev/tty${toString ttyNumber} > /dev/tty${toString ttyNumber} 2>&1
+      '';
+    };
+    ttyBackgrounds = {
+      specificThemes = optional enable {
+        tty = ttyNumber;
+	theme = pkgs.themes "theme-gnu";
+      };
+    };
+    mingetty = {
+      helpLine = if enable then "\nPress <Alt-F${toString ttyNumber}> to play rogue." else "";
+    };
+  };
+}
-- 
GitLab


From 12f4fbfb4b8540bc669ab54814f048375a3d9fde Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Fri, 9 Jan 2009 00:23:07 +0000
Subject: [PATCH 1156/5331] Added guestUsers job for automatical adding guests

svn path=/nixos/trunk/; revision=13732
---
 system/options.nix           |  1 +
 upstart-jobs/guest-users.nix | 76 ++++++++++++++++++++++++++++++++++++
 2 files changed, 77 insertions(+)
 create mode 100644 upstart-jobs/guest-users.nix

diff --git a/system/options.nix b/system/options.nix
index e70bb51628c..402fe9c2b22 100644
--- a/system/options.nix
+++ b/system/options.nix
@@ -3065,5 +3065,6 @@ root        ALL=(ALL) SETENV: ALL
     (import ../upstart-jobs/cron/locate.nix)
     (import ../upstart-jobs/manual.nix)
     (import ../upstart-jobs/rogue.nix)
+    (import ../upstart-jobs/guest-users.nix)
   ];
 }
diff --git a/upstart-jobs/guest-users.nix b/upstart-jobs/guest-users.nix
new file mode 100644
index 00000000000..98fc8a39568
--- /dev/null
+++ b/upstart-jobs/guest-users.nix
@@ -0,0 +1,76 @@
+{pkgs, config}: 
+let
+  inherit(pkgs.lib) mkOption;
+
+  options = {
+    services = {
+      guestUsers = {
+        enable = mkOption {
+	  default = false;
+	  description = "
+	    Whether to enable automatic addition of users with empty passwords
+	  ";
+	};
+	users = mkOption {
+	  default = ["guest"];
+	  description = "
+	    List of usernames to add
+	  ";
+	};
+	includeRoot = mkOption {
+	  default = false;
+	  description = "
+	    LEAVE THAT ALONE; whether to reset root password
+	  ";
+	};
+	extraGroups = mkOption {
+	  default = ["audio"];
+	  description = "
+	    Extra groups to grant
+	  ";
+	};
+      };
+    };
+  };
+  inherit (pkgs.lib) concatStringsSep optional optionalString;
+
+  inherit (config.services.guestUsers) enable users includeRoot extraGroups;
+
+  userEntry = user:
+  {
+    name = user;
+    description = "NixOS guest user";
+    home = "/home/${user}";
+    createHome = true;
+    group = "users";
+    extraGroups = extraGroups;
+    shell = "/bin/sh";
+  };
+
+  nameString = (concatStringsSep " " users) + optionalString includeRoot " root";
+
+in 
+
+{
+  require = options;
+  services = {
+    extraJobs = optional enable {
+      name = "clear-passwords";
+      job = ''
+        description "Clear guest passwords"
+	start on startup
+	script
+	  for i in ${nameString}; do
+	      echo | ${pkgs.pwdutils}/bin/passwd --stdin $i
+	  done
+	end script
+      '';
+    };
+    mingetty = {
+      helpLine = optionalString enable "\nThis users have empty passwords: ${nameString}";
+    };
+  };
+  users = {
+    extraUsers = map userEntry users;
+  };
+}
-- 
GitLab


From fbe40a260e2eab7a029e598011b72ec64b093957 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 15 Jan 2009 10:35:00 +0000
Subject: [PATCH 1157/5331] * The Linux kernel >= 2.6.27 provides firmware, so
 add it to the   firmware search path.

svn path=/nixos/trunk/; revision=13770
---
 upstart-jobs/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/upstart-jobs/default.nix b/upstart-jobs/default.nix
index ff5dc633323..af304c52574 100644
--- a/upstart-jobs/default.nix
+++ b/upstart-jobs/default.nix
@@ -97,7 +97,8 @@ let
         ++ pkgs.lib.optional config.networking.enableIntel4965AGNFirmware kernelPackages.iwlwifi4965ucode
         ++ pkgs.lib.optional config.networking.enableZydasZD1211Firmware pkgs.zd1211fw
         ++ pkgs.lib.optional config.hardware.enableGo7007 "${kernelPackages.wis_go7007}/firmware"
-        ++ config.services.udev.addFirmware;
+        ++ config.services.udev.addFirmware
+        ++ ["${kernelPackages.kernel}/lib/firmware"];
       extraUdevPkgs =
            pkgs.lib.optional config.services.hal.enable pkgs.hal
         ++ pkgs.lib.optional config.hardware.enableGo7007 kernelPackages.wis_go7007
-- 
GitLab


From 1603d28819dbc354b12d8259aa47ba2d7a01dab3 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 15 Jan 2009 13:49:00 +0000
Subject: [PATCH 1158/5331] * Include tune2fs in the initrd.  This is useful
 for   (say) converting from ext3 to ext4.

svn path=/nixos/trunk/; revision=13772
---
 boot/boot-stage-1.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/boot/boot-stage-1.nix b/boot/boot-stage-1.nix
index c26c8d1a096..f5b7e90de94 100644
--- a/boot/boot-stage-1.nix
+++ b/boot/boot-stage-1.nix
@@ -67,7 +67,7 @@ rec {
         cp $lvm2/sbin/lvm.static $out/bin/lvm
       fi
       cp $utillinux/bin/mount $utillinux/bin/umount $utillinux/sbin/pivot_root $out/bin
-      cp -p $e2fsprogs/sbin/fsck* $e2fsprogs/sbin/e2fsck $out/bin
+      cp -p $e2fsprogs/sbin/fsck* $e2fsprogs/sbin/e2fsck $e2fsprogs/sbin/tune2fs $out/bin
       cp $udev/sbin/udevd $udev/sbin/udevadm $out/bin
       cp $udev/lib/udev/*_id $out/bin
       nuke-refs $out/bin/*
-- 
GitLab


From e50e022fc6a3eb5717413dc9395284ee29f5c35d Mon Sep 17 00:00:00 2001
From: Sander van der Burg <s.vanderburg@tudelft.nl>
Date: Fri, 16 Jan 2009 14:07:54 +0000
Subject: [PATCH 1159/5331] Added Apache Tomcat proxy to new Apache upstart
 service

svn path=/nixos/trunk/; revision=13786
---
 .../apache-httpd/tomcat-connector.nix         | 91 +++++++++++++++++++
 1 file changed, 91 insertions(+)
 create mode 100644 upstart-jobs/apache-httpd/tomcat-connector.nix

diff --git a/upstart-jobs/apache-httpd/tomcat-connector.nix b/upstart-jobs/apache-httpd/tomcat-connector.nix
new file mode 100644
index 00000000000..d1186da43fb
--- /dev/null
+++ b/upstart-jobs/apache-httpd/tomcat-connector.nix
@@ -0,0 +1,91 @@
+{config, pkgs, serverInfo}:
+
+let
+  workersProperties = pkgs.writeText "workers.properties" ''
+# Define list of workers that will be used
+# for mapping requests
+# The configuration directives are valid
+# for the mod_jk version 1.2.18 and later
+#
+worker.list=loadbalancer,status
+
+# Define Node1
+# modify the host as your host IP or DNS name.
+worker.node1.port=8009
+worker.node1.host=localhost
+worker.node1.type=ajp13
+worker.node1.lbfactor=1
+
+# Load-balancing behaviour
+worker.loadbalancer.type=lb
+worker.loadbalancer.balance_workers=node1
+
+# Status worker for managing load balancer
+worker.status.type=status
+  '';
+in
+{
+  extraModules = [
+    { name = "jk"; path = "${pkgs.tomcat_connectors}/modules/mod_jk.so"; }
+  ];
+
+  extraConfig = ''
+# Where to find workers.properties
+JkWorkersFile ${workersProperties}
+
+# Where to put jk logs
+JkLogFile ${config.logDir}/mod_jk.log
+
+# Set the jk log level [debug/error/info]
+JkLogLevel info
+
+# Select the log format
+JkLogStampFormat "[%a %b %d %H:%M:%S %Y]"
+
+# JkOptions indicates to send SSK KEY SIZE
+# Note: Changed from +ForwardURICompat. 
+# See http://tomcat.apache.org/security-jk.html  
+JkOptions +ForwardKeySize +ForwardURICompatUnparsed -ForwardDirectories
+
+# JkRequestLogFormat
+JkRequestLogFormat "%w %V %T"
+
+# Mount your applications
+JkMount /__application__/* loadbalancer
+
+# You can use external file for mount points.
+# It will be checked for updates each 60 seconds.
+# The format of the file is: /url=worker
+# /examples/*=loadbalancer
+#JkMountFile uriworkermap.properties
+
+# Add shared memory.
+# This directive is present with 1.2.10 and
+# later versions of mod_jk, and is needed for
+# for load balancing to work properly
+# Note: Replaced JkShmFile logs/jk.shm due to SELinux issues. Refer to 
+# https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=225452
+JkShmFile ${config.stateDir}/jk.shm
+
+# Static files in all Tomcat webapp context directories are served by apache
+JkAutoAlias /var/tomcat/webapps
+    
+# All requests go to worker by default
+JkMount /* loadbalancer
+# Serve some static files using httpd
+JkUnMount /*.html loadbalancer
+JkUnMount /*.jpg  loadbalancer
+JkUnMount /*.gif  loadbalancer
+JkUnMount /*.css  loadbalancer
+JkUnMount /*.png  loadbalancer
+JkUnMount /*.js  loadbalancer
+
+# Add jkstatus for managing runtime data
+<Location /jkstatus/>
+JkMount status
+Order deny,allow
+Deny from all
+Allow from 127.0.0.1
+</Location>
+  '';
+}
-- 
GitLab


From 93c19c4ae9d93faea2446b7bd4225c8481f2ed44 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sat, 17 Jan 2009 13:10:06 +0000
Subject: [PATCH 1160/5331] * CUPS daemon: modprobe usblp so that CUPS can find
 USB printers. * CUPS daemon: use Ghostscript to support printing on
 non-Postscript   printers.

svn path=/nixos/trunk/; revision=13794
---
 upstart-jobs/cupsd.nix   | 19 ++++++++++++++++---
 upstart-jobs/default.nix |  2 +-
 2 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/upstart-jobs/cupsd.nix b/upstart-jobs/cupsd.nix
index 1afd9aae4c2..d67fc384324 100644
--- a/upstart-jobs/cupsd.nix
+++ b/upstart-jobs/cupsd.nix
@@ -1,4 +1,4 @@
-{config, pkgs}:
+{config, pkgs, modprobe}:
 
 let
 
@@ -16,16 +16,24 @@ let
   bindir = pkgs.runCommand "cups-progs" {} ''
     ensureDir $out/lib/cups
     ln -s ${cups}/lib/cups/* $out/lib/cups/
-    
+
+    # Provide support for printing via SMB.    
     rm $out/lib/cups/backend
     ensureDir $out/lib/cups/backend
     ln -s ${cups}/lib/cups/backend/* $out/lib/cups/backend/
     ln -s ${pkgs.samba}/bin/smbspool $out/lib/cups/backend/smb
+
+    # Provide Ghostscript rasterisation, necessary for non-Postscript
+    # printers.
+    rm $out/lib/cups/filter
+    ensureDir $out/lib/cups/filter
+    ln -s ${cups}/lib/cups/filter/* $out/lib/cups/filter/
+    ln -s ${pkgs.ghostscript}/lib/cups/filter/* $out/lib/cups/filter/
   ''; # */
   
 
   cupsdConfig = pkgs.writeText "cupsd.conf" ''
-    LogLevel info
+    LogLevel debug
 
     SystemGroup root
 
@@ -96,6 +104,8 @@ in
   extraPath = [
     cups
   ];
+
+  
   
   job = ''
     description "CUPS printing daemon"
@@ -107,6 +117,9 @@ in
         mkdir -m 0755 -p ${logDir}
         mkdir -m 0700 -p /var/cache/cups
         mkdir -m 0700 -p /var/spool/cups
+
+        # Make USB printers show up.
+        ${modprobe}/sbin/modprobe usblp || true
     end script
 
     respawn ${cups}/sbin/cupsd -c ${cupsdConfig} -F
diff --git a/upstart-jobs/default.nix b/upstart-jobs/default.nix
index af304c52574..bd0581b5870 100644
--- a/upstart-jobs/default.nix
+++ b/upstart-jobs/default.nix
@@ -301,7 +301,7 @@ let
   # CUPS (printing) daemon.
   ++ optional config.services.printing.enable
     (import ../upstart-jobs/cupsd.nix {
-      inherit config pkgs;
+      inherit config pkgs modprobe;
     })
 
   # Gateway6
-- 
GitLab


From d532df65dd3cc0efefad31e0d9f31d42547d9dac Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 19 Jan 2009 12:34:14 +0000
Subject: [PATCH 1161/5331] * Quick hack to make the `info' command work
 properly by generating   a "dir" file on the fly in a wrapper script.

svn path=/nixos/trunk/; revision=13805
---
 helpers/info-wrapper.nix | 29 +++++++++++++++++++++++++++++
 system/system.nix        |  1 +
 2 files changed, 30 insertions(+)
 create mode 100644 helpers/info-wrapper.nix

diff --git a/helpers/info-wrapper.nix b/helpers/info-wrapper.nix
new file mode 100644
index 00000000000..0f482dd4c27
--- /dev/null
+++ b/helpers/info-wrapper.nix
@@ -0,0 +1,29 @@
+# Quick hack to make the `info' command work properly.  `info' needs a
+# "dir" file containing all the installed Info files, which we don't
+# have (it would be impure to have a package installation update some
+# global "dir" file).  So this wrapper script around "info" builds a
+# temporary "dir" file on the fly.  This is a bit slow (on a cold
+# cache) but not unacceptably so.
+
+{bash, texinfo, writeScriptBin}:
+
+writeScriptBin "info"
+  ''
+    #! ${bash}/bin/sh
+  
+    dir=$(mktemp --tmpdir -d "info.dir.XXXXXX")
+
+    if test -z "$dir"; then exit 1; fi
+
+    trap 'rm -rf "$dir"' EXIT
+
+    shopt -s nullglob
+
+    for i in $(IFS=:; echo $INFOPATH); do
+        for j in $i/*.info; do
+            ${texinfo}/bin/install-info --quiet $j $dir/dir
+        done
+    done
+
+    INFOPATH=$dir:$INFOPATH ${texinfo}/bin/info "$@"
+  ''
diff --git a/system/system.nix b/system/system.nix
index bbb7d83f543..7d814993844 100644
--- a/system/system.nix
+++ b/system/system.nix
@@ -226,6 +226,7 @@ rec {
     pkgs.usbutils
     pkgs.utillinux
     pkgs.wirelesstools
+    (import ../helpers/info-wrapper.nix {inherit (pkgs) bash texinfo writeScriptBin;})
   ]
   ++ pkgs.lib.optional config.security.sudo.enable pkgs.sudo
   ++ pkgs.lib.optional config.services.atd.enable pkgs.at
-- 
GitLab


From 788275e47cfa9db074afdcea452648ce23265adf Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 20 Jan 2009 08:44:41 +0000
Subject: [PATCH 1162/5331] * Remove a stale lock file that may prevent the   X
 server from starting.

svn path=/nixos/trunk/; revision=13812
---
 upstart-jobs/xserver.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/upstart-jobs/xserver.nix b/upstart-jobs/xserver.nix
index 58e8e434ddd..9b815ede5b8 100644
--- a/upstart-jobs/xserver.nix
+++ b/upstart-jobs/xserver.nix
@@ -414,6 +414,8 @@ rec {
        }
 
       rm -f /var/log/slim.log
+
+      rm -f /tmp/.X0-lock
        
     end script
 
-- 
GitLab


From 61aa32f1749b48c64c8a0600bee919c7bd53480a Mon Sep 17 00:00:00 2001
From: Nicolas Pierron <nicolas.b.pierron@gmail.com>
Date: Sun, 25 Jan 2009 15:22:17 +0000
Subject: [PATCH 1163/5331] Update argument syntax of configuration files.

svn path=/nixos/trunk/; revision=13847
---
 upstart-jobs/cron.nix        | 2 +-
 upstart-jobs/cron/locate.nix | 2 +-
 upstart-jobs/dhclient.nix    | 3 +--
 upstart-jobs/fcron.nix       | 2 +-
 upstart-jobs/guest-users.nix | 2 +-
 upstart-jobs/manual.nix      | 2 +-
 upstart-jobs/rogue.nix       | 2 +-
 7 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/upstart-jobs/cron.nix b/upstart-jobs/cron.nix
index 4220de6d647..8216b6baaf2 100644
--- a/upstart-jobs/cron.nix
+++ b/upstart-jobs/cron.nix
@@ -1,4 +1,4 @@
-{pkgs, config}:
+{pkgs, config, ...}:
 
 ###### interface
 let
diff --git a/upstart-jobs/cron/locate.nix b/upstart-jobs/cron/locate.nix
index 2b26a10e91e..eace9f5129b 100644
--- a/upstart-jobs/cron/locate.nix
+++ b/upstart-jobs/cron/locate.nix
@@ -1,4 +1,4 @@
-{pkgs, config}:
+{pkgs, config, ...}:
 
 ###### interface
 let
diff --git a/upstart-jobs/dhclient.nix b/upstart-jobs/dhclient.nix
index 061af3d8f84..5b732f42fd1 100644
--- a/upstart-jobs/dhclient.nix
+++ b/upstart-jobs/dhclient.nix
@@ -1,5 +1,4 @@
-{pkgs, config #, ...
-}:
+{pkgs, config, ...}:
 
 ###### interface
 let
diff --git a/upstart-jobs/fcron.nix b/upstart-jobs/fcron.nix
index 97d259c65e1..5dd61e669d3 100644
--- a/upstart-jobs/fcron.nix
+++ b/upstart-jobs/fcron.nix
@@ -1,4 +1,4 @@
-{pkgs, config}:
+{pkgs, config, ...}:
 
 ###### interface
 let
diff --git a/upstart-jobs/guest-users.nix b/upstart-jobs/guest-users.nix
index 98fc8a39568..bfd83619c0e 100644
--- a/upstart-jobs/guest-users.nix
+++ b/upstart-jobs/guest-users.nix
@@ -1,4 +1,4 @@
-{pkgs, config}: 
+{pkgs, config, ...}: 
 let
   inherit(pkgs.lib) mkOption;
 
diff --git a/upstart-jobs/manual.nix b/upstart-jobs/manual.nix
index 5d658ce7681..c515e95d3dd 100644
--- a/upstart-jobs/manual.nix
+++ b/upstart-jobs/manual.nix
@@ -1,4 +1,4 @@
-{pkgs, config}: 
+{pkgs, config, ...}: 
 
 # Show the NixOS manual on tty7
 # Originally used only by installation CD
diff --git a/upstart-jobs/rogue.nix b/upstart-jobs/rogue.nix
index 75b1a0a9882..0306033adc0 100644
--- a/upstart-jobs/rogue.nix
+++ b/upstart-jobs/rogue.nix
@@ -1,4 +1,4 @@
-{pkgs, config}: 
+{pkgs, config, ...}: 
 
 # Show rogue game on tty8
 # Originally used only by installation CD
-- 
GitLab


From 348afe7dc6feae294f5aa1fb13512bfb29241fd8 Mon Sep 17 00:00:00 2001
From: Nicolas Pierron <nicolas.b.pierron@gmail.com>
Date: Sun, 25 Jan 2009 15:26:46 +0000
Subject: [PATCH 1164/5331] Replace old argument syntax.

svn path=/nixos/trunk/; revision=13848
---
 system/options.nix      | 2 +-
 upstart-jobs/pcmcia.nix | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/system/options.nix b/system/options.nix
index 402fe9c2b22..6e4f9c4ee50 100644
--- a/system/options.nix
+++ b/system/options.nix
@@ -1,4 +1,4 @@
-pkgs: config:
+{pkgs, config, ...}:
 
 let
   inherit (pkgs.lib) mkOption;
diff --git a/upstart-jobs/pcmcia.nix b/upstart-jobs/pcmcia.nix
index 77db881856e..1337a6dcffd 100644
--- a/upstart-jobs/pcmcia.nix
+++ b/upstart-jobs/pcmcia.nix
@@ -1,4 +1,4 @@
-pkgs: config:
+{pkgs, config, ...}:
 
 ###### interface
 let
-- 
GitLab


From b92036e803fa0eaea54459f098b035203cc80cd8 Mon Sep 17 00:00:00 2001
From: Nicolas Pierron <nicolas.b.pierron@gmail.com>
Date: Sun, 25 Jan 2009 15:48:25 +0000
Subject: [PATCH 1165/5331] Fetch the windows manager pid.

svn path=/nixos/branches/fix-style/; revision=13849
---
 upstart-jobs/xserver.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/upstart-jobs/xserver.nix b/upstart-jobs/xserver.nix
index 0e204282c14..51004d45702 100644
--- a/upstart-jobs/xserver.nix
+++ b/upstart-jobs/xserver.nix
@@ -586,7 +586,7 @@ let
     ''
 
     else abort ("unknown window manager " + windowManager)}
-
+    WMpid=$!
 
     ### Show a background image.
     # (but not if we're starting a full desktop environment that does it for us)
-- 
GitLab


From 08280c415f2c7e337e7e646494d919ccc39f6082 Mon Sep 17 00:00:00 2001
From: Nicolas Pierron <nicolas.b.pierron@gmail.com>
Date: Sun, 25 Jan 2009 15:48:30 +0000
Subject: [PATCH 1166/5331] Add support for wmii.

svn path=/nixos/branches/fix-style/; revision=13850
---
 upstart-jobs/xserver.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/upstart-jobs/xserver.nix b/upstart-jobs/xserver.nix
index 51004d45702..9064ec15310 100644
--- a/upstart-jobs/xserver.nix
+++ b/upstart-jobs/xserver.nix
@@ -581,6 +581,10 @@ let
       ${pkgs.xmonad}/bin/xmonad &
     ''
     
+    else if windowManager == "wmii" then ''
+      ${pkgs.wmiiSnap}/bin/wmii &
+    ''
+    
     else if windowManager == "none" then ''
       # The session starter will start the window manager.
     ''
-- 
GitLab


From bb56774a54f9553258c3a107bd68ca3f20e1be60 Mon Sep 17 00:00:00 2001
From: Nicolas Pierron <nicolas.b.pierron@gmail.com>
Date: Sun, 25 Jan 2009 15:48:35 +0000
Subject: [PATCH 1167/5331] Fix hostname (inverse test).

svn path=/nixos/branches/fix-style/; revision=13851
---
 system/system-options.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/system/system-options.nix b/system/system-options.nix
index 97a9e05d4f5..b1688cdda80 100644
--- a/system/system-options.nix
+++ b/system/system-options.nix
@@ -287,7 +287,7 @@ in
         # Set the host name.  Don't clear it if it's not configured in the
         # NixOS configuration, since it may have been set by dhclient in the
         # meantime.
-        ${if config.networking.hostName == "" then
+        ${if config.networking.hostName != "" then
             ''hostname "${config.networking.hostName}"''
         else ''
             # dhclient won't do anything if the hostname isn't empty.
-- 
GitLab


From 67edd3720fd84816e02ba8c18cc8d8b58bfd3284 Mon Sep 17 00:00:00 2001
From: Nicolas Pierron <nicolas.b.pierron@gmail.com>
Date: Sun, 25 Jan 2009 15:48:39 +0000
Subject: [PATCH 1168/5331] Update argument syntax of configuration files.

svn path=/nixos/branches/fix-style/; revision=13852
---
 upstart-jobs/disnix.nix        | 2 +-
 upstart-jobs/fcron.nix         | 2 +-
 upstart-jobs/zabbix-agent.nix  | 2 +-
 upstart-jobs/zabbix-server.nix | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/upstart-jobs/disnix.nix b/upstart-jobs/disnix.nix
index b87784ec067..52699c31daf 100644
--- a/upstart-jobs/disnix.nix
+++ b/upstart-jobs/disnix.nix
@@ -1,5 +1,5 @@
 # Disnix server
-{config, pkgs}:
+{config, pkgs, ...}:
 
 ###### interface
 let
diff --git a/upstart-jobs/fcron.nix b/upstart-jobs/fcron.nix
index 97d259c65e1..5dd61e669d3 100644
--- a/upstart-jobs/fcron.nix
+++ b/upstart-jobs/fcron.nix
@@ -1,4 +1,4 @@
-{pkgs, config}:
+{pkgs, config, ...}:
 
 ###### interface
 let
diff --git a/upstart-jobs/zabbix-agent.nix b/upstart-jobs/zabbix-agent.nix
index cb3895f81f1..55a71619dcc 100644
--- a/upstart-jobs/zabbix-agent.nix
+++ b/upstart-jobs/zabbix-agent.nix
@@ -1,5 +1,5 @@
 # Zabbix agent daemon.
-{config, pkgs}:
+{config, pkgs, ...}:
 
 ###### interface
 let
diff --git a/upstart-jobs/zabbix-server.nix b/upstart-jobs/zabbix-server.nix
index 07a31e7d7d7..e683b31ae61 100644
--- a/upstart-jobs/zabbix-server.nix
+++ b/upstart-jobs/zabbix-server.nix
@@ -1,5 +1,5 @@
 # Zabbix server daemon.
-{config, pkgs}:
+{config, pkgs, ...}:
 
 ###### interface
 let
-- 
GitLab


From 9fa758c657ff7d8995f95ae54b9c107bec4904c8 Mon Sep 17 00:00:00 2001
From: Nicolas Pierron <nicolas.b.pierron@gmail.com>
Date: Sun, 25 Jan 2009 15:48:43 +0000
Subject: [PATCH 1169/5331] Update the function used to merge option sets.

svn path=/nixos/branches/fix-style/; revision=13853
---
 system/system.nix | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/system/system.nix b/system/system.nix
index 75087708b83..656625846e1 100644
--- a/system/system.nix
+++ b/system/system.nix
@@ -11,14 +11,11 @@ rec {
     systemPathList
   ];
 
-  noOption = name: values:
-    abort "${name}: Used without option declaration.";
-
   # Make a configuration object from which we can retrieve option
   # values.
   config =
     pkgs.lib.fixOptionSets
-      (pkgs.lib.mergeOptionSets noOption)
+      pkgs.lib.newMergeOptionSets
       pkgs configComponents;
 
   optionDeclarations =
-- 
GitLab


From 9cdfe5a7114d383e3cc46c9b533f75ffe6116980 Mon Sep 17 00:00:00 2001
From: Nicolas Pierron <nicolas.b.pierron@gmail.com>
Date: Sun, 25 Jan 2009 15:48:48 +0000
Subject: [PATCH 1170/5331] Extract kernel configuration from options.nix.

svn path=/nixos/branches/fix-style/; revision=13854
---
 system/kernel.nix  | 160 +++++++++++++++++++++++++++++++++++++++++++++
 system/options.nix | 139 +--------------------------------------
 2 files changed, 162 insertions(+), 137 deletions(-)
 create mode 100644 system/kernel.nix

diff --git a/system/kernel.nix b/system/kernel.nix
new file mode 100644
index 00000000000..6fd20a820f7
--- /dev/null
+++ b/system/kernel.nix
@@ -0,0 +1,160 @@
+{pkgs, config, ...}:
+
+###### interface
+let
+  inherit (pkgs.lib) mkOption;
+
+  options = {
+    boot = {
+      kernelPackages = mkOption {
+        default = pkgs.kernelPackages;
+        example = pkgs.kernelPackages_2_6_25;
+        merge = backwardPkgsFunMerge;
+        description = "
+          This option allows you to override the Linux kernel used by
+          NixOS.  Since things like external kernel module packages are
+          tied to the kernel you're using, it also overrides those.
+          This option is a function that takes Nixpkgs as an argument
+          (as a convenience), and returns an attribute set containing at
+          the very least an attribute <varname>kernel</varname>.
+          Additional attributes may be needed depending on your
+          configuration.  For instance, if you use the NVIDIA X driver,
+          then it also needs to contain an attribute
+          <varname>nvidiaDrivers</varname>.
+        ";
+      };
+
+      kernelParams = mkOption {
+        default = [
+          "selinux=0"
+          "apm=on"
+          "acpi=on"
+          "vga=0x317"
+          "console=tty1"
+          "splash=verbose"
+        ];
+        description = "
+          The kernel parameters.  If you want to add additional
+          parameters, it's best to set
+          <option>boot.extraKernelParams</option>.
+        ";
+      };
+
+      extraKernelParams = mkOption {
+        default = [
+        ];
+        example = [
+          "debugtrace"
+        ];
+        description = "
+          Additional user-defined kernel parameters.
+        ";
+      };
+
+      extraModulePackages = mkOption {
+        default = [];
+        # !!! example = [pkgs.aufs pkgs.nvidiaDrivers];
+        description = ''
+          A list of additional packages supplying kernel modules.
+        '';
+        merge = backwardPkgsFunListMerge;
+      };
+
+      kernelModules = mkOption {
+        default = [];
+        description = "
+          The set of kernel modules to be loaded in the second stage of
+          the boot process.  That is, these modules are not included in
+          the initial ramdisk, so they'd better not be required for
+          mounting the root file system.  Add them to
+          <option>boot.initrd.extraKernelModules</option> if they are.
+        ";
+      };
+
+      initrd = {
+
+        kernelModules = mkOption {
+          default = [
+            # Note: most of these (especially the SATA/PATA modules)
+            # shouldn't be included by default since nixos-hardware-scan
+            # detects them, but I'm keeping them for now for backwards
+            # compatibility.
+            
+            # Some SATA/PATA stuff.        
+            "ahci"
+            "sata_nv"
+            "sata_via"
+            "sata_sis"
+            "sata_uli"
+            "ata_piix"
+            "pata_marvell"
+            
+            # Standard SCSI stuff.
+            "sd_mod"
+            "sr_mod"
+            
+            # Standard IDE stuff.
+            "ide_cd"
+            "ide_disk"
+            "ide_generic"
+            
+            # Filesystems.
+            "ext3"
+            
+            # Support USB keyboards, in case the boot fails and we only have
+            # a USB keyboard.
+            "ehci_hcd"
+            "ohci_hcd"
+            "usbhid"
+
+            # LVM.
+            "dm_mod"
+          ];
+          description = "
+            The set of kernel modules in the initial ramdisk used during the
+            boot process.  This set must include all modules necessary for
+            mounting the root device.  That is, it should include modules
+            for the physical device (e.g., SCSI drivers) and for the file
+            system (e.g., ext3).  The set specified here is automatically
+            closed under the module dependency relation, i.e., all
+            dependencies of the modules list here are included
+            automatically.  If you want to add additional
+            modules, it's best to set
+            <option>boot.initrd.extraKernelModules</option>.
+          ";
+        };
+
+        extraKernelModules = mkOption {
+          default = [];
+          description = "
+            Additional kernel modules for the initial ramdisk.  These are
+            loaded before the modules listed in
+            <option>boot.initrd.kernelModules</option>, so they take
+            precedence.
+          ";
+        };
+
+      };
+    };
+  };
+in
+
+###### implementation
+let
+  kernelPackages = config.boot.kernelPackages;
+  kernel = kernelPackages.kernel;
+in
+
+{
+  require = [
+    options
+  ];
+
+  system = {
+    # include kernel modules.
+    modulesTree = [ kernel ]
+    # this line should be removed!
+    ++ pkgs.lib.optional config.hardware.enableGo7007 kernelPackages.wis_go7007
+    ++ config.boot.extraModulePackages;
+  };
+}
diff --git a/system/options.nix b/system/options.nix
index fbb316dc53a..3ebb06e4d49 100644
--- a/system/options.nix
+++ b/system/options.nix
@@ -64,51 +64,6 @@ in
       ";
     };
 
-    kernelPackages = mkOption {
-      default = pkgs.kernelPackages;
-      example = pkgs.kernelPackages_2_6_25;
-      merge = backwardPkgsFunMerge;
-      description = "
-        This option allows you to override the Linux kernel used by
-        NixOS.  Since things like external kernel module packages are
-        tied to the kernel you're using, it also overrides those.
-        This option is a function that takes Nixpkgs as an argument
-        (as a convenience), and returns an attribute set containing at
-        the very least an attribute <varname>kernel</varname>.
-        Additional attributes may be needed depending on your
-        configuration.  For instance, if you use the NVIDIA X driver,
-        then it also needs to contain an attribute
-        <varname>nvidiaDrivers</varname>.
-      ";
-    };
-
-    kernelParams = mkOption {
-      default = [
-        "selinux=0"
-        "apm=on"
-        "acpi=on"
-        "vga=0x317"
-        "console=tty1"
-        "splash=verbose"
-      ];
-      description = "
-        The kernel parameters.  If you want to add additional
-        parameters, it's best to set
-        <option>boot.extraKernelParams</option>.
-      ";
-    };
-
-    extraKernelParams = mkOption {
-      default = [
-      ];
-      example = [
-        "debugtrace"
-      ];
-      description = "
-        Additional user-defined kernel parameters.
-      ";
-    };
-
     hardwareScan = mkOption {
       default = true;
       description = "
@@ -121,89 +76,8 @@ in
       ";
     };
 
-    extraModulePackages = mkOption {
-      default = [];
-      # !!! example = [pkgs.aufs pkgs.nvidiaDrivers];
-      description = ''
-        A list of additional packages supplying kernel modules.
-      '';
-      merge = backwardPkgsFunListMerge;
-    };
-
-    kernelModules = mkOption {
-      default = [];
-      description = "
-        The set of kernel modules to be loaded in the second stage of
-        the boot process.  That is, these modules are not included in
-        the initial ramdisk, so they'd better not be required for
-        mounting the root file system.  Add them to
-        <option>boot.initrd.extraKernelModules</option> if they are.
-      ";
-    };
-
     initrd = {
 
-      kernelModules = mkOption {
-        default = [
-          # Note: most of these (especially the SATA/PATA modules)
-          # shouldn't be included by default since nixos-hardware-scan
-          # detects them, but I'm keeping them for now for backwards
-          # compatibility.
-          
-          # Some SATA/PATA stuff.        
-          "ahci"
-          "sata_nv"
-          "sata_via"
-          "sata_sis"
-          "sata_uli"
-          "ata_piix"
-          "pata_marvell"
-          
-          # Standard SCSI stuff.
-          "sd_mod"
-          "sr_mod"
-          
-          # Standard IDE stuff.
-          "ide_cd"
-          "ide_disk"
-          "ide_generic"
-          
-          # Filesystems.
-          "ext3"
-          
-          # Support USB keyboards, in case the boot fails and we only have
-          # a USB keyboard.
-          "ehci_hcd"
-          "ohci_hcd"
-          "usbhid"
-
-          # LVM.
-          "dm_mod"
-        ];
-        description = "
-          The set of kernel modules in the initial ramdisk used during the
-          boot process.  This set must include all modules necessary for
-          mounting the root device.  That is, it should include modules
-          for the physical device (e.g., SCSI drivers) and for the file
-          system (e.g., ext3).  The set specified here is automatically
-          closed under the module dependency relation, i.e., all
-          dependencies of the modules list here are included
-          automatically.  If you want to add additional
-          modules, it's best to set
-          <option>boot.initrd.extraKernelModules</option>.
-        ";
-      };
-
-      extraKernelModules = mkOption {
-        default = [];
-        description = "
-          Additional kernel modules for the initial ramdisk.  These are
-          loaded before the modules listed in
-          <option>boot.initrd.kernelModules</option>, so they take
-          precedence.
-        ";
-      };
-
       allowMissing = mkOption {
         default = false;
         description = ''
@@ -295,17 +169,7 @@ in
       merge = pkgs.lib.mergeListOption;
 
       # Convert the list of path to only one path.
-      apply = list: pkgs.aggregateModules (
-        let
-          kernelPackages = config.boot.kernelPackages;
-          kernel = kernelPackages.kernel;
-        in
-        [ kernel ]
-        ++ pkgs.lib.optional config.hardware.enableGo7007 kernelPackages.wis_go7007
-        ++ config.boot.extraModulePackages
-        # should only keep this one, other have to be set by the option owners.
-        ++ list
-      );
+      apply = pkgs.aggregateModules;
     };
 
     sbin = {
@@ -2405,6 +2269,7 @@ in
 
   require = [
     # boot (is it the right place ?)
+    (import ../system/kernel.nix)
     (import ../boot/boot-stage-2.nix)
     (import ../installer/grub.nix)
 
-- 
GitLab


From 6086aee542c2d475c65688a9e7d65cb2b2b7d71a Mon Sep 17 00:00:00 2001
From: Nicolas Pierron <nicolas.b.pierron@gmail.com>
Date: Sun, 25 Jan 2009 15:48:53 +0000
Subject: [PATCH 1171/5331] * The Linux kernel >= 2.6.27 provides firmware, so
 add it to the   firmware search path.

(Patch from Eelco Dolstra)

svn path=/nixos/branches/fix-style/; revision=13855
---
 system/kernel.nix | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/system/kernel.nix b/system/kernel.nix
index 6fd20a820f7..ec5b9a63787 100644
--- a/system/kernel.nix
+++ b/system/kernel.nix
@@ -157,4 +157,11 @@ in
     ++ pkgs.lib.optional config.hardware.enableGo7007 kernelPackages.wis_go7007
     ++ config.boot.extraModulePackages;
   };
+
+  services = {
+    udev = {
+      # The Linux kernel >= 2.6.27 provides firmware
+      addFirmware = [ "${kernel}/lib/firmware" ];
+    };
+  };
 }
-- 
GitLab


From fa3437cb35967735391ca7b4bd673b44c986b56c Mon Sep 17 00:00:00 2001
From: Nicolas Pierron <nicolas.b.pierron@gmail.com>
Date: Sun, 25 Jan 2009 15:48:59 +0000
Subject: [PATCH 1172/5331] Remove enableIntel* and enableGo7007 options.
 Update nixos-hardware-scan.pl to generate files without these options.

svn path=/nixos/branches/fix-style/; revision=13856
---
 installer/nixos-hardware-scan.pl | 38 +++++++++++++++-------
 system/kernel.nix                |  9 ++----
 system/options.nix               | 54 --------------------------------
 system/system.nix                |  1 -
 upstart-jobs/default.nix         | 12 ++-----
 5 files changed, 32 insertions(+), 82 deletions(-)

diff --git a/installer/nixos-hardware-scan.pl b/installer/nixos-hardware-scan.pl
index e3277fa035d..d21e92cd51b 100644
--- a/installer/nixos-hardware-scan.pl
+++ b/installer/nixos-hardware-scan.pl
@@ -4,6 +4,7 @@ use File::Spec;
 use File::Basename;
 
 
+my @requireList = ();
 my @kernelModules = ();
 my @initrdKernelModules = ();
 
@@ -56,8 +57,6 @@ push @kernelModules, "kvm-amd" if hasCPUFeature "svm";
 # modules are auto-detected so we don't need to list them here.
 # However, some are needed in the initrd to boot the system.
 
-my $enableIntel2200BGFirmware = "false";
-my $enableIntel3945ABGFirmware = "false";
 my $videoDriver = "vesa";
 
 sub pciCheck {
@@ -97,11 +96,13 @@ sub pciCheck {
     # Can't rely on $module here, since the module may not be loaded
     # due to missing firmware.  Ideally we would check modules.pcimap
     # here.
-    $enableIntel2200BGFirmware = "true" if $vendor eq "0x8086" &&
+    push @requireList, "(import ./configurations/hardware/network/Intel2200BG.nix)" if
+        $vendor eq "0x8086" &&
         ($device eq "0x1043" || $device eq "0x104f" || $device eq "0x4220" ||
          $device eq "0x4221" || $device eq "0x4223" || $device eq "0x4224");
 
-    $enableIntel3945ABGFirmware = "true" if $vendor eq "0x8086" &&
+    push @requireList, "(import ./configurations/hardware/network/Intel3945ABG.nix)" if
+        $vendor eq "0x8086" &&
         ($device eq "0x4229" || $device eq "0x4230" ||
          $device eq "0x4222" || $device eq "0x4227");
 
@@ -197,14 +198,26 @@ sub toNixExpr {
     return $res;
 }
 
+sub multiLineList {
+    my $indent = shift;
+    my $res = "";
+    foreach my $s (@_) {
+        $res .= "\n$indent  $s";
+    }
+    $res .= "\nindent";
+    return $res;
+}
+
 my $initrdKernelModules = toNixExpr(removeDups @initrdKernelModules);
 my $kernelModules = toNixExpr(removeDups @kernelModules);
- 
+my $requireList = multiLineList("  ", removeDups @requireList);
 
 ## This is a generated file.  Do not modify!
 ## Make changes to /etc/nixos/configuration.nix instead.
 print <<EOF ;
 {
+  require = [$requireList];
+
   boot = {
     initrd = {
       extraKernelModules = [ $initrdKernelModules ];
@@ -216,12 +229,15 @@ print <<EOF ;
     maxJobs = $cpus;
   };
 
+  # list of file systems which can be mounted.
+  fileSystems = [
+  ];
+
+  # list of swap devices.
+  swapDevices = [
+  ];
+
   networking = {
-    enableIntel3945ABGFirmware = $enableIntel3945ABGFirmware;
-    
-    # Warning: setting this option to `true' requires acceptance of the
-    # firmware license, see http://ipw2200.sourceforge.net/firmware.php?fid=7.
-    enableIntel2200BGFirmware = $enableIntel2200BGFirmware;
   };
 
   services = {
@@ -229,7 +245,7 @@ print <<EOF ;
     xserver = {
       videoDriver = "$videoDriver";
     };
-      
+
   };
 }
 EOF
diff --git a/system/kernel.nix b/system/kernel.nix
index ec5b9a63787..23cdb2d9624 100644
--- a/system/kernel.nix
+++ b/system/kernel.nix
@@ -9,7 +9,6 @@ let
       kernelPackages = mkOption {
         default = pkgs.kernelPackages;
         example = pkgs.kernelPackages_2_6_25;
-        merge = backwardPkgsFunMerge;
         description = "
           This option allows you to override the Linux kernel used by
           NixOS.  Since things like external kernel module packages are
@@ -57,7 +56,6 @@ let
         description = ''
           A list of additional packages supplying kernel modules.
         '';
-        merge = backwardPkgsFunListMerge;
       };
 
       kernelModules = mkOption {
@@ -148,14 +146,13 @@ in
 {
   require = [
     options
+
+    # udev
   ];
 
   system = {
     # include kernel modules.
-    modulesTree = [ kernel ]
-    # this line should be removed!
-    ++ pkgs.lib.optional config.hardware.enableGo7007 kernelPackages.wis_go7007
-    ++ config.boot.extraModulePackages;
+    modulesTree = [ kernel ] ++ config.boot.extraModulePackages;
   };
 
   services = {
diff --git a/system/options.nix b/system/options.nix
index 3ebb06e4d49..f23adf9e7cf 100644
--- a/system/options.nix
+++ b/system/options.nix
@@ -209,21 +209,6 @@ in
     };
   };
 
-  # Hm, this sounds like a catch-all...
-  hardware = {
-
-    enableGo7007 = mkOption {
-      default = false;
-      merge = obsoleteMerge;
-      description = ''
-        Enable this option to get support for the WIS GO7007SB
-        multi-format video encoder, which is used in a number of
-        devices such as the Plextor ConvertX TV402U USB TV device.
-      '';
-    };
-  
-  };
-
 
   networking = {
 
@@ -275,45 +260,6 @@ in
       ";
     };
 
-    enableIntel2200BGFirmware = mkOption {
-      default = false;
-      merge = obsoleteMerge;
-      description = "
-        Turn on this option if you want firmware for the Intel
-        PRO/Wireless 2200BG to be loaded automatically.  This is
-        required if you want to use this device.  Intel requires you to
-        accept the license for this firmware, see
-        <link xlink:href='http://ipw2200.sourceforge.net/firmware.php?fid=7'/>.
-      ";
-    };
-
-    enableIntel3945ABGFirmware = mkOption {
-      default = false;
-      merge = obsoleteMerge;
-      description = "
-        This option enables automatic loading of the firmware for the Intel
-        PRO/Wireless 3945ABG.
-      ";
-    };
-
-    enableIntel4965AGNFirmware = mkOption {
-      default = false;
-      merge = obsoleteMerge;
-      description = "
-        This option enables automatic loading of the firmware for the Intel
-        PRO/Wireless 4965AGN.
-      ";
-    };
-
-    enableZydasZD1211Firmware = mkOption {
-      default = false;
-      merge = obsoleteMerge;
-      description = "
-        This option enables automatic loading of the firmware for the Zydas
-        ZyDAS ZD1211(b) 802.11a/b/g USB WLAN chip.
-      ";
-    };
-
     localCommands = mkOption {
       default = "";
       example = "text=anything; echo You can put $text here.";
diff --git a/system/system.nix b/system/system.nix
index 656625846e1..78b6a0a6dee 100644
--- a/system/system.nix
+++ b/system/system.nix
@@ -155,7 +155,6 @@ rec {
       ++ pkgs.lib.optional config.networking.defaultMailServer.directDelivery pkgs.ssmtp 
       ++ config.environment.extraPackages
       ++ pkgs.lib.optional config.fonts.enableFontDir fontDir
-      ++ pkgs.lib.optional config.hardware.enableGo7007 kernelPackages.wis_go7007
 
       # NSS modules need to be in `systemPath' so that (i) the builder
       # chroot gets to seem them, and (ii) applications can benefit from
diff --git a/upstart-jobs/default.nix b/upstart-jobs/default.nix
index 3633dee63e7..f66d1106622 100644
--- a/upstart-jobs/default.nix
+++ b/upstart-jobs/default.nix
@@ -147,16 +147,8 @@ let
       inherit modprobe config;
       inherit (pkgs) stdenv writeText substituteAll udev procps;
       inherit (pkgs.lib) cleanSource;
-      firmwareDirs =
-           pkgs.lib.optional config.networking.enableIntel2200BGFirmware pkgs.ipw2200fw
-        ++ pkgs.lib.optional config.networking.enableIntel3945ABGFirmware pkgs.iwlwifi3945ucode
-        ++ pkgs.lib.optional config.networking.enableIntel4965AGNFirmware kernelPackages.iwlwifi4965ucode
-        ++ pkgs.lib.optional config.networking.enableZydasZD1211Firmware pkgs.zd1211fw
-        ++ pkgs.lib.optional config.hardware.enableGo7007 "${kernelPackages.wis_go7007}/firmware"
-        ++ config.services.udev.addFirmware;
-      extraUdevPkgs =
-           pkgs.lib.optional config.hardware.enableGo7007 kernelPackages.wis_go7007
-        ++ config.services.udev.addUdevPkgs;
+      firmwareDirs = config.services.udev.addFirmware;
+      extraUdevPkgs = config.services.udev.addUdevPkgs;
     })
       
     # Makes LVM logical volumes available. 
-- 
GitLab


From b2b6f92d6bec57671a9e507e84d66f59fb4e5656 Mon Sep 17 00:00:00 2001
From: Nicolas Pierron <nicolas.b.pierron@gmail.com>
Date: Sun, 25 Jan 2009 15:49:08 +0000
Subject: [PATCH 1173/5331] Split xserver upstart job into: - xserver
 configuration & job - display manager (slim) - window manager (compiz, kwm,
 metacity, twm, wmii, xmonad) - desktop manager (kde, gnome, xterm)

Added features:
- Add WM choice in slim (with F1)

svn path=/nixos/branches/fix-style/; revision=13857
---
 system/options.nix                            |   2 +-
 .../{xserver.nix => xserver/default.nix}      | 392 ++++--------------
 .../xserver/desktopManager/default.nix        |  76 ++++
 upstart-jobs/xserver/desktopManager/gnome.nix |  47 +++
 upstart-jobs/xserver/desktopManager/kde.nix   |  65 +++
 upstart-jobs/xserver/desktopManager/none.nix  |  14 +
 upstart-jobs/xserver/desktopManager/xterm.nix |  44 ++
 .../xserver/displayManager/default.nix        | 172 ++++++++
 upstart-jobs/xserver/displayManager/slim.nix  | 112 +++++
 upstart-jobs/xserver/windowManager/compiz.nix |  64 +++
 .../xserver/windowManager/default.nix         |  61 +++
 upstart-jobs/xserver/windowManager/kwm.nix    |  46 ++
 .../xserver/windowManager/metacity.nix        |  49 +++
 upstart-jobs/xserver/windowManager/none.nix   |  12 +
 upstart-jobs/xserver/windowManager/twm.nix    |  44 ++
 upstart-jobs/xserver/windowManager/wmii.nix   |  32 ++
 upstart-jobs/xserver/windowManager/xmonad.nix |  32 ++
 upstart-jobs/{ => xserver}/xserver.conf       |   0
 18 files changed, 946 insertions(+), 318 deletions(-)
 rename upstart-jobs/{xserver.nix => xserver/default.nix} (60%)
 create mode 100644 upstart-jobs/xserver/desktopManager/default.nix
 create mode 100644 upstart-jobs/xserver/desktopManager/gnome.nix
 create mode 100644 upstart-jobs/xserver/desktopManager/kde.nix
 create mode 100644 upstart-jobs/xserver/desktopManager/none.nix
 create mode 100644 upstart-jobs/xserver/desktopManager/xterm.nix
 create mode 100644 upstart-jobs/xserver/displayManager/default.nix
 create mode 100644 upstart-jobs/xserver/displayManager/slim.nix
 create mode 100644 upstart-jobs/xserver/windowManager/compiz.nix
 create mode 100644 upstart-jobs/xserver/windowManager/default.nix
 create mode 100644 upstart-jobs/xserver/windowManager/kwm.nix
 create mode 100644 upstart-jobs/xserver/windowManager/metacity.nix
 create mode 100644 upstart-jobs/xserver/windowManager/none.nix
 create mode 100644 upstart-jobs/xserver/windowManager/twm.nix
 create mode 100644 upstart-jobs/xserver/windowManager/wmii.nix
 create mode 100644 upstart-jobs/xserver/windowManager/xmonad.nix
 rename upstart-jobs/{ => xserver}/xserver.conf (100%)

diff --git a/system/options.nix b/system/options.nix
index f23adf9e7cf..6adb1ffb226 100644
--- a/system/options.nix
+++ b/system/options.nix
@@ -2246,7 +2246,7 @@ in
     (import ../upstart-jobs/hal.nix)
     (import ../upstart-jobs/gpm.nix)
     (import ../upstart-jobs/nagios/default.nix)
-    (import ../upstart-jobs/xserver.nix)
+    (import ../upstart-jobs/xserver/default.nix)
     (import ../upstart-jobs/zabbix-agent.nix)
     (import ../upstart-jobs/zabbix-server.nix)
     (import ../upstart-jobs/disnix.nix)
diff --git a/upstart-jobs/xserver.nix b/upstart-jobs/xserver/default.nix
similarity index 60%
rename from upstart-jobs/xserver.nix
rename to upstart-jobs/xserver/default.nix
index 9064ec15310..0a7a70c7175 100644
--- a/upstart-jobs/xserver.nix
+++ b/upstart-jobs/xserver/default.nix
@@ -66,6 +66,7 @@ let
           ";
         };
 
+/*
         sessionType = mkOption {
           default = "gnome";
           example = "xterm";
@@ -91,14 +92,6 @@ let
           ";
         };
 
-        renderingFlag = mkOption {
-          default = "";
-          example = "--indirect-rendering";
-          description = "
-            Possibly pass --indierct-rendering to Compiz.
-          ";
-        };
-
         sessionStarter = mkOption {
           example = "${pkgs.xterm}/bin/xterm -ls";
           description = "
@@ -107,6 +100,7 @@ let
             <option>services.xserver.sessionType</option> is empty.
           ";
         };
+*/
 
         startSSHAgent = mkOption {
           default = true;
@@ -118,41 +112,6 @@ let
           ";
         };
 
-        slim = {
-
-          theme = mkOption {
-            default = null;
-            example = pkgs.fetchurl {
-              url = http://download.berlios.de/slim/slim-wave.tar.gz;
-              sha256 = "0ndr419i5myzcylvxb89m9grl2xyq6fbnyc3lkd711mzlmnnfxdy";
-            };
-            description = "
-              The theme for the SLiM login manager.  If not specified, SLiM's
-              default theme is used.  See <link
-              xlink:href='http://slim.berlios.de/themes01.php'/> for a
-              collection of themes.
-            ";
-          };
-
-          defaultUser = mkOption {
-            default = "";
-            example = "login";
-            description = "
-              The default user to load. If you put a username here you
-              get it automatically loaded into the username field, and
-              the focus is placed on the password.
-            ";
-          };
-
-          hideCursor = mkOption {
-            default = false;
-            example = true;
-            description = "
-              Hide the mouse cursor on the login screen.
-            ";
-          };
-        };
-
         isClone = mkOption {
           default = true;
           example = false;
@@ -327,7 +286,6 @@ let
   # Abbreviations.
   cfg = config.services.xserver;
   xorg = cfg.package;
-  gnome = pkgs.gnome;
   stdenv = pkgs.stdenv;
 
   knownVideoDrivers = {
@@ -344,25 +302,9 @@ let
   # Get a bunch of user settings.
   videoDriver = cfg.videoDriver;
   resolutions = map (res: ''"${toString res.x}x${toString res.y}"'') (cfg.resolutions);
-  sessionType = cfg.sessionType;
 
   videoDriverModules = getAttr [ videoDriver ] (throw "unkown video driver : \"${videoDriver}\"") knownVideoDrivers;
 
-  sessionCmd =
-    if sessionType == "" then cfg.sessionStarter else
-    if sessionType == "xterm" then "${pkgs.xterm}/bin/xterm -ls" else
-    if sessionType == "gnome" then "${gnome.gnometerminal}/bin/gnome-terminal -ls" else
-    abort ("unknown session type ${sessionType}");
-
-
-  windowManager =
-    let wm = cfg.windowManager; in
-    if wm != "" then wm else
-    if sessionType == "gnome" then "metacity" else
-    if sessionType == "kde" then "none" /* started by startkde */ else
-    "twm";
-
-    
   modules = 
 
     getAttr ["modulesFirst"] [] videoDriverModules
@@ -518,244 +460,7 @@ let
   };
 
 
-  clientScript = pkgs.writeText "xclient" ''
-
-    source /etc/profile
-
-    exec > $HOME/.Xerrors 2>&1
-
-
-    ### Load X defaults.
-    if test -e ~/.Xdefaults; then
-      ${xorg.xrdb}/bin/xrdb -merge ~/.Xdefaults
-    fi
-
-
-    ${if cfg.startSSHAgent then ''
-      ### Start the SSH agent.
-      export SSH_ASKPASS=${pkgs.x11_ssh_askpass}/libexec/x11-ssh-askpass
-      eval $(${pkgs.openssh}/bin/ssh-agent)
-    '' else ""}
-
-    ### Allow user to override system-wide configuration
-    if test -f ~/.xsession; then
-        source ~/.xsession;
-    fi
-  
-
-    ### Start a window manager.
-  
-    ${if windowManager == "twm" then ''
-      ${xorg.twm}/bin/twm &
-    ''
-
-    else if windowManager == "metacity" then ''
-      env LD_LIBRARY_PATH=${xorg.libX11}/lib:${xorg.libXext}/lib:/usr/lib/
-      # !!! Hack: load the schemas for Metacity.
-      GCONF_CONFIG_SOURCE=xml::~/.gconf ${gnome.GConf}/bin/gconftool-2 \
-        --makefile-install-rule ${gnome.metacity}/etc/gconf/schemas/*.schemas # */
-      ${gnome.metacity}/bin/metacity &
-    ''
-
-    else if windowManager == "kwm" then ''
-      ${pkgs.kdebase}/bin/kwin &
-    ''
-
-    else if windowManager == "compiz" then ''
-      # !!! Hack: load the schemas for Compiz.
-      GCONF_CONFIG_SOURCE=xml::~/.gconf ${gnome.GConf}/bin/gconftool-2 \
-        --makefile-install-rule ${pkgs.compiz}/etc/gconf/schemas/*.schemas # */
-
-      # !!! Hack: turn on most Compiz modules.
-      ${gnome.GConf}/bin/gconftool-2 -t list --list-type=string \
-        --set /apps/compiz/general/allscreens/options/active_plugins \
-        [gconf,png,decoration,wobbly,fade,minimize,move,resize,cube,switcher,rotate,place,scale,water]
-
-      # Start Compiz and the GTK-style window decorator.
-      env LD_LIBRARY_PATH=${xorg.libX11}/lib:${xorg.libXext}/lib:/usr/lib/
-      ${pkgs.compiz}/bin/compiz gconf ${cfg.renderingFlag} &
-      ${pkgs.compiz}/bin/gtk-window-decorator --sync &
-    ''
-
-    else if windowManager == "xmonad" then ''
-      ${pkgs.xmonad}/bin/xmonad &
-    ''
-    
-    else if windowManager == "wmii" then ''
-      ${pkgs.wmiiSnap}/bin/wmii &
-    ''
-    
-    else if windowManager == "none" then ''
-      # The session starter will start the window manager.
-    ''
-
-    else abort ("unknown window manager " + windowManager)}
-    WMpid=$!
-
-    ### Show a background image.
-    # (but not if we're starting a full desktop environment that does it for us)
-    ${if sessionType != "kde" then ''
-    
-      if test -e $HOME/.background-image; then
-        ${pkgs.feh}/bin/feh --bg-scale $HOME/.background-image
-      fi
-      
-    '' else ""}
-    
-
-    ### Start the session.
-    ${if sessionType == "kde" then ''
-
-      # Start KDE.
-      export KDEDIRS=$HOME/.nix-profile:/nix/var/nix/profiles/default:${pkgs.kdebase}:${pkgs.kdelibs}
-      export XDG_CONFIG_DIRS=${pkgs.kdebase}/etc/xdg:${pkgs.kdelibs}/etc/xdg
-      export XDG_DATA_DIRS=${pkgs.kdebase}/share
-      exec ${pkgs.kdebase}/bin/startkde
-
-    '' else ''
-
-      # For all other session types, we currently just start a
-      # terminal of the kind indicated by sessionCmd.
-      # !!! yes, this means that you 'log out' by killing the X server.
-      while ${sessionCmd}; do
-        sleep 1
-      done
-
-    ''}
-    
-  '';
-
-
-  xserverArgs = [
-    "-ac"
-    "-logverbose"
-    "-verbose"
-    "-terminate"
-    "-logfile" "/var/log/X.${toString cfg.display}.log"
-    "-config ${configFile}"
-    ":${toString cfg.display}" "vt${toString cfg.tty}"
-    "-xkbdir" "${pkgs.xkeyboard_config}/etc/X11/xkb"
-  ] ++ optional (!config.services.xserver.tcpEnable) "-nolisten tcp";
-
-  
-  slimConfig = pkgs.writeText "slim.cfg" ''
-    xauth_path ${xorg.xauth}/bin/xauth
-    default_xserver ${xorg.xorgserver}/bin/X
-    xserver_arguments ${toString xserverArgs}
-    login_cmd exec ${stdenv.bash}/bin/sh ${clientScript}
-    halt_cmd ${pkgs.upstart}/sbin/shutdown -h now
-    reboot_cmd ${pkgs.upstart}/sbin/shutdown -r now
-    ${if cfg.slim.defaultUser != "" then "default_user " + cfg.slim.defaultUser else ""}
-    ${if cfg.slim.hideCursor then "hidecursor true" else ""}
-  '';
-
-
-  # Unpack the SLiM theme, or use the default.
-  slimThemesDir =
-    let
-      unpackedTheme = stdenv.mkDerivation {
-        name = "slim-theme";
-        buildCommand = ''
-          ensureDir $out
-          cd $out
-          unpackFile ${cfg.slim.theme}
-          ln -s * default
-        '';
-      };
-    in if cfg.slim.theme == null then "${pkgs.slim}/share/slim/themes" else unpackedTheme;       
-
-    nvidiaDrivers = (config.boot.kernelPackages pkgs).nvidiaDrivers;
-
-  oldJob = rec {
-  # Warning the indentation is wrong since here in order to don't produce noise in diffs.
-
-  name = "xserver";
-
-  
-  extraPath = [
-    xorg.xrandr
-    xorg.xrdb
-    xorg.setxkbmap
-    xorg.iceauth # required for KDE applications (it's called by dcopserver)
-    pkgs.feh
-  ]
-  ++ optional (windowManager == "twm") [
-    xorg.twm
-  ]
-  ++ optional (windowManager == "metacity") [
-    gnome.metacity
-  ]
-  ++ optional (windowManager == "compiz") [
-    pkgs.compiz
-  ]
-  ++ optional (sessionType == "xterm") [
-    pkgs.xterm
-  ]
-  ++ optional (sessionType == "gnome") [
-    gnome.gnometerminal
-    gnome.GConf
-    gnome.gconfeditor
-  ]
-  ++ optional (sessionType == "kde") [
-    pkgs.kdelibs
-    pkgs.kdebase
-    xorg.xset # used by startkde, non-essential
-  ]
-  ++ optional (videoDriver == "nvidia") [
-    kernelPackages.nvidiaDrivers
-  ];
-
-
-  extraEtc =
-    optional (sessionType == "kde")
-      { source = "${pkgs.xkeyboard_config}/etc/X11/xkb";
-        target = "X11/xkb";
-      }
-    ++
-    optional cfg.exportConfiguration
-      { source = "${configFile}";
-        target = "X11/xorg.conf";
-      };
-
-    
-  job = ''
-    start on ${if cfg.autorun then "network-interfaces" else "never"}
-
-    start script
-    
-      rm -f /var/run/opengl-driver
-      ${if videoDriver == "nvidia"        
-        then ''
-          ln -sf ${kernelPackages.nvidiaDrivers} /var/run/opengl-driver
-        ''
-        else if cfg.driSupport
-        then "ln -sf ${pkgs.mesa} /var/run/opengl-driver"
-        else ""
-       }
-
-      rm -f /var/log/slim.log
-       
-    end script
-
-    env SLIM_CFGFILE=${slimConfig}
-    env SLIM_THEMESDIR=${slimThemesDir}
-    env FONTCONFIG_FILE=/etc/fonts/fonts.conf # !!! cleanup
-    env XKB_BINDIR=${xorg.xkbcomp}/bin # Needed for the Xkb extension.
-
-    ${if videoDriver == "nvidia" 
-      then "env LD_LIBRARY_PATH=${xorg.libX11}/lib:${xorg.libXext}/lib:${kernelPackages.nvidiaDrivers}/lib" 
-      else ""
-    }
-
-    ${if videoDriver != "nvidia"
-      then "env XORG_DRI_DRIVER_PATH=${pkgs.mesa}/lib/modules/dri"
-      else ""
-    }
-
-    exec ${pkgs.slim}/bin/slim
-  '';
-  
-};
+  nvidiaDrivers = (config.boot.kernelPackages pkgs).nvidiaDrivers;
 
 in
 
@@ -763,14 +468,19 @@ mkIf cfg.enable {
   require = [
     options
 
+    # services.xserver.*Manager
+    (import ./displayManager/default.nix)
+    (import ./windowManager/default.nix)
+    (import ./desktopManager/default.nix)
+
     # services.extraJobs
-    (import ../upstart-jobs/default.nix)
+    (import ../../upstart-jobs/default.nix)
 
     # environment.etc
-    (import ../etc/default.nix)
+    (import ../../etc/default.nix)
 
     # fonts.fonts
-    (import ../system/fonts.nix)
+    (import ../../system/fonts.nix)
 
     # boot.extraModulePackages
     # security.extraSetuidPrograms
@@ -783,29 +493,77 @@ mkIf cfg.enable {
     ];
   };
 
-  security = {
-    extraSetuidPrograms = mkIf (cfg.sessionType == "kde") [
-      "kcheckpass"
-    ];
-  };
-
   environment = {
-    etc = [
-      { source = ../etc/pam.d/kde;
-        target = "pam.d/kde";
-      }
-      { source = ../etc/pam.d/slim;
-        target = "pam.d/slim";
+    etc = mkIf cfg.exportConfiguration [
+      { source = "${configFile}";
+        target = "X11/xorg.conf";
       }
-    ] ++ oldJob.extraEtc;
+    ];
 
-    extraPackages =
-      oldJob.extraPath;
+    extraPackages = [
+      xorg.xrandr
+      xorg.xrdb
+      xorg.setxkbmap
+      xorg.iceauth # required for KDE applications (it's called by dcopserver)
+    ]
+    ++ optional (videoDriver == "nvidia") [
+      kernelPackages.nvidiaDrivers
+    ];
   };
 
   services = {
+    xserver = {
+      displayManager = {
+        xserverArgs = [
+          "-ac"
+          "-logverbose"
+          "-verbose"
+          "-terminate"
+          "-logfile" "/var/log/X.${toString cfg.display}.log"
+          "-config ${configFile}"
+          ":${toString cfg.display}" "vt${toString cfg.tty}"
+          "-xkbdir" "${pkgs.xkeyboard_config}/etc/X11/xkb"
+        ] ++ optional (!cfg.tcpEnable) "-nolisten tcp";
+      };
+    };
+
     extraJobs = [{
-      inherit (oldJob) name job;
+      name = "xserver";
+      job = ''
+        start on ${if cfg.autorun then "network-interfaces" else "never"}
+
+        start script
+        
+          rm -f /var/run/opengl-driver
+          ${if videoDriver == "nvidia"
+            then ''
+              ln -sf ${kernelPackages.nvidiaDrivers} /var/run/opengl-driver
+            ''
+            else if cfg.driSupport
+            then "ln -sf ${pkgs.mesa} /var/run/opengl-driver"
+            else ""
+           }
+
+          ${cfg.displayManager.job.beforeScript}
+          
+        end script
+
+        ${cfg.displayManager.job.env}
+        env FONTCONFIG_FILE=/etc/fonts/fonts.conf # !!! cleanup
+        env XKB_BINDIR=${xorg.xkbcomp}/bin # Needed for the Xkb extension.
+
+        ${if videoDriver == "nvidia" 
+          then "env LD_LIBRARY_PATH=${xorg.libX11}/lib:${xorg.libXext}/lib:${kernelPackages.nvidiaDrivers}/lib"
+          else ""
+        }
+
+        ${if videoDriver != "nvidia"
+          then "env XORG_DRI_DRIVER_PATH=${pkgs.mesa}/lib/modules/dri"
+          else ""
+        }
+
+        exec ${cfg.displayManager.job.execCmd}
+      '';
     }];
   };
 }
diff --git a/upstart-jobs/xserver/desktopManager/default.nix b/upstart-jobs/xserver/desktopManager/default.nix
new file mode 100644
index 00000000000..73b0308bea2
--- /dev/null
+++ b/upstart-jobs/xserver/desktopManager/default.nix
@@ -0,0 +1,76 @@
+{pkgs, config, ...}:
+
+let
+  inherit (builtins) head tail;
+  inherit (pkgs.lib) mkOption mkIf filter optionalString any;
+  cfg = config.services.xserver.desktopManager;
+
+  needBGCond = d: ! (d ? bgSupport && d.bgSupport);
+in
+
+{
+  require = [
+    (import ./kde.nix)
+    (import ./gnome.nix)
+    (import ./xterm.nix)
+    (import ./none.nix)
+  ];
+
+  services = {
+    xserver = {
+      displayManager = {
+        session = cfg.session.list;
+      };
+
+      desktopManager = {
+        session = mkOption {
+          default = [];
+          example = [{
+            name = "kde";
+            bgSupport = true;
+            start = "...";
+          }];
+          description = "
+            Internal option used to add some common line to desktop manager
+            scripts before forwarding the value to the
+            <varname>displayManager</varname>.
+          ";
+          apply = list: {
+            list = map (d: d // {
+              manage = "desktop";
+              start = d.start
+              + optionalString (needBGCond d) ''
+                if test -e $HOME/.background-image; then
+                  ${pkgs.feh}/bin/feh --bg-scale $HOME/.background-image
+                fi
+              '';
+            }) list;
+            needBGPackages = [] != filter needBGCond list;
+          };
+        };
+
+
+
+        default = mkOption {
+          default = "xterm";
+          example = "none";
+          description = "
+            Default desktop manager loaded if none have been chosen.
+          ";
+          merge = name: list:
+            let defaultDM = head list; in
+            if tail list != [] then
+              throw "Only one default desktop manager is allowed."
+            else if any (w: w.name == defaultDM) cfg.session.list then
+              defaultDM
+            else
+              throw "Default desktop manager not found.";
+        };
+      };
+    };
+  };
+
+  environment = mkIf cfg.session.needBGPackages {
+    extraPackages = [ pkgs.feh ];
+  };
+}
diff --git a/upstart-jobs/xserver/desktopManager/gnome.nix b/upstart-jobs/xserver/desktopManager/gnome.nix
new file mode 100644
index 00000000000..d6fa064ef11
--- /dev/null
+++ b/upstart-jobs/xserver/desktopManager/gnome.nix
@@ -0,0 +1,47 @@
+{pkgs, config, ...}:
+
+let
+  inherit (pkgs.lib) mkOption mkIf;
+  cfg = config.services.xserver.desktopManager.gnome;
+  gnome = pkgs.gnome;
+
+  options = { services = { xserver = { desktopManager = {
+
+    gnome = {
+      enable = mkOption {
+        default = false;
+        example = true;
+        description = "Enable a gnome terminal as a desktop manager.";
+      };
+    };
+
+  }; }; }; };
+in
+
+mkIf cfg.enable {
+  require = options;
+
+  services = {
+    xserver = {
+
+      desktopManager = {
+        session = [{
+          name = "gnome";
+          start = ''
+            ${gnome.gnometerminal}/bin/gnome-terminal -ls &
+            waitPID=$!
+          '';
+        }];
+      };
+
+    };
+  };
+
+  environment = {
+    extraPackages = [
+      gnome.gnometerminal
+      gnome.GConf
+      gnome.gconfeditor
+    ];
+  };
+}
diff --git a/upstart-jobs/xserver/desktopManager/kde.nix b/upstart-jobs/xserver/desktopManager/kde.nix
new file mode 100644
index 00000000000..9a241d77985
--- /dev/null
+++ b/upstart-jobs/xserver/desktopManager/kde.nix
@@ -0,0 +1,65 @@
+{pkgs, config, ...}:
+
+let
+  inherit (pkgs.lib) mkOption mkIf;
+  cfg = config.services.xserver.desktopManager.kde;
+  xorg = config.services.xserver.package;
+
+  options = { services = { xserver = { desktopManager = {
+
+    kde = {
+      enable = mkOption {
+        default = false;
+        example = true;
+        description = "Enable the kde desktop manager.";
+      };
+    };
+
+  }; }; }; };
+in
+
+mkIf cfg.enable {
+  require = options;
+
+  services = {
+    xserver = {
+
+      desktopManager = {
+        session = [{
+          name = "kde";
+          start = ''
+            # Start KDE.
+            export KDEDIRS=$HOME/.nix-profile:/nix/var/nix/profiles/default:${pkgs.kdebase}:${pkgs.kdelibs}
+            export XDG_CONFIG_DIRS=${pkgs.kdebase}/etc/xdg:${pkgs.kdelibs}/etc/xdg
+            export XDG_DATA_DIRS=${pkgs.kdebase}/share
+            exec ${pkgs.kdebase}/bin/startkde
+          '';
+        }];
+      };
+
+    };
+  };
+
+  security = {
+    extraSetuidPrograms = [
+      "kcheckpass"
+    ];
+  };
+
+  environment = {
+    extraPackages = [
+      pkgs.kdelibs
+      pkgs.kdebase
+      xorg.xset # used by startkde, non-essential
+    ];
+
+    etc = [
+      { source = ../../../etc/pam.d/kde;
+        target = "pam.d/kde";
+      }
+      { source = "${pkgs.xkeyboard_config}/etc/X11/xkb";
+        target = "X11/xkb";
+      }
+    ];
+  };
+}
diff --git a/upstart-jobs/xserver/desktopManager/none.nix b/upstart-jobs/xserver/desktopManager/none.nix
new file mode 100644
index 00000000000..a86bd5a7415
--- /dev/null
+++ b/upstart-jobs/xserver/desktopManager/none.nix
@@ -0,0 +1,14 @@
+{
+  services = {
+    xserver = {
+
+      desktopManager = {
+        session = [{
+          name = "none";
+          start = "";
+        }];
+      };
+
+    };
+  };
+}
diff --git a/upstart-jobs/xserver/desktopManager/xterm.nix b/upstart-jobs/xserver/desktopManager/xterm.nix
new file mode 100644
index 00000000000..e8aa0d289cb
--- /dev/null
+++ b/upstart-jobs/xserver/desktopManager/xterm.nix
@@ -0,0 +1,44 @@
+{pkgs, config, ...}:
+
+let
+  inherit (pkgs.lib) mkOption mkIf;
+  cfg = config.services.xserver.desktopManager.xterm;
+
+  options = { services = { xserver = { desktopManager = {
+
+    xterm = {
+      enable = mkOption {
+        default = false;
+        example = true;
+        description = "Enable a xterm terminal as a desktop manager.";
+      };
+    };
+
+  }; }; }; };
+in
+
+mkIf cfg.enable {
+  require = options;
+
+  services = {
+    xserver = {
+
+      desktopManager = {
+        session = [{
+          name = "xterm";
+          start = ''
+            ${pkgs.xterm}/bin/xterm -ls &
+            waitPID=$!
+          '';
+        }];
+      };
+
+    };
+  };
+
+  environment = {
+    extraPackages = [
+      pkgs.xterm
+    ];
+  };
+}
diff --git a/upstart-jobs/xserver/displayManager/default.nix b/upstart-jobs/xserver/displayManager/default.nix
new file mode 100644
index 00000000000..2699e34ecad
--- /dev/null
+++ b/upstart-jobs/xserver/displayManager/default.nix
@@ -0,0 +1,172 @@
+{pkgs, config, ...}:
+
+let
+  inherit (builtins) head tail;
+  inherit (pkgs.lib) mkOption optionals filter concatMap concatMapStrings;
+  cfg = config.services.xserver;
+  xorg = cfg.package;
+
+  # file provided by services.xserver.displayManager.session.script
+  xsession = wm: dm: pkgs.writeText "xsession" ''
+
+    source /etc/profile
+
+    exec > $HOME/.Xerrors 2>&1
+
+
+    ### Load X defaults.
+    if test -e ~/.Xdefaults; then
+      ${xorg.xrdb}/bin/xrdb -merge ~/.Xdefaults
+    fi
+
+    ${if cfg.startSSHAgent then ''
+      ### Start the SSH agent.
+      export SSH_ASKPASS=${pkgs.x11_ssh_askpass}/libexec/x11-ssh-askpass
+      eval $(${pkgs.openssh}/bin/ssh-agent)
+    '' else ""}
+
+    ### Allow user to override system-wide configuration
+    if test -f ~/.xsession; then
+        source ~/.xsession;
+    fi
+
+    # this script expect to have as first argument the following input
+    # "desktop-manager + window-manager".
+    arg="$1"
+
+    # extract the window manager.
+    windowManager="''${arg##* + }"
+    : ''${windowManager:=${cfg.windowManager.default}}
+    # extract the desktop manager.
+    desktopManager="''${arg% + *}"
+    : ''${desktopManager:=${cfg.desktopManager.default}}
+
+    # used to restart the xserver.
+    waitPID=0
+
+    # handle window manager starts.
+    case $windowManager in
+      ${concatMapStrings (s: "
+        (${s.name})
+          ${s.start}
+          ;;
+      ") wm}
+      (*) echo "$0: Window manager '$windowManager' not found.";;
+    esac
+
+    # handle desktop manager starts.
+    case $desktopManager in
+      ${concatMapStrings (s: "
+        (${s.name})
+          ${s.start}
+          ;;
+      ") dm}
+      (*) echo "$0: Desktop manager '$desktopManager' not found.";;
+    esac
+
+    test "$waitPID" != 0 && wait "$waitPID"
+    exit
+  '';
+
+in
+
+{
+  # list of display managers.
+  require = [
+    (import ./slim.nix)
+  ];
+
+  services = {
+    xserver = {
+      displayManager = {
+
+        xauthBin = mkOption {
+          default = "${xorg.xauth}/bin/xauth";
+          description = "
+            Path to the xauth binary used by display managers.
+          ";
+        };
+
+        xserverBin = mkOption {
+          default = "${xorg.xorgserver}/bin/X";
+          description = "
+            Path to the xserver binary used by display managers.
+          ";
+        };
+
+        xserverArgs = mkOption {
+          default = [];
+          example = [
+            "-ac"
+            "-logverbose"
+            "-nolisten tcp"
+          ];
+          description = "
+            List of arguments which have to be pass to when
+            the display manager start the xserver.
+          ";
+          apply = toString;
+        };
+
+        session = mkOption {
+          default = [];
+          example = [
+            {
+              manage = "desktop";
+              name = "xterm";
+              start = "
+                ${pkgs.xterm}/bin/xterm -ls &
+                waitPID=$!
+              ";
+            }
+          ];
+          description = ''
+            List of session supported with the command used to start each
+            session.  Each session script can set the
+            <varname>waitPID</varname> shell variable to make this script
+            waiting until the end of the user session.  Each script is used
+            to define either a windows manager or a desktop manager.  These
+            can be differentiated by setting the attribute
+            <varname>manage</varname> either to <literal>"window"</literal>
+            or <literal>"desktop"</literal>.
+
+            The list of desktop manager and window manager should appear
+            inside the display manager with the desktop manager name
+            followed by the window manager name.
+          '';
+          apply = list: rec {
+            wm = filter (s: s.manage == "window") list;
+            dm = filter (s: s.manage == "desktop") list;
+            names = concatMap (d: map (w: d.name + " + " + w.name) wm) dm;
+            script = xsession wm dm;
+          };
+        };
+
+        job = mkOption {
+          default = {};
+          example = {
+            beforeScript = ''
+              rm -f /var/log/slim.log
+            '';
+            env = ''
+              env SLIM_CFGFILE=/etc/slim.conf
+            '';
+            execCmd = "${pkgs.slim}/bin/slim";
+          };
+
+          description = "
+            List of arguments which have to be pass to when
+            the display manager start the xserver.
+          ";
+
+          merge = name: list:
+            if tail list != [] then
+              throw "only one display manager is allowed."
+            else
+              head list;
+        };
+
+      };
+    };
+  };
+}
diff --git a/upstart-jobs/xserver/displayManager/slim.nix b/upstart-jobs/xserver/displayManager/slim.nix
new file mode 100644
index 00000000000..8363a7a14ee
--- /dev/null
+++ b/upstart-jobs/xserver/displayManager/slim.nix
@@ -0,0 +1,112 @@
+{pkgs, config, ...}:
+
+###### interface
+let
+  inherit (pkgs.lib) mkOption;
+
+  options = { services = { xserver = {
+
+    slim = {
+
+      theme = mkOption {
+        default = null;
+        example = pkgs.fetchurl {
+          url = http://download.berlios.de/slim/slim-wave.tar.gz;
+          sha256 = "0ndr419i5myzcylvxb89m9grl2xyq6fbnyc3lkd711mzlmnnfxdy";
+        };
+        description = "
+          The theme for the SLiM login manager.  If not specified, SLiM's
+          default theme is used.  See <link
+          xlink:href='http://slim.berlios.de/themes01.php'/> for a
+          collection of themes.
+        ";
+      };
+
+      defaultUser = mkOption {
+        default = "";
+        example = "login";
+        description = "
+          The default user to load. If you put a username here you
+          get it automatically loaded into the username field, and
+          the focus is placed on the password.
+        ";
+      };
+
+      hideCursor = mkOption {
+        default = false;
+        example = true;
+        description = "
+          Hide the mouse cursor on the login screen.
+        ";
+      };
+    };
+
+  }; /* xserver */ }; /* services */ };
+
+in
+
+###### implementation
+let
+  xcfg = config.services.xserver;
+  dmcfg = xcfg.displayManager;
+  cfg = xcfg.slim;
+
+  slimConfig = pkgs.writeText "slim.cfg" ''
+    xauth_path ${dmcfg.xauthBin}
+    default_xserver ${dmcfg.xserverBin}
+    xserver_arguments ${dmcfg.xserverArgs}
+    sessions ${pkgs.lib.concatStringsSep "," dmcfg.session.names}
+    login_cmd exec ${pkgs.stdenv.bash}/bin/sh ${dmcfg.session.script} "%session"
+    halt_cmd ${pkgs.upstart}/sbin/shutdown -h now
+    reboot_cmd ${pkgs.upstart}/sbin/shutdown -r now
+    ${if cfg.defaultUser != "" then "default_user " + cfg.defaultUser else ""}
+    ${if cfg.hideCursor then "hidecursor true" else ""}
+  '';
+
+
+  # Unpack the SLiM theme, or use the default.
+  slimThemesDir =
+    let
+      unpackedTheme = pkgs.stdenv.mkDerivation {
+        name = "slim-theme";
+        buildCommand = ''
+          ensureDir $out
+          cd $out
+          unpackFile ${cfg.theme}
+          ln -s * default
+        '';
+      };
+    in if cfg.theme == null then "${pkgs.slim}/share/slim/themes" else unpackedTheme;
+
+in
+
+{
+  require = [
+    options
+  ];
+
+  services = {
+    xserver = {
+      displayManager = {
+        job = {
+          beforeScript = ''
+            rm -f /var/log/slim.log
+          '';
+          env = ''
+            env SLIM_CFGFILE=${slimConfig}
+            env SLIM_THEMESDIR=${slimThemesDir}
+          '';
+          execCmd = "${pkgs.slim}/bin/slim";
+        };
+      };
+    };
+  };
+
+  environment = {
+    etc = [
+      { source = ../../../etc/pam.d/slim;
+        target = "pam.d/slim";
+      }
+    ];
+  };
+}
diff --git a/upstart-jobs/xserver/windowManager/compiz.nix b/upstart-jobs/xserver/windowManager/compiz.nix
new file mode 100644
index 00000000000..e99c3adb5b4
--- /dev/null
+++ b/upstart-jobs/xserver/windowManager/compiz.nix
@@ -0,0 +1,64 @@
+{pkgs, config, ...}:
+
+let
+  inherit (pkgs.lib) mkOption mkIf;
+  cfg = config.services.xserver.windowManager.compiz;
+  xorg = config.services.xserver.package;
+  gnome = pkgs.gnome;
+
+  options = { services = { xserver = { windowManager = {
+
+    compiz = {
+      enable = mkOption {
+        default = false;
+        example = true;
+        description = "Enable the compiz window manager.";
+      };
+
+
+      renderingFlag = mkOption {
+        default = "";
+        example = "--indirect-rendering";
+        description = "
+          Possibly pass --indierct-rendering to Compiz.
+        ";
+      };
+    };
+
+  }; }; }; };
+in
+
+mkIf cfg.enable {
+  require = options;
+
+  services = {
+    xserver = {
+
+      windowManager = {
+        session = [{
+          name = "compiz";
+          start = ''
+            # !!! Hack: load the schemas for Compiz.
+            GCONF_CONFIG_SOURCE=xml::~/.gconf ${gnome.GConf}/bin/gconftool-2 \
+              --makefile-install-rule ${pkgs.compiz}/etc/gconf/schemas/*.schemas # */
+
+            # !!! Hack: turn on most Compiz modules.
+            ${gnome.GConf}/bin/gconftool-2 -t list --list-type=string \
+              --set /apps/compiz/general/allscreens/options/active_plugins \
+              [gconf,png,decoration,wobbly,fade,minimize,move,resize,cube,switcher,rotate,place,scale,water]
+
+            # Start Compiz and the GTK-style window decorator.
+            env LD_LIBRARY_PATH=${xorg.libX11}/lib:${xorg.libXext}/lib:/usr/lib/
+            ${pkgs.compiz}/bin/compiz gconf ${cfg.renderingFlag} &
+            ${pkgs.compiz}/bin/gtk-window-decorator --sync &
+          '';
+        }];
+      };
+
+    };
+  };
+
+  environment = {
+    extraPackages = [ pkgs.compiz ];
+  };
+}
diff --git a/upstart-jobs/xserver/windowManager/default.nix b/upstart-jobs/xserver/windowManager/default.nix
new file mode 100644
index 00000000000..41c3ad15983
--- /dev/null
+++ b/upstart-jobs/xserver/windowManager/default.nix
@@ -0,0 +1,61 @@
+{pkgs, config, ...}:
+
+let
+  inherit (builtins) head tail;
+  inherit (pkgs.lib) mkOption any;
+  cfg = config.services.xserver.windowManager;
+in
+
+{
+  require = [
+    (import ./compiz.nix)
+    (import ./kwm.nix)
+    (import ./metacity.nix)
+    (import ./none.nix)
+    (import ./twm.nix)
+    (import ./wmii.nix)
+    (import ./xmonad.nix)
+  ];
+
+  services = {
+    xserver = {
+      displayManager = {
+        session = cfg.session;
+      };
+
+      windowManager = {
+        session = mkOption {
+          default = [];
+          example = [{
+            name = "wmii";
+            start = "...";
+          }];
+          description = "
+            Internal option used to add some common line to window manager
+            scripts before forwarding the value to the
+            <varname>displayManager</varname>.
+          ";
+          apply = map (d: d // {
+            manage = "window";
+          });
+        };
+
+        default = mkOption {
+          default = "none";
+          example = "wmii";
+          description = "
+            Default window manager loaded if none have been chosen.
+          ";
+          merge = name: list:
+            let defaultWM = head list; in
+            if tail list != [] then
+              throw "Only one default window manager is allowed."
+            else if any (w: w.name == defaultWM) cfg.session then
+              defaultWM
+            else
+              throw "Default window manager not found.";
+        };
+      };
+    };
+  };
+}
diff --git a/upstart-jobs/xserver/windowManager/kwm.nix b/upstart-jobs/xserver/windowManager/kwm.nix
new file mode 100644
index 00000000000..db8696c510d
--- /dev/null
+++ b/upstart-jobs/xserver/windowManager/kwm.nix
@@ -0,0 +1,46 @@
+{pkgs, config, ...}:
+
+let
+  inherit (pkgs.lib) mkOption mkIf;
+  cfg = config.services.xserver.windowManager.kwm;
+
+  option = { services = { xserver = { windowManager = {
+
+    kwm = {
+      enable = mkOption {
+        default = false;
+        example = true;
+        description = "Enable the kwm window manager.";
+      };
+
+    };
+
+  }; }; }; };
+in
+
+mkIf cfg.enable {
+  require = option;
+
+  services = {
+    xserver = {
+
+      windowManager = {
+        session = [{
+          name = "kwm";
+          start = "
+            ${pkgs.kdebase}/bin/kwin &
+            waitPID=$!
+          ";
+        }];
+      };
+
+    };
+  };
+
+  environment = {
+    extraPackages = [
+      pkgs.kdelibs
+      pkgs.kdebase
+    ];
+  };
+}
diff --git a/upstart-jobs/xserver/windowManager/metacity.nix b/upstart-jobs/xserver/windowManager/metacity.nix
new file mode 100644
index 00000000000..dc1ff911d65
--- /dev/null
+++ b/upstart-jobs/xserver/windowManager/metacity.nix
@@ -0,0 +1,49 @@
+{pkgs, config, ...}:
+
+let
+  inherit (pkgs.lib) mkOption mkIf;
+  cfg = config.services.xserver.windowManager.metacity;
+  xorg = config.services.xserver.package;
+  gnome = pkgs.gnome;
+
+  option = { services = { xserver = { windowManager = {
+
+    metacity = {
+      enable = mkOption {
+        default = false;
+        example = true;
+        description = "Enable the metacity window manager.";
+      };
+
+    };
+
+  }; }; }; };
+in
+
+mkIf cfg.enable {
+  require = option;
+
+  services = {
+    xserver = {
+
+      windowManager = {
+        session = [{
+          name = "metacity";
+          start = ''
+            env LD_LIBRARY_PATH=${xorg.libX11}/lib:${xorg.libXext}/lib:/usr/lib/
+            # !!! Hack: load the schemas for Metacity.
+            GCONF_CONFIG_SOURCE=xml::~/.gconf ${gnome.GConf}/bin/gconftool-2 \
+              --makefile-install-rule ${gnome.metacity}/etc/gconf/schemas/*.schemas # */
+            ${gnome.metacity}/bin/metacity &
+            waitPID=$!
+          '';
+        }];
+      };
+
+    };
+  };
+
+  environment = {
+    extraPackages = [ gnome.metacity ];
+  };
+}
diff --git a/upstart-jobs/xserver/windowManager/none.nix b/upstart-jobs/xserver/windowManager/none.nix
new file mode 100644
index 00000000000..84cf1d77077
--- /dev/null
+++ b/upstart-jobs/xserver/windowManager/none.nix
@@ -0,0 +1,12 @@
+{
+  services = {
+    xserver = {
+      windowManager = {
+        session = [{
+          name = "none";
+          start = "";
+        }];
+      };
+    };
+  };
+}
diff --git a/upstart-jobs/xserver/windowManager/twm.nix b/upstart-jobs/xserver/windowManager/twm.nix
new file mode 100644
index 00000000000..f26be48776c
--- /dev/null
+++ b/upstart-jobs/xserver/windowManager/twm.nix
@@ -0,0 +1,44 @@
+{pkgs, config, ...}:
+
+let
+  inherit (pkgs.lib) mkOption mkIf;
+  cfg = config.services.xserver.windowManager.twm;
+  xorg = config.services.xserver.package;
+
+  option = { services = { xserver = { windowManager = {
+
+    twm = {
+      enable = mkOption {
+        default = false;
+        example = true;
+        description = "Enable the twm window manager.";
+      };
+
+    };
+
+  }; }; }; };
+in
+
+mkIf cfg.enable {
+  require = option;
+
+  services = {
+    xserver = {
+
+      windowManager = {
+        session = [{
+          name = "twm";
+          start = "
+            ${xorg.twm}/bin/twm &
+            waitPID=$!
+          ";
+        }];
+      };
+
+    };
+  };
+
+  environment = {
+    extraPackages = [ xorg.twm ];
+  };
+}
diff --git a/upstart-jobs/xserver/windowManager/wmii.nix b/upstart-jobs/xserver/windowManager/wmii.nix
new file mode 100644
index 00000000000..59a88f9352f
--- /dev/null
+++ b/upstart-jobs/xserver/windowManager/wmii.nix
@@ -0,0 +1,32 @@
+{pkgs, config, ...}:
+
+let
+  inherit (pkgs.lib) mkOption mkIf;
+  cfg = config.services.xserver.windowManager.wmii;
+in
+
+{
+  services = {
+    xserver = {
+
+      windowManager = {
+        wmii = {
+          enable = mkOption {
+            default = false;
+            example = true;
+            description = "Enable the wmii window manager.";
+          };
+        };
+
+        session = mkIf cfg.enable [{
+          name = "wmii";
+          start = "
+            ${pkgs.wmiiSnap}/bin/wmii &
+            waitPID=$!
+          ";
+        }];
+      };
+
+    };
+  };
+}
diff --git a/upstart-jobs/xserver/windowManager/xmonad.nix b/upstart-jobs/xserver/windowManager/xmonad.nix
new file mode 100644
index 00000000000..6f73ad9edc3
--- /dev/null
+++ b/upstart-jobs/xserver/windowManager/xmonad.nix
@@ -0,0 +1,32 @@
+{pkgs, config, ...}:
+
+let
+  inherit (pkgs.lib) mkOption mkIf;
+  cfg = config.services.xserver.windowManager.xmonad;
+in
+
+{
+  services = {
+    xserver = {
+
+      windowManager = {
+        xmonad = {
+          enable = mkOption {
+            default = false;
+            example = true;
+            description = "Enable the xmonad window manager.";
+          };
+        };
+
+        session = mkIf cfg.enable [{
+          name = "xmonad";
+          start = "
+            ${pkgs.xmonad}/bin/xmonad &
+            waitPID=$!
+          ";
+        }];
+      };
+
+    };
+  };
+}
diff --git a/upstart-jobs/xserver.conf b/upstart-jobs/xserver/xserver.conf
similarity index 100%
rename from upstart-jobs/xserver.conf
rename to upstart-jobs/xserver/xserver.conf
-- 
GitLab


From 639be32a8af469492e52d3a0bf44913ca4d03e64 Mon Sep 17 00:00:00 2001
From: Nicolas Pierron <nicolas.b.pierron@gmail.com>
Date: Sun, 25 Jan 2009 15:49:12 +0000
Subject: [PATCH 1174/5331] Remove obsolete notation. (backwardPkgsFun*)

svn path=/nixos/branches/fix-style/; revision=13858
---
 system/options.nix | 31 ++-----------------------------
 1 file changed, 2 insertions(+), 29 deletions(-)

diff --git a/system/options.nix b/system/options.nix
index 6adb1ffb226..7c4b5def367 100644
--- a/system/options.nix
+++ b/system/options.nix
@@ -1,33 +1,7 @@
 {pkgs, config, ...}:
 
 let
-  inherit (pkgs.lib) mkOption;
-  inherit (builtins) head tail;
-
-  obsolete = what: f: name:
-    if builtins ? trace then
-      builtins.trace "${name}: Obsolete ${what}." f name
-    else f name;
-
-  obsoleteMerge =
-    obsolete "option" pkgs.lib.mergeDefaultOption;
-
-  # temporary modifications.
-  # backward here means that expression could either be a value or a
-  # function which expects to have a pkgs argument.
-  optionalPkgs = name: x:
-    if builtins.isFunction x
-    then obsolete "notation" (name: x pkgs) name
-    else x;
-
-  backwardPkgsFunListMerge = name: list:
-    pkgs.lib.concatMap (optionalPkgs name) list;
-
-  backwardPkgsFunMerge = name: list:
-    if list != [] && tail list == []
-    then optionalPkgs name (head list)
-    else abort "${name}: Defined at least twice.";
-
+  inherit (pkgs.lib) mkOption mergeOneOption;
 in
 
 {
@@ -2156,7 +2130,6 @@ in
     extraPackages = mkOption {
       default = [];
       example = [pkgs.firefox pkgs.thunderbird];
-      merge = backwardPkgsFunListMerge;
       description = "
         This option allows you to add additional packages to the system
         path.  These packages are automatically available to all users,
@@ -2173,7 +2146,7 @@ in
     nix = mkOption {
       default = pkgs.nixUnstable;
       example = pkgs.nixCustomFun /root/nix.tar.gz;
-      merge = backwardPkgsFunMerge;
+      merge = mergeOneOption;
       description = "
         Use non-default Nix easily. Be careful, though, not to break everything.
       ";
-- 
GitLab


From dcc981840e448b5a5ccbe5b7eb3d03170e595070 Mon Sep 17 00:00:00 2001
From: Nicolas Pierron <nicolas.b.pierron@gmail.com>
Date: Sun, 25 Jan 2009 15:49:18 +0000
Subject: [PATCH 1175/5331] Use the mergeOneOption function instead of
 duplicated code.

svn path=/nixos/branches/fix-style/; revision=13859
---
 upstart-jobs/xserver/desktopManager/default.nix | 9 +++------
 upstart-jobs/xserver/displayManager/default.nix | 9 ++-------
 upstart-jobs/xserver/windowManager/default.nix  | 9 +++------
 3 files changed, 8 insertions(+), 19 deletions(-)

diff --git a/upstart-jobs/xserver/desktopManager/default.nix b/upstart-jobs/xserver/desktopManager/default.nix
index 73b0308bea2..05f82dd3e6c 100644
--- a/upstart-jobs/xserver/desktopManager/default.nix
+++ b/upstart-jobs/xserver/desktopManager/default.nix
@@ -1,8 +1,7 @@
 {pkgs, config, ...}:
 
 let
-  inherit (builtins) head tail;
-  inherit (pkgs.lib) mkOption mkIf filter optionalString any;
+  inherit (pkgs.lib) mkOption mergeOneOption mkIf filter optionalString any;
   cfg = config.services.xserver.desktopManager;
 
   needBGCond = d: ! (d ? bgSupport && d.bgSupport);
@@ -58,10 +57,8 @@ in
             Default desktop manager loaded if none have been chosen.
           ";
           merge = name: list:
-            let defaultDM = head list; in
-            if tail list != [] then
-              throw "Only one default desktop manager is allowed."
-            else if any (w: w.name == defaultDM) cfg.session.list then
+            let defaultDM = mergeOneOption name list; in
+            if any (w: w.name == defaultDM) cfg.session.list then
               defaultDM
             else
               throw "Default desktop manager not found.";
diff --git a/upstart-jobs/xserver/displayManager/default.nix b/upstart-jobs/xserver/displayManager/default.nix
index 2699e34ecad..12393af8f6c 100644
--- a/upstart-jobs/xserver/displayManager/default.nix
+++ b/upstart-jobs/xserver/displayManager/default.nix
@@ -1,8 +1,7 @@
 {pkgs, config, ...}:
 
 let
-  inherit (builtins) head tail;
-  inherit (pkgs.lib) mkOption optionals filter concatMap concatMapStrings;
+  inherit (pkgs.lib) mkOption mergeOneOption optionals filter concatMap concatMapStrings;
   cfg = config.services.xserver;
   xorg = cfg.package;
 
@@ -159,11 +158,7 @@ in
             the display manager start the xserver.
           ";
 
-          merge = name: list:
-            if tail list != [] then
-              throw "only one display manager is allowed."
-            else
-              head list;
+          merge = mergeOneOption;
         };
 
       };
diff --git a/upstart-jobs/xserver/windowManager/default.nix b/upstart-jobs/xserver/windowManager/default.nix
index 41c3ad15983..14f06b62b03 100644
--- a/upstart-jobs/xserver/windowManager/default.nix
+++ b/upstart-jobs/xserver/windowManager/default.nix
@@ -1,8 +1,7 @@
 {pkgs, config, ...}:
 
 let
-  inherit (builtins) head tail;
-  inherit (pkgs.lib) mkOption any;
+  inherit (pkgs.lib) mkOption mergeOneOption any;
   cfg = config.services.xserver.windowManager;
 in
 
@@ -47,10 +46,8 @@ in
             Default window manager loaded if none have been chosen.
           ";
           merge = name: list:
-            let defaultWM = head list; in
-            if tail list != [] then
-              throw "Only one default window manager is allowed."
-            else if any (w: w.name == defaultWM) cfg.session then
+            let defaultWM = mergeOneOption name list; in
+            if any (w: w.name == defaultWM) cfg.session then
               defaultWM
             else
               throw "Default window manager not found.";
-- 
GitLab


From ecc761543ced38cdef4d521e1af14966a23b00c7 Mon Sep 17 00:00:00 2001
From: Nicolas Pierron <nicolas.b.pierron@gmail.com>
Date: Sun, 25 Jan 2009 15:49:23 +0000
Subject: [PATCH 1176/5331] Remove name argument of merge functions.

svn path=/nixos/branches/fix-style/; revision=13860
---
 upstart-jobs/xserver/desktopManager/default.nix | 4 ++--
 upstart-jobs/xserver/windowManager/default.nix  | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/upstart-jobs/xserver/desktopManager/default.nix b/upstart-jobs/xserver/desktopManager/default.nix
index 05f82dd3e6c..ab1271e69ae 100644
--- a/upstart-jobs/xserver/desktopManager/default.nix
+++ b/upstart-jobs/xserver/desktopManager/default.nix
@@ -56,8 +56,8 @@ in
           description = "
             Default desktop manager loaded if none have been chosen.
           ";
-          merge = name: list:
-            let defaultDM = mergeOneOption name list; in
+          merge = list:
+            let defaultDM = mergeOneOption list; in
             if any (w: w.name == defaultDM) cfg.session.list then
               defaultDM
             else
diff --git a/upstart-jobs/xserver/windowManager/default.nix b/upstart-jobs/xserver/windowManager/default.nix
index 14f06b62b03..cb5a1b674e0 100644
--- a/upstart-jobs/xserver/windowManager/default.nix
+++ b/upstart-jobs/xserver/windowManager/default.nix
@@ -45,8 +45,8 @@ in
           description = "
             Default window manager loaded if none have been chosen.
           ";
-          merge = name: list:
-            let defaultWM = mergeOneOption name list; in
+          merge = list:
+            let defaultWM = mergeOneOption list; in
             if any (w: w.name == defaultWM) cfg.session then
               defaultWM
             else
-- 
GitLab


From 1c1c1e0b15fcda5bcda9eed1f21c57cd3d503992 Mon Sep 17 00:00:00 2001
From: Nicolas Pierron <nicolas.b.pierron@gmail.com>
Date: Sun, 25 Jan 2009 15:49:27 +0000
Subject: [PATCH 1177/5331] Add a section to help user to extend NixOS.

svn path=/nixos/branches/fix-style/; revision=13861
---
 doc/manual/development.xml | 224 +++++++++++++++++++++++++++++++++++++
 1 file changed, 224 insertions(+)

diff --git a/doc/manual/development.xml b/doc/manual/development.xml
index f4d68526c5e..e79114d1785 100644
--- a/doc/manual/development.xml
+++ b/doc/manual/development.xml
@@ -7,6 +7,230 @@
 NixOS.</para>
 
 
+<section>
+
+<title>Extending NixOS</title>
+
+<para>A unique syntax is used to express all system, hardware, computer and
+  service configurations.  This syntax helps for reading and writing new
+  configuration files.  It is coming with some extra strategies defined in
+  NixPkgs which are used to merge and evaluate all configuration files.</para>
+
+  <para>A configuration file is the same as your own computer
+  configuration.</para>
+
+<example xml:id='conf-syntax'><title>Usual configuration file</title>
+<programlisting>
+{pkgs, config, ...}: <co xml:id='conf-syntax-1' />
+
+###### interface
+let
+  inherit (pkgs.lib) mkOption; <co xml:id='conf-syntax-2' />
+
+  options = { <co xml:id='conf-syntax-3' />
+    services = {
+      locate = {
+
+        enable = mkOption {
+          default = false;
+          example = true;
+          description = ''
+            If enabled, NixOS will periodically update the database of
+            files used by the <command>locate</command> command.
+          '';
+        };
+
+        period = mkOption {
+          default = "15 02 * * *";
+          description = ''
+            This option defines (in the format used by cron) when the
+            locate database is updated.
+            The default is to update at 02:15 (at night) every day.
+          '';
+        };
+
+      };
+
+    };
+  };
+in
+
+###### implementation
+let
+  cfg = config.services.locate; <co xml:id='conf-syntax-4' />
+  inherit (pkgs.lib) mkIf mkThenElse;
+
+  locatedb = "/var/cache/locatedb";
+  logfile = "/var/log/updatedb";
+  cmd = "root  updatedb --localuser=nobody --output=${locatedb} > ${logfile}";
+in
+
+mkIf cfg.enable {<co xml:id='conf-syntax-5' />
+  require = [ <co xml:id='conf-syntax-6' />
+    options
+
+    # config.services.cron
+    (import ../../upstart-jobs/cron.nix)
+  ];
+
+  services = {
+    cron = {
+      systemCronJobs = mkThenElse { <co xml:id='conf-syntax-7' />
+        thenPart = "${cfg.period}  root ${cmd}";
+        elsePart = "";
+      };
+    };
+  };
+}</programlisting>
+</example>
+
+<para><xref linkend='conf-syntax' /> shows the <emphasis>configuration
+  file</emphasis> for the locate service which uses cron to update the
+  database at some dates which can be defined by the user.  This nix
+  expression is coming
+  from <filename>upstart-jobs/cron/locate.nix</filename>.  It shows a simple
+  example of a service that can be either distributed on many computer that
+  are using the same configuration or to shared with the community.  This
+  file is divided in two with the interface and the implementation.  Both
+  the interface and the implementation declare a <emphasis>configuration
+  set</emphasis>.
+
+<calloutlist>
+
+  <callout arearefs='conf-syntax-1'>
+
+    <para>This line declares the arguments of the configuration file.  You
+    can omit this line if there is no reference to <varname>pkgs</varname>
+    and <varname>config</varname> inside the configuration file.</para>
+
+    <para>The argument <varname>pkgs</varname> refers to NixPkgs and allow
+    you to access all attributes contained inside it.  In this
+    example <varname>pkgs</varname> is used to retrieve common functions to
+    ease the writing of configuration files
+    like <varname>mkOption</varname>, <varname>mkIf</varname>
+    and <varname>mkThenElse</varname>.</para>
+
+    <para>The argument <varname>config</varname> corresponds to the whole
+    NixOS configuration.  This is a set which is build by merging all
+    configuration files imported to set up the system.  Thus all options
+    declared are contained inside this variable.  In this
+    example <varname>config</varname> is used to retrieve the status of
+    the <varname>enable</varname> flag.  The important point of this
+    argument is that it contains either the result of the merge of different
+    settings or the default value, therefore you cannot assume
+    that <option>config.services.locate.enable</option> is always false
+    because it may have been defined in another configuration file.</para>
+
+  </callout>
+
+  <callout arearefs='conf-syntax-2'>
+
+    <para>This line is used to import a function that is useful for
+    writing this configuration file.</para>
+
+  </callout>
+
+  <callout arearefs='conf-syntax-3'>
+
+    <para>The variable <varname>options</varname> is
+    a <emphasis>configuration set</emphasis> which is only used to declare
+    options with the function <varname>mkOption</varname> imported
+    from <filename>pkgs/lib/default.nix</filename>.  Options may contained
+    any attribute but only the following have a special
+    meaning: <varname>default</varname>, <varname>example</varname>,
+    <varname>description</varname>, <varname>merge</varname>
+    and <varname>apply</varname>.</para>
+
+    <para>The <varname>merge</varname> attribute is used to merge all values
+    defined in all configuration files and this function return a value
+    which has the same type as the default value.  If the merge function is
+    not defined, then a default function
+    (<varname>pkgs.lib.mergeDefaultOption</varname>) is used to merge
+    values.  The <varname>merge</varname> attribute is a function which
+    expect two arguments: the location of the option and the list of values
+    which have to be merged.</para>
+
+    <para>The <varname>apply</varname> attribute is a function used to
+    process the option.  Thus the value return
+    by <option>config.<replaceable>option</replaceable></option> would be
+    the result of the <varname>apply</varname> function called with either
+    the <varname>default</varname> value or the result of
+    the <varname>merge</varname> function.</para>
+
+  </callout>
+
+  <callout arearefs='conf-syntax-4'>
+
+    <para>This line is a common trick used to reduce the amount of
+    writing.  In this case <varname>cfg</varname> is just a sugar over
+    <option>config.services.locate</option></para>
+
+  </callout>
+
+  <callout arearefs='conf-syntax-5'>
+
+    <para>This line is used to declare a special <emphasis>IF</emphasis>
+    statement.  If you had put a usual <emphasis>IF</emphasis> statement
+    here, with the same condition, then you will get an infinite loop.  The
+    reason is that your condition ask for the value of the
+    option <option>config.services.locate.enable</option> but in order to
+    get this value you have to evaluate all configuration sets including the
+    configuration set contained inside your file.</para>
+
+    <para>To remove this extra complexity, <varname>mkIf</varname> has been
+    introduced to get rid of possible infinite loop and to factor your
+    writing.</para>
+
+  </callout>
+
+  <callout arearefs='conf-syntax-6'>
+
+    <para>The attribute <varname>require</varname> is the only special
+    option that exists.  It is used to embed all option declarations that
+    are required by your configuration file and it is also used to provide
+    the options that you are declaring.</para>
+
+    <para>This attribute is processed
+    with <varname>pkgs.lib.uniqFlatten</varname> to collect all
+    configuration files that are used by your system and it avoid the
+    insertion of duplicated elements by comparing the configuration set codes.</para>
+
+    <para>Currently, the file <filename>configuration.nix</filename>
+    implicitly embeds <filename>system/options.nix</filename>.  If you need
+    a special configuration file, then you will have to add similar lines
+    to your computer configuration.</para>
+
+  </callout>
+
+  <callout arearefs='conf-syntax-7'>
+
+    <para>As <varname>mkIf</varname> does not need
+    any <emphasis>then</emphasis> part or <emphasis>else</emphasis> part,
+    then you can specify one on each option definition with the
+    function <varname>mkThenElse</varname>.</para>
+
+    <para>To avoid a lot of <varname>mkThenElse</varname> with empty
+    <emphasis>else</emphasis> part, a sugar has been added to infer the
+    corresponding <emphasis>empty</emphasis>-value of your option when the
+    function <varname>mkThenElse</varname> is not used.</para>
+
+    <para>If your <emphasis>then</emphasis> part
+    and <emphasis>else</emphasis> part are identical, then you should use
+    the function <varname>mkAlways</varname> to ignore the condition.</para>
+
+    <para>If you need to add another condition, then you can add <varname>mkIf</varname> to on
+    the appropriate location.  Thus the <emphasis>then</emphasis> part will
+    only be used if all conditions declared with <varname>mkIf</varname>
+    are satisfied.</para>
+
+  </callout>
+
+</calloutlist>
+
+</para>
+
+</section>
+
 <section>
 
 <title>Building specific parts of NixOS</title>
-- 
GitLab


From c3f848e2d6c235a092d2d98e684d8b49b919c8e0 Mon Sep 17 00:00:00 2001
From: Nicolas Pierron <nicolas.b.pierron@gmail.com>
Date: Sun, 25 Jan 2009 20:47:30 +0000
Subject: [PATCH 1178/5331] Remove name arguments from obsolete options.

svn path=/nixos/trunk/; revision=13864
---
 system/options.nix | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/system/options.nix b/system/options.nix
index 6e4f9c4ee50..0981010aaa7 100644
--- a/system/options.nix
+++ b/system/options.nix
@@ -4,10 +4,10 @@ let
   inherit (pkgs.lib) mkOption;
   inherit (builtins) head tail;
 
-  obsolete = what: f: name:
+  obsolete = what: f:
     if builtins ? trace then
-      builtins.trace "${name}: Obsolete ${what}." f name
-    else f name;
+      builtins.trace "Obsolete ${what}." f
+    else f;
 
   obsoleteMerge =
     obsolete "option" pkgs.lib.mergeDefaultOption;
@@ -15,18 +15,18 @@ let
   # temporary modifications.
   # backward here means that expression could either be a value or a
   # function which expects to have a pkgs argument.
-  optionalPkgs = name: x:
+  optionalPkgs = x:
     if builtins.isFunction x
-    then obsolete "notation" (name: x pkgs) name
+    then obsolete "notation" (x pkgs)
     else x;
 
-  backwardPkgsFunListMerge = name: list:
-    pkgs.lib.concatMap (optionalPkgs name) list;
+  backwardPkgsFunListMerge = list:
+    pkgs.lib.concatMap optionalPkgs list;
 
-  backwardPkgsFunMerge = name: list:
+  backwardPkgsFunMerge = list:
     if list != [] && tail list == []
-    then optionalPkgs name (head list)
-    else abort "${name}: Defined at least twice.";
+    then optionalPkgs (head list)
+    else abort "Defined at least twice.";
 
 in
 
-- 
GitLab


From 7ac9e76eb6fe68089f520a70a218497e06414c22 Mon Sep 17 00:00:00 2001
From: Sander van der Burg <s.vanderburg@tudelft.nl>
Date: Tue, 27 Jan 2009 13:02:56 +0000
Subject: [PATCH 1179/5331] Some fixes to the Apache Tomcat connector

svn path=/nixos/trunk/; revision=13879
---
 upstart-jobs/apache-httpd/tomcat-connector.nix | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/upstart-jobs/apache-httpd/tomcat-connector.nix b/upstart-jobs/apache-httpd/tomcat-connector.nix
index d1186da43fb..f7662c9513f 100644
--- a/upstart-jobs/apache-httpd/tomcat-connector.nix
+++ b/upstart-jobs/apache-httpd/tomcat-connector.nix
@@ -73,12 +73,12 @@ JkAutoAlias /var/tomcat/webapps
 # All requests go to worker by default
 JkMount /* loadbalancer
 # Serve some static files using httpd
-JkUnMount /*.html loadbalancer
-JkUnMount /*.jpg  loadbalancer
-JkUnMount /*.gif  loadbalancer
-JkUnMount /*.css  loadbalancer
-JkUnMount /*.png  loadbalancer
-JkUnMount /*.js  loadbalancer
+#JkUnMount /*.html loadbalancer
+#JkUnMount /*.jpg  loadbalancer
+#JkUnMount /*.gif  loadbalancer
+#JkUnMount /*.css  loadbalancer
+#JkUnMount /*.png  loadbalancer
+#JkUnMount /*.js  loadbalancer
 
 # Add jkstatus for managing runtime data
 <Location /jkstatus/>
-- 
GitLab


From 016e4dc5c332f0095ca37a26693bf4554a1f8485 Mon Sep 17 00:00:00 2001
From: Sander van der Burg <s.vanderburg@tudelft.nl>
Date: Wed, 28 Jan 2009 12:19:42 +0000
Subject: [PATCH 1180/5331] Increased the sleep hack on the Tomcat service

svn path=/nixos/trunk/; revision=13890
---
 upstart-jobs/tomcat.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/upstart-jobs/tomcat.nix b/upstart-jobs/tomcat.nix
index ad4736386d9..233da6abe38 100644
--- a/upstart-jobs/tomcat.nix
+++ b/upstart-jobs/tomcat.nix
@@ -99,7 +99,7 @@ in
 
     end script
     
-    respawn ${pkgs.su}/bin/su -s ${pkgs.bash}/bin/sh ${cfg.user} -c 'CATALINA_BASE=${cfg.baseDir} JAVA_HOME=${pkgs.jdk} JAVA_OPTS="${cfg.javaOpts}" CATALINA_OPTS="${cfg.catalinaOpts}" ${pkgs.tomcat6}/bin/startup.sh; sleep 1d'
+    respawn ${pkgs.su}/bin/su -s ${pkgs.bash}/bin/sh ${cfg.user} -c 'CATALINA_BASE=${cfg.baseDir} JAVA_HOME=${pkgs.jdk} JAVA_OPTS="${cfg.javaOpts}" CATALINA_OPTS="${cfg.catalinaOpts}" ${pkgs.tomcat6}/bin/startup.sh; sleep 1000d'
     
     stop script
         echo "Stopping tomcat..."
-- 
GitLab


From a3f778c23d3336f13cdab69a0fbab99f53b10c0c Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 28 Jan 2009 14:48:37 +0000
Subject: [PATCH 1181/5331] * CUPS: use /etc/cups rather than ${cups}/etc/cups
 as the ServerRoot,   because CUPS modifies files in the ServerRoot directory.
  Most   importantly, it stores printer configuration there.  Previously the  
 CUPS server modified the files under ${cups}/etc/cups, which is   impure and
 caused all configured printers to disappear any time CUPS   was upgraded.

svn path=/nixos/trunk/; revision=13892
---
 upstart-jobs/cupsd.nix | 19 ++++++++++++++-----
 1 file changed, 14 insertions(+), 5 deletions(-)

diff --git a/upstart-jobs/cupsd.nix b/upstart-jobs/cupsd.nix
index d67fc384324..ced164a1308 100644
--- a/upstart-jobs/cupsd.nix
+++ b/upstart-jobs/cupsd.nix
@@ -40,7 +40,10 @@ let
     Listen localhost:631
     Listen /var/run/cups/cups.sock
 
-    ServerRoot ${cups}/etc/cups
+    # Note: we can't use ${cups}/etc/cups as the ServerRoot, since
+    # CUPS will write in the ServerRoot when e.g. adding new printers
+    # through the web interface.
+    ServerRoot /etc/cups
 
     ServerBin ${bindir}/lib/cups
 
@@ -101,11 +104,17 @@ in
 {
   name = "cupsd";
 
-  extraPath = [
-    cups
-  ];
+  extraPath = [cups];
 
-  
+  extraEtc = [
+    # CUPS expects the following files in its ServerRoot.
+    { source = "${cups}/etc/cups/mime.convs";
+      target = "cups/mime.convs";
+    }
+    { source = "${cups}/etc/cups/mime.types";
+      target = "cups/mime.types";
+    }
+  ];
   
   job = ''
     description "CUPS printing daemon"
-- 
GitLab


From 42a83d33914c694ff17e4c8e272848119ecd64da Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 29 Jan 2009 17:50:28 +0000
Subject: [PATCH 1182/5331] svn path=/nixos/trunk/; revision=13906

---
 boot/boot-stage-1.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/boot/boot-stage-1.nix b/boot/boot-stage-1.nix
index f5b7e90de94..d6702799682 100644
--- a/boot/boot-stage-1.nix
+++ b/boot/boot-stage-1.nix
@@ -15,7 +15,7 @@ rec {
 
   pkgsKlibc = import "${nixpkgsPath}/pkgs/top-level/all-packages.nix" {
     system = pkgs.stdenv.system;
-    bootStdenv = pkgs.useKlibc pkgs.stdenv kernelPackages.klibc;
+    bootStdenv = pkgs.useKlibc pkgs.stdenv pkgs.klibc;
   };
 
   pkgsStatic = import "${nixpkgsPath}/pkgs/top-level/all-packages.nix" {
@@ -131,7 +131,7 @@ rec {
       # command provided by klibc (which isn't capable of
       # auto-detecting FS types).
       extraUtils
-      kernelPackages.klibcShrunk
+      pkgs.klibcShrunk
     ];
   };
 
-- 
GitLab


From 2b8216bdda25f79909293917b89ed1619f12c58f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Thu, 29 Jan 2009 18:28:09 +0000
Subject: [PATCH 1183/5331] Add Upstart job for PulseAudio as a system-wide
 daemon.

svn path=/nixos/trunk/; revision=13907
---
 system/ids.nix              |  2 +
 system/options.nix          |  1 +
 upstart-jobs/pulseaudio.nix | 94 +++++++++++++++++++++++++++++++++++++
 3 files changed, 97 insertions(+)
 create mode 100644 upstart-jobs/pulseaudio.nix

diff --git a/system/ids.nix b/system/ids.nix
index 3838f7138f2..a950ec84db1 100644
--- a/system/ids.nix
+++ b/system/ids.nix
@@ -19,6 +19,7 @@
     dovecot = 15;
     tomcat = 16;
     gnunetd = 17;
+    pulseaudio = 22; # must match `pulseaudio' GID
 
     nixbld = 30000; # start of range of uids
     nobody = 65534;
@@ -45,6 +46,7 @@
     uucp = 19;
     lp = 20;
     tomcat = 21;
+    pulseaudio = 22; # must match `pulseaudio' UID
     
     users = 100;
     nixbld = 30000;
diff --git a/system/options.nix b/system/options.nix
index 0981010aaa7..da435cfec86 100644
--- a/system/options.nix
+++ b/system/options.nix
@@ -3066,5 +3066,6 @@ root        ALL=(ALL) SETENV: ALL
     (import ../upstart-jobs/manual.nix)
     (import ../upstart-jobs/rogue.nix)
     (import ../upstart-jobs/guest-users.nix)
+    (import ../upstart-jobs/pulseaudio.nix)
   ];
 }
diff --git a/upstart-jobs/pulseaudio.nix b/upstart-jobs/pulseaudio.nix
new file mode 100644
index 00000000000..b8497ce12e7
--- /dev/null
+++ b/upstart-jobs/pulseaudio.nix
@@ -0,0 +1,94 @@
+{pkgs, config, ...}:
+
+###### interface
+let
+  inherit (pkgs.lib) mkOption;
+
+  uid = (import ../system/ids.nix).uids.pulseaudio;
+  gid = (import ../system/ids.nix).gids.pulseaudio;
+
+  options = {
+    services = {
+      pulseaudio = {
+        enable = mkOption {
+          default = false;
+          description = ''
+            Whether to enable the PulseAudio system-wide audio server.
+            Note that the documentation recommends running PulseAudio
+            daemons per-user rather than system-wide on desktop machines.
+          '';
+        };
+
+        logLevel = mkOption {
+          default = "notice";
+          example = "debug";
+          description = ''
+            A string denoting the log level: one of
+            <literal>error</literal>, <literal>warn</literal>,
+            <literal>notice</literal>, <literal>info</literal>,
+            or <literal>debug</literal>.
+          '';
+        };
+      };
+    };
+  };
+in
+
+###### implementation
+
+# For some reason, PulseAudio wants UID == GID.
+assert uid == gid;
+
+{
+  require = [
+    options
+  ];
+
+  environment = {
+
+    extraPackages =
+      pkgs.lib.optional
+        (!config.environment.cleanStart)
+        pkgs.pulseaudio;
+  };
+
+  users = {
+    extraUsers = [
+      { name = "pulse";
+        inherit uid;
+        group = "pulse";
+        description = "PulseAudio system-wide daemon";
+        home = "/var/run/pulse";
+      }
+    ];
+
+    extraGroups = [
+      { name = "pulse";
+        inherit gid;
+      }
+    ];
+  };
+
+  services = {
+    extraJobs = [{
+      name = "pulseaudio";
+
+      job = ''
+        description "PulseAudio system-wide server"
+
+        start on startup
+        stop on shutdown
+
+        start script
+          test -d /var/run/pulse ||			\
+          ( mkdir -p --mode 755 /var/run/pulse &&	\
+            chown pulse:pulse /var/run/pulse )
+        end script
+
+        respawn ${pkgs.pulseaudio}/bin/pulseaudio               \
+          --system --daemonize                                  \
+          --log-level="${config.services.pulseaudio.logLevel}"
+      '';
+    }];
+  };
+}
-- 
GitLab


From 6085b298ae53f6d4f2fce46d7ef4d5a772512c79 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Thu, 29 Jan 2009 19:17:55 +0000
Subject: [PATCH 1184/5331] Mount `/dev/shm' (shared memory support).

svn path=/nixos/trunk/; revision=13908
---
 boot/boot-stage-2-init.sh | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/boot/boot-stage-2-init.sh b/boot/boot-stage-2-init.sh
index f5fd818d3c7..3c69265b51d 100644
--- a/boot/boot-stage-2-init.sh
+++ b/boot/boot-stage-2-init.sh
@@ -69,6 +69,8 @@ mkdir -m 0755 -p /sys
 mount -t sysfs none /sys
 mkdir -m 0755 -p /dev
 mount -t tmpfs -o "mode=0755" none /dev
+mkdir -m 0777 /dev/shm
+mount -t tmpfs -o "rw,nosuid,nodev" tmpfs /dev/shm
 mkdir -m 0755 -p /dev/pts
 mount -t devpts none /dev/pts
 [ -e /proc/bus/usb ] && mount -t usbfs none /proc/bus/usb # uml doesn't have usb by default
-- 
GitLab


From d641e99375d9dfbbbc8fbe9ab3cb265644aa24be Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Sun, 1 Feb 2009 18:35:56 +0000
Subject: [PATCH 1185/5331] PulseAudio Upstart job: honor `enable'.

svn path=/nixos/trunk/; revision=13926
---
 upstart-jobs/pulseaudio.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/upstart-jobs/pulseaudio.nix b/upstart-jobs/pulseaudio.nix
index b8497ce12e7..173f96db7fc 100644
--- a/upstart-jobs/pulseaudio.nix
+++ b/upstart-jobs/pulseaudio.nix
@@ -2,7 +2,7 @@
 
 ###### interface
 let
-  inherit (pkgs.lib) mkOption;
+  inherit (pkgs.lib) mkOption mkIf;
 
   uid = (import ../system/ids.nix).uids.pulseaudio;
   gid = (import ../system/ids.nix).gids.pulseaudio;
@@ -39,7 +39,7 @@ in
 # For some reason, PulseAudio wants UID == GID.
 assert uid == gid;
 
-{
+mkIf config.services.pulseaudio.enable {
   require = [
     options
   ];
-- 
GitLab


From d98f4827393aa38361154743c7e17ffb654be164 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sun, 1 Feb 2009 19:51:53 +0000
Subject: [PATCH 1186/5331] * Start mingetty after udev, otherwise /dev/tty*
 may not exist yet   (and you get Upstart messages about the ttyN job being
 restarted).

svn path=/nixos/trunk/; revision=13931
---
 upstart-jobs/mingetty.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/upstart-jobs/mingetty.nix b/upstart-jobs/mingetty.nix
index 1d821e789b7..8f50ea5c9db 100644
--- a/upstart-jobs/mingetty.nix
+++ b/upstart-jobs/mingetty.nix
@@ -3,7 +3,7 @@
 {
   name = "tty" + toString ttyNumber;
   job = "
-    start on startup
+    start on udev
     stop on shutdown
     respawn ${mingetty}/sbin/mingetty --loginprog=${loginProgram} --noclear tty${toString ttyNumber}
   ";
-- 
GitLab


From aff7fba09859bf6c0528c74c99671cf4b0903f0a Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sun, 1 Feb 2009 19:53:59 +0000
Subject: [PATCH 1187/5331] * Don't run fsck on journalling file systems. 
 Instead assume   that the file system driver will replay the journal at  
 mount-time in case of an unclean shutdown.  For ext3 at least   this is
 *much* faster.

svn path=/nixos/trunk/; revision=13932
---
 boot/boot-stage-1-init.sh | 115 ++++++++++++++++++++------------------
 1 file changed, 62 insertions(+), 53 deletions(-)

diff --git a/boot/boot-stage-1-init.sh b/boot/boot-stage-1-init.sh
index c6d7214028c..c9930c30bbc 100644
--- a/boot/boot-stage-1-init.sh
+++ b/boot/boot-stage-1-init.sh
@@ -140,69 +140,78 @@ if test -n "$debug1devices"; then fail; fi
 
 # Return true if the machine is on AC power, or if we can't determine
 # whether it's on AC power.
-onACPower () {
+onACPower() {
     if test -d "/proc/acpi/battery"; then
-	if ls /proc/acpi/battery/BAT[0-9]* > /dev/null 2>&1; then
-	    if cat /proc/acpi/battery/BAT*/state	\
-	       | grep "^charging state"			\
-	       | grep -q "discharg" ; then
-		false
-	    else
-		true
-	    fi
-	else
-	    true
-	fi
+        if ls /proc/acpi/battery/BAT[0-9]* > /dev/null 2>&1; then
+            if cat /proc/acpi/battery/BAT*/state \
+                | grep "^charging state" \
+                | grep -q "discharg" ; then
+                false
+            else
+                true
+            fi
+        else
+            true
+        fi
     else
-	true
+        true
     fi
 }
 
-# Function for mounting a file system.
-mountFS() {
-    local device="$1"
-    local mountPoint="$2"
-    local options="$3"
-    local fsType="$4"
 
-    # Check the root device, if .
-    mustCheck=
-    if test -b "$device"; then
-        mustCheck=1
-    else
-        case $device in
-            LABEL=*)
-                mustCheck=1
-                ;;
-        esac
+# Check the specified file system, if appropriate.
+checkFS() {
+    # Only check block devices.
+    if ! test -b "$device"; then return 0; fi
+
+    # For unclean ext3 file systems, fsck.ext3 should just replay the
+    # journal and exit, but in practice this takes *much* longer than
+    # letting the kernel recover the FS.  So, don't run fsck on
+    # journalling file systems.
+    eval $(fstype "$device")
+    if test "$FSTYPE" = ext3 -o "$FSTYPE" = ext4 -o "$FSTYPE" = reiserfs -o "$FSTYPE" = xfs -o "$FSTYPE" = jfs; then
+        return 0;
+    fi
+    
+    # Don't run `fsck' if the machine is on battery power.  !!! Is
+    # this a good idea?
+    if ! onACPower; then
+        echo "on battery power, so \`fsck' not run on \`$device'"
+        return 0
+    fi
+    
+    FSTAB_FILE="/etc/mtab" fsck -V -v -C -a "$device"
+    fsckResult=$?
+
+    if test $(($fsckResult | 2)) = $fsckResult; then
+        echo "fsck finished, rebooting..."
+        sleep 3
+        reboot
     fi
 
-    if test -n "$mustCheck"; then
-	if onACPower; then
-            FSTAB_FILE="/etc/mtab" fsck -V -v -C -a "$device"
-            fsckResult=$?
+    if test $(($fsckResult | 4)) = $fsckResult; then
+        echo "$device has unrepaired errors, please fix them manually."
+        fail
+    fi
 
-            if test $(($fsckResult | 2)) = $fsckResult; then
-		echo "fsck finished, rebooting..."
-		sleep 3
-		reboot
-            fi
+    if test $fsckResult -ge 8; then
+        echo "fsck on $device failed."
+        fail
+    fi
 
-            if test $(($fsckResult | 4)) = $fsckResult; then
-		echo "$device has unrepaired errors, please fix them manually."
-		fail
-            fi
+    return 0
+}
 
-            if test $fsckResult -ge 8; then
-		echo "fsck on $device failed."
-		fail
-            fi
-	else
-            # Don't run `fsck' if the machine is on battery power.
-	    echo "on battery power, so \`fsck' not run on \`$device'"
-	fi
-    fi
 
+# Function for mounting a file system.
+mountFS() {
+    local device="$1"
+    local mountPoint="$2"
+    local options="$3"
+    local fsType="$4"
+
+    checkFS "$device"
+    
     # Mount read-writable.
     mount -t "$fsType" -o "$options" "$device" /mnt-root$mountPoint || fail
 }
@@ -224,8 +233,8 @@ for ((n = 0; n < ${#mountPoints[*]}; n++)); do
 
     # !!! Really quick hack to support bind mounts, i.e., where the
     # "device" should be taken relative to /mnt-root, not /.  Assume
-    # that every device that start with / but doesn't start with /dev
-    # or LABEL= is a bind mount.
+    # that every device that starts with / but doesn't start with /dev
+    # is a bind mount.
     case $device in
         /dev/*)
             ;;
-- 
GitLab


From 059ca080b1aa04cd727ce45315d6d412d2e773b6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Sun, 1 Feb 2009 21:23:31 +0000
Subject: [PATCH 1188/5331] Making the 'via' video module available in the
 xserver upstart-job.

svn path=/nixos/trunk/; revision=13939
---
 upstart-jobs/xserver.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/upstart-jobs/xserver.nix b/upstart-jobs/xserver.nix
index 9b815ede5b8..e8c31717002 100644
--- a/upstart-jobs/xserver.nix
+++ b/upstart-jobs/xserver.nix
@@ -22,6 +22,7 @@ let
     intel = { modules = [xorg.xf86videointel]; };
     nv =    { modules = [xorg.xf86videonv]; };
     ati =   { modules = [xorg.xf86videoati]; };
+    via =   { modules = [xorg.xf86videovia]; };
   };
 
   # Get a bunch of user settings.
-- 
GitLab


From 9774eb579880eb109e498dfd89c99b548a139633 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 5 Feb 2009 13:23:22 +0000
Subject: [PATCH 1189/5331] * Symlink fsck.ext[234] to e2fsck.  This makes the
 initrd 600 KB smaller.

svn path=/nixos/trunk/; revision=13982
---
 boot/boot-stage-1.nix | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/boot/boot-stage-1.nix b/boot/boot-stage-1.nix
index d6702799682..ff9522e8925 100644
--- a/boot/boot-stage-1.nix
+++ b/boot/boot-stage-1.nix
@@ -67,10 +67,13 @@ rec {
         cp $lvm2/sbin/lvm.static $out/bin/lvm
       fi
       cp $utillinux/bin/mount $utillinux/bin/umount $utillinux/sbin/pivot_root $out/bin
-      cp -p $e2fsprogs/sbin/fsck* $e2fsprogs/sbin/e2fsck $e2fsprogs/sbin/tune2fs $out/bin
+      cp -pd $e2fsprogs/sbin/fsck $e2fsprogs/sbin/e2fsck $e2fsprogs/sbin/tune2fs $out/bin
+      ln -s e2fsck $out/bin/fsck.ext2
+      ln -s e2fsck $out/bin/fsck.ext3
+      ln -s e2fsck $out/bin/fsck.ext4
       cp $udev/sbin/udevd $udev/sbin/udevadm $out/bin
       cp $udev/lib/udev/*_id $out/bin
-      nuke-refs $out/bin/*
+      for i in $out/bin/*; do if ! test -L $i; then nuke-refs $i; fi; done
     ''; # */
   
 
-- 
GitLab


From ab80d81e5497266f2a9422cea2bd576a9c16b649 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 5 Feb 2009 15:57:07 +0000
Subject: [PATCH 1190/5331] * Use normal, dynamically linked binaries for
 e2fsck, lvm etc. in the   initrd instead of a mix of dietlibc, klibc and
 static-glibc based   binaries.  This works by copying what we need from Glibc
 into the   initrd and using patchelf to set the ELF interpreter and RPATH  
 correctly.  The resulting initrd is about 500 KB smaller, but more  
 importantly, it's much easier to maintain - all those  
 dietlibc/klibc/static-glibc builds frequently cause build problems.

svn path=/nixos/trunk/; revision=13984
---
 boot/boot-stage-1-init.sh |  15 ++---
 boot/boot-stage-1.nix     | 123 ++++++++++++++++++++++----------------
 2 files changed, 80 insertions(+), 58 deletions(-)

diff --git a/boot/boot-stage-1-init.sh b/boot/boot-stage-1-init.sh
index c9930c30bbc..b3b2292beaa 100644
--- a/boot/boot-stage-1-init.sh
+++ b/boot/boot-stage-1-init.sh
@@ -1,7 +1,9 @@
-#! @staticShell@
+#! @shell@
 
 targetRoot=/mnt/root
 
+export LD_LIBRARY_PATH=@extraUtils@/lib
+
 
 errorDialog() {
     timeout=15
@@ -14,13 +16,13 @@ errorDialog() {
     read -t $timeout reply
     case $reply in
         f)
-            exec @staticShell@;;
+            exec @shell@;;
         i)
             echo
             echo "Quit interactive shell with exit status of"
             echo "  0        : to continue"
             echo "  non-zero : to get this dialog again"
-            @staticShell@ || fail
+            @shell@ || fail
             ;;
         *)
             echo continuing ignoring error;;
@@ -299,7 +301,6 @@ umount /proc
 exec run-init "$targetRoot" "$stage2Init"
 
 echo
-echo $1 failed running "$stage2Init"
-echo "It's your last chance to fix things manually without rebooting"
-echo "finally switching to interactive shell pid 1"
-export $stage2Init; exec @staticShell@
+echo "$1: failed running $stage2Init"
+echo "Dropping into a root shell..."
+export $stage2Init; exec @shell@
diff --git a/boot/boot-stage-1.nix b/boot/boot-stage-1.nix
index ff9522e8925..ed53a3abdb9 100644
--- a/boot/boot-stage-1.nix
+++ b/boot/boot-stage-1.nix
@@ -8,26 +8,6 @@
 
 rec {
 
-  pkgsDiet = import "${nixpkgsPath}/pkgs/top-level/all-packages.nix" {
-    system = pkgs.stdenv.system;
-    bootStdenv = pkgs.useDietLibC pkgs.stdenv;
-  };
-
-  pkgsKlibc = import "${nixpkgsPath}/pkgs/top-level/all-packages.nix" {
-    system = pkgs.stdenv.system;
-    bootStdenv = pkgs.useKlibc pkgs.stdenv pkgs.klibc;
-  };
-
-  pkgsStatic = import "${nixpkgsPath}/pkgs/top-level/all-packages.nix" {
-    system = pkgs.stdenv.system;
-    bootStdenv = pkgs.makeStaticBinaries pkgs.stdenv;
-  };
-
-  stdenvLinuxStuff = import "${nixpkgsPath}/pkgs/stdenv/linux" {
-    system = pkgs.stdenv.system;
-    allPackages = import "${nixpkgsPath}/pkgs/top-level/all-packages.nix";
-  };
-  
 
   # Determine the set of modules that we need to mount the root FS.
   modulesClosure = pkgs.makeModulesClosure {
@@ -39,41 +19,82 @@ rec {
   };
 
 
-  udev = pkgsKlibc.udev;
-
-    
-  # 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.
+  # Some additional utilities needed in stage 1, like mount, lvm, fsck
+  # etc.  We don't want to bring in all of those packages, so we just
+  # copy what we need.  Instead of using statically linked binaries,
+  # we just copy what we need from Glibc and use patchelf to make it
+  # work.
   extraUtils = pkgs.runCommand "extra-utils"
     { buildInputs = [pkgs.nukeReferences];
-      inherit (pkgsStatic) utillinux;
-      inherit udev;
-      e2fsprogs = pkgsDiet.e2fsprogs;
-      devicemapper =
-        if config.boot.initrd.lvm
-        then assert pkgs.devicemapper.enableStatic; pkgs.devicemapper
-        else null;
-      lvm2 =
-        if config.boot.initrd.lvm
-        then assert pkgs.lvm2.enableStatic; pkgs.lvm2
-        else null;
-      allowedReferences = []; # prevent accidents like glibc being included in the initrd
+      devicemapper = if config.boot.initrd.lvm then pkgs.devicemapper else null;
+      lvm2 = if config.boot.initrd.lvm then pkgs.lvm2 else null;
+      allowedReferences = ["out"]; # prevent accidents like glibc being included in the initrd
     }
     ''
       ensureDir $out/bin
-      if test -n "$devicemapper"; then
-        cp $devicemapper/sbin/dmsetup.static $out/bin/dmsetup
-        cp $lvm2/sbin/lvm.static $out/bin/lvm
-      fi
-      cp $utillinux/bin/mount $utillinux/bin/umount $utillinux/sbin/pivot_root $out/bin
-      cp -pd $e2fsprogs/sbin/fsck $e2fsprogs/sbin/e2fsck $e2fsprogs/sbin/tune2fs $out/bin
+      ensureDir $out/lib
+      
+      # Copy what we need from Glibc.
+      cp -p ${pkgs.glibc}/lib/ld-linux*.so.2 $out/lib
+      cp -p ${pkgs.glibc}/lib/libc.so.* $out/lib
+      cp -p ${pkgs.glibc}/lib/libpthread.so.* $out/lib
+      cp -p ${pkgs.glibc}/lib/librt.so.* $out/lib
+      cp -p ${pkgs.glibc}/lib/libdl.so.* $out/lib
+
+      # Copy some utillinux stuff.
+      cp ${pkgs.utillinux}/bin/mount ${pkgs.utillinux}/bin/umount ${pkgs.utillinux}/sbin/pivot_root $out/bin
+
+      # Copy e2fsck and friends.      
+      cp ${pkgs.e2fsprogs}/sbin/e2fsck $out/bin
+      cp ${pkgs.e2fsprogs}/sbin/tune2fs $out/bin
+      cp ${pkgs.e2fsprogs}/sbin/fsck $out/bin
       ln -s e2fsck $out/bin/fsck.ext2
       ln -s e2fsck $out/bin/fsck.ext3
       ln -s e2fsck $out/bin/fsck.ext4
-      cp $udev/sbin/udevd $udev/sbin/udevadm $out/bin
-      cp $udev/lib/udev/*_id $out/bin
-      for i in $out/bin/*; do if ! test -L $i; then nuke-refs $i; fi; done
+
+      cp -pd ${pkgs.e2fsprogs}/lib/lib*.so.* $out/lib
+
+      # Copy devicemapper and lvm, if we need it.
+      if test -n "$devicemapper"; then
+        cp $devicemapper/sbin/dmsetup $out/bin/dmsetup
+        cp $devicemapper/lib/libdevmapper.so.*.* $out/lib
+        cp $lvm2/sbin/lvm $out/bin/lvm
+      fi
+
+      # Copy udev.
+      cp ${pkgs.udev}/sbin/udevd ${pkgs.udev}/sbin/udevadm $out/bin
+      cp ${pkgs.udev}/lib/udev/*_id $out/bin
+      cp ${pkgs.udev}/lib/libvolume_id.so.* $out/lib
+      
+      # Copy bash.
+      cp ${pkgs.bash}/bin/bash $out/bin
+      ln -s bash $out/bin/sh
+
+      # Run patchelf to make the programs refer to the copied libraries.
+      for i in $out/bin/* $out/lib/*; do if ! test -L $i; then nuke-refs $i; fi; done
+
+      for i in $out/bin/*; do
+          if ! test -L $i; then
+              echo "patching $i..."
+              patchelf --set-interpreter $out/lib/ld-linux*.so.2 --set-rpath $out/lib $i || true
+          fi
+      done
+
+      # Make sure that the patchelf'ed binaries still work.
+      echo "testing patched programs..."
+      $out/bin/bash --version
+      export LD_LIBRARY_PATH=$out/lib
+      $out/bin/mount --version
+      $out/bin/umount --version
+      $out/bin/e2fsck -V
+      $out/bin/tune2fs 2> /dev/null | grep "tune2fs "
+      $out/bin/fsck -N
+      $out/bin/udevadm --version
+      $out/bin/vol_id 2>&1 | grep "no device"
+      if test -n "$devicemapper"; then
+          $out/bin/dmsetup --version | grep "version:"
+          LVM_SYSTEM_DIR=$out $out/bin/lvm 2>&1 | grep "LVM"
+      fi
     ''; # */
   
 
@@ -89,7 +110,7 @@ rec {
     name = "udev-rules";
     buildCommand = ''
       ensureDir $out
-      cp ${udev}/*/udev/rules.d/60-persistent-storage.rules $out/
+      cp ${pkgs.udev}/*/udev/rules.d/60-persistent-storage.rules $out/
       substituteInPlace $out/60-persistent-storage.rules \
         --replace ata_id ${extraUtils}/bin/ata_id \
         --replace usb_id ${extraUtils}/bin/usb_id \
@@ -112,11 +133,11 @@ rec {
   bootStage1 = pkgs.substituteAll {
     src = ./boot-stage-1-init.sh;
 
+    shell = "${extraUtils}/bin/bash";
+
     isExecutable = true;
 
-    staticShell = stdenvLinuxStuff.bootstrapTools.bash;
-    
-    inherit modulesClosure udevConf;
+    inherit modulesClosure udevConf extraUtils;
     
     inherit (config.boot) isLiveCD resumeDevice;
 
-- 
GitLab


From b25ee09ceb82702a0797744e255f60b08775a086 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 5 Feb 2009 16:19:59 +0000
Subject: [PATCH 1191/5331] * Remove /var/lock on startup. * Remove /etc/mtab
 on startup.  This fixes the warning on   startup when catting /proc/mount to
 /etc/mtab.

svn path=/nixos/trunk/; revision=13986
---
 boot/boot-stage-2-init.sh | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/boot/boot-stage-2-init.sh b/boot/boot-stage-2-init.sh
index 3c69265b51d..a5f94bf2ad2 100644
--- a/boot/boot-stage-2-init.sh
+++ b/boot/boot-stage-2-init.sh
@@ -30,8 +30,9 @@ test -e /etc/fstab || touch /etc/fstab # to shut up mount
 mkdir -m 0755 -p /proc
 mount -n -t proc none /proc
 [ -s /etc/mtab ] && rm /etc/mtab # while installing a symlink is created (see man mount), if it's still there for whateever reason remove it
+
+rm -f /etc/mtab
 cat /proc/mounts > /etc/mtab
-mkdir -m 0755 -p /etc/nixos
 
 
 # Process the kernel command line.
@@ -80,10 +81,12 @@ mkdir -m 0755 -p /nix/var
 mkdir -m 0700 -p /root
 mkdir -m 0755 -p /bin # for the /bin/sh symlink
 mkdir -m 0755 -p /home
+mkdir -m 0755 -p /etc/nixos
 
 
 # Miscellaneous boot time cleanup.
 rm -rf /var/run
+rm -rf /var/lock
 
 #echo -n "cleaning \`/tmp'..."
 #rm -rf --one-file-system /tmp/*
-- 
GitLab


From c83a1850905aead55b27392ccd3923094fdae116 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 10 Feb 2009 23:25:49 +0000
Subject: [PATCH 1192/5331] * Run the ACPI daemon.  This allows the system to
 respond to ACPI   events, like pressing the power button.  The NVIDIA X11
 driver also   needs it to respond to the internal/external monitor switch
 button   on laptops.  The power actions should of course be made  
 configurable.

svn path=/nixos/trunk/; revision=14027
---
 upstart-jobs/acpid.nix   | 42 ++++++++++++++++++++++++++++++++++++++++
 upstart-jobs/default.nix |  6 ++++++
 2 files changed, 48 insertions(+)
 create mode 100644 upstart-jobs/acpid.nix

diff --git a/upstart-jobs/acpid.nix b/upstart-jobs/acpid.nix
new file mode 100644
index 00000000000..5bd1fa63590
--- /dev/null
+++ b/upstart-jobs/acpid.nix
@@ -0,0 +1,42 @@
+{pkgs, config, ...}:
+
+let
+
+  acpiConfDir = pkgs.runCommand "acpi-events" {}
+    ''
+      ensureDir $out
+      ln -s ${acpiConfFile} $out/events.conf
+    '';
+
+  acpiConfFile = pkgs.writeText "acpi.conf"
+    ''
+      event=button/power.*
+      action=${powerEventHandler} "%e"
+    '';
+
+  # Called when the power button is pressed.
+  powerEventHandler = pkgs.writeScript "acpi-power.sh"
+    ''
+      #! ${pkgs.bash}/bin/sh
+      # Suspend to RAM.
+      #echo mem > /sys/power/state
+      exit 0
+    '';
+
+in
+
+{
+  name = "acpid";
+  
+  extraPath = [pkgs.acpid];
+  
+  job = ''
+    description "ACPI daemon"
+
+    start on udev
+    stop on shutdown
+
+    respawn ${pkgs.acpid}/sbin/acpid --foreground --confdir ${acpiConfDir}
+  '';
+  
+}
diff --git a/upstart-jobs/default.nix b/upstart-jobs/default.nix
index bd0581b5870..bd45dda4991 100644
--- a/upstart-jobs/default.nix
+++ b/upstart-jobs/default.nix
@@ -342,6 +342,12 @@ let
       inherit (pkgs) alsaUtils;
     })
 
+  # ACPI daemon.
+  ++ optional true /* !!! need some option */
+    (import ../upstart-jobs/acpid.nix {
+      inherit config pkgs;
+    })
+
   # D-Bus system-wide daemon.
   ++ optional config.services.dbus.enable
     (import ../upstart-jobs/dbus.nix {
-- 
GitLab


From cf7fcb98ecc0ae92e3c3a6e7248bcf011407c2fc Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 11 Feb 2009 23:15:07 +0000
Subject: [PATCH 1193/5331] * Suspend when the laptop lid is closed.

svn path=/nixos/trunk/; revision=14038
---
 upstart-jobs/acpid.nix | 19 +++++++++++++++++++
 upstart-jobs/hal.nix   |  2 ++
 2 files changed, 21 insertions(+)

diff --git a/upstart-jobs/acpid.nix b/upstart-jobs/acpid.nix
index 5bd1fa63590..efd608e1353 100644
--- a/upstart-jobs/acpid.nix
+++ b/upstart-jobs/acpid.nix
@@ -12,6 +12,9 @@ let
     ''
       event=button/power.*
       action=${powerEventHandler} "%e"
+
+      event=button/lid.*
+      action=${lidEventHandler} "%e"
     '';
 
   # Called when the power button is pressed.
@@ -23,6 +26,22 @@ let
       exit 0
     '';
 
+  # Called when the laptop lid is opened/closed.
+  lidEventHandler = pkgs.writeScript "acpi-lid.sh"
+    ''
+      #! ${pkgs.bash}/bin/sh
+
+      # Suspend to RAM if the lid is closed.  (We also get this event
+      # when the lid just opened, in which case we obviously don't
+      # want to suspend again.) 
+      if grep -q closed /proc/acpi/button/lid/LID/state; then
+          sync
+          echo mem > /sys/power/state
+      fi
+
+      exit 0
+    '';
+
 in
 
 {
diff --git a/upstart-jobs/hal.nix b/upstart-jobs/hal.nix
index 90e8c49521b..0fa47bf5eeb 100644
--- a/upstart-jobs/hal.nix
+++ b/upstart-jobs/hal.nix
@@ -21,6 +21,8 @@
   job = ''
     description "HAL daemon"
 
+    # !!! TODO: make sure that HAL starts after acpid,
+    # otherwise hald-addon-acpi will grab /proc/acpi/event.
     start on dbus
     stop on shutdown
 
-- 
GitLab


From 03e7f296b1a4b78a60314318f47c8a82cf1eae5c Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 13 Feb 2009 12:11:42 +0000
Subject: [PATCH 1194/5331] * acpid: switch to the ondemand CPU scaling
 governer when on battery power.   Disabled acpid by default because it's not
 configurable enough yet.

svn path=/nixos/trunk/; revision=14070
---
 system/options.nix       | 14 ++++++++++++++
 upstart-jobs/acpid.nix   | 16 ++++++++++++++--
 upstart-jobs/default.nix |  2 +-
 3 files changed, 29 insertions(+), 3 deletions(-)

diff --git a/system/options.nix b/system/options.nix
index da435cfec86..92d17926add 100644
--- a/system/options.nix
+++ b/system/options.nix
@@ -3033,7 +3033,20 @@ root        ALL=(ALL) SETENV: ALL
     };
 
   };
+
+    
+  powerManagement = {
+    
+    enable = mkOption {
+      default = false;
+      description = "
+        Whether to enable power management.
+      ";
+    };
+
+  };
   
+
   nesting = {
     children = mkOption {
       default = [];
@@ -3043,6 +3056,7 @@ root        ALL=(ALL) SETENV: ALL
     };
   };
 
+  
   passthru = mkOption {
     default = {};
     description = "
diff --git a/upstart-jobs/acpid.nix b/upstart-jobs/acpid.nix
index efd608e1353..3a7df58bbaf 100644
--- a/upstart-jobs/acpid.nix
+++ b/upstart-jobs/acpid.nix
@@ -15,6 +15,9 @@ let
 
       event=button/lid.*
       action=${lidEventHandler} "%e"
+
+      event=ac_adapter.*
+      action=${acEventHandler} "%e"
     '';
 
   # Called when the power button is pressed.
@@ -23,7 +26,6 @@ let
       #! ${pkgs.bash}/bin/sh
       # Suspend to RAM.
       #echo mem > /sys/power/state
-      exit 0
     '';
 
   # Called when the laptop lid is opened/closed.
@@ -38,8 +40,18 @@ let
           sync
           echo mem > /sys/power/state
       fi
+    '';
+
+  # Called when the AC power is connected or disconnected.
+  acEventHandler = pkgs.writeScript "ac-power.sh"
+    ''
+      #! ${pkgs.bash}/bin/sh
 
-      exit 0
+      if grep -q "state:.*on-line" /proc/acpi/ac_adapter/AC/state; then
+         echo performance > /sys/devices/system/cpu/cpu0/cpufreq/scaling_governor
+      elif grep -q "state:.*off-line" /proc/acpi/ac_adapter/AC/state; then
+         echo ondemand > /sys/devices/system/cpu/cpu0/cpufreq/scaling_governor
+      fi
     '';
 
 in
diff --git a/upstart-jobs/default.nix b/upstart-jobs/default.nix
index bd45dda4991..839769d028d 100644
--- a/upstart-jobs/default.nix
+++ b/upstart-jobs/default.nix
@@ -343,7 +343,7 @@ let
     })
 
   # ACPI daemon.
-  ++ optional true /* !!! need some option */
+  ++ optional config.powerManagement.enable
     (import ../upstart-jobs/acpid.nix {
       inherit config pkgs;
     })
-- 
GitLab


From 4dacbc3c794fcb999535a31b0d766d46a7f3d518 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 13 Feb 2009 18:55:38 +0000
Subject: [PATCH 1195/5331] * Generate the acpid configuration properly: each
 config file   can only contain one event.

svn path=/nixos/trunk/; revision=14080
---
 upstart-jobs/acpid.nix | 86 +++++++++++++++++++++++-------------------
 1 file changed, 48 insertions(+), 38 deletions(-)

diff --git a/upstart-jobs/acpid.nix b/upstart-jobs/acpid.nix
index 3a7df58bbaf..e2eb702bcd4 100644
--- a/upstart-jobs/acpid.nix
+++ b/upstart-jobs/acpid.nix
@@ -5,54 +5,64 @@ let
   acpiConfDir = pkgs.runCommand "acpi-events" {}
     ''
       ensureDir $out
-      ln -s ${acpiConfFile} $out/events.conf
+      ${
+        # Generate a .conf file for each event. (You can't have
+        # multiple events in one config file...)
+        let f = event:
+          ''
+            fn=$out/${event.name}.conf
+            echo "event=${event.event}" > $fn
+            echo "action=${pkgs.writeScript "${event.name}.sh" event.action}" >> $fn
+          '';
+        in pkgs.lib.concatMapStrings f events
+      }
     '';
 
-  acpiConfFile = pkgs.writeText "acpi.conf"
-    ''
-      event=button/power.*
-      action=${powerEventHandler} "%e"
-
-      event=button/lid.*
-      action=${lidEventHandler} "%e"
-
-      event=ac_adapter.*
-      action=${acEventHandler} "%e"
-    '';
+  events = [powerEvent lidEvent acEvent];
 
   # Called when the power button is pressed.
-  powerEventHandler = pkgs.writeScript "acpi-power.sh"
-    ''
-      #! ${pkgs.bash}/bin/sh
-      # Suspend to RAM.
-      #echo mem > /sys/power/state
-    '';
+  powerEvent =
+    { name = "power-button";
+      event = "button/power.*";
+      action = 
+        ''
+          #! ${pkgs.bash}/bin/sh
+        '';
+    };
 
   # Called when the laptop lid is opened/closed.
-  lidEventHandler = pkgs.writeScript "acpi-lid.sh"
-    ''
-      #! ${pkgs.bash}/bin/sh
+  lidEvent = 
+    { name = "lid";
+      event = "button/lid.*";
+      action =
+        ''
+          #! ${pkgs.bash}/bin/sh
 
-      # Suspend to RAM if the lid is closed.  (We also get this event
-      # when the lid just opened, in which case we obviously don't
-      # want to suspend again.) 
-      if grep -q closed /proc/acpi/button/lid/LID/state; then
-          sync
-          echo mem > /sys/power/state
-      fi
-    '';
+          # Suspend to RAM if the lid is closed.  (We also get this event
+          # when the lid just opened, in which case we obviously don't
+          # want to suspend again.) 
+          if grep -q closed /proc/acpi/button/lid/LID/state; then
+              sync
+              echo mem > /sys/power/state
+          fi
+        '';
+    };
 
   # Called when the AC power is connected or disconnected.
-  acEventHandler = pkgs.writeScript "ac-power.sh"
-    ''
-      #! ${pkgs.bash}/bin/sh
+  acEvent =
+    { name = "ac-power";
+      event = "ac_adapter.*";
+      action = 
+        ''
+          #! ${pkgs.bash}/bin/sh
 
-      if grep -q "state:.*on-line" /proc/acpi/ac_adapter/AC/state; then
-         echo performance > /sys/devices/system/cpu/cpu0/cpufreq/scaling_governor
-      elif grep -q "state:.*off-line" /proc/acpi/ac_adapter/AC/state; then
-         echo ondemand > /sys/devices/system/cpu/cpu0/cpufreq/scaling_governor
-      fi
-    '';
+          if grep -q "state:.*on-line" /proc/acpi/ac_adapter/AC/state; then
+             echo performance > /sys/devices/system/cpu/cpu0/cpufreq/scaling_governor
+          elif grep -q "state:.*off-line" /proc/acpi/ac_adapter/AC/state; then
+             echo ondemand > /sys/devices/system/cpu/cpu0/cpufreq/scaling_governor
+          fi
+        '';
+    };
 
 in
 
-- 
GitLab


From bcba001e37211050dd81f4bf109a4aaeacc43080 Mon Sep 17 00:00:00 2001
From: Marc Weber <marco-oweber@gmx.de>
Date: Fri, 13 Feb 2009 19:01:13 +0000
Subject: [PATCH 1196/5331] added hint about how to get the swap partion kernel
 node numbers

svn path=/nixos/trunk/; revision=14081
---
 system/options.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/system/options.nix b/system/options.nix
index 92d17926add..2a6498ed80a 100644
--- a/system/options.nix
+++ b/system/options.nix
@@ -81,7 +81,7 @@ in
       example = "0:0";
       description = "
         Device for manual resume attempt during boot. Looks like 
-        major:minor .
+        major:minor. ls -l /dev/SWAP_PARTION shows them.
       ";
     };
 
-- 
GitLab


From c87f67bd28d3ad8025f931261664e38aa94658fe Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 16 Feb 2009 23:53:18 +0000
Subject: [PATCH 1197/5331] * Support for KDE 4.2.  Set
 services.xserver.sessionType to "kde4" to   enable.  It looks great ;-)

svn path=/nixos/trunk/; revision=14089
---
 upstart-jobs/xserver.nix | 22 ++++++++++++++++++++--
 1 file changed, 20 insertions(+), 2 deletions(-)

diff --git a/upstart-jobs/xserver.nix b/upstart-jobs/xserver.nix
index e8c31717002..a2961137d9d 100644
--- a/upstart-jobs/xserver.nix
+++ b/upstart-jobs/xserver.nix
@@ -44,6 +44,7 @@ let
     if wm != "" then wm else
     if sessionType == "gnome" then "metacity" else
     if sessionType == "kde" then "none" /* started by startkde */ else
+    if sessionType == "kde4" then "none" /* started by startkde */ else
     "twm";
 
     
@@ -274,7 +275,7 @@ let
 
     ### Show a background image.
     # (but not if we're starting a full desktop environment that does it for us)
-    ${if sessionType != "kde" then ''
+    ${if sessionType != "kde" && sessionType != "kde4" then ''
     
       if test -e $HOME/.background-image; then
         ${pkgs.feh}/bin/feh --bg-scale $HOME/.background-image
@@ -292,6 +293,14 @@ let
       export XDG_DATA_DIRS=${pkgs.kdebase}/share
       exec ${pkgs.kdebase}/bin/startkde
 
+    '' else if sessionType == "kde4" then ''
+
+      # Start KDE.
+      export KDEDIRS=$HOME/.nix-profile:/nix/var/nix/profiles/default:${pkgs.kde42.kdelibs}:${pkgs.kde42.kdebase}:${pkgs.kde42.kdebase_runtime}:${pkgs.kde42.kdebase_workspace}
+      export XDG_CONFIG_DIRS=${pkgs.kde42.kdelibs}/etc/xdg:${pkgs.kde42.kdebase_runtime}/etc/xdg:${pkgs.kde42.kdebase_workspace}/etc/xdg
+      export XDG_DATA_DIRS=${pkgs.kde42.kdelibs}/share:${pkgs.kde42.kdebase}/share:${pkgs.kde42.kdebase_runtime}/share:${pkgs.kde42.kdebase_workspace}/share:${pkgs.shared_mime_info}/share
+      exec ${pkgs.kde42.kdebase_workspace}/bin/startkde
+
     '' else ''
 
       # For all other session types, we currently just start a
@@ -382,13 +391,22 @@ rec {
     pkgs.kdebase
     xorg.xset # used by startkde, non-essential
   ]
+  ++ optional (sessionType == "kde4") [
+    xorg.xmessage # so that startkde can show error messages
+    pkgs.qt4 # needed for qdbus
+    pkgs.kde42.kdelibs
+    pkgs.kde42.kdebase
+    pkgs.kde42.kdebase_runtime
+    pkgs.kde42.kdebase_workspace
+    xorg.xset # used by startkde, non-essential
+  ]
   ++ optional (videoDriver == "nvidia") [
     kernelPackages.nvidiaDrivers
   ];
 
 
   extraEtc =
-    optional (sessionType == "kde")
+    optional (sessionType == "kde" || sessionType == "kde4")
       { source = "${pkgs.xkeyboard_config}/etc/X11/xkb";
         target = "X11/xkb";
       }
-- 
GitLab


From 53cd42dba61a9718b72974a7fc13efcdebf90c59 Mon Sep 17 00:00:00 2001
From: Marc Weber <marco-oweber@gmx.de>
Date: Thu, 19 Feb 2009 15:12:30 +0000
Subject: [PATCH 1198/5331] commented out theme because url is broken

svn path=/nixos/trunk/; revision=14127
---
 installer/cd-dvd/rescue-cd.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/installer/cd-dvd/rescue-cd.nix b/installer/cd-dvd/rescue-cd.nix
index 66c707c77a7..d069c4351f9 100644
--- a/installer/cd-dvd/rescue-cd.nix
+++ b/installer/cd-dvd/rescue-cd.nix
@@ -148,12 +148,14 @@ rec {
               sha256 = "0sdykpziij1f3w4braq8r8nqg4lnsd7i7gi1k5d7c31m2q3b9a7r";
             };
           }
+          /* url is broken
           { tty = 8;
             theme = pkgs.fetchurl {
               url = http://www.bootsplash.de/files/themes/Theme-GNU.tar.bz2;
               md5 = "61969309d23c631e57b0a311102ef034";
             };
           }
+          */
         ];
       };
 
-- 
GitLab


From 018c99ec1c70b655e5501ae4cf7c4a2856af4162 Mon Sep 17 00:00:00 2001
From: Marc Weber <marco-oweber@gmx.de>
Date: Thu, 19 Feb 2009 15:12:39 +0000
Subject: [PATCH 1199/5331] added sshfsFuse and screen to rescue-cd.nix

sshsfsFuse so that you can get packages from another machine easily
screen so that you can copy paste easily

svn path=/nixos/trunk/; revision=14128
---
 installer/cd-dvd/rescue-cd.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/installer/cd-dvd/rescue-cd.nix b/installer/cd-dvd/rescue-cd.nix
index d069c4351f9..2b82df15fe3 100644
--- a/installer/cd-dvd/rescue-cd.nix
+++ b/installer/cd-dvd/rescue-cd.nix
@@ -190,6 +190,9 @@ rec {
         pkgs.gdb # for debugging Nix
         pkgs.testdisk # useful for repairing boot problems
         pkgs.mssys # for writing Microsoft boot sectors / MBRs
+
+        pkgs.sshfsFuse
+        pkgs.screen
       ];
     };
    
-- 
GitLab


From a2a092db87d4902177a7d8d9db0e5503c1bce8f5 Mon Sep 17 00:00:00 2001
From: Marc Weber <marco-oweber@gmx.de>
Date: Thu, 19 Feb 2009 15:40:53 +0000
Subject: [PATCH 1200/5331] added possibility make nixos-install not downlooad
 the manifest

do so by export NIXOS_PULL=0 (same as in nixos-rebuild)

svn path=/nixos/trunk/; revision=14129
---
 installer/nixos-install.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/installer/nixos-install.sh b/installer/nixos-install.sh
index 1288304cbe0..1784b4357f1 100644
--- a/installer/nixos-install.sh
+++ b/installer/nixos-install.sh
@@ -131,7 +131,7 @@ export NIX_OTHER_STORES=/mnt/nix:$NIX_OTHER_STORES
 
 
 # Do a nix-pull to speed up building.
-if test -n "@nixpkgsURL@"; then
+if test -n "@nixpkgsURL@" -a ${NIXOS_PULL:-1} != 0; then
     chroot $mountPoint @nix@/bin/nix-pull @nixpkgsURL@/MANIFEST || true
 fi
 
-- 
GitLab


From e9b6d417a6eeebb3d17e9e0150d482d59070a1b8 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 20 Feb 2009 11:10:17 +0000
Subject: [PATCH 1201/5331] * Include the SVN revision in the ISO name.

svn path=/nixos/trunk/; revision=14138
---
 release.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/release.nix b/release.nix
index 4612e94ded9..d291e21b8dd 100644
--- a/release.nix
+++ b/release.nix
@@ -54,6 +54,7 @@ let
           platform = system;
           compressImage = true;
           nixpkgsPath = nixpkgs.path;
+          relName = "nixos-${builtins.readFile ./VERSION}${if !officialRelease then "pre${toString nixosSrc.rev}" else ""}";
         }).rescueCD;
 
       in
-- 
GitLab


From 049c60e8c0656e7750b71930a559e78f5345f1cb Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 20 Feb 2009 15:11:07 +0000
Subject: [PATCH 1202/5331] * Quick hack to make sure that acpid starts before
 hal.

svn path=/nixos/trunk/; revision=14139
---
 upstart-jobs/default.nix | 1 +
 upstart-jobs/hal.nix     | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/upstart-jobs/default.nix b/upstart-jobs/default.nix
index 839769d028d..f804240a50b 100644
--- a/upstart-jobs/default.nix
+++ b/upstart-jobs/default.nix
@@ -363,6 +363,7 @@ let
   ++ optional config.services.hal.enable
     (import ../upstart-jobs/hal.nix {
       inherit (pkgs) stdenv hal;
+      inherit config;
     })
 
   ++ optional config.services.gpm.enable 
diff --git a/upstart-jobs/hal.nix b/upstart-jobs/hal.nix
index 0fa47bf5eeb..8b59c079eb8 100644
--- a/upstart-jobs/hal.nix
+++ b/upstart-jobs/hal.nix
@@ -1,4 +1,4 @@
-{stdenv, hal}:
+{stdenv, hal, config}:
 
 {
   name = "hal";
@@ -23,7 +23,7 @@
 
     # !!! TODO: make sure that HAL starts after acpid,
     # otherwise hald-addon-acpi will grab /proc/acpi/event.
-    start on dbus
+    start on ${if config.powerManagement.enable then "acpid" else "dbus"}
     stop on shutdown
 
     start script
-- 
GitLab


From 311ff6c8e706c47d17cb417432060d1db79c7401 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 20 Feb 2009 16:31:42 +0000
Subject: [PATCH 1203/5331] * Set KDEDIRS, XDG_CONFIG_DIRS and XDG_DATA_DIRS in
 bashrc.  This has   the advantage that KDE applications work when logging in
 via ssh,   and that you don't need to logout to have KDE upgrades take
 effect.   On the downside, since the various KDE packages and
 shared-mime-info   all have their own MIME databases, if we put them in one
 symlink   tree (systemPath), we need to rerun update-mime-database on the  
 symlink tree.  Also, systemPath is getting very large.

svn path=/nixos/trunk/; revision=14148
---
 etc/bashrc.sh            | 10 +++++++++-
 system/options.nix       |  2 +-
 system/system.nix        | 17 +++++++++++++----
 upstart-jobs/xserver.nix |  5 ++---
 4 files changed, 25 insertions(+), 9 deletions(-)

diff --git a/etc/bashrc.sh b/etc/bashrc.sh
index 4ec3b4ab415..baaed726ee1 100644
--- a/etc/bashrc.sh
+++ b/etc/bashrc.sh
@@ -15,6 +15,9 @@ export LANG=@defaultLocale@
 export EDITOR=nano
 export INFOPATH=/var/run/current-system/sw/info:/var/run/current-system/sw/share/info
 export LOCATE_PATH=/var/cache/locatedb
+export KDEDIRS=/var/run/current-system/sw
+export XDG_CONFIG_DIRS=/var/run/current-system/sw/etc/xdg
+export XDG_DATA_DIRS=/var/run/current-system/sw/share
 
 
 # Set up secure multi-user builds: non-root users build through the
@@ -41,7 +44,7 @@ for i in $NIX_PROFILES; do # !!! reverse
     export PKG_CONFIG_PATH="$i/lib/pkgconfig:$PKG_CONFIG_PATH"
 
     # Automake's `aclocal' bails out if it finds non-existent directories
-    # in its path.
+    # in its path.  !!! We should fix aclocal instead.
     if [ -d "$i/share/aclocal" ]
     then
 	export ACLOCAL_PATH="$i/share/aclocal:$ACLOCAL_PATH"
@@ -50,6 +53,11 @@ for i in $NIX_PROFILES; do # !!! reverse
 
     # GStreamer.
     export GST_PLUGIN_PATH="$i/lib/gstreamer-0.10:$GST_PLUGIN_PATH"
+
+    # KDE/Gnome stuff.
+    export KDEDIRS=$i:$KDEDIRS
+    export XDG_CONFIG_DIRS=$i/etc/xdg:$XDG_CONFIG_DIRS
+    export XDG_DATA_DIRS=$i/share:$XDG_DATA_DIRS
 done
 
 
diff --git a/system/options.nix b/system/options.nix
index 2a6498ed80a..a2952b4a325 100644
--- a/system/options.nix
+++ b/system/options.nix
@@ -2959,7 +2959,7 @@ root        ALL=(ALL) SETENV: ALL
   environment = {
 
     pathsToLink = mkOption {
-      default = ["/bin" "/sbin" "/lib" "/share" "/man" "/info"];
+      default = ["/bin" "/sbin" "/lib" "/share" "/man" "/info" "/etc"];
       example = ["/"];
       description = "
         Lists directories to be symlinked in `/var/run/current-system/sw'.
diff --git a/system/system.nix b/system/system.nix
index 7d814993844..913913db9af 100644
--- a/system/system.nix
+++ b/system/system.nix
@@ -266,6 +266,15 @@ rec {
     inherit (config.environment) pathsToLink;
 
     ignoreCollisions = true;
+
+    postBuild =
+      if config.services.xserver.sessionType == "kde4" then
+        # Rebuild the MIME database.  Otherwise KDE won't be able to
+        # find many MIME types.
+        ''
+          ${pkgs.shared_mime_info}/bin/update-mime-database $out/share/mime
+        ''
+      else "";
   };
 
 
@@ -301,10 +310,10 @@ rec {
     inherit (usersGroups) createUsersGroups usersList groupsList;
 
     path = [
-        pkgs.coreutils pkgs.gnugrep pkgs.findutils
-        pkgs.glibc # needed for getent
-        pkgs.pwdutils
-      ];
+      pkgs.coreutils pkgs.gnugrep pkgs.findutils
+      pkgs.glibc # needed for getent
+      pkgs.pwdutils
+    ];
 
     adjustSetuidOwner = pkgs.lib.concatStrings (map 
       (_entry: let entry = {
diff --git a/upstart-jobs/xserver.nix b/upstart-jobs/xserver.nix
index a2961137d9d..c889c6427a9 100644
--- a/upstart-jobs/xserver.nix
+++ b/upstart-jobs/xserver.nix
@@ -296,9 +296,6 @@ let
     '' else if sessionType == "kde4" then ''
 
       # Start KDE.
-      export KDEDIRS=$HOME/.nix-profile:/nix/var/nix/profiles/default:${pkgs.kde42.kdelibs}:${pkgs.kde42.kdebase}:${pkgs.kde42.kdebase_runtime}:${pkgs.kde42.kdebase_workspace}
-      export XDG_CONFIG_DIRS=${pkgs.kde42.kdelibs}/etc/xdg:${pkgs.kde42.kdebase_runtime}/etc/xdg:${pkgs.kde42.kdebase_workspace}/etc/xdg
-      export XDG_DATA_DIRS=${pkgs.kde42.kdelibs}/share:${pkgs.kde42.kdebase}/share:${pkgs.kde42.kdebase_runtime}/share:${pkgs.kde42.kdebase_workspace}/share:${pkgs.shared_mime_info}/share
       exec ${pkgs.kde42.kdebase_workspace}/bin/startkde
 
     '' else ''
@@ -398,6 +395,8 @@ rec {
     pkgs.kde42.kdebase
     pkgs.kde42.kdebase_runtime
     pkgs.kde42.kdebase_workspace
+    pkgs.kde42.kdegames
+    pkgs.shared_mime_info
     xorg.xset # used by startkde, non-essential
   ]
   ++ optional (videoDriver == "nvidia") [
-- 
GitLab


From 95ef8b16941c3da6a5144bfd8d7b1345eb0d5e3f Mon Sep 17 00:00:00 2001
From: Nicolas Pierron <nicolas.b.pierron@gmail.com>
Date: Sun, 22 Feb 2009 16:06:27 +0000
Subject: [PATCH 1204/5331] Option for proxy usage in Nix daemon

Signed-off-by: Nicolas Pierron <nicolas.pierron@lrde.epita.fr>

svn path=/nixos/branches/fix-style/; revision=14156
---
 system/options.nix | 21 ++++++++++++++++++++-
 1 file changed, 20 insertions(+), 1 deletion(-)

diff --git a/system/options.nix b/system/options.nix
index 7c4b5def367..dfb1019d864 100644
--- a/system/options.nix
+++ b/system/options.nix
@@ -1933,6 +1933,16 @@ in
         on the remote machine.
       ";
     };
+ 
+    proxy = mkOption {
+      default = "";
+      description = "
+        This option specifies the proxy to use for fetchurl. The real effect 
+        is just exporting http_proxy, https_proxy and ftp_proxy with that
+        value.
+      ";
+      example = "http://127.0.0.1:3128";
+    };
 
     # Environment variables for running Nix.
     envVars = mkOption {
@@ -1962,7 +1972,16 @@ in
           export NIX_REMOTE_SYSTEMS=/etc/nix.machines
           export NIX_CURRENT_LOAD=/var/run/nix/current-load
         ''
-      else "") + conf;
+      else "")
+      +
+      (if config.nix.proxy != "" then
+        ''
+          export http_proxy=${config.nix.proxy}
+          export https_proxy=${config.nix.proxy}
+          export ftp_proxy=${config.nix.proxy}
+        ''
+      else "")
+      + conf;
     };
   };
 
-- 
GitLab


From fc6d48ef6387b420a85fbbaf124dec46e73a2ae8 Mon Sep 17 00:00:00 2001
From: Nicolas Pierron <nicolas.b.pierron@gmail.com>
Date: Sun, 22 Feb 2009 16:06:32 +0000
Subject: [PATCH 1205/5331] Allowing direct package use in manual expression

svn path=/nixos/branches/fix-style/; revision=14157
---
 doc/manual/default.nix | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/doc/manual/default.nix b/doc/manual/default.nix
index a7f51adf287..56657aec2e2 100644
--- a/doc/manual/default.nix
+++ b/doc/manual/default.nix
@@ -1,8 +1,10 @@
-{nixpkgsPath ? ../../../nixpkgs}:
+{nixpkgsPath ? ../../../nixpkgs, pkgs ? null}:
 
 let
 
-  pkgs = import "${nixpkgsPath}/pkgs/top-level/all-packages.nix" {};
+  pkgs = if pkgs == null then 
+    import "${nixpkgsPath}/pkgs/top-level/all-packages.nix" {}
+  else pkgs;
 
   options = builtins.toFile "options.xml" (builtins.unsafeDiscardStringContext
     (builtins.toXML (pkgs.lib.optionAttrSetToDocList ""
-- 
GitLab


From b1eabe2b1b14b9b46abc5e2a0e530cf3b4dbf15b Mon Sep 17 00:00:00 2001
From: Nicolas Pierron <nicolas.b.pierron@gmail.com>
Date: Sun, 22 Feb 2009 16:06:42 +0000
Subject: [PATCH 1206/5331] An upstart job to display manual

svn path=/nixos/branches/fix-style/; revision=14158
---
 doc/manual/default.nix  |  6 +--
 system/options.nix      |  1 +
 system/system.nix       |  5 ++-
 upstart-jobs/manual.nix | 87 +++++++++++++++++++++++++++++++++++++++++
 4 files changed, 95 insertions(+), 4 deletions(-)
 create mode 100644 upstart-jobs/manual.nix

diff --git a/doc/manual/default.nix b/doc/manual/default.nix
index 56657aec2e2..c46e89d0fa1 100644
--- a/doc/manual/default.nix
+++ b/doc/manual/default.nix
@@ -1,10 +1,10 @@
-{nixpkgsPath ? ../../../nixpkgs, pkgs ? null}:
+{nixpkgsPath ? ../../../nixpkgs, nixpkgs ? null}:
 
 let
 
-  pkgs = if pkgs == null then 
+  pkgs = if nixpkgs == null then 
     import "${nixpkgsPath}/pkgs/top-level/all-packages.nix" {}
-  else pkgs;
+  else nixpkgs;
 
   options = builtins.toFile "options.xml" (builtins.unsafeDiscardStringContext
     (builtins.toXML (pkgs.lib.optionAttrSetToDocList ""
diff --git a/system/options.nix b/system/options.nix
index dfb1019d864..f8f07bb4b2f 100644
--- a/system/options.nix
+++ b/system/options.nix
@@ -2245,6 +2245,7 @@ in
     (import ../upstart-jobs/cron.nix)
     (import ../upstart-jobs/fcron.nix)
     (import ../upstart-jobs/cron/locate.nix)
+    (import ../upstart-jobs/manual.nix)
 
     # fonts
     (import ../system/fonts.nix)
diff --git a/system/system.nix b/system/system.nix
index 78b6a0a6dee..bfa81c5566a 100644
--- a/system/system.nix
+++ b/system/system.nix
@@ -1,6 +1,7 @@
 { platform ? __currentSystem
 , configuration
 , nixpkgsPath ? ../../nixpkgs
+, nixpkgs ? null
 }:
 
 rec {
@@ -24,7 +25,9 @@ rec {
       pkgs configComponents
       config;
 
-  pkgs = import "${nixpkgsPath}/pkgs/top-level/all-packages.nix" {system = platform;};
+  pkgs = if nixpkgs == null then 
+    import "${nixpkgsPath}/pkgs/top-level/all-packages.nix" {system = platform;}
+  else nixpkgs;
 
   manifests = config.installer.manifests; # exported here because nixos-rebuild uses it
 
diff --git a/upstart-jobs/manual.nix b/upstart-jobs/manual.nix
new file mode 100644
index 00000000000..5d658ce7681
--- /dev/null
+++ b/upstart-jobs/manual.nix
@@ -0,0 +1,87 @@
+{pkgs, config}: 
+
+# Show the NixOS manual on tty7
+# Originally used only by installation CD
+
+let
+  inherit (pkgs.lib) mkOption;
+  options = {
+    services = {
+      showManual = {
+        enable = mkOption {
+	  default = false;
+	  description = "
+	    Whether to show the NixOS manual on the tty7
+	  ";
+	};
+	ttyNumber = mkOption {
+	  default = "7";
+	  description = "
+	    TTY number name to show the manual on
+	  ";
+	};
+	browserPackage = mkOption {
+	  default = pkgs.w3m;
+	  description = "
+	    Package containing the browser to be used
+	  ";
+	};
+	browserCommand = mkOption {
+	  default = "bin/w3m";
+	  description = "
+	    Command (command path is relative to browserPackage) to run the browser
+	  ";
+	};
+	manualFile = mkOption {
+	  default = null; 
+	  description = "
+	    NixOS manual HTML file
+	  ";
+	};
+      };
+    };
+  };
+
+inherit(pkgs.lib) optional;
+
+inherit (config.services.showManual) enable ttyNumber browserPackage browserCommand 
+  manualFile;
+	  
+realManualFile = if manualFile == null then 
+  (import ../doc/manual {nixpkgs = pkgs;})+"/manual.html"
+else manualFile;
+
+in
+
+{
+  require = [
+    options
+  ];
+
+  boot = {
+    extraTTYs = optional enable ttyNumber;
+  };
+  
+  services = {
+    extraJobs = optional enable {
+      name = "showManual";
+
+      job = ''
+        description "NixOS manual"
+	
+	start on udev
+	stop on shutdown
+	respawn ${browserPackage}/${browserCommand} ${realManualFile} < /dev/tty${toString ttyNumber} > /dev/tty${toString ttyNumber} 2>&1
+      '';
+    };
+    ttyBackgrounds = {
+      specificThemes = optional enable {
+        tty = ttyNumber;
+	theme = pkgs.themes "green";
+      };
+    };
+    mingetty = {
+      helpLine = if enable then "\nPress <Alt-F${toString ttyNumber}> for NixOS manual." else "";
+    };
+  };
+}
-- 
GitLab


From f824a1e7531d8a8695ae2a45e0e6f609cf2ee8a1 Mon Sep 17 00:00:00 2001
From: Nicolas Pierron <nicolas.b.pierron@gmail.com>
Date: Sun, 22 Feb 2009 16:06:47 +0000
Subject: [PATCH 1207/5331] Added rogue job used by CD

svn path=/nixos/branches/fix-style/; revision=14159
---
 system/options.nix     |  1 +
 upstart-jobs/rogue.nix | 64 ++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 65 insertions(+)
 create mode 100644 upstart-jobs/rogue.nix

diff --git a/system/options.nix b/system/options.nix
index f8f07bb4b2f..67ed93fb30f 100644
--- a/system/options.nix
+++ b/system/options.nix
@@ -2246,6 +2246,7 @@ in
     (import ../upstart-jobs/fcron.nix)
     (import ../upstart-jobs/cron/locate.nix)
     (import ../upstart-jobs/manual.nix)
+    (import ../upstart-jobs/rogue.nix)
 
     # fonts
     (import ../system/fonts.nix)
diff --git a/upstart-jobs/rogue.nix b/upstart-jobs/rogue.nix
new file mode 100644
index 00000000000..75b1a0a9882
--- /dev/null
+++ b/upstart-jobs/rogue.nix
@@ -0,0 +1,64 @@
+{pkgs, config}: 
+
+# Show rogue game on tty8
+# Originally used only by installation CD
+
+let
+  inherit (pkgs.lib) mkOption;
+  options = {
+    services = {
+      rogue = {
+        enable = mkOption {
+	  default = false;
+	  description = "
+	    Whether to run rogue
+	  ";
+	};
+	ttyNumber = mkOption {
+	  default = "8";
+	  description = "
+	    TTY number name to show the manual on
+	  ";
+	};
+      };
+    };
+  };
+
+inherit (pkgs.lib) optional;
+
+inherit (config.services.rogue) enable ttyNumber;
+
+in
+
+{
+  require = [
+    options
+  ];
+
+  boot = {
+    extraTTYs = optional enable ttyNumber;
+  };
+  
+  services = {
+    extraJobs = optional enable {
+      name = "rogue";
+
+      job = ''
+        description "rogue game"
+	
+	start on udev
+	stop on shutdown
+	respawn ${pkgs.rogue}/bin/rogue < /dev/tty${toString ttyNumber} > /dev/tty${toString ttyNumber} 2>&1
+      '';
+    };
+    ttyBackgrounds = {
+      specificThemes = optional enable {
+        tty = ttyNumber;
+	theme = pkgs.themes "theme-gnu";
+      };
+    };
+    mingetty = {
+      helpLine = if enable then "\nPress <Alt-F${toString ttyNumber}> to play rogue." else "";
+    };
+  };
+}
-- 
GitLab


From d5f341850787885b02a960450b3638200bad8fe6 Mon Sep 17 00:00:00 2001
From: Nicolas Pierron <nicolas.b.pierron@gmail.com>
Date: Sun, 22 Feb 2009 16:06:52 +0000
Subject: [PATCH 1208/5331] Added guestUsers job for automatical adding guests

svn path=/nixos/branches/fix-style/; revision=14160
---
 system/options.nix           |  1 +
 upstart-jobs/guest-users.nix | 76 ++++++++++++++++++++++++++++++++++++
 2 files changed, 77 insertions(+)
 create mode 100644 upstart-jobs/guest-users.nix

diff --git a/system/options.nix b/system/options.nix
index 67ed93fb30f..d1748f16f7f 100644
--- a/system/options.nix
+++ b/system/options.nix
@@ -2247,6 +2247,7 @@ in
     (import ../upstart-jobs/cron/locate.nix)
     (import ../upstart-jobs/manual.nix)
     (import ../upstart-jobs/rogue.nix)
+    (import ../upstart-jobs/guest-users.nix)
 
     # fonts
     (import ../system/fonts.nix)
diff --git a/upstart-jobs/guest-users.nix b/upstart-jobs/guest-users.nix
new file mode 100644
index 00000000000..98fc8a39568
--- /dev/null
+++ b/upstart-jobs/guest-users.nix
@@ -0,0 +1,76 @@
+{pkgs, config}: 
+let
+  inherit(pkgs.lib) mkOption;
+
+  options = {
+    services = {
+      guestUsers = {
+        enable = mkOption {
+	  default = false;
+	  description = "
+	    Whether to enable automatic addition of users with empty passwords
+	  ";
+	};
+	users = mkOption {
+	  default = ["guest"];
+	  description = "
+	    List of usernames to add
+	  ";
+	};
+	includeRoot = mkOption {
+	  default = false;
+	  description = "
+	    LEAVE THAT ALONE; whether to reset root password
+	  ";
+	};
+	extraGroups = mkOption {
+	  default = ["audio"];
+	  description = "
+	    Extra groups to grant
+	  ";
+	};
+      };
+    };
+  };
+  inherit (pkgs.lib) concatStringsSep optional optionalString;
+
+  inherit (config.services.guestUsers) enable users includeRoot extraGroups;
+
+  userEntry = user:
+  {
+    name = user;
+    description = "NixOS guest user";
+    home = "/home/${user}";
+    createHome = true;
+    group = "users";
+    extraGroups = extraGroups;
+    shell = "/bin/sh";
+  };
+
+  nameString = (concatStringsSep " " users) + optionalString includeRoot " root";
+
+in 
+
+{
+  require = options;
+  services = {
+    extraJobs = optional enable {
+      name = "clear-passwords";
+      job = ''
+        description "Clear guest passwords"
+	start on startup
+	script
+	  for i in ${nameString}; do
+	      echo | ${pkgs.pwdutils}/bin/passwd --stdin $i
+	  done
+	end script
+      '';
+    };
+    mingetty = {
+      helpLine = optionalString enable "\nThis users have empty passwords: ${nameString}";
+    };
+  };
+  users = {
+    extraUsers = map userEntry users;
+  };
+}
-- 
GitLab


From 2e4c1b138fa05ff2e34891d896307b76857f00be Mon Sep 17 00:00:00 2001
From: Nicolas Pierron <nicolas.b.pierron@gmail.com>
Date: Sun, 22 Feb 2009 16:06:57 +0000
Subject: [PATCH 1209/5331] * Include tune2fs in the initrd.  This is useful
 for   (say) converting from ext3 to ext4.

svn path=/nixos/branches/fix-style/; revision=14161
---
 boot/boot-stage-1.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/boot/boot-stage-1.nix b/boot/boot-stage-1.nix
index 8a5b0a76a3a..b1fcbd9d76f 100644
--- a/boot/boot-stage-1.nix
+++ b/boot/boot-stage-1.nix
@@ -72,7 +72,7 @@ rec {
         cp $lvm2/sbin/lvm.static $out/bin/lvm
       fi
       cp $utillinux/bin/mount $utillinux/bin/umount $utillinux/sbin/pivot_root $out/bin
-      cp -p $e2fsprogs/sbin/fsck* $e2fsprogs/sbin/e2fsck $out/bin
+      cp -p $e2fsprogs/sbin/fsck* $e2fsprogs/sbin/e2fsck $e2fsprogs/sbin/tune2fs $out/bin
       cp $udev/sbin/udevd $udev/sbin/udevadm $out/bin
       cp $udev/lib/udev/*_id $out/bin
       nuke-refs $out/bin/*
-- 
GitLab


From 46f1cab80f4878c335d5b4db6650cf1374931632 Mon Sep 17 00:00:00 2001
From: Nicolas Pierron <nicolas.b.pierron@gmail.com>
Date: Sun, 22 Feb 2009 16:07:01 +0000
Subject: [PATCH 1210/5331] Added Apache Tomcat proxy to new Apache upstart
 service

svn path=/nixos/branches/fix-style/; revision=14162
---
 .../apache-httpd/tomcat-connector.nix         | 91 +++++++++++++++++++
 1 file changed, 91 insertions(+)
 create mode 100644 upstart-jobs/apache-httpd/tomcat-connector.nix

diff --git a/upstart-jobs/apache-httpd/tomcat-connector.nix b/upstart-jobs/apache-httpd/tomcat-connector.nix
new file mode 100644
index 00000000000..d1186da43fb
--- /dev/null
+++ b/upstart-jobs/apache-httpd/tomcat-connector.nix
@@ -0,0 +1,91 @@
+{config, pkgs, serverInfo}:
+
+let
+  workersProperties = pkgs.writeText "workers.properties" ''
+# Define list of workers that will be used
+# for mapping requests
+# The configuration directives are valid
+# for the mod_jk version 1.2.18 and later
+#
+worker.list=loadbalancer,status
+
+# Define Node1
+# modify the host as your host IP or DNS name.
+worker.node1.port=8009
+worker.node1.host=localhost
+worker.node1.type=ajp13
+worker.node1.lbfactor=1
+
+# Load-balancing behaviour
+worker.loadbalancer.type=lb
+worker.loadbalancer.balance_workers=node1
+
+# Status worker for managing load balancer
+worker.status.type=status
+  '';
+in
+{
+  extraModules = [
+    { name = "jk"; path = "${pkgs.tomcat_connectors}/modules/mod_jk.so"; }
+  ];
+
+  extraConfig = ''
+# Where to find workers.properties
+JkWorkersFile ${workersProperties}
+
+# Where to put jk logs
+JkLogFile ${config.logDir}/mod_jk.log
+
+# Set the jk log level [debug/error/info]
+JkLogLevel info
+
+# Select the log format
+JkLogStampFormat "[%a %b %d %H:%M:%S %Y]"
+
+# JkOptions indicates to send SSK KEY SIZE
+# Note: Changed from +ForwardURICompat. 
+# See http://tomcat.apache.org/security-jk.html  
+JkOptions +ForwardKeySize +ForwardURICompatUnparsed -ForwardDirectories
+
+# JkRequestLogFormat
+JkRequestLogFormat "%w %V %T"
+
+# Mount your applications
+JkMount /__application__/* loadbalancer
+
+# You can use external file for mount points.
+# It will be checked for updates each 60 seconds.
+# The format of the file is: /url=worker
+# /examples/*=loadbalancer
+#JkMountFile uriworkermap.properties
+
+# Add shared memory.
+# This directive is present with 1.2.10 and
+# later versions of mod_jk, and is needed for
+# for load balancing to work properly
+# Note: Replaced JkShmFile logs/jk.shm due to SELinux issues. Refer to 
+# https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=225452
+JkShmFile ${config.stateDir}/jk.shm
+
+# Static files in all Tomcat webapp context directories are served by apache
+JkAutoAlias /var/tomcat/webapps
+    
+# All requests go to worker by default
+JkMount /* loadbalancer
+# Serve some static files using httpd
+JkUnMount /*.html loadbalancer
+JkUnMount /*.jpg  loadbalancer
+JkUnMount /*.gif  loadbalancer
+JkUnMount /*.css  loadbalancer
+JkUnMount /*.png  loadbalancer
+JkUnMount /*.js  loadbalancer
+
+# Add jkstatus for managing runtime data
+<Location /jkstatus/>
+JkMount status
+Order deny,allow
+Deny from all
+Allow from 127.0.0.1
+</Location>
+  '';
+}
-- 
GitLab


From 33445eb22172545cede0f750ff67fcf081295400 Mon Sep 17 00:00:00 2001
From: Nicolas Pierron <nicolas.b.pierron@gmail.com>
Date: Sun, 22 Feb 2009 16:07:05 +0000
Subject: [PATCH 1211/5331] * CUPS daemon: modprobe usblp so that CUPS can find
 USB printers. * CUPS daemon: use Ghostscript to support printing on
 non-Postscript   printers.

svn path=/nixos/branches/fix-style/; revision=14163
---
 upstart-jobs/cupsd.nix   | 19 ++++++++++++++++---
 upstart-jobs/default.nix |  2 +-
 2 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/upstart-jobs/cupsd.nix b/upstart-jobs/cupsd.nix
index 1afd9aae4c2..d67fc384324 100644
--- a/upstart-jobs/cupsd.nix
+++ b/upstart-jobs/cupsd.nix
@@ -1,4 +1,4 @@
-{config, pkgs}:
+{config, pkgs, modprobe}:
 
 let
 
@@ -16,16 +16,24 @@ let
   bindir = pkgs.runCommand "cups-progs" {} ''
     ensureDir $out/lib/cups
     ln -s ${cups}/lib/cups/* $out/lib/cups/
-    
+
+    # Provide support for printing via SMB.    
     rm $out/lib/cups/backend
     ensureDir $out/lib/cups/backend
     ln -s ${cups}/lib/cups/backend/* $out/lib/cups/backend/
     ln -s ${pkgs.samba}/bin/smbspool $out/lib/cups/backend/smb
+
+    # Provide Ghostscript rasterisation, necessary for non-Postscript
+    # printers.
+    rm $out/lib/cups/filter
+    ensureDir $out/lib/cups/filter
+    ln -s ${cups}/lib/cups/filter/* $out/lib/cups/filter/
+    ln -s ${pkgs.ghostscript}/lib/cups/filter/* $out/lib/cups/filter/
   ''; # */
   
 
   cupsdConfig = pkgs.writeText "cupsd.conf" ''
-    LogLevel info
+    LogLevel debug
 
     SystemGroup root
 
@@ -96,6 +104,8 @@ in
   extraPath = [
     cups
   ];
+
+  
   
   job = ''
     description "CUPS printing daemon"
@@ -107,6 +117,9 @@ in
         mkdir -m 0755 -p ${logDir}
         mkdir -m 0700 -p /var/cache/cups
         mkdir -m 0700 -p /var/spool/cups
+
+        # Make USB printers show up.
+        ${modprobe}/sbin/modprobe usblp || true
     end script
 
     respawn ${cups}/sbin/cupsd -c ${cupsdConfig} -F
diff --git a/upstart-jobs/default.nix b/upstart-jobs/default.nix
index f66d1106622..9fbef07ce5d 100644
--- a/upstart-jobs/default.nix
+++ b/upstart-jobs/default.nix
@@ -326,7 +326,7 @@ let
   # CUPS (printing) daemon.
   ++ optional config.services.printing.enable
     (import ../upstart-jobs/cupsd.nix {
-      inherit config pkgs;
+      inherit config pkgs modprobe;
     })
 
   # Gateway6
-- 
GitLab


From 41b1b80d9ebebcf21bdd58851af464e6134da9f9 Mon Sep 17 00:00:00 2001
From: Nicolas Pierron <nicolas.b.pierron@gmail.com>
Date: Sun, 22 Feb 2009 16:07:10 +0000
Subject: [PATCH 1212/5331] * Quick hack to make the `info' command work
 properly by generating   a "dir" file on the fly in a wrapper script.

svn path=/nixos/branches/fix-style/; revision=14164
---
 helpers/info-wrapper.nix | 29 +++++++++++++++++++++++++++++
 system/system.nix        |  1 +
 2 files changed, 30 insertions(+)
 create mode 100644 helpers/info-wrapper.nix

diff --git a/helpers/info-wrapper.nix b/helpers/info-wrapper.nix
new file mode 100644
index 00000000000..0f482dd4c27
--- /dev/null
+++ b/helpers/info-wrapper.nix
@@ -0,0 +1,29 @@
+# Quick hack to make the `info' command work properly.  `info' needs a
+# "dir" file containing all the installed Info files, which we don't
+# have (it would be impure to have a package installation update some
+# global "dir" file).  So this wrapper script around "info" builds a
+# temporary "dir" file on the fly.  This is a bit slow (on a cold
+# cache) but not unacceptably so.
+
+{bash, texinfo, writeScriptBin}:
+
+writeScriptBin "info"
+  ''
+    #! ${bash}/bin/sh
+  
+    dir=$(mktemp --tmpdir -d "info.dir.XXXXXX")
+
+    if test -z "$dir"; then exit 1; fi
+
+    trap 'rm -rf "$dir"' EXIT
+
+    shopt -s nullglob
+
+    for i in $(IFS=:; echo $INFOPATH); do
+        for j in $i/*.info; do
+            ${texinfo}/bin/install-info --quiet $j $dir/dir
+        done
+    done
+
+    INFOPATH=$dir:$INFOPATH ${texinfo}/bin/info "$@"
+  ''
diff --git a/system/system.nix b/system/system.nix
index bfa81c5566a..570ba91c96f 100644
--- a/system/system.nix
+++ b/system/system.nix
@@ -153,6 +153,7 @@ rec {
         pkgs.usbutils
         pkgs.utillinux
         pkgs.wirelesstools
+        (import ../helpers/info-wrapper.nix {inherit (pkgs) bash texinfo writeScriptBin;})
       ]
       ++ pkgs.lib.optional config.services.bitlbee.enable pkgs.bitlbee
       ++ pkgs.lib.optional config.networking.defaultMailServer.directDelivery pkgs.ssmtp 
-- 
GitLab


From 6b1307c6f1e21f6b41932f62da01a246d74ce594 Mon Sep 17 00:00:00 2001
From: Nicolas Pierron <nicolas.b.pierron@gmail.com>
Date: Sun, 22 Feb 2009 16:07:16 +0000
Subject: [PATCH 1213/5331] * Remove a stale lock file that may prevent the   X
 server from starting.

svn path=/nixos/branches/fix-style/; revision=14165
---
 upstart-jobs/xserver/default.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/upstart-jobs/xserver/default.nix b/upstart-jobs/xserver/default.nix
index 0a7a70c7175..33f7542ad04 100644
--- a/upstart-jobs/xserver/default.nix
+++ b/upstart-jobs/xserver/default.nix
@@ -545,7 +545,9 @@ mkIf cfg.enable {
            }
 
           ${cfg.displayManager.job.beforeScript}
-          
+
+          rm -f /tmp/.X0-lock
+
         end script
 
         ${cfg.displayManager.job.env}
-- 
GitLab


From 08a18fc8633b0e1dd003e1311c8cb572e1313d30 Mon Sep 17 00:00:00 2001
From: Nicolas Pierron <nicolas.b.pierron@gmail.com>
Date: Sun, 22 Feb 2009 16:07:21 +0000
Subject: [PATCH 1214/5331] Update argument syntax of configuration files.

svn path=/nixos/branches/fix-style/; revision=14166
---
 upstart-jobs/guest-users.nix | 2 +-
 upstart-jobs/manual.nix      | 2 +-
 upstart-jobs/rogue.nix       | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/upstart-jobs/guest-users.nix b/upstart-jobs/guest-users.nix
index 98fc8a39568..bfd83619c0e 100644
--- a/upstart-jobs/guest-users.nix
+++ b/upstart-jobs/guest-users.nix
@@ -1,4 +1,4 @@
-{pkgs, config}: 
+{pkgs, config, ...}: 
 let
   inherit(pkgs.lib) mkOption;
 
diff --git a/upstart-jobs/manual.nix b/upstart-jobs/manual.nix
index 5d658ce7681..c515e95d3dd 100644
--- a/upstart-jobs/manual.nix
+++ b/upstart-jobs/manual.nix
@@ -1,4 +1,4 @@
-{pkgs, config}: 
+{pkgs, config, ...}: 
 
 # Show the NixOS manual on tty7
 # Originally used only by installation CD
diff --git a/upstart-jobs/rogue.nix b/upstart-jobs/rogue.nix
index 75b1a0a9882..0306033adc0 100644
--- a/upstart-jobs/rogue.nix
+++ b/upstart-jobs/rogue.nix
@@ -1,4 +1,4 @@
-{pkgs, config}: 
+{pkgs, config, ...}: 
 
 # Show rogue game on tty8
 # Originally used only by installation CD
-- 
GitLab


From 77db653dfeffe9a2eeb49eab47767188b53468b6 Mon Sep 17 00:00:00 2001
From: Nicolas Pierron <nicolas.b.pierron@gmail.com>
Date: Sun, 22 Feb 2009 16:07:25 +0000
Subject: [PATCH 1215/5331] Some fixes to the Apache Tomcat connector

svn path=/nixos/branches/fix-style/; revision=14167
---
 upstart-jobs/apache-httpd/tomcat-connector.nix | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/upstart-jobs/apache-httpd/tomcat-connector.nix b/upstart-jobs/apache-httpd/tomcat-connector.nix
index d1186da43fb..f7662c9513f 100644
--- a/upstart-jobs/apache-httpd/tomcat-connector.nix
+++ b/upstart-jobs/apache-httpd/tomcat-connector.nix
@@ -73,12 +73,12 @@ JkAutoAlias /var/tomcat/webapps
 # All requests go to worker by default
 JkMount /* loadbalancer
 # Serve some static files using httpd
-JkUnMount /*.html loadbalancer
-JkUnMount /*.jpg  loadbalancer
-JkUnMount /*.gif  loadbalancer
-JkUnMount /*.css  loadbalancer
-JkUnMount /*.png  loadbalancer
-JkUnMount /*.js  loadbalancer
+#JkUnMount /*.html loadbalancer
+#JkUnMount /*.jpg  loadbalancer
+#JkUnMount /*.gif  loadbalancer
+#JkUnMount /*.css  loadbalancer
+#JkUnMount /*.png  loadbalancer
+#JkUnMount /*.js  loadbalancer
 
 # Add jkstatus for managing runtime data
 <Location /jkstatus/>
-- 
GitLab


From 38aac776692ceb59d4a787db3e8d6a813fd66f74 Mon Sep 17 00:00:00 2001
From: Nicolas Pierron <nicolas.b.pierron@gmail.com>
Date: Sun, 22 Feb 2009 16:07:29 +0000
Subject: [PATCH 1216/5331] Increased the sleep hack on the Tomcat service

svn path=/nixos/branches/fix-style/; revision=14168
---
 upstart-jobs/tomcat.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/upstart-jobs/tomcat.nix b/upstart-jobs/tomcat.nix
index ad4736386d9..233da6abe38 100644
--- a/upstart-jobs/tomcat.nix
+++ b/upstart-jobs/tomcat.nix
@@ -99,7 +99,7 @@ in
 
     end script
     
-    respawn ${pkgs.su}/bin/su -s ${pkgs.bash}/bin/sh ${cfg.user} -c 'CATALINA_BASE=${cfg.baseDir} JAVA_HOME=${pkgs.jdk} JAVA_OPTS="${cfg.javaOpts}" CATALINA_OPTS="${cfg.catalinaOpts}" ${pkgs.tomcat6}/bin/startup.sh; sleep 1d'
+    respawn ${pkgs.su}/bin/su -s ${pkgs.bash}/bin/sh ${cfg.user} -c 'CATALINA_BASE=${cfg.baseDir} JAVA_HOME=${pkgs.jdk} JAVA_OPTS="${cfg.javaOpts}" CATALINA_OPTS="${cfg.catalinaOpts}" ${pkgs.tomcat6}/bin/startup.sh; sleep 1000d'
     
     stop script
         echo "Stopping tomcat..."
-- 
GitLab


From 0addac3473fe89802dc6acaaab345571f215a754 Mon Sep 17 00:00:00 2001
From: Nicolas Pierron <nicolas.b.pierron@gmail.com>
Date: Sun, 22 Feb 2009 16:07:33 +0000
Subject: [PATCH 1217/5331] * CUPS: use /etc/cups rather than ${cups}/etc/cups
 as the ServerRoot,   because CUPS modifies files in the ServerRoot directory.
  Most   importantly, it stores printer configuration there.  Previously the  
 CUPS server modified the files under ${cups}/etc/cups, which is   impure and
 caused all configured printers to disappear any time CUPS   was upgraded.

svn path=/nixos/branches/fix-style/; revision=14169
---
 upstart-jobs/cupsd.nix | 19 ++++++++++++++-----
 1 file changed, 14 insertions(+), 5 deletions(-)

diff --git a/upstart-jobs/cupsd.nix b/upstart-jobs/cupsd.nix
index d67fc384324..ced164a1308 100644
--- a/upstart-jobs/cupsd.nix
+++ b/upstart-jobs/cupsd.nix
@@ -40,7 +40,10 @@ let
     Listen localhost:631
     Listen /var/run/cups/cups.sock
 
-    ServerRoot ${cups}/etc/cups
+    # Note: we can't use ${cups}/etc/cups as the ServerRoot, since
+    # CUPS will write in the ServerRoot when e.g. adding new printers
+    # through the web interface.
+    ServerRoot /etc/cups
 
     ServerBin ${bindir}/lib/cups
 
@@ -101,11 +104,17 @@ in
 {
   name = "cupsd";
 
-  extraPath = [
-    cups
-  ];
+  extraPath = [cups];
 
-  
+  extraEtc = [
+    # CUPS expects the following files in its ServerRoot.
+    { source = "${cups}/etc/cups/mime.convs";
+      target = "cups/mime.convs";
+    }
+    { source = "${cups}/etc/cups/mime.types";
+      target = "cups/mime.types";
+    }
+  ];
   
   job = ''
     description "CUPS printing daemon"
-- 
GitLab


From 6d283c6319990f49ca2d6f0ba754437de21a4c84 Mon Sep 17 00:00:00 2001
From: Nicolas Pierron <nicolas.b.pierron@gmail.com>
Date: Sun, 22 Feb 2009 16:07:37 +0000
Subject: [PATCH 1218/5331] svn path=/nixos/branches/fix-style/; revision=14170

---
 boot/boot-stage-1.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/boot/boot-stage-1.nix b/boot/boot-stage-1.nix
index b1fcbd9d76f..4f9131cc533 100644
--- a/boot/boot-stage-1.nix
+++ b/boot/boot-stage-1.nix
@@ -20,7 +20,7 @@ rec {
 
   pkgsKlibc = import "${pkgs.path}/top-level/all-packages.nix" {
     system = pkgs.stdenv.system;
-    bootStdenv = pkgs.useKlibc pkgs.stdenv kernelPackages.klibc;
+    bootStdenv = pkgs.useKlibc pkgs.stdenv pkgs.klibc;
   };
 
   pkgsStatic = import "${pkgs.path}/top-level/all-packages.nix" {
@@ -136,7 +136,7 @@ rec {
       # command provided by klibc (which isn't capable of
       # auto-detecting FS types).
       extraUtils
-      kernelPackages.klibcShrunk
+      pkgs.klibcShrunk
     ];
   };
 
-- 
GitLab


From 0c6afe1dd2e0b283c0ecf5962789559a103db785 Mon Sep 17 00:00:00 2001
From: Nicolas Pierron <nicolas.b.pierron@gmail.com>
Date: Sun, 22 Feb 2009 16:07:42 +0000
Subject: [PATCH 1219/5331] Add Upstart job for PulseAudio as a system-wide
 daemon.

svn path=/nixos/branches/fix-style/; revision=14171
---
 system/ids.nix              |  2 +
 system/options.nix          |  1 +
 upstart-jobs/pulseaudio.nix | 94 +++++++++++++++++++++++++++++++++++++
 3 files changed, 97 insertions(+)
 create mode 100644 upstart-jobs/pulseaudio.nix

diff --git a/system/ids.nix b/system/ids.nix
index 3838f7138f2..a950ec84db1 100644
--- a/system/ids.nix
+++ b/system/ids.nix
@@ -19,6 +19,7 @@
     dovecot = 15;
     tomcat = 16;
     gnunetd = 17;
+    pulseaudio = 22; # must match `pulseaudio' GID
 
     nixbld = 30000; # start of range of uids
     nobody = 65534;
@@ -45,6 +46,7 @@
     uucp = 19;
     lp = 20;
     tomcat = 21;
+    pulseaudio = 22; # must match `pulseaudio' UID
     
     users = 100;
     nixbld = 30000;
diff --git a/system/options.nix b/system/options.nix
index d1748f16f7f..6b0f725ab2f 100644
--- a/system/options.nix
+++ b/system/options.nix
@@ -2248,6 +2248,7 @@ in
     (import ../upstart-jobs/manual.nix)
     (import ../upstart-jobs/rogue.nix)
     (import ../upstart-jobs/guest-users.nix)
+    (import ../upstart-jobs/pulseaudio.nix)
 
     # fonts
     (import ../system/fonts.nix)
diff --git a/upstart-jobs/pulseaudio.nix b/upstart-jobs/pulseaudio.nix
new file mode 100644
index 00000000000..b8497ce12e7
--- /dev/null
+++ b/upstart-jobs/pulseaudio.nix
@@ -0,0 +1,94 @@
+{pkgs, config, ...}:
+
+###### interface
+let
+  inherit (pkgs.lib) mkOption;
+
+  uid = (import ../system/ids.nix).uids.pulseaudio;
+  gid = (import ../system/ids.nix).gids.pulseaudio;
+
+  options = {
+    services = {
+      pulseaudio = {
+        enable = mkOption {
+          default = false;
+          description = ''
+            Whether to enable the PulseAudio system-wide audio server.
+            Note that the documentation recommends running PulseAudio
+            daemons per-user rather than system-wide on desktop machines.
+          '';
+        };
+
+        logLevel = mkOption {
+          default = "notice";
+          example = "debug";
+          description = ''
+            A string denoting the log level: one of
+            <literal>error</literal>, <literal>warn</literal>,
+            <literal>notice</literal>, <literal>info</literal>,
+            or <literal>debug</literal>.
+          '';
+        };
+      };
+    };
+  };
+in
+
+###### implementation
+
+# For some reason, PulseAudio wants UID == GID.
+assert uid == gid;
+
+{
+  require = [
+    options
+  ];
+
+  environment = {
+
+    extraPackages =
+      pkgs.lib.optional
+        (!config.environment.cleanStart)
+        pkgs.pulseaudio;
+  };
+
+  users = {
+    extraUsers = [
+      { name = "pulse";
+        inherit uid;
+        group = "pulse";
+        description = "PulseAudio system-wide daemon";
+        home = "/var/run/pulse";
+      }
+    ];
+
+    extraGroups = [
+      { name = "pulse";
+        inherit gid;
+      }
+    ];
+  };
+
+  services = {
+    extraJobs = [{
+      name = "pulseaudio";
+
+      job = ''
+        description "PulseAudio system-wide server"
+
+        start on startup
+        stop on shutdown
+
+        start script
+          test -d /var/run/pulse ||			\
+          ( mkdir -p --mode 755 /var/run/pulse &&	\
+            chown pulse:pulse /var/run/pulse )
+        end script
+
+        respawn ${pkgs.pulseaudio}/bin/pulseaudio               \
+          --system --daemonize                                  \
+          --log-level="${config.services.pulseaudio.logLevel}"
+      '';
+    }];
+  };
+}
-- 
GitLab


From b0aa88e7a3fd26032d0bd84a7822c1f8f1c382ac Mon Sep 17 00:00:00 2001
From: Nicolas Pierron <nicolas.b.pierron@gmail.com>
Date: Sun, 22 Feb 2009 16:07:47 +0000
Subject: [PATCH 1220/5331] Mount `/dev/shm' (shared memory support).

svn path=/nixos/branches/fix-style/; revision=14172
---
 boot/boot-stage-2-init.sh | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/boot/boot-stage-2-init.sh b/boot/boot-stage-2-init.sh
index f5fd818d3c7..3c69265b51d 100644
--- a/boot/boot-stage-2-init.sh
+++ b/boot/boot-stage-2-init.sh
@@ -69,6 +69,8 @@ mkdir -m 0755 -p /sys
 mount -t sysfs none /sys
 mkdir -m 0755 -p /dev
 mount -t tmpfs -o "mode=0755" none /dev
+mkdir -m 0777 /dev/shm
+mount -t tmpfs -o "rw,nosuid,nodev" tmpfs /dev/shm
 mkdir -m 0755 -p /dev/pts
 mount -t devpts none /dev/pts
 [ -e /proc/bus/usb ] && mount -t usbfs none /proc/bus/usb # uml doesn't have usb by default
-- 
GitLab


From d92d0e98f4981df5139e41c6ca2402f15db87c5d Mon Sep 17 00:00:00 2001
From: Nicolas Pierron <nicolas.b.pierron@gmail.com>
Date: Sun, 22 Feb 2009 16:07:52 +0000
Subject: [PATCH 1221/5331] PulseAudio Upstart job: honor `enable'.

svn path=/nixos/branches/fix-style/; revision=14173
---
 upstart-jobs/pulseaudio.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/upstart-jobs/pulseaudio.nix b/upstart-jobs/pulseaudio.nix
index b8497ce12e7..173f96db7fc 100644
--- a/upstart-jobs/pulseaudio.nix
+++ b/upstart-jobs/pulseaudio.nix
@@ -2,7 +2,7 @@
 
 ###### interface
 let
-  inherit (pkgs.lib) mkOption;
+  inherit (pkgs.lib) mkOption mkIf;
 
   uid = (import ../system/ids.nix).uids.pulseaudio;
   gid = (import ../system/ids.nix).gids.pulseaudio;
@@ -39,7 +39,7 @@ in
 # For some reason, PulseAudio wants UID == GID.
 assert uid == gid;
 
-{
+mkIf config.services.pulseaudio.enable {
   require = [
     options
   ];
-- 
GitLab


From 09bcf1418cbfa8e203fc36f98cbb8a39a5d08516 Mon Sep 17 00:00:00 2001
From: Nicolas Pierron <nicolas.b.pierron@gmail.com>
Date: Sun, 22 Feb 2009 16:07:56 +0000
Subject: [PATCH 1222/5331] * Start mingetty after udev, otherwise /dev/tty*
 may not exist yet   (and you get Upstart messages about the ttyN job being
 restarted).

svn path=/nixos/branches/fix-style/; revision=14174
---
 upstart-jobs/mingetty.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/upstart-jobs/mingetty.nix b/upstart-jobs/mingetty.nix
index 1d821e789b7..8f50ea5c9db 100644
--- a/upstart-jobs/mingetty.nix
+++ b/upstart-jobs/mingetty.nix
@@ -3,7 +3,7 @@
 {
   name = "tty" + toString ttyNumber;
   job = "
-    start on startup
+    start on udev
     stop on shutdown
     respawn ${mingetty}/sbin/mingetty --loginprog=${loginProgram} --noclear tty${toString ttyNumber}
   ";
-- 
GitLab


From ad36ce1f5b56d30188c7429418a70b68a01182e5 Mon Sep 17 00:00:00 2001
From: Nicolas Pierron <nicolas.b.pierron@gmail.com>
Date: Sun, 22 Feb 2009 16:08:00 +0000
Subject: [PATCH 1223/5331] * Don't run fsck on journalling file systems. 
 Instead assume   that the file system driver will replay the journal at  
 mount-time in case of an unclean shutdown.  For ext3 at least   this is
 *much* faster.

svn path=/nixos/branches/fix-style/; revision=14175
---
 boot/boot-stage-1-init.sh | 115 ++++++++++++++++++++------------------
 1 file changed, 62 insertions(+), 53 deletions(-)

diff --git a/boot/boot-stage-1-init.sh b/boot/boot-stage-1-init.sh
index c6d7214028c..c9930c30bbc 100644
--- a/boot/boot-stage-1-init.sh
+++ b/boot/boot-stage-1-init.sh
@@ -140,69 +140,78 @@ if test -n "$debug1devices"; then fail; fi
 
 # Return true if the machine is on AC power, or if we can't determine
 # whether it's on AC power.
-onACPower () {
+onACPower() {
     if test -d "/proc/acpi/battery"; then
-	if ls /proc/acpi/battery/BAT[0-9]* > /dev/null 2>&1; then
-	    if cat /proc/acpi/battery/BAT*/state	\
-	       | grep "^charging state"			\
-	       | grep -q "discharg" ; then
-		false
-	    else
-		true
-	    fi
-	else
-	    true
-	fi
+        if ls /proc/acpi/battery/BAT[0-9]* > /dev/null 2>&1; then
+            if cat /proc/acpi/battery/BAT*/state \
+                | grep "^charging state" \
+                | grep -q "discharg" ; then
+                false
+            else
+                true
+            fi
+        else
+            true
+        fi
     else
-	true
+        true
     fi
 }
 
-# Function for mounting a file system.
-mountFS() {
-    local device="$1"
-    local mountPoint="$2"
-    local options="$3"
-    local fsType="$4"
 
-    # Check the root device, if .
-    mustCheck=
-    if test -b "$device"; then
-        mustCheck=1
-    else
-        case $device in
-            LABEL=*)
-                mustCheck=1
-                ;;
-        esac
+# Check the specified file system, if appropriate.
+checkFS() {
+    # Only check block devices.
+    if ! test -b "$device"; then return 0; fi
+
+    # For unclean ext3 file systems, fsck.ext3 should just replay the
+    # journal and exit, but in practice this takes *much* longer than
+    # letting the kernel recover the FS.  So, don't run fsck on
+    # journalling file systems.
+    eval $(fstype "$device")
+    if test "$FSTYPE" = ext3 -o "$FSTYPE" = ext4 -o "$FSTYPE" = reiserfs -o "$FSTYPE" = xfs -o "$FSTYPE" = jfs; then
+        return 0;
+    fi
+    
+    # Don't run `fsck' if the machine is on battery power.  !!! Is
+    # this a good idea?
+    if ! onACPower; then
+        echo "on battery power, so \`fsck' not run on \`$device'"
+        return 0
+    fi
+    
+    FSTAB_FILE="/etc/mtab" fsck -V -v -C -a "$device"
+    fsckResult=$?
+
+    if test $(($fsckResult | 2)) = $fsckResult; then
+        echo "fsck finished, rebooting..."
+        sleep 3
+        reboot
     fi
 
-    if test -n "$mustCheck"; then
-	if onACPower; then
-            FSTAB_FILE="/etc/mtab" fsck -V -v -C -a "$device"
-            fsckResult=$?
+    if test $(($fsckResult | 4)) = $fsckResult; then
+        echo "$device has unrepaired errors, please fix them manually."
+        fail
+    fi
 
-            if test $(($fsckResult | 2)) = $fsckResult; then
-		echo "fsck finished, rebooting..."
-		sleep 3
-		reboot
-            fi
+    if test $fsckResult -ge 8; then
+        echo "fsck on $device failed."
+        fail
+    fi
 
-            if test $(($fsckResult | 4)) = $fsckResult; then
-		echo "$device has unrepaired errors, please fix them manually."
-		fail
-            fi
+    return 0
+}
 
-            if test $fsckResult -ge 8; then
-		echo "fsck on $device failed."
-		fail
-            fi
-	else
-            # Don't run `fsck' if the machine is on battery power.
-	    echo "on battery power, so \`fsck' not run on \`$device'"
-	fi
-    fi
 
+# Function for mounting a file system.
+mountFS() {
+    local device="$1"
+    local mountPoint="$2"
+    local options="$3"
+    local fsType="$4"
+
+    checkFS "$device"
+    
     # Mount read-writable.
     mount -t "$fsType" -o "$options" "$device" /mnt-root$mountPoint || fail
 }
@@ -224,8 +233,8 @@ for ((n = 0; n < ${#mountPoints[*]}; n++)); do
 
     # !!! Really quick hack to support bind mounts, i.e., where the
     # "device" should be taken relative to /mnt-root, not /.  Assume
-    # that every device that start with / but doesn't start with /dev
-    # or LABEL= is a bind mount.
+    # that every device that starts with / but doesn't start with /dev
+    # is a bind mount.
     case $device in
         /dev/*)
             ;;
-- 
GitLab


From 840dac3fec14689395f7597305cad04a4c106ac2 Mon Sep 17 00:00:00 2001
From: Nicolas Pierron <nicolas.b.pierron@gmail.com>
Date: Sun, 22 Feb 2009 16:08:05 +0000
Subject: [PATCH 1224/5331] Making the 'via' video module available in the
 xserver upstart-job.

svn path=/nixos/branches/fix-style/; revision=14176
---
 upstart-jobs/xserver/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/upstart-jobs/xserver/default.nix b/upstart-jobs/xserver/default.nix
index 33f7542ad04..501597c12f2 100644
--- a/upstart-jobs/xserver/default.nix
+++ b/upstart-jobs/xserver/default.nix
@@ -297,6 +297,7 @@ let
     intel = { modules = [xorg.xf86videointel]; };
     nv =    { modules = [xorg.xf86videonv]; };
     ati =   { modules = [xorg.xf86videoati]; };
+    via =   { modules = [xorg.xf86videovia]; };
   };
 
   # Get a bunch of user settings.
-- 
GitLab


From 6c703347a818a8659381f4c8b2063e36499d9011 Mon Sep 17 00:00:00 2001
From: Nicolas Pierron <nicolas.b.pierron@gmail.com>
Date: Sun, 22 Feb 2009 16:08:09 +0000
Subject: [PATCH 1225/5331] * Symlink fsck.ext[234] to e2fsck.  This makes the
 initrd 600 KB smaller.

svn path=/nixos/branches/fix-style/; revision=14177
---
 boot/boot-stage-1.nix | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/boot/boot-stage-1.nix b/boot/boot-stage-1.nix
index 4f9131cc533..bbf48fd00ff 100644
--- a/boot/boot-stage-1.nix
+++ b/boot/boot-stage-1.nix
@@ -72,10 +72,13 @@ rec {
         cp $lvm2/sbin/lvm.static $out/bin/lvm
       fi
       cp $utillinux/bin/mount $utillinux/bin/umount $utillinux/sbin/pivot_root $out/bin
-      cp -p $e2fsprogs/sbin/fsck* $e2fsprogs/sbin/e2fsck $e2fsprogs/sbin/tune2fs $out/bin
+      cp -pd $e2fsprogs/sbin/fsck $e2fsprogs/sbin/e2fsck $e2fsprogs/sbin/tune2fs $out/bin
+      ln -s e2fsck $out/bin/fsck.ext2
+      ln -s e2fsck $out/bin/fsck.ext3
+      ln -s e2fsck $out/bin/fsck.ext4
       cp $udev/sbin/udevd $udev/sbin/udevadm $out/bin
       cp $udev/lib/udev/*_id $out/bin
-      nuke-refs $out/bin/*
+      for i in $out/bin/*; do if ! test -L $i; then nuke-refs $i; fi; done
     ''; # */
   
 
-- 
GitLab


From 38e8cf175f05e4cf7305699e2f099b45f9ee09a2 Mon Sep 17 00:00:00 2001
From: Nicolas Pierron <nicolas.b.pierron@gmail.com>
Date: Sun, 22 Feb 2009 16:08:13 +0000
Subject: [PATCH 1226/5331] * Use normal, dynamically linked binaries for
 e2fsck, lvm etc. in the   initrd instead of a mix of dietlibc, klibc and
 static-glibc based   binaries.  This works by copying what we need from Glibc
 into the   initrd and using patchelf to set the ELF interpreter and RPATH  
 correctly.  The resulting initrd is about 500 KB smaller, but more  
 importantly, it's much easier to maintain - all those  
 dietlibc/klibc/static-glibc builds frequently cause build problems.

svn path=/nixos/branches/fix-style/; revision=14178
---
 boot/boot-stage-1-init.sh |  15 ++---
 boot/boot-stage-1.nix     | 123 ++++++++++++++++++++++----------------
 2 files changed, 80 insertions(+), 58 deletions(-)

diff --git a/boot/boot-stage-1-init.sh b/boot/boot-stage-1-init.sh
index c9930c30bbc..b3b2292beaa 100644
--- a/boot/boot-stage-1-init.sh
+++ b/boot/boot-stage-1-init.sh
@@ -1,7 +1,9 @@
-#! @staticShell@
+#! @shell@
 
 targetRoot=/mnt/root
 
+export LD_LIBRARY_PATH=@extraUtils@/lib
+
 
 errorDialog() {
     timeout=15
@@ -14,13 +16,13 @@ errorDialog() {
     read -t $timeout reply
     case $reply in
         f)
-            exec @staticShell@;;
+            exec @shell@;;
         i)
             echo
             echo "Quit interactive shell with exit status of"
             echo "  0        : to continue"
             echo "  non-zero : to get this dialog again"
-            @staticShell@ || fail
+            @shell@ || fail
             ;;
         *)
             echo continuing ignoring error;;
@@ -299,7 +301,6 @@ umount /proc
 exec run-init "$targetRoot" "$stage2Init"
 
 echo
-echo $1 failed running "$stage2Init"
-echo "It's your last chance to fix things manually without rebooting"
-echo "finally switching to interactive shell pid 1"
-export $stage2Init; exec @staticShell@
+echo "$1: failed running $stage2Init"
+echo "Dropping into a root shell..."
+export $stage2Init; exec @shell@
diff --git a/boot/boot-stage-1.nix b/boot/boot-stage-1.nix
index bbf48fd00ff..7b7f5503d0b 100644
--- a/boot/boot-stage-1.nix
+++ b/boot/boot-stage-1.nix
@@ -13,26 +13,6 @@ in
 
 rec {
 
-  pkgsDiet = import "${pkgs.path}/top-level/all-packages.nix" {
-    system = pkgs.stdenv.system;
-    bootStdenv = pkgs.useDietLibC pkgs.stdenv;
-  };
-
-  pkgsKlibc = import "${pkgs.path}/top-level/all-packages.nix" {
-    system = pkgs.stdenv.system;
-    bootStdenv = pkgs.useKlibc pkgs.stdenv pkgs.klibc;
-  };
-
-  pkgsStatic = import "${pkgs.path}/top-level/all-packages.nix" {
-    system = pkgs.stdenv.system;
-    bootStdenv = pkgs.makeStaticBinaries pkgs.stdenv;
-  };
-
-  stdenvLinuxStuff = import "${pkgs.path}/stdenv/linux" {
-    system = pkgs.stdenv.system;
-    allPackages = import "${pkgs.path}/top-level/all-packages.nix";
-  };
-  
 
   # Determine the set of modules that we need to mount the root FS.
   modulesClosure = pkgs.makeModulesClosure {
@@ -44,41 +24,82 @@ rec {
   };
 
 
-  udev = pkgsKlibc.udev;
-
-    
-  # 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.
+  # Some additional utilities needed in stage 1, like mount, lvm, fsck
+  # etc.  We don't want to bring in all of those packages, so we just
+  # copy what we need.  Instead of using statically linked binaries,
+  # we just copy what we need from Glibc and use patchelf to make it
+  # work.
   extraUtils = pkgs.runCommand "extra-utils"
     { buildInputs = [pkgs.nukeReferences];
-      inherit (pkgsStatic) utillinux;
-      inherit udev;
-      e2fsprogs = pkgsDiet.e2fsprogs;
-      devicemapper =
-        if config.boot.initrd.lvm
-        then assert pkgs.devicemapper.enableStatic; pkgs.devicemapper
-        else null;
-      lvm2 =
-        if config.boot.initrd.lvm
-        then assert pkgs.lvm2.enableStatic; pkgs.lvm2
-        else null;
-      allowedReferences = []; # prevent accidents like glibc being included in the initrd
+      devicemapper = if config.boot.initrd.lvm then pkgs.devicemapper else null;
+      lvm2 = if config.boot.initrd.lvm then pkgs.lvm2 else null;
+      allowedReferences = ["out"]; # prevent accidents like glibc being included in the initrd
     }
     ''
       ensureDir $out/bin
-      if test -n "$devicemapper"; then
-        cp $devicemapper/sbin/dmsetup.static $out/bin/dmsetup
-        cp $lvm2/sbin/lvm.static $out/bin/lvm
-      fi
-      cp $utillinux/bin/mount $utillinux/bin/umount $utillinux/sbin/pivot_root $out/bin
-      cp -pd $e2fsprogs/sbin/fsck $e2fsprogs/sbin/e2fsck $e2fsprogs/sbin/tune2fs $out/bin
+      ensureDir $out/lib
+      
+      # Copy what we need from Glibc.
+      cp -p ${pkgs.glibc}/lib/ld-linux*.so.2 $out/lib
+      cp -p ${pkgs.glibc}/lib/libc.so.* $out/lib
+      cp -p ${pkgs.glibc}/lib/libpthread.so.* $out/lib
+      cp -p ${pkgs.glibc}/lib/librt.so.* $out/lib
+      cp -p ${pkgs.glibc}/lib/libdl.so.* $out/lib
+
+      # Copy some utillinux stuff.
+      cp ${pkgs.utillinux}/bin/mount ${pkgs.utillinux}/bin/umount ${pkgs.utillinux}/sbin/pivot_root $out/bin
+
+      # Copy e2fsck and friends.      
+      cp ${pkgs.e2fsprogs}/sbin/e2fsck $out/bin
+      cp ${pkgs.e2fsprogs}/sbin/tune2fs $out/bin
+      cp ${pkgs.e2fsprogs}/sbin/fsck $out/bin
       ln -s e2fsck $out/bin/fsck.ext2
       ln -s e2fsck $out/bin/fsck.ext3
       ln -s e2fsck $out/bin/fsck.ext4
-      cp $udev/sbin/udevd $udev/sbin/udevadm $out/bin
-      cp $udev/lib/udev/*_id $out/bin
-      for i in $out/bin/*; do if ! test -L $i; then nuke-refs $i; fi; done
+
+      cp -pd ${pkgs.e2fsprogs}/lib/lib*.so.* $out/lib
+
+      # Copy devicemapper and lvm, if we need it.
+      if test -n "$devicemapper"; then
+        cp $devicemapper/sbin/dmsetup $out/bin/dmsetup
+        cp $devicemapper/lib/libdevmapper.so.*.* $out/lib
+        cp $lvm2/sbin/lvm $out/bin/lvm
+      fi
+
+      # Copy udev.
+      cp ${pkgs.udev}/sbin/udevd ${pkgs.udev}/sbin/udevadm $out/bin
+      cp ${pkgs.udev}/lib/udev/*_id $out/bin
+      cp ${pkgs.udev}/lib/libvolume_id.so.* $out/lib
+      
+      # Copy bash.
+      cp ${pkgs.bash}/bin/bash $out/bin
+      ln -s bash $out/bin/sh
+
+      # Run patchelf to make the programs refer to the copied libraries.
+      for i in $out/bin/* $out/lib/*; do if ! test -L $i; then nuke-refs $i; fi; done
+
+      for i in $out/bin/*; do
+          if ! test -L $i; then
+              echo "patching $i..."
+              patchelf --set-interpreter $out/lib/ld-linux*.so.2 --set-rpath $out/lib $i || true
+          fi
+      done
+
+      # Make sure that the patchelf'ed binaries still work.
+      echo "testing patched programs..."
+      $out/bin/bash --version
+      export LD_LIBRARY_PATH=$out/lib
+      $out/bin/mount --version
+      $out/bin/umount --version
+      $out/bin/e2fsck -V
+      $out/bin/tune2fs 2> /dev/null | grep "tune2fs "
+      $out/bin/fsck -N
+      $out/bin/udevadm --version
+      $out/bin/vol_id 2>&1 | grep "no device"
+      if test -n "$devicemapper"; then
+          $out/bin/dmsetup --version | grep "version:"
+          LVM_SYSTEM_DIR=$out $out/bin/lvm 2>&1 | grep "LVM"
+      fi
     ''; # */
   
 
@@ -94,7 +115,7 @@ rec {
     name = "udev-rules";
     buildCommand = ''
       ensureDir $out
-      cp ${udev}/*/udev/rules.d/60-persistent-storage.rules $out/
+      cp ${pkgs.udev}/*/udev/rules.d/60-persistent-storage.rules $out/
       substituteInPlace $out/60-persistent-storage.rules \
         --replace ata_id ${extraUtils}/bin/ata_id \
         --replace usb_id ${extraUtils}/bin/usb_id \
@@ -117,11 +138,11 @@ rec {
   bootStage1 = pkgs.substituteAll {
     src = ./boot-stage-1-init.sh;
 
+    shell = "${extraUtils}/bin/bash";
+
     isExecutable = true;
 
-    staticShell = stdenvLinuxStuff.bootstrapTools.bash;
-    
-    inherit modulesClosure udevConf;
+    inherit modulesClosure udevConf extraUtils;
     
     inherit (config.boot) isLiveCD resumeDevice;
 
-- 
GitLab


From f28c8ca553895aeca6ba6bc23e6bec321d39fdd9 Mon Sep 17 00:00:00 2001
From: Nicolas Pierron <nicolas.b.pierron@gmail.com>
Date: Sun, 22 Feb 2009 16:08:17 +0000
Subject: [PATCH 1227/5331] * Remove /var/lock on startup. * Remove /etc/mtab
 on startup.  This fixes the warning on   startup when catting /proc/mount to
 /etc/mtab.

svn path=/nixos/branches/fix-style/; revision=14179
---
 boot/boot-stage-2-init.sh | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/boot/boot-stage-2-init.sh b/boot/boot-stage-2-init.sh
index 3c69265b51d..a5f94bf2ad2 100644
--- a/boot/boot-stage-2-init.sh
+++ b/boot/boot-stage-2-init.sh
@@ -30,8 +30,9 @@ test -e /etc/fstab || touch /etc/fstab # to shut up mount
 mkdir -m 0755 -p /proc
 mount -n -t proc none /proc
 [ -s /etc/mtab ] && rm /etc/mtab # while installing a symlink is created (see man mount), if it's still there for whateever reason remove it
+
+rm -f /etc/mtab
 cat /proc/mounts > /etc/mtab
-mkdir -m 0755 -p /etc/nixos
 
 
 # Process the kernel command line.
@@ -80,10 +81,12 @@ mkdir -m 0755 -p /nix/var
 mkdir -m 0700 -p /root
 mkdir -m 0755 -p /bin # for the /bin/sh symlink
 mkdir -m 0755 -p /home
+mkdir -m 0755 -p /etc/nixos
 
 
 # Miscellaneous boot time cleanup.
 rm -rf /var/run
+rm -rf /var/lock
 
 #echo -n "cleaning \`/tmp'..."
 #rm -rf --one-file-system /tmp/*
-- 
GitLab


From 128699688a1fb6812d9a22c7f9f95902a8e03d1d Mon Sep 17 00:00:00 2001
From: Nicolas Pierron <nicolas.b.pierron@gmail.com>
Date: Sun, 22 Feb 2009 16:08:22 +0000
Subject: [PATCH 1228/5331] * Run the ACPI daemon.  This allows the system to
 respond to ACPI   events, like pressing the power button.  The NVIDIA X11
 driver also   needs it to respond to the internal/external monitor switch
 button   on laptops.  The power actions should of course be made  
 configurable.

svn path=/nixos/branches/fix-style/; revision=14180
---
 upstart-jobs/acpid.nix   | 42 ++++++++++++++++++++++++++++++++++++++++
 upstart-jobs/default.nix |  6 ++++++
 2 files changed, 48 insertions(+)
 create mode 100644 upstart-jobs/acpid.nix

diff --git a/upstart-jobs/acpid.nix b/upstart-jobs/acpid.nix
new file mode 100644
index 00000000000..5bd1fa63590
--- /dev/null
+++ b/upstart-jobs/acpid.nix
@@ -0,0 +1,42 @@
+{pkgs, config, ...}:
+
+let
+
+  acpiConfDir = pkgs.runCommand "acpi-events" {}
+    ''
+      ensureDir $out
+      ln -s ${acpiConfFile} $out/events.conf
+    '';
+
+  acpiConfFile = pkgs.writeText "acpi.conf"
+    ''
+      event=button/power.*
+      action=${powerEventHandler} "%e"
+    '';
+
+  # Called when the power button is pressed.
+  powerEventHandler = pkgs.writeScript "acpi-power.sh"
+    ''
+      #! ${pkgs.bash}/bin/sh
+      # Suspend to RAM.
+      #echo mem > /sys/power/state
+      exit 0
+    '';
+
+in
+
+{
+  name = "acpid";
+  
+  extraPath = [pkgs.acpid];
+  
+  job = ''
+    description "ACPI daemon"
+
+    start on udev
+    stop on shutdown
+
+    respawn ${pkgs.acpid}/sbin/acpid --foreground --confdir ${acpiConfDir}
+  '';
+  
+}
diff --git a/upstart-jobs/default.nix b/upstart-jobs/default.nix
index 9fbef07ce5d..9fb19188581 100644
--- a/upstart-jobs/default.nix
+++ b/upstart-jobs/default.nix
@@ -360,6 +360,12 @@ let
       inherit (config.services.bitlbee) portNumber interface;
     })
 
+  # ACPI daemon.
+  ++ optional true /* !!! need some option */
+    (import ../upstart-jobs/acpid.nix {
+      inherit config pkgs;
+    })
+
   # Postfix mail server.
   ++ optional config.services.postfix.enable
     (import ../upstart-jobs/postfix.nix {
-- 
GitLab


From be4a0494b827affffeccef2462ae55d85e2f5dc8 Mon Sep 17 00:00:00 2001
From: Nicolas Pierron <nicolas.b.pierron@gmail.com>
Date: Sun, 22 Feb 2009 16:08:28 +0000
Subject: [PATCH 1229/5331] * Suspend when the laptop lid is closed.

svn path=/nixos/branches/fix-style/; revision=14181
---
 upstart-jobs/acpid.nix | 19 +++++++++++++++++++
 upstart-jobs/hal.nix   |  2 ++
 2 files changed, 21 insertions(+)

diff --git a/upstart-jobs/acpid.nix b/upstart-jobs/acpid.nix
index 5bd1fa63590..efd608e1353 100644
--- a/upstart-jobs/acpid.nix
+++ b/upstart-jobs/acpid.nix
@@ -12,6 +12,9 @@ let
     ''
       event=button/power.*
       action=${powerEventHandler} "%e"
+
+      event=button/lid.*
+      action=${lidEventHandler} "%e"
     '';
 
   # Called when the power button is pressed.
@@ -23,6 +26,22 @@ let
       exit 0
     '';
 
+  # Called when the laptop lid is opened/closed.
+  lidEventHandler = pkgs.writeScript "acpi-lid.sh"
+    ''
+      #! ${pkgs.bash}/bin/sh
+
+      # Suspend to RAM if the lid is closed.  (We also get this event
+      # when the lid just opened, in which case we obviously don't
+      # want to suspend again.) 
+      if grep -q closed /proc/acpi/button/lid/LID/state; then
+          sync
+          echo mem > /sys/power/state
+      fi
+
+      exit 0
+    '';
+
 in
 
 {
diff --git a/upstart-jobs/hal.nix b/upstart-jobs/hal.nix
index 181341fdcf4..96982341080 100644
--- a/upstart-jobs/hal.nix
+++ b/upstart-jobs/hal.nix
@@ -44,6 +44,8 @@ let
     job = ''
       description "HAL daemon"
 
+      # !!! TODO: make sure that HAL starts after acpid,
+      # otherwise hald-addon-acpi will grab /proc/acpi/event.
       start on dbus
       stop on shutdown
 
-- 
GitLab


From 094aee7467cf4c9905b7a3e80151ee910b624036 Mon Sep 17 00:00:00 2001
From: Nicolas Pierron <nicolas.b.pierron@gmail.com>
Date: Sun, 22 Feb 2009 16:08:33 +0000
Subject: [PATCH 1230/5331] * acpid: switch to the ondemand CPU scaling
 governer when on battery power.   Disabled acpid by default because it's not
 configurable enough yet.

svn path=/nixos/branches/fix-style/; revision=14182
---
 system/options.nix       | 14 ++++++++++++++
 upstart-jobs/acpid.nix   | 16 ++++++++++++++--
 upstart-jobs/default.nix |  2 +-
 3 files changed, 29 insertions(+), 3 deletions(-)

diff --git a/system/options.nix b/system/options.nix
index 6b0f725ab2f..6e165c3b00a 100644
--- a/system/options.nix
+++ b/system/options.nix
@@ -2186,7 +2186,20 @@ in
     };
 
   };
+
+    
+  powerManagement = {
+    
+    enable = mkOption {
+      default = false;
+      description = "
+        Whether to enable power management.
+      ";
+    };
+
+  };
   
+
   nesting = {
     children = mkOption {
       default = [];
@@ -2196,6 +2209,7 @@ in
     };
   };
 
+  
   passthru = mkOption {
     default = {};
     description = "
diff --git a/upstart-jobs/acpid.nix b/upstart-jobs/acpid.nix
index efd608e1353..3a7df58bbaf 100644
--- a/upstart-jobs/acpid.nix
+++ b/upstart-jobs/acpid.nix
@@ -15,6 +15,9 @@ let
 
       event=button/lid.*
       action=${lidEventHandler} "%e"
+
+      event=ac_adapter.*
+      action=${acEventHandler} "%e"
     '';
 
   # Called when the power button is pressed.
@@ -23,7 +26,6 @@ let
       #! ${pkgs.bash}/bin/sh
       # Suspend to RAM.
       #echo mem > /sys/power/state
-      exit 0
     '';
 
   # Called when the laptop lid is opened/closed.
@@ -38,8 +40,18 @@ let
           sync
           echo mem > /sys/power/state
       fi
+    '';
+
+  # Called when the AC power is connected or disconnected.
+  acEventHandler = pkgs.writeScript "ac-power.sh"
+    ''
+      #! ${pkgs.bash}/bin/sh
 
-      exit 0
+      if grep -q "state:.*on-line" /proc/acpi/ac_adapter/AC/state; then
+         echo performance > /sys/devices/system/cpu/cpu0/cpufreq/scaling_governor
+      elif grep -q "state:.*off-line" /proc/acpi/ac_adapter/AC/state; then
+         echo ondemand > /sys/devices/system/cpu/cpu0/cpufreq/scaling_governor
+      fi
     '';
 
 in
diff --git a/upstart-jobs/default.nix b/upstart-jobs/default.nix
index 9fb19188581..ea5d8fcdbe0 100644
--- a/upstart-jobs/default.nix
+++ b/upstart-jobs/default.nix
@@ -361,7 +361,7 @@ let
     })
 
   # ACPI daemon.
-  ++ optional true /* !!! need some option */
+  ++ optional config.powerManagement.enable
     (import ../upstart-jobs/acpid.nix {
       inherit config pkgs;
     })
-- 
GitLab


From 802d4f02c4f69741026dcef5d97d29e24674481f Mon Sep 17 00:00:00 2001
From: Nicolas Pierron <nicolas.b.pierron@gmail.com>
Date: Sun, 22 Feb 2009 16:08:37 +0000
Subject: [PATCH 1231/5331] * Generate the acpid configuration properly: each
 config file   can only contain one event.

svn path=/nixos/branches/fix-style/; revision=14183
---
 upstart-jobs/acpid.nix | 86 +++++++++++++++++++++++-------------------
 1 file changed, 48 insertions(+), 38 deletions(-)

diff --git a/upstart-jobs/acpid.nix b/upstart-jobs/acpid.nix
index 3a7df58bbaf..e2eb702bcd4 100644
--- a/upstart-jobs/acpid.nix
+++ b/upstart-jobs/acpid.nix
@@ -5,54 +5,64 @@ let
   acpiConfDir = pkgs.runCommand "acpi-events" {}
     ''
       ensureDir $out
-      ln -s ${acpiConfFile} $out/events.conf
+      ${
+        # Generate a .conf file for each event. (You can't have
+        # multiple events in one config file...)
+        let f = event:
+          ''
+            fn=$out/${event.name}.conf
+            echo "event=${event.event}" > $fn
+            echo "action=${pkgs.writeScript "${event.name}.sh" event.action}" >> $fn
+          '';
+        in pkgs.lib.concatMapStrings f events
+      }
     '';
 
-  acpiConfFile = pkgs.writeText "acpi.conf"
-    ''
-      event=button/power.*
-      action=${powerEventHandler} "%e"
-
-      event=button/lid.*
-      action=${lidEventHandler} "%e"
-
-      event=ac_adapter.*
-      action=${acEventHandler} "%e"
-    '';
+  events = [powerEvent lidEvent acEvent];
 
   # Called when the power button is pressed.
-  powerEventHandler = pkgs.writeScript "acpi-power.sh"
-    ''
-      #! ${pkgs.bash}/bin/sh
-      # Suspend to RAM.
-      #echo mem > /sys/power/state
-    '';
+  powerEvent =
+    { name = "power-button";
+      event = "button/power.*";
+      action = 
+        ''
+          #! ${pkgs.bash}/bin/sh
+        '';
+    };
 
   # Called when the laptop lid is opened/closed.
-  lidEventHandler = pkgs.writeScript "acpi-lid.sh"
-    ''
-      #! ${pkgs.bash}/bin/sh
+  lidEvent = 
+    { name = "lid";
+      event = "button/lid.*";
+      action =
+        ''
+          #! ${pkgs.bash}/bin/sh
 
-      # Suspend to RAM if the lid is closed.  (We also get this event
-      # when the lid just opened, in which case we obviously don't
-      # want to suspend again.) 
-      if grep -q closed /proc/acpi/button/lid/LID/state; then
-          sync
-          echo mem > /sys/power/state
-      fi
-    '';
+          # Suspend to RAM if the lid is closed.  (We also get this event
+          # when the lid just opened, in which case we obviously don't
+          # want to suspend again.) 
+          if grep -q closed /proc/acpi/button/lid/LID/state; then
+              sync
+              echo mem > /sys/power/state
+          fi
+        '';
+    };
 
   # Called when the AC power is connected or disconnected.
-  acEventHandler = pkgs.writeScript "ac-power.sh"
-    ''
-      #! ${pkgs.bash}/bin/sh
+  acEvent =
+    { name = "ac-power";
+      event = "ac_adapter.*";
+      action = 
+        ''
+          #! ${pkgs.bash}/bin/sh
 
-      if grep -q "state:.*on-line" /proc/acpi/ac_adapter/AC/state; then
-         echo performance > /sys/devices/system/cpu/cpu0/cpufreq/scaling_governor
-      elif grep -q "state:.*off-line" /proc/acpi/ac_adapter/AC/state; then
-         echo ondemand > /sys/devices/system/cpu/cpu0/cpufreq/scaling_governor
-      fi
-    '';
+          if grep -q "state:.*on-line" /proc/acpi/ac_adapter/AC/state; then
+             echo performance > /sys/devices/system/cpu/cpu0/cpufreq/scaling_governor
+          elif grep -q "state:.*off-line" /proc/acpi/ac_adapter/AC/state; then
+             echo ondemand > /sys/devices/system/cpu/cpu0/cpufreq/scaling_governor
+          fi
+        '';
+    };
 
 in
 
-- 
GitLab


From 86f5d9dace5cd403c6fbfc4f342e753376c1371a Mon Sep 17 00:00:00 2001
From: Nicolas Pierron <nicolas.b.pierron@gmail.com>
Date: Sun, 22 Feb 2009 16:08:41 +0000
Subject: [PATCH 1232/5331] added hint about how to get the swap partion kernel
 node numbers

svn path=/nixos/branches/fix-style/; revision=14184
---
 system/options.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/system/options.nix b/system/options.nix
index 6e165c3b00a..babd4cfc162 100644
--- a/system/options.nix
+++ b/system/options.nix
@@ -34,7 +34,7 @@ in
       example = "0:0";
       description = "
         Device for manual resume attempt during boot. Looks like 
-        major:minor .
+        major:minor. ls -l /dev/SWAP_PARTION shows them.
       ";
     };
 
-- 
GitLab


From e79dbaad55766ab8144718fea39775ad0706d1fd Mon Sep 17 00:00:00 2001
From: Nicolas Pierron <nicolas.b.pierron@gmail.com>
Date: Sun, 22 Feb 2009 16:08:46 +0000
Subject: [PATCH 1233/5331] * Support for KDE 4.2.  Set
 services.xserver.desktopManager.kde4.enable to   true to enable.  It looks
 great ;-)

svn path=/nixos/branches/fix-style/; revision=14185
---
 .../xserver/desktopManager/default.nix        |  1 +
 upstart-jobs/xserver/desktopManager/kde4.nix  | 69 +++++++++++++++++++
 2 files changed, 70 insertions(+)
 create mode 100644 upstart-jobs/xserver/desktopManager/kde4.nix

diff --git a/upstart-jobs/xserver/desktopManager/default.nix b/upstart-jobs/xserver/desktopManager/default.nix
index ab1271e69ae..7ea49571698 100644
--- a/upstart-jobs/xserver/desktopManager/default.nix
+++ b/upstart-jobs/xserver/desktopManager/default.nix
@@ -10,6 +10,7 @@ in
 {
   require = [
     (import ./kde.nix)
+    (import ./kde4.nix)
     (import ./gnome.nix)
     (import ./xterm.nix)
     (import ./none.nix)
diff --git a/upstart-jobs/xserver/desktopManager/kde4.nix b/upstart-jobs/xserver/desktopManager/kde4.nix
new file mode 100644
index 00000000000..2694057720b
--- /dev/null
+++ b/upstart-jobs/xserver/desktopManager/kde4.nix
@@ -0,0 +1,69 @@
+{pkgs, config, ...}:
+
+let
+  inherit (pkgs.lib) mkOption mkIf;
+  cfg = config.services.xserver.desktopManager.kde;
+  xorg = config.services.xserver.package;
+
+  options = { services = { xserver = { desktopManager = {
+
+    kde4 = {
+      enable = mkOption {
+        default = false;
+        example = true;
+        description = "Enable the kde 4 desktop manager.";
+      };
+    };
+
+  }; }; }; };
+in
+
+mkIf cfg.enable {
+  require = options;
+
+  services = {
+    xserver = {
+
+      desktopManager = {
+        session = [{
+          name = "kde4";
+          start = ''
+            # Start KDE.
+            export KDEDIRS=$HOME/.nix-profile:/nix/var/nix/profiles/default:${pkgs.kde42.kdelibs}:${pkgs.kde42.kdebase}:${pkgs.kde42.kdebase_runtime}:${pkgs.kde42.kdebase_workspace}
+            export XDG_CONFIG_DIRS=${pkgs.kde42.kdelibs}/etc/xdg:${pkgs.kde42.kdebase_runtime}/etc/xdg:${pkgs.kde42.kdebase_workspace}/etc/xdg
+            export XDG_DATA_DIRS=${pkgs.kde42.kdelibs}/share:${pkgs.kde42.kdebase}/share:${pkgs.kde42.kdebase_runtime}/share:${pkgs.kde42.kdebase_workspace}/share:${pkgs.shared_mime_info}/share
+            exec ${pkgs.kde42.kdebase_workspace}/bin/startkde
+          '';
+        }];
+      };
+
+    };
+  };
+
+  security = {
+    extraSetuidPrograms = [
+      "kcheckpass"
+    ];
+  };
+
+  environment = {
+    extraPackages = [
+      xorg.xmessage # so that startkde can show error messages
+      pkgs.qt4 # needed for qdbus
+      pkgs.kde42.kdelibs
+      pkgs.kde42.kdebase
+      pkgs.kde42.kdebase_runtime
+      pkgs.kde42.kdebase_workspace
+      xorg.xset # used by startkde, non-essential
+    ];
+
+    etc = [
+      { source = ../../../etc/pam.d/kde;
+        target = "pam.d/kde";
+      }
+      { source = "${pkgs.xkeyboard_config}/etc/X11/xkb";
+        target = "X11/xkb";
+      }
+    ];
+  };
+}
-- 
GitLab


From a4fc915634bdc56486575308fbf29c7499086672 Mon Sep 17 00:00:00 2001
From: Nicolas Pierron <nicolas.b.pierron@gmail.com>
Date: Sun, 22 Feb 2009 16:08:51 +0000
Subject: [PATCH 1234/5331] commented out theme because url is broken

svn path=/nixos/branches/fix-style/; revision=14186
---
 installer/cd-dvd/rescue-cd.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/installer/cd-dvd/rescue-cd.nix b/installer/cd-dvd/rescue-cd.nix
index 66c707c77a7..d069c4351f9 100644
--- a/installer/cd-dvd/rescue-cd.nix
+++ b/installer/cd-dvd/rescue-cd.nix
@@ -148,12 +148,14 @@ rec {
               sha256 = "0sdykpziij1f3w4braq8r8nqg4lnsd7i7gi1k5d7c31m2q3b9a7r";
             };
           }
+          /* url is broken
           { tty = 8;
             theme = pkgs.fetchurl {
               url = http://www.bootsplash.de/files/themes/Theme-GNU.tar.bz2;
               md5 = "61969309d23c631e57b0a311102ef034";
             };
           }
+          */
         ];
       };
 
-- 
GitLab


From b1164d8daef76ce702691513648b6775212ad423 Mon Sep 17 00:00:00 2001
From: Nicolas Pierron <nicolas.b.pierron@gmail.com>
Date: Sun, 22 Feb 2009 16:08:55 +0000
Subject: [PATCH 1235/5331] added sshfsFuse and screen to rescue-cd.nix

sshsfsFuse so that you can get packages from another machine easily
screen so that you can copy paste easily

svn path=/nixos/branches/fix-style/; revision=14187
---
 installer/cd-dvd/rescue-cd.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/installer/cd-dvd/rescue-cd.nix b/installer/cd-dvd/rescue-cd.nix
index d069c4351f9..2b82df15fe3 100644
--- a/installer/cd-dvd/rescue-cd.nix
+++ b/installer/cd-dvd/rescue-cd.nix
@@ -190,6 +190,9 @@ rec {
         pkgs.gdb # for debugging Nix
         pkgs.testdisk # useful for repairing boot problems
         pkgs.mssys # for writing Microsoft boot sectors / MBRs
+
+        pkgs.sshfsFuse
+        pkgs.screen
       ];
     };
    
-- 
GitLab


From e8294555216c86e74d7e251b12c9f5459a8bc6e6 Mon Sep 17 00:00:00 2001
From: Nicolas Pierron <nicolas.b.pierron@gmail.com>
Date: Sun, 22 Feb 2009 16:08:59 +0000
Subject: [PATCH 1236/5331] added possibility make nixos-install not downlooad
 the manifest

do so by export NIXOS_PULL=0 (same as in nixos-rebuild)

svn path=/nixos/branches/fix-style/; revision=14188
---
 installer/nixos-install.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/installer/nixos-install.sh b/installer/nixos-install.sh
index 1288304cbe0..1784b4357f1 100644
--- a/installer/nixos-install.sh
+++ b/installer/nixos-install.sh
@@ -131,7 +131,7 @@ export NIX_OTHER_STORES=/mnt/nix:$NIX_OTHER_STORES
 
 
 # Do a nix-pull to speed up building.
-if test -n "@nixpkgsURL@"; then
+if test -n "@nixpkgsURL@" -a ${NIXOS_PULL:-1} != 0; then
     chroot $mountPoint @nix@/bin/nix-pull @nixpkgsURL@/MANIFEST || true
 fi
 
-- 
GitLab


From 51fee9bfbc45e97df1581032272bddbbc36cb5f4 Mon Sep 17 00:00:00 2001
From: Nicolas Pierron <nicolas.b.pierron@gmail.com>
Date: Sun, 22 Feb 2009 16:09:03 +0000
Subject: [PATCH 1237/5331] * Include the SVN revision in the ISO name.

svn path=/nixos/branches/fix-style/; revision=14189
---
 release.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/release.nix b/release.nix
index 4612e94ded9..d291e21b8dd 100644
--- a/release.nix
+++ b/release.nix
@@ -54,6 +54,7 @@ let
           platform = system;
           compressImage = true;
           nixpkgsPath = nixpkgs.path;
+          relName = "nixos-${builtins.readFile ./VERSION}${if !officialRelease then "pre${toString nixosSrc.rev}" else ""}";
         }).rescueCD;
 
       in
-- 
GitLab


From fd08470a26a4eedaf5181fea8c6522d25b666804 Mon Sep 17 00:00:00 2001
From: Nicolas Pierron <nicolas.b.pierron@gmail.com>
Date: Sun, 22 Feb 2009 16:09:07 +0000
Subject: [PATCH 1238/5331] * Quick hack to make sure that acpid starts before
 hal.

svn path=/nixos/branches/fix-style/; revision=14190
---
 upstart-jobs/hal.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/upstart-jobs/hal.nix b/upstart-jobs/hal.nix
index 96982341080..e510120a04d 100644
--- a/upstart-jobs/hal.nix
+++ b/upstart-jobs/hal.nix
@@ -46,7 +46,7 @@ let
 
       # !!! TODO: make sure that HAL starts after acpid,
       # otherwise hald-addon-acpi will grab /proc/acpi/event.
-      start on dbus
+      start on ${if config.powerManagement.enable then "acpid" else "dbus"}
       stop on shutdown
 
       start script
-- 
GitLab


From 357ca60ed78854a6f9f550bb493e16a78bdb38ea Mon Sep 17 00:00:00 2001
From: Nicolas Pierron <nicolas.b.pierron@gmail.com>
Date: Sun, 22 Feb 2009 16:09:14 +0000
Subject: [PATCH 1239/5331] * Set KDEDIRS, XDG_CONFIG_DIRS and XDG_DATA_DIRS in
 bashrc.  This has   the advantage that KDE applications work when logging in
 via ssh,   and that you don't need to logout to have KDE upgrades take
 effect.   On the downside, since the various KDE packages and
 shared-mime-info   all have their own MIME databases, if we put them in one
 symlink   tree (systemPath), we need to rerun update-mime-database on the  
 symlink tree.  Also, systemPath is getting very large.

svn path=/nixos/branches/fix-style/; revision=14191
---
 etc/bashrc.sh                                | 11 +++++++++--
 system/options.nix                           |  2 +-
 system/system-options.nix                    | 10 ++++++++++
 upstart-jobs/xserver/desktopManager/kde4.nix |  5 ++---
 4 files changed, 22 insertions(+), 6 deletions(-)

diff --git a/etc/bashrc.sh b/etc/bashrc.sh
index 4ec3b4ab415..20b78b21c63 100644
--- a/etc/bashrc.sh
+++ b/etc/bashrc.sh
@@ -15,7 +15,9 @@ export LANG=@defaultLocale@
 export EDITOR=nano
 export INFOPATH=/var/run/current-system/sw/info:/var/run/current-system/sw/share/info
 export LOCATE_PATH=/var/cache/locatedb
-
+export KDEDIRS=/var/run/current-system/sw
+export XDG_CONFIG_DIRS=/var/run/current-system/sw/etc/xdg
+export XDG_DATA_DIRS=/var/run/current-system/sw/share
 
 # Set up secure multi-user builds: non-root users build through the
 # Nix daemon.
@@ -41,7 +43,7 @@ for i in $NIX_PROFILES; do # !!! reverse
     export PKG_CONFIG_PATH="$i/lib/pkgconfig:$PKG_CONFIG_PATH"
 
     # Automake's `aclocal' bails out if it finds non-existent directories
-    # in its path.
+    # in its path.  !!! We should fix aclocal instead.
     if [ -d "$i/share/aclocal" ]
     then
 	export ACLOCAL_PATH="$i/share/aclocal:$ACLOCAL_PATH"
@@ -50,6 +52,11 @@ for i in $NIX_PROFILES; do # !!! reverse
 
     # GStreamer.
     export GST_PLUGIN_PATH="$i/lib/gstreamer-0.10:$GST_PLUGIN_PATH"
+
+    # KDE/Gnome stuff.
+    export KDEDIRS=$i:$KDEDIRS
+    export XDG_CONFIG_DIRS=$i/etc/xdg:$XDG_CONFIG_DIRS
+    export XDG_DATA_DIRS=$i/share:$XDG_DATA_DIRS
 done
 
 
diff --git a/system/options.nix b/system/options.nix
index babd4cfc162..34ae64a3c51 100644
--- a/system/options.nix
+++ b/system/options.nix
@@ -2127,7 +2127,7 @@ in
   environment = {
 
     pathsToLink = mkOption {
-      default = ["/bin" "/sbin" "/lib" "/share" "/man" "/info"];
+      default = ["/bin" "/sbin" "/lib" "/share" "/man" "/info" "/etc"];
       example = ["/"];
       description = "
         Lists directories to be symlinked in `/var/run/current-system/sw'.
diff --git a/system/system-options.nix b/system/system-options.nix
index b1688cdda80..fdbd57a79f0 100644
--- a/system/system-options.nix
+++ b/system/system-options.nix
@@ -64,6 +64,16 @@ let
           inherit (config.environment) pathsToLink;
 
           ignoreCollisions = true;
+
+          # TODO: move this to upstart-jobs/xserver/desktopManager/kde4.nix
+          postBuild =
+            if config.services.xserver.desktopManager.kde4.enable then
+              # Rebuild the MIME database.  Otherwise KDE won't be able to
+              # find many MIME types.
+              ''
+                ${pkgs.shared_mime_info}/bin/update-mime-database $out/share/mime
+              ''
+            else "";
         };
       };
 
diff --git a/upstart-jobs/xserver/desktopManager/kde4.nix b/upstart-jobs/xserver/desktopManager/kde4.nix
index 2694057720b..d7d91812a5d 100644
--- a/upstart-jobs/xserver/desktopManager/kde4.nix
+++ b/upstart-jobs/xserver/desktopManager/kde4.nix
@@ -29,9 +29,6 @@ mkIf cfg.enable {
           name = "kde4";
           start = ''
             # Start KDE.
-            export KDEDIRS=$HOME/.nix-profile:/nix/var/nix/profiles/default:${pkgs.kde42.kdelibs}:${pkgs.kde42.kdebase}:${pkgs.kde42.kdebase_runtime}:${pkgs.kde42.kdebase_workspace}
-            export XDG_CONFIG_DIRS=${pkgs.kde42.kdelibs}/etc/xdg:${pkgs.kde42.kdebase_runtime}/etc/xdg:${pkgs.kde42.kdebase_workspace}/etc/xdg
-            export XDG_DATA_DIRS=${pkgs.kde42.kdelibs}/share:${pkgs.kde42.kdebase}/share:${pkgs.kde42.kdebase_runtime}/share:${pkgs.kde42.kdebase_workspace}/share:${pkgs.shared_mime_info}/share
             exec ${pkgs.kde42.kdebase_workspace}/bin/startkde
           '';
         }];
@@ -54,6 +51,8 @@ mkIf cfg.enable {
       pkgs.kde42.kdebase
       pkgs.kde42.kdebase_runtime
       pkgs.kde42.kdebase_workspace
+      pkgs.kde42.kdegames
+      pkgs.shared_mime_info
       xorg.xset # used by startkde, non-essential
     ];
 
-- 
GitLab


From a3b91410cda70949e609689a66b793575884d0d5 Mon Sep 17 00:00:00 2001
From: Nicolas Pierron <nicolas.b.pierron@gmail.com>
Date: Sun, 22 Feb 2009 23:33:53 +0000
Subject: [PATCH 1240/5331] Fix kde4 configuration.

svn path=/nixos/branches/fix-style/; revision=14198
---
 upstart-jobs/xserver/desktopManager/kde4.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/upstart-jobs/xserver/desktopManager/kde4.nix b/upstart-jobs/xserver/desktopManager/kde4.nix
index d7d91812a5d..d39356f05de 100644
--- a/upstart-jobs/xserver/desktopManager/kde4.nix
+++ b/upstart-jobs/xserver/desktopManager/kde4.nix
@@ -2,7 +2,7 @@
 
 let
   inherit (pkgs.lib) mkOption mkIf;
-  cfg = config.services.xserver.desktopManager.kde;
+  cfg = config.services.xserver.desktopManager.kde4;
   xorg = config.services.xserver.package;
 
   options = { services = { xserver = { desktopManager = {
-- 
GitLab


From 1c66b3e0c0cbf04dd84986ab4251f7799f8f00fc Mon Sep 17 00:00:00 2001
From: Nicolas Pierron <nicolas.b.pierron@gmail.com>
Date: Sun, 22 Feb 2009 23:33:58 +0000
Subject: [PATCH 1241/5331] Fix activation script's merge function.

svn path=/nixos/branches/fix-style/; revision=14199
---
 system/activate-configuration.nix | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/system/activate-configuration.nix b/system/activate-configuration.nix
index 25510aa26bd..72a17d6dfd7 100644
--- a/system/activate-configuration.nix
+++ b/system/activate-configuration.nix
@@ -3,7 +3,8 @@
 
 let
   inherit (pkgs.stringsWithDeps) textClosureOverridable noDepEntry;
-  inherit (pkgs.lib) mkOption mergeTypedOption mergeAttrs mapRecordFlatten mapAttrs;
+  inherit (pkgs.lib) mkOption mergeTypedOption mergeAttrs mapRecordFlatten
+    mapAttrs addErrorContext fold;
 
   textClosure = steps:
     textClosureOverridable steps (
@@ -44,8 +45,9 @@ in
         Activate the new configuration (i.e., update /etc, make accounts,
         and so on).
       '';
-      merge = mergeTypedOption "script" builtins.isAttrs mergeAttrs;
-      apply = set: let lib = addAttributeName set; in {
+      merge = mergeTypedOption "script" builtins.isAttrs (fold mergeAttrs {});
+      apply = set:
+        let lib = addAttributeName set; in {
         inherit lib; # used to fetch dependencies.
         script = aggregateScripts "activationScript" lib;
       };
-- 
GitLab


From 22f49c3cd2a7387fa84499be02194a52df47b927 Mon Sep 17 00:00:00 2001
From: Nicolas Pierron <nicolas.b.pierron@gmail.com>
Date: Sun, 22 Feb 2009 23:34:03 +0000
Subject: [PATCH 1242/5331] * Add a small script to ensure that all
 configurations in doc/config-examples can be evaluated. * Fix
 doc/config-examples/svn-server.nix to use the experimental apache
 configuration.

svn path=/nixos/branches/fix-style/; revision=14200
---
 doc/config-examples/svn-server.nix |  1 +
 test/test-config-examples.sh       | 14 ++++++++++++++
 2 files changed, 15 insertions(+)
 create mode 100755 test/test-config-examples.sh

diff --git a/doc/config-examples/svn-server.nix b/doc/config-examples/svn-server.nix
index 7f2dafe16ad..a3c3b46cf24 100644
--- a/doc/config-examples/svn-server.nix
+++ b/doc/config-examples/svn-server.nix
@@ -17,6 +17,7 @@
 
     httpd = {
       enable = true;
+      experimental = true;
       adminAddr = "admin@example.org";
 
       subservices = {
diff --git a/test/test-config-examples.sh b/test/test-config-examples.sh
new file mode 100755
index 00000000000..1ba2f841c41
--- /dev/null
+++ b/test/test-config-examples.sh
@@ -0,0 +1,14 @@
+#!/bin/sh
+
+# This script try to evaluate all configurations which are stored in
+# doc/config-examples.  This script is useful to ensure that examples are
+# working with the current system.
+
+pwd=$(pwd)
+set -xe
+for i in ../doc/config-examples/*.nix; do
+  NIXOS_CONFIG="$pwd/$i" nix-instantiate \
+      --eval-only --xml --strict > /dev/null 2>&1 \
+      ../default.nix -A system
+done
+set +xe
-- 
GitLab


From 6c2622abe73e63497156d958e701f76573c28169 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 24 Feb 2009 15:07:15 +0000
Subject: [PATCH 1243/5331] * Add support for the Cirrus driver.  This is
 useful in QEMU/KVM   because it emulates a Cirrus card.

svn path=/nixos/trunk/; revision=14227
---
 upstart-jobs/xserver.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/upstart-jobs/xserver.nix b/upstart-jobs/xserver.nix
index c889c6427a9..1a84add6f05 100644
--- a/upstart-jobs/xserver.nix
+++ b/upstart-jobs/xserver.nix
@@ -23,6 +23,7 @@ let
     nv =    { modules = [xorg.xf86videonv]; };
     ati =   { modules = [xorg.xf86videoati]; };
     via =   { modules = [xorg.xf86videovia]; };
+    cirrus = { modules = [xorg.xf86videocirrus]; };
   };
 
   # Get a bunch of user settings.
-- 
GitLab


From 9e29c72bd2adf992980acb53ad851294c5a485f8 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Tue, 24 Feb 2009 16:19:29 +0000
Subject: [PATCH 1244/5331] Automated install is once more succesful

svn path=/nixos/trunk/; revision=14229
---
 installer/cd-dvd/remote-install-scripts/install-script.sh | 2 +-
 installer/cd-dvd/remote-install-scripts/install-test.sh   | 2 +-
 installer/cd-dvd/rescue-cd-configurable.nix               | 6 +++---
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/installer/cd-dvd/remote-install-scripts/install-script.sh b/installer/cd-dvd/remote-install-scripts/install-script.sh
index fbacf6ff6a5..574cdb40a22 100755
--- a/installer/cd-dvd/remote-install-scripts/install-script.sh
+++ b/installer/cd-dvd/remote-install-scripts/install-script.sh
@@ -14,7 +14,7 @@ mkdir -p /mnt/etc/nixos
 
 cat > /mnt/etc/nixos/configuration.nix <<EOF
 
-pkgs: full_configuration: {
+{pkgs, config, ...}: {
   boot = {
     grubDevice = "/dev/sda";
     copyKernels = true;
diff --git a/installer/cd-dvd/remote-install-scripts/install-test.sh b/installer/cd-dvd/remote-install-scripts/install-test.sh
index b9c135b8865..8b68c6a3bb1 100755
--- a/installer/cd-dvd/remote-install-scripts/install-test.sh
+++ b/installer/cd-dvd/remote-install-scripts/install-test.sh
@@ -17,7 +17,7 @@ set -x
 echo "Installation starting.." > report
 
 nix-build -o socat /etc/nixos/nixpkgs -A socat || { echo "Failed to build socat" >&2 ;  exit 2; };
-nix-build -o qemu /etc/nixos/nixpkgs -A qemu || { echo "Failed to build qemu" >&2 ;  exit 2; };
+nix-build -o qemu /etc/nixos/nixpkgs -A ${QEMU_PACKAGE:-qemu} || { echo "Failed to build qemu" >&2 ;  exit 2; };
 
 echo "reboot" | ./socat/bin/socat tcp-listen:4424 stdio >> report &  
 
diff --git a/installer/cd-dvd/rescue-cd-configurable.nix b/installer/cd-dvd/rescue-cd-configurable.nix
index e727d2d1f2d..f021c19b63b 100644
--- a/installer/cd-dvd/rescue-cd-configurable.nix
+++ b/installer/cd-dvd/rescue-cd-configurable.nix
@@ -137,7 +137,7 @@ rec {
 
   nixpkgsRel = "nixpkgs" + (if networkNixpkgs != "" then "-" + networkNixpkgs else "");
  
-  configuration = pkgs: final_configuration: let preConfiguration ={
+  configuration = {pkgs, config, ...}: let preConfiguration ={
     boot = {
       isLiveCD = true;
       # The label used to identify the installation CD.
@@ -164,8 +164,8 @@ rec {
 
       udev = {
         addFirmware = []
-	  ++ (pkgs.lib.optional intel3945FWEnable pkgs.iwlwifi3945ucode)
-	  ++ (pkgs.lib.optional intel4965FWEnable pkgs.iwlwifi4965ucode)
+	  #++ (pkgs.lib.optional intel3945FWEnable pkgs.iwlwifi3945ucode)
+	  #++ (pkgs.lib.optional intel4965FWEnable pkgs.iwlwifi4965ucode)
 	  ;
       };
    
-- 
GitLab


From d1f57d6e1b76882fa8051f2c544b56294211bf71 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Tue, 24 Feb 2009 19:17:25 +0000
Subject: [PATCH 1245/5331] Convert `portmap' Upstart job to the "new" style.

svn path=/nixos/trunk/; revision=14232
---
 system/options.nix       | 13 +-----
 upstart-jobs/default.nix |  6 ---
 upstart-jobs/portmap.nix | 87 +++++++++++++++++++++++++++-------------
 3 files changed, 61 insertions(+), 45 deletions(-)

diff --git a/system/options.nix b/system/options.nix
index a2952b4a325..912a6de6b4b 100644
--- a/system/options.nix
+++ b/system/options.nix
@@ -967,18 +967,6 @@ in
 
     };
 
-    portmap = {
-
-      enable = mkOption {
-        default = false;
-        description = ''
-          Whether to enable `portmap', an ONC RPC directory service
-          notably used by NFS and NIS, and which can be queried
-          using the rpcinfo(1) command.
-        '';
-      };
-    };
-
     avahi = {
 
       enable = mkOption {
@@ -3081,5 +3069,6 @@ root        ALL=(ALL) SETENV: ALL
     (import ../upstart-jobs/rogue.nix)
     (import ../upstart-jobs/guest-users.nix)
     (import ../upstart-jobs/pulseaudio.nix)
+    (import ../upstart-jobs/portmap.nix)
   ];
 }
diff --git a/upstart-jobs/default.nix b/upstart-jobs/default.nix
index f804240a50b..fa92cd57c8f 100644
--- a/upstart-jobs/default.nix
+++ b/upstart-jobs/default.nix
@@ -220,12 +220,6 @@ let
       servers = config.services.ntp.servers;
     })
 
-  # portmap daemon.
-  ++ optional config.services.portmap.enable
-    (import ../upstart-jobs/portmap.nix {
-      inherit (pkgs) makePortmap;
-     })
-
   # Avahi daemon.
   ++ optional config.services.avahi.enable
     (import ../upstart-jobs/avahi-daemon.nix {
diff --git a/upstart-jobs/portmap.nix b/upstart-jobs/portmap.nix
index 18ff06dc1af..9cb96b08b0d 100644
--- a/upstart-jobs/portmap.nix
+++ b/upstart-jobs/portmap.nix
@@ -1,35 +1,68 @@
-{ makePortmap }:
+{pkgs, config, ...}:
+
+###### interface
+let
+  inherit (pkgs.lib) mkOption mkIf;
+  inherit (pkgs) makePortmap;
+
+  uid = (import ../system/ids.nix).uids.portmap;
+  gid = (import ../system/ids.nix).gids.portmap;
+
+  options = {
+    services = {
+      portmap = {
+
+        enable = mkOption {
+          default = false;
+          description = ''
+            Whether to enable `portmap', an ONC RPC directory service
+            notably used by NFS and NIS, and which can be queried
+            using the rpcinfo(1) command.
+          '';
+        };
+
+      };
+    };
+  };
 
-let uid = (import ../system/ids.nix).uids.portmap;
-    gid = (import ../system/ids.nix).gids.portmap;
 in
-{
-  name = "portmap";
-  
-  users = [
-    { name = "portmap";
-      inherit uid;
-      description = "portmap daemon user";
-      home = "/var/empty";
-    }
-  ];
 
-  groups = [
-    { name = "portmap";
-      inherit gid;
-    }
+###### implementation
+mkIf config.services.portmap.enable {
+  require = [
+    options
   ];
+  
+  users = {
+    extraUsers = [
+      { name = "portmap";
+        inherit uid;
+        description = "portmap daemon user";
+        home = "/var/empty";
+      }
+    ];
 
-  job =
-    let portmap = makePortmap { daemonUID = uid; daemonGID = gid; };
-    in
-       ''
-description "ONC RPC portmap"
+    extraGroups = [
+      { name = "portmap";
+        inherit gid;
+      }
+    ];
+  };
 
-start on network-interfaces/started
-stop on network-interfaces/stop
+  services = {
+    extraJobs = [{
+      name = "portmap";
 
-respawn ${portmap}/sbin/portmap
-'';
-  
+      job =
+        let portmap = makePortmap { daemonUID = uid; daemonGID = gid; };
+        in ''
+          description "ONC RPC portmap"
+
+          start on network-interfaces/started
+          stop on network-interfaces/stop
+
+          respawn ${portmap}/sbin/portmap
+        '';
+    }];
+  };
 }
-- 
GitLab


From d01a495de4a37c56e8f6d9f69dd9eee61a54275a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Tue, 24 Feb 2009 20:41:58 +0000
Subject: [PATCH 1246/5331] portmap: Add options.

svn path=/nixos/trunk/; revision=14233
---
 upstart-jobs/portmap.nix | 20 +++++++++++++++++++-
 1 file changed, 19 insertions(+), 1 deletion(-)

diff --git a/upstart-jobs/portmap.nix b/upstart-jobs/portmap.nix
index 9cb96b08b0d..1a8bce11904 100644
--- a/upstart-jobs/portmap.nix
+++ b/upstart-jobs/portmap.nix
@@ -21,6 +21,20 @@ let
           '';
         };
 
+        verbose = mkOption {
+          default = false;
+          description = ''
+            Whether to enable verbose output.
+          '';
+        };
+
+        chroot = mkOption {
+          default = "/var/empty";
+          description = ''
+            If non-empty, a path to change root to.
+          '';
+        };
+
       };
     };
   };
@@ -61,7 +75,11 @@ mkIf config.services.portmap.enable {
           start on network-interfaces/started
           stop on network-interfaces/stop
 
-          respawn ${portmap}/sbin/portmap
+          respawn ${portmap}/sbin/portmap \
+            ${if config.services.portmap.chroot == ""
+              then ""
+              else "-t \"${config.services.portmap.chroot}\""} \
+            ${if config.services.portmap.verbose then "-v" else ""}
         '';
     }];
   };
-- 
GitLab


From f767f1bea87ced6d507a9e0694d419d07dad9c11 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Wed, 25 Feb 2009 21:15:35 +0000
Subject: [PATCH 1247/5331] Updating LiveDVD with X expressions

svn path=/nixos/trunk/; revision=14251
---
 installer/cd-dvd/live-dvd-X-medium.nix  | 26 ++++++++++-----------
 installer/cd-dvd/live-dvd-X-no-soft.nix | 25 ++++++++++-----------
 installer/cd-dvd/live-dvd-X.nix         | 30 ++++++++++++-------------
 3 files changed, 40 insertions(+), 41 deletions(-)

diff --git a/installer/cd-dvd/live-dvd-X-medium.nix b/installer/cd-dvd/live-dvd-X-medium.nix
index ec0089ded56..db57921b4c5 100644
--- a/installer/cd-dvd/live-dvd-X-medium.nix
+++ b/installer/cd-dvd/live-dvd-X-medium.nix
@@ -22,7 +22,7 @@ let
 in 
 (isoFun (rec {
 	inherit platform;
-	lib = (import ../pkgs/lib);
+	lib = (import ../../pkgs/lib);
 
 	networkNixpkgs = "";
 	manualEnabled = true;
@@ -171,40 +171,40 @@ in
 	configList = configuration : [
 	{
 		suffix = "X-vesa";
-		configuration = (configuration // 
+		configuration = args: ((configuration args) // 
 		{
-			boot=configuration.boot // {configurationName = "X with vesa";};
-			services = configuration.services // {
+			boot=(configuration args).boot // {configurationName = "X with vesa";};
+			services = (configuration args).services // {
 				xserver = xConfiguration // {videoDriver = "vesa";};
 			};
 		});
 	}
 	{
 		suffix = "X-Intel";
-		configuration = (configuration // 
+		configuration = args: ((configuration args) // 
 		{
-			boot=configuration.boot // {configurationName = "X with Intel graphic card";};
-			services = configuration.services // {
+			boot=(configuration args).boot // {configurationName = "X with Intel graphic card";};
+			services = (configuration args).services // {
 				xserver = xConfiguration // {videoDriver = "intel"; driSupport = true;};
 			};
 		});
 	}
 	{
 		suffix = "X-ATI";
-		configuration = (configuration // 
+		configuration = args: ((configuration args) // 
 		{
-			boot=configuration.boot // {configurationName = "X with ATI graphic card";};
-			services = configuration.services // {
+			boot=(configuration args).boot // {configurationName = "X with ATI graphic card";};
+			services = (configuration args).services // {
 				xserver = xConfiguration // {videoDriver = "ati"; driSupport = true;};
 			};
 		});
 	}
         {
                 suffix = "X-NVIDIA";
-                configuration = (configuration //
+		configuration = args: ((configuration args) // 
                 {
-                        boot=configuration.boot // {configurationName = "X with NVIDIA graphic card";};
-                        services = configuration.services // {
+                        boot=(configuration args).boot // {configurationName = "X with NVIDIA graphic card";};
+                        services = (configuration args).services // {
                                 xserver = xConfiguration // {videoDriver = "nvidia"; driSupport = true;};
                         };
                 });
diff --git a/installer/cd-dvd/live-dvd-X-no-soft.nix b/installer/cd-dvd/live-dvd-X-no-soft.nix
index 7111107b675..62ebf683d09 100644
--- a/installer/cd-dvd/live-dvd-X-no-soft.nix
+++ b/installer/cd-dvd/live-dvd-X-no-soft.nix
@@ -18,7 +18,6 @@ let
 	windowManager = "twm";
 	tty = "9";
   };
-  pkgs
 
 in 
 (isoFun {
@@ -80,40 +79,40 @@ in
 	configList = configuration : [
 	{
 		suffix = "X-vesa";
-		configuration = (configuration // 
+		configuration = args: ((configuration args) // 
 		{
-			boot=configuration.boot // {configurationName = "X with vesa";};
-			services = configuration.services // {
+			boot=(configuration args).boot // {configurationName = "X with vesa";};
+			services = (configuration args).services // {
 				xserver = xConfiguration // {videoDriver = "vesa";};
 			};
 		});
 	}
 	{
 		suffix = "X-Intel";
-		configuration = (configuration // 
+		configuration = args: ((configuration args) // 
 		{
-			boot=configuration.boot // {configurationName = "X with Intel graphic card";};
-			services = configuration.services // {
+			boot=(configuration args).boot // {configurationName = "X with Intel graphic card";};
+			services = (configuration args).services // {
 				xserver = xConfiguration // {videoDriver = "intel"; driSupport = true;};
 			};
 		});
 	}
 	{
 		suffix = "X-ATI";
-		configuration = (configuration // 
+		configuration = args: ((configuration args) // 
 		{
-			boot=configuration.boot // {configurationName = "X with ATI graphic card";};
-			services = configuration.services // {
+			boot=(configuration args).boot // {configurationName = "X with ATI graphic card";};
+			services = (configuration args).services // {
 				xserver = xConfiguration // {videoDriver = "ati"; driSupport = true;};
 			};
 		});
 	}
         {
                 suffix = "X-NVIDIA";
-                configuration = (configuration //
+		configuration = args: ((configuration args) // 
                 {
-                        boot=configuration.boot // {configurationName = "X with NVIDIA graphic card";};
-                        services = configuration.services // {
+                        boot=(configuration args).boot // {configurationName = "X with NVIDIA graphic card";};
+                        services = (configuration args).services // {
                                 xserver = xConfiguration // {videoDriver = "nvidia"; driSupport = true;};
                         };
                 });
diff --git a/installer/cd-dvd/live-dvd-X.nix b/installer/cd-dvd/live-dvd-X.nix
index e9b3c2df2eb..c98b398a9af 100644
--- a/installer/cd-dvd/live-dvd-X.nix
+++ b/installer/cd-dvd/live-dvd-X.nix
@@ -20,9 +20,9 @@ let
   };
 
 in 
-(isoFun {
+(isoFun (rec {
 	inherit platform;
-	lib = (import ../pkgs/lib);
+	lib = (import ../../pkgs/lib);
 
 	networkNixpkgs = "";
 	manualEnabled = true;
@@ -182,43 +182,43 @@ in
 	configList = configuration : [
 	{
 		suffix = "X-vesa";
-		configuration = (configuration // 
+		configuration = args: ((configuration args) // 
 		{
-			boot=configuration.boot // {configurationName = "X with vesa";};
-			services = configuration.services // {
+			boot=(configuration args).boot // {configurationName = "X with vesa";};
+			services = (configuration args).services // {
 				xserver = xConfiguration // {videoDriver = "vesa";};
 			};
 		});
 	}
 	{
 		suffix = "X-Intel";
-		configuration = (configuration // 
+		configuration = args: ((configuration args) // 
 		{
-			boot=configuration.boot // {configurationName = "X with Intel graphic card";};
-			services = configuration.services // {
+			boot=(configuration args).boot // {configurationName = "X with Intel graphic card";};
+			services = (configuration args).services // {
 				xserver = xConfiguration // {videoDriver = "intel"; driSupport = true;};
 			};
 		});
 	}
 	{
 		suffix = "X-ATI";
-		configuration = (configuration // 
+		configuration = args: ((configuration args) // 
 		{
-			boot=configuration.boot // {configurationName = "X with ATI graphic card";};
-			services = configuration.services // {
+			boot=(configuration args).boot // {configurationName = "X with ATI graphic card";};
+			services = (configuration args).services // {
 				xserver = xConfiguration // {videoDriver = "ati"; driSupport = true;};
 			};
 		});
 	}
         {
                 suffix = "X-NVIDIA";
-                configuration = (configuration //
+		configuration = args: ((configuration args) // 
                 {
-                        boot=configuration.boot // {configurationName = "X with NVIDIA graphic card";};
-                        services = configuration.services // {
+                        boot=(configuration args).boot // {configurationName = "X with NVIDIA graphic card";};
+                        services = (configuration args).services // {
                                 xserver = xConfiguration // {videoDriver = "nvidia"; driSupport = true;};
                         };
                 });
         }
 	];
-}).rescueCD
+})).rescueCD
-- 
GitLab


From f5b2ecdc1375b995236ecd1c4b52269ad108be02 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 27 Feb 2009 12:03:03 +0000
Subject: [PATCH 1248/5331] * Make nix-channel and nix-env work when chroots
 are enabled.

svn path=/nixos/trunk/; revision=14271
---
 etc/default.nix | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/etc/default.nix b/etc/default.nix
index 88d4d39e21e..6ecfedf7897 100644
--- a/etc/default.nix
+++ b/etc/default.nix
@@ -132,16 +132,22 @@ import ../helpers/make-etc.nix {
           # other paths in the store, we need the closure of /bin/sh
           # in `build-chroot-dirs' - otherwise any builder that uses
           # /bin/sh won't work.
-          refs = pkgs.writeReferencesToFile binsh;
+          binshDeps = pkgs.writeReferencesToFile binsh;
+
+          # Likewise, if chroots are turned on, we need Nix's own
+          # closure in the chroot.  Otherwise nix-channel and nix-env
+          # won't work because the dependencies of its builders (like
+          # coreutils and Perl) aren't visible.  Sigh.
+          nixDeps = pkgs.writeReferencesToFile config.environment.nix;
         in 
           pkgs.runCommand "nix.conf" {} ''
-            binshDeps=$(for i in $(cat ${refs}); do if test -d $i; then echo $i; fi; done)
+            extraPaths=$(for i in $(cat ${binshDeps} ${nixDeps}); do if test -d $i; then echo $i; fi; done)
             cat > $out <<END
             # WARNING: this file is generated.
             build-users-group = nixbld
             build-max-jobs = ${toString (config.nix.maxJobs)}
             build-use-chroot = ${if config.nix.useChroot then "true" else "false"}
-            build-chroot-dirs = /dev /dev/pts /proc /bin $(echo $binshDeps)
+            build-chroot-dirs = /dev /dev/pts /proc /bin $(echo $extraPaths)
             ${config.nix.extraOptions}
             END
           '';
-- 
GitLab


From 69ef41ea14b0ffcc0978aae7695ad5e1ddb77516 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 27 Feb 2009 13:40:31 +0000
Subject: [PATCH 1249/5331] * Need gzip in the Nix daemon's PATH.  Forgot to
 commit this.

svn path=/nixos/trunk/; revision=14274
---
 upstart-jobs/nix-daemon.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/upstart-jobs/nix-daemon.nix b/upstart-jobs/nix-daemon.nix
index 553c1c93533..939539a42f9 100644
--- a/upstart-jobs/nix-daemon.nix
+++ b/upstart-jobs/nix-daemon.nix
@@ -8,9 +8,9 @@
     stop on shutdown
     respawn
     script
-      export PATH=${if config.nix.distributedBuilds then "${pkgs.openssh}/bin:" else ""}${pkgs.openssl}/bin:${nix}/bin:$PATH
+      export PATH=${if config.nix.distributedBuilds then "${pkgs.openssh}/bin:${pkgs.gzip}/bin:" else ""}${pkgs.openssl}/bin:${nix}/bin:$PATH
       ${nixEnvVars}
-      exec ${nix}/bin/nix-worker --daemon > /dev/null 2>&1
+      exec nice -10 ${nix}/bin/nix-worker --daemon > /dev/null 2>&1
     end script
   ";
 
-- 
GitLab


From 51078ac5b7a5aa95e0e0ea56d590299e81e9c506 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 27 Feb 2009 14:08:38 +0000
Subject: [PATCH 1250/5331] * Support special characters in
 config.nix.extraOptions.

svn path=/nixos/trunk/; revision=14278
---
 etc/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/etc/default.nix b/etc/default.nix
index 6ecfedf7897..e2fc88744ce 100644
--- a/etc/default.nix
+++ b/etc/default.nix
@@ -140,7 +140,7 @@ import ../helpers/make-etc.nix {
           # coreutils and Perl) aren't visible.  Sigh.
           nixDeps = pkgs.writeReferencesToFile config.environment.nix;
         in 
-          pkgs.runCommand "nix.conf" {} ''
+          pkgs.runCommand "nix.conf" {extraOptions = config.nix.extraOptions; } ''
             extraPaths=$(for i in $(cat ${binshDeps} ${nixDeps}); do if test -d $i; then echo $i; fi; done)
             cat > $out <<END
             # WARNING: this file is generated.
@@ -148,7 +148,7 @@ import ../helpers/make-etc.nix {
             build-max-jobs = ${toString (config.nix.maxJobs)}
             build-use-chroot = ${if config.nix.useChroot then "true" else "false"}
             build-chroot-dirs = /dev /dev/pts /proc /bin $(echo $extraPaths)
-            ${config.nix.extraOptions}
+            $extraOptions
             END
           '';
       target = "nix.conf"; # will be symlinked from /nix/etc/nix/nix.conf in activate-configuration.sh.
-- 
GitLab


From 632d77806ff4a13c511a03abee530a734d95447a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Sat, 28 Feb 2009 20:01:49 +0000
Subject: [PATCH 1251/5331] Fixing vsftpd without anonymous users, adding
 localUsers, and creating chroot path.

svn path=/nixos/trunk/; revision=14286
---
 system/options.nix       |  7 +++++++
 upstart-jobs/default.nix |  2 +-
 upstart-jobs/vsftpd.nix  | 17 ++++++++++++++++-
 3 files changed, 24 insertions(+), 2 deletions(-)

diff --git a/system/options.nix b/system/options.nix
index 912a6de6b4b..a8ddd399603 100644
--- a/system/options.nix
+++ b/system/options.nix
@@ -1847,6 +1847,13 @@ in
         ";
       };
 
+      localUsers = mkOption {
+        default = false;
+        description = "
+          Whether to enable FTP for the local users.
+        ";
+      };
+
       writeEnable = mkOption {
         default = false;
         description = "
diff --git a/upstart-jobs/default.nix b/upstart-jobs/default.nix
index fa92cd57c8f..4569a9ff1ab 100644
--- a/upstart-jobs/default.nix
+++ b/upstart-jobs/default.nix
@@ -308,7 +308,7 @@ let
   ++ optional config.services.vsftpd.enable
     (import ../upstart-jobs/vsftpd.nix {
       inherit (pkgs) vsftpd;
-      inherit (config.services.vsftpd) anonymousUser 
+      inherit (config.services.vsftpd) anonymousUser localUsers
         writeEnable anonymousUploadEnable anonymousMkdirEnable;
     })
 
diff --git a/upstart-jobs/vsftpd.nix b/upstart-jobs/vsftpd.nix
index 01a509ea679..f24ae049026 100644
--- a/upstart-jobs/vsftpd.nix
+++ b/upstart-jobs/vsftpd.nix
@@ -1,4 +1,4 @@
-{ vsftpd, anonymousUser
+{ vsftpd, anonymousUser, localUsers
 , anonymousUploadEnable, anonymousMkdirEnable, writeEnable
 }:
 
@@ -42,6 +42,13 @@ start script
 "anonymous_enable=YES"
     else
 "anonymous_enable=NO") +
+(if localUsers then 
+"
+local_enable=YES"
+else
+"
+local_enable=NO"
+) +
 (if writeEnable then 
 "
 write_enable=YES"
@@ -70,8 +77,16 @@ nopriv_user=vsftpd
 secure_chroot_dir=/var/ftp/empty
 EOF
 
+" + 
+    (if anonymousUser then 
+"
     mkdir -p /home/ftp &&
     chown -R ftp:ftp /home/ftp
+"
+    else "") +
+"
+    mkdir -p /var/ftp/empty &&
+    chown vsftpd /var/ftp/empty
 end script
 
 respawn ${vsftpd}/sbin/vsftpd /etc/vsftpd.conf
-- 
GitLab


From 72bb6b30b32a42702096cfbf74b64b89c2fec78e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Sat, 28 Feb 2009 20:01:56 +0000
Subject: [PATCH 1252/5331] Adding the ftp pam service, for vsftpd.

svn path=/nixos/trunk/; revision=14287
---
 etc/default.nix | 1 +
 etc/pam.d/ftp   | 4 ++++
 2 files changed, 5 insertions(+)
 create mode 100644 etc/pam.d/ftp

diff --git a/etc/default.nix b/etc/default.nix
index e2fc88744ce..7c4d4af8c2c 100644
--- a/etc/default.nix
+++ b/etc/default.nix
@@ -251,6 +251,7 @@ import ../helpers/make-etc.nix {
       "xlock"
       "kde"
       "cups"
+      "ftp"
       "common"
       "common-console" # shared stuff for interactive local sessions
     ]
diff --git a/etc/pam.d/ftp b/etc/pam.d/ftp
new file mode 100644
index 00000000000..50f3cc5ce60
--- /dev/null
+++ b/etc/pam.d/ftp
@@ -0,0 +1,4 @@
+auth     include        common
+account  include        common
+password include        common
+session  include        common
-- 
GitLab


From 8c5f0522e753669b0cec072574820057dcd51642 Mon Sep 17 00:00:00 2001
From: Marc Weber <marco-oweber@gmx.de>
Date: Thu, 5 Mar 2009 17:11:40 +0000
Subject: [PATCH 1253/5331] removed new proposal jobs

the fix-style branch makes them obsolete
It was broken anyway. I'll readd synergy (client, server) jobs again
later

svn path=/nixos/branches/fix-style/; revision=14353
---
 system/options.nix                     |  8 ---
 upstart-jobs/default.nix               | 57 +----------------
 upstart-jobs/new-proposal/synergyc.nix | 31 ---------
 upstart-jobs/new-proposal/synergys.nix | 69 --------------------
 upstart-jobs/new-proposal/tightvnc.nix | 89 --------------------------
 5 files changed, 1 insertion(+), 253 deletions(-)
 delete mode 100644 upstart-jobs/new-proposal/synergyc.nix
 delete mode 100644 upstart-jobs/new-proposal/synergys.nix
 delete mode 100644 upstart-jobs/new-proposal/tightvnc.nix

diff --git a/system/options.nix b/system/options.nix
index 34ae64a3c51..af2801c83d0 100644
--- a/system/options.nix
+++ b/system/options.nix
@@ -380,14 +380,6 @@ in
     ";
   };
 
-  servicesProposal = {
-    # see upstart-jobs/default.nix 
-    # the option declarations can be found in the upstart-jobs/newProposal/*.nix files
-    # one way to include the declarations here is adding kind of glob "*.nix"
-    # file function to builtins to get all jobs
-    # then the checking in upstart-jobs/default.nix can be removed again (together with passing arg optionDeclarations)
-  };
-
   services = {
 
   
diff --git a/upstart-jobs/default.nix b/upstart-jobs/default.nix
index ea5d8fcdbe0..39bc6b3b849 100644
--- a/upstart-jobs/default.nix
+++ b/upstart-jobs/default.nix
@@ -71,63 +71,8 @@ let
     ++ config.boot.extraTTYs
     ++ [config.services.syslogd.tty];
 
-  # looks for a job file foreach attr name found in services from config
-  # passes { thisConfig, config, pkgs }
-  # a job must return { options = {}; job =; }
-  # options is the same format as options.nix, but only contains documentation for this job
-  # TODO check validation
-  newProposalJobs =
-  (
-  let
-    inherit (pkgs.lib) getAttr; 
-    inherit (builtins) attrNames pathExists map;
-    services = getAttr [ "servicesProposal" ] {} config;
-    nameToJobs = name : (
-      (
-      let p = ./new-proposal + "/${name}.nix";
-          p2 = ./new-proposal + "/${name}/default.nix";
-          thisConfig = getAttr [ name ] {} services;
-          path = [name];
-          args = confgiV : {
-            inherit config pkgs thisConfig path;
-            lib = pkgs.lib;
-            upstartHelpers = { # some useful functions 
-              inherit configV; # the first time a error function is passed to get the option list
-                               # the second time a function is passed getting the option for you automatically,
-                               # either returning the default option or the user supplied value (the function apply is applied when given)
-                               # maybe this is complicated, but easy to use (IMHO)
-              mkOption = pkgs.lib.mkOption; # the same function used in options.nix
-              autoGeneratedEtcFile = { name, commentChar ? "#", content } :
-                 { source = pkgs.writeText name 
-                     ("${commentChar} nixos autogenerated etc file based on /etc/nixos/configuration.nix\n" + content);
-                   target = name;
-                 };
-            };
-          };
-          jobFunc = if pathExists p  
-                    then import p
-                    else if pathExists p2 then import p2 
-                        else abort "service ${name} requested but there is no ${p}.nix or ${p}/default.nix file!";
-          options = (jobFunc (args (abort "you can't use configV within options!"))).options;
-          errorWhere = name : "${name} of service ${builtins.toString path}";
-          configV = name : if (__hasAttr name options ) then
-                             let opt = (__getAttr name options ); # this config option description
-                             in if (__hasAttr name thisConfig )
-                                then let v = (__getAttr name thisConfig); in if opt ? apply then opt.apply v else v
-                                else if opt ? default then opt.default else abort "you need to specify the configuration option ${errorWhere name}"
-                           else abort "unkown option ${errorWhere name}";
-          checkConfig = config.environment.checkConfigurationOptions;
-      in # TODO: pass path to checker so it can show full path in the abort case
-          pkgs.checker ( (jobFunc (args configV)).jobs )
-                      checkConfig
-                      options
-                      thisConfig
-
-      ));
-  in pkgs.lib.concatLists ( map nameToJobs (attrNames services)));
-    
   jobs = map makeJob
-    (newProposalJobs ++ [
+    ([
     
     # Syslogd.
     (import ../upstart-jobs/syslogd.nix {
diff --git a/upstart-jobs/new-proposal/synergyc.nix b/upstart-jobs/new-proposal/synergyc.nix
deleted file mode 100644
index 57da073cd75..00000000000
--- a/upstart-jobs/new-proposal/synergyc.nix
+++ /dev/null
@@ -1,31 +0,0 @@
-{ path, thisConfig, config, lib, pkgs, upstartHelpers } : with upstartHelpers; {
-  options = {
-    description = "synergy client lets you use a shared keyboard, mouse and clipboard";
-    screenName = mkOption {
-      default = "";
-      description = " 
-        use screen-name instead the hostname to identify
-        ourselfs to the server.
-        ";
-      apply = x: "-n '${x}'";
-    };
-    address = mkOption {
-      default = "";
-      description = "server address to connect to";
-    };
-  };
-  jobs = [ ( rec {
-    name = "synergyc";
-
-    # TODO start only when X Server has started as well
-    job = "
-description \"${name}\"
-
-start on network-interfaces/started
-stop on network-interfaces/stop
-
-exec ${pkgs.synergy}/bin/synergyc -f ${configV "screenName"} ${configV "address"}
-  ";
-  
-} ) ];
-}
diff --git a/upstart-jobs/new-proposal/synergys.nix b/upstart-jobs/new-proposal/synergys.nix
deleted file mode 100644
index 8c320a07d6f..00000000000
--- a/upstart-jobs/new-proposal/synergys.nix
+++ /dev/null
@@ -1,69 +0,0 @@
-{ path, thisConfig, config, lib, pkgs, upstartHelpers } : with upstartHelpers; {
-  options = {
-    description = "synergy client lets you use a shared keyboard, mouse and clipboard";
-
-    configuration = mkOption {
-      description = "
-        The synergy server configuration file
-      ";
-    };
-    screenName = mkOption {
-      default = "";
-      description = " 
-        use screen-name instead the hostname to identify
-        this screen in the configuration.
-        ";
-      apply = x: "-n '${x}'";
-    };
-    address = mkOption {
-      default = "";
-      description = "listen for clients on the given address";
-      apply = x: "-a '${x}'";
-    };
-  };
-
-  jobs =
-    [ ( rec {
-      name = "synergys";
-
-      extraEtc = [ (autoGeneratedEtcFile { name = name + ".conf"; content = thisConfig.configuration; }) ];
-
-      # TODO start only when X Server has started as well
-  job = "
-description \"${name}\"
-
-start on network-interfaces/started and xserver/started
-stop on network-interfaces/stop or xserver/stop
-
-exec ${pkgs.synergy}/bin/synergys -c /etc/${name}.conf -f ${configV "address"} ${configV "screenName"}
-  ";
-  
-} ) ];
-}
-
-/* Example configuration
-
-section: screens
-  laptop:
-  dm:
-  win:
-end
-section: aliases
-    laptop: 
-      192.168.5.5
-    dm:
-      192.168.5.78
-    win:
-      192.168.5.54
-end
-section: links
-   laptop:
-       left = dm
-   dm:
-       right = laptop
-       left = win
-  win:
-      right = dm
-end
-
-*/
diff --git a/upstart-jobs/new-proposal/tightvnc.nix b/upstart-jobs/new-proposal/tightvnc.nix
deleted file mode 100644
index 054828a5230..00000000000
--- a/upstart-jobs/new-proposal/tightvnc.nix
+++ /dev/null
@@ -1,89 +0,0 @@
-{ path, thisConfig, config, lib, pkgs, upstartHelpers } : with upstartHelpers; rec {
-  options = {
-    description = "tightvnc vnc server (share virtual desktop over network";
-
-    geometry = mkOption {
-      default = "-geometry 800x600";
-      example = "800x600";
-      description = ''
-        size of virtual screen
-      '';
-      apply = x :  "-geometry '${x}'";
-    };
-    depth = mkOption {
-      default = "-depth 24";
-      description = ''
-        use screen-name instead the hostname to identify
-        this screen in the configuration.
-        value must be something between 8 and 32
-        '';
-      apply = x: "-depth '${x}'";
-      check = x: (__lessThan x 33) && (7 __lessThan x); # not yet used
-    };
-    display = mkOption {
-      default = ":8";
-      example = 8;
-      description = "display to use";
-      apply = x: ":${builtins.toString x}";
-    };
-    authFile = mkOption {
-      default = "-auth /etc/tightvnc-pwd";
-      description = ''
-        The file containing authentication passwords.
-        Can be created using vncpasswd
-      '';
-      apply = x: "-auth '${x}'";
-      check = __pathExists;
-    };
-    httpPort = mkOption {
-      default = "-httpport 5900";
-      example = 5901;
-      description = "http port to listen to (Java applet remote interface)";
-      apply = x: "-httpport '${builtins.toString x}'";
-    };
-    desktopName = mkOption {
-      description = ''
-        Set VNC desktop name ("x11" by default)
-      '';
-      apply = x: "-desktop '${x}'";
-    };
-    viewOnly = mkOption {
-      default = "";
-      description = ''
-        Don't accept keboard and pointer events from clients. All clients will be able to see
-        the desktop but won't be able to control it.
-      '';
-      apply = x: "-viewonly '${x}'";
-    };
-    interface = mkOption {
-      default = "";
-      description = ''
-        Listen for client connections only on the network interface with given ipaddr
-      '';
-      apply = x: "-interface '${x}'";
-    };
-    extras = mkOption {
-      default = "";
-      description = ''
-        additional params, see man Xvnc
-      '';
-    };
-  };
-
-  jobs = if (lib.getAttr ["services" "xfs" "enable"] false config) != true
-    then abort "you need to enable xfs services = { xfs = { enable = true; }; } within your nixos/configuration.nix file"
-    else
-    [ ( rec {
-      name = "tightvnc";
-
-  job = "
-description \"${name}\"
-
-start on network-interfaces/started and xserver/started
-stop on network-interfaces/stop or xserver/stop
-
-exec ${pkgs.tightvnc}/bin/Xvnc -fp unix/:7100 ${lib.concatStringsSep " " (lib.mapIf (x : x != "description") configV (__attrNames options ) ) }
-  ";
-} ) ];
-}
-# 
-- 
GitLab


From 1c43b4946b6c4fd121a5a1c650d81aabaa8340ef Mon Sep 17 00:00:00 2001
From: Marc Weber <marco-oweber@gmx.de>
Date: Fri, 6 Mar 2009 12:25:25 +0000
Subject: [PATCH 1254/5331] Convert "acpid"

svn path=/nixos/branches/fix-style/; revision=14358
---
 system/options.nix     | 14 ++---------
 upstart-jobs/acpid.nix | 56 +++++++++++++++++++++++++++++-------------
 2 files changed, 41 insertions(+), 29 deletions(-)

diff --git a/system/options.nix b/system/options.nix
index af2801c83d0..1b924accb5d 100644
--- a/system/options.nix
+++ b/system/options.nix
@@ -2180,18 +2180,6 @@ in
   };
 
     
-  powerManagement = {
-    
-    enable = mkOption {
-      default = false;
-      description = "
-        Whether to enable power management.
-      ";
-    };
-
-  };
-  
-
   nesting = {
     children = mkOption {
       default = [];
@@ -2222,6 +2210,8 @@ in
     (import ../system/activate-configuration.nix)
     (import ../upstart-jobs/default.nix)
 
+    (import ../upstart-jobs/acpid.nix) # ACPI daemon
+
     # security
     (import ../system/sudo.nix)
 
diff --git a/upstart-jobs/acpid.nix b/upstart-jobs/acpid.nix
index e2eb702bcd4..5ab724b431c 100644
--- a/upstart-jobs/acpid.nix
+++ b/upstart-jobs/acpid.nix
@@ -1,5 +1,22 @@
 {pkgs, config, ...}:
 
+###### interface
+let
+  inherit (pkgs.lib) mkOption mkIf;
+
+  options = {
+    powerManagement = {
+
+      enable = mkOption {
+        default = false;
+        description = "Whether to enable power management (ACPI daemon)";
+      };
+    };
+  };
+in
+
+###### implementation
+
 let
 
   acpiConfDir = pkgs.runCommand "acpi-events" {}
@@ -17,9 +34,7 @@ let
         in pkgs.lib.concatMapStrings f events
       }
     '';
-
-  events = [powerEvent lidEvent acEvent];
-
+  
   # Called when the power button is pressed.
   powerEvent =
     { name = "power-button";
@@ -29,7 +44,7 @@ let
           #! ${pkgs.bash}/bin/sh
         '';
     };
-
+  
   # Called when the laptop lid is opened/closed.
   lidEvent = 
     { name = "lid";
@@ -47,7 +62,7 @@ let
           fi
         '';
     };
-
+  
   # Called when the AC power is connected or disconnected.
   acEvent =
     { name = "ac-power";
@@ -64,20 +79,27 @@ let
         '';
     };
 
+  events = [powerEvent lidEvent acEvent];
+
 in
 
-{
-  name = "acpid";
-  
-  extraPath = [pkgs.acpid];
-  
-  job = ''
-    description "ACPI daemon"
+mkIf config.powerManagement.enable {
+  require = [
+    options
+  ];
 
-    start on udev
-    stop on shutdown
+  services = {
+    extraJobs = [{
+      name = "acpid";
 
-    respawn ${pkgs.acpid}/sbin/acpid --foreground --confdir ${acpiConfDir}
-  '';
-  
+      job = ''
+        description "ACPI daemon"
+
+        start on udev
+        stop on shutdown
+
+        respawn ${pkgs.acpid}/sbin/acpid --foreground --confdir ${acpiConfDir}
+      '';
+    }];
+  };
 }
-- 
GitLab


From e344a2d055e01a2b98d03961b99a8c7c9efaf4bd Mon Sep 17 00:00:00 2001
From: Marc Weber <marco-oweber@gmx.de>
Date: Fri, 6 Mar 2009 12:25:33 +0000
Subject: [PATCH 1255/5331] Convert "unix-odbc-drivers"

svn path=/nixos/branches/fix-style/; revision=14359
---
 etc/default.nix              |  7 ------
 system/options.nix           |  9 +++-----
 system/unix-odbc-drivers.nix | 43 ++++++++++++++++++++++++++++++++++++
 upstart-jobs/default.nix     |  6 -----
 4 files changed, 46 insertions(+), 19 deletions(-)
 create mode 100644 system/unix-odbc-drivers.nix

diff --git a/etc/default.nix b/etc/default.nix
index fc07a39f9be..5e8406d6ffa 100644
--- a/etc/default.nix
+++ b/etc/default.nix
@@ -241,13 +241,6 @@ let
     target = "nix.machines";
   }
     
-  # unixODBC drivers (this solution is not perfect.. Because the user has to
-  # ask the admin to add a driver.. but it's an easy solution which works)
-  ++ (let inis = config.environment.unixODBCDrivers pkgs;
-      in optional (inis != [] ) {
-        source = pkgs.writeText "odbcinst.ini" (pkgs.lib.concatStringsSep "\n" inis);
-        target = "odbcinst.ini";
-      })
   ;
 in
 
diff --git a/system/options.nix b/system/options.nix
index 1b924accb5d..9e30c505345 100644
--- a/system/options.nix
+++ b/system/options.nix
@@ -2171,12 +2171,6 @@ in
       ";
     };
 
-    unixODBCDrivers = mkOption {
-      default = pkgs : [];
-      example = "pkgs : map (x : x.ini) (with pkgs.unixODBCDrivers; [ mysql psql psqlng ] )";
-      description = "specifies unix odbc drivers to be registered at /etc/odbcinst.ini";
-    };
-
   };
 
     
@@ -2212,6 +2206,9 @@ in
 
     (import ../upstart-jobs/acpid.nix) # ACPI daemon
 
+    (import ../system/unix-odbc-drivers.nix)
+
+
     # security
     (import ../system/sudo.nix)
 
diff --git a/system/unix-odbc-drivers.nix b/system/unix-odbc-drivers.nix
new file mode 100644
index 00000000000..7df87db8577
--- /dev/null
+++ b/system/unix-odbc-drivers.nix
@@ -0,0 +1,43 @@
+{pkgs, config, ...}:
+
+###### interface
+let
+  inherit (pkgs.lib) mkOption mkIf;
+
+  options = {
+    environment = {
+      unixODBCDrivers = mkOption {
+        default = [];
+        example = "map (x : x.ini) (with pkgs.unixODBCDrivers; [ mysql psql psqlng ] )";
+        description = ''
+          specifies unix odbc drivers to be registered at /etc/odbcinst.ini. 
+          Maybe you also want to add pkgs.unixODBC to the system path to get a
+          command line client t connnect to odbc databases.
+        '';
+      };
+    };
+  };
+in
+
+###### implementation
+
+
+# unixODBC drivers (this solution is not perfect.. Because the user has to
+# ask the admin to add a driver.. but it's simple and works
+
+mkIf (config.environment.unixODBCDrivers != []) {
+
+  require = [
+    options
+  ];
+  
+  environment = {
+    etc = [
+      { source = 
+          let inis = config.environment.unixODBCDrivers;
+          in pkgs.writeText "odbcinst.ini" (pkgs.lib.concatStringsSep "\n" inis);
+        target = "odbcinst.ini";
+      }
+    ];
+  };
+}
diff --git a/upstart-jobs/default.nix b/upstart-jobs/default.nix
index 39bc6b3b849..f96b9cb3084 100644
--- a/upstart-jobs/default.nix
+++ b/upstart-jobs/default.nix
@@ -305,12 +305,6 @@ let
       inherit (config.services.bitlbee) portNumber interface;
     })
 
-  # ACPI daemon.
-  ++ optional config.powerManagement.enable
-    (import ../upstart-jobs/acpid.nix {
-      inherit config pkgs;
-    })
-
   # Postfix mail server.
   ++ optional config.services.postfix.enable
     (import ../upstart-jobs/postfix.nix {
-- 
GitLab


From a86ae923d7c660cba592c58cec38c32faa2f545b Mon Sep 17 00:00:00 2001
From: Marc Weber <marco-oweber@gmx.de>
Date: Fri, 6 Mar 2009 12:25:35 +0000
Subject: [PATCH 1256/5331] Convert "nixos-environment"

in particular: (override) nix, extraPackages, checkConfigurationOptions

svn path=/nixos/branches/fix-style/; revision=14360
---
 system/nixos-environment.nix | 67 ++++++++++++++++++++++++++++++++++++
 system/options.nix           | 60 ++------------------------------
 2 files changed, 69 insertions(+), 58 deletions(-)
 create mode 100644 system/nixos-environment.nix

diff --git a/system/nixos-environment.nix b/system/nixos-environment.nix
new file mode 100644
index 00000000000..a2e0ae46cdf
--- /dev/null
+++ b/system/nixos-environment.nix
@@ -0,0 +1,67 @@
+
+{pkgs, config, ...}:
+let
+  inherit (pkgs.lib) mergeOneOption mkOption mkIf;
+in
+{
+  require = [ 
+  {
+
+    environment = {
+      checkConfigurationOptions = mkOption {
+        default = true;
+        example = false;
+        description = "
+          If all configuration options must be checked. Non-existing options fail build.
+        ";
+      };
+
+      nix = mkOption {
+        default = pkgs.nixUnstable;
+        example = pkgs.nixCustomFun /root/nix.tar.gz;
+        merge = mergeOneOption;
+        description = "
+          Use non-default Nix easily. Be careful, though, not to break everything.
+        ";
+      };
+
+      extraPackages = mkOption {
+        default = [];
+        example = [pkgs.firefox pkgs.thunderbird];
+        description = "
+          This option allows you to add additional packages to the system
+          path.  These packages are automatically available to all users,
+          and they are automatically updated every time you rebuild the
+          system configuration.  (The latter is the main difference with
+          installing them in the default profile,
+          <filename>/nix/var/nix/profiles/default</filename>.  The value
+          of this option must be a function that returns a list of
+          packages.  The function will be called with the Nix Packages
+          collection as its argument for convenience.
+        ";
+      };
+
+
+      pathsToLink = mkOption {
+        default = ["/bin" "/sbin" "/lib" "/share" "/man" "/info" "/etc"];
+        example = ["/"];
+        description = "
+          Lists directories to be symlinked in `/var/run/current-system/sw'.
+        ";
+      };
+
+      cleanStart = mkOption {
+        default = false;
+        example = true;
+        description = "
+          There are some times when you want really small system for specific 
+          purpose and do not want default package list. Setting 
+          <varname>cleanStart</varname> to <literal>true</literal> allows you 
+          to create a system with empty path - only extraPackages will be 
+          included.
+        ";
+      };
+    };
+  }
+  ];
+}
diff --git a/system/options.nix b/system/options.nix
index 9e30c505345..c0e09721259 100644
--- a/system/options.nix
+++ b/system/options.nix
@@ -2116,64 +2116,6 @@ in
   };
 
 
-  environment = {
-
-    pathsToLink = mkOption {
-      default = ["/bin" "/sbin" "/lib" "/share" "/man" "/info" "/etc"];
-      example = ["/"];
-      description = "
-        Lists directories to be symlinked in `/var/run/current-system/sw'.
-      ";
-    };
-
-    cleanStart = mkOption {
-      default = false;
-      example = true;
-      description = "
-        There are some times when you want really small system for specific 
-        purpose and do not want default package list. Setting 
-        <varname>cleanStart</varname> to <literal>true</literal> allows you 
-        to create a system with empty path - only extraPackages will be 
-        included.
-      ";
-    };
-
-    extraPackages = mkOption {
-      default = [];
-      example = [pkgs.firefox pkgs.thunderbird];
-      description = "
-        This option allows you to add additional packages to the system
-        path.  These packages are automatically available to all users,
-        and they are automatically updated every time you rebuild the
-        system configuration.  (The latter is the main difference with
-        installing them in the default profile,
-        <filename>/nix/var/nix/profiles/default</filename>.  The value
-        of this option must be a function that returns a list of
-        packages.  The function will be called with the Nix Packages
-        collection as its argument for convenience.
-      ";
-    };
-
-    nix = mkOption {
-      default = pkgs.nixUnstable;
-      example = pkgs.nixCustomFun /root/nix.tar.gz;
-      merge = mergeOneOption;
-      description = "
-        Use non-default Nix easily. Be careful, though, not to break everything.
-      ";
-    };
-
-    checkConfigurationOptions = mkOption {
-      default = true;
-      example = false;
-      description = "
-        If all configuration options must be checked. Non-existing options fail build.
-      ";
-    };
-
-  };
-
-    
   nesting = {
     children = mkOption {
       default = [];
@@ -2215,6 +2157,8 @@ in
     # environment
     (import ../etc/default.nix)
 
+    (import ../system/nixos-environment.nix)
+
     # users
     (import ../system/users-groups.nix)
 
-- 
GitLab


From bca405ae44113f95d44aeaf2eb77c0412f77feb9 Mon Sep 17 00:00:00 2001
From: Marc Weber <marco-oweber@gmx.de>
Date: Fri, 6 Mar 2009 12:25:38 +0000
Subject: [PATCH 1257/5331] Convert "kbd" (i18n)

svn path=/nixos/branches/fix-style/; revision=14361
---
 system/i18n.nix          |  47 +++++++++++++++
 system/options.nix       |  39 ++-----------
 upstart-jobs/default.nix |  14 +----
 upstart-jobs/kbd.nix     | 121 ++++++++++++++++++++++++---------------
 4 files changed, 130 insertions(+), 91 deletions(-)
 create mode 100644 system/i18n.nix

diff --git a/system/i18n.nix b/system/i18n.nix
new file mode 100644
index 00000000000..836fa2200a2
--- /dev/null
+++ b/system/i18n.nix
@@ -0,0 +1,47 @@
+{pkgs, config, ...}:
+
+###### interface
+let
+  inherit (pkgs.lib) mkOption mkIf;
+
+  options = {
+    i18n = {
+      defaultLocale = mkOption {
+        default = "en_US.UTF-8";
+        example = "nl_NL.UTF-8";
+        description = "
+          The default locale.  It determines the language for program
+          messages, the format for dates and times, sort order, and so on.
+          It also determines the character set, such as UTF-8.
+        ";
+      };
+
+      consoleFont = mkOption {
+        default = "lat9w-16";
+        example = "LatArCyrHeb-16";
+        description = "
+          The font used for the virtual consoles.  Leave empty to use
+          whatever the <command>setfont</command> program considers the
+          default font.
+        ";
+      };
+
+      consoleKeyMap = mkOption {
+        default = "us";
+        example = "fr";
+        description = "
+          The keyboard mapping table for the virtual consoles.
+        ";
+      };
+    };
+  };
+in
+
+###### implementation
+
+mkIf config.services.pulseaudio.enable {
+  require = [
+    options
+  ];
+
+}
diff --git a/system/options.nix b/system/options.nix
index c0e09721259..efa9372fcf4 100644
--- a/system/options.nix
+++ b/system/options.nix
@@ -2083,39 +2083,6 @@ in
   };
 
 
-  i18n = {
-
-    defaultLocale = mkOption {
-      default = "en_US.UTF-8";
-      example = "nl_NL.UTF-8";
-      description = "
-        The default locale.  It determines the language for program
-        messages, the format for dates and times, sort order, and so on.
-        It also determines the character set, such as UTF-8.
-      ";
-    };
-
-    consoleFont = mkOption {
-      default = "lat9w-16";
-      example = "LatArCyrHeb-16";
-      description = "
-        The font used for the virtual consoles.  Leave empty to use
-        whatever the <command>setfont</command> program considers the
-        default font.
-      ";
-    };
-
-    consoleKeyMap = mkOption {
-      default = "us";
-      example = "fr";
-      description = "
-        The keyboard mapping table for the virtual consoles.
-      ";
-    };
-
-  };
-
-
   nesting = {
     children = mkOption {
       default = [];
@@ -2154,6 +2121,9 @@ in
     # security
     (import ../system/sudo.nix)
 
+    # i18n
+    (import ../system/i18n.nix)
+
     # environment
     (import ../etc/default.nix)
 
@@ -2186,6 +2156,9 @@ in
     (import ../upstart-jobs/rogue.nix)
     (import ../upstart-jobs/guest-users.nix)
     (import ../upstart-jobs/pulseaudio.nix)
+    (import ../upstart-jobs/kbd.nix)
+
+
 
     # fonts
     (import ../system/fonts.nix)
diff --git a/upstart-jobs/default.nix b/upstart-jobs/default.nix
index f96b9cb3084..04e4a470b0d 100644
--- a/upstart-jobs/default.nix
+++ b/upstart-jobs/default.nix
@@ -66,10 +66,7 @@ let
 
   optional = cond: service: pkgs.lib.optional cond (makeJob service);
 
-  requiredTTYs =
-    config.services.mingetty.ttys
-    ++ config.boot.extraTTYs
-    ++ [config.services.syslogd.tty];
+  requiredTTYs = config.requiredTTYs;
 
   jobs = map makeJob
     ([
@@ -138,15 +135,6 @@ let
       inherit nssModulesPath;
     })
 
-    # Console font and keyboard maps.
-    (import ../upstart-jobs/kbd.nix {
-      inherit (pkgs) glibc kbd gzip;
-      ttyNumbers = requiredTTYs;
-      defaultLocale = config.i18n.defaultLocale;
-      consoleFont = config.i18n.consoleFont;
-      consoleKeyMap = config.i18n.consoleKeyMap;
-    })
-
     # Handles the maintenance/stalled event (single-user shell).
     (import ../upstart-jobs/maintenance-shell.nix {
       inherit (pkgs) bash;
diff --git a/upstart-jobs/kbd.nix b/upstart-jobs/kbd.nix
index 8be001b03d6..504b902bcb1 100644
--- a/upstart-jobs/kbd.nix
+++ b/upstart-jobs/kbd.nix
@@ -1,78 +1,109 @@
-{glibc, kbd, gzip, ttyNumbers, defaultLocale, consoleFont, consoleKeyMap}:
+{pkgs, config, ...}:
 
 let
-
+  inherit (pkgs.lib) mkOption;
+
+  # think about where to put this chunk of code!
+  # required by other pieces as well
+  requiredTTYs = config.services.mingetty.ttys
+    ++ config.boot.extraTTYs
+    ++ [config.services.syslogd.tty];
+  ttyNumbers = requiredTTYs;
   ttys = map (nr: "/dev/tty" + toString nr) ttyNumbers;
+  defaultLocale = config.i18n.defaultLocale;
+  consoleFont = config.i18n.consoleFont;
+  consoleKeyMap = config.i18n.consoleKeyMap;
 
 in
 
+###### implementation
+
+# most options are defined in i18n.nix
+
 {
-  name = "kbd";
 
-  extraPath = [
-    kbd
+  inherit requiredTTYs; # pass them to upstart-job/default.nix
+
+  # dummy option so that requiredTTYs can be passed, see above (FIXME)
+  require = [
+    {
+      requiredTTYs = mkOption {
+        default = [];
+      };
+    }
   ];
-  
-  job = "
-    description \"Keyboard / console initialisation\"
 
-    start on udev
+  services = {
+    extraJobs = [{
+      name = "kbd";
 
-    script
+      extraPath = [
+        pkgs.kbd
+      ];
+      
+      job = "
+        description \"Keyboard / console initialisation\"
 
-      export LANG=${defaultLocale}
-      export PATH=${gzip}/bin:$PATH # Needed by setfont
+        start on udev
 
-      set +e # continue in case of errors
+        script
 
-      
-      # Enable or disable UTF-8 mode.  This is based on
-      # unicode_{start,stop}.
-      echo 'Enabling or disabling Unicode mode...'
+          export LANG=${defaultLocale}
+          export PATH=${pkgs.gzip}/bin:$PATH # Needed by setfont
+
+          set +e # continue in case of errors
+
+          
+          # Enable or disable UTF-8 mode.  This is based on
+          # unicode_{start,stop}.
+          echo 'Enabling or disabling Unicode mode...'
+
+          charMap=$(${pkgs.glibc}/bin/locale charmap)
 
-      charMap=$(${glibc}/bin/locale charmap)
+          if test \"$charMap\" = UTF-8; then
 
-      if test \"$charMap\" = UTF-8; then
+            for tty in ${toString ttys}; do
 
-        for tty in ${toString ttys}; do
+              # Tell the console output driver that the bytes arriving are
+              # UTF-8 encoded multibyte sequences. 
+              echo -n -e '\\033%G' > $tty
 
-          # Tell the console output driver that the bytes arriving are
-          # UTF-8 encoded multibyte sequences. 
-          echo -n -e '\\033%G' > $tty
+            done
 
-        done
+            # Set the keyboard driver in UTF-8 mode.
+            ${pkgs.kbd}/bin/kbd_mode -u
 
-        # Set the keyboard driver in UTF-8 mode.
-        ${kbd}/bin/kbd_mode -u
+          else
 
-      else
+            for tty in ${toString ttys}; do
 
-        for tty in ${toString ttys}; do
+              # Tell the console output driver that the bytes arriving are
+              # UTF-8 encoded multibyte sequences. 
+              echo -n -e '\\033%@' > $tty
 
-          # Tell the console output driver that the bytes arriving are
-          # UTF-8 encoded multibyte sequences. 
-          echo -n -e '\\033%@' > $tty
+            done
 
-        done
+            # Set the keyboard driver in ASCII (or any 8-bit character
+            # set) mode.
+            ${pkgs.kbd}/bin/kbd_mode -a
 
-        # Set the keyboard driver in ASCII (or any 8-bit character
-        # set) mode.
-        ${kbd}/bin/kbd_mode -a
+          fi
 
-      fi
 
+          # Set the console font.
+          for tty in ${toString ttys}; do
+            ${pkgs.kbd}/bin/setfont -C $tty ${consoleFont}
+          done
 
-      # Set the console font.
-      for tty in ${toString ttys}; do
-        ${kbd}/bin/setfont -C $tty ${consoleFont}
-      done
 
+          # Set the keymap.
+          ${pkgs.kbd}/bin/loadkeys '${consoleKeyMap}'
 
-      # Set the keymap.
-      ${kbd}/bin/loadkeys '${consoleKeyMap}'
 
+        end script
+      ";
+    
+    }];
+  };
 
-    end script
-  ";
-  
 }
-- 
GitLab


From b5a7c767c53fa0cb5cb036cf1c29d470990986f8 Mon Sep 17 00:00:00 2001
From: Marc Weber <marco-oweber@gmx.de>
Date: Fri, 6 Mar 2009 12:25:44 +0000
Subject: [PATCH 1258/5331] Convert "ldap" (untested)

svn path=/nixos/branches/fix-style/; revision=14362
---
 etc/default.nix                          |  9 ---
 system/options.nix                       | 43 +-------------
 upstart-jobs/ldap/default.nix            | 76 ++++++++++++++++++++++++
 {etc => upstart-jobs/ldap}/ldap.conf.nix |  0
 4 files changed, 79 insertions(+), 49 deletions(-)
 create mode 100644 upstart-jobs/ldap/default.nix
 rename {etc => upstart-jobs/ldap}/ldap.conf.nix (100%)

diff --git a/etc/default.nix b/etc/default.nix
index 5e8406d6ffa..ff5b477498f 100644
--- a/etc/default.nix
+++ b/etc/default.nix
@@ -187,15 +187,6 @@ let
     target = "ssmtp/ssmtp.conf";
   }
 
-  # LDAP configuration.
-  ++ optional config.users.ldap.enable {
-    source = import ./ldap.conf.nix {
-      inherit (pkgs) writeText;
-      inherit config;
-    };
-    target = "ldap.conf";
-  }
-    
   # A bunch of PAM configuration files for various programs.
   ++ (map
     (program:
diff --git a/system/options.nix b/system/options.nix
index efa9372fcf4..d3caa8ea927 100644
--- a/system/options.nix
+++ b/system/options.nix
@@ -2043,46 +2043,6 @@ in
   };
 
 
-  users = {
-
-    ldap = {
-
-      enable = mkOption {
-        default = false;
-        description = "
-          Whether to enable authentication against an LDAP server.
-        ";
-      };
-
-      server = mkOption {
-        example = "ldap://ldap.example.org/";
-        description = "
-          The URL of the LDAP server.
-        ";
-      };
-
-      base = mkOption {
-        example = "dc=example,dc=org";
-        description = "
-          The distinguished name of the search base.
-        ";
-      };
-
-      useTLS = mkOption {
-        default = false;
-        description = "
-          If enabled, use TLS (encryption) over an LDAP (port 389)
-          connection.  The alternative is to specify an LDAPS server (port
-          636) in <option>users.ldap.server</option> or to forego
-          security.
-        ";
-      };
-
-    };
-
-  };
-
-
   nesting = {
     children = mkOption {
       default = [];
@@ -2158,6 +2118,9 @@ in
     (import ../upstart-jobs/pulseaudio.nix)
     (import ../upstart-jobs/kbd.nix)
 
+    #users
+    (import ../upstart-jobs/ldap)
+
 
 
     # fonts
diff --git a/upstart-jobs/ldap/default.nix b/upstart-jobs/ldap/default.nix
new file mode 100644
index 00000000000..4c964cd79f2
--- /dev/null
+++ b/upstart-jobs/ldap/default.nix
@@ -0,0 +1,76 @@
+{pkgs, config, ...}:
+
+###### interface
+let
+  inherit (pkgs.lib) mkOption mkIf;
+
+  options = {
+    users = {
+      ldap = {
+
+        enable = mkOption {
+          default = false;
+          description = "
+            Whether to enable authentication against an LDAP server.
+          ";
+        };
+
+        server = mkOption {
+          example = "ldap://ldap.example.org/";
+          description = "
+            The URL of the LDAP server.
+          ";
+        };
+
+        base = mkOption {
+          example = "dc=example,dc=org";
+          description = "
+            The distinguished name of the search base.
+          ";
+        };
+
+        useTLS = mkOption {
+          default = false;
+          description = "
+            If enabled, use TLS (encryption) over an LDAP (port 389)
+            connection.  The alternative is to specify an LDAPS server (port
+            636) in <option>users.ldap.server</option> or to forego
+            security.
+          ";
+        };
+
+      };
+    };
+  };
+in
+
+###### implementation
+
+mkIf config.users.ldap.enable {
+  require = [
+    options
+  ];
+
+  # LDAP configuration.
+  environment = {
+    etc = [
+
+      # Careful: OpenLDAP seems to be very picky about the indentation of
+      # this file.  Directives HAVE to start in the first column!
+      { source = pkgs.writeText "ldap.conf" ''
+        uri ${config.users.ldap.server}
+        base ${config.users.ldap.base}
+        
+        ${
+        if config.users.ldap.useTLS then ''
+        ssl start_tls
+        tls_checkpeer no
+        '' else ""
+        }
+      '';
+        target = "ldap.conf";
+      }
+    ];
+  };
+
+}
diff --git a/etc/ldap.conf.nix b/upstart-jobs/ldap/ldap.conf.nix
similarity index 100%
rename from etc/ldap.conf.nix
rename to upstart-jobs/ldap/ldap.conf.nix
-- 
GitLab


From f889d6215e29375275494f692dc2566c4bcb79fb Mon Sep 17 00:00:00 2001
From: Marc Weber <marco-oweber@gmx.de>
Date: Fri, 6 Mar 2009 12:25:46 +0000
Subject: [PATCH 1259/5331] Convert "nixos security options"

svn path=/nixos/branches/fix-style/; revision=14363
---
 system/nixos-security.nix | 49 +++++++++++++++++++++++++++++++++++++++
 system/options.nix        | 41 +++-----------------------------
 2 files changed, 52 insertions(+), 38 deletions(-)
 create mode 100644 system/nixos-security.nix

diff --git a/system/nixos-security.nix b/system/nixos-security.nix
new file mode 100644
index 00000000000..10d523ee339
--- /dev/null
+++ b/system/nixos-security.nix
@@ -0,0 +1,49 @@
+{pkgs, config, ...}:
+let
+  inherit (pkgs.lib) mergeOneOption mkOption mkIf;
+in
+{
+  require = [
+    {
+      security = {
+        setuidPrograms = mkOption {
+          default = [
+            "passwd" "su" "crontab" "ping" "ping6"
+            "fusermount" "wodim" "cdrdao" "growisofs"
+          ];
+          description = "
+            Only the programs from system path listed her will be made setuid root
+            (through a wrapper program).  It's better to set
+            <option>security.extraSetuidPrograms</option>.
+          ";
+        };
+
+        extraSetuidPrograms = mkOption {
+          default = [];
+          example = ["fusermount"];
+          description = "
+            This option lists additional programs that must be made setuid
+            root.
+          ";
+        };
+
+        setuidOwners = mkOption {
+          default = [];
+          example = [{
+            program = "sendmail";
+            owner = "nodody";
+            group = "postdrop";
+            setuid = false;
+            setgid = true;
+          }];
+          description = ''
+            List of non-trivial setuid programs from system path, like Postfix sendmail. Default 
+            should probably be nobody:nogroup:false:false - if you are bothering
+            doing anything with a setuid program, "root.root u+s g-s" is not what
+            you are aiming at..
+          '';
+        };
+      };
+    }
+  ];
+}
diff --git a/system/options.nix b/system/options.nix
index d3caa8ea927..70555424fa5 100644
--- a/system/options.nix
+++ b/system/options.nix
@@ -1980,44 +1980,6 @@ in
 
   security = {
 
-    setuidPrograms = mkOption {
-      default = [
-        "passwd" "su" "crontab" "ping" "ping6"
-        "fusermount" "wodim" "cdrdao" "growisofs"
-      ];
-      description = "
-        Only the programs from system path listed her will be made setuid root
-        (through a wrapper program).  It's better to set
-        <option>security.extraSetuidPrograms</option>.
-      ";
-    };
-
-    extraSetuidPrograms = mkOption {
-      default = [];
-      example = ["fusermount"];
-      description = "
-        This option lists additional programs that must be made setuid
-        root.
-      ";
-    };
-
-    setuidOwners = mkOption {
-      default = [];
-      example = [{
-        program = "sendmail";
-        owner = "nodody";
-        group = "postdrop";
-        setuid = false;
-        setgid = true;
-      }];
-      description = ''
-        List of non-trivial setuid programs from system path, like Postfix sendmail. Default 
-        should probably be nobody:nogroup:false:false - if you are bothering
-        doing anything with a setuid program, "root.root u+s g-s" is not what
-        you are aiming at..
-      '';
-    };
-
     seccureKeys = {
       public = mkOption {
         default = /var/elliptic-keys/public;
@@ -2098,6 +2060,9 @@ in
     # hardware
     (import ../upstart-jobs/pcmcia.nix)
 
+    # security
+    (import ../system/nixos-security.nix)
+
     # services
     (import ../upstart-jobs/avahi-daemon.nix)
     (import ../upstart-jobs/atd.nix)
-- 
GitLab


From 028b515a6e7c591f5bd7d77669b81f0930ba48a1 Mon Sep 17 00:00:00 2001
From: Marc Weber <marco-oweber@gmx.de>
Date: Fri, 6 Mar 2009 12:25:48 +0000
Subject: [PATCH 1260/5331] Convert "gw6c" and its security options (untested)

svn path=/nixos/branches/fix-style/; revision=14364
---
 system/options.nix       |  94 +----------------------------
 upstart-jobs/default.nix |   6 --
 upstart-jobs/gw6c.nix    | 126 ++++++++++++++++++++++++++++++++++++---
 3 files changed, 119 insertions(+), 107 deletions(-)

diff --git a/system/options.nix b/system/options.nix
index 70555424fa5..3a24c8dd7fc 100644
--- a/system/options.nix
+++ b/system/options.nix
@@ -1299,72 +1299,6 @@ in
     };
 
 
-    gw6c = {
-
-      enable = mkOption {
-        default = false;
-        description = "
-          Whether to enable Gateway6 client (IPv6 tunnel).
-        ";
-      };
-
-      autorun = mkOption {
-        default = true;
-        description = "
-          Switch to false to create upstart-job and configuration, 
-          but not run it automatically
-        ";
-      };
-
-      username = mkOption {
-        default = "";
-        description = "
-          Your Gateway6 login name, if any.
-        ";
-      };
-
-      password = mkOption {
-        default = "";
-        description = "
-          Your Gateway6 password, if any.
-        ";
-      };
-
-      server = mkOption {
-        default = "anon.freenet6.net";
-        example = "broker.freenet6.net";
-        description = "
-          Used Gateway6 server.
-        ";
-      };
-
-      keepAlive = mkOption {
-        default = "30";
-        example = "2";
-        description = "
-          Gateway6 keep-alive period.
-        ";
-      };
-
-      everPing = mkOption {
-        default = "1000000";
-        example = "2";
-        description = "
-          Gateway6 manual ping period.
-        ";
-      };
-
-      waitPingableBroker = mkOption {
-        default = true;
-        example = false;
-        description = "
-          Whether to wait until tunnel broker returns ICMP echo.
-        ";
-      };
-
-    };
-
-
     ircdHybrid = {
 
       enable = mkOption {
@@ -1978,32 +1912,6 @@ in
   };
 
 
-  security = {
-
-    seccureKeys = {
-      public = mkOption {
-        default = /var/elliptic-keys/public;
-        description = "
-          Public key. Make it path argument, so it is copied into store and
-          hashed. 
-
-          The key is used to encrypt Gateway 6 configuration in store, as it
-          contains a password for external service. Unfortunately, 
-          derivation file should be protected by other means. For example, 
-          nix-http-export.cgi will happily export any non-derivation path,
-          but not a derivation.
-        ";
-      };
-      private = mkOption {
-        default = "/var/elliptic-keys/private";
-        description = "
-          Private key. Make it string argument, so it is not copied into store.
-        ";
-      };
-    };
-
-  };
-
 
   nesting = {
     children = mkOption {
@@ -2082,6 +1990,8 @@ in
     (import ../upstart-jobs/guest-users.nix)
     (import ../upstart-jobs/pulseaudio.nix)
     (import ../upstart-jobs/kbd.nix)
+    (import ../upstart-jobs/gw6c.nix) # Gateway6
+
 
     #users
     (import ../upstart-jobs/ldap)
diff --git a/upstart-jobs/default.nix b/upstart-jobs/default.nix
index 04e4a470b0d..6d3864f1a6f 100644
--- a/upstart-jobs/default.nix
+++ b/upstart-jobs/default.nix
@@ -262,12 +262,6 @@ let
       inherit config pkgs modprobe;
     })
 
-  # Gateway6
-  ++ optional config.services.gw6c.enable
-    (import ../upstart-jobs/gw6c.nix {
-      inherit config pkgs;
-    })
-
   # VSFTPd server
   ++ optional config.services.vsftpd.enable
     (import ../upstart-jobs/vsftpd.nix {
diff --git a/upstart-jobs/gw6c.nix b/upstart-jobs/gw6c.nix
index f3332f9e8f3..21596c22dfa 100644
--- a/upstart-jobs/gw6c.nix
+++ b/upstart-jobs/gw6c.nix
@@ -1,8 +1,106 @@
-{config, pkgs}:
+{pkgs, config, ...}:
+
+###### interface
+let
+  inherit (pkgs.lib) mkOption mkIf;
+
+  options = {
+    services = {
+      gw6c = {
+        enable = mkOption {
+          default = false;
+          description = "
+            Whether to enable Gateway6 client (IPv6 tunnel).
+          ";
+        };
+
+        autorun = mkOption {
+          default = true;
+          description = "
+            Switch to false to create upstart-job and configuration, 
+            but not run it automatically
+          ";
+        };
+
+        username = mkOption {
+          default = "";
+          description = "
+            Your Gateway6 login name, if any.
+          ";
+        };
+
+        password = mkOption {
+          default = "";
+          description = "
+            Your Gateway6 password, if any.
+          ";
+        };
+
+        server = mkOption {
+          default = "anon.freenet6.net";
+          example = "broker.freenet6.net";
+          description = "
+            Used Gateway6 server.
+          ";
+        };
+
+        keepAlive = mkOption {
+          default = "30";
+          example = "2";
+          description = "
+            Gateway6 keep-alive period.
+          ";
+        };
+
+        everPing = mkOption {
+          default = "1000000";
+          example = "2";
+          description = "
+            Gateway6 manual ping period.
+          ";
+        };
+
+        waitPingableBroker = mkOption {
+          default = true;
+          example = false;
+          description = "
+            Whether to wait until tunnel broker returns ICMP echo.
+          ";
+        };
+      };
+    };
+    security = {
+      seccureKeys = {
+        public = mkOption {
+          default = /var/elliptic-keys/public;
+          description = "
+            Public key. Make it path argument, so it is copied into store and
+            hashed. 
+
+            The key is used to encrypt Gateway 6 configuration in store, as it
+            contains a password for external service. Unfortunately, 
+            derivation file should be protected by other means. For example, 
+            nix-http-export.cgi will happily export any non-derivation path,
+            but not a derivation.
+          ";
+        };
+        private = mkOption {
+          default = "/var/elliptic-keys/private";
+          description = "
+            Private key. Make it string argument, so it is not copied into store.
+          ";
+        };
+      };
+    };
+  };
+in
+
+###### implementation
+
 let
         cfg = config.services.gw6c;
         procps = pkgs.procps;
-        gw6cService = import ../services/gw6c {
+        gw6cService = import ../../services/gw6c {
                 inherit (pkgs) stdenv gw6c coreutils 
                 procps upstart iputils gnused 
                 gnugrep seccureUser writeScript;
@@ -17,16 +115,26 @@ let
                 waitPingableBroker = cfg.waitPingableBroker;
         };
 in
-{
+
+
+mkIf config.services.gw6c.enable {
+  require = [
+    options
+  ];
+
+  services = {
+    extraJobs = [{
         name = "gw6c";
         users = [];
         groups = [];
-        job = "
-description \"Gateway6 client\"
+        job = ''
+          description \"Gateway6 client\"
 
-start on ${ if cfg.autorun then "network-interfaces/started" else "never" }
-stop on network-interfaces/stop
+          start on ${ if cfg.autorun then "network-interfaces/started" else "never" }
+          stop on network-interfaces/stop
 
-respawn ${gw6cService}/bin/control start
-";
+          respawn ${gw6cService}/bin/control start
+        '';
+    }];
+  };
 }
-- 
GitLab


From 819873d74566c556d94fd88c85d15ac309162b84 Mon Sep 17 00:00:00 2001
From: Marc Weber <marco-oweber@gmx.de>
Date: Fri, 6 Mar 2009 12:25:51 +0000
Subject: [PATCH 1261/5331] Convert "nix-daemon" and nix options

svn path=/nixos/branches/fix-style/; revision=14365
---
 etc/default.nix          |  26 -----
 system/options.nix       | 136 +----------------------
 upstart-jobs/default.nix |   5 -
 upstart-jobs/nix.nix     | 227 +++++++++++++++++++++++++++++++++++++++
 4 files changed, 229 insertions(+), 165 deletions(-)
 create mode 100644 upstart-jobs/nix.nix

diff --git a/etc/default.nix b/etc/default.nix
index ff5b477498f..8579b334e67 100644
--- a/etc/default.nix
+++ b/etc/default.nix
@@ -129,32 +129,6 @@ let
       target = "inputrc";
     }
 
-    { # Nix configuration.
-      source =
-        let
-          # Tricky: if we're using a chroot for builds, then we need
-          # /bin/sh in the chroot (our own compromise to purity).
-          # However, since /bin/sh is a symlink to some path in the
-          # Nix store, which furthermore has runtime dependencies on
-          # other paths in the store, we need the closure of /bin/sh
-          # in `build-chroot-dirs' - otherwise any builder that uses
-          # /bin/sh won't work.
-          refs = pkgs.writeReferencesToFile binsh;
-        in 
-          pkgs.runCommand "nix.conf" {} ''
-            binshDeps=$(for i in $(cat ${refs}); do if test -d $i; then echo $i; fi; done)
-            cat > $out <<END
-            # WARNING: this file is generated.
-            build-users-group = nixbld
-            build-max-jobs = ${toString (config.nix.maxJobs)}
-            build-use-chroot = ${if config.nix.useChroot then "true" else "false"}
-            build-chroot-dirs = /dev /dev/pts /proc /bin $(echo $binshDeps)
-            ${config.nix.extraOptions}
-            END
-          '';
-      target = "nix.conf"; # will be symlinked from /nix/etc/nix/nix.conf in activate-configuration.sh.
-    }
-
     { # Script executed when the shell starts as a non-login shell (user version).
       source = ./skel/bashrc;
       target = "skel/.bashrc";      
diff --git a/system/options.nix b/system/options.nix
index 3a24c8dd7fc..df484d47451 100644
--- a/system/options.nix
+++ b/system/options.nix
@@ -1779,140 +1779,6 @@ in
   };
 
 
-  nix = {
-
-    maxJobs = mkOption {
-      default = 1;
-      example = 2;
-      description = "
-        This option defines the maximum number of jobs that Nix will try
-        to build in parallel.  The default is 1.  You should generally
-        set it to the number of CPUs in your system (e.g., 2 on a Athlon
-        64 X2).
-      ";
-    };
-
-    useChroot = mkOption {
-      default = false;
-      example = true;
-      description = "
-        If set, Nix will perform builds in a chroot-environment that it
-        will set up automatically for each build.  This prevents
-        impurities in builds by disallowing access to dependencies
-        outside of the Nix store.
-      ";
-    };
-
-    extraOptions = mkOption {
-      default = "";
-      example = "
-        gc-keep-outputs = true
-        gc-keep-derivations = true
-      ";
-      description = "
-        This option allows to append lines to nix.conf. 
-      ";
-    };
-
-    distributedBuilds = mkOption {
-      default = false;
-      description = "
-        Whether to distribute builds to the machines listed in
-        <option>nix.buildMachines</option>.
-      ";
-    };
-
-    buildMachines = mkOption {
-      example = [
-        { hostName = "voila.labs.cs.uu.nl";
-          sshUser = "nix";
-          sshKey = "/root/.ssh/id_buildfarm";
-          system = "powerpc-darwin";
-          maxJobs = 1;
-        }
-        { hostName = "linux64.example.org";
-          sshUser = "buildfarm";
-          sshKey = "/root/.ssh/id_buildfarm";
-          system = "x86_64-linux";
-          maxJobs = 2;
-        }
-      ];
-      description = "
-        This option lists the machines to be used if distributed
-        builds are enabled (see
-        <option>nix.distributedBuilds</option>).  Nix will perform
-        derivations on those machines via SSh by copying the inputs to
-        the Nix store on the remote machine, starting the build, then
-        copying the output back to the local Nix store.  Each element
-        of the list should be an attribute set containing the
-        machine's host name (<varname>hostname</varname>), the user
-        name to be used for the SSH connection
-        (<varname>sshUser</varname>), the Nix system type
-        (<varname>system</varname>, e.g.,
-        <literal>\"i686-linux\"</literal>), the maximum number of jobs
-        to be run in parallel on that machine
-        (<varname>maxJobs</varname>), and the path to the SSH private
-        key to be used to connect (<varname>sshKey</varname>).  The
-        SSH private key should not have a passphrase, and the
-        corresponding public key should be added to
-        <filename>~<replaceable>sshUser</replaceable>/authorized_keys</filename>
-        on the remote machine.
-      ";
-    };
- 
-    proxy = mkOption {
-      default = "";
-      description = "
-        This option specifies the proxy to use for fetchurl. The real effect 
-        is just exporting http_proxy, https_proxy and ftp_proxy with that
-        value.
-      ";
-      example = "http://127.0.0.1:3128";
-    };
-
-    # Environment variables for running Nix.
-    envVars = mkOption {
-      internal = true;
-      default = "";
-      description = "
-        Define the environment variables used by nix to 
-      ";
-
-      merge = pkgs.lib.mergeStringOption;
-
-      # other option should be used to define the content instead of using
-      # the apply function.
-      apply = conf: ''
-        export NIX_CONF_DIR=/nix/etc/nix
-
-        # Enable the copy-from-other-stores substituter, which allows builds
-        # to be sped up by copying build results from remote Nix stores.  To
-        # do this, mount the remote file system on a subdirectory of
-        # /var/run/nix/remote-stores.
-        export NIX_OTHER_STORES=/var/run/nix/remote-stores/*/nix
-        
-      '' + # */
-      (if config.nix.distributedBuilds then
-        ''
-          export NIX_BUILD_HOOK=${config.environment.nix}/libexec/nix/build-remote.pl
-          export NIX_REMOTE_SYSTEMS=/etc/nix.machines
-          export NIX_CURRENT_LOAD=/var/run/nix/current-load
-        ''
-      else "")
-      +
-      (if config.nix.proxy != "" then
-        ''
-          export http_proxy=${config.nix.proxy}
-          export https_proxy=${config.nix.proxy}
-          export ftp_proxy=${config.nix.proxy}
-        ''
-      else "")
-      + conf;
-    };
-  };
-
-
-
   nesting = {
     children = mkOption {
       default = [];
@@ -1992,6 +1858,8 @@ in
     (import ../upstart-jobs/kbd.nix)
     (import ../upstart-jobs/gw6c.nix) # Gateway6
 
+    (import ../upstart-jobs/nix.nix) # nix options and daemon
+
 
     #users
     (import ../upstart-jobs/ldap)
diff --git a/upstart-jobs/default.nix b/upstart-jobs/default.nix
index 6d3864f1a6f..7edff43c08c 100644
--- a/upstart-jobs/default.nix
+++ b/upstart-jobs/default.nix
@@ -124,11 +124,6 @@ let
       inherit (pkgs) nettools wirelesstools bash writeText;
     })
       
-    # Nix daemon - required for multi-user Nix.
-    (import ../upstart-jobs/nix-daemon.nix {
-      inherit config pkgs nix nixEnvVars;
-    })
-
     # Name service cache daemon.
     (import ../upstart-jobs/nscd.nix {
       inherit (pkgs) glibc;
diff --git a/upstart-jobs/nix.nix b/upstart-jobs/nix.nix
new file mode 100644
index 00000000000..c46b721a2a0
--- /dev/null
+++ b/upstart-jobs/nix.nix
@@ -0,0 +1,227 @@
+{pkgs, config, ...}:
+
+###### interface
+let
+  inherit (pkgs.lib) mkOption mkIf;
+
+  options = {
+
+    nix = {
+
+      maxJobs = mkOption {
+        default = 1;
+        example = 2;
+        description = "
+          This option defines the maximum number of jobs that Nix will try
+          to build in parallel.  The default is 1.  You should generally
+          set it to the number of CPUs in your system (e.g., 2 on a Athlon
+          64 X2).
+        ";
+      };
+
+      useChroot = mkOption {
+        default = false;
+        example = true;
+        description = "
+          If set, Nix will perform builds in a chroot-environment that it
+          will set up automatically for each build.  This prevents
+          impurities in builds by disallowing access to dependencies
+          outside of the Nix store.
+        ";
+      };
+
+      extraOptions = mkOption {
+        default = "";
+        example = "
+          gc-keep-outputs = true
+          gc-keep-derivations = true
+        ";
+        description = "
+          This option allows to append lines to nix.conf. 
+        ";
+      };
+
+      distributedBuilds = mkOption {
+        default = false;
+        description = "
+          Whether to distribute builds to the machines listed in
+          <option>nix.buildMachines</option>.
+        ";
+      };
+
+      buildMachines = mkOption {
+        example = [
+          { hostName = "voila.labs.cs.uu.nl";
+            sshUser = "nix";
+            sshKey = "/root/.ssh/id_buildfarm";
+            system = "powerpc-darwin";
+            maxJobs = 1;
+          }
+          { hostName = "linux64.example.org";
+            sshUser = "buildfarm";
+            sshKey = "/root/.ssh/id_buildfarm";
+            system = "x86_64-linux";
+            maxJobs = 2;
+          }
+        ];
+        description = "
+          This option lists the machines to be used if distributed
+          builds are enabled (see
+          <option>nix.distributedBuilds</option>).  Nix will perform
+          derivations on those machines via SSh by copying the inputs to
+          the Nix store on the remote machine, starting the build, then
+          copying the output back to the local Nix store.  Each element
+          of the list should be an attribute set containing the
+          machine's host name (<varname>hostname</varname>), the user
+          name to be used for the SSH connection
+          (<varname>sshUser</varname>), the Nix system type
+          (<varname>system</varname>, e.g.,
+          <literal>\"i686-linux\"</literal>), the maximum number of jobs
+          to be run in parallel on that machine
+          (<varname>maxJobs</varname>), and the path to the SSH private
+          key to be used to connect (<varname>sshKey</varname>).  The
+          SSH private key should not have a passphrase, and the
+          corresponding public key should be added to
+          <filename>~<replaceable>sshUser</replaceable>/authorized_keys</filename>
+          on the remote machine.
+        ";
+      };
+   
+      proxy = mkOption {
+        default = "";
+        description = "
+          This option specifies the proxy to use for fetchurl. The real effect 
+          is just exporting http_proxy, https_proxy and ftp_proxy with that
+          value.
+        ";
+        example = "http://127.0.0.1:3128";
+      };
+
+      # Environment variables for running Nix.
+      envVars = mkOption {
+        internal = true;
+        default = "";
+        description = "
+          Define the environment variables used by nix to 
+        ";
+
+        merge = pkgs.lib.mergeStringOption;
+
+        # other option should be used to define the content instead of using
+        # the apply function.
+        apply = conf: ''
+          export NIX_CONF_DIR=/nix/etc/nix
+
+          # Enable the copy-from-other-stores substituter, which allows builds
+          # to be sped up by copying build results from remote Nix stores.  To
+          # do this, mount the remote file system on a subdirectory of
+          # /var/run/nix/remote-stores.
+          export NIX_OTHER_STORES=/var/run/nix/remote-stores/*/nix
+          
+        '' + # */
+        (if config.nix.distributedBuilds then
+          ''
+            export NIX_BUILD_HOOK=${config.environment.nix}/libexec/nix/build-remote.pl
+            export NIX_REMOTE_SYSTEMS=/etc/nix.machines
+            export NIX_CURRENT_LOAD=/var/run/nix/current-load
+          ''
+        else "")
+        +
+        (if config.nix.proxy != "" then
+          ''
+            export http_proxy=${config.nix.proxy}
+            export https_proxy=${config.nix.proxy}
+            export ftp_proxy=${config.nix.proxy}
+          ''
+        else "")
+        + conf;
+      };
+
+
+      services = {
+        pulseaudio = {
+          enable = mkOption {
+            default = false;
+            description = ''
+              Whether to enable the PulseAudio system-wide audio server.
+              Note that the documentation recommends running PulseAudio
+              daemons per-user rather than system-wide on desktop machines.
+            '';
+          };
+
+          logLevel = mkOption {
+            default = "notice";
+            example = "debug";
+            description = ''
+              A string denoting the log level: one of
+              <literal>error</literal>, <literal>warn</literal>,
+              <literal>notice</literal>, <literal>info</literal>,
+              or <literal>debug</literal>.
+            '';
+          };
+        };
+      };
+    };
+  };
+in
+
+###### implementation
+
+let 
+  binsh = config.system.build.binsh;
+  nixEnvVars = config.nix.envVars;
+  inherit (pkgs) nix;
+in
+
+{
+  require = [
+    options
+  ];
+
+  environment = {
+    etc = [
+      { # Nix configuration.
+        source =
+          let
+            # Tricky: if we're using a chroot for builds, then we need
+            # /bin/sh in the chroot (our own compromise to purity).
+            # However, since /bin/sh is a symlink to some path in the
+            # Nix store, which furthermore has runtime dependencies on
+            # other paths in the store, we need the closure of /bin/sh
+            # in `build-chroot-dirs' - otherwise any builder that uses
+            # /bin/sh won't work.
+            refs = pkgs.writeReferencesToFile binsh;
+          in 
+            pkgs.runCommand "nix.conf" {} ''
+              binshDeps=$(for i in $(cat ${refs}); do if test -d $i; then echo $i; fi; done)
+              cat > $out <<END
+              # WARNING: this file is generated.
+              build-users-group = nixbld
+              build-max-jobs = ${toString (config.nix.maxJobs)}
+              build-use-chroot = ${if config.nix.useChroot then "true" else "false"}
+              build-chroot-dirs = /dev /dev/pts /proc /bin $(echo $binshDeps)
+              ${config.nix.extraOptions}
+              END
+            '';
+        target = "nix.conf"; # will be symlinked from /nix/etc/nix/nix.conf in activate-configuration.sh.
+      }
+    ];
+  };
+
+  services = {
+    extraJobs = [{
+      name = "nix-daemon";
+      
+      job = ''
+        start on startup
+        stop on shutdown
+        respawn
+        script
+          export PATH=${if config.nix.distributedBuilds then "${pkgs.openssh}/bin:" else ""}${pkgs.openssl}/bin:${nix}/bin:$PATH
+          ${nixEnvVars}
+          exec ${pkgs.nix}/bin/nix-worker --daemon > /dev/null 2>&1
+        end script
+      '';
+    }];
+  };
+}
-- 
GitLab


From 8a8d387b2215f95c6543f1ee150c0f35d4e3294a Mon Sep 17 00:00:00 2001
From: Marc Weber <marco-oweber@gmx.de>
Date: Fri, 6 Mar 2009 12:25:53 +0000
Subject: [PATCH 1262/5331] Convert "installer"

svn path=/nixos/branches/fix-style/; revision=14366
---
 system/nixos-installer.nix | 98 ++++++++++++++++++++++++++++++++++++++
 system/options.nix         | 83 +-------------------------------
 2 files changed, 99 insertions(+), 82 deletions(-)
 create mode 100644 system/nixos-installer.nix

diff --git a/system/nixos-installer.nix b/system/nixos-installer.nix
new file mode 100644
index 00000000000..285b3043c30
--- /dev/null
+++ b/system/nixos-installer.nix
@@ -0,0 +1,98 @@
+{pkgs, config, ...}:
+
+###### interface
+let
+  inherit (pkgs.lib) mkOption mkIf;
+
+  options = {
+    installer = {
+      nixpkgsURL = mkOption {
+        default = "";
+        example = http://nixos.org/releases/nix/nixpkgs-0.11pre7577;
+        description = "
+          URL of the Nixpkgs distribution to use when building the
+          installation CD.
+        ";
+      };
+
+      repos = {
+        nixos = mkOption {
+          default = [ { type  = "svn"; }  ];
+          example = [ { type = "svn"; url = "https://svn.nixos.org/repos/nix/nixos/branches/stdenv-updates"; target = "/etc/nixos/nixos-stdenv-updates"; }
+                      { type = "git"; initialize = ''git clone git://mawercer.de/nixos $target''; update = "git pull origin"; target = "/etc/nixos/nixos-git"; }
+                    ];
+          description = ''
+            The NixOS repository from which the system will be built.
+            <command>nixos-checkout</command> will update all working
+            copies of the given repositories,
+            <command>nixos-rebuild</command> will use the first item
+            which has the attribute <literal>default = true</literal>
+            falling back to the first item. The type defines the
+            repository tool added to the path. It also defines a "valid"
+            repository.  If the target directory already exists and it's
+            not valid it will be moved to the backup location
+            <filename><replaceable>dir</replaceable>-date</filename>.
+            For svn the default target and repositories are
+            <filename>/etc/nixos/nixos</filename> and
+            <filename>https://svn.nixos.org/repos/nix/nixos/trunk</filename>.
+            For git repositories update is called after initialization
+            when the repo is initialized.  The initialize code is run
+            from working directory dirname
+            <replaceable>target</replaceable> and should create the
+            directory
+            <filename><replaceable>dir</replaceable></filename>. (<command>git
+            clone url nixos/nixpkgs/services</command> should do) For
+            the executables used see <option>repoTypes</option>.
+          '';
+        };
+
+        nixpkgs = mkOption {
+          default = [ { type  = "svn"; }  ];
+          description = "same as <option>repos.nixos</option>";
+        };
+
+        services = mkOption {
+          default = [ { type  = "svn"; } ];
+          description = "same as <option>repos.nixos</option>";
+        };
+      };
+
+      repoTypes = mkOption {
+        default = {
+          svn = { valid = "[ -d .svn ]"; env = [ pkgs.coreutils pkgs.subversion ]; };
+          git = { valid = "[ -d .git ]"; env = [ pkgs.coreutils pkgs.git pkgs.gnused /*  FIXME: use full path to sed in nix-pull */ ]; };
+        };
+        description = ''
+          Defines, for each supported version control system
+          (e.g. <literal>git</literal>), the dependencies for the
+          mechanism, as well as a test used to determine whether a
+          directory is a checkout created by that version control
+          system.
+        '';
+      };
+
+      manifests = mkOption {
+        default = [http://nixos.org/releases/nixpkgs/channels/nixpkgs-unstable/MANIFEST];
+        example =
+          [ http://nixos.org/releases/nixpkgs/channels/nixpkgs-unstable/MANIFEST
+            http://nixos.org/releases/nixpkgs/channels/nixpkgs-stable/MANIFEST
+          ];
+        description = "
+          URLs of manifests to be downloaded when you run
+          <command>nixos-rebuild</command> to speed up builds.
+        ";
+      };
+    };
+  };
+
+
+in
+
+###### implementation
+
+mkIf config.services.pulseaudio.enable {
+  require = [
+    options
+  ];
+
+}
diff --git a/system/options.nix b/system/options.nix
index df484d47451..4cff3ac9296 100644
--- a/system/options.nix
+++ b/system/options.nix
@@ -1697,88 +1697,6 @@ in
 
   };
 
-  installer = {
-
-    nixpkgsURL = mkOption {
-      default = "";
-      example = http://nixos.org/releases/nix/nixpkgs-0.11pre7577;
-      description = "
-        URL of the Nixpkgs distribution to use when building the
-        installation CD.
-      ";
-    };
-
-    repos = {
-      nixos = mkOption {
-        default = [ { type  = "svn"; }  ];
-        example = [ { type = "svn"; url = "https://svn.nixos.org/repos/nix/nixos/branches/stdenv-updates"; target = "/etc/nixos/nixos-stdenv-updates"; }
-                    { type = "git"; initialize = ''git clone git://mawercer.de/nixos $target''; update = "git pull origin"; target = "/etc/nixos/nixos-git"; }
-                  ];
-        description = ''
-          The NixOS repository from which the system will be built.
-          <command>nixos-checkout</command> will update all working
-          copies of the given repositories,
-          <command>nixos-rebuild</command> will use the first item
-          which has the attribute <literal>default = true</literal>
-          falling back to the first item. The type defines the
-          repository tool added to the path. It also defines a "valid"
-          repository.  If the target directory already exists and it's
-          not valid it will be moved to the backup location
-          <filename><replaceable>dir</replaceable>-date</filename>.
-          For svn the default target and repositories are
-          <filename>/etc/nixos/nixos</filename> and
-          <filename>https://svn.nixos.org/repos/nix/nixos/trunk</filename>.
-          For git repositories update is called after initialization
-          when the repo is initialized.  The initialize code is run
-          from working directory dirname
-          <replaceable>target</replaceable> and should create the
-          directory
-          <filename><replaceable>dir</replaceable></filename>. (<command>git
-          clone url nixos/nixpkgs/services</command> should do) For
-          the executables used see <option>repoTypes</option>.
-        '';
-      };
-
-      nixpkgs = mkOption {
-        default = [ { type  = "svn"; }  ];
-        description = "same as <option>repos.nixos</option>";
-      };
-
-      services = mkOption {
-        default = [ { type  = "svn"; } ];
-        description = "same as <option>repos.nixos</option>";
-      };
-    };
-
-    repoTypes = mkOption {
-      default = {
-        svn = { valid = "[ -d .svn ]"; env = [ pkgs.coreutils pkgs.subversion ]; };
-        git = { valid = "[ -d .git ]"; env = [ pkgs.coreutils pkgs.git pkgs.gnused /*  FIXME: use full path to sed in nix-pull */ ]; };
-      };
-      description = ''
-        Defines, for each supported version control system
-        (e.g. <literal>git</literal>), the dependencies for the
-        mechanism, as well as a test used to determine whether a
-        directory is a checkout created by that version control
-        system.
-      '';
-    };
-
-    manifests = mkOption {
-      default = [http://nixos.org/releases/nixpkgs/channels/nixpkgs-unstable/MANIFEST];
-      example =
-        [ http://nixos.org/releases/nixpkgs/channels/nixpkgs-unstable/MANIFEST
-          http://nixos.org/releases/nixpkgs/channels/nixpkgs-stable/MANIFEST
-        ];
-      description = "
-        URLs of manifests to be downloaded when you run
-        <command>nixos-rebuild</command> to speed up builds.
-      ";
-    };
-
-  };
-
-
   nesting = {
     children = mkOption {
       default = [];
@@ -1859,6 +1777,7 @@ in
     (import ../upstart-jobs/gw6c.nix) # Gateway6
 
     (import ../upstart-jobs/nix.nix) # nix options and daemon
+    (import ../system/nixos-installer.nix)
 
 
     #users
-- 
GitLab


From 29cca0f34cc7b74d7eea36a8e4e15e816b1caa3b Mon Sep 17 00:00:00 2001
From: Marc Weber <marco-oweber@gmx.de>
Date: Fri, 6 Mar 2009 12:25:57 +0000
Subject: [PATCH 1263/5331] Convert "syslogd"

svn path=/nixos/branches/fix-style/; revision=14367
---
 system/options.nix       | 14 +---------
 upstart-jobs/default.nix |  6 ----
 upstart-jobs/syslogd.nix | 60 ++++++++++++++++++++++++++++++----------
 3 files changed, 47 insertions(+), 33 deletions(-)

diff --git a/system/options.nix b/system/options.nix
index 4cff3ac9296..9d54bc9d838 100644
--- a/system/options.nix
+++ b/system/options.nix
@@ -383,19 +383,6 @@ in
   services = {
 
   
-    syslogd = {
-
-      tty = mkOption {
-        default = 10;
-        description = "
-          The tty device on which syslogd will print important log
-          messages.
-        ";
-      };
-    
-    };
-
-
     ttyBackgrounds = {
 
       enable = mkOption {
@@ -1775,6 +1762,7 @@ in
     (import ../upstart-jobs/pulseaudio.nix)
     (import ../upstart-jobs/kbd.nix)
     (import ../upstart-jobs/gw6c.nix) # Gateway6
+    (import ../upstart-jobs/syslogd.nix)
 
     (import ../upstart-jobs/nix.nix) # nix options and daemon
     (import ../system/nixos-installer.nix)
diff --git a/upstart-jobs/default.nix b/upstart-jobs/default.nix
index 7edff43c08c..6dad24c35b3 100644
--- a/upstart-jobs/default.nix
+++ b/upstart-jobs/default.nix
@@ -71,12 +71,6 @@ let
   jobs = map makeJob
     ([
     
-    # Syslogd.
-    (import ../upstart-jobs/syslogd.nix {
-      inherit (pkgs) sysklogd writeText;
-      inherit config;
-    })
-
     # Klogd.
     (import ../upstart-jobs/klogd.nix {
       inherit (pkgs) sysklogd writeText;
diff --git a/upstart-jobs/syslogd.nix b/upstart-jobs/syslogd.nix
index c255eb0d9a8..bc293936982 100644
--- a/upstart-jobs/syslogd.nix
+++ b/upstart-jobs/syslogd.nix
@@ -1,8 +1,32 @@
-{sysklogd, writeText, config}:
+{pkgs, config, ...}:
 
+###### interface
 let
+  inherit (pkgs.lib) mkOption mkIf;
 
-  syslogConf = writeText "syslog.conf" ''
+  options = {
+    services = {
+
+      syslogd = {
+
+        tty = mkOption {
+          default = 10;
+          description = "
+            The tty device on which syslogd will print important log
+            messages.
+          ";
+        };
+      
+      };
+    };
+  };
+in
+
+###### implementation
+
+let
+
+  syslogConf = pkgs.writeText "syslog.conf" ''
     kern.warning;*.err;authpriv.none /dev/tty10
 
     # Send emergency messages to all users.
@@ -22,16 +46,24 @@ let
 in
 
 {
-  name = "syslogd";
-  
-  job = ''
-    description "Syslog daemon"
-  
-    start on udev
-    stop on shutdown
-
-    env TZ=${config.time.timeZone}
-    
-    respawn ${sysklogd}/sbin/syslogd -n -f ${syslogConf}
-  '';
+  require = [
+    options
+  ];
+
+  services = {
+    extraJobs = [{
+        name = "syslogd";
+        
+        job = ''
+          description "Syslog daemon"
+        
+          start on udev
+          stop on shutdown
+
+          env TZ=${config.time.timeZone}
+          
+          respawn ${pkgs.sysklogd}/sbin/syslogd -n -f ${syslogConf}
+        '';
+    }];
+  };
 }
-- 
GitLab


From e52ada51a4afff435ab69d932aaaf0dcc8b5fe02 Mon Sep 17 00:00:00 2001
From: Marc Weber <marco-oweber@gmx.de>
Date: Fri, 6 Mar 2009 12:26:01 +0000
Subject: [PATCH 1264/5331] commment

svn path=/nixos/branches/fix-style/; revision=14368
---
 system/options.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/system/options.nix b/system/options.nix
index 9d54bc9d838..60c5dd6c3ff 100644
--- a/system/options.nix
+++ b/system/options.nix
@@ -1764,6 +1764,7 @@ in
     (import ../upstart-jobs/gw6c.nix) # Gateway6
     (import ../upstart-jobs/syslogd.nix)
 
+    # nix
     (import ../upstart-jobs/nix.nix) # nix options and daemon
     (import ../system/nixos-installer.nix)
 
-- 
GitLab


From 4768fd6488cf87f52114299fdddc90321772c42b Mon Sep 17 00:00:00 2001
From: Marc Weber <marco-oweber@gmx.de>
Date: Fri, 6 Mar 2009 12:26:05 +0000
Subject: [PATCH 1265/5331] Convert "dhcpd" daemon

svn path=/nixos/branches/fix-style/; revision=14369
---
 system/options.nix       |  66 +---------------------
 upstart-jobs/default.nix |   6 --
 upstart-jobs/dhcpd.nix   | 117 +++++++++++++++++++++++++++++++++------
 3 files changed, 101 insertions(+), 88 deletions(-)

diff --git a/system/options.nix b/system/options.nix
index 60c5dd6c3ff..97b53917f24 100644
--- a/system/options.nix
+++ b/system/options.nix
@@ -480,71 +480,6 @@ in
     };
 
 
-    dhcpd = {
-
-      enable = mkOption {
-        default = false;
-        description = "
-          Whether to enable the DHCP server.
-        ";
-      };
-
-      extraConfig = mkOption {
-        default = "";
-        example = "
-          option subnet-mask 255.255.255.0;
-          option broadcast-address 192.168.1.255;
-          option routers 192.168.1.5;
-          option domain-name-servers 130.161.158.4, 130.161.33.17, 130.161.180.1;
-          option domain-name \"example.org\";
-          subnet 192.168.1.0 netmask 255.255.255.0 {
-            range 192.168.1.100 192.168.1.200;
-          }
-        ";
-        description = "
-          Extra text to be appended to the DHCP server configuration
-          file.  Currently, you almost certainly need to specify
-          something here, such as the options specifying the subnet
-          mask, DNS servers, etc.
-        ";
-      };
-
-      configFile = mkOption {
-        default = null;
-        description = "
-          The path of the DHCP server configuration file.  If no file
-          is specified, a file is generated using the other options.
-        ";
-      };
-
-      interfaces = mkOption {
-        default = ["eth0"];
-        description = "
-          The interfaces on which the DHCP server should listen.
-        ";
-      };
-
-      machines = mkOption {
-        default = [];
-        example = [
-          { hostName = "foo";
-            ethernetAddress = "00:16:76:9a:32:1d";
-            ipAddress = "192.168.1.10";
-          }
-          { hostName = "bar";
-            ethernetAddress = "00:19:d1:1d:c4:9a";
-            ipAddress = "192.168.1.11";
-          }
-        ];
-        description = "
-          A list mapping ethernet addresses to IP addresses for the
-          DHCP server.
-        ";
-      };
-
-    };
-
-
     sshd = {
 
       enable = mkOption {
@@ -1763,6 +1698,7 @@ in
     (import ../upstart-jobs/kbd.nix)
     (import ../upstart-jobs/gw6c.nix) # Gateway6
     (import ../upstart-jobs/syslogd.nix)
+    (import ../upstart-jobs/dhcpd.nix)
 
     # nix
     (import ../upstart-jobs/nix.nix) # nix options and daemon
diff --git a/upstart-jobs/default.nix b/upstart-jobs/default.nix
index 6dad24c35b3..043e82d1c44 100644
--- a/upstart-jobs/default.nix
+++ b/upstart-jobs/default.nix
@@ -141,12 +141,6 @@ let
       inherit config;
     })
 
-  # DHCP server.
-  ++ optional config.services.dhcpd.enable
-    (import ../upstart-jobs/dhcpd.nix {
-      inherit pkgs config;
-    })
-
   # SSH daemon.
   ++ optional config.services.sshd.enable
     (import ../upstart-jobs/sshd.nix {
diff --git a/upstart-jobs/dhcpd.nix b/upstart-jobs/dhcpd.nix
index d1f0a9626d5..9604dd965b9 100644
--- a/upstart-jobs/dhcpd.nix
+++ b/upstart-jobs/dhcpd.nix
@@ -1,4 +1,79 @@
-{pkgs, config}:
+{pkgs, config, ...}:
+
+###### interface
+let
+  inherit (pkgs.lib) mkOption mkIf;
+
+  options = {
+    services = {
+      dhcpd = {
+
+        enable = mkOption {
+          default = false;
+          description = "
+            Whether to enable the DHCP server.
+          ";
+        };
+
+        extraConfig = mkOption {
+          default = "";
+          example = "
+            option subnet-mask 255.255.255.0;
+            option broadcast-address 192.168.1.255;
+            option routers 192.168.1.5;
+            option domain-name-servers 130.161.158.4, 130.161.33.17, 130.161.180.1;
+            option domain-name \"example.org\";
+            subnet 192.168.1.0 netmask 255.255.255.0 {
+              range 192.168.1.100 192.168.1.200;
+            }
+          ";
+          description = "
+            Extra text to be appended to the DHCP server configuration
+            file.  Currently, you almost certainly need to specify
+            something here, such as the options specifying the subnet
+            mask, DNS servers, etc.
+          ";
+        };
+
+        configFile = mkOption {
+          default = null;
+          description = "
+            The path of the DHCP server configuration file.  If no file
+            is specified, a file is generated using the other options.
+          ";
+        };
+
+        interfaces = mkOption {
+          default = ["eth0"];
+          description = "
+            The interfaces on which the DHCP server should listen.
+          ";
+        };
+
+        machines = mkOption {
+          default = [];
+          example = [
+            { hostName = "foo";
+              ethernetAddress = "00:16:76:9a:32:1d";
+              ipAddress = "192.168.1.10";
+            }
+            { hostName = "bar";
+              ethernetAddress = "00:19:d1:1d:c4:9a";
+              ipAddress = "192.168.1.11";
+            }
+          ];
+          description = "
+            A list mapping ethernet addresses to IP addresses for the
+            DHCP server.
+          ";
+        };
+
+      };
+    };
+  };
+in
+
+###### implementation
 
 let
 
@@ -25,26 +100,34 @@ let
 
 in
   
-{
-  name = "dhcpd";
-  
-  job = ''
-    description "DHCP server"
 
-    start on network-interfaces/started
-    stop on network-interfaces/stop
+mkIf config.services.dhcpd.enable {
+  require = [
+    options
+  ];
 
-    script
+  services = {
+    extraJobs = [{
+      name = "dhcpd";
+      
+      job = ''
+        description "DHCP server"
 
-        mkdir -m 755 -p ${stateDir}
+        start on network-interfaces/started
+        stop on network-interfaces/stop
 
-        touch ${stateDir}/dhcpd.leases
+        script
 
-        exec ${pkgs.dhcp}/sbin/dhcpd -f -cf ${configFile} \
-            -lf ${stateDir}/dhcpd.leases \
-            ${toString cfg.interfaces}
+            mkdir -m 755 -p ${stateDir}
 
-    end script
-  '';
-  
+            touch ${stateDir}/dhcpd.leases
+
+            exec ${pkgs.dhcp}/sbin/dhcpd -f -cf ${configFile} \
+                -lf ${stateDir}/dhcpd.leases \
+                ${toString cfg.interfaces}
+
+        end script
+      '';
+    }];
+  };
 }
-- 
GitLab


From d285fea2da116a7c7f662d0c15af5b5575fd40c7 Mon Sep 17 00:00:00 2001
From: Marc Weber <marco-oweber@gmx.de>
Date: Fri, 6 Mar 2009 12:26:08 +0000
Subject: [PATCH 1266/5331] Convert "sshd" daemon

Should the client config in etc/default.nix be moved as wel?

svn path=/nixos/branches/fix-style/; revision=14370
---
 system/options.nix       |  45 +------------
 upstart-jobs/default.nix |   9 ---
 upstart-jobs/sshd.nix    | 141 ++++++++++++++++++++++++++++-----------
 3 files changed, 104 insertions(+), 91 deletions(-)

diff --git a/system/options.nix b/system/options.nix
index 97b53917f24..6018128459e 100644
--- a/system/options.nix
+++ b/system/options.nix
@@ -480,50 +480,6 @@ in
     };
 
 
-    sshd = {
-
-      enable = mkOption {
-        default = false;
-        description = "
-          Whether to enable the Secure Shell daemon, which allows secure
-          remote logins.
-        ";
-      };
-
-      forwardX11 = mkOption {
-        default = true;
-        description = "
-          Whether to enable sshd to forward X11 connections.
-        ";
-      };
-
-      allowSFTP = mkOption {
-        default = true;
-        description = "
-          Whether to enable the SFTP subsystem in the SSH daemon.  This
-          enables the use of commands such as <command>sftp</command> and
-          <command>sshfs</command>.
-        ";
-      };
-
-      permitRootLogin = mkOption {
-        default = "yes";
-        description = "
-          Whether the root user can login using ssh. Valid options
-          are <command>yes</command>, <command>without-password</command>,
-          <command>forced-commands-only</command> or
-          <command>no</command>
-        ";
-      };
-
-      gatewayPorts = mkOption {
-        default = "no";
-        description = "
-           Specifies  whether  remote hosts are allowed to connect to ports forwarded for the client. See man sshd_conf.
-          ";
-        };
-    };
-
     lshd = {
 
       enable = mkOption {
@@ -1699,6 +1655,7 @@ in
     (import ../upstart-jobs/gw6c.nix) # Gateway6
     (import ../upstart-jobs/syslogd.nix)
     (import ../upstart-jobs/dhcpd.nix)
+    (import ../upstart-jobs/sshd.nix)
 
     # nix
     (import ../upstart-jobs/nix.nix) # nix options and daemon
diff --git a/upstart-jobs/default.nix b/upstart-jobs/default.nix
index 043e82d1c44..f2f48d0e282 100644
--- a/upstart-jobs/default.nix
+++ b/upstart-jobs/default.nix
@@ -141,15 +141,6 @@ let
       inherit config;
     })
 
-  # SSH daemon.
-  ++ optional config.services.sshd.enable
-    (import ../upstart-jobs/sshd.nix {
-      inherit (pkgs) writeText openssh glibc;
-      inherit (pkgs.xorg) xauth;
-      inherit nssModulesPath;
-      inherit (config.services.sshd) forwardX11 allowSFTP permitRootLogin gatewayPorts;
-    })
-
   # GNU lshd SSH2 deamon.
   ++ optional config.services.lshd.enable
     (import ../upstart-jobs/lshd.nix {
diff --git a/upstart-jobs/sshd.nix b/upstart-jobs/sshd.nix
index e9b916e81d3..a0764d1177c 100644
--- a/upstart-jobs/sshd.nix
+++ b/upstart-jobs/sshd.nix
@@ -1,14 +1,66 @@
-{ writeText, openssh, glibc, xauth
-, nssModulesPath
-, forwardX11, allowSFTP, permitRootLogin, gatewayPorts
-}:
-
-assert permitRootLogin == "yes" ||
-       permitRootLogin == "without-password" ||
-       permitRootLogin == "forced-commands-only" ||
-       permitRootLogin == "no";
-       
+{pkgs, config, ...}:
+
+###### interface
 let
+  inherit (pkgs.lib) mkOption mkIf;
+
+  options = {
+    services = {
+      sshd = {
+
+        enable = mkOption {
+          default = false;
+          description = "
+            Whether to enable the Secure Shell daemon, which allows secure
+            remote logins.
+          ";
+        };
+
+        forwardX11 = mkOption {
+          default = true;
+          description = "
+            Whether to enable sshd to forward X11 connections.
+          ";
+        };
+
+        allowSFTP = mkOption {
+          default = true;
+          description = "
+            Whether to enable the SFTP subsystem in the SSH daemon.  This
+            enables the use of commands such as <command>sftp</command> and
+            <command>sshfs</command>.
+          ";
+        };
+
+        permitRootLogin = mkOption {
+          default = "yes";
+          description = "
+            Whether the root user can login using ssh. Valid options
+            are <command>yes</command>, <command>without-password</command>,
+            <command>forced-commands-only</command> or
+            <command>no</command>
+          ";
+        };
+
+        gatewayPorts = mkOption {
+          default = "no";
+          description = "
+             Specifies  whether  remote hosts are allowed to connect to ports forwarded for the client. See man sshd_conf.
+            ";
+          };
+      };
+    };
+  };
+
+###### implementation
+
+  inherit (pkgs) writeText openssh;
+
+  cfg = (config.services.sshd);
+
+  nssModules = config.system.nssModules.list;
+
+  nssModulesPath = config.system.nssModules.path;
 
   sshdConfig = writeText "sshd_config" ''
 
@@ -16,55 +68,68 @@ let
     
     UsePAM yes
     
-    ${if forwardX11 then "
+    ${if cfg.forwardX11 then "
       X11Forwarding yes
-      XAuthLocation ${xauth}/bin/xauth
+      XAuthLocation ${pkgs.xlibs.xauth}/bin/xauth
     " else "
       X11Forwarding no
     "}
 
-    ${if allowSFTP then "
+    ${if cfg.allowSFTP then "
       Subsystem sftp ${openssh}/libexec/sftp-server
     " else "
     "}
     
-    PermitRootLogin ${permitRootLogin}
-    GatewayPorts ${gatewayPorts}
+    PermitRootLogin ${cfg.permitRootLogin}
+    GatewayPorts ${cfg.gatewayPorts}
     
   '';
 
   sshdUid = (import ../system/ids.nix).uids.sshd;
 
+  assertion = cfg.permitRootLogin == "yes" ||
+       cfg.permitRootLogin == "without-password" ||
+       cfg.permitRootLogin == "forced-commands-only" ||
+       cfg.permitRootLogin == "no";
+
 in
 
-{
-  name = "sshd";
 
-  users = [
-    { name = "sshd";
-      uid = (import ../system/ids.nix).uids.sshd;
-      description = "SSH privilege separation user";
-      home = "/var/empty";
-    }
+mkIf config.services.sshd.enable {
+  require = [
+    options
   ];
-  
-  job = ''
-    description "SSH server"
 
-    start on network-interfaces/started
-    stop on network-interfaces/stop
+  services = {
+    extraJobs = [{
+      name = "sshd";
 
-    env LD_LIBRARY_PATH=${nssModulesPath}
+      users = [
+        { name = "sshd";
+          uid = (import ../system/ids.nix).uids.sshd;
+          description = "SSH privilege separation user";
+          home = "/var/empty";
+        }
+      ];
+      
+      job = ''
+        description "SSH server"
 
-    start script
-        mkdir -m 0755 -p /etc/ssh
+        start on network-interfaces/started
+        stop on network-interfaces/stop
 
-        if ! test -f /etc/ssh/ssh_host_dsa_key; then
-            ${openssh}/bin/ssh-keygen -t dsa -b 1024 -f /etc/ssh/ssh_host_dsa_key -N ""
-        fi
-    end script
+        env LD_LIBRARY_PATH=${nssModulesPath}
 
-    respawn ${openssh}/sbin/sshd -D -h /etc/ssh/ssh_host_dsa_key -f ${sshdConfig}
-  '';
-  
+        start script
+            mkdir -m 0755 -p /etc/ssh
+
+            if ! test -f /etc/ssh/ssh_host_dsa_key; then
+                ${openssh}/bin/ssh-keygen -t dsa -b 1024 -f /etc/ssh/ssh_host_dsa_key -N ""
+            fi
+        end script
+
+        respawn ${openssh}/sbin/sshd -D -h /etc/ssh/ssh_host_dsa_key -f ${sshdConfig}
+      '';
+    }];
+  };
 }
-- 
GitLab


From 7b0071781d830d01b5d89582e88fd25ff5ef3ff1 Mon Sep 17 00:00:00 2001
From: Marc Weber <marco-oweber@gmx.de>
Date: Fri, 6 Mar 2009 12:26:10 +0000
Subject: [PATCH 1267/5331] Convert "lshd" GNU ssh daemon

svn path=/nixos/branches/fix-style/; revision=14371
---
 system/options.nix       |  93 +---------------
 upstart-jobs/default.nix |  10 --
 upstart-jobs/lshd.nix    | 221 ++++++++++++++++++++++++++++++---------
 3 files changed, 172 insertions(+), 152 deletions(-)

diff --git a/system/options.nix b/system/options.nix
index 6018128459e..f952be1ddb1 100644
--- a/system/options.nix
+++ b/system/options.nix
@@ -480,98 +480,6 @@ in
     };
 
 
-    lshd = {
-
-      enable = mkOption {
-        default = false;
-        description = ''
-          Whether to enable the GNU lshd SSH2 daemon, which allows
-          secure remote login.
-        '';
-      };
-
-      portNumber = mkOption {
-        default = 22;
-        description = ''
-          The port on which to listen for connections.
-        '';
-      };
-
-      interfaces = mkOption {
-        default = [];
-        description = ''
-          List of network interfaces where listening for connections.
-          When providing the empty list, `[]', lshd listens on all
-          network interfaces.
-        '';
-        example = [ "localhost" "1.2.3.4:443" ];
-      };
-
-      hostKey = mkOption {
-        default = "/etc/lsh/host-key";
-        description = ''
-          Path to the server's private key.  Note that this key must
-          have been created, e.g., using "lsh-keygen --server |
-          lsh-writekey --server", so that you can run lshd.
-        '';
-      };
-
-      syslog = mkOption {
-        default = true;
-        description = ''Whether to enable syslog output.'';
-      };
-
-      passwordAuthentication = mkOption {
-        default = true;
-        description = ''Whether to enable password authentication.'';
-      };
-
-      publicKeyAuthentication = mkOption {
-        default = true;
-        description = ''Whether to enable public key authentication.'';
-      };
-
-      rootLogin = mkOption {
-        default = false;
-        description = ''Whether to enable remote root login.'';
-      };
-
-      loginShell = mkOption {
-        default = null;
-        description = ''
-          If non-null, override the default login shell with the
-          specified value.
-        '';
-        example = "/nix/store/xyz-bash-10.0/bin/bash10";
-      };
-
-      srpKeyExchange = mkOption {
-        default = false;
-        description = ''
-          Whether to enable SRP key exchange and user authentication.
-        '';
-      };
-
-      tcpForwarding = mkOption {
-        default = true;
-        description = ''Whether to enable TCP/IP forwarding.'';
-      };
-
-      x11Forwarding = mkOption {
-        default = true;
-        description = ''Whether to enable X11 forwarding.'';
-      };
-
-      subsystems = mkOption {
-        default = [ ["sftp" "${pkgs.lsh}/sbin/sftp-server"] ];
-        description = ''
-          List of subsystem-path pairs, where the head of the pair
-          denotes the subsystem name, and the tail denotes the path to
-          an executable implementing it.
-        '';
-      };
-    };
-
     ntp = {
 
       enable = mkOption {
@@ -1656,6 +1564,7 @@ in
     (import ../upstart-jobs/syslogd.nix)
     (import ../upstart-jobs/dhcpd.nix)
     (import ../upstart-jobs/sshd.nix)
+    (import ../upstart-jobs/lshd.nix) # GNU lshd SSH2 deamon (TODO: does neither start nor generate seed file ?)
 
     # nix
     (import ../upstart-jobs/nix.nix) # nix options and daemon
diff --git a/upstart-jobs/default.nix b/upstart-jobs/default.nix
index f2f48d0e282..0d8d2987d2c 100644
--- a/upstart-jobs/default.nix
+++ b/upstart-jobs/default.nix
@@ -141,16 +141,6 @@ let
       inherit config;
     })
 
-  # GNU lshd SSH2 deamon.
-  ++ optional config.services.lshd.enable
-    (import ../upstart-jobs/lshd.nix {
-      inherit (pkgs) lib;
-      inherit (pkgs) lsh;
-      inherit (pkgs.xorg) xauth;
-      inherit nssModulesPath;
-      lshdConfig = config.services.lshd;
-    })
-
   # GNUnet daemon.
   ++ optional config.services.gnunet.enable
     (import ../upstart-jobs/gnunet.nix {
diff --git a/upstart-jobs/lshd.nix b/upstart-jobs/lshd.nix
index 0a13d9ba7ee..9db99bce493 100644
--- a/upstart-jobs/lshd.nix
+++ b/upstart-jobs/lshd.nix
@@ -1,54 +1,175 @@
-{lsh, xauth, lib, nssModulesPath, lshdConfig}:
+{pkgs, config, ...}:
 
-with builtins;
-with lib;
+###### interface
+let
+  inherit (pkgs.lib) mkOption mkIf;
 
-{
-  name = "lshd";
-  
-  job = with lshdConfig; ''
-description "GNU lshd SSH2 daemon"
-
-start on network-interfaces/started
-stop on network-interfaces/stop
-
-env LD_LIBRARY_PATH=${nssModulesPath}
-
-start script
-    test -d /etc/lsh || mkdir -m 0755 -p /etc/lsh
-    test -d /var/spool/lsh || mkdir -m 0755 -p /var/spool/lsh
-
-    if ! test -f /var/spool/lsh/yarrow-seed-file
-    then
-        ${lsh}/bin/lsh-make-seed -o /var/spool/lsh/yarrow-seed-file
-    fi
-
-    if ! test -f "${hostKey}"
-    then
-        ${lsh}/bin/lsh-keygen --server | \
-        ${lsh}/bin/lsh-writekey --server -o "${hostKey}"
-    fi
-end script
-
-respawn ${lsh}/sbin/lshd --daemonic \
-   --password-helper="${lsh}/sbin/lsh-pam-checkpw" \
-   -p ${toString portNumber} \
-   ${if interfaces == [] then ""
-     else (concatStrings (map (i: "--interface=\"${i}\"")
-                              interfaces))} \
-   -h "${hostKey}" \
-   ${if !syslog then "--no-syslog" else ""} \
-   ${if passwordAuthentication then "--password" else "--no-password" } \
-   ${if publicKeyAuthentication then "--publickey" else "--no-publickey" } \
-   ${if rootLogin then "--root-login" else "--no-root-login" } \
-   ${if loginShell != null then "--login-shell=\"${loginShell}\"" else "" } \
-   ${if srpKeyExchange then "--srp-keyexchange" else "--no-srp-keyexchange" } \
-   ${if !tcpForwarding then "--no-tcpip-forward" else "--tcpip-forward"} \
-   ${if x11Forwarding then "--x11-forward" else "--no-x11-forward" } \
-   --subsystems=${concatStringsSep ","
-                                   (map (pair: (head pair) + "=" +
-                                               (head (tail pair)))
-                                        subsystems)}
-'';
+  options = {
+    services = {
+      lshd = {
+
+        enable = mkOption {
+          default = false;
+          description = ''
+            Whether to enable the GNU lshd SSH2 daemon, which allows
+            secure remote login.
+          '';
+        };
+
+        portNumber = mkOption {
+          default = 22;
+          description = ''
+            The port on which to listen for connections.
+          '';
+        };
+
+        interfaces = mkOption {
+          default = [];
+          description = ''
+            List of network interfaces where listening for connections.
+            When providing the empty list, `[]', lshd listens on all
+            network interfaces.
+          '';
+          example = [ "localhost" "1.2.3.4:443" ];
+        };
+
+        hostKey = mkOption {
+          default = "/etc/lsh/host-key";
+          description = ''
+            Path to the server's private key.  Note that this key must
+            have been created, e.g., using "lsh-keygen --server |
+            lsh-writekey --server", so that you can run lshd.
+          '';
+        };
+
+        syslog = mkOption {
+          default = true;
+          description = ''Whether to enable syslog output.'';
+        };
+
+        passwordAuthentication = mkOption {
+          default = true;
+          description = ''Whether to enable password authentication.'';
+        };
+
+        publicKeyAuthentication = mkOption {
+          default = true;
+          description = ''Whether to enable public key authentication.'';
+        };
+
+        rootLogin = mkOption {
+          default = false;
+          description = ''Whether to enable remote root login.'';
+        };
+
+        loginShell = mkOption {
+          default = null;
+          description = ''
+            If non-null, override the default login shell with the
+            specified value.
+          '';
+          example = "/nix/store/xyz-bash-10.0/bin/bash10";
+        };
+
+        srpKeyExchange = mkOption {
+          default = false;
+          description = ''
+            Whether to enable SRP key exchange and user authentication.
+          '';
+        };
+
+        tcpForwarding = mkOption {
+          default = true;
+          description = ''Whether to enable TCP/IP forwarding.'';
+        };
+
+        x11Forwarding = mkOption {
+          default = true;
+          description = ''Whether to enable X11 forwarding.'';
+        };
+
+        subsystems = mkOption {
+          default = [ ["sftp" "${pkgs.lsh}/sbin/sftp-server"] ];
+          description = ''
+            List of subsystem-path pairs, where the head of the pair
+            denotes the subsystem name, and the tail denotes the path to
+            an executable implementing it.
+          '';
+        };
+      };
+    };
+  };
+in
+
+###### implementation
+
+let 
+
+  inherit (pkgs) lsh;
+  inherit (pkgs.lib) concatStrings concatStringsSep head tail;
+
+  lshdConfig = config.services.lshd;
+
+  nssModules = config.system.nssModules.list;
+
+  nssModulesPath = config.system.nssModules.path;
+in
+
+mkIf config.services.lshd.enable {
+  require = [
+    options
+  ];
+
+  services = {
+    extraJobs = [{
+      name = "lshd";
+      
+      job = with lshdConfig; ''
+        description "GNU lshd SSH2 daemon"
+
+        start on network-interfaces/started
+        stop on network-interfaces/stop
+
+        env LD_LIBRARY_PATH=${nssModulesPath}
+
+        start script
+            test -d /etc/lsh || mkdir -m 0755 -p /etc/lsh
+            test -d /var/spool/lsh || mkdir -m 0755 -p /var/spool/lsh
+
+            if ! test -f /var/spool/lsh/yarrow-seed-file
+            the
+                ${lsh}/bin/lsh-make-seed -o /var/spool/lsh/yarrow-seed-file
+            fi
+
+            if ! test -f "${hostKey}"
+            then
+                ${lsh}/bin/lsh-keygen --server | \
+                ${lsh}/bin/lsh-writekey --server -o "${hostKey}"
+            fi
+        end script
+
+        respawn ${lsh}/sbin/lshd --daemonic \
+           --password-helper="${lsh}/sbin/lsh-pam-checkpw" \
+           -p ${toString portNumber} \
+           ${if interfaces == [] then ""
+             else (concatStrings (map (i: "--interface=\"${i}\"")
+                                      interfaces))} \
+           -h "${hostKey}" \
+           ${if !syslog then "--no-syslog" else ""} \
+           ${if passwordAuthentication then "--password" else "--no-password" } \
+           ${if publicKeyAuthentication then "--publickey" else "--no-publickey" } \
+           ${if rootLogin then "--root-login" else "--no-root-login" } \
+           ${if loginShell != null then "--login-shell=\"${loginShell}\"" else "" } \
+           ${if srpKeyExchange then "--srp-keyexchange" else "--no-srp-keyexchange" } \
+           ${if !tcpForwarding then "--no-tcpip-forward" else "--tcpip-forward"} \
+           ${if x11Forwarding then "--x11-forward" else "--no-x11-forward" } \
+           --subsystems=${concatStringsSep ","
+                                           (map (pair: (head pair) + "=" +
+                                                       (head (tail pair)))
+                                                subsystems)}
+    '';
   
+}
+    ];
+  };
 }
-- 
GitLab


From 0d48a739876edca5b4e04f8bf4787803c5f110bf Mon Sep 17 00:00:00 2001
From: Marc Weber <marco-oweber@gmx.de>
Date: Fri, 6 Mar 2009 12:26:13 +0000
Subject: [PATCH 1268/5331] sshd fix (users)

svn path=/nixos/branches/fix-style/; revision=14372
---
 upstart-jobs/sshd.nix | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/upstart-jobs/sshd.nix b/upstart-jobs/sshd.nix
index a0764d1177c..03dc9f47a9c 100644
--- a/upstart-jobs/sshd.nix
+++ b/upstart-jobs/sshd.nix
@@ -100,18 +100,20 @@ mkIf config.services.sshd.enable {
     options
   ];
 
+  users = {
+    extraUsers = [
+      { name = "sshd";
+        uid = (import ../system/ids.nix).uids.sshd;
+        description = "SSH privilege separation user";
+        home = "/var/empty";
+      }
+    ];
+  };
+
   services = {
     extraJobs = [{
       name = "sshd";
 
-      users = [
-        { name = "sshd";
-          uid = (import ../system/ids.nix).uids.sshd;
-          description = "SSH privilege separation user";
-          home = "/var/empty";
-        }
-      ];
-      
       job = ''
         description "SSH server"
 
-- 
GitLab


From b5f963bb8b4be8a8bd9c5cf22aac4419580cc585 Mon Sep 17 00:00:00 2001
From: Marc Weber <marco-oweber@gmx.de>
Date: Fri, 6 Mar 2009 12:26:16 +0000
Subject: [PATCH 1269/5331] use cat again to create users instead of << "..."

this way '`" doesn't have to be escaped (used by avahi)

svn path=/nixos/branches/fix-style/; revision=14373
---
 system/users-groups.nix | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/system/users-groups.nix b/system/users-groups.nix
index f1bd59a2f36..5dec1f1d1b3 100644
--- a/system/users-groups.nix
+++ b/system/users-groups.nix
@@ -143,6 +143,9 @@ let
   inherit (pkgs.stringsWithDeps) FullDepEntry;
 
   activateLib = config.system.activationScripts.lib;
+
+  # keep this extra file so that cat can be used to pass special chars such as "`" which is used in the avahi daemon
+  usersFile = pkgs.writeText "users" (concatStringsSep "\n" (map serializedUser users));
 in
 
 {
@@ -157,7 +160,7 @@ in
     activationScripts = {
 
       users = FullDepEntry ''
-        while true; do
+        cat ${usersFile} | while true; do
             read name || break
             read description
             read uid
@@ -198,9 +201,7 @@ in
                     ''${home:+--home "$home"} \
                     --shell "$shell"
             fi
-        done <<EndOfUserList
-        ${concatStringsSep "\n" (map serializedUser users)}
-        EndOfUserList
+        done
       '' [
         activateLib.groups
       ];
-- 
GitLab


From 2e93c3cdb9aa61d8dd357b7ebd29d7b427a12949 Mon Sep 17 00:00:00 2001
From: Marc Weber <marco-oweber@gmx.de>
Date: Fri, 6 Mar 2009 12:26:19 +0000
Subject: [PATCH 1270/5331] Convert "ntp" daemon

svn path=/nixos/branches/fix-style/; revision=14374
---
 system/options.nix       |  24 +--------
 upstart-jobs/default.nix |   8 ---
 upstart-jobs/ntpd.nix    | 105 ++++++++++++++++++++++++++++-----------
 3 files changed, 78 insertions(+), 59 deletions(-)

diff --git a/system/options.nix b/system/options.nix
index f952be1ddb1..31dc9c60443 100644
--- a/system/options.nix
+++ b/system/options.nix
@@ -480,29 +480,6 @@ in
     };
 
 
-    ntp = {
-
-      enable = mkOption {
-        default = true;
-        description = "
-          Whether to synchronise your machine's time using the NTP
-          protocol.
-        ";
-      };
-
-      servers = mkOption {
-        default = [
-          "0.pool.ntp.org"
-          "1.pool.ntp.org"
-          "2.pool.ntp.org"
-        ];
-        description = "
-          The set of NTP servers from which to synchronise.
-        ";
-      };
-
-    };
-
     portmap = {
 
       enable = mkOption {
@@ -1565,6 +1542,7 @@ in
     (import ../upstart-jobs/dhcpd.nix)
     (import ../upstart-jobs/sshd.nix)
     (import ../upstart-jobs/lshd.nix) # GNU lshd SSH2 deamon (TODO: does neither start nor generate seed file ?)
+    (import ../upstart-jobs/ntpd.nix)
 
     # nix
     (import ../upstart-jobs/nix.nix) # nix options and daemon
diff --git a/upstart-jobs/default.nix b/upstart-jobs/default.nix
index 0d8d2987d2c..b912fbee5a2 100644
--- a/upstart-jobs/default.nix
+++ b/upstart-jobs/default.nix
@@ -148,14 +148,6 @@ let
       gnunetConfig = config.services.gnunet;
     })
 
-  # NTP daemon.
-  ++ optional config.services.ntp.enable
-    (import ../upstart-jobs/ntpd.nix {
-      inherit modprobe;
-      inherit (pkgs) ntp glibc writeText;
-      servers = config.services.ntp.servers;
-    })
-
   # portmap daemon.
   ++ optional config.services.portmap.enable
     (import ../upstart-jobs/portmap.nix {
diff --git a/upstart-jobs/ntpd.nix b/upstart-jobs/ntpd.nix
index 4bfcfe115cb..9716ce3f308 100644
--- a/upstart-jobs/ntpd.nix
+++ b/upstart-jobs/ntpd.nix
@@ -1,52 +1,101 @@
-{ntp, modprobe, glibc, writeText, servers}:
+{pkgs, config, ...}:
 
+###### interface
 let
+  inherit (pkgs.lib) mkOption mkIf;
+
+  options = {
+    services = {
+      ntp = {
+
+        enable = mkOption {
+          default = true;
+          description = "
+            Whether to synchronise your machine's time using the NTP
+            protocol.
+          ";
+        };
+
+        servers = mkOption {
+          default = [
+            "0.pool.ntp.org"
+            "1.pool.ntp.org"
+            "2.pool.ntp.org"
+          ];
+          description = "
+            The set of NTP servers from which to synchronise.
+          ";
+        };
+
+      };
+    };
+  };
+in
+
+###### implementation
+
+let
+
+  inherit (pkgs) writeText ntp;
 
   stateDir = "/var/lib/ntp";
 
   ntpUser = "ntp";
 
-  config = writeText "ntp.conf" ''
+  servers = config.services.ntp.servers;
+
+  modprobe = config.system.sbin.modprobe;
+
+  configFile = writeText "ntp.conf" ''
     driftfile ${stateDir}/ntp.drift
 
     ${toString (map (server: "server " + server + "\n") servers)}
   '';
 
-  ntpFlags = "-c ${config} -u ${ntpUser}:nogroup -i ${stateDir}";
+  ntpFlags = "-c ${configFile} -u ${ntpUser}:nogroup -i ${stateDir}";
 
 in
 
-{
-  name = "ntpd";
-  
-  users = [
-    { name = ntpUser;
-      uid = (import ../system/ids.nix).uids.ntp;
-      description = "NTP daemon user";
-      home = stateDir;
-    }
+
+mkIf config.services.ntp.enable {
+  require = [
+    options
   ];
-  
-  job = ''
-    description "NTP daemon"
 
-    start on ip-up
-    stop on ip-down
-    stop on shutdown
+  services = {
+    extraJobs = [{
 
-    start script
+      name = "ntpd";
+      
+      users = [
+        { name = ntpUser;
+          uid = (import ../system/ids.nix).uids.ntp;
+          description = "NTP daemon user";
+          home = stateDir;
+        }
+      ];
+      
+      job = ''
+        description "NTP daemon"
 
-        mkdir -m 0755 -p ${stateDir}
-        chown ${ntpUser} ${stateDir}
+        start on ip-up
+        stop on ip-down
+        stop on shutdown
 
-        # Needed to run ntpd as an unprivileged user.
-        ${modprobe}/sbin/modprobe capability || true
+        start script
 
-        ${ntp}/bin/ntpd -q -g ${ntpFlags}
+            mkdir -m 0755 -p ${stateDir}
+            chown ${ntpUser} ${stateDir}
 
-    end script
+            # Needed to run ntpd as an unprivileged user.
+            ${modprobe}/sbin/modprobe capability || true
 
-    respawn ${ntp}/bin/ntpd -n ${ntpFlags}
-  '';
-  
+            ${ntp}/bin/ntpd -q -g ${ntpFlags}
+
+        end script
+
+        respawn ${ntp}/bin/ntpd -n ${ntpFlags}
+      '';
+    }];
+  };
 }
-- 
GitLab


From adafcb8f3299f32d2424984e862c4c67fe391036 Mon Sep 17 00:00:00 2001
From: Marc Weber <marco-oweber@gmx.de>
Date: Fri, 6 Mar 2009 12:26:22 +0000
Subject: [PATCH 1271/5331] Convert "portmap"

svn path=/nixos/branches/fix-style/; revision=14375
---
 system/options.nix       | 13 +-----
 upstart-jobs/default.nix |  6 ---
 upstart-jobs/portmap.nix | 85 ++++++++++++++++++++++++++++------------
 3 files changed, 61 insertions(+), 43 deletions(-)

diff --git a/system/options.nix b/system/options.nix
index 31dc9c60443..a5fea0b2632 100644
--- a/system/options.nix
+++ b/system/options.nix
@@ -480,18 +480,6 @@ in
     };
 
 
-    portmap = {
-
-      enable = mkOption {
-        default = false;
-        description = ''
-          Whether to enable `portmap', an ONC RPC directory service
-          notably used by NFS and NIS, and which can be queried
-          using the rpcinfo(1) command.
-        '';
-      };
-    };
-
     bitlbee = {
 
       enable = mkOption {
@@ -1543,6 +1531,7 @@ in
     (import ../upstart-jobs/sshd.nix)
     (import ../upstart-jobs/lshd.nix) # GNU lshd SSH2 deamon (TODO: does neither start nor generate seed file ?)
     (import ../upstart-jobs/ntpd.nix)
+    (import ../upstart-jobs/portmap.nix)
 
     # nix
     (import ../upstart-jobs/nix.nix) # nix options and daemon
diff --git a/upstart-jobs/default.nix b/upstart-jobs/default.nix
index b912fbee5a2..25426b16566 100644
--- a/upstart-jobs/default.nix
+++ b/upstart-jobs/default.nix
@@ -148,12 +148,6 @@ let
       gnunetConfig = config.services.gnunet;
     })
 
-  # portmap daemon.
-  ++ optional config.services.portmap.enable
-    (import ../upstart-jobs/portmap.nix {
-      inherit (pkgs) makePortmap;
-     })
-
   # Apache httpd.
   ++ optional (config.services.httpd.enable && !config.services.httpd.experimental)
     (import ../upstart-jobs/httpd.nix {
diff --git a/upstart-jobs/portmap.nix b/upstart-jobs/portmap.nix
index 18ff06dc1af..0c3368545c2 100644
--- a/upstart-jobs/portmap.nix
+++ b/upstart-jobs/portmap.nix
@@ -1,35 +1,70 @@
-{ makePortmap }:
+{pkgs, config, ...}:
+
+###### interface
+let
+  inherit (pkgs.lib) mkOption mkIf;
+
+  options = {
+    services = {
+      portmap = {
+        enable = mkOption {
+          default = false;
+          description = ''
+            Whether to enable `portmap', an ONC RPC directory service
+            notably used by NFS and NIS, and which can be queried
+            using the rpcinfo(1) command.
+          '';
+        };
+      };
+    };
+  };
+in
+
+###### implementation
 
 let uid = (import ../system/ids.nix).uids.portmap;
     gid = (import ../system/ids.nix).gids.portmap;
 in
-{
-  name = "portmap";
-  
-  users = [
-    { name = "portmap";
-      inherit uid;
-      description = "portmap daemon user";
-      home = "/var/empty";
-    }
-  ];
 
-  groups = [
-    { name = "portmap";
-      inherit gid;
-    }
+mkIf config.services.portmap.enable {
+
+  require = [
+    options
   ];
 
-  job =
-    let portmap = makePortmap { daemonUID = uid; daemonGID = gid; };
-    in
-       ''
-description "ONC RPC portmap"
 
-start on network-interfaces/started
-stop on network-interfaces/stop
+  users = {
+    extraUsers = [
+      { name = "portmap";
+        inherit uid;
+        description = "portmap daemon user";
+        home = "/var/empty";
+      }
+    ];
+
+    extraGroups = [
+      { name = "portmap";
+        inherit gid;
+      }
+    ];
+  };
+
+  services = {
+    extraJobs = [{ 
+      name = "portmap";
+      
+
+      job =
+        let portmap = pkgs.makePortmap { daemonUID = uid; daemonGID = gid; };
+        in
+          ''
+          description "ONC RPC portmap"
+
+          start on network-interfaces/started
+          stop on network-interfaces/stop
 
-respawn ${portmap}/sbin/portmap
-'';
-  
+          respawn ${portmap}/sbin/portmap
+          '';
+    }];
+  };
 }
-- 
GitLab


From f9f61c0a1e3e744807b3323b6d558fb7c960293c Mon Sep 17 00:00:00 2001
From: Marc Weber <marco-oweber@gmx.de>
Date: Fri, 6 Mar 2009 12:26:24 +0000
Subject: [PATCH 1272/5331] Convert "bitlbee"

svn path=/nixos/branches/fix-style/; revision=14376
---
 system/options.nix       |  30 +----------
 upstart-jobs/bitlbee.nix | 111 +++++++++++++++++++++++++++++----------
 upstart-jobs/default.nix |   6 ---
 3 files changed, 83 insertions(+), 64 deletions(-)

diff --git a/system/options.nix b/system/options.nix
index a5fea0b2632..2e841e6c7b7 100644
--- a/system/options.nix
+++ b/system/options.nix
@@ -480,35 +480,6 @@ in
     };
 
 
-    bitlbee = {
-
-      enable = mkOption {
-        default = false;
-        description = ''
-          Whether to run the BitlBee IRC to other chat network gateway.
-          Running it allows you to access the MSN, Jabber, Yahoo! and ICQ chat
-          networks via an IRC client.
-        '';
-      };
-
-      interface = mkOption {
-        default = "127.0.0.1";
-        description = ''
-          The interface the BitlBee deamon will be listening to.  If `127.0.0.1',
-          only clients on the local host can connect to it; if `0.0.0.0', clients
-          can access it from any network interface.
-        '';
-      };
-
-      portNumber = mkOption {
-        default = 6667;
-        description = ''
-          Number of the port BitlBee will be listening to.
-        '';
-      };
-
-    };
-
     gnunet = {
     
       enable = mkOption {
@@ -1532,6 +1503,7 @@ in
     (import ../upstart-jobs/lshd.nix) # GNU lshd SSH2 deamon (TODO: does neither start nor generate seed file ?)
     (import ../upstart-jobs/ntpd.nix)
     (import ../upstart-jobs/portmap.nix)
+    (import ../upstart-jobs/bitlbee.nix)
 
     # nix
     (import ../upstart-jobs/nix.nix) # nix options and daemon
diff --git a/upstart-jobs/bitlbee.nix b/upstart-jobs/bitlbee.nix
index d9956230aa0..a1cc1a87861 100644
--- a/upstart-jobs/bitlbee.nix
+++ b/upstart-jobs/bitlbee.nix
@@ -1,40 +1,93 @@
-args: with args;
+{pkgs, config, ...}:
+
+###### interface
+let
+  inherit (pkgs.lib) mkOption mkIf;
+
+  options = {
+    services = {
+      bitlbee = {
+
+        enable = mkOption {
+          default = false;
+          description = ''
+            Whether to run the BitlBee IRC to other chat network gateway.
+            Running it allows you to access the MSN, Jabber, Yahoo! and ICQ chat
+            networks via an IRC client.
+          '';
+        };
+
+        interface = mkOption {
+          default = "127.0.0.1";
+          description = ''
+            The interface the BitlBee deamon will be listening to.  If `127.0.0.1',
+            only clients on the local host can connect to it; if `0.0.0.0', clients
+            can access it from any network interface.
+          '';
+        };
+
+        portNumber = mkOption {
+          default = 6667;
+          description = ''
+            Number of the port BitlBee will be listening to.
+          '';
+        };
+
+      };
+    };
+  };
+in
+
+###### implementation
 
 let
   bitlbeeUid = (import ../system/ids.nix).uids.bitlbee;
+  inherit (config.services.bitlbee) portNumber interface;
 in
-{
-  name = "bitlbee";
-
-  users = [
-    { name = "bitlbee";
-      uid = bitlbeeUid;
-      description = "BitlBee user";
-      home = "/var/empty";
-    }
-  ];
-  
-  groups = [
-    { name = "bitlbee";
-      gid = (import ../system/ids.nix).gids.bitlbee;
-    }
+
+mkIf config.services.bitlbee.enable {
+
+  require = [ 
+    options
   ];
 
-  job = ''
-description "BitlBee IRC to other chat networks gateway"
+  users = {
+    extraUsers = [
+      { name = "bitlbee";
+        uid = bitlbeeUid;
+        description = "BitlBee user";
+        home = "/var/empty";
+      }
+    ];
+    
+    extraGroups = [
+      { name = "bitlbee";
+        gid = (import ../system/ids.nix).gids.bitlbee;
+      }
+    ];
+  };
+
+  services = {
+    extraJobs = [{
+      name = "bitlbee";
+
+      job = ''
+    description "BitlBee IRC to other chat networks gateway"
 
-start on network-interfaces/started
-stop on network-interfaces/stop
+    start on network-interfaces/started
+    stop on network-interfaces/stop
 
-start script
-    if ! test -d /var/lib/bitlbee
-    then
-        mkdir -p /var/lib/bitlbee
-    fi
-end script
+    start script
+        if ! test -d /var/lib/bitlbee
+        then
+            mkdir -p /var/lib/bitlbee
+        fi
+    end script
 
-respawn ${bitlbee}/sbin/bitlbee -F -p ${toString portNumber} \
-        -i ${interface} -u bitlbee
-  '';
+    respawn ${pkgs.bitlbee}/sbin/bitlbee -F -p ${toString portNumber} \
+            -i ${interface} -u bitlbee
+      '';
   
+    }];
+  };
 }
diff --git a/upstart-jobs/default.nix b/upstart-jobs/default.nix
index 25426b16566..79338c2c598 100644
--- a/upstart-jobs/default.nix
+++ b/upstart-jobs/default.nix
@@ -231,12 +231,6 @@ let
       inherit config pkgs;
     })
 
-  ++ optional config.services.bitlbee.enable
-    (import ../upstart-jobs/bitlbee.nix {
-      inherit (pkgs) bitlbee;
-      inherit (config.services.bitlbee) portNumber interface;
-    })
-
   # Postfix mail server.
   ++ optional config.services.postfix.enable
     (import ../upstart-jobs/postfix.nix {
-- 
GitLab


From 931f68c924cbeaba418bb9d33229deb744f324cf Mon Sep 17 00:00:00 2001
From: Marc Weber <marco-oweber@gmx.de>
Date: Fri, 6 Mar 2009 12:26:26 +0000
Subject: [PATCH 1273/5331] Convert "gnunet"

svn path=/nixos/branches/fix-style/; revision=14377
---
 system/options.nix       | 137 +-------------------
 upstart-jobs/default.nix |   7 -
 upstart-jobs/gnunet.nix  | 268 ++++++++++++++++++++++++++++++---------
 3 files changed, 212 insertions(+), 200 deletions(-)

diff --git a/system/options.nix b/system/options.nix
index 2e841e6c7b7..f33e7cdd805 100644
--- a/system/options.nix
+++ b/system/options.nix
@@ -480,142 +480,6 @@ in
     };
 
 
-    gnunet = {
-    
-      enable = mkOption {
-        default = false;
-        description = ''
-          Whether to run the GNUnet daemon.  GNUnet is GNU's anonymous
-          peer-to-peer communication and file sharing framework.
-        '';
-      };
-
-      home = mkOption {
-        default = "/var/lib/gnunet";
-        description = ''
-          Directory where the GNUnet daemon will store its data.
-        '';
-      };
-
-      debug = mkOption {
-        default = false;
-        description = ''
-          When true, run in debug mode; gnunetd will not daemonize and
-          error messages will be written to stderr instead of a
-          logfile.
-        '';
-      };
-
-      logLevel = mkOption {
-        default = "ERROR";
-        example = "INFO";
-        description = ''
-          Log level of the deamon (see `gnunetd(1)' for details).
-        '';
-      };
-
-      hostLists = mkOption {
-        default = [
-          "http://gnunet.org/hostlist.php"
-          "http://gnunet.mine.nu:8081/hostlist"
-          "http://vserver1236.vserver-on.de/hostlist-074"
-        ];
-        description = ''
-          URLs of host lists.
-        '';
-      };
-
-
-      applications = mkOption {
-        default = [ "advertising" "getoption" "fs" "stats" "traffic" ];
-        example = [ "chat" "fs" ];
-        description = ''
-          List of GNUnet applications supported by the daemon.  Note that
-          `fs', which means "file sharing", is probably the one you want.
-        '';
-      };
-
-      transports = mkOption {
-        default = [ "udp" "tcp" "http" "nat" ];
-        example = [ "smtp" "http" ];
-        description = ''
-          List of transport methods used by the server.
-        '';
-      };
-
-      fileSharing = {
-        quota = mkOption {
-          default = 1024;
-          description = ''
-            Maximum file system usage (in MiB) for file sharing.
-          '';
-        };
-
-        activeMigration = mkOption {
-          default = false;
-          description = ''
-            Whether to allow active migration of content originating
-            from other nodes.
-          '';
-        };
-      };
-
-      load = {
-        maxNetDownBandwidth = mkOption {
-          default = 50000;
-          description = ''
-            Maximum bandwidth usage (in bits per second) for GNUnet
-            when downloading data.
-          '';
-        };
-
-        maxNetUpBandwidth = mkOption {
-          default = 50000;
-          description = ''
-            Maximum bandwidth usage (in bits per second) for GNUnet
-            when downloading data.
-          '';
-        };
-
-        hardNetUpBandwidth = mkOption {
-          default = 0;
-          description = ''
-            Hard bandwidth limit (in bits per second) when uploading
-            data.
-          '';
-        };
-
-        maxCPULoad = mkOption {
-          default = 100;
-          description = ''
-            Maximum CPU load (percentage) authorized for the GNUnet
-            daemon.
-          '';
-        };
-
-        interfaces = mkOption {
-          default = [ "eth0" ];
-          example = [ "wlan0" "eth1" ];
-          description = ''
-            List of network interfaces to use.
-          '';
-        };
-      };
-
-      extraOptions = mkOption {
-        default = "";
-        example = ''
-          [NETWORK]
-          INTERFACE = eth3
-        '';
-        description = ''
-          Additional options that will be copied verbatim in `gnunetd.conf'.
-          See `gnunetd.conf(5)' for details.
-        '';
-      };
-    };
-
-
     ejabberd = {
       enable = mkOption {
         default = false;
@@ -1504,6 +1368,7 @@ in
     (import ../upstart-jobs/ntpd.nix)
     (import ../upstart-jobs/portmap.nix)
     (import ../upstart-jobs/bitlbee.nix)
+    (import ../upstart-jobs/gnunet.nix)
 
     # nix
     (import ../upstart-jobs/nix.nix) # nix options and daemon
diff --git a/upstart-jobs/default.nix b/upstart-jobs/default.nix
index 79338c2c598..03c3fa32822 100644
--- a/upstart-jobs/default.nix
+++ b/upstart-jobs/default.nix
@@ -141,13 +141,6 @@ let
       inherit config;
     })
 
-  # GNUnet daemon.
-  ++ optional config.services.gnunet.enable
-    (import ../upstart-jobs/gnunet.nix {
-      inherit (pkgs) gnunet lib writeText;
-      gnunetConfig = config.services.gnunet;
-    })
-
   # Apache httpd.
   ++ optional (config.services.httpd.enable && !config.services.httpd.experimental)
     (import ../upstart-jobs/httpd.nix {
diff --git a/upstart-jobs/gnunet.nix b/upstart-jobs/gnunet.nix
index 3b3de2d97b3..5fe7579d8fe 100644
--- a/upstart-jobs/gnunet.nix
+++ b/upstart-jobs/gnunet.nix
@@ -1,64 +1,218 @@
-{ gnunet, gnunetConfig, lib, writeText }:
+{pkgs, config, ...}:
 
-assert gnunetConfig.enable;
+###### interface
+let
+  inherit (pkgs.lib) mkOption mkIf;
 
-{
-  name = "gnunetd";
+  options = {
+    services = {
+      gnunet = {
+      
+        enable = mkOption {
+          default = false;
+          description = ''
+            Whether to run the GNUnet daemon.  GNUnet is GNU's anonymous
+            peer-to-peer communication and file sharing framework.
+          '';
+        };
 
-  users = [
-    { name = "gnunetd";
-      uid = (import ../system/ids.nix).uids.gnunetd;
-      description = "GNUnet Daemon User";
-      home = "/var/empty";
-    }
+        home = mkOption {
+          default = "/var/lib/gnunet";
+          description = ''
+            Directory where the GNUnet daemon will store its data.
+          '';
+        };
+
+        debug = mkOption {
+          default = false;
+          description = ''
+            When true, run in debug mode; gnunetd will not daemonize and
+            error messages will be written to stderr instead of a
+            logfile.
+          '';
+        };
+
+        logLevel = mkOption {
+          default = "ERROR";
+          example = "INFO";
+          description = ''
+            Log level of the deamon (see `gnunetd(1)' for details).
+          '';
+        };
+
+        hostLists = mkOption {
+          default = [
+            "http://gnunet.org/hostlist.php"
+            "http://gnunet.mine.nu:8081/hostlist"
+            "http://vserver1236.vserver-on.de/hostlist-074"
+          ];
+          description = ''
+            URLs of host lists.
+          '';
+        };
+
+
+        applications = mkOption {
+          default = [ "advertising" "getoption" "fs" "stats" "traffic" ];
+          example = [ "chat" "fs" ];
+          description = ''
+            List of GNUnet applications supported by the daemon.  Note that
+            `fs', which means "file sharing", is probably the one you want.
+          '';
+        };
+
+        transports = mkOption {
+          default = [ "udp" "tcp" "http" "nat" ];
+          example = [ "smtp" "http" ];
+          description = ''
+            List of transport methods used by the server.
+          '';
+        };
+
+        fileSharing = {
+          quota = mkOption {
+            default = 1024;
+            description = ''
+              Maximum file system usage (in MiB) for file sharing.
+            '';
+          };
+
+          activeMigration = mkOption {
+            default = false;
+            description = ''
+              Whether to allow active migration of content originating
+              from other nodes.
+            '';
+          };
+        };
+
+        load = {
+          maxNetDownBandwidth = mkOption {
+            default = 50000;
+            description = ''
+              Maximum bandwidth usage (in bits per second) for GNUnet
+              when downloading data.
+            '';
+          };
+
+          maxNetUpBandwidth = mkOption {
+            default = 50000;
+            description = ''
+              Maximum bandwidth usage (in bits per second) for GNUnet
+              when downloading data.
+            '';
+          };
+
+          hardNetUpBandwidth = mkOption {
+            default = 0;
+            description = ''
+              Hard bandwidth limit (in bits per second) when uploading
+              data.
+            '';
+          };
+
+          maxCPULoad = mkOption {
+            default = 100;
+            description = ''
+              Maximum CPU load (percentage) authorized for the GNUnet
+              daemon.
+            '';
+          };
+
+          interfaces = mkOption {
+            default = [ "eth0" ];
+            example = [ "wlan0" "eth1" ];
+            description = ''
+              List of network interfaces to use.
+            '';
+          };
+        };
+
+        extraOptions = mkOption {
+          default = "";
+          example = ''
+            [NETWORK]
+            INTERFACE = eth3
+          '';
+          description = ''
+            Additional options that will be copied verbatim in `gnunetd.conf'.
+            See `gnunetd.conf(5)' for details.
+          '';
+        };
+      };
+    };
+  };
+in
+
+###### implementation
+
+mkIf config.services.gnunet.enable {
+  require = [
+    options
   ];
 
-  job =
-    with gnunetConfig;
-    let configFile = writeText "gnunetd.conf" ''
-      [PATHS]
-      GNUNETD_HOME = ${home}
-
-      [GNUNETD]
-      HOSTLISTURL = ${lib.concatStringsSep " " hostLists}
-      APPLICATIONS = ${lib.concatStringsSep " " applications}
-      TRANSPORTS = ${lib.concatStringsSep " " transports}
-
-      [LOAD]
-      MAXNETDOWNBPSTOTAL = ${toString load.maxNetDownBandwidth}
-      MAXNETUPBPSTOTAL = ${toString load.maxNetUpBandwidth}
-      HARDUPLIMIT = ${toString load.hardNetUpBandwidth}
-      MAXCPULOAD = ${toString load.maxCPULoad}
-      INTERFACES = ${lib.concatStringsSep " " load.interfaces}
-
-      [FS]
-      QUOTA = ${toString fileSharing.quota}
-      ACTIVEMIGRATION = ${if fileSharing.activeMigration then "YES" else "NO"}
-
-      [MODULES]
-      sqstore = sqstore_sqlite
-      dstore = dstore_sqlite
-      topology = topology_default
-
-      ${extraOptions}
-    '';
-
-    in ''
-description "The GNUnet Daemon"
-
-start on network-interfaces/started
-stop on network-interfaces/stop
-
-start script
-    test -d "${home}" || \
-    ( mkdir -m 755 -p "${home}" && chown -R gnunetd:users "${home}")
-end script
-
-respawn ${gnunet}/bin/gnunetd                   \
-  ${if debug then "--debug" else "" }           \
-  --user="gnunetd"                              \
-  --config="${configFile}"                      \
-  --log="${logLevel}"
-'';
+  users = {
+    extraUsers = [
+      { name = "gnunetd";
+        uid = (import ../system/ids.nix).uids.gnunetd;
+        description = "GNUnet Daemon User";
+        home = "/var/empty";
+      }
+    ];
+  };
+
+  services = {
+    extraJobs = [{
+        name = "gnunetd";
+
+        job =
+          with config.services.gnunet;
+          let 
+            inherit (pkgs) lib gnunet;
+            configFile = pkgs.writeText "gnunetd.conf" ''
+              [PATHS]
+              GNUNETD_HOME = ${home}
+
+              [GNUNETD]
+              HOSTLISTURL = ${lib.concatStringsSep " " hostLists}
+              APPLICATIONS = ${lib.concatStringsSep " " applications}
+              TRANSPORTS = ${lib.concatStringsSep " " transports}
+
+              [LOAD]
+              MAXNETDOWNBPSTOTAL = ${toString load.maxNetDownBandwidth}
+              MAXNETUPBPSTOTAL = ${toString load.maxNetUpBandwidth}
+              HARDUPLIMIT = ${toString load.hardNetUpBandwidth}
+              MAXCPULOAD = ${toString load.maxCPULoad}
+              INTERFACES = ${lib.concatStringsSep " " load.interfaces}
+
+              [FS]
+              QUOTA = ${toString fileSharing.quota}
+              ACTIVEMIGRATION = ${if fileSharing.activeMigration then "YES" else "NO"}
+
+              [MODULES]
+              sqstore = sqstore_sqlite
+              dstore = dstore_sqlite
+              topology = topology_default
+
+              ${extraOptions}
+            '';
+            in ''
+            description "The GNUnet Daemon"
+
+            start on network-interfaces/started
+            stop on network-interfaces/stop
+
+            start script
+                test -d "${home}" || \
+                ( mkdir -m 755 -p "${home}" && chown -R gnunetd:users "${home}")
+            end script
 
+            respawn ${gnunet}/bin/gnunetd                   \
+              ${if debug then "--debug" else "" }           \
+              --user="gnunetd"                              \
+              --config="${configFile}"                      \
+              --log="${logLevel}"
+            '';
+    }];
+  };
 }
-- 
GitLab


From 0c7129316caaef39a42d98ab4f1808a7c8d1441e Mon Sep 17 00:00:00 2001
From: Marc Weber <marco-oweber@gmx.de>
Date: Fri, 6 Mar 2009 12:26:29 +0000
Subject: [PATCH 1274/5331] Convert "ejabbered" (untested)

svn path=/nixos/branches/fix-style/; revision=14378
---
 system/options.nix        |  28 +---------
 upstart-jobs/default.nix  |   6 ---
 upstart-jobs/ejabberd.nix | 105 ++++++++++++++++++++++++++++----------
 3 files changed, 78 insertions(+), 61 deletions(-)

diff --git a/system/options.nix b/system/options.nix
index f33e7cdd805..5358c206059 100644
--- a/system/options.nix
+++ b/system/options.nix
@@ -480,33 +480,6 @@ in
     };
 
 
-    ejabberd = {
-      enable = mkOption {
-        default = false;
-        description = "Whether to enable ejabberd server";
-      };
-            
-      spoolDir = mkOption {
-        default = "/var/lib/ejabberd";
-        description = "Location of the spooldir of ejabberd";
-      };
-      
-      logsDir = mkOption {
-        default = "/var/log/ejabberd";
-        description = "Location of the logfile directory of ejabberd";
-      };
-      
-      confDir = mkOption {
-        default = "/var/ejabberd";
-	description = "Location of the config directory of ejabberd";
-      };
-      
-      virtualHosts = mkOption {
-        default = "\"localhost\"";
-        description = "Virtualhosts that ejabberd should host. Hostnames are surrounded with doublequotes and separated by commas";
-      };
-    };
-
     jboss = {
       enable = mkOption {
         default = false;
@@ -1369,6 +1342,7 @@ in
     (import ../upstart-jobs/portmap.nix)
     (import ../upstart-jobs/bitlbee.nix)
     (import ../upstart-jobs/gnunet.nix)
+    (import ../upstart-jobs/ejabberd.nix) # untested, dosen't compile on x86_64-linux
 
     # nix
     (import ../upstart-jobs/nix.nix) # nix options and daemon
diff --git a/upstart-jobs/default.nix b/upstart-jobs/default.nix
index 03c3fa32822..4de7e099a4f 100644
--- a/upstart-jobs/default.nix
+++ b/upstart-jobs/default.nix
@@ -168,12 +168,6 @@ let
       inherit config pkgs;
     })
 
-  # EJabberd service
-  ++ optional config.services.ejabberd.enable
-    (import ../upstart-jobs/ejabberd.nix {
-      inherit config pkgs;
-    })  
-
   # OpenFire XMPP server
   ++ optional config.services.openfire.enable
     (import ../upstart-jobs/openfire.nix {
diff --git a/upstart-jobs/ejabberd.nix b/upstart-jobs/ejabberd.nix
index d2a5084068f..390feda0e09 100644
--- a/upstart-jobs/ejabberd.nix
+++ b/upstart-jobs/ejabberd.nix
@@ -1,36 +1,85 @@
-args: with args;
+{pkgs, config, ...}:
+
+###### interface
+let
+  inherit (pkgs.lib) mkOption mkIf;
+
+  options = {
+    services = {
+      ejabberd = {
+        enable = mkOption {
+          default = false;
+          description = "Whether to enable ejabberd server";
+        };
+              
+        spoolDir = mkOption {
+          default = "/var/lib/ejabberd";
+          description = "Location of the spooldir of ejabberd";
+        };
+        
+        logsDir = mkOption {
+          default = "/var/log/ejabberd";
+          description = "Location of the logfile directory of ejabberd";
+        };
+        
+        confDir = mkOption {
+          default = "/var/ejabberd";
+          description = "Location of the config directory of ejabberd";
+        };
+        
+        virtualHosts = mkOption {
+          default = "\"localhost\"";
+          description = "Virtualhosts that ejabberd should host. Hostnames are surrounded with doublequotes and separated by commas";
+        };
+      };
+    };
+  };
+in
+
+###### implementation
 
 let
 
 cfg = config.services.ejabberd;
 
 in
-{
-    name = "ejabberd";
-        
-    job = ''
-      description "EJabberd server"
-
-      start on network-interface/started
-      stop on network-interfaces/stop
-    
-      start script
-            # Initialise state data
-            mkdir -p ${cfg.logsDir}
-            
-            if ! test -d ${cfg.spoolDir}
-            then
-                cp -av ${pkgs.ejabberd}/var/lib/ejabberd /var/lib
-            fi
-	    
-	    mkdir -p ${cfg.confDir}
-	    sed -e 's|{hosts, \["localhost"\]}.|{hosts, \[${cfg.virtualHosts}\]}.|' ${pkgs.ejabberd}/etc/ejabberd/ejabberd.cfg > ${cfg.confDir}/ejabberd.cfg
-      end script
-      
-      respawn ${pkgs.bash}/bin/sh -c 'export PATH=$PATH:${pkgs.ejabberd}/sbin; cd ~; ejabberdctl --logs ${cfg.logsDir} --spool ${cfg.spoolDir} --config ${cfg.confDir}/ejabberd.cfg start; sleep 1d'
+
+mkIf config.services.ejabberd.enable {
+
+  require = [
+    options
+  ];
+
+
+  services = {
+    extraJobs = [{
+      name = "ejabberd";
+          
+      job = ''
+        description "EJabberd server"
+
+        start on network-interface/started
+        stop on network-interfaces/stop
       
-      stop script
-          ${pkgs.ejabberd}/sbin/ejabberdctl stop
-      end script
-    '';
+        start script
+              # Initialise state data
+              mkdir -p ${cfg.logsDir}
+              
+              if ! test -d ${cfg.spoolDir}
+              then
+                  cp -av ${pkgs.ejabberd}/var/lib/ejabberd /var/lib
+              fi
+              
+              mkdir -p ${cfg.confDir}
+              sed -e 's|{hosts, \["localhost"\]}.|{hosts, \[${cfg.virtualHosts}\]}.|' ${pkgs.ejabberd}/etc/ejabberd/ejabberd.cfg > ${cfg.confDir}/ejabberd.cfg
+        end script
+        
+        respawn ${pkgs.bash}/bin/sh -c 'export PATH=$PATH:${pkgs.ejabberd}/sbin; cd ~; ejabberdctl --logs ${cfg.logsDir} --spool ${cfg.spoolDir} --config ${cfg.confDir}/ejabberd.cfg start; sleep 1d'
+        
+        stop script
+            ${pkgs.ejabberd}/sbin/ejabberdctl stop
+        end script
+      '';
+    }];
+  };
 }
-- 
GitLab


From b17f9995d5d2bbbf2912ccb7639fbcc55b961b14 Mon Sep 17 00:00:00 2001
From: Marc Weber <marco-oweber@gmx.de>
Date: Fri, 6 Mar 2009 12:26:31 +0000
Subject: [PATCH 1275/5331] Convert "jboss" (untested)

svn path=/nixos/branches/fix-style/; revision=14379
---
 system/options.nix       | 43 +---------------------
 upstart-jobs/default.nix |  6 ---
 upstart-jobs/jboss.nix   | 79 +++++++++++++++++++++++++++++++++++-----
 3 files changed, 71 insertions(+), 57 deletions(-)

diff --git a/system/options.nix b/system/options.nix
index 5358c206059..4c988d0b1bf 100644
--- a/system/options.nix
+++ b/system/options.nix
@@ -480,48 +480,6 @@ in
     };
 
 
-    jboss = {
-      enable = mkOption {
-        default = false;
-        description = "Whether to enable jboss";
-      };
-
-      tempDir = mkOption {
-        default = "/tmp";
-        description = "Location where JBoss stores its temp files";
-      };
-      
-      logDir = mkOption {
-        default = "/var/log/jboss";
-        description = "Location of the logfile directory of JBoss";
-      };
-      
-      serverDir = mkOption {
-        description = "Location of the server instance files";
-        default = "/var/jboss/server";
-      };
-      
-      deployDir = mkOption {
-        description = "Location of the deployment files";
-        default = "/nix/var/nix/profiles/default/server/default/deploy/";
-      };
-      
-      libUrl = mkOption {
-        default = "file:///nix/var/nix/profiles/default/server/default/lib";
-        description = "Location where the shared library JARs are stored";
-      };
-      
-      user = mkOption {
-        default = "nobody";
-        description = "User account under which jboss runs.";
-      };
-      
-      useJK = mkOption {
-        default = false;
-        description = "Whether to use to connector to the Apache HTTP server";
-      };
-    };
-
     tomcat = {
       enable = mkOption {
         default = false;
@@ -1343,6 +1301,7 @@ in
     (import ../upstart-jobs/bitlbee.nix)
     (import ../upstart-jobs/gnunet.nix)
     (import ../upstart-jobs/ejabberd.nix) # untested, dosen't compile on x86_64-linux
+    (import ../upstart-jobs/jboss.nix)
 
     # nix
     (import ../upstart-jobs/nix.nix) # nix options and daemon
diff --git a/upstart-jobs/default.nix b/upstart-jobs/default.nix
index 4de7e099a4f..684eb7dd36d 100644
--- a/upstart-jobs/default.nix
+++ b/upstart-jobs/default.nix
@@ -174,12 +174,6 @@ let
       inherit config pkgs;
     })
 
-  # JBoss service
-  ++ optional config.services.jboss.enable
-    (import ../upstart-jobs/jboss.nix {
-      inherit config pkgs;
-    })  
-
   # Apache Tomcat service
   ++ optional config.services.tomcat.enable
     (import ../upstart-jobs/tomcat.nix {
diff --git a/upstart-jobs/jboss.nix b/upstart-jobs/jboss.nix
index 6c35fe06436..322ed92b920 100644
--- a/upstart-jobs/jboss.nix
+++ b/upstart-jobs/jboss.nix
@@ -1,21 +1,82 @@
-args: with args;
+{pkgs, config, ...}:
 
+###### interface
+let
+  inherit (pkgs.lib) mkOption mkIf;
+
+  options = {
+    services = {
+      jboss = {
+        enable = mkOption {
+          default = false;
+          description = "Whether to enable jboss";
+        };
+
+        tempDir = mkOption {
+          default = "/tmp";
+          description = "Location where JBoss stores its temp files";
+        };
+        
+        logDir = mkOption {
+          default = "/var/log/jboss";
+          description = "Location of the logfile directory of JBoss";
+        };
+        
+        serverDir = mkOption {
+          description = "Location of the server instance files";
+          default = "/var/jboss/server";
+        };
+        
+        deployDir = mkOption {
+          description = "Location of the deployment files";
+          default = "/nix/var/nix/profiles/default/server/default/deploy/";
+        };
+        
+        libUrl = mkOption {
+          default = "file:///nix/var/nix/profiles/default/server/default/lib";
+          description = "Location where the shared library JARs are stored";
+        };
+        
+        user = mkOption {
+          default = "nobody";
+          description = "User account under which jboss runs.";
+        };
+        
+        useJK = mkOption {
+          default = false;
+          description = "Whether to use to connector to the Apache HTTP server";
+        };
+      };
+    };
+  };
+in
+
+###### implementation
 let
 
 cfg = config.services.jboss;
-jbossService = import ../services/jboss {
+jbossService = import ../../services/jboss {
         inherit (pkgs) stdenv jboss su;
         inherit (cfg) tempDir logDir libUrl deployDir serverDir user useJK;
 };
 
 in
-{
-        name = "jboss";
-        job = "
-description \"JBoss server\"
 
-stop on shutdown
+mkIf config.services.jboss.enable {
+  require = [
+    options
+  ];
+
+  services = {
+    extraJobs = [{
+      name = "jboss";
+      job = ''
+          description \"JBoss server\"
+
+          stop on shutdown
 
-respawn ${jbossService}/bin/control start
-        ";
+          respawn ${jbossService}/bin/control start
+      '';
+    }];
+  };
 }
-- 
GitLab


From eacbb7c38e63e5f9bd77ca876e9013253c35c99f Mon Sep 17 00:00:00 2001
From: Marc Weber <marco-oweber@gmx.de>
Date: Fri, 6 Mar 2009 12:26:34 +0000
Subject: [PATCH 1276/5331] Convert "tomcat"

svn path=/nixos/branches/fix-style/; revision=14380
---
 system/options.nix       |  48 +-------
 upstart-jobs/default.nix |   6 -
 upstart-jobs/tomcat.nix  | 256 ++++++++++++++++++++++++---------------
 3 files changed, 162 insertions(+), 148 deletions(-)

diff --git a/system/options.nix b/system/options.nix
index 4c988d0b1bf..693e8ae777e 100644
--- a/system/options.nix
+++ b/system/options.nix
@@ -480,53 +480,6 @@ in
     };
 
 
-    tomcat = {
-      enable = mkOption {
-        default = false;
-        description = "Whether to enable Apache Tomcat";
-      };
-      
-      baseDir = mkOption {
-        default = "/var/tomcat";
-        description = "Location where Tomcat stores configuration files, webapplications and logfiles";
-      };
-      
-      user = mkOption {
-        default = "tomcat";
-        description = "User account under which Apache Tomcat runs.";
-      };      
-      
-      deployFrom = mkOption {
-        default = "";
-        description = "Location where webapplications are stored. Leave empty to use the baseDir.";
-      };
-      
-      javaOpts = mkOption {
-        default = "";
-        description = "Parameters to pass to the Java Virtual Machine which spawns Apache Tomcat";
-      };
-      
-      catalinaOpts = mkOption {
-        default = "";
-        description = "Parameters to pass to the Java Virtual Machine which spawns the Catalina servlet container";
-      };
-      
-      sharedLibFrom = mkOption {
-        default = "";
-        description = "Location where shared libraries are stored. Leave empty to use the baseDir.";
-      };
-      
-      commonLibFrom = mkOption {
-        default = "";
-        description = "Location where common libraries are stored. Leave empty to use the baseDir.";
-      };
-      
-      contextXML = mkOption {
-        default = "";
-        description = "Location of the context.xml to use. Leave empty to use the default.";
-      };
-    };
-
     httpd = {
     
       enable = mkOption {
@@ -1302,6 +1255,7 @@ in
     (import ../upstart-jobs/gnunet.nix)
     (import ../upstart-jobs/ejabberd.nix) # untested, dosen't compile on x86_64-linux
     (import ../upstart-jobs/jboss.nix)
+    (import ../upstart-jobs/tomcat.nix) # untested, too lazy to get that jdk
 
     # nix
     (import ../upstart-jobs/nix.nix) # nix options and daemon
diff --git a/upstart-jobs/default.nix b/upstart-jobs/default.nix
index 684eb7dd36d..8493fc0b226 100644
--- a/upstart-jobs/default.nix
+++ b/upstart-jobs/default.nix
@@ -174,12 +174,6 @@ let
       inherit config pkgs;
     })
 
-  # Apache Tomcat service
-  ++ optional config.services.tomcat.enable
-    (import ../upstart-jobs/tomcat.nix {
-      inherit config pkgs;
-    })
-
   # Samba service.
   ++ optional config.services.samba.enable
     (import ../upstart-jobs/samba.nix {
diff --git a/upstart-jobs/tomcat.nix b/upstart-jobs/tomcat.nix
index 233da6abe38..f714e2387f3 100644
--- a/upstart-jobs/tomcat.nix
+++ b/upstart-jobs/tomcat.nix
@@ -1,109 +1,175 @@
-args: with args;
+{pkgs, config, ...}:
 
+###### interface
 let
-  cfg = config.services.tomcat;
-in
+  inherit (pkgs.lib) mkOption mkIf;
 
-{
-  name = "tomcat";
-  
-  groups = [
-    { name = "tomcat";
-      gid = (import ../system/ids.nix).gids.tomcat;
-    }
-  ];
-  
-  users = [
-    { name = "tomcat";
-      uid = (import ../system/ids.nix).uids.tomcat;
-      description = "Tomcat user";
-      home = "/homeless-shelter";
-    }
-  ];
-  
-  job = ''
-    description "Apache Tomcat server"
-
-    start on network-interface/started
-    stop on network-interfaces/stop
-    
-    start script
-        # Create initial state data
+  options = {
+    services = {
+      tomcat = {
+        enable = mkOption {
+          default = false;
+          description = "Whether to enable Apache Tomcat";
+        };
         
-        if ! test -d ${cfg.baseDir}
-        then    
-            mkdir -p ${cfg.baseDir}/webapps
-            mkdir -p ${cfg.baseDir}/shared
-	    mkdir -p ${cfg.baseDir}/lib
-            cp -av ${pkgs.tomcat6}/{conf,temp,logs} ${cfg.baseDir}
-        fi
+        baseDir = mkOption {
+          default = "/var/tomcat";
+          description = "Location where Tomcat stores configuration files, webapplications and logfiles";
+        };
         
-	# Deploy context.xml
-	
-	if test "${cfg.contextXML}" = ""
-	then
-	    cp ${pkgs.tomcat6}/conf/context.xml.default ${cfg.baseDir}/conf/context.xml
-	else
-	    cp ${cfg.contextXML} ${cfg.baseDir}/conf/context.xml
-	fi
-		
-        # Deploy all webapplications
+        user = mkOption {
+          default = "tomcat";
+          description = "User account under which Apache Tomcat runs.";
+        };      
         
-        if ! test "${cfg.deployFrom}" = ""
-        then
-            rm -rf ${cfg.baseDir}/webapps
-            mkdir -p ${cfg.baseDir}/webapps
-            for i in ${cfg.deployFrom}/*
-            do
-                cp -rL $i ${cfg.baseDir}/webapps
-            done
-        fi
-	
-        # Fix permissions
+        deployFrom = mkOption {
+          default = "";
+          description = "Location where webapplications are stored. Leave empty to use the baseDir.";
+        };
         
-        chown -R ${cfg.user} ${cfg.baseDir}
+        javaOpts = mkOption {
+          default = "";
+          description = "Parameters to pass to the Java Virtual Machine which spawns Apache Tomcat";
+        };
         
-        for i in `find ${cfg.baseDir} -type d`
-        do
-            chmod -v 755 $i
-        done
+        catalinaOpts = mkOption {
+          default = "";
+          description = "Parameters to pass to the Java Virtual Machine which spawns the Catalina servlet container";
+        };
         
-        for i in `find ${cfg.baseDir} -type f`
-        do
-            chmod -v 644 $i
-        done
+        sharedLibFrom = mkOption {
+          default = "";
+          description = "Location where shared libraries are stored. Leave empty to use the baseDir.";
+        };
+        
+        commonLibFrom = mkOption {
+          default = "";
+          description = "Location where common libraries are stored. Leave empty to use the baseDir.";
+        };
+        
+        contextXML = mkOption {
+          default = "";
+          description = "Location of the context.xml to use. Leave empty to use the default.";
+        };
+      };
+    };
+  };
+in
+
+###### implementation
 
-	# Deploy all common libraries
-		
-	rm -rf ${cfg.baseDir}/lib/*
-	
-	if test "${cfg.commonLibFrom}" = ""
-	then
-	    commonLibFrom="${pkgs.tomcat6}/lib";
-	else
-	    commonLibFrom="${cfg.commonLibFrom}";
-	fi
-	
-	for i in $commonLibFrom/*.jar
-	do
-	    ln -s $i ${cfg.baseDir}/lib
-	done
+let
+  cfg = config.services.tomcat;
+in
 
-        # Deploy all shared libraries
+mkIf config.services.tomcat.enable {
+  require = [
+    options
+  ];
+
+  services = {
+    extraJobs = [{
+      name = "tomcat";
+      
+      groups = [
+        { name = "tomcat";
+          gid = (import ../system/ids.nix).gids.tomcat;
+        }
+      ];
+      
+      users = [
+        { name = "tomcat";
+          uid = (import ../system/ids.nix).uids.tomcat;
+          description = "Tomcat user";
+          home = "/homeless-shelter";
+        }
+      ];
+      
+      job = ''
+        description "Apache Tomcat server"
+
+        start on network-interface/started
+        stop on network-interfaces/stop
         
-        if ! test "${cfg.sharedLibFrom}" = ""
-        then
-            rm -f ${cfg.baseDir}/shared/lib
-            ln -s ${cfg.sharedLibFrom} ${cfg.baseDir}/shared/lib
-        fi
+        start script
+            # Create initial state data
+            
+            if ! test -d ${cfg.baseDir}
+            then    
+                mkdir -p ${cfg.baseDir}/webapps
+                mkdir -p ${cfg.baseDir}/shared
+                mkdir -p ${cfg.baseDir}/lib
+                cp -av ${pkgs.tomcat6}/{conf,temp,logs} ${cfg.baseDir}
+            fi
+            
+            # Deploy context.xml
+            
+            if test "${cfg.contextXML}" = ""
+            then
+                cp ${pkgs.tomcat6}/conf/context.xml.default ${cfg.baseDir}/conf/context.xml
+            else
+                cp ${cfg.contextXML} ${cfg.baseDir}/conf/context.xml
+            fi
+                    
+            # Deploy all webapplications
+            
+            if ! test "${cfg.deployFrom}" = ""
+            then
+                rm -rf ${cfg.baseDir}/webapps
+                mkdir -p ${cfg.baseDir}/webapps
+                for i in ${cfg.deployFrom}/*
+                do
+                    cp -rL $i ${cfg.baseDir}/webapps
+                done
+            fi
+            
+            # Fix permissions
+            
+            chown -R ${cfg.user} ${cfg.baseDir}
+            
+            for i in `find ${cfg.baseDir} -type d`
+            do
+                chmod -v 755 $i
+            done
+            
+            for i in `find ${cfg.baseDir} -type f`
+            do
+                chmod -v 644 $i
+            done
 
-    end script
-    
-    respawn ${pkgs.su}/bin/su -s ${pkgs.bash}/bin/sh ${cfg.user} -c 'CATALINA_BASE=${cfg.baseDir} JAVA_HOME=${pkgs.jdk} JAVA_OPTS="${cfg.javaOpts}" CATALINA_OPTS="${cfg.catalinaOpts}" ${pkgs.tomcat6}/bin/startup.sh; sleep 1000d'
-    
-    stop script
-        echo "Stopping tomcat..."
-        CATALINA_BASE=${cfg.baseDir} JAVA_HOME=${pkgs.jdk} ${pkgs.su}/bin/su -s ${pkgs.bash}/bin/sh ${cfg.user} -c ${pkgs.tomcat6}/bin/shutdown.sh
-    end script
-  '';
+            # Deploy all common libraries
+                    
+            rm -rf ${cfg.baseDir}/lib/*
+            
+            if test "${cfg.commonLibFrom}" = ""
+            then
+                commonLibFrom="${pkgs.tomcat6}/lib";
+            else
+                commonLibFrom="${cfg.commonLibFrom}";
+            fi
+            
+            for i in $commonLibFrom/*.jar
+            do
+                ln -s $i ${cfg.baseDir}/lib
+            done
+
+            # Deploy all shared libraries
+            
+            if ! test "${cfg.sharedLibFrom}" = ""
+            then
+                rm -f ${cfg.baseDir}/shared/lib
+                ln -s ${cfg.sharedLibFrom} ${cfg.baseDir}/shared/lib
+            fi
+
+        end script
+        
+        respawn ${pkgs.su}/bin/su -s ${pkgs.bash}/bin/sh ${cfg.user} -c 'CATALINA_BASE=${cfg.baseDir} JAVA_HOME=${pkgs.jdk} JAVA_OPTS="${cfg.javaOpts}" CATALINA_OPTS="${cfg.catalinaOpts}" ${pkgs.tomcat6}/bin/startup.sh; sleep 1000d'
+        
+        stop script
+            echo "Stopping tomcat..."
+            CATALINA_BASE=${cfg.baseDir} JAVA_HOME=${pkgs.jdk} ${pkgs.su}/bin/su -s ${pkgs.bash}/bin/sh ${cfg.user} -c ${pkgs.tomcat6}/bin/shutdown.sh
+        end script
+      '';
+    }];
+  };
 }
-- 
GitLab


From e95773a38fc13aa7abed4e1048ac9b2aeb48a527 Mon Sep 17 00:00:00 2001
From: Marc Weber <marco-oweber@gmx.de>
Date: Fri, 6 Mar 2009 12:26:36 +0000
Subject: [PATCH 1277/5331] typo

svn path=/nixos/branches/fix-style/; revision=14381
---
 upstart-jobs/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/upstart-jobs/default.nix b/upstart-jobs/default.nix
index 8493fc0b226..e5a9cd6eba7 100644
--- a/upstart-jobs/default.nix
+++ b/upstart-jobs/default.nix
@@ -19,7 +19,7 @@ let
                  exec sh -c "echo 'hello world' | ${pkgs.netcat}/bin/nc -l -p 9000"
                  '';
              } ];
-        # should have some checks to everify the syntax
+        # should have some checks to verify the syntax
         merge = pkgs.lib.mergeListOption;
         description = "
           Additional Upstart jobs.
-- 
GitLab


From e7b7d62777ba701ed676a989ca714c95baad248c Mon Sep 17 00:00:00 2001
From: Marc Weber <marco-oweber@gmx.de>
Date: Fri, 6 Mar 2009 12:26:41 +0000
Subject: [PATCH 1278/5331] Convert "httpd" and "apache-httpd"

svn path=/nixos/branches/fix-style/; revision=14382
---
 system/options.nix                    | 198 +---------------
 upstart-jobs/apache-httpd/default.nix | 329 +++++++++++++++++++++-----
 upstart-jobs/default.nix              |  15 --
 upstart-jobs/httpd.nix                |  78 +++---
 4 files changed, 323 insertions(+), 297 deletions(-)

diff --git a/system/options.nix b/system/options.nix
index 693e8ae777e..ad7f28c5484 100644
--- a/system/options.nix
+++ b/system/options.nix
@@ -479,202 +479,6 @@ in
 
     };
 
-
-    httpd = {
-    
-      enable = mkOption {
-        default = false;
-        description = "
-          Whether to enable the Apache httpd server.
-        ";
-      };
-
-      experimental = mkOption {
-        default = false;
-        description = "
-          Whether to use the new-style Apache configuration.
-        ";
-      };
-
-      extraConfig = mkOption {
-        default = "";
-        description = "
-          These configuration lines will be passed verbatim to the apache config
-        ";
-      };
-
-      extraModules = mkOption {
-        default = [];
-        example = [ "proxy_connect" { name = "php5_module"; path = "${pkgs.php}/modules/libphp5.so"; } ];
-        description = ''
-          Specifies additional Apache modules.  These can be specified
-          as a string in the case of modules distributed with Apache,
-          or as an attribute set specifying the
-          <varname>name</varname> and <varname>path</varname> of the
-          module.
-        '';
-      };
-
-      logPerVirtualHost = mkOption {
-        default = false;
-        description = "
-          If enabled, each virtual host gets its own
-          <filename>access_log</filename> and
-          <filename>error_log</filename>, namely suffixed by the
-          <option>hostName</option> of the virtual host.
-        ";
-      };
-
-      user = mkOption {
-        default = "wwwrun";
-        description = "
-          User account under which httpd runs.  The account is created
-          automatically if it doesn't exist.
-        ";
-      };
-
-      group = mkOption {
-        default = "wwwrun";
-        description = "
-          Group under which httpd runs.  The account is created
-          automatically if it doesn't exist.
-        ";
-      };
-
-      logDir = mkOption {
-        default = "/var/log/httpd";
-        description = "
-          Directory for Apache's log files.  It is created automatically.
-        ";
-      };
-
-      stateDir = mkOption {
-        default = "/var/run/httpd";
-        description = "
-          Directory for Apache's transient runtime state (such as PID
-          files).  It is created automatically.  Note that the default,
-          <filename>/var/run/httpd</filename>, is deleted at boot time.
-        ";
-      };
-
-      mod_php = mkOption {
-        default = false;
-        description = "Whether to enable the PHP module.";
-      };
-
-      mod_jk = {
-        enable = mkOption {
-          default = false;
-          description = "Whether to enable the Apache Tomcat connector.";
-        };
-        
-        applicationMappings = mkOption {
-          default = [];
-          description = "List of Java webapplications that should be mapped to the servlet container (Tomcat/JBoss)";
-        };
-      };
-
-      virtualHosts = mkOption {
-        default = [];
-        example = [
-          { hostName = "foo";
-            documentRoot = "/data/webroot-foo";
-          }
-          { hostName = "bar";
-            documentRoot = "/data/webroot-bar";
-          }
-        ];
-        description = ''
-          Specification of the virtual hosts served by Apache.  Each
-          element should be an attribute set specifying the
-          configuration of the virtual host.  The available options
-          are the non-global options permissible for the main host.
-        '';
-      };
-
-      subservices = {
-
-        # !!! remove this
-        subversion = {
-
-          enable = mkOption {
-            default = false;
-            description = "
-              Whether to enable the Subversion subservice in the webserver.
-            ";
-          };
-
-          notificationSender = mkOption {
-            default = "svn-server@example.org";
-            example = "svn-server@example.org";
-            description = "
-              The email address used in the Sender field of commit
-              notification messages sent by the Subversion subservice.
-            ";
-          };
-
-          userCreationDomain = mkOption {
-            default = "example.org"; 
-            example = "example.org";
-            description = "
-              The domain from which user creation is allowed.  A client can
-              only create a new user account if its IP address resolves to
-              this domain.
-            ";
-          };
-
-          autoVersioning = mkOption {
-            default = false;
-            description = "
-              Whether you want the Subversion subservice to support
-              auto-versioning, which enables Subversion repositories to be
-              mounted as read/writable file systems on operating systems that
-              support WebDAV.
-            ";
-          };
-          
-          dataDir = mkOption {
-            default = "/no/such/path/exists";
-            description = "
-              Place to put SVN repository.
-            ";
-          };
-
-          organization = {
-
-            name = mkOption {
-              default = null;
-              description = "
-                Name of the organization hosting the Subversion service.
-              ";
-            };
-
-            url = mkOption {
-              default = null;
-              description = "
-                URL of the website of the organization hosting the Subversion service.
-              ";
-            };
-
-            logo = mkOption {
-              default = null;
-              description = "
-                Logo the organization hosting the Subversion service.
-              ";
-            };
-
-          };
-
-        };
-
-      };
-
-    } // # Include the options shared between the main server and virtual hosts.
-    (import ../upstart-jobs/apache-httpd/per-server-options.nix {
-      inherit mkOption;
-      forMainServer = true;
-    });
-
     vsftpd = {
       enable = mkOption {
         default = false;
@@ -1256,6 +1060,8 @@ in
     (import ../upstart-jobs/ejabberd.nix) # untested, dosen't compile on x86_64-linux
     (import ../upstart-jobs/jboss.nix)
     (import ../upstart-jobs/tomcat.nix) # untested, too lazy to get that jdk
+    (import ../upstart-jobs/httpd.nix) # Apache httpd (probably this can be removed ?)
+    (import ../upstart-jobs/apache-httpd) # Apache httpd (new style).
 
     # nix
     (import ../upstart-jobs/nix.nix) # nix options and daemon
diff --git a/upstart-jobs/apache-httpd/default.nix b/upstart-jobs/apache-httpd/default.nix
index ee15dc06f01..aab5d331d10 100644
--- a/upstart-jobs/apache-httpd/default.nix
+++ b/upstart-jobs/apache-httpd/default.nix
@@ -1,6 +1,209 @@
-{config, pkgs}:
+{pkgs, config, ...}:
 
+###### interface
 let
+  inherit (pkgs.lib) mkOption mkIf;
+
+  options = {
+    services = {
+      httpd = {
+      
+        enable = mkOption {
+          default = false;
+          description = "
+            Whether to enable the Apache httpd server.
+          ";
+        };
+
+        experimental = mkOption {
+          default = false;
+          description = "
+            Whether to use the new-style Apache configuration.
+          ";
+        };
+
+        extraConfig = mkOption {
+          default = "";
+          description = "
+            These configuration lines will be passed verbatim to the apache config
+          ";
+        };
+
+        extraModules = mkOption {
+          default = [];
+          example = [ "proxy_connect" { name = "php5_module"; path = "${pkgs.php}/modules/libphp5.so"; } ];
+          description = ''
+            Specifies additional Apache modules.  These can be specified
+            as a string in the case of modules distributed with Apache,
+            or as an attribute set specifying the
+            <varname>name</varname> and <varname>path</varname> of the
+            module.
+          '';
+        };
+
+        logPerVirtualHost = mkOption {
+          default = false;
+          description = "
+            If enabled, each virtual host gets its own
+            <filename>access_log</filename> and
+            <filename>error_log</filename>, namely suffixed by the
+            <option>hostName</option> of the virtual host.
+          ";
+        };
+
+        user = mkOption {
+          default = "wwwrun";
+          description = "
+            User account under which httpd runs.  The account is created
+            automatically if it doesn't exist.
+          ";
+        };
+
+        group = mkOption {
+          default = "wwwrun";
+          description = "
+            Group under which httpd runs.  The account is created
+            automatically if it doesn't exist.
+          ";
+        };
+
+        logDir = mkOption {
+          default = "/var/log/httpd";
+          description = "
+            Directory for Apache's log files.  It is created automatically.
+          ";
+        };
+
+        stateDir = mkOption {
+          default = "/var/run/httpd";
+          description = "
+            Directory for Apache's transient runtime state (such as PID
+            files).  It is created automatically.  Note that the default,
+            <filename>/var/run/httpd</filename>, is deleted at boot time.
+          ";
+        };
+
+        mod_php = mkOption {
+          default = false;
+          description = "Whether to enable the PHP module.";
+        };
+
+        mod_jk = {
+          enable = mkOption {
+            default = false;
+            description = "Whether to enable the Apache Tomcat connector.";
+          };
+          
+          applicationMappings = mkOption {
+            default = [];
+            description = "List of Java webapplications that should be mapped to the servlet container (Tomcat/JBoss)";
+          };
+        };
+
+        virtualHosts = mkOption {
+          default = [];
+          example = [
+            { hostName = "foo";
+              documentRoot = "/data/webroot-foo";
+            }
+            { hostName = "bar";
+              documentRoot = "/data/webroot-bar";
+            }
+          ];
+          description = ''
+            Specification of the virtual hosts served by Apache.  Each
+            element should be an attribute set specifying the
+            configuration of the virtual host.  The available options
+            are the non-global options permissible for the main host.
+          '';
+        };
+
+        subservices = {
+
+          # !!! remove this
+          subversion = {
+
+            enable = mkOption {
+              default = false;
+              description = "
+                Whether to enable the Subversion subservice in the webserver.
+              ";
+            };
+
+            notificationSender = mkOption {
+              default = "svn-server@example.org";
+              example = "svn-server@example.org";
+              description = "
+                The email address used in the Sender field of commit
+                notification messages sent by the Subversion subservice.
+              ";
+            };
+
+            userCreationDomain = mkOption {
+              default = "example.org"; 
+              example = "example.org";
+              description = "
+                The domain from which user creation is allowed.  A client can
+                only create a new user account if its IP address resolves to
+                this domain.
+              ";
+            };
+
+            autoVersioning = mkOption {
+              default = false;
+              description = "
+                Whether you want the Subversion subservice to support
+                auto-versioning, which enables Subversion repositories to be
+                mounted as read/writable file systems on operating systems that
+                support WebDAV.
+              ";
+            };
+            
+            dataDir = mkOption {
+              default = "/no/such/path/exists";
+              description = "
+                Place to put SVN repository.
+              ";
+            };
+
+            organization = {
+
+              name = mkOption {
+                default = null;
+                description = "
+                  Name of the organization hosting the Subversion service.
+                ";
+              };
+
+              url = mkOption {
+                default = null;
+                description = "
+                  URL of the website of the organization hosting the Subversion service.
+                ";
+              };
+
+              logo = mkOption {
+                default = null;
+                description = "
+                  Logo the organization hosting the Subversion service.
+                ";
+              };
+
+            };
+
+          };
+
+        };
+      } // # Include the options shared between the main server and virtual hosts.
+          (import ../../upstart-jobs/apache-httpd/per-server-options.nix {
+           inherit mkOption;
+           forMainServer = true;
+        });
+    };
+  };
+
+
+###### implementation
 
   mainCfg = config.services.httpd;
   
@@ -361,65 +564,75 @@ let
     
 in
 
-{
-
-  name = "httpd";
-  
-  users = [
-    { name = mainCfg.user;
-      description = "Apache httpd user";
-    }
-  ];
 
-  groups = [
-    { name = mainCfg.group;
-    }
+mkIf (config.services.httpd.enable && config.services.httpd.experimental) {
+  require = [
+    options
   ];
 
-  extraPath = [httpd] ++ concatMap (svc: svc.extraPath) allSubservices;
-
-  # Statically verify the syntactic correctness of the generated
-  # httpd.conf.  !!! this is impure!  It doesn't just check for
-  # syntax, but also whether the Apache user/group exist, whether SSL
-  # keys exist, etc.
-  buildHook = ''
-    echo
-    echo '=== Checking the generated Apache configuration file ==='
-    ${httpd}/bin/httpd -f ${httpdConf} -t || true
-  '';
-
-  job = ''
-    description "Apache HTTPD"
-
-    start on ${startingDependency}/started
-    stop on shutdown
-
-    start script
-      mkdir -m 0700 -p ${mainCfg.stateDir}
-      mkdir -m 0700 -p ${mainCfg.logDir}
-
-      # Get rid of old semaphores.  These tend to accumulate across
-      # server restarts, eventually preventing it from restarting
-      # succesfully.
-      for i in $(${pkgs.utillinux}/bin/ipcs -s | grep ' ${mainCfg.user} ' | cut -f2 -d ' '); do
-          ${pkgs.utillinux}/bin/ipcrm -s $i
-      done
-
-      # Run the startup hooks for the subservices.
-      for i in ${toString (map (svn: svn.startupScript) allSubservices)}; do
-          echo Running Apache startup hook $i...
-          $i
-      done
-    end script
-
-    ${
-      let f = {name, value}: "env ${name}=${value}\n";
-      in concatMapStrings f (pkgs.lib.concatMap (svc: svc.globalEnvVars) allSubservices)
-    }
-
-    env PATH=${pkgs.coreutils}/bin:${pkgs.gnugrep}/bin:${pkgs.lib.concatStringsSep ":" (pkgs.lib.concatMap (svc: svc.extraServerPath) allSubservices)}
-
-    respawn ${httpd}/bin/httpd -f ${httpdConf} -DNO_DETACH
-  '';
+  users = {
+    extraUsers = [
+      { name = mainCfg.user;
+        description = "Apache httpd user";
+      }
+    ];
+    extraGroups = [
+      { name = mainCfg.group;
+      }
+    ];
+  };
 
+  services = {
+    extraJobs = [{
+      name = "httpd";
+
+      extraPath = [httpd] ++ concatMap (svc: svc.extraPath) allSubservices;
+
+      # Statically verify the syntactic correctness of the generated
+      # httpd.conf.  !!! this is impure!  It doesn't just check for
+      # syntax, but also whether the Apache user/group exist, whether SSL
+      # keys exist, etc.
+      buildHook = ''
+        echo
+        echo '=== Checking the generated Apache configuration file ==='
+        ${httpd}/bin/httpd -f ${httpdConf} -t || true
+      '';
+
+      job = ''
+        description "Apache HTTPD"
+
+        start on ${startingDependency}/started
+        stop on shutdown
+
+        start script
+          mkdir -m 0700 -p ${mainCfg.stateDir}
+          mkdir -m 0700 -p ${mainCfg.logDir}
+
+          # Get rid of old semaphores.  These tend to accumulate across
+          # server restarts, eventually preventing it from restarting
+          # succesfully.
+          for i in $(${pkgs.utillinux}/bin/ipcs -s | grep ' ${mainCfg.user} ' | cut -f2 -d ' '); do
+              ${pkgs.utillinux}/bin/ipcrm -s $i
+          done
+
+          # Run the startup hooks for the subservices.
+          for i in ${toString (map (svn: svn.startupScript) allSubservices)}; do
+              echo Running Apache startup hook $i...
+              $i
+          done
+        end script
+
+        ${
+          let f = {name, value}: "env ${name}=${value}\n";
+          in concatMapStrings f (pkgs.lib.concatMap (svc: svc.globalEnvVars) allSubservices)
+        }
+
+        env PATH=${pkgs.coreutils}/bin:${pkgs.gnugrep}/bin:${pkgs.lib.concatStringsSep ":" (pkgs.lib.concatMap (svc: svc.extraServerPath) allSubservices)}
+
+        respawn ${httpd}/bin/httpd -f ${httpdConf} -DNO_DETACH
+      '';
+
+    }];
+  };
 }
+
diff --git a/upstart-jobs/default.nix b/upstart-jobs/default.nix
index e5a9cd6eba7..347af40204e 100644
--- a/upstart-jobs/default.nix
+++ b/upstart-jobs/default.nix
@@ -141,21 +141,6 @@ let
       inherit config;
     })
 
-  # Apache httpd.
-  ++ optional (config.services.httpd.enable && !config.services.httpd.experimental)
-    (import ../upstart-jobs/httpd.nix {
-      inherit config pkgs;
-      inherit (pkgs) glibc;
-      extraConfig = pkgs.lib.concatStringsSep "\n"
-        (map (job: job.extraHttpdConfig) jobs);
-    })
-
-  # Apache httpd (new style).
-  ++ optional (config.services.httpd.enable && config.services.httpd.experimental)
-    (import ../upstart-jobs/apache-httpd {
-      inherit config pkgs;
-    })
-
   # MySQL server
   ++ optional config.services.mysql.enable
     (import ../upstart-jobs/mysql.nix {
diff --git a/upstart-jobs/httpd.nix b/upstart-jobs/httpd.nix
index f9613f931ff..1dd25afbf9c 100644
--- a/upstart-jobs/httpd.nix
+++ b/upstart-jobs/httpd.nix
@@ -1,4 +1,14 @@
-{config, pkgs, glibc, extraConfig}:
+{pkgs, config, ...}:
+
+###### interface
+let
+  inherit (pkgs.lib) mkOption mkIf;
+
+  # options have been moved to the apache-httpd/default.nix file 
+
+in
+
+###### implementation
 
 let
 
@@ -21,6 +31,11 @@ let
   applicationMappings = cfg.mod_jk.applicationMappings;
   
   startingDependency = if config.services.gw6c.enable && config.services.gw6c.autorun then "gw6c" else "network-interfaces";
+
+
+  extraConfig = pkgs.lib.concatStringsSep "\n"
+      (pkgs.lib.catAttrs "extraHttpdConfig" config.services.extraJobs);
+
   
   webServer = import ../../services/apache-httpd {
     inherit (pkgs) apacheHttpd coreutils;
@@ -32,6 +47,7 @@ let
       user group adminAddr logDir stateDir
       applicationMappings;
     noUserDir = !cfg.enableUserDir;
+
     extraDirectories = extraConfig + "\n" + cfg.extraConfig;
     
     subServices =
@@ -72,41 +88,47 @@ let
           )
         )
         )
-      )
-      /* ++
-
-      (optional cfg.extraSubservices.enable
-        (map (service : service webServer pkgs) cfg.extraSubservices.services)
-      ) */;
+      );
   };
   
 in
 
-{
-  name = "httpd";
-  
-  users = [
-    { name = user;
-      description = "Apache httpd user";
-    }
-  ];
+mkIf (config.services.httpd.enable && !config.services.httpd.experimental) {
 
-  groups = [
-    { name = group;
-    }
+  require = [
+    # options have been moved to the apache-httpd/default.nix file 
   ];
-  
-  job = "
-description \"Apache HTTPD\"
 
-start on ${startingDependency}/started
-stop on ${startingDependency}/stop
+  users = {
+    extraUsers = [
+      { name = user;
+        description = "Apache httpd user";
+      }
+    ];
 
-start script
-    ${webServer}/bin/control prepare    
-end script
+    extraGroups = [
+      { name = group;
+      }
+    ];
+  };
 
-respawn ${webServer}/bin/control run
-  ";
+  services = {
+    extraJobs = [{
+      name = "httpd";
+      
+      job = ''
+        description \"Apache HTTPD\"
+
+        start on ${startingDependency}/started
+        stop on ${startingDependency}/stop
+
+        start script
+            ${webServer}/bin/control prepare    
+        end script
+
+        respawn ${webServer}/bin/control run
+      '';
   
+    }];
+  };
 }
-- 
GitLab


From 4d0761beb22ef28d007ecf21b69eec01fb0568fd Mon Sep 17 00:00:00 2001
From: Marc Weber <marco-oweber@gmx.de>
Date: Fri, 6 Mar 2009 12:26:43 +0000
Subject: [PATCH 1279/5331] Convert "vsftpd"

svn path=/nixos/branches/fix-style/; revision=14383
---
 system/options.nix       |  38 +-------
 upstart-jobs/default.nix |   8 --
 upstart-jobs/vsftpd.nix  | 192 +++++++++++++++++++++++----------------
 3 files changed, 117 insertions(+), 121 deletions(-)

diff --git a/system/options.nix b/system/options.nix
index ad7f28c5484..f70abacc359 100644
--- a/system/options.nix
+++ b/system/options.nix
@@ -479,43 +479,6 @@ in
 
     };
 
-    vsftpd = {
-      enable = mkOption {
-        default = false;
-        description = "
-          Whether to enable the vsftpd FTP server.
-        ";
-      };
-      
-      anonymousUser = mkOption {
-        default = false;
-        description = "
-          Whether to enable the anonymous FTP user.
-        ";
-      };
-
-      writeEnable = mkOption {
-        default = false;
-        description = "
-          Whether any write activity is permitted to users.
-        ";
-      };
-
-      anonymousUploadEnable = mkOption {
-        default = false;
-        description = "
-          Whether any uploads are permitted to anonymous users.
-        ";
-      };
-
-      anonymousMkdirEnable = mkOption {
-        default = false;
-        description = "
-          Whether mkdir is permitted to anonymous users.
-        ";
-      };
-    };
-    
     printing = {
 
       enable = mkOption {
@@ -1062,6 +1025,7 @@ in
     (import ../upstart-jobs/tomcat.nix) # untested, too lazy to get that jdk
     (import ../upstart-jobs/httpd.nix) # Apache httpd (probably this can be removed ?)
     (import ../upstart-jobs/apache-httpd) # Apache httpd (new style).
+    (import ../upstart-jobs/vsftpd.nix)
 
     # nix
     (import ../upstart-jobs/nix.nix) # nix options and daemon
diff --git a/upstart-jobs/default.nix b/upstart-jobs/default.nix
index 347af40204e..1ca038c9221 100644
--- a/upstart-jobs/default.nix
+++ b/upstart-jobs/default.nix
@@ -172,14 +172,6 @@ let
       inherit config pkgs modprobe;
     })
 
-  # VSFTPd server
-  ++ optional config.services.vsftpd.enable
-    (import ../upstart-jobs/vsftpd.nix {
-      inherit (pkgs) vsftpd;
-      inherit (config.services.vsftpd) anonymousUser 
-        writeEnable anonymousUploadEnable anonymousMkdirEnable;
-    })
-
   # X Font Server
   ++ optional config.services.xfs.enable
     (import ../upstart-jobs/xfs.nix {
diff --git a/upstart-jobs/vsftpd.nix b/upstart-jobs/vsftpd.nix
index 01a509ea679..22d11eab51b 100644
--- a/upstart-jobs/vsftpd.nix
+++ b/upstart-jobs/vsftpd.nix
@@ -1,80 +1,120 @@
-{ vsftpd, anonymousUser
-, anonymousUploadEnable, anonymousMkdirEnable, writeEnable
-}:
+{pkgs, config, ...}:
 
-{
-  name = "vsftpd";
+###### interface
+let
+  inherit (pkgs.lib) mkOption mkIf;
 
-  groups = [
-    { name = "ftp";
-      gid = (import ../system/ids.nix).gids.ftp;
-    }
+  options = {
+    services = {
+      vsftpd = {
+        enable = mkOption {
+          default = false;
+          description = "
+            Whether to enable the vsftpd FTP server.
+          ";
+        };
+        
+        anonymousUser = mkOption {
+          default = false;
+          description = "
+            Whether to enable the anonymous FTP user.
+          ";
+        };
+
+        writeEnable = mkOption {
+          default = false;
+          description = "
+            Whether any write activity is permitted to users.
+          ";
+        };
+
+        anonymousUploadEnable = mkOption {
+          default = false;
+          description = "
+            Whether any uploads are permitted to anonymous users.
+          ";
+        };
+
+        anonymousMkdirEnable = mkOption {
+          default = false;
+          description = "
+            Whether mkdir is permitted to anonymous users.
+          ";
+        };
+      };
+    };
+  };
+in
+
+###### implementation
+
+let 
+
+  inherit (config.services.vsftpd) anonymousUser writeEnable anonymousUploadEnable anonymousMkdirEnable;
+  inherit (pkgs) vsftpd;
+
+  yesNoOption = p : name :
+    "${name}=${if p then "YES" else "NO"}";
+
+in
+
+mkIf config.services.vsftpd.enable {
+  require = [
+    options
   ];
-  
-  users = [
-    { name = "vsftpd";
-      uid = (import ../system/ids.nix).uids.vsftpd;
-      description = "VSFTPD user";
-      home = "/homeless-shelter";
-    }
-  ] ++
-  (if anonymousUser then [
-    { name = "ftp";
-      uid = (import ../system/ids.nix).uids.ftp;
-      group = "ftp";
-      description = "Anonymous ftp user";
-      home = "/home/ftp";
-    } 
-  ]
-  else
-  []);
-  
-  job = "
-description \"vsftpd server\"
-
-start on network-interfaces/started
-stop on network-interfaces/stop
-
-start script
-    cat > /etc/vsftpd.conf <<EOF
-" + 
-    (if anonymousUser then 
-"anonymous_enable=YES"
-    else
-"anonymous_enable=NO") +
-(if writeEnable then 
-"
-write_enable=YES"
-else
-"
-write_enable=NO"
-) +
-(if anonymousUploadEnable then 
-"
-anon_upload_enable=YES"
-else
-"
-anon_upload_enable=NO"
-) +
-(if anonymousMkdirEnable then 
-"
-anon_mkdir_write_enable=YES"
-else
-"
-anon_mkdir_write_enable=NO"
-) +
-"
-background=NO
-listen=YES
-nopriv_user=vsftpd
-secure_chroot_dir=/var/ftp/empty
-EOF
-
-    mkdir -p /home/ftp &&
-    chown -R ftp:ftp /home/ftp
-end script
-
-respawn ${vsftpd}/sbin/vsftpd /etc/vsftpd.conf
-  ";
-  
+
+  users = {
+    extraUsers = [
+        { name = "vsftpd";
+          uid = (import ../system/ids.nix).uids.vsftpd;
+          description = "VSFTPD user";
+          home = "/homeless-shelter";
+        }
+      ] ++ pkgs.lib.optional anonymousUser
+        { name = "ftp";
+          uid = (import ../system/ids.nix).uids.ftp;
+          group = "ftp";
+          description = "Anonymous ftp user";
+          home = "/home/ftp";
+        };
+
+    extraGroups = [
+      { name = "ftp";
+        gid = (import ../system/ids.nix).gids.ftp;
+      }
+    ];
+      
+  };
+
+  services = {
+    extraJobs = [{
+      name = "vsftpd";
+
+      job = ''
+        description "vsftpd server"
+
+        start on network-interfaces/started
+        stop on network-interfaces/stop
+
+        start script
+        cat > /etc/vsftpd.conf <<EOF
+        ${yesNoOption anonymousUser "anonymous_enable"}
+        ${yesNoOption writeEnable "write_enable"}
+        ${yesNoOption anonymousUploadEnable "anon_upload_enable"}
+        ${yesNoOption anonymousMkdirEnable "anon_mkdir_write_enable"}
+        background=NO
+        listen=YES
+        nopriv_user=vsftpd
+        secure_chroot_dir=/var/ftp/empty
+        EOF
+
+        mkdir -p /home/ftp &&
+        chown -R ftp:ftp /home/ftp
+        end script
+
+        respawn ${vsftpd}/sbin/vsftpd /etc/vsftpd.conf
+      '';
+      
+    }];
+  };
 }
-- 
GitLab


From d0733953e1f61f0d59beaf459ad3773413d7b767 Mon Sep 17 00:00:00 2001
From: Marc Weber <marco-oweber@gmx.de>
Date: Fri, 6 Mar 2009 12:26:46 +0000
Subject: [PATCH 1280/5331] Convert "printing", CUPS daemon

svn path=/nixos/branches/fix-style/; revision=14384
---
 system/options.nix       | 13 +-----
 upstart-jobs/cupsd.nix   | 94 +++++++++++++++++++++++++++-------------
 upstart-jobs/default.nix |  6 ---
 3 files changed, 64 insertions(+), 49 deletions(-)

diff --git a/system/options.nix b/system/options.nix
index f70abacc359..91cd0c78a7d 100644
--- a/system/options.nix
+++ b/system/options.nix
@@ -479,18 +479,6 @@ in
 
     };
 
-    printing = {
-
-      enable = mkOption {
-        default = false;
-        description = "
-          Whether to enable printing support through the CUPS daemon.
-        ";
-      };
-
-    };
-
-
     udev = {
 
       addFirmware = mkOption {
@@ -1026,6 +1014,7 @@ in
     (import ../upstart-jobs/httpd.nix) # Apache httpd (probably this can be removed ?)
     (import ../upstart-jobs/apache-httpd) # Apache httpd (new style).
     (import ../upstart-jobs/vsftpd.nix)
+    (import ../upstart-jobs/cupsd.nix) # CUPS printing daemon
 
     # nix
     (import ../upstart-jobs/nix.nix) # nix options and daemon
diff --git a/upstart-jobs/cupsd.nix b/upstart-jobs/cupsd.nix
index ced164a1308..7f5529e6f75 100644
--- a/upstart-jobs/cupsd.nix
+++ b/upstart-jobs/cupsd.nix
@@ -1,4 +1,26 @@
-{config, pkgs, modprobe}:
+{pkgs, config, ...}:
+
+###### interface
+let
+  inherit (pkgs.lib) mkOption mkIf;
+
+  options = {
+    services = {
+      printing = {
+
+        enable = mkOption {
+          default = false;
+          description = "
+            Whether to enable printing support through the CUPS daemon.
+          ";
+        };
+
+      };
+    };
+  };
+in
+
+###### implementation
 
 let
 
@@ -7,6 +29,8 @@ let
 
   inherit (pkgs) cups;
 
+  modprobe = config.system.sbin.modprobe;
+
 
   # Here we can enable additional backends, filters, etc. that are not
   # part of CUPS itself, e.g. the SMB backend is part of Samba.  Since
@@ -101,37 +125,45 @@ let
 
 in
 
-{
-  name = "cupsd";
-
-  extraPath = [cups];
 
-  extraEtc = [
-    # CUPS expects the following files in its ServerRoot.
-    { source = "${cups}/etc/cups/mime.convs";
-      target = "cups/mime.convs";
-    }
-    { source = "${cups}/etc/cups/mime.types";
-      target = "cups/mime.types";
-    }
+mkIf config.services.pulseaudio.enable {
+  require = [
+    options
   ];
-  
-  job = ''
-    description "CUPS printing daemon"
-
-    start on network-interfaces/started
-    stop on network-interfaces/stop
-
-    start script
-        mkdir -m 0755 -p ${logDir}
-        mkdir -m 0700 -p /var/cache/cups
-        mkdir -m 0700 -p /var/spool/cups
 
-        # Make USB printers show up.
-        ${modprobe}/sbin/modprobe usblp || true
-    end script
-
-    respawn ${cups}/sbin/cupsd -c ${cupsdConfig} -F
-  '';
-  
+  services = {
+    extraJobs = [{
+      name = "cupsd";
+
+      extraPath = [cups];
+
+      extraEtc = [
+        # CUPS expects the following files in its ServerRoot.
+        { source = "${cups}/etc/cups/mime.convs";
+          target = "cups/mime.convs";
+        }
+        { source = "${cups}/etc/cups/mime.types";
+          target = "cups/mime.types";
+        }
+      ];
+      
+      job = ''
+        description "CUPS printing daemon"
+
+        start on network-interfaces/started
+        stop on network-interfaces/stop
+
+        start script
+            mkdir -m 0755 -p ${logDir}
+            mkdir -m 0700 -p /var/cache/cups
+            mkdir -m 0700 -p /var/spool/cups
+
+            # Make USB printers show up.
+            ${modprobe}/sbin/modprobe usblp || true
+        end script
+
+        respawn ${cups}/sbin/cupsd -c ${cupsdConfig} -F
+      '';
+    }];
+  };
 }
diff --git a/upstart-jobs/default.nix b/upstart-jobs/default.nix
index 1ca038c9221..e185b5a444b 100644
--- a/upstart-jobs/default.nix
+++ b/upstart-jobs/default.nix
@@ -166,12 +166,6 @@ let
       inherit (pkgs) glibc samba;
     })
 
-  # CUPS (printing) daemon.
-  ++ optional config.services.printing.enable
-    (import ../upstart-jobs/cupsd.nix {
-      inherit config pkgs modprobe;
-    })
-
   # X Font Server
   ++ optional config.services.xfs.enable
     (import ../upstart-jobs/xfs.nix {
-- 
GitLab


From e0240ddf3dfce71132f9d479d98dc39e88532a54 Mon Sep 17 00:00:00 2001
From: Marc Weber <marco-oweber@gmx.de>
Date: Fri, 6 Mar 2009 12:26:48 +0000
Subject: [PATCH 1281/5331] Convert "udev"

svn path=/nixos/branches/fix-style/; revision=14385
---
 system/options.nix       |  34 +-------
 upstart-jobs/default.nix |  10 ---
 upstart-jobs/udev.nix    | 163 ++++++++++++++++++++++++++-------------
 3 files changed, 111 insertions(+), 96 deletions(-)

diff --git a/system/options.nix b/system/options.nix
index 91cd0c78a7d..099e99f77e7 100644
--- a/system/options.nix
+++ b/system/options.nix
@@ -479,39 +479,6 @@ in
 
     };
 
-    udev = {
-
-      addFirmware = mkOption {
-        default = [];
-        example = ["/mnt/big-storage/firmware/"];
-        description = "
-          To specify firmware that is not too spread to ensure 
-          a package, or have an interactive process of extraction
-          and cannot be redistributed.
-        ";
-        merge = pkgs.lib.mergeListOption;
-      };
-
-      addUdevPkgs = mkOption {
-        default = [];
-        description = "
-          List of packages containing udev rules.
-        ";
-        merge = pkgs.lib.mergeListOption;
-      };
-      
-      sndMode = mkOption {
-        default = "0600";
-        example = "0666";
-        description = "
-          Permissions for /dev/snd/*, in case you have multiple 
-          logged in users or if the devices belong to root for 
-          some reason.
-        ";
-      };
-    };
-
-
     samba = {
 
       enable = mkOption {
@@ -1015,6 +982,7 @@ in
     (import ../upstart-jobs/apache-httpd) # Apache httpd (new style).
     (import ../upstart-jobs/vsftpd.nix)
     (import ../upstart-jobs/cupsd.nix) # CUPS printing daemon
+    (import ../upstart-jobs/udev.nix) # The udev daemon creates devices nodes and runs programs when hardware events occur.
 
     # nix
     (import ../upstart-jobs/nix.nix) # nix options and daemon
diff --git a/upstart-jobs/default.nix b/upstart-jobs/default.nix
index e185b5a444b..43230ec505a 100644
--- a/upstart-jobs/default.nix
+++ b/upstart-jobs/default.nix
@@ -77,16 +77,6 @@ let
       inherit config;
     })
 
-    # The udev daemon creates devices nodes and runs programs when
-    # hardware events occur.
-    (import ../upstart-jobs/udev.nix {
-      inherit modprobe config;
-      inherit (pkgs) stdenv writeText substituteAll udev procps;
-      inherit (pkgs.lib) cleanSource;
-      firmwareDirs = config.services.udev.addFirmware;
-      extraUdevPkgs = config.services.udev.addUdevPkgs;
-    })
-      
     # Makes LVM logical volumes available. 
     (import ../upstart-jobs/lvm.nix {
       inherit modprobe;
diff --git a/upstart-jobs/udev.nix b/upstart-jobs/udev.nix
index 4662adde222..4765f29176e 100644
--- a/upstart-jobs/udev.nix
+++ b/upstart-jobs/udev.nix
@@ -1,18 +1,66 @@
-{ stdenv, writeText, substituteAll, cleanSource, udev, procps, firmwareDirs, modprobe
-, extraUdevPkgs ? []
-, config
-}:
+{pkgs, config, ...}:
 
+###### interface
 let
+  inherit (pkgs.lib) mkOption mkIf;
+
+  options = {
+    services = {
+      udev = {
+
+        addFirmware = mkOption {
+          default = [];
+          example = ["/mnt/big-storage/firmware/"];
+          description = "
+            To specify firmware that is not too spread to ensure 
+            a package, or have an interactive process of extraction
+            and cannot be redistributed.
+          ";
+          merge = pkgs.lib.mergeListOption;
+        };
+
+        addUdevPkgs = mkOption {
+          default = [];
+          description = "
+            List of packages containing udev rules.
+          ";
+          merge = pkgs.lib.mergeListOption;
+        };
+        
+        sndMode = mkOption {
+          default = "0600";
+          example = "0666";
+          description = "
+            Permissions for /dev/snd/*, in case you have multiple 
+            logged in users or if the devices belong to root for 
+            some reason.
+          ";
+        };
+      };
+    };
+  };
+in
+
+###### implementation
+
+let
+
+  inherit (pkgs) substituteAll stdenv writeText udev procps;
 
   cfg = config.services.udev;
 
+
   firmwareLoader = substituteAll {
     src = ./udev-firmware-loader.sh;
     path = "${stdenv.coreutils}/bin";
     isExecutable = true;
     inherit firmwareDirs;
   };
+
+  firmwareDirs = config.services.udev.addFirmware;
+  extraUdevPkgs = config.services.udev.addUdevPkgs;
+
+  modprobe = config.system.sbin.modprobe;
     
   nixRules = writeText "90-nix.rules" ''
   
@@ -86,55 +134,64 @@ let
 in
 
 {
-  name = "udev";
-  
-  job = ''
-    start on startup
-    stop on shutdown
-
-    env UDEV_CONFIG_FILE=${conf}
 
-    start script
-        echo "" > /proc/sys/kernel/hotplug
+  require = [
+    options
+  ];
 
-        # Get rid of possible old udev processes.
-        ${procps}/bin/pkill -u root "^udevd$" || true
-
-        # Do the loading of additional stage 2 kernel modules.
-        # Maybe this isn't the best place...
-        for i in ${toString config.boot.kernelModules}; do
-            echo "Loading kernel module $i..."
-            ${modprobe}/sbin/modprobe $i || true
-        done
-
-        # Start udev.
-        ${udev}/sbin/udevd --daemon
-
-        # Let udev create device nodes for all modules that have already
-        # been loaded into the kernel (or for which support is built into
-        # the kernel).
-        if ! test -e ${devicesCreated}; then
-            ${udev}/sbin/udevadm trigger
-            ${udev}/sbin/udevadm settle # wait for udev to finish
-            touch ${devicesCreated}
-        fi
-
-        # Kill udev, let Upstart restart and monitor it.  (This is nasty,
-        # but we have to run `udevadm trigger' first.  Maybe we can use
-        # Upstart's `binary' keyword, but it isn't implemented yet.)
-        if ! ${procps}/bin/pkill -u root "^udevd$"; then
-            echo "couldn't stop udevd"
-        fi
-
-        while ${procps}/bin/pgrep -u root "^udevd$"; do
-            sleep 1
-        done
-
-        initctl emit new-devices
-    end script
-
-    respawn ${udev}/sbin/udevd
-  '';
-
-  passthru = {inherit udevRules;};
+  services = {
+    extraJobs = [{
+      name = "udev";
+      
+      job = ''
+        start on startup
+        stop on shutdown
+
+        env UDEV_CONFIG_FILE=${conf}
+
+        start script
+            echo "" > /proc/sys/kernel/hotplug
+
+            # Get rid of possible old udev processes.
+            ${procps}/bin/pkill -u root "^udevd$" || true
+
+            # Do the loading of additional stage 2 kernel modules.
+            # Maybe this isn't the best place...
+            for i in ${toString config.boot.kernelModules}; do
+                echo "Loading kernel module $i..."
+                ${modprobe}/sbin/modprobe $i || true
+            done
+
+            # Start udev.
+            ${udev}/sbin/udevd --daemon
+
+            # Let udev create device nodes for all modules that have already
+            # been loaded into the kernel (or for which support is built into
+            # the kernel).
+            if ! test -e ${devicesCreated}; then
+                ${udev}/sbin/udevadm trigger
+                ${udev}/sbin/udevadm settle # wait for udev to finish
+                touch ${devicesCreated}
+            fi
+
+            # Kill udev, let Upstart restart and monitor it.  (This is nasty,
+            # but we have to run `udevadm trigger' first.  Maybe we can use
+            # Upstart's `binary' keyword, but it isn't implemented yet.)
+            if ! ${procps}/bin/pkill -u root "^udevd$"; then
+                echo "couldn't stop udevd"
+            fi
+
+            while ${procps}/bin/pgrep -u root "^udevd$"; do
+                sleep 1
+            done
+
+            initctl emit new-devices
+        end script
+
+        respawn ${udev}/sbin/udevd
+      '';
+
+      passthru = {inherit udevRules;};
+    }];
+  };
 }
-- 
GitLab


From e6144b476332d60d9adc2b61e21bae7f43528d8e Mon Sep 17 00:00:00 2001
From: Marc Weber <marco-oweber@gmx.de>
Date: Fri, 6 Mar 2009 12:26:50 +0000
Subject: [PATCH 1282/5331] Convert "samba"

svn path=/nixos/branches/fix-style/; revision=14386
---
 system/options.nix       |  13 +----
 upstart-jobs/default.nix |   7 ---
 upstart-jobs/samba.nix   | 101 ++++++++++++++++++++++++++-------------
 3 files changed, 69 insertions(+), 52 deletions(-)

diff --git a/system/options.nix b/system/options.nix
index 099e99f77e7..7eb77868e69 100644
--- a/system/options.nix
+++ b/system/options.nix
@@ -479,18 +479,6 @@ in
 
     };
 
-    samba = {
-
-      enable = mkOption {
-        default = false;
-        description = "
-          Whether to enable the samba server. (to communicate with, and provide windows shares)
-        ";
-      };
-
-    };
-
-
     ircdHybrid = {
 
       enable = mkOption {
@@ -983,6 +971,7 @@ in
     (import ../upstart-jobs/vsftpd.nix)
     (import ../upstart-jobs/cupsd.nix) # CUPS printing daemon
     (import ../upstart-jobs/udev.nix) # The udev daemon creates devices nodes and runs programs when hardware events occur.
+    (import ../upstart-jobs/samba.nix) # TODO: doesn't start here (?)
 
     # nix
     (import ../upstart-jobs/nix.nix) # nix options and daemon
diff --git a/upstart-jobs/default.nix b/upstart-jobs/default.nix
index 43230ec505a..6c6b3293f75 100644
--- a/upstart-jobs/default.nix
+++ b/upstart-jobs/default.nix
@@ -149,13 +149,6 @@ let
       inherit config pkgs;
     })
 
-  # Samba service.
-  ++ optional config.services.samba.enable
-    (import ../upstart-jobs/samba.nix {
-      inherit pkgs;
-      inherit (pkgs) glibc samba;
-    })
-
   # X Font Server
   ++ optional config.services.xfs.enable
     (import ../upstart-jobs/xfs.nix {
diff --git a/upstart-jobs/samba.nix b/upstart-jobs/samba.nix
index b1371c6f0f5..90f09a3bdd6 100644
--- a/upstart-jobs/samba.nix
+++ b/upstart-jobs/samba.nix
@@ -1,4 +1,26 @@
-{pkgs, samba, glibc}:
+{pkgs, config, ...}:
+
+###### interface
+let
+  inherit (pkgs.lib) mkOption mkIf;
+
+  options = {
+    services = {
+      samba = {
+
+        enable = mkOption {
+          default = false;
+          description = "
+            Whether to enable the samba server. (to communicate with, and provide windows shares)
+          ";
+        };
+
+      };
+    };
+  };
+in
+
+###### implementation
 
 let
   
@@ -7,52 +29,65 @@ let
  
   smbConfig = ./smb.conf ;
 
+  inherit (pkgs) samba;
+
 in
 
-{
-  name = "samba";
 
-  users = [
-    { name = user;
-      description = "Samba service user";
-      group = group;
-    }
-  ];
   
-  groups = [
-    { name = group;
-    }
+
+mkIf config.services.samba.enable {
+  require = [
+    options
   ];
-  
-  job = "
 
-description \"Samba Service\"
+  users = {
+    extraUsers = [
+      { name = user;
+        description = "Samba service user";
+        group = group;
+      }
+    ];
+    
+    extraGroups = [
+      { name = group;
+      }
+    ];
+  };
+
+  services = {
+    extraJobs = [{
+      name = "samba";
+      job = ''
 
-start on network-interfaces/started
-stop on network-interfaces/stop
+        description "Samba Service"
 
-start script
+        start on network-interfaces/started
+        stop on network-interfaces/stop
 
-  if ! test -d /home/smbd ; then 
-    mkdir -p /home/smbd
-    chown ${user} /home/smbd
-    chmod a+rwx /home/smbd
-  fi
+        start script
 
-  if ! test -d /var/samba ; then
-    mkdir -p /var/samba/locks /var/samba/cores/nmbd  /var/samba/cores/smbd /var/samba/cores/winbindd
-  fi
+          if ! test -d /home/smbd ; then 
+            mkdir -p /home/smbd
+            chown ${user} /home/smbd
+            chmod a+rwx /home/smbd
+          fi
 
-  ${samba}/sbin/nmbd -D  -s ${smbConfig} &
-  ${samba}/sbin/smbd -D  -s ${smbConfig} &
-  ${samba}/sbin/winbindd -B -s ${smbConfig} &
+          if ! test -d /var/samba ; then
+            mkdir -p /var/samba/locks /var/samba/cores/nmbd  /var/samba/cores/smbd /var/samba/cores/winbindd
+          fi
 
-  ln -fs ${smbConfig} /var/samba/config
+          ${samba}/sbin/nmbd -D  -s ${smbConfig} &
+          ${samba}/sbin/smbd -D  -s ${smbConfig} &
+          ${samba}/sbin/winbindd -B -s ${smbConfig} &
 
-end script
+          ln -fs ${smbConfig} /var/samba/config
 
-respawn ${samba}/sbin/nmbd -D -s ${smbConfig} &; ${samba}/sbin/smbd -D -s ${smbConfig} &; ${samba}/sbin/winbindd -B &
+        end script
 
-  ";
+        respawn ${samba}/sbin/nmbd -D -s ${smbConfig} &; ${samba}/sbin/smbd -D -s ${smbConfig} &; ${samba}/sbin/winbindd -B &
 
+      '';
+    }];
+  };
 }
-- 
GitLab


From 030a30b4b601ab4736715742eaa502a93d89c1fc Mon Sep 17 00:00:00 2001
From: Marc Weber <marco-oweber@gmx.de>
Date: Fri, 6 Mar 2009 12:26:55 +0000
Subject: [PATCH 1283/5331] Convert "irc-hybrid"

svn path=/nixos/branches/fix-style/; revision=14387
---
 system/options.nix           |  73 +----------------
 upstart-jobs/default.nix     |   5 --
 upstart-jobs/ircd-hybrid.nix | 154 ++++++++++++++++++++++++++++-------
 3 files changed, 124 insertions(+), 108 deletions(-)

diff --git a/system/options.nix b/system/options.nix
index 7eb77868e69..69ec7553c25 100644
--- a/system/options.nix
+++ b/system/options.nix
@@ -479,78 +479,6 @@ in
 
     };
 
-    ircdHybrid = {
-
-      enable = mkOption {
-        default = false;
-        description = "
-          Enable IRCD.
-        ";
-      };
-
-      serverName = mkOption {
-        default = "hades.arpa";
-        description = "
-          IRCD server name.
-        ";
-      };
-
-      sid = mkOption {
-        default = "0NL";
-        description = "
-          IRCD server unique ID in a net of servers.
-        ";
-      };
-
-      description = mkOption {
-        default = "Hybrid-7 IRC server.";
-        description = "
-          IRCD server description.
-        ";
-      };
-
-      rsaKey = mkOption {
-        default = null;
-        example = /root/certificates/irc.key;
-        description = "
-          IRCD server RSA key. 
-        ";
-      };
-
-      certificate = mkOption {
-        default = null;
-        example = /root/certificates/irc.pem;
-        description = "
-          IRCD server SSL certificate. There are some limitations - read manual.
-        ";
-      };
-
-      adminEmail = mkOption {
-        default = "<bit-bucket@example.com>";
-        example = "<name@domain.tld>";
-        description = "
-          IRCD server administrator e-mail. 
-        ";
-      };
-
-      extraIPs = mkOption {
-        default = [];
-        example = ["127.0.0.1"];
-        description = "
-          Extra IP's to bind.
-        ";
-      };
-
-      extraPort = mkOption {
-        default = "7117";
-        description = "
-          Extra port to avoid filtering.
-        ";
-      };
-
-    };
-
-
     xfs = {
 
       enable = mkOption {
@@ -972,6 +900,7 @@ in
     (import ../upstart-jobs/cupsd.nix) # CUPS printing daemon
     (import ../upstart-jobs/udev.nix) # The udev daemon creates devices nodes and runs programs when hardware events occur.
     (import ../upstart-jobs/samba.nix) # TODO: doesn't start here (?)
+    (import ../upstart-jobs/ircd-hybrid.nix) # TODO: doesn't compile on x86_64-linux, can't test
 
     # nix
     (import ../upstart-jobs/nix.nix) # nix options and daemon
diff --git a/upstart-jobs/default.nix b/upstart-jobs/default.nix
index 6c6b3293f75..116f6e1b79a 100644
--- a/upstart-jobs/default.nix
+++ b/upstart-jobs/default.nix
@@ -155,11 +155,6 @@ let
       inherit config pkgs;
     })
 
-  ++ optional config.services.ircdHybrid.enable
-    (import ../upstart-jobs/ircd-hybrid.nix {
-      inherit config pkgs;
-    })
-
   # Postfix mail server.
   ++ optional config.services.postfix.enable
     (import ../upstart-jobs/postfix.nix {
diff --git a/upstart-jobs/ircd-hybrid.nix b/upstart-jobs/ircd-hybrid.nix
index 4183673cef8..b78c65e96b9 100644
--- a/upstart-jobs/ircd-hybrid.nix
+++ b/upstart-jobs/ircd-hybrid.nix
@@ -1,38 +1,130 @@
-{config, pkgs}:
+{pkgs, config, ...}:
+
+###### interface
 let
-        cfg = config.services.ircdHybrid;
-        ircdService = import ../services/ircd-hybrid {
-                stdenv = pkgs.stdenv;
-                inherit (pkgs) ircdHybrid coreutils 
-                        su iproute gnugrep procps;
-                serverName = cfg.serverName;
-                sid = cfg.sid;
-                description = cfg.description;
-                rsaKey = cfg.rsaKey;
-                certificate = cfg.certificate;
-                adminEmail = cfg.adminEmail;
-                extraIPs = cfg.extraIPs;
-                extraPort = cfg.extraPort;
-                gw6cEnabled = (config.services.gw6c.enable) &&
-                        (config.services.gw6c.autorun);
+  inherit (pkgs.lib) mkOption mkIf;
+
+  options = {
+    services = {
+      ircdHybrid = {
+
+        enable = mkOption {
+          default = false;
+          description = "
+            Enable IRCD.
+          ";
+        };
+
+        serverName = mkOption {
+          default = "hades.arpa";
+          description = "
+            IRCD server name.
+          ";
+        };
+
+        sid = mkOption {
+          default = "0NL";
+          description = "
+            IRCD server unique ID in a net of servers.
+          ";
+        };
+
+        description = mkOption {
+          default = "Hybrid-7 IRC server.";
+          description = "
+            IRCD server description.
+          ";
+        };
+
+        rsaKey = mkOption {
+          default = null;
+          example = /root/certificates/irc.key;
+          description = "
+            IRCD server RSA key. 
+          ";
+        };
+
+        certificate = mkOption {
+          default = null;
+          example = /root/certificates/irc.pem;
+          description = "
+            IRCD server SSL certificate. There are some limitations - read manual.
+          ";
+        };
+
+        adminEmail = mkOption {
+          default = "<bit-bucket@example.com>";
+          example = "<name@domain.tld>";
+          description = "
+            IRCD server administrator e-mail. 
+          ";
+        };
+
+        extraIPs = mkOption {
+          default = [];
+          example = ["127.0.0.1"];
+          description = "
+            Extra IP's to bind.
+          ";
         };
 
+        extraPort = mkOption {
+          default = "7117";
+          description = "
+            Extra port to avoid filtering.
+          ";
+        };
+
+      };
+    };
+  };
+in
+
+###### implementation
+
+let
+  cfg = config.services.ircdHybrid;
+  ircdService = import ../../services/ircd-hybrid {
+    stdenv = pkgs.stdenv;
+    inherit (pkgs) ircdHybrid coreutils 
+            su iproute gnugrep procps;
+    serverName = cfg.serverName;
+    sid = cfg.sid;
+    description = cfg.description;
+    rsaKey = cfg.rsaKey;
+    certificate = cfg.certificate;
+    adminEmail = cfg.adminEmail;
+    extraIPs = cfg.extraIPs;
+    extraPort = cfg.extraPort;
+    gw6cEnabled = (config.services.gw6c.enable) &&
+            (config.services.gw6c.autorun);
+  };
+
   startingDependency = if config.services.gw6c.enable then "gw6c" else "network-interfaces";
 
 in
-{
-        name = "ircd-hybrid";
-        users = [ {
-                        name = "ircd"; 
-                        description = "IRCD owner.";
-                } ];
-        groups = [{name = "ircd";}];
-        job = "
-description = \"IRCD Hybrid server.\"
-
-start on ${startingDependency}/started
-stop on ${startingDependency}/stop
-
-respawn ${ircdService}/bin/control start
-";
+
+mkIf config.services.ircdHybrid.enable {
+  require = [
+    options
+  ];
+
+  services = {
+    extraJobs = [{
+      name = "ircd-hybrid";
+      users = [ {
+                      name = "ircd"; 
+                      description = "IRCD owner.";
+              } ];
+      groups = [{name = "ircd";}];
+      job = ''
+        description = "IRCD Hybrid server."
+
+        start on ${startingDependency}/started
+        stop on ${startingDependency}/stop
+
+        respawn ${ircdService}/bin/control start
+      '';
+    }];
+  };
 }
-- 
GitLab


From aa786904653d9bcad35fcc67c86dc9ad34ca3bbc Mon Sep 17 00:00:00 2001
From: Marc Weber <marco-oweber@gmx.de>
Date: Fri, 6 Mar 2009 12:26:57 +0000
Subject: [PATCH 1284/5331] Convert "xfs", problems when enabling warning!

svn path=/nixos/branches/fix-style/; revision=14388
---
 system/options.nix       | 13 +-------
 upstart-jobs/default.nix |  6 ----
 upstart-jobs/xfs.nix     | 66 ++++++++++++++++++++++++++++++----------
 3 files changed, 51 insertions(+), 34 deletions(-)

diff --git a/system/options.nix b/system/options.nix
index 69ec7553c25..5d7c546be27 100644
--- a/system/options.nix
+++ b/system/options.nix
@@ -479,18 +479,6 @@ in
 
     };
 
-    xfs = {
-
-      enable = mkOption {
-        default = false;
-        description = "
-          Whether to enable the X Font Server.
-        ";
-      };
-
-    };
-
-
     mysql = {
       enable = mkOption {
         default = false;
@@ -901,6 +889,7 @@ in
     (import ../upstart-jobs/udev.nix) # The udev daemon creates devices nodes and runs programs when hardware events occur.
     (import ../upstart-jobs/samba.nix) # TODO: doesn't start here (?)
     (import ../upstart-jobs/ircd-hybrid.nix) # TODO: doesn't compile on x86_64-linux, can't test
+    (import ../upstart-jobs/xfs.nix)
 
     # nix
     (import ../upstart-jobs/nix.nix) # nix options and daemon
diff --git a/upstart-jobs/default.nix b/upstart-jobs/default.nix
index 116f6e1b79a..9030af83e4b 100644
--- a/upstart-jobs/default.nix
+++ b/upstart-jobs/default.nix
@@ -149,12 +149,6 @@ let
       inherit config pkgs;
     })
 
-  # X Font Server
-  ++ optional config.services.xfs.enable
-    (import ../upstart-jobs/xfs.nix {
-      inherit config pkgs;
-    })
-
   # Postfix mail server.
   ++ optional config.services.postfix.enable
     (import ../upstart-jobs/postfix.nix {
diff --git a/upstart-jobs/xfs.nix b/upstart-jobs/xfs.nix
index 1b36002a348..c7b9d85551d 100644
--- a/upstart-jobs/xfs.nix
+++ b/upstart-jobs/xfs.nix
@@ -1,20 +1,54 @@
-{
-        pkgs, config
-}:
-if ! config.fonts.enableFontDir then abort "Please enable fontDir (fonts.enableFontDir) to use xfs." else
+{pkgs, config, ...}:
+
+###### interface
+let
+  inherit (pkgs.lib) mkOption mkIf;
+
+  options = {
+    services = {
+      xfs = {
+
+        enable = mkOption {
+          default = false;
+          description = "
+            Whether to enable the X Font Server.
+          ";
+        };
+
+      };
+    };
+  };
+in
+
+###### implementation
+
+
+# FIXME: enable this warning again. It's causing "infinite recursion encountered, why?"
+# if ! config.fonts.enableFontDir then throw "Please enable fontDir (fonts.enableFontDir) to use xfs." else
+
 let
-        configFile = ./xfs.conf;
+  configFile = ./xfs.conf;
   startingDependency = if config.services.gw6c.enable && config.services.gw6c.autorun then "gw6c" else "network-interfaces";
 in
-rec {
-        name = "xfs";
-        groups = [];
-        users = [];
-        job = "
-                description \"X Font Server\"
-                start on ${startingDependency}/started
-                stop on shutdown
-
-                respawn ${pkgs.xorg.xfs}/bin/xfs -config ${configFile}
-        ";
+
+mkIf config.services.xfs.enable {
+  require = [
+    options
+  ];
+
+  services = {
+
+    extraJobs = [ (rec {
+      name = "xfs";
+      groups = [];
+      users = [];
+      job = ''
+        description "X Font Server"
+        start on ${startingDependency}/started
+        stop on shutdown
+
+        respawn ${pkgs.xorg.xfs}/bin/xfs -config ${configFile}
+      '';
+    })];
+  };
 }
-- 
GitLab


From 72303e9b6c59b3a737cd9776d451be3a314567bc Mon Sep 17 00:00:00 2001
From: Marc Weber <marco-oweber@gmx.de>
Date: Fri, 6 Mar 2009 12:27:00 +0000
Subject: [PATCH 1285/5331] Convert "mysql"

svn path=/nixos/branches/fix-style/; revision=14389
---
 system/options.nix       |  36 +-----------
 upstart-jobs/default.nix |   6 --
 upstart-jobs/mysql.nix   | 115 +++++++++++++++++++++++++++++----------
 3 files changed, 87 insertions(+), 70 deletions(-)

diff --git a/system/options.nix b/system/options.nix
index 5d7c546be27..5644247d3fa 100644
--- a/system/options.nix
+++ b/system/options.nix
@@ -479,41 +479,6 @@ in
 
     };
 
-    mysql = {
-      enable = mkOption {
-        default = false;
-        description = "
-          Whether to enable the MySQL server.
-        ";
-      };
-      
-      port = mkOption {
-        default = "3306";
-        description = "Port of MySQL"; 
-      };
-      
-      user = mkOption {
-        default = "mysql";
-        description = "User account under which MySQL runs";
-      };
-      
-      dataDir = mkOption {
-        default = "/var/mysql";
-        description = "Location where MySQL stores its table files";
-      };
-      
-      logError = mkOption {
-        default = "/var/log/mysql_err.log";
-        description = "Location of the MySQL error logfile";
-      };
-      
-      pidDir = mkOption {
-        default = "/var/run/mysql";
-        description = "Location of the file which stores the PID of the MySQL server";
-      };
-    };
-
-    
     postgresql = {
       enable = mkOption {
         default = false;
@@ -890,6 +855,7 @@ in
     (import ../upstart-jobs/samba.nix) # TODO: doesn't start here (?)
     (import ../upstart-jobs/ircd-hybrid.nix) # TODO: doesn't compile on x86_64-linux, can't test
     (import ../upstart-jobs/xfs.nix)
+    (import ../upstart-jobs/mysql.nix)
 
     # nix
     (import ../upstart-jobs/nix.nix) # nix options and daemon
diff --git a/upstart-jobs/default.nix b/upstart-jobs/default.nix
index 9030af83e4b..173bb1d4606 100644
--- a/upstart-jobs/default.nix
+++ b/upstart-jobs/default.nix
@@ -131,12 +131,6 @@ let
       inherit config;
     })
 
-  # MySQL server
-  ++ optional config.services.mysql.enable
-    (import ../upstart-jobs/mysql.nix {
-      inherit config pkgs;
-    })
-
   # Postgres SQL server
   ++ optional config.services.postgresql.enable
     (import ../upstart-jobs/postgresql.nix {
diff --git a/upstart-jobs/mysql.nix b/upstart-jobs/mysql.nix
index 6756891321b..2ecaa6df4ca 100644
--- a/upstart-jobs/mysql.nix
+++ b/upstart-jobs/mysql.nix
@@ -1,4 +1,49 @@
-{pkgs, config}:
+{pkgs, config, ...}:
+
+###### interface
+let
+  inherit (pkgs.lib) mkOption mkIf;
+
+  options = {
+    services = {
+      mysql = {
+        enable = mkOption {
+          default = false;
+          description = "
+            Whether to enable the MySQL server.
+          ";
+        };
+        
+        port = mkOption {
+          default = "3306";
+          description = "Port of MySQL"; 
+        };
+        
+        user = mkOption {
+          default = "mysql";
+          description = "User account under which MySQL runs";
+        };
+        
+        dataDir = mkOption {
+          default = "/var/mysql";
+          description = "Location where MySQL stores its table files";
+        };
+        
+        logError = mkOption {
+          default = "/var/log/mysql_err.log";
+          description = "Location of the MySQL error logfile";
+        };
+        
+        pidDir = mkOption {
+          default = "/var/run/mysql";
+          description = "Location of the file which stores the PID of the MySQL server";
+        };
+      };
+    };
+  };
+in
+
+###### implementation
 
 let
 
@@ -14,39 +59,51 @@ let
 
 in
 
-{
-  name = "mysql";
-  
-  users = [
-    { name = "mysql";
-      description = "MySQL server user";
-    }
+
+mkIf config.services.mysql.enable {
+  require = [
+    options
   ];
 
-  extraPath = [mysql];
-  
-  job = ''
-    description "MySQL server"
+  users = {
+    extraUsers = [
+      { name = "mysql";
+        description = "MySQL server user";
+      }
+    ];
+  };
+
+  services = {
+    extraJobs = [{
+      name = "mysql";
+      
+
+      extraPath = [mysql];
+      
+      job = ''
+        description "MySQL server"
 
-    stop on shutdown
+        stop on shutdown
 
-    start script
-        if ! test -e ${cfg.dataDir}; then
-            mkdir -m 0700 -p ${cfg.dataDir}
-            chown -R ${cfg.user} ${cfg.dataDir}
-            ${mysql}/bin/mysql_install_db ${mysqldOptions}
-        fi
+        start script
+            if ! test -e ${cfg.dataDir}; then
+                mkdir -m 0700 -p ${cfg.dataDir}
+                chown -R ${cfg.user} ${cfg.dataDir}
+                ${mysql}/bin/mysql_install_db ${mysqldOptions}
+            fi
 
-        mkdir -m 0700 -p ${cfg.pidDir}
-        chown -R ${cfg.user} ${cfg.pidDir}
-    end script
+            mkdir -m 0700 -p ${cfg.pidDir}
+            chown -R ${cfg.user} ${cfg.pidDir}
+        end script
 
-    respawn ${mysql}/bin/mysqld ${mysqldOptions}
+        respawn ${mysql}/bin/mysqld ${mysqldOptions}
 
-    stop script
-        pid=$(cat ${pidFile})
-        kill "$pid"
-        ${mysql}/bin/mysql_waitpid "$pid" 1000
-    end script
-  '';
+        stop script
+            pid=$(cat ${pidFile})
+            kill "$pid"
+            ${mysql}/bin/mysql_waitpid "$pid" 1000
+        end script
+      '';
+    }];
+  };
 }
-- 
GitLab


From 8e840a7aa4cd99c1d1b100c7a1a8e906f957e80e Mon Sep 17 00:00:00 2001
From: Marc Weber <marco-oweber@gmx.de>
Date: Fri, 6 Mar 2009 12:27:02 +0000
Subject: [PATCH 1286/5331] Convert "postgresql"

svn path=/nixos/branches/fix-style/; revision=14390
---
 system/options.nix          |  59 +--------------
 upstart-jobs/default.nix    |   6 --
 upstart-jobs/postgresql.nix | 139 ++++++++++++++++++++++++++++--------
 3 files changed, 110 insertions(+), 94 deletions(-)

diff --git a/system/options.nix b/system/options.nix
index 5644247d3fa..6afc6ee97fa 100644
--- a/system/options.nix
+++ b/system/options.nix
@@ -479,64 +479,6 @@ in
 
     };
 
-    postgresql = {
-      enable = mkOption {
-        default = false;
-        description = "
-          Whether to run PostgreSQL.
-        ";
-      };
-      port = mkOption {
-        default = "5432";
-        description = "
-          Port for PostgreSQL.
-        ";
-      };
-      logDir = mkOption {
-        default = "/var/log/postgresql";
-        description = "
-          Log directory for PostgreSQL.
-        ";
-      };
-      dataDir = mkOption {
-        default = "/var/db/postgresql";
-        description = "
-          Data directory for PostgreSQL.
-        ";
-      };
-      subServices = mkOption {
-        default = [];
-        description = "
-          Subservices list. As it is already implememnted, 
-          here is an interface...
-        ";
-      };
-      authentication = mkOption {
-        default = ''
-          # Generated file; do not edit!
-          local all all              ident sameuser
-          host  all all 127.0.0.1/32 md5
-          host  all all ::1/128      md5
-        '';
-        description = "
-          Hosts (except localhost), who you allow to connect.
-        ";
-      };
-      allowedHosts = mkOption {
-        default = [];
-        description = "
-          Hosts (except localhost), who you allow to connect.
-        ";
-      };
-      authMethod = mkOption {
-        default = " ident sameuser ";
-        description = "
-          How to authorize users. 
-          Note: ident needs absolute trust to all allowed client hosts.";
-      };
-    };
-
-    
     openfire = {
       enable = mkOption {
         default = false;
@@ -856,6 +798,7 @@ in
     (import ../upstart-jobs/ircd-hybrid.nix) # TODO: doesn't compile on x86_64-linux, can't test
     (import ../upstart-jobs/xfs.nix)
     (import ../upstart-jobs/mysql.nix)
+    (import ../upstart-jobs/postgresql.nix)
 
     # nix
     (import ../upstart-jobs/nix.nix) # nix options and daemon
diff --git a/upstart-jobs/default.nix b/upstart-jobs/default.nix
index 173bb1d4606..1075bfd6446 100644
--- a/upstart-jobs/default.nix
+++ b/upstart-jobs/default.nix
@@ -131,12 +131,6 @@ let
       inherit config;
     })
 
-  # Postgres SQL server
-  ++ optional config.services.postgresql.enable
-    (import ../upstart-jobs/postgresql.nix {
-      inherit config pkgs;
-    })
-
   # OpenFire XMPP server
   ++ optional config.services.openfire.enable
     (import ../upstart-jobs/openfire.nix {
diff --git a/upstart-jobs/postgresql.nix b/upstart-jobs/postgresql.nix
index a37780678fc..77cf1a582e9 100644
--- a/upstart-jobs/postgresql.nix
+++ b/upstart-jobs/postgresql.nix
@@ -1,4 +1,72 @@
-{pkgs, config}:
+{pkgs, config, ...}:
+
+###### interface
+let
+  inherit (pkgs.lib) mkOption mkIf;
+
+  options = {
+    services = {
+      postgresql = {
+        enable = mkOption {
+          default = false;
+          description = "
+            Whether to run PostgreSQL.
+          ";
+        };
+        port = mkOption {
+          default = "5432";
+          description = "
+            Port for PostgreSQL.
+          ";
+        };
+        logDir = mkOption {
+          default = "/var/log/postgresql";
+          description = "
+            Log directory for PostgreSQL.
+          ";
+        };
+        dataDir = mkOption {
+          default = "/var/db/postgresql";
+          description = "
+            Data directory for PostgreSQL.
+          ";
+        };
+        subServices = mkOption {
+          default = [];
+          description = "
+            Subservices list. As it is already implememnted, 
+            here is an interface...
+          ";
+        };
+        authentication = mkOption {
+          default = ''
+            # Generated file; do not edit!
+            local all all              ident sameuser
+            host  all all 127.0.0.1/32 md5
+            host  all all ::1/128      md5
+          '';
+          description = "
+            Hosts (except localhost), who you allow to connect.
+          ";
+        };
+        allowedHosts = mkOption {
+          default = [];
+          description = "
+            Hosts (except localhost), who you allow to connect.
+          ";
+        };
+        authMethod = mkOption {
+          default = " ident sameuser ";
+          description = "
+            How to authorize users. 
+            Note: ident needs absolute trust to all allowed client hosts.";
+        };
+      };
+    };
+  };
+in
+
+###### implementation
 
 let
 
@@ -13,36 +81,47 @@ let
 
 in
 
-{
-  name = "postgresql";
-
-  users = [
-    { name = "postgres";
-      description = "PostgreSQL server user";
-    }
+mkIf config.services.postgresql.enable {
+  require = [
+    options
   ];
 
-  groups = [
-    { name = "postgres"; }
-  ];
 
-  extraPath = [postgresql];
-
-  job = ''
-    description "PostgreSQL server"
-
-    start on ${startDependency}/started
-    stop on shutdown
-    
-    start script
-        if ! test -e ${cfg.dataDir}; then
-            mkdir -m 0700 -p ${cfg.dataDir}
-            chown -R postgres ${cfg.dataDir}
-            ${run} -c '${postgresql}/bin/initdb -D ${cfg.dataDir} -U root'
-        fi
-        cp -f ${pkgs.writeText "pg_hba.conf" cfg.authentication} ${cfg.dataDir}/pg_hba.conf
-    end script
-
-    respawn ${run} -c '${postgresql}/bin/postgres -D ${cfg.dataDir}'
-  '';
+  users = {
+    extraUsers = [
+      { name = "postgres";
+        description = "PostgreSQL server user";
+      }
+    ];
+
+    extraGroups = [
+      { name = "postgres"; }
+    ];
+  };
+
+  services = {
+    extraJobs = [{
+      name = "postgresql";
+
+      extraPath = [postgresql];
+
+      job = ''
+        description "PostgreSQL server"
+
+        start on ${startDependency}/started
+        stop on shutdown
+        
+        start script
+            if ! test -e ${cfg.dataDir}; then
+                mkdir -m 0700 -p ${cfg.dataDir}
+                chown -R postgres ${cfg.dataDir}
+                ${run} -c '${postgresql}/bin/initdb -D ${cfg.dataDir} -U root'
+            fi
+            cp -f ${pkgs.writeText "pg_hba.conf" cfg.authentication} ${cfg.dataDir}/pg_hba.conf
+        end script
+
+        respawn ${run} -c '${postgresql}/bin/postgres -D ${cfg.dataDir}'
+      '';
+      }];
+  };
 }
-- 
GitLab


From e5fd3f271e83c1ab35a57310299ddb410b1e22c8 Mon Sep 17 00:00:00 2001
From: Marc Weber <marco-oweber@gmx.de>
Date: Fri, 6 Mar 2009 12:27:05 +0000
Subject: [PATCH 1287/5331] Convert "openfire" (problem with assertion)

svn path=/nixos/branches/fix-style/; revision=14391
---
 system/options.nix        | 17 +-------
 upstart-jobs/default.nix  |  6 ---
 upstart-jobs/openfire.nix | 86 ++++++++++++++++++++++++++++-----------
 3 files changed, 63 insertions(+), 46 deletions(-)

diff --git a/system/options.nix b/system/options.nix
index 6afc6ee97fa..da404602880 100644
--- a/system/options.nix
+++ b/system/options.nix
@@ -479,22 +479,6 @@ in
 
     };
 
-    openfire = {
-      enable = mkOption {
-        default = false;
-        description = "
-          Whether to enable OpenFire XMPP server.
-        ";
-      };
-      usePostgreSQL = mkOption {
-        default = true;
-        description = "
-          Whether you use PostgreSQL service for your storage back-end.
-        ";
-      };
-    };
-
-    
     postfix = {
       enable = mkOption {
         default = false;
@@ -799,6 +783,7 @@ in
     (import ../upstart-jobs/xfs.nix)
     (import ../upstart-jobs/mysql.nix)
     (import ../upstart-jobs/postgresql.nix)
+    (import ../upstart-jobs/openfire.nix)
 
     # nix
     (import ../upstart-jobs/nix.nix) # nix options and daemon
diff --git a/upstart-jobs/default.nix b/upstart-jobs/default.nix
index 1075bfd6446..f658e88b90a 100644
--- a/upstart-jobs/default.nix
+++ b/upstart-jobs/default.nix
@@ -131,12 +131,6 @@ let
       inherit config;
     })
 
-  # OpenFire XMPP server
-  ++ optional config.services.openfire.enable
-    (import ../upstart-jobs/openfire.nix {
-      inherit config pkgs;
-    })
-
   # Postfix mail server.
   ++ optional config.services.postfix.enable
     (import ../upstart-jobs/postfix.nix {
diff --git a/upstart-jobs/openfire.nix b/upstart-jobs/openfire.nix
index 45338c793e7..365d34a5b26 100644
--- a/upstart-jobs/openfire.nix
+++ b/upstart-jobs/openfire.nix
@@ -1,7 +1,36 @@
-{pkgs, config}:
+{pkgs, config, ...}:
 
-assert config.services.openfire.usePostgreSQL -> config.services.postgresql.enable;
+###### interface
 let
+  inherit (pkgs.lib) mkOption mkIf;
+
+  options = {
+    services = {
+      openfire = {
+        enable = mkOption {
+          default = false;
+          description = "
+            Whether to enable OpenFire XMPP server.
+          ";
+        };
+        usePostgreSQL = mkOption {
+          default = true;
+          description = "
+            Whether you use PostgreSQL service for your storage back-end.
+          ";
+        };
+      };
+    };
+  };
+in
+
+###### implementation
+
+# FIXME (see xfs)
+# if (!(config.services.openfire.usePostgreSQL -> config.services.postgresql.enable)) then throw "openfire assertion failed" else
+let
+  inherit (pkgs) jre openfire coreutils which gnugrep gawk gnused;
+    
   startDependency = if config.services.openfire.usePostgreSQL then 
     "postgresql"
   else
@@ -10,26 +39,35 @@ let
     else 
       "network-interfaces";
 in
-with pkgs;
-{
-  name = "openfire";
-  job = ''
-    description "OpenFire XMPP server"
-
-    start on ${startDependency}/started
-    stop on shutdown
-
-    script 
-      export PATH=${jre}/bin:${openfire}/bin:${coreutils}/bin:${which}/bin:${gnugrep}/bin:${gawk}/bin:${gnused}/bin
-      export HOME=/tmp
-      mkdir /var/log/openfire || true 
-      mkdir /etc/openfire || true 
-      for i in ${openfire}/conf.inst/*; do
-          if ! test -f /etc/openfire/$(basename $i); then
-              cp $i /etc/openfire/
-          fi
-      done
-      openfire start
-    end script
-  '';
+
+mkIf config.services.openfire.enable {
+  require = [
+    options
+  ];
+
+
+  services = {
+      extraJobs = [{
+        name = "openfire";
+        job = ''
+          description "OpenFire XMPP server"
+
+          start on ${startDependency}/started
+          stop on shutdown
+
+          script 
+            export PATH=${jre}/bin:${openfire}/bin:${coreutils}/bin:${which}/bin:${gnugrep}/bin:${gawk}/bin:${gnused}/bin
+            export HOME=/tmp
+            mkdir /var/log/openfire || true 
+            mkdir /etc/openfire || true 
+            for i in ${openfire}/conf.inst/*; do
+                if ! test -f /etc/openfire/$(basename $i); then
+                    cp $i /etc/openfire/
+                fi
+            done
+            openfire start
+          end script
+        '';
+    }];
+  };
 }
-- 
GitLab


From 32ec389b157bc40aafe2cc3ca89cdd5a686e47ae Mon Sep 17 00:00:00 2001
From: Marc Weber <marco-oweber@gmx.de>
Date: Fri, 6 Mar 2009 12:27:07 +0000
Subject: [PATCH 1288/5331] Convert "postfix"

svn path=/nixos/branches/fix-style/; revision=14392
---
 system/options.nix       | 139 +-------------------
 upstart-jobs/default.nix |   6 -
 upstart-jobs/postfix.nix | 274 +++++++++++++++++++++++++++++++--------
 3 files changed, 220 insertions(+), 199 deletions(-)

diff --git a/system/options.nix b/system/options.nix
index da404602880..d2e1197330a 100644
--- a/system/options.nix
+++ b/system/options.nix
@@ -479,144 +479,6 @@ in
 
     };
 
-    postfix = {
-      enable = mkOption {
-        default = false;
-        description ="
-          Whether to run the Postfix mail server.
-        ";
-      };
-      user = mkOption {
-        default = "postfix";
-        description = "
-          How to call postfix user (must be used only for postfix).
-        ";
-      };
-      group = mkOption {
-        default = "postfix";
-        description = "
-          How to call postfix group (must be used only for postfix).
-        ";
-      };
-      setgidGroup = mkOption {
-        default = "postdrop";
-        description = "
-          How to call postfix setgid group (for postdrop). Should 
-          be uniquely used group.
-        ";
-      };
-      networks = mkOption {
-        default = null;
-        example = ["192.168.0.1/24"];
-        description = "
-          Net masks for trusted - allowed to relay mail to third parties - 
-          hosts. Leave empty to use mynetworks_style configuration or use 
-          default (localhost-only).
-        ";
-      };
-      networksStyle = mkOption {
-        default = "";
-        description = "
-          Name of standard way of trusted network specification to use,
-          leave blank if you specify it explicitly or if you want to use 
-          default (localhost-only).
-        ";
-      };
-      hostname = mkOption {
-        default = "";
-        description ="
-          Hostname to use. Leave blank to use just the hostname of machine.
-          It should be FQDN.
-        ";
-      };
-      domain = mkOption {
-        default = "";
-        description ="
-          Domain to use. Leave blank to use hostname minus first component.
-        ";
-      };
-      origin = mkOption {
-        default = "";
-        description ="
-          Origin to use in outgoing e-mail. Leave blank to use hostname.
-        ";
-      };
-      destination = mkOption {
-        default = null;
-        example = ["localhost"];
-        description = "
-          Full (!) list of domains we deliver locally. Leave blank for 
-          acceptable Postfix default.
-        ";
-      };
-      relayDomains = mkOption {
-        default = null;
-        example = ["localdomain"];
-        description = "
-          List of domains we agree to relay to. Default is the same as 
-          destination.
-        ";
-      };
-      relayHost = mkOption {
-        default = "";
-        description = "
-          Mail relay for outbound mail.
-        ";
-      };
-      lookupMX = mkOption {
-        default = false;
-        description = "
-          Whether relay specified is just domain whose MX must be used.
-        ";
-      };
-      postmasterAlias = mkOption {
-        default = "root";
-        description = "
-          Who should receive postmaster e-mail.
-        ";
-      };
-      rootAlias = mkOption {
-        default = "";
-        description = "
-          Who should receive root e-mail. Blank for no redirection.
-        ";
-      };
-      extraAliases = mkOption {
-        default = "";
-        description = "
-          Additional entries to put verbatim into aliases file.
-        ";
-      };
-
-      sslCert = mkOption {
-        default = "";
-        description = "
-          SSL certificate to use.
-        ";
-      };
-      sslCACert = mkOption {
-        default = "";
-        description = "
-          SSL certificate of CA.
-        ";
-      };
-      sslKey = mkOption {
-        default = "";
-        description ="
-          SSL key to use.
-        ";
-      };
-
-      recipientDelimiter = mkOption {
-        default = "";
-        example = "+";
-        description = "
-          Delimiter for address extension: so mail to user+test can be handled by ~user/.forward+test
-        ";
-      };
-
-    };
-
     dovecot = {
       enable = mkOption {
         default = false;
@@ -784,6 +646,7 @@ in
     (import ../upstart-jobs/mysql.nix)
     (import ../upstart-jobs/postgresql.nix)
     (import ../upstart-jobs/openfire.nix)
+    (import ../upstart-jobs/postfix.nix)
 
     # nix
     (import ../upstart-jobs/nix.nix) # nix options and daemon
diff --git a/upstart-jobs/default.nix b/upstart-jobs/default.nix
index f658e88b90a..ff8b8a9e9ba 100644
--- a/upstart-jobs/default.nix
+++ b/upstart-jobs/default.nix
@@ -131,12 +131,6 @@ let
       inherit config;
     })
 
-  # Postfix mail server.
-  ++ optional config.services.postfix.enable
-    (import ../upstart-jobs/postfix.nix {
-      inherit config pkgs;
-    })
-
   # Dovecot POP3/IMAP server.
   ++ optional config.services.dovecot.enable
     (import ../upstart-jobs/dovecot.nix {
diff --git a/upstart-jobs/postfix.nix b/upstart-jobs/postfix.nix
index e72f12ea842..8db43693b94 100644
--- a/upstart-jobs/postfix.nix
+++ b/upstart-jobs/postfix.nix
@@ -1,4 +1,154 @@
-{config, pkgs} : 
+{pkgs, config, ...}:
+
+###### interface
+let
+  inherit (pkgs.lib) mkOption mkIf;
+
+  options = {
+    services = {
+      postfix = {
+        enable = mkOption {
+          default = false;
+          description ="
+            Whether to run the Postfix mail server.
+          ";
+        };
+        user = mkOption {
+          default = "postfix";
+          description = "
+            How to call postfix user (must be used only for postfix).
+          ";
+        };
+        group = mkOption {
+          default = "postfix";
+          description = "
+            How to call postfix group (must be used only for postfix).
+          ";
+        };
+        setgidGroup = mkOption {
+          default = "postdrop";
+          description = "
+            How to call postfix setgid group (for postdrop). Should 
+            be uniquely used group.
+          ";
+        };
+        networks = mkOption {
+          default = null;
+          example = ["192.168.0.1/24"];
+          description = "
+            Net masks for trusted - allowed to relay mail to third parties - 
+            hosts. Leave empty to use mynetworks_style configuration or use 
+            default (localhost-only).
+          ";
+        };
+        networksStyle = mkOption {
+          default = "";
+          description = "
+            Name of standard way of trusted network specification to use,
+            leave blank if you specify it explicitly or if you want to use 
+            default (localhost-only).
+          ";
+        };
+        hostname = mkOption {
+          default = "";
+          description ="
+            Hostname to use. Leave blank to use just the hostname of machine.
+            It should be FQDN.
+          ";
+        };
+        domain = mkOption {
+          default = "";
+          description ="
+            Domain to use. Leave blank to use hostname minus first component.
+          ";
+        };
+        origin = mkOption {
+          default = "";
+          description ="
+            Origin to use in outgoing e-mail. Leave blank to use hostname.
+          ";
+        };
+        destination = mkOption {
+          default = null;
+          example = ["localhost"];
+          description = "
+            Full (!) list of domains we deliver locally. Leave blank for 
+            acceptable Postfix default.
+          ";
+        };
+        relayDomains = mkOption {
+          default = null;
+          example = ["localdomain"];
+          description = "
+            List of domains we agree to relay to. Default is the same as 
+            destination.
+          ";
+        };
+        relayHost = mkOption {
+          default = "";
+          description = "
+            Mail relay for outbound mail.
+          ";
+        };
+        lookupMX = mkOption {
+          default = false;
+          description = "
+            Whether relay specified is just domain whose MX must be used.
+          ";
+        };
+        postmasterAlias = mkOption {
+          default = "root";
+          description = "
+            Who should receive postmaster e-mail.
+          ";
+        };
+        rootAlias = mkOption {
+          default = "";
+          description = "
+            Who should receive root e-mail. Blank for no redirection.
+          ";
+        };
+        extraAliases = mkOption {
+          default = "";
+          description = "
+            Additional entries to put verbatim into aliases file.
+          ";
+        };
+
+        sslCert = mkOption {
+          default = "";
+          description = "
+            SSL certificate to use.
+          ";
+        };
+        sslCACert = mkOption {
+          default = "";
+          description = "
+            SSL certificate of CA.
+          ";
+        };
+        sslKey = mkOption {
+          default = "";
+          description ="
+            SSL key to use.
+          ";
+        };
+
+        recipientDelimiter = mkOption {
+          default = "";
+          example = "+";
+          description = "
+            Delimiter for address extension: so mail to user+test can be handled by ~user/.forward+test
+          ";
+        };
+
+      };
+    };
+  };
+in
+
+###### implementation
+
 let
   startingDependency = if config.services.gw6c.enable then "gw6c" else "network-interfaces";
 
@@ -103,62 +253,76 @@ let
   mainCfFile = pkgs.writeText "postfix-main.cf" mainCf;
  
 in
-{
-  name = "postfix";
-  users = [
-    { name = user;
-      description = "Postfix mail server user";
-      uid = idList.uids.postfix;
-      group = group;
-    }
-  ];
 
-  groups = [
-    { name = group; 
-      gid = idList.gids.postfix;
-    }
-    { name = setgidGroup; 
-      gid = idList.gids.postdrop;
-    }
+mkIf config.services.postfix.enable {
+  require = [
+    options
   ];
 
-
-  # I copy _lots_ of shipped configuration filed 
-  # that can be left as is. I am afraid the exact
-  # will list slightly change in next Postfix 
-  # release, so listing them all one-by-one in an 
-  # accurate way is unlikely to be better.
-  job = ''
-    description "Postfix mail server job"
-
-    start on ${startingDependency}/started
-    stop on never
-
-    script 
-        if ! [ -d /var/spool/postfix ]; then
-          ${pkgs.coreutils}/bin/mkdir -p /var/spool/mail /var/postfix/conf /var/postfix/queue
-        fi
-          
-        ${pkgs.coreutils}/bin/chown -R ${user}.${group} /var/postfix 
-        ${pkgs.coreutils}/bin/chown -R ${user}.${setgidGroup} /var/postfix/queue 
-        ${pkgs.coreutils}/bin/chmod -R ug+rwX /var/postfix/queue 
-        ${pkgs.coreutils}/bin/chown root.root /var/spool/mail
-        ${pkgs.coreutils}/bin/chmod a+rwxt /var/spool/mail
-        
-        ln -sf ${pkgs.postfix}/share/postfix/conf/* /var/postfix/conf
-
-        ln -sf ${aliasesFile} /var/postfix/conf/aliases
-        ln -sf ${mainCfFile} /var/postfix/conf/main.cf
-
-        ${pkgs.postfix}/sbin/postalias -c /var/postfix/conf /var/postfix/conf/aliases
-        
-        ${pkgs.postfix}/sbin/postfix -c /var/postfix/conf start 
-    end script
-  '';
-
-  extraEtc = [
-    { source = "/var/postfix/conf";
+  environment = {
+    etc = [{
+      source = "/var/postfix/conf";
       target = "postfix";
-    }
-  ];
+    }];
+  };
+
+  users = {
+    extraUsers = [
+      { name = user;
+        description = "Postfix mail server user";
+        uid = idList.uids.postfix;
+        group = group;
+      }
+    ];
+
+    extraGroups = [
+      { name = group; 
+        gid = idList.gids.postfix;
+      }
+      { name = setgidGroup; 
+        gid = idList.gids.postdrop;
+      }
+    ];
+  };
+
+  services = {
+    extraJobs = [{
+      name = "postfix";
+
+
+      # I copy _lots_ of shipped configuration filed 
+      # that can be left as is. I am afraid the exact
+      # will list slightly change in next Postfix 
+      # release, so listing them all one-by-one in an 
+      # accurate way is unlikely to be better.
+      job = ''
+        description "Postfix mail server job"
+
+        start on ${startingDependency}/started
+        stop on never
+
+        script 
+            if ! [ -d /var/spool/postfix ]; then
+              ${pkgs.coreutils}/bin/mkdir -p /var/spool/mail /var/postfix/conf /var/postfix/queue
+            fi
+              
+            ${pkgs.coreutils}/bin/chown -R ${user}.${group} /var/postfix 
+            ${pkgs.coreutils}/bin/chown -R ${user}.${setgidGroup} /var/postfix/queue 
+            ${pkgs.coreutils}/bin/chmod -R ug+rwX /var/postfix/queue 
+            ${pkgs.coreutils}/bin/chown root.root /var/spool/mail
+            ${pkgs.coreutils}/bin/chmod a+rwxt /var/spool/mail
+            
+            ln -sf ${pkgs.postfix}/share/postfix/conf/* /var/postfix/conf
+
+            ln -sf ${aliasesFile} /var/postfix/conf/aliases
+            ln -sf ${mainCfFile} /var/postfix/conf/main.cf
+
+            ${pkgs.postfix}/sbin/postalias -c /var/postfix/conf /var/postfix/conf/aliases
+            
+            ${pkgs.postfix}/sbin/postfix -c /var/postfix/conf start 
+        end script
+      '';
+
+    }];
+  };
 }
-- 
GitLab


From a0b0bba7626a28ebc23cd3158aff65d19b37c096 Mon Sep 17 00:00:00 2001
From: Marc Weber <marco-oweber@gmx.de>
Date: Fri, 6 Mar 2009 12:27:10 +0000
Subject: [PATCH 1289/5331] Convert "dovecot"

svn path=/nixos/branches/fix-style/; revision=14393
---
 system/options.nix       |  30 +---------
 upstart-jobs/default.nix |   6 --
 upstart-jobs/dovecot.nix | 120 ++++++++++++++++++++++++++++-----------
 3 files changed, 89 insertions(+), 67 deletions(-)

diff --git a/system/options.nix b/system/options.nix
index d2e1197330a..99904c7b7a0 100644
--- a/system/options.nix
+++ b/system/options.nix
@@ -479,35 +479,6 @@ in
 
     };
 
-    dovecot = {
-      enable = mkOption {
-        default = false;
-        description = "Whether to enable dovecot POP3/IMAP server.";
-      };
-
-      user = mkOption {
-        default = "dovecot";
-        description = "dovecot user name";
-      };
-      group = mkOption {
-        default = "dovecot";
-        description = "dovecot group name";
-      };
-
-      sslServerCert = mkOption {
-        default = "";
-        description = "Server certificate";
-      };
-      sslCACert = mkOption {
-        default = "";
-        description = "CA certificate used by server certificate";
-      };
-      sslServerKey = mkOption {
-        default = "";
-        description = "Server key";
-      };
-    };
-
     bind = {
       enable = mkOption {
         default = false;
@@ -647,6 +618,7 @@ in
     (import ../upstart-jobs/postgresql.nix)
     (import ../upstart-jobs/openfire.nix)
     (import ../upstart-jobs/postfix.nix)
+    (import ../upstart-jobs/dovecot.nix)
 
     # nix
     (import ../upstart-jobs/nix.nix) # nix options and daemon
diff --git a/upstart-jobs/default.nix b/upstart-jobs/default.nix
index ff8b8a9e9ba..a11ec89acb8 100644
--- a/upstart-jobs/default.nix
+++ b/upstart-jobs/default.nix
@@ -131,12 +131,6 @@ let
       inherit config;
     })
 
-  # Dovecot POP3/IMAP server.
-  ++ optional config.services.dovecot.enable
-    (import ../upstart-jobs/dovecot.nix {
-      inherit config pkgs;
-    })
-
   # ISC BIND domain name server.
   ++ optional config.services.bind.enable
     (import ../upstart-jobs/bind.nix {
diff --git a/upstart-jobs/dovecot.nix b/upstart-jobs/dovecot.nix
index d7d74261e13..8a70a5462d1 100644
--- a/upstart-jobs/dovecot.nix
+++ b/upstart-jobs/dovecot.nix
@@ -1,4 +1,45 @@
-{config, pkgs}:
+{pkgs, config, ...}:
+
+###### interface
+let
+  inherit (pkgs.lib) mkOption mkIf;
+
+  options = {
+    services = {
+      dovecot = {
+        enable = mkOption {
+          default = false;
+          description = "Whether to enable dovecot POP3/IMAP server.";
+        };
+
+        user = mkOption {
+          default = "dovecot";
+          description = "dovecot user name";
+        };
+        group = mkOption {
+          default = "dovecot";
+          description = "dovecot group name";
+        };
+
+        sslServerCert = mkOption {
+          default = "";
+          description = "Server certificate";
+        };
+        sslCACert = mkOption {
+          default = "";
+          description = "CA certificate used by server certificate";
+        };
+        sslServerKey = mkOption {
+          default = "";
+          description = "Server key";
+        };
+      };
+    };
+  };
+in
+
+###### implementation
+
 let 
   startingDependency = if config.services.gw6c.enable then "gw6c" else "network-interfaces";
 
@@ -54,36 +95,51 @@ let
   '';
 
 in
-{
-  name = "dovecot";
-  users = [{
-    name = cfg.user;
-    uid = idList.uids.dovecot;
-    description = "Dovecot user";
-    group = cfg.group;
-  }];
-  groups = [{
-    name = cfg.group;
-    gid = idList.gids.dovecot;
-  }];
-
-  job = ''
-    description "Dovecot IMAP/POP3 server"
-
-    start on ${startingDependency}/started
-    stop on never
-
-    start script
-      ${pkgs.coreutils}/bin/mkdir -p /var/run/dovecot /var/run/dovecot/login 
-      ${pkgs.coreutils}/bin/chown -R ${cfg.user}.${cfg.group} /var/run/dovecot
-    end script 
-
-    respawn ${pkgs.dovecot}/sbin/dovecot -F -c ${confFile}
-  '';
 
-  extraEtc = [{ 
-    source = pamdFile;
-    target = "pam.d/dovecot";
-  }];
+mkIf config.services.dovecot.enable {
+
+  require = [
+    options
+  ];
+
+  environment = {
+    etc = [{
+      source = pamdFile;
+      target = "pam.d/dovecot";
+    }];
+  };
+
+  users = {
+    extraUsers = [{
+      name = cfg.user;
+      uid = idList.uids.dovecot;
+      description = "Dovecot user";
+      group = cfg.group;
+    }];
+    extraGroups = [{
+      name = cfg.group;
+      gid = idList.gids.dovecot;
+    }];
+  };
+
+  services = {
+    extraJobs = [{
+      name = "dovecot";
+
+      job = ''
+        description "Dovecot IMAP/POP3 server"
+
+        start on ${startingDependency}/started
+        stop on never
+
+        start script
+          ${pkgs.coreutils}/bin/mkdir -p /var/run/dovecot /var/run/dovecot/login 
+          ${pkgs.coreutils}/bin/chown -R ${cfg.user}.${cfg.group} /var/run/dovecot
+        end script 
+
+        respawn ${pkgs.dovecot}/sbin/dovecot -F -c ${confFile}
+      '';
+
+    }];
+  };
 }
-
-- 
GitLab


From c0ed553c87803ac5b8d88ff4ec4137fc2eb12c99 Mon Sep 17 00:00:00 2001
From: Marc Weber <marco-oweber@gmx.de>
Date: Fri, 6 Mar 2009 12:27:13 +0000
Subject: [PATCH 1290/5331] Convert "bind"

svn path=/nixos/branches/fix-style/; revision=14394
---
 system/options.nix       | 37 +------------------
 upstart-jobs/bind.nix    | 79 ++++++++++++++++++++++++++++++++++------
 upstart-jobs/default.nix |  6 ---
 3 files changed, 69 insertions(+), 53 deletions(-)

diff --git a/system/options.nix b/system/options.nix
index 99904c7b7a0..6b9e58824a7 100644
--- a/system/options.nix
+++ b/system/options.nix
@@ -479,42 +479,6 @@ in
 
     };
 
-    bind = {
-      enable = mkOption {
-        default = false;
-        description = "
-          Whether to enable BIND domain name server.
-        ";
-      };
-      cacheNetworks = mkOption {
-        default = ["127.0.0.0/24"];
-        description = "
-          What networks are allowed to use us as a resolver.
-        ";
-      };
-      blockedNetworks = mkOption {
-        default = [];
-        description = "
-          What networks are just blocked.
-        ";
-      };
-      zones = mkOption {
-        default = [];
-        description = "
-          List of zones we claim authority over.
-            master=false means slave server; slaves means addresses 
-           who may request zone transfer.
-        ";
-        example = [{
-          name = "example.com";
-          master = false;
-          file = "/var/dns/example.com";
-          masters = ["192.168.0.1"];
-          slaves = [];
-        }];
-      };
-    };
-
   };
 
   nesting = {
@@ -619,6 +583,7 @@ in
     (import ../upstart-jobs/openfire.nix)
     (import ../upstart-jobs/postfix.nix)
     (import ../upstart-jobs/dovecot.nix)
+    (import ../upstart-jobs/bind.nix)
 
     # nix
     (import ../upstart-jobs/nix.nix) # nix options and daemon
diff --git a/upstart-jobs/bind.nix b/upstart-jobs/bind.nix
index f645abc9340..d216987e573 100644
--- a/upstart-jobs/bind.nix
+++ b/upstart-jobs/bind.nix
@@ -1,4 +1,52 @@
-{config, pkgs}: 
+{pkgs, config, ...}:
+
+###### interface
+let
+  inherit (pkgs.lib) mkOption mkIf;
+
+  options = {
+    services = {
+      bind = {
+        enable = mkOption {
+          default = false;
+          description = "
+            Whether to enable BIND domain name server.
+          ";
+        };
+        cacheNetworks = mkOption {
+          default = ["127.0.0.0/24"];
+          description = "
+            What networks are allowed to use us as a resolver.
+          ";
+        };
+        blockedNetworks = mkOption {
+          default = [];
+          description = "
+            What networks are just blocked.
+          ";
+        };
+        zones = mkOption {
+          default = [];
+          description = "
+            List of zones we claim authority over.
+              master=false means slave server; slaves means addresses 
+             who may request zone transfer.
+          ";
+          example = [{
+            name = "example.com";
+            master = false;
+            file = "/var/dns/example.com";
+            masters = ["192.168.0.1"];
+            slaves = [];
+          }];
+        };
+      };
+    };
+  };
+in
+
+###### implementation
+
 let
   startingDependency = if config.services.gw6c.enable then "gw6c" else "network-interfaces";
   cfg = config.services.bind;
@@ -52,15 +100,24 @@ let
   confFile = pkgs.writeText "named.conf" namedConf;
 
 in
-{
-  name = "bind";
-  job = ''
-    description "BIND name server job"
 
-    start script
-      ${pkgs.coreutils}/bin/mkdir -p /var/run/named
-    end script
+mkIf config.services.bind.enable {
+  require = [
+    options
+  ];
+
+  services = {
+    extraJobs = [{
+      name = "bind";
+      job = ''
+        description "BIND name server job"
+
+        start script
+          ${pkgs.coreutils}/bin/mkdir -p /var/run/named
+        end script
 
-    respawn ${pkgs.bind}/sbin/named -c ${confFile} -f 
-  '';
-} 
+        respawn ${pkgs.bind}/sbin/named -c ${confFile} -f 
+      '';
+    }];
+  };
+}
diff --git a/upstart-jobs/default.nix b/upstart-jobs/default.nix
index a11ec89acb8..3999f8c4e9d 100644
--- a/upstart-jobs/default.nix
+++ b/upstart-jobs/default.nix
@@ -131,12 +131,6 @@ let
       inherit config;
     })
 
-  # ISC BIND domain name server.
-  ++ optional config.services.bind.enable
-    (import ../upstart-jobs/bind.nix {
-      inherit config pkgs;
-    })
-
   # Handles the reboot/halt events.
   ++ (map
     (event: makeJob (import ../upstart-jobs/halt.nix {
-- 
GitLab


From 3679813f37f442d290d64c7887f7443bf99f4531 Mon Sep 17 00:00:00 2001
From: Marc Weber <marco-oweber@gmx.de>
Date: Fri, 6 Mar 2009 12:27:15 +0000
Subject: [PATCH 1291/5331] Convert "mingetty"

svn path=/nixos/branches/fix-style/; revision=14395
---
 system/options.nix        | 39 +-------------------
 upstart-jobs/default.nix  | 10 -----
 upstart-jobs/mingetty.nix | 78 +++++++++++++++++++++++++++++++++++----
 3 files changed, 72 insertions(+), 55 deletions(-)

diff --git a/system/options.nix b/system/options.nix
index 6b9e58824a7..f08f31867e4 100644
--- a/system/options.nix
+++ b/system/options.nix
@@ -441,44 +441,6 @@ in
     };
 
 
-    mingetty = {
-
-      ttys = mkOption {
-        default = [1 2 3 4 5 6];
-        description = "
-          The list of tty (virtual console) devices on which to start a
-          login prompt.
-        ";
-      };
-
-      waitOnMounts = mkOption {
-        default = false;
-        description = "
-          Whether the login prompts on the virtual consoles will be
-          started before or after all file systems have been mounted.  By
-          default we don't wait, but if for example your /home is on a
-          separate partition, you may want to turn this on.
-        ";
-      };
-
-      greetingLine = mkOption {
-        default = ''<<< Welcome to NixOS (\m) - Kernel \r (\l) >>>'';
-        description = "
-          Welcome line printed by mingetty.
-        ";
-      };
-
-      helpLine = mkOption {
-        default = "";
-        description = "
-          Help line printed by mingetty below the welcome line.
-          Used by the installation CD to give some hints on
-          how to proceed.
-        ";
-      };
-
-    };
-
   };
 
   nesting = {
@@ -584,6 +546,7 @@ in
     (import ../upstart-jobs/postfix.nix)
     (import ../upstart-jobs/dovecot.nix)
     (import ../upstart-jobs/bind.nix)
+    (import ../upstart-jobs/mingetty.nix) # The terminals on ttyX.
 
     # nix
     (import ../upstart-jobs/nix.nix) # nix options and daemon
diff --git a/upstart-jobs/default.nix b/upstart-jobs/default.nix
index 3999f8c4e9d..740b6785245 100644
--- a/upstart-jobs/default.nix
+++ b/upstart-jobs/default.nix
@@ -140,16 +140,6 @@ let
     ["reboot" "halt" "system-halt" "power-off"]
   )
     
-  # The terminals on ttyX.
-  ++ (map 
-    (ttyNumber: makeJob (import ../upstart-jobs/mingetty.nix {
-        inherit (pkgs) mingetty;
-        inherit ttyNumber;
-        loginProgram = "${pkgs.pam_login}/bin/login";
-    }))
-    (config.services.mingetty.ttys)
-  )
-
   # Transparent TTY backgrounds.
   ++ optional (config.services.ttyBackgrounds.enable && kernelPackages.splashutils != null)
     (import ../upstart-jobs/tty-backgrounds.nix {
diff --git a/upstart-jobs/mingetty.nix b/upstart-jobs/mingetty.nix
index 8f50ea5c9db..c04d47061e9 100644
--- a/upstart-jobs/mingetty.nix
+++ b/upstart-jobs/mingetty.nix
@@ -1,10 +1,74 @@
-{mingetty, ttyNumber, loginProgram}:
+{pkgs, config, ...}:
+
+###### interface
+let
+  inherit (pkgs.lib) mkOption mkIf;
+
+  options = {
+    services = {
+      mingetty = {
+
+        ttys = mkOption {
+          default = [1 2 3 4 5 6];
+          description = "
+            The list of tty (virtual console) devices on which to start a
+            login prompt.
+          ";
+        };
+
+        waitOnMounts = mkOption {
+          default = false;
+          description = "
+            Whether the login prompts on the virtual consoles will be
+            started before or after all file systems have been mounted.  By
+            default we don't wait, but if for example your /home is on a
+            separate partition, you may want to turn this on.
+          ";
+        };
+
+        greetingLine = mkOption {
+          default = ''<<< Welcome to NixOS (\m) - Kernel \r (\l) >>>'';
+          description = "
+            Welcome line printed by mingetty.
+          ";
+        };
+
+        helpLine = mkOption {
+          default = "";
+          description = "
+            Help line printed by mingetty below the welcome line.
+            Used by the installation CD to give some hints on
+            how to proceed.
+          ";
+        };
+
+      };
+    };
+  };
+in
+
+###### implementation
+
+let
+  ttyNumbers = config.services.mingetty.ttys;
+  loginProgram = "${pkgs.pam_login}/bin/login";
+  inherit (pkgs) mingetty;
+    
+in
 
 {
-  name = "tty" + toString ttyNumber;
-  job = "
-    start on udev
-    stop on shutdown
-    respawn ${mingetty}/sbin/mingetty --loginprog=${loginProgram} --noclear tty${toString ttyNumber}
-  ";
+  require = [
+    options
+  ];
+
+  services = {
+    extraJobs = map (ttyNumber : {
+        name = "tty" + toString ttyNumber;
+        job = "
+          start on udev
+          stop on shutdown
+          respawn ${mingetty}/sbin/mingetty --loginprog=${loginProgram} --noclear tty${toString ttyNumber}
+        ";
+    }) ttyNumbers;
+  };
 }
-- 
GitLab


From 98ea167131a8fbfa81d79bb078c1b941979bae4c Mon Sep 17 00:00:00 2001
From: Marc Weber <marco-oweber@gmx.de>
Date: Fri, 6 Mar 2009 12:27:18 +0000
Subject: [PATCH 1292/5331] Convert "tty-backgrounds"

svn path=/nixos/branches/fix-style/; revision=14396
---
 system/options.nix               |  64 +---------
 upstart-jobs/default.nix         |  31 -----
 upstart-jobs/tty-backgrounds.nix | 204 ++++++++++++++++++++++++-------
 3 files changed, 160 insertions(+), 139 deletions(-)

diff --git a/system/options.nix b/system/options.nix
index f08f31867e4..36b72157d15 100644
--- a/system/options.nix
+++ b/system/options.nix
@@ -380,69 +380,6 @@ in
     ";
   };
 
-  services = {
-
-  
-    ttyBackgrounds = {
-
-      enable = mkOption {
-        default = true;
-        description = "
-          Whether to enable graphical backgrounds for the virtual consoles.
-        ";
-      };
-
-      defaultTheme = mkOption {
-        default = pkgs.fetchurl {
-          #url = http://www.bootsplash.de/files/themes/Theme-BabyTux.tar.bz2;
-          url = http://www.mirrorservice.org/sites/www.ibiblio.org/gentoo/distfiles/Theme-BabyTux.tar.bz2;
-          md5 = "a6d89d1c1cff3b6a08e2f526f2eab4e0";
-        };
-        description = "
-          The default theme for the virtual consoles.  Themes can be found
-          at <link xlink:href='http://www.bootsplash.de/' />.
-        ";
-      };
-
-      defaultSpecificThemes = mkOption {
-        default = [
-          /*
-          { tty = 6;
-            theme = pkgs.fetchurl { # Yeah!
-              url = http://www.bootsplash.de/files/themes/Theme-Pativo.tar.bz2;
-              md5 = "9e13beaaadf88d43a5293e7ab757d569";
-            };
-          }
-          */
-          { tty = 10;
-            theme = pkgs.fetchurl {
-              #url = http://www.bootsplash.de/files/themes/Theme-GNU.tar.bz2;
-              url = http://www.mirrorservice.org/sites/www.ibiblio.org/gentoo/distfiles/Theme-GNU.tar.bz2;
-              md5 = "61969309d23c631e57b0a311102ef034";
-            };
-          }
-        ];
-        description = "
-          This option sets specific themes for virtual consoles.  If you
-          just want to set themes for additional consoles, use
-          <option>services.ttyBackgrounds.specificThemes</option>.
-        ";
-      };
-
-      specificThemes = mkOption {
-        default = [
-        ];
-        description = "
-          This option allows you to set specific themes for virtual
-          consoles.
-        ";
-      };
-
-    };
-
-
-  };
-
   nesting = {
     children = mkOption {
       default = [];
@@ -547,6 +484,7 @@ in
     (import ../upstart-jobs/dovecot.nix)
     (import ../upstart-jobs/bind.nix)
     (import ../upstart-jobs/mingetty.nix) # The terminals on ttyX.
+    (import ../upstart-jobs/tty-backgrounds.nix)
 
     # nix
     (import ../upstart-jobs/nix.nix) # nix options and daemon
diff --git a/upstart-jobs/default.nix b/upstart-jobs/default.nix
index 740b6785245..1a3cf76740b 100644
--- a/upstart-jobs/default.nix
+++ b/upstart-jobs/default.nix
@@ -140,37 +140,6 @@ let
     ["reboot" "halt" "system-halt" "power-off"]
   )
     
-  # Transparent TTY backgrounds.
-  ++ optional (config.services.ttyBackgrounds.enable && kernelPackages.splashutils != null)
-    (import ../upstart-jobs/tty-backgrounds.nix {
-      inherit (pkgs) stdenv;
-      inherit (kernelPackages) splashutils;
-      
-      backgrounds =
-      
-        let
-        
-          specificThemes =
-            config.services.ttyBackgrounds.defaultSpecificThemes
-            ++ config.services.ttyBackgrounds.specificThemes;
-            
-          overridenTTYs = map (x: x.tty) specificThemes;
-
-          # Use the default theme for all the mingetty ttys and for the
-          # syslog tty, except those for which a specific theme is
-          # specified.
-          defaultTTYs =
-            pkgs.lib.filter (x: !(pkgs.lib.elem x overridenTTYs)) requiredTTYs;
-
-        in      
-          (map (ttyNumber: {
-            tty = ttyNumber;
-            theme = config.services.ttyBackgrounds.defaultTheme;
-          }) defaultTTYs)
-          ++ specificThemes;
-          
-    })
-
   # User-defined events.
   ++ (map makeJob (config.services.extraJobs));
 
diff --git a/upstart-jobs/tty-backgrounds.nix b/upstart-jobs/tty-backgrounds.nix
index 60408530870..825874aaeed 100644
--- a/upstart-jobs/tty-backgrounds.nix
+++ b/upstart-jobs/tty-backgrounds.nix
@@ -1,11 +1,100 @@
-{stdenv, splashutils, backgrounds}:
+{pkgs, config, ...}:
 
-rec {
-  name = "tty-backgrounds";
+###### interface
+let
+  inherit (pkgs.lib) mkOption mkIf;
 
-  unpackTheme = theme: import ../helpers/unpack-theme.nix {
-    inherit stdenv theme;
+  options = {
+    services = {
+      ttyBackgrounds = {
+
+        enable = mkOption {
+          default = true;
+          description = "
+            Whether to enable graphical backgrounds for the virtual consoles.
+          ";
+        };
+
+        defaultTheme = mkOption {
+          default = pkgs.fetchurl {
+            #url = http://www.bootsplash.de/files/themes/Theme-BabyTux.tar.bz2;
+            url = http://www.mirrorservice.org/sites/www.ibiblio.org/gentoo/distfiles/Theme-BabyTux.tar.bz2;
+            md5 = "a6d89d1c1cff3b6a08e2f526f2eab4e0";
+          };
+          description = "
+            The default theme for the virtual consoles.  Themes can be found
+            at <link xlink:href='http://www.bootsplash.de/' />.
+          ";
+        };
+
+        defaultSpecificThemes = mkOption {
+          default = [
+            /*
+            { tty = 6;
+              theme = pkgs.fetchurl { # Yeah!
+                url = http://www.bootsplash.de/files/themes/Theme-Pativo.tar.bz2;
+                md5 = "9e13beaaadf88d43a5293e7ab757d569";
+              };
+            }
+            */
+            { tty = 10;
+              theme = pkgs.fetchurl {
+                #url = http://www.bootsplash.de/files/themes/Theme-GNU.tar.bz2;
+                url = http://www.mirrorservice.org/sites/www.ibiblio.org/gentoo/distfiles/Theme-GNU.tar.bz2;
+                md5 = "61969309d23c631e57b0a311102ef034";
+              };
+            }
+          ];
+          description = "
+            This option sets specific themes for virtual consoles.  If you
+            just want to set themes for additional consoles, use
+            <option>services.ttyBackgrounds.specificThemes</option>.
+          ";
+        };
+
+        specificThemes = mkOption {
+          default = [
+          ];
+          description = "
+            This option allows you to set specific themes for virtual
+            consoles.
+          ";
+        };
+      };
+    };
   };
+in
+
+###### implementation
+
+let
+  inherit (pkgs) stdenv;
+  kernelPackages = config.boot.kernelPackages;
+  splashutils = kernelPackages.splashutils;
+  requiredTTYs = config.requiredTTYs;
+  backgrounds =
+  
+    let
+    
+      specificThemes =
+        config.services.ttyBackgrounds.defaultSpecificThemes
+        ++ config.services.ttyBackgrounds.specificThemes;
+        
+      overridenTTYs = map (x: x.tty) specificThemes;
+
+      # Use the default theme for all the mingetty ttys and for the
+      # syslog tty, except those for which a specific theme is
+      # specified.
+      defaultTTYs =
+        pkgs.lib.filter (x: !(pkgs.lib.elem x overridenTTYs)) requiredTTYs;
+
+    in      
+      (map (ttyNumber: {
+        tty = ttyNumber;
+        theme = config.services.ttyBackgrounds.defaultTheme;
+      }) defaultTTYs)
+      ++ specificThemes;
+
 
   themesUnpacked = stdenv.mkDerivation {
     name = "splash-themes";
@@ -15,46 +104,71 @@ rec {
     themes = map (x: if x ? theme then (unpackTheme x.theme) else "default") backgrounds;
   };
 
-  extraEtc = [
-    { source = themesUnpacked;
-      target = "splash";
-    }
+  unpackTheme = theme: import ../helpers/unpack-theme.nix {
+      inherit stdenv theme;
+    };
+
+
+
+in
+
+# FIXME see xfs
+# assert splashutils != null;
+
+mkIf (config.services.ttyBackgrounds.enable && kernelPackages.splashutils != null) {
+  require = [
+    options
   ];
 
-  job = ''
-    start on udev
-
-    start script
-
-        # Critical: tell the kernel where to find splash_helper.  It calls
-        # this program every time we switch between consoles.
-        helperProcFile=${splashutils.helperProcFile}
-        if test -e /proc/sys/fbcondecor; then helperProcFile=/proc/sys/fbcondecor; fi
-        echo ${splashutils}/${splashutils.helperName} > $helperProcFile
-
-        # For each console...
-        for tty in ${toString (map (x: x.tty) backgrounds)}; do
-            # Make sure that the console exists.
-            echo -n "" > /dev/tty$tty 
-
-            # Set the theme as determined by tty-backgrounds-combine.sh
-            # above.
-            theme=$(readlink ${themesUnpacked}/$tty)
-            ${splashutils}/${splashutils.controlName} --tty $tty -c setcfg -t $theme || true
-            ${splashutils}/${splashutils.controlName} --tty $tty -c setpic -t $theme || true
-            ${splashutils}/${splashutils.controlName} --tty $tty -c on || true
-        done
-
-    end script
-
-    respawn sleep 10000 # !!! Hack
-
-    stop script
-        # Disable the theme on each console.
-        for tty in ${toString (map (x: x.tty) backgrounds)}; do
-            ${splashutils}/${splashutils.controlName} --tty $tty -c off || true
-        done
-    end script
-  '';
-  
+
+  environment = {
+    etc = [
+      { source = themesUnpacked;
+        target = "splash";
+      }
+    ];
+  };
+
+
+  services = {
+    extraJobs = [ rec {
+      name = "tty-backgrounds";
+
+      job = ''
+        start on udev
+
+        start script
+
+            # Critical: tell the kernel where to find splash_helper.  It calls
+            # this program every time we switch between consoles.
+            helperProcFile=${splashutils.helperProcFile}
+            if test -e /proc/sys/fbcondecor; then helperProcFile=/proc/sys/fbcondecor; fi
+            echo ${splashutils}/${splashutils.helperName} > $helperProcFile
+
+            # For each console...
+            for tty in ${toString (map (x: x.tty) backgrounds)}; do
+                # Make sure that the console exists.
+                echo -n "" > /dev/tty$tty 
+
+                # Set the theme as determined by tty-backgrounds-combine.sh
+                # above.
+                theme=$(readlink ${themesUnpacked}/$tty)
+                ${splashutils}/${splashutils.controlName} --tty $tty -c setcfg -t $theme || true
+                ${splashutils}/${splashutils.controlName} --tty $tty -c setpic -t $theme || true
+                ${splashutils}/${splashutils.controlName} --tty $tty -c on || true
+            done
+
+        end script
+
+        respawn sleep 10000 # !!! Hack
+
+        stop script
+            # Disable the theme on each console.
+            for tty in ${toString (map (x: x.tty) backgrounds)}; do
+                ${splashutils}/${splashutils.controlName} --tty $tty -c off || true
+            done
+        end script
+      '';
+    }];
+  };
 }
-- 
GitLab


From dd0f98fe22d0671a4db9c4fae923d1eba69ea1b3 Mon Sep 17 00:00:00 2001
From: Marc Weber <marco-oweber@gmx.de>
Date: Fri, 6 Mar 2009 12:27:20 +0000
Subject: [PATCH 1293/5331] added FIXME notes

svn path=/nixos/branches/fix-style/; revision=14397
---
 system/options.nix | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/system/options.nix b/system/options.nix
index 36b72157d15..baeb96853d3 100644
--- a/system/options.nix
+++ b/system/options.nix
@@ -476,15 +476,16 @@ in
     (import ../upstart-jobs/udev.nix) # The udev daemon creates devices nodes and runs programs when hardware events occur.
     (import ../upstart-jobs/samba.nix) # TODO: doesn't start here (?)
     (import ../upstart-jobs/ircd-hybrid.nix) # TODO: doesn't compile on x86_64-linux, can't test
-    (import ../upstart-jobs/xfs.nix)
+    (import ../upstart-jobs/xfs.nix) # FIXME (assertion)
     (import ../upstart-jobs/mysql.nix)
     (import ../upstart-jobs/postgresql.nix)
-    (import ../upstart-jobs/openfire.nix)
+    (import ../upstart-jobs/openfire.nix) # FIXME (assertion)
     (import ../upstart-jobs/postfix.nix)
     (import ../upstart-jobs/dovecot.nix)
     (import ../upstart-jobs/bind.nix)
+
     (import ../upstart-jobs/mingetty.nix) # The terminals on ttyX.
-    (import ../upstart-jobs/tty-backgrounds.nix)
+    (import ../upstart-jobs/tty-backgrounds.nix) #FIXME (assertion)
 
     # nix
     (import ../upstart-jobs/nix.nix) # nix options and daemon
-- 
GitLab


From bfc722e83d7edd2e44242458587b6eb72d969a28 Mon Sep 17 00:00:00 2001
From: Marc Weber <marco-oweber@gmx.de>
Date: Fri, 6 Mar 2009 12:27:23 +0000
Subject: [PATCH 1294/5331] Convert "klogd"

svn path=/nixos/branches/fix-style/; revision=14398
---
 system/options.nix       |  3 +++
 upstart-jobs/default.nix |  6 ------
 upstart-jobs/klogd.nix   | 39 +++++++++++++++++++++++----------------
 3 files changed, 26 insertions(+), 22 deletions(-)

diff --git a/system/options.nix b/system/options.nix
index baeb96853d3..32e3a5b7b8e 100644
--- a/system/options.nix
+++ b/system/options.nix
@@ -414,6 +414,9 @@ in
 
     (import ../system/unix-odbc-drivers.nix)
 
+    (import ../upstart-jobs/klogd.nix)
+
+
 
     # security
     (import ../system/sudo.nix)
diff --git a/upstart-jobs/default.nix b/upstart-jobs/default.nix
index 1a3cf76740b..69289bcf99d 100644
--- a/upstart-jobs/default.nix
+++ b/upstart-jobs/default.nix
@@ -71,12 +71,6 @@ let
   jobs = map makeJob
     ([
     
-    # Klogd.
-    (import ../upstart-jobs/klogd.nix {
-      inherit (pkgs) sysklogd writeText;
-      inherit config;
-    })
-
     # Makes LVM logical volumes available. 
     (import ../upstart-jobs/lvm.nix {
       inherit modprobe;
diff --git a/upstart-jobs/klogd.nix b/upstart-jobs/klogd.nix
index 35207b339bd..59ab51fea92 100644
--- a/upstart-jobs/klogd.nix
+++ b/upstart-jobs/klogd.nix
@@ -1,26 +1,33 @@
-{sysklogd, writeText, config}:
+{pkgs, config, ...}:
 
+###### implementation
 let
+  inherit (pkgs.lib);
 
-  klogdCmd = "${sysklogd}/sbin/klogd -c 1 -2 -k $(dirname $(readlink -f /var/run/booted-system/kernel))/System.map";
+  klogdCmd = "${pkgs.sysklogd}/sbin/klogd -c 1 -2 -k $(dirname $(readlink -f /var/run/booted-system/kernel))/System.map";
 
 in
 
 {
-  name = "klogd";
-  
-  job = ''
-    description "Kernel log daemon"
-  
-    start on syslogd
-    stop on shutdown
 
-    start script
-      # !!! this hangs for some reason (it blocks reading from
-      # /proc/kmsg).
-      #${klogdCmd} -o
-    end script
+  services = {
+    extraJobs = [{
+      name = "klogd";
+      
+      job = ''
+        description "Kernel log daemon"
+      
+        start on syslogd
+        stop on shutdown
 
-    respawn ${klogdCmd} -n
-  '';
+        start script
+          # !!! this hangs for some reason (it blocks reading from
+          # /proc/kmsg).
+          #${klogdCmd} -o
+        end script
+
+        respawn ${klogdCmd} -n
+      '';
+    }];
+  };
 }
-- 
GitLab


From f05cccbc66d6123fbd076c4a1cbd5d4cfe18c6d7 Mon Sep 17 00:00:00 2001
From: Marc Weber <marco-oweber@gmx.de>
Date: Fri, 6 Mar 2009 12:27:28 +0000
Subject: [PATCH 1295/5331] Convert "lvm"

svn path=/nixos/branches/fix-style/; revision=14399
---
 system/options.nix       |  2 ++
 upstart-jobs/default.nix |  6 -----
 upstart-jobs/lvm.nix     | 57 ++++++++++++++++++++++++----------------
 3 files changed, 36 insertions(+), 29 deletions(-)

diff --git a/system/options.nix b/system/options.nix
index 32e3a5b7b8e..2444edaeb59 100644
--- a/system/options.nix
+++ b/system/options.nix
@@ -416,6 +416,8 @@ in
 
     (import ../upstart-jobs/klogd.nix)
 
+    (import ../upstart-jobs/lvm.nix) # Makes LVM logical volumes available.
+
 
 
     # security
diff --git a/upstart-jobs/default.nix b/upstart-jobs/default.nix
index 69289bcf99d..5b455eeaa78 100644
--- a/upstart-jobs/default.nix
+++ b/upstart-jobs/default.nix
@@ -71,12 +71,6 @@ let
   jobs = map makeJob
     ([
     
-    # Makes LVM logical volumes available. 
-    (import ../upstart-jobs/lvm.nix {
-      inherit modprobe;
-      inherit (pkgs) lvm2 devicemapper;
-    })
-      
     # Activate software RAID arrays.
     (import ../upstart-jobs/swraid.nix {
       inherit modprobe;
diff --git a/upstart-jobs/lvm.nix b/upstart-jobs/lvm.nix
index d860224685e..1d16da59bef 100644
--- a/upstart-jobs/lvm.nix
+++ b/upstart-jobs/lvm.nix
@@ -1,30 +1,41 @@
-{modprobe, lvm2, devicemapper}:
+{pkgs, config, ...}:
 
-{
-  name = "lvm";
-  
-  job = "
-start on udev
-#start on new-devices
-
-script
+###### implementation
 
-    # Load the device mapper.
-    ${modprobe}/sbin/modprobe dm_mod || true
+let
+  modprobe = config.system.sbin.modprobe;
 
-    ${devicemapper}/sbin/dmsetup mknodes
-    # Scan for block devices that might contain LVM physical volumes
-    # and volume groups.
-    ${lvm2}/sbin/vgscan --mknodes
+in
 
-    # Make all logical volumes on all volume groups available, i.e.,
-    # make them appear in /dev.
-    ${lvm2}/sbin/vgchange --available y
 
-    initctl emit new-devices
-    
-end script
-
-  ";
+{
 
+  services = {
+    extraJobs = [{
+      name = "lvm";
+      
+      job = ''
+        start on udev
+        #start on new-devices
+
+        script
+
+            # Load the device mapper.
+            ${modprobe}/sbin/modprobe dm_mod || true
+
+            ${pkgs.devicemapper}/sbin/dmsetup mknodes
+            # Scan for block devices that might contain LVM physical volumes
+            # and volume groups.
+            ${pkgs.lvm2}/sbin/vgscan --mknodes
+
+            # Make all logical volumes on all volume groups available, i.e.,
+            # make them appear in /dev.
+            ${pkgs.lvm2}/sbin/vgchange --available y
+
+            initctl emit new-devices
+            
+        end script
+      '';
+    }];
+  };
 }
-- 
GitLab


From ea60090213ef5d98ba3071ef58fc5ba29e44f7ef Mon Sep 17 00:00:00 2001
From: Marc Weber <marco-oweber@gmx.de>
Date: Fri, 6 Mar 2009 12:27:30 +0000
Subject: [PATCH 1296/5331] Convert "swraid"

svn path=/nixos/branches/fix-style/; revision=14400
---
 system/options.nix       |  1 +
 upstart-jobs/default.nix |  6 ----
 upstart-jobs/swraid.nix  | 60 +++++++++++++++++++++++-----------------
 3 files changed, 35 insertions(+), 32 deletions(-)

diff --git a/system/options.nix b/system/options.nix
index 2444edaeb59..6b167d82c1a 100644
--- a/system/options.nix
+++ b/system/options.nix
@@ -418,6 +418,7 @@ in
 
     (import ../upstart-jobs/lvm.nix) # Makes LVM logical volumes available.
 
+    (import ../upstart-jobs/swraid.nix) # Activate software RAID arrays.
 
 
     # security
diff --git a/upstart-jobs/default.nix b/upstart-jobs/default.nix
index 5b455eeaa78..6f14800d296 100644
--- a/upstart-jobs/default.nix
+++ b/upstart-jobs/default.nix
@@ -71,12 +71,6 @@ let
   jobs = map makeJob
     ([
     
-    # Activate software RAID arrays.
-    (import ../upstart-jobs/swraid.nix {
-      inherit modprobe;
-      inherit (pkgs) mdadm;
-    })
-      
     # Mount file systems.
     (import ../upstart-jobs/filesystems.nix {
       inherit mount;
diff --git a/upstart-jobs/swraid.nix b/upstart-jobs/swraid.nix
index 5cf7d82e383..a0a25efa354 100644
--- a/upstart-jobs/swraid.nix
+++ b/upstart-jobs/swraid.nix
@@ -1,36 +1,44 @@
-{modprobe, mdadm}:
+{pkgs, config, ...}:
+
+###### implementation
 
 let
 
   tempConf = "/var/run/mdadm.conf";
+  modprobe = config.system.sbin.modprobe;
+  inherit (pkgs) mdadm;
 
 in
   
 {
-  name = "swraid";
-  
-  job = "
-start on udev
-#start on new-devices
-
-script
-
-    # Load the necessary RAID personalities.
-    # !!! hm, doesn't the kernel load these automatically?
-    for mod in raid0 raid1 raid5; do
-        ${modprobe}/sbin/modprobe $mod || true
-    done
-
-    # Scan /proc/partitions for RAID devices.
-    ${mdadm}/sbin/mdadm --examine --brief --scan -c partitions > ${tempConf}
-
-    # Activate each device found.
-    ${mdadm}/sbin/mdadm --assemble -c ${tempConf} --scan
-
-    initctl emit new-devices
-    
-end script
-
-  ";
 
+  services = {
+    extraJobs = [{
+      name = "swraid";
+      
+      job = ''
+      start on udev
+      #start on new-devices
+      
+      script
+      
+          # Load the necessary RAID personalities.
+          # !!! hm, doesn't the kernel load these automatically?
+          for mod in raid0 raid1 raid5; do
+              ${modprobe}/sbin/modprobe $mod || true
+          done
+      
+          # Scan /proc/partitions for RAID devices.
+          ${mdadm}/sbin/mdadm --examine --brief --scan -c partitions > ${tempConf}
+      
+          # Activate each device found.
+          ${mdadm}/sbin/mdadm --assemble -c ${tempConf} --scan
+      
+          initctl emit new-devices
+          
+      end script
+      
+      '';
+    }];
+  };
 }
-- 
GitLab


From d964466c1af91b1c91264a083d18803e402bbf7b Mon Sep 17 00:00:00 2001
From: Marc Weber <marco-oweber@gmx.de>
Date: Fri, 6 Mar 2009 12:27:33 +0000
Subject: [PATCH 1297/5331] Convert "filesystems"

svn path=/nixos/branches/fix-style/; revision=14401
---
 system/options.nix           |   2 +
 upstart-jobs/default.nix     |   7 --
 upstart-jobs/filesystems.nix | 202 ++++++++++++++++++-----------------
 3 files changed, 106 insertions(+), 105 deletions(-)

diff --git a/system/options.nix b/system/options.nix
index 6b167d82c1a..039f8b72403 100644
--- a/system/options.nix
+++ b/system/options.nix
@@ -420,6 +420,8 @@ in
 
     (import ../upstart-jobs/swraid.nix) # Activate software RAID arrays.
 
+    (import ../upstart-jobs/filesystems.nix) # Mount file systems.
+
 
     # security
     (import ../system/sudo.nix)
diff --git a/upstart-jobs/default.nix b/upstart-jobs/default.nix
index 6f14800d296..ca90d8bb8d3 100644
--- a/upstart-jobs/default.nix
+++ b/upstart-jobs/default.nix
@@ -71,13 +71,6 @@ let
   jobs = map makeJob
     ([
     
-    # Mount file systems.
-    (import ../upstart-jobs/filesystems.nix {
-      inherit mount;
-      inherit (pkgs) utillinux e2fsprogs;
-      fileSystems = config.fileSystems;
-    })
-
     # Swapping.
     (import ../upstart-jobs/swap.nix {
       inherit (pkgs) utillinux lib;
diff --git a/upstart-jobs/filesystems.nix b/upstart-jobs/filesystems.nix
index 24569db11b4..10673cce5f3 100644
--- a/upstart-jobs/filesystems.nix
+++ b/upstart-jobs/filesystems.nix
@@ -1,120 +1,126 @@
-{utillinux, e2fsprogs, fileSystems, mount}:
+{pkgs, config, ...}:
 
-let
+###### implementation
 
-  # !!! use XML
+let
+  inherit (pkgs) e2fsprogs;
   mountPoints = map (fs: fs.mountPoint) fileSystems;
+  fileSystems = config.fileSystems;
   devices = map (fs: if fs ? device then fs.device else "LABEL=" + fs.label) fileSystems;
   fsTypes = map (fs: if fs ? fsType then fs.fsType else "auto") fileSystems;
   optionss = map (fs: if fs ? options then fs.options else "defaults") fileSystems;
   autocreates = map (fs: if fs ? autocreate then fs.autocreate else "0") fileSystems;
+  mount = config.system.sbin.mount;
 
-in 
-
-{
-  name = "filesystems";
+  job = ''
+  start on startup
+  start on new-devices
+  start on ip-up
   
-  job = "
-start on startup
-start on new-devices
-start on ip-up
-
-script
+  script
     PATH=${e2fsprogs}/sbin:$PATH
-
+  
     mountPoints=(${toString mountPoints})  
     devices=(${toString devices})
     fsTypes=(${toString fsTypes})
     optionss=(${toString optionss})
     autocreates=(${toString autocreates})
-
+  
     newDevices=1
-
+  
     # If we mount any file system, we repeat this loop, because new
     # mount opportunities may have become available (such as images
     # for loopback mounts).
-    
-    while test -n \"$newDevices\"; do
-
-        newDevices=
-
-        for ((n = 0; n < \${#mountPoints[*]}; n++)); do
-            mountPoint=\${mountPoints[$n]}
-            device=\${devices[$n]}
-            fsType=\${fsTypes[$n]}
-            options=\${optionss[$n]}
-            autocreate=\${autocreates[$n]}
-
-            isLabel=
-            if echo \"$device\" | grep -q '^LABEL='; then isLabel=1; fi
-
-            isPseudo=
-            if test \"$fsType\" = \"nfs\" || test \"$fsType\" = \"tmpfs\" ||
-              test \"$fsType\" = \"ext3cow\"; then isPseudo=1; fi
-
-            if ! test -n \"$isLabel\" -o -n \"$isPseudo\" -o -e \"$device\"; then
-                echo \"skipping $device, doesn't exist (yet)\"
-                continue
-            fi
-
-            # !!! quick hack: if mount point already exists, try a
-            # remount to change the options but nothing else.
-            if cat /proc/mounts | grep -F -q \" $mountPoint \"; then
-                echo \"remounting $device on $mountPoint\"
-                ${mount}/bin/mount -t \"$fsType\" \\
-                    -o remount,\"$options\" \\
-                    \"$device\" \"$mountPoint\" || true
-                continue
-            fi
-
-            # If $device is already mounted somewhere else, unmount it first.
-            # !!! Note: we use /etc/mtab, not /proc/mounts, because mtab
-            # contains more accurate info when using loop devices.
-
-            # !!! not very smart about labels yet; should resolve the label somehow.
-            if test -z \"$isLabel\" -a -z \"$isPseudo\"; then
-
-                device=$(readlink -f \"$device\")
-
-                prevMountPoint=$(
-                    cat /etc/mtab \\
-                    | grep \"^$device \" \\
-                    | sed 's|^[^ ]\\+ \\+\\([^ ]\\+\\).*|\\1|' \\
-                )
-
-                if test \"$prevMountPoint\" = \"$mountPoint\"; then
-                    echo \"remounting $device on $mountPoint\"
-                    ${mount}/bin/mount -t \"$fsType\" \\
-                        -o remount,\"$options\" \\
-                        \"$device\" \"$mountPoint\" || true
-                    continue
-                fi
-
-                if test -n \"$prevMountPoint\"; then
-                    echo \"unmount $device from $prevMountPoint\"
-                    ${mount}/bin/umount \"$prevMountPoint\" || true
-                fi
-
-            fi
-
-            echo \"mounting $device on $mountPoint\"
-
-            # !!! should do something with the result; also prevent repeated fscks.
-            if test -z \"$isPseudo\"; then
-                fsck -a \"$device\" || true
-            fi
-
-            if test \"\$autocreate\" = 1; then mkdir -p \"\$mountPoint\"; fi
-
-            if ${mount}/bin/mount -t \"$fsType\" -o \"$options\" \"$device\" \"$mountPoint\"; then
-                newDevices=1
-            fi
-        
-        done
-
+  
+    while test -n "$newDevices"; do
+  
+      newDevices=
+  
+      for ((n = 0; n < ''${#mountPoints[*]}; n++)); do
+        mountPoint=''${mountPoints[$n]}
+        device=''${devices[$n]}
+        fsType=''${fsTypes[$n]}
+        options=''${optionss[$n]}
+        autocreate=''${autocreates[$n]}
+  
+        isLabel=
+        if echo "$device" | grep -q '^LABEL='; then isLabel=1; fi
+  
+        isPseudo=
+        if test "$fsType" = "nfs" || test "$fsType" = "tmpfs" ||
+          test "$fsType" = "ext3cow"; then isPseudo=1; fi
+  
+        if ! test -n "$isLabel" -o -n "$isPseudo" -o -e "$device"; then
+            echo "skipping $device, doesn't exist (yet)"
+            continue
+        fi
+  
+        # !!! quick hack: if mount point already exists, try a
+        # remount to change the options but nothing else.
+        if cat /proc/mounts | grep -F -q " $mountPoint "; then
+            echo "remounting $device on $mountPoint"
+            ${mount}/bin/mount -t "$fsType" \
+                -o remount,"$options" \
+                "$device" "$mountPoint" || true
+            continue
+        fi
+  
+        # If $device is already mounted somewhere else, unmount it first.
+        # !!! Note: we use /etc/mtab, not /proc/mounts, because mtab
+        # contains more accurate info when using loop devices.
+  
+        # !!! not very smart about labels yet; should resolve the label somehow.
+        if test -z "$isLabel" -a -z "$isPseudo"; then
+  
+          device=$(readlink -f "$device")
+  
+          prevMountPoint=$(
+              cat /etc/mtab \
+              | grep "^$device " \
+              | sed 's|^[^ ]\+ \+\([^ ]\+\).*|\1|' \
+          )
+  
+          if test "$prevMountPoint" = "$mountPoint"; then
+              echo "remounting $device on $mountPoint"
+              ${mount}/bin/mount -t "$fsType" \
+                  -o remount,"$options" \
+                  "$device" "$mountPoint" || true
+              continue
+          fi
+  
+          if test -n "$prevMountPoint"; then
+              echo "unmount $device from $prevMountPoint"
+              ${mount}/bin/umount "$prevMountPoint" || true
+          fi
+  
+        fi
+  
+        echo "mounting $device on $mountPoint"
+  
+        # !!! should do something with the result; also prevent repeated fscks.
+        if test -z "$isPseudo"; then
+            fsck -a "$device" || true
+        fi
+  
+        if test "$autocreate" = 1; then mkdir -p "$mountPoint"; fi
+  
+        if ${mount}/bin/mount -t "$fsType" -o "$options" "$device" "$mountPoint"; then
+            newDevices=1
+        fi
+  
+      done
+  
     done
+  
+  end script
+  '';
+in
 
-end script
-  ";
-
+{
+  services = {
+    extraJobs = [{
+      name = "filesystems";
+      inherit job;
+    }];
+  };
 }
-- 
GitLab


From ed8bfc1c78133d9e9438271bd34bf3325f21f2f8 Mon Sep 17 00:00:00 2001
From: Marc Weber <marco-oweber@gmx.de>
Date: Fri, 6 Mar 2009 12:27:35 +0000
Subject: [PATCH 1298/5331] Convert "swap"

svn path=/nixos/branches/fix-style/; revision=14402
---
 system/options.nix       |  2 ++
 upstart-jobs/default.nix |  6 ----
 upstart-jobs/swap.nix    | 72 +++++++++++++++++++++++-----------------
 3 files changed, 43 insertions(+), 37 deletions(-)

diff --git a/system/options.nix b/system/options.nix
index 039f8b72403..9a502d9502e 100644
--- a/system/options.nix
+++ b/system/options.nix
@@ -422,6 +422,8 @@ in
 
     (import ../upstart-jobs/filesystems.nix) # Mount file systems.
 
+    (import ../upstart-jobs/swap.nix)
+
 
     # security
     (import ../system/sudo.nix)
diff --git a/upstart-jobs/default.nix b/upstart-jobs/default.nix
index ca90d8bb8d3..2de4ba70760 100644
--- a/upstart-jobs/default.nix
+++ b/upstart-jobs/default.nix
@@ -71,12 +71,6 @@ let
   jobs = map makeJob
     ([
     
-    # Swapping.
-    (import ../upstart-jobs/swap.nix {
-      inherit (pkgs) utillinux lib;
-      swapDevices = config.swapDevices;
-    })
-
     # Network interfaces.
     (import ../upstart-jobs/network-interfaces.nix {
       inherit modprobe config;
diff --git a/upstart-jobs/swap.nix b/upstart-jobs/swap.nix
index cd640b5060e..5b6b70e362f 100644
--- a/upstart-jobs/swap.nix
+++ b/upstart-jobs/swap.nix
@@ -1,7 +1,13 @@
-{lib, utillinux, swapDevices}:
+{pkgs, config, ...}:
+
+###### implementation
 
 let
 
+  inherit (pkgs) utillinux lib;
+
+  swapDevices = config.swapDevices;
+
   devicesByPath =
     map (x: x.device) (lib.filter (x: x ? device) swapDevices);
     
@@ -10,35 +16,39 @@ let
 
 in
 
-{
-  name = "swap";
-  
-  job = "
-start on startup
-start on new-devices
-
-script
-    for device in ${toString devicesByPath}; do
-        ${utillinux}/sbin/swapon \"$device\" || true
-    done
-
-    for label in ${toString devicesByLabel}; do
-        ${utillinux}/sbin/swapon -L \"$label\" || true
-    done
-
-    # Remove swap devices not listed in swapDevices.
-    # !!! disabled because it doesn't work with labels
-    #for used in $(cat /proc/swaps | grep '^/' | sed 's/ .*//'); do
-    #    found=
-    #    for device in $ {toString swapDevices}; do
-    #        if test \"$used\" = \"$device\"; then found=1; fi
-    #    done
-    #    if test -z \"$found\"; then
-    #        ${utillinux}/sbin/swapoff \"$used\" || true
-    #    fi
-    #done
-    
-end script
-  ";
 
+{
+  services = {
+    extraJobs = [{
+      name = "swap";
+      
+      job = "
+        start on startup
+        start on new-devices
+        
+        script
+            for device in ${toString devicesByPath}; do
+                ${utillinux}/sbin/swapon \"$device\" || true
+            done
+            
+            for label in ${toString devicesByLabel}; do
+                ${utillinux}/sbin/swapon -L \"$label\" || true
+            done
+            
+            # Remove swap devices not listed in swapDevices.
+            # !!! disabled because it doesn't work with labels
+            #for used in $(cat /proc/swaps | grep '^/' | sed 's/ .*//'); do
+            #    found=
+            #    for device in $ {toString swapDevices}; do
+            #        if test \"$used\" = \"$device\"; then found=1; fi
+            #    done
+            #    if test -z \"$found\"; then
+            #        ${utillinux}/sbin/swapoff \"$used\" || true
+            #    fi
+            #done
+            
+        end script
+      ";
+    }];
+  };
 }
-- 
GitLab


From 4963abf63e3d1a3f759459ec096c1faa7f40ef81 Mon Sep 17 00:00:00 2001
From: Marc Weber <marco-oweber@gmx.de>
Date: Fri, 6 Mar 2009 12:27:38 +0000
Subject: [PATCH 1299/5331] Convert "nework-interfaces"

svn path=/nixos/branches/fix-style/; revision=14403
---
 system/options.nix                  |   1 +
 upstart-jobs/default.nix            |   6 -
 upstart-jobs/network-interfaces.nix | 177 +++++++++++++++-------------
 3 files changed, 94 insertions(+), 90 deletions(-)

diff --git a/system/options.nix b/system/options.nix
index 9a502d9502e..0a57304ab2b 100644
--- a/system/options.nix
+++ b/system/options.nix
@@ -423,6 +423,7 @@ in
     (import ../upstart-jobs/filesystems.nix) # Mount file systems.
 
     (import ../upstart-jobs/swap.nix)
+    (import ../upstart-jobs/network-interfaces.nix)
 
 
     # security
diff --git a/upstart-jobs/default.nix b/upstart-jobs/default.nix
index 2de4ba70760..18c4d7f9e86 100644
--- a/upstart-jobs/default.nix
+++ b/upstart-jobs/default.nix
@@ -71,12 +71,6 @@ let
   jobs = map makeJob
     ([
     
-    # Network interfaces.
-    (import ../upstart-jobs/network-interfaces.nix {
-      inherit modprobe config;
-      inherit (pkgs) nettools wirelesstools bash writeText;
-    })
-      
     # Name service cache daemon.
     (import ../upstart-jobs/nscd.nix {
       inherit (pkgs) glibc;
diff --git a/upstart-jobs/network-interfaces.nix b/upstart-jobs/network-interfaces.nix
index 61469fffbd6..40803639331 100644
--- a/upstart-jobs/network-interfaces.nix
+++ b/upstart-jobs/network-interfaces.nix
@@ -1,7 +1,11 @@
-{nettools, modprobe, wirelesstools, bash, writeText, config}:
+{pkgs, config, ...}:
+
+###### implementation
 
 let
 
+  inherit (pkgs) nettools wirelesstools bash writeText;
+
   cfg = config.networking;
 
   # !!! use XML
@@ -10,91 +14,96 @@ let
   subnetMasks = map (i: if i ? subnetMask then i.subnetMask else "default") cfg.interfaces;
   essids = map (i: if i ? essid then i.essid else "default") cfg.interfaces;
   wepKeys = map (i: if i ? wepKey then i.wepKey else "nokey") cfg.interfaces;
+  modprobe = config.system.sbin.modprobe;
 
 in 
 
-{
-  name = "network-interfaces";
-  
-  job = ''
-    start on udev
-    stop on shutdown
-
-    start script
-        export PATH=${modprobe}/sbin:$PATH
-        modprobe af_packet || true
-
-        for i in $(cd /sys/class/net && ls -d *); do
-            echo "Bringing up network device $i..."
-            ${nettools}/sbin/ifconfig $i up || true
-        done
-
-        # Configure the manually specified interfaces.
-        names=(${toString names})
-        ipAddresses=(${toString ipAddresses})
-        subnetMasks=(${toString subnetMasks})
-        essids=(${toString essids})
-        wepKeys=(${toString wepKeys})
-
-        for ((n = 0; n < ''${#names[*]}; n++)); do
-            name=''${names[$n]}
-            ipAddress=''${ipAddresses[$n]}
-            subnetMask=''${subnetMasks[$n]}
-            essid=''${essids[$n]}
-            wepKey=''${wepKeys[$n]}
-
-            # Set wireless networking stuff.
-            if test "$essid" != default; then
-                ${wirelesstools}/sbin/iwconfig "$name" essid "$essid" || true
-            fi
-
-            if test "$wepKey" != nokey; then
-                ${wirelesstools}/sbin/iwconfig "$name" key "$(cat "$wepKey")" || true
-            fi
 
-            # Set IP address / netmask.        
-            if test "$ipAddress" != dhcp; then
-                echo "Configuring interface $name..."
-                extraFlags=
-                if test "$subnetMask" != default; then
-                    extraFlags="$extraFlags netmask $subnetMask"
-                fi
-                ${nettools}/sbin/ifconfig "$name" "$ipAddress" $extraFlags || true
-            fi
-
-        done
-
-        # Set the nameservers.
-        if test -n "${toString cfg.nameservers}"; then
-            rm -f /etc/resolv.conf
-            if test -n "${cfg.domain}"; then
-                echo "domain ${cfg.domain}" >> /etc/resolv.conf
-            fi
-            for i in ${toString cfg.nameservers}; do
-                echo "nameserver $i" >> /etc/resolv.conf
-            done
-        fi
-
-        # Set the default gateway.
-        if test -n "${cfg.defaultGateway}"; then
-            ${nettools}/sbin/route add default gw "${cfg.defaultGateway}" || true
-        fi
-
-        # Run any user-specified commands.
-        ${bash}/bin/sh ${writeText "local-net-cmds" cfg.localCommands} || true
-
-    end script
-
-    # Hack: Upstart doesn't yet support what we want: a service that
-    # doesn't have a running process associated with it.
-    respawn sleep 100000
-
-    stop script
-        for i in $(cd /sys/class/net && ls -d *); do
-            echo "Taking down network device $i..."
-            ${nettools}/sbin/ifconfig $i down || true
-        done
-    end script
-  '';
-  
+{
+  services = {
+    extraJobs = [{
+        name = "network-interfaces";
+        
+        job = ''
+          start on udev
+          stop on shutdown
+          
+          start script
+              export PATH=${modprobe}/sbin:$PATH
+              modprobe af_packet || true
+          
+              for i in $(cd /sys/class/net && ls -d *); do
+                  echo "Bringing up network device $i..."
+                  ${nettools}/sbin/ifconfig $i up || true
+              done
+          
+              # Configure the manually specified interfaces.
+              names=(${toString names})
+              ipAddresses=(${toString ipAddresses})
+              subnetMasks=(${toString subnetMasks})
+              essids=(${toString essids})
+              wepKeys=(${toString wepKeys})
+          
+              for ((n = 0; n < ''${#names[*]}; n++)); do
+                  name=''${names[$n]}
+                  ipAddress=''${ipAddresses[$n]}
+                  subnetMask=''${subnetMasks[$n]}
+                  essid=''${essids[$n]}
+                  wepKey=''${wepKeys[$n]}
+          
+                  # Set wireless networking stuff.
+                  if test "$essid" != default; then
+                      ${wirelesstools}/sbin/iwconfig "$name" essid "$essid" || true
+                  fi
+          
+                  if test "$wepKey" != nokey; then
+                      ${wirelesstools}/sbin/iwconfig "$name" key "$(cat "$wepKey")" || true
+                  fi
+          
+                  # Set IP address / netmask.        
+                  if test "$ipAddress" != dhcp; then
+                      echo "Configuring interface $name..."
+                      extraFlags=
+                      if test "$subnetMask" != default; then
+                          extraFlags="$extraFlags netmask $subnetMask"
+                      fi
+                      ${nettools}/sbin/ifconfig "$name" "$ipAddress" $extraFlags || true
+                  fi
+          
+              done
+          
+              # Set the nameservers.
+              if test -n "${toString cfg.nameservers}"; then
+                  rm -f /etc/resolv.conf
+                  if test -n "${cfg.domain}"; then
+                      echo "domain ${cfg.domain}" >> /etc/resolv.conf
+                  fi
+                  for i in ${toString cfg.nameservers}; do
+                      echo "nameserver $i" >> /etc/resolv.conf
+                  done
+              fi
+          
+              # Set the default gateway.
+              if test -n "${cfg.defaultGateway}"; then
+                  ${nettools}/sbin/route add default gw "${cfg.defaultGateway}" || true
+              fi
+          
+              # Run any user-specified commands.
+              ${bash}/bin/sh ${writeText "local-net-cmds" cfg.localCommands} || true
+          
+          end script
+          
+          # Hack: Upstart doesn't yet support what we want: a service that
+          # doesn't have a running process associated with it.
+          respawn sleep 100000
+          
+          stop script
+              for i in $(cd /sys/class/net && ls -d *); do
+                  echo "Taking down network device $i..."
+                  ${nettools}/sbin/ifconfig $i down || true
+              done
+          end script
+        '';
+    }];
+  };
 }
-- 
GitLab


From 4a01e5afc8e83e35faf7c8aa96e541d36de1be85 Mon Sep 17 00:00:00 2001
From: Marc Weber <marco-oweber@gmx.de>
Date: Fri, 6 Mar 2009 12:27:40 +0000
Subject: [PATCH 1300/5331] Convert "sncd"

svn path=/nixos/branches/fix-style/; revision=14404
---
 system/options.nix       |  2 +-
 upstart-jobs/default.nix |  6 ----
 upstart-jobs/nscd.nix    | 71 ++++++++++++++++++++++------------------
 3 files changed, 41 insertions(+), 38 deletions(-)

diff --git a/system/options.nix b/system/options.nix
index 0a57304ab2b..5e0c6add507 100644
--- a/system/options.nix
+++ b/system/options.nix
@@ -424,7 +424,7 @@ in
 
     (import ../upstart-jobs/swap.nix)
     (import ../upstart-jobs/network-interfaces.nix)
-
+    (import ../upstart-jobs/nscd.nix) # Name service cache daemon.
 
     # security
     (import ../system/sudo.nix)
diff --git a/upstart-jobs/default.nix b/upstart-jobs/default.nix
index 18c4d7f9e86..d7b6317b91b 100644
--- a/upstart-jobs/default.nix
+++ b/upstart-jobs/default.nix
@@ -71,12 +71,6 @@ let
   jobs = map makeJob
     ([
     
-    # Name service cache daemon.
-    (import ../upstart-jobs/nscd.nix {
-      inherit (pkgs) glibc;
-      inherit nssModulesPath;
-    })
-
     # Handles the maintenance/stalled event (single-user shell).
     (import ../upstart-jobs/maintenance-shell.nix {
       inherit (pkgs) bash;
diff --git a/upstart-jobs/nscd.nix b/upstart-jobs/nscd.nix
index c88c219c63b..fe89cdc5646 100644
--- a/upstart-jobs/nscd.nix
+++ b/upstart-jobs/nscd.nix
@@ -1,35 +1,44 @@
-{glibc, nssModulesPath}:
+{pkgs, config, ...}:
 
-{
-  name = "nscd";
-  
-  users = [
-    { name = "nscd";
-      uid = (import ../system/ids.nix).uids.nscd;
-      description = "Name service cache daemon user";
-    }
-  ];
-  
-  job = "
-description \"Name Service Cache Daemon\"
-
-start on startup
-stop on shutdown
-
-env LD_LIBRARY_PATH=${nssModulesPath}
+###### implementation
 
-start script
+let
+  nssModulesPath = config.system.nssModules.path;
+in
 
-    mkdir -m 0755 -p /var/run/nscd
-    mkdir -m 0755 -p /var/db/nscd
-
-    rm -f /var/db/nscd/* # for testing
-    
-end script
-
-# !!! -d turns on debug info which probably makes nscd slower
-# 2>/dev/null is to make it shut up
-respawn ${glibc}/sbin/nscd -f ${./nscd.conf} -d 2> /dev/null
-  ";
-  
+{
+  services = {
+    extraJobs = [{
+        name = "nscd";
+        
+        users = [
+          { name = "nscd";
+            uid = (import ../system/ids.nix).uids.nscd;
+            description = "Name service cache daemon user";
+          }
+        ];
+        
+        job = ''
+      description \"Name Service Cache Daemon\"
+      
+      start on startup
+      stop on shutdown
+      
+      env LD_LIBRARY_PATH=${nssModulesPath}
+      
+      start script
+      
+          mkdir -m 0755 -p /var/run/nscd
+          mkdir -m 0755 -p /var/db/nscd
+      
+          rm -f /var/db/nscd/* # for testing
+          
+      end script
+      
+      # !!! -d turns on debug info which probably makes nscd slower
+      # 2>/dev/null is to make it shut up
+      respawn ${pkgs.glibc}/sbin/nscd -f ${./nscd.conf} -d 2> /dev/null
+      '';
+    }];
+  };
 }
-- 
GitLab


From f76096bdf9cce5b5104890da391623f0559a48e7 Mon Sep 17 00:00:00 2001
From: Marc Weber <marco-oweber@gmx.de>
Date: Fri, 6 Mar 2009 12:27:42 +0000
Subject: [PATCH 1301/5331] Convert "maintenance-shell"

svn path=/nixos/branches/fix-style/; revision=14405
---
 system/options.nix                 |  1 +
 upstart-jobs/default.nix           |  5 ----
 upstart-jobs/maintenance-shell.nix | 37 +++++++++++++++++-------------
 3 files changed, 22 insertions(+), 21 deletions(-)

diff --git a/system/options.nix b/system/options.nix
index 5e0c6add507..df77eeb1a34 100644
--- a/system/options.nix
+++ b/system/options.nix
@@ -425,6 +425,7 @@ in
     (import ../upstart-jobs/swap.nix)
     (import ../upstart-jobs/network-interfaces.nix)
     (import ../upstart-jobs/nscd.nix) # Name service cache daemon.
+    (import ../upstart-jobs/maintenance-shell.nix) # Handles the maintenance/stalled event (single-user shell).
 
     # security
     (import ../system/sudo.nix)
diff --git a/upstart-jobs/default.nix b/upstart-jobs/default.nix
index d7b6317b91b..9aaa3e38f82 100644
--- a/upstart-jobs/default.nix
+++ b/upstart-jobs/default.nix
@@ -71,11 +71,6 @@ let
   jobs = map makeJob
     ([
     
-    # Handles the maintenance/stalled event (single-user shell).
-    (import ../upstart-jobs/maintenance-shell.nix {
-      inherit (pkgs) bash;
-    })
-
     # Ctrl-alt-delete action.
     (import ../upstart-jobs/ctrl-alt-delete.nix)
 
diff --git a/upstart-jobs/maintenance-shell.nix b/upstart-jobs/maintenance-shell.nix
index 9e2acdaa0f5..8481f4283f5 100644
--- a/upstart-jobs/maintenance-shell.nix
+++ b/upstart-jobs/maintenance-shell.nix
@@ -1,19 +1,24 @@
-{bash}:
+{pkgs, config, ...}:
 
-{
-  name = "maintenance-shell";
-  
-  job = "
-start on maintenance
-start on stalled
+###### implementation
 
-script
-    exec < /dev/tty1 > /dev/tty1 2>&1
-    echo \"\"
-    echo \"<<< MAINTENANCE SHELL >>>\"
-    echo \"\"
-    exec ${bash}/bin/sh
-end script
-  ";
-  
+{
+  services = {
+    extraJobs = [{
+      name = "maintenance-shell";
+      
+      job = ''
+          start on maintenance
+          start on stalled
+          
+          script
+              exec < /dev/tty1 > /dev/tty1 2>&1
+              echo \"\"
+              echo \"<<< MAINTENANCE SHELL >>>\"
+              echo \"\"
+              exec ${pkgs.bash}/bin/sh
+          end script
+      '';
+  }];
+  };
 }
-- 
GitLab


From 76f7978cc60cfa592a4ae3b12ce01cc0d2582122 Mon Sep 17 00:00:00 2001
From: Marc Weber <marco-oweber@gmx.de>
Date: Fri, 6 Mar 2009 12:27:45 +0000
Subject: [PATCH 1302/5331] Convert "ctrl-alt-delete"

svn path=/nixos/branches/fix-style/; revision=14406
---
 system/options.nix               |  2 ++
 upstart-jobs/ctrl-alt-delete.nix | 26 +++++++++++++++++---------
 upstart-jobs/default.nix         |  8 +-------
 3 files changed, 20 insertions(+), 16 deletions(-)

diff --git a/system/options.nix b/system/options.nix
index df77eeb1a34..6b24af8309f 100644
--- a/system/options.nix
+++ b/system/options.nix
@@ -426,6 +426,8 @@ in
     (import ../upstart-jobs/network-interfaces.nix)
     (import ../upstart-jobs/nscd.nix) # Name service cache daemon.
     (import ../upstart-jobs/maintenance-shell.nix) # Handles the maintenance/stalled event (single-user shell).
+    (import ../upstart-jobs/ctrl-alt-delete.nix) # Ctrl-alt-delete action.
+
 
     # security
     (import ../system/sudo.nix)
diff --git a/upstart-jobs/ctrl-alt-delete.nix b/upstart-jobs/ctrl-alt-delete.nix
index 126154bae73..6f58606b5cd 100644
--- a/upstart-jobs/ctrl-alt-delete.nix
+++ b/upstart-jobs/ctrl-alt-delete.nix
@@ -1,12 +1,20 @@
+{pkgs, config, ...}:
+
+###### implementation
+
 {
-  name = "ctrl-alt-delete";
-  
-  job = "
-on ctrlaltdel
 
-script
-    shutdown -r now 'Ctrl-Alt-Delete pressed'
-end script
-  ";
-  
+  services = {
+    extraJobs = [{
+      name = "ctrl-alt-delete";
+      
+      job = ''
+        on ctrlaltdel
+        
+        script
+            shutdown -r now 'Ctrl-Alt-Delete pressed'
+        end script
+       '';
+    }];
+  };
 }
diff --git a/upstart-jobs/default.nix b/upstart-jobs/default.nix
index 9aaa3e38f82..5db0ccdd5a5 100644
--- a/upstart-jobs/default.nix
+++ b/upstart-jobs/default.nix
@@ -68,13 +68,7 @@ let
 
   requiredTTYs = config.requiredTTYs;
 
-  jobs = map makeJob
-    ([
-    
-    # Ctrl-alt-delete action.
-    (import ../upstart-jobs/ctrl-alt-delete.nix)
-
-  ])
+  jobs = map makeJob []
 
   # ifplugd daemon for monitoring Ethernet cables.
   ++ optional config.networking.interfaceMonitor.enable
-- 
GitLab


From 8cad533a762e777cd32783c4dd09b43ef072e04d Mon Sep 17 00:00:00 2001
From: Marc Weber <marco-oweber@gmx.de>
Date: Fri, 6 Mar 2009 12:27:47 +0000
Subject: [PATCH 1303/5331] Convert "reboot/halt" events

svn path=/nixos/branches/fix-style/; revision=14407
---
 system/options.nix       |   1 +
 upstart-jobs/default.nix |   9 --
 upstart-jobs/halt.nix    | 207 +++++++++++++++++++++------------------
 3 files changed, 113 insertions(+), 104 deletions(-)

diff --git a/system/options.nix b/system/options.nix
index 6b24af8309f..fdb224b6788 100644
--- a/system/options.nix
+++ b/system/options.nix
@@ -427,6 +427,7 @@ in
     (import ../upstart-jobs/nscd.nix) # Name service cache daemon.
     (import ../upstart-jobs/maintenance-shell.nix) # Handles the maintenance/stalled event (single-user shell).
     (import ../upstart-jobs/ctrl-alt-delete.nix) # Ctrl-alt-delete action.
+    (import ../upstart-jobs/halt.nix) # FIXME (assertion) # Handles the reboot/halt events.
 
 
     # security
diff --git a/upstart-jobs/default.nix b/upstart-jobs/default.nix
index 5db0ccdd5a5..85c5622bf4d 100644
--- a/upstart-jobs/default.nix
+++ b/upstart-jobs/default.nix
@@ -77,15 +77,6 @@ let
       inherit config;
     })
 
-  # Handles the reboot/halt events.
-  ++ (map
-    (event: makeJob (import ../upstart-jobs/halt.nix {
-      inherit (pkgs) bash utillinux;
-      inherit event;
-    }))
-    ["reboot" "halt" "system-halt" "power-off"]
-  )
-    
   # User-defined events.
   ++ (map makeJob (config.services.extraJobs));
 
diff --git a/upstart-jobs/halt.nix b/upstart-jobs/halt.nix
index 9e6c798ea86..d98a3b5eea4 100644
--- a/upstart-jobs/halt.nix
+++ b/upstart-jobs/halt.nix
@@ -1,103 +1,120 @@
-{bash, event, utillinux}:
+{pkgs, config, ...}:
 
+###### implementation
+
+
+/* FIXME
 assert event == "reboot"
     || event == "halt"
     || event == "system-halt"
     || event == "power-off";
+*/
+
+let
+
+  inherit (pkgs) bash utillinux;
+
+  jobFun = event : {
+    name = "sys-" + event;
+    
+    job = ''
+      start on ${event}
+      
+      script
+          set +e # continue in case of errors
+      
+          exec < /dev/tty1 > /dev/tty1 2>&1
+          echo ""
+          echo "<<< SYSTEM SHUTDOWN >>>"
+          echo ""
+      
+          export PATH=${utillinux}/bin:${utillinux}/sbin:$PATH
+      
+      
+          # Set the hardware clock to the system time.
+          echo "Setting the hardware clock..."
+          hwclock --systohc --utc || true
+      
+      
+          # Do an initial sync just in case.
+          sync || true
+      
+      
+          # Kill all remaining processes except init and this one.
+          echo "Sending the TERM signal to all processes..."
+          kill -TERM -1 || true
+      
+          sleep 1 # wait briefly
+      
+          echo "Sending the KILL signal to all processes..."
+          kill -KILL -1 || true
+      
+      
+          # Unmount helper functions.
+          getMountPoints() {
+              cat /proc/mounts \
+              | grep -v '^rootfs' \
+              | sed 's|^[^ ]\+ \+\([^ ]\+\).*|\1|' \
+              | grep -v '/proc\|/sys\|/dev'
+          }
+      
+          getDevice() {
+              local mountPoint=$1
+              cat /proc/mounts \
+              | grep -v '^rootfs' \
+              | grep "^[^ ]\+ \+$mountPoint \+" \
+              | sed 's|^\([^ ]\+\).*|\1|'
+          }
+      
+          # Unmount file systems.  We repeat this until no more file systems
+          # can be unmounted.  This is to handle loopback devices, file
+          # systems  mounted on other file systems and so on.
+          tryAgain=1
+          while test -n "$tryAgain"; do
+              tryAgain=
+      
+              for mp in $(getMountPoints); do
+                  device=$(getDevice $mp)
+                  echo "unmounting $mp..."
+                  if umount -f -n "$mp"; then
+                      if test "$mp" != /; then tryAgain=1; fi
+                  else
+                      mount -n -o remount,ro "$mp" || true
+                  fi
+      
+                  # Hack: work around a bug in mount (mount -o remount on a
+                  # loop device forgets the loop=/dev/loopN entry in
+                  # /etc/mtab).
+                  if echo "$device" | grep -q '/dev/loop'; then
+                      echo "removing loop device $device..."
+                      losetup -d "$device" || true
+                  fi
+              done
+          done
+      
+          cat /proc/mounts
+      
+      
+          # Final sync.
+          sync || true
+      
+      
+          # Right now all events above power off the system.
+          if test ${event} = reboot; then
+              exec reboot -f
+          else
+              exec halt -f -p
+          fi
+      
+      end script
+    '';
+  };
+
+in
 
-{
-  name = "sys-" + event;
-  
-  job = "
-start on ${event}
-
-script
-    set +e # continue in case of errors
-
-    exec < /dev/tty1 > /dev/tty1 2>&1
-    echo \"\"
-    echo \"<<< SYSTEM SHUTDOWN >>>\"
-    echo \"\"
-
-    export PATH=${utillinux}/bin:${utillinux}/sbin:$PATH
-
-
-    # Set the hardware clock to the system time.
-    echo \"Setting the hardware clock...\"
-    hwclock --systohc --utc || true
-
-
-    # Do an initial sync just in case.
-    sync || true
-
-
-    # Kill all remaining processes except init and this one.
-    echo \"Sending the TERM signal to all processes...\"
-    kill -TERM -1 || true
-
-    sleep 1 # wait briefly
 
-    echo \"Sending the KILL signal to all processes...\"
-    kill -KILL -1 || true
-
-
-    # Unmount helper functions.
-    getMountPoints() {
-        cat /proc/mounts \\
-        | grep -v '^rootfs' \\
-        | sed 's|^[^ ]\\+ \\+\\([^ ]\\+\\).*|\\1|' \\
-        | grep -v '/proc\\|/sys\\|/dev'
-    }
-
-    getDevice() {
-        local mountPoint=$1
-        cat /proc/mounts \\
-        | grep -v '^rootfs' \\
-        | grep \"^[^ ]\\+ \\+$mountPoint \\+\" \\
-        | sed 's|^\\([^ ]\\+\\).*|\\1|'
-    }
-
-    # Unmount file systems.  We repeat this until no more file systems
-    # can be unmounted.  This is to handle loopback devices, file
-    # systems  mounted on other file systems and so on.
-    tryAgain=1
-    while test -n \"$tryAgain\"; do
-        tryAgain=
-
-        for mp in $(getMountPoints); do
-            device=$(getDevice $mp)
-            echo \"unmounting $mp...\"
-            if umount -f -n \"$mp\"; then
-                if test \"$mp\" != /; then tryAgain=1; fi
-            else
-                mount -n -o remount,ro \"$mp\" || true
-            fi
-
-            # Hack: work around a bug in mount (mount -o remount on a
-            # loop device forgets the loop=/dev/loopN entry in
-            # /etc/mtab).
-            if echo \"$device\" | grep -q '/dev/loop'; then
-                echo \"removing loop device $device...\"
-                losetup -d \"$device\" || true
-            fi
-        done
-    done
-
-    cat /proc/mounts
-
-
-    # Final sync.
-    sync || true
-
-
-    # Right now all events above power off the system.
-    if test ${event} = reboot; then
-        exec reboot -f
-    else
-        exec halt -f -p
-    fi
-
-end script
-  ";
-  
+{
+  services = {
+    extraJobs = map jobFun ["reboot" "halt" "system-halt" "power-off"];
+  };
 }
-- 
GitLab


From 321763dd84a8e701e384383428e26db6d9beb31f Mon Sep 17 00:00:00 2001
From: Marc Weber <marco-oweber@gmx.de>
Date: Fri, 6 Mar 2009 12:27:50 +0000
Subject: [PATCH 1304/5331] Convert "ifplugd" (interfaceMonitor)

svn path=/nixos/branches/fix-style/; revision=14408
---
 system/options.nix       | 24 +-------------
 upstart-jobs/default.nix |  7 ----
 upstart-jobs/ifplugd.nix | 69 ++++++++++++++++++++++++++++++++--------
 3 files changed, 57 insertions(+), 43 deletions(-)

diff --git a/system/options.nix b/system/options.nix
index fdb224b6788..53a3d11d7f6 100644
--- a/system/options.nix
+++ b/system/options.nix
@@ -245,29 +245,6 @@ in
       ";
     };
 
-    interfaceMonitor = {
-
-      enable = mkOption {
-        default = false;
-        description = "
-          If <literal>true</literal>, monitor Ethernet interfaces for
-          cables being plugged in or unplugged.  When this occurs, the
-          <command>dhclient</command> service is restarted to
-          automatically obtain a new IP address.  This is useful for
-          roaming users (laptops).
-        ";
-      };
-
-      beep = mkOption {
-        default = false;
-        description = "
-          If <literal>true</literal>, beep when an Ethernet cable is
-          plugged in or unplugged.
-        ";
-      };
-
-    };
-
     defaultMailServer = {
 
       directDelivery = mkOption {
@@ -428,6 +405,7 @@ in
     (import ../upstart-jobs/maintenance-shell.nix) # Handles the maintenance/stalled event (single-user shell).
     (import ../upstart-jobs/ctrl-alt-delete.nix) # Ctrl-alt-delete action.
     (import ../upstart-jobs/halt.nix) # FIXME (assertion) # Handles the reboot/halt events.
+    (import ../upstart-jobs/ifplugd.nix) # ifplugd daemon for monitoring Ethernet cables.
 
 
     # security
diff --git a/upstart-jobs/default.nix b/upstart-jobs/default.nix
index 85c5622bf4d..57f0006eb8a 100644
--- a/upstart-jobs/default.nix
+++ b/upstart-jobs/default.nix
@@ -70,13 +70,6 @@ let
 
   jobs = map makeJob []
 
-  # ifplugd daemon for monitoring Ethernet cables.
-  ++ optional config.networking.interfaceMonitor.enable
-    (import ../upstart-jobs/ifplugd.nix {
-      inherit (pkgs) ifplugd writeScript bash;
-      inherit config;
-    })
-
   # User-defined events.
   ++ (map makeJob (config.services.extraJobs));
 
diff --git a/upstart-jobs/ifplugd.nix b/upstart-jobs/ifplugd.nix
index 4536ee8b41e..c1b9c4e5620 100644
--- a/upstart-jobs/ifplugd.nix
+++ b/upstart-jobs/ifplugd.nix
@@ -1,6 +1,41 @@
-{ifplugd, config, writeScript, bash}:
+{pkgs, config, ...}:
 
+###### interface
 let
+  inherit (pkgs.lib) mkOption mkIf;
+
+  options = {
+    networking = {
+      interfaceMonitor = {
+
+        enable = mkOption {
+          default = false;
+          description = "
+            If <literal>true</literal>, monitor Ethernet interfaces for
+            cables being plugged in or unplugged.  When this occurs, the
+            <command>dhclient</command> service is restarted to
+            automatically obtain a new IP address.  This is useful for
+            roaming users (laptops).
+          ";
+        };
+
+        beep = mkOption {
+          default = false;
+          description = "
+            If <literal>true</literal>, beep when an Ethernet cable is
+            plugged in or unplugged.
+          ";
+        };
+      };
+    };
+  };
+in
+
+###### implementation
+
+let
+
+  inherit (pkgs) ifplugd writeScript bash;
 
   # The ifplugd action script, which is called whenever the link
   # status changes (i.e., a cable is plugged in or unplugged).  We do
@@ -17,19 +52,27 @@ let
 
 in 
 
-{
-  name = "ifplugd";
+mkIf config.networking.interfaceMonitor.enable {
+  require = [
+    options
+  ];
+
+  services = {
+    extraJobs = [{
+      name = "ifplugd";
 
-  extraPath = [ifplugd];
-  
-  job = "
-description \"Network interface connectivity monitor\"
+      extraPath = [ifplugd];
+      
+      job = ''
+        description "Network interface connectivity monitor"
 
-start on network-interfaces/started
-stop on network-interfaces/stop
+        start on network-interfaces/started
+        stop on network-interfaces/stop
 
-respawn ${ifplugd}/sbin/ifplugd --no-daemon --no-startup --no-shutdown \\
-    ${if config.networking.interfaceMonitor.beep then "" else "--no-beep"} \\
-    --run ${plugScript}";
-  
+        respawn ${ifplugd}/sbin/ifplugd --no-daemon --no-startup --no-shutdown \
+            ${if config.networking.interfaceMonitor.beep then "" else "--no-beep"} \
+            --run ${plugScript}
+      '';
+    }];
+  };
 }
-- 
GitLab


From 8d3ee677d57588ff200e5d889d5f32572b4d7f82 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 6 Mar 2009 13:53:19 +0000
Subject: [PATCH 1305/5331] svn path=/nixos/trunk/; revision=14411

---
 doc/manual/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/manual/default.nix b/doc/manual/default.nix
index c46e89d0fa1..4f1e555583d 100644
--- a/doc/manual/default.nix
+++ b/doc/manual/default.nix
@@ -41,7 +41,7 @@ let
         ./manual.xml
       cp ${./style.css} $out/style.css
       ensureDir $out/nix-support
-      echo "doc manual $out" >> $out/nix-support/hydra-build-products
+      echo "doc manual $out manual.html" >> $out/nix-support/hydra-build-products
     '';
   };
 
-- 
GitLab


From 88fd4080b29e03c869fae838f59f81c72d40a57c Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 6 Mar 2009 14:11:05 +0000
Subject: [PATCH 1306/5331] * Include the version in the name attribute.

svn path=/nixos/trunk/; revision=14413
---
 release.nix | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/release.nix b/release.nix
index d291e21b8dd..24b70478748 100644
--- a/release.nix
+++ b/release.nix
@@ -14,11 +14,15 @@ let
 
       releaseTools.makeSourceTarball {
         name = "nixos-tarball";
+        
+        version = builtins.readFile ./VERSION;
+        
         src = nixosSrc;
+        
         inherit officialRelease;
 
         distPhase = ''
-          releaseName=nixos-$(cat $src/VERSION)$VERSION_SUFFIX
+          releaseName=nixos-$VERSION
           ensureDir "$out/tarballs"
           mkdir ../$releaseName
           cp -prd . ../$releaseName
@@ -50,16 +54,18 @@ let
 
       let
 
+        version = builtins.readFile ./VERSION + (if officialRelease then "" else "pre${toString nixosSrc.rev}");
+
         iso = (import "${nixosSrc.path}/installer/cd-dvd/rescue-cd.nix" {
           platform = system;
           compressImage = true;
           nixpkgsPath = nixpkgs.path;
-          relName = "nixos-${builtins.readFile ./VERSION}${if !officialRelease then "pre${toString nixosSrc.rev}" else ""}";
+          relName = "nixos-${version}";
         }).rescueCD;
 
       in
         # Declare the ISO as a build product so that it shows up in Hydra.
-        runCommand "nixos-iso"
+        runCommand "nixos-iso-${version}"
           { meta = {
               description = "NixOS installation CD ISO image for ${system}";
             };
-- 
GitLab


From 2ec60d4023dce9edfe6e93d7f742c54bcdf65448 Mon Sep 17 00:00:00 2001
From: Nicolas Pierron <nicolas.b.pierron@gmail.com>
Date: Sat, 7 Mar 2009 18:01:04 +0000
Subject: [PATCH 1307/5331] * Add support for the Cirrus driver.  This is
 useful in QEMU/KVM   because it emulates a Cirrus card.

 Author:    eelco @ rev 14227

svn path=/nixos/branches/fix-style/; revision=14439
---
 upstart-jobs/xserver/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/upstart-jobs/xserver/default.nix b/upstart-jobs/xserver/default.nix
index 501597c12f2..5e0e227887d 100644
--- a/upstart-jobs/xserver/default.nix
+++ b/upstart-jobs/xserver/default.nix
@@ -298,6 +298,7 @@ let
     nv =    { modules = [xorg.xf86videonv]; };
     ati =   { modules = [xorg.xf86videoati]; };
     via =   { modules = [xorg.xf86videovia]; };
+    cirrus = { modules = [xorg.xf86videocirrus]; };
   };
 
   # Get a bunch of user settings.
-- 
GitLab


From c69348cd0737af745c79f1974897b8e2b3d182d9 Mon Sep 17 00:00:00 2001
From: Nicolas Pierron <nicolas.b.pierron@gmail.com>
Date: Sat, 7 Mar 2009 18:01:12 +0000
Subject: [PATCH 1308/5331] Automated install is once more succesful

 Author:    raskin @ rev 14229

svn path=/nixos/branches/fix-style/; revision=14440
---
 installer/cd-dvd/remote-install-scripts/install-script.sh | 2 +-
 installer/cd-dvd/remote-install-scripts/install-test.sh   | 2 +-
 installer/cd-dvd/rescue-cd-configurable.nix               | 6 +++---
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/installer/cd-dvd/remote-install-scripts/install-script.sh b/installer/cd-dvd/remote-install-scripts/install-script.sh
index fbacf6ff6a5..574cdb40a22 100755
--- a/installer/cd-dvd/remote-install-scripts/install-script.sh
+++ b/installer/cd-dvd/remote-install-scripts/install-script.sh
@@ -14,7 +14,7 @@ mkdir -p /mnt/etc/nixos
 
 cat > /mnt/etc/nixos/configuration.nix <<EOF
 
-pkgs: full_configuration: {
+{pkgs, config, ...}: {
   boot = {
     grubDevice = "/dev/sda";
     copyKernels = true;
diff --git a/installer/cd-dvd/remote-install-scripts/install-test.sh b/installer/cd-dvd/remote-install-scripts/install-test.sh
index b9c135b8865..8b68c6a3bb1 100755
--- a/installer/cd-dvd/remote-install-scripts/install-test.sh
+++ b/installer/cd-dvd/remote-install-scripts/install-test.sh
@@ -17,7 +17,7 @@ set -x
 echo "Installation starting.." > report
 
 nix-build -o socat /etc/nixos/nixpkgs -A socat || { echo "Failed to build socat" >&2 ;  exit 2; };
-nix-build -o qemu /etc/nixos/nixpkgs -A qemu || { echo "Failed to build qemu" >&2 ;  exit 2; };
+nix-build -o qemu /etc/nixos/nixpkgs -A ${QEMU_PACKAGE:-qemu} || { echo "Failed to build qemu" >&2 ;  exit 2; };
 
 echo "reboot" | ./socat/bin/socat tcp-listen:4424 stdio >> report &  
 
diff --git a/installer/cd-dvd/rescue-cd-configurable.nix b/installer/cd-dvd/rescue-cd-configurable.nix
index e727d2d1f2d..f021c19b63b 100644
--- a/installer/cd-dvd/rescue-cd-configurable.nix
+++ b/installer/cd-dvd/rescue-cd-configurable.nix
@@ -137,7 +137,7 @@ rec {
 
   nixpkgsRel = "nixpkgs" + (if networkNixpkgs != "" then "-" + networkNixpkgs else "");
  
-  configuration = pkgs: final_configuration: let preConfiguration ={
+  configuration = {pkgs, config, ...}: let preConfiguration ={
     boot = {
       isLiveCD = true;
       # The label used to identify the installation CD.
@@ -164,8 +164,8 @@ rec {
 
       udev = {
         addFirmware = []
-	  ++ (pkgs.lib.optional intel3945FWEnable pkgs.iwlwifi3945ucode)
-	  ++ (pkgs.lib.optional intel4965FWEnable pkgs.iwlwifi4965ucode)
+	  #++ (pkgs.lib.optional intel3945FWEnable pkgs.iwlwifi3945ucode)
+	  #++ (pkgs.lib.optional intel4965FWEnable pkgs.iwlwifi4965ucode)
 	  ;
       };
    
-- 
GitLab


From 119fff4c4c5f1777c63a2deb739aa45bd0c51548 Mon Sep 17 00:00:00 2001
From: Nicolas Pierron <nicolas.b.pierron@gmail.com>
Date: Sat, 7 Mar 2009 18:01:17 +0000
Subject: [PATCH 1309/5331] portmap: Add options.

 Author:    ludo @ rev 14233

svn path=/nixos/branches/fix-style/; revision=14441
---
 upstart-jobs/portmap.nix | 23 +++++++++++++++++++++--
 1 file changed, 21 insertions(+), 2 deletions(-)

diff --git a/upstart-jobs/portmap.nix b/upstart-jobs/portmap.nix
index 0c3368545c2..d0978952820 100644
--- a/upstart-jobs/portmap.nix
+++ b/upstart-jobs/portmap.nix
@@ -15,6 +15,21 @@ let
             using the rpcinfo(1) command.
           '';
         };
+
+        verbose = mkOption {
+          default = false;
+          description = ''
+            Whether to enable verbose output.
+          '';
+        };
+
+        chroot = mkOption {
+          default = "/var/empty";
+          description = ''
+            If non-empty, a path to change root to.
+          '';
+        };
+
       };
     };
   };
@@ -63,8 +78,12 @@ mkIf config.services.portmap.enable {
           start on network-interfaces/started
           stop on network-interfaces/stop
 
-          respawn ${portmap}/sbin/portmap
-          '';
+          respawn ${portmap}/sbin/portmap \
+            ${if config.services.portmap.chroot == ""
+              then ""
+              else "-t \"${config.services.portmap.chroot}\""} \
+            ${if config.services.portmap.verbose then "-v" else ""}
+        '';
     }];
   };
 }
-- 
GitLab


From 221680936e8ea9687b60c7687c624cecbda11c55 Mon Sep 17 00:00:00 2001
From: Nicolas Pierron <nicolas.b.pierron@gmail.com>
Date: Sat, 7 Mar 2009 18:01:22 +0000
Subject: [PATCH 1310/5331] Updating LiveDVD with X expressions

 Author:    raskin @ rev 14251

svn path=/nixos/branches/fix-style/; revision=14442
---
 installer/cd-dvd/live-dvd-X-medium.nix  | 26 ++++++++++-----------
 installer/cd-dvd/live-dvd-X-no-soft.nix | 25 ++++++++++-----------
 installer/cd-dvd/live-dvd-X.nix         | 30 ++++++++++++-------------
 3 files changed, 40 insertions(+), 41 deletions(-)

diff --git a/installer/cd-dvd/live-dvd-X-medium.nix b/installer/cd-dvd/live-dvd-X-medium.nix
index ec0089ded56..db57921b4c5 100644
--- a/installer/cd-dvd/live-dvd-X-medium.nix
+++ b/installer/cd-dvd/live-dvd-X-medium.nix
@@ -22,7 +22,7 @@ let
 in 
 (isoFun (rec {
 	inherit platform;
-	lib = (import ../pkgs/lib);
+	lib = (import ../../pkgs/lib);
 
 	networkNixpkgs = "";
 	manualEnabled = true;
@@ -171,40 +171,40 @@ in
 	configList = configuration : [
 	{
 		suffix = "X-vesa";
-		configuration = (configuration // 
+		configuration = args: ((configuration args) // 
 		{
-			boot=configuration.boot // {configurationName = "X with vesa";};
-			services = configuration.services // {
+			boot=(configuration args).boot // {configurationName = "X with vesa";};
+			services = (configuration args).services // {
 				xserver = xConfiguration // {videoDriver = "vesa";};
 			};
 		});
 	}
 	{
 		suffix = "X-Intel";
-		configuration = (configuration // 
+		configuration = args: ((configuration args) // 
 		{
-			boot=configuration.boot // {configurationName = "X with Intel graphic card";};
-			services = configuration.services // {
+			boot=(configuration args).boot // {configurationName = "X with Intel graphic card";};
+			services = (configuration args).services // {
 				xserver = xConfiguration // {videoDriver = "intel"; driSupport = true;};
 			};
 		});
 	}
 	{
 		suffix = "X-ATI";
-		configuration = (configuration // 
+		configuration = args: ((configuration args) // 
 		{
-			boot=configuration.boot // {configurationName = "X with ATI graphic card";};
-			services = configuration.services // {
+			boot=(configuration args).boot // {configurationName = "X with ATI graphic card";};
+			services = (configuration args).services // {
 				xserver = xConfiguration // {videoDriver = "ati"; driSupport = true;};
 			};
 		});
 	}
         {
                 suffix = "X-NVIDIA";
-                configuration = (configuration //
+		configuration = args: ((configuration args) // 
                 {
-                        boot=configuration.boot // {configurationName = "X with NVIDIA graphic card";};
-                        services = configuration.services // {
+                        boot=(configuration args).boot // {configurationName = "X with NVIDIA graphic card";};
+                        services = (configuration args).services // {
                                 xserver = xConfiguration // {videoDriver = "nvidia"; driSupport = true;};
                         };
                 });
diff --git a/installer/cd-dvd/live-dvd-X-no-soft.nix b/installer/cd-dvd/live-dvd-X-no-soft.nix
index 7111107b675..62ebf683d09 100644
--- a/installer/cd-dvd/live-dvd-X-no-soft.nix
+++ b/installer/cd-dvd/live-dvd-X-no-soft.nix
@@ -18,7 +18,6 @@ let
 	windowManager = "twm";
 	tty = "9";
   };
-  pkgs
 
 in 
 (isoFun {
@@ -80,40 +79,40 @@ in
 	configList = configuration : [
 	{
 		suffix = "X-vesa";
-		configuration = (configuration // 
+		configuration = args: ((configuration args) // 
 		{
-			boot=configuration.boot // {configurationName = "X with vesa";};
-			services = configuration.services // {
+			boot=(configuration args).boot // {configurationName = "X with vesa";};
+			services = (configuration args).services // {
 				xserver = xConfiguration // {videoDriver = "vesa";};
 			};
 		});
 	}
 	{
 		suffix = "X-Intel";
-		configuration = (configuration // 
+		configuration = args: ((configuration args) // 
 		{
-			boot=configuration.boot // {configurationName = "X with Intel graphic card";};
-			services = configuration.services // {
+			boot=(configuration args).boot // {configurationName = "X with Intel graphic card";};
+			services = (configuration args).services // {
 				xserver = xConfiguration // {videoDriver = "intel"; driSupport = true;};
 			};
 		});
 	}
 	{
 		suffix = "X-ATI";
-		configuration = (configuration // 
+		configuration = args: ((configuration args) // 
 		{
-			boot=configuration.boot // {configurationName = "X with ATI graphic card";};
-			services = configuration.services // {
+			boot=(configuration args).boot // {configurationName = "X with ATI graphic card";};
+			services = (configuration args).services // {
 				xserver = xConfiguration // {videoDriver = "ati"; driSupport = true;};
 			};
 		});
 	}
         {
                 suffix = "X-NVIDIA";
-                configuration = (configuration //
+		configuration = args: ((configuration args) // 
                 {
-                        boot=configuration.boot // {configurationName = "X with NVIDIA graphic card";};
-                        services = configuration.services // {
+                        boot=(configuration args).boot // {configurationName = "X with NVIDIA graphic card";};
+                        services = (configuration args).services // {
                                 xserver = xConfiguration // {videoDriver = "nvidia"; driSupport = true;};
                         };
                 });
diff --git a/installer/cd-dvd/live-dvd-X.nix b/installer/cd-dvd/live-dvd-X.nix
index e9b3c2df2eb..c98b398a9af 100644
--- a/installer/cd-dvd/live-dvd-X.nix
+++ b/installer/cd-dvd/live-dvd-X.nix
@@ -20,9 +20,9 @@ let
   };
 
 in 
-(isoFun {
+(isoFun (rec {
 	inherit platform;
-	lib = (import ../pkgs/lib);
+	lib = (import ../../pkgs/lib);
 
 	networkNixpkgs = "";
 	manualEnabled = true;
@@ -182,43 +182,43 @@ in
 	configList = configuration : [
 	{
 		suffix = "X-vesa";
-		configuration = (configuration // 
+		configuration = args: ((configuration args) // 
 		{
-			boot=configuration.boot // {configurationName = "X with vesa";};
-			services = configuration.services // {
+			boot=(configuration args).boot // {configurationName = "X with vesa";};
+			services = (configuration args).services // {
 				xserver = xConfiguration // {videoDriver = "vesa";};
 			};
 		});
 	}
 	{
 		suffix = "X-Intel";
-		configuration = (configuration // 
+		configuration = args: ((configuration args) // 
 		{
-			boot=configuration.boot // {configurationName = "X with Intel graphic card";};
-			services = configuration.services // {
+			boot=(configuration args).boot // {configurationName = "X with Intel graphic card";};
+			services = (configuration args).services // {
 				xserver = xConfiguration // {videoDriver = "intel"; driSupport = true;};
 			};
 		});
 	}
 	{
 		suffix = "X-ATI";
-		configuration = (configuration // 
+		configuration = args: ((configuration args) // 
 		{
-			boot=configuration.boot // {configurationName = "X with ATI graphic card";};
-			services = configuration.services // {
+			boot=(configuration args).boot // {configurationName = "X with ATI graphic card";};
+			services = (configuration args).services // {
 				xserver = xConfiguration // {videoDriver = "ati"; driSupport = true;};
 			};
 		});
 	}
         {
                 suffix = "X-NVIDIA";
-                configuration = (configuration //
+		configuration = args: ((configuration args) // 
                 {
-                        boot=configuration.boot // {configurationName = "X with NVIDIA graphic card";};
-                        services = configuration.services // {
+                        boot=(configuration args).boot // {configurationName = "X with NVIDIA graphic card";};
+                        services = (configuration args).services // {
                                 xserver = xConfiguration // {videoDriver = "nvidia"; driSupport = true;};
                         };
                 });
         }
 	];
-}).rescueCD
+})).rescueCD
-- 
GitLab


From 08f32ca62a14a9da87a0a085860b436c70e071ea Mon Sep 17 00:00:00 2001
From: Nicolas Pierron <nicolas.b.pierron@gmail.com>
Date: Sat, 7 Mar 2009 18:01:26 +0000
Subject: [PATCH 1311/5331] * Make nix-channel and nix-env work when chroots
 are enabled.

 Author:    eelco @ rev 14271

svn path=/nixos/branches/fix-style/; revision=14443
---
 upstart-jobs/nix.nix | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/upstart-jobs/nix.nix b/upstart-jobs/nix.nix
index c46b721a2a0..61ddbfbe80f 100644
--- a/upstart-jobs/nix.nix
+++ b/upstart-jobs/nix.nix
@@ -190,16 +190,22 @@ in
             # other paths in the store, we need the closure of /bin/sh
             # in `build-chroot-dirs' - otherwise any builder that uses
             # /bin/sh won't work.
-            refs = pkgs.writeReferencesToFile binsh;
+            binshDeps = pkgs.writeReferencesToFile binsh;
+  
+            # Likewise, if chroots are turned on, we need Nix's own
+            # closure in the chroot.  Otherwise nix-channel and nix-env
+            # won't work because the dependencies of its builders (like
+            # coreutils and Perl) aren't visible.  Sigh.
+            nixDeps = pkgs.writeReferencesToFile config.environment.nix;
           in 
             pkgs.runCommand "nix.conf" {} ''
-              binshDeps=$(for i in $(cat ${refs}); do if test -d $i; then echo $i; fi; done)
+              extraPaths=$(for i in $(cat ${binshDeps} ${nixDeps}); do if test -d $i; then echo $i; fi; done)
               cat > $out <<END
               # WARNING: this file is generated.
               build-users-group = nixbld
               build-max-jobs = ${toString (config.nix.maxJobs)}
               build-use-chroot = ${if config.nix.useChroot then "true" else "false"}
-              build-chroot-dirs = /dev /dev/pts /proc /bin $(echo $binshDeps)
+              build-chroot-dirs = /dev /dev/pts /proc /bin $(echo $extraPaths)
               ${config.nix.extraOptions}
               END
             '';
-- 
GitLab


From 6013de33f866083d87bc93e3905867accb111f15 Mon Sep 17 00:00:00 2001
From: Nicolas Pierron <nicolas.b.pierron@gmail.com>
Date: Sat, 7 Mar 2009 18:01:33 +0000
Subject: [PATCH 1312/5331] * Need gzip in the Nix daemon's PATH.  Forgot to
 commit this.

 Author:    eelco @ rev 14274

svn path=/nixos/branches/fix-style/; revision=14444
---
 upstart-jobs/nix-daemon.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/upstart-jobs/nix-daemon.nix b/upstart-jobs/nix-daemon.nix
index 553c1c93533..939539a42f9 100644
--- a/upstart-jobs/nix-daemon.nix
+++ b/upstart-jobs/nix-daemon.nix
@@ -8,9 +8,9 @@
     stop on shutdown
     respawn
     script
-      export PATH=${if config.nix.distributedBuilds then "${pkgs.openssh}/bin:" else ""}${pkgs.openssl}/bin:${nix}/bin:$PATH
+      export PATH=${if config.nix.distributedBuilds then "${pkgs.openssh}/bin:${pkgs.gzip}/bin:" else ""}${pkgs.openssl}/bin:${nix}/bin:$PATH
       ${nixEnvVars}
-      exec ${nix}/bin/nix-worker --daemon > /dev/null 2>&1
+      exec nice -10 ${nix}/bin/nix-worker --daemon > /dev/null 2>&1
     end script
   ";
 
-- 
GitLab


From 02ed3f12ed65b73ec7b738d85ecb6a11e12a9440 Mon Sep 17 00:00:00 2001
From: Nicolas Pierron <nicolas.b.pierron@gmail.com>
Date: Sat, 7 Mar 2009 18:01:38 +0000
Subject: [PATCH 1313/5331] * Support special characters in
 config.nix.extraOptions.

 Author:    eelco @ rev 14278

svn path=/nixos/branches/fix-style/; revision=14445
---
 upstart-jobs/nix.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/upstart-jobs/nix.nix b/upstart-jobs/nix.nix
index 61ddbfbe80f..8b43036485e 100644
--- a/upstart-jobs/nix.nix
+++ b/upstart-jobs/nix.nix
@@ -198,7 +198,7 @@ in
             # coreutils and Perl) aren't visible.  Sigh.
             nixDeps = pkgs.writeReferencesToFile config.environment.nix;
           in 
-            pkgs.runCommand "nix.conf" {} ''
+            pkgs.runCommand "nix.conf" {extraOptions = config.nix.extraOptions; } ''
               extraPaths=$(for i in $(cat ${binshDeps} ${nixDeps}); do if test -d $i; then echo $i; fi; done)
               cat > $out <<END
               # WARNING: this file is generated.
@@ -206,7 +206,7 @@ in
               build-max-jobs = ${toString (config.nix.maxJobs)}
               build-use-chroot = ${if config.nix.useChroot then "true" else "false"}
               build-chroot-dirs = /dev /dev/pts /proc /bin $(echo $extraPaths)
-              ${config.nix.extraOptions}
+              $extraOptions
               END
             '';
         target = "nix.conf"; # will be symlinked from /nix/etc/nix/nix.conf in activate-configuration.sh.
-- 
GitLab


From c887a5be1ed12380f12920146d0e188d77d93a7a Mon Sep 17 00:00:00 2001
From: Nicolas Pierron <nicolas.b.pierron@gmail.com>
Date: Sat, 7 Mar 2009 18:01:42 +0000
Subject: [PATCH 1314/5331] Fixing vsftpd without anonymous users, adding
 localUsers, and creating chroot path.

 Author:    viric @ rev 14286

svn path=/nixos/branches/fix-style/; revision=14446
---
 upstart-jobs/vsftpd.nix | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/upstart-jobs/vsftpd.nix b/upstart-jobs/vsftpd.nix
index 22d11eab51b..1cbd2ac092b 100644
--- a/upstart-jobs/vsftpd.nix
+++ b/upstart-jobs/vsftpd.nix
@@ -20,6 +20,13 @@ let
             Whether to enable the anonymous FTP user.
           ";
         };
+ 
+        localUsers = mkOption {
+          default = false;
+          description = "
+            Whether to enable FTP for the local users.
+          ";
+        };
 
         writeEnable = mkOption {
           default = false;
@@ -50,7 +57,7 @@ in
 
 let 
 
-  inherit (config.services.vsftpd) anonymousUser writeEnable anonymousUploadEnable anonymousMkdirEnable;
+  inherit (config.services.vsftpd) anonymousUser localUsers writeEnable anonymousUploadEnable anonymousMkdirEnable;
   inherit (pkgs) vsftpd;
 
   yesNoOption = p : name :
@@ -99,6 +106,7 @@ mkIf config.services.vsftpd.enable {
         start script
         cat > /etc/vsftpd.conf <<EOF
         ${yesNoOption anonymousUser "anonymous_enable"}
+        ${yesNoOption localUsers "local_enable"}
         ${yesNoOption writeEnable "write_enable"}
         ${yesNoOption anonymousUploadEnable "anon_upload_enable"}
         ${yesNoOption anonymousMkdirEnable "anon_mkdir_write_enable"}
-- 
GitLab


From 5dbb38cdec9aa4433176ff4f6e0557fac4103a38 Mon Sep 17 00:00:00 2001
From: Nicolas Pierron <nicolas.b.pierron@gmail.com>
Date: Sat, 7 Mar 2009 18:01:47 +0000
Subject: [PATCH 1315/5331] Adding the ftp pam service, for vsftpd.

 Author:    viric @ rev 14287

svn path=/nixos/branches/fix-style/; revision=14447
---
 etc/default.nix | 1 +
 etc/pam.d/ftp   | 4 ++++
 2 files changed, 5 insertions(+)
 create mode 100644 etc/pam.d/ftp

diff --git a/etc/default.nix b/etc/default.nix
index 8579b334e67..b396437c17c 100644
--- a/etc/default.nix
+++ b/etc/default.nix
@@ -191,6 +191,7 @@ let
       "chsh"
       "xlock"
       "cups"
+      "ftp"
       "common"
       "common-console" # shared stuff for interactive local sessions
     ]
diff --git a/etc/pam.d/ftp b/etc/pam.d/ftp
new file mode 100644
index 00000000000..50f3cc5ce60
--- /dev/null
+++ b/etc/pam.d/ftp
@@ -0,0 +1,4 @@
+auth     include        common
+account  include        common
+password include        common
+session  include        common
-- 
GitLab


From e05e4b6bcacf8a9642bf8d306babd3c082513eb2 Mon Sep 17 00:00:00 2001
From: Nicolas Pierron <nicolas.b.pierron@gmail.com>
Date: Sat, 7 Mar 2009 18:01:51 +0000
Subject: [PATCH 1316/5331]  Author:    eelco @ rev 14411

svn path=/nixos/branches/fix-style/; revision=14448
---
 doc/manual/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/manual/default.nix b/doc/manual/default.nix
index c46e89d0fa1..4f1e555583d 100644
--- a/doc/manual/default.nix
+++ b/doc/manual/default.nix
@@ -41,7 +41,7 @@ let
         ./manual.xml
       cp ${./style.css} $out/style.css
       ensureDir $out/nix-support
-      echo "doc manual $out" >> $out/nix-support/hydra-build-products
+      echo "doc manual $out manual.html" >> $out/nix-support/hydra-build-products
     '';
   };
 
-- 
GitLab


From 0a010e671a3663c2235a92a94cd47361a215f6ef Mon Sep 17 00:00:00 2001
From: Nicolas Pierron <nicolas.b.pierron@gmail.com>
Date: Sat, 7 Mar 2009 18:01:55 +0000
Subject: [PATCH 1317/5331] * Include the version in the name attribute.

 Author:    eelco @ rev 14413

svn path=/nixos/branches/fix-style/; revision=14449
---
 release.nix | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/release.nix b/release.nix
index d291e21b8dd..24b70478748 100644
--- a/release.nix
+++ b/release.nix
@@ -14,11 +14,15 @@ let
 
       releaseTools.makeSourceTarball {
         name = "nixos-tarball";
+        
+        version = builtins.readFile ./VERSION;
+        
         src = nixosSrc;
+        
         inherit officialRelease;
 
         distPhase = ''
-          releaseName=nixos-$(cat $src/VERSION)$VERSION_SUFFIX
+          releaseName=nixos-$VERSION
           ensureDir "$out/tarballs"
           mkdir ../$releaseName
           cp -prd . ../$releaseName
@@ -50,16 +54,18 @@ let
 
       let
 
+        version = builtins.readFile ./VERSION + (if officialRelease then "" else "pre${toString nixosSrc.rev}");
+
         iso = (import "${nixosSrc.path}/installer/cd-dvd/rescue-cd.nix" {
           platform = system;
           compressImage = true;
           nixpkgsPath = nixpkgs.path;
-          relName = "nixos-${builtins.readFile ./VERSION}${if !officialRelease then "pre${toString nixosSrc.rev}" else ""}";
+          relName = "nixos-${version}";
         }).rescueCD;
 
       in
         # Declare the ISO as a build product so that it shows up in Hydra.
-        runCommand "nixos-iso"
+        runCommand "nixos-iso-${version}"
           { meta = {
               description = "NixOS installation CD ISO image for ${system}";
             };
-- 
GitLab


From aeba0af8dd6ced7a2da7e778a28e3d7d627cada1 Mon Sep 17 00:00:00 2001
From: Marc Weber <marco-oweber@gmx.de>
Date: Mon, 9 Mar 2009 19:18:27 +0000
Subject: [PATCH 1318/5331] Allow specifying [] as filesystem option because
 you don't need any on vservers You still get a warning when not setting the
 value so that you can't forget it.

svn path=/nixos/branches/fix-style/; revision=14477
---
 boot/boot-stage-1.nix | 2 +-
 system/options.nix    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/boot/boot-stage-1.nix b/boot/boot-stage-1.nix
index 7b7f5503d0b..46d4a52c6c9 100644
--- a/boot/boot-stage-1.nix
+++ b/boot/boot-stage-1.nix
@@ -148,7 +148,7 @@ rec {
 
     # !!! copy&pasted from upstart-jobs/filesystems.nix.
     mountPoints =
-      if fileSystems == []
+      if fileSystems == null
       then abort "You must specify the fileSystems option!"
       else map (fs: fs.mountPoint) fileSystems;
     devices = map (fs: if fs ? device then fs.device else "/dev/disk/by-label/${fs.label}") fileSystems;
diff --git a/system/options.nix b/system/options.nix
index 53a3d11d7f6..68cad69d0d7 100644
--- a/system/options.nix
+++ b/system/options.nix
@@ -303,7 +303,7 @@ in
 
 
   fileSystems = mkOption {
-    default = [];
+    default = null;
     example = [
       { mountPoint = "/";
         device = "/dev/hda1";
-- 
GitLab


From 1e947b7acd158357d33e5e5a6a951b837465ba37 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 9 Mar 2009 21:10:53 +0000
Subject: [PATCH 1319/5331] svn path=/nixos/trunk/; revision=14478

---
 release.nix | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/release.nix b/release.nix
index 24b70478748..4d6ee916b1c 100644
--- a/release.nix
+++ b/release.nix
@@ -1,3 +1,5 @@
+{ nixpkgs ? ../nixpkgs-wc }:
+
 let 
 
 
@@ -5,12 +7,11 @@ let
 
 
     tarball =
-      { nixosSrc ? {path = ./.; rev = 1234;}
-      , nixpkgs ? {path = ../nixpkgs-wc;}
+      { nixosSrc ? {outPath = ./.; rev = 1234;}
       , officialRelease ? false
       }:
 
-      with import nixpkgs.path {};
+      with import nixpkgs {};
 
       releaseTools.makeSourceTarball {
         name = "nixos-tarball";
@@ -34,23 +35,21 @@ let
 
     manual =
       { nixosSrc ? {path = ./.; rev = 1234;}
-      , nixpkgs ? {path = ../nixpkgs-wc;}
       , officialRelease ? false
       }:
 
       import "${nixosSrc.path}/doc/manual" {
-        nixpkgsPath = nixpkgs.path;
+        nixpkgsPath = nixpkgs.outPath;
       };
 
 
     iso = 
       { nixosSrc ? {path = ./.; rev = 1234;}
-      , nixpkgs ? {path = ../nixpkgs-wc;}
       , officialRelease ? false
       , system ? "i686-linux"
       }:
 
-      with import nixpkgs.path {inherit system;};
+      with import nixpkgs {inherit system;};
 
       let
 
@@ -59,7 +58,7 @@ let
         iso = (import "${nixosSrc.path}/installer/cd-dvd/rescue-cd.nix" {
           platform = system;
           compressImage = true;
-          nixpkgsPath = nixpkgs.path;
+          nixpkgsPath = nixpkgs.outPath;
           relName = "nixos-${version}";
         }).rescueCD;
 
-- 
GitLab


From 39611b983a3c5645f26dfcbaa5f456cf0409b9ba Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 9 Mar 2009 21:11:17 +0000
Subject: [PATCH 1320/5331] svn path=/nixos/trunk/; revision=14479

---
 release.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/release.nix b/release.nix
index 4d6ee916b1c..85aa69e78ea 100644
--- a/release.nix
+++ b/release.nix
@@ -38,7 +38,7 @@ let
       , officialRelease ? false
       }:
 
-      import "${nixosSrc.path}/doc/manual" {
+      import "${nixosSrc}/doc/manual" {
         nixpkgsPath = nixpkgs.outPath;
       };
 
@@ -55,7 +55,7 @@ let
 
         version = builtins.readFile ./VERSION + (if officialRelease then "" else "pre${toString nixosSrc.rev}");
 
-        iso = (import "${nixosSrc.path}/installer/cd-dvd/rescue-cd.nix" {
+        iso = (import "${nixosSrc}/installer/cd-dvd/rescue-cd.nix" {
           platform = system;
           compressImage = true;
           nixpkgsPath = nixpkgs.outPath;
-- 
GitLab


From 65edbcdb9010536ea13f85f2a39fa3c6322ba2e5 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 9 Mar 2009 21:12:46 +0000
Subject: [PATCH 1321/5331] svn path=/nixos/trunk/; revision=14480

---
 release.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/release.nix b/release.nix
index 85aa69e78ea..bf8d5cc1f5e 100644
--- a/release.nix
+++ b/release.nix
@@ -34,7 +34,7 @@ let
 
 
     manual =
-      { nixosSrc ? {path = ./.; rev = 1234;}
+      { nixosSrc ? {outPath = ./.; rev = 1234;}
       , officialRelease ? false
       }:
 
@@ -44,7 +44,7 @@ let
 
 
     iso = 
-      { nixosSrc ? {path = ./.; rev = 1234;}
+      { nixosSrc ? {outPath = ./.; rev = 1234;}
       , officialRelease ? false
       , system ? "i686-linux"
       }:
-- 
GitLab


From 28567c4565d256556640a47ece2ae83878b36360 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 11 Mar 2009 15:01:13 +0000
Subject: [PATCH 1322/5331] * ntpd: make the drift detection actually work when
 running in a chroot.

svn path=/nixos/trunk/; revision=14506
---
 upstart-jobs/ntpd.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/upstart-jobs/ntpd.nix b/upstart-jobs/ntpd.nix
index 4bfcfe115cb..35a7c2e0035 100644
--- a/upstart-jobs/ntpd.nix
+++ b/upstart-jobs/ntpd.nix
@@ -7,7 +7,9 @@ let
   ntpUser = "ntp";
 
   config = writeText "ntp.conf" ''
-    driftfile ${stateDir}/ntp.drift
+    # Keep the drift file in ${stateDir}/ntp.drift.  However, since we
+    # chroot to ${stateDir}, we have to specify it as /ntp.drift.
+    driftfile /ntp.drift
 
     ${toString (map (server: "server " + server + "\n") servers)}
   '';
-- 
GitLab


From 313c440174c154fbf2258eea4caba7441ab6b685 Mon Sep 17 00:00:00 2001
From: Nicolas Pierron <nicolas.b.pierron@gmail.com>
Date: Sun, 15 Mar 2009 20:05:36 +0000
Subject: [PATCH 1323/5331] Use the nix-daemon provided by the nix version
 install with NixOS.

This remove a dependency on nix-0.12.

svn path=/nixos/branches/fix-style/; revision=14543
---
 upstart-jobs/nix.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/upstart-jobs/nix.nix b/upstart-jobs/nix.nix
index 8b43036485e..ff25c5691ec 100644
--- a/upstart-jobs/nix.nix
+++ b/upstart-jobs/nix.nix
@@ -170,7 +170,7 @@ in
 let 
   binsh = config.system.build.binsh;
   nixEnvVars = config.nix.envVars;
-  inherit (pkgs) nix;
+  inherit (config.environment) nix;
 in
 
 {
-- 
GitLab


From ab4e37d53fdf3cb573454caa29fbd19ba30175e2 Mon Sep 17 00:00:00 2001
From: Nicolas Pierron <nicolas.b.pierron@gmail.com>
Date: Sun, 15 Mar 2009 20:18:36 +0000
Subject: [PATCH 1324/5331] Remove unused file.

svn path=/nixos/branches/fix-style/; revision=14545
---
 upstart-jobs/nix-daemon.nix | 17 -----------------
 1 file changed, 17 deletions(-)
 delete mode 100644 upstart-jobs/nix-daemon.nix

diff --git a/upstart-jobs/nix-daemon.nix b/upstart-jobs/nix-daemon.nix
deleted file mode 100644
index 939539a42f9..00000000000
--- a/upstart-jobs/nix-daemon.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-{config, pkgs, nix, nixEnvVars}:
-
-{
-  name = "nix-daemon";
-  
-  job = "
-    start on startup
-    stop on shutdown
-    respawn
-    script
-      export PATH=${if config.nix.distributedBuilds then "${pkgs.openssh}/bin:${pkgs.gzip}/bin:" else ""}${pkgs.openssl}/bin:${nix}/bin:$PATH
-      ${nixEnvVars}
-      exec nice -10 ${nix}/bin/nix-worker --daemon > /dev/null 2>&1
-    end script
-  ";
-
-}
-- 
GitLab


From 5523326664d9836eae3f861e520e2d1b051cde29 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 17 Mar 2009 11:01:12 +0000
Subject: [PATCH 1325/5331] svn path=/nixos/trunk/; revision=14569

---
 upstart-jobs/apache-httpd/subversion.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/upstart-jobs/apache-httpd/subversion.nix b/upstart-jobs/apache-httpd/subversion.nix
index 5baecc83723..8a48617ee44 100644
--- a/upstart-jobs/apache-httpd/subversion.nix
+++ b/upstart-jobs/apache-httpd/subversion.nix
@@ -19,7 +19,7 @@ let
 
 
   # Build a Subversion instance with Apache modules and Swig/Python bindings.
-  subversion = pkgs.subversion15.function (origArgs: {
+  subversion = pkgs.subversion15.override (origArgs: {
     bdbSupport = true;
     httpServer = true;
     sslSupport = true;
-- 
GitLab


From 3d8df9802dbc44c5833f2dc073a4b1cc02d0364c Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 18 Mar 2009 18:10:38 +0000
Subject: [PATCH 1326/5331] * exportBuildReferencesGraph ->
 exportReferencesGraph.

svn path=/nixos/trunk/; revision=14593
---
 helpers/make-iso9660-image.nix              | 10 +++-----
 installer/cd-dvd/rescue-cd-configurable.nix | 27 +++++++++------------
 2 files changed, 14 insertions(+), 23 deletions(-)

diff --git a/helpers/make-iso9660-image.nix b/helpers/make-iso9660-image.nix
index 0262bc653bb..aef5408107f 100644
--- a/helpers/make-iso9660-image.nix
+++ b/helpers/make-iso9660-image.nix
@@ -11,13 +11,11 @@
 
 , # In addition to `contents', the closure of the store paths listed
   # in `packages' are also placed in the Nix store of the CD.  This is
-  # a list of attribute sets {source, target} where `source' if a
-  # store path whose closure will be copied, and `target' is a symlink
-  # to `source' that will be added to the CD.
+  # a list of attribute sets {object, symlink} where `object' if a
+  # store path whose closure will be copied, and `symlink' is a
+  # symlink to `object' that will be added to the CD.
   storeContents ? []
 
-, buildStoreContents ? []
-
 , # Whether this should be an El-Torito bootable CD.
   bootable ? false
 
@@ -52,7 +50,5 @@ stdenv.mkDerivation {
   # For obtaining the closure of `storeContents'.
   exportReferencesGraph =
     map (x: [("closure-" + baseNameOf x.object) x.object]) storeContents;
-  exportBuildReferencesGraph =
-    map (x: [("closure-build-" + baseNameOf x.object) x.object]) buildStoreContents;
   pathsFromGraph = "${nixpkgsPath}/pkgs/build-support/kernel/paths-from-graph.pl";
 }
diff --git a/installer/cd-dvd/rescue-cd-configurable.nix b/installer/cd-dvd/rescue-cd-configurable.nix
index f021c19b63b..53524ca36c8 100644
--- a/installer/cd-dvd/rescue-cd-configurable.nix
+++ b/installer/cd-dvd/rescue-cd-configurable.nix
@@ -461,22 +461,17 @@ rec {
     };
   
     # Closures to be copied to the Nix store on the CD.
-    storeContents = lib.uniqListExt {
-      inputList= lib.concatLists 
-        (map systemPackInstallClosures systemPacks);
-      getter = x : x.object.drvPath;
-      compare = lib.eqStrings;
-    };
-  
-    buildStoreContents = lib.uniqList 
-    {
-      inputList=([]
-      ++
-      (if includeBuildDeps then lib.concatLists 
-        (map systemPackInstallBuildClosure systemPacks)
-      else [])
-      );
-    };
+    storeContents =
+      lib.uniqListExt {
+        inputList = lib.concatLists 
+          (map systemPackInstallClosures systemPacks);
+        getter = x: x.object.drvPath;
+        compare = lib.eqStrings;
+      }
+      ++ lib.uniqList {
+        inputList = lib.optionals includeBuildDeps
+          (lib.concatLists (map systemPackInstallBuildClosure systemPacks));
+      };
     
     bootable = true;
     bootImage = "boot/grub/stage2_eltorito";
-- 
GitLab


From 7b7a29b201d3f3e51f31d1e5e45f855a06f681de Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 20 Mar 2009 16:17:23 +0000
Subject: [PATCH 1327/5331] * makePortmap -> portmap.override.

svn path=/nixos/trunk/; revision=14632
---
 upstart-jobs/portmap.nix | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/upstart-jobs/portmap.nix b/upstart-jobs/portmap.nix
index 1a8bce11904..f13c7b415da 100644
--- a/upstart-jobs/portmap.nix
+++ b/upstart-jobs/portmap.nix
@@ -3,7 +3,6 @@
 ###### interface
 let
   inherit (pkgs.lib) mkOption mkIf;
-  inherit (pkgs) makePortmap;
 
   uid = (import ../system/ids.nix).uids.portmap;
   gid = (import ../system/ids.nix).gids.portmap;
@@ -68,7 +67,7 @@ mkIf config.services.portmap.enable {
       name = "portmap";
 
       job =
-        let portmap = makePortmap { daemonUID = uid; daemonGID = gid; };
+        let portmap = pkgs.portmap.override { daemonUID = uid; daemonGID = gid; };
         in ''
           description "ONC RPC portmap"
 
-- 
GitLab


From 1220a6da39f43f656de54655870903c6d7b21425 Mon Sep 17 00:00:00 2001
From: Wouter den Breejen <uu@denbreejen.net>
Date: Sun, 22 Mar 2009 15:32:09 +0000
Subject: [PATCH 1328/5331] vsftpd userlist options added

svn path=/nixos/trunk/; revision=14648
---
 upstart-jobs/default.nix |  3 ++-
 upstart-jobs/smb.conf    | 13 ++++++++++---
 upstart-jobs/vsftpd.nix  | 22 ++++++++++++++++++++++
 3 files changed, 34 insertions(+), 4 deletions(-)

diff --git a/upstart-jobs/default.nix b/upstart-jobs/default.nix
index 4569a9ff1ab..0f479e40638 100644
--- a/upstart-jobs/default.nix
+++ b/upstart-jobs/default.nix
@@ -309,7 +309,8 @@ let
     (import ../upstart-jobs/vsftpd.nix {
       inherit (pkgs) vsftpd;
       inherit (config.services.vsftpd) anonymousUser localUsers
-        writeEnable anonymousUploadEnable anonymousMkdirEnable;
+        writeEnable anonymousUploadEnable anonymousMkdirEnable
+        chrootlocaluser userlistenable userlistdeny;
     })
 
   # X Font Server
diff --git a/upstart-jobs/smb.conf b/upstart-jobs/smb.conf
index 69d5b41f706..d8e9e5797f8 100644
--- a/upstart-jobs/smb.conf
+++ b/upstart-jobs/smb.conf
@@ -4,7 +4,14 @@
   server string = %h
   comment = Samba
   local master = no
-[default]
-  path = /home/smbd
+
+#[default]
+#  path = /home/smbd
+#  read only = no
+#  guest ok = yes
+
+[raidbackup]
+  path = /home/raidbackup
   read only = no
-  guest ok = yes
+  guest ok = no
+
diff --git a/upstart-jobs/vsftpd.nix b/upstart-jobs/vsftpd.nix
index f24ae049026..43dddd8d544 100644
--- a/upstart-jobs/vsftpd.nix
+++ b/upstart-jobs/vsftpd.nix
@@ -1,5 +1,6 @@
 { vsftpd, anonymousUser, localUsers
 , anonymousUploadEnable, anonymousMkdirEnable, writeEnable
+, chrootlocaluser, userlistenable, userlistdeny
 }:
 
 {
@@ -70,6 +71,27 @@ else
 "
 anon_mkdir_write_enable=NO"
 ) +
+(if chrootlocaluser then
+"
+chroot_local_user=YES"
+else
+"
+chroot_local_user=NO"
+) +
+(if userlistenable then
+"
+userlist_enable=YES"
+else
+"
+userlist_enable=NO"
+) +
+(if userlistdeny then
+"
+userlist_deny=YES"
+else
+"
+userlist_deny=NO"
+) +
 "
 background=NO
 listen=YES
-- 
GitLab


From 7eab893010ad7ab2dc67cfb2e4fddeede552d8d2 Mon Sep 17 00:00:00 2001
From: Wouter den Breejen <uu@denbreejen.net>
Date: Sun, 22 Mar 2009 15:34:28 +0000
Subject: [PATCH 1329/5331] vsftpd userlist options added

svn path=/nixos/trunk/; revision=14650
---
 system/options.nix | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/system/options.nix b/system/options.nix
index a8ddd399603..4fcbe1513ff 100644
--- a/system/options.nix
+++ b/system/options.nix
@@ -1874,6 +1874,28 @@ in
           Whether mkdir is permitted to anonymous users.
         ";
       };
+
+      chrootlocaluser = mkOption {
+        default = false;
+        description = "
+          Whether u can like out of ur home dir.
+        ";
+      };
+
+      userlistenable  = mkOption {
+        default = false;
+        description = "
+          Whether users are included.
+        ";
+      };
+
+      userlistdeny  = mkOption {
+        default = false;
+        description = "
+          Whether users are excluded.
+        ";
+      };
+
     };
     
     printing = {
-- 
GitLab


From 70f9a365d8f2795a41ac51144fc306cdd71ffcd1 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 25 Mar 2009 11:00:31 +0000
Subject: [PATCH 1330/5331] * Add ntfsprogs to the installation CD (mostly for
 ntfsresize).

svn path=/nixos/trunk/; revision=14697
---
 installer/cd-dvd/rescue-cd.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/installer/cd-dvd/rescue-cd.nix b/installer/cd-dvd/rescue-cd.nix
index 2b82df15fe3..6c2c0486025 100644
--- a/installer/cd-dvd/rescue-cd.nix
+++ b/installer/cd-dvd/rescue-cd.nix
@@ -190,7 +190,7 @@ rec {
         pkgs.gdb # for debugging Nix
         pkgs.testdisk # useful for repairing boot problems
         pkgs.mssys # for writing Microsoft boot sectors / MBRs
-
+        pkgs.ntfsprogs # for resizing NTFS partitions
         pkgs.sshfsFuse
         pkgs.screen
       ];
-- 
GitLab


From b470feb9161d493284fa8cc17ff7345224fe99a3 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 25 Mar 2009 15:47:29 +0000
Subject: [PATCH 1331/5331] * nixpkgsPath -> nixpkgs.

svn path=/nixos/trunk/; revision=14702
---
 boot/boot-stage-1.nix          |  2 +-
 doc/manual/default.nix         |  8 +++-----
 helpers/make-iso9660-image.nix |  4 ++--
 installer/cd-dvd/rescue-cd.nix | 10 +++++-----
 installer/default.nix          |  4 ++--
 release.nix                    |  4 ++--
 system/system.nix              | 13 +++++--------
 7 files changed, 20 insertions(+), 25 deletions(-)

diff --git a/boot/boot-stage-1.nix b/boot/boot-stage-1.nix
index ed53a3abdb9..3d3f5885afa 100644
--- a/boot/boot-stage-1.nix
+++ b/boot/boot-stage-1.nix
@@ -4,7 +4,7 @@
 # calls the init in the root file system to start the second boot
 # stage.
 
-{ pkgs, config, nixpkgsPath, kernelPackages, modulesTree }:
+{ pkgs, config, kernelPackages, modulesTree }:
 
 rec {
 
diff --git a/doc/manual/default.nix b/doc/manual/default.nix
index 4f1e555583d..fe22e4f6c8b 100644
--- a/doc/manual/default.nix
+++ b/doc/manual/default.nix
@@ -1,14 +1,12 @@
-{nixpkgsPath ? ../../../nixpkgs, nixpkgs ? null}:
+{nixpkgs ? ../../../nixpkgs}:
 
 let
 
-  pkgs = if nixpkgs == null then 
-    import "${nixpkgsPath}/pkgs/top-level/all-packages.nix" {}
-  else nixpkgs;
+  pkgs = import nixpkgs {};
 
   options = builtins.toFile "options.xml" (builtins.unsafeDiscardStringContext
     (builtins.toXML (pkgs.lib.optionAttrSetToDocList ""
-      (import ../../system/system.nix {inherit nixpkgsPath; configuration = {};}).optionDeclarations)));
+      (import ../../system/system.nix {inherit nixpkgs; configuration = {};}).optionDeclarations)));
 
   optionsDocBook = pkgs.runCommand "options-db.xml" {} ''
     ${pkgs.libxslt}/bin/xsltproc -o $out ${./options-to-docbook.xsl} ${options} 
diff --git a/helpers/make-iso9660-image.nix b/helpers/make-iso9660-image.nix
index aef5408107f..ea0cd1b4d22 100644
--- a/helpers/make-iso9660-image.nix
+++ b/helpers/make-iso9660-image.nix
@@ -1,4 +1,4 @@
-{ stdenv, perl, cdrkit, nixpkgsPath
+{ stdenv, perl, cdrkit, nixpkgs
 
 , # The file name of the resulting ISO image.
   isoName ? "cd.iso"
@@ -50,5 +50,5 @@ stdenv.mkDerivation {
   # For obtaining the closure of `storeContents'.
   exportReferencesGraph =
     map (x: [("closure-" + baseNameOf x.object) x.object]) storeContents;
-  pathsFromGraph = "${nixpkgsPath}/pkgs/build-support/kernel/paths-from-graph.pl";
+  pathsFromGraph = "${nixpkgs}/pkgs/build-support/kernel/paths-from-graph.pl";
 }
diff --git a/installer/cd-dvd/rescue-cd.nix b/installer/cd-dvd/rescue-cd.nix
index 6c2c0486025..ffa8fa875d1 100644
--- a/installer/cd-dvd/rescue-cd.nix
+++ b/installer/cd-dvd/rescue-cd.nix
@@ -4,7 +4,7 @@
     then builtins.readFile ../../relname
     else "nixos-${builtins.readFile ../../VERSION}"
 , compressImage ? false
-, nixpkgsPath ? ../../../nixpkgs
+, nixpkgs ? ../../../nixpkgs
 }:
 
 rec {
@@ -200,7 +200,7 @@ rec {
 
 
   system = import ../../system/system.nix {
-    inherit configuration platform nixpkgsPath;
+    inherit configuration platform nixpkgs;
   };
 
 
@@ -211,7 +211,7 @@ rec {
   # 0.11 (you won't get the manual).
   manual =
     if builtins ? unsafeDiscardStringContext
-    then "${import ../../doc/manual {inherit nixpkgsPath;}}/manual.html"
+    then "${import ../../doc/manual {inherit nixpkgs;}}/manual.html"
     else pkgs.writeText "dummy-manual" "Manual not included in this build!";
 
 
@@ -230,7 +230,7 @@ rec {
 
 
   # Put Nixpkgs in a tarball.
-  nixpkgsTarball = makeTarball "nixpkgs.tar.bz2" nixpkgsPath;
+  nixpkgsTarball = makeTarball "nixpkgs.tar.bz2" nixpkgs;
 
 
   # The configuration file for Grub.
@@ -255,7 +255,7 @@ rec {
   # Create an ISO image containing the Grub boot loader, the kernel,
   # the initrd produced above, and the closure of the stage 2 init.
   rescueCD = import ../../helpers/make-iso9660-image.nix {
-    inherit nixpkgsPath;
+    inherit nixpkgs;
     inherit (pkgs) stdenv perl cdrkit;
     isoName = "${relName}-${platform}.iso";
 
diff --git a/installer/default.nix b/installer/default.nix
index bf6f6ee81b9..dfa2ab38eeb 100644
--- a/installer/default.nix
+++ b/installer/default.nix
@@ -1,4 +1,4 @@
-{pkgs, config, nix, nixpkgsPath}:
+{pkgs, config, nix}:
 
 let
 
@@ -25,7 +25,7 @@ in
     inherit nix;
     nixpkgsURL = config.installer.nixpkgsURL;
 
-    pathsFromGraph = "${nixpkgsPath}/pkgs/build-support/kernel/paths-from-graph.pl";
+    pathsFromGraph = "${pkgs.path}/build-support/kernel/paths-from-graph.pl";
 
     nixClosure = pkgs.runCommand "closure"
       {exportReferencesGraph = ["refs" nix];}
diff --git a/release.nix b/release.nix
index bf8d5cc1f5e..a7f92b55dc3 100644
--- a/release.nix
+++ b/release.nix
@@ -39,7 +39,7 @@ let
       }:
 
       import "${nixosSrc}/doc/manual" {
-        nixpkgsPath = nixpkgs.outPath;
+        inherit nixpkgs;
       };
 
 
@@ -58,8 +58,8 @@ let
         iso = (import "${nixosSrc}/installer/cd-dvd/rescue-cd.nix" {
           platform = system;
           compressImage = true;
-          nixpkgsPath = nixpkgs.outPath;
           relName = "nixos-${version}";
+          inherit nixpkgs;
         }).rescueCD;
 
       in
diff --git a/system/system.nix b/system/system.nix
index 913913db9af..fb09d40ae1e 100644
--- a/system/system.nix
+++ b/system/system.nix
@@ -1,7 +1,6 @@
 { platform ? __currentSystem
 , configuration
-, nixpkgsPath ? ../../nixpkgs
-, nixpkgs ? null
+, nixpkgs ? ../../nixpkgs
 }:
 
 rec {
@@ -27,9 +26,7 @@ rec {
       pkgs configComponents
       config;
 
-  pkgs = if nixpkgs == null then 
-    import "${nixpkgsPath}/pkgs/top-level/all-packages.nix" {system = platform;}
-  else nixpkgs;
+  pkgs = import nixpkgs {system = platform;};
 
   manifests = config.installer.manifests; # exported here because nixos-rebuild uses it
 
@@ -57,7 +54,7 @@ rec {
 
   # The initial ramdisk.
   initialRamdiskStuff = import ../boot/boot-stage-1.nix {
-    inherit pkgs config nixpkgsPath kernelPackages modulesTree;
+    inherit pkgs config kernelPackages modulesTree;
   };
 
   initialRamdisk = initialRamdiskStuff.initialRamdisk;
@@ -65,7 +62,7 @@ rec {
 
   # NixOS installation/updating tools.
   nixosTools = import ../installer {
-    inherit pkgs config nix nixpkgsPath;
+    inherit pkgs config nix;
   };
 
 
@@ -155,7 +152,7 @@ rec {
   # A patched `mount' command that looks in a directory in the Nix
   # store instead of in /sbin for mount helpers (like mount.ntfs-3g or
   # mount.cifs).
-  mount = import "${nixpkgsPath}/pkgs/os-specific/linux/util-linux" {
+  mount = import "${nixpkgs}/pkgs/os-specific/linux/util-linux" {
     inherit (pkgs) fetchurl stdenv;
     buildMountOnly = true;
     mountHelpers = pkgs.buildEnv {
-- 
GitLab


From 61d24401ee5d5eeb19a54f324f6513b832bd20bc Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 25 Mar 2009 20:12:44 +0000
Subject: [PATCH 1332/5331] svn path=/nixos/trunk/; revision=14714

---
 release.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/release.nix b/release.nix
index a7f92b55dc3..e55d4103121 100644
--- a/release.nix
+++ b/release.nix
@@ -23,7 +23,7 @@ let
         inherit officialRelease;
 
         distPhase = ''
-          releaseName=nixos-$VERSION
+          releaseName=nixos-$VERSION$VERSION_SUFFIX
           ensureDir "$out/tarballs"
           mkdir ../$releaseName
           cp -prd . ../$releaseName
-- 
GitLab


From bcbfd8d3868b8433bab4bae2821b73fbdc89825b Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Fri, 27 Mar 2009 09:29:11 +0000
Subject: [PATCH 1333/5331] Complete nixpkgsPath->nixpkgs rename

svn path=/nixos/trunk/; revision=14732
---
 default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/default.nix b/default.nix
index 46f2d265216..d55adf2115b 100644
--- a/default.nix
+++ b/default.nix
@@ -4,9 +4,9 @@ let
     let env = builtins.getEnv name; in
     if env == "" then default else env;
   configuration = import (fromEnv "NIXOS_CONFIG" /etc/nixos/configuration.nix);
-  nixpkgsPath   =         fromEnv "NIXPKGS"      /etc/nixos/nixpkgs;
+  nixpkgs   =         fromEnv "NIXPKGS"      /etc/nixos/nixpkgs;
 
-  system = import system/system.nix { inherit configuration nixpkgsPath; };
+  system = import system/system.nix { inherit configuration nixpkgs; };
 
 in
 
-- 
GitLab


From fd3d09b37c6d8b99b94c4db55d3b4bd3e345034f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Sun, 29 Mar 2009 10:59:13 +0000
Subject: [PATCH 1334/5331] Adding reiserfsck to initrd to allow booting
 reiserfsck root filesystems Adding mdadm to initrd to allow managing RAIDs at
 least on stage1 interactive shell

svn path=/nixos/trunk/; revision=14754
---
 boot/boot-stage-1.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/boot/boot-stage-1.nix b/boot/boot-stage-1.nix
index 3d3f5885afa..49b71bd7c70 100644
--- a/boot/boot-stage-1.nix
+++ b/boot/boot-stage-1.nix
@@ -48,9 +48,11 @@ rec {
       cp ${pkgs.e2fsprogs}/sbin/e2fsck $out/bin
       cp ${pkgs.e2fsprogs}/sbin/tune2fs $out/bin
       cp ${pkgs.e2fsprogs}/sbin/fsck $out/bin
+      cp ${pkgs.reiserfsprogs}/sbin/reiserfsck $out/bin
       ln -s e2fsck $out/bin/fsck.ext2
       ln -s e2fsck $out/bin/fsck.ext3
       ln -s e2fsck $out/bin/fsck.ext4
+      ln -s reiserfsck $out/bin/fsck.reiserfs
 
       cp -pd ${pkgs.e2fsprogs}/lib/lib*.so.* $out/lib
 
@@ -61,6 +63,9 @@ rec {
         cp $lvm2/sbin/lvm $out/bin/lvm
       fi
 
+      # Add RAID mdadm tool
+      cp ${pkgs.mdadm}/sbin/mdadm $out/bin/mdadm
+
       # Copy udev.
       cp ${pkgs.udev}/sbin/udevd ${pkgs.udev}/sbin/udevadm $out/bin
       cp ${pkgs.udev}/lib/udev/*_id $out/bin
-- 
GitLab


From 40f38560d454ffa66b24343f76313c53e933d82d Mon Sep 17 00:00:00 2001
From: Wouter den Breejen <uu@denbreejen.net>
Date: Sun, 29 Mar 2009 21:43:40 +0000
Subject: [PATCH 1335/5331] Allow samba to use PAM (needs cleartext passwords
 for now)

svn path=/nixos/trunk/; revision=14768
---
 etc/default.nix        |  1 +
 etc/pam.d/samba        |  4 ++++
 upstart-jobs/samba.nix | 11 ++++++++---
 upstart-jobs/smb.conf  | 26 ++++++++++++++++++++++----
 4 files changed, 35 insertions(+), 7 deletions(-)
 create mode 100644 etc/pam.d/samba

diff --git a/etc/default.nix b/etc/default.nix
index 7c4d4af8c2c..b9411117971 100644
--- a/etc/default.nix
+++ b/etc/default.nix
@@ -249,6 +249,7 @@ import ../helpers/make-etc.nix {
       "useradd"
       "chsh"
       "xlock"
+      "samba"
       "kde"
       "cups"
       "ftp"
diff --git a/etc/pam.d/samba b/etc/pam.d/samba
new file mode 100644
index 00000000000..50f3cc5ce60
--- /dev/null
+++ b/etc/pam.d/samba
@@ -0,0 +1,4 @@
+auth     include        common
+account  include        common
+password include        common
+session  include        common
diff --git a/upstart-jobs/samba.nix b/upstart-jobs/samba.nix
index b1371c6f0f5..e5d4edd45a2 100644
--- a/upstart-jobs/samba.nix
+++ b/upstart-jobs/samba.nix
@@ -5,7 +5,12 @@ let
   user = "smbguest";
   group = "smbguest";
  
-  smbConfig = ./smb.conf ;
+  #smbConfig = ./smb.conf ;
+
+  smbConfig = pkgs.substituteAll {
+    src = ./smb.conf;
+    inherit samba;
+  };
 
 in
 
@@ -45,13 +50,13 @@ start script
 
   ${samba}/sbin/nmbd -D  -s ${smbConfig} &
   ${samba}/sbin/smbd -D  -s ${smbConfig} &
-  ${samba}/sbin/winbindd -B -s ${smbConfig} &
+  ${samba}/sbin/winbindd -s ${smbConfig} &
 
   ln -fs ${smbConfig} /var/samba/config
 
 end script
 
-respawn ${samba}/sbin/nmbd -D -s ${smbConfig} &; ${samba}/sbin/smbd -D -s ${smbConfig} &; ${samba}/sbin/winbindd -B &
+respawn ${samba}/sbin/nmbd -D -s ${smbConfig} &; ${samba}/sbin/smbd -D -s ${smbConfig} &; ${samba}/sbin/winbindd &
 
   ";
 
diff --git a/upstart-jobs/smb.conf b/upstart-jobs/smb.conf
index d8e9e5797f8..889f3c628ee 100644
--- a/upstart-jobs/smb.conf
+++ b/upstart-jobs/smb.conf
@@ -1,9 +1,23 @@
 [global]
   workgroup = Users
-  security = share
   server string = %h
   comment = Samba
-  local master = no
+  log file = /var/log/samba/log.%m
+  log level = 10
+  max log size = 50000
+  security = user
+
+  #must be set to 'no' to use PAM
+  encrypt passwords = No
+  client plaintext auth = yes
+  client lanman auth = Yes
+  dns proxy = no
+  invalid users = root
+  passdb backend = tdbsam
+  passwd program = /usr/bin/passwd %u
+
+#  encrypt passwords = yes
+#  smb passwd file = @samba@/private/smbpasswd
 
 #[default]
 #  path = /home/smbd
@@ -11,7 +25,11 @@
 #  guest ok = yes
 
 [raidbackup]
-  path = /home/raidbackup
+  path = /home/raidbackup/files
   read only = no
   guest ok = no
-
+  available = yes
+  browseable = yes
+  public = yes
+  valid users = raidbackup
+  comment = Raid backup Files
-- 
GitLab


From ccbcf580624c4bdf49eea46573a95a0061703771 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 30 Mar 2009 14:54:22 +0000
Subject: [PATCH 1336/5331] * nvidiaDrivers -> nvidia_x11.

svn path=/nixos/trunk/; revision=14788
---
 system/options.nix       | 4 ++--
 system/system.nix        | 2 +-
 upstart-jobs/xserver.nix | 9 ++++-----
 3 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/system/options.nix b/system/options.nix
index 4fcbe1513ff..2828863e987 100644
--- a/system/options.nix
+++ b/system/options.nix
@@ -99,7 +99,7 @@ in
         Additional attributes may be needed depending on your
         configuration.  For instance, if you use the NVIDIA X driver,
         then it also needs to contain an attribute
-        <varname>nvidiaDrivers</varname>.
+        <varname>nvidia_x11</varname>.
       ";
     };
 
@@ -152,7 +152,7 @@ in
 
     extraModulePackages = mkOption {
       default = [];
-      # !!! example = [pkgs.aufs pkgs.nvidiaDrivers];
+      # !!! example = [pkgs.aufs pkgs.nvidia_x11];
       description = ''
         A list of additional packages supplying kernel modules.
       '';
diff --git a/system/system.nix b/system/system.nix
index fb09d40ae1e..cb6c8167004 100644
--- a/system/system.nix
+++ b/system/system.nix
@@ -46,7 +46,7 @@ rec {
     # Merged into mainline kernel
     # ++ pkgs.lib.optional ((config.networking.enableIntel3945ABGFirmware || config.networking.enableIntel4965AGNFirmware) && !kernel.features ? iwlwifi) kernelPackages.iwlwifi
     # !!! this should be declared by the xserver Upstart job.
-    ++ pkgs.lib.optional (config.services.xserver.enable && config.services.xserver.videoDriver == "nvidia") kernelPackages.nvidiaDrivers
+    ++ pkgs.lib.optional (config.services.xserver.enable && config.services.xserver.videoDriver == "nvidia") kernelPackages.nvidia_x11
     ++ pkgs.lib.optional config.hardware.enableGo7007 kernelPackages.wis_go7007
     ++ config.boot.extraModulePackages
   );
diff --git a/upstart-jobs/xserver.nix b/upstart-jobs/xserver.nix
index 1a84add6f05..ff6f34e5de7 100644
--- a/upstart-jobs/xserver.nix
+++ b/upstart-jobs/xserver.nix
@@ -14,7 +14,7 @@ let
   stdenv = pkgs.stdenv;
 
   knownVideoDrivers = {
-    nvidia = { modulesFirst = [ kernelPackages.nvidiaDrivers ]; };  #make sure it first loads the nvidia libs
+    nvidia = { modulesFirst = [ kernelPackages.nvidia_x11 ]; };  #make sure it first loads the nvidia libs
     vesa =  { modules = [xorg.xf86videovesa]; };
     vga =   { modules = [xorg.xf86videovga]; };
     sis =   { modules = [xorg.xf86videosis]; };
@@ -351,7 +351,6 @@ let
       };
     in if cfg.slim.theme == null then "${pkgs.slim}/share/slim/themes" else unpackedTheme;       
 
-    nvidiaDrivers = (config.boot.kernelPackages pkgs).nvidiaDrivers;
 
 in
 
@@ -401,7 +400,7 @@ rec {
     xorg.xset # used by startkde, non-essential
   ]
   ++ optional (videoDriver == "nvidia") [
-    kernelPackages.nvidiaDrivers
+    kernelPackages.nvidia_x11
   ];
 
 
@@ -425,7 +424,7 @@ rec {
       rm -f /var/run/opengl-driver
       ${if videoDriver == "nvidia"        
         then ''
-          ln -sf ${kernelPackages.nvidiaDrivers} /var/run/opengl-driver
+          ln -sf ${kernelPackages.nvidia_x11} /var/run/opengl-driver
         ''
         else if cfg.driSupport
         then "ln -sf ${pkgs.mesa} /var/run/opengl-driver"
@@ -444,7 +443,7 @@ rec {
     env XKB_BINDIR=${xorg.xkbcomp}/bin # Needed for the Xkb extension.
 
     ${if videoDriver == "nvidia" 
-      then "env LD_LIBRARY_PATH=${xorg.libX11}/lib:${xorg.libXext}/lib:${kernelPackages.nvidiaDrivers}/lib" 
+      then "env LD_LIBRARY_PATH=${xorg.libX11}/lib:${xorg.libXext}/lib:${kernelPackages.nvidia_x11}/lib" 
       else ""
     }
 
-- 
GitLab


From d7fcb32e9b4f5db97bd428aa30464f01e1a02b00 Mon Sep 17 00:00:00 2001
From: Marc Weber <marco-oweber@gmx.de>
Date: Mon, 30 Mar 2009 14:58:05 +0000
Subject: [PATCH 1337/5331] readding synergy

svn path=/nixos/branches/fix-style/; revision=14789
---
 system/options.nix       |   2 +
 upstart-jobs/synergy.nix | 129 +++++++++++++++++++++++++++++++++++++++
 2 files changed, 131 insertions(+)
 create mode 100644 upstart-jobs/synergy.nix

diff --git a/system/options.nix b/system/options.nix
index 68cad69d0d7..7e186b71551 100644
--- a/system/options.nix
+++ b/system/options.nix
@@ -480,6 +480,8 @@ in
     (import ../upstart-jobs/mingetty.nix) # The terminals on ttyX.
     (import ../upstart-jobs/tty-backgrounds.nix) #FIXME (assertion)
 
+    (import ../upstart-jobs/synergy.nix)
+
     # nix
     (import ../upstart-jobs/nix.nix) # nix options and daemon
     (import ../system/nixos-installer.nix)
diff --git a/upstart-jobs/synergy.nix b/upstart-jobs/synergy.nix
new file mode 100644
index 00000000000..04b581002c2
--- /dev/null
+++ b/upstart-jobs/synergy.nix
@@ -0,0 +1,129 @@
+
+{pkgs, config, ...}:
+
+###### interface
+let
+  inherit (pkgs.lib) mkOption mkIf;
+
+  options = {
+    services = {
+      synergy = {
+
+        client = {
+          enable = mkOption {
+            default = false;
+            description = "
+              Whether to enable the synergy client (receive keyboard and mouse events from a synergy server)
+            ";
+          };
+          screenName = mkOption {
+            default = "";
+            description = " 
+              use screen-name instead the hostname to identify
+              ourselfs to the server.
+              ";
+          };
+        };
+
+        server = {
+          enable = mkOption {
+            default = false;
+            description = "
+              Whether to enable the synergy server (send keyboard and mouse events)
+            ";
+          };
+          configFile = mkOption {
+            default = "/etc/synergy-server.conf";
+            description = "
+              The synergy server configuration file. open upstart-jobs/synergy.nix to see an example
+            ";
+          };
+          screenName = mkOption {
+            default = "";
+            description = " 
+              use screen-name instead the hostname to identify
+              this screen in the configuration.
+              ";
+          };
+          address = mkOption {
+            default = "";
+            description = "listen for clients on the given address";
+          };
+        };
+      };
+    };
+  };
+
+###### implementation
+
+  inherit (pkgs.lib) optional;
+
+  cfgC = (config.services.synergy.client);
+  cfgS = (config.services.synergy.server);
+
+  clientJob = {
+    name = "synergy-client";
+
+    job = ''
+      description "synergy client"
+
+      start on started network-interfaces
+      stop on stopping network-interfaces
+
+      respawn ${pkgs.synergy}/bin/synergyc ${if cfgS.screenName == "" then "" else "-n ${cfgS.screenName}" }
+    '';
+  };
+
+  serverJob = {
+    name = "synergy-server";
+
+    job = ''
+      description "synergy server"
+
+      start on started network-interfaces
+      stop on stopping network-interfaces
+
+      respawn ${pkgs.synergy}/bin/synergys -c ${cfgS.configFile} \
+       -f ${if cfgS.address == "" then "" else "-a ${cfgS.address}"} \
+       ${if cfgS.screenName == "" then "" else "-n ${cfgS.screenName}" }
+    '';
+  };
+
+in
+
+
+mkIf config.services.sshd.enable {
+  require = [
+    options
+  ];
+
+  services = {
+    extraJobs = (optional cfgS.enable serverJob) 
+             ++ (optional cfgC.enable clientJob);
+  };
+}
+
+/* SYNERGY SERVER example configuration file
+section: screens
+  laptop:
+  dm:
+  win:
+end
+section: aliases
+    laptop: 
+      192.168.5.5
+    dm:
+      192.168.5.78
+    win:
+      192.168.5.54
+end
+section: links
+   laptop:
+       left = dm
+   dm:
+       right = laptop
+       left = win
+  win:
+      right = dm
+end
+*/
-- 
GitLab


From 02b243e11b806418a0f42e727ea5668c8d15943d Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 31 Mar 2009 09:27:11 +0000
Subject: [PATCH 1338/5331] * Additional checks.

svn path=/nixos/trunk/; revision=14800
---
 boot/boot-stage-1.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/boot/boot-stage-1.nix b/boot/boot-stage-1.nix
index 49b71bd7c70..c37ca27d6b1 100644
--- a/boot/boot-stage-1.nix
+++ b/boot/boot-stage-1.nix
@@ -63,7 +63,7 @@ rec {
         cp $lvm2/sbin/lvm $out/bin/lvm
       fi
 
-      # Add RAID mdadm tool
+      # Add RAID mdadm tool.
       cp ${pkgs.mdadm}/sbin/mdadm $out/bin/mdadm
 
       # Copy udev.
@@ -100,6 +100,8 @@ rec {
           $out/bin/dmsetup --version | grep "version:"
           LVM_SYSTEM_DIR=$out $out/bin/lvm 2>&1 | grep "LVM"
       fi
+      $out/bin/reiserfsck -V
+      $out/bin/mdadm --version
     ''; # */
   
 
-- 
GitLab


From 723b0dc74b33ff76619406f4289a743f64967f34 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 31 Mar 2009 09:33:35 +0000
Subject: [PATCH 1339/5331] * Use utillinuxng.override.

svn path=/nixos/trunk/; revision=14801
---
 system/system.nix | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/system/system.nix b/system/system.nix
index cb6c8167004..75c64ab7e1a 100644
--- a/system/system.nix
+++ b/system/system.nix
@@ -152,8 +152,7 @@ rec {
   # A patched `mount' command that looks in a directory in the Nix
   # store instead of in /sbin for mount helpers (like mount.ntfs-3g or
   # mount.cifs).
-  mount = import "${nixpkgs}/pkgs/os-specific/linux/util-linux" {
-    inherit (pkgs) fetchurl stdenv;
+  mount = pkgs.utillinuxng.override {
     buildMountOnly = true;
     mountHelpers = pkgs.buildEnv {
       name = "mount-helpers";
-- 
GitLab


From 2b6554b5194c93d5cff4d5165f879f201349b32a Mon Sep 17 00:00:00 2001
From: Marc Weber <marco-oweber@gmx.de>
Date: Wed, 1 Apr 2009 20:28:04 +0000
Subject: [PATCH 1340/5331] allow specifying custom udev rules in
 /etc/nixos/configuration.nix

svn path=/nixos/branches/fix-style/; revision=14826
---
 upstart-jobs/udev.nix | 21 +++++++++++++++++++--
 1 file changed, 19 insertions(+), 2 deletions(-)

diff --git a/upstart-jobs/udev.nix b/upstart-jobs/udev.nix
index 4765f29176e..30fc4279171 100644
--- a/upstart-jobs/udev.nix
+++ b/upstart-jobs/udev.nix
@@ -22,10 +22,21 @@ let
         addUdevPkgs = mkOption {
           default = [];
           description = "
-            List of packages containing udev rules.
+            List of packages containing udev rules. All files found in $out/*/udev/rules.d/*.rules will be recognized
           ";
           merge = pkgs.lib.mergeListOption;
         };
+
+        extraRules = mkOption {
+          default = "";
+          example = ''
+            KERNEL=="eth*", ATTR{address}=="00:1D:60:B9:6D:4F", NAME="my_fast_network_card"
+          '';
+          description = "
+            Add custom rules. They'll be written into file 10-local.rules.
+            Thus they are read before all other rules.
+          ";
+        };
         
         sndMode = mkOption {
           default = "0600";
@@ -58,7 +69,13 @@ let
   };
 
   firmwareDirs = config.services.udev.addFirmware;
-  extraUdevPkgs = config.services.udev.addUdevPkgs;
+  extraUdevPkgs = config.services.udev.addUdevPkgs
+    ++ pkgs.lib.optional (cfg.extraRules != "")
+      (pkgs.writeTextFile {
+        name = "extra-udev-rules";
+        text = cfg.extraRules;
+        destination = "/custom/udev/rules.d/10-local.rules";
+        });
 
   modprobe = config.system.sbin.modprobe;
     
-- 
GitLab


From 525e4e961d0e132cce50d1bcc6a477164e4434d6 Mon Sep 17 00:00:00 2001
From: Sander van der Burg <s.vanderburg@tudelft.nl>
Date: Thu, 2 Apr 2009 15:02:13 +0000
Subject: [PATCH 1341/5331] Added console kit upstart job

svn path=/nixos/trunk/; revision=14839
---
 system/options.nix          | 12 +++++++++++-
 upstart-jobs/consolekit.nix | 24 ++++++++++++++++++++++++
 upstart-jobs/default.nix    |  7 +++++++
 3 files changed, 42 insertions(+), 1 deletion(-)
 create mode 100644 upstart-jobs/consolekit.nix

diff --git a/system/options.nix b/system/options.nix
index 2828863e987..cfd81259fff 100644
--- a/system/options.nix
+++ b/system/options.nix
@@ -1967,7 +1967,17 @@ in
       };
     };
 
-
+    consolekit = {
+    
+      enable = mkOption {
+        default = false;
+        description = "
+          Whether to start the ConsoleKit daemon.
+        ";
+      };
+          
+    };
+    
     samba = {
 
       enable = mkOption {
diff --git a/upstart-jobs/consolekit.nix b/upstart-jobs/consolekit.nix
new file mode 100644
index 00000000000..fef32159aa6
--- /dev/null
+++ b/upstart-jobs/consolekit.nix
@@ -0,0 +1,24 @@
+args: with args;
+
+let
+
+cfg = config.services.consolekit;
+
+in
+{
+    name = "consolekit";
+        
+    job = ''
+      description "Console Kit Service"
+
+      start on dbus
+      stop on shutdown  
+          
+      start script
+        # !!! quick hack: wait until dbus has started
+        sleep 3
+      end script
+      
+      respawn ${pkgs.ConsoleKit}/sbin/console-kit-daemon
+    '';
+}
diff --git a/upstart-jobs/default.nix b/upstart-jobs/default.nix
index 0f479e40638..95dbb320ea9 100644
--- a/upstart-jobs/default.nix
+++ b/upstart-jobs/default.nix
@@ -350,6 +350,7 @@ let
       dbusServices =
         pkgs.lib.optional config.services.hal.enable pkgs.hal ++
         pkgs.lib.optional config.services.avahi.enable pkgs.avahi ++
+	pkgs.lib.optional config.services.consolekit.enable pkgs.ConsoleKit ++
         pkgs.lib.optional config.services.disnix.enable pkgs.disnix
         ;
     })
@@ -385,6 +386,12 @@ let
       inherit config pkgs;
     })
   
+  # ConsoleKit daemon.
+  ++ optional config.services.consolekit.enable
+    (import ../upstart-jobs/consolekit.nix {
+      inherit config pkgs;
+    })
+  
   # Postfix mail server.
   ++ optional config.services.postfix.enable
     (import ../upstart-jobs/postfix.nix {
-- 
GitLab


From 46d69d9170e35d0283983de563b463e307c7a9e2 Mon Sep 17 00:00:00 2001
From: Marc Weber <marco-oweber@gmx.de>
Date: Fri, 3 Apr 2009 12:05:15 +0000
Subject: [PATCH 1342/5331] added hint about cron.{allow,deny}

svn path=/nixos/trunk/; revision=14853
---
 upstart-jobs/cron.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/upstart-jobs/cron.nix b/upstart-jobs/cron.nix
index 8216b6baaf2..a5d628f9a65 100644
--- a/upstart-jobs/cron.nix
+++ b/upstart-jobs/cron.nix
@@ -24,6 +24,9 @@ let
             crontab.  See the manual page for crontab for the expected
             format. If you want to get the results mailed you must setuid
             sendmail. See <option>security.setuidOwners</option>
+
+            If you neither create /etc/cron.deny nor /etc/cron.allow only root
+            will be allowed to have its own crontab file.
           '';
         };
 
-- 
GitLab


From 80f0683a77c8201f17cb5b18ec7a398dc4a32e8a Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 3 Apr 2009 15:14:00 +0000
Subject: [PATCH 1343/5331] * Allow users to create crontabs by default.

svn path=/nixos/trunk/; revision=14861
---
 upstart-jobs/cron.nix | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/upstart-jobs/cron.nix b/upstart-jobs/cron.nix
index a5d628f9a65..2c9a75cbc6f 100644
--- a/upstart-jobs/cron.nix
+++ b/upstart-jobs/cron.nix
@@ -88,6 +88,16 @@ in
         # Needed to interpret times in the local timezone.
         env TZ=${config.time.timeZone}
 
+        start script
+            mkdir -m 710 -p /var/cron
+
+            # By default, allow all users to create a crontab.  This
+            # is denoted by the existence of an empty cron.deny file.
+            if ! test -e /var/cron/cron.allow -o -e /var/cron/cron.deny; then
+                touch /var/cron/cron.deny
+            fi
+        end script
+
         respawn ${pkgs.cron}/sbin/cron -n
       '';
     }];
-- 
GitLab


From 15bff21f68b343442a830240f39764e4a6787cc7 Mon Sep 17 00:00:00 2001
From: Marc Weber <marco-oweber@gmx.de>
Date: Fri, 3 Apr 2009 19:48:45 +0000
Subject: [PATCH 1344/5331] fix hint of previous commit

svn path=/nixos/trunk/; revision=14871
---
 upstart-jobs/cron.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/upstart-jobs/cron.nix b/upstart-jobs/cron.nix
index 2c9a75cbc6f..078cf4766fc 100644
--- a/upstart-jobs/cron.nix
+++ b/upstart-jobs/cron.nix
@@ -25,8 +25,9 @@ let
             format. If you want to get the results mailed you must setuid
             sendmail. See <option>security.setuidOwners</option>
 
-            If you neither create /etc/cron.deny nor /etc/cron.allow only root
-            will be allowed to have its own crontab file.
+            If neither /var/cron/cron.deny nor /var/cron/cron.allow exist only root
+            will is allowed to have its own crontab file. The /var/cron/cron.deny file
+            is created automatically for you. So every user can use a crontab.
           '';
         };
 
-- 
GitLab


From 6663af083352b62a2556a90dfbe673af4b461f1d Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 3 Apr 2009 22:04:31 +0000
Subject: [PATCH 1345/5331] * dbus: fork() into the background so that the
 daemon is   running by the time the job has finished starting.  This  
 obviates the need for the sleep hack in other jobs.

svn path=/nixos/trunk/; revision=14875
---
 upstart-jobs/consolekit.nix |  5 -----
 upstart-jobs/dbus.nix       | 15 +++++++++------
 upstart-jobs/disnix.nix     |  5 -----
 upstart-jobs/hal.nix        |  3 ---
 4 files changed, 9 insertions(+), 19 deletions(-)

diff --git a/upstart-jobs/consolekit.nix b/upstart-jobs/consolekit.nix
index fef32159aa6..57fb5b9dca6 100644
--- a/upstart-jobs/consolekit.nix
+++ b/upstart-jobs/consolekit.nix
@@ -14,11 +14,6 @@ in
       start on dbus
       stop on shutdown  
           
-      start script
-        # !!! quick hack: wait until dbus has started
-        sleep 3
-      end script
-      
       respawn ${pkgs.ConsoleKit}/sbin/console-kit-daemon
     '';
 }
diff --git a/upstart-jobs/dbus.nix b/upstart-jobs/dbus.nix
index a8ce1fddf06..d84ca477b08 100644
--- a/upstart-jobs/dbus.nix
+++ b/upstart-jobs/dbus.nix
@@ -10,8 +10,7 @@ let
     name = "dbus-conf";
     buildCommand = "
       ensureDir $out
-      substitute ${dbus}/etc/dbus-1/system.conf $out/system.conf \\
-        --replace '<fork/>' ''
+      ln -s ${dbus}/etc/dbus-1/system.conf $out/system.conf
 
       ensureDir $out/system.d
       for i in ${toString dbusServices}; do
@@ -49,13 +48,17 @@ in
         mkdir -m 0755 -p /var/lib/dbus
         ${dbus.tools}/bin/dbus-uuidgen --ensure
 
+        rm -f ${homeDir}/pid
+        ${dbus}/bin/dbus-daemon --config-file=${configFile}/system.conf
     end script
 
-    respawn
+    respawn sleep 1000000
 
-    script
-        rm -f ${homeDir}/pid
-        exec ${dbus}/bin/dbus-daemon --config-file=${configFile}/system.conf
+    stop script
+        pid=$(cat ${homeDir}/pid)
+        if test -n "$pid"; then
+            kill -9 $pid
+        fi
     end script
   '';
   
diff --git a/upstart-jobs/disnix.nix b/upstart-jobs/disnix.nix
index 2f64afbc4b9..bc24e513bec 100644
--- a/upstart-jobs/disnix.nix
+++ b/upstart-jobs/disnix.nix
@@ -14,11 +14,6 @@ in
       start on dbus
       stop on shutdown  
           
-      start script
-        # !!! quick hack: wait until dbus has started
-        sleep 3
-      end script
-      
       respawn ${pkgs.bash}/bin/sh -c 'export PATH=/var/run/current-system/sw/bin:$PATH; export HOME=/root; export DISNIX_ACTIVATE_HOOK=${cfg.activateHook}; export DISNIX_DEACTIVATE_HOOK=${cfg.deactivateHook}; ${pkgs.disnix}/bin/disnix-service'
     '';
 }
diff --git a/upstart-jobs/hal.nix b/upstart-jobs/hal.nix
index 8b59c079eb8..af4038f0fe0 100644
--- a/upstart-jobs/hal.nix
+++ b/upstart-jobs/hal.nix
@@ -28,9 +28,6 @@
 
     start script
 
-        # !!! quick hack: wait until dbus has started
-        sleep 3
-
         mkdir -m 0755 -p /var/cache/hald
 
     end script
-- 
GitLab


From 3b494865b1f1482fda55638c1436425230acc3ac Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sun, 5 Apr 2009 18:25:21 +0000
Subject: [PATCH 1346/5331] * Don't symlink all of /share as we don't need it
 and we   end up with a zillion extra symlinks which is somewhat   expensive.

svn path=/nixos/trunk/; revision=14886
---
 system/options.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/system/options.nix b/system/options.nix
index cfd81259fff..59c3001df3b 100644
--- a/system/options.nix
+++ b/system/options.nix
@@ -2986,7 +2986,7 @@ root        ALL=(ALL) SETENV: ALL
   environment = {
 
     pathsToLink = mkOption {
-      default = ["/bin" "/sbin" "/lib" "/share" "/man" "/info" "/etc"];
+      default = ["/bin" "/sbin" "/lib" "/share/man" "/share/info" "/man" "/info"];
       example = ["/"];
       description = "
         Lists directories to be symlinked in `/var/run/current-system/sw'.
-- 
GitLab


From d5e97ab056011031be29e760c3e63ecf36371679 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sun, 5 Apr 2009 18:30:39 +0000
Subject: [PATCH 1347/5331] * Let KDEDIRS, XDG_CONFIG_DIRS and XDG_DATA_DIRS
 contain the KDE   packages that we need rather than just
 /var/run/current-system/sw.   This ensures consistency when upgrading a
 system (e.g. you don't end   up with a mix of KDE versions at runtime).  This
 partially reverts   r14148 (in particular the update-mime-database hack in
 the   systemPath post-build).

svn path=/nixos/trunk/; revision=14887
---
 etc/bashrc.sh            | 12 ++++++------
 etc/default.nix          |  8 +++++++-
 system/system.nix        | 31 ++++++++++++++++++++-----------
 upstart-jobs/default.nix |  6 ++++--
 upstart-jobs/xserver.nix | 33 ++++++++++++---------------------
 5 files changed, 49 insertions(+), 41 deletions(-)

diff --git a/etc/bashrc.sh b/etc/bashrc.sh
index baaed726ee1..1a2b45794d9 100644
--- a/etc/bashrc.sh
+++ b/etc/bashrc.sh
@@ -15,9 +15,9 @@ export LANG=@defaultLocale@
 export EDITOR=nano
 export INFOPATH=/var/run/current-system/sw/info:/var/run/current-system/sw/share/info
 export LOCATE_PATH=/var/cache/locatedb
-export KDEDIRS=/var/run/current-system/sw
-export XDG_CONFIG_DIRS=/var/run/current-system/sw/etc/xdg
-export XDG_DATA_DIRS=/var/run/current-system/sw/share
+export KDEDIRS=@kdeDirs@
+export XDG_CONFIG_DIRS=@xdgConfigDirs@
+export XDG_DATA_DIRS=@xdgDataDirs@
 
 
 # Set up secure multi-user builds: non-root users build through the
@@ -44,11 +44,11 @@ for i in $NIX_PROFILES; do # !!! reverse
     export PKG_CONFIG_PATH="$i/lib/pkgconfig:$PKG_CONFIG_PATH"
 
     # Automake's `aclocal' bails out if it finds non-existent directories
-    # in its path.  !!! We should fix aclocal instead.
-    if [ -d "$i/share/aclocal" ]
-    then
+    # in its path.  !!! This has been fixed in the stdenv branch.
+    if [ -d "$i/share/aclocal" ]; then
 	export ACLOCAL_PATH="$i/share/aclocal:$ACLOCAL_PATH"
     fi
+    
     export PERL5LIB="$i/lib/site_perl:$PERL5LIB"
 
     # GStreamer.
diff --git a/etc/default.nix b/etc/default.nix
index b9411117971..656e197eca5 100644
--- a/etc/default.nix
+++ b/etc/default.nix
@@ -1,5 +1,6 @@
 { config, pkgs, upstartJobs, systemPath, wrapperDir
 , defaultShell, extraEtc, nixEnvVars, modulesTree, nssModulesPath, binsh
+, kdePackages
 }:
 
 let 
@@ -19,7 +20,7 @@ let
 
   pamConsolePerms = ./security/console.perms;
 
-  
+
 in
 
     
@@ -108,6 +109,11 @@ import ../helpers/make-etc.nix {
         timeZone = config.time.timeZone;
         defaultLocale = config.i18n.defaultLocale;
         inherit nixEnvVars;
+        # !!! in the modular NixOS these should be declared by the KDE
+        # component.
+        kdeDirs = pkgs.lib.concatStringsSep ":" kdePackages;
+        xdgConfigDirs = pkgs.lib.makeSearchPath "etc/xdg" kdePackages;
+        xdgDataDirs = pkgs.lib.makeSearchPath "share" kdePackages;
       };
       target = "bashrc";      
     }
diff --git a/system/system.nix b/system/system.nix
index 75c64ab7e1a..7fc5974cc39 100644
--- a/system/system.nix
+++ b/system/system.nix
@@ -117,14 +117,15 @@ rec {
   # The services (Upstart) configuration for the system.
   upstartJobs = import ../upstart-jobs/default.nix {
     inherit config pkgs nix modprobe nssModulesPath nixEnvVars
-      optionDeclarations kernelPackages mount;
+      optionDeclarations kernelPackages mount kdePackages;
   };
 
 
   # The static parts of /etc.
   etc = import ../etc/default.nix {
     inherit config pkgs upstartJobs systemPath wrapperDir
-      defaultShell nixEnvVars modulesTree nssModulesPath binsh;
+      defaultShell nixEnvVars modulesTree nssModulesPath binsh
+      kdePackages;
     extraEtc =
        (pkgs.lib.concatLists (map (job: job.extraEtc) upstartJobs.jobs))
     ++ config.environment.etc;
@@ -262,18 +263,26 @@ rec {
     inherit (config.environment) pathsToLink;
 
     ignoreCollisions = true;
-
-    postBuild =
-      if config.services.xserver.sessionType == "kde4" then
-        # Rebuild the MIME database.  Otherwise KDE won't be able to
-        # find many MIME types.
-        ''
-          ${pkgs.shared_mime_info}/bin/update-mime-database $out/share/mime
-        ''
-      else "";
   };
 
 
+  # The list of packages that need to appear in KDEDIRS,
+  # XDG_CONFIG_DIRS and XDG_DATA_DIRS.
+  # !!! This should be defined somewhere else.  
+  kdePackages = 
+    pkgs.lib.optionals (config.services.xserver.sessionType == "kde4")
+      [ pkgs.kde42.kdelibs
+        pkgs.kde42.kdebase
+        pkgs.kde42.kdebase_runtime
+        pkgs.kde42.kdebase_workspace
+        pkgs.shared_mime_info
+      ]
+    ++ pkgs.lib.optionals (config.services.xserver.sessionType == "kde")
+      [ pkgs.kdebase
+        pkgs.kdelibs
+      ];
+
+
   usersGroups = import ./users-groups.nix { inherit pkgs config upstartJobs defaultShell; };
 
 
diff --git a/upstart-jobs/default.nix b/upstart-jobs/default.nix
index 95dbb320ea9..3ecd007dc1c 100644
--- a/upstart-jobs/default.nix
+++ b/upstart-jobs/default.nix
@@ -1,4 +1,6 @@
-{config, pkgs, nix, modprobe, nssModulesPath, nixEnvVars, optionDeclarations, kernelPackages, mount}:
+{ config, pkgs, nix, modprobe, nssModulesPath, nixEnvVars, optionDeclarations
+, kernelPackages, mount, kdePackages
+}:
 
 let 
 
@@ -230,7 +232,7 @@ let
   # X server.
   ++ optional config.services.xserver.enable
     (import ../upstart-jobs/xserver.nix {
-      inherit config pkgs kernelPackages;
+      inherit config pkgs kernelPackages kdePackages;
       fontDirectories = import ../system/fonts.nix {inherit pkgs config;};
     })
 
diff --git a/upstart-jobs/xserver.nix b/upstart-jobs/xserver.nix
index ff6f34e5de7..772b8f214f0 100644
--- a/upstart-jobs/xserver.nix
+++ b/upstart-jobs/xserver.nix
@@ -1,4 +1,4 @@
-{ config, pkgs, kernelPackages
+{ config, pkgs, kernelPackages, kdePackages
 
 , # List of font directories.
   fontDirectories
@@ -7,6 +7,7 @@
 let
 
   inherit (pkgs.lib) optional isInList getAttr;
+  
   # Abbreviations.
   cfg = config.services.xserver;
   xorg = cfg.package;
@@ -15,14 +16,14 @@ let
 
   knownVideoDrivers = {
     nvidia = { modulesFirst = [ kernelPackages.nvidia_x11 ]; };  #make sure it first loads the nvidia libs
-    vesa =  { modules = [xorg.xf86videovesa]; };
-    vga =   { modules = [xorg.xf86videovga]; };
-    sis =   { modules = [xorg.xf86videosis]; };
-    i810 =  { modules = [xorg.xf86videoi810]; };
-    intel = { modules = [xorg.xf86videointel]; };
-    nv =    { modules = [xorg.xf86videonv]; };
-    ati =   { modules = [xorg.xf86videoati]; };
-    via =   { modules = [xorg.xf86videovia]; };
+    vesa =   { modules = [xorg.xf86videovesa]; };
+    vga =    { modules = [xorg.xf86videovga]; };
+    sis =    { modules = [xorg.xf86videosis]; };
+    i810 =   { modules = [xorg.xf86videoi810]; };
+    intel =  { modules = [xorg.xf86videointel]; };
+    nv =     { modules = [xorg.xf86videonv]; };
+    ati =    { modules = [xorg.xf86videoati]; };
+    via =    { modules = [xorg.xf86videovia]; };
     cirrus = { modules = [xorg.xf86videocirrus]; };
   };
 
@@ -289,9 +290,6 @@ let
     ${if sessionType == "kde" then ''
 
       # Start KDE.
-      export KDEDIRS=$HOME/.nix-profile:/nix/var/nix/profiles/default:${pkgs.kdebase}:${pkgs.kdelibs}
-      export XDG_CONFIG_DIRS=${pkgs.kdebase}/etc/xdg:${pkgs.kdelibs}/etc/xdg
-      export XDG_DATA_DIRS=${pkgs.kdebase}/share
       exec ${pkgs.kdebase}/bin/startkde
 
     '' else if sessionType == "kde4" then ''
@@ -384,24 +382,17 @@ rec {
     gnome.gconfeditor
   ]
   ++ optional (sessionType == "kde") [
-    pkgs.kdelibs
-    pkgs.kdebase
     xorg.xset # used by startkde, non-essential
   ]
   ++ optional (sessionType == "kde4") [
     xorg.xmessage # so that startkde can show error messages
     pkgs.qt4 # needed for qdbus
-    pkgs.kde42.kdelibs
-    pkgs.kde42.kdebase
-    pkgs.kde42.kdebase_runtime
-    pkgs.kde42.kdebase_workspace
-    pkgs.kde42.kdegames
-    pkgs.shared_mime_info
     xorg.xset # used by startkde, non-essential
   ]
   ++ optional (videoDriver == "nvidia") [
     kernelPackages.nvidia_x11
-  ];
+  ]
+  ++ kdePackages;
 
 
   extraEtc =
-- 
GitLab


From 4be528a72c3a92cd91bbff30f16144c73e384616 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sun, 5 Apr 2009 19:10:34 +0000
Subject: [PATCH 1348/5331] * An option to activate additional KDE packages.

svn path=/nixos/trunk/; revision=14888
---
 system/options.nix | 17 +++++++++++++++++
 system/system.nix  |  3 ++-
 2 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/system/options.nix b/system/options.nix
index 59c3001df3b..9128e794e02 100644
--- a/system/options.nix
+++ b/system/options.nix
@@ -3083,6 +3083,22 @@ root        ALL=(ALL) SETENV: ALL
     };
   };
 
+
+  kde = {
+
+    extraPackages = mkOption {
+      default = [];
+      merge = backwardPkgsFunListMerge;
+      description = ''
+        Additional KDE packages to be used when
+        <option>services.xserver.sessionType</option> is
+        <literal>"kde"</literal> or <literal>"kde4"</literal>.
+        By default, you only get the KDE base packages.
+      '';
+    };
+  
+  };
+
   
   passthru = mkOption {
     default = {};
@@ -3093,6 +3109,7 @@ root        ALL=(ALL) SETENV: ALL
     ";
   };
 
+  
   require = [
     # newtworking
     (import ../upstart-jobs/dhclient.nix)
diff --git a/system/system.nix b/system/system.nix
index 7fc5974cc39..607195ab0cb 100644
--- a/system/system.nix
+++ b/system/system.nix
@@ -280,7 +280,8 @@ rec {
     ++ pkgs.lib.optionals (config.services.xserver.sessionType == "kde")
       [ pkgs.kdebase
         pkgs.kdelibs
-      ];
+      ]
+    ++ config.kde.extraPackages;
 
 
   usersGroups = import ./users-groups.nix { inherit pkgs config upstartJobs defaultShell; };
-- 
GitLab


From 5dadce8770327903cd029fc36cce7617c9c55ffc Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Sun, 5 Apr 2009 19:13:52 +0000
Subject: [PATCH 1349/5331] Adding comment about child configurations

svn path=/nixos/trunk/; revision=14889
---
 system/system.nix | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/system/system.nix b/system/system.nix
index 607195ab0cb..b615c99517c 100644
--- a/system/system.nix
+++ b/system/system.nix
@@ -404,7 +404,11 @@ rec {
       pkgs.diffutils
       pkgs.upstart # for initctl
     ];
-    # !!! wtf does this do???
+    # This attribute is responsible for creating boot entries for 
+    # child configuration. They are only (directly) accessible
+    # when the parent configuration is boot default. For example,
+    # you can provide an easy way to boot the same configuration 
+    # as you use, but with another kernel
     children = map (x: ((import ./system.nix) 
       { inherit platform; 
         configuration = x//{boot=((x.boot)//{grubDevice = "";});};}).system) 
-- 
GitLab


From d9b6234e9fed951dc3b48783cf4f3817204acf6e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Mon, 6 Apr 2009 19:25:45 +0000
Subject: [PATCH 1350/5331] Adding nfsutils on mount-helpers. That adds more
 binaries to mount-helpers, but at least allows mounting nfs paths.

svn path=/nixos/trunk/; revision=14905
---
 system/system.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/system/system.nix b/system/system.nix
index b615c99517c..78063113089 100644
--- a/system/system.nix
+++ b/system/system.nix
@@ -160,6 +160,7 @@ rec {
       paths = [
         pkgs.ntfs3g
         pkgs.mount_cifs
+        pkgs.nfsUtils
       ];
       pathsToLink = "/sbin";
     } + "/sbin";
-- 
GitLab


From 5e7a768336c89a3671725ec54e70b1c0a9cf34f2 Mon Sep 17 00:00:00 2001
From: Sander van der Burg <s.vanderburg@tudelft.nl>
Date: Tue, 7 Apr 2009 15:33:59 +0000
Subject: [PATCH 1351/5331] Added very experimental KDM support

svn path=/nixos/trunk/; revision=14913
---
 system/options.nix       |   9 ++
 upstart-jobs/default.nix |   6 +
 upstart-jobs/kdm.nix     | 269 +++++++++++++++++++++++++++++++++++++++
 3 files changed, 284 insertions(+)
 create mode 100644 upstart-jobs/kdm.nix

diff --git a/system/options.nix b/system/options.nix
index 9128e794e02..0c0554897ee 100644
--- a/system/options.nix
+++ b/system/options.nix
@@ -1191,6 +1191,15 @@ in
       };
     };
 
+    kdm = {
+      
+      enable = mkOption {
+        default = false;
+        description = "
+          Whether to enable the KDE display manager.
+        ";        
+      };
+    };
 
     xserver = {
 
diff --git a/upstart-jobs/default.nix b/upstart-jobs/default.nix
index 3ecd007dc1c..9df21fb57a5 100644
--- a/upstart-jobs/default.nix
+++ b/upstart-jobs/default.nix
@@ -236,6 +236,12 @@ let
       fontDirectories = import ../system/fonts.nix {inherit pkgs config;};
     })
 
+  ++ optional config.services.kdm.enable
+    (import ../upstart-jobs/kdm.nix {
+      inherit config pkgs kernelPackages;
+      fontDirectories = import ../system/fonts.nix {inherit pkgs config;};
+    })
+
   # Apache httpd.
   ++ optional (config.services.httpd.enable && !config.services.httpd.experimental)
     (import ../upstart-jobs/httpd.nix {
diff --git a/upstart-jobs/kdm.nix b/upstart-jobs/kdm.nix
new file mode 100644
index 00000000000..a4bae828c2b
--- /dev/null
+++ b/upstart-jobs/kdm.nix
@@ -0,0 +1,269 @@
+{config, pkgs, kernelPackages, fontDirectories}:
+
+let
+  # Abbreviations.
+  cfg = config.services.xserver;
+  xorg = pkgs.xlibs;
+  
+  inherit (pkgs.lib) optional isInList getAttr;
+  stdenv = pkgs.stdenv;
+  
+  knownVideoDrivers = {
+    nvidia = { modulesFirst = [ kernelPackages.nvidia_x11 ]; };  #make sure it first loads the nvidia libs
+    vesa =   { modules = [xorg.xf86videovesa]; };
+    vga =    { modules = [xorg.xf86videovga]; };
+    sis =    { modules = [xorg.xf86videosis]; };
+    i810 =   { modules = [xorg.xf86videoi810]; };
+    intel =  { modules = [xorg.xf86videointel]; };
+    nv =     { modules = [xorg.xf86videonv]; };
+    ati =    { modules = [xorg.xf86videoati]; };
+    via =    { modules = [xorg.xf86videovia]; };
+    cirrus = { modules = [xorg.xf86videocirrus]; };
+  };
+
+  # Get a bunch of user settings.
+  videoDriver = cfg.videoDriver;
+  resolutions = map (res: ''"${toString res.x}x${toString res.y}"'') (cfg.resolutions);
+  sessionType = cfg.sessionType;
+
+  videoDriverModules = getAttr [ videoDriver ] (throw "unkown video driver : \"${videoDriver}\"") knownVideoDrivers;
+
+  modules = 
+
+    getAttr ["modulesFirst"] [] videoDriverModules
+    ++ [
+      xorg.xorgserver
+      xorg.xf86inputkeyboard
+      xorg.xf86inputmouse
+    ] 
+    ++ getAttr ["modules"] [] videoDriverModules
+    ++ (optional cfg.synaptics.enable ["${pkgs.synaptics}/${xorg.xorgserver}" /*xorg.xf86inputevdev*/]);
+
+
+  fontsForXServer =
+    fontDirectories ++
+    # We don't want these fonts in fonts.conf, because then modern,
+    # fontconfig-based applications will get horrible bitmapped
+    # Helvetica fonts.  It's better to get a substitution (like Nimbus
+    # Sans) than that horror.  But we do need the Adobe fonts for some
+    # old non-fontconfig applications.  (Possibly this could be done
+    # better using a fontconfig rule.)
+    [ pkgs.xorg.fontadobe100dpi
+      pkgs.xorg.fontadobe75dpi
+    ];
+
+  configFile = stdenv.mkDerivation {
+    name = "xserver.conf";
+    src = ./xserver.conf;
+    inherit fontsForXServer videoDriver resolutions;
+    isClone = if cfg.isClone then "on" else "off";
+
+    synapticsInputDevice = if cfg.synaptics.enable then ''
+      Section "InputDevice"
+        Identifier "Touchpad[0]"
+        Driver "synaptics"
+        Option "Device" "${cfg.synaptics.dev}"
+        Option "Protocol" "PS/2"
+        Option "LeftEdge" "1700"
+        Option "RightEdge" "5300"
+        Option "TopEdge" "1700"
+        Option "BottomEdge" "4200"
+        Option "FingerLow" "25"
+        Option "FingerHigh" "30"
+        Option "MaxTapTime" "180"
+        Option "MaxTapMove" "220"
+        Option "VertScrollDelta" "100"
+        Option "MinSpeed" "${cfg.synaptics.minSpeed}"
+        Option "MaxSpeed" "${cfg.synaptics.maxSpeed}"
+        Option "AccelFactor" "0.0010"
+        Option "SHMConfig" "on"
+        Option "Repeater" "/dev/input/mice"
+        Option "TapButton1" "1"
+        Option "TapButton2" "2"
+        Option "TapButton3" "3"
+	Option "VertTwoFingerScroll" "${if cfg.synaptics.twoFingerScroll then "1" else "0"}"
+	Option "HorizTwoFingerScroll" "${if cfg.synaptics.twoFingerScroll then "1" else "0"}"
+      EndSection
+    '' else "";
+
+    xkbOptions = if cfg.xkbOptions == "" then "" else  ''
+      Option "XkbOptions" "${cfg.xkbOptions}"
+    '';
+
+    xkbModel = cfg.xkbModel;
+    layout = cfg.layout;
+
+    corePointer = if cfg.synaptics.enable then "Touchpad[0]" else "Mouse[0]";
+
+    internalAGPGART =
+      if cfg.useInternalAGPGART == "yes" then
+        ''  Option "UseInternalAGPGART" "yes"''
+      else if cfg.useInternalAGPGART == "no" then
+        ''  Option "UseInternalAGPGART" "no"''
+      else "";
+
+    extraDeviceConfig = cfg.extraDeviceConfig; 
+    extraMonitorSettings = cfg.extraMonitorSettings; 
+    extraDisplaySettings = cfg.extraDisplaySettings;
+    extraModules = cfg.extraModules; 
+    serverLayoutOptions = cfg.serverLayoutOptions; 
+    defaultDepth = cfg.defaultDepth; 
+    virtualScreen = if cfg.virtualScreen != null then 
+        "Virtual ${toString cfg.virtualScreen.x} ${toString cfg.virtualScreen.y}" 
+      else "";
+
+    xfs = if cfg.useXFS == false then "" else 
+      ''FontPath "${toString cfg.useXFS}"'';
+
+    buildCommand = ''
+      buildCommand= # urgh, don't substitute this
+
+      export fontPaths=
+      for i in $fontsForXServer; do
+        if test "''${i:0:''${#NIX_STORE}}" == "$NIX_STORE"; then
+          for j in $(find $i -name fonts.dir); do
+            fontPaths="''${fontPaths}FontPath \"$(dirname $j)\"''\n"
+          done
+        fi
+      done
+
+      export modulePaths=
+      for i in $(find ${toString modules} -type d); do
+        if ls $i/*.so* > /dev/null 2>&1; then
+          modulePaths="''${modulePaths}ModulePath \"$i\"''\n"
+        fi
+      done
+
+      export moduleSection=""
+      export screen=""
+      export device=""
+      export extensions=""
+
+
+      #if only my gf were this dirty
+      if test "${toString videoDriver}" == "nvidia"; then
+        export screen='
+          Option "AddARGBGLXVisuals" "true"
+          Option "DisableGLXRootClipping" "true"
+          Option "RandRRotation" "on"
+        '
+        
+        export device='
+          Option "RenderAccel" "true"
+          Option "AllowGLXWithComposite" "true"
+          Option "AddARGBGLXVisuals" "true"
+        '
+        
+        export extensions='
+          Option "Composite" "Enable"
+        '
+      fi
+        
+      if [ "${toString videoDriver}" = i810 ]; then
+        export extensions='
+          Option "Composite" "Enable"
+        ';
+      fi;
+
+      if [ "${toString videoDriver}" = ati ]; then
+        export extensions='
+          Option "Composite" "Enable"
+        ';
+      fi;
+
+      if [ "${toString videoDriver}" = radeonhd ]; then
+        export extensions='
+          Option "Composite" "Enable"
+        ';
+      fi;
+
+      substituteAll $src $out
+    ''; # */
+  };
+
+  xsession = pkgs.writeText "Xsession" ''
+    source /etc/profile
+    
+    session=$1
+    
+    export PATH=$PATH:${pkgs.xterm}/bin:${pkgs.qt4}/bin:${pkgs.dbus.libs}/bin:${pkgs.kde42.kdelibs}/bin:${pkgs.xlibs.xset}/bin:${pkgs.xlibs.xsetroot}/bin:${pkgs.xlibs.xmessage}/bin:${pkgs.xlibs.xprop}/bin
+    export XDG_CONFIG_DIRS=
+    export XDG_DATA_DIRS=${pkgs.shared_mime_info}/share
+    
+    case $session in
+      "")
+        exec xmessage -center -buttons OK:0 -default OK "Sorry, $DESKTOP_SESSION is no valid session."
+        ;;
+      failsafe)
+        exec xterm -geometry 80x24-0-0
+        ;;
+      custom)
+        exec $HOME/.xsession
+      ;;
+      default)
+        exec ${pkgs.kde42.kdebase_workspace}/bin/startkde
+        ;;
+      *)
+      eval exec "$session"
+      ;;
+    esac
+
+    exec xmessage -center -buttons OK:0 -default OK "Sorry, cannot execute $session. Check $DESKTOP_SESSION.desktop."
+  '';
+ 
+  kdmrc = stdenv.mkDerivation {
+    name = "kdmrc";
+    buildCommand = ''
+      cp ${pkgs.kde42.kdebase_workspace}/share/config/kdm/kdmrc .
+      sed -i -e "s|#HaltCmd=|HaltCmd=${pkgs.upstart}/sbin/halt|" \
+             -e "s|#RebootCmd=|RebootCmd=${pkgs.upstart}/sbin/reboot|" \
+	     -e "s|#Xrdb=|Xrdb=${pkgs.xlibs.xrdb}/bin/xrdb|" \
+	     -e "s|#HiddenUsers=root|HiddenUsers=root,nixbld1,nixbld2,nixbld3,nixbld4,nixbld5,nixbld6,nixbld7,nixbld8,nixbld9,nixbld10|" \
+	     -e "s|ServerCmd=/FOO/bin/X|ServerCmd=${pkgs.xlibs.xorgserver}/bin/X -config ${configFile} -xkbdir ${pkgs.xkeyboard_config}/etc/X11/xkb|" \
+	     -e "s|Session=${pkgs.kde42.kdebase_workspace}/share/config/kdm/Xsession|Session=${xsession}|" \
+	     -e "s|#FailsafeClient=|FailsafeClient=${pkgs.xterm}/bin/xterm|" \
+	     -e "s|#PluginsLogin=sign|PluginsLogin=${pkgs.kde42.kdebase_workspace}/lib/kde4/kgreet_classic.so|" \
+      kdmrc
+      ensureDir $out
+      cp kdmrc $out
+    '';
+  };
+in
+{
+  name = "kdm";
+    
+  job = ''
+    description "KDE Display Manager"
+
+    start script
+    
+      rm -f /var/run/opengl-driver
+      ${if videoDriver == "nvidia"        
+        then ''
+          ln -sf ${kernelPackages.nvidia_x11} /var/run/opengl-driver
+        ''
+        else if cfg.driSupport
+        then "ln -sf ${pkgs.mesa} /var/run/opengl-driver"
+        else ""
+       }
+
+      rm -f /tmp/.X0-lock
+       
+    end script
+
+    ${if videoDriver == "nvidia" 
+      then "env LD_LIBRARY_PATH=${xorg.libX11}/lib:${xorg.libXext}/lib:${kernelPackages.nvidia_x11}/lib" 
+      else ""
+    }
+
+    ${if videoDriver != "nvidia"
+      then "env XORG_DRI_DRIVER_PATH=${pkgs.mesa}/lib/modules/dri"
+      else ""
+    }
+    
+    env FONTCONFIG_FILE=/etc/fonts/fonts.conf # !!! cleanup
+    env XKB_BINDIR=${xorg.xkbcomp}/bin # Needed for the Xkb extension.
+    
+    respawn ${pkgs.kde42.kdebase_workspace}/bin/kdm -config ${kdmrc}/kdmrc
+  '';
+}
-- 
GitLab


From bec0e32034493c6bbf08d70a9342d09565e098a9 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 9 Apr 2009 14:11:55 +0000
Subject: [PATCH 1352/5331] * Add the programs provided by the acl, attr and
 libcap libraries to   the system path.  (They were in the closure already
 anyway so it   doesn't cost us anything.)

svn path=/nixos/trunk/; revision=14973
---
 system/system.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/system/system.nix b/system/system.nix
index 78063113089..43e4bc58156 100644
--- a/system/system.nix
+++ b/system/system.nix
@@ -182,6 +182,8 @@ rec {
     setuidWrapper
   ]
   ++ pkgs.lib.optionals (!config.environment.cleanStart) [
+    pkgs.acl
+    pkgs.attr
     pkgs.bashInteractive # bash with ncurses support
     pkgs.bzip2
     pkgs.coreutils
@@ -197,6 +199,7 @@ rec {
     pkgs.gzip
     pkgs.iputils
     pkgs.less
+    pkgs.libcap
     pkgs.lvm2
     pkgs.man
     pkgs.mdadm
-- 
GitLab


From 23c03c3f46dbcfe0910a6498d932d3cdd30f2cb4 Mon Sep 17 00:00:00 2001
From: Nicolas Pierron <nicolas.b.pierron@gmail.com>
Date: Sat, 11 Apr 2009 22:17:01 +0000
Subject: [PATCH 1353/5331] Fix typo in kdeEnvironment.

svn path=/nixos/branches/modular-nixos/; revision=14987
---
 upstart-jobs/xserver/desktopManager/kdeEnvironment.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/upstart-jobs/xserver/desktopManager/kdeEnvironment.nix b/upstart-jobs/xserver/desktopManager/kdeEnvironment.nix
index 52628168161..5d9ab3ae5a3 100644
--- a/upstart-jobs/xserver/desktopManager/kdeEnvironment.nix
+++ b/upstart-jobs/xserver/desktopManager/kdeEnvironment.nix
@@ -29,7 +29,7 @@ let
           Additional KDE packages to be used when you use KDE as a desktop
           manager.  By default, you only get the KDE base packages.
         '';
-        apply = pkgs: pkgs ++ config.kde.extraPackages
+        apply = pkgs: pkgs ++ config.kde.extraPackages;
       };
 
     };
-- 
GitLab


From b72989eda059086223c996f12fcc4d2a0e0733c6 Mon Sep 17 00:00:00 2001
From: Nicolas Pierron <nicolas.b.pierron@gmail.com>
Date: Sat, 11 Apr 2009 22:17:05 +0000
Subject: [PATCH 1354/5331] Add a FIXME description to the requiredTTYs option.

Fix manual compilation.

svn path=/nixos/branches/modular-nixos/; revision=14988
---
 upstart-jobs/kbd.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/upstart-jobs/kbd.nix b/upstart-jobs/kbd.nix
index 504b902bcb1..61dc93737af 100644
--- a/upstart-jobs/kbd.nix
+++ b/upstart-jobs/kbd.nix
@@ -29,6 +29,10 @@ in
     {
       requiredTTYs = mkOption {
         default = [];
+        description = "
+          FIXME: find another place for this option.
+          FIXME: find a good description.
+        ";
       };
     }
   ];
-- 
GitLab


From a67aecb38b068af76aaa61a973078317ea2b5bc0 Mon Sep 17 00:00:00 2001
From: Nicolas Pierron <nicolas.b.pierron@gmail.com>
Date: Sat, 11 Apr 2009 22:17:10 +0000
Subject: [PATCH 1355/5331] Used the override version of nix and not the
 default one provided by nixpkgs.

svn path=/nixos/branches/modular-nixos/; revision=14989
---
 upstart-jobs/nix.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/upstart-jobs/nix.nix b/upstart-jobs/nix.nix
index f24be8e16fa..63941bf8ef4 100644
--- a/upstart-jobs/nix.nix
+++ b/upstart-jobs/nix.nix
@@ -226,7 +226,7 @@ in
         script
           export PATH=${if config.nix.distributedBuilds then "${pkgs.openssh}/bin:" else ""}${pkgs.openssl}/bin:${nix}/bin:$PATH
           ${nixEnvVars}
-          exec ${pkgs.nix}/bin/nix-worker --daemon > /dev/null 2>&1
+          exec ${nix}/bin/nix-worker --daemon > /dev/null 2>&1
         end script
       '';
     }];
-- 
GitLab


From 33a0873f6f0c91681261d96f76a95e32a8facf2c Mon Sep 17 00:00:00 2001
From: Nicolas Pierron <nicolas.b.pierron@gmail.com>
Date: Sat, 11 Apr 2009 22:28:33 +0000
Subject: [PATCH 1356/5331] Add error messages to detect if the default (not
 override by the user) WM/DM is enable. Enable xterm desktop manager.

svn path=/nixos/branches/modular-nixos/; revision=14990
---
 upstart-jobs/xserver/desktopManager/default.nix | 6 +++---
 upstart-jobs/xserver/desktopManager/xterm.nix   | 4 ++--
 upstart-jobs/xserver/windowManager/default.nix  | 6 +++---
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/upstart-jobs/xserver/desktopManager/default.nix b/upstart-jobs/xserver/desktopManager/default.nix
index 7ea49571698..f0355381233 100644
--- a/upstart-jobs/xserver/desktopManager/default.nix
+++ b/upstart-jobs/xserver/desktopManager/default.nix
@@ -57,12 +57,12 @@ in
           description = "
             Default desktop manager loaded if none have been chosen.
           ";
-          merge = list:
-            let defaultDM = mergeOneOption list; in
+          merge = mergeOneOption;
+          apply = defaultDM:
             if any (w: w.name == defaultDM) cfg.session.list then
               defaultDM
             else
-              throw "Default desktop manager not found.";
+              throw "Default desktop manager ($(defaultDM)) not found.";
         };
       };
     };
diff --git a/upstart-jobs/xserver/desktopManager/xterm.nix b/upstart-jobs/xserver/desktopManager/xterm.nix
index e8aa0d289cb..7066c44527c 100644
--- a/upstart-jobs/xserver/desktopManager/xterm.nix
+++ b/upstart-jobs/xserver/desktopManager/xterm.nix
@@ -8,8 +8,8 @@ let
 
     xterm = {
       enable = mkOption {
-        default = false;
-        example = true;
+        default = true;
+        example = false;
         description = "Enable a xterm terminal as a desktop manager.";
       };
     };
diff --git a/upstart-jobs/xserver/windowManager/default.nix b/upstart-jobs/xserver/windowManager/default.nix
index cb5a1b674e0..5e33b58b3b1 100644
--- a/upstart-jobs/xserver/windowManager/default.nix
+++ b/upstart-jobs/xserver/windowManager/default.nix
@@ -45,12 +45,12 @@ in
           description = "
             Default window manager loaded if none have been chosen.
           ";
-          merge = list:
-            let defaultWM = mergeOneOption list; in
+          merge = mergeOneOption;
+          apply = defaultWM:
             if any (w: w.name == defaultWM) cfg.session then
               defaultWM
             else
-              throw "Default window manager not found.";
+              throw "Default window manager (${defaultWM}) not found.";
         };
       };
     };
-- 
GitLab


From 3a8ef07934c94dcbcf2e52ad61272c8266568ad6 Mon Sep 17 00:00:00 2001
From: Nicolas Pierron <nicolas.b.pierron@gmail.com>
Date: Sat, 11 Apr 2009 22:28:38 +0000
Subject: [PATCH 1357/5331] Add wmii package in the environment if wmii WM is
 enabled.

svn path=/nixos/branches/modular-nixos/; revision=14991
---
 upstart-jobs/xserver/windowManager/wmii.nix | 32 ++++++++++++++-------
 1 file changed, 22 insertions(+), 10 deletions(-)

diff --git a/upstart-jobs/xserver/windowManager/wmii.nix b/upstart-jobs/xserver/windowManager/wmii.nix
index 59a88f9352f..219550c4f0c 100644
--- a/upstart-jobs/xserver/windowManager/wmii.nix
+++ b/upstart-jobs/xserver/windowManager/wmii.nix
@@ -3,22 +3,28 @@
 let
   inherit (pkgs.lib) mkOption mkIf;
   cfg = config.services.xserver.windowManager.wmii;
+
+  option = { services = { xserver = { windowManager = {
+
+    wmii = {
+      enable = mkOption {
+        default = false;
+        example = true;
+        description = "Enable the wmii window manager.";
+      };
+    };
+
+  }; }; }; };
 in
 
-{
+mkIf cfg.enable {
+  require = option;
+
   services = {
     xserver = {
 
       windowManager = {
-        wmii = {
-          enable = mkOption {
-            default = false;
-            example = true;
-            description = "Enable the wmii window manager.";
-          };
-        };
-
-        session = mkIf cfg.enable [{
+        session = [{
           name = "wmii";
           start = "
             ${pkgs.wmiiSnap}/bin/wmii &
@@ -29,4 +35,10 @@ in
 
     };
   };
+
+  environment = {
+    extraPackages = [
+      pkgs.wmiiSnap
+    ];
+  };
 }
-- 
GitLab


From 313fa38e2e574688f103f5c3137436ffe3453027 Mon Sep 17 00:00:00 2001
From: Nicolas Pierron <nicolas.b.pierron@gmail.com>
Date: Sun, 12 Apr 2009 14:38:41 +0000
Subject: [PATCH 1358/5331] Remove useless require attribute in
 system/nixos-environment.nix.

svn path=/nixos/branches/modular-nixos/; revision=14994
---
 system/nixos-environment.nix | 108 +++++++++++++++++------------------
 1 file changed, 52 insertions(+), 56 deletions(-)

diff --git a/system/nixos-environment.nix b/system/nixos-environment.nix
index bc28532689e..7ce7571f475 100644
--- a/system/nixos-environment.nix
+++ b/system/nixos-environment.nix
@@ -1,67 +1,63 @@
-
 {pkgs, config, ...}:
+
 let
-  inherit (pkgs.lib) mergeOneOption mkOption mkIf;
+  inherit (pkgs.lib) mergeOneOption mkOption;
 in
-{
-  require = [ 
-  {
 
-    environment = {
-      checkConfigurationOptions = mkOption {
-        default = true;
-        example = false;
-        description = "
-          If all configuration options must be checked. Non-existing options fail build.
-        ";
-      };
+{
+  environment = {
+    checkConfigurationOptions = mkOption {
+      default = true;
+      example = false;
+      description = "
+        If all configuration options must be checked. Non-existing options fail build.
+      ";
+    };
 
-      nix = mkOption {
-        default = pkgs.nixUnstable;
-        example = pkgs.nixCustomFun /root/nix.tar.gz;
-        merge = mergeOneOption;
-        description = "
-          Use non-default Nix easily. Be careful, though, not to break everything.
-        ";
-      };
+    nix = mkOption {
+      default = pkgs.nixUnstable;
+      example = pkgs.nixCustomFun /root/nix.tar.gz;
+      merge = mergeOneOption;
+      description = "
+        Use non-default Nix easily. Be careful, though, not to break everything.
+      ";
+    };
 
-      extraPackages = mkOption {
-        default = [];
-        example = [pkgs.firefox pkgs.thunderbird];
-        description = "
-          This option allows you to add additional packages to the system
-          path.  These packages are automatically available to all users,
-          and they are automatically updated every time you rebuild the
-          system configuration.  (The latter is the main difference with
-          installing them in the default profile,
-          <filename>/nix/var/nix/profiles/default</filename>.  The value
-          of this option must be a function that returns a list of
-          packages.  The function will be called with the Nix Packages
-          collection as its argument for convenience.
-        ";
-      };
+    extraPackages = mkOption {
+      default = [];
+      example = [pkgs.firefox pkgs.thunderbird];
+      description = "
+        This option allows you to add additional packages to the system
+        path.  These packages are automatically available to all users,
+        and they are automatically updated every time you rebuild the
+        system configuration.  (The latter is the main difference with
+        installing them in the default profile,
+        <filename>/nix/var/nix/profiles/default</filename>.  The value
+        of this option must be a function that returns a list of
+        packages.  The function will be called with the Nix Packages
+        collection as its argument for convenience.
+      ";
+    };
 
 
-      pathsToLink = mkOption {
-        default = ["/bin" "/sbin" "/lib" "/share/man" "/share/info" "/man" "/info"];
-        example = ["/"];
-        description = "
-          Lists directories to be symlinked in `/var/run/current-system/sw'.
-        ";
-      };
+    pathsToLink = mkOption {
+      default = ["/bin" "/sbin" "/lib" "/share/man" "/share/info" "/man" "/info"];
+      example = ["/"];
+      description = "
+        Lists directories to be symlinked in `/var/run/current-system/sw'.
+      ";
+    };
 
-      cleanStart = mkOption {
-        default = false;
-        example = true;
-        description = "
-          There are some times when you want really small system for specific 
-          purpose and do not want default package list. Setting 
-          <varname>cleanStart</varname> to <literal>true</literal> allows you 
-          to create a system with empty path - only extraPackages will be 
-          included.
-        ";
-      };
+    cleanStart = mkOption {
+      default = false;
+      example = true;
+      description = "
+        There are some times when you want really small system for specific 
+        purpose and do not want default package list. Setting 
+        <varname>cleanStart</varname> to <literal>true</literal> allows you 
+        to create a system with empty path - only extraPackages will be 
+        included.
+      ";
     };
-  }
-  ];
+  };
 }
-- 
GitLab


From 49bd768f99b4eab14a95df15821287051b73f2c3 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Mon, 13 Apr 2009 09:35:03 +0000
Subject: [PATCH 1359/5331] As we do not really generate ejabbred.cfg, allow at
 least overwriting it manually

svn path=/nixos/trunk/; revision=15006
---
 etc/default.nix           | 1 +
 etc/pam.d/ejabberd        | 4 ++++
 upstart-jobs/ejabberd.nix | 2 +-
 3 files changed, 6 insertions(+), 1 deletion(-)
 create mode 100644 etc/pam.d/ejabberd

diff --git a/etc/default.nix b/etc/default.nix
index 656e197eca5..cf4085ba236 100644
--- a/etc/default.nix
+++ b/etc/default.nix
@@ -259,6 +259,7 @@ import ../helpers/make-etc.nix {
       "kde"
       "cups"
       "ftp"
+      "ejabberd"
       "common"
       "common-console" # shared stuff for interactive local sessions
     ]
diff --git a/etc/pam.d/ejabberd b/etc/pam.d/ejabberd
new file mode 100644
index 00000000000..50f3cc5ce60
--- /dev/null
+++ b/etc/pam.d/ejabberd
@@ -0,0 +1,4 @@
+auth     include        common
+account  include        common
+password include        common
+session  include        common
diff --git a/upstart-jobs/ejabberd.nix b/upstart-jobs/ejabberd.nix
index d2a5084068f..d7ab158af5d 100644
--- a/upstart-jobs/ejabberd.nix
+++ b/upstart-jobs/ejabberd.nix
@@ -24,7 +24,7 @@ in
             fi
 	    
 	    mkdir -p ${cfg.confDir}
-	    sed -e 's|{hosts, \["localhost"\]}.|{hosts, \[${cfg.virtualHosts}\]}.|' ${pkgs.ejabberd}/etc/ejabberd/ejabberd.cfg > ${cfg.confDir}/ejabberd.cfg
+	    test -f ${cfg.confDir}/ejabberd.cfg || sed -e 's|{hosts, \["localhost"\]}.|{hosts, \[${cfg.virtualHosts}\]}.|' ${pkgs.ejabberd}/etc/ejabberd/ejabberd.cfg > ${cfg.confDir}/ejabberd.cfg
       end script
       
       respawn ${pkgs.bash}/bin/sh -c 'export PATH=$PATH:${pkgs.ejabberd}/sbin; cd ~; ejabberdctl --logs ${cfg.logsDir} --spool ${cfg.spoolDir} --config ${cfg.confDir}/ejabberd.cfg start; sleep 1d'
-- 
GitLab


From 0ff58754ae88b04341a1c02e415ccbe3fec35318 Mon Sep 17 00:00:00 2001
From: Nicolas Pierron <nicolas.b.pierron@gmail.com>
Date: Mon, 13 Apr 2009 10:47:15 +0000
Subject: [PATCH 1360/5331] Move slim options into the displayManager attribute
 set. Add an enable flag to slim which is by default set to be true.

svn path=/nixos/branches/modular-nixos/; revision=15009
---
 upstart-jobs/xserver/displayManager/slim.nix | 87 +++++++++++++-------
 1 file changed, 57 insertions(+), 30 deletions(-)

diff --git a/upstart-jobs/xserver/displayManager/slim.nix b/upstart-jobs/xserver/displayManager/slim.nix
index 8363a7a14ee..8e29bc77a5d 100644
--- a/upstart-jobs/xserver/displayManager/slim.nix
+++ b/upstart-jobs/xserver/displayManager/slim.nix
@@ -4,41 +4,65 @@
 let
   inherit (pkgs.lib) mkOption;
 
-  options = { services = { xserver = {
+  slimOptions = {
 
-    slim = {
-
-      theme = mkOption {
-        default = null;
-        example = pkgs.fetchurl {
-          url = http://download.berlios.de/slim/slim-wave.tar.gz;
-          sha256 = "0ndr419i5myzcylvxb89m9grl2xyq6fbnyc3lkd711mzlmnnfxdy";
-        };
-        description = "
-          The theme for the SLiM login manager.  If not specified, SLiM's
-          default theme is used.  See <link
-          xlink:href='http://slim.berlios.de/themes01.php'/> for a
-          collection of themes.
-        ";
+    theme = mkOption {
+      default = null;
+      example = pkgs.fetchurl {
+        url = http://download.berlios.de/slim/slim-wave.tar.gz;
+        sha256 = "0ndr419i5myzcylvxb89m9grl2xyq6fbnyc3lkd711mzlmnnfxdy";
       };
+      description = "
+        The theme for the SLiM login manager.  If not specified, SLiM's
+        default theme is used.  See <link
+        xlink:href='http://slim.berlios.de/themes01.php'/> for a
+        collection of themes.
+      ";
+    };
 
-      defaultUser = mkOption {
-        default = "";
-        example = "login";
-        description = "
-          The default user to load. If you put a username here you
-          get it automatically loaded into the username field, and
-          the focus is placed on the password.
-        ";
-      };
+    defaultUser = mkOption {
+      default = "";
+      example = "login";
+      description = "
+        The default user to load. If you put a username here you
+        get it automatically loaded into the username field, and
+        the focus is placed on the password.
+      ";
+    };
+
+    hideCursor = mkOption {
+      default = false;
+      example = true;
+      description = "
+        Hide the mouse cursor on the login screen.
+      ";
+    };
 
-      hideCursor = mkOption {
-        default = false;
-        example = true;
+  };
+
+  options = { services = { xserver = { displayManager = {
+
+    slim = slimOptions // {
+
+      enable = mkOption {
+        default = true;
         description = "
-          Hide the mouse cursor on the login screen.
+          Whether to enable slim as the display manager.
         ";
       };
+
+    };
+
+  }; /* displayManager */ }; /* xserver */ }; /* services */ };
+
+  copyOldOptions = { services = { xserver = {
+
+    # Declare old options.
+    slim = slimOptions;
+
+    # Copy the old options into the new options.
+    displayManager = {
+      slim = config.services.xserver.slim;
     };
 
   }; /* xserver */ }; /* services */ };
@@ -49,7 +73,9 @@ in
 let
   xcfg = config.services.xserver;
   dmcfg = xcfg.displayManager;
-  cfg = xcfg.slim;
+  cfg = dmcfg.slim;
+
+  inherit (pkgs.lib) mkIf;
 
   slimConfig = pkgs.writeText "slim.cfg" ''
     xauth_path ${dmcfg.xauthBin}
@@ -80,9 +106,10 @@ let
 
 in
 
-{
+mkIf cfg.enable {
   require = [
     options
+    copyOldOptions
   ];
 
   services = {
-- 
GitLab


From b1e05ed8fa95cd41e21b6d0e4da1c354b361c91d Mon Sep 17 00:00:00 2001
From: Nicolas Pierron <nicolas.b.pierron@gmail.com>
Date: Mon, 13 Apr 2009 10:55:41 +0000
Subject: [PATCH 1361/5331] * Synced with trunk @ 14913

svn path=/nixos/branches/modular-nixos/; revision=15010
---
 .../xserver/displayManager/default.nix        |  1 +
 upstart-jobs/xserver/displayManager/kdm.nix   | 68 +++++++++++++++++++
 2 files changed, 69 insertions(+)
 create mode 100644 upstart-jobs/xserver/displayManager/kdm.nix

diff --git a/upstart-jobs/xserver/displayManager/default.nix b/upstart-jobs/xserver/displayManager/default.nix
index 12393af8f6c..f7734c96aaa 100644
--- a/upstart-jobs/xserver/displayManager/default.nix
+++ b/upstart-jobs/xserver/displayManager/default.nix
@@ -72,6 +72,7 @@ in
 {
   # list of display managers.
   require = [
+    (import ./kdm.nix)
     (import ./slim.nix)
   ];
 
diff --git a/upstart-jobs/xserver/displayManager/kdm.nix b/upstart-jobs/xserver/displayManager/kdm.nix
new file mode 100644
index 00000000000..38ab01c4c3c
--- /dev/null
+++ b/upstart-jobs/xserver/displayManager/kdm.nix
@@ -0,0 +1,68 @@
+{pkgs, config, ...}:
+
+###### interface
+let
+  inherit (pkgs.lib) mkOption;
+
+  options = { services = { xserver = { displayManager = {
+
+    kdm = {
+      enable = mkOption {
+        default = false;
+        description = "
+          Whether to enable the KDE display manager.
+        ";
+      };
+    };
+
+  }; /* displayManager */ }; /* xserver */ }; /* services */ };
+
+in
+
+###### implementation
+let
+  xcfg = config.services.xserver;
+  dmcfg = xcfg.displayManager;
+  cfg = dmcfg.kdm;
+
+  inherit (pkgs.lib) mkIf;
+  inherit (pkgs) stdenv;
+  inherit (pkgs.kde42) kdebase_workspace;
+
+  kdmrc = stdenv.mkDerivation {
+    name = "kdmrc";
+    buildCommand = ''
+      cp ${kdebase_workspace}/share/config/kdm/kdmrc .
+      sed -i -e "s|#HaltCmd=|HaltCmd=${pkgs.upstart}/sbin/halt|" \
+             -e "s|#RebootCmd=|RebootCmd=${pkgs.upstart}/sbin/reboot|" \
+	     -e "s|#Xrdb=|Xrdb=${pkgs.xlibs.xrdb}/bin/xrdb|" \
+	     -e "s|#HiddenUsers=root|HiddenUsers=root,nixbld1,nixbld2,nixbld3,nixbld4,nixbld5,nixbld6,nixbld7,nixbld8,nixbld9,nixbld10|" \
+	     -e "s|ServerCmd=/FOO/bin/X|ServerCmd=${dmcfg.xserverBin} ${dmcfg.xserverArgs}|" \
+	     -e "s|Session=${kdebase_workspace}/share/config/kdm/Xsession|Session=${dmcfg.session.script}|" \
+	     -e "s|#FailsafeClient=|FailsafeClient=${pkgs.xterm}/bin/xterm|" \
+	     -e "s|#PluginsLogin=sign|PluginsLogin=${kdebase_workspace}/lib/kde4/kgreet_classic.so|" \
+      kdmrc
+      ensureDir $out
+      cp kdmrc $out
+    '';
+  };
+
+in
+
+mkIf cfg.enable {
+  require = [
+    options
+  ];
+
+  services = {
+    xserver = {
+      displayManager = {
+        job = {
+          beforeScript = "";
+          env = "";
+          execCmd = "${kdebase_workspace}/bin/kdm -config ${kdmrc}/kdmrc";
+        };
+      };
+    };
+  };
+}
-- 
GitLab


From 98eda9447392a29862d5b86fe10fc88bc74ed1c2 Mon Sep 17 00:00:00 2001
From: Nicolas Pierron <nicolas.b.pierron@gmail.com>
Date: Mon, 13 Apr 2009 10:57:36 +0000
Subject: [PATCH 1362/5331] KDM: Add support for extra window & desktop
 manager.

svn path=/nixos/branches/modular-nixos/; revision=15011
---
 .../xserver/displayManager/default.nix         | 18 +++++++++++++++++-
 upstart-jobs/xserver/displayManager/kdm.nix    |  3 ++-
 2 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/upstart-jobs/xserver/displayManager/default.nix b/upstart-jobs/xserver/displayManager/default.nix
index f7734c96aaa..af77247f6e6 100644
--- a/upstart-jobs/xserver/displayManager/default.nix
+++ b/upstart-jobs/xserver/displayManager/default.nix
@@ -6,7 +6,7 @@ let
   xorg = cfg.package;
 
   # file provided by services.xserver.displayManager.session.script
-  xsession = wm: dm: pkgs.writeText "xsession" ''
+  xsession = wm: dm: pkgs.writeScript "xsession" ''#!/bin/sh
 
     source /etc/profile
 
@@ -67,6 +67,21 @@ let
     exit
   '';
 
+  mkDesktops = names: pkgs.runCommand "desktops" {} ''
+    ensureDir $out
+    ${concatMapStrings (n: ''
+      cat - > "$out/${n}.desktop" << EODESKTOP
+      [Desktop Entry]
+      Version=1.0
+      Type=XSession
+      TryExec=${cfg.displayManager.session.script}
+      Exec=${cfg.displayManager.session.script} '${n}'
+      Name=${n}
+      Comment=
+      EODESKTOP
+    '') names}
+  '';
+
 in
 
 {
@@ -138,6 +153,7 @@ in
             wm = filter (s: s.manage == "window") list;
             dm = filter (s: s.manage == "desktop") list;
             names = concatMap (d: map (w: d.name + " + " + w.name) wm) dm;
+            desktops = mkDesktops names;
             script = xsession wm dm;
           };
         };
diff --git a/upstart-jobs/xserver/displayManager/kdm.nix b/upstart-jobs/xserver/displayManager/kdm.nix
index 38ab01c4c3c..556519472e3 100644
--- a/upstart-jobs/xserver/displayManager/kdm.nix
+++ b/upstart-jobs/xserver/displayManager/kdm.nix
@@ -31,6 +31,7 @@ let
 
   kdmrc = stdenv.mkDerivation {
     name = "kdmrc";
+# 	     -e "s|Session=${kdebase_workspace}/share/config/kdm/Xsession|Session=${dmcfg.session.script}|" \
     buildCommand = ''
       cp ${kdebase_workspace}/share/config/kdm/kdmrc .
       sed -i -e "s|#HaltCmd=|HaltCmd=${pkgs.upstart}/sbin/halt|" \
@@ -38,7 +39,7 @@ let
 	     -e "s|#Xrdb=|Xrdb=${pkgs.xlibs.xrdb}/bin/xrdb|" \
 	     -e "s|#HiddenUsers=root|HiddenUsers=root,nixbld1,nixbld2,nixbld3,nixbld4,nixbld5,nixbld6,nixbld7,nixbld8,nixbld9,nixbld10|" \
 	     -e "s|ServerCmd=/FOO/bin/X|ServerCmd=${dmcfg.xserverBin} ${dmcfg.xserverArgs}|" \
-	     -e "s|Session=${kdebase_workspace}/share/config/kdm/Xsession|Session=${dmcfg.session.script}|" \
+ 	     -e "s|^SessionsDirs=.*$|SessionsDirs=${dmcfg.session.desktops}|" \
 	     -e "s|#FailsafeClient=|FailsafeClient=${pkgs.xterm}/bin/xterm|" \
 	     -e "s|#PluginsLogin=sign|PluginsLogin=${kdebase_workspace}/lib/kde4/kgreet_classic.so|" \
       kdmrc
-- 
GitLab


From 47b61bdd4aa7dcb98f3b069969d8f9882e18ea05 Mon Sep 17 00:00:00 2001
From: Nicolas Pierron <nicolas.b.pierron@gmail.com>
Date: Tue, 14 Apr 2009 12:31:08 +0000
Subject: [PATCH 1363/5331] * upstart-jobs/manual.nix:   - Replace "optional"
 function by one "mkIf".   - Pretty-print (indentation, extra lines, no
 trailing-whitespaces).

svn path=/nixos/branches/modular-nixos/; revision=15025
---
 upstart-jobs/manual.nix | 123 +++++++++++++++++++++++-----------------
 1 file changed, 71 insertions(+), 52 deletions(-)

diff --git a/upstart-jobs/manual.nix b/upstart-jobs/manual.nix
index c515e95d3dd..882cf8f8251 100644
--- a/upstart-jobs/manual.nix
+++ b/upstart-jobs/manual.nix
@@ -1,87 +1,106 @@
-{pkgs, config, ...}: 
+{pkgs, config, ...}:
 
 # Show the NixOS manual on tty7
 # Originally used only by installation CD
 
 let
   inherit (pkgs.lib) mkOption;
+
   options = {
     services = {
+
       showManual = {
+
         enable = mkOption {
-	  default = false;
-	  description = "
-	    Whether to show the NixOS manual on the tty7
-	  ";
-	};
-	ttyNumber = mkOption {
-	  default = "7";
-	  description = "
-	    TTY number name to show the manual on
-	  ";
-	};
-	browserPackage = mkOption {
-	  default = pkgs.w3m;
-	  description = "
-	    Package containing the browser to be used
-	  ";
-	};
-	browserCommand = mkOption {
-	  default = "bin/w3m";
-	  description = "
-	    Command (command path is relative to browserPackage) to run the browser
-	  ";
-	};
-	manualFile = mkOption {
-	  default = null; 
-	  description = "
-	    NixOS manual HTML file
-	  ";
-	};
-      };
-    };
+          default = false;
+          description = "
+            Whether to show the NixOS manual on the tty7
+          ";
+        };
+
+        ttyNumber = mkOption {
+          default = "7";
+          description = "
+            TTY number name to show the manual on
+          ";
+        };
+
+        browserPackage = mkOption {
+          default = pkgs.w3m;
+          description = "
+            Package containing the browser to be used
+          ";
+        };
+
+        browserCommand = mkOption {
+          default = "bin/w3m";
+          description = "
+            Command (command path is relative to browserPackage) to run the browser
+          ";
+        };
+
+        manualFile = mkOption {
+          default = null;
+          description = "
+            NixOS manual HTML file
+          ";
+        };
+
+      }; # showManual
+
+    }; # services
   };
+in
 
-inherit(pkgs.lib) optional;
+let
+  cfg = config.services.showManual;
+  inherit (cfg) enable ttyNumber browserPackage browserCommand manualFile;
 
-inherit (config.services.showManual) enable ttyNumber browserPackage browserCommand 
-  manualFile;
-	  
-realManualFile = if manualFile == null then 
-  (import ../doc/manual {nixpkgs = pkgs;})+"/manual.html"
-else manualFile;
+  realManualFile =
+    if manualFile == null then
+      (import ../doc/manual {nixpkgs = pkgs;})+"/manual.html"
+    else
+      manualFile;
 
+  inherit (pkgs.lib) mkIf mkThenElse;
 in
 
-{
+mkIf enable {
   require = [
     options
   ];
 
   boot = {
-    extraTTYs = optional enable ttyNumber;
+    extraTTYs = [ ttyNumber ];
   };
-  
+
   services = {
-    extraJobs = optional enable {
+
+    extraJobs = [{
       name = "showManual";
 
       job = ''
         description "NixOS manual"
-	
-	start on udev
-	stop on shutdown
-	respawn ${browserPackage}/${browserCommand} ${realManualFile} < /dev/tty${toString ttyNumber} > /dev/tty${toString ttyNumber} 2>&1
+
+        start on udev
+        stop on shutdown
+        respawn ${browserPackage}/${browserCommand} ${realManualFile} < /dev/tty${toString ttyNumber} > /dev/tty${toString ttyNumber} 2>&1
       '';
-    };
+    }];
+
     ttyBackgrounds = {
-      specificThemes = optional enable {
+      specificThemes = [{
         tty = ttyNumber;
-	theme = pkgs.themes "green";
-      };
+        theme = pkgs.themes "green";
+      }];
     };
+
     mingetty = {
-      helpLine = if enable then "\nPress <Alt-F${toString ttyNumber}> for NixOS manual." else "";
+      helpLine = mkThenElse {
+        thenPart = "\nPress <Alt-F${toString ttyNumber}> for NixOS manual.";
+        elsePart = "";
+      };
     };
+
   };
 }
-- 
GitLab


From 5c165ad81534c96344ea67abacc58453c757e65d Mon Sep 17 00:00:00 2001
From: Sander van der Burg <s.vanderburg@tudelft.nl>
Date: Tue, 14 Apr 2009 13:45:57 +0000
Subject: [PATCH 1364/5331] Added vboxdrv to udev in order to have proper
 permissions

svn path=/nixos/trunk/; revision=15032
---
 upstart-jobs/udev.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/upstart-jobs/udev.nix b/upstart-jobs/udev.nix
index 4662adde222..ae4fd6c653d 100644
--- a/upstart-jobs/udev.nix
+++ b/upstart-jobs/udev.nix
@@ -20,6 +20,7 @@ let
     KERNEL=="sonypi",               MODE="0666"
     KERNEL=="kvm",                  MODE="0666"
     KERNEL=="kqemu",                NAME="%k", MODE="0666"
+    KERNEL=="vboxdrv", NAME="vboxdrv", OWNER="root", GROUP="root", MODE="0666"
 
     # Create symlinks for CD/DVD devices.
     ACTION=="add", SUBSYSTEM=="block", ENV{ID_CDROM}=="?*", SYMLINK+="cdrom cdrom-%k"
-- 
GitLab


From ee3393df8d42379e62b2d8081d3cbb7d87a40016 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 15 Apr 2009 09:57:38 +0000
Subject: [PATCH 1365/5331] * Creating /var/spool/whatever fails if /var/spool
 doesn't exist.

svn path=/nixos/trunk/; revision=15058
---
 upstart-jobs/atd.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/upstart-jobs/atd.nix b/upstart-jobs/atd.nix
index 310477d1994..59fd4789148 100644
--- a/upstart-jobs/atd.nix
+++ b/upstart-jobs/atd.nix
@@ -40,7 +40,7 @@ start script
    do
      if [ ! -d "$dir" ]
      then
-         mkdir "$dir" && chown atd:atd "$dir"
+         mkdir -p "$dir" && chown atd:atd "$dir"
      fi
    done
    chmod 1770 "$spooldir" "$jobdir"
-- 
GitLab


From 7409bb9ec1363cb036d7c4a8f4df5ed6742c70fe Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 15 Apr 2009 10:13:37 +0000
Subject: [PATCH 1366/5331] * Use Linux 2.6.28 on the installation CD.

svn path=/nixos/trunk/; revision=15061
---
 installer/cd-dvd/rescue-cd.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/installer/cd-dvd/rescue-cd.nix b/installer/cd-dvd/rescue-cd.nix
index ffa8fa875d1..045e54057a4 100644
--- a/installer/cd-dvd/rescue-cd.nix
+++ b/installer/cd-dvd/rescue-cd.nix
@@ -20,7 +20,7 @@ rec {
       extraTTYs = [7 8]; # manual, rogue
       extraModulePackages = [system.kernelPackages.aufs];
       
-      kernelPackages = pkgs.kernelPackages_2_6_25;
+      kernelPackages = pkgs.kernelPackages_2_6_28;
       
       initrd = {
         extraKernelModules = [
-- 
GitLab


From 723be3579d6001c307e40b379d693673df3f1b15 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 15 Apr 2009 11:51:37 +0000
Subject: [PATCH 1367/5331] * Remove gdb from the CD.

svn path=/nixos/trunk/; revision=15062
---
 installer/cd-dvd/rescue-cd.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/installer/cd-dvd/rescue-cd.nix b/installer/cd-dvd/rescue-cd.nix
index 045e54057a4..2a5c17199ba 100644
--- a/installer/cd-dvd/rescue-cd.nix
+++ b/installer/cd-dvd/rescue-cd.nix
@@ -187,7 +187,6 @@ rec {
         pkgs.vim
         pkgs.subversion # for nixos-checkout
         pkgs.w3m # needed for the manual anyway
-        pkgs.gdb # for debugging Nix
         pkgs.testdisk # useful for repairing boot problems
         pkgs.mssys # for writing Microsoft boot sectors / MBRs
         pkgs.ntfsprogs # for resizing NTFS partitions
-- 
GitLab


From 760f484e4dfd2d560c0e5e31c3300be01d002f2c Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 16 Apr 2009 08:24:38 +0000
Subject: [PATCH 1368/5331] * Removed some more stuff from the CD because the
 x86_64-linux ISO is   over 700 MB.  (Maybe vim could be replaced by a smaller
 vi?)   Note that the main size problem for the x86_64-linux ISO is that it  
 contains two Glibcs - Grub has a dependency on the 32-bit Glibc.  It   would
 be nice to get rid of that.

svn path=/nixos/trunk/; revision=15074
---
 installer/cd-dvd/rescue-cd.nix | 2 --
 1 file changed, 2 deletions(-)

diff --git a/installer/cd-dvd/rescue-cd.nix b/installer/cd-dvd/rescue-cd.nix
index 2a5c17199ba..8523246ae17 100644
--- a/installer/cd-dvd/rescue-cd.nix
+++ b/installer/cd-dvd/rescue-cd.nix
@@ -184,14 +184,12 @@ rec {
  
     environment = {
       extraPackages = [
-        pkgs.vim
         pkgs.subversion # for nixos-checkout
         pkgs.w3m # needed for the manual anyway
         pkgs.testdisk # useful for repairing boot problems
         pkgs.mssys # for writing Microsoft boot sectors / MBRs
         pkgs.ntfsprogs # for resizing NTFS partitions
         pkgs.sshfsFuse
-        pkgs.screen
       ];
     };
    
-- 
GitLab


From 4f3d55232aab6e9a2f6c26bb87515c60ed7bd076 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 16 Apr 2009 13:29:22 +0000
Subject: [PATCH 1369/5331] * Don't do a sync, they're incredibly expensive. 
 (I just had one that took   25 minutes to complete...)

svn path=/nixos/trunk/; revision=15086
---
 system/switch-to-configuration.sh | 2 --
 1 file changed, 2 deletions(-)

diff --git a/system/switch-to-configuration.sh b/system/switch-to-configuration.sh
index 593dd61714e..dcca984282b 100644
--- a/system/switch-to-configuration.sh
+++ b/system/switch-to-configuration.sh
@@ -85,5 +85,3 @@ if test "$action" = "switch" -o "$action" = "test"; then
         fi
     done
 fi
-
-sync
-- 
GitLab


From aac4fb7321892e9577fae4dc1e5770eb647f4ceb Mon Sep 17 00:00:00 2001
From: Nicolas Pierron <nicolas.b.pierron@gmail.com>
Date: Sat, 18 Apr 2009 17:16:46 +0000
Subject: [PATCH 1370/5331] Temporary work-around to inherit configuration
 settings.

svn path=/nixos/branches/modular-nixos/; revision=15133
---
 upstart-jobs/manual.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/upstart-jobs/manual.nix b/upstart-jobs/manual.nix
index 882cf8f8251..52cc9cd2a80 100644
--- a/upstart-jobs/manual.nix
+++ b/upstart-jobs/manual.nix
@@ -54,6 +54,7 @@ in
 
 let
   cfg = config.services.showManual;
+in let # !!! Bug in Nix 0.13pre14722, otherwise the following line is not aware of cfg.
   inherit (cfg) enable ttyNumber browserPackage browserCommand manualFile;
 
   realManualFile =
-- 
GitLab


From ed43363e2a2ffc019370df43c4861988d29520d6 Mon Sep 17 00:00:00 2001
From: Marc Weber <marco-oweber@gmx.de>
Date: Sun, 19 Apr 2009 10:36:30 +0000
Subject: [PATCH 1371/5331] following renaming whatis -> showVal

svn path=/nixos/trunk/; revision=15145
---
 installer/nixos-checkout.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/installer/nixos-checkout.nix b/installer/nixos-checkout.nix
index 4fedbd4d9c7..79e69757685 100644
--- a/installer/nixos-checkout.nix
+++ b/installer/nixos-checkout.nix
@@ -1,6 +1,6 @@
 args : with args;
 let 
-    inherit (pkgs.lib) id all whatis escapeShellArg concatMapStrings concatMap
+    inherit (pkgs.lib) id all showVal escapeShellArg concatMapStrings concatMap
       mapAttrs concatLists flattenAttrs filter;
     inherit (builtins) getAttr hasAttr head isAttrs;
 in
@@ -18,7 +18,7 @@ rec {
     assert (isAttrs attrs);
     assert (repo + "" == repo); # assert repo is a string
     if (! (attrs ? type)) then 
-      throw "repo type is missing of : ${whatis attrs}"
+      throw "repo type is missing of : ${showVal attrs}"
     # prepare svn repo
     else if attrs.type == "svn" then
       let a = { # add svn defaults
-- 
GitLab


From 453e9abc9e6689d775fd1766402fdb994089efba Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 20 Apr 2009 16:26:50 +0000
Subject: [PATCH 1372/5331] * Work around an apparent bug in Bash 4.0.  It no
 longer accepts this:

    echo $(cat <<EOF
    bla
    EOF)

  It does accept backticks:

    echo `cat <<EOF
    bla
    EOF`

svn path=/nixos/trunk/; revision=15192
---
 installer/grub-menu-builder.sh | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/installer/grub-menu-builder.sh b/installer/grub-menu-builder.sh
index 94175ac2ba2..5d26cdb4327 100644
--- a/installer/grub-menu-builder.sh
+++ b/installer/grub-menu-builder.sh
@@ -37,9 +37,9 @@ fi
 
 configurationCounter=0
 configurationLimit="@configurationLimit@"
-numAlienEntries=$(cat <<EOF | egrep '^[[:space:]]*title' | wc -l
+numAlienEntries=`cat <<EOF | egrep '^[[:space:]]*title' | wc -l
 @extraGrubEntries@
-EOF)
+EOF`
 
 if test $((configurationLimit+numAlienEntries)) -gt 190; then
 	configurationLimit=$((190-numAlienEntries));
@@ -114,10 +114,10 @@ if test -n "@copyKernels@"; then
 fi
 
 # Additional entries specified verbatim by the configuration.
-extraGrubEntries=$(cat <<EOF
+extraGrubEntries=`cat <<EOF
 @extraGrubEntries@
-EOF
-)
+EOF`
+
 
 if test -n "@extraGrubEntriesBeforeNixos@"; then 
     echo "$extraGrubEntries" >> $tmp
-- 
GitLab


From 9940de0088cd88cd12cb06015f6851762ddeca93 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 21 Apr 2009 08:03:05 +0000
Subject: [PATCH 1373/5331] * After upgrading to X.org server 1.5.3, we
 suddenly need to set   "AllowEmptyInput" to "off", otherwise we get no
 keyboard or mouse.   The logfile then says:

    (WW) AllowEmptyInput is on, devices using drivers 'kbd' or 'mouse'
      will be disabled.
    (WW) Disabling Keyboard[0]
    (WW) Disabling Mouse[0]

  which seems rather weird.

svn path=/nixos/trunk/; revision=15204
---
 upstart-jobs/xserver.conf | 1 +
 1 file changed, 1 insertion(+)

diff --git a/upstart-jobs/xserver.conf b/upstart-jobs/xserver.conf
index 36e9da8bf0f..b1d3a11e97b 100644
--- a/upstart-jobs/xserver.conf
+++ b/upstart-jobs/xserver.conf
@@ -9,6 +9,7 @@ EndSection
 
 Section "ServerFlags"
   Option "AllowMouseOpenFail" "on"
+  Option "AllowEmptyInput" "off"
 EndSection
 
 
-- 
GitLab


From 31ff856a52ffba681f9e388a04c078f03b4fd9df Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andres=20L=C3=B6h?= <mail@andres-loeh.de>
Date: Tue, 21 Apr 2009 11:29:40 +0000
Subject: [PATCH 1374/5331] Updated reference to xmonad.

svn path=/nixos/trunk/; revision=15208
---
 upstart-jobs/xserver.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/upstart-jobs/xserver.nix b/upstart-jobs/xserver.nix
index 772b8f214f0..38451046998 100644
--- a/upstart-jobs/xserver.nix
+++ b/upstart-jobs/xserver.nix
@@ -265,7 +265,7 @@ let
     ''
 
     else if windowManager == "xmonad" then ''
-      ${pkgs.xmonad}/bin/xmonad &
+      ${pkgs.haskellPackages.xmonad}/bin/xmonad &
     ''
     
     else if windowManager == "none" then ''
-- 
GitLab


From 3a7834dcac619d81c8b731554a5873a995e501bd Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 21 Apr 2009 12:38:13 +0000
Subject: [PATCH 1375/5331] * Use perlPackages.

svn path=/nixos/trunk/; revision=15211
---
 upstart-jobs/apache-httpd/subversion.nix | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/upstart-jobs/apache-httpd/subversion.nix b/upstart-jobs/apache-httpd/subversion.nix
index 8a48617ee44..a32e0bf5dbd 100644
--- a/upstart-jobs/apache-httpd/subversion.nix
+++ b/upstart-jobs/apache-httpd/subversion.nix
@@ -54,9 +54,11 @@ let
     
     # Urgh, most of these are dependencies of Email::Send, should figure them out automatically.
     perlFlags = map (x: "-I${x}/lib/site_perl") [
-      pkgs.perlBerkeleyDB pkgs.perlEmailSend pkgs.perlEmailSimple
-      pkgs.perlModulePluggable pkgs.perlReturnValue pkgs.perlEmailAddress
-      pkgs.perlCryptPasswordMD5 pkgs.perlStringMkPasswd
+      pkgs.perlPackages.BerkeleyDB pkgs.perlPackages.EmailSend
+      pkgs.perlPackages.EmailSimple pkgs.perlPackages.ModulePluggable
+      pkgs.perlPackages.ReturnValue pkgs.perlPackages.EmailAddress
+      pkgs.perlPackages.CryptPasswordMD5
+      pkgs.perlPackages.StringMkPasswd
     ];
 
     # Do a syntax check on the generated file.
-- 
GitLab


From 9f8aa03168b04e00254f422d24f441bcdec05882 Mon Sep 17 00:00:00 2001
From: Marc Weber <marco-oweber@gmx.de>
Date: Tue, 21 Apr 2009 16:25:37 +0000
Subject: [PATCH 1376/5331] don't run portmap as daemon

if you do upstart can't know (yet) when it exits

svn path=/nixos/branches/modular-nixos/; revision=15217
---
 upstart-jobs/portmap.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/upstart-jobs/portmap.nix b/upstart-jobs/portmap.nix
index 410f3d4b6b0..e188a2d41b6 100644
--- a/upstart-jobs/portmap.nix
+++ b/upstart-jobs/portmap.nix
@@ -78,7 +78,7 @@ mkIf config.services.portmap.enable {
           start on network-interfaces/started
           stop on network-interfaces/stop
 
-          respawn ${portmap}/sbin/portmap \
+          respawn ${portmap}/sbin/portmap -f \
             ${if config.services.portmap.chroot == ""
               then ""
               else "-t \"${config.services.portmap.chroot}\""} \
-- 
GitLab


From 8237528c4a9bd067b38c5ae4e5e1e7e0db67d0ca Mon Sep 17 00:00:00 2001
From: Marc Weber <marco-oweber@gmx.de>
Date: Tue, 21 Apr 2009 16:30:32 +0000
Subject: [PATCH 1377/5331] samba job: put each daemon into its own job file

use start/stop samba-control to start/stop them all

You can enable syncing samba passwords when using passwd as well now.
However you still have to add a user to the samba user database once
using smbpasswd -a username.

svn path=/nixos/branches/modular-nixos/; revision=15218
---
 etc/default.nix        |   3 +
 etc/pam.d/common       |   3 +-
 upstart-jobs/samba.nix | 201 ++++++++++++++++++++++++++++++++++-------
 upstart-jobs/smb.conf  |  35 -------
 4 files changed, 174 insertions(+), 68 deletions(-)
 delete mode 100644 upstart-jobs/smb.conf

diff --git a/etc/default.nix b/etc/default.nix
index 5e2902f715a..44307279f96 100644
--- a/etc/default.nix
+++ b/etc/default.nix
@@ -186,6 +186,9 @@ let
           inherit (pkgs.xorg) xauth;
           inherit pamConsoleHandlers;
           isLDAPEnabled = if isLDAPEnabled then "" else "#";
+          syncSambaPasswords = if config.services.samba.syncPasswordsByPam
+            then "password   optional     ${pkgs.samba}/lib/security/pam_smbpass.so nullok use_authtok try_first_pass"
+            else "# change samba configuration options to make passwd sync the samba auth database as well here..";
         };
         target = "pam.d/" + program;
       }
diff --git a/etc/pam.d/common b/etc/pam.d/common
index 8497f65f303..538c5fe4d6f 100644
--- a/etc/pam.d/common
+++ b/etc/pam.d/common
@@ -6,7 +6,8 @@ auth     required       pam_deny.so
 account  required       @pam_unix2@/lib/security/pam_unix2.so
 
 @isLDAPEnabled@  password sufficient     @pam_ldap@/lib/security/pam_ldap.so 
-password sufficient     @pam_unix2@/lib/security/pam_unix2.so nullok
+password requisite     @pam_unix2@/lib/security/pam_unix2.so nullok
+@syncSambaPasswords@
 
 @isLDAPEnabled@  session  optional       @pam_ldap@/lib/security/pam_ldap.so 
 session  required       @pam_unix2@/lib/security/pam_unix2.so
diff --git a/upstart-jobs/samba.nix b/upstart-jobs/samba.nix
index 00686a0407b..fcd1393d5c5 100644
--- a/upstart-jobs/samba.nix
+++ b/upstart-jobs/samba.nix
@@ -2,7 +2,7 @@
 
 ###### interface
 let
-  inherit (pkgs.lib) mkOption mkIf;
+  inherit (pkgs.lib) mkOption mkIf mkAlways;
 
   options = {
     services = {
@@ -12,9 +12,101 @@ let
           default = false;
           description = "
             Whether to enable the samba server. (to communicate with, and provide windows shares)
+            use start / stop samba-control to start/stop all daemons.
+            smbd and nmbd are not shutdown correctly yet. so just pkill them and restart those jobs.
           ";
         };
 
+        syncPasswordsByPam = mkOption {
+          default = false;
+          description = "
+            enabling this will add a line directly after pam_unix.so.
+            Whenever a password is changed the samba password will be updated as well.
+            However you still yave to add the samba password once using smbpasswd -a user
+            If you don't want to maintain an extra pwd database you still can send plain text
+            passwords which is not secure.
+          ";
+        };
+
+        extraConfig = mkOption {
+          default = ''
+            # [global] continuing global section here, section is started by nix to set pids etc
+
+              smb passwd file = /etc/samba/passwd
+
+              # is this useful ?
+              domain master = auto
+
+              encrypt passwords = Yes
+              client plaintext auth = No
+
+              # yes: if you use this you probably also want to enable syncPasswordsByPam
+              # no: You can still use the pam password database. However
+              # passwords will be sent plain text on network (discouraged)
+
+              workgroup = Users
+              server string = %h
+              comment = Samba
+              log file = /var/log/samba/log.%m
+              log level = 10
+              max log size = 50000
+              security = user
+              
+              client lanman auth = Yes
+              dns proxy = no
+              invalid users = root
+              passdb backend = tdbsam
+              passwd program = /usr/bin/passwd %u
+
+            ### end [ global ] section
+            
+             
+            # Un-comment the following (and tweak the other settings below to suit)
+            # to enable the default home directory shares.  This will share each
+            # user's home directory as \\server\username
+            ;[homes]
+            ;   comment = Home Directories
+            ;   browseable = no
+            ;   writable = no
+
+            # File creation mask is set to 0700 for security reasons. If you want to
+            # create files with group=rw permissions, set next parameter to 0775.
+            ;   create mask = 0700
+
+            #  this directory and user is created automatically for you by nixos
+            ;[default]
+            ;  path = /home/smbd
+            ;  read only = no
+            ;  guest ok = yes
+              
+            # this directory and user is created automatically for you by nixos
+            ;[default]
+            ;  path = /home/smbd
+            ;  read only = no
+            ;  guest ok = yes
+            
+            # additional share example
+            ;[raidbackup]
+            ;  path = /home/raidbackup/files
+            ;  read only = no
+            ;  guest ok = no
+            ;  available = yes
+            ;  browseable = yes
+            ;  public = yes
+            ;  valid users = raidbackup
+            ;  comment = Raid backup Files
+          '';
+
+          description = "
+            additional global section and extra section lines go in here.
+          ";
+        };
+
+        configFile = mkOption {
+          description = "
+            internal use to pass filepath to samba pam module
+          ";
+        };
       };
     };
   };
@@ -23,23 +115,68 @@ in
 ###### implementation
 
 let
+
+  cfg = config.services.samba;
   
   user = "smbguest";
   group = "smbguest";
- 
-  #smbConfig = ./smb.conf ;
 
-  smbConfig = pkgs.substituteAll {
-    src = ./smb.conf;
-    inherit samba;
-  };
 
+  logDir = "/var/log/samba";
+  privateDir = "/var/samba/private";
+ 
   inherit (pkgs) samba;
 
-in
+  setupScript = ''
+    mkdir -p /var/lock
 
+    if ! test -d /home/smbd ; then
+      mkdir -p /home/smbd
+      chown ${user} /home/smbd
+      chmod a+rwx /home/smbd
+    fi
+
+    if ! test -d /var/samba ; then
+      mkdir -p /var/samba/locks /var/samba/cores/nmbd  /var/samba/cores/smbd /var/samba/cores/winbindd
+    fi
+
+    passwdFile="$(sed -n 's/^.*smb[ ]\+passwd[ ]\+file[ ]\+=[ ]\+\(.*\)/\1/p' /nix/store/nnmrqalldfv2vkwy6qpg340rv7w34lmp-smb.conf)"
+    if [ -n "$passwdFile" ]; then
+      echo 'INFO: creating directory containing passwd file'
+      mkdir -p "$(dirname "$passwdFile")"
+    fi
+
+    mkdir -p ${logDir}
+    mkdir -p ${privateDir}
+  '';
+
+  configFile = pkgs.writeText "smb.conf" ''
+    [ global ]
+      log file = ${logDir}/log.%m
+      private dir = ${privateDir}
+
+      ${if cfg.syncPasswordsByPam then "pam password change = true" else "" /* does this make sense ? */ }
+
+
+    ${cfg.extraConfig}";
+  '';
+
+  daemonJob = appName : args :
+    {
+      name = "samba-${appName}";
+      job = ''
+
+        description "Samba Service daemon ${appName}"
+
+        start on samba-control/started
+        stop on samba-control/stop
+
+        respawn ${samba}/sbin/${appName} ${args}
+      '';
+    };
+
+in
 
-  
 
 mkIf config.services.samba.enable {
   require = [
@@ -60,39 +197,39 @@ mkIf config.services.samba.enable {
     ];
   };
 
+  # always provide a smb.conf to shut up programs like smbclient and smbspool.
+  environment = {
+    etc = mkAlways [{
+      source = if cfg.enable then configFile else pkgs.writeText "smb-dummy.conf" "# samba is disabled. Purpose see samba expression in nixpkgs";
+      target = "samba/smb.conf";
+      }];
+  };
+
   services = {
-    extraJobs = [{
-      name = "samba";
-      job = ''
 
-        description "Samba Service"
+    extraJobs = [
+    { name = "samba-control"; # start this dummy job to start the real samba daemons nmbd, smbd, winbindd
+      job = ''
+        description "samba job starting/stopping the real samba jobs";
 
         start on network-interfaces/started
         stop on network-interfaces/stop
 
         start script
-
-          if ! test -d /home/smbd ; then 
-            mkdir -p /home/smbd
-            chown ${user} /home/smbd
-            chmod a+rwx /home/smbd
-          fi
-
-          if ! test -d /var/samba ; then
-            mkdir -p /var/samba/locks /var/samba/cores/nmbd  /var/samba/cores/smbd /var/samba/cores/winbindd
-          fi
-
-          ${samba}/sbin/nmbd -D  -s ${smbConfig} &
-          ${samba}/sbin/smbd -D  -s ${smbConfig} &
-          ${samba}/sbin/winbindd -s ${smbConfig} &
-
-          ln -fs ${smbConfig} /var/samba/config
-
+        ${setupScript}
         end script
 
-        respawn ${samba}/sbin/nmbd -D -s ${smbConfig} &; ${samba}/sbin/smbd -D -s ${smbConfig} &; ${samba}/sbin/winbindd &
+        respawn sleep 1000000 # !!! hack
 
+        # put the store path here so that daemons are restarted when configuration changes
+        # config is ${configFile}
       '';
-    }];
+    }
+    # add -S to get debugging output on stdout
+    # config directory is passed by configure at compilation time
+    ( daemonJob "nmbd" " -i -F" ) # nmbd says "standard input is not a socket, assuming -D option", but using -i makes it stay in foreground (?)
+    ( daemonJob "smbd" " -i -F" ) # dito
+    ( daemonJob "winbindd" " -F" )
+    ];
   };
 }
diff --git a/upstart-jobs/smb.conf b/upstart-jobs/smb.conf
deleted file mode 100644
index 889f3c628ee..00000000000
--- a/upstart-jobs/smb.conf
+++ /dev/null
@@ -1,35 +0,0 @@
-[global]
-  workgroup = Users
-  server string = %h
-  comment = Samba
-  log file = /var/log/samba/log.%m
-  log level = 10
-  max log size = 50000
-  security = user
-
-  #must be set to 'no' to use PAM
-  encrypt passwords = No
-  client plaintext auth = yes
-  client lanman auth = Yes
-  dns proxy = no
-  invalid users = root
-  passdb backend = tdbsam
-  passwd program = /usr/bin/passwd %u
-
-#  encrypt passwords = yes
-#  smb passwd file = @samba@/private/smbpasswd
-
-#[default]
-#  path = /home/smbd
-#  read only = no
-#  guest ok = yes
-
-[raidbackup]
-  path = /home/raidbackup/files
-  read only = no
-  guest ok = no
-  available = yes
-  browseable = yes
-  public = yes
-  valid users = raidbackup
-  comment = Raid backup Files
-- 
GitLab


From 8ddf34fa3d985225b21b8249cc0b6c5826d5394c Mon Sep 17 00:00:00 2001
From: Marc Weber <marco-oweber@gmx.de>
Date: Tue, 21 Apr 2009 16:34:56 +0000
Subject: [PATCH 1378/5331] adding kernel nfs daemon upstart job

svn path=/nixos/branches/modular-nixos/; revision=15219
---
 system/options.nix          |   2 +
 upstart-jobs/nfs-kernel.nix | 118 ++++++++++++++++++++++++++++++++++++
 2 files changed, 120 insertions(+)
 create mode 100644 upstart-jobs/nfs-kernel.nix

diff --git a/system/options.nix b/system/options.nix
index 1954e679b45..16269905633 100644
--- a/system/options.nix
+++ b/system/options.nix
@@ -485,6 +485,8 @@ in
 
     (import ../upstart-jobs/synergy.nix)
 
+    (import ../upstart-jobs/nfs-kernel.nix)
+
     # nix
     (import ../upstart-jobs/nix.nix) # nix options and daemon
     (import ../system/nixos-installer.nix)
diff --git a/upstart-jobs/nfs-kernel.nix b/upstart-jobs/nfs-kernel.nix
new file mode 100644
index 00000000000..8926d0c80b1
--- /dev/null
+++ b/upstart-jobs/nfs-kernel.nix
@@ -0,0 +1,118 @@
+
+{pkgs, config, ...}:
+
+###### interface
+let
+  inherit (pkgs.lib) mkOption mkIf;
+
+  options = {
+    services = {
+      nfsKernel = {
+
+        enable = mkOption {
+          default = false;
+          description = "
+            wether to use the kernel nfs functionality to export filesystems.
+            You should be aware about existing security issues.
+            requires portmap!
+          ";
+        };
+
+        exports = mkOption {
+          default = "/etc/exports";
+          description = "
+            the file listing the directories to be exported.
+            install nfsUtils and run man exports to learn about its format.
+            The exports setting can either be a file path or the file contents.
+          ";
+        };
+
+        hostName = mkOption {
+          default = null;
+          description = "
+             specify a particular hostname (or address) that NFS requests will be accepted on.
+             Default: all.
+             See man rpc.nfsd (-H option)
+          ";
+        };
+        nproc = mkOption {
+          default = 8;
+          description = "
+            specify  the  number  of NFS server threads. (-> man rpc.nfsd). Defaults to recommended value 8
+          ";
+        };
+      };
+    };
+  };
+
+###### implementation
+
+  inherit (pkgs) writeText openssh;
+
+  cfg = (config.services.nfsKernel);
+
+  modprobe = config.system.sbin.modprobe;
+
+  exports = if builtins.pathExists cfg.exports
+    then cfg.export else pkgs.writeText "exports" cfg.exports;
+
+in
+
+
+mkIf config.services.sshd.enable {
+  require = [
+    options
+  ];
+
+  services = {
+    extraJobs = [
+    {
+      name = "nfs-kernel-exports";
+
+      job = ''
+        description "export filesystems using kernel nfs"
+
+        start on network-interfaces/started
+        stop on network-interfaces/stop
+
+        PATH=${pkgs.nfsUtils}/sbin
+
+        start script
+          ${modprobe}/sbin/modprobe nfsd || true
+          exportfs -a
+        end script
+
+        respawn sleep 1000000
+
+        start script
+          exportfs -au
+        end script
+      '';
+    }
+    {
+      name = "nfs-kernel-rpc-nfsd";
+
+      job = ''
+        description "export filesystems using kernel nfs"
+
+        start on nfs-kernel-exports/started
+        stop on nfs-kernel-exports/stop
+
+        respawn ${pkgs.nfsUtils}/sbin/rpc.nfsd ${if cfg.hostName != null then "-H ${cfg.hostName}" else ""} ${builtins.toString cfg.nproc}
+      '';
+    }
+    {
+      name = "nfs-kernel-mountd";
+
+      job = ''
+        description "export filesystems using kernel nfs"
+
+        start on nfs-kernel-rpc-nfsd/started
+        stop on nfs-kernel-exports/stop
+
+        respawn ${pkgs.nfsUtils}/sbin/rpc.mountd -F -f ${exports}
+      '';
+    }
+    ];
+  };
+}
-- 
GitLab


From 7cb734974789673bbf84c77c131a1fcacfa4bbff Mon Sep 17 00:00:00 2001
From: Marc Weber <marco-oweber@gmx.de>
Date: Tue, 21 Apr 2009 19:26:47 +0000
Subject: [PATCH 1379/5331] fix copy paste error

reported by Nicolas

svn path=/nixos/branches/modular-nixos/; revision=15221
---
 upstart-jobs/nfs-kernel.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/upstart-jobs/nfs-kernel.nix b/upstart-jobs/nfs-kernel.nix
index 8926d0c80b1..b96fed75a4d 100644
--- a/upstart-jobs/nfs-kernel.nix
+++ b/upstart-jobs/nfs-kernel.nix
@@ -59,7 +59,7 @@ let
 in
 
 
-mkIf config.services.sshd.enable {
+mkIf config.services.nfsKernel.enable {
   require = [
     options
   ];
-- 
GitLab


From 5ac2532cc79ce988ff5f82c56e0f5a01e58f6b5a Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 23 Apr 2009 12:56:17 +0000
Subject: [PATCH 1380/5331] * Add GNU parted to the CD.

svn path=/nixos/trunk/; revision=15274
---
 installer/cd-dvd/rescue-cd.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/installer/cd-dvd/rescue-cd.nix b/installer/cd-dvd/rescue-cd.nix
index 8523246ae17..b7e68c2d46d 100644
--- a/installer/cd-dvd/rescue-cd.nix
+++ b/installer/cd-dvd/rescue-cd.nix
@@ -189,6 +189,7 @@ rec {
         pkgs.testdisk # useful for repairing boot problems
         pkgs.mssys # for writing Microsoft boot sectors / MBRs
         pkgs.ntfsprogs # for resizing NTFS partitions
+        pkgs.parted
         pkgs.sshfsFuse
       ];
     };
-- 
GitLab


From d9f4475dd55dba9adfa28d83caeee6b320d3e3e7 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sat, 25 Apr 2009 22:36:56 +0000
Subject: [PATCH 1381/5331] * Be able to cope with future changes to Upstart.

svn path=/nixos/trunk/; revision=15312
---
 system/options.nix                |  2 +-
 system/switch-to-configuration.sh | 12 ++++++++++++
 system/system.nix                 |  1 +
 system/system.sh                  |  1 +
 4 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/system/options.nix b/system/options.nix
index 0c0554897ee..9ce0daf9de7 100644
--- a/system/options.nix
+++ b/system/options.nix
@@ -847,7 +847,7 @@ in
       gatewayPorts = mkOption {
         default = "no";
         description = "
-           Specifies  whether  remote hosts are allowed to connect to ports forwarded for the client. See man sshd_conf.
+           Specifies whether remote hosts are allowed to connect to ports forwarded for the client. See man sshd_conf.
           ";
         };
     };
diff --git a/system/switch-to-configuration.sh b/system/switch-to-configuration.sh
index dcca984282b..eaeb3106afd 100644
--- a/system/switch-to-configuration.sh
+++ b/system/switch-to-configuration.sh
@@ -35,6 +35,18 @@ fi
 
 if test "$action" = "switch" -o "$action" = "test"; then
 
+    oldVersion=$(cat /var/run/current-system/upstart-interface-version 2> /dev/null || echo 0)
+    newVersion=$(cat @out@/upstart-interface-version 2> /dev/null || echo 0)
+
+    if test "$oldVersion" -ne "$newVersion"; then
+        cat <<EOF
+Warning: the new NixOS configuration has an Upstart version that is
+incompatible with the current version.  The new configuration won't
+take effect until you reboot the system.
+EOF
+        exit 1
+    fi
+
     oldEvents=$(readlink -f /etc/event.d || true)
     newEvents=$(readlink -f @out@/etc/event.d)
 
diff --git a/system/system.nix b/system/system.nix
index 43e4bc58156..c00704df020 100644
--- a/system/system.nix
+++ b/system/system.nix
@@ -408,6 +408,7 @@ rec {
       pkgs.diffutils
       pkgs.upstart # for initctl
     ];
+    upstartInterfaceVersion = pkgs.upstart.interfaceVersion;
     # This attribute is responsible for creating boot entries for 
     # child configuration. They are only (directly) accessible
     # when the parent configuration is boot default. For example,
diff --git a/system/system.sh b/system/system.sh
index 95f650f39aa..67042b5faf4 100644
--- a/system/system.sh
+++ b/system/system.sh
@@ -13,6 +13,7 @@ ln -s $upstart $out/upstart
 
 echo "$kernelParams" > $out/kernel-params
 echo "$configurationName" > $out/configuration-name
+echo "$upstartInterfaceVersion" > $out/upstart-interface-version
 
 mkdir $out/fine-tune
 ChildCount=0;
-- 
GitLab


From b891792ddd6c07c8c9f588bda0cc691909db70b8 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sun, 26 Apr 2009 21:06:00 +0000
Subject: [PATCH 1382/5331] * Hack to make desktop locking in KDE 3 work.

svn path=/nixos/trunk/; revision=15326
---
 upstart-jobs/xserver.nix | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/upstart-jobs/xserver.nix b/upstart-jobs/xserver.nix
index 38451046998..7d1d63160d0 100644
--- a/upstart-jobs/xserver.nix
+++ b/upstart-jobs/xserver.nix
@@ -289,6 +289,15 @@ let
     ### Start the session.
     ${if sessionType == "kde" then ''
 
+      # A quick hack to make KDE screen locking work.  It calls
+      # kcheckpass, which needs to be setuid in order to read the
+      # shadow password file.  We have a setuid wrapper around
+      # kcheckpass.  However, startkde adds $kdebase/bin to the start
+      # of $PATH if it's not already in $PATH, thus overriding the
+      # setuid wrapper directory.  So here we add $kdebase/bin to the
+      # end of $PATH to keep startkde from doing that.
+      export PATH=$PATH:${pkgs.kdebase}/bin
+
       # Start KDE.
       exec ${pkgs.kdebase}/bin/startkde
 
-- 
GitLab


From 7da8137f187800084d8c87c7cd5c159fb371d134 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 27 Apr 2009 21:52:10 +0000
Subject: [PATCH 1383/5331] * Re-enable Glibc locales.

svn path=/nixos/trunk/; revision=15340
---
 etc/bashrc.sh     | 1 +
 system/system.nix | 1 +
 2 files changed, 2 insertions(+)

diff --git a/etc/bashrc.sh b/etc/bashrc.sh
index 1a2b45794d9..ba8a0ebb9c6 100644
--- a/etc/bashrc.sh
+++ b/etc/bashrc.sh
@@ -18,6 +18,7 @@ export LOCATE_PATH=/var/cache/locatedb
 export KDEDIRS=@kdeDirs@
 export XDG_CONFIG_DIRS=@xdgConfigDirs@
 export XDG_DATA_DIRS=@xdgDataDirs@
+export LOCALE_ARCHIVE=/var/run/current-system/sw/lib/locale/locale-archive
 
 
 # Set up secure multi-user builds: non-root users build through the
diff --git a/system/system.nix b/system/system.nix
index c00704df020..ed7967c5f63 100644
--- a/system/system.nix
+++ b/system/system.nix
@@ -192,6 +192,7 @@ rec {
     pkgs.e2fsprogs
     pkgs.findutils
     pkgs.glibc # for ldd, getent
+    pkgs.glibcLocales
     pkgs.gnugrep
     pkgs.gnused
     pkgs.gnutar
-- 
GitLab


From dca798111128ea1d8c4e40448b1124bc721bd2cc Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 27 Apr 2009 23:09:25 +0000
Subject: [PATCH 1384/5331] * Make sure that the FDI cache is flushed on
 startup.  Mine had a   timestamp somewhere in 2008, so apparently it's not
 getting   updated.

svn path=/nixos/trunk/; revision=15344
---
 upstart-jobs/hal.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/upstart-jobs/hal.nix b/upstart-jobs/hal.nix
index af4038f0fe0..786edd81849 100644
--- a/upstart-jobs/hal.nix
+++ b/upstart-jobs/hal.nix
@@ -30,6 +30,8 @@
 
         mkdir -m 0755 -p /var/cache/hald
 
+        rm -f /var/cache/hald/fdi-cache
+
     end script
 
     respawn ${hal}/sbin/hald --daemon=no
-- 
GitLab


From 1723eaec3d4f702d4e4c7241e97b406146631e01 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 27 Apr 2009 23:19:31 +0000
Subject: [PATCH 1385/5331] * Use evdev instead of the deprecated
 keyboard/mouse drivers.  Note:   evdev gets the keyboard layout / model from
 HAL (`lshal | grep   xkb'), but we don't yet have a way to override the
 default (`us').

svn path=/nixos/trunk/; revision=15345
---
 upstart-jobs/xserver.conf | 23 +++--------------------
 upstart-jobs/xserver.nix  | 17 ++++++++---------
 2 files changed, 11 insertions(+), 29 deletions(-)

diff --git a/upstart-jobs/xserver.conf b/upstart-jobs/xserver.conf
index b1d3a11e97b..5ac2b12d7c5 100644
--- a/upstart-jobs/xserver.conf
+++ b/upstart-jobs/xserver.conf
@@ -7,9 +7,9 @@ Section "Files"
   @modulePaths@
 EndSection
 
+
 Section "ServerFlags"
   Option "AllowMouseOpenFail" "on"
-  Option "AllowEmptyInput" "off"
 EndSection
 
 
@@ -22,25 +22,9 @@ Section "Module"
 EndSection
 
 
-Section "InputDevice"
-  Driver       "kbd"
-  Identifier   "Keyboard[0]"
-  Option       "Protocol" "Standard"
-  Option       "XkbLayout" "@layout@"
-  Option       "XkbModel" "@xkbModel@"
-  Option       "XkbRules" "xfree86"
-  @xkbOptions@
-EndSection
-
-
-Section "InputDevice"
-  Driver       "mouse"
-  Identifier   "Mouse[0]"
-  Option       "Device" "/dev/input/mice"
-EndSection
-
 @synapticsInputDevice@
 
+
 Section "Monitor"
   Identifier   "Monitor[0]"
   Option       "DPMS"
@@ -89,8 +73,7 @@ EndSection
 
 Section "ServerLayout"
   Identifier   "Layout[all]"
-  InputDevice  "Keyboard[0]" "CoreKeyboard"
-  InputDevice  "@corePointer@" "CorePointer"
+  @setCorePointer@
   Screen       "Screen[0]"
   @serverLayoutOptions@
 EndSection
diff --git a/upstart-jobs/xserver.nix b/upstart-jobs/xserver.nix
index 7d1d63160d0..062faa06db3 100644
--- a/upstart-jobs/xserver.nix
+++ b/upstart-jobs/xserver.nix
@@ -32,8 +32,9 @@ let
   resolutions = map (res: ''"${toString res.x}x${toString res.y}"'') (cfg.resolutions);
   sessionType = cfg.sessionType;
 
-  videoDriverModules = getAttr [ videoDriver ] (throw "unkown video driver : \"${videoDriver}\"") knownVideoDrivers;
+  videoDriverModules = getAttr [ videoDriver ] (throw "unknown video driver: `${videoDriver}'") knownVideoDrivers;
 
+  
   sessionCmd =
     if sessionType == "" then cfg.sessionStarter else
     if sessionType == "xterm" then "${pkgs.xterm}/bin/xterm -ls" else
@@ -51,13 +52,11 @@ let
 
     
   modules = 
-
     getAttr ["modulesFirst"] [] videoDriverModules
     ++ [
       xorg.xorgserver
-      xorg.xf86inputkeyboard
-      xorg.xf86inputmouse
-    ] 
+      xorg.xf86inputevdev
+    ]
     ++ getAttr ["modules"] [] videoDriverModules
     ++ (optional cfg.synaptics.enable ["${pkgs.synaptics}/${xorg.xorgserver}" /*xorg.xf86inputevdev*/]);
 
@@ -113,10 +112,10 @@ let
       Option "XkbOptions" "${cfg.xkbOptions}"
     '';
 
-    xkbModel = cfg.xkbModel;
-    layout = cfg.layout;
-
-    corePointer = if cfg.synaptics.enable then "Touchpad[0]" else "Mouse[0]";
+    setCorePointer = 
+      if cfg.synaptics.enable then ''
+        InputDevice "Touchpad[0]" "CorePointer"
+      '' else "";
 
     internalAGPGART =
       if cfg.useInternalAGPGART == "yes" then
-- 
GitLab


From bf04b4c7dcde3d8567be63fd45e3b71dc32d5374 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Tue, 28 Apr 2009 07:58:20 +0000
Subject: [PATCH 1386/5331] Making xserver cope with new evdev input device,
 and the proper dri mesa driver directory.

svn path=/nixos/trunk/; revision=15346
---
 upstart-jobs/xserver.conf | 1 +
 upstart-jobs/xserver.nix  | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/upstart-jobs/xserver.conf b/upstart-jobs/xserver.conf
index 5ac2b12d7c5..a8d2a70dfac 100644
--- a/upstart-jobs/xserver.conf
+++ b/upstart-jobs/xserver.conf
@@ -76,6 +76,7 @@ Section "ServerLayout"
   @setCorePointer@
   Screen       "Screen[0]"
   @serverLayoutOptions@
+  Option       "AutoAddDevices" "0"
 EndSection
 
 
diff --git a/upstart-jobs/xserver.nix b/upstart-jobs/xserver.nix
index 062faa06db3..91b30828f7e 100644
--- a/upstart-jobs/xserver.nix
+++ b/upstart-jobs/xserver.nix
@@ -58,7 +58,7 @@ let
       xorg.xf86inputevdev
     ]
     ++ getAttr ["modules"] [] videoDriverModules
-    ++ (optional cfg.synaptics.enable ["${pkgs.synaptics}/${xorg.xorgserver}" /*xorg.xf86inputevdev*/]);
+    ++ (optional cfg.synaptics.enable ["${xorg.xf86inputsynaptics}"]);
 
 
   fontsForXServer =
@@ -447,7 +447,7 @@ rec {
     }
 
     ${if videoDriver != "nvidia"
-      then "env XORG_DRI_DRIVER_PATH=${pkgs.mesa}/lib/modules/dri"
+      then "env XORG_DRI_DRIVER_PATH=${pkgs.mesa}/lib/dri"
       else ""
     }
 
-- 
GitLab


From 38d7e7b780afb9ba9b7bee3a0c5783bb4ed3f69d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Tue, 28 Apr 2009 08:47:13 +0000
Subject: [PATCH 1387/5331] Sorry, I disabled X hal config in my last commit,
 thinking it was still not usable. I see the problem rests only in configuring
 the keyboard layout in hal, for X. Nevertheless, using the client "setxkbmap"
 works, which can help until we can configure the keyboard layout in
 configuration.nix.

svn path=/nixos/trunk/; revision=15348
---
 upstart-jobs/xserver.conf | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/upstart-jobs/xserver.conf b/upstart-jobs/xserver.conf
index a8d2a70dfac..978b8739052 100644
--- a/upstart-jobs/xserver.conf
+++ b/upstart-jobs/xserver.conf
@@ -76,7 +76,8 @@ Section "ServerLayout"
   @setCorePointer@
   Screen       "Screen[0]"
   @serverLayoutOptions@
-  Option       "AutoAddDevices" "0"
+  # If you want to disable HAL-based configuration, set AutoAddDevices to 0
+  # Option       "AutoAddDevices" "0"
 EndSection
 
 
-- 
GitLab


From 56be444092152eb16ac36e9bf6a25ad9a6cfef7a Mon Sep 17 00:00:00 2001
From: Marc Weber <marco-oweber@gmx.de>
Date: Tue, 28 Apr 2009 13:17:04 +0000
Subject: [PATCH 1388/5331] * Synced with trunk @ 15032

svn path=/nixos/branches/modular-nixos/; revision=15353
---
 upstart-jobs/udev.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/upstart-jobs/udev.nix b/upstart-jobs/udev.nix
index 30fc4279171..51b11099ae1 100644
--- a/upstart-jobs/udev.nix
+++ b/upstart-jobs/udev.nix
@@ -85,6 +85,7 @@ let
     KERNEL=="sonypi",               MODE="0666"
     KERNEL=="kvm",                  MODE="0666"
     KERNEL=="kqemu",                NAME="%k", MODE="0666"
+    KERNEL=="vboxdrv", NAME="vboxdrv", OWNER="root", GROUP="root", MODE="0666"
 
     # Create symlinks for CD/DVD devices.
     ACTION=="add", SUBSYSTEM=="block", ENV{ID_CDROM}=="?*", SYMLINK+="cdrom cdrom-%k"
-- 
GitLab


From c4ad0f545414351c663af152ccd69106b6cf52d9 Mon Sep 17 00:00:00 2001
From: Marc Weber <marco-oweber@gmx.de>
Date: Tue, 28 Apr 2009 13:18:38 +0000
Subject: [PATCH 1389/5331] * Synced with trunk @ 15058

svn path=/nixos/branches/modular-nixos/; revision=15354
---
 upstart-jobs/atd.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/upstart-jobs/atd.nix b/upstart-jobs/atd.nix
index cfdbeb67915..3037ebb4ecd 100644
--- a/upstart-jobs/atd.nix
+++ b/upstart-jobs/atd.nix
@@ -67,7 +67,7 @@ start script
    do
      if [ ! -d "$dir" ]
      then
-         mkdir "$dir" && chown atd:atd "$dir"
+         mkdir -p "$dir" && chown atd:atd "$dir"
      fi
    done
    chmod 1770 "$spooldir" "$jobdir"
-- 
GitLab


From 55c787a308c9a75daff1039fbd9b8a4bcd303259 Mon Sep 17 00:00:00 2001
From: Marc Weber <marco-oweber@gmx.de>
Date: Tue, 28 Apr 2009 13:26:31 +0000
Subject: [PATCH 1390/5331] * Synced with trunk @ 15061

svn path=/nixos/branches/modular-nixos/; revision=15355
---
 installer/cd-dvd/rescue-cd.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/installer/cd-dvd/rescue-cd.nix b/installer/cd-dvd/rescue-cd.nix
index ffa8fa875d1..045e54057a4 100644
--- a/installer/cd-dvd/rescue-cd.nix
+++ b/installer/cd-dvd/rescue-cd.nix
@@ -20,7 +20,7 @@ rec {
       extraTTYs = [7 8]; # manual, rogue
       extraModulePackages = [system.kernelPackages.aufs];
       
-      kernelPackages = pkgs.kernelPackages_2_6_25;
+      kernelPackages = pkgs.kernelPackages_2_6_28;
       
       initrd = {
         extraKernelModules = [
-- 
GitLab


From bd6eb4ae29cf4f79f79f612bfa40d7edf1452610 Mon Sep 17 00:00:00 2001
From: Marc Weber <marco-oweber@gmx.de>
Date: Tue, 28 Apr 2009 13:27:37 +0000
Subject: [PATCH 1391/5331] * Synced with trunk @ 15062

svn path=/nixos/branches/modular-nixos/; revision=15356
---
 installer/cd-dvd/rescue-cd.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/installer/cd-dvd/rescue-cd.nix b/installer/cd-dvd/rescue-cd.nix
index 045e54057a4..2a5c17199ba 100644
--- a/installer/cd-dvd/rescue-cd.nix
+++ b/installer/cd-dvd/rescue-cd.nix
@@ -187,7 +187,6 @@ rec {
         pkgs.vim
         pkgs.subversion # for nixos-checkout
         pkgs.w3m # needed for the manual anyway
-        pkgs.gdb # for debugging Nix
         pkgs.testdisk # useful for repairing boot problems
         pkgs.mssys # for writing Microsoft boot sectors / MBRs
         pkgs.ntfsprogs # for resizing NTFS partitions
-- 
GitLab


From 3b934b9d03d2556fb5832ec06a30bb04ee65de9d Mon Sep 17 00:00:00 2001
From: Marc Weber <marco-oweber@gmx.de>
Date: Tue, 28 Apr 2009 13:28:38 +0000
Subject: [PATCH 1392/5331] * Synced with trunk @ 15074

svn path=/nixos/branches/modular-nixos/; revision=15357
---
 installer/cd-dvd/rescue-cd.nix | 2 --
 1 file changed, 2 deletions(-)

diff --git a/installer/cd-dvd/rescue-cd.nix b/installer/cd-dvd/rescue-cd.nix
index 2a5c17199ba..8523246ae17 100644
--- a/installer/cd-dvd/rescue-cd.nix
+++ b/installer/cd-dvd/rescue-cd.nix
@@ -184,14 +184,12 @@ rec {
  
     environment = {
       extraPackages = [
-        pkgs.vim
         pkgs.subversion # for nixos-checkout
         pkgs.w3m # needed for the manual anyway
         pkgs.testdisk # useful for repairing boot problems
         pkgs.mssys # for writing Microsoft boot sectors / MBRs
         pkgs.ntfsprogs # for resizing NTFS partitions
         pkgs.sshfsFuse
-        pkgs.screen
       ];
     };
    
-- 
GitLab


From 160c7588b3f52408f9f741fbd8f5f2d192514739 Mon Sep 17 00:00:00 2001
From: Marc Weber <marco-oweber@gmx.de>
Date: Tue, 28 Apr 2009 13:29:28 +0000
Subject: [PATCH 1393/5331] * Synced with trunk @ 15086

svn path=/nixos/branches/modular-nixos/; revision=15358
---
 system/switch-to-configuration.sh | 2 --
 1 file changed, 2 deletions(-)

diff --git a/system/switch-to-configuration.sh b/system/switch-to-configuration.sh
index 593dd61714e..dcca984282b 100644
--- a/system/switch-to-configuration.sh
+++ b/system/switch-to-configuration.sh
@@ -85,5 +85,3 @@ if test "$action" = "switch" -o "$action" = "test"; then
         fi
     done
 fi
-
-sync
-- 
GitLab


From c1bae063766e87a5218784ed1a1839f6f969ad37 Mon Sep 17 00:00:00 2001
From: Marc Weber <marco-oweber@gmx.de>
Date: Tue, 28 Apr 2009 13:29:56 +0000
Subject: [PATCH 1394/5331] * Synced with trunk @ 15145

svn path=/nixos/branches/modular-nixos/; revision=15359
---
 installer/nixos-checkout.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/installer/nixos-checkout.nix b/installer/nixos-checkout.nix
index 4fedbd4d9c7..79e69757685 100644
--- a/installer/nixos-checkout.nix
+++ b/installer/nixos-checkout.nix
@@ -1,6 +1,6 @@
 args : with args;
 let 
-    inherit (pkgs.lib) id all whatis escapeShellArg concatMapStrings concatMap
+    inherit (pkgs.lib) id all showVal escapeShellArg concatMapStrings concatMap
       mapAttrs concatLists flattenAttrs filter;
     inherit (builtins) getAttr hasAttr head isAttrs;
 in
@@ -18,7 +18,7 @@ rec {
     assert (isAttrs attrs);
     assert (repo + "" == repo); # assert repo is a string
     if (! (attrs ? type)) then 
-      throw "repo type is missing of : ${whatis attrs}"
+      throw "repo type is missing of : ${showVal attrs}"
     # prepare svn repo
     else if attrs.type == "svn" then
       let a = { # add svn defaults
-- 
GitLab


From e96fada9173763e3e161dc31fa3139cb5b975d66 Mon Sep 17 00:00:00 2001
From: Marc Weber <marco-oweber@gmx.de>
Date: Tue, 28 Apr 2009 13:30:31 +0000
Subject: [PATCH 1395/5331] * Synced with trunk @ 15192

svn path=/nixos/branches/modular-nixos/; revision=15360
---
 installer/grub-menu-builder.sh | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/installer/grub-menu-builder.sh b/installer/grub-menu-builder.sh
index 94175ac2ba2..5d26cdb4327 100644
--- a/installer/grub-menu-builder.sh
+++ b/installer/grub-menu-builder.sh
@@ -37,9 +37,9 @@ fi
 
 configurationCounter=0
 configurationLimit="@configurationLimit@"
-numAlienEntries=$(cat <<EOF | egrep '^[[:space:]]*title' | wc -l
+numAlienEntries=`cat <<EOF | egrep '^[[:space:]]*title' | wc -l
 @extraGrubEntries@
-EOF)
+EOF`
 
 if test $((configurationLimit+numAlienEntries)) -gt 190; then
 	configurationLimit=$((190-numAlienEntries));
@@ -114,10 +114,10 @@ if test -n "@copyKernels@"; then
 fi
 
 # Additional entries specified verbatim by the configuration.
-extraGrubEntries=$(cat <<EOF
+extraGrubEntries=`cat <<EOF
 @extraGrubEntries@
-EOF
-)
+EOF`
+
 
 if test -n "@extraGrubEntriesBeforeNixos@"; then 
     echo "$extraGrubEntries" >> $tmp
-- 
GitLab


From a9360de94769f99727193bc1063923118994bd61 Mon Sep 17 00:00:00 2001
From: Marc Weber <marco-oweber@gmx.de>
Date: Tue, 28 Apr 2009 13:32:37 +0000
Subject: [PATCH 1396/5331] * Synced with trunk @ 15204

svn path=/nixos/branches/modular-nixos/; revision=15361
---
 upstart-jobs/xserver/xserver.conf | 1 +
 1 file changed, 1 insertion(+)

diff --git a/upstart-jobs/xserver/xserver.conf b/upstart-jobs/xserver/xserver.conf
index 36e9da8bf0f..145d31e3192 100644
--- a/upstart-jobs/xserver/xserver.conf
+++ b/upstart-jobs/xserver/xserver.conf
@@ -9,6 +9,7 @@ EndSection
 
 Section "ServerFlags"
   Option "AllowMouseOpenFail" "on"
+  Option "AllowEmptyInput" "off"  
 EndSection
 
 
-- 
GitLab


From bb2de6da2e3adf32464c20c3916c4759134957bc Mon Sep 17 00:00:00 2001
From: Marc Weber <marco-oweber@gmx.de>
Date: Tue, 28 Apr 2009 13:33:52 +0000
Subject: [PATCH 1397/5331] * Synced with trunk @ 15208

svn path=/nixos/branches/modular-nixos/; revision=15362
---
 upstart-jobs/xserver/windowManager/xmonad.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/upstart-jobs/xserver/windowManager/xmonad.nix b/upstart-jobs/xserver/windowManager/xmonad.nix
index 6f73ad9edc3..3d2df59655a 100644
--- a/upstart-jobs/xserver/windowManager/xmonad.nix
+++ b/upstart-jobs/xserver/windowManager/xmonad.nix
@@ -21,7 +21,7 @@ in
         session = mkIf cfg.enable [{
           name = "xmonad";
           start = "
-            ${pkgs.xmonad}/bin/xmonad &
+            ${pkgs.haskellPackages.xmonad}/bin/xmonad &
             waitPID=$!
           ";
         }];
-- 
GitLab


From ab9cde5a83fdfd47bfbc4cbfa768dfe39aad712e Mon Sep 17 00:00:00 2001
From: Marc Weber <marco-oweber@gmx.de>
Date: Tue, 28 Apr 2009 13:34:22 +0000
Subject: [PATCH 1398/5331] * Synced with trunk @ 15211

svn path=/nixos/branches/modular-nixos/; revision=15363
---
 upstart-jobs/apache-httpd/subversion.nix | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/upstart-jobs/apache-httpd/subversion.nix b/upstart-jobs/apache-httpd/subversion.nix
index 8a48617ee44..a32e0bf5dbd 100644
--- a/upstart-jobs/apache-httpd/subversion.nix
+++ b/upstart-jobs/apache-httpd/subversion.nix
@@ -54,9 +54,11 @@ let
     
     # Urgh, most of these are dependencies of Email::Send, should figure them out automatically.
     perlFlags = map (x: "-I${x}/lib/site_perl") [
-      pkgs.perlBerkeleyDB pkgs.perlEmailSend pkgs.perlEmailSimple
-      pkgs.perlModulePluggable pkgs.perlReturnValue pkgs.perlEmailAddress
-      pkgs.perlCryptPasswordMD5 pkgs.perlStringMkPasswd
+      pkgs.perlPackages.BerkeleyDB pkgs.perlPackages.EmailSend
+      pkgs.perlPackages.EmailSimple pkgs.perlPackages.ModulePluggable
+      pkgs.perlPackages.ReturnValue pkgs.perlPackages.EmailAddress
+      pkgs.perlPackages.CryptPasswordMD5
+      pkgs.perlPackages.StringMkPasswd
     ];
 
     # Do a syntax check on the generated file.
-- 
GitLab


From 818baa7dd3ed951330eac5f8f05b1cb1230888c2 Mon Sep 17 00:00:00 2001
From: Marc Weber <marco-oweber@gmx.de>
Date: Tue, 28 Apr 2009 13:34:47 +0000
Subject: [PATCH 1399/5331] * Synced with trunk @ 15274

svn path=/nixos/branches/modular-nixos/; revision=15364
---
 installer/cd-dvd/rescue-cd.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/installer/cd-dvd/rescue-cd.nix b/installer/cd-dvd/rescue-cd.nix
index 8523246ae17..b7e68c2d46d 100644
--- a/installer/cd-dvd/rescue-cd.nix
+++ b/installer/cd-dvd/rescue-cd.nix
@@ -189,6 +189,7 @@ rec {
         pkgs.testdisk # useful for repairing boot problems
         pkgs.mssys # for writing Microsoft boot sectors / MBRs
         pkgs.ntfsprogs # for resizing NTFS partitions
+        pkgs.parted
         pkgs.sshfsFuse
       ];
     };
-- 
GitLab


From e28250470fdc2c269cf1f7996fa280c83f86ae5b Mon Sep 17 00:00:00 2001
From: Marc Weber <marco-oweber@gmx.de>
Date: Tue, 28 Apr 2009 13:38:22 +0000
Subject: [PATCH 1400/5331] * Synced with trunk @ 15312

svn path=/nixos/branches/modular-nixos/; revision=15365
---
 system/switch-to-configuration.sh | 12 ++++++++++++
 system/system.nix                 |  1 +
 system/system.sh                  |  1 +
 upstart-jobs/sshd.nix             |  2 +-
 4 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/system/switch-to-configuration.sh b/system/switch-to-configuration.sh
index dcca984282b..eaeb3106afd 100644
--- a/system/switch-to-configuration.sh
+++ b/system/switch-to-configuration.sh
@@ -35,6 +35,18 @@ fi
 
 if test "$action" = "switch" -o "$action" = "test"; then
 
+    oldVersion=$(cat /var/run/current-system/upstart-interface-version 2> /dev/null || echo 0)
+    newVersion=$(cat @out@/upstart-interface-version 2> /dev/null || echo 0)
+
+    if test "$oldVersion" -ne "$newVersion"; then
+        cat <<EOF
+Warning: the new NixOS configuration has an Upstart version that is
+incompatible with the current version.  The new configuration won't
+take effect until you reboot the system.
+EOF
+        exit 1
+    fi
+
     oldEvents=$(readlink -f /etc/event.d || true)
     newEvents=$(readlink -f @out@/etc/event.d)
 
diff --git a/system/system.nix b/system/system.nix
index ef4e027848b..d4507258a34 100644
--- a/system/system.nix
+++ b/system/system.nix
@@ -227,6 +227,7 @@ rec {
       pkgs.diffutils
       pkgs.upstart # for initctl
     ];
+    upstartInterfaceVersion = pkgs.upstart.interfaceVersion;
     # This attribute is responsible for creating boot entries for 
     # child configuration. They are only (directly) accessible
     # when the parent configuration is boot default. For example,
diff --git a/system/system.sh b/system/system.sh
index 95f650f39aa..67042b5faf4 100644
--- a/system/system.sh
+++ b/system/system.sh
@@ -13,6 +13,7 @@ ln -s $upstart $out/upstart
 
 echo "$kernelParams" > $out/kernel-params
 echo "$configurationName" > $out/configuration-name
+echo "$upstartInterfaceVersion" > $out/upstart-interface-version
 
 mkdir $out/fine-tune
 ChildCount=0;
diff --git a/upstart-jobs/sshd.nix b/upstart-jobs/sshd.nix
index 03dc9f47a9c..d6c06b24f7e 100644
--- a/upstart-jobs/sshd.nix
+++ b/upstart-jobs/sshd.nix
@@ -45,7 +45,7 @@ let
         gatewayPorts = mkOption {
           default = "no";
           description = "
-             Specifies  whether  remote hosts are allowed to connect to ports forwarded for the client. See man sshd_conf.
+             Specifies whether remote hosts are allowed to connect to ports forwarded for the client. See man sshd_conf.
             ";
           };
       };
-- 
GitLab


From cc7f5eba97907374caf91cb2a9c5499d6adfacfd Mon Sep 17 00:00:00 2001
From: Marc Weber <marco-oweber@gmx.de>
Date: Tue, 28 Apr 2009 13:40:55 +0000
Subject: [PATCH 1401/5331] * Synced with trunk @ 15326

svn path=/nixos/branches/modular-nixos/; revision=15366
---
 upstart-jobs/xserver/desktopManager/kde.nix | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/upstart-jobs/xserver/desktopManager/kde.nix b/upstart-jobs/xserver/desktopManager/kde.nix
index 725e51862fa..e2ff1294d9f 100644
--- a/upstart-jobs/xserver/desktopManager/kde.nix
+++ b/upstart-jobs/xserver/desktopManager/kde.nix
@@ -33,6 +33,15 @@ mkIf cfg.enable {
         session = [{
           name = "kde";
           start = ''
+            # A quick hack to make KDE screen locking work.  It calls
+            # kcheckpass, which needs to be setuid in order to read the
+            # shadow password file.  We have a setuid wrapper around
+            # kcheckpass.  However, startkde adds $kdebase/bin to the start
+            # of $PATH if it's not already in $PATH, thus overriding the
+            # setuid wrapper directory.  So here we add $kdebase/bin to the
+            # end of $PATH to keep startkde from doing that.
+            export PATH=$PATH:${pkgs.kdebase}/bin
+            
             # Start KDE.
             exec ${pkgs.kdebase}/bin/startkde
           '';
-- 
GitLab


From 8e5eeccb758fa54bf1f35d8ee425bdc8fcfea70d Mon Sep 17 00:00:00 2001
From: Marc Weber <marco-oweber@gmx.de>
Date: Tue, 28 Apr 2009 13:42:43 +0000
Subject: [PATCH 1402/5331] * Synced with trunk @ 15340

svn path=/nixos/branches/modular-nixos/; revision=15367
---
 etc/bashrc.sh             | 1 +
 system/system-options.nix | 1 +
 2 files changed, 2 insertions(+)

diff --git a/etc/bashrc.sh b/etc/bashrc.sh
index 43175f198f0..a2bb83f9da9 100644
--- a/etc/bashrc.sh
+++ b/etc/bashrc.sh
@@ -16,6 +16,7 @@ export EDITOR=nano
 export INFOPATH=/var/run/current-system/sw/info:/var/run/current-system/sw/share/info
 export LOCATE_PATH=/var/cache/locatedb
 @shellInit@
+export LOCALE_ARCHIVE=/var/run/current-system/sw/lib/locale/locale-archive
 
 # Set up secure multi-user builds: non-root users build through the
 # Nix daemon.
diff --git a/system/system-options.nix b/system/system-options.nix
index b1688cdda80..1484ca0481a 100644
--- a/system/system-options.nix
+++ b/system/system-options.nix
@@ -104,6 +104,7 @@ in
         let path = [
           pkgs.coreutils pkgs.gnugrep pkgs.findutils
           pkgs.glibc # needed for getent
+          pkgs.glibcLocals # needed for getent
           pkgs.pwdutils
         ]; in noDepEntry ''
         export PATH=/empty
-- 
GitLab


From 2cd1e7239fdbf60eea564c9183a6e31c03fca25e Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 28 Apr 2009 13:43:03 +0000
Subject: [PATCH 1403/5331] * Atomically update grub/menu.lst (although we
 really need an fsync here).

svn path=/nixos/trunk/; revision=15368
---
 installer/grub-menu-builder.sh | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/installer/grub-menu-builder.sh b/installer/grub-menu-builder.sh
index 5d26cdb4327..72635c36433 100644
--- a/installer/grub-menu-builder.sh
+++ b/installer/grub-menu-builder.sh
@@ -147,4 +147,6 @@ for generation in $(
 done
 
 
-cp $tmp $target
+# Atomically update /boot/grub/menu.lst.  !!! should do an fsync()
+# here on $tmp, especially on ext4.
+mv $tmp $target
-- 
GitLab


From 114109b709cc1331e5eaf8c5f794c4f81e371b06 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 28 Apr 2009 13:43:22 +0000
Subject: [PATCH 1404/5331] * The X server now needs HAL running.

svn path=/nixos/trunk/; revision=15369
---
 upstart-jobs/xserver.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/upstart-jobs/xserver.nix b/upstart-jobs/xserver.nix
index 91b30828f7e..504a06b8650 100644
--- a/upstart-jobs/xserver.nix
+++ b/upstart-jobs/xserver.nix
@@ -416,7 +416,7 @@ rec {
 
     
   job = ''
-    start on ${if cfg.autorun then "network-interfaces" else "never"}
+    start on ${if cfg.autorun then "hal" else "never"}
 
     start script
     
-- 
GitLab


From 0f99f50e3456ce225dea83ce414d340cfd5d0cb9 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 28 Apr 2009 13:43:48 +0000
Subject: [PATCH 1405/5331] * Use lib/perl5/site_perl.

svn path=/nixos/trunk/; revision=15370
---
 etc/bashrc.sh | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/etc/bashrc.sh b/etc/bashrc.sh
index ba8a0ebb9c6..38f839f4476 100644
--- a/etc/bashrc.sh
+++ b/etc/bashrc.sh
@@ -49,8 +49,10 @@ for i in $NIX_PROFILES; do # !!! reverse
     if [ -d "$i/share/aclocal" ]; then
 	export ACLOCAL_PATH="$i/share/aclocal:$ACLOCAL_PATH"
     fi
-    
-    export PERL5LIB="$i/lib/site_perl:$PERL5LIB"
+
+    # "lib/site_perl" is for backwards compatibility with packages
+    # from Nixpkgs <= 0.12.
+    export PERL5LIB="$i/lib/perl5/site_perl:$i/lib/site_perl:$PERL5LIB"
 
     # GStreamer.
     export GST_PLUGIN_PATH="$i/lib/gstreamer-0.10:$GST_PLUGIN_PATH"
-- 
GitLab


From addf00b1cf5f0d24b581c22e0cc6d23d198a3c17 Mon Sep 17 00:00:00 2001
From: Marc Weber <marco-oweber@gmx.de>
Date: Tue, 28 Apr 2009 13:44:43 +0000
Subject: [PATCH 1406/5331] * Synced with trunk @ 15344

svn path=/nixos/branches/modular-nixos/; revision=15371
---
 upstart-jobs/hal.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/upstart-jobs/hal.nix b/upstart-jobs/hal.nix
index ebd1cb3a197..ba6f8b94049 100644
--- a/upstart-jobs/hal.nix
+++ b/upstart-jobs/hal.nix
@@ -52,6 +52,8 @@ let
       start script
 
           mkdir -m 0755 -p /var/cache/hald
+          
+          rm -f /var/cache/hald/fdi-cache
 
       end script
 
-- 
GitLab


From fb1e6d5c80bc09165e95bbd15eb0f109538b7ad2 Mon Sep 17 00:00:00 2001
From: Marc Weber <marco-oweber@gmx.de>
Date: Tue, 28 Apr 2009 13:49:05 +0000
Subject: [PATCH 1407/5331] * Synced with trunk @ 15345

svn path=/nixos/branches/modular-nixos/; revision=15372
---
 upstart-jobs/xserver/default.nix  | 13 ++++++-------
 upstart-jobs/xserver/xserver.conf | 21 +--------------------
 2 files changed, 7 insertions(+), 27 deletions(-)

diff --git a/upstart-jobs/xserver/default.nix b/upstart-jobs/xserver/default.nix
index 98fe14d19f0..a02e559ade4 100644
--- a/upstart-jobs/xserver/default.nix
+++ b/upstart-jobs/xserver/default.nix
@@ -305,15 +305,14 @@ let
   videoDriver = cfg.videoDriver;
   resolutions = map (res: ''"${toString res.x}x${toString res.y}"'') (cfg.resolutions);
 
-  videoDriverModules = getAttr [ videoDriver ] (throw "unkown video driver : \"${videoDriver}\"") knownVideoDrivers;
+  videoDriverModules = getAttr [ videoDriver ] (throw "unkown video driver : `${videoDriver}'") knownVideoDrivers;
 
   modules = 
 
     getAttr ["modulesFirst"] [] videoDriverModules
     ++ [
       xorg.xorgserver
-      xorg.xf86inputkeyboard
-      xorg.xf86inputmouse
+      xorg.xf86inputevdev
     ] 
     ++ getAttr ["modules"] [] videoDriverModules
     ++ (optional cfg.synaptics.enable ["${pkgs.synaptics}/${xorg.xorgserver}" /*xorg.xf86inputevdev*/]);
@@ -370,10 +369,10 @@ let
       Option "XkbOptions" "${cfg.xkbOptions}"
     '';
 
-    xkbModel = cfg.xkbModel;
-    layout = cfg.layout;
-
-    corePointer = if cfg.synaptics.enable then "Touchpad[0]" else "Mouse[0]";
+    setCorePointer = 
+      if cfg.synaptics.enable then ''
+        InputDevice "Touchpad[0]" "CorePointer"
+      '' else "";
 
     internalAGPGART =
       if cfg.useInternalAGPGART == "yes" then
diff --git a/upstart-jobs/xserver/xserver.conf b/upstart-jobs/xserver/xserver.conf
index 145d31e3192..a1d8aaea9b2 100644
--- a/upstart-jobs/xserver/xserver.conf
+++ b/upstart-jobs/xserver/xserver.conf
@@ -9,7 +9,6 @@ EndSection
 
 Section "ServerFlags"
   Option "AllowMouseOpenFail" "on"
-  Option "AllowEmptyInput" "off"  
 EndSection
 
 
@@ -22,23 +21,6 @@ Section "Module"
 EndSection
 
 
-Section "InputDevice"
-  Driver       "kbd"
-  Identifier   "Keyboard[0]"
-  Option       "Protocol" "Standard"
-  Option       "XkbLayout" "@layout@"
-  Option       "XkbModel" "@xkbModel@"
-  Option       "XkbRules" "xfree86"
-  @xkbOptions@
-EndSection
-
-
-Section "InputDevice"
-  Driver       "mouse"
-  Identifier   "Mouse[0]"
-  Option       "Device" "/dev/input/mice"
-EndSection
-
 @synapticsInputDevice@
 
 Section "Monitor"
@@ -89,8 +71,7 @@ EndSection
 
 Section "ServerLayout"
   Identifier   "Layout[all]"
-  InputDevice  "Keyboard[0]" "CoreKeyboard"
-  InputDevice  "@corePointer@" "CorePointer"
+  @setCorePointer@
   Screen       "Screen[0]"
   @serverLayoutOptions@
 EndSection
-- 
GitLab


From fa9ceac86273f7fec7deb480b18de6e0efc1cd2c Mon Sep 17 00:00:00 2001
From: Marc Weber <marco-oweber@gmx.de>
Date: Tue, 28 Apr 2009 13:51:58 +0000
Subject: [PATCH 1408/5331] * Synced with trunk @ 15346

svn path=/nixos/branches/modular-nixos/; revision=15373
---
 upstart-jobs/xserver/default.nix  | 4 ++--
 upstart-jobs/xserver/xserver.conf | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/upstart-jobs/xserver/default.nix b/upstart-jobs/xserver/default.nix
index a02e559ade4..71eb34f34b6 100644
--- a/upstart-jobs/xserver/default.nix
+++ b/upstart-jobs/xserver/default.nix
@@ -315,7 +315,7 @@ let
       xorg.xf86inputevdev
     ] 
     ++ getAttr ["modules"] [] videoDriverModules
-    ++ (optional cfg.synaptics.enable ["${pkgs.synaptics}/${xorg.xorgserver}" /*xorg.xf86inputevdev*/]);
+    ++ (optional cfg.synaptics.enable ["${xorg.xf86inputsynaptics}"]);
 
 
   fontsForXServer =
@@ -560,7 +560,7 @@ mkIf cfg.enable {
         }
 
         ${if videoDriver != "nvidia"
-          then "env XORG_DRI_DRIVER_PATH=${pkgs.mesa}/lib/modules/dri"
+          then "env XORG_DRI_DRIVER_PATH=${pkgs.mesa}/lib/dri"
           else ""
         }
 
diff --git a/upstart-jobs/xserver/xserver.conf b/upstart-jobs/xserver/xserver.conf
index a1d8aaea9b2..5d62ca9e397 100644
--- a/upstart-jobs/xserver/xserver.conf
+++ b/upstart-jobs/xserver/xserver.conf
@@ -74,6 +74,7 @@ Section "ServerLayout"
   @setCorePointer@
   Screen       "Screen[0]"
   @serverLayoutOptions@
+  Option       "AutoAddDevices" "0"
 EndSection
 
 
-- 
GitLab


From 0ba7449c112cc1bcbcc0ecb2204a972c4a91ac06 Mon Sep 17 00:00:00 2001
From: Marc Weber <marco-oweber@gmx.de>
Date: Tue, 28 Apr 2009 13:53:04 +0000
Subject: [PATCH 1409/5331] * Synced with trunk @ 15348

svn path=/nixos/branches/modular-nixos/; revision=15374
---
 upstart-jobs/xserver/xserver.conf | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/upstart-jobs/xserver/xserver.conf b/upstart-jobs/xserver/xserver.conf
index 5d62ca9e397..66cb2571a8d 100644
--- a/upstart-jobs/xserver/xserver.conf
+++ b/upstart-jobs/xserver/xserver.conf
@@ -74,7 +74,8 @@ Section "ServerLayout"
   @setCorePointer@
   Screen       "Screen[0]"
   @serverLayoutOptions@
-  Option       "AutoAddDevices" "0"
+  # If you want to disable HAL-based configuration, set AutoAddDevices to 0
+  # Option       "AutoAddDevices" "0"
 EndSection
 
 
-- 
GitLab


From 84b5d26ffc90e48d5821f40648d5e455b0399f7a Mon Sep 17 00:00:00 2001
From: Marc Weber <marco-oweber@gmx.de>
Date: Tue, 28 Apr 2009 14:01:11 +0000
Subject: [PATCH 1410/5331] doh. my typo while merging

svn path=/nixos/branches/modular-nixos/; revision=15376
---
 system/system-options.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/system/system-options.nix b/system/system-options.nix
index 1484ca0481a..81495f621e8 100644
--- a/system/system-options.nix
+++ b/system/system-options.nix
@@ -104,7 +104,7 @@ in
         let path = [
           pkgs.coreutils pkgs.gnugrep pkgs.findutils
           pkgs.glibc # needed for getent
-          pkgs.glibcLocals # needed for getent
+          pkgs.glibcLocales # needed for getent
           pkgs.pwdutils
         ]; in noDepEntry ''
         export PATH=/empty
-- 
GitLab


From d804730382636116a2a29269d1222534a8b84955 Mon Sep 17 00:00:00 2001
From: Marc Weber <marco-oweber@gmx.de>
Date: Tue, 28 Apr 2009 23:05:03 +0000
Subject: [PATCH 1411/5331] adding assertion support to modular-nixos

problem: the nix language assert function can't be used because
of the fix-style used in modular-nixos. A minimal stripped down version
illustrating the problem looks like this:

fix (x : assert x.cfg.foo; { upstartJob = ...; cfg = ...; } )

Now nix has to evaluate x.cfg.foo in order to check the assertion.
However to do so it has to access x.cfg.foo beeing defined in the body
The body can only be evaluated after the assertion passes.
So in the end you get an infinite recursion error.

pierron mentioned that adding another mkIf like function could
work. Maybe this implementation is even simpler. It adds
another option collecting assertions only.
The evaluation is forced by a function adding an empty list to
extraPackages. extraPackages is evaluated by nixos in all cases.
If there are assertions evaluating to false all assertion messages are
presented to the user using throw.

svn path=/nixos/branches/modular-nixos/; revision=15387
---
 system/assertion.nix | 25 +++++++++++++++++++++++++
 system/options.nix   |  3 +++
 2 files changed, 28 insertions(+)
 create mode 100644 system/assertion.nix

diff --git a/system/assertion.nix b/system/assertion.nix
new file mode 100644
index 00000000000..36eb36cb903
--- /dev/null
+++ b/system/assertion.nix
@@ -0,0 +1,25 @@
+{pkgs, config, ...}:
+
+let
+  inherit (pkgs.lib) mkOption filter concatMap concatStringsSep;
+  failed = map (x : x.message) (filter (x: ! x.assertion) config.assertions);
+in
+
+{
+
+  assertions = mkOption {
+    default = [];
+    example = [{ assertion = false; msg = "you can't enable this for that reason"; }];
+    merge = pkgs.lib.mergeListOption;
+    description = ''
+      Add something like this
+      assertions = mkAlways [ { assertion = false; message = "false should have been true"; } ];
+      to your upstart-job.
+    '';
+  };
+
+  environment = {
+    # extraPackages are evaluated always. Thus the assertions are checked as well. hacky!
+    extraPackages = if [] == failed then [] else throw "\n!! failed assertions: !!\n${concatStringsSep "\n" (map (x: "- ${x}") failed)}";
+  };
+}
diff --git a/system/options.nix b/system/options.nix
index 16269905633..5d39beb64b4 100644
--- a/system/options.nix
+++ b/system/options.nix
@@ -379,6 +379,9 @@ in
   };
 
   require = [
+
+    (import ../system/assertion.nix)
+
     # boot (is it the right place ?)
     (import ../system/kernel.nix)
     (import ../boot/boot-stage-2.nix)
-- 
GitLab


From e3ad6a6f5926a89dcf23a63cd5c4f0f985c05c0a Mon Sep 17 00:00:00 2001
From: Rob Vermaas <rob.vermaas@gmail.com>
Date: Wed, 29 Apr 2009 12:25:25 +0000
Subject: [PATCH 1412/5331] Added enableTCPIP option for postgresql (defaults
 to false) to allow tcpip connections

svn path=/nixos/trunk/; revision=15391
---
 system/options.nix          | 6 ++++++
 upstart-jobs/postgresql.nix | 7 +++++--
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/system/options.nix b/system/options.nix
index 9ce0daf9de7..20152ddc206 100644
--- a/system/options.nix
+++ b/system/options.nix
@@ -2286,6 +2286,12 @@ in
           How to authorize users. 
           Note: ident needs absolute trust to all allowed client hosts.";
       };
+      enableTCPIP = mkOption {
+        default = false;
+        description = "
+          Whether to run PostgreSQL with -i flag to enable TCP/IP connections.
+        ";
+      };
     };
 
     
diff --git a/upstart-jobs/postgresql.nix b/upstart-jobs/postgresql.nix
index a37780678fc..83ab1d5962d 100644
--- a/upstart-jobs/postgresql.nix
+++ b/upstart-jobs/postgresql.nix
@@ -13,7 +13,7 @@ let
 
 in
 
-{
+rec {
   name = "postgresql";
 
   users = [
@@ -28,6 +28,9 @@ in
 
   extraPath = [postgresql];
 
+  flags = 
+    if cfg.enableTCPIP then ["-i"] else [] ;
+
   job = ''
     description "PostgreSQL server"
 
@@ -43,6 +46,6 @@ in
         cp -f ${pkgs.writeText "pg_hba.conf" cfg.authentication} ${cfg.dataDir}/pg_hba.conf
     end script
 
-    respawn ${run} -c '${postgresql}/bin/postgres -D ${cfg.dataDir}'
+    respawn ${run} -c '${postgresql}/bin/postgres -D ${cfg.dataDir} ${toString flags}'
   '';
 }
-- 
GitLab


From d29b8323e1ad3341d27619743172be6ae702aef5 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 29 Apr 2009 14:51:17 +0000
Subject: [PATCH 1413/5331] * Support loading the Intel 5000 firmware.

svn path=/nixos/trunk/; revision=15396
---
 system/options.nix       | 9 +++++++++
 upstart-jobs/default.nix | 1 +
 2 files changed, 10 insertions(+)

diff --git a/system/options.nix b/system/options.nix
index 20152ddc206..ef73fcb7ec0 100644
--- a/system/options.nix
+++ b/system/options.nix
@@ -429,6 +429,15 @@ in
       ";
     };
 
+    enableIntel5000Firmware = mkOption {
+      default = false;
+      merge = obsoleteMerge;
+      description = "
+        This option enables automatic loading of the firmware for the Intel
+        PRO/Wireless 5000.
+      ";
+    };
+
     enableZydasZD1211Firmware = mkOption {
       default = false;
       merge = obsoleteMerge;
diff --git a/upstart-jobs/default.nix b/upstart-jobs/default.nix
index 9df21fb57a5..581ea53fee0 100644
--- a/upstart-jobs/default.nix
+++ b/upstart-jobs/default.nix
@@ -97,6 +97,7 @@ let
            pkgs.lib.optional config.networking.enableIntel2200BGFirmware pkgs.ipw2200fw
         ++ pkgs.lib.optional config.networking.enableIntel3945ABGFirmware pkgs.iwlwifi3945ucode
         ++ pkgs.lib.optional config.networking.enableIntel4965AGNFirmware kernelPackages.iwlwifi4965ucode
+        ++ pkgs.lib.optional config.networking.enableIntel5000Firmware kernelPackages.iwlwifi5000ucode
         ++ pkgs.lib.optional config.networking.enableZydasZD1211Firmware pkgs.zd1211fw
         ++ pkgs.lib.optional config.hardware.enableGo7007 "${kernelPackages.wis_go7007}/firmware"
         ++ config.services.udev.addFirmware
-- 
GitLab


From 9325fa9ccc34db1fe0022f4f84249188915c5287 Mon Sep 17 00:00:00 2001
From: Rob Vermaas <rob.vermaas@gmail.com>
Date: Wed, 29 Apr 2009 15:10:14 +0000
Subject: [PATCH 1414/5331] iwlwifi5000ucode from pkgs

svn path=/nixos/trunk/; revision=15397
---
 upstart-jobs/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/upstart-jobs/default.nix b/upstart-jobs/default.nix
index 581ea53fee0..411fc526d41 100644
--- a/upstart-jobs/default.nix
+++ b/upstart-jobs/default.nix
@@ -97,7 +97,7 @@ let
            pkgs.lib.optional config.networking.enableIntel2200BGFirmware pkgs.ipw2200fw
         ++ pkgs.lib.optional config.networking.enableIntel3945ABGFirmware pkgs.iwlwifi3945ucode
         ++ pkgs.lib.optional config.networking.enableIntel4965AGNFirmware kernelPackages.iwlwifi4965ucode
-        ++ pkgs.lib.optional config.networking.enableIntel5000Firmware kernelPackages.iwlwifi5000ucode
+        ++ pkgs.lib.optional config.networking.enableIntel5000Firmware pkgs.iwlwifi5000ucode
         ++ pkgs.lib.optional config.networking.enableZydasZD1211Firmware pkgs.zd1211fw
         ++ pkgs.lib.optional config.hardware.enableGo7007 "${kernelPackages.wis_go7007}/firmware"
         ++ config.services.udev.addFirmware
-- 
GitLab


From a29bfb0d7bf8f6cc0ca66f0dadbf136aaf13b330 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 29 Apr 2009 17:03:29 +0000
Subject: [PATCH 1415/5331] * Use the default Subversion (1.6).

svn path=/nixos/trunk/; revision=15407
---
 upstart-jobs/apache-httpd/subversion.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/upstart-jobs/apache-httpd/subversion.nix b/upstart-jobs/apache-httpd/subversion.nix
index a32e0bf5dbd..3c3e7173549 100644
--- a/upstart-jobs/apache-httpd/subversion.nix
+++ b/upstart-jobs/apache-httpd/subversion.nix
@@ -19,7 +19,7 @@ let
 
 
   # Build a Subversion instance with Apache modules and Swig/Python bindings.
-  subversion = pkgs.subversion15.override (origArgs: {
+  subversion = pkgs.subversion.override (origArgs: {
     bdbSupport = true;
     httpServer = true;
     sslSupport = true;
@@ -53,7 +53,7 @@ let
     inherit (serverInfo.serverConfig) user group;    
     
     # Urgh, most of these are dependencies of Email::Send, should figure them out automatically.
-    perlFlags = map (x: "-I${x}/lib/site_perl") [
+    perlFlags = map (x: "-I${x}/lib/perl5/site_perl") [
       pkgs.perlPackages.BerkeleyDB pkgs.perlPackages.EmailSend
       pkgs.perlPackages.EmailSimple pkgs.perlPackages.ModulePluggable
       pkgs.perlPackages.ReturnValue pkgs.perlPackages.EmailAddress
-- 
GitLab


From ef64840085be2f457b3e21c71e989fcc3fe99f04 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 29 Apr 2009 17:03:58 +0000
Subject: [PATCH 1416/5331] * Don't hardcode values specific to the program
 transformation / Stratego wikis.

svn path=/nixos/trunk/; revision=15408
---
 upstart-jobs/apache-httpd/twiki.nix | 50 +++++++++++++++++++++++------
 1 file changed, 41 insertions(+), 9 deletions(-)

diff --git a/upstart-jobs/apache-httpd/twiki.nix b/upstart-jobs/apache-httpd/twiki.nix
index 54614aca24c..7e524144e64 100644
--- a/upstart-jobs/apache-httpd/twiki.nix
+++ b/upstart-jobs/apache-httpd/twiki.nix
@@ -3,10 +3,9 @@
 let
 
   inherit (pkgs.lib) mkOption;
-  inherit (config) urlPrefix distDir;
 
-  dataDir = "/data/pt-wiki/data";
-  pubDir = "/data/pt-wiki/pub";
+  dataDir = config.dataDir; # "/data/pt-wiki/data";
+  pubDir = config.pubDir; # "/data/pt-wiki/pub";
 
   scriptUrlPath = "/bin";
   pubUrlPath    = "/pub";
@@ -17,19 +16,18 @@ let
   dispScriptUrlPath = "";
   dispViewPath      = "";
 
-  twikiName = "Program Transformation Wiki";
   startWeb = config.startWeb;
-  registrationDomain = "ewi.tudelft.nl";
   defaultUrlHost = "";
 
   # Build the TWiki CGI and configuration files.
   twikiRoot = (import /etc/nixos/services/twiki/twiki-instance.nix).twiki {
-    name = "pt-wiki";
+    name = "wiki-instance";
     pubdir = pubDir;
     datadir = dataDir;
-    inherit twikiName scriptUrlPath pubUrlPath absHostPath
-      dispPubUrlPath dispScriptUrlPath dispViewPath
-      registrationDomain defaultUrlHost;
+    inherit scriptUrlPath pubUrlPath absHostPath
+      dispPubUrlPath dispScriptUrlPath dispViewPath defaultUrlHost;
+    twikiName = config.twikiName;
+    registrationDomain = config.registrationDomain;
   };
 
   plugins = import /etc/nixos/services/twiki/server-pkgs/twiki-plugins.nix;
@@ -111,4 +109,38 @@ in {
     Disallow: /pt/bin/
   '';
 
+  options = {
+
+    dataDir = mkOption {
+      example = "/data/wiki/data";
+      description = "
+        Path to the directory that holds the Wiki data.
+      ";
+    };
+
+    pubDir = mkOption {
+      example = "/data/wiki/pub";
+      description = "
+        Path to the directory that holds uploaded files.
+      ";
+    };
+
+    twikiName = mkOption {
+      default = "Wiki";
+      example = "Foobar Wiki";
+      description = "
+        Name of this Wiki.
+      ";
+    };
+
+    registrationDomain = mkOption {
+      example = "example.org";
+      description = "
+        Domain from which registrations are permitted.  Use `all' to
+        permit registrations from anywhere.
+      ";
+    };
+
+  };  
+
 }
\ No newline at end of file
-- 
GitLab


From 3636fa1a0439baeb1f3a614356a3066a4b90f16b Mon Sep 17 00:00:00 2001
From: Marc Weber <marco-oweber@gmx.de>
Date: Thu, 30 Apr 2009 02:29:58 +0000
Subject: [PATCH 1417/5331] fixing assertions using new assertion
 implementation

svn path=/nixos/branches/modular-nixos/; revision=15409
---
 system/options.nix               | 8 ++++----
 upstart-jobs/halt.nix            | 7 -------
 upstart-jobs/openfire.nix        | 8 ++++++--
 upstart-jobs/tty-backgrounds.nix | 6 +++---
 upstart-jobs/xfs.nix             | 6 +++---
 5 files changed, 16 insertions(+), 19 deletions(-)

diff --git a/system/options.nix b/system/options.nix
index 5d39beb64b4..f9b025ae109 100644
--- a/system/options.nix
+++ b/system/options.nix
@@ -409,7 +409,7 @@ in
     (import ../upstart-jobs/nscd.nix) # Name service cache daemon.
     (import ../upstart-jobs/maintenance-shell.nix) # Handles the maintenance/stalled event (single-user shell).
     (import ../upstart-jobs/ctrl-alt-delete.nix) # Ctrl-alt-delete action.
-    (import ../upstart-jobs/halt.nix) # FIXME (assertion) # Handles the reboot/halt events.
+    (import ../upstart-jobs/halt.nix)
     (import ../upstart-jobs/ifplugd.nix) # ifplugd daemon for monitoring Ethernet cables.
 
 
@@ -475,16 +475,16 @@ in
     (import ../upstart-jobs/udev.nix) # The udev daemon creates devices nodes and runs programs when hardware events occur.
     (import ../upstart-jobs/samba.nix) # TODO: doesn't start here (?)
     (import ../upstart-jobs/ircd-hybrid.nix) # TODO: doesn't compile on x86_64-linux, can't test
-    (import ../upstart-jobs/xfs.nix) # FIXME (assertion)
+    (import ../upstart-jobs/xfs.nix)
     (import ../upstart-jobs/mysql.nix)
     (import ../upstart-jobs/postgresql.nix)
-    (import ../upstart-jobs/openfire.nix) # FIXME (assertion)
+    (import ../upstart-jobs/openfire.nix)
     (import ../upstart-jobs/postfix.nix)
     (import ../upstart-jobs/dovecot.nix)
     (import ../upstart-jobs/bind.nix)
 
     (import ../upstart-jobs/mingetty.nix) # The terminals on ttyX.
-    (import ../upstart-jobs/tty-backgrounds.nix) #FIXME (assertion)
+    (import ../upstart-jobs/tty-backgrounds.nix)
 
     (import ../upstart-jobs/synergy.nix)
 
diff --git a/upstart-jobs/halt.nix b/upstart-jobs/halt.nix
index d98a3b5eea4..d8a1029dba5 100644
--- a/upstart-jobs/halt.nix
+++ b/upstart-jobs/halt.nix
@@ -3,13 +3,6 @@
 ###### implementation
 
 
-/* FIXME
-assert event == "reboot"
-    || event == "halt"
-    || event == "system-halt"
-    || event == "power-off";
-*/
-
 let
 
   inherit (pkgs) bash utillinux;
diff --git a/upstart-jobs/openfire.nix b/upstart-jobs/openfire.nix
index 365d34a5b26..fa51ad173a3 100644
--- a/upstart-jobs/openfire.nix
+++ b/upstart-jobs/openfire.nix
@@ -26,8 +26,6 @@ in
 
 ###### implementation
 
-# FIXME (see xfs)
-# if (!(config.services.openfire.usePostgreSQL -> config.services.postgresql.enable)) then throw "openfire assertion failed" else
 let
   inherit (pkgs) jre openfire coreutils which gnugrep gawk gnused;
     
@@ -41,6 +39,12 @@ let
 in
 
 mkIf config.services.openfire.enable {
+
+  assertions = [ {
+    assertion = !(config.services.openfire.usePostgreSQL -> config.services.postgresql.enable);
+    message = "openfire assertion failed";
+  } ];
+
   require = [
     options
   ];
diff --git a/upstart-jobs/tty-backgrounds.nix b/upstart-jobs/tty-backgrounds.nix
index 825874aaeed..e4af68b4828 100644
--- a/upstart-jobs/tty-backgrounds.nix
+++ b/upstart-jobs/tty-backgrounds.nix
@@ -112,10 +112,10 @@ let
 
 in
 
-# FIXME see xfs
-# assert splashutils != null;
+mkIf (config.services.ttyBackgrounds.enable) {
+
+  assertions = [ { assertion = kernelPackages.splashutils != null; message = "kernelPackages.splashutils may not be false"; } ];
 
-mkIf (config.services.ttyBackgrounds.enable && kernelPackages.splashutils != null) {
   require = [
     options
   ];
diff --git a/upstart-jobs/xfs.nix b/upstart-jobs/xfs.nix
index c7b9d85551d..9cc5c25ec0f 100644
--- a/upstart-jobs/xfs.nix
+++ b/upstart-jobs/xfs.nix
@@ -23,15 +23,15 @@ in
 ###### implementation
 
 
-# FIXME: enable this warning again. It's causing "infinite recursion encountered, why?"
-# if ! config.fonts.enableFontDir then throw "Please enable fontDir (fonts.enableFontDir) to use xfs." else
-
 let
   configFile = ./xfs.conf;
   startingDependency = if config.services.gw6c.enable && config.services.gw6c.autorun then "gw6c" else "network-interfaces";
 in
 
 mkIf config.services.xfs.enable {
+
+  assertions = [ { assertion = ! config.fonts.enableFontDir; message = "Please enable fontDir (fonts.enableFontDir) to use xfs."; } ];
+
   require = [
     options
   ];
-- 
GitLab


From 19ef6c7a1c658884b0d3f45a4f8c5d059800bce8 Mon Sep 17 00:00:00 2001
From: Marc Weber <marco-oweber@gmx.de>
Date: Thu, 30 Apr 2009 11:37:23 +0000
Subject: [PATCH 1418/5331] put wmii in a loop cause it crashes once or twice a
 month This also let's you change orientation. See comments

svn path=/nixos/branches/modular-nixos/; revision=15412
---
 upstart-jobs/xserver/windowManager/wmii.nix | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/upstart-jobs/xserver/windowManager/wmii.nix b/upstart-jobs/xserver/windowManager/wmii.nix
index 219550c4f0c..191e31af1de 100644
--- a/upstart-jobs/xserver/windowManager/wmii.nix
+++ b/upstart-jobs/xserver/windowManager/wmii.nix
@@ -22,13 +22,23 @@ mkIf cfg.enable {
 
   services = {
     xserver = {
-
+      # stop wmii by
+      #   $wmiir xwrite /ctl quit
+      # this will cause wmii exiting with exit code 0
+      #
+      # why this loop?
+      # wmii crashes once a month here. That doesn't matter that much
+      # wmii can recover very well. However without loop the x session terminates and then your workspace setup is
+      # lost and all applications running on X will terminate.
+      # Another use case is kill -9 wmii; after rotating screen.
+      # Note: we don't like kill for that purpose. But it works (-> subject "wmii and xrandr" on mailinglist)
       windowManager = {
         session = [{
           name = "wmii";
           start = "
-            ${pkgs.wmiiSnap}/bin/wmii &
-            waitPID=$!
+            while :; do
+              ${pkgs.wmiiSnap}/bin/wmii && break
+            done
           ";
         }];
       };
-- 
GitLab


From 2470db9d7433280065684a692f47149d2bc70f65 Mon Sep 17 00:00:00 2001
From: Marc Weber <marco-oweber@gmx.de>
Date: Thu, 30 Apr 2009 12:21:41 +0000
Subject: [PATCH 1419/5331] also add uhci_hcd, thanks to ugo @ irc

svn path=/nixos/trunk/; revision=15413
---
 installer/cd-dvd/rescue-cd.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/installer/cd-dvd/rescue-cd.nix b/installer/cd-dvd/rescue-cd.nix
index b7e68c2d46d..7a5c97421bc 100644
--- a/installer/cd-dvd/rescue-cd.nix
+++ b/installer/cd-dvd/rescue-cd.nix
@@ -54,6 +54,7 @@ rec {
           # something goes wrong in stage 1.
           "ehci_hcd"
           "ohci_hcd"
+          "uhci_hcd"
           "usbhid"
           "usb_storage"
 
-- 
GitLab


From 4f2725c54abe9cce61d7ba21aebcb0bd5c64bcfc Mon Sep 17 00:00:00 2001
From: Marc Weber <marco-oweber@gmx.de>
Date: Fri, 1 May 2009 05:43:41 +0000
Subject: [PATCH 1420/5331] adding autofs support to modular nixos.

autofs/automount is used to mount cdroms
floppies or network drivers on the fly..

svn path=/nixos/branches/modular-nixos/; revision=15420
---
 system/options.nix      |   1 +
 upstart-jobs/autofs.nix | 107 ++++++++++++++++++++++++++++++++++++++++
 2 files changed, 108 insertions(+)
 create mode 100644 upstart-jobs/autofs.nix

diff --git a/system/options.nix b/system/options.nix
index f9b025ae109..cb50cf7f6e0 100644
--- a/system/options.nix
+++ b/system/options.nix
@@ -489,6 +489,7 @@ in
     (import ../upstart-jobs/synergy.nix)
 
     (import ../upstart-jobs/nfs-kernel.nix)
+    (import ../upstart-jobs/autofs.nix)
 
     # nix
     (import ../upstart-jobs/nix.nix) # nix options and daemon
diff --git a/upstart-jobs/autofs.nix b/upstart-jobs/autofs.nix
new file mode 100644
index 00000000000..c7b436cb358
--- /dev/null
+++ b/upstart-jobs/autofs.nix
@@ -0,0 +1,107 @@
+{pkgs, config, ...}:
+
+###### interface
+let
+  inherit (pkgs.lib) mkOption mkIf;
+
+  options = {
+    services = {
+
+      autofs = {
+        enable = mkOption {
+          default = false;
+          description = "
+            automatically mount and unmount filesystems
+          ";
+        };
+
+        autoMaster = mkOption {
+          example = ''
+            autoMaster = let
+              map = pkgs.writeText "auto" '''
+               kernel    -ro,soft,intr       ftp.kernel.org:/pub/linux
+               boot      -fstype=ext2        :/dev/hda1
+               windoze   -fstype=smbfs       ://windoze/c
+               removable -fstype=ext2        :/dev/hdd
+               cd        -fstype=iso9660,ro  :/dev/hdc
+               floppy    -fstype=auto        :/dev/fd0
+               server    -rw,hard,intr       / -ro myserver.me.org:/ \
+                                             /usr myserver.me.org:/usr \
+                                             /home myserver.me.org:/home
+              ''';
+            in '''
+              /auto file:${map}
+            '''
+          '';
+          description = "
+            file contents of /etc/auto.master. See man auto.master
+            see 
+            man auto.master and man 5 autofs
+          ";
+        };
+
+        timeout = mkOption {
+          default = 600;
+          description = "Set the global minimum timeout, in seconds, until directories are unmounted";
+        };
+
+        debug = mkOption {
+          default = false;
+          description = "pass -d to automount and write log to /var/log/autofs";
+        };
+      };
+    };
+  };
+
+###### implementation
+
+  inherit (pkgs) lib writeTextopenssh autofs5;
+
+  cfg = (config.services.autofs);
+
+  modprobe = config.system.sbin.modprobe;
+
+in
+
+mkIf cfg.enable {
+
+  require = [
+    options
+  ];
+
+  environment = {
+    etc =
+      [ {
+        target = "auto.master";
+        source = pkgs.writeText "auto.master" cfg.autoMaster;
+      }];
+  };
+
+  services = {
+    extraJobs = [
+    {
+      name = "autofs";
+
+      # kernel module autofs  supports kernel protocol v3
+      # kernel module autofs4 supports kernel protocol v3, v4, v5
+      job = ''
+        description "automatically mount filesystems"
+
+        start on network-interfaces/started
+        stop on network-interfaces/stop
+
+        PATH=${pkgs.nfsUtils}/sbin:${modprobe}/sbin
+
+        start script
+          modprobe autofs4 || true
+        end script
+
+        script
+          ${if cfg.debug then "exec &> /var/log/autofs" else ""}
+          ${pkgs.autofs5}/sbin/automount -f -t ${builtins.toString cfg.timeout} ${if cfg.debug then "-d" else ""} "${pkgs.writeText "auto.master" cfg.autoMaster}"
+        end script
+      '';
+    }
+    ];
+  };
+}
-- 
GitLab


From 738fc4e48c06a9b1d4bb3b97dc05eff1667c04c6 Mon Sep 17 00:00:00 2001
From: Marc Weber <marco-oweber@gmx.de>
Date: Fri, 1 May 2009 17:57:07 +0000
Subject: [PATCH 1421/5331] adding support for openvpn daemon client and/or
 server

svn path=/nixos/branches/modular-nixos/; revision=15421
---
 system/options.nix       |   1 +
 upstart-jobs/openvpn.nix | 130 +++++++++++++++++++++++++++++++++++++++
 2 files changed, 131 insertions(+)
 create mode 100644 upstart-jobs/openvpn.nix

diff --git a/system/options.nix b/system/options.nix
index cb50cf7f6e0..d8c390934ce 100644
--- a/system/options.nix
+++ b/system/options.nix
@@ -487,6 +487,7 @@ in
     (import ../upstart-jobs/tty-backgrounds.nix)
 
     (import ../upstart-jobs/synergy.nix)
+    (import ../upstart-jobs/openvpn.nix)
 
     (import ../upstart-jobs/nfs-kernel.nix)
     (import ../upstart-jobs/autofs.nix)
diff --git a/upstart-jobs/openvpn.nix b/upstart-jobs/openvpn.nix
new file mode 100644
index 00000000000..1e1edff902c
--- /dev/null
+++ b/upstart-jobs/openvpn.nix
@@ -0,0 +1,130 @@
+
+{pkgs, config, ...}:
+
+###### interface
+let
+  inherit (pkgs.lib) mkOption mkIf;
+
+  options = {
+    services = {
+      openvpn = {
+        enable = mkOption {
+          default = false;
+          description = "
+            Whether to enable the Secure Shell daemon, which allows secure
+            remote logins.
+          ";
+        };
+        servers = mkOption {
+          example = [
+            {
+              id = "server-simplest";
+              config = ''
+                # Most simple configuration: http://openvpn.net/index.php/documentation/miscellaneous/static-key-mini-howto.html.
+                # server : 
+                dev tun
+                ifconfig 10.8.0.1 10.8.0.2
+                secret static.key
+              '';
+              up = "ip route add ..!";
+              down = "ip route add ..!";
+            }
+            {
+              id = "client-simplest";
+              config = ''
+                #client:
+                #remote myremote.mydomain
+                #dev tun
+                #ifconfig 10.8.0.2 10.8.0.1
+                #secret static.key
+              '';
+            }
+            {
+              id = "server-scalable";
+              config = ''
+                multiple clienst
+                see example file found in http://openvpn.net/index.php/documentation/howto.html
+              '';
+            }
+            {
+              id = "client-scalabe";
+              config = '' dito '';
+            }
+          ];
+          default = [];
+          description = ''
+            openvpn instances to be run. Each will be put into an extra job named openvpn-{id}
+
+            The up and down properties will be added config line up=/nix/store/xxx-up-script
+            automatically for you. If you define at least one of up/down
+            "script-security 2" will be prepended to your config.
+
+            Don't forget to check that the all package sizes can be sent. if scp hangs or such you should set
+            --fragment XXX --mssfix YYY.
+          '';
+        };
+      };
+    };
+  };
+
+###### implementation
+
+  cfg = config.services.openvpn;
+
+  inherit (pkgs) openvpn;
+  inherit (builtins) hasAttr;
+
+  PATH="${pkgs.iptables}/sbin:${pkgs.coreutils}/bin:${pkgs.iproute}/sbin:${pkgs.nettools}/sbin";
+
+  makeOpenVPNJob = cfg :
+    let
+      upScript = ''
+        #!/bin/sh
+        exec &> /var/log/openvpn-${cfg.id}-up
+        PATH=${PATH}
+        ${cfg.up}
+      '';
+      downScript = ''
+        #!/bin/sh
+        exec &> /var/log/openvpn-${cfg.id}-down
+        PATH=${PATH}
+        ${cfg.down}
+      '';
+      configFile = pkgs.writeText "openvpn-config-${cfg.id}" ''
+      ${if hasAttr "up" cfg || hasAttr "down" cfg then "script-security 2" else ""}
+      ${cfg.config}
+      ${if hasAttr "up" cfg then "up ${pkgs.writeScript "openvpn-${cfg.id}-up" upScript}" else "" }
+      ${if hasAttr "down" cfg then "down ${pkgs.writeScript "openvpn-${cfg.id}-down" downScript}" else "" }
+      '';
+    in {
+      name = "openvpn-${cfg.id}";
+
+      job = ''
+        description "OpenVPN-${cfg.id}"
+
+        start on network-interfaces/started
+        stop on network-interfaces/stop
+
+
+        PATH=${pkgs.coreutils}/bin
+
+        respawn
+        script
+          exec &> /var/log/openvpn-${cfg.id}
+          ${openvpn}/sbin/openvpn --config ${configFile}
+        end script
+      '';
+    };
+
+in
+
+
+mkIf cfg.enable {
+  require = [
+    options
+  ];
+
+  services = {
+    extraJobs = map makeOpenVPNJob cfg.servers;
+  };
+}
-- 
GitLab


From 9771cbbe2108e997baf32dadac5cb067fa24a08f Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Sat, 2 May 2009 16:25:23 +0000
Subject: [PATCH 1422/5331] Set devpts mode: failing to do so yields trouble
 with 2.6.30-rc

svn path=/nixos/trunk/; revision=15424
---
 boot/boot-stage-2-init.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/boot/boot-stage-2-init.sh b/boot/boot-stage-2-init.sh
index a5f94bf2ad2..121cf46e12a 100644
--- a/boot/boot-stage-2-init.sh
+++ b/boot/boot-stage-2-init.sh
@@ -73,7 +73,7 @@ mount -t tmpfs -o "mode=0755" none /dev
 mkdir -m 0777 /dev/shm
 mount -t tmpfs -o "rw,nosuid,nodev" tmpfs /dev/shm
 mkdir -m 0755 -p /dev/pts
-mount -t devpts none /dev/pts
+mount -t devpts -o mode=0600 none /dev/pts 
 [ -e /proc/bus/usb ] && mount -t usbfs none /proc/bus/usb # uml doesn't have usb by default
 mkdir -m 01777 -p /tmp 
 mkdir -m 0755 -p /var
-- 
GitLab


From d90d3420ef77c8e63ddc5a71a434eab717963191 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Sun, 3 May 2009 11:07:28 +0000
Subject: [PATCH 1423/5331] Replace theme sources with gentoo distfiles

svn path=/nixos/trunk/; revision=15427
---
 system/options.nix | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/system/options.nix b/system/options.nix
index ef73fcb7ec0..2f96a426638 100644
--- a/system/options.nix
+++ b/system/options.nix
@@ -667,7 +667,7 @@ in
       defaultTheme = mkOption {
         default = pkgs.fetchurl {
           #url = http://www.bootsplash.de/files/themes/Theme-BabyTux.tar.bz2;
-          url = http://www.mirrorservice.org/sites/www.ibiblio.org/gentoo/distfiles/Theme-BabyTux.tar.bz2;
+          url = mirror://gentoo/distfiles/Theme-BabyTux.tar.bz2;
           md5 = "a6d89d1c1cff3b6a08e2f526f2eab4e0";
         };
         description = "
@@ -687,11 +687,7 @@ in
           }
           */
           { tty = 10;
-            theme = pkgs.fetchurl {
-              #url = http://www.bootsplash.de/files/themes/Theme-GNU.tar.bz2;
-              url = http://www.mirrorservice.org/sites/www.ibiblio.org/gentoo/distfiles/Theme-GNU.tar.bz2;
-              md5 = "61969309d23c631e57b0a311102ef034";
-            };
+            theme = pkgs.themes "theme-gnu";
           }
         ];
         description = "
-- 
GitLab


From 26e952582f9827817c08477355b58c74f3596ea4 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Sun, 3 May 2009 11:08:17 +0000
Subject: [PATCH 1424/5331] Export some configuration data about on-boot layout

svn path=/nixos/trunk/; revision=15428
---
 system/system.nix | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/system/system.nix b/system/system.nix
index ed7967c5f63..2c60b82f066 100644
--- a/system/system.nix
+++ b/system/system.nix
@@ -379,6 +379,11 @@ rec {
       grubSplashImage bootMount configurationLimit;
   };
 
+  children = map (x: ((import ./system.nix) 
+    { inherit platform; 
+      configuration = x//{boot=((x.boot)//{grubDevice = "";});};}).system) 
+    config.nesting.children; 
+  configurationName = config.boot.configurationName;
 
   # Putting it all together.  This builds a store object containing
   # symlinks to the various parts of the built configuration (the
@@ -398,6 +403,8 @@ rec {
     inherit grubMenuBuilder;
     inherit etc;
     inherit systemPath;
+    inherit children;
+    inherit configurationName;
     kernel = kernel + "/vmlinuz";
     initrd = initialRamdisk + "/initrd";
     # Most of these are needed by grub-install.
@@ -415,11 +422,6 @@ rec {
     # when the parent configuration is boot default. For example,
     # you can provide an easy way to boot the same configuration 
     # as you use, but with another kernel
-    children = map (x: ((import ./system.nix) 
-      { inherit platform; 
-        configuration = x//{boot=((x.boot)//{grubDevice = "";});};}).system) 
-      config.nesting.children; 
-    configurationName = config.boot.configurationName;
   }) config.environment.checkConfigurationOptions
      optionDeclarations config;
 
-- 
GitLab


From e4a174822618625f09a05983cd42560f56e47a5e Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Sun, 3 May 2009 11:37:20 +0000
Subject: [PATCH 1425/5331] Port main functionality of rescue-cd-configurable
 into rescue-cd.nix as a set of small fixes. Rogue, manual are now ordinary
 jobs. It is possible to include build dependencies. It is possible to choose
 one of a few configurations in the boot menu. Of course, configuration
 overrides may be passed

svn path=/nixos/trunk/; revision=15430
---
 installer/cd-dvd/rescue-cd.nix | 82 ++++++++++++++--------------------
 1 file changed, 33 insertions(+), 49 deletions(-)

diff --git a/installer/cd-dvd/rescue-cd.nix b/installer/cd-dvd/rescue-cd.nix
index 7a5c97421bc..13b4bcf16b4 100644
--- a/installer/cd-dvd/rescue-cd.nix
+++ b/installer/cd-dvd/rescue-cd.nix
@@ -5,6 +5,13 @@
     else "nixos-${builtins.readFile ../../VERSION}"
 , compressImage ? false
 , nixpkgs ? ../../../nixpkgs
+# This option allows easy building of Rescue CD with 
+# modified package set / driver set / anything.
+# For easier maitenance, let overrider know the current
+# options
+, configurationOverrides ? (config: {})
+# Whether to put all the build-time dependencies on DVD
+, includeBuildDeps ? false
 }:
 
 rec {
@@ -13,7 +20,7 @@ rec {
   cdLabel = "NIXOS_INSTALLATION_CD";
 
   
-  configuration = {
+  baseConfiguration = {
   
     boot = {
       isLiveCD = true;
@@ -94,6 +101,15 @@ rec {
         enable = false;
       };
 
+      showManual = {
+        enable = true;
+	manualFile = manual;
+      };
+
+      rogue = {
+        enable = true;
+      };
+
       extraJobs = [
         # Unpack the NixOS/Nixpkgs sources to /etc/nixos.
         # !!! run this synchronously
@@ -116,50 +132,8 @@ rec {
           ";
         }
       
-        # Show the NixOS manual on tty7.
-        { name = "manual";
-          job = "
-            env HOME=/root
-            start on udev
-            stop on shutdown
-            respawn ${pkgs.w3m}/bin/w3m ${manual} < /dev/tty7 > /dev/tty7 2>&1
-          ";
-        }
-
-        # Allow the user to do something useful on tty8 while waiting
-        # for the installation to finish.
-        { name = "rogue";
-          job = "
-            env HOME=/root
-            chdir /root
-            start on udev
-            stop on shutdown
-            respawn ${pkgs.rogue}/bin/rogue < /dev/tty8 > /dev/tty8 2>&1
-          ";
-        }
       ];
 
-      # And a background to go with that.
-      ttyBackgrounds = {
-        specificThemes = [
-          { tty = 7;
-            # Theme is GPL according to http://kde-look.org/content/show.php/Green?content=58501.
-            theme = pkgs.fetchurl {
-              url = http://www.kde-look.org/CONTENT/content-files/58501-green.tar.gz;
-              sha256 = "0sdykpziij1f3w4braq8r8nqg4lnsd7i7gi1k5d7c31m2q3b9a7r";
-            };
-          }
-          /* url is broken
-          { tty = 8;
-            theme = pkgs.fetchurl {
-              url = http://www.bootsplash.de/files/themes/Theme-GNU.tar.bz2;
-              md5 = "61969309d23c631e57b0a311102ef034";
-            };
-          }
-          */
-        ];
-      };
-
       mingetty = {
         helpLine = ''
         
@@ -197,12 +171,12 @@ rec {
    
   };
 
+  configuration = baseConfiguration // (configurationOverrides baseConfiguration);
 
   system = import ../../system/system.nix {
     inherit configuration platform nixpkgs;
   };
 
-
   pkgs = system.pkgs;
 
 
@@ -233,7 +207,7 @@ rec {
 
 
   # The configuration file for Grub.
-  grubCfg = pkgs.writeText "menu.lst" ''
+  grubCfg = pkgs.writeText "menu.lst" (''
     default 0
     timeout 10
     splashimage /boot/background.xpm.gz
@@ -248,7 +222,14 @@ rec {
 
     title Memtest86+
       kernel /boot/memtest.bin
-  '';
+  '' 
+    + (pkgs.lib.concatStringsSep "\n\n" 
+        (map (x: ''
+	  title NixOS: ${x.configurationName}
+	    kernel ${x.kernel} systemConfig=${x} init=${x.bootStage2} ${toString system.config.boot.kernelParams}
+	    initrd ${x.initrd}
+	'') system.children)))
+    ;
 
 
   # Create an ISO image containing the Grub boot loader, the kernel,
@@ -298,7 +279,12 @@ rec {
       { object = pkgs.stdenv;
         symlink = "none";
       }
-    ];
+    ]
+      ++ pkgs.lib.optional includeBuildDeps {
+          object = system.system.drvPath;
+          symlink = "none";
+        }
+      ;
     
     bootable = true;
     bootImage = "boot/grub/stage2_eltorito";
@@ -307,6 +293,4 @@ rec {
 
     volumeID = cdLabel;
   };
-
-
 }
-- 
GitLab


From f7f64961ad8cfe79f000eec5d3332fccc16fbec9 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 6 May 2009 09:09:53 +0000
Subject: [PATCH 1426/5331] * Make "kde" the default since "gnome" is broken.

svn path=/nixos/trunk/; revision=15464
---
 system/options.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/system/options.nix b/system/options.nix
index 2f96a426638..40f4cb23132 100644
--- a/system/options.nix
+++ b/system/options.nix
@@ -1262,7 +1262,7 @@ in
       };
 
       sessionType = mkOption {
-        default = "gnome";
+        default = "kde";
         example = "xterm";
         description = "
           The kind of session to start after login.  Current possibilies
-- 
GitLab


From d2b02686460dd9454c6a23a2cedc654c3240dbb8 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 6 May 2009 12:47:08 +0000
Subject: [PATCH 1427/5331] * Fixed URL.

svn path=/nixos/trunk/; revision=15468
---
 system/options.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/system/options.nix b/system/options.nix
index 40f4cb23132..35be636fd69 100644
--- a/system/options.nix
+++ b/system/options.nix
@@ -681,7 +681,7 @@ in
           /*
           { tty = 6;
             theme = pkgs.fetchurl { # Yeah!
-              url = http://www.bootsplash.de/files/themes/Theme-Pativo.tar.bz2;
+              url = mirror://gentoo/distfiles/Theme-Pativo.tar.bz2;
               md5 = "9e13beaaadf88d43a5293e7ab757d569";
             };
           }
-- 
GitLab


From eb32ab1ff2bd21bed8d789e3e2e7eb7d1a8537a5 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 6 May 2009 13:17:14 +0000
Subject: [PATCH 1428/5331] * Support printing via HTTPS.

svn path=/nixos/trunk/; revision=15469
---
 upstart-jobs/cupsd.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/upstart-jobs/cupsd.nix b/upstart-jobs/cupsd.nix
index ced164a1308..cf0f9fad869 100644
--- a/upstart-jobs/cupsd.nix
+++ b/upstart-jobs/cupsd.nix
@@ -23,6 +23,9 @@ let
     ln -s ${cups}/lib/cups/backend/* $out/lib/cups/backend/
     ln -s ${pkgs.samba}/bin/smbspool $out/lib/cups/backend/smb
 
+    # Provide support for printing via HTTPS.
+    ln -s ipp $out/lib/cups/backend/https
+
     # Provide Ghostscript rasterisation, necessary for non-Postscript
     # printers.
     rm $out/lib/cups/filter
-- 
GitLab


From 5af2b1b580392c85799759cb11b897b90575d190 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Thu, 7 May 2009 04:24:45 +0000
Subject: [PATCH 1429/5331] Allow by-label mounting of root on removable device
 in the drive which does not report media change.

svn path=/nixos/trunk/; revision=15480
---
 boot/boot-stage-1.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/boot/boot-stage-1.nix b/boot/boot-stage-1.nix
index c37ca27d6b1..070644cadee 100644
--- a/boot/boot-stage-1.nix
+++ b/boot/boot-stage-1.nix
@@ -124,6 +124,7 @@ rec {
         --replace scsi_id ${extraUtils}/bin/scsi_id \
         --replace path_id ${extraUtils}/bin/path_id \
         --replace vol_id ${extraUtils}/bin/vol_id
+      sed -e '/^ENV[{]DEVTYPE[}]=="disk", .*GOTO/d' -i $out/60-persistent-storage.rules 
     ''; # */
   };
 
-- 
GitLab


From 05a7e1368a1f3da9f0c32bd5cf1a02e1898299e5 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 8 May 2009 11:33:22 +0000
Subject: [PATCH 1430/5331] * grub-menu-builder.sh: with copyKernels = true,
 don't delete all of   /boot/kernels and then copy all the kernels/initrds. 
 Instead, copy   only the kernels/initrds that don't exist yet in
 /boot/kernels, then   delete obsolete files in /boot/kernels.  Also, use
 slightly nicer   file names in /boot/kernels.

svn path=/nixos/trunk/; revision=15505
---
 installer/grub-menu-builder.sh    | 101 +++++++++++++++++++-----------
 system/options.nix                |  10 +--
 system/switch-to-configuration.sh |   6 +-
 3 files changed, 71 insertions(+), 46 deletions(-)

diff --git a/installer/grub-menu-builder.sh b/installer/grub-menu-builder.sh
index 72635c36433..464fc94ce22 100644
--- a/installer/grub-menu-builder.sh
+++ b/installer/grub-menu-builder.sh
@@ -15,6 +15,9 @@ bootMount="@bootMount@"
 if test -z "$bootMount"; then bootMount=/boot; fi
 
 
+echo "updating the Grub menu..."
+
+
 target=/boot/grub/menu.lst
 tmp=$target.tmp
 
@@ -27,14 +30,13 @@ GRUBEND
 
 if test -n "@grubSplashImage@"; then
     splashLocation=@grubSplashImage@
-    # !!! image in /nix/store doesn't seem to work
-    #if test -n "@copyKernels@"; then
-	cp -f $splashLocation /boot/background.xpm.gz
-	splashLocation="$bootMount/background.xpm.gz"
-    #fi
+    # Splash images in /nix/store don't seem to work, so copy them.
+    cp -f $splashLocation /boot/background.xpm.gz
+    splashLocation="$bootMount/background.xpm.gz"
     echo "splashimage $splashLocation" >> $tmp
 fi
 
+
 configurationCounter=0
 configurationLimit="@configurationLimit@"
 numAlienEntries=`cat <<EOF | egrep '^[[:space:]]*title' | wc -l
@@ -42,18 +44,48 @@ numAlienEntries=`cat <<EOF | egrep '^[[:space:]]*title' | wc -l
 EOF`
 
 if test $((configurationLimit+numAlienEntries)) -gt 190; then
-	configurationLimit=$((190-numAlienEntries));
+    configurationLimit=$((190-numAlienEntries));
 fi
 
+
+# Convert a path to a file in the Nix store such as
+# /nix/store/<hash>-<name>/file to <hash>-<name>-<file>.
+cleanName() {
+    local path="$1"
+    echo "$path" | sed 's|^/nix/store/||' | sed 's|/|-|g'
+}
+
+
+# Copy a file from the Nix store to /boot/kernels.
+declare -A filesCopied
+
+copyToKernelsDir() {
+    local src="$1"
+    local dst="/boot/kernels/$(cleanName $src)"
+    # Don't copy the file if $dst already exists.  This means that we
+    # have to create $dst atomically to prevent partially copied
+    # kernels or initrd if this script is ever interrupted.
+    if ! test -e $dst; then
+        local dstTmp=$dst.tmp.$$
+        cp $src $dstTmp
+        mv $dstTmp $dst
+    fi
+    filesCopied[$dst]=1
+    result=$dst
+}
+
+
+# Add an entry for a configuration to the Grub menu, and if
+# appropriate, copy its kernel and initrd to /boot/kernels.
 addEntry() {
     local name="$1"
     local path="$2"
     local shortSuffix="$3"
 
     configurationCounter=$((configurationCounter + 1))
-    if test $configurationCounter -gt @configurationLimit@ ; then
-	    return
-    fi;
+    if test $configurationCounter -gt @configurationLimit@; then
+	return
+    fi
 
     if ! test -e $path/kernel -a -e $path/initrd; then
         return
@@ -63,10 +95,10 @@ addEntry() {
     local initrd=$(readlink -f $path/initrd)
 
     if test "$path" = "$default"; then
-	    cp "$kernel" /boot/nixos-kernel
-	    cp "$initrd" /boot/nixos-initrd
-	    cp "$(readlink -f "$path/init")" /boot/nixos-init
-	    cat > /boot/nixos-grub-config <<EOF
+	cp "$kernel" /boot/nixos-kernel
+	cp "$initrd" /boot/nixos-initrd
+	cp "$(readlink -f "$path/init")" /boot/nixos-init
+	cat > /boot/nixos-grub-config <<EOF
 	title Emergency boot
 	kernel ${bootMount:-/boot}/nixos-kernel systemConfig=$(readlink -f "$path") init=/boot/nixos-init $(cat "$path/kernel-params")
 	initrd ${bootMount:-/boot}/nixos-initrd
@@ -74,30 +106,21 @@ EOF
     fi
 
     if test -n "@copyKernels@"; then
-        local kernel2=/boot/kernels/$(echo $kernel | sed 's^/^-^g')
-        if ! test -e $kernel2; then
-            cp $kernel $kernel2
-        fi
-        kernel=$kernel2
-
-        local initrd2=/boot/kernels/$(echo $initrd | sed 's^/^-^g')
-        if ! test -e $initrd2; then
-            cp $initrd $initrd2
-        fi
-        initrd=$initrd2
-
-        if test -n "$bootMount"; then
-          kernel=$(echo $kernel2 | sed -e "s^/boot^$bootMount^")
-          initrd=$(echo $initrd2 | sed -e "s^/boot^$bootMount^")
-        fi
+        copyToKernelsDir $kernel; kernel=$result
+        copyToKernelsDir $initrd; initrd=$result
+    fi
+    
+    if test -n "$bootMount"; then
+        kernel=$(echo $kernel | sed -e "s^/boot^$bootMount^")
+        initrd=$(echo $initrd | sed -e "s^/boot^$bootMount^")
     fi
     
     local confName=$(if test -e $path/configuration-name; then 
 	cat $path/configuration-name; 
-    fi);
-    if test -n "$confName" ; then
-	name="$confName $3";
-    fi;
+    fi)
+    if test -n "$confName"; then
+	name="$confName $3"
+    fi
 
     cat >> $tmp << GRUBEND
 
@@ -108,11 +131,11 @@ GRUBEND
 }
 
 
-rm -rf /boot/kernels
 if test -n "@copyKernels@"; then
     mkdir -p /boot/kernels
 fi
 
+
 # Additional entries specified verbatim by the configuration.
 extraGrubEntries=`cat <<EOF
 @extraGrubEntries@
@@ -135,11 +158,11 @@ for link in $((ls -d $default/fine-tune/* ) | sort -n); do
     date=$(stat --printf="%y\n" $link | sed 's/\..*//')
     addEntry "NixOS - variation" $link ""
 done
+
 for generation in $(
     (cd /nix/var/nix/profiles && ls -d system-*-link) \
     | sed 's/system-\([0-9]\+\)-link/\1/' \
     | sort -n -r); do
-    echo $generation
     link=/nix/var/nix/profiles/system-$generation-link
     date=$(stat --printf="%y\n" $link | sed 's/\..*//')
     kernelVersion=$(cd $(dirname $(readlink -f $link/kernel))/lib/modules && echo *)
@@ -150,3 +173,11 @@ done
 # Atomically update /boot/grub/menu.lst.  !!! should do an fsync()
 # here on $tmp, especially on ext4.
 mv $tmp $target
+
+
+# Remove obsolete files from /boot/kernels.
+for fn in $(ls /boot/kernels/*); do
+    if ! test "${filesCopied[$fn]}" = 1; then
+        rm -vf -- "$fn"
+    fi
+done
diff --git a/system/options.nix b/system/options.nix
index 35be636fd69..9b038fac903 100644
--- a/system/options.nix
+++ b/system/options.nix
@@ -593,14 +593,7 @@ in
     ";
   };
 
-  servicesProposal = {
-    # see upstart-jobs/default.nix 
-    # the option declarations can be found in the upstart-jobs/newProposal/*.nix files
-    # one way to include the declarations here is adding kind of glob "*.nix"
-    # file function to builtins to get all jobs
-    # then the checking in upstart-jobs/default.nix can be removed again (together with passing arg optionDeclarations)
-  };
-
+  
   services = {
 
 
@@ -652,6 +645,7 @@ in
           the `at' commands are setuid/setgid `atd'.
         '';
       };
+      
     };
 
 
diff --git a/system/switch-to-configuration.sh b/system/switch-to-configuration.sh
index eaeb3106afd..6cd5d6aff97 100644
--- a/system/switch-to-configuration.sh
+++ b/system/switch-to-configuration.sh
@@ -50,8 +50,8 @@ EOF
     oldEvents=$(readlink -f /etc/event.d || true)
     newEvents=$(readlink -f @out@/etc/event.d)
 
-    echo "old: $oldEvents"
-    echo "new: $newEvents"
+    #echo "old: $oldEvents"
+    #echo "new: $newEvents"
 
     stopJob() {
         local job=$1
@@ -73,7 +73,7 @@ EOF
 
     # Activate the new configuration (i.e., update /etc, make
     # accounts, and so on).
-    echo "Activating the configuration..."
+    echo "activating the configuration..."
     @out@/activate @out@
 
     # Make Upstart reload its events.  !!! Should wait until it has
-- 
GitLab


From 5cbcb9762d5368b325ddbbeca2a8d0e2b3d7c5b9 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Sat, 9 May 2009 07:31:56 +0000
Subject: [PATCH 1431/5331] More correct handling of services tarball

svn path=/nixos/trunk/; revision=15508
---
 installer/cd-dvd/rescue-cd.nix | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/installer/cd-dvd/rescue-cd.nix b/installer/cd-dvd/rescue-cd.nix
index 13b4bcf16b4..ef47d960613 100644
--- a/installer/cd-dvd/rescue-cd.nix
+++ b/installer/cd-dvd/rescue-cd.nix
@@ -5,6 +5,7 @@
     else "nixos-${builtins.readFile ../../VERSION}"
 , compressImage ? false
 , nixpkgs ? ../../../nixpkgs
+, services ? ../../../services
 # This option allows easy building of Rescue CD with 
 # modified package set / driver set / anything.
 # For easier maitenance, let overrider know the current
@@ -12,6 +13,7 @@
 , configurationOverrides ? (config: {})
 # Whether to put all the build-time dependencies on DVD
 , includeBuildDeps ? false
+, includeTarballs ? true
 }:
 
 rec {
@@ -127,6 +129,8 @@ rec {
               tar xjf /install/nixos.tar.bz2 -C /etc/nixos/nixos
               mkdir -p /etc/nixos/nixpkgs
               tar xjf /install/nixpkgs.tar.bz2 -C /etc/nixos/nixpkgs
+              mkdir -p /etc/nixos/services
+              tar xjf /install/services.tar.bz2 -C /etc/nixos/services
               chown -R root.root /etc/nixos
             end script
           ";
@@ -202,6 +206,10 @@ rec {
   nixosTarball = makeTarball "nixos.tar.bz2" ../..;
 
 
+  # Put Services in a tarball.
+  servicesTarball = makeTarball "services.tar.bz2" services;
+
+
   # Put Nixpkgs in a tarball.
   nixpkgsTarball = makeTarball "nixpkgs.tar.bz2" nixpkgs;
 
@@ -259,12 +267,18 @@ rec {
       { source = system.config.boot.grubSplashImage;
         target = "boot/background.xpm.gz";
       }
+    ]
+    ++
+    pkgs.lib.optionals includeTarballs [
       { source = nixosTarball + "/" + nixosTarball.tarName;
         target = "/install/" + nixosTarball.tarName;
       }
       { source = nixpkgsTarball + "/nixpkgs.tar.bz2";
         target = "/install/nixpkgs.tar.bz2";
       }
+      { source = servicesTarball + "/services.tar.bz2";
+        target = "/install/services.tar.bz2";
+      }
     ];
 
     # Closures to be copied to the Nix store on the CD.
-- 
GitLab


From 5b368b22bf0f65d14080738cf6f8f44225be1705 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Sat, 9 May 2009 07:34:20 +0000
Subject: [PATCH 1432/5331] An option for times when I only want to init Nix in
 chroot and build system semi-manually.

svn path=/nixos/trunk/; revision=15509
---
 installer/nixos-install.sh | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/installer/nixos-install.sh b/installer/nixos-install.sh
index 1784b4357f1..b90ffe4145c 100644
--- a/installer/nixos-install.sh
+++ b/installer/nixos-install.sh
@@ -135,6 +135,10 @@ if test -n "@nixpkgsURL@" -a ${NIXOS_PULL:-1} != 0; then
     chroot $mountPoint @nix@/bin/nix-pull @nixpkgsURL@/MANIFEST || true
 fi
 
+if test -n "$NIXOS_PREPARE_CHROOT_ONLY"; then
+    echo "User requested only to prepare chroot. Exiting."
+    exit 0;
+fi
 
 # Build the specified Nix expression in the target store and install
 # it into the system configuration profile.
-- 
GitLab


From 7aa1c2439c2824b0d6cc9f8e010840e220e193cd Mon Sep 17 00:00:00 2001
From: Sander van der Burg <s.vanderburg@tudelft.nl>
Date: Sat, 9 May 2009 21:00:02 +0000
Subject: [PATCH 1433/5331] Some kdm fixes

svn path=/nixos/trunk/; revision=15519
---
 upstart-jobs/kdm.nix | 28 +++++++++++++++-------------
 1 file changed, 15 insertions(+), 13 deletions(-)

diff --git a/upstart-jobs/kdm.nix b/upstart-jobs/kdm.nix
index a4bae828c2b..2d93ee2cd55 100644
--- a/upstart-jobs/kdm.nix
+++ b/upstart-jobs/kdm.nix
@@ -3,7 +3,7 @@
 let
   # Abbreviations.
   cfg = config.services.xserver;
-  xorg = pkgs.xlibs;
+  xorg = cfg.package;
   
   inherit (pkgs.lib) optional isInList getAttr;
   stdenv = pkgs.stdenv;
@@ -26,7 +26,7 @@ let
   resolutions = map (res: ''"${toString res.x}x${toString res.y}"'') (cfg.resolutions);
   sessionType = cfg.sessionType;
 
-  videoDriverModules = getAttr [ videoDriver ] (throw "unkown video driver : \"${videoDriver}\"") knownVideoDrivers;
+  videoDriverModules = getAttr [ videoDriver ] (throw "unknown video driver: `${videoDriver}'") knownVideoDrivers;
 
   modules = 
 
@@ -90,10 +90,10 @@ let
       Option "XkbOptions" "${cfg.xkbOptions}"
     '';
 
-    xkbModel = cfg.xkbModel;
-    layout = cfg.layout;
-
-    corePointer = if cfg.synaptics.enable then "Touchpad[0]" else "Mouse[0]";
+    setCorePointer = 
+      if cfg.synaptics.enable then ''
+        InputDevice "Touchpad[0]" "CorePointer"
+      '' else "";
 
     internalAGPGART =
       if cfg.useInternalAGPGART == "yes" then
@@ -181,30 +181,32 @@ let
     ''; # */
   };
 
+
   xsession = pkgs.writeText "Xsession" ''
     source /etc/profile
     
     session=$1
     
-    export PATH=$PATH:${pkgs.xterm}/bin:${pkgs.qt4}/bin:${pkgs.dbus.libs}/bin:${pkgs.kde42.kdelibs}/bin:${pkgs.xlibs.xset}/bin:${pkgs.xlibs.xsetroot}/bin:${pkgs.xlibs.xmessage}/bin:${pkgs.xlibs.xprop}/bin
+    export PATH=$PATH:${pkgs.xterm}/bin:${pkgs.qt4}/bin:${pkgs.dbus.libs}/bin:${pkgs.kde42.kdelibs}/bin:${pkgs.kde42.kdebase_workspace}/bin:${pkgs.xlibs.xset}/bin:${pkgs.xlibs.xsetroot}/bin:${pkgs.xlibs.xmessage}/bin:${pkgs.xlibs.xprop}/bin
     export XDG_CONFIG_DIRS=
     export XDG_DATA_DIRS=${pkgs.shared_mime_info}/share
+    export KDEDIRS=${pkgs.kde42.kdelibs}:${pkgs.kde42.kdebase_workspace}
     
     case $session in
       "")
-        exec xmessage -center -buttons OK:0 -default OK "Sorry, $DESKTOP_SESSION is no valid session."
+        xmessage -center -buttons OK:0 -default OK "Sorry, $DESKTOP_SESSION is no valid session."
         ;;
       failsafe)
-        exec xterm -geometry 80x24-0-0
+        xterm -geometry 80x24-0-0
         ;;
       custom)
-        exec $HOME/.xsession
+        $HOME/.xsession
       ;;
       default)
-        exec ${pkgs.kde42.kdebase_workspace}/bin/startkde
+        startkde
         ;;
       *)
-      eval exec "$session"
+      eval "$session"
       ;;
     esac
 
@@ -231,7 +233,7 @@ let
 in
 {
   name = "kdm";
-    
+      
   job = ''
     description "KDE Display Manager"
 
-- 
GitLab


From 018cb283f238a605d1fac7d03caefe4e92eac8fd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Mon, 11 May 2009 11:54:18 +0000
Subject: [PATCH 1434/5331] Fix `grub-menu-builder.sh'.

Previously, since `nullglob' is active, `$(ls /boot/kernels/*)'
would translate into `$(ls)' when `/boot/kernels' is empty, which
would then lead to the removal of all the files under $PWD.

Additionally, if `/boot/kernels' was not empty, `$fn' would contain
only the basename of the files, whereas `$filesCopied' is indexed
by full paths.


svn path=/nixos/trunk/; revision=15548
---
 installer/grub-menu-builder.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/installer/grub-menu-builder.sh b/installer/grub-menu-builder.sh
index 464fc94ce22..8a99ca5f29d 100644
--- a/installer/grub-menu-builder.sh
+++ b/installer/grub-menu-builder.sh
@@ -15,7 +15,7 @@ bootMount="@bootMount@"
 if test -z "$bootMount"; then bootMount=/boot; fi
 
 
-echo "updating the Grub menu..."
+echo "updating the GRUB menu..."
 
 
 target=/boot/grub/menu.lst
@@ -176,7 +176,7 @@ mv $tmp $target
 
 
 # Remove obsolete files from /boot/kernels.
-for fn in $(ls /boot/kernels/*); do
+for fn in /boot/kernels/*; do
     if ! test "${filesCopied[$fn]}" = 1; then
         rm -vf -- "$fn"
     fi
-- 
GitLab


From 52889b2323e4dea658006e161d6d95829cca4bfa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Tue, 12 May 2009 17:46:51 +0000
Subject: [PATCH 1435/5331] Run `fsck' when on AC power.

In practice, it should only run once in a while, and should help
find inconsistencies or corruptions sooner.

See https://mail.cs.uu.nl/pipermail/nix-dev/2009-February/001827.html
for a discussion.


svn path=/nixos/trunk/; revision=15577
---
 boot/boot-stage-1-init.sh | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/boot/boot-stage-1-init.sh b/boot/boot-stage-1-init.sh
index b3b2292beaa..524735b1ba2 100644
--- a/boot/boot-stage-1-init.sh
+++ b/boot/boot-stage-1-init.sh
@@ -166,15 +166,6 @@ checkFS() {
     # Only check block devices.
     if ! test -b "$device"; then return 0; fi
 
-    # For unclean ext3 file systems, fsck.ext3 should just replay the
-    # journal and exit, but in practice this takes *much* longer than
-    # letting the kernel recover the FS.  So, don't run fsck on
-    # journalling file systems.
-    eval $(fstype "$device")
-    if test "$FSTYPE" = ext3 -o "$FSTYPE" = ext4 -o "$FSTYPE" = reiserfs -o "$FSTYPE" = xfs -o "$FSTYPE" = jfs; then
-        return 0;
-    fi
-    
     # Don't run `fsck' if the machine is on battery power.  !!! Is
     # this a good idea?
     if ! onACPower; then
-- 
GitLab


From 60060261a01dee0ec4539625339e25c9141bbcbf Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Wed, 13 May 2009 06:10:21 +0000
Subject: [PATCH 1436/5331] Catch duplicate entries

svn path=/nixos/trunk/; revision=15580
---
 helpers/make-etc.sh     | 10 +++++++++-
 upstart-jobs/gather.nix | 10 +++++++---
 2 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/helpers/make-etc.sh b/helpers/make-etc.sh
index a7643b63c5b..4b7bb68be4b 100644
--- a/helpers/make-etc.sh
+++ b/helpers/make-etc.sh
@@ -7,7 +7,15 @@ targets_=($targets)
 modes_=($modes)
 for ((i = 0; i < ${#targets_[@]}; i++)); do
     ensureDir $out/etc/$(dirname ${targets_[$i]})
-    ln -s ${sources_[$i]} $out/etc/${targets_[$i]}
+    if ! test -e $out/etc/${targets_[$i]}; then
+      ln -s ${sources_[$i]} $out/etc/${targets_[$i]};
+    else
+      echo Duplicate entry "${targets_[$i]} -> ${sources_[$i]}"
+      if test "$(readlink "$targets_[$i]")" -ne "$sources_[$i]"; then
+        echo Mismatched duplicate entry "$(readlink "$targets_[$i]") "'<>'" $sources_[$i]"
+	exit 1
+      fi
+    fi;
     if test "${modes_[$i]}" != symlink; then
         echo "${modes_[$i]}" > $out/etc/${targets_[$i]}.mode
     fi
diff --git a/upstart-jobs/gather.nix b/upstart-jobs/gather.nix
index 47193167360..726503f1917 100644
--- a/upstart-jobs/gather.nix
+++ b/upstart-jobs/gather.nix
@@ -6,8 +6,12 @@ runCommand "upstart-jobs" {inherit jobs;}
   "
     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
+      if ln -s $i . ; then
+        if test -d $i; then
+          ln -s $i/etc/event.d/* $out/etc/event.d/ 
+        fi
+      else
+        echo Duplicate entry: $i;
+      fi;
     done
   "
-- 
GitLab


From ecff4f580cb7ae596ffd766128f7e8d1e786b0bd Mon Sep 17 00:00:00 2001
From: Marc Weber <marco-oweber@gmx.de>
Date: Fri, 15 May 2009 06:43:02 +0000
Subject: [PATCH 1437/5331] * Synced with trunk @ 15368

svn path=/nixos/branches/modular-nixos/; revision=15608
---
 installer/grub-menu-builder.sh | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/installer/grub-menu-builder.sh b/installer/grub-menu-builder.sh
index 5d26cdb4327..72635c36433 100644
--- a/installer/grub-menu-builder.sh
+++ b/installer/grub-menu-builder.sh
@@ -147,4 +147,6 @@ for generation in $(
 done
 
 
-cp $tmp $target
+# Atomically update /boot/grub/menu.lst.  !!! should do an fsync()
+# here on $tmp, especially on ext4.
+mv $tmp $target
-- 
GitLab


From 3f79e158ba5d65a68bc3be964ae91e76f7b07d9e Mon Sep 17 00:00:00 2001
From: Marc Weber <marco-oweber@gmx.de>
Date: Fri, 15 May 2009 07:39:36 +0000
Subject: [PATCH 1438/5331] add missing assertion catching enabled xserver but
 disabled hal service

svn path=/nixos/trunk/; revision=15609
---
 upstart-jobs/xserver.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/upstart-jobs/xserver.nix b/upstart-jobs/xserver.nix
index 504a06b8650..775b7524743 100644
--- a/upstart-jobs/xserver.nix
+++ b/upstart-jobs/xserver.nix
@@ -415,7 +415,8 @@ rec {
       };
 
     
-  job = ''
+  # The X server needs HAL running
+  job = assert config.services.hal.enable; ''
     start on ${if cfg.autorun then "hal" else "never"}
 
     start script
-- 
GitLab


From 1e16e6dee4cdcb4a9d2973a7289a3825b406129c Mon Sep 17 00:00:00 2001
From: Marc Weber <marco-oweber@gmx.de>
Date: Fri, 15 May 2009 07:51:51 +0000
Subject: [PATCH 1439/5331] * Synced with trunk @ 15369 also adding missing
 assertion fixed in 15609

svn path=/nixos/branches/modular-nixos/; revision=15610
---
 upstart-jobs/xserver/default.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/upstart-jobs/xserver/default.nix b/upstart-jobs/xserver/default.nix
index 71eb34f34b6..80ea8c2a564 100644
--- a/upstart-jobs/xserver/default.nix
+++ b/upstart-jobs/xserver/default.nix
@@ -465,6 +465,9 @@ let
 in
 
 mkIf cfg.enable {
+
+  assertions = [ { assertion = config.services.hal.enable == true; message = "The X server needs HAL running. Set services.hal.enable to true"; } ];
+
   require = [
     options
 
@@ -530,7 +533,7 @@ mkIf cfg.enable {
     extraJobs = [{
       name = "xserver";
       job = ''
-        start on ${if cfg.autorun then "network-interfaces" else "never"}
+        start on ${if cfg.autorun then "hal" else "never"}
 
         start script
         
-- 
GitLab


From 48e4b8f573e3f5655012d29412e6e3f128185534 Mon Sep 17 00:00:00 2001
From: Marc Weber <marco-oweber@gmx.de>
Date: Fri, 15 May 2009 07:55:47 +0000
Subject: [PATCH 1440/5331] * Synced with trunk @ 15370

svn path=/nixos/branches/modular-nixos/; revision=15611
---
 etc/bashrc.sh | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/etc/bashrc.sh b/etc/bashrc.sh
index a2bb83f9da9..55820a31a63 100644
--- a/etc/bashrc.sh
+++ b/etc/bashrc.sh
@@ -47,7 +47,9 @@ for i in $NIX_PROFILES; do # !!! reverse
         export ACLOCAL_PATH="$i/share/aclocal:$ACLOCAL_PATH"
     fi
 
-    export PERL5LIB="$i/lib/site_perl:$PERL5LIB"
+    # "lib/site_perl" is for backwards compatibility with packages
+    # from Nixpkgs <= 0.12.
+    export PERL5LIB="$i/lib/perl5/site_perl:$i/lib/site_perl:$PERL5LIB"
 
     # GStreamer.
     export GST_PLUGIN_PATH="$i/lib/gstreamer-0.10:$GST_PLUGIN_PATH"
-- 
GitLab


From d44206d2c470515e1c9d5fc55731f82c4feb9e74 Mon Sep 17 00:00:00 2001
From: Marc Weber <marco-oweber@gmx.de>
Date: Fri, 15 May 2009 08:00:20 +0000
Subject: [PATCH 1441/5331] * Synced with trunk @ 15391

svn path=/nixos/branches/modular-nixos/; revision=15612
---
 upstart-jobs/postgresql.nix | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/upstart-jobs/postgresql.nix b/upstart-jobs/postgresql.nix
index 77cf1a582e9..9bbd8d86969 100644
--- a/upstart-jobs/postgresql.nix
+++ b/upstart-jobs/postgresql.nix
@@ -61,6 +61,12 @@ let
             How to authorize users. 
             Note: ident needs absolute trust to all allowed client hosts.";
         };
+        enableTCPIP = mkOption {
+          default = false;
+          description = "
+            Whether to run PostgreSQL with -i flag to enable TCP/IP connections.
+          ";
+        };
       };
     };
   };
@@ -79,6 +85,8 @@ let
 
   run = "${pkgs.su}/bin/su -s ${pkgs.bash}/bin/sh postgres";
 
+  flags = if cfg.enableTCPIP then ["-i"] else [];
+
 in
 
 mkIf config.services.postgresql.enable {
@@ -120,7 +128,7 @@ mkIf config.services.postgresql.enable {
             cp -f ${pkgs.writeText "pg_hba.conf" cfg.authentication} ${cfg.dataDir}/pg_hba.conf
         end script
 
-        respawn ${run} -c '${postgresql}/bin/postgres -D ${cfg.dataDir}'
+        respawn ${run} -c '${postgresql}/bin/postgres -D ${cfg.dataDir} ${toString flags}'
       '';
       }];
   };
-- 
GitLab


From d29eaa100e5c63f490b44aaed88ff9bba0265fdd Mon Sep 17 00:00:00 2001
From: Marc Weber <marco-oweber@gmx.de>
Date: Fri, 15 May 2009 15:12:46 +0000
Subject: [PATCH 1442/5331] * Synced with trunk @ 15396, 15397 (->
 configurations repo)

svn path=/nixos/branches/modular-nixos/; revision=15615
-- 
GitLab


From d26f944b98c9122013379327741cdcec2441fd3d Mon Sep 17 00:00:00 2001
From: Marc Weber <marco-oweber@gmx.de>
Date: Fri, 15 May 2009 15:15:59 +0000
Subject: [PATCH 1443/5331] * Synced with trunk @ 15406

svn path=/nixos/branches/modular-nixos/; revision=15616
---
 upstart-jobs/apache-httpd/subversion.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/upstart-jobs/apache-httpd/subversion.nix b/upstart-jobs/apache-httpd/subversion.nix
index a32e0bf5dbd..3c3e7173549 100644
--- a/upstart-jobs/apache-httpd/subversion.nix
+++ b/upstart-jobs/apache-httpd/subversion.nix
@@ -19,7 +19,7 @@ let
 
 
   # Build a Subversion instance with Apache modules and Swig/Python bindings.
-  subversion = pkgs.subversion15.override (origArgs: {
+  subversion = pkgs.subversion.override (origArgs: {
     bdbSupport = true;
     httpServer = true;
     sslSupport = true;
@@ -53,7 +53,7 @@ let
     inherit (serverInfo.serverConfig) user group;    
     
     # Urgh, most of these are dependencies of Email::Send, should figure them out automatically.
-    perlFlags = map (x: "-I${x}/lib/site_perl") [
+    perlFlags = map (x: "-I${x}/lib/perl5/site_perl") [
       pkgs.perlPackages.BerkeleyDB pkgs.perlPackages.EmailSend
       pkgs.perlPackages.EmailSimple pkgs.perlPackages.ModulePluggable
       pkgs.perlPackages.ReturnValue pkgs.perlPackages.EmailAddress
-- 
GitLab


From 7ef8db8aad80c21e821526d556c16c317606d214 Mon Sep 17 00:00:00 2001
From: Marc Weber <marco-oweber@gmx.de>
Date: Fri, 15 May 2009 15:16:58 +0000
Subject: [PATCH 1444/5331] * Synced with trunk @ 15408

svn path=/nixos/branches/modular-nixos/; revision=15617
---
 upstart-jobs/apache-httpd/twiki.nix | 50 +++++++++++++++++++++++------
 1 file changed, 41 insertions(+), 9 deletions(-)

diff --git a/upstart-jobs/apache-httpd/twiki.nix b/upstart-jobs/apache-httpd/twiki.nix
index 54614aca24c..7e524144e64 100644
--- a/upstart-jobs/apache-httpd/twiki.nix
+++ b/upstart-jobs/apache-httpd/twiki.nix
@@ -3,10 +3,9 @@
 let
 
   inherit (pkgs.lib) mkOption;
-  inherit (config) urlPrefix distDir;
 
-  dataDir = "/data/pt-wiki/data";
-  pubDir = "/data/pt-wiki/pub";
+  dataDir = config.dataDir; # "/data/pt-wiki/data";
+  pubDir = config.pubDir; # "/data/pt-wiki/pub";
 
   scriptUrlPath = "/bin";
   pubUrlPath    = "/pub";
@@ -17,19 +16,18 @@ let
   dispScriptUrlPath = "";
   dispViewPath      = "";
 
-  twikiName = "Program Transformation Wiki";
   startWeb = config.startWeb;
-  registrationDomain = "ewi.tudelft.nl";
   defaultUrlHost = "";
 
   # Build the TWiki CGI and configuration files.
   twikiRoot = (import /etc/nixos/services/twiki/twiki-instance.nix).twiki {
-    name = "pt-wiki";
+    name = "wiki-instance";
     pubdir = pubDir;
     datadir = dataDir;
-    inherit twikiName scriptUrlPath pubUrlPath absHostPath
-      dispPubUrlPath dispScriptUrlPath dispViewPath
-      registrationDomain defaultUrlHost;
+    inherit scriptUrlPath pubUrlPath absHostPath
+      dispPubUrlPath dispScriptUrlPath dispViewPath defaultUrlHost;
+    twikiName = config.twikiName;
+    registrationDomain = config.registrationDomain;
   };
 
   plugins = import /etc/nixos/services/twiki/server-pkgs/twiki-plugins.nix;
@@ -111,4 +109,38 @@ in {
     Disallow: /pt/bin/
   '';
 
+  options = {
+
+    dataDir = mkOption {
+      example = "/data/wiki/data";
+      description = "
+        Path to the directory that holds the Wiki data.
+      ";
+    };
+
+    pubDir = mkOption {
+      example = "/data/wiki/pub";
+      description = "
+        Path to the directory that holds uploaded files.
+      ";
+    };
+
+    twikiName = mkOption {
+      default = "Wiki";
+      example = "Foobar Wiki";
+      description = "
+        Name of this Wiki.
+      ";
+    };
+
+    registrationDomain = mkOption {
+      example = "example.org";
+      description = "
+        Domain from which registrations are permitted.  Use `all' to
+        permit registrations from anywhere.
+      ";
+    };
+
+  };  
+
 }
\ No newline at end of file
-- 
GitLab


From aacdff7ad94548409e1c2d7c868cb7e65d547d99 Mon Sep 17 00:00:00 2001
From: Marc Weber <marco-oweber@gmx.de>
Date: Fri, 15 May 2009 15:19:59 +0000
Subject: [PATCH 1445/5331] * Synced with trunk @ 15413

svn path=/nixos/branches/modular-nixos/; revision=15618
---
 installer/cd-dvd/rescue-cd.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/installer/cd-dvd/rescue-cd.nix b/installer/cd-dvd/rescue-cd.nix
index b7e68c2d46d..7a5c97421bc 100644
--- a/installer/cd-dvd/rescue-cd.nix
+++ b/installer/cd-dvd/rescue-cd.nix
@@ -54,6 +54,7 @@ rec {
           # something goes wrong in stage 1.
           "ehci_hcd"
           "ohci_hcd"
+          "uhci_hcd"
           "usbhid"
           "usb_storage"
 
-- 
GitLab


From 314875506346d0485b6e5cec3a3b3315b31ba52e Mon Sep 17 00:00:00 2001
From: Marc Weber <marco-oweber@gmx.de>
Date: Fri, 15 May 2009 15:21:33 +0000
Subject: [PATCH 1446/5331] * Synced with trunk @ 15424

svn path=/nixos/branches/modular-nixos/; revision=15619
---
 boot/boot-stage-2-init.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/boot/boot-stage-2-init.sh b/boot/boot-stage-2-init.sh
index a5f94bf2ad2..121cf46e12a 100644
--- a/boot/boot-stage-2-init.sh
+++ b/boot/boot-stage-2-init.sh
@@ -73,7 +73,7 @@ mount -t tmpfs -o "mode=0755" none /dev
 mkdir -m 0777 /dev/shm
 mount -t tmpfs -o "rw,nosuid,nodev" tmpfs /dev/shm
 mkdir -m 0755 -p /dev/pts
-mount -t devpts none /dev/pts
+mount -t devpts -o mode=0600 none /dev/pts 
 [ -e /proc/bus/usb ] && mount -t usbfs none /proc/bus/usb # uml doesn't have usb by default
 mkdir -m 01777 -p /tmp 
 mkdir -m 0755 -p /var
-- 
GitLab


From fa32ac7fb6328e07c86d5b0362db8b3c15f672e2 Mon Sep 17 00:00:00 2001
From: Marc Weber <marco-oweber@gmx.de>
Date: Fri, 15 May 2009 16:07:27 +0000
Subject: [PATCH 1447/5331] follow -r15428 and move the comment as well

svn path=/nixos/trunk/; revision=15620
---
 system/system.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/system/system.nix b/system/system.nix
index 2c60b82f066..35772347462 100644
--- a/system/system.nix
+++ b/system/system.nix
@@ -379,6 +379,11 @@ rec {
       grubSplashImage bootMount configurationLimit;
   };
 
+  # This attribute is responsible for creating boot entries for 
+  # child configuration. They are only (directly) accessible
+  # when the parent configuration is boot default. For example,
+  # you can provide an easy way to boot the same configuration 
+  # as you use, but with another kernel
   children = map (x: ((import ./system.nix) 
     { inherit platform; 
       configuration = x//{boot=((x.boot)//{grubDevice = "";});};}).system) 
@@ -417,11 +422,6 @@ rec {
       pkgs.upstart # for initctl
     ];
     upstartInterfaceVersion = pkgs.upstart.interfaceVersion;
-    # This attribute is responsible for creating boot entries for 
-    # child configuration. They are only (directly) accessible
-    # when the parent configuration is boot default. For example,
-    # you can provide an easy way to boot the same configuration 
-    # as you use, but with another kernel
   }) config.environment.checkConfigurationOptions
      optionDeclarations config;
 
-- 
GitLab


From 9dc4edbd4d9631ede74822ebe24850ecb85e7a27 Mon Sep 17 00:00:00 2001
From: Marc Weber <marco-oweber@gmx.de>
Date: Mon, 18 May 2009 10:25:36 +0000
Subject: [PATCH 1448/5331] Synced with trunk @ 15427

svn path=/nixos/branches/modular-nixos/; revision=15630
---
 upstart-jobs/tty-backgrounds.nix | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/upstart-jobs/tty-backgrounds.nix b/upstart-jobs/tty-backgrounds.nix
index e4af68b4828..5cf455cc9f0 100644
--- a/upstart-jobs/tty-backgrounds.nix
+++ b/upstart-jobs/tty-backgrounds.nix
@@ -18,7 +18,7 @@ let
         defaultTheme = mkOption {
           default = pkgs.fetchurl {
             #url = http://www.bootsplash.de/files/themes/Theme-BabyTux.tar.bz2;
-            url = http://www.mirrorservice.org/sites/www.ibiblio.org/gentoo/distfiles/Theme-BabyTux.tar.bz2;
+            url = mirror://gentoo/distfiles/Theme-BabyTux.tar.bz2;
             md5 = "a6d89d1c1cff3b6a08e2f526f2eab4e0";
           };
           description = "
@@ -38,11 +38,7 @@ let
             }
             */
             { tty = 10;
-              theme = pkgs.fetchurl {
-                #url = http://www.bootsplash.de/files/themes/Theme-GNU.tar.bz2;
-                url = http://www.mirrorservice.org/sites/www.ibiblio.org/gentoo/distfiles/Theme-GNU.tar.bz2;
-                md5 = "61969309d23c631e57b0a311102ef034";
-              };
+              theme = pkgs.themes "theme-gnu";
             }
           ];
           description = "
-- 
GitLab


From 4dc9b6d3783f51f83300413e73764901b35b512b Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 18 May 2009 10:49:28 +0000
Subject: [PATCH 1449/5331] * Function renamed.

svn path=/nixos/branches/modular-nixos/; revision=15631
---
 system/activate-configuration.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/system/activate-configuration.nix b/system/activate-configuration.nix
index 72a17d6dfd7..7a61999ccf1 100644
--- a/system/activate-configuration.nix
+++ b/system/activate-configuration.nix
@@ -2,12 +2,12 @@
 {pkgs, config, ...}:
 
 let
-  inherit (pkgs.stringsWithDeps) textClosureOverridable noDepEntry;
+  inherit (pkgs.stringsWithDeps) textClosureMap noDepEntry;
   inherit (pkgs.lib) mkOption mergeTypedOption mergeAttrs mapRecordFlatten
-    mapAttrs addErrorContext fold;
+    mapAttrs addErrorContext fold id;
 
   textClosure = steps:
-    textClosureOverridable steps (
+    textClosureMap id steps (
        [(noDepEntry "#!/bin/sh")]
     ++ (mapRecordFlatten (a: v: v) steps)
     );
-- 
GitLab


From 168268ba28918e6e869262c528b69c8c98b64ee6 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 18 May 2009 11:27:20 +0000
Subject: [PATCH 1450/5331] svn path=/nixos/trunk/; revision=15633

---
 system/system.nix     | 2 +-
 upstart-jobs/gw6c.nix | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/system/system.nix b/system/system.nix
index 35772347462..b42ef8b5353 100644
--- a/system/system.nix
+++ b/system/system.nix
@@ -217,7 +217,7 @@ rec {
     pkgs.pwdutils
     pkgs.reiserfsprogs
     pkgs.rsync
-    pkgs.seccureUser
+    pkgs.seccure
     pkgs.strace
     pkgs.su
     pkgs.sysklogd
diff --git a/upstart-jobs/gw6c.nix b/upstart-jobs/gw6c.nix
index f3332f9e8f3..8f92c5cd090 100644
--- a/upstart-jobs/gw6c.nix
+++ b/upstart-jobs/gw6c.nix
@@ -5,7 +5,7 @@ let
         gw6cService = import ../services/gw6c {
                 inherit (pkgs) stdenv gw6c coreutils 
                 procps upstart iputils gnused 
-                gnugrep seccureUser writeScript;
+                gnugrep seccure writeScript;
                 username = cfg.username;
                 password = cfg.password;
                 server = cfg.server;
-- 
GitLab


From 65908cccd16f8b5f42b7d958f5819711293f2c2c Mon Sep 17 00:00:00 2001
From: Marc Weber <marco-oweber@gmx.de>
Date: Mon, 18 May 2009 11:30:33 +0000
Subject: [PATCH 1451/5331] Synced with trunk @ 15428, 15620

svn path=/nixos/branches/modular-nixos/; revision=15634
---
 system/system.nix | 22 ++++++++++++----------
 1 file changed, 12 insertions(+), 10 deletions(-)

diff --git a/system/system.nix b/system/system.nix
index d4507258a34..1b910d39e94 100644
--- a/system/system.nix
+++ b/system/system.nix
@@ -197,6 +197,16 @@ rec {
   # system configurations.
   grubMenuBuilder = config.system.build.grubMenuBuilder;
 
+  # This attribute is responsible for creating boot entries for 
+  # child configuration. They are only (directly) accessible
+  # when the parent configuration is boot default. For example,
+  # you can provide an easy way to boot the same configuration 
+  # as you use, but with another kernel
+  children = map (x: ((import ./system.nix) 
+    { inherit platform; 
+      configuration = x//{boot=((x.boot)//{grubDevice = "";});};}).system) 
+    config.nesting.children; 
+  configurationName = config.boot.configurationName;
 
   # Putting it all together.  This builds a store object containing
   # symlinks to the various parts of the built configuration (the
@@ -216,6 +226,8 @@ rec {
     inherit grubMenuBuilder;
     inherit etc;
     inherit systemPath;
+    inherit children;
+    inherit configurationName;
     kernel = kernel + "/vmlinuz";
     initrd = initialRamdisk + "/initrd";
     # Most of these are needed by grub-install.
@@ -228,16 +240,6 @@ rec {
       pkgs.upstart # for initctl
     ];
     upstartInterfaceVersion = pkgs.upstart.interfaceVersion;
-    # This attribute is responsible for creating boot entries for 
-    # child configuration. They are only (directly) accessible
-    # when the parent configuration is boot default. For example,
-    # you can provide an easy way to boot the same configuration 
-    # as you use, but with another kernel
-    children = map (x: ((import ./system.nix) 
-      { inherit platform; 
-        configuration = x//{boot=((x.boot)//{grubDevice = "";});};}).system) 
-      config.nesting.children; 
-    configurationName = config.boot.configurationName;
   }) config.environment.checkConfigurationOptions
      optionDeclarations config;
 
-- 
GitLab


From 551c80db4733a9b9a7d2951ed414a5db7321d831 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 18 May 2009 11:36:01 +0000
Subject: [PATCH 1452/5331] * Sync.

svn path=/nixos/branches/modular-nixos/; revision=15635
---
 system/system.nix     | 2 +-
 upstart-jobs/gw6c.nix | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/system/system.nix b/system/system.nix
index 1b910d39e94..d0bf32d7bf4 100644
--- a/system/system.nix
+++ b/system/system.nix
@@ -142,7 +142,7 @@ rec {
         pkgs.pwdutils
         pkgs.reiserfsprogs
         pkgs.rsync
-        pkgs.seccureUser
+        pkgs.seccure
         pkgs.strace
         pkgs.su
         pkgs.sysklogd
diff --git a/upstart-jobs/gw6c.nix b/upstart-jobs/gw6c.nix
index 21596c22dfa..eb40953f0be 100644
--- a/upstart-jobs/gw6c.nix
+++ b/upstart-jobs/gw6c.nix
@@ -103,7 +103,7 @@ let
         gw6cService = import ../../services/gw6c {
                 inherit (pkgs) stdenv gw6c coreutils 
                 procps upstart iputils gnused 
-                gnugrep seccureUser writeScript;
+                gnugrep seccure writeScript;
                 username = cfg.username;
                 password = cfg.password;
                 server = cfg.server;
-- 
GitLab


From 56e78c810a17e79ab7c2380332798071205a4ea1 Mon Sep 17 00:00:00 2001
From: Marc Weber <marco-oweber@gmx.de>
Date: Mon, 18 May 2009 11:55:32 +0000
Subject: [PATCH 1453/5331] Synced with trunk @ 15430

svn path=/nixos/branches/modular-nixos/; revision=15636
---
 installer/cd-dvd/rescue-cd.nix | 82 ++++++++++++++--------------------
 1 file changed, 33 insertions(+), 49 deletions(-)

diff --git a/installer/cd-dvd/rescue-cd.nix b/installer/cd-dvd/rescue-cd.nix
index 7a5c97421bc..13b4bcf16b4 100644
--- a/installer/cd-dvd/rescue-cd.nix
+++ b/installer/cd-dvd/rescue-cd.nix
@@ -5,6 +5,13 @@
     else "nixos-${builtins.readFile ../../VERSION}"
 , compressImage ? false
 , nixpkgs ? ../../../nixpkgs
+# This option allows easy building of Rescue CD with 
+# modified package set / driver set / anything.
+# For easier maitenance, let overrider know the current
+# options
+, configurationOverrides ? (config: {})
+# Whether to put all the build-time dependencies on DVD
+, includeBuildDeps ? false
 }:
 
 rec {
@@ -13,7 +20,7 @@ rec {
   cdLabel = "NIXOS_INSTALLATION_CD";
 
   
-  configuration = {
+  baseConfiguration = {
   
     boot = {
       isLiveCD = true;
@@ -94,6 +101,15 @@ rec {
         enable = false;
       };
 
+      showManual = {
+        enable = true;
+	manualFile = manual;
+      };
+
+      rogue = {
+        enable = true;
+      };
+
       extraJobs = [
         # Unpack the NixOS/Nixpkgs sources to /etc/nixos.
         # !!! run this synchronously
@@ -116,50 +132,8 @@ rec {
           ";
         }
       
-        # Show the NixOS manual on tty7.
-        { name = "manual";
-          job = "
-            env HOME=/root
-            start on udev
-            stop on shutdown
-            respawn ${pkgs.w3m}/bin/w3m ${manual} < /dev/tty7 > /dev/tty7 2>&1
-          ";
-        }
-
-        # Allow the user to do something useful on tty8 while waiting
-        # for the installation to finish.
-        { name = "rogue";
-          job = "
-            env HOME=/root
-            chdir /root
-            start on udev
-            stop on shutdown
-            respawn ${pkgs.rogue}/bin/rogue < /dev/tty8 > /dev/tty8 2>&1
-          ";
-        }
       ];
 
-      # And a background to go with that.
-      ttyBackgrounds = {
-        specificThemes = [
-          { tty = 7;
-            # Theme is GPL according to http://kde-look.org/content/show.php/Green?content=58501.
-            theme = pkgs.fetchurl {
-              url = http://www.kde-look.org/CONTENT/content-files/58501-green.tar.gz;
-              sha256 = "0sdykpziij1f3w4braq8r8nqg4lnsd7i7gi1k5d7c31m2q3b9a7r";
-            };
-          }
-          /* url is broken
-          { tty = 8;
-            theme = pkgs.fetchurl {
-              url = http://www.bootsplash.de/files/themes/Theme-GNU.tar.bz2;
-              md5 = "61969309d23c631e57b0a311102ef034";
-            };
-          }
-          */
-        ];
-      };
-
       mingetty = {
         helpLine = ''
         
@@ -197,12 +171,12 @@ rec {
    
   };
 
+  configuration = baseConfiguration // (configurationOverrides baseConfiguration);
 
   system = import ../../system/system.nix {
     inherit configuration platform nixpkgs;
   };
 
-
   pkgs = system.pkgs;
 
 
@@ -233,7 +207,7 @@ rec {
 
 
   # The configuration file for Grub.
-  grubCfg = pkgs.writeText "menu.lst" ''
+  grubCfg = pkgs.writeText "menu.lst" (''
     default 0
     timeout 10
     splashimage /boot/background.xpm.gz
@@ -248,7 +222,14 @@ rec {
 
     title Memtest86+
       kernel /boot/memtest.bin
-  '';
+  '' 
+    + (pkgs.lib.concatStringsSep "\n\n" 
+        (map (x: ''
+	  title NixOS: ${x.configurationName}
+	    kernel ${x.kernel} systemConfig=${x} init=${x.bootStage2} ${toString system.config.boot.kernelParams}
+	    initrd ${x.initrd}
+	'') system.children)))
+    ;
 
 
   # Create an ISO image containing the Grub boot loader, the kernel,
@@ -298,7 +279,12 @@ rec {
       { object = pkgs.stdenv;
         symlink = "none";
       }
-    ];
+    ]
+      ++ pkgs.lib.optional includeBuildDeps {
+          object = system.system.drvPath;
+          symlink = "none";
+        }
+      ;
     
     bootable = true;
     bootImage = "boot/grub/stage2_eltorito";
@@ -307,6 +293,4 @@ rec {
 
     volumeID = cdLabel;
   };
-
-
 }
-- 
GitLab


From bbeb12b77d5f6fd7cf9a437a63802c78b8b2300a Mon Sep 17 00:00:00 2001
From: Marc Weber <marco-oweber@gmx.de>
Date: Mon, 18 May 2009 11:58:02 +0000
Subject: [PATCH 1454/5331] Synced with trunk @ 15468

svn path=/nixos/branches/modular-nixos/; revision=15637
---
 upstart-jobs/tty-backgrounds.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/upstart-jobs/tty-backgrounds.nix b/upstart-jobs/tty-backgrounds.nix
index 5cf455cc9f0..d80de2eef70 100644
--- a/upstart-jobs/tty-backgrounds.nix
+++ b/upstart-jobs/tty-backgrounds.nix
@@ -32,7 +32,7 @@ let
             /*
             { tty = 6;
               theme = pkgs.fetchurl { # Yeah!
-                url = http://www.bootsplash.de/files/themes/Theme-Pativo.tar.bz2;
+                url = mirror://gentoo/distfiles/Theme-Pativo.tar.bz2;
                 md5 = "9e13beaaadf88d43a5293e7ab757d569";
               };
             }
-- 
GitLab


From c14ccdae913dc59d6ac4a18ec79c2899b834c7b8 Mon Sep 17 00:00:00 2001
From: Marc Weber <marco-oweber@gmx.de>
Date: Mon, 18 May 2009 11:58:45 +0000
Subject: [PATCH 1455/5331] Synced with trunk @ 15469

svn path=/nixos/branches/modular-nixos/; revision=15638
---
 upstart-jobs/cupsd.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/upstart-jobs/cupsd.nix b/upstart-jobs/cupsd.nix
index 7f5529e6f75..4080ac45fa8 100644
--- a/upstart-jobs/cupsd.nix
+++ b/upstart-jobs/cupsd.nix
@@ -47,6 +47,9 @@ let
     ln -s ${cups}/lib/cups/backend/* $out/lib/cups/backend/
     ln -s ${pkgs.samba}/bin/smbspool $out/lib/cups/backend/smb
 
+    # Provide support for printing via HTTPS.
+    ln -s ipp $out/lib/cups/backend/https
+
     # Provide Ghostscript rasterisation, necessary for non-Postscript
     # printers.
     rm $out/lib/cups/filter
-- 
GitLab


From 1d0c0a4291fae9f63ba83d8cd9df4857cc83e1e2 Mon Sep 17 00:00:00 2001
From: Marc Weber <marco-oweber@gmx.de>
Date: Mon, 18 May 2009 11:59:40 +0000
Subject: [PATCH 1456/5331] Synced with trunk @ 15480

svn path=/nixos/branches/modular-nixos/; revision=15639
---
 boot/boot-stage-1.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/boot/boot-stage-1.nix b/boot/boot-stage-1.nix
index 161b1e4b7ea..f4c8d5e3a1b 100644
--- a/boot/boot-stage-1.nix
+++ b/boot/boot-stage-1.nix
@@ -129,6 +129,7 @@ rec {
         --replace scsi_id ${extraUtils}/bin/scsi_id \
         --replace path_id ${extraUtils}/bin/path_id \
         --replace vol_id ${extraUtils}/bin/vol_id
+      sed -e '/^ENV[{]DEVTYPE[}]=="disk", .*GOTO/d' -i $out/60-persistent-storage.rules 
     ''; # */
   };
 
-- 
GitLab


From 81d6032c43bee2400106e1d151cd002b0aaa9d5c Mon Sep 17 00:00:00 2001
From: Marc Weber <marco-oweber@gmx.de>
Date: Mon, 18 May 2009 12:01:31 +0000
Subject: [PATCH 1457/5331] Synced with trunk @ 15505

svn path=/nixos/branches/modular-nixos/; revision=15640
---
 installer/grub-menu-builder.sh    | 101 +++++++++++++++++++-----------
 system/switch-to-configuration.sh |   6 +-
 2 files changed, 69 insertions(+), 38 deletions(-)

diff --git a/installer/grub-menu-builder.sh b/installer/grub-menu-builder.sh
index 72635c36433..464fc94ce22 100644
--- a/installer/grub-menu-builder.sh
+++ b/installer/grub-menu-builder.sh
@@ -15,6 +15,9 @@ bootMount="@bootMount@"
 if test -z "$bootMount"; then bootMount=/boot; fi
 
 
+echo "updating the Grub menu..."
+
+
 target=/boot/grub/menu.lst
 tmp=$target.tmp
 
@@ -27,14 +30,13 @@ GRUBEND
 
 if test -n "@grubSplashImage@"; then
     splashLocation=@grubSplashImage@
-    # !!! image in /nix/store doesn't seem to work
-    #if test -n "@copyKernels@"; then
-	cp -f $splashLocation /boot/background.xpm.gz
-	splashLocation="$bootMount/background.xpm.gz"
-    #fi
+    # Splash images in /nix/store don't seem to work, so copy them.
+    cp -f $splashLocation /boot/background.xpm.gz
+    splashLocation="$bootMount/background.xpm.gz"
     echo "splashimage $splashLocation" >> $tmp
 fi
 
+
 configurationCounter=0
 configurationLimit="@configurationLimit@"
 numAlienEntries=`cat <<EOF | egrep '^[[:space:]]*title' | wc -l
@@ -42,18 +44,48 @@ numAlienEntries=`cat <<EOF | egrep '^[[:space:]]*title' | wc -l
 EOF`
 
 if test $((configurationLimit+numAlienEntries)) -gt 190; then
-	configurationLimit=$((190-numAlienEntries));
+    configurationLimit=$((190-numAlienEntries));
 fi
 
+
+# Convert a path to a file in the Nix store such as
+# /nix/store/<hash>-<name>/file to <hash>-<name>-<file>.
+cleanName() {
+    local path="$1"
+    echo "$path" | sed 's|^/nix/store/||' | sed 's|/|-|g'
+}
+
+
+# Copy a file from the Nix store to /boot/kernels.
+declare -A filesCopied
+
+copyToKernelsDir() {
+    local src="$1"
+    local dst="/boot/kernels/$(cleanName $src)"
+    # Don't copy the file if $dst already exists.  This means that we
+    # have to create $dst atomically to prevent partially copied
+    # kernels or initrd if this script is ever interrupted.
+    if ! test -e $dst; then
+        local dstTmp=$dst.tmp.$$
+        cp $src $dstTmp
+        mv $dstTmp $dst
+    fi
+    filesCopied[$dst]=1
+    result=$dst
+}
+
+
+# Add an entry for a configuration to the Grub menu, and if
+# appropriate, copy its kernel and initrd to /boot/kernels.
 addEntry() {
     local name="$1"
     local path="$2"
     local shortSuffix="$3"
 
     configurationCounter=$((configurationCounter + 1))
-    if test $configurationCounter -gt @configurationLimit@ ; then
-	    return
-    fi;
+    if test $configurationCounter -gt @configurationLimit@; then
+	return
+    fi
 
     if ! test -e $path/kernel -a -e $path/initrd; then
         return
@@ -63,10 +95,10 @@ addEntry() {
     local initrd=$(readlink -f $path/initrd)
 
     if test "$path" = "$default"; then
-	    cp "$kernel" /boot/nixos-kernel
-	    cp "$initrd" /boot/nixos-initrd
-	    cp "$(readlink -f "$path/init")" /boot/nixos-init
-	    cat > /boot/nixos-grub-config <<EOF
+	cp "$kernel" /boot/nixos-kernel
+	cp "$initrd" /boot/nixos-initrd
+	cp "$(readlink -f "$path/init")" /boot/nixos-init
+	cat > /boot/nixos-grub-config <<EOF
 	title Emergency boot
 	kernel ${bootMount:-/boot}/nixos-kernel systemConfig=$(readlink -f "$path") init=/boot/nixos-init $(cat "$path/kernel-params")
 	initrd ${bootMount:-/boot}/nixos-initrd
@@ -74,30 +106,21 @@ EOF
     fi
 
     if test -n "@copyKernels@"; then
-        local kernel2=/boot/kernels/$(echo $kernel | sed 's^/^-^g')
-        if ! test -e $kernel2; then
-            cp $kernel $kernel2
-        fi
-        kernel=$kernel2
-
-        local initrd2=/boot/kernels/$(echo $initrd | sed 's^/^-^g')
-        if ! test -e $initrd2; then
-            cp $initrd $initrd2
-        fi
-        initrd=$initrd2
-
-        if test -n "$bootMount"; then
-          kernel=$(echo $kernel2 | sed -e "s^/boot^$bootMount^")
-          initrd=$(echo $initrd2 | sed -e "s^/boot^$bootMount^")
-        fi
+        copyToKernelsDir $kernel; kernel=$result
+        copyToKernelsDir $initrd; initrd=$result
+    fi
+    
+    if test -n "$bootMount"; then
+        kernel=$(echo $kernel | sed -e "s^/boot^$bootMount^")
+        initrd=$(echo $initrd | sed -e "s^/boot^$bootMount^")
     fi
     
     local confName=$(if test -e $path/configuration-name; then 
 	cat $path/configuration-name; 
-    fi);
-    if test -n "$confName" ; then
-	name="$confName $3";
-    fi;
+    fi)
+    if test -n "$confName"; then
+	name="$confName $3"
+    fi
 
     cat >> $tmp << GRUBEND
 
@@ -108,11 +131,11 @@ GRUBEND
 }
 
 
-rm -rf /boot/kernels
 if test -n "@copyKernels@"; then
     mkdir -p /boot/kernels
 fi
 
+
 # Additional entries specified verbatim by the configuration.
 extraGrubEntries=`cat <<EOF
 @extraGrubEntries@
@@ -135,11 +158,11 @@ for link in $((ls -d $default/fine-tune/* ) | sort -n); do
     date=$(stat --printf="%y\n" $link | sed 's/\..*//')
     addEntry "NixOS - variation" $link ""
 done
+
 for generation in $(
     (cd /nix/var/nix/profiles && ls -d system-*-link) \
     | sed 's/system-\([0-9]\+\)-link/\1/' \
     | sort -n -r); do
-    echo $generation
     link=/nix/var/nix/profiles/system-$generation-link
     date=$(stat --printf="%y\n" $link | sed 's/\..*//')
     kernelVersion=$(cd $(dirname $(readlink -f $link/kernel))/lib/modules && echo *)
@@ -150,3 +173,11 @@ done
 # Atomically update /boot/grub/menu.lst.  !!! should do an fsync()
 # here on $tmp, especially on ext4.
 mv $tmp $target
+
+
+# Remove obsolete files from /boot/kernels.
+for fn in $(ls /boot/kernels/*); do
+    if ! test "${filesCopied[$fn]}" = 1; then
+        rm -vf -- "$fn"
+    fi
+done
diff --git a/system/switch-to-configuration.sh b/system/switch-to-configuration.sh
index eaeb3106afd..6cd5d6aff97 100644
--- a/system/switch-to-configuration.sh
+++ b/system/switch-to-configuration.sh
@@ -50,8 +50,8 @@ EOF
     oldEvents=$(readlink -f /etc/event.d || true)
     newEvents=$(readlink -f @out@/etc/event.d)
 
-    echo "old: $oldEvents"
-    echo "new: $newEvents"
+    #echo "old: $oldEvents"
+    #echo "new: $newEvents"
 
     stopJob() {
         local job=$1
@@ -73,7 +73,7 @@ EOF
 
     # Activate the new configuration (i.e., update /etc, make
     # accounts, and so on).
-    echo "Activating the configuration..."
+    echo "activating the configuration..."
     @out@/activate @out@
 
     # Make Upstart reload its events.  !!! Should wait until it has
-- 
GitLab


From f51620cdff54bfb32a3f4821b5ad51eaac1ce383 Mon Sep 17 00:00:00 2001
From: Marc Weber <marco-oweber@gmx.de>
Date: Mon, 18 May 2009 12:02:27 +0000
Subject: [PATCH 1458/5331] Synced with trunk @ 15508

svn path=/nixos/branches/modular-nixos/; revision=15641
---
 installer/cd-dvd/rescue-cd.nix | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/installer/cd-dvd/rescue-cd.nix b/installer/cd-dvd/rescue-cd.nix
index 13b4bcf16b4..ef47d960613 100644
--- a/installer/cd-dvd/rescue-cd.nix
+++ b/installer/cd-dvd/rescue-cd.nix
@@ -5,6 +5,7 @@
     else "nixos-${builtins.readFile ../../VERSION}"
 , compressImage ? false
 , nixpkgs ? ../../../nixpkgs
+, services ? ../../../services
 # This option allows easy building of Rescue CD with 
 # modified package set / driver set / anything.
 # For easier maitenance, let overrider know the current
@@ -12,6 +13,7 @@
 , configurationOverrides ? (config: {})
 # Whether to put all the build-time dependencies on DVD
 , includeBuildDeps ? false
+, includeTarballs ? true
 }:
 
 rec {
@@ -127,6 +129,8 @@ rec {
               tar xjf /install/nixos.tar.bz2 -C /etc/nixos/nixos
               mkdir -p /etc/nixos/nixpkgs
               tar xjf /install/nixpkgs.tar.bz2 -C /etc/nixos/nixpkgs
+              mkdir -p /etc/nixos/services
+              tar xjf /install/services.tar.bz2 -C /etc/nixos/services
               chown -R root.root /etc/nixos
             end script
           ";
@@ -202,6 +206,10 @@ rec {
   nixosTarball = makeTarball "nixos.tar.bz2" ../..;
 
 
+  # Put Services in a tarball.
+  servicesTarball = makeTarball "services.tar.bz2" services;
+
+
   # Put Nixpkgs in a tarball.
   nixpkgsTarball = makeTarball "nixpkgs.tar.bz2" nixpkgs;
 
@@ -259,12 +267,18 @@ rec {
       { source = system.config.boot.grubSplashImage;
         target = "boot/background.xpm.gz";
       }
+    ]
+    ++
+    pkgs.lib.optionals includeTarballs [
       { source = nixosTarball + "/" + nixosTarball.tarName;
         target = "/install/" + nixosTarball.tarName;
       }
       { source = nixpkgsTarball + "/nixpkgs.tar.bz2";
         target = "/install/nixpkgs.tar.bz2";
       }
+      { source = servicesTarball + "/services.tar.bz2";
+        target = "/install/services.tar.bz2";
+      }
     ];
 
     # Closures to be copied to the Nix store on the CD.
-- 
GitLab


From 5cff1db403568d52b77990c1fe108c41a32c4b1e Mon Sep 17 00:00:00 2001
From: Marc Weber <marco-oweber@gmx.de>
Date: Mon, 18 May 2009 12:03:11 +0000
Subject: [PATCH 1459/5331] Synced with trunk @ 15509

svn path=/nixos/branches/modular-nixos/; revision=15642
---
 installer/nixos-install.sh | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/installer/nixos-install.sh b/installer/nixos-install.sh
index 1784b4357f1..b90ffe4145c 100644
--- a/installer/nixos-install.sh
+++ b/installer/nixos-install.sh
@@ -135,6 +135,10 @@ if test -n "@nixpkgsURL@" -a ${NIXOS_PULL:-1} != 0; then
     chroot $mountPoint @nix@/bin/nix-pull @nixpkgsURL@/MANIFEST || true
 fi
 
+if test -n "$NIXOS_PREPARE_CHROOT_ONLY"; then
+    echo "User requested only to prepare chroot. Exiting."
+    exit 0;
+fi
 
 # Build the specified Nix expression in the target store and install
 # it into the system configuration profile.
-- 
GitLab


From 7dc33353c4768c1ac3a612682b180b63dd13c657 Mon Sep 17 00:00:00 2001
From: Marc Weber <marco-oweber@gmx.de>
Date: Mon, 18 May 2009 12:54:54 +0000
Subject: [PATCH 1460/5331] Synced with trunk @ 15548

svn path=/nixos/branches/modular-nixos/; revision=15643
---
 installer/grub-menu-builder.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/installer/grub-menu-builder.sh b/installer/grub-menu-builder.sh
index 464fc94ce22..8a99ca5f29d 100644
--- a/installer/grub-menu-builder.sh
+++ b/installer/grub-menu-builder.sh
@@ -15,7 +15,7 @@ bootMount="@bootMount@"
 if test -z "$bootMount"; then bootMount=/boot; fi
 
 
-echo "updating the Grub menu..."
+echo "updating the GRUB menu..."
 
 
 target=/boot/grub/menu.lst
@@ -176,7 +176,7 @@ mv $tmp $target
 
 
 # Remove obsolete files from /boot/kernels.
-for fn in $(ls /boot/kernels/*); do
+for fn in /boot/kernels/*; do
     if ! test "${filesCopied[$fn]}" = 1; then
         rm -vf -- "$fn"
     fi
-- 
GitLab


From 908e8fe2d424229dfbf9b5748714ff777c723311 Mon Sep 17 00:00:00 2001
From: Marc Weber <marco-oweber@gmx.de>
Date: Mon, 18 May 2009 12:57:01 +0000
Subject: [PATCH 1461/5331] Synced with trunk @ 15577

svn path=/nixos/branches/modular-nixos/; revision=15644
---
 boot/boot-stage-1-init.sh | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/boot/boot-stage-1-init.sh b/boot/boot-stage-1-init.sh
index b3b2292beaa..524735b1ba2 100644
--- a/boot/boot-stage-1-init.sh
+++ b/boot/boot-stage-1-init.sh
@@ -166,15 +166,6 @@ checkFS() {
     # Only check block devices.
     if ! test -b "$device"; then return 0; fi
 
-    # For unclean ext3 file systems, fsck.ext3 should just replay the
-    # journal and exit, but in practice this takes *much* longer than
-    # letting the kernel recover the FS.  So, don't run fsck on
-    # journalling file systems.
-    eval $(fstype "$device")
-    if test "$FSTYPE" = ext3 -o "$FSTYPE" = ext4 -o "$FSTYPE" = reiserfs -o "$FSTYPE" = xfs -o "$FSTYPE" = jfs; then
-        return 0;
-    fi
-    
     # Don't run `fsck' if the machine is on battery power.  !!! Is
     # this a good idea?
     if ! onACPower; then
-- 
GitLab


From cb411d1a3d540a46fc3bb370d47d97cdef667639 Mon Sep 17 00:00:00 2001
From: Marc Weber <marco-oweber@gmx.de>
Date: Mon, 18 May 2009 12:59:01 +0000
Subject: [PATCH 1462/5331] Synced with trunk @ 15580

svn path=/nixos/branches/modular-nixos/; revision=15645
---
 helpers/make-etc.sh     | 10 +++++++++-
 upstart-jobs/gather.nix | 10 +++++++---
 2 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/helpers/make-etc.sh b/helpers/make-etc.sh
index a7643b63c5b..4b7bb68be4b 100644
--- a/helpers/make-etc.sh
+++ b/helpers/make-etc.sh
@@ -7,7 +7,15 @@ targets_=($targets)
 modes_=($modes)
 for ((i = 0; i < ${#targets_[@]}; i++)); do
     ensureDir $out/etc/$(dirname ${targets_[$i]})
-    ln -s ${sources_[$i]} $out/etc/${targets_[$i]}
+    if ! test -e $out/etc/${targets_[$i]}; then
+      ln -s ${sources_[$i]} $out/etc/${targets_[$i]};
+    else
+      echo Duplicate entry "${targets_[$i]} -> ${sources_[$i]}"
+      if test "$(readlink "$targets_[$i]")" -ne "$sources_[$i]"; then
+        echo Mismatched duplicate entry "$(readlink "$targets_[$i]") "'<>'" $sources_[$i]"
+	exit 1
+      fi
+    fi;
     if test "${modes_[$i]}" != symlink; then
         echo "${modes_[$i]}" > $out/etc/${targets_[$i]}.mode
     fi
diff --git a/upstart-jobs/gather.nix b/upstart-jobs/gather.nix
index 47193167360..726503f1917 100644
--- a/upstart-jobs/gather.nix
+++ b/upstart-jobs/gather.nix
@@ -6,8 +6,12 @@ runCommand "upstart-jobs" {inherit jobs;}
   "
     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
+      if ln -s $i . ; then
+        if test -d $i; then
+          ln -s $i/etc/event.d/* $out/etc/event.d/ 
+        fi
+      else
+        echo Duplicate entry: $i;
+      fi;
     done
   "
-- 
GitLab


From 8ff00dd4c5d19dff735d9db206aafc7cdb35e534 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 19 May 2009 14:55:17 +0000
Subject: [PATCH 1463/5331] svn path=/nixos/branches/modular-nixos/;
 revision=15653

---
 system/system.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/system/system.nix b/system/system.nix
index d0bf32d7bf4..0af8e602a47 100644
--- a/system/system.nix
+++ b/system/system.nix
@@ -15,7 +15,7 @@ rec {
   # values.
   config =
     pkgs.lib.fixOptionSets
-      pkgs.lib.newMergeOptionSets
+      pkgs.lib.mergeOptionSets
       pkgs configComponents;
 
   optionDeclarations =
-- 
GitLab


From 88e136954aadd6b61704ee00dbf777c242b0682e Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Tue, 19 May 2009 17:08:32 +0000
Subject: [PATCH 1464/5331] Export all needed PATH elements

svn path=/nixos/trunk/; revision=15656
---
 upstart-jobs/ejabberd.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/upstart-jobs/ejabberd.nix b/upstart-jobs/ejabberd.nix
index d7ab158af5d..4b924af5dc4 100644
--- a/upstart-jobs/ejabberd.nix
+++ b/upstart-jobs/ejabberd.nix
@@ -27,7 +27,7 @@ in
 	    test -f ${cfg.confDir}/ejabberd.cfg || sed -e 's|{hosts, \["localhost"\]}.|{hosts, \[${cfg.virtualHosts}\]}.|' ${pkgs.ejabberd}/etc/ejabberd/ejabberd.cfg > ${cfg.confDir}/ejabberd.cfg
       end script
       
-      respawn ${pkgs.bash}/bin/sh -c 'export PATH=$PATH:${pkgs.ejabberd}/sbin; cd ~; ejabberdctl --logs ${cfg.logsDir} --spool ${cfg.spoolDir} --config ${cfg.confDir}/ejabberd.cfg start; sleep 1d'
+      respawn ${pkgs.bash}/bin/sh -c 'export PATH=$PATH:${pkgs.ejabberd}/sbin:${pkgs.coreutils}/bin:${pkgs.bash}/bin; cd ~; ejabberdctl --logs ${cfg.logsDir} --spool ${cfg.spoolDir} --config ${cfg.confDir}/ejabberd.cfg start; sleep 1d'
       
       stop script
           ${pkgs.ejabberd}/sbin/ejabberdctl stop
-- 
GitLab


From 393cc8e8b9cdcbf96b0bdbdbd0d5971bdf45fe75 Mon Sep 17 00:00:00 2001
From: Nicolas Pierron <nicolas.b.pierron@gmail.com>
Date: Tue, 19 May 2009 23:14:45 +0000
Subject: [PATCH 1465/5331] Substitute the "require" of imported modules by
 module paths.

$ sed -i '/require =/ { :b; s,(import \([^)]*\)),\1,; /];/ { b e }; n; b b; :e }' *.nix


svn path=/nixos/trunk/; revision=15660
---
 system/options.nix           | 20 ++++++++++----------
 upstart-jobs/cron.nix        | 10 +++++-----
 upstart-jobs/cron/locate.nix |  2 +-
 upstart-jobs/dhclient.nix    |  2 +-
 upstart-jobs/fcron.nix       | 10 +++++-----
 5 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/system/options.nix b/system/options.nix
index 9b038fac903..9fa68009fa5 100644
--- a/system/options.nix
+++ b/system/options.nix
@@ -3126,19 +3126,19 @@ root        ALL=(ALL) SETENV: ALL
   
   require = [
     # newtworking
-    (import ../upstart-jobs/dhclient.nix)
+    ../upstart-jobs/dhclient.nix
 
     # hardware
-    (import ../upstart-jobs/pcmcia.nix)
+    ../upstart-jobs/pcmcia.nix
 
     # services
-    (import ../upstart-jobs/cron.nix)
-    (import ../upstart-jobs/fcron.nix)
-    (import ../upstart-jobs/cron/locate.nix)
-    (import ../upstart-jobs/manual.nix)
-    (import ../upstart-jobs/rogue.nix)
-    (import ../upstart-jobs/guest-users.nix)
-    (import ../upstart-jobs/pulseaudio.nix)
-    (import ../upstart-jobs/portmap.nix)
+    ../upstart-jobs/cron.nix
+    ../upstart-jobs/fcron.nix
+    ../upstart-jobs/cron/locate.nix
+    ../upstart-jobs/manual.nix
+    ../upstart-jobs/rogue.nix
+    ../upstart-jobs/guest-users.nix
+    ../upstart-jobs/pulseaudio.nix
+    ../upstart-jobs/portmap.nix
   ];
 }
diff --git a/upstart-jobs/cron.nix b/upstart-jobs/cron.nix
index 078cf4766fc..35c4b488bd7 100644
--- a/upstart-jobs/cron.nix
+++ b/upstart-jobs/cron.nix
@@ -53,11 +53,11 @@ in
 
 {
   require = [
-    # (import ../upstart-jobs/default.nix) # config.services.extraJobs
-    # (import ?) # config.time.timeZone
-    # (import ?) # config.environment.etc
-    # (import ?) # config.environment.extraPackages
-    # (import ?) # config.environment.cleanStart
+    # ../upstart-jobs/default.nix # config.services.extraJobs
+    # ? # config.time.timeZone
+    # ? # config.environment.etc
+    # ? # config.environment.extraPackages
+    # ? # config.environment.cleanStart
     options
   ];
 
diff --git a/upstart-jobs/cron/locate.nix b/upstart-jobs/cron/locate.nix
index eace9f5129b..bbb41f6e943 100644
--- a/upstart-jobs/cron/locate.nix
+++ b/upstart-jobs/cron/locate.nix
@@ -45,7 +45,7 @@ in
 
 {
   require = [
-    (import ../../upstart-jobs/cron.nix) # config.services.cron
+    ../../upstart-jobs/cron.nix # config.services.cron
     options
   ];
 
diff --git a/upstart-jobs/dhclient.nix b/upstart-jobs/dhclient.nix
index 5b732f42fd1..342ac57e9b2 100644
--- a/upstart-jobs/dhclient.nix
+++ b/upstart-jobs/dhclient.nix
@@ -55,7 +55,7 @@ in
 
 {
   require = [
-    # (import ../upstart-jobs/default.nix)
+    # ../upstart-jobs/default.nix
     options
   ];
 
diff --git a/upstart-jobs/fcron.nix b/upstart-jobs/fcron.nix
index 5dd61e669d3..b05b9d8ab6a 100644
--- a/upstart-jobs/fcron.nix
+++ b/upstart-jobs/fcron.nix
@@ -79,11 +79,11 @@ in
 
 {
   require = [
-    # (import ../upstart-jobs/default.nix) # config.services.extraJobs
-    # (import ?) # config.time.timeZone
-    # (import ?) # config.environment.etc
-    # (import ?) # config.environment.extraPackages
-    # (import ?) # config.environment.cleanStart
+    # ../upstart-jobs/default.nix # config.services.extraJobs
+    # ? # config.time.timeZone
+    # ? # config.environment.etc
+    # ? # config.environment.extraPackages
+    # ? # config.environment.cleanStart
     options
   ];
 
-- 
GitLab


From bb8fc2646ef379c8446d294cdfdb0be87dbc99dc Mon Sep 17 00:00:00 2001
From: Nicolas Pierron <nicolas.b.pierron@gmail.com>
Date: Tue, 19 May 2009 23:14:45 +0000
Subject: [PATCH 1466/5331] Substitute the "require" of imported modules by
 module paths.

$ sed -i '/require =/ { :b; s,(import \([^)]*\)),\1,; /];/ { b e }; n; b b; :e }' *.nix


svn path=/nixos/branches/modular-nixos/; revision=15660
---
 boot/boot-stage-2.nix                         |   4 +-
 etc/default.nix                               |   4 +-
 installer/grub.nix                            |   2 +-
 system/options.nix                            | 174 +++++++++---------
 system/sudo.nix                               |   6 +-
 system/system-options.nix                     |   2 +-
 system/users-groups.nix                       |   2 +-
 upstart-jobs/alsa.nix                         |   6 +-
 upstart-jobs/atd.nix                          |  10 +-
 upstart-jobs/avahi-daemon.nix                 |  14 +-
 upstart-jobs/consolekit.nix                   |   4 +-
 upstart-jobs/cron.nix                         |  10 +-
 upstart-jobs/cron/locate.nix                  |   2 +-
 upstart-jobs/dbus.nix                         |   6 +-
 upstart-jobs/default.nix                      |   2 +-
 upstart-jobs/dhclient.nix                     |   2 +-
 upstart-jobs/disnix.nix                       |   4 +-
 upstart-jobs/fcron.nix                        |  10 +-
 upstart-jobs/gpm.nix                          |   2 +-
 upstart-jobs/hal.nix                          |  10 +-
 upstart-jobs/nagios/default.nix               |  10 +-
 upstart-jobs/pcmcia.nix                       |   4 +-
 upstart-jobs/xserver/default.nix              |  12 +-
 .../xserver/desktopManager/default.nix        |  10 +-
 upstart-jobs/xserver/desktopManager/kde.nix   |   2 +-
 upstart-jobs/xserver/desktopManager/kde4.nix  |   2 +-
 .../xserver/displayManager/default.nix        |   4 +-
 .../xserver/windowManager/default.nix         |  14 +-
 upstart-jobs/zabbix-agent.nix                 |   4 +-
 upstart-jobs/zabbix-server.nix                |   4 +-
 30 files changed, 171 insertions(+), 171 deletions(-)

diff --git a/boot/boot-stage-2.nix b/boot/boot-stage-2.nix
index 5de8135867a..863de773043 100644
--- a/boot/boot-stage-2.nix
+++ b/boot/boot-stage-2.nix
@@ -37,10 +37,10 @@ in
     # config.boot.kernelPackages
 
     # config.system.activationScripts
-    (import ../system/activate-configuration.nix)
+    ../system/activate-configuration.nix
 
     # config.system.build
-    (import ../system/system-options.nix)
+    ../system/system-options.nix
   ];
 
   system = {
diff --git a/etc/default.nix b/etc/default.nix
index 44307279f96..878bea7f795 100644
--- a/etc/default.nix
+++ b/etc/default.nix
@@ -253,10 +253,10 @@ in
     option
 
     # config.system.build
-    (import ../system/system-options.nix)
+    ../system/system-options.nix
 
     # config.system.activationScripts
-    (import ../system/activate-configuration.nix)
+    ../system/activate-configuration.nix
   ];
 
   system = {
diff --git a/installer/grub.nix b/installer/grub.nix
index 7ae2dd8e7a5..dc0abbaceaa 100644
--- a/installer/grub.nix
+++ b/installer/grub.nix
@@ -100,7 +100,7 @@ in
     options
 
     # config.system.build
-    (import ../system/system-options.nix)
+    ../system/system-options.nix
   ];
 
   system = {
diff --git a/system/options.nix b/system/options.nix
index d8c390934ce..028afdae115 100644
--- a/system/options.nix
+++ b/system/options.nix
@@ -380,132 +380,132 @@ in
 
   require = [
 
-    (import ../system/assertion.nix)
+    ../system/assertion.nix
 
     # boot (is it the right place ?)
-    (import ../system/kernel.nix)
-    (import ../boot/boot-stage-2.nix)
-    (import ../installer/grub.nix)
+    ../system/kernel.nix
+    ../boot/boot-stage-2.nix
+    ../installer/grub.nix
 
     # system
-    (import ../system/system-options.nix)
-    (import ../system/activate-configuration.nix)
-    (import ../upstart-jobs/default.nix)
+    ../system/system-options.nix
+    ../system/activate-configuration.nix
+    ../upstart-jobs/default.nix
 
-    (import ../upstart-jobs/acpid.nix) # ACPI daemon
+    ../upstart-jobs/acpid.nix # ACPI daemon
 
-    (import ../system/unix-odbc-drivers.nix)
+    ../system/unix-odbc-drivers.nix
 
-    (import ../upstart-jobs/klogd.nix)
+    ../upstart-jobs/klogd.nix
 
-    (import ../upstart-jobs/lvm.nix) # Makes LVM logical volumes available.
+    ../upstart-jobs/lvm.nix # Makes LVM logical volumes available.
 
-    (import ../upstart-jobs/swraid.nix) # Activate software RAID arrays.
+    ../upstart-jobs/swraid.nix # Activate software RAID arrays.
 
-    (import ../upstart-jobs/filesystems.nix) # Mount file systems.
+    ../upstart-jobs/filesystems.nix # Mount file systems.
 
-    (import ../upstart-jobs/swap.nix)
-    (import ../upstart-jobs/network-interfaces.nix)
-    (import ../upstart-jobs/nscd.nix) # Name service cache daemon.
-    (import ../upstart-jobs/maintenance-shell.nix) # Handles the maintenance/stalled event (single-user shell).
-    (import ../upstart-jobs/ctrl-alt-delete.nix) # Ctrl-alt-delete action.
-    (import ../upstart-jobs/halt.nix)
-    (import ../upstart-jobs/ifplugd.nix) # ifplugd daemon for monitoring Ethernet cables.
+    ../upstart-jobs/swap.nix
+    ../upstart-jobs/network-interfaces.nix
+    ../upstart-jobs/nscd.nix # Name service cache daemon.
+    ../upstart-jobs/maintenance-shell.nix # Handles the maintenance/stalled event (single-user shell).
+    ../upstart-jobs/ctrl-alt-delete.nix # Ctrl-alt-delete action.
+    ../upstart-jobs/halt.nix
+    ../upstart-jobs/ifplugd.nix # ifplugd daemon for monitoring Ethernet cables.
 
 
     # security
-    (import ../system/sudo.nix)
+    ../system/sudo.nix
 
     # i18n
-    (import ../system/i18n.nix)
+    ../system/i18n.nix
 
     # environment
-    (import ../etc/default.nix)
+    ../etc/default.nix
 
-    (import ../system/nixos-environment.nix)
+    ../system/nixos-environment.nix
 
     # users
-    (import ../system/users-groups.nix)
+    ../system/users-groups.nix
 
     # newtworking
-    (import ../upstart-jobs/dhclient.nix)
+    ../upstart-jobs/dhclient.nix
 
     # hardware
-    (import ../upstart-jobs/pcmcia.nix)
+    ../upstart-jobs/pcmcia.nix
 
     # security
-    (import ../system/nixos-security.nix)
+    ../system/nixos-security.nix
 
     # services
-    (import ../upstart-jobs/avahi-daemon.nix)
-    (import ../upstart-jobs/atd.nix)
-    (import ../upstart-jobs/dbus.nix)
-    (import ../upstart-jobs/hal.nix)
-    (import ../upstart-jobs/gpm.nix)
-    (import ../upstart-jobs/nagios/default.nix)
-    (import ../upstart-jobs/xserver/default.nix)
-    (import ../upstart-jobs/zabbix-agent.nix)
-    (import ../upstart-jobs/zabbix-server.nix)
-    (import ../upstart-jobs/disnix.nix)
-    (import ../upstart-jobs/consolekit.nix)
-    (import ../upstart-jobs/cron.nix)
-    (import ../upstart-jobs/fcron.nix)
-    (import ../upstart-jobs/cron/locate.nix)
-    (import ../upstart-jobs/manual.nix)
-    (import ../upstart-jobs/rogue.nix)
-    (import ../upstart-jobs/guest-users.nix)
-    (import ../upstart-jobs/pulseaudio.nix)
-    (import ../upstart-jobs/kbd.nix)
-    (import ../upstart-jobs/gw6c.nix) # Gateway6
-    (import ../upstart-jobs/syslogd.nix)
-    (import ../upstart-jobs/dhcpd.nix)
-    (import ../upstart-jobs/sshd.nix)
-    (import ../upstart-jobs/lshd.nix) # GNU lshd SSH2 deamon (TODO: does neither start nor generate seed file ?)
-    (import ../upstart-jobs/ntpd.nix)
-    (import ../upstart-jobs/portmap.nix)
-    (import ../upstart-jobs/bitlbee.nix)
-    (import ../upstart-jobs/gnunet.nix)
-    (import ../upstart-jobs/ejabberd.nix) # untested, dosen't compile on x86_64-linux
-    (import ../upstart-jobs/jboss.nix)
-    (import ../upstart-jobs/tomcat.nix) # untested, too lazy to get that jdk
-    (import ../upstart-jobs/httpd.nix) # Apache httpd (probably this can be removed ?)
-    (import ../upstart-jobs/apache-httpd) # Apache httpd (new style).
-    (import ../upstart-jobs/vsftpd.nix)
-    (import ../upstart-jobs/cupsd.nix) # CUPS printing daemon
-    (import ../upstart-jobs/udev.nix) # The udev daemon creates devices nodes and runs programs when hardware events occur.
-    (import ../upstart-jobs/samba.nix) # TODO: doesn't start here (?)
-    (import ../upstart-jobs/ircd-hybrid.nix) # TODO: doesn't compile on x86_64-linux, can't test
-    (import ../upstart-jobs/xfs.nix)
-    (import ../upstart-jobs/mysql.nix)
-    (import ../upstart-jobs/postgresql.nix)
-    (import ../upstart-jobs/openfire.nix)
-    (import ../upstart-jobs/postfix.nix)
-    (import ../upstart-jobs/dovecot.nix)
-    (import ../upstart-jobs/bind.nix)
-
-    (import ../upstart-jobs/mingetty.nix) # The terminals on ttyX.
-    (import ../upstart-jobs/tty-backgrounds.nix)
-
-    (import ../upstart-jobs/synergy.nix)
-    (import ../upstart-jobs/openvpn.nix)
-
-    (import ../upstart-jobs/nfs-kernel.nix)
-    (import ../upstart-jobs/autofs.nix)
+    ../upstart-jobs/avahi-daemon.nix
+    ../upstart-jobs/atd.nix
+    ../upstart-jobs/dbus.nix
+    ../upstart-jobs/hal.nix
+    ../upstart-jobs/gpm.nix
+    ../upstart-jobs/nagios/default.nix
+    ../upstart-jobs/xserver/default.nix
+    ../upstart-jobs/zabbix-agent.nix
+    ../upstart-jobs/zabbix-server.nix
+    ../upstart-jobs/disnix.nix
+    ../upstart-jobs/consolekit.nix
+    ../upstart-jobs/cron.nix
+    ../upstart-jobs/fcron.nix
+    ../upstart-jobs/cron/locate.nix
+    ../upstart-jobs/manual.nix
+    ../upstart-jobs/rogue.nix
+    ../upstart-jobs/guest-users.nix
+    ../upstart-jobs/pulseaudio.nix
+    ../upstart-jobs/kbd.nix
+    ../upstart-jobs/gw6c.nix # Gateway6
+    ../upstart-jobs/syslogd.nix
+    ../upstart-jobs/dhcpd.nix
+    ../upstart-jobs/sshd.nix
+    ../upstart-jobs/lshd.nix # GNU lshd SSH2 deamon (TODO: does neither start nor generate seed file ?)
+    ../upstart-jobs/ntpd.nix
+    ../upstart-jobs/portmap.nix
+    ../upstart-jobs/bitlbee.nix
+    ../upstart-jobs/gnunet.nix
+    ../upstart-jobs/ejabberd.nix # untested, dosen't compile on x86_64-linux
+    ../upstart-jobs/jboss.nix
+    ../upstart-jobs/tomcat.nix # untested, too lazy to get that jdk
+    ../upstart-jobs/httpd.nix # Apache httpd (probably this can be removed ?)
+    ../upstart-jobs/apache-httpd # Apache httpd (new style).
+    ../upstart-jobs/vsftpd.nix
+    ../upstart-jobs/cupsd.nix # CUPS printing daemon
+    ../upstart-jobs/udev.nix # The udev daemon creates devices nodes and runs programs when hardware events occur.
+    ../upstart-jobs/samba.nix # TODO: doesn't start here (?)
+    ../upstart-jobs/ircd-hybrid.nix # TODO: doesn't compile on x86_64-linux, can't test
+    ../upstart-jobs/xfs.nix
+    ../upstart-jobs/mysql.nix
+    ../upstart-jobs/postgresql.nix
+    ../upstart-jobs/openfire.nix
+    ../upstart-jobs/postfix.nix
+    ../upstart-jobs/dovecot.nix
+    ../upstart-jobs/bind.nix
+
+    ../upstart-jobs/mingetty.nix # The terminals on ttyX.
+    ../upstart-jobs/tty-backgrounds.nix
+
+    ../upstart-jobs/synergy.nix
+    ../upstart-jobs/openvpn.nix
+
+    ../upstart-jobs/nfs-kernel.nix
+    ../upstart-jobs/autofs.nix
 
     # nix
-    (import ../upstart-jobs/nix.nix) # nix options and daemon
-    (import ../system/nixos-installer.nix)
+    ../upstart-jobs/nix.nix # nix options and daemon
+    ../system/nixos-installer.nix
 
 
     #users
-    (import ../upstart-jobs/ldap)
+    ../upstart-jobs/ldap
 
 
 
     # fonts
-    (import ../system/fonts.nix)
+    ../system/fonts.nix
 
     # sound
-    (import ../upstart-jobs/alsa.nix)
+    ../upstart-jobs/alsa.nix
   ];
 }
diff --git a/system/sudo.nix b/system/sudo.nix
index c1a655e4557..3c2d2eff14d 100644
--- a/system/sudo.nix
+++ b/system/sudo.nix
@@ -52,10 +52,10 @@ mkIf cfg.enable {
     options
 
     # config.environment.etc
-    (import ../etc/default.nix)
+    ../etc/default.nix
 
-    # (import ?) # config.environment.extraPackages
-    # (import ?) # config.security.extraSetuidPrograms
+    # ? # config.environment.extraPackages
+    # ? # config.security.extraSetuidPrograms
   ];
 
   security = {
diff --git a/system/system-options.nix b/system/system-options.nix
index 81495f621e8..70346403119 100644
--- a/system/system-options.nix
+++ b/system/system-options.nix
@@ -84,7 +84,7 @@ in
     option
 
     # config.system.activationScripts
-    (import ../system/activate-configuration.nix)
+    ../system/activate-configuration.nix
   ];
 
   system = {
diff --git a/system/users-groups.nix b/system/users-groups.nix
index 5dec1f1d1b3..0ceff1eb5f6 100644
--- a/system/users-groups.nix
+++ b/system/users-groups.nix
@@ -153,7 +153,7 @@ in
     options
 
     # config.system.activationScripts
-    (import ../system/activate-configuration.nix)
+    ../system/activate-configuration.nix
   ];
 
   system = {
diff --git a/upstart-jobs/alsa.nix b/upstart-jobs/alsa.nix
index 406c63720f6..d5dd5bec0e4 100644
--- a/upstart-jobs/alsa.nix
+++ b/upstart-jobs/alsa.nix
@@ -72,9 +72,9 @@ in
 
 mkIf config.sound.enable {
   require = [
-    (import ../upstart-jobs/default.nix) # config.services.extraJobs
-    # (import ../system/user.nix) # users.*
-    # (import ?) # config.environment.extraPackages
+    ../upstart-jobs/default.nix # config.services.extraJobs
+    # ../system/user.nix # users.*
+    # ? # config.environment.extraPackages
     options
   ];
 
diff --git a/upstart-jobs/atd.nix b/upstart-jobs/atd.nix
index 3037ebb4ecd..60f1daf7949 100644
--- a/upstart-jobs/atd.nix
+++ b/upstart-jobs/atd.nix
@@ -95,16 +95,16 @@ mkIf cfg.enable {
     options
 
     # config.services.extraJobs
-    (import ../upstart-jobs/default.nix)
+    ../upstart-jobs/default.nix
 
     # config.environment.etc
-    (import ../etc/default.nix)
+    ../etc/default.nix
 
     # users.*
-    (import ../system/users-groups.nix)
+    ../system/users-groups.nix
 
-    # (import ?) # config.environment.extraPackages
-    # (import ?) # config.security.extraSetuidPrograms
+    # ? # config.environment.extraPackages
+    # ? # config.security.extraSetuidPrograms
   ];
 
   security = {
diff --git a/upstart-jobs/avahi-daemon.nix b/upstart-jobs/avahi-daemon.nix
index c9c027fefee..063b16b8f4d 100644
--- a/upstart-jobs/avahi-daemon.nix
+++ b/upstart-jobs/avahi-daemon.nix
@@ -120,13 +120,13 @@ in
 
 mkIf cfg.enable {
   require = [
-    (import ../upstart-jobs/default.nix) # config.services.extraJobs
-    # (import ../system/?) # system.nssModules
-    # (import ?) # config.environment.etc
-    # (import ../system/user.nix) # users.*
-    # (import ../upstart-jobs/udev.nix) # services.udev.*
-    (import ../upstart-jobs/dbus.nix) # services.dbus.*
-    # (import ?) # config.environment.extraPackages
+    ../upstart-jobs/default.nix # config.services.extraJobs
+    # ../system/? # system.nssModules
+    # ? # config.environment.etc
+    # ../system/user.nix # users.*
+    # ../upstart-jobs/udev.nix # services.udev.*
+    ../upstart-jobs/dbus.nix # services.dbus.*
+    # ? # config.environment.extraPackages
     options
   ];
 
diff --git a/upstart-jobs/consolekit.nix b/upstart-jobs/consolekit.nix
index ab847b45005..554d2c4cfb6 100644
--- a/upstart-jobs/consolekit.nix
+++ b/upstart-jobs/consolekit.nix
@@ -43,8 +43,8 @@ in
 
 mkIf cfg.enable {
   require = [
-    (import ../upstart-jobs/default.nix) # config.services.extraJobs
-    (import ../upstart-jobs/dbus.nix) # services.dbus.*
+    ../upstart-jobs/default.nix # config.services.extraJobs
+    ../upstart-jobs/dbus.nix # services.dbus.*
     options
   ];
 
diff --git a/upstart-jobs/cron.nix b/upstart-jobs/cron.nix
index 4eea169adb3..a73a7eefa00 100644
--- a/upstart-jobs/cron.nix
+++ b/upstart-jobs/cron.nix
@@ -54,11 +54,11 @@ in
 
 {
   require = [
-    (import ../upstart-jobs/default.nix) # config.services.extraJobs
-    # (import ?) # config.time.timeZone
-    # (import ?) # config.environment.etc
-    # (import ?) # config.environment.extraPackages
-    # (import ?) # config.environment.cleanStart
+    ../upstart-jobs/default.nix # config.services.extraJobs
+    # ? # config.time.timeZone
+    # ? # config.environment.etc
+    # ? # config.environment.extraPackages
+    # ? # config.environment.cleanStart
     options
   ];
 
diff --git a/upstart-jobs/cron/locate.nix b/upstart-jobs/cron/locate.nix
index eace9f5129b..bbb41f6e943 100644
--- a/upstart-jobs/cron/locate.nix
+++ b/upstart-jobs/cron/locate.nix
@@ -45,7 +45,7 @@ in
 
 {
   require = [
-    (import ../../upstart-jobs/cron.nix) # config.services.cron
+    ../../upstart-jobs/cron.nix # config.services.cron
     options
   ];
 
diff --git a/upstart-jobs/dbus.nix b/upstart-jobs/dbus.nix
index db8603547ff..6d67970576a 100644
--- a/upstart-jobs/dbus.nix
+++ b/upstart-jobs/dbus.nix
@@ -96,9 +96,9 @@ in
 
 mkIf cfg.enable {
   require = [
-    (import ../upstart-jobs/default.nix) # config.services.extraJobs
-    # (import ../system/user.nix) # users.*
-    # (import ?) # config.environment.extraPackages
+    ../upstart-jobs/default.nix # config.services.extraJobs
+    # ../system/user.nix # users.*
+    # ? # config.environment.extraPackages
     options
   ];
 
diff --git a/upstart-jobs/default.nix b/upstart-jobs/default.nix
index 57f0006eb8a..91f67f53b42 100644
--- a/upstart-jobs/default.nix
+++ b/upstart-jobs/default.nix
@@ -84,7 +84,7 @@ in
 {
   require = [
     options
-    (import ./lib/default.nix)
+    ./lib/default.nix
   ];
 
   environment = {
diff --git a/upstart-jobs/dhclient.nix b/upstart-jobs/dhclient.nix
index db1c948072c..ddf1bf9cffb 100644
--- a/upstart-jobs/dhclient.nix
+++ b/upstart-jobs/dhclient.nix
@@ -55,7 +55,7 @@ in
 
 {
   require = [
-    (import ../upstart-jobs/default.nix)
+    ../upstart-jobs/default.nix
     options
   ];
 
diff --git a/upstart-jobs/disnix.nix b/upstart-jobs/disnix.nix
index 624ad8a0fc7..cbca7af7f8f 100644
--- a/upstart-jobs/disnix.nix
+++ b/upstart-jobs/disnix.nix
@@ -48,8 +48,8 @@ in
 
 mkIf cfg.enable {
   require = [
-    (import ../upstart-jobs/default.nix)
-    (import ../upstart-jobs/dbus.nix) # services.dbus.*
+    ../upstart-jobs/default.nix
+    ../upstart-jobs/dbus.nix # services.dbus.*
     options
   ];
 
diff --git a/upstart-jobs/fcron.nix b/upstart-jobs/fcron.nix
index 5dd61e669d3..b05b9d8ab6a 100644
--- a/upstart-jobs/fcron.nix
+++ b/upstart-jobs/fcron.nix
@@ -79,11 +79,11 @@ in
 
 {
   require = [
-    # (import ../upstart-jobs/default.nix) # config.services.extraJobs
-    # (import ?) # config.time.timeZone
-    # (import ?) # config.environment.etc
-    # (import ?) # config.environment.extraPackages
-    # (import ?) # config.environment.cleanStart
+    # ../upstart-jobs/default.nix # config.services.extraJobs
+    # ? # config.time.timeZone
+    # ? # config.environment.etc
+    # ? # config.environment.extraPackages
+    # ? # config.environment.cleanStart
     options
   ];
 
diff --git a/upstart-jobs/gpm.nix b/upstart-jobs/gpm.nix
index 1247f1548f8..fb4f3be5890 100644
--- a/upstart-jobs/gpm.nix
+++ b/upstart-jobs/gpm.nix
@@ -47,7 +47,7 @@ in
 
 mkIf cfg.enable {
   require = [
-    (import ../upstart-jobs/default.nix) # config.services.extraJobs
+    ../upstart-jobs/default.nix # config.services.extraJobs
     # /etc/security/console.perms (should be generated ?)
     options
   ];
diff --git a/upstart-jobs/hal.nix b/upstart-jobs/hal.nix
index ba6f8b94049..ff667356e5d 100644
--- a/upstart-jobs/hal.nix
+++ b/upstart-jobs/hal.nix
@@ -64,11 +64,11 @@ in
 
 mkIf cfg.enable {
   require = [
-    (import ../upstart-jobs/default.nix) # config.services.extraJobs
-    # (import ../system/user.nix) # users.*
-    # (import ../upstart-jobs/udev.nix) # services.udev.*
-    (import ../upstart-jobs/dbus.nix) # services.dbus.*
-    # (import ?) # config.environment.extraPackages
+    ../upstart-jobs/default.nix # config.services.extraJobs
+    # ../system/user.nix # users.*
+    # ../upstart-jobs/udev.nix # services.udev.*
+    ../upstart-jobs/dbus.nix # services.dbus.*
+    # ? # config.environment.extraPackages
     options
   ];
 
diff --git a/upstart-jobs/nagios/default.nix b/upstart-jobs/nagios/default.nix
index 1b26231cf95..4bfbae4e413 100644
--- a/upstart-jobs/nagios/default.nix
+++ b/upstart-jobs/nagios/default.nix
@@ -175,11 +175,11 @@ in
 
 mkIf cfg.enable {
   require = [
-    (import ../../upstart-jobs/default.nix) # config.services.extraJobs
-    # (import ../../system/user.nix) # users = { .. }
-    # (import ?) # config.environment.etc
-    # (import ?) # config.environment.extraPackages
-    # (import ../../upstart-jobs/httpd.nix) # config.services.httpd
+    ../../upstart-jobs/default.nix # config.services.extraJobs
+    # ../../system/user.nix # users = { .. }
+    # ? # config.environment.etc
+    # ? # config.environment.extraPackages
+    # ../../upstart-jobs/httpd.nix # config.services.httpd
     options
   ];
 
diff --git a/upstart-jobs/pcmcia.nix b/upstart-jobs/pcmcia.nix
index dcf881470b9..62225a0df7a 100644
--- a/upstart-jobs/pcmcia.nix
+++ b/upstart-jobs/pcmcia.nix
@@ -48,8 +48,8 @@ in
 
 mkIf config.hardware.pcmcia.enable {
   require = [
-    # (import ../upstart-jobs/udev.nix)
-    # (import ?) # config.environment.extraPackages
+    # ../upstart-jobs/udev.nix
+    # ? # config.environment.extraPackages
     options
   ];
 
diff --git a/upstart-jobs/xserver/default.nix b/upstart-jobs/xserver/default.nix
index 80ea8c2a564..6cd6de2c5c9 100644
--- a/upstart-jobs/xserver/default.nix
+++ b/upstart-jobs/xserver/default.nix
@@ -472,18 +472,18 @@ mkIf cfg.enable {
     options
 
     # services.xserver.*Manager
-    (import ./displayManager/default.nix)
-    (import ./windowManager/default.nix)
-    (import ./desktopManager/default.nix)
+    ./displayManager/default.nix
+    ./windowManager/default.nix
+    ./desktopManager/default.nix
 
     # services.extraJobs
-    (import ../../upstart-jobs/default.nix)
+    ../../upstart-jobs/default.nix
 
     # environment.etc
-    (import ../../etc/default.nix)
+    ../../etc/default.nix
 
     # fonts.fonts
-    (import ../../system/fonts.nix)
+    ../../system/fonts.nix
 
     # boot.extraModulePackages
     # security.extraSetuidPrograms
diff --git a/upstart-jobs/xserver/desktopManager/default.nix b/upstart-jobs/xserver/desktopManager/default.nix
index f0355381233..9c4f9d92442 100644
--- a/upstart-jobs/xserver/desktopManager/default.nix
+++ b/upstart-jobs/xserver/desktopManager/default.nix
@@ -9,11 +9,11 @@ in
 
 {
   require = [
-    (import ./kde.nix)
-    (import ./kde4.nix)
-    (import ./gnome.nix)
-    (import ./xterm.nix)
-    (import ./none.nix)
+    ./kde.nix
+    ./kde4.nix
+    ./gnome.nix
+    ./xterm.nix
+    ./none.nix
   ];
 
   services = {
diff --git a/upstart-jobs/xserver/desktopManager/kde.nix b/upstart-jobs/xserver/desktopManager/kde.nix
index e2ff1294d9f..c9c1d239f43 100644
--- a/upstart-jobs/xserver/desktopManager/kde.nix
+++ b/upstart-jobs/xserver/desktopManager/kde.nix
@@ -23,7 +23,7 @@ mkIf cfg.enable {
     options
 
     # environment.kdePackages
-    (import ./kdeEnvironment.nix)
+    ./kdeEnvironment.nix
   ];
 
   services = {
diff --git a/upstart-jobs/xserver/desktopManager/kde4.nix b/upstart-jobs/xserver/desktopManager/kde4.nix
index 7deb4e056ac..c23fa163a39 100644
--- a/upstart-jobs/xserver/desktopManager/kde4.nix
+++ b/upstart-jobs/xserver/desktopManager/kde4.nix
@@ -23,7 +23,7 @@ mkIf cfg.enable {
     options
 
     # environment.kdePackages
-    (import ./kdeEnvironment.nix)
+    ./kdeEnvironment.nix
   ];
 
   services = {
diff --git a/upstart-jobs/xserver/displayManager/default.nix b/upstart-jobs/xserver/displayManager/default.nix
index af77247f6e6..83ccae7a41a 100644
--- a/upstart-jobs/xserver/displayManager/default.nix
+++ b/upstart-jobs/xserver/displayManager/default.nix
@@ -87,8 +87,8 @@ in
 {
   # list of display managers.
   require = [
-    (import ./kdm.nix)
-    (import ./slim.nix)
+    ./kdm.nix
+    ./slim.nix
   ];
 
   services = {
diff --git a/upstart-jobs/xserver/windowManager/default.nix b/upstart-jobs/xserver/windowManager/default.nix
index 5e33b58b3b1..0295d9893d8 100644
--- a/upstart-jobs/xserver/windowManager/default.nix
+++ b/upstart-jobs/xserver/windowManager/default.nix
@@ -7,13 +7,13 @@ in
 
 {
   require = [
-    (import ./compiz.nix)
-    (import ./kwm.nix)
-    (import ./metacity.nix)
-    (import ./none.nix)
-    (import ./twm.nix)
-    (import ./wmii.nix)
-    (import ./xmonad.nix)
+    ./compiz.nix
+    ./kwm.nix
+    ./metacity.nix
+    ./none.nix
+    ./twm.nix
+    ./wmii.nix
+    ./xmonad.nix
   ];
 
   services = {
diff --git a/upstart-jobs/zabbix-agent.nix b/upstart-jobs/zabbix-agent.nix
index 55a71619dcc..a310c12a50a 100644
--- a/upstart-jobs/zabbix-agent.nix
+++ b/upstart-jobs/zabbix-agent.nix
@@ -93,8 +93,8 @@ in
 
 {
   require = [
-    (import ../upstart-jobs/default.nix)
-    # (import ../system/user.nix) # users = { .. }
+    ../upstart-jobs/default.nix
+    # ../system/user.nix # users = { .. }
     options
   ];
 
diff --git a/upstart-jobs/zabbix-server.nix b/upstart-jobs/zabbix-server.nix
index e683b31ae61..bc083d03163 100644
--- a/upstart-jobs/zabbix-server.nix
+++ b/upstart-jobs/zabbix-server.nix
@@ -86,8 +86,8 @@ in
 
 {
   require = [
-    (import ../upstart-jobs/default.nix)
-    # (import ../system/user.nix) # users = { .. }
+    ../upstart-jobs/default.nix
+    # ../system/user.nix # users = { .. }
     options
   ];
 
-- 
GitLab


From 2dbc8d7549b628673324c2bd42d01c19fd3b1eda Mon Sep 17 00:00:00 2001
From: Marc Weber <marco-oweber@gmx.de>
Date: Tue, 19 May 2009 23:25:13 +0000
Subject: [PATCH 1467/5331] FullDepEntry -> fullDepEntry

svn path=/nixos/trunk/; revision=15661
---
 system/fontdir.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/system/fontdir.nix b/system/fontdir.nix
index 85227930988..8b8687cd5c9 100644
--- a/system/fontdir.nix
+++ b/system/fontdir.nix
@@ -5,7 +5,7 @@ args : with args; with builderDefs;
     buildInputs = [mkfontdir mkfontscale ttmkfdir];
     configureFlags = [];
     fontDirs = import ./fonts.nix {inherit pkgs config;};
-    installPhase = FullDepEntry ("
+    installPhase = fullDepEntry ("
     list='';
     for i in ${toString fontDirs} ; do
       if [ -d \$i/ ]; then
-- 
GitLab


From fe16ffc552b2607d1f641414cb2cbcd9b7fe19ea Mon Sep 17 00:00:00 2001
From: Marc Weber <marco-oweber@gmx.de>
Date: Tue, 19 May 2009 23:43:24 +0000
Subject: [PATCH 1468/5331] Synced with trunk @ 15633 (patch was merged
 previously)

svn path=/nixos/branches/modular-nixos/; revision=15664
-- 
GitLab


From 224931fc9c33e8b57484ca92550a7d8d9dff6fe4 Mon Sep 17 00:00:00 2001
From: Marc Weber <marco-oweber@gmx.de>
Date: Tue, 19 May 2009 23:46:25 +0000
Subject: [PATCH 1469/5331] Synced with trunk @ 15656

svn path=/nixos/branches/modular-nixos/; revision=15665
---
 upstart-jobs/ejabberd.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/upstart-jobs/ejabberd.nix b/upstart-jobs/ejabberd.nix
index 31cc0b7efad..b1f485cf1c8 100644
--- a/upstart-jobs/ejabberd.nix
+++ b/upstart-jobs/ejabberd.nix
@@ -74,7 +74,7 @@ mkIf config.services.ejabberd.enable {
               test -f ${cfg.confDir}/ejabberd.cfg || sed -e 's|{hosts, \["localhost"\]}.|{hosts, \[${cfg.virtualHosts}\]}.|' ${pkgs.ejabberd}/etc/ejabberd/ejabberd.cfg > ${cfg.confDir}/ejabberd.cfg
         end script
         
-        respawn ${pkgs.bash}/bin/sh -c 'export PATH=$PATH:${pkgs.ejabberd}/sbin; cd ~; ejabberdctl --logs ${cfg.logsDir} --spool ${cfg.spoolDir} --config ${cfg.confDir}/ejabberd.cfg start; sleep 1d'
+        respawn ${pkgs.bash}/bin/sh -c 'export PATH=$PATH:${pkgs.ejabberd}/sbin:${pkgs.coreutils}/bin:${pkgs.bash}/bin; cd ~; ejabberdctl --logs ${cfg.logsDir} --spool ${cfg.spoolDir} --config ${cfg.confDir}/ejabberd.cfg start; sleep 1d'
         
         stop script
             ${pkgs.ejabberd}/sbin/ejabberdctl stop
-- 
GitLab


From c2362f1bf1771cfcba53d99e33a88a3c74274ae0 Mon Sep 17 00:00:00 2001
From: Marc Weber <marco-oweber@gmx.de>
Date: Tue, 19 May 2009 23:51:13 +0000
Subject: [PATCH 1470/5331] Synced with trunk @ 15661

svn path=/nixos/branches/modular-nixos/; revision=15667
---
 etc/default.nix           |  4 ++--
 system/fonts.nix          |  2 +-
 system/system-options.nix | 22 +++++++++++-----------
 system/users-groups.nix   |  6 +++---
 4 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/etc/default.nix b/etc/default.nix
index 878bea7f795..2e180877fe7 100644
--- a/etc/default.nix
+++ b/etc/default.nix
@@ -227,7 +227,7 @@ let
 in
 
 let
-  inherit (pkgs.stringsWithDeps) noDepEntry FullDepEntry PackEntry;
+  inherit (pkgs.stringsWithDeps) noDepEntry fullDepEntry packEntry;
 
   activateLib = config.system.activationScripts.lib;
 
@@ -265,7 +265,7 @@ in
     };
 
     activationScripts = {
-      etc = FullDepEntry ''
+      etc = fullDepEntry ''
         # Set up the statically computed bits of /etc.
         staticEtc=/etc/static
         rm -f $staticEtc
diff --git a/system/fonts.nix b/system/fonts.nix
index 6afe44fe99a..4f540619a45 100644
--- a/system/fonts.nix
+++ b/system/fonts.nix
@@ -103,7 +103,7 @@ let
     buildInputs = [mkfontdir mkfontscale ttmkfdir];
     configureFlags = [];
     inherit fontDirs;
-    installPhase = FullDepEntry ("
+    installPhase = fullDepEntry ("
     list='';
     for i in ${toString fontDirs} ; do
       if [ -d \$i/ ]; then
diff --git a/system/system-options.nix b/system/system-options.nix
index 70346403119..4e778a7aad4 100644
--- a/system/system-options.nix
+++ b/system/system-options.nix
@@ -73,7 +73,7 @@ in
 
 ###### implementation
 let
-  inherit (pkgs.stringsWithDeps) noDepEntry FullDepEntry PackEntry;
+  inherit (pkgs.stringsWithDeps) noDepEntry fullDepEntry packEntry;
   inherit (pkgs.lib) mapRecordFlatten;
 
   activateLib = config.system.activationScripts.lib;
@@ -113,7 +113,7 @@ in
         done
       '';
 
-      stdio = FullDepEntry ''
+      stdio = fullDepEntry ''
         # Needed by some programs.
         ln -sfn /proc/self/fd /dev/fd
         ln -sfn /proc/self/fd/0 /dev/stdin
@@ -123,7 +123,7 @@ in
         activateLib.defaultPath # path to ln
       ];
 
-      binsh = FullDepEntry ''
+      binsh = fullDepEntry ''
         # Create the required /bin/sh symlink; otherwise lots of things
         # (notably the system() function) won't work.
         mkdir -m 0755 -p $mountPoint/bin
@@ -133,7 +133,7 @@ in
         activateLib.stdio # ?
       ];
 
-      modprobe = FullDepEntry ''
+      modprobe = fullDepEntry ''
         # Allow the kernel to find our wrapped modprobe (which searches in the
         # right location in the Nix store for kernel modules).  We need this
         # when the kernel (or some module) auto-loads a module.
@@ -144,7 +144,7 @@ in
         # ?
       ];
 
-      var = FullDepEntry ''
+      var = fullDepEntry ''
         # Various log/runtime directories.
         mkdir -m 0755 -p /var/run
         mkdir -m 0755 -p /var/run/console # for pam_console
@@ -172,7 +172,7 @@ in
         activateLib.defaultPath # path to mkdir & touch & chmod
       ];
 
-      rootPasswd = FullDepEntry ''
+      rootPasswd = fullDepEntry ''
         # If there is no password file yet, create a root account with an
         # empty password.
         if ! test -e /etc/passwd; then
@@ -192,7 +192,7 @@ in
         # ?
       ];
 
-      nix = FullDepEntry ''
+      nix = fullDepEntry ''
         # Set up Nix.
         mkdir -p /nix/etc/nix
         ln -sfn /etc/nix.conf /nix/etc/nix/nix.conf
@@ -221,7 +221,7 @@ in
         activateLib.users # nixbld group
       ];
 
-      path = FullDepEntry ''
+      path = fullDepEntry ''
         PATH=${config.system.path}/bin:${config.system.path}/sbin:$PATH
       '' [
         activateLib.defaultPath
@@ -249,7 +249,7 @@ in
             '')
             config.security.setuidOwners);
 
-        in FullDepEntry ''
+        in fullDepEntry ''
         # Make a few setuid programs work.
         save_PATH="$PATH"
 
@@ -284,7 +284,7 @@ in
         activateLib.users
       ];
 
-      hostname = FullDepEntry ''
+      hostname = fullDepEntry ''
         # Set the host name.  Don't clear it if it's not configured in the
         # NixOS configuration, since it may have been set by dhclient in the
         # meantime.
@@ -302,7 +302,7 @@ in
 
       # The activation have to be done at the end.  Therefore, this entry
       # depends on all scripts declared in the activation library.
-      activate = FullDepEntry ''
+      activate = fullDepEntry ''
         # Make this configuration the current configuration.
         # The readlink is there to ensure that when $systemConfig = /system
         # (which is a symlink to the store), /var/run/current-system is still
diff --git a/system/users-groups.nix b/system/users-groups.nix
index 0ceff1eb5f6..4e671ab26f8 100644
--- a/system/users-groups.nix
+++ b/system/users-groups.nix
@@ -140,7 +140,7 @@ let
 in
 
 let
-  inherit (pkgs.stringsWithDeps) FullDepEntry;
+  inherit (pkgs.stringsWithDeps) fullDepEntry;
 
   activateLib = config.system.activationScripts.lib;
 
@@ -159,7 +159,7 @@ in
   system = {
     activationScripts = {
 
-      users = FullDepEntry ''
+      users = fullDepEntry ''
         cat ${usersFile} | while true; do
             read name || break
             read description
@@ -206,7 +206,7 @@ in
         activateLib.groups
       ];
 
-      groups = FullDepEntry ''
+      groups = fullDepEntry ''
         while true; do
             read name || break
             read gid
-- 
GitLab


From eb91b2780914448c9ccf3a281da6c1bf3a6189d0 Mon Sep 17 00:00:00 2001
From: Marc Weber <marco-oweber@gmx.de>
Date: Wed, 20 May 2009 01:35:46 +0000
Subject: [PATCH 1471/5331] adoptadopt modular-nixos to stringsWithDeps changes
 in nixpkgs. You can boot again. Also simplified some small code pieces

svn path=/nixos/branches/modular-nixos/; revision=15668
---
 etc/default.nix                   |  8 +++---
 system/activate-configuration.nix | 31 ++++++++++-----------
 system/system-options.nix         | 45 ++++++++++++-------------------
 system/users-groups.nix           | 13 ++-------
 4 files changed, 36 insertions(+), 61 deletions(-)

diff --git a/etc/default.nix b/etc/default.nix
index 2e180877fe7..105d8f5fe5b 100644
--- a/etc/default.nix
+++ b/etc/default.nix
@@ -229,8 +229,6 @@ in
 let
   inherit (pkgs.stringsWithDeps) noDepEntry fullDepEntry packEntry;
 
-  activateLib = config.system.activationScripts.lib;
-
   copyScript = {source, target, mode ? "644", own ? "root.root"}:
     assert target != "nixos"; ''
     source="${source}"
@@ -295,9 +293,9 @@ in
             fi
         done
       '' [
-        activateLib.systemConfig
-        activateLib.defaultPath # path to cp, chmod, chown
-        activateLib.stdio
+        "systemConfig"
+        "defaultPath" # path to cp, chmod, chown
+        "stdio"
       ];
     };
   };
diff --git a/system/activate-configuration.nix b/system/activate-configuration.nix
index 7a61999ccf1..0db6f50e77c 100644
--- a/system/activate-configuration.nix
+++ b/system/activate-configuration.nix
@@ -4,24 +4,15 @@
 let
   inherit (pkgs.stringsWithDeps) textClosureMap noDepEntry;
   inherit (pkgs.lib) mkOption mergeTypedOption mergeAttrs mapRecordFlatten
-    mapAttrs addErrorContext fold id;
+    mapAttrs addErrorContext fold id filter;
+  inherit (builtins) attrNames;
 
-  textClosure = steps:
-    textClosureMap id steps (
-       [(noDepEntry "#!/bin/sh")]
-    ++ (mapRecordFlatten (a: v: v) steps)
-    );
-
-  aggregateScripts = name: steps:
-    pkgs.writeScript name (textClosure steps);
-
-  addAttributeName = mapAttrs (a: v: {
+  addAttributeName = mapAttrs (a: v: v // {
       text = ''
-        #### ${a} begin
+        #### actionScripts snippet ${a} :
+        #    ========================================
         ${v.text}
-        #### ${a} end
       '';
-      inherit (v) deps;
     });
 in
 
@@ -47,9 +38,15 @@ in
       '';
       merge = mergeTypedOption "script" builtins.isAttrs (fold mergeAttrs {});
       apply = set:
-        let lib = addAttributeName set; in {
-        inherit lib; # used to fetch dependencies.
-        script = aggregateScripts "activationScript" lib;
+        let withHeadlines = addAttributeName set;
+            activateLib = removeAttrs withHeadlines ["activate"];
+            activateLibNames = attrNames activateLib;
+        in {
+        script = pkgs.writeScript "activationScript"
+          ("#!/bin/sh\n"
+           + textClosureMap id activateLib activateLibNames + "\n"
+             # make sure that the activate snippet is added last.
+           + withHeadlines.activate.text);
       };
     };
   };
diff --git a/system/system-options.nix b/system/system-options.nix
index 4e778a7aad4..c8284a0831b 100644
--- a/system/system-options.nix
+++ b/system/system-options.nix
@@ -76,7 +76,6 @@ let
   inherit (pkgs.stringsWithDeps) noDepEntry fullDepEntry packEntry;
   inherit (pkgs.lib) mapRecordFlatten;
 
-  activateLib = config.system.activationScripts.lib;
 in
 
 {
@@ -120,7 +119,7 @@ in
         ln -sfn /proc/self/fd/1 /dev/stdout
         ln -sfn /proc/self/fd/2 /dev/stderr
       '' [
-        activateLib.defaultPath # path to ln
+        "defaultPath" # path to ln
       ];
 
       binsh = fullDepEntry ''
@@ -129,8 +128,8 @@ in
         mkdir -m 0755 -p $mountPoint/bin
         ln -sfn ${config.system.build.binsh}/bin/sh $mountPoint/bin/sh
       '' [
-        activateLib.defaultPath # path to ln & mkdir
-        activateLib.stdio # ?
+        "defaultPath" # path to ln & mkdir
+        "stdio" # ?
       ];
 
       modprobe = fullDepEntry ''
@@ -169,7 +168,7 @@ in
         # Empty, read-only home directory of many system accounts.
         mkdir -m 0555 -p /var/empty
       '' [
-        activateLib.defaultPath # path to mkdir & touch & chmod
+        "defaultPath" # path to mkdir & touch & chmod
       ];
 
       rootPasswd = fullDepEntry ''
@@ -187,8 +186,8 @@ in
             echo | passwd --stdin root
         fi
       '' [
-        activateLib.defaultPath # path to touch & passwd
-        activateLib.etc # for /etc
+        "defaultPath" # path to touch & passwd
+        "etc" # for /etc
         # ?
       ];
 
@@ -216,16 +215,14 @@ in
         ln -sf /nix/var/nix/profiles /nix/var/nix/gcroots/
         ln -sf /nix/var/nix/manifests /nix/var/nix/gcroots/
       '' [
-        activateLib.defaultPath
-        activateLib.etc # /etc/nix.conf
-        activateLib.users # nixbld group
+        "defaultPath"
+        "etc" # /etc/nix.conf
+        "users" # nixbld group
       ];
 
       path = fullDepEntry ''
         PATH=${config.system.path}/bin:${config.system.path}/sbin:$PATH
-      '' [
-        activateLib.defaultPath
-      ];
+      '' [ "defaultPath" ];
 
       setuid =
         let
@@ -279,10 +276,7 @@ in
         ${adjustSetuidOwner}
 
         PATH="$save_PATH"
-      '' [
-        activateLib.path
-        activateLib.users
-      ];
+      '' [ "path" "users" ];
 
       hostname = fullDepEntry ''
         # Set the host name.  Don't clear it if it's not configured in the
@@ -296,13 +290,11 @@ in
               hostname ""
             fi
         ''}
-      '' [
-        activateLib.path
-      ];
+      '' [ "path" ];
 
-      # The activation have to be done at the end.  Therefore, this entry
-      # depends on all scripts declared in the activation library.
-      activate = fullDepEntry ''
+      # The activation has to be done at the end. This is forced at the apply
+      # function of activationScripts option
+      activate = noDepEntry ''
         # Make this configuration the current configuration.
         # The readlink is there to ensure that when $systemConfig = /system
         # (which is a symlink to the store), /var/run/current-system is still
@@ -310,11 +302,8 @@ in
         ln -sfn "$(readlink -f "$systemConfig")" /var/run/current-system
 
         # Prevent the current configuration from being garbage-collected.
-        ln -sfn /var/run/current-system /nix/var/nix/gcroots/current-system
-      '' (mapRecordFlatten (a: v: v)
-        # should be removed if this does not cause an infinite recursion.
-        (activateLib // { activate = { text = ""; deps = []; }; })
-      );
+       ln -sfn /var/run/current-system /nix/var/nix/gcroots/current-system
+      '';
     };
   };
 }
diff --git a/system/users-groups.nix b/system/users-groups.nix
index 4e671ab26f8..ecaba8922f1 100644
--- a/system/users-groups.nix
+++ b/system/users-groups.nix
@@ -142,8 +142,6 @@ in
 let
   inherit (pkgs.stringsWithDeps) fullDepEntry;
 
-  activateLib = config.system.activationScripts.lib;
-
   # keep this extra file so that cat can be used to pass special chars such as "`" which is used in the avahi daemon
   usersFile = pkgs.writeText "users" (concatStringsSep "\n" (map serializedUser users));
 in
@@ -202,9 +200,7 @@ in
                     --shell "$shell"
             fi
         done
-      '' [
-        activateLib.groups
-      ];
+      '' [ "groups" ];
 
       groups = fullDepEntry ''
         while true; do
@@ -227,12 +223,7 @@ in
         done <<EndOfGroupList
         ${concatStringsSep "\n" (map serializedGroup groups)}
         EndOfGroupList
-      '' [
-        activateLib.rootPasswd
-        activateLib.binsh
-        activateLib.etc
-        activateLib.var
-      ];
+      '' [ "rootPasswd" "binsh" "etc" "var" ];
 
     };
   };
-- 
GitLab


From 0792719b909f1a8f62842a8affb105fcf887c95c Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 20 May 2009 10:16:13 +0000
Subject: [PATCH 1472/5331] * Urgh, forgot to commit.

svn path=/nixos/trunk/; revision=15669
---
 system/system.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/system/system.nix b/system/system.nix
index b42ef8b5353..d336eb81305 100644
--- a/system/system.nix
+++ b/system/system.nix
@@ -17,7 +17,7 @@ rec {
   # values.
   config =
     pkgs.lib.fixOptionSets
-      (pkgs.lib.mergeOptionSets noOption)
+      pkgs.lib.mergeOptionSets
       pkgs configComponents;
 
   optionDeclarations =
-- 
GitLab


From f99fe41f65911e7123cb9e32ac62bb7acb77b08d Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 20 May 2009 10:18:54 +0000
Subject: [PATCH 1473/5331] svn path=/nixos/branches/modular-nixos/;
 revision=15670

---
 default.nix           | 4 +++-
 upstart-jobs/sshd.nix | 1 +
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/default.nix b/default.nix
index 6dca88241a5..9dd73430b66 100644
--- a/default.nix
+++ b/default.nix
@@ -3,8 +3,10 @@ let
   fromEnv = name: default:
     let env = builtins.getEnv name; in
     if env == "" then default else env;
+    
   configuration = import (fromEnv "NIXOS_CONFIG" /etc/nixos/configuration.nix);
-  nixpkgs   =         fromEnv "NIXPKGS"      /etc/nixos/nixpkgs;
+  
+  nixpkgs = fromEnv "NIXPKGS" /etc/nixos/nixpkgs;
 
   system = import system/system.nix { inherit configuration nixpkgs; };
 
diff --git a/upstart-jobs/sshd.nix b/upstart-jobs/sshd.nix
index d6c06b24f7e..38ccb2c19a1 100644
--- a/upstart-jobs/sshd.nix
+++ b/upstart-jobs/sshd.nix
@@ -87,6 +87,7 @@ let
 
   sshdUid = (import ../system/ids.nix).uids.sshd;
 
+  # !!! is this assertion evaluated anywhere???
   assertion = cfg.permitRootLogin == "yes" ||
        cfg.permitRootLogin == "without-password" ||
        cfg.permitRootLogin == "forced-commands-only" ||
-- 
GitLab


From be85fd25006fe008d6009ac510aceabfb330ad89 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 20 May 2009 10:44:50 +0000
Subject: [PATCH 1474/5331] * "hardware" belongs in the NixOS tree, not in the
 configurations   tree.  (The configurations tree is not for general use.)

svn path=/nixos/branches/modular-nixos/; revision=15672
---
 modules/hardware/network/Intel2200BG.nix      | 11 ++++++++
 modules/hardware/network/Intel3945ABG.nix     | 21 ++++++++++++++++
 modules/hardware/network/Intel4965AGN.nix     | 21 ++++++++++++++++
 modules/hardware/network/SMC2632W/default.nix |  9 +++++++
 .../SMC2632W/firmware/cis/SMC2632W-v1.02.cis  |  8 ++++++
 modules/hardware/network/ZydasZD1211.nix      |  9 +++++++
 modules/hardware/video/encoder/Go7007.nix     | 25 +++++++++++++++++++
 7 files changed, 104 insertions(+)
 create mode 100644 modules/hardware/network/Intel2200BG.nix
 create mode 100644 modules/hardware/network/Intel3945ABG.nix
 create mode 100644 modules/hardware/network/Intel4965AGN.nix
 create mode 100644 modules/hardware/network/SMC2632W/default.nix
 create mode 100644 modules/hardware/network/SMC2632W/firmware/cis/SMC2632W-v1.02.cis
 create mode 100644 modules/hardware/network/ZydasZD1211.nix
 create mode 100644 modules/hardware/video/encoder/Go7007.nix

diff --git a/modules/hardware/network/Intel2200BG.nix b/modules/hardware/network/Intel2200BG.nix
new file mode 100644
index 00000000000..a9069da1e94
--- /dev/null
+++ b/modules/hardware/network/Intel2200BG.nix
@@ -0,0 +1,11 @@
+{pkgs, config, ...}:
+
+{
+  services = {
+    udev = {
+      # Warning: setting this option requires acceptance of the firmware
+      # license, see http://ipw2200.sourceforge.net/firmware.php?fid=7.
+      addFirmware = [ pkgs.ipw2200fw ];
+    };
+  };
+}
\ No newline at end of file
diff --git a/modules/hardware/network/Intel3945ABG.nix b/modules/hardware/network/Intel3945ABG.nix
new file mode 100644
index 00000000000..5ba3a1c0263
--- /dev/null
+++ b/modules/hardware/network/Intel3945ABG.nix
@@ -0,0 +1,21 @@
+{pkgs, config, ...}:
+
+let
+  inherit (config.boot) kernelPackages;
+  inherit (kernelPackages) kernel;
+in
+
+{
+  boot = {
+    extraModulePackages =
+      pkgs.lib.optional
+        (!kernel.features ? iwlwifi)
+        kernelPackages.iwlwifi;
+  };
+
+  services = {
+    udev = {
+      addFirmware = [ pkgs.iwlwifi3945ucode ];
+    };
+  };
+}
diff --git a/modules/hardware/network/Intel4965AGN.nix b/modules/hardware/network/Intel4965AGN.nix
new file mode 100644
index 00000000000..e31d8902798
--- /dev/null
+++ b/modules/hardware/network/Intel4965AGN.nix
@@ -0,0 +1,21 @@
+{pkgs, config, ...}:
+
+let
+  inherit (config.boot) kernelPackages;
+  inherit (kernelPackages) kernel;
+in
+
+{
+  boot = {
+    extraModulePackages =
+      pkgs.lib.optional
+        (!kernel.features ? iwlwifi)
+        kernelPackages.iwlwifi;
+  };
+
+  services = {
+    udev = {
+      addFirmware = [ pkgs.iwlwifi4965ucode ];
+    };
+  };
+}
diff --git a/modules/hardware/network/SMC2632W/default.nix b/modules/hardware/network/SMC2632W/default.nix
new file mode 100644
index 00000000000..318131be749
--- /dev/null
+++ b/modules/hardware/network/SMC2632W/default.nix
@@ -0,0 +1,9 @@
+{pkgs, config, ...}:
+
+{
+  hardware = {
+    pcmcia = {
+      firmware = [ (pkgs.lib.cleanSource ./firmware) ];
+    };
+  };
+}
diff --git a/modules/hardware/network/SMC2632W/firmware/cis/SMC2632W-v1.02.cis b/modules/hardware/network/SMC2632W/firmware/cis/SMC2632W-v1.02.cis
new file mode 100644
index 00000000000..5f13088c373
--- /dev/null
+++ b/modules/hardware/network/SMC2632W/firmware/cis/SMC2632W-v1.02.cis
@@ -0,0 +1,8 @@
+  vers_1 5.0, "SMC", "SMC2632W", "Version 01.02", ""
+  manfid 0x0156, 0x0002
+  funcid network_adapter
+  cftable_entry 0x01 [default]
+    Vcc Vmin 3000mV Vmax 3300mV Iavg 300mA Ipeak 300mA
+    Idown 10mA
+    io 0x0000-0x003f [lines=6] [16bit]
+    irq mask 0xffff [level] [pulse]
diff --git a/modules/hardware/network/ZydasZD1211.nix b/modules/hardware/network/ZydasZD1211.nix
new file mode 100644
index 00000000000..a57e8a6cf95
--- /dev/null
+++ b/modules/hardware/network/ZydasZD1211.nix
@@ -0,0 +1,9 @@
+{pkgs, config, ...}:
+
+{
+  services = {
+    udev = {
+      addFirmware = [ pkgs.zd1211fw ];
+    };
+  };
+}
diff --git a/modules/hardware/video/encoder/Go7007.nix b/modules/hardware/video/encoder/Go7007.nix
new file mode 100644
index 00000000000..24ee27cf61d
--- /dev/null
+++ b/modules/hardware/video/encoder/Go7007.nix
@@ -0,0 +1,25 @@
+{pkgs, config, ...}:
+
+let
+  wisGo7007 = config.boot.kernelPackages.wis_go7007;
+
+  wisGo7007Pkg = [ wis_go7007 ];
+  wisGo7007Firmware = [ "${wis_go7007}/firmware" ];
+in
+
+{
+  boot = {
+    extraModulePackages = wisGo7007Pkg;
+  };
+
+  environment = {
+    extraPackages = wisGo7007Pkg;
+  };
+
+  services = {
+    udev = {
+      addFirmware = wisGo7007Firmware;
+      addUdevPkgs = wisGo7007Pkg;
+    };
+  };
+}
-- 
GitLab


From 72e4b7e18d7bd2427c1fe27b3c4c2846e2576360 Mon Sep 17 00:00:00 2001
From: Nicolas Pierron <nicolas.b.pierron@gmail.com>
Date: Wed, 20 May 2009 15:43:22 +0000
Subject: [PATCH 1475/5331] fix documentation issue: ${map} in a quoted-quote
 is not escaped as expected.

svn path=/nixos/branches/modular-nixos/; revision=15676
---
 upstart-jobs/autofs.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/upstart-jobs/autofs.nix b/upstart-jobs/autofs.nix
index c7b436cb358..1e506836a3e 100644
--- a/upstart-jobs/autofs.nix
+++ b/upstart-jobs/autofs.nix
@@ -18,7 +18,7 @@ let
         autoMaster = mkOption {
           example = ''
             autoMaster = let
-              map = pkgs.writeText "auto" '''
+              mapConf = pkgs.writeText "auto" '''
                kernel    -ro,soft,intr       ftp.kernel.org:/pub/linux
                boot      -fstype=ext2        :/dev/hda1
                windoze   -fstype=smbfs       ://windoze/c
@@ -30,7 +30,7 @@ let
                                              /home myserver.me.org:/home
               ''';
             in '''
-              /auto file:${map}
+              /auto file:''${mapConf}
             '''
           '';
           description = "
-- 
GitLab


From 91387275ee0fa9b209a6b4e81ee2a1a99d49f1eb Mon Sep 17 00:00:00 2001
From: Nicolas Pierron <nicolas.b.pierron@gmail.com>
Date: Wed, 20 May 2009 15:43:31 +0000
Subject: [PATCH 1476/5331] Remove unused require.

svn path=/nixos/branches/modular-nixos/; revision=15677
---
 system/nixos-security.nix | 80 +++++++++++++++++++--------------------
 1 file changed, 39 insertions(+), 41 deletions(-)

diff --git a/system/nixos-security.nix b/system/nixos-security.nix
index 10d523ee339..367a6d172c1 100644
--- a/system/nixos-security.nix
+++ b/system/nixos-security.nix
@@ -1,49 +1,47 @@
 {pkgs, config, ...}:
+
 let
   inherit (pkgs.lib) mergeOneOption mkOption mkIf;
 in
+
 {
-  require = [
-    {
-      security = {
-        setuidPrograms = mkOption {
-          default = [
-            "passwd" "su" "crontab" "ping" "ping6"
-            "fusermount" "wodim" "cdrdao" "growisofs"
-          ];
-          description = "
-            Only the programs from system path listed her will be made setuid root
-            (through a wrapper program).  It's better to set
-            <option>security.extraSetuidPrograms</option>.
-          ";
-        };
+  security = {
+    setuidPrograms = mkOption {
+      default = [
+        "passwd" "su" "crontab" "ping" "ping6"
+        "fusermount" "wodim" "cdrdao" "growisofs"
+      ];
+      description = "
+        Only the programs from system path listed her will be made setuid root
+        (through a wrapper program).  It's better to set
+        <option>security.extraSetuidPrograms</option>.
+      ";
+    };
 
-        extraSetuidPrograms = mkOption {
-          default = [];
-          example = ["fusermount"];
-          description = "
-            This option lists additional programs that must be made setuid
-            root.
-          ";
-        };
+    extraSetuidPrograms = mkOption {
+      default = [];
+      example = ["fusermount"];
+      description = "
+        This option lists additional programs that must be made setuid
+        root.
+      ";
+    };
 
-        setuidOwners = mkOption {
-          default = [];
-          example = [{
-            program = "sendmail";
-            owner = "nodody";
-            group = "postdrop";
-            setuid = false;
-            setgid = true;
-          }];
-          description = ''
-            List of non-trivial setuid programs from system path, like Postfix sendmail. Default 
-            should probably be nobody:nogroup:false:false - if you are bothering
-            doing anything with a setuid program, "root.root u+s g-s" is not what
-            you are aiming at..
-          '';
-        };
-      };
-    }
-  ];
+    setuidOwners = mkOption {
+      default = [];
+      example = [{
+        program = "sendmail";
+        owner = "nodody";
+        group = "postdrop";
+        setuid = false;
+        setgid = true;
+      }];
+      description = ''
+        List of non-trivial setuid programs from system path, like Postfix sendmail. Default 
+        should probably be nobody:nogroup:false:false - if you are bothering
+        doing anything with a setuid program, "root.root u+s g-s" is not what
+        you are aiming at..
+      '';
+    };
+  };
 }
-- 
GitLab


From e563c97ceb7ca45861ecbe4864d82926fdb50538 Mon Sep 17 00:00:00 2001
From: Nicolas Pierron <nicolas.b.pierron@gmail.com>
Date: Wed, 20 May 2009 15:43:43 +0000
Subject: [PATCH 1477/5331] Add support for Hal FDI extensions.  This should be
 helpful to change keymap inside the X server.

svn path=/nixos/branches/modular-nixos/; revision=15678
---
 upstart-jobs/hal.nix | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/upstart-jobs/hal.nix b/upstart-jobs/hal.nix
index ff667356e5d..d9e53a268e7 100644
--- a/upstart-jobs/hal.nix
+++ b/upstart-jobs/hal.nix
@@ -14,6 +14,14 @@ let
             Whether to start the HAL daemon.
           ";
         };
+
+        extraFdi = mkOption {
+          default = [];
+          example = [ "/nix/store/.../fdi" ];
+          description = "
+            Extend HAL daemon configuration with additionnal paths.
+          ";
+        };
       };
     };
   };
@@ -37,6 +45,15 @@ let
     gid = (import ../system/ids.nix).gids.haldaemon;
   };
 
+  fdi =
+    if cfg.extraFdi == [] then
+      hal + "/share/hal/fdi"
+    else
+      pkgs.buildEnv {
+        name = "hal-fdi";
+        pathsToLink = [ "/preprobe" "/information" "/policy" ];
+        paths = [ (hal + "/share/hal/fdi") ] ++ cfg.extraFdi;
+      };
 
   job = {
     name = "hal";
@@ -57,6 +74,12 @@ let
 
       end script
 
+      # HACK ? These environment variables manipulated inside
+      # 'src'/hald/mmap_cache.c are used for testing the daemon
+      env HAL_FDI_SOURCE_PREPROBE=${fdi}/preprobe
+      env HAL_FDI_SOURCE_INFORMATION=${fdi}/information
+      env HAL_FDI_SOURCE_POLICY=${fdi}/policy
+
       respawn ${hal}/sbin/hald --daemon=no
     '';
   };
-- 
GitLab


From 6b2f1a0ce9605cf77e1b20dc00c1e4e54261551f Mon Sep 17 00:00:00 2001
From: Marc Weber <marco-oweber@gmx.de>
Date: Sun, 24 May 2009 10:58:24 +0000
Subject: [PATCH 1478/5331] lib.getAttr -> lib.attrByPath

svn path=/nixos/trunk/; revision=15695
---
 upstart-jobs/apache-httpd/default.nix  | 2 +-
 upstart-jobs/default.nix               | 8 ++++----
 upstart-jobs/kdm.nix                   | 8 ++++----
 upstart-jobs/new-proposal/tightvnc.nix | 2 +-
 upstart-jobs/xserver.nix               | 8 ++++----
 5 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/upstart-jobs/apache-httpd/default.nix b/upstart-jobs/apache-httpd/default.nix
index ee15dc06f01..20eda6ecaac 100644
--- a/upstart-jobs/apache-httpd/default.nix
+++ b/upstart-jobs/apache-httpd/default.nix
@@ -13,7 +13,7 @@ let
 
   getPort = cfg: if cfg.port != 0 then cfg.port else if cfg.enableSSL then 443 else 80;
 
-  extraModules = pkgs.lib.getAttr ["extraModules"] [] mainCfg;
+  extraModules = pkgs.lib.attrByPath ["extraModules"] [] mainCfg;
   extraForeignModules = pkgs.lib.filter builtins.isAttrs extraModules;
   extraApachaModules = pkgs.lib.filter (x :! (builtins.isAttrs x)) extraModules; # I'd prefer using builtins.isString here, but doesn't exist yet
 
diff --git a/upstart-jobs/default.nix b/upstart-jobs/default.nix
index 411fc526d41..2216a564963 100644
--- a/upstart-jobs/default.nix
+++ b/upstart-jobs/default.nix
@@ -23,14 +23,14 @@ let
   newProposalJobs =
   (
   let
-    inherit (pkgs.lib) getAttr; 
+    inherit (pkgs.lib) attrByPath; 
     inherit (builtins) attrNames pathExists map;
-    services = getAttr [ "servicesProposal" ] {} config;
+    services = attrByPath [ "servicesProposal" ] {} config;
     nameToJobs = name : (
       (
       let p = ./new-proposal + "/${name}.nix";
           p2 = ./new-proposal + "/${name}/default.nix";
-          thisConfig = getAttr [ name ] {} services;
+          thisConfig = attrByPath [ name ] {} services;
           path = [name];
           args = confgiV : {
             inherit config pkgs thisConfig path;
@@ -60,7 +60,7 @@ let
                                 then let v = (__getAttr name thisConfig); in if opt ? apply then opt.apply v else v
                                 else if opt ? default then opt.default else abort "you need to specify the configuration option ${errorWhere name}"
                            else abort "unkown option ${errorWhere name}";
-          checkConfig = (pkgs.lib.getAttr ["environment" "checkConfigurationOptions"] 
+          checkConfig = (attrByPath ["environment" "checkConfigurationOptions"] 
                   optionDeclarations.environment.checkConfigurationOptions.default
                   config);
       in # TODO: pass path to checker so it can show full path in the abort case
diff --git a/upstart-jobs/kdm.nix b/upstart-jobs/kdm.nix
index 2d93ee2cd55..ec0e2164b85 100644
--- a/upstart-jobs/kdm.nix
+++ b/upstart-jobs/kdm.nix
@@ -5,7 +5,7 @@ let
   cfg = config.services.xserver;
   xorg = cfg.package;
   
-  inherit (pkgs.lib) optional isInList getAttr;
+  inherit (pkgs.lib) optional isInList attrByPath;
   stdenv = pkgs.stdenv;
   
   knownVideoDrivers = {
@@ -26,17 +26,17 @@ let
   resolutions = map (res: ''"${toString res.x}x${toString res.y}"'') (cfg.resolutions);
   sessionType = cfg.sessionType;
 
-  videoDriverModules = getAttr [ videoDriver ] (throw "unknown video driver: `${videoDriver}'") knownVideoDrivers;
+  videoDriverModules = attrByPath [ videoDriver ] (throw "unknown video driver: `${videoDriver}'") knownVideoDrivers;
 
   modules = 
 
-    getAttr ["modulesFirst"] [] videoDriverModules
+    attrByPath ["modulesFirst"] [] videoDriverModules
     ++ [
       xorg.xorgserver
       xorg.xf86inputkeyboard
       xorg.xf86inputmouse
     ] 
-    ++ getAttr ["modules"] [] videoDriverModules
+    ++ attrByPath ["modules"] [] videoDriverModules
     ++ (optional cfg.synaptics.enable ["${pkgs.synaptics}/${xorg.xorgserver}" /*xorg.xf86inputevdev*/]);
 
 
diff --git a/upstart-jobs/new-proposal/tightvnc.nix b/upstart-jobs/new-proposal/tightvnc.nix
index 054828a5230..342910fc886 100644
--- a/upstart-jobs/new-proposal/tightvnc.nix
+++ b/upstart-jobs/new-proposal/tightvnc.nix
@@ -70,7 +70,7 @@
     };
   };
 
-  jobs = if (lib.getAttr ["services" "xfs" "enable"] false config) != true
+  jobs = if (lib.attrByPath ["services" "xfs" "enable"] false config) != true
     then abort "you need to enable xfs services = { xfs = { enable = true; }; } within your nixos/configuration.nix file"
     else
     [ ( rec {
diff --git a/upstart-jobs/xserver.nix b/upstart-jobs/xserver.nix
index 775b7524743..105b79ef118 100644
--- a/upstart-jobs/xserver.nix
+++ b/upstart-jobs/xserver.nix
@@ -6,7 +6,7 @@
 
 let
 
-  inherit (pkgs.lib) optional isInList getAttr;
+  inherit (pkgs.lib) optional isInList attrByPath;
   
   # Abbreviations.
   cfg = config.services.xserver;
@@ -32,7 +32,7 @@ let
   resolutions = map (res: ''"${toString res.x}x${toString res.y}"'') (cfg.resolutions);
   sessionType = cfg.sessionType;
 
-  videoDriverModules = getAttr [ videoDriver ] (throw "unknown video driver: `${videoDriver}'") knownVideoDrivers;
+  videoDriverModules = attrByPath [ videoDriver ] (throw "unknown video driver: `${videoDriver}'") knownVideoDrivers;
 
   
   sessionCmd =
@@ -52,12 +52,12 @@ let
 
     
   modules = 
-    getAttr ["modulesFirst"] [] videoDriverModules
+    attrByPath ["modulesFirst"] [] videoDriverModules
     ++ [
       xorg.xorgserver
       xorg.xf86inputevdev
     ]
-    ++ getAttr ["modules"] [] videoDriverModules
+    ++ attrByPath ["modules"] [] videoDriverModules
     ++ (optional cfg.synaptics.enable ["${xorg.xf86inputsynaptics}"]);
 
 
-- 
GitLab


From dafb4b8c5d52132f25504308e16be753f193e68c Mon Sep 17 00:00:00 2001
From: Marc Weber <marco-oweber@gmx.de>
Date: Sun, 24 May 2009 10:58:28 +0000
Subject: [PATCH 1479/5331] removed all __primops from nixos

svn path=/nixos/trunk/; revision=15696
---
 upstart-jobs/default.nix               | 10 +++++-----
 upstart-jobs/new-proposal/tightvnc.nix | 10 ++++++----
 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/upstart-jobs/default.nix b/upstart-jobs/default.nix
index 2216a564963..47356114788 100644
--- a/upstart-jobs/default.nix
+++ b/upstart-jobs/default.nix
@@ -24,7 +24,7 @@ let
   (
   let
     inherit (pkgs.lib) attrByPath; 
-    inherit (builtins) attrNames pathExists map;
+    inherit (builtins) attrNames pathExists map hasAttr getAttr;
     services = attrByPath [ "servicesProposal" ] {} config;
     nameToJobs = name : (
       (
@@ -54,10 +54,10 @@ let
                         else abort "service ${name} requested but there is no ${p}.nix or ${p}/default.nix file!";
           options = (jobFunc (args (abort "you can't use configV within options!"))).options;
           errorWhere = name : "${name} of service ${builtins.toString path}";
-          configV = name : if (__hasAttr name options ) then
-                             let opt = (__getAttr name options ); # this config option description
-                             in if (__hasAttr name thisConfig )
-                                then let v = (__getAttr name thisConfig); in if opt ? apply then opt.apply v else v
+          configV = name : if (hasAttr name options ) then
+                             let opt = (getAttr name options ); # this config option description
+                             in if (hasAttr name thisConfig )
+                                then let v = (getAttr name thisConfig); in if opt ? apply then opt.apply v else v
                                 else if opt ? default then opt.default else abort "you need to specify the configuration option ${errorWhere name}"
                            else abort "unkown option ${errorWhere name}";
           checkConfig = (attrByPath ["environment" "checkConfigurationOptions"] 
diff --git a/upstart-jobs/new-proposal/tightvnc.nix b/upstart-jobs/new-proposal/tightvnc.nix
index 342910fc886..b1f8e084810 100644
--- a/upstart-jobs/new-proposal/tightvnc.nix
+++ b/upstart-jobs/new-proposal/tightvnc.nix
@@ -1,4 +1,6 @@
-{ path, thisConfig, config, lib, pkgs, upstartHelpers } : with upstartHelpers; rec {
+{ path, thisConfig, config, lib, pkgs, upstartHelpers } : with upstartHelpers;
+let inherit (builtins) lessThan pathExists attrNames; in
+rec {
   options = {
     description = "tightvnc vnc server (share virtual desktop over network";
 
@@ -18,7 +20,7 @@
         value must be something between 8 and 32
         '';
       apply = x: "-depth '${x}'";
-      check = x: (__lessThan x 33) && (7 __lessThan x); # not yet used
+      check = x: (lessThan x 33) && (7 lessThan x); # not yet used
     };
     display = mkOption {
       default = ":8";
@@ -33,7 +35,7 @@
         Can be created using vncpasswd
       '';
       apply = x: "-auth '${x}'";
-      check = __pathExists;
+      check = pathExists;
     };
     httpPort = mkOption {
       default = "-httpport 5900";
@@ -82,7 +84,7 @@ description \"${name}\"
 start on network-interfaces/started and xserver/started
 stop on network-interfaces/stop or xserver/stop
 
-exec ${pkgs.tightvnc}/bin/Xvnc -fp unix/:7100 ${lib.concatStringsSep " " (lib.mapIf (x : x != "description") configV (__attrNames options ) ) }
+exec ${pkgs.tightvnc}/bin/Xvnc -fp unix/:7100 ${lib.concatStringsSep " " (lib.mapIf (x : x != "description") configV (attrNames options ) ) }
   ";
 } ) ];
 }
-- 
GitLab


From 3f03fbe278872ca2f908fc790264cc04c2d892ec Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sun, 24 May 2009 18:28:30 +0000
Subject: [PATCH 1480/5331] * lib.getAttr renamed.

svn path=/nixos/branches/modular-nixos/; revision=15700
---
 installer/nixos-checkout.nix          | 11 ++++-------
 upstart-jobs/apache-httpd/default.nix |  2 +-
 upstart-jobs/default.nix              |  2 +-
 upstart-jobs/xserver/default.nix      | 12 +++++-------
 4 files changed, 11 insertions(+), 16 deletions(-)

diff --git a/installer/nixos-checkout.nix b/installer/nixos-checkout.nix
index 79e69757685..08a7a829852 100644
--- a/installer/nixos-checkout.nix
+++ b/installer/nixos-checkout.nix
@@ -1,9 +1,6 @@
 args : with args;
-let 
-    inherit (pkgs.lib) id all showVal escapeShellArg concatMapStrings concatMap
-      mapAttrs concatLists flattenAttrs filter;
-    inherit (builtins) getAttr hasAttr head isAttrs;
-in
+
+with pkgs.lib;
 
 rec {
   # prepareRepoAttrs adds svn defaults and preparse the repo attribute sets so that they
@@ -65,12 +62,12 @@ rec {
           # this file is automatically generated from nixos configuration file settings (installer.repos)
           backupTimestamp=$(date "+%Y%m%d%H%M%S")
           '' + concatMapStrings ( attrs :
-                let repoType = getAttr attrs.type config.installer.repoTypes; 
+                let repoType = builtins.getAttr attrs.type config.installer.repoTypes; 
                     target = escapeShellArg attrs.target; in
                 ''
                   # ${attrs.type} repo ${target}
                   PATH=
-                  for path in ${builtins.toString repoType.env}; do
+                  for path in ${toString repoType.env}; do
                     PATH=$PATH:$path/bin:$path/sbin
                   done
                   if [ -d  ${target} ] && { cd ${target} && { ${ repoType.valid}; }; }; then
diff --git a/upstart-jobs/apache-httpd/default.nix b/upstart-jobs/apache-httpd/default.nix
index aab5d331d10..b8fb5df4d48 100644
--- a/upstart-jobs/apache-httpd/default.nix
+++ b/upstart-jobs/apache-httpd/default.nix
@@ -216,7 +216,7 @@ let
 
   getPort = cfg: if cfg.port != 0 then cfg.port else if cfg.enableSSL then 443 else 80;
 
-  extraModules = pkgs.lib.getAttr ["extraModules"] [] mainCfg;
+  extraModules = pkgs.lib.attrByPath ["extraModules"] [] mainCfg;
   extraForeignModules = pkgs.lib.filter builtins.isAttrs extraModules;
   extraApachaModules = pkgs.lib.filter (x :! (builtins.isAttrs x)) extraModules; # I'd prefer using builtins.isString here, but doesn't exist yet
 
diff --git a/upstart-jobs/default.nix b/upstart-jobs/default.nix
index 91f67f53b42..006f9e06276 100644
--- a/upstart-jobs/default.nix
+++ b/upstart-jobs/default.nix
@@ -2,7 +2,7 @@
 
 ###### interface
 let
-  inherit (pkgs.lib) mkOption mapAttrs getAttr fold
+  inherit (pkgs.lib) mkOption mapAttrs fold
     mergeListOption mergeTypedOption mergeAttrsWithFunc;
 
   options = {
diff --git a/upstart-jobs/xserver/default.nix b/upstart-jobs/xserver/default.nix
index 6cd6de2c5c9..496a2a9e352 100644
--- a/upstart-jobs/xserver/default.nix
+++ b/upstart-jobs/xserver/default.nix
@@ -1,13 +1,13 @@
 {config, pkgs, ...}:
 # TODO: this file need some make-up (Nicolas Pierron)
 
+with pkgs.lib;
+
 let
   kernelPackages = config.boot.kernelPackages;
   # List of font directories.
   fontDirectories = config.fonts.fonts;
 
-  inherit (pkgs.lib) mkOption;
-
   options = {
     services = {
 
@@ -282,7 +282,6 @@ in
 
 let
 
-  inherit (pkgs.lib) optional isInList getAttr mkIf;
   # Abbreviations.
   cfg = config.services.xserver;
   xorg = cfg.package;
@@ -305,16 +304,15 @@ let
   videoDriver = cfg.videoDriver;
   resolutions = map (res: ''"${toString res.x}x${toString res.y}"'') (cfg.resolutions);
 
-  videoDriverModules = getAttr [ videoDriver ] (throw "unkown video driver : `${videoDriver}'") knownVideoDrivers;
+  videoDriverModules = attrByPath [videoDriver] (throw "unknown video driver: `${videoDriver}'") knownVideoDrivers;
 
   modules = 
-
-    getAttr ["modulesFirst"] [] videoDriverModules
+    attrByPath ["modulesFirst"] [] videoDriverModules
     ++ [
       xorg.xorgserver
       xorg.xf86inputevdev
     ] 
-    ++ getAttr ["modules"] [] videoDriverModules
+    ++ attrByPath ["modules"] [] videoDriverModules
     ++ (optional cfg.synaptics.enable ["${xorg.xf86inputsynaptics}"]);
 
 
-- 
GitLab


From d6b30cd513ded5e9fe211aca5c93e1f8983debd1 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sun, 24 May 2009 18:34:31 +0000
Subject: [PATCH 1481/5331] * Include the Glibc locales.

svn path=/nixos/branches/modular-nixos/; revision=15701
---
 system/system.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/system/system.nix b/system/system.nix
index 0af8e602a47..faebd9b83d4 100644
--- a/system/system.nix
+++ b/system/system.nix
@@ -118,6 +118,7 @@ rec {
         pkgs.e2fsprogs
         pkgs.findutils
         pkgs.glibc # for ldd, getent
+        pkgs.glibcLocales
         pkgs.gnugrep
         pkgs.gnused
         pkgs.gnutar
-- 
GitLab


From c66094a3108b897a04a1bb4ee22f9cf6dcaaa737 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sun, 24 May 2009 18:36:32 +0000
Subject: [PATCH 1482/5331] * Filenames should generally be in lowercase.

svn path=/nixos/branches/modular-nixos/; revision=15702
---
 .../hardware/network/{Intel2200BG.nix => intel-2200bg.nix}   | 0
 .../hardware/network/{Intel3945ABG.nix => intel-3945abg.nix} | 5 +++--
 .../hardware/network/{Intel4965AGN.nix => intel-4965agn.nix} | 0
 .../hardware/network/{ZydasZD1211.nix => zydas-zd1211.nix}   | 0
 .../hardware/video/encoder/{Go7007.nix => wis-go7007.nix}    | 0
 5 files changed, 3 insertions(+), 2 deletions(-)
 rename modules/hardware/network/{Intel2200BG.nix => intel-2200bg.nix} (100%)
 rename modules/hardware/network/{Intel3945ABG.nix => intel-3945abg.nix} (76%)
 rename modules/hardware/network/{Intel4965AGN.nix => intel-4965agn.nix} (100%)
 rename modules/hardware/network/{ZydasZD1211.nix => zydas-zd1211.nix} (100%)
 rename modules/hardware/video/encoder/{Go7007.nix => wis-go7007.nix} (100%)

diff --git a/modules/hardware/network/Intel2200BG.nix b/modules/hardware/network/intel-2200bg.nix
similarity index 100%
rename from modules/hardware/network/Intel2200BG.nix
rename to modules/hardware/network/intel-2200bg.nix
diff --git a/modules/hardware/network/Intel3945ABG.nix b/modules/hardware/network/intel-3945abg.nix
similarity index 76%
rename from modules/hardware/network/Intel3945ABG.nix
rename to modules/hardware/network/intel-3945abg.nix
index 5ba3a1c0263..3344704ba5a 100644
--- a/modules/hardware/network/Intel3945ABG.nix
+++ b/modules/hardware/network/intel-3945abg.nix
@@ -2,14 +2,15 @@
 
 let
   inherit (config.boot) kernelPackages;
-  inherit (kernelPackages) kernel;
 in
 
+# !!! make this optional
+
 {
   boot = {
     extraModulePackages =
       pkgs.lib.optional
-        (!kernel.features ? iwlwifi)
+        (!kernelPackages.kernel.features ? iwlwifi)
         kernelPackages.iwlwifi;
   };
 
diff --git a/modules/hardware/network/Intel4965AGN.nix b/modules/hardware/network/intel-4965agn.nix
similarity index 100%
rename from modules/hardware/network/Intel4965AGN.nix
rename to modules/hardware/network/intel-4965agn.nix
diff --git a/modules/hardware/network/ZydasZD1211.nix b/modules/hardware/network/zydas-zd1211.nix
similarity index 100%
rename from modules/hardware/network/ZydasZD1211.nix
rename to modules/hardware/network/zydas-zd1211.nix
diff --git a/modules/hardware/video/encoder/Go7007.nix b/modules/hardware/video/encoder/wis-go7007.nix
similarity index 100%
rename from modules/hardware/video/encoder/Go7007.nix
rename to modules/hardware/video/encoder/wis-go7007.nix
-- 
GitLab


From c0209d000aa2d8f9b18441f71d2d7863ee246c1f Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sun, 24 May 2009 18:49:10 +0000
Subject: [PATCH 1483/5331] svn path=/nixos/branches/modular-nixos/;
 revision=15703

---
 modules/hardware/network/{SMC2632W => smc-2632w}/default.nix      | 0
 .../{SMC2632W => smc-2632w}/firmware/cis/SMC2632W-v1.02.cis       | 0
 2 files changed, 0 insertions(+), 0 deletions(-)
 rename modules/hardware/network/{SMC2632W => smc-2632w}/default.nix (100%)
 rename modules/hardware/network/{SMC2632W => smc-2632w}/firmware/cis/SMC2632W-v1.02.cis (100%)

diff --git a/modules/hardware/network/SMC2632W/default.nix b/modules/hardware/network/smc-2632w/default.nix
similarity index 100%
rename from modules/hardware/network/SMC2632W/default.nix
rename to modules/hardware/network/smc-2632w/default.nix
diff --git a/modules/hardware/network/SMC2632W/firmware/cis/SMC2632W-v1.02.cis b/modules/hardware/network/smc-2632w/firmware/cis/SMC2632W-v1.02.cis
similarity index 100%
rename from modules/hardware/network/SMC2632W/firmware/cis/SMC2632W-v1.02.cis
rename to modules/hardware/network/smc-2632w/firmware/cis/SMC2632W-v1.02.cis
-- 
GitLab


From 575631b72a76307a1bea70c5e0f0a19ad8e929ed Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Sun, 24 May 2009 20:28:09 +0000
Subject: [PATCH 1484/5331] I officially abandon old RescueCD rewrite. I made
 official version tunable by a small patch..

svn path=/nixos/trunk/; revision=15704
---
 installer/cd-dvd/closed-install.nix         |  74 ---
 installer/cd-dvd/live-dvd-X-medium.nix      | 213 ---------
 installer/cd-dvd/live-dvd-X-no-soft.nix     | 121 -----
 installer/cd-dvd/live-dvd-X.nix             | 224 ---------
 installer/cd-dvd/live-dvd.nix               |  72 ---
 installer/cd-dvd/rescue-cd-closed.nix       |  18 -
 installer/cd-dvd/rescue-cd-configurable.nix | 482 --------------------
 installer/cd-dvd/rescue-cd-minimal.nix      |  18 -
 installer/cd-dvd/rescue-cd-offline.nix      |  36 --
 installer/cd-dvd/rescue-cd-replacement.nix  |  32 --
 installer/cd-dvd/rescue-dvd.nix             |  94 ++++
 11 files changed, 94 insertions(+), 1290 deletions(-)
 delete mode 100644 installer/cd-dvd/closed-install.nix
 delete mode 100644 installer/cd-dvd/live-dvd-X-medium.nix
 delete mode 100644 installer/cd-dvd/live-dvd-X-no-soft.nix
 delete mode 100644 installer/cd-dvd/live-dvd-X.nix
 delete mode 100644 installer/cd-dvd/live-dvd.nix
 delete mode 100644 installer/cd-dvd/rescue-cd-closed.nix
 delete mode 100644 installer/cd-dvd/rescue-cd-configurable.nix
 delete mode 100644 installer/cd-dvd/rescue-cd-minimal.nix
 delete mode 100644 installer/cd-dvd/rescue-cd-offline.nix
 delete mode 100644 installer/cd-dvd/rescue-cd-replacement.nix
 create mode 100644 installer/cd-dvd/rescue-dvd.nix

diff --git a/installer/cd-dvd/closed-install.nix b/installer/cd-dvd/closed-install.nix
deleted file mode 100644
index e7443719f60..00000000000
--- a/installer/cd-dvd/closed-install.nix
+++ /dev/null
@@ -1,74 +0,0 @@
-{
-	platform ? __currentSystem
-	,hostConnectPort ? "3737"
-	,sshPubKey ? /var/certs/ssh/id_livedvd.pub
-} : 
-let 
-  isoFun = import ./rescue-cd-configurable.nix;
-in 
-(isoFun {
-	inherit platform;
-
-	networkNixpkgs = "";
-	manualEnabled = true;
-	rogueEnabled = false;
-	sshdEnabled = true;
-	fontConfigEnabled = false;
-	sudoEnable = true;
-	includeMemtest = false;
-	includeStdenv = true;
-	includeBuildDeps = true;
-
-	/*
-		If anyone uses that DVD on live
-		computer, use DHCP; but also add
-		a rogue address for tests in virtual
-		networks without DHCP at all.
-	*/
-	addIP = "10.0.253.251";
-	netmask = "255.255.0.0";
-
-	packages = pkgs : [
-		pkgs.patch
-		pkgs.irssi
-		pkgs.subversion
-		pkgs.w3m
-		pkgs.utillinuxCurses
-		pkgs.wpa_supplicant
-		pkgs.emacs
-		pkgs.vimHugeX
-		pkgs.socat
-	];
-
-	/* 
-		The goal is remotely controlled 
-		installation (maybe over virtual
-		networking with QEmu without human
-		interaction), so let's make ssh 
-		work without manual password entry
-	*/
-	additionalFiles = [
-		{
-			source = sshPubKey;
-			target = "/root/.ssh/authorized_keys";
-		}
-	];
-
-	additionalJobs = [
-		{
-			name = "Socat-ssh-proxy";
-			job = ''
-				start on sshd/started
-				script
-					sleep 5
-					/var/run/current-system/sw/bin/socat tcp:10.0.2.2:${hostConnectPort} tcp:127.0.0.1:22
-				end script
-			'';
-		}
-	];
-        nix = pkgs: pkgs.nixCustomFun (pkgs.nixUnstable.src)
-          ""
-          ["nix-reduce-build" "nix-http-export.cgi"]
-          ["--with-docbook-xsl=\\\${pkgs.docbook5_xsl}/xml/xsl/docbook/"];
-	extraInitrdKernelModules = ["usb_storage" "ehci_hcd" "ohci_hcd" "iso9660" "ext3"];
-}).rescueCD
diff --git a/installer/cd-dvd/live-dvd-X-medium.nix b/installer/cd-dvd/live-dvd-X-medium.nix
deleted file mode 100644
index db57921b4c5..00000000000
--- a/installer/cd-dvd/live-dvd-X-medium.nix
+++ /dev/null
@@ -1,213 +0,0 @@
-{platform ? __currentSystem} : 
-let 
-  isoFun = import ./rescue-cd-configurable.nix;
-  xResolutions = [
-  	{ x = 2048; y = 1536; }
-	{ x = 1920; y = 1024; }
-  	{ x = 1280; y = 800; }
-  	{ x = 1024; y = 768; }
-  	{ x = 800; y = 600; }
-  	{ x = 640; y = 480; }
-  ];
-  xConfiguration = {
-	enable = true;
-	exportConfiguration = true;
-	tcpEnable = true;
-	resolutions = xResolutions;
-	sessionType = "xterm";
-	windowManager = "twm";
-	tty = "9";
-  };
-
-in 
-(isoFun (rec {
-	inherit platform;
-	lib = (import ../../pkgs/lib);
-
-	networkNixpkgs = "";
-	manualEnabled = true;
-	rogueEnabled = true;
-	sshdEnabled = true;
-	fontConfigEnabled = true;
-	sudoEnable = true;
-	includeMemtest = true;
-	includeStdenv = true;
-	includeBuildDeps = true;
-	addUsers = ["nixos" "livecd" "livedvd" 
-		"user" "guest" "nix"];
-	
-	extraInitrdKernelModules = 
-		import ./moduleList.nix;
-
-	arbitraryOverrides = config : config // {
-		services = config.services // {
-			gw6c = {
-				enable = true;
-				autorun = false;
-			};
-		};
-	};
-
-	packages = pkgs : [
-		pkgs.irssi
-		pkgs.ltrace
-		pkgs.subversion
-		pkgs.which
-		pkgs.file
-		pkgs.zip
-		pkgs.unzip
-		pkgs.unrar
-		pkgs.usbutils
-		pkgs.bc
-		pkgs.cpio
-		pkgs.ncat
-		pkgs.patch
-		pkgs.fuse
-		pkgs.indent
-		pkgs.zsh
-		pkgs.hddtemp
-		pkgs.hdparm
-		pkgs.sdparm
-		pkgs.sqlite
-		pkgs.wpa_supplicant
-		pkgs.lynx
-		pkgs.db4
-		pkgs.rogue
-		pkgs.attr
-		pkgs.acl
-		pkgs.automake
-		pkgs.autoconf
-		pkgs.libtool
-		pkgs.gnupg
-		pkgs.openssl
-		pkgs.gnumake
-		pkgs.manpages
-		pkgs.cabextract
-		pkgs.upstartJobControl
-		pkgs.fpc
-		pkgs.perl
-		pkgs.lftp
-		pkgs.wget
-		pkgs.utillinuxCurses
-		pkgs.iproute
-		pkgs.diffutils
-		pkgs.pciutils
-		pkgs.lsof
-		pkgs.vimHugeX
-		pkgs.xpdf
-		pkgs.ghostscript
-		pkgs.gv
-		pkgs.firefoxWrapper
-		pkgs.xlaunch
-		pkgs.wirelesstools
-		pkgs.usbutils
-		pkgs.dmidecode
-		pkgs.sshfsFuse
-		pkgs.ratpoison
-		pkgs.xorg.twm
-		pkgs.binutils
-		pkgs.xorg.lndir
-		pkgs.pstree
-		pkgs.psmisc
-		pkgs.aspell
-		pkgs.gettext
-		pkgs.xorg.xorgserver
-		pkgs.xorg.xsetroot
-		pkgs.xorg.xhost
-		pkgs.xorg.xwd
-		pkgs.xorg.xfontsel
-		pkgs.xorg.xwud
-		pkgs.xlaunch
-		pkgs.xsel
-		pkgs.xorg.xmessage
-		pkgs.xorg.xauth
-		pkgs.keynav
-		pkgs.xorg.xset
-		pkgs.xterm
-		pkgs.xmove
-		pkgs.xorg.xev
-		pkgs.xorg.xmodmap
-		pkgs.xorg.xkbcomp
-		pkgs.xorg.setxkbmap
-		pkgs.mssys
-		pkgs.testdisk
-		pkgs.gdb
-		pkgs.pidgin
-		pkgs.pidginotr
-		pkgs.gdmap
-		pkgs.thunderbird
-		pkgs.wv
-		pkgs.tightvnc
-		pkgs.bittornado
-		pkgs.wireshark
-		pkgs.smbfsFuse
-		pkgs.xfsProgs
-		pkgs.jfsUtils
-		pkgs.x11vnc
-		pkgs.lzma
-		pkgs.dict 
-		pkgs.apacheHttpd
-		pkgs.xneur
-		(with pkgs.aspellDicts; [en fr ru])
-		(pkgs.dictDBCollector {
-			dictlist = with pkgs.dictdDBs; map 
-			(x:{
-				name = x.dbName;
-				filename = x.outPath;
-				locale = x.locale;
-			})
-			[ 
-				eng2fra fra2eng eng2nld
-				nld2eng eng2rus
-				mueller_enru_abbr
-				mueller_enru_base
-				mueller_enru_dict
-				mueller_enru_geo
-				mueller_enru_names
-			];
-		})
-	];
-
-	configList = configuration : [
-	{
-		suffix = "X-vesa";
-		configuration = args: ((configuration args) // 
-		{
-			boot=(configuration args).boot // {configurationName = "X with vesa";};
-			services = (configuration args).services // {
-				xserver = xConfiguration // {videoDriver = "vesa";};
-			};
-		});
-	}
-	{
-		suffix = "X-Intel";
-		configuration = args: ((configuration args) // 
-		{
-			boot=(configuration args).boot // {configurationName = "X with Intel graphic card";};
-			services = (configuration args).services // {
-				xserver = xConfiguration // {videoDriver = "intel"; driSupport = true;};
-			};
-		});
-	}
-	{
-		suffix = "X-ATI";
-		configuration = args: ((configuration args) // 
-		{
-			boot=(configuration args).boot // {configurationName = "X with ATI graphic card";};
-			services = (configuration args).services // {
-				xserver = xConfiguration // {videoDriver = "ati"; driSupport = true;};
-			};
-		});
-	}
-        {
-                suffix = "X-NVIDIA";
-		configuration = args: ((configuration args) // 
-                {
-                        boot=(configuration args).boot // {configurationName = "X with NVIDIA graphic card";};
-                        services = (configuration args).services // {
-                                xserver = xConfiguration // {videoDriver = "nvidia"; driSupport = true;};
-                        };
-                });
-        }
-	];
-})).rescueCD
diff --git a/installer/cd-dvd/live-dvd-X-no-soft.nix b/installer/cd-dvd/live-dvd-X-no-soft.nix
deleted file mode 100644
index 62ebf683d09..00000000000
--- a/installer/cd-dvd/live-dvd-X-no-soft.nix
+++ /dev/null
@@ -1,121 +0,0 @@
-{platform ? __currentSystem} : 
-let 
-  isoFun = import ./rescue-cd-configurable.nix;
-  xResolutions = [
-  	{ x = 2048; y = 1536; }
-	{ x = 1920; y = 1024; }
-  	{ x = 1280; y = 800; }
-  	{ x = 1024; y = 768; }
-  	{ x = 800; y = 600; }
-  	{ x = 640; y = 480; }
-  ];
-  xConfiguration = {
-	enable = true;
-	exportConfiguration = true;
-	tcpEnable = true;
-	resolutions = xResolutions;
-	sessionType = "xterm";
-	windowManager = "twm";
-	tty = "9";
-  };
-
-in 
-(isoFun {
-	inherit platform;
-	lib = (import ../../pkgs/lib);
-
-	networkNixpkgs = "";
-	manualEnabled = true;
-	rogueEnabled = true;
-	sshdEnabled = true;
-	fontConfigEnabled = true;
-	sudoEnable = true;
-	includeMemtest = true;
-	includeStdenv = true;
-	includeBuildDeps = true;
-	addUsers = ["nixos" "livecd" "livedvd" 
-		"user" "guest" "nix"];
-
-	extraModulePackages = pkgs: [pkgs.kernelPackages.kqemu];
-	extraInitrdKernelModules = 
-		import ./moduleList.nix;
-
-	packages = pkgs : [
-		pkgs.which
-		pkgs.file
-		pkgs.zip
-		pkgs.unzip
-		pkgs.unrar
-		pkgs.db4
-		pkgs.attr
-		pkgs.acl
-		pkgs.manpages
-		pkgs.cabextract
-		pkgs.upstartJobControl
-		pkgs.utillinuxCurses
-		pkgs.emacs
-		pkgs.lsof
-		pkgs.vimHugeX
-		pkgs.firefoxWrapper
-		pkgs.xlaunch
-		pkgs.ratpoison
-		pkgs.xorg.twm
-		pkgs.xorg.xorgserver
-		pkgs.xorg.xhost
-		pkgs.xorg.xfontsel
-		pkgs.xlaunch
-		pkgs.xorg.xauth
-		pkgs.xorg.xset
-		pkgs.xterm
-		pkgs.xorg.xev
-		pkgs.xorg.xmodmap
-		pkgs.xorg.xkbcomp
-		pkgs.xorg.setxkbmap
-		pkgs.mssys
-		pkgs.testdisk
-		pkgs.gdb
-	];
-
-	configList = configuration : [
-	{
-		suffix = "X-vesa";
-		configuration = args: ((configuration args) // 
-		{
-			boot=(configuration args).boot // {configurationName = "X with vesa";};
-			services = (configuration args).services // {
-				xserver = xConfiguration // {videoDriver = "vesa";};
-			};
-		});
-	}
-	{
-		suffix = "X-Intel";
-		configuration = args: ((configuration args) // 
-		{
-			boot=(configuration args).boot // {configurationName = "X with Intel graphic card";};
-			services = (configuration args).services // {
-				xserver = xConfiguration // {videoDriver = "intel"; driSupport = true;};
-			};
-		});
-	}
-	{
-		suffix = "X-ATI";
-		configuration = args: ((configuration args) // 
-		{
-			boot=(configuration args).boot // {configurationName = "X with ATI graphic card";};
-			services = (configuration args).services // {
-				xserver = xConfiguration // {videoDriver = "ati"; driSupport = true;};
-			};
-		});
-	}
-        {
-                suffix = "X-NVIDIA";
-		configuration = args: ((configuration args) // 
-                {
-                        boot=(configuration args).boot // {configurationName = "X with NVIDIA graphic card";};
-                        services = (configuration args).services // {
-                                xserver = xConfiguration // {videoDriver = "nvidia"; driSupport = true;};
-                        };
-                });
-        }
-	];
-}).rescueCD
diff --git a/installer/cd-dvd/live-dvd-X.nix b/installer/cd-dvd/live-dvd-X.nix
deleted file mode 100644
index c98b398a9af..00000000000
--- a/installer/cd-dvd/live-dvd-X.nix
+++ /dev/null
@@ -1,224 +0,0 @@
-{platform ? __currentSystem} : 
-let 
-  isoFun = import ./rescue-cd-configurable.nix;
-  xResolutions = [
-  	{ x = 2048; y = 1536; }
-	{ x = 1920; y = 1024; }
-  	{ x = 1280; y = 800; }
-  	{ x = 1024; y = 768; }
-  	{ x = 800; y = 600; }
-  	{ x = 640; y = 480; }
-  ];
-  xConfiguration = {
-	enable = true;
-	exportConfiguration = true;
-	tcpEnable = true;
-	resolutions = xResolutions;
-	sessionType = "xterm";
-	windowManager = "twm";
-	tty = "9";
-  };
-
-in 
-(isoFun (rec {
-	inherit platform;
-	lib = (import ../../pkgs/lib);
-
-	networkNixpkgs = "";
-	manualEnabled = true;
-	rogueEnabled = true;
-	sshdEnabled = true;
-	fontConfigEnabled = true;
-	sudoEnable = true;
-	includeMemtest = true;
-	includeStdenv = true;
-	includeBuildDeps = true;
-	addUsers = ["nixos" "livecd" "livedvd" 
-		"user" "guest" "nix"];
-
-	extraModulePackages = pkgs: [pkgs.kernelPackages.kqemu];
-
-	extraInitrdKernelModules = 
-		import ./moduleList.nix;
-
-	arbitraryOverrides = config : config // {
-		services = config.services // {
-			gw6c = {
-				enable = true;
-				autorun = false;
-			};
-		};
-	};
-
-	packages = pkgs : [
-		pkgs.irssi
-		pkgs.ltrace
-		pkgs.subversion
-		pkgs.which
-		pkgs.file
-		pkgs.zip
-		pkgs.unzip
-		pkgs.unrar
-		pkgs.usbutils
-		pkgs.bc
-		pkgs.cpio
-		pkgs.ncat
-		pkgs.patch
-		pkgs.fuse
-		pkgs.indent
-		pkgs.zsh
-		pkgs.hddtemp
-		pkgs.hdparm
-		pkgs.sdparm
-		pkgs.sqlite
-		pkgs.wpa_supplicant
-		pkgs.lynx
-		pkgs.db4
-		pkgs.rogue
-		pkgs.attr
-		pkgs.acl
-		pkgs.automake
-		pkgs.autoconf
-		pkgs.libtool
-		pkgs.gnupg
-		pkgs.openssl
-		pkgs.units
-		pkgs.gnumake
-		pkgs.manpages
-		pkgs.cabextract
-		pkgs.upstartJobControl
-		pkgs.fpc
-		pkgs.python
-		pkgs.perl
-		pkgs.lftp
-		pkgs.wget
-		pkgs.guile
-		pkgs.utillinuxCurses
-		pkgs.emacs
-		pkgs.iproute
-		pkgs.MPlayer
-		pkgs.diffutils
-		pkgs.pciutils
-		pkgs.lsof
-		pkgs.vimHugeX
-		pkgs.xpdf
-		pkgs.ghostscript
-		pkgs.gv
-		pkgs.firefoxWrapper
-		pkgs.xlaunch
-		pkgs.wirelesstools
-		pkgs.usbutils
-		pkgs.dmidecode
-		pkgs.sdparm
-		pkgs.hdparm
-		pkgs.hddtemp
-		pkgs.sshfsFuse
-		pkgs.ratpoison
-		pkgs.xorg.twm
-		pkgs.binutils
-		pkgs.xorg.lndir
-		pkgs.pstree
-		pkgs.psmisc
-		pkgs.aspell
-		pkgs.gettext
-		pkgs.xorg.xorgserver
-		pkgs.xorg.xsetroot
-		pkgs.xorg.xhost
-		pkgs.xorg.xwd
-		pkgs.xorg.xfontsel
-		pkgs.xorg.xwud
-		pkgs.xlaunch
-		pkgs.xsel
-		pkgs.xorg.xmessage
-		pkgs.xorg.xauth
-		pkgs.keynav
-		pkgs.xorg.xset
-		pkgs.xterm
-		pkgs.xmove
-		pkgs.xorg.xev
-		pkgs.xorg.xmodmap
-		pkgs.xorg.xkbcomp
-		pkgs.xorg.setxkbmap
-		pkgs.mssys
-		pkgs.testdisk
-		pkgs.gdb
-		pkgs.xfsProgs
-		pkgs.jfsUtils
-		pkgs.ddrescue
-
-		/*
-		pkgs.elinks
-		pkgs.clisp
-		pkgs.djvulibre
-		pkgs.imagemagick
-		*/
-
-		/*
-		pkgs.pidgin
-		pkgs.pidginotr
-		pkgs.gdmap
-		pkgs.sox
-		pkgs.timidity
-		pkgs.xscreensaver
-		pkgs.thunderbird
-		pkgs.graphviz
-		pkgs.tetex
-		pkgs.pidginlatex
-		pkgs.openoffice
-		pkgs.wv
-		pkgs.maxima
-		pkgs.jre
-		pkgs.wine
-		pkgs.qemu
-		pkgs.qemuImage
-		pkgs.wireshark
-		pkgs.gimp
-		pkgs.audacity
-		pkgs.tightvnc
-		pkgs.bittornado
-		*/
-	];
-
-	configList = configuration : [
-	{
-		suffix = "X-vesa";
-		configuration = args: ((configuration args) // 
-		{
-			boot=(configuration args).boot // {configurationName = "X with vesa";};
-			services = (configuration args).services // {
-				xserver = xConfiguration // {videoDriver = "vesa";};
-			};
-		});
-	}
-	{
-		suffix = "X-Intel";
-		configuration = args: ((configuration args) // 
-		{
-			boot=(configuration args).boot // {configurationName = "X with Intel graphic card";};
-			services = (configuration args).services // {
-				xserver = xConfiguration // {videoDriver = "intel"; driSupport = true;};
-			};
-		});
-	}
-	{
-		suffix = "X-ATI";
-		configuration = args: ((configuration args) // 
-		{
-			boot=(configuration args).boot // {configurationName = "X with ATI graphic card";};
-			services = (configuration args).services // {
-				xserver = xConfiguration // {videoDriver = "ati"; driSupport = true;};
-			};
-		});
-	}
-        {
-                suffix = "X-NVIDIA";
-		configuration = args: ((configuration args) // 
-                {
-                        boot=(configuration args).boot // {configurationName = "X with NVIDIA graphic card";};
-                        services = (configuration args).services // {
-                                xserver = xConfiguration // {videoDriver = "nvidia"; driSupport = true;};
-                        };
-                });
-        }
-	];
-})).rescueCD
diff --git a/installer/cd-dvd/live-dvd.nix b/installer/cd-dvd/live-dvd.nix
deleted file mode 100644
index f4bdab1ac4c..00000000000
--- a/installer/cd-dvd/live-dvd.nix
+++ /dev/null
@@ -1,72 +0,0 @@
-{platform ? __currentSystem} : 
-let 
-  isoFun = import ./rescue-cd-configurable.nix;
-in 
-(isoFun {
-	inherit platform;
-	lib = (import ../pkgs/lib);
-
-	networkNixpkgs = "";
-	manualEnabled = true;
-	rogueEnabled = true;
-	sshdEnabled = true;
-	fontConfigEnabled = true;
-	sudoEnable = true;
-	includeMemtest = true;
-	includeStdenv = true;
-	includeBuildDeps = true;
-
-	packages = pkgs : [
-		pkgs.irssi
-		pkgs.elinks
-		pkgs.ltrace
-		pkgs.subversion
-		pkgs.which
-		pkgs.file
-		pkgs.zip
-		pkgs.unzip
-		pkgs.unrar
-		pkgs.usbutils
-		pkgs.bc
-		pkgs.cpio
-		pkgs.ncat
-		pkgs.patch
-		pkgs.fuse
-		pkgs.indent
-		pkgs.zsh
-		pkgs.hddtemp
-		pkgs.hdparm
-		pkgs.sdparm
-		pkgs.sqlite
-		pkgs.wpa_supplicant
-		pkgs.lynx
-		pkgs.db4
-		pkgs.rogue
-		pkgs.attr
-		pkgs.acl
-		pkgs.automake
-		pkgs.autoconf
-		pkgs.libtool
-		pkgs.gnupg
-		pkgs.openssl
-		pkgs.units
-		pkgs.gnumake
-		pkgs.manpages
-		pkgs.cabextract
-		pkgs.upstartJobControl
-		pkgs.fpc
-		pkgs.python
-		pkgs.perl
-		pkgs.lftp
-		pkgs.wget
-		pkgs.guile
-		pkgs.utillinuxCurses
-		pkgs.emacs
-		pkgs.iproute
-		pkgs.MPlayer
-		pkgs.diffutils
-		pkgs.pciutils
-		pkgs.lsof
-		pkgs.vimHugeX
-	];
-}).rescueCD
diff --git a/installer/cd-dvd/rescue-cd-closed.nix b/installer/cd-dvd/rescue-cd-closed.nix
deleted file mode 100644
index b6c1df04b63..00000000000
--- a/installer/cd-dvd/rescue-cd-closed.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-{platform ? __currentSystem} : 
-let 
-  isoFun = import ./rescue-cd-configurable.nix;
-in 
-(isoFun {
-	inherit platform;
-	lib = (import ../pkgs/lib);
-
-	networkNixpkgs = "";
-	manualEnabled = false;
-	rogueEnabled = false;
-	sshdEnabled = false;
-	fontConfigEnabled = false;
-	sudoEnable = false;
-	includeMemtest = false;
-	includeStdenv = false;
-	includeBuildDeps = true;
-}).rescueCD
diff --git a/installer/cd-dvd/rescue-cd-configurable.nix b/installer/cd-dvd/rescue-cd-configurable.nix
deleted file mode 100644
index 53524ca36c8..00000000000
--- a/installer/cd-dvd/rescue-cd-configurable.nix
+++ /dev/null
@@ -1,482 +0,0 @@
-{
-   lib ? null
-  ,platform ? __currentSystem
-  ,networkNixpkgs ? ""
-  ,nixpkgsMd5 ? ""
-  ,manualEnabled ? true
-  ,rogueEnabled ? true
-  ,sshdEnabled ? false
-  ,fontConfigEnabled ? false
-  ,sudoEnable ? false
-  ,packages ? (pkgs : [])
-  ,includeMemtest ? true
-  ,includeStdenv ? true
-  ,includeBuildDeps ? false
-  ,kernelPackages ? (pkgs : pkgs.kernelPackages)
-  ,extraModulePackages ? (pkgs : [])
-  ,addUsers ? []
-  ,extraInitrdKernelModules ? []
-  ,bootKernelModules ? []
-  ,arbitraryOverrides ? (config:{})
-  ,cleanStart ? false
-
-   /* Should return list of {configuration, suffix} attrsets.
-   {configuration=configuration; suffix=""} is always prepended.
-   */
-  ,configList ? (configuration : [])
-  ,aufs ? true
-
-  /*
-  	Address/netmask to be always added, whatever 
-	network-interfaces configure is kept
-  */
-  ,addIP ? ""
-  ,netmask ? "255.255.255.0"
-  /* To select interface to bind address to */
-  ,ifName ? "eth0"
-
-  /* 
-  	list of: {source, target}
-  */
-  ,additionalFiles ? []
-  ,compressImage ? false
-  ,nixpkgsPath ? ../../../nixpkgs
-  ,additionalJobs ? []
-  ,intel3945FWEnable ? true
-  ,intel4965FWEnable ? true
-  ,cdLabel ? "NIXOS_INSTALLATION_CD"
-  ,relName ?
-    if builtins.pathExists ../../relname
-    then builtins.readFile ../../relname
-    else "nixos-${builtins.readFile ../../VERSION}"
-  ,nix ? pkgs: pkgs.nix
-}:
-let 
-  realLib = if lib != null then lib else (import (nixpkgsPath+"/pkgs/lib"));
-in
-let
-  lib = realLib;
-
-  ttyCount = lib.fold builtins.add 0 [
-    (if rogueEnabled then 1 else 0)
-    (if manualEnabled then 1 else 0)
-  ];
- 
-  systemPackBuilder = {suffix, configuration} : 
-  { 
-    system = (import ../../system/system.nix) {
-      inherit configuration platform nixpkgsPath; /* To refactor later - x86+x86_64 DVD */
-    };
-    inherit suffix configuration;
-  };
- 
-  systemPackGrubEntry = systemPack : 
-  (''
-
-      title NixOS Installer / Rescue ${systemPack.system.config.boot.configurationName}
-      kernel /boot/vmlinuz${systemPack.suffix} ${toString systemPack.system.config.boot.kernelParams} systemConfig=/system${systemPack.suffix}
-      initrd /boot/initrd${systemPack.suffix}
- 
-  '');
- 
-  systemPackInstallRootList = systemPack : 
-  [
-    { 
-      source = systemPack.system.kernel + "/vmlinuz";
-      target = "boot/vmlinuz${systemPack.suffix}";
-    }
-    { 
-      source = systemPack.system.initialRamdisk + "/initrd";
-      target = "boot/initrd${systemPack.suffix}";
-    }
-  ];
-  systemPackInstallClosures = systemPack : 
-  ([
-    { 
-      object = systemPack.system.bootStage2;
-      symlink = "/init${systemPack.suffix}";
-    }
-    { 
-      object = systemPack.system.system;
-      symlink = "/system${systemPack.suffix}";
-    }
-  ]
-  ++
-  (lib.optional includeStdenv 
-  # To speed up the installation, provide the full stdenv.
-    { 
-      object = systemPack.system.pkgs.stdenv;
-      symlink = "none";
-    }
-  )
-  );
-  systemPackInstallBuildClosure = systemPack : 
-  ([
-    {
-      object = systemPack.system.system.drvPath;
-      symlink = "none";
-    }
-  ]);
- 
- 
-  userEntry = user : 
-  {
-    name = user;
-    description = "NixOS Live Disk non-root user";
-    home = "/home/${user}";
-    createHome = true;
-    group = "users";
-    extraGroups = ["wheel" "audio"];
-    shell = "/bin/sh";
-  };
-in
-
-rec {
-
-  inherit cdLabel;
-
-  nixpkgsRel = "nixpkgs" + (if networkNixpkgs != "" then "-" + networkNixpkgs else "");
- 
-  configuration = {pkgs, config, ...}: let preConfiguration ={
-    boot = {
-      isLiveCD = true;
-      # The label used to identify the installation CD.
-      extraTTYs = [] 
-        ++ (lib.optional manualEnabled 7) 
-        ++ (lib.optional rogueEnabled 8);
-      kernelPackages = kernelPackages pkgs;
-      initrd = {
-      extraKernelModules = extraInitrdKernelModules
-      ++ (if aufs then ["aufs"] else [])
-      ;
-      };
-      kernelModules = bootKernelModules;
-      extraModulePackages = ((extraModulePackages pkgs)
-      ++(if aufs then [(kernelPackages pkgs).aufs] else [])
-      );
-    };
-    
-    services = {
-      
-      sshd = { enable = sshdEnabled; };
-      
-      xserver = { enable = false; };
-
-      udev = {
-        addFirmware = []
-	  #++ (pkgs.lib.optional intel3945FWEnable pkgs.iwlwifi3945ucode)
-	  #++ (pkgs.lib.optional intel4965FWEnable pkgs.iwlwifi4965ucode)
-	  ;
-      };
-   
-      extraJobs = [
-        # Unpack the NixOS/Nixpkgs sources to /etc/nixos.
-        { 
-          name = "unpack-sources";
-          job = ''
-            start on startup
-            script
-            export PATH=${pkgs.gnutar}/bin:${pkgs.bzip2}/bin:$PATH
-
-	    mkdir -p /mnt
-        
-            ${system.nix}/bin/nix-store --load-db < /nix-path-registration
-        
-            mkdir -p /etc/nixos/nixos
-            tar xjf /install/nixos.tar.bz2 -C /etc/nixos/nixos
-            tar xjf /install/nixpkgs.tar.bz2 -C /etc/nixos
-	    tar xjf /install/nixos-services.tar.bz2 -C /etc/nixos
-            mv /etc/nixos/nixpkgs-* /etc/nixos/nixpkgs || true
-            mv /etc/nixos/*-nixpkgs /etc/nixos/nixpkgs || true
-            mv /etc/nixos/*-services /etc/nixos/services || true
-            ln -sfn ../nixpkgs/pkgs /etc/nixos/nixos/pkgs
-            ln -sfn ../services /etc/nixos/services
-            chown -R root.root /etc/nixos
-            touch /etc/resolv.conf
-            end script
-          '';
-        }
-      ] 
-        
-      ++ additionalJobs
-
-      ++ 
-        
-      (lib.optional manualEnabled 
-        # Show the NixOS manual on tty7.
-        { 
-          name = "manual";
-          job = ''
-            start on udev
-            stop on shutdown
-            respawn ${pkgs.w3m}/bin/w3m ${manual} < /dev/tty7 > /dev/tty7 2>&1
-          '';
-        }
-      )
-       
-      ++
-       
-      (lib.optional rogueEnabled
-        # Allow the user to do something useful on tty8 while waiting
-        # for the installation to finish.
-        { 
-          name = "rogue";
-          job = ''
-            start on udev
-            stop on shutdown
-            respawn ${pkgs.rogue}/bin/rogue < /dev/tty8 > /dev/tty8 2>&1
-          '';
-        }
-      )
-       
-      ++
-       
-      (lib.optional (addUsers != [])
-        # Set empty passwords
-        {
-          name = "clear-passwords";
-          job = '' 
-            start on startup
-            script 
-              for i in ${lib.concatStringsSep " " addUsers}; do
-                  echo | ${pkgs.pwdutils}/bin/passwd --stdin $i
-              done
-            end script
-          '';
-        }
-      )
-
-      ++
-
-      (lib.optional (addIP != "")
-        {
-	  name = "add-IP-adress";
-	  job = ''
-	    start on network-interfaces/started
-	    script
-	      ${pkgs.nettools}/sbin/ifconfig ${ifName} add ${addIP} up
-	      ${pkgs.nettools}/sbin/ifconfig ${ifName}:0 netmask ${netmask} up 
-	    end script
-	  '';
-	}
-      )
-      ;
-       
-      # And a background to go with that.
-      ttyBackgrounds = {
-        specificThemes = []
-        ++
-        (lib.optional manualEnabled
-          { 
-            tty = 7;
-            # Theme is GPL according to http://kde-look.org/content/show.php/Green?content=58501.
-            theme = pkgs.fetchurl {
-              url = http://www.kde-look.org/CONTENT/content-files/58501-green.tar.gz;
-              sha256 = "0sdykpziij1f3w4braq8r8nqg4lnsd7i7gi1k5d7c31m2q3b9a7r";
-            };
-          }
-        )
-        ++
-        (lib.optional rogueEnabled 
-          { 
-            tty = 8;
-            theme = pkgs.fetchurl {
-              url = http://www.bootsplash.de/files/themes/Theme-GNU.tar.bz2;
-              md5 = "61969309d23c631e57b0a311102ef034";
-            };
-          }
-        )
-        ;
-      };
-   
-      mingetty = {
-        helpLine = ''     
-          Log in as "root" with an empty password. 
-        ''
-        +(if addUsers != [] then 
-          '' These users also have empty passwords:
-            ${lib.concatStringsSep " " addUsers }
-          '' 
-        else "")
-        +(if manualEnabled then " Press <Alt-F7> for help." else "");
-      };
-      
-    };
-  
-    fonts = { enableFontConfig = fontConfigEnabled; };
-    
-    installer = {
-      nixpkgsURL = 
-        (if networkNixpkgs != "" then http://nix.cs.uu.nl/dist/nix/ + nixpkgsRel
-          else file:///mnt/ );
-    };
-  
-    security = {
-      sudo = { enable = sudoEnable; };
-    };
-    
-    environment = {
-      extraPackages = if cleanStart then [] else [
-        pkgs.vim
-        pkgs.subversion # for nixos-checkout
-        pkgs.w3m # needed for the manual anyway
-      ] ++ (packages pkgs);
-      checkConfigurationOptions = true;
-      cleanStart = cleanStart;
-      nix = nix pkgs;
-    };
-  
-    users = {
-      extraUsers = map userEntry addUsers;
-    };
-    
-    fileSystems = [
-      { mountPoint = "/";
-        label = cdLabel;
-      }
-    ];
-    
-  }; in preConfiguration // (arbitraryOverrides preConfiguration);
- 
-  configurations = [{
-    inherit configuration;
-    suffix = "";
-  }] ++ (configList configuration);
-  systemPacks = map systemPackBuilder configurations;
- 
-  system = (builtins.head systemPacks).system; /* I hope this is unneeded */
-  pkgs = system.pkgs; /* Nothing non-fixed should be built from it */
- 
- 
-  # The NixOS manual, with a backward compatibility hack for Nix <=
-  # 0.11 (you won't get the manual).
-  manual = if builtins ? unsafeDiscardStringContext
-    then "${import ../../doc/manual {inherit nixpkgsPath;}}/manual.html"
-    else pkgs.writeText "dummy-manual" "Manual not included in this build!";
- 
- 
-  # 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.runCommand "tarball" {inherit tarName;} ''
-    ensureDir $out
-    (cd ${input} && tar cvfj $out/${tarName} . \
-        --exclude '*~' \
-        --exclude 'pkgs' --exclude 'result')
-  '';
- 
-  makeNixPkgsTarball = tarName: input: ((pkgs.runCommand "tarball-nixpkgs" {inherit tarName;} ''
-  ensureDir $out
-    (cd ${input}/.. && tar cvfj $out/${tarName} $(basename ${input}) \
-        --exclude '*~' \
-        --exclude 'result')
-  '')+"/${tarName}");
- 
- 
-  
-  # Put the current directory in a tarball (making sure to filter
-  # out crap like the .svn directories).
-  nixosTarball =
-    let filter = name: type:
-    let base = baseNameOf (toString name);
-    in base != ".svn" && base != "result";
-    in
-    makeTarball "nixos.tar.bz2" (builtins.filterSource filter ./../..);
- 
- 
-  # Get a recent copy of Nixpkgs.
-  nixpkgsTarball = if networkNixpkgs != "" then pkgs.fetchurl {
-    url = configuration.installer.nixpkgsURL + "/" + nixpkgsRel + ".tar.bz2";
-    md5 = "6a793b877e2a4fa79827515902e1dfd8";
-  } else makeNixPkgsTarball "nixpkgs.tar.bz2" ("" + nixpkgsPath);
-
-  nixosServicesTarball = makeNixPkgsTarball "nixos-services.tar.bz2" ("" + ./../../../services);
- 
-  # The configuration file for Grub.
-  grubCfg = pkgs.writeText "menu.lst" (''
-    default 0
-    timeout 10
-    splashimage /boot/background.xpm.gz
-  ''+
-  (lib.concatStrings (map systemPackGrubEntry systemPacks))
-  + (if includeMemtest then
-  ''
- 
-    title Memtest86+
-    kernel /boot/memtest.bin
-  '' else ""));
- 
- 
-  # Create an ISO image containing the Grub boot loader, the kernel,
-  # the initrd produced above, and the closure of the stage 2 init.
-  rescueCD = import ../../helpers/make-iso9660-image.nix {
-    inherit (pkgs) stdenv perl cdrkit;
-    inherit compressImage nixpkgsPath;
-    isoName = "nixos-${relName}-${platform}.iso";
-  
-    # Single files to be copied to fixed locations on the CD.
-    contents = lib.uniqList {
-      inputList = [
-        { 
-          source = 
-	    "${pkgs.grub}/lib/grub/${if platform == "i686-linux" then "i386-pc" else "x86_64-unknown"}/stage2_eltorito";
-          target = "boot/grub/stage2_eltorito";
-        }
-        { 
-          source = grubCfg;
-          target = "boot/grub/menu.lst";
-        }
-      ]
-      ++ 
-      (lib.concatLists (map systemPackInstallRootList systemPacks))
-      ++
-      [
-        { 
-          source = system.config.boot.grubSplashImage;
-          target = "boot/background.xpm.gz";
-        }
-        { 
-          source = nixosTarball + "/" + nixosTarball.tarName;
-          target = "/install/" + nixosTarball.tarName;
-        }
-        {
-          source = nixpkgsTarball;
-          target = "/install/nixpkgs.tar.bz2";
-        }
-        {
-          source = nixosServicesTarball;
-          target = "/install/nixos-services.tar.bz2";
-        }
-      ]
-      ++
-      (lib.optional includeMemtest 
-        { 
-          source = pkgs.memtest86 + "/memtest.bin";
-          target = "boot/memtest.bin";
-        }
-      )
-      ++
-      additionalFiles
-      ;
-    };
-  
-    # Closures to be copied to the Nix store on the CD.
-    storeContents =
-      lib.uniqListExt {
-        inputList = lib.concatLists 
-          (map systemPackInstallClosures systemPacks);
-        getter = x: x.object.drvPath;
-        compare = lib.eqStrings;
-      }
-      ++ lib.uniqList {
-        inputList = lib.optionals includeBuildDeps
-          (lib.concatLists (map systemPackInstallBuildClosure systemPacks));
-      };
-    
-    bootable = true;
-    bootImage = "boot/grub/stage2_eltorito";
-    
-    volumeID = cdLabel;
-  };
- 
-}
diff --git a/installer/cd-dvd/rescue-cd-minimal.nix b/installer/cd-dvd/rescue-cd-minimal.nix
deleted file mode 100644
index c96e651cb53..00000000000
--- a/installer/cd-dvd/rescue-cd-minimal.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-{platform ? __currentSystem} : 
-let 
-  isoFun = import ./rescue-cd-configurable.nix;
-in 
-(isoFun {
-	inherit platform;
-	lib = (import ../pkgs/lib);
-
-	networkNixpkgs = "";
-	manualEnabled = false;
-	rogueEnabled = false;
-	sshdEnabled = false;
-	fontConfigEnabled = false;
-	sudoEnable = false;
-	includeMemtest = false;
-	includeStdenv = false;
-	includeBuildDeps = false;
-}).rescueCD
diff --git a/installer/cd-dvd/rescue-cd-offline.nix b/installer/cd-dvd/rescue-cd-offline.nix
deleted file mode 100644
index ab650f65938..00000000000
--- a/installer/cd-dvd/rescue-cd-offline.nix
+++ /dev/null
@@ -1,36 +0,0 @@
-{platform ? __currentSystem} : 
-let 
-  isoFun = import ./rescue-cd-configurable.nix;
-in 
-(isoFun {
-	inherit platform;
-	lib = (import ../pkgs/lib);
-
-	networkNixpkgs = "";
-	manualEnabled = false;
-	rogueEnabled = false;
-	sshdEnabled = false;
-	fontConfigEnabled = false;
-	sudoEnable = false;
-	includeMemtest = false;
-	includeStdenv = false;
-	includeBuildDeps = true;
-	cleanStart = true;
-	packages = pkgs: with pkgs; [
-		bashInteractive
-		bzip2
-		coreutils
-		curl
-		e2fsprogs
-		gnutar
-		grub
-		gzip
-		less
-		module_init_tools
-		nano
-		su
-		udev
-		upstart
-		utillinux
-	];
-}).rescueCD
diff --git a/installer/cd-dvd/rescue-cd-replacement.nix b/installer/cd-dvd/rescue-cd-replacement.nix
deleted file mode 100644
index d40e23221ef..00000000000
--- a/installer/cd-dvd/rescue-cd-replacement.nix
+++ /dev/null
@@ -1,32 +0,0 @@
-{platform ? __currentSystem} : 
-let 
-  isoFun = import ./rescue-cd-configurable.nix;
-in (isoFun {
-   inherit platform;
-   lib = (import ../pkgs/lib);
-
-   networkNixpkgs = "";
-   manualEnabled = false;
-   rogueEnabled = false;
-   sshdEnabled = false;
-   fontConfigEnabled = false;
-   sudoEnable = false;
-   includeMemtest = false;
-   includeStdenv = false;
-   includeBuildDeps = false;
-
-   extraInitrdKernelModules = 
-     import ./moduleList.nix;
-  packages = pkgs: [
-    pkgs.vim
-    pkgs.subversion # for nixos-checkout
-    pkgs.w3m # needed for the manual anyway
-    pkgs.gdb # for debugging Nix
-    pkgs.testdisk # useful for repairing boot problems
-    pkgs.mssys # for writing Microsoft boot sectors / MBRs
-    pkgs.xfsProgs
-    pkgs.jfsUtils
-    pkgs.ddrescue
-  ];
-
-}).rescueCD
diff --git a/installer/cd-dvd/rescue-dvd.nix b/installer/cd-dvd/rescue-dvd.nix
new file mode 100644
index 00000000000..8d0b62ce447
--- /dev/null
+++ b/installer/cd-dvd/rescue-dvd.nix
@@ -0,0 +1,94 @@
+let 
+  rescueCDFun = import /etc/nixos/nixos/installer/cd-dvd/rescue-cd.nix;
+  pkgs = import /etc/nixos/nixpkgs {};
+  kernels = import /etc/nixos/configurations/misc/raskin/kernel-options.nix {inherit pkgs;};
+  bootEntries = baseKernel: rec {
+    kernelPackages = let 
+      shippedKernelPackages = pkgs.kernelPackagesFor (baseKernel);
+    in
+    shippedKernelPackages //
+      rec { 
+          klibc = shippedKernelPackages.klibc.passthru.function (x: {
+            # version = "1.5.14";
+            # sha256 = "1cmrqpgamnv2ns7dlxjm61zc88dxm4ff0aya413ij1lmhp2h2sfc";
+            # subdir = "Testing/";
+            addPreBuild = ''
+              ln -s $PWD/linux/include/*/errno.h linux/include/asm || echo errno.h already present
+            '';
+          });
+          
+          klibcShrunk = shippedKernelPackages.klibcShrunk.passthru.function {
+            inherit klibc;
+          };
+      };
+    
+  };
+in 
+
+rescueCDFun {
+  includeBuildDeps = true;
+  configurationOverrides = x: {
+    boot = x.boot // {
+      kernelPackages = (bootEntries kernels.testingKernel).kernelPackages;
+      initrd = x.boot.initrd // {
+        extraKernelModules = x.boot.initrd.extraKernelModules ++ [
+          "sr_mod" "atiixp"
+        ];
+	allowMissing = true;
+      };
+    };
+    environment = {
+      extraPackages = x.environment.extraPackages ++ [
+        pkgs.utillinuxCurses pkgs.wpa_supplicant 
+        pkgs.upstartJobControl pkgs.iproute
+        pkgs.bc pkgs.fuse pkgs.zsh
+        pkgs.sqlite pkgs.gnupg pkgs.manpages 
+	pkgs.pinentry pkgs.screen
+
+        pkgs.patch pkgs.which pkgs.diffutils pkgs.file 
+
+        pkgs.irssi pkgs.mcabber pkgs.mutt 
+
+        pkgs.emacs pkgs.vimHugeX pkgs.bvi 
+
+        pkgs.ddrescue pkgs.cdrkit 
+
+        pkgs.btrfsProgs pkgs.xfsProgs pkgs.jfsUtils
+	pkgs.jfsrec pkgs.ntfs3g 
+
+        pkgs.subversion16 pkgs.monotone pkgs.git pkgs.darcs
+	pkgs.mercurial pkgs.bazaar pkgs.cvs 
+	
+	pkgs.pciutils pkgs.hddtemp pkgs.sdparm pkgs.hdparm 
+	pkgs.usbutils 
+
+	pkgs.openssh pkgs.lftp pkgs.w3m pkgs.openssl pkgs.ncat 
+	pkgs.lynx pkgs.wget pkgs.elinks pkgs.socat pkgs.squid
+        
+        pkgs.unrar pkgs.zip pkgs.unzip pkgs.lzma pkgs.cabextract 
+	pkgs.cpio 
+
+        pkgs.lsof pkgs.ltrace 
+
+        pkgs.perl pkgs.python pkgs.ruby pkgs.guile pkgs.clisp
+	pkgs.tcl
+      ];
+
+      nix = pkgs.nixCustomFun ("" + /etc/nixos/nix + "/")
+          ""
+          ["nix-reduce-build" "nix-http-export.cgi"]
+          ["--with-docbook-xsl=${pkgs.docbook5_xsl}/xml/xsl/docbook/"];
+    };
+
+#    nesting = {
+#      children = [
+#        (x // {
+#          boot = x.boot // {
+#            kernelPackages = (bootEntries kernels.testingKernel).kernelPackages;
+#            configurationName = "Test child configuration";
+#          };
+#        })
+#      ];
+#    };
+  };
+}
-- 
GitLab


From debbb8a1997d1fa0a271923d96e44eda8906728f Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Sun, 24 May 2009 20:30:02 +0000
Subject: [PATCH 1485/5331] Made example of configurable DVD working with aby
 common base dir for NixOS/NixPkgs/Nix/configurations checkout

svn path=/nixos/trunk/; revision=15705
---
 installer/cd-dvd/rescue-dvd.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/installer/cd-dvd/rescue-dvd.nix b/installer/cd-dvd/rescue-dvd.nix
index 8d0b62ce447..c877ffa929b 100644
--- a/installer/cd-dvd/rescue-dvd.nix
+++ b/installer/cd-dvd/rescue-dvd.nix
@@ -1,7 +1,7 @@
 let 
-  rescueCDFun = import /etc/nixos/nixos/installer/cd-dvd/rescue-cd.nix;
-  pkgs = import /etc/nixos/nixpkgs {};
-  kernels = import /etc/nixos/configurations/misc/raskin/kernel-options.nix {inherit pkgs;};
+  rescueCDFun = import ./rescue-cd.nix;
+  pkgs = import ../../../nixpkgs {};
+  kernels = import ../../../configurations/misc/raskin/kernel-options.nix {inherit pkgs;};
   bootEntries = baseKernel: rec {
     kernelPackages = let 
       shippedKernelPackages = pkgs.kernelPackagesFor (baseKernel);
@@ -74,7 +74,7 @@ rescueCDFun {
 	pkgs.tcl
       ];
 
-      nix = pkgs.nixCustomFun ("" + /etc/nixos/nix + "/")
+      nix = pkgs.nixCustomFun ("" + ../../../nix + "/")
           ""
           ["nix-reduce-build" "nix-http-export.cgi"]
           ["--with-docbook-xsl=${pkgs.docbook5_xsl}/xml/xsl/docbook/"];
-- 
GitLab


From dc707dff0894b5424fcaa99d3e0981ff1a516e10 Mon Sep 17 00:00:00 2001
From: Marc Weber <marco-oweber@gmx.de>
Date: Sun, 24 May 2009 22:13:27 +0000
Subject: [PATCH 1486/5331] job openvpn: modprobe tun

svn path=/nixos/branches/modular-nixos/; revision=15714
---
 upstart-jobs/openvpn.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/upstart-jobs/openvpn.nix b/upstart-jobs/openvpn.nix
index 1e1edff902c..025a93d20a0 100644
--- a/upstart-jobs/openvpn.nix
+++ b/upstart-jobs/openvpn.nix
@@ -67,6 +67,9 @@ let
     };
   };
 
+
+  modprobe = config.system.sbin.modprobe;
+
 ###### implementation
 
   cfg = config.services.openvpn;
@@ -111,6 +114,7 @@ let
         respawn
         script
           exec &> /var/log/openvpn-${cfg.id}
+          ${modprobe} tun || true
           ${openvpn}/sbin/openvpn --config ${configFile}
         end script
       '';
-- 
GitLab


From f86e2e5d01574d9a9073c406b4f46c0ffeb35e8a Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sun, 24 May 2009 22:49:06 +0000
Subject: [PATCH 1487/5331] * Typo.

svn path=/nixos/branches/modular-nixos/; revision=15716
---
 upstart-jobs/guest-users.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/upstart-jobs/guest-users.nix b/upstart-jobs/guest-users.nix
index bfd83619c0e..dcebf7a12af 100644
--- a/upstart-jobs/guest-users.nix
+++ b/upstart-jobs/guest-users.nix
@@ -54,6 +54,8 @@ in
 {
   require = options;
   services = {
+    # !!! Better to do this as an activation script plugin rather
+    # than an Upstart job.
     extraJobs = optional enable {
       name = "clear-passwords";
       job = ''
@@ -67,7 +69,7 @@ in
       '';
     };
     mingetty = {
-      helpLine = optionalString enable "\nThis users have empty passwords: ${nameString}";
+      helpLine = optionalString enable "\nThese users have empty passwords: ${nameString}";
     };
   };
   users = {
-- 
GitLab


From 5ebdee3577cb7c458d51460316e36ad393d73bc6 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sun, 24 May 2009 23:13:23 +0000
Subject: [PATCH 1488/5331] * Continued refactoring the tree: moved most
 Upstart jobs (namely   those that run daemons) to modules/services.  This
 probably broke   some things since there are a few relative paths in modules 
  (e.g. imports of system/ids.nix). * Moved some PAM modules out of etc/pam.d
 to the directories of NixOS   modules that use them.

svn path=/nixos/branches/modular-nixos/; revision=15717
---
 .../services/audio}/alsa.nix                  |   4 +-
 .../services/audio}/pulseaudio.nix            |   4 +-
 .../services/databases}/mysql.nix             |   0
 .../services/databases}/postgresql.nix        |   0
 .../services/hardware}/acpid.nix              |   0
 .../services/hardware}/hal.nix                |   8 +-
 .../hardware}/udev-firmware-loader.sh         |   0
 .../services/hardware}/udev.nix               |   0
 .../services/logging}/klogd.nix               |   0
 .../services/logging}/syslogd.nix             |   0
 .../services/mail}/dovecot.nix                |   2 +-
 .../services/mail}/postfix.nix                |   2 +-
 .../services/misc}/autofs.nix                 |   0
 .../services/misc}/disnix.nix                 |   4 +-
 .../services/misc/nix-daemon.nix              |   0
 .../services/misc/nixos-manual.nix            |   2 +-
 .../services/misc}/rogue.nix                  |   0
 .../services/misc}/synergy.nix                |   0
 .../services/monitoring}/nagios/commands.cfg  |   0
 .../services/monitoring}/nagios/default.nix   |   4 +-
 .../monitoring}/nagios/host-templates.cfg     |   0
 .../monitoring}/nagios/service-templates.cfg  |   0
 .../monitoring}/nagios/timeperiods.cfg        |   0
 .../services/monitoring}/zabbix-agent.nix     |   4 +-
 .../services/monitoring}/zabbix-server.nix    |   4 +-
 .../network-filesystems}/nfs-kernel.nix       |   0
 .../services/network-filesystems}/samba.nix   |   0
 .../services/networking}/avahi-daemon.nix     |  11 +-
 .../services/networking}/bind.nix             |   0
 .../services/networking}/bitlbee.nix          |   0
 .../services/networking}/dhclient.nix         |   2 +-
 .../services/networking}/dhcpd.nix            |   0
 .../services/networking}/ejabberd.nix         |   0
 .../services/networking}/gnunet.nix           |   0
 .../services/networking}/gw6c.nix             |   0
 .../services/networking}/ifplugd.nix          |   0
 .../services/networking}/ircd-hybrid.nix      |   0
 .../services/networking}/ntpd.nix             |   2 +-
 .../services/networking}/openfire.nix         |   0
 .../services/networking}/openvpn.nix          |   0
 .../services/networking}/portmap.nix          |   4 +-
 .../services/networking/ssh}/lshd.nix         |   0
 .../services/networking/ssh}/sshd.nix         |   4 +-
 .../services/networking}/vsftpd.nix           |   6 +-
 .../services/printing}/cupsd.nix              |   0
 .../services/scheduling}/atd.nix              |  12 +-
 .../services/scheduling/atd.pam               |   0
 .../services/scheduling}/cron.nix             |   2 +-
 .../services/scheduling}/fcron.nix            |   0
 .../services/system}/consolekit.nix           |   4 +-
 .../services/system}/dbus.nix                 |   4 +-
 .../services/system}/nscd.conf                |   0
 .../services/system}/nscd.nix                 |   2 +-
 .../services/ttys}/gpm.nix                    |   2 +-
 .../services/ttys}/mingetty.nix               |   0
 .../web-servers}/apache-httpd/default.nix     |   2 +-
 .../apache-httpd/per-server-options.nix       |   0
 .../web-servers}/apache-httpd/subversion.nix  |   0
 .../apache-httpd/tomcat-connector.nix         |   0
 .../web-servers}/apache-httpd/twiki.nix       |   0
 .../web-servers}/apache-httpd/zabbix.nix      |   0
 .../services/web-servers}/jboss.nix           |   0
 .../services/web-servers}/tomcat.nix          |   4 +-
 .../services/x11}/xfs.conf                    |   0
 .../services/x11}/xfs.nix                     |   0
 .../services/x11}/xserver/default.nix         |   6 +-
 .../x11}/xserver/desktopManager/default.nix   |   0
 .../x11}/xserver/desktopManager/gnome.nix     |   0
 .../x11}/xserver/desktopManager/kde.nix       |   2 +-
 .../x11/xserver/desktopManager/kde.pam        |   0
 .../x11}/xserver/desktopManager/kde4.nix      |   2 +-
 .../xserver/desktopManager/kdeEnvironment.nix |   0
 .../x11}/xserver/desktopManager/none.nix      |   0
 .../x11}/xserver/desktopManager/xterm.nix     |   0
 .../x11}/xserver/displayManager/default.nix   |   0
 .../x11}/xserver/displayManager/kdm.nix       |   0
 .../x11}/xserver/displayManager/slim.nix      |   2 +-
 .../x11/xserver/displayManager/slim.pam       |   0
 .../x11}/xserver/windowManager/compiz.nix     |   0
 .../x11}/xserver/windowManager/default.nix    |   0
 .../x11}/xserver/windowManager/kwm.nix        |   0
 .../x11}/xserver/windowManager/metacity.nix   |   0
 .../x11}/xserver/windowManager/none.nix       |   0
 .../x11}/xserver/windowManager/twm.nix        |   0
 .../x11}/xserver/windowManager/wmii.nix       |   0
 .../x11}/xserver/windowManager/xmonad.nix     |   0
 .../services/x11}/xserver/xserver.conf        |   0
 system/activate-configuration.nix             |   2 +-
 system/options.nix                            | 192 +++++++-----------
 upstart-jobs/cron/locate.nix                  |   2 +-
 upstart-jobs/httpd.nix                        | 134 ------------
 91 files changed, 133 insertions(+), 308 deletions(-)
 rename {upstart-jobs => modules/services/audio}/alsa.nix (93%)
 rename {upstart-jobs => modules/services/audio}/pulseaudio.nix (94%)
 rename {upstart-jobs => modules/services/databases}/mysql.nix (100%)
 rename {upstart-jobs => modules/services/databases}/postgresql.nix (100%)
 rename {upstart-jobs => modules/services/hardware}/acpid.nix (100%)
 rename {upstart-jobs => modules/services/hardware}/hal.nix (90%)
 rename {upstart-jobs => modules/services/hardware}/udev-firmware-loader.sh (100%)
 rename {upstart-jobs => modules/services/hardware}/udev.nix (100%)
 rename {upstart-jobs => modules/services/logging}/klogd.nix (100%)
 rename {upstart-jobs => modules/services/logging}/syslogd.nix (100%)
 rename {upstart-jobs => modules/services/mail}/dovecot.nix (98%)
 rename {upstart-jobs => modules/services/mail}/postfix.nix (99%)
 rename {upstart-jobs => modules/services/misc}/autofs.nix (100%)
 rename {upstart-jobs => modules/services/misc}/disnix.nix (94%)
 rename upstart-jobs/nix.nix => modules/services/misc/nix-daemon.nix (100%)
 rename upstart-jobs/manual.nix => modules/services/misc/nixos-manual.nix (98%)
 rename {upstart-jobs => modules/services/misc}/rogue.nix (100%)
 rename {upstart-jobs => modules/services/misc}/synergy.nix (100%)
 rename {upstart-jobs => modules/services/monitoring}/nagios/commands.cfg (100%)
 rename {upstart-jobs => modules/services/monitoring}/nagios/default.nix (97%)
 rename {upstart-jobs => modules/services/monitoring}/nagios/host-templates.cfg (100%)
 rename {upstart-jobs => modules/services/monitoring}/nagios/service-templates.cfg (100%)
 rename {upstart-jobs => modules/services/monitoring}/nagios/timeperiods.cfg (100%)
 rename {upstart-jobs => modules/services/monitoring}/zabbix-agent.nix (95%)
 rename {upstart-jobs => modules/services/monitoring}/zabbix-server.nix (96%)
 rename {upstart-jobs => modules/services/network-filesystems}/nfs-kernel.nix (100%)
 rename {upstart-jobs => modules/services/network-filesystems}/samba.nix (100%)
 rename {upstart-jobs => modules/services/networking}/avahi-daemon.nix (91%)
 rename {upstart-jobs => modules/services/networking}/bind.nix (100%)
 rename {upstart-jobs => modules/services/networking}/bitlbee.nix (100%)
 rename {upstart-jobs => modules/services/networking}/dhclient.nix (98%)
 rename {upstart-jobs => modules/services/networking}/dhcpd.nix (100%)
 rename {upstart-jobs => modules/services/networking}/ejabberd.nix (100%)
 rename {upstart-jobs => modules/services/networking}/gnunet.nix (100%)
 rename {upstart-jobs => modules/services/networking}/gw6c.nix (100%)
 rename {upstart-jobs => modules/services/networking}/ifplugd.nix (100%)
 rename {upstart-jobs => modules/services/networking}/ircd-hybrid.nix (100%)
 rename {upstart-jobs => modules/services/networking}/ntpd.nix (97%)
 rename {upstart-jobs => modules/services/networking}/openfire.nix (100%)
 rename {upstart-jobs => modules/services/networking}/openvpn.nix (100%)
 rename {upstart-jobs => modules/services/networking}/portmap.nix (93%)
 rename {upstart-jobs => modules/services/networking/ssh}/lshd.nix (100%)
 rename {upstart-jobs => modules/services/networking/ssh}/sshd.nix (96%)
 rename {upstart-jobs => modules/services/networking}/vsftpd.nix (95%)
 rename {upstart-jobs => modules/services/printing}/cupsd.nix (100%)
 rename {upstart-jobs => modules/services/scheduling}/atd.nix (91%)
 rename etc/pam.d/atd => modules/services/scheduling/atd.pam (100%)
 rename {upstart-jobs => modules/services/scheduling}/cron.nix (97%)
 rename {upstart-jobs => modules/services/scheduling}/fcron.nix (100%)
 rename {upstart-jobs => modules/services/system}/consolekit.nix (88%)
 rename {upstart-jobs => modules/services/system}/dbus.nix (94%)
 rename {upstart-jobs => modules/services/system}/nscd.conf (100%)
 rename {upstart-jobs => modules/services/system}/nscd.nix (93%)
 rename {upstart-jobs => modules/services/ttys}/gpm.nix (93%)
 rename {upstart-jobs => modules/services/ttys}/mingetty.nix (100%)
 rename {upstart-jobs => modules/services/web-servers}/apache-httpd/default.nix (99%)
 rename {upstart-jobs => modules/services/web-servers}/apache-httpd/per-server-options.nix (100%)
 rename {upstart-jobs => modules/services/web-servers}/apache-httpd/subversion.nix (100%)
 rename {upstart-jobs => modules/services/web-servers}/apache-httpd/tomcat-connector.nix (100%)
 rename {upstart-jobs => modules/services/web-servers}/apache-httpd/twiki.nix (100%)
 rename {upstart-jobs => modules/services/web-servers}/apache-httpd/zabbix.nix (100%)
 rename {upstart-jobs => modules/services/web-servers}/jboss.nix (100%)
 rename {upstart-jobs => modules/services/web-servers}/tomcat.nix (97%)
 rename {upstart-jobs => modules/services/x11}/xfs.conf (100%)
 rename {upstart-jobs => modules/services/x11}/xfs.nix (100%)
 rename {upstart-jobs => modules/services/x11}/xserver/default.nix (99%)
 rename {upstart-jobs => modules/services/x11}/xserver/desktopManager/default.nix (100%)
 rename {upstart-jobs => modules/services/x11}/xserver/desktopManager/gnome.nix (100%)
 rename {upstart-jobs => modules/services/x11}/xserver/desktopManager/kde.nix (97%)
 rename etc/pam.d/kde => modules/services/x11/xserver/desktopManager/kde.pam (100%)
 rename {upstart-jobs => modules/services/x11}/xserver/desktopManager/kde4.nix (97%)
 rename {upstart-jobs => modules/services/x11}/xserver/desktopManager/kdeEnvironment.nix (100%)
 rename {upstart-jobs => modules/services/x11}/xserver/desktopManager/none.nix (100%)
 rename {upstart-jobs => modules/services/x11}/xserver/desktopManager/xterm.nix (100%)
 rename {upstart-jobs => modules/services/x11}/xserver/displayManager/default.nix (100%)
 rename {upstart-jobs => modules/services/x11}/xserver/displayManager/kdm.nix (100%)
 rename {upstart-jobs => modules/services/x11}/xserver/displayManager/slim.nix (98%)
 rename etc/pam.d/slim => modules/services/x11/xserver/displayManager/slim.pam (100%)
 rename {upstart-jobs => modules/services/x11}/xserver/windowManager/compiz.nix (100%)
 rename {upstart-jobs => modules/services/x11}/xserver/windowManager/default.nix (100%)
 rename {upstart-jobs => modules/services/x11}/xserver/windowManager/kwm.nix (100%)
 rename {upstart-jobs => modules/services/x11}/xserver/windowManager/metacity.nix (100%)
 rename {upstart-jobs => modules/services/x11}/xserver/windowManager/none.nix (100%)
 rename {upstart-jobs => modules/services/x11}/xserver/windowManager/twm.nix (100%)
 rename {upstart-jobs => modules/services/x11}/xserver/windowManager/wmii.nix (100%)
 rename {upstart-jobs => modules/services/x11}/xserver/windowManager/xmonad.nix (100%)
 rename {upstart-jobs => modules/services/x11}/xserver/xserver.conf (100%)
 delete mode 100644 upstart-jobs/httpd.nix

diff --git a/upstart-jobs/alsa.nix b/modules/services/audio/alsa.nix
similarity index 93%
rename from upstart-jobs/alsa.nix
rename to modules/services/audio/alsa.nix
index d5dd5bec0e4..51c2e924438 100644
--- a/upstart-jobs/alsa.nix
+++ b/modules/services/audio/alsa.nix
@@ -34,7 +34,7 @@ let
   # not used (e.g., doesn't own any devices).
   group = {
     name = "audio";
-    gid = (import ../system/ids.nix).gids.audio;
+    gid = (import ../../../system/ids.nix).gids.audio;
   };
 
   job = {
@@ -72,7 +72,7 @@ in
 
 mkIf config.sound.enable {
   require = [
-    ../upstart-jobs/default.nix # config.services.extraJobs
+    # ../upstart-jobs/default.nix # config.services.extraJobs
     # ../system/user.nix # users.*
     # ? # config.environment.extraPackages
     options
diff --git a/upstart-jobs/pulseaudio.nix b/modules/services/audio/pulseaudio.nix
similarity index 94%
rename from upstart-jobs/pulseaudio.nix
rename to modules/services/audio/pulseaudio.nix
index 173f96db7fc..05ec99bae92 100644
--- a/upstart-jobs/pulseaudio.nix
+++ b/modules/services/audio/pulseaudio.nix
@@ -4,8 +4,8 @@
 let
   inherit (pkgs.lib) mkOption mkIf;
 
-  uid = (import ../system/ids.nix).uids.pulseaudio;
-  gid = (import ../system/ids.nix).gids.pulseaudio;
+  uid = (import ../../../system/ids.nix).uids.pulseaudio;
+  gid = (import ../../../system/ids.nix).gids.pulseaudio;
 
   options = {
     services = {
diff --git a/upstart-jobs/mysql.nix b/modules/services/databases/mysql.nix
similarity index 100%
rename from upstart-jobs/mysql.nix
rename to modules/services/databases/mysql.nix
diff --git a/upstart-jobs/postgresql.nix b/modules/services/databases/postgresql.nix
similarity index 100%
rename from upstart-jobs/postgresql.nix
rename to modules/services/databases/postgresql.nix
diff --git a/upstart-jobs/acpid.nix b/modules/services/hardware/acpid.nix
similarity index 100%
rename from upstart-jobs/acpid.nix
rename to modules/services/hardware/acpid.nix
diff --git a/upstart-jobs/hal.nix b/modules/services/hardware/hal.nix
similarity index 90%
rename from upstart-jobs/hal.nix
rename to modules/services/hardware/hal.nix
index d9e53a268e7..4a12973b853 100644
--- a/upstart-jobs/hal.nix
+++ b/modules/services/hardware/hal.nix
@@ -36,13 +36,13 @@ let
 
   user = {
     name = "haldaemon";
-    uid = (import ../system/ids.nix).uids.haldaemon;
+    uid = (import ../../../system/ids.nix).uids.haldaemon;
     description = "HAL daemon user";
   };
 
   group = {
     name = "haldaemon";
-    gid = (import ../system/ids.nix).gids.haldaemon;
+    gid = (import ../../../system/ids.nix).gids.haldaemon;
   };
 
   fdi =
@@ -87,10 +87,10 @@ in
 
 mkIf cfg.enable {
   require = [
-    ../upstart-jobs/default.nix # config.services.extraJobs
+    # ../upstart-jobs/default.nix # config.services.extraJobs
     # ../system/user.nix # users.*
     # ../upstart-jobs/udev.nix # services.udev.*
-    ../upstart-jobs/dbus.nix # services.dbus.*
+    # ../upstart-jobs/dbus.nix # services.dbus.*
     # ? # config.environment.extraPackages
     options
   ];
diff --git a/upstart-jobs/udev-firmware-loader.sh b/modules/services/hardware/udev-firmware-loader.sh
similarity index 100%
rename from upstart-jobs/udev-firmware-loader.sh
rename to modules/services/hardware/udev-firmware-loader.sh
diff --git a/upstart-jobs/udev.nix b/modules/services/hardware/udev.nix
similarity index 100%
rename from upstart-jobs/udev.nix
rename to modules/services/hardware/udev.nix
diff --git a/upstart-jobs/klogd.nix b/modules/services/logging/klogd.nix
similarity index 100%
rename from upstart-jobs/klogd.nix
rename to modules/services/logging/klogd.nix
diff --git a/upstart-jobs/syslogd.nix b/modules/services/logging/syslogd.nix
similarity index 100%
rename from upstart-jobs/syslogd.nix
rename to modules/services/logging/syslogd.nix
diff --git a/upstart-jobs/dovecot.nix b/modules/services/mail/dovecot.nix
similarity index 98%
rename from upstart-jobs/dovecot.nix
rename to modules/services/mail/dovecot.nix
index 8a70a5462d1..7bc091deba7 100644
--- a/upstart-jobs/dovecot.nix
+++ b/modules/services/mail/dovecot.nix
@@ -44,7 +44,7 @@ let
   startingDependency = if config.services.gw6c.enable then "gw6c" else "network-interfaces";
 
   cfg = config.services.dovecot;
-  idList = import ../system/ids.nix;
+  idList = import ../../../system/ids.nix;
 
   dovecotConf = 
   ''
diff --git a/upstart-jobs/postfix.nix b/modules/services/mail/postfix.nix
similarity index 99%
rename from upstart-jobs/postfix.nix
rename to modules/services/mail/postfix.nix
index 8db43693b94..b92bef666a0 100644
--- a/upstart-jobs/postfix.nix
+++ b/modules/services/mail/postfix.nix
@@ -156,7 +156,7 @@ let
   user = cfg.user;
   group = cfg.group;
   setgidGroup = cfg.setgidGroup;
-  idList = import ../system/ids.nix;
+  idList = import ../../../system/ids.nix;
 
   optionalString = pkgs.lib.optionalString;
   concatStringsSep = pkgs.lib.concatStringsSep;
diff --git a/upstart-jobs/autofs.nix b/modules/services/misc/autofs.nix
similarity index 100%
rename from upstart-jobs/autofs.nix
rename to modules/services/misc/autofs.nix
diff --git a/upstart-jobs/disnix.nix b/modules/services/misc/disnix.nix
similarity index 94%
rename from upstart-jobs/disnix.nix
rename to modules/services/misc/disnix.nix
index cbca7af7f8f..0f80cf6804c 100644
--- a/upstart-jobs/disnix.nix
+++ b/modules/services/misc/disnix.nix
@@ -48,8 +48,8 @@ in
 
 mkIf cfg.enable {
   require = [
-    ../upstart-jobs/default.nix
-    ../upstart-jobs/dbus.nix # services.dbus.*
+    #../upstart-jobs/default.nix
+    #../upstart-jobs/dbus.nix # services.dbus.*
     options
   ];
 
diff --git a/upstart-jobs/nix.nix b/modules/services/misc/nix-daemon.nix
similarity index 100%
rename from upstart-jobs/nix.nix
rename to modules/services/misc/nix-daemon.nix
diff --git a/upstart-jobs/manual.nix b/modules/services/misc/nixos-manual.nix
similarity index 98%
rename from upstart-jobs/manual.nix
rename to modules/services/misc/nixos-manual.nix
index 52cc9cd2a80..9ff0150c921 100644
--- a/upstart-jobs/manual.nix
+++ b/modules/services/misc/nixos-manual.nix
@@ -78,7 +78,7 @@ mkIf enable {
   services = {
 
     extraJobs = [{
-      name = "showManual";
+      name = "nixos-manual";
 
       job = ''
         description "NixOS manual"
diff --git a/upstart-jobs/rogue.nix b/modules/services/misc/rogue.nix
similarity index 100%
rename from upstart-jobs/rogue.nix
rename to modules/services/misc/rogue.nix
diff --git a/upstart-jobs/synergy.nix b/modules/services/misc/synergy.nix
similarity index 100%
rename from upstart-jobs/synergy.nix
rename to modules/services/misc/synergy.nix
diff --git a/upstart-jobs/nagios/commands.cfg b/modules/services/monitoring/nagios/commands.cfg
similarity index 100%
rename from upstart-jobs/nagios/commands.cfg
rename to modules/services/monitoring/nagios/commands.cfg
diff --git a/upstart-jobs/nagios/default.nix b/modules/services/monitoring/nagios/default.nix
similarity index 97%
rename from upstart-jobs/nagios/default.nix
rename to modules/services/monitoring/nagios/default.nix
index 4bfbae4e413..c88f486a787 100644
--- a/upstart-jobs/nagios/default.nix
+++ b/modules/services/monitoring/nagios/default.nix
@@ -137,7 +137,7 @@ let
 
   user = {
     name = nagiosUser;
-    uid = (import ../../system/ids.nix).uids.nagios;
+    uid = (import ../../../../system/ids.nix).uids.nagios;
     description = "Nagios monitoring daemon";
     home = nagiosState;
   };
@@ -175,7 +175,7 @@ in
 
 mkIf cfg.enable {
   require = [
-    ../../upstart-jobs/default.nix # config.services.extraJobs
+    # ../../upstart-jobs/default.nix # config.services.extraJobs
     # ../../system/user.nix # users = { .. }
     # ? # config.environment.etc
     # ? # config.environment.extraPackages
diff --git a/upstart-jobs/nagios/host-templates.cfg b/modules/services/monitoring/nagios/host-templates.cfg
similarity index 100%
rename from upstart-jobs/nagios/host-templates.cfg
rename to modules/services/monitoring/nagios/host-templates.cfg
diff --git a/upstart-jobs/nagios/service-templates.cfg b/modules/services/monitoring/nagios/service-templates.cfg
similarity index 100%
rename from upstart-jobs/nagios/service-templates.cfg
rename to modules/services/monitoring/nagios/service-templates.cfg
diff --git a/upstart-jobs/nagios/timeperiods.cfg b/modules/services/monitoring/nagios/timeperiods.cfg
similarity index 100%
rename from upstart-jobs/nagios/timeperiods.cfg
rename to modules/services/monitoring/nagios/timeperiods.cfg
diff --git a/upstart-jobs/zabbix-agent.nix b/modules/services/monitoring/zabbix-agent.nix
similarity index 95%
rename from upstart-jobs/zabbix-agent.nix
rename to modules/services/monitoring/zabbix-agent.nix
index a310c12a50a..402e57d21b5 100644
--- a/upstart-jobs/zabbix-agent.nix
+++ b/modules/services/monitoring/zabbix-agent.nix
@@ -52,7 +52,7 @@ let
 
   user = {
     name = "zabbix";
-    uid = (import ../system/ids.nix).uids.zabbix;
+    uid = (import ../../../system/ids.nix).uids.zabbix;
     description = "Zabbix daemon user";
   };
 
@@ -93,7 +93,7 @@ in
 
 {
   require = [
-    ../upstart-jobs/default.nix
+    # ../upstart-jobs/default.nix
     # ../system/user.nix # users = { .. }
     options
   ];
diff --git a/upstart-jobs/zabbix-server.nix b/modules/services/monitoring/zabbix-server.nix
similarity index 96%
rename from upstart-jobs/zabbix-server.nix
rename to modules/services/monitoring/zabbix-server.nix
index bc083d03163..265565ba602 100644
--- a/upstart-jobs/zabbix-server.nix
+++ b/modules/services/monitoring/zabbix-server.nix
@@ -42,7 +42,7 @@ let
 
   user = {
     name = "zabbix";
-    uid = (import ../system/ids.nix).uids.zabbix;
+    uid = (import ../../../system/ids.nix).uids.zabbix;
     description = "Zabbix daemon user";
   };
 
@@ -86,7 +86,7 @@ in
 
 {
   require = [
-    ../upstart-jobs/default.nix
+    # ../upstart-jobs/default.nix
     # ../system/user.nix # users = { .. }
     options
   ];
diff --git a/upstart-jobs/nfs-kernel.nix b/modules/services/network-filesystems/nfs-kernel.nix
similarity index 100%
rename from upstart-jobs/nfs-kernel.nix
rename to modules/services/network-filesystems/nfs-kernel.nix
diff --git a/upstart-jobs/samba.nix b/modules/services/network-filesystems/samba.nix
similarity index 100%
rename from upstart-jobs/samba.nix
rename to modules/services/network-filesystems/samba.nix
diff --git a/upstart-jobs/avahi-daemon.nix b/modules/services/networking/avahi-daemon.nix
similarity index 91%
rename from upstart-jobs/avahi-daemon.nix
rename to modules/services/networking/avahi-daemon.nix
index 063b16b8f4d..a504bf9b6a0 100644
--- a/upstart-jobs/avahi-daemon.nix
+++ b/modules/services/networking/avahi-daemon.nix
@@ -120,12 +120,12 @@ in
 
 mkIf cfg.enable {
   require = [
-    ../upstart-jobs/default.nix # config.services.extraJobs
+    # ../upstart-jobs/default.nix # config.services.extraJobs
     # ../system/? # system.nssModules
     # ? # config.environment.etc
     # ../system/user.nix # users.*
     # ../upstart-jobs/udev.nix # services.udev.*
-    ../upstart-jobs/dbus.nix # services.dbus.*
+    # ../upstart-jobs/dbus.nix # services.dbus.*
     # ? # config.environment.extraPackages
     options
   ];
@@ -138,14 +138,17 @@ mkIf cfg.enable {
     extraPackages = [avahi];
 
     # Name Service Switch configuration file.  Required by the C library.
+    # !!! This should be done in some other way, e.g., this module
+    # should define an option used by the hypothetical module that
+    # generates nsswitch.conf.
     etc = mkIf cfg.nssmdns (mkThenElse {
       thenPart = [{
-        source = ../etc/nsswitch-mdns.conf;
+        source = ../../../etc/nsswitch-mdns.conf;
         target = "nsswitch.conf";
       }];
 
       elsePart = [{
-        source = ../etc/nsswitch.conf;
+        source = ../../../etc/nsswitch.conf;
         target = "nsswitch.conf";
       }];
     });
diff --git a/upstart-jobs/bind.nix b/modules/services/networking/bind.nix
similarity index 100%
rename from upstart-jobs/bind.nix
rename to modules/services/networking/bind.nix
diff --git a/upstart-jobs/bitlbee.nix b/modules/services/networking/bitlbee.nix
similarity index 100%
rename from upstart-jobs/bitlbee.nix
rename to modules/services/networking/bitlbee.nix
diff --git a/upstart-jobs/dhclient.nix b/modules/services/networking/dhclient.nix
similarity index 98%
rename from upstart-jobs/dhclient.nix
rename to modules/services/networking/dhclient.nix
index ddf1bf9cffb..32e71f5af60 100644
--- a/upstart-jobs/dhclient.nix
+++ b/modules/services/networking/dhclient.nix
@@ -55,7 +55,7 @@ in
 
 {
   require = [
-    ../upstart-jobs/default.nix
+    #../upstart-jobs/default.nix
     options
   ];
 
diff --git a/upstart-jobs/dhcpd.nix b/modules/services/networking/dhcpd.nix
similarity index 100%
rename from upstart-jobs/dhcpd.nix
rename to modules/services/networking/dhcpd.nix
diff --git a/upstart-jobs/ejabberd.nix b/modules/services/networking/ejabberd.nix
similarity index 100%
rename from upstart-jobs/ejabberd.nix
rename to modules/services/networking/ejabberd.nix
diff --git a/upstart-jobs/gnunet.nix b/modules/services/networking/gnunet.nix
similarity index 100%
rename from upstart-jobs/gnunet.nix
rename to modules/services/networking/gnunet.nix
diff --git a/upstart-jobs/gw6c.nix b/modules/services/networking/gw6c.nix
similarity index 100%
rename from upstart-jobs/gw6c.nix
rename to modules/services/networking/gw6c.nix
diff --git a/upstart-jobs/ifplugd.nix b/modules/services/networking/ifplugd.nix
similarity index 100%
rename from upstart-jobs/ifplugd.nix
rename to modules/services/networking/ifplugd.nix
diff --git a/upstart-jobs/ircd-hybrid.nix b/modules/services/networking/ircd-hybrid.nix
similarity index 100%
rename from upstart-jobs/ircd-hybrid.nix
rename to modules/services/networking/ircd-hybrid.nix
diff --git a/upstart-jobs/ntpd.nix b/modules/services/networking/ntpd.nix
similarity index 97%
rename from upstart-jobs/ntpd.nix
rename to modules/services/networking/ntpd.nix
index 93c88734e39..b7723347ea3 100644
--- a/upstart-jobs/ntpd.nix
+++ b/modules/services/networking/ntpd.nix
@@ -72,7 +72,7 @@ mkIf config.services.ntp.enable {
       
       users = [
         { name = ntpUser;
-          uid = (import ../system/ids.nix).uids.ntp;
+          uid = (import ../../../system/ids.nix).uids.ntp;
           description = "NTP daemon user";
           home = stateDir;
         }
diff --git a/upstart-jobs/openfire.nix b/modules/services/networking/openfire.nix
similarity index 100%
rename from upstart-jobs/openfire.nix
rename to modules/services/networking/openfire.nix
diff --git a/upstart-jobs/openvpn.nix b/modules/services/networking/openvpn.nix
similarity index 100%
rename from upstart-jobs/openvpn.nix
rename to modules/services/networking/openvpn.nix
diff --git a/upstart-jobs/portmap.nix b/modules/services/networking/portmap.nix
similarity index 93%
rename from upstart-jobs/portmap.nix
rename to modules/services/networking/portmap.nix
index e188a2d41b6..74f2fd68e79 100644
--- a/upstart-jobs/portmap.nix
+++ b/modules/services/networking/portmap.nix
@@ -37,8 +37,8 @@ in
 
 ###### implementation
 
-let uid = (import ../system/ids.nix).uids.portmap;
-    gid = (import ../system/ids.nix).gids.portmap;
+let uid = (import ../../../system/ids.nix).uids.portmap;
+    gid = (import ../../../system/ids.nix).gids.portmap;
 in
 
 mkIf config.services.portmap.enable {
diff --git a/upstart-jobs/lshd.nix b/modules/services/networking/ssh/lshd.nix
similarity index 100%
rename from upstart-jobs/lshd.nix
rename to modules/services/networking/ssh/lshd.nix
diff --git a/upstart-jobs/sshd.nix b/modules/services/networking/ssh/sshd.nix
similarity index 96%
rename from upstart-jobs/sshd.nix
rename to modules/services/networking/ssh/sshd.nix
index 38ccb2c19a1..a50bafac236 100644
--- a/upstart-jobs/sshd.nix
+++ b/modules/services/networking/ssh/sshd.nix
@@ -85,7 +85,7 @@ let
     
   '';
 
-  sshdUid = (import ../system/ids.nix).uids.sshd;
+  sshdUid = (import ../../../../system/ids.nix).uids.sshd;
 
   # !!! is this assertion evaluated anywhere???
   assertion = cfg.permitRootLogin == "yes" ||
@@ -104,7 +104,7 @@ mkIf config.services.sshd.enable {
   users = {
     extraUsers = [
       { name = "sshd";
-        uid = (import ../system/ids.nix).uids.sshd;
+        uid = (import ../../../../system/ids.nix).uids.sshd;
         description = "SSH privilege separation user";
         home = "/var/empty";
       }
diff --git a/upstart-jobs/vsftpd.nix b/modules/services/networking/vsftpd.nix
similarity index 95%
rename from upstart-jobs/vsftpd.nix
rename to modules/services/networking/vsftpd.nix
index c112967e45f..753fde465d7 100644
--- a/upstart-jobs/vsftpd.nix
+++ b/modules/services/networking/vsftpd.nix
@@ -95,13 +95,13 @@ mkIf config.services.vsftpd.enable {
   users = {
     extraUsers = [
         { name = "vsftpd";
-          uid = (import ../system/ids.nix).uids.vsftpd;
+          uid = (import ../../../system/ids.nix).uids.vsftpd;
           description = "VSFTPD user";
           home = "/homeless-shelter";
         }
       ] ++ pkgs.lib.optional anonymousUser
         { name = "ftp";
-          uid = (import ../system/ids.nix).uids.ftp;
+          uid = (import ../../../system/ids.nix).uids.ftp;
           group = "ftp";
           description = "Anonymous ftp user";
           home = "/home/ftp";
@@ -109,7 +109,7 @@ mkIf config.services.vsftpd.enable {
 
     extraGroups = [
       { name = "ftp";
-        gid = (import ../system/ids.nix).gids.ftp;
+        gid = (import ../../../system/ids.nix).gids.ftp;
       }
     ];
       
diff --git a/upstart-jobs/cupsd.nix b/modules/services/printing/cupsd.nix
similarity index 100%
rename from upstart-jobs/cupsd.nix
rename to modules/services/printing/cupsd.nix
diff --git a/upstart-jobs/atd.nix b/modules/services/scheduling/atd.nix
similarity index 91%
rename from upstart-jobs/atd.nix
rename to modules/services/scheduling/atd.nix
index 60f1daf7949..bf5861d8e4f 100644
--- a/upstart-jobs/atd.nix
+++ b/modules/services/scheduling/atd.nix
@@ -37,14 +37,14 @@ let
 
   user = {
     name = "atd";
-    uid = (import ../system/ids.nix).uids.atd;
+    uid = (import ../../../system/ids.nix).uids.atd;
     description = "atd user";
     home = "/var/empty";
   };
 
   group = {
     name = "atd";
-    gid = (import ../system/ids.nix).gids.atd;
+    gid = (import ../../../system/ids.nix).gids.atd;
   };
 
   job = ''
@@ -95,13 +95,13 @@ mkIf cfg.enable {
     options
 
     # config.services.extraJobs
-    ../upstart-jobs/default.nix
+    #../upstart-jobs/default.nix
 
     # config.environment.etc
-    ../etc/default.nix
+    #../etc/default.nix
 
     # users.*
-    ../system/users-groups.nix
+    #../system/users-groups.nix
 
     # ? # config.environment.extraPackages
     # ? # config.security.extraSetuidPrograms
@@ -121,7 +121,7 @@ mkIf cfg.enable {
     extraPackages = [ at ];
 
     etc = [{
-      source = ../etc/pam.d/atd;
+      source = ./atd.pam;
       target = "pam.d/atd";
     }];
   };
diff --git a/etc/pam.d/atd b/modules/services/scheduling/atd.pam
similarity index 100%
rename from etc/pam.d/atd
rename to modules/services/scheduling/atd.pam
diff --git a/upstart-jobs/cron.nix b/modules/services/scheduling/cron.nix
similarity index 97%
rename from upstart-jobs/cron.nix
rename to modules/services/scheduling/cron.nix
index a73a7eefa00..cef505c9a34 100644
--- a/upstart-jobs/cron.nix
+++ b/modules/services/scheduling/cron.nix
@@ -54,7 +54,7 @@ in
 
 {
   require = [
-    ../upstart-jobs/default.nix # config.services.extraJobs
+    # ../upstart-jobs/default.nix # config.services.extraJobs
     # ? # config.time.timeZone
     # ? # config.environment.etc
     # ? # config.environment.extraPackages
diff --git a/upstart-jobs/fcron.nix b/modules/services/scheduling/fcron.nix
similarity index 100%
rename from upstart-jobs/fcron.nix
rename to modules/services/scheduling/fcron.nix
diff --git a/upstart-jobs/consolekit.nix b/modules/services/system/consolekit.nix
similarity index 88%
rename from upstart-jobs/consolekit.nix
rename to modules/services/system/consolekit.nix
index 554d2c4cfb6..de3fc8897c0 100644
--- a/upstart-jobs/consolekit.nix
+++ b/modules/services/system/consolekit.nix
@@ -43,8 +43,8 @@ in
 
 mkIf cfg.enable {
   require = [
-    ../upstart-jobs/default.nix # config.services.extraJobs
-    ../upstart-jobs/dbus.nix # services.dbus.*
+    #../upstart-jobs/default.nix # config.services.extraJobs
+    #../upstart-jobs/dbus.nix # services.dbus.*
     options
   ];
 
diff --git a/upstart-jobs/dbus.nix b/modules/services/system/dbus.nix
similarity index 94%
rename from upstart-jobs/dbus.nix
rename to modules/services/system/dbus.nix
index 6d67970576a..b277a5e95c1 100644
--- a/upstart-jobs/dbus.nix
+++ b/modules/services/system/dbus.nix
@@ -55,7 +55,7 @@ let
 
   user = {
     name = "messagebus";
-    uid = (import ../system/ids.nix).uids.messagebus;
+    uid = (import ../../../system/ids.nix).uids.messagebus;
     description = "D-Bus system message bus daemon user";
     home = homeDir;
   };
@@ -96,7 +96,7 @@ in
 
 mkIf cfg.enable {
   require = [
-    ../upstart-jobs/default.nix # config.services.extraJobs
+    # ../upstart-jobs/default.nix # config.services.extraJobs
     # ../system/user.nix # users.*
     # ? # config.environment.extraPackages
     options
diff --git a/upstart-jobs/nscd.conf b/modules/services/system/nscd.conf
similarity index 100%
rename from upstart-jobs/nscd.conf
rename to modules/services/system/nscd.conf
diff --git a/upstart-jobs/nscd.nix b/modules/services/system/nscd.nix
similarity index 93%
rename from upstart-jobs/nscd.nix
rename to modules/services/system/nscd.nix
index fe89cdc5646..d2b01876e85 100644
--- a/upstart-jobs/nscd.nix
+++ b/modules/services/system/nscd.nix
@@ -13,7 +13,7 @@ in
         
         users = [
           { name = "nscd";
-            uid = (import ../system/ids.nix).uids.nscd;
+            uid = (import ../../../system/ids.nix).uids.nscd;
             description = "Name service cache daemon user";
           }
         ];
diff --git a/upstart-jobs/gpm.nix b/modules/services/ttys/gpm.nix
similarity index 93%
rename from upstart-jobs/gpm.nix
rename to modules/services/ttys/gpm.nix
index fb4f3be5890..35ecab0083d 100644
--- a/upstart-jobs/gpm.nix
+++ b/modules/services/ttys/gpm.nix
@@ -47,7 +47,7 @@ in
 
 mkIf cfg.enable {
   require = [
-    ../upstart-jobs/default.nix # config.services.extraJobs
+    # ../upstart-jobs/default.nix # config.services.extraJobs
     # /etc/security/console.perms (should be generated ?)
     options
   ];
diff --git a/upstart-jobs/mingetty.nix b/modules/services/ttys/mingetty.nix
similarity index 100%
rename from upstart-jobs/mingetty.nix
rename to modules/services/ttys/mingetty.nix
diff --git a/upstart-jobs/apache-httpd/default.nix b/modules/services/web-servers/apache-httpd/default.nix
similarity index 99%
rename from upstart-jobs/apache-httpd/default.nix
rename to modules/services/web-servers/apache-httpd/default.nix
index b8fb5df4d48..60185c6bbc1 100644
--- a/upstart-jobs/apache-httpd/default.nix
+++ b/modules/services/web-servers/apache-httpd/default.nix
@@ -195,7 +195,7 @@ let
 
         };
       } // # Include the options shared between the main server and virtual hosts.
-          (import ../../upstart-jobs/apache-httpd/per-server-options.nix {
+          (import ./per-server-options.nix {
            inherit mkOption;
            forMainServer = true;
         });
diff --git a/upstart-jobs/apache-httpd/per-server-options.nix b/modules/services/web-servers/apache-httpd/per-server-options.nix
similarity index 100%
rename from upstart-jobs/apache-httpd/per-server-options.nix
rename to modules/services/web-servers/apache-httpd/per-server-options.nix
diff --git a/upstart-jobs/apache-httpd/subversion.nix b/modules/services/web-servers/apache-httpd/subversion.nix
similarity index 100%
rename from upstart-jobs/apache-httpd/subversion.nix
rename to modules/services/web-servers/apache-httpd/subversion.nix
diff --git a/upstart-jobs/apache-httpd/tomcat-connector.nix b/modules/services/web-servers/apache-httpd/tomcat-connector.nix
similarity index 100%
rename from upstart-jobs/apache-httpd/tomcat-connector.nix
rename to modules/services/web-servers/apache-httpd/tomcat-connector.nix
diff --git a/upstart-jobs/apache-httpd/twiki.nix b/modules/services/web-servers/apache-httpd/twiki.nix
similarity index 100%
rename from upstart-jobs/apache-httpd/twiki.nix
rename to modules/services/web-servers/apache-httpd/twiki.nix
diff --git a/upstart-jobs/apache-httpd/zabbix.nix b/modules/services/web-servers/apache-httpd/zabbix.nix
similarity index 100%
rename from upstart-jobs/apache-httpd/zabbix.nix
rename to modules/services/web-servers/apache-httpd/zabbix.nix
diff --git a/upstart-jobs/jboss.nix b/modules/services/web-servers/jboss.nix
similarity index 100%
rename from upstart-jobs/jboss.nix
rename to modules/services/web-servers/jboss.nix
diff --git a/upstart-jobs/tomcat.nix b/modules/services/web-servers/tomcat.nix
similarity index 97%
rename from upstart-jobs/tomcat.nix
rename to modules/services/web-servers/tomcat.nix
index f714e2387f3..592fd0fcbf5 100644
--- a/upstart-jobs/tomcat.nix
+++ b/modules/services/web-servers/tomcat.nix
@@ -73,13 +73,13 @@ mkIf config.services.tomcat.enable {
       
       groups = [
         { name = "tomcat";
-          gid = (import ../system/ids.nix).gids.tomcat;
+          gid = (import ../../../system/ids.nix).gids.tomcat;
         }
       ];
       
       users = [
         { name = "tomcat";
-          uid = (import ../system/ids.nix).uids.tomcat;
+          uid = (import ../../../system/ids.nix).uids.tomcat;
           description = "Tomcat user";
           home = "/homeless-shelter";
         }
diff --git a/upstart-jobs/xfs.conf b/modules/services/x11/xfs.conf
similarity index 100%
rename from upstart-jobs/xfs.conf
rename to modules/services/x11/xfs.conf
diff --git a/upstart-jobs/xfs.nix b/modules/services/x11/xfs.nix
similarity index 100%
rename from upstart-jobs/xfs.nix
rename to modules/services/x11/xfs.nix
diff --git a/upstart-jobs/xserver/default.nix b/modules/services/x11/xserver/default.nix
similarity index 99%
rename from upstart-jobs/xserver/default.nix
rename to modules/services/x11/xserver/default.nix
index 496a2a9e352..42642aa9137 100644
--- a/upstart-jobs/xserver/default.nix
+++ b/modules/services/x11/xserver/default.nix
@@ -475,13 +475,13 @@ mkIf cfg.enable {
     ./desktopManager/default.nix
 
     # services.extraJobs
-    ../../upstart-jobs/default.nix
+    # ../../upstart-jobs/default.nix
 
     # environment.etc
-    ../../etc/default.nix
+    # ../../etc/default.nix
 
     # fonts.fonts
-    ../../system/fonts.nix
+    # ../../system/fonts.nix
 
     # boot.extraModulePackages
     # security.extraSetuidPrograms
diff --git a/upstart-jobs/xserver/desktopManager/default.nix b/modules/services/x11/xserver/desktopManager/default.nix
similarity index 100%
rename from upstart-jobs/xserver/desktopManager/default.nix
rename to modules/services/x11/xserver/desktopManager/default.nix
diff --git a/upstart-jobs/xserver/desktopManager/gnome.nix b/modules/services/x11/xserver/desktopManager/gnome.nix
similarity index 100%
rename from upstart-jobs/xserver/desktopManager/gnome.nix
rename to modules/services/x11/xserver/desktopManager/gnome.nix
diff --git a/upstart-jobs/xserver/desktopManager/kde.nix b/modules/services/x11/xserver/desktopManager/kde.nix
similarity index 97%
rename from upstart-jobs/xserver/desktopManager/kde.nix
rename to modules/services/x11/xserver/desktopManager/kde.nix
index c9c1d239f43..15fbf666e9c 100644
--- a/upstart-jobs/xserver/desktopManager/kde.nix
+++ b/modules/services/x11/xserver/desktopManager/kde.nix
@@ -68,7 +68,7 @@ mkIf cfg.enable {
     ];
 
     etc = [
-      { source = ../../../etc/pam.d/kde;
+      { source = ./kde.pam;
         target = "pam.d/kde";
       }
       { source = "${pkgs.xkeyboard_config}/etc/X11/xkb";
diff --git a/etc/pam.d/kde b/modules/services/x11/xserver/desktopManager/kde.pam
similarity index 100%
rename from etc/pam.d/kde
rename to modules/services/x11/xserver/desktopManager/kde.pam
diff --git a/upstart-jobs/xserver/desktopManager/kde4.nix b/modules/services/x11/xserver/desktopManager/kde4.nix
similarity index 97%
rename from upstart-jobs/xserver/desktopManager/kde4.nix
rename to modules/services/x11/xserver/desktopManager/kde4.nix
index c23fa163a39..6cd25b3b459 100644
--- a/upstart-jobs/xserver/desktopManager/kde4.nix
+++ b/modules/services/x11/xserver/desktopManager/kde4.nix
@@ -64,7 +64,7 @@ mkIf cfg.enable {
     ];
 
     etc = [
-      { source = ../../../etc/pam.d/kde;
+      { source = ./kde.pam;
         target = "pam.d/kde";
       }
       { source = "${pkgs.xkeyboard_config}/etc/X11/xkb";
diff --git a/upstart-jobs/xserver/desktopManager/kdeEnvironment.nix b/modules/services/x11/xserver/desktopManager/kdeEnvironment.nix
similarity index 100%
rename from upstart-jobs/xserver/desktopManager/kdeEnvironment.nix
rename to modules/services/x11/xserver/desktopManager/kdeEnvironment.nix
diff --git a/upstart-jobs/xserver/desktopManager/none.nix b/modules/services/x11/xserver/desktopManager/none.nix
similarity index 100%
rename from upstart-jobs/xserver/desktopManager/none.nix
rename to modules/services/x11/xserver/desktopManager/none.nix
diff --git a/upstart-jobs/xserver/desktopManager/xterm.nix b/modules/services/x11/xserver/desktopManager/xterm.nix
similarity index 100%
rename from upstart-jobs/xserver/desktopManager/xterm.nix
rename to modules/services/x11/xserver/desktopManager/xterm.nix
diff --git a/upstart-jobs/xserver/displayManager/default.nix b/modules/services/x11/xserver/displayManager/default.nix
similarity index 100%
rename from upstart-jobs/xserver/displayManager/default.nix
rename to modules/services/x11/xserver/displayManager/default.nix
diff --git a/upstart-jobs/xserver/displayManager/kdm.nix b/modules/services/x11/xserver/displayManager/kdm.nix
similarity index 100%
rename from upstart-jobs/xserver/displayManager/kdm.nix
rename to modules/services/x11/xserver/displayManager/kdm.nix
diff --git a/upstart-jobs/xserver/displayManager/slim.nix b/modules/services/x11/xserver/displayManager/slim.nix
similarity index 98%
rename from upstart-jobs/xserver/displayManager/slim.nix
rename to modules/services/x11/xserver/displayManager/slim.nix
index 8e29bc77a5d..b3be8334b65 100644
--- a/upstart-jobs/xserver/displayManager/slim.nix
+++ b/modules/services/x11/xserver/displayManager/slim.nix
@@ -131,7 +131,7 @@ mkIf cfg.enable {
 
   environment = {
     etc = [
-      { source = ../../../etc/pam.d/slim;
+      { source = ./slim.pam;
         target = "pam.d/slim";
       }
     ];
diff --git a/etc/pam.d/slim b/modules/services/x11/xserver/displayManager/slim.pam
similarity index 100%
rename from etc/pam.d/slim
rename to modules/services/x11/xserver/displayManager/slim.pam
diff --git a/upstart-jobs/xserver/windowManager/compiz.nix b/modules/services/x11/xserver/windowManager/compiz.nix
similarity index 100%
rename from upstart-jobs/xserver/windowManager/compiz.nix
rename to modules/services/x11/xserver/windowManager/compiz.nix
diff --git a/upstart-jobs/xserver/windowManager/default.nix b/modules/services/x11/xserver/windowManager/default.nix
similarity index 100%
rename from upstart-jobs/xserver/windowManager/default.nix
rename to modules/services/x11/xserver/windowManager/default.nix
diff --git a/upstart-jobs/xserver/windowManager/kwm.nix b/modules/services/x11/xserver/windowManager/kwm.nix
similarity index 100%
rename from upstart-jobs/xserver/windowManager/kwm.nix
rename to modules/services/x11/xserver/windowManager/kwm.nix
diff --git a/upstart-jobs/xserver/windowManager/metacity.nix b/modules/services/x11/xserver/windowManager/metacity.nix
similarity index 100%
rename from upstart-jobs/xserver/windowManager/metacity.nix
rename to modules/services/x11/xserver/windowManager/metacity.nix
diff --git a/upstart-jobs/xserver/windowManager/none.nix b/modules/services/x11/xserver/windowManager/none.nix
similarity index 100%
rename from upstart-jobs/xserver/windowManager/none.nix
rename to modules/services/x11/xserver/windowManager/none.nix
diff --git a/upstart-jobs/xserver/windowManager/twm.nix b/modules/services/x11/xserver/windowManager/twm.nix
similarity index 100%
rename from upstart-jobs/xserver/windowManager/twm.nix
rename to modules/services/x11/xserver/windowManager/twm.nix
diff --git a/upstart-jobs/xserver/windowManager/wmii.nix b/modules/services/x11/xserver/windowManager/wmii.nix
similarity index 100%
rename from upstart-jobs/xserver/windowManager/wmii.nix
rename to modules/services/x11/xserver/windowManager/wmii.nix
diff --git a/upstart-jobs/xserver/windowManager/xmonad.nix b/modules/services/x11/xserver/windowManager/xmonad.nix
similarity index 100%
rename from upstart-jobs/xserver/windowManager/xmonad.nix
rename to modules/services/x11/xserver/windowManager/xmonad.nix
diff --git a/upstart-jobs/xserver/xserver.conf b/modules/services/x11/xserver/xserver.conf
similarity index 100%
rename from upstart-jobs/xserver/xserver.conf
rename to modules/services/x11/xserver/xserver.conf
diff --git a/system/activate-configuration.nix b/system/activate-configuration.nix
index 0db6f50e77c..8e9029d0943 100644
--- a/system/activate-configuration.nix
+++ b/system/activate-configuration.nix
@@ -42,7 +42,7 @@ in
             activateLib = removeAttrs withHeadlines ["activate"];
             activateLibNames = attrNames activateLib;
         in {
-        script = pkgs.writeScript "activationScript"
+        script = pkgs.writeScript "nixos-activation-script"
           ("#!/bin/sh\n"
            + textClosureMap id activateLib activateLibNames + "\n"
              # make sure that the activate snippet is added last.
diff --git a/system/options.nix b/system/options.nix
index 028afdae115..5932bc997be 100644
--- a/system/options.nix
+++ b/system/options.nix
@@ -379,133 +379,89 @@ in
   };
 
   require = [
-
-    ../system/assertion.nix
-
-    # boot (is it the right place ?)
-    ../system/kernel.nix
+    #../modules/hardware/network/intel-3945abg.nix
     ../boot/boot-stage-2.nix
+    ../etc/default.nix
     ../installer/grub.nix
-
-    # system
-    ../system/system-options.nix
+    ../modules/services/audio/alsa.nix
+    ../modules/services/audio/pulseaudio.nix
+    ../modules/services/databases/mysql.nix
+    ../modules/services/databases/postgresql.nix
+    ../modules/services/hardware/acpid.nix
+    ../modules/services/hardware/hal.nix
+    ../modules/services/hardware/udev.nix
+    ../modules/services/logging/klogd.nix
+    ../modules/services/logging/syslogd.nix
+    ../modules/services/mail/dovecot.nix
+    ../modules/services/mail/postfix.nix
+    ../modules/services/misc/autofs.nix
+    ../modules/services/misc/disnix.nix
+    ../modules/services/misc/nix-daemon.nix
+    ../modules/services/misc/nixos-manual.nix
+    ../modules/services/misc/rogue.nix
+    ../modules/services/misc/synergy.nix
+    ../modules/services/monitoring/nagios/default.nix
+    ../modules/services/monitoring/zabbix-agent.nix
+    ../modules/services/monitoring/zabbix-server.nix
+    ../modules/services/network-filesystems/nfs-kernel.nix
+    ../modules/services/network-filesystems/samba.nix # TODO: doesn't start here (?)
+    ../modules/services/networking/avahi-daemon.nix
+    ../modules/services/networking/bind.nix
+    ../modules/services/networking/bitlbee.nix
+    ../modules/services/networking/dhclient.nix
+    ../modules/services/networking/dhcpd.nix
+    ../modules/services/networking/ejabberd.nix # untested, dosen't compile on x86_64-linux
+    ../modules/services/networking/gnunet.nix
+    ../modules/services/networking/gw6c.nix
+    ../modules/services/networking/ifplugd.nix
+    ../modules/services/networking/ircd-hybrid.nix # TODO: doesn't compile on x86_64-linux, can't test
+    ../modules/services/networking/ntpd.nix
+    ../modules/services/networking/openfire.nix
+    ../modules/services/networking/openvpn.nix
+    ../modules/services/networking/portmap.nix
+    ../modules/services/networking/ssh/lshd.nix # GNU lshd SSH2 deamon (TODO: does neither start nor generate seed file ?)
+    ../modules/services/networking/ssh/sshd.nix
+    ../modules/services/networking/vsftpd.nix
+    ../modules/services/printing/cupsd.nix
+    ../modules/services/scheduling/atd.nix
+    ../modules/services/scheduling/cron.nix
+    ../modules/services/scheduling/fcron.nix
+    ../modules/services/system/consolekit.nix
+    ../modules/services/system/dbus.nix
+    ../modules/services/system/nscd.nix
+    ../modules/services/ttys/gpm.nix
+    ../modules/services/ttys/mingetty.nix
+    ../modules/services/web-servers/apache-httpd
+    ../modules/services/web-servers/jboss.nix
+    ../modules/services/web-servers/tomcat.nix # untested, too lazy to get that jdk
+    ../modules/services/x11/xfs.nix
+    ../modules/services/x11/xserver/default.nix
     ../system/activate-configuration.nix
-    ../upstart-jobs/default.nix
-
-    ../upstart-jobs/acpid.nix # ACPI daemon
-
-    ../system/unix-odbc-drivers.nix
-
-    ../upstart-jobs/klogd.nix
-
-    ../upstart-jobs/lvm.nix # Makes LVM logical volumes available.
-
-    ../upstart-jobs/swraid.nix # Activate software RAID arrays.
-
-    ../upstart-jobs/filesystems.nix # Mount file systems.
-
-    ../upstart-jobs/swap.nix
-    ../upstart-jobs/network-interfaces.nix
-    ../upstart-jobs/nscd.nix # Name service cache daemon.
-    ../upstart-jobs/maintenance-shell.nix # Handles the maintenance/stalled event (single-user shell).
-    ../upstart-jobs/ctrl-alt-delete.nix # Ctrl-alt-delete action.
-    ../upstart-jobs/halt.nix
-    ../upstart-jobs/ifplugd.nix # ifplugd daemon for monitoring Ethernet cables.
-
-
-    # security
-    ../system/sudo.nix
-
-    # i18n
+    ../system/assertion.nix
+    ../system/fonts.nix
     ../system/i18n.nix
-
-    # environment
-    ../etc/default.nix
-
+    ../system/kernel.nix
     ../system/nixos-environment.nix
-
-    # users
-    ../system/users-groups.nix
-
-    # newtworking
-    ../upstart-jobs/dhclient.nix
-
-    # hardware
-    ../upstart-jobs/pcmcia.nix
-
-    # security
+    ../system/nixos-installer.nix
     ../system/nixos-security.nix
-
-    # services
-    ../upstart-jobs/avahi-daemon.nix
-    ../upstart-jobs/atd.nix
-    ../upstart-jobs/dbus.nix
-    ../upstart-jobs/hal.nix
-    ../upstart-jobs/gpm.nix
-    ../upstart-jobs/nagios/default.nix
-    ../upstart-jobs/xserver/default.nix
-    ../upstart-jobs/zabbix-agent.nix
-    ../upstart-jobs/zabbix-server.nix
-    ../upstart-jobs/disnix.nix
-    ../upstart-jobs/consolekit.nix
-    ../upstart-jobs/cron.nix
-    ../upstart-jobs/fcron.nix
+    ../system/sudo.nix
+    ../system/system-options.nix
+    ../system/unix-odbc-drivers.nix
+    ../system/users-groups.nix
     ../upstart-jobs/cron/locate.nix
-    ../upstart-jobs/manual.nix
-    ../upstart-jobs/rogue.nix
+    ../upstart-jobs/ctrl-alt-delete.nix
+    ../upstart-jobs/default.nix
+    ../upstart-jobs/filesystems.nix
     ../upstart-jobs/guest-users.nix
-    ../upstart-jobs/pulseaudio.nix
+    ../upstart-jobs/halt.nix
     ../upstart-jobs/kbd.nix
-    ../upstart-jobs/gw6c.nix # Gateway6
-    ../upstart-jobs/syslogd.nix
-    ../upstart-jobs/dhcpd.nix
-    ../upstart-jobs/sshd.nix
-    ../upstart-jobs/lshd.nix # GNU lshd SSH2 deamon (TODO: does neither start nor generate seed file ?)
-    ../upstart-jobs/ntpd.nix
-    ../upstart-jobs/portmap.nix
-    ../upstart-jobs/bitlbee.nix
-    ../upstart-jobs/gnunet.nix
-    ../upstart-jobs/ejabberd.nix # untested, dosen't compile on x86_64-linux
-    ../upstart-jobs/jboss.nix
-    ../upstart-jobs/tomcat.nix # untested, too lazy to get that jdk
-    ../upstart-jobs/httpd.nix # Apache httpd (probably this can be removed ?)
-    ../upstart-jobs/apache-httpd # Apache httpd (new style).
-    ../upstart-jobs/vsftpd.nix
-    ../upstart-jobs/cupsd.nix # CUPS printing daemon
-    ../upstart-jobs/udev.nix # The udev daemon creates devices nodes and runs programs when hardware events occur.
-    ../upstart-jobs/samba.nix # TODO: doesn't start here (?)
-    ../upstart-jobs/ircd-hybrid.nix # TODO: doesn't compile on x86_64-linux, can't test
-    ../upstart-jobs/xfs.nix
-    ../upstart-jobs/mysql.nix
-    ../upstart-jobs/postgresql.nix
-    ../upstart-jobs/openfire.nix
-    ../upstart-jobs/postfix.nix
-    ../upstart-jobs/dovecot.nix
-    ../upstart-jobs/bind.nix
-
-    ../upstart-jobs/mingetty.nix # The terminals on ttyX.
-    ../upstart-jobs/tty-backgrounds.nix
-
-    ../upstart-jobs/synergy.nix
-    ../upstart-jobs/openvpn.nix
-
-    ../upstart-jobs/nfs-kernel.nix
-    ../upstart-jobs/autofs.nix
-
-    # nix
-    ../upstart-jobs/nix.nix # nix options and daemon
-    ../system/nixos-installer.nix
-
-
-    #users
     ../upstart-jobs/ldap
-
-
-
-    # fonts
-    ../system/fonts.nix
-
-    # sound
-    ../upstart-jobs/alsa.nix
+    ../upstart-jobs/lvm.nix
+    ../upstart-jobs/maintenance-shell.nix
+    ../upstart-jobs/network-interfaces.nix
+    ../upstart-jobs/pcmcia.nix
+    ../upstart-jobs/swap.nix
+    ../upstart-jobs/swraid.nix
+    ../upstart-jobs/tty-backgrounds.nix
   ];
 }
diff --git a/upstart-jobs/cron/locate.nix b/upstart-jobs/cron/locate.nix
index bbb41f6e943..3e249007dc3 100644
--- a/upstart-jobs/cron/locate.nix
+++ b/upstart-jobs/cron/locate.nix
@@ -45,7 +45,7 @@ in
 
 {
   require = [
-    ../../upstart-jobs/cron.nix # config.services.cron
+    # ../../upstart-jobs/cron.nix # config.services.cron
     options
   ];
 
diff --git a/upstart-jobs/httpd.nix b/upstart-jobs/httpd.nix
deleted file mode 100644
index 1dd25afbf9c..00000000000
--- a/upstart-jobs/httpd.nix
+++ /dev/null
@@ -1,134 +0,0 @@
-{pkgs, config, ...}:
-
-###### interface
-let
-  inherit (pkgs.lib) mkOption mkIf;
-
-  # options have been moved to the apache-httpd/default.nix file 
-
-in
-
-###### implementation
-
-let
-
-  cfg = config.services.httpd;
-  cfgSvn = cfg.subservices.subversion;
-
-  optional = pkgs.lib.optional;
-
-    
-  documentRoot = cfg.documentRoot;
-  hostName = cfg.hostName;
-  httpPort = cfg.port;
-  httpsPort = 443;
-  user = cfg.user;
-  group = cfg.group;
-  adminAddr = cfg.adminAddr;
-  logDir = cfg.logDir;
-  stateDir = cfg.stateDir;
-  enableSSL = false;
-  applicationMappings = cfg.mod_jk.applicationMappings;
-  
-  startingDependency = if config.services.gw6c.enable && config.services.gw6c.autorun then "gw6c" else "network-interfaces";
-
-
-  extraConfig = pkgs.lib.concatStringsSep "\n"
-      (pkgs.lib.catAttrs "extraHttpdConfig" config.services.extraJobs);
-
-  
-  webServer = import ../../services/apache-httpd {
-    inherit (pkgs) apacheHttpd coreutils;
-    stdenv = pkgs.stdenv;
-    php = if cfg.mod_php then pkgs.php else null;
-    tomcat_connectors = if cfg.mod_jk.enable then pkgs.tomcat_connectors else null;
-
-    inherit documentRoot hostName httpPort httpsPort
-      user group adminAddr logDir stateDir
-      applicationMappings;
-    noUserDir = !cfg.enableUserDir;
-
-    extraDirectories = extraConfig + "\n" + cfg.extraConfig;
-    
-    subServices =
-    
-      # The Subversion subservice.
-      (optional cfgSvn.enable (
-        let dataDir = cfgSvn.dataDir; in
-        import ../../services/subversion ({
-          reposDir = dataDir + "/repos";
-          dbDir = dataDir + "/db";
-          distsDir = dataDir + "/dist";
-          backupsDir = dataDir + "/backup";
-          tmpDir = dataDir + "/tmp";
-          
-          inherit user group logDir adminAddr;
-          
-          canonicalName =
-            if webServer.enableSSL then
-              "https://" + hostName + ":" + (toString httpsPort)
-            else
-              "http://" + hostName + ":" + (toString httpPort);
-
-          notificationSender = cfgSvn.notificationSender;
-          autoVersioning = cfgSvn.autoVersioning;
-          userCreationDomain = cfgSvn.userCreationDomain;
-
-          inherit pkgs;
-        } //
-          ( if cfgSvn.organization.name != null then
-              {
-                orgName = cfgSvn.organization.name;
-                orgLogoFile = cfgSvn.organization.logo;
-                orgUrl = cfgSvn.organization.url;
-              }
-            else
-              # use the default from the subversion service
-              {} 
-          )
-        )
-        )
-      );
-  };
-  
-in
-
-mkIf (config.services.httpd.enable && !config.services.httpd.experimental) {
-
-  require = [
-    # options have been moved to the apache-httpd/default.nix file 
-  ];
-
-  users = {
-    extraUsers = [
-      { name = user;
-        description = "Apache httpd user";
-      }
-    ];
-
-    extraGroups = [
-      { name = group;
-      }
-    ];
-  };
-
-  services = {
-    extraJobs = [{
-      name = "httpd";
-      
-      job = ''
-        description \"Apache HTTPD\"
-
-        start on ${startingDependency}/started
-        stop on ${startingDependency}/stop
-
-        start script
-            ${webServer}/bin/control prepare    
-        end script
-
-        respawn ${webServer}/bin/control run
-      '';
-  
-    }];
-  };
-}
-- 
GitLab


From f1fb3b45cf71f8bd3506c64d5d13abfdd3b7d694 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 25 May 2009 09:02:29 +0000
Subject: [PATCH 1489/5331] * No camelCase in filenames.  Also pluralise the
 *-manager directories   for consistency.

svn path=/nixos/branches/modular-nixos/; revision=15719
---
 modules/services/x11/xserver/default.nix                    | 6 +++---
 .../{desktopManager => desktop-managers}/default.nix        | 0
 .../xserver/{desktopManager => desktop-managers}/gnome.nix  | 0
 .../kde-environment.nix}                                    | 0
 .../xserver/{desktopManager => desktop-managers}/kde.nix    | 2 +-
 .../xserver/{desktopManager => desktop-managers}/kde.pam    | 0
 .../xserver/{desktopManager => desktop-managers}/kde4.nix   | 2 +-
 .../xserver/{desktopManager => desktop-managers}/none.nix   | 0
 .../xserver/{desktopManager => desktop-managers}/xterm.nix  | 0
 .../{displayManager => display-managers}/default.nix        | 0
 .../xserver/{displayManager => display-managers}/kdm.nix    | 0
 .../xserver/{displayManager => display-managers}/slim.nix   | 0
 .../xserver/{displayManager => display-managers}/slim.pam   | 0
 .../xserver/{windowManager => window-managers}/compiz.nix   | 0
 .../xserver/{windowManager => window-managers}/default.nix  | 0
 .../x11/xserver/{windowManager => window-managers}/kwm.nix  | 0
 .../xserver/{windowManager => window-managers}/metacity.nix | 0
 .../x11/xserver/{windowManager => window-managers}/none.nix | 0
 .../x11/xserver/{windowManager => window-managers}/twm.nix  | 0
 .../x11/xserver/{windowManager => window-managers}/wmii.nix | 0
 .../xserver/{windowManager => window-managers}/xmonad.nix   | 0
 21 files changed, 5 insertions(+), 5 deletions(-)
 rename modules/services/x11/xserver/{desktopManager => desktop-managers}/default.nix (100%)
 rename modules/services/x11/xserver/{desktopManager => desktop-managers}/gnome.nix (100%)
 rename modules/services/x11/xserver/{desktopManager/kdeEnvironment.nix => desktop-managers/kde-environment.nix} (100%)
 rename modules/services/x11/xserver/{desktopManager => desktop-managers}/kde.nix (98%)
 rename modules/services/x11/xserver/{desktopManager => desktop-managers}/kde.pam (100%)
 rename modules/services/x11/xserver/{desktopManager => desktop-managers}/kde4.nix (98%)
 rename modules/services/x11/xserver/{desktopManager => desktop-managers}/none.nix (100%)
 rename modules/services/x11/xserver/{desktopManager => desktop-managers}/xterm.nix (100%)
 rename modules/services/x11/xserver/{displayManager => display-managers}/default.nix (100%)
 rename modules/services/x11/xserver/{displayManager => display-managers}/kdm.nix (100%)
 rename modules/services/x11/xserver/{displayManager => display-managers}/slim.nix (100%)
 rename modules/services/x11/xserver/{displayManager => display-managers}/slim.pam (100%)
 rename modules/services/x11/xserver/{windowManager => window-managers}/compiz.nix (100%)
 rename modules/services/x11/xserver/{windowManager => window-managers}/default.nix (100%)
 rename modules/services/x11/xserver/{windowManager => window-managers}/kwm.nix (100%)
 rename modules/services/x11/xserver/{windowManager => window-managers}/metacity.nix (100%)
 rename modules/services/x11/xserver/{windowManager => window-managers}/none.nix (100%)
 rename modules/services/x11/xserver/{windowManager => window-managers}/twm.nix (100%)
 rename modules/services/x11/xserver/{windowManager => window-managers}/wmii.nix (100%)
 rename modules/services/x11/xserver/{windowManager => window-managers}/xmonad.nix (100%)

diff --git a/modules/services/x11/xserver/default.nix b/modules/services/x11/xserver/default.nix
index 42642aa9137..3904566d2f3 100644
--- a/modules/services/x11/xserver/default.nix
+++ b/modules/services/x11/xserver/default.nix
@@ -470,9 +470,9 @@ mkIf cfg.enable {
     options
 
     # services.xserver.*Manager
-    ./displayManager/default.nix
-    ./windowManager/default.nix
-    ./desktopManager/default.nix
+    ./display-managers/default.nix
+    ./window-managers/default.nix
+    ./desktop-managers/default.nix
 
     # services.extraJobs
     # ../../upstart-jobs/default.nix
diff --git a/modules/services/x11/xserver/desktopManager/default.nix b/modules/services/x11/xserver/desktop-managers/default.nix
similarity index 100%
rename from modules/services/x11/xserver/desktopManager/default.nix
rename to modules/services/x11/xserver/desktop-managers/default.nix
diff --git a/modules/services/x11/xserver/desktopManager/gnome.nix b/modules/services/x11/xserver/desktop-managers/gnome.nix
similarity index 100%
rename from modules/services/x11/xserver/desktopManager/gnome.nix
rename to modules/services/x11/xserver/desktop-managers/gnome.nix
diff --git a/modules/services/x11/xserver/desktopManager/kdeEnvironment.nix b/modules/services/x11/xserver/desktop-managers/kde-environment.nix
similarity index 100%
rename from modules/services/x11/xserver/desktopManager/kdeEnvironment.nix
rename to modules/services/x11/xserver/desktop-managers/kde-environment.nix
diff --git a/modules/services/x11/xserver/desktopManager/kde.nix b/modules/services/x11/xserver/desktop-managers/kde.nix
similarity index 98%
rename from modules/services/x11/xserver/desktopManager/kde.nix
rename to modules/services/x11/xserver/desktop-managers/kde.nix
index 15fbf666e9c..4bea8308e40 100644
--- a/modules/services/x11/xserver/desktopManager/kde.nix
+++ b/modules/services/x11/xserver/desktop-managers/kde.nix
@@ -23,7 +23,7 @@ mkIf cfg.enable {
     options
 
     # environment.kdePackages
-    ./kdeEnvironment.nix
+    ./kde-environment.nix
   ];
 
   services = {
diff --git a/modules/services/x11/xserver/desktopManager/kde.pam b/modules/services/x11/xserver/desktop-managers/kde.pam
similarity index 100%
rename from modules/services/x11/xserver/desktopManager/kde.pam
rename to modules/services/x11/xserver/desktop-managers/kde.pam
diff --git a/modules/services/x11/xserver/desktopManager/kde4.nix b/modules/services/x11/xserver/desktop-managers/kde4.nix
similarity index 98%
rename from modules/services/x11/xserver/desktopManager/kde4.nix
rename to modules/services/x11/xserver/desktop-managers/kde4.nix
index 6cd25b3b459..c74429e7486 100644
--- a/modules/services/x11/xserver/desktopManager/kde4.nix
+++ b/modules/services/x11/xserver/desktop-managers/kde4.nix
@@ -23,7 +23,7 @@ mkIf cfg.enable {
     options
 
     # environment.kdePackages
-    ./kdeEnvironment.nix
+    ./kde-environment.nix
   ];
 
   services = {
diff --git a/modules/services/x11/xserver/desktopManager/none.nix b/modules/services/x11/xserver/desktop-managers/none.nix
similarity index 100%
rename from modules/services/x11/xserver/desktopManager/none.nix
rename to modules/services/x11/xserver/desktop-managers/none.nix
diff --git a/modules/services/x11/xserver/desktopManager/xterm.nix b/modules/services/x11/xserver/desktop-managers/xterm.nix
similarity index 100%
rename from modules/services/x11/xserver/desktopManager/xterm.nix
rename to modules/services/x11/xserver/desktop-managers/xterm.nix
diff --git a/modules/services/x11/xserver/displayManager/default.nix b/modules/services/x11/xserver/display-managers/default.nix
similarity index 100%
rename from modules/services/x11/xserver/displayManager/default.nix
rename to modules/services/x11/xserver/display-managers/default.nix
diff --git a/modules/services/x11/xserver/displayManager/kdm.nix b/modules/services/x11/xserver/display-managers/kdm.nix
similarity index 100%
rename from modules/services/x11/xserver/displayManager/kdm.nix
rename to modules/services/x11/xserver/display-managers/kdm.nix
diff --git a/modules/services/x11/xserver/displayManager/slim.nix b/modules/services/x11/xserver/display-managers/slim.nix
similarity index 100%
rename from modules/services/x11/xserver/displayManager/slim.nix
rename to modules/services/x11/xserver/display-managers/slim.nix
diff --git a/modules/services/x11/xserver/displayManager/slim.pam b/modules/services/x11/xserver/display-managers/slim.pam
similarity index 100%
rename from modules/services/x11/xserver/displayManager/slim.pam
rename to modules/services/x11/xserver/display-managers/slim.pam
diff --git a/modules/services/x11/xserver/windowManager/compiz.nix b/modules/services/x11/xserver/window-managers/compiz.nix
similarity index 100%
rename from modules/services/x11/xserver/windowManager/compiz.nix
rename to modules/services/x11/xserver/window-managers/compiz.nix
diff --git a/modules/services/x11/xserver/windowManager/default.nix b/modules/services/x11/xserver/window-managers/default.nix
similarity index 100%
rename from modules/services/x11/xserver/windowManager/default.nix
rename to modules/services/x11/xserver/window-managers/default.nix
diff --git a/modules/services/x11/xserver/windowManager/kwm.nix b/modules/services/x11/xserver/window-managers/kwm.nix
similarity index 100%
rename from modules/services/x11/xserver/windowManager/kwm.nix
rename to modules/services/x11/xserver/window-managers/kwm.nix
diff --git a/modules/services/x11/xserver/windowManager/metacity.nix b/modules/services/x11/xserver/window-managers/metacity.nix
similarity index 100%
rename from modules/services/x11/xserver/windowManager/metacity.nix
rename to modules/services/x11/xserver/window-managers/metacity.nix
diff --git a/modules/services/x11/xserver/windowManager/none.nix b/modules/services/x11/xserver/window-managers/none.nix
similarity index 100%
rename from modules/services/x11/xserver/windowManager/none.nix
rename to modules/services/x11/xserver/window-managers/none.nix
diff --git a/modules/services/x11/xserver/windowManager/twm.nix b/modules/services/x11/xserver/window-managers/twm.nix
similarity index 100%
rename from modules/services/x11/xserver/windowManager/twm.nix
rename to modules/services/x11/xserver/window-managers/twm.nix
diff --git a/modules/services/x11/xserver/windowManager/wmii.nix b/modules/services/x11/xserver/window-managers/wmii.nix
similarity index 100%
rename from modules/services/x11/xserver/windowManager/wmii.nix
rename to modules/services/x11/xserver/window-managers/wmii.nix
diff --git a/modules/services/x11/xserver/windowManager/xmonad.nix b/modules/services/x11/xserver/window-managers/xmonad.nix
similarity index 100%
rename from modules/services/x11/xserver/windowManager/xmonad.nix
rename to modules/services/x11/xserver/window-managers/xmonad.nix
-- 
GitLab


From a65aae01400264de3263523fb8d3259939bcb6ee Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 25 May 2009 13:42:46 +0000
Subject: [PATCH 1490/5331] * Moved more modules.

svn path=/nixos/branches/modular-nixos/; revision=15722
---
 {system => modules/config}/fonts.nix                      | 0
 .../installer/grub}/grub-menu-builder.sh                  | 0
 {installer => modules/installer/grub}/grub.nix            | 4 ++--
 .../security/setuid-wrappers.nix                          | 0
 {system => modules/security}/sudo.nix                     | 4 ++--
 etc/pam.d/sudo => modules/security/sudo.pam               | 0
 system/options.nix                                        | 8 ++++----
 7 files changed, 8 insertions(+), 8 deletions(-)
 rename {system => modules/config}/fonts.nix (100%)
 rename {installer => modules/installer/grub}/grub-menu-builder.sh (100%)
 rename {installer => modules/installer/grub}/grub.nix (97%)
 rename system/nixos-security.nix => modules/security/setuid-wrappers.nix (100%)
 rename {system => modules/security}/sudo.nix (96%)
 rename etc/pam.d/sudo => modules/security/sudo.pam (100%)

diff --git a/system/fonts.nix b/modules/config/fonts.nix
similarity index 100%
rename from system/fonts.nix
rename to modules/config/fonts.nix
diff --git a/installer/grub-menu-builder.sh b/modules/installer/grub/grub-menu-builder.sh
similarity index 100%
rename from installer/grub-menu-builder.sh
rename to modules/installer/grub/grub-menu-builder.sh
diff --git a/installer/grub.nix b/modules/installer/grub/grub.nix
similarity index 97%
rename from installer/grub.nix
rename to modules/installer/grub/grub.nix
index dc0abbaceaa..45c8a1fb29b 100644
--- a/installer/grub.nix
+++ b/modules/installer/grub/grub.nix
@@ -86,7 +86,7 @@ in
 let
 
   grubMenuBuilder = pkgs.substituteAll {
-    src = ../installer/grub-menu-builder.sh;
+    src = ./grub-menu-builder.sh;
     isExecutable = true;
     inherit (pkgs) bash;
     path = [pkgs.coreutils pkgs.gnused pkgs.gnugrep];
@@ -100,7 +100,7 @@ in
     options
 
     # config.system.build
-    ../system/system-options.nix
+    # ../system/system-options.nix
   ];
 
   system = {
diff --git a/system/nixos-security.nix b/modules/security/setuid-wrappers.nix
similarity index 100%
rename from system/nixos-security.nix
rename to modules/security/setuid-wrappers.nix
diff --git a/system/sudo.nix b/modules/security/sudo.nix
similarity index 96%
rename from system/sudo.nix
rename to modules/security/sudo.nix
index 3c2d2eff14d..9c2eb5f5c24 100644
--- a/system/sudo.nix
+++ b/modules/security/sudo.nix
@@ -52,7 +52,7 @@ mkIf cfg.enable {
     options
 
     # config.environment.etc
-    ../etc/default.nix
+    # ../etc/default.nix
 
     # ? # config.environment.extraPackages
     # ? # config.security.extraSetuidPrograms
@@ -69,7 +69,7 @@ mkIf cfg.enable {
 
     etc = [
       {
-        source = ../etc/pam.d/sudo;
+        source = ./sudo.pam;
         target = "pam.d/sudo";
       }
       {
diff --git a/etc/pam.d/sudo b/modules/security/sudo.pam
similarity index 100%
rename from etc/pam.d/sudo
rename to modules/security/sudo.pam
diff --git a/system/options.nix b/system/options.nix
index 5932bc997be..cf9af7a2878 100644
--- a/system/options.nix
+++ b/system/options.nix
@@ -382,7 +382,7 @@ in
     #../modules/hardware/network/intel-3945abg.nix
     ../boot/boot-stage-2.nix
     ../etc/default.nix
-    ../installer/grub.nix
+    ../modules/installer/grub/grub.nix
     ../modules/services/audio/alsa.nix
     ../modules/services/audio/pulseaudio.nix
     ../modules/services/databases/mysql.nix
@@ -438,13 +438,13 @@ in
     ../modules/services/x11/xserver/default.nix
     ../system/activate-configuration.nix
     ../system/assertion.nix
-    ../system/fonts.nix
+    ../modules/config/fonts.nix
     ../system/i18n.nix
     ../system/kernel.nix
     ../system/nixos-environment.nix
     ../system/nixos-installer.nix
-    ../system/nixos-security.nix
-    ../system/sudo.nix
+    ../modules/security/setuid-wrappers.nix
+    ../modules/security/sudo.nix
     ../system/system-options.nix
     ../system/unix-odbc-drivers.nix
     ../system/users-groups.nix
-- 
GitLab


From 94993518d703e34f7e72df2a469cfd71e3881f53 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 25 May 2009 13:52:18 +0000
Subject: [PATCH 1491/5331] * I'm pretty sure the i18n module shouldn't be
 conditional on   pulseaudio :-)

svn path=/nixos/branches/modular-nixos/; revision=15723
---
 system/i18n.nix | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/system/i18n.nix b/system/i18n.nix
index 836fa2200a2..c7a6f1c24d8 100644
--- a/system/i18n.nix
+++ b/system/i18n.nix
@@ -39,9 +39,8 @@ in
 
 ###### implementation
 
-mkIf config.services.pulseaudio.enable {
+{
   require = [
     options
   ];
-
 }
-- 
GitLab


From 6e066c8e1d1e849ae0d4188fd18d7916e4c1a8f7 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 25 May 2009 13:55:36 +0000
Subject: [PATCH 1492/5331] * Idem.

svn path=/nixos/branches/modular-nixos/; revision=15724
---
 modules/services/printing/cupsd.nix | 2 +-
 system/nixos-installer.nix          | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/modules/services/printing/cupsd.nix b/modules/services/printing/cupsd.nix
index 4080ac45fa8..b240b7c8a9c 100644
--- a/modules/services/printing/cupsd.nix
+++ b/modules/services/printing/cupsd.nix
@@ -129,7 +129,7 @@ let
 in
 
 
-mkIf config.services.pulseaudio.enable {
+mkIf config.services.printing.enable {
   require = [
     options
   ];
diff --git a/system/nixos-installer.nix b/system/nixos-installer.nix
index 285b3043c30..b3d92e339d3 100644
--- a/system/nixos-installer.nix
+++ b/system/nixos-installer.nix
@@ -90,9 +90,8 @@ in
 
 ###### implementation
 
-mkIf config.services.pulseaudio.enable {
+{
   require = [
     options
   ];
-
 }
-- 
GitLab


From 278b15d840e837b1815ef3fc2eb5f1fe6101dac7 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 25 May 2009 14:19:33 +0000
Subject: [PATCH 1493/5331] * More moving.

svn path=/nixos/branches/modular-nixos/; revision=15725
---
 etc/default.nix                               |  4 ++--
 {system => modules/config}/i18n.nix           |  0
 .../config}/unix-odbc-drivers.nix             |  0
 {system => modules/config}/users-groups.nix   |  4 ++--
 .../system/activation/activation-script.nix   |  0
 {system => modules/system/boot}/kernel.nix    |  0
 .../system/boot/stage-1-init.sh               |  0
 .../system/boot/stage-1.nix                   |  4 ++--
 .../system/boot/stage-2-init.sh               |  0
 .../system/boot/stage-2.nix                   |  6 ++---
 .../upstart-events}/ctrl-alt-delete.nix       |  0
 .../system/upstart-events}/halt.nix           |  3 ++-
 .../upstart-events}/maintenance-shell.nix     |  0
 system/options.nix                            | 24 +++++++++----------
 system/system-options.nix                     |  2 +-
 system/system.nix                             |  2 +-
 16 files changed, 25 insertions(+), 24 deletions(-)
 rename {system => modules/config}/i18n.nix (100%)
 rename {system => modules/config}/unix-odbc-drivers.nix (100%)
 rename {system => modules/config}/users-groups.nix (98%)
 rename system/activate-configuration.nix => modules/system/activation/activation-script.nix (100%)
 rename {system => modules/system/boot}/kernel.nix (100%)
 rename boot/boot-stage-1-init.sh => modules/system/boot/stage-1-init.sh (100%)
 rename boot/boot-stage-1.nix => modules/system/boot/stage-1.nix (98%)
 rename boot/boot-stage-2-init.sh => modules/system/boot/stage-2-init.sh (100%)
 rename boot/boot-stage-2.nix => modules/system/boot/stage-2.nix (89%)
 rename {upstart-jobs => modules/system/upstart-events}/ctrl-alt-delete.nix (100%)
 rename {upstart-jobs => modules/system/upstart-events}/halt.nix (96%)
 rename {upstart-jobs => modules/system/upstart-events}/maintenance-shell.nix (100%)

diff --git a/etc/default.nix b/etc/default.nix
index 105d8f5fe5b..095318bb435 100644
--- a/etc/default.nix
+++ b/etc/default.nix
@@ -251,10 +251,10 @@ in
     option
 
     # config.system.build
-    ../system/system-options.nix
+    # ../system/system-options.nix
 
     # config.system.activationScripts
-    ../system/activate-configuration.nix
+    # ../system/activate-configuration.nix
   ];
 
   system = {
diff --git a/system/i18n.nix b/modules/config/i18n.nix
similarity index 100%
rename from system/i18n.nix
rename to modules/config/i18n.nix
diff --git a/system/unix-odbc-drivers.nix b/modules/config/unix-odbc-drivers.nix
similarity index 100%
rename from system/unix-odbc-drivers.nix
rename to modules/config/unix-odbc-drivers.nix
diff --git a/system/users-groups.nix b/modules/config/users-groups.nix
similarity index 98%
rename from system/users-groups.nix
rename to modules/config/users-groups.nix
index ecaba8922f1..fe2c4138169 100644
--- a/system/users-groups.nix
+++ b/modules/config/users-groups.nix
@@ -41,7 +41,7 @@ in
 
 ###### implementation
 let
-  ids = import ./ids.nix;
+  ids = import ../../system/ids.nix;
   defaultShell = config.system.shell;
 
   # User accounts to be created/updated by NixOS.
@@ -151,7 +151,7 @@ in
     options
 
     # config.system.activationScripts
-    ../system/activate-configuration.nix
+    # ../system/activate-configuration.nix
   ];
 
   system = {
diff --git a/system/activate-configuration.nix b/modules/system/activation/activation-script.nix
similarity index 100%
rename from system/activate-configuration.nix
rename to modules/system/activation/activation-script.nix
diff --git a/system/kernel.nix b/modules/system/boot/kernel.nix
similarity index 100%
rename from system/kernel.nix
rename to modules/system/boot/kernel.nix
diff --git a/boot/boot-stage-1-init.sh b/modules/system/boot/stage-1-init.sh
similarity index 100%
rename from boot/boot-stage-1-init.sh
rename to modules/system/boot/stage-1-init.sh
diff --git a/boot/boot-stage-1.nix b/modules/system/boot/stage-1.nix
similarity index 98%
rename from boot/boot-stage-1.nix
rename to modules/system/boot/stage-1.nix
index f4c8d5e3a1b..2ed82339629 100644
--- a/boot/boot-stage-1.nix
+++ b/modules/system/boot/stage-1.nix
@@ -144,7 +144,7 @@ rec {
   # The init script of boot stage 1 (loading kernel modules for
   # mounting the root FS).
   bootStage1 = pkgs.substituteAll {
-    src = ./boot-stage-1-init.sh;
+    src = ./stage-1-init.sh;
 
     shell = "${extraUtils}/bin/bash";
 
@@ -192,7 +192,7 @@ rec {
             suffix = "/bin/splash_helper";
             symlink = "/${kernelPackages.splashutils.helperName}";
           } # */
-          { object = import ../helpers/unpack-theme.nix {
+          { object = import ../../../helpers/unpack-theme.nix {
               inherit (pkgs) stdenv;
               theme = config.services.ttyBackgrounds.defaultTheme;
             };
diff --git a/boot/boot-stage-2-init.sh b/modules/system/boot/stage-2-init.sh
similarity index 100%
rename from boot/boot-stage-2-init.sh
rename to modules/system/boot/stage-2-init.sh
diff --git a/boot/boot-stage-2.nix b/modules/system/boot/stage-2.nix
similarity index 89%
rename from boot/boot-stage-2.nix
rename to modules/system/boot/stage-2.nix
index 863de773043..c86570ad766 100644
--- a/boot/boot-stage-2.nix
+++ b/modules/system/boot/stage-2.nix
@@ -18,7 +18,7 @@ let
   bootLocal = config.boot.localCommands;
 
   bootStage2 = substituteAll {
-    src = ./boot-stage-2-init.sh;
+    src = ./stage-2-init.sh;
     isExecutable = true;
     inherit kernel upstart isLiveCD activateConfiguration upstartPath;
     path = [
@@ -37,10 +37,10 @@ in
     # config.boot.kernelPackages
 
     # config.system.activationScripts
-    ../system/activate-configuration.nix
+    # ../system/activate-configuration.nix
 
     # config.system.build
-    ../system/system-options.nix
+    # ../system/system-options.nix
   ];
 
   system = {
diff --git a/upstart-jobs/ctrl-alt-delete.nix b/modules/system/upstart-events/ctrl-alt-delete.nix
similarity index 100%
rename from upstart-jobs/ctrl-alt-delete.nix
rename to modules/system/upstart-events/ctrl-alt-delete.nix
diff --git a/upstart-jobs/halt.nix b/modules/system/upstart-events/halt.nix
similarity index 96%
rename from upstart-jobs/halt.nix
rename to modules/system/upstart-events/halt.nix
index d8a1029dba5..60727e3686b 100644
--- a/upstart-jobs/halt.nix
+++ b/modules/system/upstart-events/halt.nix
@@ -92,7 +92,8 @@ let
           sync || true
       
       
-          # Right now all events above power off the system.
+          # Either reboot or power-off the system.  Note that the "halt"
+          # event also does a power-off.
           if test ${event} = reboot; then
               exec reboot -f
           else
diff --git a/upstart-jobs/maintenance-shell.nix b/modules/system/upstart-events/maintenance-shell.nix
similarity index 100%
rename from upstart-jobs/maintenance-shell.nix
rename to modules/system/upstart-events/maintenance-shell.nix
diff --git a/system/options.nix b/system/options.nix
index cf9af7a2878..50d61239903 100644
--- a/system/options.nix
+++ b/system/options.nix
@@ -380,9 +380,14 @@ in
 
   require = [
     #../modules/hardware/network/intel-3945abg.nix
-    ../boot/boot-stage-2.nix
     ../etc/default.nix
+    ../modules/config/fonts.nix
+    ../modules/config/i18n.nix
+    ../modules/config/unix-odbc-drivers.nix
+    ../modules/config/users-groups.nix
     ../modules/installer/grub/grub.nix
+    ../modules/security/setuid-wrappers.nix
+    ../modules/security/sudo.nix
     ../modules/services/audio/alsa.nix
     ../modules/services/audio/pulseaudio.nix
     ../modules/services/databases/mysql.nix
@@ -436,28 +441,23 @@ in
     ../modules/services/web-servers/tomcat.nix # untested, too lazy to get that jdk
     ../modules/services/x11/xfs.nix
     ../modules/services/x11/xserver/default.nix
-    ../system/activate-configuration.nix
+    ../modules/system/activation/activation-script.nix
+    ../modules/system/boot/kernel.nix
+    ../modules/system/boot/stage-2.nix
+    ../modules/system/upstart-events/ctrl-alt-delete.nix
+    ../modules/system/upstart-events/halt.nix
+    ../modules/system/upstart-events/maintenance-shell.nix
     ../system/assertion.nix
-    ../modules/config/fonts.nix
-    ../system/i18n.nix
-    ../system/kernel.nix
     ../system/nixos-environment.nix
     ../system/nixos-installer.nix
-    ../modules/security/setuid-wrappers.nix
-    ../modules/security/sudo.nix
     ../system/system-options.nix
-    ../system/unix-odbc-drivers.nix
-    ../system/users-groups.nix
     ../upstart-jobs/cron/locate.nix
-    ../upstart-jobs/ctrl-alt-delete.nix
     ../upstart-jobs/default.nix
     ../upstart-jobs/filesystems.nix
     ../upstart-jobs/guest-users.nix
-    ../upstart-jobs/halt.nix
     ../upstart-jobs/kbd.nix
     ../upstart-jobs/ldap
     ../upstart-jobs/lvm.nix
-    ../upstart-jobs/maintenance-shell.nix
     ../upstart-jobs/network-interfaces.nix
     ../upstart-jobs/pcmcia.nix
     ../upstart-jobs/swap.nix
diff --git a/system/system-options.nix b/system/system-options.nix
index c8284a0831b..ca305cfddf4 100644
--- a/system/system-options.nix
+++ b/system/system-options.nix
@@ -83,7 +83,7 @@ in
     option
 
     # config.system.activationScripts
-    ../system/activate-configuration.nix
+    # ../system/activate-configuration.nix
   ];
 
   system = {
diff --git a/system/system.nix b/system/system.nix
index faebd9b83d4..06a212df2d9 100644
--- a/system/system.nix
+++ b/system/system.nix
@@ -38,7 +38,7 @@ rec {
 
 
   # The initial ramdisk.
-  initialRamdiskStuff = import ../boot/boot-stage-1.nix {
+  initialRamdiskStuff = import ../modules/system/boot/stage-1.nix {
     inherit pkgs config;
   };
 
-- 
GitLab


From c96f0d75f0b5cc389dd5aff584f61e8973c78f75 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 25 May 2009 15:36:57 +0000
Subject: [PATCH 1494/5331] * Move the setuid wrappers activation scriptlet to 
  modules/security/setuid-wrappers.nix. * Removed the "path" activation
 scriptlet.  The partial ordering was   underspecified (there was nothing
 ensuring that it came near the end   of the activation script), and it wasn't
 needed in any case.

svn path=/nixos/branches/modular-nixos/; revision=15726
---
 etc/default.nix                               |   2 +-
 helpers/setuid/default.nix                    |  10 --
 .../security}/setuid-wrapper.c                |   0
 modules/security/setuid-wrappers.nix          | 152 +++++++++++++-----
 system/system-options.nix                     |  87 ++--------
 system/system.nix                             |  17 --
 6 files changed, 127 insertions(+), 141 deletions(-)
 delete mode 100644 helpers/setuid/default.nix
 rename {helpers/setuid => modules/security}/setuid-wrapper.c (100%)

diff --git a/etc/default.nix b/etc/default.nix
index 095318bb435..6306dd4edaf 100644
--- a/etc/default.nix
+++ b/etc/default.nix
@@ -39,7 +39,7 @@ let
   nixEnvVars = config.nix.envVars;
   modulesTree = config.system.modulesTree;
   nssModulesPath = config.system.nssModules.path;
-  wrapperDir = config.system.wrapperDir;
+  wrapperDir = config.security.wrapperDir;
   systemPath = config.system.path;
   binsh = config.system.build.binsh;
 
diff --git a/helpers/setuid/default.nix b/helpers/setuid/default.nix
deleted file mode 100644
index 362bd937cc4..00000000000
--- a/helpers/setuid/default.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-{stdenv, wrapperDir}:
-
-stdenv.mkDerivation {
-  name = "setuid-wrapper";
-  buildCommand = ''
-    ensureDir $out/bin
-    gcc -Wall -O2 -DWRAPPER_DIR=\"${wrapperDir}\" ${./setuid-wrapper.c} -o $out/bin/setuid-wrapper
-    strip -s $out/bin/setuid-wrapper
-  '';
-}
diff --git a/helpers/setuid/setuid-wrapper.c b/modules/security/setuid-wrapper.c
similarity index 100%
rename from helpers/setuid/setuid-wrapper.c
rename to modules/security/setuid-wrapper.c
diff --git a/modules/security/setuid-wrappers.nix b/modules/security/setuid-wrappers.nix
index 367a6d172c1..d7f0157a0e8 100644
--- a/modules/security/setuid-wrappers.nix
+++ b/modules/security/setuid-wrappers.nix
@@ -1,47 +1,127 @@
 {pkgs, config, ...}:
 
+with pkgs.lib;
+
 let
-  inherit (pkgs.lib) mergeOneOption mkOption mkIf;
+
+  options = {
+    security = {
+      setuidPrograms = mkOption {
+        default = [
+          "passwd" "su" "crontab" "ping" "ping6"
+          "fusermount" "wodim" "cdrdao" "growisofs"
+        ];
+        description = ''
+          Only the programs from system path listed her will be made setuid root
+          (through a wrapper program).  It's better to set
+          <option>security.extraSetuidPrograms</option>.
+        '';
+      };
+
+      # !!! obsolete
+      extraSetuidPrograms = mkOption {
+        default = [];
+        example = ["fusermount"];
+        description = ''
+          This option lists additional programs that must be made setuid
+          root.
+        '';
+      };
+
+      setuidOwners = mkOption {
+        default = [];
+        example = [{
+          program = "sendmail";
+          owner = "nobody";
+          group = "postdrop";
+          setuid = false;
+          setgid = true;
+        }];
+        description = ''
+          This option allows the ownership and permissions on the setuid
+          wrappers for specific programs to be overriden from the
+          default (setuid root, but not setgid root).
+        '';
+      };
+
+      wrapperDir = mkOption {
+        default = "/var/setuid-wrappers";
+        description = ''
+          This option defines the path to the setuid wrappers.  It
+          should generally not be overriden.
+        '';
+      };
+    };
+  };
+
+  setuidWrapper = pkgs.stdenv.mkDerivation {
+    name = "setuid-wrapper";
+    buildCommand = ''
+      ensureDir $out/bin
+      gcc -Wall -O2 -DWRAPPER_DIR=\"${config.security.wrapperDir}\" ${./setuid-wrapper.c} -o $out/bin/setuid-wrapper
+      strip -s $out/bin/setuid-wrapper
+    '';
+  };
+
 in
 
 {
-  security = {
-    setuidPrograms = mkOption {
-      default = [
-        "passwd" "su" "crontab" "ping" "ping6"
-        "fusermount" "wodim" "cdrdao" "growisofs"
-      ];
-      description = "
-        Only the programs from system path listed her will be made setuid root
-        (through a wrapper program).  It's better to set
-        <option>security.extraSetuidPrograms</option>.
-      ";
-    };
+  require = [options];
 
-    extraSetuidPrograms = mkOption {
-      default = [];
-      example = ["fusermount"];
-      description = "
-        This option lists additional programs that must be made setuid
-        root.
-      ";
-    };
+  system = {
+    activationScripts = {
+      setuid =
+        let
+          setuidPrograms = builtins.toString (
+            config.security.setuidPrograms ++
+            config.security.extraSetuidPrograms ++
+            map (x: x.program) config.security.setuidOwners
+          );
+
+          adjustSetuidOwner = concatStrings (map
+            (_entry: let entry = {
+              owner = "nobody";
+              group = "nogroup";
+              setuid = false;
+              setgid = false;
+            } //_entry; in
+            ''
+              chown ${entry.owner}.${entry.group} $wrapperDir/${entry.program}
+              chmod u${if entry.setuid then "+" else "-"}s $wrapperDir/${entry.program} 
+              chmod g${if entry.setgid then "+" else "-"}s $wrapperDir/${entry.program}
+            '')
+            config.security.setuidOwners);
+
+        in fullDepEntry ''
+          # Look in the system path and in the default profile for
+          # programs to be wrapped.  However, having setuid programs
+          # in a profile is problematic, since the NixOS activation
+          # script won't be rerun automatically when you install a
+          # wrappable program in the profile with nix-env.
+          SETUID_PATH=/nix/var/nix/profiles/default/sbin:/nix/var/nix/profiles/default/bin:${config.system.path}/bin:${config.system.path}/sbin
+
+          wrapperDir=${config.security.wrapperDir}
+          if test -d $wrapperDir; then rm -f $wrapperDir/*; fi # */
+          mkdir -p $wrapperDir
+          
+          for i in ${setuidPrograms}; do
+              program=$(PATH=$SETUID_PATH type -tP $i)
+              if test -z "$program"; then
+                  # XXX: It would be preferable to detect this problem before
+                  # `activate-configuration' is invoked.
+                  #echo "WARNING: No executable named \`$i' was found" >&2
+                  #echo "WARNING: but \`$i' was specified as a setuid program." >&2
+                  true
+              else
+                  cp ${setuidWrapper}/bin/setuid-wrapper $wrapperDir/$i
+                  echo -n "$program" > $wrapperDir/$i.real
+                  chown root.root $wrapperDir/$i
+                  chmod 4755 $wrapperDir/$i
+              fi
+          done
 
-    setuidOwners = mkOption {
-      default = [];
-      example = [{
-        program = "sendmail";
-        owner = "nodody";
-        group = "postdrop";
-        setuid = false;
-        setgid = true;
-      }];
-      description = ''
-        List of non-trivial setuid programs from system path, like Postfix sendmail. Default 
-        should probably be nobody:nogroup:false:false - if you are bothering
-        doing anything with a setuid program, "root.root u+s g-s" is not what
-        you are aiming at..
-      '';
+          ${adjustSetuidOwner}
+        '' [ "defaultPath" "users" ];
     };
   };
 }
diff --git a/system/system-options.nix b/system/system-options.nix
index ca305cfddf4..1065d5721eb 100644
--- a/system/system-options.nix
+++ b/system/system-options.nix
@@ -26,22 +26,14 @@ let
       shell = mkOption {
         default = "/var/run/current-system/sw/bin/bash";
         description = ''
-          You should not redefine this option unless you want to change the
-          bash version for security issues.
+          This option defines the path to the Bash shell.  It should
+          generally not be overriden.
         '';
         merge = list:
           assert list != [] && builtins.tail list == [];
           builtins.head list;
       };
 
-      wrapperDir = mkOption {
-        default = "/var/setuid-wrappers";
-        description = ''
-          You should not redefine this option unless you want to change the
-          path for security issues.
-        '';
-      };
-
       overridePath = mkOption {
         default = [];
         description = ''
@@ -75,7 +67,6 @@ in
 let
   inherit (pkgs.stringsWithDeps) noDepEntry fullDepEntry packEntry;
   inherit (pkgs.lib) mapRecordFlatten;
-
 in
 
 {
@@ -103,14 +94,14 @@ in
         let path = [
           pkgs.coreutils pkgs.gnugrep pkgs.findutils
           pkgs.glibc # needed for getent
-          pkgs.glibcLocales # needed for getent
           pkgs.pwdutils
+          pkgs.nettools # needed for hostname
         ]; in noDepEntry ''
-        export PATH=/empty
-        for i in ${toString path}; do
-          PATH=$PATH:$i/bin:$i/sbin;
-        done
-      '';
+          export PATH=/empty
+          for i in ${toString path}; do
+            PATH=$PATH:$i/bin:$i/sbin;
+          done
+        '';
 
       stdio = fullDepEntry ''
         # Needed by some programs.
@@ -220,64 +211,6 @@ in
         "users" # nixbld group
       ];
 
-      path = fullDepEntry ''
-        PATH=${config.system.path}/bin:${config.system.path}/sbin:$PATH
-      '' [ "defaultPath" ];
-
-      setuid =
-        let
-          setuidPrograms = builtins.toString (
-            config.security.setuidPrograms ++
-            config.security.extraSetuidPrograms ++
-            map (x: x.program) config.security.setuidOwners
-          );
-
-          adjustSetuidOwner = pkgs.lib.concatStrings (map
-            (_entry: let entry = {
-              owner = "nobody";
-              group = "nogroup";
-              setuid = false;
-              setgid = false;
-            } //_entry; in
-            ''
-              chown ${entry.owner}.${entry.group} $wrapperDir/${entry.program}
-              chmod u${if entry.setuid then "+" else "-"}s $wrapperDir/${entry.program} 
-              chmod g${if entry.setgid then "+" else "-"}s $wrapperDir/${entry.program}
-            '')
-            config.security.setuidOwners);
-
-        in fullDepEntry ''
-        # Make a few setuid programs work.
-        save_PATH="$PATH"
-
-        # Add the default profile to the search path for setuid executables.
-        PATH="/nix/var/nix/profiles/default/sbin:$PATH"
-        PATH="/nix/var/nix/profiles/default/bin:$PATH"
-
-        wrapperDir=${config.system.wrapperDir}
-        if test -d $wrapperDir; then rm -f $wrapperDir/*; fi # */
-        mkdir -p $wrapperDir
-        for i in ${setuidPrograms}; do
-            program=$(type -tp $i)
-            if test -z "$program"; then
-        	# XXX: It would be preferable to detect this problem before
-        	# `activate-configuration' is invoked.
-        	#echo "WARNING: No executable named \`$i' was found" >&2
-        	#echo "WARNING: but \`$i' was specified as a setuid program." >&2
-                true
-            else
-                cp "$(type -tp setuid-wrapper)" $wrapperDir/$i
-                echo -n "$program" > $wrapperDir/$i.real
-                chown root.root $wrapperDir/$i
-                chmod 4755 $wrapperDir/$i
-            fi
-        done
-
-        ${adjustSetuidOwner}
-
-        PATH="$save_PATH"
-      '' [ "path" "users" ];
-
       hostname = fullDepEntry ''
         # Set the host name.  Don't clear it if it's not configured in the
         # NixOS configuration, since it may have been set by dhclient in the
@@ -290,7 +223,7 @@ in
               hostname ""
             fi
         ''}
-      '' [ "path" ];
+      '' [ "defaultPath" ];
 
       # The activation has to be done at the end. This is forced at the apply
       # function of activationScripts option
@@ -302,7 +235,7 @@ in
         ln -sfn "$(readlink -f "$systemConfig")" /var/run/current-system
 
         # Prevent the current configuration from being garbage-collected.
-       ln -sfn /var/run/current-system /nix/var/nix/gcroots/current-system
+        ln -sfn /var/run/current-system /nix/var/nix/gcroots/current-system
       '';
     };
   };
diff --git a/system/system.nix b/system/system.nix
index 06a212df2d9..eaa41c720d8 100644
--- a/system/system.nix
+++ b/system/system.nix
@@ -34,8 +34,6 @@ rec {
 
   kernel = kernelPackages.kernel;
 
-  modulesTree = config.system.modulesTree;
-
 
   # The initial ramdisk.
   initialRamdiskStuff = import ../modules/system/boot/stage-1.nix {
@@ -61,10 +59,6 @@ rec {
   modprobe = config.system.sbin.modprobe;
 
 
-  # Environment variables for running Nix.
-  nixEnvVars = config.nix.envVars;
-
-
   # The static parts of /etc.
   etc = config.system.build.etc;
 
@@ -73,16 +67,6 @@ rec {
   fontDir = config.system.build.x11Fonts;
 
   
-  # The wrapper setuid programs (since we can't have setuid programs
-  # in the Nix store).
-  wrapperDir = config.system.wrapperDir;
-  
-  setuidWrapper = import ../helpers/setuid {
-    inherit (pkgs) stdenv;
-    inherit wrapperDir;
-  };
-
-
   # A patched `mount' command that looks in a directory in the Nix
   # store instead of in /sbin for mount helpers (like mount.ntfs-3g or
   # mount.cifs).
@@ -104,7 +88,6 @@ rec {
         nixosTools.nixosCheckout
         nixosTools.nixosHardwareScan
         nixosTools.nixosGenSeccureKeys
-        setuidWrapper
       ];
       path =
         pkgs.lib.optionals (!config.environment.cleanStart) [
-- 
GitLab


From 60b3f95ad86826faf95680a3529ced1c322d4d87 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 25 May 2009 17:41:03 +0000
Subject: [PATCH 1495/5331] * Move the definition of the set of system packages
 to   modules/config/system-path.nix.  system/system.nix is now almost  
 empty. * Removed the cleanStart option - it should be possible to get the  
 same functionality by overriding config.system.path (or defining  
 config.system.systemPackages with a higher priority - don't know if   that
 works though).

svn path=/nixos/branches/modular-nixos/; revision=15727
---
 default.nix                           |   5 +-
 modules/config/system-path.nix        | 150 ++++++++++++++++++++++++
 modules/services/audio/pulseaudio.nix |   6 +-
 modules/services/misc/nix-daemon.nix  |  16 ++-
 modules/services/scheduling/cron.nix  |   6 +-
 modules/services/scheduling/fcron.nix |   5 +-
 system/nixos-environment.nix          |  50 +-------
 system/options.nix                    |  13 ++-
 system/system-options.nix             |  25 ----
 system/system.nix                     | 162 ++------------------------
 10 files changed, 188 insertions(+), 250 deletions(-)
 create mode 100644 modules/config/system-path.nix

diff --git a/default.nix b/default.nix
index 9dd73430b66..affb6fdc3ea 100644
--- a/default.nix
+++ b/default.nix
@@ -19,7 +19,6 @@ in
     grubMenuBuilder
     kernel
     modulesTree
-    nix
     system
     systemPath
     config
@@ -40,7 +39,9 @@ in
     modulesClosure
     ;
     
-  nixFallback = system.nix;
+  nix = system.config.environment.nix;
+  
+  nixFallback = (import nixpkgs {}).nixUnstable;
 
   manifests = system.config.installer.manifests; # exported here because nixos-rebuild uses it
 
diff --git a/modules/config/system-path.nix b/modules/config/system-path.nix
new file mode 100644
index 00000000000..41903297252
--- /dev/null
+++ b/modules/config/system-path.nix
@@ -0,0 +1,150 @@
+# This module defines the packages that appear in
+# /var/run/current-system/sw.
+
+{pkgs, config, ...}:
+
+with pkgs.lib;
+
+let
+
+  # NixOS installation/updating tools.
+  nixosTools = import ../../installer {
+    inherit pkgs config;
+  };
+
+  
+  systemPackages =
+    [ config.system.sbin.modprobe # must take precedence over module_init_tools
+      config.system.sbin.mount # must take precedence over util-linux
+      config.environment.nix
+      nixosTools.nixosInstall
+      nixosTools.nixosRebuild
+      nixosTools.nixosCheckout
+      nixosTools.nixosHardwareScan
+      nixosTools.nixosGenSeccureKeys
+      pkgs.acl
+      pkgs.attr
+      pkgs.bashInteractive # bash with ncurses support
+      pkgs.bzip2
+      pkgs.coreutils
+      pkgs.cpio
+      pkgs.curl
+      pkgs.e2fsprogs
+      pkgs.findutils
+      pkgs.glibc # for ldd, getent
+      pkgs.glibcLocales
+      pkgs.gnugrep
+      pkgs.gnused
+      pkgs.gnutar
+      pkgs.grub
+      pkgs.gzip
+      pkgs.iputils
+      pkgs.less
+      pkgs.libcap
+      pkgs.lvm2
+      pkgs.man
+      pkgs.mdadm
+      pkgs.module_init_tools
+      pkgs.nano
+      pkgs.ncurses
+      pkgs.netcat
+      pkgs.nettools
+      pkgs.ntp
+      pkgs.openssh
+      pkgs.pciutils
+      pkgs.perl
+      pkgs.procps
+      pkgs.pwdutils
+      pkgs.reiserfsprogs
+      pkgs.rsync
+      pkgs.seccure
+      pkgs.strace
+      pkgs.su
+      pkgs.sysklogd
+      pkgs.sysvtools
+      pkgs.time
+      pkgs.udev
+      pkgs.upstart
+      pkgs.usbutils
+      pkgs.utillinux
+      pkgs.wirelesstools
+      (import ../../helpers/info-wrapper.nix {inherit (pkgs) bash texinfo writeScriptBin;})
+    ]
+    ++ pkgs.lib.optional config.services.bitlbee.enable pkgs.bitlbee
+    ++ pkgs.lib.optional config.networking.defaultMailServer.directDelivery pkgs.ssmtp 
+    ++ config.environment.extraPackages
+    ++ pkgs.lib.optional config.fonts.enableFontDir config.system.build.x11Fonts
+
+    # NSS modules need to be in `systemPath' so that (i) the builder
+    # chroot gets to seem them, and (ii) applications can benefit from
+    # changes in the list of NSS modules at run-time, without requiring
+    # a reboot.
+    ++ config.system.nssModules.list;
+
+      
+  options = {
+
+    environment = {
+
+      systemPackages = mkOption {
+        default = systemPackages;
+        description = ''
+          The set of packages that appear in
+          /var/run/current-system/sw.  These packages are
+          automatically available to all users, and are
+          automatically updated every time you rebuild the system
+          configuration.  (The latter is the main difference with
+          installing them in the default profile,
+          <filename>/nix/var/nix/profiles/default</filename>.
+        '';
+      };
+
+      # !!! Obsolete.
+      extraPackages = mkOption {
+        default = [];
+        example = [pkgs.firefox pkgs.thunderbird];
+        description = ''
+          This option allows you to add additional packages to the system
+          path.
+        '';
+      };
+
+      pathsToLink = mkOption {
+        default = ["/bin" "/sbin" "/lib" "/share/man" "/share/info" "/man" "/info"];
+        example = ["/"];
+        description = "
+          Lists directories to be symlinked in `/var/run/current-system/sw'.
+        ";
+      };
+
+    };
+
+    system = {
+
+      path = mkOption {
+        default = config.environment.systemPackages;
+        description = ''
+          The packages you want in the boot environment.
+        '';
+        apply = list: pkgs.buildEnv {
+          name = "system-path";
+          paths = list;
+
+          # Note: We need `/lib' to be among `pathsToLink' for NSS modules
+          # to work.
+          inherit (config.environment) pathsToLink;
+
+          ignoreCollisions = true;
+        };
+      };
+
+    };
+      
+  };
+
+
+in
+
+{
+  require = [options];
+}
diff --git a/modules/services/audio/pulseaudio.nix b/modules/services/audio/pulseaudio.nix
index 05ec99bae92..a32f4e38228 100644
--- a/modules/services/audio/pulseaudio.nix
+++ b/modules/services/audio/pulseaudio.nix
@@ -45,11 +45,7 @@ mkIf config.services.pulseaudio.enable {
   ];
 
   environment = {
-
-    extraPackages =
-      pkgs.lib.optional
-        (!config.environment.cleanStart)
-        pkgs.pulseaudio;
+    extraPackages = [pkgs.pulseaudio];
   };
 
   users = {
diff --git a/modules/services/misc/nix-daemon.nix b/modules/services/misc/nix-daemon.nix
index 63941bf8ef4..544ddab5832 100644
--- a/modules/services/misc/nix-daemon.nix
+++ b/modules/services/misc/nix-daemon.nix
@@ -1,11 +1,25 @@
 {pkgs, config, ...}:
 
+with pkgs.lib;
+
 ###### interface
 let
-  inherit (pkgs.lib) mkOption mkIf;
 
   options = {
 
+    environment = {
+
+      nix = mkOption {
+        default = pkgs.nixUnstable;
+        example = pkgs.nixCustomFun /root/nix.tar.gz;
+        merge = mergeOneOption;
+        description = "
+          This option specifies the Nix package instance to use throughout the system.
+        ";
+      };
+      
+    };
+
     nix = {
 
       maxJobs = mkOption {
diff --git a/modules/services/scheduling/cron.nix b/modules/services/scheduling/cron.nix
index cef505c9a34..a3a19e03ad0 100644
--- a/modules/services/scheduling/cron.nix
+++ b/modules/services/scheduling/cron.nix
@@ -58,7 +58,6 @@ in
     # ? # config.time.timeZone
     # ? # config.environment.etc
     # ? # config.environment.extraPackages
-    # ? # config.environment.cleanStart
     options
   ];
 
@@ -71,10 +70,7 @@ in
       }
     ];
 
-    extraPackages =
-      pkgs.lib.optional
-        (!config.environment.cleanStart)
-        pkgs.cron;
+    extraPackages = [pkgs.cron];
   };
 
   services = {
diff --git a/modules/services/scheduling/fcron.nix b/modules/services/scheduling/fcron.nix
index b05b9d8ab6a..e4b08b63282 100644
--- a/modules/services/scheduling/fcron.nix
+++ b/modules/services/scheduling/fcron.nix
@@ -107,10 +107,7 @@ in
       }
     ];
 
-    extraPackages = ifEnabled (
-      pkgs.lib.optional
-        (!config.environment.cleanStart)
-        pkgs.fcron);
+    extraPackages = ifEnabled [pkgs.fcron];
   };
 
   services = {
diff --git a/system/nixos-environment.nix b/system/nixos-environment.nix
index 7ce7571f475..d07d401d8e5 100644
--- a/system/nixos-environment.nix
+++ b/system/nixos-environment.nix
@@ -1,8 +1,6 @@
 {pkgs, config, ...}:
 
-let
-  inherit (pkgs.lib) mergeOneOption mkOption;
-in
+with pkgs.lib;
 
 {
   environment = {
@@ -13,51 +11,5 @@ in
         If all configuration options must be checked. Non-existing options fail build.
       ";
     };
-
-    nix = mkOption {
-      default = pkgs.nixUnstable;
-      example = pkgs.nixCustomFun /root/nix.tar.gz;
-      merge = mergeOneOption;
-      description = "
-        Use non-default Nix easily. Be careful, though, not to break everything.
-      ";
-    };
-
-    extraPackages = mkOption {
-      default = [];
-      example = [pkgs.firefox pkgs.thunderbird];
-      description = "
-        This option allows you to add additional packages to the system
-        path.  These packages are automatically available to all users,
-        and they are automatically updated every time you rebuild the
-        system configuration.  (The latter is the main difference with
-        installing them in the default profile,
-        <filename>/nix/var/nix/profiles/default</filename>.  The value
-        of this option must be a function that returns a list of
-        packages.  The function will be called with the Nix Packages
-        collection as its argument for convenience.
-      ";
-    };
-
-
-    pathsToLink = mkOption {
-      default = ["/bin" "/sbin" "/lib" "/share/man" "/share/info" "/man" "/info"];
-      example = ["/"];
-      description = "
-        Lists directories to be symlinked in `/var/run/current-system/sw'.
-      ";
-    };
-
-    cleanStart = mkOption {
-      default = false;
-      example = true;
-      description = "
-        There are some times when you want really small system for specific 
-        purpose and do not want default package list. Setting 
-        <varname>cleanStart</varname> to <literal>true</literal> allows you 
-        to create a system with empty path - only extraPackages will be 
-        included.
-      ";
-    };
   };
 }
diff --git a/system/options.nix b/system/options.nix
index 50d61239903..6c81912ea33 100644
--- a/system/options.nix
+++ b/system/options.nix
@@ -157,9 +157,10 @@ in
           inherit (pkgs) module_init_tools;
           inherit (config.system) modulesTree;
         };
-        description = "
-          Path to the modprobe binary used by the system.
-        ";
+        description = ''
+          Wrapper around modprobe that sets the path to the modules
+          tree.
+        '';
       };
 
       # !!! The mount option should not stay in /system/option.nix
@@ -178,8 +179,9 @@ in
           } + "/sbin";
         };
         description = "
-          Install a special version of mount to search mount tools in
-          unusual path.
+          A patched `mount' command that looks in a directory in the Nix
+          store instead of in /sbin for mount helpers (like mount.ntfs-3g or
+          mount.cifs).
         ";
       };
     };
@@ -447,6 +449,7 @@ in
     ../modules/system/upstart-events/ctrl-alt-delete.nix
     ../modules/system/upstart-events/halt.nix
     ../modules/system/upstart-events/maintenance-shell.nix
+    ../modules/config/system-path.nix
     ../system/assertion.nix
     ../system/nixos-environment.nix
     ../system/nixos-installer.nix
diff --git a/system/system-options.nix b/system/system-options.nix
index 1065d5721eb..8639cc702be 100644
--- a/system/system-options.nix
+++ b/system/system-options.nix
@@ -34,31 +34,6 @@ let
           builtins.head list;
       };
 
-      overridePath = mkOption {
-        default = [];
-        description = ''
-          You should not redefine this option unless you have trouble with a
-          package define in <varname>path</varname>.
-        '';
-      };
-
-      path = mkOption {
-        default = [];
-        description = ''
-          The packages you want in the boot environment.
-        '';
-        apply = list: pkgs.buildEnv {
-          name = "system-path";
-          paths = config.system.overridePath ++ list;
-
-          # Note: We need `/lib' to be among `pathsToLink' for NSS modules
-          # to work.
-          inherit (config.environment) pathsToLink;
-
-          ignoreCollisions = true;
-        };
-      };
-
     };
   };
 in
diff --git a/system/system.nix b/system/system.nix
index eaa41c720d8..46804767081 100644
--- a/system/system.nix
+++ b/system/system.nix
@@ -8,7 +8,6 @@ rec {
   configComponents = [
     configuration
     (import ./options.nix)
-    systemPathList
   ];
 
   # Make a configuration object from which we can retrieve option
@@ -26,14 +25,6 @@ rec {
 
   pkgs = import nixpkgs {system = platform;};
 
-  manifests = config.installer.manifests; # exported here because nixos-rebuild uses it
-
-  nix = config.environment.nix;
-
-  kernelPackages = config.boot.kernelPackages;
-
-  kernel = kernelPackages.kernel;
-
 
   # The initial ramdisk.
   initialRamdiskStuff = import ../modules/system/boot/stage-1.nix {
@@ -43,155 +34,18 @@ rec {
   initialRamdisk = initialRamdiskStuff.initialRamdisk;
 
 
-  # NixOS installation/updating tools.
-  nixosTools = import ../installer {
-    inherit pkgs config;
-  };
-
-
-  # NSS modules.  Hacky!
-  nssModules = config.system.nssModules.list;
-
-  nssModulesPath = config.system.nssModules.path;
-
-
-  # Wrapper around modprobe to set the path to the modules.
-  modprobe = config.system.sbin.modprobe;
-
-
-  # The static parts of /etc.
-  etc = config.system.build.etc;
-
-  
-  # Font aggregation
-  fontDir = config.system.build.x11Fonts;
-
-  
-  # A patched `mount' command that looks in a directory in the Nix
-  # store instead of in /sbin for mount helpers (like mount.ntfs-3g or
-  # mount.cifs).
-  mount = config.system.sbin.mount;
-  
-
-  # The packages you want in the boot environment.
-  # This have to be split up.
-  systemPathList = {
-    system = {
-      overridePath = [
-        # Better leave them here - they are small, needed,
-        # and hard to refer from anywhere outside.
-        modprobe # must take precedence over module_init_tools
-        mount # must take precedence over util-linux
-        nix
-        nixosTools.nixosInstall
-        nixosTools.nixosRebuild
-        nixosTools.nixosCheckout
-        nixosTools.nixosHardwareScan
-        nixosTools.nixosGenSeccureKeys
-      ];
-      path =
-        pkgs.lib.optionals (!config.environment.cleanStart) [
-        pkgs.acl
-        pkgs.attr
-        pkgs.bashInteractive # bash with ncurses support
-        pkgs.bzip2
-        pkgs.coreutils
-        pkgs.cpio
-        pkgs.curl
-        pkgs.e2fsprogs
-        pkgs.findutils
-        pkgs.glibc # for ldd, getent
-        pkgs.glibcLocales
-        pkgs.gnugrep
-        pkgs.gnused
-        pkgs.gnutar
-        pkgs.grub
-        pkgs.gzip
-        pkgs.iputils
-        pkgs.less
-        pkgs.libcap
-        pkgs.lvm2
-        pkgs.man
-        pkgs.mdadm
-        pkgs.module_init_tools
-        pkgs.nano
-        pkgs.ncurses
-        pkgs.netcat
-        pkgs.nettools
-        pkgs.ntp
-        pkgs.openssh
-        pkgs.pciutils
-        pkgs.perl
-        pkgs.procps
-        pkgs.pwdutils
-        pkgs.reiserfsprogs
-        pkgs.rsync
-        pkgs.seccure
-        pkgs.strace
-        pkgs.su
-        pkgs.sysklogd
-        pkgs.sysvtools
-        pkgs.time
-        pkgs.udev
-        pkgs.upstart
-        pkgs.usbutils
-        pkgs.utillinux
-        pkgs.wirelesstools
-        (import ../helpers/info-wrapper.nix {inherit (pkgs) bash texinfo writeScriptBin;})
-      ]
-      ++ pkgs.lib.optional config.services.bitlbee.enable pkgs.bitlbee
-      ++ pkgs.lib.optional config.networking.defaultMailServer.directDelivery pkgs.ssmtp 
-      ++ config.environment.extraPackages
-      ++ pkgs.lib.optional config.fonts.enableFontDir fontDir
-
-      # NSS modules need to be in `systemPath' so that (i) the builder
-      # chroot gets to seem them, and (ii) applications can benefit from
-      # changes in the list of NSS modules at run-time, without requiring
-      # a reboot.
-      ++ nssModules;
-    };
-  };
-
-
-  # We don't want to put all of `startPath' and `path' in $PATH, since
-  # then we get an embarrassingly long $PATH.  So use the user
-  # environment builder to make a directory with symlinks to those
-  # packages.
-  systemPath = config.system.path;
-
-
-  defaultShell = config.system.shell;
-
-
-  # The script that activates the configuration, i.e., it sets up
-  # /etc, accounts, etc.  It doesn't do anything that can only be done
-  # at boot time (such as start `init').
-  activateConfiguration = config.system.activationScripts.script;
-
-  # The shell that we want to use for /bin/sh.
-  binsh = pkgs.bashInteractive;
-
-
-  # The init script of boot stage 2, which is supposed to do
-  # everything else to bring up the system.
-  bootStage2 = config.system.build.bootStage2;
-
-
-  # Script to build the Grub menu containing the current and previous
-  # system configurations.
-  grubMenuBuilder = config.system.build.grubMenuBuilder;
-
   # This attribute is responsible for creating boot entries for 
   # child configuration. They are only (directly) accessible
   # when the parent configuration is boot default. For example,
   # you can provide an easy way to boot the same configuration 
   # as you use, but with another kernel
-  children = map (x: ((import ./system.nix) 
+  children = map (x: ((import ./system.nix)
     { inherit platform; 
       configuration = x//{boot=((x.boot)//{grubDevice = "";});};}).system) 
     config.nesting.children; 
   configurationName = config.boot.configurationName;
 
+  
   # Putting it all together.  This builds a store object containing
   # symlinks to the various parts of the built configuration (the
   # kernel, the Upstart services, the init scripts, etc.) as well as a
@@ -205,14 +59,14 @@ rec {
     grubDevice = config.boot.grubDevice;
     kernelParams =
       config.boot.kernelParams ++ config.boot.extraKernelParams;
-    inherit bootStage2;
-    inherit activateConfiguration;
-    inherit grubMenuBuilder;
-    inherit etc;
-    inherit systemPath;
+    bootStage2 = config.system.build.bootStage2;
+    activateConfiguration = config.system.activationScripts.script;
+    grubMenuBuilder = config.system.build.grubMenuBuilder;
+    etc = config.system.build.etc;
+    systemPath = config.system.path;
     inherit children;
     inherit configurationName;
-    kernel = kernel + "/vmlinuz";
+    kernel = config.boot.kernelPackages.kernel + "/vmlinuz";
     initrd = initialRamdisk + "/initrd";
     # Most of these are needed by grub-install.
     path = [
-- 
GitLab


From d4a87dd5e234329600a07f4d834ad67cffa9e069 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 25 May 2009 17:52:43 +0000
Subject: [PATCH 1496/5331] svn path=/nixos/branches/modular-nixos/;
 revision=15728

---
 system/options.nix | 2 +-
 system/system.nix  | 5 ++---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/system/options.nix b/system/options.nix
index 6c81912ea33..e7fa0b8cb23 100644
--- a/system/options.nix
+++ b/system/options.nix
@@ -385,6 +385,7 @@ in
     ../etc/default.nix
     ../modules/config/fonts.nix
     ../modules/config/i18n.nix
+    ../modules/config/system-path.nix
     ../modules/config/unix-odbc-drivers.nix
     ../modules/config/users-groups.nix
     ../modules/installer/grub/grub.nix
@@ -449,7 +450,6 @@ in
     ../modules/system/upstart-events/ctrl-alt-delete.nix
     ../modules/system/upstart-events/halt.nix
     ../modules/system/upstart-events/maintenance-shell.nix
-    ../modules/config/system-path.nix
     ../system/assertion.nix
     ../system/nixos-environment.nix
     ../system/nixos-installer.nix
diff --git a/system/system.nix b/system/system.nix
index 46804767081..489ec65d841 100644
--- a/system/system.nix
+++ b/system/system.nix
@@ -43,7 +43,6 @@ rec {
     { inherit platform; 
       configuration = x//{boot=((x.boot)//{grubDevice = "";});};}).system) 
     config.nesting.children; 
-  configurationName = config.boot.configurationName;
 
   
   # Putting it all together.  This builds a store object containing
@@ -55,7 +54,7 @@ rec {
     name = "system";
     builder = ./system.sh;
     switchToConfiguration = ./switch-to-configuration.sh;
-    inherit (pkgs) grub coreutils gnused gnugrep diffutils findutils upstart;
+    inherit (pkgs) grub upstart;
     grubDevice = config.boot.grubDevice;
     kernelParams =
       config.boot.kernelParams ++ config.boot.extraKernelParams;
@@ -65,7 +64,7 @@ rec {
     etc = config.system.build.etc;
     systemPath = config.system.path;
     inherit children;
-    inherit configurationName;
+    configurationName = config.boot.configurationName;
     kernel = config.boot.kernelPackages.kernel + "/vmlinuz";
     initrd = initialRamdisk + "/initrd";
     # Most of these are needed by grub-install.
-- 
GitLab


From af07eae05660013610c888f0407706a5e8c340ba Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 25 May 2009 18:42:44 +0000
Subject: [PATCH 1497/5331] * This config.system.build.system thing doesn't
 seem to be used.

svn path=/nixos/branches/modular-nixos/; revision=15730
---
 system/system-options.nix | 18 +++---------------
 1 file changed, 3 insertions(+), 15 deletions(-)

diff --git a/system/system-options.nix b/system/system-options.nix
index 8639cc702be..38dfce264f0 100644
--- a/system/system-options.nix
+++ b/system/system-options.nix
@@ -2,25 +2,18 @@
 # TODO: split it to make it readable.
 {pkgs, config, ...}:
 
+with pkgs.lib;
+
 ###### interface
 let
-  inherit (pkgs.lib) mkOption;
 
   option = {
     system = {
       build = mkOption {
         default = {};
         description = ''
-          Attribute set of derivation used to setup the system.  The system
-          is built by aggregating all derivations.
+          Attribute set of derivations used to setup the system.
         '';
-        apply = components: components // {
-          # all components have to build directories
-          result = pkgs.buildEnv {
-            name = "system";
-            paths = pkgs.lib.mapRecordFlatten (n: v: v) components;
-          };
-        };
       };
 
       shell = mkOption {
@@ -39,11 +32,6 @@ let
 in
 
 ###### implementation
-let
-  inherit (pkgs.stringsWithDeps) noDepEntry fullDepEntry packEntry;
-  inherit (pkgs.lib) mapRecordFlatten;
-in
-
 {
   require = [
     option
-- 
GitLab


From 47f70fda2f12783969389c4490b05e3e9ba231d4 Mon Sep 17 00:00:00 2001
From: Nicolas Pierron <nicolas.b.pierron@gmail.com>
Date: Tue, 26 May 2009 14:10:20 +0000
Subject: [PATCH 1498/5331] Fix fullDepEntry location in setuid-wrappers.nix.

svn path=/nixos/branches/modular-nixos/; revision=15733
---
 modules/security/setuid-wrappers.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/security/setuid-wrappers.nix b/modules/security/setuid-wrappers.nix
index d7f0157a0e8..b3d5db96cae 100644
--- a/modules/security/setuid-wrappers.nix
+++ b/modules/security/setuid-wrappers.nix
@@ -92,7 +92,7 @@ in
             '')
             config.security.setuidOwners);
 
-        in fullDepEntry ''
+        in pkgs.stringsWithDeps.fullDepEntry ''
           # Look in the system path and in the default profile for
           # programs to be wrapped.  However, having setuid programs
           # in a profile is problematic, since the NixOS activation
-- 
GitLab


From 7ac0b3aaeadb1607662f16a19a9f693de9ef0bca Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 27 May 2009 08:14:06 +0000
Subject: [PATCH 1499/5331] * Make modules/system/boot/stage-1.nix a proper
 module that exports   the initial ramdisk as config.system.build.bootStage1.

svn path=/nixos/branches/modular-nixos/; revision=15739
---
 default.nix                     | 15 ---------------
 modules/system/boot/stage-1.nix | 19 ++++++++++---------
 system/options.nix              |  1 +
 system/system.nix               | 10 +---------
 4 files changed, 12 insertions(+), 33 deletions(-)

diff --git a/default.nix b/default.nix
index affb6fdc3ea..30eff6c2e6a 100644
--- a/default.nix
+++ b/default.nix
@@ -24,21 +24,6 @@ in
     config
     ;
 
-  inherit (system.nixosTools)
-    nixosCheckout
-    nixosHardwareScan
-    nixosInstall
-    nixosRebuild
-    nixosGenSeccureKeys
-    ;
-
-  inherit (system.initialRamdiskStuff)
-    bootStage1
-    extraUtils
-    initialRamdisk
-    modulesClosure
-    ;
-    
   nix = system.config.environment.nix;
   
   nixFallback = (import nixpkgs {}).nixUnstable;
diff --git a/modules/system/boot/stage-1.nix b/modules/system/boot/stage-1.nix
index 2ed82339629..f4dfdb931ec 100644
--- a/modules/system/boot/stage-1.nix
+++ b/modules/system/boot/stage-1.nix
@@ -1,17 +1,13 @@
-# This Nix expression builds the initial ramdisk, which contains an
-# init script that performs the first stage of booting the system: it
-# loads the modules necessary to mount the root file system, then
-# calls the init in the root file system to start the second boot
-# stage.
+# This module builds the initial ramdisk, which contains an init
+# script that performs the first stage of booting the system: it loads
+# the modules necessary to mount the root file system, then calls the
+# init in the root file system to start the second boot stage.
 
-{pkgs, config}:
+{pkgs, config, ...}:
 
 let
   kernelPackages = config.boot.kernelPackages;
   modulesTree = config.system.modulesTree;
-in
-
-rec {
 
 
   # Determine the set of modules that we need to mount the root FS.
@@ -201,4 +197,9 @@ rec {
         ];
   };
   
+in {
+
+  system.build.bootStage1 = bootStage1;
+  system.build.initialRamdisk = initialRamdisk;
+
 }
diff --git a/system/options.nix b/system/options.nix
index e7fa0b8cb23..90add193c86 100644
--- a/system/options.nix
+++ b/system/options.nix
@@ -446,6 +446,7 @@ in
     ../modules/services/x11/xserver/default.nix
     ../modules/system/activation/activation-script.nix
     ../modules/system/boot/kernel.nix
+    ../modules/system/boot/stage-1.nix
     ../modules/system/boot/stage-2.nix
     ../modules/system/upstart-events/ctrl-alt-delete.nix
     ../modules/system/upstart-events/halt.nix
diff --git a/system/system.nix b/system/system.nix
index 489ec65d841..ee9c6d25934 100644
--- a/system/system.nix
+++ b/system/system.nix
@@ -26,14 +26,6 @@ rec {
   pkgs = import nixpkgs {system = platform;};
 
 
-  # The initial ramdisk.
-  initialRamdiskStuff = import ../modules/system/boot/stage-1.nix {
-    inherit pkgs config;
-  };
-
-  initialRamdisk = initialRamdiskStuff.initialRamdisk;
-
-
   # This attribute is responsible for creating boot entries for 
   # child configuration. They are only (directly) accessible
   # when the parent configuration is boot default. For example,
@@ -66,7 +58,7 @@ rec {
     inherit children;
     configurationName = config.boot.configurationName;
     kernel = config.boot.kernelPackages.kernel + "/vmlinuz";
-    initrd = initialRamdisk + "/initrd";
+    initrd = config.system.build.initialRamdisk + "/initrd";
     # Most of these are needed by grub-install.
     path = [
       pkgs.coreutils
-- 
GitLab


From 98cce35041be0fef2f6289297b076bdca0283640 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 27 May 2009 09:00:45 +0000
Subject: [PATCH 1500/5331] * Turn the top-level derivation of a NixOS
 configuration ("system")   into a NixOS module
 (modules/system/activation/top-level.nix -   couldn't think of a better
 name).  The top-level derivation is   returned in config.system.build.system.
 * Inlined system.sh in top-level.nix so that we don't have to pass  
 everything through environment variables.

svn path=/nixos/branches/modular-nixos/; revision=15740
---
 default.nix                                   | 46 ++++++----
 .../activation}/switch-to-configuration.sh    |  0
 modules/system/activation/top-level.nix       | 83 +++++++++++++++++++
 system/options.nix                            |  1 +
 system/system.nix                             | 75 -----------------
 system/system.sh                              | 32 -------
 6 files changed, 113 insertions(+), 124 deletions(-)
 rename {system => modules/system/activation}/switch-to-configuration.sh (100%)
 create mode 100644 modules/system/activation/top-level.nix
 delete mode 100644 system/system.nix
 delete mode 100644 system/system.sh

diff --git a/default.nix b/default.nix
index 30eff6c2e6a..ebb9110eb35 100644
--- a/default.nix
+++ b/default.nix
@@ -8,27 +8,39 @@ let
   
   nixpkgs = fromEnv "NIXPKGS" /etc/nixos/nixpkgs;
 
-  system = import system/system.nix { inherit configuration nixpkgs; };
+  pkgs = import nixpkgs {system = builtins.currentSystem;};
+  
+  #system = import system/system.nix { inherit configuration nixpkgs; };
+
+  configComponents = [
+    configuration
+    (import ./system/options.nix)
+  ];
+
+  # Make a configuration object from which we can retrieve option
+  # values.
+  config =
+    pkgs.lib.fixOptionSets
+      pkgs.lib.mergeOptionSets
+      pkgs configComponents;
 
+  optionDeclarations =
+    pkgs.lib.fixOptionSetsFun
+      pkgs.lib.filterOptionSets
+      pkgs configComponents
+      config;
+  
 in
 
-{ inherit (system)
-    activateConfiguration
-    bootStage2
-    etc
-    grubMenuBuilder
-    kernel
-    modulesTree
-    system
-    systemPath
-    config
-    ;
-
-  nix = system.config.environment.nix;
+{
+
+  system = config.system.build.system;
+
+  nix = config.environment.nix;
   
-  nixFallback = (import nixpkgs {}).nixUnstable;
+  nixFallback = pkgs.nixUnstable;
 
-  manifests = system.config.installer.manifests; # exported here because nixos-rebuild uses it
+  manifests = config.installer.manifests; # exported here because nixos-rebuild uses it
 
-  tests = system.config.tests;
+  tests = config.tests;
 }
diff --git a/system/switch-to-configuration.sh b/modules/system/activation/switch-to-configuration.sh
similarity index 100%
rename from system/switch-to-configuration.sh
rename to modules/system/activation/switch-to-configuration.sh
diff --git a/modules/system/activation/top-level.nix b/modules/system/activation/top-level.nix
new file mode 100644
index 00000000000..306037d1f57
--- /dev/null
+++ b/modules/system/activation/top-level.nix
@@ -0,0 +1,83 @@
+{pkgs, config, ...}:
+
+let
+
+  # This attribute is responsible for creating boot entries for 
+  # child configuration. They are only (directly) accessible
+  # when the parent configuration is boot default. For example,
+  # you can provide an easy way to boot the same configuration 
+  # as you use, but with another kernel
+  # !!! fix this
+  children = map (x: ((import ./system.nix)
+    { platform = pkgs.system;
+      configuration = x//{boot=((x.boot)//{grubDevice = "";});};}).system) 
+    config.nesting.children;
+
+
+  systemBuilder =
+    ''
+      ensureDir $out
+
+      ln -s ${config.boot.kernelPackages.kernel}/vmlinuz $out/kernel
+      ln -s $grub $out/grub
+      ln -s ${config.system.build.bootStage2} $out/init
+      ln -s ${config.system.build.initialRamdisk}/initrd $out/initrd
+      ln -s ${config.system.activationScripts.script} $out/activate
+      ln -s ${config.system.build.etc}/etc $out/etc
+      ln -s ${config.system.path} $out/sw
+      ln -s ${pkgs.upstart} $out/upstart
+
+      echo "$kernelParams" > $out/kernel-params
+      echo "$configurationName" > $out/configuration-name
+      echo "${toString pkgs.upstart.interfaceVersion}" > $out/upstart-interface-version
+
+      mkdir $out/fine-tune
+      childCount=0;
+      for i in $children; do 
+        childCount=$(( childCount + 1 ));
+        ln -s $i $out/fine-tune/child-$childCount;
+      done
+
+      cat > $out/menu.lst << GRUBEND
+      kernel $kernel init=$bootStage2 $kernelParams
+      initrd $initrd
+      GRUBEND
+
+      ensureDir $out/bin
+      substituteAll ${./switch-to-configuration.sh} $out/bin/switch-to-configuration
+      chmod +x $out/bin/switch-to-configuration
+    '';
+
+  
+  # Putting it all together.  This builds a store path containing
+  # symlinks to the various parts of the built configuration (the
+  # kernel, the Upstart services, the init scripts, etc.) as well as a
+  # script `switch-to-configuration' that activates the configuration
+  # and makes it bootable.
+  system = pkgs.stdenv.mkDerivation {
+    name = "system";
+    buildCommand = systemBuilder;
+    inherit children;
+    inherit (pkgs) grub;
+    grubDevice = config.boot.grubDevice;
+    kernelParams =
+      config.boot.kernelParams ++ config.boot.extraKernelParams;
+    grubMenuBuilder = config.system.build.grubMenuBuilder;
+    configurationName = config.boot.configurationName;
+    # Most of these are needed by grub-install.
+    path = [
+      pkgs.coreutils
+      pkgs.gnused
+      pkgs.gnugrep
+      pkgs.findutils
+      pkgs.diffutils
+      pkgs.upstart # for initctl
+    ];
+  };
+
+
+in {
+
+  system.build.system = system;
+
+}
diff --git a/system/options.nix b/system/options.nix
index 90add193c86..a15a4b30a4a 100644
--- a/system/options.nix
+++ b/system/options.nix
@@ -445,6 +445,7 @@ in
     ../modules/services/x11/xfs.nix
     ../modules/services/x11/xserver/default.nix
     ../modules/system/activation/activation-script.nix
+    ../modules/system/activation/top-level.nix
     ../modules/system/boot/kernel.nix
     ../modules/system/boot/stage-1.nix
     ../modules/system/boot/stage-2.nix
diff --git a/system/system.nix b/system/system.nix
deleted file mode 100644
index ee9c6d25934..00000000000
--- a/system/system.nix
+++ /dev/null
@@ -1,75 +0,0 @@
-{ platform ? __currentSystem
-, configuration
-, nixpkgs ? ../../nixpkgs
-}:
-
-rec {
-
-  configComponents = [
-    configuration
-    (import ./options.nix)
-  ];
-
-  # Make a configuration object from which we can retrieve option
-  # values.
-  config =
-    pkgs.lib.fixOptionSets
-      pkgs.lib.mergeOptionSets
-      pkgs configComponents;
-
-  optionDeclarations =
-    pkgs.lib.fixOptionSetsFun
-      pkgs.lib.filterOptionSets
-      pkgs configComponents
-      config;
-
-  pkgs = import nixpkgs {system = platform;};
-
-
-  # This attribute is responsible for creating boot entries for 
-  # child configuration. They are only (directly) accessible
-  # when the parent configuration is boot default. For example,
-  # you can provide an easy way to boot the same configuration 
-  # as you use, but with another kernel
-  children = map (x: ((import ./system.nix)
-    { inherit platform; 
-      configuration = x//{boot=((x.boot)//{grubDevice = "";});};}).system) 
-    config.nesting.children; 
-
-  
-  # Putting it all together.  This builds a store object containing
-  # symlinks to the various parts of the built configuration (the
-  # kernel, the Upstart services, the init scripts, etc.) as well as a
-  # script `switch-to-configuration' that activates the configuration
-  # and makes it bootable.
-  system = pkgs.checker (pkgs.stdenv.mkDerivation {
-    name = "system";
-    builder = ./system.sh;
-    switchToConfiguration = ./switch-to-configuration.sh;
-    inherit (pkgs) grub upstart;
-    grubDevice = config.boot.grubDevice;
-    kernelParams =
-      config.boot.kernelParams ++ config.boot.extraKernelParams;
-    bootStage2 = config.system.build.bootStage2;
-    activateConfiguration = config.system.activationScripts.script;
-    grubMenuBuilder = config.system.build.grubMenuBuilder;
-    etc = config.system.build.etc;
-    systemPath = config.system.path;
-    inherit children;
-    configurationName = config.boot.configurationName;
-    kernel = config.boot.kernelPackages.kernel + "/vmlinuz";
-    initrd = config.system.build.initialRamdisk + "/initrd";
-    # Most of these are needed by grub-install.
-    path = [
-      pkgs.coreutils
-      pkgs.gnused
-      pkgs.gnugrep
-      pkgs.findutils
-      pkgs.diffutils
-      pkgs.upstart # for initctl
-    ];
-    upstartInterfaceVersion = pkgs.upstart.interfaceVersion;
-  }) config.environment.checkConfigurationOptions
-     optionDeclarations config;
-
-}
diff --git a/system/system.sh b/system/system.sh
deleted file mode 100644
index 67042b5faf4..00000000000
--- a/system/system.sh
+++ /dev/null
@@ -1,32 +0,0 @@
-source $stdenv/setup
-
-ensureDir $out
-
-ln -s $kernel $out/kernel
-ln -s $grub $out/grub
-ln -s $bootStage2 $out/init
-ln -s $initrd $out/initrd
-ln -s $activateConfiguration $out/activate
-ln -s $etc/etc $out/etc
-ln -s $systemPath $out/sw
-ln -s $upstart $out/upstart
-
-echo "$kernelParams" > $out/kernel-params
-echo "$configurationName" > $out/configuration-name
-echo "$upstartInterfaceVersion" > $out/upstart-interface-version
-
-mkdir $out/fine-tune
-ChildCount=0;
-for i in $children; do 
-	ChildCount=$(( ChildCount + 1 ));
-	ln -s $i $out/fine-tune/child-$ChildCount;
-done
-
-cat > $out/menu.lst << GRUBEND
-kernel $kernel init=$bootStage2 $kernelParams
-initrd $initrd
-GRUBEND
-
-ensureDir $out/bin
-substituteAll $switchToConfiguration $out/bin/switch-to-configuration
-chmod +x $out/bin/switch-to-configuration
-- 
GitLab


From 6d2ca42b30068cb922b13fe41f5d39c9473cf555 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 27 May 2009 09:01:45 +0000
Subject: [PATCH 1501/5331] svn path=/nixos/branches/modular-nixos/;
 revision=15741

---
 installer/cd-dvd/rescue-cd.nix | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/installer/cd-dvd/rescue-cd.nix b/installer/cd-dvd/rescue-cd.nix
index ef47d960613..6d410941575 100644
--- a/installer/cd-dvd/rescue-cd.nix
+++ b/installer/cd-dvd/rescue-cd.nix
@@ -184,12 +184,8 @@ rec {
   pkgs = system.pkgs;
 
 
-  # The NixOS manual, with a backward compatibility hack for Nix <=
-  # 0.11 (you won't get the manual).
-  manual =
-    if builtins ? unsafeDiscardStringContext
-    then "${import ../../doc/manual {inherit nixpkgs;}}/manual.html"
-    else pkgs.writeText "dummy-manual" "Manual not included in this build!";
+  # The NixOS manual.
+  manual = "${import ../../doc/manual {inherit nixpkgs;}}/manual.html";
 
 
   # We need a copy of the Nix expressions for Nixpkgs and NixOS on the
-- 
GitLab


From 8e98dc33f5e774c5f791cbc1220c004b45bd339a Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 27 May 2009 09:03:07 +0000
Subject: [PATCH 1502/5331] svn path=/nixos/branches/modular-nixos/;
 revision=15742

---
 default.nix | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/default.nix b/default.nix
index ebb9110eb35..de237520ba3 100644
--- a/default.nix
+++ b/default.nix
@@ -34,7 +34,11 @@ in
 
 {
 
-  system = config.system.build.system;
+  # Optionally check wether all config values have corresponding
+  # option declarations.
+  system = pkgs.checker config.system.build.system
+    config.environment.checkConfigurationOptions
+    optionDeclarations config;
 
   nix = config.environment.nix;
   
-- 
GitLab


From cfa218a26b8ce073cf93f1f5f98f1a123c985803 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 27 May 2009 09:09:17 +0000
Subject: [PATCH 1503/5331] * Move the list of modules into a separate file. 
 This file could be   generated by some find/grep hackery as Nicolas
 suggested.

svn path=/nixos/branches/modular-nixos/; revision=15743
---
 default.nix             |  2 -
 modules/module-list.nix | 88 ++++++++++++++++++++++++++++++++++++++++
 system/options.nix      | 90 +----------------------------------------
 3 files changed, 89 insertions(+), 91 deletions(-)
 create mode 100644 modules/module-list.nix

diff --git a/default.nix b/default.nix
index de237520ba3..45e43c18e6d 100644
--- a/default.nix
+++ b/default.nix
@@ -10,8 +10,6 @@ let
 
   pkgs = import nixpkgs {system = builtins.currentSystem;};
   
-  #system = import system/system.nix { inherit configuration nixpkgs; };
-
   configComponents = [
     configuration
     (import ./system/options.nix)
diff --git a/modules/module-list.nix b/modules/module-list.nix
new file mode 100644
index 00000000000..57f8a014a2a
--- /dev/null
+++ b/modules/module-list.nix
@@ -0,0 +1,88 @@
+[ #./hardware/network/intel-3945abg.nix
+  ../etc/default.nix
+  ./config/fonts.nix
+  ./config/i18n.nix
+  ./config/system-path.nix
+  ./config/unix-odbc-drivers.nix
+  ./config/users-groups.nix
+  ./installer/grub/grub.nix
+  ./security/setuid-wrappers.nix
+  ./security/sudo.nix
+  ./services/audio/alsa.nix
+  ./services/audio/pulseaudio.nix
+  ./services/databases/mysql.nix
+  ./services/databases/postgresql.nix
+  ./services/hardware/acpid.nix
+  ./services/hardware/hal.nix
+  ./services/hardware/udev.nix
+  ./services/logging/klogd.nix
+  ./services/logging/syslogd.nix
+  ./services/mail/dovecot.nix
+  ./services/mail/postfix.nix
+  ./services/misc/autofs.nix
+  ./services/misc/disnix.nix
+  ./services/misc/nix-daemon.nix
+  ./services/misc/nixos-manual.nix
+  ./services/misc/rogue.nix
+  ./services/misc/synergy.nix
+  ./services/monitoring/nagios/default.nix
+  ./services/monitoring/zabbix-agent.nix
+  ./services/monitoring/zabbix-server.nix
+  ./services/network-filesystems/nfs-kernel.nix
+  ./services/network-filesystems/samba.nix # TODO: doesn't start here (?)
+  ./services/networking/avahi-daemon.nix
+  ./services/networking/bind.nix
+  ./services/networking/bitlbee.nix
+  ./services/networking/dhclient.nix
+  ./services/networking/dhcpd.nix
+  ./services/networking/ejabberd.nix # untested, dosen't compile on x86_64-linux
+  ./services/networking/gnunet.nix
+  ./services/networking/gw6c.nix
+  ./services/networking/ifplugd.nix
+  ./services/networking/ircd-hybrid.nix # TODO: doesn't compile on x86_64-linux, can't test
+  ./services/networking/ntpd.nix
+  ./services/networking/openfire.nix
+  ./services/networking/openvpn.nix
+  ./services/networking/portmap.nix
+  ./services/networking/ssh/lshd.nix # GNU lshd SSH2 deamon (TODO: does neither start nor generate seed file ?)
+  ./services/networking/ssh/sshd.nix
+  ./services/networking/vsftpd.nix
+  ./services/printing/cupsd.nix
+  ./services/scheduling/atd.nix
+  ./services/scheduling/cron.nix
+  ./services/scheduling/fcron.nix
+  ./services/system/consolekit.nix
+  ./services/system/dbus.nix
+  ./services/system/nscd.nix
+  ./services/ttys/gpm.nix
+  ./services/ttys/mingetty.nix
+  ./services/web-servers/apache-httpd
+  ./services/web-servers/jboss.nix
+  ./services/web-servers/tomcat.nix # untested, too lazy to get that jdk
+  ./services/x11/xfs.nix
+  ./services/x11/xserver/default.nix
+  ./system/activation/activation-script.nix
+  ./system/activation/top-level.nix
+  ./system/boot/kernel.nix
+  ./system/boot/stage-1.nix
+  ./system/boot/stage-2.nix
+  ./system/upstart-events/ctrl-alt-delete.nix
+  ./system/upstart-events/halt.nix
+  ./system/upstart-events/maintenance-shell.nix
+  ../system/assertion.nix
+  ../system/nixos-environment.nix
+  ../system/nixos-installer.nix
+  ../system/system-options.nix
+  ../upstart-jobs/cron/locate.nix
+  ../upstart-jobs/default.nix
+  ../upstart-jobs/filesystems.nix
+  ../upstart-jobs/guest-users.nix
+  ../upstart-jobs/kbd.nix
+  ../upstart-jobs/ldap
+  ../upstart-jobs/lvm.nix
+  ../upstart-jobs/network-interfaces.nix
+  ../upstart-jobs/pcmcia.nix
+  ../upstart-jobs/swap.nix
+  ../upstart-jobs/swraid.nix
+  ../upstart-jobs/tty-backgrounds.nix
+]
diff --git a/system/options.nix b/system/options.nix
index a15a4b30a4a..b5120f651d7 100644
--- a/system/options.nix
+++ b/system/options.nix
@@ -380,93 +380,5 @@ in
     ";
   };
 
-  require = [
-    #../modules/hardware/network/intel-3945abg.nix
-    ../etc/default.nix
-    ../modules/config/fonts.nix
-    ../modules/config/i18n.nix
-    ../modules/config/system-path.nix
-    ../modules/config/unix-odbc-drivers.nix
-    ../modules/config/users-groups.nix
-    ../modules/installer/grub/grub.nix
-    ../modules/security/setuid-wrappers.nix
-    ../modules/security/sudo.nix
-    ../modules/services/audio/alsa.nix
-    ../modules/services/audio/pulseaudio.nix
-    ../modules/services/databases/mysql.nix
-    ../modules/services/databases/postgresql.nix
-    ../modules/services/hardware/acpid.nix
-    ../modules/services/hardware/hal.nix
-    ../modules/services/hardware/udev.nix
-    ../modules/services/logging/klogd.nix
-    ../modules/services/logging/syslogd.nix
-    ../modules/services/mail/dovecot.nix
-    ../modules/services/mail/postfix.nix
-    ../modules/services/misc/autofs.nix
-    ../modules/services/misc/disnix.nix
-    ../modules/services/misc/nix-daemon.nix
-    ../modules/services/misc/nixos-manual.nix
-    ../modules/services/misc/rogue.nix
-    ../modules/services/misc/synergy.nix
-    ../modules/services/monitoring/nagios/default.nix
-    ../modules/services/monitoring/zabbix-agent.nix
-    ../modules/services/monitoring/zabbix-server.nix
-    ../modules/services/network-filesystems/nfs-kernel.nix
-    ../modules/services/network-filesystems/samba.nix # TODO: doesn't start here (?)
-    ../modules/services/networking/avahi-daemon.nix
-    ../modules/services/networking/bind.nix
-    ../modules/services/networking/bitlbee.nix
-    ../modules/services/networking/dhclient.nix
-    ../modules/services/networking/dhcpd.nix
-    ../modules/services/networking/ejabberd.nix # untested, dosen't compile on x86_64-linux
-    ../modules/services/networking/gnunet.nix
-    ../modules/services/networking/gw6c.nix
-    ../modules/services/networking/ifplugd.nix
-    ../modules/services/networking/ircd-hybrid.nix # TODO: doesn't compile on x86_64-linux, can't test
-    ../modules/services/networking/ntpd.nix
-    ../modules/services/networking/openfire.nix
-    ../modules/services/networking/openvpn.nix
-    ../modules/services/networking/portmap.nix
-    ../modules/services/networking/ssh/lshd.nix # GNU lshd SSH2 deamon (TODO: does neither start nor generate seed file ?)
-    ../modules/services/networking/ssh/sshd.nix
-    ../modules/services/networking/vsftpd.nix
-    ../modules/services/printing/cupsd.nix
-    ../modules/services/scheduling/atd.nix
-    ../modules/services/scheduling/cron.nix
-    ../modules/services/scheduling/fcron.nix
-    ../modules/services/system/consolekit.nix
-    ../modules/services/system/dbus.nix
-    ../modules/services/system/nscd.nix
-    ../modules/services/ttys/gpm.nix
-    ../modules/services/ttys/mingetty.nix
-    ../modules/services/web-servers/apache-httpd
-    ../modules/services/web-servers/jboss.nix
-    ../modules/services/web-servers/tomcat.nix # untested, too lazy to get that jdk
-    ../modules/services/x11/xfs.nix
-    ../modules/services/x11/xserver/default.nix
-    ../modules/system/activation/activation-script.nix
-    ../modules/system/activation/top-level.nix
-    ../modules/system/boot/kernel.nix
-    ../modules/system/boot/stage-1.nix
-    ../modules/system/boot/stage-2.nix
-    ../modules/system/upstart-events/ctrl-alt-delete.nix
-    ../modules/system/upstart-events/halt.nix
-    ../modules/system/upstart-events/maintenance-shell.nix
-    ../system/assertion.nix
-    ../system/nixos-environment.nix
-    ../system/nixos-installer.nix
-    ../system/system-options.nix
-    ../upstart-jobs/cron/locate.nix
-    ../upstart-jobs/default.nix
-    ../upstart-jobs/filesystems.nix
-    ../upstart-jobs/guest-users.nix
-    ../upstart-jobs/kbd.nix
-    ../upstart-jobs/ldap
-    ../upstart-jobs/lvm.nix
-    ../upstart-jobs/network-interfaces.nix
-    ../upstart-jobs/pcmcia.nix
-    ../upstart-jobs/swap.nix
-    ../upstart-jobs/swraid.nix
-    ../upstart-jobs/tty-backgrounds.nix
-  ];
+  require = import ../modules/module-list.nix;
 }
-- 
GitLab


From 5b7f7d2de1d2bc81d65b209a3d759d601528606d Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 27 May 2009 09:16:56 +0000
Subject: [PATCH 1504/5331] * Move the config evaluation into a separate
 expression so that it can   be reused, e.g. for building the CD/DVD.

svn path=/nixos/branches/modular-nixos/; revision=15744
---
 default.nix         | 25 +++++--------------------
 lib/eval-config.nix | 23 +++++++++++++++++++++++
 2 files changed, 28 insertions(+), 20 deletions(-)
 create mode 100644 lib/eval-config.nix

diff --git a/default.nix b/default.nix
index 45e43c18e6d..df69ee4c3e2 100644
--- a/default.nix
+++ b/default.nix
@@ -9,29 +9,14 @@ let
   nixpkgs = fromEnv "NIXPKGS" /etc/nixos/nixpkgs;
 
   pkgs = import nixpkgs {system = builtins.currentSystem;};
-  
-  configComponents = [
-    configuration
-    (import ./system/options.nix)
-  ];
-
-  # Make a configuration object from which we can retrieve option
-  # values.
-  config =
-    pkgs.lib.fixOptionSets
-      pkgs.lib.mergeOptionSets
-      pkgs configComponents;
-
-  optionDeclarations =
-    pkgs.lib.fixOptionSetsFun
-      pkgs.lib.filterOptionSets
-      pkgs configComponents
-      config;
-  
+
+  inherit
+    (import ./lib/eval-config.nix {inherit configuration pkgs;})
+    config optionDeclarations;
+
 in
 
 {
-
   # Optionally check wether all config values have corresponding
   # option declarations.
   system = pkgs.checker config.system.build.system
diff --git a/lib/eval-config.nix b/lib/eval-config.nix
new file mode 100644
index 00000000000..e1cf7ac3cf6
--- /dev/null
+++ b/lib/eval-config.nix
@@ -0,0 +1,23 @@
+# From an end-user configuration file (`configuration'), build a NixOS
+# configuration object (`config') from which we can retrieve option
+# values.
+
+{configuration, pkgs}:
+
+rec {
+  configComponents = [
+    configuration
+    (import ../system/options.nix)
+  ];
+
+  config =
+    pkgs.lib.fixOptionSets
+      pkgs.lib.mergeOptionSets
+      pkgs configComponents;
+
+  optionDeclarations =
+    pkgs.lib.fixOptionSetsFun
+      pkgs.lib.filterOptionSets
+      pkgs configComponents
+      config;
+}
-- 
GitLab


From 68c3132f4600aadeca32a27c04857513fd9404e8 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 27 May 2009 09:40:55 +0000
Subject: [PATCH 1505/5331] * Move the activation scripts to the appropriate
 module.

svn path=/nixos/branches/modular-nixos/; revision=15745
---
 .../system/activation/activation-script.nix   | 227 +++++++++++++++---
 system/system-options.nix                     | 157 ------------
 2 files changed, 196 insertions(+), 188 deletions(-)

diff --git a/modules/system/activation/activation-script.nix b/modules/system/activation/activation-script.nix
index 8e9029d0943..4cf6548ed29 100644
--- a/modules/system/activation/activation-script.nix
+++ b/modules/system/activation/activation-script.nix
@@ -2,9 +2,9 @@
 {pkgs, config, ...}:
 
 let
-  inherit (pkgs.stringsWithDeps) textClosureMap noDepEntry;
   inherit (pkgs.lib) mkOption mergeTypedOption mergeAttrs mapRecordFlatten
-    mapAttrs addErrorContext fold id filter;
+    mapAttrs addErrorContext fold id filter textClosureMap noDepEntry
+    fullDepEntry;
   inherit (builtins) attrNames;
 
   addAttributeName = mapAttrs (a: v: v // {
@@ -14,40 +14,205 @@ let
         ${v.text}
       '';
     });
+
+  defaultScripts = {
+  
+    systemConfig = noDepEntry ''
+      systemConfig="$1"
+      if test -z "$systemConfig"; then
+        systemConfig="/system" # for the installation CD
+      fi
+    '';
+
+    defaultPath =
+      let path = [
+        pkgs.coreutils pkgs.gnugrep pkgs.findutils
+        pkgs.glibc # needed for getent
+        pkgs.pwdutils
+        pkgs.nettools # needed for hostname
+      ]; in noDepEntry ''
+        export PATH=/empty
+        for i in ${toString path}; do
+          PATH=$PATH:$i/bin:$i/sbin;
+        done
+      '';
+
+    stdio = fullDepEntry ''
+      # Needed by some programs.
+      ln -sfn /proc/self/fd /dev/fd
+      ln -sfn /proc/self/fd/0 /dev/stdin
+      ln -sfn /proc/self/fd/1 /dev/stdout
+      ln -sfn /proc/self/fd/2 /dev/stderr
+    '' [
+      "defaultPath" # path to ln
+    ];
+
+    binsh = fullDepEntry ''
+      # Create the required /bin/sh symlink; otherwise lots of things
+      # (notably the system() function) won't work.
+      mkdir -m 0755 -p $mountPoint/bin
+      ln -sfn ${config.system.build.binsh}/bin/sh $mountPoint/bin/sh
+    '' [
+      "defaultPath" # path to ln & mkdir
+      "stdio" # ?
+    ];
+
+    modprobe = fullDepEntry ''
+      # Allow the kernel to find our wrapped modprobe (which searches in the
+      # right location in the Nix store for kernel modules).  We need this
+      # when the kernel (or some module) auto-loads a module.
+      # !!! maybe this should only happen at boot time, since we shouldn't
+      # use modules that don't match the running kernel.
+      echo ${config.system.sbin.modprobe}/sbin/modprobe > /proc/sys/kernel/modprobe
+    '' [
+      # ?
+    ];
+
+    var = fullDepEntry ''
+      # Various log/runtime directories.
+      mkdir -m 0755 -p /var/run
+      mkdir -m 0755 -p /var/run/console # for pam_console
+
+      touch /var/run/utmp # must exist
+      chmod 644 /var/run/utmp
+
+      mkdir -m 0755 -p /var/run/nix/current-load # for distributed builds
+      mkdir -m 0700 -p /var/run/nix/remote-stores
+
+      mkdir -m 0755 -p /var/log
+
+      touch /var/log/wtmp # must exist
+      chmod 644 /var/log/wtmp
+
+      touch /var/log/lastlog
+      chmod 644 /var/log/lastlog
+
+      mkdir -m 1777 -p /var/tmp
+
+
+      # Empty, read-only home directory of many system accounts.
+      mkdir -m 0555 -p /var/empty
+    '' [
+      "defaultPath" # path to mkdir & touch & chmod
+    ];
+
+    rootPasswd = fullDepEntry ''
+      # If there is no password file yet, create a root account with an
+      # empty password.
+      if ! test -e /etc/passwd; then
+          rootHome=/root
+          touch /etc/passwd; chmod 0644 /etc/passwd
+          touch /etc/group; chmod 0644 /etc/group
+          touch /etc/shadow; chmod 0600 /etc/shadow
+          # Can't use useradd, since it complains that it doesn't know us
+          # (bootstrap problem!).
+          echo "root:x:0:0:System administrator:$rootHome:${config.system.shell}" >> /etc/passwd
+          echo "root::::::::" >> /etc/shadow
+          echo | passwd --stdin root
+      fi
+    '' [
+      "defaultPath" # path to touch & passwd
+      "etc" # for /etc
+      # ?
+    ];
+
+    nix = fullDepEntry ''
+      # Set up Nix.
+      mkdir -p /nix/etc/nix
+      ln -sfn /etc/nix.conf /nix/etc/nix/nix.conf
+      chown root.nixbld /nix/store
+      chmod 1775 /nix/store
+
+      # Nix initialisation.
+      mkdir -m 0755 -p \
+          /nix/var/nix/gcroots \
+          /nix/var/nix/temproots \
+          /nix/var/nix/manifests \
+          /nix/var/nix/userpool \
+          /nix/var/nix/profiles \
+          /nix/var/nix/db \
+          /nix/var/log/nix/drvs \
+          /nix/var/nix/channel-cache \
+          /nix/var/nix/chroots
+      mkdir -m 1777 -p /nix/var/nix/gcroots/per-user
+      mkdir -m 1777 -p /nix/var/nix/profiles/per-user
+
+      ln -sf /nix/var/nix/profiles /nix/var/nix/gcroots/
+      ln -sf /nix/var/nix/manifests /nix/var/nix/gcroots/
+    '' [
+      "defaultPath"
+      "etc" # /etc/nix.conf
+      "users" # nixbld group
+    ];
+
+    hostname = fullDepEntry ''
+      # Set the host name.  Don't clear it if it's not configured in the
+      # NixOS configuration, since it may have been set by dhclient in the
+      # meantime.
+      ${if config.networking.hostName != "" then
+          ''hostname "${config.networking.hostName}"''
+      else ''
+          # dhclient won't do anything if the hostname isn't empty.
+          if test "$(hostname)" = "(none)"; then
+            hostname ""
+          fi
+      ''}
+    '' [ "defaultPath" ];
+
+    # The activation has to be done at the end. This is forced at the apply
+    # function of activationScripts option
+    activate = noDepEntry ''
+      # Make this configuration the current configuration.
+      # The readlink is there to ensure that when $systemConfig = /system
+      # (which is a symlink to the store), /var/run/current-system is still
+      # used as a garbage collection root.
+      ln -sfn "$(readlink -f "$systemConfig")" /var/run/current-system
+
+      # Prevent the current configuration from being garbage-collected.
+      ln -sfn /var/run/current-system /nix/var/nix/gcroots/current-system
+    '';
+    
+  };
+  
+    
 in
 
 {
-  system = {
-    activationScripts = mkOption {
-      default = [];
-      example = {
-        stdio = {
-          text = "
-            # Needed by some programs.
-            ln -sfn /proc/self/fd /dev/fd
-            ln -sfn /proc/self/fd/0 /dev/stdin
-            ln -sfn /proc/self/fd/1 /dev/stdout
-            ln -sfn /proc/self/fd/2 /dev/stderr
-          ";
-          deps = [];
+  require = {
+    system = {
+      activationScripts = mkOption {
+        default = [];
+        example = {
+          stdio = {
+            text = "
+              # Needed by some programs.
+              ln -sfn /proc/self/fd /dev/fd
+              ln -sfn /proc/self/fd/0 /dev/stdin
+              ln -sfn /proc/self/fd/1 /dev/stdout
+              ln -sfn /proc/self/fd/2 /dev/stderr
+            ";
+            deps = [];
+          };
+        };
+        description = ''
+          Activate the new configuration (i.e., update /etc, make accounts,
+          and so on).
+        '';
+        merge = mergeTypedOption "script" builtins.isAttrs (fold mergeAttrs {});
+        apply = set:
+          let withHeadlines = addAttributeName set;
+              activateLib = removeAttrs withHeadlines ["activate"];
+              activateLibNames = attrNames activateLib;
+          in {
+          script = pkgs.writeScript "nixos-activation-script"
+            ("#!/bin/sh\n"
+             + textClosureMap id activateLib activateLibNames + "\n"
+               # make sure that the activate snippet is added last.
+             + withHeadlines.activate.text);
         };
-      };
-      description = ''
-        Activate the new configuration (i.e., update /etc, make accounts,
-        and so on).
-      '';
-      merge = mergeTypedOption "script" builtins.isAttrs (fold mergeAttrs {});
-      apply = set:
-        let withHeadlines = addAttributeName set;
-            activateLib = removeAttrs withHeadlines ["activate"];
-            activateLibNames = attrNames activateLib;
-        in {
-        script = pkgs.writeScript "nixos-activation-script"
-          ("#!/bin/sh\n"
-           + textClosureMap id activateLib activateLibNames + "\n"
-             # make sure that the activate snippet is added last.
-           + withHeadlines.activate.text);
       };
     };
   };
+
+  system.activationScripts = defaultScripts;
 }
diff --git a/system/system-options.nix b/system/system-options.nix
index 38dfce264f0..01bff26b87c 100644
--- a/system/system-options.nix
+++ b/system/system-options.nix
@@ -44,162 +44,5 @@ in
     build = {
       binsh = pkgs.bashInteractive;
     };
-
-    activationScripts = {
-      systemConfig = noDepEntry ''
-        systemConfig="$1"
-        if test -z "$systemConfig"; then
-          systemConfig="/system" # for the installation CD
-        fi
-      '';
-
-      defaultPath =
-        let path = [
-          pkgs.coreutils pkgs.gnugrep pkgs.findutils
-          pkgs.glibc # needed for getent
-          pkgs.pwdutils
-          pkgs.nettools # needed for hostname
-        ]; in noDepEntry ''
-          export PATH=/empty
-          for i in ${toString path}; do
-            PATH=$PATH:$i/bin:$i/sbin;
-          done
-        '';
-
-      stdio = fullDepEntry ''
-        # Needed by some programs.
-        ln -sfn /proc/self/fd /dev/fd
-        ln -sfn /proc/self/fd/0 /dev/stdin
-        ln -sfn /proc/self/fd/1 /dev/stdout
-        ln -sfn /proc/self/fd/2 /dev/stderr
-      '' [
-        "defaultPath" # path to ln
-      ];
-
-      binsh = fullDepEntry ''
-        # Create the required /bin/sh symlink; otherwise lots of things
-        # (notably the system() function) won't work.
-        mkdir -m 0755 -p $mountPoint/bin
-        ln -sfn ${config.system.build.binsh}/bin/sh $mountPoint/bin/sh
-      '' [
-        "defaultPath" # path to ln & mkdir
-        "stdio" # ?
-      ];
-
-      modprobe = fullDepEntry ''
-        # Allow the kernel to find our wrapped modprobe (which searches in the
-        # right location in the Nix store for kernel modules).  We need this
-        # when the kernel (or some module) auto-loads a module.
-        # !!! maybe this should only happen at boot time, since we shouldn't
-        # use modules that don't match the running kernel.
-        echo ${config.system.sbin.modprobe}/sbin/modprobe > /proc/sys/kernel/modprobe
-      '' [
-        # ?
-      ];
-
-      var = fullDepEntry ''
-        # Various log/runtime directories.
-        mkdir -m 0755 -p /var/run
-        mkdir -m 0755 -p /var/run/console # for pam_console
-
-        touch /var/run/utmp # must exist
-        chmod 644 /var/run/utmp
-
-        mkdir -m 0755 -p /var/run/nix/current-load # for distributed builds
-        mkdir -m 0700 -p /var/run/nix/remote-stores
-
-        mkdir -m 0755 -p /var/log
-
-        touch /var/log/wtmp # must exist
-        chmod 644 /var/log/wtmp
-
-        touch /var/log/lastlog
-        chmod 644 /var/log/lastlog
-
-        mkdir -m 1777 -p /var/tmp
-
-
-        # Empty, read-only home directory of many system accounts.
-        mkdir -m 0555 -p /var/empty
-      '' [
-        "defaultPath" # path to mkdir & touch & chmod
-      ];
-
-      rootPasswd = fullDepEntry ''
-        # If there is no password file yet, create a root account with an
-        # empty password.
-        if ! test -e /etc/passwd; then
-            rootHome=/root
-            touch /etc/passwd; chmod 0644 /etc/passwd
-            touch /etc/group; chmod 0644 /etc/group
-            touch /etc/shadow; chmod 0600 /etc/shadow
-            # Can't use useradd, since it complains that it doesn't know us
-            # (bootstrap problem!).
-            echo "root:x:0:0:System administrator:$rootHome:${config.system.shell}" >> /etc/passwd
-            echo "root::::::::" >> /etc/shadow
-            echo | passwd --stdin root
-        fi
-      '' [
-        "defaultPath" # path to touch & passwd
-        "etc" # for /etc
-        # ?
-      ];
-
-      nix = fullDepEntry ''
-        # Set up Nix.
-        mkdir -p /nix/etc/nix
-        ln -sfn /etc/nix.conf /nix/etc/nix/nix.conf
-        chown root.nixbld /nix/store
-        chmod 1775 /nix/store
-
-        # Nix initialisation.
-        mkdir -m 0755 -p \
-            /nix/var/nix/gcroots \
-            /nix/var/nix/temproots \
-            /nix/var/nix/manifests \
-            /nix/var/nix/userpool \
-            /nix/var/nix/profiles \
-            /nix/var/nix/db \
-            /nix/var/log/nix/drvs \
-            /nix/var/nix/channel-cache \
-            /nix/var/nix/chroots
-        mkdir -m 1777 -p /nix/var/nix/gcroots/per-user
-        mkdir -m 1777 -p /nix/var/nix/profiles/per-user
-
-        ln -sf /nix/var/nix/profiles /nix/var/nix/gcroots/
-        ln -sf /nix/var/nix/manifests /nix/var/nix/gcroots/
-      '' [
-        "defaultPath"
-        "etc" # /etc/nix.conf
-        "users" # nixbld group
-      ];
-
-      hostname = fullDepEntry ''
-        # Set the host name.  Don't clear it if it's not configured in the
-        # NixOS configuration, since it may have been set by dhclient in the
-        # meantime.
-        ${if config.networking.hostName != "" then
-            ''hostname "${config.networking.hostName}"''
-        else ''
-            # dhclient won't do anything if the hostname isn't empty.
-            if test "$(hostname)" = "(none)"; then
-              hostname ""
-            fi
-        ''}
-      '' [ "defaultPath" ];
-
-      # The activation has to be done at the end. This is forced at the apply
-      # function of activationScripts option
-      activate = noDepEntry ''
-        # Make this configuration the current configuration.
-        # The readlink is there to ensure that when $systemConfig = /system
-        # (which is a symlink to the store), /var/run/current-system is still
-        # used as a garbage collection root.
-        ln -sfn "$(readlink -f "$systemConfig")" /var/run/current-system
-
-        # Prevent the current configuration from being garbage-collected.
-        ln -sfn /var/run/current-system /nix/var/nix/gcroots/current-system
-      '';
-    };
   };
 }
-- 
GitLab


From 690416cf1adfd4bea81b2bddbffe878e2eb0d624 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 27 May 2009 09:46:50 +0000
Subject: [PATCH 1506/5331] * Move initrd-related options to the appropriate
 module.

svn path=/nixos/branches/modular-nixos/; revision=15746
---
 modules/system/boot/stage-1.nix | 43 +++++++++++++++++++++++++++++++++
 system/options.nix              | 37 ----------------------------
 2 files changed, 43 insertions(+), 37 deletions(-)

diff --git a/modules/system/boot/stage-1.nix b/modules/system/boot/stage-1.nix
index f4dfdb931ec..ff8a37662f9 100644
--- a/modules/system/boot/stage-1.nix
+++ b/modules/system/boot/stage-1.nix
@@ -6,6 +6,47 @@
 {pkgs, config, ...}:
 
 let
+
+  inherit (pkgs.lib) mkOption;
+
+  options = {
+
+    boot.resumeDevice = mkOption {
+      default = "";
+      example = "0:0";
+      description = "
+        Device for manual resume attempt during boot. Looks like 
+        major:minor. ls -l /dev/SWAP_PARTION shows them.
+      ";
+    };
+
+    boot.initrd.allowMissing = mkOption {
+      default = false;
+      description = ''
+        Allow some initrd components to be missing. Useful for
+        custom kernel that are changed too often to track needed
+        kernelModules.
+      '';
+    };
+
+    boot.initrd.lvm = mkOption {
+      default = true;
+      description = "
+        Whether to include lvm in the initial ramdisk. You should use this option
+        if your ROOT device is on lvm volume.
+      ";
+    };
+
+    boot.initrd.enableSplashScreen = mkOption {
+      default = true;
+      description = "
+        Whether to show a nice splash screen while booting.
+      ";
+    };
+  
+  };
+
+
   kernelPackages = config.boot.kernelPackages;
   modulesTree = config.system.modulesTree;
 
@@ -199,6 +240,8 @@ let
   
 in {
 
+  require = [options];
+
   system.build.bootStage1 = bootStage1;
   system.build.initialRamdisk = initialRamdisk;
 
diff --git a/system/options.nix b/system/options.nix
index b5120f651d7..8a686cd9ee1 100644
--- a/system/options.nix
+++ b/system/options.nix
@@ -29,15 +29,6 @@ in
       ";
     };
 
-    resumeDevice = mkOption {
-      default = "";
-      example = "0:0";
-      description = "
-        Device for manual resume attempt during boot. Looks like 
-        major:minor. ls -l /dev/SWAP_PARTION shows them.
-      ";
-    };
-
     hardwareScan = mkOption {
       default = true;
       description = "
@@ -50,34 +41,6 @@ in
       ";
     };
 
-    initrd = {
-
-      allowMissing = mkOption {
-        default = false;
-        description = ''
-          Allow some initrd components to be missing. Useful for
-          custom kernel that are changed too often to track needed
-          kernelModules.
-        '';
-      };
-
-      lvm = mkOption {
-        default = true;
-        description = "
-          Whether to include lvm in the initial ramdisk. You should use this option
-          if your ROOT device is on lvm volume.
-        ";
-      };
-
-      enableSplashScreen = mkOption {
-        default = true;
-        description = "
-          Whether to show a nice splash screen while booting.
-        ";
-      };
-
-    };
-    
     copyKernels = mkOption {
       default = false;
       description = "
-- 
GitLab


From 700a1f8f21dc23a6f15abf01ddb332f73bd8189b Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 27 May 2009 09:57:30 +0000
Subject: [PATCH 1507/5331] * Move the modulesTree and modprobe options to the
 kernel.nix module.

svn path=/nixos/branches/modular-nixos/; revision=15747
---
 modules/system/boot/kernel.nix | 35 ++++++++++++++++++++++++++++++++++
 system/modprobe                |  3 ---
 system/options.nix             | 30 -----------------------------
 3 files changed, 35 insertions(+), 33 deletions(-)
 delete mode 100644 system/modprobe

diff --git a/modules/system/boot/kernel.nix b/modules/system/boot/kernel.nix
index 3b0e84a730f..6320526a31c 100644
--- a/modules/system/boot/kernel.nix
+++ b/modules/system/boot/kernel.nix
@@ -134,7 +134,42 @@ let
 
       };
     };
+
+    system.modulesTree = mkOption {
+      internal = true;
+      default = [];
+      description = "
+        Tree of kernel modules.  This includes the kernel, plus modules
+        built outside of the kernel.  Combine these into a single tree of
+        symlinks because modprobe only supports one directory.
+      ";
+      merge = pkgs.lib.mergeListOption;
+
+      # Convert the list of path to only one path.
+      apply = pkgs.aggregateModules;
+    };
+
+    system.sbin.modprobe = mkOption {
+      # should be moved in module-init-tools
+      internal = true;
+      default = pkgs.writeTextFile {
+        name = "modprobe";
+        destination = "/sbin/modprobe";
+        executable = true;
+        text =
+          ''
+            #! ${pkgs.stdenv.shell}
+            export MODULE_DIR=${config.system.modulesTree}/lib/modules
+            exec ${pkgs.module_init_tools}/sbin/modprobe "$@"
+          '';
+      };
+      description = ''
+        Wrapper around modprobe that sets the path to the modules
+        tree.
+      '';
+    };
   };
+  
 in
 
 ###### implementation
diff --git a/system/modprobe b/system/modprobe
deleted file mode 100644
index 293d9bbfd5f..00000000000
--- a/system/modprobe
+++ /dev/null
@@ -1,3 +0,0 @@
-#! @shell@
-export MODULE_DIR=@modulesTree@/lib/modules
-exec @module_init_tools@/sbin/modprobe "$@"
diff --git a/system/options.nix b/system/options.nix
index 8a686cd9ee1..63ef9bc94a3 100644
--- a/system/options.nix
+++ b/system/options.nix
@@ -95,37 +95,7 @@ in
         };
     };
 
-    modulesTree = mkOption {
-      internal = true;
-      default = [];
-      description = "
-        Tree of kernel modules.  This includes the kernel, plus modules
-        built outside of the kernel.  Combine these into a single tree of
-        symlinks because modprobe only supports one directory.
-      ";
-      merge = pkgs.lib.mergeListOption;
-
-      # Convert the list of path to only one path.
-      apply = pkgs.aggregateModules;
-    };
-
     sbin = {
-      modprobe = mkOption {
-        # should be moved in module-init-tools
-        internal = true;
-        default = pkgs.substituteAll {
-          dir = "sbin";
-          src = ./modprobe;
-          isExecutable = true;
-          inherit (pkgs) module_init_tools;
-          inherit (config.system) modulesTree;
-        };
-        description = ''
-          Wrapper around modprobe that sets the path to the modules
-          tree.
-        '';
-      };
-
       # !!! The mount option should not stay in /system/option.nix
       mount = mkOption {
         internal = true;
-- 
GitLab


From c3fb0387b4348af07900349c737bd82e4b708085 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 27 May 2009 10:32:30 +0000
Subject: [PATCH 1508/5331] * Moved the expressions for generating Upstart
 jobs.

svn path=/nixos/branches/modular-nixos/; revision=15748
---
 modules/module-list.nix                       | 32 +++++++++----------
 .../system/upstart}/make-job.nix              |  0
 .../system/upstart/tools.nix                  |  0
 .../system/upstart/upstart.nix                | 25 +++++++++++----
 upstart-jobs/gather.nix                       | 17 ----------
 5 files changed, 34 insertions(+), 40 deletions(-)
 rename {upstart-jobs => modules/system/upstart}/make-job.nix (100%)
 rename upstart-jobs/lib/default.nix => modules/system/upstart/tools.nix (100%)
 rename upstart-jobs/default.nix => modules/system/upstart/upstart.nix (83%)
 delete mode 100644 upstart-jobs/gather.nix

diff --git a/modules/module-list.nix b/modules/module-list.nix
index 57f8a014a2a..4bee3419266 100644
--- a/modules/module-list.nix
+++ b/modules/module-list.nix
@@ -1,5 +1,20 @@
 [ #./hardware/network/intel-3945abg.nix
   ../etc/default.nix
+  ../system/assertion.nix
+  ../system/nixos-environment.nix
+  ../system/nixos-installer.nix
+  ../system/system-options.nix
+  ../upstart-jobs/cron/locate.nix
+  ../upstart-jobs/filesystems.nix
+  ../upstart-jobs/guest-users.nix
+  ../upstart-jobs/kbd.nix
+  ../upstart-jobs/ldap
+  ../upstart-jobs/lvm.nix
+  ../upstart-jobs/network-interfaces.nix
+  ../upstart-jobs/pcmcia.nix
+  ../upstart-jobs/swap.nix
+  ../upstart-jobs/swraid.nix
+  ../upstart-jobs/tty-backgrounds.nix
   ./config/fonts.nix
   ./config/i18n.nix
   ./config/system-path.nix
@@ -69,20 +84,5 @@
   ./system/upstart-events/ctrl-alt-delete.nix
   ./system/upstart-events/halt.nix
   ./system/upstart-events/maintenance-shell.nix
-  ../system/assertion.nix
-  ../system/nixos-environment.nix
-  ../system/nixos-installer.nix
-  ../system/system-options.nix
-  ../upstart-jobs/cron/locate.nix
-  ../upstart-jobs/default.nix
-  ../upstart-jobs/filesystems.nix
-  ../upstart-jobs/guest-users.nix
-  ../upstart-jobs/kbd.nix
-  ../upstart-jobs/ldap
-  ../upstart-jobs/lvm.nix
-  ../upstart-jobs/network-interfaces.nix
-  ../upstart-jobs/pcmcia.nix
-  ../upstart-jobs/swap.nix
-  ../upstart-jobs/swraid.nix
-  ../upstart-jobs/tty-backgrounds.nix
+  ./system/upstart/upstart.nix
 ]
diff --git a/upstart-jobs/make-job.nix b/modules/system/upstart/make-job.nix
similarity index 100%
rename from upstart-jobs/make-job.nix
rename to modules/system/upstart/make-job.nix
diff --git a/upstart-jobs/lib/default.nix b/modules/system/upstart/tools.nix
similarity index 100%
rename from upstart-jobs/lib/default.nix
rename to modules/system/upstart/tools.nix
diff --git a/upstart-jobs/default.nix b/modules/system/upstart/upstart.nix
similarity index 83%
rename from upstart-jobs/default.nix
rename to modules/system/upstart/upstart.nix
index 006f9e06276..459b8a76e98 100644
--- a/upstart-jobs/default.nix
+++ b/modules/system/upstart/upstart.nix
@@ -60,7 +60,7 @@ let
   modprobe = config.system.sbin.modprobe;
   mount = config.system.sbin.mount;
 
-  makeJob = import ../upstart-jobs/make-job.nix {
+  makeJob = import ./make-job.nix {
     inherit (pkgs) runCommand;
   };
 
@@ -73,18 +73,29 @@ let
   # User-defined events.
   ++ (map makeJob (config.services.extraJobs));
 
-
-  command = import ../upstart-jobs/gather.nix {
-    inherit (pkgs) runCommand;
-    inherit jobs;
-  };
+  
+  # Create an etc/event.d directory containing symlinks to the
+  # specified list of Upstart job files.
+  command = pkgs.runCommand "upstart-jobs" {inherit jobs;}
+    ''
+      ensureDir $out/etc/event.d
+      for i in $jobs; do
+        if ln -s $i . ; then
+          if test -d $i; then
+            ln -s $i/etc/event.d/* $out/etc/event.d/
+          fi
+        else
+          echo Duplicate entry: $i;
+        fi;
+      done
+    '';
 
 in 
 
 {
   require = [
     options
-    ./lib/default.nix
+    ./tools.nix # !!! doesn't seem to be used anywhere
   ];
 
   environment = {
diff --git a/upstart-jobs/gather.nix b/upstart-jobs/gather.nix
deleted file mode 100644
index 726503f1917..00000000000
--- a/upstart-jobs/gather.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-# Create an etc/event.d directory containing symlinks to the
-# specified list of Upstart job files.
-{runCommand, jobs}:
-
-runCommand "upstart-jobs" {inherit jobs;}
-  "
-    ensureDir $out/etc/event.d
-    for i in $jobs; do
-      if ln -s $i . ; then
-        if test -d $i; then
-          ln -s $i/etc/event.d/* $out/etc/event.d/ 
-        fi
-      else
-        echo Duplicate entry: $i;
-      fi;
-    done
-  "
-- 
GitLab


From 054528b28dcae6632c45dd781b332bd9a60e4295 Mon Sep 17 00:00:00 2001
From: Nicolas Pierron <nicolas.b.pierron@gmail.com>
Date: Wed, 27 May 2009 20:27:46 +0000
Subject: [PATCH 1509/5331] Move hardware modules outside of the module
 directory because these are modules which should be imported only when you
 need to support some of them.

svn path=/nixos/branches/modular-nixos/; revision=15750
---
 {modules/hardware => hardware}/network/intel-2200bg.nix           | 0
 {modules/hardware => hardware}/network/intel-3945abg.nix          | 0
 {modules/hardware => hardware}/network/intel-4965agn.nix          | 0
 {modules/hardware => hardware}/network/smc-2632w/default.nix      | 0
 .../network/smc-2632w/firmware/cis/SMC2632W-v1.02.cis             | 0
 {modules/hardware => hardware}/network/zydas-zd1211.nix           | 0
 {modules/hardware => hardware}/video/encoder/wis-go7007.nix       | 0
 7 files changed, 0 insertions(+), 0 deletions(-)
 rename {modules/hardware => hardware}/network/intel-2200bg.nix (100%)
 rename {modules/hardware => hardware}/network/intel-3945abg.nix (100%)
 rename {modules/hardware => hardware}/network/intel-4965agn.nix (100%)
 rename {modules/hardware => hardware}/network/smc-2632w/default.nix (100%)
 rename {modules/hardware => hardware}/network/smc-2632w/firmware/cis/SMC2632W-v1.02.cis (100%)
 rename {modules/hardware => hardware}/network/zydas-zd1211.nix (100%)
 rename {modules/hardware => hardware}/video/encoder/wis-go7007.nix (100%)

diff --git a/modules/hardware/network/intel-2200bg.nix b/hardware/network/intel-2200bg.nix
similarity index 100%
rename from modules/hardware/network/intel-2200bg.nix
rename to hardware/network/intel-2200bg.nix
diff --git a/modules/hardware/network/intel-3945abg.nix b/hardware/network/intel-3945abg.nix
similarity index 100%
rename from modules/hardware/network/intel-3945abg.nix
rename to hardware/network/intel-3945abg.nix
diff --git a/modules/hardware/network/intel-4965agn.nix b/hardware/network/intel-4965agn.nix
similarity index 100%
rename from modules/hardware/network/intel-4965agn.nix
rename to hardware/network/intel-4965agn.nix
diff --git a/modules/hardware/network/smc-2632w/default.nix b/hardware/network/smc-2632w/default.nix
similarity index 100%
rename from modules/hardware/network/smc-2632w/default.nix
rename to hardware/network/smc-2632w/default.nix
diff --git a/modules/hardware/network/smc-2632w/firmware/cis/SMC2632W-v1.02.cis b/hardware/network/smc-2632w/firmware/cis/SMC2632W-v1.02.cis
similarity index 100%
rename from modules/hardware/network/smc-2632w/firmware/cis/SMC2632W-v1.02.cis
rename to hardware/network/smc-2632w/firmware/cis/SMC2632W-v1.02.cis
diff --git a/modules/hardware/network/zydas-zd1211.nix b/hardware/network/zydas-zd1211.nix
similarity index 100%
rename from modules/hardware/network/zydas-zd1211.nix
rename to hardware/network/zydas-zd1211.nix
diff --git a/modules/hardware/video/encoder/wis-go7007.nix b/hardware/video/encoder/wis-go7007.nix
similarity index 100%
rename from modules/hardware/video/encoder/wis-go7007.nix
rename to hardware/video/encoder/wis-go7007.nix
-- 
GitLab


From b022f2e95a0651424828f9d20aa68c1e9b1bf176 Mon Sep 17 00:00:00 2001
From: Nicolas Pierron <nicolas.b.pierron@gmail.com>
Date: Wed, 27 May 2009 20:27:54 +0000
Subject: [PATCH 1510/5331] Generate the module-list.nix which index all valid
 modules. Non-valid modules are commented inside the generated list.

Move module paths which are not the module directory into the legacy.nix file.

svn path=/nixos/branches/modular-nixos/; revision=15751
---
 maintainers/scripts/gen-module-list.sh | 55 +++++++++++++++++
 modules/legacy.nix                     | 20 +++++++
 modules/module-list.nix                | 82 ++++++++++++++++++--------
 3 files changed, 133 insertions(+), 24 deletions(-)
 create mode 100755 maintainers/scripts/gen-module-list.sh
 create mode 100644 modules/legacy.nix

diff --git a/maintainers/scripts/gen-module-list.sh b/maintainers/scripts/gen-module-list.sh
new file mode 100755
index 00000000000..8a1d298480f
--- /dev/null
+++ b/maintainers/scripts/gen-module-list.sh
@@ -0,0 +1,55 @@
+#!/bin/sh
+
+prog=$0
+
+usage(){
+  echo 1>&2 "
+$prog module-dir
+
+This script generate the index file inside the module directory.
+"
+  exit 1
+}
+
+: ${NIXPKGS=/etc/nixos/nixpkgs}
+
+is_module(){
+  local file=$1
+  echo "
+    let
+      appIfFun = f: x: if builtins.isFunction f then f x else f;
+    in
+      builtins.isAttrs (
+        appIfFun (import $file) {
+          pkgs = (import $NIXPKGS) {};
+          config = {};
+          dummy = 42;
+        }
+      )
+  " | nix-instantiate - --eval-only
+}
+
+generate_index(){
+  local path="$1"
+  cd "$path"
+  echo -n "$path: " 1>&2
+  { echo "[ # This file have been generated by $(basename $prog)";
+    for file in : $(find ./ -wholename '*.impl[./]*' -or -wholename './module-list.nix' -or -type f -name '*.nix' -print); do
+       [ "$file" = ':' ] && continue;
+       echo -n . 1>&2
+       if test "$(is_module "$file" 2> /dev/null)" = "Bool(True)"; then
+         echo "  $file"
+       else
+         echo "##### $file"
+         is_module "$file" 2>&1 | sed 's/^/# /'
+       fi
+    done
+    echo ']';
+  } > ./module-list.nix
+  echo 1>&2
+  cd - > /dev/null
+}
+
+[ $# -eq 1 ] || usage;
+
+generate_index "$1"
diff --git a/modules/legacy.nix b/modules/legacy.nix
new file mode 100644
index 00000000000..67a99ea900c
--- /dev/null
+++ b/modules/legacy.nix
@@ -0,0 +1,20 @@
+{
+  require = [
+    ../etc/default.nix
+    ../system/assertion.nix
+    ../system/nixos-environment.nix
+    ../system/nixos-installer.nix
+    ../system/system-options.nix
+    ../upstart-jobs/cron/locate.nix
+    ../upstart-jobs/filesystems.nix
+    ../upstart-jobs/guest-users.nix
+    ../upstart-jobs/kbd.nix
+    ../upstart-jobs/ldap
+    ../upstart-jobs/lvm.nix
+    ../upstart-jobs/network-interfaces.nix
+    ../upstart-jobs/pcmcia.nix
+    ../upstart-jobs/swap.nix
+    ../upstart-jobs/swraid.nix
+    ../upstart-jobs/tty-backgrounds.nix
+  ];
+}
diff --git a/modules/module-list.nix b/modules/module-list.nix
index 4bee3419266..8d41318bf23 100644
--- a/modules/module-list.nix
+++ b/modules/module-list.nix
@@ -1,25 +1,9 @@
-[ #./hardware/network/intel-3945abg.nix
-  ../etc/default.nix
-  ../system/assertion.nix
-  ../system/nixos-environment.nix
-  ../system/nixos-installer.nix
-  ../system/system-options.nix
-  ../upstart-jobs/cron/locate.nix
-  ../upstart-jobs/filesystems.nix
-  ../upstart-jobs/guest-users.nix
-  ../upstart-jobs/kbd.nix
-  ../upstart-jobs/ldap
-  ../upstart-jobs/lvm.nix
-  ../upstart-jobs/network-interfaces.nix
-  ../upstart-jobs/pcmcia.nix
-  ../upstart-jobs/swap.nix
-  ../upstart-jobs/swraid.nix
-  ../upstart-jobs/tty-backgrounds.nix
+[ # This file have been generated by gen-module-list.sh
   ./config/fonts.nix
   ./config/i18n.nix
-  ./config/system-path.nix
   ./config/unix-odbc-drivers.nix
   ./config/users-groups.nix
+  ./config/system-path.nix
   ./installer/grub/grub.nix
   ./security/setuid-wrappers.nix
   ./security/sudo.nix
@@ -44,22 +28,22 @@
   ./services/monitoring/zabbix-agent.nix
   ./services/monitoring/zabbix-server.nix
   ./services/network-filesystems/nfs-kernel.nix
-  ./services/network-filesystems/samba.nix # TODO: doesn't start here (?)
+  ./services/network-filesystems/samba.nix
   ./services/networking/avahi-daemon.nix
   ./services/networking/bind.nix
   ./services/networking/bitlbee.nix
   ./services/networking/dhclient.nix
   ./services/networking/dhcpd.nix
-  ./services/networking/ejabberd.nix # untested, dosen't compile on x86_64-linux
+  ./services/networking/ejabberd.nix
   ./services/networking/gnunet.nix
   ./services/networking/gw6c.nix
   ./services/networking/ifplugd.nix
-  ./services/networking/ircd-hybrid.nix # TODO: doesn't compile on x86_64-linux, can't test
+  ./services/networking/ircd-hybrid.nix
   ./services/networking/ntpd.nix
   ./services/networking/openfire.nix
   ./services/networking/openvpn.nix
   ./services/networking/portmap.nix
-  ./services/networking/ssh/lshd.nix # GNU lshd SSH2 deamon (TODO: does neither start nor generate seed file ?)
+  ./services/networking/ssh/lshd.nix
   ./services/networking/ssh/sshd.nix
   ./services/networking/vsftpd.nix
   ./services/printing/cupsd.nix
@@ -71,11 +55,54 @@
   ./services/system/nscd.nix
   ./services/ttys/gpm.nix
   ./services/ttys/mingetty.nix
-  ./services/web-servers/apache-httpd
+  ./services/web-servers/apache-httpd/default.nix
+##### ./services/web-servers/apache-httpd/per-server-options.nix
+# error: while evaluating the attribute `<let-body>' at `(string):2:8':
+# while evaluating the function at `(string):3:22':
+# while evaluating the function at `/trace/nixos/modules/services/web-servers/apache-httpd/per-server-options.nix:6:2':
+# the argument named `forMainServer' required by the function is missing
+##### ./services/web-servers/apache-httpd/subversion.nix
+# error: while evaluating the attribute `<let-body>' at `(string):2:8':
+# while evaluating the function at `(string):3:22':
+# while evaluating the function at `/trace/nixos/modules/services/web-servers/apache-httpd/subversion.nix:1:2':
+# the argument named `serverInfo' required by the function is missing
+##### ./services/web-servers/apache-httpd/tomcat-connector.nix
+# error: while evaluating the attribute `<let-body>' at `(string):2:8':
+# while evaluating the function at `(string):3:22':
+# while evaluating the function at `/trace/nixos/modules/services/web-servers/apache-httpd/tomcat-connector.nix:1:2':
+# the argument named `serverInfo' required by the function is missing
+##### ./services/web-servers/apache-httpd/twiki.nix
+# error: while evaluating the attribute `<let-body>' at `(string):2:8':
+# while evaluating the function at `(string):3:22':
+# while evaluating the function at `/trace/nixos/modules/services/web-servers/apache-httpd/twiki.nix:1:2':
+# the argument named `serverInfo' required by the function is missing
+##### ./services/web-servers/apache-httpd/zabbix.nix
+# error: while evaluating the attribute `<let-body>' at `(string):2:8':
+# while evaluating the function at `(string):3:22':
+# while evaluating the function at `/trace/nixos/modules/services/web-servers/apache-httpd/zabbix.nix:1:2':
+# the argument named `serverInfo' required by the function is missing
   ./services/web-servers/jboss.nix
-  ./services/web-servers/tomcat.nix # untested, too lazy to get that jdk
+  ./services/web-servers/tomcat.nix
   ./services/x11/xfs.nix
   ./services/x11/xserver/default.nix
+  ./services/x11/xserver/desktop-managers/default.nix
+  ./services/x11/xserver/desktop-managers/gnome.nix
+  ./services/x11/xserver/desktop-managers/kde-environment.nix
+  ./services/x11/xserver/desktop-managers/kde.nix
+  ./services/x11/xserver/desktop-managers/kde4.nix
+  ./services/x11/xserver/desktop-managers/none.nix
+  ./services/x11/xserver/desktop-managers/xterm.nix
+  ./services/x11/xserver/display-managers/default.nix
+  ./services/x11/xserver/display-managers/kdm.nix
+  ./services/x11/xserver/display-managers/slim.nix
+  ./services/x11/xserver/window-managers/compiz.nix
+  ./services/x11/xserver/window-managers/default.nix
+  ./services/x11/xserver/window-managers/kwm.nix
+  ./services/x11/xserver/window-managers/metacity.nix
+  ./services/x11/xserver/window-managers/none.nix
+  ./services/x11/xserver/window-managers/twm.nix
+  ./services/x11/xserver/window-managers/wmii.nix
+  ./services/x11/xserver/window-managers/xmonad.nix
   ./system/activation/activation-script.nix
   ./system/activation/top-level.nix
   ./system/boot/kernel.nix
@@ -84,5 +111,12 @@
   ./system/upstart-events/ctrl-alt-delete.nix
   ./system/upstart-events/halt.nix
   ./system/upstart-events/maintenance-shell.nix
+##### ./system/upstart/make-job.nix
+# error: while evaluating the attribute `<let-body>' at `(string):2:8':
+# while evaluating the function at `(string):3:22':
+# while evaluating the function at `/trace/nixos/modules/system/upstart/make-job.nix:1:2':
+# the argument named `runCommand' required by the function is missing
+  ./system/upstart/tools.nix
   ./system/upstart/upstart.nix
+  ./legacy.nix
 ]
-- 
GitLab


From e6ae383b9b6608e2af216d92972ca02434791a61 Mon Sep 17 00:00:00 2001
From: Nicolas Pierron <nicolas.b.pierron@gmail.com>
Date: Wed, 27 May 2009 20:27:59 +0000
Subject: [PATCH 1511/5331] Add a temporary work-around to be able to use
 non-us keyboard layout. xkbcomp does not look inside the directory specified
 with the option -xkbdir.

svn path=/nixos/branches/modular-nixos/; revision=15752
---
 modules/services/x11/xserver/default.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/modules/services/x11/xserver/default.nix b/modules/services/x11/xserver/default.nix
index 3904566d2f3..954c267b83f 100644
--- a/modules/services/x11/xserver/default.nix
+++ b/modules/services/x11/xserver/default.nix
@@ -499,6 +499,10 @@ mkIf cfg.enable {
       { source = "${configFile}";
         target = "X11/xorg.conf";
       }
+      # -xkbdir command line option does not seems to be passed to xkbcomp.
+      { source = "${pkgs.xkeyboard_config}/etc/X11/xkb";
+        target = "X11/xkb";
+      }
     ];
 
     extraPackages = [
-- 
GitLab


From 0109b7e44fa8fa949b6a33b2a30c3c8dbc8f6616 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 27 May 2009 23:12:54 +0000
Subject: [PATCH 1512/5331] * Sort the module list; otherwise the output will
 be sensitive to the   order in which files are stored in the file system of
 whoever runs the   script (and will therefore fluctuate a lot).

svn path=/nixos/branches/modular-nixos/; revision=15753
---
 maintainers/scripts/gen-module-list.sh | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/maintainers/scripts/gen-module-list.sh b/maintainers/scripts/gen-module-list.sh
index 8a1d298480f..5f40ee66bcf 100755
--- a/maintainers/scripts/gen-module-list.sh
+++ b/maintainers/scripts/gen-module-list.sh
@@ -6,7 +6,8 @@ usage(){
   echo 1>&2 "
 $prog module-dir
 
-This script generate the index file inside the module directory.
+This script generates the `module-list.nix' index file inside the
+module directory.
 "
   exit 1
 }
@@ -34,7 +35,7 @@ generate_index(){
   cd "$path"
   echo -n "$path: " 1>&2
   { echo "[ # This file have been generated by $(basename $prog)";
-    for file in : $(find ./ -wholename '*.impl[./]*' -or -wholename './module-list.nix' -or -type f -name '*.nix' -print); do
+    for file in : $(find ./ -wholename '*.impl[./]*' -or -wholename './module-list.nix' -or -type f -name '*.nix' -print | sort); do
        [ "$file" = ':' ] && continue;
        echo -n . 1>&2
        if test "$(is_module "$file" 2> /dev/null)" = "Bool(True)"; then
-- 
GitLab


From 3c6ae39a0d810c098f503710278c46c8cd015003 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 27 May 2009 23:14:38 +0000
Subject: [PATCH 1513/5331] * Refactoring: moved some options out of
 system/options.nix (almost   empty now), do more of bashrc.sh declaratively,
 and moved nsswitch   generation to modules/config/nsswitch.nix.

svn path=/nixos/branches/modular-nixos/; revision=15754
---
 default.nix                                  |   6 +-
 etc/bashrc.sh                                |   6 +-
 etc/default.nix                              |   5 +-
 maintainers/scripts/gen-module-list.sh       |   2 +-
 {etc => modules/config}/nsswitch-mdns.conf   |   0
 {etc => modules/config}/nsswitch.conf        |   0
 modules/config/nsswitch.nix                  |  56 ++++
 modules/config/timezone.nix                  |  25 ++
 modules/installer/grub/grub.nix              |   9 +
 modules/module-list.nix                      |  20 +-
 modules/services/hardware/udev.nix           |  13 +
 modules/services/networking/avahi-daemon.nix |  16 --
 modules/system/boot/stage-1.nix              |  10 +
 modules/system/boot/stage-2.nix              |  27 +-
 modules/system/upstart/upstart.nix           |   8 -
 system/options.nix                           | 161 ------------
 upstart-jobs/filesystems.nix                 | 253 ++++++++++++-------
 upstart-jobs/swap.nix                        |  95 ++++---
 18 files changed, 363 insertions(+), 349 deletions(-)
 rename {etc => modules/config}/nsswitch-mdns.conf (100%)
 rename {etc => modules/config}/nsswitch.conf (100%)
 create mode 100644 modules/config/nsswitch.nix
 create mode 100644 modules/config/timezone.nix

diff --git a/default.nix b/default.nix
index df69ee4c3e2..17a417306b2 100644
--- a/default.nix
+++ b/default.nix
@@ -23,11 +23,9 @@ in
     config.environment.checkConfigurationOptions
     optionDeclarations config;
 
-  nix = config.environment.nix;
-  
+  # The following are used by nixos-rebuild.
   nixFallback = pkgs.nixUnstable;
-
-  manifests = config.installer.manifests; # exported here because nixos-rebuild uses it
+  manifests = config.installer.manifests;
 
   tests = config.tests;
 }
diff --git a/etc/bashrc.sh b/etc/bashrc.sh
index 55820a31a63..ea3f398c8f2 100644
--- a/etc/bashrc.sh
+++ b/etc/bashrc.sh
@@ -1,15 +1,10 @@
 # Initialise a bunch of environment variables.
 export PATH=/var/run/current-system/sw/bin:/var/run/current-system/sw/sbin
 export LD_LIBRARY_PATH=/var/run/opengl-driver/lib
-if test -n "@nssModulesPath@"; then
-    LD_LIBRARY_PATH=@nssModulesPath@:$LD_LIBRARY_PATH
-fi
 export MODULE_DIR=@modulesTree@/lib/modules
 export NIXPKGS_CONFIG=/nix/etc/config.nix
 export NIXPKGS_ALL=/etc/nixos/nixpkgs
 export PAGER="less -R"
-export TZ=@timeZone@
-export TZDIR=@glibc@/share/zoneinfo
 export FONTCONFIG_FILE=/etc/fonts/fonts.conf
 export LANG=@defaultLocale@
 export EDITOR=nano
@@ -18,6 +13,7 @@ export LOCATE_PATH=/var/cache/locatedb
 @shellInit@
 export LOCALE_ARCHIVE=/var/run/current-system/sw/lib/locale/locale-archive
 
+
 # Set up secure multi-user builds: non-root users build through the
 # Nix daemon.
 if test "$USER" != root; then
diff --git a/etc/default.nix b/etc/default.nix
index 6306dd4edaf..9326160955d 100644
--- a/etc/default.nix
+++ b/etc/default.nix
@@ -38,7 +38,6 @@ let
   shellInit = config.environment.shellInit;
   nixEnvVars = config.nix.envVars;
   modulesTree = config.system.modulesTree;
-  nssModulesPath = config.system.nssModules.path;
   wrapperDir = config.security.wrapperDir;
   systemPath = config.system.path;
   binsh = config.system.build.binsh;
@@ -121,9 +120,7 @@ let
     { # Script executed when the shell starts as a non-login shell (system-wide version).
       source = pkgs.substituteAll {
         src = ./bashrc.sh;
-        inherit systemPath wrapperDir modulesTree nssModulesPath;
-        inherit (pkgs) glibc;
-        timeZone = config.time.timeZone;
+        inherit systemPath wrapperDir modulesTree;
         defaultLocale = config.i18n.defaultLocale;
         inherit nixEnvVars shellInit;
       };
diff --git a/maintainers/scripts/gen-module-list.sh b/maintainers/scripts/gen-module-list.sh
index 5f40ee66bcf..b885fe58f32 100755
--- a/maintainers/scripts/gen-module-list.sh
+++ b/maintainers/scripts/gen-module-list.sh
@@ -34,7 +34,7 @@ generate_index(){
   local path="$1"
   cd "$path"
   echo -n "$path: " 1>&2
-  { echo "[ # This file have been generated by $(basename $prog)";
+  { echo "[ # This file has been generated by $(basename $prog)";
     for file in : $(find ./ -wholename '*.impl[./]*' -or -wholename './module-list.nix' -or -type f -name '*.nix' -print | sort); do
        [ "$file" = ':' ] && continue;
        echo -n . 1>&2
diff --git a/etc/nsswitch-mdns.conf b/modules/config/nsswitch-mdns.conf
similarity index 100%
rename from etc/nsswitch-mdns.conf
rename to modules/config/nsswitch-mdns.conf
diff --git a/etc/nsswitch.conf b/modules/config/nsswitch.conf
similarity index 100%
rename from etc/nsswitch.conf
rename to modules/config/nsswitch.conf
diff --git a/modules/config/nsswitch.nix b/modules/config/nsswitch.nix
new file mode 100644
index 00000000000..2a37903f7f3
--- /dev/null
+++ b/modules/config/nsswitch.nix
@@ -0,0 +1,56 @@
+# Configuration for the Name Service Switch (/etc/nsswitch.conf).
+
+{config, pkgs, ...}:
+
+let
+
+  options = {
+
+    # NSS modules.  Hacky!
+    system.nssModules = pkgs.lib.mkOption {
+      internal = true;
+      default = [];
+      description = "
+        Search path for NSS (Name Service Switch) modules.  This allows
+        several DNS resolution methods to be specified via
+        <filename>/etc/nsswitch.conf</filename>.
+      ";
+      merge = pkgs.lib.mergeListOption;
+      apply = list:
+        let
+          list2 =
+            list
+            # !!! this should be in the LDAP module
+            ++ pkgs.lib.optional config.users.ldap.enable pkgs.nss_ldap;
+        in {
+          list = list2;
+          path = pkgs.lib.makeLibraryPath list2;
+        };
+    };
+
+  };
+
+in
+
+{
+  require = [options];
+
+  environment.etc =
+    [ # Name Service Switch configuration file.  Required by the C library.
+      # !!! Factor out the mdns stuff.  The avahi module should define
+      # an option used by this module.
+      { source =
+          if config.services.avahi.nssmdns
+          then ./nsswitch-mdns.conf
+          else ./nsswitch.conf;
+        target = "nsswitch.conf";
+      }
+    ];
+
+  environment.shellInit =
+    if config.system.nssModules.path != "" then
+      ''
+        LD_LIBRARY_PATH=${config.system.nssModules.path}:$LD_LIBRARY_PATH
+      ''
+    else "";
+}
diff --git a/modules/config/timezone.nix b/modules/config/timezone.nix
new file mode 100644
index 00000000000..b08712464a1
--- /dev/null
+++ b/modules/config/timezone.nix
@@ -0,0 +1,25 @@
+{pkgs, config, ...}:
+
+let
+
+  options = {
+
+    time.timeZone = pkgs.lib.mkOption {
+      default = "CET";
+      example = "America/New_York";
+      description = "The time zone used when displaying times and dates.";
+    };
+
+  };
+
+in
+
+{
+  require = [options];
+
+  environment.shellInit =
+    ''
+      export TZ=${config.time.timeZone}
+      export TZDIR=${pkgs.glibc}/share/zoneinfo
+    '';
+}
diff --git a/modules/installer/grub/grub.nix b/modules/installer/grub/grub.nix
index 45c8a1fb29b..eaef9521f33 100644
--- a/modules/installer/grub/grub.nix
+++ b/modules/installer/grub/grub.nix
@@ -77,6 +77,15 @@ let
         ";
       };
 
+      copyKernels = mkOption {
+        default = false;
+        description = "
+          Whether the Grub menu builder should copy kernels and initial
+          ramdisks to /boot.  This is necessary when /nix is on a
+          different file system than /boot.
+        ";
+      };
+
     };
   };
 in
diff --git a/modules/module-list.nix b/modules/module-list.nix
index 8d41318bf23..19fc5d10fbf 100644
--- a/modules/module-list.nix
+++ b/modules/module-list.nix
@@ -1,10 +1,13 @@
 [ # This file have been generated by gen-module-list.sh
   ./config/fonts.nix
   ./config/i18n.nix
+  ./config/nsswitch.nix
+  ./config/system-path.nix
+  ./config/timezone.nix
   ./config/unix-odbc-drivers.nix
   ./config/users-groups.nix
-  ./config/system-path.nix
   ./installer/grub/grub.nix
+  ./legacy.nix
   ./security/setuid-wrappers.nix
   ./security/sudo.nix
   ./services/audio/alsa.nix
@@ -59,27 +62,27 @@
 ##### ./services/web-servers/apache-httpd/per-server-options.nix
 # error: while evaluating the attribute `<let-body>' at `(string):2:8':
 # while evaluating the function at `(string):3:22':
-# while evaluating the function at `/trace/nixos/modules/services/web-servers/apache-httpd/per-server-options.nix:6:2':
+# while evaluating the function at `/home/eelco/Dev/modular-nixos/modules/services/web-servers/apache-httpd/per-server-options.nix:6:2':
 # the argument named `forMainServer' required by the function is missing
 ##### ./services/web-servers/apache-httpd/subversion.nix
 # error: while evaluating the attribute `<let-body>' at `(string):2:8':
 # while evaluating the function at `(string):3:22':
-# while evaluating the function at `/trace/nixos/modules/services/web-servers/apache-httpd/subversion.nix:1:2':
+# while evaluating the function at `/home/eelco/Dev/modular-nixos/modules/services/web-servers/apache-httpd/subversion.nix:1:2':
 # the argument named `serverInfo' required by the function is missing
 ##### ./services/web-servers/apache-httpd/tomcat-connector.nix
 # error: while evaluating the attribute `<let-body>' at `(string):2:8':
 # while evaluating the function at `(string):3:22':
-# while evaluating the function at `/trace/nixos/modules/services/web-servers/apache-httpd/tomcat-connector.nix:1:2':
+# while evaluating the function at `/home/eelco/Dev/modular-nixos/modules/services/web-servers/apache-httpd/tomcat-connector.nix:1:2':
 # the argument named `serverInfo' required by the function is missing
 ##### ./services/web-servers/apache-httpd/twiki.nix
 # error: while evaluating the attribute `<let-body>' at `(string):2:8':
 # while evaluating the function at `(string):3:22':
-# while evaluating the function at `/trace/nixos/modules/services/web-servers/apache-httpd/twiki.nix:1:2':
+# while evaluating the function at `/home/eelco/Dev/modular-nixos/modules/services/web-servers/apache-httpd/twiki.nix:1:2':
 # the argument named `serverInfo' required by the function is missing
 ##### ./services/web-servers/apache-httpd/zabbix.nix
 # error: while evaluating the attribute `<let-body>' at `(string):2:8':
 # while evaluating the function at `(string):3:22':
-# while evaluating the function at `/trace/nixos/modules/services/web-servers/apache-httpd/zabbix.nix:1:2':
+# while evaluating the function at `/home/eelco/Dev/modular-nixos/modules/services/web-servers/apache-httpd/zabbix.nix:1:2':
 # the argument named `serverInfo' required by the function is missing
   ./services/web-servers/jboss.nix
   ./services/web-servers/tomcat.nix
@@ -87,9 +90,9 @@
   ./services/x11/xserver/default.nix
   ./services/x11/xserver/desktop-managers/default.nix
   ./services/x11/xserver/desktop-managers/gnome.nix
+  ./services/x11/xserver/desktop-managers/kde4.nix
   ./services/x11/xserver/desktop-managers/kde-environment.nix
   ./services/x11/xserver/desktop-managers/kde.nix
-  ./services/x11/xserver/desktop-managers/kde4.nix
   ./services/x11/xserver/desktop-managers/none.nix
   ./services/x11/xserver/desktop-managers/xterm.nix
   ./services/x11/xserver/display-managers/default.nix
@@ -114,9 +117,8 @@
 ##### ./system/upstart/make-job.nix
 # error: while evaluating the attribute `<let-body>' at `(string):2:8':
 # while evaluating the function at `(string):3:22':
-# while evaluating the function at `/trace/nixos/modules/system/upstart/make-job.nix:1:2':
+# while evaluating the function at `/home/eelco/Dev/modular-nixos/modules/system/upstart/make-job.nix:1:2':
 # the argument named `runCommand' required by the function is missing
   ./system/upstart/tools.nix
   ./system/upstart/upstart.nix
-  ./legacy.nix
 ]
diff --git a/modules/services/hardware/udev.nix b/modules/services/hardware/udev.nix
index 51b11099ae1..63c4c77e1b3 100644
--- a/modules/services/hardware/udev.nix
+++ b/modules/services/hardware/udev.nix
@@ -5,6 +5,19 @@ let
   inherit (pkgs.lib) mkOption mkIf;
 
   options = {
+
+    boot.hardwareScan = mkOption {
+      default = true;
+      description = "
+        Whether to try to load kernel modules for all detected hardware.
+        Usually this does a good job of providing you with the modules
+        you need, but sometimes it can crash the system or cause other
+        nasty effects.  If the hardware scan is turned on, it can be
+        disabled at boot time by adding the <literal>safemode</literal>
+        parameter to the kernel command line.
+      ";
+    };
+  
     services = {
       udev = {
 
diff --git a/modules/services/networking/avahi-daemon.nix b/modules/services/networking/avahi-daemon.nix
index a504bf9b6a0..9ba55f2076c 100644
--- a/modules/services/networking/avahi-daemon.nix
+++ b/modules/services/networking/avahi-daemon.nix
@@ -136,22 +136,6 @@ mkIf cfg.enable {
 
   environment = {
     extraPackages = [avahi];
-
-    # Name Service Switch configuration file.  Required by the C library.
-    # !!! This should be done in some other way, e.g., this module
-    # should define an option used by the hypothetical module that
-    # generates nsswitch.conf.
-    etc = mkIf cfg.nssmdns (mkThenElse {
-      thenPart = [{
-        source = ../../../etc/nsswitch-mdns.conf;
-        target = "nsswitch.conf";
-      }];
-
-      elsePart = [{
-        source = ../../../etc/nsswitch.conf;
-        target = "nsswitch.conf";
-      }];
-    });
   };
 
   users = {
diff --git a/modules/system/boot/stage-1.nix b/modules/system/boot/stage-1.nix
index ff8a37662f9..cb8bb7b3243 100644
--- a/modules/system/boot/stage-1.nix
+++ b/modules/system/boot/stage-1.nix
@@ -11,6 +11,16 @@ let
 
   options = {
 
+    boot.isLiveCD = mkOption {
+      default = false;
+      description = "
+        If set to true, the root device will be mounted read-only and
+        a ramdisk will be mounted on top of it using unionfs to
+        provide a writable root.  This is used for the NixOS
+        Live-CD/DVD.
+      ";
+    };
+
     boot.resumeDevice = mkOption {
       default = "";
       example = "0:0";
diff --git a/modules/system/boot/stage-2.nix b/modules/system/boot/stage-2.nix
index c86570ad766..69c85d43bc5 100644
--- a/modules/system/boot/stage-2.nix
+++ b/modules/system/boot/stage-2.nix
@@ -1,10 +1,22 @@
 {pkgs, config, ...}:
 
 let
+
+  options = {
+
+    boot.localCommands = pkgs.lib.mkOption {
+      default = "";
+      example = "text=anything; echo You can put $text here.";
+      description = "
+        Shell commands to be executed just before Upstart is started.
+      ";
+    };
+
+  };
+
   inherit (pkgs) substituteAll writeText coreutils utillinux udev upstart;
   kernel = config.boot.kernelPackages.kernel;
   activateConfiguration = config.system.activationScripts.script;
-  inherit (config.boot) isLiveCD;
 
   # Path for Upstart jobs.  Should be quite minimal.
   upstartPath = [
@@ -20,7 +32,7 @@ let
   bootStage2 = substituteAll {
     src = ./stage-2-init.sh;
     isExecutable = true;
-    inherit kernel upstart isLiveCD activateConfiguration upstartPath;
+    inherit kernel upstart activateConfiguration upstartPath;
     path = [
       coreutils
       utillinux
@@ -32,16 +44,7 @@ let
 in
 
 {
-  require = [
-    # config.boot.localCommands
-    # config.boot.kernelPackages
-
-    # config.system.activationScripts
-    # ../system/activate-configuration.nix
-
-    # config.system.build
-    # ../system/system-options.nix
-  ];
+  require = [options];
 
   system = {
     build = {
diff --git a/modules/system/upstart/upstart.nix b/modules/system/upstart/upstart.nix
index 459b8a76e98..a5e431747fc 100644
--- a/modules/system/upstart/upstart.nix
+++ b/modules/system/upstart/upstart.nix
@@ -52,14 +52,6 @@ in
 
 ###### implementation
 let
-  # should be moved to the corresponding jobs.
-  nix = config.environment.nix;
-  nixEnvVars = config.nix.envVars;
-  kernelPackages = config.boot.kernelPackages;
-  nssModulesPath = config.system.nssModules.path;
-  modprobe = config.system.sbin.modprobe;
-  mount = config.system.sbin.mount;
-
   makeJob = import ./make-job.nix {
     inherit (pkgs) runCommand;
   };
diff --git a/system/options.nix b/system/options.nix
index 63ef9bc94a3..f070d867416 100644
--- a/system/options.nix
+++ b/system/options.nix
@@ -6,58 +6,8 @@ in
 
 {
 
-  time = {
-
-    timeZone = mkOption {
-      default = "CET";
-      example = "America/New_York";
-      description = "The time zone used when displaying times and dates.";
-    };
-
-  };
-
-  
   boot = {
 
-    isLiveCD = mkOption {
-      default = false;
-      description = "
-        If set to true, the root device will be mounted read-only and
-        a ramdisk will be mounted on top of it using unionfs to
-        provide a writable root.  This is used for the NixOS
-        Live-CD/DVD.
-      ";
-    };
-
-    hardwareScan = mkOption {
-      default = true;
-      description = "
-        Whether to try to load kernel modules for all detected hardware.
-        Usually this does a good job of providing you with the modules
-        you need, but sometimes it can crash the system or cause other
-        nasty effects.  If the hardware scan is turned on, it can be
-        disabled at boot time by adding the <literal>safemode</literal>
-        parameter to the kernel command line.
-      ";
-    };
-
-    copyKernels = mkOption {
-      default = false;
-      description = "
-        Whether the Grub menu builder should copy kernels and initial
-        ramdisks to /boot.  This is necessary when /nix is on a
-        different file system than /boot.
-      ";
-    };
-
-    localCommands = mkOption {
-      default = "";
-      example = "text=anything; echo You can put $text here.";
-      description = "
-        Shell commands to be executed just before Upstart is started.
-      ";
-    };
-
     extraTTYs = mkOption {
       default = [];
       example = [8 9];
@@ -73,53 +23,6 @@ in
 
   };
 
-  system = {
-    # NSS modules.  Hacky!
-    nssModules = mkOption {
-      internal = true;
-      default = [];
-      description = "
-        Search path for NSS (Name Service Switch) modules.  This allows
-        several DNS resolution methods to be specified via
-        <filename>/etc/nsswitch.conf</filename>.
-      ";
-      merge = pkgs.lib.mergeListOption;
-      apply = list:
-        let
-          list2 =
-             list
-          ++ pkgs.lib.optional config.users.ldap.enable pkgs.nss_ldap;
-        in {
-          list = list2;
-          path = pkgs.lib.makeLibraryPath list2;
-        };
-    };
-
-    sbin = {
-      # !!! The mount option should not stay in /system/option.nix
-      mount = mkOption {
-        internal = true;
-        default = pkgs.utillinuxng.override {
-          buildMountOnly = true;
-          mountHelpers = pkgs.buildEnv {
-            name = "mount-helpers";
-            paths = [
-              pkgs.ntfs3g
-              pkgs.mount_cifs
-              pkgs.nfsUtils
-            ];
-            pathsToLink = "/sbin";
-          } + "/sbin";
-        };
-        description = "
-          A patched `mount' command that looks in a directory in the Nix
-          store instead of in /sbin for mount helpers (like mount.ntfs-3g or
-          mount.cifs).
-        ";
-      };
-    };
-  };
-
 
   networking = {
 
@@ -239,61 +142,6 @@ in
   };
 
 
-  fileSystems = mkOption {
-    default = null;
-    example = [
-      { mountPoint = "/";
-        device = "/dev/hda1";
-      }
-      { mountPoint = "/data";
-        device = "/dev/hda2";
-        fsType = "ext3";
-        options = "data=journal";
-      }
-      { mountPoint = "/bigdisk";
-        label = "bigdisk";
-      }
-    ];
-    description = "
-      The file systems to be mounted.  It must include an entry for
-      the root directory (<literal>mountPoint = \"/\"</literal>).  Each
-      entry in the list is an attribute set with the following fields:
-      <literal>mountPoint</literal>, <literal>device</literal>,
-      <literal>fsType</literal> (a file system type recognised by
-      <command>mount</command>; defaults to
-      <literal>\"auto\"</literal>), and <literal>options</literal>
-      (the mount options passed to <command>mount</command> using the
-      <option>-o</option> flag; defaults to <literal>\"defaults\"</literal>).
-
-      Instead of specifying <literal>device</literal>, you can also
-      specify a volume label (<literal>label</literal>) for file
-      systems that support it, such as ext2/ext3 (see <command>mke2fs
-      -L</command>).
-
-      <literal>autocreate</literal> forces <literal>mountPoint</literal> to be created with 
-      <command>mkdir -p</command> .
-    ";
-  };
-
-
-  swapDevices = mkOption {
-    default = [];
-    example = [
-      { device = "/dev/hda7"; }
-      { device = "/var/swapfile"; }
-      { label = "bigswap"; }
-    ];
-    description = "
-      The swap devices and swap files.  These must have been
-      initialised using <command>mkswap</command>.  Each element
-      should be an attribute set specifying either the path of the
-      swap device or file (<literal>device</literal>) or the label
-      of the swap device (<literal>label</literal>, see
-      <command>mkswap -L</command>).  Using a label is
-      recommended.
-    ";
-  };
-
   nesting = {
     children = mkOption {
       default = [];
@@ -304,14 +152,5 @@ in
   };
 
   
-  passthru = mkOption {
-    default = {};
-    description = "
-      Additional parameters. Ignored. When you want to be sure that 
-      /etc/nixos/nixos -A config.passthru.* is that same thing the 
-      system rebuild will use.
-    ";
-  };
-
   require = import ../modules/module-list.nix;
 }
diff --git a/upstart-jobs/filesystems.nix b/upstart-jobs/filesystems.nix
index 10673cce5f3..6ed59916ccd 100644
--- a/upstart-jobs/filesystems.nix
+++ b/upstart-jobs/filesystems.nix
@@ -1,11 +1,75 @@
 {pkgs, config, ...}:
 
+let
+
+###### interface
+
+  options = {
+
+    fileSystems = pkgs.lib.mkOption {
+      default = null;
+      example = [
+        { mountPoint = "/";
+          device = "/dev/hda1";
+        }
+        { mountPoint = "/data";
+          device = "/dev/hda2";
+          fsType = "ext3";
+          options = "data=journal";
+        }
+        { mountPoint = "/bigdisk";
+          label = "bigdisk";
+        }
+      ];
+      description = "
+        The file systems to be mounted.  It must include an entry for
+        the root directory (<literal>mountPoint = \"/\"</literal>).  Each
+        entry in the list is an attribute set with the following fields:
+        <literal>mountPoint</literal>, <literal>device</literal>,
+        <literal>fsType</literal> (a file system type recognised by
+        <command>mount</command>; defaults to
+        <literal>\"auto\"</literal>), and <literal>options</literal>
+        (the mount options passed to <command>mount</command> using the
+        <option>-o</option> flag; defaults to <literal>\"defaults\"</literal>).
+
+        Instead of specifying <literal>device</literal>, you can also
+        specify a volume label (<literal>label</literal>) for file
+        systems that support it, such as ext2/ext3 (see <command>mke2fs
+        -L</command>).
+
+        <literal>autocreate</literal> forces <literal>mountPoint</literal> to be created with 
+        <command>mkdir -p</command> .
+      ";
+    };
+  
+    system.sbin.mount = pkgs.lib.mkOption {
+      internal = true;
+      default = pkgs.utillinuxng.override {
+        buildMountOnly = true;
+        mountHelpers = pkgs.buildEnv {
+          name = "mount-helpers";
+          paths = [
+            pkgs.ntfs3g
+            pkgs.mount_cifs
+            pkgs.nfsUtils
+          ];
+          pathsToLink = "/sbin";
+        } + "/sbin";
+      };
+      description = "
+        A patched `mount' command that looks in a directory in the Nix
+        store instead of in /sbin for mount helpers (like mount.ntfs-3g or
+        mount.cifs).
+      ";
+    };
+    
+  };
+
 ###### implementation
 
-let
   inherit (pkgs) e2fsprogs;
-  mountPoints = map (fs: fs.mountPoint) fileSystems;
   fileSystems = config.fileSystems;
+  mountPoints = map (fs: fs.mountPoint) fileSystems;
   devices = map (fs: if fs ? device then fs.device else "LABEL=" + fs.label) fileSystems;
   fsTypes = map (fs: if fs ? fsType then fs.fsType else "auto") fileSystems;
   optionss = map (fs: if fs ? options then fs.options else "defaults") fileSystems;
@@ -13,110 +77,111 @@ let
   mount = config.system.sbin.mount;
 
   job = ''
-  start on startup
-  start on new-devices
-  start on ip-up
-  
-  script
-    PATH=${e2fsprogs}/sbin:$PATH
-  
-    mountPoints=(${toString mountPoints})  
-    devices=(${toString devices})
-    fsTypes=(${toString fsTypes})
-    optionss=(${toString optionss})
-    autocreates=(${toString autocreates})
-  
-    newDevices=1
-  
-    # If we mount any file system, we repeat this loop, because new
-    # mount opportunities may have become available (such as images
-    # for loopback mounts).
-  
-    while test -n "$newDevices"; do
-  
-      newDevices=
-  
-      for ((n = 0; n < ''${#mountPoints[*]}; n++)); do
-        mountPoint=''${mountPoints[$n]}
-        device=''${devices[$n]}
-        fsType=''${fsTypes[$n]}
-        options=''${optionss[$n]}
-        autocreate=''${autocreates[$n]}
-  
-        isLabel=
-        if echo "$device" | grep -q '^LABEL='; then isLabel=1; fi
-  
-        isPseudo=
-        if test "$fsType" = "nfs" || test "$fsType" = "tmpfs" ||
-          test "$fsType" = "ext3cow"; then isPseudo=1; fi
-  
-        if ! test -n "$isLabel" -o -n "$isPseudo" -o -e "$device"; then
-            echo "skipping $device, doesn't exist (yet)"
-            continue
-        fi
-  
-        # !!! quick hack: if mount point already exists, try a
-        # remount to change the options but nothing else.
-        if cat /proc/mounts | grep -F -q " $mountPoint "; then
-            echo "remounting $device on $mountPoint"
-            ${mount}/bin/mount -t "$fsType" \
-                -o remount,"$options" \
-                "$device" "$mountPoint" || true
-            continue
-        fi
-  
-        # If $device is already mounted somewhere else, unmount it first.
-        # !!! Note: we use /etc/mtab, not /proc/mounts, because mtab
-        # contains more accurate info when using loop devices.
-  
-        # !!! not very smart about labels yet; should resolve the label somehow.
-        if test -z "$isLabel" -a -z "$isPseudo"; then
-  
-          device=$(readlink -f "$device")
-  
-          prevMountPoint=$(
-              cat /etc/mtab \
-              | grep "^$device " \
-              | sed 's|^[^ ]\+ \+\([^ ]\+\).*|\1|' \
-          )
-  
-          if test "$prevMountPoint" = "$mountPoint"; then
+    start on startup
+    start on new-devices
+    start on ip-up
+
+    script
+      PATH=${e2fsprogs}/sbin:$PATH
+
+      mountPoints=(${toString mountPoints})  
+      devices=(${toString devices})
+      fsTypes=(${toString fsTypes})
+      optionss=(${toString optionss})
+      autocreates=(${toString autocreates})
+
+      newDevices=1
+
+      # If we mount any file system, we repeat this loop, because new
+      # mount opportunities may have become available (such as images
+      # for loopback mounts).
+
+      while test -n "$newDevices"; do
+
+        newDevices=
+
+        for ((n = 0; n < ''${#mountPoints[*]}; n++)); do
+          mountPoint=''${mountPoints[$n]}
+          device=''${devices[$n]}
+          fsType=''${fsTypes[$n]}
+          options=''${optionss[$n]}
+          autocreate=''${autocreates[$n]}
+
+          isLabel=
+          if echo "$device" | grep -q '^LABEL='; then isLabel=1; fi
+
+          isPseudo=
+          if test "$fsType" = "nfs" || test "$fsType" = "tmpfs" ||
+            test "$fsType" = "ext3cow"; then isPseudo=1; fi
+
+          if ! test -n "$isLabel" -o -n "$isPseudo" -o -e "$device"; then
+              echo "skipping $device, doesn't exist (yet)"
+              continue
+          fi
+
+          # !!! quick hack: if mount point already exists, try a
+          # remount to change the options but nothing else.
+          if cat /proc/mounts | grep -F -q " $mountPoint "; then
               echo "remounting $device on $mountPoint"
               ${mount}/bin/mount -t "$fsType" \
                   -o remount,"$options" \
                   "$device" "$mountPoint" || true
               continue
           fi
-  
-          if test -n "$prevMountPoint"; then
-              echo "unmount $device from $prevMountPoint"
-              ${mount}/bin/umount "$prevMountPoint" || true
+
+          # If $device is already mounted somewhere else, unmount it first.
+          # !!! Note: we use /etc/mtab, not /proc/mounts, because mtab
+          # contains more accurate info when using loop devices.
+
+          # !!! not very smart about labels yet; should resolve the label somehow.
+          if test -z "$isLabel" -a -z "$isPseudo"; then
+
+            device=$(readlink -f "$device")
+
+            prevMountPoint=$(
+                cat /etc/mtab \
+                | grep "^$device " \
+                | sed 's|^[^ ]\+ \+\([^ ]\+\).*|\1|' \
+            )
+
+            if test "$prevMountPoint" = "$mountPoint"; then
+                echo "remounting $device on $mountPoint"
+                ${mount}/bin/mount -t "$fsType" \
+                    -o remount,"$options" \
+                    "$device" "$mountPoint" || true
+                continue
+            fi
+
+            if test -n "$prevMountPoint"; then
+                echo "unmount $device from $prevMountPoint"
+                ${mount}/bin/umount "$prevMountPoint" || true
+            fi
+
           fi
-  
-        fi
-  
-        echo "mounting $device on $mountPoint"
-  
-        # !!! should do something with the result; also prevent repeated fscks.
-        if test -z "$isPseudo"; then
-            fsck -a "$device" || true
-        fi
-  
-        if test "$autocreate" = 1; then mkdir -p "$mountPoint"; fi
-  
-        if ${mount}/bin/mount -t "$fsType" -o "$options" "$device" "$mountPoint"; then
-            newDevices=1
-        fi
-  
+
+          echo "mounting $device on $mountPoint"
+
+          # !!! should do something with the result; also prevent repeated fscks.
+          if test -z "$isPseudo"; then
+              fsck -a "$device" || true
+          fi
+
+          if test "$autocreate" = 1; then mkdir -p "$mountPoint"; fi
+
+          if ${mount}/bin/mount -t "$fsType" -o "$options" "$device" "$mountPoint"; then
+              newDevices=1
+          fi
+
+        done
+
       done
-  
-    done
-  
-  end script
+
+    end script
   '';
 in
 
 {
+  require = [options];
   services = {
     extraJobs = [{
       name = "filesystems";
diff --git a/upstart-jobs/swap.nix b/upstart-jobs/swap.nix
index 5b6b70e362f..173b933d992 100644
--- a/upstart-jobs/swap.nix
+++ b/upstart-jobs/swap.nix
@@ -1,9 +1,34 @@
 {pkgs, config, ...}:
 
-###### implementation
-
 let
 
+###### interface
+
+  options = {
+
+    swapDevices = pkgs.lib.mkOption {
+      default = [];
+      example = [
+        { device = "/dev/hda7"; }
+        { device = "/var/swapfile"; }
+        { label = "bigswap"; }
+      ];
+      description = "
+        The swap devices and swap files.  These must have been
+        initialised using <command>mkswap</command>.  Each element
+        should be an attribute set specifying either the path of the
+        swap device or file (<literal>device</literal>) or the label
+        of the swap device (<literal>label</literal>, see
+        <command>mkswap -L</command>).  Using a label is
+        recommended.
+      ";
+    };
+
+  };
+
+
+###### implementation
+
   inherit (pkgs) utillinux lib;
 
   swapDevices = config.swapDevices;
@@ -18,37 +43,37 @@ in
 
 
 {
-  services = {
-    extraJobs = [{
-      name = "swap";
-      
-      job = "
-        start on startup
-        start on new-devices
-        
-        script
-            for device in ${toString devicesByPath}; do
-                ${utillinux}/sbin/swapon \"$device\" || true
-            done
-            
-            for label in ${toString devicesByLabel}; do
-                ${utillinux}/sbin/swapon -L \"$label\" || true
-            done
-            
-            # Remove swap devices not listed in swapDevices.
-            # !!! disabled because it doesn't work with labels
-            #for used in $(cat /proc/swaps | grep '^/' | sed 's/ .*//'); do
-            #    found=
-            #    for device in $ {toString swapDevices}; do
-            #        if test \"$used\" = \"$device\"; then found=1; fi
-            #    done
-            #    if test -z \"$found\"; then
-            #        ${utillinux}/sbin/swapoff \"$used\" || true
-            #    fi
-            #done
-            
-        end script
-      ";
-    }];
-  };
+  require = [options];
+
+  services.extraJobs = [{
+    name = "swap";
+
+    job = ''
+      start on startup
+      start on new-devices
+
+      script
+          for device in ${toString devicesByPath}; do
+              ${utillinux}/sbin/swapon "$device" || true
+          done
+
+          for label in ${toString devicesByLabel}; do
+              ${utillinux}/sbin/swapon -L "$label" || true
+          done
+
+          # Remove swap devices not listed in swapDevices.
+          # !!! disabled because it doesn't work with labels
+          #for used in $(cat /proc/swaps | grep '^/' | sed 's/ .*//'); do
+          #    found=
+          #    for device in $ {toString swapDevices}; do
+          #        if test "$used" = "$device"; then found=1; fi
+          #    done
+          #    if test -z "$found"; then
+          #        ${utillinux}/sbin/swapoff "$used" || true
+          #    fi
+          #done
+
+      end script
+    '';
+  }];
 }
-- 
GitLab


From 05a08adf9176c76e9541f363081e6f33cfb55e20 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 27 May 2009 23:30:29 +0000
Subject: [PATCH 1514/5331] * Move the dhclient exit hooks file to the dhclient
 module, where it   belongs.

svn path=/nixos/branches/modular-nixos/; revision=15755
---
 etc/default.nix                          | 10 +--
 etc/dhclient-exit-hooks                  | 11 ----
 modules/services/networking/dhclient.nix | 83 +++++++++++++++---------
 modules/system/upstart/upstart.nix       |  2 +-
 4 files changed, 55 insertions(+), 51 deletions(-)
 delete mode 100644 etc/dhclient-exit-hooks

diff --git a/etc/default.nix b/etc/default.nix
index 9326160955d..7cffdf082aa 100644
--- a/etc/default.nix
+++ b/etc/default.nix
@@ -109,14 +109,6 @@ let
       target = "default/useradd";
     }
 
-    { # Dhclient hooks for emitting ip-up/ip-down events.
-      source = pkgs.substituteAll {
-        src = ./dhclient-exit-hooks;
-        inherit (pkgs) upstart glibc;
-      };
-      target = "dhclient-exit-hooks";
-    }
-
     { # Script executed when the shell starts as a non-login shell (system-wide version).
       source = pkgs.substituteAll {
         src = ./bashrc.sh;
@@ -140,7 +132,7 @@ let
     { # Script executed when the shell starts as a non-login shell (user version).
       source = ./skel/bashrc;
       target = "skel/.bashrc";      
-    }    
+    }
 
     { # SSH configuration.  Slight duplication of the sshd_config
       # generation in the sshd service.
diff --git a/etc/dhclient-exit-hooks b/etc/dhclient-exit-hooks
deleted file mode 100644
index 94523313055..00000000000
--- a/etc/dhclient-exit-hooks
+++ /dev/null
@@ -1,11 +0,0 @@
-echo "$reason" >> /tmp/dhcp-exit
-echo "$exit_status" >> /tmp/dhcp-exit
-
-if test "$reason" = BOUND -o "$reason" = REBOOT; then
-    @glibc@/sbin/nscd --invalidate hosts
-    @upstart@/sbin/initctl emit ip-up
-fi
-
-if test "$reason" = EXPIRE -o "$reason" = RELEASE; then
-    @upstart@/sbin/initctl emit ip-down
-fi
diff --git a/modules/services/networking/dhclient.nix b/modules/services/networking/dhclient.nix
index 32e71f5af60..39c93860bfe 100644
--- a/modules/services/networking/dhclient.nix
+++ b/modules/services/networking/dhclient.nix
@@ -38,6 +38,7 @@ in
 
 ###### implementation
 let
+
   ifEnable = arg:
     if config.networking.useDHCP then arg
     else if builtins.isList arg then []
@@ -51,6 +52,22 @@ let
     map (i: i.name) (lib.filter (i: i ? ipAddress) config.networking.interfaces);
 
   stateDir = "/var/lib/dhcp"; # Don't use /var/state/dhcp; not FHS-compliant.
+
+  dhclientExitHooks = pkgs.writeText "dhclient-exit-hooks"
+    ''
+      echo "$reason" >> /tmp/dhcp-exit
+      echo "$exit_status" >> /tmp/dhcp-exit
+
+      if test "$reason" = BOUND -o "$reason" = REBOOT; then
+          ${pkgs.glibc}/sbin/nscd --invalidate hosts
+          ${pkgs.upstart}/sbin/initctl emit ip-up
+      fi
+
+      if test "$reason" = EXPIRE -o "$reason" = RELEASE; then
+          ${pkgs.upstart}/sbin/initctl emit ip-down
+      fi
+    '';
+  
 in
 
 {
@@ -59,44 +76,50 @@ in
     options
   ];
 
-  services = {
-    extraJobs = ifEnable [{
-      name = "dhclient";
+  services.extraJobs = ifEnable [{
+    name = "dhclient";
 
-      extraPath = [dhcp];
-  
-      job = "
-description \"DHCP client\"
+    extraPath = [dhcp];
 
-start on network-interfaces/started
-stop on network-interfaces/stop
+    job = ''
+      description "DHCP client"
 
-env PATH_DHCLIENT_SCRIPT=${dhcp}/sbin/dhclient-script
+      start on network-interfaces/started
+      stop on network-interfaces/stop
 
-script
-    export PATH=${nettools}/sbin:$PATH
+      env PATH_DHCLIENT_SCRIPT=${dhcp}/sbin/dhclient-script
 
-    # Determine the interface on which to start dhclient.
-    interfaces=
+      script
+          export PATH=${nettools}/sbin:$PATH
 
-    for i in $(cd /sys/class/net && ls -d *); do
-        if ! for j in ${toString ignoredInterfaces}; do echo $j; done | grep -F -x -q \"$i\"; then
-            echo \"Running dhclient on $i\"
-            interfaces=\"$interfaces $i\"
-        fi
-    done
+          # Determine the interface on which to start dhclient.
+          interfaces=
 
-    if test -z \"$interfaces\"; then
-        echo 'No interfaces on which to start dhclient!'
-        exit 1
-    fi
+          for i in $(cd /sys/class/net && ls -d *); do
+              if ! for j in ${toString ignoredInterfaces}; do echo $j; done | grep -F -x -q "$i"; then
+                  echo "Running dhclient on $i"
+                  interfaces="$interfaces $i"
+              fi
+          done
 
-    mkdir -m 755 -p ${stateDir}
+          if test -z "$interfaces"; then
+              echo 'No interfaces on which to start dhclient!'
+              exit 1
+          fi
 
-    exec ${dhcp}/sbin/dhclient -d $interfaces -e \"PATH=$PATH\" -lf ${stateDir}/dhclient.leases
-end script
-      ";
-    }];
-  };
+          mkdir -m 755 -p ${stateDir}
+
+          exec ${dhcp}/sbin/dhclient -d $interfaces -e "PATH=$PATH" -lf ${stateDir}/dhclient.leases
+      end script
+    '';
+  }];
+
+  environment.etc = ifEnable
+    [ # Dhclient hooks for emitting ip-up/ip-down events.
+      { source = dhclientExitHooks;
+        target = "dhclient-exit-hooks";
+      }
+    ];
+  
 }
 
diff --git a/modules/system/upstart/upstart.nix b/modules/system/upstart/upstart.nix
index a5e431747fc..84237d74408 100644
--- a/modules/system/upstart/upstart.nix
+++ b/modules/system/upstart/upstart.nix
@@ -80,7 +80,7 @@ let
           echo Duplicate entry: $i;
         fi;
       done
-    '';
+    ''; # */
 
 in 
 
-- 
GitLab


From 2c34a4b8c0ce68aeda216576008066af0ecf1f19 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 27 May 2009 23:45:31 +0000
Subject: [PATCH 1515/5331] * Oops.

svn path=/nixos/branches/modular-nixos/; revision=15756
---
 maintainers/scripts/gen-module-list.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/maintainers/scripts/gen-module-list.sh b/maintainers/scripts/gen-module-list.sh
index b885fe58f32..c63d1a69521 100755
--- a/maintainers/scripts/gen-module-list.sh
+++ b/maintainers/scripts/gen-module-list.sh
@@ -6,7 +6,7 @@ usage(){
   echo 1>&2 "
 $prog module-dir
 
-This script generates the `module-list.nix' index file inside the
+This script generates the \`module-list.nix' index file inside the
 module directory.
 "
   exit 1
-- 
GitLab


From 2d7beac3773e929093a06099c328d67836f5dab6 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 27 May 2009 23:59:14 +0000
Subject: [PATCH 1516/5331] * New directory modules/programs that contains
 system-wide   configuration for specific programs.  For instance, ssh.nix
 provides   the configuration for the SSH client; ssmtp.nix provides the  
 configuration for the `ssmtp' MTA.

svn path=/nixos/branches/modular-nixos/; revision=15757
---
 etc/default.nix                | 25 ----------
 modules/config/system-path.nix |  1 -
 modules/module-list.nix        |  4 +-
 modules/programs/ssh.nix       | 20 ++++++++
 modules/programs/ssmtp.nix     | 91 ++++++++++++++++++++++++++++++++++
 system/options.nix             | 54 --------------------
 6 files changed, 114 insertions(+), 81 deletions(-)
 create mode 100644 modules/programs/ssh.nix
 create mode 100644 modules/programs/ssmtp.nix

diff --git a/etc/default.nix b/etc/default.nix
index 7cffdf082aa..6b15245e4cb 100644
--- a/etc/default.nix
+++ b/etc/default.nix
@@ -134,33 +134,8 @@ let
       target = "skel/.bashrc";      
     }
 
-    { # SSH configuration.  Slight duplication of the sshd_config
-      # generation in the sshd service.
-      source = pkgs.writeText "ssh_config" ''
-        ${if config.services.sshd.forwardX11 then ''
-          ForwardX11 yes
-          XAuthLocation ${pkgs.xorg.xauth}/bin/xauth
-        '' else ''
-          ForwardX11 no
-        ''}
-      '';
-      target = "ssh/ssh_config";
-    }
   ]
 
-  # Configuration for ssmtp.
-  ++ optional config.networking.defaultMailServer.directDelivery { 
-    source = let cfg = config.networking.defaultMailServer; in pkgs.writeText "ssmtp.conf" ''
-      MailHub=${cfg.hostName}
-      FromLineOverride=YES
-      ${if cfg.domain != "" then "rewriteDomain=${cfg.domain}" else ""}
-      UseTLS=${if cfg.useTLS then "YES" else "NO"}
-      UseSTARTTLS=${if cfg.useSTARTTLS then "YES" else "NO"}
-      #Debug=YES
-    '';
-    target = "ssmtp/ssmtp.conf";
-  }
-
   # A bunch of PAM configuration files for various programs.
   ++ (map
     (program:
diff --git a/modules/config/system-path.nix b/modules/config/system-path.nix
index 41903297252..c5708a53062 100644
--- a/modules/config/system-path.nix
+++ b/modules/config/system-path.nix
@@ -71,7 +71,6 @@ let
       (import ../../helpers/info-wrapper.nix {inherit (pkgs) bash texinfo writeScriptBin;})
     ]
     ++ pkgs.lib.optional config.services.bitlbee.enable pkgs.bitlbee
-    ++ pkgs.lib.optional config.networking.defaultMailServer.directDelivery pkgs.ssmtp 
     ++ config.environment.extraPackages
     ++ pkgs.lib.optional config.fonts.enableFontDir config.system.build.x11Fonts
 
diff --git a/modules/module-list.nix b/modules/module-list.nix
index 19fc5d10fbf..96e276df98d 100644
--- a/modules/module-list.nix
+++ b/modules/module-list.nix
@@ -1,4 +1,4 @@
-[ # This file have been generated by gen-module-list.sh
+[ # This file has been generated by gen-module-list.sh
   ./config/fonts.nix
   ./config/i18n.nix
   ./config/nsswitch.nix
@@ -8,6 +8,8 @@
   ./config/users-groups.nix
   ./installer/grub/grub.nix
   ./legacy.nix
+  ./programs/ssh.nix
+  ./programs/ssmtp.nix
   ./security/setuid-wrappers.nix
   ./security/sudo.nix
   ./services/audio/alsa.nix
diff --git a/modules/programs/ssh.nix b/modules/programs/ssh.nix
new file mode 100644
index 00000000000..c325a4bea34
--- /dev/null
+++ b/modules/programs/ssh.nix
@@ -0,0 +1,20 @@
+# Global configuration for the SSH client.
+
+{config, pkgs, ...}:
+
+{
+  environment.etc =
+    [ { # SSH configuration.  Slight duplication of the sshd_config
+        # generation in the sshd service.
+        source = pkgs.writeText "ssh_config" ''
+          ${if config.services.sshd.forwardX11 then ''
+            ForwardX11 yes
+            XAuthLocation ${pkgs.xorg.xauth}/bin/xauth
+          '' else ''
+            ForwardX11 no
+          ''}
+        '';
+        target = "ssh/ssh_config";
+      }
+    ];
+}
diff --git a/modules/programs/ssmtp.nix b/modules/programs/ssmtp.nix
new file mode 100644
index 00000000000..a0ecf763528
--- /dev/null
+++ b/modules/programs/ssmtp.nix
@@ -0,0 +1,91 @@
+# Configuration for `ssmtp', a trivial mail transfer agent that can
+# replace sendmail/postfix on simple systems.  It delivers email
+# directly to an SMTP server defined in its configuration file, wihout
+# queueing mail locally.
+
+{config, pkgs, ...}:
+
+with pkgs.lib;
+
+let
+
+  options = {
+
+    networking.defaultMailServer = {
+
+      directDelivery = mkOption {
+        default = false;
+        example = true;
+        description = "
+          Use the trivial Mail Transfer Agent (MTA)
+          <command>ssmtp</command> package to allow programs to send
+          e-mail.  If you don't want to run a ``real'' MTA like
+          <command>sendmail</command> or <command>postfix</command> on
+          your machine, set this option to <literal>true</literal>, and
+          set the option
+          <option>networking.defaultMailServer.hostName</option> to the
+          host name of your preferred mail server.
+        ";
+      };
+
+      hostName = mkOption {
+        example = "mail.example.org";
+        description = "
+          The host name of the default mail server to use to deliver
+          e-mail.
+        ";
+      };
+
+      domain = mkOption {
+        default = "";
+        example = "example.org";
+        description = "
+          The domain from which mail will appear to be sent.
+        ";
+      };
+
+      useTLS = mkOption {
+        default = false;
+        example = true;
+        description = "
+          Whether TLS should be used to connect to the default mail
+          server.
+        ";
+      };
+
+      useSTARTTLS = mkOption {
+        default = false;
+        example = true;
+        description = "
+          Whether the STARTTLS should be used to connect to the default
+          mail server.  (This is needed for TLS-capable mail servers
+          running on the default SMTP port 25.)
+        ";
+      };
+
+    };
+
+  };
+
+  cfg = config.networking.defaultMailServer;
+
+in
+
+mkIf cfg.directDelivery {
+  require = [options];
+
+  environment.etc =
+    [ { source = pkgs.writeText "ssmtp.conf" ''
+          MailHub=${cfg.hostName}
+          FromLineOverride=YES
+          ${if cfg.domain != "" then "rewriteDomain=${cfg.domain}" else ""}
+          UseTLS=${if cfg.useTLS then "YES" else "NO"}
+          UseSTARTTLS=${if cfg.useSTARTTLS then "YES" else "NO"}
+          #Debug=YES
+        '';
+        target = "ssmtp/ssmtp.conf";
+      }
+    ];
+
+  environment.extraPackages = [pkgs.ssmtp];
+}
diff --git a/system/options.nix b/system/options.nix
index f070d867416..8e3308174e7 100644
--- a/system/options.nix
+++ b/system/options.nix
@@ -85,60 +85,6 @@ in
       ";
     };
 
-    defaultMailServer = {
-
-      directDelivery = mkOption {
-        default = false;
-        example = true;
-        description = "
-          Use the trivial Mail Transfer Agent (MTA)
-          <command>ssmtp</command> package to allow programs to send
-          e-mail.  If you don't want to run a ``real'' MTA like
-          <command>sendmail</command> or <command>postfix</command> on
-          your machine, set this option to <literal>true</literal>, and
-          set the option
-          <option>networking.defaultMailServer.hostName</option> to the
-          host name of your preferred mail server.
-        ";
-      };
-
-      hostName = mkOption {
-        example = "mail.example.org";
-        description = "
-          The host name of the default mail server to use to deliver
-          e-mail.
-        ";
-      };
-
-      domain = mkOption {
-        default = "";
-        example = "example.org";
-        description = "
-          The domain from which mail will appear to be sent.
-        ";
-      };
-
-      useTLS = mkOption {
-        default = false;
-        example = true;
-        description = "
-          Whether TLS should be used to connect to the default mail
-          server.
-        ";
-      };
-
-      useSTARTTLS = mkOption {
-        default = false;
-        example = true;
-        description = "
-          Whether the STARTTLS should be used to connect to the default
-          mail server.  (This is needed for TLS-capable mail servers
-          running on the default SMTP port 25.)
-        ";
-      };
-
-    };
-
   };
 
 
-- 
GitLab


From 3badebea95d77106e454f9351e94f8ca9939de8b Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 28 May 2009 11:34:46 +0000
Subject: [PATCH 1517/5331] * Move /etc/issue to the mingetty module.

svn path=/nixos/branches/modular-nixos/; revision=15758
---
 etc/default.nix                    | 10 ----------
 modules/services/ttys/mingetty.nix | 30 ++++++++++++++++++++----------
 2 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/etc/default.nix b/etc/default.nix
index 6b15245e4cb..efb0ea1ee29 100644
--- a/etc/default.nix
+++ b/etc/default.nix
@@ -79,16 +79,6 @@ let
       target = "hosts";
     }
 
-    { # Friendly greeting on the virtual consoles.
-      source = pkgs.writeText "issue" ''
-      
-        ${config.services.mingetty.greetingLine}
-        ${config.services.mingetty.helpLine}
-        
-      '';
-      target = "issue";
-    }
-
     { # Configuration for pwdutils (login, passwd, useradd, etc.).
       # You cannot login without it!
       source = ./login.defs;
diff --git a/modules/services/ttys/mingetty.nix b/modules/services/ttys/mingetty.nix
index c04d47061e9..abca6a9784b 100644
--- a/modules/services/ttys/mingetty.nix
+++ b/modules/services/ttys/mingetty.nix
@@ -61,14 +61,24 @@ in
     options
   ];
 
-  services = {
-    extraJobs = map (ttyNumber : {
-        name = "tty" + toString ttyNumber;
-        job = "
-          start on udev
-          stop on shutdown
-          respawn ${mingetty}/sbin/mingetty --loginprog=${loginProgram} --noclear tty${toString ttyNumber}
-        ";
-    }) ttyNumbers;
-  };
+  services.extraJobs = map (ttyNumber : {
+    name = "tty" + toString ttyNumber;
+    job = ''
+      start on udev
+      stop on shutdown
+      respawn ${mingetty}/sbin/mingetty --loginprog=${loginProgram} --noclear tty${toString ttyNumber}
+    '';
+  }) ttyNumbers;
+
+  environment.etc =
+    [ { # Friendly greeting on the virtual consoles.
+        source = pkgs.writeText "issue" ''
+      
+          ${config.services.mingetty.greetingLine}
+          ${config.services.mingetty.helpLine}
+        
+        '';
+        target = "issue";
+      }
+    ];
 }
-- 
GitLab


From 421dcc35c56bce06d75f541b225767e59305f375 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 28 May 2009 12:06:54 +0000
Subject: [PATCH 1518/5331] * Moved the Bash configuration to
 modules/programs/bash.

svn path=/nixos/branches/modular-nixos/; revision=15759
---
 etc/default.nix                               | 51 ++++---------------
 modules/config/fonts.nix                      | 38 +++++++-------
 modules/module-list.nix                       |  1 +
 modules/programs/bash/bash.nix                | 42 +++++++++++++++
 .../programs/bash/bashrc-user.sh              |  0
 {etc => modules/programs/bash}/bashrc.sh      |  1 -
 {etc => modules/programs/bash}/inputrc        |  0
 {etc => modules/programs/bash}/profile.sh     |  0
 system/system-options.nix                     |  6 ---
 9 files changed, 71 insertions(+), 68 deletions(-)
 create mode 100644 modules/programs/bash/bash.nix
 rename etc/skel/bashrc => modules/programs/bash/bashrc-user.sh (100%)
 rename {etc => modules/programs/bash}/bashrc.sh (98%)
 rename {etc => modules/programs/bash}/inputrc (100%)
 rename {etc => modules/programs/bash}/profile.sh (100%)

diff --git a/etc/default.nix b/etc/default.nix
index efb0ea1ee29..37c0a360d8d 100644
--- a/etc/default.nix
+++ b/etc/default.nix
@@ -35,13 +35,6 @@ in
 
 ###### implementation
 let
-  shellInit = config.environment.shellInit;
-  nixEnvVars = config.nix.envVars;
-  modulesTree = config.system.modulesTree;
-  wrapperDir = config.security.wrapperDir;
-  systemPath = config.system.path;
-  binsh = config.system.build.binsh;
-
   optional = pkgs.lib.optional;
 
 
@@ -99,31 +92,6 @@ let
       target = "default/useradd";
     }
 
-    { # Script executed when the shell starts as a non-login shell (system-wide version).
-      source = pkgs.substituteAll {
-        src = ./bashrc.sh;
-        inherit systemPath wrapperDir modulesTree;
-        defaultLocale = config.i18n.defaultLocale;
-        inherit nixEnvVars shellInit;
-      };
-      target = "bashrc";      
-    }
-
-    { # Script executed when the shell starts as a login shell.
-      source = ./profile.sh;
-      target = "profile";
-    }
-
-    { # Configuration for readline in bash.
-      source = ./inputrc;
-      target = "inputrc";
-    }
-
-    { # Script executed when the shell starts as a non-login shell (user version).
-      source = ./skel/bashrc;
-      target = "skel/.bashrc";      
-    }
-
   ]
 
   # A bunch of PAM configuration files for various programs.
@@ -184,15 +152,16 @@ let
   inherit (pkgs.stringsWithDeps) noDepEntry fullDepEntry packEntry;
 
   copyScript = {source, target, mode ? "644", own ? "root.root"}:
-    assert target != "nixos"; ''
-    source="${source}"
-    target="/etc/${target}"
-    mkdir -p $(dirname "$target")
-    test -e "$target" && rm -f "$target"
-    cp "$source" "$target"
-    chown ${own} "$target"
-    chmod ${mode} "$target"
-  '';
+    assert target != "nixos";
+    ''
+      source="${source}"
+      target="/etc/${target}"
+      mkdir -p $(dirname "$target")
+      test -e "$target" && rm -f "$target"
+      cp "$source" "$target"
+      chown ${own} "$target"
+      chmod ${mode} "$target"
+    '';
 
   makeEtc = import ../helpers/make-etc.nix {
     inherit (pkgs) stdenv;
diff --git a/modules/config/fonts.nix b/modules/config/fonts.nix
index 4f540619a45..f03d457a8bc 100644
--- a/modules/config/fonts.nix
+++ b/modules/config/fonts.nix
@@ -155,24 +155,22 @@ let
 in
 
 {
-  require = [
-    options
-  ];
-
-  system = {
-    build = {
-      inherit x11Fonts;
-    };
-  };
-
-  environment = {
-    # Configuration file for fontconfig used to locate
-    # (X11) client-rendered fonts.
-    etc = mkIf config.fonts.enableFontConfig [{
-      source = pkgs.makeFontsConf {
-        fontDirectories = config.fonts.fonts;
-      };
-      target = "fonts/fonts.conf";
-    }];
-  };
+  require = [options];
+
+  system.build.x11Fonts = x11Fonts;
+
+  environment.etc = mkIf config.fonts.enableFontConfig
+    [ { # Configuration file for fontconfig used to locate
+        # (X11) client-rendered fonts.
+        source = pkgs.makeFontsConf {
+          fontDirectories = config.fonts.fonts;
+        };
+        target = "fonts/fonts.conf";
+      }
+    ];
+
+  environment.shellInit =
+    '' 
+      export FONTCONFIG_FILE=/etc/fonts/fonts.conf
+    '';
 }
diff --git a/modules/module-list.nix b/modules/module-list.nix
index 96e276df98d..5b7d2f7836c 100644
--- a/modules/module-list.nix
+++ b/modules/module-list.nix
@@ -8,6 +8,7 @@
   ./config/users-groups.nix
   ./installer/grub/grub.nix
   ./legacy.nix
+  ./programs/bash/bash.nix
   ./programs/ssh.nix
   ./programs/ssmtp.nix
   ./security/setuid-wrappers.nix
diff --git a/modules/programs/bash/bash.nix b/modules/programs/bash/bash.nix
new file mode 100644
index 00000000000..e7be3b5e102
--- /dev/null
+++ b/modules/programs/bash/bash.nix
@@ -0,0 +1,42 @@
+# This module defines global configuration for the Bash shell, in
+# particular /etc/bashrc and /etc/profile.
+
+{config, pkgs, ...}:
+
+{
+  environment.etc =
+    [ { # /etc/bashrc: script executed when the shell starts as a
+        # non-login shell.  /etc/profile also sources this file, so
+        # most global configuration (such as environment variables)
+        # should go into this script.
+        source = pkgs.substituteAll {
+          src = ./bashrc.sh;
+          systemPath = config.system.path;
+          wrapperDir = config.security.wrapperDir;
+          modulesTree = config.system.modulesTree;
+          defaultLocale = config.i18n.defaultLocale;
+          nixEnvVars = config.nix.envVars;
+          shellInit = config.environment.shellInit;
+        };
+        target = "bashrc";      
+      }
+
+      { # Script executed when the shell starts as a login shell.
+        source = ./profile.sh;
+        target = "profile";
+      }
+
+      { # Template for ~/.bashrc: script executed when the shell
+        # starts as a non-login shell.
+        source = ./bashrc-user.sh;
+        target = "skel/.bashrc";
+      }
+      
+      { # Configuration for readline in bash.
+        source = ./inputrc;
+        target = "inputrc";
+      }
+    ];
+
+  system.build.binsh = pkgs.bashInteractive;
+}
diff --git a/etc/skel/bashrc b/modules/programs/bash/bashrc-user.sh
similarity index 100%
rename from etc/skel/bashrc
rename to modules/programs/bash/bashrc-user.sh
diff --git a/etc/bashrc.sh b/modules/programs/bash/bashrc.sh
similarity index 98%
rename from etc/bashrc.sh
rename to modules/programs/bash/bashrc.sh
index ea3f398c8f2..ad6e5d3f247 100644
--- a/etc/bashrc.sh
+++ b/modules/programs/bash/bashrc.sh
@@ -5,7 +5,6 @@ export MODULE_DIR=@modulesTree@/lib/modules
 export NIXPKGS_CONFIG=/nix/etc/config.nix
 export NIXPKGS_ALL=/etc/nixos/nixpkgs
 export PAGER="less -R"
-export FONTCONFIG_FILE=/etc/fonts/fonts.conf
 export LANG=@defaultLocale@
 export EDITOR=nano
 export INFOPATH=/var/run/current-system/sw/info:/var/run/current-system/sw/share/info
diff --git a/etc/inputrc b/modules/programs/bash/inputrc
similarity index 100%
rename from etc/inputrc
rename to modules/programs/bash/inputrc
diff --git a/etc/profile.sh b/modules/programs/bash/profile.sh
similarity index 100%
rename from etc/profile.sh
rename to modules/programs/bash/profile.sh
diff --git a/system/system-options.nix b/system/system-options.nix
index 01bff26b87c..53705900b64 100644
--- a/system/system-options.nix
+++ b/system/system-options.nix
@@ -39,10 +39,4 @@ in
     # config.system.activationScripts
     # ../system/activate-configuration.nix
   ];
-
-  system = {
-    build = {
-      binsh = pkgs.bashInteractive;
-    };
-  };
 }
-- 
GitLab


From dfe03fc7f94a40b32b496b1768c51f98bab7ec3c Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 28 May 2009 12:21:48 +0000
Subject: [PATCH 1519/5331] * This file has been unused for a long time AFAIK.

svn path=/nixos/branches/modular-nixos/; revision=15760
---
 etc/issue | 4 ----
 1 file changed, 4 deletions(-)
 delete mode 100644 etc/issue

diff --git a/etc/issue b/etc/issue
deleted file mode 100644
index 43502e56827..00000000000
--- a/etc/issue
+++ /dev/null
@@ -1,4 +0,0 @@
-
-<<< Welcome to NixOS (\m) - Kernel \r (\l) >>>
-
-
-- 
GitLab


From ec55562ec3906aaf9406eae725c584d9094ae420 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 28 May 2009 12:24:56 +0000
Subject: [PATCH 1520/5331] * Move the configuration of the pwdutils (passwd,
 useradd etc.) to   modules/programs/pwdutils. * Renamed config.system.shell
 to config.users.defaultUserShell and   updated the description to make clear
 it has to be a non-store   path.

svn path=/nixos/branches/modular-nixos/; revision=15761
---
 etc/default.nix                               | 20 --------
 etc/default/useradd                           |  3 --
 modules/config/users-groups.nix               |  5 +-
 modules/module-list.nix                       |  1 +
 {etc => modules/programs/pwdutils}/login.defs |  0
 .../programs/pwdutils/passwd.conf             |  0
 modules/programs/pwdutils/pwdutils.nix        | 50 +++++++++++++++++++
 .../system/activation/activation-script.nix   |  2 +-
 system/system-options.nix                     | 12 -----
 9 files changed, 54 insertions(+), 39 deletions(-)
 delete mode 100644 etc/default/useradd
 rename {etc => modules/programs/pwdutils}/login.defs (100%)
 rename etc/default/passwd => modules/programs/pwdutils/passwd.conf (100%)
 create mode 100644 modules/programs/pwdutils/pwdutils.nix

diff --git a/etc/default.nix b/etc/default.nix
index 37c0a360d8d..ea37a91adb1 100644
--- a/etc/default.nix
+++ b/etc/default.nix
@@ -72,26 +72,6 @@ let
       target = "hosts";
     }
 
-    { # Configuration for pwdutils (login, passwd, useradd, etc.).
-      # You cannot login without it!
-      source = ./login.defs;
-      target = "login.defs";
-    } 
-
-    { # Configuration for passwd and friends (e.g., hash algorithm
-      # for /etc/passwd).
-      source = ./default/passwd;
-      target = "default/passwd";
-    }
-
-    { # Configuration for useradd.
-      source = pkgs.substituteAll {
-        src = ./default/useradd;
-        defaultShell = config.system.shell;
-      };
-      target = "default/useradd";
-    }
-
   ]
 
   # A bunch of PAM configuration files for various programs.
diff --git a/etc/default/useradd b/etc/default/useradd
deleted file mode 100644
index df221d58511..00000000000
--- a/etc/default/useradd
+++ /dev/null
@@ -1,3 +0,0 @@
-GROUP=100
-HOME=/home
-SHELL=@defaultShell@
diff --git a/modules/config/users-groups.nix b/modules/config/users-groups.nix
index fe2c4138169..9acaae17db9 100644
--- a/modules/config/users-groups.nix
+++ b/modules/config/users-groups.nix
@@ -42,7 +42,6 @@ in
 ###### implementation
 let
   ids = import ../../system/ids.nix;
-  defaultShell = config.system.shell;
 
   # User accounts to be created/updated by NixOS.
   users =
@@ -53,7 +52,7 @@ let
             uid = ids.uids.root;
             description = "System administrator";
             home = "/root";
-            shell = defaultShell;
+            shell = config.users.defaultUserShell;
             group = "root";
           }
           { name = "nobody";
@@ -78,7 +77,7 @@ let
         , group ? "nogroup"
         , extraGroups ? []
         , home ? "/var/empty"
-        , shell ? (if useDefaultShell then defaultShell else "/noshell")
+        , shell ? (if useDefaultShell then config.users.defaultUserShell else "/noshell")
         , createHome ? false
         , useDefaultShell ? false
         }:
diff --git a/modules/module-list.nix b/modules/module-list.nix
index 5b7d2f7836c..a8ca8a006b5 100644
--- a/modules/module-list.nix
+++ b/modules/module-list.nix
@@ -9,6 +9,7 @@
   ./installer/grub/grub.nix
   ./legacy.nix
   ./programs/bash/bash.nix
+  ./programs/pwdutils/pwdutils.nix
   ./programs/ssh.nix
   ./programs/ssmtp.nix
   ./security/setuid-wrappers.nix
diff --git a/etc/login.defs b/modules/programs/pwdutils/login.defs
similarity index 100%
rename from etc/login.defs
rename to modules/programs/pwdutils/login.defs
diff --git a/etc/default/passwd b/modules/programs/pwdutils/passwd.conf
similarity index 100%
rename from etc/default/passwd
rename to modules/programs/pwdutils/passwd.conf
diff --git a/modules/programs/pwdutils/pwdutils.nix b/modules/programs/pwdutils/pwdutils.nix
new file mode 100644
index 00000000000..ec5d31a1ad1
--- /dev/null
+++ b/modules/programs/pwdutils/pwdutils.nix
@@ -0,0 +1,50 @@
+# Configuration for the pwdutils suite of tools: passwd, useradd, etc.
+
+{config, pkgs, ...}:
+
+let
+
+  options = {
+
+    users.defaultUserShell = pkgs.lib.mkOption {
+      default = "/var/run/current-system/sw/bin/bash";
+      description = ''
+        This option defined the default shell assigned to user
+        accounts.  This must not be a store path, since the path is
+        used outside the store (in particular in /etc/passwd).
+        Rather, it should be the path of a symlink that points to the
+        actual shell in the Nix store.
+      '';
+    };
+  
+  };
+
+in
+
+{
+  require = [options];
+
+  environment.etc =
+    [ { # /etc/login.defs: global configuration for pwdutils.  You
+        # cannot login without it! 
+        source = ./login.defs;
+        target = "login.defs";
+      } 
+
+      { # /etc/default/passwd: configuration for passwd and friends
+        # (e.g., hash algorithm for /etc/passwd).
+        source = ./passwd.conf;
+        target = "default/passwd";
+      }
+
+      { # /etc/default/useradd: configuration for useradd.
+        source = pkgs.writeText "useradd"
+          ''
+            GROUP=100
+            HOME=/home
+            SHELL=${config.users.defaultUserShell}
+          '';
+        target = "default/useradd";
+      }
+    ];
+}
diff --git a/modules/system/activation/activation-script.nix b/modules/system/activation/activation-script.nix
index 4cf6548ed29..7d3f6b2ceec 100644
--- a/modules/system/activation/activation-script.nix
+++ b/modules/system/activation/activation-script.nix
@@ -106,7 +106,7 @@ let
           touch /etc/shadow; chmod 0600 /etc/shadow
           # Can't use useradd, since it complains that it doesn't know us
           # (bootstrap problem!).
-          echo "root:x:0:0:System administrator:$rootHome:${config.system.shell}" >> /etc/passwd
+          echo "root:x:0:0:System administrator:$rootHome:${config.users.defaultUserShell}" >> /etc/passwd
           echo "root::::::::" >> /etc/shadow
           echo | passwd --stdin root
       fi
diff --git a/system/system-options.nix b/system/system-options.nix
index 53705900b64..25bc58b5704 100644
--- a/system/system-options.nix
+++ b/system/system-options.nix
@@ -15,18 +15,6 @@ let
           Attribute set of derivations used to setup the system.
         '';
       };
-
-      shell = mkOption {
-        default = "/var/run/current-system/sw/bin/bash";
-        description = ''
-          This option defines the path to the Bash shell.  It should
-          generally not be overriden.
-        '';
-        merge = list:
-          assert list != [] && builtins.tail list == [];
-          builtins.head list;
-      };
-
     };
   };
 in
-- 
GitLab


From d1fd51136f2a76658fabdc4c04224e8fe31cac9c Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 28 May 2009 12:25:50 +0000
Subject: [PATCH 1521/5331] svn path=/nixos/branches/modular-nixos/;
 revision=15762

-- 
GitLab


From e4716ce3ef5c2c8bcbeecdb37098cb24000369bd Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 28 May 2009 12:43:54 +0000
Subject: [PATCH 1522/5331] * Move global networking data (/etc/services,
 /etc/protocols,   /etc/rpc, /etc/hosts) to modules/config/networking.nix.

svn path=/nixos/branches/modular-nixos/; revision=15764
---
 etc/default.nix               | 29 ++-------------------
 etc/hosts                     |  2 --
 modules/config/networking.nix | 49 +++++++++++++++++++++++++++++++++++
 modules/module-list.nix       |  1 +
 system/options.nix            |  8 ------
 5 files changed, 52 insertions(+), 37 deletions(-)
 delete mode 100644 etc/hosts
 create mode 100644 modules/config/networking.nix

diff --git a/etc/default.nix b/etc/default.nix
index ea37a91adb1..42037c8d440 100644
--- a/etc/default.nix
+++ b/etc/default.nix
@@ -47,35 +47,10 @@ let
 
   pamConsolePerms = ./security/console.perms;
 
-  # These should be moved into the corresponding configuration files.
-  configFiles = [
-    { # TCP/UDP port assignments.
-      source = pkgs.iana_etc + "/etc/services";
-      target = "services";
-    }
-
-    { # IP protocol numbers.
-      source = pkgs.iana_etc + "/etc/protocols";
-      target = "protocols";
-    }
-
-    { # RPC program numbers.
-      source = pkgs.glibc + "/etc/rpc";
-      target = "rpc";
-    }
-
-    { # Hostname-to-IP mappings.
-      source = pkgs.substituteAll {
-        src = ./hosts;
-        extraHosts = config.networking.extraHosts;
-      };
-      target = "hosts";
-    }
-
-  ]
+  configFiles = 
 
   # A bunch of PAM configuration files for various programs.
-  ++ (map
+  (map
     (program:
       let isLDAPEnabled = config.users.ldap.enable; in
       { source = pkgs.substituteAll {
diff --git a/etc/hosts b/etc/hosts
deleted file mode 100644
index 71dd03ed229..00000000000
--- a/etc/hosts
+++ /dev/null
@@ -1,2 +0,0 @@
-@extraHosts@
-127.0.0.1 localhost
diff --git a/modules/config/networking.nix b/modules/config/networking.nix
new file mode 100644
index 00000000000..ff4d0f3fee4
--- /dev/null
+++ b/modules/config/networking.nix
@@ -0,0 +1,49 @@
+# /etc files related to networking, such as /etc/services.
+
+{config, pkgs, ...}:
+
+let
+
+  options = {
+
+    networking.extraHosts = pkgs.lib.mkOption {
+      default = "";
+      example = "192.168.0.1 lanlocalhost";
+      description = ''
+        Additional entries to be appended to <filename>/etc/hosts</filename>.
+      '';
+    };
+    
+  };
+
+in
+
+{
+  require = [options];
+
+  environment.etc =
+    [ { # /etc/services: TCP/UDP port assignments.
+        source = pkgs.iana_etc + "/etc/services";
+        target = "services";
+      }
+
+      { # /etc/protocols: IP protocol numbers.
+        source = pkgs.iana_etc + "/etc/protocols";
+        target = "protocols";
+      }
+
+      { # /etc/rpc: RPC program numbers.
+        source = pkgs.glibc + "/etc/rpc";
+        target = "rpc";
+      }
+
+      { # /etc/hosts: Hostname-to-IP mappings.
+        source = pkgs.writeText "hosts"
+          ''
+            ${config.networking.extraHosts}
+            127.0.0.1 localhost
+          '';
+        target = "hosts";
+      }
+    ];
+}
diff --git a/modules/module-list.nix b/modules/module-list.nix
index a8ca8a006b5..2f72d14d2b7 100644
--- a/modules/module-list.nix
+++ b/modules/module-list.nix
@@ -1,6 +1,7 @@
 [ # This file has been generated by gen-module-list.sh
   ./config/fonts.nix
   ./config/i18n.nix
+  ./config/networking.nix
   ./config/nsswitch.nix
   ./config/system-path.nix
   ./config/timezone.nix
diff --git a/system/options.nix b/system/options.nix
index 8e3308174e7..eb51250d28e 100644
--- a/system/options.nix
+++ b/system/options.nix
@@ -42,14 +42,6 @@ in
       ";
     };
 
-    extraHosts = mkOption {
-      default = "";
-      example = "192.168.0.1 lanlocalhost";
-      description = ''
-        Additional entries to be appended to <filename>/etc/hosts</filename>.
-      '';
-    };
-
     defaultGateway = mkOption {
       default = "";
       example = "131.211.84.1";
-- 
GitLab


From de7aae5d5e54fec70a40742c2b11857bdeb3f944 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 28 May 2009 12:56:56 +0000
Subject: [PATCH 1523/5331] * Move the generation of /etc/nix.machines to the
 nix-daemon module.

svn path=/nixos/branches/modular-nixos/; revision=15765
---
 etc/default.nix                      | 15 ++-------
 modules/programs/bash/bash.nix       |  1 -
 modules/programs/bash/bashrc.sh      | 15 +--------
 modules/services/misc/nix-daemon.nix | 50 +++++++++++++++++++---------
 4 files changed, 38 insertions(+), 43 deletions(-)

diff --git a/etc/default.nix b/etc/default.nix
index 42037c8d440..cbcb094a052 100644
--- a/etc/default.nix
+++ b/etc/default.nix
@@ -88,19 +88,8 @@ let
       "common"
       "common-console" # shared stuff for interactive local sessions
     ]
-  )
-
-  # List of machines for distributed Nix builds in the format expected
-  # by build-remote.pl.
-  ++ optional config.nix.distributedBuilds {
-    source = pkgs.writeText "nix.machines"
-      (pkgs.lib.concatStrings (map (machine:
-        "${machine.sshUser}@${machine.hostName} ${machine.system} ${machine.sshKey} ${toString machine.maxJobs}\n"
-      ) config.nix.buildMachines));
-    target = "nix.machines";
-  }
-    
-  ;
+  );
+
 in
 
 let
diff --git a/modules/programs/bash/bash.nix b/modules/programs/bash/bash.nix
index e7be3b5e102..d992d0888ba 100644
--- a/modules/programs/bash/bash.nix
+++ b/modules/programs/bash/bash.nix
@@ -15,7 +15,6 @@
           wrapperDir = config.security.wrapperDir;
           modulesTree = config.system.modulesTree;
           defaultLocale = config.i18n.defaultLocale;
-          nixEnvVars = config.nix.envVars;
           shellInit = config.environment.shellInit;
         };
         target = "bashrc";      
diff --git a/modules/programs/bash/bashrc.sh b/modules/programs/bash/bashrc.sh
index ad6e5d3f247..d18cb010b50 100644
--- a/modules/programs/bash/bashrc.sh
+++ b/modules/programs/bash/bashrc.sh
@@ -9,21 +9,8 @@ export LANG=@defaultLocale@
 export EDITOR=nano
 export INFOPATH=/var/run/current-system/sw/info:/var/run/current-system/sw/share/info
 export LOCATE_PATH=/var/cache/locatedb
-@shellInit@
 export LOCALE_ARCHIVE=/var/run/current-system/sw/lib/locale/locale-archive
-
-
-# Set up secure multi-user builds: non-root users build through the
-# Nix daemon.
-if test "$USER" != root; then
-    export NIX_REMOTE=daemon
-else
-    export NIX_REMOTE=
-fi
-
-
-# Set up the environment variables for running Nix.
-@nixEnvVars@
+@shellInit@
 
 
 # Include the various profiles in the appropriate environment variables.
diff --git a/modules/services/misc/nix-daemon.nix b/modules/services/misc/nix-daemon.nix
index 544ddab5832..ee8d67f7471 100644
--- a/modules/services/misc/nix-daemon.nix
+++ b/modules/services/misc/nix-daemon.nix
@@ -178,13 +178,12 @@ let
       };
     };
   };
+
 in
 
 ###### implementation
 
 let 
-  binsh = config.system.build.binsh;
-  nixEnvVars = config.nix.envVars;
   inherit (config.environment) nix;
 in
 
@@ -193,9 +192,8 @@ in
     options
   ];
 
-  environment = {
-    etc = [
-      { # Nix configuration.
+  environment.etc =
+    [ { # Nix configuration.
         source =
           let
             # Tricky: if we're using a chroot for builds, then we need
@@ -205,7 +203,7 @@ in
             # other paths in the store, we need the closure of /bin/sh
             # in `build-chroot-dirs' - otherwise any builder that uses
             # /bin/sh won't work.
-            binshDeps = pkgs.writeReferencesToFile binsh;
+            binshDeps = pkgs.writeReferencesToFile config.system.build.binsh;
   
             # Likewise, if chroots are turned on, we need Nix's own
             # closure in the chroot.  Otherwise nix-channel and nix-env
@@ -226,23 +224,45 @@ in
             '';
         target = "nix.conf"; # will be symlinked from /nix/etc/nix/nix.conf in activate-configuration.sh.
       }
-    ];
-  };
+    ]
+
+    ++ optional config.nix.distributedBuilds
+      { # List of machines for distributed Nix builds in the format expected
+        # by build-remote.pl.
+        source = pkgs.writeText "nix.machines"
+          (pkgs.lib.concatStrings (map (machine:
+            "${machine.sshUser}@${machine.hostName} ${machine.system} ${machine.sshKey} ${toString machine.maxJobs}\n"
+          ) config.nix.buildMachines));
+        target = "nix.machines";
+      };
+
+  services.extraJobs = [
+    { name = "nix-daemon";
 
-  services = {
-    extraJobs = [{
-      name = "nix-daemon";
-      
       job = ''
         start on startup
         stop on shutdown
         respawn
         script
           export PATH=${if config.nix.distributedBuilds then "${pkgs.openssh}/bin:" else ""}${pkgs.openssl}/bin:${nix}/bin:$PATH
-          ${nixEnvVars}
+          ${config.nix.envVars}
           exec ${nix}/bin/nix-worker --daemon > /dev/null 2>&1
         end script
       '';
-    }];
-  };
+    }
+  ];
+
+  environment.shellInit =
+    ''
+      # Set up the environment variables for running Nix.
+      ${config.nix.envVars}
+      
+      # Set up secure multi-user builds: non-root users build through the
+      # Nix daemon.
+      if test "$USER" != root; then
+          export NIX_REMOTE=daemon
+      else
+          export NIX_REMOTE=
+      fi
+    '';
 }
-- 
GitLab


From 14f1c81822d3eb855ea47abf9d53bc4b06659385 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 28 May 2009 13:10:02 +0000
Subject: [PATCH 1524/5331] * Move PAM configuration to
 modules/security/pam.nix.

svn path=/nixos/branches/modular-nixos/; revision=15766
---
 etc/default.nix                               | 55 +-----------------
 modules/module-list.nix                       |  1 +
 {etc => modules}/security/console.perms       |  0
 {etc => modules/security}/pam.d/chsh          |  0
 {etc => modules/security}/pam.d/common        |  0
 .../security}/pam.d/common-console            |  0
 {etc => modules/security}/pam.d/cups          |  0
 {etc => modules/security}/pam.d/ejabberd      |  0
 {etc => modules/security}/pam.d/ftp           |  0
 {etc => modules/security}/pam.d/login         |  0
 {etc => modules/security}/pam.d/lshd          |  0
 {etc => modules/security}/pam.d/other         |  0
 {etc => modules/security}/pam.d/passwd        |  0
 {etc => modules/security}/pam.d/samba         |  0
 {etc => modules/security}/pam.d/shadow        |  0
 {etc => modules/security}/pam.d/sshd          |  0
 {etc => modules/security}/pam.d/su            |  0
 {etc => modules/security}/pam.d/useradd       |  0
 {etc => modules/security}/pam.d/xlock         |  0
 modules/security/pam.nix                      | 57 +++++++++++++++++++
 20 files changed, 59 insertions(+), 54 deletions(-)
 rename {etc => modules}/security/console.perms (100%)
 rename {etc => modules/security}/pam.d/chsh (100%)
 rename {etc => modules/security}/pam.d/common (100%)
 rename {etc => modules/security}/pam.d/common-console (100%)
 rename {etc => modules/security}/pam.d/cups (100%)
 rename {etc => modules/security}/pam.d/ejabberd (100%)
 rename {etc => modules/security}/pam.d/ftp (100%)
 rename {etc => modules/security}/pam.d/login (100%)
 rename {etc => modules/security}/pam.d/lshd (100%)
 rename {etc => modules/security}/pam.d/other (100%)
 rename {etc => modules/security}/pam.d/passwd (100%)
 rename {etc => modules/security}/pam.d/samba (100%)
 rename {etc => modules/security}/pam.d/shadow (100%)
 rename {etc => modules/security}/pam.d/sshd (100%)
 rename {etc => modules/security}/pam.d/su (100%)
 rename {etc => modules/security}/pam.d/useradd (100%)
 rename {etc => modules/security}/pam.d/xlock (100%)
 create mode 100644 modules/security/pam.nix

diff --git a/etc/default.nix b/etc/default.nix
index cbcb094a052..fad75ccbf31 100644
--- a/etc/default.nix
+++ b/etc/default.nix
@@ -37,59 +37,6 @@ in
 let
   optional = pkgs.lib.optional;
 
-
-  # !!! ugh, these files shouldn't be created here.
-  pamConsoleHandlers = pkgs.writeText "console.handlers" ''
-    console consoledevs /dev/tty[0-9][0-9]* :[0-9]\.[0-9] :[0-9]
-    ${pkgs.pam_console}/sbin/pam_console_apply lock logfail wait -t tty -s -c ${pamConsolePerms}
-    ${pkgs.pam_console}/sbin/pam_console_apply unlock logfail wait -r -t tty -s -c ${pamConsolePerms}
-  '';
-
-  pamConsolePerms = ./security/console.perms;
-
-  configFiles = 
-
-  # A bunch of PAM configuration files for various programs.
-  (map
-    (program:
-      let isLDAPEnabled = config.users.ldap.enable; in
-      { source = pkgs.substituteAll {
-          src = ./pam.d + ("/" + program);
-          inherit (pkgs) pam_unix2 pam_console;
-          pam_ldap =
-            if isLDAPEnabled
-            then pkgs.pam_ldap
-            else "/no-such-path";
-          inherit (pkgs.xorg) xauth;
-          inherit pamConsoleHandlers;
-          isLDAPEnabled = if isLDAPEnabled then "" else "#";
-          syncSambaPasswords = if config.services.samba.syncPasswordsByPam
-            then "password   optional     ${pkgs.samba}/lib/security/pam_smbpass.so nullok use_authtok try_first_pass"
-            else "# change samba configuration options to make passwd sync the samba auth database as well here..";
-        };
-        target = "pam.d/" + program;
-      }
-    )
-    [
-      "login"
-      "su"
-      "other"
-      "passwd"
-      "shadow"
-      "sshd"
-      "lshd"
-      "useradd"
-      "chsh"
-      "xlock"
-      "samba"
-      "cups"
-      "ftp"
-      "ejabberd"
-      "common"
-      "common-console" # shared stuff for interactive local sessions
-    ]
-  );
-
 in
 
 let
@@ -109,7 +56,7 @@ let
 
   makeEtc = import ../helpers/make-etc.nix {
     inherit (pkgs) stdenv;
-    configFiles = configFiles ++ config.environment.etc;
+    configFiles = config.environment.etc;
   };
 in
 
diff --git a/modules/module-list.nix b/modules/module-list.nix
index 2f72d14d2b7..a6843e09702 100644
--- a/modules/module-list.nix
+++ b/modules/module-list.nix
@@ -13,6 +13,7 @@
   ./programs/pwdutils/pwdutils.nix
   ./programs/ssh.nix
   ./programs/ssmtp.nix
+  ./security/pam.nix
   ./security/setuid-wrappers.nix
   ./security/sudo.nix
   ./services/audio/alsa.nix
diff --git a/etc/security/console.perms b/modules/security/console.perms
similarity index 100%
rename from etc/security/console.perms
rename to modules/security/console.perms
diff --git a/etc/pam.d/chsh b/modules/security/pam.d/chsh
similarity index 100%
rename from etc/pam.d/chsh
rename to modules/security/pam.d/chsh
diff --git a/etc/pam.d/common b/modules/security/pam.d/common
similarity index 100%
rename from etc/pam.d/common
rename to modules/security/pam.d/common
diff --git a/etc/pam.d/common-console b/modules/security/pam.d/common-console
similarity index 100%
rename from etc/pam.d/common-console
rename to modules/security/pam.d/common-console
diff --git a/etc/pam.d/cups b/modules/security/pam.d/cups
similarity index 100%
rename from etc/pam.d/cups
rename to modules/security/pam.d/cups
diff --git a/etc/pam.d/ejabberd b/modules/security/pam.d/ejabberd
similarity index 100%
rename from etc/pam.d/ejabberd
rename to modules/security/pam.d/ejabberd
diff --git a/etc/pam.d/ftp b/modules/security/pam.d/ftp
similarity index 100%
rename from etc/pam.d/ftp
rename to modules/security/pam.d/ftp
diff --git a/etc/pam.d/login b/modules/security/pam.d/login
similarity index 100%
rename from etc/pam.d/login
rename to modules/security/pam.d/login
diff --git a/etc/pam.d/lshd b/modules/security/pam.d/lshd
similarity index 100%
rename from etc/pam.d/lshd
rename to modules/security/pam.d/lshd
diff --git a/etc/pam.d/other b/modules/security/pam.d/other
similarity index 100%
rename from etc/pam.d/other
rename to modules/security/pam.d/other
diff --git a/etc/pam.d/passwd b/modules/security/pam.d/passwd
similarity index 100%
rename from etc/pam.d/passwd
rename to modules/security/pam.d/passwd
diff --git a/etc/pam.d/samba b/modules/security/pam.d/samba
similarity index 100%
rename from etc/pam.d/samba
rename to modules/security/pam.d/samba
diff --git a/etc/pam.d/shadow b/modules/security/pam.d/shadow
similarity index 100%
rename from etc/pam.d/shadow
rename to modules/security/pam.d/shadow
diff --git a/etc/pam.d/sshd b/modules/security/pam.d/sshd
similarity index 100%
rename from etc/pam.d/sshd
rename to modules/security/pam.d/sshd
diff --git a/etc/pam.d/su b/modules/security/pam.d/su
similarity index 100%
rename from etc/pam.d/su
rename to modules/security/pam.d/su
diff --git a/etc/pam.d/useradd b/modules/security/pam.d/useradd
similarity index 100%
rename from etc/pam.d/useradd
rename to modules/security/pam.d/useradd
diff --git a/etc/pam.d/xlock b/modules/security/pam.d/xlock
similarity index 100%
rename from etc/pam.d/xlock
rename to modules/security/pam.d/xlock
diff --git a/modules/security/pam.nix b/modules/security/pam.nix
new file mode 100644
index 00000000000..8ac6fddcc63
--- /dev/null
+++ b/modules/security/pam.nix
@@ -0,0 +1,57 @@
+# This module provides configuration for the PAM (Pluggable
+# Authentication Modules) system.
+
+{config, pkgs, ...}:
+
+let
+
+  # !!! ugh, these files shouldn't be created here.
+  pamConsoleHandlers = pkgs.writeText "console.handlers" ''
+    console consoledevs /dev/tty[0-9][0-9]* :[0-9]\.[0-9] :[0-9]
+    ${pkgs.pam_console}/sbin/pam_console_apply lock logfail wait -t tty -s -c ${pamConsolePerms}
+    ${pkgs.pam_console}/sbin/pam_console_apply unlock logfail wait -r -t tty -s -c ${pamConsolePerms}
+  '';
+
+  pamConsolePerms = ./console.perms;
+
+  generatePAMConfig = program:
+    let isLDAPEnabled = config.users.ldap.enable; in
+    { source = pkgs.substituteAll {
+        src = ./pam.d + ("/" + program);
+        inherit (pkgs) pam_unix2 pam_console;
+        pam_ldap =
+          if isLDAPEnabled
+          then pkgs.pam_ldap
+          else "/no-such-path";
+        inherit (pkgs.xorg) xauth;
+        inherit pamConsoleHandlers;
+        isLDAPEnabled = if isLDAPEnabled then "" else "#";
+        syncSambaPasswords = if config.services.samba.syncPasswordsByPam
+          then "password   optional     ${pkgs.samba}/lib/security/pam_smbpass.so nullok use_authtok try_first_pass"
+          else "# change samba configuration options to make passwd sync the samba auth database as well here..";
+      };
+      target = "pam.d/" + program;
+    };
+
+in
+
+{
+  environment.etc =  map generatePAMConfig 
+    [ "login"
+      "su"
+      "other"
+      "passwd"
+      "shadow"
+      "sshd"
+      "lshd"
+      "useradd"
+      "chsh"
+      "xlock"
+      "samba"
+      "cups"
+      "ftp"
+      "ejabberd"
+      "common"
+      "common-console" # shared stuff for interactive local sessions
+    ];
+}
-- 
GitLab


From 3c84d56273ff6a5eb07d83448a3b046cb6c5ebc7 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 28 May 2009 13:17:56 +0000
Subject: [PATCH 1525/5331] * Move the /etc generation to modules/system/etc.

svn path=/nixos/branches/modular-nixos/; revision=15767
---
 modules/legacy.nix                            |  1 -
 modules/module-list.nix                       |  1 +
 modules/programs/bash/bash.nix                | 19 +++++++
 etc/default.nix => modules/system/etc/etc.nix | 55 +++++--------------
 {helpers => modules/system/etc}/make-etc.nix  |  0
 {helpers => modules/system/etc}/make-etc.sh   |  0
 6 files changed, 35 insertions(+), 41 deletions(-)
 rename etc/default.nix => modules/system/etc/etc.nix (65%)
 rename {helpers => modules/system/etc}/make-etc.nix (100%)
 rename {helpers => modules/system/etc}/make-etc.sh (100%)

diff --git a/modules/legacy.nix b/modules/legacy.nix
index 67a99ea900c..8b4d7199ae0 100644
--- a/modules/legacy.nix
+++ b/modules/legacy.nix
@@ -1,6 +1,5 @@
 {
   require = [
-    ../etc/default.nix
     ../system/assertion.nix
     ../system/nixos-environment.nix
     ../system/nixos-installer.nix
diff --git a/modules/module-list.nix b/modules/module-list.nix
index a6843e09702..b10905fc35e 100644
--- a/modules/module-list.nix
+++ b/modules/module-list.nix
@@ -117,6 +117,7 @@
   ./system/boot/kernel.nix
   ./system/boot/stage-1.nix
   ./system/boot/stage-2.nix
+  ./system/etc/etc.nix
   ./system/upstart-events/ctrl-alt-delete.nix
   ./system/upstart-events/halt.nix
   ./system/upstart-events/maintenance-shell.nix
diff --git a/modules/programs/bash/bash.nix b/modules/programs/bash/bash.nix
index d992d0888ba..205cadea7f3 100644
--- a/modules/programs/bash/bash.nix
+++ b/modules/programs/bash/bash.nix
@@ -3,7 +3,26 @@
 
 {config, pkgs, ...}:
 
+let
+
+  options = {
+
+    environment.shellInit = pkgs.lib.mkOption {
+        default = "";
+        example = ''export PATH=/godi/bin/:$PATH'';
+        description = "
+          Script used to initialized user shell environments.
+        ";
+        merge = pkgs.lib.mergeStringOption;
+      };
+
+  };
+
+in    
+   
 {
+  require = [options];
+
   environment.etc =
     [ { # /etc/bashrc: script executed when the shell starts as a
         # non-login shell.  /etc/profile also sources this file, so
diff --git a/etc/default.nix b/modules/system/etc/etc.nix
similarity index 65%
rename from etc/default.nix
rename to modules/system/etc/etc.nix
index fad75ccbf31..c499cc0583a 100644
--- a/etc/default.nix
+++ b/modules/system/etc/etc.nix
@@ -6,41 +6,23 @@ let
   inherit (pkgs.lib) mkOption;
 
   option = {
-    environment = {
-      etc = mkOption {
-        default = [];
-        example = [
-          { source = "/nix/store/.../etc/dir/file.conf.example";
-            target = "dir/file.conf";
-            mode = "0440";
-          }
-        ];
-        description = "
-          List of files that have to be linked in /etc.
-        ";
-      };
-
-      # !!! This should be moved outside of /etc/default.nix.
-      shellInit = mkOption {
-        default = "";
-        example = ''export PATH=/godi/bin/:$PATH'';
-        description = "
-          Script used to initialized user shell environments.
-        ";
-        merge = pkgs.lib.mergeStringOption;
-      };
+    environment.etc = mkOption {
+      default = [];
+      example = [
+        { source = "/nix/store/.../etc/dir/file.conf.example";
+          target = "dir/file.conf";
+          mode = "0440";
+        }
+      ];
+      description = ''
+        List of files that have to be linked in /etc.
+      '';
     };
   };
 in
 
 ###### implementation
 let
-  optional = pkgs.lib.optional;
-
-in
-
-let
-  inherit (pkgs.stringsWithDeps) noDepEntry fullDepEntry packEntry;
 
   copyScript = {source, target, mode ? "644", own ? "root.root"}:
     assert target != "nixos";
@@ -54,22 +36,15 @@ let
       chmod ${mode} "$target"
     '';
 
-  makeEtc = import ../helpers/make-etc.nix {
+  makeEtc = import ./make-etc.nix {
     inherit (pkgs) stdenv;
     configFiles = config.environment.etc;
   };
+  
 in
 
 {
-  require = [
-    option
-
-    # config.system.build
-    # ../system/system-options.nix
-
-    # config.system.activationScripts
-    # ../system/activate-configuration.nix
-  ];
+  require = [option];
 
   system = {
     build = {
@@ -77,7 +52,7 @@ in
     };
 
     activationScripts = {
-      etc = fullDepEntry ''
+      etc = pkgs.lib.fullDepEntry ''
         # Set up the statically computed bits of /etc.
         staticEtc=/etc/static
         rm -f $staticEtc
diff --git a/helpers/make-etc.nix b/modules/system/etc/make-etc.nix
similarity index 100%
rename from helpers/make-etc.nix
rename to modules/system/etc/make-etc.nix
diff --git a/helpers/make-etc.sh b/modules/system/etc/make-etc.sh
similarity index 100%
rename from helpers/make-etc.sh
rename to modules/system/etc/make-etc.sh
-- 
GitLab


From 29611e49fd86c7147a3ebe0e43f723b7f3a45676 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 28 May 2009 13:36:38 +0000
Subject: [PATCH 1526/5331] * More cleanup.

svn path=/nixos/branches/modular-nixos/; revision=15768
---
 modules/legacy.nix                      |  1 -
 modules/system/activation/top-level.nix | 21 ++++++++++++++++-
 system/options.nix                      | 10 ---------
 system/system-options.nix               | 30 -------------------------
 4 files changed, 20 insertions(+), 42 deletions(-)
 delete mode 100644 system/system-options.nix

diff --git a/modules/legacy.nix b/modules/legacy.nix
index 8b4d7199ae0..6359682f17c 100644
--- a/modules/legacy.nix
+++ b/modules/legacy.nix
@@ -3,7 +3,6 @@
     ../system/assertion.nix
     ../system/nixos-environment.nix
     ../system/nixos-installer.nix
-    ../system/system-options.nix
     ../upstart-jobs/cron/locate.nix
     ../upstart-jobs/filesystems.nix
     ../upstart-jobs/guest-users.nix
diff --git a/modules/system/activation/top-level.nix b/modules/system/activation/top-level.nix
index 306037d1f57..d09f34264e9 100644
--- a/modules/system/activation/top-level.nix
+++ b/modules/system/activation/top-level.nix
@@ -2,6 +2,25 @@
 
 let
 
+  options = {
+  
+    system.build = pkgs.lib.mkOption {
+      default = {};
+      description = ''
+        Attribute set of derivations used to setup the system.
+      '';
+    };
+
+    nesting.children = pkgs.lib.mkOption {
+      default = [];
+      description = ''
+        Additional configurations to build.
+      '';
+    };
+    
+  };
+
+    
   # This attribute is responsible for creating boot entries for 
   # child configuration. They are only (directly) accessible
   # when the parent configuration is boot default. For example,
@@ -77,7 +96,7 @@ let
 
 
 in {
+  require = [options];
 
   system.build.system = system;
-
 }
diff --git a/system/options.nix b/system/options.nix
index eb51250d28e..8c725255487 100644
--- a/system/options.nix
+++ b/system/options.nix
@@ -80,15 +80,5 @@ in
   };
 
 
-  nesting = {
-    children = mkOption {
-      default = [];
-      description = "
-        Additional configurations to build.
-      ";
-    };
-  };
-
-  
   require = import ../modules/module-list.nix;
 }
diff --git a/system/system-options.nix b/system/system-options.nix
deleted file mode 100644
index 25bc58b5704..00000000000
--- a/system/system-options.nix
+++ /dev/null
@@ -1,30 +0,0 @@
-# this file contains all extendable options originally defined in system.nix
-# TODO: split it to make it readable.
-{pkgs, config, ...}:
-
-with pkgs.lib;
-
-###### interface
-let
-
-  option = {
-    system = {
-      build = mkOption {
-        default = {};
-        description = ''
-          Attribute set of derivations used to setup the system.
-        '';
-      };
-    };
-  };
-in
-
-###### implementation
-{
-  require = [
-    option
-
-    # config.system.activationScripts
-    # ../system/activate-configuration.nix
-  ];
-}
-- 
GitLab


From fdbe09e914d94419be815ef2e642985794009b7d Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 28 May 2009 14:37:30 +0000
Subject: [PATCH 1527/5331] * Moved the guest-users.nix module to
 modules/config.  Clearing the   passwords is now done in an activation
 scriptlet rather than an   Upstart job (not tested).  BTW, we should get rid
 of this module and   add support to the users-groups.nix module for creating
 accounts   with an empty password.

svn path=/nixos/branches/modular-nixos/; revision=15769
---
 .../config}/guest-users.nix                   | 38 +++++++------------
 modules/legacy.nix                            |  1 -
 modules/module-list.nix                       |  6 +++
 .../x11/xserver/display-managers/kdm.nix      |  8 ++--
 4 files changed, 24 insertions(+), 29 deletions(-)
 rename {upstart-jobs => modules/config}/guest-users.nix (62%)

diff --git a/upstart-jobs/guest-users.nix b/modules/config/guest-users.nix
similarity index 62%
rename from upstart-jobs/guest-users.nix
rename to modules/config/guest-users.nix
index dcebf7a12af..29a9740a733 100644
--- a/upstart-jobs/guest-users.nix
+++ b/modules/config/guest-users.nix
@@ -1,6 +1,7 @@
-{pkgs, config, ...}: 
+{pkgs, config, ...}:
+
 let
-  inherit(pkgs.lib) mkOption;
+  inherit (pkgs.lib) mkOption;
 
   options = {
     services = {
@@ -53,26 +54,15 @@ in
 
 {
   require = options;
-  services = {
-    # !!! Better to do this as an activation script plugin rather
-    # than an Upstart job.
-    extraJobs = optional enable {
-      name = "clear-passwords";
-      job = ''
-        description "Clear guest passwords"
-	start on startup
-	script
-	  for i in ${nameString}; do
-	      echo | ${pkgs.pwdutils}/bin/passwd --stdin $i
-	  done
-	end script
-      '';
-    };
-    mingetty = {
-      helpLine = optionalString enable "\nThese users have empty passwords: ${nameString}";
-    };
-  };
-  users = {
-    extraUsers = map userEntry users;
-  };
+
+  system.activationScripts = pkgs.lib.fullDepEntry
+    ''
+      for i in ${nameString}; do
+          echo | ${pkgs.pwdutils}/bin/passwd --stdin $i
+      done
+    '' ["defaultPath" "users" "groups"];
+
+  services.mingetty.helpLine = optionalString enable "\nThese users have empty passwords: ${nameString}";
+  
+  users.extraUsers = map userEntry users;
 }
diff --git a/modules/legacy.nix b/modules/legacy.nix
index 6359682f17c..7a2f223fc98 100644
--- a/modules/legacy.nix
+++ b/modules/legacy.nix
@@ -5,7 +5,6 @@
     ../system/nixos-installer.nix
     ../upstart-jobs/cron/locate.nix
     ../upstart-jobs/filesystems.nix
-    ../upstart-jobs/guest-users.nix
     ../upstart-jobs/kbd.nix
     ../upstart-jobs/ldap
     ../upstart-jobs/lvm.nix
diff --git a/modules/module-list.nix b/modules/module-list.nix
index b10905fc35e..6a08aa276d4 100644
--- a/modules/module-list.nix
+++ b/modules/module-list.nix
@@ -1,5 +1,6 @@
 [ # This file has been generated by gen-module-list.sh
   ./config/fonts.nix
+  ./config/guest-users.nix
   ./config/i18n.nix
   ./config/networking.nix
   ./config/nsswitch.nix
@@ -118,6 +119,11 @@
   ./system/boot/stage-1.nix
   ./system/boot/stage-2.nix
   ./system/etc/etc.nix
+##### ./system/etc/make-etc.nix
+# error: while evaluating the attribute `<let-body>' at `(string):2:8':
+# while evaluating the function at `(string):3:22':
+# while evaluating the function at `/home/eelco/Dev/modular-nixos/modules/system/etc/make-etc.nix:1:2':
+# the argument named `stdenv' required by the function is missing
   ./system/upstart-events/ctrl-alt-delete.nix
   ./system/upstart-events/halt.nix
   ./system/upstart-events/maintenance-shell.nix
diff --git a/modules/services/x11/xserver/display-managers/kdm.nix b/modules/services/x11/xserver/display-managers/kdm.nix
index 556519472e3..031f5c18a1e 100644
--- a/modules/services/x11/xserver/display-managers/kdm.nix
+++ b/modules/services/x11/xserver/display-managers/kdm.nix
@@ -4,9 +4,9 @@
 let
   inherit (pkgs.lib) mkOption;
 
-  options = { services = { xserver = { displayManager = {
+  options = {
 
-    kdm = {
+    services.xserver.displayManager.kdm = {
       enable = mkOption {
         default = false;
         description = "
@@ -15,7 +15,7 @@ let
       };
     };
 
-  }; /* displayManager */ }; /* xserver */ }; /* services */ };
+  };
 
 in
 
@@ -31,7 +31,7 @@ let
 
   kdmrc = stdenv.mkDerivation {
     name = "kdmrc";
-# 	     -e "s|Session=${kdebase_workspace}/share/config/kdm/Xsession|Session=${dmcfg.session.script}|" \
+    # -e "s|Session=${kdebase_workspace}/share/config/kdm/Xsession|Session=${dmcfg.session.script}|" \
     buildCommand = ''
       cp ${kdebase_workspace}/share/config/kdm/kdmrc .
       sed -i -e "s|#HaltCmd=|HaltCmd=${pkgs.upstart}/sbin/halt|" \
-- 
GitLab


From e86b0666250e3efde48b127a7d28aad64cc990e0 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 28 May 2009 14:57:31 +0000
Subject: [PATCH 1528/5331] * That wasn't quite right.

svn path=/nixos/branches/modular-nixos/; revision=15770
---
 modules/config/guest-users.nix | 31 ++++++++++++++++++-------------
 1 file changed, 18 insertions(+), 13 deletions(-)

diff --git a/modules/config/guest-users.nix b/modules/config/guest-users.nix
index 29a9740a733..ca5bfd6f7f3 100644
--- a/modules/config/guest-users.nix
+++ b/modules/config/guest-users.nix
@@ -33,9 +33,10 @@ let
       };
     };
   };
-  inherit (pkgs.lib) concatStringsSep optional optionalString;
+  
+  inherit (pkgs.lib) concatStringsSep optionalString;
 
-  inherit (config.services.guestUsers) enable users includeRoot extraGroups;
+  cfg = config.services.guestUsers;
 
   userEntry = user:
   {
@@ -44,25 +45,29 @@ let
     home = "/home/${user}";
     createHome = true;
     group = "users";
-    extraGroups = extraGroups;
+    extraGroups = cfg.extraGroups;
     shell = "/bin/sh";
   };
 
-  nameString = (concatStringsSep " " users) + optionalString includeRoot " root";
+  nameString = (concatStringsSep " " cfg.users) + optionalString cfg.includeRoot " root";
 
 in 
 
-{
+pkgs.lib.mkIf cfg.enable {
   require = options;
 
-  system.activationScripts = pkgs.lib.fullDepEntry
-    ''
-      for i in ${nameString}; do
-          echo | ${pkgs.pwdutils}/bin/passwd --stdin $i
-      done
-    '' ["defaultPath" "users" "groups"];
+  system.activationScripts = {
+
+    clearPasswords = pkgs.lib.fullDepEntry
+      ''
+        for i in ${nameString}; do
+            echo | ${pkgs.pwdutils}/bin/passwd --stdin $i
+        done
+      '' ["defaultPath" "users" "groups"];
+
+  };
 
-  services.mingetty.helpLine = optionalString enable "\nThese users have empty passwords: ${nameString}";
+  services.mingetty.helpLine = "\nThese users have empty passwords: ${nameString}";
   
-  users.extraUsers = map userEntry users;
+  users.extraUsers = map userEntry cfg.users;
 }
-- 
GitLab


From fc9111fadf9b2b471f23d6336e3674ee23fab404 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 28 May 2009 15:03:05 +0000
Subject: [PATCH 1529/5331] * Move various system initialisation tasks (e.g.
 mounting filesystems,   initialising network interfaces, etc.) to
 modules/tasks.  This   follows the Upstart terminology: a service is a job
 that doesn't   usually terminate (e.g. a daemon), while a task is a job that
 does   some work and then exits.

svn path=/nixos/branches/modular-nixos/; revision=15771
---
 modules/legacy.nix                                         | 7 -------
 modules/module-list.nix                                    | 7 +++++++
 {upstart-jobs => modules/tasks}/filesystems.nix            | 0
 {upstart-jobs => modules/tasks}/kbd.nix                    | 0
 {upstart-jobs => modules/tasks}/lvm.nix                    | 0
 {upstart-jobs => modules/tasks}/network-interfaces.nix     | 0
 {upstart-jobs => modules/tasks}/swap.nix                   | 0
 {upstart-jobs => modules/tasks}/swraid.nix                 | 0
 {upstart-jobs => modules/tasks}/tty-backgrounds-combine.sh | 0
 {upstart-jobs => modules/tasks}/tty-backgrounds.nix        | 2 +-
 10 files changed, 8 insertions(+), 8 deletions(-)
 rename {upstart-jobs => modules/tasks}/filesystems.nix (100%)
 rename {upstart-jobs => modules/tasks}/kbd.nix (100%)
 rename {upstart-jobs => modules/tasks}/lvm.nix (100%)
 rename {upstart-jobs => modules/tasks}/network-interfaces.nix (100%)
 rename {upstart-jobs => modules/tasks}/swap.nix (100%)
 rename {upstart-jobs => modules/tasks}/swraid.nix (100%)
 rename {upstart-jobs => modules/tasks}/tty-backgrounds-combine.sh (100%)
 rename {upstart-jobs => modules/tasks}/tty-backgrounds.nix (98%)

diff --git a/modules/legacy.nix b/modules/legacy.nix
index 7a2f223fc98..c1f8a45d441 100644
--- a/modules/legacy.nix
+++ b/modules/legacy.nix
@@ -4,14 +4,7 @@
     ../system/nixos-environment.nix
     ../system/nixos-installer.nix
     ../upstart-jobs/cron/locate.nix
-    ../upstart-jobs/filesystems.nix
-    ../upstart-jobs/kbd.nix
     ../upstart-jobs/ldap
-    ../upstart-jobs/lvm.nix
-    ../upstart-jobs/network-interfaces.nix
     ../upstart-jobs/pcmcia.nix
-    ../upstart-jobs/swap.nix
-    ../upstart-jobs/swraid.nix
-    ../upstart-jobs/tty-backgrounds.nix
   ];
 }
diff --git a/modules/module-list.nix b/modules/module-list.nix
index 6a08aa276d4..05a81c76fa2 100644
--- a/modules/module-list.nix
+++ b/modules/module-list.nix
@@ -134,4 +134,11 @@
 # the argument named `runCommand' required by the function is missing
   ./system/upstart/tools.nix
   ./system/upstart/upstart.nix
+  ./tasks/filesystems.nix
+  ./tasks/kbd.nix
+  ./tasks/lvm.nix
+  ./tasks/network-interfaces.nix
+  ./tasks/swap.nix
+  ./tasks/swraid.nix
+  ./tasks/tty-backgrounds.nix
 ]
diff --git a/upstart-jobs/filesystems.nix b/modules/tasks/filesystems.nix
similarity index 100%
rename from upstart-jobs/filesystems.nix
rename to modules/tasks/filesystems.nix
diff --git a/upstart-jobs/kbd.nix b/modules/tasks/kbd.nix
similarity index 100%
rename from upstart-jobs/kbd.nix
rename to modules/tasks/kbd.nix
diff --git a/upstart-jobs/lvm.nix b/modules/tasks/lvm.nix
similarity index 100%
rename from upstart-jobs/lvm.nix
rename to modules/tasks/lvm.nix
diff --git a/upstart-jobs/network-interfaces.nix b/modules/tasks/network-interfaces.nix
similarity index 100%
rename from upstart-jobs/network-interfaces.nix
rename to modules/tasks/network-interfaces.nix
diff --git a/upstart-jobs/swap.nix b/modules/tasks/swap.nix
similarity index 100%
rename from upstart-jobs/swap.nix
rename to modules/tasks/swap.nix
diff --git a/upstart-jobs/swraid.nix b/modules/tasks/swraid.nix
similarity index 100%
rename from upstart-jobs/swraid.nix
rename to modules/tasks/swraid.nix
diff --git a/upstart-jobs/tty-backgrounds-combine.sh b/modules/tasks/tty-backgrounds-combine.sh
similarity index 100%
rename from upstart-jobs/tty-backgrounds-combine.sh
rename to modules/tasks/tty-backgrounds-combine.sh
diff --git a/upstart-jobs/tty-backgrounds.nix b/modules/tasks/tty-backgrounds.nix
similarity index 98%
rename from upstart-jobs/tty-backgrounds.nix
rename to modules/tasks/tty-backgrounds.nix
index d80de2eef70..1e5f8f08d95 100644
--- a/upstart-jobs/tty-backgrounds.nix
+++ b/modules/tasks/tty-backgrounds.nix
@@ -100,7 +100,7 @@ let
     themes = map (x: if x ? theme then (unpackTheme x.theme) else "default") backgrounds;
   };
 
-  unpackTheme = theme: import ../helpers/unpack-theme.nix {
+  unpackTheme = theme: import ../../helpers/unpack-theme.nix {
       inherit stdenv theme;
     };
 
-- 
GitLab


From c6c9304b95516ab2b5e2f62d6030b1653b8402f5 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 28 May 2009 16:03:48 +0000
Subject: [PATCH 1530/5331] * system/options.nix: gone :-)

svn path=/nixos/branches/modular-nixos/; revision=15772
---
 lib/eval-config.nix                  |   2 +-
 modules/system/upstart/upstart.nix   |   8 +-
 modules/tasks/kbd.nix                |  54 ++++---
 modules/tasks/network-interfaces.nix | 230 +++++++++++++++++----------
 system/options.nix                   |  84 ----------
 5 files changed, 182 insertions(+), 196 deletions(-)
 delete mode 100644 system/options.nix

diff --git a/lib/eval-config.nix b/lib/eval-config.nix
index e1cf7ac3cf6..6af1f2af81a 100644
--- a/lib/eval-config.nix
+++ b/lib/eval-config.nix
@@ -7,7 +7,7 @@
 rec {
   configComponents = [
     configuration
-    (import ../system/options.nix)
+    { require = import ../modules/module-list.nix; }
   ];
 
   config =
diff --git a/modules/system/upstart/upstart.nix b/modules/system/upstart/upstart.nix
index 84237d74408..ca9b6e2ddf5 100644
--- a/modules/system/upstart/upstart.nix
+++ b/modules/system/upstart/upstart.nix
@@ -58,13 +58,7 @@ let
 
   optional = cond: service: pkgs.lib.optional cond (makeJob service);
 
-  requiredTTYs = config.requiredTTYs;
-
-  jobs = map makeJob []
-
-  # User-defined events.
-  ++ (map makeJob (config.services.extraJobs));
-
+  jobs = map makeJob config.services.extraJobs;
   
   # Create an etc/event.d directory containing symlinks to the
   # specified list of Upstart job files.
diff --git a/modules/tasks/kbd.nix b/modules/tasks/kbd.nix
index 61dc93737af..42511a76156 100644
--- a/modules/tasks/kbd.nix
+++ b/modules/tasks/kbd.nix
@@ -1,7 +1,39 @@
 {pkgs, config, ...}:
 
 let
-  inherit (pkgs.lib) mkOption;
+
+###### interface
+
+  # most options are defined in i18n.nix
+
+  options = {
+
+    boot.extraTTYs = pkgs.lib.mkOption {
+      default = [];
+      example = [8 9];
+      description = "
+        Tty (virtual console) devices, in addition to the consoles on
+        which mingetty and syslogd run, that must be initialised.
+        Only useful if you have some program that you want to run on
+        some fixed console.  For example, the NixOS installation CD
+        opens the manual in a web browser on console 7, so it sets
+        <option>boot.extraTTYs</option> to <literal>[7]</literal>.
+      ";
+    };
+    
+    # dummy option so that requiredTTYs can be passed
+    requiredTTYs = pkgs.lib.mkOption {
+      default = [];
+      description = "
+        FIXME: find another place for this option.
+        FIXME: find a good description.
+      ";
+    };
+
+  };
+
+  
+###### implementation
 
   # think about where to put this chunk of code!
   # required by other pieces as well
@@ -16,26 +48,10 @@ let
 
 in
 
-###### implementation
-
-# most options are defined in i18n.nix
-
 {
+  require = [options];
 
-  inherit requiredTTYs; # pass them to upstart-job/default.nix
-
-  # dummy option so that requiredTTYs can be passed, see above (FIXME)
-  require = [
-    {
-      requiredTTYs = mkOption {
-        default = [];
-        description = "
-          FIXME: find another place for this option.
-          FIXME: find a good description.
-        ";
-      };
-    }
-  ];
+  inherit requiredTTYs; # pass them to ./modules/tasks/tty-backgrounds.nix
 
   services = {
     extraJobs = [{
diff --git a/modules/tasks/network-interfaces.nix b/modules/tasks/network-interfaces.nix
index 40803639331..4c57b48bd94 100644
--- a/modules/tasks/network-interfaces.nix
+++ b/modules/tasks/network-interfaces.nix
@@ -1,9 +1,70 @@
 {pkgs, config, ...}:
 
-###### implementation
-
 let
 
+  inherit (pkgs.lib) mkOption;
+
+
+###### interface
+
+  options = {
+
+    networking.hostName = mkOption {
+      default = "nixos";
+      description = "
+        The name of the machine.  Leave it empty if you want to obtain
+        it from a DHCP server (if using DHCP).
+      ";
+    };
+
+    networking.nativeIPv6 = mkOption {
+      default = false;
+      description = "
+        Whether to use IPv6 even though gw6c is not used. For example, 
+        for Postfix.
+      ";
+    };
+
+    networking.defaultGateway = mkOption {
+      default = "";
+      example = "131.211.84.1";
+      description = "
+        The default gateway.  It can be left empty if it is auto-detected through DHCP.
+      ";
+    };
+
+    networking.nameservers = mkOption {
+      default = [];
+      example = ["130.161.158.4" "130.161.33.17"];
+      description = "
+        The list of nameservers.  It can be left empty if it is auto-detected through DHCP.
+      ";
+    };
+
+    networking.domain = mkOption {
+      default = "";
+      example = "home";
+      description = "
+        The domain.  It can be left empty if it is auto-detected through DHCP.
+      ";
+    };
+
+    networking.localCommands = mkOption {
+      default = "";
+      example = "text=anything; echo You can put $text here.";
+      description = "
+        Shell commands to be executed at the end of the
+        <literal>network-interfaces</literal> Upstart job.  Note that if
+        you are using DHCP to obtain the network configuration,
+        interfaces may not be fully configured yet.
+      ";
+    };
+
+  };
+
+
+###### implementation
+
   inherit (pkgs) nettools wirelesstools bash writeText;
 
   cfg = config.networking;
@@ -18,92 +79,91 @@ let
 
 in 
 
-
 {
-  services = {
-    extraJobs = [{
-        name = "network-interfaces";
-        
-        job = ''
-          start on udev
-          stop on shutdown
-          
-          start script
-              export PATH=${modprobe}/sbin:$PATH
-              modprobe af_packet || true
-          
-              for i in $(cd /sys/class/net && ls -d *); do
-                  echo "Bringing up network device $i..."
-                  ${nettools}/sbin/ifconfig $i up || true
-              done
-          
-              # Configure the manually specified interfaces.
-              names=(${toString names})
-              ipAddresses=(${toString ipAddresses})
-              subnetMasks=(${toString subnetMasks})
-              essids=(${toString essids})
-              wepKeys=(${toString wepKeys})
-          
-              for ((n = 0; n < ''${#names[*]}; n++)); do
-                  name=''${names[$n]}
-                  ipAddress=''${ipAddresses[$n]}
-                  subnetMask=''${subnetMasks[$n]}
-                  essid=''${essids[$n]}
-                  wepKey=''${wepKeys[$n]}
-          
-                  # Set wireless networking stuff.
-                  if test "$essid" != default; then
-                      ${wirelesstools}/sbin/iwconfig "$name" essid "$essid" || true
-                  fi
-          
-                  if test "$wepKey" != nokey; then
-                      ${wirelesstools}/sbin/iwconfig "$name" key "$(cat "$wepKey")" || true
-                  fi
-          
-                  # Set IP address / netmask.        
-                  if test "$ipAddress" != dhcp; then
-                      echo "Configuring interface $name..."
-                      extraFlags=
-                      if test "$subnetMask" != default; then
-                          extraFlags="$extraFlags netmask $subnetMask"
-                      fi
-                      ${nettools}/sbin/ifconfig "$name" "$ipAddress" $extraFlags || true
-                  fi
-          
-              done
-          
-              # Set the nameservers.
-              if test -n "${toString cfg.nameservers}"; then
-                  rm -f /etc/resolv.conf
-                  if test -n "${cfg.domain}"; then
-                      echo "domain ${cfg.domain}" >> /etc/resolv.conf
+  require = [options];
+
+  services.extraJobs = [{
+    name = "network-interfaces";
+
+    job = ''
+      start on udev
+      stop on shutdown
+
+      start script
+          export PATH=${modprobe}/sbin:$PATH
+          modprobe af_packet || true
+
+          for i in $(cd /sys/class/net && ls -d *); do
+              echo "Bringing up network device $i..."
+              ${nettools}/sbin/ifconfig $i up || true
+          done
+
+          # Configure the manually specified interfaces.
+          names=(${toString names})
+          ipAddresses=(${toString ipAddresses})
+          subnetMasks=(${toString subnetMasks})
+          essids=(${toString essids})
+          wepKeys=(${toString wepKeys})
+
+          for ((n = 0; n < ''${#names[*]}; n++)); do
+              name=''${names[$n]}
+              ipAddress=''${ipAddresses[$n]}
+              subnetMask=''${subnetMasks[$n]}
+              essid=''${essids[$n]}
+              wepKey=''${wepKeys[$n]}
+
+              # Set wireless networking stuff.
+              if test "$essid" != default; then
+                  ${wirelesstools}/sbin/iwconfig "$name" essid "$essid" || true
+              fi
+
+              if test "$wepKey" != nokey; then
+                  ${wirelesstools}/sbin/iwconfig "$name" key "$(cat "$wepKey")" || true
+              fi
+
+              # Set IP address / netmask.        
+              if test "$ipAddress" != dhcp; then
+                  echo "Configuring interface $name..."
+                  extraFlags=
+                  if test "$subnetMask" != default; then
+                      extraFlags="$extraFlags netmask $subnetMask"
                   fi
-                  for i in ${toString cfg.nameservers}; do
-                      echo "nameserver $i" >> /etc/resolv.conf
-                  done
+                  ${nettools}/sbin/ifconfig "$name" "$ipAddress" $extraFlags || true
               fi
-          
-              # Set the default gateway.
-              if test -n "${cfg.defaultGateway}"; then
-                  ${nettools}/sbin/route add default gw "${cfg.defaultGateway}" || true
+
+          done
+
+          # Set the nameservers.
+          if test -n "${toString cfg.nameservers}"; then
+              rm -f /etc/resolv.conf
+              if test -n "${cfg.domain}"; then
+                  echo "domain ${cfg.domain}" >> /etc/resolv.conf
               fi
-          
-              # Run any user-specified commands.
-              ${bash}/bin/sh ${writeText "local-net-cmds" cfg.localCommands} || true
-          
-          end script
-          
-          # Hack: Upstart doesn't yet support what we want: a service that
-          # doesn't have a running process associated with it.
-          respawn sleep 100000
-          
-          stop script
-              for i in $(cd /sys/class/net && ls -d *); do
-                  echo "Taking down network device $i..."
-                  ${nettools}/sbin/ifconfig $i down || true
+              for i in ${toString cfg.nameservers}; do
+                  echo "nameserver $i" >> /etc/resolv.conf
               done
-          end script
-        '';
-    }];
-  };
+          fi
+
+          # Set the default gateway.
+          if test -n "${cfg.defaultGateway}"; then
+              ${nettools}/sbin/route add default gw "${cfg.defaultGateway}" || true
+          fi
+
+          # Run any user-specified commands.
+          ${bash}/bin/sh ${writeText "local-net-cmds" cfg.localCommands} || true
+
+      end script
+
+      # Hack: Upstart doesn't yet support what we want: a service that
+      # doesn't have a running process associated with it.
+      respawn sleep 100000
+
+      stop script
+          for i in $(cd /sys/class/net && ls -d *); do
+              echo "Taking down network device $i..."
+              ${nettools}/sbin/ifconfig $i down || true
+          done
+      end script
+    '';
+  }];
 }
diff --git a/system/options.nix b/system/options.nix
deleted file mode 100644
index 8c725255487..00000000000
--- a/system/options.nix
+++ /dev/null
@@ -1,84 +0,0 @@
-{pkgs, config, ...}:
-
-let
-  inherit (pkgs.lib) mkOption mergeOneOption;
-in
-
-{
-
-  boot = {
-
-    extraTTYs = mkOption {
-      default = [];
-      example = [8 9];
-      description = "
-        Tty (virtual console) devices, in addition to the consoles on
-        which mingetty and syslogd run, that must be initialised.
-        Only useful if you have some program that you want to run on
-        some fixed console.  For example, the NixOS installation CD
-        opens the manual in a web browser on console 7, so it sets
-        <option>boot.extraTTYs</option> to <literal>[7]</literal>.
-      ";
-    };
-
-  };
-
-
-  networking = {
-
-    hostName = mkOption {
-      default = "nixos";
-      description = "
-        The name of the machine.  Leave it empty if you want to obtain
-        it from a DHCP server (if using DHCP).
-      ";
-    };
-
-    nativeIPv6 = mkOption {
-      default = false;
-      description = "
-        Whether to use IPv6 even though gw6c is not used. For example, 
-        for Postfix.
-      ";
-    };
-
-    defaultGateway = mkOption {
-      default = "";
-      example = "131.211.84.1";
-      description = "
-        The default gateway.  It can be left empty if it is auto-detected through DHCP.
-      ";
-    };
-
-    nameservers = mkOption {
-      default = [];
-      example = ["130.161.158.4" "130.161.33.17"];
-      description = "
-        The list of nameservers.  It can be left empty if it is auto-detected through DHCP.
-      ";
-    };
-
-    domain = mkOption {
-      default = "";
-      example = "home";
-      description = "
-        The domain.  It can be left empty if it is auto-detected through DHCP.
-      ";
-    };
-
-    localCommands = mkOption {
-      default = "";
-      example = "text=anything; echo You can put $text here.";
-      description = "
-        Shell commands to be executed at the end of the
-        <literal>network-interfaces</literal> Upstart job.  Note that if
-        you are using DHCP to obtain the network configuration,
-        interfaces may not be fully configured yet.
-      ";
-    };
-
-  };
-
-
-  require = import ../modules/module-list.nix;
-}
-- 
GitLab


From 107fc990a6c868d33f7ead4caf6b39918588526c Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 28 May 2009 16:20:08 +0000
Subject: [PATCH 1531/5331] * More cleanup.

svn path=/nixos/branches/modular-nixos/; revision=15773
---
 lib/eval-config.nix                               | 11 ++++++++++-
 modules/legacy.nix                                |  2 --
 .../assertion.nix => modules/misc/assertions.nix  |  0
 modules/module-list.nix                           |  1 +
 system/nixos-environment.nix                      | 15 ---------------
 5 files changed, 11 insertions(+), 18 deletions(-)
 rename system/assertion.nix => modules/misc/assertions.nix (100%)
 delete mode 100644 system/nixos-environment.nix

diff --git a/lib/eval-config.nix b/lib/eval-config.nix
index 6af1f2af81a..87211875456 100644
--- a/lib/eval-config.nix
+++ b/lib/eval-config.nix
@@ -7,7 +7,16 @@
 rec {
   configComponents = [
     configuration
-    { require = import ../modules/module-list.nix; }
+    {
+      require = import ../modules/module-list.nix;
+      environment.checkConfigurationOptions = pkgs.lib.mkOption {
+        default = true;
+        example = false;
+        description = ''
+          Whether to check the validity of the entire configuration.
+        '';
+      };
+    }
   ];
 
   config =
diff --git a/modules/legacy.nix b/modules/legacy.nix
index c1f8a45d441..e20caaf1116 100644
--- a/modules/legacy.nix
+++ b/modules/legacy.nix
@@ -1,7 +1,5 @@
 {
   require = [
-    ../system/assertion.nix
-    ../system/nixos-environment.nix
     ../system/nixos-installer.nix
     ../upstart-jobs/cron/locate.nix
     ../upstart-jobs/ldap
diff --git a/system/assertion.nix b/modules/misc/assertions.nix
similarity index 100%
rename from system/assertion.nix
rename to modules/misc/assertions.nix
diff --git a/modules/module-list.nix b/modules/module-list.nix
index 05a81c76fa2..996ec24b62f 100644
--- a/modules/module-list.nix
+++ b/modules/module-list.nix
@@ -10,6 +10,7 @@
   ./config/users-groups.nix
   ./installer/grub/grub.nix
   ./legacy.nix
+  ./misc/assertions.nix
   ./programs/bash/bash.nix
   ./programs/pwdutils/pwdutils.nix
   ./programs/ssh.nix
diff --git a/system/nixos-environment.nix b/system/nixos-environment.nix
deleted file mode 100644
index d07d401d8e5..00000000000
--- a/system/nixos-environment.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-{pkgs, config, ...}:
-
-with pkgs.lib;
-
-{
-  environment = {
-    checkConfigurationOptions = mkOption {
-      default = true;
-      example = false;
-      description = "
-        If all configuration options must be checked. Non-existing options fail build.
-      ";
-    };
-  };
-}
-- 
GitLab


From 48e7f85acb783b7939aa3b97e216a3b5ba25cf5e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Thu, 28 May 2009 22:02:47 +0000
Subject: [PATCH 1532/5331] Allowing the system bashrc not to be parsed, if an
 env variable exists. I think bash used not to include the system bashrc on
 "--rcfile myrc", but as now it doesn't allow it anymore, let's go on the env
 variable.

svn path=/nixos/trunk/; revision=15779
---
 etc/bashrc.sh | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/etc/bashrc.sh b/etc/bashrc.sh
index 38f839f4476..71e2ff001db 100644
--- a/etc/bashrc.sh
+++ b/etc/bashrc.sh
@@ -1,3 +1,6 @@
+if [ -n "$NOSYSBASHRC" ]; then
+  return
+fi
 # Initialise a bunch of environment variables.
 export PATH=/var/run/current-system/sw/bin:/var/run/current-system/sw/sbin
 export LD_LIBRARY_PATH=/var/run/opengl-driver/lib
-- 
GitLab


From 19e0f46b0e8b6826cd6c6f11b5ed664606c41c2d Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 29 May 2009 10:04:04 +0000
Subject: [PATCH 1533/5331] * One down, three to go.

svn path=/nixos/branches/modular-nixos/; revision=15784
---
 .../default.nix => modules/config/ldap.nix    | 22 +++++++++----------
 modules/legacy.nix                            |  1 -
 modules/module-list.nix                       |  1 +
 upstart-jobs/ldap/ldap.conf.nix               | 18 ---------------
 4 files changed, 12 insertions(+), 30 deletions(-)
 rename upstart-jobs/ldap/default.nix => modules/config/ldap.nix (81%)
 delete mode 100644 upstart-jobs/ldap/ldap.conf.nix

diff --git a/upstart-jobs/ldap/default.nix b/modules/config/ldap.nix
similarity index 81%
rename from upstart-jobs/ldap/default.nix
rename to modules/config/ldap.nix
index 4c964cd79f2..3bf1aa9d74d 100644
--- a/upstart-jobs/ldap/default.nix
+++ b/modules/config/ldap.nix
@@ -57,19 +57,19 @@ mkIf config.users.ldap.enable {
 
       # Careful: OpenLDAP seems to be very picky about the indentation of
       # this file.  Directives HAVE to start in the first column!
-      { source = pkgs.writeText "ldap.conf" ''
-        uri ${config.users.ldap.server}
-        base ${config.users.ldap.base}
-        
-        ${
-        if config.users.ldap.useTLS then ''
-        ssl start_tls
-        tls_checkpeer no
-        '' else ""
-        }
-      '';
+      { source = pkgs.writeText "ldap.conf"
+          ''
+            uri ${config.users.ldap.server}
+            base ${config.users.ldap.base}
+
+            ${if config.users.ldap.useTLS then ''
+              ssl start_tls
+              tls_checkpeer no
+            '' else ""}
+          '';
         target = "ldap.conf";
       }
+      
     ];
   };
 
diff --git a/modules/legacy.nix b/modules/legacy.nix
index e20caaf1116..a4da194288a 100644
--- a/modules/legacy.nix
+++ b/modules/legacy.nix
@@ -2,7 +2,6 @@
   require = [
     ../system/nixos-installer.nix
     ../upstart-jobs/cron/locate.nix
-    ../upstart-jobs/ldap
     ../upstart-jobs/pcmcia.nix
   ];
 }
diff --git a/modules/module-list.nix b/modules/module-list.nix
index 996ec24b62f..9d2fd9b6955 100644
--- a/modules/module-list.nix
+++ b/modules/module-list.nix
@@ -2,6 +2,7 @@
   ./config/fonts.nix
   ./config/guest-users.nix
   ./config/i18n.nix
+  ./config/ldap.nix
   ./config/networking.nix
   ./config/nsswitch.nix
   ./config/system-path.nix
diff --git a/upstart-jobs/ldap/ldap.conf.nix b/upstart-jobs/ldap/ldap.conf.nix
deleted file mode 100644
index b4113b80ec0..00000000000
--- a/upstart-jobs/ldap/ldap.conf.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-{writeText, config}:
-
-# Careful: OpenLDAP seems to be very picky about the indentation of
-# this file.  Directives HAVE to start in the first column!
-
-writeText "ldap.conf" "
-
-uri ${config.users.ldap.server}
-base ${config.users.ldap.base}
-  
-${
-if config.users.ldap.useTLS then "
-ssl start_tls
-tls_checkpeer no
-" else ""
-}
-
-"
-- 
GitLab


From df96e5c456f981e0f24cd8f3ad04e5b4c61ece91 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 29 May 2009 12:24:48 +0000
Subject: [PATCH 1534/5331] * Move nixos-checkout into its own module.

svn path=/nixos/branches/modular-nixos/; revision=15787
---
 installer/default.nix                         | 13 +--
 installer/nixos-rebuild.sh                    |  4 +-
 modules/config/system-path.nix                |  1 -
 .../installer}/nixos-checkout.nix             | 90 ++++++++++++++++++-
 modules/module-list.nix                       |  1 +
 system/nixos-installer.nix                    | 56 ------------
 6 files changed, 90 insertions(+), 75 deletions(-)
 rename {installer => modules/installer}/nixos-checkout.nix (52%)

diff --git a/installer/default.nix b/installer/default.nix
index f6f1f920574..214c5e0a164 100644
--- a/installer/default.nix
+++ b/installer/default.nix
@@ -9,12 +9,6 @@ let
     isExecutable = true;
   });
 
-
-  nixosCheckout = (import ./nixos-checkout.nix) {
-    inherit pkgs config makeProg;
-  };
-
-
 in
 
 {
@@ -34,10 +28,7 @@ in
       "cp refs $out";
   };
 
-  nixosRebuild = let inherit (nixosCheckout) repos defaultRepo;
-                 in makeProg {
-    defaultNIXOS   = (defaultRepo repos.nixos  ).target;
-    defaultNIXPKGS = (defaultRepo repos.nixpkgs).target;
+  nixosRebuild = makeProg {
     name = "nixos-rebuild";
     src = ./nixos-rebuild.sh;
   };
@@ -47,8 +38,6 @@ in
     src = ./nixos-gen-seccure-keys.sh;
   };
 
-  inherit (nixosCheckout) nixosCheckout;
-
   nixosHardwareScan = makeProg {
     name = "nixos-hardware-scan";
     src = ./nixos-hardware-scan.pl;
diff --git a/installer/nixos-rebuild.sh b/installer/nixos-rebuild.sh
index 06a7a4d39fc..cd6a3569895 100644
--- a/installer/nixos-rebuild.sh
+++ b/installer/nixos-rebuild.sh
@@ -2,8 +2,8 @@
 
 # Allow the location of NixOS sources and the system configuration
 # file to be overridden.
-NIXOS=${NIXOS:-@defaultNIXOS@}
-NIXPKGS=${NIXPKGS:-@defaultNIXPKGS@}
+NIXOS=${NIXOS:-/etc/nixos/nixos}
+NIXPKGS=${NIXPKGS:-/etc/nixos/nixpkgs}
 NIXOS_CONFIG=${NIXOS_CONFIG:-/etc/nixos/configuration.nix}
 export NIXPKGS # must be exported so that a non default location is passed to nixos/default.nix
 
diff --git a/modules/config/system-path.nix b/modules/config/system-path.nix
index c5708a53062..c8f1f787993 100644
--- a/modules/config/system-path.nix
+++ b/modules/config/system-path.nix
@@ -19,7 +19,6 @@ let
       config.environment.nix
       nixosTools.nixosInstall
       nixosTools.nixosRebuild
-      nixosTools.nixosCheckout
       nixosTools.nixosHardwareScan
       nixosTools.nixosGenSeccureKeys
       pkgs.acl
diff --git a/installer/nixos-checkout.nix b/modules/installer/nixos-checkout.nix
similarity index 52%
rename from installer/nixos-checkout.nix
rename to modules/installer/nixos-checkout.nix
index 08a7a829852..290a4d6b2eb 100644
--- a/installer/nixos-checkout.nix
+++ b/modules/installer/nixos-checkout.nix
@@ -1,8 +1,81 @@
-args : with args;
+# This module generates the nixos-checkout script, which replaces the
+# NixOS and Nixpkgs source trees in /etc/nixos/{nixos,nixpkgs} with
+# Subversion checkouts.
+
+{config, pkgs, ...}:
 
 with pkgs.lib;
 
-rec {
+let
+
+  options = {
+
+    # !!! These option (and their implementation) seems
+    # over-engineering.  nixos-checkout was never intended to be a
+    # generic, "check out anything that the user want to have from any
+    # version management system whatsoever", but merely a trivial
+    # convenience script to checkout the NixOS and Nixpkgs trees
+    # during or after a NixOS installation.
+    installer.repos.nixos = mkOption {
+      default = [ { type  = "svn"; } ];
+      example =
+        [ { type = "svn"; url = "https://svn.nixos.org/repos/nix/nixos/branches/stdenv-updates"; target = "/etc/nixos/nixos-stdenv-updates"; }
+          { type = "git"; initialize = ''git clone git://mawercer.de/nixos $target''; update = "git pull origin"; target = "/etc/nixos/nixos-git"; }
+        ];
+      description = ''
+        The NixOS repository from which the system will be built.
+        <command>nixos-checkout</command> will update all working
+        copies of the given repositories,
+        <command>nixos-rebuild</command> will use the first item
+        which has the attribute <literal>default = true</literal>
+        falling back to the first item. The type defines the
+        repository tool added to the path. It also defines a "valid"
+        repository.  If the target directory already exists and it's
+        not valid it will be moved to the backup location
+        <filename><replaceable>dir</replaceable>-date</filename>.
+        For svn the default target and repositories are
+        <filename>/etc/nixos/nixos</filename> and
+        <filename>https://svn.nixos.org/repos/nix/nixos/trunk</filename>.
+        For git repositories update is called after initialization
+        when the repo is initialized.  The initialize code is run
+        from working directory dirname
+        <replaceable>target</replaceable> and should create the
+        directory
+        <filename><replaceable>dir</replaceable></filename>. (<command>git
+        clone url nixos/nixpkgs/services</command> should do) For
+        the executables used see <option>repoTypes</option>.
+      '';
+    };
+
+    installer.repos.nixpkgs = mkOption {
+      default = [ { type  = "svn"; }  ];
+      description = "same as <option>repos.nixos</option>";
+    };
+
+    installer.repos.services = mkOption {
+      default = [ { type  = "svn"; } ];
+      description = "same as <option>repos.nixos</option>";
+    };
+
+    installer.repoTypes = mkOption {
+      default = {
+        svn = { valid = "[ -d .svn ]"; env = [ pkgs.coreutils pkgs.subversion ]; };
+        git = { valid = "[ -d .git ]"; env = [ pkgs.coreutils pkgs.git pkgs.gnused /*  FIXME: use full path to sed in nix-pull */ ]; };
+      };
+      description = ''
+        Defines, for each supported version control system
+        (e.g. <literal>git</literal>), the dependencies for the
+        mechanism, as well as a test used to determine whether a
+        directory is a checkout created by that version control
+        system.
+      '';
+    };
+      
+  };
+
+
+  ### implementation
+
   # prepareRepoAttrs adds svn defaults and preparse the repo attribute sets so that they
   # returns in any case:
   # { type = git/svn; 
@@ -54,9 +127,10 @@ rec {
                               ++ list );
 
   # creates the nixos-checkout script 
-  nixosCheckout =
-    makeProg {
+  nixosCheckout = pkgs.substituteAll {
     name = "nixos-checkout";
+    dir = "bin";
+    isExecutable = true;
     src = pkgs.writeScript "nixos-checkout" (''
           #! @shell@ -e
           # this file is automatically generated from nixos configuration file settings (installer.repos)
@@ -85,4 +159,12 @@ rec {
                ( concatLists  (flattenAttrs repos) )
       );
    };
+  
+  
+in
+
+{
+  require = options;
+
+  environment.extraPackages = [nixosCheckout];
 }
diff --git a/modules/module-list.nix b/modules/module-list.nix
index 9d2fd9b6955..9319fd703d8 100644
--- a/modules/module-list.nix
+++ b/modules/module-list.nix
@@ -10,6 +10,7 @@
   ./config/unix-odbc-drivers.nix
   ./config/users-groups.nix
   ./installer/grub/grub.nix
+  ./installer/nixos-checkout.nix
   ./legacy.nix
   ./misc/assertions.nix
   ./programs/bash/bash.nix
diff --git a/system/nixos-installer.nix b/system/nixos-installer.nix
index b3d92e339d3..046a9343309 100644
--- a/system/nixos-installer.nix
+++ b/system/nixos-installer.nix
@@ -15,62 +15,6 @@ let
         ";
       };
 
-      repos = {
-        nixos = mkOption {
-          default = [ { type  = "svn"; }  ];
-          example = [ { type = "svn"; url = "https://svn.nixos.org/repos/nix/nixos/branches/stdenv-updates"; target = "/etc/nixos/nixos-stdenv-updates"; }
-                      { type = "git"; initialize = ''git clone git://mawercer.de/nixos $target''; update = "git pull origin"; target = "/etc/nixos/nixos-git"; }
-                    ];
-          description = ''
-            The NixOS repository from which the system will be built.
-            <command>nixos-checkout</command> will update all working
-            copies of the given repositories,
-            <command>nixos-rebuild</command> will use the first item
-            which has the attribute <literal>default = true</literal>
-            falling back to the first item. The type defines the
-            repository tool added to the path. It also defines a "valid"
-            repository.  If the target directory already exists and it's
-            not valid it will be moved to the backup location
-            <filename><replaceable>dir</replaceable>-date</filename>.
-            For svn the default target and repositories are
-            <filename>/etc/nixos/nixos</filename> and
-            <filename>https://svn.nixos.org/repos/nix/nixos/trunk</filename>.
-            For git repositories update is called after initialization
-            when the repo is initialized.  The initialize code is run
-            from working directory dirname
-            <replaceable>target</replaceable> and should create the
-            directory
-            <filename><replaceable>dir</replaceable></filename>. (<command>git
-            clone url nixos/nixpkgs/services</command> should do) For
-            the executables used see <option>repoTypes</option>.
-          '';
-        };
-
-        nixpkgs = mkOption {
-          default = [ { type  = "svn"; }  ];
-          description = "same as <option>repos.nixos</option>";
-        };
-
-        services = mkOption {
-          default = [ { type  = "svn"; } ];
-          description = "same as <option>repos.nixos</option>";
-        };
-      };
-
-      repoTypes = mkOption {
-        default = {
-          svn = { valid = "[ -d .svn ]"; env = [ pkgs.coreutils pkgs.subversion ]; };
-          git = { valid = "[ -d .git ]"; env = [ pkgs.coreutils pkgs.git pkgs.gnused /*  FIXME: use full path to sed in nix-pull */ ]; };
-        };
-        description = ''
-          Defines, for each supported version control system
-          (e.g. <literal>git</literal>), the dependencies for the
-          mechanism, as well as a test used to determine whether a
-          directory is a checkout created by that version control
-          system.
-        '';
-      };
-
       manifests = mkOption {
         default = [http://nixos.org/releases/nixpkgs/channels/nixpkgs-unstable/MANIFEST];
         example =
-- 
GitLab


From f36643b6c29bd83c4508d2509e9a914c4b0dc687 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 29 May 2009 12:41:29 +0000
Subject: [PATCH 1535/5331] * Move the installer tools to
 modules/installer/tools.

svn path=/nixos/branches/modular-nixos/; revision=15788
---
 installer/default.nix                         | 47 -------------------
 modules/config/system-path.nix                | 10 ----
 .../installer/{ => tools}/nixos-checkout.nix  |  0
 .../tools}/nixos-gen-seccure-keys.sh          |  0
 .../installer/tools}/nixos-hardware-scan.pl   |  0
 .../installer/tools}/nixos-install.sh         |  0
 .../installer/tools}/nixos-rebuild.sh         |  0
 modules/legacy.nix                            |  1 -
 modules/module-list.nix                       |  3 +-
 system/nixos-installer.nix                    | 41 ----------------
 10 files changed, 2 insertions(+), 100 deletions(-)
 delete mode 100644 installer/default.nix
 rename modules/installer/{ => tools}/nixos-checkout.nix (100%)
 rename {installer => modules/installer/tools}/nixos-gen-seccure-keys.sh (100%)
 rename {installer => modules/installer/tools}/nixos-hardware-scan.pl (100%)
 rename {installer => modules/installer/tools}/nixos-install.sh (100%)
 rename {installer => modules/installer/tools}/nixos-rebuild.sh (100%)
 delete mode 100644 system/nixos-installer.nix

diff --git a/installer/default.nix b/installer/default.nix
deleted file mode 100644
index 214c5e0a164..00000000000
--- a/installer/default.nix
+++ /dev/null
@@ -1,47 +0,0 @@
-{pkgs, config}:
-
-let
-
-  nix = config.environment.nix;
-
-  makeProg = args: pkgs.substituteAll (args // {
-    dir = "bin";
-    isExecutable = true;
-  });
-
-in
-
-{
-
-  nixosInstall = makeProg {
-    name = "nixos-install";
-    src = ./nixos-install.sh;
-
-    inherit (pkgs) perl;
-    inherit nix;
-    nixpkgsURL = config.installer.nixpkgsURL;
-
-    pathsFromGraph = "${pkgs.path}/build-support/kernel/paths-from-graph.pl";
-
-    nixClosure = pkgs.runCommand "closure"
-      {exportReferencesGraph = ["refs" nix];}
-      "cp refs $out";
-  };
-
-  nixosRebuild = makeProg {
-    name = "nixos-rebuild";
-    src = ./nixos-rebuild.sh;
-  };
-
-  nixosGenSeccureKeys = makeProg {
-    name = "nixos-gen-seccure-keys";
-    src = ./nixos-gen-seccure-keys.sh;
-  };
-
-  nixosHardwareScan = makeProg {
-    name = "nixos-hardware-scan";
-    src = ./nixos-hardware-scan.pl;
-    inherit (pkgs) perl;
-  };
-
-}
diff --git a/modules/config/system-path.nix b/modules/config/system-path.nix
index c8f1f787993..e85382606da 100644
--- a/modules/config/system-path.nix
+++ b/modules/config/system-path.nix
@@ -7,20 +7,10 @@ with pkgs.lib;
 
 let
 
-  # NixOS installation/updating tools.
-  nixosTools = import ../../installer {
-    inherit pkgs config;
-  };
-
-  
   systemPackages =
     [ config.system.sbin.modprobe # must take precedence over module_init_tools
       config.system.sbin.mount # must take precedence over util-linux
       config.environment.nix
-      nixosTools.nixosInstall
-      nixosTools.nixosRebuild
-      nixosTools.nixosHardwareScan
-      nixosTools.nixosGenSeccureKeys
       pkgs.acl
       pkgs.attr
       pkgs.bashInteractive # bash with ncurses support
diff --git a/modules/installer/nixos-checkout.nix b/modules/installer/tools/nixos-checkout.nix
similarity index 100%
rename from modules/installer/nixos-checkout.nix
rename to modules/installer/tools/nixos-checkout.nix
diff --git a/installer/nixos-gen-seccure-keys.sh b/modules/installer/tools/nixos-gen-seccure-keys.sh
similarity index 100%
rename from installer/nixos-gen-seccure-keys.sh
rename to modules/installer/tools/nixos-gen-seccure-keys.sh
diff --git a/installer/nixos-hardware-scan.pl b/modules/installer/tools/nixos-hardware-scan.pl
similarity index 100%
rename from installer/nixos-hardware-scan.pl
rename to modules/installer/tools/nixos-hardware-scan.pl
diff --git a/installer/nixos-install.sh b/modules/installer/tools/nixos-install.sh
similarity index 100%
rename from installer/nixos-install.sh
rename to modules/installer/tools/nixos-install.sh
diff --git a/installer/nixos-rebuild.sh b/modules/installer/tools/nixos-rebuild.sh
similarity index 100%
rename from installer/nixos-rebuild.sh
rename to modules/installer/tools/nixos-rebuild.sh
diff --git a/modules/legacy.nix b/modules/legacy.nix
index a4da194288a..245b78384ac 100644
--- a/modules/legacy.nix
+++ b/modules/legacy.nix
@@ -1,6 +1,5 @@
 {
   require = [
-    ../system/nixos-installer.nix
     ../upstart-jobs/cron/locate.nix
     ../upstart-jobs/pcmcia.nix
   ];
diff --git a/modules/module-list.nix b/modules/module-list.nix
index 9319fd703d8..85d904493a4 100644
--- a/modules/module-list.nix
+++ b/modules/module-list.nix
@@ -10,7 +10,8 @@
   ./config/unix-odbc-drivers.nix
   ./config/users-groups.nix
   ./installer/grub/grub.nix
-  ./installer/nixos-checkout.nix
+  ./installer/tools/nixos-checkout.nix
+  ./installer/tools/tools.nix
   ./legacy.nix
   ./misc/assertions.nix
   ./programs/bash/bash.nix
diff --git a/system/nixos-installer.nix b/system/nixos-installer.nix
deleted file mode 100644
index 046a9343309..00000000000
--- a/system/nixos-installer.nix
+++ /dev/null
@@ -1,41 +0,0 @@
-{pkgs, config, ...}:
-
-###### interface
-let
-  inherit (pkgs.lib) mkOption mkIf;
-
-  options = {
-    installer = {
-      nixpkgsURL = mkOption {
-        default = "";
-        example = http://nixos.org/releases/nix/nixpkgs-0.11pre7577;
-        description = "
-          URL of the Nixpkgs distribution to use when building the
-          installation CD.
-        ";
-      };
-
-      manifests = mkOption {
-        default = [http://nixos.org/releases/nixpkgs/channels/nixpkgs-unstable/MANIFEST];
-        example =
-          [ http://nixos.org/releases/nixpkgs/channels/nixpkgs-unstable/MANIFEST
-            http://nixos.org/releases/nixpkgs/channels/nixpkgs-stable/MANIFEST
-          ];
-        description = "
-          URLs of manifests to be downloaded when you run
-          <command>nixos-rebuild</command> to speed up builds.
-        ";
-      };
-    };
-  };
-
-
-in
-
-###### implementation
-
-{
-  require = [
-    options
-  ];
-}
-- 
GitLab


From 0da38f14f52f494122b3f8e5b555de15d9e4de23 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 29 May 2009 12:43:29 +0000
Subject: [PATCH 1536/5331] * Forgot to commit.

svn path=/nixos/branches/modular-nixos/; revision=15789
---
 modules/installer/tools/tools.nix | 85 +++++++++++++++++++++++++++++++
 1 file changed, 85 insertions(+)
 create mode 100644 modules/installer/tools/tools.nix

diff --git a/modules/installer/tools/tools.nix b/modules/installer/tools/tools.nix
new file mode 100644
index 00000000000..b9f643ccca6
--- /dev/null
+++ b/modules/installer/tools/tools.nix
@@ -0,0 +1,85 @@
+# This module generates nixos-install, nixos-rebuild,
+# nixos-hardware-scan, etc.
+
+{config, pkgs, ...}:
+
+let
+
+  ### interface
+
+  options = {
+  
+    installer.nixpkgsURL = pkgs.lib.mkOption {
+      default = "";
+      example = http://nixos.org/releases/nix/nixpkgs-0.11pre7577;
+      description = ''
+        URL of the Nixpkgs distribution to use when building the
+        installation CD.
+      '';
+    };
+
+    installer.manifests = pkgs.lib.mkOption {
+      default = [http://nixos.org/releases/nixpkgs/channels/nixpkgs-unstable/MANIFEST];
+      example =
+        [ http://nixos.org/releases/nixpkgs/channels/nixpkgs-unstable/MANIFEST
+          http://nixos.org/releases/nixpkgs/channels/nixpkgs-stable/MANIFEST
+        ];
+      description = ''
+        URLs of manifests to be downloaded when you run
+        <command>nixos-rebuild</command> to speed up builds.
+      '';
+    };
+    
+  };
+
+
+  ### implementation
+
+  makeProg = args: pkgs.substituteAll (args // {
+    dir = "bin";
+    isExecutable = true;
+  });
+  
+  nixosInstall = makeProg {
+    name = "nixos-install";
+    src = ./nixos-install.sh;
+
+    inherit (pkgs) perl;
+    nix = config.environment.nix;
+    nixpkgsURL = config.installer.nixpkgsURL;
+
+    pathsFromGraph = "${pkgs.path}/build-support/kernel/paths-from-graph.pl";
+
+    nixClosure = pkgs.runCommand "closure"
+      {exportReferencesGraph = ["refs" config.environment.nix];}
+      "cp refs $out";
+  };
+
+  nixosRebuild = makeProg {
+    name = "nixos-rebuild";
+    src = ./nixos-rebuild.sh;
+  };
+
+  nixosGenSeccureKeys = makeProg {
+    name = "nixos-gen-seccure-keys";
+    src = ./nixos-gen-seccure-keys.sh;
+  };
+
+  nixosHardwareScan = makeProg {
+    name = "nixos-hardware-scan";
+    src = ./nixos-hardware-scan.pl;
+    inherit (pkgs) perl;
+  };
+
+in
+
+{
+  require = options;
+
+  environment.extraPackages =
+    [ nixosInstall
+      nixosRebuild
+      nixosHardwareScan
+      nixosGenSeccureKeys
+    ];
+}
-- 
GitLab


From 548fb6a1a589d98d61bbb42750fcaba500be566b Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 29 May 2009 13:15:31 +0000
Subject: [PATCH 1537/5331] * Move the optional parts of the system path to the
 appropriate   modules.

svn path=/nixos/branches/modular-nixos/; revision=15791
---
 modules/config/fonts.nix          |  3 +++
 modules/config/nsswitch.nix       |  6 ++++++
 modules/config/system-path.nix    | 16 ++++------------
 modules/installer/tools/tools.nix |  2 +-
 4 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/modules/config/fonts.nix b/modules/config/fonts.nix
index f03d457a8bc..47e505b3cb5 100644
--- a/modules/config/fonts.nix
+++ b/modules/config/fonts.nix
@@ -173,4 +173,7 @@ in
     '' 
       export FONTCONFIG_FILE=/etc/fonts/fonts.conf
     '';
+
+  environment.systemPackages =
+    pkgs.lib.optional config.fonts.enableFontDir config.system.build.x11Fonts;
 }
diff --git a/modules/config/nsswitch.nix b/modules/config/nsswitch.nix
index 2a37903f7f3..cac6ff382a4 100644
--- a/modules/config/nsswitch.nix
+++ b/modules/config/nsswitch.nix
@@ -53,4 +53,10 @@ in
         LD_LIBRARY_PATH=${config.system.nssModules.path}:$LD_LIBRARY_PATH
       ''
     else "";
+
+  # NSS modules need to be in `systemPath' so that (i) the builder
+  # chroot gets to seem them, and (ii) applications can benefit from
+  # changes in the list of NSS modules at run-time, without requiring
+  # a reboot.
+  environment.systemPackages = [config.system.nssModules.list];
 }
diff --git a/modules/config/system-path.nix b/modules/config/system-path.nix
index e85382606da..3b2867fbb95 100644
--- a/modules/config/system-path.nix
+++ b/modules/config/system-path.nix
@@ -7,7 +7,7 @@ with pkgs.lib;
 
 let
 
-  systemPackages =
+  requiredPackages =
     [ config.system.sbin.modprobe # must take precedence over module_init_tools
       config.system.sbin.mount # must take precedence over util-linux
       config.environment.nix
@@ -58,16 +58,7 @@ let
       pkgs.utillinux
       pkgs.wirelesstools
       (import ../../helpers/info-wrapper.nix {inherit (pkgs) bash texinfo writeScriptBin;})
-    ]
-    ++ pkgs.lib.optional config.services.bitlbee.enable pkgs.bitlbee
-    ++ config.environment.extraPackages
-    ++ pkgs.lib.optional config.fonts.enableFontDir config.system.build.x11Fonts
-
-    # NSS modules need to be in `systemPath' so that (i) the builder
-    # chroot gets to seem them, and (ii) applications can benefit from
-    # changes in the list of NSS modules at run-time, without requiring
-    # a reboot.
-    ++ config.system.nssModules.list;
+    ] ++ config.environment.extraPackages;
 
       
   options = {
@@ -75,7 +66,6 @@ let
     environment = {
 
       systemPackages = mkOption {
-        default = systemPackages;
         description = ''
           The set of packages that appear in
           /var/run/current-system/sw.  These packages are
@@ -135,4 +125,6 @@ in
 
 {
   require = [options];
+
+  environment.systemPackages = requiredPackages;
 }
diff --git a/modules/installer/tools/tools.nix b/modules/installer/tools/tools.nix
index b9f643ccca6..2f91ef2c629 100644
--- a/modules/installer/tools/tools.nix
+++ b/modules/installer/tools/tools.nix
@@ -76,7 +76,7 @@ in
 {
   require = options;
 
-  environment.extraPackages =
+  environment.systemPackages =
     [ nixosInstall
       nixosRebuild
       nixosHardwareScan
-- 
GitLab


From 81d8c2e1c8d4c32f2485e24b286cca67cc66e1b0 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 29 May 2009 13:29:49 +0000
Subject: [PATCH 1538/5331] * Move the info wrapper into a module.

svn path=/nixos/branches/modular-nixos/; revision=15792
---
 helpers/info-wrapper.nix       | 29 ---------------------------
 modules/config/system-path.nix |  1 -
 modules/module-list.nix        |  1 +
 modules/programs/info.nix      | 36 ++++++++++++++++++++++++++++++++++
 4 files changed, 37 insertions(+), 30 deletions(-)
 delete mode 100644 helpers/info-wrapper.nix
 create mode 100644 modules/programs/info.nix

diff --git a/helpers/info-wrapper.nix b/helpers/info-wrapper.nix
deleted file mode 100644
index 0f482dd4c27..00000000000
--- a/helpers/info-wrapper.nix
+++ /dev/null
@@ -1,29 +0,0 @@
-# Quick hack to make the `info' command work properly.  `info' needs a
-# "dir" file containing all the installed Info files, which we don't
-# have (it would be impure to have a package installation update some
-# global "dir" file).  So this wrapper script around "info" builds a
-# temporary "dir" file on the fly.  This is a bit slow (on a cold
-# cache) but not unacceptably so.
-
-{bash, texinfo, writeScriptBin}:
-
-writeScriptBin "info"
-  ''
-    #! ${bash}/bin/sh
-  
-    dir=$(mktemp --tmpdir -d "info.dir.XXXXXX")
-
-    if test -z "$dir"; then exit 1; fi
-
-    trap 'rm -rf "$dir"' EXIT
-
-    shopt -s nullglob
-
-    for i in $(IFS=:; echo $INFOPATH); do
-        for j in $i/*.info; do
-            ${texinfo}/bin/install-info --quiet $j $dir/dir
-        done
-    done
-
-    INFOPATH=$dir:$INFOPATH ${texinfo}/bin/info "$@"
-  ''
diff --git a/modules/config/system-path.nix b/modules/config/system-path.nix
index 3b2867fbb95..4d16b38a1f5 100644
--- a/modules/config/system-path.nix
+++ b/modules/config/system-path.nix
@@ -57,7 +57,6 @@ let
       pkgs.usbutils
       pkgs.utillinux
       pkgs.wirelesstools
-      (import ../../helpers/info-wrapper.nix {inherit (pkgs) bash texinfo writeScriptBin;})
     ] ++ config.environment.extraPackages;
 
       
diff --git a/modules/module-list.nix b/modules/module-list.nix
index 85d904493a4..b1f701e6a68 100644
--- a/modules/module-list.nix
+++ b/modules/module-list.nix
@@ -15,6 +15,7 @@
   ./legacy.nix
   ./misc/assertions.nix
   ./programs/bash/bash.nix
+  ./programs/info.nix
   ./programs/pwdutils/pwdutils.nix
   ./programs/ssh.nix
   ./programs/ssmtp.nix
diff --git a/modules/programs/info.nix b/modules/programs/info.nix
new file mode 100644
index 00000000000..e3b8025f933
--- /dev/null
+++ b/modules/programs/info.nix
@@ -0,0 +1,36 @@
+{config, pkgs, ...}:
+
+let
+
+  # Quick hack to make the `info' command work properly.  `info' needs
+  # a "dir" file containing all the installed Info files, which we
+  # don't have (it would be impure to have a package installation
+  # update some global "dir" file).  So this wrapper script around
+  # "info" builds a temporary "dir" file on the fly.  This is a bit
+  # slow (on a cold cache) but not unacceptably so.
+  infoWrapper = pkgs.writeScriptBin "info"
+    ''
+      #! ${pkgs.stdenv.shell}
+
+      dir=$(mktemp --tmpdir -d "info.dir.XXXXXX")
+
+      if test -z "$dir"; then exit 1; fi
+
+      trap 'rm -rf "$dir"' EXIT
+
+      shopt -s nullglob
+
+      for i in $(IFS=:; echo $INFOPATH); do
+          for j in $i/*.info; do
+              ${pkgs.texinfo}/bin/install-info --quiet $j $dir/dir
+          done
+      done
+
+      INFOPATH=$dir:$INFOPATH ${pkgs.texinfo}/bin/info "$@"
+    ''; # */
+
+in 
+
+{
+  environment.systemPackages = [infoWrapper];
+}
-- 
GitLab


From ca0038b9b0cd862559360c3d51604fdbf999fec4 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 29 May 2009 13:30:12 +0000
Subject: [PATCH 1539/5331] svn path=/nixos/branches/modular-nixos/;
 revision=15793

---
 modules/programs/info.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/programs/info.nix b/modules/programs/info.nix
index e3b8025f933..f3b8136253b 100644
--- a/modules/programs/info.nix
+++ b/modules/programs/info.nix
@@ -8,7 +8,7 @@ let
   # update some global "dir" file).  So this wrapper script around
   # "info" builds a temporary "dir" file on the fly.  This is a bit
   # slow (on a cold cache) but not unacceptably so.
-  infoWrapper = pkgs.writeScriptBin "info"
+  infoWrapper = pkgs.writeScriptBin "info-wrapper"
     ''
       #! ${pkgs.stdenv.shell}
 
-- 
GitLab


From 82254ce4663002b553799d7aad2f404f33ca1db4 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 29 May 2009 13:30:28 +0000
Subject: [PATCH 1540/5331] * Doh.

svn path=/nixos/branches/modular-nixos/; revision=15794
---
 modules/programs/info.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/programs/info.nix b/modules/programs/info.nix
index f3b8136253b..e3b8025f933 100644
--- a/modules/programs/info.nix
+++ b/modules/programs/info.nix
@@ -8,7 +8,7 @@ let
   # update some global "dir" file).  So this wrapper script around
   # "info" builds a temporary "dir" file on the fly.  This is a bit
   # slow (on a cold cache) but not unacceptably so.
-  infoWrapper = pkgs.writeScriptBin "info-wrapper"
+  infoWrapper = pkgs.writeScriptBin "info"
     ''
       #! ${pkgs.stdenv.shell}
 
-- 
GitLab


From c4f50d85cb1e501f2874698fc5844af420346f5f Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 29 May 2009 14:11:02 +0000
Subject: [PATCH 1541/5331] * Moved the last modules to modules/.

svn path=/nixos/branches/modular-nixos/; revision=15795
---
 {upstart-jobs => modules/hardware}/pcmcia.nix  | 0
 modules/legacy.nix                             | 6 ------
 {upstart-jobs/cron => modules/misc}/locate.nix | 0
 modules/module-list.nix                        | 3 ++-
 4 files changed, 2 insertions(+), 7 deletions(-)
 rename {upstart-jobs => modules/hardware}/pcmcia.nix (100%)
 delete mode 100644 modules/legacy.nix
 rename {upstart-jobs/cron => modules/misc}/locate.nix (100%)

diff --git a/upstart-jobs/pcmcia.nix b/modules/hardware/pcmcia.nix
similarity index 100%
rename from upstart-jobs/pcmcia.nix
rename to modules/hardware/pcmcia.nix
diff --git a/modules/legacy.nix b/modules/legacy.nix
deleted file mode 100644
index 245b78384ac..00000000000
--- a/modules/legacy.nix
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  require = [
-    ../upstart-jobs/cron/locate.nix
-    ../upstart-jobs/pcmcia.nix
-  ];
-}
diff --git a/upstart-jobs/cron/locate.nix b/modules/misc/locate.nix
similarity index 100%
rename from upstart-jobs/cron/locate.nix
rename to modules/misc/locate.nix
diff --git a/modules/module-list.nix b/modules/module-list.nix
index b1f701e6a68..6fc36d30369 100644
--- a/modules/module-list.nix
+++ b/modules/module-list.nix
@@ -9,11 +9,12 @@
   ./config/timezone.nix
   ./config/unix-odbc-drivers.nix
   ./config/users-groups.nix
+  ./hardware/pcmcia.nix
   ./installer/grub/grub.nix
   ./installer/tools/nixos-checkout.nix
   ./installer/tools/tools.nix
-  ./legacy.nix
   ./misc/assertions.nix
+  ./misc/locate.nix
   ./programs/bash/bash.nix
   ./programs/info.nix
   ./programs/pwdutils/pwdutils.nix
-- 
GitLab


From dba1d48b7897c49e5df9430c6b60f17e03ec361e Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 29 May 2009 14:25:56 +0000
Subject: [PATCH 1542/5331] * Move the uid/gid mappings into a module.  This
 allows other modules   to use it through config.ids.{uids,gids} rather than
 `import   relative-path/ids.nix'.

svn path=/nixos/branches/modular-nixos/; revision=15796
---
 modules/config/users-groups.nix               |  2 +-
 {system => modules/misc}/ids.nix              | 30 ++++++++++++-
 modules/module-list.nix                       |  1 +
 modules/services/audio/alsa.nix               |  2 +-
 modules/services/audio/pulseaudio.nix         |  9 ++--
 modules/services/hardware/hal.nix             |  4 +-
 modules/services/mail/dovecot.nix             |  5 +--
 modules/services/mail/postfix.nix             |  7 ++-
 .../services/monitoring/nagios/default.nix    |  2 +-
 modules/services/monitoring/zabbix-agent.nix  |  2 +-
 modules/services/monitoring/zabbix-server.nix |  2 +-
 modules/services/networking/avahi-daemon.nix  |  4 +-
 modules/services/networking/bitlbee.nix       | 45 +++++++++----------
 modules/services/networking/gnunet.nix        |  2 +-
 modules/services/networking/ntpd.nix          |  2 +-
 modules/services/networking/portmap.nix       |  4 +-
 modules/services/networking/ssh/sshd.nix      |  4 +-
 modules/services/networking/vsftpd.nix        |  6 +--
 modules/services/scheduling/atd.nix           |  4 +-
 modules/services/system/dbus.nix              |  2 +-
 modules/services/system/nscd.nix              |  2 +-
 modules/services/web-servers/tomcat.nix       |  4 +-
 22 files changed, 82 insertions(+), 63 deletions(-)
 rename {system => modules/misc}/ids.nix (66%)

diff --git a/modules/config/users-groups.nix b/modules/config/users-groups.nix
index 9acaae17db9..bd32fcafd83 100644
--- a/modules/config/users-groups.nix
+++ b/modules/config/users-groups.nix
@@ -41,7 +41,7 @@ in
 
 ###### implementation
 let
-  ids = import ../../system/ids.nix;
+  ids = config.ids;
 
   # User accounts to be created/updated by NixOS.
   users =
diff --git a/system/ids.nix b/modules/misc/ids.nix
similarity index 66%
rename from system/ids.nix
rename to modules/misc/ids.nix
index a950ec84db1..79121ae0c1f 100644
--- a/system/ids.nix
+++ b/modules/misc/ids.nix
@@ -1,6 +1,32 @@
+# This module defines the global list of uids and gids.  We keep a
+# central list to prevent id collissions.
+
+{config, pkgs, ...}:
+
+let
+
+  options = {
+
+    ids.uids = pkgs.lib.mkOption {
+      description = ''
+        The user IDs used in NixOS.
+      '';
+    };
+
+    ids.gids = pkgs.lib.mkOption {
+      description = ''
+        The group IDs used in NixOS.
+      '';
+    };
+
+  };
+
+in
+  
 {
+  require = options;
 
-  uids = {
+  ids.uids = {
     root = 0;
     nscd = 1;
     sshd = 2;
@@ -25,7 +51,7 @@
     nobody = 65534;
   };
 
-  gids = {
+  ids.gids = {
     root = 0;
     wheel = 1;
     kmem = 2;
diff --git a/modules/module-list.nix b/modules/module-list.nix
index 6fc36d30369..c6b2d930e5c 100644
--- a/modules/module-list.nix
+++ b/modules/module-list.nix
@@ -14,6 +14,7 @@
   ./installer/tools/nixos-checkout.nix
   ./installer/tools/tools.nix
   ./misc/assertions.nix
+  ./misc/ids.nix
   ./misc/locate.nix
   ./programs/bash/bash.nix
   ./programs/info.nix
diff --git a/modules/services/audio/alsa.nix b/modules/services/audio/alsa.nix
index 51c2e924438..47c639359f4 100644
--- a/modules/services/audio/alsa.nix
+++ b/modules/services/audio/alsa.nix
@@ -34,7 +34,7 @@ let
   # not used (e.g., doesn't own any devices).
   group = {
     name = "audio";
-    gid = (import ../../../system/ids.nix).gids.audio;
+    gid = config.ids.gids.audio;
   };
 
   job = {
diff --git a/modules/services/audio/pulseaudio.nix b/modules/services/audio/pulseaudio.nix
index a32f4e38228..a63b58ca538 100644
--- a/modules/services/audio/pulseaudio.nix
+++ b/modules/services/audio/pulseaudio.nix
@@ -4,8 +4,8 @@
 let
   inherit (pkgs.lib) mkOption mkIf;
 
-  uid = (import ../../../system/ids.nix).uids.pulseaudio;
-  gid = (import ../../../system/ids.nix).gids.pulseaudio;
+  uid = config.ids.uids.pulseaudio;
+  gid = config.ids.gids.pulseaudio;
 
   options = {
     services = {
@@ -36,8 +36,6 @@ in
 
 ###### implementation
 
-# For some reason, PulseAudio wants UID == GID.
-assert uid == gid;
 
 mkIf config.services.pulseaudio.enable {
   require = [
@@ -51,7 +49,8 @@ mkIf config.services.pulseaudio.enable {
   users = {
     extraUsers = [
       { name = "pulse";
-        inherit uid;
+        # For some reason, PulseAudio wants UID == GID.
+        uid = assert uid == gid; uid;
         group = "pulse";
         description = "PulseAudio system-wide daemon";
         home = "/var/run/pulse";
diff --git a/modules/services/hardware/hal.nix b/modules/services/hardware/hal.nix
index 4a12973b853..475ba7299d7 100644
--- a/modules/services/hardware/hal.nix
+++ b/modules/services/hardware/hal.nix
@@ -36,13 +36,13 @@ let
 
   user = {
     name = "haldaemon";
-    uid = (import ../../../system/ids.nix).uids.haldaemon;
+    uid = config.ids.uids.haldaemon;
     description = "HAL daemon user";
   };
 
   group = {
     name = "haldaemon";
-    gid = (import ../../../system/ids.nix).gids.haldaemon;
+    gid = config.ids.gids.haldaemon;
   };
 
   fdi =
diff --git a/modules/services/mail/dovecot.nix b/modules/services/mail/dovecot.nix
index 7bc091deba7..33675efef7a 100644
--- a/modules/services/mail/dovecot.nix
+++ b/modules/services/mail/dovecot.nix
@@ -44,7 +44,6 @@ let
   startingDependency = if config.services.gw6c.enable then "gw6c" else "network-interfaces";
 
   cfg = config.services.dovecot;
-  idList = import ../../../system/ids.nix;
 
   dovecotConf = 
   ''
@@ -112,13 +111,13 @@ mkIf config.services.dovecot.enable {
   users = {
     extraUsers = [{
       name = cfg.user;
-      uid = idList.uids.dovecot;
+      uid = config.ids.uids.dovecot;
       description = "Dovecot user";
       group = cfg.group;
     }];
     extraGroups = [{
       name = cfg.group;
-      gid = idList.gids.dovecot;
+      gid = config.ids.gids.dovecot;
     }];
   };
 
diff --git a/modules/services/mail/postfix.nix b/modules/services/mail/postfix.nix
index b92bef666a0..9e1ec488ae2 100644
--- a/modules/services/mail/postfix.nix
+++ b/modules/services/mail/postfix.nix
@@ -156,7 +156,6 @@ let
   user = cfg.user;
   group = cfg.group;
   setgidGroup = cfg.setgidGroup;
-  idList = import ../../../system/ids.nix;
 
   optionalString = pkgs.lib.optionalString;
   concatStringsSep = pkgs.lib.concatStringsSep;
@@ -270,17 +269,17 @@ mkIf config.services.postfix.enable {
     extraUsers = [
       { name = user;
         description = "Postfix mail server user";
-        uid = idList.uids.postfix;
+        uid = config.ids.uids.postfix;
         group = group;
       }
     ];
 
     extraGroups = [
       { name = group; 
-        gid = idList.gids.postfix;
+        gid = config.ids.gids.postfix;
       }
       { name = setgidGroup; 
-        gid = idList.gids.postdrop;
+        gid = config.ids.gids.postdrop;
       }
     ];
   };
diff --git a/modules/services/monitoring/nagios/default.nix b/modules/services/monitoring/nagios/default.nix
index c88f486a787..079f5f1342e 100644
--- a/modules/services/monitoring/nagios/default.nix
+++ b/modules/services/monitoring/nagios/default.nix
@@ -137,7 +137,7 @@ let
 
   user = {
     name = nagiosUser;
-    uid = (import ../../../../system/ids.nix).uids.nagios;
+    uid = config.ids.uids.nagios;
     description = "Nagios monitoring daemon";
     home = nagiosState;
   };
diff --git a/modules/services/monitoring/zabbix-agent.nix b/modules/services/monitoring/zabbix-agent.nix
index 402e57d21b5..70e6a73277b 100644
--- a/modules/services/monitoring/zabbix-agent.nix
+++ b/modules/services/monitoring/zabbix-agent.nix
@@ -52,7 +52,7 @@ let
 
   user = {
     name = "zabbix";
-    uid = (import ../../../system/ids.nix).uids.zabbix;
+    uid = config.ids.uids.zabbix;
     description = "Zabbix daemon user";
   };
 
diff --git a/modules/services/monitoring/zabbix-server.nix b/modules/services/monitoring/zabbix-server.nix
index 265565ba602..198b040f10e 100644
--- a/modules/services/monitoring/zabbix-server.nix
+++ b/modules/services/monitoring/zabbix-server.nix
@@ -42,7 +42,7 @@ let
 
   user = {
     name = "zabbix";
-    uid = (import ../../../system/ids.nix).uids.zabbix;
+    uid = config.ids.uids.zabbix;
     description = "Zabbix daemon user";
   };
 
diff --git a/modules/services/networking/avahi-daemon.nix b/modules/services/networking/avahi-daemon.nix
index 9ba55f2076c..bfef7c508cf 100644
--- a/modules/services/networking/avahi-daemon.nix
+++ b/modules/services/networking/avahi-daemon.nix
@@ -93,14 +93,14 @@ let
 
   user = {
     name = "avahi";
-    uid = (import ../system/ids.nix).uids.avahi;
+    uid = config.ids.uids.avahi;
     description = "`avahi-daemon' privilege separation user";
     home = "/var/empty";
   };
 
   group = {
     name = "avahi";
-    gid = (import ../system/ids.nix).gids.avahi;
+    gid = config.ids.gids.avahi;
   };
 
   job = {
diff --git a/modules/services/networking/bitlbee.nix b/modules/services/networking/bitlbee.nix
index a1cc1a87861..e1ab633349c 100644
--- a/modules/services/networking/bitlbee.nix
+++ b/modules/services/networking/bitlbee.nix
@@ -41,15 +41,13 @@ in
 ###### implementation
 
 let
-  bitlbeeUid = (import ../system/ids.nix).uids.bitlbee;
+  bitlbeeUid = config.ids.uids.bitlbee;
   inherit (config.services.bitlbee) portNumber interface;
 in
 
 mkIf config.services.bitlbee.enable {
 
-  require = [ 
-    options
-  ];
+  require = options;
 
   users = {
     extraUsers = [
@@ -62,32 +60,31 @@ mkIf config.services.bitlbee.enable {
     
     extraGroups = [
       { name = "bitlbee";
-        gid = (import ../system/ids.nix).gids.bitlbee;
+        gid = config.ids.gids.bitlbee;
       }
     ];
   };
 
-  services = {
-    extraJobs = [{
-      name = "bitlbee";
+  services.extraJobs = [{
+    name = "bitlbee";
 
-      job = ''
-    description "BitlBee IRC to other chat networks gateway"
+    job = ''
+      description "BitlBee IRC to other chat networks gateway"
 
-    start on network-interfaces/started
-    stop on network-interfaces/stop
+      start on network-interfaces/started
+      stop on network-interfaces/stop
 
-    start script
-        if ! test -d /var/lib/bitlbee
-        then
-            mkdir -p /var/lib/bitlbee
-        fi
-    end script
+      start script
+          if ! test -d /var/lib/bitlbee
+          then
+              mkdir -p /var/lib/bitlbee
+          fi
+      end script
 
-    respawn ${pkgs.bitlbee}/sbin/bitlbee -F -p ${toString portNumber} \
-            -i ${interface} -u bitlbee
-      '';
-  
-    }];
-  };
+      respawn ${pkgs.bitlbee}/sbin/bitlbee -F -p ${toString portNumber} \
+              -i ${interface} -u bitlbee
+    '';
+  }];
+
+  environment.systemPackages = pkgs.bitlbee;  
 }
diff --git a/modules/services/networking/gnunet.nix b/modules/services/networking/gnunet.nix
index 5fe7579d8fe..57e3b3d8c96 100644
--- a/modules/services/networking/gnunet.nix
+++ b/modules/services/networking/gnunet.nix
@@ -154,7 +154,7 @@ mkIf config.services.gnunet.enable {
   users = {
     extraUsers = [
       { name = "gnunetd";
-        uid = (import ../system/ids.nix).uids.gnunetd;
+        uid = config.ids.uids.gnunetd;
         description = "GNUnet Daemon User";
         home = "/var/empty";
       }
diff --git a/modules/services/networking/ntpd.nix b/modules/services/networking/ntpd.nix
index b7723347ea3..f2c8e1a7a3a 100644
--- a/modules/services/networking/ntpd.nix
+++ b/modules/services/networking/ntpd.nix
@@ -72,7 +72,7 @@ mkIf config.services.ntp.enable {
       
       users = [
         { name = ntpUser;
-          uid = (import ../../../system/ids.nix).uids.ntp;
+          uid = config.ids.uids.ntp;
           description = "NTP daemon user";
           home = stateDir;
         }
diff --git a/modules/services/networking/portmap.nix b/modules/services/networking/portmap.nix
index 74f2fd68e79..5583108f894 100644
--- a/modules/services/networking/portmap.nix
+++ b/modules/services/networking/portmap.nix
@@ -37,8 +37,8 @@ in
 
 ###### implementation
 
-let uid = (import ../../../system/ids.nix).uids.portmap;
-    gid = (import ../../../system/ids.nix).gids.portmap;
+let uid = config.ids.uids.portmap;
+    gid = config.ids.gids.portmap;
 in
 
 mkIf config.services.portmap.enable {
diff --git a/modules/services/networking/ssh/sshd.nix b/modules/services/networking/ssh/sshd.nix
index a50bafac236..e2bda953d72 100644
--- a/modules/services/networking/ssh/sshd.nix
+++ b/modules/services/networking/ssh/sshd.nix
@@ -85,8 +85,6 @@ let
     
   '';
 
-  sshdUid = (import ../../../../system/ids.nix).uids.sshd;
-
   # !!! is this assertion evaluated anywhere???
   assertion = cfg.permitRootLogin == "yes" ||
        cfg.permitRootLogin == "without-password" ||
@@ -104,7 +102,7 @@ mkIf config.services.sshd.enable {
   users = {
     extraUsers = [
       { name = "sshd";
-        uid = (import ../../../../system/ids.nix).uids.sshd;
+        uid = config.ids.uids.sshd;
         description = "SSH privilege separation user";
         home = "/var/empty";
       }
diff --git a/modules/services/networking/vsftpd.nix b/modules/services/networking/vsftpd.nix
index 753fde465d7..5f8a06cbbb5 100644
--- a/modules/services/networking/vsftpd.nix
+++ b/modules/services/networking/vsftpd.nix
@@ -95,13 +95,13 @@ mkIf config.services.vsftpd.enable {
   users = {
     extraUsers = [
         { name = "vsftpd";
-          uid = (import ../../../system/ids.nix).uids.vsftpd;
+          uid = config.ids.uids.vsftpd;
           description = "VSFTPD user";
           home = "/homeless-shelter";
         }
       ] ++ pkgs.lib.optional anonymousUser
         { name = "ftp";
-          uid = (import ../../../system/ids.nix).uids.ftp;
+          uid = config.ids.uids.ftp;
           group = "ftp";
           description = "Anonymous ftp user";
           home = "/home/ftp";
@@ -109,7 +109,7 @@ mkIf config.services.vsftpd.enable {
 
     extraGroups = [
       { name = "ftp";
-        gid = (import ../../../system/ids.nix).gids.ftp;
+        gid = config.ids.gids.ftp;
       }
     ];
       
diff --git a/modules/services/scheduling/atd.nix b/modules/services/scheduling/atd.nix
index bf5861d8e4f..bb85c5994be 100644
--- a/modules/services/scheduling/atd.nix
+++ b/modules/services/scheduling/atd.nix
@@ -37,14 +37,14 @@ let
 
   user = {
     name = "atd";
-    uid = (import ../../../system/ids.nix).uids.atd;
+    uid = config.ids.uids.atd;
     description = "atd user";
     home = "/var/empty";
   };
 
   group = {
     name = "atd";
-    gid = (import ../../../system/ids.nix).gids.atd;
+    gid = config.ids.gids.atd;
   };
 
   job = ''
diff --git a/modules/services/system/dbus.nix b/modules/services/system/dbus.nix
index b277a5e95c1..f3d56e9239c 100644
--- a/modules/services/system/dbus.nix
+++ b/modules/services/system/dbus.nix
@@ -55,7 +55,7 @@ let
 
   user = {
     name = "messagebus";
-    uid = (import ../../../system/ids.nix).uids.messagebus;
+    uid = config.ids.uids.messagebus;
     description = "D-Bus system message bus daemon user";
     home = homeDir;
   };
diff --git a/modules/services/system/nscd.nix b/modules/services/system/nscd.nix
index d2b01876e85..da1e5bec2bc 100644
--- a/modules/services/system/nscd.nix
+++ b/modules/services/system/nscd.nix
@@ -13,7 +13,7 @@ in
         
         users = [
           { name = "nscd";
-            uid = (import ../../../system/ids.nix).uids.nscd;
+            uid = config.ids.uids.nscd;
             description = "Name service cache daemon user";
           }
         ];
diff --git a/modules/services/web-servers/tomcat.nix b/modules/services/web-servers/tomcat.nix
index 592fd0fcbf5..e873c1cf4a2 100644
--- a/modules/services/web-servers/tomcat.nix
+++ b/modules/services/web-servers/tomcat.nix
@@ -73,13 +73,13 @@ mkIf config.services.tomcat.enable {
       
       groups = [
         { name = "tomcat";
-          gid = (import ../../../system/ids.nix).gids.tomcat;
+          gid = config.ids.gids.tomcat;
         }
       ];
       
       users = [
         { name = "tomcat";
-          uid = (import ../../../system/ids.nix).uids.tomcat;
+          uid = config.ids.uids.tomcat;
           description = "Tomcat user";
           home = "/homeless-shelter";
         }
-- 
GitLab


From 234c4340c2cdd9a083f298d933c7139586429f82 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 29 May 2009 14:46:27 +0000
Subject: [PATCH 1543/5331] * helpers -> lib.

svn path=/nixos/branches/modular-nixos/; revision=15797
---
 {helpers => lib}/make-iso9660-image.nix | 0
 {helpers => lib}/make-iso9660-image.sh  | 0
 {helpers => lib}/unpack-theme.nix       | 0
 {helpers => lib}/unpack-theme.sh        | 0
 modules/system/boot/stage-1.nix         | 2 +-
 modules/tasks/tty-backgrounds.nix       | 2 +-
 6 files changed, 2 insertions(+), 2 deletions(-)
 rename {helpers => lib}/make-iso9660-image.nix (100%)
 rename {helpers => lib}/make-iso9660-image.sh (100%)
 rename {helpers => lib}/unpack-theme.nix (100%)
 rename {helpers => lib}/unpack-theme.sh (100%)

diff --git a/helpers/make-iso9660-image.nix b/lib/make-iso9660-image.nix
similarity index 100%
rename from helpers/make-iso9660-image.nix
rename to lib/make-iso9660-image.nix
diff --git a/helpers/make-iso9660-image.sh b/lib/make-iso9660-image.sh
similarity index 100%
rename from helpers/make-iso9660-image.sh
rename to lib/make-iso9660-image.sh
diff --git a/helpers/unpack-theme.nix b/lib/unpack-theme.nix
similarity index 100%
rename from helpers/unpack-theme.nix
rename to lib/unpack-theme.nix
diff --git a/helpers/unpack-theme.sh b/lib/unpack-theme.sh
similarity index 100%
rename from helpers/unpack-theme.sh
rename to lib/unpack-theme.sh
diff --git a/modules/system/boot/stage-1.nix b/modules/system/boot/stage-1.nix
index cb8bb7b3243..8e092990699 100644
--- a/modules/system/boot/stage-1.nix
+++ b/modules/system/boot/stage-1.nix
@@ -239,7 +239,7 @@ let
             suffix = "/bin/splash_helper";
             symlink = "/${kernelPackages.splashutils.helperName}";
           } # */
-          { object = import ../../../helpers/unpack-theme.nix {
+          { object = import ../../../lib/unpack-theme.nix {
               inherit (pkgs) stdenv;
               theme = config.services.ttyBackgrounds.defaultTheme;
             };
diff --git a/modules/tasks/tty-backgrounds.nix b/modules/tasks/tty-backgrounds.nix
index 1e5f8f08d95..073ac90df2e 100644
--- a/modules/tasks/tty-backgrounds.nix
+++ b/modules/tasks/tty-backgrounds.nix
@@ -100,7 +100,7 @@ let
     themes = map (x: if x ? theme then (unpackTheme x.theme) else "default") backgrounds;
   };
 
-  unpackTheme = theme: import ../../helpers/unpack-theme.nix {
+  unpackTheme = theme: import ../../lib/unpack-theme.nix {
       inherit stdenv theme;
     };
 
-- 
GitLab


From 35c465f3daee7f88579a28a27e18696bdf31c5ab Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 29 May 2009 14:51:03 +0000
Subject: [PATCH 1544/5331] svn path=/nixos/branches/modular-nixos/;
 revision=15799

---
 installer/cd-dvd/moduleList.nix | 46 ---------------------------------
 1 file changed, 46 deletions(-)
 delete mode 100644 installer/cd-dvd/moduleList.nix

diff --git a/installer/cd-dvd/moduleList.nix b/installer/cd-dvd/moduleList.nix
deleted file mode 100644
index a2e8cb94306..00000000000
--- a/installer/cd-dvd/moduleList.nix
+++ /dev/null
@@ -1,46 +0,0 @@
-[
-  # The initrd should contain any modules necessary for
-  # mounting the CD.
-  
-  # SATA/PATA support.
-  "ahci"
-  
-  "ata_piix"
-  
-  "sata_inic162x" "sata_nv" "sata_promise" "sata_qstor"
-  "sata_sil" "sata_sil24" "sata_sis" "sata_svw" "sata_sx4"
-  "sata_uli" "sata_via" "sata_vsc"
-  
-  "pata_ali" "pata_amd" "pata_artop" "pata_atiixp"
-  "pata_cs5520" "pata_cs5530" "pata_cs5535" "pata_efar"
-  "pata_hpt366" "pata_hpt37x" "pata_hpt3x2n" "pata_hpt3x3"
-  "pata_it8213" "pata_it821x" "pata_jmicron" "pata_marvell"
-  "pata_mpiix" "pata_netcell" "pata_ns87410" "pata_oldpiix"
-  "pata_pcmcia" "pata_pdc2027x" "pata_qdi" "pata_rz1000"
-  "pata_sc1200" "pata_serverworks" "pata_sil680" "pata_sis"
-  "pata_sl82c105" "pata_triflex" "pata_via"
-  # "pata_winbond" <-- causes timeouts in sd_mod
-  
-  # SCSI support (incomplete).
-  "3w-9xxx" "3w-xxxx" "aic79xx" "aic7xxx" "arcmsr" 
-  
-  # USB support, especially for booting from USB CD-ROM
-  # drives.	Also include USB keyboard support for when
-  # something goes wrong in stage 1.
-  "ehci_hcd"
-  "ohci_hcd"
-  "usbhid"
-  "usb_storage"
-  
-  # Firewire support.	Not tested.
-  "ohci1394" "sbp2"
-  
-  # Wait for SCSI devices to appear.
-  "scsi_wait_scan"
-  
-  # Needed for live-CD operation.
-  "aufs"
-
-  # Virtio (QEMU, KVM etc.) support.
-  "virtio_net" "virtio_pci" "virtio_blk" "virtio_balloon"
-]
-- 
GitLab


From 720d51179efa2bd987d1abb642c20a2e1f6031f8 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 29 May 2009 14:57:31 +0000
Subject: [PATCH 1545/5331] * kdm needs the "kde" PAM module, but you only get
 it when KDE is   enabled as a session type.  Since I'm lazy, provide it  
 unconditionally.  Also have it include "common-console" to set   device
 ownership when logging in.

svn path=/nixos/branches/modular-nixos/; revision=15800
---
 .../xserver/desktop-managers/kde.pam => security/pam.d/kde}    | 1 +
 modules/security/pam.nix                                       | 1 +
 modules/services/x11/xserver/desktop-managers/kde.nix          | 3 ---
 modules/services/x11/xserver/desktop-managers/kde4.nix         | 3 ---
 4 files changed, 2 insertions(+), 6 deletions(-)
 rename modules/{services/x11/xserver/desktop-managers/kde.pam => security/pam.d/kde} (76%)

diff --git a/modules/services/x11/xserver/desktop-managers/kde.pam b/modules/security/pam.d/kde
similarity index 76%
rename from modules/services/x11/xserver/desktop-managers/kde.pam
rename to modules/security/pam.d/kde
index 50f3cc5ce60..dac4fec866c 100644
--- a/modules/services/x11/xserver/desktop-managers/kde.pam
+++ b/modules/security/pam.d/kde
@@ -2,3 +2,4 @@ auth     include        common
 account  include        common
 password include        common
 session  include        common
+session  include        common-console
diff --git a/modules/security/pam.nix b/modules/security/pam.nix
index 8ac6fddcc63..a3fef459edb 100644
--- a/modules/security/pam.nix
+++ b/modules/security/pam.nix
@@ -51,6 +51,7 @@ in
       "cups"
       "ftp"
       "ejabberd"
+      "kde"
       "common"
       "common-console" # shared stuff for interactive local sessions
     ];
diff --git a/modules/services/x11/xserver/desktop-managers/kde.nix b/modules/services/x11/xserver/desktop-managers/kde.nix
index 4bea8308e40..f8fb9f534f5 100644
--- a/modules/services/x11/xserver/desktop-managers/kde.nix
+++ b/modules/services/x11/xserver/desktop-managers/kde.nix
@@ -68,9 +68,6 @@ mkIf cfg.enable {
     ];
 
     etc = [
-      { source = ./kde.pam;
-        target = "pam.d/kde";
-      }
       { source = "${pkgs.xkeyboard_config}/etc/X11/xkb";
         target = "X11/xkb";
       }
diff --git a/modules/services/x11/xserver/desktop-managers/kde4.nix b/modules/services/x11/xserver/desktop-managers/kde4.nix
index c74429e7486..78cf90e33e4 100644
--- a/modules/services/x11/xserver/desktop-managers/kde4.nix
+++ b/modules/services/x11/xserver/desktop-managers/kde4.nix
@@ -64,9 +64,6 @@ mkIf cfg.enable {
     ];
 
     etc = [
-      { source = ./kde.pam;
-        target = "pam.d/kde";
-      }
       { source = "${pkgs.xkeyboard_config}/etc/X11/xkb";
         target = "X11/xkb";
       }
-- 
GitLab


From 365df3e29a4c855068f598083c8aeec03aeb9fda Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Sun, 31 May 2009 18:51:29 +0000
Subject: [PATCH 1546/5331] Add `gpsd' Upstart job.

svn path=/nixos/trunk/; revision=15811
---
 system/ids.nix        |   2 +
 system/options.nix    |   1 +
 upstart-jobs/gpsd.nix | 108 ++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 111 insertions(+)
 create mode 100644 upstart-jobs/gpsd.nix

diff --git a/system/ids.nix b/system/ids.nix
index a950ec84db1..240b2c8376b 100644
--- a/system/ids.nix
+++ b/system/ids.nix
@@ -20,6 +20,7 @@
     tomcat = 16;
     gnunetd = 17;
     pulseaudio = 22; # must match `pulseaudio' GID
+    gpsd = 23;
 
     nixbld = 30000; # start of range of uids
     nobody = 65534;
@@ -47,6 +48,7 @@
     lp = 20;
     tomcat = 21;
     pulseaudio = 22; # must match `pulseaudio' UID
+    gpsd = 23;
     
     users = 100;
     nixbld = 30000;
diff --git a/system/options.nix b/system/options.nix
index 9fa68009fa5..95e9c421e8a 100644
--- a/system/options.nix
+++ b/system/options.nix
@@ -3137,6 +3137,7 @@ root        ALL=(ALL) SETENV: ALL
     ../upstart-jobs/cron/locate.nix
     ../upstart-jobs/manual.nix
     ../upstart-jobs/rogue.nix
+    ../upstart-jobs/gpsd.nix
     ../upstart-jobs/guest-users.nix
     ../upstart-jobs/pulseaudio.nix
     ../upstart-jobs/portmap.nix
diff --git a/upstart-jobs/gpsd.nix b/upstart-jobs/gpsd.nix
new file mode 100644
index 00000000000..6fa131fae90
--- /dev/null
+++ b/upstart-jobs/gpsd.nix
@@ -0,0 +1,108 @@
+{pkgs, config, ...}:
+
+###### interface
+let
+  inherit (pkgs.lib) mkOption mkIf;
+
+  uid = (import ../system/ids.nix).uids.gpsd;
+  gid = (import ../system/ids.nix).gids.gpsd;
+
+  options = {
+    services = {
+      gpsd = {
+
+        enable = mkOption {
+          default = false;
+          description = ''
+            Whether to enable `gpsd', a GPS service daemon.
+          '';
+        };
+
+        device = mkOption {
+          default = "/dev/ttyUSB0";
+          description = ''
+            A device may be a local serial device for GPS input, or a URL of the form:
+                 <literal>[{dgpsip|ntrip}://][user:passwd@]host[:port][/stream]</literal>
+            in which case it specifies an input source for DGPS or ntrip data.
+          '';
+        };
+
+        readonly = mkOption {
+          default = true;
+          description = ''
+            Whether to enable the broken-device-safety, otherwise
+            known as read-only mode.  Some popular bluetooth and USB
+            receivers lock up or become totally inaccessible when
+            probed or reconfigured.  This switch prevents gpsd from
+            writing to a receiver.  This means that gpsd cannot
+            configure the receiver for optimal performance, but it
+            also means that gpsd cannot break the receiver.  A better
+            solution would be for Bluetooth to not be so fragile.  A
+            platform independent method to identify
+            serial-over-Bluetooth devices would also be nice.
+          '';
+        };
+
+        port = mkOption {
+          default = 2947;
+          description = ''
+            The port where to listen for TCP connections.
+          '';
+        };
+
+        debugLevel = mkOption {
+          default = 0;
+          description = ''
+            The debugging level.
+          '';
+        };
+
+      };
+    };
+  };
+
+in
+
+###### implementation
+mkIf config.services.gpsd.enable {
+  require = [
+    options
+  ];
+  
+  users = {
+    extraUsers = [
+      { name = "gpsd";
+        inherit uid;
+        description = "gpsd daemon user";
+        home = "/var/empty";
+      }
+    ];
+
+    extraGroups = [
+      { name = "gpsd";
+        inherit gid;
+      }
+    ];
+  };
+
+  services =
+    let cfg = config.services.gpsd; in {
+      extraJobs = [{
+        name = "gpsd";
+
+        job =
+          let gpsd = pkgs.gpsd;
+          in ''
+            description "GPSD daemon"
+
+            start on network-interfaces/started
+            stop on network-interfaces/stop
+
+            respawn ${gpsd}/sbin/gpsd -D "${toString cfg.debugLevel}"   \
+                       -S "${toString cfg.port}"                        \
+                       ${if cfg.readonly then "-b" else ""}             \
+                       "${cfg.device}"
+          '';
+        }];
+      };
+}
-- 
GitLab


From 5ed2a75f501f1c6d951707eb5a86506f3749712e Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 2 Jun 2009 14:31:21 +0000
Subject: [PATCH 1547/5331] * Don't include the services tree.  It shouldn't be
 needed except for   some legacy stuff.  (And it broke the ISO build for the
 last month   or so.)

svn path=/nixos/trunk/; revision=15822
---
 installer/cd-dvd/rescue-cd.nix | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/installer/cd-dvd/rescue-cd.nix b/installer/cd-dvd/rescue-cd.nix
index ef47d960613..94c0d14e397 100644
--- a/installer/cd-dvd/rescue-cd.nix
+++ b/installer/cd-dvd/rescue-cd.nix
@@ -5,7 +5,6 @@
     else "nixos-${builtins.readFile ../../VERSION}"
 , compressImage ? false
 , nixpkgs ? ../../../nixpkgs
-, services ? ../../../services
 # This option allows easy building of Rescue CD with 
 # modified package set / driver set / anything.
 # For easier maitenance, let overrider know the current
@@ -129,8 +128,6 @@ rec {
               tar xjf /install/nixos.tar.bz2 -C /etc/nixos/nixos
               mkdir -p /etc/nixos/nixpkgs
               tar xjf /install/nixpkgs.tar.bz2 -C /etc/nixos/nixpkgs
-              mkdir -p /etc/nixos/services
-              tar xjf /install/services.tar.bz2 -C /etc/nixos/services
               chown -R root.root /etc/nixos
             end script
           ";
@@ -206,10 +203,6 @@ rec {
   nixosTarball = makeTarball "nixos.tar.bz2" ../..;
 
 
-  # Put Services in a tarball.
-  servicesTarball = makeTarball "services.tar.bz2" services;
-
-
   # Put Nixpkgs in a tarball.
   nixpkgsTarball = makeTarball "nixpkgs.tar.bz2" nixpkgs;
 
@@ -276,9 +269,6 @@ rec {
       { source = nixpkgsTarball + "/nixpkgs.tar.bz2";
         target = "/install/nixpkgs.tar.bz2";
       }
-      { source = servicesTarball + "/services.tar.bz2";
-        target = "/install/services.tar.bz2";
-      }
     ];
 
     # Closures to be copied to the Nix store on the CD.
-- 
GitLab


From a0e7572da745580edf3e194ae2bcb4bfc1a5fd1c Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 2 Jun 2009 14:36:57 +0000
Subject: [PATCH 1548/5331] * Only set kdePackages if the X server is enabled. 
 Otherwise we get   KDE 3 in the ISO image.

svn path=/nixos/trunk/; revision=15823
---
 system/system.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/system/system.nix b/system/system.nix
index d336eb81305..4d77a6a1260 100644
--- a/system/system.nix
+++ b/system/system.nix
@@ -274,15 +274,15 @@ rec {
   # The list of packages that need to appear in KDEDIRS,
   # XDG_CONFIG_DIRS and XDG_DATA_DIRS.
   # !!! This should be defined somewhere else.  
-  kdePackages = 
-    pkgs.lib.optionals (config.services.xserver.sessionType == "kde4")
+  kdePackages =
+    pkgs.lib.optionals (config.services.xserver.enable && config.services.xserver.sessionType == "kde4")
       [ pkgs.kde42.kdelibs
         pkgs.kde42.kdebase
         pkgs.kde42.kdebase_runtime
         pkgs.kde42.kdebase_workspace
         pkgs.shared_mime_info
       ]
-    ++ pkgs.lib.optionals (config.services.xserver.sessionType == "kde")
+    ++ pkgs.lib.optionals (config.services.xserver.enable && config.services.xserver.sessionType == "kde")
       [ pkgs.kdebase
         pkgs.kdelibs
       ]
-- 
GitLab


From 40497a10e651f74b7530e1813ceab8f0e9901aa1 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 2 Jun 2009 14:53:24 +0000
Subject: [PATCH 1549/5331] * The manual/rogue jobs already declare an extry
 TTY.

svn path=/nixos/trunk/; revision=15824
---
 installer/cd-dvd/rescue-cd.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/installer/cd-dvd/rescue-cd.nix b/installer/cd-dvd/rescue-cd.nix
index 94c0d14e397..85fc97482e6 100644
--- a/installer/cd-dvd/rescue-cd.nix
+++ b/installer/cd-dvd/rescue-cd.nix
@@ -25,7 +25,7 @@ rec {
   
     boot = {
       isLiveCD = true;
-      extraTTYs = [7 8]; # manual, rogue
+
       extraModulePackages = [system.kernelPackages.aufs];
       
       kernelPackages = pkgs.kernelPackages_2_6_28;
-- 
GitLab


From 674d63e212a09b7dd402a1cc8d4effa8e1ec9f6c Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 2 Jun 2009 19:40:14 +0000
Subject: [PATCH 1550/5331] * Don't do a separate "ntp -q -g" to reset the
 system time in the ntp   start script.  It's probably not necessary, but more
 importantly, it   can hang forever if the network is down.  (Actually it will
 sit in a   loop waiting for UDP packets that will never arrive.)  This causes
   the NixOS reboot to hang, since Upstart can't kill jobs stuck in   their
 start script.

svn path=/nixos/branches/modular-nixos/; revision=15829
---
 modules/services/networking/ntpd.nix | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/modules/services/networking/ntpd.nix b/modules/services/networking/ntpd.nix
index f2c8e1a7a3a..c8063092a95 100644
--- a/modules/services/networking/ntpd.nix
+++ b/modules/services/networking/ntpd.nix
@@ -93,11 +93,16 @@ mkIf config.services.ntp.enable {
             # Needed to run ntpd as an unprivileged user.
             ${modprobe}/sbin/modprobe capability || true
 
-            ${ntp}/bin/ntpd -q -g ${ntpFlags}
+            # !!! This can hang indefinitely if the network is down or
+            # the servers are unreachable.  This is particularly bad
+            # because Upstart cannot kill jobs stuck in the start
+            # phase.  Thus a hanging ntpd job can block system
+            # shutdown.
+            # ${ntp}/bin/ntpd -q -g ${ntpFlags}
 
         end script
 
-        respawn ${ntp}/bin/ntpd -n ${ntpFlags}
+        respawn ${ntp}/bin/ntpd -g -n ${ntpFlags}
       '';
     }];
   };
-- 
GitLab


From 116306c8dc1a91f2cfe6f579e7fe6081940aac14 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 2 Jun 2009 19:42:31 +0000
Subject: [PATCH 1551/5331] * Restart ntpd when we get a new DHCP lease. 
 Without this, if ntpd   previously failed to resolve the NTP server hostnames
 in its config   file, it will happily sit in a loop forever doing nothing.

svn path=/nixos/branches/modular-nixos/; revision=15830
---
 modules/services/networking/dhclient.nix | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/modules/services/networking/dhclient.nix b/modules/services/networking/dhclient.nix
index 39c93860bfe..c409077ddc4 100644
--- a/modules/services/networking/dhclient.nix
+++ b/modules/services/networking/dhclient.nix
@@ -60,6 +60,15 @@ let
 
       if test "$reason" = BOUND -o "$reason" = REBOOT; then
           ${pkgs.glibc}/sbin/nscd --invalidate hosts
+
+          # Restart ntpd.  (The "ip-up" event below will trigger the
+          # restart.)  We need to restart it to make sure that it will
+          # actually do something: if ntpd cannot resolve the server
+          # hostnames in its config file, then it will never do
+          # anything ever again ("couldn't resolve ..., giving up on
+          # it"), so we silently lose time synchronisation.
+          ${pkgs.upstart}/sbin/initctl stop ntpd
+          
           ${pkgs.upstart}/sbin/initctl emit ip-up
       fi
 
-- 
GitLab


From b425888b621f0d8d458f59af0e7fe9447652cbb7 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 2 Jun 2009 21:16:06 +0000
Subject: [PATCH 1552/5331] * Updated URL.

svn path=/nixos/trunk/; revision=15831
---
 installer/cd-dvd/rescue-cd.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/installer/cd-dvd/rescue-cd.nix b/installer/cd-dvd/rescue-cd.nix
index 85fc97482e6..766a4332f93 100644
--- a/installer/cd-dvd/rescue-cd.nix
+++ b/installer/cd-dvd/rescue-cd.nix
@@ -149,7 +149,7 @@ rec {
     };
     
     installer = {
-      nixpkgsURL = http://nixos.org/releases/nixpkgs/unstable;
+      nixpkgsURL = http://nixos.org/releases/nixpkgs/channels/nixpkgs-unstable;
     };
 
     security = {
-- 
GitLab


From 021c65da98aa6298e0f8c238ddae1a1bb80d6ca5 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 3 Jun 2009 08:14:54 +0000
Subject: [PATCH 1553/5331] * Quick hack in the X server job: wait until udev
 is running, since we   need some devices.  In particular this fixes the
 "Cannot open   virtual console 7" errors in VirtualBox.  (There's nothing
 special   about VirtualBox, but the different timing makes it more likely to 
  trigger this bug.)

svn path=/nixos/branches/modular-nixos/; revision=15836
---
 modules/services/x11/xserver/default.nix | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/modules/services/x11/xserver/default.nix b/modules/services/x11/xserver/default.nix
index 954c267b83f..acaea17649c 100644
--- a/modules/services/x11/xserver/default.nix
+++ b/modules/services/x11/xserver/default.nix
@@ -538,6 +538,14 @@ mkIf cfg.enable {
         start on ${if cfg.autorun then "hal" else "never"}
 
         start script
+
+          # Ugly hack: wait until udev has started since the X server
+          # needs various devices.  This would more properly be
+          # expressed as an Upstart dependency, but AFAIK in "start
+          # on" we can't express a logical AND.
+          while ! initctl status udev 2>&1 | grep -q running; do
+              sleep 1
+          done
         
           rm -f /var/run/opengl-driver
           ${if videoDriver == "nvidia"
-- 
GitLab


From aa3ce1327019dc01437f72e9c702c91bc304419e Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 5 Jun 2009 11:18:58 +0000
Subject: [PATCH 1554/5331] * Merged some trunk commits.

svn path=/nixos/branches/modular-nixos/; revision=15860
---
 installer/cd-dvd/rescue-cd.nix | 14 ++------------
 1 file changed, 2 insertions(+), 12 deletions(-)

diff --git a/installer/cd-dvd/rescue-cd.nix b/installer/cd-dvd/rescue-cd.nix
index 6d410941575..ded14cce701 100644
--- a/installer/cd-dvd/rescue-cd.nix
+++ b/installer/cd-dvd/rescue-cd.nix
@@ -5,7 +5,6 @@
     else "nixos-${builtins.readFile ../../VERSION}"
 , compressImage ? false
 , nixpkgs ? ../../../nixpkgs
-, services ? ../../../services
 # This option allows easy building of Rescue CD with 
 # modified package set / driver set / anything.
 # For easier maitenance, let overrider know the current
@@ -26,7 +25,7 @@ rec {
   
     boot = {
       isLiveCD = true;
-      extraTTYs = [7 8]; # manual, rogue
+
       extraModulePackages = [system.kernelPackages.aufs];
       
       kernelPackages = pkgs.kernelPackages_2_6_28;
@@ -129,8 +128,6 @@ rec {
               tar xjf /install/nixos.tar.bz2 -C /etc/nixos/nixos
               mkdir -p /etc/nixos/nixpkgs
               tar xjf /install/nixpkgs.tar.bz2 -C /etc/nixos/nixpkgs
-              mkdir -p /etc/nixos/services
-              tar xjf /install/services.tar.bz2 -C /etc/nixos/services
               chown -R root.root /etc/nixos
             end script
           ";
@@ -152,7 +149,7 @@ rec {
     };
     
     installer = {
-      nixpkgsURL = http://nixos.org/releases/nixpkgs/unstable;
+      nixpkgsURL = http://nixos.org/releases/nixpkgs/channels/nixpkgs-unstable;
     };
 
     security = {
@@ -202,10 +199,6 @@ rec {
   nixosTarball = makeTarball "nixos.tar.bz2" ../..;
 
 
-  # Put Services in a tarball.
-  servicesTarball = makeTarball "services.tar.bz2" services;
-
-
   # Put Nixpkgs in a tarball.
   nixpkgsTarball = makeTarball "nixpkgs.tar.bz2" nixpkgs;
 
@@ -272,9 +265,6 @@ rec {
       { source = nixpkgsTarball + "/nixpkgs.tar.bz2";
         target = "/install/nixpkgs.tar.bz2";
       }
-      { source = servicesTarball + "/services.tar.bz2";
-        target = "/install/services.tar.bz2";
-      }
     ];
 
     # Closures to be copied to the Nix store on the CD.
-- 
GitLab


From 5bcfbcac88ef3061a8aebffbbd43de74e31f4f2e Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 5 Jun 2009 12:39:37 +0000
Subject: [PATCH 1555/5331] * We lost the "host" command somewhere.

svn path=/nixos/branches/modular-nixos/; revision=15861
---
 modules/config/system-path.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/modules/config/system-path.nix b/modules/config/system-path.nix
index 4d16b38a1f5..bf8f91150cb 100644
--- a/modules/config/system-path.nix
+++ b/modules/config/system-path.nix
@@ -57,6 +57,7 @@ let
       pkgs.usbutils
       pkgs.utillinux
       pkgs.wirelesstools
+      pkgs.host
     ] ++ config.environment.extraPackages;
 
       
-- 
GitLab


From 7e2574c4fd09f9d7555ac63d32505ce0496a1d5a Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Fri, 5 Jun 2009 12:44:32 +0000
Subject: [PATCH 1556/5331] Let host be overriden with a better ISC Bind
 version if the latter is installed

svn path=/nixos/branches/modular-nixos/; revision=15862
---
 modules/config/system-path.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/modules/config/system-path.nix b/modules/config/system-path.nix
index bf8f91150cb..7f4eb61b4a1 100644
--- a/modules/config/system-path.nix
+++ b/modules/config/system-path.nix
@@ -57,8 +57,9 @@ let
       pkgs.usbutils
       pkgs.utillinux
       pkgs.wirelesstools
-      pkgs.host
-    ] ++ config.environment.extraPackages;
+    ] ++ config.environment.extraPackages
+    ++ [ pkgs.host ]
+    ;
 
       
   options = {
-- 
GitLab


From dc8cbffe31072927a367a7fbc757c740f6a67663 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 5 Jun 2009 12:57:44 +0000
Subject: [PATCH 1557/5331] * Revert r15862, as the "host" package in
 system-path.nix (or any other   package) can be overriden by setting
 environment.systemPackages in   /etc/nixos/configuration.nix: it shouldn't be
 special-cased.

svn path=/nixos/branches/modular-nixos/; revision=15863
---
 modules/config/system-path.nix | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/modules/config/system-path.nix b/modules/config/system-path.nix
index 7f4eb61b4a1..62fbde95f7f 100644
--- a/modules/config/system-path.nix
+++ b/modules/config/system-path.nix
@@ -57,11 +57,10 @@ let
       pkgs.usbutils
       pkgs.utillinux
       pkgs.wirelesstools
-    ] ++ config.environment.extraPackages
-    ++ [ pkgs.host ]
-    ;
+      pkgs.host
+    ] ++ config.environment.extraPackages;
+
 
-      
   options = {
 
     environment = {
-- 
GitLab


From 02d26fc77da68c2cfa551fe87f89988fad968d33 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 5 Jun 2009 13:19:39 +0000
Subject: [PATCH 1558/5331] * Make eval-config.nix a bit more general to make
 it easier to build   other kinds of configurations (like the installation
 CD).

svn path=/nixos/branches/modular-nixos/; revision=15864
---
 default.nix         | 23 ++++++-----------------
 lib/eval-config.nix | 18 +++++++++++++++---
 lib/from-env.nix    |  3 +++
 3 files changed, 24 insertions(+), 20 deletions(-)
 create mode 100644 lib/from-env.nix

diff --git a/default.nix b/default.nix
index 17a417306b2..8950f08707a 100644
--- a/default.nix
+++ b/default.nix
@@ -1,27 +1,16 @@
-let
+{ configuration ? import (import ./lib/from-env.nix "NIXOS_CONFIG" /etc/nixos/configuration.nix)
+}:
 
-  fromEnv = name: default:
-    let env = builtins.getEnv name; in
-    if env == "" then default else env;
-    
-  configuration = import (fromEnv "NIXOS_CONFIG" /etc/nixos/configuration.nix);
+let
   
-  nixpkgs = fromEnv "NIXPKGS" /etc/nixos/nixpkgs;
-
-  pkgs = import nixpkgs {system = builtins.currentSystem;};
-
   inherit
-    (import ./lib/eval-config.nix {inherit configuration pkgs;})
-    config optionDeclarations;
+    (import ./lib/eval-config.nix {inherit configuration;})
+    config optionDeclarations pkgs;
 
 in
 
 {
-  # Optionally check wether all config values have corresponding
-  # option declarations.
-  system = pkgs.checker config.system.build.system
-    config.environment.checkConfigurationOptions
-    optionDeclarations config;
+  system = config.system.build.system;
 
   # The following are used by nixos-rebuild.
   nixFallback = pkgs.nixUnstable;
diff --git a/lib/eval-config.nix b/lib/eval-config.nix
index 87211875456..51cae554097 100644
--- a/lib/eval-config.nix
+++ b/lib/eval-config.nix
@@ -2,9 +2,15 @@
 # configuration object (`config') from which we can retrieve option
 # values.
 
-{configuration, pkgs}:
+{ configuration
+, system ? builtins.currentSystem
+, nixpkgs ? import ./from-env.nix "NIXPKGS" /etc/nixos/nixpkgs
+, pkgs ? import nixpkgs {inherit system;}
+}:
 
 rec {
+  inherit nixpkgs pkgs;
+
   configComponents = [
     configuration
     {
@@ -19,7 +25,7 @@ rec {
     }
   ];
 
-  config =
+  config_ =
     pkgs.lib.fixOptionSets
       pkgs.lib.mergeOptionSets
       pkgs configComponents;
@@ -28,5 +34,11 @@ rec {
     pkgs.lib.fixOptionSetsFun
       pkgs.lib.filterOptionSets
       pkgs configComponents
-      config;
+      config_;
+      
+  # Optionally check wether all config values have corresponding
+  # option declarations.
+  config = pkgs.checker config_
+    config_.environment.checkConfigurationOptions
+    optionDeclarations config_;
 }
diff --git a/lib/from-env.nix b/lib/from-env.nix
new file mode 100644
index 00000000000..a7a339b5f2e
--- /dev/null
+++ b/lib/from-env.nix
@@ -0,0 +1,3 @@
+name: default:
+let value = builtins.getEnv name; in
+if value == "" then default else value
-- 
GitLab


From d6617f0d5e2de6f515117c380ecc5cd40c8aa02d Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 5 Jun 2009 13:24:23 +0000
Subject: [PATCH 1559/5331] svn path=/nixos/branches/modular-nixos/;
 revision=15866

---
 modules/system/boot/stage-2.nix | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/modules/system/boot/stage-2.nix b/modules/system/boot/stage-2.nix
index 69c85d43bc5..f0e90452ebe 100644
--- a/modules/system/boot/stage-2.nix
+++ b/modules/system/boot/stage-2.nix
@@ -46,9 +46,5 @@ in
 {
   require = [options];
 
-  system = {
-    build = {
-      inherit bootStage2;
-    };
-  };
+  system.build.bootStage2 = bootStage2;
 }
-- 
GitLab


From a4fa62aaf00055caceed3e46aa11111850e0f4fc Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 5 Jun 2009 13:30:30 +0000
Subject: [PATCH 1560/5331] * The fileSystems option shouldn't have a default.

svn path=/nixos/branches/modular-nixos/; revision=15867
---
 modules/tasks/filesystems.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/modules/tasks/filesystems.nix b/modules/tasks/filesystems.nix
index 6ed59916ccd..bc918a5935b 100644
--- a/modules/tasks/filesystems.nix
+++ b/modules/tasks/filesystems.nix
@@ -7,7 +7,6 @@ let
   options = {
 
     fileSystems = pkgs.lib.mkOption {
-      default = null;
       example = [
         { mountPoint = "/";
           device = "/dev/hda1";
-- 
GitLab


From e4e408293edbcc523470b4cbd7e3dd502c7b9ddb Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 5 Jun 2009 13:35:27 +0000
Subject: [PATCH 1561/5331] * Modularise the building of the installation
 CD/DVD.  The module   iso-image.nix contains the minimal stuff necessary to
 build a   bootable ISO image containing the given configuration.  The idea is
   that this can be customised by providing additional modules, e.g. to   add
 extra packages to the image.

  The ISO image is exported in the configuration attribute
  system.build.isoImage.  So it can be built as follows:

  $ nix-build lib/eval-config.nix \
      --arg configuration 'import ./modules/installer/cd-dvd/iso-image.nix' \
      -A config.system.build.isoImage


svn path=/nixos/branches/modular-nixos/; revision=15871
---
 lib/make-iso9660-image.nix             |  5 +-
 modules/installer/cd-dvd/iso-image.nix | 88 ++++++++++++++++++++++++++
 2 files changed, 90 insertions(+), 3 deletions(-)
 create mode 100644 modules/installer/cd-dvd/iso-image.nix

diff --git a/lib/make-iso9660-image.nix b/lib/make-iso9660-image.nix
index ea0cd1b4d22..51dce5eb402 100644
--- a/lib/make-iso9660-image.nix
+++ b/lib/make-iso9660-image.nix
@@ -1,4 +1,4 @@
-{ stdenv, perl, cdrkit, nixpkgs
+{ stdenv, perl, cdrkit, pathsFromGraph
 
 , # The file name of the resulting ISO image.
   isoName ? "cd.iso"
@@ -37,7 +37,7 @@ stdenv.mkDerivation {
   builder = ./make-iso9660-image.sh;
   buildInputs = [perl cdrkit];
   
-  inherit isoName bootable bootImage compressImage volumeID;
+  inherit isoName bootable bootImage compressImage volumeID pathsFromGraph;
 
   # !!! should use XML.
   sources = map (x: x.source) contents;
@@ -50,5 +50,4 @@ stdenv.mkDerivation {
   # For obtaining the closure of `storeContents'.
   exportReferencesGraph =
     map (x: [("closure-" + baseNameOf x.object) x.object]) storeContents;
-  pathsFromGraph = "${nixpkgs}/pkgs/build-support/kernel/paths-from-graph.pl";
 }
diff --git a/modules/installer/cd-dvd/iso-image.nix b/modules/installer/cd-dvd/iso-image.nix
new file mode 100644
index 00000000000..64f788993fe
--- /dev/null
+++ b/modules/installer/cd-dvd/iso-image.nix
@@ -0,0 +1,88 @@
+# This module creates a bootable ISO image containing the given NixOS
+# configuration.  The derivation for the ISO image will be placed in
+# config.system.build.isoImage.
+
+{config, pkgs, ...}:
+
+let
+ 
+  cdLabel = "NIXOS_INSTALLATION_CD";
+
+  # The configuration file for Grub.
+  grubCfg = 
+    ''
+      default 0
+      timeout 10
+      splashimage /boot/background.xpm.gz
+
+      title Boot from hard disk
+        root (hd0)
+        chainloader +1
+    
+      title NixOS Installer / Rescue
+        kernel /boot/vmlinuz init=/init ${toString config.boot.kernelParams}
+        initrd /boot/initrd
+    '';
+  
+in
+
+{
+  # In stage 1 of the boot, mount the CD/DVD as the root FS by label
+  # so that we don't need to know its device.
+  fileSystems =
+    [ { mountPoint = "/";
+        label = cdLabel;
+      }
+    ];
+
+  # We need AUFS in the initrd to make the CD appear writable.
+  boot.extraModulePackages = [config.boot.kernelPackages.aufs];
+  boot.initrd.extraKernelModules = ["aufs"];
+
+  # Tell stage 1 of the boot to mount a tmpfs on top of the CD using
+  # AUFS.  !!! It would be nicer to make the stage 1 init pluggable
+  # and move that bit of code here.
+  boot.isLiveCD = true;
+
+  # Create the ISO image.
+  system.build.isoImage = import ../../../lib/make-iso9660-image.nix {
+    inherit (pkgs) stdenv perl cdrkit pathsFromGraph;
+    #isoName = "${relName}-${platform}.iso";
+
+    bootable = true;
+    bootImage = "boot/grub/stage2_eltorito";
+
+    #compressImage = ...;
+
+    volumeID = cdLabel;
+
+    # Single files to be copied to fixed locations on the CD.
+    contents =
+      [ { source = "${pkgs.grub}/lib/grub/${if pkgs.stdenv.system == "i686-linux" then "i386-pc" else "x86_64-unknown"}/stage2_eltorito";
+          target = "boot/grub/stage2_eltorito";
+        }
+        { source = pkgs.writeText "menu.lst" grubCfg;
+          target = "boot/grub/menu.lst";
+        }
+        { source = config.boot.kernelPackages.kernel + "/vmlinuz";
+          target = "boot/vmlinuz";
+        }
+        { source = config.system.build.initialRamdisk + "/initrd";
+          target = "boot/initrd";
+        }
+        { source = config.boot.grubSplashImage;
+          target = "boot/background.xpm.gz";
+        }
+      ];
+
+    # Closures to be copied to the Nix store on the CD.
+    storeContents =
+      [ { object = config.system.build.bootStage2;
+          symlink = "/init";
+        }
+        { object = config.system.build.system;
+          symlink = "/system";
+        }
+      ];
+  };
+}
-- 
GitLab


From f9cfe7c4ee87c13df1d686d29dd2d47fd4a7d581 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 5 Jun 2009 15:03:56 +0000
Subject: [PATCH 1562/5331] * The activation script can't use /bin/sh as its
 interpreter because   it creates the /bin/sh symlink, which may not exist yet
 (esp. when   booting from CD).

svn path=/nixos/branches/modular-nixos/; revision=15875
---
 modules/system/activation/activation-script.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/system/activation/activation-script.nix b/modules/system/activation/activation-script.nix
index 7d3f6b2ceec..64dc5d6b936 100644
--- a/modules/system/activation/activation-script.nix
+++ b/modules/system/activation/activation-script.nix
@@ -205,7 +205,7 @@ in
               activateLibNames = attrNames activateLib;
           in {
           script = pkgs.writeScript "nixos-activation-script"
-            ("#!/bin/sh\n"
+            ("#! ${pkgs.stdenv.shell}\n"
              + textClosureMap id activateLib activateLibNames + "\n"
                # make sure that the activate snippet is added last.
              + withHeadlines.activate.text);
-- 
GitLab


From d69710cdf4115b7fa1bc76e1b77a007b9f6c9894 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 5 Jun 2009 15:04:33 +0000
Subject: [PATCH 1563/5331] * Removed redundant import (Nicolas Pierron).

svn path=/nixos/branches/modular-nixos/; revision=15876
---
 default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/default.nix b/default.nix
index 8950f08707a..d628a3a5231 100644
--- a/default.nix
+++ b/default.nix
@@ -1,4 +1,4 @@
-{ configuration ? import (import ./lib/from-env.nix "NIXOS_CONFIG" /etc/nixos/configuration.nix)
+{ configuration ? import ./lib/from-env.nix "NIXOS_CONFIG" /etc/nixos/configuration.nix
 }:
 
 let
-- 
GitLab


From f4b5a21d59e15273fa8025c8e7337ca1469fc2a0 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 5 Jun 2009 15:04:58 +0000
Subject: [PATCH 1564/5331] * Fix building the manual.

svn path=/nixos/branches/modular-nixos/; revision=15877
---
 doc/manual/default.nix                 | 8 +++++---
 modules/services/misc/nixos-manual.nix | 9 +++++++--
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/doc/manual/default.nix b/doc/manual/default.nix
index fe22e4f6c8b..e44dbb56c41 100644
--- a/doc/manual/default.nix
+++ b/doc/manual/default.nix
@@ -1,12 +1,14 @@
-{nixpkgs ? ../../../nixpkgs}:
+{pkgs}:
 
 let
 
-  pkgs = import nixpkgs {};
+  manualConfig =
+    { environment.checkConfigurationOptions = false;
+    };
 
   options = builtins.toFile "options.xml" (builtins.unsafeDiscardStringContext
     (builtins.toXML (pkgs.lib.optionAttrSetToDocList ""
-      (import ../../system/system.nix {inherit nixpkgs; configuration = {};}).optionDeclarations)));
+      (import ../../lib/eval-config.nix {inherit pkgs; configuration = manualConfig;}).optionDeclarations)));
 
   optionsDocBook = pkgs.runCommand "options-db.xml" {} ''
     ${pkgs.libxslt}/bin/xsltproc -o $out ${./options-to-docbook.xsl} ${options} 
diff --git a/modules/services/misc/nixos-manual.nix b/modules/services/misc/nixos-manual.nix
index 9ff0150c921..fe26591b8ba 100644
--- a/modules/services/misc/nixos-manual.nix
+++ b/modules/services/misc/nixos-manual.nix
@@ -40,7 +40,9 @@ let
         };
 
         manualFile = mkOption {
-          default = null;
+          # Note: we can't use a default here (see below), since it
+          # causes an infinite recursion building the manual.
+          default = null; 
           description = "
             NixOS manual HTML file
           ";
@@ -59,7 +61,10 @@ in let # !!! Bug in Nix 0.13pre14722, otherwise the following line is not aware
 
   realManualFile =
     if manualFile == null then
-      (import ../doc/manual {nixpkgs = pkgs;})+"/manual.html"
+      # We could speed up the evaluation of the manual expression by
+      # providing it the optionDeclarations of the current
+      # configuration.
+      "${import ../../../doc/manual {inherit pkgs;}}/manual.html"
     else
       manualFile;
 
-- 
GitLab


From 5cf8604b1e00bdde23cf26eb0396778e735232dc Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 5 Jun 2009 15:10:15 +0000
Subject: [PATCH 1565/5331] * Module that contains the configuration for the
 NixOS installation CD   (not yet complete).

svn path=/nixos/branches/modular-nixos/; revision=15878
---
 modules/installer/cd-dvd/installation-cd.nix | 80 ++++++++++++++++++++
 1 file changed, 80 insertions(+)
 create mode 100644 modules/installer/cd-dvd/installation-cd.nix

diff --git a/modules/installer/cd-dvd/installation-cd.nix b/modules/installer/cd-dvd/installation-cd.nix
new file mode 100644
index 00000000000..24c01dcfe4b
--- /dev/null
+++ b/modules/installer/cd-dvd/installation-cd.nix
@@ -0,0 +1,80 @@
+# This module contains the configuration for the NixOS installation CD.
+
+{config, pkgs, ...}:
+
+{
+  require = [./iso-image.nix];
+
+  # Don't include X libraries.
+  services.sshd.forwardX11 = false;
+  fonts.enableFontConfig = false;
+
+  # Show the manual.
+  services.showManual.enable = true;
+
+  # Let the user play Rogue on TTY 8 during the installation.
+  services.rogue.enable = true;
+
+  # Disable some other stuff we don't need.
+  security.sudo.enable = false;
+
+  # Include some utilities that are useful for installing or repairing
+  # the system.
+  environment.systemPackages =
+    [ pkgs.subversion # for nixos-checkout
+      pkgs.w3m # needed for the manual anyway
+      pkgs.testdisk # useful for repairing boot problems
+      pkgs.mssys # for writing Microsoft boot sectors / MBRs
+      pkgs.ntfsprogs # for resizing NTFS partitions
+      pkgs.parted
+      pkgs.sshfsFuse
+    ];
+
+  # The initrd has to contain any module that might be necessary for
+  # mounting the CD/DVD.
+  boot.initrd.extraKernelModules =
+    [ # SATA/PATA support.
+      "ahci"
+
+      "ata_piix"
+
+      "sata_inic162x" "sata_nv" "sata_promise" "sata_qstor"
+      "sata_sil" "sata_sil24" "sata_sis" "sata_svw" "sata_sx4"
+      "sata_uli" "sata_via" "sata_vsc"
+
+      "pata_ali" "pata_amd" "pata_artop" "pata_atiixp"
+      "pata_cs5520" "pata_cs5530" /* "pata_cs5535" */ "pata_efar"
+      "pata_hpt366" "pata_hpt37x" "pata_hpt3x2n" "pata_hpt3x3"
+      "pata_it8213" "pata_it821x" "pata_jmicron" "pata_marvell"
+      "pata_mpiix" "pata_netcell" "pata_ns87410" "pata_oldpiix"
+      "pata_pcmcia" "pata_pdc2027x" /* "pata_qdi" */ "pata_rz1000"
+      "pata_sc1200" "pata_serverworks" "pata_sil680" "pata_sis"
+      "pata_sl82c105" "pata_triflex" "pata_via"
+      # "pata_winbond" <-- causes timeouts in sd_mod
+
+      # SCSI support (incomplete).
+      "3w-9xxx" "3w-xxxx" "aic79xx" "aic7xxx" "arcmsr" 
+
+      # USB support, especially for booting from USB CD-ROM
+      # drives.  Also include USB keyboard support for when
+      # something goes wrong in stage 1.
+      "ehci_hcd"
+      "ohci_hcd"
+      "uhci_hcd"
+      "usbhid"
+      "usb_storage"
+
+      # Firewire support.  Not tested.
+      "ohci1394" "sbp2"
+
+      # Virtio (QEMU, KVM etc.) support.
+      "virtio_net" "virtio_pci" "virtio_blk" "virtio_balloon"
+
+      # Wait for SCSI devices to appear.
+      "scsi_wait_scan"
+    ];
+
+  # nixos-install will do a pull from this channel to speed up the
+  # installation.
+  installer.nixpkgsURL = http://nixos.org/releases/nixpkgs/channels/nixpkgs-unstable;
+}
-- 
GitLab


From 0a0260514d430e4a2742bbc2ab2ffc9415d3b232 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 5 Jun 2009 16:02:58 +0000
Subject: [PATCH 1566/5331] * Renamed boot.localCommands to
 boot.postBootCommands since it wasn't   such a good name (local to what?).

svn path=/nixos/branches/modular-nixos/; revision=15879
---
 modules/installer/cd-dvd/iso-image.nix |  8 ++++++
 modules/system/boot/stage-2-init.sh    |  2 +-
 modules/system/boot/stage-2.nix        | 40 +++++++++++++-------------
 3 files changed, 29 insertions(+), 21 deletions(-)

diff --git a/modules/installer/cd-dvd/iso-image.nix b/modules/installer/cd-dvd/iso-image.nix
index 64f788993fe..49d1e5e24a3 100644
--- a/modules/installer/cd-dvd/iso-image.nix
+++ b/modules/installer/cd-dvd/iso-image.nix
@@ -85,4 +85,12 @@ in
         }
       ];
   };
+
+  # After booting, register the contents of the Nix store on the CD in
+  # the Nix database in the tmpfs.
+  boot.postBootCommands =
+    ''
+      ${config.environment.nix}/bin/nix-store --load-db < /nix-path-registration
+      rm /nix-path-registration
+    '';
 }
diff --git a/modules/system/boot/stage-2-init.sh b/modules/system/boot/stage-2-init.sh
index 121cf46e12a..f8cd3e913c3 100644
--- a/modules/system/boot/stage-2-init.sh
+++ b/modules/system/boot/stage-2-init.sh
@@ -131,7 +131,7 @@ export MODULE_DIR=@kernel@/lib/modules/
 
 
 # Run any user-specified commands.
-@shell@ @bootLocal@
+@shell@ @postBootCommands@
 
 
 # Start Upstart's init.  We start it through the
diff --git a/modules/system/boot/stage-2.nix b/modules/system/boot/stage-2.nix
index f0e90452ebe..440ff70965f 100644
--- a/modules/system/boot/stage-2.nix
+++ b/modules/system/boot/stage-2.nix
@@ -4,12 +4,13 @@ let
 
   options = {
 
-    boot.localCommands = pkgs.lib.mkOption {
+    boot.postBootCommands = pkgs.lib.mkOption {
       default = "";
-      example = "text=anything; echo You can put $text here.";
-      description = "
+      example = "rm -f /var/log/messages";
+      merge = pkgs.lib.mergeStringOption;
+      description = ''
         Shell commands to be executed just before Upstart is started.
-      ";
+      '';
     };
 
   };
@@ -19,28 +20,27 @@ let
   activateConfiguration = config.system.activationScripts.script;
 
   # Path for Upstart jobs.  Should be quite minimal.
-  upstartPath = [
-    pkgs.coreutils
-    pkgs.findutils
-    pkgs.gnugrep
-    pkgs.gnused
-    pkgs.upstart
-  ];
-
-  bootLocal = config.boot.localCommands;
+  upstartPath =
+    [ pkgs.coreutils
+      pkgs.findutils
+      pkgs.gnugrep
+      pkgs.gnused
+      pkgs.upstart
+    ];
 
   bootStage2 = substituteAll {
     src = ./stage-2-init.sh;
     isExecutable = true;
     inherit kernel upstart activateConfiguration upstartPath;
-    path = [
-      coreutils
-      utillinux
-      udev
-      upstart
-    ];
-    bootLocal = writeText "local-cmds" bootLocal;
+    path =
+      [ coreutils
+        utillinux
+        udev
+        upstart
+      ];
+    postBootCommands = writeText "local-cmds" config.boot.postBootCommands;
   };
+  
 in
 
 {
-- 
GitLab


From 86509aa159bdad55ab9fe283b7f2ed40931146e7 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 5 Jun 2009 17:16:42 +0000
Subject: [PATCH 1567/5331] * Output the manual as XHTML.  This also sets the
 charset correctly.

svn path=/nixos/branches/modular-nixos/; revision=15881
---
 doc/manual/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/manual/default.nix b/doc/manual/default.nix
index e44dbb56c41..02bce7f8e1c 100644
--- a/doc/manual/default.nix
+++ b/doc/manual/default.nix
@@ -37,7 +37,7 @@ let
       ln -s ${optionsDocBook} options-db.xml
       xsltproc $xsltFlags --nonet --xinclude \
         --output $out/manual.html \
-        ${pkgs.docbook5_xsl}/xml/xsl/docbook/html/docbook.xsl \
+        ${pkgs.docbook5_xsl}/xml/xsl/docbook/xhtml/docbook.xsl \
         ./manual.xml
       cp ${./style.css} $out/style.css
       ensureDir $out/nix-support
-- 
GitLab


From dbe229f3aac983750c405b30c2b487bba765d747 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 5 Jun 2009 17:18:20 +0000
Subject: [PATCH 1568/5331] * $LOCALE_ARCHIVE needs to be set, otherwise the
 "locale" command will   fail and the ttys won't initialised in Unicode mode.

svn path=/nixos/branches/modular-nixos/; revision=15882
---
 modules/tasks/kbd.nix | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/modules/tasks/kbd.nix b/modules/tasks/kbd.nix
index 42511a76156..08ce407fe3e 100644
--- a/modules/tasks/kbd.nix
+++ b/modules/tasks/kbd.nix
@@ -61,14 +61,15 @@ in
         pkgs.kbd
       ];
       
-      job = "
-        description \"Keyboard / console initialisation\"
+      job = ''
+        description "Keyboard / console initialisation"
 
         start on udev
 
         script
 
           export LANG=${defaultLocale}
+          export LOCALE_ARCHIVE=/var/run/current-system/sw/lib/locale/locale-archive
           export PATH=${pkgs.gzip}/bin:$PATH # Needed by setfont
 
           set +e # continue in case of errors
@@ -80,13 +81,13 @@ in
 
           charMap=$(${pkgs.glibc}/bin/locale charmap)
 
-          if test \"$charMap\" = UTF-8; then
+          if test "$charMap" = UTF-8; then
 
             for tty in ${toString ttys}; do
 
               # Tell the console output driver that the bytes arriving are
               # UTF-8 encoded multibyte sequences. 
-              echo -n -e '\\033%G' > $tty
+              echo -n -e '\033%G' > $tty
 
             done
 
@@ -99,7 +100,7 @@ in
 
               # Tell the console output driver that the bytes arriving are
               # UTF-8 encoded multibyte sequences. 
-              echo -n -e '\\033%@' > $tty
+              echo -n -e '\033%@' > $tty
 
             done
 
@@ -119,9 +120,8 @@ in
           # Set the keymap.
           ${pkgs.kbd}/bin/loadkeys '${consoleKeyMap}'
 
-
         end script
-      ";
+      '';
     
     }];
   };
-- 
GitLab


From eb8b534173511e29c2ca58410b10863a434932a3 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 5 Jun 2009 17:19:30 +0000
Subject: [PATCH 1569/5331] * Include only the en_US locale on the CD.  This
 saves 75 MiB or so.

svn path=/nixos/branches/modular-nixos/; revision=15883
---
 modules/config/i18n.nix                      | 33 ++++++++++++++++++--
 modules/config/system-path.nix               |  1 -
 modules/installer/cd-dvd/installation-cd.nix | 20 ++++++++++++
 modules/programs/bash/bash.nix               |  1 -
 modules/programs/bash/bashrc.sh              |  3 --
 modules/programs/info.nix                    |  5 +++
 6 files changed, 55 insertions(+), 8 deletions(-)

diff --git a/modules/config/i18n.nix b/modules/config/i18n.nix
index c7a6f1c24d8..744eaee6667 100644
--- a/modules/config/i18n.nix
+++ b/modules/config/i18n.nix
@@ -16,6 +16,18 @@ let
         ";
       };
 
+      supportedLocales = mkOption {
+        default = ["all"];
+        example = ["en_US.UTF-8/UTF-8" "nl_NL.UTF-8/UTF-8" "nl_NL/ISO-8859-1"];
+        description = ''
+          List of locales that the system should support.  The value
+          <literal>"all"</literal> means that all locales supported by
+          Glibc will be installed.  A full list of supported locales
+          can be found at <link
+          xlink:href="http://sourceware.org/cgi-bin/cvsweb.cgi/libc/localedata/SUPPORTED?cvsroot=glibc"/>.
+        '';
+      };
+
       consoleFont = mkOption {
         default = "lat9w-16";
         example = "LatArCyrHeb-16";
@@ -39,8 +51,23 @@ in
 
 ###### implementation
 
+let
+
+  glibcLocales = pkgs.glibcLocales.override {
+    allLocales = pkgs.lib.any (x: x == "all") config.i18n.supportedLocales;
+    locales = config.i18n.supportedLocales;
+  };
+
+in
+
 {
-  require = [
-    options
-  ];
+  require = options;
+
+  environment.systemPackages = [glibcLocales];
+
+  environment.shellInit =
+    ''
+      export LANG=${config.i18n.defaultLocale}
+      export LOCALE_ARCHIVE=/var/run/current-system/sw/lib/locale/locale-archive
+    '';
 }
diff --git a/modules/config/system-path.nix b/modules/config/system-path.nix
index 62fbde95f7f..804b9419a45 100644
--- a/modules/config/system-path.nix
+++ b/modules/config/system-path.nix
@@ -21,7 +21,6 @@ let
       pkgs.e2fsprogs
       pkgs.findutils
       pkgs.glibc # for ldd, getent
-      pkgs.glibcLocales
       pkgs.gnugrep
       pkgs.gnused
       pkgs.gnutar
diff --git a/modules/installer/cd-dvd/installation-cd.nix b/modules/installer/cd-dvd/installation-cd.nix
index 24c01dcfe4b..e5181aebda6 100644
--- a/modules/installer/cd-dvd/installation-cd.nix
+++ b/modules/installer/cd-dvd/installation-cd.nix
@@ -18,6 +18,10 @@
   # Disable some other stuff we don't need.
   security.sudo.enable = false;
 
+  # Include only the en_US locale.  This saves 75 MiB or so compared to
+  # the full glibcLocales package.
+  i18n.supportedLocales = ["en_US.UTF-8/UTF-8" "en_US/ISO-8859-1"];
+
   # Include some utilities that are useful for installing or repairing
   # the system.
   environment.systemPackages =
@@ -77,4 +81,20 @@
   # nixos-install will do a pull from this channel to speed up the
   # installation.
   installer.nixpkgsURL = http://nixos.org/releases/nixpkgs/channels/nixpkgs-unstable;
+
+  # Provide the NixOS/Nixpkgs sources in /etc/nixos.  This is required
+  # for nixos-install.
+  boot.postBootCommands =
+    ''
+      export PATH=${pkgs.gnutar}/bin:${pkgs.bzip2}/bin:$PATH
+
+      mkdir -p /mnt
+
+      echo "unpacking the NixOS/Nixpkgs sources..."
+      mkdir -p /etc/nixos/nixos
+      tar xjf /install/nixos.tar.bz2 -C /etc/nixos/nixos
+      mkdir -p /etc/nixos/nixpkgs
+      tar xjf /install/nixpkgs.tar.bz2 -C /etc/nixos/nixpkgs
+      chown -R root.root /etc/nixos
+    '';
 }
diff --git a/modules/programs/bash/bash.nix b/modules/programs/bash/bash.nix
index 205cadea7f3..f7ac48ccb28 100644
--- a/modules/programs/bash/bash.nix
+++ b/modules/programs/bash/bash.nix
@@ -33,7 +33,6 @@ in
           systemPath = config.system.path;
           wrapperDir = config.security.wrapperDir;
           modulesTree = config.system.modulesTree;
-          defaultLocale = config.i18n.defaultLocale;
           shellInit = config.environment.shellInit;
         };
         target = "bashrc";      
diff --git a/modules/programs/bash/bashrc.sh b/modules/programs/bash/bashrc.sh
index d18cb010b50..92ca71100ee 100644
--- a/modules/programs/bash/bashrc.sh
+++ b/modules/programs/bash/bashrc.sh
@@ -5,11 +5,8 @@ export MODULE_DIR=@modulesTree@/lib/modules
 export NIXPKGS_CONFIG=/nix/etc/config.nix
 export NIXPKGS_ALL=/etc/nixos/nixpkgs
 export PAGER="less -R"
-export LANG=@defaultLocale@
 export EDITOR=nano
-export INFOPATH=/var/run/current-system/sw/info:/var/run/current-system/sw/share/info
 export LOCATE_PATH=/var/cache/locatedb
-export LOCALE_ARCHIVE=/var/run/current-system/sw/lib/locale/locale-archive
 @shellInit@
 
 
diff --git a/modules/programs/info.nix b/modules/programs/info.nix
index e3b8025f933..a12aef6a7d0 100644
--- a/modules/programs/info.nix
+++ b/modules/programs/info.nix
@@ -33,4 +33,9 @@ in
 
 {
   environment.systemPackages = [infoWrapper];
+  
+  environment.shellInit =
+    ''
+      export INFOPATH=/var/run/current-system/sw/info:/var/run/current-system/sw/share/info  
+    '';
 }
-- 
GitLab


From 606a8c87a1f7b5dfe5f7957c2794c71301560ece Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 8 Jun 2009 22:43:41 +0000
Subject: [PATCH 1570/5331] svn path=/nixos/branches/modular-nixos/;
 revision=15894

---
 modules/installer/tools/tools.nix | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/modules/installer/tools/tools.nix b/modules/installer/tools/tools.nix
index 2f91ef2c629..37b7589f477 100644
--- a/modules/installer/tools/tools.nix
+++ b/modules/installer/tools/tools.nix
@@ -44,12 +44,10 @@ let
     name = "nixos-install";
     src = ./nixos-install.sh;
 
-    inherit (pkgs) perl;
+    inherit (pkgs) perl pathsFromGraph;
     nix = config.environment.nix;
     nixpkgsURL = config.installer.nixpkgsURL;
 
-    pathsFromGraph = "${pkgs.path}/build-support/kernel/paths-from-graph.pl";
-
     nixClosure = pkgs.runCommand "closure"
       {exportReferencesGraph = ["refs" config.environment.nix];}
       "cp refs $out";
-- 
GitLab


From 42513650d855a58c8fb5402c2738df50ebe01b4e Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 8 Jun 2009 22:44:05 +0000
Subject: [PATCH 1571/5331] svn path=/nixos/branches/modular-nixos/;
 revision=15895

---
 modules/services/misc/nixos-manual.nix | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/modules/services/misc/nixos-manual.nix b/modules/services/misc/nixos-manual.nix
index fe26591b8ba..d87e8cac57e 100644
--- a/modules/services/misc/nixos-manual.nix
+++ b/modules/services/misc/nixos-manual.nix
@@ -55,9 +55,7 @@ let
 in
 
 let
-  cfg = config.services.showManual;
-in let # !!! Bug in Nix 0.13pre14722, otherwise the following line is not aware of cfg.
-  inherit (cfg) enable ttyNumber browserPackage browserCommand manualFile;
+  inherit (config.services.showManual) enable ttyNumber browserPackage browserCommand manualFile;
 
   realManualFile =
     if manualFile == null then
@@ -103,7 +101,7 @@ mkIf enable {
 
     mingetty = {
       helpLine = mkThenElse {
-        thenPart = "\nPress <Alt-F${toString ttyNumber}> for NixOS manual.";
+        thenPart = "\nPress <Alt-F${toString ttyNumber}> for the NixOS manual.";
         elsePart = "";
       };
     };
-- 
GitLab


From b7cad3c059d9d21f15297dda3245443f9defabce Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 8 Jun 2009 22:44:59 +0000
Subject: [PATCH 1572/5331] * Style fix.

svn path=/nixos/branches/modular-nixos/; revision=15896
---
 modules/services/misc/rogue.nix | 40 +++++++++++++--------------------
 1 file changed, 15 insertions(+), 25 deletions(-)

diff --git a/modules/services/misc/rogue.nix b/modules/services/misc/rogue.nix
index 0306033adc0..ddda413727a 100644
--- a/modules/services/misc/rogue.nix
+++ b/modules/services/misc/rogue.nix
@@ -24,41 +24,31 @@ let
     };
   };
 
-inherit (pkgs.lib) optional;
-
-inherit (config.services.rogue) enable ttyNumber;
+  cfg = config.services.rogue;
 
 in
 
-{
-  require = [
-    options
-  ];
+pkgs.lib.mkIf cfg.enable {
+  require = [options];
 
-  boot = {
-    extraTTYs = optional enable ttyNumber;
-  };
+  boot.extraTTYs = [cfg.ttyNumber];
   
-  services = {
-    extraJobs = optional enable {
-      name = "rogue";
+  services.extraJobs = pkgs.lib.singleton
+    { name = "rogue";
 
       job = ''
         description "rogue game"
 	
-	start on udev
-	stop on shutdown
-	respawn ${pkgs.rogue}/bin/rogue < /dev/tty${toString ttyNumber} > /dev/tty${toString ttyNumber} 2>&1
+        start on udev
+        stop on shutdown
+        respawn ${pkgs.rogue}/bin/rogue < /dev/tty${toString cfg.ttyNumber} > /dev/tty${toString cfg.ttyNumber} 2>&1
       '';
     };
-    ttyBackgrounds = {
-      specificThemes = optional enable {
-        tty = ttyNumber;
-	theme = pkgs.themes "theme-gnu";
-      };
-    };
-    mingetty = {
-      helpLine = if enable then "\nPress <Alt-F${toString ttyNumber}> to play rogue." else "";
+
+  services.ttyBackgrounds.specificThemes = pkgs.lib.singleton
+    { tty = cfg.ttyNumber;
+      theme = pkgs.themes "theme-gnu";
     };
-  };
+
+  services.mingetty.helpLine = "\nPress <Alt-F${toString cfg.ttyNumber}> to play Rogue.";
 }
-- 
GitLab


From ca061eb628db7c0f824dfe9220acbe56fd8bda0e Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 8 Jun 2009 22:45:45 +0000
Subject: [PATCH 1573/5331] * Include the NixOS/Nixpkgs trees on the CD.

svn path=/nixos/branches/modular-nixos/; revision=15897
---
 modules/installer/cd-dvd/installation-cd.nix | 30 ++++++++++++++++++--
 1 file changed, 28 insertions(+), 2 deletions(-)

diff --git a/modules/installer/cd-dvd/installation-cd.nix b/modules/installer/cd-dvd/installation-cd.nix
index e5181aebda6..e4496384b85 100644
--- a/modules/installer/cd-dvd/installation-cd.nix
+++ b/modules/installer/cd-dvd/installation-cd.nix
@@ -2,9 +2,33 @@
 
 {config, pkgs, ...}:
 
+let
+
+  # 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.  !!! Once
+  # we use squashfs, maybe we won't need this anymore.
+  makeTarball = tarName: input: pkgs.runCommand "tarball" {inherit tarName;}
+    ''
+      ensureDir $out
+      (cd ${input} && tar cvfj $out/${tarName} . \
+        --exclude '*~' --exclude 'result')
+    '';
+
+  # Put the current directory in a tarball.
+  nixosTarball = makeTarball "nixos.tar.bz2" (pkgs.lib.cleanSource ../../..);
+
+  # Put Nixpkgs in a tarball.
+  nixpkgsTarball = makeTarball "nixpkgs.tar.bz2" (pkgs.lib.cleanSource pkgs.path);
+
+in
+
 {
   require = [./iso-image.nix];
 
+  # Use Linux 2.6.29.
+  boot.kernelPackages = pkgs.kernelPackages_2_6_29;
+
   # Don't include X libraries.
   services.sshd.forwardX11 = false;
   fonts.enableFontConfig = false;
@@ -92,9 +116,11 @@
 
       echo "unpacking the NixOS/Nixpkgs sources..."
       mkdir -p /etc/nixos/nixos
-      tar xjf /install/nixos.tar.bz2 -C /etc/nixos/nixos
+      tar xjf ${nixosTarball}/nixos.tar.bz2 -C /etc/nixos/nixos
       mkdir -p /etc/nixos/nixpkgs
-      tar xjf /install/nixpkgs.tar.bz2 -C /etc/nixos/nixpkgs
+      tar xjf ${nixpkgsTarball}/nixpkgs.tar.bz2 -C /etc/nixos/nixpkgs
       chown -R root.root /etc/nixos
     '';
+
+  
 }
-- 
GitLab


From d5fbea2dbb8f861517c1380abd6421849efec6ed Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 9 Jun 2009 07:46:41 +0000
Subject: [PATCH 1574/5331] svn path=/nixos/trunk/; revision=15899

---
 installer/default.nix | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/installer/default.nix b/installer/default.nix
index dfa2ab38eeb..02c1c514e6c 100644
--- a/installer/default.nix
+++ b/installer/default.nix
@@ -21,12 +21,10 @@ in
     name = "nixos-install";
     src = ./nixos-install.sh;
 
-    inherit (pkgs) perl;
+    inherit (pkgs) perl pathsFromGraph;
     inherit nix;
     nixpkgsURL = config.installer.nixpkgsURL;
 
-    pathsFromGraph = "${pkgs.path}/build-support/kernel/paths-from-graph.pl";
-
     nixClosure = pkgs.runCommand "closure"
       {exportReferencesGraph = ["refs" nix];}
       "cp refs $out";
-- 
GitLab


From 37edcf4fae23e1e3862ccbad063f91e712d13206 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 9 Jun 2009 12:01:31 +0000
Subject: [PATCH 1575/5331] * Provide an option to add more files to the ISO
 image.

svn path=/nixos/branches/modular-nixos/; revision=15903
---
 lib/make-iso9660-image.sh              | 19 ++++++-
 modules/installer/cd-dvd/iso-image.nix | 79 ++++++++++++++++++--------
 2 files changed, 71 insertions(+), 27 deletions(-)

diff --git a/lib/make-iso9660-image.sh b/lib/make-iso9660-image.sh
index 5ba133b6890..a1d7f62f35c 100644
--- a/lib/make-iso9660-image.sh
+++ b/lib/make-iso9660-image.sh
@@ -6,13 +6,24 @@ targets_=($targets)
 objects=($objects)
 symlinks=($symlinks)
 
+
+# Remove the initial slash from a path, since genisofs likes it that way.
+stripSlash() {
+    res="$1"
+    if test "${res:0:1}" = /; then res=${res:1}; fi
+}
+
+stripSlash "$bootImage"; bootImage="$res"
+
+
 if test -n "$bootable"; then
 
     # The -boot-info-table option modifies the $bootImage file, so
     # find it in `contents' and make a copy of it (since the original
     # is read-only in the Nix store...).
     for ((i = 0; i < ${#targets_[@]}; i++)); do
-        if test "${targets_[$i]}" = "$bootImage"; then
+        stripSlash "${targets_[$i]}"
+        if test "$res" = "$bootImage"; then
             echo "copying the boot image ${sources_[$i]}"
             cp "${sources_[$i]}" boot.img
             chmod u+w boot.img
@@ -23,11 +34,14 @@ if test -n "$bootable"; then
     bootFlags="-b $bootImage -c .boot.cat -no-emul-boot -boot-load-size 4 -boot-info-table"
 fi
 
+
 touch pathlist
 
+
 # Add the individual files.
 for ((i = 0; i < ${#targets_[@]}; i++)); do
-    echo "${targets_[$i]}=$(readlink -f ${sources_[$i]})" >> pathlist
+    stripSlash "${targets_[$i]}"
+    echo "$res=$(readlink -f ${sources_[$i]})" >> pathlist
 done
 
 
@@ -54,6 +68,7 @@ for ((n = 0; n < ${#objects[*]}; n++)); do
     fi
 done
 
+# !!! what does this do?
 cat pathlist | sed -e 's/=\(.*\)=\(.*\)=/\\=\1=\2\\=/' | tee pathlist.safer
 
 
diff --git a/modules/installer/cd-dvd/iso-image.nix b/modules/installer/cd-dvd/iso-image.nix
index 49d1e5e24a3..cec42c24933 100644
--- a/modules/installer/cd-dvd/iso-image.nix
+++ b/modules/installer/cd-dvd/iso-image.nix
@@ -5,6 +5,23 @@
 {config, pkgs, ...}:
 
 let
+
+  options = {
+
+    isoImage.contents = pkgs.lib.mkOption {
+      example =
+        [ { source = pkgs.memtest86 + "/memtest.bin";
+            target = "boot/memtest.bin";
+          }
+        ];
+      description = ''
+        This option lists files that have to be copied to fixed
+        locations in the generated ISO image.
+      '';
+    };
+
+  };
+
  
   cdLabel = "NIXOS_INSTALLATION_CD";
 
@@ -15,18 +32,14 @@ let
       timeout 10
       splashimage /boot/background.xpm.gz
 
-      title Boot from hard disk
-        root (hd0)
-        chainloader +1
-    
-      title NixOS Installer / Rescue
-        kernel /boot/vmlinuz init=/init ${toString config.boot.kernelParams}
-        initrd /boot/initrd
+      ${config.boot.extraGrubEntries}
     '';
   
 in
 
 {
+  require = options;
+
   # In stage 1 of the boot, mount the CD/DVD as the root FS by label
   # so that we don't need to know its device.
   fileSystems =
@@ -44,36 +57,52 @@ in
   # and move that bit of code here.
   boot.isLiveCD = true;
 
+  # Individual files to be included on the CD, outside of the Nix
+  # store on the CD.
+  isoImage.contents =
+    [ { source = "${pkgs.grub}/lib/grub/${if pkgs.stdenv.system == "i686-linux" then "i386-pc" else "x86_64-unknown"}/stage2_eltorito";
+        target = "/boot/grub/stage2_eltorito";
+      }
+      { source = pkgs.writeText "menu.lst" grubCfg;
+        target = "/boot/grub/menu.lst";
+      }
+      { source = config.boot.kernelPackages.kernel + "/vmlinuz";
+        target = "/boot/vmlinuz";
+      }
+      { source = config.system.build.initialRamdisk + "/initrd";
+        target = "/boot/initrd";
+      }
+      { source = config.boot.grubSplashImage;
+        target = "/boot/background.xpm.gz";
+      }
+    ];
+
+  # The Grub menu.
+  boot.extraGrubEntries =
+    ''
+      title Boot from hard disk
+        root (hd0)
+        chainloader +1
+    
+      title NixOS Installer / Rescue
+        kernel /boot/vmlinuz init=/init ${toString config.boot.kernelParams}
+        initrd /boot/initrd
+    '';
+
   # Create the ISO image.
   system.build.isoImage = import ../../../lib/make-iso9660-image.nix {
     inherit (pkgs) stdenv perl cdrkit pathsFromGraph;
     #isoName = "${relName}-${platform}.iso";
 
     bootable = true;
-    bootImage = "boot/grub/stage2_eltorito";
+    bootImage = "/boot/grub/stage2_eltorito";
 
     #compressImage = ...;
 
     volumeID = cdLabel;
 
     # Single files to be copied to fixed locations on the CD.
-    contents =
-      [ { source = "${pkgs.grub}/lib/grub/${if pkgs.stdenv.system == "i686-linux" then "i386-pc" else "x86_64-unknown"}/stage2_eltorito";
-          target = "boot/grub/stage2_eltorito";
-        }
-        { source = pkgs.writeText "menu.lst" grubCfg;
-          target = "boot/grub/menu.lst";
-        }
-        { source = config.boot.kernelPackages.kernel + "/vmlinuz";
-          target = "boot/vmlinuz";
-        }
-        { source = config.system.build.initialRamdisk + "/initrd";
-          target = "boot/initrd";
-        }
-        { source = config.boot.grubSplashImage;
-          target = "boot/background.xpm.gz";
-        }
-      ];
+    contents = config.isoImage.contents;
 
     # Closures to be copied to the Nix store on the CD.
     storeContents =
-- 
GitLab


From 6023722135a6ea90b8bb1f22aef57b9369f2bf44 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 9 Jun 2009 12:02:52 +0000
Subject: [PATCH 1576/5331] * Provide Memtest86 as a module.

svn path=/nixos/branches/modular-nixos/; revision=15904
---
 modules/installer/cd-dvd/installation-cd.nix |  8 +++++--
 modules/installer/cd-dvd/memtest.nix         | 24 ++++++++++++++++++++
 2 files changed, 30 insertions(+), 2 deletions(-)
 create mode 100644 modules/installer/cd-dvd/memtest.nix

diff --git a/modules/installer/cd-dvd/installation-cd.nix b/modules/installer/cd-dvd/installation-cd.nix
index e4496384b85..bf54f59c21e 100644
--- a/modules/installer/cd-dvd/installation-cd.nix
+++ b/modules/installer/cd-dvd/installation-cd.nix
@@ -24,7 +24,7 @@ let
 in
 
 {
-  require = [./iso-image.nix];
+  require = [./iso-image.nix ./memtest.nix];
 
   # Use Linux 2.6.29.
   boot.kernelPackages = pkgs.kernelPackages_2_6_29;
@@ -122,5 +122,9 @@ in
       chown -R root.root /etc/nixos
     '';
 
-  
+  services.mingetty.helpLine =
+    ''
+        
+      Log in as "root" with an empty password.
+    '';
 }
diff --git a/modules/installer/cd-dvd/memtest.nix b/modules/installer/cd-dvd/memtest.nix
new file mode 100644
index 00000000000..fb3aa817855
--- /dev/null
+++ b/modules/installer/cd-dvd/memtest.nix
@@ -0,0 +1,24 @@
+# This module adds Memtest86 to the Grub boot menu on the CD.  !!! It
+# would be nice if this also worked for normal configurations.
+
+{config, pkgs, ...}:
+
+let
+
+  memtestPath = "/boot/memtest.bin";
+
+in
+
+{
+  boot.extraGrubEntries =
+    ''
+      title Memtest86+
+        kernel ${memtestPath}
+    '';
+
+  isoImage.contents =
+    [ { source = pkgs.memtest86 + "/memtest.bin";
+        target = memtestPath;
+      }
+    ];
+}
-- 
GitLab


From 45e6fe420c7837a1389a6c2c1fcb99896666f41a Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 9 Jun 2009 13:14:43 +0000
Subject: [PATCH 1577/5331] svn path=/nixos/branches/modular-nixos/;
 revision=15905

---
 modules/installer/cd-dvd/installation-cd.nix | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/modules/installer/cd-dvd/installation-cd.nix b/modules/installer/cd-dvd/installation-cd.nix
index bf54f59c21e..6c8c437e073 100644
--- a/modules/installer/cd-dvd/installation-cd.nix
+++ b/modules/installer/cd-dvd/installation-cd.nix
@@ -24,7 +24,11 @@ let
 in
 
 {
-  require = [./iso-image.nix ./memtest.nix];
+  require =
+    [ ./iso-image.nix
+      ./memtest.nix
+      ../../../hardware/network/intel-3945abg.nix
+    ];
 
   # Use Linux 2.6.29.
   boot.kernelPackages = pkgs.kernelPackages_2_6_29;
-- 
GitLab


From 803d8b646f0b41817bf3e575a326b135faf254e2 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 9 Jun 2009 13:27:50 +0000
Subject: [PATCH 1578/5331] * Option isoImage.storeContents to add extra paths
 to the Nix store on   the CD.

svn path=/nixos/branches/modular-nixos/; revision=15906
---
 modules/installer/cd-dvd/installation-cd.nix |  9 +++++
 modules/installer/cd-dvd/iso-image.nix       | 39 +++++++++++++-------
 2 files changed, 35 insertions(+), 13 deletions(-)

diff --git a/modules/installer/cd-dvd/installation-cd.nix b/modules/installer/cd-dvd/installation-cd.nix
index 6c8c437e073..ca66a5b4728 100644
--- a/modules/installer/cd-dvd/installation-cd.nix
+++ b/modules/installer/cd-dvd/installation-cd.nix
@@ -126,9 +126,18 @@ in
       chown -R root.root /etc/nixos
     '';
 
+  # Some more help text.
   services.mingetty.helpLine =
     ''
         
       Log in as "root" with an empty password.
     '';
+
+  # To speed up installation a little bit, include the complete stdenv
+  # in the Nix store on the CD.
+  isoImage.storeContents =
+    [ { object = pkgs.stdenv;
+        symlink = "none";
+      }
+    ];
 }
diff --git a/modules/installer/cd-dvd/iso-image.nix b/modules/installer/cd-dvd/iso-image.nix
index cec42c24933..65abf4c18c4 100644
--- a/modules/installer/cd-dvd/iso-image.nix
+++ b/modules/installer/cd-dvd/iso-image.nix
@@ -15,8 +15,20 @@ let
           }
         ];
       description = ''
-        This option lists files that have to be copied to fixed
-        locations in the generated ISO image.
+        This option lists files to be copied to fixed locations in the
+        generated ISO image.
+      '';
+    };
+
+    isoImage.storeContents = pkgs.lib.mkOption {
+      example =
+        [ { object = pkgs.stdenv;
+            symlink = "/stdenv";
+          }
+        ];
+      description = ''
+        This option lists additional derivations to be included in the
+        Nix store in the generated ISO image.
       '';
     };
 
@@ -77,6 +89,17 @@ in
       }
     ];
 
+  # Closures to be copied to the Nix store on the CD, namely the init
+  # script and the top-level system configuration directory.
+  isoImage.storeContents =
+    [ { object = config.system.build.bootStage2;
+        symlink = "/init";
+      }
+      { object = config.system.build.system;
+        symlink = "/system";
+      }
+    ];
+
   # The Grub menu.
   boot.extraGrubEntries =
     ''
@@ -101,18 +124,8 @@ in
 
     volumeID = cdLabel;
 
-    # Single files to be copied to fixed locations on the CD.
     contents = config.isoImage.contents;
-
-    # Closures to be copied to the Nix store on the CD.
-    storeContents =
-      [ { object = config.system.build.bootStage2;
-          symlink = "/init";
-        }
-        { object = config.system.build.system;
-          symlink = "/system";
-        }
-      ];
+    storeContents = config.isoImage.storeContents;
   };
 
   # After booting, register the contents of the Nix store on the CD in
-- 
GitLab


From ba43b5d00068fa93bfe340454f77c5deb3f0fcdd Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 9 Jun 2009 15:23:03 +0000
Subject: [PATCH 1579/5331] * Set the CD volume ID and the ISO filename.

svn path=/nixos/branches/modular-nixos/; revision=15912
---
 modules/installer/cd-dvd/installation-cd.nix | 20 ++++++++++-
 modules/installer/cd-dvd/iso-image.nix       | 38 ++++++++++++++------
 2 files changed, 46 insertions(+), 12 deletions(-)

diff --git a/modules/installer/cd-dvd/installation-cd.nix b/modules/installer/cd-dvd/installation-cd.nix
index ca66a5b4728..68d2a76f93a 100644
--- a/modules/installer/cd-dvd/installation-cd.nix
+++ b/modules/installer/cd-dvd/installation-cd.nix
@@ -4,6 +4,18 @@
 
 let
 
+  options = {
+
+    system.nixosVersion = pkgs.lib.mkOption {
+      default = "${builtins.readFile ../../../VERSION}";
+      description = ''
+        NixOS version number.
+      '';
+    };
+  
+  };
+
+
   # 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.  !!! Once
@@ -25,11 +37,17 @@ in
 
 {
   require =
-    [ ./iso-image.nix
+    [ options
+      ./iso-image.nix
       ./memtest.nix
       ../../../hardware/network/intel-3945abg.nix
     ];
 
+  # ISO naming.
+  isoImage.isoName = "nixos-${config.system.nixosVersion}-${pkgs.stdenv.system}.iso";
+    
+  isoImage.volumeID = "NIXOS_INSTALLATION_CD_${config.system.nixosVersion}";
+  
   # Use Linux 2.6.29.
   boot.kernelPackages = pkgs.kernelPackages_2_6_29;
 
diff --git a/modules/installer/cd-dvd/iso-image.nix b/modules/installer/cd-dvd/iso-image.nix
index 65abf4c18c4..d17106cde32 100644
--- a/modules/installer/cd-dvd/iso-image.nix
+++ b/modules/installer/cd-dvd/iso-image.nix
@@ -8,6 +8,30 @@ let
 
   options = {
 
+    isoImage.isoName = pkgs.lib.mkOption {
+      default = "cd.iso";
+      description = ''
+        Name of the generated ISO image file.
+      '';
+    };
+
+    isoImage.compressImage = pkgs.lib.mkOption {
+      default = false;
+      description = ''
+        Whether the ISO image should be compressed using
+        <command>bzip2</command>.
+      '';
+    };
+
+    isoImage.volumeID = pkgs.lib.mkOption {
+      default = "NIXOS_BOOT_CD";
+      description = ''
+        Specifies the label or volume ID of the generated ISO image.
+        Note that the label is used by stage 1 of the boot process to
+        mount the CD, so it should be reasonably distinctive.
+      '';
+    };
+
     isoImage.contents = pkgs.lib.mkOption {
       example =
         [ { source = pkgs.memtest86 + "/memtest.bin";
@@ -34,8 +58,6 @@ let
 
   };
 
- 
-  cdLabel = "NIXOS_INSTALLATION_CD";
 
   # The configuration file for Grub.
   grubCfg = 
@@ -56,7 +78,7 @@ in
   # so that we don't need to know its device.
   fileSystems =
     [ { mountPoint = "/";
-        label = cdLabel;
+        label = config.isoImage.volumeID;
       }
     ];
 
@@ -115,17 +137,11 @@ in
   # Create the ISO image.
   system.build.isoImage = import ../../../lib/make-iso9660-image.nix {
     inherit (pkgs) stdenv perl cdrkit pathsFromGraph;
-    #isoName = "${relName}-${platform}.iso";
+    
+    inherit (config.isoImage) isoName compressImage volumeID contents storeContents;
 
     bootable = true;
     bootImage = "/boot/grub/stage2_eltorito";
-
-    #compressImage = ...;
-
-    volumeID = cdLabel;
-
-    contents = config.isoImage.contents;
-    storeContents = config.isoImage.storeContents;
   };
 
   # After booting, register the contents of the Nix store on the CD in
-- 
GitLab


From 1f8602afd2a9b6fdcd92f5c83ca7732ada6f5c24 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 10 Jun 2009 11:00:29 +0000
Subject: [PATCH 1580/5331] * Get rid of the old CD/DVD expressions. 
 live-dvd.nix is basically   rescue-dvd.nix (not tested though), i.e. it has
 all its extra   packages and includes the build-time dependencies.

svn path=/nixos/branches/modular-nixos/; revision=15917
---
 installer/cd-dvd/rescue-cd.nix        | 296 --------------------------
 installer/cd-dvd/rescue-dvd.nix       |  94 --------
 modules/installer/cd-dvd/live-dvd.nix |  83 ++++++++
 3 files changed, 83 insertions(+), 390 deletions(-)
 delete mode 100644 installer/cd-dvd/rescue-cd.nix
 delete mode 100644 installer/cd-dvd/rescue-dvd.nix
 create mode 100644 modules/installer/cd-dvd/live-dvd.nix

diff --git a/installer/cd-dvd/rescue-cd.nix b/installer/cd-dvd/rescue-cd.nix
deleted file mode 100644
index ded14cce701..00000000000
--- a/installer/cd-dvd/rescue-cd.nix
+++ /dev/null
@@ -1,296 +0,0 @@
-{ platform ? __currentSystem
-, relName ?
-    if builtins.pathExists ../../relname
-    then builtins.readFile ../../relname
-    else "nixos-${builtins.readFile ../../VERSION}"
-, compressImage ? false
-, nixpkgs ? ../../../nixpkgs
-# This option allows easy building of Rescue CD with 
-# modified package set / driver set / anything.
-# For easier maitenance, let overrider know the current
-# options
-, configurationOverrides ? (config: {})
-# Whether to put all the build-time dependencies on DVD
-, includeBuildDeps ? false
-, includeTarballs ? true
-}:
-
-rec {
-
-
-  cdLabel = "NIXOS_INSTALLATION_CD";
-
-  
-  baseConfiguration = {
-  
-    boot = {
-      isLiveCD = true;
-
-      extraModulePackages = [system.kernelPackages.aufs];
-      
-      kernelPackages = pkgs.kernelPackages_2_6_28;
-      
-      initrd = {
-        extraKernelModules = [
-          # The initrd should contain any modules necessary for
-          # mounting the CD.
-        
-          # SATA/PATA support.
-          "ahci"
-
-          "ata_piix"
-          
-          "sata_inic162x" "sata_nv" "sata_promise" "sata_qstor"
-          "sata_sil" "sata_sil24" "sata_sis" "sata_svw" "sata_sx4"
-          "sata_uli" "sata_via" "sata_vsc"
-
-          "pata_ali" "pata_amd" "pata_artop" "pata_atiixp"
-          "pata_cs5520" "pata_cs5530" /* "pata_cs5535" */ "pata_efar"
-          "pata_hpt366" "pata_hpt37x" "pata_hpt3x2n" "pata_hpt3x3"
-          "pata_it8213" "pata_it821x" "pata_jmicron" "pata_marvell"
-          "pata_mpiix" "pata_netcell" "pata_ns87410" "pata_oldpiix"
-          "pata_pcmcia" "pata_pdc2027x" /* "pata_qdi" */ "pata_rz1000"
-          "pata_sc1200" "pata_serverworks" "pata_sil680" "pata_sis"
-          "pata_sl82c105" "pata_triflex" "pata_via"
-          # "pata_winbond" <-- causes timeouts in sd_mod
-
-          # SCSI support (incomplete).
-          "3w-9xxx" "3w-xxxx" "aic79xx" "aic7xxx" "arcmsr" 
-        
-          # USB support, especially for booting from USB CD-ROM
-          # drives.  Also include USB keyboard support for when
-          # something goes wrong in stage 1.
-          "ehci_hcd"
-          "ohci_hcd"
-          "uhci_hcd"
-          "usbhid"
-          "usb_storage"
-
-          # Firewire support.  Not tested.
-          "ohci1394" "sbp2"
-
-          # Virtio (QEMU, KVM etc.) support.
-          "virtio_net" "virtio_pci" "virtio_blk" "virtio_balloon"
-
-          # Wait for SCSI devices to appear.
-          "scsi_wait_scan"
-
-          # Needed for live-CD operation.
-          "aufs"
-        ];
-      };
-    };
-
-    fileSystems = [
-      { mountPoint = "/";
-        label = cdLabel;
-      }
-    ];
-
-    networking = {
-      enableIntel3945ABGFirmware = true;
-    };
-    
-    services = {
-    
-      sshd = {
-        enable = false;
-        forwardX11 = false;
-      };
-      
-      xserver = {
-        enable = false;
-      };
-
-      showManual = {
-        enable = true;
-	manualFile = manual;
-      };
-
-      rogue = {
-        enable = true;
-      };
-
-      extraJobs = [
-        # Unpack the NixOS/Nixpkgs sources to /etc/nixos.
-        # !!! run this synchronously
-        { name = "unpack-sources";
-          job = "
-            start on startup
-            script
-              export PATH=${pkgs.gnutar}/bin:${pkgs.bzip2}/bin:$PATH
-
-              mkdir -p /mnt
-
-              ${system.nix}/bin/nix-store --load-db < /nix-path-registration
-
-              mkdir -p /etc/nixos/nixos
-              tar xjf /install/nixos.tar.bz2 -C /etc/nixos/nixos
-              mkdir -p /etc/nixos/nixpkgs
-              tar xjf /install/nixpkgs.tar.bz2 -C /etc/nixos/nixpkgs
-              chown -R root.root /etc/nixos
-            end script
-          ";
-        }
-      
-      ];
-
-      mingetty = {
-        helpLine = ''
-        
-          Log in as "root" with an empty password.  Press <Alt-F7> for help.
-        '';
-      };
-      
-    };
-
-    fonts = {
-      enableFontConfig = false;
-    };
-    
-    installer = {
-      nixpkgsURL = http://nixos.org/releases/nixpkgs/channels/nixpkgs-unstable;
-    };
-
-    security = {
-      sudo = {
-        enable = false;
-      };
-    };
- 
-    environment = {
-      extraPackages = [
-        pkgs.subversion # for nixos-checkout
-        pkgs.w3m # needed for the manual anyway
-        pkgs.testdisk # useful for repairing boot problems
-        pkgs.mssys # for writing Microsoft boot sectors / MBRs
-        pkgs.ntfsprogs # for resizing NTFS partitions
-        pkgs.parted
-        pkgs.sshfsFuse
-      ];
-    };
-   
-  };
-
-  configuration = baseConfiguration // (configurationOverrides baseConfiguration);
-
-  system = import ../../system/system.nix {
-    inherit configuration platform nixpkgs;
-  };
-
-  pkgs = system.pkgs;
-
-
-  # The NixOS manual.
-  manual = "${import ../../doc/manual {inherit nixpkgs;}}/manual.html";
-
-
-  # 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.runCommand "tarball" {inherit tarName;} "
-    ensureDir $out
-    (cd ${input} && tar cvfj $out/${tarName} . \\
-      --exclude '*~' --exclude 'result')
-  ";
-
-  
-  # Put the current directory in a tarball.
-  nixosTarball = makeTarball "nixos.tar.bz2" ../..;
-
-
-  # Put Nixpkgs in a tarball.
-  nixpkgsTarball = makeTarball "nixpkgs.tar.bz2" nixpkgs;
-
-
-  # The configuration file for Grub.
-  grubCfg = pkgs.writeText "menu.lst" (''
-    default 0
-    timeout 10
-    splashimage /boot/background.xpm.gz
-
-    title Boot from hard disk
-      root (hd0)
-      chainloader +1
-    
-    title NixOS Installer / Rescue
-      kernel /boot/vmlinuz init=/init ${toString system.config.boot.kernelParams}
-      initrd /boot/initrd
-
-    title Memtest86+
-      kernel /boot/memtest.bin
-  '' 
-    + (pkgs.lib.concatStringsSep "\n\n" 
-        (map (x: ''
-	  title NixOS: ${x.configurationName}
-	    kernel ${x.kernel} systemConfig=${x} init=${x.bootStage2} ${toString system.config.boot.kernelParams}
-	    initrd ${x.initrd}
-	'') system.children)))
-    ;
-
-
-  # Create an ISO image containing the Grub boot loader, the kernel,
-  # the initrd produced above, and the closure of the stage 2 init.
-  rescueCD = import ../../helpers/make-iso9660-image.nix {
-    inherit nixpkgs;
-    inherit (pkgs) stdenv perl cdrkit;
-    isoName = "${relName}-${platform}.iso";
-
-    # Single files to be copied to fixed locations on the CD.
-    contents = [
-      { source = "${pkgs.grub}/lib/grub/${if platform == "i686-linux" then "i386-pc" else "x86_64-unknown"}/stage2_eltorito";
-        target = "boot/grub/stage2_eltorito";
-      }
-      { source = grubCfg;
-        target = "boot/grub/menu.lst";
-      }
-      { source = system.kernel + "/vmlinuz";
-        target = "boot/vmlinuz";
-      }
-      { source = system.initialRamdisk + "/initrd";
-        target = "boot/initrd";
-      }
-      { source = pkgs.memtest86 + "/memtest.bin";
-        target = "boot/memtest.bin";
-      }
-      { source = system.config.boot.grubSplashImage;
-        target = "boot/background.xpm.gz";
-      }
-    ]
-    ++
-    pkgs.lib.optionals includeTarballs [
-      { source = nixosTarball + "/" + nixosTarball.tarName;
-        target = "/install/" + nixosTarball.tarName;
-      }
-      { source = nixpkgsTarball + "/nixpkgs.tar.bz2";
-        target = "/install/nixpkgs.tar.bz2";
-      }
-    ];
-
-    # Closures to be copied to the Nix store on the CD.
-    storeContents = [
-      { object = system.bootStage2;
-        symlink = "/init";
-      }
-      { object = system.system;
-        symlink = "/system";
-      }
-      # To speed up the installation, provide the full stdenv.
-      { object = pkgs.stdenv;
-        symlink = "none";
-      }
-    ]
-      ++ pkgs.lib.optional includeBuildDeps {
-          object = system.system.drvPath;
-          symlink = "none";
-        }
-      ;
-    
-    bootable = true;
-    bootImage = "boot/grub/stage2_eltorito";
-
-    inherit compressImage;
-
-    volumeID = cdLabel;
-  };
-}
diff --git a/installer/cd-dvd/rescue-dvd.nix b/installer/cd-dvd/rescue-dvd.nix
deleted file mode 100644
index 8d0b62ce447..00000000000
--- a/installer/cd-dvd/rescue-dvd.nix
+++ /dev/null
@@ -1,94 +0,0 @@
-let 
-  rescueCDFun = import /etc/nixos/nixos/installer/cd-dvd/rescue-cd.nix;
-  pkgs = import /etc/nixos/nixpkgs {};
-  kernels = import /etc/nixos/configurations/misc/raskin/kernel-options.nix {inherit pkgs;};
-  bootEntries = baseKernel: rec {
-    kernelPackages = let 
-      shippedKernelPackages = pkgs.kernelPackagesFor (baseKernel);
-    in
-    shippedKernelPackages //
-      rec { 
-          klibc = shippedKernelPackages.klibc.passthru.function (x: {
-            # version = "1.5.14";
-            # sha256 = "1cmrqpgamnv2ns7dlxjm61zc88dxm4ff0aya413ij1lmhp2h2sfc";
-            # subdir = "Testing/";
-            addPreBuild = ''
-              ln -s $PWD/linux/include/*/errno.h linux/include/asm || echo errno.h already present
-            '';
-          });
-          
-          klibcShrunk = shippedKernelPackages.klibcShrunk.passthru.function {
-            inherit klibc;
-          };
-      };
-    
-  };
-in 
-
-rescueCDFun {
-  includeBuildDeps = true;
-  configurationOverrides = x: {
-    boot = x.boot // {
-      kernelPackages = (bootEntries kernels.testingKernel).kernelPackages;
-      initrd = x.boot.initrd // {
-        extraKernelModules = x.boot.initrd.extraKernelModules ++ [
-          "sr_mod" "atiixp"
-        ];
-	allowMissing = true;
-      };
-    };
-    environment = {
-      extraPackages = x.environment.extraPackages ++ [
-        pkgs.utillinuxCurses pkgs.wpa_supplicant 
-        pkgs.upstartJobControl pkgs.iproute
-        pkgs.bc pkgs.fuse pkgs.zsh
-        pkgs.sqlite pkgs.gnupg pkgs.manpages 
-	pkgs.pinentry pkgs.screen
-
-        pkgs.patch pkgs.which pkgs.diffutils pkgs.file 
-
-        pkgs.irssi pkgs.mcabber pkgs.mutt 
-
-        pkgs.emacs pkgs.vimHugeX pkgs.bvi 
-
-        pkgs.ddrescue pkgs.cdrkit 
-
-        pkgs.btrfsProgs pkgs.xfsProgs pkgs.jfsUtils
-	pkgs.jfsrec pkgs.ntfs3g 
-
-        pkgs.subversion16 pkgs.monotone pkgs.git pkgs.darcs
-	pkgs.mercurial pkgs.bazaar pkgs.cvs 
-	
-	pkgs.pciutils pkgs.hddtemp pkgs.sdparm pkgs.hdparm 
-	pkgs.usbutils 
-
-	pkgs.openssh pkgs.lftp pkgs.w3m pkgs.openssl pkgs.ncat 
-	pkgs.lynx pkgs.wget pkgs.elinks pkgs.socat pkgs.squid
-        
-        pkgs.unrar pkgs.zip pkgs.unzip pkgs.lzma pkgs.cabextract 
-	pkgs.cpio 
-
-        pkgs.lsof pkgs.ltrace 
-
-        pkgs.perl pkgs.python pkgs.ruby pkgs.guile pkgs.clisp
-	pkgs.tcl
-      ];
-
-      nix = pkgs.nixCustomFun ("" + /etc/nixos/nix + "/")
-          ""
-          ["nix-reduce-build" "nix-http-export.cgi"]
-          ["--with-docbook-xsl=${pkgs.docbook5_xsl}/xml/xsl/docbook/"];
-    };
-
-#    nesting = {
-#      children = [
-#        (x // {
-#          boot = x.boot // {
-#            kernelPackages = (bootEntries kernels.testingKernel).kernelPackages;
-#            configurationName = "Test child configuration";
-#          };
-#        })
-#      ];
-#    };
-  };
-}
diff --git a/modules/installer/cd-dvd/live-dvd.nix b/modules/installer/cd-dvd/live-dvd.nix
new file mode 100644
index 00000000000..c510c94b359
--- /dev/null
+++ b/modules/installer/cd-dvd/live-dvd.nix
@@ -0,0 +1,83 @@
+{config, pkgs, ...}:
+
+{
+  require = [./installation-cd.nix];
+
+  # Build the build-time dependencies of this configuration on the DVD
+  # to speed up installation.
+  isoImage.storeContents =
+    [ { object = config.system.build.system.drvPath;
+        symlink = "none";
+      }
+    ];
+
+  # Include lots of packages.
+  environment.systemPackages =
+    [ pkgs.utillinuxCurses
+      pkgs.wpa_supplicant 
+      pkgs.upstartJobControl
+      pkgs.iproute
+      pkgs.bc
+      pkgs.fuse
+      pkgs.zsh
+      pkgs.sqlite
+      pkgs.gnupg
+      pkgs.manpages
+      pkgs.pinentry
+      pkgs.screen
+      pkgs.patch
+      pkgs.which
+      pkgs.diffutils
+      pkgs.file 
+      pkgs.irssi
+      pkgs.mcabber
+      pkgs.mutt 
+      pkgs.emacs
+      pkgs.vimHugeX
+      pkgs.bvi 
+      pkgs.ddrescue
+      pkgs.cdrkit 
+      pkgs.btrfsProgs
+      pkgs.xfsProgs
+      pkgs.jfsUtils
+      pkgs.jfsrec
+      pkgs.ntfs3g 
+      pkgs.subversion16
+      pkgs.monotone
+      pkgs.git
+      pkgs.darcs
+      pkgs.mercurial
+      pkgs.bazaar
+      pkgs.cvs 
+      pkgs.pciutils
+      pkgs.hddtemp
+      pkgs.sdparm
+      pkgs.hdparm
+      pkgs.usbutils 
+      pkgs.openssh
+      pkgs.lftp
+      pkgs.w3m
+      pkgs.openssl
+      pkgs.ncat
+      pkgs.lynx
+      pkgs.wget
+      pkgs.elinks
+      pkgs.socat
+      pkgs.squid
+      pkgs.unrar
+      pkgs.zip
+      pkgs.unzip
+      pkgs.lzma
+      pkgs.cabextract
+      pkgs.cpio 
+      pkgs.lsof
+      pkgs.ltrace 
+      pkgs.perl
+      pkgs.python
+      pkgs.ruby
+      pkgs.guile
+      pkgs.clisp
+      pkgs.tcl
+    ];
+  
+}
-- 
GitLab


From 56922fa5b1ae61cd9337686338050f5b52d319ff Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 10 Jun 2009 11:02:17 +0000
Subject: [PATCH 1581/5331] * Removed the installer directory.

svn path=/nixos/branches/modular-nixos/; revision=15918
---
 .../cd-dvd => test}/remote-install-scripts/install-launch.sh      | 0
 .../cd-dvd => test}/remote-install-scripts/install-script.sh      | 0
 .../cd-dvd => test}/remote-install-scripts/install-start.sh       | 0
 {installer/cd-dvd => test}/remote-install-scripts/install-test.sh | 0
 4 files changed, 0 insertions(+), 0 deletions(-)
 rename {installer/cd-dvd => test}/remote-install-scripts/install-launch.sh (100%)
 rename {installer/cd-dvd => test}/remote-install-scripts/install-script.sh (100%)
 rename {installer/cd-dvd => test}/remote-install-scripts/install-start.sh (100%)
 rename {installer/cd-dvd => test}/remote-install-scripts/install-test.sh (100%)

diff --git a/installer/cd-dvd/remote-install-scripts/install-launch.sh b/test/remote-install-scripts/install-launch.sh
similarity index 100%
rename from installer/cd-dvd/remote-install-scripts/install-launch.sh
rename to test/remote-install-scripts/install-launch.sh
diff --git a/installer/cd-dvd/remote-install-scripts/install-script.sh b/test/remote-install-scripts/install-script.sh
similarity index 100%
rename from installer/cd-dvd/remote-install-scripts/install-script.sh
rename to test/remote-install-scripts/install-script.sh
diff --git a/installer/cd-dvd/remote-install-scripts/install-start.sh b/test/remote-install-scripts/install-start.sh
similarity index 100%
rename from installer/cd-dvd/remote-install-scripts/install-start.sh
rename to test/remote-install-scripts/install-start.sh
diff --git a/installer/cd-dvd/remote-install-scripts/install-test.sh b/test/remote-install-scripts/install-test.sh
similarity index 100%
rename from installer/cd-dvd/remote-install-scripts/install-test.sh
rename to test/remote-install-scripts/install-test.sh
-- 
GitLab


From 463cf8efdd974738ae30ed9a7712fd3d9d8ee922 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 10 Jun 2009 12:34:58 +0000
Subject: [PATCH 1582/5331] * Provide a /etc/nixos/configuration.nix in the
 booted CD to make   nixos-rebuild work.  This makes it a true live CD.

svn path=/nixos/branches/modular-nixos/; revision=15922
---
 modules/installer/cd-dvd/installation-cd.nix | 37 ++++++++++++++++++--
 modules/services/misc/rogue.nix              |  1 +
 2 files changed, 36 insertions(+), 2 deletions(-)

diff --git a/modules/installer/cd-dvd/installation-cd.nix b/modules/installer/cd-dvd/installation-cd.nix
index 68d2a76f93a..acb62db01cf 100644
--- a/modules/installer/cd-dvd/installation-cd.nix
+++ b/modules/installer/cd-dvd/installation-cd.nix
@@ -33,6 +33,27 @@ let
   # Put Nixpkgs in a tarball.
   nixpkgsTarball = makeTarball "nixpkgs.tar.bz2" (pkgs.lib.cleanSource pkgs.path);
 
+
+  # A dummy /etc/nixos/configuration.nix in the booted CD that
+  # rebuilds the CD's configuration (and allows the configuration to
+  # be modified, of course, providing a true live CD).  Problem is
+  # that we don't really know how the CD was built - the Nix
+  # expression language doesn't allow us to query the expression being
+  # evaluated.  So we'll just hope for the best.
+  dummyConfiguration = pkgs.writeText "configuration.nix"
+    ''
+      {config, pkgs, ...}:
+
+      {
+        require = [./nixos/modules/installer/cd-dvd/installation-cd.nix];
+
+        # Add your own options below and run "nixos-rebuild switch".
+        # E.g.,
+        #   services.sshd.enable = true;
+      }
+    '';
+  
+  
 in
 
 {
@@ -54,6 +75,7 @@ in
   # Don't include X libraries.
   services.sshd.forwardX11 = false;
   fonts.enableFontConfig = false;
+  fonts.enableCoreFonts = false;
 
   # Show the manual.
   services.showManual.enable = true;
@@ -128,20 +150,31 @@ in
   # installation.
   installer.nixpkgsURL = http://nixos.org/releases/nixpkgs/channels/nixpkgs-unstable;
 
-  # Provide the NixOS/Nixpkgs sources in /etc/nixos.  This is required
-  # for nixos-install.
   boot.postBootCommands =
     ''
       export PATH=${pkgs.gnutar}/bin:${pkgs.bzip2}/bin:$PATH
 
+      # Provide a mount point for nixos-install.
       mkdir -p /mnt
 
+      # Provide the NixOS/Nixpkgs sources in /etc/nixos.  This is required
+      # for nixos-install.
       echo "unpacking the NixOS/Nixpkgs sources..."
       mkdir -p /etc/nixos/nixos
       tar xjf ${nixosTarball}/nixos.tar.bz2 -C /etc/nixos/nixos
       mkdir -p /etc/nixos/nixpkgs
       tar xjf ${nixpkgsTarball}/nixpkgs.tar.bz2 -C /etc/nixos/nixpkgs
       chown -R root.root /etc/nixos
+
+      # Provide a configuration for the CD/DVD itself, to allow users
+      # to run nixos-rebuild to change the configuration of the
+      # running system on the CD/DVD.
+      cp ${dummyConfiguration} /etc/nixos/configuration.nix
+
+      # nixos-rebuild also requires a "system" profile and an
+      # /etc/NIXOS tag.
+      touch /etc/NIXOS
+      ${config.environment.nix}/bin/nix-env -p /nix/var/nix/profiles/system --set /var/run/current-system
     '';
 
   # Some more help text.
diff --git a/modules/services/misc/rogue.nix b/modules/services/misc/rogue.nix
index ddda413727a..5ae14fbee22 100644
--- a/modules/services/misc/rogue.nix
+++ b/modules/services/misc/rogue.nix
@@ -41,6 +41,7 @@ pkgs.lib.mkIf cfg.enable {
 	
         start on udev
         stop on shutdown
+
         respawn ${pkgs.rogue}/bin/rogue < /dev/tty${toString cfg.ttyNumber} > /dev/tty${toString cfg.ttyNumber} 2>&1
       '';
     };
-- 
GitLab


From 135240e05ffad48431afdd220d3e7bf2bb619fe5 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 10 Jun 2009 12:51:16 +0000
Subject: [PATCH 1583/5331] * Sigh.  The nix-env call has to come after
 nix-store --load-db.   Should really allow an ordering between
 postBootCommands.

svn path=/nixos/branches/modular-nixos/; revision=15923
---
 modules/installer/cd-dvd/installation-cd.nix | 5 -----
 modules/installer/cd-dvd/iso-image.nix       | 5 +++++
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/modules/installer/cd-dvd/installation-cd.nix b/modules/installer/cd-dvd/installation-cd.nix
index acb62db01cf..4f38ebfc796 100644
--- a/modules/installer/cd-dvd/installation-cd.nix
+++ b/modules/installer/cd-dvd/installation-cd.nix
@@ -170,11 +170,6 @@ in
       # to run nixos-rebuild to change the configuration of the
       # running system on the CD/DVD.
       cp ${dummyConfiguration} /etc/nixos/configuration.nix
-
-      # nixos-rebuild also requires a "system" profile and an
-      # /etc/NIXOS tag.
-      touch /etc/NIXOS
-      ${config.environment.nix}/bin/nix-env -p /nix/var/nix/profiles/system --set /var/run/current-system
     '';
 
   # Some more help text.
diff --git a/modules/installer/cd-dvd/iso-image.nix b/modules/installer/cd-dvd/iso-image.nix
index d17106cde32..d7d346bd264 100644
--- a/modules/installer/cd-dvd/iso-image.nix
+++ b/modules/installer/cd-dvd/iso-image.nix
@@ -150,5 +150,10 @@ in
     ''
       ${config.environment.nix}/bin/nix-store --load-db < /nix-path-registration
       rm /nix-path-registration
+
+      # nixos-rebuild also requires a "system" profile and an
+      # /etc/NIXOS tag.
+      touch /etc/NIXOS
+      ${config.environment.nix}/bin/nix-env -p /nix/var/nix/profiles/system --set /var/run/current-system
     '';
 }
-- 
GitLab


From 262ddf0854e431ca08871e7092005d902b3e6583 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 10 Jun 2009 12:53:45 +0000
Subject: [PATCH 1584/5331] * Move the manual/Rogue from virtual consoles 7/8
 to 8/9   respectively so that the X server can run on 7.

svn path=/nixos/branches/modular-nixos/; revision=15924
---
 modules/services/misc/nixos-manual.nix | 30 ++++++++-----------
 modules/services/misc/rogue.nix        | 40 ++++++++++++++------------
 2 files changed, 34 insertions(+), 36 deletions(-)

diff --git a/modules/services/misc/nixos-manual.nix b/modules/services/misc/nixos-manual.nix
index d87e8cac57e..29df0e3354a 100644
--- a/modules/services/misc/nixos-manual.nix
+++ b/modules/services/misc/nixos-manual.nix
@@ -1,6 +1,6 @@
 {pkgs, config, ...}:
 
-# Show the NixOS manual on tty7
+# Show the NixOS manual on tty8
 # Originally used only by installation CD
 
 let
@@ -14,29 +14,23 @@ let
         enable = mkOption {
           default = false;
           description = "
-            Whether to show the NixOS manual on the tty7
+            Whether to show the NixOS manual on one of the virtual
+            consoles.
           ";
         };
 
         ttyNumber = mkOption {
-          default = "7";
+          default = "8";
           description = "
-            TTY number name to show the manual on
+            Virtual console on which to show the manual.
           ";
         };
 
-        browserPackage = mkOption {
-          default = pkgs.w3m;
-          description = "
-            Package containing the browser to be used
-          ";
-        };
-
-        browserCommand = mkOption {
-          default = "bin/w3m";
-          description = "
-            Command (command path is relative to browserPackage) to run the browser
-          ";
+        browser = mkOption {
+          default = "${pkgs.w3m}/bin/w3m";
+          description = ''
+            Browser used to show the manual.
+          '';
         };
 
         manualFile = mkOption {
@@ -55,7 +49,7 @@ let
 in
 
 let
-  inherit (config.services.showManual) enable ttyNumber browserPackage browserCommand manualFile;
+  inherit (config.services.showManual) enable ttyNumber browser manualFile;
 
   realManualFile =
     if manualFile == null then
@@ -88,7 +82,7 @@ mkIf enable {
 
         start on udev
         stop on shutdown
-        respawn ${browserPackage}/${browserCommand} ${realManualFile} < /dev/tty${toString ttyNumber} > /dev/tty${toString ttyNumber} 2>&1
+        respawn ${browser} ${realManualFile} < /dev/tty${toString ttyNumber} > /dev/tty${toString ttyNumber} 2>&1
       '';
     }];
 
diff --git a/modules/services/misc/rogue.nix b/modules/services/misc/rogue.nix
index 5ae14fbee22..f952b7189df 100644
--- a/modules/services/misc/rogue.nix
+++ b/modules/services/misc/rogue.nix
@@ -1,29 +1,31 @@
 {pkgs, config, ...}: 
 
-# Show rogue game on tty8
+# Show rogue game on tty9
 # Originally used only by installation CD
 
 let
+
   inherit (pkgs.lib) mkOption;
+  
   options = {
-    services = {
-      rogue = {
-        enable = mkOption {
-	  default = false;
-	  description = "
-	    Whether to run rogue
-	  ";
-	};
-	ttyNumber = mkOption {
-	  default = "8";
-	  description = "
-	    TTY number name to show the manual on
-	  ";
-	};
-      };
+  
+    services.rogue.enable = mkOption {
+      default = false;
+      description = ''
+        Whether to enable the Rogue game on one of the virtual
+        consoles.
+      '';
     };
-  };
 
+    services.rogue.ttyNumber = mkOption {
+      default = "9";
+      description = ''
+        Virtual console on which to run Rogue.
+      '';
+    };
+
+  };
+  
   cfg = config.services.rogue;
 
 in
@@ -37,11 +39,13 @@ pkgs.lib.mkIf cfg.enable {
     { name = "rogue";
 
       job = ''
-        description "rogue game"
+        description "Rogue dungeon crawling game"
 	
         start on udev
         stop on shutdown
 
+        chdir /root
+
         respawn ${pkgs.rogue}/bin/rogue < /dev/tty${toString cfg.ttyNumber} > /dev/tty${toString cfg.ttyNumber} 2>&1
       '';
     };
-- 
GitLab


From 27230eed8e965594dcf87c73a8e564fcdeda66e8 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 10 Jun 2009 13:40:35 +0000
Subject: [PATCH 1585/5331] * A function for generating squashfs filesystem
 images.

svn path=/nixos/branches/modular-nixos/; revision=15926
---
 lib/make-iso9660-image.sh |  3 ++-
 lib/make-squashfs.nix     | 30 ++++++++++++++++++++++++++++++
 2 files changed, 32 insertions(+), 1 deletion(-)
 create mode 100644 lib/make-squashfs.nix

diff --git a/lib/make-iso9660-image.sh b/lib/make-iso9660-image.sh
index a1d7f62f35c..d3f220ae4f5 100644
--- a/lib/make-iso9660-image.sh
+++ b/lib/make-iso9660-image.sh
@@ -52,7 +52,8 @@ for i in $storePaths; do
 done
 
 
-# Also put a nix-pull manifest of the closures on the CD.
+# Also include a manifest of the closures in a format suitable for
+# nix-store --load-db.
 printRegistration=1 perl $pathsFromGraph closure-* > nix-path-registration
 echo "nix-path-registration=nix-path-registration" >> pathlist
 
diff --git a/lib/make-squashfs.nix b/lib/make-squashfs.nix
new file mode 100644
index 00000000000..1bd93b8ffaf
--- /dev/null
+++ b/lib/make-squashfs.nix
@@ -0,0 +1,30 @@
+{ stdenv, squashfsTools, perl, pathsFromGraph
+
+, # The root directory of the squashfs filesystem is filled with the
+  # closures of the Nix store paths listed here.
+  storeContents ? []
+}:
+
+stdenv.mkDerivation {
+  name = "squashfs.img";
+  
+  buildInputs = [perl squashfsTools];
+  
+  # For obtaining the closure of `storeContents'.
+  exportReferencesGraph =
+    map (x: [("closure-" + baseNameOf x) x]) storeContents;
+
+  buildCommand =
+    ''
+      # Add the closures of the top-level store objects.
+      storePaths=$(perl ${pathsFromGraph} closure-*)
+      
+      # Also include a manifest of the closures in a format suitable
+      # for nix-store --load-db.
+      printRegistration=1 perl ${pathsFromGraph} closure-* > nix-path-registration
+
+      # Generate the squashfs image.
+      mksquashfs nix-path-registration $storePaths $out \
+        -keep-as-directory -all-root
+    '';
+}
-- 
GitLab


From e940f1fbd73196be50a3904d22e8a3f8718b27a6 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 10 Jun 2009 15:02:39 +0000
Subject: [PATCH 1586/5331] * Cleaned up the error messages in the stage 1 init
 script. * Use the basename from coreutils rather than a bash hack.

svn path=/nixos/branches/modular-nixos/; revision=15927
---
 modules/system/boot/stage-1-init.sh | 91 +++++++++++------------------
 modules/system/boot/stage-1.nix     |  4 ++
 2 files changed, 38 insertions(+), 57 deletions(-)

diff --git a/modules/system/boot/stage-1-init.sh b/modules/system/boot/stage-1-init.sh
index 524735b1ba2..50870909489 100644
--- a/modules/system/boot/stage-1-init.sh
+++ b/modules/system/boot/stage-1-init.sh
@@ -5,50 +5,37 @@ targetRoot=/mnt/root
 export LD_LIBRARY_PATH=@extraUtils@/lib
 
 
-errorDialog() {
+fail() {
+    # If starting stage 2 failed, allow the user to repair the problem
+    # in an interactive shell.
     timeout=15
-    echo
-    echo "Press within $timeout seconds:"
-    echo "  i) to launch an interactive shell"
-    echo "  f) to start an interactive shell having pid 1"
-    echo "     (needed if you want to start Stage 2 manually)"
-    echo "  *) to continue immediately (ignoring the failing command)"
+    cat <<EOF
+
+An error occured in stage 1 of the boot process, which must mount the
+root filesystem on \`$targetRoot' and then start stage 2.  Press one
+of the following keys within $timeout seconds:
+
+  i) to launch an interactive shell;
+  f) to start an interactive shell having pid 1 (needed if you want to
+     start stage 2's init manually); or
+  *) to ignore the error and continue.
+EOF
+
     read -t $timeout reply
+    
     case $reply in
         f)
             exec @shell@;;
         i)
-            echo
-            echo "Quit interactive shell with exit status of"
-            echo "  0        : to continue"
-            echo "  non-zero : to get this dialog again"
+            echo "Starting interactive shell..."
             @shell@ || fail
             ;;
         *)
-            echo continuing ignoring error;;
+            echo "Continuing...";;
     esac
 }
 
-
-fail() {
-    # If starting stage 2 failed, start an interactive shell.
-    echo "error while running Stage 1"
-    echo "Stage 1 should mount the root partition containing the nix store on \`$targetRoot'";
-    echo
-    errorDialog
-}
-trap 'fail' ERR;
-
-
-
-# Poor man's `basename'.
-basename() {
-    local s="$1"
-    set -- $(IFS=/; echo $s)
-    local res
-    while test $# != 0; do res=$1; shift; done
-    echo $res
-}
+trap 'fail' ERR
 
 
 # Print a greeting.
@@ -116,11 +103,11 @@ mknod /dev/null c 1 3
 if test -e /sys/power/tuxonice/resume; then
     if test -n "$(cat /sys/power/tuxonice/resume)"; then
         echo 0 > /sys/power/tuxonice/user_interface/enabled
-        echo 1 > /sys/power/tuxonice/do_resume || echo "Failed to resume..."
+        echo 1 > /sys/power/tuxonice/do_resume || echo "failed to resume..."
     fi
 fi
 
-echo "@resumeDevice@" > /sys/power/resume 2> /dev/null || echo "Failed to resume..."
+echo "@resumeDevice@" > /sys/power/resume 2> /dev/null || echo "failed to resume..."
 echo shutdown > /sys/power/disk
 
 
@@ -131,7 +118,7 @@ udevadm trigger
 udevadm settle
 
 if type -p dmsetup > /dev/null; then
-  echo "dmsetup found, starting device mapper and lvm"
+  echo "starting device mapper and LVM..."
   dmsetup mknodes
   lvm vgscan --ignorelockingfailure
   lvm vgchange -ay --ignorelockingfailure
@@ -143,21 +130,9 @@ if test -n "$debug1devices"; then fail; fi
 # Return true if the machine is on AC power, or if we can't determine
 # whether it's on AC power.
 onACPower() {
-    if test -d "/proc/acpi/battery"; then
-        if ls /proc/acpi/battery/BAT[0-9]* > /dev/null 2>&1; then
-            if cat /proc/acpi/battery/BAT*/state \
-                | grep "^charging state" \
-                | grep -q "discharg" ; then
-                false
-            else
-                true
-            fi
-        else
-            true
-        fi
-    else
-        true
-    fi
+    ! test -d "/proc/acpi/battery" ||
+    ! ls /proc/acpi/battery/BAT[0-9]* > /dev/null 2>&1 ||
+    ! cat /proc/acpi/battery/BAT*/state | grep "^charging state" | grep -q "discharg"
 }
 
 
@@ -169,7 +144,7 @@ checkFS() {
     # Don't run `fsck' if the machine is on battery power.  !!! Is
     # this a good idea?
     if ! onACPower; then
-        echo "on battery power, so \`fsck' not run on \`$device'"
+        echo "on battery power, so no \`fsck' will be performed on \`$device'"
         return 0
     fi
     
@@ -204,8 +179,9 @@ mountFS() {
     local fsType="$4"
 
     checkFS "$device"
+
+    mkdir -p "/mnt-root$mountPoint" || true
     
-    # Mount read-writable.
     mount -t "$fsType" -o "$options" "$device" /mnt-root$mountPoint || fail
 }
 
@@ -286,12 +262,13 @@ fi
 
 # Start stage 2.  `run-init' deletes all files in the ramfs on the
 # current /.
-if test -z "$stage2Init"; then fail; fi
+if test -z "$stage2Init" -o ! -e "$targetRoot/$stage2Init"; then
+    echo "stage 2 init script not found"
+    fail
+fi
+
 umount /sys
 umount /proc
 exec run-init "$targetRoot" "$stage2Init"
 
-echo
-echo "$1: failed running $stage2Init"
-echo "Dropping into a root shell..."
-export $stage2Init; exec @shell@
+fail # should never be reached
diff --git a/modules/system/boot/stage-1.nix b/modules/system/boot/stage-1.nix
index 8e092990699..0a451648eb1 100644
--- a/modules/system/boot/stage-1.nix
+++ b/modules/system/boot/stage-1.nix
@@ -96,6 +96,9 @@ let
       # Copy some utillinux stuff.
       cp ${pkgs.utillinux}/bin/mount ${pkgs.utillinux}/bin/umount ${pkgs.utillinux}/sbin/pivot_root $out/bin
 
+      # Copy some coreutils.
+      cp ${pkgs.coreutils}/bin/basename $out/bin
+
       # Copy e2fsck and friends.      
       cp ${pkgs.e2fsprogs}/sbin/e2fsck $out/bin
       cp ${pkgs.e2fsprogs}/sbin/tune2fs $out/bin
@@ -154,6 +157,7 @@ let
       fi
       $out/bin/reiserfsck -V
       $out/bin/mdadm --version
+      $out/bin/basename --version
     ''; # */
   
 
-- 
GitLab


From 31c6852403bc872fab409cc3d748ca997b405e6f Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 10 Jun 2009 16:05:25 +0000
Subject: [PATCH 1587/5331] * The menu.lst fragment in the top-level system
 derivation doesn't   seem to be used anywhere.  Removed.

svn path=/nixos/branches/modular-nixos/; revision=15928
---
 modules/system/activation/top-level.nix | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/modules/system/activation/top-level.nix b/modules/system/activation/top-level.nix
index d09f34264e9..4d8e2055111 100644
--- a/modules/system/activation/top-level.nix
+++ b/modules/system/activation/top-level.nix
@@ -57,11 +57,6 @@ let
         ln -s $i $out/fine-tune/child-$childCount;
       done
 
-      cat > $out/menu.lst << GRUBEND
-      kernel $kernel init=$bootStage2 $kernelParams
-      initrd $initrd
-      GRUBEND
-
       ensureDir $out/bin
       substituteAll ${./switch-to-configuration.sh} $out/bin/switch-to-configuration
       chmod +x $out/bin/switch-to-configuration
-- 
GitLab


From 1cea6b09efa23e4e2755d547193b1610d7ff6403 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 10 Jun 2009 16:29:48 +0000
Subject: [PATCH 1588/5331] * Compress the Nix store on the CD using squashfs. 
 This reduces the   size of the i686-linux ISO image from 463 MiB to 147 MiB. 
 Hopefully   it also speeds up installation due to reduced seek time and
 larger   block sizes, but I haven't tested that yet (on real hardware).

svn path=/nixos/branches/modular-nixos/; revision=15930
---
 modules/installer/cd-dvd/installation-cd.nix |  6 +--
 modules/installer/cd-dvd/iso-image.nix       | 55 ++++++++++++--------
 modules/installer/cd-dvd/live-dvd.nix        |  6 +--
 modules/system/boot/stage-1-init.sh          | 18 ++++---
 4 files changed, 46 insertions(+), 39 deletions(-)

diff --git a/modules/installer/cd-dvd/installation-cd.nix b/modules/installer/cd-dvd/installation-cd.nix
index 4f38ebfc796..2d21eaa1300 100644
--- a/modules/installer/cd-dvd/installation-cd.nix
+++ b/modules/installer/cd-dvd/installation-cd.nix
@@ -181,9 +181,5 @@ in
 
   # To speed up installation a little bit, include the complete stdenv
   # in the Nix store on the CD.
-  isoImage.storeContents =
-    [ { object = pkgs.stdenv;
-        symlink = "none";
-      }
-    ];
+  isoImage.storeContents = [pkgs.stdenv];
 }
diff --git a/modules/installer/cd-dvd/iso-image.nix b/modules/installer/cd-dvd/iso-image.nix
index d7d346bd264..bea9da2d03f 100644
--- a/modules/installer/cd-dvd/iso-image.nix
+++ b/modules/installer/cd-dvd/iso-image.nix
@@ -45,11 +45,7 @@ let
     };
 
     isoImage.storeContents = pkgs.lib.mkOption {
-      example =
-        [ { object = pkgs.stdenv;
-            symlink = "/stdenv";
-          }
-        ];
+      example = [pkgs.stdenv];
       description = ''
         This option lists additional derivations to be included in the
         Nix store in the generated ISO image.
@@ -80,17 +76,37 @@ in
     [ { mountPoint = "/";
         label = config.isoImage.volumeID;
       }
+      { mountPoint = "/nix/store";
+        fsType = "squashfs";
+        device = "/nix-store.squashfs";
+        options = "loop";
+        neededForBoot = true;
+      }
     ];
 
-  # We need AUFS in the initrd to make the CD appear writable.
+  # We need squashfs in the initrd to mount the compressed Nix store,
+  # and aufs to make the root filesystem appear writable.
   boot.extraModulePackages = [config.boot.kernelPackages.aufs];
-  boot.initrd.extraKernelModules = ["aufs"];
+  boot.initrd.extraKernelModules = ["aufs" "squashfs"];
 
   # Tell stage 1 of the boot to mount a tmpfs on top of the CD using
   # AUFS.  !!! It would be nicer to make the stage 1 init pluggable
   # and move that bit of code here.
   boot.isLiveCD = true;
 
+  # Closures to be copied to the Nix store on the CD, namely the init
+  # script and the top-level system configuration directory.
+  isoImage.storeContents =
+    [ config.system.build.bootStage2
+      config.system.build.system
+    ];
+
+  # Create the squashfs image that contains the Nix store.
+  system.build.squashfsStore = import ../../../lib/make-squashfs.nix {
+    inherit (pkgs) stdenv squashfsTools perl pathsFromGraph;
+    storeContents = config.isoImage.storeContents;
+  };
+
   # Individual files to be included on the CD, outside of the Nix
   # store on the CD.
   isoImage.contents =
@@ -109,16 +125,12 @@ in
       { source = config.boot.grubSplashImage;
         target = "/boot/background.xpm.gz";
       }
-    ];
-
-  # Closures to be copied to the Nix store on the CD, namely the init
-  # script and the top-level system configuration directory.
-  isoImage.storeContents =
-    [ { object = config.system.build.bootStage2;
-        symlink = "/init";
+      { source = config.system.build.squashfsStore;
+        target = "/nix-store.squashfs";
       }
-      { object = config.system.build.system;
-        symlink = "/system";
+      { # Quick hack: need a mount point for the store.
+        source = pkgs.runCommand "empty" {} "ensureDir $out";
+        target = "/nix/store";
       }
     ];
 
@@ -130,7 +142,7 @@ in
         chainloader +1
     
       title NixOS Installer / Rescue
-        kernel /boot/vmlinuz init=/init ${toString config.boot.kernelParams}
+        kernel /boot/vmlinuz init=${config.system.build.bootStage2} systemConfig=${config.system.build.system} ${toString config.boot.kernelParams}
         initrd /boot/initrd
     '';
 
@@ -138,18 +150,17 @@ in
   system.build.isoImage = import ../../../lib/make-iso9660-image.nix {
     inherit (pkgs) stdenv perl cdrkit pathsFromGraph;
     
-    inherit (config.isoImage) isoName compressImage volumeID contents storeContents;
+    inherit (config.isoImage) isoName compressImage volumeID contents;
 
     bootable = true;
     bootImage = "/boot/grub/stage2_eltorito";
   };
 
-  # After booting, register the contents of the Nix store on the CD in
-  # the Nix database in the tmpfs.
   boot.postBootCommands =
     ''
-      ${config.environment.nix}/bin/nix-store --load-db < /nix-path-registration
-      rm /nix-path-registration
+      # After booting, register the contents of the Nix store on the
+      # CD in the Nix database in the tmpfs.
+      ${config.environment.nix}/bin/nix-store --load-db < /nix/store/nix-path-registration
 
       # nixos-rebuild also requires a "system" profile and an
       # /etc/NIXOS tag.
diff --git a/modules/installer/cd-dvd/live-dvd.nix b/modules/installer/cd-dvd/live-dvd.nix
index c510c94b359..dde8dd9930d 100644
--- a/modules/installer/cd-dvd/live-dvd.nix
+++ b/modules/installer/cd-dvd/live-dvd.nix
@@ -5,11 +5,7 @@
 
   # Build the build-time dependencies of this configuration on the DVD
   # to speed up installation.
-  isoImage.storeContents =
-    [ { object = config.system.build.system.drvPath;
-        symlink = "none";
-      }
-    ];
+  isoImage.storeContents = [config.system.build.system.drvPath];
 
   # Include lots of packages.
   environment.systemPackages =
diff --git a/modules/system/boot/stage-1-init.sh b/modules/system/boot/stage-1-init.sh
index 50870909489..8d062ac96c8 100644
--- a/modules/system/boot/stage-1-init.sh
+++ b/modules/system/boot/stage-1-init.sh
@@ -1,6 +1,6 @@
 #! @shell@
 
-targetRoot=/mnt/root
+targetRoot=/mnt-root
 
 export LD_LIBRARY_PATH=@extraUtils@/lib
 
@@ -236,13 +236,17 @@ done
 
 # If this is a live-CD/DVD, then union-mount a tmpfs on top of the
 # original root.
-targetRoot=/mnt-root
 if test -n "@isLiveCD@"; then
-    mkdir /mnt-tmpfs
-    mount -t tmpfs -o "mode=755" none /mnt-tmpfs
-    mkdir /mnt-union
-    mount -t aufs -o dirs=/mnt-tmpfs=rw:$targetRoot=ro none /mnt-union
-    targetRoot=/mnt-union
+    mkdir /mnt-root-tmpfs
+    mount -t tmpfs -o "mode=755" none /mnt-root-tmpfs
+    mkdir /mnt-root-union
+    mount -t aufs -o dirs=/mnt-root-tmpfs=rw:$targetRoot=ro none /mnt-root-union
+    targetRoot=/mnt-root-union
+
+    mkdir /mnt-store-tmpfs
+    mount -t tmpfs -o "mode=755" none /mnt-store-tmpfs
+    mkdir -p $targetRoot/nix/store
+    mount -t aufs -o dirs=/mnt-store-tmpfs=rw:/mnt-root/nix/store=ro none /mnt-root-union/nix/store
 fi
 
 
-- 
GitLab


From cd1e4aefc13f463af7338c43eb74f0d70eb2f2cc Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 10 Jun 2009 21:46:42 +0000
Subject: [PATCH 1589/5331] * Break the cyclic dependency between the system
 derivation and   Grub's menu.lst.

svn path=/nixos/branches/modular-nixos/; revision=15931
---
 lib/make-iso9660-image.sh              |  2 +-
 modules/installer/cd-dvd/iso-image.nix | 10 +++++++++-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/lib/make-iso9660-image.sh b/lib/make-iso9660-image.sh
index d3f220ae4f5..3305b8856e2 100644
--- a/lib/make-iso9660-image.sh
+++ b/lib/make-iso9660-image.sh
@@ -41,7 +41,7 @@ touch pathlist
 # Add the individual files.
 for ((i = 0; i < ${#targets_[@]}; i++)); do
     stripSlash "${targets_[$i]}"
-    echo "$res=$(readlink -f ${sources_[$i]})" >> pathlist
+    echo "$res=${sources_[$i]}" >> pathlist
 done
 
 
diff --git a/modules/installer/cd-dvd/iso-image.nix b/modules/installer/cd-dvd/iso-image.nix
index bea9da2d03f..a3bd94805dc 100644
--- a/modules/installer/cd-dvd/iso-image.nix
+++ b/modules/installer/cd-dvd/iso-image.nix
@@ -132,6 +132,14 @@ in
         source = pkgs.runCommand "empty" {} "ensureDir $out";
         target = "/nix/store";
       }
+      { # Another quick hack: the kernel needs a systemConfig
+        # parameter in menu.lst, but the system config depends on
+        # menu.lst.  Break the cyclic dependency by having a /system
+        # symlink on the CD, and having menu.lst refer to /system.
+        source = pkgs.runCommand "system" {}
+          "ln -s ${config.system.build.system} $out";
+        target = "/system";
+      }
     ];
 
   # The Grub menu.
@@ -142,7 +150,7 @@ in
         chainloader +1
     
       title NixOS Installer / Rescue
-        kernel /boot/vmlinuz init=${config.system.build.bootStage2} systemConfig=${config.system.build.system} ${toString config.boot.kernelParams}
+        kernel /boot/vmlinuz init=${config.system.build.bootStage2} systemConfig=/system ${toString config.boot.kernelParams}
         initrd /boot/initrd
     '';
 
-- 
GitLab


From 03760c0c03ed4f73637a06cb5ceb3fb254fd64be Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 11 Jun 2009 09:51:27 +0000
Subject: [PATCH 1590/5331] * `installation-cd-big.nix' builds a NixOS
 installation CD containing   an X server and KDE 4.  Thanks to squashfs it's
 only 466 MiB large.   `installation-cd-small.nix' builds the original,
 text-only   installation CD.

svn path=/nixos/branches/modular-nixos/; revision=15934
---
 ...tallation-cd.nix => installation-cd-base.nix} | 14 +++++++-------
 modules/installer/cd-dvd/installation-cd-big.nix | 16 ++++++++++++++++
 .../installer/cd-dvd/installation-cd-small.nix   | 13 +++++++++++++
 3 files changed, 36 insertions(+), 7 deletions(-)
 rename modules/installer/cd-dvd/{installation-cd.nix => installation-cd-base.nix} (95%)
 create mode 100644 modules/installer/cd-dvd/installation-cd-big.nix
 create mode 100644 modules/installer/cd-dvd/installation-cd-small.nix

diff --git a/modules/installer/cd-dvd/installation-cd.nix b/modules/installer/cd-dvd/installation-cd-base.nix
similarity index 95%
rename from modules/installer/cd-dvd/installation-cd.nix
rename to modules/installer/cd-dvd/installation-cd-base.nix
index 2d21eaa1300..18300f01ee9 100644
--- a/modules/installer/cd-dvd/installation-cd.nix
+++ b/modules/installer/cd-dvd/installation-cd-base.nix
@@ -1,4 +1,5 @@
-# This module contains the configuration for the NixOS installation CD.
+# This module contains the basic configuration for building a NixOS
+# installation CD.
 
 {config, pkgs, ...}:
 
@@ -72,11 +73,6 @@ in
   # Use Linux 2.6.29.
   boot.kernelPackages = pkgs.kernelPackages_2_6_29;
 
-  # Don't include X libraries.
-  services.sshd.forwardX11 = false;
-  fonts.enableFontConfig = false;
-  fonts.enableCoreFonts = false;
-
   # Show the manual.
   services.showManual.enable = true;
 
@@ -176,7 +172,11 @@ in
   services.mingetty.helpLine =
     ''
         
-      Log in as "root" with an empty password.
+      Log in as "root" with an empty password.  ${
+        if config.services.xserver.enable then
+          "Type `start xserver' to start\nthe graphical user interface."
+        else ""
+      }
     '';
 
   # To speed up installation a little bit, include the complete stdenv
diff --git a/modules/installer/cd-dvd/installation-cd-big.nix b/modules/installer/cd-dvd/installation-cd-big.nix
new file mode 100644
index 00000000000..fada3cd1017
--- /dev/null
+++ b/modules/installer/cd-dvd/installation-cd-big.nix
@@ -0,0 +1,16 @@
+# This module defines a NixOS installation CD that contains X11 and
+# KDE 4.
+
+{config, pkgs, ...}:
+
+{
+  require = [./installation-cd-base.nix];
+
+  services.xserver = {
+    enable = true;
+    autorun = false;
+    defaultDepth = 16;
+    desktopManager.default = "kde4";
+    desktopManager.kde4.enable = true;
+  };
+}
diff --git a/modules/installer/cd-dvd/installation-cd-small.nix b/modules/installer/cd-dvd/installation-cd-small.nix
new file mode 100644
index 00000000000..7b0103f9ada
--- /dev/null
+++ b/modules/installer/cd-dvd/installation-cd-small.nix
@@ -0,0 +1,13 @@
+# This module defines a small NixOS installation CD.  It does not
+# contain any graphical stuff.
+
+{config, pkgs, ...}:
+
+{
+  require = [./installation-cd-base.nix];
+
+  # Don't include X libraries.
+  services.sshd.forwardX11 = false;
+  fonts.enableFontConfig = false;
+  fonts.enableCoreFonts = false;
+}
-- 
GitLab


From 0657b26ab1cc34d0fc77267cd24d6d3db2b8e90f Mon Sep 17 00:00:00 2001
From: Nicolas Pierron <nicolas.b.pierron@gmail.com>
Date: Thu, 11 Jun 2009 16:03:57 +0000
Subject: [PATCH 1591/5331] Use types in to improve filesystems.nix

svn path=/nixos/branches/modular-nixos/; revision=15939
---
 modules/tasks/filesystems.nix | 81 ++++++++++++++++++++++++++++++++---
 1 file changed, 75 insertions(+), 6 deletions(-)

diff --git a/modules/tasks/filesystems.nix b/modules/tasks/filesystems.nix
index bc918a5935b..a6c5d9370ef 100644
--- a/modules/tasks/filesystems.nix
+++ b/modules/tasks/filesystems.nix
@@ -3,10 +3,11 @@
 let
 
 ###### interface
+  inherit (pkgs.lib) mkOption types;
 
   options = {
 
-    fileSystems = pkgs.lib.mkOption {
+    fileSystems = mkOption {
       example = [
         { mountPoint = "/";
           device = "/dev/hda1";
@@ -39,9 +40,77 @@ let
         <literal>autocreate</literal> forces <literal>mountPoint</literal> to be created with 
         <command>mkdir -p</command> .
       ";
+      type = types.nullOr (types.list types.optionSet);
+
+      options =  {
+
+        mountPoint = mkOption {
+          example = "/mnt/usb";
+          type = types.uniq types.string;
+          description = "
+            Location of the mounted the file system.
+          ";
+        };
+
+        device = mkOption {
+          default = null;
+          example = "/dev/sda";
+          type = types.uniq (types.nullOr types.string);
+          description = "
+            Location of the device.
+          ";
+        };
+
+        label = mkOption {
+          default = null;
+          example = "root-partition";
+          type = types.uniq (types.nullOr types.string);
+          description = "
+            Label of the device (if any).
+          ";
+        };
+
+        fsType = mkOption {
+          default = "auto";
+          example = "ext3";
+          type = types.uniq types.string;
+          description = "
+            Type of the file system.
+          ";
+        };
+
+        options = mkOption {
+          default = "defaults";
+          example = "data=journal";
+          type = types.string;
+          merge = pkgs.lib.concatStringsSep ",";
+          description = "
+            Option used to mount the file system.
+          ";
+        };
+
+        autocreate = mkOption {
+          default = "0";
+          type = types.uniq types.string;
+          description = "
+            Automatically create the mount point defined in
+            <option>fileSystems.*.mountPoint</option>.
+          ";
+        };
+
+        # Should be moved inside boot-stage-1.nix
+        neededForBoot = mkOption {
+          default = false;
+          type = types.enable;
+          description = "
+            Mount this file system to boot on NixOS.
+          ";
+        };
+
+      };
     };
   
-    system.sbin.mount = pkgs.lib.mkOption {
+    system.sbin.mount = mkOption {
       internal = true;
       default = pkgs.utillinuxng.override {
         buildMountOnly = true;
@@ -69,10 +138,10 @@ let
   inherit (pkgs) e2fsprogs;
   fileSystems = config.fileSystems;
   mountPoints = map (fs: fs.mountPoint) fileSystems;
-  devices = map (fs: if fs ? device then fs.device else "LABEL=" + fs.label) fileSystems;
-  fsTypes = map (fs: if fs ? fsType then fs.fsType else "auto") fileSystems;
-  optionss = map (fs: if fs ? options then fs.options else "defaults") fileSystems;
-  autocreates = map (fs: if fs ? autocreate then fs.autocreate else "0") fileSystems;
+  devices = map (fs: if fs.device != null then fs.device else "LABEL=" + fs.label) fileSystems;
+  fsTypes = map (fs: fs.fsType) fileSystems;
+  optionss = map (fs: fs.options) fileSystems;
+  autocreates = map (fs: fs.autocreate) fileSystems;
   mount = config.system.sbin.mount;
 
   job = ''
-- 
GitLab


From 4001b66c8840f1fcad3b698895c41b408cd69780 Mon Sep 17 00:00:00 2001
From: Nicolas Pierron <nicolas.b.pierron@gmail.com>
Date: Thu, 11 Jun 2009 16:04:03 +0000
Subject: [PATCH 1592/5331] Move the option declaration of
 filesystems.*.neededForBoot to boot/stage-1.nix.

svn path=/nixos/branches/modular-nixos/; revision=15940
---
 modules/system/boot/stage-1.nix | 14 ++++++++++++--
 modules/tasks/filesystems.nix   | 10 ----------
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/modules/system/boot/stage-1.nix b/modules/system/boot/stage-1.nix
index 0a451648eb1..ec2d6dc0620 100644
--- a/modules/system/boot/stage-1.nix
+++ b/modules/system/boot/stage-1.nix
@@ -7,7 +7,7 @@
 
 let
 
-  inherit (pkgs.lib) mkOption;
+  inherit (pkgs.lib) mkOption types;
 
   options = {
 
@@ -53,6 +53,16 @@ let
         Whether to show a nice splash screen while booting.
       ";
     };
+
+    fileSystems = mkOption {
+      options.neededForBoot = mkOption {
+        default = false;
+        type = types.enable;
+        description = "
+          Mount this file system to boot on NixOS.
+        ";
+      };
+    };
   
   };
 
@@ -165,7 +175,7 @@ let
   # booting (such as the FS containing /nix/store, or an FS needed for
   # mounting /, like / on a loopback).
   fileSystems = pkgs.lib.filter
-    (fs: fs.mountPoint == "/" || (fs ? neededForBoot && fs.neededForBoot))
+    (fs: fs.mountPoint == "/" || fs.neededForBoot)
     config.fileSystems;
 
 
diff --git a/modules/tasks/filesystems.nix b/modules/tasks/filesystems.nix
index a6c5d9370ef..f7e75d32700 100644
--- a/modules/tasks/filesystems.nix
+++ b/modules/tasks/filesystems.nix
@@ -97,16 +97,6 @@ let
             <option>fileSystems.*.mountPoint</option>.
           ";
         };
-
-        # Should be moved inside boot-stage-1.nix
-        neededForBoot = mkOption {
-          default = false;
-          type = types.enable;
-          description = "
-            Mount this file system to boot on NixOS.
-          ";
-        };
-
       };
     };
   
-- 
GitLab


From 6cee6e9d873f63b6ce15ffb875f4acfe6496d020 Mon Sep 17 00:00:00 2001
From: Nicolas Pierron <nicolas.b.pierron@gmail.com>
Date: Thu, 11 Jun 2009 17:59:47 +0000
Subject: [PATCH 1593/5331] Replace special rule by a module-list.mask file
 which enumerates all patterns matching the files which should not figure in
 module-list.nix.

svn path=/nixos/branches/modular-nixos/; revision=15941
---
 maintainers/scripts/gen-module-list.sh | 16 ++++++++++++++--
 modules/module-list.mask               |  4 ++++
 modules/module-list.nix                | 14 +++++++-------
 3 files changed, 25 insertions(+), 9 deletions(-)
 create mode 100644 modules/module-list.mask

diff --git a/maintainers/scripts/gen-module-list.sh b/maintainers/scripts/gen-module-list.sh
index c63d1a69521..e964f11edd1 100755
--- a/maintainers/scripts/gen-module-list.sh
+++ b/maintainers/scripts/gen-module-list.sh
@@ -30,19 +30,31 @@ is_module(){
   " | nix-instantiate - --eval-only
 }
 
+find_mask(){
+  local maskfile="$1"
+  if test -r "${maskfile}"; then
+    cat "${maskfile}"
+    echo
+    echo "./module-list.nix"
+  else
+    echo "./module-list.nix"
+  fi | \
+  sed -ne 's/[ 	]*#.*//; /^[ 	]*$/ d; s/\(.*\)/-wholename '"'\1'"' -or /p' | tr -d '\n'
+}
+
 generate_index(){
   local path="$1"
   cd "$path"
   echo -n "$path: " 1>&2
   { echo "[ # This file has been generated by $(basename $prog)";
-    for file in : $(find ./ -wholename '*.impl[./]*' -or -wholename './module-list.nix' -or -type f -name '*.nix' -print | sort); do
+    for file in : $(eval find ./ $(find_mask ./module-list.mask) -type f -name "'*.nix'" -print | sort); do
        [ "$file" = ':' ] && continue;
        echo -n . 1>&2
        if test "$(is_module "$file" 2> /dev/null)" = "Bool(True)"; then
          echo "  $file"
        else
          echo "##### $file"
-         is_module "$file" 2>&1 | sed 's/^/# /'
+         is_module "$file" 2>&1 | sed "s/^/# /; s,$(pwd),.,"
        fi
     done
     echo ']';
diff --git a/modules/module-list.mask b/modules/module-list.mask
new file mode 100644
index 00000000000..10e9f58925e
--- /dev/null
+++ b/modules/module-list.mask
@@ -0,0 +1,4 @@
+# CD-DVD modules are not generic.
+# Avoid all modules from ./installer/cd-dvd/
+
+./installer/cd-dvd/*
diff --git a/modules/module-list.nix b/modules/module-list.nix
index c6b2d930e5c..7bdb0d685dc 100644
--- a/modules/module-list.nix
+++ b/modules/module-list.nix
@@ -76,27 +76,27 @@
 ##### ./services/web-servers/apache-httpd/per-server-options.nix
 # error: while evaluating the attribute `<let-body>' at `(string):2:8':
 # while evaluating the function at `(string):3:22':
-# while evaluating the function at `/home/eelco/Dev/modular-nixos/modules/services/web-servers/apache-httpd/per-server-options.nix:6:2':
+# while evaluating the function at `./services/web-servers/apache-httpd/per-server-options.nix:6:2':
 # the argument named `forMainServer' required by the function is missing
 ##### ./services/web-servers/apache-httpd/subversion.nix
 # error: while evaluating the attribute `<let-body>' at `(string):2:8':
 # while evaluating the function at `(string):3:22':
-# while evaluating the function at `/home/eelco/Dev/modular-nixos/modules/services/web-servers/apache-httpd/subversion.nix:1:2':
+# while evaluating the function at `./services/web-servers/apache-httpd/subversion.nix:1:2':
 # the argument named `serverInfo' required by the function is missing
 ##### ./services/web-servers/apache-httpd/tomcat-connector.nix
 # error: while evaluating the attribute `<let-body>' at `(string):2:8':
 # while evaluating the function at `(string):3:22':
-# while evaluating the function at `/home/eelco/Dev/modular-nixos/modules/services/web-servers/apache-httpd/tomcat-connector.nix:1:2':
+# while evaluating the function at `./services/web-servers/apache-httpd/tomcat-connector.nix:1:2':
 # the argument named `serverInfo' required by the function is missing
 ##### ./services/web-servers/apache-httpd/twiki.nix
 # error: while evaluating the attribute `<let-body>' at `(string):2:8':
 # while evaluating the function at `(string):3:22':
-# while evaluating the function at `/home/eelco/Dev/modular-nixos/modules/services/web-servers/apache-httpd/twiki.nix:1:2':
+# while evaluating the function at `./services/web-servers/apache-httpd/twiki.nix:1:2':
 # the argument named `serverInfo' required by the function is missing
 ##### ./services/web-servers/apache-httpd/zabbix.nix
 # error: while evaluating the attribute `<let-body>' at `(string):2:8':
 # while evaluating the function at `(string):3:22':
-# while evaluating the function at `/home/eelco/Dev/modular-nixos/modules/services/web-servers/apache-httpd/zabbix.nix:1:2':
+# while evaluating the function at `./services/web-servers/apache-httpd/zabbix.nix:1:2':
 # the argument named `serverInfo' required by the function is missing
   ./services/web-servers/jboss.nix
   ./services/web-servers/tomcat.nix
@@ -129,7 +129,7 @@
 ##### ./system/etc/make-etc.nix
 # error: while evaluating the attribute `<let-body>' at `(string):2:8':
 # while evaluating the function at `(string):3:22':
-# while evaluating the function at `/home/eelco/Dev/modular-nixos/modules/system/etc/make-etc.nix:1:2':
+# while evaluating the function at `./system/etc/make-etc.nix:1:2':
 # the argument named `stdenv' required by the function is missing
   ./system/upstart-events/ctrl-alt-delete.nix
   ./system/upstart-events/halt.nix
@@ -137,7 +137,7 @@
 ##### ./system/upstart/make-job.nix
 # error: while evaluating the attribute `<let-body>' at `(string):2:8':
 # while evaluating the function at `(string):3:22':
-# while evaluating the function at `/home/eelco/Dev/modular-nixos/modules/system/upstart/make-job.nix:1:2':
+# while evaluating the function at `./system/upstart/make-job.nix:1:2':
 # the argument named `runCommand' required by the function is missing
   ./system/upstart/tools.nix
   ./system/upstart/upstart.nix
-- 
GitLab


From 1c6bbf6784fe96c59717c715e9c2689697c0e3d1 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 12 Jun 2009 11:12:46 +0000
Subject: [PATCH 1594/5331] * Add diffutils, gawk and patch to the system path.

svn path=/nixos/branches/modular-nixos/; revision=15943
---
 modules/config/system-path.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/modules/config/system-path.nix b/modules/config/system-path.nix
index 804b9419a45..3752528572d 100644
--- a/modules/config/system-path.nix
+++ b/modules/config/system-path.nix
@@ -18,14 +18,18 @@ let
       pkgs.coreutils
       pkgs.cpio
       pkgs.curl
+      pkgs.diffutils
       pkgs.e2fsprogs
       pkgs.findutils
+      pkgs.gawk
       pkgs.glibc # for ldd, getent
       pkgs.gnugrep
+      pkgs.gnupatch
       pkgs.gnused
       pkgs.gnutar
       pkgs.grub
       pkgs.gzip
+      pkgs.host
       pkgs.iputils
       pkgs.less
       pkgs.libcap
@@ -56,7 +60,6 @@ let
       pkgs.usbutils
       pkgs.utillinux
       pkgs.wirelesstools
-      pkgs.host
     ] ++ config.environment.extraPackages;
 
 
-- 
GitLab


From f258edcb80a77412d633569fabf33f87d7c0dba3 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sun, 14 Jun 2009 11:07:44 +0000
Subject: [PATCH 1595/5331] * autocreate should be a boolean.

svn path=/nixos/branches/modular-nixos/; revision=15956
---
 modules/tasks/filesystems.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/tasks/filesystems.nix b/modules/tasks/filesystems.nix
index f7e75d32700..b5262ec6107 100644
--- a/modules/tasks/filesystems.nix
+++ b/modules/tasks/filesystems.nix
@@ -90,8 +90,8 @@ let
         };
 
         autocreate = mkOption {
-          default = "0";
-          type = types.uniq types.string;
+          default = false;
+          type = types.bool;
           description = "
             Automatically create the mount point defined in
             <option>fileSystems.*.mountPoint</option>.
-- 
GitLab


From ff58b5dedec44d99fbb7842b5488c633982683a5 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sun, 14 Jun 2009 11:08:44 +0000
Subject: [PATCH 1596/5331] * Booting was broken when using the "label" option.

svn path=/nixos/branches/modular-nixos/; revision=15957
---
 modules/system/boot/stage-1.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/modules/system/boot/stage-1.nix b/modules/system/boot/stage-1.nix
index ec2d6dc0620..c789205079b 100644
--- a/modules/system/boot/stage-1.nix
+++ b/modules/system/boot/stage-1.nix
@@ -57,7 +57,7 @@ let
     fileSystems = mkOption {
       options.neededForBoot = mkOption {
         default = false;
-        type = types.enable;
+        type = types.bool;
         description = "
           Mount this file system to boot on NixOS.
         ";
@@ -220,9 +220,9 @@ let
       if fileSystems == null
       then abort "You must specify the fileSystems option!"
       else map (fs: fs.mountPoint) fileSystems;
-    devices = map (fs: if fs ? device then fs.device else "/dev/disk/by-label/${fs.label}") fileSystems;
-    fsTypes = map (fs: if fs ? fsType then fs.fsType else "auto") fileSystems;
-    optionss = map (fs: if fs ? options then fs.options else "defaults") fileSystems;
+    devices = map (fs: if fs.device != null then fs.device else "/dev/disk/by-label/${fs.label}") fileSystems;
+    fsTypes = map (fs: fs.fsType) fileSystems;
+    optionss = map (fs: fs.options) fileSystems;
 
     path = [
       # `extraUtils' comes first because it overrides the `mount'
-- 
GitLab


From 048e03377f2c99656dc0547892fcb8298d0d1089 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 15 Jun 2009 15:50:36 +0000
Subject: [PATCH 1597/5331] * Don't try to run fsck on ISO-9660/UDF
 filesystems.

svn path=/nixos/branches/modular-nixos/; revision=15963
---
 default.nix                         | 2 ++
 modules/system/boot/stage-1-init.sh | 7 ++++++-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/default.nix b/default.nix
index d628a3a5231..3c174ca13e5 100644
--- a/default.nix
+++ b/default.nix
@@ -10,6 +10,8 @@ let
 in
 
 {
+  inherit config;
+
   system = config.system.build.system;
 
   # The following are used by nixos-rebuild.
diff --git a/modules/system/boot/stage-1-init.sh b/modules/system/boot/stage-1-init.sh
index 8d062ac96c8..3f11da28950 100644
--- a/modules/system/boot/stage-1-init.sh
+++ b/modules/system/boot/stage-1-init.sh
@@ -141,13 +141,18 @@ checkFS() {
     # Only check block devices.
     if ! test -b "$device"; then return 0; fi
 
+    eval $(fstype "$device")
+
+    # Don't check ROM filesystems.
+    if test "$FSTYPE" = iso9660 -o "$FSTYPE" = udf; then return 0; fi
+
     # Don't run `fsck' if the machine is on battery power.  !!! Is
     # this a good idea?
     if ! onACPower; then
         echo "on battery power, so no \`fsck' will be performed on \`$device'"
         return 0
     fi
-    
+
     FSTAB_FILE="/etc/mtab" fsck -V -v -C -a "$device"
     fsckResult=$?
 
-- 
GitLab


From 16937dd23d5839bc60091dc30b4a3372a175145e Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 15 Jun 2009 16:47:37 +0000
Subject: [PATCH 1598/5331] * Make fsck on journaling filesystems optional
 (enabled by default).   This is because fsck.ext3 takes several minutes to
 recover the   journal, whereas the ext3 implementation in the kernel only
 takes a   few seconds.  I'd love to know why this is the case...

svn path=/nixos/branches/modular-nixos/; revision=15965
---
 modules/system/boot/stage-1-init.sh | 11 +++++++++++
 modules/system/boot/stage-1.nix     | 10 ++++++++++
 2 files changed, 21 insertions(+)

diff --git a/modules/system/boot/stage-1-init.sh b/modules/system/boot/stage-1-init.sh
index 3f11da28950..dd1fe0c886f 100644
--- a/modules/system/boot/stage-1-init.sh
+++ b/modules/system/boot/stage-1-init.sh
@@ -146,6 +146,17 @@ checkFS() {
     # Don't check ROM filesystems.
     if test "$FSTYPE" = iso9660 -o "$FSTYPE" = udf; then return 0; fi
 
+    # Optionally, skip fsck on journaling filesystems.  This option is
+    # a hack - it's mostly because e2fsck on ext3 takes much longer to
+    # recover the journal than the ext3 implementation in the kernel
+    # does (minutes versus seconds).
+    if test -z "@checkJournalingFS@" -a \
+        \( "$FSTYPE" = ext3 -o "$FSTYPE" = ext4 -o "$FSTYPE" = reiserfs \
+        -o "$FSTYPE" = xfs -o "$FSTYPE" = jfs \)
+    then
+        return 0
+    fi
+    
     # Don't run `fsck' if the machine is on battery power.  !!! Is
     # this a good idea?
     if ! onACPower; then
diff --git a/modules/system/boot/stage-1.nix b/modules/system/boot/stage-1.nix
index c789205079b..565af8fdc8f 100644
--- a/modules/system/boot/stage-1.nix
+++ b/modules/system/boot/stage-1.nix
@@ -54,6 +54,14 @@ let
       ";
     };
 
+    boot.initrd.checkJournalingFS = mkOption {
+      default = true;
+      type = types.bool;
+      description = ''
+        Whether to run fsck on journaling filesystems such as ext3.
+      '';
+    };
+
     fileSystems = mkOption {
       options.neededForBoot = mkOption {
         default = false;
@@ -215,6 +223,8 @@ let
     
     inherit (config.boot) isLiveCD resumeDevice;
 
+    inherit (config.boot.initrd) checkJournalingFS;
+
     # !!! copy&pasted from upstart-jobs/filesystems.nix.
     mountPoints =
       if fileSystems == null
-- 
GitLab


From c3ea825c234a5a165714c145453862a912cb8b05 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 17 Jun 2009 10:07:31 +0000
Subject: [PATCH 1599/5331] * Fix installing from the modular branch. 
 system/system.nix no longer   exists.  $NIXPKGS needs to be set, otherwise
 NixOS can't find   Nixpkgs (because in the chroot it's in
 /mnt/etc/nixos/nixpkgs).   Also clear LANG to shut up Perl warnings about the
 locale.

svn path=/nixos/branches/modular-nixos/; revision=15978
---
 modules/installer/tools/nixos-install.sh | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/modules/installer/tools/nixos-install.sh b/modules/installer/tools/nixos-install.sh
index b90ffe4145c..f9baa0e891a 100644
--- a/modules/installer/tools/nixos-install.sh
+++ b/modules/installer/tools/nixos-install.sh
@@ -110,6 +110,10 @@ for i in $storePaths; do
 done
 
 
+# We don't have locale-archive in the chroot, so clear $LANG.
+export LANG=
+
+
 # Register the paths in the Nix closure as valid.  This is necessary
 # to prevent them from being deleted the first time we install
 # something.  (I.e., Nix will see that, e.g., the glibc path is not
@@ -143,9 +147,9 @@ fi
 # Build the specified Nix expression in the target store and install
 # it into the system configuration profile.
 echo "building the system configuration..."
-chroot $mountPoint @nix@/bin/nix-env \
+NIXPKGS=/mnt/etc/nixos/nixpkgs chroot $mountPoint @nix@/bin/nix-env \
     -p /nix/var/nix/profiles/system \
-    -f "/mnt$NIXOS/system/system.nix" \
+    -f "/mnt$NIXOS" \
     --arg configuration "import $NIXOS_CONFIG" \
     --set -A system
 
-- 
GitLab


From c46dc8ad1000aef0ffb9311b69446ac8913df7b5 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 17 Jun 2009 10:41:17 +0000
Subject: [PATCH 1600/5331] * Fix nixos-hardware-scan.  BTW the model is now to
 do something like

  $ nixos-hardware-scan > /etc/nixos/hardware.nix

  and import the hardware.nix module in /etc/nixos/configuration.nix.
  That way you can easily rescan for new hardware.

svn path=/nixos/branches/modular-nixos/; revision=15979
---
 .../installer/tools/nixos-hardware-scan.pl    | 43 +++++--------------
 1 file changed, 10 insertions(+), 33 deletions(-)

diff --git a/modules/installer/tools/nixos-hardware-scan.pl b/modules/installer/tools/nixos-hardware-scan.pl
index d21e92cd51b..c1d94b93927 100644
--- a/modules/installer/tools/nixos-hardware-scan.pl
+++ b/modules/installer/tools/nixos-hardware-scan.pl
@@ -96,19 +96,19 @@ sub pciCheck {
     # Can't rely on $module here, since the module may not be loaded
     # due to missing firmware.  Ideally we would check modules.pcimap
     # here.
-    push @requireList, "(import ./configurations/hardware/network/Intel2200BG.nix)" if
+    push @requireList, "./nixos/hardware/network/intel-2200bg.nix" if
         $vendor eq "0x8086" &&
         ($device eq "0x1043" || $device eq "0x104f" || $device eq "0x4220" ||
          $device eq "0x4221" || $device eq "0x4223" || $device eq "0x4224");
 
-    push @requireList, "(import ./configurations/hardware/network/Intel3945ABG.nix)" if
+    push @requireList, "./nixos/hardware/network/intel-3945abg.nix" if
         $vendor eq "0x8086" &&
         ($device eq "0x4229" || $device eq "0x4230" ||
          $device eq "0x4222" || $device eq "0x4227");
 
     # Hm, can we extract the PCI ids supported by X drivers somehow?
     # cf. http://www.calel.org/pci-devices/xorg-device-list.html
-    $videoDriver = "i810" if $vendor eq "0x8086" &&
+    $videoDriver = "intel" if $vendor eq "0x8086" &&
         ($device eq "0x1132" ||
          $device eq "0x2572" ||
          $device eq "0x2592" ||
@@ -204,7 +204,7 @@ sub multiLineList {
     foreach my $s (@_) {
         $res .= "\n$indent  $s";
     }
-    $res .= "\nindent";
+    $res .= "\n$indent";
     return $res;
 }
 
@@ -212,40 +212,17 @@ my $initrdKernelModules = toNixExpr(removeDups @initrdKernelModules);
 my $kernelModules = toNixExpr(removeDups @kernelModules);
 my $requireList = multiLineList("  ", removeDups @requireList);
 
-## This is a generated file.  Do not modify!
-## Make changes to /etc/nixos/configuration.nix instead.
 print <<EOF ;
+# This is a generated file.  Do not modify!
+# Make changes to /etc/nixos/configuration.nix instead.
 {
   require = [$requireList];
 
-  boot = {
-    initrd = {
-      extraKernelModules = [ $initrdKernelModules ];
-    };
-    kernelModules = [ $kernelModules ];
-  };
+  boot.initrd.extraKernelModules = [ $initrdKernelModules ];
+  boot.kernelModules = [ $kernelModules ];
 
-  nix = {
-    maxJobs = $cpus;
-  };
+  nix.maxJobs = $cpus;
 
-  # list of file systems which can be mounted.
-  fileSystems = [
-  ];
-
-  # list of swap devices.
-  swapDevices = [
-  ];
-
-  networking = {
-  };
-
-  services = {
-
-    xserver = {
-      videoDriver = "$videoDriver";
-    };
-
-  };
+  services.xserver.videoDriver = "$videoDriver";
 }
 EOF
-- 
GitLab


From e08e7aedbc7dd18620a4d29b9b120842cce65b93 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 18 Jun 2009 16:03:18 +0000
Subject: [PATCH 1601/5331] * Option boot.initrd.postMountCommands to specify
 additional shell   commands for in stage 1 of the boot.

svn path=/nixos/branches/modular-nixos/; revision=15998
---
 modules/system/boot/stage-1-init.sh |  3 +++
 modules/system/boot/stage-1.nix     | 11 ++++++++++-
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/modules/system/boot/stage-1-init.sh b/modules/system/boot/stage-1-init.sh
index dd1fe0c886f..17c9d2b3ee0 100644
--- a/modules/system/boot/stage-1-init.sh
+++ b/modules/system/boot/stage-1-init.sh
@@ -266,6 +266,9 @@ if test -n "@isLiveCD@"; then
 fi
 
 
+@postMountCommands@
+
+
 # Stop udevd.
 kill $(minips -C udevd -o pid=)
 
diff --git a/modules/system/boot/stage-1.nix b/modules/system/boot/stage-1.nix
index 565af8fdc8f..da8a50f4903 100644
--- a/modules/system/boot/stage-1.nix
+++ b/modules/system/boot/stage-1.nix
@@ -62,6 +62,15 @@ let
       '';
     };
 
+    boot.initrd.postMountCommands = mkOption {
+      default = "";
+      merge = pkgs.lib.mergeStringOption;
+      description = ''
+        Shell commands to be executed immediately after the stage 1
+        filesystems has been mounted.
+      '';
+    };
+
     fileSystems = mkOption {
       options.neededForBoot = mkOption {
         default = false;
@@ -223,7 +232,7 @@ let
     
     inherit (config.boot) isLiveCD resumeDevice;
 
-    inherit (config.boot.initrd) checkJournalingFS;
+    inherit (config.boot.initrd) checkJournalingFS postMountCommands;
 
     # !!! copy&pasted from upstart-jobs/filesystems.nix.
     mountPoints =
-- 
GitLab


From 8179e5213f76777fd8d45780cce61c40e867dd63 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 18 Jun 2009 16:16:12 +0000
Subject: [PATCH 1602/5331] * A module for building KVM/QEMU virtual machines
 from a NixOS   configuration.  No virtual disk image is generated; the VM
 shares a   Nix store with the host.  This makes it very fast to build new
 VMs.

svn path=/nixos/branches/modular-nixos/; revision=15999
---
 modules/virtualisation/qemu-vm.nix | 61 ++++++++++++++++++++++++++++++
 1 file changed, 61 insertions(+)
 create mode 100644 modules/virtualisation/qemu-vm.nix

diff --git a/modules/virtualisation/qemu-vm.nix b/modules/virtualisation/qemu-vm.nix
new file mode 100644
index 00000000000..eae0541f338
--- /dev/null
+++ b/modules/virtualisation/qemu-vm.nix
@@ -0,0 +1,61 @@
+# This module creates a virtual machine from the NixOS configuration.
+# Building the `config.system.build.vm' attribute gives you a command
+# that starts a KVM/QEMU VM running the NixOS configuration defined in
+# `config'.  The Nix store is shared read-only with the host, which
+# makes (re)building VMs very efficient.  However, it also means you
+# can't reconfigure the guest inside the guest - you need to rebuild
+# the VM in the host.  On the other hand, the root filesystem is a
+# read/writable disk image persistent across VM reboots.
+
+{config, pkgs, ...}:
+
+{
+  # All the modules the initrd needs to mount the host filesystem via
+  # CIFS.  Also use paravirtualised network and block devices for
+  # performance.
+  boot.initrd.extraKernelModules =
+    ["cifs" "virtio_net" "virtio_pci" "virtio_blk" "virtio_balloon" "nls_utf8"];
+
+  fileSystems =
+    [ { mountPoint = "/";
+        device = "/dev/vda";
+      }
+    ];
+
+  # Mount the host filesystem and bind-mount its Nix store into our
+  # own root FS.
+  boot.initrd.postMountCommands =
+    ''
+      ipconfig 10.0.2.15:::::eth0:none
+      
+      mkdir /hostfs
+      ${pkgs.vmTools.mountCifs}/bin/mount.cifs //10.0.2.4/qemu /hostfs -o guest,username=nobody
+
+      mkdir -p $targetRoot/nix/store
+      mount --bind /hostfs/nix/store $targetRoot/nix/store
+    '';
+
+  # Starting DHCP brings down eth0, which kills the connection to the
+  # host filesystem and thus deadlocks the system.
+  networking.useDHCP = false;
+
+  system.build.vm = pkgs.runCommand "nixos-vm" {}
+    ''
+      ensureDir $out
+      ln -s ${config.system.build.system} $out/system
+
+      ensureDir $out/bin
+      cat > $out/bin/run-nixos-vm <<EOF
+      #! ${pkgs.stdenv.shell}
+      export PATH=${pkgs.samba}/sbin:\$PATH
+      ${pkgs.kvm}/bin/qemu-system-x86_64 \
+        -net nic,model=virtio -net user -smb / \
+        -drive file=\$diskImage,if=virtio,boot=on \
+        -kernel ${config.system.build.system}/kernel \
+        -initrd ${config.system.build.system}/initrd \
+        -append "\$(cat ${config.system.build.system}/kernel-params) init=${config.system.build.bootStage2} systemConfig=${config.system.build.system}"
+      EOF
+      chmod u+x $out/bin/run-nixos-vm
+    '';
+
+}
-- 
GitLab


From 9460a308511046d1f769b28811fb85edad9cfb2c Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 18 Jun 2009 16:47:00 +0000
Subject: [PATCH 1603/5331] * Use the fileSystems option to mount the host
 filesystem.  Also, it   seems that mount.cifs isn't actually needed
 (anymore?).

svn path=/nixos/branches/modular-nixos/; revision=16000
---
 modules/system/boot/stage-1-init.sh |  6 ++++++
 modules/system/boot/stage-1.nix     | 15 ++++++++++++--
 modules/virtualisation/qemu-vm.nix  | 31 +++++++++++++++++------------
 3 files changed, 37 insertions(+), 15 deletions(-)

diff --git a/modules/system/boot/stage-1-init.sh b/modules/system/boot/stage-1-init.sh
index 17c9d2b3ee0..7a5ebedd7a8 100644
--- a/modules/system/boot/stage-1-init.sh
+++ b/modules/system/boot/stage-1-init.sh
@@ -127,6 +127,9 @@ fi
 if test -n "$debug1devices"; then fail; fi
 
 
+@postDeviceCommands@
+
+
 # Return true if the machine is on AC power, or if we can't determine
 # whether it's on AC power.
 onACPower() {
@@ -223,6 +226,9 @@ for ((n = 0; n < ${#mountPoints[*]}; n++)); do
     case $device in
         /dev/*)
             ;;
+        //*)
+            # Don't touch SMB/CIFS paths.
+            ;;
         /*)
             device=/mnt-root$device
             ;;
diff --git a/modules/system/boot/stage-1.nix b/modules/system/boot/stage-1.nix
index da8a50f4903..3ff69ac12da 100644
--- a/modules/system/boot/stage-1.nix
+++ b/modules/system/boot/stage-1.nix
@@ -62,12 +62,22 @@ let
       '';
     };
 
+    boot.initrd.postDeviceCommands = mkOption {
+      default = "";
+      merge = pkgs.lib.mergeStringOption;
+      description = ''
+        Shell commands to be executed immediately after stage 1 of the
+        boot has loaded kernel modules and created device nodes in
+        /dev.
+      '';
+    };
+
     boot.initrd.postMountCommands = mkOption {
       default = "";
       merge = pkgs.lib.mergeStringOption;
       description = ''
         Shell commands to be executed immediately after the stage 1
-        filesystems has been mounted.
+        filesystems have been mounted.
       '';
     };
 
@@ -232,7 +242,8 @@ let
     
     inherit (config.boot) isLiveCD resumeDevice;
 
-    inherit (config.boot.initrd) checkJournalingFS postMountCommands;
+    inherit (config.boot.initrd) checkJournalingFS
+      postDeviceCommands postMountCommands;
 
     # !!! copy&pasted from upstart-jobs/filesystems.nix.
     mountPoints =
diff --git a/modules/virtualisation/qemu-vm.nix b/modules/virtualisation/qemu-vm.nix
index eae0541f338..af1911a1ae6 100644
--- a/modules/virtualisation/qemu-vm.nix
+++ b/modules/virtualisation/qemu-vm.nix
@@ -16,25 +16,30 @@
   boot.initrd.extraKernelModules =
     ["cifs" "virtio_net" "virtio_pci" "virtio_blk" "virtio_balloon" "nls_utf8"];
 
+  boot.initrd.postDeviceCommands =
+    ''
+      ipconfig 10.0.2.15:::::eth0:none
+    '';
+
+  # Mount the host filesystem via CIFS, and bind-mount the Nix store
+  # of the host into our own filesystem.
   fileSystems =
     [ { mountPoint = "/";
         device = "/dev/vda";
       }
+      { mountPoint = "/hostfs";
+        device = "//10.0.2.4/qemu";
+        fsType = "cifs";
+        options = "guest,username=nobody";
+        neededForBoot = true;
+      }
+      { mountPoint = "/nix/store";
+        device = "/hostfs/nix/store";
+        options = "bind";
+        neededForBoot = true;
+      }
     ];
 
-  # Mount the host filesystem and bind-mount its Nix store into our
-  # own root FS.
-  boot.initrd.postMountCommands =
-    ''
-      ipconfig 10.0.2.15:::::eth0:none
-      
-      mkdir /hostfs
-      ${pkgs.vmTools.mountCifs}/bin/mount.cifs //10.0.2.4/qemu /hostfs -o guest,username=nobody
-
-      mkdir -p $targetRoot/nix/store
-      mount --bind /hostfs/nix/store $targetRoot/nix/store
-    '';
-
   # Starting DHCP brings down eth0, which kills the connection to the
   # host filesystem and thus deadlocks the system.
   networking.useDHCP = false;
-- 
GitLab


From d06556e274bed57fb98fa21289d1bd368aa9f54f Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 19 Jun 2009 14:27:43 +0000
Subject: [PATCH 1604/5331] * Get rid of the `experimental' flag.

svn path=/nixos/branches/modular-nixos/; revision=16010
---
 doc/config-examples/svn-server.nix                    | 1 -
 modules/services/web-servers/apache-httpd/default.nix | 9 +--------
 2 files changed, 1 insertion(+), 9 deletions(-)

diff --git a/doc/config-examples/svn-server.nix b/doc/config-examples/svn-server.nix
index a3c3b46cf24..7f2dafe16ad 100644
--- a/doc/config-examples/svn-server.nix
+++ b/doc/config-examples/svn-server.nix
@@ -17,7 +17,6 @@
 
     httpd = {
       enable = true;
-      experimental = true;
       adminAddr = "admin@example.org";
 
       subservices = {
diff --git a/modules/services/web-servers/apache-httpd/default.nix b/modules/services/web-servers/apache-httpd/default.nix
index 60185c6bbc1..1d5281f25d9 100644
--- a/modules/services/web-servers/apache-httpd/default.nix
+++ b/modules/services/web-servers/apache-httpd/default.nix
@@ -15,13 +15,6 @@ let
           ";
         };
 
-        experimental = mkOption {
-          default = false;
-          description = "
-            Whether to use the new-style Apache configuration.
-          ";
-        };
-
         extraConfig = mkOption {
           default = "";
           description = "
@@ -565,7 +558,7 @@ let
 in
 
 
-mkIf (config.services.httpd.enable && config.services.httpd.experimental) {
+mkIf config.services.httpd.enable {
   require = [
     options
   ];
-- 
GitLab


From aa60f3e9a7bed5d06aad1dad8df2195f9e0db108 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 19 Jun 2009 14:30:56 +0000
Subject: [PATCH 1605/5331] * sendfile() is broken over CIFS.

svn path=/nixos/branches/modular-nixos/; revision=16011
---
 modules/virtualisation/qemu-vm.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/modules/virtualisation/qemu-vm.nix b/modules/virtualisation/qemu-vm.nix
index af1911a1ae6..d532208378e 100644
--- a/modules/virtualisation/qemu-vm.nix
+++ b/modules/virtualisation/qemu-vm.nix
@@ -63,4 +63,7 @@
       chmod u+x $out/bin/run-nixos-vm
     '';
 
+  # sendfile() is currently broken over CIFS, so fix it here for all
+  # configurations that use Apache.
+  services.httpd.extraConfig = "EnableSendFile Off";
 }
-- 
GitLab


From da77a6437f63c98132135f158970cac7b295f3f3 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 19 Jun 2009 15:19:56 +0000
Subject: [PATCH 1606/5331] * qemu-vm.nix: automatically create and initialise
 the disk image if   it doesn't already exist.  Also set up some ad hoc port
 forwarding   from the host to the guest.

svn path=/nixos/branches/modular-nixos/; revision=16012
---
 modules/system/boot/stage-1.nix    | 12 +++++
 modules/virtualisation/qemu-vm.nix | 75 ++++++++++++++++++++++++------
 2 files changed, 73 insertions(+), 14 deletions(-)

diff --git a/modules/system/boot/stage-1.nix b/modules/system/boot/stage-1.nix
index 3ff69ac12da..c91c4d93333 100644
--- a/modules/system/boot/stage-1.nix
+++ b/modules/system/boot/stage-1.nix
@@ -81,6 +81,16 @@ let
       '';
     };
 
+    boot.initrd.extraUtilsCommands = mkOption {
+      default = "";
+      merge = pkgs.lib.mergeStringOption;
+      description = ''
+        Shell commands to be executed in the builder of the
+        extra-utils derivation.  This can be used to provide
+        additional utilities in the initial ramdisk.
+      '';
+    };
+
     fileSystems = mkOption {
       options.neededForBoot = mkOption {
         default = false;
@@ -167,6 +177,8 @@ let
       cp ${pkgs.bash}/bin/bash $out/bin
       ln -s bash $out/bin/sh
 
+      ${config.boot.initrd.extraUtilsCommands}
+
       # Run patchelf to make the programs refer to the copied libraries.
       for i in $out/bin/* $out/lib/*; do if ! test -L $i; then nuke-refs $i; fi; done
 
diff --git a/modules/virtualisation/qemu-vm.nix b/modules/virtualisation/qemu-vm.nix
index d532208378e..db12c2c9bb4 100644
--- a/modules/virtualisation/qemu-vm.nix
+++ b/modules/virtualisation/qemu-vm.nix
@@ -9,16 +9,75 @@
 
 {config, pkgs, ...}:
 
+let
+
+  options = {
+
+    virtualisation.diskImage =
+      pkgs.lib.mkOption {
+        default = "./${config.networking.hostName}.qcow2";
+        description =
+          ''
+            Path to the disk image containing the root filesystem.
+            The image will be created on startup if it does not
+            exist.
+          '';
+      };
+
+  };
+
+
+  # Shell script to start the VM.
+  startVM =
+    ''
+      #! ${pkgs.stdenv.shell}
+      
+      export PATH=${pkgs.samba}/sbin:$PATH
+
+      NIX_DISK_IMAGE=''${NIX_DISK_IMAGE:-${config.virtualisation.diskImage}}
+
+      if ! test -e "$NIX_DISK_IMAGE"; then
+          ${pkgs.kvm}/bin/qemu-img create -f qcow2 "$NIX_DISK_IMAGE" 512M || exit 1
+      fi
+      
+      ${pkgs.kvm}/bin/qemu-system-x86_64 \
+          -net nic,model=virtio -net user -smb / \
+          -drive file=$NIX_DISK_IMAGE,if=virtio,boot=on \
+          -kernel ${config.system.build.system}/kernel \
+          -initrd ${config.system.build.system}/initrd \
+          -redir tcp:8080::80 \
+          -redir tcp:8022::22 \
+          -append "$(cat ${config.system.build.system}/kernel-params) init=${config.system.build.bootStage2} systemConfig=${config.system.build.system}"
+    '';
+
+in
+
 {
+  require = options;
+
   # All the modules the initrd needs to mount the host filesystem via
   # CIFS.  Also use paravirtualised network and block devices for
   # performance.
   boot.initrd.extraKernelModules =
     ["cifs" "virtio_net" "virtio_pci" "virtio_blk" "virtio_balloon" "nls_utf8"];
 
+  boot.initrd.extraUtilsCommands =
+    ''
+      # We need mke2fs in the initrd.
+      cp ${pkgs.e2fsprogs}/sbin/mke2fs $out/bin
+    '';
+      
   boot.initrd.postDeviceCommands =
     ''
+      # Set up networking.  Needed for CIFS mounting.
       ipconfig 10.0.2.15:::::eth0:none
+
+      # If the disk image appears to be empty (fstype "unknown";
+      # hacky!!!), run mke2fs to initialise.
+      eval $(fstype /dev/vda)
+      if test "$FSTYPE" = unknown; then
+          mke2fs -t ext3 /dev/vda
+      fi
     '';
 
   # Mount the host filesystem via CIFS, and bind-mount the Nix store
@@ -46,21 +105,9 @@
 
   system.build.vm = pkgs.runCommand "nixos-vm" {}
     ''
-      ensureDir $out
-      ln -s ${config.system.build.system} $out/system
-
       ensureDir $out/bin
-      cat > $out/bin/run-nixos-vm <<EOF
-      #! ${pkgs.stdenv.shell}
-      export PATH=${pkgs.samba}/sbin:\$PATH
-      ${pkgs.kvm}/bin/qemu-system-x86_64 \
-        -net nic,model=virtio -net user -smb / \
-        -drive file=\$diskImage,if=virtio,boot=on \
-        -kernel ${config.system.build.system}/kernel \
-        -initrd ${config.system.build.system}/initrd \
-        -append "\$(cat ${config.system.build.system}/kernel-params) init=${config.system.build.bootStage2} systemConfig=${config.system.build.system}"
-      EOF
-      chmod u+x $out/bin/run-nixos-vm
+      ln -s ${config.system.build.system} $out/system
+      ln -s ${pkgs.writeScript "run-nixos-vm" startVM} $out/bin/run-nixos-vm
     '';
 
   # sendfile() is currently broken over CIFS, so fix it here for all
-- 
GitLab


From fc3eecad91b7fd0c92bb9055830cbf0f390d0da9 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 22 Jun 2009 10:01:14 +0000
Subject: [PATCH 1607/5331] * Remove some references to the services tree.

svn path=/nixos/branches/modular-nixos/; revision=16015
---
 modules/installer/tools/nixos-checkout.nix | 8 +-------
 modules/installer/tools/nixos-install.sh   | 8 --------
 2 files changed, 1 insertion(+), 15 deletions(-)

diff --git a/modules/installer/tools/nixos-checkout.nix b/modules/installer/tools/nixos-checkout.nix
index 290a4d6b2eb..2d59f671884 100644
--- a/modules/installer/tools/nixos-checkout.nix
+++ b/modules/installer/tools/nixos-checkout.nix
@@ -41,8 +41,7 @@ let
         from working directory dirname
         <replaceable>target</replaceable> and should create the
         directory
-        <filename><replaceable>dir</replaceable></filename>. (<command>git
-        clone url nixos/nixpkgs/services</command> should do) For
+        <filename><replaceable>dir</replaceable></filename>.  For
         the executables used see <option>repoTypes</option>.
       '';
     };
@@ -52,11 +51,6 @@ let
       description = "same as <option>repos.nixos</option>";
     };
 
-    installer.repos.services = mkOption {
-      default = [ { type  = "svn"; } ];
-      description = "same as <option>repos.nixos</option>";
-    };
-
     installer.repoTypes = mkOption {
       default = {
         svn = { valid = "[ -d .svn ]"; env = [ pkgs.coreutils pkgs.subversion ]; };
diff --git a/modules/installer/tools/nixos-install.sh b/modules/installer/tools/nixos-install.sh
index f9baa0e891a..bc935f7c8e3 100644
--- a/modules/installer/tools/nixos-install.sh
+++ b/modules/installer/tools/nixos-install.sh
@@ -169,20 +169,12 @@ if test -e $targetNixpkgs; then
     mv $targetNixpkgs $targetNixpkgs.backup-$backupTimestamp
 fi
 
-targetServices=$mountPoint/etc/nixos/services
-if test -e $targetServices; then
-    mv $targetServices $targetServices.backup-$backupTimestamp
-fi
-
 
 # Copy the NixOS/Nixpkgs sources to the target.
 cp -prd $NIXOS $targetNixos
 if test -e /etc/nixos/nixpkgs; then
     cp -prd /etc/nixos/nixpkgs $targetNixpkgs
 fi
-if test -e /etc/nixos/services; then
-    cp -prd /etc/nixos/services $targetServices
-fi
 
 
 # Grub needs an mtab.
-- 
GitLab


From 97a4e1fcb3db3c74f510a075d6748e1ecdb7f118 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 22 Jun 2009 10:03:58 +0000
Subject: [PATCH 1608/5331] * Rename the CD modules to something more sensible.
 * Make sure that reconfiguration in the live CD works properly by   including
 the proper configuration module in   /etc/nixos/configuration.nix.  Ugly.

svn path=/nixos/branches/modular-nixos/; revision=16016
---
 modules/installer/cd-dvd/installation-cd-base.nix     | 11 ++++++++++-
 ...ation-cd-big.nix => installation-cd-graphical.nix} |  2 ++
 ...ation-cd-small.nix => installation-cd-minimal.nix} |  2 ++
 3 files changed, 14 insertions(+), 1 deletion(-)
 rename modules/installer/cd-dvd/{installation-cd-big.nix => installation-cd-graphical.nix} (76%)
 rename modules/installer/cd-dvd/{installation-cd-small.nix => installation-cd-minimal.nix} (76%)

diff --git a/modules/installer/cd-dvd/installation-cd-base.nix b/modules/installer/cd-dvd/installation-cd-base.nix
index 18300f01ee9..76ac3b5d3cc 100644
--- a/modules/installer/cd-dvd/installation-cd-base.nix
+++ b/modules/installer/cd-dvd/installation-cd-base.nix
@@ -13,6 +13,15 @@ let
         NixOS version number.
       '';
     };
+
+    installer.configModule = pkgs.lib.mkOption {
+      example = "./nixos/modules/installer/cd-dvd/installation-cd.nix";
+      description = ''
+        Filename of the configuration module that builds the CD
+        configuration.  Must be specified to support reconfiguration
+        in live CDs.
+      '';
+    };
   
   };
 
@@ -46,7 +55,7 @@ let
       {config, pkgs, ...}:
 
       {
-        require = [./nixos/modules/installer/cd-dvd/installation-cd.nix];
+        require = [${config.installer.configModule}];
 
         # Add your own options below and run "nixos-rebuild switch".
         # E.g.,
diff --git a/modules/installer/cd-dvd/installation-cd-big.nix b/modules/installer/cd-dvd/installation-cd-graphical.nix
similarity index 76%
rename from modules/installer/cd-dvd/installation-cd-big.nix
rename to modules/installer/cd-dvd/installation-cd-graphical.nix
index fada3cd1017..5f600022dce 100644
--- a/modules/installer/cd-dvd/installation-cd-big.nix
+++ b/modules/installer/cd-dvd/installation-cd-graphical.nix
@@ -6,6 +6,8 @@
 {
   require = [./installation-cd-base.nix];
 
+  installer.configModule = "./nixos/modules/installer/cd-dvd/installation-cd-graphical.nix";
+
   services.xserver = {
     enable = true;
     autorun = false;
diff --git a/modules/installer/cd-dvd/installation-cd-small.nix b/modules/installer/cd-dvd/installation-cd-minimal.nix
similarity index 76%
rename from modules/installer/cd-dvd/installation-cd-small.nix
rename to modules/installer/cd-dvd/installation-cd-minimal.nix
index 7b0103f9ada..2b3e4bf04b6 100644
--- a/modules/installer/cd-dvd/installation-cd-small.nix
+++ b/modules/installer/cd-dvd/installation-cd-minimal.nix
@@ -6,6 +6,8 @@
 {
   require = [./installation-cd-base.nix];
 
+  installer.configModule = "./nixos/modules/installer/cd-dvd/installation-cd-minimal.nix";
+
   # Don't include X libraries.
   services.sshd.forwardX11 = false;
   fonts.enableFontConfig = false;
-- 
GitLab


From 0f6d7c8862acb570a0679ab289bddf0085fb088d Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 22 Jun 2009 14:10:11 +0000
Subject: [PATCH 1609/5331] * Use insmod from module_init_tools in the initrd,
 since the latest   klibc no longer has it.

svn path=/nixos/branches/modular-nixos/; revision=16019
---
 modules/system/boot/stage-1.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/modules/system/boot/stage-1.nix b/modules/system/boot/stage-1.nix
index c91c4d93333..fd515b4bacc 100644
--- a/modules/system/boot/stage-1.nix
+++ b/modules/system/boot/stage-1.nix
@@ -177,6 +177,9 @@ let
       cp ${pkgs.bash}/bin/bash $out/bin
       ln -s bash $out/bin/sh
 
+      # Copy insmod.
+      cp ${pkgs.module_init_tools}/sbin/insmod $out/bin
+      
       ${config.boot.initrd.extraUtilsCommands}
 
       # Run patchelf to make the programs refer to the copied libraries.
@@ -207,6 +210,7 @@ let
       $out/bin/reiserfsck -V
       $out/bin/mdadm --version
       $out/bin/basename --version
+      $out/bin/insmod --version
     ''; # */
   
 
-- 
GitLab


From 0b39f614e90905ae84ae8ce1a24145c4ece9978b Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 22 Jun 2009 14:44:48 +0000
Subject: [PATCH 1610/5331] * Don't wait for CIFS "devices" (//share/path) to
 appear since they   won't.  This speeds up booting from CIFS a lot.

svn path=/nixos/branches/modular-nixos/; revision=16023
---
 modules/system/boot/stage-1-init.sh | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/modules/system/boot/stage-1-init.sh b/modules/system/boot/stage-1-init.sh
index 7a5ebedd7a8..1ba65cc24cc 100644
--- a/modules/system/boot/stage-1-init.sh
+++ b/modules/system/boot/stage-1-init.sh
@@ -223,15 +223,22 @@ for ((n = 0; n < ${#mountPoints[*]}; n++)); do
     # "device" should be taken relative to /mnt-root, not /.  Assume
     # that every device that starts with / but doesn't start with /dev
     # is a bind mount.
+    pseudoDevice=
     case $device in
         /dev/*)
             ;;
         //*)
             # Don't touch SMB/CIFS paths.
+            pseudoDevice=1
             ;;
         /*)
             device=/mnt-root$device
             ;;
+        *)
+            # Not an absolute path; assume that it's a pseudo-device
+            # like an NFS path (e.g. "server:/path").
+            pseudoDevice=1
+            ;;
     esac
 
     # USB storage devices tend to appear with some delay.  It would be
@@ -239,8 +246,8 @@ for ((n = 0; n < ${#mountPoints[*]}; n++)); do
     # alas...  So just wait for a few seconds for the device to
     # appear.  If it doesn't appear, try to mount it anyway (and
     # probably fail).  This is a fallback for non-device "devices"
-    # that we don't properly recognise (like NFS mounts).
-    if ! test -e $device; then
+    # that we don't properly recognise.
+    if test -z "$pseudoDevice" -a ! -e $device; then
         echo -n "waiting for device $device to appear..."
         for ((try = 0; try < 10; try++)); do
             sleep 1
-- 
GitLab


From 64d8af9677af729a0427f737ca0a9c28cf0f826d Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 22 Jun 2009 14:45:28 +0000
Subject: [PATCH 1611/5331] svn path=/nixos/branches/modular-nixos/;
 revision=16024

---
 modules/virtualisation/qemu-vm.nix | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/modules/virtualisation/qemu-vm.nix b/modules/virtualisation/qemu-vm.nix
index db12c2c9bb4..354294b4060 100644
--- a/modules/virtualisation/qemu-vm.nix
+++ b/modules/virtualisation/qemu-vm.nix
@@ -11,11 +11,13 @@
 
 let
 
+  vmName = config.networking.hostName;
+
   options = {
 
     virtualisation.diskImage =
       pkgs.lib.mkOption {
-        default = "./${config.networking.hostName}.qcow2";
+        default = "./${vmName}.qcow2";
         description =
           ''
             Path to the disk image containing the root filesystem.
@@ -45,8 +47,7 @@ let
           -drive file=$NIX_DISK_IMAGE,if=virtio,boot=on \
           -kernel ${config.system.build.system}/kernel \
           -initrd ${config.system.build.system}/initrd \
-          -redir tcp:8080::80 \
-          -redir tcp:8022::22 \
+          $QEMU_OPTS \
           -append "$(cat ${config.system.build.system}/kernel-params) init=${config.system.build.bootStage2} systemConfig=${config.system.build.system}"
     '';
 
@@ -107,7 +108,7 @@ in
     ''
       ensureDir $out/bin
       ln -s ${config.system.build.system} $out/system
-      ln -s ${pkgs.writeScript "run-nixos-vm" startVM} $out/bin/run-nixos-vm
+      ln -s ${pkgs.writeScript "run-nixos-vm" startVM} $out/bin/run-${vmName}-vm
     '';
 
   # sendfile() is currently broken over CIFS, so fix it here for all
-- 
GitLab


From ccdae5ed875703c1f79b5092b955c6b0bbe081c4 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 22 Jun 2009 16:06:11 +0000
Subject: [PATCH 1612/5331] * Fix building the manual.

svn path=/nixos/branches/modular-nixos/; revision=16025
---
 release.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/release.nix b/release.nix
index 16ba809139b..fdd1875a606 100644
--- a/release.nix
+++ b/release.nix
@@ -39,7 +39,7 @@ let
       }:
 
       import "${nixosSrc}/doc/manual" {
-        inherit nixpkgs;
+        pkgs = import nixpkgs {};
       };
 
 
-- 
GitLab


From 27ad47bdac98ba7bf403e881fcccfc11cfd9fa62 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 22 Jun 2009 16:28:21 +0000
Subject: [PATCH 1613/5331] * Build the ISO from the modular branch.  Don't
 bzip the ISO anymore   since it's already compressed using squashfs.

svn path=/nixos/branches/modular-nixos/; revision=16026
---
 release.nix | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/release.nix b/release.nix
index fdd1875a606..b6a1e5556e3 100644
--- a/release.nix
+++ b/release.nix
@@ -55,12 +55,13 @@ let
 
         version = builtins.readFile ./VERSION + (if officialRelease then "" else "pre${toString nixosSrc.rev}");
 
-        iso = (import "${nixosSrc}/installer/cd-dvd/rescue-cd.nix" {
-          platform = system;
-          compressImage = true;
-          relName = "nixos-${version}";
-          inherit nixpkgs;
-        }).rescueCD;
+        iso = (import lib/eval-config.nix {
+          inherit system nixpkgs;        
+          configuration =
+            { require = ./modules/installer/cd-dvd/installation-cd-minimal.nix;
+              system.nixosVersion = version;
+            };
+        }).config.system.build.isoImage;
 
       in
         # Declare the ISO as a build product so that it shows up in Hydra.
-- 
GitLab


From 74995fe5538fb9a8399d680ba2738dc9417899fa Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 22 Jun 2009 16:38:11 +0000
Subject: [PATCH 1614/5331] * The CD volume label was just over the limit of 32
 characters.

svn path=/nixos/branches/modular-nixos/; revision=16027
---
 modules/installer/cd-dvd/installation-cd-base.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/installer/cd-dvd/installation-cd-base.nix b/modules/installer/cd-dvd/installation-cd-base.nix
index 76ac3b5d3cc..b45a5cdb6e0 100644
--- a/modules/installer/cd-dvd/installation-cd-base.nix
+++ b/modules/installer/cd-dvd/installation-cd-base.nix
@@ -77,7 +77,7 @@ in
   # ISO naming.
   isoImage.isoName = "nixos-${config.system.nixosVersion}-${pkgs.stdenv.system}.iso";
     
-  isoImage.volumeID = "NIXOS_INSTALLATION_CD_${config.system.nixosVersion}";
+  isoImage.volumeID = "NIXOS_INSTALL_CD_${config.system.nixosVersion}";
   
   # Use Linux 2.6.29.
   boot.kernelPackages = pkgs.kernelPackages_2_6_29;
-- 
GitLab


From 2346754f5ecbc12f32ab92bf9042585b5ad142b5 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 22 Jun 2009 20:34:51 +0000
Subject: [PATCH 1615/5331] * Don't add xterm and feh to the system path if the
 X server is   disabled.  Other desktop/display/window manager modules should
 be   conditional on config.services.xserver.enable as well, but at least  
 they're disabled by default due to other options.

svn path=/nixos/branches/modular-nixos/; revision=16031
---
 .../x11/xserver/desktop-managers/default.nix   |  5 +++--
 .../x11/xserver/desktop-managers/xterm.nix     | 18 +++++++++---------
 2 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/modules/services/x11/xserver/desktop-managers/default.nix b/modules/services/x11/xserver/desktop-managers/default.nix
index 9c4f9d92442..3de3fa25792 100644
--- a/modules/services/x11/xserver/desktop-managers/default.nix
+++ b/modules/services/x11/xserver/desktop-managers/default.nix
@@ -4,6 +4,8 @@ let
   inherit (pkgs.lib) mkOption mergeOneOption mkIf filter optionalString any;
   cfg = config.services.xserver.desktopManager;
 
+  # Whether desktop manager `d' is capable of setting a background.
+  # If it isn't, the `feh' program is used as a fallback.
   needBGCond = d: ! (d ? bgSupport && d.bgSupport);
 in
 
@@ -50,7 +52,6 @@ in
         };
 
 
-
         default = mkOption {
           default = "xterm";
           example = "none";
@@ -68,7 +69,7 @@ in
     };
   };
 
-  environment = mkIf cfg.session.needBGPackages {
+  environment = mkIf (config.services.xserver.enable && cfg.session.needBGPackages) {
     extraPackages = [ pkgs.feh ];
   };
 }
diff --git a/modules/services/x11/xserver/desktop-managers/xterm.nix b/modules/services/x11/xserver/desktop-managers/xterm.nix
index 7066c44527c..861d5001478 100644
--- a/modules/services/x11/xserver/desktop-managers/xterm.nix
+++ b/modules/services/x11/xserver/desktop-managers/xterm.nix
@@ -1,23 +1,23 @@
 {pkgs, config, ...}:
 
 let
+
   inherit (pkgs.lib) mkOption mkIf;
   cfg = config.services.xserver.desktopManager.xterm;
 
-  options = { services = { xserver = { desktopManager = {
+  options = {
 
-    xterm = {
-      enable = mkOption {
-        default = true;
-        example = false;
-        description = "Enable a xterm terminal as a desktop manager.";
-      };
+    services.xserver.desktopManager.xterm.enable = mkOption {
+      default = true;
+      example = false;
+      description = "Enable a xterm terminal as a desktop manager.";
     };
 
-  }; }; }; };
+  };
+  
 in
 
-mkIf cfg.enable {
+mkIf (config.services.xserver.enable && cfg.enable) {
   require = options;
 
   services = {
-- 
GitLab


From 1803c67d13761c1ece6a4d115fd54bc26ac8947d Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 24 Jun 2009 09:11:26 +0000
Subject: [PATCH 1616/5331] * Leave out HAL and d-bus (not needed).

svn path=/nixos/branches/modular-nixos/; revision=16032
---
 modules/installer/cd-dvd/installation-cd-minimal.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/modules/installer/cd-dvd/installation-cd-minimal.nix b/modules/installer/cd-dvd/installation-cd-minimal.nix
index 2b3e4bf04b6..ae520e64101 100644
--- a/modules/installer/cd-dvd/installation-cd-minimal.nix
+++ b/modules/installer/cd-dvd/installation-cd-minimal.nix
@@ -10,6 +10,8 @@
 
   # Don't include X libraries.
   services.sshd.forwardX11 = false;
+  services.dbus.enable = false; # depends on libX11
+  services.hal.enable = false; # depends on dbus
   fonts.enableFontConfig = false;
   fonts.enableCoreFonts = false;
 }
-- 
GitLab


From 2c03c134f5e9b83fd715eaabb93d8843628b2b33 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 24 Jun 2009 09:14:28 +0000
Subject: [PATCH 1617/5331] * Build the big CD image in Hydra.

svn path=/nixos/branches/modular-nixos/; revision=16033
---
 release.nix | 78 ++++++++++++++++++++++++++++++-----------------------
 1 file changed, 45 insertions(+), 33 deletions(-)

diff --git a/release.nix b/release.nix
index b6a1e5556e3..49713c26486 100644
--- a/release.nix
+++ b/release.nix
@@ -1,6 +1,40 @@
 { nixpkgs ? ../nixpkgs-wc }:
 
-let 
+let
+
+
+  makeIso =
+    { module, description }:
+    { nixosSrc ? {outPath = ./.; rev = 1234;}
+    , officialRelease ? false
+    , system ? "i686-linux"
+    }:
+
+    with import nixpkgs {inherit system;};
+
+    let
+
+      version = builtins.readFile ./VERSION + (if officialRelease then "" else "pre${toString nixosSrc.rev}");
+
+      iso = (import lib/eval-config.nix {
+        inherit system nixpkgs;        
+        configuration =
+          { require = module;
+            system.nixosVersion = version;
+          };
+      }).config.system.build.isoImage;
+
+    in
+      # Declare the ISO as a build product so that it shows up in Hydra.
+      runCommand "nixos-iso-${version}"
+        { meta = {
+            description = "NixOS installation CD (${description}) - ISO image for ${system}";
+          };
+        }
+        ''
+          ensureDir $out/nix-support
+          echo "file iso" ${iso}/iso/*.iso* >> $out/nix-support/hydra-build-products
+        ''; # */
 
 
   jobs = rec {
@@ -43,38 +77,16 @@ let
       };
 
 
-    iso = 
-      { nixosSrc ? {outPath = ./.; rev = 1234;}
-      , officialRelease ? false
-      , system ? "i686-linux"
-      }:
-
-      with import nixpkgs {inherit system;};
-
-      let
-
-        version = builtins.readFile ./VERSION + (if officialRelease then "" else "pre${toString nixosSrc.rev}");
-
-        iso = (import lib/eval-config.nix {
-          inherit system nixpkgs;        
-          configuration =
-            { require = ./modules/installer/cd-dvd/installation-cd-minimal.nix;
-              system.nixosVersion = version;
-            };
-        }).config.system.build.isoImage;
-
-      in
-        # Declare the ISO as a build product so that it shows up in Hydra.
-        runCommand "nixos-iso-${version}"
-          { meta = {
-              description = "NixOS installation CD ISO image for ${system}";
-            };
-          }
-          ''
-            ensureDir $out/nix-support
-            echo "file iso" ${iso}/iso/*.iso* >> $out/nix-support/hydra-build-products
-          ''; # */
-      
+    iso_minimal = makeIso {
+      module = ./modules/installer/cd-dvd/installation-cd-minimal.nix;
+      description = "minimal";
+    };
+    
+    iso_graphical = makeIso {
+      module = ./modules/installer/cd-dvd/installation-cd-graphical.nix;
+      description = "graphical";
+    };
+    
 
   };
   
-- 
GitLab


From aa075f089e99144b5b7037372f1c5b6057f45584 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 24 Jun 2009 12:16:06 +0000
Subject: [PATCH 1618/5331] * Set the default gateway.

svn path=/nixos/branches/modular-nixos/; revision=16034
---
 modules/virtualisation/qemu-vm.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/modules/virtualisation/qemu-vm.nix b/modules/virtualisation/qemu-vm.nix
index 354294b4060..41c0d662af0 100644
--- a/modules/virtualisation/qemu-vm.nix
+++ b/modules/virtualisation/qemu-vm.nix
@@ -104,6 +104,8 @@ in
   # host filesystem and thus deadlocks the system.
   networking.useDHCP = false;
 
+  networking.defaultGateway = "10.0.2.2";
+
   system.build.vm = pkgs.runCommand "nixos-vm" {}
     ''
       ensureDir $out/bin
-- 
GitLab


From 9704472d1c0edd9b04b294bd975ee3fc35b8c42d Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 24 Jun 2009 13:33:03 +0000
Subject: [PATCH 1619/5331] Some hacks to support clean shutdowns of VMs that
 mount the Nix store ove QEMU (and other NixOS instances that use a remote
 filesystem like NFS):

* Don't take down the network interfaces during shutdown.
* Don't try to unmount the Nix store.  Usually, this doesn't work
  because it's still in use, but on remote filesystems like CIFS the
  `-f' umount flag actually works.

svn path=/nixos/branches/modular-nixos/; revision=16036
---
 modules/system/upstart-events/halt.nix | 7 ++++++-
 modules/tasks/network-interfaces.nix   | 8 ++++----
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/modules/system/upstart-events/halt.nix b/modules/system/upstart-events/halt.nix
index 60727e3686b..82b5ffcae1a 100644
--- a/modules/system/upstart-events/halt.nix
+++ b/modules/system/upstart-events/halt.nix
@@ -69,7 +69,12 @@ let
               for mp in $(getMountPoints); do
                   device=$(getDevice $mp)
                   echo "unmounting $mp..."
-                  if umount -f -n "$mp"; then
+                  # !!! Don't unmount /nix/store or /hostfs.  This is
+                  # a quick hack to cleanly shutdown VMs that mount
+                  # the Nix store via CIFS.  "mount -f" will actually
+                  # work on such filesystems, which makes all commands
+                  # needed below disappear.
+                  if test "$mp" != /nix/store -a "$mp" != /hostfs && umount -f -n "$mp"; then
                       if test "$mp" != /; then tryAgain=1; fi
                   else
                       mount -n -o remount,ro "$mp" || true
diff --git a/modules/tasks/network-interfaces.nix b/modules/tasks/network-interfaces.nix
index 4c57b48bd94..d075d04ed6b 100644
--- a/modules/tasks/network-interfaces.nix
+++ b/modules/tasks/network-interfaces.nix
@@ -159,10 +159,10 @@ in
       respawn sleep 100000
 
       stop script
-          for i in $(cd /sys/class/net && ls -d *); do
-              echo "Taking down network device $i..."
-              ${nettools}/sbin/ifconfig $i down || true
-          done
+          #for i in $(cd /sys/class/net && ls -d *); do
+          #    echo "Taking down network device $i..."
+          #    ${nettools}/sbin/ifconfig $i down || true
+          #done
       end script
     '';
   }];
-- 
GitLab


From b701207ead9892fa4d3ae1b5d3b57da18cd18739 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 24 Jun 2009 22:27:54 +0000
Subject: [PATCH 1620/5331] * Typo.

svn path=/nixos/branches/modular-nixos/; revision=16039
---
 modules/services/web-servers/apache-httpd/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/services/web-servers/apache-httpd/default.nix b/modules/services/web-servers/apache-httpd/default.nix
index 1d5281f25d9..2452b7697fa 100644
--- a/modules/services/web-servers/apache-httpd/default.nix
+++ b/modules/services/web-servers/apache-httpd/default.nix
@@ -211,7 +211,7 @@ let
 
   extraModules = pkgs.lib.attrByPath ["extraModules"] [] mainCfg;
   extraForeignModules = pkgs.lib.filter builtins.isAttrs extraModules;
-  extraApachaModules = pkgs.lib.filter (x :! (builtins.isAttrs x)) extraModules; # I'd prefer using builtins.isString here, but doesn't exist yet
+  extraApacheModules = pkgs.lib.filter (x: !(builtins.isAttrs x)) extraModules; # I'd prefer using builtins.isString here, but doesn't exist yet
 
   makeServerInfo = cfg: {
     # Canonical name must not include a trailing slash.
@@ -304,7 +304,7 @@ let
       "mime" "dav" "status" "autoindex" "asis" "info" "cgi" "dav_fs"
       "vhost_alias" "negotiation" "dir" "imagemap" "actions" "speling"
       "userdir" "alias" "rewrite" "proxy" "proxy_http"
-    ] ++ optional enableSSL "ssl" ++ extraApachaModules;
+    ] ++ optional enableSSL "ssl" ++ extraApacheModules;
     
 
   loggingConf = ''
-- 
GitLab


From 6e802e5d75107070be6021886ec38b79b6ceeb92 Mon Sep 17 00:00:00 2001
From: Nicolas Pierron <nicolas.b.pierron@gmail.com>
Date: Thu, 25 Jun 2009 22:08:03 +0000
Subject: [PATCH 1621/5331] Replace extraPackages by x11Packages for all
 windows/desktop managers. -> No longer install graphical packages if the
 xserver is disabled. -> avoid duplication of "mkIf
 config.services.xserver.enable".

svn path=/nixos/branches/modular-nixos/; revision=16044
---
 modules/services/x11/xserver/default.nix            | 13 ++++++++++++-
 .../x11/xserver/desktop-managers/default.nix        |  7 ++++---
 .../services/x11/xserver/desktop-managers/gnome.nix |  2 +-
 .../xserver/desktop-managers/kde-environment.nix    |  7 ++++---
 .../services/x11/xserver/desktop-managers/kde.nix   |  9 +++++----
 .../services/x11/xserver/desktop-managers/kde4.nix  |  9 +++++----
 .../services/x11/xserver/desktop-managers/xterm.nix |  4 ++--
 .../services/x11/xserver/window-managers/compiz.nix |  2 +-
 .../services/x11/xserver/window-managers/kwm.nix    |  2 +-
 .../x11/xserver/window-managers/metacity.nix        |  2 +-
 .../services/x11/xserver/window-managers/twm.nix    |  2 +-
 .../services/x11/xserver/window-managers/wmii.nix   |  2 +-
 12 files changed, 38 insertions(+), 23 deletions(-)

diff --git a/modules/services/x11/xserver/default.nix b/modules/services/x11/xserver/default.nix
index acaea17649c..3e49420778e 100644
--- a/modules/services/x11/xserver/default.nix
+++ b/modules/services/x11/xserver/default.nix
@@ -277,6 +277,15 @@ let
       };
 
     };
+
+    environment.x11Packages = mkOption {
+      default = [];
+      type = types.list types.packages;
+      description = "
+        List of packages added to the system when the xserver is
+        activated. (<option>services.xserver.enable</option>).
+      ";
+    };
   };
 in
 
@@ -505,7 +514,7 @@ mkIf cfg.enable {
       }
     ];
 
-    extraPackages = [
+    x11Packages = [
       xorg.xrandr
       xorg.xrdb
       xorg.setxkbmap
@@ -514,6 +523,8 @@ mkIf cfg.enable {
     ++ optional (videoDriver == "nvidia") [
       kernelPackages.nvidia_x11
     ];
+
+    extraPackages = config.environment.x11Packages;
   };
 
   services = {
diff --git a/modules/services/x11/xserver/desktop-managers/default.nix b/modules/services/x11/xserver/desktop-managers/default.nix
index 3de3fa25792..c40266f99d7 100644
--- a/modules/services/x11/xserver/desktop-managers/default.nix
+++ b/modules/services/x11/xserver/desktop-managers/default.nix
@@ -2,7 +2,8 @@
 
 let
   inherit (pkgs.lib) mkOption mergeOneOption mkIf filter optionalString any;
-  cfg = config.services.xserver.desktopManager;
+  xcfg = config.services.xserver;
+  cfg = xcfg.desktopManager;
 
   # Whether desktop manager `d' is capable of setting a background.
   # If it isn't, the `feh' program is used as a fallback.
@@ -69,7 +70,7 @@ in
     };
   };
 
-  environment = mkIf (config.services.xserver.enable && cfg.session.needBGPackages) {
-    extraPackages = [ pkgs.feh ];
+  environment = mkIf cfg.session.needBGPackages {
+    x11Packages = [ pkgs.feh ];
   };
 }
diff --git a/modules/services/x11/xserver/desktop-managers/gnome.nix b/modules/services/x11/xserver/desktop-managers/gnome.nix
index d6fa064ef11..3fa82bae2ba 100644
--- a/modules/services/x11/xserver/desktop-managers/gnome.nix
+++ b/modules/services/x11/xserver/desktop-managers/gnome.nix
@@ -38,7 +38,7 @@ mkIf cfg.enable {
   };
 
   environment = {
-    extraPackages = [
+    x11Packages = [
       gnome.gnometerminal
       gnome.GConf
       gnome.gconfeditor
diff --git a/modules/services/x11/xserver/desktop-managers/kde-environment.nix b/modules/services/x11/xserver/desktop-managers/kde-environment.nix
index 5d9ab3ae5a3..3a4b8b22d36 100644
--- a/modules/services/x11/xserver/desktop-managers/kde-environment.nix
+++ b/modules/services/x11/xserver/desktop-managers/kde-environment.nix
@@ -1,7 +1,7 @@
 {pkgs, config, ...}:
 
 let
-  inherit (pkgs.lib) mkOption mkIf;
+  inherit (pkgs.lib) mkOption mkIf types;
   kdePackages = config.environment.kdePackages;
 
   options = {
@@ -25,6 +25,7 @@ let
       kdePackages = mkOption {
         default = [];
         example = [ pkgs.kde42.kdegames ];
+        type = types.list types.packages;
         description = ''
           Additional KDE packages to be used when you use KDE as a desktop
           manager.  By default, you only get the KDE base packages.
@@ -36,11 +37,11 @@ let
   };
 in
 
-mkIf (kdePackages != []) {
+mkIf (kdePackages != [] && config.services.xserver.enable) {
   require = options;
 
   environment = {
-    extraPackages = kdePackages;
+    x11Packages = kdePackages;
 
     shellInit = ''
       export KDEDIRS="${pkgs.lib.concatStringsSep ":" kdePackages}"
diff --git a/modules/services/x11/xserver/desktop-managers/kde.nix b/modules/services/x11/xserver/desktop-managers/kde.nix
index f8fb9f534f5..45c4c464f9a 100644
--- a/modules/services/x11/xserver/desktop-managers/kde.nix
+++ b/modules/services/x11/xserver/desktop-managers/kde.nix
@@ -2,8 +2,9 @@
 
 let
   inherit (pkgs.lib) mkOption mkIf;
-  cfg = config.services.xserver.desktopManager.kde;
-  xorg = config.services.xserver.package;
+  xcfg = config.services.xserver;
+  cfg = xcfg.desktopManager.kde;
+  xorg = xcfg.package;
 
   options = { services = { xserver = { desktopManager = {
 
@@ -18,7 +19,7 @@ let
   }; }; }; };
 in
 
-mkIf cfg.enable {
+mkIf (xcfg.enable && cfg.enable) {
   require = [
     options
 
@@ -63,7 +64,7 @@ mkIf cfg.enable {
       pkgs.kdebase
     ];
 
-    extraPackages = [
+    x11Packages = [
       xorg.xset # used by startkde, non-essential
     ];
 
diff --git a/modules/services/x11/xserver/desktop-managers/kde4.nix b/modules/services/x11/xserver/desktop-managers/kde4.nix
index 78cf90e33e4..f8b66e2840d 100644
--- a/modules/services/x11/xserver/desktop-managers/kde4.nix
+++ b/modules/services/x11/xserver/desktop-managers/kde4.nix
@@ -2,8 +2,9 @@
 
 let
   inherit (pkgs.lib) mkOption mkIf;
-  cfg = config.services.xserver.desktopManager.kde4;
-  xorg = config.services.xserver.package;
+  xcfg = config.services.xserver;
+  cfg = xcfg.desktopManager.kde4;
+  xorg = xcfg.package;
 
   options = { services = { xserver = { desktopManager = {
 
@@ -18,7 +19,7 @@ let
   }; }; }; };
 in
 
-mkIf cfg.enable {
+mkIf (xcfg.enable && cfg.enable) {
   require = [
     options
 
@@ -57,7 +58,7 @@ mkIf cfg.enable {
       pkgs.shared_mime_info
     ];
 
-    extraPackages = [
+    x11Packages = [
       xorg.xmessage # so that startkde can show error messages
       pkgs.qt4 # needed for qdbus
       xorg.xset # used by startkde, non-essential
diff --git a/modules/services/x11/xserver/desktop-managers/xterm.nix b/modules/services/x11/xserver/desktop-managers/xterm.nix
index 861d5001478..8524c0c6544 100644
--- a/modules/services/x11/xserver/desktop-managers/xterm.nix
+++ b/modules/services/x11/xserver/desktop-managers/xterm.nix
@@ -17,7 +17,7 @@ let
   
 in
 
-mkIf (config.services.xserver.enable && cfg.enable) {
+mkIf cfg.enable {
   require = options;
 
   services = {
@@ -37,7 +37,7 @@ mkIf (config.services.xserver.enable && cfg.enable) {
   };
 
   environment = {
-    extraPackages = [
+    x11Packages = [
       pkgs.xterm
     ];
   };
diff --git a/modules/services/x11/xserver/window-managers/compiz.nix b/modules/services/x11/xserver/window-managers/compiz.nix
index e99c3adb5b4..bf159582663 100644
--- a/modules/services/x11/xserver/window-managers/compiz.nix
+++ b/modules/services/x11/xserver/window-managers/compiz.nix
@@ -59,6 +59,6 @@ mkIf cfg.enable {
   };
 
   environment = {
-    extraPackages = [ pkgs.compiz ];
+    x11Packages = [ pkgs.compiz ];
   };
 }
diff --git a/modules/services/x11/xserver/window-managers/kwm.nix b/modules/services/x11/xserver/window-managers/kwm.nix
index db8696c510d..3d946f213a3 100644
--- a/modules/services/x11/xserver/window-managers/kwm.nix
+++ b/modules/services/x11/xserver/window-managers/kwm.nix
@@ -38,7 +38,7 @@ mkIf cfg.enable {
   };
 
   environment = {
-    extraPackages = [
+    x11Packages = [
       pkgs.kdelibs
       pkgs.kdebase
     ];
diff --git a/modules/services/x11/xserver/window-managers/metacity.nix b/modules/services/x11/xserver/window-managers/metacity.nix
index dc1ff911d65..ea1dd5a3bde 100644
--- a/modules/services/x11/xserver/window-managers/metacity.nix
+++ b/modules/services/x11/xserver/window-managers/metacity.nix
@@ -44,6 +44,6 @@ mkIf cfg.enable {
   };
 
   environment = {
-    extraPackages = [ gnome.metacity ];
+    x11Packages = [ gnome.metacity ];
   };
 }
diff --git a/modules/services/x11/xserver/window-managers/twm.nix b/modules/services/x11/xserver/window-managers/twm.nix
index f26be48776c..9dc3bea8093 100644
--- a/modules/services/x11/xserver/window-managers/twm.nix
+++ b/modules/services/x11/xserver/window-managers/twm.nix
@@ -39,6 +39,6 @@ mkIf cfg.enable {
   };
 
   environment = {
-    extraPackages = [ xorg.twm ];
+    x11Packages = [ xorg.twm ];
   };
 }
diff --git a/modules/services/x11/xserver/window-managers/wmii.nix b/modules/services/x11/xserver/window-managers/wmii.nix
index 191e31af1de..d1ff72092f1 100644
--- a/modules/services/x11/xserver/window-managers/wmii.nix
+++ b/modules/services/x11/xserver/window-managers/wmii.nix
@@ -47,7 +47,7 @@ mkIf cfg.enable {
   };
 
   environment = {
-    extraPackages = [
+    x11Packages = [
       pkgs.wmiiSnap
     ];
   };
-- 
GitLab


From 0bd210bb78dcb6a666c8b00951baf3eb20740da4 Mon Sep 17 00:00:00 2001
From: Nicolas Pierron <nicolas.b.pierron@gmail.com>
Date: Thu, 25 Jun 2009 22:49:05 +0000
Subject: [PATCH 1622/5331] Fix typos in type names. (types.packages ->
 types.package)

svn path=/nixos/branches/modular-nixos/; revision=16045
---
 modules/services/x11/xserver/default.nix                        | 2 +-
 .../services/x11/xserver/desktop-managers/kde-environment.nix   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/services/x11/xserver/default.nix b/modules/services/x11/xserver/default.nix
index 3e49420778e..d32309aa4fa 100644
--- a/modules/services/x11/xserver/default.nix
+++ b/modules/services/x11/xserver/default.nix
@@ -280,7 +280,7 @@ let
 
     environment.x11Packages = mkOption {
       default = [];
-      type = types.list types.packages;
+      type = types.list types.package;
       description = "
         List of packages added to the system when the xserver is
         activated. (<option>services.xserver.enable</option>).
diff --git a/modules/services/x11/xserver/desktop-managers/kde-environment.nix b/modules/services/x11/xserver/desktop-managers/kde-environment.nix
index 3a4b8b22d36..51489a1d16b 100644
--- a/modules/services/x11/xserver/desktop-managers/kde-environment.nix
+++ b/modules/services/x11/xserver/desktop-managers/kde-environment.nix
@@ -25,7 +25,7 @@ let
       kdePackages = mkOption {
         default = [];
         example = [ pkgs.kde42.kdegames ];
-        type = types.list types.packages;
+        type = types.list types.package;
         description = ''
           Additional KDE packages to be used when you use KDE as a desktop
           manager.  By default, you only get the KDE base packages.
-- 
GitLab


From f61a3ebd2c14a6516b69bafa42678f9f0f18c26a Mon Sep 17 00:00:00 2001
From: Nicolas Pierron <nicolas.b.pierron@gmail.com>
Date: Thu, 25 Jun 2009 23:29:49 +0000
Subject: [PATCH 1623/5331] Generate hal configuration file form the xserver
 settings.

svn path=/nixos/branches/modular-nixos/; revision=16046
---
 modules/services/x11/xserver/default.nix | 30 +++++++++++++++++++++++-
 1 file changed, 29 insertions(+), 1 deletion(-)

diff --git a/modules/services/x11/xserver/default.nix b/modules/services/x11/xserver/default.nix
index d32309aa4fa..ccbec555ce6 100644
--- a/modules/services/x11/xserver/default.nix
+++ b/modules/services/x11/xserver/default.nix
@@ -336,7 +336,31 @@ let
     [ pkgs.xorg.fontadobe100dpi
       pkgs.xorg.fontadobe75dpi
     ];
-    
+
+
+  halConfigFiles = [
+    (pkgs.writeTextFile {
+      name = "hal-policy-keymap";
+      destination = "/policy/30-keymap.fdi";
+      text = ''
+        <?xml version="1.0" encoding="ISO-8859-1"?>
+        <deviceinfo version="0.2">
+          <device>
+            <match key="info.capabilities" contains="input.keymap">
+              <append key="info.callouts.add" type="strlist">hal-setup-keymap</append>
+            </match>
+
+            <match key="info.capabilities" contains="input.keys">
+              <merge key="input.x11_options.XkbRules" type="string">base</merge>
+              <merge key="input.x11_options.XkbModel" type="string">${cfg.xkbModel}</merge>
+              <merge key="input.x11_options.XkbLayout" type="string">${cfg.layout}</merge>
+              <append key="input.x11_options.XkbOptions" type="strlist">${cfg.xkbOptions}</append>
+            </match>
+          </device>
+        </deviceinfo>
+      '';
+    })
+  ];
 
   configFile = stdenv.mkDerivation {
     name = "xserver.conf";
@@ -543,6 +567,10 @@ mkIf cfg.enable {
       };
     };
 
+    hal = {
+      extraFdi = halConfigFiles;
+    };
+
     extraJobs = [{
       name = "xserver";
       job = ''
-- 
GitLab


From 5f59ac0447ddefde983e722ad84e152d9bd7bad6 Mon Sep 17 00:00:00 2001
From: Nicolas Pierron <nicolas.b.pierron@gmail.com>
Date: Fri, 26 Jun 2009 12:14:02 +0000
Subject: [PATCH 1624/5331] Fix a bad use of pkgs.lib.optional. (detect with
 bad type error on x11Packages)

svn path=/nixos/branches/modular-nixos/; revision=16053
---
 modules/services/x11/xserver/default.nix | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/modules/services/x11/xserver/default.nix b/modules/services/x11/xserver/default.nix
index ccbec555ce6..225799c1a52 100644
--- a/modules/services/x11/xserver/default.nix
+++ b/modules/services/x11/xserver/default.nix
@@ -322,7 +322,7 @@ let
       xorg.xf86inputevdev
     ] 
     ++ attrByPath ["modules"] [] videoDriverModules
-    ++ (optional cfg.synaptics.enable ["${xorg.xf86inputsynaptics}"]);
+    ++ optional cfg.synaptics.enable xorg.xf86inputsynaptics;
 
 
   fontsForXServer =
@@ -544,9 +544,7 @@ mkIf cfg.enable {
       xorg.setxkbmap
       xorg.iceauth # required for KDE applications (it's called by dcopserver)
     ]
-    ++ optional (videoDriver == "nvidia") [
-      kernelPackages.nvidia_x11
-    ];
+    ++ optional (videoDriver == "nvidia") kernelPackages.nvidia_x11;
 
     extraPackages = config.environment.x11Packages;
   };
-- 
GitLab


From dbac3922662ebbeb2a3964b49f25cb762a2332d3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Fri, 26 Jun 2009 21:24:18 +0000
Subject: [PATCH 1625/5331] Fix typo in `config/nsswitch.nix'.

svn path=/nixos/branches/modular-nixos/; revision=16063
---
 modules/config/nsswitch.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/config/nsswitch.nix b/modules/config/nsswitch.nix
index cac6ff382a4..83e3bf3a0cc 100644
--- a/modules/config/nsswitch.nix
+++ b/modules/config/nsswitch.nix
@@ -58,5 +58,5 @@ in
   # chroot gets to seem them, and (ii) applications can benefit from
   # changes in the list of NSS modules at run-time, without requiring
   # a reboot.
-  environment.systemPackages = [config.system.nssModules.list];
+  environment.systemPackages = [config.system.nssModules];
 }
-- 
GitLab


From d68e17790915692f988242f36c6adf1ed0574f97 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Fri, 26 Jun 2009 21:39:31 +0000
Subject: [PATCH 1626/5331] Oops.

svn path=/nixos/branches/modular-nixos/; revision=16064
---
 modules/config/nsswitch.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/config/nsswitch.nix b/modules/config/nsswitch.nix
index 83e3bf3a0cc..cac6ff382a4 100644
--- a/modules/config/nsswitch.nix
+++ b/modules/config/nsswitch.nix
@@ -58,5 +58,5 @@ in
   # chroot gets to seem them, and (ii) applications can benefit from
   # changes in the list of NSS modules at run-time, without requiring
   # a reboot.
-  environment.systemPackages = [config.system.nssModules];
+  environment.systemPackages = [config.system.nssModules.list];
 }
-- 
GitLab


From 05183ccb78ea2cd53e3ee2f6ebaa79d7c9f8d4ad Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Fri, 26 Jun 2009 21:40:29 +0000
Subject: [PATCH 1627/5331] Use the right iwl4965 firmware depending on the
 kernel version.

svn path=/nixos/branches/modular-nixos/; revision=16065
---
 hardware/network/intel-4965agn.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/hardware/network/intel-4965agn.nix b/hardware/network/intel-4965agn.nix
index e31d8902798..c0eb413e2d2 100644
--- a/hardware/network/intel-4965agn.nix
+++ b/hardware/network/intel-4965agn.nix
@@ -15,7 +15,7 @@ in
 
   services = {
     udev = {
-      addFirmware = [ pkgs.iwlwifi4965ucode ];
+      addFirmware = [ kernelPackages.iwlwifi4965ucode ];
     };
   };
 }
-- 
GitLab


From 6566bc4882b7c1d7e060b57bb3d2c1112cdc3026 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Tue, 30 Jun 2009 07:56:08 +0000
Subject: [PATCH 1628/5331] gpsd: Fix UID/GID declaration.

svn path=/nixos/branches/modular-nixos/; revision=16089
---
 modules/services/misc/gpsd.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/services/misc/gpsd.nix b/modules/services/misc/gpsd.nix
index 6fa131fae90..724abbea6cb 100644
--- a/modules/services/misc/gpsd.nix
+++ b/modules/services/misc/gpsd.nix
@@ -4,8 +4,8 @@
 let
   inherit (pkgs.lib) mkOption mkIf;
 
-  uid = (import ../system/ids.nix).uids.gpsd;
-  gid = (import ../system/ids.nix).gids.gpsd;
+  uid = config.ids.uids.gpsd;
+  gid = config.ids.gids.gpsd;
 
   options = {
     services = {
-- 
GitLab


From e2e373b89c46ed168ce42cb5471680d4cfabfddb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Tue, 30 Jun 2009 08:01:14 +0000
Subject: [PATCH 1629/5331] bitlbee: Fix `systemPackages' attribute.

svn path=/nixos/branches/modular-nixos/; revision=16090
---
 modules/services/networking/bitlbee.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/services/networking/bitlbee.nix b/modules/services/networking/bitlbee.nix
index e1ab633349c..7d5952b0fe5 100644
--- a/modules/services/networking/bitlbee.nix
+++ b/modules/services/networking/bitlbee.nix
@@ -86,5 +86,5 @@ mkIf config.services.bitlbee.enable {
     '';
   }];
 
-  environment.systemPackages = pkgs.bitlbee;  
+  environment.systemPackages = [ pkgs.bitlbee ];
 }
-- 
GitLab


From 74738de1f8ece870cd19c422fe2e4208c1033e2d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Wed, 1 Jul 2009 12:27:35 +0000
Subject: [PATCH 1630/5331] Make NSS modules visible to `avahi-daemon'.

It allows it to know whether `libnss-mdns' is available, which clients
can ask via the `IsNSSSupportAvailable' D-Bus method.

svn path=/nixos/branches/modular-nixos/; revision=16125
---
 modules/services/networking/avahi-daemon.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/modules/services/networking/avahi-daemon.nix b/modules/services/networking/avahi-daemon.nix
index bfef7c508cf..2a10d8f28d1 100644
--- a/modules/services/networking/avahi-daemon.nix
+++ b/modules/services/networking/avahi-daemon.nix
@@ -112,6 +112,11 @@ let
       respawn
       script
         export PATH="${avahi}/bin:${avahi}/sbin:$PATH"
+
+        # Make NSS modules visible so that `avahi_nss_support ()' can
+        # return a sensible value.
+        export LD_LIBRARY_PATH="${config.system.nssModules.path}"
+
         exec ${avahi}/sbin/avahi-daemon --daemonize -f "${avahiDaemonConf}"
       end script
     '';
-- 
GitLab


From 1f9d8f45eaba3fe2fda4812ce98eab0470399375 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Thu, 2 Jul 2009 14:05:01 +0000
Subject: [PATCH 1631/5331] lshd: Fix typo; comment on the seed generation.

svn path=/nixos/branches/modular-nixos/; revision=16142
---
 modules/services/networking/ssh/lshd.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/modules/services/networking/ssh/lshd.nix b/modules/services/networking/ssh/lshd.nix
index 9db99bce493..c6b529e66ee 100644
--- a/modules/services/networking/ssh/lshd.nix
+++ b/modules/services/networking/ssh/lshd.nix
@@ -137,7 +137,10 @@ mkIf config.services.lshd.enable {
             test -d /var/spool/lsh || mkdir -m 0755 -p /var/spool/lsh
 
             if ! test -f /var/spool/lsh/yarrow-seed-file
-            the
+            then
+                # XXX: It would be nice to provide feedback to the
+                # user when this fails, so that they can retry it
+                # manually.
                 ${lsh}/bin/lsh-make-seed -o /var/spool/lsh/yarrow-seed-file
             fi
 
-- 
GitLab


From 26fcc601a65805085742e9417559e3343cea1661 Mon Sep 17 00:00:00 2001
From: Nicolas Pierron <nicolas.b.pierron@gmail.com>
Date: Mon, 6 Jul 2009 16:20:58 +0000
Subject: [PATCH 1632/5331] Update function arguments to follow nixpkgs
 modification.

svn path=/nixos/branches/modular-nixos/; revision=16193
---
 lib/eval-config.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/eval-config.nix b/lib/eval-config.nix
index 51cae554097..991f86b2664 100644
--- a/lib/eval-config.nix
+++ b/lib/eval-config.nix
@@ -28,12 +28,12 @@ rec {
   config_ =
     pkgs.lib.fixOptionSets
       pkgs.lib.mergeOptionSets
-      pkgs configComponents;
+      { inherit pkgs; } configComponents;
 
   optionDeclarations =
     pkgs.lib.fixOptionSetsFun
       pkgs.lib.filterOptionSets
-      pkgs configComponents
+      { inherit pkgs; } configComponents
       config_;
       
   # Optionally check wether all config values have corresponding
-- 
GitLab


From 36bc4971bab35ba9724674a5e9b248e82a8e5414 Mon Sep 17 00:00:00 2001
From: Nicolas Pierron <nicolas.b.pierron@gmail.com>
Date: Mon, 6 Jul 2009 16:21:03 +0000
Subject: [PATCH 1633/5331] Inline the require attribute and move the set into
 lib/check-config.nix.

svn path=/nixos/branches/modular-nixos/; revision=16194
---
 lib/check-config.nix | 11 +++++++++++
 lib/eval-config.nix  | 13 ++-----------
 2 files changed, 13 insertions(+), 11 deletions(-)
 create mode 100644 lib/check-config.nix

diff --git a/lib/check-config.nix b/lib/check-config.nix
new file mode 100644
index 00000000000..e2cd2c06d6a
--- /dev/null
+++ b/lib/check-config.nix
@@ -0,0 +1,11 @@
+{pkgs, ...}:
+
+{
+  environment.checkConfigurationOptions = pkgs.lib.mkOption {
+    default = true;
+    example = false;
+    description = ''
+      Whether to check the validity of the entire configuration.
+    '';
+  };
+}
\ No newline at end of file
diff --git a/lib/eval-config.nix b/lib/eval-config.nix
index 991f86b2664..84c60bd6921 100644
--- a/lib/eval-config.nix
+++ b/lib/eval-config.nix
@@ -13,17 +13,8 @@ rec {
 
   configComponents = [
     configuration
-    {
-      require = import ../modules/module-list.nix;
-      environment.checkConfigurationOptions = pkgs.lib.mkOption {
-        default = true;
-        example = false;
-        description = ''
-          Whether to check the validity of the entire configuration.
-        '';
-      };
-    }
-  ];
+    ./check-config.nix
+  ] ++ (import ../modules/module-list.nix);
 
   config_ =
     pkgs.lib.fixOptionSets
-- 
GitLab


From 284f0e7d26bdada9a053c19dfd27fe407ec01a53 Mon Sep 17 00:00:00 2001
From: Nicolas Pierron <nicolas.b.pierron@gmail.com>
Date: Mon, 6 Jul 2009 23:25:12 +0000
Subject: [PATCH 1634/5331] Use "definitionsOf" & "fixableDeclarationsOf": Hide
 implementation details.

svn path=/nixos/branches/modular-nixos/; revision=16199
---
 lib/eval-config.nix | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/lib/eval-config.nix b/lib/eval-config.nix
index 84c60bd6921..d5947e8d870 100644
--- a/lib/eval-config.nix
+++ b/lib/eval-config.nix
@@ -17,16 +17,17 @@ rec {
   ] ++ (import ../modules/module-list.nix);
 
   config_ =
-    pkgs.lib.fixOptionSets
-      pkgs.lib.mergeOptionSets
-      { inherit pkgs; } configComponents;
+    pkgs.lib.definitionsOf configComponents {
+      inherit pkgs;
+    };
 
+  # "fixableDeclarationsOf" is used instead of "declarationsOf" because some
+  # option default values may depends on the definition of other options.
   optionDeclarations =
-    pkgs.lib.fixOptionSetsFun
-      pkgs.lib.filterOptionSets
-      { inherit pkgs; } configComponents
-      config_;
-      
+    pkgs.lib.fixableDeclarationsOf configComponents {
+      inherit pkgs;
+    } config_;
+
   # Optionally check wether all config values have corresponding
   # option declarations.
   config = pkgs.checker config_
-- 
GitLab


From 1118c4b6d125a45a726b36b50d3699a7c4e063a2 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Wed, 8 Jul 2009 09:09:57 +0000
Subject: [PATCH 1635/5331] Fix service tree paths

svn path=/nixos/branches/modular-nixos/; revision=16235
---
 modules/services/networking/gw6c.nix        | 2 +-
 modules/services/networking/ircd-hybrid.nix | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/services/networking/gw6c.nix b/modules/services/networking/gw6c.nix
index eb40953f0be..2fbd266b700 100644
--- a/modules/services/networking/gw6c.nix
+++ b/modules/services/networking/gw6c.nix
@@ -100,7 +100,7 @@ in
 let
         cfg = config.services.gw6c;
         procps = pkgs.procps;
-        gw6cService = import ../../services/gw6c {
+        gw6cService = import ../../../../services/gw6c {
                 inherit (pkgs) stdenv gw6c coreutils 
                 procps upstart iputils gnused 
                 gnugrep seccure writeScript;
diff --git a/modules/services/networking/ircd-hybrid.nix b/modules/services/networking/ircd-hybrid.nix
index b78c65e96b9..5b098ef6904 100644
--- a/modules/services/networking/ircd-hybrid.nix
+++ b/modules/services/networking/ircd-hybrid.nix
@@ -84,7 +84,7 @@ in
 
 let
   cfg = config.services.ircdHybrid;
-  ircdService = import ../../services/ircd-hybrid {
+  ircdService = import ../../../../services/ircd-hybrid {
     stdenv = pkgs.stdenv;
     inherit (pkgs) ircdHybrid coreutils 
             su iproute gnugrep procps;
-- 
GitLab


From 9a66d59786592d26f94ef9da000bbf507dd5aac6 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Wed, 8 Jul 2009 09:10:26 +0000
Subject: [PATCH 1636/5331] Fixing wrong assertion sign

svn path=/nixos/branches/modular-nixos/; revision=16236
---
 modules/services/x11/xfs.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/services/x11/xfs.nix b/modules/services/x11/xfs.nix
index 9cc5c25ec0f..07f5bac7a9a 100644
--- a/modules/services/x11/xfs.nix
+++ b/modules/services/x11/xfs.nix
@@ -30,7 +30,7 @@ in
 
 mkIf config.services.xfs.enable {
 
-  assertions = [ { assertion = ! config.fonts.enableFontDir; message = "Please enable fontDir (fonts.enableFontDir) to use xfs."; } ];
+  assertions = [ { assertion = config.fonts.enableFontDir; message = "Please enable fontDir (fonts.enableFontDir) to use xfs."; } ];
 
   require = [
     options
-- 
GitLab


From 35011ade4e9a68428878033b69adee441ca01b9e Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Wed, 8 Jul 2009 09:10:48 +0000
Subject: [PATCH 1637/5331] Adding back passthru functionality

svn path=/nixos/branches/modular-nixos/; revision=16237
---
 modules/misc/passthru.nix | 21 +++++++++++++++++++++
 modules/module-list.nix   |  1 +
 2 files changed, 22 insertions(+)
 create mode 100644 modules/misc/passthru.nix

diff --git a/modules/misc/passthru.nix b/modules/misc/passthru.nix
new file mode 100644
index 00000000000..5aacf507afb
--- /dev/null
+++ b/modules/misc/passthru.nix
@@ -0,0 +1,21 @@
+# This module allows you to export something from configuration
+# Use case: export kernel source expression for ease of configuring 
+
+{config, pkgs, ...}:
+
+let 
+
+options = {
+  passthru = pkgs.lib.mkOption {
+    description = ''
+      This attribute set will be exported as a system attribute.
+      You can put whatever you want here.
+    '';
+  };
+};
+
+in 
+
+{
+  require = options;
+}
diff --git a/modules/module-list.nix b/modules/module-list.nix
index 88dcdcf13c6..c806495c833 100644
--- a/modules/module-list.nix
+++ b/modules/module-list.nix
@@ -16,6 +16,7 @@
   ./misc/assertions.nix
   ./misc/ids.nix
   ./misc/locate.nix
+  ./misc/passthru.nix
   ./programs/bash/bash.nix
   ./programs/info.nix
   ./programs/pwdutils/pwdutils.nix
-- 
GitLab


From a62e1cf2dd50d2b7cf08bd42abaf8f3df236e382 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Wed, 8 Jul 2009 14:52:58 +0000
Subject: [PATCH 1638/5331] Disable proprietary fonts by default.

svn path=/nixos/branches/modular-nixos/; revision=16253
---
 modules/config/fonts.nix | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/modules/config/fonts.nix b/modules/config/fonts.nix
index 47e505b3cb5..51ddc9e5d43 100644
--- a/modules/config/fonts.nix
+++ b/modules/config/fonts.nix
@@ -72,16 +72,19 @@ let
 
       extraFonts = mkOption {
         default = [];
-        description = "
+        description = ''
           List of additional fonts.
-        ";
+        '';
       };
 
       enableCoreFonts = mkOption {
-        default = true;
-        description = "
-          Whether to include MS Core Fonts (redistributable, but only verbatim).
-        ";
+        default = false;
+        description = ''
+          Whether to include Microsoft's proprietary Core Fonts.  These fonts
+          are redistributable, but only verbatim, among other restrictions.
+          See <link xlink:href="http://corefonts.sourceforge.net/eula.htm"/>
+          for details.
+       '';
       };
 
     };
-- 
GitLab


From fa9f557b964f091001c173ce4e9c1f285b47ca2a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Wed, 8 Jul 2009 16:10:09 +0000
Subject: [PATCH 1639/5331] Add `localhost' under its "real" host name to
 /etc/hosts.

svn path=/nixos/branches/modular-nixos/; revision=16258
---
 modules/config/networking.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/modules/config/networking.nix b/modules/config/networking.nix
index ff4d0f3fee4..65f22445b06 100644
--- a/modules/config/networking.nix
+++ b/modules/config/networking.nix
@@ -41,6 +41,9 @@ in
         source = pkgs.writeText "hosts"
           ''
             ${config.networking.extraHosts}
+            ${if config.networking.hostName != ""
+              then "127.0.0.1 ${config.networking.hostName}"
+              else ""}
             127.0.0.1 localhost
           '';
         target = "hosts";
-- 
GitLab


From c42e6da111323c609754b7ff961fa1a457a1605d Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 9 Jul 2009 11:57:20 +0000
Subject: [PATCH 1640/5331] svn path=/nixos/branches/modular-nixos/;
 revision=16271

---
 release.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/release.nix b/release.nix
index 49713c26486..ca0a101d796 100644
--- a/release.nix
+++ b/release.nix
@@ -29,6 +29,7 @@ let
       runCommand "nixos-iso-${version}"
         { meta = {
             description = "NixOS installation CD (${description}) - ISO image for ${system}";
+            maintainers = [lib.maintainers.eelco];
           };
         }
         ''
-- 
GitLab


From 6d2cc812c21e71e9e1b03a39d3e418cd30f1a599 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Thu, 9 Jul 2009 12:10:58 +0000
Subject: [PATCH 1641/5331] Make the Liberation Fonts available by default.

svn path=/nixos/branches/modular-nixos/; revision=16274
---
 modules/config/fonts.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/modules/config/fonts.nix b/modules/config/fonts.nix
index 51ddc9e5d43..3076f0cbebc 100644
--- a/modules/config/fonts.nix
+++ b/modules/config/fonts.nix
@@ -61,6 +61,7 @@ let
           pkgs.xorg.fontbhlucidatypewriter75dpi
           pkgs.ttf_bitstream_vera
           pkgs.freefont_ttf
+          pkgs.liberation_ttf
           pkgs.xorg.fontbh100dpi
           pkgs.xorg.fontmiscmisc
           pkgs.xorg.fontcursormisc
-- 
GitLab


From d4a37c2f1bcec8e22437ebe77696889daae3e1e0 Mon Sep 17 00:00:00 2001
From: Marc Weber <marco-oweber@gmx.de>
Date: Thu, 9 Jul 2009 14:35:03 +0000
Subject: [PATCH 1642/5331] fix copy paste error

svn path=/nixos/branches/modular-nixos/; revision=16278
---
 modules/services/misc/synergy.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/services/misc/synergy.nix b/modules/services/misc/synergy.nix
index 04b581002c2..3a1ce34d070 100644
--- a/modules/services/misc/synergy.nix
+++ b/modules/services/misc/synergy.nix
@@ -92,7 +92,7 @@ let
 in
 
 
-mkIf config.services.sshd.enable {
+{
   require = [
     options
   ];
-- 
GitLab


From c331fd106baa719d796cde5d13cb3954bc89a9ad Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Sat, 11 Jul 2009 10:33:42 +0000
Subject: [PATCH 1643/5331] Updated the xserver video drivers list, removing
 the old via, and putting the new openchrome.

svn path=/nixos/branches/modular-nixos/; revision=16330
---
 modules/services/x11/xserver/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/services/x11/xserver/default.nix b/modules/services/x11/xserver/default.nix
index 225799c1a52..dea239f6aea 100644
--- a/modules/services/x11/xserver/default.nix
+++ b/modules/services/x11/xserver/default.nix
@@ -305,7 +305,7 @@ let
     intel =  { modules = [xorg.xf86videointel]; };
     nv =     { modules = [xorg.xf86videonv]; };
     ati =    { modules = [xorg.xf86videoati]; };
-    via =    { modules = [xorg.xf86videovia]; };
+    openchrome = { modules = [xorg.xf86videoopenchrome]; };
     cirrus = { modules = [xorg.xf86videocirrus]; };
   };
 
-- 
GitLab


From b84bab78739826961739f8883e7425d6a49e736e Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 14 Jul 2009 12:07:17 +0000
Subject: [PATCH 1644/5331] * Use the relatime mount option by default.  (This
 is the default   anyway in Linux 2.6.30.)

svn path=/nixos/branches/modular-nixos/; revision=16348
---
 modules/tasks/filesystems.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/tasks/filesystems.nix b/modules/tasks/filesystems.nix
index b5262ec6107..86ddd79b186 100644
--- a/modules/tasks/filesystems.nix
+++ b/modules/tasks/filesystems.nix
@@ -80,7 +80,7 @@ let
         };
 
         options = mkOption {
-          default = "defaults";
+          default = "defaults,relatime";
           example = "data=journal";
           type = types.string;
           merge = pkgs.lib.concatStringsSep ",";
-- 
GitLab


From b56d08fc838fb1ebace5b7f12dc5a7b999e2fe60 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 14 Jul 2009 12:36:02 +0000
Subject: [PATCH 1645/5331] * Move the hardware modules back to the main
 modules tree.  No need   for a separate tree.

* Pass the path of the modules tree to modules so that you don't have
  to write absolute paths, e.g. you can say

    require = [ "${modulesPath}/hardware/network/intel-3945abg.nix" ];

  instead of

    require = [ /etc/nixos/nixos/hardware/network/intel-3945abg.nix ];

  The latter is bad because it makes it hard to build from a different
  NixOS source tree.

svn path=/nixos/branches/modular-nixos/; revision=16350
---
 lib/eval-config.nix | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/lib/eval-config.nix b/lib/eval-config.nix
index d5947e8d870..4a1853a8d32 100644
--- a/lib/eval-config.nix
+++ b/lib/eval-config.nix
@@ -16,17 +16,18 @@ rec {
     ./check-config.nix
   ] ++ (import ../modules/module-list.nix);
 
+  extraArgs = {
+    inherit pkgs;
+    modulesPath = ../modules;
+  };
+
   config_ =
-    pkgs.lib.definitionsOf configComponents {
-      inherit pkgs;
-    };
+    pkgs.lib.definitionsOf configComponents extraArgs;
 
   # "fixableDeclarationsOf" is used instead of "declarationsOf" because some
   # option default values may depends on the definition of other options.
   optionDeclarations =
-    pkgs.lib.fixableDeclarationsOf configComponents {
-      inherit pkgs;
-    } config_;
+    pkgs.lib.fixableDeclarationsOf configComponents extraArgs config_;
 
   # Optionally check wether all config values have corresponding
   # option declarations.
-- 
GitLab


From ab1676b4575fdd20f6709392cce940a1282b61e9 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 14 Jul 2009 13:28:50 +0000
Subject: [PATCH 1646/5331] * Urgh, this should have been in commit r16350.

svn path=/nixos/branches/modular-nixos/; revision=16353
---
 {hardware => modules/hardware}/network/intel-2200bg.nix           | 0
 {hardware => modules/hardware}/network/intel-3945abg.nix          | 0
 {hardware => modules/hardware}/network/intel-4965agn.nix          | 0
 {hardware => modules/hardware}/network/smc-2632w/default.nix      | 0
 .../hardware}/network/smc-2632w/firmware/cis/SMC2632W-v1.02.cis   | 0
 {hardware => modules/hardware}/network/zydas-zd1211.nix           | 0
 {hardware => modules/hardware}/video/encoder/wis-go7007.nix       | 0
 7 files changed, 0 insertions(+), 0 deletions(-)
 rename {hardware => modules/hardware}/network/intel-2200bg.nix (100%)
 rename {hardware => modules/hardware}/network/intel-3945abg.nix (100%)
 rename {hardware => modules/hardware}/network/intel-4965agn.nix (100%)
 rename {hardware => modules/hardware}/network/smc-2632w/default.nix (100%)
 rename {hardware => modules/hardware}/network/smc-2632w/firmware/cis/SMC2632W-v1.02.cis (100%)
 rename {hardware => modules/hardware}/network/zydas-zd1211.nix (100%)
 rename {hardware => modules/hardware}/video/encoder/wis-go7007.nix (100%)

diff --git a/hardware/network/intel-2200bg.nix b/modules/hardware/network/intel-2200bg.nix
similarity index 100%
rename from hardware/network/intel-2200bg.nix
rename to modules/hardware/network/intel-2200bg.nix
diff --git a/hardware/network/intel-3945abg.nix b/modules/hardware/network/intel-3945abg.nix
similarity index 100%
rename from hardware/network/intel-3945abg.nix
rename to modules/hardware/network/intel-3945abg.nix
diff --git a/hardware/network/intel-4965agn.nix b/modules/hardware/network/intel-4965agn.nix
similarity index 100%
rename from hardware/network/intel-4965agn.nix
rename to modules/hardware/network/intel-4965agn.nix
diff --git a/hardware/network/smc-2632w/default.nix b/modules/hardware/network/smc-2632w/default.nix
similarity index 100%
rename from hardware/network/smc-2632w/default.nix
rename to modules/hardware/network/smc-2632w/default.nix
diff --git a/hardware/network/smc-2632w/firmware/cis/SMC2632W-v1.02.cis b/modules/hardware/network/smc-2632w/firmware/cis/SMC2632W-v1.02.cis
similarity index 100%
rename from hardware/network/smc-2632w/firmware/cis/SMC2632W-v1.02.cis
rename to modules/hardware/network/smc-2632w/firmware/cis/SMC2632W-v1.02.cis
diff --git a/hardware/network/zydas-zd1211.nix b/modules/hardware/network/zydas-zd1211.nix
similarity index 100%
rename from hardware/network/zydas-zd1211.nix
rename to modules/hardware/network/zydas-zd1211.nix
diff --git a/hardware/video/encoder/wis-go7007.nix b/modules/hardware/video/encoder/wis-go7007.nix
similarity index 100%
rename from hardware/video/encoder/wis-go7007.nix
rename to modules/hardware/video/encoder/wis-go7007.nix
-- 
GitLab


From a27f3942ef2fbee94a5aea81ac3e44ff448f980d Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 14 Jul 2009 13:31:32 +0000
Subject: [PATCH 1647/5331] * Callouts require the docbook_xsl images.

svn path=/nixos/branches/modular-nixos/; revision=16354
---
 doc/manual/default.nix     | 2 ++
 doc/manual/development.xml | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/doc/manual/default.nix b/doc/manual/default.nix
index 02bce7f8e1c..816e333866b 100644
--- a/doc/manual/default.nix
+++ b/doc/manual/default.nix
@@ -39,7 +39,9 @@ let
         --output $out/manual.html \
         ${pkgs.docbook5_xsl}/xml/xsl/docbook/xhtml/docbook.xsl \
         ./manual.xml
+      ln -s ${pkgs.docbook5_xsl}/xml/xsl/docbook/images $out/
       cp ${./style.css} $out/style.css
+      
       ensureDir $out/nix-support
       echo "doc manual $out manual.html" >> $out/nix-support/hydra-build-products
     '';
diff --git a/doc/manual/development.xml b/doc/manual/development.xml
index e79114d1785..b1a9a3a4325 100644
--- a/doc/manual/development.xml
+++ b/doc/manual/development.xml
@@ -65,7 +65,7 @@ let
   cmd = "root  updatedb --localuser=nobody --output=${locatedb} > ${logfile}";
 in
 
-mkIf cfg.enable {<co xml:id='conf-syntax-5' />
+mkIf cfg.enable { <co xml:id='conf-syntax-5' />
   require = [ <co xml:id='conf-syntax-6' />
     options
 
-- 
GitLab


From 896a9f0508bae27aae4a751bfc1429f7966362e5 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 14 Jul 2009 15:47:03 +0000
Subject: [PATCH 1648/5331] * Generate a manual page for configuration.nix
 containing all the   options.

svn path=/nixos/branches/modular-nixos/; revision=16358
---
 doc/manual/default.nix            | 20 ++++++++++++----
 doc/manual/installation.xml       |  2 +-
 doc/manual/man-configuration.xml  | 38 +++++++++++++++++++++++++++++++
 doc/manual/man-pages.xml          | 28 +++++++++++++++++++++++
 doc/manual/manual.xml             |  7 ++++--
 doc/manual/options-to-docbook.xsl |  7 ++----
 6 files changed, 89 insertions(+), 13 deletions(-)
 create mode 100644 doc/manual/man-configuration.xml
 create mode 100644 doc/manual/man-pages.xml

diff --git a/doc/manual/default.nix b/doc/manual/default.nix
index 816e333866b..1909c8a9e44 100644
--- a/doc/manual/default.nix
+++ b/doc/manual/default.nix
@@ -32,18 +32,28 @@ let
     '';
 
     buildCommand = ''
-      ensureDir $out
+      
       ln -s $sources/*.xml .
       ln -s ${optionsDocBook} options-db.xml
+
+      dst=$out/share/doc/nixos
+      ensureDir $dst
       xsltproc $xsltFlags --nonet --xinclude \
-        --output $out/manual.html \
+        --output $dst/manual.html \
         ${pkgs.docbook5_xsl}/xml/xsl/docbook/xhtml/docbook.xsl \
         ./manual.xml
-      ln -s ${pkgs.docbook5_xsl}/xml/xsl/docbook/images $out/
-      cp ${./style.css} $out/style.css
+      ln -s ${pkgs.docbook5_xsl}/xml/xsl/docbook/images $dst/
+      cp ${./style.css} $dst/style.css
+
+      ensureDir $out/share/man
+      xsltproc --nonet --xinclude \
+        --param man.output.in.separate.dir 1 \
+        --param man.output.base.dir "'$out/share/man/'" \
+        ${pkgs.docbook5_xsl}/xml/xsl/docbook/manpages/docbook.xsl \
+        ./man-pages.xml
       
       ensureDir $out/nix-support
-      echo "doc manual $out manual.html" >> $out/nix-support/hydra-build-products
+      echo "doc manual $dst manual.html" >> $out/nix-support/hydra-build-products
     '';
   };
 
diff --git a/doc/manual/installation.xml b/doc/manual/installation.xml
index 8dbeb0cf446..5b116bbd060 100644
--- a/doc/manual/installation.xml
+++ b/doc/manual/installation.xml
@@ -246,7 +246,7 @@ $ nix-env -qa \*</screen>
 
     shows what packages are available, and
 
-<screen>    
+<screen>
 $ nix-env -i w3m</screen>
 
     install the <literal>w3m</literal> browser.</para>
diff --git a/doc/manual/man-configuration.xml b/doc/manual/man-configuration.xml
new file mode 100644
index 00000000000..d49369d2c58
--- /dev/null
+++ b/doc/manual/man-configuration.xml
@@ -0,0 +1,38 @@
+<refentry xmlns="http://docbook.org/ns/docbook"
+          xmlns:xlink="http://www.w3.org/1999/xlink"
+          xmlns:xi="http://www.w3.org/2001/XInclude">
+  
+<refmeta>
+  <refentrytitle><filename>configuration.nix</filename></refentrytitle>
+  <manvolnum>5</manvolnum>
+  <refmiscinfo class="source">NixOS</refmiscinfo>
+  <!-- <refmiscinfo class="version"><xi:include href="version.txt" parse="text"/></refmiscinfo> -->
+</refmeta>
+
+<refnamediv>
+  <refname><filename>configuration.nix</filename></refname>
+  <refpurpose>NixOS system configuration specification</refpurpose>
+</refnamediv>
+
+
+<refsection><title>Description</title>
+
+<para>The file <filename>/etc/nixos/configuration.nix</filename>
+contains the declarative specification of your NixOS system
+configuration.  The command <command>nixos-rebuild</command> takes
+this file and realises the system configuration specified
+therein.</para>
+
+</refsection>
+
+
+<refsection><title>Options</title>
+
+<para>You can use the following options in
+<filename>configuration.nix</filename>.</para>
+
+<xi:include href="options-db.xml" />
+
+</refsection>
+  
+</refentry>
diff --git a/doc/manual/man-pages.xml b/doc/manual/man-pages.xml
new file mode 100644
index 00000000000..ccd0ebfc6da
--- /dev/null
+++ b/doc/manual/man-pages.xml
@@ -0,0 +1,28 @@
+<reference xmlns="http://docbook.org/ns/docbook"
+           xmlns:xlink="http://www.w3.org/1999/xlink"
+           xmlns:xi="http://www.w3.org/2001/XInclude">
+
+  <title>NixOS Reference Pages</title>
+
+  <info>
+
+    <author>
+      <personname>
+        <firstname>Eelco</firstname>
+        <surname>Dolstra</surname>
+      </personname>
+      <contrib>Author</contrib>
+    </author>
+
+    <copyright>
+      <year>2007</year>
+      <year>2008</year>
+      <year>2009</year>
+      <holder>Eelco Dolstra</holder>
+    </copyright>
+    
+  </info>
+  
+  <xi:include href="man-configuration.xml" />
+
+</reference>
diff --git a/doc/manual/manual.xml b/doc/manual/manual.xml
index 9f79b6fdb6e..6ad59ae8486 100644
--- a/doc/manual/manual.xml
+++ b/doc/manual/manual.xml
@@ -35,7 +35,7 @@
     problems here and there.  Extensive familiarity with Linux is
     recommended.  If you encounter problems, please report them on the
     <literal>nix-dev@cs.uu.nl</literal> mailing list or on <link
-    xlink:href="irc://irc.freenode.net/#trace" />.</para>
+    xlink:href="irc://irc.freenode.net/#nixos" />.</para>
     
   </preface>
   
@@ -44,6 +44,9 @@
   <xi:include href="userconfiguration.xml" />
   <xi:include href="troubleshooting.xml" />
   <xi:include href="development.xml" />
-  <xi:include href="options-db.xml" />
+  <chapter xml:id="ch-options">
+    <title>List of Options</title>
+    <xi:include href="options-db.xml" />
+  </chapter>
 
 </book>
diff --git a/doc/manual/options-to-docbook.xsl b/doc/manual/options-to-docbook.xsl
index 1496daf30c6..34a415ffc17 100644
--- a/doc/manual/options-to-docbook.xsl
+++ b/doc/manual/options-to-docbook.xsl
@@ -13,9 +13,6 @@
   
   <xsl:template match="/expr/list">
 
-    <chapter xml:id="ch-options">
-      <title>List of Options</title>
-
       <variablelist>
 
         <xsl:for-each select="attrs">
@@ -39,6 +36,7 @@
 
                <para>
                  <emphasis>Default:</emphasis>
+                 <xsl:text> </xsl:text>
                  <xsl:choose>
                    <xsl:when test="attr[@name = 'default']">
                      <literal>
@@ -54,6 +52,7 @@
                <xsl:if test="attr[@name = 'example']">
                  <para>
                    <emphasis>Example:</emphasis>
+                   <xsl:text> </xsl:text>
                    <literal>
                      <xsl:apply-templates select="attr[@name = 'example']" />
                    </literal>
@@ -68,8 +67,6 @@
 
       </variablelist>
 
-    </chapter>
-
   </xsl:template>
 
 
-- 
GitLab


From da996583eef58371854e0c50f0bba3899e4441be Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 14 Jul 2009 16:27:46 +0000
Subject: [PATCH 1649/5331] * Include the NixOS manpages in the system
 environment.  Actually   there is only one currently: configuration.nix(5),
 which contains a   list of all the options.

svn path=/nixos/branches/modular-nixos/; revision=16360
---
 doc/manual/default.nix                        |   1 +
 .../installer/cd-dvd/installation-cd-base.nix |   2 +-
 modules/services/misc/nixos-manual.nix        | 156 ++++++++----------
 3 files changed, 72 insertions(+), 87 deletions(-)

diff --git a/doc/manual/default.nix b/doc/manual/default.nix
index 1909c8a9e44..271a6a54bcc 100644
--- a/doc/manual/default.nix
+++ b/doc/manual/default.nix
@@ -4,6 +4,7 @@ let
 
   manualConfig =
     { environment.checkConfigurationOptions = false;
+      services.nixosManual.enable = false;
     };
 
   options = builtins.toFile "options.xml" (builtins.unsafeDiscardStringContext
diff --git a/modules/installer/cd-dvd/installation-cd-base.nix b/modules/installer/cd-dvd/installation-cd-base.nix
index b45a5cdb6e0..dc84fa3e8cb 100644
--- a/modules/installer/cd-dvd/installation-cd-base.nix
+++ b/modules/installer/cd-dvd/installation-cd-base.nix
@@ -83,7 +83,7 @@ in
   boot.kernelPackages = pkgs.kernelPackages_2_6_29;
 
   # Show the manual.
-  services.showManual.enable = true;
+  services.nixosManual.showManual = true;
 
   # Let the user play Rogue on TTY 8 during the installation.
   services.rogue.enable = true;
diff --git a/modules/services/misc/nixos-manual.nix b/modules/services/misc/nixos-manual.nix
index 29df0e3354a..a886814d76d 100644
--- a/modules/services/misc/nixos-manual.nix
+++ b/modules/services/misc/nixos-manual.nix
@@ -1,104 +1,88 @@
-{pkgs, config, ...}:
+# This module includes the NixOS man-pages in the system environment,
+# and optionally starts a browser that shows the NixOS manual on one
+# of the virtual consoles.  The latter is useful for the installation
+# CD.
 
-# Show the NixOS manual on tty8
-# Originally used only by installation CD
+{pkgs, config, ...}:
 
 let
-  inherit (pkgs.lib) mkOption;
 
-  options = {
-    services = {
-
-      showManual = {
-
-        enable = mkOption {
-          default = false;
-          description = "
-            Whether to show the NixOS manual on one of the virtual
-            consoles.
-          ";
-        };
-
-        ttyNumber = mkOption {
-          default = "8";
-          description = "
-            Virtual console on which to show the manual.
-          ";
-        };
-
-        browser = mkOption {
-          default = "${pkgs.w3m}/bin/w3m";
-          description = ''
-            Browser used to show the manual.
-          '';
-        };
-
-        manualFile = mkOption {
-          # Note: we can't use a default here (see below), since it
-          # causes an infinite recursion building the manual.
-          default = null; 
-          description = "
-            NixOS manual HTML file
-          ";
-        };
-
-      }; # showManual
-
-    }; # services
-  };
-in
-
-let
-  inherit (config.services.showManual) enable ttyNumber browser manualFile;
-
-  realManualFile =
-    if manualFile == null then
-      # We could speed up the evaluation of the manual expression by
-      # providing it the optionDeclarations of the current
-      # configuration.
-      "${import ../../../doc/manual {inherit pkgs;}}/manual.html"
-    else
-      manualFile;
-
-  inherit (pkgs.lib) mkIf mkThenElse;
-in
+  inherit (pkgs.lib) mkOption mkIf;
 
-mkIf enable {
-  require = [
-    options
-  ];
+  cfg = config.services.nixosManual;
 
-  boot = {
-    extraTTYs = [ ttyNumber ];
-  };
+  manual =
+    # We could speed up the evaluation of the manual expression by
+    # providing it the optionDeclarations of the current
+    # configuration.
+    import ../../../doc/manual {inherit pkgs;};
+    
+in
 
-  services = {
+{
 
-    extraJobs = [{
-      name = "nixos-manual";
+  options = {
 
-      job = ''
-        description "NixOS manual"
+    services.nixosManual.enable = mkOption {
+      default = true;
+      description = ''
+        Whether to build the NixOS manual pages.
+      '';
+    };
 
-        start on udev
-        stop on shutdown
-        respawn ${browser} ${realManualFile} < /dev/tty${toString ttyNumber} > /dev/tty${toString ttyNumber} 2>&1
+    services.nixosManual.showManual = mkOption {
+      default = false;
+      description = ''
+        Whether to show the NixOS manual on one of the virtual
+        consoles.
       '';
-    }];
+    };
 
-    ttyBackgrounds = {
-      specificThemes = [{
-        tty = ttyNumber;
-        theme = pkgs.themes "green";
-      }];
+    services.nixosManual.ttyNumber = mkOption {
+      default = "8";
+      description = ''
+        Virtual console on which to show the manual.
+      '';
     };
 
-    mingetty = {
-      helpLine = mkThenElse {
-        thenPart = "\nPress <Alt-F${toString ttyNumber}> for the NixOS manual.";
-        elsePart = "";
-      };
+    services.nixosManual.browser = mkOption {
+      default = "${pkgs.w3m}/bin/w3m";
+      description = ''
+        Browser used to show the manual.
+      '';
     };
 
   };
+
+
+  config = mkIf cfg.enable {
+
+    environment.systemPackages = [manual];
+
+    boot.extraTTYs = mkIf cfg.showManual [cfg.ttyNumber];
+
+    services.extraJobs = mkIf cfg.showManual (pkgs.lib.singleton
+      { name = "nixos-manual";
+
+        job = ''
+          description "NixOS manual"
+
+          start on udev
+          stop on shutdown
+          respawn ${cfg.browser} ${manual}/share/doc/nixos/manual.html \
+            < /dev/tty${toString cfg.ttyNumber} > /dev/tty${toString cfg.ttyNumber} 2>&1
+        '';
+      });
+
+    services.ttyBackgrounds.specificThemes = mkIf cfg.showManual 
+      [ { tty = cfg.ttyNumber;
+          theme = pkgs.themes "green";
+        }
+      ];
+
+    services.mingetty.helpLine = mkIf cfg.showManual
+      "\nPress <Alt-F${toString cfg.ttyNumber}> for the NixOS manual.";
+      
+  };
+
 }
-- 
GitLab


From b66fd2364caa955032ea0c4de2f0785d0db47278 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 15 Jul 2009 08:45:29 +0000
Subject: [PATCH 1650/5331] * Don't put /etc/nixos/nixos in ~/.nix-defexpr.

svn path=/nixos/branches/modular-nixos/; revision=16366
---
 modules/programs/bash/profile.sh | 1 -
 1 file changed, 1 deletion(-)

diff --git a/modules/programs/bash/profile.sh b/modules/programs/bash/profile.sh
index 8718f8087fc..c053f861400 100644
--- a/modules/programs/bash/profile.sh
+++ b/modules/programs/bash/profile.sh
@@ -37,7 +37,6 @@ if test ! -e $HOME/.nix-defexpr -o -L $HOME/.nix-defexpr; then
     rm -f $HOME/.nix-defexpr
     mkdir $HOME/.nix-defexpr
     ln -s /etc/nixos/nixpkgs $HOME/.nix-defexpr/nixpkgs_sys
-    ln -s /etc/nixos/nixos $HOME/.nix-defexpr/nixos
     if test "$USER" != root; then
         ln -s /nix/var/nix/gcroots/per-user/root/channels $HOME/.nix-defexpr/channels_root
     fi
-- 
GitLab


From 118418ba319ff15e4d52b0b5713be3289b1e8068 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 15 Jul 2009 09:06:36 +0000
Subject: [PATCH 1651/5331] * Refactoring the Upstart module.  Got rid of
 job.extraEtc, it's   redundant now (modules can just define environment.etc).

svn path=/nixos/branches/modular-nixos/; revision=16367
---
 modules/module-list.nix             |  39 +-------
 modules/services/printing/cupsd.nix |  34 +++----
 modules/system/upstart/make-job.nix |   3 -
 modules/system/upstart/upstart.nix  | 146 +++++++++++++---------------
 4 files changed, 82 insertions(+), 140 deletions(-)

diff --git a/modules/module-list.nix b/modules/module-list.nix
index c806495c833..750a39ba105 100644
--- a/modules/module-list.nix
+++ b/modules/module-list.nix
@@ -1,5 +1,4 @@
-[ # This file has been generated by gen-module-list.sh
-  ./config/fonts.nix
+[ ./config/fonts.nix
   ./config/guest-users.nix
   ./config/i18n.nix
   ./config/ldap.nix
@@ -75,31 +74,6 @@
   ./services/ttys/gpm.nix
   ./services/ttys/mingetty.nix
   ./services/web-servers/apache-httpd/default.nix
-##### ./services/web-servers/apache-httpd/per-server-options.nix
-# error: while evaluating the attribute `<let-body>' at `(string):2:8':
-# while evaluating the function at `(string):3:22':
-# while evaluating the function at `./services/web-servers/apache-httpd/per-server-options.nix:6:2':
-# the argument named `forMainServer' required by the function is missing
-##### ./services/web-servers/apache-httpd/subversion.nix
-# error: while evaluating the attribute `<let-body>' at `(string):2:8':
-# while evaluating the function at `(string):3:22':
-# while evaluating the function at `./services/web-servers/apache-httpd/subversion.nix:1:2':
-# the argument named `serverInfo' required by the function is missing
-##### ./services/web-servers/apache-httpd/tomcat-connector.nix
-# error: while evaluating the attribute `<let-body>' at `(string):2:8':
-# while evaluating the function at `(string):3:22':
-# while evaluating the function at `./services/web-servers/apache-httpd/tomcat-connector.nix:1:2':
-# the argument named `serverInfo' required by the function is missing
-##### ./services/web-servers/apache-httpd/twiki.nix
-# error: while evaluating the attribute `<let-body>' at `(string):2:8':
-# while evaluating the function at `(string):3:22':
-# while evaluating the function at `./services/web-servers/apache-httpd/twiki.nix:1:2':
-# the argument named `serverInfo' required by the function is missing
-##### ./services/web-servers/apache-httpd/zabbix.nix
-# error: while evaluating the attribute `<let-body>' at `(string):2:8':
-# while evaluating the function at `(string):3:22':
-# while evaluating the function at `./services/web-servers/apache-httpd/zabbix.nix:1:2':
-# the argument named `serverInfo' required by the function is missing
   ./services/web-servers/jboss.nix
   ./services/web-servers/tomcat.nix
   ./services/x11/xfs.nix
@@ -128,20 +102,9 @@
   ./system/boot/stage-1.nix
   ./system/boot/stage-2.nix
   ./system/etc/etc.nix
-##### ./system/etc/make-etc.nix
-# error: while evaluating the attribute `<let-body>' at `(string):2:8':
-# while evaluating the function at `(string):3:22':
-# while evaluating the function at `./system/etc/make-etc.nix:1:2':
-# the argument named `stdenv' required by the function is missing
   ./system/upstart-events/ctrl-alt-delete.nix
   ./system/upstart-events/halt.nix
   ./system/upstart-events/maintenance-shell.nix
-##### ./system/upstart/make-job.nix
-# error: while evaluating the attribute `<let-body>' at `(string):2:8':
-# while evaluating the function at `(string):3:22':
-# while evaluating the function at `./system/upstart/make-job.nix:1:2':
-# the argument named `runCommand' required by the function is missing
-  ./system/upstart/tools.nix
   ./system/upstart/upstart.nix
   ./tasks/filesystems.nix
   ./tasks/kbd.nix
diff --git a/modules/services/printing/cupsd.nix b/modules/services/printing/cupsd.nix
index b240b7c8a9c..4f2bffe7773 100644
--- a/modules/services/printing/cupsd.nix
+++ b/modules/services/printing/cupsd.nix
@@ -134,22 +134,21 @@ mkIf config.services.printing.enable {
     options
   ];
 
-  services = {
-    extraJobs = [{
-      name = "cupsd";
-
-      extraPath = [cups];
-
-      extraEtc = [
-        # CUPS expects the following files in its ServerRoot.
-        { source = "${cups}/etc/cups/mime.convs";
-          target = "cups/mime.convs";
-        }
-        { source = "${cups}/etc/cups/mime.types";
-          target = "cups/mime.types";
-        }
-      ];
-      
+  environment.systemPackages = [cups];
+
+  environment.etc =
+    [ # CUPS expects the following files in its ServerRoot.
+      { source = "${cups}/etc/cups/mime.convs";
+        target = "cups/mime.convs";
+      }
+      { source = "${cups}/etc/cups/mime.types";
+        target = "cups/mime.types";
+      }
+    ];
+
+  services.extraJobs = pkgs.lib.singleton
+    { name = "cupsd";
+
       job = ''
         description "CUPS printing daemon"
 
@@ -167,6 +166,5 @@ mkIf config.services.printing.enable {
 
         respawn ${cups}/sbin/cupsd -c ${cupsdConfig} -F
       '';
-    }];
-  };
+    };
 }
diff --git a/modules/system/upstart/make-job.nix b/modules/system/upstart/make-job.nix
index df56b5dee29..26cce3af2a9 100644
--- a/modules/system/upstart/make-job.nix
+++ b/modules/system/upstart/make-job.nix
@@ -21,9 +21,6 @@
   # system path.
   extraPath = if job ? extraPath then job.extraPath else [];
 
-  # Allow jobs to declare extra files that should be added to /etc.
-  extraEtc = if job ? extraEtc then job.extraEtc else [];
-
   # Allow jobs to declare extra configuration for Apache (e.g. Nagios
   # declaring its web interface).
   extraHttpdConfig = if job ? extraHttpdConfig then job.extraHttpdConfig else "";
diff --git a/modules/system/upstart/upstart.nix b/modules/system/upstart/upstart.nix
index ca9b6e2ddf5..699fcc4c2f4 100644
--- a/modules/system/upstart/upstart.nix
+++ b/modules/system/upstart/upstart.nix
@@ -1,63 +1,13 @@
 {config, pkgs, ...}:
 
-###### interface
 let
-  inherit (pkgs.lib) mkOption mapAttrs fold
-    mergeListOption mergeTypedOption mergeAttrsWithFunc;
 
-  options = {
-    services = {
-      extraJobs = mkOption {
-        default = [];
-        example = [
-             { name = "test-job";
-               job = ''
-                 description "nc"
-                 start on started network-interfaces
-                 respawn
-                 env PATH=/var/run/current-system/sw/bin
-                 exec sh -c "echo 'hello world' | ${pkgs.netcat}/bin/nc -l -p 9000"
-                 '';
-             } ];
-        # should have some checks to verify the syntax
-        merge = pkgs.lib.mergeListOption;
-        description = "
-          Additional Upstart jobs.
-        ";
-      };
-
-      tools = {
-        upstartJobs = mkOption {
-          default = {};
-          description = "
-            List of functions which can be used to create upstart-jobs.
-          ";
-        };
-      };
-    };
-
-    tests = {
-      upstartJobs = mkOption {
-        internal = true;
-        default = {};
-        description = "
-          Make it easier to build individual Upstart jobs. (e.g.,
-          <command>nix-build /etc/nixos/nixos -A
-          tests.upstartJobs.xserver</command>).
-        ";
-      };
-    };
-  };
-in
-
-###### implementation
-let
   makeJob = import ./make-job.nix {
     inherit (pkgs) runCommand;
   };
 
-  optional = cond: service: pkgs.lib.optional cond (makeJob service);
-
+  inherit (pkgs.lib) mkOption mergeListOption;
+  
   jobs = map makeJob config.services.extraJobs;
   
   # Create an etc/event.d directory containing symlinks to the
@@ -76,45 +26,79 @@ let
       done
     ''; # */
 
-in 
-
+in
+  
 {
-  require = [
-    options
-    ./tools.nix # !!! doesn't seem to be used anywhere
-  ];
-
-  environment = {
-    etc = [{ # The Upstart events defined above.
-      source = command + "/etc/event.d";
-      target = "event.d";
-    }]
-    ++ pkgs.lib.concatLists (map (job: job.extraEtc) jobs);
-
-    extraPackages =
-      pkgs.lib.concatLists (map (job: job.extraPath) jobs);
+
+  ###### interface
+  
+  options = {
+  
+    services.extraJobs = mkOption {
+      default = [];
+      example =
+        [ { name = "test-job";
+            job = ''
+              description "nc"
+              start on started network-interfaces
+              respawn
+              env PATH=/var/run/current-system/sw/bin
+              exec sh -c "echo 'hello world' | ${pkgs.netcat}/bin/nc -l -p 9000"
+             '';
+          }
+        ];
+      # should have some checks to verify the syntax
+      merge = pkgs.lib.mergeListOption;
+      description = ''
+        Additional Upstart jobs.
+      '';
+    };
+
+    tests.upstartJobs = mkOption {
+      internal = true;
+      default = {};
+      description = ''
+        Make it easier to build individual Upstart jobs. (e.g.,
+        <command>nix-build /etc/nixos/nixos -A
+        tests.upstartJobs.xserver</command>).
+      '';
+    };
+    
   };
 
-  users = {
-    extraUsers =
+
+  ###### implementation
+  
+  config = {
+
+    environment.etc =
+      [ { # The Upstart events defined above.
+          source = command + "/etc/event.d";
+          target = "event.d";
+        }
+      ];
+
+    environment.extraPackages =
+      pkgs.lib.concatLists (map (job: job.extraPath) jobs);
+
+
+    users.extraUsers =
       pkgs.lib.concatLists (map (job: job.users) jobs);
 
-    extraGroups =
+    users.extraGroups =
       pkgs.lib.concatLists (map (job: job.groups) jobs);
-  };
 
-  services = {
-    extraJobs = [
-      # For the built-in logd job.
-      { jobDrv = pkgs.upstart; }
-    ];
-  };
+    services.extraJobs =
+      [ # For the built-in logd job.
+        { jobDrv = pkgs.upstart; }
+      ];
 
-  tests = {
-    # see test/test-upstart-job.sh
-    upstartJobs = { recurseForDerivations = true; } //
+    # see test/test-upstart-job.sh (!!! check whether this still works)
+    tests.upstartJobs = { recurseForDerivations = true; } //
       builtins.listToAttrs (map (job:
         { name = if job ? jobName then job.jobName else job.name; value = job; }
       ) jobs);
+  
   };
+
 }
-- 
GitLab


From def0be732fb434dbb51cd5f1127da975bb882c28 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 15 Jul 2009 09:14:24 +0000
Subject: [PATCH 1652/5331] * job.extraHttpdConfig: not used anywhere.

svn path=/nixos/branches/modular-nixos/; revision=16369
---
 modules/system/upstart/make-job.nix | 4 ----
 modules/system/upstart/upstart.nix  | 1 -
 2 files changed, 5 deletions(-)

diff --git a/modules/system/upstart/make-job.nix b/modules/system/upstart/make-job.nix
index 26cce3af2a9..319e58a0a5c 100644
--- a/modules/system/upstart/make-job.nix
+++ b/modules/system/upstart/make-job.nix
@@ -21,10 +21,6 @@
   # system path.
   extraPath = if job ? extraPath then job.extraPath else [];
 
-  # Allow jobs to declare extra configuration for Apache (e.g. Nagios
-  # declaring its web interface).
-  extraHttpdConfig = if job ? extraHttpdConfig then job.extraHttpdConfig else "";
-
   # Allow jobs to declare user accounts that should be created.
   users = if job ? users then job.users else [];
   
diff --git a/modules/system/upstart/upstart.nix b/modules/system/upstart/upstart.nix
index 699fcc4c2f4..e190c23523f 100644
--- a/modules/system/upstart/upstart.nix
+++ b/modules/system/upstart/upstart.nix
@@ -81,7 +81,6 @@ in
     environment.extraPackages =
       pkgs.lib.concatLists (map (job: job.extraPath) jobs);
 
-
     users.extraUsers =
       pkgs.lib.concatLists (map (job: job.users) jobs);
 
-- 
GitLab


From ca8e00cafabcc3466f9aac6ddb0dcbca098424d4 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 15 Jul 2009 11:19:11 +0000
Subject: [PATCH 1653/5331] * Got rid of the extraPath field in jobs (use  
 environment.systemPackages instead).  Also renamed   services.extraJobs to
 jobs.

svn path=/nixos/branches/modular-nixos/; revision=16370
---
 modules/services/databases/mysql.nix          | 116 +++--
 modules/services/databases/postgresql.nix     | 189 ++++----
 modules/services/networking/dhclient.nix      | 155 +++---
 modules/services/networking/ifplugd.nix       |  96 ++--
 .../web-servers/apache-httpd/default.nix      | 453 +++++++++---------
 modules/system/upstart/make-job.nix           |   4 -
 modules/system/upstart/upstart.nix            |  18 +-
 modules/tasks/kbd.nix                         |  57 ++-
 8 files changed, 539 insertions(+), 549 deletions(-)

diff --git a/modules/services/databases/mysql.nix b/modules/services/databases/mysql.nix
index 2ecaa6df4ca..e5b8661ef99 100644
--- a/modules/services/databases/mysql.nix
+++ b/modules/services/databases/mysql.nix
@@ -1,51 +1,7 @@
 {pkgs, config, ...}:
 
-###### interface
-let
-  inherit (pkgs.lib) mkOption mkIf;
-
-  options = {
-    services = {
-      mysql = {
-        enable = mkOption {
-          default = false;
-          description = "
-            Whether to enable the MySQL server.
-          ";
-        };
-        
-        port = mkOption {
-          default = "3306";
-          description = "Port of MySQL"; 
-        };
-        
-        user = mkOption {
-          default = "mysql";
-          description = "User account under which MySQL runs";
-        };
-        
-        dataDir = mkOption {
-          default = "/var/mysql";
-          description = "Location where MySQL stores its table files";
-        };
-        
-        logError = mkOption {
-          default = "/var/log/mysql_err.log";
-          description = "Location of the MySQL error logfile";
-        };
-        
-        pidDir = mkOption {
-          default = "/var/run/mysql";
-          description = "Location of the file which stores the PID of the MySQL server";
-        };
-      };
-    };
-  };
-in
-
-###### implementation
-
 let
+  inherit (pkgs.lib) mkOption mkIf singleton;
 
   cfg = config.services.mysql;
 
@@ -59,26 +15,64 @@ let
 
 in
 
+{
+
+  ###### interface
+
+  options = {
+  
+    services.mysql = {
+    
+      enable = mkOption {
+        default = false;
+        description = "
+          Whether to enable the MySQL server.
+        ";
+      };
+
+      port = mkOption {
+        default = "3306";
+        description = "Port of MySQL"; 
+      };
+
+      user = mkOption {
+        default = "mysql";
+        description = "User account under which MySQL runs";
+      };
+
+      dataDir = mkOption {
+        default = "/var/mysql";
+        description = "Location where MySQL stores its table files";
+      };
+
+      logError = mkOption {
+        default = "/var/log/mysql_err.log";
+        description = "Location of the MySQL error logfile";
+      };
+
+      pidDir = mkOption {
+        default = "/var/run/mysql";
+        description = "Location of the file which stores the PID of the MySQL server";
+      };
+
+    };
+    
+  };
+
 
-mkIf config.services.mysql.enable {
-  require = [
-    options
-  ];
+  ###### implementation
 
-  users = {
-    extraUsers = [
+  config = mkIf config.services.mysql.enable {
+
+    users.extraUsers = singleton
       { name = "mysql";
         description = "MySQL server user";
-      }
-    ];
-  };
+      };
 
-  services = {
-    extraJobs = [{
-      name = "mysql";
-      
+    environment.systemPackages = [mysql];
 
-      extraPath = [mysql];
+    jobs = singleton {
+      name = "mysql";
       
       job = ''
         description "MySQL server"
@@ -104,6 +98,8 @@ mkIf config.services.mysql.enable {
             ${mysql}/bin/mysql_waitpid "$pid" 1000
         end script
       '';
-    }];
+    };
+
   };
+
 }
diff --git a/modules/services/databases/postgresql.nix b/modules/services/databases/postgresql.nix
index 9bbd8d86969..1fb11244768 100644
--- a/modules/services/databases/postgresql.nix
+++ b/modules/services/databases/postgresql.nix
@@ -1,80 +1,7 @@
 {pkgs, config, ...}:
 
-###### interface
-let
-  inherit (pkgs.lib) mkOption mkIf;
-
-  options = {
-    services = {
-      postgresql = {
-        enable = mkOption {
-          default = false;
-          description = "
-            Whether to run PostgreSQL.
-          ";
-        };
-        port = mkOption {
-          default = "5432";
-          description = "
-            Port for PostgreSQL.
-          ";
-        };
-        logDir = mkOption {
-          default = "/var/log/postgresql";
-          description = "
-            Log directory for PostgreSQL.
-          ";
-        };
-        dataDir = mkOption {
-          default = "/var/db/postgresql";
-          description = "
-            Data directory for PostgreSQL.
-          ";
-        };
-        subServices = mkOption {
-          default = [];
-          description = "
-            Subservices list. As it is already implememnted, 
-            here is an interface...
-          ";
-        };
-        authentication = mkOption {
-          default = ''
-            # Generated file; do not edit!
-            local all all              ident sameuser
-            host  all all 127.0.0.1/32 md5
-            host  all all ::1/128      md5
-          '';
-          description = "
-            Hosts (except localhost), who you allow to connect.
-          ";
-        };
-        allowedHosts = mkOption {
-          default = [];
-          description = "
-            Hosts (except localhost), who you allow to connect.
-          ";
-        };
-        authMethod = mkOption {
-          default = " ident sameuser ";
-          description = "
-            How to authorize users. 
-            Note: ident needs absolute trust to all allowed client hosts.";
-        };
-        enableTCPIP = mkOption {
-          default = false;
-          description = "
-            Whether to run PostgreSQL with -i flag to enable TCP/IP connections.
-          ";
-        };
-      };
-    };
-  };
-in
-
-###### implementation
-
 let
+  inherit (pkgs.lib) mkOption mkIf singleton;
 
   cfg = config.services.postgresql;
 
@@ -83,35 +10,111 @@ let
   startDependency = if config.services.gw6c.enable then 
     "gw6c" else "network-interfaces";
 
-  run = "${pkgs.su}/bin/su -s ${pkgs.bash}/bin/sh postgres";
+  run = "${pkgs.su}/bin/su -s ${pkgs.stdenv.shell} postgres";
 
   flags = if cfg.enableTCPIP then ["-i"] else [];
 
 in
 
-mkIf config.services.postgresql.enable {
-  require = [
-    options
-  ];
+{
+
+  ###### interface
+  
+  options = {
+  
+    services.postgresql = {
+    
+      enable = mkOption {
+        default = false;
+        description = ''
+          Whether to run PostgreSQL.
+        '';
+      };
+      
+      port = mkOption {
+        default = "5432";
+        description = ''
+          Port for PostgreSQL.
+        '';
+      };
+      
+      logDir = mkOption {
+        default = "/var/log/postgresql";
+        description = ''
+          Log directory for PostgreSQL.
+        '';
+      };
+      
+      dataDir = mkOption {
+        default = "/var/db/postgresql";
+        description = ''
+          Data directory for PostgreSQL.
+        '';
+      };
+      
+      subServices = mkOption {
+        default = [];
+        description = ''
+          Subservices list. As it is already implememnted, 
+          here is an interface...
+        '';
+      };
+      
+      authentication = mkOption {
+        default = ''
+          # Generated file; do not edit!
+          local all all              ident sameuser
+          host  all all 127.0.0.1/32 md5
+          host  all all ::1/128      md5
+        '';
+        description = ''
+          Hosts (except localhost), who you allow to connect.
+        '';
+      };
+      
+      allowedHosts = mkOption {
+        default = [];
+        description = ''
+          Hosts (except localhost), who you allow to connect.
+        '';
+      };
+      
+      authMethod = mkOption {
+        default = " ident sameuser ";
+        description = ''
+          How to authorize users. 
+          Note: ident needs absolute trust to all allowed client hosts.
+        '';
+      };
+      
+      enableTCPIP = mkOption {
+        default = false;
+        description = ''
+          Whether to run PostgreSQL with -i flag to enable TCP/IP connections.
+        '';
+      };
+      
+    };
+
+  };
 
 
-  users = {
-    extraUsers = [
+  ###### implementation
+  
+  config = mkIf config.services.postgresql.enable {
+
+    users.extraUsers = singleton
       { name = "postgres";
         description = "PostgreSQL server user";
-      }
-    ];
+      };
 
-    extraGroups = [
-      { name = "postgres"; }
-    ];
-  };
+    users.extraGroups = singleton
+      { name = "postgres"; };
 
-  services = {
-    extraJobs = [{
-      name = "postgresql";
+    environment.systemPackages = [postgresql];
 
-      extraPath = [postgresql];
+    jobs = singleton {
+      name = "postgresql";
 
       job = ''
         description "PostgreSQL server"
@@ -130,6 +133,8 @@ mkIf config.services.postgresql.enable {
 
         respawn ${run} -c '${postgresql}/bin/postgres -D ${cfg.dataDir} ${toString flags}'
       '';
-      }];
+    };
+
   };
+  
 }
diff --git a/modules/services/networking/dhclient.nix b/modules/services/networking/dhclient.nix
index c409077ddc4..aea5a8f9c0c 100644
--- a/modules/services/networking/dhclient.nix
+++ b/modules/services/networking/dhclient.nix
@@ -1,49 +1,7 @@
 {pkgs, config, ...}:
 
-###### interface
 let
-  inherit (pkgs.lib) mkOption
-    mergeEnableOption mergeListOption;
-
-  options = {
-    networking = {
-      useDHCP = mkOption {
-        default = true;
-        merge = mergeEnableOption;
-        description = "
-          Whether to use DHCP to obtain an IP adress and other
-          configuration for all network interfaces that are not manually
-          configured.
-        ";
-      };
-  
-      interfaces = mkOption {
-        default = [];
-        merge = mergeListOption;
-        example = [
-          { name = "eth0";
-            ipAddress = "131.211.84.78";
-            subnetMask = "255.255.255.128";
-          }
-        ];
-        description = "
-          The configuration for each network interface.  If
-          <option>networking.useDHCP</option> is true, then each interface
-          not listed here will be configured using DHCP.
-        ";
-      };
-    };
-  };
-in
-
-###### implementation
-let
-
-  ifEnable = arg:
-    if config.networking.useDHCP then arg
-    else if builtins.isList arg then []
-    else if builtins.isAttrs arg then {}
-    else null;
+  inherit (pkgs.lib) mkOption mkIf mergeEnableOption mergeListOption;
 
   inherit (pkgs) nettools dhcp lib;
 
@@ -80,55 +38,90 @@ let
 in
 
 {
-  require = [
-    #../upstart-jobs/default.nix
-    options
-  ];
 
-  services.extraJobs = ifEnable [{
-    name = "dhclient";
+  ###### interface
 
-    extraPath = [dhcp];
+  options = {
+  
+    networking.useDHCP = mkOption {
+      default = true;
+      merge = mergeEnableOption;
+      description = "
+        Whether to use DHCP to obtain an IP adress and other
+        configuration for all network interfaces that are not manually
+        configured.
+      ";
+    };
+  
+    networking.interfaces = mkOption {
+      default = [];
+      merge = mergeListOption;
+      example = [
+        { name = "eth0";
+          ipAddress = "131.211.84.78";
+          subnetMask = "255.255.255.128";
+        }
+      ];
+      description = "
+        The configuration for each network interface.  If
+        <option>networking.useDHCP</option> is true, then each interface
+        not listed here will be configured using DHCP.
+      ";
+    };
+
+  };
 
-    job = ''
-      description "DHCP client"
 
-      start on network-interfaces/started
-      stop on network-interfaces/stop
+  ###### implementation
+  
+  config = mkIf config.networking.useDHCP {
 
-      env PATH_DHCLIENT_SCRIPT=${dhcp}/sbin/dhclient-script
+    jobs = pkgs.lib.singleton {
+      name = "dhclient";
 
-      script
-          export PATH=${nettools}/sbin:$PATH
+      job = ''
+        description "DHCP client"
 
-          # Determine the interface on which to start dhclient.
-          interfaces=
+        start on network-interfaces/started
+        stop on network-interfaces/stop
 
-          for i in $(cd /sys/class/net && ls -d *); do
-              if ! for j in ${toString ignoredInterfaces}; do echo $j; done | grep -F -x -q "$i"; then
-                  echo "Running dhclient on $i"
-                  interfaces="$interfaces $i"
-              fi
-          done
+        env PATH_DHCLIENT_SCRIPT=${dhcp}/sbin/dhclient-script
 
-          if test -z "$interfaces"; then
-              echo 'No interfaces on which to start dhclient!'
-              exit 1
-          fi
+        script
+            export PATH=${nettools}/sbin:$PATH
 
-          mkdir -m 755 -p ${stateDir}
+            # Determine the interface on which to start dhclient.
+            interfaces=
 
-          exec ${dhcp}/sbin/dhclient -d $interfaces -e "PATH=$PATH" -lf ${stateDir}/dhclient.leases
-      end script
-    '';
-  }];
-
-  environment.etc = ifEnable
-    [ # Dhclient hooks for emitting ip-up/ip-down events.
-      { source = dhclientExitHooks;
-        target = "dhclient-exit-hooks";
-      }
-    ];
+            for i in $(cd /sys/class/net && ls -d *); do
+                if ! for j in ${toString ignoredInterfaces}; do echo $j; done | grep -F -x -q "$i"; then
+                    echo "Running dhclient on $i"
+                    interfaces="$interfaces $i"
+                fi
+            done
+
+            if test -z "$interfaces"; then
+                echo 'No interfaces on which to start dhclient!'
+                exit 1
+            fi
+
+            mkdir -m 755 -p ${stateDir}
+
+            exec ${dhcp}/sbin/dhclient -d $interfaces -e "PATH=$PATH" -lf ${stateDir}/dhclient.leases
+        end script
+      '';
+    };
+
+    environment.systemPackages = [dhcp];
+
+    environment.etc =
+      [ # Dhclient hooks for emitting ip-up/ip-down events.
+        { source = dhclientExitHooks;
+          target = "dhclient-exit-hooks";
+        }
+      ];
+
+  };  
   
 }
 
diff --git a/modules/services/networking/ifplugd.nix b/modules/services/networking/ifplugd.nix
index c1b9c4e5620..9a08bba05e5 100644
--- a/modules/services/networking/ifplugd.nix
+++ b/modules/services/networking/ifplugd.nix
@@ -1,68 +1,62 @@
 {pkgs, config, ...}:
 
-###### interface
 let
   inherit (pkgs.lib) mkOption mkIf;
 
-  options = {
-    networking = {
-      interfaceMonitor = {
-
-        enable = mkOption {
-          default = false;
-          description = "
-            If <literal>true</literal>, monitor Ethernet interfaces for
-            cables being plugged in or unplugged.  When this occurs, the
-            <command>dhclient</command> service is restarted to
-            automatically obtain a new IP address.  This is useful for
-            roaming users (laptops).
-          ";
-        };
-
-        beep = mkOption {
-          default = false;
-          description = "
-            If <literal>true</literal>, beep when an Ethernet cable is
-            plugged in or unplugged.
-          ";
-        };
-      };
-    };
-  };
-in
-
-###### implementation
-
-let
-
-  inherit (pkgs) ifplugd writeScript bash;
+  inherit (pkgs) ifplugd;
 
   # The ifplugd action script, which is called whenever the link
   # status changes (i.e., a cable is plugged in or unplugged).  We do
   # nothing when a cable is unplugged.  When a cable is plugged in, we
   # restart dhclient, which will hopefully give us a new IP address
   # if appropriate.
-  plugScript = writeScript "ifplugd.action" "#! ${bash}/bin/sh
-    if test \"$2\" = up; then
-      initctl stop dhclient
-      sleep 1
-      initctl start dhclient
-    fi
-  ";
+  plugScript = pkgs.writeScript "ifplugd.action"
+    ''
+      #! ${pkgs.stdenv.shell}
+      if test "$2" = up; then
+        initctl stop dhclient
+        sleep 1
+        initctl start dhclient
+      fi
+    '';
 
 in 
 
-mkIf config.networking.interfaceMonitor.enable {
-  require = [
-    options
-  ];
+{
+
+  ###### interface
+
+  options = {
+  
+    networking.interfaceMonitor.enable = mkOption {
+      default = false;
+      description = "
+        If <literal>true</literal>, monitor Ethernet interfaces for
+        cables being plugged in or unplugged.  When this occurs, the
+        <command>dhclient</command> service is restarted to
+        automatically obtain a new IP address.  This is useful for
+        roaming users (laptops).
+      ";
+    };
+
+    networking.interfaceMonitor.beep = mkOption {
+      default = false;
+      description = "
+        If <literal>true</literal>, beep when an Ethernet cable is
+        plugged in or unplugged.
+      ";
+    };
+    
+  };
+
+
+  ###### implementation
+
+  config = mkIf config.networking.interfaceMonitor.enable {
 
-  services = {
-    extraJobs = [{
+    jobs = pkgs.lib.singleton {
       name = "ifplugd";
 
-      extraPath = [ifplugd];
-      
       job = ''
         description "Network interface connectivity monitor"
 
@@ -73,6 +67,10 @@ mkIf config.networking.interfaceMonitor.enable {
             ${if config.networking.interfaceMonitor.beep then "" else "--no-beep"} \
             --run ${plugScript}
       '';
-    }];
+    };
+
+    environment.systemPackages = [ifplugd];
+      
   };
+
 }
diff --git a/modules/services/web-servers/apache-httpd/default.nix b/modules/services/web-servers/apache-httpd/default.nix
index 2452b7697fa..dda59e4618d 100644
--- a/modules/services/web-servers/apache-httpd/default.nix
+++ b/modules/services/web-servers/apache-httpd/default.nix
@@ -1,202 +1,8 @@
 {pkgs, config, ...}:
 
-###### interface
-let
-  inherit (pkgs.lib) mkOption mkIf;
-
-  options = {
-    services = {
-      httpd = {
-      
-        enable = mkOption {
-          default = false;
-          description = "
-            Whether to enable the Apache httpd server.
-          ";
-        };
-
-        extraConfig = mkOption {
-          default = "";
-          description = "
-            These configuration lines will be passed verbatim to the apache config
-          ";
-        };
-
-        extraModules = mkOption {
-          default = [];
-          example = [ "proxy_connect" { name = "php5_module"; path = "${pkgs.php}/modules/libphp5.so"; } ];
-          description = ''
-            Specifies additional Apache modules.  These can be specified
-            as a string in the case of modules distributed with Apache,
-            or as an attribute set specifying the
-            <varname>name</varname> and <varname>path</varname> of the
-            module.
-          '';
-        };
-
-        logPerVirtualHost = mkOption {
-          default = false;
-          description = "
-            If enabled, each virtual host gets its own
-            <filename>access_log</filename> and
-            <filename>error_log</filename>, namely suffixed by the
-            <option>hostName</option> of the virtual host.
-          ";
-        };
-
-        user = mkOption {
-          default = "wwwrun";
-          description = "
-            User account under which httpd runs.  The account is created
-            automatically if it doesn't exist.
-          ";
-        };
-
-        group = mkOption {
-          default = "wwwrun";
-          description = "
-            Group under which httpd runs.  The account is created
-            automatically if it doesn't exist.
-          ";
-        };
-
-        logDir = mkOption {
-          default = "/var/log/httpd";
-          description = "
-            Directory for Apache's log files.  It is created automatically.
-          ";
-        };
-
-        stateDir = mkOption {
-          default = "/var/run/httpd";
-          description = "
-            Directory for Apache's transient runtime state (such as PID
-            files).  It is created automatically.  Note that the default,
-            <filename>/var/run/httpd</filename>, is deleted at boot time.
-          ";
-        };
-
-        mod_php = mkOption {
-          default = false;
-          description = "Whether to enable the PHP module.";
-        };
-
-        mod_jk = {
-          enable = mkOption {
-            default = false;
-            description = "Whether to enable the Apache Tomcat connector.";
-          };
-          
-          applicationMappings = mkOption {
-            default = [];
-            description = "List of Java webapplications that should be mapped to the servlet container (Tomcat/JBoss)";
-          };
-        };
-
-        virtualHosts = mkOption {
-          default = [];
-          example = [
-            { hostName = "foo";
-              documentRoot = "/data/webroot-foo";
-            }
-            { hostName = "bar";
-              documentRoot = "/data/webroot-bar";
-            }
-          ];
-          description = ''
-            Specification of the virtual hosts served by Apache.  Each
-            element should be an attribute set specifying the
-            configuration of the virtual host.  The available options
-            are the non-global options permissible for the main host.
-          '';
-        };
-
-        subservices = {
-
-          # !!! remove this
-          subversion = {
-
-            enable = mkOption {
-              default = false;
-              description = "
-                Whether to enable the Subversion subservice in the webserver.
-              ";
-            };
-
-            notificationSender = mkOption {
-              default = "svn-server@example.org";
-              example = "svn-server@example.org";
-              description = "
-                The email address used in the Sender field of commit
-                notification messages sent by the Subversion subservice.
-              ";
-            };
-
-            userCreationDomain = mkOption {
-              default = "example.org"; 
-              example = "example.org";
-              description = "
-                The domain from which user creation is allowed.  A client can
-                only create a new user account if its IP address resolves to
-                this domain.
-              ";
-            };
-
-            autoVersioning = mkOption {
-              default = false;
-              description = "
-                Whether you want the Subversion subservice to support
-                auto-versioning, which enables Subversion repositories to be
-                mounted as read/writable file systems on operating systems that
-                support WebDAV.
-              ";
-            };
-            
-            dataDir = mkOption {
-              default = "/no/such/path/exists";
-              description = "
-                Place to put SVN repository.
-              ";
-            };
-
-            organization = {
-
-              name = mkOption {
-                default = null;
-                description = "
-                  Name of the organization hosting the Subversion service.
-                ";
-              };
-
-              url = mkOption {
-                default = null;
-                description = "
-                  URL of the website of the organization hosting the Subversion service.
-                ";
-              };
-
-              logo = mkOption {
-                default = null;
-                description = "
-                  Logo the organization hosting the Subversion service.
-                ";
-              };
-
-            };
-
-          };
-
-        };
-      } // # Include the options shared between the main server and virtual hosts.
-          (import ./per-server-options.nix {
-           inherit mkOption;
-           forMainServer = true;
-        });
-    };
-  };
+with pkgs.lib;
 
-
-###### implementation
+let
 
   mainCfg = config.services.httpd;
   
@@ -204,15 +10,13 @@ let
 
   httpd = pkgs.apacheHttpd;
 
-  inherit (pkgs.lib) addDefaultOptionValues optional concatMap concatMapStrings;
-
-
   getPort = cfg: if cfg.port != 0 then cfg.port else if cfg.enableSSL then 443 else 80;
 
-  extraModules = pkgs.lib.attrByPath ["extraModules"] [] mainCfg;
-  extraForeignModules = pkgs.lib.filter builtins.isAttrs extraModules;
-  extraApacheModules = pkgs.lib.filter (x: !(builtins.isAttrs x)) extraModules; # I'd prefer using builtins.isString here, but doesn't exist yet
+  extraModules = attrByPath ["extraModules"] [] mainCfg;
+  extraForeignModules = filter builtins.isAttrs extraModules;
+  extraApacheModules = filter (x: !(builtins.isAttrs x)) extraModules; # I'd prefer using builtins.isString here, but doesn't exist yet
 
+  
   makeServerInfo = cfg: {
     # Canonical name must not include a trailing slash.
     canonicalName =
@@ -231,7 +35,7 @@ let
 
 
   vhostOptions = import ./per-server-options.nix {
-    inherit (pkgs.lib) mkOption;
+    inherit mkOption;
     forMainServer = false;
   };
 
@@ -276,7 +80,7 @@ let
 
   mainSubservices = subservicesFor mainCfg;
 
-  allSubservices = mainSubservices ++ pkgs.lib.concatMap subservicesFor vhosts;
+  allSubservices = mainSubservices ++ concatMap subservicesFor vhosts;
 
 
   # !!! should be in lib
@@ -284,7 +88,7 @@ let
     pkgs.runCommand name {inherit text;} "ensureDir $out; echo -n \"$text\" > $out/$name";
 
 
-  enableSSL = pkgs.lib.any (vhost: vhost.enableSSL) allHosts;
+  enableSSL = any (vhost: vhost.enableSSL) allHosts;
   
 
   # Names of modules from ${httpd}/modules that we want to load.
@@ -484,7 +288,7 @@ let
 
     ${let
         ports = map getPort allHosts;
-        uniquePorts = pkgs.lib.uniqList {inputList = ports;};
+        uniquePorts = uniqList {inputList = ports;};
       in concatMapStrings (port: "Listen ${toString port}\n") uniquePorts
     }
 
@@ -540,7 +344,7 @@ let
     # Always enable virtual hosts; it doesn't seem to hurt.
     ${let
         ports = map getPort allHosts;
-        uniquePorts = pkgs.lib.uniqList {inputList = ports;};
+        uniquePorts = uniqList {inputList = ports;};
       in concatMapStrings (port: "NameVirtualHost *:${toString port}\n") uniquePorts
     }
 
@@ -558,28 +362,222 @@ let
 in
 
 
-mkIf config.services.httpd.enable {
-  require = [
-    options
-  ];
+{
+
+  ###### interface
+
+  options = {
+  
+    services.httpd = {
+      
+      enable = mkOption {
+        default = false;
+        description = "
+          Whether to enable the Apache httpd server.
+        ";
+      };
+
+      extraConfig = mkOption {
+        default = "";
+        description = "
+          These configuration lines will be passed verbatim to the apache config
+        ";
+      };
+
+      extraModules = mkOption {
+        default = [];
+        example = [ "proxy_connect" { name = "php5_module"; path = "${pkgs.php}/modules/libphp5.so"; } ];
+        description = ''
+          Specifies additional Apache modules.  These can be specified
+          as a string in the case of modules distributed with Apache,
+          or as an attribute set specifying the
+          <varname>name</varname> and <varname>path</varname> of the
+          module.
+        '';
+      };
+
+      logPerVirtualHost = mkOption {
+        default = false;
+        description = "
+          If enabled, each virtual host gets its own
+          <filename>access_log</filename> and
+          <filename>error_log</filename>, namely suffixed by the
+          <option>hostName</option> of the virtual host.
+        ";
+      };
+
+      user = mkOption {
+        default = "wwwrun";
+        description = "
+          User account under which httpd runs.  The account is created
+          automatically if it doesn't exist.
+        ";
+      };
+
+      group = mkOption {
+        default = "wwwrun";
+        description = "
+          Group under which httpd runs.  The account is created
+          automatically if it doesn't exist.
+        ";
+      };
+
+      logDir = mkOption {
+        default = "/var/log/httpd";
+        description = "
+          Directory for Apache's log files.  It is created automatically.
+        ";
+      };
+
+      stateDir = mkOption {
+        default = "/var/run/httpd";
+        description = "
+          Directory for Apache's transient runtime state (such as PID
+          files).  It is created automatically.  Note that the default,
+          <filename>/var/run/httpd</filename>, is deleted at boot time.
+        ";
+      };
+
+      mod_php = mkOption {
+        default = false;
+        description = "Whether to enable the PHP module.";
+      };
+
+      mod_jk = {
+        enable = mkOption {
+          default = false;
+          description = "Whether to enable the Apache Tomcat connector.";
+        };
+
+        applicationMappings = mkOption {
+          default = [];
+          description = "List of Java webapplications that should be mapped to the servlet container (Tomcat/JBoss)";
+        };
+      };
+
+      virtualHosts = mkOption {
+        default = [];
+        example = [
+          { hostName = "foo";
+            documentRoot = "/data/webroot-foo";
+          }
+          { hostName = "bar";
+            documentRoot = "/data/webroot-bar";
+          }
+        ];
+        description = ''
+          Specification of the virtual hosts served by Apache.  Each
+          element should be an attribute set specifying the
+          configuration of the virtual host.  The available options
+          are the non-global options permissible for the main host.
+        '';
+      };
+
+      subservices = {
+
+        # !!! remove this
+        subversion = {
+
+          enable = mkOption {
+            default = false;
+            description = "
+              Whether to enable the Subversion subservice in the webserver.
+            ";
+          };
+
+          notificationSender = mkOption {
+            default = "svn-server@example.org";
+            example = "svn-server@example.org";
+            description = "
+              The email address used in the Sender field of commit
+              notification messages sent by the Subversion subservice.
+            ";
+          };
+
+          userCreationDomain = mkOption {
+            default = "example.org"; 
+            example = "example.org";
+            description = "
+              The domain from which user creation is allowed.  A client can
+              only create a new user account if its IP address resolves to
+              this domain.
+            ";
+          };
+
+          autoVersioning = mkOption {
+            default = false;
+            description = "
+              Whether you want the Subversion subservice to support
+              auto-versioning, which enables Subversion repositories to be
+              mounted as read/writable file systems on operating systems that
+              support WebDAV.
+            ";
+          };
+
+          dataDir = mkOption {
+            default = "/no/such/path/exists";
+            description = "
+              Place to put SVN repository.
+            ";
+          };
+
+          organization = {
 
-  users = {
-    extraUsers = [
+            name = mkOption {
+              default = null;
+              description = "
+                Name of the organization hosting the Subversion service.
+              ";
+            };
+
+            url = mkOption {
+              default = null;
+              description = "
+                URL of the website of the organization hosting the Subversion service.
+              ";
+            };
+
+            logo = mkOption {
+              default = null;
+              description = "
+                Logo the organization hosting the Subversion service.
+              ";
+            };
+
+          };
+
+        };
+
+      };
+
+    }
+
+    # Include the options shared between the main server and virtual hosts.
+    // (import ./per-server-options.nix {
+      inherit mkOption;
+      forMainServer = true;
+    });
+
+  };
+
+
+  ###### implementation
+
+  config = mkIf config.services.httpd.enable {
+
+    users.extraUsers = singleton
       { name = mainCfg.user;
         description = "Apache httpd user";
-      }
-    ];
-    extraGroups = [
+      };
+
+    users.extraGroups = singleton
       { name = mainCfg.group;
-      }
-    ];
-  };
+      };
 
-  services = {
-    extraJobs = [{
-      name = "httpd";
+    environment.systemPackages = [httpd] ++ concatMap (svc: svc.extraPath) allSubservices;
 
-      extraPath = [httpd] ++ concatMap (svc: svc.extraPath) allSubservices;
+    jobs = singleton {
+      name = "httpd";
 
       # Statically verify the syntactic correctness of the generated
       # httpd.conf.  !!! this is impure!  It doesn't just check for
@@ -617,15 +615,16 @@ mkIf config.services.httpd.enable {
 
         ${
           let f = {name, value}: "env ${name}=${value}\n";
-          in concatMapStrings f (pkgs.lib.concatMap (svc: svc.globalEnvVars) allSubservices)
+          in concatMapStrings f (concatMap (svc: svc.globalEnvVars) allSubservices)
         }
 
-        env PATH=${pkgs.coreutils}/bin:${pkgs.gnugrep}/bin:${pkgs.lib.concatStringsSep ":" (pkgs.lib.concatMap (svc: svc.extraServerPath) allSubservices)}
+        env PATH=${pkgs.coreutils}/bin:${pkgs.gnugrep}/bin:${concatStringsSep ":" (concatMap (svc: svc.extraServerPath) allSubservices)}
 
         respawn ${httpd}/bin/httpd -f ${httpdConf} -DNO_DETACH
       '';
-
-    }];
+    };
+    
   };
+  
 }
 
diff --git a/modules/system/upstart/make-job.nix b/modules/system/upstart/make-job.nix
index 319e58a0a5c..aabc3ad2f5d 100644
--- a/modules/system/upstart/make-job.nix
+++ b/modules/system/upstart/make-job.nix
@@ -17,10 +17,6 @@
 //
 
 {
-  # Allow jobs to declare extra packages that should be added to the
-  # system path.
-  extraPath = if job ? extraPath then job.extraPath else [];
-
   # Allow jobs to declare user accounts that should be created.
   users = if job ? users then job.users else [];
   
diff --git a/modules/system/upstart/upstart.nix b/modules/system/upstart/upstart.nix
index e190c23523f..7ae1f4e206d 100644
--- a/modules/system/upstart/upstart.nix
+++ b/modules/system/upstart/upstart.nix
@@ -8,7 +8,7 @@ let
 
   inherit (pkgs.lib) mkOption mergeListOption;
   
-  jobs = map makeJob config.services.extraJobs;
+  jobs = map makeJob (config.jobs ++ config.services.extraJobs);
   
   # Create an etc/event.d directory containing symlinks to the
   # specified list of Upstart job files.
@@ -34,7 +34,7 @@ in
   
   options = {
   
-    services.extraJobs = mkOption {
+    jobs = mkOption {
       default = [];
       example =
         [ { name = "test-job";
@@ -50,7 +50,16 @@ in
       # should have some checks to verify the syntax
       merge = pkgs.lib.mergeListOption;
       description = ''
-        Additional Upstart jobs.
+        This option defines the system jobs started and managed by the
+        Upstart daemon.
+      '';
+    };
+
+    services.extraJobs = mkOption {
+      default = [];
+      merge = pkgs.lib.mergeListOption;
+      description = ''
+        Obsolete - don't use.
       '';
     };
 
@@ -78,9 +87,6 @@ in
         }
       ];
 
-    environment.extraPackages =
-      pkgs.lib.concatLists (map (job: job.extraPath) jobs);
-
     users.extraUsers =
       pkgs.lib.concatLists (map (job: job.users) jobs);
 
diff --git a/modules/tasks/kbd.nix b/modules/tasks/kbd.nix
index 08ce407fe3e..d744d942b57 100644
--- a/modules/tasks/kbd.nix
+++ b/modules/tasks/kbd.nix
@@ -2,12 +2,26 @@
 
 let
 
-###### interface
+  # think about where to put this chunk of code!
+  # required by other pieces as well
+  requiredTTYs = config.services.mingetty.ttys
+    ++ config.boot.extraTTYs
+    ++ [config.services.syslogd.tty];
+  ttyNumbers = requiredTTYs;
+  ttys = map (nr: "/dev/tty" + toString nr) ttyNumbers;
+  defaultLocale = config.i18n.defaultLocale;
+  consoleFont = config.i18n.consoleFont;
+  consoleKeyMap = config.i18n.consoleKeyMap;
 
-  # most options are defined in i18n.nix
+in
+
+{
+  ###### interface
 
   options = {
 
+    # most options are defined in i18n.nix
+
     boot.extraTTYs = pkgs.lib.mkOption {
       default = [];
       example = [8 9];
@@ -29,38 +43,21 @@ let
         FIXME: find a good description.
       ";
     };
-
-  };
-
   
-###### implementation
-
-  # think about where to put this chunk of code!
-  # required by other pieces as well
-  requiredTTYs = config.services.mingetty.ttys
-    ++ config.boot.extraTTYs
-    ++ [config.services.syslogd.tty];
-  ttyNumbers = requiredTTYs;
-  ttys = map (nr: "/dev/tty" + toString nr) ttyNumbers;
-  defaultLocale = config.i18n.defaultLocale;
-  consoleFont = config.i18n.consoleFont;
-  consoleKeyMap = config.i18n.consoleKeyMap;
+  };
 
-in
 
-{
-  require = [options];
+  ###### implementation
 
-  inherit requiredTTYs; # pass them to ./modules/tasks/tty-backgrounds.nix
+  config = {  
+  
+    inherit requiredTTYs; # pass it to ./modules/tasks/tty-backgrounds.nix
 
-  services = {
-    extraJobs = [{
+    environment.systemPackages = [pkgs.kbd];
+  
+    jobs = pkgs.lib.singleton {
       name = "kbd";
 
-      extraPath = [
-        pkgs.kbd
-      ];
-      
       job = ''
         description "Keyboard / console initialisation"
 
@@ -74,7 +71,7 @@ in
 
           set +e # continue in case of errors
 
-          
+
           # Enable or disable UTF-8 mode.  This is based on
           # unicode_{start,stop}.
           echo 'Enabling or disabling Unicode mode...'
@@ -122,8 +119,8 @@ in
 
         end script
       '';
-    
-    }];
+    };
+
   };
 
 }
-- 
GitLab


From 9d1e31117f8060d28ff6d21283d6d56d5aca63e9 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 15 Jul 2009 11:34:55 +0000
Subject: [PATCH 1654/5331] * Get rid of the "users" and "groups" fields in
 jobs.

svn path=/nixos/branches/modular-nixos/; revision=16371
---
 modules/services/networking/ntpd.nix | 99 ++++++++++++++--------------
 modules/services/system/nscd.nix     | 69 +++++++++----------
 modules/system/upstart/make-job.nix  | 12 ----
 modules/system/upstart/upstart.nix   |  6 --
 4 files changed, 85 insertions(+), 101 deletions(-)

diff --git a/modules/services/networking/ntpd.nix b/modules/services/networking/ntpd.nix
index c8063092a95..e4b3432abd9 100644
--- a/modules/services/networking/ntpd.nix
+++ b/modules/services/networking/ntpd.nix
@@ -1,42 +1,10 @@
 {pkgs, config, ...}:
 
-###### interface
 let
-  inherit (pkgs.lib) mkOption mkIf;
 
-  options = {
-    services = {
-      ntp = {
-
-        enable = mkOption {
-          default = true;
-          description = "
-            Whether to synchronise your machine's time using the NTP
-            protocol.
-          ";
-        };
-
-        servers = mkOption {
-          default = [
-            "0.pool.ntp.org"
-            "1.pool.ntp.org"
-            "2.pool.ntp.org"
-          ];
-          description = "
-            The set of NTP servers from which to synchronise.
-          ";
-        };
-
-      };
-    };
-  };
-in
+  inherit (pkgs.lib) mkOption mkIf singleton;
 
-###### implementation
-
-let
-
-  inherit (pkgs) writeText ntp;
+  inherit (pkgs) ntp;
 
   stateDir = "/var/lib/ntp";
 
@@ -46,7 +14,7 @@ let
 
   modprobe = config.system.sbin.modprobe;
 
-  configFile = writeText "ntp.conf" ''
+  configFile = pkgs.writeText "ntp.conf" ''
     driftfile ${stateDir}/ntp.drift
     # Keep the drift file in ${stateDir}/ntp.drift.  However, since we
     # chroot to ${stateDir}, we have to specify it as /ntp.drift.
@@ -59,25 +27,53 @@ let
 
 in
 
+{
+
+  ###### interface
+  
+  options = {
+  
+    services.ntp = {
+
+      enable = mkOption {
+        default = true;
+        description = ''
+          Whether to synchronise your machine's time using the NTP
+          protocol.
+        '';
+      };
+
+      servers = mkOption {
+        default = [
+          "0.pool.ntp.org"
+          "1.pool.ntp.org"
+          "2.pool.ntp.org"
+        ];
+        description = ''
+          The set of NTP servers from which to synchronise.
+        '';
+      };
+
+    };
+
+  };
+
+
+  ###### implementation
 
-mkIf config.services.ntp.enable {
-  require = [
-    options
-  ];
+  config = mkIf config.services.ntp.enable {
+  
+    users.extraUsers = singleton
+      { name = ntpUser;
+        uid = config.ids.uids.ntp;
+        description = "NTP daemon user";
+        home = stateDir;
+      };
 
-  services = {
-    extraJobs = [{
+    jobs = singleton {
 
       name = "ntpd";
       
-      users = [
-        { name = ntpUser;
-          uid = config.ids.uids.ntp;
-          description = "NTP daemon user";
-          home = stateDir;
-        }
-      ];
-      
       job = ''
         description "NTP daemon"
 
@@ -104,6 +100,9 @@ mkIf config.services.ntp.enable {
 
         respawn ${ntp}/bin/ntpd -g -n ${ntpFlags}
       '';
-    }];
+
+    };
+    
   };
+  
 }
diff --git a/modules/services/system/nscd.nix b/modules/services/system/nscd.nix
index da1e5bec2bc..63fa36b9422 100644
--- a/modules/services/system/nscd.nix
+++ b/modules/services/system/nscd.nix
@@ -1,44 +1,47 @@
 {pkgs, config, ...}:
 
-###### implementation
-
 let
+
   nssModulesPath = config.system.nssModules.path;
+
+  inherit (pkgs.lib) singleton;
+  
 in
 
 {
-  services = {
-    extraJobs = [{
-        name = "nscd";
-        
-        users = [
-          { name = "nscd";
-            uid = config.ids.uids.nscd;
-            description = "Name service cache daemon user";
-          }
-        ];
+  config = {
+  
+    users.extraUsers = singleton
+      { name = "nscd";
+        uid = config.ids.uids.nscd;
+        description = "Name service cache daemon user";
+      };
+
+    jobs = singleton {
+      name = "nscd";
         
-        job = ''
-      description \"Name Service Cache Daemon\"
-      
-      start on startup
-      stop on shutdown
-      
-      env LD_LIBRARY_PATH=${nssModulesPath}
-      
-      start script
-      
-          mkdir -m 0755 -p /var/run/nscd
-          mkdir -m 0755 -p /var/db/nscd
-      
-          rm -f /var/db/nscd/* # for testing
-          
-      end script
-      
-      # !!! -d turns on debug info which probably makes nscd slower
-      # 2>/dev/null is to make it shut up
-      respawn ${pkgs.glibc}/sbin/nscd -f ${./nscd.conf} -d 2> /dev/null
+      job = ''
+        description \"Name Service Cache Daemon\"
+
+        start on startup
+        stop on shutdown
+
+        env LD_LIBRARY_PATH=${nssModulesPath}
+
+        start script
+
+            mkdir -m 0755 -p /var/run/nscd
+            mkdir -m 0755 -p /var/db/nscd
+
+            rm -f /var/db/nscd/* # for testing
+
+        end script
+
+        # !!! -d turns on debug info which probably makes nscd slower
+        # 2>/dev/null is to make it shut up
+        respawn ${pkgs.glibc}/sbin/nscd -f ${./nscd.conf} -d 2> /dev/null
       '';
-    }];
+    };
+
   };
 }
diff --git a/modules/system/upstart/make-job.nix b/modules/system/upstart/make-job.nix
index aabc3ad2f5d..b7ec71e999b 100644
--- a/modules/system/upstart/make-job.nix
+++ b/modules/system/upstart/make-job.nix
@@ -13,15 +13,3 @@
         "eval \"$buildHook\"; ensureDir $out/etc/event.d; echo \"$job\" > $out/etc/event.d/$jobName"
     )
 )
-
-//
-
-{
-  # Allow jobs to declare user accounts that should be created.
-  users = if job ? users then job.users else [];
-  
-  # Allow jobs to declare groups that should be created.
-  groups = if job ? groups then job.groups else [];
-
-  passthru = if job ? passthru then job.passthru else {};
-}
diff --git a/modules/system/upstart/upstart.nix b/modules/system/upstart/upstart.nix
index 7ae1f4e206d..ea45bb498fb 100644
--- a/modules/system/upstart/upstart.nix
+++ b/modules/system/upstart/upstart.nix
@@ -87,12 +87,6 @@ in
         }
       ];
 
-    users.extraUsers =
-      pkgs.lib.concatLists (map (job: job.users) jobs);
-
-    users.extraGroups =
-      pkgs.lib.concatLists (map (job: job.groups) jobs);
-
     services.extraJobs =
       [ # For the built-in logd job.
         { jobDrv = pkgs.upstart; }
-- 
GitLab


From 96fe3ba1b71ae8935f9c6f25b2e916433a9d5cc7 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 15 Jul 2009 11:38:17 +0000
Subject: [PATCH 1655/5331] * Inline make-job.nix.

svn path=/nixos/branches/modular-nixos/; revision=16372
---
 modules/system/upstart/make-job.nix | 15 ---------------
 modules/system/upstart/upstart.nix  | 23 +++++++++++++++++------
 2 files changed, 17 insertions(+), 21 deletions(-)
 delete mode 100644 modules/system/upstart/make-job.nix

diff --git a/modules/system/upstart/make-job.nix b/modules/system/upstart/make-job.nix
deleted file mode 100644
index b7ec71e999b..00000000000
--- a/modules/system/upstart/make-job.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-{runCommand}: job:
-
-(
-  if job ? jobDrv then
-    job.jobDrv
-  else
-    (
-      runCommand ("upstart-" + job.name)
-        { inherit (job) job;
-          jobName = job.name;
-          buildHook = if job ? buildHook then job.buildHook else "true";
-        }
-        "eval \"$buildHook\"; ensureDir $out/etc/event.d; echo \"$job\" > $out/etc/event.d/$jobName"
-    )
-)
diff --git a/modules/system/upstart/upstart.nix b/modules/system/upstart/upstart.nix
index ea45bb498fb..7801afdbb89 100644
--- a/modules/system/upstart/upstart.nix
+++ b/modules/system/upstart/upstart.nix
@@ -2,17 +2,28 @@
 
 let
 
-  makeJob = import ./make-job.nix {
-    inherit (pkgs) runCommand;
-  };
-
   inherit (pkgs.lib) mkOption mergeListOption;
   
+  makeJob = job:
+    if job ? jobDrv then
+      job.jobDrv
+    else
+      pkgs.runCommand ("upstart-" + job.name)
+        { inherit (job) job;
+          jobName = job.name;
+          buildHook = if job ? buildHook then job.buildHook else "true";
+        }
+        ''
+          eval "$buildHook"
+          ensureDir $out/etc/event.d
+          echo "$job" > $out/etc/event.d/$jobName
+        '';
+
   jobs = map makeJob (config.jobs ++ config.services.extraJobs);
   
   # Create an etc/event.d directory containing symlinks to the
   # specified list of Upstart job files.
-  command = pkgs.runCommand "upstart-jobs" {inherit jobs;}
+  jobsDir = pkgs.runCommand "upstart-jobs" {inherit jobs;}
     ''
       ensureDir $out/etc/event.d
       for i in $jobs; do
@@ -82,7 +93,7 @@ in
 
     environment.etc =
       [ { # The Upstart events defined above.
-          source = command + "/etc/event.d";
+          source = "${jobsDir}/etc/event.d";
           target = "event.d";
         }
       ];
-- 
GitLab


From 14243990025637ede3a608bd874b401be73ab860 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 15 Jul 2009 12:52:32 +0000
Subject: [PATCH 1656/5331] * Simplify.

svn path=/nixos/branches/modular-nixos/; revision=16373
---
 modules/system/upstart/upstart.nix | 33 ++++++++++++------------------
 1 file changed, 13 insertions(+), 20 deletions(-)

diff --git a/modules/system/upstart/upstart.nix b/modules/system/upstart/upstart.nix
index 7801afdbb89..2890ac97734 100644
--- a/modules/system/upstart/upstart.nix
+++ b/modules/system/upstart/upstart.nix
@@ -4,22 +4,20 @@ let
 
   inherit (pkgs.lib) mkOption mergeListOption;
   
-  makeJob = job:
-    if job ? jobDrv then
-      job.jobDrv
-    else
-      pkgs.runCommand ("upstart-" + job.name)
-        { inherit (job) job;
-          jobName = job.name;
-          buildHook = if job ? buildHook then job.buildHook else "true";
-        }
-        ''
-          eval "$buildHook"
-          ensureDir $out/etc/event.d
-          echo "$job" > $out/etc/event.d/$jobName
-        '';
+  makeJob =
+    {name, job, buildHook ? "true", passthru ? null}:
+    
+    pkgs.runCommand ("upstart-" + name)
+      { inherit buildHook job; }
+      ''
+        eval "$buildHook"
+        ensureDir $out/etc/event.d
+        echo "$job" > $out/etc/event.d/${name}
+      '';
 
-  jobs = map makeJob (config.jobs ++ config.services.extraJobs);
+  jobs =
+    [pkgs.upstart] # for the built-in logd job
+    ++ map makeJob (config.jobs ++ config.services.extraJobs);
   
   # Create an etc/event.d directory containing symlinks to the
   # specified list of Upstart job files.
@@ -98,11 +96,6 @@ in
         }
       ];
 
-    services.extraJobs =
-      [ # For the built-in logd job.
-        { jobDrv = pkgs.upstart; }
-      ];
-
     # see test/test-upstart-job.sh (!!! check whether this still works)
     tests.upstartJobs = { recurseForDerivations = true; } //
       builtins.listToAttrs (map (job:
-- 
GitLab


From f076849acd23648c91188e441ce4fe824d7451b6 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 15 Jul 2009 13:40:30 +0000
Subject: [PATCH 1657/5331] * Escape strings.

svn path=/nixos/branches/modular-nixos/; revision=16374
---
 doc/manual/options-to-docbook.xsl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/manual/options-to-docbook.xsl b/doc/manual/options-to-docbook.xsl
index 34a415ffc17..f269857a1c3 100644
--- a/doc/manual/options-to-docbook.xsl
+++ b/doc/manual/options-to-docbook.xsl
@@ -72,7 +72,7 @@
 
   <xsl:template match="string">
     <!-- !!! escaping -->
-    <xsl:text>"</xsl:text><xsl:value-of select="@value" /><xsl:text>"</xsl:text>
+    <xsl:text>"</xsl:text><xsl:value-of select="str:replace(str:replace(str:replace(@value, '\', '\\'), '&quot;', '\&quot;'), '&#010;', '\n')" /><xsl:text>"</xsl:text>
   </xsl:template>
   
   
-- 
GitLab


From 0e3bef4195804c07fc34c0395729bb530efdecdb Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 15 Jul 2009 13:41:00 +0000
Subject: [PATCH 1658/5331] * Declare the type of jobs.

svn path=/nixos/branches/modular-nixos/; revision=16375
---
 modules/system/upstart/upstart.nix | 55 ++++++++++++++++++++++--------
 modules/tasks/filesystems.nix      |  2 +-
 2 files changed, 42 insertions(+), 15 deletions(-)

diff --git a/modules/system/upstart/upstart.nix b/modules/system/upstart/upstart.nix
index 2890ac97734..1c304233e84 100644
--- a/modules/system/upstart/upstart.nix
+++ b/modules/system/upstart/upstart.nix
@@ -2,7 +2,7 @@
 
 let
 
-  inherit (pkgs.lib) mkOption mergeListOption;
+  inherit (pkgs.lib) mkOption mergeListOption types;
   
   makeJob =
     {name, job, buildHook ? "true", passthru ? null}:
@@ -45,28 +45,55 @@ in
   
     jobs = mkOption {
       default = [];
-      example =
-        [ { name = "test-job";
-            job = ''
+      description = ''
+        This option defines the system jobs started and managed by the
+        Upstart daemon.
+      '';
+
+      type = types.list types.optionSet;
+
+      options = {
+
+        name = mkOption {
+          type = types.string;
+          example = "sshd";
+          description = ''
+            Name of the Upstart job.
+          '';
+        };
+
+        job = mkOption {
+          type = types.string;
+          example =
+            ''
               description "nc"
               start on started network-interfaces
               respawn
               env PATH=/var/run/current-system/sw/bin
               exec sh -c "echo 'hello world' | ${pkgs.netcat}/bin/nc -l -p 9000"
-             '';
-          }
-        ];
-      # should have some checks to verify the syntax
-      merge = pkgs.lib.mergeListOption;
-      description = ''
-        This option defines the system jobs started and managed by the
-        Upstart daemon.
-      '';
+            '';
+          description = ''
+            Contents of the Upstart job.
+          '';
+        };
+
+        buildHook = mkOption {
+          type = types.string;
+          default = "true";
+          description = ''
+            Command run while building the Upstart job.  Can be used
+            to perform simple regression tests (e.g., the Apache
+            Upstart job uses it to check the syntax of the generated
+            <filename>httpd.conf</filename>.
+          '';
+        };
+
+      };
+      
     };
 
     services.extraJobs = mkOption {
       default = [];
-      merge = pkgs.lib.mergeListOption;
       description = ''
         Obsolete - don't use.
       '';
diff --git a/modules/tasks/filesystems.nix b/modules/tasks/filesystems.nix
index 86ddd79b186..5002ff25295 100644
--- a/modules/tasks/filesystems.nix
+++ b/modules/tasks/filesystems.nix
@@ -42,7 +42,7 @@ let
       ";
       type = types.nullOr (types.list types.optionSet);
 
-      options =  {
+      options = {
 
         mountPoint = mkOption {
           example = "/mnt/usb";
-- 
GitLab


From c45cf3a28ee9dba02f37fe6c1ed84ace9dbdbadc Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 15 Jul 2009 15:24:11 +0000
Subject: [PATCH 1659/5331] * In the jobs attribute, support a more high-level
 way of specifying   jobs, e.g. (from the nscd job)

    { name = "nscd";

      description = "Name Service Cache Daemon";

      startOn = "startup";
      stopOn = "shutdown";

      environment = { LD_LIBRARY_PATH = nssModulesPath; };

      preStart =
        ''
          mkdir -m 0755 -p /var/run/nscd
          mkdir -m 0755 -p /var/db/nscd
        '';

      exec = "${pkgs.glibc}/sbin/nscd -f ${./nscd.conf} -d 2> /dev/null";
    };

  The Upstart job is generated from this.  The main goal is to provide
  some abstraction from the Upstart syntax.  For instance, this should
  make it easier to upgrade to newer versions of Upstart, to switch to
  an entirely different process management system (e.g. initng or
  launchd), or to test a job independantly from Upstart.  (However the
  startOn and stopOn attributes are tied to Upstart's event model.)

svn path=/nixos/branches/modular-nixos/; revision=16376
---
 modules/services/system/nscd.nix   |  31 ++++-----
 modules/system/upstart/upstart.nix | 102 +++++++++++++++++++++++++----
 2 files changed, 101 insertions(+), 32 deletions(-)

diff --git a/modules/services/system/nscd.nix b/modules/services/system/nscd.nix
index 63fa36b9422..11aa48720b2 100644
--- a/modules/services/system/nscd.nix
+++ b/modules/services/system/nscd.nix
@@ -17,31 +17,24 @@ in
         description = "Name service cache daemon user";
       };
 
-    jobs = singleton {
-      name = "nscd";
-        
-      job = ''
-        description \"Name Service Cache Daemon\"
-
-        start on startup
-        stop on shutdown
+    jobs = singleton
+      { name = "nscd";
 
-        env LD_LIBRARY_PATH=${nssModulesPath}
+        description = "Name Service Cache Daemon";
 
-        start script
+        startOn = "startup";
+        stopOn = "shutdown";
 
+        environment = { LD_LIBRARY_PATH = nssModulesPath; };
+        
+        preStart =
+          ''
             mkdir -m 0755 -p /var/run/nscd
             mkdir -m 0755 -p /var/db/nscd
+          '';
 
-            rm -f /var/db/nscd/* # for testing
-
-        end script
-
-        # !!! -d turns on debug info which probably makes nscd slower
-        # 2>/dev/null is to make it shut up
-        respawn ${pkgs.glibc}/sbin/nscd -f ${./nscd.conf} -d 2> /dev/null
-      '';
-    };
+        exec = "${pkgs.glibc}/sbin/nscd -f ${./nscd.conf} -d 2> /dev/null";
+      };
 
   };
 }
diff --git a/modules/system/upstart/upstart.nix b/modules/system/upstart/upstart.nix
index 1c304233e84..6933b71c027 100644
--- a/modules/system/upstart/upstart.nix
+++ b/modules/system/upstart/upstart.nix
@@ -1,20 +1,44 @@
 {config, pkgs, ...}:
 
-let
+with pkgs.lib;
 
-  inherit (pkgs.lib) mkOption mergeListOption types;
-  
-  makeJob =
-    {name, job, buildHook ? "true", passthru ? null}:
-    
-    pkgs.runCommand ("upstart-" + name)
-      { inherit buildHook job; }
-      ''
-        eval "$buildHook"
-        ensureDir $out/etc/event.d
-        echo "$job" > $out/etc/event.d/${name}
-      '';
+let
 
+  # From a job description, generate an Upstart job file.
+  makeJob = job@{buildHook ? "", ...}:
+
+    let
+
+      jobText = if job.job != "" then job.job else
+        ''
+          description "${job.description}"
+
+          ${if job.startOn != "" then "start on ${job.startOn}" else ""}
+          ${if job.stopOn != "" then "start on ${job.stopOn}" else ""}
+
+          ${concatMapStrings (n: "env ${n}=${getAttr n job.environment}\n") (attrNames job.environment)}
+          
+          ${if job.preStart != "" then ''
+            start script
+              ${job.preStart}
+            end script
+          '' else ""}
+          
+          ${if job.exec != "" then ''
+            exec ${job.exec}
+          '' else ""}
+        '';
+
+    in
+      pkgs.runCommand ("upstart-" + job.name)
+        { inherit buildHook; inherit jobText; }
+        ''
+          eval "$buildHook"
+          ensureDir $out/etc/event.d
+          echo "$jobText" > $out/etc/event.d/${job.name}
+        '';
+
+        
   jobs =
     [pkgs.upstart] # for the built-in logd job
     ++ map makeJob (config.jobs ++ config.services.extraJobs);
@@ -63,6 +87,7 @@ in
         };
 
         job = mkOption {
+          default = "";
           type = types.string;
           example =
             ''
@@ -88,6 +113,57 @@ in
           '';
         };
 
+        description = mkOption {
+          type = types.string;
+          default = "(no description given)";
+          description = ''
+            A short description of this job.
+          '';
+        };
+
+        startOn = mkOption {
+          type = types.string;
+          default = "";
+          description = ''
+            The Upstart event that triggers this job to be started.
+            If empty, the job will not start automatically.
+          '';
+        };
+
+        stopOn = mkOption {
+          type = types.string;
+          default = "";
+          description = ''
+            The Upstart event that triggers this job to be stopped.
+          '';
+        };
+
+        preStart = mkOption {
+          type = types.string;
+          default = "";
+          description = ''
+            Shell commands executed before the job is started
+            (i.e. before the <varname>exec</varname> command is run).
+          '';
+        };
+
+        exec = mkOption {
+          type = types.string;
+          default = "";
+          description = ''
+            Command to start the job.
+          '';
+        };
+
+        environment = mkOption {
+          type = types.attrs;
+          default = {};
+          example = { PATH = "/foo/bar/bin"; LANG = "nl_NL.UTF-8"; };
+          description = ''
+            Environment variables passed to the job's processes.
+          '';
+        };
+
       };
       
     };
-- 
GitLab


From 889311f4cadc168783d13046f949fff1566c8d59 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 15 Jul 2009 15:53:39 +0000
Subject: [PATCH 1660/5331] * Refactored the sshd module.

svn path=/nixos/branches/modular-nixos/; revision=16377
---
 modules/services/networking/ssh/sshd.nix | 196 ++++++++++++-----------
 modules/system/upstart/upstart.nix       |  11 ++
 2 files changed, 110 insertions(+), 97 deletions(-)

diff --git a/modules/services/networking/ssh/sshd.nix b/modules/services/networking/ssh/sshd.nix
index e2bda953d72..88d8e5b0c29 100644
--- a/modules/services/networking/ssh/sshd.nix
+++ b/modules/services/networking/ssh/sshd.nix
@@ -1,60 +1,9 @@
 {pkgs, config, ...}:
 
-###### interface
 let
-  inherit (pkgs.lib) mkOption mkIf;
 
-  options = {
-    services = {
-      sshd = {
-
-        enable = mkOption {
-          default = false;
-          description = "
-            Whether to enable the Secure Shell daemon, which allows secure
-            remote logins.
-          ";
-        };
-
-        forwardX11 = mkOption {
-          default = true;
-          description = "
-            Whether to enable sshd to forward X11 connections.
-          ";
-        };
-
-        allowSFTP = mkOption {
-          default = true;
-          description = "
-            Whether to enable the SFTP subsystem in the SSH daemon.  This
-            enables the use of commands such as <command>sftp</command> and
-            <command>sshfs</command>.
-          ";
-        };
-
-        permitRootLogin = mkOption {
-          default = "yes";
-          description = "
-            Whether the root user can login using ssh. Valid options
-            are <command>yes</command>, <command>without-password</command>,
-            <command>forced-commands-only</command> or
-            <command>no</command>
-          ";
-        };
-
-        gatewayPorts = mkOption {
-          default = "no";
-          description = "
-             Specifies whether remote hosts are allowed to connect to ports forwarded for the client. See man sshd_conf.
-            ";
-          };
-      };
-    };
-  };
-
-###### implementation
-
-  inherit (pkgs) writeText openssh;
+  inherit (pkgs.lib) mkOption mkIf;
+  inherit (pkgs) openssh;
 
   cfg = (config.services.sshd);
 
@@ -62,28 +11,27 @@ let
 
   nssModulesPath = config.system.nssModules.path;
 
-  sshdConfig = writeText "sshd_config" ''
-
-    Protocol 2
-    
-    UsePAM yes
-    
-    ${if cfg.forwardX11 then "
-      X11Forwarding yes
-      XAuthLocation ${pkgs.xlibs.xauth}/bin/xauth
-    " else "
-      X11Forwarding no
-    "}
-
-    ${if cfg.allowSFTP then "
-      Subsystem sftp ${openssh}/libexec/sftp-server
-    " else "
-    "}
-    
-    PermitRootLogin ${cfg.permitRootLogin}
-    GatewayPorts ${cfg.gatewayPorts}
-    
-  '';
+  sshdConfig = pkgs.writeText "sshd_config"
+    ''
+      Protocol 2
+
+      UsePAM yes
+
+      ${if cfg.forwardX11 then "
+        X11Forwarding yes
+        XAuthLocation ${pkgs.xlibs.xauth}/bin/xauth
+      " else "
+        X11Forwarding no
+      "}
+
+      ${if cfg.allowSFTP then "
+        Subsystem sftp ${openssh}/libexec/sftp-server
+      " else "
+      "}
+
+      PermitRootLogin ${cfg.permitRootLogin}
+      GatewayPorts ${cfg.gatewayPorts}
+    '';
 
   # !!! is this assertion evaluated anywhere???
   assertion = cfg.permitRootLogin == "yes" ||
@@ -93,44 +41,98 @@ let
 
 in
 
+{
 
-mkIf config.services.sshd.enable {
-  require = [
-    options
-  ];
+  ###### interface
+  
+  options = {
+  
+    services.sshd = {
+
+      enable = mkOption {
+        default = false;
+        description = ''
+          Whether to enable the Secure Shell daemon, which allows secure
+          remote logins.
+        '';
+      };
+
+      forwardX11 = mkOption {
+        default = true;
+        description = ''
+          Whether to allow X11 connections to be forwarded.
+        '';
+      };
+
+      allowSFTP = mkOption {
+        default = true;
+        description = ''
+          Whether to enable the SFTP subsystem in the SSH daemon.  This
+          enables the use of commands such as <command>sftp</command> and
+          <command>sshfs</command>.
+        '';
+      };
 
-  users = {
-    extraUsers = [
+      permitRootLogin = mkOption {
+        default = "yes";
+        description = ''
+          Whether the root user can login using ssh. Valid values are
+          <literal>yes</literal>, <literal>without-password</literal>,
+          <literal>forced-commands-only</literal> or
+          <literal>no</literal>.
+        '';
+      };
+
+      gatewayPorts = mkOption {
+        default = "no";
+        description = ''
+          Specifies whether remote hosts are allowed to connect to
+          ports forwarded for the client.  See
+          <citerefentry><refentrytitle>sshd_config</refentrytitle>
+          <manvolnum>5</manvolnum></citerefentry>.
+        '';
+      };
+      
+    };
+
+  };
+
+
+  ###### implementation
+
+  config = mkIf config.services.sshd.enable {
+
+    users.extraUsers = pkgs.lib.singleton
       { name = "sshd";
         uid = config.ids.uids.sshd;
         description = "SSH privilege separation user";
         home = "/var/empty";
-      }
-    ];
-  };
+      };
 
-  services = {
-    extraJobs = [{
-      name = "sshd";
+    jobs = pkgs.lib.singleton
+      { name = "sshd";
 
-      job = ''
-        description "SSH server"
+        description = "OpenSSH server";
 
-        start on network-interfaces/started
-        stop on network-interfaces/stop
+        startOn = "network-interfaces/started";
+        stopOn = "network-interfaces/stop";
 
-        env LD_LIBRARY_PATH=${nssModulesPath}
+        environment = { LD_LIBRARY_PATH = nssModulesPath; };
 
-        start script
+        preStart =
+          ''
             mkdir -m 0755 -p /etc/ssh
 
             if ! test -f /etc/ssh/ssh_host_dsa_key; then
                 ${openssh}/bin/ssh-keygen -t dsa -b 1024 -f /etc/ssh/ssh_host_dsa_key -N ""
             fi
-        end script
+          '';
+
+        exec = "${openssh}/sbin/sshd -D -h /etc/ssh/ssh_host_dsa_key -f ${sshdConfig}";
+
+        respawn = true;
+      };
 
-        respawn ${openssh}/sbin/sshd -D -h /etc/ssh/ssh_host_dsa_key -f ${sshdConfig}
-      '';
-    }];
   };
+
 }
diff --git a/modules/system/upstart/upstart.nix b/modules/system/upstart/upstart.nix
index 6933b71c027..d7c9ecc489a 100644
--- a/modules/system/upstart/upstart.nix
+++ b/modules/system/upstart/upstart.nix
@@ -27,6 +27,8 @@ let
           ${if job.exec != "" then ''
             exec ${job.exec}
           '' else ""}
+
+          ${if job.respawn then "respawn" else ""}
         '';
 
     in
@@ -155,6 +157,15 @@ in
           '';
         };
 
+        respawn = mkOption {
+          type = types.bool;
+          default = true;
+          description = ''
+            Whether to restart the job automatically if its process
+            ends unexpectedly.
+          '';
+        };
+
         environment = mkOption {
           type = types.attrs;
           default = {};
-- 
GitLab


From a7f24fd4bb6574fcc27132e3df6c26063fb399e9 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Thu, 16 Jul 2009 09:22:40 +0000
Subject: [PATCH 1661/5331] Trying to build a good rescue CD..

svn path=/nixos/branches/modular-nixos/; revision=16385
---
 .../installer/cd-dvd/installation-cd-base.nix |  2 +-
 .../cd-dvd/installation-cd-rescue.nix         | 39 +++++++++++++++++++
 release.nix                                   |  5 +++
 3 files changed, 45 insertions(+), 1 deletion(-)
 create mode 100644 modules/installer/cd-dvd/installation-cd-rescue.nix

diff --git a/modules/installer/cd-dvd/installation-cd-base.nix b/modules/installer/cd-dvd/installation-cd-base.nix
index dc84fa3e8cb..83fd1423ef1 100644
--- a/modules/installer/cd-dvd/installation-cd-base.nix
+++ b/modules/installer/cd-dvd/installation-cd-base.nix
@@ -71,7 +71,7 @@ in
     [ options
       ./iso-image.nix
       ./memtest.nix
-      ../../../hardware/network/intel-3945abg.nix
+      ../../hardware/network/intel-3945abg.nix
     ];
 
   # ISO naming.
diff --git a/modules/installer/cd-dvd/installation-cd-rescue.nix b/modules/installer/cd-dvd/installation-cd-rescue.nix
new file mode 100644
index 00000000000..97965c06d5b
--- /dev/null
+++ b/modules/installer/cd-dvd/installation-cd-rescue.nix
@@ -0,0 +1,39 @@
+# This module defines a small NixOS installation CD.  It does not
+# contain any graphical stuff.
+
+{config, pkgs, ...}:
+
+{
+  require = [./installation-cd-base.nix];
+
+  installer.configModule = "./nixos/modules/installer/cd-dvd/installation-cd-minimal.nix";
+
+  # Don't include X libraries.
+  services.sshd.forwardX11 = false;
+  services.dbus.enable = false; # depends on libX11
+  services.hal.enable = false; # depends on dbus
+  fonts.enableFontConfig = false;
+  fonts.enableCoreFonts = false;
+
+  # Useful for rescue..
+  environment.systemPackages = with pkgs; [
+    utillinuxCurses ddrescue 
+    pciutils sdparm hdparm hddtemp usbutils
+    btrfsProgs xfsProgs jfsUtils jfsrec
+    wpa_supplicant iproute 
+    fuse ntfs3g smbfsFuse sshfsFuse
+    manpages irssi elinks mcabber mutt openssh lftp 
+    openssl ncat socat
+    gnupg gnupg2
+    patch which diffutils gcc binutils bc file
+    screen
+    bvi joe nvi 
+    subversion16 monotone git darcs mercurial bazaar cvs
+    unrar unzip zip lzma cabextract cpio 
+    lsof
+  ];
+
+  boot.kernelPackages = pkgs.kernelPackages_2_6_31_rc2_old_i686;
+
+  services.ttyBackgrounds.enable = false;
+}
diff --git a/release.nix b/release.nix
index ca0a101d796..69459a25895 100644
--- a/release.nix
+++ b/release.nix
@@ -83,6 +83,11 @@ let
       description = "minimal";
     };
     
+    iso_rescue = makeIso {
+      module = ./modules/installer/cd-dvd/installation-cd-rescue.nix;
+      description = "minimal";
+    };
+    
     iso_graphical = makeIso {
       module = ./modules/installer/cd-dvd/installation-cd-graphical.nix;
       description = "graphical";
-- 
GitLab


From e155a46516438b4c375afa9978eca6eb050c476d Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Thu, 16 Jul 2009 09:48:22 +0000
Subject: [PATCH 1662/5331] Forgot all-module fixes for the correct booting in
 rescue CD

svn path=/nixos/branches/modular-nixos/; revision=16386
---
 modules/installer/cd-dvd/installation-cd-rescue.nix | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/modules/installer/cd-dvd/installation-cd-rescue.nix b/modules/installer/cd-dvd/installation-cd-rescue.nix
index 97965c06d5b..ad5d520e311 100644
--- a/modules/installer/cd-dvd/installation-cd-rescue.nix
+++ b/modules/installer/cd-dvd/installation-cd-rescue.nix
@@ -34,6 +34,17 @@
   ];
 
   boot.kernelPackages = pkgs.kernelPackages_2_6_31_rc2_old_i686;
+  boot.initrd.extraKernelModules = ["evdev" "i8042" "pcips2" "serio"
+    "sd_mod" "libata" "unix" "usbhid" "uhci_hcd" "atkbd" "xtkbd" "fbdev"];
+  boot.kernelModules = ["fbcon" "radeonfb" "intelfb" "sisfb" "nvidiafb"
+    "cirrusfb"];
+  boot.kernelParams = [
+      "selinux=0"
+      "acpi=on"
+      "apm=off"
+      "console=tty1"
+      "splash=verbose"
+    ];
 
   services.ttyBackgrounds.enable = false;
 }
-- 
GitLab


From fac9d099419748d924ea5a613d56c8ffc61153b8 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Thu, 16 Jul 2009 10:06:53 +0000
Subject: [PATCH 1663/5331] Oops, forgot FS modules

svn path=/nixos/branches/modular-nixos/; revision=16387
---
 modules/installer/cd-dvd/installation-cd-rescue.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/modules/installer/cd-dvd/installation-cd-rescue.nix b/modules/installer/cd-dvd/installation-cd-rescue.nix
index ad5d520e311..95afb2a2431 100644
--- a/modules/installer/cd-dvd/installation-cd-rescue.nix
+++ b/modules/installer/cd-dvd/installation-cd-rescue.nix
@@ -35,7 +35,8 @@
 
   boot.kernelPackages = pkgs.kernelPackages_2_6_31_rc2_old_i686;
   boot.initrd.extraKernelModules = ["evdev" "i8042" "pcips2" "serio"
-    "sd_mod" "libata" "unix" "usbhid" "uhci_hcd" "atkbd" "xtkbd" "fbdev"];
+    "sd_mod" "libata" "unix" "usbhid" "uhci_hcd" "atkbd" "xtkbd" "fbdev"
+    "iso9660" "udf"];
   boot.kernelModules = ["fbcon" "radeonfb" "intelfb" "sisfb" "nvidiafb"
     "cirrusfb"];
   boot.kernelParams = [
-- 
GitLab


From 8f7b33c87d47691eaa8556db03d88776223dea00 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Thu, 16 Jul 2009 10:28:58 +0000
Subject: [PATCH 1664/5331] I thought squashfs would not require loop.ko

svn path=/nixos/branches/modular-nixos/; revision=16388
---
 modules/installer/cd-dvd/installation-cd-rescue.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/installer/cd-dvd/installation-cd-rescue.nix b/modules/installer/cd-dvd/installation-cd-rescue.nix
index 95afb2a2431..94ac6d9a03e 100644
--- a/modules/installer/cd-dvd/installation-cd-rescue.nix
+++ b/modules/installer/cd-dvd/installation-cd-rescue.nix
@@ -36,7 +36,7 @@
   boot.kernelPackages = pkgs.kernelPackages_2_6_31_rc2_old_i686;
   boot.initrd.extraKernelModules = ["evdev" "i8042" "pcips2" "serio"
     "sd_mod" "libata" "unix" "usbhid" "uhci_hcd" "atkbd" "xtkbd" "fbdev"
-    "iso9660" "udf"];
+    "iso9660" "udf" "loop"];
   boot.kernelModules = ["fbcon" "radeonfb" "intelfb" "sisfb" "nvidiafb"
     "cirrusfb"];
   boot.kernelParams = [
-- 
GitLab


From bb292fdf04c6daf77edb761dcc4b4d153e64af73 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 16 Jul 2009 13:46:49 +0000
Subject: [PATCH 1665/5331] * Support post-stop actions.

svn path=/nixos/branches/modular-nixos/; revision=16393
---
 modules/system/upstart/upstart.nix |  32 +++-
 modules/tasks/tty-backgrounds.nix  | 227 ++++++++++++++---------------
 2 files changed, 137 insertions(+), 122 deletions(-)

diff --git a/modules/system/upstart/upstart.nix b/modules/system/upstart/upstart.nix
index d7c9ecc489a..7dd6896c25a 100644
--- a/modules/system/upstart/upstart.nix
+++ b/modules/system/upstart/upstart.nix
@@ -24,11 +24,21 @@ let
             end script
           '' else ""}
           
-          ${if job.exec != "" then ''
-            exec ${job.exec}
-          '' else ""}
+          ${if true then
+            # Simulate jobs without a main process (which Upstart 0.3
+            # doesn't support) using a semi-infinite sleep.
+            ''
+              exec ${if job.exec != "" then job.exec else "sleep 1e100"}
+            ''
+            else ""}
 
           ${if job.respawn then "respawn" else ""}
+
+          ${if job.postStop != "" then ''
+            stop script
+              ${job.postStop}
+            end script
+          '' else ""}
         '';
 
     in
@@ -145,7 +155,16 @@ in
           default = "";
           description = ''
             Shell commands executed before the job is started
-            (i.e. before the <varname>exec</varname> command is run).
+            (i.e. before the job's main process is started).
+          '';
+        };
+
+        postStop = mkOption {
+          type = types.string;
+          default = "";
+          description = ''
+            Shell commands executed after the job has stopped
+            (i.e. after the job's main process has terminated).
           '';
         };
 
@@ -153,7 +172,10 @@ in
           type = types.string;
           default = "";
           description = ''
-            Command to start the job.
+            Command to start the job's main process.  If empty, the
+            job has no main process, but can still have pre/post-start
+            and pre/post-stop scripts, and is considered "running"
+            until it is stopped.
           '';
         };
 
diff --git a/modules/tasks/tty-backgrounds.nix b/modules/tasks/tty-backgrounds.nix
index 073ac90df2e..b83935827f7 100644
--- a/modules/tasks/tty-backgrounds.nix
+++ b/modules/tasks/tty-backgrounds.nix
@@ -1,75 +1,14 @@
 {pkgs, config, ...}:
 
-###### interface
-let
-  inherit (pkgs.lib) mkOption mkIf;
-
-  options = {
-    services = {
-      ttyBackgrounds = {
-
-        enable = mkOption {
-          default = true;
-          description = "
-            Whether to enable graphical backgrounds for the virtual consoles.
-          ";
-        };
-
-        defaultTheme = mkOption {
-          default = pkgs.fetchurl {
-            #url = http://www.bootsplash.de/files/themes/Theme-BabyTux.tar.bz2;
-            url = mirror://gentoo/distfiles/Theme-BabyTux.tar.bz2;
-            md5 = "a6d89d1c1cff3b6a08e2f526f2eab4e0";
-          };
-          description = "
-            The default theme for the virtual consoles.  Themes can be found
-            at <link xlink:href='http://www.bootsplash.de/' />.
-          ";
-        };
-
-        defaultSpecificThemes = mkOption {
-          default = [
-            /*
-            { tty = 6;
-              theme = pkgs.fetchurl { # Yeah!
-                url = mirror://gentoo/distfiles/Theme-Pativo.tar.bz2;
-                md5 = "9e13beaaadf88d43a5293e7ab757d569";
-              };
-            }
-            */
-            { tty = 10;
-              theme = pkgs.themes "theme-gnu";
-            }
-          ];
-          description = "
-            This option sets specific themes for virtual consoles.  If you
-            just want to set themes for additional consoles, use
-            <option>services.ttyBackgrounds.specificThemes</option>.
-          ";
-        };
-
-        specificThemes = mkOption {
-          default = [
-          ];
-          description = "
-            This option allows you to set specific themes for virtual
-            consoles.
-          ";
-        };
-      };
-    };
-  };
-in
-
-###### implementation
-
 let
+  inherit (pkgs.lib) mkOption mkIf singleton;
   inherit (pkgs) stdenv;
+  
   kernelPackages = config.boot.kernelPackages;
   splashutils = kernelPackages.splashutils;
   requiredTTYs = config.requiredTTYs;
-  backgrounds =
   
+  backgrounds =
     let
     
       specificThemes =
@@ -91,7 +30,6 @@ let
       }) defaultTTYs)
       ++ specificThemes;
 
-
   themesUnpacked = stdenv.mkDerivation {
     name = "splash-themes";
     builder = ./tty-backgrounds-combine.sh;
@@ -101,70 +39,125 @@ let
   };
 
   unpackTheme = theme: import ../../lib/unpack-theme.nix {
-      inherit stdenv theme;
-    };
+    inherit stdenv theme;
+  };
 
+in
 
+{
 
-in
+  ###### interface
+  
+  options = {
+  
+    services.ttyBackgrounds = {
 
-mkIf (config.services.ttyBackgrounds.enable) {
+      enable = mkOption {
+        default = true;
+        description = ''
+          Whether to enable graphical backgrounds for the virtual consoles.
+        '';
+      };
+
+      defaultTheme = mkOption {
+        default = pkgs.fetchurl {
+          #url = http://www.bootsplash.de/files/themes/Theme-BabyTux.tar.bz2;
+          url = mirror://gentoo/distfiles/Theme-BabyTux.tar.bz2;
+          md5 = "a6d89d1c1cff3b6a08e2f526f2eab4e0";
+        };
+        description = ''
+          The default theme for the virtual consoles.  Themes can be found
+          at <link xlink:href='http://www.bootsplash.de/' />.
+        '';
+      };
 
-  assertions = [ { assertion = kernelPackages.splashutils != null; message = "kernelPackages.splashutils may not be false"; } ];
+      defaultSpecificThemes = mkOption {
+        default = [
+          /*
+          { tty = 6;
+            theme = pkgs.fetchurl { # Yeah!
+              url = mirror://gentoo/distfiles/Theme-Pativo.tar.bz2;
+              md5 = "9e13beaaadf88d43a5293e7ab757d569";
+            };
+          }
+          */
+          { tty = 10;
+            theme = pkgs.themes "theme-gnu";
+          }
+        ];
+        description = ''
+          This option sets specific themes for virtual consoles.  If you
+          just want to set themes for additional consoles, use
+          <option>services.ttyBackgrounds.specificThemes</option>.
+        '';
+      };
 
-  require = [
-    options
-  ];
+      specificThemes = mkOption {
+        default = [
+        ];
+        description = ''
+          This option allows you to set specific themes for virtual
+          consoles.
+        '';
+      };
+      
+    };
+    
+  };
 
 
-  environment = {
-    etc = [
+  ###### implementation
+
+  config = mkIf config.services.ttyBackgrounds.enable {
+
+    assertions = singleton
+      { assertion = kernelPackages.splashutils != null;
+        message = "kernelPackages.splashutils may not be false";
+      };
+
+    environment.etc = singleton
       { source = themesUnpacked;
         target = "splash";
-      }
-    ];
-  };
-
+      };
 
-  services = {
-    extraJobs = [ rec {
+    jobs = singleton {
       name = "tty-backgrounds";
 
-      job = ''
-        start on udev
-
-        start script
-
-            # Critical: tell the kernel where to find splash_helper.  It calls
-            # this program every time we switch between consoles.
-            helperProcFile=${splashutils.helperProcFile}
-            if test -e /proc/sys/fbcondecor; then helperProcFile=/proc/sys/fbcondecor; fi
-            echo ${splashutils}/${splashutils.helperName} > $helperProcFile
-
-            # For each console...
-            for tty in ${toString (map (x: x.tty) backgrounds)}; do
-                # Make sure that the console exists.
-                echo -n "" > /dev/tty$tty 
-
-                # Set the theme as determined by tty-backgrounds-combine.sh
-                # above.
-                theme=$(readlink ${themesUnpacked}/$tty)
-                ${splashutils}/${splashutils.controlName} --tty $tty -c setcfg -t $theme || true
-                ${splashutils}/${splashutils.controlName} --tty $tty -c setpic -t $theme || true
-                ${splashutils}/${splashutils.controlName} --tty $tty -c on || true
-            done
-
-        end script
-
-        respawn sleep 10000 # !!! Hack
-
-        stop script
-            # Disable the theme on each console.
-            for tty in ${toString (map (x: x.tty) backgrounds)}; do
-                ${splashutils}/${splashutils.controlName} --tty $tty -c off || true
-            done
-        end script
-      '';
-    }];
+      startOn = "udev";
+
+      preStart =
+        ''
+          # Critical: tell the kernel where to find splash_helper.  It calls
+          # this program every time we switch between consoles.
+          helperProcFile=${splashutils.helperProcFile}
+          if test -e /proc/sys/fbcondecor; then helperProcFile=/proc/sys/fbcondecor; fi
+          echo ${splashutils}/${splashutils.helperName} > $helperProcFile
+
+          # For each console...
+          for tty in ${toString (map (x: x.tty) backgrounds)}; do
+              # Make sure that the console exists.
+              echo -n "" > /dev/tty$tty 
+
+              # Set the theme as determined by tty-backgrounds-combine.sh
+              # above.
+              theme=$(readlink ${themesUnpacked}/$tty)
+              ${splashutils}/${splashutils.controlName} --tty $tty -c setcfg -t $theme || true
+              ${splashutils}/${splashutils.controlName} --tty $tty -c setpic -t $theme || true
+              ${splashutils}/${splashutils.controlName} --tty $tty -c on || true
+          done
+        '';
+
+      postStop =
+        ''
+          /var/run/current-system/sw/bin/ps -axuw > /tmp/ps
+        
+          # Disable the theme on each console.
+          for tty in ${toString (map (x: x.tty) backgrounds)}; do
+              ${splashutils}/${splashutils.controlName} --tty $tty -c off || true
+          done
+        '';
+    };
+    
   };
+  
 }
-- 
GitLab


From 7cb4503ad63e5376abad54d3479649a232df3ef2 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 16 Jul 2009 13:55:11 +0000
Subject: [PATCH 1666/5331] * More Upstart refactoring.

svn path=/nixos/branches/modular-nixos/; revision=16394
---
 modules/services/networking/ssh/sshd.nix |   2 -
 modules/services/ttys/mingetty.nix       | 125 +++++++++++------------
 modules/system/upstart/upstart.nix       |   2 +-
 3 files changed, 63 insertions(+), 66 deletions(-)

diff --git a/modules/services/networking/ssh/sshd.nix b/modules/services/networking/ssh/sshd.nix
index 88d8e5b0c29..154f5ab17c8 100644
--- a/modules/services/networking/ssh/sshd.nix
+++ b/modules/services/networking/ssh/sshd.nix
@@ -129,8 +129,6 @@ in
           '';
 
         exec = "${openssh}/sbin/sshd -D -h /etc/ssh/ssh_host_dsa_key -f ${sshdConfig}";
-
-        respawn = true;
       };
 
   };
diff --git a/modules/services/ttys/mingetty.nix b/modules/services/ttys/mingetty.nix
index abca6a9784b..cab206ec2fe 100644
--- a/modules/services/ttys/mingetty.nix
+++ b/modules/services/ttys/mingetty.nix
@@ -1,77 +1,75 @@
 {pkgs, config, ...}:
 
-###### interface
 let
-  inherit (pkgs.lib) mkOption mkIf;
+
+  inherit (pkgs.lib) mkOption mkIf singleton;
+  
+in
+
+{
+
+  ###### interface
 
   options = {
-    services = {
-      mingetty = {
-
-        ttys = mkOption {
-          default = [1 2 3 4 5 6];
-          description = "
-            The list of tty (virtual console) devices on which to start a
-            login prompt.
-          ";
-        };
-
-        waitOnMounts = mkOption {
-          default = false;
-          description = "
-            Whether the login prompts on the virtual consoles will be
-            started before or after all file systems have been mounted.  By
-            default we don't wait, but if for example your /home is on a
-            separate partition, you may want to turn this on.
-          ";
-        };
-
-        greetingLine = mkOption {
-          default = ''<<< Welcome to NixOS (\m) - Kernel \r (\l) >>>'';
-          description = "
-            Welcome line printed by mingetty.
-          ";
-        };
-
-        helpLine = mkOption {
-          default = "";
-          description = "
-            Help line printed by mingetty below the welcome line.
-            Used by the installation CD to give some hints on
-            how to proceed.
-          ";
-        };
+  
+    services.mingetty = {
+
+      ttys = mkOption {
+        default = [1 2 3 4 5 6];
+        description = ''
+          The list of tty (virtual console) devices on which to start a
+          login prompt.
+        '';
+      };
+
+      waitOnMounts = mkOption {
+        default = false;
+        description = ''
+          Whether the login prompts on the virtual consoles will be
+          started before or after all file systems have been mounted.  By
+          default we don't wait, but if for example your /home is on a
+          separate partition, you may want to turn this on.
+        '';
+      };
+
+      greetingLine = mkOption {
+        default = ''<<< Welcome to NixOS (\m) - Kernel \r (\l) >>>'';
+        description = ''
+          Welcome line printed by mingetty.
+        '';
+      };
 
+      helpLine = mkOption {
+        default = "";
+        description = ''
+          Help line printed by mingetty below the welcome line.
+          Used by the installation CD to give some hints on
+          how to proceed.
+        '';
       };
+
     };
+    
   };
-in
 
-###### implementation
 
-let
-  ttyNumbers = config.services.mingetty.ttys;
-  loginProgram = "${pkgs.pam_login}/bin/login";
-  inherit (pkgs) mingetty;
+  ###### implementation
+
+  config = {
+
+    # Generate a separate job for each tty.  
+    jobs = map (ttyNumber: {
     
-in
+      name = "tty${toString ttyNumber}";
 
-{
-  require = [
-    options
-  ];
-
-  services.extraJobs = map (ttyNumber : {
-    name = "tty" + toString ttyNumber;
-    job = ''
-      start on udev
-      stop on shutdown
-      respawn ${mingetty}/sbin/mingetty --loginprog=${loginProgram} --noclear tty${toString ttyNumber}
-    '';
-  }) ttyNumbers;
-
-  environment.etc =
-    [ { # Friendly greeting on the virtual consoles.
+      startOn = "udev";
+
+      exec = "${pkgs.mingetty}/sbin/mingetty --loginprog=${pkgs.pam_login}/bin/login --noclear tty${toString ttyNumber}";
+      
+    }) config.services.mingetty.ttys;
+
+    environment.etc = singleton
+      { # Friendly greeting on the virtual consoles.
         source = pkgs.writeText "issue" ''
       
           ${config.services.mingetty.greetingLine}
@@ -79,6 +77,7 @@ in
         
         '';
         target = "issue";
-      }
-    ];
+      };
+  };
+  
 }
diff --git a/modules/system/upstart/upstart.nix b/modules/system/upstart/upstart.nix
index 7dd6896c25a..1461320c001 100644
--- a/modules/system/upstart/upstart.nix
+++ b/modules/system/upstart/upstart.nix
@@ -144,7 +144,7 @@ in
 
         stopOn = mkOption {
           type = types.string;
-          default = "";
+          default = "shutdown";
           description = ''
             The Upstart event that triggers this job to be stopped.
           '';
-- 
GitLab


From 6119c399d864739674d2568abd943a41ca09788c Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 16 Jul 2009 14:51:49 +0000
Subject: [PATCH 1667/5331] * Support tasks in the new Upstart formalism. *
 Swap task: fixed removing disabled swap devices. * Swap task: specified the
 type of swapDevices.

svn path=/nixos/branches/modular-nixos/; revision=16396
---
 modules/services/misc/nix-daemon.nix |  17 ++--
 modules/system/upstart/upstart.nix   |  65 +++++++++++---
 modules/tasks/swap.nix               | 126 ++++++++++++++++-----------
 3 files changed, 133 insertions(+), 75 deletions(-)

diff --git a/modules/services/misc/nix-daemon.nix b/modules/services/misc/nix-daemon.nix
index ee8d67f7471..b8911a8cea3 100644
--- a/modules/services/misc/nix-daemon.nix
+++ b/modules/services/misc/nix-daemon.nix
@@ -236,21 +236,18 @@ in
         target = "nix.machines";
       };
 
-  services.extraJobs = [
+  jobs = pkgs.lib.singleton
     { name = "nix-daemon";
 
-      job = ''
-        start on startup
-        stop on shutdown
-        respawn
-        script
+      startOn = "startup";
+
+      script =
+        ''
           export PATH=${if config.nix.distributedBuilds then "${pkgs.openssh}/bin:" else ""}${pkgs.openssl}/bin:${nix}/bin:$PATH
           ${config.nix.envVars}
           exec ${nix}/bin/nix-worker --daemon > /dev/null 2>&1
-        end script
-      '';
-    }
-  ];
+        '';
+    };
 
   environment.shellInit =
     ''
diff --git a/modules/system/upstart/upstart.nix b/modules/system/upstart/upstart.nix
index 1461320c001..7c9253b23f0 100644
--- a/modules/system/upstart/upstart.nix
+++ b/modules/system/upstart/upstart.nix
@@ -11,10 +11,19 @@ let
 
       jobText = if job.job != "" then job.job else
         ''
+          # Upstart job `${job.name}'.  This is a generated file.  Do not edit.
+        
           description "${job.description}"
 
-          ${if job.startOn != "" then "start on ${job.startOn}" else ""}
-          ${if job.stopOn != "" then "start on ${job.stopOn}" else ""}
+          ${if isList job.startOn then
+              # This is a hack to support or-dependencies on Upstart 0.3.
+              concatMapStrings (x: "start on ${x}\n") job.startOn
+            else if job.startOn != "" then
+              "start on ${job.startOn}"
+            else ""
+          }
+          
+          ${if job.stopOn != "" then "stop on ${job.stopOn}" else ""}
 
           ${concatMapStrings (n: "env ${n}=${getAttr n job.environment}\n") (attrNames job.environment)}
           
@@ -24,15 +33,27 @@ let
             end script
           '' else ""}
           
-          ${if true then
-            # Simulate jobs without a main process (which Upstart 0.3
-            # doesn't support) using a semi-infinite sleep.
-            ''
-              exec ${if job.exec != "" then job.exec else "sleep 1e100"}
-            ''
-            else ""}
-
-          ${if job.respawn then "respawn" else ""}
+          ${if job.script != "" && job.exec != "" then
+              abort "Job ${job.name} has both a `script' and `exec' attribute."
+            else if job.script != "" then
+              ''
+                script
+                  ${job.script}
+                end script
+              ''
+            else if job.exec != "" then
+              ''
+                exec ${job.exec}
+              ''
+            else
+              # Simulate jobs without a main process (which Upstart 0.3
+              # doesn't support) using a semi-infinite sleep.
+              ''
+                exec sleep 1e100
+              ''
+          }
+
+          ${if job.respawn && !job.task then "respawn" else ""}
 
           ${if job.postStop != "" then ''
             stop script
@@ -134,7 +155,8 @@ in
         };
 
         startOn = mkOption {
-          type = types.string;
+          # !!! Re-enable this once we're on Upstart >= 0.6.
+          #type = types.string; 
           default = "";
           description = ''
             The Upstart event that triggers this job to be started.
@@ -179,6 +201,15 @@ in
           '';
         };
 
+        script = mkOption {
+          type = types.string;
+          default = "";
+          description = ''
+            Shell commands executed as the job's main process.  Can be
+            specified instead of the <varname>exec</varname> attribute.
+          '';
+        };
+
         respawn = mkOption {
           type = types.bool;
           default = true;
@@ -188,6 +219,16 @@ in
           '';
         };
 
+        task = mkOption {
+          type = types.bool;
+          default = false;
+          description = ''
+            Whether this job is a task rather than a service.  Tasks
+            are executed only once, while services are restarted when
+            they exit.
+          '';
+        };
+
         environment = mkOption {
           type = types.attrs;
           default = {};
diff --git a/modules/tasks/swap.nix b/modules/tasks/swap.nix
index 173b933d992..0f1a726ab29 100644
--- a/modules/tasks/swap.nix
+++ b/modules/tasks/swap.nix
@@ -2,18 +2,27 @@
 
 let
 
-###### interface
+  inherit (pkgs) utillinux;
+  inherit (pkgs.lib) mkOption filter types;
 
+  toPath = x: if x.device != null then x.device else "/dev/disk/by-label/${x.label}";
+  
+in
+
+{
+
+  ###### interface
+  
   options = {
 
-    swapDevices = pkgs.lib.mkOption {
+    swapDevices = mkOption {
       default = [];
       example = [
         { device = "/dev/hda7"; }
         { device = "/var/swapfile"; }
         { label = "bigswap"; }
       ];
-      description = "
+      description = ''
         The swap devices and swap files.  These must have been
         initialised using <command>mkswap</command>.  Each element
         should be an attribute set specifying either the path of the
@@ -21,59 +30,70 @@ let
         of the swap device (<literal>label</literal>, see
         <command>mkswap -L</command>).  Using a label is
         recommended.
-      ";
+      '';
+
+      type = types.list types.optionSet;
+
+      options = {
+
+        device = mkOption {
+          default = null;
+          example = "/dev/sda3";
+          type = types.nullOr types.string;
+          description = ''
+            Path of the device.
+          '';
+        };
+
+        label = mkOption {
+          default = null;
+          example = "swap";
+          type = types.nullOr types.string;
+          description = "
+            Label of the device.  Can be used instead of <varname>device</varname>.
+          ";
+        };
+
+      };
+      
     };
 
   };
+  
+
+  ###### implementation
+
+  config = {
+
+    jobs = pkgs.lib.singleton
+      { name = "swap";
+
+        task = true;
+        
+        startOn = ["startup" "new-devices"];
+
+        script =
+          ''        
+            swapDevices=${toString (map toPath config.swapDevices)}
+          
+            for device in $swapDevices; do
+                ${utillinux}/sbin/swapon "$device" || true
+            done
+
+            # Remove swap devices not listed in swapDevices.
+            for used in $(cat /proc/swaps | grep '^/' | sed 's/ .*//'); do
+                found=
+                for device in $swapDevices; do
+                    device=$(readlink -f $device)
+                    if test "$used" = "$device"; then found=1; fi
+                done
+                if test -z "$found"; then
+                    ${utillinux}/sbin/swapoff "$used" || true
+                fi
+            done
+          '';
+      };
 
+  };
 
-###### implementation
-
-  inherit (pkgs) utillinux lib;
-
-  swapDevices = config.swapDevices;
-
-  devicesByPath =
-    map (x: x.device) (lib.filter (x: x ? device) swapDevices);
-    
-  devicesByLabel =
-    map (x: x.label) (lib.filter (x: x ? label) swapDevices);
-
-in
-
-
-{
-  require = [options];
-
-  services.extraJobs = [{
-    name = "swap";
-
-    job = ''
-      start on startup
-      start on new-devices
-
-      script
-          for device in ${toString devicesByPath}; do
-              ${utillinux}/sbin/swapon "$device" || true
-          done
-
-          for label in ${toString devicesByLabel}; do
-              ${utillinux}/sbin/swapon -L "$label" || true
-          done
-
-          # Remove swap devices not listed in swapDevices.
-          # !!! disabled because it doesn't work with labels
-          #for used in $(cat /proc/swaps | grep '^/' | sed 's/ .*//'); do
-          #    found=
-          #    for device in $ {toString swapDevices}; do
-          #        if test "$used" = "$device"; then found=1; fi
-          #    done
-          #    if test -z "$found"; then
-          #        ${utillinux}/sbin/swapoff "$used" || true
-          #    fi
-          #done
-
-      end script
-    '';
-  }];
 }
-- 
GitLab


From 2cd3e205f4ebfd9c646fd7fe84a09c3f152c912b Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 16 Jul 2009 15:01:56 +0000
Subject: [PATCH 1668/5331] svn path=/nixos/branches/modular-nixos/;
 revision=16397

---
 modules/services/audio/alsa.nix | 110 +++++++++++++-------------------
 1 file changed, 46 insertions(+), 64 deletions(-)

diff --git a/modules/services/audio/alsa.nix b/modules/services/audio/alsa.nix
index 47c639359f4..da92ed915b2 100644
--- a/modules/services/audio/alsa.nix
+++ b/modules/services/audio/alsa.nix
@@ -1,92 +1,74 @@
 # ALSA sound support.
 {pkgs, config, ...}:
 
-###### interface
 let
-  inherit (pkgs.lib) mkOption;
+  inherit (pkgs.lib) mkOption singleton mkIf;
 
+  inherit (pkgs) alsaUtils;
+
+  soundState = "/var/lib/alsa/asound.state";
+
+in
+
+{
+
+  ###### interface
+  
   options = {
+  
     sound = {
 
       enable = mkOption {
         default = true;
-        description = "
+        description = ''
           Whether to enable ALSA sound.
-        ";
+        '';
         merge = pkgs.lib.mergeEnableOption;
       };
 
     };
+    
   };
-in
-
-###### implementation
-let
-  inherit (pkgs.lib) mkIf;
 
-  # dangerous !
-  modprobe = config.system.sbin.modprobe;
-  inherit (pkgs) alsaUtils;
 
-  soundState = "/var/lib/alsa/asound.state";
-
-  # Alsalib seems to require the existence of this group, even if it's
-  # not used (e.g., doesn't own any devices).
-  group = {
-    name = "audio";
-    gid = config.ids.gids.audio;
-  };
+  ###### implementation
+  
+  config = mkIf config.sound.enable {
+  
+    environment.systemPackages = [alsaUtils];
 
-  job = {
-    name = "alsa";
-
-    job = ''
-      start on udev
-      stop on shutdown
-
-      start script
-
-          mkdir -m 0755 -p $(dirname ${soundState})
-
-          # Load some additional modules.
-          for mod in snd_pcm_oss; do
-              ${modprobe}/sbin/modprobe $mod || true
-          done
-
-          # Restore the sound state.
-          ${alsaUtils}/sbin/alsactl -f ${soundState} restore
-
-      end script
-
-      respawn sleep 1000000 # !!! hack
+    users.extraGroups = singleton
+      { # Alsalib seems to require the existence of this group, even
+        # if it's not used (e.g., doesn't own any devices).
+        name = "audio";
+        gid = config.ids.gids.audio;
+      };
 
-      stop script
+    jobs = singleton
+      { name = "alsa";
 
-          # Save the sound state.
-          ${alsaUtils}/sbin/alsactl -f ${soundState} store
+        startOn = "udev";
 
-      end script
-    '';
-  };
-in
+        preStart =
+          ''
+            mkdir -m 0755 -p $(dirname ${soundState})
 
-mkIf config.sound.enable {
-  require = [
-    # ../upstart-jobs/default.nix # config.services.extraJobs
-    # ../system/user.nix # users.*
-    # ? # config.environment.extraPackages
-    options
-  ];
+            # Load some additional modules.
+            for mod in snd_pcm_oss; do
+                ${config.system.sbin.modprobe}/sbin/modprobe $mod || true
+            done
 
-  environment = {
-    extraPackages = [alsaUtils];
-  };
+            # Restore the sound state.
+            ${alsaUtils}/sbin/alsactl -f ${soundState} restore
+          '';
 
-  users = {
-    extraGroups = [group];
+        postStop =
+          ''
+            # Save the sound state.
+            ${alsaUtils}/sbin/alsactl -f ${soundState} store
+          '';
+      };
+      
   };
 
-  services = {
-    extraJobs = [job];
-  };
 }
-- 
GitLab


From f53c9d70ec2f056957151ea4198bbdc836da65bd Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 16 Jul 2009 16:13:35 +0000
Subject: [PATCH 1669/5331] * The lack of a newline at the end of
 "EnableSendFile Off" caused a   broken httpd.conf to be generated.  We should
 really have a merge   function that appends newlines to every value of
 options like   services.httpd.extraConfig.

svn path=/nixos/branches/modular-nixos/; revision=16404
---
 modules/virtualisation/qemu-vm.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/modules/virtualisation/qemu-vm.nix b/modules/virtualisation/qemu-vm.nix
index 41c0d662af0..04b5c880d26 100644
--- a/modules/virtualisation/qemu-vm.nix
+++ b/modules/virtualisation/qemu-vm.nix
@@ -115,5 +115,8 @@ in
 
   # sendfile() is currently broken over CIFS, so fix it here for all
   # configurations that use Apache.
-  services.httpd.extraConfig = "EnableSendFile Off";
+  services.httpd.extraConfig =
+    ''
+      EnableSendFile Off
+    '';
 }
-- 
GitLab


From b58682401ede3842ba41fd6665f27630650413bd Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 16 Jul 2009 17:18:54 +0000
Subject: [PATCH 1670/5331] * Give a type to networking.interfaces. *
 Simplified the pre-start script of the network-interfaces module. * Removed
 wireless support from the network-interfaces module.  It   only worked for
 static WEP configurations anyway, and AFAIK nobody   used it.

svn path=/nixos/branches/modular-nixos/; revision=16406
---
 modules/services/networking/dhclient.nix |  16 --
 modules/tasks/network-interfaces.nix     | 237 ++++++++++++-----------
 2 files changed, 127 insertions(+), 126 deletions(-)

diff --git a/modules/services/networking/dhclient.nix b/modules/services/networking/dhclient.nix
index aea5a8f9c0c..658c25b6726 100644
--- a/modules/services/networking/dhclient.nix
+++ b/modules/services/networking/dhclient.nix
@@ -53,22 +53,6 @@ in
       ";
     };
   
-    networking.interfaces = mkOption {
-      default = [];
-      merge = mergeListOption;
-      example = [
-        { name = "eth0";
-          ipAddress = "131.211.84.78";
-          subnetMask = "255.255.255.128";
-        }
-      ];
-      description = "
-        The configuration for each network interface.  If
-        <option>networking.useDHCP</option> is true, then each interface
-        not listed here will be configured using DHCP.
-      ";
-    };
-
   };
 
 
diff --git a/modules/tasks/network-interfaces.nix b/modules/tasks/network-interfaces.nix
index d075d04ed6b..d2e01370668 100644
--- a/modules/tasks/network-interfaces.nix
+++ b/modules/tasks/network-interfaces.nix
@@ -2,168 +2,185 @@
 
 let
 
-  inherit (pkgs.lib) mkOption;
+  inherit (pkgs.lib) mkOption types;
 
+  inherit (pkgs) nettools;
 
-###### interface
+  cfg = config.networking;
+
+in 
+
+{
+
+  ###### interface
 
   options = {
 
     networking.hostName = mkOption {
       default = "nixos";
-      description = "
+      description = ''
         The name of the machine.  Leave it empty if you want to obtain
         it from a DHCP server (if using DHCP).
-      ";
+      '';
     };
 
     networking.nativeIPv6 = mkOption {
       default = false;
-      description = "
+      description = ''
         Whether to use IPv6 even though gw6c is not used. For example, 
         for Postfix.
-      ";
+      '';
     };
 
     networking.defaultGateway = mkOption {
       default = "";
       example = "131.211.84.1";
-      description = "
+      description = ''
         The default gateway.  It can be left empty if it is auto-detected through DHCP.
-      ";
+      '';
     };
 
     networking.nameservers = mkOption {
       default = [];
       example = ["130.161.158.4" "130.161.33.17"];
-      description = "
+      description = ''
         The list of nameservers.  It can be left empty if it is auto-detected through DHCP.
-      ";
+      '';
     };
 
     networking.domain = mkOption {
       default = "";
       example = "home";
-      description = "
+      description = ''
         The domain.  It can be left empty if it is auto-detected through DHCP.
-      ";
+      '';
     };
 
     networking.localCommands = mkOption {
       default = "";
       example = "text=anything; echo You can put $text here.";
-      description = "
+      description = ''
         Shell commands to be executed at the end of the
         <literal>network-interfaces</literal> Upstart job.  Note that if
         you are using DHCP to obtain the network configuration,
         interfaces may not be fully configured yet.
-      ";
+      '';
+    };
+
+    networking.interfaces = mkOption {
+      default = [];
+      example = [
+        { name = "eth0";
+          ipAddress = "131.211.84.78";
+          subnetMask = "255.255.255.128";
+        }
+      ];
+      description = ''
+        The configuration for each network interface.  If
+        <option>networking.useDHCP</option> is true, then every
+        interface not listed here will be configured using DHCP.
+      '';
+
+      type = types.list types.optionSet;
+
+      options = {
+
+        name = mkOption {
+          example = "eth0";
+          type = types.string;
+          description = ''
+            Name of the interface.
+          '';
+        };
+
+        ipAddress = mkOption {
+          default = "";
+          example = "10.0.0.1";
+          type = types.string;
+          description = ''
+            IP address of the interface.  Leave empty to configure the
+            interface using DHCP.
+          '';
+        };
+
+        subnetMask = mkOption {
+          default = "";
+          example = "255.255.255.0";
+          type = types.string;
+          description = ''
+            Subnet mask of the interface.  Leave empty to use the
+            default subnet mask.
+          '';
+        };
+
+      };
+      
     };
 
   };
 
 
-###### implementation
+  ###### implementation
 
-  inherit (pkgs) nettools wirelesstools bash writeText;
+  config = {
 
-  cfg = config.networking;
+    jobs = pkgs.lib.singleton
+      { name = "network-interfaces";
 
-  # !!! use XML
-  names = map (i: i.name) cfg.interfaces;
-  ipAddresses = map (i: if i ? ipAddress then i.ipAddress else "dhcp") cfg.interfaces;
-  subnetMasks = map (i: if i ? subnetMask then i.subnetMask else "default") cfg.interfaces;
-  essids = map (i: if i ? essid then i.essid else "default") cfg.interfaces;
-  wepKeys = map (i: if i ? wepKey then i.wepKey else "nokey") cfg.interfaces;
-  modprobe = config.system.sbin.modprobe;
+        startOn = "udev";
 
-in 
+        preStart =
+          ''
+            export PATH=${config.system.sbin.modprobe}/sbin:$PATH
+            modprobe af_packet || true
 
-{
-  require = [options];
-
-  services.extraJobs = [{
-    name = "network-interfaces";
-
-    job = ''
-      start on udev
-      stop on shutdown
-
-      start script
-          export PATH=${modprobe}/sbin:$PATH
-          modprobe af_packet || true
-
-          for i in $(cd /sys/class/net && ls -d *); do
-              echo "Bringing up network device $i..."
-              ${nettools}/sbin/ifconfig $i up || true
-          done
-
-          # Configure the manually specified interfaces.
-          names=(${toString names})
-          ipAddresses=(${toString ipAddresses})
-          subnetMasks=(${toString subnetMasks})
-          essids=(${toString essids})
-          wepKeys=(${toString wepKeys})
-
-          for ((n = 0; n < ''${#names[*]}; n++)); do
-              name=''${names[$n]}
-              ipAddress=''${ipAddresses[$n]}
-              subnetMask=''${subnetMasks[$n]}
-              essid=''${essids[$n]}
-              wepKey=''${wepKeys[$n]}
-
-              # Set wireless networking stuff.
-              if test "$essid" != default; then
-                  ${wirelesstools}/sbin/iwconfig "$name" essid "$essid" || true
-              fi
-
-              if test "$wepKey" != nokey; then
-                  ${wirelesstools}/sbin/iwconfig "$name" key "$(cat "$wepKey")" || true
-              fi
-
-              # Set IP address / netmask.        
-              if test "$ipAddress" != dhcp; then
-                  echo "Configuring interface $name..."
+            for i in $(cd /sys/class/net && ls -d *); do
+                echo "Bringing up network device $i..."
+                ${nettools}/sbin/ifconfig $i up || true
+            done
+
+            # Configure the manually specified interfaces.
+            ${pkgs.lib.concatMapStrings (i:
+              if i.ipAddress != "" then
+                ''
+                  echo "Configuring interface ${i.name}..."
                   extraFlags=
-                  if test "$subnetMask" != default; then
-                      extraFlags="$extraFlags netmask $subnetMask"
+                  if test -n "${i.subnetMask}"; then
+                      extraFlags="$extraFlags netmask ${i.subnetMask}"
                   fi
-                  ${nettools}/sbin/ifconfig "$name" "$ipAddress" $extraFlags || true
-              fi
-
-          done
-
-          # Set the nameservers.
-          if test -n "${toString cfg.nameservers}"; then
-              rm -f /etc/resolv.conf
-              if test -n "${cfg.domain}"; then
-                  echo "domain ${cfg.domain}" >> /etc/resolv.conf
-              fi
-              for i in ${toString cfg.nameservers}; do
-                  echo "nameserver $i" >> /etc/resolv.conf
-              done
-          fi
-
-          # Set the default gateway.
-          if test -n "${cfg.defaultGateway}"; then
-              ${nettools}/sbin/route add default gw "${cfg.defaultGateway}" || true
-          fi
-
-          # Run any user-specified commands.
-          ${bash}/bin/sh ${writeText "local-net-cmds" cfg.localCommands} || true
-
-      end script
-
-      # Hack: Upstart doesn't yet support what we want: a service that
-      # doesn't have a running process associated with it.
-      respawn sleep 100000
-
-      stop script
-          #for i in $(cd /sys/class/net && ls -d *); do
-          #    echo "Taking down network device $i..."
-          #    ${nettools}/sbin/ifconfig $i down || true
-          #done
-      end script
-    '';
-  }];
+                  ${nettools}/sbin/ifconfig "${i.name}" "${i.ipAddress}" $extraFlags || true
+                ''
+              else "") cfg.interfaces}
+
+            # Set the nameservers.
+            if test -n "${toString cfg.nameservers}"; then
+                rm -f /etc/resolv.conf
+                if test -n "${cfg.domain}"; then
+                    echo "domain ${cfg.domain}" >> /etc/resolv.conf
+                fi
+                for i in ${toString cfg.nameservers}; do
+                    echo "nameserver $i" >> /etc/resolv.conf
+                done
+            fi
+
+            # Set the default gateway.
+            if test -n "${cfg.defaultGateway}"; then
+                ${nettools}/sbin/route add default gw "${cfg.defaultGateway}" || true
+            fi
+
+            # Run any user-specified commands.
+            ${pkgs.stdenv.shell} ${pkgs.writeText "local-net-cmds" cfg.localCommands} || true
+          '';
+
+        postStop =
+          ''
+            #for i in $(cd /sys/class/net && ls -d *); do
+            #    echo "Taking down network device $i..."
+            #    ${nettools}/sbin/ifconfig $i down || true
+            #done
+          '';
+    };
+
+  };
+  
 }
-- 
GitLab


From 3abf509637ff3693615aed97a0f0bb0aa80e919a Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 16 Jul 2009 17:25:50 +0000
Subject: [PATCH 1671/5331] * Don't try to start dhclient on the wmaster0
 interface.  This just   gets rid of endless dhclient log messages such as

    Jul 16 19:09:30 dutibo dhclient: DHCPDISCOVER on wmaster0 to 255.255.255.255 port 67 interval 19
    Jul 16 19:09:30 dutibo dhclient: send_packet: Network is down

svn path=/nixos/branches/modular-nixos/; revision=16407
---
 modules/services/networking/dhclient.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/services/networking/dhclient.nix b/modules/services/networking/dhclient.nix
index 658c25b6726..c87e788b6d5 100644
--- a/modules/services/networking/dhclient.nix
+++ b/modules/services/networking/dhclient.nix
@@ -6,7 +6,7 @@ let
   inherit (pkgs) nettools dhcp lib;
 
   # Don't start dhclient on explicitly configured interfaces.
-  ignoredInterfaces = ["lo"] ++
+  ignoredInterfaces = ["lo" "wmaster0"] ++
     map (i: i.name) (lib.filter (i: i ? ipAddress) config.networking.interfaces);
 
   stateDir = "/var/lib/dhcp"; # Don't use /var/state/dhcp; not FHS-compliant.
-- 
GitLab


From d59155960977939fc748e2930685e635255c9ee9 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 16 Jul 2009 21:08:32 +0000
Subject: [PATCH 1672/5331] * A simple module for running wpa_supplicant.

svn path=/nixos/branches/modular-nixos/; revision=16409
---
 modules/module-list.nix                       |  1 +
 .../services/networking/wpa_supplicant.nix    | 54 +++++++++++++++++++
 2 files changed, 55 insertions(+)
 create mode 100644 modules/services/networking/wpa_supplicant.nix

diff --git a/modules/module-list.nix b/modules/module-list.nix
index 750a39ba105..429bcfcf1b8 100644
--- a/modules/module-list.nix
+++ b/modules/module-list.nix
@@ -64,6 +64,7 @@
   ./services/networking/ssh/lshd.nix
   ./services/networking/ssh/sshd.nix
   ./services/networking/vsftpd.nix
+  ./services/networking/wpa_supplicant.nix
   ./services/printing/cupsd.nix
   ./services/scheduling/atd.nix
   ./services/scheduling/cron.nix
diff --git a/modules/services/networking/wpa_supplicant.nix b/modules/services/networking/wpa_supplicant.nix
new file mode 100644
index 00000000000..7cb75fd68a2
--- /dev/null
+++ b/modules/services/networking/wpa_supplicant.nix
@@ -0,0 +1,54 @@
+{pkgs, config, ...}:
+
+let
+
+  configFile = "/etc/wpa_supplicant.conf";
+
+in
+
+{
+
+  ###### interface
+
+  options = {
+  
+    networking.enableWLAN = pkgs.lib.mkOption {
+      default = false;
+      description = ''
+        Whether to start <command>wpa_supplicant</command> to scan for
+        and associate with wireless networks.  Note: NixOS currently
+        does not generate <command>wpa_supplicant</command>'s
+        configuration file, <filename>${configFile}</filename>.  You
+        should edit this file yourself to define wireless networks,
+        WPA keys and so on (see
+        <citerefentry><refentrytitle>wpa_supplicant.conf</refentrytitle>
+        <manvolnum>5</manvolnum></citerefentry>).
+      '';
+    };
+  
+  };
+
+
+  ###### implementation
+  
+  config = pkgs.lib.mkIf config.networking.enableWLAN {
+
+    environment.systemPackages = [pkgs.wpa_supplicant];
+
+    jobs = pkgs.lib.singleton
+      { name = "wpa_supplicant";
+
+        preStart =
+          ''
+            touch -a ${configFile}
+            chmod 600 ${configFile}
+          '';
+
+        exec =
+          "${pkgs.wpa_supplicant}/sbin/wpa_supplicant " +
+          "-C /var/run/wpa_supplicant -c ${configFile} -iwlan0";
+      };
+  
+  };
+
+}
-- 
GitLab


From dbd6ea7f63ef0d1eb68c142d2da9cda57ac33c93 Mon Sep 17 00:00:00 2001
From: Marc Weber <marco-oweber@gmx.de>
Date: Sat, 18 Jul 2009 16:14:03 +0000
Subject: [PATCH 1673/5331] adding daemonNiceLevel option. running biulds with
 niceness 0 can be annoying

svn path=/nixos/branches/modular-nixos/; revision=16420
---
 modules/services/misc/nix-daemon.nix | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/modules/services/misc/nix-daemon.nix b/modules/services/misc/nix-daemon.nix
index b8911a8cea3..f3c749ff480 100644
--- a/modules/services/misc/nix-daemon.nix
+++ b/modules/services/misc/nix-daemon.nix
@@ -63,6 +63,15 @@ let
         ";
       };
 
+
+      daemonNiceLevel = mkOption {
+        default = 2;
+        description = "
+          nix dameon process priority. This priority propagates to build processes.
+          0 is default unix process priority. 20 is lowest.
+        ";
+      };
+
       buildMachines = mkOption {
         example = [
           { hostName = "voila.labs.cs.uu.nl";
@@ -245,7 +254,7 @@ in
         ''
           export PATH=${if config.nix.distributedBuilds then "${pkgs.openssh}/bin:" else ""}${pkgs.openssl}/bin:${nix}/bin:$PATH
           ${config.nix.envVars}
-          exec ${nix}/bin/nix-worker --daemon > /dev/null 2>&1
+          exec nice -n ${builtins.toString config.nix.daemonNiceLevel} ${nix}/bin/nix-worker --daemon > /dev/null 2>&1
         '';
     };
 
-- 
GitLab


From 32b311a0f52eeb9cfd5370799505ef96edaacf99 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 23 Jul 2009 23:25:50 +0000
Subject: [PATCH 1674/5331] * Add gzip to the $PATH of nix-daemon, otherwise
 distributed builds   don't work.  This is a regression wrt the trunk.

svn path=/nixos/branches/modular-nixos/; revision=16448
---
 modules/services/misc/nix-daemon.nix | 32 +++-------------------------
 1 file changed, 3 insertions(+), 29 deletions(-)

diff --git a/modules/services/misc/nix-daemon.nix b/modules/services/misc/nix-daemon.nix
index f3c749ff480..3e435348f9d 100644
--- a/modules/services/misc/nix-daemon.nix
+++ b/modules/services/misc/nix-daemon.nix
@@ -63,12 +63,11 @@ let
         ";
       };
 
-
       daemonNiceLevel = mkOption {
         default = 2;
         description = "
-          nix dameon process priority. This priority propagates to build processes.
-          0 is default unix process priority. 20 is lowest.
+          Nix daemon process priority. This priority propagates to build processes.
+          0 is the default Unix process priority, 20 is the lowest.
         ";
       };
 
@@ -160,31 +159,6 @@ let
         else "")
         + conf;
       };
-
-
-      services = {
-        pulseaudio = {
-          enable = mkOption {
-            default = false;
-            description = ''
-              Whether to enable the PulseAudio system-wide audio server.
-              Note that the documentation recommends running PulseAudio
-              daemons per-user rather than system-wide on desktop machines.
-            '';
-          };
-
-          logLevel = mkOption {
-            default = "notice";
-            example = "debug";
-            description = ''
-              A string denoting the log level: one of
-              <literal>error</literal>, <literal>warn</literal>,
-              <literal>notice</literal>, <literal>info</literal>,
-              or <literal>debug</literal>.
-            '';
-          };
-        };
-      };
     };
   };
 
@@ -252,7 +226,7 @@ in
 
       script =
         ''
-          export PATH=${if config.nix.distributedBuilds then "${pkgs.openssh}/bin:" else ""}${pkgs.openssl}/bin:${nix}/bin:$PATH
+          export PATH=${if config.nix.distributedBuilds then "${pkgs.openssh}/bin:${pkgs.gzip}/bin:" else ""}${pkgs.openssl}/bin:${nix}/bin:$PATH
           ${config.nix.envVars}
           exec nice -n ${builtins.toString config.nix.daemonNiceLevel} ${nix}/bin/nix-worker --daemon > /dev/null 2>&1
         '';
-- 
GitLab


From c4780a8953bbbb61e0405889f217779a9432e9ca Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 24 Jul 2009 00:31:22 +0000
Subject: [PATCH 1675/5331] * dhcp 4.1 requires IPv6 support.

svn path=/nixos/branches/modular-nixos/; revision=16450
---
 modules/services/networking/dhclient.nix | 29 ++++++++++++------------
 1 file changed, 14 insertions(+), 15 deletions(-)

diff --git a/modules/services/networking/dhclient.nix b/modules/services/networking/dhclient.nix
index c87e788b6d5..f1b523adf88 100644
--- a/modules/services/networking/dhclient.nix
+++ b/modules/services/networking/dhclient.nix
@@ -60,20 +60,20 @@ in
   
   config = mkIf config.networking.useDHCP {
 
-    jobs = pkgs.lib.singleton {
-      name = "dhclient";
+    jobs = pkgs.lib.singleton
+      { name = "dhclient";
 
-      job = ''
-        description "DHCP client"
+        startOn = "network-interfaces/started";
+        stopOn = "network-interfaces/stop";
 
-        start on network-interfaces/started
-        stop on network-interfaces/stop
-
-        env PATH_DHCLIENT_SCRIPT=${dhcp}/sbin/dhclient-script
-
-        script
-            export PATH=${nettools}/sbin:$PATH
+        preStart =
+          ''
+            # dhclient barfs if /proc/net/if_inet6 doesn't exist.
+            ${config.system.sbin.modprobe}/sbin/modprobe ipv6 || true
+          '';
 
+        script =
+          ''
             # Determine the interface on which to start dhclient.
             interfaces=
 
@@ -91,10 +91,9 @@ in
 
             mkdir -m 755 -p ${stateDir}
 
-            exec ${dhcp}/sbin/dhclient -d $interfaces -e "PATH=$PATH" -lf ${stateDir}/dhclient.leases
-        end script
-      '';
-    };
+            exec ${dhcp}/sbin/dhclient -d $interfaces -e "PATH=$PATH" -lf ${stateDir}/dhclient.leases -sf ${dhcp}/sbin/dhclient-script
+          '';
+      };
 
     environment.systemPackages = [dhcp];
 
-- 
GitLab


From 38d594deecfc092821044ee5f31bc9b61e754447 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 24 Jul 2009 00:31:42 +0000
Subject: [PATCH 1676/5331] * wpa_supplicant: start/stop automatically.

svn path=/nixos/branches/modular-nixos/; revision=16451
---
 modules/services/networking/wpa_supplicant.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/modules/services/networking/wpa_supplicant.nix b/modules/services/networking/wpa_supplicant.nix
index 7cb75fd68a2..36ad294470f 100644
--- a/modules/services/networking/wpa_supplicant.nix
+++ b/modules/services/networking/wpa_supplicant.nix
@@ -38,6 +38,9 @@ in
     jobs = pkgs.lib.singleton
       { name = "wpa_supplicant";
 
+        startOn = "network-interfaces/started";
+        stopOn = "network-interfaces/stop";
+
         preStart =
           ''
             touch -a ${configFile}
-- 
GitLab


From 264b49fce76b52fce46daafdcc706d3d85dd40b0 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 24 Jul 2009 23:12:52 +0000
Subject: [PATCH 1677/5331] * A very basic firewall that rejects all incoming
 connections except   for the ports defined in
 networking.firewall.allowedTCPPorts.

svn path=/nixos/branches/modular-nixos/; revision=16460
---
 modules/services/networking/firewall.nix | 70 ++++++++++++++++++++++++
 modules/services/networking/ssh/sshd.nix |  4 ++
 2 files changed, 74 insertions(+)
 create mode 100644 modules/services/networking/firewall.nix

diff --git a/modules/services/networking/firewall.nix b/modules/services/networking/firewall.nix
new file mode 100644
index 00000000000..a6a5f8fec2b
--- /dev/null
+++ b/modules/services/networking/firewall.nix
@@ -0,0 +1,70 @@
+{pkgs, config, ...}:
+
+let
+
+  iptables = "${pkgs.iptables}/sbin/iptables";
+
+in
+
+{
+
+  ###### interface
+
+  options = {
+  
+    networking.firewall.allowedTCPPorts = pkgs.lib.mkOption {
+      default = [];
+      example = [22 80];
+      type = pkgs.lib.types.list pkgs.lib.types.int;
+      description =
+        ''
+          List of TCP ports on which incoming connections are
+          accepted.
+        '';
+    };
+  
+  };
+
+
+  ###### implementation
+  
+  config = {
+
+    environment.systemPackages = [pkgs.iptables];
+
+    jobs = pkgs.lib.singleton
+      { name = "firewall";
+
+        preStart =
+          ''
+            ${iptables} -F
+
+            # Accept all traffic on the loopback interface.
+            ${iptables} -A INPUT -i lo -j ACCEPT
+
+            # Accept packets from established or related connections.
+            ${iptables} -A INPUT -m conntrack --ctstate ESTABLISHED,RELATED -j ACCEPT
+
+            # Accept connections to the allowed TCP ports.            
+            ${pkgs.lib.concatMapStrings (port:
+                ''
+                  ${iptables} -A INPUT -p tcp --dport ${toString port} -j ACCEPT
+                ''
+              ) config.networking.firewall.allowedTCPPorts
+            }
+
+            # Drop everything else.              
+            ${iptables} -A INPUT -j DROP
+          '';
+
+        postStop =
+          ''
+            ${iptables} -F
+          '';     
+      };
+
+    networking.firewall.allowedTCPPorts = [22];
+    
+  };
+
+}
diff --git a/modules/services/networking/ssh/sshd.nix b/modules/services/networking/ssh/sshd.nix
index 154f5ab17c8..95b78d69445 100644
--- a/modules/services/networking/ssh/sshd.nix
+++ b/modules/services/networking/ssh/sshd.nix
@@ -131,6 +131,10 @@ in
         exec = "${openssh}/sbin/sshd -D -h /etc/ssh/ssh_host_dsa_key -f ${sshdConfig}";
       };
 
+    # !!! This barfs because of the mkIf ("value is a list while an
+    #attribute set was expected") :-(
+    #networking.firewall.allowedTCPPorts = [22];
+          
   };
 
 }
-- 
GitLab


From f0f5434eaad8efb46496b9e113c8cd1a872665a2 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sun, 26 Jul 2009 21:27:35 +0000
Subject: [PATCH 1678/5331] * Add an option to enable the firewall.  It should
 eventually be   enabled by default.

svn path=/nixos/branches/modular-nixos/; revision=16464
---
 modules/module-list.nix                  |  3 ++-
 modules/services/networking/firewall.nix | 21 +++++++++++++++++----
 modules/services/networking/ssh/sshd.nix |  4 +---
 3 files changed, 20 insertions(+), 8 deletions(-)

diff --git a/modules/module-list.nix b/modules/module-list.nix
index 429bcfcf1b8..cd37d967066 100644
--- a/modules/module-list.nix
+++ b/modules/module-list.nix
@@ -53,6 +53,7 @@
   ./services/networking/dhclient.nix
   ./services/networking/dhcpd.nix
   ./services/networking/ejabberd.nix
+  ./services/networking/firewall.nix
   ./services/networking/gnunet.nix
   ./services/networking/gw6c.nix
   ./services/networking/ifplugd.nix
@@ -81,9 +82,9 @@
   ./services/x11/xserver/default.nix
   ./services/x11/xserver/desktop-managers/default.nix
   ./services/x11/xserver/desktop-managers/gnome.nix
-  ./services/x11/xserver/desktop-managers/kde4.nix
   ./services/x11/xserver/desktop-managers/kde-environment.nix
   ./services/x11/xserver/desktop-managers/kde.nix
+  ./services/x11/xserver/desktop-managers/kde4.nix
   ./services/x11/xserver/desktop-managers/none.nix
   ./services/x11/xserver/desktop-managers/xterm.nix
   ./services/x11/xserver/display-managers/default.nix
diff --git a/modules/services/networking/firewall.nix b/modules/services/networking/firewall.nix
index a6a5f8fec2b..ef6b3a94472 100644
--- a/modules/services/networking/firewall.nix
+++ b/modules/services/networking/firewall.nix
@@ -12,6 +12,14 @@ in
 
   options = {
   
+    networking.firewall.enable = pkgs.lib.mkOption {
+      default = false;
+      description =
+        ''
+          Whether to enable the firewall.
+        '';
+    };
+  
     networking.firewall.allowedTCPPorts = pkgs.lib.mkOption {
       default = [];
       example = [22 80];
@@ -27,14 +35,21 @@ in
 
 
   ###### implementation
-  
-  config = {
+
+  # !!! Maybe if `enable' is false, the firewall should still be built
+  # but not started by default.  However, currently nixos-rebuild
+  # doesn't deal with such Upstart jobs properly (it starts them if
+  # they are changed, regardless of whether the start condition
+  # holds).
+  config = pkgs.lib.mkIf config.networking.firewall.enable {
 
     environment.systemPackages = [pkgs.iptables];
 
     jobs = pkgs.lib.singleton
       { name = "firewall";
 
+        startOn = "network-interfaces/started";
+
         preStart =
           ''
             ${iptables} -F
@@ -63,8 +78,6 @@ in
           '';     
       };
 
-    networking.firewall.allowedTCPPorts = [22];
-    
   };
 
 }
diff --git a/modules/services/networking/ssh/sshd.nix b/modules/services/networking/ssh/sshd.nix
index 95b78d69445..ca072e92084 100644
--- a/modules/services/networking/ssh/sshd.nix
+++ b/modules/services/networking/ssh/sshd.nix
@@ -131,9 +131,7 @@ in
         exec = "${openssh}/sbin/sshd -D -h /etc/ssh/ssh_host_dsa_key -f ${sshdConfig}";
       };
 
-    # !!! This barfs because of the mkIf ("value is a list while an
-    #attribute set was expected") :-(
-    #networking.firewall.allowedTCPPorts = [22];
+    networking.firewall.allowedTCPPorts = [22];
           
   };
 
-- 
GitLab


From 9c05dd98dcaaf2d3358d0e6f4772dc6ed244e77a Mon Sep 17 00:00:00 2001
From: Rob Vermaas <rob.vermaas@gmail.com>
Date: Mon, 27 Jul 2009 14:08:14 +0000
Subject: [PATCH 1679/5331] intel5000 firmware

svn path=/nixos/branches/modular-nixos/; revision=16473
---
 modules/hardware/network/intel-5000.nix | 9 +++++++++
 1 file changed, 9 insertions(+)
 create mode 100644 modules/hardware/network/intel-5000.nix

diff --git a/modules/hardware/network/intel-5000.nix b/modules/hardware/network/intel-5000.nix
new file mode 100644
index 00000000000..0b0d29fe6df
--- /dev/null
+++ b/modules/hardware/network/intel-5000.nix
@@ -0,0 +1,9 @@
+{pkgs, config, ...}:
+
+{
+  services = {
+    udev = {
+      addFirmware = [ pkgs.iwlwifi5000ucode ];
+    };
+  };
+}
-- 
GitLab


From 6aba79bed578f7df78825468598f5c5c20e78dd7 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Thu, 30 Jul 2009 04:20:23 +0000
Subject: [PATCH 1680/5331] Update child configuration generation

svn path=/nixos/branches/modular-nixos/; revision=16514
---
 modules/system/activation/top-level.nix | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/modules/system/activation/top-level.nix b/modules/system/activation/top-level.nix
index 4d8e2055111..124c39e5b51 100644
--- a/modules/system/activation/top-level.nix
+++ b/modules/system/activation/top-level.nix
@@ -27,9 +27,8 @@ let
   # you can provide an easy way to boot the same configuration 
   # as you use, but with another kernel
   # !!! fix this
-  children = map (x: ((import ./system.nix)
-    { platform = pkgs.system;
-      configuration = x//{boot=((x.boot)//{grubDevice = "";});};}).system) 
+  children = map (x: ((import ../../../default.nix)
+    { configuration = x//{boot=((x.boot)//{grubDevice = "";});};}).system) 
     config.nesting.children;
 
 
-- 
GitLab


From bef1dc8bd59cea754b5926dd91d7fe83a1fd17a0 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Thu, 30 Jul 2009 04:20:56 +0000
Subject: [PATCH 1681/5331] Update RC kernel for rescue CD: includes some BtrFS
 fixes

svn path=/nixos/branches/modular-nixos/; revision=16515
---
 modules/installer/cd-dvd/installation-cd-rescue.nix | 2 +-
 release.nix                                         | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/installer/cd-dvd/installation-cd-rescue.nix b/modules/installer/cd-dvd/installation-cd-rescue.nix
index 94ac6d9a03e..028c3a1f76c 100644
--- a/modules/installer/cd-dvd/installation-cd-rescue.nix
+++ b/modules/installer/cd-dvd/installation-cd-rescue.nix
@@ -33,7 +33,7 @@
     lsof
   ];
 
-  boot.kernelPackages = pkgs.kernelPackages_2_6_31_rc2_old_i686;
+  boot.kernelPackages = pkgs.kernelPackages_2_6_31_rc4_old_i686;
   boot.initrd.extraKernelModules = ["evdev" "i8042" "pcips2" "serio"
     "sd_mod" "libata" "unix" "usbhid" "uhci_hcd" "atkbd" "xtkbd" "fbdev"
     "iso9660" "udf" "loop"];
diff --git a/release.nix b/release.nix
index 69459a25895..17e34f42fb4 100644
--- a/release.nix
+++ b/release.nix
@@ -85,7 +85,7 @@ let
     
     iso_rescue = makeIso {
       module = ./modules/installer/cd-dvd/installation-cd-rescue.nix;
-      description = "minimal";
+      description = "rescue";
     };
     
     iso_graphical = makeIso {
-- 
GitLab


From f05682c84d9019f6f3715c68189d3e5e98f2baf7 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Fri, 31 Jul 2009 04:56:52 +0000
Subject: [PATCH 1682/5331] Give some progress indications during Stage2 boot

svn path=/nixos/branches/modular-nixos/; revision=16523
---
 modules/system/boot/stage-2-init.sh | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/modules/system/boot/stage-2-init.sh b/modules/system/boot/stage-2-init.sh
index f8cd3e913c3..0df20b33b8b 100644
--- a/modules/system/boot/stage-2-init.sh
+++ b/modules/system/boot/stage-2-init.sh
@@ -83,11 +83,14 @@ mkdir -m 0755 -p /bin # for the /bin/sh symlink
 mkdir -m 0755 -p /home
 mkdir -m 0755 -p /etc/nixos
 
+echo "Filesystems mounted"
 
 # Miscellaneous boot time cleanup.
 rm -rf /var/run
 rm -rf /var/lock
 
+echo "On-boot /var cleanup done"
+
 #echo -n "cleaning \`/tmp'..."
 #rm -rf --one-file-system /tmp/*
 #echo " done"
@@ -98,6 +101,8 @@ rm -rf /var/lock
 # gone, of course.
 rm -rf /nix/var/nix/chroots # recreated in activate-configuration.sh
 
+echo "Nix chroots removed"
+
 if test -n "$safeMode"; then
     mkdir -m 0755 -p /var/run
     touch /var/run/safemode
@@ -114,11 +119,14 @@ if test -n "$resumeDevice"; then
     mkswap "$resumeDevice" || echo 'Failed to clear saved image.'
 fi
 
+echo -n "Activating configuration .. "
 
 # Run the script that performs all configuration activation that does
 # not have to be done at boot time.
 @activateConfiguration@ "$systemConfig"
 
+echo ".. done"
+
 
 # Record the boot configuration.  !!! Should this be a GC root?
 if test -n "$systemConfig"; then
@@ -133,6 +141,7 @@ export MODULE_DIR=@kernel@/lib/modules/
 # Run any user-specified commands.
 @shell@ @postBootCommands@
 
+echo "Running Upstart"
 
 # Start Upstart's init.  We start it through the
 # /var/run/current-system symlink indirection so that we can upgrade
-- 
GitLab


From 137ce0907c59ee2541850e6a87f7eb3bfed6c2d0 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Fri, 31 Jul 2009 08:32:53 +0000
Subject: [PATCH 1683/5331] Some fixes in on-boot activation

svn path=/nixos/branches/modular-nixos/; revision=16525
---
 modules/system/activation/activation-script.nix | 6 ++++--
 modules/system/etc/etc.nix                      | 2 ++
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/modules/system/activation/activation-script.nix b/modules/system/activation/activation-script.nix
index 64dc5d6b936..7053166d582 100644
--- a/modules/system/activation/activation-script.nix
+++ b/modules/system/activation/activation-script.nix
@@ -61,9 +61,11 @@ let
       # Allow the kernel to find our wrapped modprobe (which searches in the
       # right location in the Nix store for kernel modules).  We need this
       # when the kernel (or some module) auto-loads a module.
-      # !!! maybe this should only happen at boot time, since we shouldn't
+      # this should only happen at boot time, since we shouldn't
       # use modules that don't match the running kernel.
-      echo ${config.system.sbin.modprobe}/sbin/modprobe > /proc/sys/kernel/modprobe
+      if [ "$(cat /proc/sys/kernel/modprobe)" = "/sbin/modprobe" ]; then
+        echo ${config.system.sbin.modprobe}/sbin/modprobe > /proc/sys/kernel/modprobe
+      fi
     '' [
       # ?
     ];
diff --git a/modules/system/etc/etc.nix b/modules/system/etc/etc.nix
index c499cc0583a..83da614bf74 100644
--- a/modules/system/etc/etc.nix
+++ b/modules/system/etc/etc.nix
@@ -54,6 +54,7 @@ in
     activationScripts = {
       etc = pkgs.lib.fullDepEntry ''
         # Set up the statically computed bits of /etc.
+	echo -n "Setting up /etc files .. "
         staticEtc=/etc/static
         rm -f $staticEtc
         ln -s ${makeEtc}/etc $staticEtc
@@ -70,6 +71,7 @@ in
                 ln -s $staticEtc/$i /etc/$i
             fi
         done
+	echo ".. done"
 
         # Remove dangling symlinks that point to /etc/static.  These are
         # configuration files that existed in a previous configuration but not
-- 
GitLab


From bc54061cba355818f158df19bcdc2837a2a3b51d Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 3 Aug 2009 12:17:23 +0000
Subject: [PATCH 1684/5331] svn path=/nixos/branches/modular-nixos/;
 revision=16557

---
 modules/system/activation/activation-script.nix | 13 ++++++++-----
 modules/system/etc/etc.nix                      |  3 +--
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/modules/system/activation/activation-script.nix b/modules/system/activation/activation-script.nix
index 7053166d582..b120f7361dc 100644
--- a/modules/system/activation/activation-script.nix
+++ b/modules/system/activation/activation-script.nix
@@ -58,11 +58,14 @@ let
     ];
 
     modprobe = fullDepEntry ''
-      # Allow the kernel to find our wrapped modprobe (which searches in the
-      # right location in the Nix store for kernel modules).  We need this
-      # when the kernel (or some module) auto-loads a module.
-      # this should only happen at boot time, since we shouldn't
-      # use modules that don't match the running kernel.
+      # Allow the kernel to find our wrapped modprobe (which searches
+      # in the right location in the Nix store for kernel modules).
+      # We need this when the kernel (or some module) auto-loads a
+      # module.  This is only done at boot time to make sure that we
+      # don't use modules that don't match the running kernel.
+      # !!! We should check whether the new kernel modules are
+      # compatible with the running kernel so that we can upgrade
+      # kernel modules (e.g. the NVIDIA driver) in a running system.
       if [ "$(cat /proc/sys/kernel/modprobe)" = "/sbin/modprobe" ]; then
         echo ${config.system.sbin.modprobe}/sbin/modprobe > /proc/sys/kernel/modprobe
       fi
diff --git a/modules/system/etc/etc.nix b/modules/system/etc/etc.nix
index 83da614bf74..0f0b23ed3fd 100644
--- a/modules/system/etc/etc.nix
+++ b/modules/system/etc/etc.nix
@@ -54,7 +54,7 @@ in
     activationScripts = {
       etc = pkgs.lib.fullDepEntry ''
         # Set up the statically computed bits of /etc.
-	echo -n "Setting up /etc files .. "
+	echo "setting up /etc..."
         staticEtc=/etc/static
         rm -f $staticEtc
         ln -s ${makeEtc}/etc $staticEtc
@@ -71,7 +71,6 @@ in
                 ln -s $staticEtc/$i /etc/$i
             fi
         done
-	echo ".. done"
 
         # Remove dangling symlinks that point to /etc/static.  These are
         # configuration files that existed in a previous configuration but not
-- 
GitLab


From 6802a750764e82eb883f951a0f7226178a60ec70 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 3 Aug 2009 12:36:15 +0000
Subject: [PATCH 1685/5331] * nixos-rebuild: replaced some environment
 variables with options   (e.g. --install-grub instead of
 $NIXOS_INSTALL_GRUB).  Also support   some nix-build options (e.g.
 --show-trace and -j).

svn path=/nixos/branches/modular-nixos/; revision=16560
---
 modules/installer/tools/nixos-rebuild.sh | 55 ++++++++++++++++++------
 modules/system/etc/etc.nix               |  2 +-
 2 files changed, 43 insertions(+), 14 deletions(-)

diff --git a/modules/installer/tools/nixos-rebuild.sh b/modules/installer/tools/nixos-rebuild.sh
index cd6a3569895..99da4e1431a 100644
--- a/modules/installer/tools/nixos-rebuild.sh
+++ b/modules/installer/tools/nixos-rebuild.sh
@@ -11,20 +11,34 @@ showSyntax() {
     # !!! more or less cut&paste from
     # system/switch-to-configuration.sh (which we call, of course).
     cat <<EOF
-Usage: $0 [switch|boot|test|build|dry-run]
+Usage: $0 [OPTIONS...] OPERATION
 
-switch:  make the configuration the boot default and activate now
-boot:    make the configuration the boot default
-test:    activate the configuration, but don't make it the boot default
-build:   build the configuration, but don't make it the default or
-         activate it
-dry-run: just show what store paths would be built/downloaded
+The operation is one of the following:
 
+  switch:  make the configuration the boot default and activate now
+  boot:    make the configuration the boot default
+  test:    activate the configuration, but don't make it the boot default
+  build:   build the configuration, but don't make it the default or
+           activate it
+  dry-run: just show what store paths would be built/downloaded
+
+Options:
+
+  --install-grub         (re-)install the Grub bootloader
+  --no-pull              don't do a nix-pull to get the latest Nixpkgs
+                         channel manifest
+  --no-build-nix         don't build the latest Nix from Nixpkgs before
+                         building NixOS
+
+Various nix-build options are also accepted, in particular:
+
+  --show-trace           show a detailed stack trace for evaluation errors
+ 
 Environment variables affecting nixos-rebuild:
 
-  Path to NixOS:         NIXOS=${NIXOS}
-  Path to Nixpkgs:       NIXPKGS=${NIXPKGS}
-  Path to configuration: NIXOS_CONFIG=${NIXOS_CONFIG}
+  \$NIXOS                 path to the NixOS source tree
+  \$NIXPKGS               path to the Nixpkgs source tree
+  \$NIXOS_CONFIG          path to the NixOS system configuration specification
 EOF
     exit 1
 }
@@ -33,12 +47,27 @@ EOF
 # Parse the command line.
 extraBuildFlags=
 action=
+pullManifest=1
+buildNix=1
 
-for i in "$@"; do
+while test "$#" -gt 0; do
+    i="$1"; shift 1
     if test "$i" = "--help"; then
         showSyntax
     elif test "$i" = switch -o "$i" = boot -o "$i" = test -o "$i" = build -o "$i" = dry-run; then
         action="$i"
+    elif test "$i" = --install-grub; then
+        export NIXOS_INSTALL_GRUB=1
+    elif test "$i" = --no-pull; then
+        pullManifest=
+    elif test "$i" = --no-build-nix; then
+        buildNix=
+    elif test "$i" = --show-trace -o "$i" = --no-build-hook -o "$i" = --keep-failed -o "$i" = -K \
+        -o "$i" = --keep-going -o "$i" = -k -o "$i" = --verbose -o "$i" = -v; then
+        extraBuildFlags="$extraBuildFlags $i"
+    elif test "$i" = --max-jobs -o "$i" = -j; then
+        j="$1"; shift 1
+        extraBuildFlags="$extraBuildFlags $i $j"
     else
         echo "$0: unknown option \`$i'"
         exit 1
@@ -65,7 +94,7 @@ fi
 
 # Pull the manifests defined in the configuration (the "manifests"
 # attribute).  Wonderfully hacky.
-if test "${NIXOS_PULL:-1}" != 0; then
+if test -n "$pullManifest"; then
     manifests=$(nix-instantiate --eval-only --xml --strict $NIXOS -A manifests \
         | grep '<string'  | sed 's^.*"\(.*\)".*^\1^g')
 
@@ -79,7 +108,7 @@ fi
 # First build Nix, since NixOS may require a newer version than the
 # current one.  Of course, the same goes for Nixpkgs, but Nixpkgs is
 # more conservative.
-if test "${NIXOS_BUILD_NIX:-1}" != 0; then
+if test -n "$buildNix"; then
     if ! nix-build $NIXOS -A nixFallback -o $HOME/nix-tmp; then
         nix-build $NIXPKGS -A nixUnstable -o $HOME/nix-tmp
     fi
diff --git a/modules/system/etc/etc.nix b/modules/system/etc/etc.nix
index 0f0b23ed3fd..da60108d7c9 100644
--- a/modules/system/etc/etc.nix
+++ b/modules/system/etc/etc.nix
@@ -54,7 +54,7 @@ in
     activationScripts = {
       etc = pkgs.lib.fullDepEntry ''
         # Set up the statically computed bits of /etc.
-	echo "setting up /etc..."
+        echo "setting up /etc..."
         staticEtc=/etc/static
         rm -f $staticEtc
         ln -s ${makeEtc}/etc $staticEtc
-- 
GitLab


From 383370f78220d86f1bdd6f312ac6a648263b7dad Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 3 Aug 2009 12:44:45 +0000
Subject: [PATCH 1686/5331] * Don't create a temporary file in $HOME.

svn path=/nixos/branches/modular-nixos/; revision=16561
---
 modules/installer/tools/nixos-rebuild.sh | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/modules/installer/tools/nixos-rebuild.sh b/modules/installer/tools/nixos-rebuild.sh
index 99da4e1431a..cd2329416ab 100644
--- a/modules/installer/tools/nixos-rebuild.sh
+++ b/modules/installer/tools/nixos-rebuild.sh
@@ -81,6 +81,10 @@ if test "$action" = dry-run; then
 fi
 
 
+tmpDir=$(mktemp -t -d nixos-rebuild.XXXXXX)
+trap 'rm -rf "$tmpDir"' EXIT
+
+
 # If the Nix daemon is running, then use it.  This allows us to use
 # the latest Nix from Nixpkgs (below) for expression evaluation, while
 # still using the old Nix (via the daemon) for actual store access.
@@ -109,10 +113,10 @@ fi
 # current one.  Of course, the same goes for Nixpkgs, but Nixpkgs is
 # more conservative.
 if test -n "$buildNix"; then
-    if ! nix-build $NIXOS -A nixFallback -o $HOME/nix-tmp; then
-        nix-build $NIXPKGS -A nixUnstable -o $HOME/nix-tmp
+    if ! nix-build $NIXOS -A nixFallback -o $tmpDir/nix; then
+        nix-build $NIXPKGS -A nixUnstable -o $tmpDir/nix
     fi
-    PATH=$HOME/nix-tmp/bin:$PATH
+    PATH=$tmpDir/nix/bin:$PATH
 fi
 
 
@@ -145,6 +149,3 @@ active system configuration may be garbage collected!  This may render
 the system inoperable (though a reboot will fix things).
 EOF
 fi
-
-
-rm -f $HOME/nix-tmp
-- 
GitLab


From c8705704e15981b87f643ecc2194ee506725492a Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Mon, 3 Aug 2009 19:55:33 +0000
Subject: [PATCH 1687/5331] Add Wacom X11 driver support

svn path=/nixos/branches/modular-nixos/; revision=16569
---
 modules/services/x11/xserver/default.nix  | 57 ++++++++++++++++++++++-
 modules/services/x11/xserver/xserver.conf |  2 +
 2 files changed, 57 insertions(+), 2 deletions(-)

diff --git a/modules/services/x11/xserver/default.nix b/modules/services/x11/xserver/default.nix
index dea239f6aea..5c5301ecf32 100644
--- a/modules/services/x11/xserver/default.nix
+++ b/modules/services/x11/xserver/default.nix
@@ -148,6 +148,25 @@ let
           };
         };
 
+        wacom = {
+	  enable = mkOption {
+	    default = false;
+	    description = "Whether to enable Wacom touchscreen/digitizer";
+	  };
+
+          device = mkOption {
+	    default = "/dev/ttyS0";
+	    description = "Device to use";
+	  };
+
+	  forceDeviceType = mkOption {
+	    default = "ISDV4";
+	    example = null;
+	    description = "Some models (think touchscreen) require forcing device type";
+	  };
+
+	};
+
         layout = mkOption {
           default = "us";
           description = "
@@ -322,7 +341,9 @@ let
       xorg.xf86inputevdev
     ] 
     ++ attrByPath ["modules"] [] videoDriverModules
-    ++ optional cfg.synaptics.enable xorg.xf86inputsynaptics;
+    ++ optional cfg.synaptics.enable xorg.xf86inputsynaptics
+    ++ (optional cfg.wacom.enable ["${pkgs.linuxwacom}"])
+    ;
 
 
   fontsForXServer =
@@ -396,6 +417,32 @@ let
       EndSection
     '' else "";
 
+    wacomInputDevice = if cfg.wacom.enable then ''
+      Section "InputDevice"
+        Driver "wacom"
+        Identifier "Wacom_stylus"
+        Option "Device" "${cfg.wacom.device}"
+        Option "Type" "stylus"
+        ${if cfg.wacom.forceDeviceType!=null then ''Option "ForceDevice" "${cfg.wacom.forceDeviceType}"'' else ""}
+        Option "Button2" "3"
+      EndSection
+      Section "InputDevice"
+        Driver "wacom"
+        Identifier "Wacom_eraser"
+        Option "Device" "${cfg.wacom.device}"
+        Option "Type" "eraser"
+        ${if cfg.wacom.forceDeviceType!=null then ''Option "ForceDevice" "${cfg.wacom.forceDeviceType}"'' else ""}
+        Option "Button1" "2"
+      EndSection
+      Section "InputDevice"
+        Driver "wacom"
+        Identifier "Wacom_cursor"
+        Option "Device" "${cfg.wacom.device}"
+        Option "Type" "cursor"
+        ${if cfg.wacom.forceDeviceType!=null then ''Option "ForceDevice" "${cfg.wacom.forceDeviceType}"'' else ""}
+      EndSection
+    '' else "";
+
     xkbOptions = if cfg.xkbOptions == "" then "" else  ''
       Option "XkbOptions" "${cfg.xkbOptions}"
     '';
@@ -416,7 +463,13 @@ let
     extraMonitorSettings = cfg.extraMonitorSettings; 
     extraDisplaySettings = cfg.extraDisplaySettings;
     extraModules = cfg.extraModules; 
-    serverLayoutOptions = cfg.serverLayoutOptions; 
+    serverLayoutOptions = cfg.serverLayoutOptions +
+    (if cfg.wacom.enable then ''
+      InputDevice "Wacom_stylus"
+      InputDevice "Wacom_cursor"
+      InputDevice "Wacom_eraser"
+    '' else "")
+    ; 
     defaultDepth = cfg.defaultDepth; 
     virtualScreen = if cfg.virtualScreen != null then 
         "Virtual ${toString cfg.virtualScreen.x} ${toString cfg.virtualScreen.y}" 
diff --git a/modules/services/x11/xserver/xserver.conf b/modules/services/x11/xserver/xserver.conf
index 66cb2571a8d..5b784884075 100644
--- a/modules/services/x11/xserver/xserver.conf
+++ b/modules/services/x11/xserver/xserver.conf
@@ -23,6 +23,8 @@ EndSection
 
 @synapticsInputDevice@
 
+@wacomInputDevice@
+
 Section "Monitor"
   Identifier   "Monitor[0]"
   Option       "DPMS"
-- 
GitLab


From 32bb5b2d0fa14e6e4f2892877d7b1f00f05d1921 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 4 Aug 2009 08:50:02 +0000
Subject: [PATCH 1688/5331] * Bring back the options to enable/disable the
 Intel firmwares.

svn path=/nixos/branches/modular-nixos/; revision=16574
---
 modules/hardware/network/intel-2200bg.nix     | 35 +++++++++++++++----
 modules/hardware/network/intel-3945abg.nix    | 35 +++++++++++--------
 .../installer/tools/nixos-hardware-scan.pl    | 13 ++++---
 modules/module-list.mask                      |  4 ---
 modules/module-list.nix                       |  2 ++
 5 files changed, 58 insertions(+), 31 deletions(-)
 delete mode 100644 modules/module-list.mask

diff --git a/modules/hardware/network/intel-2200bg.nix b/modules/hardware/network/intel-2200bg.nix
index a9069da1e94..382f7b78bd9 100644
--- a/modules/hardware/network/intel-2200bg.nix
+++ b/modules/hardware/network/intel-2200bg.nix
@@ -1,11 +1,34 @@
 {pkgs, config, ...}:
 
 {
-  services = {
-    udev = {
-      # Warning: setting this option requires acceptance of the firmware
-      # license, see http://ipw2200.sourceforge.net/firmware.php?fid=7.
-      addFirmware = [ pkgs.ipw2200fw ];
+
+  ###### interface
+
+  options = {
+  
+    networking.enableIntel2200BGFirmware = pkgs.lib.mkOption {
+      default = false;
+      type = pkgs.lib.types.bool;
+      description = ''
+        Turn on this option if you want firmware for the Intel
+        PRO/Wireless 2200BG to be loaded automatically.  This is
+        required if you want to use this device.  Intel requires you to
+        accept the license for this firmware, see
+        <link xlink:href='http://ipw2200.sourceforge.net/firmware.php?fid=7'/>.
+      '';
     };
+
+  };
+
+
+  ###### implementation
+  
+  config = pkgs.lib.mkIf config.networking.enableIntel2200BGFirmware {
+  
+    # Warning: setting this option requires acceptance of the firmware
+    # license, see http://ipw2200.sourceforge.net/firmware.php?fid=7.
+    services.udev.addFirmware = [ pkgs.ipw2200fw ];
+
   };
-}
\ No newline at end of file
+  
+}
diff --git a/modules/hardware/network/intel-3945abg.nix b/modules/hardware/network/intel-3945abg.nix
index 3344704ba5a..5468f7bc18d 100644
--- a/modules/hardware/network/intel-3945abg.nix
+++ b/modules/hardware/network/intel-3945abg.nix
@@ -1,22 +1,29 @@
 {pkgs, config, ...}:
 
-let
-  inherit (config.boot) kernelPackages;
-in
+{
 
-# !!! make this optional
+  ###### interface
+
+  options = {
+  
+    networking.enableIntel3945ABGFirmware = pkgs.lib.mkOption {
+      default = false;
+      type = pkgs.lib.types.bool;
+      description = ''
+        This option enables automatic loading of the firmware for the Intel
+        PRO/Wireless 3945ABG.
+      '';
+    };
 
-{
-  boot = {
-    extraModulePackages =
-      pkgs.lib.optional
-        (!kernelPackages.kernel.features ? iwlwifi)
-        kernelPackages.iwlwifi;
   };
 
-  services = {
-    udev = {
-      addFirmware = [ pkgs.iwlwifi3945ucode ];
-    };
+
+  ###### implementation
+  
+  config = pkgs.lib.mkIf config.networking.enableIntel3945ABGFirmware {
+  
+    services.udev.addFirmware = [ pkgs.iwlwifi3945ucode ];
+
   };
+  
 }
diff --git a/modules/installer/tools/nixos-hardware-scan.pl b/modules/installer/tools/nixos-hardware-scan.pl
index c1d94b93927..73f65a6d83e 100644
--- a/modules/installer/tools/nixos-hardware-scan.pl
+++ b/modules/installer/tools/nixos-hardware-scan.pl
@@ -4,7 +4,7 @@ use File::Spec;
 use File::Basename;
 
 
-my @requireList = ();
+my @attrs = ();
 my @kernelModules = ();
 my @initrdKernelModules = ();
 
@@ -96,12 +96,12 @@ sub pciCheck {
     # Can't rely on $module here, since the module may not be loaded
     # due to missing firmware.  Ideally we would check modules.pcimap
     # here.
-    push @requireList, "./nixos/hardware/network/intel-2200bg.nix" if
+    push @attrs, "networking.enableIntel2200BGFirmware = true;" if
         $vendor eq "0x8086" &&
         ($device eq "0x1043" || $device eq "0x104f" || $device eq "0x4220" ||
          $device eq "0x4221" || $device eq "0x4223" || $device eq "0x4224");
 
-    push @requireList, "./nixos/hardware/network/intel-3945abg.nix" if
+    push @attrs, "networking.enableIntel3945ABGFirmware = true;" if
         $vendor eq "0x8086" &&
         ($device eq "0x4229" || $device eq "0x4230" ||
          $device eq "0x4222" || $device eq "0x4227");
@@ -202,7 +202,7 @@ sub multiLineList {
     my $indent = shift;
     my $res = "";
     foreach my $s (@_) {
-        $res .= "\n$indent  $s";
+        $res .= "\n$indent$s";
     }
     $res .= "\n$indent";
     return $res;
@@ -210,19 +210,18 @@ sub multiLineList {
 
 my $initrdKernelModules = toNixExpr(removeDups @initrdKernelModules);
 my $kernelModules = toNixExpr(removeDups @kernelModules);
-my $requireList = multiLineList("  ", removeDups @requireList);
+my $attrs = multiLineList("  ", removeDups @attrs);
 
 print <<EOF ;
 # This is a generated file.  Do not modify!
 # Make changes to /etc/nixos/configuration.nix instead.
 {
-  require = [$requireList];
-
   boot.initrd.extraKernelModules = [ $initrdKernelModules ];
   boot.kernelModules = [ $kernelModules ];
 
   nix.maxJobs = $cpus;
 
   services.xserver.videoDriver = "$videoDriver";
+  $attrs
 }
 EOF
diff --git a/modules/module-list.mask b/modules/module-list.mask
deleted file mode 100644
index 10e9f58925e..00000000000
--- a/modules/module-list.mask
+++ /dev/null
@@ -1,4 +0,0 @@
-# CD-DVD modules are not generic.
-# Avoid all modules from ./installer/cd-dvd/
-
-./installer/cd-dvd/*
diff --git a/modules/module-list.nix b/modules/module-list.nix
index cd37d967066..9938cc6e1b5 100644
--- a/modules/module-list.nix
+++ b/modules/module-list.nix
@@ -8,6 +8,8 @@
   ./config/timezone.nix
   ./config/unix-odbc-drivers.nix
   ./config/users-groups.nix
+  ./hardware/network/intel-2200bg.nix
+  ./hardware/network/intel-3945abg.nix
   ./hardware/pcmcia.nix
   ./installer/grub/grub.nix
   ./installer/tools/nixos-checkout.nix
-- 
GitLab


From 7d3e2b15ef158d2896cd96e97895b3a39b85a36a Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 4 Aug 2009 16:09:07 +0000
Subject: [PATCH 1689/5331] svn path=/nixos/branches/modular-nixos/;
 revision=16585

---
 modules/virtualisation/qemu-vm.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/virtualisation/qemu-vm.nix b/modules/virtualisation/qemu-vm.nix
index 04b5c880d26..333c14f137f 100644
--- a/modules/virtualisation/qemu-vm.nix
+++ b/modules/virtualisation/qemu-vm.nix
@@ -39,10 +39,10 @@ let
       NIX_DISK_IMAGE=''${NIX_DISK_IMAGE:-${config.virtualisation.diskImage}}
 
       if ! test -e "$NIX_DISK_IMAGE"; then
-          ${pkgs.kvm}/bin/qemu-img create -f qcow2 "$NIX_DISK_IMAGE" 512M || exit 1
+          ${pkgs.qemu_kvm}/bin/qemu-img create -f qcow2 "$NIX_DISK_IMAGE" 512M || exit 1
       fi
       
-      ${pkgs.kvm}/bin/qemu-system-x86_64 \
+      ${pkgs.qemu_kvm}/bin/qemu-system-x86_64 \
           -net nic,model=virtio -net user -smb / \
           -drive file=$NIX_DISK_IMAGE,if=virtio,boot=on \
           -kernel ${config.system.build.system}/kernel \
-- 
GitLab


From 02c119a104c35ef22540608432d191e5007df236 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 5 Aug 2009 11:43:51 +0000
Subject: [PATCH 1690/5331] * Workaround for hangs on x86_64.

svn path=/nixos/branches/modular-nixos/; revision=16590
---
 modules/virtualisation/qemu-vm.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/modules/virtualisation/qemu-vm.nix b/modules/virtualisation/qemu-vm.nix
index 333c14f137f..d8ab12daa93 100644
--- a/modules/virtualisation/qemu-vm.nix
+++ b/modules/virtualisation/qemu-vm.nix
@@ -42,7 +42,10 @@ let
           ${pkgs.qemu_kvm}/bin/qemu-img create -f qcow2 "$NIX_DISK_IMAGE" 512M || exit 1
       fi
       
+      # -no-kvm-irqchip is needed to prevent the CIFS mount from
+      # hanging the VM on x86_64.
       ${pkgs.qemu_kvm}/bin/qemu-system-x86_64 \
+          -no-kvm-irqchip \
           -net nic,model=virtio -net user -smb / \
           -drive file=$NIX_DISK_IMAGE,if=virtio,boot=on \
           -kernel ${config.system.build.system}/kernel \
-- 
GitLab


From a9071b3283562cfa5c9b279644a8a5f181d32825 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 5 Aug 2009 14:43:13 +0000
Subject: [PATCH 1691/5331] svn path=/nixos/branches/modular-nixos/;
 revision=16592

---
 lib/eval-config.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/lib/eval-config.nix b/lib/eval-config.nix
index 4a1853a8d32..9dccc62e1ec 100644
--- a/lib/eval-config.nix
+++ b/lib/eval-config.nix
@@ -6,8 +6,11 @@
 , system ? builtins.currentSystem
 , nixpkgs ? import ./from-env.nix "NIXPKGS" /etc/nixos/nixpkgs
 , pkgs ? import nixpkgs {inherit system;}
+, extraArgs ? {}
 }:
 
+let extraArgs_ = extraArgs; in
+
 rec {
   inherit nixpkgs pkgs;
 
@@ -16,7 +19,7 @@ rec {
     ./check-config.nix
   ] ++ (import ../modules/module-list.nix);
 
-  extraArgs = {
+  extraArgs = extraArgs_ // {
     inherit pkgs;
     modulesPath = ../modules;
   };
-- 
GitLab


From 8c034b988d6628d0f30e17f89272e6ea3468e67a Mon Sep 17 00:00:00 2001
From: Sander van der Burg <s.vanderburg@tudelft.nl>
Date: Sun, 9 Aug 2009 20:19:07 +0000
Subject: [PATCH 1692/5331] Added a lot of modifications in order to expression
 a Tomcat configuration better and to perform more efficient management of
 various Tomcat components.

With these modifications, a user can configure a tomcat instance with web applications and web services by writing a service, such as:

...

services = {
  tomcat = {
    enable = true;
    webapps = [ mypkgs.HelloWorldWebApplication ];
    axis2 = {
      enable = true;
      services = [ mypkgs.HelloService mypkgs.HelloWorldService ];
    };
  };
};


svn path=/nixos/trunk/; revision=16619
---
 modules/services/web-servers/tomcat.nix | 243 ++++++++++++++++--------
 1 file changed, 161 insertions(+), 82 deletions(-)

diff --git a/modules/services/web-servers/tomcat.nix b/modules/services/web-servers/tomcat.nix
index e873c1cf4a2..fc64acfa3d9 100644
--- a/modules/services/web-servers/tomcat.nix
+++ b/modules/services/web-servers/tomcat.nix
@@ -22,10 +22,10 @@ let
           description = "User account under which Apache Tomcat runs.";
         };      
         
-        deployFrom = mkOption {
-          default = "";
-          description = "Location where webapplications are stored. Leave empty to use the baseDir.";
-        };
+	group = mkOption {
+          default = "tomcat";
+          description = "Group account under which Apache Tomcat runs.";
+        };      
         
         javaOpts = mkOption {
           default = "";
@@ -37,20 +37,32 @@ let
           description = "Parameters to pass to the Java Virtual Machine which spawns the Catalina servlet container";
         };
         
-        sharedLibFrom = mkOption {
-          default = "";
-          description = "Location where shared libraries are stored. Leave empty to use the baseDir.";
-        };
-        
-        commonLibFrom = mkOption {
-          default = "";
-          description = "Location where common libraries are stored. Leave empty to use the baseDir.";
+        sharedLibs = mkOption {
+          default = [];
+          description = "List containing JAR files or directories with JAR files which are libraries shared by the web applications";
         };
         
-        contextXML = mkOption {
-          default = "";
-          description = "Location of the context.xml to use. Leave empty to use the default.";
+        commonLibs = mkOption {
+          default = [];
+          description = "List containing JAR files or directories with JAR files which are libraries shared by the web applications and the servlet container";
         };
+	
+	webapps = mkOption {
+	  default = [ pkgs.tomcat6 ];
+	  description = "List containing WAR files or directories with WAR files which are web applications to be deployed on Tomcat";
+	};
+	
+	axis2 = {
+	  enable = mkOption {
+	    default = false;
+	    description = "Whether to enable an Apache Axis2 container";
+	  };
+	  
+	  services = mkOption {
+	    default = [];
+	    description = "List containing AAR files or directories with AAR files which are web services to be deployed on Axis2";
+	  };
+	};
       };
     };
   };
@@ -92,75 +104,142 @@ mkIf config.services.tomcat.enable {
         stop on network-interfaces/stop
         
         start script
-            # Create initial state data
-            
-            if ! test -d ${cfg.baseDir}
-            then    
-                mkdir -p ${cfg.baseDir}/webapps
-                mkdir -p ${cfg.baseDir}/shared
-                mkdir -p ${cfg.baseDir}/lib
-                cp -av ${pkgs.tomcat6}/{conf,temp,logs} ${cfg.baseDir}
-            fi
-            
-            # Deploy context.xml
-            
-            if test "${cfg.contextXML}" = ""
-            then
-                cp ${pkgs.tomcat6}/conf/context.xml.default ${cfg.baseDir}/conf/context.xml
-            else
-                cp ${cfg.contextXML} ${cfg.baseDir}/conf/context.xml
-            fi
-                    
-            # Deploy all webapplications
-            
-            if ! test "${cfg.deployFrom}" = ""
-            then
-                rm -rf ${cfg.baseDir}/webapps
-                mkdir -p ${cfg.baseDir}/webapps
-                for i in ${cfg.deployFrom}/*
-                do
-                    cp -rL $i ${cfg.baseDir}/webapps
-                done
-            fi
-            
-            # Fix permissions
-            
-            chown -R ${cfg.user} ${cfg.baseDir}
-            
-            for i in `find ${cfg.baseDir} -type d`
-            do
-                chmod -v 755 $i
-            done
-            
-            for i in `find ${cfg.baseDir} -type f`
-            do
-                chmod -v 644 $i
-            done
-
-            # Deploy all common libraries
-                    
-            rm -rf ${cfg.baseDir}/lib/*
-            
-            if test "${cfg.commonLibFrom}" = ""
-            then
-                commonLibFrom="${pkgs.tomcat6}/lib";
-            else
-                commonLibFrom="${cfg.commonLibFrom}";
-            fi
-            
-            for i in $commonLibFrom/*.jar
-            do
-                ln -s $i ${cfg.baseDir}/lib
-            done
+	    rm -Rf ${cfg.baseDir}
+	    
+	    # Create the base directory
+	    mkdir -p ${cfg.baseDir}
+	    
+	    # Create a symlink to the bin directory of the tomcat component
+	    ln -sf ${pkgs.tomcat6}/bin ${cfg.baseDir}/bin
+	    
+	    # Create a conf/ directory
+	    mkdir -p ${cfg.baseDir}/conf
+	    chown ${cfg.user}:${cfg.group} ${cfg.baseDir}/conf
+	    
+	    # Symlink the config files in the conf/ directory (except for catalina.properties)
+	    for i in $(ls ${pkgs.tomcat6}/conf | grep -v catalina.properties)
+	    do
+	        ln -sf ${pkgs.tomcat6}/conf/$i ${cfg.baseDir}/conf/`basename $i`
+	    done
+	    
+	    # Create a modified catalina.properties file 
+	    # Change all references from CATALINA_HOME to CATALINA_BASE and add support for shared libraries
+	    sed -e 's|''${catalina.home}|''${catalina.base}|g' \
+                -e 's|shared.loader=|shared.loader=''${catalina.base}/shared/lib/*.jar|' \
+		${pkgs.tomcat6}/conf/catalina.properties > ${cfg.baseDir}/conf/catalina.properties
+	    	    
+	    # Create a logs/ directory
+	    mkdir -p ${cfg.baseDir}/logs
+	    chown ${cfg.user}:${cfg.group} ${cfg.baseDir}/logs
+	    
+	    # Create a temp/ directory
+	    mkdir -p ${cfg.baseDir}/temp
+	    chown ${cfg.user}:${cfg.group} ${cfg.baseDir}/temp
 
-            # Deploy all shared libraries
-            
-            if ! test "${cfg.sharedLibFrom}" = ""
-            then
-                rm -f ${cfg.baseDir}/shared/lib
-                ln -s ${cfg.sharedLibFrom} ${cfg.baseDir}/shared/lib
-            fi
+	    # Create a lib/ directory	    
+	    mkdir -p ${cfg.baseDir}/lib
+	    chown ${cfg.user}:${cfg.group} ${cfg.baseDir}/lib
+	    	    
+	    # Create a shared/lib directory
+	    mkdir -p ${cfg.baseDir}/shared/lib
+	    chown ${cfg.user}:${cfg.group} ${cfg.baseDir}/shared/lib
+	    
+	    # Create a webapps/ directory
+	    mkdir -p ${cfg.baseDir}/webapps
+	    chown ${cfg.user}:${cfg.group} ${cfg.baseDir}/webapps
+	    
+	    # Symlink all the given common libs files or paths into the lib/ directory
+	    for i in ${pkgs.tomcat6} ${toString cfg.commonLibs}
+	    do
+		if [ -f $i ]
+		then
+		    # If the given web application is a file, symlink it into the common/lib/ directory
+		    ln -sf $i ${cfg.baseDir}/lib/`basename $i`
+		elif [ -d $i ]
+		then
+		    # If the given web application is a directory, then iterate over the files
+		    # in the special purpose directories and symlink them into the tomcat tree
+		    
+		    for j in $i/lib/*
+		    do
+			ln -sf $j ${cfg.baseDir}/lib/`basename $j`
+		    done
+		fi
+	    done 
 
+	    # Symlink all the given shared libs files or paths into the shared/lib/ directory
+	    for i in ${toString cfg.sharedLibs}
+	    do
+		if [ -f $i ]
+		then
+		    # If the given web application is a file, symlink it into the common/lib/ directory
+		    ln -sf $i ${cfg.baseDir}/shared/lib/`basename $i`
+		elif [ -d $i ]
+		then
+		    # If the given web application is a directory, then iterate over the files
+		    # in the special purpose directories and symlink them into the tomcat tree
+		    
+		    for j in $i/shared/lib/*
+		    do
+			ln -sf $j ${cfg.baseDir}/shared/lib/`basename $j`
+		    done
+		fi
+	    done 
+	    
+	    # Symlink all the given web applications files or paths into the webapps/ directory
+	    for i in ${toString cfg.webapps}
+	    do
+		if [ -f $i ]
+		then
+		    # If the given web application is a file, symlink it into the webapps/ directory
+		    ln -sf $i ${cfg.baseDir}/webapps/`basename $i`
+		elif [ -d $i ]
+		then
+		    # If the given web application is a directory, then iterate over the files
+		    # in the special purpose directories and symlink them into the tomcat tree
+		    
+		    for j in $i/webapps/*
+		    do
+		        ln -sf $j ${cfg.baseDir}/webapps/`basename $j`
+		    done
+		fi
+	    done 
+	    
+	    # Create a work/ directory
+	    mkdir -p ${cfg.baseDir}/work
+	    chown ${cfg.user}:${cfg.group} ${cfg.baseDir}/work
+	    
+	    ${if cfg.axis2.enable == true then
+		''
+		# Copy the Axis2 web application
+		cp -av ${pkgs.axis2}/webapps/axis2 ${cfg.baseDir}/webapps
+		
+		# Turn off addressing, which causes many errors
+		sed -i -e 's%<module ref="addressing"/>%<!-- <module ref="addressing"/> -->%' ${cfg.baseDir}/webapps/axis2/WEB-INF/conf/axis2.xml
+		
+		# Modify permissions on the Axis2 application
+		chown -R ${cfg.user}:${cfg.group} ${cfg.baseDir}/webapps/axis2
+				
+		# Symlink all the given web service files or paths into the webapps/axis2/WEB-INF/services directory
+		for i in ${toString cfg.axis2.services}
+		do
+		    if [ -f $i ]
+		    then
+			# If the given web service is a file, symlink it into the webapps/axis2/WEB-INF/services
+			ln -sf $i ${cfg.baseDir}/webapps/axis2/WEB-INF/services/`basename $i`
+		    elif [ -d $i ]
+		    then
+			# If the given web application is a directory, then iterate over the files
+		        # in the special purpose directories and symlink them into the tomcat tree
+			
+			for j in $i/webapps/axis2/WEB-INF/services/*
+			do
+			    ln -sf $j ${cfg.baseDir}/webapps/axis2/WEB-INF/services/`basename $j`
+			done
+		    fi
+		done    
+		''
+	    else ""}
         end script
         
         respawn ${pkgs.su}/bin/su -s ${pkgs.bash}/bin/sh ${cfg.user} -c 'CATALINA_BASE=${cfg.baseDir} JAVA_HOME=${pkgs.jdk} JAVA_OPTS="${cfg.javaOpts}" CATALINA_OPTS="${cfg.catalinaOpts}" ${pkgs.tomcat6}/bin/startup.sh; sleep 1000d'
-- 
GitLab


From ac29ad197bd46b24c7004601da7437abec8e3b64 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Mon, 10 Aug 2009 09:20:05 +0000
Subject: [PATCH 1693/5331] stage-1-init: Remove timeout from `fail()'.

Timeouts upon failure can be harmful, e.g., after a file system failure
that needs manual intervention.

svn path=/nixos/trunk/; revision=16637
---
 modules/system/boot/stage-1-init.sh | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/modules/system/boot/stage-1-init.sh b/modules/system/boot/stage-1-init.sh
index 1ba65cc24cc..8604df5a70d 100644
--- a/modules/system/boot/stage-1-init.sh
+++ b/modules/system/boot/stage-1-init.sh
@@ -8,7 +8,6 @@ export LD_LIBRARY_PATH=@extraUtils@/lib
 fail() {
     # If starting stage 2 failed, allow the user to repair the problem
     # in an interactive shell.
-    timeout=15
     cat <<EOF
 
 An error occured in stage 1 of the boot process, which must mount the
@@ -21,7 +20,7 @@ of the following keys within $timeout seconds:
   *) to ignore the error and continue.
 EOF
 
-    read -t $timeout reply
+    read reply
     
     case $reply in
         f)
-- 
GitLab


From 4c848efc1aa7175a40ab4c01c1b5f843c612ae8b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Mon, 10 Aug 2009 10:07:30 +0000
Subject: [PATCH 1694/5331] bashrc: Remove obsolete `aclocal' and `rpcgen'
 hacks.

svn path=/nixos/trunk/; revision=16640
---
 modules/programs/bash/bashrc.sh | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/modules/programs/bash/bashrc.sh b/modules/programs/bash/bashrc.sh
index 445d35ba0d1..b180d352fdb 100644
--- a/modules/programs/bash/bashrc.sh
+++ b/modules/programs/bash/bashrc.sh
@@ -24,12 +24,6 @@ for i in $NIX_PROFILES; do # !!! reverse
     export INFOPATH=$i/info:$i/share/info:$INFOPATH
     export PKG_CONFIG_PATH="$i/lib/pkgconfig:$PKG_CONFIG_PATH"
 
-    # Automake's `aclocal' bails out if it finds non-existent directories
-    # in its path.  !!! This has been fixed in the stdenv branch.
-    if [ -d "$i/share/aclocal" ]; then
-        export ACLOCAL_PATH="$i/share/aclocal:$ACLOCAL_PATH"
-    fi
-
     # "lib/site_perl" is for backwards compatibility with packages
     # from Nixpkgs <= 0.12.
     export PERL5LIB="$i/lib/perl5/site_perl:$i/lib/site_perl:$PERL5LIB"
@@ -67,6 +61,3 @@ alias ll="ls -l"
 alias l="ls -alh"
 alias which="type -p"
 
-
-# Help `rpcgen' find `cpp', assuming it's installed in the user's environment.
-alias rpcgen="rpcgen -Y $HOME/.nix-profile/bin"
-- 
GitLab


From fe51b0c6c34ffc1186056112bab488434d327d5a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Mon, 10 Aug 2009 10:18:33 +0000
Subject: [PATCH 1695/5331] bashrc: Source `${bash}/etc/bash_completion' when
 available.

svn path=/nixos/trunk/; revision=16641
---
 modules/programs/bash/bash.nix  |  4 +++-
 modules/programs/bash/bashrc.sh | 10 ++++++++++
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/modules/programs/bash/bash.nix b/modules/programs/bash/bash.nix
index f7ac48ccb28..38ed7c7a186 100644
--- a/modules/programs/bash/bash.nix
+++ b/modules/programs/bash/bash.nix
@@ -30,12 +30,14 @@ in
         # should go into this script.
         source = pkgs.substituteAll {
           src = ./bashrc.sh;
+
+          bash = pkgs.bash;
           systemPath = config.system.path;
           wrapperDir = config.security.wrapperDir;
           modulesTree = config.system.modulesTree;
           shellInit = config.environment.shellInit;
         };
-        target = "bashrc";      
+        target = "bashrc";
       }
 
       { # Script executed when the shell starts as a login shell.
diff --git a/modules/programs/bash/bashrc.sh b/modules/programs/bash/bashrc.sh
index b180d352fdb..b09e3230a5d 100644
--- a/modules/programs/bash/bashrc.sh
+++ b/modules/programs/bash/bashrc.sh
@@ -61,3 +61,13 @@ alias ll="ls -l"
 alias l="ls -alh"
 alias which="type -p"
 
+# Completion.
+if [ -d "@bash@/etc/bash_completion.d" ]
+then
+    export BASH_COMPLETION_DIR="@bash@/etc/bash_completion.d"
+fi
+if [ -f "@bash@/etc/bash_completion" ]
+then
+    export BASH_COMPLETION="@bash@/etc/bash_completion"
+    source "$BASH_COMPLETION"
+fi
-- 
GitLab


From 89810914e4201e5d3e39f467cf692bc5b8875561 Mon Sep 17 00:00:00 2001
From: Sander van der Burg <s.vanderburg@tudelft.nl>
Date: Mon, 10 Aug 2009 15:27:25 +0000
Subject: [PATCH 1696/5331] Added virtual host support, which requires some
 more testing

svn path=/nixos/trunk/; revision=16649
---
 modules/services/web-servers/tomcat.nix | 49 ++++++++++++++++++++++---
 1 file changed, 44 insertions(+), 5 deletions(-)

diff --git a/modules/services/web-servers/tomcat.nix b/modules/services/web-servers/tomcat.nix
index fc64acfa3d9..4c37449983a 100644
--- a/modules/services/web-servers/tomcat.nix
+++ b/modules/services/web-servers/tomcat.nix
@@ -52,6 +52,11 @@ let
 	  description = "List containing WAR files or directories with WAR files which are web applications to be deployed on Tomcat";
 	};
 	
+	virtualHosts = mkOption {
+	  default = [];
+	  description = "List consisting of a virtual host name and a list of web applications to deploy on each virtual host";
+	};
+	
 	axis2 = {
 	  enable = mkOption {
 	    default = false;
@@ -116,8 +121,8 @@ mkIf config.services.tomcat.enable {
 	    mkdir -p ${cfg.baseDir}/conf
 	    chown ${cfg.user}:${cfg.group} ${cfg.baseDir}/conf
 	    
-	    # Symlink the config files in the conf/ directory (except for catalina.properties)
-	    for i in $(ls ${pkgs.tomcat6}/conf | grep -v catalina.properties)
+	    # Symlink the config files in the conf/ directory (except for catalina.properties and server.xml)
+	    for i in $(ls ${pkgs.tomcat6}/conf | grep -v catalina.properties server.xml)
 	    do
 	        ln -sf ${pkgs.tomcat6}/conf/$i ${cfg.baseDir}/conf/`basename $i`
 	    done
@@ -127,7 +132,11 @@ mkIf config.services.tomcat.enable {
 	    sed -e 's|''${catalina.home}|''${catalina.base}|g' \
                 -e 's|shared.loader=|shared.loader=''${catalina.base}/shared/lib/*.jar|' \
 		${pkgs.tomcat6}/conf/catalina.properties > ${cfg.baseDir}/conf/catalina.properties
-	    	    
+	    
+	    # Create a modified server.xml which also includes all virtual hosts
+	    sed -e "/<Engine name=\"Catalina\" defaultHost=\"localhost\">/a\  ${toString (map (virtualHost: ''<Host name=\"${virtualHost.name}\" appBase=\"virtualhosts/${virtualHost.name}/webapps\" unpackWARs=\"true\" autoDeploy=\"true\" xmlValidation=\"false\" xmlNamespaceAware=\"false\" />'' ) cfg.virtualHosts)}" \
+	        ${pkgs.tomcat6}/conf/server.xml > ${cfg.baseDir}/conf/server.xml
+	    
 	    # Create a logs/ directory
 	    mkdir -p ${cfg.baseDir}/logs
 	    chown ${cfg.user}:${cfg.group} ${cfg.baseDir}/logs
@@ -165,7 +174,7 @@ mkIf config.services.tomcat.enable {
 			ln -sf $j ${cfg.baseDir}/lib/`basename $j`
 		    done
 		fi
-	    done 
+	    done	    	     
 
 	    # Symlink all the given shared libs files or paths into the shared/lib/ directory
 	    for i in ${toString cfg.sharedLibs}
@@ -203,7 +212,37 @@ mkIf config.services.tomcat.enable {
 		        ln -sf $j ${cfg.baseDir}/webapps/`basename $j`
 		    done
 		fi
-	    done 
+	    done	    	    
+	    
+	    ${toString (map (virtualHost: ''
+	      # Create webapps directory for the virtual host
+	      mkdir -p ${cfg.baseDir}/virtualhosts/${virtualHost.name}/webapps
+	      
+	      # Modify ownership
+	      chown ${cfg.user}:${cfg.group} ${cfg.baseDir}/virtualhosts/${virtualHost.name}/webapps
+	      
+	      # Symlink all the given web applications files or paths into the webapps/ directory
+	      # of this virtual host
+	      for i in ${toString virtualHost.webapps}
+	      do
+		  if [ -f $i ]
+		  then
+		      # If the given web application is a file, symlink it into the webapps/ directory
+		      ln -sf $i ${cfg.baseDir}/virtualhosts/${virtualHost.name}/webapps/`basename $i`
+		  elif [ -d $i ]
+		  then
+		      # If the given web application is a directory, then iterate over the files
+		      # in the special purpose directories and symlink them into the tomcat tree
+		    
+		      for j in $i/webapps/*
+		      do
+		          ln -sf $j ${cfg.baseDir}/virtualhosts/${virtualHost.name}/webapps/`basename $j`
+		      done
+                  fi	                  
+	      done
+	      
+	      ''
+	    ) cfg.virtualHosts) }
 	    
 	    # Create a work/ directory
 	    mkdir -p ${cfg.baseDir}/work
-- 
GitLab


From 0ab6be1c8172947aa8930d65f3d878f1737f0d75 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 10 Aug 2009 16:18:51 +0000
Subject: [PATCH 1697/5331] * Restarting dbus no longer seems to kill the X
 server.

svn path=/nixos/trunk/; revision=16650
---
 modules/system/activation/switch-to-configuration.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/system/activation/switch-to-configuration.sh b/modules/system/activation/switch-to-configuration.sh
index 6cd5d6aff97..3d084f92ff8 100644
--- a/modules/system/activation/switch-to-configuration.sh
+++ b/modules/system/activation/switch-to-configuration.sh
@@ -85,7 +85,7 @@ EOF
 
         # Hack: skip the sys-* and ctrl-alt-delete events.
         # Another hack: don't restart the X server (that would kill all the clients).
-        if echo "$event" | grep -q "^sys-\|^ctrl-\|^xserver\|^dbus"; then continue; fi
+        if echo "$event" | grep -q "^sys-\|^ctrl-\|^xserver"; then continue; fi
     
         if ! test -e "$oldEvents/$event"; then
             echo "starting $event..."
-- 
GitLab


From 2331a5140d0cd4be4037b394452f3f3368b734d5 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 10 Aug 2009 18:25:09 +0000
Subject: [PATCH 1698/5331] * Added a module for the bluetooth daemon. *
 Refactored some other modules (dbus, hal).

svn path=/nixos/trunk/; revision=16652
---
 modules/services/hardware/bluetooth.nix      |  38 +++++
 modules/services/hardware/hal.nix            | 165 +++++++++----------
 modules/services/misc/disnix.nix             |   2 +-
 modules/services/networking/avahi-daemon.nix |   2 +-
 modules/services/networking/firewall.nix     |   7 +-
 modules/services/system/consolekit.nix       |   2 +-
 modules/services/system/dbus.nix             | 161 +++++++++---------
 7 files changed, 199 insertions(+), 178 deletions(-)
 create mode 100644 modules/services/hardware/bluetooth.nix

diff --git a/modules/services/hardware/bluetooth.nix b/modules/services/hardware/bluetooth.nix
new file mode 100644
index 00000000000..4e00f43aee7
--- /dev/null
+++ b/modules/services/hardware/bluetooth.nix
@@ -0,0 +1,38 @@
+{pkgs, config, ...}:
+
+with pkgs.lib;
+
+{
+
+  ###### interface
+
+  options = {
+  
+  };
+
+
+  ###### implementation
+  
+  config = {
+
+    jobs = pkgs.lib.singleton
+      { name = "bluetoothd";
+
+        startOn = "dbus";
+        stopOn = "dbus";
+
+        preStart =
+          ''
+            mkdir -m 0755 -p /var/lib/bluetooth
+          '';
+
+        exec = "${pkgs.bluez}/sbin/bluetoothd --nodaemon --debug";
+      };
+
+    environment.systemPackages = [pkgs.bluez pkgs.openobex pkgs.obexftp];
+
+    services.dbus.enable = true;
+    services.dbus.packages = [pkgs.bluez];
+  };  
+  
+}
diff --git a/modules/services/hardware/hal.nix b/modules/services/hardware/hal.nix
index 475ba7299d7..972e8b5e3c9 100644
--- a/modules/services/hardware/hal.nix
+++ b/modules/services/hardware/hal.nix
@@ -1,119 +1,104 @@
 # HAL daemon.
 {pkgs, config, ...}:
 
-###### interface
-let
-  inherit (pkgs.lib) mkOption;
+with pkgs.lib;
 
-  options = {
-    services = {
-      hal = {
-        enable = mkOption {
-          default = true;
-          description = "
-            Whether to start the HAL daemon.
-          ";
-        };
-
-        extraFdi = mkOption {
-          default = [];
-          example = [ "/nix/store/.../fdi" ];
-          description = "
-            Extend HAL daemon configuration with additionnal paths.
-          ";
-        };
-      };
-    };
-  };
-in
-
-###### implementation
 let
+
   cfg = config.services.hal;
-  inherit (pkgs.lib) mkIf;
 
   inherit (pkgs) hal;
 
-  user = {
-    name = "haldaemon";
-    uid = config.ids.uids.haldaemon;
-    description = "HAL daemon user";
-  };
-
-  group = {
-    name = "haldaemon";
-    gid = config.ids.gids.haldaemon;
-  };
-
   fdi =
     if cfg.extraFdi == [] then
-      hal + "/share/hal/fdi"
+      "${hal}/share/hal/fdi"
     else
       pkgs.buildEnv {
         name = "hal-fdi";
         pathsToLink = [ "/preprobe" "/information" "/policy" ];
-        paths = [ (hal + "/share/hal/fdi") ] ++ cfg.extraFdi;
+        paths = [ "${hal}/share/hal/fdi" ] ++ cfg.extraFdi;
       };
 
-  job = {
-    name = "hal";
-    
-    job = ''
-      description "HAL daemon"
+in
 
-      # !!! TODO: make sure that HAL starts after acpid,
-      # otherwise hald-addon-acpi will grab /proc/acpi/event.
-      start on ${if config.powerManagement.enable then "acpid" else "dbus"}
-      stop on shutdown
+{
 
-      start script
+  ###### interface
+  
+  options = {
+  
+    services.hal = {
+    
+      enable = mkOption {
+        default = true;
+        description = "
+          Whether to start the HAL daemon.
+        ";
+      };
 
-          mkdir -m 0755 -p /var/cache/hald
-          
-          rm -f /var/cache/hald/fdi-cache
+      extraFdi = mkOption {
+        default = [];
+        example = [ "/nix/store/.../fdi" ];
+        description = "
+          Extend HAL daemon configuration with additionnal paths.
+        ";
+      };
 
-      end script
+    };
+    
+  };
 
-      # HACK ? These environment variables manipulated inside
-      # 'src'/hald/mmap_cache.c are used for testing the daemon
-      env HAL_FDI_SOURCE_PREPROBE=${fdi}/preprobe
-      env HAL_FDI_SOURCE_INFORMATION=${fdi}/information
-      env HAL_FDI_SOURCE_POLICY=${fdi}/policy
 
-      respawn ${hal}/sbin/hald --daemon=no
-    '';
-  };
-in
+  ###### implementation
+  
+  config = mkIf cfg.enable {
 
-mkIf cfg.enable {
-  require = [
-    # ../upstart-jobs/default.nix # config.services.extraJobs
-    # ../system/user.nix # users.*
-    # ../upstart-jobs/udev.nix # services.udev.*
-    # ../upstart-jobs/dbus.nix # services.dbus.*
-    # ? # config.environment.extraPackages
-    options
-  ];
-
-  environment = {
-    extraPackages = [hal];
-  };
+    environment.systemPackages = [hal];
 
-  users = {
-    extraUsers = [user];
-    extraGroups = [group];
-  };
+    users.extraUsers = singleton
+      { name = "haldaemon";
+        uid = config.ids.uids.haldaemon;
+        description = "HAL daemon user";
+      };
 
-  services = {
-    extraJobs = [job];
+    users.extraGroups = singleton
+      { name = "haldaemon";
+        gid = config.ids.gids.haldaemon;
+      };
 
-    udev = {
-      addUdevPkgs = [hal];
-    };
+    jobs = singleton
+      { name = "hal";
+
+        description = "HAL daemon";
+        
+        # !!! TODO: make sure that HAL starts after acpid,
+        # otherwise hald-addon-acpi will grab /proc/acpi/event.
+        startOn = if config.powerManagement.enable then "acpid" else "dbus";
+        stopOn = "shutdown";
+
+        # !!! HACK? These environment variables manipulated inside
+        # 'src'/hald/mmap_cache.c are used for testing the daemon
+        environment =
+          { HAL_FDI_SOURCE_PREPROBE = "${fdi}/preprobe";
+            HAL_FDI_SOURCE_INFORMATION = "${fdi}/information";
+            HAL_FDI_SOURCE_POLICY = "${fdi}/policy";
+          };
+
+        preStart =
+          ''
+            mkdir -m 0755 -p /var/cache/hald
+            
+            rm -f /var/cache/hald/fdi-cache
+          '';
+
+        exec = "${hal}/sbin/hald --daemon=no";
+      };
 
-    dbus = {
-      enable = true;
-      services = [hal];
-    };
+    services.udev.addUdevPkgs = [hal];
+
+    services.dbus.enable = true;
+    services.dbus.packages = [hal];
+    
   };
-}
+
+}
\ No newline at end of file
diff --git a/modules/services/misc/disnix.nix b/modules/services/misc/disnix.nix
index 0f80cf6804c..8e96b6f2130 100644
--- a/modules/services/misc/disnix.nix
+++ b/modules/services/misc/disnix.nix
@@ -58,7 +58,7 @@ mkIf cfg.enable {
 
     dbus = {
       enable = true;
-      services = [pkgs.disnix];
+      packages = [pkgs.disnix];
     };
   };
 }
diff --git a/modules/services/networking/avahi-daemon.nix b/modules/services/networking/avahi-daemon.nix
index 2a10d8f28d1..d01bf4c3b54 100644
--- a/modules/services/networking/avahi-daemon.nix
+++ b/modules/services/networking/avahi-daemon.nix
@@ -153,7 +153,7 @@ mkIf cfg.enable {
 
     dbus = {
       enable = true;
-      services = [avahi];
+      packages = [avahi];
     };
   };
 }
diff --git a/modules/services/networking/firewall.nix b/modules/services/networking/firewall.nix
index ef6b3a94472..85f88330134 100644
--- a/modules/services/networking/firewall.nix
+++ b/modules/services/networking/firewall.nix
@@ -68,7 +68,12 @@ in
               ) config.networking.firewall.allowedTCPPorts
             }
 
-            # Drop everything else.              
+            # Accept multicast.  Not a big security risk since
+            # probably nobody is listening anyway.
+            ${iptables} -A INPUT -d 224.0.0.0/4 -j ACCEPT
+
+            # Drop everything else.
+            ${iptables} -A INPUT -j LOG --log-level info --log-prefix "firewall: "
             ${iptables} -A INPUT -j DROP
           '';
 
diff --git a/modules/services/system/consolekit.nix b/modules/services/system/consolekit.nix
index de3fc8897c0..e5d1f104a80 100644
--- a/modules/services/system/consolekit.nix
+++ b/modules/services/system/consolekit.nix
@@ -53,7 +53,7 @@ mkIf cfg.enable {
 
     dbus = {
       enable = true;
-      services = [ConsoleKit];
+      packages = [ConsoleKit];
     };
   };
 }
diff --git a/modules/services/system/dbus.nix b/modules/services/system/dbus.nix
index f3d56e9239c..9dc6bd9d78b 100644
--- a/modules/services/system/dbus.nix
+++ b/modules/services/system/dbus.nix
@@ -1,116 +1,109 @@
 # D-Bus system-wide daemon.
 {pkgs, config, ...}:
 
-###### interface
-let
-  inherit (pkgs.lib) mkOption;
-
-  options = {
-    services = {
-      dbus = {
-
-        enable = mkOption {
-          default = true;
-          description = "
-            Whether to start the D-Bus message bus daemon.  It is required
-            by the HAL service.
-          ";
-          merge = pkgs.lib.mergeEnableOption;
-        };
-
-        services = mkOption {
-          default = [];
-          description = ".. fill me ..";
-        };
-
-      };
-    };
-  };
-in
+with pkgs.lib;
 
-###### implementation
 let
+
   cfg = config.services.dbus;
-  services = cfg.services;
-  inherit (pkgs.lib) mkIf;
 
-  inherit (pkgs) stdenv dbus;
+  inherit (pkgs) dbus;
 
   homeDir = "/var/run/dbus";
 
-  # Take the standard system configuration file, except that we don't
-  # want to fork (Upstart will monitor the daemon).
-  configFile = stdenv.mkDerivation {
+  configFile = pkgs.stdenv.mkDerivation {
     name = "dbus-conf";
-    buildCommand = "
+    buildCommand = ''
       ensureDir $out
       ln -s ${dbus}/etc/dbus-1/system.conf $out/system.conf
 
+      # Note: system.conf includes ./system.d (i.e. it has a relative,
+      # not absolute path).
       ensureDir $out/system.d
-      for i in ${toString services}; do
+      for i in ${toString cfg.packages}; do
         ln -s $i/etc/dbus-1/system.d/* $out/system.d/
       done
-    ";
+    ''; # */
   };
 
-  user = {
-    name = "messagebus";
-    uid = config.ids.uids.messagebus;
-    description = "D-Bus system message bus daemon user";
-    home = homeDir;
-  };
+in
 
-  job = {
-    name = "dbus";
-  
-    job = ''
-      description "D-Bus system message bus daemon"
+{
 
-      start on startup
-      stop on shutdown
+  ###### interface
 
-      start script
+  options = {
+  
+    services.dbus = {
+
+      enable = mkOption {
+        default = true;
+        description = ''
+          Whether to start the D-Bus message bus daemon, which is
+          required by many other system services and applications.
+        '';
+        merge = pkgs.lib.mergeEnableOption;
+      };
 
-          mkdir -m 0755 -p ${homeDir}
-          chown messagebus ${homeDir}
+      packages = mkOption {
+        default = [];
+        description = ''
+          Packages whose D-Bus configuration files should be included in
+          the configuration of the D-Bus system-wide message bus.
+          Specifically, every file in
+          <filename><replaceable>pkg</replaceable>/etc/dbus-1/system.d</filename>
+          is included.
+        '';
+      };
 
-          mkdir -m 0755 -p /var/lib/dbus
-          ${dbus.tools}/bin/dbus-uuidgen --ensure
- 
-          rm -f ${homeDir}/pid
-          ${dbus}/bin/dbus-daemon --config-file=${configFile}/system.conf
-      end script
-
-      respawn sleep 1000000
-
-      stop script
-          pid=$(cat ${homeDir}/pid)
-          if test -n "$pid"; then
-              kill -9 $pid
-          fi
-      end script
-    '';
+    };
+    
   };
 
-in
 
-mkIf cfg.enable {
-  require = [
-    # ../upstart-jobs/default.nix # config.services.extraJobs
-    # ../system/user.nix # users.*
-    # ? # config.environment.extraPackages
-    options
-  ];
+  ###### implementation
 
-  environment = {
-    extraPackages = [dbus.daemon dbus.tools];
-  };
+  config = mkIf cfg.enable {
 
-  users = {
-    extraUsers = [user];
-  };
+    environment.systemPackages = [dbus.daemon dbus.tools];
+
+    users.extraUsers = singleton
+      { name = "messagebus";
+        uid = config.ids.uids.messagebus;
+        description = "D-Bus system message bus daemon user";
+        home = homeDir;
+      };
+
+    jobs = singleton
+      { name = "dbus";
+
+        startOn = "startup";
+        stopOn = "shutdown";
+
+        preStart =
+          ''
+            mkdir -m 0755 -p ${homeDir}
+            chown messagebus ${homeDir}
+
+            mkdir -m 0755 -p /var/lib/dbus
+            ${dbus.tools}/bin/dbus-uuidgen --ensure
+ 
+            rm -f ${homeDir}/pid
+            # !!! hack - dbus should be running once this job is
+            # considered "running"; should be fixable once we have
+            # Upstart 0.6.
+            ${dbus}/bin/dbus-daemon --config-file=${configFile}/system.conf
+          '';
+
+        postStop =
+          ''
+            pid=$(cat ${homeDir}/pid)
+            if test -n "$pid"; then
+                kill -9 $pid
+            fi
+          '';
+      };
 
-  services = {
-    extraJobs = [job];
   };
+ 
 }
-- 
GitLab


From b4f8f919ab02af695b9ce84ad6c4c95b1c8e4afb Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 10 Aug 2009 18:41:57 +0000
Subject: [PATCH 1699/5331] * Clean up the udev module.

svn path=/nixos/trunk/; revision=16653
---
 modules/services/hardware/udev.nix | 169 +++++++++++++++--------------
 1 file changed, 85 insertions(+), 84 deletions(-)

diff --git a/modules/services/hardware/udev.nix b/modules/services/hardware/udev.nix
index 63c4c77e1b3..9b69b81b751 100644
--- a/modules/services/hardware/udev.nix
+++ b/modules/services/hardware/udev.nix
@@ -1,71 +1,6 @@
 {pkgs, config, ...}:
 
-###### interface
-let
-  inherit (pkgs.lib) mkOption mkIf;
-
-  options = {
-
-    boot.hardwareScan = mkOption {
-      default = true;
-      description = "
-        Whether to try to load kernel modules for all detected hardware.
-        Usually this does a good job of providing you with the modules
-        you need, but sometimes it can crash the system or cause other
-        nasty effects.  If the hardware scan is turned on, it can be
-        disabled at boot time by adding the <literal>safemode</literal>
-        parameter to the kernel command line.
-      ";
-    };
-  
-    services = {
-      udev = {
-
-        addFirmware = mkOption {
-          default = [];
-          example = ["/mnt/big-storage/firmware/"];
-          description = "
-            To specify firmware that is not too spread to ensure 
-            a package, or have an interactive process of extraction
-            and cannot be redistributed.
-          ";
-          merge = pkgs.lib.mergeListOption;
-        };
-
-        addUdevPkgs = mkOption {
-          default = [];
-          description = "
-            List of packages containing udev rules. All files found in $out/*/udev/rules.d/*.rules will be recognized
-          ";
-          merge = pkgs.lib.mergeListOption;
-        };
-
-        extraRules = mkOption {
-          default = "";
-          example = ''
-            KERNEL=="eth*", ATTR{address}=="00:1D:60:B9:6D:4F", NAME="my_fast_network_card"
-          '';
-          description = "
-            Add custom rules. They'll be written into file 10-local.rules.
-            Thus they are read before all other rules.
-          ";
-        };
-        
-        sndMode = mkOption {
-          default = "0600";
-          example = "0666";
-          description = "
-            Permissions for /dev/snd/*, in case you have multiple 
-            logged in users or if the devices belong to root for 
-            some reason.
-          ";
-        };
-      };
-    };
-  };
-in
-
-###### implementation
+with pkgs.lib;
 
 let
 
@@ -73,7 +8,6 @@ let
 
   cfg = config.services.udev;
 
-
   firmwareLoader = substituteAll {
     src = ./udev-firmware-loader.sh;
     path = "${stdenv.coreutils}/bin";
@@ -82,6 +16,7 @@ let
   };
 
   firmwareDirs = config.services.udev.addFirmware;
+  
   extraUdevPkgs = config.services.udev.addUdevPkgs
     ++ pkgs.lib.optional (cfg.extraRules != "")
       (pkgs.writeTextFile {
@@ -166,21 +101,87 @@ in
 
 {
 
-  require = [
-    options
-  ];
+  ###### interface
+  
+  options = {
 
-  services = {
-    extraJobs = [{
-      name = "udev";
-      
-      job = ''
-        start on startup
-        stop on shutdown
+    boot.hardwareScan = mkOption {
+      default = true;
+      description = ''
+        Whether to try to load kernel modules for all detected hardware.
+        Usually this does a good job of providing you with the modules
+        you need, but sometimes it can crash the system or cause other
+        nasty effects.  If the hardware scan is turned on, it can be
+        disabled at boot time by adding the <literal>safemode</literal>
+        parameter to the kernel command line.
+      '';
+    };
+  
+    services.udev = {
+
+      addFirmware = mkOption {
+        default = [];
+        example = ["/mnt/big-storage/firmware/"];
+        description = ''
+          To specify firmware that is not too spread to ensure 
+          a package, or have an interactive process of extraction
+          and cannot be redistributed.
+        '';
+        merge = pkgs.lib.mergeListOption;
+      };
+
+      addUdevPkgs = mkOption {
+        default = [];
+        description = ''
+          List of packages containing <command>udev</command> rules.
+          All files found in
+          <filename><replaceable>pkg</replaceable>/udev/rules.d</filename>
+          will be included.
+        '';
+        merge = pkgs.lib.mergeListOption;
+      };
 
-        env UDEV_CONFIG_FILE=${conf}
+      extraRules = mkOption {
+        default = "";
+        example = ''
+          KERNEL=="eth*", ATTR{address}=="00:1D:60:B9:6D:4F", NAME="my_fast_network_card"
+        '';
+        description = ''
+          Additional <command>udev</command> rules. They'll be written
+          into file <filename>10-local.rules</filename>. Thus they are
+          read before all other rules.
+        '';
+      };
 
-        start script
+      sndMode = mkOption {
+        default = "0600";
+        example = "0666";
+        description = ''
+          Permissions for sound devices, in case you have multiple
+          logged in users or if the devices belong to root for some
+          reason.
+        '';
+      };
+        
+    };
+    
+  };
+  
+
+  ###### implementation
+
+  config = {
+
+    jobs = singleton
+      { name = "udev";
+
+        startOn = "startup";
+        stopOn = "shutdown";
+
+        environment = { UDEV_CONFIG_FILE = conf; };
+
+        preStart =
+          ''
             echo "" > /proc/sys/kernel/hotplug
 
             # Get rid of possible old udev processes.
@@ -217,12 +218,12 @@ in
             done
 
             initctl emit new-devices
-        end script
+          '';
 
-        respawn ${udev}/sbin/udevd
-      '';
+        exec = "${udev}/sbin/udevd";
+
+      };
 
-      passthru = {inherit udevRules;};
-    }];
   };
+
 }
-- 
GitLab


From 0d356995078def727eb5a209df488faae801383a Mon Sep 17 00:00:00 2001
From: Sander van der Burg <s.vanderburg@tudelft.nl>
Date: Mon, 10 Aug 2009 18:45:18 +0000
Subject: [PATCH 1700/5331] Implemented virtual host support. Now it's possible
 to assign web applications to virtual host, for example:

{
  ...

  services = {
    tomcat = {
      enable = true;
      virtualHosts = [
        { name = "test1.localhost";
          webapps = [ mypkgs.HelloApp ];
        }
        { name = "test2.localhost";
          webapps = [ mypkgs.ByeApp ];
        }
      ];
    };
  };
}


svn path=/nixos/trunk/; revision=16654
---
 modules/services/web-servers/tomcat.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/services/web-servers/tomcat.nix b/modules/services/web-servers/tomcat.nix
index 4c37449983a..c473e7aa38f 100644
--- a/modules/services/web-servers/tomcat.nix
+++ b/modules/services/web-servers/tomcat.nix
@@ -122,7 +122,7 @@ mkIf config.services.tomcat.enable {
 	    chown ${cfg.user}:${cfg.group} ${cfg.baseDir}/conf
 	    
 	    # Symlink the config files in the conf/ directory (except for catalina.properties and server.xml)
-	    for i in $(ls ${pkgs.tomcat6}/conf | grep -v catalina.properties server.xml)
+	    for i in $(ls ${pkgs.tomcat6}/conf | grep -v catalina.properties | grep -v server.xml)
 	    do
 	        ln -sf ${pkgs.tomcat6}/conf/$i ${cfg.baseDir}/conf/`basename $i`
 	    done
-- 
GitLab


From b3c0061a91e23775d8d9cc8ccb9bdcf0dfa3d6da Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 10 Aug 2009 19:05:20 +0000
Subject: [PATCH 1701/5331] * services.udev.addUdevPkgs ->
 services.udev.packages. * Simplified the udev rules generation: merged
 nixRules into   services.udev.extraRules, and handle services.udev.extraRules
 using   services.udev.packages.

svn path=/nixos/trunk/; revision=16655
---
 modules/hardware/pcmcia.nix                   | 14 ++----
 modules/hardware/video/encoder/wis-go7007.nix | 16 ++-----
 modules/services/hardware/hal.nix             |  2 +-
 modules/services/hardware/udev.nix            | 44 +++++++++++--------
 4 files changed, 34 insertions(+), 42 deletions(-)

diff --git a/modules/hardware/pcmcia.nix b/modules/hardware/pcmcia.nix
index 62225a0df7a..0ab5e35ea80 100644
--- a/modules/hardware/pcmcia.nix
+++ b/modules/hardware/pcmcia.nix
@@ -53,17 +53,9 @@ mkIf config.hardware.pcmcia.enable {
     options
   ];
 
-  boot = {
-    kernelModules = [ "pcmcia" ];
-  };
+  boot.kernelModules = [ "pcmcia" ];
 
-  services = {
-    udev = {
-      addUdevPkgs = [ pcmciaUtils ];
-    };
-  };
+  services.udev.packages = [ pcmciaUtils ];
 
-  environment = {
-    extraPackages = [ pcmciaUtils ];
-  };
+  environment.systemPackages = [ pcmciaUtils ];
 }
diff --git a/modules/hardware/video/encoder/wis-go7007.nix b/modules/hardware/video/encoder/wis-go7007.nix
index 24ee27cf61d..f242651d633 100644
--- a/modules/hardware/video/encoder/wis-go7007.nix
+++ b/modules/hardware/video/encoder/wis-go7007.nix
@@ -8,18 +8,10 @@ let
 in
 
 {
-  boot = {
-    extraModulePackages = wisGo7007Pkg;
-  };
+  boot.extraModulePackages = [wisGo7007Pkg];
 
-  environment = {
-    extraPackages = wisGo7007Pkg;
-  };
+  environment.extraPackages = [wisGo7007Pkg];
 
-  services = {
-    udev = {
-      addFirmware = wisGo7007Firmware;
-      addUdevPkgs = wisGo7007Pkg;
-    };
-  };
+  services.udev.addFirmware = [wisGo7007Firmware];
+  services.udev.packages = [wisGo7007Pkg];
 }
diff --git a/modules/services/hardware/hal.nix b/modules/services/hardware/hal.nix
index 972e8b5e3c9..c1390dd6eee 100644
--- a/modules/services/hardware/hal.nix
+++ b/modules/services/hardware/hal.nix
@@ -94,7 +94,7 @@ in
         exec = "${hal}/sbin/hald --daemon=no";
       };
 
-    services.udev.addUdevPkgs = [hal];
+    services.udev.packages = [hal];
 
     services.dbus.enable = true;
     services.dbus.packages = [hal];
diff --git a/modules/services/hardware/udev.nix b/modules/services/hardware/udev.nix
index 9b69b81b751..6c6b82d9c80 100644
--- a/modules/services/hardware/udev.nix
+++ b/modules/services/hardware/udev.nix
@@ -12,22 +12,18 @@ let
     src = ./udev-firmware-loader.sh;
     path = "${stdenv.coreutils}/bin";
     isExecutable = true;
-    inherit firmwareDirs;
+    firmwareDirs = cfg.addFirmware;
   };
 
-  firmwareDirs = config.services.udev.addFirmware;
-  
-  extraUdevPkgs = config.services.udev.addUdevPkgs
-    ++ pkgs.lib.optional (cfg.extraRules != "")
-      (pkgs.writeTextFile {
-        name = "extra-udev-rules";
-        text = cfg.extraRules;
-        destination = "/custom/udev/rules.d/10-local.rules";
-        });
+  extraUdevRules = pkgs.writeTextFile {
+    name = "extra-udev-rules";
+    text = cfg.extraRules;
+    destination = "/etc/udev/rules.d/10-local.rules";
+  };
 
   modprobe = config.system.sbin.modprobe;
     
-  nixRules = writeText "90-nix.rules" ''
+  nixosRules = ''
   
     # Miscellaneous devices.
     KERNEL=="sonypi",               MODE="0666"
@@ -60,10 +56,14 @@ let
     #src = cleanSource ./udev-rules;
     buildCommand = ''
       ensureDir $out
-      ln -s ${nixRules} $out/${nixRules.name}
       shopt -s nullglob
+
+      # Use all the default udev rules.
       cp ${udev}/*/udev/rules.d/*.rules $out/
-      
+
+      # If auto-configuration is disabled, then remove
+      # udev's 80-drivers.rules file, which contains rules for
+      # automatically calling modprobe.
       ${if config.boot.hardwareScan then
         ''
           substituteInPlace $out/80-drivers.rules \
@@ -74,7 +74,9 @@ let
           rm $out/80-drivers.rules
         ''
       }
-      for i in ${toString extraUdevPkgs}; do
+
+      # Add the udev rules from other packages.
+      for i in ${toString cfg.packages}; do
         for j in $i/*/udev/rules.d/*; do
           ln -s $j $out/$(basename $j)
         done
@@ -122,23 +124,24 @@ in
       addFirmware = mkOption {
         default = [];
         example = ["/mnt/big-storage/firmware/"];
+        merge = mergeListOption; 
         description = ''
           To specify firmware that is not too spread to ensure 
           a package, or have an interactive process of extraction
           and cannot be redistributed.
         '';
-        merge = pkgs.lib.mergeListOption;
       };
 
-      addUdevPkgs = mkOption {
+      packages = mkOption {
         default = [];
+        merge = mergeListOption;
         description = ''
           List of packages containing <command>udev</command> rules.
           All files found in
-          <filename><replaceable>pkg</replaceable>/udev/rules.d</filename>
+          <filename><replaceable>pkg</replaceable>/etc/udev/rules.d</filename> and
+          <filename><replaceable>pkg</replaceable>/lib/udev/rules.d</filename>
           will be included.
         '';
-        merge = pkgs.lib.mergeListOption;
       };
 
       extraRules = mkOption {
@@ -146,6 +149,7 @@ in
         example = ''
           KERNEL=="eth*", ATTR{address}=="00:1D:60:B9:6D:4F", NAME="my_fast_network_card"
         '';
+        merge = mergeStringOption;
         description = ''
           Additional <command>udev</command> rules. They'll be written
           into file <filename>10-local.rules</filename>. Thus they are
@@ -172,6 +176,10 @@ in
 
   config = {
 
+    services.udev.extraRules = nixosRules;
+    
+    services.udev.packages = [extraUdevRules];
+
     jobs = singleton
       { name = "udev";
 
-- 
GitLab


From 167ccdd537224017168619fdf8d86a5401255852 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 10 Aug 2009 19:27:15 +0000
Subject: [PATCH 1702/5331] * Move the firmware loader into a separate module.
 * services.udev.addFirmware -> hardware.firmware.

svn path=/nixos/trunk/; revision=16657
---
 modules/hardware/network/intel-2200bg.nix     |  2 +-
 modules/hardware/network/intel-3945abg.nix    |  2 +-
 modules/hardware/network/intel-4965agn.nix    | 18 +------
 modules/hardware/network/intel-5000.nix       |  6 +--
 modules/hardware/network/zydas-zd1211.nix     |  6 +--
 modules/hardware/video/encoder/wis-go7007.nix | 14 +++--
 modules/module-list.nix                       |  1 +
 modules/services/hardware/firmware.nix        | 51 +++++++++++++++++++
 modules/services/hardware/udev.nix            | 23 +--------
 modules/system/boot/kernel.nix                | 19 ++-----
 10 files changed, 68 insertions(+), 74 deletions(-)
 create mode 100644 modules/services/hardware/firmware.nix

diff --git a/modules/hardware/network/intel-2200bg.nix b/modules/hardware/network/intel-2200bg.nix
index 382f7b78bd9..dc67e1335fe 100644
--- a/modules/hardware/network/intel-2200bg.nix
+++ b/modules/hardware/network/intel-2200bg.nix
@@ -27,7 +27,7 @@
   
     # Warning: setting this option requires acceptance of the firmware
     # license, see http://ipw2200.sourceforge.net/firmware.php?fid=7.
-    services.udev.addFirmware = [ pkgs.ipw2200fw ];
+    hardware.firmware = [ pkgs.ipw2200fw ];
 
   };
   
diff --git a/modules/hardware/network/intel-3945abg.nix b/modules/hardware/network/intel-3945abg.nix
index 5468f7bc18d..9fe4be500f1 100644
--- a/modules/hardware/network/intel-3945abg.nix
+++ b/modules/hardware/network/intel-3945abg.nix
@@ -22,7 +22,7 @@
   
   config = pkgs.lib.mkIf config.networking.enableIntel3945ABGFirmware {
   
-    services.udev.addFirmware = [ pkgs.iwlwifi3945ucode ];
+    hardware.firmware = [ pkgs.iwlwifi3945ucode ];
 
   };
   
diff --git a/modules/hardware/network/intel-4965agn.nix b/modules/hardware/network/intel-4965agn.nix
index c0eb413e2d2..d22eea29697 100644
--- a/modules/hardware/network/intel-4965agn.nix
+++ b/modules/hardware/network/intel-4965agn.nix
@@ -1,21 +1,5 @@
 {pkgs, config, ...}:
 
-let
-  inherit (config.boot) kernelPackages;
-  inherit (kernelPackages) kernel;
-in
-
 {
-  boot = {
-    extraModulePackages =
-      pkgs.lib.optional
-        (!kernel.features ? iwlwifi)
-        kernelPackages.iwlwifi;
-  };
-
-  services = {
-    udev = {
-      addFirmware = [ kernelPackages.iwlwifi4965ucode ];
-    };
-  };
+  hardware.firmware = [ config.boot.kernelPackages.iwlwifi4965ucode ];
 }
diff --git a/modules/hardware/network/intel-5000.nix b/modules/hardware/network/intel-5000.nix
index 0b0d29fe6df..19e6499fa99 100644
--- a/modules/hardware/network/intel-5000.nix
+++ b/modules/hardware/network/intel-5000.nix
@@ -1,9 +1,5 @@
 {pkgs, config, ...}:
 
 {
-  services = {
-    udev = {
-      addFirmware = [ pkgs.iwlwifi5000ucode ];
-    };
-  };
+  hardware.firmware = [ pkgs.iwlwifi5000ucode ];
 }
diff --git a/modules/hardware/network/zydas-zd1211.nix b/modules/hardware/network/zydas-zd1211.nix
index a57e8a6cf95..c8428a7241b 100644
--- a/modules/hardware/network/zydas-zd1211.nix
+++ b/modules/hardware/network/zydas-zd1211.nix
@@ -1,9 +1,5 @@
 {pkgs, config, ...}:
 
 {
-  services = {
-    udev = {
-      addFirmware = [ pkgs.zd1211fw ];
-    };
-  };
+  hardware.firmware = [ pkgs.zd1211fw ];
 }
diff --git a/modules/hardware/video/encoder/wis-go7007.nix b/modules/hardware/video/encoder/wis-go7007.nix
index f242651d633..3936b333af4 100644
--- a/modules/hardware/video/encoder/wis-go7007.nix
+++ b/modules/hardware/video/encoder/wis-go7007.nix
@@ -1,17 +1,15 @@
 {pkgs, config, ...}:
 
 let
-  wisGo7007 = config.boot.kernelPackages.wis_go7007;
-
-  wisGo7007Pkg = [ wis_go7007 ];
-  wisGo7007Firmware = [ "${wis_go7007}/firmware" ];
+  wis_go7007 = config.boot.kernelPackages.wis_go7007;
 in
 
 {
-  boot.extraModulePackages = [wisGo7007Pkg];
+  boot.extraModulePackages = [wis_go7007];
 
-  environment.extraPackages = [wisGo7007Pkg];
+  environment.systemPackages = [wis_go7007];
 
-  services.udev.addFirmware = [wisGo7007Firmware];
-  services.udev.packages = [wisGo7007Pkg];
+  hardware.firmware = ["${wis_go7007}/firmware"];
+  
+  services.udev.packages = [wis_go7007];
 }
diff --git a/modules/module-list.nix b/modules/module-list.nix
index 9938cc6e1b5..d3290226b9a 100644
--- a/modules/module-list.nix
+++ b/modules/module-list.nix
@@ -31,6 +31,7 @@
   ./services/databases/mysql.nix
   ./services/databases/postgresql.nix
   ./services/hardware/acpid.nix
+  ./services/hardware/firmware.nix
   ./services/hardware/hal.nix
   ./services/hardware/udev.nix
   ./services/logging/klogd.nix
diff --git a/modules/services/hardware/firmware.nix b/modules/services/hardware/firmware.nix
new file mode 100644
index 00000000000..0ed5fb31f98
--- /dev/null
+++ b/modules/services/hardware/firmware.nix
@@ -0,0 +1,51 @@
+# This module provides support for automatic loading of firmware from
+# kernel modules. 
+{pkgs, config, ...}:
+
+with pkgs.lib;
+
+let
+
+  firmwareLoader = pkgs.substituteAll {
+    src = ./udev-firmware-loader.sh;
+    path = "${pkgs.coreutils}/bin";
+    isExecutable = true;
+    firmwareDirs = config.hardware.firmware;
+  };
+
+in
+
+{
+
+  ###### interface
+  
+  options = {
+
+    hardware.firmware = mkOption {
+      default = [];
+      example = ["/root/my-firmware"];
+      merge = mergeListOption; 
+      description = ''
+        List of directories containing firmware files.  Such files
+        will be loaded automatically if the kernel asks for them
+        (i.e., when it has detected specific hardware that requires
+        firmware to function).
+      '';
+    };
+
+  };
+
+
+  ###### implementation
+  
+  config = {
+
+    services.udev.extraRules =
+      ''
+        # Firmware loading.
+        SUBSYSTEM=="firmware", ACTION=="add", RUN+="${firmwareLoader}"
+      '';
+
+  };
+  
+}
diff --git a/modules/services/hardware/udev.nix b/modules/services/hardware/udev.nix
index 6c6b82d9c80..d1e22efc58a 100644
--- a/modules/services/hardware/udev.nix
+++ b/modules/services/hardware/udev.nix
@@ -4,17 +4,10 @@ with pkgs.lib;
 
 let
 
-  inherit (pkgs) substituteAll stdenv writeText udev procps;
+  inherit (pkgs) stdenv writeText udev procps;
 
   cfg = config.services.udev;
 
-  firmwareLoader = substituteAll {
-    src = ./udev-firmware-loader.sh;
-    path = "${stdenv.coreutils}/bin";
-    isExecutable = true;
-    firmwareDirs = cfg.addFirmware;
-  };
-
   extraUdevRules = pkgs.writeTextFile {
     name = "extra-udev-rules";
     text = cfg.extraRules;
@@ -45,9 +38,6 @@ let
     KERNEL=="timer",                NAME="snd/%k", MODE="${cfg.sndMode}"
     KERNEL=="seq",                  NAME="snd/%k", MODE="${cfg.sndMode}"
 
-    # Firmware loading.
-    SUBSYSTEM=="firmware",          ACTION=="add", RUN+="${firmwareLoader}"
-    
   '';
   
   # Perform substitutions in all udev rules files.
@@ -121,17 +111,6 @@ in
   
     services.udev = {
 
-      addFirmware = mkOption {
-        default = [];
-        example = ["/mnt/big-storage/firmware/"];
-        merge = mergeListOption; 
-        description = ''
-          To specify firmware that is not too spread to ensure 
-          a package, or have an interactive process of extraction
-          and cannot be redistributed.
-        '';
-      };
-
       packages = mkOption {
         default = [];
         merge = mergeListOption;
diff --git a/modules/system/boot/kernel.nix b/modules/system/boot/kernel.nix
index 6320526a31c..2d5050f76b8 100644
--- a/modules/system/boot/kernel.nix
+++ b/modules/system/boot/kernel.nix
@@ -179,21 +179,10 @@ let
 in
 
 {
-  require = [
-    options
+  require = [options];
 
-    # udev
-  ];
+  system.modulesTree = [ kernel ] ++ config.boot.extraModulePackages;
 
-  system = {
-    # include kernel modules.
-    modulesTree = [ kernel ] ++ config.boot.extraModulePackages;
-  };
-
-  services = {
-    udev = {
-      # The Linux kernel >= 2.6.27 provides firmware
-      addFirmware = [ "${kernel}/lib/firmware" ];
-    };
-  };
+  # The Linux kernel >= 2.6.27 provides firmware.
+  hardware.firmware = [ "${kernel}/lib/firmware" ];
 }
-- 
GitLab


From f003f6d7cdc24a5594b40e984857ee53f66dbb46 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 10 Aug 2009 20:07:58 +0000
Subject: [PATCH 1703/5331] * Fixed the path to the services tree.  This should
 be a NixOS module argument.

svn path=/nixos/trunk/; revision=16658
---
 .../services/web-servers/apache-httpd/subversion.nix   | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/modules/services/web-servers/apache-httpd/subversion.nix b/modules/services/web-servers/apache-httpd/subversion.nix
index 3c3e7173549..5996acd69fa 100644
--- a/modules/services/web-servers/apache-httpd/subversion.nix
+++ b/modules/services/web-servers/apache-httpd/subversion.nix
@@ -31,7 +31,7 @@ let
   # Build the maintenance scripts and commit hooks.
   scripts = substituteInAll {
     name = "svn-server-scripts";
-    src = pkgs.lib.cleanSource ../../../services/subversion/src/scripts;
+    src = pkgs.lib.cleanSource ../../../../services/subversion/src/scripts;
 
     # The variables to substitute:
     
@@ -75,7 +75,7 @@ let
 
   
   # Build our custom authentication modules.
-  authModules = import ../../../services/subversion/src/auth {
+  authModules = import ../../../../services/subversion/src/auth {
     inherit (pkgs) stdenv apacheHttpd;
   };
 
@@ -115,7 +115,7 @@ let
 
 
   # Build ViewVC.
-  viewvc = import ../../../services/subversion/src/viewvc {
+  viewvc = import ../../../../services/subversion/src/viewvc {
     inherit (pkgs) fetchurl stdenv python enscript;
     inherit urlPrefix reposDir adminAddr subversion;
   };
@@ -149,7 +149,7 @@ let
 
 
   # Build WebSVN.
-  websvn = import ../../../services/subversion/src/websvn {
+  websvn = import ../../../../services/subversion/src/websvn {
     inherit (pkgs) fetchurl stdenv writeText enscript gnused diffutils;
     inherit urlPrefix reposDir subversion;
     cacheDir = tmpDir;
@@ -232,7 +232,7 @@ let
 
   staticFiles = substituteInSome {
     name = "svn-static-files";
-    src = pkgs.lib.cleanSource ../../../services/subversion/root;
+    src = pkgs.lib.cleanSource ../../../../services/subversion/root;
     files = ["xsl/svnindex.xsl"];
     inherit urlPrefix;
   };
-- 
GitLab


From ebd2fbd24fd3e518d68773e941bb6f3736ee9b91 Mon Sep 17 00:00:00 2001
From: Sander van der Burg <s.vanderburg@tudelft.nl>
Date: Mon, 10 Aug 2009 20:16:33 +0000
Subject: [PATCH 1704/5331] Removed mod_jk option, which is obsolete

svn path=/nixos/trunk/; revision=16660
---
 .../services/web-servers/apache-httpd/default.nix    | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/modules/services/web-servers/apache-httpd/default.nix b/modules/services/web-servers/apache-httpd/default.nix
index dda59e4618d..561a911439e 100644
--- a/modules/services/web-servers/apache-httpd/default.nix
+++ b/modules/services/web-servers/apache-httpd/default.nix
@@ -443,18 +443,6 @@ in
         description = "Whether to enable the PHP module.";
       };
 
-      mod_jk = {
-        enable = mkOption {
-          default = false;
-          description = "Whether to enable the Apache Tomcat connector.";
-        };
-
-        applicationMappings = mkOption {
-          default = [];
-          description = "List of Java webapplications that should be mapped to the servlet container (Tomcat/JBoss)";
-        };
-      };
-
       virtualHosts = mkOption {
         default = [];
         example = [
-- 
GitLab


From 89ef5c979b0f13f8642376ddcacd1182fbd715c2 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 11 Aug 2009 01:35:56 +0000
Subject: [PATCH 1705/5331] * New nixos-rebuild action: "nixos-rebuild
 build-vm" builds a virtual   machine containing a replica (minus the state)
 of the system   configuration.  This is mostly useful for testing
 configuration   changes prior to doing an actual "nixos-rebuild switch" (or
 even   "nixos-rebuild test").  The VM can be started as follows:

  $ nixos-rebuild build-vm
  $ ./result/bin/run-*-vm

  which starts a KVM/QEMU instance.  Additional QEMU options can be
  passed through the QEMU_OPTS environment variable
  (e.g. QEMU_OPTS="-redir tcp:8080::80" to forward a host port to the
  guest).  The fileSystem attribute of the regular system
  configuration is ignored (using mkOverride), because obviously we
  can't allow the VM to access the host's block devices.  Instead, at
  startup the VM creates an empty disk image in ./<hostname>.qcow2 to
  store the VM's root filesystem.

  Building a VM in this way is efficient because the VM shares its Nix
  store with the host (through a CIFS mount).  However, because the
  Nix store of the host is mounted read-only in the guest, you cannot
  run Nix build actions inside the VM.  Therefore the VM can only be
  reconfigured by re-running "nixos-rebuild build-vm" on the host and
  restarting the VM.

svn path=/nixos/trunk/; revision=16662
---
 default.nix                              |  7 ++++++
 lib/eval-config.nix                      | 11 +++++----
 modules/installer/tools/nixos-rebuild.sh | 30 +++++++++++++++++-------
 modules/services/networking/ssh/sshd.nix |  4 +---
 modules/virtualisation/qemu-vm.nix       |  8 +++++--
 5 files changed, 43 insertions(+), 17 deletions(-)

diff --git a/default.nix b/default.nix
index 3c174ca13e5..f0020c5a1a6 100644
--- a/default.nix
+++ b/default.nix
@@ -7,6 +7,11 @@ let
     (import ./lib/eval-config.nix {inherit configuration;})
     config optionDeclarations pkgs;
 
+  vmConfig = (import ./lib/eval-config.nix {
+    inherit configuration;
+    extraModules = [./modules/virtualisation/qemu-vm.nix];
+  }).config;
+    
 in
 
 {
@@ -14,6 +19,8 @@ in
 
   system = config.system.build.system;
 
+  vm = vmConfig.system.build.vm;
+
   # The following are used by nixos-rebuild.
   nixFallback = pkgs.nixUnstable;
   manifests = config.installer.manifests;
diff --git a/lib/eval-config.nix b/lib/eval-config.nix
index 9dccc62e1ec..9d6c5794df1 100644
--- a/lib/eval-config.nix
+++ b/lib/eval-config.nix
@@ -7,6 +7,7 @@
 , nixpkgs ? import ./from-env.nix "NIXPKGS" /etc/nixos/nixpkgs
 , pkgs ? import nixpkgs {inherit system;}
 , extraArgs ? {}
+, extraModules ? []
 }:
 
 let extraArgs_ = extraArgs; in
@@ -14,10 +15,12 @@ let extraArgs_ = extraArgs; in
 rec {
   inherit nixpkgs pkgs;
 
-  configComponents = [
-    configuration
-    ./check-config.nix
-  ] ++ (import ../modules/module-list.nix);
+  configComponents =
+    [ configuration
+      ./check-config.nix
+    ]
+    ++ extraModules
+    ++ (import ../modules/module-list.nix);
 
   extraArgs = extraArgs_ // {
     inherit pkgs;
diff --git a/modules/installer/tools/nixos-rebuild.sh b/modules/installer/tools/nixos-rebuild.sh
index cd2329416ab..86b7337beac 100644
--- a/modules/installer/tools/nixos-rebuild.sh
+++ b/modules/installer/tools/nixos-rebuild.sh
@@ -15,12 +15,14 @@ Usage: $0 [OPTIONS...] OPERATION
 
 The operation is one of the following:
 
-  switch:  make the configuration the boot default and activate now
-  boot:    make the configuration the boot default
-  test:    activate the configuration, but don't make it the boot default
-  build:   build the configuration, but don't make it the default or
-           activate it
-  dry-run: just show what store paths would be built/downloaded
+  switch:   make the configuration the boot default and activate now
+  boot:     make the configuration the boot default
+  test:     activate the configuration, but don't make it the boot default
+  build:    build the configuration, but don't make it the default or
+            activate it
+  build-vm: build a virtual machine containing the configuration
+            (useful for testing)
+  dry-run:  just show what store paths would be built/downloaded
 
 Options:
 
@@ -54,7 +56,8 @@ while test "$#" -gt 0; do
     i="$1"; shift 1
     if test "$i" = "--help"; then
         showSyntax
-    elif test "$i" = switch -o "$i" = boot -o "$i" = test -o "$i" = build -o "$i" = dry-run; then
+    elif test "$i" = switch -o "$i" = boot -o "$i" = test -o "$i" = build \
+        -o "$i" = dry-run -o "$i" = build-vm; then
         action="$i"
     elif test "$i" = --install-grub; then
         export NIXOS_INSTALL_GRUB=1
@@ -129,6 +132,9 @@ if test "$action" = switch -o "$action" = boot; then
 elif test "$action" = test -o "$action" = build -o "$action" = dry-run; then
     nix-build $NIXOS -A system -K -k $extraBuildFlags
     pathToConfig=./result
+elif test "$action" = build-vm; then
+    nix-build $NIXOS -A vm -K -k $extraBuildFlags
+    pathToConfig=./result
 else
     showSyntax
 fi
@@ -141,7 +147,7 @@ if test "$action" = switch -o "$action" = boot -o "$action" = test; then
 fi
 
 
-if test "$action" = "test"; then
+if test "$action" = test; then
     cat >&2 <<EOF
 
 Warning: if you remove or overwrite the symlink \`$pathToConfig', the
@@ -149,3 +155,11 @@ active system configuration may be garbage collected!  This may render
 the system inoperable (though a reboot will fix things).
 EOF
 fi
+
+
+if test "$action" = build-vm; then
+    cat >&2 <<EOF
+
+Done.  The virtual machine can be started by running $(echo $pathToConfig/bin/run-*-vm).
+EOF
+fi
diff --git a/modules/services/networking/ssh/sshd.nix b/modules/services/networking/ssh/sshd.nix
index ca072e92084..a3ca7d84c46 100644
--- a/modules/services/networking/ssh/sshd.nix
+++ b/modules/services/networking/ssh/sshd.nix
@@ -5,9 +5,7 @@ let
   inherit (pkgs.lib) mkOption mkIf;
   inherit (pkgs) openssh;
 
-  cfg = (config.services.sshd);
-
-  nssModules = config.system.nssModules.list;
+  cfg = config.services.sshd;
 
   nssModulesPath = config.system.nssModules.path;
 
diff --git a/modules/virtualisation/qemu-vm.nix b/modules/virtualisation/qemu-vm.nix
index d8ab12daa93..a5329b0d297 100644
--- a/modules/virtualisation/qemu-vm.nix
+++ b/modules/virtualisation/qemu-vm.nix
@@ -85,8 +85,12 @@ in
     '';
 
   # Mount the host filesystem via CIFS, and bind-mount the Nix store
-  # of the host into our own filesystem.
-  fileSystems =
+  # of the host into our own filesystem.  We use mkOverride to allow
+  # this module to be applied to "normal" NixOS system configuration,
+  # where the regular value for the `fileSystems' attribute should be
+  # disregarded for the purpose of building a VM test image (since
+  # those filesystems don't exist in the VM).
+  fileSystems = pkgs.lib.mkOverride 50 {}
     [ { mountPoint = "/";
         device = "/dev/vda";
       }
-- 
GitLab


From f666aa7479f2e4902fb4819c0e85b874bb501e3e Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 11 Aug 2009 02:02:01 +0000
Subject: [PATCH 1706/5331] * With "nixos-rebuild build-vm", override the video
 driver of   the host (since e.g. "nvidia" won't work in the VM).

svn path=/nixos/trunk/; revision=16663
---
 modules/virtualisation/qemu-vm.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/modules/virtualisation/qemu-vm.nix b/modules/virtualisation/qemu-vm.nix
index a5329b0d297..742bef873fc 100644
--- a/modules/virtualisation/qemu-vm.nix
+++ b/modules/virtualisation/qemu-vm.nix
@@ -126,4 +126,9 @@ in
     ''
       EnableSendFile Off
     '';
+
+  # When building a regular system configuration, override whatever
+  # video driver the host uses.
+  services.xserver.videoDriver = pkgs.lib.mkOverride 50 {} "vesa";
+  services.xserver.defaultDepth = pkgs.lib.mkOverride 50 {} 16;
 }
-- 
GitLab


From c21b02d34b826b8232fcff127cf2ab47545fd4a3 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 11 Aug 2009 09:17:30 +0000
Subject: [PATCH 1707/5331] * Add some groups required by the latest udev.

svn path=/nixos/trunk/; revision=16667
---
 modules/config/users-groups.nix | 12 ++++++++++++
 modules/misc/ids.nix            |  6 +++++-
 2 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/modules/config/users-groups.nix b/modules/config/users-groups.nix
index bd32fcafd83..cb50b8bb3c4 100644
--- a/modules/config/users-groups.nix
+++ b/modules/config/users-groups.nix
@@ -115,6 +115,18 @@ let
           { name = "lp";
             gid = ids.gids.lp;
           }
+          { name = "cdrom";
+            gid = ids.gids.cdrom;
+          }
+          { name = "tape";
+            gid = ids.gids.tape;
+          }
+          { name = "video";
+            gid = ids.gids.video;
+          }
+          { name = "dialout";
+            gid = ids.gids.dialout;
+          }
           { name = "nogroup";
             gid = ids.gids.nogroup;
           }
diff --git a/modules/misc/ids.nix b/modules/misc/ids.nix
index cd4b36b0ed9..52a518add3a 100644
--- a/modules/misc/ids.nix
+++ b/modules/misc/ids.nix
@@ -75,7 +75,11 @@ in
     tomcat = 21;
     pulseaudio = 22; # must match `pulseaudio' UID
     gpsd = 23;
-    
+    cdrom = 24;
+    tape = 25;
+    video = 26;
+    dialout = 27;
+
     users = 100;
     nixbld = 30000;
     nogroup = 65534;
-- 
GitLab


From e8103aa39d6340d29c6ecee94881a8c7b9224c51 Mon Sep 17 00:00:00 2001
From: Sander van der Burg <s.vanderburg@tudelft.nl>
Date: Tue, 11 Aug 2009 09:40:31 +0000
Subject: [PATCH 1708/5331] Implemented support for per application
 configuration files

svn path=/nixos/trunk/; revision=16668
---
 modules/services/web-servers/tomcat.nix | 27 +++++++++++++++++++++++++
 1 file changed, 27 insertions(+)

diff --git a/modules/services/web-servers/tomcat.nix b/modules/services/web-servers/tomcat.nix
index c473e7aa38f..abd9cf3fcbf 100644
--- a/modules/services/web-servers/tomcat.nix
+++ b/modules/services/web-servers/tomcat.nix
@@ -211,6 +211,15 @@ mkIf config.services.tomcat.enable {
 		    do
 		        ln -sf $j ${cfg.baseDir}/webapps/`basename $j`
 		    done
+		    
+		    # Also symlink the configuration files if they are included
+		    if [ -d $i/conf/Catalina ]
+		    then
+			for j in $i/conf/Catalina/*
+			do
+			    ln -sf $j ${cfg.baseDir}/conf/Catalina/localhost/`basename $j`
+			done
+		    fi
 		fi
 	    done	    	    
 	    
@@ -238,6 +247,15 @@ mkIf config.services.tomcat.enable {
 		      do
 		          ln -sf $j ${cfg.baseDir}/virtualhosts/${virtualHost.name}/webapps/`basename $j`
 		      done
+		      
+		      # Also symlink the configuration files if they are included
+		      if [ -d $i/conf/Catalina ]
+		      then
+			  for j in $i/conf/Catalina/*
+			  do
+			      ln -sf $j ${cfg.baseDir}/conf/Catalina/${virtualHost.name}/`basename $j`
+			  done
+		      fi
                   fi	                  
 	      done
 	      
@@ -275,6 +293,15 @@ mkIf config.services.tomcat.enable {
 			do
 			    ln -sf $j ${cfg.baseDir}/webapps/axis2/WEB-INF/services/`basename $j`
 			done
+			
+			# Also symlink the configuration files if they are included
+		        if [ -d $i/conf/Catalina ]
+		        then
+			    for j in $i/conf/Catalina/*
+			    do
+			        ln -sf $j ${cfg.baseDir}/conf/Catalina/localhost/`basename $j`
+			    done
+		        fi
 		    fi
 		done    
 		''
-- 
GitLab


From fe329f96ef14bf3965f1da4de84142e33253efec Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 11 Aug 2009 14:28:25 +0000
Subject: [PATCH 1709/5331] * Mount the host's /nix/var/nix/db in the guest.

svn path=/nixos/trunk/; revision=16674
---
 modules/virtualisation/qemu-vm.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/modules/virtualisation/qemu-vm.nix b/modules/virtualisation/qemu-vm.nix
index 742bef873fc..5158af7668a 100644
--- a/modules/virtualisation/qemu-vm.nix
+++ b/modules/virtualisation/qemu-vm.nix
@@ -105,6 +105,12 @@ in
         options = "bind";
         neededForBoot = true;
       }
+      # Mount the host's Nix database.  This allows read-only Nix
+      # operations in the guest to work properly.
+      { mountPoint = "/nix/var/nix/db";
+        device = "/hostfs/nix/var/nix/db";
+        options = "bind";
+      }
     ];
 
   # Starting DHCP brings down eth0, which kills the connection to the
-- 
GitLab


From bd2fbcf9e5cfae0c8ae6f7f982fbdc7f8129e5c6 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 11 Aug 2009 21:06:17 +0000
Subject: [PATCH 1710/5331] * Fix the bluetoothd stop condition.

svn path=/nixos/trunk/; revision=16687
---
 modules/services/hardware/bluetooth.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/services/hardware/bluetooth.nix b/modules/services/hardware/bluetooth.nix
index 4e00f43aee7..0efd6710412 100644
--- a/modules/services/hardware/bluetooth.nix
+++ b/modules/services/hardware/bluetooth.nix
@@ -18,8 +18,8 @@ with pkgs.lib;
     jobs = pkgs.lib.singleton
       { name = "bluetoothd";
 
-        startOn = "dbus";
-        stopOn = "dbus";
+        startOn = "dbus/started";
+        stopOn = "dbus/stop";
 
         preStart =
           ''
-- 
GitLab


From bed6fd6a61d3c32af513146d2fedd08f3c040885 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 11 Aug 2009 21:08:05 +0000
Subject: [PATCH 1711/5331] * `umount -f' causes lots of problems, so don't do
 it.

svn path=/nixos/trunk/; revision=16688
---
 modules/system/upstart-events/halt.nix | 43 ++++++++++++++------------
 1 file changed, 24 insertions(+), 19 deletions(-)

diff --git a/modules/system/upstart-events/halt.nix b/modules/system/upstart-events/halt.nix
index 82b5ffcae1a..0713aa70ab7 100644
--- a/modules/system/upstart-events/halt.nix
+++ b/modules/system/upstart-events/halt.nix
@@ -25,22 +25,22 @@ let
       
       
           # Set the hardware clock to the system time.
-          echo "Setting the hardware clock..."
-          hwclock --systohc --utc || true
+          echo "setting the hardware clock..."
+          hwclock --systohc --utc
       
       
           # Do an initial sync just in case.
-          sync || true
+          sync
       
       
           # Kill all remaining processes except init and this one.
-          echo "Sending the TERM signal to all processes..."
-          kill -TERM -1 || true
+          echo "sending the TERM signal to all processes..."
+          kill -TERM -1
       
           sleep 1 # wait briefly
-      
-          echo "Sending the KILL signal to all processes..."
-          kill -KILL -1 || true
+
+          echo "sending the KILL signal to all processes..."
+          kill -KILL -1
       
       
           # Unmount helper functions.
@@ -69,15 +69,18 @@ let
               for mp in $(getMountPoints); do
                   device=$(getDevice $mp)
                   echo "unmounting $mp..."
-                  # !!! Don't unmount /nix/store or /hostfs.  This is
-                  # a quick hack to cleanly shutdown VMs that mount
-                  # the Nix store via CIFS.  "mount -f" will actually
-                  # work on such filesystems, which makes all commands
-                  # needed below disappear.
-                  if test "$mp" != /nix/store -a "$mp" != /hostfs && umount -f -n "$mp"; then
+
+                  # Note: don't use `umount -f'; it's very buggy.
+                  # (For instance, when applied to a bind-mount it
+                  # unmounts the target of the bind-mount.)  !!! But
+                  # we should use `-f' for NFS.
+                  if umount -n "$mp"; then
                       if test "$mp" != /; then tryAgain=1; fi
                   else
-                      mount -n -o remount,ro "$mp" || true
+                      # `-i' is to workaround a bug in mount.cifs (it
+                      # doesn't recognise the `remount' option, and
+                      # instead mounts the FS again).
+                      mount -n -i -o remount,ro "$mp"
                   fi
       
                   # Hack: work around a bug in mount (mount -o remount on a
@@ -85,23 +88,25 @@ let
                   # /etc/mtab).
                   if echo "$device" | grep -q '/dev/loop'; then
                       echo "removing loop device $device..."
-                      losetup -d "$device" || true
+                      losetup -d "$device"
                   fi
               done
           done
       
-          cat /proc/mounts
-      
       
           # Final sync.
-          sync || true
+          sync
       
       
           # Either reboot or power-off the system.  Note that the "halt"
           # event also does a power-off.
           if test ${event} = reboot; then
+              echo "rebooting..."
+              sleep 1
               exec reboot -f
           else
+              echo "powering off..."
+              sleep 1
               exec halt -f -p
           fi
       
-- 
GitLab


From fd56f110dadf0cf2f6d7a4433ac756d7de1586af Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 11 Aug 2009 21:09:25 +0000
Subject: [PATCH 1712/5331] * Clean up some boot messages.

svn path=/nixos/trunk/; revision=16689
---
 modules/system/boot/stage-2-init.sh | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

diff --git a/modules/system/boot/stage-2-init.sh b/modules/system/boot/stage-2-init.sh
index 0df20b33b8b..3f76b165a27 100644
--- a/modules/system/boot/stage-2-init.sh
+++ b/modules/system/boot/stage-2-init.sh
@@ -83,26 +83,22 @@ mkdir -m 0755 -p /bin # for the /bin/sh symlink
 mkdir -m 0755 -p /home
 mkdir -m 0755 -p /etc/nixos
 
-echo "Filesystems mounted"
 
 # Miscellaneous boot time cleanup.
 rm -rf /var/run
 rm -rf /var/lock
 
-echo "On-boot /var cleanup done"
-
 #echo -n "cleaning \`/tmp'..."
 #rm -rf --one-file-system /tmp/*
 #echo " done"
 
+
 # This is a good time to clean up /nix/var/nix/chroots.  Doing an `rm
 # -rf' on it isn't safe in general because it can contain bind mounts
 # to /nix/store and other places.  But after rebooting these are all
 # gone, of course.
 rm -rf /nix/var/nix/chroots # recreated in activate-configuration.sh
 
-echo "Nix chroots removed"
-
 if test -n "$safeMode"; then
     mkdir -m 0755 -p /var/run
     touch /var/run/safemode
@@ -119,14 +115,12 @@ if test -n "$resumeDevice"; then
     mkswap "$resumeDevice" || echo 'Failed to clear saved image.'
 fi
 
-echo -n "Activating configuration .. "
+echo "running activation script..."
 
 # Run the script that performs all configuration activation that does
 # not have to be done at boot time.
 @activateConfiguration@ "$systemConfig"
 
-echo ".. done"
-
 
 # Record the boot configuration.  !!! Should this be a GC root?
 if test -n "$systemConfig"; then
@@ -141,7 +135,7 @@ export MODULE_DIR=@kernel@/lib/modules/
 # Run any user-specified commands.
 @shell@ @postBootCommands@
 
-echo "Running Upstart"
+echo "starting Upstart..."
 
 # Start Upstart's init.  We start it through the
 # /var/run/current-system symlink indirection so that we can upgrade
-- 
GitLab


From 39d1b11ff7d6002cb9d664f649739d5709f90189 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 11 Aug 2009 21:10:33 +0000
Subject: [PATCH 1713/5331] * The mount hack is gone, just use the regular
 mount from   util-linux-ng and make sure that the needed mount helpers  
 (e.g. ntfs3g) are in /var/lib/current-system/sw/sbin.

svn path=/nixos/trunk/; revision=16690
---
 modules/tasks/filesystems.nix | 21 ++++++---------------
 1 file changed, 6 insertions(+), 15 deletions(-)

diff --git a/modules/tasks/filesystems.nix b/modules/tasks/filesystems.nix
index 5002ff25295..6ef6ec7840e 100644
--- a/modules/tasks/filesystems.nix
+++ b/modules/tasks/filesystems.nix
@@ -102,22 +102,9 @@ let
   
     system.sbin.mount = mkOption {
       internal = true;
-      default = pkgs.utillinuxng.override {
-        buildMountOnly = true;
-        mountHelpers = pkgs.buildEnv {
-          name = "mount-helpers";
-          paths = [
-            pkgs.ntfs3g
-            pkgs.mount_cifs
-            pkgs.nfsUtils
-          ];
-          pathsToLink = "/sbin";
-        } + "/sbin";
-      };
+      default = pkgs.utillinuxng;
       description = "
-        A patched `mount' command that looks in a directory in the Nix
-        store instead of in /sbin for mount helpers (like mount.ntfs-3g or
-        mount.cifs).
+        Package containing mount and umount.
       ";
     };
     
@@ -240,10 +227,14 @@ in
 
 {
   require = [options];
+  
   services = {
     extraJobs = [{
       name = "filesystems";
       inherit job;
     }];
   };
+
+  # Add the mount helpers to the system path so that `mount' can find them.
+  environment.systemPackages = [pkgs.ntfs3g pkgs.mount_cifs pkgs.nfsUtils];
 }
-- 
GitLab


From 25dbf1594eee02358825bdeb3ce0d291cb92ca06 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 11 Aug 2009 21:12:37 +0000
Subject: [PATCH 1714/5331] * Updates for the new udev and util-linux-ng: fsck
 is now in   util-linux-ng instead of e2fsprogs, blkid is in util-linux-ng,
 and   we need to manually create /dev/.udev prior to starting udevd for  
 some reason.

svn path=/nixos/trunk/; revision=16691
---
 modules/system/boot/stage-1-init.sh |  3 ++-
 modules/system/boot/stage-1.nix     | 17 ++++++++++-------
 2 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/modules/system/boot/stage-1-init.sh b/modules/system/boot/stage-1-init.sh
index 8604df5a70d..121605ab479 100644
--- a/modules/system/boot/stage-1-init.sh
+++ b/modules/system/boot/stage-1-init.sh
@@ -112,6 +112,7 @@ echo shutdown > /sys/power/disk
 
 # Create device nodes in /dev.
 export UDEV_CONFIG_FILE=@udevConf@
+mkdir -p /dev/.udev # !!! bug in udev?
 udevd --daemon
 udevadm trigger
 udevadm settle
@@ -282,7 +283,7 @@ fi
 
 
 # Stop udevd.
-kill $(minips -C udevd -o pid=)
+kill $(minips -C udevd -o pid=) 2> /dev/null
 
 
 if test -n "$debug1mounts"; then fail; fi
diff --git a/modules/system/boot/stage-1.nix b/modules/system/boot/stage-1.nix
index fd515b4bacc..3715fd4e0b4 100644
--- a/modules/system/boot/stage-1.nix
+++ b/modules/system/boot/stage-1.nix
@@ -141,7 +141,11 @@ let
       cp -p ${pkgs.glibc}/lib/libdl.so.* $out/lib
 
       # Copy some utillinux stuff.
-      cp ${pkgs.utillinux}/bin/mount ${pkgs.utillinux}/bin/umount ${pkgs.utillinux}/sbin/pivot_root $out/bin
+      cp ${pkgs.utillinux}/bin/mount ${pkgs.utillinux}/bin/umount \
+         ${pkgs.utillinux}/sbin/fsck ${pkgs.utillinux}/sbin/pivot_root \
+         ${pkgs.utillinux}/sbin/blkid $out/bin
+      cp -pd ${pkgs.utillinux}/lib/libblkid*.so.* $out/lib
+      cp -pd ${pkgs.utillinux}/lib/libuuid*.so.* $out/lib
 
       # Copy some coreutils.
       cp ${pkgs.coreutils}/bin/basename $out/bin
@@ -149,7 +153,6 @@ let
       # Copy e2fsck and friends.      
       cp ${pkgs.e2fsprogs}/sbin/e2fsck $out/bin
       cp ${pkgs.e2fsprogs}/sbin/tune2fs $out/bin
-      cp ${pkgs.e2fsprogs}/sbin/fsck $out/bin
       cp ${pkgs.reiserfsprogs}/sbin/reiserfsck $out/bin
       ln -s e2fsck $out/bin/fsck.ext2
       ln -s e2fsck $out/bin/fsck.ext3
@@ -170,8 +173,7 @@ let
 
       # Copy udev.
       cp ${pkgs.udev}/sbin/udevd ${pkgs.udev}/sbin/udevadm $out/bin
-      cp ${pkgs.udev}/lib/udev/*_id $out/bin
-      cp ${pkgs.udev}/lib/libvolume_id.so.* $out/lib
+      cp ${pkgs.udev}/libexec/*_id $out/bin
       
       # Copy bash.
       cp ${pkgs.bash}/bin/bash $out/bin
@@ -202,7 +204,7 @@ let
       $out/bin/tune2fs 2> /dev/null | grep "tune2fs "
       $out/bin/fsck -N
       $out/bin/udevadm --version
-      $out/bin/vol_id 2>&1 | grep "no device"
+      $out/bin/blkid -v 2>&1 | grep "blkid from util-linux-ng"
       if test -n "$devicemapper"; then
           $out/bin/dmsetup --version | grep "version:"
           LVM_SYSTEM_DIR=$out $out/bin/lvm 2>&1 | grep "LVM"
@@ -226,13 +228,14 @@ let
     name = "udev-rules";
     buildCommand = ''
       ensureDir $out
-      cp ${pkgs.udev}/*/udev/rules.d/60-persistent-storage.rules $out/
+      cp ${pkgs.udev}/libexec/rules.d/60-persistent-storage.rules $out/
       substituteInPlace $out/60-persistent-storage.rules \
         --replace ata_id ${extraUtils}/bin/ata_id \
         --replace usb_id ${extraUtils}/bin/usb_id \
         --replace scsi_id ${extraUtils}/bin/scsi_id \
         --replace path_id ${extraUtils}/bin/path_id \
-        --replace vol_id ${extraUtils}/bin/vol_id
+        --replace vol_id ${extraUtils}/bin/vol_id \
+        --replace /sbin/blkid ${extraUtils}/bin/blkid
       sed -e '/^ENV[{]DEVTYPE[}]=="disk", .*GOTO/d' -i $out/60-persistent-storage.rules 
     ''; # */
   };
-- 
GitLab


From dc093b57ddf018de97fa076a07784d025685a8f6 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 11 Aug 2009 21:16:15 +0000
Subject: [PATCH 1715/5331] * Updates to the udev service: support persistant
 CD-ROM / network   interface names, use udev's own firmware loader, and
 dropped the   sndMode option (udev puts all audio devices in the "audio"
 group, so   users can be added to that group if necessary).

svn path=/nixos/trunk/; revision=16692
---
 modules/module-list.nix                       |  1 -
 modules/services/hardware/firmware.nix        | 51 ------------
 .../services/hardware/udev-firmware-loader.sh | 32 --------
 modules/services/hardware/udev.nix            | 77 ++++++++++---------
 4 files changed, 41 insertions(+), 120 deletions(-)
 delete mode 100644 modules/services/hardware/firmware.nix
 delete mode 100755 modules/services/hardware/udev-firmware-loader.sh

diff --git a/modules/module-list.nix b/modules/module-list.nix
index d3290226b9a..9938cc6e1b5 100644
--- a/modules/module-list.nix
+++ b/modules/module-list.nix
@@ -31,7 +31,6 @@
   ./services/databases/mysql.nix
   ./services/databases/postgresql.nix
   ./services/hardware/acpid.nix
-  ./services/hardware/firmware.nix
   ./services/hardware/hal.nix
   ./services/hardware/udev.nix
   ./services/logging/klogd.nix
diff --git a/modules/services/hardware/firmware.nix b/modules/services/hardware/firmware.nix
deleted file mode 100644
index 0ed5fb31f98..00000000000
--- a/modules/services/hardware/firmware.nix
+++ /dev/null
@@ -1,51 +0,0 @@
-# This module provides support for automatic loading of firmware from
-# kernel modules. 
-{pkgs, config, ...}:
-
-with pkgs.lib;
-
-let
-
-  firmwareLoader = pkgs.substituteAll {
-    src = ./udev-firmware-loader.sh;
-    path = "${pkgs.coreutils}/bin";
-    isExecutable = true;
-    firmwareDirs = config.hardware.firmware;
-  };
-
-in
-
-{
-
-  ###### interface
-  
-  options = {
-
-    hardware.firmware = mkOption {
-      default = [];
-      example = ["/root/my-firmware"];
-      merge = mergeListOption; 
-      description = ''
-        List of directories containing firmware files.  Such files
-        will be loaded automatically if the kernel asks for them
-        (i.e., when it has detected specific hardware that requires
-        firmware to function).
-      '';
-    };
-
-  };
-
-
-  ###### implementation
-  
-  config = {
-
-    services.udev.extraRules =
-      ''
-        # Firmware loading.
-        SUBSYSTEM=="firmware", ACTION=="add", RUN+="${firmwareLoader}"
-      '';
-
-  };
-  
-}
diff --git a/modules/services/hardware/udev-firmware-loader.sh b/modules/services/hardware/udev-firmware-loader.sh
deleted file mode 100755
index 3592e72bb13..00000000000
--- a/modules/services/hardware/udev-firmware-loader.sh
+++ /dev/null
@@ -1,32 +0,0 @@
-#! @shell@
-
-export PATH="@path@"
-
-exec > /var/log/udev-fw 2>&1
-
-if test "$ACTION" = "add"; then
-
-    ls -l /sys/$DEVPATH
-
-    if ! test -e /sys/$DEVPATH/loading; then
-        echo "Firmware loading is not supported by device \`DEVPATH'."
-        exit 1
-    fi
-
-    # /root/test-firmware is an impure location allowing quick testing
-    # of firmwares.
-    for dir in /root/test-firmware @firmwareDirs@; do
-        if test -e "$dir/$FIRMWARE"; then
-            echo "Loading \`$FIRMWARE' for device \`$DEVPATH' from $dir."
-            echo 1 > /sys/$DEVPATH/loading
-            cat "$dir/$FIRMWARE" > /sys/$DEVPATH/data
-            echo 0 > /sys/$DEVPATH/loading
-            exit 0
-        fi
-    done
-
-    echo "Firmware \`$FIRMWARE' for device \`$DEVPATH' not found."
-    echo -1 > /sys/$DEVPATH/loading
-    exit 1
-
-fi
diff --git a/modules/services/hardware/udev.nix b/modules/services/hardware/udev.nix
index d1e22efc58a..f22adac6eb6 100644
--- a/modules/services/hardware/udev.nix
+++ b/modules/services/hardware/udev.nix
@@ -24,46 +24,37 @@ let
     KERNEL=="kqemu",                NAME="%k", MODE="0666"
     KERNEL=="vboxdrv", NAME="vboxdrv", OWNER="root", GROUP="root", MODE="0666"
 
-    # Create symlinks for CD/DVD devices.
-    ACTION=="add", SUBSYSTEM=="block", ENV{ID_CDROM}=="?*", SYMLINK+="cdrom cdrom-%k"
-    ACTION=="add", SUBSYSTEM=="block", ENV{ID_CDROM_CD_RW}=="?*", SYMLINK+="cdrw cdrw-%k"
-    ACTION=="add", SUBSYSTEM=="block", ENV{ID_CDROM_DVD}=="?*", SYMLINK+="dvd dvd-%k"
-    ACTION=="add", SUBSYSTEM=="block", ENV{ID_CDROM_DVD_RW}=="?*", SYMLINK+="dvdrw dvdrw-%k"
-    
-    # ALSA sound devices.
-    KERNEL=="controlC[0-9]*",       NAME="snd/%k", MODE="${cfg.sndMode}"
-    KERNEL=="hwC[D0-9]*",           NAME="snd/%k", MODE="${cfg.sndMode}"
-    KERNEL=="pcmC[D0-9cp]*",        NAME="snd/%k", MODE="${cfg.sndMode}"
-    KERNEL=="midiC[D0-9]*",         NAME="snd/%k", MODE="${cfg.sndMode}"
-    KERNEL=="timer",                NAME="snd/%k", MODE="${cfg.sndMode}"
-    KERNEL=="seq",                  NAME="snd/%k", MODE="${cfg.sndMode}"
-
   '';
   
   # Perform substitutions in all udev rules files.
   udevRules = stdenv.mkDerivation {
     name = "udev-rules";
-    #src = cleanSource ./udev-rules;
     buildCommand = ''
       ensureDir $out
       shopt -s nullglob
 
       # Use all the default udev rules.
-      cp ${udev}/*/udev/rules.d/*.rules $out/
+      cp ${udev}/libexec/rules.d/*.rules $out/
+
+      # Set a reasonable $PATH for programs called by udev rules.
+      echo 'ENV{PATH}="${pkgs.coreutils}/bin:${pkgs.gnused}/bin:${pkgs.utillinux}/bin"' > $out/00-path.rules
+
+      # Set the firmware search path so that the firmware.sh helper
+      # called by 50-firmware.rules works properly.
+      echo 'ENV{FIRMWARE_DIRS}="${toString config.hardware.firmware}"' >> $out/00-path.rules
+      
+      # Fix some paths in the standard udev rules.
+      for i in $out/*.rules; do
+        substituteInPlace $i \
+          --replace /sbin/modprobe ${modprobe}/sbin/modprobe \
+          --replace /sbin/blkid ${pkgs.utillinux}/sbin/blkid \
+          --replace /sbin/mdadm ${pkgs.mdadm}/sbin/madm
+      done
 
       # If auto-configuration is disabled, then remove
       # udev's 80-drivers.rules file, which contains rules for
       # automatically calling modprobe.
-      ${if config.boot.hardwareScan then
-        ''
-          substituteInPlace $out/80-drivers.rules \
-            --replace /sbin/modprobe ${modprobe}/sbin/modprobe
-        ''
-        else
-        ''
-          rm $out/80-drivers.rules
-        ''
-      }
+      ${if !config.boot.hardwareScan then "rm $out/80-drivers.rules" else ""}
 
       # Add the udev rules from other packages.
       for i in ${toString cfg.packages}; do
@@ -71,6 +62,15 @@ let
           ln -s $j $out/$(basename $j)
         done
       done
+
+      # Use the persistent device rules (naming for CD/DVD and
+      # network devices) stored in 
+      # /var/lib/udev/rules.d/70-persistent-{cd,net}.rules.  These are
+      # modified by the write_{cd,net}_rules helpers called from
+      # 75-cd-aliases-generator.rules and
+      # 75-persistent-net-generator.rules.
+      ln -s /var/lib/udev/rules.d/70-persistent-cd.rules $out/
+      ln -s /var/lib/udev/rules.d/70-persistent-net.rules $out/
     ''; # */
   };
 
@@ -136,16 +136,18 @@ in
         '';
       };
 
-      sndMode = mkOption {
-        default = "0600";
-        example = "0666";
-        description = ''
-          Permissions for sound devices, in case you have multiple
-          logged in users or if the devices belong to root for some
-          reason.
-        '';
-      };
-        
+    };
+    
+    hardware.firmware = mkOption {
+      default = [];
+      example = ["/root/my-firmware"];
+      merge = mergeListOption; 
+      description = ''
+        List of directories containing firmware files.  Such files
+        will be loaded automatically if the kernel asks for them
+        (i.e., when it has detected specific hardware that requires
+        firmware to function).
+      '';
     };
     
   };
@@ -171,6 +173,8 @@ in
           ''
             echo "" > /proc/sys/kernel/hotplug
 
+            mkdir -p /var/lib/udev/rules.d
+
             # Get rid of possible old udev processes.
             ${procps}/bin/pkill -u root "^udevd$" || true
 
@@ -182,6 +186,7 @@ in
             done
 
             # Start udev.
+            mkdir -p /dev/.udev # !!! bug in udev?
             ${udev}/sbin/udevd --daemon
 
             # Let udev create device nodes for all modules that have already
-- 
GitLab


From 9493ecc2a40eabc9a371c536b285ae5f0adeb9d3 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 11 Aug 2009 21:16:59 +0000
Subject: [PATCH 1716/5331] * Use the hal-info package.

svn path=/nixos/trunk/; revision=16693
---
 modules/services/hardware/hal.nix        | 35 +++++++++++-------------
 modules/services/x11/xserver/default.nix | 12 ++++----
 2 files changed, 21 insertions(+), 26 deletions(-)

diff --git a/modules/services/hardware/hal.nix b/modules/services/hardware/hal.nix
index c1390dd6eee..b8d858faa92 100644
--- a/modules/services/hardware/hal.nix
+++ b/modules/services/hardware/hal.nix
@@ -9,15 +9,11 @@ let
 
   inherit (pkgs) hal;
 
-  fdi =
-    if cfg.extraFdi == [] then
-      "${hal}/share/hal/fdi"
-    else
-      pkgs.buildEnv {
-        name = "hal-fdi";
-        pathsToLink = [ "/preprobe" "/information" "/policy" ];
-        paths = [ "${hal}/share/hal/fdi" ] ++ cfg.extraFdi;
-      };
+  fdi = pkgs.buildEnv {
+    name = "hal-fdi";
+    pathsToLink = [ "/share/hal/fdi" ];
+    paths = cfg.packages;
+  };
 
 in
 
@@ -31,17 +27,16 @@ in
     
       enable = mkOption {
         default = true;
-        description = "
+        description = ''
           Whether to start the HAL daemon.
-        ";
+        '';
       };
 
-      extraFdi = mkOption {
+      packages = mkOption {
         default = [];
-        example = [ "/nix/store/.../fdi" ];
-        description = "
-          Extend HAL daemon configuration with additionnal paths.
-        ";
+        description = ''
+          Packages containing additional HAL configuration data.
+        '';
       };
 
     };
@@ -55,6 +50,8 @@ in
 
     environment.systemPackages = [hal];
 
+    services.hal.packages = [hal pkgs.hal_info];
+
     users.extraUsers = singleton
       { name = "haldaemon";
         uid = config.ids.uids.haldaemon;
@@ -79,9 +76,9 @@ in
         # !!! HACK? These environment variables manipulated inside
         # 'src'/hald/mmap_cache.c are used for testing the daemon
         environment =
-          { HAL_FDI_SOURCE_PREPROBE = "${fdi}/preprobe";
-            HAL_FDI_SOURCE_INFORMATION = "${fdi}/information";
-            HAL_FDI_SOURCE_POLICY = "${fdi}/policy";
+          { HAL_FDI_SOURCE_PREPROBE = "${fdi}/share/hal/fdi/preprobe";
+            HAL_FDI_SOURCE_INFORMATION = "${fdi}/share/hal/fdi/information";
+            HAL_FDI_SOURCE_POLICY = "${fdi}/share/hal/fdi/policy";
           };
 
         preStart =
diff --git a/modules/services/x11/xserver/default.nix b/modules/services/x11/xserver/default.nix
index 5c5301ecf32..9845a7536bc 100644
--- a/modules/services/x11/xserver/default.nix
+++ b/modules/services/x11/xserver/default.nix
@@ -359,10 +359,10 @@ let
     ];
 
 
-  halConfigFiles = [
+  halConfigFiles = singleton
     (pkgs.writeTextFile {
       name = "hal-policy-keymap";
-      destination = "/policy/30-keymap.fdi";
+      destination = "/share/hal/fdi/policy/30-keymap.fdi";
       text = ''
         <?xml version="1.0" encoding="ISO-8859-1"?>
         <deviceinfo version="0.2">
@@ -380,9 +380,9 @@ let
           </device>
         </deviceinfo>
       '';
-    })
-  ];
+    });
 
+    
   configFile = stdenv.mkDerivation {
     name = "xserver.conf";
     src = ./xserver.conf;
@@ -618,9 +618,7 @@ mkIf cfg.enable {
       };
     };
 
-    hal = {
-      extraFdi = halConfigFiles;
-    };
+    hal.packages = halConfigFiles;
 
     extraJobs = [{
       name = "xserver";
-- 
GitLab


From 88c505c9e0e63d2247c4407763fcd4b2430f25b5 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sun, 16 Aug 2009 13:14:33 +0000
Subject: [PATCH 1717/5331] * make-etc.sh: fixed the duplicate entry check. *
 Inlined make-etc.nix since it's a trivial function.

svn path=/nixos/trunk/; revision=16728
---
 modules/system/etc/etc.nix      | 14 ++++++++++----
 modules/system/etc/make-etc.nix | 12 ------------
 modules/system/etc/make-etc.sh  | 12 ++++++------
 3 files changed, 16 insertions(+), 22 deletions(-)
 delete mode 100644 modules/system/etc/make-etc.nix

diff --git a/modules/system/etc/etc.nix b/modules/system/etc/etc.nix
index da60108d7c9..4ae420017a5 100644
--- a/modules/system/etc/etc.nix
+++ b/modules/system/etc/etc.nix
@@ -36,11 +36,17 @@ let
       chmod ${mode} "$target"
     '';
 
-  makeEtc = import ./make-etc.nix {
-    inherit (pkgs) stdenv;
-    configFiles = config.environment.etc;
+  makeEtc = pkgs.stdenv.mkDerivation {
+    name = "etc";
+
+    builder = ./make-etc.sh;
+
+    /* !!! Use toXML. */
+    sources = map (x: x.source) config.environment.etc;
+    targets = map (x: x.target) config.environment.etc;
+    modes = map (x: if x ? mode then x.mode else "symlink") config.environment.etc;
   };
-  
+
 in
 
 {
diff --git a/modules/system/etc/make-etc.nix b/modules/system/etc/make-etc.nix
deleted file mode 100644
index 94ea248f669..00000000000
--- a/modules/system/etc/make-etc.nix
+++ /dev/null
@@ -1,12 +0,0 @@
-{stdenv, configFiles}:
-
-stdenv.mkDerivation {
-  name = "etc";
-
-  builder = ./make-etc.sh;
-
-  /* !!! Use toXML. */
-  sources = map (x: x.source) configFiles;
-  targets = map (x: x.target) configFiles;
-  modes = map (x: if x ? mode then x.mode else "symlink") configFiles;
-}
diff --git a/modules/system/etc/make-etc.sh b/modules/system/etc/make-etc.sh
index 4b7bb68be4b..f05d74b55fc 100644
--- a/modules/system/etc/make-etc.sh
+++ b/modules/system/etc/make-etc.sh
@@ -8,13 +8,13 @@ modes_=($modes)
 for ((i = 0; i < ${#targets_[@]}; i++)); do
     ensureDir $out/etc/$(dirname ${targets_[$i]})
     if ! test -e $out/etc/${targets_[$i]}; then
-      ln -s ${sources_[$i]} $out/etc/${targets_[$i]};
+        ln -s ${sources_[$i]} $out/etc/${targets_[$i]};
     else
-      echo Duplicate entry "${targets_[$i]} -> ${sources_[$i]}"
-      if test "$(readlink "$targets_[$i]")" -ne "$sources_[$i]"; then
-        echo Mismatched duplicate entry "$(readlink "$targets_[$i]") "'<>'" $sources_[$i]"
-	exit 1
-      fi
+        echo "Duplicate entry ${targets_[$i]} -> ${sources_[$i]}"
+        if test "$(readlink $out/etc/${targets_[$i]})" != "${sources_[$i]}"; then
+            echo "Mismatched duplicate entry $(readlink $out/etc/${targets_[$i]}) <-> ${sources_[$i]}"
+	    exit 1
+        fi
     fi;
     if test "${modes_[$i]}" != symlink; then
         echo "${modes_[$i]}" > $out/etc/${targets_[$i]}.mode
-- 
GitLab


From 39bffdb34c1e1f344ba350041c10d0b07deeecb0 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sun, 16 Aug 2009 14:49:14 +0000
Subject: [PATCH 1718/5331] * Make the generation of /etc/pam.d more
 declarative.  There now is an   option security.pam.services containing the
 list of PAM services.   For instance, the SLiM module simply declares:

    security.pam.services = [ { name = "slim"; localLogin = true; } ];

svn path=/nixos/trunk/; revision=16729
---
 modules/security/pam.d/chsh                   |   5 -
 modules/security/pam.d/common                 |  13 --
 modules/security/pam.d/common-console         |   1 -
 modules/security/pam.d/cups                   |   4 -
 modules/security/pam.d/ejabberd               |   4 -
 modules/security/pam.d/ftp                    |   4 -
 modules/security/pam.d/kde                    |   5 -
 modules/security/pam.d/login                  |   5 -
 modules/security/pam.d/lshd                   |   4 -
 modules/security/pam.d/other                  |   8 -
 modules/security/pam.d/passwd                 |   4 -
 modules/security/pam.d/samba                  |   4 -
 modules/security/pam.d/shadow                 |   6 -
 modules/security/pam.d/sshd                   |   4 -
 modules/security/pam.d/su                     |   6 -
 modules/security/pam.d/useradd                |   5 -
 modules/security/pam.d/xlock                  |   4 -
 modules/security/pam.nix                      | 153 +++++++++---
 modules/security/sudo.nix                     | 113 ++++-----
 modules/security/sudo.pam                     |   4 -
 modules/services/mail/dovecot.nix             | 220 +++++++++---------
 modules/services/scheduling/atd.nix           | 212 ++++++++---------
 modules/services/scheduling/atd.pam           |   4 -
 .../x11/xserver/display-managers/kdm.nix      |  68 +++---
 .../x11/xserver/display-managers/slim.nix     | 187 +++++++--------
 .../x11/xserver/display-managers/slim.pam     |   5 -
 26 files changed, 479 insertions(+), 573 deletions(-)
 delete mode 100644 modules/security/pam.d/chsh
 delete mode 100644 modules/security/pam.d/common
 delete mode 100644 modules/security/pam.d/common-console
 delete mode 100644 modules/security/pam.d/cups
 delete mode 100644 modules/security/pam.d/ejabberd
 delete mode 100644 modules/security/pam.d/ftp
 delete mode 100644 modules/security/pam.d/kde
 delete mode 100644 modules/security/pam.d/login
 delete mode 100644 modules/security/pam.d/lshd
 delete mode 100644 modules/security/pam.d/other
 delete mode 100644 modules/security/pam.d/passwd
 delete mode 100644 modules/security/pam.d/samba
 delete mode 100644 modules/security/pam.d/shadow
 delete mode 100644 modules/security/pam.d/sshd
 delete mode 100644 modules/security/pam.d/su
 delete mode 100644 modules/security/pam.d/useradd
 delete mode 100644 modules/security/pam.d/xlock
 delete mode 100644 modules/security/sudo.pam
 delete mode 100644 modules/services/scheduling/atd.pam
 delete mode 100644 modules/services/x11/xserver/display-managers/slim.pam

diff --git a/modules/security/pam.d/chsh b/modules/security/pam.d/chsh
deleted file mode 100644
index b4aac2aba95..00000000000
--- a/modules/security/pam.d/chsh
+++ /dev/null
@@ -1,5 +0,0 @@
-auth     sufficient     pam_rootok.so
-auth     required       pam_permit.so
-account  required       pam_permit.so
-password required       pam_permit.so
-session  required       pam_permit.so
diff --git a/modules/security/pam.d/common b/modules/security/pam.d/common
deleted file mode 100644
index 538c5fe4d6f..00000000000
--- a/modules/security/pam.d/common
+++ /dev/null
@@ -1,13 +0,0 @@
-@isLDAPEnabled@  auth     sufficient     @pam_ldap@/lib/security/pam_ldap.so 
-auth     sufficient     @pam_unix2@/lib/security/pam_unix2.so
-auth     required       pam_deny.so
-
-@isLDAPEnabled@  account  optional       @pam_ldap@/lib/security/pam_ldap.so 
-account  required       @pam_unix2@/lib/security/pam_unix2.so
-
-@isLDAPEnabled@  password sufficient     @pam_ldap@/lib/security/pam_ldap.so 
-password requisite     @pam_unix2@/lib/security/pam_unix2.so nullok
-@syncSambaPasswords@
-
-@isLDAPEnabled@  session  optional       @pam_ldap@/lib/security/pam_ldap.so 
-session  required       @pam_unix2@/lib/security/pam_unix2.so
diff --git a/modules/security/pam.d/common-console b/modules/security/pam.d/common-console
deleted file mode 100644
index 1534ac15401..00000000000
--- a/modules/security/pam.d/common-console
+++ /dev/null
@@ -1 +0,0 @@
-session  optional       @pam_console@/lib/security/pam_console.so debug handlersfile=@pamConsoleHandlers@
diff --git a/modules/security/pam.d/cups b/modules/security/pam.d/cups
deleted file mode 100644
index 50f3cc5ce60..00000000000
--- a/modules/security/pam.d/cups
+++ /dev/null
@@ -1,4 +0,0 @@
-auth     include        common
-account  include        common
-password include        common
-session  include        common
diff --git a/modules/security/pam.d/ejabberd b/modules/security/pam.d/ejabberd
deleted file mode 100644
index 50f3cc5ce60..00000000000
--- a/modules/security/pam.d/ejabberd
+++ /dev/null
@@ -1,4 +0,0 @@
-auth     include        common
-account  include        common
-password include        common
-session  include        common
diff --git a/modules/security/pam.d/ftp b/modules/security/pam.d/ftp
deleted file mode 100644
index 50f3cc5ce60..00000000000
--- a/modules/security/pam.d/ftp
+++ /dev/null
@@ -1,4 +0,0 @@
-auth     include        common
-account  include        common
-password include        common
-session  include        common
diff --git a/modules/security/pam.d/kde b/modules/security/pam.d/kde
deleted file mode 100644
index dac4fec866c..00000000000
--- a/modules/security/pam.d/kde
+++ /dev/null
@@ -1,5 +0,0 @@
-auth     include        common
-account  include        common
-password include        common
-session  include        common
-session  include        common-console
diff --git a/modules/security/pam.d/login b/modules/security/pam.d/login
deleted file mode 100644
index dac4fec866c..00000000000
--- a/modules/security/pam.d/login
+++ /dev/null
@@ -1,5 +0,0 @@
-auth     include        common
-account  include        common
-password include        common
-session  include        common
-session  include        common-console
diff --git a/modules/security/pam.d/lshd b/modules/security/pam.d/lshd
deleted file mode 100644
index 50f3cc5ce60..00000000000
--- a/modules/security/pam.d/lshd
+++ /dev/null
@@ -1,4 +0,0 @@
-auth     include        common
-account  include        common
-password include        common
-session  include        common
diff --git a/modules/security/pam.d/other b/modules/security/pam.d/other
deleted file mode 100644
index b1ed9205b72..00000000000
--- a/modules/security/pam.d/other
+++ /dev/null
@@ -1,8 +0,0 @@
-auth     required       pam_warn.so
-auth     required       pam_deny.so
-account  required       pam_warn.so
-account  required       pam_deny.so
-password required       pam_warn.so
-password required       pam_deny.so
-session  required       pam_warn.so
-session  required       pam_deny.so
diff --git a/modules/security/pam.d/passwd b/modules/security/pam.d/passwd
deleted file mode 100644
index 50f3cc5ce60..00000000000
--- a/modules/security/pam.d/passwd
+++ /dev/null
@@ -1,4 +0,0 @@
-auth     include        common
-account  include        common
-password include        common
-session  include        common
diff --git a/modules/security/pam.d/samba b/modules/security/pam.d/samba
deleted file mode 100644
index 50f3cc5ce60..00000000000
--- a/modules/security/pam.d/samba
+++ /dev/null
@@ -1,4 +0,0 @@
-auth     include        common
-account  include        common
-password include        common
-session  include        common
diff --git a/modules/security/pam.d/shadow b/modules/security/pam.d/shadow
deleted file mode 100644
index 0148f1fea27..00000000000
--- a/modules/security/pam.d/shadow
+++ /dev/null
@@ -1,6 +0,0 @@
-# Used by groupadd etc.
-auth     sufficient     pam_rootok.so
-auth     required       pam_permit.so
-account  required       pam_permit.so
-password required       pam_permit.so
-session  required       pam_deny.so
diff --git a/modules/security/pam.d/sshd b/modules/security/pam.d/sshd
deleted file mode 100644
index 50f3cc5ce60..00000000000
--- a/modules/security/pam.d/sshd
+++ /dev/null
@@ -1,4 +0,0 @@
-auth     include        common
-account  include        common
-password include        common
-session  include        common
diff --git a/modules/security/pam.d/su b/modules/security/pam.d/su
deleted file mode 100644
index ad62e2241b7..00000000000
--- a/modules/security/pam.d/su
+++ /dev/null
@@ -1,6 +0,0 @@
-auth     sufficient     pam_rootok.so
-auth     include        common
-account  include        common
-password include        common
-session  include        common
-session  optional       pam_xauth.so xauthpath=@xauth@/bin/xauth systemuser=99
diff --git a/modules/security/pam.d/useradd b/modules/security/pam.d/useradd
deleted file mode 100644
index b4aac2aba95..00000000000
--- a/modules/security/pam.d/useradd
+++ /dev/null
@@ -1,5 +0,0 @@
-auth     sufficient     pam_rootok.so
-auth     required       pam_permit.so
-account  required       pam_permit.so
-password required       pam_permit.so
-session  required       pam_permit.so
diff --git a/modules/security/pam.d/xlock b/modules/security/pam.d/xlock
deleted file mode 100644
index 50f3cc5ce60..00000000000
--- a/modules/security/pam.d/xlock
+++ /dev/null
@@ -1,4 +0,0 @@
-auth     include        common
-account  include        common
-password include        common
-session  include        common
diff --git a/modules/security/pam.nix b/modules/security/pam.nix
index a3fef459edb..291fe67b044 100644
--- a/modules/security/pam.nix
+++ b/modules/security/pam.nix
@@ -3,8 +3,12 @@
 
 {config, pkgs, ...}:
 
+with pkgs.lib;
+
 let
 
+  inherit (pkgs) pam_unix2 pam_console pam_ldap;
+
   # !!! ugh, these files shouldn't be created here.
   pamConsoleHandlers = pkgs.writeText "console.handlers" ''
     console consoledevs /dev/tty[0-9][0-9]* :[0-9]\.[0-9] :[0-9]
@@ -14,45 +18,122 @@ let
 
   pamConsolePerms = ./console.perms;
 
-  generatePAMConfig = program:
-    let isLDAPEnabled = config.users.ldap.enable; in
-    { source = pkgs.substituteAll {
-        src = ./pam.d + ("/" + program);
-        inherit (pkgs) pam_unix2 pam_console;
-        pam_ldap =
-          if isLDAPEnabled
-          then pkgs.pam_ldap
-          else "/no-such-path";
-        inherit (pkgs.xorg) xauth;
-        inherit pamConsoleHandlers;
-        isLDAPEnabled = if isLDAPEnabled then "" else "#";
-        syncSambaPasswords = if config.services.samba.syncPasswordsByPam
-          then "password   optional     ${pkgs.samba}/lib/security/pam_smbpass.so nullok use_authtok try_first_pass"
-          else "# change samba configuration options to make passwd sync the samba auth database as well here..";
-      };
-      target = "pam.d/" + program;
+  makePAMService =
+    { name
+    , # If set, root doesn't need to authenticate (e.g. for the "chsh"
+      # service).
+      rootOK ? false
+    , # If set, this is a local login (e.g. virtual console or X), so
+      # the user gets ownership of audio devices etc.
+      localLogin ? false
+    , # Whether to forward XAuth keys between users.  Mostly useful
+      # for "su".
+      forwardXAuth ? false
+    }:
+
+    { source = pkgs.writeText "${name}.pam"
+        # !!! TODO: move the LDAP stuff to the LDAP module, and the
+        # Samba stuff to the Samba module.  This requires that the PAM
+        # module provides the right hooks.
+        ''
+          # Account management.
+          ${optionalString config.users.ldap.enable
+              "account optional ${pam_ldap}/lib/security/pam_ldap.so"}
+          account required ${pam_unix2}/lib/security/pam_unix2.so
+
+          # Authentication management.
+          ${optionalString rootOK
+              "auth sufficient pam_rootok.so"}
+          ${optionalString config.users.ldap.enable
+              "auth sufficient ${pam_ldap}/lib/security/pam_ldap.so"}
+          auth sufficient ${pam_unix2}/lib/security/pam_unix2.so
+          auth required   pam_deny.so
+
+          # Password management.
+          ${optionalString config.users.ldap.enable
+              "password sufficient ${pam_ldap}/lib/security/pam_ldap.so"}
+          password requisite ${pam_unix2}/lib/security/pam_unix2.so nullok
+          ${optionalString config.services.samba.syncPasswordsByPam
+              "password optional ${pkgs.samba}/lib/security/pam_smbpass.so nullok use_authtok try_first_pass"}
+
+          # Session management.
+          ${optionalString config.users.ldap.enable
+              "session optional ${pam_ldap}/lib/security/pam_ldap.so"}
+          session required ${pam_unix2}/lib/security/pam_unix2.so
+          ${optionalString localLogin
+              "session optional ${pam_console}/lib/security/pam_console.so debug handlersfile=${pamConsoleHandlers}"}
+          ${optionalString forwardXAuth
+              "session optional pam_xauth.so xauthpath=${pkgs.xorg.xauth}/bin/xauth systemuser=99"}
+        '';
+      target = "pam.d/${name}";
     };
 
 in
 
 {
-  environment.etc =  map generatePAMConfig 
-    [ "login"
-      "su"
-      "other"
-      "passwd"
-      "shadow"
-      "sshd"
-      "lshd"
-      "useradd"
-      "chsh"
-      "xlock"
-      "samba"
-      "cups"
-      "ftp"
-      "ejabberd"
-      "kde"
-      "common"
-      "common-console" # shared stuff for interactive local sessions
-    ];
+
+  ###### interface
+
+  options = {
+
+    security.pam.services = mkOption {
+      default = [];
+      example = [ { name = "chsh"; rootOK = true; } ];
+      description =
+        ''
+          This option defines the PAM services.  A service typically
+          corresponds to a program that uses PAM,
+          e.g. <command>login</command> or <command>passwd</command>.
+          Each element of this list is an attribute set describing a
+          service.  The attribute <varname>name</varname> specifies
+          the name of the service.  The attribute
+          <varname>rootOK</varname> specifies whether the root user is
+          allowed to use this service without authentication.  The
+          attribute <varname>localLogin</varname> specifies whether
+          this is a local login service (e.g. <command>xdm</command>),
+          which implies that the user gets ownership of devices such
+          as audio and CD-ROM drives.  The
+          attribute <varname>forwardXAuth</varname> specifies whether
+          X authentication keys should be passed from the calling user
+          to the target user (e.g. for <command>su</command>).
+        '';
+    };
+
+  };
+
+
+  ###### implementation
+
+  config = {
+  
+    environment.systemPackages =
+      # Include the PAM modules in the system path mostly for the manpages.
+      [ pkgs.pam pam_unix2 ]
+      ++ optional config.users.ldap.enable pam_ldap;
+
+    environment.etc = map makePAMService config.security.pam.services;
+
+    security.pam.services =
+      # Most of these should be moved to specific modules.
+      [ { name = "cups"; }
+        { name = "ejabberd"; }
+        { name = "ftp"; }
+        { name = "lshd"; }
+        { name = "passwd"; }
+        { name = "samba"; }
+        { name = "sshd"; }
+        { name = "xlock"; }
+        { name = "chsh"; rootOK = true; }
+        { name = "su"; rootOK = true; forwardXAuth = true; }
+        # Note: useradd, groupadd etc. aren't setuid root, so it
+        # doesn't really matter what the PAM config says as long as it
+        # lets root in.
+        { name = "useradd"; rootOK = true; }
+        # Used by groupadd etc.
+        { name = "shadow"; rootOK = true; }
+        { name = "login"; localLogin = true; }
+      ];
+
+  };
+  
 }
diff --git a/modules/security/sudo.nix b/modules/security/sudo.nix
index 9c2eb5f5c24..62a061a268f 100644
--- a/modules/security/sudo.nix
+++ b/modules/security/sudo.nix
@@ -1,79 +1,65 @@
 {pkgs, config, ...}:
 
-###### interface
+with pkgs.lib;
+
 let
-  inherit (pkgs.lib) mkOption;
+
+  cfg = config.security.sudo;
+  
+  inherit (pkgs) sudo;
+
+in
+
+{
+
+  ###### interface
 
   options = {
-    security = {
-      sudo = {
-
-        enable = mkOption {
-          default = true;
-          description = "
-            Whether to enable the <command>sudo</command> command, which
-            allows non-root users to execute commands as root.
-          ";
-        };
-
-        configFile = mkOption {
-          default = "
-# WARNING: do not edit this file directly or with \"visudo\".  Instead,
-# edit the source file in /etc/nixos/nixos/etc/sudoers.
-
-# \"root\" is allowed to do anything.
-root        ALL=(ALL) SETENV: ALL
-
-# Users in the \"wheel\" group can do anything.
-%wheel      ALL=(ALL) SETENV: ALL
-          ";
-          description = "
-            This string contains the contents of the
-            <filename>sudoers</filename> file.
-          ";
-          # If syntax errors are detected in this file, the NixOS
-          # configuration will fail to build.
-        };
 
-      };
+    security.sudo.enable = mkOption {
+      default = true;
+      description =
+        ''
+          Whether to enable the <command>sudo</command> command, which
+          allows non-root users to execute commands as root.
+        '';
+    };
+
+    security.sudo.configFile = mkOption {
+      # Note: if syntax errors are detected in this file, the NixOS
+      # configuration will fail to build.
+      default =
+        ''
+          # WARNING: do not edit this file directly or with "visudo".  Instead,
+          # edit the source file in /etc/nixos/nixos/etc/sudoers.
+
+          # "root" is allowed to do anything.
+          root        ALL=(ALL) SETENV: ALL
+
+          # Users in the "wheel" group can do anything.
+          %wheel      ALL=(ALL) SETENV: ALL
+        '';
+      description =
+        ''
+          This string contains the contents of the
+          <filename>sudoers</filename> file.
+        '';
     };
   };
-in
 
-###### implementation
-let
-  cfg = config.security.sudo;
-  inherit (pkgs.lib) mkIf;
-  inherit (pkgs) sudo;
-in
 
-mkIf cfg.enable {
-  require = [
-    options
+  ###### implementation
 
-    # config.environment.etc
-    # ../etc/default.nix
+  config = mkIf cfg.enable {
 
-    # ? # config.environment.extraPackages
-    # ? # config.security.extraSetuidPrograms
-  ];
+    security.extraSetuidPrograms = [ "sudo" ];
 
-  security = {
-    extraSetuidPrograms = [
-      "sudo"
-    ];
-  };
+    environment.systemPackages = [ sudo ];
 
-  environment = {
-    extraPackages = [ sudo ];
+    security.pam.services = [ { name = "sudo"; } ];
 
-    etc = [
-      {
-        source = ./sudo.pam;
-        target = "pam.d/sudo";
-      }
-      {
-        source = pkgs.runCommand "sudoers"
+    environment.etc = singleton
+      { source = pkgs.runCommand "sudoers"
           { src = pkgs.writeText "sudoers-in" cfg.configFile; }
           # Make sure that the sudoers file is syntactically valid.
           # (currently disabled - NIXOS-66)
@@ -81,7 +67,8 @@ mkIf cfg.enable {
           "cp $src $out";
         target = "sudoers";
         mode = "0440";
-      }
-    ];
+      };
+
   };
+
 }
diff --git a/modules/security/sudo.pam b/modules/security/sudo.pam
deleted file mode 100644
index 50f3cc5ce60..00000000000
--- a/modules/security/sudo.pam
+++ /dev/null
@@ -1,4 +0,0 @@
-auth     include        common
-account  include        common
-password include        common
-session  include        common
diff --git a/modules/services/mail/dovecot.nix b/modules/services/mail/dovecot.nix
index 33675efef7a..79442f959c6 100644
--- a/modules/services/mail/dovecot.nix
+++ b/modules/services/mail/dovecot.nix
@@ -1,44 +1,6 @@
 {pkgs, config, ...}:
 
-###### interface
-let
-  inherit (pkgs.lib) mkOption mkIf;
-
-  options = {
-    services = {
-      dovecot = {
-        enable = mkOption {
-          default = false;
-          description = "Whether to enable dovecot POP3/IMAP server.";
-        };
-
-        user = mkOption {
-          default = "dovecot";
-          description = "dovecot user name";
-        };
-        group = mkOption {
-          default = "dovecot";
-          description = "dovecot group name";
-        };
-
-        sslServerCert = mkOption {
-          default = "";
-          description = "Server certificate";
-        };
-        sslCACert = mkOption {
-          default = "";
-          description = "CA certificate used by server certificate";
-        };
-        sslServerKey = mkOption {
-          default = "";
-          description = "Server key";
-        };
-      };
-    };
-  };
-in
-
-###### implementation
+with pkgs.lib;
 
 let 
   startingDependency = if config.services.gw6c.enable then "gw6c" else "network-interfaces";
@@ -46,99 +8,129 @@ let
   cfg = config.services.dovecot;
 
   dovecotConf = 
-  ''
-    base_dir = /var/run/dovecot/ 
-
-    protocols = imap imaps pop3 pop3s
-  ''
-  + (if cfg.sslServerCert!="" then
-  ''
-    ssl_cert_file = ${cfg.sslServerCert}
-    ssl_key_file = ${cfg.sslServerKey}
-    ssl_ca_file = ${cfg.sslCACert}
-  '' else ''
-    ssl_disable = yes
-    disable_plaintext_auth = no
-  '')
+    ''
+      base_dir = /var/run/dovecot/ 
+
+      protocols = imap imaps pop3 pop3s
+    ''
+    + (if cfg.sslServerCert!="" then
+    ''
+      ssl_cert_file = ${cfg.sslServerCert}
+      ssl_key_file = ${cfg.sslServerKey}
+      ssl_ca_file = ${cfg.sslCACert}
+    '' else ''
+      ssl_disable = yes
+      disable_plaintext_auth = no
+    '')
+
+    + ''
+      login_user = ${cfg.user}
+      login_chroot = no
+
+      mail_location = maildir:/var/spool/mail/%u
+
+      maildir_copy_with_hardlinks = yes
+
+      auth default {
+        mechanisms = plain login 
+        userdb passwd {
+        }
+        passdb pam {
+        }
+        user = root 
+      }
+      auth_debug = yes
+      auth_verbose = yes
 
+      pop3_uidl_format = %08Xv%08Xu
 
-  + ''
-    login_user = ${cfg.user}
-    login_chroot = no
+      log_path = /var/log/dovecot.log
+    '';
+  
+  confFile = pkgs.writeText "dovecot.conf" dovecotConf;
 
-    mail_location = maildir:/var/spool/mail/%u
+in
 
-    maildir_copy_with_hardlinks = yes
+{
 
-    auth default {
-      mechanisms = plain login 
-      userdb passwd {
-      }
-      passdb pam {
-      }
-      user = root 
-    }
-    auth_debug = yes
-    auth_verbose = yes
+  ###### interface
 
-    pop3_uidl_format = %08Xv%08Xu
+  options = {
+  
+    services.dovecot = {
+    
+      enable = mkOption {
+        default = false;
+        description = "Whether to enable the Dovecot POP3/IMAP server.";
+      };
 
-    log_path = /var/log/dovecot.log
-  ''
-  ;
-  confFile = pkgs.writeText "dovecot.conf" dovecotConf;
+      user = mkOption {
+        default = "dovecot";
+        description = "Dovecot user name.";
+      };
+      
+      group = mkOption {
+        default = "dovecot";
+        description = "Dovecot group name.";
+      };
 
-  pamdFile = pkgs.writeText "dovecot.pam" ''
-    auth        include common
-    account     include common
-  '';
+      sslServerCert = mkOption {
+        default = "";
+        description = "Server certificate";
+      };
+      
+      sslCACert = mkOption {
+        default = "";
+        description = "CA certificate used by the server certificate.";
+      };
+      
+      sslServerKey = mkOption {
+        default = "";
+        description = "Server key.";
+      };
 
-in
+    };
+    
+  };
 
-mkIf config.services.dovecot.enable {
+  
+  ###### implementation
 
-  require = [
-    options
-  ];
+  config = mkIf config.services.dovecot.enable {
 
-  environment = {
-    etc = [{
-      source = pamdFile;
-      target = "pam.d/dovecot";
-    }];
-  };
+    security.pam.services = [ { name = "dovecot"; } ];
 
-  users = {
-    extraUsers = [{
-      name = cfg.user;
-      uid = config.ids.uids.dovecot;
-      description = "Dovecot user";
-      group = cfg.group;
-    }];
-    extraGroups = [{
-      name = cfg.group;
-      gid = config.ids.gids.dovecot;
-    }];
-  };
+    users.extraUsers = singleton
+      { name = cfg.user;
+        uid = config.ids.uids.dovecot;
+        description = "Dovecot user";
+        group = cfg.group;
+      };
 
-  services = {
-    extraJobs = [{
-      name = "dovecot";
+    users.extraGroups = singleton
+      { name = cfg.group;
+        gid = config.ids.gids.dovecot;
+      };
 
-      job = ''
-        description "Dovecot IMAP/POP3 server"
+    services.extraJobs = singleton
+      { name = "dovecot";
 
-        start on ${startingDependency}/started
-        stop on never
+        job =
+          ''
+            description "Dovecot IMAP/POP3 server"
 
-        start script
-          ${pkgs.coreutils}/bin/mkdir -p /var/run/dovecot /var/run/dovecot/login 
-          ${pkgs.coreutils}/bin/chown -R ${cfg.user}.${cfg.group} /var/run/dovecot
-        end script 
+            start on ${startingDependency}/started
+            stop on never
 
-        respawn ${pkgs.dovecot}/sbin/dovecot -F -c ${confFile}
-      '';
+            start script
+              ${pkgs.coreutils}/bin/mkdir -p /var/run/dovecot /var/run/dovecot/login 
+              ${pkgs.coreutils}/bin/chown -R ${cfg.user}.${cfg.group} /var/run/dovecot
+            end script 
 
-    }];
+            respawn ${pkgs.dovecot}/sbin/dovecot -F -c ${confFile}
+          '';
+      };
+      
   };
+  
 }
diff --git a/modules/services/scheduling/atd.nix b/modules/services/scheduling/atd.nix
index bb85c5994be..e4e6e090234 100644
--- a/modules/services/scheduling/atd.nix
+++ b/modules/services/scheduling/atd.nix
@@ -1,140 +1,116 @@
 {pkgs, config, ...}:
 
-###### interface
+with pkgs.lib;
+
 let
-  inherit (pkgs.lib) mkOption;
 
-  options = {
-    services = {
-      atd = {
-
-        enable = mkOption {
-          default = true;
-          description = ''
-            Whether to enable the `at' daemon, a command scheduler.
-          '';
-        };
-
-        allowEveryone = mkOption {
-          default = false;
-          description = ''
-            Whether to make /var/spool/at{jobs,spool} writeable 
-            by everyone (and sticky).  This is normally not needed since
-            the `at' commands are setuid/setgid `atd'.
-          '';
-        };
-      };
+  cfg = config.services.atd;
+  
+  inherit (pkgs) at;
+
+  job =
+    ''
+      description "at daemon (atd)"
+
+      start on startup
+      stop on shutdown
+
+      start script
+         # Snippets taken and adapted from the original `install' rule of
+         # the makefile.
+
+         # We assume these values are those actually used in Nixpkgs for
+         # `at'.
+         spooldir=/var/spool/atspool
+         jobdir=/var/spool/atjobs
+         etcdir=/etc/at
+
+         for dir in "$spooldir" "$jobdir" "$etcdir"
+         do
+           if [ ! -d "$dir" ]
+           then
+               mkdir -p "$dir" && chown atd:atd "$dir"
+           fi
+         done
+         chmod 1770 "$spooldir" "$jobdir"
+         ${if cfg.allowEveryone then ''chmod a+rwxt "$spooldir" "$jobdir" '' else ""}
+         if [ ! -f "$etcdir"/at.deny ]
+         then
+             touch "$etcdir"/at.deny && \
+             chown root:atd "$etcdir"/at.deny && \
+             chmod 640 "$etcdir"/at.deny
+         fi
+         if [ ! -f "$jobdir"/.SEQ ]
+         then
+             touch "$jobdir"/.SEQ && \
+             chown atd:atd "$jobdir"/.SEQ && \
+             chmod 600 "$jobdir"/.SEQ
+         fi
+      end script
+
+      respawn ${at}/sbin/atd
+    '';
 
-    };
-  };
 in
 
-###### implementation
-let
-  cfg = config.services.atd;
-  inherit (pkgs.lib) mkIf;
-  inherit (pkgs) at;
+{
 
-  user = {
-    name = "atd";
-    uid = config.ids.uids.atd;
-    description = "atd user";
-    home = "/var/empty";
-  };
+  ###### interface
 
-  group = {
-    name = "atd";
-    gid = config.ids.gids.atd;
-  };
+  options = {
+  
+    services.atd.enable = mkOption {
+      default = true;
+      description = ''
+        Whether to enable the `at' daemon, a command scheduler.
+      '';
+    };
 
-  job = ''
-description "at daemon (atd)"
-
-start on startup
-stop on shutdown
-
-start script
-   # Snippets taken and adapted from the original `install' rule of
-   # the makefile.
-
-   # We assume these values are those actually used in Nixpkgs for
-   # `at'.
-   spooldir=/var/spool/atspool
-   jobdir=/var/spool/atjobs
-   etcdir=/etc/at
-
-   for dir in "$spooldir" "$jobdir" "$etcdir"
-   do
-     if [ ! -d "$dir" ]
-     then
-         mkdir -p "$dir" && chown atd:atd "$dir"
-     fi
-   done
-   chmod 1770 "$spooldir" "$jobdir"
-   ${if cfg.allowEveryone then ''chmod a+rwxt "$spooldir" "$jobdir" '' else ""}
-   if [ ! -f "$etcdir"/at.deny ]
-   then
-       touch "$etcdir"/at.deny && \
-       chown root:atd "$etcdir"/at.deny && \
-       chmod 640 "$etcdir"/at.deny
-   fi
-   if [ ! -f "$jobdir"/.SEQ ]
-   then
-       touch "$jobdir"/.SEQ && \
-       chown atd:atd "$jobdir"/.SEQ && \
-       chmod 600 "$jobdir"/.SEQ
-   fi
-end script
-
-respawn ${at}/sbin/atd
-'';
-in
+    services.atd.allowEveryone = mkOption {
+      default = false;
+      description = ''
+        Whether to make /var/spool/at{jobs,spool} writeable 
+        by everyone (and sticky).  This is normally not needed since
+        the `at' commands are setuid/setgid `atd'.
+     '';
+    };
+    
+  };
+  
 
-mkIf cfg.enable {
-  require = [
-    options
+  ###### implementation
 
-    # config.services.extraJobs
-    #../upstart-jobs/default.nix
+  config = mkIf cfg.enable {
 
-    # config.environment.etc
-    #../etc/default.nix
+    security.setuidOwners = map (program: {
+      inherit program;
+      owner = "atd";
+      group = "atd";
+      setuid = true;
+      setgid = true;
+    }) [ "at" "atq" "atrm" ];
 
-    # users.*
-    #../system/users-groups.nix
+    environment.systemPackages = [ at ];
 
-    # ? # config.environment.extraPackages
-    # ? # config.security.extraSetuidPrograms
-  ];
+    security.pam.services = [ { name = "atd"; } ];
 
-  security = {
-    setuidOwners = map (program: {
-        inherit program;
-        owner = "atd";
-        group = "atd";
-        setuid = true;
-        setgid = true;
-      }) [ "at" "atq" "atrm" ];
-  };
+    users.extraUsers = singleton
+      { name = "atd";
+        uid = config.ids.uids.atd;
+        description = "atd user";
+        home = "/var/empty";
+      };
 
-  environment = {
-    extraPackages = [ at ];
+    users.extraGroups = singleton
+      { name = "atd";
+        gid = config.ids.gids.atd;
+      };
 
-    etc = [{
-      source = ./atd.pam;
-      target = "pam.d/atd";
-    }];
-  };
+    services.extraJobs = singleton # !!! convert to job
+      { name = "atd";
+        inherit job;
+      };
 
-  users = {
-    extraUsers = [user];
-    extraGroups = [group];
   };
 
-  services = {
-    extraJobs = [{
-      name = "atd";
-      inherit job;
-    }];
-  };
 }
diff --git a/modules/services/scheduling/atd.pam b/modules/services/scheduling/atd.pam
deleted file mode 100644
index 50f3cc5ce60..00000000000
--- a/modules/services/scheduling/atd.pam
+++ /dev/null
@@ -1,4 +0,0 @@
-auth     include        common
-account  include        common
-password include        common
-session  include        common
diff --git a/modules/services/x11/xserver/display-managers/kdm.nix b/modules/services/x11/xserver/display-managers/kdm.nix
index 031f5c18a1e..e7f22cf1f34 100644
--- a/modules/services/x11/xserver/display-managers/kdm.nix
+++ b/modules/services/x11/xserver/display-managers/kdm.nix
@@ -1,35 +1,15 @@
 {pkgs, config, ...}:
 
-###### interface
-let
-  inherit (pkgs.lib) mkOption;
-
-  options = {
+with pkgs.lib;
 
-    services.xserver.displayManager.kdm = {
-      enable = mkOption {
-        default = false;
-        description = "
-          Whether to enable the KDE display manager.
-        ";
-      };
-    };
-
-  };
-
-in
-
-###### implementation
 let
-  xcfg = config.services.xserver;
-  dmcfg = xcfg.displayManager;
+
+  dmcfg = config.services.xserver.displayManager;
   cfg = dmcfg.kdm;
 
-  inherit (pkgs.lib) mkIf;
-  inherit (pkgs) stdenv;
   inherit (pkgs.kde42) kdebase_workspace;
 
-  kdmrc = stdenv.mkDerivation {
+  kdmrc = pkgs.stdenv.mkDerivation {
     name = "kdmrc";
     # -e "s|Session=${kdebase_workspace}/share/config/kdm/Xsession|Session=${dmcfg.session.script}|" \
     buildCommand = ''
@@ -50,20 +30,36 @@ let
 
 in
 
-mkIf cfg.enable {
-  require = [
-    options
-  ];
+{
+
+  ###### interface
+  
+  options = {
 
-  services = {
-    xserver = {
-      displayManager = {
-        job = {
-          beforeScript = "";
-          env = "";
-          execCmd = "${kdebase_workspace}/bin/kdm -config ${kdmrc}/kdmrc";
-        };
+    services.xserver.displayManager.kdm = {
+      enable = mkOption {
+        default = false;
+        description = ''
+          Whether to enable the KDE display manager.
+        '';
       };
     };
+
+  };
+  
+  
+  ###### implementation
+  
+  config = mkIf cfg.enable {
+  
+    services.xserver.displayManager.job =
+      { beforeScript = "";
+        env = "";
+        execCmd = "${kdebase_workspace}/bin/kdm -config ${kdmrc}/kdmrc";
+      };
+
+    security.pam.services = [ { name = "slim"; localLogin = true; } ];
+      
   };
+  
 }
diff --git a/modules/services/x11/xserver/display-managers/slim.nix b/modules/services/x11/xserver/display-managers/slim.nix
index b3be8334b65..447b0ef5171 100644
--- a/modules/services/x11/xserver/display-managers/slim.nix
+++ b/modules/services/x11/xserver/display-managers/slim.nix
@@ -1,94 +1,24 @@
 {pkgs, config, ...}:
 
-###### interface
-let
-  inherit (pkgs.lib) mkOption;
-
-  slimOptions = {
-
-    theme = mkOption {
-      default = null;
-      example = pkgs.fetchurl {
-        url = http://download.berlios.de/slim/slim-wave.tar.gz;
-        sha256 = "0ndr419i5myzcylvxb89m9grl2xyq6fbnyc3lkd711mzlmnnfxdy";
-      };
-      description = "
-        The theme for the SLiM login manager.  If not specified, SLiM's
-        default theme is used.  See <link
-        xlink:href='http://slim.berlios.de/themes01.php'/> for a
-        collection of themes.
-      ";
-    };
-
-    defaultUser = mkOption {
-      default = "";
-      example = "login";
-      description = "
-        The default user to load. If you put a username here you
-        get it automatically loaded into the username field, and
-        the focus is placed on the password.
-      ";
-    };
-
-    hideCursor = mkOption {
-      default = false;
-      example = true;
-      description = "
-        Hide the mouse cursor on the login screen.
-      ";
-    };
-
-  };
-
-  options = { services = { xserver = { displayManager = {
-
-    slim = slimOptions // {
-
-      enable = mkOption {
-        default = true;
-        description = "
-          Whether to enable slim as the display manager.
-        ";
-      };
-
-    };
+with pkgs.lib;
 
-  }; /* displayManager */ }; /* xserver */ }; /* services */ };
-
-  copyOldOptions = { services = { xserver = {
-
-    # Declare old options.
-    slim = slimOptions;
-
-    # Copy the old options into the new options.
-    displayManager = {
-      slim = config.services.xserver.slim;
-    };
-
-  }; /* xserver */ }; /* services */ };
-
-in
-
-###### implementation
 let
-  xcfg = config.services.xserver;
-  dmcfg = xcfg.displayManager;
-  cfg = dmcfg.slim;
-
-  inherit (pkgs.lib) mkIf;
 
-  slimConfig = pkgs.writeText "slim.cfg" ''
-    xauth_path ${dmcfg.xauthBin}
-    default_xserver ${dmcfg.xserverBin}
-    xserver_arguments ${dmcfg.xserverArgs}
-    sessions ${pkgs.lib.concatStringsSep "," dmcfg.session.names}
-    login_cmd exec ${pkgs.stdenv.bash}/bin/sh ${dmcfg.session.script} "%session"
-    halt_cmd ${pkgs.upstart}/sbin/shutdown -h now
-    reboot_cmd ${pkgs.upstart}/sbin/shutdown -r now
-    ${if cfg.defaultUser != "" then "default_user " + cfg.defaultUser else ""}
-    ${if cfg.hideCursor then "hidecursor true" else ""}
-  '';
+  dmcfg = config.services.xserver.displayManager;
+  cfg = dmcfg.slim;
 
+  slimConfig = pkgs.writeText "slim.cfg"
+    ''
+      xauth_path ${dmcfg.xauthBin}
+      default_xserver ${dmcfg.xserverBin}
+      xserver_arguments ${dmcfg.xserverArgs}
+      sessions ${pkgs.lib.concatStringsSep "," dmcfg.session.names}
+      login_cmd exec ${pkgs.stdenv.bash}/bin/sh ${dmcfg.session.script} "%session"
+      halt_cmd ${pkgs.upstart}/sbin/shutdown -h now
+      reboot_cmd ${pkgs.upstart}/sbin/shutdown -r now
+      ${if cfg.defaultUser != "" then "default_user " + cfg.defaultUser else ""}
+      ${if cfg.hideCursor then "hidecursor true" else ""}
+    '';
 
   # Unpack the SLiM theme, or use the default.
   slimThemesDir =
@@ -106,34 +36,77 @@ let
 
 in
 
-mkIf cfg.enable {
-  require = [
-    options
-    copyOldOptions
-  ];
-
-  services = {
-    xserver = {
-      displayManager = {
-        job = {
-          beforeScript = ''
+{
+
+  ###### interface
+
+  options = {
+  
+    services.xserver.displayManager.slim = {
+    
+      enable = mkOption {
+        default = true;
+        description = ''
+          Whether to enable SLiM as the display manager.
+        '';
+      };
+
+      theme = mkOption {
+        default = null;
+        example = pkgs.fetchurl {
+          url = http://download.berlios.de/slim/slim-wave.tar.gz;
+          sha256 = "0ndr419i5myzcylvxb89m9grl2xyq6fbnyc3lkd711mzlmnnfxdy";
+        };
+        description = ''
+          The theme for the SLiM login manager.  If not specified, SLiM's
+          default theme is used.  See <link
+          xlink:href='http://slim.berlios.de/themes01.php'/> for a
+          collection of themes.
+        '';
+      };
+
+      defaultUser = mkOption {
+        default = "";
+        example = "login";
+        description = ''
+          The default user to load. If you put a username here you
+          get it automatically loaded into the username field, and
+          the focus is placed on the password.
+        '';
+      };
+
+      hideCursor = mkOption {
+        default = false;
+        example = true;
+        description = ''
+          Hide the mouse cursor on the login screen.
+        '';
+      };
+
+    };
+
+  };
+
+
+  ###### implementation
+
+  config = mkIf cfg.enable {
+
+    services.xserver.displayManager.job =
+      { beforeScript =
+          ''
             rm -f /var/log/slim.log
           '';
-          env = ''
+        env =
+          ''
             env SLIM_CFGFILE=${slimConfig}
             env SLIM_THEMESDIR=${slimThemesDir}
           '';
-          execCmd = "${pkgs.slim}/bin/slim";
-        };
+        execCmd = "${pkgs.slim}/bin/slim";
       };
-    };
-  };
 
-  environment = {
-    etc = [
-      { source = ./slim.pam;
-        target = "pam.d/slim";
-      }
-    ];
+    security.pam.services = [ { name = "slim"; localLogin = true; } ];
+
   };
+
 }
diff --git a/modules/services/x11/xserver/display-managers/slim.pam b/modules/services/x11/xserver/display-managers/slim.pam
deleted file mode 100644
index dac4fec866c..00000000000
--- a/modules/services/x11/xserver/display-managers/slim.pam
+++ /dev/null
@@ -1,5 +0,0 @@
-auth     include        common
-account  include        common
-password include        common
-session  include        common
-session  include        common-console
-- 
GitLab


From 2884c9a83651a10857bbaa7912162f4cd4601617 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sun, 16 Aug 2009 14:54:31 +0000
Subject: [PATCH 1719/5331] * Style change.

svn path=/nixos/trunk/; revision=16730
---
 modules/security/setuid-wrappers.nix | 162 ++++++++++++++-------------
 1 file changed, 84 insertions(+), 78 deletions(-)

diff --git a/modules/security/setuid-wrappers.nix b/modules/security/setuid-wrappers.nix
index b3d5db96cae..105cb4fe85f 100644
--- a/modules/security/setuid-wrappers.nix
+++ b/modules/security/setuid-wrappers.nix
@@ -4,56 +4,6 @@ with pkgs.lib;
 
 let
 
-  options = {
-    security = {
-      setuidPrograms = mkOption {
-        default = [
-          "passwd" "su" "crontab" "ping" "ping6"
-          "fusermount" "wodim" "cdrdao" "growisofs"
-        ];
-        description = ''
-          Only the programs from system path listed her will be made setuid root
-          (through a wrapper program).  It's better to set
-          <option>security.extraSetuidPrograms</option>.
-        '';
-      };
-
-      # !!! obsolete
-      extraSetuidPrograms = mkOption {
-        default = [];
-        example = ["fusermount"];
-        description = ''
-          This option lists additional programs that must be made setuid
-          root.
-        '';
-      };
-
-      setuidOwners = mkOption {
-        default = [];
-        example = [{
-          program = "sendmail";
-          owner = "nobody";
-          group = "postdrop";
-          setuid = false;
-          setgid = true;
-        }];
-        description = ''
-          This option allows the ownership and permissions on the setuid
-          wrappers for specific programs to be overriden from the
-          default (setuid root, but not setgid root).
-        '';
-      };
-
-      wrapperDir = mkOption {
-        default = "/var/setuid-wrappers";
-        description = ''
-          This option defines the path to the setuid wrappers.  It
-          should generally not be overriden.
-        '';
-      };
-    };
-  };
-
   setuidWrapper = pkgs.stdenv.mkDerivation {
     name = "setuid-wrapper";
     buildCommand = ''
@@ -66,33 +16,88 @@ let
 in
 
 {
-  require = [options];
-
-  system = {
-    activationScripts = {
-      setuid =
-        let
-          setuidPrograms = builtins.toString (
-            config.security.setuidPrograms ++
-            config.security.extraSetuidPrograms ++
-            map (x: x.program) config.security.setuidOwners
-          );
-
-          adjustSetuidOwner = concatStrings (map
-            (_entry: let entry = {
-              owner = "nobody";
-              group = "nogroup";
-              setuid = false;
-              setgid = false;
-            } //_entry; in
-            ''
-              chown ${entry.owner}.${entry.group} $wrapperDir/${entry.program}
-              chmod u${if entry.setuid then "+" else "-"}s $wrapperDir/${entry.program} 
-              chmod g${if entry.setgid then "+" else "-"}s $wrapperDir/${entry.program}
-            '')
-            config.security.setuidOwners);
-
-        in pkgs.stringsWithDeps.fullDepEntry ''
+
+  ###### interface
+
+  options = {
+
+    security.setuidPrograms = mkOption {
+      default =
+        [ "passwd" "su" "crontab" "ping" "ping6"
+          "fusermount" "wodim" "cdrdao" "growisofs"
+        ];
+      description = ''
+        Only the programs from system path listed here will be made
+        setuid root (through a wrapper program).
+      '';
+    };
+
+    # !!! obsolete
+    security.extraSetuidPrograms = mkOption {
+      default = [];
+      example = ["fusermount"];
+      description = ''
+        This option lists additional programs that must be made setuid
+        root.
+      '';
+    };
+
+    security.setuidOwners = mkOption {
+      default = [];
+      example =
+        [ { program = "sendmail";
+            owner = "nobody";
+            group = "postdrop";
+            setuid = false;
+            setgid = true;
+          }
+        ];
+      description = ''
+        This option allows the ownership and permissions on the setuid
+        wrappers for specific programs to be overriden from the
+        default (setuid root, but not setgid root).
+      '';
+    };
+
+    security.wrapperDir = mkOption {
+      default = "/var/setuid-wrappers";
+      description = ''
+        This option defines the path to the setuid wrappers.  It
+        should generally not be overriden.
+      '';
+    };
+
+  };
+
+
+  ###### implementation
+
+  config = {
+  
+    system.activationScripts.setuid =
+      let
+        setuidPrograms = builtins.toString (
+          config.security.setuidPrograms ++
+          config.security.extraSetuidPrograms ++
+          map (x: x.program) config.security.setuidOwners
+        );
+
+        adjustSetuidOwner = concatStrings (map
+          (_entry: let entry = {
+            owner = "nobody";
+            group = "nogroup";
+            setuid = false;
+            setgid = false;
+          } //_entry; in
+          ''
+            chown ${entry.owner}.${entry.group} $wrapperDir/${entry.program}
+            chmod u${if entry.setuid then "+" else "-"}s $wrapperDir/${entry.program} 
+            chmod g${if entry.setgid then "+" else "-"}s $wrapperDir/${entry.program}
+          '')
+          config.security.setuidOwners);
+
+      in pkgs.stringsWithDeps.fullDepEntry
+        ''
           # Look in the system path and in the default profile for
           # programs to be wrapped.  However, having setuid programs
           # in a profile is problematic, since the NixOS activation
@@ -122,6 +127,7 @@ in
 
           ${adjustSetuidOwner}
         '' [ "defaultPath" "users" ];
-    };
+
   };
+  
 }
-- 
GitLab


From 3b931f786128599b0b02eb04f7dba22a1d5a41a9 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sun, 16 Aug 2009 15:46:24 +0000
Subject: [PATCH 1720/5331] * We still need /etc/pam.d/other to keep usermod
 happy.

svn path=/nixos/trunk/; revision=16731
---
 modules/security/pam.nix | 19 ++++++++++++++++++-
 1 file changed, 18 insertions(+), 1 deletion(-)

diff --git a/modules/security/pam.nix b/modules/security/pam.nix
index 291fe67b044..2a36e7cece0 100644
--- a/modules/security/pam.nix
+++ b/modules/security/pam.nix
@@ -18,6 +18,18 @@ let
 
   pamConsolePerms = ./console.perms;
 
+  otherService = pkgs.writeText "other.pam"
+    ''
+      auth     required pam_warn.so
+      auth     required pam_deny.so
+      account  required pam_warn.so
+      account  required pam_deny.so
+      password required pam_warn.so
+      password required pam_deny.so
+      session  required pam_warn.so
+      session  required pam_deny.so
+    '';
+
   makePAMService =
     { name
     , # If set, root doesn't need to authenticate (e.g. for the "chsh"
@@ -111,7 +123,12 @@ in
       [ pkgs.pam pam_unix2 ]
       ++ optional config.users.ldap.enable pam_ldap;
 
-    environment.etc = map makePAMService config.security.pam.services;
+    environment.etc =
+      map makePAMService config.security.pam.services
+      ++ singleton
+        { source = otherService;
+          target = "pam.d/other";
+        };
 
     security.pam.services =
       # Most of these should be moved to specific modules.
-- 
GitLab


From f31e2718b73fe9d8857c26dd76f4d472e90580d0 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sun, 16 Aug 2009 16:46:00 +0000
Subject: [PATCH 1721/5331] * Print an error if the exec fails.

svn path=/nixos/trunk/; revision=16732
---
 modules/security/setuid-wrapper.c | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/modules/security/setuid-wrapper.c b/modules/security/setuid-wrapper.c
index 32965d40c11..007ffbc34fe 100644
--- a/modules/security/setuid-wrapper.c
+++ b/modules/security/setuid-wrapper.c
@@ -7,6 +7,8 @@
 #include <fcntl.h>
 #include <dirent.h>
 #include <assert.h>
+#include <string.h>
+#include <errno.h>
 
 /* Make sure assertions are not compiled out.  */
 #undef NDEBUG
@@ -71,6 +73,9 @@ int main(int argc, char * * argv)
     //printf("real = %s, len = %d\n", real, len);
 
     execve(real, argv, environ);
+
+    fprintf(stderr, "%s: cannot run `%s': %s\n",
+        argv[0], real, strerror(errno));
     
     exit(1);
 }
-- 
GitLab


From dba1964122f9a5589d8cdf0a13acc4ff4dcdc99e Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sun, 16 Aug 2009 17:24:59 +0000
Subject: [PATCH 1722/5331] * setuid-wrappers: support setting the mode.  For
 instance, some   programs require that the mode is 4550 so that execution of
 the   setuid program can be restricted to members of a group. *
 setuid-wrappers: remove a race condition in the creation of the   wrappers if
 the ownership or mode was different than root:root and   4555. *
 setuid-wrappers: allow the full path of the wrapped program to be  
 specified, rather than looking it up in $PATH.

svn path=/nixos/trunk/; revision=16733
---
 modules/security/setuid-wrappers.nix | 85 +++++++++++++---------------
 1 file changed, 39 insertions(+), 46 deletions(-)

diff --git a/modules/security/setuid-wrappers.nix b/modules/security/setuid-wrappers.nix
index 105cb4fe85f..103929a12d4 100644
--- a/modules/security/setuid-wrappers.nix
+++ b/modules/security/setuid-wrappers.nix
@@ -4,11 +4,13 @@ with pkgs.lib;
 
 let
 
+  inherit (config.security) wrapperDir;
+
   setuidWrapper = pkgs.stdenv.mkDerivation {
     name = "setuid-wrapper";
     buildCommand = ''
       ensureDir $out/bin
-      gcc -Wall -O2 -DWRAPPER_DIR=\"${config.security.wrapperDir}\" ${./setuid-wrapper.c} -o $out/bin/setuid-wrapper
+      gcc -Wall -O2 -DWRAPPER_DIR=\"${wrapperDir}\" ${./setuid-wrapper.c} -o $out/bin/setuid-wrapper
       strip -s $out/bin/setuid-wrapper
     '';
   };
@@ -76,56 +78,47 @@ in
   
     system.activationScripts.setuid =
       let
-        setuidPrograms = builtins.toString (
-          config.security.setuidPrograms ++
-          config.security.extraSetuidPrograms ++
-          map (x: x.program) config.security.setuidOwners
-        );
-
-        adjustSetuidOwner = concatStrings (map
-          (_entry: let entry = {
-            owner = "nobody";
-            group = "nogroup";
-            setuid = false;
-            setgid = false;
-          } //_entry; in
+        setuidPrograms =
+          (map (x: { program = x; owner = "root"; group = "root"; setuid = true; })
+            (config.security.setuidPrograms ++
+             config.security.extraSetuidPrograms))
+          ++ config.security.setuidOwners;
+
+        makeSetuidWrapper =
+          { program
+          , source ? ""
+          , owner ? "nobody"
+          , group ? "nogroup"
+          , setuid ? false
+          , setgid ? false
+          , permissions ? "u+rx,g+rx,o+rx"
+          }:
+
           ''
-            chown ${entry.owner}.${entry.group} $wrapperDir/${entry.program}
-            chmod u${if entry.setuid then "+" else "-"}s $wrapperDir/${entry.program} 
-            chmod g${if entry.setgid then "+" else "-"}s $wrapperDir/${entry.program}
-          '')
-          config.security.setuidOwners);
+            source=${if source != "" then source else "$(PATH=$SETUID_PATH type -tP ${program})"}
+            if test -z "$source"; then
+                # If we can't find the program, fall back to the
+                # system profile.
+                source=/nix/var/nix/profiles/default/bin/${program}
+            fi
+            
+            cp ${setuidWrapper}/bin/setuid-wrapper ${wrapperDir}/${program}
+            echo -n "$source" > ${wrapperDir}/${program}.real
+            chmod 0000 ${wrapperDir}/${program} # to prevent races
+            chown ${owner}.${group} ${wrapperDir}/${program}
+            chmod "u${if setuid then "+" else "-"}s,g${if setgid then "+" else "-"}s,${permissions}" ${wrapperDir}/${program}
+          '';
 
       in pkgs.stringsWithDeps.fullDepEntry
         ''
           # Look in the system path and in the default profile for
-          # programs to be wrapped.  However, having setuid programs
-          # in a profile is problematic, since the NixOS activation
-          # script won't be rerun automatically when you install a
-          # wrappable program in the profile with nix-env.
-          SETUID_PATH=/nix/var/nix/profiles/default/sbin:/nix/var/nix/profiles/default/bin:${config.system.path}/bin:${config.system.path}/sbin
-
-          wrapperDir=${config.security.wrapperDir}
-          if test -d $wrapperDir; then rm -f $wrapperDir/*; fi # */
-          mkdir -p $wrapperDir
-          
-          for i in ${setuidPrograms}; do
-              program=$(PATH=$SETUID_PATH type -tP $i)
-              if test -z "$program"; then
-                  # XXX: It would be preferable to detect this problem before
-                  # `activate-configuration' is invoked.
-                  #echo "WARNING: No executable named \`$i' was found" >&2
-                  #echo "WARNING: but \`$i' was specified as a setuid program." >&2
-                  true
-              else
-                  cp ${setuidWrapper}/bin/setuid-wrapper $wrapperDir/$i
-                  echo -n "$program" > $wrapperDir/$i.real
-                  chown root.root $wrapperDir/$i
-                  chmod 4755 $wrapperDir/$i
-              fi
-          done
-
-          ${adjustSetuidOwner}
+          # programs to be wrapped.
+          SETUID_PATH=${config.system.path}/bin:${config.system.path}/sbin
+
+          if test -d ${wrapperDir}; then rm -f ${wrapperDir}/*; fi # */
+          mkdir -p ${wrapperDir}
+
+          ${concatMapStrings makeSetuidWrapper setuidPrograms}
         '' [ "defaultPath" "users" ];
 
   };
-- 
GitLab


From 26439de75bdeb322530f4b5f7126a7e0c09419c5 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sun, 16 Aug 2009 21:11:04 +0000
Subject: [PATCH 1723/5331] * security.setuidPrograms: don't set the default in
 the "default"   mkOption argument, because then we lose them if somebody sets
   security.setuidPrograms somewhere else.  (Shouldn't "default" be   merged
 as well?)

svn path=/nixos/trunk/; revision=16734
---
 modules/security/setuid-wrappers.nix | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/modules/security/setuid-wrappers.nix b/modules/security/setuid-wrappers.nix
index 103929a12d4..5450bbb7bab 100644
--- a/modules/security/setuid-wrappers.nix
+++ b/modules/security/setuid-wrappers.nix
@@ -10,7 +10,8 @@ let
     name = "setuid-wrapper";
     buildCommand = ''
       ensureDir $out/bin
-      gcc -Wall -O2 -DWRAPPER_DIR=\"${wrapperDir}\" ${./setuid-wrapper.c} -o $out/bin/setuid-wrapper
+      gcc -Wall -O2 -DWRAPPER_DIR=\"${wrapperDir}\" \
+          ${./setuid-wrapper.c} -o $out/bin/setuid-wrapper
       strip -s $out/bin/setuid-wrapper
     '';
   };
@@ -24,10 +25,7 @@ in
   options = {
 
     security.setuidPrograms = mkOption {
-      default =
-        [ "passwd" "su" "crontab" "ping" "ping6"
-          "fusermount" "wodim" "cdrdao" "growisofs"
-        ];
+      default = [];
       description = ''
         Only the programs from system path listed here will be made
         setuid root (through a wrapper program).
@@ -75,7 +73,12 @@ in
   ###### implementation
 
   config = {
-  
+
+    security.setuidPrograms =
+      [ "passwd" "su" "crontab" "ping" "ping6"
+        "fusermount" "wodim" "cdrdao" "growisofs"
+      ];
+
     system.activationScripts.setuid =
       let
         setuidPrograms =
-- 
GitLab


From 7dbf523ddca758a17f3ba0654d3d651921a72fee Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sun, 16 Aug 2009 21:46:26 +0000
Subject: [PATCH 1724/5331] * dbus: enable support for system services (these
 are programs that   the bus daemon can start on demand).  ConsoleKit and
 PolicyKit need   this.  This requires a setuid wrapper for
 dbus-daemon-launch-helper,   as well as a "messagebus" group.

svn path=/nixos/trunk/; revision=16736
---
 modules/misc/ids.nix             |  1 +
 modules/services/system/dbus.nix | 50 ++++++++++++++++++++++++++++----
 2 files changed, 46 insertions(+), 5 deletions(-)

diff --git a/modules/misc/ids.nix b/modules/misc/ids.nix
index 52a518add3a..87a73832a59 100644
--- a/modules/misc/ids.nix
+++ b/modules/misc/ids.nix
@@ -57,6 +57,7 @@ in
     wheel = 1;
     kmem = 2;
     tty = 3;
+    messagebus = 4; # D-Bus
     haldaemon = 5;
     disk = 6;
     vsftpd = 7;
diff --git a/modules/services/system/dbus.nix b/modules/services/system/dbus.nix
index 9dc6bd9d78b..66feb6d46f4 100644
--- a/modules/services/system/dbus.nix
+++ b/modules/services/system/dbus.nix
@@ -7,16 +7,27 @@ let
 
   cfg = config.services.dbus;
 
-  inherit (pkgs) dbus;
+  # !!! dbus_temp uses /etc/dbus-1; will be merged into pkgs.dbus later.
+  dbus = pkgs.dbus_temp;
 
   homeDir = "/var/run/dbus";
 
-  configFile = pkgs.stdenv.mkDerivation {
+  configDir = pkgs.stdenv.mkDerivation {
     name = "dbus-conf";
     buildCommand = ''
       ensureDir $out
-      ln -s ${dbus}/etc/dbus-1/system.conf $out/system.conf
-
+      
+      cp ${dbus}/etc/dbus-1/system.conf $out/system.conf
+
+      # Tell the daemon where the setuid wrapper around
+      # dbus-daemon-launch-helper lives.      
+      sed -i $out/system.conf \
+          -e 's|<servicehelper>.*/libexec/dbus-daemon-launch-helper|<servicehelper>${config.security.wrapperDir}/dbus-daemon-launch-helper|'
+
+      # Add the system-services directories to the daemon's search path.
+      sed -i $out/system.conf \
+          -e 's|<standard_system_servicedirs/>|${systemServiceDirs}|'
+          
       # Note: system.conf includes ./system.d (i.e. it has a relative,
       # not absolute path).
       ensureDir $out/system.d
@@ -26,6 +37,10 @@ let
     ''; # */
   };
 
+  systemServiceDirs = concatMapStrings
+    (d: "<servicedir>${d}/share/dbus-1/system-services</servicedir> ")
+    cfg.packages;
+
 in
 
 {
@@ -67,11 +82,26 @@ in
 
     environment.systemPackages = [dbus.daemon dbus.tools];
 
+    environment.etc = singleton
+      # We need /etc/dbus-1/system.conf for now, because
+      # dbus-daemon-launch-helper is called with an empty environment
+      # and no arguments.  So we have no way to tell it the location
+      # of our config file.
+      { source = configDir;
+        target = "dbus-1";
+      };
+
     users.extraUsers = singleton
       { name = "messagebus";
         uid = config.ids.uids.messagebus;
         description = "D-Bus system message bus daemon user";
         home = homeDir;
+        group = "messagebus";
+      };
+
+    users.extraGroups = singleton
+      { name = "messagebus";
+        gid = config.ids.gids.messagebus;
       };
 
     jobs = singleton
@@ -92,7 +122,7 @@ in
             # !!! hack - dbus should be running once this job is
             # considered "running"; should be fixable once we have
             # Upstart 0.6.
-            ${dbus}/bin/dbus-daemon --config-file=${configFile}/system.conf
+            ${dbus}/bin/dbus-daemon --config-file=${configDir}/system.conf
           '';
 
         postStop =
@@ -104,6 +134,16 @@ in
           '';
       };
 
+    security.setuidOwners = singleton
+      { program = "dbus-daemon-launch-helper";
+        source = "${dbus}/libexec/dbus-daemon-launch-helper";
+        owner = "root";
+        group = "messagebus";
+        setuid = true;
+        setgid = false;
+        permissions = "u+rx,g+rx,o-rx";
+      };
+
   };
  
 }
-- 
GitLab


From ac24c7834da869b08c18d8a2ab5cc8512562feb0 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sun, 16 Aug 2009 21:48:46 +0000
Subject: [PATCH 1725/5331] * A module for policy-kit (not enabled yet).

svn path=/nixos/trunk/; revision=16738
---
 modules/security/policy-kit.nix | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)
 create mode 100644 modules/security/policy-kit.nix

diff --git a/modules/security/policy-kit.nix b/modules/security/policy-kit.nix
new file mode 100644
index 00000000000..09c216ebcf3
--- /dev/null
+++ b/modules/security/policy-kit.nix
@@ -0,0 +1,24 @@
+{ config, pkgs, ... }:
+
+with pkgs.lib;
+
+{
+
+  config = {
+
+    environment.systemPackages = [ pkgs.policy_kit ];
+
+    services.dbus.packages = [ pkgs.policy_kit ];
+
+    security.pam.services = [ { name = "polkit-1"; } ];
+
+    security.setuidPrograms = [ "pkexec" ];
+
+    system.activationScripts.policyKit = pkgs.stringsWithDeps.noDepEntry
+      ''
+        mkdir -p /var/lib/polkit-1
+      '';
+
+  };
+
+}
\ No newline at end of file
-- 
GitLab


From 7ab616f659d885180c428515ec5fe77e5792190e Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 17 Aug 2009 01:16:38 +0000
Subject: [PATCH 1726/5331] * Added support for ConsoleKit. * Let ConsoleKit
 track the current logins instead of pam_console.   Udev now takes care of
 setting the device permissions to the active   user.  This works much better,
 since pam_console wouldn't apply   permissions to new (hot-plugged) devices. 
 Also, the udev+ConsoleKit   approach supports user switching.  (We don't have
 that for X yet,   but it already works for logins on virtual consoles: if you
 switch   between different users on differents VCs with Alt+Fn, the device  
 ownership will be changed automatically.)

svn path=/nixos/trunk/; revision=16743
---
 modules/module-list.nix                |  3 +-
 modules/security/console-kit.nix       | 24 ++++++++
 modules/security/console.perms         | 79 --------------------------
 modules/security/pam.nix               | 24 ++++----
 modules/security/policy-kit.nix        |  2 +-
 modules/services/system/consolekit.nix | 59 -------------------
 modules/services/system/dbus.nix       | 11 +++-
 7 files changed, 50 insertions(+), 152 deletions(-)
 create mode 100644 modules/security/console-kit.nix
 delete mode 100644 modules/security/console.perms
 delete mode 100644 modules/services/system/consolekit.nix

diff --git a/modules/module-list.nix b/modules/module-list.nix
index 9938cc6e1b5..68f00dace2b 100644
--- a/modules/module-list.nix
+++ b/modules/module-list.nix
@@ -23,7 +23,9 @@
   ./programs/pwdutils/pwdutils.nix
   ./programs/ssh.nix
   ./programs/ssmtp.nix
+  ./security/console-kit.nix
   ./security/pam.nix
+  ./security/policy-kit.nix
   ./security/setuid-wrappers.nix
   ./security/sudo.nix
   ./services/audio/alsa.nix
@@ -72,7 +74,6 @@
   ./services/scheduling/atd.nix
   ./services/scheduling/cron.nix
   ./services/scheduling/fcron.nix
-  ./services/system/consolekit.nix
   ./services/system/dbus.nix
   ./services/system/nscd.nix
   ./services/ttys/gpm.nix
diff --git a/modules/security/console-kit.nix b/modules/security/console-kit.nix
new file mode 100644
index 00000000000..e172a8e4415
--- /dev/null
+++ b/modules/security/console-kit.nix
@@ -0,0 +1,24 @@
+{ config, pkgs, ... }:
+
+with pkgs.lib;
+
+{
+
+  config = {
+
+    environment.systemPackages = [ pkgs.console_kit ];
+
+    services.dbus.packages = [ pkgs.console_kit ];
+
+    environment.etc = singleton
+      { source = (pkgs.buildEnv {
+          name = "console-kit-config";
+          pathsToLink = [ "/etc/ConsoleKit" ];
+          paths = [ pkgs.console_kit pkgs.udev ];
+        }) + "/etc/ConsoleKit";
+        target = "ConsoleKit";
+      };
+
+  };
+
+}
diff --git a/modules/security/console.perms b/modules/security/console.perms
deleted file mode 100644
index c5d9b4aa693..00000000000
--- a/modules/security/console.perms
+++ /dev/null
@@ -1,79 +0,0 @@
-# This file determines the permissions that will be given to priviledged
-# users of the console at login time, and the permissions to which to
-# revert when the users log out.
-
-# format is:
-#   <class>=list of regexps specifying consoles or globs specifying files
-#   file-glob|<class> perm dev-regex|<dev-class> \
-#     revert-mode revert-owner[.revert-group]
-# the revert-mode, revert-owner, and revert-group are optional, and default
-# to 0600, root, and root, respectively.
-#
-# For more information:
-# man 5 console.perms
-
-# file classes -- these are regular expressions
-<console>=/dev/tty[0-9][0-9]* :[0-9]\.[0-9] :[0-9]
-<xconsole>=:[0-9]\.[0-9] :[0-9]
-
-# device classes -- these are shell-style globs
-<floppy>=/dev/fd[0-1]* \
-	 /dev/floppy* /mnt/floppy*
-<sound>=/dev/dsp* /dev/audio* /dev/midi* \
-	/dev/mixer* /dev/sequencer* \
-	/dev/sound/* /dev/beep \
-	/dev/snd/* 
-<cdrom>=/dev/cdrom* /dev/cdroms/* /dev/cdwriter* /mnt/cdrom*
-<pilot>=/dev/pilot
-<jaz>=/mnt/jaz*
-<zip>=/mnt/pocketzip* /mnt/zip* /dev/zip*
-<ls120>=/dev/ls120 /mnt/ls120*
-<scanner>=/dev/scanner* /dev/usb/scanner*
-<rio500>=/dev/usb/rio500
-<camera>=/mnt/camera* /dev/usb/dc2xx* /dev/usb/mdc800*
-<memstick>=/mnt/memstick*
-<flash>=/mnt/flash* /dev/flash*
-<diskonkey>=/mnt/diskonkey*
-<rem_ide>=/mnt/microdrive*
-<fb>=/dev/fb /dev/fb[0-9]* \
-     /dev/fb/*
-<kbd>=/dev/kbd
-<joystick>=/dev/js[0-9]*
-<v4l>=/dev/video* /dev/radio* /dev/winradio* /dev/vtx* /dev/vbi* \
-      /dev/video/*
-<gpm>=/dev/gpmctl
-<dri>=/dev/nvidia* /dev/3dfx* /dev/dri/card*
-<mainboard>=/dev/apm_bios
-<pmu>=/dev/pmu
-<bluetooth>=/dev/rfcomm*
-<raw1394>=/dev/raw1394
-<irda>=/dev/ircomm*
-
-# permission definitions
-<console>  0660 <floppy>
-<console>  0600 <sound>
-<console>  0600 <cdrom>
-<console>  0600 <pilot>
-<console>  0600 <jaz>
-<console>  0600 <zip>
-<console>  0600 <ls120>
-<console>  0600 <scanner>
-<console>  0600 <camera>
-<console>  0600 <memstick>
-<console>  0600 <flash>
-<console>  0600 <diskonkey>
-<console>  0600 <rem_ide>
-<console>  0600 <fb>
-<console>  0600 <kbd>
-<console>  0600 <joystick>
-<console>  0600 <v4l>
-<console>  0700 <gpm>
-<console>  0600 <mainboard>
-<console>  0600 <rio500>
-<console>  0600 <pmu>
-<console>  0600 <bluetooth>
-<console>  0600 <raw1394>
-<console>  0600 <irda>
-
-<xconsole> 0600 /dev/console
-<console>  0600 <dri>
diff --git a/modules/security/pam.nix b/modules/security/pam.nix
index 2a36e7cece0..314f12d4f88 100644
--- a/modules/security/pam.nix
+++ b/modules/security/pam.nix
@@ -7,16 +7,7 @@ with pkgs.lib;
 
 let
 
-  inherit (pkgs) pam_unix2 pam_console pam_ldap;
-
-  # !!! ugh, these files shouldn't be created here.
-  pamConsoleHandlers = pkgs.writeText "console.handlers" ''
-    console consoledevs /dev/tty[0-9][0-9]* :[0-9]\.[0-9] :[0-9]
-    ${pkgs.pam_console}/sbin/pam_console_apply lock logfail wait -t tty -s -c ${pamConsolePerms}
-    ${pkgs.pam_console}/sbin/pam_console_apply unlock logfail wait -r -t tty -s -c ${pamConsolePerms}
-  '';
-
-  pamConsolePerms = ./console.perms;
+  inherit (pkgs) pam_unix2 pam_ldap;
 
   otherService = pkgs.writeText "other.pam"
     ''
@@ -73,13 +64,24 @@ let
               "session optional ${pam_ldap}/lib/security/pam_ldap.so"}
           session required ${pam_unix2}/lib/security/pam_unix2.so
           ${optionalString localLogin
-              "session optional ${pam_console}/lib/security/pam_console.so debug handlersfile=${pamConsoleHandlers}"}
+              ''
+                session required pam_env.so debug conffile=${envFile} readenv=0
+                session optional ${pkgs.console_kit}/lib/security/pam_ck_connector.so debug
+              ''}
           ${optionalString forwardXAuth
               "session optional pam_xauth.so xauthpath=${pkgs.xorg.xauth}/bin/xauth systemuser=99"}
         '';
       target = "pam.d/${name}";
     };
 
+  # This is needed to get an active session in ConsoleKit.  Apparently
+  # a better way is to run ck-launch-session from the session starter
+  # (or let xdm/kdm do it).
+  envFile = pkgs.writeText "pam_env.conf"
+    ''
+      CKCON_X11_DISPLAY_DEVICE DEFAULT="/dev/tty7"
+    '';
+
 in
 
 {
diff --git a/modules/security/policy-kit.nix b/modules/security/policy-kit.nix
index 09c216ebcf3..0299bc7d4c2 100644
--- a/modules/security/policy-kit.nix
+++ b/modules/security/policy-kit.nix
@@ -21,4 +21,4 @@ with pkgs.lib;
 
   };
 
-}
\ No newline at end of file
+}
diff --git a/modules/services/system/consolekit.nix b/modules/services/system/consolekit.nix
deleted file mode 100644
index e5d1f104a80..00000000000
--- a/modules/services/system/consolekit.nix
+++ /dev/null
@@ -1,59 +0,0 @@
-{pkgs, config, ...}:
-
-###### interface
-let
-  inherit (pkgs.lib) mkOption;
-
-  options = {
-    services = {
-
-      consolekit = {
-        enable = mkOption {
-          default = false;
-          description = "
-            Whether to start the ConsoleKit daemon.
-          ";
-        };
-      };
-
-    };
-  };
-in
-
-###### implementation
-let
-  cfg = config.services.consolekit;
-  inherit (pkgs.lib) mkIf;
-  inherit (pkgs) ConsoleKit;
-
-  job = {
-    name = "consolekit";
-
-    job = ''
-      description "Console Kit Service"
-
-      start on dbus
-      stop on shutdown
-
-      respawn ${ConsoleKit}/sbin/console-kit-daemon
-    '';
-  };
-
-in
-
-mkIf cfg.enable {
-  require = [
-    #../upstart-jobs/default.nix # config.services.extraJobs
-    #../upstart-jobs/dbus.nix # services.dbus.*
-    options
-  ];
-
-  services = {
-    extraJobs = [job];
-
-    dbus = {
-      enable = true;
-      packages = [ConsoleKit];
-    };
-  };
-}
diff --git a/modules/services/system/dbus.nix b/modules/services/system/dbus.nix
index 66feb6d46f4..8ecaf295a22 100644
--- a/modules/services/system/dbus.nix
+++ b/modules/services/system/dbus.nix
@@ -17,6 +17,8 @@ let
     buildCommand = ''
       ensureDir $out
       
+      ln -s ${dbus}/etc/dbus-1/session.conf $out/session.conf
+      
       cp ${dbus}/etc/dbus-1/system.conf $out/system.conf
 
       # Tell the daemon where the setuid wrapper around
@@ -30,9 +32,16 @@ let
           
       # Note: system.conf includes ./system.d (i.e. it has a relative,
       # not absolute path).
+      ensureDir $out/session.d
       ensureDir $out/system.d
+      
       for i in ${toString cfg.packages}; do
-        ln -s $i/etc/dbus-1/system.d/* $out/system.d/
+        for j in $i/etc/dbus-1/session.d/*; do
+          ln -s $j  $out/session.d/
+        done
+        for j in $i/etc/dbus-1/system.d/*; do
+          ln -s $j $out/system.d/
+        done
       done
     ''; # */
   };
-- 
GitLab


From 447c1ac34a79b0b9fcfefb41dc05dc122730ecd9 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 17 Aug 2009 01:35:48 +0000
Subject: [PATCH 1727/5331] * SLiM / ConsoleKit compatibility hack.

svn path=/nixos/trunk/; revision=16744
---
 modules/security/pam.nix                               | 9 +++++----
 modules/services/x11/xserver/display-managers/slim.nix | 2 +-
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/modules/security/pam.nix b/modules/security/pam.nix
index 314f12d4f88..9be1bad0668 100644
--- a/modules/security/pam.nix
+++ b/modules/security/pam.nix
@@ -29,6 +29,8 @@ let
     , # If set, this is a local login (e.g. virtual console or X), so
       # the user gets ownership of audio devices etc.
       localLogin ? false
+    , # Temporary hack to get SLiM to work with ConsoleKit.
+      ckHack ? false
     , # Whether to forward XAuth keys between users.  Mostly useful
       # for "su".
       forwardXAuth ? false
@@ -63,11 +65,10 @@ let
           ${optionalString config.users.ldap.enable
               "session optional ${pam_ldap}/lib/security/pam_ldap.so"}
           session required ${pam_unix2}/lib/security/pam_unix2.so
+          ${optionalString ckHack
+              "session required pam_env.so debug conffile=${envFile} readenv=0"}
           ${optionalString localLogin
-              ''
-                session required pam_env.so debug conffile=${envFile} readenv=0
-                session optional ${pkgs.console_kit}/lib/security/pam_ck_connector.so debug
-              ''}
+              "session optional ${pkgs.console_kit}/lib/security/pam_ck_connector.so"}
           ${optionalString forwardXAuth
               "session optional pam_xauth.so xauthpath=${pkgs.xorg.xauth}/bin/xauth systemuser=99"}
         '';
diff --git a/modules/services/x11/xserver/display-managers/slim.nix b/modules/services/x11/xserver/display-managers/slim.nix
index 447b0ef5171..2c50b912e73 100644
--- a/modules/services/x11/xserver/display-managers/slim.nix
+++ b/modules/services/x11/xserver/display-managers/slim.nix
@@ -105,7 +105,7 @@ in
         execCmd = "${pkgs.slim}/bin/slim";
       };
 
-    security.pam.services = [ { name = "slim"; localLogin = true; } ];
+    security.pam.services = [ { name = "slim"; localLogin = true; ckHack = true; } ];
 
   };
 
-- 
GitLab


From 8b229a45c3ee84c0c85b63ee7b5689833d116e94 Mon Sep 17 00:00:00 2001
From: Sander van der Burg <s.vanderburg@tudelft.nl>
Date: Tue, 18 Aug 2009 11:50:32 +0000
Subject: [PATCH 1728/5331] Removed the rm -rf command and replaced symlink
 operations by ln -sfn so that the state of tomcat can be retained \(unless
 somebody messes it up manually of course\)

svn path=/nixos/trunk/; revision=16757
---
 modules/services/web-servers/tomcat.nix | 32 ++++++++++++-------------
 1 file changed, 15 insertions(+), 17 deletions(-)

diff --git a/modules/services/web-servers/tomcat.nix b/modules/services/web-servers/tomcat.nix
index abd9cf3fcbf..b9e1c82a04e 100644
--- a/modules/services/web-servers/tomcat.nix
+++ b/modules/services/web-servers/tomcat.nix
@@ -109,13 +109,11 @@ mkIf config.services.tomcat.enable {
         stop on network-interfaces/stop
         
         start script
-	    rm -Rf ${cfg.baseDir}
-	    
 	    # Create the base directory
 	    mkdir -p ${cfg.baseDir}
 	    
 	    # Create a symlink to the bin directory of the tomcat component
-	    ln -sf ${pkgs.tomcat6}/bin ${cfg.baseDir}/bin
+	    ln -sfn ${pkgs.tomcat6}/bin ${cfg.baseDir}/bin
 	    
 	    # Create a conf/ directory
 	    mkdir -p ${cfg.baseDir}/conf
@@ -124,7 +122,7 @@ mkIf config.services.tomcat.enable {
 	    # Symlink the config files in the conf/ directory (except for catalina.properties and server.xml)
 	    for i in $(ls ${pkgs.tomcat6}/conf | grep -v catalina.properties | grep -v server.xml)
 	    do
-	        ln -sf ${pkgs.tomcat6}/conf/$i ${cfg.baseDir}/conf/`basename $i`
+	        ln -sfn ${pkgs.tomcat6}/conf/$i ${cfg.baseDir}/conf/`basename $i`
 	    done
 	    
 	    # Create a modified catalina.properties file 
@@ -163,7 +161,7 @@ mkIf config.services.tomcat.enable {
 		if [ -f $i ]
 		then
 		    # If the given web application is a file, symlink it into the common/lib/ directory
-		    ln -sf $i ${cfg.baseDir}/lib/`basename $i`
+		    ln -sfn $i ${cfg.baseDir}/lib/`basename $i`
 		elif [ -d $i ]
 		then
 		    # If the given web application is a directory, then iterate over the files
@@ -171,7 +169,7 @@ mkIf config.services.tomcat.enable {
 		    
 		    for j in $i/lib/*
 		    do
-			ln -sf $j ${cfg.baseDir}/lib/`basename $j`
+			ln -sfn $j ${cfg.baseDir}/lib/`basename $j`
 		    done
 		fi
 	    done	    	     
@@ -182,7 +180,7 @@ mkIf config.services.tomcat.enable {
 		if [ -f $i ]
 		then
 		    # If the given web application is a file, symlink it into the common/lib/ directory
-		    ln -sf $i ${cfg.baseDir}/shared/lib/`basename $i`
+		    ln -sfn $i ${cfg.baseDir}/shared/lib/`basename $i`
 		elif [ -d $i ]
 		then
 		    # If the given web application is a directory, then iterate over the files
@@ -190,7 +188,7 @@ mkIf config.services.tomcat.enable {
 		    
 		    for j in $i/shared/lib/*
 		    do
-			ln -sf $j ${cfg.baseDir}/shared/lib/`basename $j`
+			ln -sfn $j ${cfg.baseDir}/shared/lib/`basename $j`
 		    done
 		fi
 	    done 
@@ -201,7 +199,7 @@ mkIf config.services.tomcat.enable {
 		if [ -f $i ]
 		then
 		    # If the given web application is a file, symlink it into the webapps/ directory
-		    ln -sf $i ${cfg.baseDir}/webapps/`basename $i`
+		    ln -sfn $i ${cfg.baseDir}/webapps/`basename $i`
 		elif [ -d $i ]
 		then
 		    # If the given web application is a directory, then iterate over the files
@@ -209,7 +207,7 @@ mkIf config.services.tomcat.enable {
 		    
 		    for j in $i/webapps/*
 		    do
-		        ln -sf $j ${cfg.baseDir}/webapps/`basename $j`
+		        ln -sfn $j ${cfg.baseDir}/webapps/`basename $j`
 		    done
 		    
 		    # Also symlink the configuration files if they are included
@@ -217,7 +215,7 @@ mkIf config.services.tomcat.enable {
 		    then
 			for j in $i/conf/Catalina/*
 			do
-			    ln -sf $j ${cfg.baseDir}/conf/Catalina/localhost/`basename $j`
+			    ln -sfn $j ${cfg.baseDir}/conf/Catalina/localhost/`basename $j`
 			done
 		    fi
 		fi
@@ -237,7 +235,7 @@ mkIf config.services.tomcat.enable {
 		  if [ -f $i ]
 		  then
 		      # If the given web application is a file, symlink it into the webapps/ directory
-		      ln -sf $i ${cfg.baseDir}/virtualhosts/${virtualHost.name}/webapps/`basename $i`
+		      ln -sfn $i ${cfg.baseDir}/virtualhosts/${virtualHost.name}/webapps/`basename $i`
 		  elif [ -d $i ]
 		  then
 		      # If the given web application is a directory, then iterate over the files
@@ -245,7 +243,7 @@ mkIf config.services.tomcat.enable {
 		    
 		      for j in $i/webapps/*
 		      do
-		          ln -sf $j ${cfg.baseDir}/virtualhosts/${virtualHost.name}/webapps/`basename $j`
+		          ln -sfn $j ${cfg.baseDir}/virtualhosts/${virtualHost.name}/webapps/`basename $j`
 		      done
 		      
 		      # Also symlink the configuration files if they are included
@@ -253,7 +251,7 @@ mkIf config.services.tomcat.enable {
 		      then
 			  for j in $i/conf/Catalina/*
 			  do
-			      ln -sf $j ${cfg.baseDir}/conf/Catalina/${virtualHost.name}/`basename $j`
+			      ln -sfn $j ${cfg.baseDir}/conf/Catalina/${virtualHost.name}/`basename $j`
 			  done
 		      fi
                   fi	                  
@@ -283,7 +281,7 @@ mkIf config.services.tomcat.enable {
 		    if [ -f $i ]
 		    then
 			# If the given web service is a file, symlink it into the webapps/axis2/WEB-INF/services
-			ln -sf $i ${cfg.baseDir}/webapps/axis2/WEB-INF/services/`basename $i`
+			ln -sfn $i ${cfg.baseDir}/webapps/axis2/WEB-INF/services/`basename $i`
 		    elif [ -d $i ]
 		    then
 			# If the given web application is a directory, then iterate over the files
@@ -291,7 +289,7 @@ mkIf config.services.tomcat.enable {
 			
 			for j in $i/webapps/axis2/WEB-INF/services/*
 			do
-			    ln -sf $j ${cfg.baseDir}/webapps/axis2/WEB-INF/services/`basename $j`
+			    ln -sfn $j ${cfg.baseDir}/webapps/axis2/WEB-INF/services/`basename $j`
 			done
 			
 			# Also symlink the configuration files if they are included
@@ -299,7 +297,7 @@ mkIf config.services.tomcat.enable {
 		        then
 			    for j in $i/conf/Catalina/*
 			    do
-			        ln -sf $j ${cfg.baseDir}/conf/Catalina/localhost/`basename $j`
+			        ln -sfn $j ${cfg.baseDir}/conf/Catalina/localhost/`basename $j`
 			    done
 		        fi
 		    fi
-- 
GitLab


From 5980d130c9bb85a2d1110fa15abcf263b572b097 Mon Sep 17 00:00:00 2001
From: Nicolas Pierron <nicolas.b.pierron@gmail.com>
Date: Wed, 19 Aug 2009 15:04:05 +0000
Subject: [PATCH 1729/5331] Check sshd.permitRootLogin values.

svn path=/nixos/trunk/; revision=16769
---
 modules/services/networking/ssh/sshd.nix | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/modules/services/networking/ssh/sshd.nix b/modules/services/networking/ssh/sshd.nix
index a3ca7d84c46..4cce11a8145 100644
--- a/modules/services/networking/ssh/sshd.nix
+++ b/modules/services/networking/ssh/sshd.nix
@@ -31,11 +31,11 @@ let
       GatewayPorts ${cfg.gatewayPorts}
     '';
 
-  # !!! is this assertion evaluated anywhere???
-  assertion = cfg.permitRootLogin == "yes" ||
-       cfg.permitRootLogin == "without-password" ||
-       cfg.permitRootLogin == "forced-commands-only" ||
-       cfg.permitRootLogin == "no";
+  permitRootLoginCheck = v:
+    v == "yes" ||
+    v == "without-password" ||
+    v == "forced-commands-only" ||
+    v == "no";
 
 in
 
@@ -73,6 +73,7 @@ in
 
       permitRootLogin = mkOption {
         default = "yes";
+        check = permitRootLoginCheck;
         description = ''
           Whether the root user can login using ssh. Valid values are
           <literal>yes</literal>, <literal>without-password</literal>,
-- 
GitLab


From ce030d6c356a11fb3fe71a1677d859088e50665d Mon Sep 17 00:00:00 2001
From: Nicolas Pierron <nicolas.b.pierron@gmail.com>
Date: Wed, 19 Aug 2009 15:04:11 +0000
Subject: [PATCH 1730/5331] inherit eval to access option declarations from
 outside programs.

svn path=/nixos/trunk/; revision=16770
---
 default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/default.nix b/default.nix
index f0020c5a1a6..863a8339f12 100644
--- a/default.nix
+++ b/default.nix
@@ -3,9 +3,9 @@
 
 let
   
-  inherit
-    (import ./lib/eval-config.nix {inherit configuration;})
-    config optionDeclarations pkgs;
+  eval = import ./lib/eval-config.nix {inherit configuration;};
+
+  inherit (eval) config pkgs;
 
   vmConfig = (import ./lib/eval-config.nix {
     inherit configuration;
@@ -15,7 +15,7 @@ let
 in
 
 {
-  inherit config;
+  inherit eval config;
 
   system = config.system.build.system;
 
-- 
GitLab


From 923f58794aac6c54559b4415d81cb8a06dbd1170 Mon Sep 17 00:00:00 2001
From: Nicolas Pierron <nicolas.b.pierron@gmail.com>
Date: Wed, 19 Aug 2009 15:04:19 +0000
Subject: [PATCH 1731/5331] Add --rollback option to nixos-rebuild.

svn path=/nixos/trunk/; revision=16771
---
 modules/installer/tools/nixos-rebuild.sh | 48 ++++++++++++++++++------
 1 file changed, 37 insertions(+), 11 deletions(-)

diff --git a/modules/installer/tools/nixos-rebuild.sh b/modules/installer/tools/nixos-rebuild.sh
index 86b7337beac..d3b86fa6ab4 100644
--- a/modules/installer/tools/nixos-rebuild.sh
+++ b/modules/installer/tools/nixos-rebuild.sh
@@ -31,6 +31,8 @@ Options:
                          channel manifest
   --no-build-nix         don't build the latest Nix from Nixpkgs before
                          building NixOS
+  --rollback             restore the previous NixOS configuration (only
+                         with switch, boot, test, build)
 
 Various nix-build options are also accepted, in particular:
 
@@ -51,6 +53,7 @@ extraBuildFlags=
 action=
 pullManifest=1
 buildNix=1
+rollback=
 
 while test "$#" -gt 0; do
     i="$1"; shift 1
@@ -65,6 +68,8 @@ while test "$#" -gt 0; do
         pullManifest=
     elif test "$i" = --no-build-nix; then
         buildNix=
+    elif test "$i" = --rollback; then
+        rollback=1
     elif test "$i" = --show-trace -o "$i" = --no-build-hook -o "$i" = --keep-failed -o "$i" = -K \
         -o "$i" = --keep-going -o "$i" = -k -o "$i" = --verbose -o "$i" = -v; then
         extraBuildFlags="$extraBuildFlags $i"
@@ -83,6 +88,11 @@ if test "$action" = dry-run; then
     extraBuildFlags="$extraBuildFlags --dry-run"
 fi
 
+if test -n "$rollback"; then
+    pullManifest=
+    buildNix=
+fi
+
 
 tmpDir=$(mktemp -t -d nixos-rebuild.XXXXXX)
 trap 'rm -rf "$tmpDir"' EXIT
@@ -126,17 +136,33 @@ fi
 # Either upgrade the configuration in the system profile (for "switch"
 # or "boot"), or just build it and create a symlink "result" in the
 # current directory (for "build" and "test").
-if test "$action" = switch -o "$action" = boot; then
-    nix-env -p /nix/var/nix/profiles/system -f $NIXOS --set -A system $extraBuildFlags
-    pathToConfig=/nix/var/nix/profiles/system
-elif test "$action" = test -o "$action" = build -o "$action" = dry-run; then
-    nix-build $NIXOS -A system -K -k $extraBuildFlags
-    pathToConfig=./result
-elif test "$action" = build-vm; then
-    nix-build $NIXOS -A vm -K -k $extraBuildFlags
-    pathToConfig=./result
-else
-    showSyntax
+if test -z "$rollback"; then
+    if test "$action" = switch -o "$action" = boot; then
+        nix-env -p /nix/var/nix/profiles/system -f $NIXOS --set -A system $extraBuildFlags
+        pathToConfig=/nix/var/nix/profiles/system
+    elif test "$action" = test -o "$action" = build -o "$action" = dry-run; then
+        nix-build $NIXOS -A system -K -k $extraBuildFlags
+        pathToConfig=./result
+    elif test "$action" = build-vm; then
+        nix-build $NIXOS -A vm -K -k $extraBuildFlags
+        pathToConfig=./result
+    else
+        showSyntax
+    fi
+else # test -n "$rollback"
+    if test "$action" = switch -o "$action" = boot; then
+        nix-env --rollback -p /nix/var/nix/profiles/system
+        pathToConfig=/nix/var/nix/profiles/system
+    elif test "$action" = test -o "$action" = build; then
+        systemNumber=$(
+            nix-env -p /nix/var/nix/profiles/system --list-generations |
+            sed -n '/current/ {g; p;}; s/ *\([0-9]*\).*/\1/; h'
+        )
+        ln -sT /nix/var/nix/profiles/system-${systemNumber}-link ./result
+        pathToConfig=./result
+    else
+        showSyntax
+    fi
 fi
 
 
-- 
GitLab


From 11c603c3fba2f1916ad6a8f7c9b8c24e7365ee3e Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 19 Aug 2009 16:48:28 +0000
Subject: [PATCH 1732/5331] * Fix booting from CD.  60-persistent-storage.rules
 requires some   variables set by 60-cdrom_id.rules.

svn path=/nixos/trunk/; revision=16773
---
 modules/system/boot/stage-1.nix | 22 +++++++++++++++-------
 1 file changed, 15 insertions(+), 7 deletions(-)

diff --git a/modules/system/boot/stage-1.nix b/modules/system/boot/stage-1.nix
index 3715fd4e0b4..95b5372a515 100644
--- a/modules/system/boot/stage-1.nix
+++ b/modules/system/boot/stage-1.nix
@@ -228,14 +228,22 @@ let
     name = "udev-rules";
     buildCommand = ''
       ensureDir $out
+      
+      cp ${pkgs.udev}/libexec/rules.d/60-cdrom_id.rules $out/
       cp ${pkgs.udev}/libexec/rules.d/60-persistent-storage.rules $out/
-      substituteInPlace $out/60-persistent-storage.rules \
-        --replace ata_id ${extraUtils}/bin/ata_id \
-        --replace usb_id ${extraUtils}/bin/usb_id \
-        --replace scsi_id ${extraUtils}/bin/scsi_id \
-        --replace path_id ${extraUtils}/bin/path_id \
-        --replace vol_id ${extraUtils}/bin/vol_id \
-        --replace /sbin/blkid ${extraUtils}/bin/blkid
+
+      for i in $out/*.rules; do
+          substituteInPlace $i \
+            --replace ata_id ${extraUtils}/bin/ata_id \
+            --replace usb_id ${extraUtils}/bin/usb_id \
+            --replace scsi_id ${extraUtils}/bin/scsi_id \
+            --replace path_id ${extraUtils}/bin/path_id \
+            --replace vol_id ${extraUtils}/bin/vol_id \
+            --replace cdrom_id ${extraUtils}/bin/cdrom_id \
+            --replace /sbin/blkid ${extraUtils}/bin/blkid
+      done
+
+      # !!! What does this do?
       sed -e '/^ENV[{]DEVTYPE[}]=="disk", .*GOTO/d' -i $out/60-persistent-storage.rules 
     ''; # */
   };
-- 
GitLab


From 769dc2f7e645c750a23b4874ccf13a2cc942bf41 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Wed, 19 Aug 2009 17:24:33 +0000
Subject: [PATCH 1733/5331] Write an explanation for a rule edit needed by
 LiveCD

svn path=/nixos/trunk/; revision=16774
---
 modules/system/boot/stage-1.nix | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/modules/system/boot/stage-1.nix b/modules/system/boot/stage-1.nix
index 95b5372a515..0480a277afd 100644
--- a/modules/system/boot/stage-1.nix
+++ b/modules/system/boot/stage-1.nix
@@ -243,7 +243,11 @@ let
             --replace /sbin/blkid ${extraUtils}/bin/blkid
       done
 
-      # !!! What does this do?
+      # Remove rule preventing creation of a by-label symlink
+      # for a CD-ROM if disk removal will not be properly reported.
+      # Such a link can get obsolete in a running system, but 
+      # during boot stage 1 it is unlikely. We need this change
+      # to be able to boot on a wider choice of CD drives.
       sed -e '/^ENV[{]DEVTYPE[}]=="disk", .*GOTO/d' -i $out/60-persistent-storage.rules 
     ''; # */
   };
-- 
GitLab


From 4e646bf39caa1c8fafd05bb1cec2451bf4535d75 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Wed, 19 Aug 2009 20:20:44 +0000
Subject: [PATCH 1734/5331] Openchrome driver in xserver

svn path=/nixos/trunk/; revision=16783
---
 upstart-jobs/xserver.nix | 458 +++++++++++++++++++++++++++++++++++++++
 1 file changed, 458 insertions(+)
 create mode 100644 upstart-jobs/xserver.nix

diff --git a/upstart-jobs/xserver.nix b/upstart-jobs/xserver.nix
new file mode 100644
index 00000000000..2757c5de205
--- /dev/null
+++ b/upstart-jobs/xserver.nix
@@ -0,0 +1,458 @@
+{ config, pkgs, kernelPackages, kdePackages
+
+, # List of font directories.
+  fontDirectories
+}:
+
+let
+
+  inherit (pkgs.lib) optional isInList attrByPath;
+  
+  # Abbreviations.
+  cfg = config.services.xserver;
+  xorg = cfg.package;
+  gnome = pkgs.gnome;
+  stdenv = pkgs.stdenv;
+
+  knownVideoDrivers = {
+    nvidia = { modulesFirst = [ kernelPackages.nvidia_x11 ]; };  #make sure it first loads the nvidia libs
+    vesa =   { modules = [xorg.xf86videovesa]; };
+    vga =    { modules = [xorg.xf86videovga]; };
+    sis =    { modules = [xorg.xf86videosis]; };
+    i810 =   { modules = [xorg.xf86videoi810]; };
+    intel =  { modules = [xorg.xf86videointel]; };
+    nv =     { modules = [xorg.xf86videonv]; };
+    ati =    { modules = [xorg.xf86videoati]; };
+    openchrome = { modules = [xorg.xf86videoopenchrome]; };
+    cirrus = { modules = [xorg.xf86videocirrus]; };
+  };
+
+  # Get a bunch of user settings.
+  videoDriver = cfg.videoDriver;
+  resolutions = map (res: ''"${toString res.x}x${toString res.y}"'') (cfg.resolutions);
+  sessionType = cfg.sessionType;
+
+  videoDriverModules = attrByPath [ videoDriver ] (throw "unknown video driver: `${videoDriver}'") knownVideoDrivers;
+
+  
+  sessionCmd =
+    if sessionType == "" then cfg.sessionStarter else
+    if sessionType == "xterm" then "${pkgs.xterm}/bin/xterm -ls" else
+    if sessionType == "gnome" then "${gnome.gnometerminal}/bin/gnome-terminal -ls" else
+    abort ("unknown session type ${sessionType}");
+
+
+  windowManager =
+    let wm = cfg.windowManager; in
+    if wm != "" then wm else
+    if sessionType == "gnome" then "metacity" else
+    if sessionType == "kde" then "none" /* started by startkde */ else
+    if sessionType == "kde4" then "none" /* started by startkde */ else
+    "twm";
+
+    
+  modules = 
+    attrByPath ["modulesFirst"] [] videoDriverModules
+    ++ [
+      xorg.xorgserver
+      xorg.xf86inputevdev
+    ]
+    ++ attrByPath ["modules"] [] videoDriverModules
+    ++ (optional cfg.synaptics.enable ["${xorg.xf86inputsynaptics}"]);
+
+
+  fontsForXServer =
+    fontDirectories ++
+    # We don't want these fonts in fonts.conf, because then modern,
+    # fontconfig-based applications will get horrible bitmapped
+    # Helvetica fonts.  It's better to get a substitution (like Nimbus
+    # Sans) than that horror.  But we do need the Adobe fonts for some
+    # old non-fontconfig applications.  (Possibly this could be done
+    # better using a fontconfig rule.)
+    [ pkgs.xorg.fontadobe100dpi
+      pkgs.xorg.fontadobe75dpi
+    ];
+    
+
+  configFile = stdenv.mkDerivation {
+    name = "xserver.conf";
+    src = ./xserver.conf;
+    inherit fontsForXServer videoDriver resolutions;
+    isClone = if cfg.isClone then "on" else "off";
+
+    synapticsInputDevice = if cfg.synaptics.enable then ''
+      Section "InputDevice"
+        Identifier "Touchpad[0]"
+        Driver "synaptics"
+        Option "Device" "${cfg.synaptics.dev}"
+        Option "Protocol" "PS/2"
+        Option "LeftEdge" "1700"
+        Option "RightEdge" "5300"
+        Option "TopEdge" "1700"
+        Option "BottomEdge" "4200"
+        Option "FingerLow" "25"
+        Option "FingerHigh" "30"
+        Option "MaxTapTime" "180"
+        Option "MaxTapMove" "220"
+        Option "VertScrollDelta" "100"
+        Option "MinSpeed" "${cfg.synaptics.minSpeed}"
+        Option "MaxSpeed" "${cfg.synaptics.maxSpeed}"
+        Option "AccelFactor" "0.0010"
+        Option "SHMConfig" "on"
+        Option "Repeater" "/dev/input/mice"
+        Option "TapButton1" "1"
+        Option "TapButton2" "2"
+        Option "TapButton3" "3"
+	Option "VertTwoFingerScroll" "${if cfg.synaptics.twoFingerScroll then "1" else "0"}"
+	Option "HorizTwoFingerScroll" "${if cfg.synaptics.twoFingerScroll then "1" else "0"}"
+      EndSection
+    '' else "";
+
+    xkbOptions = if cfg.xkbOptions == "" then "" else  ''
+      Option "XkbOptions" "${cfg.xkbOptions}"
+    '';
+
+    setCorePointer = 
+      if cfg.synaptics.enable then ''
+        InputDevice "Touchpad[0]" "CorePointer"
+      '' else "";
+
+    internalAGPGART =
+      if cfg.useInternalAGPGART == "yes" then
+        ''  Option "UseInternalAGPGART" "yes"''
+      else if cfg.useInternalAGPGART == "no" then
+        ''  Option "UseInternalAGPGART" "no"''
+      else "";
+
+    extraDeviceConfig = cfg.extraDeviceConfig; 
+    extraMonitorSettings = cfg.extraMonitorSettings; 
+    extraDisplaySettings = cfg.extraDisplaySettings;
+    extraModules = cfg.extraModules; 
+    serverLayoutOptions = cfg.serverLayoutOptions; 
+    defaultDepth = cfg.defaultDepth; 
+    virtualScreen = if cfg.virtualScreen != null then 
+        "Virtual ${toString cfg.virtualScreen.x} ${toString cfg.virtualScreen.y}" 
+      else "";
+
+    xfs = if cfg.useXFS == false then "" else 
+      ''FontPath "${toString cfg.useXFS}"'';
+
+    buildCommand = ''
+      buildCommand= # urgh, don't substitute this
+
+      export fontPaths=
+      for i in $fontsForXServer; do
+        if test "''${i:0:''${#NIX_STORE}}" == "$NIX_STORE"; then
+          for j in $(find $i -name fonts.dir); do
+            fontPaths="''${fontPaths}FontPath \"$(dirname $j)\"''\n"
+          done
+        fi
+      done
+
+      export modulePaths=
+      for i in $(find ${toString modules} -type d); do
+        if ls $i/*.so* > /dev/null 2>&1; then
+          modulePaths="''${modulePaths}ModulePath \"$i\"''\n"
+        fi
+      done
+
+      export moduleSection=""
+      export screen=""
+      export device=""
+      export extensions=""
+
+
+      #if only my gf were this dirty
+      if test "${toString videoDriver}" == "nvidia"; then
+        export screen='
+          Option "AddARGBGLXVisuals" "true"
+          Option "DisableGLXRootClipping" "true"
+          Option "RandRRotation" "on"
+        '
+        
+        export device='
+          Option "RenderAccel" "true"
+          Option "AllowGLXWithComposite" "true"
+          Option "AddARGBGLXVisuals" "true"
+        '
+        
+        export extensions='
+          Option "Composite" "Enable"
+        '
+      fi
+        
+      if [ "${toString videoDriver}" = i810 ]; then
+        export extensions='
+          Option "Composite" "Enable"
+        ';
+      fi;
+
+      if [ "${toString videoDriver}" = ati ]; then
+        export extensions='
+          Option "Composite" "Enable"
+        ';
+      fi;
+
+      if [ "${toString videoDriver}" = radeonhd ]; then
+        export extensions='
+          Option "Composite" "Enable"
+        ';
+      fi;
+
+      substituteAll $src $out
+    ''; # */
+  };
+
+
+  clientScript = pkgs.writeText "xclient" ''
+
+    source /etc/profile
+
+    exec > $HOME/.Xerrors 2>&1
+
+
+    ### Load X defaults.
+    if test -e ~/.Xdefaults; then
+      ${xorg.xrdb}/bin/xrdb -merge ~/.Xdefaults
+    fi
+
+
+    ${if cfg.startSSHAgent then ''
+      ### Start the SSH agent.
+      export SSH_ASKPASS=${pkgs.x11_ssh_askpass}/libexec/x11-ssh-askpass
+      eval $(${pkgs.openssh}/bin/ssh-agent)
+    '' else ""}
+
+    ### Allow user to override system-wide configuration
+    if test -f ~/.xsession; then
+        source ~/.xsession;
+    fi
+  
+
+    ### Start a window manager.
+  
+    ${if windowManager == "twm" then ''
+      ${xorg.twm}/bin/twm &
+    ''
+
+    else if windowManager == "metacity" then ''
+      env LD_LIBRARY_PATH=${xorg.libX11}/lib:${xorg.libXext}/lib:/usr/lib/
+      # !!! Hack: load the schemas for Metacity.
+      GCONF_CONFIG_SOURCE=xml::~/.gconf ${gnome.GConf}/bin/gconftool-2 \
+        --makefile-install-rule ${gnome.metacity}/etc/gconf/schemas/*.schemas
+      ${gnome.metacity}/bin/metacity &
+    ''
+
+    else if windowManager == "kwm" then ''
+      ${pkgs.kdebase}/bin/kwin &
+    ''
+
+    else if windowManager == "compiz" then ''
+      # !!! Hack: load the schemas for Compiz.
+      GCONF_CONFIG_SOURCE=xml::~/.gconf ${gnome.GConf}/bin/gconftool-2 \
+        --makefile-install-rule ${pkgs.compiz}/etc/gconf/schemas/*.schemas
+
+      # !!! Hack: turn on most Compiz modules.
+      ${gnome.GConf}/bin/gconftool-2 -t list --list-type=string \
+        --set /apps/compiz/general/allscreens/options/active_plugins \
+        [gconf,png,decoration,wobbly,fade,minimize,move,resize,cube,switcher,rotate,place,scale,water]
+
+      # Start Compiz and the GTK-style window decorator.
+      env LD_LIBRARY_PATH=${xorg.libX11}/lib:${xorg.libXext}/lib:/usr/lib/
+      ${pkgs.compiz}/bin/compiz gconf ${cfg.renderingFlag} &
+      ${pkgs.compiz}/bin/gtk-window-decorator --sync &
+    ''
+
+    else if windowManager == "xmonad" then ''
+      ${pkgs.haskellPackages.xmonad}/bin/xmonad &
+    ''
+    
+    else if windowManager == "none" then ''
+      # The session starter will start the window manager.
+    ''
+
+    else abort ("unknown window manager " + windowManager)}
+
+
+    ### Show a background image.
+    # (but not if we're starting a full desktop environment that does it for us)
+    ${if sessionType != "kde" && sessionType != "kde4" then ''
+    
+      if test -e $HOME/.background-image; then
+        ${pkgs.feh}/bin/feh --bg-scale $HOME/.background-image
+      fi
+      
+    '' else ""}
+    
+
+    ### Start the session.
+    ${if sessionType == "kde" then ''
+
+      # A quick hack to make KDE screen locking work.  It calls
+      # kcheckpass, which needs to be setuid in order to read the
+      # shadow password file.  We have a setuid wrapper around
+      # kcheckpass.  However, startkde adds $kdebase/bin to the start
+      # of $PATH if it's not already in $PATH, thus overriding the
+      # setuid wrapper directory.  So here we add $kdebase/bin to the
+      # end of $PATH to keep startkde from doing that.
+      export PATH=$PATH:${pkgs.kdebase}/bin
+
+      # Start KDE.
+      exec ${pkgs.kdebase}/bin/startkde
+
+    '' else if sessionType == "kde4" then ''
+
+      # Start KDE.
+      exec ${pkgs.kde42.kdebase_workspace}/bin/startkde
+
+    '' else ''
+
+      # For all other session types, we currently just start a
+      # terminal of the kind indicated by sessionCmd.
+      # !!! yes, this means that you 'log out' by killing the X server.
+      while ${sessionCmd}; do
+        sleep 1  
+      done
+
+    ''}
+    
+  ''; # */
+
+
+  xserverArgs = [
+    "-ac"
+    "-logverbose"
+    "-verbose"
+    "-terminate"
+    "-logfile" "/var/log/X.${toString cfg.display}.log"
+    "-config ${configFile}"
+    ":${toString cfg.display}" "vt${toString cfg.tty}"
+    "-xkbdir" "${pkgs.xkeyboard_config}/etc/X11/xkb"
+  ] ++ optional (!config.services.xserver.tcpEnable) "-nolisten tcp";
+
+  
+  slimConfig = pkgs.writeText "slim.cfg" ''
+    xauth_path ${xorg.xauth}/bin/xauth
+    default_xserver ${xorg.xorgserver}/bin/X
+    xserver_arguments ${toString xserverArgs}
+    login_cmd exec ${stdenv.bash}/bin/sh ${clientScript}
+    halt_cmd ${pkgs.upstart}/sbin/shutdown -h now
+    reboot_cmd ${pkgs.upstart}/sbin/shutdown -r now
+    ${if cfg.slim.defaultUser != "" then "default_user " + cfg.slim.defaultUser else ""}
+    ${if cfg.slim.hideCursor then "hidecursor true" else ""}
+  '';
+
+
+  # Unpack the SLiM theme, or use the default.
+  slimThemesDir =
+    let
+      unpackedTheme = stdenv.mkDerivation {
+        name = "slim-theme";
+        buildCommand = ''
+          ensureDir $out
+          cd $out
+          unpackFile ${cfg.slim.theme}
+          ln -s * default
+        '';
+      };
+    in if cfg.slim.theme == null then "${pkgs.slim}/share/slim/themes" else unpackedTheme;       
+
+
+in
+
+
+rec {
+  name = "xserver";
+
+  
+  extraPath = [
+    xorg.xrandr
+    xorg.xrdb
+    xorg.setxkbmap
+    xorg.iceauth # required for KDE applications (it's called by dcopserver)
+    pkgs.feh
+  ]
+  ++ optional (windowManager == "twm") [
+    xorg.twm
+  ]
+  ++ optional (windowManager == "metacity") [
+    gnome.metacity
+  ]
+  ++ optional (windowManager == "compiz") [
+    pkgs.compiz
+  ]
+  ++ optional (sessionType == "xterm") [
+    pkgs.xterm
+  ]
+  ++ optional (sessionType == "gnome") [
+    gnome.gnometerminal
+    gnome.GConf
+    gnome.gconfeditor
+  ]
+  ++ optional (sessionType == "kde") [
+    xorg.xset # used by startkde, non-essential
+  ]
+  ++ optional (sessionType == "kde4") [
+    xorg.xmessage # so that startkde can show error messages
+    pkgs.qt4 # needed for qdbus
+    xorg.xset # used by startkde, non-essential
+  ]
+  ++ optional (videoDriver == "nvidia") [
+    kernelPackages.nvidia_x11
+  ]
+  ++ kdePackages;
+
+
+  extraEtc =
+    optional (sessionType == "kde" || sessionType == "kde4")
+      { source = "${pkgs.xkeyboard_config}/etc/X11/xkb";
+        target = "X11/xkb";
+      }
+    ++
+    optional cfg.exportConfiguration
+      { source = "${configFile}";
+        target = "X11/xorg.conf";
+      };
+
+    
+  # The X server needs HAL running
+  job = assert config.services.hal.enable; ''
+    start on ${if cfg.autorun then "hal" else "never"}
+
+    start script
+    
+      rm -f /var/run/opengl-driver
+      ${if videoDriver == "nvidia"        
+        then ''
+          ln -sf ${kernelPackages.nvidia_x11} /var/run/opengl-driver
+        ''
+        else if cfg.driSupport
+        then "ln -sf ${pkgs.mesa} /var/run/opengl-driver"
+        else ""
+       }
+
+      rm -f /var/log/slim.log
+
+      rm -f /tmp/.X0-lock
+       
+    end script
+
+    env SLIM_CFGFILE=${slimConfig}
+    env SLIM_THEMESDIR=${slimThemesDir}
+    env FONTCONFIG_FILE=/etc/fonts/fonts.conf # !!! cleanup
+    env XKB_BINDIR=${xorg.xkbcomp}/bin # Needed for the Xkb extension.
+
+    ${if videoDriver == "nvidia" 
+      then "env LD_LIBRARY_PATH=${xorg.libX11}/lib:${xorg.libXext}/lib:${kernelPackages.nvidia_x11}/lib" 
+      else ""
+    }
+
+    ${if videoDriver != "nvidia"
+      then "env XORG_DRI_DRIVER_PATH=${pkgs.mesa}/lib/dri"
+      else ""
+    }
+
+    exec ${pkgs.slim}/bin/slim
+  '';
+  
+}
-- 
GitLab


From f250f69ee8fe38d0855d2db68157157c5fb9c7e0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Wed, 19 Aug 2009 20:20:51 +0000
Subject: [PATCH 1735/5331] Adding xinetd with a possible tftpd server.

svn path=/nixos/trunk/; revision=16784
---
 modules/module-list.nix                |  1 +
 modules/services/networking/xinetd.nix | 95 ++++++++++++++++++++++++++
 2 files changed, 96 insertions(+)
 create mode 100644 modules/services/networking/xinetd.nix

diff --git a/modules/module-list.nix b/modules/module-list.nix
index 68f00dace2b..af19ece8f1d 100644
--- a/modules/module-list.nix
+++ b/modules/module-list.nix
@@ -69,6 +69,7 @@
   ./services/networking/ssh/lshd.nix
   ./services/networking/ssh/sshd.nix
   ./services/networking/vsftpd.nix
+  ./services/networking/xinetd.nix
   ./services/networking/wpa_supplicant.nix
   ./services/printing/cupsd.nix
   ./services/scheduling/atd.nix
diff --git a/modules/services/networking/xinetd.nix b/modules/services/networking/xinetd.nix
new file mode 100644
index 00000000000..a1a69a71955
--- /dev/null
+++ b/modules/services/networking/xinetd.nix
@@ -0,0 +1,95 @@
+{pkgs, config, ...}:
+
+###### interface
+let
+  inherit (pkgs.lib) mkOption mkIf;
+
+  options = {
+    services = {
+      xinetd = {
+        enable = mkOption {
+          default = false;
+          description = "
+            Whether to enable the vsftpd FTP server.
+          ";
+        };
+
+        tftpd = {
+          enable = mkOption {
+            default = false;
+            description = "
+              Whether to enable the anonymous FTP user.
+            ";
+          };
+
+          path = mkOption {
+            default = "/home/tftp";
+            description = "
+              Where the tftp server files are stored
+            ";
+          };
+        };
+      };
+    };
+  };
+in
+
+###### implementation
+
+let 
+
+  inherit (config.services.xinetd) tftpd;
+  inherit (pkgs) xinetd;
+
+  tftpservice = ''
+    service tftp
+    {
+       protocol = udp
+       port = 69
+       socket_type = dgram
+       wait = yes
+       user = nobody
+       server = ${pkgs.netkittftp}/sbin/in.tftpd
+       server_args = ${tftpd.path}
+       disable = no
+    }
+  '';
+
+  configFile = pkgs.writeText "xinetd.conf" ''
+    defaults
+    {
+      log_type = SYSLOG daemon info
+      log_on_failure = HOST
+      log_on_success = PID HOST DURATION EXIT
+    }
+    ${if tftpd.enable then tftpservice else ""}
+  '';
+
+in
+
+mkIf config.services.xinetd.enable {
+  require = [
+    options
+  ];
+
+  services = {
+    extraJobs = [{
+      name = "xinetd";
+
+      job = ''
+        description "xinetd server"
+
+        start on network-interfaces/started
+        stop on network-interfaces/stop
+
+        start script
+
+        mkdir -p ${tftpd.path}
+        end script
+
+        respawn ${xinetd}/sbin/xinetd -stayalive -f ${configFile}
+      '';
+      
+    }];
+  };
+}
-- 
GitLab


From 8db9b2ca542c34e85aadaaad1bb412d6ba4ab2de Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Wed, 19 Aug 2009 20:20:57 +0000
Subject: [PATCH 1736/5331] Fixing a typo in nfs-kernel.nix (export -> exports)

svn path=/nixos/trunk/; revision=16785
---
 modules/services/network-filesystems/nfs-kernel.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/services/network-filesystems/nfs-kernel.nix b/modules/services/network-filesystems/nfs-kernel.nix
index b96fed75a4d..96675a6baa2 100644
--- a/modules/services/network-filesystems/nfs-kernel.nix
+++ b/modules/services/network-filesystems/nfs-kernel.nix
@@ -54,7 +54,7 @@ let
   modprobe = config.system.sbin.modprobe;
 
   exports = if builtins.pathExists cfg.exports
-    then cfg.export else pkgs.writeText "exports" cfg.exports;
+    then cfg.exports else pkgs.writeText "exports" cfg.exports;
 
 in
 
-- 
GitLab


From 8e3cf49667b24ba66113e6aedbe687613242c1e4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Wed, 19 Aug 2009 20:29:58 +0000
Subject: [PATCH 1737/5331] removing an upstart-jobs reminiscency.

svn path=/nixos/trunk/; revision=16786
---
 upstart-jobs/xserver.nix | 458 ---------------------------------------
 1 file changed, 458 deletions(-)
 delete mode 100644 upstart-jobs/xserver.nix

diff --git a/upstart-jobs/xserver.nix b/upstart-jobs/xserver.nix
deleted file mode 100644
index 2757c5de205..00000000000
--- a/upstart-jobs/xserver.nix
+++ /dev/null
@@ -1,458 +0,0 @@
-{ config, pkgs, kernelPackages, kdePackages
-
-, # List of font directories.
-  fontDirectories
-}:
-
-let
-
-  inherit (pkgs.lib) optional isInList attrByPath;
-  
-  # Abbreviations.
-  cfg = config.services.xserver;
-  xorg = cfg.package;
-  gnome = pkgs.gnome;
-  stdenv = pkgs.stdenv;
-
-  knownVideoDrivers = {
-    nvidia = { modulesFirst = [ kernelPackages.nvidia_x11 ]; };  #make sure it first loads the nvidia libs
-    vesa =   { modules = [xorg.xf86videovesa]; };
-    vga =    { modules = [xorg.xf86videovga]; };
-    sis =    { modules = [xorg.xf86videosis]; };
-    i810 =   { modules = [xorg.xf86videoi810]; };
-    intel =  { modules = [xorg.xf86videointel]; };
-    nv =     { modules = [xorg.xf86videonv]; };
-    ati =    { modules = [xorg.xf86videoati]; };
-    openchrome = { modules = [xorg.xf86videoopenchrome]; };
-    cirrus = { modules = [xorg.xf86videocirrus]; };
-  };
-
-  # Get a bunch of user settings.
-  videoDriver = cfg.videoDriver;
-  resolutions = map (res: ''"${toString res.x}x${toString res.y}"'') (cfg.resolutions);
-  sessionType = cfg.sessionType;
-
-  videoDriverModules = attrByPath [ videoDriver ] (throw "unknown video driver: `${videoDriver}'") knownVideoDrivers;
-
-  
-  sessionCmd =
-    if sessionType == "" then cfg.sessionStarter else
-    if sessionType == "xterm" then "${pkgs.xterm}/bin/xterm -ls" else
-    if sessionType == "gnome" then "${gnome.gnometerminal}/bin/gnome-terminal -ls" else
-    abort ("unknown session type ${sessionType}");
-
-
-  windowManager =
-    let wm = cfg.windowManager; in
-    if wm != "" then wm else
-    if sessionType == "gnome" then "metacity" else
-    if sessionType == "kde" then "none" /* started by startkde */ else
-    if sessionType == "kde4" then "none" /* started by startkde */ else
-    "twm";
-
-    
-  modules = 
-    attrByPath ["modulesFirst"] [] videoDriverModules
-    ++ [
-      xorg.xorgserver
-      xorg.xf86inputevdev
-    ]
-    ++ attrByPath ["modules"] [] videoDriverModules
-    ++ (optional cfg.synaptics.enable ["${xorg.xf86inputsynaptics}"]);
-
-
-  fontsForXServer =
-    fontDirectories ++
-    # We don't want these fonts in fonts.conf, because then modern,
-    # fontconfig-based applications will get horrible bitmapped
-    # Helvetica fonts.  It's better to get a substitution (like Nimbus
-    # Sans) than that horror.  But we do need the Adobe fonts for some
-    # old non-fontconfig applications.  (Possibly this could be done
-    # better using a fontconfig rule.)
-    [ pkgs.xorg.fontadobe100dpi
-      pkgs.xorg.fontadobe75dpi
-    ];
-    
-
-  configFile = stdenv.mkDerivation {
-    name = "xserver.conf";
-    src = ./xserver.conf;
-    inherit fontsForXServer videoDriver resolutions;
-    isClone = if cfg.isClone then "on" else "off";
-
-    synapticsInputDevice = if cfg.synaptics.enable then ''
-      Section "InputDevice"
-        Identifier "Touchpad[0]"
-        Driver "synaptics"
-        Option "Device" "${cfg.synaptics.dev}"
-        Option "Protocol" "PS/2"
-        Option "LeftEdge" "1700"
-        Option "RightEdge" "5300"
-        Option "TopEdge" "1700"
-        Option "BottomEdge" "4200"
-        Option "FingerLow" "25"
-        Option "FingerHigh" "30"
-        Option "MaxTapTime" "180"
-        Option "MaxTapMove" "220"
-        Option "VertScrollDelta" "100"
-        Option "MinSpeed" "${cfg.synaptics.minSpeed}"
-        Option "MaxSpeed" "${cfg.synaptics.maxSpeed}"
-        Option "AccelFactor" "0.0010"
-        Option "SHMConfig" "on"
-        Option "Repeater" "/dev/input/mice"
-        Option "TapButton1" "1"
-        Option "TapButton2" "2"
-        Option "TapButton3" "3"
-	Option "VertTwoFingerScroll" "${if cfg.synaptics.twoFingerScroll then "1" else "0"}"
-	Option "HorizTwoFingerScroll" "${if cfg.synaptics.twoFingerScroll then "1" else "0"}"
-      EndSection
-    '' else "";
-
-    xkbOptions = if cfg.xkbOptions == "" then "" else  ''
-      Option "XkbOptions" "${cfg.xkbOptions}"
-    '';
-
-    setCorePointer = 
-      if cfg.synaptics.enable then ''
-        InputDevice "Touchpad[0]" "CorePointer"
-      '' else "";
-
-    internalAGPGART =
-      if cfg.useInternalAGPGART == "yes" then
-        ''  Option "UseInternalAGPGART" "yes"''
-      else if cfg.useInternalAGPGART == "no" then
-        ''  Option "UseInternalAGPGART" "no"''
-      else "";
-
-    extraDeviceConfig = cfg.extraDeviceConfig; 
-    extraMonitorSettings = cfg.extraMonitorSettings; 
-    extraDisplaySettings = cfg.extraDisplaySettings;
-    extraModules = cfg.extraModules; 
-    serverLayoutOptions = cfg.serverLayoutOptions; 
-    defaultDepth = cfg.defaultDepth; 
-    virtualScreen = if cfg.virtualScreen != null then 
-        "Virtual ${toString cfg.virtualScreen.x} ${toString cfg.virtualScreen.y}" 
-      else "";
-
-    xfs = if cfg.useXFS == false then "" else 
-      ''FontPath "${toString cfg.useXFS}"'';
-
-    buildCommand = ''
-      buildCommand= # urgh, don't substitute this
-
-      export fontPaths=
-      for i in $fontsForXServer; do
-        if test "''${i:0:''${#NIX_STORE}}" == "$NIX_STORE"; then
-          for j in $(find $i -name fonts.dir); do
-            fontPaths="''${fontPaths}FontPath \"$(dirname $j)\"''\n"
-          done
-        fi
-      done
-
-      export modulePaths=
-      for i in $(find ${toString modules} -type d); do
-        if ls $i/*.so* > /dev/null 2>&1; then
-          modulePaths="''${modulePaths}ModulePath \"$i\"''\n"
-        fi
-      done
-
-      export moduleSection=""
-      export screen=""
-      export device=""
-      export extensions=""
-
-
-      #if only my gf were this dirty
-      if test "${toString videoDriver}" == "nvidia"; then
-        export screen='
-          Option "AddARGBGLXVisuals" "true"
-          Option "DisableGLXRootClipping" "true"
-          Option "RandRRotation" "on"
-        '
-        
-        export device='
-          Option "RenderAccel" "true"
-          Option "AllowGLXWithComposite" "true"
-          Option "AddARGBGLXVisuals" "true"
-        '
-        
-        export extensions='
-          Option "Composite" "Enable"
-        '
-      fi
-        
-      if [ "${toString videoDriver}" = i810 ]; then
-        export extensions='
-          Option "Composite" "Enable"
-        ';
-      fi;
-
-      if [ "${toString videoDriver}" = ati ]; then
-        export extensions='
-          Option "Composite" "Enable"
-        ';
-      fi;
-
-      if [ "${toString videoDriver}" = radeonhd ]; then
-        export extensions='
-          Option "Composite" "Enable"
-        ';
-      fi;
-
-      substituteAll $src $out
-    ''; # */
-  };
-
-
-  clientScript = pkgs.writeText "xclient" ''
-
-    source /etc/profile
-
-    exec > $HOME/.Xerrors 2>&1
-
-
-    ### Load X defaults.
-    if test -e ~/.Xdefaults; then
-      ${xorg.xrdb}/bin/xrdb -merge ~/.Xdefaults
-    fi
-
-
-    ${if cfg.startSSHAgent then ''
-      ### Start the SSH agent.
-      export SSH_ASKPASS=${pkgs.x11_ssh_askpass}/libexec/x11-ssh-askpass
-      eval $(${pkgs.openssh}/bin/ssh-agent)
-    '' else ""}
-
-    ### Allow user to override system-wide configuration
-    if test -f ~/.xsession; then
-        source ~/.xsession;
-    fi
-  
-
-    ### Start a window manager.
-  
-    ${if windowManager == "twm" then ''
-      ${xorg.twm}/bin/twm &
-    ''
-
-    else if windowManager == "metacity" then ''
-      env LD_LIBRARY_PATH=${xorg.libX11}/lib:${xorg.libXext}/lib:/usr/lib/
-      # !!! Hack: load the schemas for Metacity.
-      GCONF_CONFIG_SOURCE=xml::~/.gconf ${gnome.GConf}/bin/gconftool-2 \
-        --makefile-install-rule ${gnome.metacity}/etc/gconf/schemas/*.schemas
-      ${gnome.metacity}/bin/metacity &
-    ''
-
-    else if windowManager == "kwm" then ''
-      ${pkgs.kdebase}/bin/kwin &
-    ''
-
-    else if windowManager == "compiz" then ''
-      # !!! Hack: load the schemas for Compiz.
-      GCONF_CONFIG_SOURCE=xml::~/.gconf ${gnome.GConf}/bin/gconftool-2 \
-        --makefile-install-rule ${pkgs.compiz}/etc/gconf/schemas/*.schemas
-
-      # !!! Hack: turn on most Compiz modules.
-      ${gnome.GConf}/bin/gconftool-2 -t list --list-type=string \
-        --set /apps/compiz/general/allscreens/options/active_plugins \
-        [gconf,png,decoration,wobbly,fade,minimize,move,resize,cube,switcher,rotate,place,scale,water]
-
-      # Start Compiz and the GTK-style window decorator.
-      env LD_LIBRARY_PATH=${xorg.libX11}/lib:${xorg.libXext}/lib:/usr/lib/
-      ${pkgs.compiz}/bin/compiz gconf ${cfg.renderingFlag} &
-      ${pkgs.compiz}/bin/gtk-window-decorator --sync &
-    ''
-
-    else if windowManager == "xmonad" then ''
-      ${pkgs.haskellPackages.xmonad}/bin/xmonad &
-    ''
-    
-    else if windowManager == "none" then ''
-      # The session starter will start the window manager.
-    ''
-
-    else abort ("unknown window manager " + windowManager)}
-
-
-    ### Show a background image.
-    # (but not if we're starting a full desktop environment that does it for us)
-    ${if sessionType != "kde" && sessionType != "kde4" then ''
-    
-      if test -e $HOME/.background-image; then
-        ${pkgs.feh}/bin/feh --bg-scale $HOME/.background-image
-      fi
-      
-    '' else ""}
-    
-
-    ### Start the session.
-    ${if sessionType == "kde" then ''
-
-      # A quick hack to make KDE screen locking work.  It calls
-      # kcheckpass, which needs to be setuid in order to read the
-      # shadow password file.  We have a setuid wrapper around
-      # kcheckpass.  However, startkde adds $kdebase/bin to the start
-      # of $PATH if it's not already in $PATH, thus overriding the
-      # setuid wrapper directory.  So here we add $kdebase/bin to the
-      # end of $PATH to keep startkde from doing that.
-      export PATH=$PATH:${pkgs.kdebase}/bin
-
-      # Start KDE.
-      exec ${pkgs.kdebase}/bin/startkde
-
-    '' else if sessionType == "kde4" then ''
-
-      # Start KDE.
-      exec ${pkgs.kde42.kdebase_workspace}/bin/startkde
-
-    '' else ''
-
-      # For all other session types, we currently just start a
-      # terminal of the kind indicated by sessionCmd.
-      # !!! yes, this means that you 'log out' by killing the X server.
-      while ${sessionCmd}; do
-        sleep 1  
-      done
-
-    ''}
-    
-  ''; # */
-
-
-  xserverArgs = [
-    "-ac"
-    "-logverbose"
-    "-verbose"
-    "-terminate"
-    "-logfile" "/var/log/X.${toString cfg.display}.log"
-    "-config ${configFile}"
-    ":${toString cfg.display}" "vt${toString cfg.tty}"
-    "-xkbdir" "${pkgs.xkeyboard_config}/etc/X11/xkb"
-  ] ++ optional (!config.services.xserver.tcpEnable) "-nolisten tcp";
-
-  
-  slimConfig = pkgs.writeText "slim.cfg" ''
-    xauth_path ${xorg.xauth}/bin/xauth
-    default_xserver ${xorg.xorgserver}/bin/X
-    xserver_arguments ${toString xserverArgs}
-    login_cmd exec ${stdenv.bash}/bin/sh ${clientScript}
-    halt_cmd ${pkgs.upstart}/sbin/shutdown -h now
-    reboot_cmd ${pkgs.upstart}/sbin/shutdown -r now
-    ${if cfg.slim.defaultUser != "" then "default_user " + cfg.slim.defaultUser else ""}
-    ${if cfg.slim.hideCursor then "hidecursor true" else ""}
-  '';
-
-
-  # Unpack the SLiM theme, or use the default.
-  slimThemesDir =
-    let
-      unpackedTheme = stdenv.mkDerivation {
-        name = "slim-theme";
-        buildCommand = ''
-          ensureDir $out
-          cd $out
-          unpackFile ${cfg.slim.theme}
-          ln -s * default
-        '';
-      };
-    in if cfg.slim.theme == null then "${pkgs.slim}/share/slim/themes" else unpackedTheme;       
-
-
-in
-
-
-rec {
-  name = "xserver";
-
-  
-  extraPath = [
-    xorg.xrandr
-    xorg.xrdb
-    xorg.setxkbmap
-    xorg.iceauth # required for KDE applications (it's called by dcopserver)
-    pkgs.feh
-  ]
-  ++ optional (windowManager == "twm") [
-    xorg.twm
-  ]
-  ++ optional (windowManager == "metacity") [
-    gnome.metacity
-  ]
-  ++ optional (windowManager == "compiz") [
-    pkgs.compiz
-  ]
-  ++ optional (sessionType == "xterm") [
-    pkgs.xterm
-  ]
-  ++ optional (sessionType == "gnome") [
-    gnome.gnometerminal
-    gnome.GConf
-    gnome.gconfeditor
-  ]
-  ++ optional (sessionType == "kde") [
-    xorg.xset # used by startkde, non-essential
-  ]
-  ++ optional (sessionType == "kde4") [
-    xorg.xmessage # so that startkde can show error messages
-    pkgs.qt4 # needed for qdbus
-    xorg.xset # used by startkde, non-essential
-  ]
-  ++ optional (videoDriver == "nvidia") [
-    kernelPackages.nvidia_x11
-  ]
-  ++ kdePackages;
-
-
-  extraEtc =
-    optional (sessionType == "kde" || sessionType == "kde4")
-      { source = "${pkgs.xkeyboard_config}/etc/X11/xkb";
-        target = "X11/xkb";
-      }
-    ++
-    optional cfg.exportConfiguration
-      { source = "${configFile}";
-        target = "X11/xorg.conf";
-      };
-
-    
-  # The X server needs HAL running
-  job = assert config.services.hal.enable; ''
-    start on ${if cfg.autorun then "hal" else "never"}
-
-    start script
-    
-      rm -f /var/run/opengl-driver
-      ${if videoDriver == "nvidia"        
-        then ''
-          ln -sf ${kernelPackages.nvidia_x11} /var/run/opengl-driver
-        ''
-        else if cfg.driSupport
-        then "ln -sf ${pkgs.mesa} /var/run/opengl-driver"
-        else ""
-       }
-
-      rm -f /var/log/slim.log
-
-      rm -f /tmp/.X0-lock
-       
-    end script
-
-    env SLIM_CFGFILE=${slimConfig}
-    env SLIM_THEMESDIR=${slimThemesDir}
-    env FONTCONFIG_FILE=/etc/fonts/fonts.conf # !!! cleanup
-    env XKB_BINDIR=${xorg.xkbcomp}/bin # Needed for the Xkb extension.
-
-    ${if videoDriver == "nvidia" 
-      then "env LD_LIBRARY_PATH=${xorg.libX11}/lib:${xorg.libXext}/lib:${kernelPackages.nvidia_x11}/lib" 
-      else ""
-    }
-
-    ${if videoDriver != "nvidia"
-      then "env XORG_DRI_DRIVER_PATH=${pkgs.mesa}/lib/dri"
-      else ""
-    }
-
-    exec ${pkgs.slim}/bin/slim
-  '';
-  
-}
-- 
GitLab


From ea6f6f3e417dbc320feb939460bcc3564e02d9ae Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 20 Aug 2009 14:58:02 +0000
Subject: [PATCH 1738/5331] * Remove empty directory.

svn path=/nixos/trunk/; revision=16787
-- 
GitLab


From 44fb2e4ecd03a842b4a5a39fd2a52e7c8bd64780 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 20 Aug 2009 23:20:19 +0000
Subject: [PATCH 1739/5331] * Allow adding additional kernel parameters.

svn path=/nixos/trunk/; revision=16792
---
 modules/virtualisation/qemu-vm.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/virtualisation/qemu-vm.nix b/modules/virtualisation/qemu-vm.nix
index 5158af7668a..ec3981a9188 100644
--- a/modules/virtualisation/qemu-vm.nix
+++ b/modules/virtualisation/qemu-vm.nix
@@ -51,7 +51,7 @@ let
           -kernel ${config.system.build.system}/kernel \
           -initrd ${config.system.build.system}/initrd \
           $QEMU_OPTS \
-          -append "$(cat ${config.system.build.system}/kernel-params) init=${config.system.build.bootStage2} systemConfig=${config.system.build.system}"
+          -append "$(cat ${config.system.build.system}/kernel-params) init=${config.system.build.bootStage2} systemConfig=${config.system.build.system} $QEMU_KERNEL_PARAMS"
     '';
 
 in
-- 
GitLab


From b48a1c394b9855cb7244922ecd6caa4440328ced Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 21 Aug 2009 00:02:45 +0000
Subject: [PATCH 1740/5331] * Since atd forks into the background, it wasn't
 properly monitored by   Upstart.

svn path=/nixos/trunk/; revision=16795
---
 modules/services/scheduling/atd.nix | 90 ++++++++++++++---------------
 1 file changed, 45 insertions(+), 45 deletions(-)

diff --git a/modules/services/scheduling/atd.nix b/modules/services/scheduling/atd.nix
index e4e6e090234..74fdd9ea84e 100644
--- a/modules/services/scheduling/atd.nix
+++ b/modules/services/scheduling/atd.nix
@@ -8,49 +8,6 @@ let
   
   inherit (pkgs) at;
 
-  job =
-    ''
-      description "at daemon (atd)"
-
-      start on startup
-      stop on shutdown
-
-      start script
-         # Snippets taken and adapted from the original `install' rule of
-         # the makefile.
-
-         # We assume these values are those actually used in Nixpkgs for
-         # `at'.
-         spooldir=/var/spool/atspool
-         jobdir=/var/spool/atjobs
-         etcdir=/etc/at
-
-         for dir in "$spooldir" "$jobdir" "$etcdir"
-         do
-           if [ ! -d "$dir" ]
-           then
-               mkdir -p "$dir" && chown atd:atd "$dir"
-           fi
-         done
-         chmod 1770 "$spooldir" "$jobdir"
-         ${if cfg.allowEveryone then ''chmod a+rwxt "$spooldir" "$jobdir" '' else ""}
-         if [ ! -f "$etcdir"/at.deny ]
-         then
-             touch "$etcdir"/at.deny && \
-             chown root:atd "$etcdir"/at.deny && \
-             chmod 640 "$etcdir"/at.deny
-         fi
-         if [ ! -f "$jobdir"/.SEQ ]
-         then
-             touch "$jobdir"/.SEQ && \
-             chown atd:atd "$jobdir"/.SEQ && \
-             chmod 600 "$jobdir"/.SEQ
-         fi
-      end script
-
-      respawn ${at}/sbin/atd
-    '';
-
 in
 
 {
@@ -106,9 +63,52 @@ in
         gid = config.ids.gids.atd;
       };
 
-    services.extraJobs = singleton # !!! convert to job
+    jobs = singleton
       { name = "atd";
-        inherit job;
+
+        description = "at daemon (atd)";
+
+        startOn = "startup";
+        stopOn = "shutdown";
+
+        preStart =
+          ''
+            # Snippets taken and adapted from the original `install' rule of
+            # the makefile.
+
+            # We assume these values are those actually used in Nixpkgs for
+            # `at'.
+            spooldir=/var/spool/atspool
+            jobdir=/var/spool/atjobs
+            etcdir=/etc/at
+
+            for dir in "$spooldir" "$jobdir" "$etcdir"; do
+              if [ ! -d "$dir" ]; then
+                  mkdir -p "$dir" && chown atd:atd "$dir"
+              fi
+            done
+            chmod 1770 "$spooldir" "$jobdir"
+            ${if cfg.allowEveryone then ''chmod a+rwxt "$spooldir" "$jobdir" '' else ""}
+            if [ ! -f "$etcdir"/at.deny ]; then
+                touch "$etcdir"/at.deny && \
+                chown root:atd "$etcdir"/at.deny && \
+                chmod 640 "$etcdir"/at.deny
+            fi
+            if [ ! -f "$jobdir"/.SEQ ]; then
+                touch "$jobdir"/.SEQ && \
+                chown atd:atd "$jobdir"/.SEQ && \
+                chmod 600 "$jobdir"/.SEQ
+            fi
+
+            # `atd' doesn't have a no-fork flag, so start it here. !!!
+            # Fix this once we have Upstart 0.6.
+            ${at}/sbin/atd
+          '';
+
+        postStop =
+          ''
+            test -e /var/run/atd.pid && kill $(cat /var/run/atd.pid)
+          '';
       };
 
   };
-- 
GitLab


From f1035de47c8efb9bb7be7bf058dd23628c09d727 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 21 Aug 2009 09:08:55 +0000
Subject: [PATCH 1741/5331] * For the generation of manual / manpages, don't
 evaluate the option   declarations again (because we already have them). 
 This cuts   evaluation time from 7.2s to 4.9s.

svn path=/nixos/trunk/; revision=16798
---
 doc/manual/default.nix                 | 11 ++++++++---
 lib/eval-config.nix                    |  2 +-
 modules/services/misc/nixos-manual.nix |  4 ++--
 3 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/doc/manual/default.nix b/doc/manual/default.nix
index 271a6a54bcc..d77a65bdf4a 100644
--- a/doc/manual/default.nix
+++ b/doc/manual/default.nix
@@ -1,4 +1,4 @@
-{pkgs}:
+{ pkgs, optionDeclarations }:
 
 let
 
@@ -7,9 +7,14 @@ let
       services.nixosManual.enable = false;
     };
 
+  # To prevent infinite recursion, remove system.path from the
+  # options.  Not sure why this happens.
+  optionDeclarations_ =
+    optionDeclarations //
+    { system = removeAttrs optionDeclarations.system ["path"]; };
+
   options = builtins.toFile "options.xml" (builtins.unsafeDiscardStringContext
-    (builtins.toXML (pkgs.lib.optionAttrSetToDocList ""
-      (import ../../lib/eval-config.nix {inherit pkgs; configuration = manualConfig;}).optionDeclarations)));
+    (builtins.toXML (pkgs.lib.optionAttrSetToDocList "" optionDeclarations_)));
 
   optionsDocBook = pkgs.runCommand "options-db.xml" {} ''
     ${pkgs.libxslt}/bin/xsltproc -o $out ${./options-to-docbook.xsl} ${options} 
diff --git a/lib/eval-config.nix b/lib/eval-config.nix
index 9d6c5794df1..5554c659fce 100644
--- a/lib/eval-config.nix
+++ b/lib/eval-config.nix
@@ -23,7 +23,7 @@ rec {
     ++ (import ../modules/module-list.nix);
 
   extraArgs = extraArgs_ // {
-    inherit pkgs;
+    inherit pkgs optionDeclarations;
     modulesPath = ../modules;
   };
 
diff --git a/modules/services/misc/nixos-manual.nix b/modules/services/misc/nixos-manual.nix
index a886814d76d..a113c8ee962 100644
--- a/modules/services/misc/nixos-manual.nix
+++ b/modules/services/misc/nixos-manual.nix
@@ -3,7 +3,7 @@
 # of the virtual consoles.  The latter is useful for the installation
 # CD.
 
-{pkgs, config, ...}:
+{pkgs, config, optionDeclarations, ...}:
 
 let
 
@@ -15,7 +15,7 @@ let
     # We could speed up the evaluation of the manual expression by
     # providing it the optionDeclarations of the current
     # configuration.
-    import ../../../doc/manual {inherit pkgs;};
+    import ../../../doc/manual {inherit pkgs optionDeclarations;};
     
 in
 
-- 
GitLab


From 4d72704d774f719fc7470f2adb7d2890a355f97e Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 21 Aug 2009 09:11:33 +0000
Subject: [PATCH 1742/5331] svn path=/nixos/trunk/; revision=16799

---
 lib/eval-config.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/lib/eval-config.nix b/lib/eval-config.nix
index 5554c659fce..8befb75408b 100644
--- a/lib/eval-config.nix
+++ b/lib/eval-config.nix
@@ -32,6 +32,8 @@ rec {
 
   # "fixableDeclarationsOf" is used instead of "declarationsOf" because some
   # option default values may depends on the definition of other options.
+  # !!! This seems inefficent.  Didn't definitionsOf already compute
+  # the option declarations?
   optionDeclarations =
     pkgs.lib.fixableDeclarationsOf configComponents extraArgs config_;
 
-- 
GitLab


From fb730174a1f5ff3231a6dbd1e98c2de6ead1d607 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 21 Aug 2009 10:13:27 +0000
Subject: [PATCH 1743/5331] * Style change.  Tried to have the kde4 module set
 a default for   services.xserver.desktopManager.default (so that the user
 doesn't   have to) but it doesn't work yet.

svn path=/nixos/trunk/; revision=16800
---
 .../x11/xserver/desktop-managers/kde4.nix     | 97 +++++++++----------
 1 file changed, 47 insertions(+), 50 deletions(-)

diff --git a/modules/services/x11/xserver/desktop-managers/kde4.nix b/modules/services/x11/xserver/desktop-managers/kde4.nix
index f8b66e2840d..de0838565fc 100644
--- a/modules/services/x11/xserver/desktop-managers/kde4.nix
+++ b/modules/services/x11/xserver/desktop-managers/kde4.nix
@@ -1,73 +1,70 @@
-{pkgs, config, ...}:
+{ config, pkgs, ... }:
+
+with pkgs.lib;
 
 let
-  inherit (pkgs.lib) mkOption mkIf;
+
   xcfg = config.services.xserver;
   cfg = xcfg.desktopManager.kde4;
   xorg = xcfg.package;
 
-  options = { services = { xserver = { desktopManager = {
+in
 
-    kde4 = {
-      enable = mkOption {
-        default = false;
-        example = true;
-        description = "Enable the kde 4 desktop manager.";
-      };
-    };
+{
 
-  }; }; }; };
-in
+  imports = [ ./kde-environment.nix ];
+
+    
+  options = {
 
-mkIf (xcfg.enable && cfg.enable) {
-  require = [
-    options
+    services.xserver.desktopManager.kde4.enable = mkOption {
+      default = false;
+      example = true;
+      description = "Enable the KDE 4 desktop environment.";
+    };
 
-    # environment.kdePackages
-    ./kde-environment.nix
-  ];
+  };
 
-  services = {
-    xserver = {
+  
+  config = mkIf (xcfg.enable && cfg.enable) {
 
-      desktopManager = {
-        session = [{
-          name = "kde4";
-          start = ''
+    # If KDE 4 is enabled, make it default desktop manager (unless
+    # overriden by the user's configuration).
+    # !!! doesn't work yet ("Multiple definitions. Only one is allowed
+    # for this option.")
+    # services.xserver.desktopManager.default = mkOverride 900 "kde4";
+
+    services.xserver.desktopManager.session = singleton
+      { name = "kde4";
+        bgSupport = true;
+        start =
+          ''
             # Start KDE.
             exec ${pkgs.kde42.kdebase_workspace}/bin/startkde
           '';
-        }];
       };
 
-    };
-  };
+    security.setuidPrograms = [ "kcheckpass" ];
 
-  security = {
-    extraSetuidPrograms = [
-      "kcheckpass"
-    ];
-  };
+    environment.kdePackages =
+      [ pkgs.kde42.kdelibs
+        pkgs.kde42.kdebase
+        pkgs.kde42.kdebase_runtime
+        pkgs.kde42.kdebase_workspace
+        pkgs.shared_mime_info
+      ];
 
-  environment = {
-    kdePackages = [
-      pkgs.kde42.kdelibs
-      pkgs.kde42.kdebase
-      pkgs.kde42.kdebase_runtime
-      pkgs.kde42.kdebase_workspace
-      pkgs.shared_mime_info
-    ];
-
-    x11Packages = [
-      xorg.xmessage # so that startkde can show error messages
-      pkgs.qt4 # needed for qdbus
-      xorg.xset # used by startkde, non-essential
-    ];
-
-    etc = [
+    environment.x11Packages =
+      [ xorg.xmessage # so that startkde can show error messages
+        pkgs.qt4 # needed for qdbus
+        xorg.xset # used by startkde, non-essential
+      ];
+
+    environment.etc = singleton
       { source = "${pkgs.xkeyboard_config}/etc/X11/xkb";
         target = "X11/xkb";
-      }
-    ];
+      };
+
   };
+
 }
-- 
GitLab


From 8e6ad840f2b1851bcfc630fe6c73540ea73b5889 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 21 Aug 2009 13:05:45 +0000
Subject: [PATCH 1744/5331] * Modularised the xinetd service.  tftp has been
 factored out into a   separate module, which just declares a configuration
 value that   causes the xinetd module to add it to xinetd.conf.  Also
 Nixified   the service declarations to abstract over the inetd
 implementation.

* Renamed the services.xinetd.tftpd options to services.tftpd.  The
  fact that the tftpd module uses xinetd is an implementation detail.

* xinetd: use -dontfork to let Upstart monitor it, and use -syslog to
  get error messages at startup.

svn path=/nixos/trunk/; revision=16803
---
 modules/module-list.nix                       |   3 +-
 modules/services/networking/tftpd.nix         |  43 ++++
 modules/services/networking/xinetd.nix        | 190 +++++++++++-------
 .../x11/xserver/desktop-managers/kde4.nix     |   2 +-
 4 files changed, 161 insertions(+), 77 deletions(-)
 create mode 100644 modules/services/networking/tftpd.nix

diff --git a/modules/module-list.nix b/modules/module-list.nix
index af19ece8f1d..ec30539df84 100644
--- a/modules/module-list.nix
+++ b/modules/module-list.nix
@@ -68,9 +68,10 @@
   ./services/networking/portmap.nix
   ./services/networking/ssh/lshd.nix
   ./services/networking/ssh/sshd.nix
+  ./services/networking/tftpd.nix
   ./services/networking/vsftpd.nix
-  ./services/networking/xinetd.nix
   ./services/networking/wpa_supplicant.nix
+  ./services/networking/xinetd.nix
   ./services/printing/cupsd.nix
   ./services/scheduling/atd.nix
   ./services/scheduling/cron.nix
diff --git a/modules/services/networking/tftpd.nix b/modules/services/networking/tftpd.nix
new file mode 100644
index 00000000000..002fc991555
--- /dev/null
+++ b/modules/services/networking/tftpd.nix
@@ -0,0 +1,43 @@
+{ config, pkgs, ... }:
+
+with pkgs.lib;
+
+{
+
+  ###### interface
+  
+  options = {
+
+    services.tftpd.enable = mkOption {
+      default = false;
+      description = ''
+        Whether to enable the anonymous FTP user.
+      '';
+    };
+
+    services.tftpd.path = mkOption {
+      default = "/home/tftp";
+      description = ''
+        Where the tftp server files are stored
+      '';
+    };
+
+  };
+
+
+  ###### implementation
+
+  config = mkIf config.services.tftpd.enable {
+
+    services.xinetd.enable = true;
+
+    services.xinetd.services = singleton
+      { name = "tftp";
+        protocol = "udp";
+        server = "${pkgs.netkittftp}/sbin/in.tftpd";
+        serverArgs = "${config.services.tftpd.path}";
+      };
+
+  };
+
+}
diff --git a/modules/services/networking/xinetd.nix b/modules/services/networking/xinetd.nix
index a1a69a71955..a7f808e674e 100644
--- a/modules/services/networking/xinetd.nix
+++ b/modules/services/networking/xinetd.nix
@@ -1,95 +1,135 @@
-{pkgs, config, ...}:
+{ config, pkgs, ... }:
 
-###### interface
-let
-  inherit (pkgs.lib) mkOption mkIf;
+with pkgs.lib;
 
+let 
+
+  cfg = config.services.xinetd;
+  
+  inherit (pkgs) xinetd;
+
+  configFile = pkgs.writeText "xinetd.conf"
+    ''
+      defaults
+      {
+        log_type       = SYSLOG daemon info
+        log_on_failure = HOST
+        log_on_success = PID HOST DURATION EXIT
+      }
+      
+      ${concatMapStrings makeService cfg.services}
+    '';
+
+  makeService = srv:
+    ''
+      service ${srv.name}
+      {
+        protocol    = ${srv.protocol}
+        ${optionalString srv.unlisted "type        = UNLISTED"}
+        socket_type = ${if srv.protocol == "udp" then "dgram" else "stream"}
+        ${if srv.port != 0 then "port        = ${toString srv.port}" else ""}
+        wait        = ${if srv.protocol == "udp" then "yes" else "no"}
+        user        = ${srv.user}
+        server      = ${srv.server}
+        ${optionalString (srv.serverArgs != "") "server_args = ${srv.serverArgs}"}
+      }
+    '';
+  
+in
+  
+{
+
+  ###### interface
+  
   options = {
-    services = {
-      xinetd = {
-        enable = mkOption {
-          default = false;
-          description = "
-            Whether to enable the vsftpd FTP server.
-          ";
-        };
+  
+    services.xinetd.enable = mkOption {
+      default = false;
+      description = ''
+        Whether to enable the xinetd super-server daemon.
+      '';
+    };
+
+    services.xinetd.services = mkOption {
+      default = [];
+      description = ''
+        A list of services provided by xinetd.
+      '';
+
+      type = types.list types.optionSet;
+      
+      options = {
 
-        tftpd = {
-          enable = mkOption {
-            default = false;
-            description = "
-              Whether to enable the anonymous FTP user.
-            ";
-          };
-
-          path = mkOption {
-            default = "/home/tftp";
-            description = "
-              Where the tftp server files are stored
-            ";
-          };
+        name = mkOption {
+          type = types.string;
+          example = "login";
+          description = "Name of the service.";
         };
-      };
-    };
-  };
-in
 
-###### implementation
+        protocol = mkOption {
+          type = types.string;
+          default = "tcp";
+          description =
+            "Protocol of the service.  Usually <literal>tcp</literal> or <literal>udp</literal>.";
+        };
 
-let 
+        port = mkOption {
+          type = types.int;
+          default = 0;
+          example = 123;
+          description = "Port number of the service.";
+        };
 
-  inherit (config.services.xinetd) tftpd;
-  inherit (pkgs) xinetd;
+        user = mkOption {
+          type = types.string;
+          default = "nobody";
+          description = "User account for the service";
+        };
 
-  tftpservice = ''
-    service tftp
-    {
-       protocol = udp
-       port = 69
-       socket_type = dgram
-       wait = yes
-       user = nobody
-       server = ${pkgs.netkittftp}/sbin/in.tftpd
-       server_args = ${tftpd.path}
-       disable = no
-    }
-  '';
-
-  configFile = pkgs.writeText "xinetd.conf" ''
-    defaults
-    {
-      log_type = SYSLOG daemon info
-      log_on_failure = HOST
-      log_on_success = PID HOST DURATION EXIT
-    }
-    ${if tftpd.enable then tftpservice else ""}
-  '';
+        server = mkOption {
+          type = types.string;
+          example = "/foo/bin/ftpd";
+          description = "Path of the program that implements the service.";
+        };
 
-in
+        serverArgs = mkOption {
+          type = types.string;
+          default = "";
+          description = "Command-line arguments for the server program.";
+        };
 
-mkIf config.services.xinetd.enable {
-  require = [
-    options
-  ];
+        unlisted = mkOption {
+          type = types.bool;
+          default = false;
+          description = ''
+            Whether this server is listed in
+            <filename>/etc/services</filename>.  If so, the port
+            number can be omitted.
+          '';
+        };
 
-  services = {
-    extraJobs = [{
-      name = "xinetd";
+      };
 
-      job = ''
-        description "xinetd server"
+    };
 
-        start on network-interfaces/started
-        stop on network-interfaces/stop
+  };
+  
 
-        start script
+  ###### implementation
 
-        mkdir -p ${tftpd.path}
-        end script
+  config = mkIf cfg.enable {
 
-        respawn ${xinetd}/sbin/xinetd -stayalive -f ${configFile}
-      '';
+    jobs = singleton
+      { name = "xinetd";
       
-    }];
+        description = "xinetd server";
+
+        startOn = "network-interfaces/started";
+        stopOn = "network-interfaces/stop";
+
+        exec = "${xinetd}/sbin/xinetd -syslog daemon -dontfork -stayalive -f ${configFile}";
+      };
+
   };
+
 }
diff --git a/modules/services/x11/xserver/desktop-managers/kde4.nix b/modules/services/x11/xserver/desktop-managers/kde4.nix
index de0838565fc..9ce593f1444 100644
--- a/modules/services/x11/xserver/desktop-managers/kde4.nix
+++ b/modules/services/x11/xserver/desktop-managers/kde4.nix
@@ -28,7 +28,7 @@ in
   
   config = mkIf (xcfg.enable && cfg.enable) {
 
-    # If KDE 4 is enabled, make it default desktop manager (unless
+    # If KDE 4 is enabled, make it the default desktop manager (unless
     # overriden by the user's configuration).
     # !!! doesn't work yet ("Multiple definitions. Only one is allowed
     # for this option.")
-- 
GitLab


From ff146aee081971b883a763d2860c6b0cdbf0afb2 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 24 Aug 2009 22:09:19 +0000
Subject: [PATCH 1745/5331] svn path=/nixos/trunk/; revision=16843

---
 modules/virtualisation/qemu-vm.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/virtualisation/qemu-vm.nix b/modules/virtualisation/qemu-vm.nix
index ec3981a9188..0c5d730d0d3 100644
--- a/modules/virtualisation/qemu-vm.nix
+++ b/modules/virtualisation/qemu-vm.nix
@@ -44,7 +44,7 @@ let
       
       # -no-kvm-irqchip is needed to prevent the CIFS mount from
       # hanging the VM on x86_64.
-      ${pkgs.qemu_kvm}/bin/qemu-system-x86_64 \
+      exec ${pkgs.qemu_kvm}/bin/qemu-system-x86_64 \
           -no-kvm-irqchip \
           -net nic,model=virtio -net user -smb / \
           -drive file=$NIX_DISK_IMAGE,if=virtio,boot=on \
-- 
GitLab


From 6f1b1aefde5a06d3317e1350d61a33b263cfc3e7 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 26 Aug 2009 16:52:38 +0000
Subject: [PATCH 1746/5331] * Added an option `nixpkgs.config' that allows the
 Nixpkgs options to   be set from the NixOS configuration.  For instance, you
 can say

    nixpkgs.config.firefox.enableGeckoMediaPlayer = true;

    environment.systemPackages = [ pkgs.firefox ];

  but the more interesting application is to apply global overrides to
  Nixpkgs throughout NixOS, e.g.

    nixpkgs.config.packageOverrides = pkgs:
      { glibc = pkgs.glibc27;
        gcc = pkgs.gcc42;
      };

  would build the whole system with Glibc 2.7 and GCC 4.2.  (There are
  some issues with "useFromStdenv" in all-packages.nix that need to be
  fixed for packages in the stdenv bootstrap though.)

  The implementation of this option is kind of evil though due to the
  need to prevent a circularity between the evaluation of
  nixpkgs.config and the "pkgs" module argument.

svn path=/nixos/trunk/; revision=16866
---
 lib/eval-config.nix                    | 54 +++++++++++++++++++-------
 {lib => modules/misc}/check-config.nix |  0
 modules/misc/nixpkgs.nix               | 17 ++++++++
 modules/module-list.nix                |  2 +
 4 files changed, 60 insertions(+), 13 deletions(-)
 rename {lib => modules/misc}/check-config.nix (100%)
 create mode 100644 modules/misc/nixpkgs.nix

diff --git a/lib/eval-config.nix b/lib/eval-config.nix
index 8befb75408b..653a260fb9b 100644
--- a/lib/eval-config.nix
+++ b/lib/eval-config.nix
@@ -5,41 +5,69 @@
 { configuration
 , system ? builtins.currentSystem
 , nixpkgs ? import ./from-env.nix "NIXPKGS" /etc/nixos/nixpkgs
-, pkgs ? import nixpkgs {inherit system;}
+, pkgs ? null
+, baseModules ? import ../modules/module-list.nix
 , extraArgs ? {}
 , extraModules ? []
 }:
 
-let extraArgs_ = extraArgs; in
+let extraArgs_ = extraArgs; pkgs_ = pkgs; in
 
 rec {
-  inherit nixpkgs pkgs;
 
+  # These are the NixOS modules that constitute the system configuration.
   configComponents =
-    [ configuration
-      ./check-config.nix
-    ]
+    [ configuration ]
     ++ extraModules
-    ++ (import ../modules/module-list.nix);
+    ++ baseModules;
 
+  # Merge the option definitions in all modules, forming the full
+  # system configuration.  This is called "configFast" because it's
+  # not checked for undeclared options.
+  configFast =
+    pkgs.lib.definitionsOf configComponents extraArgs;
+
+  # These are the extra arguments passed to every module.  In
+  # particular, Nixpkgs is passed through the "pkgs" argument.
   extraArgs = extraArgs_ // {
     inherit pkgs optionDeclarations;
     modulesPath = ../modules;
   };
 
-  config_ =
-    pkgs.lib.definitionsOf configComponents extraArgs;
+  # Import Nixpkgs, allowing the NixOS option nixpkgs.config to
+  # specify the Nixpkgs configuration (e.g., to set package options
+  # such as firefox.enableGeckoMediaPlayer, or to apply global
+  # overrides such as changing GCC throughout the system).  This is
+  # tricky, because we have to prevent an infinite recursion: "pkgs"
+  # is passed as an argument to NixOS modules, but the value of "pkgs"
+  # depends on config.nixpkgs.config, which we get from the modules.
+  # So we call ourselves here with "pkgs" explicitly set to an
+  # instance that doesn't depend on nixpkgs.config.
+  pkgs =
+    if pkgs_ != null
+    then pkgs_
+    else import nixpkgs {
+      inherit system;
+      config =
+        (import ./eval-config.nix {
+          inherit configuration system nixpkgs extraArgs extraModules;
+          # For efficiency, leave out most NixOS modules; they don't
+          # define nixpkgs.config, so it's pointless to evaluate them.
+          baseModules = [ ../modules/misc/nixpkgs.nix ];
+          pkgs = import nixpkgs { inherit system; config = {}; };
+        }).configFast.nixpkgs.config;
+    };
 
   # "fixableDeclarationsOf" is used instead of "declarationsOf" because some
   # option default values may depends on the definition of other options.
   # !!! This seems inefficent.  Didn't definitionsOf already compute
   # the option declarations?
   optionDeclarations =
-    pkgs.lib.fixableDeclarationsOf configComponents extraArgs config_;
+    pkgs.lib.fixableDeclarationsOf configComponents extraArgs configFast;
 
   # Optionally check wether all config values have corresponding
   # option declarations.
-  config = pkgs.checker config_
-    config_.environment.checkConfigurationOptions
-    optionDeclarations config_;
+  config = pkgs.checker configFast
+    configFast.environment.checkConfigurationOptions
+    optionDeclarations configFast;
 }
diff --git a/lib/check-config.nix b/modules/misc/check-config.nix
similarity index 100%
rename from lib/check-config.nix
rename to modules/misc/check-config.nix
diff --git a/modules/misc/nixpkgs.nix b/modules/misc/nixpkgs.nix
new file mode 100644
index 00000000000..68e7e2517f9
--- /dev/null
+++ b/modules/misc/nixpkgs.nix
@@ -0,0 +1,17 @@
+{ config, pkgs, ... }:
+
+{
+  options = {
+
+    nixpkgs.config = pkgs.lib.mkOption {
+      default = {};
+      example = {
+        firefox.enableGeckoMediaPlayer = true;
+      };
+      description = ''
+        The configuration of the Nix Packages collection.
+      '';
+    };
+
+  };
+}
\ No newline at end of file
diff --git a/modules/module-list.nix b/modules/module-list.nix
index ec30539df84..02268df64bb 100644
--- a/modules/module-list.nix
+++ b/modules/module-list.nix
@@ -15,8 +15,10 @@
   ./installer/tools/nixos-checkout.nix
   ./installer/tools/tools.nix
   ./misc/assertions.nix
+  ./misc/check-config.nix
   ./misc/ids.nix
   ./misc/locate.nix
+  ./misc/nixpkgs.nix
   ./misc/passthru.nix
   ./programs/bash/bash.nix
   ./programs/info.nix
-- 
GitLab


From 2892aed71227bc326fc619d03062a6e5a2130880 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 27 Aug 2009 11:57:43 +0000
Subject: [PATCH 1747/5331] * lib/eval-config.nix: combined "configuration" and
 "extraModules"   into one argument "modules". * release.nix: fixed the manual
 job. * ISO generation: break an infinite recursion.  Don't know why this  
 suddenly happens.  Probably because of the nixpkgs.config change,   but I
 don't see why.  Maybe the option evaluation is too strict.

svn path=/nixos/trunk/; revision=16878
---
 default.nix                            |  5 ++---
 lib/eval-config.nix                    | 12 ++++--------
 modules/installer/cd-dvd/iso-image.nix |  7 ++++++-
 modules/system/boot/stage-1-init.sh    |  7 ++++---
 release.nix                            | 16 ++++++++++------
 5 files changed, 26 insertions(+), 21 deletions(-)

diff --git a/default.nix b/default.nix
index 863a8339f12..28049ebd146 100644
--- a/default.nix
+++ b/default.nix
@@ -3,13 +3,12 @@
 
 let
   
-  eval = import ./lib/eval-config.nix {inherit configuration;};
+  eval = import ./lib/eval-config.nix { modules = [ configuration ]; };
 
   inherit (eval) config pkgs;
 
   vmConfig = (import ./lib/eval-config.nix {
-    inherit configuration;
-    extraModules = [./modules/virtualisation/qemu-vm.nix];
+    modules = [ configuration ./modules/virtualisation/qemu-vm.nix ];
   }).config;
     
 in
diff --git a/lib/eval-config.nix b/lib/eval-config.nix
index 653a260fb9b..dd23867ef0d 100644
--- a/lib/eval-config.nix
+++ b/lib/eval-config.nix
@@ -2,13 +2,12 @@
 # configuration object (`config') from which we can retrieve option
 # values.
 
-{ configuration
-, system ? builtins.currentSystem
+{ system ? builtins.currentSystem
 , nixpkgs ? import ./from-env.nix "NIXPKGS" /etc/nixos/nixpkgs
 , pkgs ? null
 , baseModules ? import ../modules/module-list.nix
 , extraArgs ? {}
-, extraModules ? []
+, modules
 }:
 
 let extraArgs_ = extraArgs; pkgs_ = pkgs; in
@@ -16,10 +15,7 @@ let extraArgs_ = extraArgs; pkgs_ = pkgs; in
 rec {
 
   # These are the NixOS modules that constitute the system configuration.
-  configComponents =
-    [ configuration ]
-    ++ extraModules
-    ++ baseModules;
+  configComponents = modules ++ baseModules;
 
   # Merge the option definitions in all modules, forming the full
   # system configuration.  This is called "configFast" because it's
@@ -50,7 +46,7 @@ rec {
       inherit system;
       config =
         (import ./eval-config.nix {
-          inherit configuration system nixpkgs extraArgs extraModules;
+          inherit system nixpkgs extraArgs modules;
           # For efficiency, leave out most NixOS modules; they don't
           # define nixpkgs.config, so it's pointless to evaluate them.
           baseModules = [ ../modules/misc/nixpkgs.nix ];
diff --git a/modules/installer/cd-dvd/iso-image.nix b/modules/installer/cd-dvd/iso-image.nix
index a3bd94805dc..3b26628148f 100644
--- a/modules/installer/cd-dvd/iso-image.nix
+++ b/modules/installer/cd-dvd/iso-image.nix
@@ -140,6 +140,11 @@ in
           "ln -s ${config.system.build.system} $out";
         target = "/system";
       }
+      { # Idem for the stage-2 init script.
+        source = pkgs.runCommand "system" {}
+          "ln -s ${config.system.build.bootStage2} $out";
+        target = "/init";
+      }
     ];
 
   # The Grub menu.
@@ -150,7 +155,7 @@ in
         chainloader +1
     
       title NixOS Installer / Rescue
-        kernel /boot/vmlinuz init=${config.system.build.bootStage2} systemConfig=/system ${toString config.boot.kernelParams}
+        kernel /boot/vmlinuz init=/init systemConfig=/system ${toString config.boot.kernelParams}
         initrd /boot/initrd
     '';
 
diff --git a/modules/system/boot/stage-1-init.sh b/modules/system/boot/stage-1-init.sh
index 121605ab479..5c3ad57af65 100644
--- a/modules/system/boot/stage-1-init.sh
+++ b/modules/system/boot/stage-1-init.sh
@@ -63,7 +63,7 @@ mount -t sysfs none /sys
 
 
 # Process the kernel command line.
-stage2Init=/init
+export stage2Init=/init
 for o in $(cat /proc/cmdline); do
     case $o in
         init=*)
@@ -297,8 +297,9 @@ fi
 
 
 # Start stage 2.  `run-init' deletes all files in the ramfs on the
-# current /.
-if test -z "$stage2Init" -o ! -e "$targetRoot/$stage2Init"; then
+# current /.  Note that $stage2Init might be an absolute symlink, in
+# which case "-e" won't work because we're not in the chroot yet.
+if ! test -e "$targetRoot/$stage2Init" -o -L "$targetRoot/$stage2Init"; then
     echo "stage 2 init script not found"
     fail
 fi
diff --git a/release.nix b/release.nix
index 17e34f42fb4..abf1ed95669 100644
--- a/release.nix
+++ b/release.nix
@@ -1,4 +1,4 @@
-{ nixpkgs ? ../nixpkgs-wc }:
+{ nixpkgs ? ../nixpkgs }:
 
 let
 
@@ -16,12 +16,11 @@ let
 
       version = builtins.readFile ./VERSION + (if officialRelease then "" else "pre${toString nixosSrc.rev}");
 
+      versionModule = { system.nixosVersion = version; };
+      
       iso = (import lib/eval-config.nix {
-        inherit system nixpkgs;        
-        configuration =
-          { require = module;
-            system.nixosVersion = version;
-          };
+        inherit system nixpkgs;
+        modules = [ module versionModule ];
       }).config.system.build.isoImage;
 
     in
@@ -75,6 +74,11 @@ let
 
       import "${nixosSrc}/doc/manual" {
         pkgs = import nixpkgs {};
+        optionDeclarations =
+          (import lib/eval-config.nix {
+            inherit nixpkgs;
+            modules = [ ];
+          }).optionDeclarations;
       };
 
 
-- 
GitLab


From 39e12e13c4dbd894269e63afc0edbcadeebac04a Mon Sep 17 00:00:00 2001
From: Marc Weber <marco-oweber@gmx.de>
Date: Thu, 27 Aug 2009 23:16:09 +0000
Subject: [PATCH 1748/5331] cupsd: add bindirCmds so that you can test other
 backends easier.

svn path=/nixos/trunk/; revision=16879
---
 modules/services/printing/cupsd.nix | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/modules/services/printing/cupsd.nix b/modules/services/printing/cupsd.nix
index 4f2bffe7773..63c4d3b1df4 100644
--- a/modules/services/printing/cupsd.nix
+++ b/modules/services/printing/cupsd.nix
@@ -15,6 +15,13 @@ let
           ";
         };
 
+        bindirCmds = mkOption {
+          default = "";
+          description = "
+            add commands adding additional symlinks to the bindir such as bjnp
+          ";
+        };
+
       };
     };
   };
@@ -31,6 +38,7 @@ let
 
   modprobe = config.system.sbin.modprobe;
 
+  cfg = config.services.printing;
 
   # Here we can enable additional backends, filters, etc. that are not
   # part of CUPS itself, e.g. the SMB backend is part of Samba.  Since
@@ -56,6 +64,7 @@ let
     ensureDir $out/lib/cups/filter
     ln -s ${cups}/lib/cups/filter/* $out/lib/cups/filter/
     ln -s ${pkgs.ghostscript}/lib/cups/filter/* $out/lib/cups/filter/
+    ${cfg.bindirCmds}
   ''; # */
   
 
-- 
GitLab


From 7f8272dd70ff49b9bf4df6eaf096fed32ff8e357 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sat, 29 Aug 2009 14:14:42 +0000
Subject: [PATCH 1749/5331] * Make the host filesystem writable for non-root. 
 This is a temporary   hack to enable non-root processes to write coverage
 data.

svn path=/nixos/trunk/; revision=16891
---
 modules/virtualisation/qemu-vm.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/virtualisation/qemu-vm.nix b/modules/virtualisation/qemu-vm.nix
index 0c5d730d0d3..ab7a494e988 100644
--- a/modules/virtualisation/qemu-vm.nix
+++ b/modules/virtualisation/qemu-vm.nix
@@ -97,7 +97,7 @@ in
       { mountPoint = "/hostfs";
         device = "//10.0.2.4/qemu";
         fsType = "cifs";
-        options = "guest,username=nobody";
+        options = "guest,username=nobody,noperm";
         neededForBoot = true;
       }
       { mountPoint = "/nix/store";
-- 
GitLab


From 8fd9fa36c465a66835b1170704d2aa6ab30a76f0 Mon Sep 17 00:00:00 2001
From: Sander van der Burg <s.vanderburg@tudelft.nl>
Date: Sun, 30 Aug 2009 19:11:47 +0000
Subject: [PATCH 1750/5331] Added an initial Trac subservice. Trac projects
 still have to be created by using the trac-admin tool

svn path=/nixos/trunk/; revision=16894
---
 .../web-servers/apache-httpd/trac.nix         | 38 +++++++++++++++++++
 1 file changed, 38 insertions(+)
 create mode 100644 modules/services/web-servers/apache-httpd/trac.nix

diff --git a/modules/services/web-servers/apache-httpd/trac.nix b/modules/services/web-servers/apache-httpd/trac.nix
new file mode 100644
index 00000000000..aabeb429ce8
--- /dev/null
+++ b/modules/services/web-servers/apache-httpd/trac.nix
@@ -0,0 +1,38 @@
+{config, pkgs, serverInfo}:
+
+let
+  inherit (pkgs.lib) mkOption;
+in
+{
+  options = {
+    projectsLocation = mkOption {
+      description = "URL path in which Trac projects can be accessed";
+      default = "/projects";
+    };
+  };
+
+  extraModules = [
+    { name = "python"; path = "${pkgs.mod_python}/modules/mod_python.so"; }
+  ];
+  
+  extraConfig = ''
+      <Location ${config.projectsLocation}>
+        SetHandler mod_python
+        PythonHandler trac.web.modpython_frontend
+	PythonOption TracEnvParentDir /var/trac/projects
+        PythonOption TracUriRoot ${config.projectsLocation}
+        PythonOption PYTHON_EGG_CACHE /var/trac/egg-cache
+      </Location>
+  '';
+  
+  globalEnvVars = [
+    { name = "PYTHONPATH";
+      value = 
+        "${pkgs.mod_python}/lib/python2.5/site-packages:" +
+	"${pkgs.pythonPackages.trac}/lib/python2.5/site-packages:" +
+	"${pkgs.setuptools}/lib/python2.5/site-packages:" +
+	"${pkgs.pythonPackages.genshi}/lib/python2.5/site-packages:" +
+	"${pkgs.pythonPackages.psycopg2}/lib/python2.5/site-packages";
+    }
+  ];
+}
-- 
GitLab


From 4a0be54df099e43fa2fa154ce4de6e588d2af5c3 Mon Sep 17 00:00:00 2001
From: Sander van der Burg <s.vanderburg@tudelft.nl>
Date: Sun, 30 Aug 2009 19:45:15 +0000
Subject: [PATCH 1751/5331] Added subversion python modules to the PYTHONPATH

svn path=/nixos/trunk/; revision=16895
---
 modules/services/web-servers/apache-httpd/trac.nix | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/modules/services/web-servers/apache-httpd/trac.nix b/modules/services/web-servers/apache-httpd/trac.nix
index aabeb429ce8..b50cd2aff7e 100644
--- a/modules/services/web-servers/apache-httpd/trac.nix
+++ b/modules/services/web-servers/apache-httpd/trac.nix
@@ -2,6 +2,15 @@
 
 let
   inherit (pkgs.lib) mkOption;
+  
+  # Build a Subversion instance with Apache modules and Swig/Python bindings.
+  subversion = pkgs.subversion.override (origArgs: {
+    bdbSupport = true;
+    httpServer = true;
+    sslSupport = true;
+    compressionSupport = true;
+    pythonBindings = true;
+  });
 in
 {
   options = {
@@ -32,7 +41,8 @@ in
 	"${pkgs.pythonPackages.trac}/lib/python2.5/site-packages:" +
 	"${pkgs.setuptools}/lib/python2.5/site-packages:" +
 	"${pkgs.pythonPackages.genshi}/lib/python2.5/site-packages:" +
-	"${pkgs.pythonPackages.psycopg2}/lib/python2.5/site-packages";
+	"${pkgs.pythonPackages.psycopg2}/lib/python2.5/site-packages:" +
+	"${subversion}/lib/python2.5/site-packages";
     }
   ];
 }
-- 
GitLab


From 921b838149492fe1ec55384715f5f94ad454fa3b Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 31 Aug 2009 13:40:57 +0000
Subject: [PATCH 1752/5331] * test -> tests.

svn path=/nixos/trunk/; revision=16897
---
 .../installer/cd-dvd/installation-cd-base.nix |  2 ++
 .../web-servers/apache-httpd/default.nix      |  2 ++
 modules/testing/test-instrumentation.nix      | 36 +++++++++++++++++++
 .../remote-install-scripts/install-launch.sh  |  0
 .../remote-install-scripts/install-script.sh  |  0
 .../remote-install-scripts/install-start.sh   |  0
 .../remote-install-scripts/install-test.sh    |  0
 {test => tests}/test-config-examples.sh       |  0
 {test => tests}/test-upstart-job.sh           |  0
 9 files changed, 40 insertions(+)
 create mode 100644 modules/testing/test-instrumentation.nix
 rename {test => tests}/remote-install-scripts/install-launch.sh (100%)
 rename {test => tests}/remote-install-scripts/install-script.sh (100%)
 rename {test => tests}/remote-install-scripts/install-start.sh (100%)
 rename {test => tests}/remote-install-scripts/install-test.sh (100%)
 rename {test => tests}/test-config-examples.sh (100%)
 rename {test => tests}/test-upstart-job.sh (100%)

diff --git a/modules/installer/cd-dvd/installation-cd-base.nix b/modules/installer/cd-dvd/installation-cd-base.nix
index 83fd1423ef1..3613ccb1613 100644
--- a/modules/installer/cd-dvd/installation-cd-base.nix
+++ b/modules/installer/cd-dvd/installation-cd-base.nix
@@ -155,6 +155,7 @@ in
   # installation.
   installer.nixpkgsURL = http://nixos.org/releases/nixpkgs/channels/nixpkgs-unstable;
 
+  /*
   boot.postBootCommands =
     ''
       export PATH=${pkgs.gnutar}/bin:${pkgs.bzip2}/bin:$PATH
@@ -176,6 +177,7 @@ in
       # running system on the CD/DVD.
       cp ${dummyConfiguration} /etc/nixos/configuration.nix
     '';
+    */
 
   # Some more help text.
   services.mingetty.helpLine =
diff --git a/modules/services/web-servers/apache-httpd/default.nix b/modules/services/web-servers/apache-httpd/default.nix
index 561a911439e..66019a9b00e 100644
--- a/modules/services/web-servers/apache-httpd/default.nix
+++ b/modules/services/web-servers/apache-httpd/default.nix
@@ -606,6 +606,8 @@ in
           in concatMapStrings f (concatMap (svc: svc.globalEnvVars) allSubservices)
         }
 
+        env GCOV_PREFIX=/tmp/coverage-data
+
         env PATH=${pkgs.coreutils}/bin:${pkgs.gnugrep}/bin:${concatStringsSep ":" (concatMap (svc: svc.extraServerPath) allSubservices)}
 
         respawn ${httpd}/bin/httpd -f ${httpdConf} -DNO_DETACH
diff --git a/modules/testing/test-instrumentation.nix b/modules/testing/test-instrumentation.nix
new file mode 100644
index 00000000000..b64dc70ab30
--- /dev/null
+++ b/modules/testing/test-instrumentation.nix
@@ -0,0 +1,36 @@
+# This module allows the test driver to connect to the virtual machine
+# via a root shell attached to port 514.
+
+{ config, pkgs, ... }:
+
+with pkgs.lib;
+
+{
+
+  config = {
+
+    jobs = singleton
+      { name = "backdoor";
+      
+        startOn = "network-interfaces";
+        
+        preStart =
+          ''
+            eval $(cat /proc/cmdline)
+            echo "guest running, will write in $hostTmpDir on host" > /dev/ttyS0
+            touch /hostfs/$hostTmpDir/running
+          '';
+          
+        exec = "${pkgs.socat}/bin/socat tcp-listen:514,fork exec:/bin/sh,stderr";
+      };
+  
+    boot.postBootCommands =
+      ''
+        ( eval $(cat /proc/cmdline)
+          mkdir /hostfs/$hostTmpDir/coverage-data
+          ln -s /hostfs/$hostTmpDir/coverage-data /tmp/coverage-data
+        )
+      '';
+  };
+
+}
diff --git a/test/remote-install-scripts/install-launch.sh b/tests/remote-install-scripts/install-launch.sh
similarity index 100%
rename from test/remote-install-scripts/install-launch.sh
rename to tests/remote-install-scripts/install-launch.sh
diff --git a/test/remote-install-scripts/install-script.sh b/tests/remote-install-scripts/install-script.sh
similarity index 100%
rename from test/remote-install-scripts/install-script.sh
rename to tests/remote-install-scripts/install-script.sh
diff --git a/test/remote-install-scripts/install-start.sh b/tests/remote-install-scripts/install-start.sh
similarity index 100%
rename from test/remote-install-scripts/install-start.sh
rename to tests/remote-install-scripts/install-start.sh
diff --git a/test/remote-install-scripts/install-test.sh b/tests/remote-install-scripts/install-test.sh
similarity index 100%
rename from test/remote-install-scripts/install-test.sh
rename to tests/remote-install-scripts/install-test.sh
diff --git a/test/test-config-examples.sh b/tests/test-config-examples.sh
similarity index 100%
rename from test/test-config-examples.sh
rename to tests/test-config-examples.sh
diff --git a/test/test-upstart-job.sh b/tests/test-upstart-job.sh
similarity index 100%
rename from test/test-upstart-job.sh
rename to tests/test-upstart-job.sh
-- 
GitLab


From a7001d34d7a6c6d02ba19dd5b8c0773967054097 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 31 Aug 2009 13:46:56 +0000
Subject: [PATCH 1753/5331] * Oops, didn't want to commit that.

svn path=/nixos/trunk/; revision=16898
---
 modules/installer/cd-dvd/installation-cd-base.nix | 2 --
 1 file changed, 2 deletions(-)

diff --git a/modules/installer/cd-dvd/installation-cd-base.nix b/modules/installer/cd-dvd/installation-cd-base.nix
index 3613ccb1613..83fd1423ef1 100644
--- a/modules/installer/cd-dvd/installation-cd-base.nix
+++ b/modules/installer/cd-dvd/installation-cd-base.nix
@@ -155,7 +155,6 @@ in
   # installation.
   installer.nixpkgsURL = http://nixos.org/releases/nixpkgs/channels/nixpkgs-unstable;
 
-  /*
   boot.postBootCommands =
     ''
       export PATH=${pkgs.gnutar}/bin:${pkgs.bzip2}/bin:$PATH
@@ -177,7 +176,6 @@ in
       # running system on the CD/DVD.
       cp ${dummyConfiguration} /etc/nixos/configuration.nix
     '';
-    */
 
   # Some more help text.
   services.mingetty.helpLine =
-- 
GitLab


From 27a8e656bc2a99a0451f0c84481083498e779817 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 31 Aug 2009 14:25:12 +0000
Subject: [PATCH 1754/5331] * Stuff for automatic and manual testing of NixOS
 VMs.

  lib/build-vms.nix contains a function `buildVirtualNetwork' that
  takes a specification of a network of machines (as an attribute set
  of NixOS machine configurations) and builds a script that starts
  each configuration in a separate QEMU/KVM VM and connects them
  together in a virtual network.  This script can be run manually to
  test the VMs interactively.  There is also a function `runTests'
  that starts and runs the virtual network in a derivation, and
  then executes a test specification that tells the VMs to do certain
  things (i.e., letting one VM send an HTTP request to a webserver on
  another VM).  The tests are written in Perl (for now).

  tests/subversion.nix shows a simple example, namely a network of two
  machines: a webserver that runs the Subversion subservice, and a
  client.  Apache, Subversion and a few other packages are built with
  coverage analysis instrumentation.  For instance,

    $ nix-build tests/subversion.nix -A vms
    $ ./result/bin/run-vms

  starts two QEMU/KVM instances.  When they have finished booting, the
  webserver can be accessed from the host through
  http://localhost:8081/.

  It also has a small test suite:

    $ nix-build tests/subversion.nix -A report

  This runs the VMs in a derivation, runs the tests, and then produces
  a distributed code coverage analysis report (i.e. it shows the
  combined coverage on both machines).

  The Perl test driver program is in lib/test-driver.  It executes
  commands on the guest machines by connecting to a root shell running
  on port 514 (provided by modules/testing/test-instrumentation.nix).

  The VMs are connected together in a virtual network using QEMU's
  multicast feature.  This isn't very secure.  At the very least,
  other processes on the same machine can listen to or send packets on
  the virtual network.  On the plus side, we don't need to be root to
  set up a multicast virtual network, so we can do it from a
  derivation.  Maybe we can use VDE instead.

  (Moved from the vario repository.)

svn path=/nixos/trunk/; revision=16899
---
 lib/build-vms.nix              | 180 ++++++++++++++++++++++++
 lib/test-driver/Machine.pm     | 242 +++++++++++++++++++++++++++++++++
 lib/test-driver/test-driver.pl |  41 ++++++
 tests/subversion.nix           | 112 +++++++++++++++
 4 files changed, 575 insertions(+)
 create mode 100644 lib/build-vms.nix
 create mode 100644 lib/test-driver/Machine.pm
 create mode 100644 lib/test-driver/test-driver.pl
 create mode 100644 tests/subversion.nix

diff --git a/lib/build-vms.nix b/lib/build-vms.nix
new file mode 100644
index 00000000000..7032489253b
--- /dev/null
+++ b/lib/build-vms.nix
@@ -0,0 +1,180 @@
+{ nixos ? /etc/nixos/nixos
+, nixpkgs ? /etc/nixos/nixpkgs
+}:
+
+let pkgs = import nixpkgs { config = {}; }; in
+
+with pkgs;
+
+rec {
+
+  inherit pkgs;
+
+  
+  # Build a virtual network from an attribute set `{ machine1 =
+  # config1; ... machineN = configN; }', where `machineX' is the
+  # hostname and `configX' is a NixOS system configuration.  The
+  # result is a script that starts a QEMU instance for each virtual
+  # machine.  Each machine is given an arbitrary IP address in the
+  # virtual network.
+  buildVirtualNetwork =
+    { nodes }:
+
+    let nodes_ = lib.mapAttrs (n: buildVM nodes_) (assignIPAddresses nodes); in
+
+    stdenv.mkDerivation {
+      name = "vms";
+      buildCommand =
+        ''
+          ensureDir $out/vms
+          ${
+            lib.concatMapStrings (vm:
+              ''
+                ln -sn ${vm.config.system.build.vm} $out/vms/${vm.config.networking.hostName}
+              ''
+            ) (lib.attrValues nodes_)
+          }
+
+          ensureDir $out/bin
+          cat > $out/bin/run-vms <<EOF
+          #! ${stdenv.shell}
+          port=8080
+          for i in $out/vms/*; do
+            port2=\$((port++))
+            echo "forwarding localhost:\$port2 to \$(basename \$i):80"
+            QEMU_OPTS="-redir tcp:\$port2::80 -net nic,vlan=1 -net socket,vlan=1,mcast=232.0.1.1:1234" \$i/bin/run-*-vm &
+          done
+          EOF
+          chmod +x $out/bin/run-vms
+        ''; # */
+    };
+
+
+  buildVM =
+    nodes: configuration:
+
+    import "${nixos}/lib/eval-config.nix" {
+      inherit nixpkgs;
+      modules = [ configuration ];
+      extraArgs = { inherit nodes; };
+      /* !!! bug in the module/option handling: this ignores the
+         config from assignIPAddresses.  Too much magic. 
+      configuration = {
+        imports = [configuration "${nixos}/modules/virtualisation/qemu-vm.nix"];
+        config = {
+          # We don't need the manual in a test VM, and leaving it out
+          # speeds up evaluation quite a bit.
+          services.nixosManual.enable = false;
+        };
+      };
+      */
+    };
+
+
+  # Given an attribute set { machine1 = config1; ... machineN =
+  # configN; }, sequentially assign IP addresses in the 192.168.1.0/24
+  # range to each machine, and set the hostname to the attribute name.
+  assignIPAddresses = nodes:
+
+    let
+    
+      machines = lib.attrNames nodes;
+
+      machinesWithIP = zip machines
+        (map (n: "192.168.1.${toString n}") (lib.range 1 254));
+
+      # Generate a /etc/hosts file.
+      hosts = lib.concatMapStrings (m: "${m.second} ${m.first}\n") machinesWithIP;
+
+      nodes_ = map (m: lib.nameValuePair m.first
+          { imports = [
+              (lib.getAttr m.first nodes)
+              "${nixos}/modules/virtualisation/qemu-vm.nix" # !!!
+              "${nixos}/modules/testing/test-instrumentation.nix" # !!! should only get added for automated test runs
+            ];
+            config =
+              { networking.hostName = m.first;
+                networking.interfaces =
+                  [ { name = "eth1";
+                      ipAddress = m.second;
+                    }
+                  ];
+                networking.extraHosts = hosts;
+                services.nixosManual.enable = false; # !!!
+              };
+          }
+        ) machinesWithIP;
+
+    in lib.listToAttrs nodes_;
+
+    
+  # Zip two lists together.  Should be moved to pkgs.lib.
+  zip = xs: ys:
+    if xs != [] && ys != [] then
+      [ {first = lib.head xs; second = lib.head ys;} ]
+      ++ zip (lib.tail xs) (lib.tail ys)
+    else [];
+
+
+  # Run an automated test suite in the given virtual network.
+  # `network' must be the result of a call to the
+  # `buildVirtualNetwork' function.  `tests' is a Perl fragment
+  # describing the tests.
+  runTests = network: tests:
+    stdenv.mkDerivation {
+      name = "vm-test-run";
+      inherit tests;
+      buildCommand =
+        ''
+          mkdir $out
+          cp ${./test-driver/Machine.pm} Machine.pm
+          ${perl}/bin/perl ${./test-driver/test-driver.pl} ${network}/vms/*/bin/run-*-vm
+          for i in */coverage-data; do
+            ensureDir $out/coverage-data
+            mv $i $out/coverage-data/$(dirname $i)
+          done
+        ''; # */
+    };
+
+
+  # Generate a coverage report from the coverage data produced by
+  # runTests.
+  makeReport = x: runCommand "report" { buildInputs = [rsync]; }
+    ''
+      for d in ${x}/coverage-data/*; do
+
+          echo "doing $d"
+
+          ensureDir $TMPDIR/gcov/
+
+          for i in $(cd $d/nix/store && ls); do
+              if ! test -e $TMPDIR/gcov/nix/store/$i; then
+                  echo "copying $i"
+                  mkdir -p $TMPDIR/gcov/$(echo $i | cut -c34-)
+                  rsync -rv /nix/store/$i/.coverage/ $TMPDIR/gcov/$(echo $i | cut -c34-)
+              fi
+          done
+
+          chmod -R u+w $TMPDIR/gcov
+
+          find $TMPDIR/gcov -name "*.gcda" -exec rm {} \;
+
+          for i in $(cd $d/nix/store && ls); do
+              rsync -rv $d/nix/store/$i/.coverage/ $TMPDIR/gcov/$(echo $i | cut -c34-)
+          done
+
+          find $TMPDIR/gcov -name "*.gcda" -exec chmod 644 {} \;
+          
+          echo "producing info..."
+          ${pkgs.lcov}/bin/geninfo --ignore-errors source,gcov $TMPDIR/gcov --output-file $TMPDIR/app.info
+          cat $TMPDIR/app.info >> $TMPDIR/full.info
+      done
+            
+      ${pkgs.lcov}/bin/lcov --remove $TMPDIR/full.info "/nix/store/*" > $TMPDIR/out.info
+      
+      echo "making report..."
+      ensureDir $out/coverage
+      ${pkgs.lcov}/bin/genhtml --show-details $TMPDIR/out.info -o $out/coverage
+    ''; # */
+    
+}
diff --git a/lib/test-driver/Machine.pm b/lib/test-driver/Machine.pm
new file mode 100644
index 00000000000..b30cd501a8d
--- /dev/null
+++ b/lib/test-driver/Machine.pm
@@ -0,0 +1,242 @@
+package Machine;
+
+use strict;
+use Socket;
+use IO::Handle;
+use POSIX qw(dup2);
+
+
+# Stuff our PID in the multicast address/port to prevent collissions
+# with other NixOS VM networks.
+my $mcastAddr = "232.18.1." . ($$ >> 8) . ":" . (64000 + ($$ & 0xff));
+print STDERR "using multicast address $mcastAddr\n";
+
+
+sub new {
+    my ($class, $vmScript) = @_;
+
+    $vmScript =~ /run-(.*)-vm$/ or die;
+    my $name = $1;
+
+    my $tmpDir = $ENV{'TMPDIR'} || "/tmp";
+    
+    my $self = {
+        script => $vmScript,
+        name => $name,
+        booted => 0,
+        pid => 0,
+        connected => 0,
+        socket => undef,
+        stateDir => "$tmpDir/$name",
+    };
+
+    mkdir $self->{stateDir}, 0700;
+
+    bless $self, $class;
+    return $self;
+}
+
+
+sub log {
+    my ($self, $msg) = @_;
+    chomp $msg;
+    print STDERR $self->{name}, ": $msg\n";
+}
+
+
+sub name {
+    my ($self) = @_;
+    return $self->{name};
+}
+
+
+sub start {
+    my ($self) = @_;
+    return if $self->{booted};
+
+    $self->log("starting vm");
+
+    my $pid = fork();
+    die if $pid == -1;
+
+    if ($pid == 0) {
+        my $name = $self->{name};
+        open LOG, "| sed --unbuffered 's|^|$name console: |'" or die;
+        dup2(fileno(LOG), fileno(STDOUT));
+        dup2(fileno(LOG), fileno(STDERR));
+        $ENV{TMPDIR} = $self->{stateDir};
+        $ENV{QEMU_OPTS} = "-nographic -redir tcp:65535::514 -net nic,vlan=1 -net socket,vlan=1,mcast=$mcastAddr";
+        $ENV{QEMU_KERNEL_PARAMS} = "console=ttyS0 panic=1 hostTmpDir=$ENV{TMPDIR}";
+        chdir $self->{stateDir} or die;
+        exec $self->{script};
+        die;
+    }
+    
+    $self->log("vm running as pid $pid");
+    $self->{pid} = $pid;
+    $self->{booted} = 1;
+}
+
+
+sub connect {
+    my ($self) = @_;
+    return if $self->{connected};
+
+    $self->start;
+
+    while (1) {
+        last if -e ($self->{stateDir} . "/running");
+        sleep 1;
+    }
+
+    while (1) {
+        $self->log("trying to connect");
+        my $socket = new IO::Handle;
+        $self->{socket} = $socket;
+        socket($socket, PF_UNIX, SOCK_STREAM, 0) or die;
+        connect($socket, sockaddr_un($self->{stateDir} . "/65535.socket")) or die;
+        $socket->autoflush(1);
+        print $socket "echo hello\n" or next;
+        flush $socket;
+        my $line = readline($socket);
+        chomp $line;
+        last if $line eq "hello";
+        sleep 1;
+    }    
+
+    $self->log("connected");
+    $self->{connected} = 1;
+    
+    print { $self->{socket} } "PATH=/var/run/current-system/sw/bin:/var/run/current-system/sw/sbin:\$PATH\n";
+    print { $self->{socket} } "export GCOV_PREFIX=/tmp/coverage-data\n";
+    print { $self->{socket} } "cd /tmp\n";
+    # !!! Should make sure the commands above don't produce output, otherwise we're out of sync.
+}
+
+
+sub waitForShutdown {
+    my ($self) = @_;
+    return unless $self->{booted};
+    
+    waitpid $self->{pid}, 0;
+    $self->{pid} = 0;
+    $self->{booted} = 0;
+}
+
+
+sub execute {
+    my ($self, $command) = @_;
+    
+    $self->connect;
+
+    $self->log("running command: $command");
+
+    print { $self->{socket} } ("($command); echo '|!=EOF' \$?\n");
+
+    my $out = "";
+
+    while (1) {
+        my $line = readline($self->{socket}) or die "connection to VM lost unexpectedly";
+        #$self->log("got line: $line");
+        if ($line =~ /^(.*)\|\!\=EOF\s+(\d+)$/) {
+            $out .= $1;
+            $self->log("exit status $2");
+            return ($2, $out);
+        }
+        $out .= $line;
+    }
+}
+
+
+sub mustSucceed {
+    my ($self, $command) = @_;
+    my ($status, $out) = $self->execute($command);
+    if ($status != 0) {
+        $self->log("output: $out");
+        die "command `$command' did not succeed (exit code $status)";
+    }
+    return $out;
+}
+
+
+sub mustFail {
+    my ($self, $command) = @_;
+    my ($status, $out) = $self->execute($command);
+    die "command `$command' unexpectedly succeeded"
+        if $status == 0;
+}
+
+
+# Wait for an Upstart job to reach the "running" state.
+sub waitForJob {
+    my ($self, $jobName) = @_;
+    while (1) {
+        my ($status, $out) = $self->execute("initctl status $jobName");
+        return if $out =~ /\(start\)\s+running/;
+        sleep 1;
+        # !!! need a timeout
+    }
+}
+
+
+sub stopJob {
+    my ($self, $jobName) = @_;
+    $self->execute("initctl stop $jobName");
+    while (1) {
+        my ($status, $out) = $self->execute("initctl status $jobName");
+        return if $out =~ /\(stop\)\s+waiting/;
+        sleep 1;
+        # !!! need a timeout
+    }
+}
+
+
+# Wait until the machine is listening on the given TCP port.
+sub waitForOpenPort {
+    my ($self, $port) = @_;
+    while (1) {
+        my ($status, $out) = $self->execute("nc -z localhost $port");
+        return if $status == 0;
+        sleep 1;
+    }
+}
+
+
+# Wait until the machine is not listening on the given TCP port.
+sub waitForClosedPort {
+    my ($self, $port) = @_;
+    while (1) {
+        my ($status, $out) = $self->execute("nc -z localhost $port");
+        return if $status != 0;
+        sleep 1;
+    }
+}
+
+
+sub shutdown {
+    my ($self) = @_;
+    return unless $self->{booted};
+
+    $self->execute("poweroff -f &");
+
+    $self->waitForShutdown;
+}
+
+
+# Make the machine unreachable by shutting down eth1 (the multicast
+# interface used to talk to the other VMs).  We keep eth0 up so that
+# the test driver can continue to talk to the machine.
+sub block {
+    my ($self) = @_;
+    $self->mustSucceed("ifconfig eth1 down");
+}
+
+
+# Make the machine reachable.
+sub unblock {
+    my ($self) = @_;
+    $self->mustSucceed("ifconfig eth1 up");
+}
+
+
+1;
diff --git a/lib/test-driver/test-driver.pl b/lib/test-driver/test-driver.pl
new file mode 100644
index 00000000000..f76d01199a5
--- /dev/null
+++ b/lib/test-driver/test-driver.pl
@@ -0,0 +1,41 @@
+use strict;
+use Machine;
+
+$SIG{PIPE} = 'IGNORE'; # because Unix domain sockets may die unexpectedly
+
+my %vms;
+my $context = "";
+
+
+foreach my $vmScript (@ARGV) {
+    my $vm = Machine->new($vmScript);
+    $vms{$vm->name} = $vm;
+    $context .= "my \$" . $vm->name . " = \$vms{'" . $vm->name . "'}; ";
+}
+
+
+sub startAll {
+    $_->start foreach values %vms;
+}
+
+
+sub runTests {
+    eval "$context $ENV{tests}";
+    die $@ if $@;
+}
+
+
+END {
+    foreach my $vm (values %vms) {
+        if ($vm->{pid}) {
+            print STDERR "killing ", $vm->{name}, " (pid ", $vm->{pid}, ")\n";
+            kill 9, $vm->{pid};
+        }
+    }
+}
+
+
+runTests;
+
+
+print STDERR "DONE\n";
diff --git a/tests/subversion.nix b/tests/subversion.nix
new file mode 100644
index 00000000000..024d1fc3651
--- /dev/null
+++ b/tests/subversion.nix
@@ -0,0 +1,112 @@
+with import ../lib/build-vms.nix {};
+
+let
+
+  # Build some packages with coverage instrumentation.
+  overrides = pkgs:  
+    let
+      do = pkg: pkg.override (args: {
+        stdenv = pkgs.addCoverageInstrumentation args.stdenv;
+      });
+    in
+      rec {
+        apr = do pkgs.apr;
+        aprutil = do pkgs.aprutil;
+        apacheHttpd = do pkgs.apacheHttpd;
+        mod_python = do pkgs.mod_python;
+        subversion = do pkgs.subversion;
+      };
+
+in
+      
+rec {
+
+  nodes =
+    { webserver =
+        { config, pkgs, ... }:
+
+        {
+          services.httpd.enable = true;
+          services.httpd.adminAddr = "e.dolstra@tudelft.nl";
+          services.httpd.extraSubservices =
+            [ { serviceType = "subversion";
+                urlPrefix = "";
+                dataDir = "/data/subversion";
+                userCreationDomain = "192.168.0.0/16";
+              }
+            ];
+          nixpkgs.config.packageOverrides = overrides;
+        };
+
+      client =
+        { config, pkgs, ... }:
+
+        {
+          environment.systemPackages = [ pkgs.subversion ];
+          nixpkgs.config.packageOverrides = overrides;
+        };
+
+    };
+
+  vms = buildVirtualNetwork { inherit nodes; };
+
+  test = runTests vms
+    ''
+      startAll;
+
+      $webserver->waitForOpenPort(80);
+
+      my $out = $client->mustSucceed("svn --version");
+      print STDERR "GOT: $out";
+
+      my $out = $client->mustSucceed("curl --fail http://webserver/");
+      print STDERR "GOT: $out";
+
+      # Create a new user through the web interface.
+      $client->mustSucceed("curl --fail -F username=alice -F fullname='Alice Lastname' -F address=alice\@example.org -F password=foobar -F password_again=foobar http://webserver/repoman/adduser");
+
+      # Let Alice create a new repository.      
+      $client->mustSucceed("curl --fail -u alice:foobar --form repo=xyzzy --form description=Xyzzy http://webserver/repoman/create");
+
+      $client->mustSucceed("curl --fail http://webserver/") =~ /alice/ or die;
+      
+      # Let Alice do a checkout.
+      my $svnFlags = "--non-interactive --username alice --password foobar";
+      $client->mustSucceed("svn co $svnFlags http://webserver/repos/xyzzy wc");
+      $client->mustSucceed("echo hello > wc/world");
+      $client->mustSucceed("svn add wc/world");
+      $client->mustSucceed("svn ci $svnFlags -m 'Added world.' wc/world");
+
+      # Create a new user on the server through the create-user.pl script.
+      $webserver->execute("svn-server-create-user.pl bob bob\@example.org Bob");
+      $webserver->mustSucceed("svn-server-resetpw.pl bob fnord");
+      $client->mustSucceed("curl --fail http://webserver/") =~ /bob/ or die;
+
+      # Bob should not have access to the repo.
+      my $svnFlagsBob = "--non-interactive --username bob --password fnord";
+      $client->mustFail("svn co $svnFlagsBob http://webserver/repos/xyzzy wc2");
+
+      # Bob should not be able change the ACLs of the repo.
+      # !!! Repoman should really return a 403 here.
+      $client->execute("curl --fail -u bob:fnord -F description=Xyzzy -F readers=alice,bob -F writers=alice -F watchers= -F tardirs= http://webserver/repoman/update/xyzzy")
+          =~ /not authorised/ or die;
+      
+      # Give Bob access.
+      $client->mustSucceed("curl --fail -u alice:foobar -F description=Xyzzy -F readers=alice,bob -F writers=alice -F watchers= -F tardirs= http://webserver/repoman/update/xyzzy");
+      
+      # So now his checkout should succeed.
+      $client->mustSucceed("svn co $svnFlagsBob http://webserver/repos/xyzzy wc2");
+
+      # Test ViewVC and WebSVN
+      $client->mustSucceed("curl --fail -u alice:foobar http://webserver/viewvc/xyzzy");
+      $client->mustSucceed("curl --fail -u alice:foobar http://webserver/websvn/xyzzy");
+      $client->mustSucceed("curl --fail -u alice:foobar http://webserver/repos-xml/xyzzy");
+
+      # Stop Apache to gather all the coverage data.
+      $webserver->stopJob("httpd");
+      $webserver->execute("sleep 5"); # !!!
+    '';
+
+  report = makeReport test;
+    
+}
-- 
GitLab


From a2945a2eb211661a0aa99be666c50ba269e11cab Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 31 Aug 2009 14:26:31 +0000
Subject: [PATCH 1755/5331] svn path=/nixos/trunk/; revision=16900

---
 modules/services/web-servers/apache-httpd/default.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/modules/services/web-servers/apache-httpd/default.nix b/modules/services/web-servers/apache-httpd/default.nix
index 66019a9b00e..200d8cc576d 100644
--- a/modules/services/web-servers/apache-httpd/default.nix
+++ b/modules/services/web-servers/apache-httpd/default.nix
@@ -606,6 +606,9 @@ in
           in concatMapStrings f (concatMap (svc: svc.globalEnvVars) allSubservices)
         }
 
+        # !!! This should be added in test-instrumentation.nix.  It
+        # shouldn't hurt though, since packages usually aren't built
+        # with coverage enabled.
         env GCOV_PREFIX=/tmp/coverage-data
 
         env PATH=${pkgs.coreutils}/bin:${pkgs.gnugrep}/bin:${concatStringsSep ":" (concatMap (svc: svc.extraServerPath) allSubservices)}
-- 
GitLab


From 9359bf11d58f5a2803ce93ad69db2926fc986ddb Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 31 Aug 2009 14:56:19 +0000
Subject: [PATCH 1756/5331] * Build the Subversion test in Hydra (as a
 regression test for NixOS). * Pass the location to the services tree around
 instead of requiring   it to be in ../services.

svn path=/nixos/trunk/; revision=16901
---
 lib/build-vms.nix                                    |  8 ++++++--
 lib/eval-config.nix                                  |  4 +++-
 .../services/web-servers/apache-httpd/default.nix    |  4 ++--
 .../services/web-servers/apache-httpd/subversion.nix | 12 ++++++------
 .../web-servers/apache-httpd/tomcat-connector.nix    |  2 +-
 modules/services/web-servers/apache-httpd/trac.nix   |  2 +-
 modules/services/web-servers/apache-httpd/twiki.nix  |  2 +-
 modules/services/web-servers/apache-httpd/zabbix.nix |  2 +-
 release.nix                                          |  8 ++++++++
 tests/subversion.nix                                 |  7 ++++++-
 10 files changed, 35 insertions(+), 16 deletions(-)

diff --git a/lib/build-vms.nix b/lib/build-vms.nix
index 7032489253b..8a51a23bc4c 100644
--- a/lib/build-vms.nix
+++ b/lib/build-vms.nix
@@ -1,5 +1,6 @@
-{ nixos ? /etc/nixos/nixos
+{ nixos ? ./..
 , nixpkgs ? /etc/nixos/nixpkgs
+, services ? /etc/nixos/services
 }:
 
 let pkgs = import nixpkgs { config = {}; }; in
@@ -54,7 +55,7 @@ rec {
     nodes: configuration:
 
     import "${nixos}/lib/eval-config.nix" {
-      inherit nixpkgs;
+      inherit nixpkgs services;
       modules = [ configuration ];
       extraArgs = { inherit nodes; };
       /* !!! bug in the module/option handling: this ignores the
@@ -175,6 +176,9 @@ rec {
       echo "making report..."
       ensureDir $out/coverage
       ${pkgs.lcov}/bin/genhtml --show-details $TMPDIR/out.info -o $out/coverage
+
+      ensureDir $out/nix-support
+      echo "report coverage $out/coverage" >> $out/nix-support/hydra-build-products
     ''; # */
     
 }
diff --git a/lib/eval-config.nix b/lib/eval-config.nix
index dd23867ef0d..2eb0435d24d 100644
--- a/lib/eval-config.nix
+++ b/lib/eval-config.nix
@@ -4,6 +4,7 @@
 
 { system ? builtins.currentSystem
 , nixpkgs ? import ./from-env.nix "NIXPKGS" /etc/nixos/nixpkgs
+, services ? /etc/nixos/services
 , pkgs ? null
 , baseModules ? import ../modules/module-list.nix
 , extraArgs ? {}
@@ -28,6 +29,7 @@ rec {
   extraArgs = extraArgs_ // {
     inherit pkgs optionDeclarations;
     modulesPath = ../modules;
+    servicesPath = services;
   };
 
   # Import Nixpkgs, allowing the NixOS option nixpkgs.config to
@@ -46,7 +48,7 @@ rec {
       inherit system;
       config =
         (import ./eval-config.nix {
-          inherit system nixpkgs extraArgs modules;
+          inherit system nixpkgs services extraArgs modules;
           # For efficiency, leave out most NixOS modules; they don't
           # define nixpkgs.config, so it's pointless to evaluate them.
           baseModules = [ ../modules/misc/nixpkgs.nix ];
diff --git a/modules/services/web-servers/apache-httpd/default.nix b/modules/services/web-servers/apache-httpd/default.nix
index 200d8cc576d..57d32209d26 100644
--- a/modules/services/web-servers/apache-httpd/default.nix
+++ b/modules/services/web-servers/apache-httpd/default.nix
@@ -1,4 +1,4 @@
-{pkgs, config, ...}:
+{ config, pkgs, servicesPath, ... }:
 
 with pkgs.lib;
 
@@ -70,7 +70,7 @@ let
           startupScript = "";
           options = {};
         };
-        res = defaults // svcFunction {inherit config pkgs serverInfo;};
+        res = defaults // svcFunction {inherit config pkgs serverInfo servicesPath;};
       in res;
     in map f defs;
 
diff --git a/modules/services/web-servers/apache-httpd/subversion.nix b/modules/services/web-servers/apache-httpd/subversion.nix
index 5996acd69fa..d22b2b580d4 100644
--- a/modules/services/web-servers/apache-httpd/subversion.nix
+++ b/modules/services/web-servers/apache-httpd/subversion.nix
@@ -1,4 +1,4 @@
-{config, pkgs, serverInfo}:
+{ config, pkgs, serverInfo, servicesPath, ... }:
 
 let
 
@@ -31,7 +31,7 @@ let
   # Build the maintenance scripts and commit hooks.
   scripts = substituteInAll {
     name = "svn-server-scripts";
-    src = pkgs.lib.cleanSource ../../../../services/subversion/src/scripts;
+    src = pkgs.lib.cleanSource "${servicesPath}/subversion/src/scripts";
 
     # The variables to substitute:
     
@@ -75,7 +75,7 @@ let
 
   
   # Build our custom authentication modules.
-  authModules = import ../../../../services/subversion/src/auth {
+  authModules = import "${servicesPath}/subversion/src/auth" {
     inherit (pkgs) stdenv apacheHttpd;
   };
 
@@ -115,7 +115,7 @@ let
 
 
   # Build ViewVC.
-  viewvc = import ../../../../services/subversion/src/viewvc {
+  viewvc = import "${servicesPath}/subversion/src/viewvc" {
     inherit (pkgs) fetchurl stdenv python enscript;
     inherit urlPrefix reposDir adminAddr subversion;
   };
@@ -149,7 +149,7 @@ let
 
 
   # Build WebSVN.
-  websvn = import ../../../../services/subversion/src/websvn {
+  websvn = import "${servicesPath}/subversion/src/websvn" {
     inherit (pkgs) fetchurl stdenv writeText enscript gnused diffutils;
     inherit urlPrefix reposDir subversion;
     cacheDir = tmpDir;
@@ -232,7 +232,7 @@ let
 
   staticFiles = substituteInSome {
     name = "svn-static-files";
-    src = pkgs.lib.cleanSource ../../../../services/subversion/root;
+    src = pkgs.lib.cleanSource "${servicesPath}/subversion/root";
     files = ["xsl/svnindex.xsl"];
     inherit urlPrefix;
   };
diff --git a/modules/services/web-servers/apache-httpd/tomcat-connector.nix b/modules/services/web-servers/apache-httpd/tomcat-connector.nix
index f7662c9513f..00cca42c6e0 100644
--- a/modules/services/web-servers/apache-httpd/tomcat-connector.nix
+++ b/modules/services/web-servers/apache-httpd/tomcat-connector.nix
@@ -1,4 +1,4 @@
-{config, pkgs, serverInfo}:
+{ config, pkgs, serverInfo, ... }:
 
 let
   workersProperties = pkgs.writeText "workers.properties" ''
diff --git a/modules/services/web-servers/apache-httpd/trac.nix b/modules/services/web-servers/apache-httpd/trac.nix
index b50cd2aff7e..ab27b385cb4 100644
--- a/modules/services/web-servers/apache-httpd/trac.nix
+++ b/modules/services/web-servers/apache-httpd/trac.nix
@@ -1,4 +1,4 @@
-{config, pkgs, serverInfo}:
+{ config, pkgs, serverInfo, ... }:
 
 let
   inherit (pkgs.lib) mkOption;
diff --git a/modules/services/web-servers/apache-httpd/twiki.nix b/modules/services/web-servers/apache-httpd/twiki.nix
index 7e524144e64..e55197ade67 100644
--- a/modules/services/web-servers/apache-httpd/twiki.nix
+++ b/modules/services/web-servers/apache-httpd/twiki.nix
@@ -1,4 +1,4 @@
-{config, pkgs, serverInfo}:
+{ config, pkgs, serverInfo, ... }:
 
 let
 
diff --git a/modules/services/web-servers/apache-httpd/zabbix.nix b/modules/services/web-servers/apache-httpd/zabbix.nix
index de597f6c4da..2d9a80f69ed 100644
--- a/modules/services/web-servers/apache-httpd/zabbix.nix
+++ b/modules/services/web-servers/apache-httpd/zabbix.nix
@@ -1,4 +1,4 @@
-{config, pkgs, serverInfo}:
+{ config, pkgs, serverInfo, ... }:
 
 let
 
diff --git a/release.nix b/release.nix
index abf1ed95669..f2dd8e8bcbe 100644
--- a/release.nix
+++ b/release.nix
@@ -96,6 +96,14 @@ let
       module = ./modules/installer/cd-dvd/installation-cd-graphical.nix;
       description = "graphical";
     };
+
+
+    tests.subversion =
+      { services ? ../services }:
+
+      (import ./tests/subversion.nix {
+        inherit nixpkgs services;
+      }).report;
     
 
   };
diff --git a/tests/subversion.nix b/tests/subversion.nix
index 024d1fc3651..c55c3b5ea2c 100644
--- a/tests/subversion.nix
+++ b/tests/subversion.nix
@@ -1,4 +1,9 @@
-with import ../lib/build-vms.nix {};
+{ nixos ? ./..
+, nixpkgs ? /etc/nixos/nixpkgs
+, services ? /etc/nixos/services
+}:
+
+with import ../lib/build-vms.nix { inherit nixos nixpkgs services; };
 
 let
 
-- 
GitLab


From 2c5599f59ba7f05b528cb4c7731fe3dd493ebe6a Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 31 Aug 2009 15:12:42 +0000
Subject: [PATCH 1757/5331] * Urgh, cleanSource doesn't work on paths in the
 store.  Looks like a   bug.

svn path=/nixos/trunk/; revision=16905
---
 modules/services/web-servers/apache-httpd/subversion.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/services/web-servers/apache-httpd/subversion.nix b/modules/services/web-servers/apache-httpd/subversion.nix
index d22b2b580d4..d9febdf44c0 100644
--- a/modules/services/web-servers/apache-httpd/subversion.nix
+++ b/modules/services/web-servers/apache-httpd/subversion.nix
@@ -31,7 +31,7 @@ let
   # Build the maintenance scripts and commit hooks.
   scripts = substituteInAll {
     name = "svn-server-scripts";
-    src = pkgs.lib.cleanSource "${servicesPath}/subversion/src/scripts";
+    src = /* pkgs.lib.cleanSource */ "${servicesPath}/subversion/src/scripts";
 
     # The variables to substitute:
     
@@ -232,7 +232,7 @@ let
 
   staticFiles = substituteInSome {
     name = "svn-static-files";
-    src = pkgs.lib.cleanSource "${servicesPath}/subversion/root";
+    src = /* pkgs.lib.cleanSource */ "${servicesPath}/subversion/root";
     files = ["xsl/svnindex.xsl"];
     inherit urlPrefix;
   };
-- 
GitLab


From 4d8d704fbab1a2f3a3487358789e519b410b0bf7 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 1 Sep 2009 22:22:45 +0000
Subject: [PATCH 1758/5331] * Run the subversion.nix test with coverage
 analysis on the kernel.

svn path=/nixos/trunk/; revision=16917
---
 lib/build-vms.nix          |  9 ++++-----
 lib/test-driver/Machine.pm |  8 +++++++-
 tests/subversion.nix       | 30 +++++++++++++++++++++++++++++-
 3 files changed, 40 insertions(+), 7 deletions(-)

diff --git a/lib/build-vms.nix b/lib/build-vms.nix
index 8a51a23bc4c..ceb38b4b5cf 100644
--- a/lib/build-vms.nix
+++ b/lib/build-vms.nix
@@ -130,6 +130,7 @@ rec {
           mkdir $out
           cp ${./test-driver/Machine.pm} Machine.pm
           ${perl}/bin/perl ${./test-driver/test-driver.pl} ${network}/vms/*/bin/run-*-vm
+          find .
           for i in */coverage-data; do
             ensureDir $out/coverage-data
             mv $i $out/coverage-data/$(dirname $i)
@@ -152,7 +153,7 @@ rec {
               if ! test -e $TMPDIR/gcov/nix/store/$i; then
                   echo "copying $i"
                   mkdir -p $TMPDIR/gcov/$(echo $i | cut -c34-)
-                  rsync -rv /nix/store/$i/.coverage/ $TMPDIR/gcov/$(echo $i | cut -c34-)
+                  rsync -rv /nix/store/$i/.build/ $TMPDIR/gcov/$(echo $i | cut -c34-)
               fi
           done
 
@@ -161,7 +162,7 @@ rec {
           find $TMPDIR/gcov -name "*.gcda" -exec rm {} \;
 
           for i in $(cd $d/nix/store && ls); do
-              rsync -rv $d/nix/store/$i/.coverage/ $TMPDIR/gcov/$(echo $i | cut -c34-)
+              rsync -rv $d/nix/store/$i/.build/ $TMPDIR/gcov/$(echo $i | cut -c34-)
           done
 
           find $TMPDIR/gcov -name "*.gcda" -exec chmod 644 {} \;
@@ -171,11 +172,9 @@ rec {
           cat $TMPDIR/app.info >> $TMPDIR/full.info
       done
             
-      ${pkgs.lcov}/bin/lcov --remove $TMPDIR/full.info "/nix/store/*" > $TMPDIR/out.info
-      
       echo "making report..."
       ensureDir $out/coverage
-      ${pkgs.lcov}/bin/genhtml --show-details $TMPDIR/out.info -o $out/coverage
+      ${pkgs.lcov}/bin/genhtml --show-details $TMPDIR/full.info -o $out/coverage
 
       ensureDir $out/nix-support
       echo "report coverage $out/coverage" >> $out/nix-support/hydra-build-products
diff --git a/lib/test-driver/Machine.pm b/lib/test-driver/Machine.pm
index b30cd501a8d..65797604735 100644
--- a/lib/test-driver/Machine.pm
+++ b/lib/test-driver/Machine.pm
@@ -50,6 +50,12 @@ sub name {
 }
 
 
+sub stateDir {
+    my ($self) = @_;
+    return $self->{stateDir};
+}
+
+
 sub start {
     my ($self) = @_;
     return if $self->{booted};
@@ -131,7 +137,7 @@ sub execute {
 
     $self->log("running command: $command");
 
-    print { $self->{socket} } ("($command); echo '|!=EOF' \$?\n");
+    print { $self->{socket} } ("( $command ); echo '|!=EOF' \$?\n");
 
     my $out = "";
 
diff --git a/tests/subversion.nix b/tests/subversion.nix
index c55c3b5ea2c..481ab12a4ab 100644
--- a/tests/subversion.nix
+++ b/tests/subversion.nix
@@ -20,6 +20,26 @@ let
         apacheHttpd = do pkgs.apacheHttpd;
         mod_python = do pkgs.mod_python;
         subversion = do pkgs.subversion;
+
+        # To build the kernel with coverage instrumentation, we need a
+        # special patch to make coverage data available under /proc.
+        kernel_2_6_28 = pkgs.kernel_2_6_28.override (orig: {
+          stdenv = pkgs.keepBuildTree orig.stdenv;
+          kernelPatches = orig.kernelPatches ++ pkgs.lib.singleton
+            { name = "gcov";
+              patch = pkgs.fetchurl {
+                url = http://buildfarm.st.ewi.tudelft.nl/~eelco/dist/linux-2.6.28-gcov.patch;
+                sha256 = "0ck9misa3pgh3vzyb7714ibf7ix7piyg5dvfa9r42v15scjqiyny";
+              };
+              extraConfig =
+                ''
+                  CONFIG_GCOV_PROFILE=y
+                  CONFIG_GCOV_ALL=y
+                  CONFIG_GCOV_PROC=m
+                  CONFIG_GCOV_HAMMER=n
+                '';
+            };
+        });
       };
 
 in
@@ -31,6 +51,7 @@ rec {
         { config, pkgs, ... }:
 
         {
+          boot.kernelModules = [ "gcov-proc" ];
           services.httpd.enable = true;
           services.httpd.adminAddr = "e.dolstra@tudelft.nl";
           services.httpd.extraSubservices =
@@ -109,7 +130,14 @@ rec {
 
       # Stop Apache to gather all the coverage data.
       $webserver->stopJob("httpd");
-      $webserver->execute("sleep 5"); # !!!
+      $webserver->execute("sleep 10"); # !!!
+
+      # !!! move this to build-vms.nix
+      my $kernelDir = $webserver->mustSucceed("echo \$(dirname \$(readlink -f /var/run/current-system/kernel))/.build/linux-*");
+      chomp $kernelDir;
+      my $coverageDir = "/hostfs" . $webserver->stateDir() . "/coverage-data/$kernelDir";
+      $webserver->execute("for i in \$(cd /proc/gcov && find -name module -prune -o -name '*.gcda'); do echo \$i; mkdir -p $coverageDir/\$(dirname \$i); cp -v /proc/gcov/\$i $coverageDir/\$i; done");
+      $webserver->execute("for i in \$(cd /proc/gcov/module/nix/store/*/.build/* && find -name module -prune -o -name '*.gcda'); do mkdir -p $coverageDir/\$(dirname \$i); cp /proc/gcov/module/nix/store/*/.build/*/\$i $coverageDir/\$i; done");
     '';
 
   report = makeReport test;
-- 
GitLab


From e7acca2ba3c44d5d2ab3154fb04ce8a0b9d14801 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 1 Sep 2009 22:50:46 +0000
Subject: [PATCH 1759/5331] * Cleanup the kernel coverage analysis.

svn path=/nixos/trunk/; revision=16919
---
 lib/test-driver/test-driver.pl           | 21 +++++++++++++++++++++
 modules/testing/test-instrumentation.nix |  5 +++++
 tests/subversion.nix                     |  8 --------
 3 files changed, 26 insertions(+), 8 deletions(-)

diff --git a/lib/test-driver/test-driver.pl b/lib/test-driver/test-driver.pl
index f76d01199a5..739753baeb1 100644
--- a/lib/test-driver/test-driver.pl
+++ b/lib/test-driver/test-driver.pl
@@ -22,6 +22,27 @@ sub startAll {
 sub runTests {
     eval "$context $ENV{tests}";
     die $@ if $@;
+
+    # Copy the kernel coverage data for each machine, if the kernel
+    # has been compiled with coverage instrumentation.
+    foreach my $vm (values %vms) {
+        my ($status, $out) = $vm->execute("test -e /proc/gcov");
+        next if $status != 0;
+
+        # Figure out where to put the *.gcda files so that the report
+        # generator can find the corresponding kernel sources.
+        my $kernelDir = $vm->mustSucceed("echo \$(dirname \$(readlink -f /var/run/current-system/kernel))/.build/linux-*");
+        chomp $kernelDir;
+        my $coverageDir = "/hostfs" . $vm->stateDir() . "/coverage-data/$kernelDir";
+
+        # Copy all the *.gcda files.  The ones under
+        # /proc/gcov/module/nix/store are the kernel modules in the
+        # initrd to which we have applied nuke-refs in
+        # makeModuleClosure.  This confuses the gcov module a bit.
+        $vm->execute("for i in \$(cd /proc/gcov && find -name module -prune -o -name '*.gcda'); do echo \$i; mkdir -p $coverageDir/\$(dirname \$i); cp -v /proc/gcov/\$i $coverageDir/\$i; done");
+
+        $vm->execute("for i in \$(cd /proc/gcov/module/nix/store/*/.build/* && find -name module -prune -o -name '*.gcda'); do mkdir -p $coverageDir/\$(dirname \$i); cp /proc/gcov/module/nix/store/*/.build/*/\$i $coverageDir/\$i; done");
+    }
 }
 
 
diff --git a/modules/testing/test-instrumentation.nix b/modules/testing/test-instrumentation.nix
index b64dc70ab30..85f892e887f 100644
--- a/modules/testing/test-instrumentation.nix
+++ b/modules/testing/test-instrumentation.nix
@@ -31,6 +31,11 @@ with pkgs.lib;
           ln -s /hostfs/$hostTmpDir/coverage-data /tmp/coverage-data
         )
       '';
+
+    # If the kernel has been built with coverage instrumentation, make
+    # it available under /proc/gcov.
+    boot.kernelModules = [ "gcov-proc" ];
+      
   };
 
 }
diff --git a/tests/subversion.nix b/tests/subversion.nix
index 481ab12a4ab..5c26c9cd802 100644
--- a/tests/subversion.nix
+++ b/tests/subversion.nix
@@ -51,7 +51,6 @@ rec {
         { config, pkgs, ... }:
 
         {
-          boot.kernelModules = [ "gcov-proc" ];
           services.httpd.enable = true;
           services.httpd.adminAddr = "e.dolstra@tudelft.nl";
           services.httpd.extraSubservices =
@@ -131,13 +130,6 @@ rec {
       # Stop Apache to gather all the coverage data.
       $webserver->stopJob("httpd");
       $webserver->execute("sleep 10"); # !!!
-
-      # !!! move this to build-vms.nix
-      my $kernelDir = $webserver->mustSucceed("echo \$(dirname \$(readlink -f /var/run/current-system/kernel))/.build/linux-*");
-      chomp $kernelDir;
-      my $coverageDir = "/hostfs" . $webserver->stateDir() . "/coverage-data/$kernelDir";
-      $webserver->execute("for i in \$(cd /proc/gcov && find -name module -prune -o -name '*.gcda'); do echo \$i; mkdir -p $coverageDir/\$(dirname \$i); cp -v /proc/gcov/\$i $coverageDir/\$i; done");
-      $webserver->execute("for i in \$(cd /proc/gcov/module/nix/store/*/.build/* && find -name module -prune -o -name '*.gcda'); do mkdir -p $coverageDir/\$(dirname \$i); cp /proc/gcov/module/nix/store/*/.build/*/\$i $coverageDir/\$i; done");
     '';
 
   report = makeReport test;
-- 
GitLab


From 37134cf3af96ac132fa610570e10a68c16f7aeb1 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 2 Sep 2009 06:45:50 +0000
Subject: [PATCH 1760/5331] svn path=/nixos/trunk/; revision=16921

---
 tests/subversion.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/subversion.nix b/tests/subversion.nix
index 5c26c9cd802..e6f438b01f4 100644
--- a/tests/subversion.nix
+++ b/tests/subversion.nix
@@ -24,7 +24,7 @@ let
         # To build the kernel with coverage instrumentation, we need a
         # special patch to make coverage data available under /proc.
         kernel_2_6_28 = pkgs.kernel_2_6_28.override (orig: {
-          stdenv = pkgs.keepBuildTree orig.stdenv;
+          stdenv = pkgs.cleanupBuildTree (pkgs.keepBuildTree orig.stdenv);
           kernelPatches = orig.kernelPatches ++ pkgs.lib.singleton
             { name = "gcov";
               patch = pkgs.fetchurl {
-- 
GitLab


From b1aa227cbdca8c7c17e622c8cdf89949e06e66f4 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 2 Sep 2009 07:52:36 +0000
Subject: [PATCH 1761/5331] * Use -no-reboot, otherwise kernel panics cause
 QEMU to get into an   infinite loop trying to start the machine.

svn path=/nixos/trunk/; revision=16922
---
 lib/build-vms.nix          | 2 +-
 lib/test-driver/Machine.pm | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/build-vms.nix b/lib/build-vms.nix
index ceb38b4b5cf..939c1ecc51c 100644
--- a/lib/build-vms.nix
+++ b/lib/build-vms.nix
@@ -130,7 +130,6 @@ rec {
           mkdir $out
           cp ${./test-driver/Machine.pm} Machine.pm
           ${perl}/bin/perl ${./test-driver/test-driver.pl} ${network}/vms/*/bin/run-*-vm
-          find .
           for i in */coverage-data; do
             ensureDir $out/coverage-data
             mv $i $out/coverage-data/$(dirname $i)
@@ -175,6 +174,7 @@ rec {
       echo "making report..."
       ensureDir $out/coverage
       ${pkgs.lcov}/bin/genhtml --show-details $TMPDIR/full.info -o $out/coverage
+      cp $TMPDIR/full.info $out/coverage/
 
       ensureDir $out/nix-support
       echo "report coverage $out/coverage" >> $out/nix-support/hydra-build-products
diff --git a/lib/test-driver/Machine.pm b/lib/test-driver/Machine.pm
index 65797604735..0573293c2af 100644
--- a/lib/test-driver/Machine.pm
+++ b/lib/test-driver/Machine.pm
@@ -71,7 +71,7 @@ sub start {
         dup2(fileno(LOG), fileno(STDOUT));
         dup2(fileno(LOG), fileno(STDERR));
         $ENV{TMPDIR} = $self->{stateDir};
-        $ENV{QEMU_OPTS} = "-nographic -redir tcp:65535::514 -net nic,vlan=1 -net socket,vlan=1,mcast=$mcastAddr";
+        $ENV{QEMU_OPTS} = "-nographic -no-reboot -redir tcp:65535::514 -net nic,vlan=1 -net socket,vlan=1,mcast=$mcastAddr";
         $ENV{QEMU_KERNEL_PARAMS} = "console=ttyS0 panic=1 hostTmpDir=$ENV{TMPDIR}";
         chdir $self->{stateDir} or die;
         exec $self->{script};
-- 
GitLab


From 137c5c65bd3f10f7ccb41e2b0cda52f467944780 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 2 Sep 2009 08:36:30 +0000
Subject: [PATCH 1762/5331] * Added a timeout for starting the VM.  TODO:
 handle SIGCHLD from   qemu. * Do the subversion test on i686-linux.

svn path=/nixos/trunk/; revision=16923
---
 lib/build-vms.nix          | 3 ++-
 lib/test-driver/Machine.pm | 2 ++
 release.nix                | 1 +
 tests/subversion.nix       | 1 +
 4 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/lib/build-vms.nix b/lib/build-vms.nix
index 939c1ecc51c..39ae9b77cf3 100644
--- a/lib/build-vms.nix
+++ b/lib/build-vms.nix
@@ -1,6 +1,7 @@
 { nixos ? ./..
 , nixpkgs ? /etc/nixos/nixpkgs
 , services ? /etc/nixos/services
+, system ? builtins.currentSystem
 }:
 
 let pkgs = import nixpkgs { config = {}; }; in
@@ -55,7 +56,7 @@ rec {
     nodes: configuration:
 
     import "${nixos}/lib/eval-config.nix" {
-      inherit nixpkgs services;
+      inherit nixpkgs services system;
       modules = [ configuration ];
       extraArgs = { inherit nodes; };
       /* !!! bug in the module/option handling: this ignores the
diff --git a/lib/test-driver/Machine.pm b/lib/test-driver/Machine.pm
index 0573293c2af..7b97ff1a65d 100644
--- a/lib/test-driver/Machine.pm
+++ b/lib/test-driver/Machine.pm
@@ -90,9 +90,11 @@ sub connect {
 
     $self->start;
 
+    my $try = 0;
     while (1) {
         last if -e ($self->{stateDir} . "/running");
         sleep 1;
+        die ("VM " . $self->{name} . " timed out") if $try++ > 180;
     }
 
     while (1) {
diff --git a/release.nix b/release.nix
index f2dd8e8bcbe..4dbf798ec0c 100644
--- a/release.nix
+++ b/release.nix
@@ -103,6 +103,7 @@ let
 
       (import ./tests/subversion.nix {
         inherit nixpkgs services;
+        system = "i686-linux";
       }).report;
     
 
diff --git a/tests/subversion.nix b/tests/subversion.nix
index e6f438b01f4..c9556137305 100644
--- a/tests/subversion.nix
+++ b/tests/subversion.nix
@@ -1,6 +1,7 @@
 { nixos ? ./..
 , nixpkgs ? /etc/nixos/nixpkgs
 , services ? /etc/nixos/services
+, system ? builtins.currentSystem
 }:
 
 with import ../lib/build-vms.nix { inherit nixos nixpkgs services; };
-- 
GitLab


From 0ca8c84618be1d39a60befdab88efc65193ed13c Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 2 Sep 2009 08:42:43 +0000
Subject: [PATCH 1763/5331] svn path=/nixos/trunk/; revision=16924

---
 tests/subversion.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/subversion.nix b/tests/subversion.nix
index c9556137305..82ada4576eb 100644
--- a/tests/subversion.nix
+++ b/tests/subversion.nix
@@ -4,7 +4,7 @@
 , system ? builtins.currentSystem
 }:
 
-with import ../lib/build-vms.nix { inherit nixos nixpkgs services; };
+with import ../lib/build-vms.nix { inherit nixos nixpkgs services system; };
 
 let
 
-- 
GitLab


From 486714bfcc941df3e0cc70d4b5db5f70bdd34ccf Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 2 Sep 2009 09:38:16 +0000
Subject: [PATCH 1764/5331] * Make the coverage report more concise.

svn path=/nixos/trunk/; revision=16926
---
 lib/build-vms.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/build-vms.nix b/lib/build-vms.nix
index 39ae9b77cf3..97c9a040c63 100644
--- a/lib/build-vms.nix
+++ b/lib/build-vms.nix
@@ -153,7 +153,7 @@ rec {
               if ! test -e $TMPDIR/gcov/nix/store/$i; then
                   echo "copying $i"
                   mkdir -p $TMPDIR/gcov/$(echo $i | cut -c34-)
-                  rsync -rv /nix/store/$i/.build/ $TMPDIR/gcov/$(echo $i | cut -c34-)
+                  rsync -rv /nix/store/$i/.build/* $TMPDIR/gcov/
               fi
           done
 
@@ -162,7 +162,7 @@ rec {
           find $TMPDIR/gcov -name "*.gcda" -exec rm {} \;
 
           for i in $(cd $d/nix/store && ls); do
-              rsync -rv $d/nix/store/$i/.build/ $TMPDIR/gcov/$(echo $i | cut -c34-)
+              rsync -rv $d/nix/store/$i/.build/* $TMPDIR/gcov/
           done
 
           find $TMPDIR/gcov -name "*.gcda" -exec chmod 644 {} \;
-- 
GitLab


From 484580dbbdddc65a3bc64372521e1327bbc4f8e6 Mon Sep 17 00:00:00 2001
From: Sander van der Burg <s.vanderburg@tudelft.nl>
Date: Wed, 2 Sep 2009 10:27:44 +0000
Subject: [PATCH 1765/5331] Updated disnix service to work with latest revision

svn path=/nixos/trunk/; revision=16929
---
 modules/services/misc/disnix.nix | 28 +++++++++++++---------------
 1 file changed, 13 insertions(+), 15 deletions(-)

diff --git a/modules/services/misc/disnix.nix b/modules/services/misc/disnix.nix
index 8e96b6f2130..a4568ec78a8 100644
--- a/modules/services/misc/disnix.nix
+++ b/modules/services/misc/disnix.nix
@@ -4,24 +4,14 @@
 ###### interface
 let
   inherit (pkgs.lib) mkOption;
-
+  
   options = {
     services = {
       disnix = {
         enable = mkOption {
           default = false;
           description = "Whether to enable Disnix";
-        };
-        
-        activateHook = mkOption {
-          default = "";
-          description = "Custom script or executable that activates services through Disnix";
-        };
-
-        deactivateHook = mkOption {
-          default = "";
-          description = "Custom script or executable that deactivates services through Disnix";
-        };
+        };        
       };
     };
   };
@@ -40,8 +30,14 @@ let
 
       start on dbus
       stop on shutdown  
-          
-      respawn ${pkgs.bash}/bin/sh -c 'export PATH=/var/run/current-system/sw/bin:$PATH; export HOME=/root; export DISNIX_ACTIVATE_HOOK=${cfg.activateHook}; export DISNIX_DEACTIVATE_HOOK=${cfg.deactivateHook}; ${pkgs.disnix}/bin/disnix-service'
+    
+      script
+        export ACTIVATION_SCRIPTS=${pkgs.disnix_activation_scripts}/libexec/disnix/activation-scripts
+        export PATH=${pkgs.nixUnstable}/bin
+        export HOME=/root
+	
+        ${pkgs.disnix}/bin/disnix-service
+      end script
     '';
   };
 in
@@ -52,13 +48,15 @@ mkIf cfg.enable {
     #../upstart-jobs/dbus.nix # services.dbus.*
     options
   ];
+  
+  environment.systemPackages = [ pkgs.disnix ];
 
   services = {
     extraJobs = [job];
 
     dbus = {
       enable = true;
-      packages = [pkgs.disnix];
+      packages = [ pkgs.disnix ];
     };
   };
 }
-- 
GitLab


From cddc93cc5e3fcb6ae88e816dbed05ae56d7f8c81 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 2 Sep 2009 14:48:28 +0000
Subject: [PATCH 1766/5331] * Start of a simple GUI test.  Right now it just
 starts the X server,   wait a few seconds and makes a screenshot.

svn path=/nixos/trunk/; revision=16934
---
 lib/test-driver/Machine.pm | 12 +++++++++++
 tests/kde4.nix             | 44 ++++++++++++++++++++++++++++++++++++++
 2 files changed, 56 insertions(+)
 create mode 100644 tests/kde4.nix

diff --git a/lib/test-driver/Machine.pm b/lib/test-driver/Machine.pm
index 7b97ff1a65d..590ad21d09b 100644
--- a/lib/test-driver/Machine.pm
+++ b/lib/test-driver/Machine.pm
@@ -187,6 +187,18 @@ sub waitForJob {
 }
 
 
+# Wait until the specified file exists.
+sub waitForFile {
+    my ($self, $fileName) = @_;
+    while (1) {
+        my ($status, $out) = $self->execute("test -e $fileName");
+        return if $status == 0;
+        sleep 1;
+        # !!! need a timeout
+    }
+}
+
+
 sub stopJob {
     my ($self, $jobName) = @_;
     $self->execute("initctl stop $jobName");
diff --git a/tests/kde4.nix b/tests/kde4.nix
new file mode 100644
index 00000000000..99761cbc8ba
--- /dev/null
+++ b/tests/kde4.nix
@@ -0,0 +1,44 @@
+{ nixos ? ./..
+, nixpkgs ? /etc/nixos/nixpkgs
+, services ? /etc/nixos/services
+, system ? builtins.currentSystem
+}:
+
+with import ../lib/build-vms.nix { inherit nixos nixpkgs services system; };
+
+rec {
+
+  nodes =
+    { client =
+        { config, pkgs, ... }:
+
+        { services.xserver.enable = true;
+          services.xserver.desktopManager.default = "kde4";
+          services.xserver.desktopManager.kde4.enable = true;
+
+          users.extraUsers = pkgs.lib.singleton
+            { name = "alice";
+              description = "Alice Foobar";
+              home = "/home/alice";
+              createHome = true;
+              useDefaultShell = true;
+            };
+
+          environment.systemPackages = [ pkgs.xorg.xclock pkgs.xorg.xwd ];
+        };
+    };
+
+  vms = buildVirtualNetwork { inherit nodes; };
+
+  test = runTests vms
+    ''
+      startAll;
+
+      $client->waitForFile("/tmp/.X11-unix/X0");
+
+      sleep 20;
+
+      print STDERR $client->execute("DISPLAY=:0.0 xwd -root > /hostfs/$ENV{out}/screen.xwd");
+    '';
+  
+}
-- 
GitLab


From a186b5e4b462628e24941874aafa93a936ac3c2b Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 2 Sep 2009 17:00:25 +0000
Subject: [PATCH 1767/5331] * Fix kdm logins.  Doh!

svn path=/nixos/trunk/; revision=16936
---
 modules/services/x11/xserver/display-managers/kdm.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/services/x11/xserver/display-managers/kdm.nix b/modules/services/x11/xserver/display-managers/kdm.nix
index e7f22cf1f34..86340c3cd6d 100644
--- a/modules/services/x11/xserver/display-managers/kdm.nix
+++ b/modules/services/x11/xserver/display-managers/kdm.nix
@@ -58,7 +58,7 @@ in
         execCmd = "${kdebase_workspace}/bin/kdm -config ${kdmrc}/kdmrc";
       };
 
-    security.pam.services = [ { name = "slim"; localLogin = true; } ];
+    security.pam.services = [ { name = "kde"; localLogin = true; } ];
       
   };
   
-- 
GitLab


From 331bee12a4753e5a82216d52683deae4227b9dab Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 2 Sep 2009 17:35:24 +0000
Subject: [PATCH 1768/5331] * Fold the functionality of guest-users.nix into
 users-groups.nix by   adding an attribute "password" that defines the default
 password for   an account.  The default (null, as opposed to the empty
 string)   means not to set a password.

svn path=/nixos/trunk/; revision=16937
---
 modules/config/guest-users.nix  |  73 -------------------
 modules/config/users-groups.nix | 125 ++++++++++++++++----------------
 modules/module-list.nix         |   1 -
 3 files changed, 63 insertions(+), 136 deletions(-)
 delete mode 100644 modules/config/guest-users.nix

diff --git a/modules/config/guest-users.nix b/modules/config/guest-users.nix
deleted file mode 100644
index ca5bfd6f7f3..00000000000
--- a/modules/config/guest-users.nix
+++ /dev/null
@@ -1,73 +0,0 @@
-{pkgs, config, ...}:
-
-let
-  inherit (pkgs.lib) mkOption;
-
-  options = {
-    services = {
-      guestUsers = {
-        enable = mkOption {
-	  default = false;
-	  description = "
-	    Whether to enable automatic addition of users with empty passwords
-	  ";
-	};
-	users = mkOption {
-	  default = ["guest"];
-	  description = "
-	    List of usernames to add
-	  ";
-	};
-	includeRoot = mkOption {
-	  default = false;
-	  description = "
-	    LEAVE THAT ALONE; whether to reset root password
-	  ";
-	};
-	extraGroups = mkOption {
-	  default = ["audio"];
-	  description = "
-	    Extra groups to grant
-	  ";
-	};
-      };
-    };
-  };
-  
-  inherit (pkgs.lib) concatStringsSep optionalString;
-
-  cfg = config.services.guestUsers;
-
-  userEntry = user:
-  {
-    name = user;
-    description = "NixOS guest user";
-    home = "/home/${user}";
-    createHome = true;
-    group = "users";
-    extraGroups = cfg.extraGroups;
-    shell = "/bin/sh";
-  };
-
-  nameString = (concatStringsSep " " cfg.users) + optionalString cfg.includeRoot " root";
-
-in 
-
-pkgs.lib.mkIf cfg.enable {
-  require = options;
-
-  system.activationScripts = {
-
-    clearPasswords = pkgs.lib.fullDepEntry
-      ''
-        for i in ${nameString}; do
-            echo | ${pkgs.pwdutils}/bin/passwd --stdin $i
-        done
-      '' ["defaultPath" "users" "groups"];
-
-  };
-
-  services.mingetty.helpLine = "\nThese users have empty passwords: ${nameString}";
-  
-  users.extraUsers = map userEntry cfg.users;
-}
diff --git a/modules/config/users-groups.nix b/modules/config/users-groups.nix
index cb50b8bb3c4..ffc43a63b46 100644
--- a/modules/config/users-groups.nix
+++ b/modules/config/users-groups.nix
@@ -1,54 +1,17 @@
 {pkgs, config, ...}:
 
-###### interface
-let
-  inherit (pkgs.lib) mkOption;
-
-  options = {
-    users = {
-      extraUsers = mkOption {
-        default = [];
-        example = [
-          { name = "alice";
-            uid = 1234;
-            description = "Alice";
-            home = "/home/alice";
-            createHome = true;
-            group = "users";
-            extraGroups = ["wheel"];
-            shell = "/bin/sh";
-          }
-        ];
-        description = "
-          Additional user accounts to be created automatically by the system.
-        ";
-      };
-
-      extraGroups = mkOption {
-        default = [];
-        example = [
-          { name = "students";
-            gid = 1001;
-          }
-        ];
-        description = "
-          Additional groups to be created automatically by the system.
-        ";
-      };
-    };
-  };
-in
+with pkgs.lib;
 
-###### implementation
 let
+
   ids = config.ids;
 
+  
   # User accounts to be created/updated by NixOS.
   users =
     let
       defaultUsers =
-        [
-          { name = "root";
+        [ { name = "root";
             uid = ids.uids.root;
             description = "System administrator";
             home = "/root";
@@ -80,8 +43,9 @@ let
         , shell ? (if useDefaultShell then config.users.defaultUserShell else "/noshell")
         , createHome ? false
         , useDefaultShell ? false
+        , password ? null
         }:
-        { inherit name description uid group extraGroups home shell createHome; };
+        { inherit name description uid group extraGroups home shell createHome password; };
 
     in map addAttrs (defaultUsers ++ nixBuildUsers ++ config.users.extraUsers);
 
@@ -90,8 +54,7 @@ let
   groups =
     let
       defaultGroups = 
-        [
-          { name = "root";
+        [ { name = "root";
             gid = ids.gids.root;
           }
           { name = "wheel";
@@ -144,31 +107,63 @@ let
 
     in map addAttrs (defaultGroups ++ config.users.extraGroups);
 
-  inherit (pkgs.lib) concatStringsSep;
 
-  serializedUser = u: "${u.name}\n${u.description}\n${toString u.uid}\n${u.group}\n${toString (concatStringsSep "," u.extraGroups)}\n${u.home}\n${u.shell}\n${toString u.createHome}";
+  # Note: the 'X' in front of the password is to distinguish between
+  # having an empty password, and not having a password.
+  serializedUser = u: "${u.name}\n${u.description}\n${toString u.uid}\n${u.group}\n${toString (concatStringsSep "," u.extraGroups)}\n${u.home}\n${u.shell}\n${toString u.createHome}\n${if u.password != null then "X" + u.password else ""}\n";
   serializedGroup = g: "${g.name}\n${toString g.gid}";
-in
-
-let
-  inherit (pkgs.stringsWithDeps) fullDepEntry;
-
+  
   # keep this extra file so that cat can be used to pass special chars such as "`" which is used in the avahi daemon
-  usersFile = pkgs.writeText "users" (concatStringsSep "\n" (map serializedUser users));
+  usersFile = pkgs.writeText "users" (concatStrings (map serializedUser users));
+  
 in
 
 {
-  require = [
-    options
 
-    # config.system.activationScripts
-    # ../system/activate-configuration.nix
-  ];
+  ###### interface
 
-  system = {
-    activationScripts = {
+  options = {
+  
+    users.extraUsers = mkOption {
+      default = [];
+      example =
+        [ { name = "alice";
+            uid = 1234;
+            description = "Alice";
+            home = "/home/alice";
+            createHome = true;
+            group = "users";
+            extraGroups = ["wheel"];
+            shell = "/bin/sh";
+            password = "foobar";
+          }
+        ];
+      description = ''
+        Additional user accounts to be created automatically by the system.
+      '';
+    };
 
-      users = fullDepEntry ''
+    users.extraGroups = mkOption {
+      default = [];
+      example =
+        [ { name = "students";
+            gid = 1001;
+          }
+        ];
+      description = ''
+        Additional groups to be created automatically by the system.
+      '';
+    };
+
+  };
+  
+
+  ###### implementation
+
+  config = {
+
+    system.activationScripts.users = fullDepEntry
+      ''
         cat ${usersFile} | while true; do
             read name || break
             read description
@@ -178,6 +173,7 @@ in
             read home
             read shell
             read createHome
+            read password
 
             if ! curEnt=$(getent passwd "$name"); then
                 echo "creating user $name..."
@@ -190,6 +186,9 @@ in
                     --home "$home" \
                     --shell "$shell" \
                     ''${createHome:+--create-home}
+                if test "''${password:0:1}" = 'X'; then
+                    echo "''${password:1}" | ${pkgs.pwdutils}/bin/passwd --stdin "$name"
+                fi
             else
                 #echo "updating user $name..."
                 oldIFS="$IFS"; IFS=:; set -- $curEnt; IFS="$oldIFS"
@@ -210,10 +209,12 @@ in
                     ''${home:+--home "$home"} \
                     --shell "$shell"
             fi
+
         done
       '' [ "groups" ];
 
-      groups = fullDepEntry ''
+    system.activationScripts.groups = fullDepEntry
+      ''
         while true; do
             read name || break
             read gid
@@ -236,6 +237,6 @@ in
         EndOfGroupList
       '' [ "rootPasswd" "binsh" "etc" "var" ];
 
-    };
   };
+
 }
diff --git a/modules/module-list.nix b/modules/module-list.nix
index 02268df64bb..0f554bdb653 100644
--- a/modules/module-list.nix
+++ b/modules/module-list.nix
@@ -1,5 +1,4 @@
 [ ./config/fonts.nix
-  ./config/guest-users.nix
   ./config/i18n.nix
   ./config/ldap.nix
   ./config/networking.nix
-- 
GitLab


From 48f22eb62d50ca543496b09241dcc9d8f129f1dc Mon Sep 17 00:00:00 2001
From: Sander van der Burg <s.vanderburg@tudelft.nl>
Date: Wed, 2 Sep 2009 17:59:46 +0000
Subject: [PATCH 1769/5331] Fixed errors with: export command not found

svn path=/nixos/trunk/; revision=16938
---
 modules/services/network-filesystems/nfs-kernel.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/services/network-filesystems/nfs-kernel.nix b/modules/services/network-filesystems/nfs-kernel.nix
index 96675a6baa2..b10d58ff6b1 100644
--- a/modules/services/network-filesystems/nfs-kernel.nix
+++ b/modules/services/network-filesystems/nfs-kernel.nix
@@ -75,9 +75,8 @@ mkIf config.services.nfsKernel.enable {
         start on network-interfaces/started
         stop on network-interfaces/stop
 
-        PATH=${pkgs.nfsUtils}/sbin
-
         start script
+	  export PATH=${pkgs.nfsUtils}/sbin
           ${modprobe}/sbin/modprobe nfsd || true
           exportfs -a
         end script
@@ -85,6 +84,7 @@ mkIf config.services.nfsKernel.enable {
         respawn sleep 1000000
 
         start script
+	  export PATH=${pkgs.nfsUtils}/sbin
           exportfs -au
         end script
       '';
-- 
GitLab


From 672347342192fe715a77af61a7fd27cb80447584 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 2 Sep 2009 18:33:38 +0000
Subject: [PATCH 1770/5331] * Give some more memory to the VMs.

svn path=/nixos/trunk/; revision=16939
---
 modules/virtualisation/qemu-vm.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/virtualisation/qemu-vm.nix b/modules/virtualisation/qemu-vm.nix
index ab7a494e988..f804a63395d 100644
--- a/modules/virtualisation/qemu-vm.nix
+++ b/modules/virtualisation/qemu-vm.nix
@@ -44,7 +44,7 @@ let
       
       # -no-kvm-irqchip is needed to prevent the CIFS mount from
       # hanging the VM on x86_64.
-      exec ${pkgs.qemu_kvm}/bin/qemu-system-x86_64 \
+      exec ${pkgs.qemu_kvm}/bin/qemu-system-x86_64 -m 384 \
           -no-kvm-irqchip \
           -net nic,model=virtio -net user -smb / \
           -drive file=$NIX_DISK_IMAGE,if=virtio,boot=on \
-- 
GitLab


From 67db73312361815a2a9efd1087c3ff89c834334e Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 2 Sep 2009 18:35:23 +0000
Subject: [PATCH 1771/5331] * Simplify the generation of kdmrc.  Instead of
 using sed to   substitute some values, just prepend them to the start of
 kdmrc.   KDM will merge multiple sections with the same name (even though it 
  complains a bit).  Option definitions that occur first have   precedence.

svn path=/nixos/trunk/; revision=16940
---
 .../x11/xserver/display-managers/kdm.nix      | 52 +++++++++++++------
 1 file changed, 36 insertions(+), 16 deletions(-)

diff --git a/modules/services/x11/xserver/display-managers/kdm.nix b/modules/services/x11/xserver/display-managers/kdm.nix
index 86340c3cd6d..cb80c500952 100644
--- a/modules/services/x11/xserver/display-managers/kdm.nix
+++ b/modules/services/x11/xserver/display-managers/kdm.nix
@@ -9,23 +9,33 @@ let
 
   inherit (pkgs.kde42) kdebase_workspace;
 
+  defaultConfig =
+    ''
+      [Shutdown]
+      HaltCmd=${pkgs.upstart}/sbin/halt
+      RebootCmd=${pkgs.upstart}/sbin/reboot
+
+      [X-*-Core]
+      Xrdb=${pkgs.xlibs.xrdb}/bin/xrdb
+      SessionsDirs=${dmcfg.session.desktops}
+      FailsafeClient=${pkgs.xterm}/bin/xterm
+
+      [X-:*-Core]
+      ServerCmd=${dmcfg.xserverBin} ${dmcfg.xserverArgs}
+
+      [X-*-Greeter]
+      HiddenUsers=root,nixbld1,nixbld2,nixbld3,nixbld4,nixbld5,nixbld6,nixbld7,nixbld8,nixbld9,nixbld10
+      PluginsLogin=${kdebase_workspace}/lib/kde4/kgreet_classic.so
+    '';
+
   kdmrc = pkgs.stdenv.mkDerivation {
     name = "kdmrc";
-    # -e "s|Session=${kdebase_workspace}/share/config/kdm/Xsession|Session=${dmcfg.session.script}|" \
-    buildCommand = ''
-      cp ${kdebase_workspace}/share/config/kdm/kdmrc .
-      sed -i -e "s|#HaltCmd=|HaltCmd=${pkgs.upstart}/sbin/halt|" \
-             -e "s|#RebootCmd=|RebootCmd=${pkgs.upstart}/sbin/reboot|" \
-	     -e "s|#Xrdb=|Xrdb=${pkgs.xlibs.xrdb}/bin/xrdb|" \
-	     -e "s|#HiddenUsers=root|HiddenUsers=root,nixbld1,nixbld2,nixbld3,nixbld4,nixbld5,nixbld6,nixbld7,nixbld8,nixbld9,nixbld10|" \
-	     -e "s|ServerCmd=/FOO/bin/X|ServerCmd=${dmcfg.xserverBin} ${dmcfg.xserverArgs}|" \
- 	     -e "s|^SessionsDirs=.*$|SessionsDirs=${dmcfg.session.desktops}|" \
-	     -e "s|#FailsafeClient=|FailsafeClient=${pkgs.xterm}/bin/xterm|" \
-	     -e "s|#PluginsLogin=sign|PluginsLogin=${kdebase_workspace}/lib/kde4/kgreet_classic.so|" \
-      kdmrc
-      ensureDir $out
-      cp kdmrc $out
-    '';
+    config = defaultConfig + cfg.extraConfig;
+    buildCommand =
+      ''
+        echo "$config" > $out
+        cat ${kdebase_workspace}/share/config/kdm/kdmrc >> $out
+      '';
   };
 
 in
@@ -37,12 +47,22 @@ in
   options = {
 
     services.xserver.displayManager.kdm = {
+    
       enable = mkOption {
         default = false;
         description = ''
           Whether to enable the KDE display manager.
         '';
       };
+
+      extraConfig = mkOption {
+        default = "";
+        description = ''
+          Options appended to <filename>kdmrc</filename>, the
+          configuration file of KDM.
+        '';
+      };
+      
     };
 
   };
@@ -55,7 +75,7 @@ in
     services.xserver.displayManager.job =
       { beforeScript = "";
         env = "";
-        execCmd = "${kdebase_workspace}/bin/kdm -config ${kdmrc}/kdmrc";
+        execCmd = "${kdebase_workspace}/bin/kdm -config ${kdmrc}";
       };
 
     security.pam.services = [ { name = "kde"; localLogin = true; } ];
-- 
GitLab


From 6ee7ccf07f5443f1e70fe893d8b0f490dfa0138c Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 2 Sep 2009 18:44:09 +0000
Subject: [PATCH 1772/5331] * Automatically log in using kdm.

svn path=/nixos/trunk/; revision=16941
---
 tests/kde4.nix | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/tests/kde4.nix b/tests/kde4.nix
index 99761cbc8ba..4f4a9f2d56b 100644
--- a/tests/kde4.nix
+++ b/tests/kde4.nix
@@ -13,15 +13,29 @@ rec {
         { config, pkgs, ... }:
 
         { services.xserver.enable = true;
+        
+          services.xserver.displayManager.slim.enable = false;
+          services.xserver.displayManager.kdm.enable = true;
+          services.xserver.displayManager.kdm.extraConfig =
+            ''
+              [X-:0-Core]
+              AutoLoginEnable=true
+              AutoLoginUser=alice
+              AutoLoginPass=foobar
+            '';
+            
           services.xserver.desktopManager.default = "kde4";
           services.xserver.desktopManager.kde4.enable = true;
 
+          services.sshd.enable = true;
+
           users.extraUsers = pkgs.lib.singleton
             { name = "alice";
               description = "Alice Foobar";
               home = "/home/alice";
               createHome = true;
               useDefaultShell = true;
+              password = "foobar";
             };
 
           environment.systemPackages = [ pkgs.xorg.xclock pkgs.xorg.xwd ];
@@ -36,7 +50,7 @@ rec {
 
       $client->waitForFile("/tmp/.X11-unix/X0");
 
-      sleep 20;
+      sleep 60;
 
       print STDERR $client->execute("DISPLAY=:0.0 xwd -root > /hostfs/$ENV{out}/screen.xwd");
     '';
-- 
GitLab


From 05cb34c6d0fde621f5d55be5ef6fe67bbd860ca4 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 2 Sep 2009 19:59:26 +0000
Subject: [PATCH 1773/5331] svn path=/nixos/trunk/; revision=16942

---
 lib/build-vms.nix | 9 +++++++++
 release.nix       | 7 +++++++
 2 files changed, 16 insertions(+)

diff --git a/lib/build-vms.nix b/lib/build-vms.nix
index 97c9a040c63..071c458a944 100644
--- a/lib/build-vms.nix
+++ b/lib/build-vms.nix
@@ -130,11 +130,20 @@ rec {
         ''
           mkdir $out
           cp ${./test-driver/Machine.pm} Machine.pm
+          
           ${perl}/bin/perl ${./test-driver/test-driver.pl} ${network}/vms/*/bin/run-*-vm
+          
           for i in */coverage-data; do
             ensureDir $out/coverage-data
             mv $i $out/coverage-data/$(dirname $i)
           done
+
+          for i in $out/*.xwd; do
+            j=$out/$(basename $i .xwd).png
+            ${pkgs.imagemagick}/bin/convert $i $j
+            ensureDir $out/nix-support
+            echo "report screenshot $j" >> $out/nix-support/hydra-build-products
+          done
         ''; # */
     };
 
diff --git a/release.nix b/release.nix
index 4dbf798ec0c..be7cede3f85 100644
--- a/release.nix
+++ b/release.nix
@@ -106,6 +106,13 @@ let
         system = "i686-linux";
       }).report;
     
+    tests.kde4 =
+      { services ? ../services }:
+
+      (import ./tests/kde4.nix {
+        inherit nixpkgs services;
+        system = "i686-linux";
+      }).test;
 
   };
   
-- 
GitLab


From 497760b44479429d04ecccc3bc8ffaa8a7103f58 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 2 Sep 2009 23:16:33 +0000
Subject: [PATCH 1774/5331] * Use scrot to make screenshots. * Another X11 test
 (running Quake 3).

svn path=/nixos/trunk/; revision=16949
---
 lib/build-vms.nix |  6 ++----
 release.nix       |  8 ++++++++
 tests/kde4.nix    |  6 ++----
 tests/quake3.nix  | 39 +++++++++++++++++++++++++++++++++++++++
 4 files changed, 51 insertions(+), 8 deletions(-)
 create mode 100644 tests/quake3.nix

diff --git a/lib/build-vms.nix b/lib/build-vms.nix
index 071c458a944..abbeb1d0d89 100644
--- a/lib/build-vms.nix
+++ b/lib/build-vms.nix
@@ -138,11 +138,9 @@ rec {
             mv $i $out/coverage-data/$(dirname $i)
           done
 
-          for i in $out/*.xwd; do
-            j=$out/$(basename $i .xwd).png
-            ${pkgs.imagemagick}/bin/convert $i $j
+          for i in $out/*.png; do
             ensureDir $out/nix-support
-            echo "report screenshot $j" >> $out/nix-support/hydra-build-products
+            echo "report screenshot $i" >> $out/nix-support/hydra-build-products
           done
         ''; # */
     };
diff --git a/release.nix b/release.nix
index be7cede3f85..bd5914da39c 100644
--- a/release.nix
+++ b/release.nix
@@ -114,6 +114,14 @@ let
         system = "i686-linux";
       }).test;
 
+    tests.quake3 =
+      { services ? ../services }:
+
+      (import ./tests/quake3.nix {
+        inherit nixpkgs services;
+        system = "i686-linux";
+      }).test;
+
   };
   
 
diff --git a/tests/kde4.nix b/tests/kde4.nix
index 4f4a9f2d56b..8c8e1e0d801 100644
--- a/tests/kde4.nix
+++ b/tests/kde4.nix
@@ -27,8 +27,6 @@ rec {
           services.xserver.desktopManager.default = "kde4";
           services.xserver.desktopManager.kde4.enable = true;
 
-          services.sshd.enable = true;
-
           users.extraUsers = pkgs.lib.singleton
             { name = "alice";
               description = "Alice Foobar";
@@ -38,7 +36,7 @@ rec {
               password = "foobar";
             };
 
-          environment.systemPackages = [ pkgs.xorg.xclock pkgs.xorg.xwd ];
+          environment.systemPackages = [ pkgs.scrot ];
         };
     };
 
@@ -52,7 +50,7 @@ rec {
 
       sleep 60;
 
-      print STDERR $client->execute("DISPLAY=:0.0 xwd -root > /hostfs/$ENV{out}/screen.xwd");
+      print STDERR $client->execute("DISPLAY=:0.0 scrot /hostfs/$ENV{out}/screen.png");
     '';
   
 }
diff --git a/tests/quake3.nix b/tests/quake3.nix
new file mode 100644
index 00000000000..4521d157b4e
--- /dev/null
+++ b/tests/quake3.nix
@@ -0,0 +1,39 @@
+{ nixos ? ./..
+, nixpkgs ? /etc/nixos/nixpkgs
+, services ? /etc/nixos/services
+, system ? builtins.currentSystem
+}:
+
+with import ../lib/build-vms.nix { inherit nixos nixpkgs services system; };
+
+rec {
+
+  nodes =
+    { client =
+        { config, pkgs, ... }:
+
+        { services.xserver.enable = true;
+          services.xserver.driSupport = true;
+        
+          environment.systemPackages = [ pkgs.scrot pkgs.xorg.twm pkgs.quake3demo ];
+        };
+    };
+
+  vms = buildVirtualNetwork { inherit nodes; };
+
+  test = runTests vms
+    ''
+      startAll;
+
+      $client->waitForFile("/tmp/.X11-unix/X0");
+
+      sleep 20;
+
+      print STDERR $client->execute("DISPLAY=:0.0 quake3 &");
+
+      sleep 20;
+
+      print STDERR $client->execute("DISPLAY=:0.0 scrot /hostfs/$ENV{out}/screen.png");
+    '';
+  
+}
-- 
GitLab


From c6d4282f2512a4728580e29ea7705e2906fb394e Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 2 Sep 2009 23:37:58 +0000
Subject: [PATCH 1775/5331] svn path=/nixos/trunk/; revision=16950

---
 lib/build-vms.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/build-vms.nix b/lib/build-vms.nix
index abbeb1d0d89..c35906adfc5 100644
--- a/lib/build-vms.nix
+++ b/lib/build-vms.nix
@@ -4,7 +4,7 @@
 , system ? builtins.currentSystem
 }:
 
-let pkgs = import nixpkgs { config = {}; }; in
+let pkgs = import nixpkgs { config = {}; inherit system; }; in
 
 with pkgs;
 
-- 
GitLab


From a27680ea1745c1b8bbc8bbb767a3600b38bc4250 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 3 Sep 2009 00:04:43 +0000
Subject: [PATCH 1776/5331] * Another distributed regression test, a network
 consisting of a Quake   3 server and two clients.  The clients connect to the
 server and do   nothing (except getting blown by the bots).  After a few
 seconds we   verify that the clients indeed connected successfully, and make
 a   screenshot of the X displays of the clients.

svn path=/nixos/trunk/; revision=16951
---
 tests/quake3.nix | 46 +++++++++++++++++++++++++++++++++++-----------
 1 file changed, 35 insertions(+), 11 deletions(-)

diff --git a/tests/quake3.nix b/tests/quake3.nix
index 4521d157b4e..ae2f276880e 100644
--- a/tests/quake3.nix
+++ b/tests/quake3.nix
@@ -8,15 +8,29 @@ with import ../lib/build-vms.nix { inherit nixos nixpkgs services system; };
 
 rec {
 
+  client = 
+    { config, pkgs, ... }:
+
+    { services.xserver.enable = true;
+      services.xserver.driSupport = true;
+      environment.systemPackages = [ pkgs.scrot pkgs.icewm pkgs.quake3demo ];
+    };
+
   nodes =
-    { client =
+    { server =
         { config, pkgs, ... }:
 
-        { services.xserver.enable = true;
-          services.xserver.driSupport = true;
-        
-          environment.systemPackages = [ pkgs.scrot pkgs.xorg.twm pkgs.quake3demo ];
+        { jobs = pkgs.lib.singleton
+            { name = "quake3-server";
+              startOn = "startup";
+              exec =
+                "${pkgs.quake3demo}/bin/quake3 '+set dedicated 1' '+set g_gametype 0' " +
+                "'+map q3dm7' '+addbot grunt' '+addbot daemia' 2> /tmp/log";
+            };
         };
+
+      client1 = client;
+      client2 = client;
     };
 
   vms = buildVirtualNetwork { inherit nodes; };
@@ -25,15 +39,25 @@ rec {
     ''
       startAll;
 
-      $client->waitForFile("/tmp/.X11-unix/X0");
-
-      sleep 20;
-
-      print STDERR $client->execute("DISPLAY=:0.0 quake3 &");
+      $server->waitForJob("quake3-server");
+      $client1->waitForFile("/tmp/.X11-unix/X0");
+      $client2->waitForFile("/tmp/.X11-unix/X0");
 
       sleep 20;
 
-      print STDERR $client->execute("DISPLAY=:0.0 scrot /hostfs/$ENV{out}/screen.png");
+      print STDERR $client1->execute("DISPLAY=:0.0 icewm &");
+      print STDERR $client1->execute("DISPLAY=:0.0 quake3 '+set r_fullscreen 0' '+set name Foo' '+connect server' &");
+ 
+      print STDERR $client2->execute("DISPLAY=:0.0 icewm &");
+      print STDERR $client2->execute("DISPLAY=:0.0 quake3 '+set r_fullscreen 0' '+set name Bar' '+connect server' &");
+ 
+      sleep 40;
+
+      $server->mustSucceed("grep -q 'Foo.*entered the game' /tmp/log");
+      $server->mustSucceed("grep -q 'Bar.*entered the game' /tmp/log");
+      
+      print STDERR $client1->execute("DISPLAY=:0.0 scrot /hostfs/$ENV{out}/screen1.png");
+      print STDERR $client2->execute("DISPLAY=:0.0 scrot /hostfs/$ENV{out}/screen2.png");
     '';
   
 }
-- 
GitLab


From 2b5c9a78ff70c61dd0983666c3ae9b636cc86cd8 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 3 Sep 2009 00:05:38 +0000
Subject: [PATCH 1777/5331] * Increase the timeout to deal with heavily loaded
 hosts.

svn path=/nixos/trunk/; revision=16952
---
 lib/test-driver/Machine.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/test-driver/Machine.pm b/lib/test-driver/Machine.pm
index 590ad21d09b..782a50956f7 100644
--- a/lib/test-driver/Machine.pm
+++ b/lib/test-driver/Machine.pm
@@ -94,7 +94,7 @@ sub connect {
     while (1) {
         last if -e ($self->{stateDir} . "/running");
         sleep 1;
-        die ("VM " . $self->{name} . " timed out") if $try++ > 180;
+        die ("VM " . $self->{name} . " timed out") if $try++ > 300;
     }
 
     while (1) {
-- 
GitLab


From 9843fa2ed7ebfbab156d5c20d4c3c0bfb8b0210b Mon Sep 17 00:00:00 2001
From: Sander van der Burg <s.vanderburg@tudelft.nl>
Date: Thu, 3 Sep 2009 14:47:58 +0000
Subject: [PATCH 1778/5331] Various NFS server fixes:

- Added rpc.statd service, which prevents messages that tell you that you should use -o nolock
- Create /var/lib/nfs on initialization
- Create /etc/exports, so that exportfs can create /var/lib/nfs/etab. This prevents errors such as: mount.nfs: an incorrect mount option was specified


svn path=/nixos/trunk/; revision=16953
---
 .../network-filesystems/nfs-kernel.nix        | 27 +++++++++++++++++--
 1 file changed, 25 insertions(+), 2 deletions(-)

diff --git a/modules/services/network-filesystems/nfs-kernel.nix b/modules/services/network-filesystems/nfs-kernel.nix
index b10d58ff6b1..b41e33bb4ba 100644
--- a/modules/services/network-filesystems/nfs-kernel.nix
+++ b/modules/services/network-filesystems/nfs-kernel.nix
@@ -64,6 +64,11 @@ mkIf config.services.nfsKernel.enable {
     options
   ];
 
+  environment.etc = [
+    { source = exports;
+      target = "exports"; }
+  ];
+
   services = {
     extraJobs = [
     {
@@ -77,15 +82,17 @@ mkIf config.services.nfsKernel.enable {
 
         start script
 	  export PATH=${pkgs.nfsUtils}/sbin
+	  mkdir -p /var/lib/nfs
           ${modprobe}/sbin/modprobe nfsd || true
-          exportfs -a
+          exportfs -ra
         end script
 
         respawn sleep 1000000
 
         start script
+	  mkdir -p /var/lib/nfs
 	  export PATH=${pkgs.nfsUtils}/sbin
-          exportfs -au
+          exportfs -ra
         end script
       '';
     }
@@ -113,6 +120,22 @@ mkIf config.services.nfsKernel.enable {
         respawn ${pkgs.nfsUtils}/sbin/rpc.mountd -F -f ${exports}
       '';
     }
+    {
+      name = "nfs-kernel-statd";
+      
+      job = ''
+        description "NSM (Network Status Monitor) of the RPC protocol"
+      
+        start on nfs-kernel-rpc-nfsd/started
+	stop on nfs-kernel-exports/stop
+	
+        start script
+          mkdir -p /var/lib/nfs
+        end script
+
+        respawn ${pkgs.nfsUtils}/sbin/rpc.statd
+      '';
+    }
     ];
   };
 }
-- 
GitLab


From 685335df2f2275a07ab759f05e764f851a1e06b7 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 4 Sep 2009 09:29:18 +0000
Subject: [PATCH 1779/5331] * system.build.system -> system.build.toplevel,
 since the former name   is just too weird.

svn path=/nixos/trunk/; revision=16954
---
 default.nix                             | 2 +-
 modules/installer/cd-dvd/iso-image.nix  | 4 ++--
 modules/installer/cd-dvd/live-dvd.nix   | 2 +-
 modules/system/activation/top-level.nix | 2 +-
 modules/virtualisation/qemu-vm.nix      | 8 ++++----
 5 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/default.nix b/default.nix
index 28049ebd146..cf16a81acfb 100644
--- a/default.nix
+++ b/default.nix
@@ -16,7 +16,7 @@ in
 {
   inherit eval config;
 
-  system = config.system.build.system;
+  system = config.system.build.toplevel;
 
   vm = vmConfig.system.build.vm;
 
diff --git a/modules/installer/cd-dvd/iso-image.nix b/modules/installer/cd-dvd/iso-image.nix
index 3b26628148f..bd4d39ccdf8 100644
--- a/modules/installer/cd-dvd/iso-image.nix
+++ b/modules/installer/cd-dvd/iso-image.nix
@@ -98,7 +98,7 @@ in
   # script and the top-level system configuration directory.
   isoImage.storeContents =
     [ config.system.build.bootStage2
-      config.system.build.system
+      config.system.build.toplevel
     ];
 
   # Create the squashfs image that contains the Nix store.
@@ -137,7 +137,7 @@ in
         # menu.lst.  Break the cyclic dependency by having a /system
         # symlink on the CD, and having menu.lst refer to /system.
         source = pkgs.runCommand "system" {}
-          "ln -s ${config.system.build.system} $out";
+          "ln -s ${config.system.build.toplevel} $out";
         target = "/system";
       }
       { # Idem for the stage-2 init script.
diff --git a/modules/installer/cd-dvd/live-dvd.nix b/modules/installer/cd-dvd/live-dvd.nix
index dde8dd9930d..aa8a164c033 100644
--- a/modules/installer/cd-dvd/live-dvd.nix
+++ b/modules/installer/cd-dvd/live-dvd.nix
@@ -5,7 +5,7 @@
 
   # Build the build-time dependencies of this configuration on the DVD
   # to speed up installation.
-  isoImage.storeContents = [config.system.build.system.drvPath];
+  isoImage.storeContents = [config.system.build.toplevel.drvPath];
 
   # Include lots of packages.
   environment.systemPackages =
diff --git a/modules/system/activation/top-level.nix b/modules/system/activation/top-level.nix
index 124c39e5b51..19457513473 100644
--- a/modules/system/activation/top-level.nix
+++ b/modules/system/activation/top-level.nix
@@ -92,5 +92,5 @@ let
 in {
   require = [options];
 
-  system.build.system = system;
+  system.build.toplevel = system;
 }
diff --git a/modules/virtualisation/qemu-vm.nix b/modules/virtualisation/qemu-vm.nix
index f804a63395d..69cc73954e0 100644
--- a/modules/virtualisation/qemu-vm.nix
+++ b/modules/virtualisation/qemu-vm.nix
@@ -48,10 +48,10 @@ let
           -no-kvm-irqchip \
           -net nic,model=virtio -net user -smb / \
           -drive file=$NIX_DISK_IMAGE,if=virtio,boot=on \
-          -kernel ${config.system.build.system}/kernel \
-          -initrd ${config.system.build.system}/initrd \
+          -kernel ${config.system.build.toplevel}/kernel \
+          -initrd ${config.system.build.toplevel}/initrd \
           $QEMU_OPTS \
-          -append "$(cat ${config.system.build.system}/kernel-params) init=${config.system.build.bootStage2} systemConfig=${config.system.build.system} $QEMU_KERNEL_PARAMS"
+          -append "$(cat ${config.system.build.toplevel}/kernel-params) init=${config.system.build.bootStage2} systemConfig=${config.system.build.toplevel} $QEMU_KERNEL_PARAMS"
     '';
 
 in
@@ -122,7 +122,7 @@ in
   system.build.vm = pkgs.runCommand "nixos-vm" {}
     ''
       ensureDir $out/bin
-      ln -s ${config.system.build.system} $out/system
+      ln -s ${config.system.build.toplevel} $out/system
       ln -s ${pkgs.writeScript "run-nixos-vm" startVM} $out/bin/run-${vmName}-vm
     '';
 
-- 
GitLab


From 65cb814f7a7bc3eedd3fa9557e81e9f930ca5f5f Mon Sep 17 00:00:00 2001
From: Sander van der Burg <s.vanderburg@tudelft.nl>
Date: Fri, 4 Sep 2009 11:37:07 +0000
Subject: [PATCH 1780/5331] Committed trac example case

svn path=/nixos/trunk/; revision=16955
---
 tests/trac.nix | 123 +++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 123 insertions(+)
 create mode 100644 tests/trac.nix

diff --git a/tests/trac.nix b/tests/trac.nix
new file mode 100644
index 00000000000..829f2c5755c
--- /dev/null
+++ b/tests/trac.nix
@@ -0,0 +1,123 @@
+{ nixos ? ./..
+, nixpkgs ? /etc/nixos/nixpkgs
+, services ? /etc/nixos/services
+, system ? builtins.currentSystem
+}:
+
+with import ../lib/build-vms.nix { inherit nixos nixpkgs services system; };
+
+rec {
+  nodes = {
+    storage = 
+      {pkgs, config, ...}:
+      {
+        services = {
+          portmap = {
+            enable = true;
+          };
+    
+          nfsKernel = {
+            enable = true;
+            exports = ''
+              /repos/trac 192.168.1.0/255.255.255.0(rw,no_root_squash)
+            '';
+          };    
+        };
+  
+        environment = {
+          extraPackages = [
+            pkgs.subversion
+          ];
+        };
+      };
+
+    postgresql =
+      {config, pkgs, ...}:
+      {
+        services = {
+          sshd = {
+            enable = true;
+          };
+    
+          postgresql = {
+            enable = true;
+      
+            authentication = ''
+              # Generated file; do not edit!
+              local all all              trust
+              host  all all 127.0.0.1/32 trust
+	      host  all all ::1/128      trust
+            '';
+          };
+        };  
+      };
+
+    webserver = 
+      {config, pkgs, ...}:
+      {
+        services = {
+          nfsKernel = {
+            enable = true;
+          };
+  
+          httpd = {
+            enable = true;
+            adminAddr = "root@localhost";
+            extraSubservices = [
+	      { serviceType = "trac"; }
+            ];
+          };
+        };
+	
+	environment = {
+	  extraPackages = [ pkgs.pythonPackages.trac ];
+	};
+      };
+      
+    client = 
+      {config, pkgs, ...}:
+      {
+        services = {
+	  xserver = {
+	    enable = true;
+            driSupport = true;
+	  };
+	};
+	  
+        environment = {
+	  extraPackages = [
+	    pkgs.firefox
+	    pkgs.icewm
+	    pkgs.scrot
+	  ];
+	};
+      };
+  };
+    
+  vms = buildVirtualNetwork { inherit nodes; };
+
+  test = runTests vms
+    ''
+      startAll;
+      
+      $storage->mustSucceed("mkdir -p /repos/trac");
+      $storage->mustSucceed("svnadmin create /repos/trac");
+      $webserver->mustSucceed("mount storage:/repos/trac /repos/trac");
+      
+      #$postgresql->waitForFile("/tmp/.s.PGSQL.5432");
+      #$postgresql->mustSucceed("createdb trac");
+      
+      $webserver->waitForFile("/var/trac");
+      $webserver->mustSucceed("PYTHONPATH=${pkgs.pythonPackages.psycopg2}/lib/python2.5/site-packages trac-admin /var/trac/projects/test initenv Test postgres://root\@postgresql/trac svn /repos/trac -v");
+      
+      sleep 10;
+      
+      $client->waitForFile("/tmp/.X11-unix/X0");
+      print STDERR $client->execute("DISPLAY=:0.0 icewm &");
+      print STDERR $client->execute("DISPLAY=:0.0 firefox http://webserver/projects/test &");
+      
+      sleep 40;
+      
+      print STDERR $client->execute("DISPLAY=:0.0 scrot /hostfs/$ENV{out}/screen1.png");
+    '';
+}
-- 
GitLab


From 7fc8a1fd982b0660e3f6ef553a11486ee4cc1841 Mon Sep 17 00:00:00 2001
From: Sander van der Burg <s.vanderburg@tudelft.nl>
Date: Fri, 4 Sep 2009 14:45:30 +0000
Subject: [PATCH 1781/5331] Fixed some bugs in the Trac testcase

svn path=/nixos/trunk/; revision=16957
---
 tests/trac.nix | 74 ++++++++++++++++++++++++++++++++++++++------------
 1 file changed, 56 insertions(+), 18 deletions(-)

diff --git a/tests/trac.nix b/tests/trac.nix
index 829f2c5755c..bf10ad68a54 100644
--- a/tests/trac.nix
+++ b/tests/trac.nix
@@ -41,12 +41,14 @@ rec {
     
           postgresql = {
             enable = true;
-      
+    	    enableTCPIP = true;
+	    
             authentication = ''
               # Generated file; do not edit!
-              local all all              trust
-              host  all all 127.0.0.1/32 trust
-	      host  all all ::1/128      trust
+              local all all                trust
+              host  all all 127.0.0.1/32   trust
+	      host  all all ::1/128        trust
+	      host  all all 192.168.1.0/24 trust
             '';
           };
         };  
@@ -56,9 +58,13 @@ rec {
       {config, pkgs, ...}:
       {
         services = {
+	  portmap = {
+	    enable = true;
+	  };
+
           nfsKernel = {
             enable = true;
-          };
+          };	  
   
           httpd = {
             enable = true;
@@ -80,14 +86,45 @@ rec {
         services = {
 	  xserver = {
 	    enable = true;
-            driSupport = true;
+
+            displayManager = {
+	      slim = {
+	        enable = false;
+	      };
+              kdm = {
+	        enable = true;
+		extraConfig =
+                  ''
+                    [X-:0-Core]
+                    AutoLoginEnable=true
+                    AutoLoginUser=alice
+                    AutoLoginPass=foobar
+                  '';
+	      };
+	    };
+	    desktopManager = {
+	      default = "kde4";
+	      kde4 = {
+	        enable = true;
+	      };
+	    };            
 	  };
 	};
-	  
+	
+	users = {
+	  extraUsers = pkgs.lib.singleton { 
+	      name = "alice";
+              description = "Alice Foobar";
+              home = "/home/alice";
+              createHome = true;
+              useDefaultShell = true;
+              password = "foobar";
+          };
+        };
+ 
         environment = {
 	  extraPackages = [
-	    pkgs.firefox
-	    pkgs.icewm
+	    pkgs.firefoxWrapper
 	    pkgs.scrot
 	  ];
 	};
@@ -102,21 +139,22 @@ rec {
       
       $storage->mustSucceed("mkdir -p /repos/trac");
       $storage->mustSucceed("svnadmin create /repos/trac");
-      $webserver->mustSucceed("mount storage:/repos/trac /repos/trac");
       
-      #$postgresql->waitForFile("/tmp/.s.PGSQL.5432");
-      #$postgresql->mustSucceed("createdb trac");
+      $postgresql->waitForFile("/tmp/.s.PGSQL.5432");
+      $postgresql->mustSucceed("createdb trac");
+
+      $webserver->mustSucceed("mkdir -p /repos/trac");
+      #$webserver->mustSucceed("mount storage:/repos/trac /repos/trac");
       
       $webserver->waitForFile("/var/trac");
-      $webserver->mustSucceed("PYTHONPATH=${pkgs.pythonPackages.psycopg2}/lib/python2.5/site-packages trac-admin /var/trac/projects/test initenv Test postgres://root\@postgresql/trac svn /repos/trac -v");
-      
-      sleep 10;
+      $webserver->mustSucceed("mkdir -p /var/trac/projects/test");
+      $webserver->mustSucceed("PYTHONPATH=${pkgs.pythonPackages.psycopg2}/lib/python2.5/site-packages trac-admin /var/trac/projects/test initenv Test postgres://root\@postgresql/trac svn /repos/trac");
       
       $client->waitForFile("/tmp/.X11-unix/X0");
-      print STDERR $client->execute("DISPLAY=:0.0 icewm &");
-      print STDERR $client->execute("DISPLAY=:0.0 firefox http://webserver/projects/test &");
+      sleep 60;
       
-      sleep 40;
+      print STDERR $client->execute("DISPLAY=:0.0 konqueror http://webserver/projects/test &");
+      sleep 30;
       
       print STDERR $client->execute("DISPLAY=:0.0 scrot /hostfs/$ENV{out}/screen1.png");
     '';
-- 
GitLab


From 3f65966653357c900813f76e6212243ceec77c01 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 4 Sep 2009 15:02:52 +0000
Subject: [PATCH 1782/5331] * Test konqueror.

svn path=/nixos/trunk/; revision=16958
---
 tests/kde4.nix | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/tests/kde4.nix b/tests/kde4.nix
index 8c8e1e0d801..fc3a849c938 100644
--- a/tests/kde4.nix
+++ b/tests/kde4.nix
@@ -14,6 +14,10 @@ rec {
 
         { services.xserver.enable = true;
         
+          services.httpd.enable = true;
+          services.httpd.adminAddr = "foo@example.org";
+          services.httpd.documentRoot = "${pkgs.valgrind}/share/doc/valgrind/html";
+  
           services.xserver.displayManager.slim.enable = false;
           services.xserver.displayManager.kdm.enable = true;
           services.xserver.displayManager.kdm.extraConfig =
@@ -48,8 +52,12 @@ rec {
 
       $client->waitForFile("/tmp/.X11-unix/X0");
 
-      sleep 60;
+      sleep 50;
+
+      print STDERR $client->execute("su - alice -c 'DISPLAY=:0.0 konqueror http://localhost/ &'");
 
+      sleep 10;
+      
       print STDERR $client->execute("DISPLAY=:0.0 scrot /hostfs/$ENV{out}/screen.png");
     '';
   
-- 
GitLab


From 80eafedc16eb962660c16c5376020eec1aefa2e9 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 4 Sep 2009 15:26:30 +0000
Subject: [PATCH 1783/5331] svn path=/nixos/trunk/; revision=16959

---
 tests/kde4.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/tests/kde4.nix b/tests/kde4.nix
index fc3a849c938..ed557557467 100644
--- a/tests/kde4.nix
+++ b/tests/kde4.nix
@@ -54,6 +54,10 @@ rec {
 
       sleep 50;
 
+      print STDERR $client->execute("su - alice -c 'DISPLAY=:0.0 kwrite /var/log/messages &'");
+
+      sleep 10;
+      
       print STDERR $client->execute("su - alice -c 'DISPLAY=:0.0 konqueror http://localhost/ &'");
 
       sleep 10;
-- 
GitLab


From 17d287afa51324d97840b90bc7f9a1ab6c72a4bb Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 4 Sep 2009 15:27:52 +0000
Subject: [PATCH 1784/5331] * Bump the number of maximum open files for Nix
 builders.   Our VM builds were causing Samba to go over this limit.

svn path=/nixos/trunk/; revision=16960
---
 modules/services/misc/nix-daemon.nix |  5 +++++
 modules/system/upstart/upstart.nix   | 11 +++++++++++
 2 files changed, 16 insertions(+)

diff --git a/modules/services/misc/nix-daemon.nix b/modules/services/misc/nix-daemon.nix
index 3e435348f9d..ca18a8ad5b4 100644
--- a/modules/services/misc/nix-daemon.nix
+++ b/modules/services/misc/nix-daemon.nix
@@ -230,6 +230,11 @@ in
           ${config.nix.envVars}
           exec nice -n ${builtins.toString config.nix.daemonNiceLevel} ${nix}/bin/nix-worker --daemon > /dev/null 2>&1
         '';
+
+      extraConfig = 
+        ''
+          limit nofile 4096 4096
+        '';
     };
 
   environment.shellInit =
diff --git a/modules/system/upstart/upstart.nix b/modules/system/upstart/upstart.nix
index 7c9253b23f0..cdf96d7cb79 100644
--- a/modules/system/upstart/upstart.nix
+++ b/modules/system/upstart/upstart.nix
@@ -60,6 +60,8 @@ let
               ${job.postStop}
             end script
           '' else ""}
+
+          ${job.extraConfig}
         '';
 
     in
@@ -238,6 +240,15 @@ in
           '';
         };
 
+        extraConfig = mkOption {
+          type = types.string;
+          default = "";
+          example = "limit nofile 4096 4096";
+          description = ''
+            Additional Upstart stanzas not otherwise supported.
+          '';
+        };
+
       };
       
     };
-- 
GitLab


From fc69e22e3a33c12e8d2d726af79e8b23dec9a35a Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 4 Sep 2009 15:33:21 +0000
Subject: [PATCH 1785/5331] * Timing dependency is bad.

svn path=/nixos/trunk/; revision=16961
---
 tests/kde4.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/kde4.nix b/tests/kde4.nix
index ed557557467..0cff2d4eec0 100644
--- a/tests/kde4.nix
+++ b/tests/kde4.nix
@@ -52,7 +52,7 @@ rec {
 
       $client->waitForFile("/tmp/.X11-unix/X0");
 
-      sleep 50;
+      sleep 70;
 
       print STDERR $client->execute("su - alice -c 'DISPLAY=:0.0 kwrite /var/log/messages &'");
 
-- 
GitLab


From f6f6bfbc2f2d0035c4c207c17ee72c7ecc881e67 Mon Sep 17 00:00:00 2001
From: Sander van der Burg <s.vanderburg@tudelft.nl>
Date: Fri, 4 Sep 2009 15:58:04 +0000
Subject: [PATCH 1786/5331] The /var/trac directory needs to be accessible by
 the webserver user

svn path=/nixos/trunk/; revision=16962
---
 .../web-servers/apache-httpd/trac.nix         | 51 ++++++++++++++++---
 1 file changed, 44 insertions(+), 7 deletions(-)

diff --git a/modules/services/web-servers/apache-httpd/trac.nix b/modules/services/web-servers/apache-httpd/trac.nix
index ab27b385cb4..d5588e1162c 100644
--- a/modules/services/web-servers/apache-httpd/trac.nix
+++ b/modules/services/web-servers/apache-httpd/trac.nix
@@ -18,6 +18,29 @@ in
       description = "URL path in which Trac projects can be accessed";
       default = "/projects";
     };
+    
+    projects = mkOption {
+      description = "List of projects that should be provided by Trac. If they are not defined yet empty projects are created.";
+      default = [];
+      example = [ { identifier = "myproject";
+                    name = "My Project";
+                    databaseURL="postgres://root:password@/tracdb";
+                    subversionRepository="/data/subversion/myproject"; } ];
+    };
+    
+    user = mkOption {
+      default = "wwwrun";
+      description = "
+        User account under which Trac runs.
+      ";
+    };
+
+    group = mkOption {
+      default = "wwwrun";
+      description = "
+        Group under which Trac runs.
+      ";
+    };
   };
 
   extraModules = [
@@ -25,13 +48,13 @@ in
   ];
   
   extraConfig = ''
-      <Location ${config.projectsLocation}>
-        SetHandler mod_python
-        PythonHandler trac.web.modpython_frontend
-	PythonOption TracEnvParentDir /var/trac/projects
-        PythonOption TracUriRoot ${config.projectsLocation}
-        PythonOption PYTHON_EGG_CACHE /var/trac/egg-cache
-      </Location>
+    <Location ${config.projectsLocation}>
+      SetHandler mod_python
+      PythonHandler trac.web.modpython_frontend
+      PythonOption TracEnvParentDir /var/trac/projects
+      PythonOption TracUriRoot ${config.projectsLocation}
+      PythonOption PYTHON_EGG_CACHE /var/trac/egg-cache
+    </Location>
   '';
   
   globalEnvVars = [
@@ -45,4 +68,18 @@ in
 	"${subversion}/lib/python2.5/site-packages";
     }
   ];
+  
+  startupScript = pkgs.writeScript "activateTrac" ''
+    mkdir -p /var/trac
+    chown ${config.user}:${config.group} /var/trac
+    
+    ${pkgs.lib.concatMapStrings (project:
+      ''
+        if [ ! -d /var/trac/${project.identifier} ]
+	then
+	    export PYTHONPATH=${pkgs.pythonPackages.psycopg2}/lib/python2.5/site-packages
+	    ${pkgs.pythonPackages.trac}/bin/trac-admin /var/trac/${project.identifier} initenv "${project.name}" "${project.databaseURL}" svn "${project.subversionRepository}"
+	fi
+      '' ) (config.projects)}
+  '';
 }
-- 
GitLab


From 17c063b6274fe831a13b91f469eabd58b7cd4377 Mon Sep 17 00:00:00 2001
From: Sander van der Burg <s.vanderburg@tudelft.nl>
Date: Fri, 4 Sep 2009 22:01:08 +0000
Subject: [PATCH 1787/5331] Added an option that automatically creates the
 mount points in /etc/exports, so that everything is self initializing

svn path=/nixos/trunk/; revision=16963
---
 .../network-filesystems/nfs-kernel.nix        | 27 ++++++++++++++-----
 1 file changed, 20 insertions(+), 7 deletions(-)

diff --git a/modules/services/network-filesystems/nfs-kernel.nix b/modules/services/network-filesystems/nfs-kernel.nix
index b41e33bb4ba..6868e75ff1a 100644
--- a/modules/services/network-filesystems/nfs-kernel.nix
+++ b/modules/services/network-filesystems/nfs-kernel.nix
@@ -41,6 +41,11 @@ let
             specify  the  number  of NFS server threads. (-> man rpc.nfsd). Defaults to recommended value 8
           ";
         };
+	
+	createMountPoints = mkOption {
+	  default = false;
+	  description = "Whether to create the mount points in the exports file at startup time.";
+	};
       };
     };
   };
@@ -81,19 +86,27 @@ mkIf config.services.nfsKernel.enable {
         stop on network-interfaces/stop
 
         start script
-	  export PATH=${pkgs.nfsUtils}/sbin
+	  export PATH=${pkgs.nfsUtils}/sbin:$PATH
 	  mkdir -p /var/lib/nfs
           ${modprobe}/sbin/modprobe nfsd || true
+	  
+	  ${if cfg.createMountPoints == true then
+	    ''
+	      cat /etc/exports | while read line
+	      do
+	        for i in $line
+		do
+		  mkdir -p $i
+		  break
+		done
+	      done
+	    ''
+	    else ""}
+	    	  
           exportfs -ra
         end script
 
         respawn sleep 1000000
-
-        start script
-	  mkdir -p /var/lib/nfs
-	  export PATH=${pkgs.nfsUtils}/sbin
-          exportfs -ra
-        end script
       '';
     }
     {
-- 
GitLab


From 4c2650d0157d20c0b34bce21792c126751eb905f Mon Sep 17 00:00:00 2001
From: Sander van der Burg <s.vanderburg@tudelft.nl>
Date: Fri, 4 Sep 2009 22:06:54 +0000
Subject: [PATCH 1788/5331] - The repository is no longer explicitly created on
 the storage server, but on the webserver in which the /repos dir is a NFS
 mount - NFS mounts are created during startup time - Played a bit with
 waiting times in order to capture a nice screenshot

svn path=/nixos/trunk/; revision=16964
---
 tests/trac.nix | 35 ++++++++++++++++-------------------
 1 file changed, 16 insertions(+), 19 deletions(-)

diff --git a/tests/trac.nix b/tests/trac.nix
index bf10ad68a54..181ada3ad0e 100644
--- a/tests/trac.nix
+++ b/tests/trac.nix
@@ -19,16 +19,11 @@ rec {
           nfsKernel = {
             enable = true;
             exports = ''
-              /repos/trac 192.168.1.0/255.255.255.0(rw,no_root_squash)
+              /repos 192.168.1.0/255.255.255.0(rw,no_root_squash)
             '';
+	    createMountPoints = true;
           };    
-        };
-  
-        environment = {
-          extraPackages = [
-            pkgs.subversion
-          ];
-        };
+        };  
       };
 
     postgresql =
@@ -57,6 +52,12 @@ rec {
     webserver = 
       {config, pkgs, ...}:
       {
+        fileSystems = pkgs.lib.mkOverride 50 {} 
+	[ 
+	  { mountPoint = "/repos";
+	    device = "storage:/repos"; } 
+	];
+      
         services = {
 	  portmap = {
 	    enable = true;
@@ -64,7 +65,7 @@ rec {
 
           nfsKernel = {
             enable = true;
-          };	  
+          };
   
           httpd = {
             enable = true;
@@ -76,7 +77,7 @@ rec {
         };
 	
 	environment = {
-	  extraPackages = [ pkgs.pythonPackages.trac ];
+	  extraPackages = [ pkgs.pythonPackages.trac pkgs.subversion ];
 	};
       };
       
@@ -124,7 +125,6 @@ rec {
  
         environment = {
 	  extraPackages = [
-	    pkgs.firefoxWrapper
 	    pkgs.scrot
 	  ];
 	};
@@ -137,24 +137,21 @@ rec {
     ''
       startAll;
       
-      $storage->mustSucceed("mkdir -p /repos/trac");
-      $storage->mustSucceed("svnadmin create /repos/trac");
-      
       $postgresql->waitForFile("/tmp/.s.PGSQL.5432");
       $postgresql->mustSucceed("createdb trac");
-
+      
       $webserver->mustSucceed("mkdir -p /repos/trac");
-      #$webserver->mustSucceed("mount storage:/repos/trac /repos/trac");
+      $webserver->mustSucceed("svnadmin create /repos/trac");
       
-      $webserver->waitForFile("/var/trac");
+      $webserver->waitForFile("/var/trac");      
       $webserver->mustSucceed("mkdir -p /var/trac/projects/test");
       $webserver->mustSucceed("PYTHONPATH=${pkgs.pythonPackages.psycopg2}/lib/python2.5/site-packages trac-admin /var/trac/projects/test initenv Test postgres://root\@postgresql/trac svn /repos/trac");
       
       $client->waitForFile("/tmp/.X11-unix/X0");
       sleep 60;
       
-      print STDERR $client->execute("DISPLAY=:0.0 konqueror http://webserver/projects/test &");
-      sleep 30;
+      print STDERR $client->execute("su - alice -c 'DISPLAY=:0.0 konqueror http://webserver/projects/test &'");
+      sleep 120;
       
       print STDERR $client->execute("DISPLAY=:0.0 scrot /hostfs/$ENV{out}/screen1.png");
     '';
-- 
GitLab


From d6b1b4615a290eb124ec551973df4252e42c2c9a Mon Sep 17 00:00:00 2001
From: Sander van der Burg <s.vanderburg@tudelft.nl>
Date: Fri, 4 Sep 2009 23:04:29 +0000
Subject: [PATCH 1789/5331] Shortened the Trac test expression a bit to make it
 more readable

svn path=/nixos/trunk/; revision=16965
---
 tests/trac.nix | 137 +++++++++++++++----------------------------------
 1 file changed, 42 insertions(+), 95 deletions(-)

diff --git a/tests/trac.nix b/tests/trac.nix
index 181ada3ad0e..785c75b8132 100644
--- a/tests/trac.nix
+++ b/tests/trac.nix
@@ -11,42 +11,27 @@ rec {
     storage = 
       {pkgs, config, ...}:
       {
-        services = {
-          portmap = {
-            enable = true;
-          };
-    
-          nfsKernel = {
-            enable = true;
-            exports = ''
-              /repos 192.168.1.0/255.255.255.0(rw,no_root_squash)
-            '';
-	    createMountPoints = true;
-          };    
-        };  
+        services.portmap.enable = true;
+        services.nfsKernel.enable = true;
+        services.nfsKernel.exports = ''
+          /repos 192.168.1.0/255.255.255.0(rw,no_root_squash)
+        '';
+	services.nfsKernel.createMountPoints = true;
       };
 
     postgresql =
       {config, pkgs, ...}:
       {
-        services = {
-          sshd = {
-            enable = true;
-          };
-    
-          postgresql = {
-            enable = true;
-    	    enableTCPIP = true;
-	    
-            authentication = ''
-              # Generated file; do not edit!
-              local all all                trust
-              host  all all 127.0.0.1/32   trust
-	      host  all all ::1/128        trust
-	      host  all all 192.168.1.0/24 trust
-            '';
-          };
-        };  
+        services.sshd.enable = true;
+        services.postgresql.enable = true;
+    	services.postgresql.enableTCPIP = true;
+        services.postgresql.authentication = ''
+          # Generated file; do not edit!
+          local all all                trust
+          host  all all 127.0.0.1/32   trust
+	  host  all all ::1/128        trust
+	  host  all all 192.168.1.0/24 trust
+        '';
       };
 
     webserver = 
@@ -58,76 +43,38 @@ rec {
 	    device = "storage:/repos"; } 
 	];
       
-        services = {
-	  portmap = {
-	    enable = true;
-	  };
-
-          nfsKernel = {
-            enable = true;
-          };
-  
-          httpd = {
-            enable = true;
-            adminAddr = "root@localhost";
-            extraSubservices = [
-	      { serviceType = "trac"; }
-            ];
-          };
-        };
-	
-	environment = {
-	  extraPackages = [ pkgs.pythonPackages.trac pkgs.subversion ];
-	};
+        services.portmap.enable = true;
+        services.nfsKernel.enable = true;
+        services.httpd.enable = true;
+        services.httpd.adminAddr = "root@localhost";
+        services.httpd.extraSubservices = [ { serviceType = "trac"; } ];
+	environment.systemPackages = [ pkgs.pythonPackages.trac pkgs.subversion ];
       };
       
     client = 
       {config, pkgs, ...}:
       {
-        services = {
-	  xserver = {
-	    enable = true;
-
-            displayManager = {
-	      slim = {
-	        enable = false;
-	      };
-              kdm = {
-	        enable = true;
-		extraConfig =
-                  ''
-                    [X-:0-Core]
-                    AutoLoginEnable=true
-                    AutoLoginUser=alice
-                    AutoLoginPass=foobar
-                  '';
-	      };
-	    };
-	    desktopManager = {
-	      default = "kde4";
-	      kde4 = {
-	        enable = true;
-	      };
-	    };            
-	  };
-	};
-	
-	users = {
-	  extraUsers = pkgs.lib.singleton { 
-	      name = "alice";
-              description = "Alice Foobar";
-              home = "/home/alice";
-              createHome = true;
-              useDefaultShell = true;
-              password = "foobar";
-          };
+        services.xserver.enable = true;
+        services.xserver.displayManager.slim.enable = false;
+        services.xserver.displayManager.kdm.enable = true;
+	services.xserver.displayManager.kdm.extraConfig =
+          ''
+            [X-:0-Core]
+            AutoLoginEnable=true
+            AutoLoginUser=alice
+            AutoLoginPass=foobar
+          '';
+	services.xserver.desktopManager.default = "kde4";
+	services.xserver.desktopManager.kde4.enable = true;
+	users.extraUsers = pkgs.lib.singleton { 
+	  name = "alice";
+          description = "Alice Foobar";
+          home = "/home/alice";
+          createHome = true;
+          useDefaultShell = true;
+          password = "foobar";
         };
- 
-        environment = {
-	  extraPackages = [
-	    pkgs.scrot
-	  ];
-	};
+        environment.systemPackages = [ pkgs.scrot ];
       };
   };
     
-- 
GitLab


From 93571df6808c794749d83dcaee1ea84478704c1d Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 9 Sep 2009 21:22:00 +0000
Subject: [PATCH 1790/5331] * Make sure that hal is really running when the X
 server starts,   otherwise we could end up without any input devices.

svn path=/nixos/trunk/; revision=16998
---
 modules/services/hardware/hal.nix | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/modules/services/hardware/hal.nix b/modules/services/hardware/hal.nix
index b8d858faa92..5e448d13d90 100644
--- a/modules/services/hardware/hal.nix
+++ b/modules/services/hardware/hal.nix
@@ -84,11 +84,21 @@ in
         preStart =
           ''
             mkdir -m 0755 -p /var/cache/hald
+            mkdir -m 0755 -p /var/run/hald
             
             rm -f /var/cache/hald/fdi-cache
+
+            # !!! Hack: start the daemon here to make sure it's
+            # running when the Upstart job reaches the "running"
+            # state.  Should be fixable in Upstart 0.6.
+            ${hal}/sbin/hald
           '';
 
-        exec = "${hal}/sbin/hald --daemon=no";
+        postStop =
+          '' 
+            pid=$(cat /var/run/hald/pid)
+            test -n "$pid" && kill "$pid"
+         '';
       };
 
     services.udev.packages = [hal];
-- 
GitLab


From cbe27af1912254721c01d73c5f2d7cd56fac3d71 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 9 Sep 2009 21:22:25 +0000
Subject: [PATCH 1791/5331] * Removed an unnecessary flag.

svn path=/nixos/trunk/; revision=16999
---
 modules/system/boot/kernel.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/modules/system/boot/kernel.nix b/modules/system/boot/kernel.nix
index 2d5050f76b8..58a8948f4fd 100644
--- a/modules/system/boot/kernel.nix
+++ b/modules/system/boot/kernel.nix
@@ -25,7 +25,6 @@ let
 
       kernelParams = mkOption {
         default = [
-          "selinux=0"
           "apm=on"
           "acpi=on"
           "vga=0x317"
-- 
GitLab


From 6920f43f1cc6d2b671223c3e7c22421d0808d771 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 10 Sep 2009 12:37:33 +0000
Subject: [PATCH 1792/5331] Refactoring of the X server module:

* Modularised the xorg.conf generation.  For instance, the Wacom and
  Synaptics support has been moved into separate modules.  The
  contents of xorg.conf is defined by the option
  services.xserver.config, and various other options for specific
  sections (e.g. services.xserver.serverLayoutSection).

* displayManager.job.env: made this an attribute set.

* tcpEnable -> enableTCP for naming consistency.

* defaultDepth can be set to 0 to leave it undefined (needed for the
  vmware driver).

* Removed some options that seem obsolete or are now the default
  (e.g. RenderAccel, AllowGLXWithComposite).

* Removed services.xserver.package.  This can now be done using
  nixpkgs.config.packageOverrides.

svn path=/nixos/trunk/; revision=17004
---
 modules/module-list.nix                       |    2 +
 modules/services/x11/xserver/default.nix      | 1028 +++++++----------
 .../x11/xserver/desktop-managers/kde4.nix     |    2 +-
 .../x11/xserver/display-managers/default.nix  |   11 +-
 .../x11/xserver/display-managers/kdm.nix      |    4 +-
 .../x11/xserver/display-managers/slim.nix     |   11 +-
 .../x11/xserver/hardware/synaptics.nix        |   84 ++
 .../services/x11/xserver/hardware/wacom.nix   |   88 ++
 modules/services/x11/xserver/xserver.conf     |   92 --
 9 files changed, 609 insertions(+), 713 deletions(-)
 create mode 100644 modules/services/x11/xserver/hardware/synaptics.nix
 create mode 100644 modules/services/x11/xserver/hardware/wacom.nix
 delete mode 100644 modules/services/x11/xserver/xserver.conf

diff --git a/modules/module-list.nix b/modules/module-list.nix
index 0f554bdb653..e49a9b3631c 100644
--- a/modules/module-list.nix
+++ b/modules/module-list.nix
@@ -96,6 +96,8 @@
   ./services/x11/xserver/display-managers/default.nix
   ./services/x11/xserver/display-managers/kdm.nix
   ./services/x11/xserver/display-managers/slim.nix
+  ./services/x11/xserver/hardware/synaptics.nix
+  ./services/x11/xserver/hardware/wacom.nix
   ./services/x11/xserver/window-managers/compiz.nix
   ./services/x11/xserver/window-managers/default.nix
   ./services/x11/xserver/window-managers/kwm.nix
diff --git a/modules/services/x11/xserver/default.nix b/modules/services/x11/xserver/default.nix
index 9845a7536bc..a3fda74ba83 100644
--- a/modules/services/x11/xserver/default.nix
+++ b/modules/services/x11/xserver/default.nix
@@ -1,353 +1,38 @@
-{config, pkgs, ...}:
-# TODO: this file need some make-up (Nicolas Pierron)
+{ config, pkgs, ... }:
 
 with pkgs.lib;
 
 let
-  kernelPackages = config.boot.kernelPackages;
-  # List of font directories.
-  fontDirectories = config.fonts.fonts;
-
-  options = {
-    services = {
-
-      xserver = {
-
-        enable = mkOption {
-          default = false;
-          description = "
-            Whether to enable the X server.
-          ";
-        };
-
-        autorun = mkOption {
-          default = true;
-          description = "
-            Switch to false to create upstart-job and configuration, 
-            but not run it automatically
-          ";
-        };
-
-        exportConfiguration = mkOption {
-          default = false;
-          description = "
-            Create /etc/X11/xorg.conf and a file with environment
-            variables
-          ";
-        };
-
-        tcpEnable = mkOption {
-          default = false;
-          description = "
-            Whether to enable TCP socket for the X server.
-          ";
-        };
-
-        resolutions = mkOption {
-          default = [{x = 1024; y = 768;} {x = 800; y = 600;} {x = 640; y = 480;}];
-          description = "
-            The screen resolutions for the X server.  The first element is the default resolution.
-          ";
-        };
-
-        videoDriver = mkOption {
-          default = "vesa";
-          example = "i810";
-          description = "
-            The name of the video driver for your graphics card.
-          ";
-        };
-
-        driSupport = mkOption {
-          default = false;
-          description = "
-            Whether to enable accelerated OpenGL rendering through the
-            Direct Rendering Interface (DRI).
-          ";
-        };
-
-/*
-        sessionType = mkOption {
-          default = "gnome";
-          example = "xterm";
-          description = "
-            The kind of session to start after login.  Current possibilies
-            are <literal>kde</literal> (which starts KDE),
-            <literal>gnome</literal> (which starts
-            <command>gnome-terminal</command>) and <literal>xterm</literal>
-            (which starts <command>xterm</command>).
-          ";
-        };
-
-        windowManager = mkOption {
-          default = "";
-          description = "
-            This option selects the window manager.  Available values are
-            <literal>twm</literal> (extremely primitive),
-            <literal>metacity</literal>, <literal>xmonad</literal>
-            and <literal>compiz</literal>.  If
-            left empty, the <option>sessionType</option> determines the
-            window manager, e.g., Metacity for Gnome, and
-            <command>kwm</command> for KDE.
-          ";
-        };
-
-        sessionStarter = mkOption {
-          example = "${pkgs.xterm}/bin/xterm -ls";
-          description = "
-            The command executed after login and after the window manager
-            has been started.  Used if
-            <option>services.xserver.sessionType</option> is empty.
-          ";
-        };
-*/
-
-        startSSHAgent = mkOption {
-          default = true;
-          description = "
-            Whether to start the SSH agent when you log in.  The SSH agent
-            remembers private keys for you so that you don't have to type in
-            passphrases every time you make an SSH connection.  Use
-            <command>ssh-add</command> to add a key to the agent.
-          ";
-        };
-
-        isClone = mkOption {
-          default = true;
-          example = false;
-          description = "
-            Whether to enable the X server clone mode for dual-head.
-          ";
-        };
-
-        synaptics = {
-          enable = mkOption {
-            default = false;
-            example = true;
-            description = "
-              Whether to replace mouse with touchpad.
-            ";
-          };
-          dev = mkOption {
-            default = "/dev/input/event0";
-            description = "
-              Event device for Synaptics touchpad.
-            ";
-          };
-          minSpeed = mkOption {
-            default = "0.06";
-            description = "Cursor speed factor for precision finger motion";
-          };
-          maxSpeed = mkOption {
-            default = "0.12";
-            description = "Cursor speed factor for highest-speed finger motion";
-          };
-          twoFingerScroll = mkOption {
-            default = false;
-            description = "Whether to enable two-finger drag-scrolling";
-          };
-        };
-
-        wacom = {
-	  enable = mkOption {
-	    default = false;
-	    description = "Whether to enable Wacom touchscreen/digitizer";
-	  };
-
-          device = mkOption {
-	    default = "/dev/ttyS0";
-	    description = "Device to use";
-	  };
-
-	  forceDeviceType = mkOption {
-	    default = "ISDV4";
-	    example = null;
-	    description = "Some models (think touchscreen) require forcing device type";
-	  };
-
-	};
-
-        layout = mkOption {
-          default = "us";
-          description = "
-            Keyboard layout.
-          ";
-        };
-
-        xkbModel = mkOption {
-          default = "pc104";
-          example = "presario";
-          description = "
-            Keyboard model.
-          ";
-        };
-
-        xkbOptions = mkOption {
-          default = "";
-          example = "grp:caps_toggle, grp_led:scroll";
-          description = "
-            X keyboard options; layout switching goes here.
-          ";
-        };
-
-        useInternalAGPGART = mkOption {
-          default = "";
-          example = "no";
-          description = "
-            Just the wrapper for an xorg.conf option.
-          ";
-        };
-
-        extraDeviceConfig = mkOption {
-          default = "";
-          example = "VideoRAM 131072";
-          description = "
-            Just anything to add into Device section.
-          ";
-        };
-
-        extraMonitorSettings = mkOption {
-          default = "";
-          example = "HorizSync 28-49";
-          description = "
-            Just anything to add into Monitor section.
-          ";
-        };
-
-        extraDisplaySettings = mkOption {
-          default = "";
-          example = "Virtual 2048 2048";
-          description = "
-            Just anything to add into Display subsection (located in Screen section).
-          ";
-        };
-   
-        extraModules = mkOption {
-          default = "";
-          example = "
-            SubSection \"extmod\"
-            EndSubsection
-          ";
-          description = "
-            Just anything to add into Modules section.
-          ";
-        };
-
-        serverLayoutOptions = mkOption {
-          default = "";
-          example = "
-            Option \"AIGLX\" \"true\"
-          ";
-          description = "
-            Just anything to add into Monitor section.
-          ";
-        };
-
-        defaultDepth = mkOption {
-          default = 24;
-          example = 8;
-          description = "
-            Default colour depth.
-          ";
-        };
-        
-        useXFS = mkOption {
-          default = false;
-          example = "unix/:7100";
-          description = "
-            Way to access the X Font Server to use.
-          ";
-        };
-
-        tty = mkOption {
-          default = 7;
-          example = 9;
-          description = "
-            Virtual console for the X server.
-          ";
-        };
-
-        display = mkOption {
-          default = 0;
-          example = 1;
-          description = "
-            Display number for the X server.
-          ";
-        };
-
-        package = mkOption {
-          default = pkgs.xorg;
-          description = "
-            Alternative X.org package to use. For 
-            example, you can replace individual drivers.
-          ";
-        };
-
-        virtualScreen = mkOption {
-          default = null;
-          example = {
-            x=2048;
-            y=2048;
-          };
-          description = "
-            Virtual screen size for Xrandr
-          ";
-        };
-      };
-
-    };
-
-    environment.x11Packages = mkOption {
-      default = [];
-      type = types.list types.package;
-      description = "
-        List of packages added to the system when the xserver is
-        activated. (<option>services.xserver.enable</option>).
-      ";
-    };
-  };
-in
 
-let
+  kernelPackages = config.boot.kernelPackages;
 
   # Abbreviations.
   cfg = config.services.xserver;
-  xorg = cfg.package;
-  stdenv = pkgs.stdenv;
+  xorg = pkgs.xorg;
+
 
+  # Map the video driver setting to a driver.
   knownVideoDrivers = {
-    nvidia = { modulesFirst = [ kernelPackages.nvidia_x11 ]; };  #make sure it first loads the nvidia libs
-    vesa =   { modules = [xorg.xf86videovesa]; };
-    vga =    { modules = [xorg.xf86videovga]; };
-    sis =    { modules = [xorg.xf86videosis]; };
-    i810 =   { modules = [xorg.xf86videoi810]; };
-    intel =  { modules = [xorg.xf86videointel]; };
-    nv =     { modules = [xorg.xf86videonv]; };
-    ati =    { modules = [xorg.xf86videoati]; };
-    openchrome = { modules = [xorg.xf86videoopenchrome]; };
-    cirrus = { modules = [xorg.xf86videocirrus]; };
+    nvidia =     { modules = [ kernelPackages.nvidia_x11 ]; };
+    vesa =       { modules = [ xorg.xf86videovesa ]; };
+    vga =        { modules = [ xorg.xf86videovga ]; };
+    sis =        { modules = [ xorg.xf86videosis ]; };
+    i810 =       { modules = [ xorg.xf86videoi810 ]; };
+    intel =      { modules = [ xorg.xf86videointel ]; };
+    nv =         { modules = [ xorg.xf86videonv ]; };
+    ati =        { modules = [ xorg.xf86videoati ]; };
+    openchrome = { modules = [ xorg.xf86videoopenchrome ]; };
+    cirrus =     { modules = [ xorg.xf86videocirrus ]; };
+    vmware =     { modules = [ xorg.xf86videovmware ]; };
   };
 
-  # Get a bunch of user settings.
   videoDriver = cfg.videoDriver;
-  resolutions = map (res: ''"${toString res.x}x${toString res.y}"'') (cfg.resolutions);
 
-  videoDriverModules = attrByPath [videoDriver] (throw "unknown video driver: `${videoDriver}'") knownVideoDrivers;
-
-  modules = 
-    attrByPath ["modulesFirst"] [] videoDriverModules
-    ++ [
-      xorg.xorgserver
-      xorg.xf86inputevdev
-    ] 
-    ++ attrByPath ["modules"] [] videoDriverModules
-    ++ optional cfg.synaptics.enable xorg.xf86inputsynaptics
-    ++ (optional cfg.wacom.enable ["${pkgs.linuxwacom}"])
-    ;
+  videoDriverInfo = attrByPath [videoDriver] (throw "unknown video driver: `${videoDriver}'") knownVideoDrivers;
 
 
   fontsForXServer =
-    fontDirectories ++
+    config.fonts.fonts ++
     # We don't want these fonts in fonts.conf, because then modern,
     # fontconfig-based applications will get horrible bitmapped
     # Helvetica fonts.  It's better to get a substitution (like Nimbus
@@ -359,314 +44,445 @@ let
     ];
 
 
-  halConfigFiles = singleton
-    (pkgs.writeTextFile {
-      name = "hal-policy-keymap";
-      destination = "/share/hal/fdi/policy/30-keymap.fdi";
-      text = ''
-        <?xml version="1.0" encoding="ISO-8859-1"?>
-        <deviceinfo version="0.2">
-          <device>
-            <match key="info.capabilities" contains="input.keymap">
-              <append key="info.callouts.add" type="strlist">hal-setup-keymap</append>
-            </match>
-
-            <match key="info.capabilities" contains="input.keys">
-              <merge key="input.x11_options.XkbRules" type="string">base</merge>
-              <merge key="input.x11_options.XkbModel" type="string">${cfg.xkbModel}</merge>
-              <merge key="input.x11_options.XkbLayout" type="string">${cfg.layout}</merge>
-              <append key="input.x11_options.XkbOptions" type="strlist">${cfg.xkbOptions}</append>
-            </match>
-          </device>
-        </deviceinfo>
-      '';
-    });
-
-    
-  configFile = stdenv.mkDerivation {
+  configFile = pkgs.stdenv.mkDerivation {
     name = "xserver.conf";
-    src = ./xserver.conf;
-    inherit fontsForXServer videoDriver resolutions;
-    isClone = if cfg.isClone then "on" else "off";
-
-    synapticsInputDevice = if cfg.synaptics.enable then ''
-      Section "InputDevice"
-        Identifier "Touchpad[0]"
-        Driver "synaptics"
-        Option "Device" "${cfg.synaptics.dev}"
-        Option "Protocol" "PS/2"
-        Option "LeftEdge" "1700"
-        Option "RightEdge" "5300"
-        Option "TopEdge" "1700"
-        Option "BottomEdge" "4200"
-        Option "FingerLow" "25"
-        Option "FingerHigh" "30"
-        Option "MaxTapTime" "180"
-        Option "MaxTapMove" "220"
-        Option "VertScrollDelta" "100"
-        Option "MinSpeed" "${cfg.synaptics.minSpeed}"
-        Option "MaxSpeed" "${cfg.synaptics.maxSpeed}"
-        Option "AccelFactor" "0.0010"
-        Option "SHMConfig" "on"
-        Option "Repeater" "/dev/input/mice"
-        Option "TapButton1" "1"
-        Option "TapButton2" "2"
-        Option "TapButton3" "3"
-        Option "VertTwoFingerScroll" "${if cfg.synaptics.twoFingerScroll then "1" else "0"}"
-        Option "HorizTwoFingerScroll" "${if cfg.synaptics.twoFingerScroll then "1" else "0"}"
-      EndSection
-    '' else "";
-
-    wacomInputDevice = if cfg.wacom.enable then ''
-      Section "InputDevice"
-        Driver "wacom"
-        Identifier "Wacom_stylus"
-        Option "Device" "${cfg.wacom.device}"
-        Option "Type" "stylus"
-        ${if cfg.wacom.forceDeviceType!=null then ''Option "ForceDevice" "${cfg.wacom.forceDeviceType}"'' else ""}
-        Option "Button2" "3"
-      EndSection
-      Section "InputDevice"
-        Driver "wacom"
-        Identifier "Wacom_eraser"
-        Option "Device" "${cfg.wacom.device}"
-        Option "Type" "eraser"
-        ${if cfg.wacom.forceDeviceType!=null then ''Option "ForceDevice" "${cfg.wacom.forceDeviceType}"'' else ""}
-        Option "Button1" "2"
-      EndSection
-      Section "InputDevice"
-        Driver "wacom"
-        Identifier "Wacom_cursor"
-        Option "Device" "${cfg.wacom.device}"
-        Option "Type" "cursor"
-        ${if cfg.wacom.forceDeviceType!=null then ''Option "ForceDevice" "${cfg.wacom.forceDeviceType}"'' else ""}
-      EndSection
-    '' else "";
-
-    xkbOptions = if cfg.xkbOptions == "" then "" else  ''
-      Option "XkbOptions" "${cfg.xkbOptions}"
-    '';
-
-    setCorePointer = 
-      if cfg.synaptics.enable then ''
-        InputDevice "Touchpad[0]" "CorePointer"
-      '' else "";
-
-    internalAGPGART =
-      if cfg.useInternalAGPGART == "yes" then
-        ''  Option "UseInternalAGPGART" "yes"''
-      else if cfg.useInternalAGPGART == "no" then
-        ''  Option "UseInternalAGPGART" "no"''
-      else "";
-
-    extraDeviceConfig = cfg.extraDeviceConfig; 
-    extraMonitorSettings = cfg.extraMonitorSettings; 
-    extraDisplaySettings = cfg.extraDisplaySettings;
-    extraModules = cfg.extraModules; 
-    serverLayoutOptions = cfg.serverLayoutOptions +
-    (if cfg.wacom.enable then ''
-      InputDevice "Wacom_stylus"
-      InputDevice "Wacom_cursor"
-      InputDevice "Wacom_eraser"
-    '' else "")
-    ; 
-    defaultDepth = cfg.defaultDepth; 
-    virtualScreen = if cfg.virtualScreen != null then 
-        "Virtual ${toString cfg.virtualScreen.x} ${toString cfg.virtualScreen.y}" 
-      else "";
-
-    xfs = if cfg.useXFS == false then "" else 
+
+    xfs = optionalString (cfg.useXFS != false)
       ''FontPath "${toString cfg.useXFS}"'';
 
-    buildCommand = ''
-      buildCommand= # urgh, don't substitute this
-
-      export fontPaths=
-      for i in $fontsForXServer; do
-        if test "''${i:0:''${#NIX_STORE}}" == "$NIX_STORE"; then
-          for j in $(find $i -name fonts.dir); do
-            fontPaths="''${fontPaths}FontPath \"$(dirname $j)\"''\n"
-          done
-        fi
-      done
-
-      export modulePaths=
-      for i in $(find ${toString modules} -type d); do
-        if ls $i/*.so* > /dev/null 2>&1; then
-          modulePaths="''${modulePaths}ModulePath \"$i\"''\n"
-        fi
-      done
-
-      export moduleSection=""
-      export screen=""
-      export device=""
-      export extensions=""
-
-
-      #if only my gf were this dirty
-      if test "${toString videoDriver}" == "nvidia"; then
-        export screen='
-          Option "AddARGBGLXVisuals" "true"
-          Option "DisableGLXRootClipping" "true"
-          Option "RandRRotation" "on"
-        '
-        
-        export device='
-          Option "RenderAccel" "true"
-          Option "AllowGLXWithComposite" "true"
-          Option "AddARGBGLXVisuals" "true"
-        '
-        
-        export extensions='
-          Option "Composite" "Enable"
-        '
-      fi
+    inherit (cfg) config;
+
+    buildCommand =
+      ''
+        echo 'Section "Files"' >> $out
+        echo $xfs >> $out
+
+        for i in ${toString fontsForXServer}; do
+          if test "''${i:0:''${#NIX_STORE}}" == "$NIX_STORE"; then
+            for j in $(find $i -name fonts.dir); do
+              echo "  FontPath \"$(dirname $j)\"" >> $out
+            done
+          fi
+        done
+                
+        for i in $(find ${toString cfg.modules} -type d); do
+          if test $(echo $i/*.so* | wc -w) -ne 0; then
+            echo "  ModulePath \"$i\"" >> $out
+          fi
+        done
+
+        echo 'EndSection' >> $out
         
-      if [ "${toString videoDriver}" = i810 ]; then
-        export extensions='
-          Option "Composite" "Enable"
-        ';
-      fi;
-
-      if [ "${toString videoDriver}" = ati ]; then
-        export extensions='
-          Option "Composite" "Enable"
-        ';
-      fi;
-
-      if [ "${toString videoDriver}" = radeonhd ]; then
-        export extensions='
-          Option "Composite" "Enable"
-        ';
-      fi;
-
-      substituteAll $src $out
-    ''; # */
+        echo "$config" >> $out
+      ''; # */
   };
 
 
+  halConfigFiles = singleton (pkgs.writeTextFile
+    { name = "hal-policy-keymap";
+      destination = "/share/hal/fdi/policy/30-keymap.fdi";
+      text =
+        ''
+          <?xml version="1.0" encoding="ISO-8859-1"?>
+          <deviceinfo version="0.2">
+            <device>
+              <match key="info.capabilities" contains="input.keymap">
+                <append key="info.callouts.add" type="strlist">hal-setup-keymap</append>
+              </match>
+
+              <match key="info.capabilities" contains="input.keys">
+                <merge key="input.x11_options.XkbRules" type="string">base</merge>
+                <merge key="input.x11_options.XkbModel" type="string">${cfg.xkbModel}</merge>
+                <merge key="input.x11_options.XkbLayout" type="string">${cfg.layout}</merge>
+                <append key="input.x11_options.XkbOptions" type="strlist">${cfg.xkbOptions}</append>
+              </match>
+            </device>
+          </deviceinfo>
+        '';
+    });
 
+  
 in
 
-mkIf cfg.enable {
+{
 
-  assertions = [ { assertion = config.services.hal.enable == true; message = "The X server needs HAL running. Set services.hal.enable to true"; } ];
+  imports =
+    [ ./display-managers/default.nix
+      ./window-managers/default.nix
+      ./desktop-managers/default.nix
+    ];
 
-  require = [
-    options
 
-    # services.xserver.*Manager
-    ./display-managers/default.nix
-    ./window-managers/default.nix
-    ./desktop-managers/default.nix
+  ###### interface
+  
+  options = {
+  
+    services.xserver = {
+
+      enable = mkOption {
+        default = false;
+        description = ''
+          Whether to enable the X server.
+        '';
+      };
 
-    # services.extraJobs
-    # ../../upstart-jobs/default.nix
+      autorun = mkOption {
+        default = true;
+        description = ''
+          Whether to start the X server automatically.
+        '';
+      };
 
-    # environment.etc
-    # ../../etc/default.nix
+      exportConfiguration = mkOption {
+        default = false;
+        description = ''
+          Whether to symlink the X server configuration under
+          <filename>/etc/X11/xorg.conf</filename>.
+        '';
+      };
 
-    # fonts.fonts
-    # ../../system/fonts.nix
+      enableTCP = mkOption {
+        default = false;
+        description = ''
+          Whether to allow the X server to accept TCP connections.
+        '';
+      };
 
-    # boot.extraModulePackages
-    # security.extraSetuidPrograms
-    # environment.extraPackages
-  ];
+      modules = mkOption {
+        default = [];
+        example = [ pkgs.linuxwacom ];
+        description = "Packages to be added to the module search path of the X server.";
+      };
 
-  boot = {
-    extraModulePackages = mkIf (cfg.videoDriver == "nvidia") [
-      kernelPackages.nvidia_x11
-    ];
-  };
+      resolutions = mkOption {
+        default = [ {x = 1024; y = 768;} {x = 800; y = 600;} {x = 640; y = 480;} ];
+        description = ''
+          The screen resolutions for the X server.  The first element is the default resolution.
+        '';
+      };
 
-  environment = {
-    etc = mkIf cfg.exportConfiguration [
-      { source = "${configFile}";
-        target = "X11/xorg.conf";
-      }
-      # -xkbdir command line option does not seems to be passed to xkbcomp.
-      { source = "${pkgs.xkeyboard_config}/etc/X11/xkb";
-        target = "X11/xkb";
-      }
-    ];
+      videoDriver = mkOption {
+        default = "vesa";
+        example = "i810";
+        description = ''
+          The name of the video driver for your graphics card.
+        '';
+      };
 
-    x11Packages = [
-      xorg.xrandr
-      xorg.xrdb
-      xorg.setxkbmap
-      xorg.iceauth # required for KDE applications (it's called by dcopserver)
-    ]
-    ++ optional (videoDriver == "nvidia") kernelPackages.nvidia_x11;
+      driSupport = mkOption {
+        default = true;
+        description = ''
+          Whether to enable accelerated OpenGL rendering through the
+          Direct Rendering Interface (DRI).
+        '';
+      };
 
-    extraPackages = config.environment.x11Packages;
-  };
+      startSSHAgent = mkOption {
+        default = true;
+        description = ''
+          Whether to start the SSH agent when you log in.  The SSH agent
+          remembers private keys for you so that you don't have to type in
+          passphrases every time you make an SSH connection.  Use
+          <command>ssh-add</command> to add a key to the agent.
+        '';
+      };
 
-  services = {
-    xserver = {
-      displayManager = {
-        xserverArgs = [
-          "-ac"
-          "-logverbose"
-          "-verbose"
-          "-terminate"
-          "-logfile" "/var/log/X.${toString cfg.display}.log"
-          "-config ${configFile}"
-          ":${toString cfg.display}" "vt${toString cfg.tty}"
-          "-xkbdir" "${pkgs.xkeyboard_config}/etc/X11/xkb"
-        ] ++ optional (!cfg.tcpEnable) "-nolisten tcp";
+      isClone = mkOption {
+        default = true;
+        example = false;
+        description = ''
+          Whether to enable the X server clone mode for dual-head.
+        '';
+      };
+
+      layout = mkOption {
+        default = "us";
+        description = ''
+          Keyboard layout.
+        '';
       };
-    };
 
-    hal.packages = halConfigFiles;
+      xkbModel = mkOption {
+        default = "pc104";
+        example = "presario";
+        description = ''
+          Keyboard model.
+        '';
+      };
 
-    extraJobs = [{
-      name = "xserver";
-      job = ''
-        start on ${if cfg.autorun then "hal" else "never"}
+      xkbOptions = mkOption {
+        default = "";
+        example = "grp:caps_toggle, grp_led:scroll";
+        description = ''
+          X keyboard options; layout switching goes here.
+        '';
+      };
 
-        start script
+      config = mkOption {
+        description = ''
+          The contents of the configuration file of the X server
+          (<filename>xorg.conf</filename>).
+        '';
+      };
 
-          # Ugly hack: wait until udev has started since the X server
-          # needs various devices.  This would more properly be
-          # expressed as an Upstart dependency, but AFAIK in "start
-          # on" we can't express a logical AND.
-          while ! initctl status udev 2>&1 | grep -q running; do
-              sleep 1
-          done
-        
-          rm -f /var/run/opengl-driver
-          ${if videoDriver == "nvidia"
-            then ''
-              ln -sf ${kernelPackages.nvidia_x11} /var/run/opengl-driver
-            ''
-            else if cfg.driSupport
-            then "ln -sf ${pkgs.mesa} /var/run/opengl-driver"
-            else ""
-           }
+      deviceSection = mkOption {
+        default = "";
+        example = "VideoRAM 131072";
+        description = "Contents of the first Device section of the X server configuration file.";
+      };
 
-          ${cfg.displayManager.job.beforeScript}
+      monitorSection = mkOption {
+        default = "";
+        example = "HorizSync 28-49";
+        description = "Contents of the first Monitor section of the X server configuration file.";
+      };
 
-          rm -f /tmp/.X0-lock
+      moduleSection = mkOption {
+        default = "";
+        example =
+          ''
+            SubSection "extmod"
+            EndSubsection
+          '';
+        description = "Contents of the Module section of the X server configuration file.";
+      };
 
-        end script
+      serverLayoutSection = mkOption {
+        default = "";
+        example =
+          ''
+            Option "AIGLX" "true"
+          '';
+        description = "Contents of the ServerLayout section of the X server configuration file.";
+      };
 
-        ${cfg.displayManager.job.env}
-        env FONTCONFIG_FILE=/etc/fonts/fonts.conf # !!! cleanup
-        env XKB_BINDIR=${xorg.xkbcomp}/bin # Needed for the Xkb extension.
+      extraDisplaySettings = mkOption {
+        default = "";
+        example = "Virtual 2048 2048";
+        description = "Lines to be added to every Display subsection of the Screen section.";
+      };
 
-        ${if videoDriver == "nvidia" 
-          then "env LD_LIBRARY_PATH=${xorg.libX11}/lib:${xorg.libXext}/lib:${kernelPackages.nvidia_x11}/lib"
-          else ""
-        }
+      defaultDepth = mkOption {
+        default = 24;
+        example = 8;
+        description = "Default colour depth.";
+      };
 
-        ${if videoDriver != "nvidia"
-          then "env XORG_DRI_DRIVER_PATH=${pkgs.mesa}/lib/dri"
-          else ""
+      useXFS = mkOption {
+        default = false;
+        example = "unix/:7100";
+        description = "Determines how to connect to the X Font Server.";
+      };
+
+      tty = mkOption {
+        default = 7;
+        example = 9;
+        description = "Virtual console for the X server.";
+      };
+
+      display = mkOption {
+        default = 0;
+        example = 1;
+        description = "Display number for the X server.";
+      };
+
+      virtualScreen = mkOption {
+        default = null;
+        example = { x = 2048; y = 2048; };
+        description = ''
+          Virtual screen size for Xrandr.
+        '';
+      };
+      
+    };
+
+    environment.x11Packages = mkOption {
+      default = [];
+      type = types.list types.package;
+      description = ''
+        List of packages added to the system when the X server is
+        activated (<option>services.xserver.enable</option>).
+      '';
+    };
+    
+  };
+
+
+  ###### implementation
+  
+  config = mkIf cfg.enable {
+
+    assertions = singleton
+      { assertion = config.services.hal.enable == true;
+        message = "The X server needs HAL running. Set services.hal.enable to true";
+      };
+
+    boot.extraModulePackages =
+      optional (cfg.videoDriver == "nvidia") kernelPackages.nvidia_x11;
+
+    environment.etc = optionals cfg.exportConfiguration
+      [ { source = "${configFile}";
+          target = "X11/xorg.conf";
+        }
+        # -xkbdir command line option does not seems to be passed to xkbcomp.
+        { source = "${pkgs.xkeyboard_config}/etc/X11/xkb";
+          target = "X11/xkb";
         }
+      ];
+    
+    environment.x11Packages =
+      [ xorg.xorgserver
+        xorg.xrandr
+        xorg.xrdb
+        xorg.setxkbmap
+        xorg.iceauth # required for KDE applications (it's called by dcopserver)
+        xorg.xsetroot
+      ]
+      ++ optional (videoDriver == "nvidia") kernelPackages.nvidia_x11;
+
+    environment.systemPackages = config.environment.x11Packages;
+    
+    services.hal.packages = halConfigFiles;
+
+    jobs = singleton
+      { name = "xserver";
+
+        startOn = if cfg.autorun then "hal" else "never";
+ 
+        environment =
+          { FONTCONFIG_FILE = "/etc/fonts/fonts.conf"; # !!! cleanup
+            XKB_BINDIR = "${xorg.xkbcomp}/bin"; # Needed for the Xkb extension.
+          } // optionalAttrs (videoDriver != "nvidia") {
+            XORG_DRI_DRIVER_PATH = "${pkgs.mesa}/lib/dri";
+          } // optionalAttrs (videoDriver == "nvidia") {
+            LD_LIBRARY_PATH = "${xorg.libX11}/lib:${xorg.libXext}/lib:${kernelPackages.nvidia_x11}/lib";
+          } // cfg.displayManager.job.environment;
+
+        preStart =
+          ''
+            # Ugly hack: wait until udev has started since the X server
+            # needs various devices.  This would more properly be
+            # expressed as an Upstart dependency, but AFAIK in "start
+            # on" we can't express a logical AND.
+            while ! initctl status udev 2>&1 | grep -q running; do
+                sleep 1
+            done
+        
+            rm -f /var/run/opengl-driver
+            ${if videoDriver == "nvidia"
+              then ''
+                ln -sf ${kernelPackages.nvidia_x11} /var/run/opengl-driver
+              ''
+              else if cfg.driSupport
+              then "ln -sf ${pkgs.mesa} /var/run/opengl-driver"
+              else ""
+             }
+
+            ${cfg.displayManager.job.beforeScript}
+
+            rm -f /tmp/.X0-lock
+          '';
+
+        exec = "${cfg.displayManager.job.execCmd}";
+      };
+
+    services.xserver.displayManager.xserverArgs =
+      [ "-ac"
+        "-logverbose"
+        "-verbose"
+        "-terminate"
+        "-logfile" "/var/log/X.${toString cfg.display}.log"
+        "-config ${configFile}"
+        ":${toString cfg.display}" "vt${toString cfg.tty}"
+        "-xkbdir" "${pkgs.xkeyboard_config}/etc/X11/xkb"
+      ] ++ optional (!cfg.enableTCP) "-nolisten tcp";
+
+    services.xserver.modules = videoDriverInfo.modules
+      ++ [ xorg.xorgserver xorg.xf86inputevdev ];
+    
+    services.xserver.config =
+      ''
+        Section "ServerFlags"
+          Option "AllowMouseOpenFail" "on"
+        EndSection
+
+        Section "Module"
+          ${cfg.moduleSection}
+        EndSection
+
+        Section "Monitor"
+          ${cfg.monitorSection}
+        EndSection
+
+        Section "Device"
+          ${cfg.deviceSection}
+        EndSection
+
+        Section "ServerLayout"
+          ${cfg.serverLayoutSection}
+        EndSection
+
+        Section "Screen"
+          Identifier "Screen[0]"
+          Device "Device[0]"
+          Monitor "Monitor[0]"
+
+          ${optionalString (cfg.defaultDepth != 0) ''
+            DefaultDepth ${toString cfg.defaultDepth}
+          ''}
+
+          ${optionalString (cfg.videoDriver == "nvidia") ''
+            Option "RandRRotation" "on"
+          ''}
+
+          ${
+            let
+              f = depth:
+                ''
+                  SubSection "Display"
+                    Depth ${toString depth}
+                    Modes ${concatMapStrings (res: ''"${toString res.x}x${toString res.y}"'') cfg.resolutions}
+                    ${cfg.extraDisplaySettings}
+                    ${optionalString (cfg.virtualScreen != null)
+                      "Virtual ${toString cfg.virtualScreen.x} ${toString cfg.virtualScreen.y}"}
+                  EndSubSection
+                '';
+            in concatMapStrings f [8 16 24]
+          }
+
+        EndSection
+
+        Section "Extensions"
+          ${optionalString (cfg.videoDriver == "nvidia" || cfg.videoDriver == "i810" || cfg.videoDriver == "ati" || cfg.videoDriver == "radeonhd") ''
+            Option "Composite" "Enable"
+          ''}
+        EndSection
+
+        Section "DRI"
+          Mode 0666 # !!! FIX THIS!
+        EndSection
+      '';
 
-        exec ${cfg.displayManager.job.execCmd}
+    services.xserver.monitorSection =
+      ''
+        Identifier "Monitor[0]"
       '';
-    }];
+      
+    services.xserver.deviceSection =
+      ''
+        Identifier "Device[0]"
+        Driver "${cfg.videoDriver}"
+
+        # !!! Is the "Clone" option still useful?
+        Option "Clone" "${if cfg.isClone then "on" else "off"}"
+      '';
+
+    services.xserver.serverLayoutSection =
+      ''
+        Identifier "Layout[all]"
+        Screen "Screen[0]"
+      '';
+
   };
+
 }
diff --git a/modules/services/x11/xserver/desktop-managers/kde4.nix b/modules/services/x11/xserver/desktop-managers/kde4.nix
index 9ce593f1444..b8edf73815b 100644
--- a/modules/services/x11/xserver/desktop-managers/kde4.nix
+++ b/modules/services/x11/xserver/desktop-managers/kde4.nix
@@ -6,7 +6,7 @@ let
 
   xcfg = config.services.xserver;
   cfg = xcfg.desktopManager.kde4;
-  xorg = xcfg.package;
+  xorg = pkgs.xorg;
 
 in
 
diff --git a/modules/services/x11/xserver/display-managers/default.nix b/modules/services/x11/xserver/display-managers/default.nix
index 83ccae7a41a..9e251501e5b 100644
--- a/modules/services/x11/xserver/display-managers/default.nix
+++ b/modules/services/x11/xserver/display-managers/default.nix
@@ -3,10 +3,11 @@
 let
   inherit (pkgs.lib) mkOption mergeOneOption optionals filter concatMap concatMapStrings;
   cfg = config.services.xserver;
-  xorg = cfg.package;
+  xorg = pkgs.xorg;
 
   # file provided by services.xserver.displayManager.session.script
-  xsession = wm: dm: pkgs.writeScript "xsession" ''#!/bin/sh
+  xsession = wm: dm: pkgs.writeScript "xsession" ''
+    #!/bin/sh
 
     source /etc/profile
 
@@ -161,12 +162,10 @@ in
         job = mkOption {
           default = {};
           example = {
-            beforeScript = ''
+            preStart = ''
               rm -f /var/log/slim.log
             '';
-            env = ''
-              env SLIM_CFGFILE=/etc/slim.conf
-            '';
+            environment = { SLIM_CFGFILE = /etc/slim.conf; };
             execCmd = "${pkgs.slim}/bin/slim";
           };
 
diff --git a/modules/services/x11/xserver/display-managers/kdm.nix b/modules/services/x11/xserver/display-managers/kdm.nix
index cb80c500952..77093e00f81 100644
--- a/modules/services/x11/xserver/display-managers/kdm.nix
+++ b/modules/services/x11/xserver/display-managers/kdm.nix
@@ -74,11 +74,11 @@ in
   
     services.xserver.displayManager.job =
       { beforeScript = "";
-        env = "";
+        environment = {};
         execCmd = "${kdebase_workspace}/bin/kdm -config ${kdmrc}";
       };
 
-    security.pam.services = [ { name = "kde"; localLogin = true; } ];
+    security.pam.services = [ { name = "kde"; localLogin = true; ckHack = true; } ];
       
   };
   
diff --git a/modules/services/x11/xserver/display-managers/slim.nix b/modules/services/x11/xserver/display-managers/slim.nix
index 2c50b912e73..acef3879107 100644
--- a/modules/services/x11/xserver/display-managers/slim.nix
+++ b/modules/services/x11/xserver/display-managers/slim.nix
@@ -93,15 +93,14 @@ in
   config = mkIf cfg.enable {
 
     services.xserver.displayManager.job =
-      { beforeScript =
+      { preStart =
           ''
             rm -f /var/log/slim.log
           '';
-        env =
-          ''
-            env SLIM_CFGFILE=${slimConfig}
-            env SLIM_THEMESDIR=${slimThemesDir}
-          '';
+        environment =
+          { SLIM_CFGFILE = slimConfig;
+            SLIM_THEMESDIR = slimThemesDir;
+          };
         execCmd = "${pkgs.slim}/bin/slim";
       };
 
diff --git a/modules/services/x11/xserver/hardware/synaptics.nix b/modules/services/x11/xserver/hardware/synaptics.nix
new file mode 100644
index 00000000000..57e5318f481
--- /dev/null
+++ b/modules/services/x11/xserver/hardware/synaptics.nix
@@ -0,0 +1,84 @@
+{ config, pkgs, ... }:
+
+with pkgs.lib;
+
+let cfg = config.services.xserver.synaptics; in
+
+{
+
+  options = {
+
+    services.xserver.synaptics = {
+      
+      enable = mkOption {
+        default = false;
+        example = true;
+        description = "Whether to enable touchpad support.";
+      };
+
+      dev = mkOption {
+        default = "/dev/input/event0";
+        description = "Event device for Synaptics touchpad.";
+      };
+
+      minSpeed = mkOption {
+        default = "0.06";
+        description = "Cursor speed factor for precision finger motion.";
+      };
+
+      maxSpeed = mkOption {
+        default = "0.12";
+        description = "Cursor speed factor for highest-speed finger motion.";
+      };
+
+      twoFingerScroll = mkOption {
+        default = false;
+        description = "Whether to enable two-finger drag-scrolling.";
+      };
+
+    };
+
+  };
+
+
+  config = mkIf cfg.enable {
+
+    services.xserver.modules = [ pkgs.xorg.xf86inputsynaptics ];
+
+    services.xserver.config =
+      ''
+        Section "InputDevice"
+          Identifier "Touchpad[0]"
+          Driver "synaptics"
+          Option "Device" "${cfg.dev}"
+          Option "Protocol" "PS/2"
+          Option "LeftEdge" "1700"
+          Option "RightEdge" "5300"
+          Option "TopEdge" "1700"
+          Option "BottomEdge" "4200"
+          Option "FingerLow" "25"
+          Option "FingerHigh" "30"
+          Option "MaxTapTime" "180"
+          Option "MaxTapMove" "220"
+          Option "VertScrollDelta" "100"
+          Option "MinSpeed" "${cfg.minSpeed}"
+          Option "MaxSpeed" "${cfg.maxSpeed}"
+          Option "AccelFactor" "0.0010"
+          Option "SHMConfig" "on"
+          Option "Repeater" "/dev/input/mice"
+          Option "TapButton1" "1"
+          Option "TapButton2" "2"
+          Option "TapButton3" "3"
+          Option "VertTwoFingerScroll" "${if cfg.twoFingerScroll then "1" else "0"}"
+          Option "HorizTwoFingerScroll" "${if cfg.twoFingerScroll then "1" else "0"}"
+        EndSection
+      '';
+
+    services.xserver.serverLayoutSection =
+      ''
+        InputDevice "Touchpad[0]" "CorePointer"
+      '';
+
+  };
+
+}
diff --git a/modules/services/x11/xserver/hardware/wacom.nix b/modules/services/x11/xserver/hardware/wacom.nix
new file mode 100644
index 00000000000..2ad2c12c495
--- /dev/null
+++ b/modules/services/x11/xserver/hardware/wacom.nix
@@ -0,0 +1,88 @@
+{ config, pkgs, ... }:
+
+with pkgs.lib;
+
+let
+
+  cfg = config.services.xserver.wacom;
+
+in
+
+{
+
+  options = {
+
+    services.xserver.wacom = {
+      
+      enable = mkOption {
+        default = false;
+        description = "Whether to enable the Wacom touchscreen/digitizer.";
+      };
+
+      device = mkOption {
+        default = "/dev/ttyS0";
+        description = "Device to use.";
+      };
+
+      forceDeviceType = mkOption {
+        default = "ISDV4";
+        example = null;
+        description = "Some models (think touchscreen) require the device type to be specified.";
+      };
+
+    };
+
+  };
+
+
+  config = mkIf cfg.enable {
+
+    services.xserver.modules = [ pkgs.linuxwacom ];
+
+    services.udev.packages = [ pkgs.linuxwacom ];
+
+    services.xserver.serverLayoutSection =
+      ''
+        InputDevice "Wacom_stylus"
+        InputDevice "Wacom_cursor"
+        InputDevice "Wacom_eraser"
+      '';
+
+    services.xserver.config =
+      ''
+        Section "InputDevice"
+          Driver "wacom"
+          Identifier "Wacom_stylus"
+          Option "Device" "${cfg.device}"
+          Option "Type" "stylus"
+          ${optionalString (cfg.forceDeviceType != null) ''
+            Option "ForceDevice" "${cfg.forceDeviceType}"
+          ''}
+          Option "Button2" "3"
+        EndSection
+        
+        Section "InputDevice"
+          Driver "wacom"
+          Identifier "Wacom_eraser"
+          Option "Device" "${cfg.device}"
+          Option "Type" "eraser"
+          ${optionalString (cfg.forceDeviceType != null) ''
+            Option "ForceDevice" "${cfg.forceDeviceType}"
+          ''}
+          Option "Button1" "2"
+        EndSection
+        
+        Section "InputDevice"
+          Driver "wacom"
+          Identifier "Wacom_cursor"
+          Option "Device" "${cfg.device}"
+          Option "Type" "cursor"
+          ${optionalString (cfg.forceDeviceType != null) ''
+            Option "ForceDevice" "${cfg.forceDeviceType}"
+          ''}
+        EndSection
+      '';
+        
+  };
+
+}
diff --git a/modules/services/x11/xserver/xserver.conf b/modules/services/x11/xserver/xserver.conf
deleted file mode 100644
index 5b784884075..00000000000
--- a/modules/services/x11/xserver/xserver.conf
+++ /dev/null
@@ -1,92 +0,0 @@
-Section "Files"
-  # Font directories.
-  @xfs@
-  @fontPaths@
-
-  # Module (driver) directories.
-  @modulePaths@
-EndSection
-
-Section "ServerFlags"
-  Option "AllowMouseOpenFail" "on"
-EndSection
-
-
-Section "Module"
-  Load "bitmap"
-  Load "int10"
-  Load "vbe"
-  @moduleSection@
-  @extraModules@
-EndSection
-
-
-@synapticsInputDevice@
-
-@wacomInputDevice@
-
-Section "Monitor"
-  Identifier   "Monitor[0]"
-  Option       "DPMS"
-#  HorizSync    28-49
-#  VertRefresh  43-75
-  @extraMonitorSettings@
-EndSection
-
-
-Section "Screen"
-  Identifier   "Screen[0]"
-  Device       "Device[0]"
-  Monitor      "Monitor[0]"
-  DefaultDepth @defaultDepth@
-  SubSection "Display"
-    Depth      16
-    Modes      @resolutions@
-    @extraDisplaySettings@
-    @virtualScreen@
-  EndSubSection
-  SubSection "Display"
-    Depth      24
-    Modes      @resolutions@
-    @extraDisplaySettings@
-    @virtualScreen@
-  EndSubSection
-  #SubSection "Display"
-  #  Depth      32
-  #  Modes      @resolutions@
-  #  @extraDisplaySettings@
-  #EndSubSection
-
-  @screen@
-EndSection
-
-
-Section "Device"
-  Identifier   "Device[0]"
-  Driver       "@videoDriver@"
-  Option       "Clone" "@isClone@"
-  @device@
-  @internalAGPGART@
-  @extraDeviceConfig@
-EndSection
-
-
-Section "ServerLayout"
-  Identifier   "Layout[all]"
-  @setCorePointer@
-  Screen       "Screen[0]"
-  @serverLayoutOptions@
-  # If you want to disable HAL-based configuration, set AutoAddDevices to 0
-  # Option       "AutoAddDevices" "0"
-EndSection
-
-
-Section "Extensions"
-  @extensions@
-EndSection
-
-
-Section "DRI"
-  Mode         0666 # !!! FIX THIS!
-EndSection
-
-- 
GitLab


From bc95e0fdf9e8c08d5030ba6f8de255f0bd9b7055 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 10 Sep 2009 12:50:58 +0000
Subject: [PATCH 1793/5331] * Simplified the X server directory structure:
 x11/xserver/* -> x11/.

svn path=/nixos/trunk/; revision=17005
---
 modules/module-list.nix                       | 42 +++++++++----------
 .../desktop-managers/default.nix              |  0
 .../{xserver => }/desktop-managers/gnome.nix  |  0
 .../desktop-managers/kde-environment.nix      |  0
 .../{xserver => }/desktop-managers/kde.nix    |  0
 .../{xserver => }/desktop-managers/kde4.nix   |  0
 .../{xserver => }/desktop-managers/none.nix   |  0
 .../{xserver => }/desktop-managers/xterm.nix  |  0
 .../display-managers/default.nix              |  0
 .../{xserver => }/display-managers/kdm.nix    |  0
 .../{xserver => }/display-managers/slim.nix   |  0
 .../x11/{xserver => }/hardware/synaptics.nix  |  0
 .../x11/{xserver => }/hardware/wacom.nix      |  0
 .../{xserver => }/window-managers/compiz.nix  |  0
 .../{xserver => }/window-managers/default.nix |  0
 .../x11/{xserver => }/window-managers/kwm.nix |  0
 .../window-managers/metacity.nix              |  0
 .../{xserver => }/window-managers/none.nix    |  0
 .../x11/{xserver => }/window-managers/twm.nix |  0
 .../{xserver => }/window-managers/wmii.nix    |  0
 .../{xserver => }/window-managers/xmonad.nix  |  0
 .../x11/{xserver/default.nix => xserver.nix}  |  0
 22 files changed, 21 insertions(+), 21 deletions(-)
 rename modules/services/x11/{xserver => }/desktop-managers/default.nix (100%)
 rename modules/services/x11/{xserver => }/desktop-managers/gnome.nix (100%)
 rename modules/services/x11/{xserver => }/desktop-managers/kde-environment.nix (100%)
 rename modules/services/x11/{xserver => }/desktop-managers/kde.nix (100%)
 rename modules/services/x11/{xserver => }/desktop-managers/kde4.nix (100%)
 rename modules/services/x11/{xserver => }/desktop-managers/none.nix (100%)
 rename modules/services/x11/{xserver => }/desktop-managers/xterm.nix (100%)
 rename modules/services/x11/{xserver => }/display-managers/default.nix (100%)
 rename modules/services/x11/{xserver => }/display-managers/kdm.nix (100%)
 rename modules/services/x11/{xserver => }/display-managers/slim.nix (100%)
 rename modules/services/x11/{xserver => }/hardware/synaptics.nix (100%)
 rename modules/services/x11/{xserver => }/hardware/wacom.nix (100%)
 rename modules/services/x11/{xserver => }/window-managers/compiz.nix (100%)
 rename modules/services/x11/{xserver => }/window-managers/default.nix (100%)
 rename modules/services/x11/{xserver => }/window-managers/kwm.nix (100%)
 rename modules/services/x11/{xserver => }/window-managers/metacity.nix (100%)
 rename modules/services/x11/{xserver => }/window-managers/none.nix (100%)
 rename modules/services/x11/{xserver => }/window-managers/twm.nix (100%)
 rename modules/services/x11/{xserver => }/window-managers/wmii.nix (100%)
 rename modules/services/x11/{xserver => }/window-managers/xmonad.nix (100%)
 rename modules/services/x11/{xserver/default.nix => xserver.nix} (100%)

diff --git a/modules/module-list.nix b/modules/module-list.nix
index e49a9b3631c..d44d15c09e4 100644
--- a/modules/module-list.nix
+++ b/modules/module-list.nix
@@ -84,28 +84,28 @@
   ./services/web-servers/apache-httpd/default.nix
   ./services/web-servers/jboss.nix
   ./services/web-servers/tomcat.nix
+  ./services/x11/desktop-managers/default.nix
+  ./services/x11/desktop-managers/gnome.nix
+  ./services/x11/desktop-managers/kde-environment.nix
+  ./services/x11/desktop-managers/kde.nix
+  ./services/x11/desktop-managers/kde4.nix
+  ./services/x11/desktop-managers/none.nix
+  ./services/x11/desktop-managers/xterm.nix
+  ./services/x11/display-managers/default.nix
+  ./services/x11/display-managers/kdm.nix
+  ./services/x11/display-managers/slim.nix
+  ./services/x11/hardware/synaptics.nix
+  ./services/x11/hardware/wacom.nix
+  ./services/x11/window-managers/compiz.nix
+  ./services/x11/window-managers/default.nix
+  ./services/x11/window-managers/kwm.nix
+  ./services/x11/window-managers/metacity.nix
+  ./services/x11/window-managers/none.nix
+  ./services/x11/window-managers/twm.nix
+  ./services/x11/window-managers/wmii.nix
+  ./services/x11/window-managers/xmonad.nix
   ./services/x11/xfs.nix
-  ./services/x11/xserver/default.nix
-  ./services/x11/xserver/desktop-managers/default.nix
-  ./services/x11/xserver/desktop-managers/gnome.nix
-  ./services/x11/xserver/desktop-managers/kde-environment.nix
-  ./services/x11/xserver/desktop-managers/kde.nix
-  ./services/x11/xserver/desktop-managers/kde4.nix
-  ./services/x11/xserver/desktop-managers/none.nix
-  ./services/x11/xserver/desktop-managers/xterm.nix
-  ./services/x11/xserver/display-managers/default.nix
-  ./services/x11/xserver/display-managers/kdm.nix
-  ./services/x11/xserver/display-managers/slim.nix
-  ./services/x11/xserver/hardware/synaptics.nix
-  ./services/x11/xserver/hardware/wacom.nix
-  ./services/x11/xserver/window-managers/compiz.nix
-  ./services/x11/xserver/window-managers/default.nix
-  ./services/x11/xserver/window-managers/kwm.nix
-  ./services/x11/xserver/window-managers/metacity.nix
-  ./services/x11/xserver/window-managers/none.nix
-  ./services/x11/xserver/window-managers/twm.nix
-  ./services/x11/xserver/window-managers/wmii.nix
-  ./services/x11/xserver/window-managers/xmonad.nix
+  ./services/x11/xserver.nix
   ./system/activation/activation-script.nix
   ./system/activation/top-level.nix
   ./system/boot/kernel.nix
diff --git a/modules/services/x11/xserver/desktop-managers/default.nix b/modules/services/x11/desktop-managers/default.nix
similarity index 100%
rename from modules/services/x11/xserver/desktop-managers/default.nix
rename to modules/services/x11/desktop-managers/default.nix
diff --git a/modules/services/x11/xserver/desktop-managers/gnome.nix b/modules/services/x11/desktop-managers/gnome.nix
similarity index 100%
rename from modules/services/x11/xserver/desktop-managers/gnome.nix
rename to modules/services/x11/desktop-managers/gnome.nix
diff --git a/modules/services/x11/xserver/desktop-managers/kde-environment.nix b/modules/services/x11/desktop-managers/kde-environment.nix
similarity index 100%
rename from modules/services/x11/xserver/desktop-managers/kde-environment.nix
rename to modules/services/x11/desktop-managers/kde-environment.nix
diff --git a/modules/services/x11/xserver/desktop-managers/kde.nix b/modules/services/x11/desktop-managers/kde.nix
similarity index 100%
rename from modules/services/x11/xserver/desktop-managers/kde.nix
rename to modules/services/x11/desktop-managers/kde.nix
diff --git a/modules/services/x11/xserver/desktop-managers/kde4.nix b/modules/services/x11/desktop-managers/kde4.nix
similarity index 100%
rename from modules/services/x11/xserver/desktop-managers/kde4.nix
rename to modules/services/x11/desktop-managers/kde4.nix
diff --git a/modules/services/x11/xserver/desktop-managers/none.nix b/modules/services/x11/desktop-managers/none.nix
similarity index 100%
rename from modules/services/x11/xserver/desktop-managers/none.nix
rename to modules/services/x11/desktop-managers/none.nix
diff --git a/modules/services/x11/xserver/desktop-managers/xterm.nix b/modules/services/x11/desktop-managers/xterm.nix
similarity index 100%
rename from modules/services/x11/xserver/desktop-managers/xterm.nix
rename to modules/services/x11/desktop-managers/xterm.nix
diff --git a/modules/services/x11/xserver/display-managers/default.nix b/modules/services/x11/display-managers/default.nix
similarity index 100%
rename from modules/services/x11/xserver/display-managers/default.nix
rename to modules/services/x11/display-managers/default.nix
diff --git a/modules/services/x11/xserver/display-managers/kdm.nix b/modules/services/x11/display-managers/kdm.nix
similarity index 100%
rename from modules/services/x11/xserver/display-managers/kdm.nix
rename to modules/services/x11/display-managers/kdm.nix
diff --git a/modules/services/x11/xserver/display-managers/slim.nix b/modules/services/x11/display-managers/slim.nix
similarity index 100%
rename from modules/services/x11/xserver/display-managers/slim.nix
rename to modules/services/x11/display-managers/slim.nix
diff --git a/modules/services/x11/xserver/hardware/synaptics.nix b/modules/services/x11/hardware/synaptics.nix
similarity index 100%
rename from modules/services/x11/xserver/hardware/synaptics.nix
rename to modules/services/x11/hardware/synaptics.nix
diff --git a/modules/services/x11/xserver/hardware/wacom.nix b/modules/services/x11/hardware/wacom.nix
similarity index 100%
rename from modules/services/x11/xserver/hardware/wacom.nix
rename to modules/services/x11/hardware/wacom.nix
diff --git a/modules/services/x11/xserver/window-managers/compiz.nix b/modules/services/x11/window-managers/compiz.nix
similarity index 100%
rename from modules/services/x11/xserver/window-managers/compiz.nix
rename to modules/services/x11/window-managers/compiz.nix
diff --git a/modules/services/x11/xserver/window-managers/default.nix b/modules/services/x11/window-managers/default.nix
similarity index 100%
rename from modules/services/x11/xserver/window-managers/default.nix
rename to modules/services/x11/window-managers/default.nix
diff --git a/modules/services/x11/xserver/window-managers/kwm.nix b/modules/services/x11/window-managers/kwm.nix
similarity index 100%
rename from modules/services/x11/xserver/window-managers/kwm.nix
rename to modules/services/x11/window-managers/kwm.nix
diff --git a/modules/services/x11/xserver/window-managers/metacity.nix b/modules/services/x11/window-managers/metacity.nix
similarity index 100%
rename from modules/services/x11/xserver/window-managers/metacity.nix
rename to modules/services/x11/window-managers/metacity.nix
diff --git a/modules/services/x11/xserver/window-managers/none.nix b/modules/services/x11/window-managers/none.nix
similarity index 100%
rename from modules/services/x11/xserver/window-managers/none.nix
rename to modules/services/x11/window-managers/none.nix
diff --git a/modules/services/x11/xserver/window-managers/twm.nix b/modules/services/x11/window-managers/twm.nix
similarity index 100%
rename from modules/services/x11/xserver/window-managers/twm.nix
rename to modules/services/x11/window-managers/twm.nix
diff --git a/modules/services/x11/xserver/window-managers/wmii.nix b/modules/services/x11/window-managers/wmii.nix
similarity index 100%
rename from modules/services/x11/xserver/window-managers/wmii.nix
rename to modules/services/x11/window-managers/wmii.nix
diff --git a/modules/services/x11/xserver/window-managers/xmonad.nix b/modules/services/x11/window-managers/xmonad.nix
similarity index 100%
rename from modules/services/x11/xserver/window-managers/xmonad.nix
rename to modules/services/x11/window-managers/xmonad.nix
diff --git a/modules/services/x11/xserver/default.nix b/modules/services/x11/xserver.nix
similarity index 100%
rename from modules/services/x11/xserver/default.nix
rename to modules/services/x11/xserver.nix
-- 
GitLab


From 5d55df7abf55c2750e17742ebef714b9089ddd14 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 10 Sep 2009 13:53:31 +0000
Subject: [PATCH 1794/5331] * Cleanup.

svn path=/nixos/trunk/; revision=17008
---
 modules/misc/assertions.nix | 44 +++++++++++++++++++++++--------------
 1 file changed, 28 insertions(+), 16 deletions(-)

diff --git a/modules/misc/assertions.nix b/modules/misc/assertions.nix
index 36eb36cb903..c2a94311a28 100644
--- a/modules/misc/assertions.nix
+++ b/modules/misc/assertions.nix
@@ -1,25 +1,37 @@
-{pkgs, config, ...}:
+{ config, pkgs, ... }:
+
+with pkgs.lib;
 
 let
-  inherit (pkgs.lib) mkOption filter concatMap concatStringsSep;
-  failed = map (x : x.message) (filter (x: ! x.assertion) config.assertions);
-in
 
+  failed = map (x: x.message) (filter (x: !x.assertion) config.assertions);
+
+in
+  
 {
 
-  assertions = mkOption {
-    default = [];
-    example = [{ assertion = false; msg = "you can't enable this for that reason"; }];
-    merge = pkgs.lib.mergeListOption;
-    description = ''
-      Add something like this
-      assertions = mkAlways [ { assertion = false; message = "false should have been true"; } ];
-      to your upstart-job.
-    '';
+  options = {
+
+    assertions = mkOption {
+      default = [];
+      example = [ { assertion = false; msg = "you can't enable this for that reason"; } ];
+      merge = pkgs.lib.mergeListOption;
+      description = ''
+        This option allows modules to express conditions that must
+        hold for the evaluation of the system configuration to
+        succeed, along with associated error messages for the user.
+      '';
+    };
+
   };
 
-  environment = {
-    # extraPackages are evaluated always. Thus the assertions are checked as well. hacky!
-    extraPackages = if [] == failed then [] else throw "\n!! failed assertions: !!\n${concatStringsSep "\n" (map (x: "- ${x}") failed)}";
+  config = {
+
+    # This option is evaluated always. Thus the assertions are checked as well. hacky!
+    environment.systemPackages =
+      if [] == failed then []
+      else throw "\nFailed assertions:\n${concatStringsSep "\n" (map (x: "- ${x}") failed)}";
+
   };
+  
 }
-- 
GitLab


From 22693ae44ef04943bfd6de7525f0f6fabf6aa29c Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 10 Sep 2009 14:43:11 +0000
Subject: [PATCH 1795/5331] * Disable wireless in a VM to prevent
 wpa_supplicant from flooding the   log.

svn path=/nixos/trunk/; revision=17010
---
 modules/virtualisation/qemu-vm.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/modules/virtualisation/qemu-vm.nix b/modules/virtualisation/qemu-vm.nix
index 69cc73954e0..37da613eed2 100644
--- a/modules/virtualisation/qemu-vm.nix
+++ b/modules/virtualisation/qemu-vm.nix
@@ -137,4 +137,7 @@ in
   # video driver the host uses.
   services.xserver.videoDriver = pkgs.lib.mkOverride 50 {} "vesa";
   services.xserver.defaultDepth = pkgs.lib.mkOverride 50 {} 16;
+
+  # Wireless won't work in the VM.
+  networking.enableWLAN = pkgs.lib.mkOverride 50 {} false;
 }
-- 
GitLab


From 0156cfbe9e5ff2514597a7614d8938c9a89c77be Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 10 Sep 2009 15:49:16 +0000
Subject: [PATCH 1796/5331] * Cleaned up the display manager module a bit.

svn path=/nixos/trunk/; revision=17012
---
 .../services/x11/display-managers/default.nix | 329 +++++++++---------
 modules/services/x11/display-managers/kdm.nix |   4 +-
 modules/services/x11/xserver.nix              |   2 +-
 3 files changed, 170 insertions(+), 165 deletions(-)

diff --git a/modules/services/x11/display-managers/default.nix b/modules/services/x11/display-managers/default.nix
index 9e251501e5b..54ed4dec218 100644
--- a/modules/services/x11/display-managers/default.nix
+++ b/modules/services/x11/display-managers/default.nix
@@ -1,183 +1,190 @@
-{pkgs, config, ...}:
+# This module declares the options to define a *display manager*, the
+# program responsible for handling X logins (such as xdm, kdm, gdb, or
+# SLiM).  The display manager allows the user to select a *session
+# type*.  When the user logs in, the display manager starts the
+# *session script* ("xsession" below) to launch the selected session
+# type.  The session type defines two things: the *desktop manager*
+# (e.g., KDE, Gnome or a plain xterm), and optionally the *window
+# manager* (e.g. kwin or twm).
+
+{ config, pkgs, ... }:
+
+with pkgs.lib;
 
 let
-  inherit (pkgs.lib) mkOption mergeOneOption optionals filter concatMap concatMapStrings;
+
   cfg = config.services.xserver;
   xorg = pkgs.xorg;
 
   # file provided by services.xserver.displayManager.session.script
-  xsession = wm: dm: pkgs.writeScript "xsession" ''
-    #!/bin/sh
-
-    source /etc/profile
-
-    exec > $HOME/.Xerrors 2>&1
-
-
-    ### Load X defaults.
-    if test -e ~/.Xdefaults; then
-      ${xorg.xrdb}/bin/xrdb -merge ~/.Xdefaults
-    fi
-
-    ${if cfg.startSSHAgent then ''
-      ### Start the SSH agent.
-      export SSH_ASKPASS=${pkgs.x11_ssh_askpass}/libexec/x11-ssh-askpass
-      eval $(${pkgs.openssh}/bin/ssh-agent)
-    '' else ""}
-
-    ### Allow user to override system-wide configuration
-    if test -f ~/.xsession; then
-        source ~/.xsession;
-    fi
-
-    # this script expect to have as first argument the following input
-    # "desktop-manager + window-manager".
-    arg="$1"
-
-    # extract the window manager.
-    windowManager="''${arg##* + }"
-    : ''${windowManager:=${cfg.windowManager.default}}
-    # extract the desktop manager.
-    desktopManager="''${arg% + *}"
-    : ''${desktopManager:=${cfg.desktopManager.default}}
-
-    # used to restart the xserver.
-    waitPID=0
-
-    # handle window manager starts.
-    case $windowManager in
-      ${concatMapStrings (s: "
-        (${s.name})
-          ${s.start}
-          ;;
-      ") wm}
-      (*) echo "$0: Window manager '$windowManager' not found.";;
-    esac
-
-    # handle desktop manager starts.
-    case $desktopManager in
-      ${concatMapStrings (s: "
-        (${s.name})
-          ${s.start}
-          ;;
-      ") dm}
-      (*) echo "$0: Desktop manager '$desktopManager' not found.";;
-    esac
-
-    test "$waitPID" != 0 && wait "$waitPID"
-    exit
-  '';
-
-  mkDesktops = names: pkgs.runCommand "desktops" {} ''
-    ensureDir $out
-    ${concatMapStrings (n: ''
-      cat - > "$out/${n}.desktop" << EODESKTOP
-      [Desktop Entry]
-      Version=1.0
-      Type=XSession
-      TryExec=${cfg.displayManager.session.script}
-      Exec=${cfg.displayManager.session.script} '${n}'
-      Name=${n}
-      Comment=
-      EODESKTOP
-    '') names}
-  '';
+  xsession = wm: dm: pkgs.writeScript "xsession"
+    ''
+      #! /bin/sh
+ 
+      exec > $HOME/.xsession-errors 2>&1
+
+      source /etc/profile
+
+      ### Load X defaults.
+      if test -e ~/.Xdefaults; then
+        ${xorg.xrdb}/bin/xrdb -merge ~/.Xdefaults
+      fi
+
+      ${optionalString cfg.startSSHAgent ''
+        ### Start the SSH agent.
+        export SSH_ASKPASS=${pkgs.x11_ssh_askpass}/libexec/x11-ssh-askpass
+        eval $(${pkgs.openssh}/bin/ssh-agent)
+      ''}
+
+      ### Allow user to override system-wide configuration
+      if test -f ~/.xsession; then
+          source ~/.xsession
+      fi
+
+      # The first argument of this script is the session type
+      sessionType="$1"
+
+      # The session type "<desktop-manager> + <window-manager>", so
+      # extract those.
+      windowManager="''${arg##* + }"
+      : ''${windowManager:=${cfg.windowManager.default}}
+      desktopManager="''${arg% + *}"
+      : ''${desktopManager:=${cfg.desktopManager.default}}
+
+      # Start the window manager.
+      case $windowManager in
+        ${concatMapStrings (s: ''
+          (${s.name})
+            ${s.start}
+            ;;
+        '') wm}
+        (*) echo "$0: Window manager '$windowManager' not found.";;
+      esac
+
+      # Start the desktop manager.
+      case $desktopManager in
+        ${concatMapStrings (s: ''
+          (${s.name})
+            ${s.start}
+            ;;
+        '') dm}
+        (*) echo "$0: Desktop manager '$desktopManager' not found.";;
+      esac
+
+      test -n "$waitPID" && wait "$waitPID"
+      exit 0
+    '';
+
+  mkDesktops = names: pkgs.runCommand "desktops" {}
+    ''
+      ensureDir $out
+      ${concatMapStrings (n: ''
+        cat - > "$out/${n}.desktop" << EODESKTOP
+        [Desktop Entry]
+        Version=1.0
+        Type=XSession
+        TryExec=${cfg.displayManager.session.script}
+        Exec=${cfg.displayManager.session.script} '${n}'
+        Name=${n}
+        Comment=
+        EODESKTOP
+      '') names}
+    '';
 
 in
 
 {
-  # list of display managers.
-  require = [
-    ./kdm.nix
-    ./slim.nix
-  ];
-
-  services = {
-    xserver = {
-      displayManager = {
-
-        xauthBin = mkOption {
-          default = "${xorg.xauth}/bin/xauth";
-          description = "
-            Path to the xauth binary used by display managers.
-          ";
-        };
 
-        xserverBin = mkOption {
-          default = "${xorg.xorgserver}/bin/X";
-          description = "
-            Path to the xserver binary used by display managers.
-          ";
-        };
+  imports = [ ./kdm.nix ./slim.nix ];
 
-        xserverArgs = mkOption {
-          default = [];
-          example = [
-            "-ac"
-            "-logverbose"
-            "-nolisten tcp"
-          ];
-          description = "
-            List of arguments which have to be pass to when
-            the display manager start the xserver.
-          ";
-          apply = toString;
-        };
 
-        session = mkOption {
-          default = [];
-          example = [
-            {
-              manage = "desktop";
-              name = "xterm";
-              start = "
-                ${pkgs.xterm}/bin/xterm -ls &
-                waitPID=$!
-              ";
-            }
-          ];
-          description = ''
-            List of session supported with the command used to start each
-            session.  Each session script can set the
-            <varname>waitPID</varname> shell variable to make this script
-            waiting until the end of the user session.  Each script is used
-            to define either a windows manager or a desktop manager.  These
-            can be differentiated by setting the attribute
-            <varname>manage</varname> either to <literal>"window"</literal>
-            or <literal>"desktop"</literal>.
-
-            The list of desktop manager and window manager should appear
-            inside the display manager with the desktop manager name
-            followed by the window manager name.
-          '';
-          apply = list: rec {
-            wm = filter (s: s.manage == "window") list;
-            dm = filter (s: s.manage == "desktop") list;
-            names = concatMap (d: map (w: d.name + " + " + w.name) wm) dm;
-            desktops = mkDesktops names;
-            script = xsession wm dm;
-          };
-        };
+  options = {
 
-        job = mkOption {
-          default = {};
-          example = {
-            preStart = ''
-              rm -f /var/log/slim.log
-            '';
-            environment = { SLIM_CFGFILE = /etc/slim.conf; };
-            execCmd = "${pkgs.slim}/bin/slim";
-          };
+    services.xserver.displayManager = {
 
-          description = "
-            List of arguments which have to be pass to when
-            the display manager start the xserver.
-          ";
+      xauthBin = mkOption {
+        default = "${xorg.xauth}/bin/xauth";
+        description = "Path to the <command>xauth</command> program used by display managers.";
+      };
 
-          merge = mergeOneOption;
+      xserverBin = mkOption {
+        default = "${xorg.xorgserver}/bin/X";
+        description = "Path to the X server used by display managers.";
+      };
+
+      xserverArgs = mkOption {
+        default = [];
+        example = [ "-ac" "-logverbose" "-nolisten tcp" ];
+        description = "List of arguments for the X server.";
+        apply = toString;
+      };
+
+      session = mkOption {
+        default = [];
+        example = [
+          {
+            manage = "desktop";
+            name = "xterm";
+            start = "
+              ${pkgs.xterm}/bin/xterm -ls &
+              waitPID=$!
+            ";
+          }
+        ];
+        description = ''
+          List of sessions supported with the command used to start each
+          session.  Each session script can set the
+          <varname>waitPID</varname> shell variable to make this script
+          wait until the end of the user session.  Each script is used
+          to define either a windows manager or a desktop manager.  These
+          can be differentiated by setting the attribute
+          <varname>manage</varname> either to <literal>"window"</literal>
+          or <literal>"desktop"</literal>.
+
+          The list of desktop manager and window manager should appear
+          inside the display manager with the desktop manager name
+          followed by the window manager name.
+        '';
+        apply = list: rec {
+          wm = filter (s: s.manage == "window") list;
+          dm = filter (s: s.manage == "desktop") list;
+          names = concatMap (d: map (w: d.name + " + " + w.name) wm) dm;
+          desktops = mkDesktops names;
+          script = xsession wm dm;
         };
+      };
 
+      job = mkOption {
+        default = {};
+        type = types.optionSet;
+        merge = mergeOneOption;
+        description = "This option defines how to start the display manager.";
+
+        options = {
+  
+          preStart = mkOption {
+            default = "";
+            example = "rm -f /var/log/my-display-manager.log";
+            description = "Script executed before the display manager is started.";
+          };
+         
+          execCmd = mkOption {
+            example = "${pkgs.slim}/bin/slim";
+            description = "Command to start the display manager.";
+          };
+         
+          environment = mkOption {
+            default = {};
+            example = { SLIM_CFGFILE = /etc/slim.conf; };
+            description = "Additional environment variables needed by the display manager.";
+          };
+         
+        };
+        
       };
+
     };
+    
   };
+
 }
diff --git a/modules/services/x11/display-managers/kdm.nix b/modules/services/x11/display-managers/kdm.nix
index 77093e00f81..d0d30effbf0 100644
--- a/modules/services/x11/display-managers/kdm.nix
+++ b/modules/services/x11/display-managers/kdm.nix
@@ -73,9 +73,7 @@ in
   config = mkIf cfg.enable {
   
     services.xserver.displayManager.job =
-      { beforeScript = "";
-        environment = {};
-        execCmd = "${kdebase_workspace}/bin/kdm -config ${kdmrc}";
+      { execCmd = "${kdebase_workspace}/bin/kdm -config ${kdmrc}";
       };
 
     security.pam.services = [ { name = "kde"; localLogin = true; ckHack = true; } ];
diff --git a/modules/services/x11/xserver.nix b/modules/services/x11/xserver.nix
index a3fda74ba83..b6fb55a3e99 100644
--- a/modules/services/x11/xserver.nix
+++ b/modules/services/x11/xserver.nix
@@ -378,7 +378,7 @@ in
               else ""
              }
 
-            ${cfg.displayManager.job.beforeScript}
+            ${cfg.displayManager.job.preStart}
 
             rm -f /tmp/.X0-lock
           '';
-- 
GitLab


From ecde113c525d31bf7b943fff9ae3d88c71b6c00f Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 10 Sep 2009 15:58:39 +0000
Subject: [PATCH 1797/5331] * Fix logging out in X.  Without this option, the X
 server dies for   some reason:

  Sep 10 17:52:49 dutibo kernel: mtrr: no MTRR for f0000000,400000 found
  Sep 10 17:52:50 dutibo kdm[2960]: X server for display :0 terminated unexpectedly
  Sep 10 17:52:50 dutibo kdm[2960]: Unable to fire up local display :0; disabling.

svn path=/nixos/trunk/; revision=17013
---
 modules/services/x11/display-managers/kdm.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/modules/services/x11/display-managers/kdm.nix b/modules/services/x11/display-managers/kdm.nix
index d0d30effbf0..55ab406b9e9 100644
--- a/modules/services/x11/display-managers/kdm.nix
+++ b/modules/services/x11/display-managers/kdm.nix
@@ -22,6 +22,8 @@ let
 
       [X-:*-Core]
       ServerCmd=${dmcfg.xserverBin} ${dmcfg.xserverArgs}
+      # Needed to prevent the X server from dying on logout and not coming back:
+      TerminateServer=true
 
       [X-*-Greeter]
       HiddenUsers=root,nixbld1,nixbld2,nixbld3,nixbld4,nixbld5,nixbld6,nixbld7,nixbld8,nixbld9,nixbld10
-- 
GitLab


From ca241a48017e43589bb2f9d19076364abc69df9a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Fri, 11 Sep 2009 09:41:19 +0000
Subject: [PATCH 1798/5331] Making twm work with the new xserver expression.

svn path=/nixos/trunk/; revision=17042
---
 modules/services/x11/window-managers/twm.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/services/x11/window-managers/twm.nix b/modules/services/x11/window-managers/twm.nix
index 9dc3bea8093..6b67934feb7 100644
--- a/modules/services/x11/window-managers/twm.nix
+++ b/modules/services/x11/window-managers/twm.nix
@@ -3,7 +3,7 @@
 let
   inherit (pkgs.lib) mkOption mkIf;
   cfg = config.services.xserver.windowManager.twm;
-  xorg = config.services.xserver.package;
+  xorg = pkgs.xorg;
 
   option = { services = { xserver = { windowManager = {
 
-- 
GitLab


From 297889f05c192d941478da392004f9cb0cefedc6 Mon Sep 17 00:00:00 2001
From: Sander van der Burg <s.vanderburg@tudelft.nl>
Date: Fri, 11 Sep 2009 10:43:13 +0000
Subject: [PATCH 1799/5331] Switched KDE 4.2 to KDE 4.3

svn path=/nixos/trunk/; revision=17043
---
 modules/services/x11/desktop-managers/kde4.nix | 11 ++++++-----
 modules/services/x11/display-managers/kdm.nix  |  2 +-
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/modules/services/x11/desktop-managers/kde4.nix b/modules/services/x11/desktop-managers/kde4.nix
index b8edf73815b..8a4800f7d0a 100644
--- a/modules/services/x11/desktop-managers/kde4.nix
+++ b/modules/services/x11/desktop-managers/kde4.nix
@@ -40,17 +40,18 @@ in
         start =
           ''
             # Start KDE.
-            exec ${pkgs.kde42.kdebase_workspace}/bin/startkde
+            exec ${pkgs.kde43.kdebase_workspace}/bin/startkde
           '';
       };
 
     security.setuidPrograms = [ "kcheckpass" ];
 
     environment.kdePackages =
-      [ pkgs.kde42.kdelibs
-        pkgs.kde42.kdebase
-        pkgs.kde42.kdebase_runtime
-        pkgs.kde42.kdebase_workspace
+      [ pkgs.kde43.kdelibs
+        pkgs.kde43.kdebase
+        pkgs.kde43.kdebase_runtime
+        pkgs.kde43.kdebase_workspace
+	pkgs.kde43.oxygen_icons
         pkgs.shared_mime_info
       ];
 
diff --git a/modules/services/x11/display-managers/kdm.nix b/modules/services/x11/display-managers/kdm.nix
index 55ab406b9e9..62d9c609ce6 100644
--- a/modules/services/x11/display-managers/kdm.nix
+++ b/modules/services/x11/display-managers/kdm.nix
@@ -7,7 +7,7 @@ let
   dmcfg = config.services.xserver.displayManager;
   cfg = dmcfg.kdm;
 
-  inherit (pkgs.kde42) kdebase_workspace;
+  inherit (pkgs.kde43) kdebase_workspace;
 
   defaultConfig =
     ''
-- 
GitLab


From 5c53a29a01945c8e4d543cfa0cfe28b239dd2dc0 Mon Sep 17 00:00:00 2001
From: Sander van der Burg <s.vanderburg@tudelft.nl>
Date: Fri, 11 Sep 2009 10:48:54 +0000
Subject: [PATCH 1800/5331] Changed reference from KDE 4.2 to KDE 4.3

svn path=/nixos/trunk/; revision=17044
---
 modules/services/x11/desktop-managers/kde-environment.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/services/x11/desktop-managers/kde-environment.nix b/modules/services/x11/desktop-managers/kde-environment.nix
index 51489a1d16b..e868ab78f4b 100644
--- a/modules/services/x11/desktop-managers/kde-environment.nix
+++ b/modules/services/x11/desktop-managers/kde-environment.nix
@@ -24,7 +24,7 @@ let
 
       kdePackages = mkOption {
         default = [];
-        example = [ pkgs.kde42.kdegames ];
+        example = [ pkgs.kde43.kdegames ];
         type = types.list types.package;
         description = ''
           Additional KDE packages to be used when you use KDE as a desktop
-- 
GitLab


From 6b0487d47f3451a972c28f355c7045aa65b833da Mon Sep 17 00:00:00 2001
From: Nicolas Pierron <nicolas.b.pierron@gmail.com>
Date: Sat, 12 Sep 2009 22:46:53 +0000
Subject: [PATCH 1801/5331] Replace "mergeOneOption" by "types.uniq".

svn path=/nixos/trunk/; revision=17074
---
 modules/services/x11/display-managers/default.nix | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/modules/services/x11/display-managers/default.nix b/modules/services/x11/display-managers/default.nix
index 54ed4dec218..2582679e9e7 100644
--- a/modules/services/x11/display-managers/default.nix
+++ b/modules/services/x11/display-managers/default.nix
@@ -156,8 +156,7 @@ in
 
       job = mkOption {
         default = {};
-        type = types.optionSet;
-        merge = mergeOneOption;
+        type = types.uniq types.optionSet;
         description = "This option defines how to start the display manager.";
 
         options = {
-- 
GitLab


From 2a1f28d92330e4808b311b0d45a71eff08d8bf67 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sun, 13 Sep 2009 10:47:51 +0000
Subject: [PATCH 1802/5331] * Disabling iso_rescue since it has been broken on
 x86_64 for months.   Also, I don't think we should have a separate "recue"
 CD.  Any   rescue tools should be added to iso_minimal.

svn path=/nixos/trunk/; revision=17082
---
 release.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/release.nix b/release.nix
index bd5914da39c..a07d36dfc15 100644
--- a/release.nix
+++ b/release.nix
@@ -86,11 +86,13 @@ let
       module = ./modules/installer/cd-dvd/installation-cd-minimal.nix;
       description = "minimal";
     };
-    
+
+    /*    
     iso_rescue = makeIso {
       module = ./modules/installer/cd-dvd/installation-cd-rescue.nix;
       description = "rescue";
     };
+    */
     
     iso_graphical = makeIso {
       module = ./modules/installer/cd-dvd/installation-cd-graphical.nix;
-- 
GitLab


From 6e2914fb9b9b8f6f3c2fe6f035e7195e198199a9 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sun, 13 Sep 2009 11:09:58 +0000
Subject: [PATCH 1803/5331] * Make the KDE modules work with KDE 4.2 and 4.3. 
 Also, when using   KDE 4.3, add Qt 4.5 instead of Qt 4.4 to the system path.

svn path=/nixos/trunk/; revision=17085
---
 .../x11/desktop-managers/kde-environment.nix      |  2 +-
 modules/services/x11/desktop-managers/kde4.nix    | 15 +++++++--------
 modules/services/x11/display-managers/kdm.nix     |  2 +-
 3 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/modules/services/x11/desktop-managers/kde-environment.nix b/modules/services/x11/desktop-managers/kde-environment.nix
index e868ab78f4b..6053832a3c3 100644
--- a/modules/services/x11/desktop-managers/kde-environment.nix
+++ b/modules/services/x11/desktop-managers/kde-environment.nix
@@ -24,7 +24,7 @@ let
 
       kdePackages = mkOption {
         default = [];
-        example = [ pkgs.kde43.kdegames ];
+        example = [ pkgs.kde4.kdegames ];
         type = types.list types.package;
         description = ''
           Additional KDE packages to be used when you use KDE as a desktop
diff --git a/modules/services/x11/desktop-managers/kde4.nix b/modules/services/x11/desktop-managers/kde4.nix
index 8a4800f7d0a..a4c63616347 100644
--- a/modules/services/x11/desktop-managers/kde4.nix
+++ b/modules/services/x11/desktop-managers/kde4.nix
@@ -40,24 +40,23 @@ in
         start =
           ''
             # Start KDE.
-            exec ${pkgs.kde43.kdebase_workspace}/bin/startkde
+            exec ${pkgs.kde4.kdebase_workspace}/bin/startkde
           '';
       };
 
     security.setuidPrograms = [ "kcheckpass" ];
 
     environment.kdePackages =
-      [ pkgs.kde43.kdelibs
-        pkgs.kde43.kdebase
-        pkgs.kde43.kdebase_runtime
-        pkgs.kde43.kdebase_workspace
-	pkgs.kde43.oxygen_icons
+      [ pkgs.kde4.kdelibs
+        pkgs.kde4.kdebase
+        pkgs.kde4.kdebase_runtime
+        pkgs.kde4.kdebase_workspace
         pkgs.shared_mime_info
-      ];
+      ] ++ optional (pkgs.kde4 ? oxygen_icons) pkgs.kde4.oxygen_icons;
 
     environment.x11Packages =
       [ xorg.xmessage # so that startkde can show error messages
-        pkgs.qt4 # needed for qdbus
+        pkgs.kde4.qt4 # needed for qdbus
         xorg.xset # used by startkde, non-essential
       ];
 
diff --git a/modules/services/x11/display-managers/kdm.nix b/modules/services/x11/display-managers/kdm.nix
index 62d9c609ce6..1b3b2080920 100644
--- a/modules/services/x11/display-managers/kdm.nix
+++ b/modules/services/x11/display-managers/kdm.nix
@@ -7,7 +7,7 @@ let
   dmcfg = config.services.xserver.displayManager;
   cfg = dmcfg.kdm;
 
-  inherit (pkgs.kde43) kdebase_workspace;
+  inherit (pkgs.kde4) kdebase_workspace;
 
   defaultConfig =
     ''
-- 
GitLab


From d1e7a902775fd2d2aaaac4e5973e6fc0b53a554c Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sun, 13 Sep 2009 13:26:35 +0000
Subject: [PATCH 1804/5331] * KDE likes to have xprop.

svn path=/nixos/trunk/; revision=17086
---
 modules/services/x11/xserver.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/modules/services/x11/xserver.nix b/modules/services/x11/xserver.nix
index b6fb55a3e99..63c7764f75d 100644
--- a/modules/services/x11/xserver.nix
+++ b/modules/services/x11/xserver.nix
@@ -337,6 +337,7 @@ in
         xorg.setxkbmap
         xorg.iceauth # required for KDE applications (it's called by dcopserver)
         xorg.xsetroot
+        xorg.xprop
       ]
       ++ optional (videoDriver == "nvidia") kernelPackages.nvidia_x11;
 
-- 
GitLab


From 6596a3ec55297007d530311113b059dc10dabd90 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sun, 13 Sep 2009 13:34:52 +0000
Subject: [PATCH 1805/5331] * When using kdm, always use our xsession script,
 even when the   default session is selected.  This is because we always want
 to run   our own initialisation (like starting ssh-agent).

* ssh-agent: don't start it is a child but have it re-exec the
  xsession script.  This ensures that ssh-agent quits when we log out.

* In the xsession script, don't redirect output to ~/.xsession-errors
  if the display manager is kdm, since kdm already does that.  In fact
  it uses ~/.xsession-errors<optional number> if there are concurrent
  X sessions.

* For consistency with other distros and the xdm manpage, exec the
  ~/.xsession script instead of sourcing it.  Do this for the "custom"
  session type provided by kdm.

svn path=/nixos/trunk/; revision=17087
---
 .../services/x11/display-managers/default.nix | 57 +++++++++++++------
 modules/services/x11/display-managers/kdm.nix |  2 +
 2 files changed, 41 insertions(+), 18 deletions(-)

diff --git a/modules/services/x11/display-managers/default.nix b/modules/services/x11/display-managers/default.nix
index 2582679e9e7..0343c6ae766 100644
--- a/modules/services/x11/display-managers/default.nix
+++ b/modules/services/x11/display-managers/default.nix
@@ -20,35 +20,47 @@ let
   xsession = wm: dm: pkgs.writeScript "xsession"
     ''
       #! /bin/sh
- 
-      exec > $HOME/.xsession-errors 2>&1
 
-      source /etc/profile
+      # Handle being called by kdm.
+      if test "''${1:0:1}" = /; then eval exec "$1"; fi
 
-      ### Load X defaults.
-      if test -e ~/.Xdefaults; then
-        ${xorg.xrdb}/bin/xrdb -merge ~/.Xdefaults
-      fi
+      # The first argument of this script is the session type.
+      sessionType="$1"
+      if test "$sessionType" = default; then sessionType=""; fi
+
+      ${optionalString (!cfg.displayManager.job.logsXsession) ''
+        exec > ~/.xsession-errors 2>&1
+      ''}
 
       ${optionalString cfg.startSSHAgent ''
-        ### Start the SSH agent.
-        export SSH_ASKPASS=${pkgs.x11_ssh_askpass}/libexec/x11-ssh-askpass
-        eval $(${pkgs.openssh}/bin/ssh-agent)
+        if test -z "$SSH_AUTH_SOCK"; then
+            # Restart this script as a child of the SSH agent.  (It is
+            # also possible to start the agent as a child that prints
+            # the required environment variabled on stdout, but in
+            # that mode ssh-agent is not terminated when we log out.)
+            export SSH_ASKPASS=${pkgs.x11_ssh_askpass}/libexec/x11-ssh-askpass
+            exec ${pkgs.openssh}/bin/ssh-agent "$0" "$sessionType"
+        fi
       ''}
 
-      ### Allow user to override system-wide configuration
-      if test -f ~/.xsession; then
-          source ~/.xsession
+      # Load X defaults.
+      if test -e ~/.Xdefaults; then
+          ${xorg.xrdb}/bin/xrdb -merge ~/.Xdefaults
       fi
 
-      # The first argument of this script is the session type
-      sessionType="$1"
+      source /etc/profile
+
+      # Allow the user to setup a custom session type.
+      if test "$sessionType" = custom; then
+          test -x ~/.xsession && exec ~/.xsession
+          sessionType="" # fall-thru if there is no ~/.xsession
+      fi
 
-      # The session type "<desktop-manager> + <window-manager>", so
+      # The session type is "<desktop-manager> + <window-manager>", so
       # extract those.
-      windowManager="''${arg##* + }"
+      windowManager="''${sessionType##* + }"
       : ''${windowManager:=${cfg.windowManager.default}}
-      desktopManager="''${arg% + *}"
+      desktopManager="''${sessionType% + *}"
       : ''${desktopManager:=${cfg.desktopManager.default}}
 
       # Start the window manager.
@@ -178,6 +190,15 @@ in
             description = "Additional environment variables needed by the display manager.";
           };
          
+          logsXsession = mkOption {
+            default = false;
+            description = ''
+              Whether the display manager redirects the
+              output of the session script to
+              <filename>~/.xsession-errors</filename>.
+            '';
+          };
+         
         };
         
       };
diff --git a/modules/services/x11/display-managers/kdm.nix b/modules/services/x11/display-managers/kdm.nix
index 1b3b2080920..c58b4867967 100644
--- a/modules/services/x11/display-managers/kdm.nix
+++ b/modules/services/x11/display-managers/kdm.nix
@@ -18,6 +18,7 @@ let
       [X-*-Core]
       Xrdb=${pkgs.xlibs.xrdb}/bin/xrdb
       SessionsDirs=${dmcfg.session.desktops}
+      Session=${dmcfg.session.script}
       FailsafeClient=${pkgs.xterm}/bin/xterm
 
       [X-:*-Core]
@@ -76,6 +77,7 @@ in
   
     services.xserver.displayManager.job =
       { execCmd = "${kdebase_workspace}/bin/kdm -config ${kdmrc}";
+        logsXsession = true;
       };
 
     security.pam.services = [ { name = "kde"; localLogin = true; ckHack = true; } ];
-- 
GitLab


From 0806a8e203f01a82f41b5d7fa430faf880b8a6a9 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sun, 13 Sep 2009 13:40:06 +0000
Subject: [PATCH 1806/5331] * Support the custom session type (i.e.
 ~/.xsession) in SLiM.

svn path=/nixos/trunk/; revision=17088
---
 modules/services/x11/display-managers/slim.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/services/x11/display-managers/slim.nix b/modules/services/x11/display-managers/slim.nix
index acef3879107..f8985f36b52 100644
--- a/modules/services/x11/display-managers/slim.nix
+++ b/modules/services/x11/display-managers/slim.nix
@@ -12,7 +12,7 @@ let
       xauth_path ${dmcfg.xauthBin}
       default_xserver ${dmcfg.xserverBin}
       xserver_arguments ${dmcfg.xserverArgs}
-      sessions ${pkgs.lib.concatStringsSep "," dmcfg.session.names}
+      sessions ${pkgs.lib.concatStringsSep "," (dmcfg.session.names ++ ["custom"])}
       login_cmd exec ${pkgs.stdenv.bash}/bin/sh ${dmcfg.session.script} "%session"
       halt_cmd ${pkgs.upstart}/sbin/shutdown -h now
       reboot_cmd ${pkgs.upstart}/sbin/shutdown -r now
-- 
GitLab


From 379778c385091a93dc412c4876f22cd618e3789f Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sun, 13 Sep 2009 14:05:21 +0000
Subject: [PATCH 1807/5331] * For X logins, don't use pam_ck_connector since it
 doesn't really   work for X logins.  (The documentation also says so.) 
 Instead just   call ck-launch-session from the xsession script.

svn path=/nixos/trunk/; revision=17090
---
 modules/security/pam.nix                      | 36 +++++++------------
 .../services/x11/display-managers/default.nix |  6 ++++
 modules/services/x11/display-managers/kdm.nix |  2 +-
 .../services/x11/display-managers/slim.nix    |  2 +-
 4 files changed, 20 insertions(+), 26 deletions(-)

diff --git a/modules/security/pam.nix b/modules/security/pam.nix
index 9be1bad0668..977ff0ae549 100644
--- a/modules/security/pam.nix
+++ b/modules/security/pam.nix
@@ -26,11 +26,9 @@ let
     , # If set, root doesn't need to authenticate (e.g. for the "chsh"
       # service).
       rootOK ? false
-    , # If set, this is a local login (e.g. virtual console or X), so
-      # the user gets ownership of audio devices etc.
-      localLogin ? false
-    , # Temporary hack to get SLiM to work with ConsoleKit.
-      ckHack ? false
+    , # If set, use ConsoleKit's PAM connector module to claim
+      # ownership of audio devices etc.
+      ownDevices ? false
     , # Whether to forward XAuth keys between users.  Mostly useful
       # for "su".
       forwardXAuth ? false
@@ -65,9 +63,7 @@ let
           ${optionalString config.users.ldap.enable
               "session optional ${pam_ldap}/lib/security/pam_ldap.so"}
           session required ${pam_unix2}/lib/security/pam_unix2.so
-          ${optionalString ckHack
-              "session required pam_env.so debug conffile=${envFile} readenv=0"}
-          ${optionalString localLogin
+          ${optionalString ownDevices
               "session optional ${pkgs.console_kit}/lib/security/pam_ck_connector.so"}
           ${optionalString forwardXAuth
               "session optional pam_xauth.so xauthpath=${pkgs.xorg.xauth}/bin/xauth systemuser=99"}
@@ -75,14 +71,6 @@ let
       target = "pam.d/${name}";
     };
 
-  # This is needed to get an active session in ConsoleKit.  Apparently
-  # a better way is to run ck-launch-session from the session starter
-  # (or let xdm/kdm do it).
-  envFile = pkgs.writeText "pam_env.conf"
-    ''
-      CKCON_X11_DISPLAY_DEVICE DEFAULT="/dev/tty7"
-    '';
-
 in
 
 {
@@ -104,13 +92,13 @@ in
           the name of the service.  The attribute
           <varname>rootOK</varname> specifies whether the root user is
           allowed to use this service without authentication.  The
-          attribute <varname>localLogin</varname> specifies whether
-          this is a local login service (e.g. <command>xdm</command>),
-          which implies that the user gets ownership of devices such
-          as audio and CD-ROM drives.  The
-          attribute <varname>forwardXAuth</varname> specifies whether
-          X authentication keys should be passed from the calling user
-          to the target user (e.g. for <command>su</command>).
+          attribute <varname>ownDevices</varname> specifies whether
+          ConsoleKit's PAM connector module should be used to give the
+          user ownership of devices such as audio and CD-ROM drives.
+          The attribute <varname>forwardXAuth</varname> specifies
+          whether X authentication keys should be passed from the
+          calling user to the target user (e.g. for
+          <command>su</command>).
         '';
     };
 
@@ -151,7 +139,7 @@ in
         { name = "useradd"; rootOK = true; }
         # Used by groupadd etc.
         { name = "shadow"; rootOK = true; }
-        { name = "login"; localLogin = true; }
+        { name = "login"; ownDevices = true; }
       ];
 
   };
diff --git a/modules/services/x11/display-managers/default.nix b/modules/services/x11/display-managers/default.nix
index 0343c6ae766..1649f2922c0 100644
--- a/modules/services/x11/display-managers/default.nix
+++ b/modules/services/x11/display-managers/default.nix
@@ -43,6 +43,12 @@ let
         fi
       ''}
 
+      # Start a ConsoleKit session so that we get ownership of various
+      # devices.
+      if test -z "$XDG_SESSION_COOKIE"; then
+          exec ${pkgs.console_kit}/bin/ck-launch-session "$0" "$sessionType"
+      fi
+
       # Load X defaults.
       if test -e ~/.Xdefaults; then
           ${xorg.xrdb}/bin/xrdb -merge ~/.Xdefaults
diff --git a/modules/services/x11/display-managers/kdm.nix b/modules/services/x11/display-managers/kdm.nix
index c58b4867967..8f7a5b5b3fe 100644
--- a/modules/services/x11/display-managers/kdm.nix
+++ b/modules/services/x11/display-managers/kdm.nix
@@ -80,7 +80,7 @@ in
         logsXsession = true;
       };
 
-    security.pam.services = [ { name = "kde"; localLogin = true; ckHack = true; } ];
+    security.pam.services = [ { name = "kde"; } ];
       
   };
   
diff --git a/modules/services/x11/display-managers/slim.nix b/modules/services/x11/display-managers/slim.nix
index f8985f36b52..2f1e8c8e21a 100644
--- a/modules/services/x11/display-managers/slim.nix
+++ b/modules/services/x11/display-managers/slim.nix
@@ -104,7 +104,7 @@ in
         execCmd = "${pkgs.slim}/bin/slim";
       };
 
-    security.pam.services = [ { name = "slim"; localLogin = true; ckHack = true; } ];
+    security.pam.services = [ { name = "slim"; } ];
 
   };
 
-- 
GitLab


From 6ca8fa89494f7899dd8f902dc56f70d5e228bec6 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sun, 13 Sep 2009 15:03:07 +0000
Subject: [PATCH 1808/5331] * Enable Grub support in kdm, i.e., the reboot menu
 option can be used   to directly boot into any of the Grub menu entries. 
 This doesn't   work yet though.  Probably Grub needs some messing with the  
 savedefault option.

svn path=/nixos/trunk/; revision=17091
---
 modules/services/x11/display-managers/kdm.nix | 5 ++++-
 modules/services/x11/xserver.nix              | 2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/modules/services/x11/display-managers/kdm.nix b/modules/services/x11/display-managers/kdm.nix
index 8f7a5b5b3fe..e0a85f66f07 100644
--- a/modules/services/x11/display-managers/kdm.nix
+++ b/modules/services/x11/display-managers/kdm.nix
@@ -14,6 +14,9 @@ let
       [Shutdown]
       HaltCmd=${pkgs.upstart}/sbin/halt
       RebootCmd=${pkgs.upstart}/sbin/reboot
+      ${optionalString (config.boot.grubDevice != "") ''
+        BootManager=Grub
+      ''}
 
       [X-*-Core]
       Xrdb=${pkgs.xlibs.xrdb}/bin/xrdb
@@ -76,7 +79,7 @@ in
   config = mkIf cfg.enable {
   
     services.xserver.displayManager.job =
-      { execCmd = "${kdebase_workspace}/bin/kdm -config ${kdmrc}";
+      { execCmd = "PATH=${pkgs.grub}/sbin:$PATH ${kdebase_workspace}/bin/kdm -config ${kdmrc}";
         logsXsession = true;
       };
 
diff --git a/modules/services/x11/xserver.nix b/modules/services/x11/xserver.nix
index 63c7764f75d..cb71a484043 100644
--- a/modules/services/x11/xserver.nix
+++ b/modules/services/x11/xserver.nix
@@ -384,7 +384,7 @@ in
             rm -f /tmp/.X0-lock
           '';
 
-        exec = "${cfg.displayManager.job.execCmd}";
+        script = "${cfg.displayManager.job.execCmd}";
       };
 
     services.xserver.displayManager.xserverArgs =
-- 
GitLab


From 66ebc25eb9aa6ca37cd5dea20a82d7cd1254d771 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Sun, 13 Sep 2009 18:26:05 +0000
Subject: [PATCH 1809/5331] Bitlbee: Change ownership of `/var/lib/bitlbee'.

svn path=/nixos/trunk/; revision=17099
---
 modules/services/networking/bitlbee.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/modules/services/networking/bitlbee.nix b/modules/services/networking/bitlbee.nix
index 7d5952b0fe5..9e07858f949 100644
--- a/modules/services/networking/bitlbee.nix
+++ b/modules/services/networking/bitlbee.nix
@@ -78,6 +78,7 @@ mkIf config.services.bitlbee.enable {
           if ! test -d /var/lib/bitlbee
           then
               mkdir -p /var/lib/bitlbee
+              chown bitlbee:bitlbee /var/lib/bitlbee
           fi
       end script
 
-- 
GitLab


From ff7e67f2d3ef26556ae244243e4b8d3bcb1d26c5 Mon Sep 17 00:00:00 2001
From: Nicolas Pierron <nicolas.b.pierron@gmail.com>
Date: Sun, 13 Sep 2009 22:13:07 +0000
Subject: [PATCH 1810/5331] Use the system hostname as default for the avahi
 daemon.

svn path=/nixos/trunk/; revision=17104
---
 modules/services/networking/avahi-daemon.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/services/networking/avahi-daemon.nix b/modules/services/networking/avahi-daemon.nix
index d01bf4c3b54..8437a9afc27 100644
--- a/modules/services/networking/avahi-daemon.nix
+++ b/modules/services/networking/avahi-daemon.nix
@@ -20,7 +20,7 @@ let
         };
 
         hostName = mkOption {
-          default = "nixos";  # XXX: Would be nice to use `networking.hostName'.
+          default = config.networking.hostName;
           description = ''Host name advertised on the LAN.'';
         };
 
-- 
GitLab


From a07e90d6f38dfc18a3dc3f1614cd802176f56151 Mon Sep 17 00:00:00 2001
From: Nicolas Pierron <nicolas.b.pierron@gmail.com>
Date: Sun, 13 Sep 2009 22:13:19 +0000
Subject: [PATCH 1811/5331] Update the documentation:

* Change the module syntax of the example to follow Eelco's suggestions.

* Add a section "Building your own NixOS CD", which explain how to replace
configuration.nix by the configuration file of a live CD/DVD.

* Fix "Testing the installer" and "Testing the initrd" to fit the location
of derivations.

svn path=/nixos/trunk/; revision=17105
---
 doc/manual/development.xml        | 186 ++++++++++++++++--------------
 modules/installer/tools/tools.nix |   2 +
 modules/system/boot/kernel.nix    |   1 +
 3 files changed, 105 insertions(+), 84 deletions(-)

diff --git a/doc/manual/development.xml b/doc/manual/development.xml
index b1a9a3a4325..2f99ee42bce 100644
--- a/doc/manual/development.xml
+++ b/doc/manual/development.xml
@@ -21,60 +21,48 @@ NixOS.</para>
 
 <example xml:id='conf-syntax'><title>Usual configuration file</title>
 <programlisting>
-{pkgs, config, ...}: <co xml:id='conf-syntax-1' />
+{config, modulesPath, pkgs, ...}: <co xml:id='conf-syntax-1' />
 
-###### interface
 let
-  inherit (pkgs.lib) mkOption; <co xml:id='conf-syntax-2' />
+  inherit (pkgs.lib) mkOption mkIf mkThenElse types; <co xml:id='conf-syntax-2' />
 
-  options = { <co xml:id='conf-syntax-3' />
-    services = {
-      locate = {
-
-        enable = mkOption {
-          default = false;
-          example = true;
-          description = ''
-            If enabled, NixOS will periodically update the database of
-            files used by the <command>locate</command> command.
-          '';
-        };
-
-        period = mkOption {
-          default = "15 02 * * *";
-          description = ''
-            This option defines (in the format used by cron) when the
-            locate database is updated.
-            The default is to update at 02:15 (at night) every day.
-          '';
-        };
-
-      };
-
-    };
-  };
-in
-
-###### implementation
-let
   cfg = config.services.locate; <co xml:id='conf-syntax-4' />
-  inherit (pkgs.lib) mkIf mkThenElse;
-
   locatedb = "/var/cache/locatedb";
   logfile = "/var/log/updatedb";
   cmd = "root  updatedb --localuser=nobody --output=${locatedb} > ${logfile}";
 in
 
-mkIf cfg.enable { <co xml:id='conf-syntax-5' />
-  require = [ <co xml:id='conf-syntax-6' />
-    options
-
-    # config.services.cron
-    (import ../../upstart-jobs/cron.nix)
+{
+  imports = [ <co xml:id='conf-syntax-6' />
+    (modulesPath + /services/scheduling/cron.nix)
   ];
 
-  services = {
-    cron = {
+  options = { <co xml:id='conf-syntax-3' />
+    services.locate = {
+      enable = mkOption {
+        default = false;
+        example = true;
+        type = types.bool;
+        description = ''
+          If enabled, NixOS will periodically update the database of
+          files used by the <command>locate</command> command.
+        '';
+      };
+
+      period = mkOption {
+        default = "15 02 * * *";
+        type = types.uniq type.string;
+        description = ''
+          This option defines (in the format used by cron) when the
+          locate database is updated.
+          The default is to update at 02:15 (at night) every day.
+        '';
+      };
+    };
+  };
+
+  config = mkIf cfg.enable { <co xml:id='conf-syntax-5' />
+    services.cron = {
       systemCronJobs = mkThenElse { <co xml:id='conf-syntax-7' />
         thenPart = "${cfg.period}  root ${cmd}";
         elsePart = "";
@@ -125,7 +113,7 @@ mkIf cfg.enable { <co xml:id='conf-syntax-5' />
 
   <callout arearefs='conf-syntax-2'>
 
-    <para>This line is used to import a function that is useful for
+    <para>This line is used to import a functions that are useful for
     writing this configuration file.</para>
 
   </callout>
@@ -185,25 +173,26 @@ mkIf cfg.enable { <co xml:id='conf-syntax-5' />
 
   <callout arearefs='conf-syntax-6'>
 
-    <para>The attribute <varname>require</varname> is the only special
-    option that exists.  It is used to embed all option declarations that
-    are required by your configuration file and it is also used to provide
-    the options that you are declaring.</para>
+    <para>The attribute <varname>imports</varname> contains a list of other
+    module location.  These modules should provide option declarations for
+    the current module in order to be evaluated safely.</para>
 
-    <para>This attribute is processed
-    with <varname>pkgs.lib.uniqFlatten</varname> to collect all
-    configuration files that are used by your system and it avoid the
-    insertion of duplicated elements by comparing the configuration set codes.</para>
-
-    <para>Currently, the file <filename>configuration.nix</filename>
-    implicitly embeds <filename>system/options.nix</filename>.  If you need
-    a special configuration file, then you will have to add similar lines
-    to your computer configuration.</para>
+    <para>When a dependence on a NixOS module has to be made, then you
+    should use the argument <varname>modulesPath</varname> to prefix the
+    location of your NixOS repository.</para>
 
   </callout>
 
   <callout arearefs='conf-syntax-7'>
 
+    <para>The attribute <varname>config</varname>, which should not be
+    confused with the argument of the same name, contains a set of option
+    definitions defined by this module. When there is
+    neither <varname>imports</varname> nor <varname>options</varname>, then
+    this attribute set can be return without any enclosing.  This feature
+    allow you to write your <filename>configuration.nix</filename> as a
+    module which does not contains any option declarations.</para>
+
     <para>As <varname>mkIf</varname> does not need
     any <emphasis>then</emphasis> part or <emphasis>else</emphasis> part,
     then you can specify one on each option definition with the
@@ -238,7 +227,7 @@ mkIf cfg.enable { <co xml:id='conf-syntax-5' />
 <para>
 
 <screen>
-$ nix-build /etc/nixos/nixos <replaceable>attr</replaceable></screen>
+$ nix-build /etc/nixos/nixos -A <replaceable>attr</replaceable></screen>
 
 where <replaceable>attr</replaceable> is an attribute in
 <filename>/etc/nixos/nixos/default.nix</filename>.  Attributes of interest include:
@@ -246,55 +235,84 @@ where <replaceable>attr</replaceable> is an attribute in
 <variablelist>
 
   <varlistentry>
-    <term><varname>kernel</varname></term>
-    <listitem><para>The kernel.</para></listitem>
+    <term><varname>config</varname></term>
+    <listitem><para>The computer configuration generated from
+    the <env>NIXOS_CONFIG</env> environment variable (default
+    is <filename>/etc/nixos/configuration.nix</filename>) with the NixOS
+    default set of modules.</para></listitem>
   </varlistentry>
 
   <varlistentry>
-    <term><varname>initialRamdisk</varname></term>
-    <listitem><para>The initial ramdisk (initrd) for this configuration.</para></listitem>
+    <term><varname>system</varname></term>
+    <listitem><para>The derivation which build your computer system.  It is
+    built by the command <command>nixos-rebuild
+    build</command></para></listitem>
   </varlistentry>
 
   <varlistentry>
-    <term><varname>bootStage1</varname></term>
-    <listitem><para>The stage 1 (initrd) init script.</para></listitem>
+    <term><varname>vm</varname></term>
+    <listitem><para>The derivation which build your computer system inside a
+    virtual machine.  It is built by the command <command>nixos-rebuild
+    build-vm</command></para></listitem>
   </varlistentry>
+</variablelist>
 
-  <varlistentry>
-    <term><varname>bootStage2</varname></term>
-    <listitem><para>The stage 2 init script.</para></listitem>
-  </varlistentry>
+</para>
 
-  <varlistentry>
-    <term><varname>etc</varname></term>
-    <listitem><para>The statically computed parts of <filename>/etc</filename>.</para></listitem>
-  </varlistentry>
+<para>
+Most parts of NixOS can be build through the <varname>config</varname>
+attribute set.  This attribute set allows you to have a view of the merged
+option definitions and all its derivations.  Important derivations are store
+inside the option <option>system.build</option> and can be listed with the
+command <command>nix-instantiate --xml --eval-only /etc/nixos/nixos -A
+config.system.build</command>
+</para>.
 
-  <varlistentry>
-    <term><varname>upstartJobs</varname></term>
-    <listitem><para>An attribute set containing the Upstart jobs.  For
-    instance, the <varname>sshd</varname> Upstart job can be built by
-    doing <literal>nix-build /etc/nixos/nixos -A
-    tests.upstartJobs.sshd</literal>.</para></listitem>
-  </varlistentry>
+</section>
 
-</variablelist>
+
+<section>
+
+<title>Building your own NixOS CD</title>
+
+<para>Building a NixOS CD is as easy as configuring your own computer. The
+idea is to use another module which will replace
+your <filename>configuration.nix</filename> to configure the system that
+would be install on the CD.</para>
+
+<para>Default CD/DVD configurations are available
+inside <filename>nixos/modules/installer/cd-dvd</filename>.  To build them
+you have to set <env>NIXOS_CONFIG</env> before
+running <command>nix-build</command> to build the ISO.
+
+<screen>
+$ export NIXOS_CONFIG=/etc/nixos/nixos/modules/installer/cd-dvd/installation-cd-minimal.nix
+$ nix-build /etc/nixos/nixos -A config.system.build.isoImage</screen>
 
 </para>
 
-</section>
+<para>Before burning your CD/DVD, you can check the content of the image by mounting anywhere like
+suggested by the following command:
 
+<screen>
+$ mount -o loop -t iso9660 ./result/iso/cd.iso /mnt/iso</screen>
+
+</para>
+
+</section>
 
 <section>
 
 <title>Testing the installer</title>
 
+
 <para>Building, burning, and booting from an installation CD is rather
 tedious, so here is a quick way to see if the installer works
 properly:
 
 <screen>
-$ nix-build .../nixos/configuration/rescue-cd.nix -A system.nixosInstall
+$ export NIXOS_CONFIG=/etc/nixos/nixos/modules/installer/cd-dvd/installation-cd-minimal.nix
+$ nix-build /etc/nixos/nixos -A config.system.build.nixosInstall
 $ dd if=/dev/zero of=diskimage seek=2G count=0 bs=1
 $ yes | mke2fs -j diskimage
 $ mount -o loop diskimage /mnt
@@ -314,8 +332,8 @@ boot correctly is to use QEMU’s <option>-kernel</option> and
 <option>-initrd</option> options:
 
 <screen>
-$ nix-build /etc/nixos/nixos -A initialRamdisk -o initrd
-$ nix-build /etc/nixos/nixos -A kernel -o kernel
+$ nix-build /etc/nixos/nixos -A config.system.build.initialRamdisk -o initrd
+$ nix-build /etc/nixos/nixos -A config.system.build.kernel -o kernel
 $ qemu-system-x86_64 -kernel ./kernel/vmlinuz -initrd ./initrd/initrd -hda /dev/null
 </screen>
 
diff --git a/modules/installer/tools/tools.nix b/modules/installer/tools/tools.nix
index 37b7589f477..45df2a50e92 100644
--- a/modules/installer/tools/tools.nix
+++ b/modules/installer/tools/tools.nix
@@ -80,4 +80,6 @@ in
       nixosHardwareScan
       nixosGenSeccureKeys
     ];
+
+  system.build = { inherit nixosInstall; };
 }
diff --git a/modules/system/boot/kernel.nix b/modules/system/boot/kernel.nix
index 58a8948f4fd..ca809805734 100644
--- a/modules/system/boot/kernel.nix
+++ b/modules/system/boot/kernel.nix
@@ -180,6 +180,7 @@ in
 {
   require = [options];
 
+  system.build = { inherit kernel; };
   system.modulesTree = [ kernel ] ++ config.boot.extraModulePackages;
 
   # The Linux kernel >= 2.6.27 provides firmware.
-- 
GitLab


From b56fecc83a893928f677928e21540a38356723d7 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 14 Sep 2009 06:56:00 +0000
Subject: [PATCH 1812/5331] * env -> envar.

svn path=/nixos/trunk/; revision=17106
---
 doc/manual/development.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/doc/manual/development.xml b/doc/manual/development.xml
index 2f99ee42bce..6604c0f7df5 100644
--- a/doc/manual/development.xml
+++ b/doc/manual/development.xml
@@ -237,7 +237,7 @@ where <replaceable>attr</replaceable> is an attribute in
   <varlistentry>
     <term><varname>config</varname></term>
     <listitem><para>The computer configuration generated from
-    the <env>NIXOS_CONFIG</env> environment variable (default
+    the <envar>NIXOS_CONFIG</envar> environment variable (default
     is <filename>/etc/nixos/configuration.nix</filename>) with the NixOS
     default set of modules.</para></listitem>
   </varlistentry>
@@ -282,7 +282,7 @@ would be install on the CD.</para>
 
 <para>Default CD/DVD configurations are available
 inside <filename>nixos/modules/installer/cd-dvd</filename>.  To build them
-you have to set <env>NIXOS_CONFIG</env> before
+you have to set <envar>NIXOS_CONFIG</envar> before
 running <command>nix-build</command> to build the ISO.
 
 <screen>
-- 
GitLab


From a9eadf9fe6fb7caf218ac14273a96e984a14cc7f Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 14 Sep 2009 13:19:28 +0000
Subject: [PATCH 1813/5331] * Add vfat to the initrd on the CD to enable people
 to copy the   contents of the CD to a bootable USB stick.

svn path=/nixos/trunk/; revision=17109
---
 modules/installer/cd-dvd/installation-cd-base.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/modules/installer/cd-dvd/installation-cd-base.nix b/modules/installer/cd-dvd/installation-cd-base.nix
index 83fd1423ef1..a02aa5c0e0a 100644
--- a/modules/installer/cd-dvd/installation-cd-base.nix
+++ b/modules/installer/cd-dvd/installation-cd-base.nix
@@ -149,6 +149,10 @@ in
 
       # Wait for SCSI devices to appear.
       "scsi_wait_scan"
+
+      # Add vfat to enable people to copy the contents of the CD to a
+      # bootable USB stick.
+      "vfat"
     ];
 
   # nixos-install will do a pull from this channel to speed up the
-- 
GitLab


From 81ec373e1eb62421beab861e2a0f440023a3d88d Mon Sep 17 00:00:00 2001
From: Nicolas Pierron <nicolas.b.pierron@gmail.com>
Date: Tue, 15 Sep 2009 00:18:00 +0000
Subject: [PATCH 1814/5331] Imports of imported attribute set are not working
 anymore because this feature is hard to maintain and because this a potential
 source of error.

Imports are only accepted inside named modules where the system has some
control over mutual inclusion.

svn path=/nixos/trunk/; revision=17143
---
 lib/build-vms.nix | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

diff --git a/lib/build-vms.nix b/lib/build-vms.nix
index c35906adfc5..e8b21fb6dfd 100644
--- a/lib/build-vms.nix
+++ b/lib/build-vms.nix
@@ -53,11 +53,14 @@ rec {
 
 
   buildVM =
-    nodes: configuration:
+    nodes: configurations:
 
     import "${nixos}/lib/eval-config.nix" {
       inherit nixpkgs services system;
-      modules = [ configuration ];
+      modules = configurations ++ [
+        "${nixos}/modules/virtualisation/qemu-vm.nix" # !!!
+        "${nixos}/modules/testing/test-instrumentation.nix" # !!! should only get added for automated test runs
+      ];
       extraArgs = { inherit nodes; };
       /* !!! bug in the module/option handling: this ignores the
          config from assignIPAddresses.  Too much magic. 
@@ -88,13 +91,8 @@ rec {
       # Generate a /etc/hosts file.
       hosts = lib.concatMapStrings (m: "${m.second} ${m.first}\n") machinesWithIP;
 
-      nodes_ = map (m: lib.nameValuePair m.first
-          { imports = [
-              (lib.getAttr m.first nodes)
-              "${nixos}/modules/virtualisation/qemu-vm.nix" # !!!
-              "${nixos}/modules/testing/test-instrumentation.nix" # !!! should only get added for automated test runs
-            ];
-            config =
+      nodes_ = map (m: lib.nameValuePair m.first [
+          { config =
               { networking.hostName = m.first;
                 networking.interfaces =
                   [ { name = "eth1";
@@ -105,7 +103,8 @@ rec {
                 services.nixosManual.enable = false; # !!!
               };
           }
-        ) machinesWithIP;
+          (lib.getAttr m.first nodes)
+        ]) machinesWithIP;
 
     in lib.listToAttrs nodes_;
 
-- 
GitLab


From 36573e5e5c7b330151a340755194fc7b4cb3fc25 Mon Sep 17 00:00:00 2001
From: Nicolas Pierron <nicolas.b.pierron@gmail.com>
Date: Tue, 15 Sep 2009 08:33:45 +0000
Subject: [PATCH 1815/5331] Convert module which are declaring options into
 modules separated with an "options" set to declare options and a "config" set
 to define options.

svn path=/nixos/trunk/; revision=17148
---
 modules/misc/check-config.nix                 | 16 ++--
 .../services/x11/desktop-managers/default.nix | 90 +++++++++----------
 .../services/x11/window-managers/default.nix  | 70 +++++++--------
 .../services/x11/window-managers/xmonad.nix   | 36 ++++----
 4 files changed, 105 insertions(+), 107 deletions(-)

diff --git a/modules/misc/check-config.nix b/modules/misc/check-config.nix
index e2cd2c06d6a..28f36ad9ae5 100644
--- a/modules/misc/check-config.nix
+++ b/modules/misc/check-config.nix
@@ -1,11 +1,13 @@
 {pkgs, ...}:
 
 {
-  environment.checkConfigurationOptions = pkgs.lib.mkOption {
-    default = true;
-    example = false;
-    description = ''
-      Whether to check the validity of the entire configuration.
-    '';
+  options = {
+    environment.checkConfigurationOptions = pkgs.lib.mkOption {
+      default = true;
+      example = false;
+      description = ''
+        Whether to check the validity of the entire configuration.
+      '';
+    };
   };
-}
\ No newline at end of file
+}
diff --git a/modules/services/x11/desktop-managers/default.nix b/modules/services/x11/desktop-managers/default.nix
index c40266f99d7..a775684b47d 100644
--- a/modules/services/x11/desktop-managers/default.nix
+++ b/modules/services/x11/desktop-managers/default.nix
@@ -11,7 +11,7 @@ let
 in
 
 {
-  require = [
+  imports = [
     ./kde.nix
     ./kde4.nix
     ./gnome.nix
@@ -19,58 +19,56 @@ in
     ./none.nix
   ];
 
-  services = {
-    xserver = {
-      displayManager = {
-        session = cfg.session.list;
-      };
+  options = {
+    services.xserver.desktopManager = {
 
-      desktopManager = {
-        session = mkOption {
-          default = [];
-          example = [{
-            name = "kde";
-            bgSupport = true;
-            start = "...";
-          }];
-          description = "
-            Internal option used to add some common line to desktop manager
-            scripts before forwarding the value to the
-            <varname>displayManager</varname>.
-          ";
-          apply = list: {
-            list = map (d: d // {
-              manage = "desktop";
-              start = d.start
-              + optionalString (needBGCond d) ''
-                if test -e $HOME/.background-image; then
-                  ${pkgs.feh}/bin/feh --bg-scale $HOME/.background-image
-                fi
-              '';
-            }) list;
-            needBGPackages = [] != filter needBGCond list;
-          };
+      session = mkOption {
+        default = [];
+        example = [{
+          name = "kde";
+          bgSupport = true;
+          start = "...";
+        }];
+        description = "
+          Internal option used to add some common line to desktop manager
+          scripts before forwarding the value to the
+          <varname>displayManager</varname>.
+        ";
+        apply = list: {
+          list = map (d: d // {
+            manage = "desktop";
+            start = d.start
+            + optionalString (needBGCond d) ''
+              if test -e $HOME/.background-image; then
+                ${pkgs.feh}/bin/feh --bg-scale $HOME/.background-image
+              fi
+            '';
+          }) list;
+          needBGPackages = [] != filter needBGCond list;
         };
+      };
 
 
-        default = mkOption {
-          default = "xterm";
-          example = "none";
-          description = "
-            Default desktop manager loaded if none have been chosen.
-          ";
-          merge = mergeOneOption;
-          apply = defaultDM:
-            if any (w: w.name == defaultDM) cfg.session.list then
-              defaultDM
-            else
-              throw "Default desktop manager ($(defaultDM)) not found.";
-        };
+      default = mkOption {
+        default = "xterm";
+        example = "none";
+        description = "
+          Default desktop manager loaded if none have been chosen.
+        ";
+        merge = mergeOneOption;
+        apply = defaultDM:
+          if any (w: w.name == defaultDM) cfg.session.list then
+            defaultDM
+          else
+            throw "Default desktop manager ($(defaultDM)) not found.";
       };
+
     };
   };
 
-  environment = mkIf cfg.session.needBGPackages {
-    x11Packages = [ pkgs.feh ];
+  config = {
+    services.xserver.displayManager.session = cfg.session.list;
+    environment.x11Packages =
+      mkIf cfg.session.needBGPackages [ pkgs.feh ];
   };
 }
diff --git a/modules/services/x11/window-managers/default.nix b/modules/services/x11/window-managers/default.nix
index 0295d9893d8..801517fdd98 100644
--- a/modules/services/x11/window-managers/default.nix
+++ b/modules/services/x11/window-managers/default.nix
@@ -6,7 +6,7 @@ let
 in
 
 {
-  require = [
+  imports = [
     ./compiz.nix
     ./kwm.nix
     ./metacity.nix
@@ -16,43 +16,43 @@ in
     ./xmonad.nix
   ];
 
-  services = {
-    xserver = {
-      displayManager = {
-        session = cfg.session;
-      };
+  options = {
+    services.xserver.windowManager = {
 
-      windowManager = {
-        session = mkOption {
-          default = [];
-          example = [{
-            name = "wmii";
-            start = "...";
-          }];
-          description = "
-            Internal option used to add some common line to window manager
-            scripts before forwarding the value to the
-            <varname>displayManager</varname>.
-          ";
-          apply = map (d: d // {
-            manage = "window";
-          });
-        };
+      session = mkOption {
+        default = [];
+        example = [{
+          name = "wmii";
+          start = "...";
+        }];
+        description = "
+          Internal option used to add some common line to window manager
+          scripts before forwarding the value to the
+          <varname>displayManager</varname>.
+        ";
+        apply = map (d: d // {
+          manage = "window";
+        });
+      };
 
-        default = mkOption {
-          default = "none";
-          example = "wmii";
-          description = "
-            Default window manager loaded if none have been chosen.
-          ";
-          merge = mergeOneOption;
-          apply = defaultWM:
-            if any (w: w.name == defaultWM) cfg.session then
-              defaultWM
-            else
-              throw "Default window manager (${defaultWM}) not found.";
-        };
+      default = mkOption {
+        default = "none";
+        example = "wmii";
+        description = "
+          Default window manager loaded if none have been chosen.
+        ";
+        merge = mergeOneOption;
+        apply = defaultWM:
+          if any (w: w.name == defaultWM) cfg.session then
+            defaultWM
+          else
+            throw "Default window manager (${defaultWM}) not found.";
       };
+
     };
   };
+
+  config = {
+    services.xserver.displayManager.session = cfg.session;
+  };
 }
diff --git a/modules/services/x11/window-managers/xmonad.nix b/modules/services/x11/window-managers/xmonad.nix
index 3d2df59655a..2cbb5002d6c 100644
--- a/modules/services/x11/window-managers/xmonad.nix
+++ b/modules/services/x11/window-managers/xmonad.nix
@@ -6,27 +6,25 @@ let
 in
 
 {
-  services = {
-    xserver = {
-
-      windowManager = {
-        xmonad = {
-          enable = mkOption {
-            default = false;
-            example = true;
-            description = "Enable the xmonad window manager.";
-          };
-        };
-
-        session = mkIf cfg.enable [{
-          name = "xmonad";
-          start = "
-            ${pkgs.haskellPackages.xmonad}/bin/xmonad &
-            waitPID=$!
-          ";
-        }];
+  options = {
+    services.xserver.windowManager.xmonad = {
+      enable = mkOption {
+        default = false;
+        example = true;
+        description = "Enable the xmonad window manager.";
       };
+    };
+  };
 
+  config = {
+    services.xserver.windowManager = {
+      session = mkIf cfg.enable [{
+        name = "xmonad";
+        start = "
+          ${pkgs.haskellPackages.xmonad}/bin/xmonad &
+          waitPID=$!
+        ";
+      }];
     };
   };
 }
-- 
GitLab


From dd40d6196bfb2316042d5744e2a1b0dddc4c4da1 Mon Sep 17 00:00:00 2001
From: Nicolas Pierron <nicolas.b.pierron@gmail.com>
Date: Tue, 15 Sep 2009 14:09:11 +0000
Subject: [PATCH 1816/5331] Use only one merge to compute option definitions
 and option declarations.

svn path=/nixos/trunk/; revision=17165
---
 lib/eval-config.nix | 25 ++++++++++---------------
 1 file changed, 10 insertions(+), 15 deletions(-)

diff --git a/lib/eval-config.nix b/lib/eval-config.nix
index 2eb0435d24d..be683c8b2fa 100644
--- a/lib/eval-config.nix
+++ b/lib/eval-config.nix
@@ -19,10 +19,12 @@ rec {
   configComponents = modules ++ baseModules;
 
   # Merge the option definitions in all modules, forming the full
-  # system configuration.  This is called "configFast" because it's
-  # not checked for undeclared options.
-  configFast =
-    pkgs.lib.definitionsOf configComponents extraArgs;
+  # system configuration.  It's not checked for undeclared options.
+  systemModule =
+    pkgs.lib.fixMergeModules configComponents extraArgs;
+
+  optionDefinitions = systemModule.config;
+  optionDeclarations = systemModule.options;
 
   # These are the extra arguments passed to every module.  In
   # particular, Nixpkgs is passed through the "pkgs" argument.
@@ -53,19 +55,12 @@ rec {
           # define nixpkgs.config, so it's pointless to evaluate them.
           baseModules = [ ../modules/misc/nixpkgs.nix ];
           pkgs = import nixpkgs { inherit system; config = {}; };
-        }).configFast.nixpkgs.config;
+        }).optionDefinitions.nixpkgs.config;
     };
 
-  # "fixableDeclarationsOf" is used instead of "declarationsOf" because some
-  # option default values may depends on the definition of other options.
-  # !!! This seems inefficent.  Didn't definitionsOf already compute
-  # the option declarations?
-  optionDeclarations =
-    pkgs.lib.fixableDeclarationsOf configComponents extraArgs configFast;
-
   # Optionally check wether all config values have corresponding
   # option declarations.
-  config = pkgs.checker configFast
-    configFast.environment.checkConfigurationOptions
-    optionDeclarations configFast;
+  config = pkgs.checker optionDefinitions
+    optionDefinitions.environment.checkConfigurationOptions
+    optionDeclarations optionDefinitions;
 }
-- 
GitLab


From 10e9705a86fc96aa121e25d80ec46d0f86cc9db2 Mon Sep 17 00:00:00 2001
From: Nicolas Pierron <nicolas.b.pierron@gmail.com>
Date: Tue, 15 Sep 2009 14:09:18 +0000
Subject: [PATCH 1817/5331] Replace optionDeclarations by options which is
 directly computed by moduleMerge.

svn path=/nixos/trunk/; revision=17166
---
 doc/manual/default.nix                 | 20 +++++++-------------
 lib/eval-config.nix                    |  5 +++--
 modules/services/misc/nixos-manual.nix |  7 +++----
 release.nix                            |  4 ++--
 4 files changed, 15 insertions(+), 21 deletions(-)

diff --git a/doc/manual/default.nix b/doc/manual/default.nix
index d77a65bdf4a..fad32986538 100644
--- a/doc/manual/default.nix
+++ b/doc/manual/default.nix
@@ -1,23 +1,17 @@
-{ pkgs, optionDeclarations }:
+{ pkgs, options }:
 
 let
-
-  manualConfig =
-    { environment.checkConfigurationOptions = false;
-      services.nixosManual.enable = false;
-    };
-
   # To prevent infinite recursion, remove system.path from the
   # options.  Not sure why this happens.
-  optionDeclarations_ =
-    optionDeclarations //
-    { system = removeAttrs optionDeclarations.system ["path"]; };
+  options_ =
+    options //
+    { system = removeAttrs options.system ["path"]; };
 
-  options = builtins.toFile "options.xml" (builtins.unsafeDiscardStringContext
-    (builtins.toXML (pkgs.lib.optionAttrSetToDocList "" optionDeclarations_)));
+  optionsXML = builtins.toFile "options.xml" (builtins.unsafeDiscardStringContext
+    (builtins.toXML (pkgs.lib.optionAttrSetToDocList "" options_)));
 
   optionsDocBook = pkgs.runCommand "options-db.xml" {} ''
-    ${pkgs.libxslt}/bin/xsltproc -o $out ${./options-to-docbook.xsl} ${options} 
+    ${pkgs.libxslt}/bin/xsltproc -o $out ${./options-to-docbook.xsl} ${optionsXML} 
   '';
     
   manual = pkgs.stdenv.mkDerivation {
diff --git a/lib/eval-config.nix b/lib/eval-config.nix
index be683c8b2fa..10efb8a251d 100644
--- a/lib/eval-config.nix
+++ b/lib/eval-config.nix
@@ -25,11 +25,12 @@ rec {
 
   optionDefinitions = systemModule.config;
   optionDeclarations = systemModule.options;
+  inherit (systemModule) options;
 
   # These are the extra arguments passed to every module.  In
   # particular, Nixpkgs is passed through the "pkgs" argument.
   extraArgs = extraArgs_ // {
-    inherit pkgs optionDeclarations;
+    inherit pkgs;
     modulesPath = ../modules;
     servicesPath = services;
   };
@@ -62,5 +63,5 @@ rec {
   # option declarations.
   config = pkgs.checker optionDefinitions
     optionDefinitions.environment.checkConfigurationOptions
-    optionDeclarations optionDefinitions;
+    options optionDefinitions;
 }
diff --git a/modules/services/misc/nixos-manual.nix b/modules/services/misc/nixos-manual.nix
index a113c8ee962..45a38c778ea 100644
--- a/modules/services/misc/nixos-manual.nix
+++ b/modules/services/misc/nixos-manual.nix
@@ -3,7 +3,7 @@
 # of the virtual consoles.  The latter is useful for the installation
 # CD.
 
-{pkgs, config, optionDeclarations, ...}:
+{pkgs, config, options, ...}:
 
 let
 
@@ -13,9 +13,8 @@ let
 
   manual =
     # We could speed up the evaluation of the manual expression by
-    # providing it the optionDeclarations of the current
-    # configuration.
-    import ../../../doc/manual {inherit pkgs optionDeclarations;};
+    # providing it the options of the current configuration.
+    import ../../../doc/manual {inherit pkgs options;};
     
 in
 
diff --git a/release.nix b/release.nix
index a07d36dfc15..a8f07216560 100644
--- a/release.nix
+++ b/release.nix
@@ -74,11 +74,11 @@ let
 
       import "${nixosSrc}/doc/manual" {
         pkgs = import nixpkgs {};
-        optionDeclarations =
+        options =
           (import lib/eval-config.nix {
             inherit nixpkgs;
             modules = [ ];
-          }).optionDeclarations;
+          }).options;
       };
 
 
-- 
GitLab


From 9587192c683149fbad1e7830a0e8a8458f512c82 Mon Sep 17 00:00:00 2001
From: Rob Vermaas <rob.vermaas@gmail.com>
Date: Wed, 16 Sep 2009 07:48:47 +0000
Subject: [PATCH 1818/5331]  * added uptimed module

svn path=/nixos/trunk/; revision=17173
---
 modules/misc/ids.nix                |  1 +
 modules/module-list.nix             |  1 +
 modules/services/system/uptimed.nix | 81 +++++++++++++++++++++++++++++
 3 files changed, 83 insertions(+)
 create mode 100644 modules/services/system/uptimed.nix

diff --git a/modules/misc/ids.nix b/modules/misc/ids.nix
index 87a73832a59..7ed3e110e5d 100644
--- a/modules/misc/ids.nix
+++ b/modules/misc/ids.nix
@@ -47,6 +47,7 @@ in
     gnunetd = 17;
     pulseaudio = 22; # must match `pulseaudio' GID
     gpsd = 23;
+    uptimed = 24;
 
     nixbld = 30000; # start of range of uids
     nobody = 65534;
diff --git a/modules/module-list.nix b/modules/module-list.nix
index d44d15c09e4..f8bae4a06d1 100644
--- a/modules/module-list.nix
+++ b/modules/module-list.nix
@@ -79,6 +79,7 @@
   ./services/scheduling/fcron.nix
   ./services/system/dbus.nix
   ./services/system/nscd.nix
+  ./services/system/uptimed.nix
   ./services/ttys/gpm.nix
   ./services/ttys/mingetty.nix
   ./services/web-servers/apache-httpd/default.nix
diff --git a/modules/services/system/uptimed.nix b/modules/services/system/uptimed.nix
new file mode 100644
index 00000000000..7ffccdf1251
--- /dev/null
+++ b/modules/services/system/uptimed.nix
@@ -0,0 +1,81 @@
+{pkgs, config, ...}:
+
+let
+
+  inherit (pkgs.lib) mkOption mkIf singleton;
+
+  inherit (pkgs) uptimed;
+
+  stateDir = "/var/spool/uptimed";
+
+  uptimedUser = "uptimed";
+
+  modprobe = config.system.sbin.modprobe;
+
+  uptimedFlags = "";
+
+in
+
+{
+
+  ###### interface
+  
+  options = {
+  
+    services.uptimed = {
+
+      enable = mkOption {
+        default = true;
+        description = ''
+          Uptimed allows you to track your highest uptimes.
+        '';
+      };
+
+    };
+
+  };
+
+
+  ###### implementation
+
+  config = mkIf config.services.uptimed.enable {
+  
+    users.extraUsers = singleton
+      { name = uptimedUser;
+        uid = config.ids.uids.uptimed;
+        description = "Uptimed daemon user";
+        home = stateDir;
+      };
+
+    jobs = singleton {
+
+      name = "uptimed";
+      
+      job = ''
+        description "Uptimed daemon"
+
+        start on startup
+        stop on shutdown
+
+        start script
+
+            mkdir -m 0755 -p ${stateDir}
+            chown ${uptimedUser} ${stateDir}
+
+            # Needed to run uptimed as an unprivileged user.
+            ${modprobe}/sbin/modprobe capability || true
+
+            if ! test -f ${stateDir}/bootid ; then
+              ${uptimed}/sbin/uptimed -b
+            fi
+
+        end script
+
+        respawn ${uptimed}/sbin/uptimed ${uptimedFlags}
+      '';
+
+    };
+    
+  };
+  
+}
-- 
GitLab


From ba1a9aecfd2904013bcf277b51a1ea630a399528 Mon Sep 17 00:00:00 2001
From: Rob Vermaas <rob.vermaas@gmail.com>
Date: Wed, 16 Sep 2009 07:49:23 +0000
Subject: [PATCH 1819/5331]  * added uptimed module, default disabled

svn path=/nixos/trunk/; revision=17174
---
 modules/services/system/uptimed.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/services/system/uptimed.nix b/modules/services/system/uptimed.nix
index 7ffccdf1251..c588e96ed05 100644
--- a/modules/services/system/uptimed.nix
+++ b/modules/services/system/uptimed.nix
@@ -25,7 +25,7 @@ in
     services.uptimed = {
 
       enable = mkOption {
-        default = true;
+        default = false;
         description = ''
           Uptimed allows you to track your highest uptimes.
         '';
-- 
GitLab


From 185c8a38844efded6b3e8df1a7e21f57cc4cc97a Mon Sep 17 00:00:00 2001
From: Rob Vermaas <rob.vermaas@gmail.com>
Date: Wed, 16 Sep 2009 08:01:03 +0000
Subject: [PATCH 1820/5331]  * add uptimed to system packages

svn path=/nixos/trunk/; revision=17175
---
 modules/services/system/uptimed.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/modules/services/system/uptimed.nix b/modules/services/system/uptimed.nix
index c588e96ed05..9dd251a2821 100644
--- a/modules/services/system/uptimed.nix
+++ b/modules/services/system/uptimed.nix
@@ -39,6 +39,7 @@ in
   ###### implementation
 
   config = mkIf config.services.uptimed.enable {
+    environment.systemPackages = [ uptimed ];
   
     users.extraUsers = singleton
       { name = uptimedUser;
-- 
GitLab


From b9079b8da993a276dcac56ad38d2217d66dc7cfe Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Wed, 16 Sep 2009 11:03:15 +0000
Subject: [PATCH 1821/5331] Returning selinux=0: convenient with allmodconfig

svn path=/nixos/trunk/; revision=17179
---
 modules/system/boot/kernel.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/modules/system/boot/kernel.nix b/modules/system/boot/kernel.nix
index ca809805734..2a052d213d4 100644
--- a/modules/system/boot/kernel.nix
+++ b/modules/system/boot/kernel.nix
@@ -25,6 +25,7 @@ let
 
       kernelParams = mkOption {
         default = [
+          "selinux=0"
           "apm=on"
           "acpi=on"
           "vga=0x317"
-- 
GitLab


From 44f99c64d4581dab1b2f88393fc8bdae49d7ea88 Mon Sep 17 00:00:00 2001
From: Rob Vermaas <rob.vermaas@gmail.com>
Date: Wed, 16 Sep 2009 11:22:45 +0000
Subject: [PATCH 1822/5331]  * added ddclient module to allow synchronization
 of machine's ip address with dynamic dns provider

svn path=/nixos/trunk/; revision=17180
---
 modules/misc/ids.nix                     |   1 +
 modules/module-list.nix                  |   1 +
 modules/services/networking/ddclient.nix | 140 +++++++++++++++++++++++
 3 files changed, 142 insertions(+)
 create mode 100644 modules/services/networking/ddclient.nix

diff --git a/modules/misc/ids.nix b/modules/misc/ids.nix
index 7ed3e110e5d..3c3df827999 100644
--- a/modules/misc/ids.nix
+++ b/modules/misc/ids.nix
@@ -48,6 +48,7 @@ in
     pulseaudio = 22; # must match `pulseaudio' GID
     gpsd = 23;
     uptimed = 24;
+    ddclient = 25;
 
     nixbld = 30000; # start of range of uids
     nobody = 65534;
diff --git a/modules/module-list.nix b/modules/module-list.nix
index f8bae4a06d1..63246f44400 100644
--- a/modules/module-list.nix
+++ b/modules/module-list.nix
@@ -56,6 +56,7 @@
   ./services/networking/bind.nix
   ./services/networking/bitlbee.nix
   ./services/networking/dhclient.nix
+  ./services/networking/ddclient.nix
   ./services/networking/dhcpd.nix
   ./services/networking/ejabberd.nix
   ./services/networking/firewall.nix
diff --git a/modules/services/networking/ddclient.nix b/modules/services/networking/ddclient.nix
new file mode 100644
index 00000000000..c22a1535b54
--- /dev/null
+++ b/modules/services/networking/ddclient.nix
@@ -0,0 +1,140 @@
+{pkgs, config, ...}:
+
+let
+
+  inherit (pkgs.lib) mkOption mkIf singleton;
+
+  inherit (pkgs) ddclient;
+
+  stateDir = "/var/spool/ddclient";
+
+  ddclientUser = "ddclient";
+
+  modprobe = config.system.sbin.modprobe;
+
+  ddclientFlags = "-foreground -file ${ddclientCfg}";
+
+  ddclientCfg = pkgs.writeText "ddclient.conf" ''
+daemon=600
+cache=${stateDir}/ddclient.cache
+pid=${stateDir}/ddclient.pid
+use=${config.services.ddclient.web}
+login=${config.services.ddclient.username}
+password=${config.services.ddclient.password}
+protocol=${config.services.ddclient.protocol}
+server=${config.services.ddclient.server}
+wildcard=YES
+${config.services.ddclient.domain}
+${config.services.ddclient.extraConfig}
+'';
+
+in
+
+{
+
+  ###### interface
+  
+  options = {
+  
+    services.ddclient = {
+
+      enable = mkOption {
+        default = false;
+        description = ''
+          Whether to synchronise your machine's IP address with a dynamic DNS provider (e.g. dyndns.org).
+        '';
+      };
+
+      domain = mkOption {
+        default = "";
+        description = ''
+          Domain name to synchronize.
+        '';
+      };
+
+      username = mkOption {
+        default = "";
+        description = ''
+          Username.
+        '';
+      };
+
+      password = mkOption {
+        default = "" ;
+        description = ''
+          Password.
+        '';
+      };
+
+      protocol = mkOption {
+        default = "dyndns2" ;
+        description = ''
+          Protocol to use with dynamic DNS provider. (see also, http://sourceforge.net/apps/trac/ddclient/wiki/Protocols)
+        '';
+      };
+
+      server = mkOption {
+        default = "members.dyndns.org" ;
+        description = ''
+          Server
+        '';
+      };
+
+      extraConfig = mkOption {
+        default = "" ;
+        description = ''
+          Extra configuration. Contents will be added verbatim to the configuration file.
+        '';
+      };
+
+      web = mkOption {
+        default = "web, web=checkip.dyndns.com/, web-skip='IP Address'" ;
+        description = ''
+        '';
+      };
+
+    };
+
+  };
+
+
+  ###### implementation
+
+  config = mkIf config.services.ddclient.enable {
+    environment.systemPackages = [ ddclient ];
+  
+    users.extraUsers = singleton
+      { name = ddclientUser;
+        uid = config.ids.uids.ddclient;
+        description = "ddclient daemon user";
+        home = stateDir;
+      };
+
+    jobs = singleton {
+
+      name = "ddclient";
+      
+      job = ''
+        description "ddclient daemon"
+
+        start on startup
+        stop on shutdown
+
+        start script
+
+            mkdir -m 0755 -p ${stateDir}
+            chown ${ddclientUser} ${stateDir}
+
+            # Needed to run ddclient as an unprivileged user.
+            ${modprobe}/sbin/modprobe capability || true
+
+        end script
+
+        respawn ${ddclient}/bin/ddclient ${ddclientFlags}
+      '';
+
+    };
+    
+  };
+  
+}
-- 
GitLab


From bb8c6b038d05a4c2a20cd5f6e5d3ca6eb1bd5323 Mon Sep 17 00:00:00 2001
From: Rob Vermaas <rob.vermaas@gmail.com>
Date: Wed, 16 Sep 2009 11:57:41 +0000
Subject: [PATCH 1823/5331]  * use new job style for ddclient upstart

svn path=/nixos/trunk/; revision=17184
---
 modules/services/networking/ddclient.nix | 48 +++++++++++-------------
 1 file changed, 22 insertions(+), 26 deletions(-)

diff --git a/modules/services/networking/ddclient.nix b/modules/services/networking/ddclient.nix
index c22a1535b54..7d99a95131f 100644
--- a/modules/services/networking/ddclient.nix
+++ b/modules/services/networking/ddclient.nix
@@ -15,18 +15,18 @@ let
   ddclientFlags = "-foreground -file ${ddclientCfg}";
 
   ddclientCfg = pkgs.writeText "ddclient.conf" ''
-daemon=600
-cache=${stateDir}/ddclient.cache
-pid=${stateDir}/ddclient.pid
-use=${config.services.ddclient.web}
-login=${config.services.ddclient.username}
-password=${config.services.ddclient.password}
-protocol=${config.services.ddclient.protocol}
-server=${config.services.ddclient.server}
-wildcard=YES
-${config.services.ddclient.domain}
-${config.services.ddclient.extraConfig}
-'';
+    daemon=600
+    cache=${stateDir}/ddclient.cache
+    pid=${stateDir}/ddclient.pid
+    use=${config.services.ddclient.web}
+    login=${config.services.ddclient.username}
+    password=${config.services.ddclient.password}
+    protocol=${config.services.ddclient.protocol}
+    server=${config.services.ddclient.server}
+    wildcard=YES
+    ${config.services.ddclient.domain}
+    ${config.services.ddclient.extraConfig}
+  '';
 
 in
 
@@ -113,24 +113,20 @@ in
     jobs = singleton {
 
       name = "ddclient";
-      
-      job = ''
-        description "ddclient daemon"
 
-        start on startup
-        stop on shutdown
+      startOn = "startup";
+      stopOn = "shutdown"; 
 
-        start script
+      preStart = ''
+         mkdir -m 0755 -p ${stateDir}
+         chown ${ddclientUser} ${stateDir}
 
-            mkdir -m 0755 -p ${stateDir}
-            chown ${ddclientUser} ${stateDir}
-
-            # Needed to run ddclient as an unprivileged user.
-            ${modprobe}/sbin/modprobe capability || true
-
-        end script
+         # Needed to run ddclient as an unprivileged user.
+         ${modprobe}/sbin/modprobe capability || true
+      '';
 
-        respawn ${ddclient}/bin/ddclient ${ddclientFlags}
+      script = ''
+        ${ddclient}/bin/ddclient ${ddclientFlags}
       '';
 
     };
-- 
GitLab


From 32020223550b7426715f4aff4c8359cd05387ffb Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Wed, 16 Sep 2009 12:31:23 +0000
Subject: [PATCH 1824/5331] Adding an updated iso_minimal version

svn path=/nixos/trunk/; revision=17186
---
 .../installation-cd-minimal-fresh-kernel.nix  | 37 +++++++++++++++++++
 modules/installer/cd-dvd/iso-image.nix        |  4 +-
 release.nix                                   | 10 ++++-
 3 files changed, 48 insertions(+), 3 deletions(-)
 create mode 100644 modules/installer/cd-dvd/installation-cd-minimal-fresh-kernel.nix

diff --git a/modules/installer/cd-dvd/installation-cd-minimal-fresh-kernel.nix b/modules/installer/cd-dvd/installation-cd-minimal-fresh-kernel.nix
new file mode 100644
index 00000000000..73e83fa2645
--- /dev/null
+++ b/modules/installer/cd-dvd/installation-cd-minimal-fresh-kernel.nix
@@ -0,0 +1,37 @@
+# This module defines a small NixOS installation CD.  It does not
+# contain any graphical stuff.
+
+{config, pkgs, ...}:
+
+{
+  require = [./installation-cd-base.nix];
+
+  installer.configModule = "./nixos/modules/installer/cd-dvd/installation-cd-minimal.nix";
+
+  # Don't include X libraries.
+  services.sshd.forwardX11 = false;
+  services.dbus.enable = false; # depends on libX11
+  services.hal.enable = false; # depends on dbus
+  fonts.enableFontConfig = false;
+  fonts.enableCoreFonts = false;
+
+  # Use Linux 2.6.31-zen0 (with aufs2).
+  boot.kernelPackages = pkgs.kernelPackages_2_6_31_zen0;
+
+  # We need squashfs and aufs. Zen Linux Kernel contains kernel side.
+  boot.initrd.extraUtilsCommands = ''
+    cp ${config.boot.kernelPackages.aufs2Utils}/sbin/mount.aufs $out/bin
+    cp ${config.boot.kernelPackages.aufs2Utils}/sbin/umount.aufs $out/bin
+    mkdir -p $out/var/run/current-system/sw
+    ln -s /bin "$out/var/run/current-system/sw/sbin"
+  '';
+
+  boot.initrd.extraKernelModules = [
+    "i8042" "pcips2" "serio" "mousedev" "evdev" "psmouse" "sermouse"
+    "synaptics_i2c" "unix" "usbhid" "uhci_hcd" "ehci_hcd" "ohci_hcd" 
+    "atkbd" "xtkbd" 
+    # CD part
+    "iso9660" "loop" "squashfs"
+    ];
+  boot.initrd.allowMissing = true;
+}
diff --git a/modules/installer/cd-dvd/iso-image.nix b/modules/installer/cd-dvd/iso-image.nix
index bd4d39ccdf8..2a0ac4f0e28 100644
--- a/modules/installer/cd-dvd/iso-image.nix
+++ b/modules/installer/cd-dvd/iso-image.nix
@@ -86,7 +86,9 @@ in
 
   # We need squashfs in the initrd to mount the compressed Nix store,
   # and aufs to make the root filesystem appear writable.
-  boot.extraModulePackages = [config.boot.kernelPackages.aufs];
+  boot.extraModulePackages = (pkgs.lib.optional 
+    (! config.boot.kernelPackages.kernel.features ? aufs) 
+    config.boot.kernelPackages.aufs);
   boot.initrd.extraKernelModules = ["aufs" "squashfs"];
 
   # Tell stage 1 of the boot to mount a tmpfs on top of the CD using
diff --git a/release.nix b/release.nix
index a8f07216560..91a83de392c 100644
--- a/release.nix
+++ b/release.nix
@@ -4,7 +4,7 @@ let
 
 
   makeIso =
-    { module, description }:
+    { module, description, maintainers ? ["eelco"]}:
     { nixosSrc ? {outPath = ./.; rev = 1234;}
     , officialRelease ? false
     , system ? "i686-linux"
@@ -28,7 +28,7 @@ let
       runCommand "nixos-iso-${version}"
         { meta = {
             description = "NixOS installation CD (${description}) - ISO image for ${system}";
-            maintainers = [lib.maintainers.eelco];
+            maintainers = map (x: lib.getAttr x lib.maintainers) maintainers;
           };
         }
         ''
@@ -87,6 +87,12 @@ let
       description = "minimal";
     };
 
+    iso_minimal_fresh_kernel = makeIso {
+      module = ./modules/installer/cd-dvd/installation-cd-minimal-fresh-kernel.nix;
+      description = "minimal with 2.6.31-zen0";
+      maintainers = ["raskin"];
+    };
+
     /*    
     iso_rescue = makeIso {
       module = ./modules/installer/cd-dvd/installation-cd-rescue.nix;
-- 
GitLab


From bd6fbce0f3c23f8937ab4f795364725ae48fec08 Mon Sep 17 00:00:00 2001
From: Rob Vermaas <rob.vermaas@gmail.com>
Date: Thu, 17 Sep 2009 07:39:21 +0000
Subject: [PATCH 1825/5331]  * vsftpd typo

svn path=/nixos/trunk/; revision=17215
---
 modules/services/networking/vsftpd.nix | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/modules/services/networking/vsftpd.nix b/modules/services/networking/vsftpd.nix
index 5f8a06cbbb5..a0630de77cc 100644
--- a/modules/services/networking/vsftpd.nix
+++ b/modules/services/networking/vsftpd.nix
@@ -21,6 +21,13 @@ let
           ";
         };
  
+        anonymousUserHome = mkOption {
+          default = "/home/ftp";
+          description = "
+            Path to anonymous user data.
+          ";
+        };
+ 
         localUsers = mkOption {
           default = false;
           description = "
@@ -78,7 +85,7 @@ in
 
 let 
 
-  inherit (config.services.vsftpd) anonymousUser localUsers writeEnable anonymousUploadEnable anonymousMkdirEnable
+  inherit (config.services.vsftpd) anonymousUser anonymousUserHome localUsers writeEnable anonymousUploadEnable anonymousMkdirEnable
     chrootlocalUser userlistEnable userlistDeny;
   inherit (pkgs) vsftpd;
 
@@ -104,7 +111,7 @@ mkIf config.services.vsftpd.enable {
           uid = config.ids.uids.ftp;
           group = "ftp";
           description = "Anonymous ftp user";
-          home = "/home/ftp";
+          home = anonymousUserHome;
         };
 
     extraGroups = [
@@ -141,8 +148,8 @@ mkIf config.services.vsftpd.enable {
         secure_chroot_dir=/var/ftp/empty
         EOF
 
-        mkdir -p /home/ftp &&
-        chown -R ftp:ftp /home/ftp
+        mkdir -p ${anonymousUserHome} &&
+        chown -R ftp:ftp ${anonymousUserHome}
         end script
 
         respawn ${vsftpd}/sbin/vsftpd /etc/vsftpd.conf
-- 
GitLab


From 70a10c172083e2e392bbe6f4f8a9b1f18624c12e Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 17 Sep 2009 16:22:26 +0000
Subject: [PATCH 1826/5331] * In the generation of machines.nix, support
 specifying a   speed factor and multiple system types.

svn path=/nixos/trunk/; revision=17231
---
 modules/services/misc/nix-daemon.nix | 248 +++++++++++++--------------
 1 file changed, 121 insertions(+), 127 deletions(-)

diff --git a/modules/services/misc/nix-daemon.nix b/modules/services/misc/nix-daemon.nix
index ca18a8ad5b4..d0c35d9130a 100644
--- a/modules/services/misc/nix-daemon.nix
+++ b/modules/services/misc/nix-daemon.nix
@@ -2,24 +2,27 @@
 
 with pkgs.lib;
 
-###### interface
 let
 
-  options = {
+  inherit (config.environment) nix;
 
-    environment = {
+in
 
-      nix = mkOption {
-        default = pkgs.nixUnstable;
-        example = pkgs.nixCustomFun /root/nix.tar.gz;
-        merge = mergeOneOption;
-        description = "
-          This option specifies the Nix package instance to use throughout the system.
-        ";
-      };
-      
-    };
+{
 
+  ###### interface
+
+  options = {
+
+    environment.nix = mkOption {
+      default = pkgs.nixUnstable;
+      example = pkgs.nixCustomFun /root/nix.tar.gz;
+      merge = mergeOneOption;
+      description = "
+        This option specifies the Nix package instance to use throughout the system.
+      ";
+    };
+    
     nix = {
 
       maxJobs = mkOption {
@@ -119,135 +122,126 @@ let
         example = "http://127.0.0.1:3128";
       };
 
-      # Environment variables for running Nix.
-      # !!! Fix description.
+      # Environment variables for running Nix.  !!! Misnomer - it's
+      # actually a shell script.
       envVars = mkOption {
         internal = true;
         default = "";
+        merge = pkgs.lib.mergeStringOption;
         description = "
-          Define the environment variables used by nix to 
+          Environment variables used by Nix.
         ";
-
-        merge = pkgs.lib.mergeStringOption;
-
-        # other option should be used to define the content instead of using
-        # the apply function.
-        apply = conf: ''
-          export NIX_CONF_DIR=/nix/etc/nix
-
-          # Enable the copy-from-other-stores substituter, which allows builds
-          # to be sped up by copying build results from remote Nix stores.  To
-          # do this, mount the remote file system on a subdirectory of
-          # /var/run/nix/remote-stores.
-          export NIX_OTHER_STORES=/var/run/nix/remote-stores/*/nix
-          
-        '' + # */
-        (if config.nix.distributedBuilds then
-          ''
-            export NIX_BUILD_HOOK=${config.environment.nix}/libexec/nix/build-remote.pl
-            export NIX_REMOTE_SYSTEMS=/etc/nix.machines
-            export NIX_CURRENT_LOAD=/var/run/nix/current-load
-          ''
-        else "")
-        +
-        (if config.nix.proxy != "" then
-          ''
-            export http_proxy=${config.nix.proxy}
-            export https_proxy=${config.nix.proxy}
-            export ftp_proxy=${config.nix.proxy}
-          ''
-        else "")
-        + conf;
       };
     };
   };
 
-in
 
-###### implementation
+  ###### implementation
 
-let 
-  inherit (config.environment) nix;
-in
+  config = {
 
-{
-  require = [
-    options
-  ];
-
-  environment.etc =
-    [ { # Nix configuration.
-        source =
-          let
-            # Tricky: if we're using a chroot for builds, then we need
-            # /bin/sh in the chroot (our own compromise to purity).
-            # However, since /bin/sh is a symlink to some path in the
-            # Nix store, which furthermore has runtime dependencies on
-            # other paths in the store, we need the closure of /bin/sh
-            # in `build-chroot-dirs' - otherwise any builder that uses
-            # /bin/sh won't work.
-            binshDeps = pkgs.writeReferencesToFile config.system.build.binsh;
+    environment.etc =
+      [ { # Nix configuration.
+          source =
+            let
+              # Tricky: if we're using a chroot for builds, then we need
+              # /bin/sh in the chroot (our own compromise to purity).
+              # However, since /bin/sh is a symlink to some path in the
+              # Nix store, which furthermore has runtime dependencies on
+              # other paths in the store, we need the closure of /bin/sh
+              # in `build-chroot-dirs' - otherwise any builder that uses
+              # /bin/sh won't work.
+              binshDeps = pkgs.writeReferencesToFile config.system.build.binsh;
   
-            # Likewise, if chroots are turned on, we need Nix's own
-            # closure in the chroot.  Otherwise nix-channel and nix-env
-            # won't work because the dependencies of its builders (like
-            # coreutils and Perl) aren't visible.  Sigh.
-            nixDeps = pkgs.writeReferencesToFile config.environment.nix;
-          in 
-            pkgs.runCommand "nix.conf" {extraOptions = config.nix.extraOptions; } ''
-              extraPaths=$(for i in $(cat ${binshDeps} ${nixDeps}); do if test -d $i; then echo $i; fi; done)
-              cat > $out <<END
-              # WARNING: this file is generated.
-              build-users-group = nixbld
-              build-max-jobs = ${toString (config.nix.maxJobs)}
-              build-use-chroot = ${if config.nix.useChroot then "true" else "false"}
-              build-chroot-dirs = /dev /dev/pts /proc /bin $(echo $extraPaths)
-              $extraOptions
-              END
-            '';
-        target = "nix.conf"; # will be symlinked from /nix/etc/nix/nix.conf in activate-configuration.sh.
-      }
-    ]
-
-    ++ optional config.nix.distributedBuilds
-      { # List of machines for distributed Nix builds in the format expected
-        # by build-remote.pl.
-        source = pkgs.writeText "nix.machines"
-          (pkgs.lib.concatStrings (map (machine:
-            "${machine.sshUser}@${machine.hostName} ${machine.system} ${machine.sshKey} ${toString machine.maxJobs}\n"
-          ) config.nix.buildMachines));
-        target = "nix.machines";
-      };
-
-  jobs = pkgs.lib.singleton
-    { name = "nix-daemon";
+              # Likewise, if chroots are turned on, we need Nix's own
+              # closure in the chroot.  Otherwise nix-channel and nix-env
+              # won't work because the dependencies of its builders (like
+              # coreutils and Perl) aren't visible.  Sigh.
+              nixDeps = pkgs.writeReferencesToFile config.environment.nix;
+            in 
+              pkgs.runCommand "nix.conf" {extraOptions = config.nix.extraOptions; } ''
+                extraPaths=$(for i in $(cat ${binshDeps} ${nixDeps}); do if test -d $i; then echo $i; fi; done)
+                cat > $out <<END
+                # WARNING: this file is generated.
+                build-users-group = nixbld
+                build-max-jobs = ${toString (config.nix.maxJobs)}
+                build-use-chroot = ${if config.nix.useChroot then "true" else "false"}
+                build-chroot-dirs = /dev /dev/pts /proc /bin $(echo $extraPaths)
+                $extraOptions
+                END
+              '';
+          target = "nix.conf"; # will be symlinked from /nix/etc/nix/nix.conf in activate-configuration.sh.
+        }
+      ]
+
+      ++ optional config.nix.distributedBuilds
+        { # List of machines for distributed Nix builds in the format expected
+          # by build-remote.pl.
+          source = pkgs.writeText "nix.machines"
+            (pkgs.lib.concatStrings (map (machine:
+              "${machine.sshUser}@${machine.hostName} "
+              + (if machine ? system then machine.system else concatStringsSep "," machine.systems) 
+              + " ${machine.sshKey} ${toString machine.maxJobs} "
+              + (if machine ? speedFactor then toString machine.speedFactor else "1" )
+              + "\n"
+            ) config.nix.buildMachines));
+          target = "nix.machines";
+        };
+
+    jobs = pkgs.lib.singleton
+      { name = "nix-daemon";
+
+        startOn = "startup";
+
+        script =
+          ''
+            export PATH=${if config.nix.distributedBuilds then "${pkgs.openssh}/bin:${pkgs.gzip}/bin:" else ""}${pkgs.openssl}/bin:${nix}/bin:$PATH
+            ${config.nix.envVars}
+            exec nice -n ${builtins.toString config.nix.daemonNiceLevel} ${nix}/bin/nix-worker --daemon > /dev/null 2>&1
+          '';
 
-      startOn = "startup";
+        extraConfig = 
+          ''
+            limit nofile 4096 4096
+          '';
+      };
 
-      script =
-        ''
-          export PATH=${if config.nix.distributedBuilds then "${pkgs.openssh}/bin:${pkgs.gzip}/bin:" else ""}${pkgs.openssl}/bin:${nix}/bin:$PATH
-          ${config.nix.envVars}
-          exec nice -n ${builtins.toString config.nix.daemonNiceLevel} ${nix}/bin/nix-worker --daemon > /dev/null 2>&1
-        '';
+    environment.shellInit =
+      ''
+        # Set up the environment variables for running Nix.
+        ${config.nix.envVars}
+      
+        # Set up secure multi-user builds: non-root users build through the
+        # Nix daemon.
+        if test "$USER" != root; then
+            export NIX_REMOTE=daemon
+        else
+            export NIX_REMOTE=
+        fi
+      '';
+
+    nix.envVars =
+      ''
+        export NIX_CONF_DIR=/nix/etc/nix
+
+        # Enable the copy-from-other-stores substituter, which allows builds
+        # to be sped up by copying build results from remote Nix stores.  To
+        # do this, mount the remote file system on a subdirectory of
+        # /var/run/nix/remote-stores.
+        export NIX_OTHER_STORES=/var/run/nix/remote-stores/*/nix
+      '' 
+      + optionalString config.nix.distributedBuilds ''
+        export NIX_BUILD_HOOK=${config.environment.nix}/libexec/nix/build-remote.pl
+        export NIX_REMOTE_SYSTEMS=/etc/nix.machines
+        export NIX_CURRENT_LOAD=/var/run/nix/current-load
+      ''
+      # !!! These should not be defined here, but in some general proxy configuration module!
+      + optionalString (config.nix.proxy != "") ''
+        export http_proxy=${config.nix.proxy}
+        export https_proxy=${config.nix.proxy}
+        export ftp_proxy=${config.nix.proxy}
+      '';
 
-      extraConfig = 
-        ''
-          limit nofile 4096 4096
-        '';
-    };
+  };
 
-  environment.shellInit =
-    ''
-      # Set up the environment variables for running Nix.
-      ${config.nix.envVars}
-      
-      # Set up secure multi-user builds: non-root users build through the
-      # Nix daemon.
-      if test "$USER" != root; then
-          export NIX_REMOTE=daemon
-      else
-          export NIX_REMOTE=
-      fi
-    '';
 }
-- 
GitLab


From cb85c4ed3eca027427b7c4d690e293cf42a8550d Mon Sep 17 00:00:00 2001
From: Nicolas Pierron <nicolas.b.pierron@gmail.com>
Date: Fri, 18 Sep 2009 15:10:32 +0000
Subject: [PATCH 1827/5331] Add display of declaration and definition
 locations.

svn path=/nixos/trunk/; revision=17254
---
 doc/manual/default.nix            |  7 +++++--
 doc/manual/options-to-docbook.xsl | 14 ++++++++++++++
 2 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/doc/manual/default.nix b/doc/manual/default.nix
index fad32986538..d2b92143630 100644
--- a/doc/manual/default.nix
+++ b/doc/manual/default.nix
@@ -1,4 +1,7 @@
-{ pkgs, options }:
+{ pkgs, options
+# revision can have multiple values: local, HEAD or any revision number.
+, revision ? "HEAD"
+}:
 
 let
   # To prevent infinite recursion, remove system.path from the
@@ -33,7 +36,7 @@ let
 
     buildCommand = ''
       
-      ln -s $sources/*.xml .
+      ln -s $sources/*.xml . # */
       ln -s ${optionsDocBook} options-db.xml
 
       dst=$out/share/doc/nixos
diff --git a/doc/manual/options-to-docbook.xsl b/doc/manual/options-to-docbook.xsl
index f269857a1c3..b69ea9e135a 100644
--- a/doc/manual/options-to-docbook.xsl
+++ b/doc/manual/options-to-docbook.xsl
@@ -58,6 +58,20 @@
                    </literal>
                  </para>
                </xsl:if>
+
+               <xsl:if test="count(attr[@name = 'declarations']/list/*) != 0">
+                 <para>
+                   <emphasis>Declared by:</emphasis>
+                   <xsl:apply-templates select="attr[@name = 'declarations']" />
+                 </para>
+               </xsl:if>
+
+               <xsl:if test="count(attr[@name = 'definitions']/list/*) != 0">
+                 <para>
+                   <emphasis>Defined by:</emphasis>
+                   <xsl:apply-templates select="attr[@name = 'definitions']" />
+                 </para>
+               </xsl:if>
                
              </listitem>
 
-- 
GitLab


From 32c3793e62f1e30187406a97e887a74705e3b313 Mon Sep 17 00:00:00 2001
From: Nicolas Pierron <nicolas.b.pierron@gmail.com>
Date: Fri, 18 Sep 2009 15:10:37 +0000
Subject: [PATCH 1828/5331] Add "defined by" and "declared by" for each option.
  These are list of files which link to either the remote source or the local
 file location.

svn path=/nixos/trunk/; revision=17255
---
 doc/manual/default.nix            | 32 +++++++++++++++++++++++++++----
 doc/manual/options-to-docbook.xsl |  9 ++++++++-
 2 files changed, 36 insertions(+), 5 deletions(-)

diff --git a/doc/manual/default.nix b/doc/manual/default.nix
index d2b92143630..1bd6f6c0441 100644
--- a/doc/manual/default.nix
+++ b/doc/manual/default.nix
@@ -10,13 +10,32 @@ let
     options //
     { system = removeAttrs options.system ["path"]; };
 
-  optionsXML = builtins.toFile "options.xml" (builtins.unsafeDiscardStringContext
+  optionsXML_ = builtins.toFile "options.xml" (builtins.unsafeDiscardStringContext
     (builtins.toXML (pkgs.lib.optionAttrSetToDocList "" options_)));
 
+  optionsXML = pkgs.runCommand "options2.xml" {} ''
+    sed '
+      \,<attr name="\(declarations\|definitions\)">, {
+        n # fetch the next line
+        : rewriteLinks
+        n # fetch the next line
+        \,</list>, b # leave if this is the end of the list
+        ${if revision == "local" then "" else ''
+        # redirect nixos internals to the repository
+        s,<string value="[^"]*/modules/\([^"]*\)" />,<string value="!https://svn.nixos.org/viewvc/nix/nixos/trunk/modules/\1?revision=${revision}!!../nixos/modules/\1!" />, #"
+        t rewriteLinks # jump to rewriteLinks if done
+        ''}
+        # redirect local file to their locations
+        s,<string value="\([^"]*\)" />,<string value="!file://\1\!!../nixos/modules/\1!" />, #"
+        b rewriteLinks # jump to rewriteLinks
+      }
+    ' ${optionsXML_} > $out
+  '';
+
   optionsDocBook = pkgs.runCommand "options-db.xml" {} ''
-    ${pkgs.libxslt}/bin/xsltproc -o $out ${./options-to-docbook.xsl} ${optionsXML} 
+    ${pkgs.libxslt}/bin/xsltproc -o $out ${./options-to-docbook.xsl} ${optionsXML}
   '';
-    
+
   manual = pkgs.stdenv.mkDerivation {
     name = "nixos-manual";
 
@@ -42,9 +61,14 @@ let
       dst=$out/share/doc/nixos
       ensureDir $dst
       xsltproc $xsltFlags --nonet --xinclude \
-        --output $dst/manual.html \
+        --output ./manual.html \
         ${pkgs.docbook5_xsl}/xml/xsl/docbook/xhtml/docbook.xsl \
         ./manual.xml
+
+      sed '
+        s,!\([^!]*\)!!\([^!]*\)!,<a class="link" href="\1" target="_top"><code class="filename">\2</code></a>,g
+      ' ./manual.html > $dst/manual.html
+
       ln -s ${pkgs.docbook5_xsl}/xml/xsl/docbook/images $dst/
       cp ${./style.css} $dst/style.css
 
diff --git a/doc/manual/options-to-docbook.xsl b/doc/manual/options-to-docbook.xsl
index b69ea9e135a..a9d77da977d 100644
--- a/doc/manual/options-to-docbook.xsl
+++ b/doc/manual/options-to-docbook.xsl
@@ -136,6 +136,13 @@
       </xsl:otherwise>
     </xsl:choose>
   </xsl:template>
-  
+
+  <xsl:template match="attr[@name = 'declarations' or @name = 'definitions']">
+    <itemizedlist>
+      <xsl:for-each select="list/string">
+        <listitem><xsl:text> </xsl:text><xsl:value-of select="@value" /></listitem>
+      </xsl:for-each>
+    </itemizedlist>
+  </xsl:template>  
   
 </xsl:stylesheet>
-- 
GitLab


From f563438264cd4f979e636f7068639eeef09ac0f3 Mon Sep 17 00:00:00 2001
From: Nicolas Pierron <nicolas.b.pierron@gmail.com>
Date: Fri, 18 Sep 2009 15:15:40 +0000
Subject: [PATCH 1829/5331] The generated manual now use the SVN revision
 fetched by the buildfarm.

svn path=/nixos/trunk/; revision=17256
---
 release.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/release.nix b/release.nix
index 91a83de392c..be8831d06de 100644
--- a/release.nix
+++ b/release.nix
@@ -79,6 +79,7 @@ let
             inherit nixpkgs;
             modules = [ ];
           }).options;
+        revision = if rev == 1234 then "HEAD" else toString rev;
       };
 
 
-- 
GitLab


From 0e3981213ff68484d2cde72e6fe079059c003b32 Mon Sep 17 00:00:00 2001
From: Nicolas Pierron <nicolas.b.pierron@gmail.com>
Date: Fri, 18 Sep 2009 15:27:10 +0000
Subject: [PATCH 1830/5331] Add an option to change the policy of source file
 links inside the manual. The default policy use local files instead of remote
 ones.

svn path=/nixos/trunk/; revision=17258
---
 modules/services/misc/nixos-manual.nix | 20 +++++++++++++++-----
 1 file changed, 15 insertions(+), 5 deletions(-)

diff --git a/modules/services/misc/nixos-manual.nix b/modules/services/misc/nixos-manual.nix
index 45a38c778ea..8447bc8ae75 100644
--- a/modules/services/misc/nixos-manual.nix
+++ b/modules/services/misc/nixos-manual.nix
@@ -7,14 +7,14 @@
 
 let
 
-  inherit (pkgs.lib) mkOption mkIf;
+  inherit (pkgs.lib) mkOption mkIf types;
 
   cfg = config.services.nixosManual;
 
-  manual =
-    # We could speed up the evaluation of the manual expression by
-    # providing it the options of the current configuration.
-    import ../../../doc/manual {inherit pkgs options;};
+  manual = import ../../../doc/manual {
+    inherit (cfg) revision;
+    inherit pkgs options;
+  };
     
 in
 
@@ -51,6 +51,16 @@ in
       '';
     };
 
+    services.nixosManual.revision = mkOption {
+      default = "local";
+      type = types.uniq types.string;
+      description = ''
+        Revision of the targeted source file.  This value can either be
+        <literate>"local"</literate>, <literate>"HEAD"</literate> or any
+        revision number embedded in a string.
+      '';
+    };
+
   };
 
 
-- 
GitLab


From 801710b8bf6124b6fe7896bb31390bf27e29114d Mon Sep 17 00:00:00 2001
From: Nicolas Pierron <nicolas.b.pierron@gmail.com>
Date: Fri, 18 Sep 2009 15:40:02 +0000
Subject: [PATCH 1831/5331] Fix access to the `rev' attribute

svn path=/nixos/trunk/; revision=17259
---
 release.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/release.nix b/release.nix
index be8831d06de..b0e3036942c 100644
--- a/release.nix
+++ b/release.nix
@@ -79,7 +79,8 @@ let
             inherit nixpkgs;
             modules = [ ];
           }).options;
-        revision = if rev == 1234 then "HEAD" else toString rev;
+        revision = with nixosSrc;
+          if rev == 1234 then "HEAD" else toString rev;
       };
 
 
-- 
GitLab


From 2ebd1252aa619cabbf86f1e3ea4b41f0d16e165d Mon Sep 17 00:00:00 2001
From: Nicolas Pierron <nicolas.b.pierron@gmail.com>
Date: Fri, 18 Sep 2009 15:47:02 +0000
Subject: [PATCH 1832/5331] Fix typo.

svn path=/nixos/trunk/; revision=17260
---
 modules/services/misc/nixos-manual.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/services/misc/nixos-manual.nix b/modules/services/misc/nixos-manual.nix
index 8447bc8ae75..5fa65990e2d 100644
--- a/modules/services/misc/nixos-manual.nix
+++ b/modules/services/misc/nixos-manual.nix
@@ -56,7 +56,7 @@ in
       type = types.uniq types.string;
       description = ''
         Revision of the targeted source file.  This value can either be
-        <literate>"local"</literate>, <literate>"HEAD"</literate> or any
+        <literal>"local"</literal>, <literal>"HEAD"</literal> or any
         revision number embedded in a string.
       '';
     };
-- 
GitLab


From 4670b1318ac6679c9b5ba020c97e408d191a07d9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Fri, 18 Sep 2009 20:49:12 +0000
Subject: [PATCH 1833/5331] Adding support for the rt73 usb wifi nic firmware
 loading.

svn path=/nixos/trunk/; revision=17264
---
 modules/hardware/network/rt73.nix | 26 ++++++++++++++++++++++++++
 modules/module-list.nix           |  1 +
 2 files changed, 27 insertions(+)
 create mode 100644 modules/hardware/network/rt73.nix

diff --git a/modules/hardware/network/rt73.nix b/modules/hardware/network/rt73.nix
new file mode 100644
index 00000000000..f7fae009528
--- /dev/null
+++ b/modules/hardware/network/rt73.nix
@@ -0,0 +1,26 @@
+{pkgs, config, ...}:
+
+{
+
+  ###### interface
+
+  options = {
+  
+    networking.enableRT73Firmware = pkgs.lib.mkOption {
+      default = false;
+      type = pkgs.lib.types.bool;
+      description = ''
+        Turn on this option if you want firmware for the RT73 NIC
+      '';
+    };
+
+  };
+
+
+  ###### implementation
+  
+  config = pkgs.lib.mkIf config.networking.enableRT73Firmware {
+    hardware.firmware = [ pkgs.rt73fw ];
+  };
+  
+}
diff --git a/modules/module-list.nix b/modules/module-list.nix
index 63246f44400..ca6bd0b3515 100644
--- a/modules/module-list.nix
+++ b/modules/module-list.nix
@@ -9,6 +9,7 @@
   ./config/users-groups.nix
   ./hardware/network/intel-2200bg.nix
   ./hardware/network/intel-3945abg.nix
+  ./hardware/network/rt73.nix 
   ./hardware/pcmcia.nix
   ./installer/grub/grub.nix
   ./installer/tools/nixos-checkout.nix
-- 
GitLab


From a574ae095a27b0393f2e7dd2357e3325627da764 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Sat, 19 Sep 2009 11:09:22 +0000
Subject: [PATCH 1834/5331] Fresh kernel means fresh kernel!

svn path=/nixos/trunk/; revision=17272
---
 .../installer/cd-dvd/installation-cd-minimal-fresh-kernel.nix | 4 ++--
 release.nix                                                   | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/modules/installer/cd-dvd/installation-cd-minimal-fresh-kernel.nix b/modules/installer/cd-dvd/installation-cd-minimal-fresh-kernel.nix
index 73e83fa2645..3c58b03f2e9 100644
--- a/modules/installer/cd-dvd/installation-cd-minimal-fresh-kernel.nix
+++ b/modules/installer/cd-dvd/installation-cd-minimal-fresh-kernel.nix
@@ -15,8 +15,8 @@
   fonts.enableFontConfig = false;
   fonts.enableCoreFonts = false;
 
-  # Use Linux 2.6.31-zen0 (with aufs2).
-  boot.kernelPackages = pkgs.kernelPackages_2_6_31_zen0;
+  # Use Linux 2.6.31-zen2 (with aufs2).
+  boot.kernelPackages = pkgs.kernelPackages_2_6_31_zen2;
 
   # We need squashfs and aufs. Zen Linux Kernel contains kernel side.
   boot.initrd.extraUtilsCommands = ''
diff --git a/release.nix b/release.nix
index b0e3036942c..26708ed3e73 100644
--- a/release.nix
+++ b/release.nix
@@ -91,7 +91,7 @@ let
 
     iso_minimal_fresh_kernel = makeIso {
       module = ./modules/installer/cd-dvd/installation-cd-minimal-fresh-kernel.nix;
-      description = "minimal with 2.6.31-zen0";
+      description = "minimal with 2.6.31-zen2-branch";
       maintainers = ["raskin"];
     };
 
-- 
GitLab


From 67fa5622bf86e0178b31778478194694501281c5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Sat, 19 Sep 2009 22:09:29 +0000
Subject: [PATCH 1835/5331] Adding support for the nvidia legacy drivers
 (videoDriver = "nvidiaLegacy")

svn path=/nixos/trunk/; revision=17285
---
 modules/services/x11/xserver.nix | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/modules/services/x11/xserver.nix b/modules/services/x11/xserver.nix
index cb71a484043..eff5b693722 100644
--- a/modules/services/x11/xserver.nix
+++ b/modules/services/x11/xserver.nix
@@ -14,6 +14,7 @@ let
   # Map the video driver setting to a driver.
   knownVideoDrivers = {
     nvidia =     { modules = [ kernelPackages.nvidia_x11 ]; };
+    nvidiaLegacy =     { modules = [ kernelPackages.nvidia_x11_legacy ]; };
     vesa =       { modules = [ xorg.xf86videovesa ]; };
     vga =        { modules = [ xorg.xf86videovga ]; };
     sis =        { modules = [ xorg.xf86videosis ]; };
@@ -318,7 +319,8 @@ in
       };
 
     boot.extraModulePackages =
-      optional (cfg.videoDriver == "nvidia") kernelPackages.nvidia_x11;
+      optional (cfg.videoDriver == "nvidia") kernelPackages.nvidia_x11 ++ 
+      optional (cfg.videoDriver == "nvidiaLegacy") kernelPackages.nvidia_x11_legacy;
 
     environment.etc = optionals cfg.exportConfiguration
       [ { source = "${configFile}";
@@ -339,7 +341,8 @@ in
         xorg.xsetroot
         xorg.xprop
       ]
-      ++ optional (videoDriver == "nvidia") kernelPackages.nvidia_x11;
+      ++ optional (videoDriver == "nvidia") kernelPackages.nvidia_x11
+      ++ optional (videoDriver == "nvidiaLegacy") kernelPackages.nvidia_x11_legacy;
 
     environment.systemPackages = config.environment.x11Packages;
     
@@ -357,6 +360,8 @@ in
             XORG_DRI_DRIVER_PATH = "${pkgs.mesa}/lib/dri";
           } // optionalAttrs (videoDriver == "nvidia") {
             LD_LIBRARY_PATH = "${xorg.libX11}/lib:${xorg.libXext}/lib:${kernelPackages.nvidia_x11}/lib";
+          } // optionalAttrs (videoDriver == "nvidiaLegacy") {
+            LD_LIBRARY_PATH = "${xorg.libX11}/lib:${xorg.libXext}/lib:${kernelPackages.nvidia_x11_legacy}/lib";
           } // cfg.displayManager.job.environment;
 
         preStart =
@@ -374,6 +379,10 @@ in
               then ''
                 ln -sf ${kernelPackages.nvidia_x11} /var/run/opengl-driver
               ''
+	      else if videoDriver == "nvidia"
+              then ''
+                ln -sf ${kernelPackages.nvidia_x11_legacy} /var/run/opengl-driver
+              ''
               else if cfg.driSupport
               then "ln -sf ${pkgs.mesa} /var/run/opengl-driver"
               else ""
@@ -454,7 +463,7 @@ in
         EndSection
 
         Section "Extensions"
-          ${optionalString (cfg.videoDriver == "nvidia" || cfg.videoDriver == "i810" || cfg.videoDriver == "ati" || cfg.videoDriver == "radeonhd") ''
+          ${optionalString (cfg.videoDriver == "nvidia" || cfg.videoDriver == "nvidiaLegacy" || cfg.videoDriver == "i810" || cfg.videoDriver == "ati" || cfg.videoDriver == "radeonhd") ''
             Option "Composite" "Enable"
           ''}
         EndSection
@@ -472,7 +481,7 @@ in
     services.xserver.deviceSection =
       ''
         Identifier "Device[0]"
-        Driver "${cfg.videoDriver}"
+        Driver "${if cfg.videoDriver == "nvidiaLegacy" then "nvidia" else cfg.videoDriver}"
 
         # !!! Is the "Clone" option still useful?
         Option "Clone" "${if cfg.isClone then "on" else "off"}"
-- 
GitLab


From 406bcd0d4f2b34335a89a190dd6518495bd1bf87 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Sun, 20 Sep 2009 06:00:50 +0000
Subject: [PATCH 1836/5331] Adding the single package needed for the offline
 installation

svn path=/nixos/trunk/; revision=17291
---
 .../cd-dvd/installation-cd-minimal-fresh-kernel.nix         | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/modules/installer/cd-dvd/installation-cd-minimal-fresh-kernel.nix b/modules/installer/cd-dvd/installation-cd-minimal-fresh-kernel.nix
index 3c58b03f2e9..ff7bad02e04 100644
--- a/modules/installer/cd-dvd/installation-cd-minimal-fresh-kernel.nix
+++ b/modules/installer/cd-dvd/installation-cd-minimal-fresh-kernel.nix
@@ -3,7 +3,7 @@
 
 {config, pkgs, ...}:
 
-{
+rec {
   require = [./installation-cd-base.nix];
 
   installer.configModule = "./nixos/modules/installer/cd-dvd/installation-cd-minimal.nix";
@@ -34,4 +34,8 @@
     "iso9660" "loop" "squashfs"
     ];
   boot.initrd.allowMissing = true;
+
+  environment.systemPackages = [
+    pkgs.klibc
+    ];
 }
-- 
GitLab


From 9be240eaf2a60f37993ca4122454ca33308d6a61 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Sun, 20 Sep 2009 09:50:24 +0000
Subject: [PATCH 1837/5331] Add rescue functionality

svn path=/nixos/trunk/; revision=17296
---
 .../installation-cd-minimal-fresh-kernel.nix  | 25 +++++++++++++++++--
 1 file changed, 23 insertions(+), 2 deletions(-)

diff --git a/modules/installer/cd-dvd/installation-cd-minimal-fresh-kernel.nix b/modules/installer/cd-dvd/installation-cd-minimal-fresh-kernel.nix
index ff7bad02e04..152d1724b1e 100644
--- a/modules/installer/cd-dvd/installation-cd-minimal-fresh-kernel.nix
+++ b/modules/installer/cd-dvd/installation-cd-minimal-fresh-kernel.nix
@@ -35,7 +35,28 @@ rec {
     ];
   boot.initrd.allowMissing = true;
 
-  environment.systemPackages = [
-    pkgs.klibc
+  environment.systemPackages = with pkgs; [
+    klibc 
+
+    dmraid
+
+    cryptsetup ccrypt 
+
+    utillinuxCurses ddrescue testdisk
+    pciutils sdparm hdparm hddtemp usbutils
+    btrfsProgs xfsProgs jfsUtils jfsrec
+    wpa_supplicant iproute 
+    fuse ntfs3g smbfsFuse sshfsFuse
+    manpages irssi elinks mcabber mutt openssh lftp 
+    openssl ncat socat
+    gnupg gnupg2
+    patch which diffutils gcc binutils bc file
+    screen
+    bvi joe nvi 
+    subversion16 monotone git darcs mercurial bazaar cvs
+    unrar unzip zip lzma cabextract cpio 
+    dar p7zip xz lrzip rzip lzop
+    lsof
+    gcc gnused gnumake ncurses gnugrep findutils ed
     ];
 }
-- 
GitLab


From de555c37057de4d265f135177e84523121311431 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Sun, 20 Sep 2009 15:07:19 +0000
Subject: [PATCH 1838/5331] Reduce size of iso-minimal-fresh-kernel and make it
 easier to install offline

svn path=/nixos/trunk/; revision=17301
---
 modules/config/no-x-libs.nix                  | 24 +++++++++++++
 .../installation-cd-minimal-fresh-kernel.nix  | 34 ++++++-------------
 modules/module-list.nix                       |  1 +
 3 files changed, 36 insertions(+), 23 deletions(-)
 create mode 100644 modules/config/no-x-libs.nix

diff --git a/modules/config/no-x-libs.nix b/modules/config/no-x-libs.nix
new file mode 100644
index 00000000000..3194eb9b324
--- /dev/null
+++ b/modules/config/no-x-libs.nix
@@ -0,0 +1,24 @@
+{pkgs, config, ...}:
+
+{
+  options = {
+    environment.noXlibs = pkgs.lib.mkOption {
+      default = false;
+      example = true;
+      description = "Removing on-by-default X-dependent settings";
+    };
+  };
+  config = pkgs.lib.mkIf config.environment.noXlibs {
+    services = {
+      sshd = {
+        forwardX11 = false;
+      };
+      dbus.enable = false;
+      hal.enable = false;
+    };
+    fonts = {
+      enableCoreFonts = false;
+      enableFontConfig = false;
+    };
+  };
+}
diff --git a/modules/installer/cd-dvd/installation-cd-minimal-fresh-kernel.nix b/modules/installer/cd-dvd/installation-cd-minimal-fresh-kernel.nix
index 152d1724b1e..30aa7e1c351 100644
--- a/modules/installer/cd-dvd/installation-cd-minimal-fresh-kernel.nix
+++ b/modules/installer/cd-dvd/installation-cd-minimal-fresh-kernel.nix
@@ -9,11 +9,10 @@ rec {
   installer.configModule = "./nixos/modules/installer/cd-dvd/installation-cd-minimal.nix";
 
   # Don't include X libraries.
-  services.sshd.forwardX11 = false;
-  services.dbus.enable = false; # depends on libX11
-  services.hal.enable = false; # depends on dbus
-  fonts.enableFontConfig = false;
-  fonts.enableCoreFonts = false;
+  environment.noXlibs = true;
+
+  # Most users will download it anyway
+  security.sudo.enable = true;
 
   # Use Linux 2.6.31-zen2 (with aufs2).
   boot.kernelPackages = pkgs.kernelPackages_2_6_31_zen2;
@@ -36,27 +35,16 @@ rec {
   boot.initrd.allowMissing = true;
 
   environment.systemPackages = with pkgs; [
-    klibc 
-
-    dmraid
-
-    cryptsetup ccrypt 
-
+    klibc dmraid cryptsetup ccrypt 
     utillinuxCurses ddrescue testdisk
-    pciutils sdparm hdparm hddtemp usbutils
+    pciutils sdparm hdparm usbutils
     btrfsProgs xfsProgs jfsUtils jfsrec
     wpa_supplicant iproute 
-    fuse ntfs3g smbfsFuse sshfsFuse
-    manpages irssi elinks mcabber mutt openssh lftp 
-    openssl ncat socat
-    gnupg gnupg2
+    manpages openssh openssl ncat socat
+    fuse ntfs3g gnupg gnupg2
     patch which diffutils gcc binutils bc file
-    screen
-    bvi joe nvi 
-    subversion16 monotone git darcs mercurial bazaar cvs
-    unrar unzip zip lzma cabextract cpio 
-    dar p7zip xz lrzip rzip lzop
-    lsof
-    gcc gnused gnumake ncurses gnugrep findutils ed
+    gnused gnumake ncurses gnugrep findutils ed
+    screen bvi joe nvi dar xz lsof
+    unrar unzip zip lzma cpio 
     ];
 }
diff --git a/modules/module-list.nix b/modules/module-list.nix
index ca6bd0b3515..40c7e1c2f88 100644
--- a/modules/module-list.nix
+++ b/modules/module-list.nix
@@ -2,6 +2,7 @@
   ./config/i18n.nix
   ./config/ldap.nix
   ./config/networking.nix
+  ./config/no-x-libs.nix
   ./config/nsswitch.nix
   ./config/system-path.nix
   ./config/timezone.nix
-- 
GitLab


From 69cc6ce3ec7c8495f2640abc6f355e5088b6cc43 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Sun, 20 Sep 2009 18:15:52 +0000
Subject: [PATCH 1839/5331] Refactoring modules and cleaning up a comment

svn path=/nixos/trunk/; revision=17310
---
 modules/config/no-x-libs.nix                             | 6 +++++-
 .../cd-dvd/installation-cd-minimal-fresh-kernel.nix      | 4 ----
 modules/system/boot/kernel.nix                           | 9 +++++++--
 modules/system/boot/stage-1.nix                          | 2 +-
 4 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/modules/config/no-x-libs.nix b/modules/config/no-x-libs.nix
index 3194eb9b324..fbefc5b6b3e 100644
--- a/modules/config/no-x-libs.nix
+++ b/modules/config/no-x-libs.nix
@@ -5,7 +5,11 @@
     environment.noXlibs = pkgs.lib.mkOption {
       default = false;
       example = true;
-      description = "Removing on-by-default X-dependent settings";
+      description = ''
+        Switch off the options in the default configuration that require X libraries.
+	Currently this includes: sshd.forwardX11, dbus, hal, fonts.enableCoreFonts,
+	fonts.enableFontConfig
+      '';
     };
   };
   config = pkgs.lib.mkIf config.environment.noXlibs {
diff --git a/modules/installer/cd-dvd/installation-cd-minimal-fresh-kernel.nix b/modules/installer/cd-dvd/installation-cd-minimal-fresh-kernel.nix
index 30aa7e1c351..6f85e7a8d51 100644
--- a/modules/installer/cd-dvd/installation-cd-minimal-fresh-kernel.nix
+++ b/modules/installer/cd-dvd/installation-cd-minimal-fresh-kernel.nix
@@ -26,10 +26,6 @@ rec {
   '';
 
   boot.initrd.extraKernelModules = [
-    "i8042" "pcips2" "serio" "mousedev" "evdev" "psmouse" "sermouse"
-    "synaptics_i2c" "unix" "usbhid" "uhci_hcd" "ehci_hcd" "ohci_hcd" 
-    "atkbd" "xtkbd" 
-    # CD part
     "iso9660" "loop" "squashfs"
     ];
   boot.initrd.allowMissing = true;
diff --git a/modules/system/boot/kernel.nix b/modules/system/boot/kernel.nix
index 2a052d213d4..ea6f2812485 100644
--- a/modules/system/boot/kernel.nix
+++ b/modules/system/boot/kernel.nix
@@ -28,9 +28,9 @@ let
           "selinux=0"
           "apm=on"
           "acpi=on"
-          "vga=0x317"
           "console=tty1"
           "splash=verbose"
+          "vga=0x317"
         ];
         description = "
           The kernel parameters.  If you want to add additional
@@ -101,12 +101,17 @@ let
             
             # Support USB keyboards, in case the boot fails and we only have
             # a USB keyboard.
+            "uhci_hcd"
             "ehci_hcd"
             "ohci_hcd"
             "usbhid"
 
             # LVM.
             "dm_mod"
+
+	    # All-mod-config case:
+	    "unix"
+	    "i8042" "pcips2" "serio" "atkbd" "xtkbd"
           ];
           description = "
             The set of kernel modules in the initial ramdisk used during the
@@ -179,7 +184,7 @@ let
 in
 
 {
-  require = [options];
+  require = [ options ];
 
   system.build = { inherit kernel; };
   system.modulesTree = [ kernel ] ++ config.boot.extraModulePackages;
diff --git a/modules/system/boot/stage-1.nix b/modules/system/boot/stage-1.nix
index 0480a277afd..04b5b5fa525 100644
--- a/modules/system/boot/stage-1.nix
+++ b/modules/system/boot/stage-1.nix
@@ -31,7 +31,7 @@ let
     };
 
     boot.initrd.allowMissing = mkOption {
-      default = false;
+      default = true;
       description = ''
         Allow some initrd components to be missing. Useful for
         custom kernel that are changed too often to track needed
-- 
GitLab


From 478dd67532226009f48ca3afda434cedc8129a10 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Sun, 20 Sep 2009 18:48:34 +0000
Subject: [PATCH 1840/5331] Fixing incorrect file reference

svn path=/nixos/trunk/; revision=17311
---
 .../installer/cd-dvd/installation-cd-minimal-fresh-kernel.nix   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/installer/cd-dvd/installation-cd-minimal-fresh-kernel.nix b/modules/installer/cd-dvd/installation-cd-minimal-fresh-kernel.nix
index 6f85e7a8d51..2cde633c4be 100644
--- a/modules/installer/cd-dvd/installation-cd-minimal-fresh-kernel.nix
+++ b/modules/installer/cd-dvd/installation-cd-minimal-fresh-kernel.nix
@@ -6,7 +6,7 @@
 rec {
   require = [./installation-cd-base.nix];
 
-  installer.configModule = "./nixos/modules/installer/cd-dvd/installation-cd-minimal.nix";
+  installer.configModule = "./nixos/modules/installer/cd-dvd/installation-cd-minimal-fresh-kernel.nix";
 
   # Don't include X libraries.
   environment.noXlibs = true;
-- 
GitLab


From e49ea464664485eda5d2685fcebd790fa1af32cc Mon Sep 17 00:00:00 2001
From: Marc Weber <marco-oweber@gmx.de>
Date: Wed, 23 Sep 2009 00:54:09 +0000
Subject: [PATCH 1841/5331] nfs-kernel:  fix creating directories by skipping
 comments and interpreting quotes,  take input from ${exports} which may be
 different from /etc/exports  which also restarts the service in this case
 updating the export list  Also run rpc.statd in forground so that it doesn't
 get respawned

svn path=/nixos/trunk/; revision=17358
---
 .../network-filesystems/nfs-kernel.nix        | 20 +++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/modules/services/network-filesystems/nfs-kernel.nix b/modules/services/network-filesystems/nfs-kernel.nix
index 6868e75ff1a..d2667e1cd18 100644
--- a/modules/services/network-filesystems/nfs-kernel.nix
+++ b/modules/services/network-filesystems/nfs-kernel.nix
@@ -19,11 +19,12 @@ let
         };
 
         exports = mkOption {
-          default = "/etc/exports";
+          check = v: v != "/etc/exports"; # this won't work
           description = "
             the file listing the directories to be exported.
             install nfsUtils and run man exports to learn about its format.
             The exports setting can either be a file path or the file contents.
+            Don't use /etc/exports. This won't work as nix will overwrite it.
           ";
         };
 
@@ -92,17 +93,16 @@ mkIf config.services.nfsKernel.enable {
 	  
 	  ${if cfg.createMountPoints == true then
 	    ''
-	      cat /etc/exports | while read line
-	      do
-	        for i in $line
-		do
-		  mkdir -p $i
-		  break
-		done
-	      done
+              # create export directories:
+              # skip comments, take first col which may either be a quoted
+              # "foo bar" or just foo (-> man export)
+              sed '/^#.*/d;s/^"\([^"]*\)".*/\1/;t;s/[ ].*//' ${exports} \
+              | xargs -d '\n' mkdir -p
 	    ''
 	    else ""}
 	    	  
+          # exports file is ${exports}
+          # keep this comment so that this job is restarted whenever exports changes!
           exportfs -ra
         end script
 
@@ -146,7 +146,7 @@ mkIf config.services.nfsKernel.enable {
           mkdir -p /var/lib/nfs
         end script
 
-        respawn ${pkgs.nfsUtils}/sbin/rpc.statd
+        respawn ${pkgs.nfsUtils}/sbin/rpc.statd -F
       '';
     }
     ];
-- 
GitLab


From 7b14ee9932140c432e15dec3eec653efcce64bec Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Wed, 23 Sep 2009 20:50:41 +0000
Subject: [PATCH 1842/5331] Setting the files cipher algorithm depending on the
 architecture (with libxcrypt or without libxcrypt, at the end)

svn path=/nixos/trunk/; revision=17389
---
 modules/programs/pwdutils/passwd.conf  | 2 +-
 modules/programs/pwdutils/pwdutils.nix | 9 ++++++++-
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/modules/programs/pwdutils/passwd.conf b/modules/programs/pwdutils/passwd.conf
index 5804e28c38b..3b10fa350b5 100644
--- a/modules/programs/pwdutils/passwd.conf
+++ b/modules/programs/pwdutils/passwd.conf
@@ -4,7 +4,7 @@ CRYPT=des
 
 # for local files, use a more secure hash. We
 # don't need to be portable here:
-CRYPT_FILES=blowfish
+CRYPT_FILES=@filesCipher@
 
 # sometimes we need to specify special options for
 # a hash (variable is prepended by the name of the
diff --git a/modules/programs/pwdutils/pwdutils.nix b/modules/programs/pwdutils/pwdutils.nix
index ec5d31a1ad1..a690d7dab3e 100644
--- a/modules/programs/pwdutils/pwdutils.nix
+++ b/modules/programs/pwdutils/pwdutils.nix
@@ -33,7 +33,14 @@ in
 
       { # /etc/default/passwd: configuration for passwd and friends
         # (e.g., hash algorithm for /etc/passwd).
-        source = ./passwd.conf;
+        source = pkgs.substituteAll {
+          src = ./passwd.conf;
+          # This depends on pam_unix2 being built with libxcrypt or libc's libcrypt.
+          # Only in the first case it will understand 'blowfish'. And pam_unix2
+          # is not built with libxcrypt at the time of writing (it did not build)
+          filesCipher = if (pkgs.stdenv.system == "armv5tel-linux") then
+            "des" else "blowfish";
+        };
         target = "default/passwd";
       }
 
-- 
GitLab


From eab68acb35832dd0365b801188f1cb7821eb1b25 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Wed, 23 Sep 2009 20:50:48 +0000
Subject: [PATCH 1843/5331] Conditioning on /sys/power, and adding double
 patchelf for armv5tel-linux

svn path=/nixos/trunk/; revision=17390
---
 modules/system/boot/stage-1-init.sh | 6 ++++--
 modules/system/boot/stage-1.nix     | 9 +++++++--
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/modules/system/boot/stage-1-init.sh b/modules/system/boot/stage-1-init.sh
index 5c3ad57af65..58bf218428b 100644
--- a/modules/system/boot/stage-1-init.sh
+++ b/modules/system/boot/stage-1-init.sh
@@ -106,8 +106,10 @@ if test -e /sys/power/tuxonice/resume; then
     fi
 fi
 
-echo "@resumeDevice@" > /sys/power/resume 2> /dev/null || echo "failed to resume..."
-echo shutdown > /sys/power/disk
+if test -e /sys/power/resume -a -e /sys/power/disk; then
+  echo "@resumeDevice@" > /sys/power/resume 2> /dev/null || echo "failed to resume..."
+  echo shutdown > /sys/power/disk
+fi
 
 
 # Create device nodes in /dev.
diff --git a/modules/system/boot/stage-1.nix b/modules/system/boot/stage-1.nix
index 04b5b5fa525..a0e2fe120b0 100644
--- a/modules/system/boot/stage-1.nix
+++ b/modules/system/boot/stage-1.nix
@@ -128,17 +128,19 @@ let
       devicemapper = if config.boot.initrd.lvm then pkgs.devicemapper else null;
       lvm2 = if config.boot.initrd.lvm then pkgs.lvm2 else null;
       allowedReferences = ["out"]; # prevent accidents like glibc being included in the initrd
+      doublePatchelf = (pkgs.stdenv.system == "armv5tel-linux");
     }
     ''
       ensureDir $out/bin
       ensureDir $out/lib
       
       # Copy what we need from Glibc.
-      cp -p ${pkgs.glibc}/lib/ld-linux*.so.2 $out/lib
+      cp -p ${pkgs.glibc}/lib/ld-linux*.so.? $out/lib
       cp -p ${pkgs.glibc}/lib/libc.so.* $out/lib
       cp -p ${pkgs.glibc}/lib/libpthread.so.* $out/lib
       cp -p ${pkgs.glibc}/lib/librt.so.* $out/lib
       cp -p ${pkgs.glibc}/lib/libdl.so.* $out/lib
+      cp -p ${pkgs.gcc.gcc}/lib/libgcc_s.so.* $out/lib
 
       # Copy some utillinux stuff.
       cp ${pkgs.utillinux}/bin/mount ${pkgs.utillinux}/bin/umount \
@@ -190,7 +192,10 @@ let
       for i in $out/bin/*; do
           if ! test -L $i; then
               echo "patching $i..."
-              patchelf --set-interpreter $out/lib/ld-linux*.so.2 --set-rpath $out/lib $i || true
+              patchelf --set-interpreter $out/lib/ld-linux*.so.? --set-rpath $out/lib $i || true
+              if [ "$doublePatchelf" -eq 1 ]; then
+                  patchelf --set-interpreter $out/lib/ld-linux*.so.? --set-rpath $out/lib $i || true
+              fi
           fi
       done
 
-- 
GitLab


From b2334990dbb00f37b9568854291eae57b82a7865 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Wed, 23 Sep 2009 20:50:53 +0000
Subject: [PATCH 1844/5331] Making the mingetty module support not only vc
 ttys.

svn path=/nixos/trunk/; revision=17391
---
 modules/services/ttys/mingetty.nix | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/modules/services/ttys/mingetty.nix b/modules/services/ttys/mingetty.nix
index cab206ec2fe..d4cade43f40 100644
--- a/modules/services/ttys/mingetty.nix
+++ b/modules/services/ttys/mingetty.nix
@@ -15,10 +15,9 @@ in
     services.mingetty = {
 
       ttys = mkOption {
-        default = [1 2 3 4 5 6];
+        default = [ "tty1" "tty2" "tty3" "tty4" "tty5" "tty6" ];
         description = ''
-          The list of tty (virtual console) devices on which to start a
-          login prompt.
+          The list of tty devices on which to start a login prompt.
         '';
       };
 
@@ -58,13 +57,13 @@ in
   config = {
 
     # Generate a separate job for each tty.  
-    jobs = map (ttyNumber: {
+    jobs = map (tty: {
     
-      name = "tty${toString ttyNumber}";
+      name = tty;
 
       startOn = "udev";
 
-      exec = "${pkgs.mingetty}/sbin/mingetty --loginprog=${pkgs.pam_login}/bin/login --noclear tty${toString ttyNumber}";
+      exec = "${pkgs.mingetty}/sbin/mingetty --loginprog=${pkgs.pam_login}/bin/login --noclear ${tty}";
       
     }) config.services.mingetty.ttys;
 
-- 
GitLab


From 8b9f510b0866ad2d91139a09a7db35bdbf4af89b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Wed, 23 Sep 2009 20:51:00 +0000
Subject: [PATCH 1845/5331] Removing grub from the system expression for
 armv5tel-linux.

svn path=/nixos/trunk/; revision=17392
---
 modules/config/system-path.nix          | 4 ++--
 modules/system/activation/top-level.nix | 9 ++++++---
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/modules/config/system-path.nix b/modules/config/system-path.nix
index 3752528572d..7f24bd04108 100644
--- a/modules/config/system-path.nix
+++ b/modules/config/system-path.nix
@@ -27,7 +27,6 @@ let
       pkgs.gnupatch
       pkgs.gnused
       pkgs.gnutar
-      pkgs.grub
       pkgs.gzip
       pkgs.host
       pkgs.iputils
@@ -60,7 +59,8 @@ let
       pkgs.usbutils
       pkgs.utillinux
       pkgs.wirelesstools
-    ] ++ config.environment.extraPackages;
+    ] ++ optional (pkgs.stdenv.system != "armv5tel-linux") [ pkgs.grub ]
+    ++ config.environment.extraPackages;
 
 
   options = {
diff --git a/modules/system/activation/top-level.nix b/modules/system/activation/top-level.nix
index 19457513473..96e9e289d30 100644
--- a/modules/system/activation/top-level.nix
+++ b/modules/system/activation/top-level.nix
@@ -36,8 +36,10 @@ let
     ''
       ensureDir $out
 
-      ln -s ${config.boot.kernelPackages.kernel}/vmlinuz $out/kernel
-      ln -s $grub $out/grub
+      ln -s ${config.boot.kernelPackages.kernel}/uImage $out/kernel
+      if [ -n "$grub" ]; then 
+        ln -s $grub $out/grub
+      fi
       ln -s ${config.system.build.bootStage2} $out/init
       ln -s ${config.system.build.initialRamdisk}/initrd $out/initrd
       ln -s ${config.system.activationScripts.script} $out/activate
@@ -71,7 +73,8 @@ let
     name = "system";
     buildCommand = systemBuilder;
     inherit children;
-    inherit (pkgs) grub;
+    grub = if (pkgs.stdenv.system != "armv5tel-linux") then pkgs.grub
+      else null;
     grubDevice = config.boot.grubDevice;
     kernelParams =
       config.boot.kernelParams ++ config.boot.extraKernelParams;
-- 
GitLab


From ff1a79ed883394113dc9d78d0f7ae32ca2eea914 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Wed, 23 Sep 2009 20:51:09 +0000
Subject: [PATCH 1846/5331] Fixing the top-level expression not to boot only
 from uImage, but keep on booting vmlinuz in non armv5tel.

svn path=/nixos/trunk/; revision=17393
---
 modules/system/activation/top-level.nix | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/modules/system/activation/top-level.nix b/modules/system/activation/top-level.nix
index 96e9e289d30..19e737d0d42 100644
--- a/modules/system/activation/top-level.nix
+++ b/modules/system/activation/top-level.nix
@@ -32,11 +32,14 @@ let
     config.nesting.children;
 
 
-  systemBuilder =
-    ''
+  systemBuilder = let
+      kernelfile = if (pkgs.stdenv.system == "armv5tel-linux")
+        then "${config.boot.kernelPackages.kernel}/uImage"
+        else "${config.boot.kernelPackages.kernel}/vmlinuz";
+    in ''
       ensureDir $out
 
-      ln -s ${config.boot.kernelPackages.kernel}/uImage $out/kernel
+      ln -s ${kernelfile} $out/kernel
       if [ -n "$grub" ]; then 
         ln -s $grub $out/grub
       fi
-- 
GitLab


From 69998a8d6162b499fd74a67942c52792f687b8c5 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 25 Sep 2009 12:34:09 +0000
Subject: [PATCH 1847/5331] * libgcc_s.so is in $gcc/lib64 on x86_64-linux.

svn path=/nixos/trunk/; revision=17417
---
 modules/system/boot/stage-1.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/system/boot/stage-1.nix b/modules/system/boot/stage-1.nix
index a0e2fe120b0..4d6502ba66b 100644
--- a/modules/system/boot/stage-1.nix
+++ b/modules/system/boot/stage-1.nix
@@ -140,7 +140,7 @@ let
       cp -p ${pkgs.glibc}/lib/libpthread.so.* $out/lib
       cp -p ${pkgs.glibc}/lib/librt.so.* $out/lib
       cp -p ${pkgs.glibc}/lib/libdl.so.* $out/lib
-      cp -p ${pkgs.gcc.gcc}/lib/libgcc_s.so.* $out/lib
+      cp -p ${pkgs.gcc.gcc}/lib*/libgcc_s.so.* $out/lib
 
       # Copy some utillinux stuff.
       cp ${pkgs.utillinux}/bin/mount ${pkgs.utillinux}/bin/umount \
-- 
GitLab


From 38898d5304c991112b4da019844b061909e1494a Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 25 Sep 2009 19:55:08 +0000
Subject: [PATCH 1848/5331] * r17391 changed the mingetty ttys to device names
 instead of tty   numbers.  This also requires kbd and tty-backgrounds to be
 updated   (and by extension syslogd and rogue).  Also updated the style of  
 those modules.

svn path=/nixos/trunk/; revision=17424
---
 modules/services/logging/syslogd.nix | 82 +++++++++++++---------------
 modules/services/misc/rogue.nix      | 60 ++++++++++----------
 modules/tasks/kbd.nix                | 37 ++++++-------
 modules/tasks/tty-backgrounds.nix    | 55 ++++++-------------
 4 files changed, 105 insertions(+), 129 deletions(-)

diff --git a/modules/services/logging/syslogd.nix b/modules/services/logging/syslogd.nix
index bc293936982..f62bf1da33f 100644
--- a/modules/services/logging/syslogd.nix
+++ b/modules/services/logging/syslogd.nix
@@ -1,33 +1,11 @@
-{pkgs, config, ...}:
+{ config, pkgs, ... }:
 
-###### interface
-let
-  inherit (pkgs.lib) mkOption mkIf;
-
-  options = {
-    services = {
-
-      syslogd = {
-
-        tty = mkOption {
-          default = 10;
-          description = "
-            The tty device on which syslogd will print important log
-            messages.
-          ";
-        };
-      
-      };
-    };
-  };
-in
-
-###### implementation
+with pkgs.lib;
 
 let
 
   syslogConf = pkgs.writeText "syslog.conf" ''
-    kern.warning;*.err;authpriv.none /dev/tty10
+    kern.warning;*.err;authpriv.none /dev/${config.services.syslogd.tty}
 
     # Send emergency messages to all users.
     *.emerg                       *
@@ -46,24 +24,42 @@ let
 in
 
 {
-  require = [
-    options
-  ];
-
-  services = {
-    extraJobs = [{
-        name = "syslogd";
-        
-        job = ''
-          description "Syslog daemon"
-        
-          start on udev
-          stop on shutdown
-
-          env TZ=${config.time.timeZone}
-          
-          respawn ${pkgs.sysklogd}/sbin/syslogd -n -f ${syslogConf}
+  ###### interface
+
+  options = {
+  
+    services.syslogd = {
+
+      tty = mkOption {
+        default = "tty10";
+        description = ''
+          The tty device on which syslogd will print important log
+          messages.
         '';
-    }];
+      };
+      
+    };
+    
+  };
+
+
+  ###### implementation
+
+  config = {
+  
+    jobs = singleton
+      { name = "syslogd";
+
+        description = "Syslog daemon";
+
+        startOn = "udev";
+        stopOn = "shutdown";
+
+        environment = { TZ = config.time.timeZone; };
+
+        exec = "${pkgs.sysklogd}/sbin/syslogd -n -f ${syslogConf}";
+      };
+
   };
+  
 }
diff --git a/modules/services/misc/rogue.nix b/modules/services/misc/rogue.nix
index f952b7189df..3e6b24a5fd7 100644
--- a/modules/services/misc/rogue.nix
+++ b/modules/services/misc/rogue.nix
@@ -1,12 +1,19 @@
-{pkgs, config, ...}: 
+# Execute the game `rogue' on tty 9.  Mostly used by the NixOS
+# installation CD.
 
-# Show rogue game on tty9
-# Originally used only by installation CD
+{ config, pkgs, ... }:
+
+with pkgs.lib;
 
 let
 
-  inherit (pkgs.lib) mkOption;
+  cfg = config.services.rogue;
+
+in
   
+{
+  ###### interface
+
   options = {
   
     services.rogue.enable = mkOption {
@@ -17,43 +24,40 @@ let
       '';
     };
 
-    services.rogue.ttyNumber = mkOption {
-      default = "9";
+    services.rogue.tty = mkOption {
+      default = "tty9";
       description = ''
         Virtual console on which to run Rogue.
       '';
     };
 
   };
-  
-  cfg = config.services.rogue;
 
-in
+  
+  ###### implementation
 
-pkgs.lib.mkIf cfg.enable {
-  require = [options];
+  config = mkIf cfg.enable {
 
-  boot.extraTTYs = [cfg.ttyNumber];
+    boot.extraTTYs = [ cfg.tty ];
   
-  services.extraJobs = pkgs.lib.singleton
-    { name = "rogue";
+    jobs = singleton
+      { name = "rogue";
 
-      job = ''
-        description "Rogue dungeon crawling game"
-	
-        start on udev
-        stop on shutdown
+        description = "Rogue dungeon crawling game";
 
-        chdir /root
+        startOn = "udev";
+        stopOn = "shutdown";
 
-        respawn ${pkgs.rogue}/bin/rogue < /dev/tty${toString cfg.ttyNumber} > /dev/tty${toString cfg.ttyNumber} 2>&1
-      '';
-    };
+        extraConfig = "chdir /root";
 
-  services.ttyBackgrounds.specificThemes = pkgs.lib.singleton
-    { tty = cfg.ttyNumber;
-      theme = pkgs.themes "theme-gnu";
-    };
+        exec = "${pkgs.rogue}/bin/rogue < /dev/{cfg.tty} > /dev/{cfg.tty} 2>&1";
+      };
+
+    services.ttyBackgrounds.specificThemes = singleton
+      { tty = cfg.tty;
+        theme = pkgs.themes "theme-gnu";
+      };
 
-  services.mingetty.helpLine = "\nPress <Alt-F${toString cfg.ttyNumber}> to play Rogue.";
+  };
+    
 }
diff --git a/modules/tasks/kbd.nix b/modules/tasks/kbd.nix
index d744d942b57..fb95712bf11 100644
--- a/modules/tasks/kbd.nix
+++ b/modules/tasks/kbd.nix
@@ -1,14 +1,15 @@
 {pkgs, config, ...}:
 
+with pkgs.lib;
+
 let
 
   # think about where to put this chunk of code!
   # required by other pieces as well
   requiredTTYs = config.services.mingetty.ttys
     ++ config.boot.extraTTYs
-    ++ [config.services.syslogd.tty];
-  ttyNumbers = requiredTTYs;
-  ttys = map (nr: "/dev/tty" + toString nr) ttyNumbers;
+    ++ [ config.services.syslogd.tty ];
+  ttys = map (dev: "/dev/${dev}") requiredTTYs;
   defaultLocale = config.i18n.defaultLocale;
   consoleFont = config.i18n.consoleFont;
   consoleKeyMap = config.i18n.consoleKeyMap;
@@ -22,21 +23,21 @@ in
 
     # most options are defined in i18n.nix
 
-    boot.extraTTYs = pkgs.lib.mkOption {
+    boot.extraTTYs = mkOption {
       default = [];
-      example = [8 9];
-      description = "
+      example = ["tty8" "tty9"];
+      description = ''
         Tty (virtual console) devices, in addition to the consoles on
         which mingetty and syslogd run, that must be initialised.
         Only useful if you have some program that you want to run on
         some fixed console.  For example, the NixOS installation CD
         opens the manual in a web browser on console 7, so it sets
-        <option>boot.extraTTYs</option> to <literal>[7]</literal>.
-      ";
+        <option>boot.extraTTYs</option> to <literal>["tty7"]</literal>.
+      '';
     };
     
     # dummy option so that requiredTTYs can be passed
-    requiredTTYs = pkgs.lib.mkOption {
+    requiredTTYs = mkOption {
       default = [];
       description = "
         FIXME: find another place for this option.
@@ -55,16 +56,14 @@ in
 
     environment.systemPackages = [pkgs.kbd];
   
-    jobs = pkgs.lib.singleton {
-      name = "kbd";
+    jobs = singleton
+      { name = "kbd";
 
-      job = ''
-        description "Keyboard / console initialisation"
+        description = "Keyboard / console initialisation";
 
-        start on udev
-
-        script
+        startOn = "udev";
 
+        preStart = ''
           export LANG=${defaultLocale}
           export LOCALE_ARCHIVE=/var/run/current-system/sw/lib/locale/locale-archive
           export PATH=${pkgs.gzip}/bin:$PATH # Needed by setfont
@@ -116,10 +115,8 @@ in
 
           # Set the keymap.
           ${pkgs.kbd}/bin/loadkeys '${consoleKeyMap}'
-
-        end script
-      '';
-    };
+        '';
+      };
 
   };
 
diff --git a/modules/tasks/tty-backgrounds.nix b/modules/tasks/tty-backgrounds.nix
index b83935827f7..5e3631f9adb 100644
--- a/modules/tasks/tty-backgrounds.nix
+++ b/modules/tasks/tty-backgrounds.nix
@@ -11,9 +11,7 @@ let
   backgrounds =
     let
     
-      specificThemes =
-        config.services.ttyBackgrounds.defaultSpecificThemes
-        ++ config.services.ttyBackgrounds.specificThemes;
+      specificThemes = config.services.ttyBackgrounds.specificThemes;
         
       overridenTTYs = map (x: x.tty) specificThemes;
 
@@ -24,8 +22,8 @@ let
         pkgs.lib.filter (x: !(pkgs.lib.elem x overridenTTYs)) requiredTTYs;
 
     in      
-      (map (ttyNumber: {
-        tty = ttyNumber;
+      (map (tty: {
+        inherit tty;
         theme = config.services.ttyBackgrounds.defaultTheme;
       }) defaultTTYs)
       ++ specificThemes;
@@ -71,33 +69,10 @@ in
         '';
       };
 
-      defaultSpecificThemes = mkOption {
-        default = [
-          /*
-          { tty = 6;
-            theme = pkgs.fetchurl { # Yeah!
-              url = mirror://gentoo/distfiles/Theme-Pativo.tar.bz2;
-              md5 = "9e13beaaadf88d43a5293e7ab757d569";
-            };
-          }
-          */
-          { tty = 10;
-            theme = pkgs.themes "theme-gnu";
-          }
-        ];
-        description = ''
-          This option sets specific themes for virtual consoles.  If you
-          just want to set themes for additional consoles, use
-          <option>services.ttyBackgrounds.specificThemes</option>.
-        '';
-      };
-
       specificThemes = mkOption {
-        default = [
-        ];
+        default = [ ];
         description = ''
-          This option allows you to set specific themes for virtual
-          consoles.
+          This option overrides the theme for specific virtual consoles.
         '';
       };
       
@@ -115,6 +90,11 @@ in
         message = "kernelPackages.splashutils may not be false";
       };
 
+    services.ttyBackgrounds.specificThemes = singleton
+      { tty = config.services.syslogd.tty;
+        theme = pkgs.themes "theme-gnu";
+      };
+
     environment.etc = singleton
       { source = themesUnpacked;
         target = "splash";
@@ -136,24 +116,23 @@ in
           # For each console...
           for tty in ${toString (map (x: x.tty) backgrounds)}; do
               # Make sure that the console exists.
-              echo -n "" > /dev/tty$tty 
+              echo -n "" > /dev/$tty
 
               # Set the theme as determined by tty-backgrounds-combine.sh
-              # above.
+              # above.  Note that splashutils needs a TTY number
+              # instead of a device name, hence the ''${tty:3}.
               theme=$(readlink ${themesUnpacked}/$tty)
-              ${splashutils}/${splashutils.controlName} --tty $tty -c setcfg -t $theme || true
-              ${splashutils}/${splashutils.controlName} --tty $tty -c setpic -t $theme || true
-              ${splashutils}/${splashutils.controlName} --tty $tty -c on || true
+              ${splashutils}/${splashutils.controlName} --tty ''${tty:3} -c setcfg -t $theme || true
+              ${splashutils}/${splashutils.controlName} --tty ''${tty:3} -c setpic -t $theme || true
+              ${splashutils}/${splashutils.controlName} --tty ''${tty:3} -c on || true
           done
         '';
 
       postStop =
         ''
-          /var/run/current-system/sw/bin/ps -axuw > /tmp/ps
-        
           # Disable the theme on each console.
           for tty in ${toString (map (x: x.tty) backgrounds)}; do
-              ${splashutils}/${splashutils.controlName} --tty $tty -c off || true
+              ${splashutils}/${splashutils.controlName} --tty ''${tty:3} -c off || true
           done
         '';
     };
-- 
GitLab


From 3e5912833dccbcae96916586429b1e821c4dc9c7 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 25 Sep 2009 20:12:35 +0000
Subject: [PATCH 1849/5331] * For consistency with Nixpkgs.

svn path=/nixos/trunk/; revision=17427
---
 modules/module-list.nix                              | 4 ++--
 modules/security/{console-kit.nix => consolekit.nix} | 8 ++++----
 modules/security/pam.nix                             | 2 +-
 modules/security/{policy-kit.nix => polkit.nix}      | 4 ++--
 modules/services/x11/display-managers/default.nix    | 2 +-
 5 files changed, 10 insertions(+), 10 deletions(-)
 rename modules/security/{console-kit.nix => consolekit.nix} (56%)
 rename modules/security/{policy-kit.nix => polkit.nix} (74%)

diff --git a/modules/module-list.nix b/modules/module-list.nix
index 40c7e1c2f88..9463c15de6f 100644
--- a/modules/module-list.nix
+++ b/modules/module-list.nix
@@ -26,9 +26,9 @@
   ./programs/pwdutils/pwdutils.nix
   ./programs/ssh.nix
   ./programs/ssmtp.nix
-  ./security/console-kit.nix
+  ./security/consolekit.nix
   ./security/pam.nix
-  ./security/policy-kit.nix
+  ./security/polkit.nix
   ./security/setuid-wrappers.nix
   ./security/sudo.nix
   ./services/audio/alsa.nix
diff --git a/modules/security/console-kit.nix b/modules/security/consolekit.nix
similarity index 56%
rename from modules/security/console-kit.nix
rename to modules/security/consolekit.nix
index e172a8e4415..d1636d23378 100644
--- a/modules/security/console-kit.nix
+++ b/modules/security/consolekit.nix
@@ -6,15 +6,15 @@ with pkgs.lib;
 
   config = {
 
-    environment.systemPackages = [ pkgs.console_kit ];
+    environment.systemPackages = [ pkgs.consolekit ];
 
-    services.dbus.packages = [ pkgs.console_kit ];
+    services.dbus.packages = [ pkgs.consolekit ];
 
     environment.etc = singleton
       { source = (pkgs.buildEnv {
-          name = "console-kit-config";
+          name = "consolekit-config";
           pathsToLink = [ "/etc/ConsoleKit" ];
-          paths = [ pkgs.console_kit pkgs.udev ];
+          paths = [ pkgs.consolekit pkgs.udev ];
         }) + "/etc/ConsoleKit";
         target = "ConsoleKit";
       };
diff --git a/modules/security/pam.nix b/modules/security/pam.nix
index 977ff0ae549..c8090ed691e 100644
--- a/modules/security/pam.nix
+++ b/modules/security/pam.nix
@@ -64,7 +64,7 @@ let
               "session optional ${pam_ldap}/lib/security/pam_ldap.so"}
           session required ${pam_unix2}/lib/security/pam_unix2.so
           ${optionalString ownDevices
-              "session optional ${pkgs.console_kit}/lib/security/pam_ck_connector.so"}
+              "session optional ${pkgs.consolekit}/lib/security/pam_ck_connector.so"}
           ${optionalString forwardXAuth
               "session optional pam_xauth.so xauthpath=${pkgs.xorg.xauth}/bin/xauth systemuser=99"}
         '';
diff --git a/modules/security/policy-kit.nix b/modules/security/polkit.nix
similarity index 74%
rename from modules/security/policy-kit.nix
rename to modules/security/polkit.nix
index 0299bc7d4c2..ed0496485cb 100644
--- a/modules/security/policy-kit.nix
+++ b/modules/security/polkit.nix
@@ -6,9 +6,9 @@ with pkgs.lib;
 
   config = {
 
-    environment.systemPackages = [ pkgs.policy_kit ];
+    environment.systemPackages = [ pkgs.polkit ];
 
-    services.dbus.packages = [ pkgs.policy_kit ];
+    services.dbus.packages = [ pkgs.polkit ];
 
     security.pam.services = [ { name = "polkit-1"; } ];
 
diff --git a/modules/services/x11/display-managers/default.nix b/modules/services/x11/display-managers/default.nix
index 1649f2922c0..398996bd7c6 100644
--- a/modules/services/x11/display-managers/default.nix
+++ b/modules/services/x11/display-managers/default.nix
@@ -46,7 +46,7 @@ let
       # Start a ConsoleKit session so that we get ownership of various
       # devices.
       if test -z "$XDG_SESSION_COOKIE"; then
-          exec ${pkgs.console_kit}/bin/ck-launch-session "$0" "$sessionType"
+          exec ${pkgs.consolekit}/bin/ck-launch-session "$0" "$sessionType"
       fi
 
       # Load X defaults.
-- 
GitLab


From 530c96761adcd3b6ba591c90f9b9b2770a7a00df Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 25 Sep 2009 20:41:15 +0000
Subject: [PATCH 1850/5331] * Start dbus after udev.  Otherwise ConsoleKit may
 or may not   recognise X logins as active sessions (i.e. ck-list-sessions
 will   show "active = FALSE", and the user doesn't get ownership of  
 devices).  I guess console-kit-daemon (which is started by dbus)   needs some
 device in /dev to exist.

svn path=/nixos/trunk/; revision=17428
---
 modules/services/system/dbus.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/services/system/dbus.nix b/modules/services/system/dbus.nix
index 8ecaf295a22..febf5f44b37 100644
--- a/modules/services/system/dbus.nix
+++ b/modules/services/system/dbus.nix
@@ -116,7 +116,7 @@ in
     jobs = singleton
       { name = "dbus";
 
-        startOn = "startup";
+        startOn = "udev";
         stopOn = "shutdown";
 
         preStart =
-- 
GitLab


From 684eb63658f63c7e3ea4e9c82aa44386488e6e6c Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 25 Sep 2009 22:38:37 +0000
Subject: [PATCH 1851/5331] * fsck is no longer in e2fsprogs. * Don't try to
 remount CIFS filesystems. * For devices specified by label, use
 /dev/disk/by-label instead of   LABEL=.  The initrd already did this. *
 Improved the flagging of pseudo devices.

svn path=/nixos/trunk/; revision=17431
---
 modules/tasks/filesystems.nix | 36 ++++++++++++++++++-----------------
 1 file changed, 19 insertions(+), 17 deletions(-)

diff --git a/modules/tasks/filesystems.nix b/modules/tasks/filesystems.nix
index 6ef6ec7840e..ec9836e09e3 100644
--- a/modules/tasks/filesystems.nix
+++ b/modules/tasks/filesystems.nix
@@ -112,10 +112,9 @@ let
 
 ###### implementation
 
-  inherit (pkgs) e2fsprogs;
   fileSystems = config.fileSystems;
   mountPoints = map (fs: fs.mountPoint) fileSystems;
-  devices = map (fs: if fs.device != null then fs.device else "LABEL=" + fs.label) fileSystems;
+  devices = map (fs: if fs.device != null then fs.device else "/dev/disk/by-label/${fs.label}") fileSystems;
   fsTypes = map (fs: fs.fsType) fileSystems;
   optionss = map (fs: fs.options) fileSystems;
   autocreates = map (fs: fs.autocreate) fileSystems;
@@ -127,7 +126,7 @@ let
     start on ip-up
 
     script
-      PATH=${e2fsprogs}/sbin:$PATH
+      PATH=${pkgs.e2fsprogs}/sbin:${pkgs.utillinuxng}/sbin:$PATH
 
       mountPoints=(${toString mountPoints})  
       devices=(${toString devices})
@@ -152,25 +151,29 @@ let
           options=''${optionss[$n]}
           autocreate=''${autocreates[$n]}
 
-          isLabel=
-          if echo "$device" | grep -q '^LABEL='; then isLabel=1; fi
-
+          # A device is a pseudo-device (i.e. not an actual device
+          # node) if it's not an absolute path (e.g. an NFS server
+          # such as machine:/path), if it starts with // (a CIFS FS),
+          # a known pseudo filesystem (such as tmpfs), or the device
+          # is a directory (e.g. a bind mount).
           isPseudo=
-          if test "$fsType" = "nfs" || test "$fsType" = "tmpfs" ||
-            test "$fsType" = "ext3cow"; then isPseudo=1; fi
+          test "''${device:0:1}" != / -o "''${device:0:2}" = // -o "$fsType" = "tmpfs" \
+              -o -d "$device" && isPseudo=1
 
-          if ! test -n "$isLabel" -o -n "$isPseudo" -o -e "$device"; then
+          if ! test -n "$isPseudo" -o -e "$device"; then
               echo "skipping $device, doesn't exist (yet)"
               continue
           fi
 
-          # !!! quick hack: if mount point already exists, try a
-          # remount to change the options but nothing else.
+          # !!! quick hack: if the mount point is already mounted, try
+          # a remount to change the options but nothing else.
           if cat /proc/mounts | grep -F -q " $mountPoint "; then
-              echo "remounting $device on $mountPoint"
-              ${mount}/bin/mount -t "$fsType" \
-                  -o remount,"$options" \
-                  "$device" "$mountPoint" || true
+              if test "''${device:0:2}" != //; then
+                  echo "remounting $device on $mountPoint"
+                  ${mount}/bin/mount -t "$fsType" \
+                      -o remount,"$options" \
+                      "$device" "$mountPoint" || true
+              fi
               continue
           fi
 
@@ -178,8 +181,7 @@ let
           # !!! Note: we use /etc/mtab, not /proc/mounts, because mtab
           # contains more accurate info when using loop devices.
 
-          # !!! not very smart about labels yet; should resolve the label somehow.
-          if test -z "$isLabel" -a -z "$isPseudo"; then
+          if test -z "$isPseudo"; then
 
             device=$(readlink -f "$device")
 
-- 
GitLab


From 69f68c319d2b5c48a3bce61a1e72eafe9e694bcb Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 25 Sep 2009 23:06:38 +0000
Subject: [PATCH 1852/5331] * A module for the old PolicyKit.

svn path=/nixos/trunk/; revision=17433
---
 modules/misc/ids.nix           |  8 +++++--
 modules/module-list.nix        |  3 ++-
 modules/security/policykit.nix | 42 ++++++++++++++++++++++++++++++++++
 3 files changed, 50 insertions(+), 3 deletions(-)
 create mode 100644 modules/security/policykit.nix

diff --git a/modules/misc/ids.nix b/modules/misc/ids.nix
index 3c3df827999..1a26a8f9e24 100644
--- a/modules/misc/ids.nix
+++ b/modules/misc/ids.nix
@@ -47,8 +47,10 @@ in
     gnunetd = 17;
     pulseaudio = 22; # must match `pulseaudio' GID
     gpsd = 23;
-    uptimed = 24;
-    ddclient = 25;
+    polkituser = 28;
+    uptimed = 29;
+    ddclient = 30;
+    # When adding a uid, make sure it doesn't match an existing gid.
 
     nixbld = 30000; # start of range of uids
     nobody = 65534;
@@ -82,6 +84,8 @@ in
     tape = 25;
     video = 26;
     dialout = 27;
+    polkituser = 28;
+    # When adding a gid, make sure it doesn't match an existing uid.
 
     users = 100;
     nixbld = 30000;
diff --git a/modules/module-list.nix b/modules/module-list.nix
index 9463c15de6f..68f639ea5ff 100644
--- a/modules/module-list.nix
+++ b/modules/module-list.nix
@@ -28,7 +28,8 @@
   ./programs/ssmtp.nix
   ./security/consolekit.nix
   ./security/pam.nix
-  ./security/polkit.nix
+  ./security/policykit.nix
+  #./security/polkit.nix # Currently disabled; using the old policykit.
   ./security/setuid-wrappers.nix
   ./security/sudo.nix
   ./services/audio/alsa.nix
diff --git a/modules/security/policykit.nix b/modules/security/policykit.nix
new file mode 100644
index 00000000000..a095270dc39
--- /dev/null
+++ b/modules/security/policykit.nix
@@ -0,0 +1,42 @@
+{ config, pkgs, ... }:
+
+with pkgs.lib;
+
+{
+
+  config = {
+
+    environment.systemPackages = [ pkgs.policykit ];
+
+    services.dbus.packages = [ pkgs.policykit ];
+
+    security.pam.services = [ { name = "polkit"; } ];
+
+    users.extraUsers = singleton
+      { name = "polkituser";
+        uid = config.ids.uids.polkituser;
+        description = "PolicyKit user";
+      };
+
+    users.extraGroups = singleton
+      { name = "polkituser";
+        gid = config.ids.gids.polkituser;
+      };
+
+    system.activationScripts.policyKit = fullDepEntry
+      ''
+        mkdir -m 0770 -p /var/run/PolicyKit
+        chown root.polkituser /var/run/PolicyKit
+
+        mkdir -m 0770 -p /var/lib/PolicyKit
+        chown root.polkituser /var/lib/PolicyKit
+        
+        mkdir -p /var/lib/misc
+        touch /var/lib/misc/PolicyKit.reload
+        chmod 0664 /var/lib/misc/PolicyKit.reload
+        chown polkituser.polkituser /var/lib/misc/PolicyKit.reload
+      '' [ "users" ];
+
+  };
+
+}
-- 
GitLab


From a83e308856b51dfe98def2b50a17dc7af96848f6 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 25 Sep 2009 23:18:52 +0000
Subject: [PATCH 1853/5331] * Clean up ConsoleKit.

svn path=/nixos/trunk/; revision=17434
---
 modules/services/system/dbus.nix | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/modules/services/system/dbus.nix b/modules/services/system/dbus.nix
index febf5f44b37..44d186dd54e 100644
--- a/modules/services/system/dbus.nix
+++ b/modules/services/system/dbus.nix
@@ -138,7 +138,14 @@ in
           ''
             pid=$(cat ${homeDir}/pid)
             if test -n "$pid"; then
-                kill -9 $pid
+                kill $pid
+            fi
+
+            # !!! Hack: doesn't belong here.
+            pid=$(cat /var/run/ConsoleKit/pid)
+            if test -n "$pid"; then
+                kill $pid
+                rm /var/run/ConsoleKit/pid
             fi
           '';
       };
-- 
GitLab


From 3d5462c9802d3030810ecc8a15af663b900124bf Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sat, 26 Sep 2009 00:07:52 +0000
Subject: [PATCH 1854/5331] * Install a PolicyKit policy configuration file. 
 There should be a   configuration option to add to this file.

svn path=/nixos/trunk/; revision=17436
---
 modules/security/policykit.nix | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/modules/security/policykit.nix b/modules/security/policykit.nix
index a095270dc39..e8cdecd0e9a 100644
--- a/modules/security/policykit.nix
+++ b/modules/security/policykit.nix
@@ -2,6 +2,21 @@
 
 with pkgs.lib;
 
+let
+
+  conf = pkgs.writeText "PolicyKit.conf"
+    ''
+      <?xml version="1.0" encoding="UTF-8"?>
+
+      <!DOCTYPE pkconfig PUBLIC "-//freedesktop//DTD PolicyKit Configuration 1.0//EN"
+        "http://hal.freedesktop.org/releases/PolicyKit/1.0/config.dtd">
+
+      <config version="0.1">
+      </config>
+    '';
+
+in
+
 {
 
   config = {
@@ -23,6 +38,11 @@ with pkgs.lib;
         gid = config.ids.gids.polkituser;
       };
 
+    environment.etc = singleton
+      { source = conf;
+        target = "PolicyKit/PolicyKit.conf";
+      };
+
     system.activationScripts.policyKit = fullDepEntry
       ''
         mkdir -m 0770 -p /var/run/PolicyKit
-- 
GitLab


From 693e017bfe9fbd6ff47ad610b6bd444cabc62f9d Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sat, 26 Sep 2009 10:27:47 +0000
Subject: [PATCH 1855/5331] * HAL expects a /media directory for mounting
 removable media.

svn path=/nixos/trunk/; revision=17437
---
 modules/system/activation/activation-script.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/modules/system/activation/activation-script.nix b/modules/system/activation/activation-script.nix
index b120f7361dc..34b222435c2 100644
--- a/modules/system/activation/activation-script.nix
+++ b/modules/system/activation/activation-script.nix
@@ -94,7 +94,6 @@ let
 
       mkdir -m 1777 -p /var/tmp
 
-
       # Empty, read-only home directory of many system accounts.
       mkdir -m 0555 -p /var/empty
     '' [
@@ -176,6 +175,10 @@ let
       # Prevent the current configuration from being garbage-collected.
       ln -sfn /var/run/current-system /nix/var/nix/gcroots/current-system
     '';
+
+    media = noDepEntry ''
+      mkdir -p /media
+    '';
     
   };
   
-- 
GitLab


From d933f55e45fa1afe973117c9b8b7a5be588ec212 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sat, 26 Sep 2009 10:32:57 +0000
Subject: [PATCH 1856/5331] * Tell PolicyKit about the policies of HAL and
 ConsoleKit.

svn path=/nixos/trunk/; revision=17439
---
 modules/security/policykit.nix | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/modules/security/policykit.nix b/modules/security/policykit.nix
index e8cdecd0e9a..6d7b507d033 100644
--- a/modules/security/policykit.nix
+++ b/modules/security/policykit.nix
@@ -38,11 +38,19 @@ in
         gid = config.ids.gids.polkituser;
       };
 
-    environment.etc = singleton
-      { source = conf;
-        target = "PolicyKit/PolicyKit.conf";
-      };
-
+    environment.etc =
+      [ { source = conf;
+          target = "PolicyKit/PolicyKit.conf";
+        }
+        { source = (pkgs.buildEnv {
+            name = "PolicyKit-policies";
+            pathsToLink = [ "/share/PolicyKit/policy" ];
+            paths = [ pkgs.policykit pkgs.consolekit pkgs.hal ];
+          }) + "/share/PolicyKit/policy";
+          target = "PolicyKit/policy";
+        }
+      ];
+      
     system.activationScripts.policyKit = fullDepEntry
       ''
         mkdir -m 0770 -p /var/run/PolicyKit
-- 
GitLab


From b3818c1a770672dbfc7052315e660690ab1bce49 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sat, 26 Sep 2009 18:57:34 +0000
Subject: [PATCH 1857/5331] * Add eject to the system path.

svn path=/nixos/trunk/; revision=17448
---
 modules/config/system-path.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/modules/config/system-path.nix b/modules/config/system-path.nix
index 7f24bd04108..f15f8bf8a5a 100644
--- a/modules/config/system-path.nix
+++ b/modules/config/system-path.nix
@@ -20,6 +20,7 @@ let
       pkgs.curl
       pkgs.diffutils
       pkgs.e2fsprogs
+      pkgs.eject # HAL depends on it anyway
       pkgs.findutils
       pkgs.gawk
       pkgs.glibc # for ldd, getent
-- 
GitLab


From 17d0b83eefcbdb4ccbc7b6283f5dbb81afd138e2 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sat, 26 Sep 2009 20:37:48 +0000
Subject: [PATCH 1858/5331] * Enable power management support in HAL.  So now
 you can for instance   suspend from within KDE.

svn path=/nixos/trunk/; revision=17451
---
 modules/services/hardware/hal.nix | 24 +++++++++++++++++++-----
 1 file changed, 19 insertions(+), 5 deletions(-)

diff --git a/modules/services/hardware/hal.nix b/modules/services/hardware/hal.nix
index 5e448d13d90..8948251f242 100644
--- a/modules/services/hardware/hal.nix
+++ b/modules/services/hardware/hal.nix
@@ -48,7 +48,8 @@ in
   
   config = mkIf cfg.enable {
 
-    environment.systemPackages = [hal];
+    # !!! move pmutils somewhere else
+    environment.systemPackages = [hal pkgs.pmutils];
 
     services.hal.packages = [hal pkgs.hal_info];
 
@@ -73,12 +74,25 @@ in
         startOn = if config.powerManagement.enable then "acpid" else "dbus";
         stopOn = "shutdown";
 
-        # !!! HACK? These environment variables manipulated inside
-        # 'src'/hald/mmap_cache.c are used for testing the daemon
         environment =
-          { HAL_FDI_SOURCE_PREPROBE = "${fdi}/share/hal/fdi/preprobe";
+          { # !!! HACK? These environment variables manipulated inside
+            # 'src'/hald/mmap_cache.c are used for testing the daemon.
+            HAL_FDI_SOURCE_PREPROBE = "${fdi}/share/hal/fdi/preprobe";
             HAL_FDI_SOURCE_INFORMATION = "${fdi}/share/hal/fdi/information";
             HAL_FDI_SOURCE_POLICY = "${fdi}/share/hal/fdi/policy";
+
+            # Stuff needed by the shell scripts run by HAL (in particular pm-utils).
+            HALD_RUNNER_PATH = concatStringsSep ":"
+              [ "${pkgs.coreutils}/bin"
+                "${pkgs.gnugrep}/bin"
+                "${pkgs.dbus.tools}/bin"
+                "${pkgs.procps}/bin"
+                "${pkgs.procps}/sbin"
+                "${config.system.sbin.modprobe}/sbin"
+                "${pkgs.module_init_tools}/bin"
+                "${pkgs.module_init_tools}/sbin"
+                "${pkgs.kbd}/bin"
+              ];
           };
 
         preStart =
@@ -91,7 +105,7 @@ in
             # !!! Hack: start the daemon here to make sure it's
             # running when the Upstart job reaches the "running"
             # state.  Should be fixable in Upstart 0.6.
-            ${hal}/sbin/hald
+            ${hal}/sbin/hald --use-syslog # --verbose=yes 
           '';
 
         postStop =
-- 
GitLab


From c5d45514a1ec69043cebd30469833d5466bf24c9 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sat, 26 Sep 2009 21:00:47 +0000
Subject: [PATCH 1859/5331] * Don't restart dbus, since that causes ConsoleKit
 to forget about   current sessions.

svn path=/nixos/trunk/; revision=17452
---
 modules/system/activation/switch-to-configuration.sh | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/modules/system/activation/switch-to-configuration.sh b/modules/system/activation/switch-to-configuration.sh
index 3d084f92ff8..bcf31f9bd52 100644
--- a/modules/system/activation/switch-to-configuration.sh
+++ b/modules/system/activation/switch-to-configuration.sh
@@ -85,7 +85,9 @@ EOF
 
         # Hack: skip the sys-* and ctrl-alt-delete events.
         # Another hack: don't restart the X server (that would kill all the clients).
-        if echo "$event" | grep -q "^sys-\|^ctrl-\|^xserver"; then continue; fi
+        # And don't restart dbus, since that causes ConsoleKit to
+        # forget about current sessions.
+        if echo "$event" | grep -q "^sys-\|^ctrl-\|^xserver$\|^dbus$"; then continue; fi
     
         if ! test -e "$oldEvents/$event"; then
             echo "starting $event..."
-- 
GitLab


From a701637f9431f536f23d4df2ec55b5137a01fe8a Mon Sep 17 00:00:00 2001
From: Nicolas Pierron <nicolas.b.pierron@gmail.com>
Date: Sat, 26 Sep 2009 23:04:43 +0000
Subject: [PATCH 1860/5331] Use servicePath instead of relative paths.

svn path=/nixos/trunk/; revision=17454
---
 modules/services/networking/gw6c.nix        | 5 +++--
 modules/services/networking/ircd-hybrid.nix | 4 ++--
 modules/services/web-servers/jboss.nix      | 4 ++--
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/modules/services/networking/gw6c.nix b/modules/services/networking/gw6c.nix
index 2fbd266b700..502a7b1826e 100644
--- a/modules/services/networking/gw6c.nix
+++ b/modules/services/networking/gw6c.nix
@@ -1,4 +1,4 @@
-{pkgs, config, ...}:
+{servicesPath, pkgs, config, ...}:
 
 ###### interface
 let
@@ -84,6 +84,7 @@ let
             but not a derivation.
           ";
         };
+
         private = mkOption {
           default = "/var/elliptic-keys/private";
           description = "
@@ -100,7 +101,7 @@ in
 let
         cfg = config.services.gw6c;
         procps = pkgs.procps;
-        gw6cService = import ../../../../services/gw6c {
+        gw6cService = import (servicesPath + /gw6c) {
                 inherit (pkgs) stdenv gw6c coreutils 
                 procps upstart iputils gnused 
                 gnugrep seccure writeScript;
diff --git a/modules/services/networking/ircd-hybrid.nix b/modules/services/networking/ircd-hybrid.nix
index 5b098ef6904..070abc1ef22 100644
--- a/modules/services/networking/ircd-hybrid.nix
+++ b/modules/services/networking/ircd-hybrid.nix
@@ -1,4 +1,4 @@
-{pkgs, config, ...}:
+{servicesPath, pkgs, config, ...}:
 
 ###### interface
 let
@@ -84,7 +84,7 @@ in
 
 let
   cfg = config.services.ircdHybrid;
-  ircdService = import ../../../../services/ircd-hybrid {
+  ircdService = import (servicesPath + /ircd-hybrid) {
     stdenv = pkgs.stdenv;
     inherit (pkgs) ircdHybrid coreutils 
             su iproute gnugrep procps;
diff --git a/modules/services/web-servers/jboss.nix b/modules/services/web-servers/jboss.nix
index 322ed92b920..9ead3e11e9b 100644
--- a/modules/services/web-servers/jboss.nix
+++ b/modules/services/web-servers/jboss.nix
@@ -1,4 +1,4 @@
-{pkgs, config, ...}:
+{servicesPath, pkgs, config, ...}:
 
 ###### interface
 let
@@ -55,7 +55,7 @@ in
 let
 
 cfg = config.services.jboss;
-jbossService = import ../../services/jboss {
+jbossService = import (servicesPath + /jboss) {
         inherit (pkgs) stdenv jboss su;
         inherit (cfg) tempDir logDir libUrl deployDir serverDir user useJK;
 };
-- 
GitLab


From 5bf3abba14ca472bdcc72bf038ed0477e5fca638 Mon Sep 17 00:00:00 2001
From: Nicolas Pierron <nicolas.b.pierron@gmail.com>
Date: Sat, 26 Sep 2009 23:15:19 +0000
Subject: [PATCH 1861/5331] Add the base of a highly experimental gui for
 NixOS.

svn path=/nixos/trunk/; revision=17455
---
 gui/README                                 |  19 +++
 gui/application.ini                        |  35 +++++
 gui/chrome/chrome.manifest                 |   1 +
 gui/chrome/content/nixos-gui/io.js         |  74 +++++++++
 gui/chrome/content/nixos-gui/main.js       | 171 +++++++++++++++++++++
 gui/chrome/content/nixos-gui/myviewer.xul  |  30 ++++
 gui/chrome/content/nixos-gui/treeView.js   | 117 ++++++++++++++
 gui/components/clh.js                      | 154 +++++++++++++++++++
 gui/defaults/preferences/myviewer-prefs.js |  11 ++
 gui/nixos-gui                              |   3 +
 10 files changed, 615 insertions(+)
 create mode 100644 gui/README
 create mode 100644 gui/application.ini
 create mode 100644 gui/chrome/chrome.manifest
 create mode 100644 gui/chrome/content/nixos-gui/io.js
 create mode 100644 gui/chrome/content/nixos-gui/main.js
 create mode 100644 gui/chrome/content/nixos-gui/myviewer.xul
 create mode 100644 gui/chrome/content/nixos-gui/treeView.js
 create mode 100644 gui/components/clh.js
 create mode 100644 gui/defaults/preferences/myviewer-prefs.js
 create mode 100755 gui/nixos-gui

diff --git a/gui/README b/gui/README
new file mode 100644
index 00000000000..7eee9040e3f
--- /dev/null
+++ b/gui/README
@@ -0,0 +1,19 @@
+This file should become a nix expression.
+
+you need to:
+- download the latest jQuery from:
+    http://jqueryjs.googlecode.com/files/jquery-1.3.2.js
+    SHA1 Checksum: f0b95e99225f314fbe37ccf6b74ce2f916c517de
+
+- install 'xulrunner' with nix:
+    nix-env -i xulrunner
+
+- install and add nix-intantiate in your path
+
+- have /etc/nixos/nixpkgs
+- have /etc/nixos/nixos
+
+
+to run it, either:
+- cd /etc/nixos/nixos/gui; ./nixos-gui
+- xulrunner /etc/nixos/nixos/gui/application.ini
diff --git a/gui/application.ini b/gui/application.ini
new file mode 100644
index 00000000000..0da5e498dad
--- /dev/null
+++ b/gui/application.ini
@@ -0,0 +1,35 @@
+[App]
+;
+; This field specifies your organization's name.  This field is recommended,
+; but optional.
+Vendor=NixOS
+;
+; This field specifies your application's name.  This field is required.
+Name=NixOS-gui
+;
+; This field specifies your application's version.  This field is optional.
+Version=0.0
+;
+; This field specifies your application's build ID (timestamp).  This field is
+; required.
+BuildID=20090925
+;
+; This field specifies a compact copyright notice for your application.  This
+; field is optional.
+;Copyright=
+;
+; This ID is just an example.  Every XUL app ought to have it's own unique ID.
+; You can use the microsoft "guidgen" or "uuidgen" tools, or go on
+; irc.mozilla.org and /msg botbot uuid.  This field is optional.
+;ID=
+
+[Gecko]
+;
+; This field is required.  It specifies the minimum Gecko version that this
+; application requires.
+MinVersion=1.9a5
+;
+; This field is optional.  It specifies the maximum Gecko version that this
+; application requires.  It should be specified if your application uses
+; unfrozen interfaces.
+;MaxVersion=1.9.0.*
diff --git a/gui/chrome/chrome.manifest b/gui/chrome/chrome.manifest
new file mode 100644
index 00000000000..6b524807eaa
--- /dev/null
+++ b/gui/chrome/chrome.manifest
@@ -0,0 +1 @@
+content nixos-gui content/nixos-gui/
diff --git a/gui/chrome/content/nixos-gui/io.js b/gui/chrome/content/nixos-gui/io.js
new file mode 100644
index 00000000000..3e3b080b814
--- /dev/null
+++ b/gui/chrome/content/nixos-gui/io.js
@@ -0,0 +1,74 @@
+function makeTempFile(prefix)
+{
+  var file = Components.classes["@mozilla.org/file/directory_service;1"]
+                       .getService(Components.interfaces.nsIProperties)
+                       .get("TmpD", Components.interfaces.nsIFile);
+  file.append(prefix || "xulrunner");
+  file.createUnique(Components.interfaces.nsIFile.NORMAL_FILE_TYPE, 0664);
+  return file;
+}
+
+function writeToFile(file, data)
+{
+  // file is nsIFile, data is a string
+  var foStream = Components.classes["@mozilla.org/network/file-output-stream;1"]
+                           .createInstance(Components.interfaces.nsIFileOutputStream);
+
+  // use 0x02 | 0x10 to open file for appending.
+  foStream.init(file, 0x02 | 0x08 | 0x20, 0664, 0); // write, create, truncate
+  foStream.write(data, data.length);
+  foStream.close();
+}
+
+function readFromFile(file)
+{
+  // |file| is nsIFile
+  var data = "";
+  var fstream = Components.classes["@mozilla.org/network/file-input-stream;1"]
+                          .createInstance(Components.interfaces.nsIFileInputStream);
+  var sstream = Components.classes["@mozilla.org/scriptableinputstream;1"]
+                          .createInstance(Components.interfaces.nsIScriptableInputStream);
+  fstream.init(file, -1, 0, 0);
+  sstream.init(fstream); 
+
+  var str = sstream.read(4096);
+  while (str.length > 0) {
+    data += str;
+    str = sstream.read(4096);
+  }
+
+  sstream.close();
+  fstream.close();
+
+  return data;
+}
+
+function runProgram(commandLine)
+{
+  // create an nsILocalFile for the executable
+  var file = Components.classes["@mozilla.org/file/local;1"]
+                       .createInstance(Components.interfaces.nsILocalFile);
+  file.initWithPath("/bin/sh");
+
+  // create an nsIProcess
+  var process = Components.classes["@mozilla.org/process/util;1"]
+                          .createInstance(Components.interfaces.nsIProcess);
+  process.init(file);
+
+  // Run the process.
+  // If first param is true, calling thread will be blocked until
+  // called process terminates.
+  // Second and third params are used to pass command-line arguments
+  // to the process.
+  var args = ["-c", commandLine];
+  process.run(true, args, args.length);
+}
+
+// only for testing...
+function testIO()
+{
+  var f = makeTempFile();
+  writeToFile(f, "essai\ntest");
+  alert(readFromFile(f));
+  runProgram("zenity --info");
+}
diff --git a/gui/chrome/content/nixos-gui/main.js b/gui/chrome/content/nixos-gui/main.js
new file mode 100644
index 00000000000..baa934e43e2
--- /dev/null
+++ b/gui/chrome/content/nixos-gui/main.js
@@ -0,0 +1,171 @@
+var COPYCOL = 2;
+var gOptionListView = new treeView(["opt-success","opt-name","opt-desc"],
+                                   COPYCOL);
+
+// Run xulrunner application.ini -jsconsole -console, to see messages.
+function log(str)
+{
+  Components.classes['@mozilla.org/consoleservice;1']
+    .getService(Components.interfaces.nsIConsoleService)
+    .logStringMessage(str);
+}
+
+
+// return the DOM of the value returned by nix-instantiate
+function dumpOptions(path)
+{
+  var nixInstantiate = "nix-instantiate"; // "@nix@/bin/nix-instantiate";
+  var nixos = "/etc/nixos/nixos/default.nix"; // "@nixos@/default.nix";
+
+  var o = makeTempFile("nixos-options");
+
+  path = "eval.options" + (path? "." + path : "");
+  log("retrieve options from: " + path);
+
+  runProgram(nixInstantiate+" "+nixos+" -A "+path+" --eval-only --strict --xml 2>/dev/null | tr -d '' >" + o.path);
+
+  var xml = readFromFile(o);
+  o.remove(false);
+
+  // jQuery does a stack overflow when converting the XML to a DOM.
+  var dom = DOMParser().parseFromString(xml, "text/xml");
+  
+  log("return dom");
+  return dom;
+}
+
+
+// Pretty print Nix values.
+function nixPP(value, level)
+{
+  function indent(level) {  ret = ""; while (level--) ret+= "  "; return ret; }
+
+  if (!level) level = 0;
+  var ret = "<no match>";
+  if (value.is("attrs")) {
+    var content = "";
+    value.children().each(function (){
+      var name = $(this).attr("name");
+      var value = nixPP($(this).children(), level + 1);
+      content += indent(level + 1) + name + " = " + value + ";\n";
+    });
+    ret = "{\n" + content + indent(level) + "}";
+  }
+  else if (value.is("list")) {
+    var content = "";
+    value.children().each(function (){
+      content += indent(level + 1) + "(" + nixPP($(this), level + 1) + ")\n";
+    });
+    ret = "[\n" + content + indent(level) + "]";
+  }
+  else if (value.is("bool"))
+    ret = (value.attr("value") == "true");
+  else if (value.is("string"))
+    ret = '"' + value.attr("value") + '"';
+  else if (value.is("path"))
+    ret = value.attr("value");
+  else if (value.is("int"))
+    ret = parseInt(value.attr("value"));
+  else if (value.is("derivation"))
+    ret = value.attr("outPath");
+  else if (value.is("function"))
+    ret = "<function>";
+  else {
+    var content = "";
+    value.children().each(function (){
+      content += indent(level + 1) + "(" + nixPP($(this), level + 1) + ")\n";
+    });
+    ret = "<!--" + value.selector + "--><!--\n" + content + indent(level) + "-->";
+  }
+  return ret;
+}
+
+// Function used to reproduce the select operator on the XML DOM.
+// It return the value contained in the targeted attribute.
+function nixSelect(attrs, selector)
+{
+  var names = selector.split(".");
+  var value = $(attrs);
+  for (var i = 0; i < names.length; i++) {
+    log(nixPP(value) + "." + names[i]);
+    if (value.is("attrs"))
+      value = value.children("attr[name='" + names[i] + "']").children();
+    else {
+      log("Cannot do an attribute selection.");
+      break
+    }
+  }
+
+  log("nixSelect return: " + nixPP(value));
+
+  var ret;
+  if (value.is("attrs") || value.is("list"))
+    ret = value;
+  else if (value.is("bool"))
+    ret = value.attr("value") == "true";
+  else if (value.is("string"))
+    ret = value.attr("value");
+  else if (value.is("int"))
+    ret = parseInt(value.attr("value"));
+  else if (value.is("derivation"))
+    ret = value.attr("outPath");
+  else if (value.is("function"))
+    ret = "<function>";
+
+  return ret;
+}
+
+var gProgressBar;
+function setProgress(current, max)
+{
+  if (gProgressBar) {
+    gProgressBar.value = 100 * current / max;
+    log("progress: " + gProgressBar.value + "%");
+  }
+  else
+    log("unknow progress bar");
+}
+
+// fill the list of options
+function setOptionList(optionDOM)
+{
+  var options = $("attrs", optionDOM).filter(function () {
+    return $(this)
+      .children("attr[name='_type']")
+      .children("string[value='option']")
+      .length != 0;
+  });
+
+  var max = options.length;
+
+  log("Number of options: " + max);
+
+  setProgress(0, max);
+  gOptionListView.clear();
+  options.each(function (index){
+      var success = nixSelect(this, "config.success");
+      var name = nixSelect(this, "name");
+      var desc = nixSelect(this, "description");
+      if (success && name && desc) {
+        log("Add option '" + name + "' in the list.");
+        gOptionListView.addRow([success, name, desc]);
+      }
+      else
+        log("A problem occur while scanning an option.");
+      setProgress(index + 1, max);
+  });
+}
+
+
+function onload()
+{
+  var optionList = document.getElementById("option-list");
+  gProgressBar = document.getElementById("progress-bar");
+  setProgress(0, 1);
+  optionList.view = gOptionListView;
+
+  // try to avoid blocking the rendering, unfortunately this is not perfect.
+  setTimeout(function (){
+    setOptionList(dumpOptions("hardware"));}
+  , 100);
+}
diff --git a/gui/chrome/content/nixos-gui/myviewer.xul b/gui/chrome/content/nixos-gui/myviewer.xul
new file mode 100644
index 00000000000..c0c2bd6f822
--- /dev/null
+++ b/gui/chrome/content/nixos-gui/myviewer.xul
@@ -0,0 +1,30 @@
+<?xml version="1.0"?>
+<?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
+
+<!DOCTYPE window>
+
+<!-- To edit this file I recommend you to use: 
+     http://xulfr.org/outils/xulediteur.xul
+  -->
+
+<window
+  id     = "nixos-gui"
+  title  = "NixOS gui"
+  xmlns  = "http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
+  <script src="jquery-1.3.2.js"/>
+  <script src="treeView.js"/>
+  <script src="main.js"/>
+  <script src="io.js"/>
+  <tree flex="1" id="option-list" persist="height">
+    <treecols>
+      <treecol persist="hidden width" flex="1" id="opt-success" label="Success"/>
+      <splitter class="tree-splitter"/>
+      <treecol persist="hidden width" flex="30" id="opt-name" label="Option"/>
+      <splitter class="tree-splitter"/>
+      <treecol persist="hidden width" flex="50" id="opt-desc" label="Description"
+               primary="true"/>
+    </treecols>
+    <treechildren id="first-child" flex="1"/>
+  </tree>
+  <progressmeter id="progress-bar" value="0%"/>
+</window>
diff --git a/gui/chrome/content/nixos-gui/treeView.js b/gui/chrome/content/nixos-gui/treeView.js
new file mode 100644
index 00000000000..8ab7c875e68
--- /dev/null
+++ b/gui/chrome/content/nixos-gui/treeView.js
@@ -0,0 +1,117 @@
+// Taken from pageInfo.js
+
+//******** define a js object to implement nsITreeView
+function treeView(columnids, copycol)
+{
+  // columnids is an array of strings indicating the names of the columns, in order
+  this.columnids = columnids;
+  this.colcount = columnids.length;
+
+  // copycol is the index number for the column that we want to add to
+  // the copy-n-paste buffer when the user hits accel-c
+  this.copycol = copycol;
+  this.rows = 0;
+  this.tree = null;
+  this.data = [ ];
+  this.selection = null;
+  this.sortcol = null;
+  this.sortdir = 0;
+}
+
+treeView.prototype = {
+  set rowCount(c) { throw "rowCount is a readonly property"; },
+  get rowCount() { return this.rows; },
+
+  setTree: function(tree)
+  {
+    this.tree = tree;
+  },
+
+  getCellText: function(row, column)
+  {
+    // row can be null, but js arrays are 0-indexed.
+    // colidx cannot be null, but can be larger than the number
+    // of columns in the array (when column is a string not in
+    // this.columnids.) In this case it's the fault of
+    // whoever typoed while calling this function.
+    return this.data[row][column.index] || "";
+  },
+
+  setCellValue: function(row, column, value)
+  {
+  },
+
+  setCellText: function(row, column, value)
+  {
+    this.data[row][column.index] = value;
+  },
+
+  addRow: function(row)
+  {
+    this.rows = this.data.push(row);
+    this.rowCountChanged(this.rows - 1, 1);
+  },
+
+  addRows: function(rows)
+  {
+    var length = rows.length;
+    for(var i = 0; i < length; i++)
+      this.rows = this.data.push(rows[i]);
+    this.rowCountChanged(this.rows - length, length);
+  },
+
+  rowCountChanged: function(index, count)
+  {
+    this.tree.rowCountChanged(index, count);
+  },
+
+  invalidate: function()
+  {
+    this.tree.invalidate();
+  },
+
+  clear: function()
+  {
+    if (this.tree)
+      this.tree.rowCountChanged(0, -this.rows);
+    this.rows = 0;
+    this.data = [ ];
+  },
+
+  handleCopy: function(row)
+  {
+    return (row < 0 || this.copycol < 0) ? "" : (this.data[row][this.copycol] || "");
+  },
+
+  performActionOnRow: function(action, row)
+  {
+    if (action == "copy") {
+      var data = this.handleCopy(row)
+      this.tree.treeBody.parentNode.setAttribute("copybuffer", data);
+    }
+  },
+
+  getRowProperties: function(row, prop) { },
+  getCellProperties: function(row, column, prop) { },
+  getColumnProperties: function(column, prop) { },
+  isContainer: function(index) { return false; },
+  isContainerOpen: function(index) { return false; },
+  isSeparator: function(index) { return false; },
+  isSorted: function() { },
+  canDrop: function(index, orientation) { return false; },
+  drop: function(row, orientation) { return false; },
+  getParentIndex: function(index) { return 0; },
+  hasNextSibling: function(index, after) { return false; },
+  getLevel: function(index) { return 0; },
+  getImageSrc: function(row, column) { },
+  getProgressMode: function(row, column) { },
+  getCellValue: function(row, column) { },
+  toggleOpenState: function(index) { },
+  cycleHeader: function(col) { },
+  selectionChanged: function() { },
+  cycleCell: function(row, column) { },
+  isEditable: function(row, column) { return false; },
+  isSelectable: function(row, column) { return false; },
+  performAction: function(action) { },
+  performActionOnCell: function(action, row, column) { }
+};
diff --git a/gui/components/clh.js b/gui/components/clh.js
new file mode 100644
index 00000000000..fd85422d6c8
--- /dev/null
+++ b/gui/components/clh.js
@@ -0,0 +1,154 @@
+const nsIAppShellService    = Components.interfaces.nsIAppShellService;
+const nsISupports           = Components.interfaces.nsISupports;
+const nsICategoryManager    = Components.interfaces.nsICategoryManager;
+const nsIComponentRegistrar = Components.interfaces.nsIComponentRegistrar;
+const nsICommandLine        = Components.interfaces.nsICommandLine;
+const nsICommandLineHandler = Components.interfaces.nsICommandLineHandler;
+const nsIFactory            = Components.interfaces.nsIFactory;
+const nsIModule             = Components.interfaces.nsIModule;
+const nsIWindowWatcher      = Components.interfaces.nsIWindowWatcher;
+
+// CHANGEME: to the chrome URI of your extension or application
+const CHROME_URI = "chrome://nixos-gui/content/myviewer.xul";
+
+// CHANGEME: change the contract id, CID, and category to be unique
+// to your application.
+const clh_contractID = "@mozilla.org/commandlinehandler/general-startup;1?type=myapp";
+
+// use uuidgen to generate a unique ID
+const clh_CID = Components.ID("{2991c315-b871-42cd-b33f-bfee4fcbf682}");
+
+// category names are sorted alphabetically. Typical command-line handlers use a
+// category that begins with the letter "m".
+const clh_category = "m-myapp";
+
+/**
+ * Utility functions
+ */
+
+/**
+ * Opens a chrome window.
+ * @param aChromeURISpec a string specifying the URI of the window to open.
+ * @param aArgument an argument to pass to the window (may be null)
+ */
+function openWindow(aChromeURISpec, aArgument)
+{
+  var ww = Components.classes["@mozilla.org/embedcomp/window-watcher;1"].
+    getService(Components.interfaces.nsIWindowWatcher);
+  ww.openWindow(null, aChromeURISpec, "_blank",
+                "chrome,menubar,toolbar,status,resizable,dialog=no",
+                aArgument);
+}
+ 
+/**
+ * The XPCOM component that implements nsICommandLineHandler.
+ * It also implements nsIFactory to serve as its own singleton factory.
+ */
+const myAppHandler = {
+  /* nsISupports */
+  QueryInterface : function clh_QI(iid)
+  {
+    if (iid.equals(nsICommandLineHandler) ||
+        iid.equals(nsIFactory) ||
+        iid.equals(nsISupports))
+      return this;
+
+    throw Components.results.NS_ERROR_NO_INTERFACE;
+  },
+
+  /* nsICommandLineHandler */
+
+  handle : function clh_handle(cmdLine)
+  {
+    openWindow(CHROME_URI, cmdLine);
+    cmdLine.preventDefault = true;
+  },
+
+  // CHANGEME: change the help info as appropriate, but
+  // follow the guidelines in nsICommandLineHandler.idl
+  // specifically, flag descriptions should start at
+  // character 24, and lines should be wrapped at
+  // 72 characters with embedded newlines,
+  // and finally, the string should end with a newline
+  helpInfo : "  <filename>           Open the file in the viewer\n",
+
+  /* nsIFactory */
+
+  createInstance : function clh_CI(outer, iid)
+  {
+    if (outer != null)
+      throw Components.results.NS_ERROR_NO_AGGREGATION;
+
+    return this.QueryInterface(iid);
+  },
+
+  lockFactory : function clh_lock(lock)
+  {
+    /* no-op */
+  }
+};
+
+/**
+ * The XPCOM glue that implements nsIModule
+ */
+const myAppHandlerModule = {
+  /* nsISupports */
+  QueryInterface : function mod_QI(iid)
+  {
+    if (iid.equals(nsIModule) ||
+        iid.equals(nsISupports))
+      return this;
+
+    throw Components.results.NS_ERROR_NO_INTERFACE;
+  },
+
+  /* nsIModule */
+  getClassObject : function mod_gch(compMgr, cid, iid)
+  {
+    if (cid.equals(clh_CID))
+      return myAppHandler.QueryInterface(iid);
+
+    throw Components.results.NS_ERROR_NOT_REGISTERED;
+  },
+
+  registerSelf : function mod_regself(compMgr, fileSpec, location, type)
+  {
+    compMgr.QueryInterface(nsIComponentRegistrar);
+
+    compMgr.registerFactoryLocation(clh_CID,
+                                    "myAppHandler",
+                                    clh_contractID,
+                                    fileSpec,
+                                    location,
+                                    type);
+
+    var catMan = Components.classes["@mozilla.org/categorymanager;1"].
+      getService(nsICategoryManager);
+    catMan.addCategoryEntry("command-line-handler",
+                            clh_category,
+                            clh_contractID, true, true);
+  },
+
+  unregisterSelf : function mod_unreg(compMgr, location, type)
+  {
+    compMgr.QueryInterface(nsIComponentRegistrar);
+    compMgr.unregisterFactoryLocation(clh_CID, location);
+
+    var catMan = Components.classes["@mozilla.org/categorymanager;1"].
+      getService(nsICategoryManager);
+    catMan.deleteCategoryEntry("command-line-handler", clh_category);
+  },
+
+  canUnload : function (compMgr)
+  {
+    return true;
+  }
+};
+
+/* The NSGetModule function is the magic entry point that XPCOM uses to find what XPCOM objects
+ * this component provides
+ */
+function NSGetModule(comMgr, fileSpec)
+{
+  return myAppHandlerModule;
+}
diff --git a/gui/defaults/preferences/myviewer-prefs.js b/gui/defaults/preferences/myviewer-prefs.js
new file mode 100644
index 00000000000..e10fa18c0d8
--- /dev/null
+++ b/gui/defaults/preferences/myviewer-prefs.js
@@ -0,0 +1,11 @@
+pref("toolkit.defaultChromeURI", "chrome://nixos-gui/content/myviewer.xul");
+pref("general.useragent.extra.myviewer", "NixOS gui/0.0");
+
+/* debugging prefs */
+pref("browser.dom.window.dump.enabled", true);  // enable output to stderr
+pref("javascript.options.showInConsole", true); // show javascript errors from chrome: files in the jsconsole
+pref("javascript.options.strict", true);        // show javascript strict warnings in the jsconsole
+
+/* disable xul cache so that modifications to chrome: files apply without restarting xulrunner */
+pref("nglayout.debug.disable_xul_cache", true); 
+pref("nglayout.debug.disable_xul_fastload", true);
diff --git a/gui/nixos-gui b/gui/nixos-gui
new file mode 100755
index 00000000000..f7728147ad3
--- /dev/null
+++ b/gui/nixos-gui
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+exec xulrunner "./application.ini"
-- 
GitLab


From 852478ff794c499496a327373506b00985768463 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Sun, 27 Sep 2009 21:51:22 +0000
Subject: [PATCH 1862/5331] Making supplicant work on eth1

svn path=/nixos/trunk/; revision=17459
---
 modules/services/networking/wpa_supplicant.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/services/networking/wpa_supplicant.nix b/modules/services/networking/wpa_supplicant.nix
index 36ad294470f..41b73f22d35 100644
--- a/modules/services/networking/wpa_supplicant.nix
+++ b/modules/services/networking/wpa_supplicant.nix
@@ -25,7 +25,7 @@ in
         <manvolnum>5</manvolnum></citerefentry>).
       '';
     };
-  
+
   };
 
 
@@ -49,7 +49,7 @@ in
 
         exec =
           "${pkgs.wpa_supplicant}/sbin/wpa_supplicant " +
-          "-C /var/run/wpa_supplicant -c ${configFile} -iwlan0";
+          "-C /var/run/wpa_supplicant -c ${configFile} -ieth1";
       };
   
   };
-- 
GitLab


From 75f6cd20da8f34af7d7249998b7e5164f8ac658a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Sun, 27 Sep 2009 21:51:37 +0000
Subject: [PATCH 1863/5331] Making modular my previous changes for armv5tel. I
 updated the way to use grub. Its options are no more inside 'boot', but
 inside 'boot.loader.grub'. I added a new bootloader configuration for nixos,
 generationsDir. It creates /boot/default/{init,initrd,kernel,system}
 symlinks, and the same for the generations in
 /boot/system-$gen/{init,initrd,kernel,system}.

I can program the u-boot loader to load /boot/default files always, and have
a minimal nixos boot loader installer functionality. Additionally, I can refer
to the other system generations easily, with a simple 'ls' in /boot.

svn path=/nixos/trunk/; revision=17460
---
 modules/config/system-path.nix                |   2 +-
 .../generations-dir-builder.sh                | 105 ++++++++++
 .../generations-dir/generations-dir.nix       |  60 ++++++
 modules/installer/grub/grub.nix               | 181 ++++++++++--------
 modules/module-list.nix                       |   1 +
 .../activation/switch-to-configuration.sh     |  20 +-
 modules/system/activation/top-level.nix       |  40 +++-
 7 files changed, 309 insertions(+), 100 deletions(-)
 create mode 100644 modules/installer/generations-dir/generations-dir-builder.sh
 create mode 100644 modules/installer/generations-dir/generations-dir.nix

diff --git a/modules/config/system-path.nix b/modules/config/system-path.nix
index f15f8bf8a5a..f0da2eab341 100644
--- a/modules/config/system-path.nix
+++ b/modules/config/system-path.nix
@@ -60,7 +60,7 @@ let
       pkgs.usbutils
       pkgs.utillinux
       pkgs.wirelesstools
-    ] ++ optional (pkgs.stdenv.system != "armv5tel-linux") [ pkgs.grub ]
+    ]
     ++ config.environment.extraPackages;
 
 
diff --git a/modules/installer/generations-dir/generations-dir-builder.sh b/modules/installer/generations-dir/generations-dir-builder.sh
new file mode 100644
index 00000000000..80f2b638e51
--- /dev/null
+++ b/modules/installer/generations-dir/generations-dir-builder.sh
@@ -0,0 +1,105 @@
+#! @bash@/bin/sh -e
+
+shopt -s nullglob
+
+export PATH=/empty
+for i in @path@; do PATH=$PATH:$i/bin; done
+
+default=$1
+if test -z "$1"; then
+    echo "Syntax: generations-dir-builder.sh <DEFAULT-CONFIG>"
+    exit 1
+fi
+
+echo "updating the boot generations directory..."
+
+mkdir -p /boot
+
+rm -Rf /boot/system* || true
+
+target=/boot/grub/menu.lst
+tmp=$target.tmp
+
+# Convert a path to a file in the Nix store such as
+# /nix/store/<hash>-<name>/file to <hash>-<name>-<file>.
+cleanName() {
+    local path="$1"
+    echo "$path" | sed 's|^/nix/store/||' | sed 's|/|-|g'
+}
+
+# Copy a file from the Nix store to /boot/kernels.
+declare -A filesCopied
+
+copyToKernelsDir() {
+    local src="$1"
+    local dst="/boot/kernels/$(cleanName $src)"
+    # Don't copy the file if $dst already exists.  This means that we
+    # have to create $dst atomically to prevent partially copied
+    # kernels or initrd if this script is ever interrupted.
+    if ! test -e $dst; then
+        local dstTmp=$dst.tmp.$$
+        cp $src $dstTmp
+        mv $dstTmp $dst
+    fi
+    filesCopied[$dst]=1
+    result=$dst
+}
+
+
+# Add an entry for a configuration to the Grub menu, and if
+# appropriate, copy its kernel and initrd to /boot/kernels.
+addEntry() {
+    local path="$1"
+    local generation="$2"
+    local outdir=/boot/system-$generation
+
+    if ! test -e $path/kernel -a -e $path/initrd; then
+        return
+    fi
+
+    local kernel=$(readlink -f $path/kernel)
+    local initrd=$(readlink -f $path/initrd)
+
+    if test -n "@copyKernels@"; then
+        copyToKernelsDir $kernel; kernel=$result
+        copyToKernelsDir $initrd; initrd=$result
+    fi
+    
+    mkdir -p $outdir
+    ln -sf $(readlink -f $path) $outdir/system
+    ln -sf $(readlink -f $path/init) $outdir/init
+    ln -sf $(readlink -f $path/initrd) $outdir/initrd
+    ln -sf $(readlink -f $path/kernel) $outdir/kernel
+
+    if test $(readlink -f "$path") = "$default"; then
+      cp "$kernel" /boot/nixos-kernel
+      cp "$initrd" /boot/nixos-initrd
+      cp "$(readlink -f "$path/init")" /boot/nixos-init
+      mkdir -p /boot/default
+      ln -sf $(readlink -f $path) /boot/default/system
+      ln -sf $(readlink -f $path/init) /boot/default/init
+      ln -sf $(readlink -f $path/initrd) /boot/default/initrd
+      ln -sf $(readlink -f $path/kernel) /boot/default/kernel
+    fi
+}
+
+if test -n "@copyKernels@"; then
+    mkdir -p /boot/kernels
+fi
+
+# Add all generations of the system profile to the menu, in reverse
+# (most recent to least recent) order.
+for generation in $(
+    (cd /nix/var/nix/profiles && ls -d system-*-link) \
+    | sed 's/system-\([0-9]\+\)-link/\1/' \
+    | sort -n -r); do
+    link=/nix/var/nix/profiles/system-$generation-link
+    addEntry $link $generation
+done
+
+# Remove obsolete files from /boot/kernels.
+for fn in /boot/kernels/*; do
+    if ! test "${filesCopied[$fn]}" = 1; then
+        rm -vf -- "$fn"
+    fi
+done
diff --git a/modules/installer/generations-dir/generations-dir.nix b/modules/installer/generations-dir/generations-dir.nix
new file mode 100644
index 00000000000..7ee7a1828da
--- /dev/null
+++ b/modules/installer/generations-dir/generations-dir.nix
@@ -0,0 +1,60 @@
+{pkgs, config, ...}:
+
+###### interface
+let
+  inherit (pkgs.lib) mkOption mkIf;
+
+  options = {
+    boot = {
+      loader = {
+        generationsDir = {
+
+          enable = mkOption {
+            default = false;
+            description = ''
+              Whether to enable the simple preparation of symlinks to the system
+              generations in /boot.
+            '';
+          };
+
+          copyKernels = mkOption {
+            default = false;
+            description = "
+              Whether copy the necessary boot files into /boot, so
+              /nix/store is not needed by the boot loadear.
+            ";
+          };
+        };
+      };
+    };
+  };
+
+in
+
+###### implementation
+let
+  generationsDirBuilder = pkgs.substituteAll {
+    src = ./generations-dir-builder.sh;
+    isExecutable = true;
+    inherit (pkgs) bash;
+    path = [pkgs.coreutils pkgs.gnused pkgs.gnugrep];
+    inherit (config.boot.loader.generationsDir) copyKernels;
+  };
+
+in
+{
+  require = [
+    options
+
+    # config.system.build
+    # ../system/system-options.nix
+  ];
+
+  system = mkIf config.boot.loader.generationsDir.enable {
+    build = {
+      menuBuilder = generationsDirBuilder;
+    };
+    boot.loader.id = "generationsDir";
+    boot.loader.kernelFile = "uImage";
+  };
+}
diff --git a/modules/installer/grub/grub.nix b/modules/installer/grub/grub.nix
index eaef9521f33..233c8fdc95e 100644
--- a/modules/installer/grub/grub.nix
+++ b/modules/installer/grub/grub.nix
@@ -2,90 +2,100 @@
 
 ###### interface
 let
-  inherit (pkgs.lib) mkOption;
+  inherit (pkgs.lib) mkOption mkIf;
 
   options = {
     boot = {
-
-      grubDevice = mkOption {
-        default = "";
-        example = "/dev/hda";
-        description = "
-          The device on which the boot loader, Grub, will be installed.
-          If empty, Grub won't be installed and it's your responsibility
-          to make the system bootable.
-        ";
-      };
-
-      bootMount = mkOption {
-        default = "";
-        example = "(hd0,0)";
-        description = "
-          If the system partition may be wiped on reinstall, it is better
-          to have /boot on a small partition. To do it, we need to explain
-          to GRUB where the kernels live. Specify the partition here (in 
-          GRUB notation.
-        ";
-      };
-
-      configurationName = mkOption {
-        default = "";
-        example = "Stable 2.6.21";
-        description = "
-          Grub entry name instead of default.
-        ";
-      };
-
-      extraGrubEntries = mkOption {
-        default = "";
-        example = "
-          title Windows
-            chainloader (hd0,1)+1
-        ";
-        description = "
-          Any additional entries you want added to the Grub boot menu.
-        ";
-      };
-
-      extraGrubEntriesBeforeNixos = mkOption {
-        default = false;
-        description = "
-          Wheter extraGrubEntries are put before the Nixos-default option
-        ";
-      };
-
-      grubSplashImage = mkOption {
-        default = pkgs.fetchurl {
-          url = http://www.gnome-look.org/CONTENT/content-files/36909-soft-tux.xpm.gz;
-          sha256 = "14kqdx2lfqvh40h6fjjzqgff1mwk74dmbjvmqphi6azzra7z8d59";
+      loader = {
+        grub = {
+
+          enable = mkOption {
+            default = true;
+            description = ''
+              Whether to enable the GRUB boot loader.
+            '';
+          };
+
+          grubDevice = mkOption {
+            default = "";
+            example = "/dev/hda";
+            description = "
+              The device on which the boot loader, Grub, will be installed.
+              If empty, Grub won't be installed and it's your responsibility
+              to make the system bootable.
+            ";
+          };
+
+          bootMount = mkOption {
+            default = "";
+            example = "(hd0,0)";
+            description = "
+              If the system partition may be wiped on reinstall, it is better
+              to have /boot on a small partition. To do it, we need to explain
+              to GRUB where the kernels live. Specify the partition here (in 
+              GRUB notation.
+            ";
+          };
+
+          configurationName = mkOption {
+            default = "";
+            example = "Stable 2.6.21";
+            description = "
+              Grub entry name instead of default.
+            ";
+          };
+
+          extraGrubEntries = mkOption {
+            default = "";
+            example = "
+              title Windows
+                chainloader (hd0,1)+1
+            ";
+            description = "
+              Any additional entries you want added to the Grub boot menu.
+            ";
+          };
+
+          extraGrubEntriesBeforeNixos = mkOption {
+            default = false;
+            description = "
+              Wheter extraGrubEntries are put before the Nixos-default option
+            ";
+          };
+
+          grubSplashImage = mkOption {
+            default = pkgs.fetchurl {
+              url = http://www.gnome-look.org/CONTENT/content-files/36909-soft-tux.xpm.gz;
+              sha256 = "14kqdx2lfqvh40h6fjjzqgff1mwk74dmbjvmqphi6azzra7z8d59";
+            };
+            example = null;
+            description = "
+              Background image used for Grub.  It must be a 640x480,
+              14-colour image in XPM format, optionally compressed with
+              <command>gzip</command> or <command>bzip2</command>.  Set to
+              <literal>null</literal> to run Grub in text mode.
+            ";
+          };
+
+          configurationLimit = mkOption {
+            default = 100;
+            example = 120;
+            description = "
+              Maximum of configurations in boot menu. GRUB has problems when
+              there are too many entries.
+            ";
+          };
+
+          copyKernels = mkOption {
+            default = false;
+            description = "
+              Whether the Grub menu builder should copy kernels and initial
+              ramdisks to /boot.  This is necessary when /nix is on a
+              different file system than /boot.
+            ";
+          };
         };
-        example = null;
-        description = "
-          Background image used for Grub.  It must be a 640x480,
-          14-colour image in XPM format, optionally compressed with
-          <command>gzip</command> or <command>bzip2</command>.  Set to
-          <literal>null</literal> to run Grub in text mode.
-        ";
       };
-
-      configurationLimit = mkOption {
-        default = 100;
-        example = 120;
-        description = "
-          Maximum of configurations in boot menu. GRUB has problems when
-          there are too many entries.
-        ";
-      };
-
-      copyKernels = mkOption {
-        default = false;
-        description = "
-          Whether the Grub menu builder should copy kernels and initial
-          ramdisks to /boot.  This is necessary when /nix is on a
-          different file system than /boot.
-        ";
-      };
-
     };
   };
 in
@@ -99,7 +109,7 @@ let
     isExecutable = true;
     inherit (pkgs) bash;
     path = [pkgs.coreutils pkgs.gnused pkgs.gnugrep];
-    inherit (config.boot) copyKernels extraGrubEntries extraGrubEntriesBeforeNixos
+    inherit (config.boot.loader.grub) copyKernels extraGrubEntries extraGrubEntriesBeforeNixos
       grubSplashImage bootMount configurationLimit;
   };
 in
@@ -112,11 +122,18 @@ in
     # ../system/system-options.nix
   ];
 
-  system = {
+  system = mkIf config.boot.loader.grub.enable {
     build = {
-      inherit grubMenuBuilder;
+      menuBuilder = grubMenuBuilder;
     };
+
+    # Common attribute for boot loaders so only one of them can be
+    # set at once
+    boot.loader.id = "grub";
+    boot.loader.kernelFile = "vmlinuz";
   };
 
+  environment.extraPackages = mkIf config.boot.loader.grub.enable [ pkgs.grub ];
+
   # and many other things that have to be moved inside this file.
 }
diff --git a/modules/module-list.nix b/modules/module-list.nix
index 68f639ea5ff..39b1bb325b6 100644
--- a/modules/module-list.nix
+++ b/modules/module-list.nix
@@ -13,6 +13,7 @@
   ./hardware/network/rt73.nix 
   ./hardware/pcmcia.nix
   ./installer/grub/grub.nix
+  ./installer/generations-dir/generations-dir.nix
   ./installer/tools/nixos-checkout.nix
   ./installer/tools/tools.nix
   ./misc/assertions.nix
diff --git a/modules/system/activation/switch-to-configuration.sh b/modules/system/activation/switch-to-configuration.sh
index bcf31f9bd52..957bc124d7a 100644
--- a/modules/system/activation/switch-to-configuration.sh
+++ b/modules/system/activation/switch-to-configuration.sh
@@ -22,14 +22,20 @@ EOF
 fi
 
 if test "$action" = "switch" -o "$action" = "boot"; then
-    if test -n "@grubDevice@"; then
-        mkdir -m 0700 -p /boot/grub
-        @grubMenuBuilder@ @out@
-        if test "$NIXOS_INSTALL_GRUB" = 1; then
-            @grub@/sbin/grub-install "@grubDevice@" --no-floppy --recheck
-        fi
+    if [ "@bootLoader@" == "grub" ]; then
+      if test -n "@grubDevice@"; then
+          mkdir -m 0700 -p /boot/grub
+          @menuBuilder@ @out@
+          if test "$NIXOS_INSTALL_GRUB" = 1; then
+              @grub@/sbin/grub-install "@grubDevice@" --no-floppy --recheck
+          fi
+      else
+          echo "Warning: don't know how to make this configuration bootable; please set \`boot.grubDevice'." 1>&2
+      fi
+    elif [ "@bootLoader@" == "generationsDir" ]; then
+          @menuBuilder@ @out@
     else
-        echo "Warning: don't know how to make this configuration bootable; please set \`boot.grubDevice'." 1>&2
+          echo "Warning: don't know how to make this configuration bootable; please enable a boot loader." 1>&2
     fi
 fi
 
diff --git a/modules/system/activation/top-level.nix b/modules/system/activation/top-level.nix
index 19e737d0d42..992b988bc49 100644
--- a/modules/system/activation/top-level.nix
+++ b/modules/system/activation/top-level.nix
@@ -17,6 +17,20 @@ let
         Additional configurations to build.
       '';
     };
+
+    system.boot.loader.id = pkgs.lib.mkOption {
+      default = "";
+      description = ''
+        Id string of the used bootloader.
+      '';
+    };
+
+    system.boot.loader.kernelFile = pkgs.lib.mkOption {
+      default = "";
+      description = ''
+        Name of the kernel file to be passed to the bootloader.
+      '';
+    };
     
   };
 
@@ -33,13 +47,17 @@ let
 
 
   systemBuilder = let
-      kernelfile = if (pkgs.stdenv.system == "armv5tel-linux")
-        then "${config.boot.kernelPackages.kernel}/uImage"
-        else "${config.boot.kernelPackages.kernel}/vmlinuz";
-    in ''
+      kernelPath = "${config.boot.kernelPackages.kernel}/" +
+        "${config.system.boot.loader.kernelFile}";
+    in 
+      ''
       ensureDir $out
 
-      ln -s ${kernelfile} $out/kernel
+      if [ ! -f ${kernelPath} ]; then
+        echo "The bootloader cannot find the proper kernel image."
+        echo "(Expecting ${kernelPath})"
+      fi
+      ln -s ${kernelPath} $out/kernel
       if [ -n "$grub" ]; then 
         ln -s $grub $out/grub
       fi
@@ -76,13 +94,9 @@ let
     name = "system";
     buildCommand = systemBuilder;
     inherit children;
-    grub = if (pkgs.stdenv.system != "armv5tel-linux") then pkgs.grub
-      else null;
-    grubDevice = config.boot.grubDevice;
     kernelParams =
       config.boot.kernelParams ++ config.boot.extraKernelParams;
-    grubMenuBuilder = config.system.build.grubMenuBuilder;
-    configurationName = config.boot.configurationName;
+    menuBuilder = config.system.build.menuBuilder;
     # Most of these are needed by grub-install.
     path = [
       pkgs.coreutils
@@ -92,6 +106,12 @@ let
       pkgs.diffutils
       pkgs.upstart # for initctl
     ];
+
+    # Boot loaders
+    bootLoader = config.system.boot.loader.id;
+    grub = if config.boot.loader.grub.enable then pkgs.grub else null;
+    grubDevice = config.boot.loader.grub.grubDevice;
+    configurationName = config.boot.loader.grub.configurationName;
   };
 
 
-- 
GitLab


From b0a6c15f4236a2a08408e813b3e39655a3db7975 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Sun, 27 Sep 2009 21:51:47 +0000
Subject: [PATCH 1864/5331] Fixing a reference to a grub in kdm, I hadn't
 tested before.

svn path=/nixos/trunk/; revision=17461
---
 modules/services/x11/display-managers/kdm.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/services/x11/display-managers/kdm.nix b/modules/services/x11/display-managers/kdm.nix
index e0a85f66f07..5264aa78228 100644
--- a/modules/services/x11/display-managers/kdm.nix
+++ b/modules/services/x11/display-managers/kdm.nix
@@ -14,7 +14,7 @@ let
       [Shutdown]
       HaltCmd=${pkgs.upstart}/sbin/halt
       RebootCmd=${pkgs.upstart}/sbin/reboot
-      ${optionalString (config.boot.grubDevice != "") ''
+      ${optionalString (config.system.boot.loader.id == "grub") ''
         BootManager=Grub
       ''}
 
-- 
GitLab


From 4163ff95b4216b9e621fd7693852d1c75e929e9a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Sun, 27 Sep 2009 21:54:38 +0000
Subject: [PATCH 1865/5331] Reverting r17459 - I had wpa_supplicant addapted to
 my system (nic device), and I didn't want to commit that for all nixos users.
 We may write some day a better wpa_supplicant solution.

svn path=/nixos/trunk/; revision=17462
---
 modules/services/networking/wpa_supplicant.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/services/networking/wpa_supplicant.nix b/modules/services/networking/wpa_supplicant.nix
index 41b73f22d35..309305481ee 100644
--- a/modules/services/networking/wpa_supplicant.nix
+++ b/modules/services/networking/wpa_supplicant.nix
@@ -49,7 +49,7 @@ in
 
         exec =
           "${pkgs.wpa_supplicant}/sbin/wpa_supplicant " +
-          "-C /var/run/wpa_supplicant -c ${configFile} -ieth1";
+          "-C /var/run/wpa_supplicant -c ${configFile} -iwlan0";
       };
   
   };
-- 
GitLab


From 647d9ba3b605e220532a03451d2dcabfdfa61bf5 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 28 Sep 2009 16:27:01 +0000
Subject: [PATCH 1866/5331] * udev: removed the /var/run/devices-created hack. 
 It's no longer   needed now that we don't use pam_devperm anymore.  When udev
 is   restarted, it now asks ConsoleKit to get the active users and sets  
 device ACLs accordingly.

svn path=/nixos/trunk/; revision=17474
---
 modules/services/hardware/udev.nix | 16 ++--------------
 1 file changed, 2 insertions(+), 14 deletions(-)

diff --git a/modules/services/hardware/udev.nix b/modules/services/hardware/udev.nix
index f22adac6eb6..16d05997fd3 100644
--- a/modules/services/hardware/udev.nix
+++ b/modules/services/hardware/udev.nix
@@ -80,15 +80,6 @@ let
     #udev_log="debug"
   '';
 
-  # Dummy file indicating whether we've run udevtrigger/udevsettle.
-  # Since that *recreates* all device nodes with default permissions,
-  # it's not nice to do that when a user is logged in (it messes up
-  # the permissions set by pam_devperm).
-  # !!! Actually, this makes the udev configuration less declarative;
-  # changes may not take effect until the user reboots.  We should
-  # find a better way to preserve the permissions of logged-in users.
-  devicesCreated = "/var/run/devices-created";
-
 in
 
 {
@@ -192,11 +183,8 @@ in
             # Let udev create device nodes for all modules that have already
             # been loaded into the kernel (or for which support is built into
             # the kernel).
-            if ! test -e ${devicesCreated}; then
-                ${udev}/sbin/udevadm trigger
-                ${udev}/sbin/udevadm settle # wait for udev to finish
-                touch ${devicesCreated}
-            fi
+            ${udev}/sbin/udevadm trigger
+            ${udev}/sbin/udevadm settle # wait for udev to finish
 
             # Kill udev, let Upstart restart and monitor it.  (This is nasty,
             # but we have to run `udevadm trigger' first.  Maybe we can use
-- 
GitLab


From 373445c410fedf111d8239a652d9672885da8f80 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 28 Sep 2009 16:37:46 +0000
Subject: [PATCH 1867/5331] * Start bluetoothd from udev.

svn path=/nixos/trunk/; revision=17475
---
 modules/services/hardware/bluetooth.nix | 18 ++----------------
 1 file changed, 2 insertions(+), 16 deletions(-)

diff --git a/modules/services/hardware/bluetooth.nix b/modules/services/hardware/bluetooth.nix
index 0efd6710412..2359ef73e0e 100644
--- a/modules/services/hardware/bluetooth.nix
+++ b/modules/services/hardware/bluetooth.nix
@@ -15,24 +15,10 @@ with pkgs.lib;
   
   config = {
 
-    jobs = pkgs.lib.singleton
-      { name = "bluetoothd";
-
-        startOn = "dbus/started";
-        stopOn = "dbus/stop";
-
-        preStart =
-          ''
-            mkdir -m 0755 -p /var/lib/bluetooth
-          '';
-
-        exec = "${pkgs.bluez}/sbin/bluetoothd --nodaemon --debug";
-      };
-
     environment.systemPackages = [pkgs.bluez pkgs.openobex pkgs.obexftp];
 
-    services.dbus.enable = true;
-    services.dbus.packages = [pkgs.bluez];
+    services.udev.packages = [pkgs.bluez];
+    
   };  
   
 }
-- 
GitLab


From bd41c01bfe45bdc20f85632b5ee35879ddd4584f Mon Sep 17 00:00:00 2001
From: Nicolas Pierron <nicolas.b.pierron@gmail.com>
Date: Mon, 28 Sep 2009 18:26:07 +0000
Subject: [PATCH 1868/5331] Add a nix expression which generate a graph inside
 a pdf to display option usages.

svn path=/nixos/trunk/; revision=17483
---
 maintainers/option-usages.nix | 131 ++++++++++++++++++++++++++++++++++
 1 file changed, 131 insertions(+)
 create mode 100644 maintainers/option-usages.nix

diff --git a/maintainers/option-usages.nix b/maintainers/option-usages.nix
new file mode 100644
index 00000000000..6ddc6e9db60
--- /dev/null
+++ b/maintainers/option-usages.nix
@@ -0,0 +1,131 @@
+{ configuration ? import ../lib/from-env.nix "NIXOS_CONFIG" /etc/nixos/configuration.nix
+
+# []: display all options
+# [<option names>]: display the selected options
+, displayOptions ? [
+    "hardware.pcmcia.enable"
+    "environment.systemPackages"
+    "boot.kernelModules"
+    "services.udev.packages"
+    "jobs"
+    "environment.etc"
+    "system.activationScripts"
+  ]
+}:
+
+# This file is used to generate a dot graph which contains all options and
+# there dependencies to track problems and their sources.
+
+let
+  
+  evalFun = {
+    extraArgs ? {}
+  }: import ../lib/eval-config.nix {
+       modules = [ configuration ];
+       inherit extraArgs;
+     };
+
+  eval = evalFun {};
+  inherit (eval) pkgs;
+
+  reportNewFailures = old: new: with pkgs.lib;
+    let
+      filterChanges =
+        filter ({fst, snd}:
+          !(fst.config.success -> snd.config.success)
+        );
+
+      keepNames =
+        map ({fst, snd}:
+          assert fst.name == snd.name; snd.name
+        );
+     in
+       keepNames (
+         filterChanges (
+           zipLists (collect isOption old) (collect isOption new)
+         )
+       );
+
+
+  mkProtect = name: value: { _type = "protect"; inherit name value; };
+  isProtected = attr: (pkgs.lib.typeOf attr) == "protect";
+
+  getName = set: with pkgs.lib;
+    if isProtected set then
+      set.name
+    else
+      getName (head (attrValues set));
+
+  rmProtect = set: with pkgs.lib;
+    if isProtected set then
+      set.value
+    else
+      mapAttrs (n: rmProtect) set;
+
+  # Create a list of modules where each module contains only one failling
+  # options.
+  introspectionModules = with pkgs.lib;
+    let
+      genericFun = f: set:
+        fold (name: rest:
+          (map (v:
+            listToAttrs [(nameValuePair name v)]
+          ) (f (getAttr name set)))
+          ++ rest
+        ) [] (attrNames set);
+
+      addIntrospection = opt: mkProtect opt.name (
+        throw "Usage introspection of '${opt.name}' by forced failure."
+      );
+
+      f = v:
+        if isOption v then
+          [(addIntrospection v)]
+        else
+          genericFun f v;
+    in
+      genericFun f eval.options;
+
+  overrideConfig = override: with pkgs.lib;
+    let f = configs:
+      zip (n: v:
+        if tail v == [] || isProtected (head v) then
+          head v
+        else
+          f v
+      ) configs;
+    in
+      f [ override eval.config ];
+
+
+  graph = with pkgs.lib;
+    map (thrower: {
+      option = getName thrower;
+      usedBy = reportNewFailures eval.options (evalFun {
+        extraArgs = {
+          config = overrideConfig (rmProtect thrower);
+        };
+      }).options;
+    }) introspectionModules;
+
+  graphToDot = graph: with pkgs.lib; ''
+    digraph "Option Usages" {
+      ${concatMapStrings ({option, usedBy}:
+          assert __trace option true;
+          if displayOptions == [] || elem option displayOptions then
+            concatMapStrings (user: ''
+              "${option}" -> "${user}"''
+            ) usedBy
+          else ""
+        ) graph}
+    }
+  '';
+
+in
+
+pkgs.texFunctions.dot2pdf {
+  dotGraph = pkgs.writeTextFile {
+    name = "option_usages.dot";
+    text = graphToDot graph;
+  };
+}
-- 
GitLab


From 7568587e8871a193320e790e05e4af519a361170 Mon Sep 17 00:00:00 2001
From: Nicolas Pierron <nicolas.b.pierron@gmail.com>
Date: Mon, 28 Sep 2009 18:26:13 +0000
Subject: [PATCH 1869/5331] Add a renaming module.  This module introduce the
 rename function to fetch definitions of oldest options and to add them inside
 the new option.

Properties are still valid and will not be affected by the renaming. e.g:

with: rename alias "foo.bar" to "baz.quz"
and with the following module:

{
  foo.bar = (mkOverride 10 {}) 42;
  baz.quz = 21;
}

the result of baz.quz would be 42 because the priority is still working
after the renaming.

svn path=/nixos/trunk/; revision=17484
---
 modules/module-list.nix |  1 +
 modules/rename.nix      | 41 +++++++++++++++++++++++++++++++++++++++++
 2 files changed, 42 insertions(+)
 create mode 100644 modules/rename.nix

diff --git a/modules/module-list.nix b/modules/module-list.nix
index 39b1bb325b6..e644a9bb77d 100644
--- a/modules/module-list.nix
+++ b/modules/module-list.nix
@@ -27,6 +27,7 @@
   ./programs/pwdutils/pwdutils.nix
   ./programs/ssh.nix
   ./programs/ssmtp.nix
+  ./rename.nix
   ./security/consolekit.nix
   ./security/pam.nix
   ./security/policykit.nix
diff --git a/modules/rename.nix b/modules/rename.nix
new file mode 100644
index 00000000000..777b95cc977
--- /dev/null
+++ b/modules/rename.nix
@@ -0,0 +1,41 @@
+{pkgs, options, config, ...}:
+
+
+let
+  to = throw "This is just a dummy keyword";
+  alias = { name = "Alias"; };
+  obsolete = { name = "Obsolete name"; };
+
+  zipModules = list: with pkgs.lib;
+    zip (n: v:
+      if tail v != [] then zipModules v else head v
+    ) list;
+
+  rename = fromStatus: from: keyword: to: with pkgs.lib;
+    let
+      setTo = setAttrByPath (splitString "." to);
+      setFrom = setAttrByPath (splitString "." from);
+      toOf = attrByPath (splitString "." to) (abort "bad renaming");
+      fromOf = attrByPath (splitString "." from) (abort "IE: renaming error");
+    in
+      [{
+        options = setFrom (mkOption {
+          description = "${fromStatus.name} of <option>${to}</option>.";
+          apply = x: toOf config;
+        });
+      }] ++
+      [{
+        options = setTo (mkOption {
+          extraConfigs = map (def: def.value) (fromOf options).definitions;
+        });
+      }];
+
+in zipModules ([]
+
+# usage example:
+# ++ rename alias "services.xserver.slim.theme" to "services.xserver.displayManager.slim.theme"
+# ++ rename obsolete "environment.extraPackages" to "environment.systemPackages"
+
+
+
+) # do not add renaming after this.
-- 
GitLab


From c9f5889ad18ed8dc62a25709c0cdc446993d871e Mon Sep 17 00:00:00 2001
From: Nicolas Pierron <nicolas.b.pierron@gmail.com>
Date: Mon, 28 Sep 2009 18:26:18 +0000
Subject: [PATCH 1870/5331] move "environment.extraPackages" into the rename
 module.

svn path=/nixos/trunk/; revision=17485
---
 modules/config/system-path.nix | 15 +++------------
 modules/rename.nix             |  2 +-
 2 files changed, 4 insertions(+), 13 deletions(-)

diff --git a/modules/config/system-path.nix b/modules/config/system-path.nix
index f0da2eab341..91a88656bf8 100644
--- a/modules/config/system-path.nix
+++ b/modules/config/system-path.nix
@@ -60,8 +60,7 @@ let
       pkgs.usbutils
       pkgs.utillinux
       pkgs.wirelesstools
-    ]
-    ++ config.environment.extraPackages;
+    ];
 
 
   options = {
@@ -69,6 +68,8 @@ let
     environment = {
 
       systemPackages = mkOption {
+        default = [];
+        example = [pkgs.firefox pkgs.thunderbird];
         description = ''
           The set of packages that appear in
           /var/run/current-system/sw.  These packages are
@@ -80,16 +81,6 @@ let
         '';
       };
 
-      # !!! Obsolete.
-      extraPackages = mkOption {
-        default = [];
-        example = [pkgs.firefox pkgs.thunderbird];
-        description = ''
-          This option allows you to add additional packages to the system
-          path.
-        '';
-      };
-
       pathsToLink = mkOption {
         default = ["/bin" "/sbin" "/lib" "/share/man" "/share/info" "/man" "/info"];
         example = ["/"];
diff --git a/modules/rename.nix b/modules/rename.nix
index 777b95cc977..950321105ca 100644
--- a/modules/rename.nix
+++ b/modules/rename.nix
@@ -34,7 +34,7 @@ in zipModules ([]
 
 # usage example:
 # ++ rename alias "services.xserver.slim.theme" to "services.xserver.displayManager.slim.theme"
-# ++ rename obsolete "environment.extraPackages" to "environment.systemPackages"
+++ rename obsolete "environment.extraPackages" to "environment.systemPackages"
 
 
 
-- 
GitLab


From 636a9e7e32a1de5d9336e97181b5b09037a4b254 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 29 Sep 2009 09:50:38 +0000
Subject: [PATCH 1871/5331] * Add rename clauses for the old Grub options. *
 Renamed some of the new Grub options to more sensible names   (e.g.
 extraGrubEntries to extraEntries, bootMount to bootDevice,   etc.).

svn path=/nixos/trunk/; revision=17494
---
 modules/installer/grub/grub-menu-builder.sh |  34 +--
 modules/installer/grub/grub.nix             | 231 ++++++++++----------
 modules/rename.nix                          |   6 +
 modules/system/activation/top-level.nix     |   5 +-
 4 files changed, 139 insertions(+), 137 deletions(-)

diff --git a/modules/installer/grub/grub-menu-builder.sh b/modules/installer/grub/grub-menu-builder.sh
index 8a99ca5f29d..f64aa837eb5 100644
--- a/modules/installer/grub/grub-menu-builder.sh
+++ b/modules/installer/grub/grub-menu-builder.sh
@@ -11,8 +11,8 @@ if test -z "$1"; then
     exit 1
 fi
 
-bootMount="@bootMount@"
-if test -z "$bootMount"; then bootMount=/boot; fi
+bootDevice="@bootDevice@"
+if test -z "$bootDevice"; then bootDevice=/boot; fi
 
 
 echo "updating the GRUB menu..."
@@ -28,11 +28,11 @@ timeout 5
 GRUBEND
 
 
-if test -n "@grubSplashImage@"; then
-    splashLocation=@grubSplashImage@
+if test -n "@splashImage@"; then
+    splashLocation=@splashImage@
     # Splash images in /nix/store don't seem to work, so copy them.
     cp -f $splashLocation /boot/background.xpm.gz
-    splashLocation="$bootMount/background.xpm.gz"
+    splashLocation="$bootDevice/background.xpm.gz"
     echo "splashimage $splashLocation" >> $tmp
 fi
 
@@ -40,7 +40,7 @@ fi
 configurationCounter=0
 configurationLimit="@configurationLimit@"
 numAlienEntries=`cat <<EOF | egrep '^[[:space:]]*title' | wc -l
-@extraGrubEntries@
+@extraEntries@
 EOF`
 
 if test $((configurationLimit+numAlienEntries)) -gt 190; then
@@ -100,8 +100,8 @@ addEntry() {
 	cp "$(readlink -f "$path/init")" /boot/nixos-init
 	cat > /boot/nixos-grub-config <<EOF
 	title Emergency boot
-	kernel ${bootMount:-/boot}/nixos-kernel systemConfig=$(readlink -f "$path") init=/boot/nixos-init $(cat "$path/kernel-params")
-	initrd ${bootMount:-/boot}/nixos-initrd
+	kernel ${bootDevice:-/boot}/nixos-kernel systemConfig=$(readlink -f "$path") init=/boot/nixos-init $(cat "$path/kernel-params")
+	initrd ${bootDevice:-/boot}/nixos-initrd
 EOF
     fi
 
@@ -110,9 +110,9 @@ EOF
         copyToKernelsDir $initrd; initrd=$result
     fi
     
-    if test -n "$bootMount"; then
-        kernel=$(echo $kernel | sed -e "s^/boot^$bootMount^")
-        initrd=$(echo $initrd | sed -e "s^/boot^$bootMount^")
+    if test -n "$bootDevice"; then
+        kernel=$(echo $kernel | sed -e "s^/boot^$bootDevice^")
+        initrd=$(echo $initrd | sed -e "s^/boot^$bootDevice^")
     fi
     
     local confName=$(if test -e $path/configuration-name; then 
@@ -137,19 +137,19 @@ fi
 
 
 # Additional entries specified verbatim by the configuration.
-extraGrubEntries=`cat <<EOF
-@extraGrubEntries@
+extraEntries=`cat <<EOF
+@extraEntries@
 EOF`
 
 
-if test -n "@extraGrubEntriesBeforeNixos@"; then 
-    echo "$extraGrubEntries" >> $tmp
+if test -n "@extraEntriesBeforeNixOS@"; then 
+    echo "$extraEntries" >> $tmp
 fi
 
 addEntry "NixOS - Default" $default ""
 
-if test -z "@extraGrubEntriesBeforeNixos@"; then 
-    echo "$extraGrubEntries" >> $tmp
+if test -z "@extraEntriesBeforeNixOS@"; then 
+    echo "$extraEntries" >> $tmp
 fi
 
 # Add all generations of the system profile to the menu, in reverse
diff --git a/modules/installer/grub/grub.nix b/modules/installer/grub/grub.nix
index 233c8fdc95e..1bfdda027b2 100644
--- a/modules/installer/grub/grub.nix
+++ b/modules/installer/grub/grub.nix
@@ -1,107 +1,7 @@
-{pkgs, config, ...}:
+{ config, pkgs, ... }:
 
-###### interface
-let
-  inherit (pkgs.lib) mkOption mkIf;
-
-  options = {
-    boot = {
-      loader = {
-        grub = {
-
-          enable = mkOption {
-            default = true;
-            description = ''
-              Whether to enable the GRUB boot loader.
-            '';
-          };
-
-          grubDevice = mkOption {
-            default = "";
-            example = "/dev/hda";
-            description = "
-              The device on which the boot loader, Grub, will be installed.
-              If empty, Grub won't be installed and it's your responsibility
-              to make the system bootable.
-            ";
-          };
-
-          bootMount = mkOption {
-            default = "";
-            example = "(hd0,0)";
-            description = "
-              If the system partition may be wiped on reinstall, it is better
-              to have /boot on a small partition. To do it, we need to explain
-              to GRUB where the kernels live. Specify the partition here (in 
-              GRUB notation.
-            ";
-          };
-
-          configurationName = mkOption {
-            default = "";
-            example = "Stable 2.6.21";
-            description = "
-              Grub entry name instead of default.
-            ";
-          };
-
-          extraGrubEntries = mkOption {
-            default = "";
-            example = "
-              title Windows
-                chainloader (hd0,1)+1
-            ";
-            description = "
-              Any additional entries you want added to the Grub boot menu.
-            ";
-          };
-
-          extraGrubEntriesBeforeNixos = mkOption {
-            default = false;
-            description = "
-              Wheter extraGrubEntries are put before the Nixos-default option
-            ";
-          };
-
-          grubSplashImage = mkOption {
-            default = pkgs.fetchurl {
-              url = http://www.gnome-look.org/CONTENT/content-files/36909-soft-tux.xpm.gz;
-              sha256 = "14kqdx2lfqvh40h6fjjzqgff1mwk74dmbjvmqphi6azzra7z8d59";
-            };
-            example = null;
-            description = "
-              Background image used for Grub.  It must be a 640x480,
-              14-colour image in XPM format, optionally compressed with
-              <command>gzip</command> or <command>bzip2</command>.  Set to
-              <literal>null</literal> to run Grub in text mode.
-            ";
-          };
-
-          configurationLimit = mkOption {
-            default = 100;
-            example = 120;
-            description = "
-              Maximum of configurations in boot menu. GRUB has problems when
-              there are too many entries.
-            ";
-          };
-
-          copyKernels = mkOption {
-            default = false;
-            description = "
-              Whether the Grub menu builder should copy kernels and initial
-              ramdisks to /boot.  This is necessary when /nix is on a
-              different file system than /boot.
-            ";
-          };
-        };
-      };
-    };
-  };
-in
+with pkgs.lib;
 
-
-###### implementation
 let
 
   grubMenuBuilder = pkgs.substituteAll {
@@ -109,31 +9,126 @@ let
     isExecutable = true;
     inherit (pkgs) bash;
     path = [pkgs.coreutils pkgs.gnused pkgs.gnugrep];
-    inherit (config.boot.loader.grub) copyKernels extraGrubEntries extraGrubEntriesBeforeNixos
-      grubSplashImage bootMount configurationLimit;
+    inherit (config.boot.loader.grub) copyKernels extraEntries extraEntriesBeforeNixOS
+      splashImage bootDevice configurationLimit;
   };
+  
 in
 
 {
-  require = [
-    options
 
-    # config.system.build
-    # ../system/system-options.nix
-  ];
+  ###### interface
+
+  options = {
+  
+    boot.loader.grub = {
+
+      enable = mkOption {
+        default = true;
+        description = ''
+          Whether to enable the GRUB boot loader.
+        '';
+      };
+
+      device = mkOption {
+        default = "";
+        example = "/dev/hda";
+        description = "
+          The device on which the boot loader, Grub, will be installed.
+          If empty, Grub won't be installed and it's your responsibility
+          to make the system bootable.
+        ";
+      };
+
+      bootDevice = mkOption {
+        default = "";
+        example = "(hd0,0)";
+        description = "
+          If the system partition may be wiped on reinstall, it is better
+          to have /boot on a small partition. To do it, we need to explain
+          to GRUB where the kernels live. Specify the partition here (in 
+          GRUB notation).
+        ";
+      };
+
+      configurationName = mkOption {
+        default = "";
+        example = "Stable 2.6.21";
+        description = "
+          Grub entry name instead of default.
+        ";
+      };
+
+      extraEntries = mkOption {
+        default = "";
+        example = "
+          title Windows
+            chainloader (hd0,1)+1
+        ";
+        description = "
+          Any additional entries you want added to the Grub boot menu.
+        ";
+      };
+
+      extraEntriesBeforeNixOS = mkOption {
+        default = false;
+        description = "
+          Whether extraEntries are included before the default option.
+        ";
+      };
+
+      splashImage = mkOption {
+        default = pkgs.fetchurl {
+          url = http://www.gnome-look.org/CONTENT/content-files/36909-soft-tux.xpm.gz;
+          sha256 = "14kqdx2lfqvh40h6fjjzqgff1mwk74dmbjvmqphi6azzra7z8d59";
+        };
+        example = null;
+        description = "
+          Background image used for Grub.  It must be a 640x480,
+          14-colour image in XPM format, optionally compressed with
+          <command>gzip</command> or <command>bzip2</command>.  Set to
+          <literal>null</literal> to run Grub in text mode.
+        ";
+      };
+
+      configurationLimit = mkOption {
+        default = 100;
+        example = 120;
+        description = "
+          Maximum of configurations in boot menu. GRUB has problems when
+          there are too many entries.
+        ";
+      };
 
-  system = mkIf config.boot.loader.grub.enable {
-    build = {
-      menuBuilder = grubMenuBuilder;
+      copyKernels = mkOption {
+        default = false;
+        description = "
+          Whether the Grub menu builder should copy kernels and initial
+          ramdisks to /boot.  This is necessary when /nix is on a
+          different file system than /boot.
+        ";
+      };
+      
     };
 
-    # Common attribute for boot loaders so only one of them can be
-    # set at once
-    boot.loader.id = "grub";
-    boot.loader.kernelFile = "vmlinuz";
   };
+  
+
+  ###### implementation
 
-  environment.extraPackages = mkIf config.boot.loader.grub.enable [ pkgs.grub ];
+  config = mkIf config.boot.loader.grub.enable {
+  
+    system.build.menuBuilder = grubMenuBuilder;
 
-  # and many other things that have to be moved inside this file.
+    # Common attribute for boot loaders so only one of them can be
+    # set at once.
+    system.boot.loader.id = "grub";
+    system.boot.loader.kernelFile = "vmlinuz";
+    
+    environment.extraPackages = mkIf config.boot.loader.grub.enable [ pkgs.grub ];
+    
+    # and many other things that have to be moved inside this file.
+    
+  };
+  
 }
diff --git a/modules/rename.nix b/modules/rename.nix
index 950321105ca..c7847d7c5da 100644
--- a/modules/rename.nix
+++ b/modules/rename.nix
@@ -36,6 +36,12 @@ in zipModules ([]
 # ++ rename alias "services.xserver.slim.theme" to "services.xserver.displayManager.slim.theme"
 ++ rename obsolete "environment.extraPackages" to "environment.systemPackages"
 
+# Old Grub-related options.
+++ rename obsolete "boot.copyKernels" to "boot.loader.grub.copyKernels"
+++ rename obsolete "boot.extraGrubEntries" to "boot.loader.grub.extraEntries"
+++ rename obsolete "boot.extraGrubEntriesBeforeNixos" to "boot.loader.grub.extraEntriesBeforeNixOS"
+++ rename obsolete "boot.grubDevice" to "boot.loader.grub.device"
+++ rename obsolete "boot.bootMount" to "boot.loader.grub.bootDevice"
 
 
 ) # do not add renaming after this.
diff --git a/modules/system/activation/top-level.nix b/modules/system/activation/top-level.nix
index 992b988bc49..9fea447164b 100644
--- a/modules/system/activation/top-level.nix
+++ b/modules/system/activation/top-level.nix
@@ -46,7 +46,8 @@ let
     config.nesting.children;
 
 
-  systemBuilder = let
+  systemBuilder =
+    let
       kernelPath = "${config.boot.kernelPackages.kernel}/" +
         "${config.system.boot.loader.kernelFile}";
     in 
@@ -110,7 +111,7 @@ let
     # Boot loaders
     bootLoader = config.system.boot.loader.id;
     grub = if config.boot.loader.grub.enable then pkgs.grub else null;
-    grubDevice = config.boot.loader.grub.grubDevice;
+    grubDevice = config.boot.loader.grub.device;
     configurationName = config.boot.loader.grub.configurationName;
   };
 
-- 
GitLab


From d142b8a13b955143147077309fdee88375cfea0d Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 29 Sep 2009 09:52:25 +0000
Subject: [PATCH 1872/5331] * Remove the ACPI actions.  There's obsolete now
 (handled by HAL /   pm-utils / KDE).

svn path=/nixos/trunk/; revision=17495
---
 modules/services/hardware/acpid.nix | 80 ++++++++++++-----------------
 1 file changed, 33 insertions(+), 47 deletions(-)

diff --git a/modules/services/hardware/acpid.nix b/modules/services/hardware/acpid.nix
index 5ab724b431c..10449aac216 100644
--- a/modules/services/hardware/acpid.nix
+++ b/modules/services/hardware/acpid.nix
@@ -1,21 +1,6 @@
-{pkgs, config, ...}:
+{ config, pkgs, ... }:
 
-###### interface
-let
-  inherit (pkgs.lib) mkOption mkIf;
-
-  options = {
-    powerManagement = {
-
-      enable = mkOption {
-        default = false;
-        description = "Whether to enable power management (ACPI daemon)";
-      };
-    };
-  };
-in
-
-###### implementation
+with pkgs.lib;
 
 let
 
@@ -35,6 +20,8 @@ let
       }
     '';
   
+  events = [powerEvent lidEvent acEvent];
+  
   # Called when the power button is pressed.
   powerEvent =
     { name = "power-button";
@@ -52,14 +39,6 @@ let
       action =
         ''
           #! ${pkgs.bash}/bin/sh
-
-          # Suspend to RAM if the lid is closed.  (We also get this event
-          # when the lid just opened, in which case we obviously don't
-          # want to suspend again.) 
-          if grep -q closed /proc/acpi/button/lid/LID/state; then
-              sync
-              echo mem > /sys/power/state
-          fi
         '';
     };
   
@@ -70,36 +49,43 @@ let
       action = 
         ''
           #! ${pkgs.bash}/bin/sh
-
-          if grep -q "state:.*on-line" /proc/acpi/ac_adapter/AC/state; then
-             echo performance > /sys/devices/system/cpu/cpu0/cpufreq/scaling_governor
-          elif grep -q "state:.*off-line" /proc/acpi/ac_adapter/AC/state; then
-             echo ondemand > /sys/devices/system/cpu/cpu0/cpufreq/scaling_governor
-          fi
         '';
     };
 
-  events = [powerEvent lidEvent acEvent];
-
 in
 
-mkIf config.powerManagement.enable {
-  require = [
-    options
-  ];
+{
 
-  services = {
-    extraJobs = [{
-      name = "acpid";
+  ###### interface
 
-      job = ''
-        description "ACPI daemon"
+  options = {
+  
+    powerManagement = {
 
-        start on udev
-        stop on shutdown
+      enable = mkOption {
+        default = false;
+        description = "Whether to enable power management (ACPI daemon)";
+      };
+      
+    };
+    
+  };
+  
+
+  ###### implementation
+
+  config = mkIf config.powerManagement.enable {
 
-        respawn ${pkgs.acpid}/sbin/acpid --foreground --confdir ${acpiConfDir}
-      '';
-    }];
+    jobs = singleton
+      { name = "acpid";
+        description = "ACPI daemon";
+
+        startOn = "udev";
+        stopOn = "shutdown";
+
+        exec = "${pkgs.acpid}/sbin/acpid --foreground --confdir ${acpiConfDir}";
+      };
+      
   };
+  
 }
-- 
GitLab


From eb1ee3206e5aecbabdbd61e43a516806ff442577 Mon Sep 17 00:00:00 2001
From: Nicolas Pierron <nicolas.b.pierron@gmail.com>
Date: Tue, 29 Sep 2009 13:44:07 +0000
Subject: [PATCH 1873/5331] Rename module: - Improve error messages.

svn path=/nixos/trunk/; revision=17500
---
 modules/rename.nix | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/modules/rename.nix b/modules/rename.nix
index c7847d7c5da..fb83f7e06b9 100644
--- a/modules/rename.nix
+++ b/modules/rename.nix
@@ -15,8 +15,10 @@ let
     let
       setTo = setAttrByPath (splitString "." to);
       setFrom = setAttrByPath (splitString "." from);
-      toOf = attrByPath (splitString "." to) (abort "bad renaming");
-      fromOf = attrByPath (splitString "." from) (abort "IE: renaming error");
+      toOf = attrByPath (splitString "." to)
+        (abort "Renaming Error: option '${to}' does not exists.");
+      fromOf = attrByPath (splitString "." from)
+        (abort "Internal Error: option '${from}' should be declared.");
     in
       [{
         options = setFrom (mkOption {
-- 
GitLab


From a5ad5a035ed7be53b7dd37746c10e9182e799e2c Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 29 Sep 2009 14:21:56 +0000
Subject: [PATCH 1874/5331] * Firewall: by default, only log rejected TCP
 connections.  Otherwise   you get a lot of garbage in the log.  Also, an
 option to reject   instead of drop packets.

svn path=/nixos/trunk/; revision=17505
---
 modules/services/networking/firewall.nix | 56 ++++++++++++++++++++----
 1 file changed, 47 insertions(+), 9 deletions(-)

diff --git a/modules/services/networking/firewall.nix b/modules/services/networking/firewall.nix
index 85f88330134..f577f0e3bf1 100644
--- a/modules/services/networking/firewall.nix
+++ b/modules/services/networking/firewall.nix
@@ -1,9 +1,13 @@
-{pkgs, config, ...}:
+{ config, pkgs, ... }:
+
+with pkgs.lib;
 
 let
 
   iptables = "${pkgs.iptables}/sbin/iptables";
 
+  cfg = config.networking.firewall;
+
 in
 
 {
@@ -12,7 +16,7 @@ in
 
   options = {
   
-    networking.firewall.enable = pkgs.lib.mkOption {
+    networking.firewall.enable = mkOption {
       default = false;
       description =
         ''
@@ -20,10 +24,39 @@ in
         '';
     };
   
-    networking.firewall.allowedTCPPorts = pkgs.lib.mkOption {
+    networking.firewall.logRefusedConnections = mkOption {
+      default = true;
+      description =
+        ''
+          Whether to log rejected or dropped incoming connections.
+        '';
+    };
+  
+    networking.firewall.logRefusedPackets = mkOption {
+      default = false;
+      description =
+        ''
+          Whether to log all rejected or dropped incoming packets.
+          This tends to give a lot of log messages, so it's mostly
+          useful for debugging.
+        '';
+    };
+
+    networking.firewall.rejectPackets = mkOption {
+      default = false;
+      description =
+        ''
+          If set, forbidden packets are rejected rather than dropped
+          (ignored).  This means that a ICMP "port unreachable" error
+          message is sent back to the client.  Rejecting packets makes
+          port scanning somewhat easier.
+        '';
+    };
+  
+    networking.firewall.allowedTCPPorts = mkOption {
       default = [];
       example = [22 80];
-      type = pkgs.lib.types.list pkgs.lib.types.int;
+      type = types.list types.int;
       description =
         ''
           List of TCP ports on which incoming connections are
@@ -41,11 +74,11 @@ in
   # doesn't deal with such Upstart jobs properly (it starts them if
   # they are changed, regardless of whether the start condition
   # holds).
-  config = pkgs.lib.mkIf config.networking.firewall.enable {
+  config = mkIf config.networking.firewall.enable {
 
     environment.systemPackages = [pkgs.iptables];
 
-    jobs = pkgs.lib.singleton
+    jobs = singleton
       { name = "firewall";
 
         startOn = "network-interfaces/started";
@@ -61,7 +94,7 @@ in
             ${iptables} -A INPUT -m conntrack --ctstate ESTABLISHED,RELATED -j ACCEPT
 
             # Accept connections to the allowed TCP ports.            
-            ${pkgs.lib.concatMapStrings (port:
+            ${concatMapStrings (port:
                 ''
                   ${iptables} -A INPUT -p tcp --dport ${toString port} -j ACCEPT
                 ''
@@ -73,8 +106,13 @@ in
             ${iptables} -A INPUT -d 224.0.0.0/4 -j ACCEPT
 
             # Drop everything else.
-            ${iptables} -A INPUT -j LOG --log-level info --log-prefix "firewall: "
-            ${iptables} -A INPUT -j DROP
+            ${optionalString cfg.logRefusedConnections ''
+              ${iptables} -A INPUT -p tcp --syn -j LOG --log-level info --log-prefix "rejected connection: "
+            ''}
+            ${optionalString cfg.logRefusedPackets ''
+              ${iptables} -A INPUT -j LOG --log-level info --log-prefix "rejected packet: "
+            ''}
+            ${iptables} -A INPUT -j ${if cfg.rejectPackets then "REJECT" else "DROP"}
           '';
 
         postStop =
-- 
GitLab


From 08c3069e402fb495d12ad97a677529bd47ddb8a3 Mon Sep 17 00:00:00 2001
From: Nicolas Pierron <nicolas.b.pierron@gmail.com>
Date: Tue, 29 Sep 2009 15:03:08 +0000
Subject: [PATCH 1875/5331] Add obsolete "boot.grubSplashImage".

svn path=/nixos/trunk/; revision=17507
---
 modules/rename.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/modules/rename.nix b/modules/rename.nix
index fb83f7e06b9..fd936c7a446 100644
--- a/modules/rename.nix
+++ b/modules/rename.nix
@@ -44,6 +44,7 @@ in zipModules ([]
 ++ rename obsolete "boot.extraGrubEntriesBeforeNixos" to "boot.loader.grub.extraEntriesBeforeNixOS"
 ++ rename obsolete "boot.grubDevice" to "boot.loader.grub.device"
 ++ rename obsolete "boot.bootMount" to "boot.loader.grub.bootDevice"
+++ rename obsolete "boot.grubSplashImage" to "boot.loader.grub.splashImage"
 
 
 ) # do not add renaming after this.
-- 
GitLab


From 5c0c8a40170b86da6ba2c76228b98546aef186a3 Mon Sep 17 00:00:00 2001
From: Nicolas Pierron <nicolas.b.pierron@gmail.com>
Date: Tue, 29 Sep 2009 15:21:36 +0000
Subject: [PATCH 1876/5331] Add messages inside the renaming process to force
 user to rename their options.

Add the "deprecated" status which breaks until options are manually
renamed.

svn path=/nixos/trunk/; revision=17508
---
 modules/rename.nix | 37 +++++++++++++++++++++++++++++++------
 1 file changed, 31 insertions(+), 6 deletions(-)

diff --git a/modules/rename.nix b/modules/rename.nix
index fd936c7a446..c68d59b2e18 100644
--- a/modules/rename.nix
+++ b/modules/rename.nix
@@ -3,16 +3,38 @@
 
 let
   to = throw "This is just a dummy keyword";
-  alias = { name = "Alias"; };
-  obsolete = { name = "Obsolete name"; };
+
+  alias = from: to: {
+    name = "Alias";
+    msg.use = x: x;
+    msg.define = x: x;
+  };
+
+  obsolete = from: to: {
+    name = "Obsolete name";
+    msg.use = x:
+      builtins.trace "Option '${from}' is used instead of '${to}'." x;
+    msg.define = x:
+      builtins.trace "Option '${from}' is defined instead of '${to}'." x;
+  };
+
+  deprecated = from: to: {
+    name = "Deprecated name";
+    msg.use = x:
+      abort "Option '${from}' is used instead of '${to}'.";
+    msg.define = x:
+      abort "Option '${from}' is defined instead of '${to}'.";
+  };
+
 
   zipModules = list: with pkgs.lib;
     zip (n: v:
       if tail v != [] then zipModules v else head v
     ) list;
 
-  rename = fromStatus: from: keyword: to: with pkgs.lib;
+  rename = statusTemplate: from: keyword: to: with pkgs.lib;
     let
+      status = statusTemplate from to;
       setTo = setAttrByPath (splitString "." to);
       setFrom = setAttrByPath (splitString "." from);
       toOf = attrByPath (splitString "." to)
@@ -22,13 +44,16 @@ let
     in
       [{
         options = setFrom (mkOption {
-          description = "${fromStatus.name} of <option>${to}</option>.";
-          apply = x: toOf config;
+          description = "${status.name} of <option>${to}</option>.";
+          apply = x: status.msg.use (toOf config);
         });
       }] ++
       [{
         options = setTo (mkOption {
-          extraConfigs = map (def: def.value) (fromOf options).definitions;
+          extraConfigs =
+            let externalDefs = (fromOf options).definitions; in
+            if externalDefs == [] then []
+            else map (def: def.value) (status.msg.define externalDefs);
         });
       }];
 
-- 
GitLab


From fdab6626598273be15da40a7af77ad75b9e52a0a Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 29 Sep 2009 15:43:52 +0000
Subject: [PATCH 1877/5331] * Add iproute to the system path.  It was a
 dependency of dhclient   already anyway.

svn path=/nixos/trunk/; revision=17512
---
 modules/config/system-path.nix       | 4 ----
 modules/tasks/network-interfaces.nix | 9 +++++++++
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/modules/config/system-path.nix b/modules/config/system-path.nix
index 91a88656bf8..c2605d0963e 100644
--- a/modules/config/system-path.nix
+++ b/modules/config/system-path.nix
@@ -29,8 +29,6 @@ let
       pkgs.gnused
       pkgs.gnutar
       pkgs.gzip
-      pkgs.host
-      pkgs.iputils
       pkgs.less
       pkgs.libcap
       pkgs.lvm2
@@ -40,7 +38,6 @@ let
       pkgs.nano
       pkgs.ncurses
       pkgs.netcat
-      pkgs.nettools
       pkgs.ntp
       pkgs.openssh
       pkgs.pciutils
@@ -59,7 +56,6 @@ let
       pkgs.upstart
       pkgs.usbutils
       pkgs.utillinux
-      pkgs.wirelesstools
     ];
 
 
diff --git a/modules/tasks/network-interfaces.nix b/modules/tasks/network-interfaces.nix
index d2e01370668..6c77a40ae5d 100644
--- a/modules/tasks/network-interfaces.nix
+++ b/modules/tasks/network-interfaces.nix
@@ -124,6 +124,15 @@ in
 
   config = {
 
+    environment.systemPackages =
+      [ pkgs.host
+        pkgs.iproute
+        pkgs.iputils
+        pkgs.nettools
+        pkgs.wirelesstools
+      ];
+    
+
     jobs = pkgs.lib.singleton
       { name = "network-interfaces";
 
-- 
GitLab


From 2dce393e6ebbaa49096939f2a98e30a75f01adda Mon Sep 17 00:00:00 2001
From: Nicolas Pierron <nicolas.b.pierron@gmail.com>
Date: Tue, 29 Sep 2009 16:42:22 +0000
Subject: [PATCH 1878/5331] Clean-up option-usages.nix by using recent library
 functions.

svn path=/nixos/trunk/; revision=17516
---
 maintainers/option-usages.nix | 58 ++++++++---------------------------
 1 file changed, 13 insertions(+), 45 deletions(-)

diff --git a/maintainers/option-usages.nix b/maintainers/option-usages.nix
index 6ddc6e9db60..175ae9f0821 100644
--- a/maintainers/option-usages.nix
+++ b/maintainers/option-usages.nix
@@ -47,63 +47,31 @@ let
        );
 
 
-  mkProtect = name: value: { _type = "protect"; inherit name value; };
-  isProtected = attr: (pkgs.lib.typeOf attr) == "protect";
-
-  getName = set: with pkgs.lib;
-    if isProtected set then
-      set.name
-    else
-      getName (head (attrValues set));
-
-  rmProtect = set: with pkgs.lib;
-    if isProtected set then
-      set.value
-    else
-      mapAttrs (n: rmProtect) set;
-
   # Create a list of modules where each module contains only one failling
   # options.
   introspectionModules = with pkgs.lib;
     let
-      genericFun = f: set:
-        fold (name: rest:
-          (map (v:
-            listToAttrs [(nameValuePair name v)]
-          ) (f (getAttr name set)))
-          ++ rest
-        ) [] (attrNames set);
-
-      addIntrospection = opt: mkProtect opt.name (
-        throw "Usage introspection of '${opt.name}' by forced failure."
-      );
-
-      f = v:
-        if isOption v then
-          [(addIntrospection v)]
-        else
-          genericFun f v;
+      setIntrospection = opt: rec {
+        name = opt.name;
+        path = splitString "." opt.name;
+        config = setAttrByPath path
+          (throw "Usage introspection of '${name}' by forced failure.");
+      };
     in
-      genericFun f eval.options;
+      map setIntrospection (collect isOption eval.options);
 
-  overrideConfig = override: with pkgs.lib;
-    let f = configs:
-      zip (n: v:
-        if tail v == [] || isProtected (head v) then
-          head v
-        else
-          f v
-      ) configs;
-    in
-      f [ override eval.config ];
+  overrideConfig = thrower:
+    pkgs.lib.recursiveUpdateUntil (path: old: new:
+      path == thrower.path
+    ) eval.config thrower.config;
 
 
   graph = with pkgs.lib;
     map (thrower: {
-      option = getName thrower;
+      option = thrower.name;
       usedBy = reportNewFailures eval.options (evalFun {
         extraArgs = {
-          config = overrideConfig (rmProtect thrower);
+          config = overrideConfig thrower;
         };
       }).options;
     }) introspectionModules;
-- 
GitLab


From e4c27acde3cf6716b7bb20403dce982fdac8795e Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 1 Oct 2009 15:34:51 +0000
Subject: [PATCH 1879/5331] * The mod_php option is no longer implemented.

svn path=/nixos/trunk/; revision=17578
---
 modules/services/web-servers/apache-httpd/default.nix | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/modules/services/web-servers/apache-httpd/default.nix b/modules/services/web-servers/apache-httpd/default.nix
index 57d32209d26..77a724f1e46 100644
--- a/modules/services/web-servers/apache-httpd/default.nix
+++ b/modules/services/web-servers/apache-httpd/default.nix
@@ -438,11 +438,6 @@ in
         ";
       };
 
-      mod_php = mkOption {
-        default = false;
-        description = "Whether to enable the PHP module.";
-      };
-
       virtualHosts = mkOption {
         default = [];
         example = [
-- 
GitLab


From 4452096f3e1c32c94076dae5bf3d49874558ba79 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 5 Oct 2009 13:17:45 +0000
Subject: [PATCH 1880/5331] * Validate the manual against the DocBook 5 RelaxNG
 schema.

svn path=/nixos/trunk/; revision=17643
---
 doc/manual/default.nix     | 9 ++++++++-
 doc/manual/development.xml | 2 +-
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/doc/manual/default.nix b/doc/manual/default.nix
index 1bd6f6c0441..8433feec098 100644
--- a/doc/manual/default.nix
+++ b/doc/manual/default.nix
@@ -41,7 +41,7 @@ let
 
     sources = pkgs.lib.sourceFilesBySuffices ./. [".xml"];
 
-    buildInputs = [pkgs.libxslt];
+    buildInputs = [pkgs.libxml2New pkgs.libxslt];
 
     xsltFlags = ''
       --param section.autolabel 1
@@ -58,6 +58,12 @@ let
       ln -s $sources/*.xml . # */
       ln -s ${optionsDocBook} options-db.xml
 
+      # Check the validity of the manual sources.
+      xmllint --noout --nonet --xinclude --noxincludenode \
+        --relaxng ${pkgs.docbook5}/xml/rng/docbook/docbook.rng \
+        manual.xml
+
+      # Generate the HTML manual.
       dst=$out/share/doc/nixos
       ensureDir $dst
       xsltproc $xsltFlags --nonet --xinclude \
@@ -72,6 +78,7 @@ let
       ln -s ${pkgs.docbook5_xsl}/xml/xsl/docbook/images $dst/
       cp ${./style.css} $dst/style.css
 
+      # Generate manpages.
       ensureDir $out/share/man
       xsltproc --nonet --xinclude \
         --param man.output.in.separate.dir 1 \
diff --git a/doc/manual/development.xml b/doc/manual/development.xml
index 6604c0f7df5..56c071cce98 100644
--- a/doc/manual/development.xml
+++ b/doc/manual/development.xml
@@ -266,7 +266,7 @@ option definitions and all its derivations.  Important derivations are store
 inside the option <option>system.build</option> and can be listed with the
 command <command>nix-instantiate --xml --eval-only /etc/nixos/nixos -A
 config.system.build</command>
-</para>.
+</para>
 
 </section>
 
-- 
GitLab


From 8ab6828f31688151367c85756241111f6c48d964 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 5 Oct 2009 13:55:33 +0000
Subject: [PATCH 1881/5331] * Export the manual under system.build.manual to
 make it easier to   test (nix-build /etc/nixos/nixos -A
 config.system.build.manual).

svn path=/nixos/trunk/; revision=17644
---
 modules/services/misc/nixos-manual.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/modules/services/misc/nixos-manual.nix b/modules/services/misc/nixos-manual.nix
index 5fa65990e2d..961dbe2800f 100644
--- a/modules/services/misc/nixos-manual.nix
+++ b/modules/services/misc/nixos-manual.nix
@@ -66,6 +66,8 @@ in
 
   config = mkIf cfg.enable {
 
+    system.build.manual = manual;
+
     environment.systemPackages = [manual];
 
     boot.extraTTYs = mkIf cfg.showManual [cfg.ttyNumber];
-- 
GitLab


From 0e2c160e2e7decf36f6a428bd1b802e7d1d5c2b1 Mon Sep 17 00:00:00 2001
From: Rob Vermaas <rob.vermaas@gmail.com>
Date: Mon, 5 Oct 2009 15:11:32 +0000
Subject: [PATCH 1882/5331] added privoxy nixos module

svn path=/nixos/trunk/; revision=17646
---
 modules/misc/ids.nix                    |   4 +
 modules/module-list.nix                 |   1 +
 modules/services/networking/privoxy.nix | 103 ++++++++++++++++++++++++
 3 files changed, 108 insertions(+)
 create mode 100644 modules/services/networking/privoxy.nix

diff --git a/modules/misc/ids.nix b/modules/misc/ids.nix
index 1a26a8f9e24..7ddb11cf6ca 100644
--- a/modules/misc/ids.nix
+++ b/modules/misc/ids.nix
@@ -50,6 +50,8 @@ in
     polkituser = 28;
     uptimed = 29;
     ddclient = 30;
+    davfs2 = 31;
+    privoxy = 32;
     # When adding a uid, make sure it doesn't match an existing gid.
 
     nixbld = 30000; # start of range of uids
@@ -85,6 +87,8 @@ in
     video = 26;
     dialout = 27;
     polkituser = 28;
+    davfs2 = 31;
+    privoxy = 32;
     # When adding a gid, make sure it doesn't match an existing uid.
 
     users = 100;
diff --git a/modules/module-list.nix b/modules/module-list.nix
index e644a9bb77d..f152c2382f5 100644
--- a/modules/module-list.nix
+++ b/modules/module-list.nix
@@ -73,6 +73,7 @@
   ./services/networking/openfire.nix
   ./services/networking/openvpn.nix
   ./services/networking/portmap.nix
+  ./services/networking/privoxy.nix
   ./services/networking/ssh/lshd.nix
   ./services/networking/ssh/sshd.nix
   ./services/networking/tftpd.nix
diff --git a/modules/services/networking/privoxy.nix b/modules/services/networking/privoxy.nix
new file mode 100644
index 00000000000..4e2585aba81
--- /dev/null
+++ b/modules/services/networking/privoxy.nix
@@ -0,0 +1,103 @@
+{pkgs, config, ...}:
+
+let
+
+  inherit (pkgs.lib) mkOption mkIf singleton;
+
+  inherit (pkgs) privoxy;
+
+  stateDir = "/var/spool/privoxy";
+
+  privoxyUser = "privoxy";
+
+  modprobe = config.system.sbin.modprobe;
+
+  privoxyFlags = "--no-daemon ${privoxyCfg}";
+
+  privoxyCfg = pkgs.writeText "privoxy.conf" ''
+    listen-address  ${config.services.privoxy.listenAddress}
+    logdir          ${config.services.privoxy.logDir}
+    confdir         ${privoxy}/etc
+    filterfile      default.filter
+
+    ${config.services.privoxy.extraConfig}
+  '';
+
+in
+
+{
+
+  ###### interface
+  
+  options = {
+  
+    services.privoxy = {
+
+      enable = mkOption {
+        default = false;
+        description = ''
+          Whether to run the machine as a HTTP proxy server.
+        '';
+      };
+
+      listenAddress = mkOption {
+        default = "127.0.0.1:8118";
+        description = ''
+          Address the proxy server is listening to.
+        '';
+      };
+
+      logDir = mkOption {
+        default = "/var/log/privoxy" ;
+        description = ''
+          Location for privoxy log files.
+        '';
+      };
+
+      extraConfig = mkOption {
+        default = "" ;
+        description = ''
+          Extra configuration. Contents will be added verbatim to the configuration file.
+        '';
+      };
+    };
+
+  };
+
+
+  ###### implementation
+
+  config = mkIf config.services.privoxy.enable {
+    environment.systemPackages = [ privoxy ];
+  
+    users.extraUsers = singleton
+      { name = privoxyUser;
+        uid = config.ids.uids.privoxy;
+        description = "privoxy daemon user";
+        home = stateDir;
+      };
+
+    jobs = singleton {
+
+      name = "privoxy";
+
+      startOn = "startup";
+      stopOn = "shutdown"; 
+
+      preStart = ''
+         mkdir -m 0755 -p ${stateDir}
+         chown ${privoxyUser} ${stateDir}
+
+         # Needed to run privoxy as an unprivileged user.
+         ${modprobe}/sbin/modprobe capability || true
+      '';
+
+      script = ''
+        ${privoxy}/sbin/privoxy ${privoxyFlags}
+      '';
+
+    };
+    
+  };
+  
+}
-- 
GitLab


From d0c68bc9ab4aa7618b508777767ab1dd6aaa4199 Mon Sep 17 00:00:00 2001
From: Marc Weber <marco-oweber@gmx.de>
Date: Mon, 5 Oct 2009 18:31:27 +0000
Subject: [PATCH 1883/5331] adding jobAttrs which is filled from jobs contents 
   Purpose: Allow overwriding of properties such as:           
 config.jobAttrs.sshd.startOn = "never";

thanks to Nicolas Pierron for reviewing and
extending nixpkgs to make this possible

I'll convert most of the jobs ASAP so please don't care
about the depreceateion much right now

svn path=/nixos/trunk/; revision=17650
---
 modules/system/upstart/upstart.nix | 69 ++++++++++++++++++++++--------
 1 file changed, 50 insertions(+), 19 deletions(-)

diff --git a/modules/system/upstart/upstart.nix b/modules/system/upstart/upstart.nix
index cdf96d7cb79..c6fcd7f81e8 100644
--- a/modules/system/upstart/upstart.nix
+++ b/modules/system/upstart/upstart.nix
@@ -76,7 +76,7 @@ let
         
   jobs =
     [pkgs.upstart] # for the built-in logd job
-    ++ map makeJob (config.jobs ++ config.services.extraJobs);
+    ++ (map makeJob (mapAttrsFlatten (name: job: job // { inherit name; } ) config.jobAttrs));
   
   # Create an etc/event.d directory containing symlinks to the
   # specified list of Upstart job files.
@@ -94,24 +94,7 @@ let
       done
     ''; # */
 
-in
-  
-{
-
-  ###### interface
-  
-  options = {
-  
-    jobs = mkOption {
-      default = [];
-      description = ''
-        This option defines the system jobs started and managed by the
-        Upstart daemon.
-      '';
-
-      type = types.list types.optionSet;
-
-      options = {
+  listJobOptions = {
 
         name = mkOption {
           type = types.string;
@@ -250,6 +233,44 @@ in
         };
 
       };
+
+    attrJobOptions = builtins.removeAttrs listJobOptions ["name"];
+
+in
+  
+{
+
+  ###### interface
+  
+  options = {
+
+    jobAttrs = mkOption {
+      default = {};
+      description = ''
+        This option defines the system jobs started and managed by the
+        Upstart daemon.
+
+        It's filled by config.jobs by now. A warning is print.
+
+        You can overwrite settings easily. Example:
+
+          config.jobAttrs.sshd.startOn = "never";
+      '';
+
+      options = attrJobOptions;
+      type = types.attrsOf types.optionSet;
+    };
+   
+  
+    jobs = mkOption {
+      default = [];
+      description = ''
+        See jobAttrs
+      '';
+
+      type = types.list types.optionSet;
+
+      options = listJobOptions;
       
     };
 
@@ -277,6 +298,16 @@ in
   
   config = {
 
+    # add jobs of list style. If there are some print deprecation message
+    jobAttrs =
+      let deprecatedJobDefs = config.jobs ++ config.services.extraJobs;
+          jobList = concatStringsSep ", " (map (j: j.name) deprecatedJobDefs);
+          jobs = if deprecatedJobDefs != [] then
+                    builtins.trace "Make the following jobs use jobAttrs please. Using jobs is depreceated: ${jobList}"
+                          deprecatedJobDefs
+                    else deprecatedJobDefs;
+      in builtins.listToAttrs (map (job: { inherit (job) name; value = builtins.removeAttrs job ["name"]; }) jobs);
+
     environment.etc =
       [ { # The Upstart events defined above.
           source = "${jobsDir}/etc/event.d";
-- 
GitLab


From 7e72788a3957a5e3578be3ffe89414e38b9558e9 Mon Sep 17 00:00:00 2001
From: Marc Weber <marco-oweber@gmx.de>
Date: Mon, 5 Oct 2009 18:31:30 +0000
Subject: [PATCH 1884/5331] rewrite sshd using jobAtts serving as example

svn path=/nixos/trunk/; revision=17651
---
 modules/services/networking/ssh/sshd.nix | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/modules/services/networking/ssh/sshd.nix b/modules/services/networking/ssh/sshd.nix
index 4cce11a8145..01ade07761c 100644
--- a/modules/services/networking/ssh/sshd.nix
+++ b/modules/services/networking/ssh/sshd.nix
@@ -108,8 +108,7 @@ in
         home = "/var/empty";
       };
 
-    jobs = pkgs.lib.singleton
-      { name = "sshd";
+    jobAttrs.sshd = {
 
         description = "OpenSSH server";
 
-- 
GitLab


From 6b3b22537e488b270f921102c0b15976538a58b4 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 5 Oct 2009 23:15:06 +0000
Subject: [PATCH 1885/5331] * Generate valid DocBook.  <emphasis> isn't allowed
 in a <filename>.

* For manpage generation, work around a bug in the DocBook XSL
  stylesheet by using a <simplelist> instead of a <itemizedlist>
  (which is arguably better anyway).  The indentation of an
  <itemizedlist> lasts beyond the end of that element under certain
  circumstances, it seems.

* Disable the man.endnotes.are.numbered option to prevent endnotes to
  be generated for each xlink:href in the Declarations/Definitions
  lists (which we don't want anyway, I guess).  This causes libxslt to
  get stuck in an infinite (?) loop.

svn path=/nixos/trunk/; revision=17659
---
 doc/manual/default.nix            | 10 ++++------
 doc/manual/options-to-docbook.xsl | 14 +++++++-------
 doc/manual/style.css              |  5 +++++
 3 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/doc/manual/default.nix b/doc/manual/default.nix
index 8433feec098..1e9581e8dd4 100644
--- a/doc/manual/default.nix
+++ b/doc/manual/default.nix
@@ -4,6 +4,7 @@
 }:
 
 let
+
   # To prevent infinite recursion, remove system.path from the
   # options.  Not sure why this happens.
   options_ =
@@ -33,7 +34,7 @@ let
   '';
 
   optionsDocBook = pkgs.runCommand "options-db.xml" {} ''
-    ${pkgs.libxslt}/bin/xsltproc -o $out ${./options-to-docbook.xsl} ${optionsXML}
+    ${pkgs.libxslt}/bin/xsltproc -o $out ${./options-to-docbook.xsl} ${optionsXML_}
   '';
 
   manual = pkgs.stdenv.mkDerivation {
@@ -67,14 +68,10 @@ let
       dst=$out/share/doc/nixos
       ensureDir $dst
       xsltproc $xsltFlags --nonet --xinclude \
-        --output ./manual.html \
+        --output $dst/manual.html \
         ${pkgs.docbook5_xsl}/xml/xsl/docbook/xhtml/docbook.xsl \
         ./manual.xml
 
-      sed '
-        s,!\([^!]*\)!!\([^!]*\)!,<a class="link" href="\1" target="_top"><code class="filename">\2</code></a>,g
-      ' ./manual.html > $dst/manual.html
-
       ln -s ${pkgs.docbook5_xsl}/xml/xsl/docbook/images $dst/
       cp ${./style.css} $dst/style.css
 
@@ -83,6 +80,7 @@ let
       xsltproc --nonet --xinclude \
         --param man.output.in.separate.dir 1 \
         --param man.output.base.dir "'$out/share/man/'" \
+        --param man.endnotes.are.numbered 0 \
         ${pkgs.docbook5_xsl}/xml/xsl/docbook/manpages/docbook.xsl \
         ./man-pages.xml
       
diff --git a/doc/manual/options-to-docbook.xsl b/doc/manual/options-to-docbook.xsl
index a9d77da977d..d8cd057ac29 100644
--- a/doc/manual/options-to-docbook.xsl
+++ b/doc/manual/options-to-docbook.xsl
@@ -62,15 +62,15 @@
                <xsl:if test="count(attr[@name = 'declarations']/list/*) != 0">
                  <para>
                    <emphasis>Declared by:</emphasis>
-                   <xsl:apply-templates select="attr[@name = 'declarations']" />
                  </para>
+                 <xsl:apply-templates select="attr[@name = 'declarations']" />
                </xsl:if>
 
                <xsl:if test="count(attr[@name = 'definitions']/list/*) != 0">
                  <para>
                    <emphasis>Defined by:</emphasis>
-                   <xsl:apply-templates select="attr[@name = 'definitions']" />
                  </para>
+                 <xsl:apply-templates select="attr[@name = 'definitions']" />
                </xsl:if>
                
              </listitem>
@@ -129,20 +129,20 @@
   <xsl:template match="derivation">
     <xsl:choose>
       <xsl:when test="attr[@name = 'url']/string/@value">
-        <emphasis>(download of <xsl:value-of select="attr[@name = 'url']/string/@value" />)</emphasis>
+        <replaceable>(download of <xsl:value-of select="attr[@name = 'url']/string/@value" />)</replaceable>
       </xsl:when>
       <xsl:otherwise>
-        <emphasis>(build of <xsl:value-of select="attr[@name = 'name']/string/@value" />)</emphasis>
+        <replaceable>(build of <xsl:value-of select="attr[@name = 'name']/string/@value" />)</replaceable>
       </xsl:otherwise>
     </xsl:choose>
   </xsl:template>
 
   <xsl:template match="attr[@name = 'declarations' or @name = 'definitions']">
-    <itemizedlist>
+    <simplelist>
       <xsl:for-each select="list/string">
-        <listitem><xsl:text> </xsl:text><xsl:value-of select="@value" /></listitem>
+        <member><filename xlink:href="http://example.org"><xsl:value-of select="@value" /></filename></member>
       </xsl:for-each>
-    </itemizedlist>
+    </simplelist>
   </xsl:template>  
   
 </xsl:stylesheet>
diff --git a/doc/manual/style.css b/doc/manual/style.css
index e992a9a85dd..5756d60eba3 100644
--- a/doc/manual/style.css
+++ b/doc/manual/style.css
@@ -281,3 +281,8 @@ div.calloutlist td
 {
     padding-bottom: 1em;
 }
+
+table
+{
+    margin-bottom: 1em;
+}
-- 
GitLab


From 824e94cf0ad4bb1c37267185034813cf640d9d8a Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 5 Oct 2009 23:47:50 +0000
Subject: [PATCH 1886/5331] * Fix hyperlink generation, but now in XSLT instead
 of sed.

svn path=/nixos/trunk/; revision=17660
---
 doc/manual/default.nix            | 25 ++++---------------------
 doc/manual/options-to-docbook.xsl | 17 ++++++++++++++++-
 2 files changed, 20 insertions(+), 22 deletions(-)

diff --git a/doc/manual/default.nix b/doc/manual/default.nix
index 1e9581e8dd4..f0e6b64103c 100644
--- a/doc/manual/default.nix
+++ b/doc/manual/default.nix
@@ -11,30 +11,13 @@ let
     options //
     { system = removeAttrs options.system ["path"]; };
 
-  optionsXML_ = builtins.toFile "options.xml" (builtins.unsafeDiscardStringContext
+  optionsXML = builtins.toFile "options.xml" (builtins.unsafeDiscardStringContext
     (builtins.toXML (pkgs.lib.optionAttrSetToDocList "" options_)));
 
-  optionsXML = pkgs.runCommand "options2.xml" {} ''
-    sed '
-      \,<attr name="\(declarations\|definitions\)">, {
-        n # fetch the next line
-        : rewriteLinks
-        n # fetch the next line
-        \,</list>, b # leave if this is the end of the list
-        ${if revision == "local" then "" else ''
-        # redirect nixos internals to the repository
-        s,<string value="[^"]*/modules/\([^"]*\)" />,<string value="!https://svn.nixos.org/viewvc/nix/nixos/trunk/modules/\1?revision=${revision}!!../nixos/modules/\1!" />, #"
-        t rewriteLinks # jump to rewriteLinks if done
-        ''}
-        # redirect local file to their locations
-        s,<string value="\([^"]*\)" />,<string value="!file://\1\!!../nixos/modules/\1!" />, #"
-        b rewriteLinks # jump to rewriteLinks
-      }
-    ' ${optionsXML_} > $out
-  '';
-
   optionsDocBook = pkgs.runCommand "options-db.xml" {} ''
-    ${pkgs.libxslt}/bin/xsltproc -o $out ${./options-to-docbook.xsl} ${optionsXML_}
+    ${pkgs.libxslt}/bin/xsltproc \
+      --stringparam revision '${revision}' \
+      -o $out ${./options-to-docbook.xsl} ${optionsXML}
   '';
 
   manual = pkgs.stdenv.mkDerivation {
diff --git a/doc/manual/options-to-docbook.xsl b/doc/manual/options-to-docbook.xsl
index d8cd057ac29..68c3590d45d 100644
--- a/doc/manual/options-to-docbook.xsl
+++ b/doc/manual/options-to-docbook.xsl
@@ -10,6 +10,8 @@
 
   <xsl:output method='xml' encoding="UTF-8" />
 
+  <xsl:param name="revision" />
+
   
   <xsl:template match="/expr/list">
 
@@ -140,7 +142,20 @@
   <xsl:template match="attr[@name = 'declarations' or @name = 'definitions']">
     <simplelist>
       <xsl:for-each select="list/string">
-        <member><filename xlink:href="http://example.org"><xsl:value-of select="@value" /></filename></member>
+        <member><filename>
+          <!-- Hyperlink the filename either to the NixOS Subversion
+          repository (if it’s a module and we have a revision number),
+          or to the local filesystem. -->
+          <xsl:choose>
+            <xsl:when test="$revision != 'local' and contains(@value, '/modules/')">
+              <xsl:attribute name="xlink:href">https://svn.nixos.org/viewvc/nix/nixos/trunk/modules/<xsl:value-of select="substring-after(@value, '/modules/')"/>?revision=<xsl:value-of select="$revision"/></xsl:attribute>
+            </xsl:when>
+            <xsl:otherwise>
+              <xsl:attribute name="xlink:href">file://<xsl:value-of select="@value"/></xsl:attribute>
+            </xsl:otherwise>
+          </xsl:choose>
+          <xsl:value-of select="@value" />
+        </filename></member>
       </xsl:for-each>
     </simplelist>
   </xsl:template>  
-- 
GitLab


From 2969f36b15506b42052fde6321973a11e9f4515e Mon Sep 17 00:00:00 2001
From: Nicolas Pierron <nicolas.b.pierron@gmail.com>
Date: Tue, 6 Oct 2009 09:30:13 +0000
Subject: [PATCH 1887/5331] Add the computation of upstart-packages inside the
 job sub-module by adding the option named "upstartPkg".

Move the obsolete option "services.extraJobs" to the rename module.

svn path=/nixos/trunk/; revision=17672
---
 modules/rename.nix                 |  1 +
 modules/system/upstart/upstart.nix | 71 ++++++++++++++++++------------
 2 files changed, 43 insertions(+), 29 deletions(-)

diff --git a/modules/rename.nix b/modules/rename.nix
index c68d59b2e18..fcbdb9b3b02 100644
--- a/modules/rename.nix
+++ b/modules/rename.nix
@@ -71,5 +71,6 @@ in zipModules ([]
 ++ rename obsolete "boot.bootMount" to "boot.loader.grub.bootDevice"
 ++ rename obsolete "boot.grubSplashImage" to "boot.loader.grub.splashImage"
 
+++ rename obsolete "services.extraJobs" to "jobs"
 
 ) # do not add renaming after this.
diff --git a/modules/system/upstart/upstart.nix b/modules/system/upstart/upstart.nix
index c6fcd7f81e8..a87c6e5ee2c 100644
--- a/modules/system/upstart/upstart.nix
+++ b/modules/system/upstart/upstart.nix
@@ -75,9 +75,19 @@ let
 
         
   jobs =
-    [pkgs.upstart] # for the built-in logd job
-    ++ (map makeJob (mapAttrsFlatten (name: job: job // { inherit name; } ) config.jobAttrs));
-  
+    let
+      deprecatedJobDefs = config.jobs;
+      jobList = concatStringsSep ", " (map (j: j.name) deprecatedJobDefs);
+      jobs =
+        if deprecatedJobDefs != [] then
+          builtins.trace "Make the following jobs use jobAttrs please. Using jobs is depreceated: ${jobList}" deprecatedJobDefs
+        else
+          deprecatedJobDefs;
+    in
+       [pkgs.upstart] # for the built-in logd job
+    ++ map (job: job.upstartPkg) (attrValues config.jobAttrs)
+    ++ map (job: job.upstartPkg) jobs;
+
   # Create an etc/event.d directory containing symlinks to the
   # specified list of Upstart job files.
   jobsDir = pkgs.runCommand "upstart-jobs" {inherit jobs;}
@@ -94,9 +104,11 @@ let
       done
     ''; # */
 
-  listJobOptions = {
+  # !! remove extra indentations.
+  jobOptions = {
 
         name = mkOption {
+          # !!! The type should ensure that this could be a filename.
           type = types.string;
           example = "sshd";
           description = ''
@@ -234,7 +246,26 @@ let
 
       };
 
-    attrJobOptions = builtins.removeAttrs listJobOptions ["name"];
+  upstartJob = {name, config, ...}: {
+    options = {
+      upstartPkg = mkOption {
+        default = makeJob config;
+        type = types.uniq types.package;
+        description = ''
+          Upstart package which contains upstart events inside
+          <filename>/etc/event.d/</filename>.  The default value is
+          generated from other options.
+        '';
+      };
+    };
+
+    config = {
+      # The default name is the name extracted from the attribute path.
+      name = mkDefaultValue (
+        replaceChars ["<" ">" "*"] ["_" "_" "_name_"] name
+      );
+    };
+  };
 
 in
   
@@ -257,8 +288,8 @@ in
           config.jobAttrs.sshd.startOn = "never";
       '';
 
-      options = attrJobOptions;
       type = types.attrsOf types.optionSet;
+      options = [ jobOptions upstartJob ];
     };
    
   
@@ -269,16 +300,7 @@ in
       '';
 
       type = types.list types.optionSet;
-
-      options = listJobOptions;
-      
-    };
-
-    services.extraJobs = mkOption {
-      default = [];
-      description = ''
-        Obsolete - don't use.
-      '';
+      options = [ jobOptions upstartJob ];
     };
 
     tests.upstartJobs = mkOption {
@@ -298,16 +320,6 @@ in
   
   config = {
 
-    # add jobs of list style. If there are some print deprecation message
-    jobAttrs =
-      let deprecatedJobDefs = config.jobs ++ config.services.extraJobs;
-          jobList = concatStringsSep ", " (map (j: j.name) deprecatedJobDefs);
-          jobs = if deprecatedJobDefs != [] then
-                    builtins.trace "Make the following jobs use jobAttrs please. Using jobs is depreceated: ${jobList}"
-                          deprecatedJobDefs
-                    else deprecatedJobDefs;
-      in builtins.listToAttrs (map (job: { inherit (job) name; value = builtins.removeAttrs job ["name"]; }) jobs);
-
     environment.etc =
       [ { # The Upstart events defined above.
           source = "${jobsDir}/etc/event.d";
@@ -317,9 +329,10 @@ in
 
     # see test/test-upstart-job.sh (!!! check whether this still works)
     tests.upstartJobs = { recurseForDerivations = true; } //
-      builtins.listToAttrs (map (job:
-        { name = if job ? jobName then job.jobName else job.name; value = job; }
-      ) jobs);
+      builtins.listToAttrs (map (job: {
+        name = removePrefix "upstart-" job.name;
+        value = job;
+      }) jobs);
   
   };
 
-- 
GitLab


From 2fe37ffe21892abb861a54ed4161b801dc9bbb53 Mon Sep 17 00:00:00 2001
From: Nicolas Pierron <nicolas.b.pierron@gmail.com>
Date: Tue, 6 Oct 2009 09:53:19 +0000
Subject: [PATCH 1888/5331] Remove /nix/store/<hash> prefixes from the manual.

svn path=/nixos/trunk/; revision=17673
---
 doc/manual/options-to-docbook.xsl | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/doc/manual/options-to-docbook.xsl b/doc/manual/options-to-docbook.xsl
index 68c3590d45d..33cc7284f20 100644
--- a/doc/manual/options-to-docbook.xsl
+++ b/doc/manual/options-to-docbook.xsl
@@ -154,7 +154,16 @@
               <xsl:attribute name="xlink:href">file://<xsl:value-of select="@value"/></xsl:attribute>
             </xsl:otherwise>
           </xsl:choose>
-          <xsl:value-of select="@value" />
+          <!-- Print the filename and make it user-friendly by removing the
+          /nix/store/<hash> prefix. -->
+          <xsl:choose>
+            <xsl:when test="start-with(@value, '/nix/store/')">
+              <xsl:value-of select="substring-after(@value, '-')"/>
+            </xsl:when>
+            <xsl:otherwise>
+              <xsl:value-of select="@value" />
+            </xsl:otherwise>
+          </xsl:choose>
         </filename></member>
       </xsl:for-each>
     </simplelist>
-- 
GitLab


From 11025f346206cb2a0e3cba0d2ddf7e70180229b6 Mon Sep 17 00:00:00 2001
From: Nicolas Pierron <nicolas.b.pierron@gmail.com>
Date: Tue, 6 Oct 2009 09:58:11 +0000
Subject: [PATCH 1889/5331] Fix typo from the previous commit.

svn path=/nixos/trunk/; revision=17674
---
 doc/manual/options-to-docbook.xsl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/manual/options-to-docbook.xsl b/doc/manual/options-to-docbook.xsl
index 33cc7284f20..df0060c33f2 100644
--- a/doc/manual/options-to-docbook.xsl
+++ b/doc/manual/options-to-docbook.xsl
@@ -157,7 +157,7 @@
           <!-- Print the filename and make it user-friendly by removing the
           /nix/store/<hash> prefix. -->
           <xsl:choose>
-            <xsl:when test="start-with(@value, '/nix/store/')">
+            <xsl:when test="starts-with(@value, '/nix/store/')">
               <xsl:value-of select="substring-after(@value, '-')"/>
             </xsl:when>
             <xsl:otherwise>
-- 
GitLab


From 56d6afaa8a5acc525ced967df16d5094ee851ff8 Mon Sep 17 00:00:00 2001
From: Nicolas Pierron <nicolas.b.pierron@gmail.com>
Date: Tue, 6 Oct 2009 19:07:09 +0000
Subject: [PATCH 1890/5331] When nixos is used inside a /nix/store, the store
 path is replace by /etc/nixos/nixos which is the default location of nixos.

svn path=/nixos/trunk/; revision=17681
---
 doc/manual/options-to-docbook.xsl | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/doc/manual/options-to-docbook.xsl b/doc/manual/options-to-docbook.xsl
index df0060c33f2..828ca99ecd8 100644
--- a/doc/manual/options-to-docbook.xsl
+++ b/doc/manual/options-to-docbook.xsl
@@ -154,11 +154,12 @@
               <xsl:attribute name="xlink:href">file://<xsl:value-of select="@value"/></xsl:attribute>
             </xsl:otherwise>
           </xsl:choose>
-          <!-- Print the filename and make it user-friendly by removing the
-          /nix/store/<hash> prefix. -->
+          <!-- Print the filename and make it user-friendly by replacing the
+          /nix/store/<hash> prefix by the default location of nixos
+          sources. -->
           <xsl:choose>
             <xsl:when test="starts-with(@value, '/nix/store/')">
-              <xsl:value-of select="substring-after(@value, '-')"/>
+              /etc/nixos/nixos/modules/<xsl:value-of select="substring-after(@value, '/modules/')"/>
             </xsl:when>
             <xsl:otherwise>
               <xsl:value-of select="@value" />
-- 
GitLab


From 9b5611e35e5edccb10199ad91de2bbb140aad2c8 Mon Sep 17 00:00:00 2001
From: Nicolas Pierron <nicolas.b.pierron@gmail.com>
Date: Tue, 6 Oct 2009 19:25:25 +0000
Subject: [PATCH 1891/5331] Option "kde.extraPackages" is now deprecated.

svn path=/nixos/trunk/; revision=17682
---
 modules/rename.nix                                |  5 +++++
 .../x11/desktop-managers/kde-environment.nix      | 15 ---------------
 2 files changed, 5 insertions(+), 15 deletions(-)

diff --git a/modules/rename.nix b/modules/rename.nix
index fcbdb9b3b02..05d278bd3e7 100644
--- a/modules/rename.nix
+++ b/modules/rename.nix
@@ -71,6 +71,11 @@ in zipModules ([]
 ++ rename obsolete "boot.bootMount" to "boot.loader.grub.bootDevice"
 ++ rename obsolete "boot.grubSplashImage" to "boot.loader.grub.splashImage"
 
+# jobs
 ++ rename obsolete "services.extraJobs" to "jobs"
 
+# kde
+++ rename deprecated "kde.extraPackages" to "environment.kdePackages"
+
+
 ) # do not add renaming after this.
diff --git a/modules/services/x11/desktop-managers/kde-environment.nix b/modules/services/x11/desktop-managers/kde-environment.nix
index 6053832a3c3..98b92e42b85 100644
--- a/modules/services/x11/desktop-managers/kde-environment.nix
+++ b/modules/services/x11/desktop-managers/kde-environment.nix
@@ -6,20 +6,6 @@ let
 
   options = {
 
-    kde = {
-
-      extraPackages = mkOption {
-        default = [];
-        merge = builtins.trace "!!! kde.extraPackages is obsolete, you should use environment.kdePackages." pkgs.lib.mergeDefaultOption;
-        description = ''
-          ** Obsolete **
-          Additional KDE packages to be used when you use KDE as a desktop
-          manager.  By default, you only get the KDE base packages.
-        '';
-      };
-
-    };
-
     environment = {
 
       kdePackages = mkOption {
@@ -30,7 +16,6 @@ let
           Additional KDE packages to be used when you use KDE as a desktop
           manager.  By default, you only get the KDE base packages.
         '';
-        apply = pkgs: pkgs ++ config.kde.extraPackages;
       };
 
     };
-- 
GitLab


From 704e56667a96e03c9bb6bca53135ff4ce7387cdb Mon Sep 17 00:00:00 2001
From: Rob Vermaas <rob.vermaas@gmail.com>
Date: Wed, 7 Oct 2009 11:55:36 +0000
Subject: [PATCH 1892/5331] added nixos modules to perform simple backup
 scheduling for directories, postgresql and mysql database dumps

svn path=/nixos/trunk/; revision=17690
---
 modules/module-list.nix                       |   3 +
 modules/services/backup/mysql-backup.nix      |  71 ++++++++++++
 modules/services/backup/postgresql-backup.nix |  71 ++++++++++++
 modules/services/backup/sitecopy-backup.nix   | 109 ++++++++++++++++++
 4 files changed, 254 insertions(+)
 create mode 100644 modules/services/backup/mysql-backup.nix
 create mode 100644 modules/services/backup/postgresql-backup.nix
 create mode 100644 modules/services/backup/sitecopy-backup.nix

diff --git a/modules/module-list.nix b/modules/module-list.nix
index f152c2382f5..b443a41a64e 100644
--- a/modules/module-list.nix
+++ b/modules/module-list.nix
@@ -36,6 +36,9 @@
   ./security/sudo.nix
   ./services/audio/alsa.nix
   ./services/audio/pulseaudio.nix
+  ./services/backup/mysql-backup.nix
+  ./services/backup/postgresql-backup.nix
+  ./services/backup/sitecopy-backup.nix
   ./services/databases/mysql.nix
   ./services/databases/postgresql.nix
   ./services/hardware/acpid.nix
diff --git a/modules/services/backup/mysql-backup.nix b/modules/services/backup/mysql-backup.nix
new file mode 100644
index 00000000000..ca749fa9e42
--- /dev/null
+++ b/modules/services/backup/mysql-backup.nix
@@ -0,0 +1,71 @@
+{pkgs, config, ...}:
+
+let
+  inherit (pkgs.lib) mkOption mkIf singleton concatStrings;
+  inherit (pkgs) mysql gzip;
+
+  location = config.services.mysqlBackup.location ;
+
+  mysqlBackupCron = db : ''
+    ${config.services.mysqlBackup.period} mysql ${mysql}/bin/mysqldump ${db} | ${gzip}/bin/gzip -c > ${location}/${db}.gz
+  ''; 
+
+in
+
+{
+
+  ###### interface
+  
+  options = {
+  
+    services.mysqlBackup = {
+
+      enable = mkOption {
+        default = false;
+        description = ''
+          Whether to enable MySQL backups.
+        '';
+      };
+
+      period = mkOption {
+        default = "15 01 * * *";
+        description = ''
+          This option defines (in the format used by cron) when the
+          databases should be dumped.
+          The default is to update at 01:15 (at night) every day.
+        '';
+      };
+
+      databases = mkOption {
+        default = [];
+        description = ''
+          List of database names to dump.
+        '';
+      };
+ 
+      location = mkOption {
+        default = "/var/backup/mysql";
+        description = ''
+          Location to put the gzipped PostgreSQL database dumps.
+        '';
+      };
+    };
+
+  };
+
+  ###### implementation
+  config = mkIf config.services.mysqlBackup.enable {
+    services.cron = {
+      systemCronJobs = 
+        pkgs.lib.optional
+          config.services.mysqlBackup.enable
+          (concatStrings (map mysqlBackupCron config.services.mysqlBackup.databases));
+    };
+
+    system.activationScripts.mysqlBackup = pkgs.stringsWithDeps.noDepEntry ''
+         mkdir -m 0700 -p ${config.services.mysqlBackup.location}
+         chown mysql ${config.services.mysqlBackup.location}
+    '';
+  };
+  
+}
diff --git a/modules/services/backup/postgresql-backup.nix b/modules/services/backup/postgresql-backup.nix
new file mode 100644
index 00000000000..3ef758d595b
--- /dev/null
+++ b/modules/services/backup/postgresql-backup.nix
@@ -0,0 +1,71 @@
+{pkgs, config, ...}:
+
+let
+  inherit (pkgs.lib) mkOption mkIf singleton concatStrings;
+  inherit (pkgs) postgresql gzip;
+
+  location = config.services.postgresqlBackup.location ;
+
+  postgresqlBackupCron = db : ''
+    ${config.services.postgresqlBackup.period} root ${postgresql}/bin/pg_dump ${db} | ${gzip}/bin/gzip -c > ${location}/${db}.gz
+  ''; 
+
+in
+
+{
+
+  ###### interface
+  
+  options = {
+  
+    services.postgresqlBackup = {
+
+      enable = mkOption {
+        default = false;
+        description = ''
+          Whether to enable PostgreSQL dumps.
+        '';
+      };
+
+      period = mkOption {
+        default = "15 01 * * *";
+        description = ''
+          This option defines (in the format used by cron) when the
+          databases should be dumped.
+          The default is to update at 01:15 (at night) every day.
+        '';
+      };
+
+      databases = mkOption {
+        default = [];
+        description = ''
+          List of database names to dump. 
+        '';
+      };
+ 
+      location = mkOption {
+        default = "/var/backup/postgresql";
+        description = ''
+          Location to put the gzipped PostgreSQL database dumps.
+        '';
+      };
+    };
+
+  };
+
+  ###### implementation
+  config = mkIf config.services.postgresqlBackup.enable {
+    services.cron = {
+      systemCronJobs = 
+        pkgs.lib.optional
+          config.services.postgresqlBackup.enable
+          (concatStrings (map postgresqlBackupCron config.services.postgresqlBackup.databases));
+    };
+
+    system.activationScripts.postgresqlBackup = pkgs.stringsWithDeps.noDepEntry ''
+         mkdir -m 0700 -p ${config.services.postgresqlBackup.location}
+         chown root ${config.services.postgresqlBackup.location}
+    '';
+  };
+  
+}
diff --git a/modules/services/backup/sitecopy-backup.nix b/modules/services/backup/sitecopy-backup.nix
new file mode 100644
index 00000000000..5ff16b62157
--- /dev/null
+++ b/modules/services/backup/sitecopy-backup.nix
@@ -0,0 +1,109 @@
+{pkgs, config, ...}:
+
+let
+  inherit (pkgs.lib) mkOption mkIf singleton concatStrings;
+  inherit (pkgs) sitecopy;
+
+  stateDir = "/var/spool/sitecopy";
+
+  sitecopyCron = backup : ''
+    ${if backup ? period then backup.period else config.services.sitecopy.period} root ${sitecopy}/bin/sitecopy --storepath=${stateDir} --rcfile=${stateDir}/${backup.name}.conf --update ${backup.name}
+  ''; 
+in
+
+{
+
+  ###### interface
+  
+  options = {
+  
+    services.sitecopy = {
+
+      enable = mkOption {
+        default = false;
+        description = ''
+          Whether to enable sitecopy backups of specified directories.
+        '';
+      };
+
+      period = mkOption {
+        default = "15 04 * * *";
+        description = ''
+          This option defines (in the format used by cron) when the
+          sitecopy backup are being run.
+          The default is to update at 04:15 (at night) every day.
+        '';
+      };
+
+      backups = mkOption {
+        default = [];
+        description = ''
+           List of attributesets describing the backups. 
+           E.g. { name = "test"; 
+                  local = "/tmp/backup"; 
+                  remote = "/staff-groups/ewi/st/strategoxt/backup/test";
+                  server = "webdata.tudelft.nl";
+                  protocol = "webdav";
+                  https = true ;
+                };
+           Username/password are extracted from ${stateDir}/sitecopy.secrets at activation 
+           time. The secrets file lines should have the following structure:
+
+             <server> <username> <password>
+ 
+        '';
+      }; 
+
+    };
+
+  };
+
+
+  ###### implementation
+
+  config = mkIf config.services.sitecopy.enable {
+    environment.systemPackages = [ sitecopy ];
+
+    services.cron = {
+      systemCronJobs = pkgs.lib.optional
+          config.services.sitecopy.enable
+          (concatStrings (map sitecopyCron config.services.sitecopy.backups));
+    };
+
+
+    system.activationScripts.postgresqlBackup = 
+      pkgs.stringsWithDeps.noDepEntry ''  
+          mkdir -m 0700 -p ${stateDir}
+          chown root ${stateDir}
+          touch ${stateDir}/sitecopy.secrets
+          chown root ${stateDir}/sitecopy.secrets
+
+          ${pkgs.lib.concatStrings (map ( b: ''
+              unset secrets
+              unset secret
+              secrets=`grep '^${b.server}' ${stateDir}/sitecopy.secrets | head -1`
+              secret=($secrets)
+              cat > ${stateDir}/${b.name}.conf << EOF
+                site ${b.name}
+                server ${b.server}
+                protocol ${b.protocol}
+                username ''${secret[1]}
+                password ''${secret[2]}
+                local ${b.local}
+                remote ${b.remote}
+                ${if b.https then "http secure" else ""}
+              EOF
+              chmod 0600 ${stateDir}/${b.name}.conf
+              if ! test -e ${stateDir}/${b.name} ; then
+                echo " * Initializing sitecopy '${b.name}'"
+                ${sitecopy}/bin/sitecopy --storepath=${stateDir} --rcfile=${stateDir}/${b.name}.conf --initialize ${b.name}
+              else
+                echo " * Sitecopy '${b.name}' already initialized"
+              fi
+            '' ) config.services.sitecopy.backups 
+         )}
+
+      '';
+  };
+  
+}
-- 
GitLab


From 870b2ae68eb259cbaf7ff1cb87d1e64e1bd95e18 Mon Sep 17 00:00:00 2001
From: Rob Vermaas <rob.vermaas@gmail.com>
Date: Wed, 7 Oct 2009 11:58:23 +0000
Subject: [PATCH 1893/5331] PostgreSQL should be MySQL

svn path=/nixos/trunk/; revision=17691
---
 modules/services/backup/mysql-backup.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/services/backup/mysql-backup.nix b/modules/services/backup/mysql-backup.nix
index ca749fa9e42..0914f006965 100644
--- a/modules/services/backup/mysql-backup.nix
+++ b/modules/services/backup/mysql-backup.nix
@@ -46,7 +46,7 @@ in
       location = mkOption {
         default = "/var/backup/mysql";
         description = ''
-          Location to put the gzipped PostgreSQL database dumps.
+          Location to put the gzipped MySQL database dumps.
         '';
       };
     };
-- 
GitLab


From 15ffc4a296986369a00d796b4fd8f93edc4213aa Mon Sep 17 00:00:00 2001
From: Rob Vermaas <rob.vermaas@gmail.com>
Date: Wed, 7 Oct 2009 12:08:04 +0000
Subject: [PATCH 1894/5331] shouldn't use <'s in description

svn path=/nixos/trunk/; revision=17692
---
 modules/services/backup/sitecopy-backup.nix | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/modules/services/backup/sitecopy-backup.nix b/modules/services/backup/sitecopy-backup.nix
index 5ff16b62157..292c7b11311 100644
--- a/modules/services/backup/sitecopy-backup.nix
+++ b/modules/services/backup/sitecopy-backup.nix
@@ -48,8 +48,7 @@ in
                 };
            Username/password are extracted from ${stateDir}/sitecopy.secrets at activation 
            time. The secrets file lines should have the following structure:
-
-             <server> <username> <password>
+             server username password
  
         '';
       }; 
-- 
GitLab


From e6e3c11dba238e80af4cef968960c3667f6718e1 Mon Sep 17 00:00:00 2001
From: Rob Vermaas <rob.vermaas@gmail.com>
Date: Wed, 7 Oct 2009 12:52:04 +0000
Subject: [PATCH 1895/5331] * moved example to example attribute, changed
 description of sitecopy backup module

svn path=/nixos/trunk/; revision=17693
---
 modules/services/backup/sitecopy-backup.nix | 22 ++++++++++++---------
 1 file changed, 13 insertions(+), 9 deletions(-)

diff --git a/modules/services/backup/sitecopy-backup.nix b/modules/services/backup/sitecopy-backup.nix
index 292c7b11311..527a5e5b69d 100644
--- a/modules/services/backup/sitecopy-backup.nix
+++ b/modules/services/backup/sitecopy-backup.nix
@@ -36,20 +36,24 @@ in
       };
 
       backups = mkOption {
+        example = [
+          { name = "test"; 
+            local = "/tmp/backup"; 
+            remote = "/staff-groups/ewi/st/strategoxt/backup/test";
+            server = "webdata.tudelft.nl";
+            protocol = "webdav";
+            https = true ;
+          }
+        ];
         default = [];
         description = ''
            List of attributesets describing the backups. 
-           E.g. { name = "test"; 
-                  local = "/tmp/backup"; 
-                  remote = "/staff-groups/ewi/st/strategoxt/backup/test";
-                  server = "webdata.tudelft.nl";
-                  protocol = "webdav";
-                  https = true ;
-                };
-           Username/password are extracted from ${stateDir}/sitecopy.secrets at activation 
+
+           Username/password are extracted from <filename>${stateDir}/sitecopy.secrets</filename> at activation 
            time. The secrets file lines should have the following structure:
+           <screen>
              server username password
- 
+           </screen>
         '';
       }; 
 
-- 
GitLab


From 06f26e1ad0b35107696c6d2c2fed16925d6ff62c Mon Sep 17 00:00:00 2001
From: Rob Vermaas <rob.vermaas@gmail.com>
Date: Wed, 7 Oct 2009 12:53:27 +0000
Subject: [PATCH 1896/5331] * removed unnecessary comments

svn path=/nixos/trunk/; revision=17694
---
 modules/services/backup/sitecopy-backup.nix | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/modules/services/backup/sitecopy-backup.nix b/modules/services/backup/sitecopy-backup.nix
index 527a5e5b69d..dfb48c68131 100644
--- a/modules/services/backup/sitecopy-backup.nix
+++ b/modules/services/backup/sitecopy-backup.nix
@@ -13,8 +13,6 @@ in
 
 {
 
-  ###### interface
-  
   options = {
   
     services.sitecopy = {
@@ -61,9 +59,6 @@ in
 
   };
 
-
-  ###### implementation
-
   config = mkIf config.services.sitecopy.enable {
     environment.systemPackages = [ sitecopy ];
 
-- 
GitLab


From cc5d5b3e7723d1b72b54e78cb11666dc5529697e Mon Sep 17 00:00:00 2001
From: Rob Vermaas <rob.vermaas@gmail.com>
Date: Wed, 7 Oct 2009 12:53:59 +0000
Subject: [PATCH 1897/5331] * removed unnecessary comments

svn path=/nixos/trunk/; revision=17695
---
 modules/services/backup/postgresql-backup.nix | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/modules/services/backup/postgresql-backup.nix b/modules/services/backup/postgresql-backup.nix
index 3ef758d595b..82fcac893ef 100644
--- a/modules/services/backup/postgresql-backup.nix
+++ b/modules/services/backup/postgresql-backup.nix
@@ -14,8 +14,6 @@ in
 
 {
 
-  ###### interface
-  
   options = {
   
     services.postgresqlBackup = {
@@ -53,7 +51,6 @@ in
 
   };
 
-  ###### implementation
   config = mkIf config.services.postgresqlBackup.enable {
     services.cron = {
       systemCronJobs = 
-- 
GitLab


From ddf7a784e769aa8e3d06c8ed0f856b7d3fcaca36 Mon Sep 17 00:00:00 2001
From: Rob Vermaas <rob.vermaas@gmail.com>
Date: Wed, 7 Oct 2009 12:54:22 +0000
Subject: [PATCH 1898/5331] * removed unnecessary comments

svn path=/nixos/trunk/; revision=17696
---
 modules/services/backup/mysql-backup.nix | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/modules/services/backup/mysql-backup.nix b/modules/services/backup/mysql-backup.nix
index 0914f006965..ede9be1982d 100644
--- a/modules/services/backup/mysql-backup.nix
+++ b/modules/services/backup/mysql-backup.nix
@@ -13,9 +13,6 @@ let
 in
 
 {
-
-  ###### interface
-  
   options = {
   
     services.mysqlBackup = {
@@ -53,7 +50,6 @@ in
 
   };
 
-  ###### implementation
   config = mkIf config.services.mysqlBackup.enable {
     services.cron = {
       systemCronJobs = 
-- 
GitLab


From 00668de9f15fd09f0326e67e97c250c895a2d605 Mon Sep 17 00:00:00 2001
From: Rob Vermaas <rob.vermaas@gmail.com>
Date: Wed, 7 Oct 2009 13:00:37 +0000
Subject: [PATCH 1899/5331] removed unnecessary optional

svn path=/nixos/trunk/; revision=17697
---
 modules/services/backup/sitecopy-backup.nix | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/modules/services/backup/sitecopy-backup.nix b/modules/services/backup/sitecopy-backup.nix
index dfb48c68131..5122b93ac00 100644
--- a/modules/services/backup/sitecopy-backup.nix
+++ b/modules/services/backup/sitecopy-backup.nix
@@ -63,9 +63,7 @@ in
     environment.systemPackages = [ sitecopy ];
 
     services.cron = {
-      systemCronJobs = pkgs.lib.optional
-          config.services.sitecopy.enable
-          (concatStrings (map sitecopyCron config.services.sitecopy.backups));
+      systemCronJobs = concatStrings (map sitecopyCron config.services.sitecopy.backups);
     };
 
 
-- 
GitLab


From 43b3ccc62073d5d81903bf3acab29dc19ac876fc Mon Sep 17 00:00:00 2001
From: Sander van der Burg <s.vanderburg@tudelft.nl>
Date: Wed, 7 Oct 2009 13:12:45 +0000
Subject: [PATCH 1900/5331] remove unnecessary concatstrings

svn path=/nixos/trunk/; revision=17699
---
 modules/services/backup/mysql-backup.nix      | 5 +----
 modules/services/backup/postgresql-backup.nix | 5 +----
 modules/services/backup/sitecopy-backup.nix   | 2 +-
 3 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/modules/services/backup/mysql-backup.nix b/modules/services/backup/mysql-backup.nix
index ede9be1982d..51c998a9b09 100644
--- a/modules/services/backup/mysql-backup.nix
+++ b/modules/services/backup/mysql-backup.nix
@@ -52,10 +52,7 @@ in
 
   config = mkIf config.services.mysqlBackup.enable {
     services.cron = {
-      systemCronJobs = 
-        pkgs.lib.optional
-          config.services.mysqlBackup.enable
-          (concatStrings (map mysqlBackupCron config.services.mysqlBackup.databases));
+      systemCronJobs = map mysqlBackupCron config.services.mysqlBackup.databases;
     };
 
     system.activationScripts.mysqlBackup = pkgs.stringsWithDeps.noDepEntry ''
diff --git a/modules/services/backup/postgresql-backup.nix b/modules/services/backup/postgresql-backup.nix
index 82fcac893ef..630b01efe0e 100644
--- a/modules/services/backup/postgresql-backup.nix
+++ b/modules/services/backup/postgresql-backup.nix
@@ -53,10 +53,7 @@ in
 
   config = mkIf config.services.postgresqlBackup.enable {
     services.cron = {
-      systemCronJobs = 
-        pkgs.lib.optional
-          config.services.postgresqlBackup.enable
-          (concatStrings (map postgresqlBackupCron config.services.postgresqlBackup.databases));
+      systemCronJobs = map postgresqlBackupCron config.services.postgresqlBackup.databases;
     };
 
     system.activationScripts.postgresqlBackup = pkgs.stringsWithDeps.noDepEntry ''
diff --git a/modules/services/backup/sitecopy-backup.nix b/modules/services/backup/sitecopy-backup.nix
index 5122b93ac00..64fb546aad2 100644
--- a/modules/services/backup/sitecopy-backup.nix
+++ b/modules/services/backup/sitecopy-backup.nix
@@ -63,7 +63,7 @@ in
     environment.systemPackages = [ sitecopy ];
 
     services.cron = {
-      systemCronJobs = concatStrings (map sitecopyCron config.services.sitecopy.backups);
+      systemCronJobs = map sitecopyCron config.services.sitecopy.backups;
     };
 
 
-- 
GitLab


From 2e34baba3b69cfff7143eb444ea57cd7f08296b5 Mon Sep 17 00:00:00 2001
From: Nicolas Pierron <nicolas.b.pierron@gmail.com>
Date: Wed, 7 Oct 2009 17:14:25 +0000
Subject: [PATCH 1901/5331] Rename environment.extraPackages to
 environment.systemPackages.

svn path=/nixos/trunk/; revision=17705
---
 modules/installer/grub/grub.nix                | 2 +-
 modules/installer/tools/nixos-checkout.nix     | 2 +-
 modules/programs/ssmtp.nix                     | 2 +-
 modules/services/audio/pulseaudio.nix          | 2 +-
 modules/services/monitoring/nagios/default.nix | 2 +-
 modules/services/networking/avahi-daemon.nix   | 2 +-
 modules/services/scheduling/cron.nix           | 2 +-
 modules/services/scheduling/fcron.nix          | 2 +-
 tests/remote-install-scripts/install-script.sh | 2 +-
 9 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/modules/installer/grub/grub.nix b/modules/installer/grub/grub.nix
index 1bfdda027b2..afeb947a263 100644
--- a/modules/installer/grub/grub.nix
+++ b/modules/installer/grub/grub.nix
@@ -125,7 +125,7 @@ in
     system.boot.loader.id = "grub";
     system.boot.loader.kernelFile = "vmlinuz";
     
-    environment.extraPackages = mkIf config.boot.loader.grub.enable [ pkgs.grub ];
+    environment.systemPackages = mkIf config.boot.loader.grub.enable [ pkgs.grub ];
     
     # and many other things that have to be moved inside this file.
     
diff --git a/modules/installer/tools/nixos-checkout.nix b/modules/installer/tools/nixos-checkout.nix
index 2d59f671884..313e8dea7a0 100644
--- a/modules/installer/tools/nixos-checkout.nix
+++ b/modules/installer/tools/nixos-checkout.nix
@@ -160,5 +160,5 @@ in
 {
   require = options;
 
-  environment.extraPackages = [nixosCheckout];
+  environment.systemPackages = [nixosCheckout];
 }
diff --git a/modules/programs/ssmtp.nix b/modules/programs/ssmtp.nix
index a0ecf763528..2859f70e6aa 100644
--- a/modules/programs/ssmtp.nix
+++ b/modules/programs/ssmtp.nix
@@ -87,5 +87,5 @@ mkIf cfg.directDelivery {
       }
     ];
 
-  environment.extraPackages = [pkgs.ssmtp];
+  environment.systemPackages = [pkgs.ssmtp];
 }
diff --git a/modules/services/audio/pulseaudio.nix b/modules/services/audio/pulseaudio.nix
index a63b58ca538..7b71571337f 100644
--- a/modules/services/audio/pulseaudio.nix
+++ b/modules/services/audio/pulseaudio.nix
@@ -43,7 +43,7 @@ mkIf config.services.pulseaudio.enable {
   ];
 
   environment = {
-    extraPackages = [pkgs.pulseaudio];
+    systemPackages = [pkgs.pulseaudio];
   };
 
   users = {
diff --git a/modules/services/monitoring/nagios/default.nix b/modules/services/monitoring/nagios/default.nix
index 079f5f1342e..af309f5043c 100644
--- a/modules/services/monitoring/nagios/default.nix
+++ b/modules/services/monitoring/nagios/default.nix
@@ -192,7 +192,7 @@ mkIf cfg.enable {
       }
     ];
 
-    extraPackages = [pkgs.nagios];
+    systemPackages = [pkgs.nagios];
   };
 
   users = {
diff --git a/modules/services/networking/avahi-daemon.nix b/modules/services/networking/avahi-daemon.nix
index 8437a9afc27..ff01a755f6a 100644
--- a/modules/services/networking/avahi-daemon.nix
+++ b/modules/services/networking/avahi-daemon.nix
@@ -140,7 +140,7 @@ mkIf cfg.enable {
   };
 
   environment = {
-    extraPackages = [avahi];
+    systemPackages = [avahi];
   };
 
   users = {
diff --git a/modules/services/scheduling/cron.nix b/modules/services/scheduling/cron.nix
index a3a19e03ad0..2b4dcc825c5 100644
--- a/modules/services/scheduling/cron.nix
+++ b/modules/services/scheduling/cron.nix
@@ -70,7 +70,7 @@ in
       }
     ];
 
-    extraPackages = [pkgs.cron];
+    systemPackages = [pkgs.cron];
   };
 
   services = {
diff --git a/modules/services/scheduling/fcron.nix b/modules/services/scheduling/fcron.nix
index e4b08b63282..2764f8fdad0 100644
--- a/modules/services/scheduling/fcron.nix
+++ b/modules/services/scheduling/fcron.nix
@@ -107,7 +107,7 @@ in
       }
     ];
 
-    extraPackages = ifEnabled [pkgs.fcron];
+    systemPackages = ifEnabled [pkgs.fcron];
   };
 
   services = {
diff --git a/tests/remote-install-scripts/install-script.sh b/tests/remote-install-scripts/install-script.sh
index 574cdb40a22..8bcadaaba56 100755
--- a/tests/remote-install-scripts/install-script.sh
+++ b/tests/remote-install-scripts/install-script.sh
@@ -67,7 +67,7 @@ cat > /mnt/etc/nixos/configuration.nix <<EOF
   };
 
   environment = {
-    extraPackages = [
+    systemPackages = [
       pkgs.socat (pkgs.lowPrio pkgs.nixUnstable)
     ];
     nix = pkgs.nixCustomFun (pkgs.nixUnstable.src)
-- 
GitLab


From 8d9c51a9910f7caa272d2dd95f1d764c23f7225a Mon Sep 17 00:00:00 2001
From: Rob Vermaas <rob.vermaas@gmail.com>
Date: Wed, 7 Oct 2009 20:05:08 +0000
Subject: [PATCH 1902/5331] activation script should have unique name

svn path=/nixos/trunk/; revision=17706
---
 modules/services/backup/sitecopy-backup.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/services/backup/sitecopy-backup.nix b/modules/services/backup/sitecopy-backup.nix
index 64fb546aad2..2966013e947 100644
--- a/modules/services/backup/sitecopy-backup.nix
+++ b/modules/services/backup/sitecopy-backup.nix
@@ -67,7 +67,7 @@ in
     };
 
 
-    system.activationScripts.postgresqlBackup = 
+    system.activationScripts.sitecopyBackup = 
       pkgs.stringsWithDeps.noDepEntry ''  
           mkdir -m 0700 -p ${stateDir}
           chown root ${stateDir}
-- 
GitLab


From 81e37d8475465c77c67d22306b80be779bcfb527 Mon Sep 17 00:00:00 2001
From: Rob Vermaas <rob.vermaas@gmail.com>
Date: Thu, 8 Oct 2009 09:29:16 +0000
Subject: [PATCH 1903/5331] added deps for activation scripts of backup modules

svn path=/nixos/trunk/; revision=17714
---
 modules/services/backup/mysql-backup.nix      | 4 ++--
 modules/services/backup/postgresql-backup.nix | 4 ++--
 modules/services/backup/sitecopy-backup.nix   | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/modules/services/backup/mysql-backup.nix b/modules/services/backup/mysql-backup.nix
index 51c998a9b09..adb9f1d74f8 100644
--- a/modules/services/backup/mysql-backup.nix
+++ b/modules/services/backup/mysql-backup.nix
@@ -55,10 +55,10 @@ in
       systemCronJobs = map mysqlBackupCron config.services.mysqlBackup.databases;
     };
 
-    system.activationScripts.mysqlBackup = pkgs.stringsWithDeps.noDepEntry ''
+    system.activationScripts.mysqlBackup = pkgs.stringsWithDeps.fullDepEntry ''
          mkdir -m 0700 -p ${config.services.mysqlBackup.location}
          chown mysql ${config.services.mysqlBackup.location}
-    '';
+    '' [ "stdio" "defaultPath" "systemConfig" "users" ];
   };
   
 }
diff --git a/modules/services/backup/postgresql-backup.nix b/modules/services/backup/postgresql-backup.nix
index 630b01efe0e..61bafed7bfa 100644
--- a/modules/services/backup/postgresql-backup.nix
+++ b/modules/services/backup/postgresql-backup.nix
@@ -56,10 +56,10 @@ in
       systemCronJobs = map postgresqlBackupCron config.services.postgresqlBackup.databases;
     };
 
-    system.activationScripts.postgresqlBackup = pkgs.stringsWithDeps.noDepEntry ''
+    system.activationScripts.postgresqlBackup = pkgs.stringsWithDeps.fullDepEntry ''
          mkdir -m 0700 -p ${config.services.postgresqlBackup.location}
          chown root ${config.services.postgresqlBackup.location}
-    '';
+    '' [ "stdio" "defaultPath" "systemConfig" "users" ];
   };
   
 }
diff --git a/modules/services/backup/sitecopy-backup.nix b/modules/services/backup/sitecopy-backup.nix
index 2966013e947..81f124ecc63 100644
--- a/modules/services/backup/sitecopy-backup.nix
+++ b/modules/services/backup/sitecopy-backup.nix
@@ -68,7 +68,7 @@ in
 
 
     system.activationScripts.sitecopyBackup = 
-      pkgs.stringsWithDeps.noDepEntry ''  
+      pkgs.stringsWithDeps.fullDepEntry ''  
           mkdir -m 0700 -p ${stateDir}
           chown root ${stateDir}
           touch ${stateDir}/sitecopy.secrets
@@ -99,7 +99,7 @@ in
             '' ) config.services.sitecopy.backups 
          )}
 
-      '';
+      '' [ "stdio" "defaultPath" "systemConfig" "users" ] ;
   };
   
 }
-- 
GitLab


From a39b238e69ed9a5abe1ea17c46351e1a21b616a9 Mon Sep 17 00:00:00 2001
From: Rob Vermaas <rob.vermaas@gmail.com>
Date: Thu, 8 Oct 2009 11:08:45 +0000
Subject: [PATCH 1904/5331] symlink handling mode for sitecopy backup

svn path=/nixos/trunk/; revision=17716
---
 modules/services/backup/sitecopy-backup.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/modules/services/backup/sitecopy-backup.nix b/modules/services/backup/sitecopy-backup.nix
index 81f124ecc63..310a5e78b08 100644
--- a/modules/services/backup/sitecopy-backup.nix
+++ b/modules/services/backup/sitecopy-backup.nix
@@ -41,6 +41,7 @@ in
             server = "webdata.tudelft.nl";
             protocol = "webdav";
             https = true ;
+            symlinks = "maintain" ;
           }
         ];
         default = [];
@@ -87,6 +88,7 @@ in
                 password ''${secret[2]}
                 local ${b.local}
                 remote ${b.remote}
+                symlinks ${b.symlinks}
                 ${if b.https then "http secure" else ""}
               EOF
               chmod 0600 ${stateDir}/${b.name}.conf
-- 
GitLab


From 679c3f929536c29f019dcc05f9ecef749eb16bcd Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 8 Oct 2009 13:10:08 +0000
Subject: [PATCH 1905/5331] * Fix the xfsprogs/jfsutils attribute names.  TODO:
 these shouldn't be   listed in three different places.  The set of "rescue"
 packages   should be factored out into a separate module.

svn path=/nixos/trunk/; revision=17727
---
 .../installer/cd-dvd/installation-cd-minimal-fresh-kernel.nix | 2 +-
 modules/installer/cd-dvd/installation-cd-rescue.nix           | 2 +-
 modules/installer/cd-dvd/live-dvd.nix                         | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/modules/installer/cd-dvd/installation-cd-minimal-fresh-kernel.nix b/modules/installer/cd-dvd/installation-cd-minimal-fresh-kernel.nix
index 2cde633c4be..f3f0a9fe50d 100644
--- a/modules/installer/cd-dvd/installation-cd-minimal-fresh-kernel.nix
+++ b/modules/installer/cd-dvd/installation-cd-minimal-fresh-kernel.nix
@@ -34,7 +34,7 @@ rec {
     klibc dmraid cryptsetup ccrypt 
     utillinuxCurses ddrescue testdisk
     pciutils sdparm hdparm usbutils
-    btrfsProgs xfsProgs jfsUtils jfsrec
+    btrfsProgs xfsprogs jfsutils jfsrec
     wpa_supplicant iproute 
     manpages openssh openssl ncat socat
     fuse ntfs3g gnupg gnupg2
diff --git a/modules/installer/cd-dvd/installation-cd-rescue.nix b/modules/installer/cd-dvd/installation-cd-rescue.nix
index 028c3a1f76c..9be701e1bd2 100644
--- a/modules/installer/cd-dvd/installation-cd-rescue.nix
+++ b/modules/installer/cd-dvd/installation-cd-rescue.nix
@@ -19,7 +19,7 @@
   environment.systemPackages = with pkgs; [
     utillinuxCurses ddrescue 
     pciutils sdparm hdparm hddtemp usbutils
-    btrfsProgs xfsProgs jfsUtils jfsrec
+    btrfsProgs xfsprogs jfsutils jfsrec
     wpa_supplicant iproute 
     fuse ntfs3g smbfsFuse sshfsFuse
     manpages irssi elinks mcabber mutt openssh lftp 
diff --git a/modules/installer/cd-dvd/live-dvd.nix b/modules/installer/cd-dvd/live-dvd.nix
index aa8a164c033..655376fdea4 100644
--- a/modules/installer/cd-dvd/live-dvd.nix
+++ b/modules/installer/cd-dvd/live-dvd.nix
@@ -34,8 +34,8 @@
       pkgs.ddrescue
       pkgs.cdrkit 
       pkgs.btrfsProgs
-      pkgs.xfsProgs
-      pkgs.jfsUtils
+      pkgs.xfsprogs
+      pkgs.jfsutils
       pkgs.jfsrec
       pkgs.ntfs3g 
       pkgs.subversion16
-- 
GitLab


From 32229e0c0535bd21e382b55797f4f77285ebfd03 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Fri, 9 Oct 2009 16:09:56 +0000
Subject: [PATCH 1906/5331] Make NixOS harder to kill on boot by leaving stale
 locks for mtab

svn path=/nixos/trunk/; revision=17734
---
 modules/system/boot/stage-2-init.sh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/modules/system/boot/stage-2-init.sh b/modules/system/boot/stage-2-init.sh
index 3f76b165a27..0cc09caebba 100644
--- a/modules/system/boot/stage-2-init.sh
+++ b/modules/system/boot/stage-2-init.sh
@@ -27,9 +27,10 @@ setPath "@path@"
 # Mount special file systems.
 mkdir -m 0755 -p /etc
 test -e /etc/fstab || touch /etc/fstab # to shut up mount
+[ -s /etc/mtab ] && rm /etc/mtab # while installing a symlink is created (see man mount), if it's still there for whateever reason remove it
+rm -f /etc/mtab* # not that we care about stale locks
 mkdir -m 0755 -p /proc
 mount -n -t proc none /proc
-[ -s /etc/mtab ] && rm /etc/mtab # while installing a symlink is created (see man mount), if it's still there for whateever reason remove it
 
 rm -f /etc/mtab
 cat /proc/mounts > /etc/mtab
-- 
GitLab


From 4a78ef25e73da292d060a2afde0c00980a22b2ac Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 12 Oct 2009 11:30:43 +0000
Subject: [PATCH 1907/5331] * Start mysql automatically on startup.

svn path=/nixos/trunk/; revision=17755
---
 modules/services/databases/mysql.nix | 30 ++++++++++++++--------------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/modules/services/databases/mysql.nix b/modules/services/databases/mysql.nix
index e5b8661ef99..39b1978be91 100644
--- a/modules/services/databases/mysql.nix
+++ b/modules/services/databases/mysql.nix
@@ -41,7 +41,7 @@ in
       };
 
       dataDir = mkOption {
-        default = "/var/mysql";
+        default = "/var/mysql"; # !!! should be /var/db/mysql
         description = "Location where MySQL stores its table files";
       };
 
@@ -71,16 +71,16 @@ in
 
     environment.systemPackages = [mysql];
 
-    jobs = singleton {
-      name = "mysql";
-      
-      job = ''
-        description "MySQL server"
+    jobs = singleton
+      { name = "mysql";
+        description = "MySQL server";
 
-        stop on shutdown
+        startOn = "filesystems";
+        stopOn = "shutdown";
 
-        start script
-            if ! test -e ${cfg.dataDir}; then
+        preStart =
+          ''
+            if ! test -e ${cfg.dataDir}/mysql; then
                 mkdir -m 0700 -p ${cfg.dataDir}
                 chown -R ${cfg.user} ${cfg.dataDir}
                 ${mysql}/bin/mysql_install_db ${mysqldOptions}
@@ -88,17 +88,17 @@ in
 
             mkdir -m 0700 -p ${cfg.pidDir}
             chown -R ${cfg.user} ${cfg.pidDir}
-        end script
+          '';
 
-        respawn ${mysql}/bin/mysqld ${mysqldOptions}
+        exec = "${mysql}/bin/mysqld ${mysqldOptions}";
 
-        stop script
+        postStop =
+          ''
             pid=$(cat ${pidFile})
             kill "$pid"
             ${mysql}/bin/mysql_waitpid "$pid" 1000
-        end script
-      '';
-    };
+          '';
+      };
 
   };
 
-- 
GitLab


From e91d882a946fc736f62235296e77c139cee7d9b3 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 12 Oct 2009 16:36:19 +0000
Subject: [PATCH 1908/5331] * Converted modules that were still using the old
 (concrete syntax)   style of declaring Upstart jobs.  While at it, converted
 them to the   current NixOS module style and improved some option
 descriptions.   Hopefully I didn't break too much :-)

svn path=/nixos/trunk/; revision=17761
---
 modules/services/audio/pulseaudio.nix         | 117 ++--
 modules/services/logging/klogd.nix            |  32 +-
 modules/services/mail/dovecot.nix             |  28 +-
 modules/services/mail/postfix.nix             | 521 +++++++++---------
 modules/services/misc/autofs.nix              | 164 +++---
 modules/services/misc/disnix.nix              |  89 ++-
 modules/services/misc/gpsd.nix                | 151 +++--
 modules/services/misc/nixos-manual.nix        |  30 +-
 modules/services/misc/synergy.nix             | 162 +++---
 .../services/monitoring/nagios/default.nix    | 328 ++++++-----
 modules/services/monitoring/zabbix-agent.nix  | 153 +++--
 modules/services/monitoring/zabbix-server.nix | 141 +++--
 .../network-filesystems/nfs-kernel.nix        | 263 +++++----
 .../services/network-filesystems/samba.nix    | 334 +++++------
 modules/services/networking/avahi-daemon.nix  | 236 ++++----
 modules/services/networking/bind.nix          | 212 ++++---
 modules/services/networking/bitlbee.nix       | 132 ++---
 modules/services/networking/dhcpd.nix         | 208 ++++---
 modules/services/networking/ejabberd.nix      | 138 +++--
 modules/services/networking/gnunet.nix        | 336 +++++------
 modules/services/networking/gw6c.nix          | 252 ++++-----
 modules/services/networking/ircd-hybrid.nix   | 215 ++++----
 modules/services/networking/openfire.nix      | 100 ++--
 modules/services/networking/openvpn.nix       | 188 +++----
 modules/services/networking/portmap.nix       | 121 ++--
 modules/services/networking/ssh/lshd.nix      | 284 +++++-----
 modules/services/networking/vsftpd.nix        | 237 ++++----
 modules/services/printing/cupsd.nix           | 264 ++++-----
 modules/services/scheduling/cron.nix          | 137 +++--
 modules/services/scheduling/fcron.nix         | 203 ++++---
 modules/services/ttys/gpm.nix                 |  80 ++-
 modules/services/web-servers/jboss.nix        | 133 +++--
 modules/services/web-servers/tomcat.nix       | 204 +++----
 modules/services/x11/xfs.nix                  |  74 +--
 .../system/upstart-events/ctrl-alt-delete.nix |  26 +-
 modules/system/upstart-events/halt.nix        |  31 +-
 .../upstart-events/maintenance-shell.nix      |  36 +-
 modules/system/upstart/upstart.nix            |   2 +-
 modules/tasks/filesystems.nix                 | 252 ++++-----
 modules/tasks/lvm.nix                         |  37 +-
 modules/tasks/network-interfaces.nix          |   1 -
 modules/tasks/swraid.nix                      |  26 +-
 42 files changed, 3228 insertions(+), 3450 deletions(-)

diff --git a/modules/services/audio/pulseaudio.nix b/modules/services/audio/pulseaudio.nix
index 7b71571337f..d322c6b51ea 100644
--- a/modules/services/audio/pulseaudio.nix
+++ b/modules/services/audio/pulseaudio.nix
@@ -1,89 +1,88 @@
-{pkgs, config, ...}:
+{ config, pkgs, ... }:
+
+with pkgs.lib;
 
-###### interface
 let
-  inherit (pkgs.lib) mkOption mkIf;
 
   uid = config.ids.uids.pulseaudio;
   gid = config.ids.gids.pulseaudio;
 
+in
+
+{
+
+  ###### interface
+
   options = {
-    services = {
-      pulseaudio = {
-        enable = mkOption {
-          default = false;
-          description = ''
-            Whether to enable the PulseAudio system-wide audio server.
-            Note that the documentation recommends running PulseAudio
-            daemons per-user rather than system-wide on desktop machines.
-          '';
-        };
-
-        logLevel = mkOption {
-          default = "notice";
-          example = "debug";
-          description = ''
-            A string denoting the log level: one of
-            <literal>error</literal>, <literal>warn</literal>,
-            <literal>notice</literal>, <literal>info</literal>,
-            or <literal>debug</literal>.
-          '';
-        };
+  
+    services.pulseaudio = {
+    
+      enable = mkOption {
+        default = false;
+        description = ''
+          Whether to enable the PulseAudio system-wide audio server.
+          Note that the documentation recommends running PulseAudio
+          daemons per-user rather than system-wide on desktop machines.
+        '';
       };
+
+      logLevel = mkOption {
+        default = "notice";
+        example = "debug";
+        description = ''
+          A string denoting the log level: one of
+          <literal>error</literal>, <literal>warn</literal>,
+          <literal>notice</literal>, <literal>info</literal>,
+          or <literal>debug</literal>.
+        '';
+      };
+
     };
+    
   };
-in
-
-###### implementation
+  
 
+  ###### implementation
 
-mkIf config.services.pulseaudio.enable {
-  require = [
-    options
-  ];
+  config = mkIf config.services.pulseaudio.enable {
 
-  environment = {
-    systemPackages = [pkgs.pulseaudio];
-  };
+    environment.systemPackages = [ pkgs.pulseaudio ];
 
-  users = {
-    extraUsers = [
+    users.extraUsers = singleton
       { name = "pulse";
         # For some reason, PulseAudio wants UID == GID.
         uid = assert uid == gid; uid;
         group = "pulse";
         description = "PulseAudio system-wide daemon";
         home = "/var/run/pulse";
-      }
-    ];
+      };
 
-    extraGroups = [
+    users.extraGroups = singleton
       { name = "pulse";
         inherit gid;
-      }
-    ];
-  };
+      };
 
-  services = {
-    extraJobs = [{
-      name = "pulseaudio";
+    jobAttrs.pulseaudio =
+      { description = "PulseAudio system-wide server";
 
-      job = ''
-        description "PulseAudio system-wide server"
+        startOn = "startup";
+        stopOn = "shutdown";
 
-        start on startup
-        stop on shutdown
+        preStart =
+          ''
+            test -d /var/run/pulse ||			\
+            ( mkdir -p --mode 755 /var/run/pulse &&	\
+              chown pulse:pulse /var/run/pulse )
+          '';
 
-        start script
-          test -d /var/run/pulse ||			\
-          ( mkdir -p --mode 755 /var/run/pulse &&	\
-            chown pulse:pulse /var/run/pulse )
-        end script
+        exec =
+          ''
+            ${pkgs.pulseaudio}/bin/pulseaudio           \
+              --system --daemonize                      \
+              --log-level="${config.services.pulseaudio.logLevel}"
+          '';
+      };
 
-        respawn ${pkgs.pulseaudio}/bin/pulseaudio               \
-          --system --daemonize                                  \
-          --log-level="${config.services.pulseaudio.logLevel}"
-      '';
-    }];
   };
+  
 }
diff --git a/modules/services/logging/klogd.nix b/modules/services/logging/klogd.nix
index 59ab51fea92..f8c26e0f166 100644
--- a/modules/services/logging/klogd.nix
+++ b/modules/services/logging/klogd.nix
@@ -1,8 +1,8 @@
-{pkgs, config, ...}:
+{ config, pkgs, ... }:
 
 ###### implementation
+
 let
-  inherit (pkgs.lib);
 
   klogdCmd = "${pkgs.sysklogd}/sbin/klogd -c 1 -2 -k $(dirname $(readlink -f /var/run/booted-system/kernel))/System.map";
 
@@ -10,24 +10,20 @@ in
 
 {
 
-  services = {
-    extraJobs = [{
-      name = "klogd";
-      
-      job = ''
-        description "Kernel log daemon"
-      
-        start on syslogd
-        stop on shutdown
-
-        start script
+  jobAttrs.klogd =
+    { description = "Kernel log daemon";
+
+      startOn = "syslogd";
+      stopOn = "shutdown";
+
+      preStart =
+        ''
           # !!! this hangs for some reason (it blocks reading from
           # /proc/kmsg).
           #${klogdCmd} -o
-        end script
+        '';
 
-        respawn ${klogdCmd} -n
-      '';
-    }];
-  };
+      exec = "${klogdCmd} -n";
+    };
+    
 }
diff --git a/modules/services/mail/dovecot.nix b/modules/services/mail/dovecot.nix
index 79442f959c6..950c748ff8c 100644
--- a/modules/services/mail/dovecot.nix
+++ b/modules/services/mail/dovecot.nix
@@ -1,8 +1,9 @@
-{pkgs, config, ...}:
+{ config, pkgs, ... }:
 
 with pkgs.lib;
 
-let 
+let
+
   startingDependency = if config.services.gw6c.enable then "gw6c" else "network-interfaces";
 
   cfg = config.services.dovecot;
@@ -112,23 +113,18 @@ in
         gid = config.ids.gids.dovecot;
       };
 
-    services.extraJobs = singleton
-      { name = "dovecot";
-
-        job =
-          ''
-            description "Dovecot IMAP/POP3 server"
-
-            start on ${startingDependency}/started
-            stop on never
+    jobAttrs.dovecot =
+      { description = "Dovecot IMAP/POP3 server";
 
-            start script
-              ${pkgs.coreutils}/bin/mkdir -p /var/run/dovecot /var/run/dovecot/login 
-              ${pkgs.coreutils}/bin/chown -R ${cfg.user}.${cfg.group} /var/run/dovecot
-            end script 
+        startOn = "${startingDependency}/started";
 
-            respawn ${pkgs.dovecot}/sbin/dovecot -F -c ${confFile}
+        preStart =
+          ''
+            ${pkgs.coreutils}/bin/mkdir -p /var/run/dovecot /var/run/dovecot/login 
+            ${pkgs.coreutils}/bin/chown -R ${cfg.user}.${cfg.group} /var/run/dovecot
           '';
+
+        exec = "${pkgs.dovecot}/sbin/dovecot -F -c ${confFile}";
       };
       
   };
diff --git a/modules/services/mail/postfix.nix b/modules/services/mail/postfix.nix
index 9e1ec488ae2..ec218608980 100644
--- a/modules/services/mail/postfix.nix
+++ b/modules/services/mail/postfix.nix
@@ -1,155 +1,9 @@
-{pkgs, config, ...}:
+{ config, pkgs, ... }:
 
-###### interface
-let
-  inherit (pkgs.lib) mkOption mkIf;
-
-  options = {
-    services = {
-      postfix = {
-        enable = mkOption {
-          default = false;
-          description ="
-            Whether to run the Postfix mail server.
-          ";
-        };
-        user = mkOption {
-          default = "postfix";
-          description = "
-            How to call postfix user (must be used only for postfix).
-          ";
-        };
-        group = mkOption {
-          default = "postfix";
-          description = "
-            How to call postfix group (must be used only for postfix).
-          ";
-        };
-        setgidGroup = mkOption {
-          default = "postdrop";
-          description = "
-            How to call postfix setgid group (for postdrop). Should 
-            be uniquely used group.
-          ";
-        };
-        networks = mkOption {
-          default = null;
-          example = ["192.168.0.1/24"];
-          description = "
-            Net masks for trusted - allowed to relay mail to third parties - 
-            hosts. Leave empty to use mynetworks_style configuration or use 
-            default (localhost-only).
-          ";
-        };
-        networksStyle = mkOption {
-          default = "";
-          description = "
-            Name of standard way of trusted network specification to use,
-            leave blank if you specify it explicitly or if you want to use 
-            default (localhost-only).
-          ";
-        };
-        hostname = mkOption {
-          default = "";
-          description ="
-            Hostname to use. Leave blank to use just the hostname of machine.
-            It should be FQDN.
-          ";
-        };
-        domain = mkOption {
-          default = "";
-          description ="
-            Domain to use. Leave blank to use hostname minus first component.
-          ";
-        };
-        origin = mkOption {
-          default = "";
-          description ="
-            Origin to use in outgoing e-mail. Leave blank to use hostname.
-          ";
-        };
-        destination = mkOption {
-          default = null;
-          example = ["localhost"];
-          description = "
-            Full (!) list of domains we deliver locally. Leave blank for 
-            acceptable Postfix default.
-          ";
-        };
-        relayDomains = mkOption {
-          default = null;
-          example = ["localdomain"];
-          description = "
-            List of domains we agree to relay to. Default is the same as 
-            destination.
-          ";
-        };
-        relayHost = mkOption {
-          default = "";
-          description = "
-            Mail relay for outbound mail.
-          ";
-        };
-        lookupMX = mkOption {
-          default = false;
-          description = "
-            Whether relay specified is just domain whose MX must be used.
-          ";
-        };
-        postmasterAlias = mkOption {
-          default = "root";
-          description = "
-            Who should receive postmaster e-mail.
-          ";
-        };
-        rootAlias = mkOption {
-          default = "";
-          description = "
-            Who should receive root e-mail. Blank for no redirection.
-          ";
-        };
-        extraAliases = mkOption {
-          default = "";
-          description = "
-            Additional entries to put verbatim into aliases file.
-          ";
-        };
-
-        sslCert = mkOption {
-          default = "";
-          description = "
-            SSL certificate to use.
-          ";
-        };
-        sslCACert = mkOption {
-          default = "";
-          description = "
-            SSL certificate of CA.
-          ";
-        };
-        sslKey = mkOption {
-          default = "";
-          description ="
-            SSL key to use.
-          ";
-        };
-
-        recipientDelimiter = mkOption {
-          default = "";
-          example = "+";
-          description = "
-            Delimiter for address extension: so mail to user+test can be handled by ~user/.forward+test
-          ";
-        };
-
-      };
-    };
-  };
-in
-
-###### implementation
+with pkgs.lib;
 
 let
+
   startingDependency = if config.services.gw6c.enable then "gw6c" else "network-interfaces";
 
   cfg = config.services.postfix;
@@ -157,94 +11,86 @@ let
   group = cfg.group;
   setgidGroup = cfg.setgidGroup;
 
-  optionalString = pkgs.lib.optionalString;
-  concatStringsSep = pkgs.lib.concatStringsSep;
   mainCf = 
-  ''
-    queue_directory = /var/postfix/queue
-    command_directory = ${pkgs.postfix}/sbin
-    daemon_directory = ${pkgs.postfix}/libexec/postfix
-
-    mail_owner = ${user}
-    default_privs = nobody
-
-  ''
-  + optionalString (config.services.gw6c.enable || config.networking.nativeIPv6) (''
-    inet_protocols = all
-  '')
-  +
-  (if cfg.networks!=null then
-    (''
-      mynetworks = ${concatStringsSep ", " cfg.networks}
-    '') 
-  else if (cfg.networksStyle != "") then
-    (''
-      mynetworks_style = ${cfg.networksStyle} 
-    '')
-  else
-    # Postfix default is subnet, but let's play safe
-    (''
-      mynetworks_style = host
+    ''
+      queue_directory = /var/postfix/queue
+      command_directory = ${pkgs.postfix}/sbin
+      daemon_directory = ${pkgs.postfix}/libexec/postfix
+
+      mail_owner = ${user}
+      default_privs = nobody
+
+    ''
+    + optionalString (config.services.gw6c.enable || config.networking.nativeIPv6) (''
+      inet_protocols = all
     '')
-  )
-  + optionalString (cfg.hostname != "") (''
-    myhostname = ${cfg.hostname}
-  '')
-  + optionalString (cfg.domain != "") (''
-    mydomain = ${cfg.domain}
-  '')
-  + optionalString (cfg.origin != "") (''
-    myorigin = ${cfg.origin}
-  '')
-  + optionalString (cfg.destination != null) (''
-    mydestination = ${concatStringsSep ", " cfg.destination}
-  '')
-  + optionalString (cfg.relayDomains != null) (''
-    relay_domains = ${concatStringsSep ", " cfg.relayDomains}
-  '')
-  + ''
-    local_recipient_maps = 
-  ''
-  + (''
-    relayhost = ${if cfg.lookupMX || cfg.relayHost == "" then 
-        cfg.relayHost 
-      else 
-        "[" + cfg.relayHost + "]"}
-  '')
-  + (''
-    alias_maps = hash:/var/postfix/conf/aliases
-
-    mail_spool_directory = /var/spool/mail/
-
-    setgid_group = ${setgidGroup}
-  '')
-  + optionalString (cfg.sslCert != "") (''
-
-    smtp_tls_CAfile = ${cfg.sslCACert}
-    smtp_tls_cert_file = ${cfg.sslCert}
-    smtp_tls_key_file = ${cfg.sslKey}
-
-    smtp_use_tls = yes
-
-    smtpd_tls_CAfile = ${cfg.sslCACert}
-    smtpd_tls_cert_file = ${cfg.sslCert}
-    smtpd_tls_key_file = ${cfg.sslKey}
-
-    smtpd_use_tls = yes 
-
-    recipientDelimiter = ${cfg.recipientDelimiter}
-
-  '')
-  ;
+    + (if cfg.networks != null then
+        ''
+          mynetworks = ${concatStringsSep ", " cfg.networks}
+        ''
+      else if cfg.networksStyle != "" then
+        ''
+          mynetworks_style = ${cfg.networksStyle} 
+        ''
+      else
+        # Postfix default is subnet, but let's play safe
+        ''
+          mynetworks_style = host
+        '')
+    + optionalString (cfg.hostname != "") ''
+      myhostname = ${cfg.hostname}
+    ''
+    + optionalString (cfg.domain != "") ''
+      mydomain = ${cfg.domain}
+    ''
+    + optionalString (cfg.origin != "") ''
+      myorigin = ${cfg.origin}
+    ''
+    + optionalString (cfg.destination != null) ''
+      mydestination = ${concatStringsSep ", " cfg.destination}
+    ''
+    + optionalString (cfg.relayDomains != null) ''
+      relay_domains = ${concatStringsSep ", " cfg.relayDomains}
+    ''
+    + ''
+      local_recipient_maps =
+      
+      relayhost = ${if cfg.lookupMX || cfg.relayHost == "" then 
+          cfg.relayHost 
+        else 
+          "[" + cfg.relayHost + "]"}
+          
+      alias_maps = hash:/var/postfix/conf/aliases
+
+      mail_spool_directory = /var/spool/mail/
+
+      setgid_group = ${setgidGroup}
+    ''
+    + optionalString (cfg.sslCert != "") ''
+
+      smtp_tls_CAfile = ${cfg.sslCACert}
+      smtp_tls_cert_file = ${cfg.sslCert}
+      smtp_tls_key_file = ${cfg.sslKey}
+
+      smtp_use_tls = yes
+
+      smtpd_tls_CAfile = ${cfg.sslCACert}
+      smtpd_tls_cert_file = ${cfg.sslCert}
+      smtpd_tls_key_file = ${cfg.sslKey}
+
+      smtpd_use_tls = yes 
+
+      recipientDelimiter = ${cfg.recipientDelimiter}
+
+    '';
 
   aliases = 
-    (optionalString (cfg.postmasterAlias != "") (''
+    optionalString (cfg.postmasterAlias != "") ''
       postmaster: ${cfg.postmasterAlias}
-    ''))
-    +
-    (optionalString (cfg.rootAlias != "") (''
+    ''
+    + optionalString (cfg.rootAlias != "") ''
       root: ${cfg.rootAlias}
-    ''))
+    ''
     + cfg.extraAliases
   ;
 
@@ -253,54 +99,194 @@ let
  
 in
 
-mkIf config.services.postfix.enable {
-  require = [
-    options
-  ];
+{
+
+  ###### interface
+
+  options = {
+  
+    services.postfix = {
+    
+      enable = mkOption {
+        default = false;
+        description = "Whether to run the Postfix mail server.";
+      };
+      
+      user = mkOption {
+        default = "postfix";
+        description = "What to call the Postfix user (must be used only for postfix).";
+      };
+      
+      group = mkOption {
+        default = "postfix";
+        description = "What to call the Postfix group (must be used only for postfix).";
+      };
+      
+      setgidGroup = mkOption {
+        default = "postdrop";
+        description = "
+          How to call postfix setgid group (for postdrop). Should 
+          be uniquely used group.
+        ";
+      };
+      
+      networks = mkOption {
+        default = null;
+        example = ["192.168.0.1/24"];
+        description = "
+          Net masks for trusted - allowed to relay mail to third parties - 
+          hosts. Leave empty to use mynetworks_style configuration or use 
+          default (localhost-only).
+        ";
+      };
+      
+      networksStyle = mkOption {
+        default = "";
+        description = "
+          Name of standard way of trusted network specification to use,
+          leave blank if you specify it explicitly or if you want to use 
+          default (localhost-only).
+        ";
+      };
+      
+      hostname = mkOption {
+        default = "";
+        description ="
+          Hostname to use. Leave blank to use just the hostname of machine.
+          It should be FQDN.
+        ";
+      };
+      
+      domain = mkOption {
+        default = "";
+        description ="
+          Domain to use. Leave blank to use hostname minus first component.
+        ";
+      };
+      
+      origin = mkOption {
+        default = "";
+        description ="
+          Origin to use in outgoing e-mail. Leave blank to use hostname.
+        ";
+      };
+      
+      destination = mkOption {
+        default = null;
+        example = ["localhost"];
+        description = "
+          Full (!) list of domains we deliver locally. Leave blank for 
+          acceptable Postfix default.
+        ";
+      };
+      
+      relayDomains = mkOption {
+        default = null;
+        example = ["localdomain"];
+        description = "
+          List of domains we agree to relay to. Default is the same as 
+          destination.
+        ";
+      };
+      
+      relayHost = mkOption {
+        default = "";
+        description = "
+          Mail relay for outbound mail.
+        ";
+      };
+      
+      lookupMX = mkOption {
+        default = false;
+        description = "
+          Whether relay specified is just domain whose MX must be used.
+        ";
+      };
+      
+      postmasterAlias = mkOption {
+        default = "root";
+        description = "Who should receive postmaster e-mail.";
+      };
+      
+      rootAlias = mkOption {
+        default = "";
+        description = "
+          Who should receive root e-mail. Blank for no redirection.
+        ";
+      };
+      
+      extraAliases = mkOption {
+        default = "";
+        description = "
+          Additional entries to put verbatim into aliases file.
+        ";
+      };
+
+      sslCert = mkOption {
+        default = "";
+        description = "SSL certificate to use.";
+      };
+      
+      sslCACert = mkOption {
+        default = "";
+        description = "SSL certificate of CA.";
+      };
+      
+      sslKey = mkOption {
+        default = "";
+        description = "SSL key to use.";
+      };
+
+      recipientDelimiter = mkOption {
+        default = "";
+        example = "+";
+        description = "
+          Delimiter for address extension: so mail to user+test can be handled by ~user/.forward+test
+        ";
+      };
+
+    };
 
-  environment = {
-    etc = [{
-      source = "/var/postfix/conf";
-      target = "postfix";
-    }];
   };
 
-  users = {
-    extraUsers = [
+
+  ###### implementation
+
+  config = mkIf config.services.postfix.enable {
+
+    environment.etc = singleton
+      { source = "/var/postfix/conf";
+        target = "postfix";
+      };
+
+    users.extraUsers = singleton
       { name = user;
         description = "Postfix mail server user";
         uid = config.ids.uids.postfix;
         group = group;
-      }
-    ];
-
-    extraGroups = [
-      { name = group; 
-        gid = config.ids.gids.postfix;
-      }
-      { name = setgidGroup; 
-        gid = config.ids.gids.postdrop;
-      }
-    ];
-  };
-
-  services = {
-    extraJobs = [{
-      name = "postfix";
+      };
 
+    users.extraGroups =
+      [ { name = group; 
+          gid = config.ids.gids.postfix;
+        }
+        { name = setgidGroup; 
+          gid = config.ids.gids.postdrop;
+        }
+      ];
 
+    jobAttrs.postfix =
       # I copy _lots_ of shipped configuration filed 
       # that can be left as is. I am afraid the exact
       # will list slightly change in next Postfix 
       # release, so listing them all one-by-one in an 
       # accurate way is unlikely to be better.
-      job = ''
-        description "Postfix mail server job"
+      { description = "Postfix mail server";
 
-        start on ${startingDependency}/started
-        stop on never
+        startOn = "${startingDependency}/started";
 
-        script 
+        script =
+          ''
             if ! [ -d /var/spool/postfix ]; then
               ${pkgs.coreutils}/bin/mkdir -p /var/spool/mail /var/postfix/conf /var/postfix/queue
             fi
@@ -318,10 +304,11 @@ mkIf config.services.postfix.enable {
 
             ${pkgs.postfix}/sbin/postalias -c /var/postfix/conf /var/postfix/conf/aliases
             
-            ${pkgs.postfix}/sbin/postfix -c /var/postfix/conf start 
-        end script
-      '';
+            ${pkgs.postfix}/sbin/postfix -c /var/postfix/conf start
+          ''; # */
+
+      };
 
-    }];
   };
+
 }
diff --git a/modules/services/misc/autofs.nix b/modules/services/misc/autofs.nix
index 1e506836a3e..757d38a1280 100644
--- a/modules/services/misc/autofs.nix
+++ b/modules/services/misc/autofs.nix
@@ -1,107 +1,99 @@
-{pkgs, config, ...}:
+{ config, pkgs, ... }:
+
+with pkgs.lib;
 
-###### interface
 let
-  inherit (pkgs.lib) mkOption mkIf;
+
+  cfg = config.services.autofs;
+
+in
+
+{
+
+  ###### interface
 
   options = {
-    services = {
-
-      autofs = {
-        enable = mkOption {
-          default = false;
-          description = "
-            automatically mount and unmount filesystems
-          ";
-        };
-
-        autoMaster = mkOption {
-          example = ''
-            autoMaster = let
-              mapConf = pkgs.writeText "auto" '''
-               kernel    -ro,soft,intr       ftp.kernel.org:/pub/linux
-               boot      -fstype=ext2        :/dev/hda1
-               windoze   -fstype=smbfs       ://windoze/c
-               removable -fstype=ext2        :/dev/hdd
-               cd        -fstype=iso9660,ro  :/dev/hdc
-               floppy    -fstype=auto        :/dev/fd0
-               server    -rw,hard,intr       / -ro myserver.me.org:/ \
-                                             /usr myserver.me.org:/usr \
-                                             /home myserver.me.org:/home
-              ''';
-            in '''
-              /auto file:''${mapConf}
-            '''
-          '';
-          description = "
-            file contents of /etc/auto.master. See man auto.master
-            see 
-            man auto.master and man 5 autofs
-          ";
-        };
-
-        timeout = mkOption {
-          default = 600;
-          description = "Set the global minimum timeout, in seconds, until directories are unmounted";
-        };
-
-        debug = mkOption {
-          default = false;
-          description = "pass -d to automount and write log to /var/log/autofs";
-        };
+  
+    services.autofs = {
+    
+      enable = mkOption {
+        default = false;
+        description = "
+          automatically mount and unmount filesystems
+        ";
       };
-    };
-  };
 
-###### implementation
+      autoMaster = mkOption {
+        example = ''
+          autoMaster = let
+            mapConf = pkgs.writeText "auto" '''
+             kernel    -ro,soft,intr       ftp.kernel.org:/pub/linux
+             boot      -fstype=ext2        :/dev/hda1
+             windoze   -fstype=smbfs       ://windoze/c
+             removable -fstype=ext2        :/dev/hdd
+             cd        -fstype=iso9660,ro  :/dev/hdc
+             floppy    -fstype=auto        :/dev/fd0
+             server    -rw,hard,intr       / -ro myserver.me.org:/ \
+                                           /usr myserver.me.org:/usr \
+                                           /home myserver.me.org:/home
+            ''';
+          in '''
+            /auto file:''${mapConf}
+          '''
+        '';
+        description = "
+          file contents of /etc/auto.master. See man auto.master
+          see 
+          man auto.master and man 5 autofs
+        ";
+      };
 
-  inherit (pkgs) lib writeTextopenssh autofs5;
+      timeout = mkOption {
+        default = 600;
+        description = "Set the global minimum timeout, in seconds, until directories are unmounted";
+      };
 
-  cfg = (config.services.autofs);
+      debug = mkOption {
+        default = false;
+        description = "pass -d to automount and write log to /var/log/autofs";
+      };
+      
+    };
 
-  modprobe = config.system.sbin.modprobe;
+  };
 
-in
 
-mkIf cfg.enable {
+  ###### implementation
 
-  require = [
-    options
-  ];
+  config = mkIf cfg.enable {
 
-  environment = {
-    etc =
-      [ {
-        target = "auto.master";
+    environment.etc = singleton
+      { target = "auto.master";
         source = pkgs.writeText "auto.master" cfg.autoMaster;
-      }];
-  };
-
-  services = {
-    extraJobs = [
-    {
-      name = "autofs";
+      };
 
-      # kernel module autofs  supports kernel protocol v3
-      # kernel module autofs4 supports kernel protocol v3, v4, v5
-      job = ''
-        description "automatically mount filesystems"
+    jobAttrs.autofs =
+      { description = "Filesystem automounter";
 
-        start on network-interfaces/started
-        stop on network-interfaces/stop
+        startOn = "network-interfaces/started";
+        stopOn = "network-interfaces/stop";
 
-        PATH=${pkgs.nfsUtils}/sbin:${modprobe}/sbin
+        environment =
+          { PATH = "${pkgs.nfsUtils}/sbin:${config.system.sbin.modprobe}/sbin";
+          };
 
-        start script
-          modprobe autofs4 || true
-        end script
+        preStart =
+          ''
+            modprobe autofs4 || true
+          '';
 
-        script
-          ${if cfg.debug then "exec &> /var/log/autofs" else ""}
-          ${pkgs.autofs5}/sbin/automount -f -t ${builtins.toString cfg.timeout} ${if cfg.debug then "-d" else ""} "${pkgs.writeText "auto.master" cfg.autoMaster}"
-        end script
-      '';
-    }
-    ];
+        script =
+          ''
+            ${if cfg.debug then "exec &> /var/log/autofs" else ""}
+            ${pkgs.autofs5}/sbin/automount -f -t ${builtins.toString cfg.timeout} ${if cfg.debug then "-d" else ""} "${pkgs.writeText "auto.master" cfg.autoMaster}"
+          '';
+      };
+          
   };
+  
 }
diff --git a/modules/services/misc/disnix.nix b/modules/services/misc/disnix.nix
index a4568ec78a8..bae74826da1 100644
--- a/modules/services/misc/disnix.nix
+++ b/modules/services/misc/disnix.nix
@@ -1,62 +1,57 @@
 # Disnix server
-{config, pkgs, ...}:
+{ config, pkgs, ... }:
+
+with pkgs.lib;
 
-###### interface
 let
-  inherit (pkgs.lib) mkOption;
+
+  cfg = config.services.disnix;
+
+in
+
+{
+
+  ###### interface
   
   options = {
-    services = {
-      disnix = {
-        enable = mkOption {
-          default = false;
-          description = "Whether to enable Disnix";
-        };        
-      };
+  
+    services.disnix = {
+    
+      enable = mkOption {
+        default = false;
+        description = "Whether to enable Disnix";
+      };        
+
     };
+    
   };
-in
+  
 
-###### implementation
-let
-  cfg = config.services.disnix;
-  inherit (pkgs.lib) mkIf;
+  ###### implementation
 
-  job = {
-    name = "disnix";
-        
-    job = ''
-      description "Disnix server"
+  config = mkIf cfg.enable {
 
-      start on dbus
-      stop on shutdown  
-    
-      script
-        export ACTIVATION_SCRIPTS=${pkgs.disnix_activation_scripts}/libexec/disnix/activation-scripts
-        export PATH=${pkgs.nixUnstable}/bin
-        export HOME=/root
-	
-        ${pkgs.disnix}/bin/disnix-service
-      end script
-    '';
-  };
-in
+    environment.systemPackages = [ pkgs.disnix ];
 
-mkIf cfg.enable {
-  require = [
-    #../upstart-jobs/default.nix
-    #../upstart-jobs/dbus.nix # services.dbus.*
-    options
-  ];
-  
-  environment.systemPackages = [ pkgs.disnix ];
+    services.dbus.enable = true;
+    services.dbus.packages = [ pkgs.disnix ];
 
-  services = {
-    extraJobs = [job];
+    jobAttrs.disnix =
+      { description = "Disnix server";
+
+        startOn = "dbus";
+        stopOn = "shutdown";
+
+        script =
+          ''    
+            export ACTIVATION_SCRIPTS=${pkgs.disnix_activation_scripts}/libexec/disnix/activation-scripts
+            export PATH=${pkgs.nixUnstable}/bin
+            export HOME=/root
+	
+            ${pkgs.disnix}/bin/disnix-service
+          '';
+      };
 
-    dbus = {
-      enable = true;
-      packages = [ pkgs.disnix ];
-    };
   };
+
 }
diff --git a/modules/services/misc/gpsd.nix b/modules/services/misc/gpsd.nix
index 724abbea6cb..b4cc58c3094 100644
--- a/modules/services/misc/gpsd.nix
+++ b/modules/services/misc/gpsd.nix
@@ -1,108 +1,105 @@
-{pkgs, config, ...}:
+{ config, pkgs, ... }:
+
+with pkgs.lib;
 
-###### interface
 let
-  inherit (pkgs.lib) mkOption mkIf;
 
   uid = config.ids.uids.gpsd;
   gid = config.ids.gids.gpsd;
+  cfg = config.services.gpsd;
+  
+in
+
+{
+
+  ###### interface
 
   options = {
-    services = {
-      gpsd = {
+  
+    services.gpsd = {
 
-        enable = mkOption {
-          default = false;
-          description = ''
-            Whether to enable `gpsd', a GPS service daemon.
-          '';
-        };
-
-        device = mkOption {
-          default = "/dev/ttyUSB0";
-          description = ''
-            A device may be a local serial device for GPS input, or a URL of the form:
-                 <literal>[{dgpsip|ntrip}://][user:passwd@]host[:port][/stream]</literal>
-            in which case it specifies an input source for DGPS or ntrip data.
-          '';
-        };
-
-        readonly = mkOption {
-          default = true;
-          description = ''
-            Whether to enable the broken-device-safety, otherwise
-            known as read-only mode.  Some popular bluetooth and USB
-            receivers lock up or become totally inaccessible when
-            probed or reconfigured.  This switch prevents gpsd from
-            writing to a receiver.  This means that gpsd cannot
-            configure the receiver for optimal performance, but it
-            also means that gpsd cannot break the receiver.  A better
-            solution would be for Bluetooth to not be so fragile.  A
-            platform independent method to identify
-            serial-over-Bluetooth devices would also be nice.
-          '';
-        };
+      enable = mkOption {
+        default = false;
+        description = ''
+          Whether to enable `gpsd', a GPS service daemon.
+        '';
+      };
 
-        port = mkOption {
-          default = 2947;
-          description = ''
-            The port where to listen for TCP connections.
-          '';
-        };
+      device = mkOption {
+        default = "/dev/ttyUSB0";
+        description = ''
+          A device may be a local serial device for GPS input, or a URL of the form:
+               <literal>[{dgpsip|ntrip}://][user:passwd@]host[:port][/stream]</literal>
+          in which case it specifies an input source for DGPS or ntrip data.
+        '';
+      };
 
-        debugLevel = mkOption {
-          default = 0;
-          description = ''
-            The debugging level.
-          '';
-        };
+      readonly = mkOption {
+        default = true;
+        description = ''
+          Whether to enable the broken-device-safety, otherwise
+          known as read-only mode.  Some popular bluetooth and USB
+          receivers lock up or become totally inaccessible when
+          probed or reconfigured.  This switch prevents gpsd from
+          writing to a receiver.  This means that gpsd cannot
+          configure the receiver for optimal performance, but it
+          also means that gpsd cannot break the receiver.  A better
+          solution would be for Bluetooth to not be so fragile.  A
+          platform independent method to identify
+          serial-over-Bluetooth devices would also be nice.
+        '';
+      };
 
+      port = mkOption {
+        default = 2947;
+        description = ''
+          The port where to listen for TCP connections.
+        '';
       };
+
+      debugLevel = mkOption {
+        default = 0;
+        description = ''
+          The debugging level.
+        '';
+      };
+
     };
+
   };
 
-in
 
-###### implementation
-mkIf config.services.gpsd.enable {
-  require = [
-    options
-  ];
+  ###### implementation
+  
+  config = mkIf cfg.enable {
   
-  users = {
-    extraUsers = [
+    users.extraUsers = singleton
       { name = "gpsd";
         inherit uid;
         description = "gpsd daemon user";
         home = "/var/empty";
-      }
-    ];
+      };
 
-    extraGroups = [
+    users.extraGroups = singleton
       { name = "gpsd";
         inherit gid;
-      }
-    ];
-  };
-
-  services =
-    let cfg = config.services.gpsd; in {
-      extraJobs = [{
-        name = "gpsd";
+      };
 
-        job =
-          let gpsd = pkgs.gpsd;
-          in ''
-            description "GPSD daemon"
+    jobAttrs.gpsd =
+      { description = "GPSD daemon";
 
-            start on network-interfaces/started
-            stop on network-interfaces/stop
+        startOn = "network-interfaces/started";
+        stopOn = "network-interfaces/stop";
 
-            respawn ${gpsd}/sbin/gpsd -D "${toString cfg.debugLevel}"   \
-                       -S "${toString cfg.port}"                        \
-                       ${if cfg.readonly then "-b" else ""}             \
+        exec =
+          ''
+            respawn ${pkgs.gpsd}/sbin/gpsd -D "${toString cfg.debugLevel}"   \
+                       -S "${toString cfg.port}"                             \
+                       ${if cfg.readonly then "-b" else ""}                  \
                        "${cfg.device}"
           '';
-        }];
       };
+
+  };
+  
 }
diff --git a/modules/services/misc/nixos-manual.nix b/modules/services/misc/nixos-manual.nix
index 961dbe2800f..78c120872c8 100644
--- a/modules/services/misc/nixos-manual.nix
+++ b/modules/services/misc/nixos-manual.nix
@@ -3,11 +3,11 @@
 # of the virtual consoles.  The latter is useful for the installation
 # CD.
 
-{pkgs, config, options, ...}:
+{ config, pkgs, options, ... }:
 
-let
+with pkgs.lib;
 
-  inherit (pkgs.lib) mkOption mkIf types;
+let
 
   cfg = config.services.nixosManual;
 
@@ -72,18 +72,22 @@ in
 
     boot.extraTTYs = mkIf cfg.showManual [cfg.ttyNumber];
 
-    services.extraJobs = mkIf cfg.showManual (pkgs.lib.singleton
-      { name = "nixos-manual";
+    jobAttrs = mkIf cfg.showManual
+      { nixosManual = 
+        { name = "nixos-manual";
+
+          description = "NixOS manual";
 
-        job = ''
-          description "NixOS manual"
+          startOn = "udev";
+          stopOn = "shutdown";
 
-          start on udev
-          stop on shutdown
-          respawn ${cfg.browser} ${manual}/share/doc/nixos/manual.html \
-            < /dev/tty${toString cfg.ttyNumber} > /dev/tty${toString cfg.ttyNumber} 2>&1
-        '';
-      });
+          exec =
+            ''
+              ${cfg.browser} ${manual}/share/doc/nixos/manual.html \
+                < /dev/tty${toString cfg.ttyNumber} > /dev/tty${toString cfg.ttyNumber} 2>&1
+            '';
+        };
+      };
 
     services.ttyBackgrounds.specificThemes = mkIf cfg.showManual 
       [ { tty = cfg.ttyNumber;
diff --git a/modules/services/misc/synergy.nix b/modules/services/misc/synergy.nix
index 3a1ce34d070..a7df38f239d 100644
--- a/modules/services/misc/synergy.nix
+++ b/modules/services/misc/synergy.nix
@@ -1,106 +1,108 @@
+{ config, pkgs, ... }:
 
-{pkgs, config, ...}:
+with pkgs.lib;
 
-###### interface
 let
-  inherit (pkgs.lib) mkOption mkIf;
+
+  cfgC = config.services.synergy.client;
+  cfgS = config.services.synergy.server;
+
+in
+
+{
+  ###### interface
 
   options = {
-    services = {
-      synergy = {
-
-        client = {
-          enable = mkOption {
-            default = false;
-            description = "
-              Whether to enable the synergy client (receive keyboard and mouse events from a synergy server)
+  
+    services.synergy = {
+
+      # !!! All these option descriptions needs to be cleaned up.
+
+      client = {
+        enable = mkOption {
+          default = false;
+          description = "
+            Whether to enable the synergy client (receive keyboard and mouse events from a synergy server)
+          ";
+        };
+        screenName = mkOption {
+          default = "";
+          description = " 
+            use screen-name instead the hostname to identify
+            ourselfs to the server.
             ";
-          };
-          screenName = mkOption {
-            default = "";
-            description = " 
-              use screen-name instead the hostname to identify
-              ourselfs to the server.
-              ";
-          };
         };
+      };
 
-        server = {
-          enable = mkOption {
-            default = false;
-            description = "
-              Whether to enable the synergy server (send keyboard and mouse events)
-            ";
-          };
-          configFile = mkOption {
-            default = "/etc/synergy-server.conf";
-            description = "
-              The synergy server configuration file. open upstart-jobs/synergy.nix to see an example
+      server = {
+        enable = mkOption {
+          default = false;
+          description = "
+            Whether to enable the synergy server (send keyboard and mouse events)
+          ";
+        };
+        configFile = mkOption {
+          default = "/etc/synergy-server.conf";
+          description = "
+            The synergy server configuration file. open upstart-jobs/synergy.nix to see an example
+          ";
+        };
+        screenName = mkOption {
+          default = "";
+          description = " 
+            use screen-name instead the hostname to identify
+            this screen in the configuration.
             ";
-          };
-          screenName = mkOption {
-            default = "";
-            description = " 
-              use screen-name instead the hostname to identify
-              this screen in the configuration.
-              ";
-          };
-          address = mkOption {
-            default = "";
-            description = "listen for clients on the given address";
-          };
+        };
+        address = mkOption {
+          default = "";
+          description = "listen for clients on the given address";
         };
       };
     };
-  };
-
-###### implementation
-
-  inherit (pkgs.lib) optional;
-
-  cfgC = (config.services.synergy.client);
-  cfgS = (config.services.synergy.server);
-
-  clientJob = {
-    name = "synergy-client";
-
-    job = ''
-      description "synergy client"
 
-      start on started network-interfaces
-      stop on stopping network-interfaces
-
-      respawn ${pkgs.synergy}/bin/synergyc ${if cfgS.screenName == "" then "" else "-n ${cfgS.screenName}" }
-    '';
   };
 
-  serverJob = {
-    name = "synergy-server";
 
-    job = ''
-      description "synergy server"
+  ###### implementation
 
-      start on started network-interfaces
-      stop on stopping network-interfaces
+  config = {
 
-      respawn ${pkgs.synergy}/bin/synergys -c ${cfgS.configFile} \
-       -f ${if cfgS.address == "" then "" else "-a ${cfgS.address}"} \
-       ${if cfgS.screenName == "" then "" else "-n ${cfgS.screenName}" }
-    '';
-  };
+    jobAttrs =
+    
+      optionalAttrs cfgC.enable
+        { synergyClient = 
+          { name = "synergy-client";
 
-in
+            description = "Synergy client";
 
+            startOn = "network-interfaces/started";
+            stopOn = "network-interfaces/stopped";
 
-{
-  require = [
-    options
-  ];
+            exec = "${pkgs.synergy}/bin/synergyc ${if cfgS.screenName == "" then "" else "-n ${cfgS.screenName}" }";
+          };
+        }
+        
+      // optionalAttrs cfgS.enable
+        { synergyServer = 
+          { name = "synergy-server";
+
+            description = "Synergy server";
+
+            startOn = "network-interfaces/started";
+            stopOn = "network-interfaces/stopped";
+
+            exec =
+              ''
+                respawn ${pkgs.synergy}/bin/synergys -c ${cfgS.configFile} \
+                  -f ${if cfgS.address == "" then "" else "-a ${cfgS.address}"} \
+                  ${if cfgS.screenName == "" then "" else "-n ${cfgS.screenName}" }
+              '';
+          };
+        };
 
-  services = {
-    extraJobs = (optional cfgS.enable serverJob) 
-             ++ (optional cfgC.enable clientJob);
   };
+
 }
 
 /* SYNERGY SERVER example configuration file
diff --git a/modules/services/monitoring/nagios/default.nix b/modules/services/monitoring/nagios/default.nix
index af309f5043c..dc060e675da 100644
--- a/modules/services/monitoring/nagios/default.nix
+++ b/modules/services/monitoring/nagios/default.nix
@@ -1,65 +1,11 @@
 # Nagios system/network monitoring daemon.
-{config, pkgs, ...}:
+{ config, pkgs, ... }:
 
-###### interface
-let
-  inherit (pkgs.lib) mkOption;
-
-  options = {
-    services = {
-      nagios = {
-
-        enable = mkOption {
-          default = false;
-          description = "
-            Whether to use <link
-            xlink:href='http://www.nagios.org/'>Nagios</link> to monitor
-            your system or network.
-          ";
-        };
-
-        objectDefs = mkOption {
-          description = "
-            A list of Nagios object configuration files that must define
-            the hosts, host groups, services and contacts for the
-            network that you want Nagios to monitor.
-          ";
-        };
-
-        plugins = mkOption {
-          default = [pkgs.nagiosPluginsOfficial pkgs.ssmtp];
-          description = "
-            Packages to be added to the Nagios <envar>PATH</envar>.
-            Typically used to add plugins, but can be anything.
-          ";
-        };
-
-        enableWebInterface = mkOption {
-          default = false;
-          description = "
-            Whether to enable the Nagios web interface.  You should also
-            enable Apache (<option>services.httpd.enable</option>).
-          ";
-        };
-
-        urlPath = mkOption {
-          default = "/nagios";
-          description = "
-            The URL path under which the Nagios web interface appears.
-            That is, you can access the Nagios web interface through
-            <literal>http://<replaceable>server</replaceable>/<replaceable>urlPath</replaceable></literal>.
-          ";
-        };
-
-      };
-    };
-  };
-in
+with pkgs.lib;
 
-###### implementation
 let
+
   cfg = config.services.nagios;
-  inherit (pkgs.lib) mkIf mkThenElse;
 
   nagiosUser = "nagios";
   nagiosGroup = "nogroup";
@@ -67,146 +13,184 @@ let
   nagiosState = "/var/lib/nagios";
   nagiosLogDir = "/var/log/nagios";
 
-  nagiosObjectDefs = [
-    ./timeperiods.cfg
-    ./host-templates.cfg
-    ./service-templates.cfg
-    ./commands.cfg
-  ] ++ cfg.objectDefs;
+  nagiosObjectDefs =
+    [ ./timeperiods.cfg
+      ./host-templates.cfg
+      ./service-templates.cfg
+      ./commands.cfg
+    ] ++ cfg.objectDefs;
 
   nagiosObjectDefsDir = pkgs.runCommand "nagios-objects" {inherit nagiosObjectDefs;}
     "ensureDir $out; ln -s $nagiosObjectDefs $out/";
 
-  nagiosCfgFile = pkgs.writeText "nagios.cfg" "
-  
-    # Paths for state and logs.
-    log_file=${nagiosLogDir}/current
-    log_archive_path=${nagiosLogDir}/archive
-    status_file=${nagiosState}/status.dat
-    object_cache_file=${nagiosState}/objects.cache
-    comment_file=${nagiosState}/comment.dat
-    downtime_file=${nagiosState}/downtime.dat
-    temp_file=${nagiosState}/nagios.tmp
-    lock_file=/var/run/nagios.lock # Not used I think.
-    state_retention_file=${nagiosState}/retention.dat
-
-    # Configuration files.
-    #resource_file=resource.cfg
-    cfg_dir=${nagiosObjectDefsDir}
-
-    # Uid/gid that the daemon runs under.
-    nagios_user=${nagiosUser}
-    nagios_group=${nagiosGroup}
-
-    # Misc. options.
-    illegal_macro_output_chars=`~$&|'\"<>
-    retain_state_information=1
+  nagiosCfgFile = pkgs.writeText "nagios.cfg"
+    ''
+      # Paths for state and logs.
+      log_file=${nagiosLogDir}/current
+      log_archive_path=${nagiosLogDir}/archive
+      status_file=${nagiosState}/status.dat
+      object_cache_file=${nagiosState}/objects.cache
+      comment_file=${nagiosState}/comment.dat
+      downtime_file=${nagiosState}/downtime.dat
+      temp_file=${nagiosState}/nagios.tmp
+      lock_file=/var/run/nagios.lock # Not used I think.
+      state_retention_file=${nagiosState}/retention.dat
+
+      # Configuration files.
+      #resource_file=resource.cfg
+      cfg_dir=${nagiosObjectDefsDir}
+
+      # Uid/gid that the daemon runs under.
+      nagios_user=${nagiosUser}
+      nagios_group=${nagiosGroup}
+
+      # Misc. options.
+      illegal_macro_output_chars=`~$&|'"<>
+      retain_state_information=1
+    ''; # "
     
-  ";
-
   # Plain configuration for the Nagios web-interface with no
   # authentication.
-  nagiosCGICfgFile = pkgs.writeText "nagios.cgi.conf" "
-    main_config_file=${nagiosCfgFile}
-    use_authentication=0
-    url_html_path=/nagios
-  ";
+  nagiosCGICfgFile = pkgs.writeText "nagios.cgi.conf"
+    ''
+      main_config_file=${nagiosCfgFile}
+      use_authentication=0
+      url_html_path=/nagios
+    '';
 
   urlPath = cfg.urlPath;
 
-  extraHttpdConfig = "
-    ScriptAlias ${urlPath}/cgi-bin ${pkgs.nagios}/sbin
-
-    <Directory \"${pkgs.nagios}/sbin\">
-      Options ExecCGI
-      AllowOverride None
-      Order allow,deny
-      Allow from all
-      SetEnv NAGIOS_CGI_CONFIG ${nagiosCGICfgFile}
-    </Directory>
-
-    Alias ${urlPath} ${pkgs.nagios}/share
-
-    <Directory \"${pkgs.nagios}/share\">
-      Options None
-      AllowOverride None
-      Order allow,deny
-      Allow from all
-    </Directory>
-  ";
-
-  user = {
-    name = nagiosUser;
-    uid = config.ids.uids.nagios;
-    description = "Nagios monitoring daemon";
-    home = nagiosState;
-  };
+  extraHttpdConfig =
+    ''
+      ScriptAlias ${urlPath}/cgi-bin ${pkgs.nagios}/sbin
+
+      <Directory "${pkgs.nagios}/sbin">
+        Options ExecCGI
+        AllowOverride None
+        Order allow,deny
+        Allow from all
+        SetEnv NAGIOS_CGI_CONFIG ${nagiosCGICfgFile}
+      </Directory>
+
+      Alias ${urlPath} ${pkgs.nagios}/share
+
+      <Directory "${pkgs.nagios}/share">
+        Options None
+        AllowOverride None
+        Order allow,deny
+        Allow from all
+      </Directory>
+    '';
 
-  job = {
-    name = "nagios";
-    
-    # Run `nagios -v' to check the validity of the configuration file so
-    # that a nixos-rebuild fails *before* we kill the running Nagios
-    # daemon.
-    buildHook = "${pkgs.nagios}/bin/nagios -v ${nagiosCfgFile}";
-
-    job = "
-      description \"Nagios monitoring daemon\"
-
-      start on network-interfaces/started
-      stop on network-interfaces/stop
-
-      start script
-        mkdir -m 0755 -p ${nagiosState} ${nagiosLogDir}
-        chown ${nagiosUser} ${nagiosState} ${nagiosLogDir}
-      end script
-
-      respawn
-
-      script
-        for i in ${toString config.services.nagios.plugins}; do
-          export PATH=$i/bin:$i/sbin:$i/libexec:$PATH
-        done
-        exec ${pkgs.nagios}/bin/nagios ${nagiosCfgFile}
-      end script
-    ";
-  };
 in
+  
+{
+  ###### interface
+
+  options = {
+  
+    services.nagios = {
+
+      enable = mkOption {
+        default = false;
+        description = "
+          Whether to use <link
+          xlink:href='http://www.nagios.org/'>Nagios</link> to monitor
+          your system or network.
+        ";
+      };
+
+      objectDefs = mkOption {
+        description = "
+          A list of Nagios object configuration files that must define
+          the hosts, host groups, services and contacts for the
+          network that you want Nagios to monitor.
+        ";
+      };
+
+      plugins = mkOption {
+        default = [pkgs.nagiosPluginsOfficial pkgs.ssmtp];
+        description = "
+          Packages to be added to the Nagios <envar>PATH</envar>.
+          Typically used to add plugins, but can be anything.
+        ";
+      };
+
+      enableWebInterface = mkOption {
+        default = false;
+        description = "
+          Whether to enable the Nagios web interface.  You should also
+          enable Apache (<option>services.httpd.enable</option>).
+        ";
+      };
+
+      urlPath = mkOption {
+        default = "/nagios";
+        description = "
+          The URL path under which the Nagios web interface appears.
+          That is, you can access the Nagios web interface through
+          <literal>http://<replaceable>server</replaceable>/<replaceable>urlPath</replaceable></literal>.
+        ";
+      };
+
+    };
+
+  };
+
+
+  ###### implementation
+
+  config = mkIf cfg.enable {
+  
+    users.extraUsers = singleton
+      { name = nagiosUser;
+        uid = config.ids.uids.nagios;
+        description = "Nagios monitoring daemon";
+        home = nagiosState;
+      };
 
-mkIf cfg.enable {
-  require = [
-    # ../../upstart-jobs/default.nix # config.services.extraJobs
-    # ../../system/user.nix # users = { .. }
-    # ? # config.environment.etc
-    # ? # config.environment.extraPackages
-    # ../../upstart-jobs/httpd.nix # config.services.httpd
-    options
-  ];
-
-  environment = {
     # This isn't needed, it's just so that the user can type "nagiostats
     # -c /etc/nagios.cfg".
-    etc = [
+    environment.etc = singleton
       { source = nagiosCfgFile;
         target = "nagios.cfg";
-      }
-    ];
+      };
 
-    systemPackages = [pkgs.nagios];
-  };
+    environment.systemPackages = [ pkgs.nagios ];
 
-  users = {
-    extraUsers = [user];
-  };
+    jobAttrs.nagios =
+      { # Run `nagios -v' to check the validity of the configuration file so
+        # that a nixos-rebuild fails *before* we kill the running Nagios
+        # daemon.
+        buildHook = "${pkgs.nagios}/bin/nagios -v ${nagiosCfgFile}";
 
-  services = {
-    extraJobs = [job];
+        description = "Nagios monitoring daemon";
 
-    httpd = mkIf cfg.enableWebInterface {
+        startOn = "network-interfaces/started";
+        stopOn = "network-interfaces/stop";
+
+        preStart =
+          ''
+            mkdir -m 0755 -p ${nagiosState} ${nagiosLogDir}
+            chown ${nagiosUser} ${nagiosState} ${nagiosLogDir}
+          '';
+
+        script =
+          ''
+            for i in ${toString config.services.nagios.plugins}; do
+              export PATH=$i/bin:$i/sbin:$i/libexec:$PATH
+            done
+            exec ${pkgs.nagios}/bin/nagios ${nagiosCfgFile}
+          '';
+      };
+
+    services.httpd = mkIf cfg.enableWebInterface {
       extraConfig = mkThenElse {
         thenPart = extraHttpdConfig;
         elsePart = "";
       };
     };
+    
   };
+
 }
diff --git a/modules/services/monitoring/zabbix-agent.nix b/modules/services/monitoring/zabbix-agent.nix
index 70e6a73277b..f3559ef8ba4 100644
--- a/modules/services/monitoring/zabbix-agent.nix
+++ b/modules/services/monitoring/zabbix-agent.nix
@@ -1,35 +1,8 @@
 # Zabbix agent daemon.
-{config, pkgs, ...}:
+{ config, pkgs, ... }:
 
-###### interface
-let
-  inherit (pkgs.lib) mkOption;
-
-  options = {
-    services = {
-      zabbixAgent = {
-
-        enable = mkOption {
-          default = false;
-          description = "
-            Whether to run the Zabbix monitoring agent on this machine.
-            It will send monitoring data to a Zabbix server.
-          ";
-        };
-
-        server = mkOption {
-          default = "127.0.0.1";
-          description = ''
-            The IP address or hostname of the Zabbix server to connect to.
-          '';
-        };
-
-      };
-    };
-  };
-in
+with pkgs.lib;
 
-###### implementation
 let
 
   cfg = config.services.zabbixAgent;
@@ -40,69 +13,87 @@ let
 
   pidFile = "${stateDir}/zabbix_agentd.pid";
 
-  configFile = pkgs.writeText "zabbix_agentd.conf" ''
-    Server = ${cfg.server}
+  configFile = pkgs.writeText "zabbix_agentd.conf"
+    ''
+      Server = ${cfg.server}
 
-    LogFile = ${logDir}/zabbix_agentd
+      LogFile = ${logDir}/zabbix_agentd
+  
+      PidFile = ${pidFile}
+
+      StartAgents = 5
+    '';
+
+in
+  
+{
+
+  ###### interface
+
+  options = {
   
-    PidFile = ${pidFile}
+    services.zabbixAgent = {
+
+      enable = mkOption {
+        default = false;
+        description = ''
+          Whether to run the Zabbix monitoring agent on this machine.
+          It will send monitoring data to a Zabbix server.
+        '';
+      };
 
-    StartAgents = 5
-  '';
+      server = mkOption {
+        default = "127.0.0.1";
+        description = ''
+          The IP address or hostname of the Zabbix server to connect to.
+        '';
+      };
+
+    };
 
-  user = {
-    name = "zabbix";
-    uid = config.ids.uids.zabbix;
-    description = "Zabbix daemon user";
   };
+  
+
+  ###### implementation
+
+  config = mkIf cfg.enable {
+
+    users.extraUsers = singleton
+      { name = "zabbix";
+        uid = config.ids.uids.zabbix;
+        description = "Zabbix daemon user";
+      };
+
+    jobAttrs.zabbix_agent =
+      { #name = "zabbix-agent"; !!! mkIf bug
 
-  job = {
-    name = "zabbix-agent";
-    
-    job = ''
-      start on network-interfaces/started
-      stop on network-interfaces/stop
+        description = "Zabbix agent daemon";
 
-      description "Zabbix agent daemon"
+        startOn = "network-interfaces/started";
+        stopOn = "network-interfaces/stop";
 
-      start script
-        mkdir -m 0755 -p ${stateDir} ${logDir}
-        chown zabbix ${stateDir} ${logDir}
+        preStart =
+          ''
+            mkdir -m 0755 -p ${stateDir} ${logDir}
+            chown zabbix ${stateDir} ${logDir}
         
-        export PATH=${pkgs.nettools}/bin:$PATH
-        ${pkgs.zabbixAgent}/sbin/zabbix_agentd --config ${configFile}
-      end script
-
-      respawn sleep 100000
-      
-      stop script
-        # !!! this seems to leave processes behind.
-        #pid=$(cat ${pidFile})
-        #if test -n "$pid"; then
-        #  kill $pid 
-        #fi
-
-        # So instead kill the agent in a brutal fashion.
-        while ${pkgs.procps}/bin/pkill -u zabbix zabbix_agentd; do true; done
-      end script
-    '';
-  };
+            export PATH=${pkgs.nettools}/bin:$PATH
+            ${pkgs.zabbixAgent}/sbin/zabbix_agentd --config ${configFile}
+          '';
 
-  ifEnable = pkgs.lib.ifEnable cfg.enable;
-in
+        postStop =
+          ''      
+            # !!! this seems to leave processes behind.
+            #pid=$(cat ${pidFile})
+            #if test -n "$pid"; then
+            #  kill $pid 
+            #fi
 
-{
-  require = [
-    # ../upstart-jobs/default.nix
-    # ../system/user.nix # users = { .. }
-    options
-  ];
-
-  services = {
-    extraJobs = ifEnable [job];
-  };
+            # So instead kill the agent in a brutal fashion.
+            while ${pkgs.procps}/bin/pkill -u zabbix zabbix_agentd; do true; done
+          '';
+      };
 
-  users = {
-    extraUsers = ifEnable [user];
   };
+
 }
diff --git a/modules/services/monitoring/zabbix-server.nix b/modules/services/monitoring/zabbix-server.nix
index 198b040f10e..c41fc93ac1d 100644
--- a/modules/services/monitoring/zabbix-server.nix
+++ b/modules/services/monitoring/zabbix-server.nix
@@ -1,25 +1,8 @@
 # Zabbix server daemon.
-{config, pkgs, ...}:
+{ config, pkgs, ... }:
 
-###### interface
-let
-  inherit (pkgs.lib) mkOption;
+with pkgs.lib;
 
-  options = {
-    services = {
-      zabbixServer = {
-        enable = mkOption {
-          default = false;
-          description = "
-            Whether to run the Zabbix server on this machine.
-          ";
-        };
-      };
-    };
-  };
-in
-
-###### implementation
 let
 
   stateDir = "/var/run/zabbix";
@@ -30,72 +13,76 @@ let
 
   pidFile = "${stateDir}/zabbix_server.pid";
 
-  configFile = pkgs.writeText "zabbix_server.conf" ''
-    LogFile = ${logDir}/zabbix_server
+  configFile = pkgs.writeText "zabbix_server.conf"
+    ''
+      LogFile = ${logDir}/zabbix_server
   
-    PidFile = ${pidFile}
+      PidFile = ${pidFile}
 
-    DBName = zabbix
+      DBName = zabbix
 
-    DBUser = zabbix
-  '';
-
-  user = {
-    name = "zabbix";
-    uid = config.ids.uids.zabbix;
-    description = "Zabbix daemon user";
-  };
-
-  job = {
-    name = "zabbix-server";
-
-    job = ''
-      description "Zabbix server daemon"
-
-      start on postgresql/started
-      stop on shutdown
-
-      start script
-        mkdir -m 0755 -p ${stateDir} ${logDir} ${libDir}
-        chown zabbix ${stateDir} ${logDir} ${libDir}
-
-        if ! test -e "${libDir}/db-created"; then
-            ${pkgs.postgresql}/bin/createuser --no-superuser --no-createdb --no-createrole zabbix || true
-            ${pkgs.postgresql}/bin/createdb --owner zabbix zabbix || true
-            cat ${pkgs.zabbixServer}/share/zabbix/db/schema/postgresql.sql | ${pkgs.su}/bin/su -s "$SHELL" zabbix -c 'psql zabbix'
-            cat ${pkgs.zabbixServer}/share/zabbix/db/data/data.sql | ${pkgs.su}/bin/su -s "$SHELL" zabbix -c 'psql zabbix'
-            cat ${pkgs.zabbixServer}/share/zabbix/db/data/images_pgsql.sql | ${pkgs.su}/bin/su -s "$SHELL" zabbix -c 'psql zabbix'
-            touch "${libDir}/db-created"
-        fi
-        
-        export PATH=${pkgs.nettools}/bin:$PATH
-        ${pkgs.zabbixServer}/sbin/zabbix_server --config ${configFile}
-      end script
-
-      respawn sleep 100000
-      
-      stop script
-        while ${pkgs.procps}/bin/pkill -u zabbix zabbix_server; do true; done
-      end script
+      DBUser = zabbix
     '';
-    
-  };
 
-  ifEnable = pkgs.lib.ifEnable config.services.zabbixServer.enable;
 in
-
+  
 {
-  require = [
-    # ../upstart-jobs/default.nix
-    # ../system/user.nix # users = { .. }
-    options
-  ];
-
-  services = {
-    extraJobs = ifEnable [job];
+
+  ###### interface
+
+  options = {
+  
+    services.zabbixServer.enable = mkOption {
+      default = false;
+      description = ''
+        Whether to run the Zabbix server on this machine.
+      '';
+    };
+
   };
 
-  users = {
-    extraUsers = ifEnable [user];
+  ###### implementation
+
+  config = mkIf config.services.zabbixServer.enable {
+
+    users.extraUsers = singleton
+      { name = "zabbix";
+        uid = config.ids.uids.zabbix;
+        description = "Zabbix daemon user";
+      };
+
+    jobAttrs.zabbix_server =
+      { #name = "zabbix-server"; !!! mkIf bug
+
+        description = "Zabbix server daemon";
+
+        startOn = "postgresql";
+        stopOn = "shutdown";
+
+        preStart =
+          ''
+            mkdir -m 0755 -p ${stateDir} ${logDir} ${libDir}
+            chown zabbix ${stateDir} ${logDir} ${libDir}
+
+            if ! test -e "${libDir}/db-created"; then
+                ${pkgs.postgresql}/bin/createuser --no-superuser --no-createdb --no-createrole zabbix || true
+                ${pkgs.postgresql}/bin/createdb --owner zabbix zabbix || true
+                cat ${pkgs.zabbixServer}/share/zabbix/db/schema/postgresql.sql | ${pkgs.su}/bin/su -s "$SHELL" zabbix -c 'psql zabbix'
+                cat ${pkgs.zabbixServer}/share/zabbix/db/data/data.sql | ${pkgs.su}/bin/su -s "$SHELL" zabbix -c 'psql zabbix'
+                cat ${pkgs.zabbixServer}/share/zabbix/db/data/images_pgsql.sql | ${pkgs.su}/bin/su -s "$SHELL" zabbix -c 'psql zabbix'
+                touch "${libDir}/db-created"
+            fi
+
+            export PATH=${pkgs.nettools}/bin:$PATH
+            ${pkgs.zabbixServer}/sbin/zabbix_server --config ${configFile}
+          '';
+
+        postStop =
+          ''
+            while ${pkgs.procps}/bin/pkill -u zabbix zabbix_server; do true; done
+          '';
+      };
+      
   };
+
 }
diff --git a/modules/services/network-filesystems/nfs-kernel.nix b/modules/services/network-filesystems/nfs-kernel.nix
index d2667e1cd18..624e224fb36 100644
--- a/modules/services/network-filesystems/nfs-kernel.nix
+++ b/modules/services/network-filesystems/nfs-kernel.nix
@@ -1,154 +1,149 @@
+{ config, pkgs, ... }:
 
-{pkgs, config, ...}:
+with pkgs.lib;
 
-###### interface
 let
-  inherit (pkgs.lib) mkOption mkIf;
+
+  inherit (pkgs) writeText openssh;
+
+  cfg = config.services.nfsKernel;
+
+  exports =
+    if builtins.pathExists cfg.exports
+    then cfg.exports
+    else pkgs.writeText "exports" cfg.exports;
+
+in
+
+{
+
+  ###### interface
 
   options = {
-    services = {
-      nfsKernel = {
-
-        enable = mkOption {
-          default = false;
-          description = "
-            wether to use the kernel nfs functionality to export filesystems.
-            You should be aware about existing security issues.
-            requires portmap!
-          ";
-        };
-
-        exports = mkOption {
-          check = v: v != "/etc/exports"; # this won't work
-          description = "
-            the file listing the directories to be exported.
-            install nfsUtils and run man exports to learn about its format.
-            The exports setting can either be a file path or the file contents.
-            Don't use /etc/exports. This won't work as nix will overwrite it.
-          ";
-        };
-
-        hostName = mkOption {
-          default = null;
-          description = "
-             specify a particular hostname (or address) that NFS requests will be accepted on.
-             Default: all.
-             See man rpc.nfsd (-H option)
-          ";
-        };
-        nproc = mkOption {
-          default = 8;
-          description = "
-            specify  the  number  of NFS server threads. (-> man rpc.nfsd). Defaults to recommended value 8
-          ";
-        };
-	
-	createMountPoints = mkOption {
-	  default = false;
-	  description = "Whether to create the mount points in the exports file at startup time.";
-	};
+  
+    services.nfsKernel = {
+
+      enable = mkOption {
+        default = false;
+        description = ''
+          Whether to enable the kernel's NFS server.
+        '';
+      };
+
+      # !!! Why is this a file?  Why not a list of export entries?
+      exports = mkOption {
+        check = v: v != "/etc/exports"; # this won't work
+        description = ''
+          The file listing the directories to be exported.  See
+          <citerefentry><refentrytitle>exports</refentrytitle>
+          <manvolnum>5</manvolnum></citerefentry> for the format.
+        '';
       };
+
+      hostName = mkOption {
+        default = null;
+        description = ''
+          Hostname or address on which NFS requests will be accepted.
+          Default is all.  See the <option>-H</option> option in
+          <citerefentry><refentrytitle>nfsd</refentrytitle>
+          <manvolnum>8</manvolnum></citerefentry>.
+        '';
+      };
+      
+      nproc = mkOption {
+        default = 8;
+        description = ''
+          Number of NFS server threads.  Defaults to the recommended value of 8.
+        '';
+      };
+
+      createMountPoints = mkOption {
+        default = false;
+        description = "Whether to create the mount points in the exports file at startup time.";
+      };
+      
     };
+
   };
 
-###### implementation
 
-  inherit (pkgs) writeText openssh;
+  ###### implementation
 
-  cfg = (config.services.nfsKernel);
+  config = mkIf config.services.nfsKernel.enable {
 
-  modprobe = config.system.sbin.modprobe;
+    environment.etc = singleton
+      { source = exports;
+        target = "exports";
+      };
 
-  exports = if builtins.pathExists cfg.exports
-    then cfg.exports else pkgs.writeText "exports" cfg.exports;
+    jobAttrs.nfs_kernel_exports =
+      { name = "nfs-kernel-exports";
+      
+        description = "Kernel NFS server";
+
+        startOn = "network-interfaces/started";
+        stopOn = "network-interfaces/stop";
+
+        preStart =
+          ''
+            export PATH=${pkgs.nfsUtils}/sbin:$PATH
+            mkdir -p /var/lib/nfs
+            ${config.system.sbin.modprobe}/sbin/modprobe nfsd || true
+
+            ${optionalString cfg.createMountPoints
+              ''
+                # create export directories:
+                # skip comments, take first col which may either be a quoted
+                # "foo bar" or just foo (-> man export)
+                sed '/^#.*/d;s/^"\([^"]*\)".*/\1/;t;s/[ ].*//' ${exports} \
+                | xargs -d '\n' mkdir -p
+	      ''
+            }
+	    	  
+            # exports file is ${exports}
+            # keep this comment so that this job is restarted whenever exports changes!
+            exportfs -ra
+          '';
+      };
 
-in
+    jobAttrs.nfs_kernel_nfsd =
+      { name = "nfs-kernel-nfsd";
 
+        description = "Kernel NFS server";
 
-mkIf config.services.nfsKernel.enable {
-  require = [
-    options
-  ];
-
-  environment.etc = [
-    { source = exports;
-      target = "exports"; }
-  ];
-
-  services = {
-    extraJobs = [
-    {
-      name = "nfs-kernel-exports";
-
-      job = ''
-        description "export filesystems using kernel nfs"
-
-        start on network-interfaces/started
-        stop on network-interfaces/stop
-
-        start script
-	  export PATH=${pkgs.nfsUtils}/sbin:$PATH
-	  mkdir -p /var/lib/nfs
-          ${modprobe}/sbin/modprobe nfsd || true
-	  
-	  ${if cfg.createMountPoints == true then
-	    ''
-              # create export directories:
-              # skip comments, take first col which may either be a quoted
-              # "foo bar" or just foo (-> man export)
-              sed '/^#.*/d;s/^"\([^"]*\)".*/\1/;t;s/[ ].*//' ${exports} \
-              | xargs -d '\n' mkdir -p
-	    ''
-	    else ""}
-	    	  
-          # exports file is ${exports}
-          # keep this comment so that this job is restarted whenever exports changes!
-          exportfs -ra
-        end script
-
-        respawn sleep 1000000
-      '';
-    }
-    {
-      name = "nfs-kernel-rpc-nfsd";
-
-      job = ''
-        description "export filesystems using kernel nfs"
-
-        start on nfs-kernel-exports/started
-        stop on nfs-kernel-exports/stop
-
-        respawn ${pkgs.nfsUtils}/sbin/rpc.nfsd ${if cfg.hostName != null then "-H ${cfg.hostName}" else ""} ${builtins.toString cfg.nproc}
-      '';
-    }
-    {
-      name = "nfs-kernel-mountd";
-
-      job = ''
-        description "export filesystems using kernel nfs"
-
-        start on nfs-kernel-rpc-nfsd/started
-        stop on nfs-kernel-exports/stop
-
-        respawn ${pkgs.nfsUtils}/sbin/rpc.mountd -F -f ${exports}
-      '';
-    }
-    {
-      name = "nfs-kernel-statd";
+        startOn = "nfs-kernel-exports/started";
+        stopOn = "nfs-kernel-exports/stop";
+
+        exec = "${pkgs.nfsUtils}/sbin/rpc.nfsd ${if cfg.hostName != null then "-H ${cfg.hostName}" else ""} ${builtins.toString cfg.nproc}";
+      };
+
+    jobAttrs.nfs_kernel_mountd =
+      { name = "nfs-kernel-mountd";
+
+        description = "Kernel NFS server - mount daemon";
+
+        startOn = "nfs-kernel-nfsd/started";
+        stopOn = "nfs-kernel-exports/stop";
+
+        exec = "${pkgs.nfsUtils}/sbin/rpc.mountd -F -f ${exports}";
+      };
+
+    jobAttrs.nfs_kernel_statd =
+      { name = "nfs-kernel-statd";
       
-      job = ''
-        description "NSM (Network Status Monitor) of the RPC protocol"
+        description = "Kernel NFS server - Network Status Monitor";
+      
+        startOn = "nfs-kernel-nfsd/started";
+	stopOn = "nfs-kernel-exports/stop";
+
+        preStart =
+          ''	
+            mkdir -p /var/lib/nfs
+          '';
+
+        exec = "${pkgs.nfsUtils}/sbin/rpc.statd -F";
+      };
       
-        start on nfs-kernel-rpc-nfsd/started
-	stop on nfs-kernel-exports/stop
-	
-        start script
-          mkdir -p /var/lib/nfs
-        end script
-
-        respawn ${pkgs.nfsUtils}/sbin/rpc.statd -F
-      '';
-    }
-    ];
   };
+  
 }
diff --git a/modules/services/network-filesystems/samba.nix b/modules/services/network-filesystems/samba.nix
index fcd1393d5c5..177a2f5128e 100644
--- a/modules/services/network-filesystems/samba.nix
+++ b/modules/services/network-filesystems/samba.nix
@@ -1,118 +1,6 @@
-{pkgs, config, ...}:
+{ config, pkgs, ... }:
 
-###### interface
-let
-  inherit (pkgs.lib) mkOption mkIf mkAlways;
-
-  options = {
-    services = {
-      samba = {
-
-        enable = mkOption {
-          default = false;
-          description = "
-            Whether to enable the samba server. (to communicate with, and provide windows shares)
-            use start / stop samba-control to start/stop all daemons.
-            smbd and nmbd are not shutdown correctly yet. so just pkill them and restart those jobs.
-          ";
-        };
-
-        syncPasswordsByPam = mkOption {
-          default = false;
-          description = "
-            enabling this will add a line directly after pam_unix.so.
-            Whenever a password is changed the samba password will be updated as well.
-            However you still yave to add the samba password once using smbpasswd -a user
-            If you don't want to maintain an extra pwd database you still can send plain text
-            passwords which is not secure.
-          ";
-        };
-
-        extraConfig = mkOption {
-          default = ''
-            # [global] continuing global section here, section is started by nix to set pids etc
-
-              smb passwd file = /etc/samba/passwd
-
-              # is this useful ?
-              domain master = auto
-
-              encrypt passwords = Yes
-              client plaintext auth = No
-
-              # yes: if you use this you probably also want to enable syncPasswordsByPam
-              # no: You can still use the pam password database. However
-              # passwords will be sent plain text on network (discouraged)
-
-              workgroup = Users
-              server string = %h
-              comment = Samba
-              log file = /var/log/samba/log.%m
-              log level = 10
-              max log size = 50000
-              security = user
-              
-              client lanman auth = Yes
-              dns proxy = no
-              invalid users = root
-              passdb backend = tdbsam
-              passwd program = /usr/bin/passwd %u
-
-            ### end [ global ] section
-            
-             
-            # Un-comment the following (and tweak the other settings below to suit)
-            # to enable the default home directory shares.  This will share each
-            # user's home directory as \\server\username
-            ;[homes]
-            ;   comment = Home Directories
-            ;   browseable = no
-            ;   writable = no
-
-            # File creation mask is set to 0700 for security reasons. If you want to
-            # create files with group=rw permissions, set next parameter to 0775.
-            ;   create mask = 0700
-
-            #  this directory and user is created automatically for you by nixos
-            ;[default]
-            ;  path = /home/smbd
-            ;  read only = no
-            ;  guest ok = yes
-              
-            # this directory and user is created automatically for you by nixos
-            ;[default]
-            ;  path = /home/smbd
-            ;  read only = no
-            ;  guest ok = yes
-            
-            # additional share example
-            ;[raidbackup]
-            ;  path = /home/raidbackup/files
-            ;  read only = no
-            ;  guest ok = no
-            ;  available = yes
-            ;  browseable = yes
-            ;  public = yes
-            ;  valid users = raidbackup
-            ;  comment = Raid backup Files
-          '';
-
-          description = "
-            additional global section and extra section lines go in here.
-          ";
-        };
-
-        configFile = mkOption {
-          description = "
-            internal use to pass filepath to samba pam module
-          ";
-        };
-      };
-    };
-  };
-in
-
-###### implementation
+with pkgs.lib;
 
 let
 
@@ -121,115 +9,179 @@ let
   user = "smbguest";
   group = "smbguest";
 
-
   logDir = "/var/log/samba";
   privateDir = "/var/samba/private";
  
   inherit (pkgs) samba;
 
-  setupScript = ''
-    mkdir -p /var/lock
+  setupScript =
+    ''
+      mkdir -p /var/lock
+
+      if ! test -d /home/smbd ; then
+        mkdir -p /home/smbd
+        chown ${user} /home/smbd
+        chmod a+rwx /home/smbd
+      fi
+
+      if ! test -d /var/samba ; then
+        mkdir -p /var/samba/locks /var/samba/cores/nmbd  /var/samba/cores/smbd /var/samba/cores/winbindd
+      fi
+
+      passwdFile="$(sed -n 's/^.*smb[ ]\+passwd[ ]\+file[ ]\+=[ ]\+\(.*\)/\1/p' /nix/store/nnmrqalldfv2vkwy6qpg340rv7w34lmp-smb.conf)"
+      if [ -n "$passwdFile" ]; then
+        echo 'INFO: creating directory containing passwd file'
+        mkdir -p "$(dirname "$passwdFile")"
+      fi
+
+      mkdir -p ${logDir}
+      mkdir -p ${privateDir}
+
+      # The following line is to trigger a restart of the daemons when
+      # the configuration changes:
+      # ${configFile}
+    '';
+
+  configFile = pkgs.writeText "smb.conf"
+    ''
+      [ global ]
+      log file = ${logDir}/log.%m
+      private dir = ${privateDir}
+      ${optionalString cfg.syncPasswordsByPam "pam password change = true"}
 
-    if ! test -d /home/smbd ; then
-      mkdir -p /home/smbd
-      chown ${user} /home/smbd
-      chmod a+rwx /home/smbd
-    fi
+      ${cfg.extraConfig}
+    '';
 
-    if ! test -d /var/samba ; then
-      mkdir -p /var/samba/locks /var/samba/cores/nmbd  /var/samba/cores/smbd /var/samba/cores/winbindd
-    fi
+  daemonJob = appName: args:
+    { name = "samba-${appName}";
+      description = "Samba Service daemon ${appName}";
 
-    passwdFile="$(sed -n 's/^.*smb[ ]\+passwd[ ]\+file[ ]\+=[ ]\+\(.*\)/\1/p' /nix/store/nnmrqalldfv2vkwy6qpg340rv7w34lmp-smb.conf)"
-    if [ -n "$passwdFile" ]; then
-      echo 'INFO: creating directory containing passwd file'
-      mkdir -p "$(dirname "$passwdFile")"
-    fi
+      startOn = "samba/started";
+      stopOn = "samba-control/stop";
 
-    mkdir -p ${logDir}
-    mkdir -p ${privateDir}
-  '';
+      exec = "${samba}/sbin/${appName} ${args}";
+    };
 
-  configFile = pkgs.writeText "smb.conf" ''
-    [ global ]
-      log file = ${logDir}/log.%m
-      private dir = ${privateDir}
+in
 
-      ${if cfg.syncPasswordsByPam then "pam password change = true" else "" /* does this make sense ? */ }
+{
 
+  ###### interface
 
-    ${cfg.extraConfig}";
-  '';
+  options = {
 
-  daemonJob = appName : args :
-    {
-      name = "samba-${appName}";
-      job = ''
+    # !!! clean up the descriptions.
+  
+    services.samba = {
+
+      enable = mkOption {
+        default = false;
+        description = "
+          Whether to enable the samba server. (to communicate with, and provide windows shares)
+          use start / stop samba-control to start/stop all daemons.
+          smbd and nmbd are not shutdown correctly yet. so just pkill them and restart those jobs.
+        ";
+      };
 
-        description "Samba Service daemon ${appName}"
+      syncPasswordsByPam = mkOption {
+        default = false;
+        description = "
+          enabling this will add a line directly after pam_unix.so.
+          Whenever a password is changed the samba password will be updated as well.
+          However you still yave to add the samba password once using smbpasswd -a user
+          If you don't want to maintain an extra pwd database you still can send plain text
+          passwords which is not secure.
+        ";
+      };
 
-        start on samba-control/started
-        stop on samba-control/stop
+      extraConfig = mkOption {
+        # !!! Bad default.
+        default = ''
+          # [global] continuing global section here, section is started by nix to set pids etc
+
+            smb passwd file = /etc/samba/passwd
+
+            # is this useful ?
+            domain master = auto
+
+            encrypt passwords = Yes
+            client plaintext auth = No
+
+            # yes: if you use this you probably also want to enable syncPasswordsByPam
+            # no: You can still use the pam password database. However
+            # passwords will be sent plain text on network (discouraged)
+
+            workgroup = Users
+            server string = %h
+            comment = Samba
+            log file = /var/log/samba/log.%m
+            log level = 10
+            max log size = 50000
+            security = user
+
+            client lanman auth = Yes
+            dns proxy = no
+            invalid users = root
+            passdb backend = tdbsam
+            passwd program = /usr/bin/passwd %u
+        '';
+
+        description = "
+          additional global section and extra section lines go in here.
+        ";
+      };
 
-        respawn ${samba}/sbin/${appName} ${args}
-      '';
+      configFile = mkOption {
+        description = "
+          internal use to pass filepath to samba pam module
+        ";
+      };
     };
 
-in
+  };
+  
 
+  ###### implementation
 
-mkIf config.services.samba.enable {
-  require = [
-    options
-  ];
+  config = mkIf config.services.samba.enable {
 
-  users = {
-    extraUsers = [
+    users.extraUsers = singleton
       { name = user;
         description = "Samba service user";
         group = group;
-      }
-    ];
-    
-    extraGroups = [
+      };
+
+    users.extraGroups = singleton
       { name = group;
-      }
-    ];
-  };
+      };
 
-  # always provide a smb.conf to shut up programs like smbclient and smbspool.
-  environment = {
-    etc = mkAlways [{
-      source = if cfg.enable then configFile else pkgs.writeText "smb-dummy.conf" "# samba is disabled. Purpose see samba expression in nixpkgs";
-      target = "samba/smb.conf";
-      }];
-  };
+    # always provide a smb.conf to shut up programs like smbclient and smbspool.
+    environment.etc = mkAlways (singleton
+      { source =
+          if cfg.enable then configFile
+          else pkgs.writeText "smb-dummy.conf" "# Samba is disabled.";
+        target = "samba/smb.conf";
+      });
+
+    # Dummy job to start the real Samba daemons (nmbd, smbd, winbindd).
+    jobAttrs.sambaControl =
+      { name = "samba";
+        description = "Samba server";
 
-  services = {
+        startOn = "network-interfaces/started";
+        stopOn = "network-interfaces/stop";
 
-    extraJobs = [
-    { name = "samba-control"; # start this dummy job to start the real samba daemons nmbd, smbd, winbindd
-      job = ''
-        description "samba job starting/stopping the real samba jobs";
+        preStart = setupScript;
+      };
 
-        start on network-interfaces/started
-        stop on network-interfaces/stop
+    # nmbd says "standard input is not a socket, assuming -D option",
+    # but using -i makes it stay in foreground (?)
+    jobAttrs.nmbd = daemonJob "nmbd" " -i -F";
 
-        start script
-        ${setupScript}
-        end script
+    jobAttrs.smbd = daemonJob "smbd" " -i -F";
 
-        respawn sleep 1000000 # !!! hack
+    jobAttrs.winbindd = daemonJob "winbindd" " -F";
 
-        # put the store path here so that daemons are restarted when configuration changes
-        # config is ${configFile}
-      '';
-    }
-    # add -S to get debugging output on stdout
-    # config directory is passed by configure at compilation time
-    ( daemonJob "nmbd" " -i -F" ) # nmbd says "standard input is not a socket, assuming -D option", but using -i makes it stay in foreground (?)
-    ( daemonJob "smbd" " -i -F" ) # dito
-    ( daemonJob "winbindd" " -F" )
-    ];
   };
+  
 }
diff --git a/modules/services/networking/avahi-daemon.nix b/modules/services/networking/avahi-daemon.nix
index ff01a755f6a..34e2a83754d 100644
--- a/modules/services/networking/avahi-daemon.nix
+++ b/modules/services/networking/avahi-daemon.nix
@@ -1,86 +1,18 @@
 # Avahi daemon.
-{pkgs, config, ...}:
+{ config, pkgs, ... }:
 
-###### interface
-let
-  inherit (pkgs.lib) mkOption;
-
-  options = {
-    services = {
-      avahi = {
-
-        enable = mkOption {
-          default = false;
-          description = ''
-            Whether to run the Avahi daemon, which allows Avahi clients
-            to use Avahi's service discovery facilities and also allows
-            the local machine to advertise its presence and services
-            (through the mDNS responder implemented by `avahi-daemon').
-          '';
-        };
+with pkgs.lib;
 
-        hostName = mkOption {
-          default = config.networking.hostName;
-          description = ''Host name advertised on the LAN.'';
-        };
-
-        browseDomains = mkOption {
-          default = [ "0pointer.de" "zeroconf.org" ];
-          description = ''
-            List of non-local DNS domains to be browsed.
-          '';
-        };
-
-        ipv4 = mkOption {
-          default = true;
-          description = ''Whether to use IPv4'';
-        };
-
-        ipv6 = mkOption {
-          default = false;
-          description = ''Whether to use IPv6'';
-        };
-
-        wideArea = mkOption {
-          default = true;
-          description = ''Whether to enable wide-area service discovery.'';
-        };
-
-        publishing = mkOption {
-          default = true;
-          description = ''Whether to allow publishing.'';
-        };
-
-        nssmdns = mkOption {
-          default = false;
-          description = ''
-            Whether to enable the mDNS NSS (Name Service Switch) plug-in.
-            Enabling it allows applications to resolve names in the `.local'
-            domain by transparently querying the Avahi daemon.
-
-            Warning: Currently, enabling this option breaks DNS lookups after
-            a `nixos-rebuild'.  This is because `/etc/nsswitch.conf' is
-            updated to use `nss-mdns' but `libnss_mdns' is not in
-            applications' `LD_LIBRARY_PATH'.  The next time `/etc/profile' is
-            sourced, it will set up an appropriate `LD_LIBRARY_PATH', though.
-          '';
-        };
-      };
-    };
-  };
-in
-
-###### implementation
 let
+
   cfg = config.services.avahi;
-  inherit (pkgs.lib) mkIf mkThenElse;
 
-  inherit (pkgs) avahi writeText lib;
+  inherit (pkgs) avahi;
 
-  avahiDaemonConf = with cfg; writeText "avahi-daemon.conf" ''
+  avahiDaemonConf = with cfg; pkgs.writeText "avahi-daemon.conf" ''
     [server]
     host-name=${hostName}
-    browse-domains=${lib.concatStringsSep ", " browseDomains}
+    browse-domains=${concatStringsSep ", " browseDomains}
     use-ipv4=${if ipv4 then "yes" else "no"}
     use-ipv6=${if ipv6 then "yes" else "no"}
 
@@ -91,69 +23,119 @@ let
     disable-publishing=${if publishing then "no" else "yes"}
   '';
 
-  user = {
-    name = "avahi";
-    uid = config.ids.uids.avahi;
-    description = "`avahi-daemon' privilege separation user";
-    home = "/var/empty";
-  };
+in
 
-  group = {
-    name = "avahi";
-    gid = config.ids.gids.avahi;
-  };
+{
 
-  job = {
-    name = "avahi-daemon";
+  ###### interface
 
-    job = ''
-      start on network-interfaces/started
-      stop on network-interfaces/stop
-      respawn
-      script
-        export PATH="${avahi}/bin:${avahi}/sbin:$PATH"
+  options = {
+  
+    services.avahi = {
+
+      enable = mkOption {
+        default = false;
+        description = ''
+          Whether to run the Avahi daemon, which allows Avahi clients
+          to use Avahi's service discovery facilities and also allows
+          the local machine to advertise its presence and services
+          (through the mDNS responder implemented by `avahi-daemon').
+        '';
+      };
 
-        # Make NSS modules visible so that `avahi_nss_support ()' can
-        # return a sensible value.
-        export LD_LIBRARY_PATH="${config.system.nssModules.path}"
+      hostName = mkOption {
+        default = config.networking.hostName;
+        description = ''Host name advertised on the LAN.'';
+      };
 
-        exec ${avahi}/sbin/avahi-daemon --daemonize -f "${avahiDaemonConf}"
-      end script
-    '';
-  };
-in
+      browseDomains = mkOption {
+        default = [ "0pointer.de" "zeroconf.org" ];
+        description = ''
+          List of non-local DNS domains to be browsed.
+        '';
+      };
 
-mkIf cfg.enable {
-  require = [
-    # ../upstart-jobs/default.nix # config.services.extraJobs
-    # ../system/? # system.nssModules
-    # ? # config.environment.etc
-    # ../system/user.nix # users.*
-    # ../upstart-jobs/udev.nix # services.udev.*
-    # ../upstart-jobs/dbus.nix # services.dbus.*
-    # ? # config.environment.extraPackages
-    options
-  ];
-
-  system = {
-    nssModules = pkgs.lib.optional cfg.nssmdns pkgs.nssmdns;
-  };
+      ipv4 = mkOption {
+        default = true;
+        description = ''Whether to use IPv4'';
+      };
 
-  environment = {
-    systemPackages = [avahi];
-  };
+      ipv6 = mkOption {
+        default = false;
+        description = ''Whether to use IPv6'';
+      };
 
-  users = {
-    extraUsers = [user];
-    extraGroups = [group];
-  };
+      wideArea = mkOption {
+        default = true;
+        description = ''Whether to enable wide-area service discovery.'';
+      };
 
-  services = {
-    extraJobs = [job];
+      publishing = mkOption {
+        default = true;
+        description = ''Whether to allow publishing.'';
+      };
 
-    dbus = {
-      enable = true;
-      packages = [avahi];
+      nssmdns = mkOption {
+        default = false;
+        description = ''
+          Whether to enable the mDNS NSS (Name Service Switch) plug-in.
+          Enabling it allows applications to resolve names in the `.local'
+          domain by transparently querying the Avahi daemon.
+
+          Warning: Currently, enabling this option breaks DNS lookups after
+          a `nixos-rebuild'.  This is because `/etc/nsswitch.conf' is
+          updated to use `nss-mdns' but `libnss_mdns' is not in
+          applications' `LD_LIBRARY_PATH'.  The next time `/etc/profile' is
+          sourced, it will set up an appropriate `LD_LIBRARY_PATH', though.
+        '';
+      };
+      
     };
+    
+  };
+  
+
+  ###### implementation
+
+  config = mkIf cfg.enable {
+
+    users.extraUsers = singleton
+      { name = "avahi";
+        uid = config.ids.uids.avahi;
+        description = "`avahi-daemon' privilege separation user";
+        home = "/var/empty";
+      };
+
+    users.extraGroups = singleton
+      { name = "avahi";
+        gid = config.ids.gids.avahi;
+      };
+
+    system.nssModules = optional cfg.nssmdns pkgs.nssmdns;
+
+    environment.systemPackages = [ avahi ];
+
+    jobAttrs.avahi_daemon =
+      { name = "avahi-daemon";
+
+        startOn = "network-interfaces/started";
+        stopOn = "network-interfaces/stop";
+
+        script =
+          ''
+            export PATH="${avahi}/bin:${avahi}/sbin:$PATH"
+
+            # Make NSS modules visible so that `avahi_nss_support ()' can
+            # return a sensible value.
+            export LD_LIBRARY_PATH="${config.system.nssModules.path}"
+
+            exec ${avahi}/sbin/avahi-daemon --daemonize -f "${avahiDaemonConf}"
+          '';
+      };
+
+    services.dbus.enable = true;
+    services.dbus.packages = [avahi];
+
   };
+
 }
diff --git a/modules/services/networking/bind.nix b/modules/services/networking/bind.nix
index d216987e573..d1a137f3502 100644
--- a/modules/services/networking/bind.nix
+++ b/modules/services/networking/bind.nix
@@ -1,123 +1,121 @@
-{pkgs, config, ...}:
+{ config, pkgs, ... }:
+
+with pkgs.lib;
 
-###### interface
 let
-  inherit (pkgs.lib) mkOption mkIf;
 
-  options = {
-    services = {
-      bind = {
-        enable = mkOption {
-          default = false;
-          description = "
-            Whether to enable BIND domain name server.
-          ";
-        };
-        cacheNetworks = mkOption {
-          default = ["127.0.0.0/24"];
-          description = "
-            What networks are allowed to use us as a resolver.
-          ";
-        };
-        blockedNetworks = mkOption {
-          default = [];
-          description = "
-            What networks are just blocked.
-          ";
-        };
-        zones = mkOption {
-          default = [];
-          description = "
-            List of zones we claim authority over.
-              master=false means slave server; slaves means addresses 
-             who may request zone transfer.
-          ";
-          example = [{
-            name = "example.com";
-            master = false;
-            file = "/var/dns/example.com";
-            masters = ["192.168.0.1"];
-            slaves = [];
-          }];
-        };
+  startingDependency = if config.services.gw6c.enable then "gw6c" else "network-interfaces";
+  
+  cfg = config.services.bind;
+
+  confFile = pkgs.writeText "named.conf"
+    ''
+      acl cachenetworks { ${concatMapStrings (entry: " ${entry}; ") cfg.cacheNetworks} };
+      acl badnetworks { ${concatMapStrings (entry: " ${entry}; ") cfg.blockedNetworks} };
+
+      options {
+        listen-on {any;};
+        listen-on-v6 {any;};
+        allow-query { cachenetworks; };
+        blackhole { badnetworks; };
+        forward first;
+        forwarders { ${concatMapStrings (entry: " ${entry}; ") config.networking.nameservers} };
+        directory "/var/run/named";
+        pid-file "/var/run/named/named.pid";
       };
-    };
-  };
+
+      ${ concatMapStrings
+          ({ name, file, master ? true, slaves ? [], masters ? [] }:
+            ''           
+              zone "${name}" {
+                type ${if master then "master" else "slave"};
+                file "${file}";
+                ${ if master then
+                   ''
+                     allow-transfer {
+                       ${concatMapStrings (ip: "${ip};\n") slaves}
+                     };
+                   ''
+                   else
+                   ''
+                     masters {
+                       ${concatMapStrings (ip: "${ip};\n") masters}
+                     };
+                   ''
+                }
+                allow-query { any; };
+              };
+            '')
+          cfg.zones }
+    '';
+
 in
 
-###### implementation
+{
 
-let
-  startingDependency = if config.services.gw6c.enable then "gw6c" else "network-interfaces";
-  cfg = config.services.bind;
-  concatMapStrings = pkgs.lib.concatMapStrings;
-
-  namedConf = 
-  (''
-    acl cachenetworks { ${concatMapStrings (entry: " ${entry}; ") cfg.cacheNetworks} };
-    acl badnetworks { ${concatMapStrings (entry: " ${entry}; ") cfg.blockedNetworks} };
-
-    options {
-      listen-on {any;};
-      listen-on-v6 {any;};
-      allow-query { cachenetworks; };
-      blackhole { badnetworks; };
-      forward first;
-      forwarders { ${concatMapStrings (entry: " ${entry}; ") config.networking.nameservers} };
-      directory "/var/run/named";
-      pid-file "/var/run/named/named.pid";
+  ###### interface
+
+  options = {
+  
+    services.bind = {
+    
+      enable = mkOption {
+        default = false;
+        description = "
+          Whether to enable BIND domain name server.
+        ";
+      };
+      
+      cacheNetworks = mkOption {
+        default = ["127.0.0.0/24"];
+        description = "
+          What networks are allowed to use us as a resolver.
+        ";
+      };
+      
+      blockedNetworks = mkOption {
+        default = [];
+        description = "
+          What networks are just blocked.
+        ";
+      };
+      
+      zones = mkOption {
+        default = [];
+        description = "
+          List of zones we claim authority over.
+            master=false means slave server; slaves means addresses 
+           who may request zone transfer.
+        ";
+        example = [{
+          name = "example.com";
+          master = false;
+          file = "/var/dns/example.com";
+          masters = ["192.168.0.1"];
+          slaves = [];
+        }];
+      };
+      
     };
 
-  '')
-  + 
-  (concatMapStrings 
-    (_entry:let entry={master=true;slaves=[];masters=[];}//_entry; in
-      ''
-        zone "${entry.name}" {
-          type ${if entry.master then "master" else "slave"};
-          file "${entry.file}";
-          ${ if entry.master then
-             ''
-               allow-transfer {
-                 ${concatMapStrings (ip: ip+";\n") entry.slaves}
-               };
-             ''
-             else
-             ''
-               masters {
-                 ${concatMapStrings (ip: ip+";\n") entry.masters}
-               };
-             ''
-          }
-          allow-query { any; };
-        };
-      ''
-    )
-    cfg.zones
-  )
-  ;
-
-  confFile = pkgs.writeText "named.conf" namedConf;
+  };
+  
 
-in
+  ###### implementation
 
-mkIf config.services.bind.enable {
-  require = [
-    options
-  ];
+  config = mkIf config.services.bind.enable {
 
-  services = {
-    extraJobs = [{
-      name = "bind";
-      job = ''
-        description "BIND name server job"
+    jobAttrs.bind =
+      { description = "BIND name server job";
 
-        start script
-          ${pkgs.coreutils}/bin/mkdir -p /var/run/named
-        end script
+        preStart =
+          ''
+            ${pkgs.coreutils}/bin/mkdir -p /var/run/named
+          '';
+
+        exec = "${pkgs.bind}/sbin/named -c ${confFile} -f";
+      };
 
-        respawn ${pkgs.bind}/sbin/named -c ${confFile} -f 
-      '';
-    }];
   };
+  
 }
diff --git a/modules/services/networking/bitlbee.nix b/modules/services/networking/bitlbee.nix
index 9e07858f949..c55adb49335 100644
--- a/modules/services/networking/bitlbee.nix
+++ b/modules/services/networking/bitlbee.nix
@@ -1,91 +1,93 @@
-{pkgs, config, ...}:
+{ config, pkgs, ... }:
+
+with pkgs.lib;
 
-###### interface
 let
-  inherit (pkgs.lib) mkOption mkIf;
+
+  bitlbeeUid = config.ids.uids.bitlbee;
+  
+  inherit (config.services.bitlbee) portNumber interface;
+  
+in
+
+{
+
+  ###### interface
 
   options = {
-    services = {
-      bitlbee = {
-
-        enable = mkOption {
-          default = false;
-          description = ''
-            Whether to run the BitlBee IRC to other chat network gateway.
-            Running it allows you to access the MSN, Jabber, Yahoo! and ICQ chat
-            networks via an IRC client.
-          '';
-        };
-
-        interface = mkOption {
-          default = "127.0.0.1";
-          description = ''
-            The interface the BitlBee deamon will be listening to.  If `127.0.0.1',
-            only clients on the local host can connect to it; if `0.0.0.0', clients
-            can access it from any network interface.
-          '';
-        };
+  
+    services.bitlbee = {
+
+      enable = mkOption {
+        default = false;
+        description = ''
+          Whether to run the BitlBee IRC to other chat network gateway.
+          Running it allows you to access the MSN, Jabber, Yahoo! and ICQ chat
+          networks via an IRC client.
+        '';
+      };
 
-        portNumber = mkOption {
-          default = 6667;
-          description = ''
-            Number of the port BitlBee will be listening to.
-          '';
-        };
+      interface = mkOption {
+        default = "127.0.0.1";
+        description = ''
+          The interface the BitlBee deamon will be listening to.  If `127.0.0.1',
+          only clients on the local host can connect to it; if `0.0.0.0', clients
+          can access it from any network interface.
+        '';
+      };
 
+      portNumber = mkOption {
+        default = 6667;
+        description = ''
+          Number of the port BitlBee will be listening to.
+        '';
       };
-    };
-  };
-in
 
-###### implementation
+    };
 
-let
-  bitlbeeUid = config.ids.uids.bitlbee;
-  inherit (config.services.bitlbee) portNumber interface;
-in
+  };
+  
 
-mkIf config.services.bitlbee.enable {
+  ###### implementation
 
-  require = options;
+  config = mkIf config.services.bitlbee.enable {
 
-  users = {
-    extraUsers = [
+    users.extraUsers = singleton
       { name = "bitlbee";
         uid = bitlbeeUid;
         description = "BitlBee user";
         home = "/var/empty";
-      }
-    ];
+      };
     
-    extraGroups = [
+    users.extraGroups = singleton
       { name = "bitlbee";
         gid = config.ids.gids.bitlbee;
-      }
-    ];
-  };
-
-  services.extraJobs = [{
-    name = "bitlbee";
+      };
 
-    job = ''
-      description "BitlBee IRC to other chat networks gateway"
+    jobAttrs.bitlbee =
+      { description = "BitlBee IRC to other chat networks gateway";
 
-      start on network-interfaces/started
-      stop on network-interfaces/stop
+        startOn = "network-interfaces/started";
+        stopOn = "network-interfaces/stop";
 
-      start script
-          if ! test -d /var/lib/bitlbee
-          then
-              mkdir -p /var/lib/bitlbee
-              chown bitlbee:bitlbee /var/lib/bitlbee
-          fi
-      end script
+        preStart =
+          ''
+            if ! test -d /var/lib/bitlbee
+            then
+                mkdir -p /var/lib/bitlbee
+                chown bitlbee:bitlbee /var/lib/bitlbee
+            fi
+          '';
 
-      respawn ${pkgs.bitlbee}/sbin/bitlbee -F -p ${toString portNumber} \
+        exec =
+          ''
+            ${pkgs.bitlbee}/sbin/bitlbee -F -p ${toString portNumber} \
               -i ${interface} -u bitlbee
-    '';
-  }];
+          '';
+      };
+
+    environment.systemPackages = [ pkgs.bitlbee ];
 
-  environment.systemPackages = [ pkgs.bitlbee ];
+  };
+  
 }
diff --git a/modules/services/networking/dhcpd.nix b/modules/services/networking/dhcpd.nix
index 9604dd965b9..5a2d9034dfd 100644
--- a/modules/services/networking/dhcpd.nix
+++ b/modules/services/networking/dhcpd.nix
@@ -1,123 +1,121 @@
-{pkgs, config, ...}:
+{ config, pkgs, ... }:
+
+with pkgs.lib;
 
-###### interface
 let
-  inherit (pkgs.lib) mkOption mkIf;
 
-  options = {
-    services = {
-      dhcpd = {
-
-        enable = mkOption {
-          default = false;
-          description = "
-            Whether to enable the DHCP server.
-          ";
-        };
-
-        extraConfig = mkOption {
-          default = "";
-          example = "
-            option subnet-mask 255.255.255.0;
-            option broadcast-address 192.168.1.255;
-            option routers 192.168.1.5;
-            option domain-name-servers 130.161.158.4, 130.161.33.17, 130.161.180.1;
-            option domain-name \"example.org\";
-            subnet 192.168.1.0 netmask 255.255.255.0 {
-              range 192.168.1.100 192.168.1.200;
-            }
-          ";
-          description = "
-            Extra text to be appended to the DHCP server configuration
-            file.  Currently, you almost certainly need to specify
-            something here, such as the options specifying the subnet
-            mask, DNS servers, etc.
-          ";
-        };
-
-        configFile = mkOption {
-          default = null;
-          description = "
-            The path of the DHCP server configuration file.  If no file
-            is specified, a file is generated using the other options.
-          ";
-        };
-
-        interfaces = mkOption {
-          default = ["eth0"];
-          description = "
-            The interfaces on which the DHCP server should listen.
-          ";
-        };
-
-        machines = mkOption {
-          default = [];
-          example = [
-            { hostName = "foo";
-              ethernetAddress = "00:16:76:9a:32:1d";
-              ipAddress = "192.168.1.10";
-            }
-            { hostName = "bar";
-              ethernetAddress = "00:19:d1:1d:c4:9a";
-              ipAddress = "192.168.1.11";
+  cfg = config.services.dhcpd;
+
+  stateDir = "/var/lib/dhcp"; # Don't use /var/state/dhcp; not FHS-compliant.
+
+  configFile = if cfg.configFile != null then cfg.configFile else pkgs.writeText "dhcpd.conf"
+    ''
+      default-lease-time 600;
+      max-lease-time 7200;
+      authoritative;
+      ddns-update-style ad-hoc;
+      log-facility local1; # see dhcpd.nix
+      
+      ${cfg.extraConfig}
+
+      ${pkgs.lib.concatMapStrings
+          (machine: ''
+            host ${machine.hostName} {
+              hardware ethernet ${machine.ethernetAddress};
+              fixed-address ${machine.ipAddress};
             }
-          ];
-          description = "
-            A list mapping ethernet addresses to IP addresses for the
-            DHCP server.
-          ";
-        };
+          '')
+          cfg.machines
+      }
+    '';
 
-      };
-    };
-  };
 in
+  
+{
 
-###### implementation
+  ###### interface
 
-let
+  options = {
+  
+    services.dhcpd = {
 
-  cfg = config.services.dhcpd;
+      enable = mkOption {
+        default = false;
+        description = "
+          Whether to enable the DHCP server.
+        ";
+      };
 
-  stateDir = "/var/lib/dhcp"; # Don't use /var/state/dhcp; not FHS-compliant.
+      extraConfig = mkOption {
+        default = "";
+        example = "
+          option subnet-mask 255.255.255.0;
+          option broadcast-address 192.168.1.255;
+          option routers 192.168.1.5;
+          option domain-name-servers 130.161.158.4, 130.161.33.17, 130.161.180.1;
+          option domain-name \"example.org\";
+          subnet 192.168.1.0 netmask 255.255.255.0 {
+            range 192.168.1.100 192.168.1.200;
+          }
+        ";
+        description = "
+          Extra text to be appended to the DHCP server configuration
+          file.  Currently, you almost certainly need to specify
+          something here, such as the options specifying the subnet
+          mask, DNS servers, etc.
+        ";
+      };
 
-  machines = pkgs.lib.concatMapStrings (machine: ''
-    host ${machine.hostName} {
-      hardware ethernet ${machine.ethernetAddress};
-      fixed-address ${machine.ipAddress};
-    }
-  '') cfg.machines;
-
-  configFile = if cfg.configFile != null then cfg.configFile else pkgs.writeText "dhcpd.conf" ''
-    default-lease-time 600;
-    max-lease-time 7200;
-    authoritative;
-    ddns-update-style ad-hoc;
-    log-facility local1; # see dhcpd.nix
-    ${cfg.extraConfig}
-    ${machines}
-  '';
+      configFile = mkOption {
+        default = null;
+        description = "
+          The path of the DHCP server configuration file.  If no file
+          is specified, a file is generated using the other options.
+        ";
+      };
 
-in
+      interfaces = mkOption {
+        default = ["eth0"];
+        description = "
+          The interfaces on which the DHCP server should listen.
+        ";
+      };
+
+      machines = mkOption {
+        default = [];
+        example = [
+          { hostName = "foo";
+            ethernetAddress = "00:16:76:9a:32:1d";
+            ipAddress = "192.168.1.10";
+          }
+          { hostName = "bar";
+            ethernetAddress = "00:19:d1:1d:c4:9a";
+            ipAddress = "192.168.1.11";
+          }
+        ];
+        description = "
+          A list mapping ethernet addresses to IP addresses for the
+          DHCP server.
+        ";
+      };
+
+    };
+    
+  };
   
 
-mkIf config.services.dhcpd.enable {
-  require = [
-    options
-  ];
+  ###### implementation
 
-  services = {
-    extraJobs = [{
-      name = "dhcpd";
-      
-      job = ''
-        description "DHCP server"
+  config = mkIf config.services.dhcpd.enable {
 
-        start on network-interfaces/started
-        stop on network-interfaces/stop
+    jobAttrs.dhcpd =
+      { description = "DHCP server";
 
-        script
+        startOn = "network-interfaces/started";
+        stopOn = "network-interfaces/stop";
 
+        script =
+          ''
             mkdir -m 755 -p ${stateDir}
 
             touch ${stateDir}/dhcpd.leases
@@ -125,9 +123,9 @@ mkIf config.services.dhcpd.enable {
             exec ${pkgs.dhcp}/sbin/dhcpd -f -cf ${configFile} \
                 -lf ${stateDir}/dhcpd.leases \
                 ${toString cfg.interfaces}
+          '';
+      };
 
-        end script
-      '';
-    }];
   };
+  
 }
diff --git a/modules/services/networking/ejabberd.nix b/modules/services/networking/ejabberd.nix
index b1f485cf1c8..8ef910e1262 100644
--- a/modules/services/networking/ejabberd.nix
+++ b/modules/services/networking/ejabberd.nix
@@ -1,85 +1,83 @@
-{pkgs, config, ...}:
+{ config, pkgs, ... }:
+
+with pkgs.lib;
 
-###### interface
 let
-  inherit (pkgs.lib) mkOption mkIf;
+
+  cfg = config.services.ejabberd;
+
+in
+
+{
+
+  ###### interface
 
   options = {
-    services = {
-      ejabberd = {
-        enable = mkOption {
-          default = false;
-          description = "Whether to enable ejabberd server";
-        };
-              
-        spoolDir = mkOption {
-          default = "/var/lib/ejabberd";
-          description = "Location of the spooldir of ejabberd";
-        };
-        
-        logsDir = mkOption {
-          default = "/var/log/ejabberd";
-          description = "Location of the logfile directory of ejabberd";
-        };
-        
-        confDir = mkOption {
-          default = "/var/ejabberd";
-          description = "Location of the config directory of ejabberd";
-        };
-        
-        virtualHosts = mkOption {
-          default = "\"localhost\"";
-          description = "Virtualhosts that ejabberd should host. Hostnames are surrounded with doublequotes and separated by commas";
-        };
+  
+    services.ejabberd = {
+    
+      enable = mkOption {
+        default = false;
+        description = "Whether to enable ejabberd server";
+      };
+
+      spoolDir = mkOption {
+        default = "/var/lib/ejabberd";
+        description = "Location of the spooldir of ejabberd";
+      };
+
+      logsDir = mkOption {
+        default = "/var/log/ejabberd";
+        description = "Location of the logfile directory of ejabberd";
+      };
+
+      confDir = mkOption {
+        default = "/var/ejabberd";
+        description = "Location of the config directory of ejabberd";
       };
+
+      virtualHosts = mkOption {
+        default = "\"localhost\"";
+        description = "Virtualhosts that ejabberd should host. Hostnames are surrounded with doublequotes and separated by commas";
+      };
+
     };
+    
   };
-in
+  
 
-###### implementation
+  ###### implementation
 
-let
+  config = mkIf cfg.enable {
 
-cfg = config.services.ejabberd;
+    jobAttrs.ejabberd =
+      { description = "EJabberd server";
 
-in
+        startOn = "network-interface/started";
+        stopOn = "network-interfaces/stop";
 
-mkIf config.services.ejabberd.enable {
-
-  require = [
-    options
-  ];
-
-
-  services = {
-    extraJobs = [{
-      name = "ejabberd";
-          
-      job = ''
-        description "EJabberd server"
-
-        start on network-interface/started
-        stop on network-interfaces/stop
-      
-        start script
-              # Initialise state data
-              mkdir -p ${cfg.logsDir}
-              
-              if ! test -d ${cfg.spoolDir}
-              then
-                  cp -av ${pkgs.ejabberd}/var/lib/ejabberd /var/lib
-              fi
-              
-              mkdir -p ${cfg.confDir}
-              test -f ${cfg.confDir}/ejabberd.cfg || sed -e 's|{hosts, \["localhost"\]}.|{hosts, \[${cfg.virtualHosts}\]}.|' ${pkgs.ejabberd}/etc/ejabberd/ejabberd.cfg > ${cfg.confDir}/ejabberd.cfg
-        end script
-        
-        respawn ${pkgs.bash}/bin/sh -c 'export PATH=$PATH:${pkgs.ejabberd}/sbin:${pkgs.coreutils}/bin:${pkgs.bash}/bin; cd ~; ejabberdctl --logs ${cfg.logsDir} --spool ${cfg.spoolDir} --config ${cfg.confDir}/ejabberd.cfg start; sleep 1d'
-        
-        stop script
+        preStart =
+          ''
+            # Initialise state data
+            mkdir -p ${cfg.logsDir}
+
+            if ! test -d ${cfg.spoolDir}
+            then
+                cp -av ${pkgs.ejabberd}/var/lib/ejabberd /var/lib
+            fi
+
+            mkdir -p ${cfg.confDir}
+            test -f ${cfg.confDir}/ejabberd.cfg || sed -e 's|{hosts, \["localhost"\]}.|{hosts, \[${cfg.virtualHosts}\]}.|' ${pkgs.ejabberd}/etc/ejabberd/ejabberd.cfg > ${cfg.confDir}/ejabberd.cfg
+          '';
+
+        exec = "${pkgs.bash}/bin/sh -c 'export PATH=$PATH:${pkgs.ejabberd}/sbin:${pkgs.coreutils}/bin:${pkgs.bash}/bin; cd ~; ejabberdctl --logs ${cfg.logsDir} --spool ${cfg.spoolDir} --config ${cfg.confDir}/ejabberd.cfg start; sleep 1d'";
+
+        postStop =
+          ''        
             ${pkgs.ejabberd}/sbin/ejabberdctl stop
-        end script
-      '';
-    }];
+          '';
+      };
+
   };
+  
 }
diff --git a/modules/services/networking/gnunet.nix b/modules/services/networking/gnunet.nix
index 57e3b3d8c96..05956f74612 100644
--- a/modules/services/networking/gnunet.nix
+++ b/modules/services/networking/gnunet.nix
@@ -1,218 +1,218 @@
-{pkgs, config, ...}:
+{ config, pkgs, ... }:
+
+with pkgs.lib;
 
-###### interface
 let
-  inherit (pkgs.lib) mkOption mkIf;
+
+  cfg = config.services.gnunet;
+
+  configFile = with cfg; pkgs.writeText "gnunetd.conf"
+    ''
+      [PATHS]
+      GNUNETD_HOME = ${home}
+
+      [GNUNETD]
+      HOSTLISTURL = ${lib.concatStringsSep " " hostLists}
+      APPLICATIONS = ${lib.concatStringsSep " " applications}
+      TRANSPORTS = ${lib.concatStringsSep " " transports}
+
+      [LOAD]
+      MAXNETDOWNBPSTOTAL = ${toString load.maxNetDownBandwidth}
+      MAXNETUPBPSTOTAL = ${toString load.maxNetUpBandwidth}
+      HARDUPLIMIT = ${toString load.hardNetUpBandwidth}
+      MAXCPULOAD = ${toString load.maxCPULoad}
+      INTERFACES = ${lib.concatStringsSep " " load.interfaces}
+
+      [FS]
+      QUOTA = ${toString fileSharing.quota}
+      ACTIVEMIGRATION = ${if fileSharing.activeMigration then "YES" else "NO"}
+
+      [MODULES]
+      sqstore = sqstore_sqlite
+      dstore = dstore_sqlite
+      topology = topology_default
+
+      ${extraOptions}
+    '';
+
+in
+
+{
+
+  ###### interface
 
   options = {
-    services = {
-      gnunet = {
+  
+    services.gnunet = {
       
-        enable = mkOption {
-          default = false;
-          description = ''
-            Whether to run the GNUnet daemon.  GNUnet is GNU's anonymous
-            peer-to-peer communication and file sharing framework.
-          '';
-        };
+      enable = mkOption {
+        default = false;
+        description = ''
+          Whether to run the GNUnet daemon.  GNUnet is GNU's anonymous
+          peer-to-peer communication and file sharing framework.
+        '';
+      };
 
-        home = mkOption {
-          default = "/var/lib/gnunet";
+      home = mkOption {
+        default = "/var/lib/gnunet";
+        description = ''
+          Directory where the GNUnet daemon will store its data.
+        '';
+      };
+
+      debug = mkOption {
+        default = false;
+        description = ''
+          When true, run in debug mode; gnunetd will not daemonize and
+          error messages will be written to stderr instead of a
+          logfile.
+        '';
+      };
+
+      logLevel = mkOption {
+        default = "ERROR";
+        example = "INFO";
+        description = ''
+          Log level of the deamon (see `gnunetd(1)' for details).
+        '';
+      };
+
+      hostLists = mkOption {
+        default = [
+          "http://gnunet.org/hostlist.php"
+          "http://gnunet.mine.nu:8081/hostlist"
+          "http://vserver1236.vserver-on.de/hostlist-074"
+        ];
+        description = ''
+          URLs of host lists.
+        '';
+      };
+
+      applications = mkOption {
+        default = [ "advertising" "getoption" "fs" "stats" "traffic" ];
+        example = [ "chat" "fs" ];
+        description = ''
+          List of GNUnet applications supported by the daemon.  Note that
+          `fs', which means "file sharing", is probably the one you want.
+        '';
+      };
+
+      transports = mkOption {
+        default = [ "udp" "tcp" "http" "nat" ];
+        example = [ "smtp" "http" ];
+        description = ''
+          List of transport methods used by the server.
+        '';
+      };
+
+      fileSharing = {
+        quota = mkOption {
+          default = 1024;
           description = ''
-            Directory where the GNUnet daemon will store its data.
+            Maximum file system usage (in MiB) for file sharing.
           '';
         };
 
-        debug = mkOption {
+        activeMigration = mkOption {
           default = false;
           description = ''
-            When true, run in debug mode; gnunetd will not daemonize and
-            error messages will be written to stderr instead of a
-            logfile.
+            Whether to allow active migration of content originating
+            from other nodes.
           '';
         };
+      };
 
-        logLevel = mkOption {
-          default = "ERROR";
-          example = "INFO";
+      load = {
+        maxNetDownBandwidth = mkOption {
+          default = 50000;
           description = ''
-            Log level of the deamon (see `gnunetd(1)' for details).
+            Maximum bandwidth usage (in bits per second) for GNUnet
+            when downloading data.
           '';
         };
 
-        hostLists = mkOption {
-          default = [
-            "http://gnunet.org/hostlist.php"
-            "http://gnunet.mine.nu:8081/hostlist"
-            "http://vserver1236.vserver-on.de/hostlist-074"
-          ];
+        maxNetUpBandwidth = mkOption {
+          default = 50000;
           description = ''
-            URLs of host lists.
+            Maximum bandwidth usage (in bits per second) for GNUnet
+            when downloading data.
           '';
         };
 
-
-        applications = mkOption {
-          default = [ "advertising" "getoption" "fs" "stats" "traffic" ];
-          example = [ "chat" "fs" ];
+        hardNetUpBandwidth = mkOption {
+          default = 0;
           description = ''
-            List of GNUnet applications supported by the daemon.  Note that
-            `fs', which means "file sharing", is probably the one you want.
+            Hard bandwidth limit (in bits per second) when uploading
+            data.
           '';
         };
 
-        transports = mkOption {
-          default = [ "udp" "tcp" "http" "nat" ];
-          example = [ "smtp" "http" ];
+        maxCPULoad = mkOption {
+          default = 100;
           description = ''
-            List of transport methods used by the server.
+            Maximum CPU load (percentage) authorized for the GNUnet
+            daemon.
           '';
         };
 
-        fileSharing = {
-          quota = mkOption {
-            default = 1024;
-            description = ''
-              Maximum file system usage (in MiB) for file sharing.
-            '';
-          };
-
-          activeMigration = mkOption {
-            default = false;
-            description = ''
-              Whether to allow active migration of content originating
-              from other nodes.
-            '';
-          };
-        };
-
-        load = {
-          maxNetDownBandwidth = mkOption {
-            default = 50000;
-            description = ''
-              Maximum bandwidth usage (in bits per second) for GNUnet
-              when downloading data.
-            '';
-          };
-
-          maxNetUpBandwidth = mkOption {
-            default = 50000;
-            description = ''
-              Maximum bandwidth usage (in bits per second) for GNUnet
-              when downloading data.
-            '';
-          };
-
-          hardNetUpBandwidth = mkOption {
-            default = 0;
-            description = ''
-              Hard bandwidth limit (in bits per second) when uploading
-              data.
-            '';
-          };
-
-          maxCPULoad = mkOption {
-            default = 100;
-            description = ''
-              Maximum CPU load (percentage) authorized for the GNUnet
-              daemon.
-            '';
-          };
-
-          interfaces = mkOption {
-            default = [ "eth0" ];
-            example = [ "wlan0" "eth1" ];
-            description = ''
-              List of network interfaces to use.
-            '';
-          };
-        };
-
-        extraOptions = mkOption {
-          default = "";
-          example = ''
-            [NETWORK]
-            INTERFACE = eth3
-          '';
+        interfaces = mkOption {
+          default = [ "eth0" ];
+          example = [ "wlan0" "eth1" ];
           description = ''
-            Additional options that will be copied verbatim in `gnunetd.conf'.
-            See `gnunetd.conf(5)' for details.
+            List of network interfaces to use.
           '';
         };
       };
+
+      extraOptions = mkOption {
+        default = "";
+        example = ''
+          [NETWORK]
+          INTERFACE = eth3
+        '';
+        description = ''
+          Additional options that will be copied verbatim in `gnunetd.conf'.
+          See `gnunetd.conf(5)' for details.
+        '';
+      };
     };
+
   };
-in
 
-###### implementation
 
-mkIf config.services.gnunet.enable {
-  require = [
-    options
-  ];
+  ###### implementation
+
+  config = mkIf config.services.gnunet.enable {
 
-  users = {
-    extraUsers = [
+    users.extraUsers = singleton
       { name = "gnunetd";
         uid = config.ids.uids.gnunetd;
         description = "GNUnet Daemon User";
         home = "/var/empty";
-      }
-    ];
-  };
+      };
+
+    jobAttrs.gnunetd =
+      { description = "The GNUnet Daemon";
+
+        startOn = "network-interfaces/started";
+        stopOn = "network-interfaces/stop";
 
-  services = {
-    extraJobs = [{
-        name = "gnunetd";
-
-        job =
-          with config.services.gnunet;
-          let 
-            inherit (pkgs) lib gnunet;
-            configFile = pkgs.writeText "gnunetd.conf" ''
-              [PATHS]
-              GNUNETD_HOME = ${home}
-
-              [GNUNETD]
-              HOSTLISTURL = ${lib.concatStringsSep " " hostLists}
-              APPLICATIONS = ${lib.concatStringsSep " " applications}
-              TRANSPORTS = ${lib.concatStringsSep " " transports}
-
-              [LOAD]
-              MAXNETDOWNBPSTOTAL = ${toString load.maxNetDownBandwidth}
-              MAXNETUPBPSTOTAL = ${toString load.maxNetUpBandwidth}
-              HARDUPLIMIT = ${toString load.hardNetUpBandwidth}
-              MAXCPULOAD = ${toString load.maxCPULoad}
-              INTERFACES = ${lib.concatStringsSep " " load.interfaces}
-
-              [FS]
-              QUOTA = ${toString fileSharing.quota}
-              ACTIVEMIGRATION = ${if fileSharing.activeMigration then "YES" else "NO"}
-
-              [MODULES]
-              sqstore = sqstore_sqlite
-              dstore = dstore_sqlite
-              topology = topology_default
-
-              ${extraOptions}
-            '';
-            in ''
-            description "The GNUnet Daemon"
-
-            start on network-interfaces/started
-            stop on network-interfaces/stop
-
-            start script
-                test -d "${home}" || \
-                ( mkdir -m 755 -p "${home}" && chown -R gnunetd:users "${home}")
-            end script
-
-            respawn ${gnunet}/bin/gnunetd                   \
+        preStart =
+          ''
+            test -d "${cfg.home}" || \
+              ( mkdir -m 755 -p "${cfg.home}" && chown -R gnunetd:users "${cfg.home}")
+          '';
+
+        exec =
+          ''
+            respawn ${pkgs.gnunet}/bin/gnunetd              \
               ${if debug then "--debug" else "" }           \
               --user="gnunetd"                              \
               --config="${configFile}"                      \
-              --log="${logLevel}"
-            '';
-    }];
+              --log="${cfg.logLevel}"
+          '';
+      };
+
   };
+
 }
diff --git a/modules/services/networking/gw6c.nix b/modules/services/networking/gw6c.nix
index 502a7b1826e..961940d534a 100644
--- a/modules/services/networking/gw6c.nix
+++ b/modules/services/networking/gw6c.nix
@@ -1,141 +1,143 @@
-{servicesPath, pkgs, config, ...}:
+{ config, pkgs, servicesPath, ... }:
+
+with pkgs.lib;
 
-###### interface
 let
-  inherit (pkgs.lib) mkOption mkIf;
+
+  cfg = config.services.gw6c;
+
+  gw6cService = import (servicesPath + /gw6c) {
+    inherit (pkgs) stdenv gw6c coreutils 
+      procps upstart iputils gnused 
+      gnugrep seccure writeScript;
+    username = cfg.username;
+    password = cfg.password;
+    server = cfg.server;
+    keepAlive = cfg.keepAlive;
+    everPing = cfg.everPing;
+    seccureKeys = config.security.seccureKeys;
+    waitPingableBroker = cfg.waitPingableBroker;
+  };
+  
+in
+
+{
+
+  ###### interface
 
   options = {
-    services = {
-      gw6c = {
-        enable = mkOption {
-          default = false;
-          description = "
-            Whether to enable Gateway6 client (IPv6 tunnel).
-          ";
-        };
-
-        autorun = mkOption {
-          default = true;
-          description = "
-            Switch to false to create upstart-job and configuration, 
-            but not run it automatically
-          ";
-        };
-
-        username = mkOption {
-          default = "";
-          description = "
-            Your Gateway6 login name, if any.
-          ";
-        };
-
-        password = mkOption {
-          default = "";
-          description = "
-            Your Gateway6 password, if any.
-          ";
-        };
-
-        server = mkOption {
-          default = "anon.freenet6.net";
-          example = "broker.freenet6.net";
-          description = "
-            Used Gateway6 server.
-          ";
-        };
-
-        keepAlive = mkOption {
-          default = "30";
-          example = "2";
-          description = "
-            Gateway6 keep-alive period.
-          ";
-        };
-
-        everPing = mkOption {
-          default = "1000000";
-          example = "2";
-          description = "
-            Gateway6 manual ping period.
-          ";
-        };
-
-        waitPingableBroker = mkOption {
-          default = true;
-          example = false;
-          description = "
-            Whether to wait until tunnel broker returns ICMP echo.
-          ";
-        };
+  
+    services.gw6c = {
+    
+      enable = mkOption {
+        default = false;
+        description = "
+          Whether to enable Gateway6 client (IPv6 tunnel).
+        ";
       };
-    };
-    security = {
-      seccureKeys = {
-        public = mkOption {
-          default = /var/elliptic-keys/public;
-          description = "
-            Public key. Make it path argument, so it is copied into store and
-            hashed. 
-
-            The key is used to encrypt Gateway 6 configuration in store, as it
-            contains a password for external service. Unfortunately, 
-            derivation file should be protected by other means. For example, 
-            nix-http-export.cgi will happily export any non-derivation path,
-            but not a derivation.
-          ";
-        };
-
-        private = mkOption {
-          default = "/var/elliptic-keys/private";
-          description = "
-            Private key. Make it string argument, so it is not copied into store.
-          ";
-        };
+
+      autorun = mkOption {
+        default = true;
+        description = "
+          Switch to false to create upstart-job and configuration, 
+          but not run it automatically
+        ";
+      };
+
+      username = mkOption {
+        default = "";
+        description = "
+          Your Gateway6 login name, if any.
+        ";
+      };
+
+      password = mkOption {
+        default = "";
+        description = "
+          Your Gateway6 password, if any.
+        ";
+      };
+
+      server = mkOption {
+        default = "anon.freenet6.net";
+        example = "broker.freenet6.net";
+        description = "
+          Used Gateway6 server.
+        ";
+      };
+
+      keepAlive = mkOption {
+        default = "30";
+        example = "2";
+        description = "
+          Gateway6 keep-alive period.
+        ";
       };
+
+      everPing = mkOption {
+        default = "1000000";
+        example = "2";
+        description = "
+          Gateway6 manual ping period.
+        ";
+      };
+
+      waitPingableBroker = mkOption {
+        default = true;
+        example = false;
+        description = "
+          Whether to wait until tunnel broker returns ICMP echo.
+        ";
+      };
+
     };
-  };
-in
+    
+    security.seccureKeys = {
+
+      # !!! It's not clear to me (ED) what additional security this
+      # provides.  Passwords shouldn't be in configuration.nix,
+      # period.  You could just place the password in
+      # /var/blah/password or whatever.
+    
+      public = mkOption {
+        default = /var/elliptic-keys/public;
+        description = "
+          Public key. Make it path argument, so it is copied into store and
+          hashed. 
+
+          The key is used to encrypt Gateway 6 configuration in store, as it
+          contains a password for external service. Unfortunately, 
+          derivation file should be protected by other means. For example, 
+          nix-http-export.cgi will happily export any non-derivation path,
+          but not a derivation.
+        ";
+      };
 
-###### implementation
+      private = mkOption {
+        default = "/var/elliptic-keys/private";
+        description = "
+          Private key. Make it string argument, so it is not copied into store.
+        ";
+      };
 
-let
-        cfg = config.services.gw6c;
-        procps = pkgs.procps;
-        gw6cService = import (servicesPath + /gw6c) {
-                inherit (pkgs) stdenv gw6c coreutils 
-                procps upstart iputils gnused 
-                gnugrep seccure writeScript;
-                username = cfg.username;
-                password = cfg.password;
-                server = cfg.server;
-                keepAlive = cfg.keepAlive;
-                everPing = cfg.everPing;
-
-                seccureKeys = config.security.seccureKeys;
-
-                waitPingableBroker = cfg.waitPingableBroker;
-        };
-in
+    };
 
+  };
+  
+
+  ###### implementation
 
-mkIf config.services.gw6c.enable {
-  require = [
-    options
-  ];
+  config = mkIf cfg.enable {
 
-  services = {
-    extraJobs = [{
-        name = "gw6c";
-        users = [];
-        groups = [];
-        job = ''
-          description \"Gateway6 client\"
+    jobAttrs.gw6c =
+      { description = "Gateway6 client";
+      
+        startOn = if cfg.autorun then "network-interfaces/started" else "";
+        stopOn = "network-interfaces/stop";
 
-          start on ${ if cfg.autorun then "network-interfaces/started" else "never" }
-          stop on network-interfaces/stop
+        exec = "${gw6cService}/bin/control start";
+      };
 
-          respawn ${gw6cService}/bin/control start
-        '';
-    }];
   };
+
 }
diff --git a/modules/services/networking/ircd-hybrid.nix b/modules/services/networking/ircd-hybrid.nix
index 070abc1ef22..e59f9a8fa4f 100644
--- a/modules/services/networking/ircd-hybrid.nix
+++ b/modules/services/networking/ircd-hybrid.nix
@@ -1,89 +1,11 @@
-{servicesPath, pkgs, config, ...}:
+{ config, pkgs, servicesPath, ... }:
 
-###### interface
-let
-  inherit (pkgs.lib) mkOption mkIf;
-
-  options = {
-    services = {
-      ircdHybrid = {
-
-        enable = mkOption {
-          default = false;
-          description = "
-            Enable IRCD.
-          ";
-        };
-
-        serverName = mkOption {
-          default = "hades.arpa";
-          description = "
-            IRCD server name.
-          ";
-        };
-
-        sid = mkOption {
-          default = "0NL";
-          description = "
-            IRCD server unique ID in a net of servers.
-          ";
-        };
-
-        description = mkOption {
-          default = "Hybrid-7 IRC server.";
-          description = "
-            IRCD server description.
-          ";
-        };
-
-        rsaKey = mkOption {
-          default = null;
-          example = /root/certificates/irc.key;
-          description = "
-            IRCD server RSA key. 
-          ";
-        };
-
-        certificate = mkOption {
-          default = null;
-          example = /root/certificates/irc.pem;
-          description = "
-            IRCD server SSL certificate. There are some limitations - read manual.
-          ";
-        };
-
-        adminEmail = mkOption {
-          default = "<bit-bucket@example.com>";
-          example = "<name@domain.tld>";
-          description = "
-            IRCD server administrator e-mail. 
-          ";
-        };
-
-        extraIPs = mkOption {
-          default = [];
-          example = ["127.0.0.1"];
-          description = "
-            Extra IP's to bind.
-          ";
-        };
-
-        extraPort = mkOption {
-          default = "7117";
-          description = "
-            Extra port to avoid filtering.
-          ";
-        };
-
-      };
-    };
-  };
-in
-
-###### implementation
+with pkgs.lib;
 
 let
+
   cfg = config.services.ircdHybrid;
+  
   ircdService = import (servicesPath + /ircd-hybrid) {
     stdenv = pkgs.stdenv;
     inherit (pkgs) ircdHybrid coreutils 
@@ -96,35 +18,116 @@ let
     adminEmail = cfg.adminEmail;
     extraIPs = cfg.extraIPs;
     extraPort = cfg.extraPort;
-    gw6cEnabled = (config.services.gw6c.enable) &&
-            (config.services.gw6c.autorun);
+    gw6cEnabled = config.services.gw6c.enable && config.services.gw6c.autorun;
   };
 
   startingDependency = if config.services.gw6c.enable then "gw6c" else "network-interfaces";
 
 in
 
-mkIf config.services.ircdHybrid.enable {
-  require = [
-    options
-  ];
-
-  services = {
-    extraJobs = [{
-      name = "ircd-hybrid";
-      users = [ {
-                      name = "ircd"; 
-                      description = "IRCD owner.";
-              } ];
-      groups = [{name = "ircd";}];
-      job = ''
-        description = "IRCD Hybrid server."
-
-        start on ${startingDependency}/started
-        stop on ${startingDependency}/stop
-
-        respawn ${ircdService}/bin/control start
-      '';
-    }];
+{
+
+  ###### interface
+
+  options = {
+  
+    services.ircdHybrid = {
+
+      enable = mkOption {
+        default = false;
+        description = "
+          Enable IRCD.
+        ";
+      };
+
+      serverName = mkOption {
+        default = "hades.arpa";
+        description = "
+          IRCD server name.
+        ";
+      };
+
+      sid = mkOption {
+        default = "0NL";
+        description = "
+          IRCD server unique ID in a net of servers.
+        ";
+      };
+
+      description = mkOption {
+        default = "Hybrid-7 IRC server.";
+        description = "
+          IRCD server description.
+        ";
+      };
+
+      rsaKey = mkOption {
+        default = null;
+        example = /root/certificates/irc.key;
+        description = "
+          IRCD server RSA key. 
+        ";
+      };
+
+      certificate = mkOption {
+        default = null;
+        example = /root/certificates/irc.pem;
+        description = "
+          IRCD server SSL certificate. There are some limitations - read manual.
+        ";
+      };
+
+      adminEmail = mkOption {
+        default = "<bit-bucket@example.com>";
+        example = "<name@domain.tld>";
+        description = "
+          IRCD server administrator e-mail. 
+        ";
+      };
+
+      extraIPs = mkOption {
+        default = [];
+        example = ["127.0.0.1"];
+        description = "
+          Extra IP's to bind.
+        ";
+      };
+
+      extraPort = mkOption {
+        default = "7117";
+        description = "
+          Extra port to avoid filtering.
+        ";
+      };
+
+    };
+
   };
+
+
+  ###### implementation
+
+  config = mkIf config.services.ircdHybrid.enable {
+
+    users.extraUsers = singleton
+      { name = "ircd"; 
+        description = "IRCD owner";
+      };
+
+    users.extraGroups = singleton
+      { name = "ircd"; };
+
+    jobAttrs.ircd_hybrid =
+      { # name = "ircd-hybrid"; !!! mkIf bug
+
+        description = "IRCD Hybrid server";
+
+        startOn = "${startingDependency}/started";
+        stopOn = "${startingDependency}/stop";
+
+        exec = "${ircdService}/bin/control start";
+      };
+
+  };
+
 }
diff --git a/modules/services/networking/openfire.nix b/modules/services/networking/openfire.nix
index fa51ad173a3..e009498546c 100644
--- a/modules/services/networking/openfire.nix
+++ b/modules/services/networking/openfire.nix
@@ -1,65 +1,62 @@
-{pkgs, config, ...}:
+{ config, pkgs, ... }:
+
+with pkgs.lib;
 
-###### interface
 let
-  inherit (pkgs.lib) mkOption mkIf;
 
-  options = {
-    services = {
-      openfire = {
-        enable = mkOption {
-          default = false;
-          description = "
-            Whether to enable OpenFire XMPP server.
-          ";
-        };
-        usePostgreSQL = mkOption {
-          default = true;
-          description = "
-            Whether you use PostgreSQL service for your storage back-end.
-          ";
-        };
-      };
-    };
-  };
+  inherit (pkgs) jre openfire coreutils which gnugrep gawk gnused;
+    
+  startDependency =
+    if config.services.openfire.usePostgreSQL then "postgresql" else
+    if config.services.gw6c.enable then "gw6c" else
+    "network-interfaces";
+    
 in
 
-###### implementation
+{
 
-let
-  inherit (pkgs) jre openfire coreutils which gnugrep gawk gnused;
+  ###### interface
+
+  options = {
+  
+    services.openfire = {
     
-  startDependency = if config.services.openfire.usePostgreSQL then 
-    "postgresql"
-  else
-    if config.services.gw6c.enable then 
-      "gw6c" 
-    else 
-      "network-interfaces";
-in
+      enable = mkOption {
+        default = false;
+        description = "
+          Whether to enable OpenFire XMPP server.
+        ";
+      };
+      
+      usePostgreSQL = mkOption {
+        default = true;
+        description = "
+          Whether you use PostgreSQL service for your storage back-end.
+        ";
+      };
 
-mkIf config.services.openfire.enable {
+    };
 
-  assertions = [ {
-    assertion = !(config.services.openfire.usePostgreSQL -> config.services.postgresql.enable);
-    message = "openfire assertion failed";
-  } ];
+  };
 
-  require = [
-    options
-  ];
 
+  ###### implementation
 
-  services = {
-      extraJobs = [{
-        name = "openfire";
-        job = ''
-          description "OpenFire XMPP server"
+  config = mkIf config.services.openfire.enable {
 
-          start on ${startDependency}/started
-          stop on shutdown
+    assertions = singleton
+      { assertion = !(config.services.openfire.usePostgreSQL -> config.services.postgresql.enable);
+        message = "openfire assertion failed";
+      };
+
+    jobAttrs.openfire =
+      { description = "OpenFire XMPP server";
+
+        startOn = "${startDependency}/started";
+        stopOn = "shutdown";
 
-          script 
+        script =
+          ''
             export PATH=${jre}/bin:${openfire}/bin:${coreutils}/bin:${which}/bin:${gnugrep}/bin:${gawk}/bin:${gnused}/bin
             export HOME=/tmp
             mkdir /var/log/openfire || true 
@@ -70,8 +67,9 @@ mkIf config.services.openfire.enable {
                 fi
             done
             openfire start
-          end script
-        '';
-    }];
+          ''; # */
+      };
+
   };
+  
 }
diff --git a/modules/services/networking/openvpn.nix b/modules/services/networking/openvpn.nix
index 025a93d20a0..f7a8f51d9b1 100644
--- a/modules/services/networking/openvpn.nix
+++ b/modules/services/networking/openvpn.nix
@@ -1,83 +1,14 @@
+{ config, pkgs, ... }:
 
-{pkgs, config, ...}:
+with pkgs.lib;
 
-###### interface
 let
-  inherit (pkgs.lib) mkOption mkIf;
-
-  options = {
-    services = {
-      openvpn = {
-        enable = mkOption {
-          default = false;
-          description = "
-            Whether to enable the Secure Shell daemon, which allows secure
-            remote logins.
-          ";
-        };
-        servers = mkOption {
-          example = [
-            {
-              id = "server-simplest";
-              config = ''
-                # Most simple configuration: http://openvpn.net/index.php/documentation/miscellaneous/static-key-mini-howto.html.
-                # server : 
-                dev tun
-                ifconfig 10.8.0.1 10.8.0.2
-                secret static.key
-              '';
-              up = "ip route add ..!";
-              down = "ip route add ..!";
-            }
-            {
-              id = "client-simplest";
-              config = ''
-                #client:
-                #remote myremote.mydomain
-                #dev tun
-                #ifconfig 10.8.0.2 10.8.0.1
-                #secret static.key
-              '';
-            }
-            {
-              id = "server-scalable";
-              config = ''
-                multiple clienst
-                see example file found in http://openvpn.net/index.php/documentation/howto.html
-              '';
-            }
-            {
-              id = "client-scalabe";
-              config = '' dito '';
-            }
-          ];
-          default = [];
-          description = ''
-            openvpn instances to be run. Each will be put into an extra job named openvpn-{id}
-
-            The up and down properties will be added config line up=/nix/store/xxx-up-script
-            automatically for you. If you define at least one of up/down
-            "script-security 2" will be prepended to your config.
-
-            Don't forget to check that the all package sizes can be sent. if scp hangs or such you should set
-            --fragment XXX --mssfix YYY.
-          '';
-        };
-      };
-    };
-  };
-
-
-  modprobe = config.system.sbin.modprobe;
-
-###### implementation
 
   cfg = config.services.openvpn;
 
   inherit (pkgs) openvpn;
-  inherit (builtins) hasAttr;
 
-  PATH="${pkgs.iptables}/sbin:${pkgs.coreutils}/bin:${pkgs.iproute}/sbin:${pkgs.nettools}/sbin";
+  PATH = "${pkgs.iptables}/sbin:${pkgs.coreutils}/bin:${pkgs.iproute}/sbin:${pkgs.nettools}/sbin";
 
   makeOpenVPNJob = cfg :
     let
@@ -93,42 +24,105 @@ let
         PATH=${PATH}
         ${cfg.down}
       '';
-      configFile = pkgs.writeText "openvpn-config-${cfg.id}" ''
-      ${if hasAttr "up" cfg || hasAttr "down" cfg then "script-security 2" else ""}
-      ${cfg.config}
-      ${if hasAttr "up" cfg then "up ${pkgs.writeScript "openvpn-${cfg.id}-up" upScript}" else "" }
-      ${if hasAttr "down" cfg then "down ${pkgs.writeScript "openvpn-${cfg.id}-down" downScript}" else "" }
-      '';
+      configFile = pkgs.writeText "openvpn-config-${cfg.id}"
+        ''
+          ${if cfg ? up || cfg ? down then "script-security 2" else ""}
+          ${cfg.config}
+          ${if cfg ? up then "up ${pkgs.writeScript "openvpn-${cfg.id}-up" upScript}" else "" }
+          ${if cfg ? down then "down ${pkgs.writeScript "openvpn-${cfg.id}-down" downScript}" else "" }
+        '';
     in {
-      name = "openvpn-${cfg.id}";
-
-      job = ''
-        description "OpenVPN-${cfg.id}"
-
-        start on network-interfaces/started
-        stop on network-interfaces/stop
+      description = "OpenVPN-${cfg.id}";
 
+      startOn = "network-interfaces/started";
+      stopOn = "network-interfaces/stop";
 
-        PATH=${pkgs.coreutils}/bin
+      environment = { PATH = "${pkgs.coreutils}/bin"; };
 
-        respawn
-        script
+      script =
+        ''
           exec &> /var/log/openvpn-${cfg.id}
-          ${modprobe} tun || true
+          ${config.system.sbin.modprobe} tun || true
           ${openvpn}/sbin/openvpn --config ${configFile}
-        end script
-      '';
+        '';
     };
 
 in
+  
+{
+
+  ###### interface
+
+  options = {
+  
+    services.openvpn = {
+    
+      enable = mkOption {
+        default = false;
+        description = "Whether to enable OpenVPN.";
+      };
+
+      servers = mkOption {
+        example = [
+          {
+            id = "server-simplest";
+            config = ''
+              # Most simple configuration: http://openvpn.net/index.php/documentation/miscellaneous/static-key-mini-howto.html.
+              # server : 
+              dev tun
+              ifconfig 10.8.0.1 10.8.0.2
+              secret static.key
+            '';
+            up = "ip route add ..!";
+            down = "ip route add ..!";
+          }
+          {
+            id = "client-simplest";
+            config = ''
+              #client:
+              #remote myremote.mydomain
+              #dev tun
+              #ifconfig 10.8.0.2 10.8.0.1
+              #secret static.key
+            '';
+          }
+          {
+            id = "server-scalable";
+            config = ''
+              multiple clienst
+              see example file found in http://openvpn.net/index.php/documentation/howto.html
+            '';
+          }
+          {
+            id = "client-scalabe";
+            config = '' dito '';
+          }
+        ];
+        default = [];
+        # !!! clean up this description please
+        description = ''
+          openvpn instances to be run. Each will be put into an extra job named openvpn-{id}
+
+          The up and down properties will be added config line up=/nix/store/xxx-up-script
+          automatically for you. If you define at least one of up/down
+          "script-security 2" will be prepended to your config.
+
+          Don't forget to check that the all package sizes can be sent. if scp hangs or such you should set
+          --fragment XXX --mssfix YYY.
+        '';
+      };
+      
+    };
+
+  };
+
 
+  ###### implementation
 
-mkIf cfg.enable {
-  require = [
-    options
-  ];
+  config = mkIf cfg.enable {
 
-  services = {
-    extraJobs = map makeOpenVPNJob cfg.servers;
+    jobAttrs = listToAttrs (map (c: nameValuePair "openvpn-${cfg.id}" (makeOpenVPNJob c)) cfg.servers);
+  
   };
+  
 }
diff --git a/modules/services/networking/portmap.nix b/modules/services/networking/portmap.nix
index 5583108f894..08cd2457bcc 100644
--- a/modules/services/networking/portmap.nix
+++ b/modules/services/networking/portmap.nix
@@ -1,89 +1,84 @@
-{pkgs, config, ...}:
+{ config, pkgs, ... }:
+
+with pkgs.lib;
 
-###### interface
 let
-  inherit (pkgs.lib) mkOption mkIf;
 
-  options = {
-    services = {
-      portmap = {
-        enable = mkOption {
-          default = false;
-          description = ''
-            Whether to enable `portmap', an ONC RPC directory service
-            notably used by NFS and NIS, and which can be queried
-            using the rpcinfo(1) command.
-          '';
-        };
+  uid = config.ids.uids.portmap;
+  gid = config.ids.gids.portmap;
 
-        verbose = mkOption {
-          default = false;
-          description = ''
-            Whether to enable verbose output.
-          '';
-        };
+  portmap = pkgs.portmap.override { daemonUID = uid; daemonGID = gid; };
+  
+in
 
-        chroot = mkOption {
-          default = "/var/empty";
-          description = ''
-            If non-empty, a path to change root to.
-          '';
-        };
+{
 
+  ###### interface
+
+  options = {
+  
+    services.portmap = {
+    
+      enable = mkOption {
+        default = false;
+        description = ''
+          Whether to enable `portmap', an ONC RPC directory service
+          notably used by NFS and NIS, and which can be queried
+          using the rpcinfo(1) command.
+        '';
       };
-    };
-  };
-in
 
-###### implementation
+      verbose = mkOption {
+        default = false;
+        description = ''
+          Whether to enable verbose output.
+        '';
+      };
 
-let uid = config.ids.uids.portmap;
-    gid = config.ids.gids.portmap;
-in
+      chroot = mkOption {
+        default = "/var/empty";
+        description = ''
+          If non-empty, a path to change root to.
+        '';
+      };
 
-mkIf config.services.portmap.enable {
+    };
 
-  require = [
-    options
-  ];
+  };
+  
 
+  ###### implementation
 
-  users = {
-    extraUsers = [
+  config = mkIf config.services.portmap.enable {
+
+    users.extraUsers = singleton
       { name = "portmap";
         inherit uid;
         description = "portmap daemon user";
         home = "/var/empty";
-      }
-    ];
+      };
 
-    extraGroups = [
+    users.extraGroups = singleton
       { name = "portmap";
         inherit gid;
-      }
-    ];
-  };
+      };
 
-  services = {
-    extraJobs = [{ 
-      name = "portmap";
-      
+    jobAttrs.portmap =
+      { description = "ONC RPC portmap";
 
-      job =
-        let portmap = pkgs.portmap.override { daemonUID = uid; daemonGID = gid; };
-        in
-          ''
-          description "ONC RPC portmap"
+        startOn = "network-interfaces/started";
+        stopOn = "network-interfaces/stop";
 
-          start on network-interfaces/started
-          stop on network-interfaces/stop
+        exec =
+          ''
+            ${portmap}/sbin/portmap -f \
+              ${if config.services.portmap.chroot == ""
+                then ""
+                else "-t \"${config.services.portmap.chroot}\""} \
+              ${if config.services.portmap.verbose then "-v" else ""}
+          '';
+      };
 
-          respawn ${portmap}/sbin/portmap -f \
-            ${if config.services.portmap.chroot == ""
-              then ""
-              else "-t \"${config.services.portmap.chroot}\""} \
-            ${if config.services.portmap.verbose then "-v" else ""}
-        '';
-    }];
   };
+
 }
diff --git a/modules/services/networking/ssh/lshd.nix b/modules/services/networking/ssh/lshd.nix
index c6b529e66ee..35eaa0c743f 100644
--- a/modules/services/networking/ssh/lshd.nix
+++ b/modules/services/networking/ssh/lshd.nix
@@ -1,138 +1,132 @@
-{pkgs, config, ...}:
+{ config, pkgs, ... }:
 
-###### interface
-let
-  inherit (pkgs.lib) mkOption mkIf;
+with pkgs.lib;
+
+let 
+
+  inherit (pkgs) lsh;
+
+  cfg = config.services.lshd;
+
+in
+
+{
+
+  ###### interface
 
   options = {
-    services = {
-      lshd = {
-
-        enable = mkOption {
-          default = false;
-          description = ''
-            Whether to enable the GNU lshd SSH2 daemon, which allows
-            secure remote login.
-          '';
-        };
+  
+    services.lshd = {
+
+      enable = mkOption {
+        default = false;
+        description = ''
+          Whether to enable the GNU lshd SSH2 daemon, which allows
+          secure remote login.
+        '';
+      };
 
-        portNumber = mkOption {
-          default = 22;
-          description = ''
-            The port on which to listen for connections.
-          '';
-        };
-
-        interfaces = mkOption {
-          default = [];
-          description = ''
-            List of network interfaces where listening for connections.
-            When providing the empty list, `[]', lshd listens on all
-            network interfaces.
-          '';
-          example = [ "localhost" "1.2.3.4:443" ];
-        };
-
-        hostKey = mkOption {
-          default = "/etc/lsh/host-key";
-          description = ''
-            Path to the server's private key.  Note that this key must
-            have been created, e.g., using "lsh-keygen --server |
-            lsh-writekey --server", so that you can run lshd.
-          '';
-        };
-
-        syslog = mkOption {
-          default = true;
-          description = ''Whether to enable syslog output.'';
-        };
-
-        passwordAuthentication = mkOption {
-          default = true;
-          description = ''Whether to enable password authentication.'';
-        };
-
-        publicKeyAuthentication = mkOption {
-          default = true;
-          description = ''Whether to enable public key authentication.'';
-        };
-
-        rootLogin = mkOption {
-          default = false;
-          description = ''Whether to enable remote root login.'';
-        };
-
-        loginShell = mkOption {
-          default = null;
-          description = ''
-            If non-null, override the default login shell with the
-            specified value.
-          '';
-          example = "/nix/store/xyz-bash-10.0/bin/bash10";
-        };
+      portNumber = mkOption {
+        default = 22;
+        description = ''
+          The port on which to listen for connections.
+        '';
+      };
 
-        srpKeyExchange = mkOption {
-          default = false;
-          description = ''
-            Whether to enable SRP key exchange and user authentication.
-          '';
-        };
-
-        tcpForwarding = mkOption {
-          default = true;
-          description = ''Whether to enable TCP/IP forwarding.'';
-        };
-
-        x11Forwarding = mkOption {
-          default = true;
-          description = ''Whether to enable X11 forwarding.'';
-        };
-
-        subsystems = mkOption {
-          default = [ ["sftp" "${pkgs.lsh}/sbin/sftp-server"] ];
-          description = ''
-            List of subsystem-path pairs, where the head of the pair
-            denotes the subsystem name, and the tail denotes the path to
-            an executable implementing it.
-          '';
-        };
+      interfaces = mkOption {
+        default = [];
+        description = ''
+          List of network interfaces where listening for connections.
+          When providing the empty list, `[]', lshd listens on all
+          network interfaces.
+        '';
+        example = [ "localhost" "1.2.3.4:443" ];
       };
-    };
-  };
-in
 
-###### implementation
+      hostKey = mkOption {
+        default = "/etc/lsh/host-key";
+        description = ''
+          Path to the server's private key.  Note that this key must
+          have been created, e.g., using "lsh-keygen --server |
+          lsh-writekey --server", so that you can run lshd.
+        '';
+      };
 
-let 
+      syslog = mkOption {
+        default = true;
+        description = ''Whether to enable syslog output.'';
+      };
 
-  inherit (pkgs) lsh;
-  inherit (pkgs.lib) concatStrings concatStringsSep head tail;
+      passwordAuthentication = mkOption {
+        default = true;
+        description = ''Whether to enable password authentication.'';
+      };
 
-  lshdConfig = config.services.lshd;
+      publicKeyAuthentication = mkOption {
+        default = true;
+        description = ''Whether to enable public key authentication.'';
+      };
 
-  nssModules = config.system.nssModules.list;
+      rootLogin = mkOption {
+        default = false;
+        description = ''Whether to enable remote root login.'';
+      };
 
-  nssModulesPath = config.system.nssModules.path;
-in
+      loginShell = mkOption {
+        default = null;
+        description = ''
+          If non-null, override the default login shell with the
+          specified value.
+        '';
+        example = "/nix/store/xyz-bash-10.0/bin/bash10";
+      };
 
-mkIf config.services.lshd.enable {
-  require = [
-    options
-  ];
+      srpKeyExchange = mkOption {
+        default = false;
+        description = ''
+          Whether to enable SRP key exchange and user authentication.
+        '';
+      };
 
-  services = {
-    extraJobs = [{
-      name = "lshd";
+      tcpForwarding = mkOption {
+        default = true;
+        description = ''Whether to enable TCP/IP forwarding.'';
+      };
+
+      x11Forwarding = mkOption {
+        default = true;
+        description = ''Whether to enable X11 forwarding.'';
+      };
+
+      subsystems = mkOption {
+        default = [ ["sftp" "${pkgs.lsh}/sbin/sftp-server"] ];
+        description = ''
+          List of subsystem-path pairs, where the head of the pair
+          denotes the subsystem name, and the tail denotes the path to
+          an executable implementing it.
+        '';
+      };
       
-      job = with lshdConfig; ''
-        description "GNU lshd SSH2 daemon"
+    };
 
-        start on network-interfaces/started
-        stop on network-interfaces/stop
+  };
 
-        env LD_LIBRARY_PATH=${nssModulesPath}
 
-        start script
+  ###### implementation
+
+  config = mkIf cfg.enable {
+
+    jobAttrs.lshd =
+      { description = "GNU lshd SSH2 daemon";
+
+        startOn = "network-interfaces/started";
+        stopOn = "network-interfaces/stop";
+
+        environment =
+          { LD_LIBRARY_PATH = config.system.nssModules.path; };
+
+        preStart =
+          ''
             test -d /etc/lsh || mkdir -m 0755 -p /etc/lsh
             test -d /var/spool/lsh || mkdir -m 0755 -p /var/spool/lsh
 
@@ -144,35 +138,37 @@ mkIf config.services.lshd.enable {
                 ${lsh}/bin/lsh-make-seed -o /var/spool/lsh/yarrow-seed-file
             fi
 
-            if ! test -f "${hostKey}"
+            if ! test -f "${cfg.hostKey}"
             then
                 ${lsh}/bin/lsh-keygen --server | \
-                ${lsh}/bin/lsh-writekey --server -o "${hostKey}"
+                ${lsh}/bin/lsh-writekey --server -o "${cfg.hostKey}"
             fi
-        end script
-
-        respawn ${lsh}/sbin/lshd --daemonic \
-           --password-helper="${lsh}/sbin/lsh-pam-checkpw" \
-           -p ${toString portNumber} \
-           ${if interfaces == [] then ""
-             else (concatStrings (map (i: "--interface=\"${i}\"")
-                                      interfaces))} \
-           -h "${hostKey}" \
-           ${if !syslog then "--no-syslog" else ""} \
-           ${if passwordAuthentication then "--password" else "--no-password" } \
-           ${if publicKeyAuthentication then "--publickey" else "--no-publickey" } \
-           ${if rootLogin then "--root-login" else "--no-root-login" } \
-           ${if loginShell != null then "--login-shell=\"${loginShell}\"" else "" } \
-           ${if srpKeyExchange then "--srp-keyexchange" else "--no-srp-keyexchange" } \
-           ${if !tcpForwarding then "--no-tcpip-forward" else "--tcpip-forward"} \
-           ${if x11Forwarding then "--x11-forward" else "--no-x11-forward" } \
-           --subsystems=${concatStringsSep ","
-                                           (map (pair: (head pair) + "=" +
-                                                       (head (tail pair)))
-                                                subsystems)}
-    '';
-  
-}
-    ];
+          '';
+
+        exec = with cfg;
+          ''
+            ${lsh}/sbin/lshd --daemonic \
+              --password-helper="${lsh}/sbin/lsh-pam-checkpw" \
+              -p ${toString portNumber} \
+              ${if interfaces == [] then ""
+                else (concatStrings (map (i: "--interface=\"${i}\"")
+                                         interfaces))} \
+              -h "${hostKey}" \
+              ${if !syslog then "--no-syslog" else ""} \
+              ${if passwordAuthentication then "--password" else "--no-password" } \
+              ${if publicKeyAuthentication then "--publickey" else "--no-publickey" } \
+              ${if rootLogin then "--root-login" else "--no-root-login" } \
+              ${if loginShell != null then "--login-shell=\"${loginShell}\"" else "" } \
+              ${if srpKeyExchange then "--srp-keyexchange" else "--no-srp-keyexchange" } \
+              ${if !tcpForwarding then "--no-tcpip-forward" else "--tcpip-forward"} \
+              ${if x11Forwarding then "--x11-forward" else "--no-x11-forward" } \
+              --subsystems=${concatStringsSep ","
+                                              (map (pair: (head pair) + "=" +
+                                                          (head (tail pair)))
+                                                   subsystems)}
+          '';
+      };
+         
   };
+  
 }
diff --git a/modules/services/networking/vsftpd.nix b/modules/services/networking/vsftpd.nix
index a0630de77cc..2a567f3ec90 100644
--- a/modules/services/networking/vsftpd.nix
+++ b/modules/services/networking/vsftpd.nix
@@ -1,160 +1,135 @@
-{pkgs, config, ...}:
+{ config, pkgs, ... }:
 
-###### interface
-let
-  inherit (pkgs.lib) mkOption mkIf;
+with pkgs.lib;
 
-  options = {
-    services = {
-      vsftpd = {
-        enable = mkOption {
-          default = false;
-          description = "
-            Whether to enable the vsftpd FTP server.
-          ";
-        };
-        
-        anonymousUser = mkOption {
-          default = false;
-          description = "
-            Whether to enable the anonymous FTP user.
-          ";
-        };
- 
-        anonymousUserHome = mkOption {
-          default = "/home/ftp";
-          description = "
-            Path to anonymous user data.
-          ";
-        };
- 
-        localUsers = mkOption {
-          default = false;
-          description = "
-            Whether to enable FTP for the local users.
-          ";
-        };
+let 
 
-        writeEnable = mkOption {
-          default = false;
-          description = "
-            Whether any write activity is permitted to users.
-          ";
-        };
+  cfg = config.services.vsftpd;
+  
+  inherit (pkgs) vsftpd;
 
-        anonymousUploadEnable = mkOption {
-          default = false;
-          description = "
-            Whether any uploads are permitted to anonymous users.
-          ";
-        };
+  yesNoOption = p : name :
+    "${name}=${if p then "YES" else "NO"}";
 
-        anonymousMkdirEnable = mkOption {
-          default = false;
-          description = "
-            Whether mkdir is permitted to anonymous users.
-          ";
-        };
+in
 
-        chrootlocalUser = mkOption {
-          default = false;
-          description = "
-            Whether u can like out of ur home dir.
-          ";
-        };
-  
-        userlistEnable  = mkOption {
-          default = false;
-          description = "
-            Whether users are included.
-          ";
-        };
+{
+
+  ###### interface
+
+  options = {
   
-        userlistDeny  = mkOption {
-          default = false;
-          description = "
-            Whether users are excluded.
-          ";
-        };
+    services.vsftpd = {
+    
+      enable = mkOption {
+        default = false;
+        description = "Whether to enable the vsftpd FTP server.";
       };
-    };
-  };
-in
 
-###### implementation
+      anonymousUser = mkOption {
+        default = false;
+        description = "Whether to enable the anonymous FTP user.";
+      };
 
-let 
+      anonymousUserHome = mkOption {
+        default = "/home/ftp";
+        description = "Path to anonymous user data.";
+      };
 
-  inherit (config.services.vsftpd) anonymousUser anonymousUserHome localUsers writeEnable anonymousUploadEnable anonymousMkdirEnable
-    chrootlocalUser userlistEnable userlistDeny;
-  inherit (pkgs) vsftpd;
+      localUsers = mkOption {
+        default = false;
+        description = "Whether to enable FTP for local users.";
+      };
 
-  yesNoOption = p : name :
-    "${name}=${if p then "YES" else "NO"}";
+      writeEnable = mkOption {
+        default = false;
+        description = "Whether any write activity is permitted to users.";
+      };
 
-in
+      anonymousUploadEnable = mkOption {
+        default = false;
+        description = "Whether any uploads are permitted to anonymous users.";
+      };
+
+      anonymousMkdirEnable = mkOption {
+        default = false;
+        description = "Whether mkdir is permitted to anonymous users.";
+      };
+
+      chrootlocalUser = mkOption {
+        default = false;
+        description = "Whether local users are confined to their home directory.";
+      };
+
+      userlistEnable = mkOption {
+        default = false;
+        description = "Whether users are included.";
+      };
+
+      userlistDeny = mkOption {
+        default = false;
+        description = "Whether users are excluded.";
+      };
+
+    };
+    
+  };
+  
 
-mkIf config.services.vsftpd.enable {
-  require = [
-    options
-  ];
+  ###### implementation
 
-  users = {
-    extraUsers = [
-        { name = "vsftpd";
+  config = mkIf cfg.enable {
+
+    users.extraUsers =
+      [ { name = "vsftpd";
           uid = config.ids.uids.vsftpd;
           description = "VSFTPD user";
           home = "/homeless-shelter";
         }
-      ] ++ pkgs.lib.optional anonymousUser
+      ] ++ pkgs.lib.optional cfg.anonymousUser
         { name = "ftp";
           uid = config.ids.uids.ftp;
           group = "ftp";
-          description = "Anonymous ftp user";
-          home = anonymousUserHome;
+          description = "Anonymous FTP user";
+          home = cfg.anonymousUserHome;
         };
 
-    extraGroups = [
+    users.extraGroups = singleton
       { name = "ftp";
         gid = config.ids.gids.ftp;
-      }
-    ];
-      
-  };
+      };
+
+    jobAttrs.vsftpd =
+      { description = "vsftpd server";
+
+        startOn = "network-interfaces/started";
+        stopOn = "network-interfaces/stop";
+
+        preStart =
+          ''
+            # !!! Why isn't this generated in the normal way?
+            cat > /etc/vsftpd.conf <<EOF
+            ${yesNoOption cfg.anonymousUser "anonymous_enable"}
+            ${yesNoOption cfg.localUsers "local_enable"}
+            ${yesNoOption cfg.writeEnable "write_enable"}
+            ${yesNoOption cfg.anonymousUploadEnable "anon_upload_enable"}
+            ${yesNoOption cfg.anonymousMkdirEnable "anon_mkdir_write_enable"}
+            ${yesNoOption cfg.chrootlocalUser "chroot_local_user"}
+            ${yesNoOption cfg.userlistEnable "userlist_enable"}
+            ${yesNoOption cfg.userlistDeny "userlist_deny"}
+            background=NO
+            listen=YES
+            nopriv_user=vsftpd
+            secure_chroot_dir=/var/ftp/empty
+            EOF
+
+            mkdir -p ${cfg.anonymousUserHome}
+            chown -R ftp:ftp ${cfg.anonymousUserHome}
+          '';
+
+        exec = "${vsftpd}/sbin/vsftpd /etc/vsftpd.conf";
+      };
 
-  services = {
-    extraJobs = [{
-      name = "vsftpd";
-
-      job = ''
-        description "vsftpd server"
-
-        start on network-interfaces/started
-        stop on network-interfaces/stop
-
-        start script
-        cat > /etc/vsftpd.conf <<EOF
-        ${yesNoOption anonymousUser "anonymous_enable"}
-        ${yesNoOption localUsers "local_enable"}
-        ${yesNoOption writeEnable "write_enable"}
-        ${yesNoOption anonymousUploadEnable "anon_upload_enable"}
-        ${yesNoOption anonymousMkdirEnable "anon_mkdir_write_enable"}
-        ${yesNoOption chrootlocalUser "chroot_local_user"}
-        ${yesNoOption userlistEnable "userlist_enable"}
-        ${yesNoOption userlistDeny "userlist_deny"}
-        background=NO
-        listen=YES
-        nopriv_user=vsftpd
-        secure_chroot_dir=/var/ftp/empty
-        EOF
-
-        mkdir -p ${anonymousUserHome} &&
-        chown -R ftp:ftp ${anonymousUserHome}
-        end script
-
-        respawn ${vsftpd}/sbin/vsftpd /etc/vsftpd.conf
-      '';
-      
-    }];
   };
+  
 }
diff --git a/modules/services/printing/cupsd.nix b/modules/services/printing/cupsd.nix
index 63c4d3b1df4..f6c65250162 100644
--- a/modules/services/printing/cupsd.nix
+++ b/modules/services/printing/cupsd.nix
@@ -1,41 +1,13 @@
-{pkgs, config, ...}:
+{ config, pkgs, ... }:
 
-###### interface
-let
-  inherit (pkgs.lib) mkOption mkIf;
-
-  options = {
-    services = {
-      printing = {
-
-        enable = mkOption {
-          default = false;
-          description = "
-            Whether to enable printing support through the CUPS daemon.
-          ";
-        };
-
-        bindirCmds = mkOption {
-          default = "";
-          description = "
-            add commands adding additional symlinks to the bindir such as bjnp
-          ";
-        };
-
-      };
-    };
-  };
-in
-
-###### implementation
+with pkgs.lib;
 
 let
 
-  logDir = "/var/log/cups";
-
-
   inherit (pkgs) cups;
 
+  logDir = "/var/log/cups";
+
   modprobe = config.system.sbin.modprobe;
 
   cfg = config.services.printing;
@@ -45,135 +17,163 @@ let
   # we can't update ${cups}/lib/cups itself, we create a symlink tree
   # here and add the additional programs.  The ServerBin directive in
   # cupsd.conf tells cupsd to use this tree.
-  bindir = pkgs.runCommand "cups-progs" {} ''
-    ensureDir $out/lib/cups
-    ln -s ${cups}/lib/cups/* $out/lib/cups/
-
-    # Provide support for printing via SMB.    
-    rm $out/lib/cups/backend
-    ensureDir $out/lib/cups/backend
-    ln -s ${cups}/lib/cups/backend/* $out/lib/cups/backend/
-    ln -s ${pkgs.samba}/bin/smbspool $out/lib/cups/backend/smb
-
-    # Provide support for printing via HTTPS.
-    ln -s ipp $out/lib/cups/backend/https
-
-    # Provide Ghostscript rasterisation, necessary for non-Postscript
-    # printers.
-    rm $out/lib/cups/filter
-    ensureDir $out/lib/cups/filter
-    ln -s ${cups}/lib/cups/filter/* $out/lib/cups/filter/
-    ln -s ${pkgs.ghostscript}/lib/cups/filter/* $out/lib/cups/filter/
-    ${cfg.bindirCmds}
-  ''; # */
+  bindir = pkgs.runCommand "cups-progs" {}
+    ''
+      ensureDir $out/lib/cups
+      ln -s ${cups}/lib/cups/* $out/lib/cups/
+
+      # Provide support for printing via SMB.    
+      rm $out/lib/cups/backend
+      ensureDir $out/lib/cups/backend
+      ln -s ${cups}/lib/cups/backend/* $out/lib/cups/backend/
+      ln -s ${pkgs.samba}/bin/smbspool $out/lib/cups/backend/smb
+
+      # Provide support for printing via HTTPS.
+      ln -s ipp $out/lib/cups/backend/https
+
+      # Provide Ghostscript rasterisation, necessary for non-Postscript
+      # printers.
+      rm $out/lib/cups/filter
+      ensureDir $out/lib/cups/filter
+      ln -s ${cups}/lib/cups/filter/* $out/lib/cups/filter/
+      ln -s ${pkgs.ghostscript}/lib/cups/filter/* $out/lib/cups/filter/
+      ${cfg.bindirCmds}
+    ''; # */
   
 
-  cupsdConfig = pkgs.writeText "cupsd.conf" ''
-    LogLevel debug
+  cupsdConfig = pkgs.writeText "cupsd.conf"
+    ''
+      LogLevel debug
 
-    SystemGroup root
+      SystemGroup root
 
-    Listen localhost:631
-    Listen /var/run/cups/cups.sock
+      Listen localhost:631
+      Listen /var/run/cups/cups.sock
 
-    # Note: we can't use ${cups}/etc/cups as the ServerRoot, since
-    # CUPS will write in the ServerRoot when e.g. adding new printers
-    # through the web interface.
-    ServerRoot /etc/cups
+      # Note: we can't use ${cups}/etc/cups as the ServerRoot, since
+      # CUPS will write in the ServerRoot when e.g. adding new printers
+      # through the web interface.
+      ServerRoot /etc/cups
 
-    ServerBin ${bindir}/lib/cups
+      ServerBin ${bindir}/lib/cups
 
-    AccessLog ${logDir}/access_log
-    ErrorLog ${logDir}/access_log
-    PageLog ${logDir}/page_log
+      AccessLog ${logDir}/access_log
+      ErrorLog ${logDir}/access_log
+      PageLog ${logDir}/page_log
 
-    TempDir /tmp
+      TempDir /tmp
 
-    Browsing On
-    BrowseOrder allow,deny
-    BrowseAllow @LOCAL
+      Browsing On
+      BrowseOrder allow,deny
+      BrowseAllow @LOCAL
 
-    DefaultAuthType Basic
+      DefaultAuthType Basic
 
-    <Location />
-      Order allow,deny
-      Allow localhost
-    </Location>
-    
-    <Location /admin>
-      Order allow,deny
-      Allow localhost
-    </Location>
-    
-    <Location /admin/conf>
-      AuthType Basic
-      Require user @SYSTEM
-      Order allow,deny
-      Allow localhost
-    </Location>
-
-    <Policy default>
-      <Limit Send-Document Send-URI Hold-Job Release-Job Restart-Job Purge-Jobs Set-Job-Attributes Create-Job-Subscription Renew-Subscription Cancel-Subscription Get-Notifications Reprocess-Job Cancel-Current-Job Suspend-Current-Job Resume-Job CUPS-Move-Job>
-        Require user @OWNER @SYSTEM
-        Order deny,allow
-      </Limit>
-
-      <Limit Pause-Printer Resume-Printer Set-Printer-Attributes Enable-Printer Disable-Printer Pause-Printer-After-Current-Job Hold-New-Jobs Release-Held-New-Jobs Deactivate-Printer Activate-Printer Restart-Printer Shutdown-Printer Startup-Printer Promote-Job Schedule-Job-After CUPS-Add-Printer CUPS-Delete-Printer CUPS-Add-Class CUPS-Delete-Class CUPS-Accept-Jobs CUPS-Reject-Jobs CUPS-Set-Default>
+      <Location />
+        Order allow,deny
+        Allow localhost
+      </Location>
+
+      <Location /admin>
+        Order allow,deny
+        Allow localhost
+      </Location>
+
+      <Location /admin/conf>
         AuthType Basic
         Require user @SYSTEM
-        Order deny,allow
-      </Limit>
+        Order allow,deny
+        Allow localhost
+      </Location>
+
+      <Policy default>
+        <Limit Send-Document Send-URI Hold-Job Release-Job Restart-Job Purge-Jobs Set-Job-Attributes Create-Job-Subscription Renew-Subscription Cancel-Subscription Get-Notifications Reprocess-Job Cancel-Current-Job Suspend-Current-Job Resume-Job CUPS-Move-Job>
+          Require user @OWNER @SYSTEM
+          Order deny,allow
+        </Limit>
+
+        <Limit Pause-Printer Resume-Printer Set-Printer-Attributes Enable-Printer Disable-Printer Pause-Printer-After-Current-Job Hold-New-Jobs Release-Held-New-Jobs Deactivate-Printer Activate-Printer Restart-Printer Shutdown-Printer Startup-Printer Promote-Job Schedule-Job-After CUPS-Add-Printer CUPS-Delete-Printer CUPS-Add-Class CUPS-Delete-Class CUPS-Accept-Jobs CUPS-Reject-Jobs CUPS-Set-Default>
+          AuthType Basic
+          Require user @SYSTEM
+          Order deny,allow
+        </Limit>
+
+        <Limit Cancel-Job CUPS-Authenticate-Job>
+          Require user @OWNER @SYSTEM
+          Order deny,allow
+        </Limit>
+
+        <Limit All>
+          Order deny,allow
+        </Limit>
+      </Policy>
+    '';
 
-      <Limit Cancel-Job CUPS-Authenticate-Job>
-        Require user @OWNER @SYSTEM
-        Order deny,allow
-      </Limit>
+in
 
-      <Limit All>
-        Order deny,allow
-      </Limit>
-    </Policy>
-  '';
+{
 
-in
+  ###### interface
+
+  options = {
+  
+    services.printing = {
+
+      enable = mkOption {
+        default = false;
+        description = ''
+          Whether to enable printing support through the CUPS daemon.
+        '';
+      };
+
+      bindirCmds = mkOption {
+        default = "";
+        description = ''
+          Additional commands executed while creating the directory
+          containing the CUPS server binaries.
+        '';
+      };
 
+    };
 
-mkIf config.services.printing.enable {
-  require = [
-    options
-  ];
+  };
 
-  environment.systemPackages = [cups];
+    
+  ###### implementation
 
-  environment.etc =
-    [ # CUPS expects the following files in its ServerRoot.
-      { source = "${cups}/etc/cups/mime.convs";
-        target = "cups/mime.convs";
-      }
-      { source = "${cups}/etc/cups/mime.types";
-        target = "cups/mime.types";
-      }
-    ];
+  config = mkIf config.services.printing.enable {
 
-  services.extraJobs = pkgs.lib.singleton
-    { name = "cupsd";
+    environment.systemPackages = [cups];
 
-      job = ''
-        description "CUPS printing daemon"
+    environment.etc =
+      [ # CUPS expects the following files in its ServerRoot.
+        { source = "${cups}/etc/cups/mime.convs";
+          target = "cups/mime.convs";
+        }
+        { source = "${cups}/etc/cups/mime.types";
+          target = "cups/mime.types";
+        }
+      ];
 
-        start on network-interfaces/started
-        stop on network-interfaces/stop
+    jobAttrs.cupsd =
+      { description = "CUPS printing daemon";
 
-        start script
+        startOn = "network-interfaces/started";
+        stopOn = "network-interfaces/stop";
+
+        preStart =
+          ''
             mkdir -m 0755 -p ${logDir}
             mkdir -m 0700 -p /var/cache/cups
             mkdir -m 0700 -p /var/spool/cups
 
             # Make USB printers show up.
             ${modprobe}/sbin/modprobe usblp || true
-        end script
+          '';
 
-        respawn ${cups}/sbin/cupsd -c ${cupsdConfig} -F
-      '';
-    };
+        exec = "${cups}/sbin/cupsd -c ${cupsdConfig} -F";
+      };
+
+  };
+  
 }
diff --git a/modules/services/scheduling/cron.nix b/modules/services/scheduling/cron.nix
index 2b4dcc825c5..19ea49619ec 100644
--- a/modules/services/scheduling/cron.nix
+++ b/modules/services/scheduling/cron.nix
@@ -1,92 +1,82 @@
-{pkgs, config, ...}:
+{ config, pkgs, ... }:
+
+with pkgs.lib;
 
-###### interface
 let
-  inherit (pkgs.lib) mkOption;
+
+  inherit (config.services) jobsTags;
+
+  # Put all the system cronjobs together.
+  systemCronJobsFile = pkgs.writeText "system-crontab"
+    ''
+      SHELL=${pkgs.bash}/bin/sh
+      PATH=${pkgs.coreutils}/bin:${pkgs.findutils}/bin:${pkgs.gnused}/bin:${pkgs.su}/bin
+      MAILTO="${config.services.cron.mailto}"
+      ${pkgs.lib.concatStrings (map (job: job + "\n") config.services.cron.systemCronJobs)}
+    '';
+  
+in
+
+{
+
+  ###### interface
 
   options = {
-    services = {
-      cron = {
-
-        mailto = mkOption {
-          default = "";
-          description = " The job output will be mailed to this email address. ";
-        };
-
-        systemCronJobs = mkOption {
-          default = [];
-          example = [
-            "* * * * *  test   ls -l / > /tmp/cronout 2>&1"
-            "* * * * *  eelco  echo Hello World > /home/eelco/cronout"
-          ];
-          description = ''
-            A list of Cron jobs to be appended to the system-wide
-            crontab.  See the manual page for crontab for the expected
-            format. If you want to get the results mailed you must setuid
-            sendmail. See <option>security.setuidOwners</option>
-
-            If neither /var/cron/cron.deny nor /var/cron/cron.allow exist only root
-            will is allowed to have its own crontab file. The /var/cron/cron.deny file
-            is created automatically for you. So every user can use a crontab.
-          '';
-        };
+  
+    services.cron = {
 
+      mailto = mkOption {
+        default = "";
+        description = " The job output will be mailed to this email address. ";
       };
+
+      systemCronJobs = mkOption {
+        default = [];
+        example = [
+          "* * * * *  test   ls -l / > /tmp/cronout 2>&1"
+          "* * * * *  eelco  echo Hello World > /home/eelco/cronout"
+        ];
+        description = ''
+          A list of Cron jobs to be appended to the system-wide
+          crontab.  See the manual page for crontab for the expected
+          format. If you want to get the results mailed you must setuid
+          sendmail. See <option>security.setuidOwners</option>
+
+          If neither /var/cron/cron.deny nor /var/cron/cron.allow exist only root
+          will is allowed to have its own crontab file. The /var/cron/cron.deny file
+          is created automatically for you. So every user can use a crontab.
+        '';
+      };
+
     };
+    
   };
-in
 
-###### implementation
-let
-  inherit (config.services) jobsTags;
 
-  # Put all the system cronjobs together.
-  systemCronJobs =
-    config.services.cron.systemCronJobs;
-
-  systemCronJobsFile = pkgs.writeText "system-crontab" ''
-    SHELL=${pkgs.bash}/bin/sh
-    PATH=${pkgs.coreutils}/bin:${pkgs.findutils}/bin:${pkgs.gnused}/bin:${pkgs.su}/bin
-    MAILTO="${config.services.cron.mailto}"
-    ${pkgs.lib.concatStrings (map (job: job + "\n") systemCronJobs)}
-  '';
-in
+  ###### implementation
 
-{
-  require = [
-    # ../upstart-jobs/default.nix # config.services.extraJobs
-    # ? # config.time.timeZone
-    # ? # config.environment.etc
-    # ? # config.environment.extraPackages
-    options
-  ];
-
-  environment = {
-    etc = [
+  config = {  
+
+    environment.etc = singleton
       # The system-wide crontab.
       { source = systemCronJobsFile;
         target = "crontab";
         mode = "0600"; # Cron requires this.
-      }
-    ];
-
-    systemPackages = [pkgs.cron];
-  };
-
-  services = {
-    extraJobs = [{
-      name = "cron";
+      };
 
-      job = ''
-        description "Cron daemon"
+    environment.systemPackages = [pkgs.cron];
 
-        start on startup
-        stop on shutdown
+    jobAttrs.cron =
+      { description = "Cron daemon";
 
+        startOn = "startup";
+        stopOn = "shutdown";
+ 
         # Needed to interpret times in the local timezone.
-        env TZ=${config.time.timeZone}
+        environment = { TZ = config.time.timeZone; };
 
-        start script
+        preStart =
+          ''
             mkdir -m 710 -p /var/cron
 
             # By default, allow all users to create a crontab.  This
@@ -94,10 +84,11 @@ in
             if ! test -e /var/cron/cron.allow -o -e /var/cron/cron.deny; then
                 touch /var/cron/cron.deny
             fi
-        end script
+          '';
+
+        exec = "${pkgs.cron}/sbin/cron -n";
+      };
 
-        respawn ${pkgs.cron}/sbin/cron -n
-      '';
-    }];
   };
+  
 }
diff --git a/modules/services/scheduling/fcron.nix b/modules/services/scheduling/fcron.nix
index 2764f8fdad0..18b002ef387 100644
--- a/modules/services/scheduling/fcron.nix
+++ b/modules/services/scheduling/fcron.nix
@@ -1,135 +1,122 @@
-{pkgs, config, ...}:
+{ config, pkgs, ... }:
 
-###### interface
-let
-  inherit (pkgs.lib) mkOption concatStringsSep;
-  inherit (pkgs) writeText;
-
-  options = {
-    services = {
-      fcron = {
-        enable = mkOption {
-          default = false;
-          description = ''Whether to enable the `fcron' daemon.
-            From its docs: "fcron does both the job of Vixie Cron and anacron, but does even more and better".
-            It can trigger actions even if the event has passed due to shutdown for example.
-            TODO: add supoprt for fcron.allow and fcron.deny
-            Of course on cron daemon is enough.. So if fcron works fine there should be a system option systemCron="fcron or cron"
-
-            There are (or have been) some security issues.
-            I haven't yet checked wether they have been resolved.
-            For now you should trust the users registering crontab files.
-            I think gentoo has them listed.
-          '';
-        };
-        allow = mkOption {
-          default = [];
-          description = ''
-            Users allowed to use fcrontab and fcrondyn (one name per line, special name "all" acts for everyone)
-            nix adds username "root" for you.
-          '';
-        };
-        deny = mkOption {
-          default = [];
-          description = " same as allow but deny ";
-        };
-        maxSerialJobs = mkOption {
-          default = 1;
-          description = "maximum number of serial jobs which can run simultaneously (-m)";
-        };
-        queuelen = mkOption {
-          default = "";
-          description = "number of jobs the serial queue and the lavg queue can contain - empty to net set this number (-q)";
-        };
-        systab = mkOption {
-          default = "";
-          description = ''
-            The "system" crontab contents..
-          '';
-        };
-      };
-    };
-  };
-in
+with pkgs.lib;
 
-###### implementation
 let
+
   # Put all the system cronjobs together.
   # TODO allow using fcron only..
   #systemCronJobs =
   #  config.services.cron.systemCronJobs;
   cfg = config.services.fcron;
-  ifEnabled = if cfg.enable then pkgs.lib.id else (x : []);
+  
   queuelen = if cfg.queuelen == "" then "" else "-q ${toString cfg.queuelen}";
 
   # shell is set to /sh in config..
   # ${pkgs.lib.concatStrings (map (job: job + "\n") systemCronJobs)}
-  systemCronJobsFile = pkgs.writeText "fcron-systab" ''
-    SHELL=${pkgs.bash}/bin/sh
-    PATH=${pkgs.coreutils}/bin:${pkgs.findutils}/bin:${pkgs.gnused}/bin
-  '';
-
-  allowdeny = target: users : {
-    source = writeText "fcron.${target}" (concatStringsSep "\n" users);
-    target = "fcron.${target}";
-    mode = "600"; # fcron has some security issues.. So I guess this is most safe
-  };
+  systemCronJobsFile = pkgs.writeText "fcron-systab"
+    ''
+      SHELL=${pkgs.bash}/bin/sh
+      PATH=${pkgs.coreutils}/bin:${pkgs.findutils}/bin:${pkgs.gnused}/bin
+    '';
+
+  allowdeny = target: users:
+    { source = pkgs.writeText "fcron.${target}" (concatStringsSep "\n" users);
+      target = "fcron.${target}";
+      mode = "600"; # fcron has some security issues.. So I guess this is most safe
+    };
 
 in
 
 {
-  require = [
-    # ../upstart-jobs/default.nix # config.services.extraJobs
-    # ? # config.time.timeZone
-    # ? # config.environment.etc
-    # ? # config.environment.extraPackages
-    # ? # config.environment.cleanStart
-    options
-  ];
-
-  environment = {
-    etc = ifEnabled [
-      (allowdeny "allow" (["root"] ++ cfg.allow))
-      (allowdeny "deny" cfg.deny)
-      # see man 5 fcron.conf
-      { source = writeText "fcon.conf" ''
-          fcrontabs	=	/var/spool/fcron
-          pidfile	=	/var/run/fcron.pid
-          fifofile	=	/var/run/fcron.fifo
-          fcronallow	=	/etc/fcron.allow
-          fcrondeny	=	/etc/fcron.deny
-          shell		=	/bin/sh
-          sendmail	=	/var/setuid-wrappers/sendmail
-          editor	=	/var/run/current-system/sw/bin/vi
-       '';
-        target = "fcron.conf";
-        mode = "0600"; # max allowed is 644
-      }
-    ];
-
-    systemPackages = ifEnabled [pkgs.fcron];
+
+  ###### interface
+  
+  options = {
+  
+    services.fcron = {
+    
+      enable = mkOption {
+        default = false;
+        description = "Whether to enable the `fcron' daemon.";
+      };
+      
+      allow = mkOption {
+        default = [];
+        description = ''
+          Users allowed to use fcrontab and fcrondyn (one name per line, "all" for everyone).
+        '';
+      };
+      
+      deny = mkOption {
+        default = [];
+        description = "Users forbidden from using fcron.";
+      };
+      
+      maxSerialJobs = mkOption {
+        default = 1;
+        description = "Maximum number of serial jobs which can run simultaneously.";
+      };
+      
+      queuelen = mkOption {
+        default = "";
+        description = "Number of jobs the serial queue and the lavg queue can contain - empty to net set this number (-q)";
+      };
+      
+      systab = mkOption {
+        default = "";
+        description = ''The "system" crontab contents.'';
+      };
+    };
+
   };
 
-  services = {
-    extraJobs = ifEnabled [{
-      name = "fcron";
 
-      job = ''
-        description "fcron daemon"
+  ###### implementation
+
+  config = mkIf cfg.enable {
 
-        start on startup
-        stop on shutdown
+    environment.etc =
+      [ (allowdeny "allow" (["root"] ++ cfg.allow))
+        (allowdeny "deny" cfg.deny)
+        # see man 5 fcron.conf
+        { source = pkgs.writeText "fcon.conf" ''
+            fcrontabs	=	/var/spool/fcron
+            pidfile	=	/var/run/fcron.pid
+            fifofile	=	/var/run/fcron.fifo
+            fcronallow	=	/etc/fcron.allow
+            fcrondeny	=	/etc/fcron.deny
+            shell	=	/bin/sh
+            sendmail	=	/var/setuid-wrappers/sendmail
+            editor	=	/var/run/current-system/sw/bin/vi
+          '';
+          target = "fcron.conf";
+          mode = "0600"; # max allowed is 644
+        }
+      ];
+
+    environment.systemPackages = [ pkgs.fcron ];
+
+    jobAttrs.fcron =
+      { description = "fcron daemon";
+
+        startOn = "startup";
+        stopOn = "shutdown";
 
-        env PATH=/var/run/current-system/sw/bin
+        environment =
+          { PATH = "/var/run/current-system/sw/bin";
+          };
 
-        start script
+        preStart =
+          ''
             ${pkgs.coreutils}/bin/mkdir -m 0700 -p /var/spool/fcron
             # load system crontab file
-            ${pkgs.fcron}/bin/fcrontab -u systab ${writeText "systab" cfg.systab}
-        end script
+            ${pkgs.fcron}/bin/fcrontab -u systab ${pkgs.writeText "systab" cfg.systab}
+          '';
+
+        exec = "${pkgs.fcron}/sbin/fcron -f -m ${toString cfg.maxSerialJobs} ${queuelen}";
+      };
 
-        respawn ${pkgs.fcron}/sbin/fcron -f -m ${toString cfg.maxSerialJobs} ${queuelen}
-      '';
-    }];
   };
+
 }
diff --git a/modules/services/ttys/gpm.nix b/modules/services/ttys/gpm.nix
index 35ecab0083d..fdc1db2878c 100644
--- a/modules/services/ttys/gpm.nix
+++ b/modules/services/ttys/gpm.nix
@@ -1,58 +1,52 @@
-{pkgs, config, ...}:
+{ config, pkgs, ... }:
+
+with pkgs.lib;
 
-###### interface
 let
-  inherit (pkgs.lib) mkOption;
+
+  cfg = config.services.gpm;
+
+in
+  
+{
+
+  ###### interface
 
   options = {
-    services = {
-      gpm = {
-        enable = mkOption {
-          default = false;
-          description = "
-            Whether to enable general purpose mouse daemon.
-          ";
-        };
-        protocol = mkOption {
-          default = "ps/2";
-          description = "
-            Mouse protocol to use.
-          ";
-        };
+  
+    services.gpm = {
+    
+      enable = mkOption {
+        default = false;
+        description = ''
+          Whether to enable GPM, the General Purpose Mouse daemon,
+          which enables mouse support in virtual consoles.
+        '';
       };
+        
+      protocol = mkOption {
+        default = "ps/2";
+        description = "Mouse protocol to use.";
+      };
+
     };
+    
   };
-in
+  
 
-###### implementation
-let
-  cfg = config.services.gpm;
-  inherit (pkgs.lib) mkIf;
+  ###### implementation
 
-  gpm = pkgs.gpm;
-  gpmBin = "${gpm}/sbin/gpm";
+  config = mkIf cfg.enable {
 
-  job = {
-    name = "gpm";
-    job = ''
-      description = "General purpose mouse"
+    jobAttrs.gpm =
+      { description = "General purpose mouse";
 
-      start on udev
-      stop on shutdown
+        startOn = "udev";
+        stopOn = "shutdown";
 
-      respawn ${gpmBin} -m /dev/input/mice -t ${cfg.protocol} -D &>/dev/null
-    '';
-  };
-in
-
-mkIf cfg.enable {
-  require = [
-    # ../upstart-jobs/default.nix # config.services.extraJobs
-    # /etc/security/console.perms (should be generated ?)
-    options
-  ];
+        exec = "${pkgs.gpm}/sbin/gpm -m /dev/input/mice -t ${cfg.protocol} -D &>/dev/null";
+      };
 
-  services = {
-    extraJobs = [job];
   };
+  
 }
diff --git a/modules/services/web-servers/jboss.nix b/modules/services/web-servers/jboss.nix
index 9ead3e11e9b..9d81f75a83d 100644
--- a/modules/services/web-servers/jboss.nix
+++ b/modules/services/web-servers/jboss.nix
@@ -1,82 +1,81 @@
-{servicesPath, pkgs, config, ...}:
+{ config, pkgs, servicesPath, ... }:
+
+with pkgs.lib;
 
-###### interface
 let
-  inherit (pkgs.lib) mkOption mkIf;
+
+  cfg = config.services.jboss;
+  
+  jbossService = import (servicesPath + /jboss) {
+    inherit (pkgs) stdenv jboss su;
+    inherit (cfg) tempDir logDir libUrl deployDir serverDir user useJK;
+  };
+
+in
+
+{
+
+  ###### interface
 
   options = {
-    services = {
-      jboss = {
-        enable = mkOption {
-          default = false;
-          description = "Whether to enable jboss";
-        };
-
-        tempDir = mkOption {
-          default = "/tmp";
-          description = "Location where JBoss stores its temp files";
-        };
-        
-        logDir = mkOption {
-          default = "/var/log/jboss";
-          description = "Location of the logfile directory of JBoss";
-        };
-        
-        serverDir = mkOption {
-          description = "Location of the server instance files";
-          default = "/var/jboss/server";
-        };
-        
-        deployDir = mkOption {
-          description = "Location of the deployment files";
-          default = "/nix/var/nix/profiles/default/server/default/deploy/";
-        };
-        
-        libUrl = mkOption {
-          default = "file:///nix/var/nix/profiles/default/server/default/lib";
-          description = "Location where the shared library JARs are stored";
-        };
-        
-        user = mkOption {
-          default = "nobody";
-          description = "User account under which jboss runs.";
-        };
-        
-        useJK = mkOption {
-          default = false;
-          description = "Whether to use to connector to the Apache HTTP server";
-        };
+  
+    services.jboss = {
+    
+      enable = mkOption {
+        default = false;
+        description = "Whether to enable jboss";
       };
+
+      tempDir = mkOption {
+        default = "/tmp";
+        description = "Location where JBoss stores its temp files";
+      };
+
+      logDir = mkOption {
+        default = "/var/log/jboss";
+        description = "Location of the logfile directory of JBoss";
+      };
+
+      serverDir = mkOption {
+        description = "Location of the server instance files";
+        default = "/var/jboss/server";
+      };
+
+      deployDir = mkOption {
+        description = "Location of the deployment files";
+        default = "/nix/var/nix/profiles/default/server/default/deploy/";
+      };
+
+      libUrl = mkOption {
+        default = "file:///nix/var/nix/profiles/default/server/default/lib";
+        description = "Location where the shared library JARs are stored";
+      };
+
+      user = mkOption {
+        default = "nobody";
+        description = "User account under which jboss runs.";
+      };
+
+      useJK = mkOption {
+        default = false;
+        description = "Whether to use to connector to the Apache HTTP server";
+      };
+      
     };
-  };
-in
 
-###### implementation
-let
+  };
 
-cfg = config.services.jboss;
-jbossService = import (servicesPath + /jboss) {
-        inherit (pkgs) stdenv jboss su;
-        inherit (cfg) tempDir logDir libUrl deployDir serverDir user useJK;
-};
 
-in
+  ###### implementation
 
-mkIf config.services.jboss.enable {
-  require = [
-    options
-  ];
+  config = mkIf config.services.jboss.enable {
 
-  services = {
-    extraJobs = [{
-      name = "jboss";
-      job = ''
-          description \"JBoss server\"
+    jobAttrs.jboss =
+      { description = "JBoss server";
 
-          stop on shutdown
+        exec = "${jbossService}/bin/control start";
+      };
 
-          respawn ${jbossService}/bin/control start
-      '';
-    }];
   };
+  
 }
diff --git a/modules/services/web-servers/tomcat.nix b/modules/services/web-servers/tomcat.nix
index b9e1c82a04e..613e1204f50 100644
--- a/modules/services/web-servers/tomcat.nix
+++ b/modules/services/web-servers/tomcat.nix
@@ -1,114 +1,114 @@
-{pkgs, config, ...}:
+{ config, pkgs, ... }:
+
+with pkgs.lib;
 
-###### interface
 let
-  inherit (pkgs.lib) mkOption mkIf;
+
+  cfg = config.services.tomcat;
+  
+in
+
+{
+
+  ###### interface
 
   options = {
-    services = {
-      tomcat = {
+  
+    services.tomcat = {
+    
+      enable = mkOption {
+        default = false;
+        description = "Whether to enable Apache Tomcat";
+      };
+
+      baseDir = mkOption {
+        default = "/var/tomcat";
+        description = "Location where Tomcat stores configuration files, webapplications and logfiles";
+      };
+
+      user = mkOption {
+        default = "tomcat";
+        description = "User account under which Apache Tomcat runs.";
+      };      
+
+      group = mkOption {
+        default = "tomcat";
+        description = "Group account under which Apache Tomcat runs.";
+      };      
+
+      javaOpts = mkOption {
+        default = "";
+        description = "Parameters to pass to the Java Virtual Machine which spawns Apache Tomcat";
+      };
+
+      catalinaOpts = mkOption {
+        default = "";
+        description = "Parameters to pass to the Java Virtual Machine which spawns the Catalina servlet container";
+      };
+
+      sharedLibs = mkOption {
+        default = [];
+        description = "List containing JAR files or directories with JAR files which are libraries shared by the web applications";
+      };
+
+      commonLibs = mkOption {
+        default = [];
+        description = "List containing JAR files or directories with JAR files which are libraries shared by the web applications and the servlet container";
+      };
+
+      webapps = mkOption {
+        default = [ pkgs.tomcat6 ];
+        description = "List containing WAR files or directories with WAR files which are web applications to be deployed on Tomcat";
+      };
+
+      virtualHosts = mkOption {
+        default = [];
+        description = "List consisting of a virtual host name and a list of web applications to deploy on each virtual host";
+      };
+
+      axis2 = {
+      
         enable = mkOption {
           default = false;
-          description = "Whether to enable Apache Tomcat";
-        };
-        
-        baseDir = mkOption {
-          default = "/var/tomcat";
-          description = "Location where Tomcat stores configuration files, webapplications and logfiles";
-        };
-        
-        user = mkOption {
-          default = "tomcat";
-          description = "User account under which Apache Tomcat runs.";
-        };      
-        
-	group = mkOption {
-          default = "tomcat";
-          description = "Group account under which Apache Tomcat runs.";
-        };      
-        
-        javaOpts = mkOption {
-          default = "";
-          description = "Parameters to pass to the Java Virtual Machine which spawns Apache Tomcat";
+          description = "Whether to enable an Apache Axis2 container";
         };
-        
-        catalinaOpts = mkOption {
-          default = "";
-          description = "Parameters to pass to the Java Virtual Machine which spawns the Catalina servlet container";
-        };
-        
-        sharedLibs = mkOption {
+
+        services = mkOption {
           default = [];
-          description = "List containing JAR files or directories with JAR files which are libraries shared by the web applications";
+          description = "List containing AAR files or directories with AAR files which are web services to be deployed on Axis2";
         };
         
-        commonLibs = mkOption {
-          default = [];
-          description = "List containing JAR files or directories with JAR files which are libraries shared by the web applications and the servlet container";
-        };
-	
-	webapps = mkOption {
-	  default = [ pkgs.tomcat6 ];
-	  description = "List containing WAR files or directories with WAR files which are web applications to be deployed on Tomcat";
-	};
-	
-	virtualHosts = mkOption {
-	  default = [];
-	  description = "List consisting of a virtual host name and a list of web applications to deploy on each virtual host";
-	};
-	
-	axis2 = {
-	  enable = mkOption {
-	    default = false;
-	    description = "Whether to enable an Apache Axis2 container";
-	  };
-	  
-	  services = mkOption {
-	    default = [];
-	    description = "List containing AAR files or directories with AAR files which are web services to be deployed on Axis2";
-	  };
-	};
       };
+      
     };
+
   };
-in
 
-###### implementation
 
-let
-  cfg = config.services.tomcat;
-in
+  ###### implementation
 
-mkIf config.services.tomcat.enable {
-  require = [
-    options
-  ];
+  config = mkIf config.services.tomcat.enable {
 
-  services = {
-    extraJobs = [{
-      name = "tomcat";
-      
-      groups = [
-        { name = "tomcat";
-          gid = config.ids.gids.tomcat;
-        }
-      ];
+    users.extraGroups = singleton
+      { name = "tomcat";
+        gid = config.ids.gids.tomcat;
+      };
       
-      users = [
-        { name = "tomcat";
-          uid = config.ids.uids.tomcat;
-          description = "Tomcat user";
-          home = "/homeless-shelter";
-        }
-      ];
+    users.extraUsers = singleton
+      { name = "tomcat";
+        uid = config.ids.uids.tomcat;
+        description = "Tomcat user";
+        home = "/homeless-shelter";
+      };
       
-      job = ''
-        description "Apache Tomcat server"
+    jobAttrs.tomcat =
+      { description = "Apache Tomcat server";
 
-        start on network-interface/started
-        stop on network-interfaces/stop
-        
-        start script
+        startOn = "network-interface/started";
+        stopOn = "network-interfaces/stop";
+
+        preStart =
+          ''        
 	    # Create the base directory
 	    mkdir -p ${cfg.baseDir}
 	    
@@ -304,15 +304,21 @@ mkIf config.services.tomcat.enable {
 		done    
 		''
 	    else ""}
-        end script
-        
-        respawn ${pkgs.su}/bin/su -s ${pkgs.bash}/bin/sh ${cfg.user} -c 'CATALINA_BASE=${cfg.baseDir} JAVA_HOME=${pkgs.jdk} JAVA_OPTS="${cfg.javaOpts}" CATALINA_OPTS="${cfg.catalinaOpts}" ${pkgs.tomcat6}/bin/startup.sh; sleep 1000d'
-        
-        stop script
+          ''; # */
+
+        exec =
+          ''
+            ${pkgs.su}/bin/su -s ${pkgs.bash}/bin/sh ${cfg.user} -c 'CATALINA_BASE=${cfg.baseDir} JAVA_HOME=${pkgs.jdk} JAVA_OPTS="${cfg.javaOpts}" CATALINA_OPTS="${cfg.catalinaOpts}" ${pkgs.tomcat6}/bin/startup.sh; sleep 1000d'
+          '';
+
+        postStop =
+          ''
             echo "Stopping tomcat..."
             CATALINA_BASE=${cfg.baseDir} JAVA_HOME=${pkgs.jdk} ${pkgs.su}/bin/su -s ${pkgs.bash}/bin/sh ${cfg.user} -c ${pkgs.tomcat6}/bin/shutdown.sh
-        end script
-      '';
-    }];
+          '';
+
+      };
+
   };
+
 }
diff --git a/modules/services/x11/xfs.nix b/modules/services/x11/xfs.nix
index 07f5bac7a9a..4f4d278fadb 100644
--- a/modules/services/x11/xfs.nix
+++ b/modules/services/x11/xfs.nix
@@ -1,54 +1,54 @@
-{pkgs, config, ...}:
+{ config, pkgs, ... }:
+
+with pkgs.lib;
 
-###### interface
 let
-  inherit (pkgs.lib) mkOption mkIf;
 
-  options = {
-    services = {
-      xfs = {
+  configFile = ./xfs.conf;
+  
+  startingDependency =
+    if config.services.gw6c.enable && config.services.gw6c.autorun
+    then "gw6c"
+    else "network-interfaces";
+  
+in
+
+{
 
-        enable = mkOption {
-          default = false;
-          description = "
-            Whether to enable the X Font Server.
-          ";
-        };
+  ###### interface
 
+  options = {
+  
+    services.xfs = {
+
+      enable = mkOption {
+        default = false;
+        description = "Whether to enable the X Font Server.";
       };
-    };
-  };
-in
 
-###### implementation
+    };
 
+  };
 
-let
-  configFile = ./xfs.conf;
-  startingDependency = if config.services.gw6c.enable && config.services.gw6c.autorun then "gw6c" else "network-interfaces";
-in
 
-mkIf config.services.xfs.enable {
+  ###### implementation
 
-  assertions = [ { assertion = config.fonts.enableFontDir; message = "Please enable fontDir (fonts.enableFontDir) to use xfs."; } ];
+  config = mkIf config.services.xfs.enable {
 
-  require = [
-    options
-  ];
+    assertions = singleton
+      { assertion = config.fonts.enableFontDir;
+        message = "Please enable fontDir (fonts.enableFontDir) to use xfs.";
+      };
 
-  services = {
+    jobAttrs.xfs =
+      { description = "X Font Server";
+      
+        startOn = "${startingDependency}/started";
+        stopOn = "shutdown";
 
-    extraJobs = [ (rec {
-      name = "xfs";
-      groups = [];
-      users = [];
-      job = ''
-        description "X Font Server"
-        start on ${startingDependency}/started
-        stop on shutdown
+        exec = "${pkgs.xorg.xfs}/bin/xfs -config ${configFile}";
+      };
 
-        respawn ${pkgs.xorg.xfs}/bin/xfs -config ${configFile}
-      '';
-    })];
   };
+  
 }
diff --git a/modules/system/upstart-events/ctrl-alt-delete.nix b/modules/system/upstart-events/ctrl-alt-delete.nix
index 6f58606b5cd..3fb6c12c25d 100644
--- a/modules/system/upstart-events/ctrl-alt-delete.nix
+++ b/modules/system/upstart-events/ctrl-alt-delete.nix
@@ -1,20 +1,18 @@
-{pkgs, config, ...}:
+{ config, pkgs, ... }:
 
 ###### implementation
 
 {
+  jobAttrs.ctrl_alt_delete =
+    { name = "ctrl-alt-delete";
 
-  services = {
-    extraJobs = [{
-      name = "ctrl-alt-delete";
-      
-      job = ''
-        on ctrlaltdel
-        
-        script
-            shutdown -r now 'Ctrl-Alt-Delete pressed'
-        end script
-       '';
-    }];
-  };
+      startOn = "ctrlaltdel";
+
+      task = true;
+
+      script =
+        ''
+          shutdown -r now 'Ctrl-Alt-Delete pressed'
+        '';
+    };
 }
diff --git a/modules/system/upstart-events/halt.nix b/modules/system/upstart-events/halt.nix
index 0713aa70ab7..c7721eb3e28 100644
--- a/modules/system/upstart-events/halt.nix
+++ b/modules/system/upstart-events/halt.nix
@@ -1,19 +1,20 @@
-{pkgs, config, ...}:
+{ config, pkgs, ... }:
 
-###### implementation
+with pkgs.lib;
 
+###### implementation
 
 let
 
   inherit (pkgs) bash utillinux;
 
-  jobFun = event : {
-    name = "sys-" + event;
-    
-    job = ''
-      start on ${event}
-      
-      script
+  jobFun = event:
+    { startOn = event;
+
+      task = true;
+
+      script =
+        ''
           set +e # continue in case of errors
       
           exec < /dev/tty1 > /dev/tty1 2>&1
@@ -109,16 +110,12 @@ let
               sleep 1
               exec halt -f -p
           fi
-      
-      end script
-    '';
-  };
+        '';
+    };
 
 in
 
-
 {
-  services = {
-    extraJobs = map jobFun ["reboot" "halt" "system-halt" "power-off"];
-  };
+  jobAttrs = listToAttrs (map (n: nameValuePair "sys-${n}" (jobFun n))
+    [ "reboot" "halt" "system-halt" "power-off" ] );
 }
diff --git a/modules/system/upstart-events/maintenance-shell.nix b/modules/system/upstart-events/maintenance-shell.nix
index 8481f4283f5..6c9d32b625c 100644
--- a/modules/system/upstart-events/maintenance-shell.nix
+++ b/modules/system/upstart-events/maintenance-shell.nix
@@ -1,24 +1,22 @@
-{pkgs, config, ...}:
+{ config, pkgs, ... }:
 
 ###### implementation
 
 {
-  services = {
-    extraJobs = [{
-      name = "maintenance-shell";
-      
-      job = ''
-          start on maintenance
-          start on stalled
-          
-          script
-              exec < /dev/tty1 > /dev/tty1 2>&1
-              echo \"\"
-              echo \"<<< MAINTENANCE SHELL >>>\"
-              echo \"\"
-              exec ${pkgs.bash}/bin/sh
-          end script
-      '';
-  }];
-  };
+  jobAttrs.maintenance_shell =
+    { name = "maintenance-shell";
+
+      startOn = [ "maintenance" "stalled" ];
+
+      task = true;
+
+      script =
+        ''
+          exec < /dev/tty1 > /dev/tty1 2>&1
+          echo \
+          echo "<<< MAINTENANCE SHELL >>>"
+          echo ""
+          exec ${pkgs.bash}/bin/sh
+        '';
+    };
 }
diff --git a/modules/system/upstart/upstart.nix b/modules/system/upstart/upstart.nix
index a87c6e5ee2c..f55c7ddcf3d 100644
--- a/modules/system/upstart/upstart.nix
+++ b/modules/system/upstart/upstart.nix
@@ -327,7 +327,7 @@ in
         }
       ];
 
-    # see test/test-upstart-job.sh (!!! check whether this still works)
+    # !!! fix this
     tests.upstartJobs = { recurseForDerivations = true; } //
       builtins.listToAttrs (map (job: {
         name = removePrefix "upstart-" job.name;
diff --git a/modules/tasks/filesystems.nix b/modules/tasks/filesystems.nix
index ec9836e09e3..86eaaf0c429 100644
--- a/modules/tasks/filesystems.nix
+++ b/modules/tasks/filesystems.nix
@@ -1,9 +1,122 @@
-{pkgs, config, ...}:
+{ config, pkgs, ... }:
+
+with pkgs.lib;
 
 let
 
-###### interface
-  inherit (pkgs.lib) mkOption types;
+  fileSystems = config.fileSystems;
+  mountPoints = map (fs: fs.mountPoint) fileSystems;
+  devices = map (fs: if fs.device != null then fs.device else "/dev/disk/by-label/${fs.label}") fileSystems;
+  fsTypes = map (fs: fs.fsType) fileSystems;
+  optionss = map (fs: fs.options) fileSystems;
+  autocreates = map (fs: fs.autocreate) fileSystems;
+  mount = config.system.sbin.mount;
+
+  task =
+    ''
+      PATH=${pkgs.e2fsprogs}/sbin:${pkgs.utillinuxng}/sbin:$PATH
+
+      mountPoints=(${toString mountPoints})  
+      devices=(${toString devices})
+      fsTypes=(${toString fsTypes})
+      optionss=(${toString optionss})
+      autocreates=(${toString autocreates})
+
+      newDevices=1
+
+      # If we mount any file system, we repeat this loop, because new
+      # mount opportunities may have become available (such as images
+      # for loopback mounts).
+
+      while test -n "$newDevices"; do
+
+        newDevices=
+
+        for ((n = 0; n < ''${#mountPoints[*]}; n++)); do
+          mountPoint=''${mountPoints[$n]}
+          device=''${devices[$n]}
+          fsType=''${fsTypes[$n]}
+          options=''${optionss[$n]}
+          autocreate=''${autocreates[$n]}
+
+          # A device is a pseudo-device (i.e. not an actual device
+          # node) if it's not an absolute path (e.g. an NFS server
+          # such as machine:/path), if it starts with // (a CIFS FS),
+          # a known pseudo filesystem (such as tmpfs), or the device
+          # is a directory (e.g. a bind mount).
+          isPseudo=
+          test "''${device:0:1}" != / -o "''${device:0:2}" = // -o "$fsType" = "tmpfs" \
+              -o -d "$device" && isPseudo=1
+
+          if ! test -n "$isPseudo" -o -e "$device"; then
+              echo "skipping $device, doesn't exist (yet)"
+              continue
+          fi
+
+          # !!! quick hack: if the mount point is already mounted, try
+          # a remount to change the options but nothing else.
+          if cat /proc/mounts | grep -F -q " $mountPoint "; then
+              if test "''${device:0:2}" != //; then
+                  echo "remounting $device on $mountPoint"
+                  ${mount}/bin/mount -t "$fsType" \
+                      -o remount,"$options" \
+                      "$device" "$mountPoint" || true
+              fi
+              continue
+          fi
+
+          # If $device is already mounted somewhere else, unmount it first.
+          # !!! Note: we use /etc/mtab, not /proc/mounts, because mtab
+          # contains more accurate info when using loop devices.
+
+          if test -z "$isPseudo"; then
+
+            device=$(readlink -f "$device")
+
+            prevMountPoint=$(
+                cat /etc/mtab \
+                | grep "^$device " \
+                | sed 's|^[^ ]\+ \+\([^ ]\+\).*|\1|' \
+            )
+
+            if test "$prevMountPoint" = "$mountPoint"; then
+                echo "remounting $device on $mountPoint"
+                ${mount}/bin/mount -t "$fsType" \
+                    -o remount,"$options" \
+                    "$device" "$mountPoint" || true
+                continue
+            fi
+
+            if test -n "$prevMountPoint"; then
+                echo "unmount $device from $prevMountPoint"
+                ${mount}/bin/umount "$prevMountPoint" || true
+            fi
+
+          fi
+
+          echo "mounting $device on $mountPoint"
+
+          # !!! should do something with the result; also prevent repeated fscks.
+          if test -z "$isPseudo"; then
+              fsck -a "$device" || true
+          fi
+
+          if test "$autocreate" = 1; then mkdir -p "$mountPoint"; fi
+
+          if ${mount}/bin/mount -t "$fsType" -o "$options" "$device" "$mountPoint"; then
+              newDevices=1
+          fi
+   
+        done
+
+      done
+    '';
+
+in
+
+{
+
+  ###### interface
 
   options = {
 
@@ -21,6 +134,7 @@ let
           label = "bigdisk";
         }
       ];
+      
       description = "
         The file systems to be mounted.  It must include an entry for
         the root directory (<literal>mountPoint = \"/\"</literal>).  Each
@@ -40,6 +154,7 @@ let
         <literal>autocreate</literal> forces <literal>mountPoint</literal> to be created with 
         <command>mkdir -p</command> .
       ";
+      
       type = types.nullOr (types.list types.optionSet);
 
       options = {
@@ -110,133 +225,22 @@ let
     
   };
 
-###### implementation
-
-  fileSystems = config.fileSystems;
-  mountPoints = map (fs: fs.mountPoint) fileSystems;
-  devices = map (fs: if fs.device != null then fs.device else "/dev/disk/by-label/${fs.label}") fileSystems;
-  fsTypes = map (fs: fs.fsType) fileSystems;
-  optionss = map (fs: fs.options) fileSystems;
-  autocreates = map (fs: fs.autocreate) fileSystems;
-  mount = config.system.sbin.mount;
-
-  job = ''
-    start on startup
-    start on new-devices
-    start on ip-up
-
-    script
-      PATH=${pkgs.e2fsprogs}/sbin:${pkgs.utillinuxng}/sbin:$PATH
-
-      mountPoints=(${toString mountPoints})  
-      devices=(${toString devices})
-      fsTypes=(${toString fsTypes})
-      optionss=(${toString optionss})
-      autocreates=(${toString autocreates})
-
-      newDevices=1
-
-      # If we mount any file system, we repeat this loop, because new
-      # mount opportunities may have become available (such as images
-      # for loopback mounts).
-
-      while test -n "$newDevices"; do
-
-        newDevices=
-
-        for ((n = 0; n < ''${#mountPoints[*]}; n++)); do
-          mountPoint=''${mountPoints[$n]}
-          device=''${devices[$n]}
-          fsType=''${fsTypes[$n]}
-          options=''${optionss[$n]}
-          autocreate=''${autocreates[$n]}
-
-          # A device is a pseudo-device (i.e. not an actual device
-          # node) if it's not an absolute path (e.g. an NFS server
-          # such as machine:/path), if it starts with // (a CIFS FS),
-          # a known pseudo filesystem (such as tmpfs), or the device
-          # is a directory (e.g. a bind mount).
-          isPseudo=
-          test "''${device:0:1}" != / -o "''${device:0:2}" = // -o "$fsType" = "tmpfs" \
-              -o -d "$device" && isPseudo=1
-
-          if ! test -n "$isPseudo" -o -e "$device"; then
-              echo "skipping $device, doesn't exist (yet)"
-              continue
-          fi
-
-          # !!! quick hack: if the mount point is already mounted, try
-          # a remount to change the options but nothing else.
-          if cat /proc/mounts | grep -F -q " $mountPoint "; then
-              if test "''${device:0:2}" != //; then
-                  echo "remounting $device on $mountPoint"
-                  ${mount}/bin/mount -t "$fsType" \
-                      -o remount,"$options" \
-                      "$device" "$mountPoint" || true
-              fi
-              continue
-          fi
-
-          # If $device is already mounted somewhere else, unmount it first.
-          # !!! Note: we use /etc/mtab, not /proc/mounts, because mtab
-          # contains more accurate info when using loop devices.
-
-          if test -z "$isPseudo"; then
-
-            device=$(readlink -f "$device")
-
-            prevMountPoint=$(
-                cat /etc/mtab \
-                | grep "^$device " \
-                | sed 's|^[^ ]\+ \+\([^ ]\+\).*|\1|' \
-            )
-
-            if test "$prevMountPoint" = "$mountPoint"; then
-                echo "remounting $device on $mountPoint"
-                ${mount}/bin/mount -t "$fsType" \
-                    -o remount,"$options" \
-                    "$device" "$mountPoint" || true
-                continue
-            fi
-
-            if test -n "$prevMountPoint"; then
-                echo "unmount $device from $prevMountPoint"
-                ${mount}/bin/umount "$prevMountPoint" || true
-            fi
-
-          fi
 
-          echo "mounting $device on $mountPoint"
+  ###### implementation
 
-          # !!! should do something with the result; also prevent repeated fscks.
-          if test -z "$isPseudo"; then
-              fsck -a "$device" || true
-          fi
+  config = {
 
-          if test "$autocreate" = 1; then mkdir -p "$mountPoint"; fi
-
-          if ${mount}/bin/mount -t "$fsType" -o "$options" "$device" "$mountPoint"; then
-              newDevices=1
-          fi
-
-        done
+    # Add the mount helpers to the system path so that `mount' can find them.
+    environment.systemPackages = [pkgs.ntfs3g pkgs.mount_cifs pkgs.nfsUtils];
+    
+    jobAttrs.filesystems =
+      { startOn = [ "startup" "new-devices" "ip-up" ];
 
-      done
+        script = task;
 
-    end script
-  '';
-in
+        task = true;
+      };
 
-{
-  require = [options];
-  
-  services = {
-    extraJobs = [{
-      name = "filesystems";
-      inherit job;
-    }];
   };
 
-  # Add the mount helpers to the system path so that `mount' can find them.
-  environment.systemPackages = [pkgs.ntfs3g pkgs.mount_cifs pkgs.nfsUtils];
 }
diff --git a/modules/tasks/lvm.nix b/modules/tasks/lvm.nix
index 1d16da59bef..28fb293821a 100644
--- a/modules/tasks/lvm.nix
+++ b/modules/tasks/lvm.nix
@@ -1,27 +1,18 @@
-{pkgs, config, ...}:
-
-###### implementation
-
-let
-  modprobe = config.system.sbin.modprobe;
-
-in
-
+{ config, pkgs, ... }:
 
 {
 
-  services = {
-    extraJobs = [{
-      name = "lvm";
-      
-      job = ''
-        start on udev
-        #start on new-devices
+  ###### implementation
 
-        script
+  config = {
 
+    jobAttrs.lvm =
+      { startOn = " udev"; # !!! or on new-devices
+
+        script =
+          ''
             # Load the device mapper.
-            ${modprobe}/sbin/modprobe dm_mod || true
+            ${config.system.sbin.modprobe}/sbin/modprobe dm_mod || true
 
             ${pkgs.devicemapper}/sbin/dmsetup mknodes
             # Scan for block devices that might contain LVM physical volumes
@@ -33,9 +24,11 @@ in
             ${pkgs.lvm2}/sbin/vgchange --available y
 
             initctl emit new-devices
-            
-        end script
-      '';
-    }];
+          '';
+
+        task = true;
+      };
+
   };
+  
 }
diff --git a/modules/tasks/network-interfaces.nix b/modules/tasks/network-interfaces.nix
index 6c77a40ae5d..713eed22e88 100644
--- a/modules/tasks/network-interfaces.nix
+++ b/modules/tasks/network-interfaces.nix
@@ -132,7 +132,6 @@ in
         pkgs.wirelesstools
       ];
     
-
     jobs = pkgs.lib.singleton
       { name = "network-interfaces";
 
diff --git a/modules/tasks/swraid.nix b/modules/tasks/swraid.nix
index a0a25efa354..d9419fadb11 100644
--- a/modules/tasks/swraid.nix
+++ b/modules/tasks/swraid.nix
@@ -1,4 +1,4 @@
-{pkgs, config, ...}:
+{ config, pkgs, ... }:
 
 ###### implementation
 
@@ -12,16 +12,11 @@ in
   
 {
 
-  services = {
-    extraJobs = [{
-      name = "swraid";
-      
-      job = ''
-      start on udev
-      #start on new-devices
-      
-      script
+  jobAttrs.swraid =
+    { startOn = "udev"; # !!! or on "new-devices"
       
+      script =
+        ''
           # Load the necessary RAID personalities.
           # !!! hm, doesn't the kernel load these automatically?
           for mod in raid0 raid1 raid5; do
@@ -35,10 +30,9 @@ in
           ${mdadm}/sbin/mdadm --assemble -c ${tempConf} --scan
       
           initctl emit new-devices
-          
-      end script
-      
-      '';
-    }];
-  };
+        '';
+
+      task = true;        
+    };
+
 }
-- 
GitLab


From 9943e0762e1589e37c3653c3812967f303225277 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 12 Oct 2009 17:09:38 +0000
Subject: [PATCH 1909/5331] * Update some more modules.

svn path=/nixos/trunk/; revision=17763
---
 modules/rename.nix                            |   5 +-
 modules/services/databases/postgresql.nix     |  21 ++--
 modules/services/misc/gpsd.nix                |   8 +-
 modules/services/misc/synergy.nix             |   2 +-
 modules/services/networking/gnunet.nix        |   2 +-
 modules/services/networking/ifplugd.nix       |  26 ++---
 modules/services/networking/ntpd.nix          |  32 +++---
 modules/services/system/uptimed.nix           |  26 ++---
 .../web-servers/apache-httpd/default.nix      | 101 +++++++++---------
 modules/system/upstart/tools.nix              |  36 -------
 modules/system/upstart/upstart.nix            |  22 +---
 11 files changed, 102 insertions(+), 179 deletions(-)
 delete mode 100644 modules/system/upstart/tools.nix

diff --git a/modules/rename.nix b/modules/rename.nix
index 05d278bd3e7..a3b40da4213 100644
--- a/modules/rename.nix
+++ b/modules/rename.nix
@@ -71,10 +71,7 @@ in zipModules ([]
 ++ rename obsolete "boot.bootMount" to "boot.loader.grub.bootDevice"
 ++ rename obsolete "boot.grubSplashImage" to "boot.loader.grub.splashImage"
 
-# jobs
-++ rename obsolete "services.extraJobs" to "jobs"
-
-# kde
+# KDE
 ++ rename deprecated "kde.extraPackages" to "environment.kdePackages"
 
 
diff --git a/modules/services/databases/postgresql.nix b/modules/services/databases/postgresql.nix
index 1fb11244768..207701f1355 100644
--- a/modules/services/databases/postgresql.nix
+++ b/modules/services/databases/postgresql.nix
@@ -113,27 +113,24 @@ in
 
     environment.systemPackages = [postgresql];
 
-    jobs = singleton {
-      name = "postgresql";
+    jobAttrs.postgresql =
+      { description = "PostgreSQL server";
 
-      job = ''
-        description "PostgreSQL server"
+        startOn = "${startDependency}/started";
+        stopOn = "shutdown";
 
-        start on ${startDependency}/started
-        stop on shutdown
-        
-        start script
+        preStart =
+          ''
             if ! test -e ${cfg.dataDir}; then
                 mkdir -m 0700 -p ${cfg.dataDir}
                 chown -R postgres ${cfg.dataDir}
                 ${run} -c '${postgresql}/bin/initdb -D ${cfg.dataDir} -U root'
             fi
             cp -f ${pkgs.writeText "pg_hba.conf" cfg.authentication} ${cfg.dataDir}/pg_hba.conf
-        end script
+          '';
 
-        respawn ${run} -c '${postgresql}/bin/postgres -D ${cfg.dataDir} ${toString flags}'
-      '';
-    };
+        exec = "${run} -c '${postgresql}/bin/postgres -D ${cfg.dataDir} ${toString flags}'";
+      };
 
   };
   
diff --git a/modules/services/misc/gpsd.nix b/modules/services/misc/gpsd.nix
index b4cc58c3094..ba2d550f461 100644
--- a/modules/services/misc/gpsd.nix
+++ b/modules/services/misc/gpsd.nix
@@ -93,10 +93,10 @@ in
 
         exec =
           ''
-            respawn ${pkgs.gpsd}/sbin/gpsd -D "${toString cfg.debugLevel}"   \
-                       -S "${toString cfg.port}"                             \
-                       ${if cfg.readonly then "-b" else ""}                  \
-                       "${cfg.device}"
+            ${pkgs.gpsd}/sbin/gpsd -D "${toString cfg.debugLevel}"  \
+              -S "${toString cfg.port}"                             \
+              ${if cfg.readonly then "-b" else ""}                  \
+              "${cfg.device}"
           '';
       };
 
diff --git a/modules/services/misc/synergy.nix b/modules/services/misc/synergy.nix
index a7df38f239d..88226755e66 100644
--- a/modules/services/misc/synergy.nix
+++ b/modules/services/misc/synergy.nix
@@ -94,7 +94,7 @@ in
 
             exec =
               ''
-                respawn ${pkgs.synergy}/bin/synergys -c ${cfgS.configFile} \
+                ${pkgs.synergy}/bin/synergys -c ${cfgS.configFile} \
                   -f ${if cfgS.address == "" then "" else "-a ${cfgS.address}"} \
                   ${if cfgS.screenName == "" then "" else "-n ${cfgS.screenName}" }
               '';
diff --git a/modules/services/networking/gnunet.nix b/modules/services/networking/gnunet.nix
index 05956f74612..4f9723fc304 100644
--- a/modules/services/networking/gnunet.nix
+++ b/modules/services/networking/gnunet.nix
@@ -205,7 +205,7 @@ in
 
         exec =
           ''
-            respawn ${pkgs.gnunet}/bin/gnunetd              \
+            ${pkgs.gnunet}/bin/gnunetd              \
               ${if debug then "--debug" else "" }           \
               --user="gnunetd"                              \
               --config="${configFile}"                      \
diff --git a/modules/services/networking/ifplugd.nix b/modules/services/networking/ifplugd.nix
index 9a08bba05e5..021e7f8fecf 100644
--- a/modules/services/networking/ifplugd.nix
+++ b/modules/services/networking/ifplugd.nix
@@ -1,7 +1,8 @@
 {pkgs, config, ...}:
 
+with pkgs.lib;
+
 let
-  inherit (pkgs.lib) mkOption mkIf;
 
   inherit (pkgs) ifplugd;
 
@@ -54,20 +55,19 @@ in
 
   config = mkIf config.networking.interfaceMonitor.enable {
 
-    jobs = pkgs.lib.singleton {
-      name = "ifplugd";
-
-      job = ''
-        description "Network interface connectivity monitor"
+    jobAttrs.ifplugd =
+      { description = "Network interface connectivity monitor";
 
-        start on network-interfaces/started
-        stop on network-interfaces/stop
+        startOn = "network-interfaces/started";
+        stopOn = "network-interfaces/stop";
 
-        respawn ${ifplugd}/sbin/ifplugd --no-daemon --no-startup --no-shutdown \
-            ${if config.networking.interfaceMonitor.beep then "" else "--no-beep"} \
-            --run ${plugScript}
-      '';
-    };
+        exec =
+          ''
+            ${ifplugd}/sbin/ifplugd --no-daemon --no-startup --no-shutdown \
+              ${if config.networking.interfaceMonitor.beep then "" else "--no-beep"} \
+              --run ${plugScript}
+          '';
+      };
 
     environment.systemPackages = [ifplugd];
       
diff --git a/modules/services/networking/ntpd.nix b/modules/services/networking/ntpd.nix
index e4b3432abd9..711682c9dce 100644
--- a/modules/services/networking/ntpd.nix
+++ b/modules/services/networking/ntpd.nix
@@ -1,8 +1,8 @@
-{pkgs, config, ...}:
+{ config, pkgs, ... }:
 
-let
+with pkgs.lib;
 
-  inherit (pkgs.lib) mkOption mkIf singleton;
+let
 
   inherit (pkgs) ntp;
 
@@ -70,19 +70,14 @@ in
         home = stateDir;
       };
 
-    jobs = singleton {
-
-      name = "ntpd";
-      
-      job = ''
-        description "NTP daemon"
-
-        start on ip-up
-        stop on ip-down
-        stop on shutdown
+    jobAttrs.ntpd =
+      { description = "NTP daemon";
 
-        start script
+        startOn = "ip-up";
+        stopOn = "ip-down";
 
+        preStart =
+          ''
             mkdir -m 0755 -p ${stateDir}
             chown ${ntpUser} ${stateDir}
 
@@ -95,13 +90,10 @@ in
             # phase.  Thus a hanging ntpd job can block system
             # shutdown.
             # ${ntp}/bin/ntpd -q -g ${ntpFlags}
+          '';
 
-        end script
-
-        respawn ${ntp}/bin/ntpd -g -n ${ntpFlags}
-      '';
-
-    };
+        exec = "${ntp}/bin/ntpd -g -n ${ntpFlags}";
+      };
     
   };
   
diff --git a/modules/services/system/uptimed.nix b/modules/services/system/uptimed.nix
index 9dd251a2821..259363024fc 100644
--- a/modules/services/system/uptimed.nix
+++ b/modules/services/system/uptimed.nix
@@ -39,6 +39,7 @@ in
   ###### implementation
 
   config = mkIf config.services.uptimed.enable {
+  
     environment.systemPackages = [ uptimed ];
   
     users.extraUsers = singleton
@@ -48,18 +49,14 @@ in
         home = stateDir;
       };
 
-    jobs = singleton {
-
-      name = "uptimed";
-      
-      job = ''
-        description "Uptimed daemon"
+    jobAttrs.uptimed =
+      { description = "Uptimed daemon";
 
-        start on startup
-        stop on shutdown
-
-        start script
+        startOn = "startup";
+        stopOn = "shutdown";
 
+        preStart =
+          ''
             mkdir -m 0755 -p ${stateDir}
             chown ${uptimedUser} ${stateDir}
 
@@ -69,13 +66,10 @@ in
             if ! test -f ${stateDir}/bootid ; then
               ${uptimed}/sbin/uptimed -b
             fi
+          '';
 
-        end script
-
-        respawn ${uptimed}/sbin/uptimed ${uptimedFlags}
-      '';
-
-    };
+        exec = "${uptimed}/sbin/uptimed ${uptimedFlags}";
+      };
     
   };
   
diff --git a/modules/services/web-servers/apache-httpd/default.nix b/modules/services/web-servers/apache-httpd/default.nix
index 77a724f1e46..6470b64d6be 100644
--- a/modules/services/web-servers/apache-httpd/default.nix
+++ b/modules/services/web-servers/apache-httpd/default.nix
@@ -559,59 +559,54 @@ in
 
     environment.systemPackages = [httpd] ++ concatMap (svc: svc.extraPath) allSubservices;
 
-    jobs = singleton {
-      name = "httpd";
-
-      # Statically verify the syntactic correctness of the generated
-      # httpd.conf.  !!! this is impure!  It doesn't just check for
-      # syntax, but also whether the Apache user/group exist, whether SSL
-      # keys exist, etc.
-      buildHook = ''
-        echo
-        echo '=== Checking the generated Apache configuration file ==='
-        ${httpd}/bin/httpd -f ${httpdConf} -t || true
-      '';
-
-      job = ''
-        description "Apache HTTPD"
-
-        start on ${startingDependency}/started
-        stop on shutdown
-
-        start script
-          mkdir -m 0700 -p ${mainCfg.stateDir}
-          mkdir -m 0700 -p ${mainCfg.logDir}
-
-          # Get rid of old semaphores.  These tend to accumulate across
-          # server restarts, eventually preventing it from restarting
-          # succesfully.
-          for i in $(${pkgs.utillinux}/bin/ipcs -s | grep ' ${mainCfg.user} ' | cut -f2 -d ' '); do
-              ${pkgs.utillinux}/bin/ipcrm -s $i
-          done
-
-          # Run the startup hooks for the subservices.
-          for i in ${toString (map (svn: svn.startupScript) allSubservices)}; do
-              echo Running Apache startup hook $i...
-              $i
-          done
-        end script
-
-        ${
-          let f = {name, value}: "env ${name}=${value}\n";
-          in concatMapStrings f (concatMap (svc: svc.globalEnvVars) allSubservices)
-        }
-
-        # !!! This should be added in test-instrumentation.nix.  It
-        # shouldn't hurt though, since packages usually aren't built
-        # with coverage enabled.
-        env GCOV_PREFIX=/tmp/coverage-data
-
-        env PATH=${pkgs.coreutils}/bin:${pkgs.gnugrep}/bin:${concatStringsSep ":" (concatMap (svc: svc.extraServerPath) allSubservices)}
-
-        respawn ${httpd}/bin/httpd -f ${httpdConf} -DNO_DETACH
-      '';
-    };
-    
+    jobAttrs.httpd =
+      { # Statically verify the syntactic correctness of the generated
+        # httpd.conf.  !!! this is impure!  It doesn't just check for
+        # syntax, but also whether the Apache user/group exist,
+        # whether SSL keys exist, etc.
+        buildHook =
+          ''
+            echo
+            echo '=== Checking the generated Apache configuration file ==='
+            ${httpd}/bin/httpd -f ${httpdConf} -t || true
+          '';
+
+        description = "Apache HTTPD";
+
+        startOn = "${startingDependency}/started";
+        stopOn = "shutdown";
+
+        environment =
+          { # !!! This should be added in test-instrumentation.nix.  It
+            # shouldn't hurt though, since packages usually aren't built
+            # with coverage enabled.
+           GCOV_PREFIX = "/tmp/coverage-data";
+
+           PATH = "${pkgs.coreutils}/bin:${pkgs.gnugrep}/bin:${concatStringsSep ":" (concatMap (svc: svc.extraServerPath) allSubservices)}";
+          } // (listToAttrs (concatMap (svc: svc.globalEnvVars) allSubservices));
+
+        preStart =
+          ''
+            mkdir -m 0700 -p ${mainCfg.stateDir}
+            mkdir -m 0700 -p ${mainCfg.logDir}
+
+            # Get rid of old semaphores.  These tend to accumulate across
+            # server restarts, eventually preventing it from restarting
+            # succesfully.
+            for i in $(${pkgs.utillinux}/bin/ipcs -s | grep ' ${mainCfg.user} ' | cut -f2 -d ' '); do
+                ${pkgs.utillinux}/bin/ipcrm -s $i
+            done
+
+            # Run the startup hooks for the subservices.
+            for i in ${toString (map (svn: svn.startupScript) allSubservices)}; do
+                echo Running Apache startup hook $i...
+                $i
+            done
+          '';
+
+        exec = "${httpd}/bin/httpd -f ${httpdConf} -DNO_DETACH";
+      };
+
   };
   
 }
diff --git a/modules/system/upstart/tools.nix b/modules/system/upstart/tools.nix
deleted file mode 100644
index e2adbd1d841..00000000000
--- a/modules/system/upstart/tools.nix
+++ /dev/null
@@ -1,36 +0,0 @@
-# This file defines functions to handle upstart-jobs.
-{pkgs, config, ...}:
-
-let
-  inherit (pkgs.lib) filter findSingle;
-  jobs = config.services.extraJobs;
-
-  primaryEvents = [
-    "startup"
-    "shutdown"
-    "never"
-  ];
-
-  upstartJobsTools = rec {
-    exists = name:
-      let
-        found = filter
-          (j: j ? name && j.name == name)
-          (jobs ++ map (name: {inherit name;}) primaryEvents);
-      in found != [];
-
-    check = name:
-      if exists name then
-        name
-      else
-        abort "Undefined upstart job name: ${name}.";
-  };
-in
-
-{
-  services = {
-    tools = {
-      upstartJobs = upstartJobsTools;
-    };
-  };
-}
diff --git a/modules/system/upstart/upstart.nix b/modules/system/upstart/upstart.nix
index f55c7ddcf3d..f84d98ff873 100644
--- a/modules/system/upstart/upstart.nix
+++ b/modules/system/upstart/upstart.nix
@@ -5,11 +5,11 @@ with pkgs.lib;
 let
 
   # From a job description, generate an Upstart job file.
-  makeJob = job@{buildHook ? "", ...}:
+  makeJob = job:
 
     let
 
-      jobText = if job.job != "" then job.job else
+      jobText =
         ''
           # Upstart job `${job.name}'.  This is a generated file.  Do not edit.
         
@@ -66,7 +66,7 @@ let
 
     in
       pkgs.runCommand ("upstart-" + job.name)
-        { inherit buildHook; inherit jobText; }
+        { inherit (job) buildHook; inherit jobText; }
         ''
           eval "$buildHook"
           ensureDir $out/etc/event.d
@@ -116,22 +116,6 @@ let
           '';
         };
 
-        job = mkOption {
-          default = "";
-          type = types.string;
-          example =
-            ''
-              description "nc"
-              start on started network-interfaces
-              respawn
-              env PATH=/var/run/current-system/sw/bin
-              exec sh -c "echo 'hello world' | ${pkgs.netcat}/bin/nc -l -p 9000"
-            '';
-          description = ''
-            Contents of the Upstart job.
-          '';
-        };
-
         buildHook = mkOption {
           type = types.string;
           default = "true";
-- 
GitLab


From d982f23f2052cca8e03cb21e3f0c7ff639d369d0 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 12 Oct 2009 17:27:57 +0000
Subject: [PATCH 1910/5331] * Convert the remaining jobs to jobAttrs style.

svn path=/nixos/trunk/; revision=17764
---
 modules/services/audio/alsa.nix               | 13 ++-
 modules/services/databases/mysql.nix          | 10 +--
 modules/services/hardware/acpid.nix           |  5 +-
 modules/services/hardware/hal.nix             |  8 +-
 modules/services/hardware/udev.nix            |  6 +-
 modules/services/logging/syslogd.nix          |  6 +-
 modules/services/misc/nix-daemon.nix          | 12 ++-
 modules/services/misc/rogue.nix               |  6 +-
 modules/services/networking/ddclient.nix      | 31 ++++---
 modules/services/networking/dhclient.nix      | 11 ++-
 modules/services/networking/firewall.nix      |  6 +-
 modules/services/networking/privoxy.nix       | 35 ++++----
 .../services/networking/wpa_supplicant.nix    | 14 ++--
 modules/services/networking/xinetd.nix        |  6 +-
 modules/services/scheduling/atd.nix           |  6 +-
 modules/services/system/dbus.nix              |  6 +-
 modules/services/system/nscd.nix              |  6 +-
 modules/services/ttys/mingetty.nix            | 14 +---
 modules/services/x11/xserver.nix              |  6 +-
 modules/system/upstart/upstart.nix            |  2 +-
 modules/tasks/kbd.nix                         |  8 +-
 modules/tasks/network-interfaces.nix          |  8 +-
 modules/tasks/swap.nix                        | 11 ++-
 modules/tasks/tty-backgrounds.nix             | 80 ++++++++++---------
 modules/testing/test-instrumentation.nix      |  6 +-
 25 files changed, 141 insertions(+), 181 deletions(-)

diff --git a/modules/services/audio/alsa.nix b/modules/services/audio/alsa.nix
index da92ed915b2..c72449150d1 100644
--- a/modules/services/audio/alsa.nix
+++ b/modules/services/audio/alsa.nix
@@ -1,8 +1,9 @@
 # ALSA sound support.
-{pkgs, config, ...}:
+{ config, pkgs, ... }:
+
+with pkgs.lib;
 
 let
-  inherit (pkgs.lib) mkOption singleton mkIf;
 
   inherit (pkgs) alsaUtils;
 
@@ -23,7 +24,7 @@ in
         description = ''
           Whether to enable ALSA sound.
         '';
-        merge = pkgs.lib.mergeEnableOption;
+        merge = mergeEnableOption;
       };
 
     };
@@ -44,10 +45,8 @@ in
         gid = config.ids.gids.audio;
       };
 
-    jobs = singleton
-      { name = "alsa";
-
-        startOn = "udev";
+    jobAttrs.alsa =
+      { startOn = "udev";
 
         preStart =
           ''
diff --git a/modules/services/databases/mysql.nix b/modules/services/databases/mysql.nix
index 39b1978be91..9e7a0543c9d 100644
--- a/modules/services/databases/mysql.nix
+++ b/modules/services/databases/mysql.nix
@@ -1,7 +1,8 @@
-{pkgs, config, ...}:
+{ config, pkgs, ... }:
+
+with pkgs.lib;
 
 let
-  inherit (pkgs.lib) mkOption mkIf singleton;
 
   cfg = config.services.mysql;
 
@@ -71,9 +72,8 @@ in
 
     environment.systemPackages = [mysql];
 
-    jobs = singleton
-      { name = "mysql";
-        description = "MySQL server";
+    jobAttrs.mysql =
+      { description = "MySQL server";
 
         startOn = "filesystems";
         stopOn = "shutdown";
diff --git a/modules/services/hardware/acpid.nix b/modules/services/hardware/acpid.nix
index 10449aac216..595153b0af9 100644
--- a/modules/services/hardware/acpid.nix
+++ b/modules/services/hardware/acpid.nix
@@ -76,9 +76,8 @@ in
 
   config = mkIf config.powerManagement.enable {
 
-    jobs = singleton
-      { name = "acpid";
-        description = "ACPI daemon";
+    jobAttrs.acpid =
+      { description = "ACPI daemon";
 
         startOn = "udev";
         stopOn = "shutdown";
diff --git a/modules/services/hardware/hal.nix b/modules/services/hardware/hal.nix
index 8948251f242..94831b62778 100644
--- a/modules/services/hardware/hal.nix
+++ b/modules/services/hardware/hal.nix
@@ -1,5 +1,5 @@
 # HAL daemon.
-{pkgs, config, ...}:
+{ config, pkgs, ... }:
 
 with pkgs.lib;
 
@@ -64,10 +64,8 @@ in
         gid = config.ids.gids.haldaemon;
       };
 
-    jobs = singleton
-      { name = "hal";
-
-        description = "HAL daemon";
+    jobAttrs.hal =
+      { description = "HAL daemon";
         
         # !!! TODO: make sure that HAL starts after acpid,
         # otherwise hald-addon-acpi will grab /proc/acpi/event.
diff --git a/modules/services/hardware/udev.nix b/modules/services/hardware/udev.nix
index 16d05997fd3..91e933f4b03 100644
--- a/modules/services/hardware/udev.nix
+++ b/modules/services/hardware/udev.nix
@@ -152,10 +152,8 @@ in
     
     services.udev.packages = [extraUdevRules];
 
-    jobs = singleton
-      { name = "udev";
-
-        startOn = "startup";
+    jobAttrs.udev =
+      { startOn = "startup";
         stopOn = "shutdown";
 
         environment = { UDEV_CONFIG_FILE = conf; };
diff --git a/modules/services/logging/syslogd.nix b/modules/services/logging/syslogd.nix
index f62bf1da33f..a1679f71bc2 100644
--- a/modules/services/logging/syslogd.nix
+++ b/modules/services/logging/syslogd.nix
@@ -47,10 +47,8 @@ in
 
   config = {
   
-    jobs = singleton
-      { name = "syslogd";
-
-        description = "Syslog daemon";
+    jobAttrs.syslogd =
+      { description = "Syslog daemon";
 
         startOn = "udev";
         stopOn = "shutdown";
diff --git a/modules/services/misc/nix-daemon.nix b/modules/services/misc/nix-daemon.nix
index d0c35d9130a..479c4fa4a28 100644
--- a/modules/services/misc/nix-daemon.nix
+++ b/modules/services/misc/nix-daemon.nix
@@ -1,4 +1,4 @@
-{pkgs, config, ...}:
+{ config, pkgs, ... }:
 
 with pkgs.lib;
 
@@ -127,7 +127,7 @@ in
       envVars = mkOption {
         internal = true;
         default = "";
-        merge = pkgs.lib.mergeStringOption;
+        merge = mergeStringOption;
         description = "
           Environment variables used by Nix.
         ";
@@ -178,7 +178,7 @@ in
         { # List of machines for distributed Nix builds in the format expected
           # by build-remote.pl.
           source = pkgs.writeText "nix.machines"
-            (pkgs.lib.concatStrings (map (machine:
+            (concatStrings (map (machine:
               "${machine.sshUser}@${machine.hostName} "
               + (if machine ? system then machine.system else concatStringsSep "," machine.systems) 
               + " ${machine.sshKey} ${toString machine.maxJobs} "
@@ -188,10 +188,8 @@ in
           target = "nix.machines";
         };
 
-    jobs = pkgs.lib.singleton
-      { name = "nix-daemon";
-
-        startOn = "startup";
+    jobAttrs.nixDaemon =
+      { startOn = "startup";
 
         script =
           ''
diff --git a/modules/services/misc/rogue.nix b/modules/services/misc/rogue.nix
index 3e6b24a5fd7..11d185f7409 100644
--- a/modules/services/misc/rogue.nix
+++ b/modules/services/misc/rogue.nix
@@ -40,10 +40,8 @@ in
 
     boot.extraTTYs = [ cfg.tty ];
   
-    jobs = singleton
-      { name = "rogue";
-
-        description = "Rogue dungeon crawling game";
+    jobAttrs.rogue =
+      { description = "Rogue dungeon crawling game";
 
         startOn = "udev";
         stopOn = "shutdown";
diff --git a/modules/services/networking/ddclient.nix b/modules/services/networking/ddclient.nix
index 7d99a95131f..03172592c16 100644
--- a/modules/services/networking/ddclient.nix
+++ b/modules/services/networking/ddclient.nix
@@ -1,4 +1,4 @@
-{pkgs, config, ...}:
+{ config, pkgs, ... }:
 
 let
 
@@ -110,27 +110,24 @@ in
         home = stateDir;
       };
 
-    jobs = singleton {
+    jobAttrs.ddclient =
+      { name = "ddclient";
 
-      name = "ddclient";
+        startOn = "startup";
+        stopOn = "shutdown"; 
 
-      startOn = "startup";
-      stopOn = "shutdown"; 
+        preStart =
+          ''
+            mkdir -m 0755 -p ${stateDir}
+            chown ${ddclientUser} ${stateDir}
 
-      preStart = ''
-         mkdir -m 0755 -p ${stateDir}
-         chown ${ddclientUser} ${stateDir}
+            # Needed to run ddclient as an unprivileged user.
+            ${modprobe}/sbin/modprobe capability || true
+          '';
 
-         # Needed to run ddclient as an unprivileged user.
-         ${modprobe}/sbin/modprobe capability || true
-      '';
-
-      script = ''
-        ${ddclient}/bin/ddclient ${ddclientFlags}
-      '';
+        exec = "${ddclient}/bin/ddclient ${ddclientFlags}";
+      };
 
-    };
-    
   };
   
 }
diff --git a/modules/services/networking/dhclient.nix b/modules/services/networking/dhclient.nix
index f1b523adf88..5ec87148172 100644
--- a/modules/services/networking/dhclient.nix
+++ b/modules/services/networking/dhclient.nix
@@ -1,7 +1,8 @@
-{pkgs, config, ...}:
+{ config, pkgs, ... }:
+
+with pkgs.lib;
 
 let
-  inherit (pkgs.lib) mkOption mkIf mergeEnableOption mergeListOption;
 
   inherit (pkgs) nettools dhcp lib;
 
@@ -60,10 +61,8 @@ in
   
   config = mkIf config.networking.useDHCP {
 
-    jobs = pkgs.lib.singleton
-      { name = "dhclient";
-
-        startOn = "network-interfaces/started";
+    jobAttrs.dhclient = 
+      { startOn = "network-interfaces/started";
         stopOn = "network-interfaces/stop";
 
         preStart =
diff --git a/modules/services/networking/firewall.nix b/modules/services/networking/firewall.nix
index f577f0e3bf1..f6353fdc37d 100644
--- a/modules/services/networking/firewall.nix
+++ b/modules/services/networking/firewall.nix
@@ -78,10 +78,8 @@ in
 
     environment.systemPackages = [pkgs.iptables];
 
-    jobs = singleton
-      { name = "firewall";
-
-        startOn = "network-interfaces/started";
+    jobAttrs.firewall =
+      { startOn = "network-interfaces/started";
 
         preStart =
           ''
diff --git a/modules/services/networking/privoxy.nix b/modules/services/networking/privoxy.nix
index 4e2585aba81..4c8a50a5d70 100644
--- a/modules/services/networking/privoxy.nix
+++ b/modules/services/networking/privoxy.nix
@@ -1,8 +1,8 @@
-{pkgs, config, ...}:
+{ config, pkgs, ... }:
 
-let
+with pkgs.lib;
 
-  inherit (pkgs.lib) mkOption mkIf singleton;
+let
 
   inherit (pkgs) privoxy;
 
@@ -77,27 +77,24 @@ in
         home = stateDir;
       };
 
-    jobs = singleton {
-
-      name = "privoxy";
+    jobAttrs.privoxy =
+      { name = "privoxy";
 
-      startOn = "startup";
-      stopOn = "shutdown"; 
+        startOn = "startup";
+        stopOn = "shutdown"; 
 
-      preStart = ''
-         mkdir -m 0755 -p ${stateDir}
-         chown ${privoxyUser} ${stateDir}
+        preStart =
+          ''
+            mkdir -m 0755 -p ${stateDir}
+            chown ${privoxyUser} ${stateDir}
 
-         # Needed to run privoxy as an unprivileged user.
-         ${modprobe}/sbin/modprobe capability || true
-      '';
+            # Needed to run privoxy as an unprivileged user.
+            ${modprobe}/sbin/modprobe capability || true
+          '';
 
-      script = ''
-        ${privoxy}/sbin/privoxy ${privoxyFlags}
-      '';
+        exec = "${privoxy}/sbin/privoxy ${privoxyFlags}";
+      };
 
-    };
-    
   };
   
 }
diff --git a/modules/services/networking/wpa_supplicant.nix b/modules/services/networking/wpa_supplicant.nix
index 309305481ee..c566452f9f7 100644
--- a/modules/services/networking/wpa_supplicant.nix
+++ b/modules/services/networking/wpa_supplicant.nix
@@ -1,4 +1,6 @@
-{pkgs, config, ...}:
+{ config, pkgs, ... }:
+
+with pkgs.lib;
 
 let
 
@@ -12,7 +14,7 @@ in
 
   options = {
   
-    networking.enableWLAN = pkgs.lib.mkOption {
+    networking.enableWLAN = mkOption {
       default = false;
       description = ''
         Whether to start <command>wpa_supplicant</command> to scan for
@@ -31,14 +33,12 @@ in
 
   ###### implementation
   
-  config = pkgs.lib.mkIf config.networking.enableWLAN {
+  config = mkIf config.networking.enableWLAN {
 
     environment.systemPackages = [pkgs.wpa_supplicant];
 
-    jobs = pkgs.lib.singleton
-      { name = "wpa_supplicant";
-
-        startOn = "network-interfaces/started";
+    jobAttrs.wpa_supplicant = 
+      { startOn = "network-interfaces/started";
         stopOn = "network-interfaces/stop";
 
         preStart =
diff --git a/modules/services/networking/xinetd.nix b/modules/services/networking/xinetd.nix
index a7f808e674e..41d6873d660 100644
--- a/modules/services/networking/xinetd.nix
+++ b/modules/services/networking/xinetd.nix
@@ -119,10 +119,8 @@ in
 
   config = mkIf cfg.enable {
 
-    jobs = singleton
-      { name = "xinetd";
-      
-        description = "xinetd server";
+    jobAttrs.xinetd =
+      { description = "xinetd server";
 
         startOn = "network-interfaces/started";
         stopOn = "network-interfaces/stop";
diff --git a/modules/services/scheduling/atd.nix b/modules/services/scheduling/atd.nix
index 74fdd9ea84e..38e5dad6bd4 100644
--- a/modules/services/scheduling/atd.nix
+++ b/modules/services/scheduling/atd.nix
@@ -63,10 +63,8 @@ in
         gid = config.ids.gids.atd;
       };
 
-    jobs = singleton
-      { name = "atd";
-
-        description = "at daemon (atd)";
+    jobAttrs.atd =
+      { description = "at daemon (atd)";
 
         startOn = "startup";
         stopOn = "shutdown";
diff --git a/modules/services/system/dbus.nix b/modules/services/system/dbus.nix
index 44d186dd54e..86c1887f57d 100644
--- a/modules/services/system/dbus.nix
+++ b/modules/services/system/dbus.nix
@@ -113,10 +113,8 @@ in
         gid = config.ids.gids.messagebus;
       };
 
-    jobs = singleton
-      { name = "dbus";
-
-        startOn = "udev";
+    jobAttrs.dbus =
+      { startOn = "udev";
         stopOn = "shutdown";
 
         preStart =
diff --git a/modules/services/system/nscd.nix b/modules/services/system/nscd.nix
index 11aa48720b2..3dfc6d3a468 100644
--- a/modules/services/system/nscd.nix
+++ b/modules/services/system/nscd.nix
@@ -17,10 +17,8 @@ in
         description = "Name service cache daemon user";
       };
 
-    jobs = singleton
-      { name = "nscd";
-
-        description = "Name Service Cache Daemon";
+    jobAttrs.nscd =
+      { description = "Name Service Cache Daemon";
 
         startOn = "startup";
         stopOn = "shutdown";
diff --git a/modules/services/ttys/mingetty.nix b/modules/services/ttys/mingetty.nix
index d4cade43f40..bbe3dd38c78 100644
--- a/modules/services/ttys/mingetty.nix
+++ b/modules/services/ttys/mingetty.nix
@@ -1,10 +1,6 @@
-{pkgs, config, ...}:
+{ config, pkgs, ... }:
 
-let
-
-  inherit (pkgs.lib) mkOption mkIf singleton;
-  
-in
+with pkgs.lib;
 
 {
 
@@ -57,15 +53,13 @@ in
   config = {
 
     # Generate a separate job for each tty.  
-    jobs = map (tty: {
+    jobAttrs = listToAttrs (map (tty: nameValuePair tty {
     
-      name = tty;
-
       startOn = "udev";
 
       exec = "${pkgs.mingetty}/sbin/mingetty --loginprog=${pkgs.pam_login}/bin/login --noclear ${tty}";
       
-    }) config.services.mingetty.ttys;
+    }) config.services.mingetty.ttys);
 
     environment.etc = singleton
       { # Friendly greeting on the virtual consoles.
diff --git a/modules/services/x11/xserver.nix b/modules/services/x11/xserver.nix
index eff5b693722..cbfcfbd186b 100644
--- a/modules/services/x11/xserver.nix
+++ b/modules/services/x11/xserver.nix
@@ -348,10 +348,8 @@ in
     
     services.hal.packages = halConfigFiles;
 
-    jobs = singleton
-      { name = "xserver";
-
-        startOn = if cfg.autorun then "hal" else "never";
+    jobAttrs.xserver =
+      { startOn = if cfg.autorun then "hal" else "never";
  
         environment =
           { FONTCONFIG_FILE = "/etc/fonts/fonts.conf"; # !!! cleanup
diff --git a/modules/system/upstart/upstart.nix b/modules/system/upstart/upstart.nix
index f84d98ff873..efa5d52ae7b 100644
--- a/modules/system/upstart/upstart.nix
+++ b/modules/system/upstart/upstart.nix
@@ -73,7 +73,7 @@ let
           echo "$jobText" > $out/etc/event.d/${job.name}
         '';
 
-        
+
   jobs =
     let
       deprecatedJobDefs = config.jobs;
diff --git a/modules/tasks/kbd.nix b/modules/tasks/kbd.nix
index fb95712bf11..d1c9e4bab35 100644
--- a/modules/tasks/kbd.nix
+++ b/modules/tasks/kbd.nix
@@ -1,4 +1,4 @@
-{pkgs, config, ...}:
+{ config, pkgs, ... }:
 
 with pkgs.lib;
 
@@ -56,10 +56,8 @@ in
 
     environment.systemPackages = [pkgs.kbd];
   
-    jobs = singleton
-      { name = "kbd";
-
-        description = "Keyboard / console initialisation";
+    jobAttrs.kbd =
+      { description = "Keyboard / console initialisation";
 
         startOn = "udev";
 
diff --git a/modules/tasks/network-interfaces.nix b/modules/tasks/network-interfaces.nix
index 713eed22e88..50c2c73823d 100644
--- a/modules/tasks/network-interfaces.nix
+++ b/modules/tasks/network-interfaces.nix
@@ -1,8 +1,8 @@
-{pkgs, config, ...}:
+{ config, pkgs, ... }:
 
-let
+with pkgs.lib;
 
-  inherit (pkgs.lib) mkOption types;
+let
 
   inherit (pkgs) nettools;
 
@@ -132,7 +132,7 @@ in
         pkgs.wirelesstools
       ];
     
-    jobs = pkgs.lib.singleton
+    jobAttrs.networkInterfaces = 
       { name = "network-interfaces";
 
         startOn = "udev";
diff --git a/modules/tasks/swap.nix b/modules/tasks/swap.nix
index 0f1a726ab29..ae4cd3a5c49 100644
--- a/modules/tasks/swap.nix
+++ b/modules/tasks/swap.nix
@@ -1,9 +1,10 @@
-{pkgs, config, ...}:
+{ config, pkgs, ... }:
+
+with pkgs.lib;
 
 let
 
   inherit (pkgs) utillinux;
-  inherit (pkgs.lib) mkOption filter types;
 
   toPath = x: if x.device != null then x.device else "/dev/disk/by-label/${x.label}";
   
@@ -65,10 +66,8 @@ in
 
   config = {
 
-    jobs = pkgs.lib.singleton
-      { name = "swap";
-
-        task = true;
+    jobAttrs.swap =
+      { task = true;
         
         startOn = ["startup" "new-devices"];
 
diff --git a/modules/tasks/tty-backgrounds.nix b/modules/tasks/tty-backgrounds.nix
index 5e3631f9adb..2abcf068e41 100644
--- a/modules/tasks/tty-backgrounds.nix
+++ b/modules/tasks/tty-backgrounds.nix
@@ -1,7 +1,9 @@
-{pkgs, config, ...}:
+{ config, pkgs, ... }:
+
+with pkgs.lib;
 
 let
-  inherit (pkgs.lib) mkOption mkIf singleton;
+
   inherit (pkgs) stdenv;
   
   kernelPackages = config.boot.kernelPackages;
@@ -19,7 +21,7 @@ let
       # syslog tty, except those for which a specific theme is
       # specified.
       defaultTTYs =
-        pkgs.lib.filter (x: !(pkgs.lib.elem x overridenTTYs)) requiredTTYs;
+        filter (x: !(elem x overridenTTYs)) requiredTTYs;
 
     in      
       (map (tty: {
@@ -100,42 +102,42 @@ in
         target = "splash";
       };
 
-    jobs = singleton {
-      name = "tty-backgrounds";
-
-      startOn = "udev";
-
-      preStart =
-        ''
-          # Critical: tell the kernel where to find splash_helper.  It calls
-          # this program every time we switch between consoles.
-          helperProcFile=${splashutils.helperProcFile}
-          if test -e /proc/sys/fbcondecor; then helperProcFile=/proc/sys/fbcondecor; fi
-          echo ${splashutils}/${splashutils.helperName} > $helperProcFile
-
-          # For each console...
-          for tty in ${toString (map (x: x.tty) backgrounds)}; do
-              # Make sure that the console exists.
-              echo -n "" > /dev/$tty
-
-              # Set the theme as determined by tty-backgrounds-combine.sh
-              # above.  Note that splashutils needs a TTY number
-              # instead of a device name, hence the ''${tty:3}.
-              theme=$(readlink ${themesUnpacked}/$tty)
-              ${splashutils}/${splashutils.controlName} --tty ''${tty:3} -c setcfg -t $theme || true
-              ${splashutils}/${splashutils.controlName} --tty ''${tty:3} -c setpic -t $theme || true
-              ${splashutils}/${splashutils.controlName} --tty ''${tty:3} -c on || true
-          done
-        '';
-
-      postStop =
-        ''
-          # Disable the theme on each console.
-          for tty in ${toString (map (x: x.tty) backgrounds)}; do
-              ${splashutils}/${splashutils.controlName} --tty ''${tty:3} -c off || true
-          done
-        '';
-    };
+    jobAttrs.ttyBackgrounds =
+      { name = "tty-backgrounds";
+
+        startOn = "udev";
+
+        preStart =
+          ''
+            # Critical: tell the kernel where to find splash_helper.  It calls
+            # this program every time we switch between consoles.
+            helperProcFile=${splashutils.helperProcFile}
+            if test -e /proc/sys/fbcondecor; then helperProcFile=/proc/sys/fbcondecor; fi
+            echo ${splashutils}/${splashutils.helperName} > $helperProcFile
+
+            # For each console...
+            for tty in ${toString (map (x: x.tty) backgrounds)}; do
+                # Make sure that the console exists.
+                echo -n "" > /dev/$tty
+
+                # Set the theme as determined by tty-backgrounds-combine.sh
+                # above.  Note that splashutils needs a TTY number
+                # instead of a device name, hence the ''${tty:3}.
+                theme=$(readlink ${themesUnpacked}/$tty)
+                ${splashutils}/${splashutils.controlName} --tty ''${tty:3} -c setcfg -t $theme || true
+                ${splashutils}/${splashutils.controlName} --tty ''${tty:3} -c setpic -t $theme || true
+                ${splashutils}/${splashutils.controlName} --tty ''${tty:3} -c on || true
+            done
+          '';
+
+        postStop =
+          ''
+            # Disable the theme on each console.
+            for tty in ${toString (map (x: x.tty) backgrounds)}; do
+                ${splashutils}/${splashutils.controlName} --tty ''${tty:3} -c off || true
+            done
+          '';
+      };
     
   };
   
diff --git a/modules/testing/test-instrumentation.nix b/modules/testing/test-instrumentation.nix
index 85f892e887f..a3c874d4fa5 100644
--- a/modules/testing/test-instrumentation.nix
+++ b/modules/testing/test-instrumentation.nix
@@ -9,10 +9,8 @@ with pkgs.lib;
 
   config = {
 
-    jobs = singleton
-      { name = "backdoor";
-      
-        startOn = "network-interfaces";
+    jobAttrs.backdoor =
+      { startOn = "network-interfaces";
         
         preStart =
           ''
-- 
GitLab


From 40c9057a49ee36481c712787cfe41d5d632e0fbe Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 12 Oct 2009 17:32:30 +0000
Subject: [PATCH 1911/5331] * Remove the obsolete "jobs" option.

svn path=/nixos/trunk/; revision=17765
---
 modules/system/upstart/upstart.nix | 32 ++----------------------------
 1 file changed, 2 insertions(+), 30 deletions(-)

diff --git a/modules/system/upstart/upstart.nix b/modules/system/upstart/upstart.nix
index efa5d52ae7b..7f053109082 100644
--- a/modules/system/upstart/upstart.nix
+++ b/modules/system/upstart/upstart.nix
@@ -75,18 +75,8 @@ let
 
 
   jobs =
-    let
-      deprecatedJobDefs = config.jobs;
-      jobList = concatStringsSep ", " (map (j: j.name) deprecatedJobDefs);
-      jobs =
-        if deprecatedJobDefs != [] then
-          builtins.trace "Make the following jobs use jobAttrs please. Using jobs is depreceated: ${jobList}" deprecatedJobDefs
-        else
-          deprecatedJobDefs;
-    in
-       [pkgs.upstart] # for the built-in logd job
-    ++ map (job: job.upstartPkg) (attrValues config.jobAttrs)
-    ++ map (job: job.upstartPkg) jobs;
+    [pkgs.upstart] # for the built-in logd job
+    ++ map (job: job.upstartPkg) (attrValues config.jobAttrs);
 
   # Create an etc/event.d directory containing symlinks to the
   # specified list of Upstart job files.
@@ -264,29 +254,11 @@ in
       description = ''
         This option defines the system jobs started and managed by the
         Upstart daemon.
-
-        It's filled by config.jobs by now. A warning is print.
-
-        You can overwrite settings easily. Example:
-
-          config.jobAttrs.sshd.startOn = "never";
       '';
-
       type = types.attrsOf types.optionSet;
       options = [ jobOptions upstartJob ];
     };
-   
   
-    jobs = mkOption {
-      default = [];
-      description = ''
-        See jobAttrs
-      '';
-
-      type = types.list types.optionSet;
-      options = [ jobOptions upstartJob ];
-    };
-
     tests.upstartJobs = mkOption {
       internal = true;
       default = {};
-- 
GitLab


From eba8f94069310f0a887c1d5568532c467459ccdf Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 12 Oct 2009 18:09:34 +0000
Subject: [PATCH 1912/5331] * jobAttrs -> jobs.

svn path=/nixos/trunk/; revision=17769
---
 modules/services/audio/alsa.nix                       | 2 +-
 modules/services/audio/pulseaudio.nix                 | 2 +-
 modules/services/databases/mysql.nix                  | 2 +-
 modules/services/databases/postgresql.nix             | 2 +-
 modules/services/hardware/acpid.nix                   | 2 +-
 modules/services/hardware/hal.nix                     | 2 +-
 modules/services/hardware/udev.nix                    | 2 +-
 modules/services/logging/klogd.nix                    | 2 +-
 modules/services/logging/syslogd.nix                  | 2 +-
 modules/services/mail/dovecot.nix                     | 2 +-
 modules/services/mail/postfix.nix                     | 2 +-
 modules/services/misc/autofs.nix                      | 2 +-
 modules/services/misc/disnix.nix                      | 2 +-
 modules/services/misc/gpsd.nix                        | 2 +-
 modules/services/misc/nix-daemon.nix                  | 2 +-
 modules/services/misc/nixos-manual.nix                | 2 +-
 modules/services/misc/rogue.nix                       | 2 +-
 modules/services/misc/synergy.nix                     | 2 +-
 modules/services/monitoring/nagios/default.nix        | 2 +-
 modules/services/monitoring/zabbix-agent.nix          | 2 +-
 modules/services/monitoring/zabbix-server.nix         | 2 +-
 modules/services/network-filesystems/nfs-kernel.nix   | 8 ++++----
 modules/services/network-filesystems/samba.nix        | 8 ++++----
 modules/services/networking/avahi-daemon.nix          | 2 +-
 modules/services/networking/bind.nix                  | 2 +-
 modules/services/networking/bitlbee.nix               | 2 +-
 modules/services/networking/ddclient.nix              | 2 +-
 modules/services/networking/dhclient.nix              | 2 +-
 modules/services/networking/dhcpd.nix                 | 2 +-
 modules/services/networking/ejabberd.nix              | 2 +-
 modules/services/networking/firewall.nix              | 2 +-
 modules/services/networking/gnunet.nix                | 2 +-
 modules/services/networking/gw6c.nix                  | 2 +-
 modules/services/networking/ifplugd.nix               | 2 +-
 modules/services/networking/ircd-hybrid.nix           | 2 +-
 modules/services/networking/ntpd.nix                  | 2 +-
 modules/services/networking/openfire.nix              | 2 +-
 modules/services/networking/openvpn.nix               | 2 +-
 modules/services/networking/portmap.nix               | 2 +-
 modules/services/networking/privoxy.nix               | 2 +-
 modules/services/networking/ssh/lshd.nix              | 2 +-
 modules/services/networking/ssh/sshd.nix              | 2 +-
 modules/services/networking/vsftpd.nix                | 2 +-
 modules/services/networking/wpa_supplicant.nix        | 2 +-
 modules/services/networking/xinetd.nix                | 2 +-
 modules/services/printing/cupsd.nix                   | 2 +-
 modules/services/scheduling/atd.nix                   | 2 +-
 modules/services/scheduling/cron.nix                  | 2 +-
 modules/services/scheduling/fcron.nix                 | 2 +-
 modules/services/system/dbus.nix                      | 2 +-
 modules/services/system/nscd.nix                      | 2 +-
 modules/services/system/uptimed.nix                   | 2 +-
 modules/services/ttys/gpm.nix                         | 2 +-
 modules/services/ttys/mingetty.nix                    | 2 +-
 modules/services/web-servers/apache-httpd/default.nix | 2 +-
 modules/services/web-servers/jboss.nix                | 2 +-
 modules/services/web-servers/tomcat.nix               | 2 +-
 modules/services/x11/xfs.nix                          | 2 +-
 modules/services/x11/xserver.nix                      | 2 +-
 modules/system/upstart-events/ctrl-alt-delete.nix     | 2 +-
 modules/system/upstart-events/halt.nix                | 2 +-
 modules/system/upstart-events/maintenance-shell.nix   | 2 +-
 modules/system/upstart/upstart.nix                    | 5 ++---
 modules/tasks/filesystems.nix                         | 2 +-
 modules/tasks/kbd.nix                                 | 2 +-
 modules/tasks/lvm.nix                                 | 2 +-
 modules/tasks/network-interfaces.nix                  | 2 +-
 modules/tasks/swap.nix                                | 2 +-
 modules/tasks/swraid.nix                              | 2 +-
 modules/tasks/tty-backgrounds.nix                     | 2 +-
 modules/testing/test-instrumentation.nix              | 2 +-
 71 files changed, 78 insertions(+), 79 deletions(-)

diff --git a/modules/services/audio/alsa.nix b/modules/services/audio/alsa.nix
index c72449150d1..5f463f8d8cd 100644
--- a/modules/services/audio/alsa.nix
+++ b/modules/services/audio/alsa.nix
@@ -45,7 +45,7 @@ in
         gid = config.ids.gids.audio;
       };
 
-    jobAttrs.alsa =
+    jobs.alsa =
       { startOn = "udev";
 
         preStart =
diff --git a/modules/services/audio/pulseaudio.nix b/modules/services/audio/pulseaudio.nix
index d322c6b51ea..5a8ffbd30a1 100644
--- a/modules/services/audio/pulseaudio.nix
+++ b/modules/services/audio/pulseaudio.nix
@@ -62,7 +62,7 @@ in
         inherit gid;
       };
 
-    jobAttrs.pulseaudio =
+    jobs.pulseaudio =
       { description = "PulseAudio system-wide server";
 
         startOn = "startup";
diff --git a/modules/services/databases/mysql.nix b/modules/services/databases/mysql.nix
index 9e7a0543c9d..5d16ebe0af4 100644
--- a/modules/services/databases/mysql.nix
+++ b/modules/services/databases/mysql.nix
@@ -72,7 +72,7 @@ in
 
     environment.systemPackages = [mysql];
 
-    jobAttrs.mysql =
+    jobs.mysql =
       { description = "MySQL server";
 
         startOn = "filesystems";
diff --git a/modules/services/databases/postgresql.nix b/modules/services/databases/postgresql.nix
index 207701f1355..b463e39c725 100644
--- a/modules/services/databases/postgresql.nix
+++ b/modules/services/databases/postgresql.nix
@@ -113,7 +113,7 @@ in
 
     environment.systemPackages = [postgresql];
 
-    jobAttrs.postgresql =
+    jobs.postgresql =
       { description = "PostgreSQL server";
 
         startOn = "${startDependency}/started";
diff --git a/modules/services/hardware/acpid.nix b/modules/services/hardware/acpid.nix
index 595153b0af9..ebb2f2a6a05 100644
--- a/modules/services/hardware/acpid.nix
+++ b/modules/services/hardware/acpid.nix
@@ -76,7 +76,7 @@ in
 
   config = mkIf config.powerManagement.enable {
 
-    jobAttrs.acpid =
+    jobs.acpid =
       { description = "ACPI daemon";
 
         startOn = "udev";
diff --git a/modules/services/hardware/hal.nix b/modules/services/hardware/hal.nix
index 94831b62778..5ac01d3b098 100644
--- a/modules/services/hardware/hal.nix
+++ b/modules/services/hardware/hal.nix
@@ -64,7 +64,7 @@ in
         gid = config.ids.gids.haldaemon;
       };
 
-    jobAttrs.hal =
+    jobs.hal =
       { description = "HAL daemon";
         
         # !!! TODO: make sure that HAL starts after acpid,
diff --git a/modules/services/hardware/udev.nix b/modules/services/hardware/udev.nix
index 91e933f4b03..d819527fb23 100644
--- a/modules/services/hardware/udev.nix
+++ b/modules/services/hardware/udev.nix
@@ -152,7 +152,7 @@ in
     
     services.udev.packages = [extraUdevRules];
 
-    jobAttrs.udev =
+    jobs.udev =
       { startOn = "startup";
         stopOn = "shutdown";
 
diff --git a/modules/services/logging/klogd.nix b/modules/services/logging/klogd.nix
index f8c26e0f166..0b2e3d9ddc7 100644
--- a/modules/services/logging/klogd.nix
+++ b/modules/services/logging/klogd.nix
@@ -10,7 +10,7 @@ in
 
 {
 
-  jobAttrs.klogd =
+  jobs.klogd =
     { description = "Kernel log daemon";
 
       startOn = "syslogd";
diff --git a/modules/services/logging/syslogd.nix b/modules/services/logging/syslogd.nix
index a1679f71bc2..bc6b6eb4389 100644
--- a/modules/services/logging/syslogd.nix
+++ b/modules/services/logging/syslogd.nix
@@ -47,7 +47,7 @@ in
 
   config = {
   
-    jobAttrs.syslogd =
+    jobs.syslogd =
       { description = "Syslog daemon";
 
         startOn = "udev";
diff --git a/modules/services/mail/dovecot.nix b/modules/services/mail/dovecot.nix
index 950c748ff8c..8ddbe5bfd7b 100644
--- a/modules/services/mail/dovecot.nix
+++ b/modules/services/mail/dovecot.nix
@@ -113,7 +113,7 @@ in
         gid = config.ids.gids.dovecot;
       };
 
-    jobAttrs.dovecot =
+    jobs.dovecot =
       { description = "Dovecot IMAP/POP3 server";
 
         startOn = "${startingDependency}/started";
diff --git a/modules/services/mail/postfix.nix b/modules/services/mail/postfix.nix
index ec218608980..b5ed10d957b 100644
--- a/modules/services/mail/postfix.nix
+++ b/modules/services/mail/postfix.nix
@@ -275,7 +275,7 @@ in
         }
       ];
 
-    jobAttrs.postfix =
+    jobs.postfix =
       # I copy _lots_ of shipped configuration filed 
       # that can be left as is. I am afraid the exact
       # will list slightly change in next Postfix 
diff --git a/modules/services/misc/autofs.nix b/modules/services/misc/autofs.nix
index 757d38a1280..b9936d0249d 100644
--- a/modules/services/misc/autofs.nix
+++ b/modules/services/misc/autofs.nix
@@ -72,7 +72,7 @@ in
         source = pkgs.writeText "auto.master" cfg.autoMaster;
       };
 
-    jobAttrs.autofs =
+    jobs.autofs =
       { description = "Filesystem automounter";
 
         startOn = "network-interfaces/started";
diff --git a/modules/services/misc/disnix.nix b/modules/services/misc/disnix.nix
index bae74826da1..225762813ee 100644
--- a/modules/services/misc/disnix.nix
+++ b/modules/services/misc/disnix.nix
@@ -36,7 +36,7 @@ in
     services.dbus.enable = true;
     services.dbus.packages = [ pkgs.disnix ];
 
-    jobAttrs.disnix =
+    jobs.disnix =
       { description = "Disnix server";
 
         startOn = "dbus";
diff --git a/modules/services/misc/gpsd.nix b/modules/services/misc/gpsd.nix
index ba2d550f461..98feef68231 100644
--- a/modules/services/misc/gpsd.nix
+++ b/modules/services/misc/gpsd.nix
@@ -85,7 +85,7 @@ in
         inherit gid;
       };
 
-    jobAttrs.gpsd =
+    jobs.gpsd =
       { description = "GPSD daemon";
 
         startOn = "network-interfaces/started";
diff --git a/modules/services/misc/nix-daemon.nix b/modules/services/misc/nix-daemon.nix
index 479c4fa4a28..7c40dbe12f4 100644
--- a/modules/services/misc/nix-daemon.nix
+++ b/modules/services/misc/nix-daemon.nix
@@ -188,7 +188,7 @@ in
           target = "nix.machines";
         };
 
-    jobAttrs.nixDaemon =
+    jobs.nixDaemon =
       { startOn = "startup";
 
         script =
diff --git a/modules/services/misc/nixos-manual.nix b/modules/services/misc/nixos-manual.nix
index 78c120872c8..a5a3e8977da 100644
--- a/modules/services/misc/nixos-manual.nix
+++ b/modules/services/misc/nixos-manual.nix
@@ -72,7 +72,7 @@ in
 
     boot.extraTTYs = mkIf cfg.showManual [cfg.ttyNumber];
 
-    jobAttrs = mkIf cfg.showManual
+    jobs = mkIf cfg.showManual
       { nixosManual = 
         { name = "nixos-manual";
 
diff --git a/modules/services/misc/rogue.nix b/modules/services/misc/rogue.nix
index 11d185f7409..a128e7f7cdb 100644
--- a/modules/services/misc/rogue.nix
+++ b/modules/services/misc/rogue.nix
@@ -40,7 +40,7 @@ in
 
     boot.extraTTYs = [ cfg.tty ];
   
-    jobAttrs.rogue =
+    jobs.rogue =
       { description = "Rogue dungeon crawling game";
 
         startOn = "udev";
diff --git a/modules/services/misc/synergy.nix b/modules/services/misc/synergy.nix
index 88226755e66..72eaf640ea8 100644
--- a/modules/services/misc/synergy.nix
+++ b/modules/services/misc/synergy.nix
@@ -68,7 +68,7 @@ in
 
   config = {
 
-    jobAttrs =
+    jobs =
     
       optionalAttrs cfgC.enable
         { synergyClient = 
diff --git a/modules/services/monitoring/nagios/default.nix b/modules/services/monitoring/nagios/default.nix
index dc060e675da..78e6a276fc8 100644
--- a/modules/services/monitoring/nagios/default.nix
+++ b/modules/services/monitoring/nagios/default.nix
@@ -158,7 +158,7 @@ in
 
     environment.systemPackages = [ pkgs.nagios ];
 
-    jobAttrs.nagios =
+    jobs.nagios =
       { # Run `nagios -v' to check the validity of the configuration file so
         # that a nixos-rebuild fails *before* we kill the running Nagios
         # daemon.
diff --git a/modules/services/monitoring/zabbix-agent.nix b/modules/services/monitoring/zabbix-agent.nix
index f3559ef8ba4..9fbcad78c68 100644
--- a/modules/services/monitoring/zabbix-agent.nix
+++ b/modules/services/monitoring/zabbix-agent.nix
@@ -64,7 +64,7 @@ in
         description = "Zabbix daemon user";
       };
 
-    jobAttrs.zabbix_agent =
+    jobs.zabbix_agent =
       { #name = "zabbix-agent"; !!! mkIf bug
 
         description = "Zabbix agent daemon";
diff --git a/modules/services/monitoring/zabbix-server.nix b/modules/services/monitoring/zabbix-server.nix
index c41fc93ac1d..9b006ed8ec2 100644
--- a/modules/services/monitoring/zabbix-server.nix
+++ b/modules/services/monitoring/zabbix-server.nix
@@ -51,7 +51,7 @@ in
         description = "Zabbix daemon user";
       };
 
-    jobAttrs.zabbix_server =
+    jobs.zabbix_server =
       { #name = "zabbix-server"; !!! mkIf bug
 
         description = "Zabbix server daemon";
diff --git a/modules/services/network-filesystems/nfs-kernel.nix b/modules/services/network-filesystems/nfs-kernel.nix
index 624e224fb36..1f67d584b89 100644
--- a/modules/services/network-filesystems/nfs-kernel.nix
+++ b/modules/services/network-filesystems/nfs-kernel.nix
@@ -76,7 +76,7 @@ in
         target = "exports";
       };
 
-    jobAttrs.nfs_kernel_exports =
+    jobs.nfs_kernel_exports =
       { name = "nfs-kernel-exports";
       
         description = "Kernel NFS server";
@@ -106,7 +106,7 @@ in
           '';
       };
 
-    jobAttrs.nfs_kernel_nfsd =
+    jobs.nfs_kernel_nfsd =
       { name = "nfs-kernel-nfsd";
 
         description = "Kernel NFS server";
@@ -117,7 +117,7 @@ in
         exec = "${pkgs.nfsUtils}/sbin/rpc.nfsd ${if cfg.hostName != null then "-H ${cfg.hostName}" else ""} ${builtins.toString cfg.nproc}";
       };
 
-    jobAttrs.nfs_kernel_mountd =
+    jobs.nfs_kernel_mountd =
       { name = "nfs-kernel-mountd";
 
         description = "Kernel NFS server - mount daemon";
@@ -128,7 +128,7 @@ in
         exec = "${pkgs.nfsUtils}/sbin/rpc.mountd -F -f ${exports}";
       };
 
-    jobAttrs.nfs_kernel_statd =
+    jobs.nfs_kernel_statd =
       { name = "nfs-kernel-statd";
       
         description = "Kernel NFS server - Network Status Monitor";
diff --git a/modules/services/network-filesystems/samba.nix b/modules/services/network-filesystems/samba.nix
index 177a2f5128e..98d58e9f7f4 100644
--- a/modules/services/network-filesystems/samba.nix
+++ b/modules/services/network-filesystems/samba.nix
@@ -164,7 +164,7 @@ in
       });
 
     # Dummy job to start the real Samba daemons (nmbd, smbd, winbindd).
-    jobAttrs.sambaControl =
+    jobs.sambaControl =
       { name = "samba";
         description = "Samba server";
 
@@ -176,11 +176,11 @@ in
 
     # nmbd says "standard input is not a socket, assuming -D option",
     # but using -i makes it stay in foreground (?)
-    jobAttrs.nmbd = daemonJob "nmbd" " -i -F";
+    jobs.nmbd = daemonJob "nmbd" " -i -F";
 
-    jobAttrs.smbd = daemonJob "smbd" " -i -F";
+    jobs.smbd = daemonJob "smbd" " -i -F";
 
-    jobAttrs.winbindd = daemonJob "winbindd" " -F";
+    jobs.winbindd = daemonJob "winbindd" " -F";
 
   };
   
diff --git a/modules/services/networking/avahi-daemon.nix b/modules/services/networking/avahi-daemon.nix
index 34e2a83754d..f3033e8a408 100644
--- a/modules/services/networking/avahi-daemon.nix
+++ b/modules/services/networking/avahi-daemon.nix
@@ -115,7 +115,7 @@ in
 
     environment.systemPackages = [ avahi ];
 
-    jobAttrs.avahi_daemon =
+    jobs.avahi_daemon =
       { name = "avahi-daemon";
 
         startOn = "network-interfaces/started";
diff --git a/modules/services/networking/bind.nix b/modules/services/networking/bind.nix
index d1a137f3502..c93c2a9b00e 100644
--- a/modules/services/networking/bind.nix
+++ b/modules/services/networking/bind.nix
@@ -105,7 +105,7 @@ in
 
   config = mkIf config.services.bind.enable {
 
-    jobAttrs.bind =
+    jobs.bind =
       { description = "BIND name server job";
 
         preStart =
diff --git a/modules/services/networking/bitlbee.nix b/modules/services/networking/bitlbee.nix
index c55adb49335..2aa51603d05 100644
--- a/modules/services/networking/bitlbee.nix
+++ b/modules/services/networking/bitlbee.nix
@@ -64,7 +64,7 @@ in
         gid = config.ids.gids.bitlbee;
       };
 
-    jobAttrs.bitlbee =
+    jobs.bitlbee =
       { description = "BitlBee IRC to other chat networks gateway";
 
         startOn = "network-interfaces/started";
diff --git a/modules/services/networking/ddclient.nix b/modules/services/networking/ddclient.nix
index 03172592c16..b5bffa83cd7 100644
--- a/modules/services/networking/ddclient.nix
+++ b/modules/services/networking/ddclient.nix
@@ -110,7 +110,7 @@ in
         home = stateDir;
       };
 
-    jobAttrs.ddclient =
+    jobs.ddclient =
       { name = "ddclient";
 
         startOn = "startup";
diff --git a/modules/services/networking/dhclient.nix b/modules/services/networking/dhclient.nix
index 5ec87148172..9696c8b14aa 100644
--- a/modules/services/networking/dhclient.nix
+++ b/modules/services/networking/dhclient.nix
@@ -61,7 +61,7 @@ in
   
   config = mkIf config.networking.useDHCP {
 
-    jobAttrs.dhclient = 
+    jobs.dhclient = 
       { startOn = "network-interfaces/started";
         stopOn = "network-interfaces/stop";
 
diff --git a/modules/services/networking/dhcpd.nix b/modules/services/networking/dhcpd.nix
index 5a2d9034dfd..6daa0c073b8 100644
--- a/modules/services/networking/dhcpd.nix
+++ b/modules/services/networking/dhcpd.nix
@@ -108,7 +108,7 @@ in
 
   config = mkIf config.services.dhcpd.enable {
 
-    jobAttrs.dhcpd =
+    jobs.dhcpd =
       { description = "DHCP server";
 
         startOn = "network-interfaces/started";
diff --git a/modules/services/networking/ejabberd.nix b/modules/services/networking/ejabberd.nix
index 8ef910e1262..7b341bc8604 100644
--- a/modules/services/networking/ejabberd.nix
+++ b/modules/services/networking/ejabberd.nix
@@ -50,7 +50,7 @@ in
 
   config = mkIf cfg.enable {
 
-    jobAttrs.ejabberd =
+    jobs.ejabberd =
       { description = "EJabberd server";
 
         startOn = "network-interface/started";
diff --git a/modules/services/networking/firewall.nix b/modules/services/networking/firewall.nix
index f6353fdc37d..0b8a8d93061 100644
--- a/modules/services/networking/firewall.nix
+++ b/modules/services/networking/firewall.nix
@@ -78,7 +78,7 @@ in
 
     environment.systemPackages = [pkgs.iptables];
 
-    jobAttrs.firewall =
+    jobs.firewall =
       { startOn = "network-interfaces/started";
 
         preStart =
diff --git a/modules/services/networking/gnunet.nix b/modules/services/networking/gnunet.nix
index 4f9723fc304..e35dfbcd1a8 100644
--- a/modules/services/networking/gnunet.nix
+++ b/modules/services/networking/gnunet.nix
@@ -191,7 +191,7 @@ in
         home = "/var/empty";
       };
 
-    jobAttrs.gnunetd =
+    jobs.gnunetd =
       { description = "The GNUnet Daemon";
 
         startOn = "network-interfaces/started";
diff --git a/modules/services/networking/gw6c.nix b/modules/services/networking/gw6c.nix
index 961940d534a..143fe57979a 100644
--- a/modules/services/networking/gw6c.nix
+++ b/modules/services/networking/gw6c.nix
@@ -129,7 +129,7 @@ in
 
   config = mkIf cfg.enable {
 
-    jobAttrs.gw6c =
+    jobs.gw6c =
       { description = "Gateway6 client";
       
         startOn = if cfg.autorun then "network-interfaces/started" else "";
diff --git a/modules/services/networking/ifplugd.nix b/modules/services/networking/ifplugd.nix
index 021e7f8fecf..85eda29f5a2 100644
--- a/modules/services/networking/ifplugd.nix
+++ b/modules/services/networking/ifplugd.nix
@@ -55,7 +55,7 @@ in
 
   config = mkIf config.networking.interfaceMonitor.enable {
 
-    jobAttrs.ifplugd =
+    jobs.ifplugd =
       { description = "Network interface connectivity monitor";
 
         startOn = "network-interfaces/started";
diff --git a/modules/services/networking/ircd-hybrid.nix b/modules/services/networking/ircd-hybrid.nix
index e59f9a8fa4f..aea5fbd6550 100644
--- a/modules/services/networking/ircd-hybrid.nix
+++ b/modules/services/networking/ircd-hybrid.nix
@@ -117,7 +117,7 @@ in
     users.extraGroups = singleton
       { name = "ircd"; };
 
-    jobAttrs.ircd_hybrid =
+    jobs.ircd_hybrid =
       { # name = "ircd-hybrid"; !!! mkIf bug
 
         description = "IRCD Hybrid server";
diff --git a/modules/services/networking/ntpd.nix b/modules/services/networking/ntpd.nix
index 711682c9dce..159c8022442 100644
--- a/modules/services/networking/ntpd.nix
+++ b/modules/services/networking/ntpd.nix
@@ -70,7 +70,7 @@ in
         home = stateDir;
       };
 
-    jobAttrs.ntpd =
+    jobs.ntpd =
       { description = "NTP daemon";
 
         startOn = "ip-up";
diff --git a/modules/services/networking/openfire.nix b/modules/services/networking/openfire.nix
index e009498546c..67e2558b22a 100644
--- a/modules/services/networking/openfire.nix
+++ b/modules/services/networking/openfire.nix
@@ -49,7 +49,7 @@ in
         message = "openfire assertion failed";
       };
 
-    jobAttrs.openfire =
+    jobs.openfire =
       { description = "OpenFire XMPP server";
 
         startOn = "${startDependency}/started";
diff --git a/modules/services/networking/openvpn.nix b/modules/services/networking/openvpn.nix
index f7a8f51d9b1..b02f18e6b28 100644
--- a/modules/services/networking/openvpn.nix
+++ b/modules/services/networking/openvpn.nix
@@ -121,7 +121,7 @@ in
 
   config = mkIf cfg.enable {
 
-    jobAttrs = listToAttrs (map (c: nameValuePair "openvpn-${cfg.id}" (makeOpenVPNJob c)) cfg.servers);
+    jobs = listToAttrs (map (c: nameValuePair "openvpn-${cfg.id}" (makeOpenVPNJob c)) cfg.servers);
   
   };
   
diff --git a/modules/services/networking/portmap.nix b/modules/services/networking/portmap.nix
index 08cd2457bcc..0fcbf63d799 100644
--- a/modules/services/networking/portmap.nix
+++ b/modules/services/networking/portmap.nix
@@ -63,7 +63,7 @@ in
         inherit gid;
       };
 
-    jobAttrs.portmap =
+    jobs.portmap =
       { description = "ONC RPC portmap";
 
         startOn = "network-interfaces/started";
diff --git a/modules/services/networking/privoxy.nix b/modules/services/networking/privoxy.nix
index 4c8a50a5d70..f2350f4c462 100644
--- a/modules/services/networking/privoxy.nix
+++ b/modules/services/networking/privoxy.nix
@@ -77,7 +77,7 @@ in
         home = stateDir;
       };
 
-    jobAttrs.privoxy =
+    jobs.privoxy =
       { name = "privoxy";
 
         startOn = "startup";
diff --git a/modules/services/networking/ssh/lshd.nix b/modules/services/networking/ssh/lshd.nix
index 35eaa0c743f..c3a14ba17e8 100644
--- a/modules/services/networking/ssh/lshd.nix
+++ b/modules/services/networking/ssh/lshd.nix
@@ -116,7 +116,7 @@ in
 
   config = mkIf cfg.enable {
 
-    jobAttrs.lshd =
+    jobs.lshd =
       { description = "GNU lshd SSH2 daemon";
 
         startOn = "network-interfaces/started";
diff --git a/modules/services/networking/ssh/sshd.nix b/modules/services/networking/ssh/sshd.nix
index 01ade07761c..8c18a560748 100644
--- a/modules/services/networking/ssh/sshd.nix
+++ b/modules/services/networking/ssh/sshd.nix
@@ -108,7 +108,7 @@ in
         home = "/var/empty";
       };
 
-    jobAttrs.sshd = {
+    jobs.sshd = {
 
         description = "OpenSSH server";
 
diff --git a/modules/services/networking/vsftpd.nix b/modules/services/networking/vsftpd.nix
index 2a567f3ec90..b98a9aa3f7d 100644
--- a/modules/services/networking/vsftpd.nix
+++ b/modules/services/networking/vsftpd.nix
@@ -99,7 +99,7 @@ in
         gid = config.ids.gids.ftp;
       };
 
-    jobAttrs.vsftpd =
+    jobs.vsftpd =
       { description = "vsftpd server";
 
         startOn = "network-interfaces/started";
diff --git a/modules/services/networking/wpa_supplicant.nix b/modules/services/networking/wpa_supplicant.nix
index c566452f9f7..37b5923421f 100644
--- a/modules/services/networking/wpa_supplicant.nix
+++ b/modules/services/networking/wpa_supplicant.nix
@@ -37,7 +37,7 @@ in
 
     environment.systemPackages = [pkgs.wpa_supplicant];
 
-    jobAttrs.wpa_supplicant = 
+    jobs.wpa_supplicant = 
       { startOn = "network-interfaces/started";
         stopOn = "network-interfaces/stop";
 
diff --git a/modules/services/networking/xinetd.nix b/modules/services/networking/xinetd.nix
index 41d6873d660..be9e5712e7d 100644
--- a/modules/services/networking/xinetd.nix
+++ b/modules/services/networking/xinetd.nix
@@ -119,7 +119,7 @@ in
 
   config = mkIf cfg.enable {
 
-    jobAttrs.xinetd =
+    jobs.xinetd =
       { description = "xinetd server";
 
         startOn = "network-interfaces/started";
diff --git a/modules/services/printing/cupsd.nix b/modules/services/printing/cupsd.nix
index f6c65250162..3c7944261ed 100644
--- a/modules/services/printing/cupsd.nix
+++ b/modules/services/printing/cupsd.nix
@@ -155,7 +155,7 @@ in
         }
       ];
 
-    jobAttrs.cupsd =
+    jobs.cupsd =
       { description = "CUPS printing daemon";
 
         startOn = "network-interfaces/started";
diff --git a/modules/services/scheduling/atd.nix b/modules/services/scheduling/atd.nix
index 38e5dad6bd4..fb579dbf0b2 100644
--- a/modules/services/scheduling/atd.nix
+++ b/modules/services/scheduling/atd.nix
@@ -63,7 +63,7 @@ in
         gid = config.ids.gids.atd;
       };
 
-    jobAttrs.atd =
+    jobs.atd =
       { description = "at daemon (atd)";
 
         startOn = "startup";
diff --git a/modules/services/scheduling/cron.nix b/modules/services/scheduling/cron.nix
index 19ea49619ec..930162f1c73 100644
--- a/modules/services/scheduling/cron.nix
+++ b/modules/services/scheduling/cron.nix
@@ -66,7 +66,7 @@ in
 
     environment.systemPackages = [pkgs.cron];
 
-    jobAttrs.cron =
+    jobs.cron =
       { description = "Cron daemon";
 
         startOn = "startup";
diff --git a/modules/services/scheduling/fcron.nix b/modules/services/scheduling/fcron.nix
index 18b002ef387..b38a70b932a 100644
--- a/modules/services/scheduling/fcron.nix
+++ b/modules/services/scheduling/fcron.nix
@@ -97,7 +97,7 @@ in
 
     environment.systemPackages = [ pkgs.fcron ];
 
-    jobAttrs.fcron =
+    jobs.fcron =
       { description = "fcron daemon";
 
         startOn = "startup";
diff --git a/modules/services/system/dbus.nix b/modules/services/system/dbus.nix
index 86c1887f57d..4011c3b3335 100644
--- a/modules/services/system/dbus.nix
+++ b/modules/services/system/dbus.nix
@@ -113,7 +113,7 @@ in
         gid = config.ids.gids.messagebus;
       };
 
-    jobAttrs.dbus =
+    jobs.dbus =
       { startOn = "udev";
         stopOn = "shutdown";
 
diff --git a/modules/services/system/nscd.nix b/modules/services/system/nscd.nix
index 3dfc6d3a468..a14215c70d1 100644
--- a/modules/services/system/nscd.nix
+++ b/modules/services/system/nscd.nix
@@ -17,7 +17,7 @@ in
         description = "Name service cache daemon user";
       };
 
-    jobAttrs.nscd =
+    jobs.nscd =
       { description = "Name Service Cache Daemon";
 
         startOn = "startup";
diff --git a/modules/services/system/uptimed.nix b/modules/services/system/uptimed.nix
index 259363024fc..3749358ac20 100644
--- a/modules/services/system/uptimed.nix
+++ b/modules/services/system/uptimed.nix
@@ -49,7 +49,7 @@ in
         home = stateDir;
       };
 
-    jobAttrs.uptimed =
+    jobs.uptimed =
       { description = "Uptimed daemon";
 
         startOn = "startup";
diff --git a/modules/services/ttys/gpm.nix b/modules/services/ttys/gpm.nix
index fdc1db2878c..026ed4a299f 100644
--- a/modules/services/ttys/gpm.nix
+++ b/modules/services/ttys/gpm.nix
@@ -38,7 +38,7 @@ in
 
   config = mkIf cfg.enable {
 
-    jobAttrs.gpm =
+    jobs.gpm =
       { description = "General purpose mouse";
 
         startOn = "udev";
diff --git a/modules/services/ttys/mingetty.nix b/modules/services/ttys/mingetty.nix
index bbe3dd38c78..6c793ffa112 100644
--- a/modules/services/ttys/mingetty.nix
+++ b/modules/services/ttys/mingetty.nix
@@ -53,7 +53,7 @@ with pkgs.lib;
   config = {
 
     # Generate a separate job for each tty.  
-    jobAttrs = listToAttrs (map (tty: nameValuePair tty {
+    jobs = listToAttrs (map (tty: nameValuePair tty {
     
       startOn = "udev";
 
diff --git a/modules/services/web-servers/apache-httpd/default.nix b/modules/services/web-servers/apache-httpd/default.nix
index 6470b64d6be..24c3077e0a9 100644
--- a/modules/services/web-servers/apache-httpd/default.nix
+++ b/modules/services/web-servers/apache-httpd/default.nix
@@ -559,7 +559,7 @@ in
 
     environment.systemPackages = [httpd] ++ concatMap (svc: svc.extraPath) allSubservices;
 
-    jobAttrs.httpd =
+    jobs.httpd =
       { # Statically verify the syntactic correctness of the generated
         # httpd.conf.  !!! this is impure!  It doesn't just check for
         # syntax, but also whether the Apache user/group exist,
diff --git a/modules/services/web-servers/jboss.nix b/modules/services/web-servers/jboss.nix
index 9d81f75a83d..bf7a8090b19 100644
--- a/modules/services/web-servers/jboss.nix
+++ b/modules/services/web-servers/jboss.nix
@@ -70,7 +70,7 @@ in
 
   config = mkIf config.services.jboss.enable {
 
-    jobAttrs.jboss =
+    jobs.jboss =
       { description = "JBoss server";
 
         exec = "${jbossService}/bin/control start";
diff --git a/modules/services/web-servers/tomcat.nix b/modules/services/web-servers/tomcat.nix
index 613e1204f50..331653ba929 100644
--- a/modules/services/web-servers/tomcat.nix
+++ b/modules/services/web-servers/tomcat.nix
@@ -101,7 +101,7 @@ in
         home = "/homeless-shelter";
       };
       
-    jobAttrs.tomcat =
+    jobs.tomcat =
       { description = "Apache Tomcat server";
 
         startOn = "network-interface/started";
diff --git a/modules/services/x11/xfs.nix b/modules/services/x11/xfs.nix
index 4f4d278fadb..860d5823be3 100644
--- a/modules/services/x11/xfs.nix
+++ b/modules/services/x11/xfs.nix
@@ -40,7 +40,7 @@ in
         message = "Please enable fontDir (fonts.enableFontDir) to use xfs.";
       };
 
-    jobAttrs.xfs =
+    jobs.xfs =
       { description = "X Font Server";
       
         startOn = "${startingDependency}/started";
diff --git a/modules/services/x11/xserver.nix b/modules/services/x11/xserver.nix
index cbfcfbd186b..1cf36e9ad70 100644
--- a/modules/services/x11/xserver.nix
+++ b/modules/services/x11/xserver.nix
@@ -348,7 +348,7 @@ in
     
     services.hal.packages = halConfigFiles;
 
-    jobAttrs.xserver =
+    jobs.xserver =
       { startOn = if cfg.autorun then "hal" else "never";
  
         environment =
diff --git a/modules/system/upstart-events/ctrl-alt-delete.nix b/modules/system/upstart-events/ctrl-alt-delete.nix
index 3fb6c12c25d..ae1ba2e342e 100644
--- a/modules/system/upstart-events/ctrl-alt-delete.nix
+++ b/modules/system/upstart-events/ctrl-alt-delete.nix
@@ -3,7 +3,7 @@
 ###### implementation
 
 {
-  jobAttrs.ctrl_alt_delete =
+  jobs.ctrl_alt_delete =
     { name = "ctrl-alt-delete";
 
       startOn = "ctrlaltdel";
diff --git a/modules/system/upstart-events/halt.nix b/modules/system/upstart-events/halt.nix
index c7721eb3e28..36efc3fe2cf 100644
--- a/modules/system/upstart-events/halt.nix
+++ b/modules/system/upstart-events/halt.nix
@@ -116,6 +116,6 @@ let
 in
 
 {
-  jobAttrs = listToAttrs (map (n: nameValuePair "sys-${n}" (jobFun n))
+  jobs = listToAttrs (map (n: nameValuePair "sys-${n}" (jobFun n))
     [ "reboot" "halt" "system-halt" "power-off" ] );
 }
diff --git a/modules/system/upstart-events/maintenance-shell.nix b/modules/system/upstart-events/maintenance-shell.nix
index 6c9d32b625c..a8eceb93158 100644
--- a/modules/system/upstart-events/maintenance-shell.nix
+++ b/modules/system/upstart-events/maintenance-shell.nix
@@ -3,7 +3,7 @@
 ###### implementation
 
 {
-  jobAttrs.maintenance_shell =
+  jobs.maintenance_shell =
     { name = "maintenance-shell";
 
       startOn = [ "maintenance" "stalled" ];
diff --git a/modules/system/upstart/upstart.nix b/modules/system/upstart/upstart.nix
index 7f053109082..bb6a4f9a117 100644
--- a/modules/system/upstart/upstart.nix
+++ b/modules/system/upstart/upstart.nix
@@ -73,10 +73,9 @@ let
           echo "$jobText" > $out/etc/event.d/${job.name}
         '';
 
-
   jobs =
     [pkgs.upstart] # for the built-in logd job
-    ++ map (job: job.upstartPkg) (attrValues config.jobAttrs);
+    ++ map (job: job.upstartPkg) (attrValues config.jobs);
 
   # Create an etc/event.d directory containing symlinks to the
   # specified list of Upstart job files.
@@ -249,7 +248,7 @@ in
   
   options = {
 
-    jobAttrs = mkOption {
+    jobs = mkOption {
       default = {};
       description = ''
         This option defines the system jobs started and managed by the
diff --git a/modules/tasks/filesystems.nix b/modules/tasks/filesystems.nix
index 86eaaf0c429..cce4ce59406 100644
--- a/modules/tasks/filesystems.nix
+++ b/modules/tasks/filesystems.nix
@@ -233,7 +233,7 @@ in
     # Add the mount helpers to the system path so that `mount' can find them.
     environment.systemPackages = [pkgs.ntfs3g pkgs.mount_cifs pkgs.nfsUtils];
     
-    jobAttrs.filesystems =
+    jobs.filesystems =
       { startOn = [ "startup" "new-devices" "ip-up" ];
 
         script = task;
diff --git a/modules/tasks/kbd.nix b/modules/tasks/kbd.nix
index d1c9e4bab35..9ba7f973cf3 100644
--- a/modules/tasks/kbd.nix
+++ b/modules/tasks/kbd.nix
@@ -56,7 +56,7 @@ in
 
     environment.systemPackages = [pkgs.kbd];
   
-    jobAttrs.kbd =
+    jobs.kbd =
       { description = "Keyboard / console initialisation";
 
         startOn = "udev";
diff --git a/modules/tasks/lvm.nix b/modules/tasks/lvm.nix
index 28fb293821a..4da517deae1 100644
--- a/modules/tasks/lvm.nix
+++ b/modules/tasks/lvm.nix
@@ -6,7 +6,7 @@
 
   config = {
 
-    jobAttrs.lvm =
+    jobs.lvm =
       { startOn = " udev"; # !!! or on new-devices
 
         script =
diff --git a/modules/tasks/network-interfaces.nix b/modules/tasks/network-interfaces.nix
index 50c2c73823d..4b53da876da 100644
--- a/modules/tasks/network-interfaces.nix
+++ b/modules/tasks/network-interfaces.nix
@@ -132,7 +132,7 @@ in
         pkgs.wirelesstools
       ];
     
-    jobAttrs.networkInterfaces = 
+    jobs.networkInterfaces = 
       { name = "network-interfaces";
 
         startOn = "udev";
diff --git a/modules/tasks/swap.nix b/modules/tasks/swap.nix
index ae4cd3a5c49..ad9d94f8ea6 100644
--- a/modules/tasks/swap.nix
+++ b/modules/tasks/swap.nix
@@ -66,7 +66,7 @@ in
 
   config = {
 
-    jobAttrs.swap =
+    jobs.swap =
       { task = true;
         
         startOn = ["startup" "new-devices"];
diff --git a/modules/tasks/swraid.nix b/modules/tasks/swraid.nix
index d9419fadb11..6e29062f0a9 100644
--- a/modules/tasks/swraid.nix
+++ b/modules/tasks/swraid.nix
@@ -12,7 +12,7 @@ in
   
 {
 
-  jobAttrs.swraid =
+  jobs.swraid =
     { startOn = "udev"; # !!! or on "new-devices"
       
       script =
diff --git a/modules/tasks/tty-backgrounds.nix b/modules/tasks/tty-backgrounds.nix
index 2abcf068e41..d15365fab9d 100644
--- a/modules/tasks/tty-backgrounds.nix
+++ b/modules/tasks/tty-backgrounds.nix
@@ -102,7 +102,7 @@ in
         target = "splash";
       };
 
-    jobAttrs.ttyBackgrounds =
+    jobs.ttyBackgrounds =
       { name = "tty-backgrounds";
 
         startOn = "udev";
diff --git a/modules/testing/test-instrumentation.nix b/modules/testing/test-instrumentation.nix
index a3c874d4fa5..64f7729cd73 100644
--- a/modules/testing/test-instrumentation.nix
+++ b/modules/testing/test-instrumentation.nix
@@ -9,7 +9,7 @@ with pkgs.lib;
 
   config = {
 
-    jobAttrs.backdoor =
+    jobs.backdoor =
       { startOn = "network-interfaces";
         
         preStart =
-- 
GitLab


From 24cbefd7a883940c903547edd1eac87dc71aebdc Mon Sep 17 00:00:00 2001
From: Nicolas Pierron <nicolas.b.pierron@gmail.com>
Date: Tue, 13 Oct 2009 09:49:26 +0000
Subject: [PATCH 1913/5331] Fix example value of httpd.

svn path=/nixos/trunk/; revision=17774
---
 modules/services/web-servers/apache-httpd/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/services/web-servers/apache-httpd/default.nix b/modules/services/web-servers/apache-httpd/default.nix
index 24c3077e0a9..d2cc288601a 100644
--- a/modules/services/web-servers/apache-httpd/default.nix
+++ b/modules/services/web-servers/apache-httpd/default.nix
@@ -386,7 +386,7 @@ in
 
       extraModules = mkOption {
         default = [];
-        example = [ "proxy_connect" { name = "php5_module"; path = "${pkgs.php}/modules/libphp5.so"; } ];
+        example = [ "proxy_connect" { name = "php5"; path = "${pkgs.php}/modules/libphp5.so"; } ];
         description = ''
           Specifies additional Apache modules.  These can be specified
           as a string in the case of modules distributed with Apache,
-- 
GitLab


From 1581d91330bcadb644038fa8dc7375a6921e038d Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 13 Oct 2009 10:09:06 +0000
Subject: [PATCH 1914/5331] * Fix the job name of the Nix daemon.

svn path=/nixos/trunk/; revision=17776
---
 modules/services/misc/nix-daemon.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/modules/services/misc/nix-daemon.nix b/modules/services/misc/nix-daemon.nix
index 7c40dbe12f4..d1eee1576b6 100644
--- a/modules/services/misc/nix-daemon.nix
+++ b/modules/services/misc/nix-daemon.nix
@@ -189,7 +189,9 @@ in
         };
 
     jobs.nixDaemon =
-      { startOn = "startup";
+      { name = "nix-daemon";
+
+        startOn = "startup";
 
         script =
           ''
-- 
GitLab


From 50902d2e5893cc00f54e3367f740186a79ad6c11 Mon Sep 17 00:00:00 2001
From: Sander van der Burg <s.vanderburg@tudelft.nl>
Date: Tue, 13 Oct 2009 13:56:30 +0000
Subject: [PATCH 1915/5331] Added some basic VirtualBox driver support. Input
 driver and dynamic resizing still remains on my todo list

svn path=/nixos/trunk/; revision=17779
---
 modules/services/x11/xserver.nix | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/modules/services/x11/xserver.nix b/modules/services/x11/xserver.nix
index 1cf36e9ad70..f6281d66344 100644
--- a/modules/services/x11/xserver.nix
+++ b/modules/services/x11/xserver.nix
@@ -25,6 +25,7 @@ let
     openchrome = { modules = [ xorg.xf86videoopenchrome ]; };
     cirrus =     { modules = [ xorg.xf86videocirrus ]; };
     vmware =     { modules = [ xorg.xf86videovmware ]; };
+    vboxvideo =  { modules = [ kernelPackages.virtualboxGuestAdditions ]; };
   };
 
   videoDriver = cfg.videoDriver;
@@ -320,7 +321,8 @@ in
 
     boot.extraModulePackages =
       optional (cfg.videoDriver == "nvidia") kernelPackages.nvidia_x11 ++ 
-      optional (cfg.videoDriver == "nvidiaLegacy") kernelPackages.nvidia_x11_legacy;
+      optional (cfg.videoDriver == "nvidiaLegacy") kernelPackages.nvidia_x11_legacy ++
+      optional (cfg.videoDriver == "vboxvideo") kernelPackages.virtualboxGuestAdditions;
 
     environment.etc = optionals cfg.exportConfiguration
       [ { source = "${configFile}";
@@ -343,7 +345,7 @@ in
       ]
       ++ optional (videoDriver == "nvidia") kernelPackages.nvidia_x11
       ++ optional (videoDriver == "nvidiaLegacy") kernelPackages.nvidia_x11_legacy;
-
+      
     environment.systemPackages = config.environment.x11Packages;
     
     services.hal.packages = halConfigFiles;
-- 
GitLab


From b9d9802c451590156967d0451bb9e8c4cdf3df8b Mon Sep 17 00:00:00 2001
From: Sander van der Burg <s.vanderburg@tudelft.nl>
Date: Tue, 13 Oct 2009 14:30:37 +0000
Subject: [PATCH 1916/5331] Pass virtualbox package as HAL package, so that the
 guest mouse cursor will follow the host mouse cursor

svn path=/nixos/trunk/; revision=17781
---
 modules/services/x11/xserver.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/modules/services/x11/xserver.nix b/modules/services/x11/xserver.nix
index f6281d66344..2b5eee8dfec 100644
--- a/modules/services/x11/xserver.nix
+++ b/modules/services/x11/xserver.nix
@@ -348,7 +348,8 @@ in
       
     environment.systemPackages = config.environment.x11Packages;
     
-    services.hal.packages = halConfigFiles;
+    services.hal.packages = halConfigFiles ++
+      optional (videoDriver == "vboxvideo") kernelPackages.virtualboxGuestAdditions;
 
     jobs.xserver =
       { startOn = if cfg.autorun then "hal" else "never";
-- 
GitLab


From 4eea2539c1c06cdfb9820de58a37ba2c781608ce Mon Sep 17 00:00:00 2001
From: Sander van der Burg <s.vanderburg@tudelft.nl>
Date: Tue, 13 Oct 2009 15:05:06 +0000
Subject: [PATCH 1917/5331] Added udev permissions for virtualbox guest
 additions

svn path=/nixos/trunk/; revision=17783
---
 modules/services/hardware/udev.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/modules/services/hardware/udev.nix b/modules/services/hardware/udev.nix
index d819527fb23..1eaf9fd71b2 100644
--- a/modules/services/hardware/udev.nix
+++ b/modules/services/hardware/udev.nix
@@ -23,7 +23,8 @@ let
     KERNEL=="kvm",                  MODE="0666"
     KERNEL=="kqemu",                NAME="%k", MODE="0666"
     KERNEL=="vboxdrv", NAME="vboxdrv", OWNER="root", GROUP="root", MODE="0666"
-
+    KERNEL=="vboxadd", NAME="vboxadd", OWNER="root", GROUP="root", MODE="0660"
+    KERNEL=="vboxuser", NAME="vboxuser", OWNER="root", GROUP="root", MODE="0666"
   '';
   
   # Perform substitutions in all udev rules files.
-- 
GitLab


From 8457873334b8279f291aca9a75fc65c645dea4b3 Mon Sep 17 00:00:00 2001
From: Sander van der Burg <s.vanderburg@tudelft.nl>
Date: Tue, 13 Oct 2009 15:16:30 +0000
Subject: [PATCH 1918/5331] The 'resolution section' is not generated in the
 xorg.conf when using the vboxvideo driver. This allows us to perform dynamic
 resolution resizing

svn path=/nixos/trunk/; revision=17784
---
 modules/services/x11/xserver.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/modules/services/x11/xserver.nix b/modules/services/x11/xserver.nix
index 2b5eee8dfec..d453cbdc042 100644
--- a/modules/services/x11/xserver.nix
+++ b/modules/services/x11/xserver.nix
@@ -446,7 +446,7 @@ in
             Option "RandRRotation" "on"
           ''}
 
-          ${
+          ${if cfg.videoDriver != "vboxvideo" then
             let
               f = depth:
                 ''
@@ -459,6 +459,8 @@ in
                   EndSubSection
                 '';
             in concatMapStrings f [8 16 24]
+	    else
+	      "" # The VirtualBox driver does not support dynamic resizing if resolutions are defined
           }
 
         EndSection
-- 
GitLab


From a347979be595c152b8397767c915943d0867281c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Tue, 13 Oct 2009 17:52:49 +0000
Subject: [PATCH 1919/5331] Adding nvidiaLegacy xorg option for suspend to work

svn path=/nixos/trunk/; revision=17785
---
 modules/services/x11/xserver.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/modules/services/x11/xserver.nix b/modules/services/x11/xserver.nix
index d453cbdc042..63a5abc32b3 100644
--- a/modules/services/x11/xserver.nix
+++ b/modules/services/x11/xserver.nix
@@ -486,6 +486,10 @@ in
         Identifier "Device[0]"
         Driver "${if cfg.videoDriver == "nvidiaLegacy" then "nvidia" else cfg.videoDriver}"
 
+        ${if cfg.videoDriver == "nvidiaLegacy" then ''
+        # This option allows suspending with a nvidiaLegacy card
+	Option "NvAGP" "1"''
+        else ""}
         # !!! Is the "Clone" option still useful?
         Option "Clone" "${if cfg.isClone then "on" else "off"}"
       '';
-- 
GitLab


From e9702320bf0d012d260fb84ab12443147e39d1dd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Tue, 13 Oct 2009 17:52:58 +0000
Subject: [PATCH 1920/5331] Fixing nvidiaLegacy /var/run/opengl-driver

svn path=/nixos/trunk/; revision=17786
---
 modules/services/x11/xserver.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/services/x11/xserver.nix b/modules/services/x11/xserver.nix
index 63a5abc32b3..e5a3db74220 100644
--- a/modules/services/x11/xserver.nix
+++ b/modules/services/x11/xserver.nix
@@ -380,7 +380,7 @@ in
               then ''
                 ln -sf ${kernelPackages.nvidia_x11} /var/run/opengl-driver
               ''
-	      else if videoDriver == "nvidia"
+	      else if videoDriver == "nvidiaLegacy"
               then ''
                 ln -sf ${kernelPackages.nvidia_x11_legacy} /var/run/opengl-driver
               ''
-- 
GitLab


From ccd2a0b617f576574a6ed987a62ae9f5bd4d6f33 Mon Sep 17 00:00:00 2001
From: Marc Weber <marco-oweber@gmx.de>
Date: Tue, 13 Oct 2009 21:29:30 +0000
Subject: [PATCH 1921/5331] sudo default configFile: replace outdated comment

svn path=/nixos/trunk/; revision=17790
---
 modules/security/sudo.nix | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/modules/security/sudo.nix b/modules/security/sudo.nix
index 62a061a268f..e911a257bbf 100644
--- a/modules/security/sudo.nix
+++ b/modules/security/sudo.nix
@@ -30,8 +30,7 @@ in
       # configuration will fail to build.
       default =
         ''
-          # WARNING: do not edit this file directly or with "visudo".  Instead,
-          # edit the source file in /etc/nixos/nixos/etc/sudoers.
+          # Don't edit this file. Set nixos option security.sudo.configFile instead
 
           # "root" is allowed to do anything.
           root        ALL=(ALL) SETENV: ALL
-- 
GitLab


From f9541e0d12389b7e91ac93358e58474f4e66ccf6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Tue, 13 Oct 2009 21:39:18 +0000
Subject: [PATCH 1922/5331] Add GRUB 2 support.

svn path=/nixos/trunk/; revision=17792
---
 modules/installer/grub/grub-menu-builder.sh   | 120 ++++++++++++++----
 modules/installer/grub/grub.nix               |  42 ++++--
 .../activation/switch-to-configuration.sh     |   1 +
 modules/system/activation/top-level.nix       |   7 +-
 4 files changed, 138 insertions(+), 32 deletions(-)

diff --git a/modules/installer/grub/grub-menu-builder.sh b/modules/installer/grub/grub-menu-builder.sh
index f64aa837eb5..9db2bbfa41c 100644
--- a/modules/installer/grub/grub-menu-builder.sh
+++ b/modules/installer/grub/grub-menu-builder.sh
@@ -5,36 +5,87 @@ shopt -s nullglob
 export PATH=/empty
 for i in @path@; do PATH=$PATH:$i/bin; done
 
-default=$1
-if test -z "$1"; then
-    echo "Syntax: grub-menu-builder.sh <DEFAULT-CONFIG>"
+if test $# -ne 1; then
+    echo "Usage: grub-menu-builder.sh DEFAULT-CONFIG"
     exit 1
 fi
 
+grubVersion="@version@"
+defaultConfig="$1"
 bootDevice="@bootDevice@"
 if test -z "$bootDevice"; then bootDevice=/boot; fi
 
+case "$grubVersion" in
+    1|2)
+	echo "updating GRUB $grubVersion menu..."
+	;;
+    *)
+	echo "Unsupported GRUB version \`$grubVersion'" >&2
+	echo "Supported versions are \`1' (GRUB Legacy) and \`2' (GRUB 1.9x)." >&2
+	exit 1
+	;;
+esac
+
+
+prologue() {
+    if test -n "@splashImage@"; then
+	splashLocation="@splashImage@"
+	if test "$grubVersion" -eq 1 ; then
+    	    # Splash images in /nix/store don't seem to work, so copy them.
+	    cp -f $splashLocation /boot/background.xpm.gz
+	    splashLocation="$bootDevice/background.xpm.gz"
+	fi
+    fi
 
-echo "updating the GRUB menu..."
-
-
-target=/boot/grub/menu.lst
-tmp=$target.tmp
-
-cat > $tmp << GRUBEND
+    case "$grubVersion" in
+	1)
+	    cat > "$1" << GRUBEND
 # Automatically generated.  DO NOT EDIT THIS FILE!
 default 0
 timeout 5
 GRUBEND
+	    if test -n "@splashImage@"; then
+		echo "splashimage $splashLocation" >> "$1"
+	    fi
+	    ;;
+	2)
+	    cat > "$1" <<EOF
+# Automatically generated.  DO NOT EDIT THIS FILE!
+set default=0
+set timeout=5
+if loadfont @grub@/share/grub/unicode.pf2 ; then
+  set gfxmode=640x480
+  insmod gfxterm
+  insmod vbe
+  terminal_output gfxterm
+fi
+EOF
+	    if test -n "@splashImage@"; then
+		# FIXME: GRUB 1.97 doesn't resize the background image
+		# if it doesn't match the video resolution.
+		cat >> "$1" <<EOF
+insmod png
+if background_image $splashLocation ; then
+  set color_normal=black/black
+  set color_highlight=magenta/black
+else
+  set menu_color_normal=cyan/blue
+  set menu_color_highlight=white/blue
+fi
+EOF
+	    fi
+	    ;;
+    esac
+}
 
+case "$grubVersion" in
+    1) target="/boot/grub/menu.lst";;
+    2) target="/boot/grub/grub.cfg";;
+esac
 
-if test -n "@splashImage@"; then
-    splashLocation=@splashImage@
-    # Splash images in /nix/store don't seem to work, so copy them.
-    cp -f $splashLocation /boot/background.xpm.gz
-    splashLocation="$bootDevice/background.xpm.gz"
-    echo "splashimage $splashLocation" >> $tmp
-fi
+tmp="$target.tmp"
+
+prologue "$tmp"
 
 
 configurationCounter=0
@@ -94,15 +145,27 @@ addEntry() {
     local kernel=$(readlink -f $path/kernel)
     local initrd=$(readlink -f $path/initrd)
 
-    if test "$path" = "$default"; then
+    if test "$path" = "$defaultConfig"; then
 	cp "$kernel" /boot/nixos-kernel
 	cp "$initrd" /boot/nixos-initrd
 	cp "$(readlink -f "$path/init")" /boot/nixos-init
-	cat > /boot/nixos-grub-config <<EOF
+	case "$grubVersion" in
+	    1)
+		cat > /boot/nixos-grub-config <<EOF
 	title Emergency boot
 	kernel ${bootDevice:-/boot}/nixos-kernel systemConfig=$(readlink -f "$path") init=/boot/nixos-init $(cat "$path/kernel-params")
 	initrd ${bootDevice:-/boot}/nixos-initrd
 EOF
+		;;
+	    2)
+		cat > /boot/nixos-grub-config <<EOF
+        menuentry "Emergency boot" {
+          linux  ${bootDevice:-/boot}/nixos-kernel systemConfig=$(readlink -f "$path") init=/boot/nixos-init $(cat "$path/kernel-params")
+          initrd ${bootDevice:-/boot}/initrd
+        }
+EOF
+		;;
+	esac
     fi
 
     if test -n "@copyKernels@"; then
@@ -122,12 +185,23 @@ EOF
 	name="$confName $3"
     fi
 
-    cat >> $tmp << GRUBEND
-
+    case "$grubVersion" in
+	1)
+	    cat >> "$tmp" << GRUBEND
 title $name
   kernel $kernel systemConfig=$(readlink -f $path) init=$(readlink -f $path/init) $(cat $path/kernel-params)
   initrd $initrd
 GRUBEND
+	    ;;
+	2)
+	    cat >> "$tmp" << GRUBEND
+menuentry "$name" {
+  linux  $kernel systemConfig=$(readlink -f $path) init=$(readlink -f $path/init) $(cat $path/kernel-params)
+  initrd $initrd
+}
+GRUBEND
+	    ;;
+    esac
 }
 
 
@@ -146,7 +220,7 @@ if test -n "@extraEntriesBeforeNixOS@"; then
     echo "$extraEntries" >> $tmp
 fi
 
-addEntry "NixOS - Default" $default ""
+addEntry "NixOS - Default" $defaultConfig ""
 
 if test -z "@extraEntriesBeforeNixOS@"; then 
     echo "$extraEntries" >> $tmp
@@ -154,7 +228,7 @@ fi
 
 # Add all generations of the system profile to the menu, in reverse
 # (most recent to least recent) order.
-for link in $((ls -d $default/fine-tune/* ) | sort -n); do
+for link in $((ls -d $defaultConfig/fine-tune/* ) | sort -n); do
     date=$(stat --printf="%y\n" $link | sed 's/\..*//')
     addEntry "NixOS - variation" $link ""
 done
diff --git a/modules/installer/grub/grub.nix b/modules/installer/grub/grub.nix
index afeb947a263..4394219a319 100644
--- a/modules/installer/grub/grub.nix
+++ b/modules/installer/grub/grub.nix
@@ -7,10 +7,13 @@ let
   grubMenuBuilder = pkgs.substituteAll {
     src = ./grub-menu-builder.sh;
     isExecutable = true;
+    grub = if config.boot.loader.grub.version == 1
+           then pkgs.grub
+           else pkgs.grub2;
     inherit (pkgs) bash;
     path = [pkgs.coreutils pkgs.gnused pkgs.gnugrep];
     inherit (config.boot.loader.grub) copyKernels extraEntries extraEntriesBeforeNixOS
-      splashImage bootDevice configurationLimit;
+      splashImage bootDevice configurationLimit version;
   };
   
 in
@@ -30,6 +33,15 @@ in
         '';
       };
 
+      version = mkOption {
+        default = 1;
+        example = 2;
+        description = ''
+          The version of GRUB to use: <literal>1</literal> for GRUB Legacy
+          (versions 0.9x), or <literal>2</literal> for GRUB 2.
+        '';
+      };
+
       device = mkOption {
         default = "";
         example = "/dev/hda";
@@ -78,10 +90,17 @@ in
       };
 
       splashImage = mkOption {
-        default = pkgs.fetchurl {
-          url = http://www.gnome-look.org/CONTENT/content-files/36909-soft-tux.xpm.gz;
-          sha256 = "14kqdx2lfqvh40h6fjjzqgff1mwk74dmbjvmqphi6azzra7z8d59";
-        };
+        default =
+          if config.boot.loader.grub.version == 1
+          then pkgs.fetchurl {
+            url = http://www.gnome-look.org/CONTENT/content-files/36909-soft-tux.xpm.gz;
+            sha256 = "14kqdx2lfqvh40h6fjjzqgff1mwk74dmbjvmqphi6azzra7z8d59";
+          }
+          # GRUB 1.97 doesn't support gzipped XPMs.
+          else pkgs.fetchurl {
+            url = http://www.gnu.org/graphics/winkler-gnu-blue.png;
+            sha256 = "0y8fvxalwxyid4k438k7c21bnv728qjsb92rqfapsmpv2bcj7f6k";
+          };
         example = null;
         description = "
           Background image used for Grub.  It must be a 640x480,
@@ -124,9 +143,16 @@ in
     # set at once.
     system.boot.loader.id = "grub";
     system.boot.loader.kernelFile = "vmlinuz";
-    
-    environment.systemPackages = mkIf config.boot.loader.grub.enable [ pkgs.grub ];
-    
+
+    environment.systemPackages =
+      mkIf config.boot.loader.grub.enable
+           (let version = config.boot.loader.grub.version; in
+              assert version != 1 -> version == 2;
+
+              if version == 1
+              then [ pkgs.grub ]
+              else [ pkgs.grub2 ]);
+
     # and many other things that have to be moved inside this file.
     
   };
diff --git a/modules/system/activation/switch-to-configuration.sh b/modules/system/activation/switch-to-configuration.sh
index 957bc124d7a..802b57a31af 100644
--- a/modules/system/activation/switch-to-configuration.sh
+++ b/modules/system/activation/switch-to-configuration.sh
@@ -27,6 +27,7 @@ if test "$action" = "switch" -o "$action" = "boot"; then
           mkdir -m 0700 -p /boot/grub
           @menuBuilder@ @out@
           if test "$NIXOS_INSTALL_GRUB" = 1; then
+	      echo "running \`@grub@/sbin/grub-install'..."
               @grub@/sbin/grub-install "@grubDevice@" --no-floppy --recheck
           fi
       else
diff --git a/modules/system/activation/top-level.nix b/modules/system/activation/top-level.nix
index 9fea447164b..609b11dd3d6 100644
--- a/modules/system/activation/top-level.nix
+++ b/modules/system/activation/top-level.nix
@@ -110,7 +110,12 @@ let
 
     # Boot loaders
     bootLoader = config.system.boot.loader.id;
-    grub = if config.boot.loader.grub.enable then pkgs.grub else null;
+    grub =
+      if config.boot.loader.grub.enable
+      then (if config.boot.loader.grub.version == 1
+            then pkgs.grub
+            else pkgs.grub2)
+      else null;
     grubDevice = config.boot.loader.grub.device;
     configurationName = config.boot.loader.grub.configurationName;
   };
-- 
GitLab


From 290f41bd9f88d714a8bb00b4a467ba182d58e8be Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Tue, 13 Oct 2009 21:39:23 +0000
Subject: [PATCH 1923/5331] GRUB: "Grub" -> "GRUB".

svn path=/nixos/trunk/; revision=17793
---
 modules/installer/grub/grub.nix | 56 ++++++++++++++++-----------------
 1 file changed, 28 insertions(+), 28 deletions(-)

diff --git a/modules/installer/grub/grub.nix b/modules/installer/grub/grub.nix
index 4394219a319..37b7a7f4a70 100644
--- a/modules/installer/grub/grub.nix
+++ b/modules/installer/grub/grub.nix
@@ -23,13 +23,13 @@ in
   ###### interface
 
   options = {
-  
+
     boot.loader.grub = {
 
       enable = mkOption {
         default = true;
         description = ''
-          Whether to enable the GRUB boot loader.
+          Whether to enable the GNU GRUB boot loader.
         '';
       };
 
@@ -45,48 +45,48 @@ in
       device = mkOption {
         default = "";
         example = "/dev/hda";
-        description = "
-          The device on which the boot loader, Grub, will be installed.
-          If empty, Grub won't be installed and it's your responsibility
+        description = ''
+          The device on which the boot loader, GRUB, will be installed.
+          If empty, GRUB won't be installed and it's your responsibility
           to make the system bootable.
-        ";
+        '';
       };
 
       bootDevice = mkOption {
         default = "";
         example = "(hd0,0)";
-        description = "
+        description = ''
           If the system partition may be wiped on reinstall, it is better
           to have /boot on a small partition. To do it, we need to explain
           to GRUB where the kernels live. Specify the partition here (in 
           GRUB notation).
-        ";
+        '';
       };
 
       configurationName = mkOption {
         default = "";
         example = "Stable 2.6.21";
-        description = "
-          Grub entry name instead of default.
-        ";
+        description = ''
+          GRUB entry name instead of default.
+        '';
       };
 
       extraEntries = mkOption {
         default = "";
-        example = "
+        example = ''
           title Windows
             chainloader (hd0,1)+1
-        ";
-        description = "
-          Any additional entries you want added to the Grub boot menu.
-        ";
+        '';
+        description = ''
+          Any additional entries you want added to the GRUB boot menu.
+        '';
       };
 
       extraEntriesBeforeNixOS = mkOption {
         default = false;
-        description = "
+        description = ''
           Whether extraEntries are included before the default option.
-        ";
+        '';
       };
 
       splashImage = mkOption {
@@ -102,32 +102,32 @@ in
             sha256 = "0y8fvxalwxyid4k438k7c21bnv728qjsb92rqfapsmpv2bcj7f6k";
           };
         example = null;
-        description = "
-          Background image used for Grub.  It must be a 640x480,
+        description = ''
+          Background image used for GRUB.  It must be a 640x480,
           14-colour image in XPM format, optionally compressed with
           <command>gzip</command> or <command>bzip2</command>.  Set to
-          <literal>null</literal> to run Grub in text mode.
-        ";
+          <literal>null</literal> to run GRUB in text mode.
+        '';
       };
 
       configurationLimit = mkOption {
         default = 100;
         example = 120;
-        description = "
+        description = ''
           Maximum of configurations in boot menu. GRUB has problems when
           there are too many entries.
-        ";
+        '';
       };
 
       copyKernels = mkOption {
         default = false;
-        description = "
-          Whether the Grub menu builder should copy kernels and initial
+        description = ''
+          Whether the GRUB menu builder should copy kernels and initial
           ramdisks to /boot.  This is necessary when /nix is on a
           different file system than /boot.
-        ";
+        '';
       };
-      
+
     };
 
   };
-- 
GitLab


From e4defbe8bdfe143a2688abdb7e803d1cacf5582c Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 14 Oct 2009 09:38:56 +0000
Subject: [PATCH 1924/5331] * Bring back loading of firmware from
 /root/test-firmware.

svn path=/nixos/trunk/; revision=17797
---
 modules/services/hardware/udev.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/modules/services/hardware/udev.nix b/modules/services/hardware/udev.nix
index 1eaf9fd71b2..105f8a2b54f 100644
--- a/modules/services/hardware/udev.nix
+++ b/modules/services/hardware/udev.nix
@@ -153,6 +153,10 @@ in
     
     services.udev.packages = [extraUdevRules];
 
+    # As a fallback, allow firmware to be placed in
+    # /root/test-firmware (primarily for testing).
+    hardware.firmware = [ "/root/test-firmware" ];
+
     jobs.udev =
       { startOn = "startup";
         stopOn = "shutdown";
-- 
GitLab


From 336d33e591b885c5c7b46d93d8201fdf1d300507 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Wed, 14 Oct 2009 13:10:41 +0000
Subject: [PATCH 1925/5331] Adding the wifi nic rt73 firmware into the nixos
 cds. I'm not sure if I had to add the module file reference in "required", or
 all modules are properly loaded.

svn path=/nixos/trunk/; revision=17800
---
 modules/installer/cd-dvd/installation-cd-base.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/modules/installer/cd-dvd/installation-cd-base.nix b/modules/installer/cd-dvd/installation-cd-base.nix
index a02aa5c0e0a..3ec4f3a63de 100644
--- a/modules/installer/cd-dvd/installation-cd-base.nix
+++ b/modules/installer/cd-dvd/installation-cd-base.nix
@@ -72,6 +72,7 @@ in
       ./iso-image.nix
       ./memtest.nix
       ../../hardware/network/intel-3945abg.nix
+      ../../hardware/network/rt73.nix
     ];
 
   # ISO naming.
@@ -191,6 +192,9 @@ in
         else ""
       }
     '';
+  
+  # Have the redistributable firmware of rt73 wifi nics.
+  networking.enableRT73Firmware = true;
 
   # To speed up installation a little bit, include the complete stdenv
   # in the Nix store on the CD.
-- 
GitLab


From 70b4e1a3713f205bf500467b416883ced316f495 Mon Sep 17 00:00:00 2001
From: Marc Weber <marco-oweber@gmx.de>
Date: Wed, 14 Oct 2009 21:35:39 +0000
Subject: [PATCH 1926/5331] add /root/my-firmware to the list of firmware
 directories

svn path=/nixos/trunk/; revision=17809
---
 modules/installer/cd-dvd/installation-cd-minimal.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/modules/installer/cd-dvd/installation-cd-minimal.nix b/modules/installer/cd-dvd/installation-cd-minimal.nix
index ae520e64101..2308abc6dfc 100644
--- a/modules/installer/cd-dvd/installation-cd-minimal.nix
+++ b/modules/installer/cd-dvd/installation-cd-minimal.nix
@@ -8,6 +8,10 @@
 
   installer.configModule = "./nixos/modules/installer/cd-dvd/installation-cd-minimal.nix";
 
+  # allow using of firmware without rebuilding the system
+  hardware.firmware = [ "/root/my-firmware" ];
+
+
   # Don't include X libraries.
   services.sshd.forwardX11 = false;
   services.dbus.enable = false; # depends on libX11
-- 
GitLab


From e6112662854ad42f2cfc8547121e0d5ffed68c79 Mon Sep 17 00:00:00 2001
From: Marc Weber <marco-oweber@gmx.de>
Date: Wed, 14 Oct 2009 21:44:25 +0000
Subject: [PATCH 1927/5331] Revert "add /root/my-firmware to the list of
 firmware directories"

This reverts rev 17809  - I missed the update

svn path=/nixos/trunk/; revision=17810
---
 modules/installer/cd-dvd/installation-cd-minimal.nix | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/modules/installer/cd-dvd/installation-cd-minimal.nix b/modules/installer/cd-dvd/installation-cd-minimal.nix
index 2308abc6dfc..ae520e64101 100644
--- a/modules/installer/cd-dvd/installation-cd-minimal.nix
+++ b/modules/installer/cd-dvd/installation-cd-minimal.nix
@@ -8,10 +8,6 @@
 
   installer.configModule = "./nixos/modules/installer/cd-dvd/installation-cd-minimal.nix";
 
-  # allow using of firmware without rebuilding the system
-  hardware.firmware = [ "/root/my-firmware" ];
-
-
   # Don't include X libraries.
   services.sshd.forwardX11 = false;
   services.dbus.enable = false; # depends on libX11
-- 
GitLab


From ba496e25c43bb6badcfb59c9ad48783b67c646fc Mon Sep 17 00:00:00 2001
From: Marc Weber <marco-oweber@gmx.de>
Date: Wed, 14 Oct 2009 21:48:12 +0000
Subject: [PATCH 1928/5331] allow starting of sshd using "start sshd" - but
 don't start it on startup automatically because root password is empty by
 default.

svn path=/nixos/trunk/; revision=17811
---
 modules/installer/cd-dvd/installation-cd-minimal.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/modules/installer/cd-dvd/installation-cd-minimal.nix b/modules/installer/cd-dvd/installation-cd-minimal.nix
index ae520e64101..29e6cc939ad 100644
--- a/modules/installer/cd-dvd/installation-cd-minimal.nix
+++ b/modules/installer/cd-dvd/installation-cd-minimal.nix
@@ -8,6 +8,10 @@
 
   installer.configModule = "./nixos/modules/installer/cd-dvd/installation-cd-minimal.nix";
 
+  # allow starting sshd by running "start sshd"
+  services.sshd.enable = true;
+  jobs.sshd.startOn = "never-start-ssh-automatically-you-should-set-root-password-first";
+
   # Don't include X libraries.
   services.sshd.forwardX11 = false;
   services.dbus.enable = false; # depends on libX11
-- 
GitLab


From f3472f7163e134af7a656a77a84259e31328b17a Mon Sep 17 00:00:00 2001
From: Marc Weber <marco-oweber@gmx.de>
Date: Wed, 14 Oct 2009 23:56:11 +0000
Subject: [PATCH 1929/5331] new nixos-rebuild shortcut for --no-fetch
 --no-nix-build --show-trace called --redo

svn path=/nixos/trunk/; revision=17813
---
 modules/installer/tools/nixos-rebuild.sh | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/modules/installer/tools/nixos-rebuild.sh b/modules/installer/tools/nixos-rebuild.sh
index d3b86fa6ab4..41b179fade9 100644
--- a/modules/installer/tools/nixos-rebuild.sh
+++ b/modules/installer/tools/nixos-rebuild.sh
@@ -34,6 +34,8 @@ Options:
   --rollback             restore the previous NixOS configuration (only
                          with switch, boot, test, build)
 
+  --redo                 same as --no-pull --no-build-nix --show-trace
+
 Various nix-build options are also accepted, in particular:
 
   --show-trace           show a detailed stack trace for evaluation errors
@@ -76,6 +78,10 @@ while test "$#" -gt 0; do
     elif test "$i" = --max-jobs -o "$i" = -j; then
         j="$1"; shift 1
         extraBuildFlags="$extraBuildFlags $i $j"
+    elif test "$i" = --redo; then
+        buildNix=
+        pullManifest=
+        extraBuildFlags="$extraBuildFlags --show-trace"
     else
         echo "$0: unknown option \`$i'"
         exit 1
-- 
GitLab


From 6472ee4d20b7f3b9ff2c3ad19811a62eb3db8c39 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Thu, 15 Oct 2009 08:27:51 +0000
Subject: [PATCH 1930/5331] X11: Always honor ~/.xsession.

See http://thread.gmane.org/gmane.linux.distributions.nixos/2879 .

svn path=/nixos/trunk/; revision=17814
---
 modules/services/x11/display-managers/default.nix | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/modules/services/x11/display-managers/default.nix b/modules/services/x11/display-managers/default.nix
index 398996bd7c6..f62c38bf711 100644
--- a/modules/services/x11/display-managers/default.nix
+++ b/modules/services/x11/display-managers/default.nix
@@ -57,9 +57,12 @@ let
       source /etc/profile
 
       # Allow the user to setup a custom session type.
-      if test "$sessionType" = custom; then
-          test -x ~/.xsession && exec ~/.xsession
-          sessionType="" # fall-thru if there is no ~/.xsession
+      if test -x ~/.xsession; then
+          exec ~/.xsession
+      else
+          if test "$sessionType" = "custom"; then
+              sessionType="" # fall-thru if there is no ~/.xsession
+          fi
       fi
 
       # The session type is "<desktop-manager> + <window-manager>", so
-- 
GitLab


From f57f344996275a5596f8393320d1c704d1c808b9 Mon Sep 17 00:00:00 2001
From: Sander van der Burg <s.vanderburg@tudelft.nl>
Date: Thu, 15 Oct 2009 09:31:30 +0000
Subject: [PATCH 1931/5331] Changed vboxvideo identifier to virtualbox for
 clarity

svn path=/nixos/trunk/; revision=17816
---
 modules/services/x11/xserver.nix | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/modules/services/x11/xserver.nix b/modules/services/x11/xserver.nix
index e5a3db74220..6b66cf57b93 100644
--- a/modules/services/x11/xserver.nix
+++ b/modules/services/x11/xserver.nix
@@ -25,7 +25,7 @@ let
     openchrome = { modules = [ xorg.xf86videoopenchrome ]; };
     cirrus =     { modules = [ xorg.xf86videocirrus ]; };
     vmware =     { modules = [ xorg.xf86videovmware ]; };
-    vboxvideo =  { modules = [ kernelPackages.virtualboxGuestAdditions ]; };
+    virtualbox = { modules = [ kernelPackages.virtualboxGuestAdditions ]; };
   };
 
   videoDriver = cfg.videoDriver;
@@ -322,7 +322,7 @@ in
     boot.extraModulePackages =
       optional (cfg.videoDriver == "nvidia") kernelPackages.nvidia_x11 ++ 
       optional (cfg.videoDriver == "nvidiaLegacy") kernelPackages.nvidia_x11_legacy ++
-      optional (cfg.videoDriver == "vboxvideo") kernelPackages.virtualboxGuestAdditions;
+      optional (cfg.videoDriver == "virtualbox") kernelPackages.virtualboxGuestAdditions;
 
     environment.etc = optionals cfg.exportConfiguration
       [ { source = "${configFile}";
@@ -349,7 +349,7 @@ in
     environment.systemPackages = config.environment.x11Packages;
     
     services.hal.packages = halConfigFiles ++
-      optional (videoDriver == "vboxvideo") kernelPackages.virtualboxGuestAdditions;
+      optional (videoDriver == "virtualbox") kernelPackages.virtualboxGuestAdditions;
 
     jobs.xserver =
       { startOn = if cfg.autorun then "hal" else "never";
@@ -446,7 +446,7 @@ in
             Option "RandRRotation" "on"
           ''}
 
-          ${if cfg.videoDriver != "vboxvideo" then
+          ${if cfg.videoDriver != "virtualbox" then
             let
               f = depth:
                 ''
@@ -484,7 +484,9 @@ in
     services.xserver.deviceSection =
       ''
         Identifier "Device[0]"
-        Driver "${if cfg.videoDriver == "nvidiaLegacy" then "nvidia" else cfg.videoDriver}"
+        Driver "${if cfg.videoDriver == "nvidiaLegacy" then "nvidia" 
+	          else if cfg.videoDriver == "virtualbox" then "vboxvideo"
+	          else cfg.videoDriver}"
 
         ${if cfg.videoDriver == "nvidiaLegacy" then ''
         # This option allows suspending with a nvidiaLegacy card
-- 
GitLab


From f6f5d0414ed6955790d20d3152993ea7b2b73336 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 15 Oct 2009 11:25:15 +0000
Subject: [PATCH 1932/5331] * Run the nix-daemon with a lower I/O priority so
 that it doesn't   interfere with interactive tasks as much (hopefully).

svn path=/nixos/trunk/; revision=17820
---
 modules/services/misc/nix-daemon.nix | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/modules/services/misc/nix-daemon.nix b/modules/services/misc/nix-daemon.nix
index d1eee1576b6..69a7149c2be 100644
--- a/modules/services/misc/nix-daemon.nix
+++ b/modules/services/misc/nix-daemon.nix
@@ -67,13 +67,21 @@ in
       };
 
       daemonNiceLevel = mkOption {
-        default = 2;
+        default = 10;
         description = "
           Nix daemon process priority. This priority propagates to build processes.
           0 is the default Unix process priority, 20 is the lowest.
         ";
       };
 
+      daemonIONiceLevel = mkOption {
+        default = 7;
+        description = "
+          Nix daemon process I/O priority. This priority propagates to build processes.        
+          0 is the default Unix process I/O priority, 7 is the lowest.
+        ";
+      };
+
       buildMachines = mkOption {
         example = [
           { hostName = "voila.labs.cs.uu.nl";
@@ -197,7 +205,10 @@ in
           ''
             export PATH=${if config.nix.distributedBuilds then "${pkgs.openssh}/bin:${pkgs.gzip}/bin:" else ""}${pkgs.openssl}/bin:${nix}/bin:$PATH
             ${config.nix.envVars}
-            exec nice -n ${builtins.toString config.nix.daemonNiceLevel} ${nix}/bin/nix-worker --daemon > /dev/null 2>&1
+            exec \
+              nice -n ${builtins.toString config.nix.daemonNiceLevel} \
+              ${pkgs.utillinux}/bin/ionice -n ${builtins.toString config.nix.daemonIONiceLevel} \
+              ${nix}/bin/nix-worker --daemon > /dev/null 2>&1
           '';
 
         extraConfig = 
-- 
GitLab


From e055085ac1a59c35a904ec0de85aba46e9c7d8c3 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 15 Oct 2009 12:32:33 +0000
Subject: [PATCH 1933/5331] svn path=/nixos/trunk/; revision=17823

---
 modules/installer/cd-dvd/installation-cd-minimal.nix | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/modules/installer/cd-dvd/installation-cd-minimal.nix b/modules/installer/cd-dvd/installation-cd-minimal.nix
index 29e6cc939ad..b87bc016d36 100644
--- a/modules/installer/cd-dvd/installation-cd-minimal.nix
+++ b/modules/installer/cd-dvd/installation-cd-minimal.nix
@@ -8,9 +8,11 @@
 
   installer.configModule = "./nixos/modules/installer/cd-dvd/installation-cd-minimal.nix";
 
-  # allow starting sshd by running "start sshd"
+  # Allow sshd to be started manually through "start sshd".  It should
+  # not be started by default on the installation CD because the
+  # default root password is empty.
   services.sshd.enable = true;
-  jobs.sshd.startOn = "never-start-ssh-automatically-you-should-set-root-password-first";
+  jobs.sshd.startOn = "";
 
   # Don't include X libraries.
   services.sshd.forwardX11 = false;
-- 
GitLab


From 762c13b83e7eb102b57f6ae94fc88c78d3aa9b07 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 15 Oct 2009 14:02:24 +0000
Subject: [PATCH 1934/5331] * Fix the Rogue job.

svn path=/nixos/trunk/; revision=17830
---
 modules/services/misc/rogue.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/services/misc/rogue.nix b/modules/services/misc/rogue.nix
index a128e7f7cdb..43f43ae5bad 100644
--- a/modules/services/misc/rogue.nix
+++ b/modules/services/misc/rogue.nix
@@ -48,7 +48,7 @@ in
 
         extraConfig = "chdir /root";
 
-        exec = "${pkgs.rogue}/bin/rogue < /dev/{cfg.tty} > /dev/{cfg.tty} 2>&1";
+        exec = "${pkgs.rogue}/bin/rogue < /dev/${cfg.tty} > /dev/${cfg.tty} 2>&1";
       };
 
     services.ttyBackgrounds.specificThemes = singleton
-- 
GitLab


From da5f745603d4060b3f5e11f9c8cf6df6a1dee130 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 15 Oct 2009 14:32:15 +0000
Subject: [PATCH 1935/5331] * You need an override here, otherwise bad things
 happen.

svn path=/nixos/trunk/; revision=17831
---
 modules/installer/cd-dvd/installation-cd-minimal.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/installer/cd-dvd/installation-cd-minimal.nix b/modules/installer/cd-dvd/installation-cd-minimal.nix
index b87bc016d36..dc7188d8dc2 100644
--- a/modules/installer/cd-dvd/installation-cd-minimal.nix
+++ b/modules/installer/cd-dvd/installation-cd-minimal.nix
@@ -12,7 +12,7 @@
   # not be started by default on the installation CD because the
   # default root password is empty.
   services.sshd.enable = true;
-  jobs.sshd.startOn = "";
+  jobs.sshd.startOn = pkgs.lib.mkOverride 50 {} "";
 
   # Don't include X libraries.
   services.sshd.forwardX11 = false;
-- 
GitLab


From 77ec877a8ca83caae445e1cd40936e3c3f16e567 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 15 Oct 2009 14:35:10 +0000
Subject: [PATCH 1936/5331] * Fix the background of the manual.

svn path=/nixos/trunk/; revision=17832
---
 modules/services/misc/nixos-manual.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/services/misc/nixos-manual.nix b/modules/services/misc/nixos-manual.nix
index a5a3e8977da..04fc34c94fa 100644
--- a/modules/services/misc/nixos-manual.nix
+++ b/modules/services/misc/nixos-manual.nix
@@ -70,7 +70,7 @@ in
 
     environment.systemPackages = [manual];
 
-    boot.extraTTYs = mkIf cfg.showManual [cfg.ttyNumber];
+    boot.extraTTYs = mkIf cfg.showManual ["tty${cfg.ttyNumber}"];
 
     jobs = mkIf cfg.showManual
       { nixosManual = 
@@ -90,7 +90,7 @@ in
       };
 
     services.ttyBackgrounds.specificThemes = mkIf cfg.showManual 
-      [ { tty = cfg.ttyNumber;
+      [ { tty = "tty${cfg.ttyNumber}";
           theme = pkgs.themes "green";
         }
       ];
-- 
GitLab


From 5dfaf565bf4f257121df6c4c19b590bee935605d Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 15 Oct 2009 14:41:59 +0000
Subject: [PATCH 1937/5331] * On the CD or on a newly installed system, create
 the root account   with an empty password, rather than with a hashed empty
 password.   The latter is a security risk, because it allows remote root
 logins   if a user enables sshd before setting a proper root password. *
 Allow empty passwords for login and slim, but nothing else.

svn path=/nixos/trunk/; revision=17833
---
 modules/security/pam.nix                        | 13 +++++++++++--
 modules/services/x11/display-managers/slim.nix  |  4 +++-
 modules/system/activation/activation-script.nix |  1 -
 3 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/modules/security/pam.nix b/modules/security/pam.nix
index c8090ed691e..904cf438bff 100644
--- a/modules/security/pam.nix
+++ b/modules/security/pam.nix
@@ -32,6 +32,14 @@ let
     , # Whether to forward XAuth keys between users.  Mostly useful
       # for "su".
       forwardXAuth ? false
+    , # Whether to allow logging into accounts that have no password
+      # set (i.e., have an empty password field in /etc/passwd or
+      # /etc/group).  This does not enable logging into disabled
+      # accounts (i.e., that have the password field set to `!').
+      # Note that regardless of what the pam_unix2 documentation says,
+      # accounts with hashed empty passwords are always allowed to log
+      # in.
+      allowNullPassword ? false
     }:
 
     { source = pkgs.writeText "${name}.pam"
@@ -49,7 +57,8 @@ let
               "auth sufficient pam_rootok.so"}
           ${optionalString config.users.ldap.enable
               "auth sufficient ${pam_ldap}/lib/security/pam_ldap.so"}
-          auth sufficient ${pam_unix2}/lib/security/pam_unix2.so
+          auth sufficient ${pam_unix2}/lib/security/pam_unix2.so ${
+            optionalString allowNullPassword "nullok"}
           auth required   pam_deny.so
 
           # Password management.
@@ -139,7 +148,7 @@ in
         { name = "useradd"; rootOK = true; }
         # Used by groupadd etc.
         { name = "shadow"; rootOK = true; }
-        { name = "login"; ownDevices = true; }
+        { name = "login"; ownDevices = true; allowNullPassword = true; }
       ];
 
   };
diff --git a/modules/services/x11/display-managers/slim.nix b/modules/services/x11/display-managers/slim.nix
index 2f1e8c8e21a..af15e0df5e6 100644
--- a/modules/services/x11/display-managers/slim.nix
+++ b/modules/services/x11/display-managers/slim.nix
@@ -104,7 +104,9 @@ in
         execCmd = "${pkgs.slim}/bin/slim";
       };
 
-    security.pam.services = [ { name = "slim"; } ];
+    # Allow null passwords so that the user can login as root on the
+    # installation CD.
+    security.pam.services = [ { name = "slim"; allowNullPassword = true; } ];
 
   };
 
diff --git a/modules/system/activation/activation-script.nix b/modules/system/activation/activation-script.nix
index 34b222435c2..a62120363f2 100644
--- a/modules/system/activation/activation-script.nix
+++ b/modules/system/activation/activation-script.nix
@@ -112,7 +112,6 @@ let
           # (bootstrap problem!).
           echo "root:x:0:0:System administrator:$rootHome:${config.users.defaultUserShell}" >> /etc/passwd
           echo "root::::::::" >> /etc/shadow
-          echo | passwd --stdin root
       fi
     '' [
       "defaultPath" # path to touch & passwd
-- 
GitLab


From fceadcbef7c2d32eba9f8ae92d031801020220df Mon Sep 17 00:00:00 2001
From: Marc Weber <marco-oweber@gmx.de>
Date: Thu, 15 Oct 2009 23:39:57 +0000
Subject: [PATCH 1938/5331] --redo -> --fast

svn path=/nixos/trunk/; revision=17839
---
 modules/installer/tools/nixos-rebuild.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/installer/tools/nixos-rebuild.sh b/modules/installer/tools/nixos-rebuild.sh
index 41b179fade9..cad1308355f 100644
--- a/modules/installer/tools/nixos-rebuild.sh
+++ b/modules/installer/tools/nixos-rebuild.sh
@@ -34,7 +34,7 @@ Options:
   --rollback             restore the previous NixOS configuration (only
                          with switch, boot, test, build)
 
-  --redo                 same as --no-pull --no-build-nix --show-trace
+  --fast                 same as --no-pull --no-build-nix --show-trace
 
 Various nix-build options are also accepted, in particular:
 
@@ -78,7 +78,7 @@ while test "$#" -gt 0; do
     elif test "$i" = --max-jobs -o "$i" = -j; then
         j="$1"; shift 1
         extraBuildFlags="$extraBuildFlags $i $j"
-    elif test "$i" = --redo; then
+    elif test "$i" = --fast; then
         buildNix=
         pullManifest=
         extraBuildFlags="$extraBuildFlags --show-trace"
-- 
GitLab


From 35abca4e7a75386fd664edf5e54d50f1aa4b0794 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Fri, 16 Oct 2009 04:27:59 +0000
Subject: [PATCH 1939/5331] Forward-port sshd fixes to
 iso-minimal-fresh-kernel. By the way, maybe we should finalyy decide what to
 do with kernel update and corresponding ISO update (to fresh-kernel proposal
 or otherwise)

svn path=/nixos/trunk/; revision=17840
---
 .../cd-dvd/installation-cd-minimal-fresh-kernel.nix         | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/modules/installer/cd-dvd/installation-cd-minimal-fresh-kernel.nix b/modules/installer/cd-dvd/installation-cd-minimal-fresh-kernel.nix
index f3f0a9fe50d..70e15fce39f 100644
--- a/modules/installer/cd-dvd/installation-cd-minimal-fresh-kernel.nix
+++ b/modules/installer/cd-dvd/installation-cd-minimal-fresh-kernel.nix
@@ -8,6 +8,12 @@ rec {
 
   installer.configModule = "./nixos/modules/installer/cd-dvd/installation-cd-minimal-fresh-kernel.nix";
 
+  # Allow sshd to be started manually through "start sshd".  It should
+  # not be started by default on the installation CD because the
+  # default root password is empty.
+  services.sshd.enable = true;
+  jobs.sshd.startOn = pkgs.lib.mkOverride 50 {} "";
+
   # Don't include X libraries.
   environment.noXlibs = true;
 
-- 
GitLab


From feeff52285d3e66bcaddf3283be1ff88c6eee973 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 21 Oct 2009 09:41:32 +0000
Subject: [PATCH 1940/5331] * Ugly hack to get HAL to start at boot time. 
 Sometimes it fails   without any error message in the log (maybe ConsoleKit
 related?).

svn path=/nixos/trunk/; revision=17907
---
 modules/services/hardware/hal.nix | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/modules/services/hardware/hal.nix b/modules/services/hardware/hal.nix
index 5ac01d3b098..11cda8d4cc4 100644
--- a/modules/services/hardware/hal.nix
+++ b/modules/services/hardware/hal.nix
@@ -100,6 +100,11 @@ in
             
             rm -f /var/cache/hald/fdi-cache
 
+            # For some weird reason HAL sometimes fails to start at
+            # boot time, which seems to be timing-dependent.  As a
+            # temporary workaround, sleep for a while here.
+            sleep 2
+
             # !!! Hack: start the daemon here to make sure it's
             # running when the Upstart job reaches the "running"
             # state.  Should be fixable in Upstart 0.6.
@@ -108,7 +113,7 @@ in
 
         postStop =
           '' 
-            pid=$(cat /var/run/hald/pid)
+            pid=$(cat /var/run/hald/pid || true)
             test -n "$pid" && kill "$pid"
          '';
       };
-- 
GitLab


From 1e1ae9cd1ea78384bd1308afa0122cd450726a6d Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 22 Oct 2009 07:46:30 +0000
Subject: [PATCH 1941/5331] * Don't squeeze all the filesystem option values
 into one environment   variable, since they might get confused (NIXOS-84).

svn path=/nixos/trunk/; revision=17919
---
 modules/tasks/filesystems.nix | 144 ++++++++++++++++------------------
 1 file changed, 67 insertions(+), 77 deletions(-)

diff --git a/modules/tasks/filesystems.nix b/modules/tasks/filesystems.nix
index cce4ce59406..cf6e712192f 100644
--- a/modules/tasks/filesystems.nix
+++ b/modules/tasks/filesystems.nix
@@ -5,23 +5,12 @@ with pkgs.lib;
 let
 
   fileSystems = config.fileSystems;
-  mountPoints = map (fs: fs.mountPoint) fileSystems;
-  devices = map (fs: if fs.device != null then fs.device else "/dev/disk/by-label/${fs.label}") fileSystems;
-  fsTypes = map (fs: fs.fsType) fileSystems;
-  optionss = map (fs: fs.options) fileSystems;
-  autocreates = map (fs: fs.autocreate) fileSystems;
   mount = config.system.sbin.mount;
 
   task =
     ''
       PATH=${pkgs.e2fsprogs}/sbin:${pkgs.utillinuxng}/sbin:$PATH
 
-      mountPoints=(${toString mountPoints})  
-      devices=(${toString devices})
-      fsTypes=(${toString fsTypes})
-      optionss=(${toString optionss})
-      autocreates=(${toString autocreates})
-
       newDevices=1
 
       # If we mount any file system, we repeat this loop, because new
@@ -29,86 +18,87 @@ let
       # for loopback mounts).
 
       while test -n "$newDevices"; do
-
         newDevices=
 
-        for ((n = 0; n < ''${#mountPoints[*]}; n++)); do
-          mountPoint=''${mountPoints[$n]}
-          device=''${devices[$n]}
-          fsType=''${fsTypes[$n]}
-          options=''${optionss[$n]}
-          autocreate=''${autocreates[$n]}
-
-          # A device is a pseudo-device (i.e. not an actual device
-          # node) if it's not an absolute path (e.g. an NFS server
-          # such as machine:/path), if it starts with // (a CIFS FS),
-          # a known pseudo filesystem (such as tmpfs), or the device
-          # is a directory (e.g. a bind mount).
-          isPseudo=
-          test "''${device:0:1}" != / -o "''${device:0:2}" = // -o "$fsType" = "tmpfs" \
-              -o -d "$device" && isPseudo=1
-
-          if ! test -n "$isPseudo" -o -e "$device"; then
-              echo "skipping $device, doesn't exist (yet)"
-              continue
-          fi
-
-          # !!! quick hack: if the mount point is already mounted, try
-          # a remount to change the options but nothing else.
-          if cat /proc/mounts | grep -F -q " $mountPoint "; then
-              if test "''${device:0:2}" != //; then
-                  echo "remounting $device on $mountPoint"
-                  ${mount}/bin/mount -t "$fsType" \
-                      -o remount,"$options" \
-                      "$device" "$mountPoint" || true
-              fi
-              continue
-          fi
+        ${flip concatMapStrings fileSystems
+          (fs: ''
+            mountPoint='${fs.mountPoint}'
+            device='${if fs.device != null then fs.device else "/dev/disk/by-label/${fs.label}"}'
+            fsType='${fs.fsType}'
+          
+            # A device is a pseudo-device (i.e. not an actual device
+            # node) if it's not an absolute path (e.g. an NFS server
+            # such as machine:/path), if it starts with // (a CIFS FS),
+            # a known pseudo filesystem (such as tmpfs), or the device
+            # is a directory (e.g. a bind mount).
+            isPseudo=
+            test "''${device:0:1}" != / -o "''${device:0:2}" = // -o "$fsType" = "tmpfs" \
+                -o -d "$device" && isPseudo=1
+
+            if ! test -n "$isPseudo" -o -e "$device"; then
+                echo "skipping $device, doesn't exist (yet)"
+                continue
+            fi
 
-          # If $device is already mounted somewhere else, unmount it first.
-          # !!! Note: we use /etc/mtab, not /proc/mounts, because mtab
-          # contains more accurate info when using loop devices.
+            # !!! quick hack: if the mount point is already mounted, try
+            # a remount to change the options but nothing else.
+            if cat /proc/mounts | grep -F -q " $mountPoint "; then
+                if test "''${device:0:2}" != //; then
+                    echo "remounting $device on $mountPoint"
+                    ${mount}/bin/mount -t "$fsType" \
+                        -o remount,"${fs.options}" \
+                        "$device" "$mountPoint" || true
+                fi
+                continue
+            fi
 
-          if test -z "$isPseudo"; then
+            # If $device is already mounted somewhere else, unmount it first.
+            # !!! Note: we use /etc/mtab, not /proc/mounts, because mtab
+            # contains more accurate info when using loop devices.
 
-            device=$(readlink -f "$device")
+            if test -z "$isPseudo"; then
 
-            prevMountPoint=$(
-                cat /etc/mtab \
-                | grep "^$device " \
-                | sed 's|^[^ ]\+ \+\([^ ]\+\).*|\1|' \
-            )
+              device=$(readlink -f "$device")
 
-            if test "$prevMountPoint" = "$mountPoint"; then
-                echo "remounting $device on $mountPoint"
-                ${mount}/bin/mount -t "$fsType" \
-                    -o remount,"$options" \
-                    "$device" "$mountPoint" || true
-                continue
-            fi
+              prevMountPoint=$(
+                  cat /etc/mtab \
+                  | grep "^$device " \
+                  | sed 's|^[^ ]\+ \+\([^ ]\+\).*|\1|' \
+              )
 
-            if test -n "$prevMountPoint"; then
-                echo "unmount $device from $prevMountPoint"
-                ${mount}/bin/umount "$prevMountPoint" || true
-            fi
+              if test "$prevMountPoint" = "$mountPoint"; then
+                  echo "remounting $device on $mountPoint"
+                  ${mount}/bin/mount -t "$fsType" \
+                      -o remount,"${fs.options}" \
+                      "$device" "$mountPoint" || true
+                  continue
+              fi
 
-          fi
+              if test -n "$prevMountPoint"; then
+                  echo "unmount $device from $prevMountPoint"
+                  ${mount}/bin/umount "$prevMountPoint" || true
+              fi
 
-          echo "mounting $device on $mountPoint"
+            fi
 
-          # !!! should do something with the result; also prevent repeated fscks.
-          if test -z "$isPseudo"; then
-              fsck -a "$device" || true
-          fi
+            echo "mounting $device on $mountPoint"
 
-          if test "$autocreate" = 1; then mkdir -p "$mountPoint"; fi
+            # !!! should do something with the result; also prevent repeated fscks.
+            if test -z "$isPseudo"; then
+                fsck -a "$device" || true
+            fi
 
-          if ${mount}/bin/mount -t "$fsType" -o "$options" "$device" "$mountPoint"; then
-              newDevices=1
-          fi
-   
-        done
+            ${optionalString fs.autocreate
+              ''
+                mkdir -p "$mountPoint"
+              ''
+            }
 
+            if ${mount}/bin/mount -t "$fsType" -o "$options" "$device" "$mountPoint"; then
+                newDevices=1
+            fi
+          '')
+        }
       done
     '';
 
-- 
GitLab


From 9e80ca48cb38dc1dd9fea45baad82fd9dd42b390 Mon Sep 17 00:00:00 2001
From: Rob Vermaas <rob.vermaas@gmail.com>
Date: Thu, 22 Oct 2009 14:36:54 +0000
Subject: [PATCH 1942/5331] added option to specify logformat to apache httpd,
 defaults to common (like it was until now)

svn path=/nixos/trunk/; revision=17923
---
 .../services/web-servers/apache-httpd/default.nix    | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/modules/services/web-servers/apache-httpd/default.nix b/modules/services/web-servers/apache-httpd/default.nix
index d2cc288601a..9157aed3173 100644
--- a/modules/services/web-servers/apache-httpd/default.nix
+++ b/modules/services/web-servers/apache-httpd/default.nix
@@ -121,7 +121,7 @@ let
     LogFormat "%{Referer}i -> %U" referer
     LogFormat "%{User-agent}i" agent
 
-    CustomLog ${mainCfg.logDir}/access_log common
+    CustomLog ${mainCfg.logDir}/access_log ${mainCfg.logFormat}
   '';
 
 
@@ -218,7 +218,7 @@ let
 
     ${if !isMainServer && mainCfg.logPerVirtualHost then ''
       ErrorLog ${mainCfg.logDir}/error_log-${cfg.hostName}
-      CustomLog ${mainCfg.logDir}/access_log-${cfg.hostName} common
+      CustomLog ${mainCfg.logDir}/access_log-${cfg.hostName} ${mainCfg.logFormat}
     '' else ""}
 
     ${robotsConf}
@@ -429,6 +429,13 @@ in
         ";
       };
 
+      logFormat = mkOption {
+        default = "common";
+        description = "
+          Log format for Apache's log files. 
+        ";
+      };
+
       stateDir = mkOption {
         default = "/var/run/httpd";
         description = "
@@ -456,6 +463,7 @@ in
         '';
       };
 
+
       subservices = {
 
         # !!! remove this
-- 
GitLab


From 5103c7a872a4d79133ee8615c4f996f32656ed2e Mon Sep 17 00:00:00 2001
From: Rob Vermaas <rob.vermaas@gmail.com>
Date: Thu, 22 Oct 2009 17:37:06 +0000
Subject: [PATCH 1943/5331] list possible logformats for apache and added
 example

svn path=/nixos/trunk/; revision=17929
---
 modules/services/web-servers/apache-httpd/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/modules/services/web-servers/apache-httpd/default.nix b/modules/services/web-servers/apache-httpd/default.nix
index 9157aed3173..55902f9e5e0 100644
--- a/modules/services/web-servers/apache-httpd/default.nix
+++ b/modules/services/web-servers/apache-httpd/default.nix
@@ -431,8 +431,9 @@ in
 
       logFormat = mkOption {
         default = "common";
+        example = "combined";
         description = "
-          Log format for Apache's log files. 
+          Log format for Apache's log files. Possible values are: combined, common, referer, agent.
         ";
       };
 
-- 
GitLab


From ac5bc4a68a546d193bd1ed349ca93db172822228 Mon Sep 17 00:00:00 2001
From: Sander van der Burg <s.vanderburg@tudelft.nl>
Date: Fri, 23 Oct 2009 10:54:35 +0000
Subject: [PATCH 1944/5331] Added XDMCP option to KDM

svn path=/nixos/trunk/; revision=17938
---
 modules/services/x11/display-managers/kdm.nix | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/modules/services/x11/display-managers/kdm.nix b/modules/services/x11/display-managers/kdm.nix
index 5264aa78228..349fd19adfe 100644
--- a/modules/services/x11/display-managers/kdm.nix
+++ b/modules/services/x11/display-managers/kdm.nix
@@ -32,6 +32,12 @@ let
       [X-*-Greeter]
       HiddenUsers=root,nixbld1,nixbld2,nixbld3,nixbld4,nixbld5,nixbld6,nixbld7,nixbld8,nixbld9,nixbld10
       PluginsLogin=${kdebase_workspace}/lib/kde4/kgreet_classic.so
+      
+      ${optionalString (cfg.enableXDMCP)
+      ''
+        [Xdmcp]
+        Enable=true    
+      ''}
     '';
 
   kdmrc = pkgs.stdenv.mkDerivation {
@@ -61,6 +67,13 @@ in
         '';
       };
 
+      enableXDMCP = mkOption {
+        default = false;
+	description = ''
+	  Whether to enable XDMCP, which allows remote logins";
+	'';
+      };
+
       extraConfig = mkOption {
         default = "";
         description = ''
-- 
GitLab


From 4f006e49bfffb49c3009199d5c1e4603cb84c6ba Mon Sep 17 00:00:00 2001
From: Marc Weber <marco-oweber@gmx.de>
Date: Fri, 23 Oct 2009 11:30:54 +0000
Subject: [PATCH 1945/5331] openvpn was broken by jobAttrs. fixed

svn path=/nixos/trunk/; revision=17940
---
 modules/services/networking/openvpn.nix | 143 +++++++++++++++---------
 1 file changed, 88 insertions(+), 55 deletions(-)

diff --git a/modules/services/networking/openvpn.nix b/modules/services/networking/openvpn.nix
index b02f18e6b28..78873db67fa 100644
--- a/modules/services/networking/openvpn.nix
+++ b/modules/services/networking/openvpn.nix
@@ -10,29 +10,29 @@ let
 
   PATH = "${pkgs.iptables}/sbin:${pkgs.coreutils}/bin:${pkgs.iproute}/sbin:${pkgs.nettools}/sbin";
 
-  makeOpenVPNJob = cfg :
+  makeOpenVPNJob = cfg : name:
     let
       upScript = ''
         #!/bin/sh
-        exec &> /var/log/openvpn-${cfg.id}-up
+        exec &> /var/log/openvpn-${name}-up
         PATH=${PATH}
         ${cfg.up}
       '';
       downScript = ''
         #!/bin/sh
-        exec &> /var/log/openvpn-${cfg.id}-down
+        exec &> /var/log/openvpn-${name}-down
         PATH=${PATH}
         ${cfg.down}
       '';
-      configFile = pkgs.writeText "openvpn-config-${cfg.id}"
+      configFile = pkgs.writeText "openvpn-config-${name}"
         ''
-          ${if cfg ? up || cfg ? down then "script-security 2" else ""}
+          ${if cfg.up != "" || cfg.down != "" then "script-security 2" else ""}
           ${cfg.config}
-          ${if cfg ? up then "up ${pkgs.writeScript "openvpn-${cfg.id}-up" upScript}" else "" }
-          ${if cfg ? down then "down ${pkgs.writeScript "openvpn-${cfg.id}-down" downScript}" else "" }
+          ${if cfg.up != "" then "up ${pkgs.writeScript "openvpn-${name}-up" upScript}" else "" }
+          ${if cfg.down != "" then "down ${pkgs.writeScript "openvpn-${name}-down" downScript}" else "" }
         '';
     in {
-      description = "OpenVPN-${cfg.id}";
+      description = "OpenVPN-${name}";
 
       startOn = "network-interfaces/started";
       stopOn = "network-interfaces/stop";
@@ -41,12 +41,39 @@ let
 
       script =
         ''
-          exec &> /var/log/openvpn-${cfg.id}
+          exec &> /var/log/openvpn-${name}
           ${config.system.sbin.modprobe} tun || true
           ${openvpn}/sbin/openvpn --config ${configFile}
         '';
     };
 
+  openvpnInstanceOptions = {
+
+    config = mkOption {
+      type = types.string;
+      description = ''
+        config of this openvpn instance
+      '';
+    };
+    up = mkOption {
+      default = "";
+      type = types.string;
+      description = ''
+        script which is run when server instance starts up succesfully.
+        Use it to setup firewall and routing
+      '';
+    };
+    down = mkOption {
+      default = "";
+      type = types.string;
+      description = ''
+        script which is run when server instance shuts down
+        Usually this reverts what up has done
+      '';
+    };
+
+  };
+
 in
   
 {
@@ -62,56 +89,64 @@ in
         description = "Whether to enable OpenVPN.";
       };
 
+
       servers = mkOption {
-        example = [
-          {
-            id = "server-simplest";
-            config = ''
-              # Most simple configuration: http://openvpn.net/index.php/documentation/miscellaneous/static-key-mini-howto.html.
-              # server : 
-              dev tun
-              ifconfig 10.8.0.1 10.8.0.2
-              secret static.key
-            '';
-            up = "ip route add ..!";
-            down = "ip route add ..!";
-          }
-          {
-            id = "client-simplest";
-            config = ''
-              #client:
-              #remote myremote.mydomain
-              #dev tun
-              #ifconfig 10.8.0.2 10.8.0.1
-              #secret static.key
-            '';
-          }
-          {
-            id = "server-scalable";
-            config = ''
-              multiple clienst
-              see example file found in http://openvpn.net/index.php/documentation/howto.html
-            '';
-          }
-          {
-            id = "client-scalabe";
-            config = '' dito '';
-          }
-        ];
-        default = [];
+
+        default = {};
+
+        example = {
+            mostSimple = {
+              config = ''
+                # Most simple configuration: http://openvpn.net/index.php/documentation/miscellaneous/static-key-mini-howto.html.
+                # server : 
+                dev tun
+                ifconfig 10.8.0.1 10.8.0.2
+                secret static.key
+              '';
+              up = "ip route add ..!";
+              down = "ip route add ..!";
+            };
+            clientMostSimple = {
+              config = ''
+                #client:
+                #remote myremote.mydomain
+                #dev tun
+                #ifconfig 10.8.0.2 10.8.0.1
+                #secret static.key
+              '';
+            };
+            serverScalable = {
+              config = ''
+                multiple clienst
+                see example file found in http://openvpn.net/index.php/documentation/howto.html
+              '';
+            };
+        };
+
         # !!! clean up this description please
         description = ''
-          openvpn instances to be run. Each will be put into an extra job named openvpn-{id}
+          You can define multiple openvpn instances.
+
+          The id of an instance is given by the attribute name.
+
+          Each instance will result in a new job file.
 
-          The up and down properties will be added config line up=/nix/store/xxx-up-script
-          automatically for you. If you define at least one of up/down
-          "script-security 2" will be prepended to your config.
+          Additionally you can specify the up/ down scripts by setting
+          the up down properties. 
+          Config lines up=/nix/store/xxx-up-script down=...
+          will be appended to your configuration file automatically
 
-          Don't forget to check that the all package sizes can be sent. if scp hangs or such you should set
-          --fragment XXX --mssfix YYY.
+          If you define at least one of up/down "script-security 2" will be
+          prepended to your config otherwise you scripts aren't run by openvpn
+
+          Don't forget to check that the all package sizes can be sent. For
+          examlpe if scp hangs you should set --fragment XXX --mssfix YYY.
         '';
+
+        type = types.attrsOf types.optionSet;
+        options = [ openvpnInstanceOptions ];
       };
-      
+
     };
 
   };
@@ -120,9 +155,7 @@ in
   ###### implementation
 
   config = mkIf cfg.enable {
-
-    jobs = listToAttrs (map (c: nameValuePair "openvpn-${cfg.id}" (makeOpenVPNJob c)) cfg.servers);
-  
+    jobs = listToAttrs (mapAttrsFlatten (name: value: nameValuePair "openvpn-${name}" (makeOpenVPNJob value name)) cfg.servers);
   };
   
 }
-- 
GitLab


From 893f13bb1490f1facd7750049cf67ed4ac143172 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Fri, 23 Oct 2009 20:30:12 +0000
Subject: [PATCH 1946/5331] Some boot optimisations attempted. My system boots
 a few times faster now, and I cannot see how these can break things.

svn path=/nixos/trunk/; revision=17946
---
 .../system/activation/activation-script.nix   | 11 ++-
 modules/system/activation/top-level.nix       |  4 +-
 modules/system/boot/stage-2-init.sh           |  1 +
 modules/system/etc/etc.nix                    | 32 ++------
 modules/system/etc/make-etc.sh                | 76 ++++++++++++++++++-
 5 files changed, 93 insertions(+), 31 deletions(-)

diff --git a/modules/system/activation/activation-script.nix b/modules/system/activation/activation-script.nix
index a62120363f2..2ca7dcc82e1 100644
--- a/modules/system/activation/activation-script.nix
+++ b/modules/system/activation/activation-script.nix
@@ -11,6 +11,7 @@ let
       text = ''
         #### actionScripts snippet ${a} :
         #    ========================================
+	echo "executing activation snippet ${a} at $(${pkgs.coreutils}/bin/date)"
         ${v.text}
       '';
     });
@@ -123,8 +124,14 @@ let
       # Set up Nix.
       mkdir -p /nix/etc/nix
       ln -sfn /etc/nix.conf /nix/etc/nix/nix.conf
-      chown root.nixbld /nix/store
-      chmod 1775 /nix/store
+      stat /nix/store/ | \
+        egrep \
+	  'Access: [(]1775/[-drwxt]*[)] *Uid: [(][0-9 ]*/ *root[)] *Gid: [(][0-9 ]*/ *nixbld[)]' \
+	  > /dev/null || {
+
+              chown root.nixbld /nix/store
+              chmod 1775 /nix/store
+      }
 
       # Nix initialisation.
       mkdir -m 0755 -p \
diff --git a/modules/system/activation/top-level.nix b/modules/system/activation/top-level.nix
index 609b11dd3d6..50fbde63b88 100644
--- a/modules/system/activation/top-level.nix
+++ b/modules/system/activation/top-level.nix
@@ -42,7 +42,9 @@ let
   # as you use, but with another kernel
   # !!! fix this
   children = map (x: ((import ../../../default.nix)
-    { configuration = x//{boot=((x.boot)//{grubDevice = "";});};}).system) 
+    { configuration = x//{boot=((x.boot)//
+    	{loader=x.boot.loader//{grub=x.boot.loader.grub//
+	{device = "";};};});};}).system)
     config.nesting.children;
 
 
diff --git a/modules/system/boot/stage-2-init.sh b/modules/system/boot/stage-2-init.sh
index 0cc09caebba..1089526cf6b 100644
--- a/modules/system/boot/stage-2-init.sh
+++ b/modules/system/boot/stage-2-init.sh
@@ -132,6 +132,7 @@ fi
 # Ensure that the module tools can find the kernel modules.
 export MODULE_DIR=@kernel@/lib/modules/
 
+echo "Running post-boot commands"
 
 # Run any user-specified commands.
 @shell@ @postBootCommands@
diff --git a/modules/system/etc/etc.nix b/modules/system/etc/etc.nix
index 4ae420017a5..35137597d04 100644
--- a/modules/system/etc/etc.nix
+++ b/modules/system/etc/etc.nix
@@ -41,6 +41,8 @@ let
 
     builder = ./make-etc.sh;
 
+    inherit (pkgs) coreutils;
+
     /* !!! Use toXML. */
     sources = map (x: x.source) config.environment.etc;
     targets = map (x: x.target) config.environment.etc;
@@ -61,33 +63,9 @@ in
       etc = pkgs.lib.fullDepEntry ''
         # Set up the statically computed bits of /etc.
         echo "setting up /etc..."
-        staticEtc=/etc/static
-        rm -f $staticEtc
-        ln -s ${makeEtc}/etc $staticEtc
-        for i in $(cd $staticEtc && find * -type l); do
-            mkdir -p /etc/$(dirname $i)
-            rm -f /etc/$i
-            if test -e "$staticEtc/$i.mode"; then
-                # Create a regular file in /etc.
-                cp $staticEtc/$i /etc/$i
-                chown 0.0 /etc/$i
-                chmod "$(cat "$staticEtc/$i.mode")" /etc/$i
-            else
-                # Create a symlink in /etc.
-                ln -s $staticEtc/$i /etc/$i
-            fi
-        done
-
-        # Remove dangling symlinks that point to /etc/static.  These are
-        # configuration files that existed in a previous configuration but not
-        # in the current one.  For efficiency, don't look under /etc/nixos
-        # (where all the NixOS sources live).
-        for i in $(find /etc/ \( -path /etc/nixos -prune \) -o -type l); do
-            target=$(readlink "$i")
-            if test "''${target:0:''${#staticEtc}}" = "$staticEtc" -a ! -e "$i"; then
-                rm -f "$i"
-            fi
-        done
+	/etc/kill-etc || true
+	${makeEtc}/bin/fill-etc
+	echo "/etc is set up"
       '' [
         "systemConfig"
         "defaultPath" # path to cp, chmod, chown
diff --git a/modules/system/etc/make-etc.sh b/modules/system/etc/make-etc.sh
index f05d74b55fc..76ae97c6c65 100644
--- a/modules/system/etc/make-etc.sh
+++ b/modules/system/etc/make-etc.sh
@@ -5,6 +5,61 @@ ensureDir $out/etc
 sources_=($sources)
 targets_=($targets)
 modes_=($modes)
+
+cat <<EOF >> fill-etc.c
+    #include <sys/types.h>
+    #include <sys/stat.h>
+    #include <unistd.h>
+    #include <stdio.h>
+    #include <stdlib.h>
+    #include <string.h>
+    #include <limits.h>
+    #include <sys/wait.h>
+
+    struct stat statBuffer;
+
+    void ensureDir(char* path) {
+        int i, j;
+        char pathBuffer[PATH_MAX];
+        statBuffer.st_mode = 0;
+        for (i=0; path[i]; i++) {
+            if (path[i]=='/') {
+                pathBuffer[i]=0;
+                mkdir(pathBuffer ,0755);
+		j = i;
+            }
+            pathBuffer[i]=path[i];
+        }
+	pathBuffer[j]=0;
+        if (stat(pathBuffer, &statBuffer) || ! (statBuffer.st_mode & S_IFDIR)) {
+            printf ("Path does not exist or not a directory: %s\n", path);
+            exit (EXIT_FAILURE);
+        }
+    }
+
+    void copyAndChmod(char* path, char* target, mode_t mode) {
+        int pid;
+        pid = fork();
+        if (! pid) {
+            execl("${coreutils}/bin/cp", "cp", path, target, NULL);
+        } else {
+            waitpid (pid, NULL, 0);
+        }
+        chmod (target, mode);
+    }
+    
+    int main () {
+        /* generated code begins */
+EOF
+cat <<EOF >> kill-etc.c
+    #include <sys/types.h>
+    #include <sys/stat.h>
+    #include <unistd.h>
+
+    int main () {
+        /* generated code begins */
+EOF
+
 for ((i = 0; i < ${#targets_[@]}; i++)); do
     ensureDir $out/etc/$(dirname ${targets_[$i]})
     if ! test -e $out/etc/${targets_[$i]}; then
@@ -13,10 +68,29 @@ for ((i = 0; i < ${#targets_[@]}; i++)); do
         echo "Duplicate entry ${targets_[$i]} -> ${sources_[$i]}"
         if test "$(readlink $out/etc/${targets_[$i]})" != "${sources_[$i]}"; then
             echo "Mismatched duplicate entry $(readlink $out/etc/${targets_[$i]}) <-> ${sources_[$i]}"
-	    exit 1
+        exit 1
         fi
     fi;
+    echo "ensureDir(\"/etc/${targets_[$i]}\");" >> fill-etc.c
     if test "${modes_[$i]}" != symlink; then
         echo "${modes_[$i]}" > $out/etc/${targets_[$i]}.mode
+
+        echo "copyAndChmod(\"$out/etc/${targets_[$i]}\",\"/etc/${targets_[$i]}\",${modes_[$i]});" >> fill-etc.c;
+    else
+       echo "symlink(\"$out/etc/${targets_[$i]}\",\"/etc/${targets_[$i]}\");" >> fill-etc.c;
     fi
+
+    echo "unlink (\"/etc/${targets_[$i]}\");" >> kill-etc.c
 done
+
+echo "symlink(\"$out/bin/kill-etc\",\"/etc/kill-etc\");" >> fill-etc.c
+echo "unlink(\"/etc/kill-etc\");" >> kill-etc.c
+echo "  return 0; }" >> fill-etc.c
+echo "  return 0; }" >> kill-etc.c
+ensureDir $out/bin
+ensureDir $out/share/etc-scripts/src
+gcc -Wall fill-etc.c -o $out/bin/fill-etc
+gcc -Wall kill-etc.c -o $out/bin/kill-etc
+cp fill-etc.c $out/share/etc-scripts/src
+cp kill-etc.c $out/share/etc-scripts/src
+
-- 
GitLab


From ca6f5e6cd48cdec330da4495a626b720775e2061 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Sat, 24 Oct 2009 00:03:13 +0000
Subject: [PATCH 1947/5331] Further reducing writes on boot.. Do not copy /etc
 unless it changed

svn path=/nixos/trunk/; revision=17948
---
 modules/system/etc/etc.nix | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/modules/system/etc/etc.nix b/modules/system/etc/etc.nix
index 35137597d04..7246d62c160 100644
--- a/modules/system/etc/etc.nix
+++ b/modules/system/etc/etc.nix
@@ -63,9 +63,15 @@ in
       etc = pkgs.lib.fullDepEntry ''
         # Set up the statically computed bits of /etc.
         echo "setting up /etc..."
-	/etc/kill-etc || true
-	${makeEtc}/bin/fill-etc
-	echo "/etc is set up"
+	if [ "$(readlink /etc/kill-etc)" != "${makeEtc}/bin/kill-etc" ]; then
+	    /etc/kill-etc || true
+	    ${makeEtc}/bin/fill-etc
+	    echo -e "#! /bin/sh\n${makeEtc}/bin/kill-etc\n${makeEtc}/bin/fill-etc" > /etc/refill-etc
+	    chmod 0755 /etc/refill-etc
+	    echo "/etc is set up"
+	else
+	    echo "/etc unchanged"
+	fi
       '' [
         "systemConfig"
         "defaultPath" # path to cp, chmod, chown
-- 
GitLab


From f65674139534db17dc6d47035acdc82a19b39823 Mon Sep 17 00:00:00 2001
From: Nicolas Pierron <nicolas.b.pierron@gmail.com>
Date: Mon, 26 Oct 2009 09:50:33 +0000
Subject: [PATCH 1948/5331] Manual: Update nixos-checkout comments.

svn path=/nixos/trunk/; revision=17955
---
 doc/manual/installation.xml | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/doc/manual/installation.xml b/doc/manual/installation.xml
index 5b116bbd060..b73da06b5c2 100644
--- a/doc/manual/installation.xml
+++ b/doc/manual/installation.xml
@@ -365,22 +365,26 @@ whether everything compiles cleanly.</para>
 <title>Keeping NixOS up to date</title>
 
 <para>The currently best way to keep your NixOS installation up to
-date is to track the NixOS Subversion repository.  You should replace
-the static NixOS/Nixpkgs sources installed in
-<filename>/etc/nixos</filename> with a Subversion checkout.  The
-program <command>nixos-checkout</command> does that for you (and it
-also installs Subversion into your current profile).</para>
+date is to track the NixOS Subversion repository.  The program
+<command>nixos-checkout</command> does that for you.  It will
+check if the NixOS/NixPkgs sources are present and if they are under a
+version control system (VCS) before updating them to the latest version.  If your
+sources are not under a VCS, then you can rename them before
+running <command>nixos-checkout</command> which will checkout the sources.</para>
 
 <para>To build the latest and greatest, do
 
 <screen>
-$ svn up /etc/nixos/nixos
-$ svn up /etc/nixos/nixpkgs
+$ nixos-checkout
 $ nixos-rebuild switch</screen>
 
 (Or instead of <literal>switch</literal>, use any of the alternatives
 shown in <xref linkend="sec-changing-config"/>.)</para>
 
+<para>To customize your VCS or to handle more repositories with
+<command>nixos-checkout</command>, you can have a look at the
+options <option>installer.repos.nixos</option>
+and <option>installer.repos.nixpkgs</option>.</para>
 
 </section>
 
-- 
GitLab


From c195493a321918a3858b982bcca20202e1e77e7b Mon Sep 17 00:00:00 2001
From: Nicolas Pierron <nicolas.b.pierron@gmail.com>
Date: Tue, 27 Oct 2009 10:45:18 +0000
Subject: [PATCH 1949/5331] * Add a hacky for-loop to fix the usage of the
 continue keyword. (NIXOS-85)   The continue keyword was previously used to
 mount the next device, but   the loop in has been removed. (see r17919)

svn path=/nixos/trunk/; revision=17973
---
 modules/tasks/filesystems.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/modules/tasks/filesystems.nix b/modules/tasks/filesystems.nix
index cf6e712192f..d6ec640ac38 100644
--- a/modules/tasks/filesystems.nix
+++ b/modules/tasks/filesystems.nix
@@ -20,8 +20,8 @@ let
       while test -n "$newDevices"; do
         newDevices=
 
-        ${flip concatMapStrings fileSystems
-          (fs: ''
+        ${flip concatMapStrings fileSystems (fs: ''
+          for theContinueKeyword in theFollowingCode; do
             mountPoint='${fs.mountPoint}'
             device='${if fs.device != null then fs.device else "/dev/disk/by-label/${fs.label}"}'
             fsType='${fs.fsType}'
@@ -97,8 +97,8 @@ let
             if ${mount}/bin/mount -t "$fsType" -o "$options" "$device" "$mountPoint"; then
                 newDevices=1
             fi
-          '')
-        }
+          done
+        '')}
       done
     '';
 
-- 
GitLab


From 35c14bb11a23b6e3d2cc2d875483364ac0a97d47 Mon Sep 17 00:00:00 2001
From: Nicolas Pierron <nicolas.b.pierron@gmail.com>
Date: Tue, 27 Oct 2009 19:19:48 +0000
Subject: [PATCH 1950/5331] * Add a test to avoid regression of (NIXOS-85).

svn path=/nixos/trunk/; revision=17979
---
 tests/check-filesystems.nix | 83 +++++++++++++++++++++++++++++++++++++
 1 file changed, 83 insertions(+)
 create mode 100644 tests/check-filesystems.nix

diff --git a/tests/check-filesystems.nix b/tests/check-filesystems.nix
new file mode 100644
index 00000000000..d455d7b021f
--- /dev/null
+++ b/tests/check-filesystems.nix
@@ -0,0 +1,83 @@
+{ nixos ? ./..
+, nixpkgs ? /etc/nixos/nixpkgs
+, services ? /etc/nixos/services
+, system ? builtins.currentSystem
+}:
+
+with import ../lib/build-vms.nix { inherit nixos nixpkgs services system; };
+
+rec {
+  nodes = {
+    share = {pkgs, config, ...}: {
+      services.portmap.enable = true;
+      services.nfsKernel.enable = true;
+      services.nfsKernel.exports = ''
+        /repos1 192.168.1.0/255.255.255.0(rw,no_root_squash)
+        /repos2 192.168.1.0/255.255.255.0(rw,no_root_squash)
+      '';
+      services.nfsKernel.createMountPoints = true;
+
+      jobs.checkable = {
+        startOn = [
+          config.jobs.nfs_kernel_exports.name
+          config.jobs.nfs_kernel_nfsd.name
+        ];
+        respawn = true;
+      };
+    };
+
+    fsCheck = {pkgs, config, ...}: {
+      # enable nfs import
+      services.portmap.enable = true;
+
+      fileSystems =
+        let
+          repos1 = {
+            mountPoint = "/repos1";
+            autocreate = true;
+            device = "share:/repos1";
+          };
+
+          repos2 = {
+            mountPoint = "/repos2";
+            autocreate = true;
+            device = "share:/repos2";
+          };
+        in pkgs.lib.mkOverride 50 {} [ 
+          repos1
+          repos1 # check remount 
+          repos2 # check after remount
+        ];
+
+      jobs.checkable = {
+        startOn = "stopped ${config.jobs.filesystems.name}";
+        respawn = true;
+      };
+    };
+  };
+    
+  vms = buildVirtualNetwork { inherit nodes; };
+
+  test = runTests vms
+    ''
+      startAll;
+
+      $share->waitForJob("checkable");
+      $fsCheck->waitForJob("checkable");
+
+      # check repos1
+      $fsCheck->mustSucceed("test -d /repos1");
+      $share->mustSucceed("touch /repos1/test1");
+      $fsCheck->mustSucceed("test -e /repos1/test1");
+
+      # check repos2 (check after remount)
+      $fsCheck->mustSucceed("test -d /repos2");
+      $share->mustSucceed("touch /repos2/test2");
+      $fsCheck->mustSucceed("test -e /repos2/test2");
+
+      # check without network
+      $share->block();
+      $fsCheck->mustFail("test -e /repos1/test1");
+      $fsCheck->mustFail("test -e /repos2/test2");
+    '';
+}
-- 
GitLab


From 11022e8d9f83e68250cfa0846919878d3d1d1ab9 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 30 Oct 2009 08:37:08 +0000
Subject: [PATCH 1951/5331] * Back out r17946 and 17948 because it doesn't
 work.  I've seen it   fail to update /etc twice now.  It's also unnecessarily
 complex   IMHO (see nix-dev).

svn path=/nixos/trunk/; revision=18045
---
 .../system/activation/activation-script.nix   | 11 +--
 modules/system/activation/top-level.nix       |  4 +-
 modules/system/boot/stage-2-init.sh           |  1 -
 modules/system/etc/etc.nix                    | 38 +++++++---
 modules/system/etc/make-etc.sh                | 76 +------------------
 5 files changed, 31 insertions(+), 99 deletions(-)

diff --git a/modules/system/activation/activation-script.nix b/modules/system/activation/activation-script.nix
index 2ca7dcc82e1..a62120363f2 100644
--- a/modules/system/activation/activation-script.nix
+++ b/modules/system/activation/activation-script.nix
@@ -11,7 +11,6 @@ let
       text = ''
         #### actionScripts snippet ${a} :
         #    ========================================
-	echo "executing activation snippet ${a} at $(${pkgs.coreutils}/bin/date)"
         ${v.text}
       '';
     });
@@ -124,14 +123,8 @@ let
       # Set up Nix.
       mkdir -p /nix/etc/nix
       ln -sfn /etc/nix.conf /nix/etc/nix/nix.conf
-      stat /nix/store/ | \
-        egrep \
-	  'Access: [(]1775/[-drwxt]*[)] *Uid: [(][0-9 ]*/ *root[)] *Gid: [(][0-9 ]*/ *nixbld[)]' \
-	  > /dev/null || {
-
-              chown root.nixbld /nix/store
-              chmod 1775 /nix/store
-      }
+      chown root.nixbld /nix/store
+      chmod 1775 /nix/store
 
       # Nix initialisation.
       mkdir -m 0755 -p \
diff --git a/modules/system/activation/top-level.nix b/modules/system/activation/top-level.nix
index 50fbde63b88..609b11dd3d6 100644
--- a/modules/system/activation/top-level.nix
+++ b/modules/system/activation/top-level.nix
@@ -42,9 +42,7 @@ let
   # as you use, but with another kernel
   # !!! fix this
   children = map (x: ((import ../../../default.nix)
-    { configuration = x//{boot=((x.boot)//
-    	{loader=x.boot.loader//{grub=x.boot.loader.grub//
-	{device = "";};};});};}).system)
+    { configuration = x//{boot=((x.boot)//{grubDevice = "";});};}).system) 
     config.nesting.children;
 
 
diff --git a/modules/system/boot/stage-2-init.sh b/modules/system/boot/stage-2-init.sh
index 1089526cf6b..0cc09caebba 100644
--- a/modules/system/boot/stage-2-init.sh
+++ b/modules/system/boot/stage-2-init.sh
@@ -132,7 +132,6 @@ fi
 # Ensure that the module tools can find the kernel modules.
 export MODULE_DIR=@kernel@/lib/modules/
 
-echo "Running post-boot commands"
 
 # Run any user-specified commands.
 @shell@ @postBootCommands@
diff --git a/modules/system/etc/etc.nix b/modules/system/etc/etc.nix
index 7246d62c160..4ae420017a5 100644
--- a/modules/system/etc/etc.nix
+++ b/modules/system/etc/etc.nix
@@ -41,8 +41,6 @@ let
 
     builder = ./make-etc.sh;
 
-    inherit (pkgs) coreutils;
-
     /* !!! Use toXML. */
     sources = map (x: x.source) config.environment.etc;
     targets = map (x: x.target) config.environment.etc;
@@ -63,15 +61,33 @@ in
       etc = pkgs.lib.fullDepEntry ''
         # Set up the statically computed bits of /etc.
         echo "setting up /etc..."
-	if [ "$(readlink /etc/kill-etc)" != "${makeEtc}/bin/kill-etc" ]; then
-	    /etc/kill-etc || true
-	    ${makeEtc}/bin/fill-etc
-	    echo -e "#! /bin/sh\n${makeEtc}/bin/kill-etc\n${makeEtc}/bin/fill-etc" > /etc/refill-etc
-	    chmod 0755 /etc/refill-etc
-	    echo "/etc is set up"
-	else
-	    echo "/etc unchanged"
-	fi
+        staticEtc=/etc/static
+        rm -f $staticEtc
+        ln -s ${makeEtc}/etc $staticEtc
+        for i in $(cd $staticEtc && find * -type l); do
+            mkdir -p /etc/$(dirname $i)
+            rm -f /etc/$i
+            if test -e "$staticEtc/$i.mode"; then
+                # Create a regular file in /etc.
+                cp $staticEtc/$i /etc/$i
+                chown 0.0 /etc/$i
+                chmod "$(cat "$staticEtc/$i.mode")" /etc/$i
+            else
+                # Create a symlink in /etc.
+                ln -s $staticEtc/$i /etc/$i
+            fi
+        done
+
+        # Remove dangling symlinks that point to /etc/static.  These are
+        # configuration files that existed in a previous configuration but not
+        # in the current one.  For efficiency, don't look under /etc/nixos
+        # (where all the NixOS sources live).
+        for i in $(find /etc/ \( -path /etc/nixos -prune \) -o -type l); do
+            target=$(readlink "$i")
+            if test "''${target:0:''${#staticEtc}}" = "$staticEtc" -a ! -e "$i"; then
+                rm -f "$i"
+            fi
+        done
       '' [
         "systemConfig"
         "defaultPath" # path to cp, chmod, chown
diff --git a/modules/system/etc/make-etc.sh b/modules/system/etc/make-etc.sh
index 76ae97c6c65..f05d74b55fc 100644
--- a/modules/system/etc/make-etc.sh
+++ b/modules/system/etc/make-etc.sh
@@ -5,61 +5,6 @@ ensureDir $out/etc
 sources_=($sources)
 targets_=($targets)
 modes_=($modes)
-
-cat <<EOF >> fill-etc.c
-    #include <sys/types.h>
-    #include <sys/stat.h>
-    #include <unistd.h>
-    #include <stdio.h>
-    #include <stdlib.h>
-    #include <string.h>
-    #include <limits.h>
-    #include <sys/wait.h>
-
-    struct stat statBuffer;
-
-    void ensureDir(char* path) {
-        int i, j;
-        char pathBuffer[PATH_MAX];
-        statBuffer.st_mode = 0;
-        for (i=0; path[i]; i++) {
-            if (path[i]=='/') {
-                pathBuffer[i]=0;
-                mkdir(pathBuffer ,0755);
-		j = i;
-            }
-            pathBuffer[i]=path[i];
-        }
-	pathBuffer[j]=0;
-        if (stat(pathBuffer, &statBuffer) || ! (statBuffer.st_mode & S_IFDIR)) {
-            printf ("Path does not exist or not a directory: %s\n", path);
-            exit (EXIT_FAILURE);
-        }
-    }
-
-    void copyAndChmod(char* path, char* target, mode_t mode) {
-        int pid;
-        pid = fork();
-        if (! pid) {
-            execl("${coreutils}/bin/cp", "cp", path, target, NULL);
-        } else {
-            waitpid (pid, NULL, 0);
-        }
-        chmod (target, mode);
-    }
-    
-    int main () {
-        /* generated code begins */
-EOF
-cat <<EOF >> kill-etc.c
-    #include <sys/types.h>
-    #include <sys/stat.h>
-    #include <unistd.h>
-
-    int main () {
-        /* generated code begins */
-EOF
-
 for ((i = 0; i < ${#targets_[@]}; i++)); do
     ensureDir $out/etc/$(dirname ${targets_[$i]})
     if ! test -e $out/etc/${targets_[$i]}; then
@@ -68,29 +13,10 @@ for ((i = 0; i < ${#targets_[@]}; i++)); do
         echo "Duplicate entry ${targets_[$i]} -> ${sources_[$i]}"
         if test "$(readlink $out/etc/${targets_[$i]})" != "${sources_[$i]}"; then
             echo "Mismatched duplicate entry $(readlink $out/etc/${targets_[$i]}) <-> ${sources_[$i]}"
-        exit 1
+	    exit 1
         fi
     fi;
-    echo "ensureDir(\"/etc/${targets_[$i]}\");" >> fill-etc.c
     if test "${modes_[$i]}" != symlink; then
         echo "${modes_[$i]}" > $out/etc/${targets_[$i]}.mode
-
-        echo "copyAndChmod(\"$out/etc/${targets_[$i]}\",\"/etc/${targets_[$i]}\",${modes_[$i]});" >> fill-etc.c;
-    else
-       echo "symlink(\"$out/etc/${targets_[$i]}\",\"/etc/${targets_[$i]}\");" >> fill-etc.c;
     fi
-
-    echo "unlink (\"/etc/${targets_[$i]}\");" >> kill-etc.c
 done
-
-echo "symlink(\"$out/bin/kill-etc\",\"/etc/kill-etc\");" >> fill-etc.c
-echo "unlink(\"/etc/kill-etc\");" >> kill-etc.c
-echo "  return 0; }" >> fill-etc.c
-echo "  return 0; }" >> kill-etc.c
-ensureDir $out/bin
-ensureDir $out/share/etc-scripts/src
-gcc -Wall fill-etc.c -o $out/bin/fill-etc
-gcc -Wall kill-etc.c -o $out/bin/kill-etc
-cp fill-etc.c $out/share/etc-scripts/src
-cp kill-etc.c $out/share/etc-scripts/src
-
-- 
GitLab


From b86e8208d58b503b901b27b7836cb13742a6f6a8 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 30 Oct 2009 08:49:35 +0000
Subject: [PATCH 1952/5331] * Doh!  The mount options weren't passed properly.

svn path=/nixos/trunk/; revision=18047
---
 modules/tasks/filesystems.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/tasks/filesystems.nix b/modules/tasks/filesystems.nix
index d6ec640ac38..8225a618325 100644
--- a/modules/tasks/filesystems.nix
+++ b/modules/tasks/filesystems.nix
@@ -21,7 +21,7 @@ let
         newDevices=
 
         ${flip concatMapStrings fileSystems (fs: ''
-          for theContinueKeyword in theFollowingCode; do
+          for dummy in x; do # make `continue' work
             mountPoint='${fs.mountPoint}'
             device='${if fs.device != null then fs.device else "/dev/disk/by-label/${fs.label}"}'
             fsType='${fs.fsType}'
@@ -94,7 +94,7 @@ let
               ''
             }
 
-            if ${mount}/bin/mount -t "$fsType" -o "$options" "$device" "$mountPoint"; then
+            if ${mount}/bin/mount -t "$fsType" -o "${fs.options}" "$device" "$mountPoint"; then
                 newDevices=1
             fi
           done
-- 
GitLab


From 8c5b2001649317ba2dd626200a072c80db22e56c Mon Sep 17 00:00:00 2001
From: Nicolas Pierron <nicolas.b.pierron@gmail.com>
Date: Fri, 30 Oct 2009 11:57:23 +0000
Subject: [PATCH 1953/5331] * boor.loader.grub.device can only be defined once.
 * Replace an obscure piece of code by its equivalent based on the  
 recursiveUpdate function.  Undefined the obsolete name of   boot.grubDevice
 to avoid conflicts.

svn path=/nixos/trunk/; revision=18049
---
 modules/installer/grub/grub.nix         |  1 +
 modules/system/activation/top-level.nix | 14 +++++++++++---
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/modules/installer/grub/grub.nix b/modules/installer/grub/grub.nix
index 37b7a7f4a70..cb716a2a84e 100644
--- a/modules/installer/grub/grub.nix
+++ b/modules/installer/grub/grub.nix
@@ -45,6 +45,7 @@ in
       device = mkOption {
         default = "";
         example = "/dev/hda";
+        type = with pkgs.lib.types; uniq string;
         description = ''
           The device on which the boot loader, GRUB, will be installed.
           If empty, GRUB won't be installed and it's your responsibility
diff --git a/modules/system/activation/top-level.nix b/modules/system/activation/top-level.nix
index 609b11dd3d6..1e3f22c37ad 100644
--- a/modules/system/activation/top-level.nix
+++ b/modules/system/activation/top-level.nix
@@ -41,9 +41,17 @@ let
   # you can provide an easy way to boot the same configuration 
   # as you use, but with another kernel
   # !!! fix this
-  children = map (x: ((import ../../../default.nix)
-    { configuration = x//{boot=((x.boot)//{grubDevice = "";});};}).system) 
-    config.nesting.children;
+  children =
+    map (childConfig:
+      (import ../../../default.nix {
+        configuration =
+          pkgs.lib.recursiveUpdate childConfig {
+            boot.loader.grub.device = "";
+            # undefined the obsolete name of the previous option.
+            boot.grubDevice = pkgs.lib.mkNotdef;
+          };
+      }).system
+    ) config.nesting.children;
 
 
   systemBuilder =
-- 
GitLab


From 46558b31a0c3205c5da0d6e5286b3c27715fe53e Mon Sep 17 00:00:00 2001
From: Sander van der Burg <s.vanderburg@tudelft.nl>
Date: Mon, 2 Nov 2009 12:13:09 +0000
Subject: [PATCH 1954/5331] Added ejabberd to the systemPackages and fixed some
 command line arguments. This will make the ejabberd service working again

svn path=/nixos/trunk/; revision=18070
---
 modules/services/networking/ejabberd.nix | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/modules/services/networking/ejabberd.nix b/modules/services/networking/ejabberd.nix
index 7b341bc8604..4dce0926364 100644
--- a/modules/services/networking/ejabberd.nix
+++ b/modules/services/networking/ejabberd.nix
@@ -49,6 +49,7 @@ in
   ###### implementation
 
   config = mkIf cfg.enable {
+    environment.systemPackages = [ pkgs.ejabberd ];
 
     jobs.ejabberd =
       { description = "EJabberd server";
@@ -65,12 +66,16 @@ in
             then
                 cp -av ${pkgs.ejabberd}/var/lib/ejabberd /var/lib
             fi
-
-            mkdir -p ${cfg.confDir}
-            test -f ${cfg.confDir}/ejabberd.cfg || sed -e 's|{hosts, \["localhost"\]}.|{hosts, \[${cfg.virtualHosts}\]}.|' ${pkgs.ejabberd}/etc/ejabberd/ejabberd.cfg > ${cfg.confDir}/ejabberd.cfg
+            
+            if ! test -d ${cfg.confDir}
+	    then
+		mkdir -p ${cfg.confDir}
+	        cp ${pkgs.ejabberd}/etc/ejabberd/* ${cfg.confDir}
+	        sed -e 's|{hosts, \["localhost"\]}.|{hosts, \[${cfg.virtualHosts}\]}.|' ${pkgs.ejabberd}/etc/ejabberd/ejabberd.cfg > ${cfg.confDir}/ejabberd.cfg
+	    fi
           '';
 
-        exec = "${pkgs.bash}/bin/sh -c 'export PATH=$PATH:${pkgs.ejabberd}/sbin:${pkgs.coreutils}/bin:${pkgs.bash}/bin; cd ~; ejabberdctl --logs ${cfg.logsDir} --spool ${cfg.spoolDir} --config ${cfg.confDir}/ejabberd.cfg start; sleep 1d'";
+        exec = "${pkgs.bash}/bin/sh -c 'export PATH=$PATH:${pkgs.ejabberd}/sbin:${pkgs.coreutils}/bin:${pkgs.bash}/bin; ejabberdctl --config-dir ${cfg.confDir} --logs ${cfg.logsDir} --spool ${cfg.spoolDir} start; sleep 1d'";
 
         postStop =
           ''        
-- 
GitLab


From 063224bc84105fd5c92fa522dd2e86fb511a2068 Mon Sep 17 00:00:00 2001
From: Nicolas Pierron <nicolas.b.pierron@gmail.com>
Date: Wed, 4 Nov 2009 17:00:42 +0000
Subject: [PATCH 1955/5331] * Convert per-server-options into a module.

svn path=/nixos/trunk/; revision=18105
---
 modules/module-list.nix                       |  1 +
 .../web-servers/apache-httpd/default.nix      | 51 ++-----------------
 .../apache-httpd/per-server-options.nix       | 51 ++++++++++++++++++-
 3 files changed, 54 insertions(+), 49 deletions(-)

diff --git a/modules/module-list.nix b/modules/module-list.nix
index b443a41a64e..6a3a36d5229 100644
--- a/modules/module-list.nix
+++ b/modules/module-list.nix
@@ -93,6 +93,7 @@
   ./services/ttys/gpm.nix
   ./services/ttys/mingetty.nix
   ./services/web-servers/apache-httpd/default.nix
+  ./services/web-servers/apache-httpd/per-server-options.nix
   ./services/web-servers/jboss.nix
   ./services/web-servers/tomcat.nix
   ./services/x11/desktop-managers/default.nix
diff --git a/modules/services/web-servers/apache-httpd/default.nix b/modules/services/web-servers/apache-httpd/default.nix
index 55902f9e5e0..20373ba7fe6 100644
--- a/modules/services/web-servers/apache-httpd/default.nix
+++ b/modules/services/web-servers/apache-httpd/default.nix
@@ -33,24 +33,12 @@ let
     fullConfig = config; # machine config
   };
 
-
-  vhostOptions = import ./per-server-options.nix {
-    inherit mkOption;
-    forMainServer = false;
-  };
-
-  vhosts = let
-    makeVirtualHost = cfgIn: 
-      let
-        # Fill in defaults for missing options.
-        cfg = addDefaultOptionValues vhostOptions cfgIn;
-      in cfg;
-    in map makeVirtualHost mainCfg.virtualHosts;
-
+  vhosts = mainCfg.virtualHosts;
 
   allHosts = [mainCfg] ++ vhosts;
     
-
+  # !!! This should be replaced by sub-modules to allow non-intrusive
+  # extensions of NixOS.
   callSubservices = serverInfo: defs:
     let f = svc:
       let 
@@ -377,13 +365,6 @@ in
         ";
       };
 
-      extraConfig = mkOption {
-        default = "";
-        description = "
-          These configuration lines will be passed verbatim to the apache config
-        ";
-      };
-
       extraModules = mkOption {
         default = [];
         example = [ "proxy_connect" { name = "php5"; path = "${pkgs.php}/modules/libphp5.so"; } ];
@@ -446,24 +427,6 @@ in
         ";
       };
 
-      virtualHosts = mkOption {
-        default = [];
-        example = [
-          { hostName = "foo";
-            documentRoot = "/data/webroot-foo";
-          }
-          { hostName = "bar";
-            documentRoot = "/data/webroot-bar";
-          }
-        ];
-        description = ''
-          Specification of the virtual hosts served by Apache.  Each
-          element should be an attribute set specifying the
-          configuration of the virtual host.  The available options
-          are the non-global options permissible for the main host.
-        '';
-      };
-
 
       subservices = {
 
@@ -542,13 +505,7 @@ in
 
       };
 
-    }
-
-    # Include the options shared between the main server and virtual hosts.
-    // (import ./per-server-options.nix {
-      inherit mkOption;
-      forMainServer = true;
-    });
+    };
 
   };
 
diff --git a/modules/services/web-servers/apache-httpd/per-server-options.nix b/modules/services/web-servers/apache-httpd/per-server-options.nix
index 8a2ee0e849a..5f711eef68f 100644
--- a/modules/services/web-servers/apache-httpd/per-server-options.nix
+++ b/modules/services/web-servers/apache-httpd/per-server-options.nix
@@ -3,8 +3,13 @@
 # has additional options that affect the web server as a whole, like
 # the user/group to run under.)
 
-{forMainServer, mkOption}:
+{config, pkgs, ...}:
 
+let
+  inherit (pkgs.lib) mkOption addDefaultOptionValues;
+
+  perServerOptions = {forMainServer}:
+# !!! The following have to be re-indent later.
 {
 
   hostName = mkOption {
@@ -135,4 +140,46 @@
     ";
   };
 
-}
+};
+
+
+  vhostOptions = perServerOptions {
+    forMainServer = false;
+  };
+
+in
+
+{
+  options = {
+    services.httpd = {
+
+      virtualHosts = mkOption {
+        default = [];
+        example = [
+          { hostName = "foo";
+            documentRoot = "/data/webroot-foo";
+          }
+          { hostName = "bar";
+            documentRoot = "/data/webroot-bar";
+          }
+        ];
+        description = ''
+          Specification of the virtual hosts served by Apache.  Each
+          element should be an attribute set specifying the
+          configuration of the virtual host.  The available options
+          are the non-global options permissible for the main host.
+        '';
+
+        # Add the default value for each function which is not defined.
+        # This should be replaced by sub-modules.
+        apply =
+          map (vhost:
+            addDefaultOptionValues vhostOptions vhost
+          );
+      };
+
+    }
+    // perServerOptions {forMainServer = true;}
+    ;
+  };
+}
\ No newline at end of file
-- 
GitLab


From ff1d9969fbe49704830ce9c5ebb26571b1a23eec Mon Sep 17 00:00:00 2001
From: Nicolas Pierron <nicolas.b.pierron@gmail.com>
Date: Wed, 4 Nov 2009 17:00:48 +0000
Subject: [PATCH 1956/5331] * re-indent per-server-options.nix content.

svn path=/nixos/trunk/; revision=18106
---
 .../apache-httpd/per-server-options.nix       | 260 +++++++++---------
 1 file changed, 129 insertions(+), 131 deletions(-)

diff --git a/modules/services/web-servers/apache-httpd/per-server-options.nix b/modules/services/web-servers/apache-httpd/per-server-options.nix
index 5f711eef68f..480144fb08d 100644
--- a/modules/services/web-servers/apache-httpd/per-server-options.nix
+++ b/modules/services/web-servers/apache-httpd/per-server-options.nix
@@ -8,140 +8,138 @@
 let
   inherit (pkgs.lib) mkOption addDefaultOptionValues;
 
-  perServerOptions = {forMainServer}:
-# !!! The following have to be re-indent later.
-{
-
-  hostName = mkOption {
-    default = "localhost";
-    description = "
-      Canonical hostname for the server.
-    ";
-  };
-
-  serverAliases = mkOption {
-    default = [];
-    example = ["www.example.org" "www.example.org:8080" "example.org"];
-    description = "
-      Additional names of virtual hosts served by this virtual host configuration.
-    ";
-  };
-
-  port = mkOption {
-    default = 0;
-    description = "
-      Port for the server.  0 means use the default port: 80 for http
-      and 443 for https (i.e. when enableSSL is set).
-    ";
-  };
-
-  enableSSL = mkOption {
-    default = false;
-    description = "
-      Whether to enable SSL (https) support.
-    ";
-  };
-
-  # Note: sslServerCert and sslServerKey can be left empty, but this
-  # only makes sense for virtual hosts (they will inherit from the
-  # main server).
-  
-  sslServerCert = mkOption {
-    default = ""; 
-    example = "/var/host.cert";
-    description = "
-      Path to server SSL certificate.
-    ";
-  };
-
-  sslServerKey = mkOption {
-    default = "";
-    example = "/var/host.key";
-    description = "
-      Path to server SSL certificate key.
-    ";
-  };
+  perServerOptions = {forMainServer}: {
+
+    hostName = mkOption {
+      default = "localhost";
+      description = "
+        Canonical hostname for the server.
+      ";
+    };
+
+    serverAliases = mkOption {
+      default = [];
+      example = ["www.example.org" "www.example.org:8080" "example.org"];
+      description = "
+        Additional names of virtual hosts served by this virtual host configuration.
+      ";
+    };
+
+    port = mkOption {
+      default = 0;
+      description = "
+        Port for the server.  0 means use the default port: 80 for http
+        and 443 for https (i.e. when enableSSL is set).
+      ";
+    };
+
+    enableSSL = mkOption {
+      default = false;
+      description = "
+        Whether to enable SSL (https) support.
+      ";
+    };
+
+    # Note: sslServerCert and sslServerKey can be left empty, but this
+    # only makes sense for virtual hosts (they will inherit from the
+    # main server).
+    
+    sslServerCert = mkOption {
+      default = ""; 
+      example = "/var/host.cert";
+      description = "
+        Path to server SSL certificate.
+      ";
+    };
+
+    sslServerKey = mkOption {
+      default = "";
+      example = "/var/host.key";
+      description = "
+        Path to server SSL certificate key.
+      ";
+    };
+
+    adminAddr = mkOption ({
+      example = "admin@example.org";
+      description = "
+        E-mail address of the server administrator.
+      ";
+    } // (if forMainServer then {} else {default = "";}));
+
+    documentRoot = mkOption {
+      default = null;
+      example = "/data/webserver/docs";
+      description = "
+        The path of Apache's document root directory.  If left undefined,
+        an empty directory in the Nix store will be used as root.
+      ";
+    };
+
+    servedDirs = mkOption {
+      default = [];
+      example = [
+        { urlPath = "/nix";
+          dir = "/home/eelco/Dev/nix-homepage";
+        }
+      ];
+      description = "
+        This option provides a simple way to serve static directories.
+      ";
+    };
+
+    servedFiles = mkOption {
+      default = [];
+      example = [
+        { urlPath = "/foo/bar.png";
+          dir = "/home/eelco/some-file.png";
+        }
+      ];
+      description = "
+        This option provides a simple way to serve individual, static files.
+      ";
+    };
+
+    extraConfig = mkOption {
+      default = "";
+      example = ''
+        <Directory /home>
+          Options FollowSymlinks
+          AllowOverride All
+        </Directory>
+      '';
+      description = "
+        These lines go to httpd.conf verbatim. They will go after
+        directories and directory aliases defined by default.
+      ";
+    };
+
+    extraSubservices = mkOption {
+      default = [];
+      description = "
+        Extra subservices to enable in the webserver.
+      ";
+    };
+
+    enableUserDir = mkOption {
+      default = false;
+      description = "
+        Whether to enable serving <filename>~/public_html</filename> as
+        <literal>/~<replaceable>username</replaceable></literal>.
+      ";
+    };
+
+    globalRedirect = mkOption {
+      default = "";
+      example = http://newserver.example.org/;
+      description = "
+        If set, all requests for this host are redirected permanently to
+        the given URL.
+      ";
+    };
 
-  adminAddr = mkOption ({
-    example = "admin@example.org";
-    description = "
-      E-mail address of the server administrator.
-    ";
-  } // (if forMainServer then {} else {default = "";}));
-
-  documentRoot = mkOption {
-    default = null;
-    example = "/data/webserver/docs";
-    description = "
-      The path of Apache's document root directory.  If left undefined,
-      an empty directory in the Nix store will be used as root.
-    ";
   };
 
-  servedDirs = mkOption {
-    default = [];
-    example = [
-      { urlPath = "/nix";
-        dir = "/home/eelco/Dev/nix-homepage";
-      }
-    ];
-    description = "
-      This option provides a simple way to serve static directories.
-    ";
-  };
-
-  servedFiles = mkOption {
-    default = [];
-    example = [
-      { urlPath = "/foo/bar.png";
-        dir = "/home/eelco/some-file.png";
-      }
-    ];
-    description = "
-      This option provides a simple way to serve individual, static files.
-    ";
-  };
-
-  extraConfig = mkOption {
-    default = "";
-    example = ''
-      <Directory /home>
-        Options FollowSymlinks
-        AllowOverride All
-      </Directory>
-    '';
-    description = "
-      These lines go to httpd.conf verbatim. They will go after
-      directories and directory aliases defined by default.
-    ";
-  };
-
-  extraSubservices = mkOption {
-    default = [];
-    description = "
-      Extra subservices to enable in the webserver.
-    ";
-  };
-
-  enableUserDir = mkOption {
-    default = false;
-    description = "
-      Whether to enable serving <filename>~/public_html</filename> as
-      <literal>/~<replaceable>username</replaceable></literal>.
-    ";
-  };
-
-  globalRedirect = mkOption {
-    default = "";
-    example = http://newserver.example.org/;
-    description = "
-      If set, all requests for this host are redirected permanently to
-      the given URL.
-    ";
-  };
-
-};
-
 
   vhostOptions = perServerOptions {
     forMainServer = false;
-- 
GitLab


From 0e22df1587d274f3527a3c652127613a9deb8018 Mon Sep 17 00:00:00 2001
From: Nicolas Pierron <nicolas.b.pierron@gmail.com>
Date: Wed, 4 Nov 2009 17:00:53 +0000
Subject: [PATCH 1957/5331] * Use sub-modules for httpd virtual hosts.  This
 add documentation entries   and allow non-intrusive extensions of virtual
 hosts.

svn path=/nixos/trunk/; revision=18107
---
 .../apache-httpd/per-server-options.nix            | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/modules/services/web-servers/apache-httpd/per-server-options.nix b/modules/services/web-servers/apache-httpd/per-server-options.nix
index 480144fb08d..cdb1f72a945 100644
--- a/modules/services/web-servers/apache-httpd/per-server-options.nix
+++ b/modules/services/web-servers/apache-httpd/per-server-options.nix
@@ -6,7 +6,7 @@
 {config, pkgs, ...}:
 
 let
-  inherit (pkgs.lib) mkOption addDefaultOptionValues;
+  inherit (pkgs.lib) mkOption addDefaultOptionValues types;
 
   perServerOptions = {forMainServer}: {
 
@@ -161,6 +161,7 @@ in
             documentRoot = "/data/webroot-bar";
           }
         ];
+        type = with types; listOf optionSet;
         description = ''
           Specification of the virtual hosts served by Apache.  Each
           element should be an attribute set specifying the
@@ -168,16 +169,13 @@ in
           are the non-global options permissible for the main host.
         '';
 
-        # Add the default value for each function which is not defined.
-        # This should be replaced by sub-modules.
-        apply =
-          map (vhost:
-            addDefaultOptionValues vhostOptions vhost
-          );
+        options = [
+          vhostOptions
+        ];
       };
 
     }
     // perServerOptions {forMainServer = true;}
     ;
   };
-}
\ No newline at end of file
+}
-- 
GitLab


From 8734b7103e23159f65cdcc076f1b234e604d93eb Mon Sep 17 00:00:00 2001
From: Nicolas Pierron <nicolas.b.pierron@gmail.com>
Date: Wed, 4 Nov 2009 18:14:42 +0000
Subject: [PATCH 1958/5331] * Remove needs to call getPort to access the server
 port.  This is made   possible by using sub-modules arguments.

svn path=/nixos/trunk/; revision=18112
---
 .../web-servers/apache-httpd/default.nix      |  2 +-
 .../apache-httpd/per-server-options.nix       | 20 +++++++++++++------
 2 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/modules/services/web-servers/apache-httpd/default.nix b/modules/services/web-servers/apache-httpd/default.nix
index 20373ba7fe6..e40c6b914df 100644
--- a/modules/services/web-servers/apache-httpd/default.nix
+++ b/modules/services/web-servers/apache-httpd/default.nix
@@ -10,7 +10,7 @@ let
 
   httpd = pkgs.apacheHttpd;
 
-  getPort = cfg: if cfg.port != 0 then cfg.port else if cfg.enableSSL then 443 else 80;
+  getPort = cfg: cfg.port;
 
   extraModules = attrByPath ["extraModules"] [] mainCfg;
   extraForeignModules = filter builtins.isAttrs extraModules;
diff --git a/modules/services/web-servers/apache-httpd/per-server-options.nix b/modules/services/web-servers/apache-httpd/per-server-options.nix
index cdb1f72a945..0029e1293cb 100644
--- a/modules/services/web-servers/apache-httpd/per-server-options.nix
+++ b/modules/services/web-servers/apache-httpd/per-server-options.nix
@@ -3,12 +3,18 @@
 # has additional options that affect the web server as a whole, like
 # the user/group to run under.)
 
-{config, pkgs, ...}:
+{options, config, pkgs, ...}@moduleArguments:
 
 let
   inherit (pkgs.lib) mkOption addDefaultOptionValues types;
 
-  perServerOptions = {forMainServer}: {
+  mainServerArgs = {
+    config = config.services.httpd;
+    options = options.services.httpd;
+  };
+
+
+  perServerOptions = {forMainServer}: {config, ...}: {
 
     hostName = mkOption {
       default = "localhost";
@@ -26,10 +32,12 @@ let
     };
 
     port = mkOption {
-      default = 0;
+      default = if config.enableSSL then 443 else 80;
+      type = with types; uniq int;
       description = "
-        Port for the server.  0 means use the default port: 80 for http
-        and 443 for https (i.e. when enableSSL is set).
+        Port for the server.  The default port depends on the
+        <option>enableSSL</option> option of this server. (80 for http and
+        443 for https).
       ";
     };
 
@@ -175,7 +183,7 @@ in
       };
 
     }
-    // perServerOptions {forMainServer = true;}
+    // perServerOptions {forMainServer = true;} mainServerArgs
     ;
   };
 }
-- 
GitLab


From 3f7eb694a9779e16fac3713b30214961cc7f3d26 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 4 Nov 2009 22:44:21 +0000
Subject: [PATCH 1959/5331] * CUPS provides a dbus service.

svn path=/nixos/trunk/; revision=18125
---
 modules/services/printing/cupsd.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/modules/services/printing/cupsd.nix b/modules/services/printing/cupsd.nix
index 3c7944261ed..149055d74c5 100644
--- a/modules/services/printing/cupsd.nix
+++ b/modules/services/printing/cupsd.nix
@@ -145,6 +145,8 @@ in
 
     environment.systemPackages = [cups];
 
+    services.dbus.packages = [cups];
+
     environment.etc =
       [ # CUPS expects the following files in its ServerRoot.
         { source = "${cups}/etc/cups/mime.convs";
-- 
GitLab


From ad17a6dce3f0649c31db7fc60cad98c3cbafc102 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 4 Nov 2009 22:44:40 +0000
Subject: [PATCH 1960/5331] * Changes related to the xorg-7.5 merge.

svn path=/nixos/trunk/; revision=18126
---
 doc/manual/default.nix           | 2 +-
 modules/services/system/dbus.nix | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/doc/manual/default.nix b/doc/manual/default.nix
index f0e6b64103c..54301dadf44 100644
--- a/doc/manual/default.nix
+++ b/doc/manual/default.nix
@@ -25,7 +25,7 @@ let
 
     sources = pkgs.lib.sourceFilesBySuffices ./. [".xml"];
 
-    buildInputs = [pkgs.libxml2New pkgs.libxslt];
+    buildInputs = [pkgs.libxml2 pkgs.libxslt];
 
     xsltFlags = ''
       --param section.autolabel 1
diff --git a/modules/services/system/dbus.nix b/modules/services/system/dbus.nix
index 4011c3b3335..8e1d9bd4d10 100644
--- a/modules/services/system/dbus.nix
+++ b/modules/services/system/dbus.nix
@@ -7,8 +7,7 @@ let
 
   cfg = config.services.dbus;
 
-  # !!! dbus_temp uses /etc/dbus-1; will be merged into pkgs.dbus later.
-  dbus = pkgs.dbus_temp;
+  inherit (pkgs) dbus;
 
   homeDir = "/var/run/dbus";
 
-- 
GitLab


From 8dd4147548f15398ee2c96a0170f601f611d65cc Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 5 Nov 2009 10:28:25 +0000
Subject: [PATCH 1961/5331] * Removed an empty directory.

svn path=/nixos/trunk/; revision=18130
-- 
GitLab


From 1952365a51352840f27d85757ffe1f9bd98e3d63 Mon Sep 17 00:00:00 2001
From: Nicolas Pierron <nicolas.b.pierron@gmail.com>
Date: Thu, 5 Nov 2009 13:34:01 +0000
Subject: [PATCH 1962/5331] * Remove unused subservice syntax.

svn path=/nixos/trunk/; revision=18135
---
 .../web-servers/apache-httpd/default.nix      | 78 -------------------
 1 file changed, 78 deletions(-)

diff --git a/modules/services/web-servers/apache-httpd/default.nix b/modules/services/web-servers/apache-httpd/default.nix
index e40c6b914df..53116191b70 100644
--- a/modules/services/web-servers/apache-httpd/default.nix
+++ b/modules/services/web-servers/apache-httpd/default.nix
@@ -427,84 +427,6 @@ in
         ";
       };
 
-
-      subservices = {
-
-        # !!! remove this
-        subversion = {
-
-          enable = mkOption {
-            default = false;
-            description = "
-              Whether to enable the Subversion subservice in the webserver.
-            ";
-          };
-
-          notificationSender = mkOption {
-            default = "svn-server@example.org";
-            example = "svn-server@example.org";
-            description = "
-              The email address used in the Sender field of commit
-              notification messages sent by the Subversion subservice.
-            ";
-          };
-
-          userCreationDomain = mkOption {
-            default = "example.org"; 
-            example = "example.org";
-            description = "
-              The domain from which user creation is allowed.  A client can
-              only create a new user account if its IP address resolves to
-              this domain.
-            ";
-          };
-
-          autoVersioning = mkOption {
-            default = false;
-            description = "
-              Whether you want the Subversion subservice to support
-              auto-versioning, which enables Subversion repositories to be
-              mounted as read/writable file systems on operating systems that
-              support WebDAV.
-            ";
-          };
-
-          dataDir = mkOption {
-            default = "/no/such/path/exists";
-            description = "
-              Place to put SVN repository.
-            ";
-          };
-
-          organization = {
-
-            name = mkOption {
-              default = null;
-              description = "
-                Name of the organization hosting the Subversion service.
-              ";
-            };
-
-            url = mkOption {
-              default = null;
-              description = "
-                URL of the website of the organization hosting the Subversion service.
-              ";
-            };
-
-            logo = mkOption {
-              default = null;
-              description = "
-                Logo the organization hosting the Subversion service.
-              ";
-            };
-
-          };
-
-        };
-
-      };
-
     };
 
   };
-- 
GitLab


From 7571055ad320acbc9b8ec1422bb7b5c14704c39d Mon Sep 17 00:00:00 2001
From: Nicolas Pierron <nicolas.b.pierron@gmail.com>
Date: Thu, 5 Nov 2009 18:21:03 +0000
Subject: [PATCH 1963/5331] * Declare options for sub-services. * Add
 deprecated options for "serviceType", "serviceName", "function" and  
 "config" without changing the behavior.

svn path=/nixos/trunk/; revision=18150
---
 modules/module-list.nix                       |   1 +
 .../web-servers/apache-httpd/default.nix      |  27 ++--
 .../apache-httpd/per-server-options.nix       |   9 +-
 .../web-servers/apache-httpd/services.nix     | 131 ++++++++++++++++++
 4 files changed, 141 insertions(+), 27 deletions(-)
 create mode 100644 modules/services/web-servers/apache-httpd/services.nix

diff --git a/modules/module-list.nix b/modules/module-list.nix
index 6a3a36d5229..4addbda5760 100644
--- a/modules/module-list.nix
+++ b/modules/module-list.nix
@@ -94,6 +94,7 @@
   ./services/ttys/mingetty.nix
   ./services/web-servers/apache-httpd/default.nix
   ./services/web-servers/apache-httpd/per-server-options.nix
+  ./services/web-servers/apache-httpd/services.nix
   ./services/web-servers/jboss.nix
   ./services/web-servers/tomcat.nix
   ./services/x11/desktop-managers/default.nix
diff --git a/modules/services/web-servers/apache-httpd/default.nix b/modules/services/web-servers/apache-httpd/default.nix
index 53116191b70..76b2bea4e9f 100644
--- a/modules/services/web-servers/apache-httpd/default.nix
+++ b/modules/services/web-servers/apache-httpd/default.nix
@@ -41,25 +41,14 @@ let
   # extensions of NixOS.
   callSubservices = serverInfo: defs:
     let f = svc:
-      let 
-        svcFunction =
-          if svc ? function then svc.function
-          else import "${./.}/${if svc ? serviceType then svc.serviceType else svc.serviceName}.nix";
-        config = addDefaultOptionValues res.options
-          (if svc ? config then svc.config else svc);
-        defaults = {
-          extraConfig = "";
-          extraModules = [];
-          extraModulesPre = [];
-          extraPath = [];
-          extraServerPath = [];
-          globalEnvVars = [];
-          robotsEntries = "";
-          startupScript = "";
-          options = {};
-        };
-        res = defaults // svcFunction {inherit config pkgs serverInfo servicesPath;};
-      in res;
+      rec {
+        config =
+          if res ? options then
+            addDefaultOptionValues res.options svc.config
+          else
+            svc.config;
+        res = svc // svc.function {inherit config pkgs serverInfo servicesPath;};
+      }.res;
     in map f defs;
 
 
diff --git a/modules/services/web-servers/apache-httpd/per-server-options.nix b/modules/services/web-servers/apache-httpd/per-server-options.nix
index 0029e1293cb..6e98b8685fa 100644
--- a/modules/services/web-servers/apache-httpd/per-server-options.nix
+++ b/modules/services/web-servers/apache-httpd/per-server-options.nix
@@ -3,7 +3,7 @@
 # has additional options that affect the web server as a whole, like
 # the user/group to run under.)
 
-{options, config, pkgs, ...}@moduleArguments:
+{options, config, pkgs, ...}:
 
 let
   inherit (pkgs.lib) mkOption addDefaultOptionValues types;
@@ -122,13 +122,6 @@ let
       ";
     };
 
-    extraSubservices = mkOption {
-      default = [];
-      description = "
-        Extra subservices to enable in the webserver.
-      ";
-    };
-
     enableUserDir = mkOption {
       default = false;
       description = "
diff --git a/modules/services/web-servers/apache-httpd/services.nix b/modules/services/web-servers/apache-httpd/services.nix
new file mode 100644
index 00000000000..f8d95f955cf
--- /dev/null
+++ b/modules/services/web-servers/apache-httpd/services.nix
@@ -0,0 +1,131 @@
+{options, config, pkgs, ...}:
+
+let
+  inherit (pkgs.lib) mkOption addDefaultOptionValues types;
+
+  mainServerArgs = {
+    config = config.services.httpd;
+    options = options.services.httpd;
+  };
+
+  subServiceOptions = {options, config, ...}: {
+    options = {
+
+      extraConfig = mkOption {
+        default = "";
+        description = "Not documented yet.";
+      };
+
+      extraModules = mkOption {
+        default = [];
+        description = "Not documented yet.";
+      };
+
+      extraModulesPre = mkOption {
+        default = [];
+        description = "Not documented yet.";
+      };
+
+      extraPath = mkOption {
+        default = [];
+        description = "Not documented yet.";
+      };
+
+      extraServerPath = mkOption {
+        default = [];
+        description = "Not documented yet.";
+      };
+
+      globalEnvVars = mkOption {
+        default = [];
+        description = "Not documented yet.";
+      };
+
+      robotsEntries = mkOption {
+        default = "";
+        description = "Not documented yet.";
+      };
+
+      startupScript = mkOption {
+        default = "";
+        description = "Not documented yet.";
+      };
+
+
+      serviceType = mkOption {
+        default = "";
+        description = "Obsolete name of <option>serviceName</option>.";
+        # serviceType is the old name of serviceName.
+        apply = x: config.serviceName;
+      };
+
+      serviceName = mkOption {
+        default = "";
+        example = "trac";
+        description = "
+          (Deprecated)
+
+          Identify a service by the name of the file containing it.  The
+          service expression is contained inside
+          <filename>./modules/services/web-servers/apache-httpd</filename>
+          directory.
+
+          Due to lack of documentation, this option will be replaced by
+          enable flags.
+        ";
+
+        # serviceName is the new name of serviceType.
+        extraConfigs = map (def: def.value) options.serviceType.definitions;
+      };
+
+      function = mkOption {
+        default = null;
+        description = "
+          (Deprecated) Add a function which configure the current sub-service.
+        ";
+        apply = f:
+          if isNull f then
+            import "${./.}/${config.serviceName}.nix"
+          else
+            f;
+      };
+
+      config = mkOption {
+        default = {};
+        description = "
+          (Deprecated) Define option values of the current sub-service.
+        ";
+      };
+
+    };
+  };
+
+
+  perServerOptions = {config, ...}: {
+
+    extraSubservices = mkOption {
+      default = [];
+      type = with types; listOf optionSet;
+      description = "
+        Extra subservices to enable in the webserver.
+      ";
+      options = [ subServiceOptions ];
+    };
+
+  };
+
+in
+
+{
+  options = {
+    services.httpd = {
+
+      virtualHosts = mkOption {
+        options = [ perServerOptions ];
+      };
+
+    }
+    // perServerOptions mainServerArgs
+    ;
+  };
+}
-- 
GitLab


From ca00f6f3f8e0d7859e08ffd16baaae7c1a64322c Mon Sep 17 00:00:00 2001
From: Nicolas Pierron <nicolas.b.pierron@gmail.com>
Date: Thu, 5 Nov 2009 18:21:09 +0000
Subject: [PATCH 1964/5331] * Fix nix-build errors of tests.

svn path=/nixos/trunk/; revision=18151
---
 tests/quake3.nix |  2 +-
 tests/trac.nix   | 29 ++++++++++++++---------------
 2 files changed, 15 insertions(+), 16 deletions(-)

diff --git a/tests/quake3.nix b/tests/quake3.nix
index ae2f276880e..4ee6d63619e 100644
--- a/tests/quake3.nix
+++ b/tests/quake3.nix
@@ -20,7 +20,7 @@ rec {
     { server =
         { config, pkgs, ... }:
 
-        { jobs = pkgs.lib.singleton
+        { jobs.quake3Server =
             { name = "quake3-server";
               startOn = "startup";
               exec =
diff --git a/tests/trac.nix b/tests/trac.nix
index 785c75b8132..6db5a382802 100644
--- a/tests/trac.nix
+++ b/tests/trac.nix
@@ -16,7 +16,7 @@ rec {
         services.nfsKernel.exports = ''
           /repos 192.168.1.0/255.255.255.0(rw,no_root_squash)
         '';
-	services.nfsKernel.createMountPoints = true;
+        services.nfsKernel.createMountPoints = true;
       };
 
     postgresql =
@@ -24,13 +24,13 @@ rec {
       {
         services.sshd.enable = true;
         services.postgresql.enable = true;
-    	services.postgresql.enableTCPIP = true;
+        services.postgresql.enableTCPIP = true;
         services.postgresql.authentication = ''
           # Generated file; do not edit!
           local all all                trust
           host  all all 127.0.0.1/32   trust
-	  host  all all ::1/128        trust
-	  host  all all 192.168.1.0/24 trust
+          host  all all ::1/128        trust
+          host  all all 192.168.1.0/24 trust
         '';
       };
 
@@ -38,17 +38,16 @@ rec {
       {config, pkgs, ...}:
       {
         fileSystems = pkgs.lib.mkOverride 50 {} 
-	[ 
-	  { mountPoint = "/repos";
-	    device = "storage:/repos"; } 
-	];
+        [ 
+          { mountPoint = "/repos";
+            device = "storage:/repos"; } 
+        ];
       
         services.portmap.enable = true;
-        services.nfsKernel.enable = true;
         services.httpd.enable = true;
         services.httpd.adminAddr = "root@localhost";
         services.httpd.extraSubservices = [ { serviceType = "trac"; } ];
-	environment.systemPackages = [ pkgs.pythonPackages.trac pkgs.subversion ];
+        environment.systemPackages = [ pkgs.pythonPackages.trac pkgs.subversion ];
       };
       
     client = 
@@ -57,17 +56,17 @@ rec {
         services.xserver.enable = true;
         services.xserver.displayManager.slim.enable = false;
         services.xserver.displayManager.kdm.enable = true;
-	services.xserver.displayManager.kdm.extraConfig =
+        services.xserver.displayManager.kdm.extraConfig =
           ''
             [X-:0-Core]
             AutoLoginEnable=true
             AutoLoginUser=alice
             AutoLoginPass=foobar
           '';
-	services.xserver.desktopManager.default = "kde4";
-	services.xserver.desktopManager.kde4.enable = true;
-	users.extraUsers = pkgs.lib.singleton { 
-	  name = "alice";
+        services.xserver.desktopManager.default = "kde4";
+        services.xserver.desktopManager.kde4.enable = true;
+        users.extraUsers = pkgs.lib.singleton { 
+          name = "alice";
           description = "Alice Foobar";
           home = "/home/alice";
           createHome = true;
-- 
GitLab


From 72f804c9b250d8da4c209dc50b5ebcc0f1d315f6 Mon Sep 17 00:00:00 2001
From: Nicolas Pierron <nicolas.b.pierron@gmail.com>
Date: Thu, 5 Nov 2009 19:24:02 +0000
Subject: [PATCH 1965/5331] * Fix subversion test and change the name of the
 "config" option to   "configuration" because it may interfered with
 sub-modules keywords.

svn path=/nixos/trunk/; revision=18155
---
 modules/services/web-servers/apache-httpd/default.nix  | 4 ++--
 modules/services/web-servers/apache-httpd/services.nix | 4 +---
 tests/subversion.nix                                   | 8 +++++---
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/modules/services/web-servers/apache-httpd/default.nix b/modules/services/web-servers/apache-httpd/default.nix
index 76b2bea4e9f..7e3067510d3 100644
--- a/modules/services/web-servers/apache-httpd/default.nix
+++ b/modules/services/web-servers/apache-httpd/default.nix
@@ -44,9 +44,9 @@ let
       rec {
         config =
           if res ? options then
-            addDefaultOptionValues res.options svc.config
+            addDefaultOptionValues res.options svc.configuration
           else
-            svc.config;
+            svc.configuration;
         res = svc // svc.function {inherit config pkgs serverInfo servicesPath;};
       }.res;
     in map f defs;
diff --git a/modules/services/web-servers/apache-httpd/services.nix b/modules/services/web-servers/apache-httpd/services.nix
index f8d95f955cf..a8b69be636e 100644
--- a/modules/services/web-servers/apache-httpd/services.nix
+++ b/modules/services/web-servers/apache-httpd/services.nix
@@ -53,14 +53,12 @@ let
 
 
       serviceType = mkOption {
-        default = "";
         description = "Obsolete name of <option>serviceName</option>.";
         # serviceType is the old name of serviceName.
         apply = x: config.serviceName;
       };
 
       serviceName = mkOption {
-        default = "";
         example = "trac";
         description = "
           (Deprecated)
@@ -90,7 +88,7 @@ let
             f;
       };
 
-      config = mkOption {
+      configuration = mkOption {
         default = {};
         description = "
           (Deprecated) Define option values of the current sub-service.
diff --git a/tests/subversion.nix b/tests/subversion.nix
index 82ada4576eb..5fed5ba77c4 100644
--- a/tests/subversion.nix
+++ b/tests/subversion.nix
@@ -56,9 +56,11 @@ rec {
           services.httpd.adminAddr = "e.dolstra@tudelft.nl";
           services.httpd.extraSubservices =
             [ { serviceType = "subversion";
-                urlPrefix = "";
-                dataDir = "/data/subversion";
-                userCreationDomain = "192.168.0.0/16";
+                configuration = {
+                  urlPrefix = "";
+                  dataDir = "/data/subversion";
+                  userCreationDomain = "192.168.0.0/16";
+                };
               }
             ];
           nixpkgs.config.packageOverrides = overrides;
-- 
GitLab


From fe1f084728b85d70c2e451719ba8d8f7b05ea250 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Thu, 5 Nov 2009 21:35:36 +0000
Subject: [PATCH 1966/5331] Adding a new xorg driver: unichrome

svn path=/nixos/trunk/; revision=18163
---
 modules/services/x11/xserver.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/modules/services/x11/xserver.nix b/modules/services/x11/xserver.nix
index 6b66cf57b93..8cb70ca911e 100644
--- a/modules/services/x11/xserver.nix
+++ b/modules/services/x11/xserver.nix
@@ -23,6 +23,7 @@ let
     nv =         { modules = [ xorg.xf86videonv ]; };
     ati =        { modules = [ xorg.xf86videoati ]; };
     openchrome = { modules = [ xorg.xf86videoopenchrome ]; };
+    unichrome  = { modules = [ pkgs.xorgVideoUnichrome ]; };
     cirrus =     { modules = [ xorg.xf86videocirrus ]; };
     vmware =     { modules = [ xorg.xf86videovmware ]; };
     virtualbox = { modules = [ kernelPackages.virtualboxGuestAdditions ]; };
-- 
GitLab


From 3e9665dd963f0bc64c861bc1d0cdcd7349a72595 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 6 Nov 2009 00:59:03 +0000
Subject: [PATCH 1967/5331] * X server autoconfiguration.  Rather than
 specifying a fixed video   driver (in services.xserver.videoDriver), the X
 server is now given   a set of drivers, and will use PCI ids to find the
 right one.

  The only problem is that the choice of OpenGL driver (the
  /var/run/opengl-driver symlink) depends on what driver is selected
  at runtime (i.e. the NVIDIA implementation for "nvidia", and Mesa
  for all other drivers).  However this isn't a big problem right now
  since "nvidia" isn't included in the default set of drivers anyway
  for legal reasons.

* `services.xserver.resolutions' now defaults to [], meaning that the
  X server should figure out the desired resolution(s) itself.
  Likewise, `services.xserver.defaultDepth' defaults to 0 to let the X
  server figure it out.

* Removed some options from xorg.conf that no longer appear needed
  ("Composite" and the DRI "Mode").

svn path=/nixos/trunk/; revision=18176
---
 modules/services/x11/xserver.nix   | 230 ++++++++++++++---------------
 modules/virtualisation/qemu-vm.nix |   6 +-
 2 files changed, 117 insertions(+), 119 deletions(-)

diff --git a/modules/services/x11/xserver.nix b/modules/services/x11/xserver.nix
index 8cb70ca911e..2d432e831f7 100644
--- a/modules/services/x11/xserver.nix
+++ b/modules/services/x11/xserver.nix
@@ -11,27 +11,29 @@ let
   xorg = pkgs.xorg;
 
 
-  # Map the video driver setting to a driver.
+  # Map video driver names to driver packages.
   knownVideoDrivers = {
-    nvidia =     { modules = [ kernelPackages.nvidia_x11 ]; };
-    nvidiaLegacy =     { modules = [ kernelPackages.nvidia_x11_legacy ]; };
-    vesa =       { modules = [ xorg.xf86videovesa ]; };
-    vga =        { modules = [ xorg.xf86videovga ]; };
-    sis =        { modules = [ xorg.xf86videosis ]; };
-    i810 =       { modules = [ xorg.xf86videoi810 ]; };
-    intel =      { modules = [ xorg.xf86videointel ]; };
-    nv =         { modules = [ xorg.xf86videonv ]; };
-    ati =        { modules = [ xorg.xf86videoati ]; };
-    openchrome = { modules = [ xorg.xf86videoopenchrome ]; };
-    unichrome  = { modules = [ pkgs.xorgVideoUnichrome ]; };
-    cirrus =     { modules = [ xorg.xf86videocirrus ]; };
-    vmware =     { modules = [ xorg.xf86videovmware ]; };
-    virtualbox = { modules = [ kernelPackages.virtualboxGuestAdditions ]; };
+    ati          = { modules = [ xorg.xf86videoati ]; };
+    cirrus       = { modules = [ xorg.xf86videocirrus ]; };
+    i810         = { modules = [ xorg.xf86videoi810 ]; };
+    intel        = { modules = [ xorg.xf86videointel ]; };
+    nv           = { modules = [ xorg.xf86videonv ]; };
+    nvidia       = { modules = [ kernelPackages.nvidia_x11 ]; };
+    nvidiaLegacy = { modules = [ kernelPackages.nvidia_x11_legacy ]; name = "nvidia"; };
+    openchrome   = { modules = [ xorg.xf86videoopenchrome ]; };
+    sis          = { modules = [ xorg.xf86videosis ]; };
+    unichrome    = { modules = [ pkgs.xorgVideoUnichrome ]; };
+    vesa         = { modules = [ xorg.xf86videovesa ]; };
+    virtualbox   = { modules = [ kernelPackages.virtualboxGuestAdditions ]; name = "vboxvideo"; };
+    vmware       = { modules = [ xorg.xf86videovmware ]; };
   };
 
-  videoDriver = cfg.videoDriver;
+  driverNames =
+    optional (cfg.videoDriver != null) cfg.videoDriver ++ cfg.videoDrivers;
 
-  videoDriverInfo = attrByPath [videoDriver] (throw "unknown video driver: `${videoDriver}'") knownVideoDrivers;
+  drivers = flip map driverNames
+    (name: { inherit name; } //
+      attrByPath [name] (throw "unknown video driver `${name}'") knownVideoDrivers);
 
 
   fontsForXServer =
@@ -158,17 +160,30 @@ in
       };
 
       resolutions = mkOption {
-        default = [ {x = 1024; y = 768;} {x = 800; y = 600;} {x = 640; y = 480;} ];
+        default = [];
         description = ''
-          The screen resolutions for the X server.  The first element is the default resolution.
+          The screen resolutions for the X server.  The first element
+          is the default resolution.  If this list is empty, the X
+          server will automatically configure the resolution.
         '';
       };
 
       videoDriver = mkOption {
-        default = "vesa";
+        default = null;
         example = "i810";
         description = ''
-          The name of the video driver for your graphics card.
+          The name of the video driver for your graphics card.  This
+          option is obsolete; please set the
+          <option>videoDrivers</option> instead.
+        '';
+      };
+
+      videoDrivers = mkOption {
+        example = [ "vesa" ];
+        description = ''
+          The names of the video drivers that the X server should
+          support.  The X server will try all of the drivers listed
+          here until it finds one that supports your video card.
         '';
       };
 
@@ -190,14 +205,6 @@ in
         '';
       };
 
-      isClone = mkOption {
-        default = true;
-        example = false;
-        description = ''
-          Whether to enable the X server clone mode for dual-head.
-        '';
-      };
-
       layout = mkOption {
         default = "us";
         description = ''
@@ -266,7 +273,7 @@ in
       };
 
       defaultDepth = mkOption {
-        default = 24;
+        default = 0;
         example = 8;
         description = "Default colour depth.";
       };
@@ -321,9 +328,9 @@ in
       };
 
     boot.extraModulePackages =
-      optional (cfg.videoDriver == "nvidia") kernelPackages.nvidia_x11 ++ 
-      optional (cfg.videoDriver == "nvidiaLegacy") kernelPackages.nvidia_x11_legacy ++
-      optional (cfg.videoDriver == "virtualbox") kernelPackages.virtualboxGuestAdditions;
+      optional (elem "nvidia" driverNames) kernelPackages.nvidia_x11 ++ 
+      optional (elem "nvidiaLegacy" driverNames) kernelPackages.nvidia_x11_legacy ++
+      optional (elem "virtualbox" driverNames) kernelPackages.virtualboxGuestAdditions;
 
     environment.etc = optionals cfg.exportConfiguration
       [ { source = "${configFile}";
@@ -344,13 +351,13 @@ in
         xorg.xsetroot
         xorg.xprop
       ]
-      ++ optional (videoDriver == "nvidia") kernelPackages.nvidia_x11
-      ++ optional (videoDriver == "nvidiaLegacy") kernelPackages.nvidia_x11_legacy;
+      ++ optional (elem "nvidia" driverNames) kernelPackages.nvidia_x11
+      ++ optional (elem "nvidiaLegacy" driverNames) kernelPackages.nvidia_x11_legacy;
       
     environment.systemPackages = config.environment.x11Packages;
     
     services.hal.packages = halConfigFiles ++
-      optional (videoDriver == "virtualbox") kernelPackages.virtualboxGuestAdditions;
+      optional (elem "virtualbox" driverNames) kernelPackages.virtualboxGuestAdditions;
 
     jobs.xserver =
       { startOn = if cfg.autorun then "hal" else "never";
@@ -358,11 +365,12 @@ in
         environment =
           { FONTCONFIG_FILE = "/etc/fonts/fonts.conf"; # !!! cleanup
             XKB_BINDIR = "${xorg.xkbcomp}/bin"; # Needed for the Xkb extension.
-          } // optionalAttrs (videoDriver != "nvidia") {
+          } # !!! Depends on the driver selected at runtime.
+            // optionalAttrs (!elem "nvidia" driverNames) {
             XORG_DRI_DRIVER_PATH = "${pkgs.mesa}/lib/dri";
-          } // optionalAttrs (videoDriver == "nvidia") {
+          } // optionalAttrs (elem "nvidia" driverNames) {
             LD_LIBRARY_PATH = "${xorg.libX11}/lib:${xorg.libXext}/lib:${kernelPackages.nvidia_x11}/lib";
-          } // optionalAttrs (videoDriver == "nvidiaLegacy") {
+          } // optionalAttrs (elem "nvidiaLegacy" driverNames) {
             LD_LIBRARY_PATH = "${xorg.libX11}/lib:${xorg.libXext}/lib:${kernelPackages.nvidia_x11_legacy}/lib";
           } // cfg.displayManager.job.environment;
 
@@ -377,16 +385,15 @@ in
             done
         
             rm -f /var/run/opengl-driver
-            ${if videoDriver == "nvidia"
-              then ''
+            ${# !!! The OpenGL driver depends on what's detected at runtime.
+              if elem "nvidia" driverNames then ''
                 ln -sf ${kernelPackages.nvidia_x11} /var/run/opengl-driver
               ''
-	      else if videoDriver == "nvidiaLegacy"
-              then ''
+	      else if elem "nvidiaLegacy" driverNames then ''
                 ln -sf ${kernelPackages.nvidia_x11_legacy} /var/run/opengl-driver
               ''
-              else if cfg.driSupport
-              then "ln -sf ${pkgs.mesa} /var/run/opengl-driver"
+              else if cfg.driSupport then
+                "ln -sf ${pkgs.mesa} /var/run/opengl-driver"
               else ""
              }
 
@@ -409,8 +416,11 @@ in
         "-xkbdir" "${pkgs.xkeyboard_config}/etc/X11/xkb"
       ] ++ optional (!cfg.enableTCP) "-nolisten tcp";
 
-    services.xserver.modules = videoDriverInfo.modules
-      ++ [ xorg.xorgserver xorg.xf86inputevdev ];
+    services.xserver.modules =
+      concatLists (catAttrs "modules" drivers) ++
+      [ xorg.xorgserver
+        xorg.xf86inputevdev
+      ];
     
     services.xserver.config =
       ''
@@ -423,85 +433,71 @@ in
         EndSection
 
         Section "Monitor"
+          Identifier "Monitor[0]"
           ${cfg.monitorSection}
         EndSection
 
-        Section "Device"
-          ${cfg.deviceSection}
-        EndSection
-
         Section "ServerLayout"
+          Identifier "Layout[all]"
           ${cfg.serverLayoutSection}
+          # Reference the Screen sections for each driver.  This will
+          # cause the X server to try each in turn.
+          ${flip concatMapStrings drivers (d: ''
+            Screen "Screen-${d.name}[0]"
+          '')}
         EndSection
 
-        Section "Screen"
-          Identifier "Screen[0]"
-          Device "Device[0]"
-          Monitor "Monitor[0]"
-
-          ${optionalString (cfg.defaultDepth != 0) ''
-            DefaultDepth ${toString cfg.defaultDepth}
-          ''}
-
-          ${optionalString (cfg.videoDriver == "nvidia") ''
-            Option "RandRRotation" "on"
-          ''}
-
-          ${if cfg.videoDriver != "virtualbox" then
-            let
-              f = depth:
-                ''
-                  SubSection "Display"
-                    Depth ${toString depth}
-                    Modes ${concatMapStrings (res: ''"${toString res.x}x${toString res.y}"'') cfg.resolutions}
-                    ${cfg.extraDisplaySettings}
-                    ${optionalString (cfg.virtualScreen != null)
-                      "Virtual ${toString cfg.virtualScreen.x} ${toString cfg.virtualScreen.y}"}
-                  EndSubSection
-                '';
-            in concatMapStrings f [8 16 24]
-	    else
-	      "" # The VirtualBox driver does not support dynamic resizing if resolutions are defined
-          }
-
-        EndSection
-
-        Section "Extensions"
-          ${optionalString (cfg.videoDriver == "nvidia" || cfg.videoDriver == "nvidiaLegacy" || cfg.videoDriver == "i810" || cfg.videoDriver == "ati" || cfg.videoDriver == "radeonhd") ''
-            Option "Composite" "Enable"
-          ''}
-        EndSection
-
-        Section "DRI"
-          Mode 0666 # !!! FIX THIS!
-        EndSection
-      '';
-
-    services.xserver.monitorSection =
-      ''
-        Identifier "Monitor[0]"
-      '';
-      
-    services.xserver.deviceSection =
-      ''
-        Identifier "Device[0]"
-        Driver "${if cfg.videoDriver == "nvidiaLegacy" then "nvidia" 
-	          else if cfg.videoDriver == "virtualbox" then "vboxvideo"
-	          else cfg.videoDriver}"
-
-        ${if cfg.videoDriver == "nvidiaLegacy" then ''
-        # This option allows suspending with a nvidiaLegacy card
-	Option "NvAGP" "1"''
-        else ""}
-        # !!! Is the "Clone" option still useful?
-        Option "Clone" "${if cfg.isClone then "on" else "off"}"
+        # For each supported driver, add a "Device" and "Screen"
+        # section.
+        ${flip concatMapStrings drivers (driver: ''
+        
+          Section "Device"
+            Identifier "Device-${driver.name}[0]"
+            Driver "${driver.name}"
+            ${optionalString (driver.name == "nvidiaLegacy") ''
+              # This option allows suspending with a nvidiaLegacy card
+              Option "NvAGP" "1"
+            ''}
+            ${cfg.deviceSection}
+          EndSection
+
+          Section "Screen"
+            Identifier "Screen-${driver.name}[0]"
+            Device "Device-${driver.name}[0]"
+
+            ${optionalString (cfg.defaultDepth != 0) ''
+              DefaultDepth ${toString cfg.defaultDepth}
+            ''}
+
+            ${optionalString (driver.name == "nvidia") ''
+              Option "RandRRotation" "on"
+            ''}
+
+            ${optionalString
+                (driver.name != "virtualbox" && (cfg.resolutions != []
+                 || cfg.extraDisplaySettings != "" || cfg.virtualScreen != null)) (
+              let
+                f = depth:
+                  ''
+                    SubSection "Display"
+                      Depth ${toString depth}
+                      ${optionalString (cfg.resolutions != [])
+                        "Modes ${concatMapStrings (res: ''"${toString res.x}x${toString res.y}"'') cfg.resolutions}"}
+                      ${cfg.extraDisplaySettings}
+                      ${optionalString (cfg.virtualScreen != null)
+                        "Virtual ${toString cfg.virtualScreen.x} ${toString cfg.virtualScreen.y}"}
+                    EndSubSection
+                  '';
+              in concatMapStrings f [8 16 24]
+            )}
+          
+          EndSection
+        '')}
       '';
 
-    services.xserver.serverLayoutSection =
-      ''
-        Identifier "Layout[all]"
-        Screen "Screen[0]"
-      '';
+    # The default set of supported video drivers.  !!! We'd like "nv"
+    # here, but it segfaults the X server.  Idem for "vmware".
+    services.xserver.videoDrivers = [ "ati" "cirrus" "intel" "vesa" ];
 
   };
 
diff --git a/modules/virtualisation/qemu-vm.nix b/modules/virtualisation/qemu-vm.nix
index 37da613eed2..87138ed5c52 100644
--- a/modules/virtualisation/qemu-vm.nix
+++ b/modules/virtualisation/qemu-vm.nix
@@ -135,8 +135,10 @@ in
 
   # When building a regular system configuration, override whatever
   # video driver the host uses.
-  services.xserver.videoDriver = pkgs.lib.mkOverride 50 {} "vesa";
-  services.xserver.defaultDepth = pkgs.lib.mkOverride 50 {} 16;
+  services.xserver.videoDriver = pkgs.lib.mkOverride 50 {} null;
+  services.xserver.videoDrivers = pkgs.lib.mkOverride 50 {} [ "cirrus" "vesa" ];
+  services.xserver.defaultDepth = pkgs.lib.mkOverride 50 {} 0;
+  services.xserver.resolutions = pkgs.lib.mkOverride 50 {} [];
 
   # Wireless won't work in the VM.
   networking.enableWLAN = pkgs.lib.mkOverride 50 {} false;
-- 
GitLab


From 194a24bcf1afd384a588ba78b672ebda7c0ce186 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 6 Nov 2009 01:00:44 +0000
Subject: [PATCH 1968/5331] * Support a `system' argument for if you want to do
 hacky things like   change a NixOS installation from x86_64-linux to
 i686-linux (or vice   versa if you have distributed builds enabled - I used
 this upgrade   from 32-bit to 64-bit NixOS).

svn path=/nixos/trunk/; revision=18177
---
 default.nix | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/default.nix b/default.nix
index cf16a81acfb..e63a76cd03f 100644
--- a/default.nix
+++ b/default.nix
@@ -1,13 +1,18 @@
 { configuration ? import ./lib/from-env.nix "NIXOS_CONFIG" /etc/nixos/configuration.nix
+, system ? builtins.currentSystem
 }:
 
 let
   
-  eval = import ./lib/eval-config.nix { modules = [ configuration ]; };
+  eval = import ./lib/eval-config.nix {
+    inherit system;
+    modules = [ configuration ];
+  };
 
   inherit (eval) config pkgs;
 
   vmConfig = (import ./lib/eval-config.nix {
+    inherit system;
     modules = [ configuration ./modules/virtualisation/qemu-vm.nix ];
   }).config;
     
-- 
GitLab


From 124096e4183780d78108e23c69b501345f4032ed Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 6 Nov 2009 09:22:00 +0000
Subject: [PATCH 1969/5331] * Remember the original symbolic driver name.

svn path=/nixos/trunk/; revision=18185
---
 modules/services/x11/xserver.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/modules/services/x11/xserver.nix b/modules/services/x11/xserver.nix
index 2d432e831f7..d58e75bbad9 100644
--- a/modules/services/x11/xserver.nix
+++ b/modules/services/x11/xserver.nix
@@ -19,12 +19,12 @@ let
     intel        = { modules = [ xorg.xf86videointel ]; };
     nv           = { modules = [ xorg.xf86videonv ]; };
     nvidia       = { modules = [ kernelPackages.nvidia_x11 ]; };
-    nvidiaLegacy = { modules = [ kernelPackages.nvidia_x11_legacy ]; name = "nvidia"; };
+    nvidiaLegacy = { modules = [ kernelPackages.nvidia_x11_legacy ]; driverName = "nvidia"; };
     openchrome   = { modules = [ xorg.xf86videoopenchrome ]; };
     sis          = { modules = [ xorg.xf86videosis ]; };
     unichrome    = { modules = [ pkgs.xorgVideoUnichrome ]; };
     vesa         = { modules = [ xorg.xf86videovesa ]; };
-    virtualbox   = { modules = [ kernelPackages.virtualboxGuestAdditions ]; name = "vboxvideo"; };
+    virtualbox   = { modules = [ kernelPackages.virtualboxGuestAdditions ]; driverName = "vboxvideo"; };
     vmware       = { modules = [ xorg.xf86videovmware ]; };
   };
 
@@ -32,7 +32,7 @@ let
     optional (cfg.videoDriver != null) cfg.videoDriver ++ cfg.videoDrivers;
 
   drivers = flip map driverNames
-    (name: { inherit name; } //
+    (name: { inherit name; driverName = name; } //
       attrByPath [name] (throw "unknown video driver `${name}'") knownVideoDrivers);
 
 
@@ -453,7 +453,7 @@ in
         
           Section "Device"
             Identifier "Device-${driver.name}[0]"
-            Driver "${driver.name}"
+            Driver "${driver.driverName}"
             ${optionalString (driver.name == "nvidiaLegacy") ''
               # This option allows suspending with a nvidiaLegacy card
               Option "NvAGP" "1"
-- 
GitLab


From 5fc4590ce56dda56e02f1e980452838952e10812 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 6 Nov 2009 09:26:36 +0000
Subject: [PATCH 1970/5331] * Fix indentation.

svn path=/nixos/branches/upstart-0.6/; revision=18186
---
 modules/system/upstart/upstart.nix | 247 +++++++++++++++--------------
 1 file changed, 125 insertions(+), 122 deletions(-)

diff --git a/modules/system/upstart/upstart.nix b/modules/system/upstart/upstart.nix
index bb6a4f9a117..42ac9899673 100644
--- a/modules/system/upstart/upstart.nix
+++ b/modules/system/upstart/upstart.nix
@@ -73,10 +73,12 @@ let
           echo "$jobText" > $out/etc/event.d/${job.name}
         '';
 
+        
   jobs =
     [pkgs.upstart] # for the built-in logd job
     ++ map (job: job.upstartPkg) (attrValues config.jobs);
 
+    
   # Create an etc/event.d directory containing symlinks to the
   # specified list of Upstart job files.
   jobsDir = pkgs.runCommand "upstart-jobs" {inherit jobs;}
@@ -93,132 +95,133 @@ let
       done
     ''; # */
 
-  # !! remove extra indentations.
+
   jobOptions = {
 
-        name = mkOption {
-          # !!! The type should ensure that this could be a filename.
-          type = types.string;
-          example = "sshd";
-          description = ''
-            Name of the Upstart job.
-          '';
-        };
-
-        buildHook = mkOption {
-          type = types.string;
-          default = "true";
-          description = ''
-            Command run while building the Upstart job.  Can be used
-            to perform simple regression tests (e.g., the Apache
-            Upstart job uses it to check the syntax of the generated
-            <filename>httpd.conf</filename>.
-          '';
-        };
-
-        description = mkOption {
-          type = types.string;
-          default = "(no description given)";
-          description = ''
-            A short description of this job.
-          '';
-        };
-
-        startOn = mkOption {
-          # !!! Re-enable this once we're on Upstart >= 0.6.
-          #type = types.string; 
-          default = "";
-          description = ''
-            The Upstart event that triggers this job to be started.
-            If empty, the job will not start automatically.
-          '';
-        };
-
-        stopOn = mkOption {
-          type = types.string;
-          default = "shutdown";
-          description = ''
-            The Upstart event that triggers this job to be stopped.
-          '';
-        };
-
-        preStart = mkOption {
-          type = types.string;
-          default = "";
-          description = ''
-            Shell commands executed before the job is started
-            (i.e. before the job's main process is started).
-          '';
-        };
-
-        postStop = mkOption {
-          type = types.string;
-          default = "";
-          description = ''
-            Shell commands executed after the job has stopped
-            (i.e. after the job's main process has terminated).
-          '';
-        };
-
-        exec = mkOption {
-          type = types.string;
-          default = "";
-          description = ''
-            Command to start the job's main process.  If empty, the
-            job has no main process, but can still have pre/post-start
-            and pre/post-stop scripts, and is considered "running"
-            until it is stopped.
-          '';
-        };
-
-        script = mkOption {
-          type = types.string;
-          default = "";
-          description = ''
-            Shell commands executed as the job's main process.  Can be
-            specified instead of the <varname>exec</varname> attribute.
-          '';
-        };
-
-        respawn = mkOption {
-          type = types.bool;
-          default = true;
-          description = ''
-            Whether to restart the job automatically if its process
-            ends unexpectedly.
-          '';
-        };
-
-        task = mkOption {
-          type = types.bool;
-          default = false;
-          description = ''
-            Whether this job is a task rather than a service.  Tasks
-            are executed only once, while services are restarted when
-            they exit.
-          '';
-        };
-
-        environment = mkOption {
-          type = types.attrs;
-          default = {};
-          example = { PATH = "/foo/bar/bin"; LANG = "nl_NL.UTF-8"; };
-          description = ''
-            Environment variables passed to the job's processes.
-          '';
-        };
-
-        extraConfig = mkOption {
-          type = types.string;
-          default = "";
-          example = "limit nofile 4096 4096";
-          description = ''
-            Additional Upstart stanzas not otherwise supported.
-          '';
-        };
+    name = mkOption {
+      # !!! The type should ensure that this could be a filename.
+      type = types.string;
+      example = "sshd";
+      description = ''
+        Name of the Upstart job.
+      '';
+    };
 
-      };
+    buildHook = mkOption {
+      type = types.string;
+      default = "true";
+      description = ''
+        Command run while building the Upstart job.  Can be used
+        to perform simple regression tests (e.g., the Apache
+        Upstart job uses it to check the syntax of the generated
+        <filename>httpd.conf</filename>.
+      '';
+    };
+
+    description = mkOption {
+      type = types.string;
+      default = "(no description given)";
+      description = ''
+        A short description of this job.
+      '';
+    };
+
+    startOn = mkOption {
+      # !!! Re-enable this once we're on Upstart >= 0.6.
+      #type = types.string; 
+      default = "";
+      description = ''
+        The Upstart event that triggers this job to be started.
+        If empty, the job will not start automatically.
+      '';
+    };
+
+    stopOn = mkOption {
+      type = types.string;
+      default = "shutdown";
+      description = ''
+        The Upstart event that triggers this job to be stopped.
+      '';
+    };
+
+    preStart = mkOption {
+      type = types.string;
+      default = "";
+      description = ''
+        Shell commands executed before the job is started
+        (i.e. before the job's main process is started).
+      '';
+    };
+
+    postStop = mkOption {
+      type = types.string;
+      default = "";
+      description = ''
+        Shell commands executed after the job has stopped
+        (i.e. after the job's main process has terminated).
+      '';
+    };
+
+    exec = mkOption {
+      type = types.string;
+      default = "";
+      description = ''
+        Command to start the job's main process.  If empty, the
+        job has no main process, but can still have pre/post-start
+        and pre/post-stop scripts, and is considered "running"
+        until it is stopped.
+      '';
+    };
 
+    script = mkOption {
+      type = types.string;
+      default = "";
+      description = ''
+        Shell commands executed as the job's main process.  Can be
+        specified instead of the <varname>exec</varname> attribute.
+      '';
+    };
+
+    respawn = mkOption {
+      type = types.bool;
+      default = true;
+      description = ''
+        Whether to restart the job automatically if its process
+        ends unexpectedly.
+      '';
+    };
+
+    task = mkOption {
+      type = types.bool;
+      default = false;
+      description = ''
+        Whether this job is a task rather than a service.  Tasks
+        are executed only once, while services are restarted when
+        they exit.
+      '';
+    };
+
+    environment = mkOption {
+      type = types.attrs;
+      default = {};
+      example = { PATH = "/foo/bar/bin"; LANG = "nl_NL.UTF-8"; };
+      description = ''
+        Environment variables passed to the job's processes.
+      '';
+    };
+
+    extraConfig = mkOption {
+      type = types.string;
+      default = "";
+      example = "limit nofile 4096 4096";
+      description = ''
+        Additional Upstart stanzas not otherwise supported.
+      '';
+    };
+
+  };
+
+  
   upstartJob = {name, config, ...}: {
     options = {
       upstartPkg = mkOption {
-- 
GitLab


From b581a56d79834fd7b89341e7db10a03acaa4837a Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 6 Nov 2009 09:36:35 +0000
Subject: [PATCH 1971/5331] * Define the Upstart package to use in one place.

svn path=/nixos/branches/upstart-0.6/; revision=18187
---
 modules/config/system-path.nix                 | 2 +-
 modules/services/networking/dhclient.nix       | 6 +++---
 modules/services/networking/gw6c.nix           | 4 +++-
 modules/services/x11/display-managers/kdm.nix  | 4 ++--
 modules/services/x11/display-managers/slim.nix | 4 ++--
 modules/system/activation/top-level.nix        | 6 +++---
 modules/system/boot/stage-2.nix                | 5 +++--
 modules/system/upstart/upstart.nix             | 7 ++++++-
 8 files changed, 23 insertions(+), 15 deletions(-)

diff --git a/modules/config/system-path.nix b/modules/config/system-path.nix
index c2605d0963e..50617ec91da 100644
--- a/modules/config/system-path.nix
+++ b/modules/config/system-path.nix
@@ -10,6 +10,7 @@ let
   requiredPackages =
     [ config.system.sbin.modprobe # must take precedence over module_init_tools
       config.system.sbin.mount # must take precedence over util-linux
+      config.system.build.upstart
       config.environment.nix
       pkgs.acl
       pkgs.attr
@@ -53,7 +54,6 @@ let
       pkgs.sysvtools
       pkgs.time
       pkgs.udev
-      pkgs.upstart
       pkgs.usbutils
       pkgs.utillinux
     ];
diff --git a/modules/services/networking/dhclient.nix b/modules/services/networking/dhclient.nix
index 9696c8b14aa..80451ce2a5a 100644
--- a/modules/services/networking/dhclient.nix
+++ b/modules/services/networking/dhclient.nix
@@ -26,13 +26,13 @@ let
           # hostnames in its config file, then it will never do
           # anything ever again ("couldn't resolve ..., giving up on
           # it"), so we silently lose time synchronisation.
-          ${pkgs.upstart}/sbin/initctl stop ntpd
+          ${config.system.build.upstart}/sbin/initctl stop ntpd
           
-          ${pkgs.upstart}/sbin/initctl emit ip-up
+          ${config.system.build.upstart}/sbin/initctl emit ip-up
       fi
 
       if test "$reason" = EXPIRE -o "$reason" = RELEASE; then
-          ${pkgs.upstart}/sbin/initctl emit ip-down
+          ${config.system.build.upstart}/sbin/initctl emit ip-down
       fi
     '';
   
diff --git a/modules/services/networking/gw6c.nix b/modules/services/networking/gw6c.nix
index 143fe57979a..d723766bb2c 100644
--- a/modules/services/networking/gw6c.nix
+++ b/modules/services/networking/gw6c.nix
@@ -6,10 +6,12 @@ let
 
   cfg = config.services.gw6c;
 
+  # !!! Move this from the services tree to the nixos tree.
   gw6cService = import (servicesPath + /gw6c) {
     inherit (pkgs) stdenv gw6c coreutils 
-      procps upstart iputils gnused 
+      procps iputils gnused 
       gnugrep seccure writeScript;
+    upstart = config.system.build.upstart;
     username = cfg.username;
     password = cfg.password;
     server = cfg.server;
diff --git a/modules/services/x11/display-managers/kdm.nix b/modules/services/x11/display-managers/kdm.nix
index 349fd19adfe..55171035442 100644
--- a/modules/services/x11/display-managers/kdm.nix
+++ b/modules/services/x11/display-managers/kdm.nix
@@ -12,8 +12,8 @@ let
   defaultConfig =
     ''
       [Shutdown]
-      HaltCmd=${pkgs.upstart}/sbin/halt
-      RebootCmd=${pkgs.upstart}/sbin/reboot
+      HaltCmd=${config.system.build.upstart}/sbin/halt
+      RebootCmd=${config.system.build.upstart}/sbin/reboot
       ${optionalString (config.system.boot.loader.id == "grub") ''
         BootManager=Grub
       ''}
diff --git a/modules/services/x11/display-managers/slim.nix b/modules/services/x11/display-managers/slim.nix
index af15e0df5e6..ad767e199a1 100644
--- a/modules/services/x11/display-managers/slim.nix
+++ b/modules/services/x11/display-managers/slim.nix
@@ -14,8 +14,8 @@ let
       xserver_arguments ${dmcfg.xserverArgs}
       sessions ${pkgs.lib.concatStringsSep "," (dmcfg.session.names ++ ["custom"])}
       login_cmd exec ${pkgs.stdenv.bash}/bin/sh ${dmcfg.session.script} "%session"
-      halt_cmd ${pkgs.upstart}/sbin/shutdown -h now
-      reboot_cmd ${pkgs.upstart}/sbin/shutdown -r now
+      halt_cmd ${config.system.build.upstart}/sbin/shutdown -h now
+      reboot_cmd ${config.system.build.upstart}/sbin/shutdown -r now
       ${if cfg.defaultUser != "" then "default_user " + cfg.defaultUser else ""}
       ${if cfg.hideCursor then "hidecursor true" else ""}
     '';
diff --git a/modules/system/activation/top-level.nix b/modules/system/activation/top-level.nix
index 1e3f22c37ad..1f17702b408 100644
--- a/modules/system/activation/top-level.nix
+++ b/modules/system/activation/top-level.nix
@@ -75,11 +75,11 @@ let
       ln -s ${config.system.activationScripts.script} $out/activate
       ln -s ${config.system.build.etc}/etc $out/etc
       ln -s ${config.system.path} $out/sw
-      ln -s ${pkgs.upstart} $out/upstart
+      ln -s ${config.system.build.upstart} $out/upstart
 
       echo "$kernelParams" > $out/kernel-params
       echo "$configurationName" > $out/configuration-name
-      echo "${toString pkgs.upstart.interfaceVersion}" > $out/upstart-interface-version
+      echo "${toString config.system.build.upstart.interfaceVersion}" > $out/upstart-interface-version
 
       mkdir $out/fine-tune
       childCount=0;
@@ -113,7 +113,7 @@ let
       pkgs.gnugrep
       pkgs.findutils
       pkgs.diffutils
-      pkgs.upstart # for initctl
+      config.system.build.upstart # for initctl
     ];
 
     # Boot loaders
diff --git a/modules/system/boot/stage-2.nix b/modules/system/boot/stage-2.nix
index 440ff70965f..41c53c492f4 100644
--- a/modules/system/boot/stage-2.nix
+++ b/modules/system/boot/stage-2.nix
@@ -15,9 +15,10 @@ let
 
   };
 
-  inherit (pkgs) substituteAll writeText coreutils utillinux udev upstart;
+  inherit (pkgs) substituteAll writeText coreutils utillinux udev;
   kernel = config.boot.kernelPackages.kernel;
   activateConfiguration = config.system.activationScripts.script;
+  upstart = config.system.build.upstart;
 
   # Path for Upstart jobs.  Should be quite minimal.
   upstartPath =
@@ -25,7 +26,7 @@ let
       pkgs.findutils
       pkgs.gnugrep
       pkgs.gnused
-      pkgs.upstart
+      upstart
     ];
 
   bootStage2 = substituteAll {
diff --git a/modules/system/upstart/upstart.nix b/modules/system/upstart/upstart.nix
index 42ac9899673..a0f5b5802da 100644
--- a/modules/system/upstart/upstart.nix
+++ b/modules/system/upstart/upstart.nix
@@ -4,6 +4,9 @@ with pkgs.lib;
 
 let
 
+  upstart = pkgs.upstart;
+
+
   # From a job description, generate an Upstart job file.
   makeJob = job:
 
@@ -75,7 +78,7 @@ let
 
         
   jobs =
-    [pkgs.upstart] # for the built-in logd job
+    [ upstart ] # for the built-in logd job
     ++ map (job: job.upstartPkg) (attrValues config.jobs);
 
     
@@ -278,6 +281,8 @@ in
   
   config = {
 
+    system.build.upstart = upstart;
+
     environment.etc =
       [ { # The Upstart events defined above.
           source = "${jobsDir}/etc/event.d";
-- 
GitLab


From 7011a9315fc077e65c400d09b42627221809e000 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 6 Nov 2009 10:43:38 +0000
Subject: [PATCH 1972/5331] * Use Upstart 0.6.  Jobs are now in /etc/init
 instead of /etc/event.d.

svn path=/nixos/branches/upstart-0.6/; revision=18192
---
 modules/services/ttys/mingetty.nix  |  2 +-
 modules/system/boot/stage-2-init.sh | 12 +++--
 modules/system/boot/stage-2.nix     | 14 +-----
 modules/system/upstart/upstart.nix  | 71 ++++++++++++-----------------
 modules/tasks/tty-backgrounds.nix   |  2 +-
 5 files changed, 39 insertions(+), 62 deletions(-)

diff --git a/modules/services/ttys/mingetty.nix b/modules/services/ttys/mingetty.nix
index 6c793ffa112..5f6b1d0f14c 100644
--- a/modules/services/ttys/mingetty.nix
+++ b/modules/services/ttys/mingetty.nix
@@ -55,7 +55,7 @@ with pkgs.lib;
     # Generate a separate job for each tty.  
     jobs = listToAttrs (map (tty: nameValuePair tty {
     
-      startOn = "udev";
+      startOn = "started udev";
 
       exec = "${pkgs.mingetty}/sbin/mingetty --loginprog=${pkgs.pam_login}/bin/login --noclear ${tty}";
       
diff --git a/modules/system/boot/stage-2-init.sh b/modules/system/boot/stage-2-init.sh
index 0cc09caebba..a95ff1873ef 100644
--- a/modules/system/boot/stage-2-init.sh
+++ b/modules/system/boot/stage-2-init.sh
@@ -106,9 +106,11 @@ if test -n "$safeMode"; then
 fi
 
 
-# Create the minimal device nodes needed before we run udev.
+# Create the minimal device nodes needed for the activation scripts
+# and Upstart.
 mknod -m 0666 /dev/null c 1 3
 mknod -m 0644 /dev/urandom c 1 9 # needed for passwd
+mknod -m 0644 /dev/console c 5 1
 
 
 # Clear the resume device.
@@ -136,12 +138,12 @@ export MODULE_DIR=@kernel@/lib/modules/
 # Run any user-specified commands.
 @shell@ @postBootCommands@
 
-echo "starting Upstart..."
+# For debugging Upstart.
+#@shell@ --login < /dev/console > /dev/console 2>&1 &
 
 # Start Upstart's init.  We start it through the
 # /var/run/current-system symlink indirection so that we can upgrade
 # init in a running system by changing the symlink and sending init a
 # HUP signal.
-export UPSTART_CFG_DIR=/etc/event.d
-setPath "@upstartPath@"
-exec /var/run/current-system/upstart/sbin/init
+echo "starting Upstart..."
+exec /var/run/current-system/upstart/sbin/init -v
diff --git a/modules/system/boot/stage-2.nix b/modules/system/boot/stage-2.nix
index 41c53c492f4..b19dbc39183 100644
--- a/modules/system/boot/stage-2.nix
+++ b/modules/system/boot/stage-2.nix
@@ -18,26 +18,16 @@ let
   inherit (pkgs) substituteAll writeText coreutils utillinux udev;
   kernel = config.boot.kernelPackages.kernel;
   activateConfiguration = config.system.activationScripts.script;
-  upstart = config.system.build.upstart;
-
-  # Path for Upstart jobs.  Should be quite minimal.
-  upstartPath =
-    [ pkgs.coreutils
-      pkgs.findutils
-      pkgs.gnugrep
-      pkgs.gnused
-      upstart
-    ];
 
   bootStage2 = substituteAll {
     src = ./stage-2-init.sh;
     isExecutable = true;
-    inherit kernel upstart activateConfiguration upstartPath;
+    inherit kernel activateConfiguration;
+    upstart = config.system.build.upstart;
     path =
       [ coreutils
         utillinux
         udev
-        upstart
       ];
     postBootCommands = writeText "local-cmds" config.boot.postBootCommands;
   };
diff --git a/modules/system/upstart/upstart.nix b/modules/system/upstart/upstart.nix
index a0f5b5802da..0919fc0d75f 100644
--- a/modules/system/upstart/upstart.nix
+++ b/modules/system/upstart/upstart.nix
@@ -4,9 +4,19 @@ with pkgs.lib;
 
 let
 
-  upstart = pkgs.upstart;
+  upstart = pkgs.upstart06;
 
 
+  # Path for Upstart jobs.  Should be quite minimal.
+  upstartPath =
+    [ pkgs.coreutils
+      pkgs.findutils
+      pkgs.gnugrep
+      pkgs.gnused
+      upstart
+    ];
+
+    
   # From a job description, generate an Upstart job file.
   makeJob = job:
 
@@ -18,6 +28,8 @@ let
         
           description "${job.description}"
 
+          console output
+
           ${if isList job.startOn then
               # This is a hack to support or-dependencies on Upstart 0.3.
               concatMapStrings (x: "start on ${x}\n") job.startOn
@@ -28,10 +40,11 @@ let
           
           ${if job.stopOn != "" then "stop on ${job.stopOn}" else ""}
 
+          env PATH=${makeSearchPath "bin" upstartPath}:${makeSearchPath "sbin" upstartPath}
           ${concatMapStrings (n: "env ${n}=${getAttr n job.environment}\n") (attrNames job.environment)}
           
           ${if job.preStart != "" then ''
-            start script
+            pre-start script
               ${job.preStart}
             end script
           '' else ""}
@@ -48,18 +61,13 @@ let
               ''
                 exec ${job.exec}
               ''
-            else
-              # Simulate jobs without a main process (which Upstart 0.3
-              # doesn't support) using a semi-infinite sleep.
-              ''
-                exec sleep 1e100
-              ''
+            else ""
           }
 
           ${if job.respawn && !job.task then "respawn" else ""}
 
           ${if job.postStop != "" then ''
-            stop script
+            post-stop script
               ${job.postStop}
             end script
           '' else ""}
@@ -68,37 +76,14 @@ let
         '';
 
     in
-      pkgs.runCommand ("upstart-" + job.name)
+      pkgs.runCommand ("upstart-" + job.name + ".conf")
         { inherit (job) buildHook; inherit jobText; }
         ''
           eval "$buildHook"
-          ensureDir $out/etc/event.d
-          echo "$jobText" > $out/etc/event.d/${job.name}
+          echo "$jobText" > $out
         '';
 
         
-  jobs =
-    [ upstart ] # for the built-in logd job
-    ++ map (job: job.upstartPkg) (attrValues config.jobs);
-
-    
-  # Create an etc/event.d directory containing symlinks to the
-  # specified list of Upstart job files.
-  jobsDir = pkgs.runCommand "upstart-jobs" {inherit jobs;}
-    ''
-      ensureDir $out/etc/event.d
-      for i in $jobs; do
-        if ln -s $i . ; then
-          if test -d $i; then
-            ln -s $i/etc/event.d/* $out/etc/event.d/
-          fi
-        else
-          echo Duplicate entry: $i;
-        fi;
-      done
-    ''; # */
-
-
   jobOptions = {
 
     name = mkOption {
@@ -227,13 +212,12 @@ let
   
   upstartJob = {name, config, ...}: {
     options = {
-      upstartPkg = mkOption {
+      jobDrv = mkOption {
         default = makeJob config;
         type = types.uniq types.package;
         description = ''
-          Upstart package which contains upstart events inside
-          <filename>/etc/event.d/</filename>.  The default value is
-          generated from other options.
+          Derivation that builds the Upstart job file.  The default
+          value is generated from other options.
         '';
       };
     };
@@ -284,18 +268,19 @@ in
     system.build.upstart = upstart;
 
     environment.etc =
-      [ { # The Upstart events defined above.
-          source = "${jobsDir}/etc/event.d";
-          target = "event.d";
-        }
-      ];
+      flip map (attrValues config.jobs) (job:
+        { source = job.jobDrv;
+          target = "init/${job.name}.conf";
+        } );
 
     # !!! fix this
+    /*
     tests.upstartJobs = { recurseForDerivations = true; } //
       builtins.listToAttrs (map (job: {
         name = removePrefix "upstart-" job.name;
         value = job;
       }) jobs);
+    */
   
   };
 
diff --git a/modules/tasks/tty-backgrounds.nix b/modules/tasks/tty-backgrounds.nix
index d15365fab9d..5f557ac7f5c 100644
--- a/modules/tasks/tty-backgrounds.nix
+++ b/modules/tasks/tty-backgrounds.nix
@@ -105,7 +105,7 @@ in
     jobs.ttyBackgrounds =
       { name = "tty-backgrounds";
 
-        startOn = "udev";
+        startOn = "started udev";
 
         preStart =
           ''
-- 
GitLab


From 5d240b99d57126ee611f46fb7cd5ea2f15166dba Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 6 Nov 2009 11:31:57 +0000
Subject: [PATCH 1973/5331] * Work around a bug in HAL (it fails to start if
 $PATH is too long,   since it uses a 512-byte buffer somewhere).

svn path=/nixos/branches/upstart-0.6/; revision=18198
---
 modules/services/hardware/hal.nix | 12 +++++-------
 modules/services/system/dbus.nix  |  3 +--
 2 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/modules/services/hardware/hal.nix b/modules/services/hardware/hal.nix
index 11cda8d4cc4..56bcf1fb4d8 100644
--- a/modules/services/hardware/hal.nix
+++ b/modules/services/hardware/hal.nix
@@ -69,7 +69,7 @@ in
         
         # !!! TODO: make sure that HAL starts after acpid,
         # otherwise hald-addon-acpi will grab /proc/acpi/event.
-        startOn = if config.powerManagement.enable then "acpid" else "dbus";
+        startOn = if config.powerManagement.enable then "started acpid" else "started dbus";
         stopOn = "shutdown";
 
         environment =
@@ -100,15 +100,13 @@ in
             
             rm -f /var/cache/hald/fdi-cache
 
-            # For some weird reason HAL sometimes fails to start at
-            # boot time, which seems to be timing-dependent.  As a
-            # temporary workaround, sleep for a while here.
-            sleep 2
-
             # !!! Hack: start the daemon here to make sure it's
             # running when the Upstart job reaches the "running"
             # state.  Should be fixable in Upstart 0.6.
-            ${hal}/sbin/hald --use-syslog # --verbose=yes 
+            # The `PATH=' works around a bug in HAL: it concatenates
+            # its libexec directory to $PATH, but using a 512-byte
+            # buffer.  So if $PATH is too long it fails.
+            PATH= ${hal}/sbin/hald --use-syslog # --verbose=yes 
           '';
 
         postStop =
diff --git a/modules/services/system/dbus.nix b/modules/services/system/dbus.nix
index 8e1d9bd4d10..d91be4eb88b 100644
--- a/modules/services/system/dbus.nix
+++ b/modules/services/system/dbus.nix
@@ -113,8 +113,7 @@ in
       };
 
     jobs.dbus =
-      { startOn = "udev";
-        stopOn = "shutdown";
+      { startOn = "started udev";
 
         preStart =
           ''
-- 
GitLab


From ae23b68ee8bed66d29d0ed573e91d9afaaae1a7e Mon Sep 17 00:00:00 2001
From: Marco Maggesi <maggesi@math.unifi.it>
Date: Fri, 6 Nov 2009 12:58:44 +0000
Subject: [PATCH 1974/5331] Add configurations for MIT kerberos.

svn path=/nixos/trunk/; revision=18203
---
 modules/config/krb5.nix | 185 ++++++++++++++++++++++++++++++++++++++++
 modules/module-list.nix |   1 +
 2 files changed, 186 insertions(+)
 create mode 100644 modules/config/krb5.nix

diff --git a/modules/config/krb5.nix b/modules/config/krb5.nix
new file mode 100644
index 00000000000..960ef850084
--- /dev/null
+++ b/modules/config/krb5.nix
@@ -0,0 +1,185 @@
+{pkgs, config, ...}:
+
+###### interface
+let
+  inherit (pkgs.lib) mkOption mkIf;
+
+  cfg = config.krb5;
+
+  #myPkgs = import /home/nixer/nix/my-expr.nix { system = "x86_64-linux"; };
+
+  options = {
+    krb5 = {
+
+      enable = mkOption {
+        default = false;
+        description = "Whether to enable Kerberos V.";
+      };
+
+      defaultRealm = mkOption {
+        default = "ATENA.MIT.EDU";
+        description = "Default realm.";
+      };
+
+      kdc = mkOption {
+        default = "kerberos.mit.edu";
+        description = "Kerberos Domain Controller";
+      };
+
+      kerberosAdminServer = mkOption { 
+        default = "kerberos.mit.edu";
+        description = "Kerberos Admin Server";
+      };
+
+    };
+  };
+in
+
+###### implementation
+
+mkIf config.krb5.enable {
+  require = [
+    options
+  ];
+
+  environment = {
+    systemPackages = [ pkgs.krb5 ];
+    etc = [
+      { source = pkgs.writeText "krb5.conf"
+          ''
+[libdefaults]
+	default_realm = ${cfg.defaultRealm}
+
+# The following krb5.conf variables are only for MIT Kerberos.
+	krb4_config = /etc/krb.conf
+	krb4_realms = /etc/krb.realms
+	kdc_timesync = 1
+	ccache_type = 4
+	forwardable = true
+	proxiable = true
+
+# The following encryption type specification will be used by MIT Kerberos
+# if uncommented.  In general, the defaults in the MIT Kerberos code are
+# correct and overriding these specifications only serves to disable new
+# encryption types as they are added, creating interoperability problems.
+
+#	default_tgs_enctypes = aes256-cts arcfour-hmac-md5 des3-hmac-sha1 des-cbc-crc des-cbc-md5
+#	default_tkt_enctypes = aes256-cts arcfour-hmac-md5 des3-hmac-sha1 des-cbc-crc des-cbc-md5
+#	permitted_enctypes = aes256-cts arcfour-hmac-md5 des3-hmac-sha1 des-cbc-crc des-cbc-md5
+
+# The following libdefaults parameters are only for Heimdal Kerberos.
+	v4_instance_resolve = false
+	v4_name_convert = {
+		host = {
+			rcmd = host
+			ftp = ftp
+		}
+		plain = {
+			something = something-else
+		}
+	}
+	fcc-mit-ticketflags = true
+
+[realms]
+	${cfg.defaultRealm} = {
+		kdc = ${cfg.kdc}
+		admin_server = ${cfg.kerberosAdminServer}
+	}
+	ATHENA.MIT.EDU = {
+		kdc = kerberos.mit.edu:88
+		kdc = kerberos-1.mit.edu:88
+		kdc = kerberos-2.mit.edu:88
+		admin_server = kerberos.mit.edu
+		default_domain = mit.edu
+	}
+	MEDIA-LAB.MIT.EDU = {
+		kdc = kerberos.media.mit.edu
+		admin_server = kerberos.media.mit.edu
+	}
+	ZONE.MIT.EDU = {
+		kdc = casio.mit.edu
+		kdc = seiko.mit.edu
+		admin_server = casio.mit.edu
+	}
+	MOOF.MIT.EDU = {
+		kdc = three-headed-dogcow.mit.edu:88
+		kdc = three-headed-dogcow-1.mit.edu:88
+		admin_server = three-headed-dogcow.mit.edu
+	}
+	CSAIL.MIT.EDU = {
+		kdc = kerberos-1.csail.mit.edu
+		kdc = kerberos-2.csail.mit.edu
+		admin_server = kerberos.csail.mit.edu
+		default_domain = csail.mit.edu
+		krb524_server = krb524.csail.mit.edu
+	}
+	IHTFP.ORG = {
+		kdc = kerberos.ihtfp.org
+		admin_server = kerberos.ihtfp.org
+	}
+	GNU.ORG = {
+		kdc = kerberos.gnu.org
+		kdc = kerberos-2.gnu.org
+		kdc = kerberos-3.gnu.org
+		admin_server = kerberos.gnu.org
+	}
+	1TS.ORG = {
+		kdc = kerberos.1ts.org
+		admin_server = kerberos.1ts.org
+	}
+	GRATUITOUS.ORG = {
+		kdc = kerberos.gratuitous.org
+		admin_server = kerberos.gratuitous.org
+	}
+	DOOMCOM.ORG = {
+		kdc = kerberos.doomcom.org
+		admin_server = kerberos.doomcom.org
+	}
+	ANDREW.CMU.EDU = {
+		kdc = vice28.fs.andrew.cmu.edu
+		kdc = vice2.fs.andrew.cmu.edu
+		kdc = vice11.fs.andrew.cmu.edu
+		kdc = vice12.fs.andrew.cmu.edu
+		admin_server = vice28.fs.andrew.cmu.edu
+		default_domain = andrew.cmu.edu
+	}
+	CS.CMU.EDU = {
+		kdc = kerberos.cs.cmu.edu
+		kdc = kerberos-2.srv.cs.cmu.edu
+		admin_server = kerberos.cs.cmu.edu
+	}
+	DEMENTIA.ORG = {
+		kdc = kerberos.dementia.org
+		kdc = kerberos2.dementia.org
+		admin_server = kerberos.dementia.org
+	}
+	stanford.edu = {
+		kdc = krb5auth1.stanford.edu
+		kdc = krb5auth2.stanford.edu
+		kdc = krb5auth3.stanford.edu
+		admin_server = krb5-admin.stanford.edu
+		default_domain = stanford.edu
+	}
+
+[domain_realm]
+	.mit.edu = ATHENA.MIT.EDU
+	mit.edu = ATHENA.MIT.EDU
+	.media.mit.edu = MEDIA-LAB.MIT.EDU
+	media.mit.edu = MEDIA-LAB.MIT.EDU
+	.csail.mit.edu = CSAIL.MIT.EDU
+	csail.mit.edu = CSAIL.MIT.EDU
+	.whoi.edu = ATHENA.MIT.EDU
+	whoi.edu = ATHENA.MIT.EDU
+	.stanford.edu = stanford.edu
+
+[login]
+	krb4_convert = true
+	krb4_get_tickets = false
+	    
+          '';
+        target = "krb5.conf";
+      }
+    ];
+  };
+
+}
diff --git a/modules/module-list.nix b/modules/module-list.nix
index 4addbda5760..dc20fa605c4 100644
--- a/modules/module-list.nix
+++ b/modules/module-list.nix
@@ -1,5 +1,6 @@
 [ ./config/fonts.nix
   ./config/i18n.nix
+  ./config/krb5.nix
   ./config/ldap.nix
   ./config/networking.nix
   ./config/no-x-libs.nix
-- 
GitLab


From 903e92bde6508486482c6d2d18e7ac2087fc06c4 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 6 Nov 2009 15:23:16 +0000
Subject: [PATCH 1975/5331] * Use Upstart's "export fork" feature to properly
 detect when a daemon   is "ready".  This prevents ugly race conditions, e.g.
 HAL failing to   start because dbus hasn't finished starting yet. * Support
 post-start scripts.  These are executed after the job's main   process has
 started but before the job's "started" event is   emitted.  For instance, the
 udev job uses this to perform "udevadm   trigger / settle" to create all
 devices.  Previously this had to be   done in the pre-start script, so the
 daemon had to started in the   pre-start script as well.

svn path=/nixos/branches/upstart-0.6/; revision=18211
---
 modules/services/hardware/hal.nix  | 19 ++++-------
 modules/services/hardware/udev.nix | 27 +++++----------
 modules/services/system/dbus.nix   | 19 ++++-------
 modules/system/upstart/upstart.nix | 53 ++++++++++++++++++++++++++----
 4 files changed, 67 insertions(+), 51 deletions(-)

diff --git a/modules/services/hardware/hal.nix b/modules/services/hardware/hal.nix
index 56bcf1fb4d8..be51968317f 100644
--- a/modules/services/hardware/hal.nix
+++ b/modules/services/hardware/hal.nix
@@ -99,21 +99,14 @@ in
             mkdir -m 0755 -p /var/run/hald
             
             rm -f /var/cache/hald/fdi-cache
-
-            # !!! Hack: start the daemon here to make sure it's
-            # running when the Upstart job reaches the "running"
-            # state.  Should be fixable in Upstart 0.6.
-            # The `PATH=' works around a bug in HAL: it concatenates
-            # its libexec directory to $PATH, but using a 512-byte
-            # buffer.  So if $PATH is too long it fails.
-            PATH= ${hal}/sbin/hald --use-syslog # --verbose=yes 
           '';
 
-        postStop =
-          '' 
-            pid=$(cat /var/run/hald/pid || true)
-            test -n "$pid" && kill "$pid"
-         '';
+        daemonType = "fork";
+
+        # The `PATH=' works around a bug in HAL: it concatenates
+        # its libexec directory to $PATH, but using a 512-byte
+        # buffer.  So if $PATH is too long it fails.
+        script = "PATH= exec ${hal}/sbin/hald --use-syslog";
       };
 
     services.udev.packages = [hal];
diff --git a/modules/services/hardware/udev.nix b/modules/services/hardware/udev.nix
index 105f8a2b54f..2baa87e9547 100644
--- a/modules/services/hardware/udev.nix
+++ b/modules/services/hardware/udev.nix
@@ -169,9 +169,6 @@ in
 
             mkdir -p /var/lib/udev/rules.d
 
-            # Get rid of possible old udev processes.
-            ${procps}/bin/pkill -u root "^udevd$" || true
-
             # Do the loading of additional stage 2 kernel modules.
             # Maybe this isn't the best place...
             for i in ${toString config.boot.kernelModules}; do
@@ -179,32 +176,24 @@ in
                 ${modprobe}/sbin/modprobe $i || true
             done
 
-            # Start udev.
             mkdir -p /dev/.udev # !!! bug in udev?
-            ${udev}/sbin/udevd --daemon
+          '';
+
+        daemonType = "fork";
 
+        exec = "${udev}/sbin/udevd --daemon";
+
+        postStart =
+          ''
             # Let udev create device nodes for all modules that have already
             # been loaded into the kernel (or for which support is built into
             # the kernel).
             ${udev}/sbin/udevadm trigger
             ${udev}/sbin/udevadm settle # wait for udev to finish
 
-            # Kill udev, let Upstart restart and monitor it.  (This is nasty,
-            # but we have to run `udevadm trigger' first.  Maybe we can use
-            # Upstart's `binary' keyword, but it isn't implemented yet.)
-            if ! ${procps}/bin/pkill -u root "^udevd$"; then
-                echo "couldn't stop udevd"
-            fi
-
-            while ${procps}/bin/pgrep -u root "^udevd$"; do
-                sleep 1
-            done
-
             initctl emit new-devices
           '';
-
-        exec = "${udev}/sbin/udevd";
-
+        
       };
 
   };
diff --git a/modules/services/system/dbus.nix b/modules/services/system/dbus.nix
index d91be4eb88b..b0c8dc66ae5 100644
--- a/modules/services/system/dbus.nix
+++ b/modules/services/system/dbus.nix
@@ -124,24 +124,19 @@ in
             ${dbus.tools}/bin/dbus-uuidgen --ensure
  
             rm -f ${homeDir}/pid
-            # !!! hack - dbus should be running once this job is
-            # considered "running"; should be fixable once we have
-            # Upstart 0.6.
-            ${dbus}/bin/dbus-daemon --config-file=${configDir}/system.conf
           '';
 
+        daemonType = "fork";
+
+        exec = "${dbus}/bin/dbus-daemon --config-file=${configDir}/system.conf";
+
         postStop =
           ''
-            pid=$(cat ${homeDir}/pid)
-            if test -n "$pid"; then
-                kill $pid
-            fi
-
             # !!! Hack: doesn't belong here.
-            pid=$(cat /var/run/ConsoleKit/pid)
+            pid=$(cat /var/run/ConsoleKit/pid || true)
             if test -n "$pid"; then
-                kill $pid
-                rm /var/run/ConsoleKit/pid
+                kill $pid || true
+                rm -f /var/run/ConsoleKit/pid
             fi
           '';
       };
diff --git a/modules/system/upstart/upstart.nix b/modules/system/upstart/upstart.nix
index 0919fc0d75f..fea8f9e880c 100644
--- a/modules/system/upstart/upstart.nix
+++ b/modules/system/upstart/upstart.nix
@@ -38,16 +38,16 @@ let
             else ""
           }
           
-          ${if job.stopOn != "" then "stop on ${job.stopOn}" else ""}
+          ${optionalString (job.stopOn != "") "stop on ${job.stopOn}"}
 
           env PATH=${makeSearchPath "bin" upstartPath}:${makeSearchPath "sbin" upstartPath}
           ${concatMapStrings (n: "env ${n}=${getAttr n job.environment}\n") (attrNames job.environment)}
           
-          ${if job.preStart != "" then ''
+          ${optionalString (job.preStart != "") ''
             pre-start script
               ${job.preStart}
             end script
-          '' else ""}
+          ''}
           
           ${if job.script != "" && job.exec != "" then
               abort "Job ${job.name} has both a `script' and `exec' attribute."
@@ -64,13 +64,28 @@ let
             else ""
           }
 
-          ${if job.respawn && !job.task then "respawn" else ""}
+          ${optionalString (job.postStart != "") ''
+            post-start script
+              ${job.postStart}
+            end script
+          ''}
+          
+          ${optionalString job.task "task"}
+          ${optionalString job.respawn "respawn"}
 
-          ${if job.postStop != "" then ''
+          ${optionalString (job.postStop != "") ''
             post-stop script
               ${job.postStop}
             end script
-          '' else ""}
+          ''}
+
+          ${optionalString (!job.task) (
+             if job.daemonType == "fork" then "expect fork" else
+             if job.daemonType == "daemon" then "expect daemon" else
+             if job.daemonType == "stop" then "expect stop" else
+             if job.daemonType == "none" then "" else
+             throw "invalid daemon type `${job.daemonType}'"
+          )}
 
           ${job.extraConfig}
         '';
@@ -141,6 +156,16 @@ let
       '';
     };
 
+    postStart = mkOption {
+      type = types.string;
+      default = "";
+      description = ''
+        Shell commands executed after the job is started (i.e. after
+        the job's main process is started), but before the job is
+        considered “running”.
+      '';
+    };
+
     postStop = mkOption {
       type = types.string;
       default = "";
@@ -156,7 +181,7 @@ let
       description = ''
         Command to start the job's main process.  If empty, the
         job has no main process, but can still have pre/post-start
-        and pre/post-stop scripts, and is considered "running"
+        and pre/post-stop scripts, and is considered “running”
         until it is stopped.
       '';
     };
@@ -198,6 +223,20 @@ let
       '';
     };
 
+    daemonType = mkOption {
+      type = types.string;
+      default = "none";
+      description = ''
+        Determines how Upstart detects when a daemon should be
+        considered “running”.  The value <literal>none</literal> means
+        that the daemon is considered ready immediately.  The value
+        <literal>fork</literal> means that the daemon will fork once.
+        The value <literal>daemon</literal> means that the daemon will
+        fork twice.  The value <literal>stop</literal> means that the
+        daemon will raise the SIGSTOP signal to indicate readiness.
+      '';
+    };
+
     extraConfig = mkOption {
       type = types.string;
       default = "";
-- 
GitLab


From 9fa2f12cc254691dd52c7ee38f77576ddf7111a0 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 6 Nov 2009 15:46:56 +0000
Subject: [PATCH 1976/5331] * Do some more jobs.

svn path=/nixos/branches/upstart-0.6/; revision=18212
---
 modules/services/logging/klogd.nix       | 19 ++++---------------
 modules/services/logging/syslogd.nix     |  7 ++++---
 modules/services/networking/ssh/sshd.nix |  7 ++++---
 modules/system/upstart/upstart.nix       |  3 +--
 modules/tasks/network-interfaces.nix     |  2 +-
 5 files changed, 14 insertions(+), 24 deletions(-)

diff --git a/modules/services/logging/klogd.nix b/modules/services/logging/klogd.nix
index 0b2e3d9ddc7..98d9d5eeabf 100644
--- a/modules/services/logging/klogd.nix
+++ b/modules/services/logging/klogd.nix
@@ -2,28 +2,17 @@
 
 ###### implementation
 
-let
-
-  klogdCmd = "${pkgs.sysklogd}/sbin/klogd -c 1 -2 -k $(dirname $(readlink -f /var/run/booted-system/kernel))/System.map";
-
-in
-
 {
 
   jobs.klogd =
     { description = "Kernel log daemon";
 
-      startOn = "syslogd";
+      startOn = "started syslogd";
       stopOn = "shutdown";
 
-      preStart =
-        ''
-          # !!! this hangs for some reason (it blocks reading from
-          # /proc/kmsg).
-          #${klogdCmd} -o
-        '';
-
-      exec = "${klogdCmd} -n";
+      exec =
+        "${pkgs.sysklogd}/sbin/klogd -c 1 -2 -n " +
+        "-k $(dirname $(readlink -f /var/run/booted-system/kernel))/System.map";
     };
     
 }
diff --git a/modules/services/logging/syslogd.nix b/modules/services/logging/syslogd.nix
index bc6b6eb4389..7c3e54cadb0 100644
--- a/modules/services/logging/syslogd.nix
+++ b/modules/services/logging/syslogd.nix
@@ -50,12 +50,13 @@ in
     jobs.syslogd =
       { description = "Syslog daemon";
 
-        startOn = "udev";
-        stopOn = "shutdown";
+        startOn = "started udev";
 
         environment = { TZ = config.time.timeZone; };
 
-        exec = "${pkgs.sysklogd}/sbin/syslogd -n -f ${syslogConf}";
+        daemonType = "fork";
+
+        exec = "${pkgs.sysklogd}/sbin/syslogd -f ${syslogConf}";
       };
 
   };
diff --git a/modules/services/networking/ssh/sshd.nix b/modules/services/networking/ssh/sshd.nix
index 8c18a560748..87cb942f2f9 100644
--- a/modules/services/networking/ssh/sshd.nix
+++ b/modules/services/networking/ssh/sshd.nix
@@ -112,8 +112,7 @@ in
 
         description = "OpenSSH server";
 
-        startOn = "network-interfaces/started";
-        stopOn = "network-interfaces/stop";
+        startOn = "started network-interfaces";
 
         environment = { LD_LIBRARY_PATH = nssModulesPath; };
 
@@ -126,7 +125,9 @@ in
             fi
           '';
 
-        exec = "${openssh}/sbin/sshd -D -h /etc/ssh/ssh_host_dsa_key -f ${sshdConfig}";
+        daemonType = "fork";
+
+        exec = "${openssh}/sbin/sshd -h /etc/ssh/ssh_host_dsa_key -f ${sshdConfig}";
       };
 
     networking.firewall.allowedTCPPorts = [22];
diff --git a/modules/system/upstart/upstart.nix b/modules/system/upstart/upstart.nix
index fea8f9e880c..9edb0153cb2 100644
--- a/modules/system/upstart/upstart.nix
+++ b/modules/system/upstart/upstart.nix
@@ -31,8 +31,7 @@ let
           console output
 
           ${if isList job.startOn then
-              # This is a hack to support or-dependencies on Upstart 0.3.
-              concatMapStrings (x: "start on ${x}\n") job.startOn
+              "start on ${concatStringsSep " or " job.startOn}"
             else if job.startOn != "" then
               "start on ${job.startOn}"
             else ""
diff --git a/modules/tasks/network-interfaces.nix b/modules/tasks/network-interfaces.nix
index 4b53da876da..098828469a6 100644
--- a/modules/tasks/network-interfaces.nix
+++ b/modules/tasks/network-interfaces.nix
@@ -135,7 +135,7 @@ in
     jobs.networkInterfaces = 
       { name = "network-interfaces";
 
-        startOn = "udev";
+        startOn = "started udev";
 
         preStart =
           ''
-- 
GitLab


From b9bfe7ed43e0839d54708de21639feb1173eb0dd Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 6 Nov 2009 15:59:23 +0000
Subject: [PATCH 1977/5331] * Connect Upstart to the system bus.

svn path=/nixos/branches/upstart-0.6/; revision=18213
---
 modules/services/system/dbus.nix   | 6 ++++++
 modules/system/upstart/upstart.nix | 4 ++++
 2 files changed, 10 insertions(+)

diff --git a/modules/services/system/dbus.nix b/modules/services/system/dbus.nix
index b0c8dc66ae5..6f79865645d 100644
--- a/modules/services/system/dbus.nix
+++ b/modules/services/system/dbus.nix
@@ -130,6 +130,12 @@ in
 
         exec = "${dbus}/bin/dbus-daemon --config-file=${configDir}/system.conf";
 
+        postStart =
+          ''
+            # Signal Upstart that it can connect to the system bus.
+            kill -HUP 1 || true
+          '';
+
         postStop =
           ''
             # !!! Hack: doesn't belong here.
diff --git a/modules/system/upstart/upstart.nix b/modules/system/upstart/upstart.nix
index 9edb0153cb2..3d2af1b0382 100644
--- a/modules/system/upstart/upstart.nix
+++ b/modules/system/upstart/upstart.nix
@@ -311,6 +311,10 @@ in
           target = "init/${job.name}.conf";
         } );
 
+    # Upstart can listen on the system bus, allowing normal users to
+    # do status queries.
+    services.dbus.packages = [ upstart ];
+
     # !!! fix this
     /*
     tests.upstartJobs = { recurseForDerivations = true; } //
-- 
GitLab


From e07f1e98db5e4faa20c660b56004271fce702bc1 Mon Sep 17 00:00:00 2001
From: Nicolas Pierron <nicolas.b.pierron@gmail.com>
Date: Fri, 6 Nov 2009 16:23:25 +0000
Subject: [PATCH 1978/5331] * Revert 18115, 18150, 18135, 18112, 18107-18105.  
 Revert modifications done on apache-httpd configurations.

svn path=/nixos/trunk/; revision=18215
---
 modules/module-list.nix                       |   2 -
 .../web-servers/apache-httpd/default.nix      | 158 +++++++++-
 .../apache-httpd/per-server-options.nix       | 282 ++++++++----------
 .../web-servers/apache-httpd/services.nix     | 129 --------
 tests/subversion.nix                          |   8 +-
 5 files changed, 267 insertions(+), 312 deletions(-)
 delete mode 100644 modules/services/web-servers/apache-httpd/services.nix

diff --git a/modules/module-list.nix b/modules/module-list.nix
index dc20fa605c4..861039d7391 100644
--- a/modules/module-list.nix
+++ b/modules/module-list.nix
@@ -94,8 +94,6 @@
   ./services/ttys/gpm.nix
   ./services/ttys/mingetty.nix
   ./services/web-servers/apache-httpd/default.nix
-  ./services/web-servers/apache-httpd/per-server-options.nix
-  ./services/web-servers/apache-httpd/services.nix
   ./services/web-servers/jboss.nix
   ./services/web-servers/tomcat.nix
   ./services/x11/desktop-managers/default.nix
diff --git a/modules/services/web-servers/apache-httpd/default.nix b/modules/services/web-servers/apache-httpd/default.nix
index 7e3067510d3..55902f9e5e0 100644
--- a/modules/services/web-servers/apache-httpd/default.nix
+++ b/modules/services/web-servers/apache-httpd/default.nix
@@ -10,7 +10,7 @@ let
 
   httpd = pkgs.apacheHttpd;
 
-  getPort = cfg: cfg.port;
+  getPort = cfg: if cfg.port != 0 then cfg.port else if cfg.enableSSL then 443 else 80;
 
   extraModules = attrByPath ["extraModules"] [] mainCfg;
   extraForeignModules = filter builtins.isAttrs extraModules;
@@ -33,22 +33,45 @@ let
     fullConfig = config; # machine config
   };
 
-  vhosts = mainCfg.virtualHosts;
+
+  vhostOptions = import ./per-server-options.nix {
+    inherit mkOption;
+    forMainServer = false;
+  };
+
+  vhosts = let
+    makeVirtualHost = cfgIn: 
+      let
+        # Fill in defaults for missing options.
+        cfg = addDefaultOptionValues vhostOptions cfgIn;
+      in cfg;
+    in map makeVirtualHost mainCfg.virtualHosts;
+
 
   allHosts = [mainCfg] ++ vhosts;
     
-  # !!! This should be replaced by sub-modules to allow non-intrusive
-  # extensions of NixOS.
+
   callSubservices = serverInfo: defs:
     let f = svc:
-      rec {
-        config =
-          if res ? options then
-            addDefaultOptionValues res.options svc.configuration
-          else
-            svc.configuration;
-        res = svc // svc.function {inherit config pkgs serverInfo servicesPath;};
-      }.res;
+      let 
+        svcFunction =
+          if svc ? function then svc.function
+          else import "${./.}/${if svc ? serviceType then svc.serviceType else svc.serviceName}.nix";
+        config = addDefaultOptionValues res.options
+          (if svc ? config then svc.config else svc);
+        defaults = {
+          extraConfig = "";
+          extraModules = [];
+          extraModulesPre = [];
+          extraPath = [];
+          extraServerPath = [];
+          globalEnvVars = [];
+          robotsEntries = "";
+          startupScript = "";
+          options = {};
+        };
+        res = defaults // svcFunction {inherit config pkgs serverInfo servicesPath;};
+      in res;
     in map f defs;
 
 
@@ -354,6 +377,13 @@ in
         ";
       };
 
+      extraConfig = mkOption {
+        default = "";
+        description = "
+          These configuration lines will be passed verbatim to the apache config
+        ";
+      };
+
       extraModules = mkOption {
         default = [];
         example = [ "proxy_connect" { name = "php5"; path = "${pkgs.php}/modules/libphp5.so"; } ];
@@ -416,7 +446,109 @@ in
         ";
       };
 
-    };
+      virtualHosts = mkOption {
+        default = [];
+        example = [
+          { hostName = "foo";
+            documentRoot = "/data/webroot-foo";
+          }
+          { hostName = "bar";
+            documentRoot = "/data/webroot-bar";
+          }
+        ];
+        description = ''
+          Specification of the virtual hosts served by Apache.  Each
+          element should be an attribute set specifying the
+          configuration of the virtual host.  The available options
+          are the non-global options permissible for the main host.
+        '';
+      };
+
+
+      subservices = {
+
+        # !!! remove this
+        subversion = {
+
+          enable = mkOption {
+            default = false;
+            description = "
+              Whether to enable the Subversion subservice in the webserver.
+            ";
+          };
+
+          notificationSender = mkOption {
+            default = "svn-server@example.org";
+            example = "svn-server@example.org";
+            description = "
+              The email address used in the Sender field of commit
+              notification messages sent by the Subversion subservice.
+            ";
+          };
+
+          userCreationDomain = mkOption {
+            default = "example.org"; 
+            example = "example.org";
+            description = "
+              The domain from which user creation is allowed.  A client can
+              only create a new user account if its IP address resolves to
+              this domain.
+            ";
+          };
+
+          autoVersioning = mkOption {
+            default = false;
+            description = "
+              Whether you want the Subversion subservice to support
+              auto-versioning, which enables Subversion repositories to be
+              mounted as read/writable file systems on operating systems that
+              support WebDAV.
+            ";
+          };
+
+          dataDir = mkOption {
+            default = "/no/such/path/exists";
+            description = "
+              Place to put SVN repository.
+            ";
+          };
+
+          organization = {
+
+            name = mkOption {
+              default = null;
+              description = "
+                Name of the organization hosting the Subversion service.
+              ";
+            };
+
+            url = mkOption {
+              default = null;
+              description = "
+                URL of the website of the organization hosting the Subversion service.
+              ";
+            };
+
+            logo = mkOption {
+              default = null;
+              description = "
+                Logo the organization hosting the Subversion service.
+              ";
+            };
+
+          };
+
+        };
+
+      };
+
+    }
+
+    # Include the options shared between the main server and virtual hosts.
+    // (import ./per-server-options.nix {
+      inherit mkOption;
+      forMainServer = true;
+    });
 
   };
 
diff --git a/modules/services/web-servers/apache-httpd/per-server-options.nix b/modules/services/web-servers/apache-httpd/per-server-options.nix
index 6e98b8685fa..8a2ee0e849a 100644
--- a/modules/services/web-servers/apache-httpd/per-server-options.nix
+++ b/modules/services/web-servers/apache-httpd/per-server-options.nix
@@ -3,180 +3,136 @@
 # has additional options that affect the web server as a whole, like
 # the user/group to run under.)
 
-{options, config, pkgs, ...}:
+{forMainServer, mkOption}:
 
-let
-  inherit (pkgs.lib) mkOption addDefaultOptionValues types;
+{
 
-  mainServerArgs = {
-    config = config.services.httpd;
-    options = options.services.httpd;
+  hostName = mkOption {
+    default = "localhost";
+    description = "
+      Canonical hostname for the server.
+    ";
   };
 
+  serverAliases = mkOption {
+    default = [];
+    example = ["www.example.org" "www.example.org:8080" "example.org"];
+    description = "
+      Additional names of virtual hosts served by this virtual host configuration.
+    ";
+  };
 
-  perServerOptions = {forMainServer}: {config, ...}: {
-
-    hostName = mkOption {
-      default = "localhost";
-      description = "
-        Canonical hostname for the server.
-      ";
-    };
-
-    serverAliases = mkOption {
-      default = [];
-      example = ["www.example.org" "www.example.org:8080" "example.org"];
-      description = "
-        Additional names of virtual hosts served by this virtual host configuration.
-      ";
-    };
-
-    port = mkOption {
-      default = if config.enableSSL then 443 else 80;
-      type = with types; uniq int;
-      description = "
-        Port for the server.  The default port depends on the
-        <option>enableSSL</option> option of this server. (80 for http and
-        443 for https).
-      ";
-    };
-
-    enableSSL = mkOption {
-      default = false;
-      description = "
-        Whether to enable SSL (https) support.
-      ";
-    };
-
-    # Note: sslServerCert and sslServerKey can be left empty, but this
-    # only makes sense for virtual hosts (they will inherit from the
-    # main server).
-    
-    sslServerCert = mkOption {
-      default = ""; 
-      example = "/var/host.cert";
-      description = "
-        Path to server SSL certificate.
-      ";
-    };
-
-    sslServerKey = mkOption {
-      default = "";
-      example = "/var/host.key";
-      description = "
-        Path to server SSL certificate key.
-      ";
-    };
-
-    adminAddr = mkOption ({
-      example = "admin@example.org";
-      description = "
-        E-mail address of the server administrator.
-      ";
-    } // (if forMainServer then {} else {default = "";}));
-
-    documentRoot = mkOption {
-      default = null;
-      example = "/data/webserver/docs";
-      description = "
-        The path of Apache's document root directory.  If left undefined,
-        an empty directory in the Nix store will be used as root.
-      ";
-    };
-
-    servedDirs = mkOption {
-      default = [];
-      example = [
-        { urlPath = "/nix";
-          dir = "/home/eelco/Dev/nix-homepage";
-        }
-      ];
-      description = "
-        This option provides a simple way to serve static directories.
-      ";
-    };
-
-    servedFiles = mkOption {
-      default = [];
-      example = [
-        { urlPath = "/foo/bar.png";
-          dir = "/home/eelco/some-file.png";
-        }
-      ];
-      description = "
-        This option provides a simple way to serve individual, static files.
-      ";
-    };
-
-    extraConfig = mkOption {
-      default = "";
-      example = ''
-        <Directory /home>
-          Options FollowSymlinks
-          AllowOverride All
-        </Directory>
-      '';
-      description = "
-        These lines go to httpd.conf verbatim. They will go after
-        directories and directory aliases defined by default.
-      ";
-    };
-
-    enableUserDir = mkOption {
-      default = false;
-      description = "
-        Whether to enable serving <filename>~/public_html</filename> as
-        <literal>/~<replaceable>username</replaceable></literal>.
-      ";
-    };
-
-    globalRedirect = mkOption {
-      default = "";
-      example = http://newserver.example.org/;
-      description = "
-        If set, all requests for this host are redirected permanently to
-        the given URL.
-      ";
-    };
+  port = mkOption {
+    default = 0;
+    description = "
+      Port for the server.  0 means use the default port: 80 for http
+      and 443 for https (i.e. when enableSSL is set).
+    ";
+  };
 
+  enableSSL = mkOption {
+    default = false;
+    description = "
+      Whether to enable SSL (https) support.
+    ";
   };
 
+  # Note: sslServerCert and sslServerKey can be left empty, but this
+  # only makes sense for virtual hosts (they will inherit from the
+  # main server).
+  
+  sslServerCert = mkOption {
+    default = ""; 
+    example = "/var/host.cert";
+    description = "
+      Path to server SSL certificate.
+    ";
+  };
 
-  vhostOptions = perServerOptions {
-    forMainServer = false;
+  sslServerKey = mkOption {
+    default = "";
+    example = "/var/host.key";
+    description = "
+      Path to server SSL certificate key.
+    ";
   };
 
-in
+  adminAddr = mkOption ({
+    example = "admin@example.org";
+    description = "
+      E-mail address of the server administrator.
+    ";
+  } // (if forMainServer then {} else {default = "";}));
+
+  documentRoot = mkOption {
+    default = null;
+    example = "/data/webserver/docs";
+    description = "
+      The path of Apache's document root directory.  If left undefined,
+      an empty directory in the Nix store will be used as root.
+    ";
+  };
 
-{
-  options = {
-    services.httpd = {
-
-      virtualHosts = mkOption {
-        default = [];
-        example = [
-          { hostName = "foo";
-            documentRoot = "/data/webroot-foo";
-          }
-          { hostName = "bar";
-            documentRoot = "/data/webroot-bar";
-          }
-        ];
-        type = with types; listOf optionSet;
-        description = ''
-          Specification of the virtual hosts served by Apache.  Each
-          element should be an attribute set specifying the
-          configuration of the virtual host.  The available options
-          are the non-global options permissible for the main host.
-        '';
-
-        options = [
-          vhostOptions
-        ];
-      };
-
-    }
-    // perServerOptions {forMainServer = true;} mainServerArgs
-    ;
+  servedDirs = mkOption {
+    default = [];
+    example = [
+      { urlPath = "/nix";
+        dir = "/home/eelco/Dev/nix-homepage";
+      }
+    ];
+    description = "
+      This option provides a simple way to serve static directories.
+    ";
+  };
+
+  servedFiles = mkOption {
+    default = [];
+    example = [
+      { urlPath = "/foo/bar.png";
+        dir = "/home/eelco/some-file.png";
+      }
+    ];
+    description = "
+      This option provides a simple way to serve individual, static files.
+    ";
   };
+
+  extraConfig = mkOption {
+    default = "";
+    example = ''
+      <Directory /home>
+        Options FollowSymlinks
+        AllowOverride All
+      </Directory>
+    '';
+    description = "
+      These lines go to httpd.conf verbatim. They will go after
+      directories and directory aliases defined by default.
+    ";
+  };
+
+  extraSubservices = mkOption {
+    default = [];
+    description = "
+      Extra subservices to enable in the webserver.
+    ";
+  };
+
+  enableUserDir = mkOption {
+    default = false;
+    description = "
+      Whether to enable serving <filename>~/public_html</filename> as
+      <literal>/~<replaceable>username</replaceable></literal>.
+    ";
+  };
+
+  globalRedirect = mkOption {
+    default = "";
+    example = http://newserver.example.org/;
+    description = "
+      If set, all requests for this host are redirected permanently to
+      the given URL.
+    ";
+  };
+
 }
diff --git a/modules/services/web-servers/apache-httpd/services.nix b/modules/services/web-servers/apache-httpd/services.nix
deleted file mode 100644
index a8b69be636e..00000000000
--- a/modules/services/web-servers/apache-httpd/services.nix
+++ /dev/null
@@ -1,129 +0,0 @@
-{options, config, pkgs, ...}:
-
-let
-  inherit (pkgs.lib) mkOption addDefaultOptionValues types;
-
-  mainServerArgs = {
-    config = config.services.httpd;
-    options = options.services.httpd;
-  };
-
-  subServiceOptions = {options, config, ...}: {
-    options = {
-
-      extraConfig = mkOption {
-        default = "";
-        description = "Not documented yet.";
-      };
-
-      extraModules = mkOption {
-        default = [];
-        description = "Not documented yet.";
-      };
-
-      extraModulesPre = mkOption {
-        default = [];
-        description = "Not documented yet.";
-      };
-
-      extraPath = mkOption {
-        default = [];
-        description = "Not documented yet.";
-      };
-
-      extraServerPath = mkOption {
-        default = [];
-        description = "Not documented yet.";
-      };
-
-      globalEnvVars = mkOption {
-        default = [];
-        description = "Not documented yet.";
-      };
-
-      robotsEntries = mkOption {
-        default = "";
-        description = "Not documented yet.";
-      };
-
-      startupScript = mkOption {
-        default = "";
-        description = "Not documented yet.";
-      };
-
-
-      serviceType = mkOption {
-        description = "Obsolete name of <option>serviceName</option>.";
-        # serviceType is the old name of serviceName.
-        apply = x: config.serviceName;
-      };
-
-      serviceName = mkOption {
-        example = "trac";
-        description = "
-          (Deprecated)
-
-          Identify a service by the name of the file containing it.  The
-          service expression is contained inside
-          <filename>./modules/services/web-servers/apache-httpd</filename>
-          directory.
-
-          Due to lack of documentation, this option will be replaced by
-          enable flags.
-        ";
-
-        # serviceName is the new name of serviceType.
-        extraConfigs = map (def: def.value) options.serviceType.definitions;
-      };
-
-      function = mkOption {
-        default = null;
-        description = "
-          (Deprecated) Add a function which configure the current sub-service.
-        ";
-        apply = f:
-          if isNull f then
-            import "${./.}/${config.serviceName}.nix"
-          else
-            f;
-      };
-
-      configuration = mkOption {
-        default = {};
-        description = "
-          (Deprecated) Define option values of the current sub-service.
-        ";
-      };
-
-    };
-  };
-
-
-  perServerOptions = {config, ...}: {
-
-    extraSubservices = mkOption {
-      default = [];
-      type = with types; listOf optionSet;
-      description = "
-        Extra subservices to enable in the webserver.
-      ";
-      options = [ subServiceOptions ];
-    };
-
-  };
-
-in
-
-{
-  options = {
-    services.httpd = {
-
-      virtualHosts = mkOption {
-        options = [ perServerOptions ];
-      };
-
-    }
-    // perServerOptions mainServerArgs
-    ;
-  };
-}
diff --git a/tests/subversion.nix b/tests/subversion.nix
index 5fed5ba77c4..82ada4576eb 100644
--- a/tests/subversion.nix
+++ b/tests/subversion.nix
@@ -56,11 +56,9 @@ rec {
           services.httpd.adminAddr = "e.dolstra@tudelft.nl";
           services.httpd.extraSubservices =
             [ { serviceType = "subversion";
-                configuration = {
-                  urlPrefix = "";
-                  dataDir = "/data/subversion";
-                  userCreationDomain = "192.168.0.0/16";
-                };
+                urlPrefix = "";
+                dataDir = "/data/subversion";
+                userCreationDomain = "192.168.0.0/16";
               }
             ];
           nixpkgs.config.packageOverrides = overrides;
-- 
GitLab


From c0f732f079a5fd98bae3a5b799683e10512bae66 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 6 Nov 2009 16:30:48 +0000
Subject: [PATCH 1979/5331] * Work around a lack of laziness in the xserver.nix
 module.

svn path=/nixos/trunk/; revision=18216
---
 modules/services/x11/xserver.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/modules/services/x11/xserver.nix b/modules/services/x11/xserver.nix
index d58e75bbad9..25b5c4a615f 100644
--- a/modules/services/x11/xserver.nix
+++ b/modules/services/x11/xserver.nix
@@ -179,6 +179,7 @@ in
       };
 
       videoDrivers = mkOption {
+        default = [];
         example = [ "vesa" ];
         description = ''
           The names of the video drivers that the X server should
-- 
GitLab


From 3fcb7c2cb532aa1bee435df185b6d6ed578c74b3 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 6 Nov 2009 19:19:46 +0000
Subject: [PATCH 1980/5331] * Set the nameserver.

svn path=/nixos/branches/upstart-0.6/; revision=18218
---
 modules/virtualisation/qemu-vm.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/modules/virtualisation/qemu-vm.nix b/modules/virtualisation/qemu-vm.nix
index 87138ed5c52..6886a0b23d1 100644
--- a/modules/virtualisation/qemu-vm.nix
+++ b/modules/virtualisation/qemu-vm.nix
@@ -119,6 +119,8 @@ in
 
   networking.defaultGateway = "10.0.2.2";
 
+  networking.nameservers = [ "10.0.2.3" ];
+
   system.build.vm = pkgs.runCommand "nixos-vm" {}
     ''
       ensureDir $out/bin
-- 
GitLab


From 676da4d87da48bc754add39add3d6de0a567898c Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 6 Nov 2009 19:20:09 +0000
Subject: [PATCH 1981/5331] * Updated some more jobs.

svn path=/nixos/branches/upstart-0.6/; revision=18219
---
 modules/module-list.nix                                     | 2 +-
 .../{ctrl-alt-delete.nix => control-alt-delete.nix}         | 6 +++---
 modules/tasks/kbd.nix                                       | 6 ++++--
 modules/tasks/lvm.nix                                       | 2 +-
 modules/tasks/swraid.nix                                    | 4 +++-
 5 files changed, 12 insertions(+), 8 deletions(-)
 rename modules/system/upstart-events/{ctrl-alt-delete.nix => control-alt-delete.nix} (62%)

diff --git a/modules/module-list.nix b/modules/module-list.nix
index 4addbda5760..eab8503f1ee 100644
--- a/modules/module-list.nix
+++ b/modules/module-list.nix
@@ -125,7 +125,7 @@
   ./system/boot/stage-1.nix
   ./system/boot/stage-2.nix
   ./system/etc/etc.nix
-  ./system/upstart-events/ctrl-alt-delete.nix
+  ./system/upstart-events/control-alt-delete.nix
   ./system/upstart-events/halt.nix
   ./system/upstart-events/maintenance-shell.nix
   ./system/upstart/upstart.nix
diff --git a/modules/system/upstart-events/ctrl-alt-delete.nix b/modules/system/upstart-events/control-alt-delete.nix
similarity index 62%
rename from modules/system/upstart-events/ctrl-alt-delete.nix
rename to modules/system/upstart-events/control-alt-delete.nix
index ae1ba2e342e..5fa2bd87eb9 100644
--- a/modules/system/upstart-events/ctrl-alt-delete.nix
+++ b/modules/system/upstart-events/control-alt-delete.nix
@@ -3,10 +3,10 @@
 ###### implementation
 
 {
-  jobs.ctrl_alt_delete =
-    { name = "ctrl-alt-delete";
+  jobs.control_alt_delete =
+    { name = "control-alt-delete";
 
-      startOn = "ctrlaltdel";
+      startOn = "control-alt-delete";
 
       task = true;
 
diff --git a/modules/tasks/kbd.nix b/modules/tasks/kbd.nix
index 9ba7f973cf3..8ed4b44f91b 100644
--- a/modules/tasks/kbd.nix
+++ b/modules/tasks/kbd.nix
@@ -59,9 +59,11 @@ in
     jobs.kbd =
       { description = "Keyboard / console initialisation";
 
-        startOn = "udev";
+        startOn = "started udev";
 
-        preStart = ''
+        task = true;
+
+        script = ''
           export LANG=${defaultLocale}
           export LOCALE_ARCHIVE=/var/run/current-system/sw/lib/locale/locale-archive
           export PATH=${pkgs.gzip}/bin:$PATH # Needed by setfont
diff --git a/modules/tasks/lvm.nix b/modules/tasks/lvm.nix
index 4da517deae1..92dfd52aefd 100644
--- a/modules/tasks/lvm.nix
+++ b/modules/tasks/lvm.nix
@@ -7,7 +7,7 @@
   config = {
 
     jobs.lvm =
-      { startOn = " udev"; # !!! or on new-devices
+      { startOn = "started udev or new-devices";
 
         script =
           ''
diff --git a/modules/tasks/swraid.nix b/modules/tasks/swraid.nix
index 6e29062f0a9..74a34ba5689 100644
--- a/modules/tasks/swraid.nix
+++ b/modules/tasks/swraid.nix
@@ -13,7 +13,7 @@ in
 {
 
   jobs.swraid =
-    { startOn = "udev"; # !!! or on "new-devices"
+    { startOn = "started udev or new-devices";
       
       script =
         ''
@@ -25,6 +25,8 @@ in
       
           # Scan /proc/partitions for RAID devices.
           ${mdadm}/sbin/mdadm --examine --brief --scan -c partitions > ${tempConf}
+          
+          if ! test -s ${tempConf}; then exit 0; fi
       
           # Activate each device found.
           ${mdadm}/sbin/mdadm --assemble -c ${tempConf} --scan
-- 
GitLab


From 82c3e2aa50713cf8669173360edeffb21228d701 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 6 Nov 2009 21:08:06 +0000
Subject: [PATCH 1982/5331] * Updated poweroff/reboot/maintenance mode for
 Upstart 0.6.  Upstart   no longer emits specific events for those.  Instead
 it emits a   "runlevel" event.  The "runlevel" task starts the "shutdown"
 task to   perform the desired action. * Upstart 0.6 no longer has a
 "shutdown" event, so "stop on shutdown"   no longer works.  Therefore the
 shutdown task explicitly stops all   running Upstart jobs, before sending a
 TERM/KILL signal to all   remaining processes. * Do a "chvt 1" at the start
 of the shutdown task to switch to the   console. * Use /dev/console instead
 of /dev/tty1, since if somebody is logged   in on tty1, bad things will
 happen.

svn path=/nixos/branches/upstart-0.6/; revision=18224
---
 modules/module-list.nix                       |  4 +-
 modules/system/boot/stage-2-init.sh           |  7 +--
 .../upstart-events/maintenance-shell.nix      | 22 --------
 modules/system/upstart-events/runlevel.nix    | 25 +++++++++
 .../upstart-events/{halt.nix => shutdown.nix} | 53 ++++++++++++-------
 5 files changed, 64 insertions(+), 47 deletions(-)
 delete mode 100644 modules/system/upstart-events/maintenance-shell.nix
 create mode 100644 modules/system/upstart-events/runlevel.nix
 rename modules/system/upstart-events/{halt.nix => shutdown.nix} (75%)

diff --git a/modules/module-list.nix b/modules/module-list.nix
index eab8503f1ee..8c5cdcfd9dd 100644
--- a/modules/module-list.nix
+++ b/modules/module-list.nix
@@ -126,8 +126,8 @@
   ./system/boot/stage-2.nix
   ./system/etc/etc.nix
   ./system/upstart-events/control-alt-delete.nix
-  ./system/upstart-events/halt.nix
-  ./system/upstart-events/maintenance-shell.nix
+  ./system/upstart-events/runlevel.nix
+  ./system/upstart-events/shutdown.nix
   ./system/upstart/upstart.nix
   ./tasks/filesystems.nix
   ./tasks/kbd.nix
diff --git a/modules/system/boot/stage-2-init.sh b/modules/system/boot/stage-2-init.sh
index a95ff1873ef..5e1a2104ca3 100644
--- a/modules/system/boot/stage-2-init.sh
+++ b/modules/system/boot/stage-2-init.sh
@@ -141,9 +141,6 @@ export MODULE_DIR=@kernel@/lib/modules/
 # For debugging Upstart.
 #@shell@ --login < /dev/console > /dev/console 2>&1 &
 
-# Start Upstart's init.  We start it through the
-# /var/run/current-system symlink indirection so that we can upgrade
-# init in a running system by changing the symlink and sending init a
-# HUP signal.
+# Start Upstart's init.
 echo "starting Upstart..."
-exec /var/run/current-system/upstart/sbin/init -v
+PATH=/var/run/current-system/upstart/sbin exec init
diff --git a/modules/system/upstart-events/maintenance-shell.nix b/modules/system/upstart-events/maintenance-shell.nix
deleted file mode 100644
index a8eceb93158..00000000000
--- a/modules/system/upstart-events/maintenance-shell.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-{ config, pkgs, ... }:
-
-###### implementation
-
-{
-  jobs.maintenance_shell =
-    { name = "maintenance-shell";
-
-      startOn = [ "maintenance" "stalled" ];
-
-      task = true;
-
-      script =
-        ''
-          exec < /dev/tty1 > /dev/tty1 2>&1
-          echo \
-          echo "<<< MAINTENANCE SHELL >>>"
-          echo ""
-          exec ${pkgs.bash}/bin/sh
-        '';
-    };
-}
diff --git a/modules/system/upstart-events/runlevel.nix b/modules/system/upstart-events/runlevel.nix
new file mode 100644
index 00000000000..750d9a07f50
--- /dev/null
+++ b/modules/system/upstart-events/runlevel.nix
@@ -0,0 +1,25 @@
+{ config, pkgs, ... }:
+
+with pkgs.lib;
+
+{
+
+  jobs.runlevel =
+    { name = "runlevel";
+
+      startOn = "runlevel [0123456S]";
+
+      task = true;
+
+      script =
+        ''
+          case "$RUNLEVEL" in
+              0) initctl start shutdown MODE=poweroff;;
+              1) initctl start shutdown MODE=maintenance;;
+              6) initctl start shutdown MODE=reboot;;
+              *) echo "Unsupported runlevel: $RUNLEVEL";;
+          esac
+        '';
+    };
+
+}
diff --git a/modules/system/upstart-events/halt.nix b/modules/system/upstart-events/shutdown.nix
similarity index 75%
rename from modules/system/upstart-events/halt.nix
rename to modules/system/upstart-events/shutdown.nix
index 36efc3fe2cf..a8519edbd84 100644
--- a/modules/system/upstart-events/halt.nix
+++ b/modules/system/upstart-events/shutdown.nix
@@ -2,29 +2,29 @@
 
 with pkgs.lib;
 
-###### implementation
-
-let
-
-  inherit (pkgs) bash utillinux;
+{
 
-  jobFun = event:
-    { startOn = event;
+  jobs.shutdown =
+    { name = "shutdown";
 
       task = true;
 
+      environment = { MODE = "poweroff"; };
+
       script =
         ''
           set +e # continue in case of errors
+
+          ${pkgs.kbd}/bin/chvt 1
       
-          exec < /dev/tty1 > /dev/tty1 2>&1
+          exec < /dev/console > /dev/console 2>&1
           echo ""
           echo "<<< SYSTEM SHUTDOWN >>>"
           echo ""
       
-          export PATH=${utillinux}/bin:${utillinux}/sbin:$PATH
-      
+          export PATH=${pkgs.utillinux}/bin:${pkgs.utillinux}/sbin:$PATH
       
+
           # Set the hardware clock to the system time.
           echo "setting the hardware clock..."
           hwclock --systohc --utc
@@ -32,6 +32,15 @@ let
       
           # Do an initial sync just in case.
           sync
+
+
+          # Stop all Upstart jobs.
+          initctl list | while read jobName rest; do
+              if test "$jobName" != shutdown; then
+                  echo "stopping $jobName..."
+                  stop "$jobName"
+              fi
+          done
       
       
           # Kill all remaining processes except init and this one.
@@ -42,7 +51,20 @@ let
 
           echo "sending the KILL signal to all processes..."
           kill -KILL -1
-      
+
+
+          # If maintenance mode is requested, start a root shell, and
+          # afterwards emit the "startup" event to bring everything
+          # back up.
+          if test "$MODE" = maintenance; then
+              echo ""
+              echo "<<< MAINTENANCE SHELL >>>"
+              echo ""
+              while ! ${pkgs.bash}/bin/bash --login; do true; done
+              initctl emit startup
+              exit 0
+          fi
+                
       
           # Unmount helper functions.
           getMountPoints() {
@@ -101,7 +123,7 @@ let
       
           # Either reboot or power-off the system.  Note that the "halt"
           # event also does a power-off.
-          if test ${event} = reboot; then
+          if test "$MODE" = reboot; then
               echo "rebooting..."
               sleep 1
               exec reboot -f
@@ -113,9 +135,4 @@ let
         '';
     };
 
-in
-
-{
-  jobs = listToAttrs (map (n: nameValuePair "sys-${n}" (jobFun n))
-    [ "reboot" "halt" "system-halt" "power-off" ] );
-}
+}
\ No newline at end of file
-- 
GitLab


From 4b2ff53ec6972f159a9b0343aa6d533e346e0518 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 6 Nov 2009 21:17:11 +0000
Subject: [PATCH 1983/5331] * Don't stop jobs that are already stopped.

svn path=/nixos/branches/upstart-0.6/; revision=18226
---
 modules/system/upstart-events/shutdown.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/system/upstart-events/shutdown.nix b/modules/system/upstart-events/shutdown.nix
index a8519edbd84..02bce7979d0 100644
--- a/modules/system/upstart-events/shutdown.nix
+++ b/modules/system/upstart-events/shutdown.nix
@@ -35,8 +35,8 @@ with pkgs.lib;
 
 
           # Stop all Upstart jobs.
-          initctl list | while read jobName rest; do
-              if test "$jobName" != shutdown; then
+          initctl list | while IFS=", " read jobName status rest; do
+              if test "$jobName" != shutdown -a "$status" != "stop/waiting"; then
                   echo "stopping $jobName..."
                   stop "$jobName"
               fi
-- 
GitLab


From d545d08461edba3a70060afc2cce7431ff8381d6 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 6 Nov 2009 21:38:40 +0000
Subject: [PATCH 1984/5331] * In the network-interfaces task, emit an ip-up
 event if there is a   statically configured interface (i.e. we're not running
 dhclient).   Otherwise the ntpd job won't be triggered. * Use the "-n" flag
 of "initctl emit" to send the event   asynchronously.

svn path=/nixos/branches/upstart-0.6/; revision=18227
---
 modules/services/hardware/udev.nix         |  2 +-
 modules/services/networking/dhclient.nix   |  4 ++--
 modules/services/networking/ntpd.nix       |  2 +-
 modules/system/upstart-events/shutdown.nix |  2 +-
 modules/tasks/lvm.nix                      |  2 +-
 modules/tasks/network-interfaces.nix       |  5 +++++
 modules/tasks/swraid.nix                   |  2 +-
 modules/virtualisation/qemu-vm.nix         | 21 ++++++++++++++-------
 8 files changed, 26 insertions(+), 14 deletions(-)

diff --git a/modules/services/hardware/udev.nix b/modules/services/hardware/udev.nix
index 2baa87e9547..eebf9672a84 100644
--- a/modules/services/hardware/udev.nix
+++ b/modules/services/hardware/udev.nix
@@ -191,7 +191,7 @@ in
             ${udev}/sbin/udevadm trigger
             ${udev}/sbin/udevadm settle # wait for udev to finish
 
-            initctl emit new-devices
+            initctl emit -n new-devices
           '';
         
       };
diff --git a/modules/services/networking/dhclient.nix b/modules/services/networking/dhclient.nix
index 80451ce2a5a..5a193e60728 100644
--- a/modules/services/networking/dhclient.nix
+++ b/modules/services/networking/dhclient.nix
@@ -28,11 +28,11 @@ let
           # it"), so we silently lose time synchronisation.
           ${config.system.build.upstart}/sbin/initctl stop ntpd
           
-          ${config.system.build.upstart}/sbin/initctl emit ip-up
+          ${config.system.build.upstart}/sbin/initctl emit -n ip-up
       fi
 
       if test "$reason" = EXPIRE -o "$reason" = RELEASE; then
-          ${config.system.build.upstart}/sbin/initctl emit ip-down
+          ${config.system.build.upstart}/sbin/initctl emit -n ip-down
       fi
     '';
   
diff --git a/modules/services/networking/ntpd.nix b/modules/services/networking/ntpd.nix
index 159c8022442..895a8b8933b 100644
--- a/modules/services/networking/ntpd.nix
+++ b/modules/services/networking/ntpd.nix
@@ -82,7 +82,7 @@ in
             chown ${ntpUser} ${stateDir}
 
             # Needed to run ntpd as an unprivileged user.
-            ${modprobe}/sbin/modprobe capability || true
+            ${modprobe}/sbin/modprobe --quiet capability
 
             # !!! This can hang indefinitely if the network is down or
             # the servers are unreachable.  This is particularly bad
diff --git a/modules/system/upstart-events/shutdown.nix b/modules/system/upstart-events/shutdown.nix
index 02bce7979d0..9c2359c0ff8 100644
--- a/modules/system/upstart-events/shutdown.nix
+++ b/modules/system/upstart-events/shutdown.nix
@@ -61,7 +61,7 @@ with pkgs.lib;
               echo "<<< MAINTENANCE SHELL >>>"
               echo ""
               while ! ${pkgs.bash}/bin/bash --login; do true; done
-              initctl emit startup
+              initctl emit -n startup
               exit 0
           fi
                 
diff --git a/modules/tasks/lvm.nix b/modules/tasks/lvm.nix
index 92dfd52aefd..4aebb33767e 100644
--- a/modules/tasks/lvm.nix
+++ b/modules/tasks/lvm.nix
@@ -23,7 +23,7 @@
             # make them appear in /dev.
             ${pkgs.lvm2}/sbin/vgchange --available y
 
-            initctl emit new-devices
+            initctl emit -n new-devices
           '';
 
         task = true;
diff --git a/modules/tasks/network-interfaces.nix b/modules/tasks/network-interfaces.nix
index 098828469a6..2868c251fca 100644
--- a/modules/tasks/network-interfaces.nix
+++ b/modules/tasks/network-interfaces.nix
@@ -178,6 +178,11 @@ in
 
             # Run any user-specified commands.
             ${pkgs.stdenv.shell} ${pkgs.writeText "local-net-cmds" cfg.localCommands} || true
+
+            # Emit the ip-up event (e.g. to start ntpd).
+            ${optionalString (cfg.interfaces != []) ''
+              initctl emit -n ip-up
+            ''}
           '';
 
         postStop =
diff --git a/modules/tasks/swraid.nix b/modules/tasks/swraid.nix
index 74a34ba5689..b9465822601 100644
--- a/modules/tasks/swraid.nix
+++ b/modules/tasks/swraid.nix
@@ -31,7 +31,7 @@ in
           # Activate each device found.
           ${mdadm}/sbin/mdadm --assemble -c ${tempConf} --scan
       
-          initctl emit new-devices
+          initctl emit -n new-devices
         '';
 
       task = true;        
diff --git a/modules/virtualisation/qemu-vm.nix b/modules/virtualisation/qemu-vm.nix
index 6886a0b23d1..68ba340e6c2 100644
--- a/modules/virtualisation/qemu-vm.nix
+++ b/modules/virtualisation/qemu-vm.nix
@@ -9,6 +9,8 @@
 
 {config, pkgs, ...}:
 
+with pkgs.lib;
+
 let
 
   vmName = config.networking.hostName;
@@ -16,7 +18,7 @@ let
   options = {
 
     virtualisation.diskImage =
-      pkgs.lib.mkOption {
+      mkOption {
         default = "./${vmName}.qcow2";
         description =
           ''
@@ -90,7 +92,7 @@ in
   # where the regular value for the `fileSystems' attribute should be
   # disregarded for the purpose of building a VM test image (since
   # those filesystems don't exist in the VM).
-  fileSystems = pkgs.lib.mkOverride 50 {}
+  fileSystems = mkOverride 50 {}
     [ { mountPoint = "/";
         device = "/dev/vda";
       }
@@ -121,6 +123,11 @@ in
 
   networking.nameservers = [ "10.0.2.3" ];
 
+  networking.interfaces = singleton
+    { name = "eth0";
+      ipAddress = "10.0.2.15";
+    };
+
   system.build.vm = pkgs.runCommand "nixos-vm" {}
     ''
       ensureDir $out/bin
@@ -137,11 +144,11 @@ in
 
   # When building a regular system configuration, override whatever
   # video driver the host uses.
-  services.xserver.videoDriver = pkgs.lib.mkOverride 50 {} null;
-  services.xserver.videoDrivers = pkgs.lib.mkOverride 50 {} [ "cirrus" "vesa" ];
-  services.xserver.defaultDepth = pkgs.lib.mkOverride 50 {} 0;
-  services.xserver.resolutions = pkgs.lib.mkOverride 50 {} [];
+  services.xserver.videoDriver = mkOverride 50 {} null;
+  services.xserver.videoDrivers = mkOverride 50 {} [ "cirrus" "vesa" ];
+  services.xserver.defaultDepth = mkOverride 50 {} 0;
+  services.xserver.resolutions = mkOverride 50 {} [];
 
   # Wireless won't work in the VM.
-  networking.enableWLAN = pkgs.lib.mkOverride 50 {} false;
+  networking.enableWLAN = mkOverride 50 {} false;
 }
-- 
GitLab


From a60d83d3b496e21cda034ca1c33b0dc0ac4c2e98 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 6 Nov 2009 21:39:18 +0000
Subject: [PATCH 1985/5331] svn path=/nixos/branches/upstart-0.6/;
 revision=18228

---
 modules/services/networking/ntpd.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/services/networking/ntpd.nix b/modules/services/networking/ntpd.nix
index 895a8b8933b..eaf5b5532ac 100644
--- a/modules/services/networking/ntpd.nix
+++ b/modules/services/networking/ntpd.nix
@@ -82,7 +82,7 @@ in
             chown ${ntpUser} ${stateDir}
 
             # Needed to run ntpd as an unprivileged user.
-            ${modprobe}/sbin/modprobe --quiet capability
+            ${modprobe}/sbin/modprobe --quiet capability || true
 
             # !!! This can hang indefinitely if the network is down or
             # the servers are unreachable.  This is particularly bad
-- 
GitLab


From 6b0842ff52e49b907f13d90d52bbb1936f76b3e1 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 6 Nov 2009 21:51:28 +0000
Subject: [PATCH 1986/5331] svn path=/nixos/branches/upstart-0.6/;
 revision=18229

---
 modules/system/boot/stage-1-init.sh        |  2 +-
 modules/system/boot/stage-2-init.sh        |  2 +-
 modules/system/upstart-events/shutdown.nix | 11 +++++++----
 3 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/modules/system/boot/stage-1-init.sh b/modules/system/boot/stage-1-init.sh
index 58bf218428b..182fe7e98e1 100644
--- a/modules/system/boot/stage-1-init.sh
+++ b/modules/system/boot/stage-1-init.sh
@@ -39,7 +39,7 @@ trap 'fail' ERR
 
 # Print a greeting.
 echo
-echo "<<< NixOS Stage 1 >>>"
+echo "<<< NixOS Stage 1 >>>"
 echo
 
 
diff --git a/modules/system/boot/stage-2-init.sh b/modules/system/boot/stage-2-init.sh
index 5e1a2104ca3..30298c3127f 100644
--- a/modules/system/boot/stage-2-init.sh
+++ b/modules/system/boot/stage-2-init.sh
@@ -5,7 +5,7 @@
 
 # Print a greeting.
 echo
-echo "<<< NixOS Stage 2 >>>"
+echo -e "\e[1;32m<<< NixOS Stage 2 >>>\e[0m"
 echo
 
 
diff --git a/modules/system/upstart-events/shutdown.nix b/modules/system/upstart-events/shutdown.nix
index 9c2359c0ff8..fa264979c6c 100644
--- a/modules/system/upstart-events/shutdown.nix
+++ b/modules/system/upstart-events/shutdown.nix
@@ -19,7 +19,11 @@ with pkgs.lib;
       
           exec < /dev/console > /dev/console 2>&1
           echo ""
-          echo "<<< SYSTEM SHUTDOWN >>>"
+          if test "$MODE" = maintenance; then
+              echo "<<< Entering maintenance mode >>>"
+          else
+              echo "<<< System shutdown >>>"
+          fi
           echo ""
       
           export PATH=${pkgs.utillinux}/bin:${pkgs.utillinux}/sbin:$PATH
@@ -58,7 +62,7 @@ with pkgs.lib;
           # back up.
           if test "$MODE" = maintenance; then
               echo ""
-              echo "<<< MAINTENANCE SHELL >>>"
+              echo "<<< Maintenance shell >>>"
               echo ""
               while ! ${pkgs.bash}/bin/bash --login; do true; done
               initctl emit -n startup
@@ -121,8 +125,7 @@ with pkgs.lib;
           sync
       
       
-          # Either reboot or power-off the system.  Note that the "halt"
-          # event also does a power-off.
+          # Either reboot or power-off the system.
           if test "$MODE" = reboot; then
               echo "rebooting..."
               sleep 1
-- 
GitLab


From 83a9bf9a6aaac9fb967c34706e6c62150562a149 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 6 Nov 2009 22:19:17 +0000
Subject: [PATCH 1987/5331] * Change all the startOn / stopOn attributes to the
 Upstart 0.6 syntax   (e.g., startOn = "started foo" instead of startOn =
 "foo").

svn path=/nixos/branches/upstart-0.6/; revision=18230
---
 modules/services/audio/alsa.nix                  |  2 +-
 modules/services/audio/pulseaudio.nix            |  1 -
 modules/services/databases/mysql.nix             |  3 +--
 modules/services/databases/postgresql.nix        |  3 +--
 modules/services/hardware/acpid.nix              |  3 +--
 modules/services/hardware/hal.nix                |  1 -
 modules/services/hardware/udev.nix               |  1 -
 modules/services/logging/klogd.nix               |  1 -
 modules/services/mail/dovecot.nix                |  2 +-
 modules/services/mail/postfix.nix                |  2 +-
 modules/services/misc/autofs.nix                 |  4 ++--
 modules/services/misc/disnix.nix                 |  3 +--
 modules/services/misc/gpsd.nix                   |  4 ++--
 modules/services/misc/nixos-manual.nix           |  3 +--
 modules/services/misc/rogue.nix                  |  3 +--
 modules/services/misc/synergy.nix                |  8 ++++----
 modules/services/monitoring/nagios/default.nix   |  4 ++--
 modules/services/monitoring/zabbix-agent.nix     |  4 ++--
 modules/services/monitoring/zabbix-server.nix    |  4 ++--
 .../services/network-filesystems/nfs-kernel.nix  | 16 ++++++++--------
 modules/services/network-filesystems/samba.nix   |  8 ++++----
 modules/services/networking/avahi-daemon.nix     |  4 ++--
 modules/services/networking/bitlbee.nix          |  4 ++--
 modules/services/networking/ddclient.nix         |  1 -
 modules/services/networking/dhclient.nix         |  4 ++--
 modules/services/networking/dhcpd.nix            |  4 ++--
 modules/services/networking/ejabberd.nix         |  4 ++--
 modules/services/networking/firewall.nix         |  2 +-
 modules/services/networking/gnunet.nix           |  4 ++--
 modules/services/networking/gw6c.nix             |  4 ++--
 modules/services/networking/ifplugd.nix          |  4 ++--
 modules/services/networking/ircd-hybrid.nix      |  4 ++--
 modules/services/networking/openfire.nix         |  3 +--
 modules/services/networking/portmap.nix          |  4 ++--
 modules/services/networking/privoxy.nix          |  1 -
 modules/services/networking/ssh/lshd.nix         |  4 ++--
 modules/services/networking/vsftpd.nix           |  4 ++--
 modules/services/networking/wpa_supplicant.nix   |  4 ++--
 modules/services/networking/xinetd.nix           |  4 ++--
 modules/services/printing/cupsd.nix              |  4 ++--
 modules/services/scheduling/atd.nix              |  9 ++++-----
 modules/services/scheduling/cron.nix             |  1 -
 modules/services/scheduling/fcron.nix            |  1 -
 modules/services/system/nscd.nix                 |  1 -
 modules/services/system/uptimed.nix              |  1 -
 modules/services/ttys/gpm.nix                    |  3 +--
 .../web-servers/apache-httpd/default.nix         |  3 +--
 modules/services/web-servers/tomcat.nix          |  4 ++--
 modules/services/x11/xfs.nix                     |  3 +--
 modules/services/x11/xserver.nix                 |  2 +-
 50 files changed, 77 insertions(+), 98 deletions(-)

diff --git a/modules/services/audio/alsa.nix b/modules/services/audio/alsa.nix
index 5f463f8d8cd..78d6a004418 100644
--- a/modules/services/audio/alsa.nix
+++ b/modules/services/audio/alsa.nix
@@ -46,7 +46,7 @@ in
       };
 
     jobs.alsa =
-      { startOn = "udev";
+      { startOn = "started udev";
 
         preStart =
           ''
diff --git a/modules/services/audio/pulseaudio.nix b/modules/services/audio/pulseaudio.nix
index 5a8ffbd30a1..f48cdd49c83 100644
--- a/modules/services/audio/pulseaudio.nix
+++ b/modules/services/audio/pulseaudio.nix
@@ -66,7 +66,6 @@ in
       { description = "PulseAudio system-wide server";
 
         startOn = "startup";
-        stopOn = "shutdown";
 
         preStart =
           ''
diff --git a/modules/services/databases/mysql.nix b/modules/services/databases/mysql.nix
index 5d16ebe0af4..81a2c5ea007 100644
--- a/modules/services/databases/mysql.nix
+++ b/modules/services/databases/mysql.nix
@@ -75,8 +75,7 @@ in
     jobs.mysql =
       { description = "MySQL server";
 
-        startOn = "filesystems";
-        stopOn = "shutdown";
+        startOn = "started filesystems";
 
         preStart =
           ''
diff --git a/modules/services/databases/postgresql.nix b/modules/services/databases/postgresql.nix
index b463e39c725..92e6083d948 100644
--- a/modules/services/databases/postgresql.nix
+++ b/modules/services/databases/postgresql.nix
@@ -116,8 +116,7 @@ in
     jobs.postgresql =
       { description = "PostgreSQL server";
 
-        startOn = "${startDependency}/started";
-        stopOn = "shutdown";
+        startOn = "started ${startDependency}";
 
         preStart =
           ''
diff --git a/modules/services/hardware/acpid.nix b/modules/services/hardware/acpid.nix
index ebb2f2a6a05..88bfc4e7258 100644
--- a/modules/services/hardware/acpid.nix
+++ b/modules/services/hardware/acpid.nix
@@ -79,8 +79,7 @@ in
     jobs.acpid =
       { description = "ACPI daemon";
 
-        startOn = "udev";
-        stopOn = "shutdown";
+        startOn = "started udev";
 
         exec = "${pkgs.acpid}/sbin/acpid --foreground --confdir ${acpiConfDir}";
       };
diff --git a/modules/services/hardware/hal.nix b/modules/services/hardware/hal.nix
index be51968317f..9ee16cedf87 100644
--- a/modules/services/hardware/hal.nix
+++ b/modules/services/hardware/hal.nix
@@ -70,7 +70,6 @@ in
         # !!! TODO: make sure that HAL starts after acpid,
         # otherwise hald-addon-acpi will grab /proc/acpi/event.
         startOn = if config.powerManagement.enable then "started acpid" else "started dbus";
-        stopOn = "shutdown";
 
         environment =
           { # !!! HACK? These environment variables manipulated inside
diff --git a/modules/services/hardware/udev.nix b/modules/services/hardware/udev.nix
index eebf9672a84..798b9a4e381 100644
--- a/modules/services/hardware/udev.nix
+++ b/modules/services/hardware/udev.nix
@@ -159,7 +159,6 @@ in
 
     jobs.udev =
       { startOn = "startup";
-        stopOn = "shutdown";
 
         environment = { UDEV_CONFIG_FILE = conf; };
 
diff --git a/modules/services/logging/klogd.nix b/modules/services/logging/klogd.nix
index 98d9d5eeabf..2b8a6a64d99 100644
--- a/modules/services/logging/klogd.nix
+++ b/modules/services/logging/klogd.nix
@@ -8,7 +8,6 @@
     { description = "Kernel log daemon";
 
       startOn = "started syslogd";
-      stopOn = "shutdown";
 
       exec =
         "${pkgs.sysklogd}/sbin/klogd -c 1 -2 -n " +
diff --git a/modules/services/mail/dovecot.nix b/modules/services/mail/dovecot.nix
index 8ddbe5bfd7b..a41bd9eaad7 100644
--- a/modules/services/mail/dovecot.nix
+++ b/modules/services/mail/dovecot.nix
@@ -116,7 +116,7 @@ in
     jobs.dovecot =
       { description = "Dovecot IMAP/POP3 server";
 
-        startOn = "${startingDependency}/started";
+        startOn = "started ${startingDependency}";
 
         preStart =
           ''
diff --git a/modules/services/mail/postfix.nix b/modules/services/mail/postfix.nix
index b5ed10d957b..ae85dd43f23 100644
--- a/modules/services/mail/postfix.nix
+++ b/modules/services/mail/postfix.nix
@@ -283,7 +283,7 @@ in
       # accurate way is unlikely to be better.
       { description = "Postfix mail server";
 
-        startOn = "${startingDependency}/started";
+        startOn = "started ${startingDependency}";
 
         script =
           ''
diff --git a/modules/services/misc/autofs.nix b/modules/services/misc/autofs.nix
index b9936d0249d..079c684d086 100644
--- a/modules/services/misc/autofs.nix
+++ b/modules/services/misc/autofs.nix
@@ -75,8 +75,8 @@ in
     jobs.autofs =
       { description = "Filesystem automounter";
 
-        startOn = "network-interfaces/started";
-        stopOn = "network-interfaces/stop";
+        startOn = "started network-interfaces";
+        stopOn = "stopping network-interfaces";
 
         environment =
           { PATH = "${pkgs.nfsUtils}/sbin:${config.system.sbin.modprobe}/sbin";
diff --git a/modules/services/misc/disnix.nix b/modules/services/misc/disnix.nix
index 225762813ee..886c86e7fab 100644
--- a/modules/services/misc/disnix.nix
+++ b/modules/services/misc/disnix.nix
@@ -39,8 +39,7 @@ in
     jobs.disnix =
       { description = "Disnix server";
 
-        startOn = "dbus";
-        stopOn = "shutdown";
+        startOn = "started dbus";
 
         script =
           ''    
diff --git a/modules/services/misc/gpsd.nix b/modules/services/misc/gpsd.nix
index 98feef68231..83cc6bae1d5 100644
--- a/modules/services/misc/gpsd.nix
+++ b/modules/services/misc/gpsd.nix
@@ -88,8 +88,8 @@ in
     jobs.gpsd =
       { description = "GPSD daemon";
 
-        startOn = "network-interfaces/started";
-        stopOn = "network-interfaces/stop";
+        startOn = "started network-interfaces";
+        stopOn = "stopping network-interfaces";
 
         exec =
           ''
diff --git a/modules/services/misc/nixos-manual.nix b/modules/services/misc/nixos-manual.nix
index 04fc34c94fa..ed2972e5b5b 100644
--- a/modules/services/misc/nixos-manual.nix
+++ b/modules/services/misc/nixos-manual.nix
@@ -78,8 +78,7 @@ in
 
           description = "NixOS manual";
 
-          startOn = "udev";
-          stopOn = "shutdown";
+          startOn = "started udev";
 
           exec =
             ''
diff --git a/modules/services/misc/rogue.nix b/modules/services/misc/rogue.nix
index 43f43ae5bad..8760ce12510 100644
--- a/modules/services/misc/rogue.nix
+++ b/modules/services/misc/rogue.nix
@@ -43,8 +43,7 @@ in
     jobs.rogue =
       { description = "Rogue dungeon crawling game";
 
-        startOn = "udev";
-        stopOn = "shutdown";
+        startOn = "started udev";
 
         extraConfig = "chdir /root";
 
diff --git a/modules/services/misc/synergy.nix b/modules/services/misc/synergy.nix
index 72eaf640ea8..96616fa7a73 100644
--- a/modules/services/misc/synergy.nix
+++ b/modules/services/misc/synergy.nix
@@ -76,8 +76,8 @@ in
 
             description = "Synergy client";
 
-            startOn = "network-interfaces/started";
-            stopOn = "network-interfaces/stopped";
+            startOn = "started network-interfaces";
+            stopOn = "stopping network-interfaces";
 
             exec = "${pkgs.synergy}/bin/synergyc ${if cfgS.screenName == "" then "" else "-n ${cfgS.screenName}" }";
           };
@@ -89,8 +89,8 @@ in
 
             description = "Synergy server";
 
-            startOn = "network-interfaces/started";
-            stopOn = "network-interfaces/stopped";
+            startOn = "started network-interfaces";
+            stopOn = "stopping network-interfaces";
 
             exec =
               ''
diff --git a/modules/services/monitoring/nagios/default.nix b/modules/services/monitoring/nagios/default.nix
index 78e6a276fc8..6b1b3163d26 100644
--- a/modules/services/monitoring/nagios/default.nix
+++ b/modules/services/monitoring/nagios/default.nix
@@ -166,8 +166,8 @@ in
 
         description = "Nagios monitoring daemon";
 
-        startOn = "network-interfaces/started";
-        stopOn = "network-interfaces/stop";
+        startOn = "started network-interfaces";
+        stopOn = "stopping network-interfaces";
 
         preStart =
           ''
diff --git a/modules/services/monitoring/zabbix-agent.nix b/modules/services/monitoring/zabbix-agent.nix
index 9fbcad78c68..3691405e1e2 100644
--- a/modules/services/monitoring/zabbix-agent.nix
+++ b/modules/services/monitoring/zabbix-agent.nix
@@ -69,8 +69,8 @@ in
 
         description = "Zabbix agent daemon";
 
-        startOn = "network-interfaces/started";
-        stopOn = "network-interfaces/stop";
+        startOn = "started network-interfaces";
+        stopOn = "stopping network-interfaces";
 
         preStart =
           ''
diff --git a/modules/services/monitoring/zabbix-server.nix b/modules/services/monitoring/zabbix-server.nix
index 9b006ed8ec2..d38e955ed4f 100644
--- a/modules/services/monitoring/zabbix-server.nix
+++ b/modules/services/monitoring/zabbix-server.nix
@@ -56,8 +56,8 @@ in
 
         description = "Zabbix server daemon";
 
-        startOn = "postgresql";
-        stopOn = "shutdown";
+        startOn = "started postgresql";
+        stopOn = "stopping postgresql";
 
         preStart =
           ''
diff --git a/modules/services/network-filesystems/nfs-kernel.nix b/modules/services/network-filesystems/nfs-kernel.nix
index 1f67d584b89..2f6904457b2 100644
--- a/modules/services/network-filesystems/nfs-kernel.nix
+++ b/modules/services/network-filesystems/nfs-kernel.nix
@@ -81,8 +81,8 @@ in
       
         description = "Kernel NFS server";
 
-        startOn = "network-interfaces/started";
-        stopOn = "network-interfaces/stop";
+        startOn = "started network-interfaces";
+        stopOn = "stopping network-interfaces";
 
         preStart =
           ''
@@ -111,8 +111,8 @@ in
 
         description = "Kernel NFS server";
 
-        startOn = "nfs-kernel-exports/started";
-        stopOn = "nfs-kernel-exports/stop";
+        startOn = "started nfs-kernel-exports";
+        stopOn = "stopping nfs-kernel-exports";
 
         exec = "${pkgs.nfsUtils}/sbin/rpc.nfsd ${if cfg.hostName != null then "-H ${cfg.hostName}" else ""} ${builtins.toString cfg.nproc}";
       };
@@ -122,8 +122,8 @@ in
 
         description = "Kernel NFS server - mount daemon";
 
-        startOn = "nfs-kernel-nfsd/started";
-        stopOn = "nfs-kernel-exports/stop";
+        startOn = "started nfs-kernel-nfsd";
+        stopOn = "stopping nfs-kernel-exports";
 
         exec = "${pkgs.nfsUtils}/sbin/rpc.mountd -F -f ${exports}";
       };
@@ -133,8 +133,8 @@ in
       
         description = "Kernel NFS server - Network Status Monitor";
       
-        startOn = "nfs-kernel-nfsd/started";
-	stopOn = "nfs-kernel-exports/stop";
+        startOn = "started nfs-kernel-nfsd";
+	stopOn = "stopping nfs-kernel-exports";
 
         preStart =
           ''	
diff --git a/modules/services/network-filesystems/samba.nix b/modules/services/network-filesystems/samba.nix
index 98d58e9f7f4..6e9cd391597 100644
--- a/modules/services/network-filesystems/samba.nix
+++ b/modules/services/network-filesystems/samba.nix
@@ -56,8 +56,8 @@ let
     { name = "samba-${appName}";
       description = "Samba Service daemon ${appName}";
 
-      startOn = "samba/started";
-      stopOn = "samba-control/stop";
+      startOn = "started samba";
+      stopOn = "stopping samba-control";
 
       exec = "${samba}/sbin/${appName} ${args}";
     };
@@ -168,8 +168,8 @@ in
       { name = "samba";
         description = "Samba server";
 
-        startOn = "network-interfaces/started";
-        stopOn = "network-interfaces/stop";
+        startOn = "started network-interfaces";
+        stopOn = "stopping network-interfaces";
 
         preStart = setupScript;
       };
diff --git a/modules/services/networking/avahi-daemon.nix b/modules/services/networking/avahi-daemon.nix
index f3033e8a408..82693c7399e 100644
--- a/modules/services/networking/avahi-daemon.nix
+++ b/modules/services/networking/avahi-daemon.nix
@@ -118,8 +118,8 @@ in
     jobs.avahi_daemon =
       { name = "avahi-daemon";
 
-        startOn = "network-interfaces/started";
-        stopOn = "network-interfaces/stop";
+        startOn = "started network-interfaces";
+        stopOn = "stopping network-interfaces";
 
         script =
           ''
diff --git a/modules/services/networking/bitlbee.nix b/modules/services/networking/bitlbee.nix
index 2aa51603d05..f61227e0984 100644
--- a/modules/services/networking/bitlbee.nix
+++ b/modules/services/networking/bitlbee.nix
@@ -67,8 +67,8 @@ in
     jobs.bitlbee =
       { description = "BitlBee IRC to other chat networks gateway";
 
-        startOn = "network-interfaces/started";
-        stopOn = "network-interfaces/stop";
+        startOn = "started network-interfaces";
+        stopOn = "stopping network-interfaces";
 
         preStart =
           ''
diff --git a/modules/services/networking/ddclient.nix b/modules/services/networking/ddclient.nix
index b5bffa83cd7..575386c8579 100644
--- a/modules/services/networking/ddclient.nix
+++ b/modules/services/networking/ddclient.nix
@@ -114,7 +114,6 @@ in
       { name = "ddclient";
 
         startOn = "startup";
-        stopOn = "shutdown"; 
 
         preStart =
           ''
diff --git a/modules/services/networking/dhclient.nix b/modules/services/networking/dhclient.nix
index 5a193e60728..600b7196aa4 100644
--- a/modules/services/networking/dhclient.nix
+++ b/modules/services/networking/dhclient.nix
@@ -62,8 +62,8 @@ in
   config = mkIf config.networking.useDHCP {
 
     jobs.dhclient = 
-      { startOn = "network-interfaces/started";
-        stopOn = "network-interfaces/stop";
+      { startOn = "started network-interfaces";
+        stopOn = "stopping network-interfaces";
 
         preStart =
           ''
diff --git a/modules/services/networking/dhcpd.nix b/modules/services/networking/dhcpd.nix
index 6daa0c073b8..43e0843cb97 100644
--- a/modules/services/networking/dhcpd.nix
+++ b/modules/services/networking/dhcpd.nix
@@ -111,8 +111,8 @@ in
     jobs.dhcpd =
       { description = "DHCP server";
 
-        startOn = "network-interfaces/started";
-        stopOn = "network-interfaces/stop";
+        startOn = "started network-interfaces";
+        stopOn = "stopping network-interfaces";
 
         script =
           ''
diff --git a/modules/services/networking/ejabberd.nix b/modules/services/networking/ejabberd.nix
index 4dce0926364..ae8cf47b2fa 100644
--- a/modules/services/networking/ejabberd.nix
+++ b/modules/services/networking/ejabberd.nix
@@ -54,8 +54,8 @@ in
     jobs.ejabberd =
       { description = "EJabberd server";
 
-        startOn = "network-interface/started";
-        stopOn = "network-interfaces/stop";
+        startOn = "started network-interface";
+        stopOn = "stopping network-interfaces";
 
         preStart =
           ''
diff --git a/modules/services/networking/firewall.nix b/modules/services/networking/firewall.nix
index 0b8a8d93061..28c43ef3370 100644
--- a/modules/services/networking/firewall.nix
+++ b/modules/services/networking/firewall.nix
@@ -79,7 +79,7 @@ in
     environment.systemPackages = [pkgs.iptables];
 
     jobs.firewall =
-      { startOn = "network-interfaces/started";
+      { startOn = "started network-interfaces";
 
         preStart =
           ''
diff --git a/modules/services/networking/gnunet.nix b/modules/services/networking/gnunet.nix
index e35dfbcd1a8..53223f1df22 100644
--- a/modules/services/networking/gnunet.nix
+++ b/modules/services/networking/gnunet.nix
@@ -194,8 +194,8 @@ in
     jobs.gnunetd =
       { description = "The GNUnet Daemon";
 
-        startOn = "network-interfaces/started";
-        stopOn = "network-interfaces/stop";
+        startOn = "started network-interfaces";
+        stopOn = "stopping network-interfaces";
 
         preStart =
           ''
diff --git a/modules/services/networking/gw6c.nix b/modules/services/networking/gw6c.nix
index d723766bb2c..eaf84c5f70f 100644
--- a/modules/services/networking/gw6c.nix
+++ b/modules/services/networking/gw6c.nix
@@ -134,8 +134,8 @@ in
     jobs.gw6c =
       { description = "Gateway6 client";
       
-        startOn = if cfg.autorun then "network-interfaces/started" else "";
-        stopOn = "network-interfaces/stop";
+        startOn = if cfg.autorun then "started network-interfaces" else "";
+        stopOn = "stopping network-interfaces";
 
         exec = "${gw6cService}/bin/control start";
       };
diff --git a/modules/services/networking/ifplugd.nix b/modules/services/networking/ifplugd.nix
index 85eda29f5a2..f1510b1aa4b 100644
--- a/modules/services/networking/ifplugd.nix
+++ b/modules/services/networking/ifplugd.nix
@@ -58,8 +58,8 @@ in
     jobs.ifplugd =
       { description = "Network interface connectivity monitor";
 
-        startOn = "network-interfaces/started";
-        stopOn = "network-interfaces/stop";
+        startOn = "started network-interfaces";
+        stopOn = "stopping network-interfaces";
 
         exec =
           ''
diff --git a/modules/services/networking/ircd-hybrid.nix b/modules/services/networking/ircd-hybrid.nix
index aea5fbd6550..34c3b13d82d 100644
--- a/modules/services/networking/ircd-hybrid.nix
+++ b/modules/services/networking/ircd-hybrid.nix
@@ -122,8 +122,8 @@ in
 
         description = "IRCD Hybrid server";
 
-        startOn = "${startingDependency}/started";
-        stopOn = "${startingDependency}/stop";
+        startOn = "started ${startingDependency}";
+        stopOn = "stopping ${startingDependency}";
 
         exec = "${ircdService}/bin/control start";
       };
diff --git a/modules/services/networking/openfire.nix b/modules/services/networking/openfire.nix
index 67e2558b22a..a46b4fa4294 100644
--- a/modules/services/networking/openfire.nix
+++ b/modules/services/networking/openfire.nix
@@ -52,8 +52,7 @@ in
     jobs.openfire =
       { description = "OpenFire XMPP server";
 
-        startOn = "${startDependency}/started";
-        stopOn = "shutdown";
+        startOn = "started ${startDependency}";
 
         script =
           ''
diff --git a/modules/services/networking/portmap.nix b/modules/services/networking/portmap.nix
index 0fcbf63d799..5a51836efad 100644
--- a/modules/services/networking/portmap.nix
+++ b/modules/services/networking/portmap.nix
@@ -66,8 +66,8 @@ in
     jobs.portmap =
       { description = "ONC RPC portmap";
 
-        startOn = "network-interfaces/started";
-        stopOn = "network-interfaces/stop";
+        startOn = "started network-interfaces";
+        stopOn = "stopping network-interfaces";
 
         exec =
           ''
diff --git a/modules/services/networking/privoxy.nix b/modules/services/networking/privoxy.nix
index f2350f4c462..eee020a1f0e 100644
--- a/modules/services/networking/privoxy.nix
+++ b/modules/services/networking/privoxy.nix
@@ -81,7 +81,6 @@ in
       { name = "privoxy";
 
         startOn = "startup";
-        stopOn = "shutdown"; 
 
         preStart =
           ''
diff --git a/modules/services/networking/ssh/lshd.nix b/modules/services/networking/ssh/lshd.nix
index c3a14ba17e8..f5d52c82101 100644
--- a/modules/services/networking/ssh/lshd.nix
+++ b/modules/services/networking/ssh/lshd.nix
@@ -119,8 +119,8 @@ in
     jobs.lshd =
       { description = "GNU lshd SSH2 daemon";
 
-        startOn = "network-interfaces/started";
-        stopOn = "network-interfaces/stop";
+        startOn = "started network-interfaces";
+        stopOn = "stopping network-interfaces";
 
         environment =
           { LD_LIBRARY_PATH = config.system.nssModules.path; };
diff --git a/modules/services/networking/vsftpd.nix b/modules/services/networking/vsftpd.nix
index b98a9aa3f7d..4c6b6f411cd 100644
--- a/modules/services/networking/vsftpd.nix
+++ b/modules/services/networking/vsftpd.nix
@@ -102,8 +102,8 @@ in
     jobs.vsftpd =
       { description = "vsftpd server";
 
-        startOn = "network-interfaces/started";
-        stopOn = "network-interfaces/stop";
+        startOn = "started network-interfaces";
+        stopOn = "stopping network-interfaces";
 
         preStart =
           ''
diff --git a/modules/services/networking/wpa_supplicant.nix b/modules/services/networking/wpa_supplicant.nix
index 37b5923421f..93450f8eac1 100644
--- a/modules/services/networking/wpa_supplicant.nix
+++ b/modules/services/networking/wpa_supplicant.nix
@@ -38,8 +38,8 @@ in
     environment.systemPackages = [pkgs.wpa_supplicant];
 
     jobs.wpa_supplicant = 
-      { startOn = "network-interfaces/started";
-        stopOn = "network-interfaces/stop";
+      { startOn = "started network-interfaces";
+        stopOn = "stopping network-interfaces";
 
         preStart =
           ''
diff --git a/modules/services/networking/xinetd.nix b/modules/services/networking/xinetd.nix
index be9e5712e7d..4729ba9d2e4 100644
--- a/modules/services/networking/xinetd.nix
+++ b/modules/services/networking/xinetd.nix
@@ -122,8 +122,8 @@ in
     jobs.xinetd =
       { description = "xinetd server";
 
-        startOn = "network-interfaces/started";
-        stopOn = "network-interfaces/stop";
+        startOn = "started network-interfaces";
+        stopOn = "stopping network-interfaces";
 
         exec = "${xinetd}/sbin/xinetd -syslog daemon -dontfork -stayalive -f ${configFile}";
       };
diff --git a/modules/services/printing/cupsd.nix b/modules/services/printing/cupsd.nix
index 149055d74c5..546eb7be396 100644
--- a/modules/services/printing/cupsd.nix
+++ b/modules/services/printing/cupsd.nix
@@ -160,8 +160,8 @@ in
     jobs.cupsd =
       { description = "CUPS printing daemon";
 
-        startOn = "network-interfaces/started";
-        stopOn = "network-interfaces/stop";
+        startOn = "started network-interfaces";
+        stopOn = "stopping network-interfaces";
 
         preStart =
           ''
diff --git a/modules/services/scheduling/atd.nix b/modules/services/scheduling/atd.nix
index fb579dbf0b2..19fda42928a 100644
--- a/modules/services/scheduling/atd.nix
+++ b/modules/services/scheduling/atd.nix
@@ -67,7 +67,6 @@ in
       { description = "at daemon (atd)";
 
         startOn = "startup";
-        stopOn = "shutdown";
 
         preStart =
           ''
@@ -97,12 +96,12 @@ in
                 chown atd:atd "$jobdir"/.SEQ && \
                 chmod 600 "$jobdir"/.SEQ
             fi
-
-            # `atd' doesn't have a no-fork flag, so start it here. !!!
-            # Fix this once we have Upstart 0.6.
-            ${at}/sbin/atd
           '';
 
+        daemonType = "fork";
+
+        exec = "${at}/sbin/atd";
+
         postStop =
           ''
             test -e /var/run/atd.pid && kill $(cat /var/run/atd.pid)
diff --git a/modules/services/scheduling/cron.nix b/modules/services/scheduling/cron.nix
index 930162f1c73..bae03f40138 100644
--- a/modules/services/scheduling/cron.nix
+++ b/modules/services/scheduling/cron.nix
@@ -70,7 +70,6 @@ in
       { description = "Cron daemon";
 
         startOn = "startup";
-        stopOn = "shutdown";
  
         # Needed to interpret times in the local timezone.
         environment = { TZ = config.time.timeZone; };
diff --git a/modules/services/scheduling/fcron.nix b/modules/services/scheduling/fcron.nix
index b38a70b932a..fbd1288a55f 100644
--- a/modules/services/scheduling/fcron.nix
+++ b/modules/services/scheduling/fcron.nix
@@ -101,7 +101,6 @@ in
       { description = "fcron daemon";
 
         startOn = "startup";
-        stopOn = "shutdown";
 
         environment =
           { PATH = "/var/run/current-system/sw/bin";
diff --git a/modules/services/system/nscd.nix b/modules/services/system/nscd.nix
index a14215c70d1..1e3a4ff75c9 100644
--- a/modules/services/system/nscd.nix
+++ b/modules/services/system/nscd.nix
@@ -21,7 +21,6 @@ in
       { description = "Name Service Cache Daemon";
 
         startOn = "startup";
-        stopOn = "shutdown";
 
         environment = { LD_LIBRARY_PATH = nssModulesPath; };
         
diff --git a/modules/services/system/uptimed.nix b/modules/services/system/uptimed.nix
index 3749358ac20..fd4c1652bd3 100644
--- a/modules/services/system/uptimed.nix
+++ b/modules/services/system/uptimed.nix
@@ -53,7 +53,6 @@ in
       { description = "Uptimed daemon";
 
         startOn = "startup";
-        stopOn = "shutdown";
 
         preStart =
           ''
diff --git a/modules/services/ttys/gpm.nix b/modules/services/ttys/gpm.nix
index 026ed4a299f..256fe8d2380 100644
--- a/modules/services/ttys/gpm.nix
+++ b/modules/services/ttys/gpm.nix
@@ -41,8 +41,7 @@ in
     jobs.gpm =
       { description = "General purpose mouse";
 
-        startOn = "udev";
-        stopOn = "shutdown";
+        startOn = "started udev";
 
         exec = "${pkgs.gpm}/sbin/gpm -m /dev/input/mice -t ${cfg.protocol} -D &>/dev/null";
       };
diff --git a/modules/services/web-servers/apache-httpd/default.nix b/modules/services/web-servers/apache-httpd/default.nix
index 7e3067510d3..c489393f889 100644
--- a/modules/services/web-servers/apache-httpd/default.nix
+++ b/modules/services/web-servers/apache-httpd/default.nix
@@ -450,8 +450,7 @@ in
 
         description = "Apache HTTPD";
 
-        startOn = "${startingDependency}/started";
-        stopOn = "shutdown";
+        startOn = "started ${startingDependency}";
 
         environment =
           { # !!! This should be added in test-instrumentation.nix.  It
diff --git a/modules/services/web-servers/tomcat.nix b/modules/services/web-servers/tomcat.nix
index 331653ba929..4eb5b3fc5b5 100644
--- a/modules/services/web-servers/tomcat.nix
+++ b/modules/services/web-servers/tomcat.nix
@@ -104,8 +104,8 @@ in
     jobs.tomcat =
       { description = "Apache Tomcat server";
 
-        startOn = "network-interface/started";
-        stopOn = "network-interfaces/stop";
+        startOn = "started network-interface";
+        stopOn = "stopping network-interfaces";
 
         preStart =
           ''        
diff --git a/modules/services/x11/xfs.nix b/modules/services/x11/xfs.nix
index 860d5823be3..f2b7108debc 100644
--- a/modules/services/x11/xfs.nix
+++ b/modules/services/x11/xfs.nix
@@ -43,8 +43,7 @@ in
     jobs.xfs =
       { description = "X Font Server";
       
-        startOn = "${startingDependency}/started";
-        stopOn = "shutdown";
+        startOn = "started ${startingDependency}";
 
         exec = "${pkgs.xorg.xfs}/bin/xfs -config ${configFile}";
       };
diff --git a/modules/services/x11/xserver.nix b/modules/services/x11/xserver.nix
index 2d432e831f7..ff288f3b1b0 100644
--- a/modules/services/x11/xserver.nix
+++ b/modules/services/x11/xserver.nix
@@ -360,7 +360,7 @@ in
       optional (elem "virtualbox" driverNames) kernelPackages.virtualboxGuestAdditions;
 
     jobs.xserver =
-      { startOn = if cfg.autorun then "hal" else "never";
+      { startOn = if cfg.autorun then "started hal" else "";
  
         environment =
           { FONTCONFIG_FILE = "/etc/fonts/fonts.conf"; # !!! cleanup
-- 
GitLab


From d7342c78d49ac80c6a1464bbc9c1cdf188eeebe9 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 6 Nov 2009 22:45:19 +0000
Subject: [PATCH 1988/5331] * Support pre-stop scripts.  These are needed to
 cleanly shutdown   daemons such as Apache or PostgreSQL.

svn path=/nixos/branches/upstart-0.6/; revision=18234
---
 .../web-servers/apache-httpd/default.nix         |  9 ++++++++-
 modules/system/upstart/upstart.nix               | 16 ++++++++++++++++
 2 files changed, 24 insertions(+), 1 deletion(-)

diff --git a/modules/services/web-servers/apache-httpd/default.nix b/modules/services/web-servers/apache-httpd/default.nix
index c489393f889..107340c4586 100644
--- a/modules/services/web-servers/apache-httpd/default.nix
+++ b/modules/services/web-servers/apache-httpd/default.nix
@@ -480,7 +480,14 @@ in
             done
           '';
 
-        exec = "${httpd}/bin/httpd -f ${httpdConf} -DNO_DETACH";
+        daemonType = "fork";
+
+        exec = "${httpd}/bin/httpd -f ${httpdConf}";
+
+        preStop =
+          ''
+            ${httpd}/bin/httpd -f ${httpdConf} -k graceful-stop
+          '';
       };
 
   };
diff --git a/modules/system/upstart/upstart.nix b/modules/system/upstart/upstart.nix
index 3d2af1b0382..f7c9eaaa6ef 100644
--- a/modules/system/upstart/upstart.nix
+++ b/modules/system/upstart/upstart.nix
@@ -72,6 +72,12 @@ let
           ${optionalString job.task "task"}
           ${optionalString job.respawn "respawn"}
 
+          ${optionalString (job.preStop != "") ''
+            pre-stop script
+              ${job.preStop}
+            end script
+          ''}
+
           ${optionalString (job.postStop != "") ''
             post-stop script
               ${job.postStop}
@@ -165,6 +171,16 @@ let
       '';
     };
 
+    preStop = mkOption {
+      type = types.string;
+      default = "";
+      description = ''
+        Shell commands executed before the job is stopped
+        (i.e. before Upstart kills the job's main process).  This can
+        be used to cleanly shut down a daemon.
+      '';
+    };
+
     postStop = mkOption {
       type = types.string;
       default = "";
-- 
GitLab


From 18f2d75275ed6167b250c0513e21e14432e5cfe0 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 6 Nov 2009 22:56:47 +0000
Subject: [PATCH 1989/5331] * Set a timezone in the PostgreSQL job.  Otherwise
 database   initialisation will be incredibly slow (minutes instead of  
 seconds).  An strace shows that it's continuously looking up   timezone
 information if TZ is empty.

svn path=/nixos/branches/upstart-0.6/; revision=18235
---
 modules/services/databases/postgresql.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/modules/services/databases/postgresql.nix b/modules/services/databases/postgresql.nix
index 92e6083d948..9f1ca6e2ed1 100644
--- a/modules/services/databases/postgresql.nix
+++ b/modules/services/databases/postgresql.nix
@@ -118,6 +118,8 @@ in
 
         startOn = "started ${startDependency}";
 
+        environment = { TZ = config.time.timeZone; };
+
         preStart =
           ''
             if ! test -e ${cfg.dataDir}; then
-- 
GitLab


From 06fcb121fb06031486a9335730e88aca78b5c30b Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 6 Nov 2009 23:37:31 +0000
Subject: [PATCH 1990/5331] * Shut down PostgreSQL cleanly.

svn path=/nixos/branches/upstart-0.6/; revision=18236
---
 modules/services/databases/postgresql.nix | 25 ++++++++++++++++++++---
 1 file changed, 22 insertions(+), 3 deletions(-)

diff --git a/modules/services/databases/postgresql.nix b/modules/services/databases/postgresql.nix
index 9f1ca6e2ed1..cd1f9dc8094 100644
--- a/modules/services/databases/postgresql.nix
+++ b/modules/services/databases/postgresql.nix
@@ -118,19 +118,38 @@ in
 
         startOn = "started ${startDependency}";
 
-        environment = { TZ = config.time.timeZone; };
+        environment =
+          { TZ = config.time.timeZone;
+            PGDATA = cfg.dataDir;
+          };
 
         preStart =
           ''
+            # Initialise the database.
             if ! test -e ${cfg.dataDir}; then
                 mkdir -m 0700 -p ${cfg.dataDir}
                 chown -R postgres ${cfg.dataDir}
-                ${run} -c '${postgresql}/bin/initdb -D ${cfg.dataDir} -U root'
+                ${run} -c '${postgresql}/bin/initdb -U root'
             fi
+            
             cp -f ${pkgs.writeText "pg_hba.conf" cfg.authentication} ${cfg.dataDir}/pg_hba.conf
+
+            # We'd like to use the `-w' flag here to wait until the
+            # database is up, but it requires a `postgres' user to
+            # exist.  And we can't call `createuser' before the
+            # database is running.
+            ${run} -c '${postgresql}/bin/pg_ctl start'
+
+            # So wait until the server is running.
+            while ! ${run} -c '${postgresql}/bin/pg_ctl status'; do
+                sleep 1
+            done
           '';
 
-        exec = "${run} -c '${postgresql}/bin/postgres -D ${cfg.dataDir} ${toString flags}'";
+        postStop =
+          ''
+            ${run} -c '${postgresql}/bin/pg_ctl stop -m fast'
+          '';
       };
 
   };
-- 
GitLab


From b7c519456e534e93649239ffe87a094a7ebb4dc5 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sat, 7 Nov 2009 01:17:56 +0000
Subject: [PATCH 1991/5331] * Updated switch-to-configuration for Upstart 0.6.

svn path=/nixos/branches/upstart-0.6/; revision=18237
---
 .../activation/switch-to-configuration.sh     | 52 +++++++++----------
 1 file changed, 25 insertions(+), 27 deletions(-)

diff --git a/modules/system/activation/switch-to-configuration.sh b/modules/system/activation/switch-to-configuration.sh
index 802b57a31af..18a0664daa7 100644
--- a/modules/system/activation/switch-to-configuration.sh
+++ b/modules/system/activation/switch-to-configuration.sh
@@ -54,27 +54,24 @@ EOF
         exit 1
     fi
 
-    oldEvents=$(readlink -f /etc/event.d || true)
-    newEvents=$(readlink -f @out@/etc/event.d)
+    oldJobs=$(readlink -f /etc/static/init)
+    newJobs=$(readlink -f @out@/etc/init)
 
-    #echo "old: $oldEvents"
-    #echo "new: $newEvents"
+    echo "old: $oldJobs"
+    echo "new: $newJobs"
 
     stopJob() {
         local job=$1
-        initctl stop "$job"
-        while ! initctl status "$job" 2>&1 | grep -q "(stop) waiting"; do
-            echo "waiting for $job to stop..."
-            sleep 1
-        done
+        initctl stop "$job" || true
     }
 
     # Stop all services that are not in the new Upstart
     # configuration.
-    for event in $(cd $oldEvents && ls); do
-        if ! test -e "$newEvents/$event"; then
-            echo "stopping $event..."
-            stopJob $event
+    for job in $(cd $oldJobs && ls *.conf); do
+        job=$(basename $job .conf)
+        if ! test -e "$newJobs/$job.conf"; then
+            echo "stopping $job..."
+            stopJob $job
         fi
     done
 
@@ -83,26 +80,27 @@ EOF
     echo "activating the configuration..."
     @out@/activate @out@
 
-    # Make Upstart reload its events.  !!! Should wait until it has
-    # finished processing its stop events.
-    kill -TERM 1 
+    # Make Upstart reload its jobs.
+    initctl reload-configuration
 
     # Start all new services and restart all changed services.
-    for event in $(cd $newEvents && ls); do
+    for job in $(cd $newJobs && ls *.conf); do
 
-        # Hack: skip the sys-* and ctrl-alt-delete events.
+        job=$(basename $job .conf)
+        
+        # Hack: skip the shutdown and control-alt-delete jobs.
         # Another hack: don't restart the X server (that would kill all the clients).
         # And don't restart dbus, since that causes ConsoleKit to
         # forget about current sessions.
-        if echo "$event" | grep -q "^sys-\|^ctrl-\|^xserver$\|^dbus$"; then continue; fi
-    
-        if ! test -e "$oldEvents/$event"; then
-            echo "starting $event..."
-            initctl start "$event"
-        elif test "$(readlink "$oldEvents/$event")" != "$(readlink "$newEvents/$event")"; then
-            echo "restarting $event..."
-            stopJob $event
-            initctl start "$event"
+        if echo "$job" | grep -q "^shutdown$\|^control-alt-delete$\|^xserver$\|^dbus$"; then continue; fi
+
+        if ! test -e "$oldJobs/$job.conf"; then
+            echo "starting $job..."
+            initctl start "$job" || true
+        elif test "$(readlink "$oldJobs/$job.conf")" != "$(readlink "$newJobs/$job.conf")"; then
+            echo "restarting $job..."
+            stopJob $job
+            initctl start "$job" || true
         fi
     done
 fi
-- 
GitLab


From 7d47575a58827ac61bf8c1068f3c81e7324233be Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sat, 7 Nov 2009 11:32:28 +0000
Subject: [PATCH 1992/5331] * A 15-second timeout to start the X server is too
 low if there are a   billion other daemons starting at the same time during
 the boot.

svn path=/nixos/branches/upstart-0.6/; revision=18250
---
 modules/services/x11/display-managers/kdm.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/modules/services/x11/display-managers/kdm.nix b/modules/services/x11/display-managers/kdm.nix
index 55171035442..18a6623eb85 100644
--- a/modules/services/x11/display-managers/kdm.nix
+++ b/modules/services/x11/display-managers/kdm.nix
@@ -26,6 +26,8 @@ let
 
       [X-:*-Core]
       ServerCmd=${dmcfg.xserverBin} ${dmcfg.xserverArgs}
+      # The default timeout (15) is too short in a heavily loaded boot process.
+      ServerTimeout=60
       # Needed to prevent the X server from dying on logout and not coming back:
       TerminateServer=true
 
-- 
GitLab


From 7aecd0ca53d28a0398020907df50e4c7e694bb16 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sat, 7 Nov 2009 12:01:12 +0000
Subject: [PATCH 1993/5331] * hal: depend on both dbus and acpid (if enabled).
 * dbus: don't signal Upstart, since that seems to make it forget about  
 pending events or something.  In any case starting dbus after acpid   was
 running wouldn't trigger hal to be started (but the other way   around did
 work).

svn path=/nixos/branches/upstart-0.6/; revision=18251
---
 modules/services/hardware/hal.nix | 4 +---
 modules/services/system/dbus.nix  | 6 ------
 2 files changed, 1 insertion(+), 9 deletions(-)

diff --git a/modules/services/hardware/hal.nix b/modules/services/hardware/hal.nix
index 9ee16cedf87..6c033256633 100644
--- a/modules/services/hardware/hal.nix
+++ b/modules/services/hardware/hal.nix
@@ -67,9 +67,7 @@ in
     jobs.hal =
       { description = "HAL daemon";
         
-        # !!! TODO: make sure that HAL starts after acpid,
-        # otherwise hald-addon-acpi will grab /proc/acpi/event.
-        startOn = if config.powerManagement.enable then "started acpid" else "started dbus";
+        startOn = "started dbus" + optionalString config.powerManagement.enable " and started acpid";
 
         environment =
           { # !!! HACK? These environment variables manipulated inside
diff --git a/modules/services/system/dbus.nix b/modules/services/system/dbus.nix
index 6f79865645d..b0c8dc66ae5 100644
--- a/modules/services/system/dbus.nix
+++ b/modules/services/system/dbus.nix
@@ -130,12 +130,6 @@ in
 
         exec = "${dbus}/bin/dbus-daemon --config-file=${configDir}/system.conf";
 
-        postStart =
-          ''
-            # Signal Upstart that it can connect to the system bus.
-            kill -HUP 1 || true
-          '';
-
         postStop =
           ''
             # !!! Hack: doesn't belong here.
-- 
GitLab


From d9d072a89bcefe7685a0e9709f3937e1e161c59f Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sat, 7 Nov 2009 12:43:32 +0000
Subject: [PATCH 1994/5331] * Improve the mysql shutdown.

svn path=/nixos/branches/upstart-0.6/; revision=18255
---
 modules/services/databases/mysql.nix | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/modules/services/databases/mysql.nix b/modules/services/databases/mysql.nix
index 81a2c5ea007..230d36dfe91 100644
--- a/modules/services/databases/mysql.nix
+++ b/modules/services/databases/mysql.nix
@@ -89,14 +89,12 @@ in
             chown -R ${cfg.user} ${cfg.pidDir}
           '';
 
-        exec = "${mysql}/bin/mysqld ${mysqldOptions}";
+        exec = "${mysql}/libexec/mysqld ${mysqldOptions}";
 
-        postStop =
-          ''
-            pid=$(cat ${pidFile})
-            kill "$pid"
-            ${mysql}/bin/mysql_waitpid "$pid" 1000
-          '';
+        # !!! Need a postStart script to wait until mysqld is ready to
+        # accept connections.
+
+        extraConfig = "kill timeout 60";
       };
 
   };
-- 
GitLab


From 2353e53c5f985c26cd33dd252d0e2ff96397eb59 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sat, 7 Nov 2009 15:24:59 +0000
Subject: [PATCH 1995/5331] * /var/run/safemode isn't used anywhere.

svn path=/nixos/branches/upstart-0.6/; revision=18257
---
 modules/system/boot/stage-2-init.sh | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/modules/system/boot/stage-2-init.sh b/modules/system/boot/stage-2-init.sh
index 30298c3127f..5343aa9eae9 100644
--- a/modules/system/boot/stage-2-init.sh
+++ b/modules/system/boot/stage-2-init.sh
@@ -27,7 +27,7 @@ setPath "@path@"
 # Mount special file systems.
 mkdir -m 0755 -p /etc
 test -e /etc/fstab || touch /etc/fstab # to shut up mount
-[ -s /etc/mtab ] && rm /etc/mtab # while installing a symlink is created (see man mount), if it's still there for whateever reason remove it
+test -s /etc/mtab && rm /etc/mtab # while installing a symlink is created (see man mount), if it's still there for whateever reason remove it
 rm -f /etc/mtab* # not that we care about stale locks
 mkdir -m 0755 -p /proc
 mount -n -t proc none /proc
@@ -100,11 +100,6 @@ rm -rf /var/lock
 # gone, of course.
 rm -rf /nix/var/nix/chroots # recreated in activate-configuration.sh
 
-if test -n "$safeMode"; then
-    mkdir -m 0755 -p /var/run
-    touch /var/run/safemode
-fi
-
 
 # Create the minimal device nodes needed for the activation scripts
 # and Upstart.
-- 
GitLab


From 9bf8801dc6cfba63811f16b2b9cf0b37ad5897d5 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sat, 7 Nov 2009 15:29:46 +0000
Subject: [PATCH 1996/5331] * Use a tmpfs for /var/run/nscd to ensure that / or
 /var can be   unmounted or at least remounted read-only during shutdown. 
 Upstart   0.6 apparently uses nscd to do some name lookups, resulting in it  
 holding some mmap mappings to deleted files in /var/run/nscd.   E.g. lsof
 shows:

    init         1 root  DEL       REG              253,0          1850313 /var/run/nscd/dbyn3Piz
    init         1 root  DEL       REG              253,0          1850312 /var/run/nscd/dbt2e8PH

  See also http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=324900.
  This is a workaround - it would be better if Upstart didn't do this.

svn path=/nixos/branches/upstart-0.6/; revision=18258
---
 modules/system/activation/activation-script.nix | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/modules/system/activation/activation-script.nix b/modules/system/activation/activation-script.nix
index a62120363f2..c29c82dd7ae 100644
--- a/modules/system/activation/activation-script.nix
+++ b/modules/system/activation/activation-script.nix
@@ -84,6 +84,14 @@ let
       mkdir -m 0755 -p /var/run/nix/current-load # for distributed builds
       mkdir -m 0700 -p /var/run/nix/remote-stores
 
+      # Use a tmpfs for /var/run/nscd to ensure that / or /var can be
+      # unmounted or at least remounted read-only during shutdown.
+      # (Upstart 0.6 apparently uses nscd to do some name lookups,
+      # resulting in it holding some mmap mapping to deleted files in
+      # /var/run/nscd.)
+      mkdir -p /var/run/nscd
+      ${pkgs.utillinux}/bin/mount -t tmpfs -o "mode=755" none /var/run/nscd
+
       mkdir -m 0755 -p /var/log
 
       touch /var/log/wtmp # must exist
-- 
GitLab


From b0ba17873cec97c0350c8a8448e2f78ff332ff19 Mon Sep 17 00:00:00 2001
From: Wouter den Breejen <uu@denbreejen.net>
Date: Sat, 7 Nov 2009 21:03:57 +0000
Subject: [PATCH 1997/5331] Fixed hash replace with a variable to the real hash

svn path=/nixos/trunk/; revision=18268
---
 modules/services/network-filesystems/samba.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/services/network-filesystems/samba.nix b/modules/services/network-filesystems/samba.nix
index 98d58e9f7f4..9b7937ac4a1 100644
--- a/modules/services/network-filesystems/samba.nix
+++ b/modules/services/network-filesystems/samba.nix
@@ -28,7 +28,7 @@ let
         mkdir -p /var/samba/locks /var/samba/cores/nmbd  /var/samba/cores/smbd /var/samba/cores/winbindd
       fi
 
-      passwdFile="$(sed -n 's/^.*smb[ ]\+passwd[ ]\+file[ ]\+=[ ]\+\(.*\)/\1/p' /nix/store/nnmrqalldfv2vkwy6qpg340rv7w34lmp-smb.conf)"
+      passwdFile="$(sed -n 's/^.*smb[ ]\+passwd[ ]\+file[ ]\+=[ ]\+\(.*\)/\1/p' ${configFile})"
       if [ -n "$passwdFile" ]; then
         echo 'INFO: creating directory containing passwd file'
         mkdir -p "$(dirname "$passwdFile")"
-- 
GitLab


From 16c2aa734f8c7b7f7026a8a953f1595741a99a84 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sun, 8 Nov 2009 09:01:53 +0000
Subject: [PATCH 1998/5331] * Generate /etc/modprobe.conf to allow the setting
 of module options   and the blacklisting of modules.

svn path=/nixos/trunk/; revision=18284
---
 modules/module-list.nix          |  1 +
 modules/system/boot/kernel.nix   | 26 ++---------
 modules/system/boot/modprobe.nix | 80 ++++++++++++++++++++++++++++++++
 3 files changed, 85 insertions(+), 22 deletions(-)
 create mode 100644 modules/system/boot/modprobe.nix

diff --git a/modules/module-list.nix b/modules/module-list.nix
index 861039d7391..cb1a19b4dfc 100644
--- a/modules/module-list.nix
+++ b/modules/module-list.nix
@@ -121,6 +121,7 @@
   ./system/activation/activation-script.nix
   ./system/activation/top-level.nix
   ./system/boot/kernel.nix
+  ./system/boot/modprobe.nix
   ./system/boot/stage-1.nix
   ./system/boot/stage-2.nix
   ./system/etc/etc.nix
diff --git a/modules/system/boot/kernel.nix b/modules/system/boot/kernel.nix
index ea6f2812485..d7facd76519 100644
--- a/modules/system/boot/kernel.nix
+++ b/modules/system/boot/kernel.nix
@@ -1,8 +1,9 @@
-{pkgs, config, ...}:
+{ config, pkgs, ... }:
+
+with pkgs.lib;
 
 ###### interface
 let
-  inherit (pkgs.lib) mkOption;
 
   options = {
     boot = {
@@ -148,31 +149,12 @@ let
         built outside of the kernel.  Combine these into a single tree of
         symlinks because modprobe only supports one directory.
       ";
-      merge = pkgs.lib.mergeListOption;
+      merge = mergeListOption;
 
       # Convert the list of path to only one path.
       apply = pkgs.aggregateModules;
     };
 
-    system.sbin.modprobe = mkOption {
-      # should be moved in module-init-tools
-      internal = true;
-      default = pkgs.writeTextFile {
-        name = "modprobe";
-        destination = "/sbin/modprobe";
-        executable = true;
-        text =
-          ''
-            #! ${pkgs.stdenv.shell}
-            export MODULE_DIR=${config.system.modulesTree}/lib/modules
-            exec ${pkgs.module_init_tools}/sbin/modprobe "$@"
-          '';
-      };
-      description = ''
-        Wrapper around modprobe that sets the path to the modules
-        tree.
-      '';
-    };
   };
   
 in
diff --git a/modules/system/boot/modprobe.nix b/modules/system/boot/modprobe.nix
new file mode 100644
index 00000000000..919a08f22ba
--- /dev/null
+++ b/modules/system/boot/modprobe.nix
@@ -0,0 +1,80 @@
+{ config, pkgs, ... }:
+
+with pkgs.lib;
+
+# blacklist "cirrusfb" "i2c_piix4"
+
+{
+
+  ###### interface
+
+  options = {
+
+    system.sbin.modprobe = mkOption {
+      # should be moved in module-init-tools
+      internal = true;
+      default = pkgs.writeTextFile {
+        name = "modprobe";
+        destination = "/sbin/modprobe";
+        executable = true;
+        text =
+          ''
+            #! ${pkgs.stdenv.shell}
+            export MODULE_DIR=${config.system.modulesTree}/lib/modules
+            exec ${pkgs.module_init_tools}/sbin/modprobe "$@"
+          '';
+      };
+      description = ''
+        Wrapper around modprobe that sets the path to the modules
+        tree.
+      '';
+    };
+
+    boot.blacklistedKernelModules = mkOption {
+      default = [];
+      example = [ "cirrusfb" "i2c_piix4" ];
+      description = ''
+        List of names of kernel modules that should not be loaded
+        automatically by the hardware probing code.
+      '';
+    };
+  
+    boot.extraModprobeConfig = mkOption {
+      default = "";
+      example =
+        ''
+          options parport_pc io=0x378 irq=7 dma=1
+        '';
+      description = ''
+        Any additional configuration to be appended to the generated
+        <filename>modprobe.conf</filename>.  This is typically used to
+        specify module options.  See
+        <citerefentry><refentrytitle>modprobe.conf</refentrytitle>
+        <manvolnum>5</manvolnum></citerefentry> for details.
+      '';
+    };
+  
+  };
+
+
+  ###### implementation
+
+  config = {
+
+    environment.etc = singleton
+      { source = pkgs.writeText "modprobe.conf"
+          ''
+            ${flip concatMapStrings config.boot.blacklistedKernelModules (name: ''
+              blacklist ${name}
+            '')}
+            ${config.boot.extraModprobeConfig}
+          '';
+        target = "modprobe.conf";
+      };
+
+  };
+
+}
+
+
+        
\ No newline at end of file
-- 
GitLab


From 37470cccc5d6acc66b14f359d76e0b1c5ed38f93 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sun, 8 Nov 2009 09:08:50 +0000
Subject: [PATCH 1999/5331] * Blacklist the "evbug" module.

svn path=/nixos/trunk/; revision=18285
---
 modules/system/boot/modprobe.nix | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/modules/system/boot/modprobe.nix b/modules/system/boot/modprobe.nix
index 919a08f22ba..520a7b19767 100644
--- a/modules/system/boot/modprobe.nix
+++ b/modules/system/boot/modprobe.nix
@@ -72,9 +72,16 @@ with pkgs.lib;
         target = "modprobe.conf";
       };
 
-  };
+    boot.blacklistedKernelModules =
+      [ # This module is for debugging and generates gigantic amounts
+        # of log output, so it should never be loaded automatically.
+        "evbug"
 
-}
+        # !!! Hm, Ubuntu blacklists all framebuffer devices because
+        # they're "buggy" and cause suspend problems.  Maybe we should
+        # too?
+      ];
 
+  };
 
-        
\ No newline at end of file
+}
-- 
GitLab


From 616c844336cfc0a3ab958bbbb4fcab45142f5852 Mon Sep 17 00:00:00 2001
From: Nicolas Pierron <nicolas.b.pierron@gmail.com>
Date: Sun, 8 Nov 2009 16:01:22 +0000
Subject: [PATCH 2000/5331] * Move the default value of videoDrivers into the
 default field of the   option.  Otherwise, the system may depends on
 unused/unsupported   softwares and users will be force to use properties in
 their   configuration.nix file to override this default value. (too complex
 for   new users)

svn path=/nixos/trunk/; revision=18288
---
 modules/services/x11/xserver.nix | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/modules/services/x11/xserver.nix b/modules/services/x11/xserver.nix
index 25b5c4a615f..92324de042f 100644
--- a/modules/services/x11/xserver.nix
+++ b/modules/services/x11/xserver.nix
@@ -179,7 +179,9 @@ in
       };
 
       videoDrivers = mkOption {
-        default = [];
+        # !!! We'd like "nv" here, but it segfaults the X server.  Idem for
+        # "vmware".
+        default = [ "ati" "cirrus" "intel" "vesa" ];
         example = [ "vesa" ];
         description = ''
           The names of the video drivers that the X server should
@@ -496,10 +498,6 @@ in
         '')}
       '';
 
-    # The default set of supported video drivers.  !!! We'd like "nv"
-    # here, but it segfaults the X server.  Idem for "vmware".
-    services.xserver.videoDrivers = [ "ati" "cirrus" "intel" "vesa" ];
-
   };
 
 }
-- 
GitLab


From 420639a4b17d58c358fdad7272f0acfdd4c1e9d7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Sun, 8 Nov 2009 17:38:35 +0000
Subject: [PATCH 2001/5331] Making generations-dir consider the pkgs.platform.
 stdenv-updates stuff. Still to be reviewed, but at least an implementation to
 have some different armv5tel-linux platforms: qemu versatile and the
 sheevaplug.

svn path=/nixos/trunk/; revision=18290
---
 .../generations-dir-builder.sh                | 21 +++++++++++++++----
 .../generations-dir/generations-dir.nix       |  8 ++++++-
 2 files changed, 24 insertions(+), 5 deletions(-)

diff --git a/modules/installer/generations-dir/generations-dir-builder.sh b/modules/installer/generations-dir/generations-dir-builder.sh
index 80f2b638e51..2dbe1356753 100644
--- a/modules/installer/generations-dir/generations-dir-builder.sh
+++ b/modules/installer/generations-dir/generations-dir-builder.sh
@@ -68,18 +68,31 @@ addEntry() {
     mkdir -p $outdir
     ln -sf $(readlink -f $path) $outdir/system
     ln -sf $(readlink -f $path/init) $outdir/init
-    ln -sf $(readlink -f $path/initrd) $outdir/initrd
-    ln -sf $(readlink -f $path/kernel) $outdir/kernel
+    ln -sf $initrd $outdir/initrd
+    ln -sf $kernel $outdir/kernel
 
     if test $(readlink -f "$path") = "$default"; then
       cp "$kernel" /boot/nixos-kernel
       cp "$initrd" /boot/nixos-initrd
       cp "$(readlink -f "$path/init")" /boot/nixos-init
+
       mkdir -p /boot/default
+      if [ -e /boot/default/system ];
+        rm /boot/default/system
+      fi
       ln -sf $(readlink -f $path) /boot/default/system
+      if [ -e /boot/default/init ];
+        rm /boot/default/init
+      fi
       ln -sf $(readlink -f $path/init) /boot/default/init
-      ln -sf $(readlink -f $path/initrd) /boot/default/initrd
-      ln -sf $(readlink -f $path/kernel) /boot/default/kernel
+      if [ -e /boot/default/initrd ];
+        rm /boot/default/initrd
+      fi
+      ln -sf $initrd /boot/default/initrd
+      if [ -e /boot/default/kernel ];
+        rm /boot/default/kernel
+      fi
+      ln -sf $kernel /boot/default/kernel
     fi
 }
 
diff --git a/modules/installer/generations-dir/generations-dir.nix b/modules/installer/generations-dir/generations-dir.nix
index 7ee7a1828da..4b999a8d5a4 100644
--- a/modules/installer/generations-dir/generations-dir.nix
+++ b/modules/installer/generations-dir/generations-dir.nix
@@ -41,6 +41,9 @@ let
     inherit (config.boot.loader.generationsDir) copyKernels;
   };
 
+  # Temporary check, for nixos to cope both with nixpkgs stdenv-updates and trunk
+  platform = (if pkgs ? platform then pkgs.platform else
+    { name = "pc"; uboot = null; });
 in
 {
   require = [
@@ -55,6 +58,9 @@ in
       menuBuilder = generationsDirBuilder;
     };
     boot.loader.id = "generationsDir";
-    boot.loader.kernelFile = "uImage";
+    boot.loader.kernelFile = (
+       if (platform.name == "sheevaplug") then "uImage"
+       else if (platform.name == "versatileARM") then "zImage"
+       else "vmlinuz");
   };
 }
-- 
GitLab


From de1713a24f2f4ed8772d00fe61102e4e24a4a630 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Sun, 8 Nov 2009 18:32:21 +0000
Subject: [PATCH 2002/5331] Failing when the top level system expression cannot
 find the kernel image

svn path=/nixos/trunk/; revision=18291
---
 modules/system/activation/top-level.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/modules/system/activation/top-level.nix b/modules/system/activation/top-level.nix
index 1e3f22c37ad..bb1cacfa78a 100644
--- a/modules/system/activation/top-level.nix
+++ b/modules/system/activation/top-level.nix
@@ -65,6 +65,7 @@ let
       if [ ! -f ${kernelPath} ]; then
         echo "The bootloader cannot find the proper kernel image."
         echo "(Expecting ${kernelPath})"
+        false
       fi
       ln -s ${kernelPath} $out/kernel
       if [ -n "$grub" ]; then 
-- 
GitLab


From f9b44a7f0dd797086cdd46051e879a83afd602ea Mon Sep 17 00:00:00 2001
From: Marco Maggesi <maggesi@math.unifi.it>
Date: Tue, 10 Nov 2009 15:01:12 +0000
Subject: [PATCH 2003/5331] Add configurations for package OpenAFS

svn path=/nixos/trunk/; revision=18320
---
 modules/module-list.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/modules/module-list.nix b/modules/module-list.nix
index cb1a19b4dfc..a25857f2a9a 100644
--- a/modules/module-list.nix
+++ b/modules/module-list.nix
@@ -60,6 +60,7 @@
   ./services/monitoring/zabbix-agent.nix
   ./services/monitoring/zabbix-server.nix
   ./services/network-filesystems/nfs-kernel.nix
+  ./services/network-filesystems/openafs-client/default.nix
   ./services/network-filesystems/samba.nix
   ./services/networking/avahi-daemon.nix
   ./services/networking/bind.nix
-- 
GitLab


From 4bc162df4c745a0f3092c5e47b9abdcd21b1981d Mon Sep 17 00:00:00 2001
From: Marco Maggesi <maggesi@math.unifi.it>
Date: Tue, 10 Nov 2009 15:22:57 +0000
Subject: [PATCH 2004/5331] Add configurations for package OpenAFS (added
 forgotten files)

svn path=/nixos/trunk/; revision=18321
---
 .../openafs-client/CellServDB                 | 656 ++++++++++++++++++
 .../openafs-client/default.nix                |  82 +++
 2 files changed, 738 insertions(+)
 create mode 100644 modules/services/network-filesystems/openafs-client/CellServDB
 create mode 100644 modules/services/network-filesystems/openafs-client/default.nix

diff --git a/modules/services/network-filesystems/openafs-client/CellServDB b/modules/services/network-filesystems/openafs-client/CellServDB
new file mode 100644
index 00000000000..1a4b03b05d4
--- /dev/null
+++ b/modules/services/network-filesystems/openafs-client/CellServDB
@@ -0,0 +1,656 @@
+>grand.central.org      #GCO Public CellServDB 29 Jun 2009
+18.9.48.14                      #grand.mit.edu
+128.2.203.61                    #penn.central.org
+130.237.48.87                   #andrew.e.kth.se
+>wu-wien.ac.at          #University of Economics, Vienna, Austria
+137.208.3.33                    #goya.wu-wien.ac.at
+137.208.7.57                    #caravaggio.wu-wien.ac.at
+137.208.127.57                  #vermeer.wu-wien.ac.at
+>hephy.at               #hephy-vienna
+193.170.243.10                  #mowgli.oeaw.ac.at
+193.170.243.12                  #baloo.oeaw.ac.at
+193.170.243.14                  #akela.oeaw.ac.at
+>cgv.tugraz.at          #CGV cell
+129.27.218.30                   #phobos.cgv.tugraz.at
+129.27.218.31                   #deimos.cgv.tugraz.at
+129.27.218.32                   #trinculo.cgv.tugraz.at
+>itp.tugraz.at          #Institute of Theoretical and Computational Physics, TU Graz, Aus
+129.27.161.7                    #faepafs1.tu-graz.ac.at
+129.27.161.15                   #faepafs2.tu-graz.ac.at
+129.27.161.114                  #faepafs3.tu-graz.ac.at
+>sums.math.mcgill.ca    #Society of Undergraduate Mathematics Students of McGill Universi
+132.216.24.122                  #germain.sums.math.mcgill.ca
+132.216.24.125                  #turing.sums.math.mcgill.ca
+>cern.ch                #European Laboratory for Particle Physics, Geneva
+137.138.128.148                 #afsdb1.cern.ch
+137.138.246.50                  #afsdb3.cern.ch
+137.138.246.51                  #afsdb2.cern.ch
+>ams.cern.ch            #AMS Experiment
+137.138.188.185                 #ams.cern.ch
+137.138.199.58                  #pcamsf4.cern.ch
+>epfl.ch                #Swiss Federal Institute of Technology at Lausanne
+128.178.109.111                 #kd1.epfl.ch
+128.178.109.112                 #kd2.epfl.ch
+128.178.109.113                 #kd3.epfl.ch
+>ethz.ch                #Swiss Federal Inst. of Tech. - Zurich, Switzerland
+82.130.118.32                   #afs-db-1.ethz.ch
+>psi.ch                 #Paul Scherrer Institut - Villigen, Switzerland
+129.129.190.140                 #afs00.psi.ch
+129.129.190.141                 #afs01.psi.ch
+129.129.190.142                 #afs02.psi.ch
+>extundo.com            #Simon Josefsson's cell
+195.42.214.241                  #slipsten.extundo.com
+>freedaemon.com         #Free Daemon Consulting, Oklahoma City, OK, USA
+66.210.104.254                  #afs0.freedaemon.com
+>membrain.com           #membrain.com
+66.93.118.125                   #stormy
+130.85.24.11                    #weasel
+130.85.24.13                    #straykitten
+>setfilepointer.com     #SetFilePointer.com
+63.224.10.2                     #hamlet.SetFilePointer.com
+63.224.10.4                     #troilus.SetFilePointer.com
+>sodre.cx               #Sodre.cx
+128.8.140.165                   #greed.sodre.cx
+>ruk.cuni.cz            #Charles University Computer Centre, Prague, CR
+195.113.0.36                    #asterix.ruk.cuni.cz
+195.113.0.37                    #obelix.ruk.cuni.cz
+195.113.0.40                    #sal.ruk.cuni.cz
+>ics.muni.cz            #Masaryk university
+147.251.3.11                    #grond.ics.muni.cz
+147.251.3.15                    #nimloth.ics.muni.cz
+147.251.3.19                    #sirion.ics.muni.cz
+>zcu.cz                 #University of West Bohemia, Czech Republic
+147.228.10.18                   #sauron.zcu.cz
+147.228.52.10                   #oknos.zcu.cz
+147.228.52.17                   #nic.zcu.cz
+>desy.de                #Deutsches Elektronen-Synchrotron
+131.169.2.19                    #afsdb2.desy.de
+131.169.2.20                    #afsdb3.desy.de
+131.169.244.60                  #solar00.desy.de
+>gppc.de                #GPP Chemnitz mbH
+213.187.92.33                   #gpp1.gppc.de
+213.187.92.34                   #paulchen.gppc.de
+213.187.92.35                   #lotus.gppc.de
+>cms.hu-berlin.de       #Humboldt University Berlin
+141.20.1.65                     #commodus.cms.hu-berlin.de
+141.20.1.66                     #faustinus.cms.hu-berlin.de
+141.20.1.67                     #marcellus.cms.hu-berlin.de
+>ifh.de                 #DESY Zeuthen
+141.34.22.10                    #romulus.ifh.de
+141.34.22.11                    #remus.ifh.de
+141.34.22.29                    #hekate.ifh.de
+>lrz-muenchen.de        #Leibniz Computing Centre, Germany
+129.187.10.36                   #afs1.lrz-muenchen.de
+129.187.10.56                   #afs3.lrz-muenchen.de
+129.187.10.57                   #afs2.lrz-muenchen.de
+>ipp-garching.mpg.de    #Institut fuer Plasmaphysik
+130.183.9.5                     #afs-db1.rzg.mpg.de
+130.183.100.10                  #afs-db2.aug.ipp-garching.mpg.de
+130.183.100.23                  #afs-db3.aug.ipp-garching.mpg.de
+>mpe.mpg.de             #MPE cell
+130.183.130.7                   #irafs1.mpe-garching.mpg.de
+130.183.134.20                  #irafs2.mpe-garching.mpg.de
+>i1.informatik.rwth-aachen.de #Informatik I, RWTH Aachen
+137.226.244.79                  #remus.informatik.rwth-aachen.de
+>combi.tfh-wildau.de    #Philips Research Lab
+194.95.50.106                   #joda13.combi.tfh-wildau.de
+>tu-bs.de               #Technical University of Braunschweig, Germany
+134.169.1.1                     #rzafs1.rz.tu-bs.de
+134.169.1.5                     #rzafs2.rz.tu-bs.de
+134.169.1.6                     #rzafs3.rz.tu-bs.de
+>tu-chemnitz.de         #Technische Universitaet Chemnitz, Germany
+134.109.2.1                     #zuse.hrz.tu-chemnitz.de
+134.109.2.15                    #phoenix.hrz.tu-chemnitz.de
+134.109.200.7                   #aetius.hrz.tu-chemnitz.de
+>e18.ph.tum.de          #Experimental Physics, TU Munich, Germany
+129.187.154.223                 #hamlet.e18.physik.tu-muenchen.de
+>atlass01.physik.uni-bonn.de #Bonn ATLAS
+131.220.165.43                  #atlass01.physik.uni-bonn.de
+>uni-freiburg.de        #Albert-Ludwigs-Universitat Freiburg
+132.230.6.237                   #sv8.ruf.uni-freiburg.de
+132.230.6.239                   #sv10.ruf.uni-freiburg.de
+>physik.uni-freiburg.de #Institute of Physics, University Freiburg, Germany
+132.230.6.234                   #afs1.ruf.uni-freiburg.de
+132.230.6.235                   #afs2.ruf.uni-freiburg.de
+132.230.77.16                   #hepafs.physik.uni-freiburg.de
+>physnet.uni-hamburg.de #PHYSnet-Rechenzentrum university of hamburg
+134.100.106.44                  #afs-core.physnet.uni-hamburg.de
+134.100.106.45                  #afs-core2.physnet.uni-hamburg.de
+134.100.106.47                  #afs-core3.physnet.uni-hamburg.de
+>mathi.uni-heidelberg.de #Uni Heidelberg (Mathematisches Institut)
+129.206.26.241                  #hactar.mathi.uni-heidelberg.de
+>urz.uni-heidelberg.de  #Uni Heidelberg (Rechenzentrum)
+129.206.119.10                  #afsdb.urz.uni-heidelberg.de
+129.206.119.16                  #afsdb1.urz.uni-heidelberg.de
+129.206.119.17                  #afsdb2.urz.uni-heidelberg.de
+>ziti.uni-heidelberg.de #Institute of Computer Science at the University of Heidelberg
+147.142.42.246                  #mp-sun.ziti.uni-heidelberg.de
+>uni-hohenheim.de       #University of Hohenheim
+144.41.2.2                      #rs13.serv.uni-hohenheim.de
+144.41.2.3                      #rs14.serv.uni-hohenheim.de
+144.41.2.4                      #rs15.serv.uni-hohenheim.de
+>rz.uni-jena.de         #Rechenzentrum University of Jena, Germany
+141.35.2.180                    #afs00.rz.uni-jena.de
+141.35.2.181                    #afs01.rz.uni-jena.de
+141.35.2.182                    #afs02.rz.uni-jena.de
+>impetus.uni-koeln.de   #Univ. of Cologne - Geophysics/Meteorology Inst.
+134.95.80.39                    #forano.meteo.uni-koeln.de
+>meteo.uni-koeln.de     #Univ. of Cologne - Inst. for Geophysics & Meteorology
+134.95.144.22                   #afs1.meteo.uni-koeln.de
+134.95.144.24                   #afs2.meteo.uni-koeln.de
+>rrz.uni-koeln.de       #University of Cologne - Reg Comp Center
+134.95.19.3                     #afsdb1.rrz.uni-koeln.de
+134.95.19.4                     #afsdb2.rrz.uni-koeln.de
+134.95.19.10                    #lyra.rrz.uni-koeln.de
+134.95.67.97                    #afs.thp.uni-koeln.de
+134.95.112.8                    #ladon.rrz.uni-koeln.de
+>physik.uni-mainz.de    #institute of physics, university Mainz, Germany
+134.93.130.93                   #hardy.physik.uni-mainz.de
+>uni-mannheim.de        #Uni Mannheim (Rechenzentrum)
+134.155.97.204                  #afsdb1.uni-mannheim.de
+134.155.97.205                  #afsdb2.uni-mannheim.de
+134.155.97.206                  #afsdb3.uni-mannheim.de
+>uni-paderborn.de       #University of Paderborn, Germany
+131.234.137.10                  #afsdb1.uni-paderborn.de
+131.234.137.11                  #afsdb2.uni-paderborn.de
+131.234.137.12                  #afsdb3.uni-paderborn.de
+>physik.uni-wuppertal.de #Physics department of Bergische Universit�t Wuppertal
+132.195.104.3                   #afs1.physik.uni-wuppertal.de
+132.195.104.230                 #afs2.physik.uni-wuppertal.de
+>s-et.aau.dk            #Aalborg Univ., The Student Society, Denmark
+130.225.196.22                  #afs.s-et.aau.dk
+>ies.auc.dk             #Aalborg Univ., Inst. of Electronic Systems, Denmark
+130.225.51.73                   #afsdb1.kom.auc.dk
+130.225.51.74                   #afsdb2.kom.auc.dk
+130.225.51.85                   #afsdb3.kom.auc.dk
+>asu.edu                #Arizona State University
+129.219.10.69                   #authen2.asu.edu
+129.219.10.70                   #authen1.asu.edu
+129.219.10.72                   #authen3.asu.edu
+129.219.100.16                  #authen4.asu.edu
+>mars.asu.edu           #Mars Space Flight Facility - ASU Mars Research
+149.169.146.57                  #kdc1.mars.asu.edu
+149.169.146.58                  #kdc2.mars.asu.edu
+149.169.146.59                  #kdc3.mars.asu.edu
+>eecs.berkeley.edu      #University of California, Berkeley - EECS Dept.
+128.32.139.34                   #greed.eecs.berkeley.edu
+128.32.139.35                   #gluttony.eecs.berkeley.edu
+169.229.60.112                  #envy.eecs.berkeley.edu
+>hep.caltech.edu        #Caltech High Energy Physics
+131.215.116.20                  #afs.hep.caltech.edu
+>ugcs.caltech.edu       #Caltech UGCS lab
+131.215.176.65                  #afs-c.ugcs.caltech.edu
+131.215.176.67                  #afs-a.ugcs.caltech.edu
+131.215.176.68                  #afs-b.ugcs.caltech.edu
+>clarkson.edu           #Clarkson University, Potsdam, New York USA
+128.153.1.111                   #arthur.clarkson.edu
+128.153.9.111                   #lancelot.clarkson.edu
+128.153.17.111                  #uther.clarkson.edu
+>andrew.cmu.edu         #Carnegie Mellon University - Computing Services Cell
+128.2.10.2                      #afsdb-01.andrew.cmu.edu
+128.2.10.7                      #afsdb-02.andrew.cmu.edu
+128.2.10.11                     #afsdb-03.andrew.cmu.edu
+>mw.andrew.cmu.edu      #Carnegie Mellon University - Middleware Test Cell
+128.2.234.24                    #null.andrew.cmu.edu
+128.2.234.170                   #mw-mgr.andrew.cmu.edu
+>club.cc.cmu.edu        #Carnegie Mellon University Computer Club
+128.2.204.149                   #barium.club.cc.cmu.edu
+128.237.157.11                  #sodium.club.cc.cmu.edu
+128.237.157.13                  #potassium.club.cc.cmu.edu
+>chem.cmu.edu           #Carnegie Mellon University - Chemistry Dept.
+128.2.40.134                    #afs.chem.cmu.edu
+128.2.40.140                    #afs2.chem.cmu.edu
+>cs.cmu.edu             #Carnegie Mellon University - School of Comp. Sci.
+128.2.184.215                   #pumpkin.srv.cs.cmu.edu
+128.2.200.97                    #watermelon.srv.cs.cmu.edu
+128.2.201.46                    #strawberry.srv.cs.cmu.edu
+128.2.201.48                    #cherry.srv.cs.cmu.edu
+>ece.cmu.edu            #Carnegie Mellon University - Elec. Comp. Eng. Dept.
+128.2.129.7                     #porok.ece.cmu.edu
+128.2.129.8                     #vicio.ece.cmu.edu
+128.2.129.9                     #e-xing.ece.cmu.edu
+>scotch.ece.cmu.edu     #CMU ECE CALCM research group
+128.2.134.82                    #lagavulin.ece.cmu.edu
+>qatar.cmu.edu          #Carnegie Mellon University - Qatar
+86.36.46.6                      #afs1.qatar.cmu.edu
+86.36.46.7                      #afs2.qatar.cmu.edu
+>sbp.ri.cmu.edu         #Carnegie Mellon University - Sensor Based Planning Lab
+128.2.179.12                    #nihao.sbp.ri.cmu.edu
+128.2.179.113                   #youtheman.sbp.ri.cmu.edu
+>cnf.cornell.edu        #CNF
+128.253.198.9                   #hole.cnf.cornell.edu
+128.253.198.27                  #smoke.cnf.cornell.edu
+128.253.198.231                 #mist.cnf.cornell.edu
+>math.cornell.edu       #Cornell Math Dept
+128.84.234.12                   #pooh.math.cornell.edu
+128.84.234.16                   #bernoulli.math.cornell.edu
+128.84.234.162                  #dyno.math.cornell.edu
+>msc.cornell.edu        #Cornell University Materials Science Center
+128.84.231.242                  #miranda.ccmr.cornell.edu
+128.84.241.35                   #co.ccmr.cornell.edu
+128.84.249.78                   #dax.ccmr.cornell.edu
+>dbic.dartmouth.edu     #Dartmouth Brain Imaging Center
+129.170.30.143                  #dbicafs1.dartmouth.edu
+129.170.30.144                  #dbicafs2.dartmouth.edu
+129.170.30.145                  #dbicafs3.dartmouth.edu
+>northstar.dartmouth.edu #Dartmouth College Research Computing
+129.170.16.22                   #halley.dartmouth.edu
+129.170.16.26                   #andromeda.dartmouth.edu
+129.170.16.43                   #cygnusx1.dartmouth.edu
+>cs.hm.edu              #Department Computer Science Munich University Of Applied Science
+129.187.208.2                   #srv1.informatik.fh-muenchen.de
+>eecs.harvard.edu       #Harvard - EECS
+140.247.60.64                   #lefkada.eecs.harvard.edu
+140.247.60.83                   #corfu.eecs.harvard.edu
+>iastate.edu            #Iowa State University
+129.186.1.243                   #afsdb-1.iastate.edu
+129.186.6.243                   #afsdb-2.iastate.edu
+129.186.142.243                 #afsdb-3.iastate.edu
+>athena.mit.edu         #MIT/Athena cell
+18.7.1.66                       #paris.mit.edu.
+18.9.48.11                      #castor.mit.edu
+18.9.48.12                      #pollux.mit.edu.
+>dev.mit.edu            #MIT/IS Development cell
+18.9.48.13                      #saw.mit.edu.
+18.9.60.110                     #hammer.mit.edu.
+18.9.60.111                     #screw.mit.edu.
+>net.mit.edu            #MIT/Network Group cell
+18.7.7.73                       #gracie.mit.edu
+18.7.21.95                      #george.mit.edu
+>numenor.mit.edu        #Project Numenor
+18.243.2.49                     #numenor.mit.edu
+>sipb.mit.edu           #MIT/SIPB cell
+18.181.0.19                     #reynelda.mit.edu
+18.181.0.22                     #rosebud.mit.edu
+18.181.0.23                     #ronald-ann.mit.edu
+>soap.mit.edu           #MIT School Of Architecture & Planning
+18.89.1.204                     #CRYPT.MIT.EDU
+18.89.3.46                      #SOAP.MIT.EDU
+18.89.4.9                       #ARCH.MIT.EDU
+>msu.edu                #Michigan State University Main Cell
+35.9.7.10                       #afsdb0.cl.msu.edu
+>nd.edu                 #University of Notre Dame
+129.74.223.17                   #john.helios.nd.edu
+129.74.223.33                   #lizardo.helios.nd.edu
+129.74.223.65                   #buckaroo.helios.nd.edu
+>crc.nd.edu             #University of Notre Dame - Center for Research Computing
+129.74.85.34                    #afsdb1.crc.nd.edu
+129.74.85.35                    #afsdb2.crc.nd.edu
+129.74.85.36                    #afsdb3.crc.nd.edu
+>pitt.edu               #University of Pittsburgh
+136.142.8.15                    #afs09.srv.cis.pitt.edu
+136.142.8.20                    #afs10.srv.cis.pitt.edu
+136.142.8.21                    #afs11.srv.cis.pitt.edu
+>cs.pitt.edu            #University of Pittsburgh - Computer Science
+130.49.220.11                   #afs01.cs.pitt.edu
+130.49.220.12                   #afs02.cs.pitt.edu
+130.49.220.13                   #afs03.cs.pitt.edu
+>psc.edu                #PSC (Pittsburgh Supercomputing Center)
+128.182.59.182                  #shaggy.psc.edu
+128.182.66.184                  #velma.psc.edu
+128.182.66.185                  #daphne.psc.edu
+>scoobydoo.psc.edu      #PSC Test Cell
+128.182.59.181                  #scooby.psc.edu
+>cede.psu.edu           #Penn State - Center for Engr. Design & Entrepeneurship
+146.186.218.10                  #greenly.cede.psu.edu
+146.186.218.60                  #b50.cede.psu.edu
+146.186.218.246                 #stalin.cede.psu.edu
+>rose-hulman.edu        #Rose-Hulman Institute of Technology
+137.112.7.11                    #afs1.rose-hulman.edu
+137.112.7.12                    #afs2.rose-hulman.edu
+137.112.7.13                    #afs3.rose-hulman.edu
+>cs.rose-hulman.edu     #Rose-Hulman CS Department
+137.112.40.10                   #galaxy.cs.rose-hulman.edu
+>rpi.edu                #Rensselaer Polytechnic Institute
+128.113.22.11                   #saul.server.rpi.edu
+128.113.22.12                   #joab.server.rpi.edu
+128.113.22.13                   #korah.server.rpi.edu
+128.113.22.14                   #achan.server.rpi.edu
+>hep.sc.edu             #University of South Carolina, Dept. of Physics
+129.252.78.77                   #cpeven.physics.sc.edu
+>cs.stanford.edu        #Stanford University Computer Science Department
+171.64.64.10                    #cs-afs-1.Stanford.EDU
+171.64.64.66                    #cs-afs-2.stanford.edu
+171.64.64.69                    #cs-afs-3.stanford.edu
+>ir.stanford.edu        #Stanford University
+171.64.7.222                    #afsdb1.stanford.edu
+171.64.7.234                    #afsdb2.stanford.edu
+171.64.7.246                    #afsdb3.stanford.edu
+>slac.stanford.edu      #Stanford Linear Accelerator Center
+134.79.18.25                    #afsdb1.slac.stanford.edu
+134.79.18.26                    #afsdb2.slac.stanford.edu
+134.79.18.27                    #afsdb3.slac.stanford.edu
+>physics.ucsb.edu       #UC Santa Barbara, Physics Dept
+128.111.18.161                  #ledzeppelin.physics.ucsb.edu
+>cats.ucsc.edu          #UC Santa Cruz, Comp and Tech Services, California U.S.A
+128.114.123.14                  #elan.ucsc.edu
+128.114.123.15                  #ichabod.ucsc.edu
+128.114.123.18                  #maneki.ucsc.edu
+>acm.uiuc.edu           #ACM at the University of Illinois
+128.174.251.8                   #alnitak.acm.uiuc.edu
+128.174.251.9                   #alnilam.acm.uiuc.edu
+128.174.251.10                  #mintaka.acm.uiuc.edu
+>illigal.uiuc.edu       #Illinois Genetic Algorithms Labaratory
+128.174.193.200                 #ial.illigal.uiuc.edu
+128.174.193.201                 #cac.illigal.uiuc.edu
+128.174.193.202                 #gcs.illigal.uiuc.edu
+>ncsa.uiuc.edu          #University of Illinois
+141.142.3.5                     #congo.ncsa.uiuc.edu
+141.142.3.8                     #nile.ncsa.uiuc.edu
+141.142.3.9                     #kaskaskia.ncsa.uiuc.edu
+>umbc.edu               #University of Maryland, Baltimore County
+130.85.24.23                    #db2.afs.umbc.edu
+130.85.24.87                    #db3.afs.umbc.edu
+130.85.24.101                   #db1.afs.umbc.edu
+>glue.umd.edu           #University of Maryland - Project Glue
+128.8.70.11                     #olmec.umd.edu
+128.8.236.4                     #egypt.umd.edu
+128.8.236.230                   #babylon.umd.edu
+>wam.umd.edu            #University of Maryland Network WAM Project
+128.8.70.9                      #csc-srv.wam.umd.edu
+128.8.236.5                     #avw-srv.wam.umd.edu
+128.8.236.231                   #ptx-srv.wam.umd.edu
+>umich.edu              #University of Michigan - Campus
+141.211.1.32                    #fear.ifs.umich.edu
+141.211.1.33                    #surprise.ifs.umich.edu
+141.211.1.34                    #ruthless.ifs.umich.edu
+>atlas.umich.edu        #ATLAS group cell in physics at University of Michigan
+141.211.43.102                  #linat02.grid.umich.edu
+141.211.43.103                  #linat03.grid.umich.edu
+141.211.43.104                  #linat04.grid.umich.edu
+>citi.umich.edu         #Center for Information Technology Integration
+141.211.133.5                   #babylon.citi.umich.edu
+>sph.umich.edu          #University of Michigan -- School of Public  Health
+141.211.51.137                  #afssph7.sph.umich.edu
+141.211.51.139                  #afssph0.sph.umich.edu
+141.211.51.142                  #afssph6.sph.umich.edu
+>isis.unc.edu           #Univ. of NC at Chapel Hill - ITS
+152.2.1.5                       #db0.isis.unc.edu
+152.2.1.6                       #db1.isis.unc.edu
+152.2.1.7                       #db2.isis.unc.edu
+>physics.unc.edu        #Univ. of NC at Chapel Hill, Dept. of Physics
+152.2.4.1                       #who.physics.unc.edu
+152.2.4.3                       #what.physics.unc.edu
+152.2.4.5                       #when.physics.unc.edu
+>uncc.edu               #University of NC at Charlotte Mosaic AFS Cell
+152.15.10.70                    #as-sm1.uncc.edu
+152.15.93.186                   #as-ece1.uncc.edu
+152.15.181.175                  #as-me1.uncc.edu
+>eng.utah.edu           #University of Utah - Engineering
+155.98.111.9                    #lenny.eng.utah.edu
+155.98.111.10                   #carl.eng.utah.edu
+>cs.uwm.edu             #University of Wisconsin--Milwaukee
+129.89.38.124                   #solomons.cs.uwm.edu
+>cs.wisc.edu            #Univ. of Wisconsin-Madison, Computer Sciences Dept.
+128.105.132.14                  #timon.cs.wisc.edu
+128.105.132.15                  #pumbaa.cs.wisc.edu
+128.105.132.16                  #zazu.cs.wisc.edu
+>engr.wisc.edu          #University of Wisconsin-Madison, College of Engineering
+144.92.13.14                    #larry.cae.wisc.edu
+144.92.13.15                    #curly.cae.wisc.edu
+144.92.13.16                    #moe.cae.wisc.edu
+>hep.wisc.edu           #University of Wisconsin -- High Energy Physics
+128.104.28.219                  #anise.hep.wisc.edu
+144.92.180.7                    #rosemary.hep.wisc.edu
+144.92.180.30                   #fennel.hep.wisc.edu
+>physics.wisc.edu       #Univ. of Wisconsin-Madison, Physics Department
+128.104.160.13                  #kendra.physics.wisc.edu
+128.104.160.14                  #fray.physics.wisc.edu
+128.104.160.15                  #buffy.physics.wisc.edu
+>ciemat.es              #Ciemat, Madrid, Spain
+130.206.11.42                   #afsdb1.ciemat.es
+130.206.11.217                  #afsdb2.ciemat.es
+130.206.11.247                  #afsdb3.ciemat.es
+>ifca.unican.es         #Instituto de Fisica de Cantabria (IFCA), Santander, Spain
+193.144.209.20                  #gridwall.ifca.unican.es
+>ific.uv.es             #Instituto de Fisica Corpuscular, Valencia, Spain
+147.156.163.11                  #alpha.ific.uv.es
+>biocenter.helsinki.fi  #University of Helsinki, Institute of Biotechnology
+128.214.58.174                  #afsdb1.biocenter.helsinki.fi
+128.214.88.114                  #afsdb2.biocenter.helsinki.fi
+>dapnia.saclay.cea.fr   #CEA DAPNIA
+132.166.32.7                    #dphrsg.saclay.cea.fr
+132.166.32.12                   #dphrsl.saclay.cea.fr
+>in2p3.fr               #IN2P3 production cell
+134.158.104.11                  #ccafsdb01.in2p3.fr
+134.158.104.12                  #ccafsdb02.in2p3.fr
+134.158.232.11                  #ccafsdb1.in2p3.fr
+134.158.232.12                  #ccafsdb2.in2p3.fr
+134.158.232.13                  #ccafsdb3.in2p3.fr
+>mcc.ac.gb              #University of Manchester
+130.88.203.41                   #nevis.mc.man.ac.uk
+130.88.203.144                  #eryri.mc.man.ac.uk
+130.88.203.145                  #scafell.mc.man.ac.uk
+>anl.gov                #Argonne National Laboratory
+146.137.96.33                   #arteus.it.anl.gov
+146.137.162.88                  #agamemnon.it.anl.gov
+146.137.194.80                  #antenor.it.anl.gov
+>rhic.bnl.gov           #Relativistic Heavy Ion Collider
+130.199.6.51                    #rafs03.rcf.bnl.gov
+130.199.6.52                    #rafs02.rcf.bnl.gov
+130.199.6.69                    #rafs01.rcf.bnl.gov
+>usatlas.bnl.gov        #US Atlas Tier 1 Facility at BNL
+130.199.48.32                   #aafs01.usatlas.bnl.gov
+130.199.48.33                   #aafs02.usatlas.bnl.gov
+130.199.48.34                   #aafs03.usatlas.bnl.gov
+>fnal.gov               #Fermi National Acclerator Laboratory
+131.225.68.1                    #fsus01.fnal.gov
+131.225.68.4                    #fsus03.fnal.gov
+131.225.68.14                   #fsus04.fnal.gov
+>ic-afs.arc.nasa.gov    #Code IC, Ames Research Center
+128.102.105.62                  #udanax.arc.nasa.gov
+>jpl.nasa.gov           #Jet Propulsion Laboratory
+137.78.160.21                   #afsdb08.jpl.nasa.gov
+137.78.160.22                   #afsdb09.jpl.nasa.gov
+137.78.160.23                   #afsdb10.jpl.nasa.gov
+>nersc.gov              #National Energy Research Supercomputer Center
+128.55.128.250                  #mars.nersc.gov
+128.55.128.252                  #alfred.nersc.gov
+128.55.128.254                  #lurch.nersc.gov
+>doe.atomki.hu          #Institute of Nuclear Research (MTA ATOMKI), Debrecen, Hungary
+193.6.179.31                    #afs.doe.atomki.hu
+>bme.hu                 #Budapest University of Technology and Economics
+152.66.241.6                    #afs.iit.bme.hu
+>kfki.hu                #Research Institute for Nuclear and Particle Physics - Budapest,H
+148.6.8.14                      #afs.kfki.hu
+>caspur.it              #CASPUR Inter-University Computing Consortium, Rome
+193.204.5.45                    #pomodoro.caspur.it
+193.204.5.46                    #banana.caspur.it
+193.204.5.50                    #maslo.caspur.it
+>enea.it                #ENEA New Tech. Energy & Environment Agency, Italy
+192.107.54.5                    #aixfs.frascati.enea.it
+192.107.54.11                   #rs2ced.frascati.enea.it
+192.107.54.12                   #43p.frascati.enea.it
+>fusione.it             #Assoz. FUSIONE/Euratom, ENEA, Frascati-Italy
+192.107.90.2                    #fusafs1.frascati.enea.it
+192.107.90.3                    #fusafs2.frascati.enea.it
+192.107.90.4                    #fusafs3.frascati.enea.it
+>icemb.it               #ICEMB, Universita' La Sapienza - Rome - Italy
+193.204.6.130                   #icembfs.caspur.it
+>ictp.it                #The Abdus Salam International Centre for Theoretical Physics (IC
+140.105.34.7                    #afsdb1.ictp.it
+140.105.34.8                    #afsdb2.ictp.it
+>infn.it                #Istituto Nazionale di Fisica Nucleare (INFN), Italia
+131.154.1.7                     #afscnaf.infn.it
+141.108.26.75                   #afsrm1.roma1.infn.it
+192.84.134.75                   #afsna.na.infn.it
+>ba.infn.it             #INFN, Sezione di Bari
+193.206.185.235                 #baafsserver.ba.infn.it
+193.206.185.236                 #debsrv.ba.infn.it
+>kloe.infn.it           #INFN, KLOE experiment at Laboratori di Frascati
+192.135.25.111                  #kloeafs1.lnf.infn.it
+192.135.25.112                  #kloeafs2.lnf.infn.it
+>le.infn.it             #INFN, Sezione di Lecce
+192.84.152.40                   #afs01.le.infn.it
+192.84.152.148                  #afs02.le.infn.it
+>lnf.infn.it            #INFN, Laboratori Nazionali di Frascati
+193.206.84.121                  #afs1.lnf.infn.it
+193.206.84.122                  #afs2.lnf.infn.it
+193.206.84.123                  #afs3.lnf.infn.it
+>lngs.infn.it           #INFN, Laboratori Nazionali di Gran Sasso
+192.84.135.21                   #rsgs05.lngs.infn.it
+>pi.infn.it             #INFN, Sezione di Pisa
+192.84.133.50                   #aix1.pi.infn.it
+212.189.152.6                   #afs1.pi.infn.it
+212.189.152.7                   #afs2.pi.infn.it
+>roma3.infn.it          #Istituto Nazionale di Fisica Nucleare (INFN), Italia
+193.205.159.17                  #afsrm3.roma3.infn.it
+>psm.it                 #Progetto San Marco, Universita' di Roma-1
+151.100.1.65                    #atlante.psm.uniroma1.it
+>tgrid.it               #CASPUR-CILEA-CINECA Grid Cell
+193.204.5.33                    #cccgrid.caspur.it
+>math.unifi.it          #math.unifi.it
+150.217.34.182                  #xeno.math.unifi.it
+>ing.uniroma1.it        #Universita' La Sapienza, Fac. Ingeneria
+151.100.85.253                  #alfa.ing.uniroma1.it
+>dia.uniroma3.it        #University Roma Tre - DIA
+193.204.161.79                  #plm.dia.uniroma3.it
+193.204.161.118                 #afs.dia.uniroma3.it
+>vn.uniroma3.it         #University of Rome 3, Area Vasca Navale
+193.204.161.136                 #alfa.dia.uniroma3.it
+193.204.161.137                 #beta.dia.uniroma3.it
+193.204.161.138                 #gamma.dia.uniroma3.it
+>italia                 #Italian public AFS cell
+193.204.5.9                     #afs.caspur.it
+>cmf.nrl.navy.mil       #Naval Research Lab - CCS
+134.207.10.68                   #picard.cmf.nrl.navy.mil
+134.207.10.69                   #riker.cmf.nrl.navy.mil
+134.207.10.70                   #kirk.cmf.nrl.navy.mil
+>lcp.nrl.navy.mil       #Naval Research Lab - Lab for Computational Physics
+132.250.114.2                   #afs1.lcp.nrl.navy.mil
+132.250.114.4                   #afs2.lcp.nrl.navy.mil
+132.250.114.6                   #afs3.lcp.nrl.navy.mil
+>epitech.net            #EPITECH, France
+163.5.255.41                    #afs-db-1.epitech.net
+163.5.255.42                    #afs-db-2.epitech.net
+>es.net                 #Energy Sciences Net
+198.128.3.21                    #fs1.es.net
+198.128.3.22                    #fs2.es.net
+198.128.3.23                    #fs3.es.net
+>laroia.net             #Laroia Networks
+66.66.102.254                   #supercore.laroia.net
+>sinenomine.net         #Sine Nomine Associates
+66.135.48.108                   #tx2srv03.sinenomine.net
+72.73.30.42                     #va.sinenomine.net
+>slackers.net           #The Slackers' Network
+199.4.150.159                   #alexandria.slackers.net
+>tproa.net              #The People's Republic of Ames
+204.11.35.83                    #service-3.tproa.net
+204.11.35.84                    #service-4.tproa.net
+204.11.35.85                    #service-5.tproa.net
+>interdose.net          #Interdose Ltd. & Co. KG, Germany
+80.190.171.42                   #bfd9000.tow5.interdose.net
+80.190.171.43                   #bfd9001.tow5.interdose.net
+>nikhef.nl              #The Dutch National Institute for High Energy Physics
+192.16.185.26                   #afs1.nikhef.nl
+192.16.185.27                   #afs2.nikhef.nl
+>1ts.org                #1TS.ORG, Cambridge, MA
+69.25.196.51                    #pancake.1ts.org
+>acm-csuf.org           #California State Univerisity Fullerton ACM
+137.151.29.193                  #afs1.acm-csuf.org
+>adrake.org             #adrake.org
+128.2.98.241                    #afs.adrake.org
+>bazquux.org            #Baz Quux Organization
+66.207.142.196                  #baxquux.org
+>coed.org               #Adam Pennington's Cell
+66.93.61.184                    #vice1.coed.org
+128.237.157.35                  #vice3.coed.org
+>dementia.org           #Dementia Unlimited
+128.2.13.209                    #dedlock.dementia.org
+128.2.235.26                    #meredith.dementia.org
+>dsrw.org               #The DSRW
+65.103.82.83                    #straylight.dsrw.org
+65.103.82.84                    #chiba.dsrw.org
+65.103.82.85                    #freeside.dsrw.org
+>hackish.org            #Hackish.org
+98.210.160.157                  #kurma.sys.hackish.org
+>idahofuturetruck.org   #University of Idaho hybrid vehicle development
+12.18.238.210                   #dsle210.fsr.net
+>mrow.org               #MROW.ORG and RITLUG Cell
+88.198.46.111                   #mrow.org
+129.21.205.119                  #mirror.rit.edu
+>mrph.org               #Mrph
+66.207.133.1                    #sanber.mrph.org
+128.2.99.209                    #hernandarias.mrph.org
+>mstacm.org             #Missouri Science & Technology - ACM
+131.151.88.2                    #acmwork.device.mst.edu
+>nimlabs.org            #Nimlabs, Ink. Cell.
+18.238.1.103                    #olfin.nimlabs.org
+18.238.1.105                    #caerbanog.nimlabs.org
+>nomh.org               #nomh.org
+204.29.154.12                   #iota.nomh.org
+204.29.154.32                   #adversity.xi.nomh.org
+>oc7.org                #The OC7 Project
+128.2.122.140                   #knife.oc7.org
+207.22.77.170                   #spoon.oc7.org
+>pfriedma.org           #pfriedma.org
+72.95.215.18                    #vice.pfriedma.org
+>riscpkg.org            #The RISC OS Packaging Project
+83.104.175.10                   #delenn.riscpkg.org
+>kth.se                 #Royal Institute of Technology, Stockholm, Sweden
+130.237.32.145                  #sonen.e.kth.se
+130.237.48.7                    #anden.e.kth.se
+130.237.48.244                  #fadern.e.kth.se
+>isk.kth.se             #Royal Institute of Technology, ISK
+130.237.209.5                   #afsdb2.isk.kth.se
+130.237.216.17                  #afsdb1.isk.kth.se
+>it.kth.se              #Royal Institute of Technology, IT
+130.237.212.15                  #ptah.it.kth.se
+130.237.212.16                  #toth.it.kth.se
+130.237.215.7                   #isis.it.kth.se
+>md.kth.se              #Royal Institute of Technology, MMK
+130.237.57.21                   #euler.md.kth.se
+130.237.57.68                   #trinity.md.kth.se
+130.237.57.72                   #morpheus.md.kth.se
+>mech.kth.se            #Royal Institute of Technology, MECH
+130.237.233.142                 #matterhorn.mech.kth.se
+130.237.233.143                 #castor.mech.kth.se
+130.237.233.144                 #pollux.mech.kth.se
+>nada.kth.se            #Royal Institute of Technology, NADA
+130.237.222.20                  #kosmos.nada.kth.se
+130.237.223.12                  #sputnik.nada.kth.se
+130.237.224.78                  #mir.nada.kth.se
+130.237.227.23                  #gagarin.nada.kth.se
+130.237.228.28                  #laika.nada.kth.se
+>pdc.kth.se             #Royal Institute of Technology, PDC
+130.237.232.29                  #crab.pdc.kth.se
+130.237.232.112                 #anna.pdc.kth.se
+130.237.232.114                 #hokkigai.pdc.kth.se
+>stacken.kth.se         #Stacken Computer Club
+130.237.234.3                   #milko.stacken.kth.se
+130.237.234.43                  #hot.stacken.kth.se
+130.237.234.101                 #fishburger.stacken.kth.se
+>syd.kth.se             #Royal Institute of Technology, KTH-Syd
+130.237.83.23                   #afs.haninge.kth.se
+>physto.se              #Physics department Stockholm University
+130.237.205.36                  #sysafs1.physto.se
+130.237.205.72                  #sysafs2.physto.se
+>sanchin.se             #Sanchin Consulting AB, Sweden
+192.195.148.10                  #sesan.sanchin.se
+>su.se                  #Stockholm University
+130.237.162.81                  #afsdb1.su.se
+130.237.162.82                  #afsdb2.su.se
+130.237.162.230                 #afsdb3.su.se
+>f9.ijs.si              #F9, Jozef Stefan Institue
+194.249.156.1                   #brenta.ijs.si
+>p-ng.si                #Nova Gorica Polytechnic
+193.2.120.2                     #solkan.p-ng.si
+>hep-ex.physics.metu.edu.tr #METU Department of Physics, Experimental HEP group, Ankara/Turke
+144.122.31.131                  #neutrino.physics.metu.edu.tr
+>phy.bris.ac.uk         #Bristol University - phyics
+137.222.58.9                    #afs1.phy.bris.ac.uk
+>inf.ed.ac.uk           #School of Informatics, University of Edinburgh
+129.215.64.16                   #afsdb0.inf.ed.ac.uk
+129.215.64.17                   #afsdb1.inf.ed.ac.uk
+129.215.64.18                   #afsdb2.inf.ed.ac.uk
+>ic.ac.uk               #Imperial College London
+155.198.63.148                  #icafs2.cc.ic.ac.uk
+155.198.63.149                  #icafs1.cc.ic.ac.uk
+>hep.man.ac.uk          #Manchester HEP
+194.36.2.3                      #afs1.hep.man.ac.uk
+194.36.2.4                      #afs2.hep.man.ac.uk
+194.36.2.5                      #afs3.hep.man.ac.uk
+>rl.ac.uk               #Rutherford Appleton Lab, England
+130.246.183.203                 #afs1.gridpp.rl.ac.uk
+130.246.183.204                 #afs2.gridpp.rl.ac.uk
+130.246.183.205                 #afs3.gridpp.rl.ac.uk
diff --git a/modules/services/network-filesystems/openafs-client/default.nix b/modules/services/network-filesystems/openafs-client/default.nix
new file mode 100644
index 00000000000..bd6a456d693
--- /dev/null
+++ b/modules/services/network-filesystems/openafs-client/default.nix
@@ -0,0 +1,82 @@
+{ config, pkgs, ... }:
+
+let
+  inherit (pkgs.lib) mkOption mkIf;
+  cfg = config.services.openafsClient;
+  cellServDB = ./CellServDB;
+  afsConfig = pkgs.runCommand "afsconfig" {} ''
+    ensureDir $out
+    echo ${cfg.cellName} > $out/ThisCell
+    cp ${cellServDB} $out/CellServDB
+    echo "/afs:${cfg.cacheDirectory}:${cfg.cacheSize}" > $out/cacheinfo
+  '';
+in
+{
+  ###### interface
+
+  options = {
+
+    services.openafsClient = {
+
+      enable = mkOption {
+        default = false;
+        description = "Whether to enable the OpenAFS client.";
+      };
+
+      cellName = mkOption {
+        default = "grand.central.org";
+        description = "Cell name.";
+      };
+
+      cacheSize = mkOption {
+        default = "100000";
+        description = "Cache size.";
+      };
+
+      cacheDirectory = mkOption {
+        default = "/var/cache/openafs";
+        description = "Cache directory.";
+      };
+
+    };
+  };
+
+
+  ###### implementation
+
+  config = mkIf cfg.enable {
+
+    environment.systemPackages = [pkgs.openafsClient];
+
+    environment.etc = [
+      { source = afsConfig;
+        target = "openafs";
+      }
+    ];
+
+    jobs.openafsClient =
+      { name = "afsd";
+
+        description = "AFS client";
+
+        startOn = "network-interfaces/started";
+        stopOn = "network-interfaces/stop";
+
+	preStart = ''
+	  mkdir -m 0755 /afs || true
+	  mkdir -m 0755 -p ${cfg.cacheDirectory} || true
+          ${pkgs.module_init_tools}/sbin/insmod ${pkgs.openafsClient}/lib/openafs/libafs-*.ko || true
+          ${pkgs.openafsClient}/sbin/afsd -confdir ${afsConfig} -cachedir ${cfg.cacheDirectory} -dynroot -fakestat
+	'';
+
+	postStop = ''
+	  umount /afs
+          ${pkgs.openafsClient}/sbin/afsd -shutdown
+	  rmmod libafs
+	'';
+
+      };
+
+  };
+
+}
-- 
GitLab


From 4af37a099447672962d5eaa9670819c27913ed79 Mon Sep 17 00:00:00 2001
From: Sander van der Burg <s.vanderburg@tudelft.nl>
Date: Tue, 10 Nov 2009 15:25:50 +0000
Subject: [PATCH 2005/5331] VirtualBox Xorg driver needs xrefresh, so added it
 to the environment when using the virtualbox driver

svn path=/nixos/trunk/; revision=18322
---
 modules/services/x11/xserver.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/modules/services/x11/xserver.nix b/modules/services/x11/xserver.nix
index 92324de042f..e14c9762bd0 100644
--- a/modules/services/x11/xserver.nix
+++ b/modules/services/x11/xserver.nix
@@ -355,7 +355,8 @@ in
         xorg.xprop
       ]
       ++ optional (elem "nvidia" driverNames) kernelPackages.nvidia_x11
-      ++ optional (elem "nvidiaLegacy" driverNames) kernelPackages.nvidia_x11_legacy;
+      ++ optional (elem "nvidiaLegacy" driverNames) kernelPackages.nvidia_x11_legacy
+      ++ optional (elem "virtualbox" driverNames) xorg.xrefresh;
       
     environment.systemPackages = config.environment.x11Packages;
     
-- 
GitLab


From 091631b43352345f67e507291d1b71a2c678adff Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 10 Nov 2009 21:42:38 +0000
Subject: [PATCH 2006/5331] * Use Grub 2 on the installation CD.  No graphics
 yet.

svn path=/nixos/branches/upstart-0.6/; revision=18325
---
 .../installer/cd-dvd/installation-cd-base.nix | 28 +++++++++------
 modules/installer/cd-dvd/iso-image.nix        | 35 ++++++++++++-------
 modules/installer/cd-dvd/memtest.nix          |  5 +--
 release.nix                                   |  3 +-
 4 files changed, 45 insertions(+), 26 deletions(-)

diff --git a/modules/installer/cd-dvd/installation-cd-base.nix b/modules/installer/cd-dvd/installation-cd-base.nix
index 3ec4f3a63de..0fb1156dc71 100644
--- a/modules/installer/cd-dvd/installation-cd-base.nix
+++ b/modules/installer/cd-dvd/installation-cd-base.nix
@@ -1,20 +1,22 @@
 # This module contains the basic configuration for building a NixOS
 # installation CD.
 
-{config, pkgs, ...}:
+{ config, pkgs, ... }:
+
+with pkgs.lib;
 
 let
 
   options = {
 
-    system.nixosVersion = pkgs.lib.mkOption {
+    system.nixosVersion = mkOption {
       default = "${builtins.readFile ../../../VERSION}";
       description = ''
         NixOS version number.
       '';
     };
 
-    installer.configModule = pkgs.lib.mkOption {
+    installer.configModule = mkOption {
       example = "./nixos/modules/installer/cd-dvd/installation-cd.nix";
       description = ''
         Filename of the configuration module that builds the CD
@@ -38,10 +40,12 @@ let
     '';
 
   # Put the current directory in a tarball.
-  nixosTarball = makeTarball "nixos.tar.bz2" (pkgs.lib.cleanSource ../../..);
+  nixosTarball = makeTarball "nixos.tar.bz2" (cleanSource ../../..);
 
   # Put Nixpkgs in a tarball.
-  nixpkgsTarball = makeTarball "nixpkgs.tar.bz2" (pkgs.lib.cleanSource pkgs.path);
+  nixpkgsTarball = makeTarball "nixpkgs.tar.bz2" (cleanSource pkgs.path);
+
+  includeSources = true;
 
 
   # A dummy /etc/nixos/configuration.nix in the booted CD that
@@ -169,12 +173,14 @@ in
 
       # Provide the NixOS/Nixpkgs sources in /etc/nixos.  This is required
       # for nixos-install.
-      echo "unpacking the NixOS/Nixpkgs sources..."
-      mkdir -p /etc/nixos/nixos
-      tar xjf ${nixosTarball}/nixos.tar.bz2 -C /etc/nixos/nixos
-      mkdir -p /etc/nixos/nixpkgs
-      tar xjf ${nixpkgsTarball}/nixpkgs.tar.bz2 -C /etc/nixos/nixpkgs
-      chown -R root.root /etc/nixos
+      ${optionalString includeSources ''
+        echo "unpacking the NixOS/Nixpkgs sources..."
+        mkdir -p /etc/nixos/nixos
+        tar xjf ${nixosTarball}/nixos.tar.bz2 -C /etc/nixos/nixos
+        mkdir -p /etc/nixos/nixpkgs
+        tar xjf ${nixpkgsTarball}/nixpkgs.tar.bz2 -C /etc/nixos/nixpkgs
+        chown -R root.root /etc/nixos
+     ''}
 
       # Provide a configuration for the CD/DVD itself, to allow users
       # to run nixos-rebuild to change the configuration of the
diff --git a/modules/installer/cd-dvd/iso-image.nix b/modules/installer/cd-dvd/iso-image.nix
index 2a0ac4f0e28..b8398825057 100644
--- a/modules/installer/cd-dvd/iso-image.nix
+++ b/modules/installer/cd-dvd/iso-image.nix
@@ -55,12 +55,21 @@ let
   };
 
 
+  # The Grub image.
+  grubImage = pkgs.runCommand "grub_eltorito" {}
+    ''
+      ${pkgs.grub2}/bin/grub-mkimage -o tmp biosdisk iso9660 help linux linux16 sh chain
+      cat ${pkgs.grub2}/lib/grub/*/cdboot.img tmp > $out
+    ''; # */
+
+
   # The configuration file for Grub.
   grubCfg = 
     ''
-      default 0
-      timeout 10
-      splashimage /boot/background.xpm.gz
+      set default = 0
+      set timeout = 10
+
+      #splashimage /boot/background.xpm.gz
 
       ${config.boot.extraGrubEntries}
     '';
@@ -112,11 +121,11 @@ in
   # Individual files to be included on the CD, outside of the Nix
   # store on the CD.
   isoImage.contents =
-    [ { source = "${pkgs.grub}/lib/grub/${if pkgs.stdenv.system == "i686-linux" then "i386-pc" else "x86_64-unknown"}/stage2_eltorito";
-        target = "/boot/grub/stage2_eltorito";
+    [ { source = grubImage;
+        target = "/boot/grub/grub_eltorito";
       }
-      { source = pkgs.writeText "menu.lst" grubCfg;
-        target = "/boot/grub/menu.lst";
+      { source = pkgs.writeText "grub.cfg" grubCfg;
+        target = "/boot/grub/grub.cfg";
       }
       { source = config.boot.kernelPackages.kernel + "/vmlinuz";
         target = "/boot/vmlinuz";
@@ -152,13 +161,15 @@ in
   # The Grub menu.
   boot.extraGrubEntries =
     ''
-      title Boot from hard disk
-        root (hd0)
+      menuentry "Boot from hard disk" {
+        set root=(hd0)
         chainloader +1
+      }
     
-      title NixOS Installer / Rescue
-        kernel /boot/vmlinuz init=/init systemConfig=/system ${toString config.boot.kernelParams}
+      menuentry "NixOS Installer / Rescue" {
+        linux /boot/vmlinuz init=/init systemConfig=/system ${toString config.boot.kernelParams}
         initrd /boot/initrd
+      }
     '';
 
   # Create the ISO image.
@@ -168,7 +179,7 @@ in
     inherit (config.isoImage) isoName compressImage volumeID contents;
 
     bootable = true;
-    bootImage = "/boot/grub/stage2_eltorito";
+    bootImage = "/boot/grub/grub_eltorito";
   };
 
   boot.postBootCommands =
diff --git a/modules/installer/cd-dvd/memtest.nix b/modules/installer/cd-dvd/memtest.nix
index fb3aa817855..4bf3ee5a53a 100644
--- a/modules/installer/cd-dvd/memtest.nix
+++ b/modules/installer/cd-dvd/memtest.nix
@@ -12,8 +12,9 @@ in
 {
   boot.extraGrubEntries =
     ''
-      title Memtest86+
-        kernel ${memtestPath}
+      menuentry "Memtest86+" {
+        linux16 ${memtestPath}
+      }
     '';
 
   isoImage.contents =
diff --git a/release.nix b/release.nix
index 26708ed3e73..68e77057c9b 100644
--- a/release.nix
+++ b/release.nix
@@ -30,10 +30,11 @@ let
             description = "NixOS installation CD (${description}) - ISO image for ${system}";
             maintainers = map (x: lib.getAttr x lib.maintainers) maintainers;
           };
+          inherit iso;
         }
         ''
           ensureDir $out/nix-support
-          echo "file iso" ${iso}/iso/*.iso* >> $out/nix-support/hydra-build-products
+          echo "file iso" $iso/iso/*.iso* >> $out/nix-support/hydra-build-products
         ''; # */
 
 
-- 
GitLab


From 5cb52cc7cbffb91ad503eac54045da3bd31ca69d Mon Sep 17 00:00:00 2001
From: Marc Weber <marco-oweber@gmx.de>
Date: Wed, 11 Nov 2009 23:54:54 +0000
Subject: [PATCH 2007/5331] nixos vms tests: use relative path to services,
 nixpkgs because this is more like to work if you don't put the repos in
 /etc/nixos/

svn path=/nixos/trunk/; revision=18330
---
 lib/build-vms.nix    | 4 ++--
 lib/eval-config.nix  | 2 +-
 tests/kde4.nix       | 4 ++--
 tests/subversion.nix | 4 ++--
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/lib/build-vms.nix b/lib/build-vms.nix
index e8b21fb6dfd..2989708bdc8 100644
--- a/lib/build-vms.nix
+++ b/lib/build-vms.nix
@@ -1,6 +1,6 @@
 { nixos ? ./..
-, nixpkgs ? /etc/nixos/nixpkgs
-, services ? /etc/nixos/services
+, nixpkgs ? ../../nixpkgs
+, services ? ../../nixos/services
 , system ? builtins.currentSystem
 }:
 
diff --git a/lib/eval-config.nix b/lib/eval-config.nix
index 10efb8a251d..a0d34b4701f 100644
--- a/lib/eval-config.nix
+++ b/lib/eval-config.nix
@@ -4,7 +4,7 @@
 
 { system ? builtins.currentSystem
 , nixpkgs ? import ./from-env.nix "NIXPKGS" /etc/nixos/nixpkgs
-, services ? /etc/nixos/services
+, services ? ../../services
 , pkgs ? null
 , baseModules ? import ../modules/module-list.nix
 , extraArgs ? {}
diff --git a/tests/kde4.nix b/tests/kde4.nix
index 0cff2d4eec0..3dc5e35a1c5 100644
--- a/tests/kde4.nix
+++ b/tests/kde4.nix
@@ -1,6 +1,6 @@
 { nixos ? ./..
-, nixpkgs ? /etc/nixos/nixpkgs
-, services ? /etc/nixos/services
+, nixpkgs ? ../../nixpkgs
+, services ? ../../nixos/services
 , system ? builtins.currentSystem
 }:
 
diff --git a/tests/subversion.nix b/tests/subversion.nix
index 82ada4576eb..c49d74f5975 100644
--- a/tests/subversion.nix
+++ b/tests/subversion.nix
@@ -1,6 +1,6 @@
 { nixos ? ./..
-, nixpkgs ? /etc/nixos/nixpkgs
-, services ? /etc/nixos/services
+, nixpkgs ? ../../nixpkgs
+, services ? ../../services
 , system ? builtins.currentSystem
 }:
 
-- 
GitLab


From 7621b40d563c064322c5983c131909a254ce9935 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 13 Nov 2009 16:45:41 +0000
Subject: [PATCH 2008/5331] * Provide a 640x480 background image for GRUB 2. *
 Turn on the graphical GRUB boot screen for the installation CD.

svn path=/nixos/branches/upstart-0.6/; revision=18340
---
 modules/installer/cd-dvd/iso-image.nix        |  40 +++++++++++++-----
 modules/installer/cd-dvd/memtest.nix          |   2 +-
 modules/installer/grub/grub.nix               |   5 +--
 .../grub/winkler-gnu-blue-640x480.png         | Bin 0 -> 74487 bytes
 .../installer/grub/winkler-gnu-blue.README    |   6 +++
 5 files changed, 38 insertions(+), 15 deletions(-)
 create mode 100644 modules/installer/grub/winkler-gnu-blue-640x480.png
 create mode 100644 modules/installer/grub/winkler-gnu-blue.README

diff --git a/modules/installer/cd-dvd/iso-image.nix b/modules/installer/cd-dvd/iso-image.nix
index b8398825057..c6b28e78ea8 100644
--- a/modules/installer/cd-dvd/iso-image.nix
+++ b/modules/installer/cd-dvd/iso-image.nix
@@ -58,7 +58,7 @@ let
   # The Grub image.
   grubImage = pkgs.runCommand "grub_eltorito" {}
     ''
-      ${pkgs.grub2}/bin/grub-mkimage -o tmp biosdisk iso9660 help linux linux16 sh chain
+      ${pkgs.grub2}/bin/grub-mkimage -o tmp biosdisk iso9660 help linux linux16 sh chain gfxterm vbe png jpeg
       cat ${pkgs.grub2}/lib/grub/*/cdboot.img tmp > $out
     ''; # */
 
@@ -66,12 +66,27 @@ let
   # The configuration file for Grub.
   grubCfg = 
     ''
-      set default = 0
-      set timeout = 10
-
-      #splashimage /boot/background.xpm.gz
-
-      ${config.boot.extraGrubEntries}
+      set default=0
+      set timeout=10
+
+      if loadfont /boot/grub/unicode.pf2; then
+        set gfxmode=640x480
+        insmod gfxterm
+        insmod vbe
+        terminal_output.gfxterm
+
+        insmod png
+        if background_image /boot/grub/splash.png; then
+          set color_normal=white/black
+          set color_highlight=black/white
+        else
+          set menu_color_normal=cyan/blue
+          set menu_color_highlight=white/blue
+        fi
+        
+      fi
+
+      ${config.boot.loader.grub.extraEntries}
     '';
   
 in
@@ -79,6 +94,8 @@ in
 {
   require = options;
 
+  boot.loader.grub.version = 2;
+
   # In stage 1 of the boot, mount the CD/DVD as the root FS by label
   # so that we don't need to know its device.
   fileSystems =
@@ -133,8 +150,11 @@ in
       { source = config.system.build.initialRamdisk + "/initrd";
         target = "/boot/initrd";
       }
-      { source = config.boot.grubSplashImage;
-        target = "/boot/background.xpm.gz";
+      { source = "${pkgs.grub2}/share/grub/unicode.pf2";
+        target = "/boot/grub/unicode.pf2";
+      }
+      { source = config.boot.loader.grub.splashImage;
+        target = "/boot/grub/splash.png";
       }
       { source = config.system.build.squashfsStore;
         target = "/nix-store.squashfs";
@@ -159,7 +179,7 @@ in
     ];
 
   # The Grub menu.
-  boot.extraGrubEntries =
+  boot.loader.grub.extraEntries =
     ''
       menuentry "Boot from hard disk" {
         set root=(hd0)
diff --git a/modules/installer/cd-dvd/memtest.nix b/modules/installer/cd-dvd/memtest.nix
index 4bf3ee5a53a..2ec35dcc8fb 100644
--- a/modules/installer/cd-dvd/memtest.nix
+++ b/modules/installer/cd-dvd/memtest.nix
@@ -10,7 +10,7 @@ let
 in
 
 {
-  boot.extraGrubEntries =
+  boot.loader.grub.extraEntries =
     ''
       menuentry "Memtest86+" {
         linux16 ${memtestPath}
diff --git a/modules/installer/grub/grub.nix b/modules/installer/grub/grub.nix
index cb716a2a84e..9fe65a7bceb 100644
--- a/modules/installer/grub/grub.nix
+++ b/modules/installer/grub/grub.nix
@@ -98,10 +98,7 @@ in
             sha256 = "14kqdx2lfqvh40h6fjjzqgff1mwk74dmbjvmqphi6azzra7z8d59";
           }
           # GRUB 1.97 doesn't support gzipped XPMs.
-          else pkgs.fetchurl {
-            url = http://www.gnu.org/graphics/winkler-gnu-blue.png;
-            sha256 = "0y8fvxalwxyid4k438k7c21bnv728qjsb92rqfapsmpv2bcj7f6k";
-          };
+          else ./winkler-gnu-blue-640x480.png;
         example = null;
         description = ''
           Background image used for GRUB.  It must be a 640x480,
diff --git a/modules/installer/grub/winkler-gnu-blue-640x480.png b/modules/installer/grub/winkler-gnu-blue-640x480.png
new file mode 100644
index 0000000000000000000000000000000000000000..35bbb57b51ee147cb3dc32747ee31d7fb3cba3bf
GIT binary patch
literal 74487
zcmYIvbySq!_w@wbAl)H?Al==d(%mgNba$6DDoA%p4M_LUDBTSMC?Jh=zskq&?_I1}
zta;{-d+&2<?|sgFuc9P}iAIVB001!Gyp~o206;+i01%FX^ydlB#PW|n|A4M)a*}|m
zQSx7Zz95;&%Si(s|NiB+mwf#51l8%at}6h5{_O7u2uRN){__yo?Tw-g@&Y<0mJqQn
zmBtYOKn-{!EurDHxZke-;rX|T3M;~y6<FY4k0Lp)s5AXCNV|uq!-dEI{ZgDJ93cRM
zJ+$j=nN1{AO;oyRsc%Gtwj9#(6)=<Zq3U~VtiD#hXlirWugAO2J17pW>dHHHf(2;}
z4Yws}=^_yZ&_V;UswS?gYVxM<pC226(wYfu0u4e9xXJdAwZ^$pSUVDqYB-99^h$%-
zEvWjj?&r1)B^A{s^P;FpLj7DLGF3u30(C+{!aWZl-kv5X8m<Zu7(G$_feTs~E4gQ|
zhCT}xjuw@?_`GO-AiU(kbU-{Xx9M!;wLh>19csW8{@$@rAS@cqNO=pnxPP3ocQw!!
za#$NHfX_q8Z~gu5ww;x!e_t`K`CT(y4?Ug-zAbt@2z(U#(RrWnI2Ews;acu^%hTw)
zbm;B-t3WuKvJ-M5a@=|djdm;@48V2^40tq}y=5}SzP!Kk3C_CqF+Suu{Iq@)XV9kn
zaAzNLe>uUtd|7@J+_~*BlDf}K;pCjN4IP6nM7!2}?%g9FL;UGJ5?~eKx)7+paqDg8
zupN5siy{=cF4{T=4Wz2M@}~?eg+AN6^t)MTxoRdjyLCIie15pJR?>GAdUv|DHX!Hy
zsj?F(W~}njKlNTT|86buO1JVzcbVu#&eFxrNubn*fI0usN#L{o(}e9`kBu%5LimRt
zD?}R~cpd^FY<`E@moNPePmfGml~3nxv8~z&FK>@i596jgvGt4?B5osxF2DFcGA1PG
zbtq2;P*G}9pRPsT1XA6fP(`jWJa+0o)FvODZh0x>;`9OS??d-!s_kPb@XqJ$Z!d#b
zLj^*+j$<}fOOZYukY5~aJ{~vTU)^gjHn8}OJO;&;T`W~?QY+yG3(5VOD;lq(@?7f$
za>NUj2_D;v1_%==CiMBX5q96(b!r?^2sH%zCR|?btOVX+Pqja6=R7**F-GSz?z-Ea
z;uL??UL9w4o9rYN;)DNso&kp@6(K(p7gF?1+`HX>gl-2(#T|bZz_K^)dGw5TYqMVp
zAm?$Te5B&XJ2nkc1{YpDg19LS>2Vu^YsA*P`jHV1e^6XlY>zV)Uf<9WHz51V5V(LM
z)62`RUk*||4v_=IZpR)!=TQFHK(tRKz*;;4L_94qxTV*DB=3~FVJ+=4gF2pf(-@lf
znsy{0^T1kaoAdNVMrb1`FcPxRfR(0IG;MCICTS9;S<jSPw>R$f?bm9a#PhQzD=l0M
z@zOr;0eu4a;k>hTm-bPH)h<TFZRgT)hYhk?awOkTaVLM^_30xWHn!sx>Yp9tm(HOC
zY5jD89LMt(LzhYFG!KlmDfS@<>x-X|h>&P+1K@yu7KlJDeHG$D0}D0QyFEb3uTEe;
zTznj8)Jj?S)&#(Mf>Te0U8UHu7PDL|3yp8szLzO$9q^F(aA<DZ9=ZL@jxWWIWi=q+
z;P9Oq#nK2Ril*lA6~8_B@tiI2Lu4d!K**ChctG&0#GCkEKv(D5n)`B74jX-jZD5(>
zntqFr#}{h=Cs>qX_91S2K>>FX^H~Se{N6{ob4=Mc4*vNPCgpZF=kAzMKKiYOT;xsN
zWnQLP*`fLq^Rpv3yayKOtW}q%^ip$1jz?K#Ld+ELbK=ufprE^Tu?L8EU8nyAgBIZB
zUzex{nQ)s*f0S^Dw6y+xu!f?vx*V+WW~##y%VJL(xj>p*&d!XW{XW(5W*)0}MUuWc
z%Z81*#XZ9RF)=?{J57W7tGyW_Z~ZNz;vULOUMW}T4|8PmH&t7GXr=)Pw99Xr5*iLC
zhZ*8mu;DAhLvQydrB?52kYH;8x0<4US7|xaPi_$hnD-v6H`OdyY5MB3eF5#YTFkav
z`{qz3p5Ss~iGIZsI9f@nNI#2Zq}jI!;aiYCi?U5i<!fv1i=`s1yapjxXua82#X#NH
zBjfiloDm2;NMC{ozsg7g_nbQIM+WHb>TRbFA5rFC4!GGCOc2`9IX+&kDIXmfKmKO;
zXAO6diCbU4?UFUdFU_yD7tq&H3MUXu{c~&w5rfFup7TYFXTH8#-Fm`9&xUJQ5QlRO
zcS5a?yd3eC3e#ulX~m&@abE0G<7O9Im{zczUY;s&=5d-~I+t96$kIikptU^PCwzPL
z`s~{=`vW*()h0GN;BLwIQSASmAy*4)TIu<>RBG1zA_+Or^PIRj;8)F7obteqzH+<*
zc?}J2&97~!@34zyt>wvLNv8Yeeh{a&fQs>!HY_XnsT+G{9FQguYBkB4YMhYuN#;cQ
zFJT#04eQ=RWObMFJW^TC#ttQ(wa~%_Coi5KD}fbEL4igUhJ{bg=m2y=h**wa&ToX_
z$~Zh;L>nis&5_rzK-lX9*Jt<p6vU%GNsO0V4{&xTz73NWk3b>l^ibhxw5U|Xu-QY>
zUlJr!eq~fbf$_dvihOvY8#93c*&Xpc?%nt)fSI8hXj<OT^4%(A{vzEo@CrKBdegV|
zV4(Ewzr;iUFaeh>H=HLX$r;5RtOX-T9cDH}XOs=$eyYY&PA4O>#7gU0&1P<TPsKGI
znxl-+)x_%zP!o{tq=AtOmtM?PwOX;JtE`-!G-#>v(B@?l7Uxg190iE=Nm<;^75ltn
zs7|IEYE;}nASPJZZTj39aKYd`zk^WxHz8=F1|gx1jE^riBI$@YRDB-XU2f6(1<|C3
ztlv0^q3+$`ceFI>^4G;i;JeZ{zV6gn(2EP)BVc`##L%J0qE&R(9I<tA-dlIR_Zw&D
zNDkU?UI8n3iP70{JO~~>O+uu3=#!h`rh5&BD9jT16gWA)Er<)Py~H=05PI-Oq%2W_
z|Bc6mRK(Y+_%f<cY=F6rt2pw2EMax*Xb5p;vu_bL#q;qm=nlh~8EQ1V^yXr-gd1<~
z5MnSg0)!3AAFiQZMyUL^_0$a^!8AAhV5{tcrO>=!a~A5%Jo?JUz03Sc)M*vmR|K>!
zXf3CS+k~Vy<GcF^lyWCFsNWk%@zv=Djm6A~xn=$=-~JXb44Vt47m}5_bRu8kos3F|
zw)x1lsIUUo$lRPIK#n}IaM9?-2*c25P)xvpIY&5F^<ICWJ-}Gpv{%T|Tzjs$w%pR9
zvEqiQZeBT#)W1_b&YwfKb$o66ZpqXXAqm5I71a(|U+yO{RsU{r*7z&5t&^P2Z)0MQ
zgUYy1JCFsOLC(u~Em7WRxf|icB4Iu*Hmn)pYD^rYqWft)`jomEt9b%+OWAjEH!`(o
z%W6_ISJB3&P$ca8s}%*_ySfw<Gy!vriM9s@n^9?)LUm<8Ce2#*o@=|)aMNTJ>>Qr1
z>+x;0;m~LEjj{e@!ZKalj7Ao~hl5(NQ+4Sl6JP>-ArqP{v{!aO{KcL6vU_H0$bxVV
zwdUhRIHcxg8^$!y<ra#z@#n3)<Lye?ohy4c@H~+YWa)<8n!;p<<bW(ZhqgNRtJyV3
zk?9)&mky~b_eblB(S?>);@)MsnIhi0E;wNnG^{_rQb;iPet5ItoKSD&!5dfC3K-DO
zZvB)L-2wAfFv`J6)1q{Q4=ARy59c#t!6Utx1%s03*rTuVX$GL78cw4Pnr?#PikV2l
zIrx*zX2-V^>}Y+t&O!~1v(7;+_(OO~y;Az%HbUux#SZgQcP^=c>a2-PPNN*cxon`C
z0sgQZsu|r%8fqaB{@qLJ@A0Q8Kqd&`_@fohDOHXqHy5@6O5~J0a%_N!Q4vDKXJsx<
zxE#*W4nbteEQ;S$g6-N#o4#e*2%Gd-cxPB#Ae!_6Lo@0;SaR<dxhump0v`mXbqkui
z7dyWt3kPMjoJU0|nTp+DCO^}OM1851HawoT9`NXMIq>L!6%=?sh0~z;w22ik-0nVy
zSfMG!DL(MmW6K3wZ+pYRX_TGn1UKsl2@`&PBL9aGmb3C@7_AIpPA@`xlVuH;;fo>@
zq!V?eeJ>|VymHYCZ}RraSW}UA@jglXYW(%iGajWKf~`z5eRH2r*w7l0oQ0PI65LY7
zDq0k40b-B)W3eHBGg9dsQqa#*of;ndj`Q?^tObva#ZEJ<b@MGpDNeB&5USsFXc8oi
z_w>DhzbnRY{yob4G~SAjkh`zbas2|1PBKe|_;d25MCNb_x-Old;pKPQ$b&WE2kWmu
zwVj?lUMY3h+C>CJZ6c{}_FLH7<6>UHIv?Ip@`9+JB7g~C5Jv(L-+Et2dAGjQ=}TzB
z6<ErDiky#XK6tfP8^S`qIQor5*5JyS%jX9)8=pe*6DG*rbxM{uv|?EHH3TS9afr2D
z@O3L5vhbc{2gj0D-a(4*%I$>jMAUIz1TBJaZZ}Q|?p*BpAS&Bs9kSluf9;Trcoi`v
z{!|JyfhIE=7+A(uyQLe(7}f^2d_v0ijP;cMoZTqPoxJvy!Q-<uKXsZ@$*auozc;#G
zexZr;;R_X~9_a}ea52mv2?6R9rPA*&!DizXRoNybp@!#}FH`zf`k5x_+s)+}sz3eW
z=sUfyXGPnpmK+1%BqaQvN)S8#_+Rv)0_f|ktxjl=4@~eL_O;>RHP%&3;m#}+IKflk
zR6e07Y~e%Hk?dmfQA%UnmSt}28XL-6grv>wkvJXKyorDhZz|drI@~9aMm^C!y8DS1
zj8Q9tGp|kTG%13)JBd(9d%U$B%<%Uxum}AwBg1jSRN4P{J^pzMU|dZ(5v~M2<JOlY
zxX*Wxtp=?CmtwJ7_xM`1-JO6|#KYU>RakSBBBK=a8VffPq4gKEN4%7^ARcmv;~QkF
zucRvV3*Y|KUrq4(SH$vHoiKwQgAF@JlJ$v9Sg<$6nJIr2(9r-~D&u^-LW_QUloQym
zjQ3>o7l1mkQ?1H90(M1dm60C@$pU8=(0qy5Sd|6Crp>6YCLjrq{s<P#lx1?0-sA2(
z?Xs6CG91Qab8$3_cY`nEiwz%D<1n(;3ov8NSqky#)}|#Ysea9Zza&{=_h^$hcB7~X
z1)rjb92D=CtFpJQvgVs~T-~wVJ%0)|2nfd6dv&!sH&Yja(4>=Eptn^rO<MSKA2xxo
zK~Zj6@JYs+X6AMic-Jq{1+G3=lY`aw{IDh!5L_c2_<D}f-N4JKIp;^_Rr-!ri#?0x
zdDY4gk7AguQCgSbtc2VgG+Vms%6{pY<0Cs15O9si9Q5?Y%K+@4u;(R}kdKl|i}hMB
zPh}Bug6CFhqgWT3QWOpMX0l2{o9$y>+a9R#Ar}UlFIcW%AgI=Bm_r&RvLnSaFg6<9
z=kPf3PIZJ(t2Sp}tTFq(UhpT4aF0D<TOVdQ^F~Ql!sQhV*>X@IDX%SK!p3$jIa(8Y
zEVujrVczGbo5Y`88TR}Pu-%abc{GdCI;qlrz0V0*_)XE1s$Y-u<)Ae|rxxn}s4qoM
z9jqQYyVc+4M47c2WQIUl@fvmCo84Q-kSjGxS}G>S7k7m-azW&61eU&3Gv;NH3&=cb
zB?*<hzq!}rs88aipw0Wz*cNcN!G;m~1U}{vf{-+-2r_;@a!cq|NrpE-V`50=O6don
zO;^cS5|;0dtCsKdjB)MaH+Z#)?U~*;*=pw;L7eFP7YAoa#w?%R)<+-sm_Shp<SAy6
zdCR0YAah9XuTttV3Jg$g!aO|zM@_HP%9&`@PG%Ho(<;Gt8>eH$NKZKyiVCO{A#Uz!
zq@H1^K_>}LOvJU0Uu;VmL44VG?mo}_4l`>pAeRH_1t{5ZjF)lw-4bOyv@)<Sagz{0
zyaHQITawH-M;s4-O9d;7#-Eu~Aakb3C(K)Da3u2}%4rOw@mL%3@YGy*mVw$9sR8Mf
zLz;F_`zmA+cH)64+lbYMlP25M_BcTFRm6#s{V57)0pv6?xpWopj{k5GB)qPBvdf8b
zgLsjB4v}F(B<<QSM3pX$*w;EE1Lxwc(1Kbo(oW@A2&G})gti>nv<-B(Id{9EosQEa
zhm%t<J}&NFP~3SBAk(f+WXh6<>=at>R~17RA~>X)byDJUzvSu4aO}Aj(4+k9Uks9O
z>XGJu1BN0#_pnQ(LqvLsuz1i@c~R@tUNDoPH_9YPswU}>750U)R=59xI39haVvF|&
z4zK##;g=X&pSVwYIq}qgLW3$#f_V)KNi><PE7`T)GG>!VN}KWKVv&rcfEm$K4t0Y9
zuh^!H3p=^cBK}fRBO-uhs<rsEWPW5yDSwHz{$mO#lJ3yEg`d1uKgLWzuR6c#=JP`(
zOkERUX?>C)Ms<Pc@I1xUwM6gd@A)RXA~S1X47n3oEVXGjRCATw#@)O>qJTaI%RI{)
zJM{f`!m_m0X<UltYf;(iAqYV|RD1X|d(W=>#FIu#PFpwVUodDR1Z6{BbxSX2E^(8N
zfK|-1XMbaG1<VXwosaKOJQQkY!7&*G2AW-0nkaGP^e-nmy_SCLV3rICE6^PpP@Ffv
zHF6UR+ckz9MaO+Qy$;U9BxjWkC88si?k?qfGk_%}^$P374+hpum}$;tlNc4^rtFI)
zA-{^4Gy9*7F*el3PNXPLcAx}c94rW@(cS;(N%s{s*_4^l==*)`B4jOL=Jz&(G+#}F
zxG(Nr@j!=aFaO^C3mZBA>)T!&RSLS4mA3VGNHmI$!y2)8&8{5T>-vRWuFxn%NaJn9
zH(#ev9~n0h-}(3ihlrD;WlFgAY0%@twG{(8_Fpa>-9iQ+7YBUd(GM4EE%Ij~%{SK5
z#rZHh(d@U4<TO5_K!bW*2Ud-B`4zd^0Mx6M(v?&jn*VeG9m3jPj>kITHJig5;i$?l
zoj@?3J1UD?oyT2`tQ<HAYwN_{$;^Uni8+&muwJ}a&T-4Se$JGlA1)Gj-DgFU9{Hq8
z2qD4j2*({%hzB~a-x_f#?u(HL*J<sHPvQ?vFXgPom!%_l{bEKDx}#CRd~YvLA=qLQ
zvOGB-B(5l$D;THbsww{I)OFy<pG;@P4i2z86s}9tkmQ&k6B}nPrY&GzoKc{ti!KK=
zIPD0cy;v=$-IbH3PWXL+Jq-Fw080ab0BHmOwx%9G1Z=<$n?j*Xx7=*NXy<hUS1}R8
z71IlJDqK7(I@L)`$HWoWAvk9GGgjDdIYqow(1Z3zF@s(F<+Z1tf84B5WSWdNKU%&N
zXE3_NikmA!tV@Pvd?BxjW3x$NM@tpX&IZEQ#J0I{o=~m~fbmNo$^ea^WD+s|6>)Nk
zxfOxrQJFntqAr6Qf8G^rI>32+W<ScJfP`z~8oWd*@+;vQ3W&HxTE9!6dl5b9OtE2-
zXv1D6*Ffd-hxvX);;Yfr(&VZ191b4m{ZRRn+NWuX@{>Kw_Lpb;?G6aC&PUCrH8;Gi
zq5U35R)DLA@=n)(*@qBtwl~<@m1<(D#m?$<VBB<3wM1#Vm9PnT%>|JmXKdhch@@G^
zbyr%)QrFj6BZ6&t4J#v_AWXx)Mp8jYwIjU@FRoP6r^pQ`R>ml)rHpb1Q>o?;&tI70
z>*t`*cFYJFnTv>Gi5MZ<V5~jd^UsckK6pu8dfc^&RdwffZZZ6QA^ApN0G70N9UtAD
zHHu;i{{7@)ClX$iIwv0NYTQB$s>PQqM_u<~<V}o9v+dr&i=B<2SCMZW{YQ+;`_l5v
zkQF*RCSd9m7dN-a;GIt-*8QY&<1!edvOwpp=4SSjcX)`;<mP@&@;@^jKPa{UcIbym
z1a|#n96W$|Ols4Sj8BR1(`?O2(z?|L85e8_9|r<;81$hTs+hG-S0%NSxd0qMOf903
zU3{lq_UP=yM>VR8ZX-(GZb3%Q`fOat-H=S@F0~OOe^cZ@Hj(B|x1U_vz!?<dsxw#n
z9&Gz!N^!Z-aA~QQk@&v@BLk2;NI|(PUff9qMSGT4ExFbNdqBSJ^0CxCRVL!{Ky$_u
zVmCWxg0cRpI0DuYEWAhaHLD>;X~4$3nd1G5UwnF~WgDdFX0Cte=g89HcQ^v8Y_|+U
zwMgXj21UNfq=H!>2xVz0K$`_V_IQ(X_k=U2ApjV=1EyL?vS2wY9vG2bt*M#ZL2>0o
zFI*9QA-Gqs71NAYk)X~}2?tgE<wcS$ueSDiUdftGUzqNy#s0TvgxYkp`PH`XC_nS9
zxRW}3SXZC&$4n9mf}l7eR##=hP?`E(d?9A<hOx?ge;wUKnNTo<2EPsT>r(y;eq`E_
z0Q&$yV?UNT`Wy_op<mhX4!t)VyBypECU0bE36@dYo6}2dAm<nZt%73rS&S6-=HrQp
z=Ml3d6mv_LnJ{G&dYaL<;g}F&x~OZOn8~gCh%!^|_NYNqgbC9s=o#<*cU0kW4_nMA
zJqzH?m*?pVUKB|8KezvfJU~Gd7}JOxLgJG>5$VX<UY@oWqNTk8E$Omd*9}mK{*DIL
z94Ril9rm}Fresv$0#UwWVge%O_<*}Kh-c(?9RpV@S%Nbr)0~jZMOYB@UHl&48Kmg=
zS1`Ry%tgb26oldU`Gd^R?9sw=z5`~qwYJ*?ml$ZrUFJW$O$r$A4l<{%W3#5|ij406
z{(&T@NVO0el_!z<+GznqY*1n^Vsv`u(^$2}itS!rpu!E@2o*X^GTb>ui<3^6YijQA
z5fn&hj&Y_tM7n1DjI##{v-jO`BVLJ^f($3vICkCIby|qj%_H@UIlfSW2UdgrQ&_+N
zup3P7eG_j{x$V#MKvBY?$BLT!C6iugWemI3j2Q5O+JXc)5%iplRr)&)0d*Mr(sj`<
z%4-h3p}Dmj_9bmUGMxymYRAw4Vc3b+wa8%YnTqUh>xthp99%WN3Uz>X4)p4FO9G_(
zL+nQmAgt5*UtuEz#8#;xl#Unp>q8&+3f(I_V}d5;o<)-(GBn4vN-Y;e)$7qq#$q|Y
zu(X`dRHhyHc7?Okm9aOw(N*dDiTwm&AYq>QgNU5t-oerA=!F^u<2Ao=AU1roE9vtJ
z3tyvlu@c<NAQUDlLQf|4TL8&~vQZ+P07HDWt&%y2D&ShT>IZ?^U*~g21`yko=C!B8
z^V4LyYdPehc8?K`(OSE}6yJ{3S6UW>s#tJt3X>!ZTG1TnBXiW&XC$T9=D)jJq;x3r
z7sp!qZfE_!+ls~Q7dg-ldUf`1ym;#cnIrCLE(+V}@J9@t@sT(&9S_WWko1>fc*1ro
zVt|OUBr=Ox35mOCPK>=rpFOV1zP$;yK5cHrL8I%?{`t@2wDs?)Dc{}5koRL_XA6)P
zQIWl5hNg*4_CCWD2;}8>UKc9VL?PCrOfo?u<+yE+aXFu7%75uKvfDp@paf6#B>rU&
zFw@vdBE7hfU+YGq>|MJv6~+8f&L*~9@|0^1DFB#synN2xdP$-og~<;d;^I+kNp=00
z%?3p9p2{N#2eSiOc<`7VMeg(5Pf3=AWQp6Sv3(|A4c|I3lw-vItoiLd%qJR4E*Pe;
z{f7C2!Yha2Y-4Oj-dZnmq|XwnS*Aq*_{L3T`#w|VO9dZ7r1tNiyMeXGer1BcF~1@N
zcpC&oQO>5|CPvM_mZYeLRp!N9X;*v{5=Q||C>m0(@8HEBN2s_DZ|`?GAkPWQd)d)9
z5_*;{OZd*_bT%x{HdI?7@UP@#Dgx7btGMS^Ihzf0P|1%PEiSD!FPK*;ldYS+9WA{=
zl9m2J^=N{a__w4SQUXSPeDROdcKXmA$JDd>f|AL02Jb6CU51Qb8$;-tq-}&LP?V80
z1o%U5$Zcu=N(CdidgT+Y{(uX@n_E{6K4{Yl+PVEt%EVH-A1xVp=>9flk;U(+KhV1R
zq{@3hAbe%Ln=NGp@t^pHK;+j>7@+};0P%*Prw+p(Z8rhnmc$r@g#<c#n<F6$z2OnJ
z73Zv|KaI32U#Sy<xSxX8XwP`~&j!>lb7Jj2QfqZLaKsncn?p`}C76Y;!#1fkfUWNf
zR|*twrSX!N)z%USXndm9Qt~jVs&IkxbasRUQ|MUm-|gM(_$nIG4UvsgbB~)tZ2u%x
zPwb!#bjN~Fo}i$VF)Xq2X)Z6RL*t$z@G;ytLoVYRN}#_UGC5Yt9!R7`r+lfyEWG@Y
z8qXEu{-#6!gVH4Nn%yihf_7h~T~0~vyP%liXqs$>hE7~+N`CCn2yx2Q2WL=F;O0L(
zg9%{NYgP7*Q7uRNAlt~i!Cy~2OFnmYKp;can$K&E!5E9*0h;?ZR-6FfL=T~a+m^C7
zKt~pv4+O4oEWtDcn1BWHX%UnbO&+PiT3{;n$^{bcAUTe<65KCg%4tnBWGwzA-oSuO
z3zZxq7nOd+#kB_~<_~5i@PE1$Fet!Z7X@<YWU>{hd&|z^DMTV*SsglVL|I^gbhY<m
zCQ3<$vf-XtrY$znQ@Ww)7g0)vmAY^)>Ff`QWxdxVx^8P$2yK9&L50tHts8Kx55->#
zgB;!m@uzd&2;pR3Dq5mfv#x$N@E<W9A6Q*gDhd9_-Bv^Z@w)Dm25lcTHcGkPY++8|
zw+M%XImb*SONNBb$L|%#zq>lcZ`O@BTEm+0GlAUa)3M2VX*Sx9g-hM;W?BZxW5K0u
zIrfxYlc(f{uU^v7ZpQakPLZ#%iL2kvB`lI1>uVLmUoKNgtkt5ymBj+YYWUQjk{KVM
z=}~hnq?Y^fWUSUq-^(==dBi#|wJ|VnWBXci0{kgdX#UR{;m$~+OgNvDkWm`!b1+NJ
zGx2VfdOGQ-53oy-O;@CGT!A7uH<HF&fnGr~>}#G52sXYzZs}9UJA9)5%>wA?)I-N@
zF%J*ZcX`4(@OBPuu!^xv$4@*>2oO(4<{se;F;DSE0;mP{N(J-TJ|B)6HPHF_>LY%1
z!>e5TU_<MHhI@Bn5xBaWogt{DmeS2m;I`gxz=xX}iK3j?q`}>l!xyK$#TuYhXW!Qk
zeKYvD=fy(s@@Os(6=MlSu>OiLwretec9)n4myb=CL1La`M@W<}{&#Itrhi6bIb-Vo
zNaZ0Zz)IQLwy_(y+#9r5ZYiD>8OdF%4Tj~C=gpRXFqMoNY@lHo8uGw|P<R%|8V!^<
zj~HZrz%92+1!xUU$>%b^UW<7ZnkPcuA9|D7z4$7mi^HIIFw8%WX3U+q?vwowzH%Gt
ze^^2YSv-yoe$$BwjyKD~sFV?7Wsz<6LLpu3-0dHHkIj7nK`SB?F|(wS-L8PL7e5Nu
z&kK}9TMi2Ms=TqovbMK}=c$!`Z0>A*ro*{~7+KGk+q*1^J&NSjcby=&Gt*a{K!fgt
z4(G!Rtuk0B`vapslOxOhRjw{EgSwV+EQidTF4EuhG`sh8@@^diy}8pBM^)aL)chh1
zSr&{JM-XqYCyRfEZ!=9IH7V5v!<As7YR$Pdd#L8$IcK#T63+B~ewUHk!!yPlp4#Eb
zfzB@5@k7;XhG%<o@oSJbMr_oewlUs+4bv(hyH$Vk_q`iQc}}YpmLGTImQKe=IInq>
ziJ}hR%VjH_4Fz9`N3fklrjGfsHW8P9U|W|eNvbqUEzU%g<tX0c?4?oe0aUl}XC;O-
z;V~;q<h$hMg%=(_Z42L~n`M3lB;dLZv0DpOL=W~XU2`X18vDOolKodiSpa3OfJ@$j
z9I^7<SU~#XNAu-q&p}&W8UCi4Bv+@Z4P09n_ByCf{U46K{TT@PXwUbt6vKXhHo_j$
zTug5MMf`kfV?~qY1Z8Lj*{jmUYK|(IsS2aD!+0fl`v;wH3*`Af{i0E{%-`3v7(QZK
zF9LLG9UQ;k``tgtt6Bp8f`{pQP;MkWHm<v-O=i*3+@r*Iau|v}7NuHwZN1q#j6Riv
zu+~mrp1(0<W*hznF%XNAN5~bs;A^14FnK{}`CPNj?MY(?7JF~MThz+;TQa7gE>v<Z
zq+oaW#c|ux93W|?I{A%)lKzo^KJwN1Et>#l*i%eV0Q~#Dv`YD|LuOje5_-Q7lsPMA
zusBO`dho++EYZJoF+pG2!L_?&tr4Y=`Ji3KTrF2+ndpHj81^&v<G=mbR)pqUSQ^9D
zMq$(0)4($qfXC`dO9+2<Z}maVkS-y7&iLMtmmctRMnkX(LL^C{$>2wD8wcp;88)I|
zbr_D-rGLgAdX4}2J%GljPdy5o`!E4?FAr*~FNj-UXg4HVoYgAot@%i^Dyyc+&HteY
zS;CW#y&_JZ6?!^AoCzadE#Oa+ev8sj9~bvv>*;KP_6-ORMhAMI9wz*BUJE=gvcpCY
z{|i)F^Z|7wFq_!<?k|F=7%mOQAvjboC}tNZM6|3CVphg+4_YPwW^m;BW9*qqZG=jC
za&xmAGcjtzk89J0B{5asaw}dZzd;^yQh7N~XA0k5JJ+Tr=IDNqXK)f&I`Fb4n|=Iw
z>EQP&T;ld)iY;d>$-6%o5qR9V7LYu3?eaIP%CwUMMmNNrV0d?=ZC__l<S`XKvi4s<
zqXuV3sE)@3uHF}aY!69cPP{!$w2w)a!HyJV>PL4deC<RVx#t8!bJrB=mHP6DPld}3
zYwx_@y8}{EJ!)=?-xCmVDOosts~;&LA1QJxhKf|i1;AhD=YKjj1i+mLsbS<)=o)|L
z5CtD^SeSIJ;b`u`dfRq#@{&ehrI1^7UZAfmSFD71($6Gzh}6!0<(Tv&B4yaDWm`O^
zg_!*89uw*F{vD>KQs=Bw%%uV*yDEQh&rR=}cQL_wqoCo>_)(oGq4Bt4*Bupr<9qGE
z?UMhJHW7eFvad!-AsyJO-2VC*J85aJxS26wOs#cos8>#1u;|Ce9xStCx7aY7fk}X1
z!z0t64xItd>$iIsK2Ei~uHhM;`<5t|dl>ec1@4BDzjbq6xm|wP_!f~7C2C%5pzQc)
z*beMu`&IRf_0?#&+k$X$uW!oPu7CY??^0hx7zSGKBdDr(*U&ASG|~I;H-$XJn3fdJ
zCG)#!OAzGV2S!TXh!;m?36Mb5yG>0>J@F);=$}Dk7os(TbD}LNzGbmeR;q+A3@kO1
zS&_s9M1M;)wI2P+F)e_gCvTe}WX1lL!Nq|^TOjg)Lm?DFdlTLfFh=+vI%fgI2c8W~
zKqkC*X-1j+ni12s_0G_AnKQpcnEZNZ*{tt4htTv6ym90Z8zU22)UI+mfY!XF4w^<&
z3gUyA3vHVhN9e`W4=aS3)_H>UaT<_i3soJGnnO4Be!H&d31{K%UkbQhkQ&fxFl%mB
z6JtMM4-p;{okxlOhs%M0EU8ARkc+puKt<a%q}Pkf6^49z6`yf7^;$)a#+dY*)n@c2
zNFFK__o-cztgKi}%cHK(L(sO-E*wnv?cq3|X;})!i~aVulV=row+x2fM6oV9ef%T9
zkM-BgIExSzhJP+xO70TuS@$CytZF>cdXWgNvcP<zL+5ya)P?RcEea5VdUx4u^Fe=D
zyfctk>drW*4MhZnE0~U7SJ2q*+{{|N=RjXlDUZ*RUyY|p$~4HC<!BZu;+2lVGvV7Z
zs=_F5RL@d`CX?cC+jMk4Fl)1|K8nAq@RNL3V~lI4aC>$0M{N3!3$8E&kdU2fenU^<
z1i`QE<OqvFEVCECW=n#^4fX3vEx$lAc-!8K=lho*n9SR@8`vQhut(Nq?V{A$D^+I*
zP9BW{oyINi#$9+h@pLpDc5$!Ga6BRwjk;dtwy#*_Anx>ho!Q3IG99NZPMUMF<X>*g
zt`A=8d~`vL`Y*bv0a)f^@fRhT@#thr$p^k%Z%hU|mKc0>>QD_hn2BHd%sB4B>jlK^
zW@Nyx1|t-C7bKav`n#xQ3U$t6f)iw*D74epg8IZP+qBw%H*kxCcTL|-!AtW-a}%h-
zb*ph(26t|{;T491=iHx6ut@Y~YK?&v16}smcVT}E_q0FAWTO@dg_4*(?UdQlOB@8&
zs5Gsq=?t;ud|iSK=H?mZ*dUer%o7!!tBpu+oSD$}OKBbD1F4y#EZn(-ng;d7Wr%N>
zLVD^~9(Io;j#|dg-&~u^biG;Hdb~KlHzM?5#H^rvFm^RKTY7_dym$F%f}Z+RN5}vJ
z*I!owAQDAXMwfNJa*fCfI!Rca@n@oJ*N6oF<@C6yXGx}o2H9SDRndrPa=93Dp|p&;
z+#|>-J+P4ATt8;Rfh5L0j{6fPhGXY74lPbPzW%{ffk8uc?jI(pNFR<CDnM6%z~KML
z7a5=c+~ksrRUEvoKR2ZKBEBOT^61g4*13gax)J#T2Q!xlgPc=550QUp8ewv-uS>vJ
z>bEJcwzV-=sa#OK!cqm&B&qBbZ|>@=c~ULJaBRcTy~F<Zj=vO-aSrC}7VmY#B`#0A
z)JBqqTyvNBo5U0Xn*;8T(Zx*vTG~AUz(0DC9LyP!k}HR>Vm9OfvNOMJ#In6`^%rrw
z@PpxG3kTD97UP<j^C(ZfdxnB#F2@vV>FL~xgl!YGhw^h!xMH*@1q!3BZyL}Y%HImV
zz%dLLoYU+f7ml+TS_r_FMKO#I^&N9|dRp!?fLN}uUenEWVD};S=Q^U5-I9#8Me(e?
z%N!C6GLC@x;#0@bNPVQHXT06sRGm!b^CsuhK>D~4^jAL{V#a?dJ|{JHn&$G&bsHoV
zc90f>k`LgmJMAK*ETU!}L1emJo7iYg^orMUZZ{Z`V+*$VvEu)l)rcM-xQQHn!6q!u
zKmY3$P&-bt3LEQK`}aF^@(2=U473>vseFN=E>+X{!62Ifu~>2}_FLzPkObUqY<XKM
z1}ARD^Pu|kIS<!3N1;Z0X?5-xp>5s>)`SK5OB$m!JxvGGs{MuY)>Dc5j><n}Lre$w
zB%8M)ietYF#zxzekc%_*J)=ql9s*wGfJ9(vKH#^p5E7IkPN%3itG$v?4R7IxQ*{Zy
z@j6A~H#i1LI;WZ)K9y!2R@tTQO>;aZ$&n&(mGUAV7CL9a2*pU(_qT?IU=X|1ECkSb
z9dY^}nPvr63n+mR3gPD1&lzd@KuIHm96GjOr#B(e8eGBtGi+9vf+!flW4q%XgwPMn
zMz0ymHRDa(IC_Frpegi56ihD1SSBMVFPyUs4|Zir2e)2{7jii1A&AP~=t7h*2li94
zk4Z&<Fvre-F>lyE|Jmun)<Z_~Es%c4!SfkXK*C~FqSwFx#Gocw?vK~8tI%ID8pWA1
zH$>_TH9jRySaJA<;y?_So1O$C@~6<gAc9_f&&Qw{LmJ~8M!-5oPlH|yVeV(cj07-y
zkvp3j8h@y|d#F<pzDRWJ^#9+gP{7VgRo*=+27wS2O+KogAU>->i}%9;dm3FF^2wO}
z65&N0!pBNH;yB_-Qwyl=hR&X~_^-Jw8{{SL{kX~l`8~XWFCKU~u%=qm*3(F2@X$uH
z4Pq5{f?dggaipxA|K*5pgv4L|I4uIo9m%Sn-69s+Sp0}e>UXOi!&{jXxwq7pqDr)V
za0906vf@)C7dz;fF=wh=yd>0XJJ*hXfuX1=V1*(uI+v4y)aaIdzNh;}%3>@-bVG;F
za||a7mTov*>+bDfM6S{rAa|rt#UEd}?%_P-J!U4cgzdPR+-a~DaH=UF^Mr0oiI89>
zZ-}X>wbL>5e#0@2@TyFd2(LY^t<HXIHLZ?~fwUS2m1QjCANy*WGwKZ+S;XO94|o^l
zGJ&n3=8pQU@GbE{Qab0!nnls1hT6~i_zLt*tsIs>$}s`Yns!`GgkgoqM&Fu|o(vxf
zIA6toDAym98&!F4%X|)aUSf}g;!HDmPRfmG?42I=2|m~Hr?SaJ=iz3&a2fusX~#p|
z{GQsW((dT2KC^Ytd|jBBU<e&EZ94tiNmcBe2!BZJX^YN>9sQq;6<@hzWkMzpQyJiA
zerP77NcSs^M>42SEr0hM06$L14-UJy(&e_rGFyI(t$IR>D1Dp$aN%E4Kb@ZI%P?p7
z-dC82kR+!JOdKd#2*}Pf3+BiY?~d=yqBd0Y3Tr9(WV8&vbkiJmK)_X`-a@NfeI7y@
zUw+9%RXebOZ*OY8r19l^>zM}EC#!KRZ!aN7prak|pQYi}{nml=d(m04p;30gA3pVp
z1~50|x}BTKy$F<K!KShwC^5HAiJ$PMfbJjd+0<WtFD1#?%NXeXR`YJG`EwGpH|Z?h
z&Cd^c_simX5W3eMAWxzijpK-`00nXwA`xM%!;}Hi_)u}eSF@$XxkNt4-M>=B0}SnH
zvS)=3FiSG9Td@0%9K3#Nw0l7l`%yB3LptGkE<kw4TA$)G23^<l<<f6yG|QjiI@qN$
zNR&QbFb6Ajr9bR>affd7Mvf<5ekLnZ-?m$C7`^=Bb1;wMU^?#2+<RG!PpC|I8dNh1
zx;q{kyZiK1WZQvoxB>xckhzi;rmi#74xM!WF3GYqX4p3}q|^oW$qoH+S1^sB#slpY
z#q)v;lV=NVAMKZ3VafKF>Bh*a&a7Cx!pnD%Jm#_sa2l4Vvmx^^G@oI8W)^SpP08eq
zKqy$Fpp23<)tmTS7AJI6=?5yDN1)^W<-2FY{McUl;SzzT1Y#CXS;P}C|JWoS6_ms&
z>VOfJK_Z^}HI|Lzcv3@CEs}*(yg)Uc@?2gdW$%mPqe{j|tB9QilIhs*kJrSFSnnw{
zRJ8%86j7&c_ifmZ25z8%H_SUMXZ*6tFD_SlOggZ@Jt6W#^`FvxI?I;)D34vpmwf}i
z|0xQLyOcnjDeq3_$|dW;aroqc{fwei&V+Wy-3^R9EuS<GdEsZe;)@P_U5xUb+{T}_
zpCh#DFE_NNWH&Y>&J4r-$*Zi-zEGb~hO4?$ddRaW4rxt`l$MkRfj*1|E-QCj(w7ke
zgXov@K?C>eKe-d3y8ns-7-qM+!_GjLxnTU5ueJq17&TCh^WB50g8TeA2PSwgDm9Oe
zRfdN5*2f5zcTo5VA2Kt$mTIt6o@?A(Ky2;dD3*deGW`5{CTUsEBJ>5*MP7YmKQt#~
zQxBJz`}sC&ge)b5c7@;uEiZa7gD-~gxbYut6av@{oAj#{dZl25L_*wM?KQCNR3<73
zzE4IqDhX}O-ZoQPOaKl1&Y@}IE(AyEuPiMiM^J>*b6<uT-I}|HM#mGtJPb3^tR-cf
zCmZU8C4DvaIKSv)m%5j0pFU(!2{lEk%dJ$Ne&WW~L5_%XABglU=Lz~3UWOo(;X5*^
zq=8cSAdxxCTlr&j@ol?q+=q$-UuhAcD`w7vWzu$jWPXr!7<v7KC+axU)cfaHOUf%V
z!a!XN5Tz$B+}>|R#lO9`vE_z?L~v_cFn(1?<Wrkr1@JB&@YKDzL=CF7#ybc0y;jm)
z+d5;feUBf?4LaU$oyvxPped>>*-K{sl8Z4(yLIQ&6|97eQ>U`)KrAqeVq5coJ--A~
z5hEftBj`qbg<0!WKYUOQl(&e@kjO%0?E5V@g3DfOesgiB_1oVco36?M`_J_OlRu;C
z5B+ah{!(JqP9cCT(1uRji}4t;-M^Dc=~I!M2Wsz|U+gpm$)t8q#4^+p6NeTO-s8=Y
z9onm9yrTWJ$Q_%0x_8H&&@?4X#IJlF1+}T%#Rz<$ym5A3eP6yYryjp|5;1$p9_WRY
zLI-2XTsG}I^@gP=oT`A~d`HTbm`^I_`8S}-_i3U|hyAzv@1ba;<$)3W4sWZs8n{5Q
zf0Tk!B;N7w@a=)z`j<3x2tN4bacok36PH~ytq^l(<sg(VQ~u4qBC8tsSUV?KU*$61
zTk;R?zcSRULA#|)P!D}ktjfL?aGz|Ki6r^=pqGe2q9CNAYr04pK4Eds{Rl!QH1CUC
z(*wh!)vQJb^K-Vt0l);TMiazUy%lYW7{v3F7Lelz-u^|-GAu|e(TiwP;^9rOL9X8>
zH-DChy`%qYwHl8(<yN%e-R|q$5^phg*4(w1&o%86PTaWwcZW-t|5Nmkf=KSVbNncP
z;=PNV8wFRHx`npPd`*cP0#qpWOBBFwE7xR~eyPc~g5qlpRWH)7%x{uhjx9vy8npQ6
zbbbbP+OinBz+wvy&BEeimMKShmWgs(&aoz=PkKoVdLU&s)M`{hD|<VvTF9S0jx2S9
z{*>Wtg8x((Ilwfx+%S`66n_#pj*H4cmSJ;{D@GZ&a-|=aomAK+h}hZHztNIk^;7ld
zJe$Bu4=)=6+3*X1Ejp(gk#3mcXWgJuz~Tt$DC+3p))yb*dayMd_ALxMc=}XlKW+*k
zig9sthQBGft=4N1^pFDiPf|Pts8AgD#x|qyf{&?5xSpp=M%a)AAlR?7pO{Y#!%R<I
z^#j%bqKo_u@gXNwx@(meTz*Alf@S<f{8w)w1inFLnO=D1*7n_RGIA=yYjp*m&(6rl
zYIX(pa_1RSzzpNOm&UxAJ#!w%f)p|*v7a#<iv`}sv6?(7E_{Gk3l<{DSCulhxHJNM
zW3s&zGtf$xLd#M~<2l|`F`sa(7563hb5ec}<dYZr{08B2zPGqouZkKyMk>pBPc~Bl
zW{HedZ+9@62tB#VGj-j+mW|ohY%p-LwDk>(zg+2|tXsM_lIc<q;LL0dTqCq3!1eax
zN(j0BxlMKbrr@vkaSIZ^9fA&A&givpMZggBB(G}8w-&g|D#;k1Yh?~2gaC;f3HiMU
zJN)>=F}I{E;`WO}c8q4G6(oDAjf9NdIe2MFUxfVVaAxNpQ|Jt(Z(V-<>Lb+0w@rvd
ziqYe|-!Kcg&Gx5*<Em25?Zd6(zg2y~FiOgOy_60!KEP7q(zfOH+oS@9ofilcdI`1>
zv6c_~{oj5jIqrtMbNckVVRj?DQroU{3g)=xCeOZU*!$qjyk}AJRjJtJ%-=eG^ksLh
zyh{9Ko2J(754_fxJc6us$FO6J4|-wZV_QI?(`@yGrqJ45H_Y6q!OJ!O9%a&}hTt<m
zS(R+aHSc}}sb*}>c_OuYoI_^RdhQqN49lxMC(pzvhYUvQ3^yzJnj^)sx2a>aXGtvS
zV?&x3Zp3|gc_CJ55m@tZM^@>g=n4{v^6wz>)dcP`hr?Zm?fgEyj#C^buPfK1p$2Q<
z<1xj5W0&sQfSnqe3}j1tDGIxq4oRYcs%w}Pex(8Au{%xpg_3zqS>D)CZ7S|i*;4d`
zg{220lP*E(uJvOj{4Kq*R2QDt`dB?@Z&Zp2zj}59C-~5L-$>@{52xIgW?-m+mUZaH
zhTcB-{<~mQ1sE^$6;<%!_8ojh-4qUlU@#t9qLZj=3SUWkR&g0NdDOfm(5U>`adFVt
z{&OD-^@pnGEGd@xQoKh+3vacpo%Zc5S4-i?m_{p7-cxx$R%oytKnP@x=vrIjAmb2M
zp+8YOaO<!B@^a?v*aP^#TI3JREf(7m1r^(RS`uTds=P+Ck5`vSVKsa2G&A=s8)jS%
z7@b|IcRhQ_)F7+c%~;nEuL`F%eh2aZw%ZxLODMK!4pnC?cfn>}mM7@%^B&H{f)yQn
zA7FF1t=0iwffcErV2v?=|G~NOXoNfj@%6A?{N9^7kvXga|1RxEzw)_I{2)Bp@68Ri
z0%6T)j3nd2BQ0c;6yK2N7p`-iOm@sLDb*_EZRO;X5WQBDv7K1uKlN1iEcj;V52c1|
z2qUY6{R>ecfOJH=E`kCGeAV3c?R;<UQJ0u|a@pX`M;`7&UrwgV%4fryed!#%V_=7b
zZKmy=(G@fNIOz9ZGhc{*`EdxOTw!#c7$rpD)Fk<qyZ)k|NAWnJ{DlJ&83lWsCR5;p
z%oV4(ela0!MILop{C5vz<r!crDjCZm-x(_{c62T=q=e4R`d#cxcJGoCEIT2D2zL*&
zyzdSDPFNKIv?$A&8(872;PLL_B!I>W{<FCbEwPe$ura~yr0ga=I|i)eum#PNd+QR~
zS=E&>h%gnsFsja&5qC>wFNq7@yZ3)w;mbr;cq%*yL9<)-?CV$JoaDt5jzGk=mvowm
z%Qu}EY@8VpKnei%ICmEv4N89w7Xm5yTVMk2<UUW8prv{!ggx8vbD@G*WgO`SQ~3Ex
zT)|3&RK4$~Y?YB6-W+7%EYw)ii?gPMTK6Dd#Kix=geN$N#{{E71!}{*^|;mkb2q0&
zz_l4|e(s^(*~!$QN<o2|2V>D3OHiL4XO+Mp)?eMdQk4koA6p9UUms-Rz|nVeJ8d}s
zF!YUVl%#@I25ECx_yd4bQTRl8bQ`$W=iJj6_a_!w9p^z$)4sk4;%N`-#;s0!bFkUi
zFNBo_b7gK2(7J4<#h-p7<^DOx$VUOQk>Om9D#hW5#MjDB)Dfh0-RW&eVQL>!f26?*
zx(cuYXMI+Tah=-xIh_aEH;`D_1JNpQssD_!^<1t+e?|Q7HG+c#Zwo{XT~k8h<-xCq
z;-_A^C}fokYBo<$=atc7GLq(&eJ?ggukBmZu^1~eA@TB~pVS`u4KT)}oB7T2K6a1E
z>Qltc;#=4hV3dA%9c`Q-VT6-%J+zXJe4xhV*42@a02cSJYEl6{;gs41PFLP=E3F<s
zDgoIflA$1<W3t80^zBX7G7}N|#k|>xHO;iTh-U`$wdGef#FRhwRno~jh{ajJx*nhe
z`vvD09FxMhn8jpa>^o&M7!_97a%L5yRHh<kExzY$QwV_0+e5Pd%PA_)l}cVGvV+^m
zXYdT#m`<;|B8M77Br?)zq+(Px-{lsHE6kUN958E6(z^K^Pk}%bU>jg$*Z9UENm*&y
zhUkj`mLvNlM1GE+T3$jUG}5NTFM&pTVRBh8DuDNCF>mnQ%{o!~f7c;a0qj-)B!h2C
zx`W|}_oTB}5pyNPEf3K+1#0{eWGto_O4;LyI{HH46yR@dc+4M85Xy~e_&wz(l#^{o
zGSRas&2dU}gTUODC}3$m5nvBW>(J)&`DC|voeDaGKNpW~_So*~p6HqgFt=W2q*R6H
zc8f)ZWD9Am!A4PY4bLHXNWhUz?prRD`Rt3QgJJrk;Bv3&LALQ`$uA!vD_Vh&d-q&}
zH6l(>Up>Uoq8_b5_B&r)S@{bmx8v<Y$C<5}THIGZebYcWL=J1@%A1#bT)|QQYui%*
zXeCtcmc(or@`J@q0pD^r;nuUZ$#raUg!jgCaABjm_mY)GZ4|~V{W44R`Kea1)1a)%
zj47`}+Y`Qg_jt->SNrbQN~0N?YsHBoW4f#!Y6q_MU_(l(^_J(b{3uOs?LVIB`48Rw
z2{_SHHjTj1Ws3XTMN7fa<G4h8h6rox9;DYFwWeK9UUjs1!i?(stAswuNS#+58Jkbb
zhvoVdW~_C#<4MhCV>#^d7gst^BqX-OTR7I(!bQev@4u6-w$&TEbz#mob~HwQBNfL@
zI_k9gH~WGFIKcMBpd+lLd*jDzSl%lGj>^b#{vffj)Jf>NF}p`$zqW;Qk=%DsdU3rH
z|54oMo6>U$OYktSVQ-_a6xlp9e6KbEx6Gww5U_twOW*OoSpb}pj4&13M*HF0p6b!B
zaRX%Q*z_2*%eIO}X}VQwf-=>1$PE34nt%K@<zKQv3<|MU6Hot<gh{dh6rREXWKkYT
z|Dsa=#bU^xxghZt9EmF3fXQh-V!t%m#C3pWA%xs?9#DfBi+8;IP=>ZMj2hd-isLWU
z`GEawoU|lfT<!Ha=HaRzPdUyWq;ePhooZDfkSO3Po8>=fM+b;?nywbNSCGjnYSc+6
zei;PSJ}onCZ|0n1_7L)~;|Z9Q?V!h60v1QWh-C`QBCr)JZO*2?1T!>*xu?#R+fWpW
zHKUbdy?&+(pxQzxKIJED&Gzx%U}v#FJ4((g{Eo>j@(OTVlGCwW68EI7BLld+h~22g
zSP6-q>2>8z@-)zE4w&pbG?9v5N8y%Iibnrn^_Z!@SbMPqe2;s$VPK3b5)hXU?!oOf
z>o7KIY+~CR8b$GC0S&JYb`Q-*{$Px6io(O1+vgj-&KdzX2n=uvDVg4+Qh4dt1qI%%
zBL^%#(R>Gh3KS?C`!4Avd*K(G^?JsHf|~mn^OYQkv@h~5&Ii94(k1lt*PDxrqGaS%
z5+z{u)Kr%s1LK}~NVM8YHPa6Pv218<COWwT_nk$yLt|UZ3`>?UsxB0Gm-a8o(E&0;
z!uxz*OGaASF_!r65HflDvly=<A@$eWcYrbGQnYY`%}8ZqH_iM+#u_s(dF%Kj_Tj(&
zA5T{uR#o?O&!xM&L#4ZsmQX;t8|en=zI2y_APovgcXxMpcXvyEyvpzU7oO*yeP++z
zYi7-wIR`ebpEFv-TZ)-_R+K9D7B>0Ce{Ghqgx9YZ+8vR=Z1i9(n`|~u^6?ty5s8S_
z1ns4HJ)8wm5vBhv3a%gngnCF5TyA26HGxzYu5Wq46$_I!v7Q_(l`3l%#>V}-)|$6-
zjm)JBEqmLM*R$K(BX|2Lp2P>J=nKElQ?yPUTAB@^gx3-R-*pZMn(mQU-ykQNTp&*f
zN%kf;$yOND^b|0EWFTj6-zC8FemHZVdu>8nf(LL8R{G_d;KQLLPUJJCiq#!QTvrDv
zS2P^L+e<Xx3(1bnJQz8%054tg9!9%|XnDKSGjN}GTff6Z|D0<f7^I*T3&1pM{>r_)
zCRF`iQFdlj`lneS;dqW4jQ!bG$Gw|Es-`mTqvJ?QtKj45V*tAEe-V|KCj}twy*Yr?
zYEM1dX3FyZjmrB<W~|SNp=u#)XcPR$&<4O)SV<eWy_q1uHA2I2P>JTxfMA}K+IR{L
zF^Tvrl-Pmlj%71c^&fYYBD<7g_e0|ty6lf+sHj(btLa`3Pt0v{|2^nx9mvBhJlzgN
zzs^57kkl{X{N>u}UNF(7bqT;mTTBR+AGnMFlW3w=BcuzP*G0!MtZGWV0KPHE0<6Jb
zetoSdR;M-|AV$fP$(5cvtCQ8nLIi#YPc4`m2-_pwDLtO=J-)m6Oj`l03<9UHugIkX
zFh7&qkd05*{kbm2nh;_|yM}9oF{0=*lpg>XNVp{G)V4~FTy36JHnyRx7<9_2<=1~A
zU117zjxbEa%Uv~WT}PmM5c6g3UocKDMrf9>LRJ~qHZO5*GfOU^T#pEEPtBiM3sncr
z!#`|9z49`TfL;g(wp<<(PrHJUI1IL_x^8&3BfqE_9v!S6P-`p=x>P$cIa)M@FgsNd
znl2k1g(x8|H5=m2!&%<je`@<YZwjs*!m~nfZxhoJvgf{@OLjQFdn=aKgc2RZWrG9s
zz7~<u0du&gr4Nx44oHO>ZN(S~X%;0{@w6>QHht~TScv15C~PLT+&BlN`MWS<RtLIK
z>w$&8Yp?tyl+kdAkY|QDPDAEgSsFD`FO*?=!x{Hy-K^x9%ktrp@#$H$Ve$4W#fW4$
zP+eg6j<EK{d)*1xtp_;3uUs}UX!W*78xk&@ynREhW`pz!-j2E_vkK>UwpxsUd`GiA
zLRf#|BU)|<K)Fp;>qrbm!k}yFtLUu5vtzpzSM>Fko{bqI-r9~nZ6B%>Y`Yve+VSV|
z>PLWk!<S-W7kL7~bF7%DE0w6Gq?eoLX|JdGI_B>YeGeh@oJ&kY0z>sK8cjN7x@~V%
z@pJUp`E6%Pg9`seJeNgLXy~r79Nt2|F~uHs`$h}O59G|i#%6Qkw3?UhS_kOCdjB_j
z&Ro@f1*)CbXPZ@sMf%o8PcA={L><0BxJEwyqkp7<L<3om1{Qyz0c@($$E2G`oj8LT
z49w7^_v~$-3ZAYw?F!)P(XA<xEeLJMZQTk>&A?sDFxR()Io`dziYK-Z5@eTFtNZu(
zxICr{p@6CO;87ETIj_%nmzT!oFg;_=QiD25Mz0R^zj**C!03DdbAMu+2*R!+1H{iI
z(O?vM^5L%F9@(MN{j_U*hkP7dHYg56!&n9-S~|`>d>^yz;`|7o11r55>*8JMUtjNx
z?L(83kvc`OahW5aZU3lu(b+EC$d5oaqj;O&m|WG*@zfqDpu5g)W4DreZ}R;^ElfbV
zH^c5o!?b9>vB)fj$=ucP<H4w#6o!~r22Q+ii^@>zNag}7w^6uph?O?KjFJ&+^-vKV
z`^RxW?<_};tjNw#6Xe2OvK~J|xhx2IeC7qH8biyrI^(ZY$m&~bTE5VwvafV06(D`o
zM0B34Rq)}S3wZzzn<b_rfcH}zqP$B3;k0;;S>nP1nfQB$-=+nXpfZ#kvF@crOUhAC
z((08Lo%KZh{)~_u@gjk(*do$O0sRPFwp#H~(GJLjXlSb2C9<MkKhIbPswW9i&5-n;
zUTyNlO@)Y>DY#Of5ou;3ISgPZYPay4#|zv`OHGO(W1WL+-IMC!DPXazHG^6i)}&4C
zq|94Lu%H5rh|L4!izAjwe)&=)ttyGu0n6*!z35B(Xy(Mru`bIzV0Zg_KGGe|=-)El
zp90fKUjlSeZ;F3~9%6`9wY_saJs|Gs^ad^wNrdvWmJ*pP6T>gfDxAp8DgASTRICV5
zO5o#8A4QM%z0<xP%@$c`pq(Qt)mA{+haEZPr5MBdJthV^f86#oT!Zf;Rf#)=7gYc%
z>gy%*(yu*dsa_z2e@Is8i{5Ob%;Qoy&LXPOP9QAEHdEy`Rb}kRSv^Q*u~2Qm8cek~
zl<JIxaJf@xYo!%_IrTo%%qm?OW8+P%?em-Z^q91ZC>b^o?ke9e7Jk^_wIT^e9rRLF
z3kX#U;4kd2|6})oQV3+O+YX;jB35P;8cbO>{KY#g#CQypsV#_W`n@cI9ls0-<{|7Z
zNSUg{`mu#pmdsLFLePBCj}0ZBqz$z+?m4g1aQYmdO73Ld#=67{cXL{G?a$D&GndTp
zzBrk$k^uxDsO8FaXvL5{DX8%Dq51<(zc%jitX?6rpNRYLSC9d=f^xrf8|d4rMwf)K
zZc0_MQx<jkpY8+H(V)JjUj5l$gJSk+H9?BfAIxgUK+**hwQm(m!<W>zf%1Pn3C_^q
zd@~LmRL<*CHXoq~^fzhUcb(yxA9v>qz8uXZz|Vdr$3VvQg3?0Pq*zEuJBb%xDB12$
zL9K{|N!@2fcsqDi1V-amnxF5BSN|Ca4mqIP`4hI`vF`g*cIB4#z_uyBRD+PWI!N_h
zw653FC&r@JsUH)7p7Jk(Kkdo9a>b4Z&v#W{_ET$mJTz<J2|qLruAPf%X4m+ULy+k^
z+`!B#Xx{96g>u(aKO(Z%lG<t<qFg=?*HNOJk8Y*+u^@&?%`k^?qm{xdN~hE4`kI8l
z)4GS}=u9LFoPJLa*jW9$WyL@#MxZDbs#@&#+8ru*doh8PU4cORE^}A`yNwlxeZ4aE
z)`e<y4w=TXH_bVaT6?t&WS@-^!xh>l2Pb`E$1Lh7xSN@#5^K%*b9~Oew!<Z~z*w);
zLw%%ox*Ql0T;i+#D+kD10Rc_#r&agD2SplFkfvyo26G%^`S>1`SlFyc$uXHhnx@DD
zc#sv(weY3hRaZWJw+p%xn$w<E8NA@J@+HkADcahKjkkL3DLw^P&b0G8)DokbN`DlT
zhd&h7vv^9G583i1nJehL7gZvC>E{i24e>$X#}m%+MV*d__OgA=y1dWm@KSdNWS-MD
z-pJ=3+WuywWdys@WS}f3)3AeQ&N<Ek5zcUU`FEwa@kB=oU72~hbll0|6dHv|(s-e{
zKGD-#lRPLoEa~)7H7@-7IM;)4=NGbquToSUz_xcsN)Ln!LELJk02=(6g}c^SGFGu6
z4rdu(sH0Bbp147@Hg;6NmKzYs<IcIx0HG*Y?CtQSL>u39e);q#hs$w)Xq9t)%2OFi
z&2@%ns`yQME^vDxOByTvZwiAwL`EAlQA!`&d)38X$=C9>#AFJk=Q>uRAkHF!nzy$D
zMa#zR!LdU7p{X`YI7Oy*uHM(>ojlybuCWvO>YyqWX03>*<S4&`9gB`1m=B-ot!Xs+
z?Yvu)^gENSZ6U)$cVC#v38;TH2S~6Y9G)JfF(9%}X3_#M;F0hinkJ>16scnuJc!XQ
zEOaPC%Xi=g!oM41S-hU^Y5%Pq>(uG6b8r$?f>W<z%0ZL;BZZSVS~XFIzJ)ohr<TN4
z*^wBsGFKDjfc=W~L6{6R7Gag?|BJzT#NNJQbYtQzT~4L-@{JRMcNHFdWQCZQ*nMgE
ziS<Q5yDBVGFJRmzv_1lv%2UEHHo@Uy#9aWsLckgJB;2@nG{$J_^H?P+y1?4w1PQ(J
z1t=i714msq6_ELb8-Mg(VYxqO`zsD<V0B3WPJ4q(S6kY(dTaBqLhJsIHraQfOCTTD
zVmr3fTk~13;;xU}M{(*}HH><=QnYDeT|(>J{Lh^{55MCs;t++rzWv8NVuJoPb)W!{
zZnZRI3C^lPLR@Nnr>mMZb<kSAt<2X$>t-T9B-39S)};Um9}D<wi593Y!mMp^<f8<7
z<?-XgS$eb)MarMCM+)vIx}r8lYv=e|e2zrkyQ@$w;#dG?5PzEq-h*BWJUmaS-QjQq
zAGouFa?0bXoY-c6^(WuPn4@dVU!u+Zu<M|8V3P~&Mu*x6`pMygKDaoNIdsTW`4thD
z3wB}wheWQ7<E6gTjlNqrN=QBI_ouNcY=Yg?{Tb^ZqB_Wph{!MFZ<k0UfYwx$uZXvg
z#<B^TzwuP)jE-?u^HKhgT&~456Bbx(J`;{l)3i0%#rw1Xk+as_YNob>H#7Q&%mP(&
z!#|c~TTF_5;uk+9i9NW4%|+ysQ-#Bi^(LK@=XK)=gw>K3FS377*aYa+(Obg!eC_H5
ze`O$tNo=(xx-?L8Evxeqd#o2sCix;Bg$}V$ZS^u_BfISDY~*j{S~hc~gA!4GOrG`<
zAGJpESp)m&S`KK5n&emnUAx1%#Ad~hDa0!%f|`&nPQ?GR7!e@lN&ou-5-0(LC*{Z{
z#5!6gsmo~<KKunKhEV{I*B5@ASEwa{xk_9=V^Vu0w2vLtu8&#uB&z0opGUdq#9{Vm
z?&I22tlHHzzt;NUJf{?EiV`3u`Z6>tAf5Mb<%S9fN7~XX>B2(G@b4_m84))`!lorF
z=3qymLwbic_SvmCz3A~`b!K{moZIinBWi|2E<SMqcRRpe<w~srA^t;E>?I2)Z&>Z#
zsLF?_(q>eO@}b4{M4)O`q>n95D?9<w0{v=U;QIc33GnoA5%n<nm!#4L$j(VGu<EtY
zz}vMLzq|WBrNFRaH6sMWr$CJXp>;;#Xm^WW^s24s$e5#o2Xf|SF@|k1jUT==!m@&X
z>+daBuIGH$I9AM)jxzWfPOxY@@$}f7Z&e-S3Vr%r*K0fXpPq{VK*ovWHkqWf%FRJT
zrCGWqpfn&r9nxdfmxDsQTHPJQCP=>|Q~10wOM0^%>0w!@_PZ9Bw-|R36=R2t>aL)>
zO}(*yH%;7?m7C!>RpYZ#`_DL+^kI$X`o>QS`4G35uQMpt0X%)$s?Uh41KDd2c*r)U
zr^?MLc8Dl?@wO>V<3SMgs3}kgXj9`*3Q@rqM;h>voBV`wfn-LGk7k$Ej1(Kl!h>E2
zI*V}R&uAS^ZQsVH8D(-y^gy{5?BVuaJ9>hY>nO8%<n~4of407--~Rqv?{WuP^C@y9
zQlwxab~TiPSgn7Eg1(H|xv$EZKT=r2LYAk%=b^V(7Y&~h79=j65K2=nffa<5V2F{}
zf+sli`g9=Wlr3&Gy4MhfDe$Ia*al{prk@yO9x%)pLD8>#1umfVFgGH^rqtK@y)oy$
z9fNIMm>@c!Dmb(2fXcmgrdGZkAEIa<+WrJZ9A0%Oj@#U-iNrckGSPQaQkCL)c;pQV
zhuMt@N*>(JakkfQ9EMe0FXLBAjR0^CPQ*u8=R|jU;M0Xi^EVjOa%q$(740!I$T{W?
zOrHu{rC+Z8JU?G+RdG>y)`FK(d$jL?=K$@-QaXRKAU1oM;EL|4II(6pY_oJ7KvuOS
z!D?e4T2R3SIq1S#bne#1=7Eq(ae%No!tV25x<2U%(!*Z1yaa=En3ZayGe-T0B?$;J
zPfWWhAZEBz4Fq5qdBHE5`M|3PTH5+wJgpdQY!wQrCc$6{yT(+MqyWl~^92@uaFKI8
z^-wI@KU5eKFiWhjJ3o<8yylNfpo~X5QmcF;BTH!FL>BR>H=m;@RDP~=b8*qtFhKD&
z&sY%(Gu8PG9gXR+f})+fzkG#;k2{!8lBqL?nV(Smjwl2Z?#xmBZHM8I&H4Hd&%22s
z2*BG2js0((j}Xx4D!jY*ntoHbSVN6Wj(_-0QG&hN`|(i64m6zH8@-krOY>$<&&RqR
z&mQu~gqYT=!nJc?UyUsq3q^~VhMmYeaANm(t2Q^VeuUG7fhT1rS$_`V>6Gpj4d8$g
zc~H-x1{;pjXwF+chr~7?ZAiJK`x=Nok8l#wjqCDHy;bnJaSNsS)<+cUhq_^UA*~xT
z=sI;yO)r(1+FT*fy2*w2K@Cb;{!Fh|>Jt*r)?k0d-pf((dA)F8fkM{j{WXK%9Qka_
zWmi7=c?omsT?|Jbo6LlJB-8Rk1843O=ll|C0_93EBaGt+{3+thxe#ii4{5IQkg|_A
z9hTAqheCbqEgU8s7p@WJhal6#9OK=7eGWIkTC4_yUP%%ZKrR>YdfQ?g2fLm^PCc|=
zmrLT1X7od#UI&kNI7+^`y*HtBR)d?t0IoF(u^!47QtWJAj8xisNOi8NYb%fpKWh$$
zwqpM|@ATI7JFB(6I>2$tNj1{3DQ0nHK@9PBMpuweb{grwjgcpX1hc`}DVHVbgY4nx
zXCQ~c<YGe(+hDABk(Ak}>*WB~Ty=Fd6AF>_!ILFL2&%pl+zf@bFS_VN9LlE>3!gcb
zda(lcM7#^4N$Y^0>aF(3-l}AmmS1`gpP?-489;K%fBOC&`tPtpEBiz&n_okN{n`(*
zyWbVbPBPEyjS-5hD@9RK^LBQsISc}l=4t9v=%<lyeKEmbGsmq-sY|LjW0YERN8fI1
zOMFPp`YE8e88)KPn5FCeNH${n`9Gwl-ZubBYxL~hXMB+Q>02T2^v2$JS!u;*?+~|o
zYIND@3EmaKa!3{PNy0W*eZWJ^?RbOErh2*2)}c>m_C2Llp&Pn;|EG-&Y6jj(9-~&1
zqUmyFM_w@+8g%RTlU@5yK^NWY4=<A9u+moz4g{D)NKQ!G4-J1QzmLwn(sV7Q-T*2*
zH~uTc$HY6kL)q^AA4LZfrNtu~Dt;_sNTOv+Aj^sVlpJRBh<G7-p2N5nErWW|Zaa~W
z{feUcqBK6(VVKFvROtwT+5aKjD}l`f#K9Rt|3b33?;lrtsGfi4mw8lR`XM_;lW^%>
zc9J2t&6`pVwvUzr<{`rSJ}wAKl%{ut8P<tkOTNmW*};o(_vv*qj5<}PAJ}p_q8SLF
zM85v8B2YQHVsX4W7l&pT3%7sd*_>uWd@pb9b!|P^J7IV^T22ACTM2!n+aSnkkur^4
zzUF4Abzg%ZkAI@;z)+%(vNIZ}e)*YT#F^Fln6*@92czO&-OU*Uo)FwDFf)ZF9lZ7f
zv(rTfYi^#|q{(YcoeXBqlVh!uv63#ZKA$^^lK6)Cnw_yJ3?8Qf6vLV&f3|ggcWd{b
zHJ}OG({SCv40X48-kyd<|I>&BfaDC1KWf*>2dN^lV=dMF=$G4)<l;)7k?j`ZGTzi`
zP25n8P-W8%Q-*qM&K+2fv<L52Rp<2^nGQs2EJuVLFI-p^kNokR)-8kwp6=E<_C5;#
z7e!<VfB+dY@nVxH*AL=Q_@v(sC5m}sgP8=)p!hBwy?;zUPBCw_WWc@=UaD{78J%+z
zVF0ldGSe?q%!p{%W?F^CQqie8x$?jGJf)WpGvr7gd-RKE{!j2o1>^{B*CS80;<Rd=
zjSxYomX427`{Zt;ZHukirQIwnR%k$K_)jZgH^xM>&q)~Hw@;#{0%z^QstZ~LqU**F
z4XkERS>;w$@S7b$x@ym_@F^5rl3#=~6|qvFqiJItAQ)#HJ|}$bl3?ltXU7y)<;cKY
zfAR@^m{O;=S6rot?|9_!$9oAgV5nRHKJKMP?QP=!)9sGkT5ZgEz_8k)t3eDpn&saR
zuyf#cd#J$>g1;~3!&y%=Gf#N8N|@4_W9}h<(<x^v9PVkhaCH?R(Sqy6LdJ~8U6`K}
zFxEk9?ZuZWOr79Ruoc=JKyLU+jqT^RubnzxnN#Fdtpl1FC}B6GCJ$8kvHvfY3)`>J
z73{rUupvb<z{)-7PQZRo4`wlf?2iuNs+J*6;3y93QAQ_HuKw)YiK)y30~r)THr-zQ
z#qdp4@r}8@V@P&{7$TW~#;-rvZX)h<9pbLZc0S}+;-|^PD<7VCT0eg#Yk3mE{5Mf2
zW4Y0j3(+^hC?>ZM3I$VueQS+D4`U2OG@QweZ;x9L=3*D^!u{>hjU!Jtw<cj_g_gv~
z)vBxdf-*bGtsuRN<6~@8$XE50CC6hnFR#QZupl$+kN><!M{NNK`nt@frcZ6Cic&Ld
zCP0XiiC5}0F@gl=*fL(&PVj!?Am-8cwBr5uENHDLc|Ss7E&^F&s|h!O^0d<l^}O?`
zn=kC!(u&rMfdU)Tdt^OKqd6BuLdCC2N}$zTi7;(4e*m0Y;gkg%V{mWEp5{-5Yk}-J
z#jJv+ubOKx${sqd0vCi+0NnK)B-PjHYo{I?dNIjl++krb38~NSI8EHU#zu1Z_7nY6
zdFcWvXF=N!@d!v@n#$YUa(odVH(j+4zamU0D0JTT)S7B3=05%kDsb_qZ#qs!)731n
ze;jsp+J{ZrBv$FE!$3e@efQkOa0=VGzk|f;Bk`K|{Q{K+^68>4h{_dxNLFqqg1Tn#
z+@crJ_L5(qg1NP?1E=DyF&Yw%bPo9{o*W=o1W@M9yRz#gMf5VX7r}1+h%#?zCOJb&
zuqF4_SaQ_zE7`iNrx~2*UnW^jA*1^XR!p$q?@#rp!43%2R+of0`W=vJ<Zb@qtq@wu
z3i`q$Z7~Hsx16144$%f_HvWRiD6IMg6NCKx*;(*f+VJ|_dlgOl2@5;9I%|IjmxhlT
z<y0Y=ab_4P&Vwbq&i~?w7jSA8`&N9zum2M)kEQC_cq8*~mSwTRZ+SuzLPWz~@-&mU
zhQ>a?du&xVSMl44q;Hwk*z1Z+#q-XIl~4SR5w&qCDUn5<^W?sGwmBQ|e(IJb`ETV-
z>_D|rd_}@a<&=88>7zxoms9kV8O_cGPi-g3V^&l74uv+EzD#L}&QYvT>4yw)E~e;(
z0W~0D9x4hGMx)-igxlP%=`lYmchxI73^&YR1t!1(c%Tw={V(0R8V6=Gb`hwR791FP
z@gZ?Dtk3xLTBjOn(>N-j-`_h1L|ZKwz8A@`$1iTM!k)8U9HmlT+P3QlWZr#E@w25E
zT-%9Cf#GUn)3&CgiZuLv46+t%ds+KG)pip-K=C*v015syW@1vH9w4_=UjtdAM0G!C
z8=tKaDVd&}v_K1P^$NFIxa%4`KUSd(zuFWZoZ-*6ryW_f6?2>+C;BewUo*#GeHxr{
z?CnVW%0Ng#W{5+)cg)oZW`tklT=QQoCO&_DlgNHu<-u4i*68{nwP2>oF^U0MfX==z
z)NHb=A!U=Gy64I=m8f{B!HmW+$dccuM6<xP;Gkan=<_<k|J=Lq$=~Jx0aHd;oY8+#
zJtticNv*g59JGV`EeEV;GPki~wSW<ow`(RQJ5i;bN#!>=HkF(ck#e**J}(p>e84sS
zhXJ@Lb62kh*TMXcYj{7Y1&-N!2YuDaVQ^Kr^gHRN(cD|{vV;QRpGC5MR{69h6C<>c
z{inWWcE^<O9JO|vR<Kq*U|ZCrFneuU&SU?!YcnB&V>QMR&MRSZ=;YYhVz{dvbWkHu
z^H;K~q(ILlNPm3RPt9$pK47uvX<!dr_-hr6ccrTuqo?Q*c0#07?ch#3@2jj)dKoc_
zw^`Z)4-x<H+|3Nodd%$kMP{gn!ZyWS!6!Z(6>4#?;8vY3iRz@1cwbp`zc6#VXULx(
zWfNin$?vj#ZRI+25YxTIi5S)ioza-K;2fo)EJ}(G`F8~B4FVWtc=&1dVE)!t<tp~m
zFEmf{o<p^=h?Jh1KS+G(0(ltjh;($v|I-5W`BDC9zbaa&o*G<2YE+ddUqbLSiSI%r
zbKh%BsIh#B(<5H-r5woH>3j43qZJ)hhbv<m&K7IDmTPQgL^65K2!a!~h_F<p0He87
zG=!jmOb3ZQv|`XEA47?wKz~v5G-1+U>a*3+yr<Je5yP@(lpTncs~-H9KCuR!j*~vX
zaAqC&;8Xl^ci|V8$!Xo%(CqFb9;dQ*8J%F)7`6!`q_K>z;X-t}mRZ`nTJF?T?ZCI0
zu~HPVp3H){{RsSRXu5}OMWLvV1Sb`BHAHB?i?1>~JY`(bL5|}qqZCnJX}RNYQ4`t!
zQ_De0nl07X2&0)uV&M2N1y@IfbP%mRe>3IMHdQtLkI^fE0hUOwCz9GYoCbHGsWv5x
z^r%G<e}?FfS>rIzFRsE-c=79@v=0Bwj=kKcq2B+5HfRJ{*6%vLPE=bAS-b4yo2$7E
zm#U0}^e@TL!2$%|NpDJX2Q;DUnOBzXk<BgYv-w%!oGufHmjG_9p=)EVo>^@18RA5X
zF2}MBHe4zS>9)5E-{IHa)%0Qjd;eru-=T%FDfkW|bFY{`CZ&Io3xdFj;eOLIn2~qc
z6=RdhgGdLUSfCBSzmc`?7r-vE;h!!dpM0O<Ie72+<V_ft{g28X2FXna2AxIS=Ogp+
zI$cb7F_u)>7r0>69w~-Zyv%X8hv})1Te63Eyk5iW!1{KkVLYS;%+PuFTENd7P}|k<
zIU{y@YQ-yzbmuJ!mAzJ^FoDBUJA5izcqM{SvI%u%Pr6y*w{a)FYX<&h4gzwpKV*fo
zAX#xooy@p<-(I&{6;5YjaDi47=ci=dk!Su<T&a+H`SaQpu3k_=LTTl_pZUoH&B)8P
z7WCQLR_bKAd}nD3@8<kcY{CtN?L1YNSyv|>zLdSjuc%-W`qChQfvWvw%(K?WogC-O
z9zA2!%7?a%L-rxa?wH4!YD6pj?}(;WE5;Ap!<1lLLu)9z5$$|poha$L`jMU5o0`VM
z-#k7-_r$N&rvjiA#e}Of#G?>ig`vOrnJBz&X^(K{zWQjMPY+dsg_&1J;RNU4E+x%P
zyT*5dq39-==6H|kPcWB~;ll2}EmMU8!**&}+x0t$d<;yP;>^c;q;UJSZVVt;#W2CK
zu=ot>MZeU-t%+i2NObixqL#BfbT@B~*Su0L=4#zI5N}mq5sn083kyD)+|}oEbgY~w
z^1o!)=+tU-4?tz4zDrcfvQtWV_i>RfbVg!g%GMs_R06DEPCpiD6x5{3I?9a5zw7K{
z`Cpd@OzW@|Zh8v@o7=i*Z*(3_=-VIMkyjqpRyrl(`}#0;o4FX|a<L7!mk%R3?RD8&
z=VObF$FkOuCk+o6O(^Yjw-fB;C5!uKG3k7N2|W{_5gMi#C2Z6{d&L7u^R~=Cq|v%G
zSxCe(Tt>GN1w3rxa7MED<!+SjXwe*4Mwa6`T*qXBN_k2H|N8|ub)ZqLs$mnMStk6T
z`b}WZSD+FOYUr%t#_Mrf0<ALjp0?+<^3)k4eY_y3wn)sQ2_jfFVTI}zFX+r^F9+h4
z3PFTiz331Pw^ontelQIPb4CJBzx_Ei`h&P;V-p!y9`jxFE|l@M-XE=TLZZ2wtf{2c
zn17^`8#dsgX|!92o6ptp*^i}ncX>!$*E{%$S6U96dSoqu8h7eDRLPY8x9?C4uhW69
zAXm$*QAs&Kn|lkt2Oz_9ja<Pz4I>&wJqb<Hro!L~gJ<hl0c$X6%CRm}qgl<@WUs{o
zrszjX&A;7=SCYW#ZMGL3h8E}zTa>g$wP&R!f(H(9j-!7jiNc}c%#_3>zD3K#o4BZa
zoc*n$GzEhOqpzQu&A1rQU;A@)&;fxE<l!|TS>t(>F=ptz#I=rO&nlaO_%q0>y1|hi
z3Z3pMzniz7YkmwDSg!!_ED3OnH|(-ihQD6~byVNm?{2KFZ$PJ4a(Ig&L@eV~a;23t
zuj>Zv1ggJAvfh|LBQ|)Sz7?OX7^d>KIJf`L7~8PaBzdUwdh%m~WuC`i7JIje2C;wF
zus03x;9_fP0aC6?R8pzYzFE)E=|G+8Dm%e`y2K<F6YQg5gZ+!mPemYG85DQy6UkqB
zb*?v(%TEDYm(fu$f+=ZF1wiw65tUb3g##jE`I;3N(a=`hfiPReHPAx|zMK%o8gY48
zxVbu+QQLm=cO>K8cZk+pi8ek||E?-efm_rMI2l{d{Fn*+*oMzy@V3p}UqRrM*9#sM
z*a~6bBNhp?YnSHrTr7uV82`1XGXto+OumQce=KHrc-&QbJuluYfCufQi+Mxk<BMG1
zDldQhSrL!A-%yRo7*6B8j}8A-RKS*M$uD^SS8s|3ZWrZB=e@cRf2?a+ev`Q02`I23
zm49?!(l+RB{YwijL98m0Z|rqP<~E{C^niYMq&s#Q(vB{mJlB7JdK74_@*sVE`aN`O
z)YFFd#madua!P84c*;=$!BPu4Um7QssxGi``5V&n1nNWlD|_k;c-)b0QjJ8`*1^^0
z5p5%+4v&=fe{cTab@v_T6^sY~LDuY(*s?Je=$}Zz&0jHY^R`@M`HUVn-$i@=Sn|ZA
z)Bfk9<G^j`WJ<Ga=!rY8b2C8hc^Gy=4E$RcHN<Mfo0^`6MwoBeaDQ7Q#Q-9`$UEnk
znKl2QeFgU~1MuI7PD-FN>;&va{`>sd`S0tuPyqrQJ17)rjUPElue5;Po4@4w6F=w_
z({DpD0+wlA_109N{$!u}l_mrL-B=pT*1ot96T$U^^$kj<v*HmugMWo?9UMS6kHC*g
z<xH~H2R5VeB-_x14`ngb;SPQ3L*vJXLH@~^(|+>!|1!U)D$wa$(+&8Nw!SBV#VO5#
zw#>%JOMJeAko5pYJruAd<lmM{x)-zOhcC5<O~jbHJC2;#l++i|g{PO_IgmOsdit<w
zK>qEFlxKnir(?;TJ}fvVfZJqJu*0JSaXph9zuju<9sRyO*nu>A9gfZnc#UW8MZEd7
z6I~`)1QAgA3^fljGR7Mt<oT!z1#uOB#MQ!7k^NdzeEFI}dU^0OO%7@ugm<-luPH`|
zV9rh@Mf^@d^c>G(!`j*ncS}!K3F>P#U>`XBRGWbv&QA=5ghD?1Nk-|?Hu0`w9UjP0
z&AZT5n<=q#vr)wsdR>eFfW_wpRmzW<o_998oTlvRf#vGqZ~!sYBASk9gu2>z#Zj_1
zBa*(xppht)2>EaPAR3U4V8zusUReG!A6l!GUvRF+9wPB+m}@mOWNW$WU($gNlys1~
z$(_zMu2=(YGDI<S%=A0SMX;6`xAYcQr-hT$Ej>S8zP#Z5V<YcXL-4!}1Vh21Oft9Y
zFHdt$>c5ZA(ohph%lFxNTnv%*JhWeJJ{nYI(0jcObddl-6oZ^JUv`zDe5WfrmiILQ
zet%pS>t$DZ2EN32m9Id)dZ5wOwj$AHVZE_<q+7$|+0>Kf@k(|ZQhtK5MQ$;fEi^MX
zNW3@Ka&EaIf#-ky7h(I1PZ$=c9>r@+f?m=ut&dmW8IS@h)`6`{p#9Dc2J<<JMz`Ya
z9h~XJ4)6Z@8_w5NIf7QFIL!*0wdbA^rVC17R7w_>S|~$IIh3JDgXCSdf4{>v6?b`@
zj2ByU$SD{-f}48<tpZT%Qj$9|(dBw&bb<6_HDaXpRfgF@C5z3nJfC>M?j8>xSEB%Y
zTf&iz$EBxdF>cP=A5=gu>c8|90cd<n@zY@iWi=~T-HxP~o*+j&oIt2@mhs5IbgNss
ztztiUUn<INLTdEtcNdxIe|UX|3$!lyrZA~I;lvj;hh;4-80dge2<q~oLi9%yw?S#C
zO#L&3dRIKhBeo@J5c;yNnF14&7_V$W8tBwK`QppPjc-h=QxN=v8Nlo9vB_f-w16vC
zT5%-EYwrk7;b_%{$s){6)mqUn^b+t4JwLG}U;9DAbmaG%POJki=Mvg8Mf1t}hKEy(
z>D@9ekSdpZq!JD4Vq0goC1*N?gKvAK&}#G79XC521?nAS1wgRcPS*lbH)>3umFHd?
z6W&7$X=VHBXu3yM*}B27iD5H=f@EfJwn>=N48>dfw96#l$iN?L-(MX{J$S)lesYEy
zaXvjg4SbDUB!EM8XA?LdBmpWQmkln7P~u^OU{wTFM%hOMYksN4sgYRzgQ`o+l!rn_
z<Lvsf#kbtkU+FLqc8aL?i^QH*s!{*KUpFhj<*MXa8JAwB_qQ9tY-aI$Fh``n#XD57
z!iTCOXEgiheDfk*Tx@$xqrHoz*r<#G+4FC?d1Y4{2*3*3KdST?IOUw^>4_B^uD?j~
z`gkR%yR@L2?U_mjMf|{9@JHo(eAg%U^n}3Q_VLa}1NHXJQ-?&OpsdT#Mn3dI>nmTu
z2dsbcK1xUNHa?W=1(Nf3i)NQL&+udzN}w(2F8CgfqPpi=j4y51M)hIJ63~A1A&%JG
z9PK>c%O@>AU?h)t9K^8m__F=Kz6Ssk3p3(oStkX&w=SRv?ShKLj#GLE3Hjce$ipEg
zHJu_$)>pTw@n|T{@vGIy+(nb8t`y*Lk??9@Tp%u4Bf$+G$2h~q@nN1;rBn66!-=fW
zTPw}R?d~Dv9hn<G#MND8<U)SFET|&4aT~t3wh(yj26<tnYm_dn{UYqrdCNApk9;28
zo1ikVxkZ%5(m7Pwa**OdpTuOrSG4(Ep<8Yn1t%R7I4A<h5O#zvtT2B^lphlUHY}c6
zJ;)9&ZU~j4&4lDg@Y22)H-ISC0b=qJcL{2^`&6=v1&WfaMaS|NGFO68e$aKtEf#+h
zC*SyMZh;7H>0u5<pe{&iv=0{c<#&)`ii9WqD%uz<Zc@tS&dwGhm~4Cd=@)V=+Tjy(
z8lYc8z?|kVB6!Tt+tXbzl11n&2^jt>LB1fB&C`W<JF?N#XB>-d1UA2u(`x$GIgM5=
zc&sTbLVgj{(uOFzOa=lf_ey;G4SZ9C^6rS}99eND|9h8s$euzGEw7>YKg=)P%Qm(D
zNDduDV4uB2hIn;xUV~^=_9b5S)^ubd;OEU68hls8il=9y9n<K<ud$rHW0j{nmkjf<
z0pWYS1BQVcy=On+f%o3)NRSy2cqf+6+OcMx+11cqbPQn{Ds#>Kvj02pHS<Tl0#*G_
zQWO2Fm<6u2+y;N<myLI>?sFt{&A0@=BLABbzyv%!A2yl95zn|X)XFY-yx$=j-Gvzy
zqNJig(;KFE`z<T$%F?xupv7e5;z!w`D_g~b?~zdyf4RhUY|+_;T7opK92Q<DSu`9J
zJjIUqF5ocCv)uf9IEgfVqX=en6<TdYLv6QN+mUuzvElmW=#l3WemNG$GtIz?G=tV8
zx7gIuho|?@<X;H6^HmWG#$zyyJ_3>f-u>Ibl4ulL5&@2r4L?gg-Wd;e_S=sVl(HBn
z=qQ&tkfAK>ED;H@Ny#tR>`dQEPE=VbwlV?^9mrgZwjB|&*ue5Wux+MbjEHjN2^B$)
z6Qd?TtcL|qO!)9<KW5awi>B6-pQ4gMG@@^1)JFj`O@M^Ip#H#1@fF(9JC^Ah0(<?*
zxv1v=Ti31y5?a^BbOWO~iGpu&^l``rAdq-2=M=*Pl<HC4F-?#wOq*G(5P4v;5DOsf
zDnsFHiC1}w)Ha-yaF)FWNH2zFS-{p*X#cJ2WpTIc9Tw1Vc!{lU=)*)GY_BQc+X3-#
z9k65r&y>@YAS(>Tx`L|*JUIq@90HwfN*qeUe5)BKH3uRZUK8g#l#voltpcfDcb>7J
zv~ZS~z#<WQezyZeqLlz!^&TZSVoDOB)-w!Xb)20B>S^@;duX4f822x%j~vh};=(kL
zTdrU<+Z0%$9S~fr{4bODm=?Zx2FHCbhNA@7T{{(F*2y__CE>Z}(1PEY=`iSF#b$)}
z;wj#~H>ocK^SmX*sW>LuZVK4aX?%mdkyB$Y4=Lha`s<p69olA)#EGWId;v<`c&hLw
zkO3lViJ(=AKm3YYM-^)Q#fY;*`qIp?C&#tnZE2jB&f3C;)?ei*v9V?{@;rD#2h8O)
z)KN=j3e1Us#Te;eLhD5aAi9s3BE^FxnE%>dPMaE_jFC}-L`~fa^Npzdg7(Rl+#@r|
zwO*~|<(#uRmgwPmt0amX@vy?W4zBTJCy+5?Ut@e4hy#BEGScS>OW1uhA&rNxK>s;O
z=c!BM$L`qOljgwTX|_bXJqZf@4~El3r+@tLd;93bsM&f>u_WJZ1P^}Jcl(03LAiuS
zx+gvWy=K#9i_@qh$Q^~N&J&PlHVfxX7GB=(=He;fqr4e=4E-n0Z-WnF=>xZ1w}H7O
z5ONCv__{cd#MHsR!L&Q=<Ax)LGu|YNi$N?IL1iXG8x~Qq4*9ssEY}}4LWz5-2?(Lf
zFr$S3{OTqy`5uo=9?k&hvE#jzkoGnTHw(r5#m;1qaw^Cj12^gZ2R)uQQMkQ4E<aI-
zkU1YL`2(U>15ZPdDuHc!^mAEJ*_<r11bE_iZzo`h>qlrclDmL7`{IGj>4e;okUMLm
z3$D;FA4?H2IWXHG66fB;RnDsSf;<oHU%LsAQ&5ME>OmBzq28#fTFO5}>v1hbOX`}n
zW%_0Z!n$6p4X&GmACyKhF#d}7sI9tbg{{g?mJ;Ll<Ib^{DPM$|k}z(k4evy!^w%Z=
zH$<duM%)*DFM<m;ga52ZLDKbbiHEbDJLnU}1W@EW=2F23|AD$SRJZ^J`so5ja7A_O
zILg0Dp$`v2l7Dgiriq>b19n;+!cxZ*%7EeyHsjBn7D!|<K;^x{Rc{RuO`&$6CyOaB
z4}DIDqQ}q9cd8P7lEz6wd#UIiC_Ea*ip=G=Tlu365OC2sMgG<<;_y=#I??DbcaJ`T
zf(i`^Q`(jJf*jI;A^e9(?YOWB8A*02WD1!}AWRre*hZCZdFAFN$Gb$W8V6P2F&ScX
zqUz?Shl24Qb)Fgylw7|dgpWdI@xsPg)=$eMKI_N*qVth6HLUL=B;o^I9RN7y$q5ir
zUBGuuQYIv6pD&84#XYQU0pOAZ+wJi7n**;0NPT2GD{tU-#8j+V_yh!5%Ms)>mVyr(
z6?_I`x_%)PP-)xKV4P8l-_0}6dg5bJYM<}m^K_|Iow2w;lH)?<gEAl*Q+!YryL%{3
z3QjgNg`-7fVOW(p(jqM};@+}eP(2hbP>HY~;u=7S&SZW50$cUg9ci%MqSVzhlg8AL
zb9>B~vH%?yGpSRPVnrHM+wt2qrfdB7tn|fdqt2-vE>OSLZSt0ngoz?X-Q(ej4v%<$
z`lmBwCcWkS8T(fRNjVjDR4_PS2Mu>YyZ_TIq_E}u6?^sKGyRt_xbDDuw50U50L&AL
zYGy>hw9Xce0T+cFtzXpIi>5!HaIE$WBqso$CR-2RB?h%~MnR$})Kj&Qn2z6ZI0^TS
zVt0V)x3KGH%*Lk-;I0t_mS1xn{25LXU=NE3Q^Ev3uXoJLTL72?1OAwaZogyUAB(CW
zZAKE|Hr$HODs*B%ko@lR4l`XF=zXKY&;?%&=`Cs_Fvwk(5QXWJd5I&zt{0N0P)7te
z_AR`hQw$we-Vrv2<!7fjdXoFMnfRNaUaq(&7iwi{aYq8x3D`t5d3ocg%HVpclC~N-
z4@GDp2Bi)R`|e=BA40B4N`q;Tro9TFg|0TK2KM@%4KWB7XBCHz2=|07^zp_JQ6htm
zrdqc%N{8wcoE==0IoG#&nsv}y90hXf6$odY5O}|`>SyNPsSx0jt-{5mGxQlE^@&P@
zA}JtuFQ8Y~_{y#D45HhhwrKEvow|8aGnT-TBhk$qi|VQ(zL<G*$_u3|z_k-+n|aZj
zxZ`og?rM=dZl+lLasQ~dpAkGlDy`0Xsg5kdEsC4N!p{@lc3gl*x{o%;k1B#cr#4-S
z`KN2Dw|5w}1VRs@L+Uded~UR6J3dnQi<TeGpLGq@n5?80CVqg+z#|Xx1HbC1o3&tj
z5_FzgGYQY1t<zfw$+Ab25RgOXL((jaMoz@rQxgM@Uc9mkKhE$XIPpoo)Gr91#R{-~
zEz8Oiuw_--j^*kky>(-qyxRN7M3*Dgka*3NOS7ny!0>f`x-_nOdNhXGpF0zKD78c#
zL07C}fy{0tb;))k&Det*Mf>Qx-Dwf2DKK7tB%5uvK?3zbpT$ZlI#{Aj$SO%dtVzl?
z`-*7WBsW^Rd(3?UBc}&eq100!OLa24^e2J;MMkw3zsQ<2X1gExi^J)ELPn6vAFI`8
z5&|C|4DBA6itFyY?KHU9HRq3DEHf^%yD(6zGlu2UA=QfU!KhH|*sXQL*ytdB8IJJ1
z=tIYk`!-j;j4bGdRE*`1$8SkWP{pw6<dw$2h7^Iz*KDROE^vTc#lAqCa!H%XTfsvP
zs;5fQpAcWSb=9miW)253ua08NQUkFk!+XqN6U<RKq*J}#8ebABwUmCs46ApFQm>QM
z1QQMj^l{OA8?|QR_~`Jh`fV1TF$>tcY)13q{m25*4^5AkNacp&VCM#Q%<G7K*y{o3
zopP(?2<D2A>y@OT@z(G0hEAvU^LxKw#=(vDzQ;to<L<@7H#t;+xR17xJruhKwf@bK
zQULfOy)ndAoU!~O3?0G5;ApxhCRvvPknjG0h8a47*Dt5of>T8|ZQx~$5WDfXYyCb-
z$F9)AWJO}&j~_Md@2+kB5lX5OxHGlO3ivyIop5Bwtc`sZNNU}xHGQnONeZ-nmGL?^
zVqmS+wUNxf<Kd9|Wp`NKbNKci)^=qlwjCf+yf490cm37dPxEpkgyygOJXO%Qi~6L_
z_;TX6KHp>)8Y7F}mt;3=K?T;AWL27T^dC%9CIv4|lrCE+-&6U~i9@S%vU!ImSNQVU
zQnj(ao3{V>TQ5GHv?ruHRa)~R^VpYs>Y|Uscm3<QSi;kHY<=1_Xv~O=sb%Kz<loCU
z;>ZbbV>xm|v+vm&@B&=@kQ+=#dVi^4OPO$CcjV$3O^9W*c7cV+<BP!p#^mQ@{(c92
z`!B{<L5u8|oF$7ScEN_^p8<eoA-IC+<L=?07Jowu+F<U&PTeeuIIx~&Eh1+2BlqK&
zz-iy@w?i94F9dXX{rNdsIKgR4S1hA=WNLctcW?+|F@y$4;XCL^CRyy25ZF}~t7k4_
zb8aZaGcsS?zT#2(ah)!YJQKW_YPRwMA1lPb14l@3jhlW@ChKS&J^VMGpa>uJZ!I6k
z8&8?S8-pyh4=%G9GNo=IgEADX?|pus312$vKyBfwMsdxr<ow~MD?t+5x`Oj(i-}PO
z3o&CV(K9hi@hC{5_xFljg)&g<R-+W{2nsnbz=tDMesP`9F*MxvQ}Fs^E-&Z_Gs=4Z
z$x^w^e8Tu~Cj~_wgP5BA+$VIXVw-L1Hk7JTo=7B^XW=cR^j>i1Hy%pD94u^ve0{4>
zwLhPMjJTw^IyC0k%5rV~R3*&a(}IL=@D6vz^ocG^$e7glCW?snP~Kz!F6ae`_@SQQ
zgcqjRxX-Tz2hyk5E!&r=n*YNBLyCRVm(bEFg|8e{(crPh@tL(8QC?0fpfCl(_9bK+
zYt!>`!ibss6drX+hOXNh&qli1pM)B%DHmC#Nh;xbMZ1)O!ejI)7G7zZGpoEB-5<@t
zSxek|$LP{gt3Af~2_O0`$87zMm_M66*u8c$0L?dKO(*64R+$)%PHbYD>Sdn>zM$s8
z5r}Xj-Bf3_Y(N;l3$i{C7?MHx;`CMSiNB^41Nzs1yjGn8)YbNkp8`35quYUEA_=MJ
zK;4b)pH9LT3zH}haIM6Gmo4D?@G5@F+8i_Z%r*<>Ie$>u6Jdgqf3rFGvm)q6AEj}+
zSu0*_k#yWULS7*%Tt5Xr{&f7)Mn^OgEhjs*K2vt90YpX+iov?I8Vgt;edRN#;l+0C
zPjA*)4p(lX@b)p)62l8U_#O^x<g`@i2GeOo&Epib_#Q#?Or$S|vh(wal;a}|l&`+h
zOp%zl69`UX^#c0k6%j^Q<Ui#f{b3YXgG28mDRX7+XXX)jxi@ibANS$0uv86>swHBi
zJFRr{3KBRnbF7KKG^BU*b+oj~*&x2eQv6DjocbM+xocO@$DdBQCKo~na+l==Huy|U
z=lw$Kt006s69e%=#Z7EC&U+Hm@Pznyy(O;g%?n>P)pOUHALPvp`GP{(8HFg}xe2mm
zhYw#Zy;cu)&3PhyhQnS$dGU_=AT$J%6~z&zlc80tZoENBh$<Q8FF%xbkg4;0LqI;%
zV9EIIxBU^6A-qt+%pi1m5(CkWO7!2!A;lL#lgYEa=AUv{%*TRxK7OH@V^P*nuSqdV
z%|J>_gwB?z4Cb5?D_@8talursU-T7@vvk4<(=7rrR!D6hzc1Qu6no#=C#K?eG?Y9M
zzwAE<_!W<Q`!Ms27a~gkR&)L31W&lalb(31S8J<FZ*G1kr=){*q^mLLnm<~N6&b?a
za*d!O+Hn0PqE#bn&f2?iMcJ_fEfgISAGE)9u(rlGa5Mh%e_DXugStRE6O^oaeaIIK
zpSBqa_d(CNzY{~cs)pOR_;k5k8~h_M;w4gO*ttVz1FW*5vakxc1Ov<WrvjA($)PGH
z3{0DB;a&hsokvWMN9@#A=hj#M_JQ2R6Lk9^45BZPs=<TYdP#$1^!0Vnp5b=5d}iB;
zvSRQh?vthAB+sf5Nn5=cAgdzYM{6oUN4iM&lEMsceCW6fdhwL(mJPliQ70Y!pQ9*q
zGqiSvJ#9cj<j8cFbG0EdWVGl(FyXd_@-=Z;NGcEaZ*23rBSfXqG3|o<zar-hKZmX;
z$1GEdB1+>=xnW>z=WR#+dhkyK)4^t&G2_|8^{4*yOmz^nyL>?aImHrF<%11Jd?BvI
z+5-d2pSbr=S0kG%r0#1sa!r<154P1N$Qv$Kx=(m#riNn+OXWMRh0CR?rD6J5DR~qs
zgu*Ml74UPm^|hAxp<--iO>?E^6rY*-d3;f?Jx7?QV|AZUd@~2#&q?rzYhPZnE--?S
zRLpFO_M$GG#n2d6Z{wJ$Uwl~U?YJH<YwseAIOwR|RrOHgTL?F=ri@<gPJXs$RL}O9
z(;5I|SPwl?7pv(@ddUg+oX<N_7nyg?Q3?tl)V=&!E8s``!U?>P%^}p6%<FhD^3Ftp
z>7RB}YQlclNyQdHyhRod=LE`~qZG2gOXZAEfqXbYJU{*eV?_VNK4ddy`!VKtz26bp
zNsz|M1?JNvjMz~<DAz2S(Y1+gA299lyNMuW>0nw<P#5iO+O2EP)ZrsHM#r4cPfqRy
zfVR#*7rOT-<rksSpl|HDw~wGphpN@PDNNHQ2M75Dt!i^Z6`NVVtZ@Q4$#~y~1sx5l
zsu;}uwva(y=9sr{R)b+DVmlIl;JqYxVkQG-FSjgSC#|cP^6dSj&B}!5i2eBhd&^Am
zd|;xo#&_<UQ_B3ov@L~tLH9-h_QItw>;uxy#Ywn3UPgjWa+NW=ErZMI^tS$pC<?k7
z(aK-sKN{LMt_&{xbR{m%xR}RhAO!FwtTq^--4~C5=nw&Vf3=V7aG-3YPJ<_ypE_!i
zj|Wyd?BEfEU^@&sEPTG-6+yk>GzMr}&fU_-NRIX2dl3x!(3G?l^I*8nn}1J~e}k_C
z!F{6D?=y%tzxGR_woXEh`raQpB574fI_HLD5V86tNoadl@k<|Y_fQPiiOhAZa_amz
z&qL&L0Ska1*3J2@x>h8Z<Me6q48whPUdV;UK*U_Z)>*xv4J+sl^*rq|_=9Tx$nbE>
zH?i=iS-L4pkl)czNKj!#;J$faoXtXfJHvZ3{AnGEI{V{0jMXl?*buy1Lx?jMtTQ#J
zmw#u)@N{m-yUK)#=df^2nl-E>@raqupW~Sy%oI#FaZ%#+iyY-2y<CLwz^<8K(0Ztw
zOQYAAl`lR<paPF7Juj@Jt6aWT_DfJIO7Sky-5%;m2#=(MRKOdJXa{<Y`xY`O3lY{v
zL`IG|jUp~72%C^Z_$st$*Ge#G>}fjgE&L0a!I<uW*cBg<r`3$EqdV&IjEOpZbPF-h
zNYZ&L2a6GcM=;HAYRgz>fiF~GP<n7-QC;fAD(4JYMwJ>Y*_a98E|>VJD^Sc$QSqpD
z8-T;hB#VPnq3`Uqgg0Q3%cll2Fn<H>?AlRHgs09o&T$SfRyEnnsPl@MGg~Jz<X;5U
zeO0${AENgJ9tB#G0jG|L2Ij!K_eQ6<{k?5rEmz(eKW-7K7Dyg$Po76(5Y&i`rV36w
z5nHJ4>fp)7C%JWLzoUoL|Cyt4sM2ojm7@}e;f)R!JD#m0_wRsAzvn~<r4^zPqd>>J
z{zKACO1(8U>L5tL7K?{(+7Zuoveu8EQEB{=DVWD7$^{CMLGo=0yOQ*YB0Xvkz1Z6x
z@eLqsc118*xJZFu5za*NP2oM-pwQ!w`xilWuvE_t4}s^;69RGA`O>o|CVc<*?M~e6
z)?OGp0(UgV-S>7|lM8AM8;A)UC(hVFCGVO@6OoBtHq-!?3?igup}`<hj#0G4n-yW@
zf&ZiFtfQjpzi>Zv!%)(#G|~dnjYyYt44nef-5nCbfHczGBAr7cB_-V<-7(zr{_eeN
z`JcF!oY-gY=lMMQD_C&2#TLp4>6Q$GdgCenThrpfv+B{;Uua#(U;>ucjP<y(qogqL
z_?zC)3d^>TTf2L(a`~lb64$j_kC91qjs7>#8xh4JNIwgl-Auw?fz%9*Bdxn0BJ&u#
z<G4`+X~PoNURd7d-kYi~m)S0aRo#lm0>9PSa2TU`zYC=w9K2bF!j~%)mB0FmUB-%=
zR|s>^3ppfXh=p0&IDn=8OU&2rCakq`$WgKkn_WWv1^6<%#rW|`Ytuq3Z)@b|E}GCI
z8<K#&%h@VtNG+h*Crfk0ysvtXi(f2=t>o4`zyn))<rCMezifk{U<GKWNqK03qo;Vq
zM20pM!Gsn$alR&1^n;!tI<^T9zC3+%Q1}qG4NroN1*)_^2kBvJTz<|d2sxG}kSi|p
z+btbamzJeap^Tggorl=Hqf#PXUdeOZApPJ~K#9l%)jdWzd2?QY6N4A|r<^ay>-Wfi
zPW=$(C*XiyRcIsDj7M?ul3YxE@fI<t;H;PKyY=JUJeNU1smw8bL5rIiqeJcwGW^an
znHe<Q!_8uyBE=B=jsYyqZ|xt-%+1J(&(X9N-VLPc)%2+mhKwa(n3pXG5yrmy?nINY
zO~vvnywslCaey{6fwcu83xA<FXodX0kC^Xonj)gl9T)SUAX7mKPX9}B2CIu&^SEI3
zn3ljB(JK!_w{{Gm5%SHsL$y1cr_YEARkhRX;MFwWKd>2WE&SZOhesz|gN|eGVYWD;
zJTx>$AWI>_ytNb1dsvnfMU*dt22O~IxYFmLABN$_j|HnT4qW}nW5$i(0b^T+T>9*M
zNLOV<-l=0|RAMA#C5fG!cw*!S4UKRNRx<@sY)P*GeFHdJh6s>D56M0Ae?o+8cmNfr
z{7?o3Kk9eIydg5s>GXv2;G<iPybq1p`Mz=P#l`<8cEX;imP<VRK7(5+;R*ygoIjB@
zRwsVSXAl2I_^n^B^$oC30}E*4q#g&PSuzfQ={ZWys?K2!7Y8>Px-w^wJ2;>k5Nu;X
z{z>H-lkJ^IG9qUY9jI|sZizL7Oyku?xoo!&uMG|s^SfJ}Skc+MuVDT>q5z%#*NRMp
zP5Mx74iJRrY^JkHF)o)+)TS<a1PP2xt5u1WdWbhpCRHpfP){13fyH+9Xc^0(%xDCG
zy1BuiuI%*lV)e^>!FrD%)b)q%pBsZK_>?fSwXSDk5Z%AWqR-EtG|$jL#x;14@P9A8
z``tLOEt1sP&4Y9}1G>D$A5{V@<Ih5oGxEmL4raLgZ11+dm^_<rze*j^q<ljJ^wX6(
z2=@KV*a;4%Vb?5Aa8Rj0o}E4|qL^5|wqV6Tq*GL$U_w@ihJ){&edeAjeY2@DIR~Om
z2=|#EVyY@FLmOCmITuj^oRKYYdVNVsWdpn3WdH>gT%gWYF5%{KR+5G85e`jo!iv#4
zW72p}%@|QA1eexgfL@MVK)kx_ApHTeX5}7nf+_%|AtiLb%Y~YFRA5DWQUF-aQd_><
zz<SqoOb*#Yv1zXUU;@c!SCMeDd-Zk5gHvC-4%LB&0b<FB8hF^*?E_{s82P(BU^zzJ
zpMk@1s){-OdE|;iy&<3FW~;dtwO<b9*ps*0>8H!5AaT3|>Zfq_Rj-TKF1#*roA;mY
zo)Fq^m&DmIpQ^e}Ssebt!@B7uOK-7|`ve0w{TmIR&>J)vbUPo!Dp!A!gb!%zqYe)k
z*^Z*yE&q7yAJ%YD=Q_hsYFvi`On*OJ?iu268_gX`k$@INx8t7Wto+6`3=H1vIs7-7
zceLb!?QYUc6=+pJW5mIv)@FxBs!UE@W#1f#o37d(3>1)|Ar>hW$$^zisun~C(|$4q
z+TCu+lz`W}Y3%yo5>jD8X4J1d%Zw+<XF}Yqi%~ZC5;%{27N_Ec_<ZJau|)3gXD23P
zYiR$hb39x3{|(YN8^eA#!`j6FLAp>-3@YoSE>7bbbD+^&Y+smX*03|CJh?<Oqyb)j
zg-g>oGq;~;=_=3UAmH=$f)GCNEluKlY|8WZoX4N@yYHtjBF!fcSq@8+F4Ri#cpE#X
zFWf3L-Z*iL=lvuvAfPDVZ11Lr?4@`b`HaU4lceqeuVH@UFMQwJ$6R&8IrM}}Q^-#&
z`L$=XIBZf5Gt#0`$G_1_b8Q+4;(vXK8T>hl|9uYKa9AYRmAf=M8}2vyvMMM_Yxb_p
z$m))P7vIO;7o8AEx=7!6rs7i*B?I~QSB&0|!M3F0gR>IqlDF?~C5eBkSDHfye?v>V
zD}}nJX(Io$eI-rc{#FzVe^%gtaUpG&5iQ&(8e6$Mn+6!YI{#X`lr}eU=l8$HYFg9}
zPP_Va;E4coXA>y&81Nab`M01zqY~ISdA?xZA{K#TKqIM9d5uK3@6Z+|U;_ULh`+$7
zA5YSCZvu?775JfmZ}-fr#uJ`kcAxoJXM36se6(2*8yIZF&WjPUxJL>b>+$E<noB6V
zE|-`9n<o=qRoX6T1z+N%LWZqS!4tDKdK`PG^$<Y3nl?>f87$yzq+Y0A7k?UNd(^t(
ze6JD?;#?(V=*<@?B2EeZi)6c(ZT<I<IvUie@K;`$4FS7%L&m8a$PO7CmUH`=KR}ML
zAP<$!sCN?6#KAu|<d(!0U7pT3@lBx8Dgi9i0XHoi1|}}loU1-NHI#{l+AXgPJjL14
zqR=ldBTt{%#QYuuK_K!>kB#AUc=w>z5{^JtS3jSlFKR`L2o7LEwI1MS2|axV6x~_=
z>b%lYgUFa)@hmWhHfM<|!C7%$Z*~KJ@%BzydS3JWQ^CZxe3f9$LSn1w-Ppw-QO$LU
zO3h@QT-({6;sd>;aPyea9Id?)R4DnaGotj!JhK#CjDl1Z{U6W!+HP?<;<t4Oc8ApT
zRu12Ly9prS;u$fCVI03_63S7ERH#9N=8fjK8IF?{qW?2wr};^lcU*2#T0o#gkz0;B
ztC6RHi>GLl@A{v0MZf0yo!@Rhm?q9gHo#UTt&hk+Asu5mfTEMIWq7tX_^<Uli>!*I
z(7S)nm^}5d-OPzMv1nWi?qrmE>h-ay1y(yA$WnUETLXn(_S<iwho3(Hs$!|0I}OOR
zw2e$8SK-luq{QEbqT?K$w<h%CH*P-CHx-~C^iH)>I!o6U5vqzv(kpo22)^3((=bx~
z36{8g1Ru##eytMA@rpUVGLzz(^w()k3Hr`<0w@Mqh7j1gUW3Q$fu_3VB$sKE6jD)A
zM<s55<6HxT{Rj$Ma_U5q)2Gc-5PI2K!L;3|5G{H9`fOyEo5&5X$vrN?In=QD%VD9v
zjaUZ_2#jvIxme>b?@+cIA}-+M39ei|_tu(qL<G4RJt8~q;n_gDfoA<$*hE2Sx?c?q
zg0;(WdJ$u{t>rwr=-K1lZtJhpUIwD#l?Ah=Veg{;&U`On6@8LwIq-@*c|Dj5QqC8l
z2+qH|;7VET(Pty$zngJfC5q?Hp6;th$;4ou;SIG~GP_J5Z}w6$PExl+qNWO<a!{&v
z?5POdIlh^+1g$tTC@&HWa`B1=!>cPm=sCd6>Q8uOb%_?)klX&x>$rG4u^_J$JC$U%
z6X-o`#HvVT#UJOyHG=!vNC2LX+DinPLE0#abBuvJ8+Lq!UVwE8%!zPQ^hNKYvwJ`E
zh%aio8aO!@rb-t?Zl`^3T6yTnv>IF~Ldb-EPWh1n68rkwN42#^d8;A}SiZ-cidz$9
z162+1%IY@VV@NYmDtc?xEF|m_)-b%v=$W;_tG^hTxhWcCn=>17oFj^}Rse|k&}e;1
zGgP<*qY^SCE18^8#>G=Ww?E2ptx_`|I}Yqj%Q{wWxdNpl9_2Gtvk@G(sFC1zW?&S+
z-C>b{Dwb7fGutD8d1XIYQAy6OYxnUJ@M_m4xbrrZ=rm=10pV3iGPiky6-@VM_7VRp
z-!Fi-e7C(`0Sa1443K4pGVT8P6vy4jPxFP(i7P9->NZfNn&EZWI#OK`CCDLg{f&jy
z-fB}*PnfeVG`D}K8wdNQ$t>?ErVJ--o+Jo%gj7hBdf|H5Uik~ZNSjSv_ZRlY7-e1G
zpAtM$bQsXM;Tu4a%%yB4*vS!g2t(w#_5cSJ{L9;!Qfk9t6cxxJAhPVJ8`dErcgK&)
zb1ki5PHgqmYYXq}D3+6RPtS)8{SDjE<t0P{bVvyur#dqVxEf;&n~oVUtoSSg<_hex
z`NvSnB#4IsQ!TN8B{aJ`ob)`?VV2!TNV<kx$8IgkgR1N#9?BBi^s?N1W;u95bI4bX
zcmgedm0XI<A%g-f#ilKz4&@frw6;JUFTaB7o>db60?$A+nXq$;*J^tf9;_Jk5PNM#
z_={e7c%%fa?Rn-l0?<W7k`m+8lq)%?))tl$WsmLGG_|&J_!D;8EINtB`MCM?XE6Yu
zHwEZ)#*U>bmoK<Bhr=5|qOllds^>|bfl<*(PBWGx_VWb+<NnOd)yabN3YNSeaQsB!
z<&v$T2>czhGCf-ja-!eHtwhSO>W<eBXg0a5{3r|dwV^vMqn~8u+C8P~#pv`>eI$2G
z?}g860(G|*N|^Jc_BQbxt#FN2r<^v9!IV!x*FQlds=Ye9%M`g<z#>Vjf+?)=_ZMD5
zDG%hF%(TgoBycXJ**SCIUo_Ly%13$Y-l~i7hA7*z_xNQFJFZ4ebgAN?D#sauuGjc-
zJo-U{P}?=Ev`s82b})@bC>w=U;>v5ahWhXL5_#;2b!Ny^P9K*%3uqF_Bxyg3dfyv@
z{wqFYOkzZphSc6Cf%PbXVkRK8wFf47bE~~?d1lw|?&%J&kX^2xbJ3MP%8CL%w5;$N
z;;FnyV~%Z{O9PnrE<4APN>Lm`KY(TlpNL4CuBMi<N9`4J;byD|FAFgQ9hJA%XGR+M
zTeH`M+)8m*1y%RV1a+i;9DV=Zy#H(G)h-77QNq5>E8Ka#TP&}x+f2FGDvNHpo#(O@
zy72Q-@1H}>VM=C{JTPwn_5(02<aITWStmYGg1#E)MwdS*Ggs+{TZm+)nbx*@aL_kw
zk^cKEJ-T>X>$G<XR0;`nNn;nB-i-TZ_VwdgE(q3_Gqk?JFGuJ3wSFjrs7t?Rd=T%8
z-1BVr@%EJm(rkmM()Cf;J@3H5<S=|HFALMSnM_KGDr92QVU}ayjL2k@{5&gD5L9t7
z&uZdo)$^gV2mBB6+Cx+G74!UUndZ=}R9U5wYQ@7Gyq_KXeN5_5lBo{Cd5nA(-&;vI
zz|BP|kGsiidTSv80sH5Ftc^kofRFt2vJ-EIgLSGp@P=jnx-Q<glJyr{CJe6pe8w1$
z^_`3#Rp@6xx8B{n>^jc{8$i=d7G|jKTqq+ChVl7weSkZmcpC+XNwe=9<hCL@qG0sv
z_dou6jCE#xABrQ|VG*1N4M`>^`o@6-^ZxDUBhG3!PfI!xF-cN;T%GE(^y=sU11(Jn
z;tByr>mnODT61$x<Mg`dHbaEpoq8kiWq@jYg3}-9K0dNGPNvkGQub!FqFZAgJWkv7
z__ek@Q=+!j<lXlh{B+qN<a6{!)N37p*s48%Bo)2+Dg#LYA!^3l|7XAf*Pl}#{8Yvs
zCPL;aTPfJLL<blt#jgZF&@5&*|5u((N@0VP8)t6!6HD)Y$M&{hi@$C7I*v@;wPjaV
zT1w3BGZhX}X=M$~heJuMCMhV0aswNYQ1+S)M413qE51T0-gF%qR~*nPZ<PqcC;V1}
zo*Cv={4X`{z3?n3GU_fRqa%LK3t8sFN;w(-h(q-IG>BHMmi%VrW2BIQEp|=|YEZDm
zkpI%J4Y^F&Wo^3aHjhhb1;*oy7`8n;Vd@r_E$UX1O4w0fG+tn|sUX(mOWTVyYM`gI
zGiBsN+806hZSDJpu`DTv#Y_4a#c~N2Ldo+gNxhAGxgI7Ko$6(zgv<5KvfFh$3)96I
z<+BIGgz1Wl%Lp*=W?Z@RnOi}SpN&X%EHM@BrhYe~&9S}fIl5*bOI)4q)D*)QVNy44
zAP0PZZgJk=-IT80vc8%;vz5?N<4)>>KTHA{QTYM?kOY12EdN6qetTmS@!Nwy1K-%D
zmIKJ6fAV7qFU-Y_?0i>hFiyQ-W;RMV&!-?g_$;epM$G)NhWtZ~Xg6K$&_av=T}cpQ
zA3Y}Fn_7sH9{87A{qQ@B9t_RtZaZ*kOK?)B2&RPkf~;dKFEOb(Fa;l{uwfXMBIso_
z`8Avz4l4OPECrX&(ql`3MtHS5=b^udCAga?M-{{9Lv?nycfvC8(+6b)n*xH6L;geW
z;@vQNU4Fhr>~=SxA)YJUZ9v#N&#S2znELsj>M5fHA_fZ0Y3Gf<Qo_wf24^5zKp@yw
zpX4+2q5!KwFyPFZl-QRZtxss-raKn!k?|eH_LI2`dM{&PzZ_K|K7Q!(w=d|aiG6^w
z!P^23A80y5<K3p(VM$yp;~rDOrhSzy?_fq9?L{;!Llkc5jviKDdmUUuoAnJVmlMFW
zUh5aA>tgu7ma?ql_mAVYu-Mz`l!sHvp;m8Q9C&g~uSM`1<b;WXRVbQx>5zf)iE~8r
zp9%pO+|ipO-$3Uf7b2J=hkz<I@F2*N2#8H^iG?dlqEA)5cfWDQRB-9>6T7!Q)?h<%
zK(85<auAKLa5m5dg}O#ayUV(vztR%H6JMuOn+6~cdM5*;QQfaxm#~VJ83^yK3R0mU
zNvin)Eyp!4N%hL&KXX>UW59jbcPvL3V^nhzua!IUWdG&9=cu-Nf_}h**itk*&^O4r
zG#3!;#w~t%VpK@^-wkMc?Ue(&t^mea2m=pqg9DjgE@w~=wKd3Db_UnwWW)L3itay8
zsQyqcRr`<abewJUBWWmXYhZf;6!5&XHj?}4twF4)>T?>p16gH%%Jc&*WdYWgs4-P@
zvjF`J3hl`x31*~VQ%0a@giw(y+xh;z{9v(1ym8J6M@Z;+;bG40e!3Ej_+_xYmv9wF
zOBp;*A|a<ER__|Crqh7>t;rs_OL*|BR@0vpjX5h$<e9C|D2_2Y7GtKw(x<Bj>7lWS
zNO35FRB5e$3R)!3TWObj*JHoq7U#p?Y=ZuG#14UX0_&G(GZ<TiKOt}4*HFpxbOucY
zdk}qk7s4G8lDyLl0)qxo$7j03K!7%Waa#E7$XsRgJprUfWCRU*GtnQLxNmm|?3&=3
zeU_YfCa9>1E8kT?45npWjM~Ks8+t5({L%~(M`71s{Si2~rJ<<3=)lj+Kp#ZdLv7X!
z_xBL>{-#dcoRHxIR&-BbBq09&&T;H1wfI$QY3gfN|D7t3#CJ4>-`mQ=|Dm2&kXlvK
z=0l2>r4VrtDFu}?pVbFh(F@E`iIfj<@i$v{`MC%nprsbKkx*EwF9_?~`4TzhcW8ug
zhbndV_tT32@I8IKss2OJl0eG&xLb8<ZLWQR!+hnYM6Cgm0@~NwW5JJwTs}`qyF{yr
zp7Om8|G}4Lw|p-<hllH7(l@a6xybM>>4dD&mPe|#K(PZiF}fAxHf60h^0PmU{MsYa
zvDfkUv&iW^y>6y0008>9PcZF|QZ%QW$5*C-Y9Q|xFmiEsZ-Hp(PQkU{f<V}p&0Mo=
z^YN=6E9iHeAkV{D8P2CMu}BQ%N)!jF5$*9j3;_=Ls0F1y2xYO6@nq%)iQk9RS}i{{
z`)L?AQK<B%m+R3H!7I%@W8fSi-3GM>o)j$8WtP|B=7~nixt-Sai^!>V^$M2i<|T-@
zVZhmDI0Dlc`-Y+~bRg5~hm|N;!Mjn!`I;;@KBtwD@jO2Qpq{{RF-LyKEb*_SqbW{*
zx}YobOQd-cdT*eL0Mc>v0t1!DNr+R?VNJ^7m4EiQP3s*#03JGJCjN4}pfY@aj~lY#
zz;4h=46qenGc=j+cn}kMF2{o$5-#&J8xa*T{OC1*`gn*}=d9oXYAf(l>P>zOPd&B4
zMnoFJ)W=>|EzVD&fjz^a;)5q8og8Ouwii5VTE>Y-<B>pH-UFB-uCe8kWPpE;ziTbW
zG5?+PMDF>04a#{BfE`5lBw$6!?>QL{HOTa^&|~voq7m+}1PAC96;aHr;~;YQ7C9Z*
z<48cQQk1mz6s^V;sd8r*rPY5Cgrt79KvW>gkRHBG1Zz_WMQii1tee}Rs%v{H^uzn(
zGP=ze?q<z-Ahhd^-Qy~PkZhDRg2Ny^d-1KGV{Qd4C$^PhYL}MBexOh%OaKa<W(4Ry
zxkw*1oeow@{j@C+(&M%ho4@tt-%R83TQ14v9>U$p|2U`~&2pMc74HFuXi#NWm8|21
z)mcuG)VaVki}9SwLg${2Ujq^iUYF0#qzin(palfK0@<U^Ptf!S&%fYWi#@!t0>XaY
zA|LIb$}EW?$%nEvB#9G+4LitUK6^A%KIdEnfOzNb$(0rVP~4H13Oj!mM=tVPA`N09
zbeXMM#Q{MnkCGN=Dzi3I^Hx-B$R=2WU~IGScs%zXB%s+%<m6-_jRhX_l}uYUp|V`|
zDMYz~kdHnF#LDElh|*fNdj+-rGN`&TD7#||EJ9V7%%ag|DywA}a^{nUkO??9@xDf|
z7%!*Q<zse+xh{pXJ$!&0(H(k<5vMjgeD|kY9gcMxBLR5)PEkWo?8Qu|>gp@Byh<KK
zroH(ZjXx{NDPj4~BQEz1-|RhqxF60RU2n{HJ^2CzR0tR^=l+nU&}oNpR9^@fz^0x#
zw>my`u{DH$B=)BwIp3%W2#RG|`)0(M#;RDZvpW6IF+aJn@B0!~*Q1g$MlU^g5f9+T
zF)|_{qfD!)d*?q!*+8zaZEMv3&jMhvA%M)0{z>651%=e_ly%8}N%>Q#5#ww{4We!4
zN{Il0<sv4!WfqGlt2DB8uDux771zG#Ce>9K#7Pcx9|Ysf1j#=O+NJ%D+pyr7kyqkQ
zSc-f9hC?3R;lsN=Z^q(13Dk@@cFdrR+^YdZk&@5jgP797s9az-`~PGDBZ!^U{*bz6
z7u_4dOP_YqgRUgkv4Z-Yywpf>a2kTCm5TaOb6;|5?dSF<5@-gcl#8sW@!f79FspL8
zcb%b0{q(z`y?H+CGNlcdSoe_kJhDB08CZk3m0Ax6nFg4l)L$w(d1uAK*18Y+#PNAO
z^pmacGqVBsGitcbxG_r<lsKRM>NZ3iEGO6i0)17&G=}Q2(nV^Isl@BT<27QQlHY^6
zuWUHc_db00&E=KCEI@fPCe=~ya>|Q_Y*#_3?90y#Qo=&KE*`f_vEn#lDvBT@ob6If
zG=ZF>d?M;jo}_75vYvAS?~mor<t5wBEKdX{E63-M)iyLb)4eOxcTK4`){eB~S5uDm
z{Z;{Uh%sEzaR!E1v8nn0)GAra@t9e5*i&U8dGR!+<j(R;eo*1BZxosjSOJ-!v#L*U
z#7o|-(sF}DSni9z^RLLpZBu}vIlEDXV*+nbvhV%sL6q#C^JaJA)JgzuSlcs;S&k~?
zIl=n#sBXhdq2SZ*E!YT3?6@U^7zs?GThc>p)q|#!#Mo}{7^vFKn0EjH6c+?sdV-u#
z+#nANkFgsRR%j9uC`zul=kDqpaa#itEXyUKVU%4UG2IMdC^k*8MJP(3N}V2+x#CT8
zv_#i@#wM$UB8a1mDU?~@TYU&jA%ZEfoz%WEV15p{cA#!R^tTdScEBmnvokG4%(>~~
zIwIB#`?WgdLpG2L>{LeJ{hN)m1~8n)SbzeZS3)&F>|Qq01uABgr;0aFZ@@IgMp{v%
zS=_vMPm9y_7%hVhfC;`b47@f=4}u=zH`@ILSP_vzbd;#S49*4<;S|6tI0ISZ%=V*j
zOc!%SR(nOUF=ohDx$L_<C=7?=anH_|U%-j6%LPsXsC%5>=}*wqT27r<Y!hSgf4!Vx
zxcHKFxkN~EzTdtX>p(z<4^lMc9tY9#;(P7e|82xO8xR@FNRTpbrbn~Fh=F2KE|mq$
zt*b6eO(0@(r#y%wIZwCPGVD6X94v@xOXh1I<T9XeNn*++X6Az1GW%qehOIbG#^hh8
z@p$G==DtJe`j5E41C-9y2{vE?w0YWQ?^>HB`=YMZiA^hG&O$gbq+DU1KHEvt4#xv3
z9c*{SL}I2GEgqYRaA`YR9FCiC@-pAp7EwilSJ-uVk(`ygQ{ib7G+H(IZRWIK??LYk
ziXuoXqrW*a5D8#<_QW5;Z7QD+x=0ZeKk5yV0(#K0`wzFe9nW!+pm`Fdw#Ud6niC}~
zS7<e@@+5G;sjHSfX_avTH!m$iW&X`|%5=xqxIFFS>{2uxT@hlaCa1MKLj^+qPs?#@
zp9cGXE-X2rJ_eNhVLUfzKz&fh?<TEns+VQ6`klt@wm?3F?9Q6b7M{H178w6gZ?PLW
zgzi6-TrLwCe};AE+jVng$6~t;iQb|&Z5VAc_`~Q{+H@;T`#Bx}ef96I<ibYW+mzM@
zQ-+bn7H-$3R-as!jA2-?RVnuOfd+dzQpiY$*TOkXmd&py1ga@zJs-);l*-PL=oZ><
zKZ584U(W48=68HFgd3HJ;cfUdUvr4CP0Rhri$r+(^?LzcoK`s}H0z!uEb73Z*gO}#
z@&h|Bx@2R}po~e+EQ!Iu8GgYmc6krkR0hX#Q>nVa#J=RWdg`e^4CS~fw$oGkUDCEp
zq){kC8Y&1M7s(UIn$3i$qvV1eafYFiw-v+_q;F+LmZ9Cvi&5>V#7Lyrt)Tz<nKwT&
z+Y9O~6J}ed!o6W2EZQih0$cCDfNUJO3b)3-Z8DoA><TAV7Vcq+2MJOeba&FgG2~F4
zeq6g-#KDH8#XJ5<VM?I`)$q658gGmHUy5{bDFB$i5S2%lWM&|tI1R)HIJuu5@X$A(
z-Y<uLLc1Y_ZZv%Vsem5C4iR}D>2?qf%jlw7td)PSX@yh&HFE@!methSkS3FeZK^Er
zdQnCBz5YdNL~pgaqP7%X75PFfUYy=im+lwi!Aa7wU_x#o>oDC=O*GGhH{dT<Z#;hC
zY+B^%9@a&><KzL;({}+Hp!KbU&2C3wM`g*lt+s}vm=oozSuIgD%<sXN&;lazS9O57
z8j&@v>K%fZgoP9NY3IXA+phkE3a+_p<7so^M|8;#_pU^#Z`-Q2JeqQ300c9Bfl;^x
zd3647;uQQ{9F7Ns<$+Dumz>9$I``(>D^`c!mBJ7d?ZxhRLNNhSj9N?}{Fs+lO{L|F
zP(IAq5so>-<!`6WshJti<xUQb7W0K<LRl~kA)BwOR}=WEpECOYmcc(P6X=S{f~2Ar
z#lGJ_Q><}2IO$A_3!2J<XN%`Bkgpqr6fKKQM{xVgW_ESdrl@m;9;Nh)f~5an3$<&-
zNYW%SDXe{t*#H#>w@16DzXjT=iQI+6i9a*CUC%6)hHW#mnO1gw;I4;Z6X2`t`N?Q9
zeCRki?jw3+m9GgRY-RPK{pMpN_v~`H&yAXvfP<9m3aX*d^MoVsY^PAaT)s!&y5{Vi
z5W@7uWfJ3bIs#vixQ#&@Hw^A7lY<$h&yPinPB-|A0A~iR=rU3ZgE>eL;Yk-LTL;D!
zmz9p1g?FHl>ma4{i*Woao^P%)E5#EcgkyX-o!M(be^?C>x9%Bg^>Ypq=I`zuGuRz8
zx`Ry@P=F9z5+i;FA$4s)<Z9MzSz@l>vzHe8NWaZXNkDs5dSd?ltgmjzff=7;0N5{C
z;42#NY#+bu+@6da>8UsP3=i(!zkYY@bJCpXdp+h$o+r<e7~$@ll%W|m6KSlX=i9;;
zlpdr(O{e!$=4*R)r4jkPnJeS((dKa|u>_w$XtU{P)GK7$Abib=u%<@{IAecNRGA5!
zjF@+rsL%g}YyycJWH5d%bQY0zV}crE)lkeX-+W=LB~f>Q*3pWqp6H>OH^W?M#saTy
z>oURzqGdn)75M$BBL^F2^D%XOj;alswBe;Sm*qVMrz(RIpV?IW@5s|?Iwu>ODCm$G
zLXEt(V1YjK#;WyU?q9;dMBnDk7t0@=9v7JKo+#)qH7^>1FFrUdT@vtoiE%#cPV8~X
z5q|iq5cOPJR81QOe(hu~%C>i26wg3VGGK`eMxmA4K;(5h1p7Q6bR!V^ZWEv!9Z={E
z{mnyAV-1q7%Sij>Co$8Kt`|pF7Bf2#5oa5iMkb|fm&rV0RU9PwrpO-WY}PJ+wmU-?
zWV_>)5l-8;N*$?p{N4K-10DNLI_n!RKK}e>{9t71YP>w)xBZ~NX{Qn#I@u*i5gW3J
zi30L4ikQD;ar33^-o68i`JBo#mpOE&txQJ4l-<^A2<2CwNp6d4eW}%`wXZ4CAr^*r
zUNp?PvwU$jOK|LhB-=)#_w1{Mp1X^6V0_XKCbaCUG?b8}<@sJ^@X-$dym}Q7^)u9V
zyH-xxf?q<t#K4hEl0VAgy#dh*sge#JTVAi$n+me;A>4?HZz8@$<sRfS@%kIgr5<tf
zCW=%c>H;{Yt2D*KIge4Ur2!|Y@C`w6o_$?T%%5eK0xq42Y%@Q|B<L4Ckf~H41TpjY
zL@$IC?jQvZG`T4C7nXkh`!)nE=Du}NI3Nyq5dF>uZ}G7$*XuZ+e4Qx)Lr5h7XXCfQ
z%l;6ya5jSvn%%3={K_|E0{DsRv-zJa&Qa)qs7!COd?2Cp%KYy+R{~E(BB}e=z^x_X
zE({&_d7c=?>Ghu3&Dr3y8m@)-u|t{AT2=F($s1647&p;}R{iunKCWnf)g#5m><A$P
zl_SZGE!0V;=<o|sTj52F84PFG#$|-oRZY|&?KqaZI3aw&5cEt!(uI!vFR`hR3v|Q1
zeF7Vm-77TMLi$clR*I<5Z|=$$d;iiCSL#l?e*E&=vtC2lN%4BRUqj1P+V7_68{1~a
zZNGo^-Sok|Ze+iI<lhjqupoImyl}ox`IgF;in>O1!ubAKvU25|-Di2y)UNV0!G@_A
z_K=iq^0te1px_d>^CMXTO(P|&2nVm%wg-h<c{H;{z?_`dX7rWKuSqDz#f-;4+KYWT
zHj?b%hVtD>=Gou3L=g)o%9QEcTzbKkP!U48M*q-^CCX)FW*%N}skjuxFcC~=RIT41
zr;Ox|y00WWKKz~jm)lzdWX0DkAF1Z9`T9`{Q2*~Msf-*#CV)b!DI2I7E8;0oy&N9r
z(4*UOeSzV1s>SI%2z0_PpJf;tyf(vMqD&Wt3^~Ro*Rwx$#mb2Is2Wa|)ggeLZ1D+p
zQcCqZ1BM540T6t7pwD#$FgS$nE&s!c0PFu%@!(@^suC^Cn@i|V>}HI1G7EY!OcM)=
zn6D&{!-5R{_kjf8nU%Pf8naZhR=-w(bfyqjnN?e-B<8@ds3KC`i*9}o|9UyggR1C-
zeTr1^Q1zEa1v=UO2ls$6(1O-_DruY7elU-EFpIx65z1^?9%0?9@coH)4?{x6=?g1!
z0p3r=&Yp~AzrvYmS5#Q`Z_)k|)&BR2hVh2KGfB|Q#qIjlLG{UkVa>|{;k$>(|3==v
zr@v##H0gj`4fkJz&EA3D{qw=~4!2~qTSH&<yPxD}AU+^!Vr$8F*<#Rb*umg)@*x5U
zWjV`i{4n>HTm)stbn;JykVXBX>}3L(Ko|;k#Um=xf3)7#F3bf``vDaq-C-H)l6PGY
z4-r!Soq=*NQkc>&{leiz1wF}tWwkDy7HwlL6tmzhs#f5+JB@++`q%Eve0|j!mBArI
zR`zdou<Bk^DJu-(;80g{f&!EzyL?Q96p?aC(y4!;A<lf2Sx}8vgM^wR3DX-f2K;pO
z0?h*s<*v<)pu+wQrH^s`Z266uydQOVzYiyHcZkM48^mGAA)|CVJar=WI4|ANv;rAK
z(fUhZe=9&Os_7>!?a!B?Tev!afGG1MQ%`qo{ef7P=nb2U6_d-|zrY?|6QBdCXu0%i
z_j<XeG4=aNac%Db881cyJpDn^f+_S>pL@>fhb5vk4p^o#9s_S1$T(2qn{5G4&vfIC
ziwymY&1X1i=*lMq5EVy>TGwvp8~@2&K|G!6KoG|s-rGfBn&?QB;6hrwx4dv?WBm-;
z@Dudkhb=VTengLG_<Xe0e{{LkJ7r?(JwvUgh|=EUq6_`_Po8vS4A7>87Ec(z7Sx=T
z^n%DWI~0WllQ%bNKAb8tPN-o?$6dQFsn9%BlgZ3a_3ihSfJ7}tKY$ASicz96-J{E!
z$fiQLS(Gb{(wWPxviD`J=(Q!Z1xdyf9uKrTlQ%P&gQob19axp>K;Oo&bI3GjWBqO$
zbU)b}I$Gb6V_J6u(xgJ-(8w#@*p1+~@`~$!p9ti)5^&t<S$NcC{M1)27v>Q_p&cAh
zQYyn_4R9hXvhef;IaG8WAOp?j3r!Fv?T_He!-A{6*Poph7d*>)x6bozms0@FTL6GM
zQGsOh$YnuZQp}DDQQXCu*E5hl?ElljX*N026<V1EaWfV!EBj_bPYoW`aWru?$c=>=
z%k$uC;>!@BylK*1ZA7yce_|;}%2-xpj=O3JzQEXir8AuS27(pE@#7UIiiTSUT^KES
zMw;FLp9Ltt%$j!sO$K(s@>whEZ3?>|W0L(Yd%i1y*0oFd1T7E4(1!zU`sD^Ff^cg@
zVt22x+|S^so;-cq7!?Vn#rMOc(^|Ma8ok_g(m6{nzom$zq1RrJaaxyIgM|a+ZYNh!
zUR@UCCWN33XU6|F3-Dz;4XoBB-Lp7{A>n0)(4Et#CLNVZ_YIknD2~|gtg+eY01sKD
z^Uhy7zq=E>^Ctl~Awl$Vdi87MpUzKIe}8%qfX=ScU%=5`S_UafLGyu6dkSyW$4$6W
z!w-R|Mvaq<lNp&v7VO8n94R9n2Icjc8FMH(h0OH@BiG<pH|8<Au%L?%7CS^{le}xa
z3NJW@qP`#?(^3E9R)q(@Z}8Eif8Vs^!vXO?@9}Fnw3@XG50!v3hGU<H<qPQqjhN(e
zxiB7Amz%y^$V$Q_gK*c?yT9U;)h6%b_ziLqcD8ulW{@8l5lKQkLlw*HCsM>%O=}Q-
zOX8e>AjuDNq0+6s5gVysoY7*{Wkm-HIxCROfE7MR)-+Fq%oa_l)dNwklvU~F%<La-
zZ<bOU!ECC8JMKA5N$9tb1!r_*tskctL|rnL6LZDsRqx%QNPKpgU6!~w<=2EPMJ!HM
z--G{Y2){)F-0TCwICUV10wh_muuU;@trfk2tc)OH(6}{j-qmFn(x9gI>eBshlBvZ2
zge?ZqyY1hcwOhd?+221dkI81iV*iXXIiJr4fVu(m2)IWqo}P$E1jB;HFH^azug*Rh
zP6e4VV_9nB09=5aoCmewCjQZw_o(r{$2zTW30SCA7IK)x-kE0bS}ca`2xwJJ^$OgD
z8ER?~?`5^g5#=A*UqiDg<pMwPT9wFg^K#ejJE~>&hbNl!MXYc#2XutdmgG@V+_r~Z
z(sV?OJj9pU{|&a_>D)I@yF#^2gj4=6-pH9^e~rG^qhRuJgj*`Zo26}gOf`{t)OzQ8
zGwqWWC@+7$21;Rxy)KBa@WG85sT*H8*YHCa-SA1%zpWpQbk<AF$_L79h|<DcX1&<#
zdB!WO-d7)FC_<Y*MqLdQ<dJu?+KZN+qpJKXD*4g*rn^-2GaDj4v9+8Q?boulpwd4@
zn_@?Ey|Wl3OhHceTriCvA>+cq=nl+H?K-oJO~6qa{{?Ck($`Zyq|R4Lc|Ljrc{o{F
z?T+U@=$?8Dq;R2YPRvI*vxmvsnKhVtlIeU};Dy&19x2{C_a#!TsS<;Dj?GETXc)N%
z))Xu6a&ZPQF}=z9m5Wb#h(AF6n^<1Ab6t}3oz9xy&+ny~S!??0i4B0=19*Y7=yGM7
zo+G5mei}3O&&5ILP8@|FWC(!83Gu=k86{kqe{^if7EyGYHt2wD7GGwzpgELMs*hx2
z%8Bn+CjdHNBJhd)-RUz=@^IKw`{>XJ>;~2u{DlTiiFK)|+q$vw{k=8E-kLlx5I5ao
zFm5CR?p>^@hn?UKsh-dPk4@t*bwUWMFhdFH!7Ntrj9@`U0FMWf`gE>-Pee?sMv*z0
zcF+%U_Cx=RF?%?Xhni0~1Azqt<KUFWqX7PsI=_hma4;E%0Sltsl%Kxi3q1n!j%NXP
zFk_hR!b&MOVFR*;Pf+O%w$>q1)#C$!70!H~uI<_wUvh|J<NH@d@rnFM|Cc4A01Yvz
z8?~T<xPH6OVJt=vD^KVLtBXYgQZcXpdgs~qKt#~O%V<}hTHv0tI2eNtaISI4o)EeL
z+RTJ+0-UPe4&M@&w(xMB+Dg}|?#5bs()8O9ctLKXd3--&uLG3sAXP?(Js|<NS>&Si
z6pS#QdUeCqpej5+V&B|n|81gFVQOn9A7n=oJaV2W<IkX5QMfVywg}#=ibv=8<38Vs
z7-zlg??I`L`VOm9d$z9aDP<#maSEGHX+#yG(?Rj8EPz!GPTAL;+1PnhzepxfN^0G*
zj92Za>c`YdVA!_C?p3*Sg8E?e)(Dj~Q5kssksQyp%bzQ9M%RZ=MgdH-$C5CJeyE^t
zt<2Z@Hq-_Z8|D$?l+FRAQPNCDy@M$F9&>9&a~3KkjrJxx8dfJ9VB+~pjAt#SX2@6?
zC|o13)rn>z!DCi4F+MioDFSabKZQK5l7JIs`Ig6q#s=pDZaL2fM+4(MO`hLoz7r40
zPHYd;<pZn)0Jp#N;u7Xh2>lEPC{QUo4)9q2e-}1M&61W8hI$6?JPjpTBw<q5X&`6&
zb1b30$aCk1a5jtL(?UalNJ+QQxc7#AOx3LR67$!xYKh^O+DA-+bJ9N!zNkR3-vcGz
zkAT8MG%-4fI!ow^=fAY7eh2E#=pRf(@{!Q!I4+pC1bQUJC-FfW6Sg}G%4>TX36%g8
zFXB?Bus(_TH}dk^SQbC-a$KUu5=Kpvek2h_d_o$L31Vu{IDBVIZ$(SVS3K_FCSVR?
znm=`sJCEWbB^6YU9xc--WBp<kJ)p^Jo*Wel)`TlI6TH@^MWO$*r4B@(vJa5Ye!TV3
zLejPai6;Nbuv?Ho^?!l*r{f<O^5iUb+8%ZB>7;Q!n3u$52$K*neq08Q=A%dY1%2j*
zE9>{G813==rx+L~8PF2_PQ>$!Em!dcDcBMOtEDkmzV3FuS!mO3*^%rUEf5C}Hkdpz
zP(H5{8;bdYwhEtrp7xM@O)<evAZ*}fRmY^GL`NG_QC%Nw(){UW*Oldg1%NXf)?M)c
zvVn}81q-c9GN$yq%(Wo4Wo0Zat;7ZVzKG<D_x<MF-_9oEi!c>a(2;rT+HFaA0Kv>-
z!*qo2d12kX(L^N7vchwC(zC3cwxt%)fCi50v!qgZd8mH1CYU((7qU&H)4PX7n-OJZ
zS4lHNh@{ZJ3-FeuCXXP@Q3~wIdH4iYLL!534d1{=tbwO7QV?yIg`U0<QVp`!>n#=V
z7E%tFzo?)6TL-4#c0adlpJi`ZB}g`}#5~iYI1%*K9+fyL>Rmkcz;8VqS0yqTels}<
zNy{c~%YtBjI#*6Jx&HSG*|gI5^30}6^&{$@tVu^Fuk+ZrZ6N=slQ__b)uUDee=A1i
zw|vkV{2i=Xq7!lvtxhzk!(JpSFYaBCdYG1>Z1<XSLP3xH2-v*yw-r6S7f6Bj4N0Iq
z_%5q!8Ctf9<SG@EJK<ED2yNIrX#&9nf8h8GP#ic!f;LQE>{fXH$aWxjzAJG)@X8w9
zddGb3L6o_wlH?{FL}(tmf9fPVc^ykiF`aplrd`u(KKb%C8KVw05p3AzOk^zvFDiVl
zFleHp@DxF*;Y61zE$w{1A|r2N8x$Q!i<wO9oz^E3y%!d|ovHu~iAE#qyd#2LE4jLW
zc@k_0CXhdRX!5OXx5Yzk%j910M=@u#+a7rs2h1MYG=KGRV%7e_{kDL?b8dk7cNj?g
z!VBqO*jT@ebZD^1B|x%)JUBcJP+sAeEseDYa%qy)4Dp8^5^+UsrZd$rB5**esjbSV
zwE4rxxv}Dm{dpcsbhZvV9-%oakTld`#Tadri%LI;5<&*C2BGHin0kQ@=*O>*Hap}t
z-^$b2UTe-i>wQ%0N0Y&1*bg6~{I4l=Gc)trCQdc8$V2j{N(U})24tdSXo5v|_8o4=
z^UKDi$qVjgUFpGJZS4jEllzq}nbUYH;HhU4^t_5sHQ(J%Hy_Ob&b?e_#zYFc-zj{q
z$?Lec8M%&SBL~RG8K6Z$Eb_D43l&CqAPp4<_hvA3b^jehPL3u8IC-7V0obkgMa^<>
z7UT1cTQndV7@pLl62$%AHyhY4WctlKqsRR0;pvP(MGO{@ix;PEmeV!Pd6~*sXLft}
zALw=ExxnkpOBgEXxvlN6@LXV9<1_dl#3<|i?>$hz7+z%~?WCMNgaW2T=%tsW?X>eT
zU}$|BJs*%*Ac81{9Mp+{B+R@!7{{}KESW(rj4vpjo4(eoK0EeZctu@ounx|sZR!A6
z@11)Ku68;uqoI_U!C(SioC^<c@j|0SpA4qNRDUJ3^q1ezkopoyxyFm4tu>}%wA?pY
z7R{obf#+f^C92q5O*2~eE>jd*)}xVsXM7sO{GsyK=voM2wTG+_{(NY#1Y|m0FC(t1
zpF@L*m`cFziD0>7<)`ENUuOou){&jrjr_gzgi&pLM{3{^i0c>Q0TD9+B5tII_5cUA
z*8OK?l9W1V+HdRfv98?(i(KGu;_$gy*5mdkfKp+|i2?v1K+kO#1J<6jF0?=Dh4n5*
z!AQE92-gL1XHv|)ZubI1hq)g+t2V|&9F`vu%hLtusAGi`FIk;P%B=~_ignCddc(%Y
z<F>Lt1(<q8i(TB{)tc>nDJ@$=H$Bf|dzB4CdxX=(qp0{^;)n5E)IR5PGJr>Tv}u5d
zET#A33s7l(ZhQt(3wb{Z5P+pCx|K1oF=G{f&Pv@|5b*!{WuUs4z$?xhVcrF&(e+(x
z03ttx^{V=H2&9(43Kz>lt74y|sRrXX^(!Os*ys%v7%bU9&8z~nD<T$mg^5@ZS1I-5
z8#1W}J-EPrXOOn#3t>A*Xf8c8MO8$-iurbRE?RWkN1SjesVpd@U}#D~xPM7pITTyj
zPIsxek+=>&tJtJQq<CRh`H)0OD@bWUjDM#KiV<kdXJd63BY~o*ZdV@lj>}o5sS*=7
zWjULMJNp&%&2I7l6{G2788jTq1MROz<szEUg?Rb^yUVt$g5=e0`9Y>0KG+P>9n8$^
z4Mru6<z`dMt<IZNsoHaemD8(sjKBsL=B)UYME`LQCq+g`J#%eW8!_72ljMj$bB$5F
zXks8z7+Ai{xM|4QEZ`NAC<hQrq}SY*l+&TUz#IXR^;kuQ2fMq1IjWmmx9|a;P}hxx
z??V%8k{(Xy1+bIWfYsR-;9n8|b?wcK$Ti0diKkcw7fK-L_lyUssG~J-4=<V7D~zs0
z1%&zI#@gwX4^rGZy~Uz4iI;(=W53O16;7^Bou1H<P`}iq+w4=K^qU<wi9m+L>bEN#
zNruYHu$+OnreDpV#*!7~R2p!AbFlM>B@5}RwwEw*)Xc3EO$wxDl#t5##DZmBP_~Fh
zi3_^uq9TS;K(CXcOq5&rtK8%J*;5DpKMN3Y4jsJHdqyp=?i*`!D1Erj40;_dFxS*S
z!(bOpJX_(((H6v|$@rW7Uq#7YRGPpnRXU4b6DZhWiZFu(gl)O%hWX#JI^AFE=(Sce
zp+8+uxb)vr4V*-p)cfnP)fjtgE_<Jnto1SEzTB3U8Eo0St!-W+NbTm`Dim~CFCnF>
zw{~dn1Ob+<yVjrTX3Hm1BoS)dsc<1|yuT6#m+CSkyI-R?Y*NP}p0`ENEiFQWx{vUH
z1!9r)<-~w|hfAF(P}E98hn%kZFI`wxci<f9CBnM%p-Y&cxwLQM$;ZhKnR1UCB?uo)
z)Y(6Hz2Fo{3jKXGRo}J^jfhy+@t7n!TFrc9Wjjyh-!s~@nne^vZ)~?>oh@7sesi}x
zDocL*|5`S&K=jn};t|k&=h*`{&+mwygpZ2ZtMm+PEn4zww$c#7%NTo!`zv3#H?a<e
zewqqed(=pXtn1dFC>}u^@scvk)S$dZN<#ea+}UGVW65c6b-Lm|WXsO_R>*o_ausTk
zsqk<!zCSJuQf0m3wj%nCAZJTcq>t~&gs)3-%sr5y7LWC<bNKMGe9%|_>mU@rF{3`*
zM@7Zz5&m+s%BN6$)J`C>Hd^V=Nu;(Q83aO4ru`Z7Lm~QyjC#Gta<YE&>t)9_stbaR
zX5l5?lQX5nl_}h1Lc*1;{buXq6Wc|{kB)7Y!)cXs$?SIdrQxwMNt>N1Ajx9`jtuXv
z`}5U~+qUJ=N_q*c=v!uHEz3^7)6P$=Sx=p(S%l4DeV9M|l-e)$eE1_|d$q8<bcHXi
zEi5XTnXL?e?veiuycOR#k31Q)ck=)IkEE+WHz4hR1b&j}vYhyg`SzzXXR4i9S=CIz
zRR2MW{CR)h?Rs@hK>N{6Utx;ZOj`hPAH!DDcFp2^WFMzUd<pd<b%66^dYX=e1{KWu
z>~7<E;pGa+>k7?t)BW>{=?BC%@GKL}iBssbKD00PF}Hg=6G!w@YZQ7cmaU~@;bQLV
ztqyRv<qpCTE>%TPRx`;SSKu!4Aft7yH;j0p<MdUQV0{<U*8a_=NRIdRve$0XXY-ka
zQEssggy(05eHu!Z4{zBT4X~iX{@7ImC?ePE0>7O&#K|IJPzQ^xQgXh^7Dh`?iX(!c
zi;ZmTOO@z|3e`a&B9gLPM<k*M%hH@Naz&ux5!6A)wO^mQhoQV4T*+6&C>e_#1<WFE
zxY{^O@7{6kDAB~07afJ~F@^;hUhI^*uxMw+j!k`VuU0r=wnh`il~nGSj96pglZ@A9
z-U-<}Ei1e4OpYw>z+qu|iW<kz(7@pr5z*hJ``>*42Vr>_qXs!Y^qYyi92YLs+RD2=
zs`%nBdl-e6P`CQ(!5(3WFZdot4|eVErgxP;?U5?FpCty~G6|lIg^G$=^`(h=^(6+>
zdK9Y%=06|3Ty*`J<m5zRN}%kHE=1$z*Zl0|cYFrVx%FPpKx;dhG-uH*Ei-oN+Sj&e
zc~zKuR6_92qy@3rgKSbjs^p{LYH&$lP?d0vT*=HJagDb?=S|s*^#_>O$@%GKE3C^`
z#YDis!#Gr>glfl4ChS>t6)i6=hJyM#%QO0?1#HtEgtq7w(;a{0*I~$K)NGBVt2aAh
zf0+dcR=ri0P^IsXq<%y!ybF$lb2kmeJPoJff7IEa98Km{(K&WxN~8M5(L<6GRk7o)
zx#KvYRFFbW(A9j-R)wfT{qp@c4<G3)|Jw<syfT5Qo{c1S#Ni>`d>f95Ep34gLeSY_
zBHa3F{s)EIdn!YpopH_suf)GEIDS{sU7<*mq6r04ZmWM|<bvf2qdVb}l;RKcolghi
zed14vFIY72!oU^Y`(@v8N8nmML+%lj&%Yvo&%RB<$>0yFftQsj;_=aCi`D%%txTP3
zm+%~)ZEC*n&mCQ%gk~-$Zu5=>fqQSOcICc+;;q(rYLuR>B~4yxq4P|JzDKGxrSqff
zXUKn?mW-B$-joMEvN0UQFW2l75POQT1$Dq%W$rnx;FMONBgeiT-DRn(3TMkiXo%y=
zKR<@U*%W9vXRQ6Y61BSPa@Vh3=H=Ss4>F2fT`^Er&xr}Jwb6xT1u~;tBf%iTM)jYM
z#>W(}&aQcxX(7%lXcsNR@mqNj3>G<D|5!@JmY_)as#7yLxxtveZ}S}(Yw*K0b2B(m
zj`xLR<#H{@k}@-)%v-Mm;(Bw=P2QJF@y+B4r-7nRt8wAsGr&7VfOab$Z7y%zofJBG
zlR9u{K3^oTUQV&9uWj8sSq5C#KD69{f4TQ+s*V#okfRB<DVulp6<M-V-BW#&oWZ4&
zW+!7GuC8y3`xy(CFijm*>p!-+db!b`Z3r9e(~!D}^`l0@YR^ObMN7V9**mOyyE{_A
z@A9ql-*XVj5^5eb&pjaLSR)Rdp!rDR7Z81Zw&SnWLZsNKXjDQ#c45ofB1S>cW)t#c
zUT$zsmNeucCB<GQ#V`D!t?2z39a63ORjk5Th1oYcjs~kQ8)uf2a@?H~i*zANQn}nA
zGwS;F@k4yHQ4bnZry2*-sKB#IH%38O*0=_;vyBB`R5=hN)|I3|9cQfexn6d@rONI9
zm;3nfX`AyYfv}2^n@cdvv8}paGx6_ba^hq6ib+3`XW)5dR^Py<PTWsxcg;UYtC%rG
zuAYU@|1H1l33cUsGJN?{&2b{vfcKc|WBTDy)c*pVao%CS15q&d#`qr%rJhp~ZeQWd
zp3=g+0N1ghu+?C-f6MxQehIfH?gw8^Qfh<HgGH?5hCnU8v$4K49+^6ax*8?vQ+gfS
zk7eo@?ndpIC(WDz67lI-U@|TSjqDIw^%0EE@95SGAf;hDF?=x|T3w9QZ&hOah`H$p
z>LnH_J8)Sm&t%Kp>irY+{|`-X85LL4v~8oo-95N_aCe6wgS)%CLvRglg9LYXcM0z9
z1Rn?<{G023zPEqRTC;cW?yjn{j;dC}r}W!;Sk~KZRe5vZlfsw6X+35<{Oha<X=Pq*
zPFLdm5byK_f|&2$w>+PNkRzgAH4^=Y^S0{phq~Qvq&i=aK#`5aR7uc&&+gmSr1%H7
z!*1+H$gkS#b=pK`gMdzKc7ry=ZDS=tt11N~Z)fjIAi`@lMx9*A#+t|a#mwuS{YmdC
z^#mE`;opxjHW4o<@agT5!#WtF9yoqsKVd{3rT?I6n8i5BU?5ljc5Vd7TWqkM<8(+v
zFOF*aselpbc~0p(K!?9q*r}8$v{{HJP|W%eK2iw~YGEm!E3yx2Y)vyUpogjE;5S6L
zm(y|<aTx}(YAj`cY5I;t>&-5S&7rYMYz$&7FVre;!*!v<ze%u;%7>CzMt(#^iQluw
zFSRr`2NI!Uykx((AH1~f?Ffj(v-%(O9YBL=(FxSKPL$31>kXcLzulKDAEVdd`!8?f
zT|qb?*%7t2fWEgZwEYSh-&t=E5&r1?h7vwW{y=N4ma*rZa#e7xutWk0UsM^{D~sXQ
zC$BQGP!wlbLTGtEfTy=fgJe}BFbYxd_PvhzSwE2^u-A%wd{8`~^=fa<`?h25{B}*c
zh=2r6fasJgN{fcplG|*%G}ifVN94@po&DkCBzU#PXxM5N%@1=Xrp8<uWbA4J3bi;O
ztI7Y?R%&L7WcY6HNl6!{^@n@c)2M|nDx|-1OOGW)l4Rjl91<JC_)v?j0sS#w^`&Rd
z!r46?UwH<Yq`L4Uc=-{Hhu)avk`44uqABHp%0&8%(OAWGPsGMO!U@T9_+n|C0rV%&
zb5PlHXH2CCdw;EIf(Qtz3K0KoZ0^MR^*!qV`8=?ncJBa}J?AYG40|YTy>MvTUU0a_
z%6Y3EeK%u4ur({<sd4BSS6#0PLMeT{ALL-hnYrD0mTN{Y{jg7~M-DYH&SbWC)%a<L
zNEI74FYwZj*Zr>zGBR?;^DWmHeGJrC;-%4T2dRLosCMge5kTM*4w;HEILx!FYj>~1
z)}gerta5QcN~`Cl8@=E1^DDQJH^71RBHW5hvWqM6*F1fkaxHY#O3aEdZeVyMflXCX
zo;sy(dtY|+om^r{%_I|iPOgU;<!^KmH=tqrvPc4(7q@Uw5;aX~J23FZ#}rYnRQrRa
z3&eGGGsDO3<DXhsEc8h6Fe~B9`1sPMK+t5ngwemhpY(Q?oz#Fhr>ozOv%2#I;@^u%
zAdC!J-%tPTHoaKy>%M;^aVoQUZ4bR4xqVR~1N&6Ze*ZoMT&_v-FFW(+ZwR_SKxD%L
zLFaAt7s+-RvW~wyu4?cMBN*#~>{Kw^Ae{e&mu2|(S}Bvdn4Q_yuhl^D@@7+c){Hok
z`b=7JZ?{VrDZK&#aGR{XHx@y8pstUxg`-4*SR|{z_Y%7>QT2xlIVlbYIPwsD_?^g0
zja)OA$Gc&xK>M-Mt4PN&O+}3qO1oz@z=C!Py}}hXJ)OlT(u#~TgM%e=@QDz<m5HMQ
z-;ogqG=4#|TK3>@QYSAT4{TU&>y4UG#uU9T0i_=TrnVad;INJB8%MT?4kw2uLg}g_
z_ce;q$5Q^U_0@du{IB<D$Oi@@cYP+H2oUQl|7!K7E_Lj%NQQDAZ>ZDm$9(PUdf+^l
z_ZVCt)&;ktjOw=xuFcY2&b0G;Nz$%AxcMkM%LZW!ig}854GOT%d^B^*WwHz$OP8IK
zy=|c0QoF(5>%)(+PH{8T*_^iD{w|?iLG-V+zWO2~$Jc7_N6J8es`F@Qk7g^9oa7X1
zYvlDQh%t;L^D?P0h5K<jsz~diQ9F(lQ$)=M#C3zgd}J_rsAKFZqaGIE&a3tPLaV!7
zns@=}Z~-Q@5Qb4>ZIqLZUVf%XhW0UxiXL+u!32%<f}~<b!Oq=XFsRbfyc!d{FL3Yf
z2HsWn^x8g2&ZT){3i}0iKZ(4bX5YCVd(Pu0Ip7UZcV4hQ5kX-i(m|hJKR#Fk+b)E6
z{?!IW+c^c!^4&ox?jPO!8A+U;%@t%kGIjQ5I-3&x+KhWq6$uSJH2EjUnw6!yxTQ@u
zw*9iRt&b_FEDJ@T!E^Cy!vU4d8;UlOr2p^fw-v`;>*ZoYoYv};r9Ylr0qK(UcHwh(
z4~I*N*(Uyjkt$Qy2r5=|0JBx7XZ%ESm+XF*YDue?xm4@BPO4apUMr5WTK1pWvsKh{
z!PAhn)P84UIX1r~iHMgrc_ulGg~TAnXl~1FrAHYC4hD%011?lDcl+*IR1P}INGmG>
z)0{9<7B8H)nMD%3-lv>Qtj%wMwKp+Zea!0!^n@t>``4evd6C#C-JpQJXs!$HzBjUN
zsgRSr_8^@^A-8k7^09NhZL7!rJ?+ktbqS>Qpe&f5<^2bPXQc9o9<LCkD~<zue><3&
zkmHq2#;EI*Dl4)G?%Zf^{yjN?myydnzzM1@bfr!LqQoVd-NsTRh$jt7++$Wa!=IWV
zyc2dR2_)ARF<@+}j^Qp_;DVeelH$(A^wl<Ptl;4@7F{zpgoz=&x|mDxeQ~w5!r~2B
z)2QnuDmErdx;Zzs;iSQY-Jj4-lldO2Atu&h%Ti0->1k0}S}nqnjbJQ2YCG6lWfYlo
z!*%>L`vD3XJX0U*(&R}!FR=c0lkoH@Ju7KZaSCq4My<6?Au&n9;rsWQ_QqamP`YV7
z(JOGTjg4D4zz{Pg3K59=JRn?Z#abTlww1Lb$%DkTsj5`U32Cs%_>wLMf#a2*XwThg
zr9rnm8t&)BZxvKDu#cec3)+kqkd3Jnc3-uEgy^d4uJP|(JjW2gO}DBq7xySTF7c2L
zV<XQcEHp5Ha)H$;I|+`mKA3P0BP+%krAuq8X4u4m)mzb|zF|z18$d3s_IUvrtsl2=
z22qfQ9eD;SY$a1Je(@SFq@K}GZ*kL|!me}m{M;B83aXRuX-KIbPU@;>{<wYeM1drp
z#OaTV1HeM<uXw$MzW0NgZ?uA5ob1dFj{JtkPhlLr-~DDMHarb9D;>?qTH`IrdOyMw
zmxMnauK!6Pqvnd35K8P1&qGhVdKtO~fDTojelF@^jvP+v8nsm$LY!V)7_Ic`-C1=y
zs@r{MuDA3giWn=M{k>~GIb-L%O%z0mchv(6;XGoui^M=EC#`{v^0p_CFJ|Y0s^{5*
zNO{OvWqLKs2bY159{S83)Al7mFD-9e(!7;<`AhmB7PHFAdWST#J_bE3KojmyP{g`?
zNF?J&@Ho_?N<!AKbzXUr>#h4B(r{|^)_M#{4uPbfi9uR)3-FATdK%+1dyOX(+$Jf;
z`@`d183IrQMM^Nq84Nb4age5m=}0%7ZSURGUqG<_r)WVW&=Qmej3JU?3bow`tJ}AE
zr|*aAlUk@oKJR+TV?ld)n=X~3#?KpiJ3m^8S`Yj;)IdR<JEP{?qeymDWx1q)(K{>U
zVv)C4>D#;F<?QRuYw6wo#+d+<{Y#8~<+Awg4AyC4U+X36ICW0Fo66PCZ`@by#MRg<
z)qN1Fz56HgHf_l>6!DfKq@5>syl%H_t(U#H7i|Wew#Oe7Fl^HBbk(v_;baZx`2yD`
ztzP?6kmp1?nBt!<=76uY{|015E<wxO*ucm#jR>lsqvjw7JN4%F5m0h}c*J7i0j*}a
z6|=b=kNvMm=+H)Lr|DK|o?0y5@1lF{NFgnfd`c|ptTFr+t7=eFoE#jQUsBc9ny!8I
zJ&H)$McmHuKW-C0QOXga$^-n%elXVdpkx?&RJpw#Wygc#9#b8=4Yy~d68UfG>iXaQ
z{_yJs(rD&*n#@}8<TW90=2Zqw@w)!a`X)w@H9Yqh>=iCFMa!TGFSaboY8Zbg@_%u3
z_MWm#e;KY^HYlFgKK6TgJA0|5!impgw2=&pK8wdcb-{HuxBuc-=LbhP9r%5|{{@L<
zXk@jwWXir)Z73?{$m(n5O$FTb3vmKjAZm`Me#nC!D_`AgS(7+~8QJ|M0{5Uwke9$6
zD=#6E<%CwKY_fu2k(-VFVQASz;rH-j!H>5`kLq`#R)a~~T%C+Qqskk_Fn~^zM5{Oy
z>F|sX{nyJ!lkj8(nv~&i=BraO+R04nXwW+mimL902pey+t<hHkf;w-^HJihY)m{{y
z?)`w{R<p>wq1})5>y;TWNV*x@{*g{Ll-PZ;Dym`Z>`e?dG<}j*S(Te4eum*oypunk
z0%6NkNachdBlLm_?S|L+KIfQYHVArA^qvZ~9hZIINrdk8wOB<d2H*6vAyCm0X%YNc
zSIgHg^;Vu|J;;N9NGMFkU%TtB1>RKoZFp{{3(*lOb)T=~541S_I|18dUH1*<dwmp|
z!5>~hq+_T;@$mw+!x2a<M$7pQQf-yr*_coM?5kb2HNM(h>ffiR3bR8?)yljb1&Fyu
zyv@=E%df|ngs!~|&(iv&PaxdDtI9S~;7FfzVhG+Sb}pRM4%L~iU<|jrn4BY}R-0z`
z_u@Y*!RzBQJnNoOY4lST9rD5PQkvoX&@tKNYTN7iJlM_JOd$6E^7$_EZujjK&JPiG
zt=WP$@NxA6UF3OScjWJ1c$VI`W8<!htm#v->L=vwdJ8S!&-;hN-mczE|E;S@!yifW
zH+RBifN$9?%zGap<mJjli*`KJZG8XUis-<_s|CjaUe4|e&t4bJT`6~eJUu$sC%?T$
z`r>=KHh2!roPs+nq$@bzEIW-JBh`(LX!Q{^>9H8D>>A<K^}aqN9vscTuX#MztThMh
zR(|T+ZKRt*Y61J_P<?xYGxh)j<-u_nl#P<Vy<aBeDFE@Rg#{k=368_qwa<-*%;i-9
zRG{dIhS(d%OwZ#vW<uRY1WwBG<wlEPy%KtMd*#vYjsxu6vdO5;lT-Y*+ZXzFM7@0!
z?VRodi<?G7Nx~aEFUjc~?}jWla>;}XP+2JyFF!wO3*reS2M5RHMem|2e!gz3(F@Nf
zneYc*Un2CZaA<gk`oFoLe}L`>+CUV}i&l;GvK!mfYpR>`)gCx-L~S`Wn>(28kt3=x
z<Nkmax0m?&u3~mVT{oH_q;+^l_Bv}Rf@kPzu#k7ObVJz!8X*D;pR4A`2EY8SCSIqz
zT;{D!O>Ie}$5z2>GHdq7A1w$X>*ciq`!!E?h|w2jzhs?(o>Ijn>g2dM<z6ZdMJY)4
z^q2CheCSCX^|Hmm8E}B^XY`rr_KGws7)*k<8(h(%cX|1#_GvgROe}EEMB4q@Wc`R@
zy85Th)YbBiZ&EB!2ch7X&&(wr>_De-EKioJn6d@J6kSwUeBLU5&0`5?#Dt3i%a5Qx
zKt0u;Eo>O_hMO}Fj7HQxi-^X6Bq`10`{m{!9KOwg2FG97C#^ZZ^e`*Vxo3Au1QUQh
zl8v`kcw4Uuu~IOG2B^+2ME=$qAWV0I2BtYVbD4w$r6XKt=}|Oj6e@A>({Bdd8kq!s
zAb-5{z3DMc<qwX1T<#u5Z0;l~u=F*YnEdnX3jg?kynjM7Hra3XR$;F9c@^$HR=OT~
zBgmjrQm#`O)__6_xVD=x1N9uE2qlRa$i1DPd<gpPDmgv#O*w8nCs&&(lZdGKeco?O
zgS|{+gADVuB35B_#^PUvA?jSV`*{peR`1X1#tpIX#r6)Y?=J}|HDhZ>{6Im^xsLbw
z*S^r)v_>x*fC$9*e=`|iCwGJoIZ^4b@gnHkGqn|0p|eUl&{kiF{bwtaD_JdVZZ-ak
zIrU013Q9g>jJzXDJ+l|JZrT(?DtUNgvTO?la!f6w={7M=@Y*Y#>khV0s81V~Eg2R(
z|60}FI?*(d8LQK{BZr)KUeC`_b6974QvgFTcy%t|6BCcV2Aw@Q4-xG|{z{VDx=AD(
zJrVx+G!49(QmBk07Py5n^jH-5#h+WSp*8b4BDYD2=Fj;|?YX+M(`0sm4C=c*`;3@<
zn-1z%Puz{{?G3T$sUz{-pEwGL?+sjqEc(KF71aIsuX6E<u;Z~2tH1En)`XK+u(y~%
z^v<W4e=YFLZt&uMYlzo<ufb3&3M|pTotb&RebnvMvIgOUr^S9VK!_z^c@z8y0HX&t
z_^;%pFI0VdDaz0;5u1WYm=bY=S;A$y<9SA;4PT?oEB%t=QfqWMih>KVh&Af`cSRED
zd?)2ifON^cdDP7}t8_#-t^pMC3!k%-1PK`JUz@W0p$ITFkMY-$qAjv7J*<9K@Z==T
zyOaw;XC~c9L|QhXfvqT(@ZZV4L?S0Ykw=ktbm6zLz7QGGf82zVHEir=rj>EYemCJ|
zQ`19c>R|mNM)>IOz)5mCEm13I;MDrMf=c6i2I3C6|Aj(OxXS1Br@^MFQcohONb=*S
zUf(mt;tr@;PrL8o;HcHjN_i<ciNDAO0v}&DP}nakqdNVj9g4Oa(Lff0HXQ&76C8bp
zf}aI%22b|9BO>O(PX|`}IasD<r5;`fx8yE^&V~IyXH@oj1w<l-;7Estv!~l%j-Sjt
z?YIPFMa=7r+FoGU@Je*k>=l+v4cj?A!i&Ti^jfDxRki<AlERs<Y1a93IZM{}8)MVy
zV}!Grv^M!X7$pM{bB6$xp7ng5&s{X$A4ut86-}6mO4pI^SCy?l#L_+nervKR$pAEo
zN*Fq`CGM390NFnq#+6F5Gn7-iR!8?nIIrHu0Mjo=Nis5SNW7GXkvK0cJyyFY?f-69
z_ZrBy!h>Fxg8tK8-MT+BJ|Li>B^2OgjFA(Sv*!z-X9ey1WD}HV5msYg7XdA?tbHA{
zW@hT)cK4-@LZ1J0{4XUw;dUN-cZb1&kke6exiE)Yx1bD^SOqFg>B@fpqDYkE>s!jx
z;qAq4I<~#LT?=ZWGL03&#fo<FSds-mWO6RTbJYWu(^{x-(GeUd@f`Fzz2$yVjqvpS
z-GzXVD6*RqVbd6G&lOG>32#?>sm$4lwEPqmw0n#Uhxk%li#{B=Ff5-Uf{Vl93QP_!
z58JX$<CGaE)_@9eo?#(W&@ywpOcB|29BDJ2?^2Vm3sEx9VZ~IIWz=WL-ILhAi%Q-t
zHZ7gm@B8~<+_*7O{&2XmK6;i)l=01tpSRnfh>(bY=<^qT=Jfb@IW5l=BA%f?m*-^%
z;%mMSe$eOsCsw>P^lNPZ)}!H#E)&a)L`A1HGv;#PmxSK--8W%wVUl+W9c&cA=kcBi
zkLf8#si~H#ggNflFLPJ(EXQQRw{Y!$9QuN@)*ZGPjpJ!hNxT~)AT(_-0ZC@Qpp~Om
zuv%g}=BCTVnfOD(?1t|V@$Rndyvm&tYqAoe)z4ZE4LPx=_+;-tM-#XnY8H8580%Js
zO8F;&v+ED$lzlt8S<1yPjn~KzF1=#iqz3Oc?0wV6!#N5-yGCr1areX2J8|97goo_n
zDX$48Owy2>+h*~8@B6xFhcuMTrOm?XbO%l2`)_s%yidPOpFu|_AX9Y77ElVcUPaWP
zutIORfyM<~zQ1wCGdT~01}5FaP=r93y&vcP>t}r@t?hc={<p&;65IDYcYP3Yy&bYx
zmH;i;N;yp5I5!vzN6ORZwC1Y1+<|}^<0(!cD9qJ$G~VV}mImZf3{d~L1@qs^q#{d;
z4}5{<LAM_*L|*M-=6AIl?<D?L^I>!mwpJ)z80{k+iw{%|&fYqJhC{9!FHg{jf-fq=
za>5MMD1r~!mq^-rpOfYGw+JtjS85((cT-C_oWo@U$W$CbRf3dl-IE-st`VU-yFXvd
zHk(SI)_jP=aRfQ|y16lx`q)ny3iN(45xbsfLGwArTBY{+2K;IJE=M>aS<23?og~MM
zp#2k((fg0^x^|<rN8LlB$=DphaeQ)IPP{sXB13=!ta`;yy0L0w|J{)dwfrEoUu7<F
z%HXh*V4B?->=R3Jtbz5pW28sp$=Q!<-hgwM-W!#mSSSB|N_>36ksZ68s9ZdwAN%_a
z*0cxDWn`X#`I&j~ny9gbvdOvo^ApsG`Sqrk9dDL`{=2K`_wBO*_aX-}pU+NyMXD^y
zZ0A4n{~rrLEH~T7l?{zgkn3J)E~Q%FWQ<=UDezPwb2YeuB2dtNXpr(Hq355y(x0-?
z<9zs71BPJeA7+!bkYs*0S+$#SDz(se3gpINzmgE99D86`g`Z^q0_kJEtT^oa2pLeV
z-gZ?@Bh@V3apod?lowm9rx`oVM33U^Ua7X3w@s@x<D^Jyld?dbhRkYyO-p2!^uw29
z%>KDmpSh3aU>F9n-@N@(uwcnxV7&OzqBEEs9FE~dPXV}6Ak+65TeM$j(Iv0DnHuQr
zp!q>?c5d3N#=w}ig(Vgz)H}oL{_O<9%Dg)?+E{8-denJSAdnO;&yVD)<BqfaqKa(D
zz~~(x9Cfp?x1h#LW2M+}oBD!qryRQ>(6(MJtVB4Q^ojsg>a>eHL3S&ShK=8g^e=b=
zkGA^~)M-%<1&rQ#k57~z!E+mQk9M<?|7Mij<Ppn7Gk&Ok5sGM4wmo<Z%Gi&FJ48Ie
zk}(pUw-#;Lb}KF{uaQNKSEgYMhB>#*TD0cQ5MCMDdT?Ur{T5MZ-F<{e%ov{Q=QLQ`
z!{f*K@KU52qT@jz;|+^0Dnuz$%0S%>K?$HDc(9cHYBMi!24_{H*UZ-_3lEv&#C?kr
znmfSvq)mTts@W>fVSy$UrAoMKDy4OO^sXk4kqL->H5beSR#Bp-l6(Fpw@m0Ctf*}$
z$h)+cF{Yb63m@0Q@nd&R`khNwE)M@W6R41h$vxj1Zb(}0XlUuq)D{emaOKSoS}xiS
zYCbQuZcfpz2HW~>*@1$A@Ky{X=S?bGWC2?*(_NF7`^vJqGeE&~nqZ-+KPA0XDvGnF
z{=OtTEwA$6_TUIx4=stSmj9sov(#m7e)xSL__6fS>ylT+YTG?N$m}}sIPK<81%t!7
z0WcoGzSq(bjo7SrH({ovSi`g4Ms7komCNU{^7*)AeX#cH#I`L<zso}>Oz4A0!x)D=
zNDT5kEw&WMXeQSDJEy}I4o~&Y4Aa5*c0Aevbx7kRrr4*sW(R}40A9a-?q^sr=hqVX
z5GkD;s1=D8PBdzA3OY4oDFAvTBmBI+mX8X!;g~o~8m}EtvHBu57oNT80RK;gTvUhs
z#OPXXM}>V^*~Soy(eYl6FMVi;Otsm(hpt==V=&k6)-9-+@p1HP63_}o>(yFp4c^sA
zTki`3ap3;hX=KAy<K>2*L}R7qDhn}5j_<^U1M`fT>$Gq8zDy8oqW>rAmfIMuZQJLE
zmvExe=96@yflP3zC3gtrk(H^h1nB0!)J==TW`?`68P}HuOaC+Cy|sNSyKAG`PF}Mt
znD2qZc%jv*r*QU*;xHF(BW1OGO|8=ioC0*{9{8_VN}26ceo}uBXOx$mC1Vr<g(mTg
zod-{~?PV^}TkB2XuRTfDHDwqu{9pIRSCcZm^2tU<leoru*QuOt!dN#{a`-%j#FK3#
z?z{OUD`|r%JD@U?k}ymNVfL1JK6x{Tz2k_7Dm$gCHS{4CK+v^ypO@9m+3Pz2>+#x6
zj*Pwc6Cxq!#bbuOHzR0=GCL0!*0By?!Fe7pUq#r`cYCG$Rl2E;47?-v*Y<gR{LhoF
zjXf7<j8W@R4^uAAtE>#Z^kt+_xE8`e%AP@H-njm<=6*#MFm4BsnN3aYPp0=|iSV5r
z&mK=?iL%K|6+mWcvLoz=<TWAP`J>QNgo<}BUoeE>*xN>_9MI|BG&V&n^Y`x{7dp61
z;&Q{Cn`We9JUi%TWYRSG{76myr@+%~)SS_CpY*SRE?a_Wy6c?>37`cz1;a*3NeNlP
zf9k&RJr`A@?1%D$)3ck;t810GRabVg2AsMb&jDCIG_64ZMN_iw{cFJM-oGvMOm{YR
zrs`B!wt+i0ZmVn+VXLdnnP6dbDB^1FmW@&V_VOx|{^q59TFCSzIO_rL2yb{YOt~z)
zaNE!wB~YsBCtbDgNcWHGJo31oNCpPKZH*d}OM0HhryG`idTEgG#eZUyP`iExcEUx!
z4`%T+kIwGDnD&ODhCIk-P<dy6rNQ#5DBUPOs383?E2pS3)+%oV@=Q1j=@%)NZXoW7
zei{e1SeTo4UuFup-2yMYOs9Rf{zc?hZXb8;{`(dqP3di<gvsip_x#aqGMRUD2+pB_
zO^|-m>2rrKjuYsTXnB?aO7ydTZh=8b3VK$=$7mJwC1Uh8<<UaCXg+fA_`EZXOW~Vf
zNmV_M$s_V39S0hmg6tLpQQ-li1Du4V2o)yBR!nxh#-Sw9B6XoBcal<bP70EKlFH9(
zopJ7k;UM;=d?3c;RlH9HoeRkx`d@saD$ej$2OWC9U%_nB?G`A{VQs>QQB7M67Jt_-
zFJ}KUsRSp;8sCziz-rJNpPb8Ah#W8d7_O$XnB@>Fvcat^b<{I{HwNa~%yOGa<!Sp$
zi^NDYVbEJIZ_o=hkcj$(8N_9jtz|TCy>~xB*|Hg@G$U>Gm2-v!aROaF&r;+_t~^v{
z3PQdxvcEq|u*ov9v6v$qHlz{2_gHOudHCA}9h0@zRa(-giK0~~)|hNmk<em2k+0OJ
z1!S~(xlZlzqR*T~akBAKM%qA4D~Ta70FE+N?5h4cfR6V5yfWe!L9@cSzEnf?+V5xO
z3K->Qh=fFyyrz(YIPf^jil2Bzy$Y&M|JsWUR;%;_4h8Jm_}&K92di59x6ay4JL-bq
z<1Kv+ld@a}YO7M7L>}h6<}QiY`c_-AW2Ku~IfsSNyA3ggjy6<CMN$R5?!5HdaB{Uo
zUq*jZ1}_*TidSJvd@;5Cu4L~X%k|>k=ob8OxSfh7+NSIvHJ4krSYmfLIp!E%X}F?f
zD8&YRUu==d`DWUO^L*z)I{V`~qb4ZXj-q(N+T+XLv~~2L5d3JQi`eaAkbPxi10EyA
z38C(9Z6rvjWNx-YEcO4LB`z~__K(yf&~9ZaEFHSbZY6Q>>YPNjRl#uiep6I>K)&2Z
zMq+}TE6kcv{5sVuhUL)-v&dneGRF8J$`k`)cI*i0^OM#SyBTWFTvWk#<5dvNihXT-
z*(5J5%ug(se!!7Dx9JFZZ%A_=nKur@lN?5@i<>2!6q0V6y+cV1CDl(XoYC*8<nf8?
z8HX>4N`L-LykmBNjQb2g21cm5EvcD|=CnS=EH5lsSjg+*C-@5SK`7OKQcZg#PpJgU
zMrlejE{F4zl9J{bu^Ho(s-t(jPW!RIj@(*@K<l~j>JCxz6Pd_M=uNkfdJ~u;I^C$;
zak=qmc@lX)-9A1E&qmza8~4^~T&H`nO<X=}_N66=7Z!Y;%Wc_2MvXU{esOr7cyq-P
zl}AU|O)uWWmzuD{uf}JxJOz5zqZ??O;^_|dXR6xW9-JUoiQ4aDQ5f(w^K{S?H`dtu
z!zxj8>gRkbw+zh!q~7^uGjWVXWnynE>D%2#7j6=_UOe9Vl?<+<Tj1C{r~!ww5E&`5
zhB)BX{R}l=>RX{Q!I>iIQ9h`q!G2@iG~d4+W3y*BGPdB-6g)?O7R|+(HkRE2=*o)h
zGjDueDaaTNIbkWNfOGD&iZ*yGu{*dhV}&1sG-&U_fF}pI?!SUuz?m)zVFm>w;y7Kz
zxa^ko!?R&IrM_wfhpGrj%P5CPT_xYzr<=?qQZsZFnKg+lk}%yZX9C0L=BukyO?m$H
z__ol&994=*6P<j;PBF(~BpI4KvU>-0-~r@LfxN|&fJ>w!)!H;OOr-W#fcmj&wThz7
zDYvZ*6Q*9z4t#`D9#W%=E)P7$*2?b$efAiMn-TPS^c3;jYL0b$fs^Ut=Pp<7(nJvi
zLxTz3|LnQ!G94k&;uV)js}$`jc+!Ra_gubZ2N=wDY&-7Xkogx~c;<LsPUaTgi9zI|
zy^W_Vw}nOvpIB_Bn5n#_syDWTxoo7A{<%!%QBZ~~Iq2voZ@5Xr?$zbiH!J@@vAV&`
zTLAE67LLvwP)G2mIrdPr?c8P+22H-mv(TPEUPKj1<-$(=`={aQIXgbiTLxo4-B~l?
zmq_Z5t0LmL%g4vTx$1j7@zl#t)@_Kz#<CXR0eYVm^kgLjONIP@mu@r519$UucRg~z
zU&zsQdMXZ#3hlle7<q2b?)~K*EnDq7Fk7FYgmkY`Mh6JWb-oGet>a>=wktCMtKe~Q
zDMp<WrAp%BIvOh~8?epWsn83o{n%+t5rjZ66&l3TZ(L0Y6oJYyRQURwDR>Rl<cO6a
z{I0Cx4^taQA0-GLb*#2p4MZv=H_V=whwY4zHIqQ%{LJ5Vjo_2aEhhS`MZ4{0@aWy>
z^WZaBEw|~#A~kE?`kTuvNxq^ZCpRDTh(+Z2eMK{hywT^^;43>KeByznsq~|Fu&zZs
zZ7Fg*OI$~uQ)H0H+2ZK7>OlJbu^QSB`>yj#gJ}0-LB@9VSA*RyGr03D#|$}Ss$noZ
zok6v)bm%vo2n;Y&Rt4CQj%abskkZ3TXcw&$)oQIqQIvhtpkNuNwb>9Z*=oyEL5|Mm
zj->H%lpJ){**&7MT6^Thw46$+EE`+1mqn1G+$&}+yz?^4N0U|)4Xa61c^tnJSR&c!
zT<i3Vx3Q)H=g|mG2tk@ict$R6w;wBm1aI3$Z-!28c0!?1U;ykhIAzR8(Xq+oV#FAb
zz&5>1XZ8Bx$Em5A%Wc_qsk|c+^ukNp)7Sf_({m`ir(O@N$0>nmz)7?{a8aWhEp9><
zyVp6q<L59Lb<qWt^r%(6=TO2MxML|y{U$K0&I(>HKhUmSqoy;RT7U5iDv}O1x#J70
zOoUPTvdEZe_yRZEltpbVuB!E}xRQBM&0={`9@U`dNyM6TkF#Jn=U`=aLzasr!$mK~
z?@KeAW@fiIz$%^(kV*YW_G(wmuu7R35;*gJUo!#8)4<Tqhy%QFK0bzmz%Q1li9n)I
z_vL&r*mShVE07TE=-Rbxs?6GR<SX29RZ#WN*s%q#D}l|I&tC29>W&CM`{JU{jAL*4
zg{PG=30RK$XSVe;t+GFV9faZ)xZig;L%PvRh-c(M#NYAa^#Na?;x0Z?101@GQkC37
zhsPE)2?6(MV>X<3<UXFIYCB<b8J5f?2l<EA-&!Ggm`4-3H4j<}LB2maDYXHrM|z|e
zkT?8-byObe`Zyyp7Pl;<!ARFuxWs5x)XihP8~C0rekk5_#{WJdEA$2k*U|s*6>Mug
z-lY6*Df=Rwg8pD-<_m;_x0D8U)Wt`2h}*n%;rgY7oeL@2t{2?LK4o8`Os`R$qd}hq
zT7(Skv@ovi0-tXU1e67XEXjP$#rVCKIz%k%Gv@{CDSfts%l<c1;U~5{-+!Cn<fiPb
z4e6$*QEbD6htK1+V4+T6y}I$c$x`RnIxbnrlV345sS!E$4DQJa*x?zjCaz2Ff0Sod
zZ~#wDf}Z5@g46s2-^0@y(24s5zdw5~t1i#(xA8v3=}!{YoKo9-Vcuxa*V$PMNJsig
zp?=GX^3%Y~qB4;6dNEclt$rj|jEXIFie8ggNav|eeBw7*_*N~y<0ZH9@yCmO*S2!s
zzM}bmQNRsHa8$j?B#ZsF4;YfV-`Q{=d)WbbpZc}^DDS@ts2l0EbCj63j$$u%4MMuJ
z`g>HgJ0h|B?&^TVqr2T%nC(z>3vKOU(rXFoxo%rD9FAc2`}^<5uKq38M&sdap3vJy
z4eaHP7uMD5aoNnvuC2c>rKi5HL_(k*0?c<TGE5P0DF@(zejJhN8~GhAEPY|JM{1`D
zX;w#c7y;t*3X^2$KE0@_2QlktJcubz59P3YS)p!dfGPF&A7VowzQW+}D4j0g1V?ji
zyhw`}i**v<+}=1IanN1T(8ij4MirgcVd-1TS*Ts>0I5<d*42_}Wb@yaCf+*R<8tyB
z5q>^!YiaU%d{@~2b-j}i+3WYJV=y-AkYQ};$;gj0K>mH!cK^!G@-kpKCtV7H$FQEq
z!2_3kDW}aS0*t$dpX9%N=yY*|v)%RA%h$o@&2A6Zf<+L^A_x{&jC|PPiWo6M&=x0F
z?I7{R6`Vl~Zf1kl2~x3{TB2#q9hRbtR6jEFw8Wk}^34buS9qWwQ%<O97=?07)IILe
zZ&Z~R$`_D}>oCzk_t$5TX2<DYC-d5z!+hE02hBp;NsJbkt;aFyEGCAgtKOq*0WOBU
z-rkQl1~8@S?eo3o<a1o)wMAa%^%fke(&+o$b#1S6Q-Jl&d>p89kyUO3=k??jFjf^3
zeYQ@W#8SfFess?BxP*8G3kFXAgMNw%p!gmfz-k6x)iEK@q>d<JmALK%((0D>%8>pa
zmS|!laHQUMAX$n?m;aX?346Pj$>}K^2?oHffq55e8G!MMyZ#Yw2>nd@qk&KKc2>L_
zufZniRZ`vYqB*N$2Wr%(>26hwyyI>)Ylo_uqEp-gGh8nx7ibHKmKbN@HVd{f86*J#
z@7}AkAKVc#Mmrd(6I?leJH7nTrHTmPu`d{d75wteHNnry!+ORJ&gnt(gI1DfqobVf
zHig%?$l8fouR6c1_U&7J|Mrr;ayP^41yip;FkS`E*Qaw!#SnO;H~1aYwD$TaQHW@L
zrm6^}SS?JY3Eg?g>;@4eoRBlkH(#KIGqF53soJZp?VqW4-&JBb<HI^1If<TCGKC6x
zebSu0QogV|-w2xW%277FFOBy9!T$N*lM_gWNjF8ey&pLlgE45sbhF;`<EOn=vQHe&
zzN?~no+$9U{IK0<HPAAfzFcr~etr4UV0Wz~<RHNIEoNGPMXwc&g7dIbPb3&DnKB3D
zzDu;<wp@?a_SA)|<xah8qE8_ki)l!Wrxzj}tHqdX<miLlpUzTLX4iA`2tn0hU<Y=5
z`ykRJxA|r}lY3G;Wz}N^cBP3#JC!^erOmr(VC_bSBcm2T#l3N?Hc(TZk8iY*nT0XJ
zVx+baVJ?kzURbNs)iy{p(^Wj=e3jN&jSZ9b3Y$EDm^^+f&G@&S`UJR0`@8EGw*PcH
zbKojkd#~`;ZF>F)7TRunSKo&mP}t{)={g9aDaUJn6x{8+a#7w>P&f7t{5jtR=$5~z
zLKY5oqj~AZTC)~$l%)<*YwgB>)4NeAW2h^Rej`=8s-$jU9xG~YS0t*+=+%*U>k}S)
zw6XvNU!ZWY0Mj2KCUMGB#zQMTYt8Q*&A2C(vq@7QnoAcyh;{eo=}d<Umogavtem3Z
z<Q%sMrD<JEmx{k>dp8{)?m`vF8yrS(VSjYgZ!1%NSN+ORu;+Ktaa6L^S9uJ(eM^cV
zLC;YfuR{QZuen!!yFw_)*hMDEl7`V#zpGGlwfx(}D4H=rPPVsVoY2Nbu_hETmpXRk
zb1r3acoR+huWDry;O}$|@j$UT=J>y1cSkTSZ4T^{{|cY$iKN$R6yX3yFe9%%aeMF5
z`T{1-)fouaTAsMpyg)<>1O{CIy>$u-@caBS6P?xkD%aH#rPa4z=KNarfsN$ml0QI_
zu@%g9!TNWQFnt7S-m$ITa$B=nrwwH)ZsZw!gXQBuWy_THH@JGoL*;uk)Ery!F0T9$
zQpPk0j+889vyp<(P#?}$0f9Rs=?WzIb7Oj6nNu`tcuGB6bF+igEQuvs3xLwIlx<L`
zxQ?sj#+^zkn@5gL-M}-6q1}oKbZxXLCqV4XEvmBdG)o~vlk*X1F`_&J5rHElsoU;6
zGxn?(?cnE&B|F9Y;#3P!fY}Pw0Sin@YM_WRUY=MFm}pt+y>JCD4&+&(hp(t){)7<D
zM|(}Y0k_U?0rs{+qcp39>pa2ndY)#sAWLKvFl=idDv*1}KPxQ>t`Hc!*twbXz6=rg
zdvK@npNckrdNBqTzZ=YETQalPHCha3ulTbF-hW7}wO%mLlE~99H!biU3Sx;yDq@G5
z&6=J|Uus=`t7rttGZ0$RD7Se&U@g^@h8t1@HcFZdBkwnqSj4M*6b?sBP+N!0b4g0G
z18}7OWQsJ|5TtO@mRq1Vh8|DRi#G?pKl3f(rDsUi#xl`MDwZDz1L42#Jk*@{1g6bl
zTHZaW0jctjTeF=O{ud)RB==W?qhu3P+b>w^JnPoH4BxTCH0>~AW06Xp-Bb&LjN#>5
z25>6ae;Xd(_Be$91cHkxVp;lN!R}Jk*)aWb$a(X?N$}fqK2pO{Z5%)xf{`a};ePD~
znn}@P1`xDyo_0tn(ZFI&jp@Q*i!CU(#Za)Vxr$p<I+sLiTAs><JXO6>8A*;QdwG*;
z^j;<SMx0`;nU>s65l`}3BO|l)oYgVIzyG4yb%DhhhNGIQ$vP7|eL+@M={K-dAoF*s
zb0kJVEm{)Q*~csw;ePF(d0;qLc&ZjfPc>z0tE$BLQU1oiO_v?9IzhlAtQWB9=EiTV
zdD;xfYnjw0gpAAL7-N(+UzpS<kE)(Z;)Jti(gK2n1h8$c)zXN~BIc9zpPPP2V)G~`
zNDr?sD*gG??dx-<btK|x9zaMa;iG#-G^SS5-aBTdoPt3u1ff4zq9$B7>~A=P7Nhr1
z>HO{s5q9kw-Lw@f3pNK2ARu#Aw^BN%a@L@#|DNUm>E^?re!bP0{Ym9!R@SmW9e@FN
zAgkgA<C2Sx67&`f#ktCx?u}EYiMZcvRcSVpXaz{A+%7$Yin^VqFCVG(j?9@tAkqO`
ziHETA#_NI0LG^0z2cwl8X`F41(#EC(nu9vrHQ&<179RDs&Cx%tEWfbBO2$Viay#w8
zjXS;(oza&6lxsJPB3-YFaay<?CAW$49umzr;zGW(KWxopo+#>P1@~G7?G|Y;GpdGY
z%*0k<_pI4DA+%iAoD!;}sO~w}D;Xe;4=*YHZ{p3pEucUNzeEnB@Ij9h{57y({3;D8
zJOB+GdTiuMHRIwHY{Xi(=vgyQ{c33s9vR`ZW@d?EJtXFeFdjK|*ZmH{<p=+a(R9_u
zOR=k+%8ijW59A^8c+s*xN?=t4RZb9Ofn>l7qllTpaghP^#fwgjKDRp6H^y+2#@57w
z#Ymw*7cb6b>`gx1oJ=ptWp}T(>GrJVil~jYFR~3fK$6KiyLf><k2BUlG*dsIti#nt
zaEpc?W*c3)<!^svyB*OBD5{b*bpM$76jDV^1z9&O@sDJ)&9khk=b9Zs)Qof-1(ues
z9&2fX1q{Xt;S+4sx2Lm}K|$qQ!5FMD)PwuzAzqhDDIl*edYKCG?+lj1Hw;mYrCDSc
z>56Qo(FP3bpSAFsFshhrDU4J4SJ@M?L`VAh_wCTtc=`4Z$@*a*xFt|eVs~8&M{-9`
zFRaRUU2`g7XLNaI<dR}>5RbiVX<b@_Jc-+5=N;p=$F<yJJg!J(zO4q98v0I-sKadg
zAyTDCW4dGdM9@5G|BEuJl84hM&=)?l{(U#Tx<>#Cy1<tukPLu}@SG3+#iorYJX?0Q
z^Cqqw2;$-$&*=hxBqxE@PR3XWO<}*#OwlMYbn>7N<Xnjb(<Yzn^ae+01vl$;Q_Zio
zshh!qde~jUuG&bO>-=u^)L99O*_NyUl3HV#8lsL-Tbj;UCR3vu()1)&WmB!1XFzK>
z+JZ!E91a1y^mAjmJ>EgMp;RmY0B;?mCCWn}#<D{+hQarOAs9=Y6I=v%SH%QYRs>Z$
zZhQKeq_LHcXmG+t!ugn3rofN{1b)qm;PDI)Oc=|6@415{7P*B2Yb%P55_xrfyYjd@
zZ*1tIoU1a)QNwBdje|6dAr`;N(Zea*VC{iWNXdfJ<gDE6k^ri@TLSYwHEWvr(3M7i
zmyDxoek____AL%3^p<p+ovGdnJ~b*URGL|+^;AA;E<``AOE&9qAl2=epu=4h!$Q{Y
z8twI2V}X3&rg6&`U$K@?_`bOEX2=HO8iv-|E^Jn)LOyZ5azIXjg%+o;=rcgRXiB*J
zq4}X#F_>mOW^gXc1uUs}<KkBvgOi`UXY4sH>F@<d-;~=pe<7o879MdMO6euNX*N1S
z`?>u{rjuVd^7{nyfZEZi{u8B5;i1@{yJ}Nk!^kdQF{K%Nsc<I$YIOes#tf`@N};}!
zE5ado=L<%(^$6QfLC;aw9_V+rMt4}U2in3@GX|$Da`Js)0nc&wL5N>psNdDUVaCY6
zxJt;#s6|f3@bAzPU{qTgtdhLE!p&cjNgC}!#1uj@5Yiz+sSb78Vq2u87KGD>qkC&o
zqrwKKfjn(S*xk~KM~>YJ?<ts;2exc}Ejku0+N6E9Y<_>?UY0J~4n1#nc^eO`XV5#|
zWbG8zf-pjbvQF!F8Pt$GzCl!1)+#78$%EIO5)+Sctn{mQFm9WZWLafHAT$@WVq$GU
zz`Jsjc!d=gG_iO<u4fngRfA*`OLQ%$gD<XUQPXAER;fuc)~xt|B&&mZY=2=1g;la3
zEQndFB2Vu^!uxv@cyUSBfJOCP)0Yv-MsLPkl3Y@DqhC>Z`sjcD@m&mxp4VZXfacXp
zOkv2!fXV#>+ON7Gi0Na9^7<Kqp+h@1LBWt;^9W!C)x_Bw`G-W&DG~ntXyf`%4vFD=
z!7jDZ-~z!}ZPgvwz~j>dooCKCqrz^X=d3?oS;i4v_L0iOJ#>WH`k69KtX_$RG*H%6
zKDC(b=x)x=x`TzqR)I|Z;?%Fd0l%eHTS63c0r&?MRUsct<V_6fQd8<*l)JOc6sJpK
zR@Lx6qbD$K$7mj)QFUsf2-&rLV7_C^P8(L;qg#E<UM9w?G}#DXrCnXp;f$(5GEJ1w
z_}s{6Q(IUt5-5~kx)hJ&sX(%?@CKSRb&j^cIK!?ZfX!3)ZM~=G#q;M+5K;f-@wRrC
z2^_fCVDR4&augv#^2mT*vqHbTs)?NmDo0cp3Dil4K@^HQ=c^1K;llr80a(#05h(!X
zser$HHT)pkW@~m?_(@*4S*4nz@M2d*)S^4R8tz3+B#ug2Vg&WW{>v-__0xg{x?UWg
zkHD9L+R==CMW$qM@uJy~nRCrr;ZaH_39=Zm!91+oeAwJCXSUC=3B0h+rdLpfZsezh
z{1ocO*!YxDZa(tKW=0mXVsY@&x;&h!$Z}t<ClEqesqTL;1i=Z8JpB|H_l`sr^jUdQ
zTI#<{H?aQpGQTPUPLFM}arb_C|3OJtiEI10$Ce%Nqx5Ao4SY2c7Xf1^gzmvULx_&X
zR2;p#DlhX|<1{1nt-XWE_smu{0>8|`){uQHF?<Qz3o-nes|hCo&E9>fwgE1mR*-2%
zKYQ2JS!Z~4s_S@~6E1V1uMo!>&Z3Zvr&8xy#S1xy6>S*(0uv$dO`7UqRPvVi!9iaK
zu~Fvbz%R*iDT*b<7Qs;G|8j(ff|&ivL_}>@I^2*{6mfC0#@^<{oEL3il*bYs2YhKL
zj>OPm+6a;aeJwxfZ}{tbfyzqD4SNjov1W_vuTa(u{^AHsb~b?(yx2w>ZoxYNG@{}f
zKVvEzN5eNQJ;9Y7E2WOGc$S}?ICgq191g>N&ze-ynztHK5#u`fixf1^-t3%W5EaS1
z=aAY$T4VAvV>XE*cGwO}y}xZUbrhn6VCyw7x(owK%(}^&h-saY+8R#ZsSz%tYRZ9|
zcT9o$9xdCwJ5ZKNfgWJ@4CrOQ<;mXrR5Sb7>|nI})zjdSP~Ur^1)r4kNw@0CKF9yF
z$za8C9|*QWF%ZczAzw!a)|zyZaJX>OgfgO>xyWRHZl1q3SGU~4+)JW0WWiiuXj8#g
zT=11Mt5A`1anor4*2Y&bIvPEaFs#HLki>6}z7@T5*Y-?ns4D5oj;}UX87-yq-5L%i
z=oIwkC4c*^S#Kw2mN+RitEmm`803lB!q=~^&Id~cJ{#Z6EVqyMTGy4j>K#^b@QDdW
z=Kk_Z(^|6e^1?uzx~Jl(9hn-8qH#jHI~aVsfR_vAHufCHvwIb(N_ddMHs;ury}-YH
ztlOOAxcPxYB&E?|P<~*+N;pHCl>XLHqpD;!9;R`D)i^wztl~LN$S^B<to%p8n$cp4
zgc6xv51K9g+s3O30O}{qAC56K<wrI>_Ak(t@&Nj(tU|ddd2fi($Lk!?E^z{N*wiqU
z;r=XmQ>cv^cUWhR|M{HN@aQakAI$i<nc%{22yTb%ABA*tjxE!Ezbai_6+9R#pT3{l
z?&T*nR3a2)O`FvY<E3F{DwMgKK{5Mw{prrjR5jBHV2qYjwJt0}$!)nN(?=71M?+Gh
zu|gzSv{{Xu!>QN4{XH+JzxlWf;A1{82A35U&9pEz-Lh6QWVj|sAhtoF35iuw@byo%
zmM|_4PGKmYHpdt=o-#{pnMMP#O7O^mQ&hwxW}9I*J{~yz6K9GLU`%92BopV+@WGdJ
zW~lN<!nvfd2nUCu4jq+=^CBJQhuhK4$wsxT_&z6==SJleMbDr&aZ}2O-BK-l0LWZ#
zomQe1)_yuAYa(e%efh*<R^{hDjjglPhkTKO)=vzfJd4U&)@IDtGGAAVPYM$|ZHAv_
z4Nmk>Ob5~j=F5CRwAwJgPE4acr;+zG{-?Hs)j7rt2;D=Is+bmAt%Q>sc}yD1nKw|}
zd2|Wu*BtqR1P!x;a}gm2Y19;UQnBB(Auqzzt&8l|zcJgjY3ew=tk;$0s_*%0-jNVA
z&BrO#MS}@ejMd3zM|*teNyFd=6nJ%@F+#^I0~=mjqo_9M6UknBznd(pTv1s-LPH#4
zEj}-&fm4CtfK?6QD-zU6xv2#}Ip`mjpCm+{^03zSAiIkvV{rKwX2~yge65(C-_rfZ
zWAX({)n3{W<<CC-kFl(zbPe=0U&I$rZ?o6Zo8o#GSBGXk8|nvLstTA6cX>6X9#TZL
ze*(lFzso$PE|MlDiALmqUSJCGz)BkSuw}HTSwlWOpqUp{fpsMCNK=G>4jrzY;d1;$
zk{DdOOK4)&GLl3mq!+N=ZX~$ie~UiPeb<?7P4d!LP^=D6jHC96gRkXL_m7*Mxgdxj
z+IIQZm5|w_#fse``Lv%o7&*+UyL=Ds4}H?(qafORPbo(ZgF3jNGkjkHzo#(+2_|8{
zL;D$KPP3p}QJ2$>X5*K#o@O#<e!-e1ou7j-Xv9huP*TZt7>r!jb3V2TflVF(pMZAS
z+JKYk3}|$(O1jKqmVhzPdJr)fpcGTakYk)rOp#J^>(k`ZgN&_GPPfB3O4!qcle->b
za69A-Fpuu6-Qx(2%AH%C5Ae^-)xT;^`3`A?b^3o301$<M-jC>2qOmyDqZfvw18ElT
zK~XqwVDGvo!#4=rNw2ugjQ^$d2@izl;uL7(!!GAf*W6ET->!5nNop>aPd1Bm$gnw8
zJ(W5&6#G*g)K08I2;I4?TK4BRc?oCB2+U0iX>edO5QFuVFZNQ)b$=S^Hy3(TQZ<CK
za?LbfKX^_4w=A<DXqF4&iqVHlDB;(|=XhINSzLQ(>U_`EdDVqd(`1|yEovzQn0HTo
zf`1iMzS-yugefh5-E3VsS}t{1v&~cAjx}tOZRZ|YfvG#kGt)bYve!>0n0cOf4||oq
zb)v*0#CrW6=6i0`5yN|%r1$^+76<{=swN4D#T1W1hZpOYYuszK-7j~}vL{;Ovc!F4
zu+&UQu_4nuvzyKbxrFhzQv_xQXOCg}@O2!mwP!xEMyJ<3Qc~4?)MQUg4JOmD7mY>z
z<Yoo@n4r|@m6dE{!HwA3X_$IEqRV+tukD`Z2}zj6?L5GSIBmvFQK_7$$TIf)kDUPz
zvv7?5VCP^;H`A2@omTjGSMCG3lPQo7;G1`i`NF(C%^mlBzdFBWQ6)rYl=-%=Cr8O)
zmrO7aJ5g2-5S=BM^i!-sxS|5zmbzXMqhY}LkJ6*QeyE)$wP${eBNDSQ6T7<<+tKh?
zM~p41y*UtWFqfLi$&oovPPoEyrB-I<`|tl-nFBC$4cxees#;;9q&(<4Z6Rws;=^<x
z2P?*q&@fvQ25oO_TQxJUgDI#LV6k6dUgsKmp*z>CFz>u&dMJ9BB<~R*EE6`?iyXwI
zoU668mSsz#eO{+-kNfSTd_{Z%#@E-9yRQ+9_=ATg2V|JK4`P)g`WfC-?YfJou;7iD
z@u6D9_m)8|2K{O71NPyDZe2YDuwcUPsPs8&#ZepWE_K_^FH*;E8K?!W@YDc6(4!B?
z9!pQ<Rjy$LOUkBQe4c31iUnFEo3S$*f`!9Pc<P1<UQf=Dbo*~qc{Sl+n=(E1^7i}x
zf8Pn1IZrE{V)dU{aH-<xk>BBi1eCsBwijrmCM&edRw;}p6W0aUtMRyN7V+qn_guJJ
zw<!)Ue{#|mrLt8$ZnUA^kjrQsXz!pCq*!QWQv82SU3nmsU-utl#!mJ<F=mW?C!%a)
zXRI^!?8Y*dkWwVFXJ^X3W#899WG7@xWKZ_Bz9cFY@A%gH{(k4*=a1)k?!D)p&*z+b
zJ~u9(p^$18I9StjJy_QBz5DrO(^!ue(R=@90oP()L)e?W3IjzC!6f89`#1~eRd9O=
zIQw6Ed+7w(fS1Wk5<f9E&BuZ^8+g~vQ+wypQWhWIsEoM`4kvwos+GDv%*G@^yK(nb
z0!27c@zU^M_e8?L1CcupTkc=u-6#4MGv;6Lq>m_hKx?D|RpY;$(Oauf8wZUgeLDQd
z>DoriJvGQ1<jLg4d`=s-WlH2@OicOz#^NoZZY1G59CNTYvX^JTK8i;UM2E@NEq<sL
zG`nqurWe=M>Mw{3>!W9+-{;jl;db0ebG_5I+@eTY&-`xdbS#I+<dfgxyA5MSPlyO=
z;&!2C$0x3~b0>1KA(_2^+B^@UzR}@hU1O8C#@loEl{Y6^)6<DKx!Cq|qzOsfOUu3n
zEZgptJAAf2bqaMRqxLQlmh5wBW0k+qX;9&!BtNi)%ENrGAxta$6$ItVq;$33FB;Ip
z1BKy88uVmgx$A-xd!aJh_{9&Fv9l|KSo>eoSGqqXw)4HsmC7>@wx%0H2Hf%Ho1F5}
z;F6yK=32CK<zRt1e_~PtdHyf+D{1&b3K(_4J0>prie-OOD{+${QHwMnnE9fy$bkF~
zg#|>55tfU(KIdko`%kwo2RJHrcsg!lled(8IFvW;5aqvrcRbSfmPFCKmy5W<?AYBP
ze2l->NrFRE{P}W!C*5Y0i*5D5eX!4iF)Wg3_>bFBgT%SueBs<1?5ZB3Jd0UV*OETE
z{Lq28MpMom-E@%%-GYWHmnEHC_#^8pwn$%PTHU{etLr604iOgih+}||L+;wFOwRkr
zNhst%YgEIMp3?88Gm{~^hr(yEqf;R{_M>F?le6pe^`-aU_e**K^=VX0U8)h`NFgrb
z7MD-LrtmD~Ka)^}1-dGJvxfNyj>lg$wl{WLZldk-+)3CX4^t@tmc?+X@TDfn;a#uq
z=Q%4pA5pZ+p#plJ2rH6QFU+Gko4+GymT^l@d12zdma_+uoWv9fnd#Z#SFFYwH%5NU
z7||$**pvg9i)IaW$)fE$gyLE;c126u1@GKpd4}&i-v24_T!v;Opt?P(LRdo)Qt;}u
z3D8|Bt8Ntqk<|b2nr|I#VT=F>-7ASFnqWzcpU5k*9oY#HQJD!4UEmw6g@);_#=t_b
zLwU9~QcU8JQh8*<C&rx*$=9GF*dQxhnq<0hBhJOf*Y@n&BwU;^?t7D10M$L&y622Z
zyBYJB(nptOz6+u)6rnI6gQ(L^>5gx0KG;Y=Sg~sHM>-cz(sMl{8R7JZScolP%rk_p
zpv&F$3|mB~yN-Pmax4a7n;v+iin#4N^W%C!rCeromVx@5w@GaQklFEE-b9Z;N8gy?
z=DGsVDm3<Lp8|3eWJw#C5ba@n9HQ(7)K7E#_;-(#CYp{AHVO7~8OI{4%MlXR3JkXO
zl`V-)_OKZ7@Z?JQTd-<lh!dSXvp6YAqaB(Rr90>q8QqPH6bB1Q7op5+hXOV3pg5m9
zrNZM34<RqMs!&gDWttM+d(G6|zy!-tFm<~i8ES&#tic`9EJ6f9sPK(!A|pAox!ZC!
zx|b;S($I25O`JTpTGV}r!<uo?-hmF5RVf1iqeO)ioEkjm$%bnI3k)9PHU~ipm^pLc
zHiNFUdo%(W7tfqeC1Z)&TBDaKvwkRHUY|SKtFxs94WfECrsOOHs$?QgV<cebon&M!
zN9NK>LYRmXrtZ5xP=A5q6gjuq5!M-)5zj+eX*z{O;05LFH+u^u2M2%FKpmjb9Jm{l
zbHD2_yu9Q&i#E_G>p_J?&T__=B;zj~+!khwaP^!{yL)UJ8f{*tY=nlpycH6IxzBC#
zBQuXi3iG6M@o{O{dMnW@d5uU`-*K{-M%}Xwlzx^nv2uGP0i#T8n4vT-ZBPgP_;Kw)
zaS~Kp&9$%h*K~X|d4p?~&O1k`*P1vP3hB@n-1dFf-Jdz>SONEBiy4CfK1@9jw*IlN
z&4GPevf2;g_hvQTXUuD*xNl7wlW<wUG-q^ai0*P3R`+~E_-lE`?P)N+>c6wb!u#-5
zx-x^2F-THQ+S&?7NV@&I8dX4(K_5+Yc-${G*_p%<9O(>upuonHcTXe&TvF~}B<NK6
z^ZCKoP|gX#VcIo;l1oL@kam8PX2<e=CMjRxZAxCVn7(}%%MluK<o6S>w1MI{Jn(k2
zgrPV5BKE;mFRSb4-{NYkaM7VwQmOj+e<mIcCUPpR<|mI}46758_Sx#I`j+>?66a~B
zZ#}e}$H%+*Xg=e*|Jp~0k+auyR&d<8fuT6Yrh+~+Jp)lYHOy5$g;H%}W-b|LtV#@D
zm4R$`CrD;S2o(IV;{V4I4d2Dr1h=!qE@{@(<~Pz%_=cRU^ys_ShhVB(ktjeZ#%1h;
z&{_2F@ArUcMaRh4<2tLa)-%b;bp}Kl`na;%jLjq;R{0THmaSl)t;{}afcp)`f72yP
zgwc%Vv!U)9MwARUY*JbL_VYx~)mIWNx!*P~pT?;Mq^Of|8l9DZxY0zTZ>j9u8X0tz
zw3&{rv%14At>kPPF=sghZCi`H|3>FZLOT^S48l~Ie|3L?XwP#PO}zZbTisGF{Wz6*
zGNSl4lEg>5BTdaNs8(4Y6f^XIQPr~kzEtE{Nd1o7ih0Iw57n(~0oT`O4|z>&)bx_~
zO+lM&$#4)IS48hSgV=;kN1LC|L2Qg~$Z-R{kLo(q?=B3(-(^}~=3EJ8eiKAncb3pf
z3mT`&JUV3PS}c>b(s%qKg)OeNo12>M3`XTfDTHX&zzg_XUamna??0&4`6X;MvM`yE
zZq48{8!<l)r;k#lPMc9Z{YI2QcQA30Z1nAA|1AB^2&V*eE`ggjd)dzoQrJJ?=|Oo#
zIbm)Ip~WlZSU*U78L1wr6H*=ot0DpJwCJd$^pgAXx=dTEhrPO{8Y5&Pqf^OJd5YU*
zI3O22u(p|5lNK1r>`<==#+h9;aXrWu4j!;J1<^HIr$1?CH^J0O?%+$8(QWeK4q}$$
z_{r*MjU@xJ!sQ^Nr&&3|RrjQmOX^a#4K3WR@+txx`6jE`fvsMBTfbueqBd&Kq<si7
zL##Rg*Xet7F?$?-04=~lC!KFk70ovlqS{cyIN=PV$V~nrw}CX6&ZzF>HH9XO^Y($$
zQg#-ehm2LlU2I8SzVtU$(eb0-w(?v=nD<N;Eq=V3^vYAwcO1i%vUV#XShhXLJ{}DI
z@3kTXfFxXF9%_a0HIe45RWf0lCK(}{?h&pG65i8|{Q85OQ5+>xZdBLRh<6RpdIk*5
z7wj$kSn4*XXiK(POOMh>$J(02LuKplg$}7zE#pIO8fl<VQeb100B+Utt=xu*$%YQV
zL9hTD<IaB;oval7SyIz<s3t6f6Cy-j=nV`mi3E6!)Rz4rZ!^k(oYO+Ar;Y-{a|5|#
z?@n8r-EDX@ubr{7bQ@HKN>`UDgSHo~c@T3e%{UUv78+fbdGyA&Q$osZ+f}U&lz|H$
zWmOfD^Yl?s?y(jqd_|GdI^e6{g59RH)nlsH0leMr#%47ne4_d||L!|i$a^4(HmnY*
zz;nG%KE1g~liQH+<Z#IRe~SYs4HGD6dQ+csEEFQq)@?dAoFT6g9U|l~U`og8=w^Iw
zEw?}^fq4z(TNiHg+ddTDjpfjI*l$phveTw0A@sV?vNVmUt+l8+h^pQL#ZVH`&(zu}
zkB9n?jvNu|P0A)tmhWWewu!pLcYbqdUF^O`D-p%2>cMlHXq0dAl1LJ?IY=X**YRiD
zLVnAF+*y0i&u!>A7fJZUR1?_pD}b8V-#{Azy%sAGyl3`QK6?a`>NZ<qhk%S9<_XnI
z{(QzPfv4b;uhplBc?bKQ#n?rrr2L)2F~ln|T<mV~RJBfYIQ!45iTRnq$sxjt(?-7n
z)DZT5i9C!Ss{5%vF3jui`2Slax%5~WkYOswO5dTNA6NABYQz&fhNtv58$PtyHn%9H
zWL`U^358SgoKXc01O(8~^*L)hDAr)+6EMUt7R$&gd^?rZb4l55tIx#c%S150OGN6v
zENmOuqEa{x(fCwVk!L~B0sGJjoRf#!T6j*GIWUXUosaPJ_)~Q8Pg=$?bl+{{@B{y0
zmyXS}$_WEFHxp%F$2Y<PW&IQfaPv7~JGYQtx)X1CHTYOM&vZ+sb#Ga+jlnC!)qRHU
zp@!xD#GTEg+{a#2><<+%>(AG1d0Pf30aZi$l_Sg&`?~SUFwT?Gtsxm&kQMFsIZ;LY
zHobPD-p`%sbmfVvMY2C-yUQ7Q0vObKY+9!yNjthwpKc+wq!kmJ=}N4Y3X?p(hd$9k
zf+@KIlOeQyCh6)mwN~{I`L5EWp$+O`9!k|%t&>Fk0r8-YnkqJ(?WEqRg_0U3kDH|0
zbrRP@BVG)SJ)62QpcmlgB`(C;6t>(p@VH;{MYE6K4}_&cd;Qa0y?=u@L6VW@F~Un#
z6RHbb<;;f<avOZjU+hML>zp_cH7oh11tV?JN=L%nH$jYH!h&dSbn%E;n+OvAdF&sy
zhehbx*WMw-H{f%42hSPfB<n3-1(h(mq?@vu4N(1YDc^1>=K+}#0MZ%AuqJRVjk|A9
zIdg7q<LeetYq<-%)L(|LPN%&6ByY&Pb}svRo>Qw6k6@JDt{Ev@8$kj6D#5uh{DIRU
z9KimNF*SgQ(NgR{AR~VH=~wozk>Ifh2=%FN{EW?tr7~1^awU9Tu5g-kgSK_-?rCD5
ze71%}^Jh?c`^D$Tz)!8V5=iYL(9}fP7A-tonSaq63sIa^+5HCMhu5&sEYB>}bX6f0
z@@5uWwiyk(R+@=T^Q_?sm=#Ydv&c)Csx+u5mg14USGBJ?If$QMcRhPAPe#GTyJR9-
z3BhE@VN1}fUp|+SmF0x`Cmk|C<*mxE?H?<sSQ68ZNT}CiXLZ6fbLVBrjYx|tAEz{-
zm0B9e{r{bZ!7EpY{4JX!S$m|yBU34{<m@qe7T%xZi@R=H*f?QolBzPKi29)^;;oRN
zkqpY|sCzFvHqJeE;xX*{byHRlNvZHn#}msS$Oisi+ZPH1Z3ao@d3AzSZo}wYgxYj?
z0>XTtU+|$9d(;(r1T#&KOVsF{9YfFeV(}%b%gd?cUtMKG|EAzjph+HyOxo`8j{_YA
zS1Xf?Vtk-aW)Dng5pSO~Nrh$`o;8%+de+wM3?4Ik{gO0oW1{+3fxCr}w)2zq5nB7x
ze)`THzx(G0&LoRXPFgEBS0Z8Jty`|0^=QD)evwfD{7;wdN528H#Iymv3;=h%{8<dx
z=g%OxLmt;$<Z**k%X+v3Bt4BBG;dPQVeKB~Eq-YdF_xTf6=o}>Lm4XXIiV)uZq9F7
zOi47i*P0y6@yasfuz(22<Mjd3*Zf(dc*z?`jgbsLl+&=_lB{qzD=0UIMoNB-x`yK`
zC1dw{xf|!=2370FApz<tE<&ot;EsR*-Wv_jtbYk_ay^0Z>Oz*Dm1Yyip^gq@o%YpD
z)n7@(w94v#1=Vwt74{-GwO2&_+%~%cxF+#YZ{}~H=tYf7kQi5O=`|z+4{EG$fSlp!
zs$xx1tCQCAvXmGd?wE^rpZw`R`Ac1pZf=0z_%+Y=jBD=&s<{pK8G)mqA97b@qCiuR
zKk|3nJxVdme<jBfOkbTf#&vm;_;RyI0Qe$yId-8W(7vtTe9;V1PL)MYvgome%xJtL
zp)hb2h&%jJnbv)(#CoLBDjVEkx^I^HK?k7f2E<x6Z(LOyh;JIp=Hj%)NYujPvgM`I
z30FF<_Rh(kiv%DWycUtAIK|JSFSCIue^`G7S-w=*b`m?Ypph?Rz<S;FG_BU2!(7nd
zYJ-3|2}c$y&0Li3uaO6)1co*~n+y#(Sm>TZ`=Z`5?628bt-e<ch=26+x+|$JOtft_
z9x-0?FvkHJ-@)mmoA2l}h61P|y4pG)^&H7<5}AMKlv^19Wj0d(^@a+b$C4?+Wj?Si
z0Bqh@ByHW(ZWgUR`d&Lz4UMA81NqL;JmVYFDOVOb_*xaiIa7<CKeJio-YtT7n9>Q^
zV?NEbCe>AyBfDa+m1uzt$AA4m-7McImU|oNMf9`!C>=O=;g{;VYgw<~(YkZ`)M{BT
zUtsaSG#>&qZ<Zf8xCU;sKdf*K17&JaA%>_xN4!y>v!BT#x1;A(w1GV@A8gU9L3Dgr
zeYFZt`Wf&-2MZsE<Zr%ih<r&Yv9#hmFtuJB{p0(*qmhs2-bM6X3cEn-djns*nOU-j
z@BubpAD899Upjwbn?5KB+8%~s6<%m>0J6}k+-a}H%HX8dx~C9$NU+fp6MKJQjPzoG
zcqbYfRHydK3H%nWywQ|byel11HEfZ`kqBSxn({NqRQEV~T1s(BmEUuuN6>4j9xVo2
zP&0OK-D%h>=PdN7tU0vo<cas5xeusWX_e_p`MV1;5XFt<?rtQcWRa=Sm-ewgSjwPr
zQV)vm6XZ_L%G*!9b&9pC%6#U@gzPyNW_cY(dn48!Klm29MK!E3Q@@sfjNM|OOPT(1
z@1Y3Rm@IpQ_aW*Q$EOm#_N-O>(5B3()y`S#olxrV_@{d3(c46?y&F7TKD{9`Yyi#?
zj;GoAi2uJY(K8H7;*FM94&f5B6Fp1`a>mzcQWSUhnHCM9%XMtK>J~@_>=S%icYHZu
z<HkjqWi(k$3EgN|O2=x6d!1VPT3jq-apZ>*zS<N1Aii)`MvIFG@-5k<JgviqUUOyi
zM%&7scawMs;o8qx@1;x;yT4<=mRWM4C91+7TZpABBqDji?fF=bM(K{Qb-!?ayj0~7
z3f0^=-x=|O48LK}5+_7@3sNfLVVMt=zr7SbSJk*?sdKlA0*$&ZB+x_)VcMOA2T|z1
zVRHDDEW!qR`$$&Doy_Dw(DMnZ^rb<IKW_au26XMrvP^n6mBKEJf}fN3mZt04cXM!1
zYMH4v1Mcn{bRn?y(K`D7U=xb}fGXWiC51C-v<>!ps^6RV`5K+veD~BuLcAigN@pER
z@fjZQI4t(;LSVHX6V5#z(!hajS+9U-6|a!*y?hbiWiYOkvOTt48RGnN7UsS&&v&CE
z15Audbi6O$dtOxn&!zM9kY6vI)s>)R{UTzww4ZMZ*KQyTQ_5vamxczWOp+P^08(lr
zR7?qCfV_`a^&7^9=)4$>fKPvB2g*iGCaJmjE6kK1)>qXf7YRS>*p*2d1>=*Q>n{{7
zStevj+I5_Vpp0^Blv$R>HwTYt{7?6i2U0%81cPT4I|f0^0avumO?mV<$2Is`)a6uN
zD^iwk0x;LH`YC;XpnV)c_p><9`XjiEoTa_%%`;)Z^K3Rc5A|HZ6ET%CKX9lYg8QS+
zVvkW+$pE)b3JW6D^Ap*%QmMNcyy0e*xhI)=w%J#UMLCjn?pt4+u?n%QUT7l0(oomY
z^U)$xpkIHZcnQFz5j_kXo}YSk%V}-@Ah`U862QF6UiTF6mvef8Cdcw&?|@By!6Q6S
zs9vm^E~~7kown{!f3cBsm0p<7eI*7`r!gkcBr-8ax{VScr_GQ}s;n=j?HglbyBTWE
z+WF-Oidtnc!VTYc1~IzH`8JNU`aY-sm@+ier!RZ#r&jpm^nXzU!F8S!x^LKi8;k-6
z=l$-Qc!=5%E!7EFbzgE$0_(g1<PTI?@|nvarg{*WB;i$19aDg?T&@IV@ZP(H3@{?z
z6npcPqTNON=TKy~{Ox-W;+-v{m#!~f)Z2vLuJyFnJivAw&pw@&3gh&+IC~h&Cf7cV
z#Oi-w|Ft@>w?ruXcWHi?(LEh5T45kzW|;!{{2uiDflB)mB1R4`h{L(!yJeRA_W=ac
MR!1UgRPDn41ItmTMgRZ+

literal 0
HcmV?d00001

diff --git a/modules/installer/grub/winkler-gnu-blue.README b/modules/installer/grub/winkler-gnu-blue.README
new file mode 100644
index 00000000000..9616362dce2
--- /dev/null
+++ b/modules/installer/grub/winkler-gnu-blue.README
@@ -0,0 +1,6 @@
+This is a resized version of
+
+  http://www.gnu.org/graphics/winkler-gnu-blue.png
+
+by Kyle Winkler and released under the Free Art License
+(http://artlibre.org/licence.php/lalgb.html).
-- 
GitLab


From e164ea4df89b1b77fd0bff88331e67b865f75538 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Fri, 13 Nov 2009 19:30:39 +0000
Subject: [PATCH 2009/5331] Fixing bash syntax errors in the generations-dir
 builder.

svn path=/nixos/trunk/; revision=18342
---
 .../installer/generations-dir/generations-dir-builder.sh  | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/modules/installer/generations-dir/generations-dir-builder.sh b/modules/installer/generations-dir/generations-dir-builder.sh
index 2dbe1356753..20fd51f9abd 100644
--- a/modules/installer/generations-dir/generations-dir-builder.sh
+++ b/modules/installer/generations-dir/generations-dir-builder.sh
@@ -77,19 +77,19 @@ addEntry() {
       cp "$(readlink -f "$path/init")" /boot/nixos-init
 
       mkdir -p /boot/default
-      if [ -e /boot/default/system ];
+      if [ -e /boot/default/system ]; then
         rm /boot/default/system
       fi
       ln -sf $(readlink -f $path) /boot/default/system
-      if [ -e /boot/default/init ];
+      if [ -e /boot/default/init ]; then
         rm /boot/default/init
       fi
       ln -sf $(readlink -f $path/init) /boot/default/init
-      if [ -e /boot/default/initrd ];
+      if [ -e /boot/default/initrd ]; then
         rm /boot/default/initrd
       fi
       ln -sf $initrd /boot/default/initrd
-      if [ -e /boot/default/kernel ];
+      if [ -e /boot/default/kernel ]; then
         rm /boot/default/kernel
       fi
       ln -sf $kernel /boot/default/kernel
-- 
GitLab


From c1b008b4e3ed7f8ed30345bc855ab07abc01f62c Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sat, 14 Nov 2009 16:12:02 +0000
Subject: [PATCH 2010/5331] * Don't build the Grub menu builder script on the
 ISO.  Then we don't   the /init and /system symlinks on the CD (since it
 removes the   cyclic dependency between building the Grub menu and the system
   derivation).

svn path=/nixos/branches/upstart-0.6/; revision=18344
---
 modules/installer/cd-dvd/iso-image.nix | 40 ++++++++++++--------------
 1 file changed, 19 insertions(+), 21 deletions(-)

diff --git a/modules/installer/cd-dvd/iso-image.nix b/modules/installer/cd-dvd/iso-image.nix
index c6b28e78ea8..6c1151ca217 100644
--- a/modules/installer/cd-dvd/iso-image.nix
+++ b/modules/installer/cd-dvd/iso-image.nix
@@ -2,20 +2,22 @@
 # configuration.  The derivation for the ISO image will be placed in
 # config.system.build.isoImage.
 
-{config, pkgs, ...}:
+{ config, pkgs, ... }:
+
+with pkgs.lib;
 
 let
 
   options = {
 
-    isoImage.isoName = pkgs.lib.mkOption {
+    isoImage.isoName = mkOption {
       default = "cd.iso";
       description = ''
         Name of the generated ISO image file.
       '';
     };
 
-    isoImage.compressImage = pkgs.lib.mkOption {
+    isoImage.compressImage = mkOption {
       default = false;
       description = ''
         Whether the ISO image should be compressed using
@@ -23,7 +25,7 @@ let
       '';
     };
 
-    isoImage.volumeID = pkgs.lib.mkOption {
+    isoImage.volumeID = mkOption {
       default = "NIXOS_BOOT_CD";
       description = ''
         Specifies the label or volume ID of the generated ISO image.
@@ -32,7 +34,7 @@ let
       '';
     };
 
-    isoImage.contents = pkgs.lib.mkOption {
+    isoImage.contents = mkOption {
       example =
         [ { source = pkgs.memtest86 + "/memtest.bin";
             target = "boot/memtest.bin";
@@ -44,7 +46,7 @@ let
       '';
     };
 
-    isoImage.storeContents = pkgs.lib.mkOption {
+    isoImage.storeContents = mkOption {
       example = [pkgs.stdenv];
       description = ''
         This option lists additional derivations to be included in the
@@ -96,6 +98,15 @@ in
 
   boot.loader.grub.version = 2;
 
+  # Don't build the GRUB menu builder script, since we don't need it
+  # here and it causes a cyclic dependency.
+  boot.loader.grub.enable = false;
+
+  # !!! Hack - attributes expected by other modules.
+  system.build.menuBuilder = "true";
+  system.boot.loader.kernelFile = "vmlinuz";
+  environment.systemPackages = [ pkgs.grub2 ];
+
   # In stage 1 of the boot, mount the CD/DVD as the root FS by label
   # so that we don't need to know its device.
   fileSystems =
@@ -112,7 +123,7 @@ in
 
   # We need squashfs in the initrd to mount the compressed Nix store,
   # and aufs to make the root filesystem appear writable.
-  boot.extraModulePackages = (pkgs.lib.optional 
+  boot.extraModulePackages = (optional 
     (! config.boot.kernelPackages.kernel.features ? aufs) 
     config.boot.kernelPackages.aufs);
   boot.initrd.extraKernelModules = ["aufs" "squashfs"];
@@ -163,19 +174,6 @@ in
         source = pkgs.runCommand "empty" {} "ensureDir $out";
         target = "/nix/store";
       }
-      { # Another quick hack: the kernel needs a systemConfig
-        # parameter in menu.lst, but the system config depends on
-        # menu.lst.  Break the cyclic dependency by having a /system
-        # symlink on the CD, and having menu.lst refer to /system.
-        source = pkgs.runCommand "system" {}
-          "ln -s ${config.system.build.toplevel} $out";
-        target = "/system";
-      }
-      { # Idem for the stage-2 init script.
-        source = pkgs.runCommand "system" {}
-          "ln -s ${config.system.build.bootStage2} $out";
-        target = "/init";
-      }
     ];
 
   # The Grub menu.
@@ -187,7 +185,7 @@ in
       }
     
       menuentry "NixOS Installer / Rescue" {
-        linux /boot/vmlinuz init=/init systemConfig=/system ${toString config.boot.kernelParams}
+        linux /boot/vmlinuz init=${config.system.build.bootStage2} systemConfig=${config.system.build.toplevel} ${toString config.boot.kernelParams}
         initrd /boot/initrd
       }
     '';
-- 
GitLab


From 1affc9168e66ca53c590529597934c1217a908cb Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sun, 15 Nov 2009 12:48:42 +0000
Subject: [PATCH 2011/5331] * Move power management configuration into a
 separate module from   the acpid service. * Add a pm-utils hook to allow
 commands to be executed when the system   suspends/resumes etc.

svn path=/nixos/branches/upstart-0.6/; revision=18353
---
 modules/config/power-management.nix | 63 +++++++++++++++++++++++++++++
 modules/module-list.nix             |  1 +
 modules/services/hardware/acpid.nix |  6 +--
 modules/services/hardware/hal.nix   |  9 ++---
 4 files changed, 71 insertions(+), 8 deletions(-)
 create mode 100644 modules/config/power-management.nix

diff --git a/modules/config/power-management.nix b/modules/config/power-management.nix
new file mode 100644
index 00000000000..a094caae0e0
--- /dev/null
+++ b/modules/config/power-management.nix
@@ -0,0 +1,63 @@
+{ config, pkgs, ... }:
+
+with pkgs.lib;
+
+let
+
+  cfg = config.powerManagement;
+
+  sleepHook = pkgs.writeScript "sleep-hook.sh"
+    ''
+      #! ${pkgs.stdenv.shell}
+      action="$1"
+      if [ "$action" = "resume" ]; then
+          ${cfg.resumeCommands}        
+      fi
+    '';
+
+in
+
+{
+
+  ###### interface
+
+  options = {
+  
+    powerManagement = {
+
+      enable = mkOption {
+        default = false;
+        description =
+          ''
+            Whether to enable power management.  This includes support
+            for suspend-to-RAM and powersave features on laptops.
+          '';
+      };
+
+      resumeCommands = mkOption {
+        default = "";
+        description = "Commands executed after the system resumes from suspend-to-RAM.";
+      };
+      
+    };
+    
+  };
+  
+
+  ###### implementation
+
+  config = mkIf cfg.enable {
+
+    # Enable the ACPI daemon.  Not sure whether this is essential.
+    services.acpid.enable = true;
+
+    environment.systemPackages = [ pkgs.pmutils ];
+
+    environment.etc = singleton
+      { source = sleepHook;
+        target = "pm/sleep.d/00sleep-hook";
+      };
+    
+  };
+
+}
diff --git a/modules/module-list.nix b/modules/module-list.nix
index b69012f07e4..e3300242912 100644
--- a/modules/module-list.nix
+++ b/modules/module-list.nix
@@ -5,6 +5,7 @@
   ./config/networking.nix
   ./config/no-x-libs.nix
   ./config/nsswitch.nix
+  ./config/power-management.nix
   ./config/system-path.nix
   ./config/timezone.nix
   ./config/unix-odbc-drivers.nix
diff --git a/modules/services/hardware/acpid.nix b/modules/services/hardware/acpid.nix
index 88bfc4e7258..e9fd8e46dc9 100644
--- a/modules/services/hardware/acpid.nix
+++ b/modules/services/hardware/acpid.nix
@@ -60,11 +60,11 @@ in
 
   options = {
   
-    powerManagement = {
+    services.acpid = {
 
       enable = mkOption {
         default = false;
-        description = "Whether to enable power management (ACPI daemon)";
+        description = "Whether to enable the ACPI daemon.";
       };
       
     };
@@ -74,7 +74,7 @@ in
 
   ###### implementation
 
-  config = mkIf config.powerManagement.enable {
+  config = mkIf config.services.acpid.enable {
 
     jobs.acpid =
       { description = "ACPI daemon";
diff --git a/modules/services/hardware/hal.nix b/modules/services/hardware/hal.nix
index 6c033256633..25a24ce5e34 100644
--- a/modules/services/hardware/hal.nix
+++ b/modules/services/hardware/hal.nix
@@ -48,10 +48,9 @@ in
   
   config = mkIf cfg.enable {
 
-    # !!! move pmutils somewhere else
-    environment.systemPackages = [hal pkgs.pmutils];
+    environment.systemPackages = [ hal ];
 
-    services.hal.packages = [hal pkgs.hal_info];
+    services.hal.packages = [ hal pkgs.hal_info ];
 
     users.extraUsers = singleton
       { name = "haldaemon";
@@ -67,7 +66,7 @@ in
     jobs.hal =
       { description = "HAL daemon";
         
-        startOn = "started dbus" + optionalString config.powerManagement.enable " and started acpid";
+        startOn = "started dbus" + optionalString config.services.acpid.enable " and started acpid";
 
         environment =
           { # !!! HACK? These environment variables manipulated inside
@@ -113,4 +112,4 @@ in
     
   };
 
-}
\ No newline at end of file
+}
-- 
GitLab


From 9174b4ab421029927fef7febc0645480c10748fa Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sun, 15 Nov 2009 12:56:40 +0000
Subject: [PATCH 2012/5331] * Provide a convience option for commands that must
 be executed both   when the system boots and when it resumes from suspend.

svn path=/nixos/branches/upstart-0.6/; revision=18354
---
 modules/config/power-management.nix | 14 +++++++++++++-
 modules/system/boot/stage-2.nix     |  6 +++++-
 2 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/modules/config/power-management.nix b/modules/config/power-management.nix
index a094caae0e0..dd241e4e815 100644
--- a/modules/config/power-management.nix
+++ b/modules/config/power-management.nix
@@ -11,7 +11,8 @@ let
       #! ${pkgs.stdenv.shell}
       action="$1"
       if [ "$action" = "resume" ]; then
-          ${cfg.resumeCommands}        
+          ${cfg.resumeCommands}
+          ${cfg.powerUpCommands}
       fi
     '';
 
@@ -39,6 +40,17 @@ in
         description = "Commands executed after the system resumes from suspend-to-RAM.";
       };
       
+      powerUpCommands = mkOption {
+        default = "";
+        example = "${pkgs.hdparm}/sbin/hdparm -B 255 /dev/sda";
+        description =
+          ''
+            Commands executed when the machine powers up.  That is,
+            they're executed both when the system first boots and when
+            it resumes from suspend or hibernation.
+          '';
+      };
+      
     };
     
   };
diff --git a/modules/system/boot/stage-2.nix b/modules/system/boot/stage-2.nix
index b19dbc39183..5c3c3560be3 100644
--- a/modules/system/boot/stage-2.nix
+++ b/modules/system/boot/stage-2.nix
@@ -29,7 +29,11 @@ let
         utillinux
         udev
       ];
-    postBootCommands = writeText "local-cmds" config.boot.postBootCommands;
+    postBootCommands = writeText "local-cmds"
+      ''
+        ${config.boot.postBootCommands}
+        ${config.powerManagement.powerUpCommands}
+      '';
   };
   
 in
-- 
GitLab


From 56d817b0b0f198d8102736d511593d42750fd014 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sun, 15 Nov 2009 20:38:19 +0000
Subject: [PATCH 2013/5331] * X server: remove the udev hack.

svn path=/nixos/branches/upstart-0.6/; revision=18358
---
 modules/services/x11/xserver.nix | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

diff --git a/modules/services/x11/xserver.nix b/modules/services/x11/xserver.nix
index be0fb3bcecf..ea6f0f8cf96 100644
--- a/modules/services/x11/xserver.nix
+++ b/modules/services/x11/xserver.nix
@@ -363,7 +363,7 @@ in
       optional (elem "virtualbox" driverNames) kernelPackages.virtualboxGuestAdditions;
 
     jobs.xserver =
-      { startOn = if cfg.autorun then "started hal" else "";
+      { startOn = if cfg.autorun then "started udev and started hal" else "";
  
         environment =
           { FONTCONFIG_FILE = "/etc/fonts/fonts.conf"; # !!! cleanup
@@ -379,14 +379,6 @@ in
 
         preStart =
           ''
-            # Ugly hack: wait until udev has started since the X server
-            # needs various devices.  This would more properly be
-            # expressed as an Upstart dependency, but AFAIK in "start
-            # on" we can't express a logical AND.
-            while ! initctl status udev 2>&1 | grep -q running; do
-                sleep 1
-            done
-        
             rm -f /var/run/opengl-driver
             ${# !!! The OpenGL driver depends on what's detected at runtime.
               if elem "nvidia" driverNames then ''
-- 
GitLab


From 0755e228bfee452957e4c89ef86e47ea1187ecd3 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sun, 15 Nov 2009 20:40:07 +0000
Subject: [PATCH 2014/5331] * Since "initctl stop" is now synchronous, the
 sleep is no longer   needed.

svn path=/nixos/branches/upstart-0.6/; revision=18359
---
 modules/services/networking/ifplugd.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/modules/services/networking/ifplugd.nix b/modules/services/networking/ifplugd.nix
index f1510b1aa4b..6ec71849ca3 100644
--- a/modules/services/networking/ifplugd.nix
+++ b/modules/services/networking/ifplugd.nix
@@ -16,7 +16,6 @@ let
       #! ${pkgs.stdenv.shell}
       if test "$2" = up; then
         initctl stop dhclient
-        sleep 1
         initctl start dhclient
       fi
     '';
-- 
GitLab


From e9b2ef9fb7ba4582e7a51d2022e5fc30720f8962 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sun, 15 Nov 2009 20:40:41 +0000
Subject: [PATCH 2015/5331] * Restart wpa_supplicant and dhclient on resume.

svn path=/nixos/branches/upstart-0.6/; revision=18360
---
 modules/services/networking/dhclient.nix | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/modules/services/networking/dhclient.nix b/modules/services/networking/dhclient.nix
index 600b7196aa4..a714562444e 100644
--- a/modules/services/networking/dhclient.nix
+++ b/modules/services/networking/dhclient.nix
@@ -103,6 +103,22 @@ in
         }
       ];
 
+    powerManagement.resumeCommands =
+      ''
+        export PATH=${config.system.build.upstart}/sbin:$PATH
+      
+        restart() {
+            local job="$1"
+            if initctl status "$job" 2> /dev/null | grep -q 'running'; then
+                initctl stop "$job"
+                initctl start "$job"
+            fi
+        }
+
+        restart wpa_supplicant      
+        restart dhclient
+      '';
+
   };  
   
 }
-- 
GitLab


From f9958cbb446a54e63b68775d270ad68c4daca11a Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Tue, 17 Nov 2009 09:00:49 +0000
Subject: [PATCH 2016/5331] Update kernel version for fresh-kernel

svn path=/nixos/trunk/; revision=18379
---
 .../installer/cd-dvd/installation-cd-minimal-fresh-kernel.nix | 4 ++--
 release.nix                                                   | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/modules/installer/cd-dvd/installation-cd-minimal-fresh-kernel.nix b/modules/installer/cd-dvd/installation-cd-minimal-fresh-kernel.nix
index 70e15fce39f..0bdd6ebdb34 100644
--- a/modules/installer/cd-dvd/installation-cd-minimal-fresh-kernel.nix
+++ b/modules/installer/cd-dvd/installation-cd-minimal-fresh-kernel.nix
@@ -20,8 +20,8 @@ rec {
   # Most users will download it anyway
   security.sudo.enable = true;
 
-  # Use Linux 2.6.31-zen2 (with aufs2).
-  boot.kernelPackages = pkgs.kernelPackages_2_6_31_zen2;
+  # Use Linux 2.6.31-zen (with aufs2).
+  boot.kernelPackages = pkgs.kernelPackages_2_6_31_zen;
 
   # We need squashfs and aufs. Zen Linux Kernel contains kernel side.
   boot.initrd.extraUtilsCommands = ''
diff --git a/release.nix b/release.nix
index 26708ed3e73..8d00c826806 100644
--- a/release.nix
+++ b/release.nix
@@ -91,7 +91,7 @@ let
 
     iso_minimal_fresh_kernel = makeIso {
       module = ./modules/installer/cd-dvd/installation-cd-minimal-fresh-kernel.nix;
-      description = "minimal with 2.6.31-zen2-branch";
+      description = "minimal with 2.6.31-zen-branch";
       maintainers = ["raskin"];
     };
 
-- 
GitLab


From 1a05efa66a7d891006225cc2e107e43272d20ecd Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Wed, 18 Nov 2009 08:39:10 +0000
Subject: [PATCH 2017/5331] Adding Monit - one more service to watch system..

svn path=/nixos/trunk/; revision=18399
---
 modules/module-list.nix               |  1 +
 modules/services/monitoring/monit.nix | 51 +++++++++++++++++++++++++++
 2 files changed, 52 insertions(+)
 create mode 100644 modules/services/monitoring/monit.nix

diff --git a/modules/module-list.nix b/modules/module-list.nix
index a25857f2a9a..c9b414ca420 100644
--- a/modules/module-list.nix
+++ b/modules/module-list.nix
@@ -56,6 +56,7 @@
   ./services/misc/nixos-manual.nix
   ./services/misc/rogue.nix
   ./services/misc/synergy.nix
+  ./services/monitoring/monit.nix
   ./services/monitoring/nagios/default.nix
   ./services/monitoring/zabbix-agent.nix
   ./services/monitoring/zabbix-server.nix
diff --git a/modules/services/monitoring/monit.nix b/modules/services/monitoring/monit.nix
new file mode 100644
index 00000000000..216c57411af
--- /dev/null
+++ b/modules/services/monitoring/monit.nix
@@ -0,0 +1,51 @@
+# Monit system watcher
+# http://mmonit.org/monit/
+
+{config, pkgs, ...}: 
+
+let inherit (pkgs.lib) mkOption;
+in
+
+{
+  options = {
+    services.monit = {
+      enable = mkOption {
+        default = false;
+        description = ''
+          Whether to run Monit system watcher.
+        '';
+      };
+      config = mkOption {
+        default = "";
+        description = "monit.conf content";
+      };
+      startOn = mkOption {
+        default = "networking/started";
+        description = "What Monit supposes to be already present";
+      };
+    };
+  };
+  
+  config = {
+    environment.etc = [
+      {
+        source = pkgs.writeTextFile {
+          name = "monit.conf";
+          text = config.services.monit.config;
+        };
+        target = "monit.conf";
+        mode = "0400";
+      }
+    ];
+    jobs.monit = {
+      description = "Monit system watcher";
+      
+      startOn = config.services.monit.startOn;
+      stopOn = "shutdown";
+
+      exec = "${pkgs.monit}/bin/monit -I -c /etc/monit.conf";
+
+      respawn = true;
+    };
+  };
+}
-- 
GitLab


From a94da973541e273bcd69e58eca28cd51978ddc73 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Wed, 18 Nov 2009 09:29:43 +0000
Subject: [PATCH 2018/5331] Make monit actually switchable off

svn path=/nixos/trunk/; revision=18401
---
 modules/services/monitoring/monit.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/services/monitoring/monit.nix b/modules/services/monitoring/monit.nix
index 216c57411af..118b329afc5 100644
--- a/modules/services/monitoring/monit.nix
+++ b/modules/services/monitoring/monit.nix
@@ -3,7 +3,7 @@
 
 {config, pkgs, ...}: 
 
-let inherit (pkgs.lib) mkOption;
+let inherit (pkgs.lib) mkOption mkIf;
 in
 
 {
@@ -37,7 +37,7 @@ in
         mode = "0400";
       }
     ];
-    jobs.monit = {
+    jobs.monit = mkIf config.services.monit.enable {
       description = "Monit system watcher";
       
       startOn = config.services.monit.startOn;
-- 
GitLab


From ddc5a7d7c5d0009420a35a97e96c7236e92a4897 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Wed, 18 Nov 2009 09:30:38 +0000
Subject: [PATCH 2019/5331] Oops, placed mkIf in the wrong place. Fixing

svn path=/nixos/trunk/; revision=18402
---
 modules/services/monitoring/monit.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/services/monitoring/monit.nix b/modules/services/monitoring/monit.nix
index 118b329afc5..e51e6d1872a 100644
--- a/modules/services/monitoring/monit.nix
+++ b/modules/services/monitoring/monit.nix
@@ -26,7 +26,7 @@ in
     };
   };
   
-  config = {
+  config = mkIf config.services.monit.enable {
     environment.etc = [
       {
         source = pkgs.writeTextFile {
@@ -37,7 +37,7 @@ in
         mode = "0400";
       }
     ];
-    jobs.monit = mkIf config.services.monit.enable {
+    jobs.monit = {
       description = "Monit system watcher";
       
       startOn = config.services.monit.startOn;
-- 
GitLab


From 58b3476dfc820646bc759c2ae40509e02dbc7202 Mon Sep 17 00:00:00 2001
From: Marco Maggesi <maggesi@math.unifi.it>
Date: Wed, 18 Nov 2009 13:28:16 +0000
Subject: [PATCH 2020/5331] Automatic download of CellServDB for OpenAFS
 client.

svn path=/nixos/trunk/; revision=18417
---
 .../openafs-client/CellServDB                 | 656 ------------------
 .../openafs-client/default.nix                |   8 +-
 2 files changed, 7 insertions(+), 657 deletions(-)
 delete mode 100644 modules/services/network-filesystems/openafs-client/CellServDB

diff --git a/modules/services/network-filesystems/openafs-client/CellServDB b/modules/services/network-filesystems/openafs-client/CellServDB
deleted file mode 100644
index 1a4b03b05d4..00000000000
--- a/modules/services/network-filesystems/openafs-client/CellServDB
+++ /dev/null
@@ -1,656 +0,0 @@
->grand.central.org      #GCO Public CellServDB 29 Jun 2009
-18.9.48.14                      #grand.mit.edu
-128.2.203.61                    #penn.central.org
-130.237.48.87                   #andrew.e.kth.se
->wu-wien.ac.at          #University of Economics, Vienna, Austria
-137.208.3.33                    #goya.wu-wien.ac.at
-137.208.7.57                    #caravaggio.wu-wien.ac.at
-137.208.127.57                  #vermeer.wu-wien.ac.at
->hephy.at               #hephy-vienna
-193.170.243.10                  #mowgli.oeaw.ac.at
-193.170.243.12                  #baloo.oeaw.ac.at
-193.170.243.14                  #akela.oeaw.ac.at
->cgv.tugraz.at          #CGV cell
-129.27.218.30                   #phobos.cgv.tugraz.at
-129.27.218.31                   #deimos.cgv.tugraz.at
-129.27.218.32                   #trinculo.cgv.tugraz.at
->itp.tugraz.at          #Institute of Theoretical and Computational Physics, TU Graz, Aus
-129.27.161.7                    #faepafs1.tu-graz.ac.at
-129.27.161.15                   #faepafs2.tu-graz.ac.at
-129.27.161.114                  #faepafs3.tu-graz.ac.at
->sums.math.mcgill.ca    #Society of Undergraduate Mathematics Students of McGill Universi
-132.216.24.122                  #germain.sums.math.mcgill.ca
-132.216.24.125                  #turing.sums.math.mcgill.ca
->cern.ch                #European Laboratory for Particle Physics, Geneva
-137.138.128.148                 #afsdb1.cern.ch
-137.138.246.50                  #afsdb3.cern.ch
-137.138.246.51                  #afsdb2.cern.ch
->ams.cern.ch            #AMS Experiment
-137.138.188.185                 #ams.cern.ch
-137.138.199.58                  #pcamsf4.cern.ch
->epfl.ch                #Swiss Federal Institute of Technology at Lausanne
-128.178.109.111                 #kd1.epfl.ch
-128.178.109.112                 #kd2.epfl.ch
-128.178.109.113                 #kd3.epfl.ch
->ethz.ch                #Swiss Federal Inst. of Tech. - Zurich, Switzerland
-82.130.118.32                   #afs-db-1.ethz.ch
->psi.ch                 #Paul Scherrer Institut - Villigen, Switzerland
-129.129.190.140                 #afs00.psi.ch
-129.129.190.141                 #afs01.psi.ch
-129.129.190.142                 #afs02.psi.ch
->extundo.com            #Simon Josefsson's cell
-195.42.214.241                  #slipsten.extundo.com
->freedaemon.com         #Free Daemon Consulting, Oklahoma City, OK, USA
-66.210.104.254                  #afs0.freedaemon.com
->membrain.com           #membrain.com
-66.93.118.125                   #stormy
-130.85.24.11                    #weasel
-130.85.24.13                    #straykitten
->setfilepointer.com     #SetFilePointer.com
-63.224.10.2                     #hamlet.SetFilePointer.com
-63.224.10.4                     #troilus.SetFilePointer.com
->sodre.cx               #Sodre.cx
-128.8.140.165                   #greed.sodre.cx
->ruk.cuni.cz            #Charles University Computer Centre, Prague, CR
-195.113.0.36                    #asterix.ruk.cuni.cz
-195.113.0.37                    #obelix.ruk.cuni.cz
-195.113.0.40                    #sal.ruk.cuni.cz
->ics.muni.cz            #Masaryk university
-147.251.3.11                    #grond.ics.muni.cz
-147.251.3.15                    #nimloth.ics.muni.cz
-147.251.3.19                    #sirion.ics.muni.cz
->zcu.cz                 #University of West Bohemia, Czech Republic
-147.228.10.18                   #sauron.zcu.cz
-147.228.52.10                   #oknos.zcu.cz
-147.228.52.17                   #nic.zcu.cz
->desy.de                #Deutsches Elektronen-Synchrotron
-131.169.2.19                    #afsdb2.desy.de
-131.169.2.20                    #afsdb3.desy.de
-131.169.244.60                  #solar00.desy.de
->gppc.de                #GPP Chemnitz mbH
-213.187.92.33                   #gpp1.gppc.de
-213.187.92.34                   #paulchen.gppc.de
-213.187.92.35                   #lotus.gppc.de
->cms.hu-berlin.de       #Humboldt University Berlin
-141.20.1.65                     #commodus.cms.hu-berlin.de
-141.20.1.66                     #faustinus.cms.hu-berlin.de
-141.20.1.67                     #marcellus.cms.hu-berlin.de
->ifh.de                 #DESY Zeuthen
-141.34.22.10                    #romulus.ifh.de
-141.34.22.11                    #remus.ifh.de
-141.34.22.29                    #hekate.ifh.de
->lrz-muenchen.de        #Leibniz Computing Centre, Germany
-129.187.10.36                   #afs1.lrz-muenchen.de
-129.187.10.56                   #afs3.lrz-muenchen.de
-129.187.10.57                   #afs2.lrz-muenchen.de
->ipp-garching.mpg.de    #Institut fuer Plasmaphysik
-130.183.9.5                     #afs-db1.rzg.mpg.de
-130.183.100.10                  #afs-db2.aug.ipp-garching.mpg.de
-130.183.100.23                  #afs-db3.aug.ipp-garching.mpg.de
->mpe.mpg.de             #MPE cell
-130.183.130.7                   #irafs1.mpe-garching.mpg.de
-130.183.134.20                  #irafs2.mpe-garching.mpg.de
->i1.informatik.rwth-aachen.de #Informatik I, RWTH Aachen
-137.226.244.79                  #remus.informatik.rwth-aachen.de
->combi.tfh-wildau.de    #Philips Research Lab
-194.95.50.106                   #joda13.combi.tfh-wildau.de
->tu-bs.de               #Technical University of Braunschweig, Germany
-134.169.1.1                     #rzafs1.rz.tu-bs.de
-134.169.1.5                     #rzafs2.rz.tu-bs.de
-134.169.1.6                     #rzafs3.rz.tu-bs.de
->tu-chemnitz.de         #Technische Universitaet Chemnitz, Germany
-134.109.2.1                     #zuse.hrz.tu-chemnitz.de
-134.109.2.15                    #phoenix.hrz.tu-chemnitz.de
-134.109.200.7                   #aetius.hrz.tu-chemnitz.de
->e18.ph.tum.de          #Experimental Physics, TU Munich, Germany
-129.187.154.223                 #hamlet.e18.physik.tu-muenchen.de
->atlass01.physik.uni-bonn.de #Bonn ATLAS
-131.220.165.43                  #atlass01.physik.uni-bonn.de
->uni-freiburg.de        #Albert-Ludwigs-Universitat Freiburg
-132.230.6.237                   #sv8.ruf.uni-freiburg.de
-132.230.6.239                   #sv10.ruf.uni-freiburg.de
->physik.uni-freiburg.de #Institute of Physics, University Freiburg, Germany
-132.230.6.234                   #afs1.ruf.uni-freiburg.de
-132.230.6.235                   #afs2.ruf.uni-freiburg.de
-132.230.77.16                   #hepafs.physik.uni-freiburg.de
->physnet.uni-hamburg.de #PHYSnet-Rechenzentrum university of hamburg
-134.100.106.44                  #afs-core.physnet.uni-hamburg.de
-134.100.106.45                  #afs-core2.physnet.uni-hamburg.de
-134.100.106.47                  #afs-core3.physnet.uni-hamburg.de
->mathi.uni-heidelberg.de #Uni Heidelberg (Mathematisches Institut)
-129.206.26.241                  #hactar.mathi.uni-heidelberg.de
->urz.uni-heidelberg.de  #Uni Heidelberg (Rechenzentrum)
-129.206.119.10                  #afsdb.urz.uni-heidelberg.de
-129.206.119.16                  #afsdb1.urz.uni-heidelberg.de
-129.206.119.17                  #afsdb2.urz.uni-heidelberg.de
->ziti.uni-heidelberg.de #Institute of Computer Science at the University of Heidelberg
-147.142.42.246                  #mp-sun.ziti.uni-heidelberg.de
->uni-hohenheim.de       #University of Hohenheim
-144.41.2.2                      #rs13.serv.uni-hohenheim.de
-144.41.2.3                      #rs14.serv.uni-hohenheim.de
-144.41.2.4                      #rs15.serv.uni-hohenheim.de
->rz.uni-jena.de         #Rechenzentrum University of Jena, Germany
-141.35.2.180                    #afs00.rz.uni-jena.de
-141.35.2.181                    #afs01.rz.uni-jena.de
-141.35.2.182                    #afs02.rz.uni-jena.de
->impetus.uni-koeln.de   #Univ. of Cologne - Geophysics/Meteorology Inst.
-134.95.80.39                    #forano.meteo.uni-koeln.de
->meteo.uni-koeln.de     #Univ. of Cologne - Inst. for Geophysics & Meteorology
-134.95.144.22                   #afs1.meteo.uni-koeln.de
-134.95.144.24                   #afs2.meteo.uni-koeln.de
->rrz.uni-koeln.de       #University of Cologne - Reg Comp Center
-134.95.19.3                     #afsdb1.rrz.uni-koeln.de
-134.95.19.4                     #afsdb2.rrz.uni-koeln.de
-134.95.19.10                    #lyra.rrz.uni-koeln.de
-134.95.67.97                    #afs.thp.uni-koeln.de
-134.95.112.8                    #ladon.rrz.uni-koeln.de
->physik.uni-mainz.de    #institute of physics, university Mainz, Germany
-134.93.130.93                   #hardy.physik.uni-mainz.de
->uni-mannheim.de        #Uni Mannheim (Rechenzentrum)
-134.155.97.204                  #afsdb1.uni-mannheim.de
-134.155.97.205                  #afsdb2.uni-mannheim.de
-134.155.97.206                  #afsdb3.uni-mannheim.de
->uni-paderborn.de       #University of Paderborn, Germany
-131.234.137.10                  #afsdb1.uni-paderborn.de
-131.234.137.11                  #afsdb2.uni-paderborn.de
-131.234.137.12                  #afsdb3.uni-paderborn.de
->physik.uni-wuppertal.de #Physics department of Bergische Universit�t Wuppertal
-132.195.104.3                   #afs1.physik.uni-wuppertal.de
-132.195.104.230                 #afs2.physik.uni-wuppertal.de
->s-et.aau.dk            #Aalborg Univ., The Student Society, Denmark
-130.225.196.22                  #afs.s-et.aau.dk
->ies.auc.dk             #Aalborg Univ., Inst. of Electronic Systems, Denmark
-130.225.51.73                   #afsdb1.kom.auc.dk
-130.225.51.74                   #afsdb2.kom.auc.dk
-130.225.51.85                   #afsdb3.kom.auc.dk
->asu.edu                #Arizona State University
-129.219.10.69                   #authen2.asu.edu
-129.219.10.70                   #authen1.asu.edu
-129.219.10.72                   #authen3.asu.edu
-129.219.100.16                  #authen4.asu.edu
->mars.asu.edu           #Mars Space Flight Facility - ASU Mars Research
-149.169.146.57                  #kdc1.mars.asu.edu
-149.169.146.58                  #kdc2.mars.asu.edu
-149.169.146.59                  #kdc3.mars.asu.edu
->eecs.berkeley.edu      #University of California, Berkeley - EECS Dept.
-128.32.139.34                   #greed.eecs.berkeley.edu
-128.32.139.35                   #gluttony.eecs.berkeley.edu
-169.229.60.112                  #envy.eecs.berkeley.edu
->hep.caltech.edu        #Caltech High Energy Physics
-131.215.116.20                  #afs.hep.caltech.edu
->ugcs.caltech.edu       #Caltech UGCS lab
-131.215.176.65                  #afs-c.ugcs.caltech.edu
-131.215.176.67                  #afs-a.ugcs.caltech.edu
-131.215.176.68                  #afs-b.ugcs.caltech.edu
->clarkson.edu           #Clarkson University, Potsdam, New York USA
-128.153.1.111                   #arthur.clarkson.edu
-128.153.9.111                   #lancelot.clarkson.edu
-128.153.17.111                  #uther.clarkson.edu
->andrew.cmu.edu         #Carnegie Mellon University - Computing Services Cell
-128.2.10.2                      #afsdb-01.andrew.cmu.edu
-128.2.10.7                      #afsdb-02.andrew.cmu.edu
-128.2.10.11                     #afsdb-03.andrew.cmu.edu
->mw.andrew.cmu.edu      #Carnegie Mellon University - Middleware Test Cell
-128.2.234.24                    #null.andrew.cmu.edu
-128.2.234.170                   #mw-mgr.andrew.cmu.edu
->club.cc.cmu.edu        #Carnegie Mellon University Computer Club
-128.2.204.149                   #barium.club.cc.cmu.edu
-128.237.157.11                  #sodium.club.cc.cmu.edu
-128.237.157.13                  #potassium.club.cc.cmu.edu
->chem.cmu.edu           #Carnegie Mellon University - Chemistry Dept.
-128.2.40.134                    #afs.chem.cmu.edu
-128.2.40.140                    #afs2.chem.cmu.edu
->cs.cmu.edu             #Carnegie Mellon University - School of Comp. Sci.
-128.2.184.215                   #pumpkin.srv.cs.cmu.edu
-128.2.200.97                    #watermelon.srv.cs.cmu.edu
-128.2.201.46                    #strawberry.srv.cs.cmu.edu
-128.2.201.48                    #cherry.srv.cs.cmu.edu
->ece.cmu.edu            #Carnegie Mellon University - Elec. Comp. Eng. Dept.
-128.2.129.7                     #porok.ece.cmu.edu
-128.2.129.8                     #vicio.ece.cmu.edu
-128.2.129.9                     #e-xing.ece.cmu.edu
->scotch.ece.cmu.edu     #CMU ECE CALCM research group
-128.2.134.82                    #lagavulin.ece.cmu.edu
->qatar.cmu.edu          #Carnegie Mellon University - Qatar
-86.36.46.6                      #afs1.qatar.cmu.edu
-86.36.46.7                      #afs2.qatar.cmu.edu
->sbp.ri.cmu.edu         #Carnegie Mellon University - Sensor Based Planning Lab
-128.2.179.12                    #nihao.sbp.ri.cmu.edu
-128.2.179.113                   #youtheman.sbp.ri.cmu.edu
->cnf.cornell.edu        #CNF
-128.253.198.9                   #hole.cnf.cornell.edu
-128.253.198.27                  #smoke.cnf.cornell.edu
-128.253.198.231                 #mist.cnf.cornell.edu
->math.cornell.edu       #Cornell Math Dept
-128.84.234.12                   #pooh.math.cornell.edu
-128.84.234.16                   #bernoulli.math.cornell.edu
-128.84.234.162                  #dyno.math.cornell.edu
->msc.cornell.edu        #Cornell University Materials Science Center
-128.84.231.242                  #miranda.ccmr.cornell.edu
-128.84.241.35                   #co.ccmr.cornell.edu
-128.84.249.78                   #dax.ccmr.cornell.edu
->dbic.dartmouth.edu     #Dartmouth Brain Imaging Center
-129.170.30.143                  #dbicafs1.dartmouth.edu
-129.170.30.144                  #dbicafs2.dartmouth.edu
-129.170.30.145                  #dbicafs3.dartmouth.edu
->northstar.dartmouth.edu #Dartmouth College Research Computing
-129.170.16.22                   #halley.dartmouth.edu
-129.170.16.26                   #andromeda.dartmouth.edu
-129.170.16.43                   #cygnusx1.dartmouth.edu
->cs.hm.edu              #Department Computer Science Munich University Of Applied Science
-129.187.208.2                   #srv1.informatik.fh-muenchen.de
->eecs.harvard.edu       #Harvard - EECS
-140.247.60.64                   #lefkada.eecs.harvard.edu
-140.247.60.83                   #corfu.eecs.harvard.edu
->iastate.edu            #Iowa State University
-129.186.1.243                   #afsdb-1.iastate.edu
-129.186.6.243                   #afsdb-2.iastate.edu
-129.186.142.243                 #afsdb-3.iastate.edu
->athena.mit.edu         #MIT/Athena cell
-18.7.1.66                       #paris.mit.edu.
-18.9.48.11                      #castor.mit.edu
-18.9.48.12                      #pollux.mit.edu.
->dev.mit.edu            #MIT/IS Development cell
-18.9.48.13                      #saw.mit.edu.
-18.9.60.110                     #hammer.mit.edu.
-18.9.60.111                     #screw.mit.edu.
->net.mit.edu            #MIT/Network Group cell
-18.7.7.73                       #gracie.mit.edu
-18.7.21.95                      #george.mit.edu
->numenor.mit.edu        #Project Numenor
-18.243.2.49                     #numenor.mit.edu
->sipb.mit.edu           #MIT/SIPB cell
-18.181.0.19                     #reynelda.mit.edu
-18.181.0.22                     #rosebud.mit.edu
-18.181.0.23                     #ronald-ann.mit.edu
->soap.mit.edu           #MIT School Of Architecture & Planning
-18.89.1.204                     #CRYPT.MIT.EDU
-18.89.3.46                      #SOAP.MIT.EDU
-18.89.4.9                       #ARCH.MIT.EDU
->msu.edu                #Michigan State University Main Cell
-35.9.7.10                       #afsdb0.cl.msu.edu
->nd.edu                 #University of Notre Dame
-129.74.223.17                   #john.helios.nd.edu
-129.74.223.33                   #lizardo.helios.nd.edu
-129.74.223.65                   #buckaroo.helios.nd.edu
->crc.nd.edu             #University of Notre Dame - Center for Research Computing
-129.74.85.34                    #afsdb1.crc.nd.edu
-129.74.85.35                    #afsdb2.crc.nd.edu
-129.74.85.36                    #afsdb3.crc.nd.edu
->pitt.edu               #University of Pittsburgh
-136.142.8.15                    #afs09.srv.cis.pitt.edu
-136.142.8.20                    #afs10.srv.cis.pitt.edu
-136.142.8.21                    #afs11.srv.cis.pitt.edu
->cs.pitt.edu            #University of Pittsburgh - Computer Science
-130.49.220.11                   #afs01.cs.pitt.edu
-130.49.220.12                   #afs02.cs.pitt.edu
-130.49.220.13                   #afs03.cs.pitt.edu
->psc.edu                #PSC (Pittsburgh Supercomputing Center)
-128.182.59.182                  #shaggy.psc.edu
-128.182.66.184                  #velma.psc.edu
-128.182.66.185                  #daphne.psc.edu
->scoobydoo.psc.edu      #PSC Test Cell
-128.182.59.181                  #scooby.psc.edu
->cede.psu.edu           #Penn State - Center for Engr. Design & Entrepeneurship
-146.186.218.10                  #greenly.cede.psu.edu
-146.186.218.60                  #b50.cede.psu.edu
-146.186.218.246                 #stalin.cede.psu.edu
->rose-hulman.edu        #Rose-Hulman Institute of Technology
-137.112.7.11                    #afs1.rose-hulman.edu
-137.112.7.12                    #afs2.rose-hulman.edu
-137.112.7.13                    #afs3.rose-hulman.edu
->cs.rose-hulman.edu     #Rose-Hulman CS Department
-137.112.40.10                   #galaxy.cs.rose-hulman.edu
->rpi.edu                #Rensselaer Polytechnic Institute
-128.113.22.11                   #saul.server.rpi.edu
-128.113.22.12                   #joab.server.rpi.edu
-128.113.22.13                   #korah.server.rpi.edu
-128.113.22.14                   #achan.server.rpi.edu
->hep.sc.edu             #University of South Carolina, Dept. of Physics
-129.252.78.77                   #cpeven.physics.sc.edu
->cs.stanford.edu        #Stanford University Computer Science Department
-171.64.64.10                    #cs-afs-1.Stanford.EDU
-171.64.64.66                    #cs-afs-2.stanford.edu
-171.64.64.69                    #cs-afs-3.stanford.edu
->ir.stanford.edu        #Stanford University
-171.64.7.222                    #afsdb1.stanford.edu
-171.64.7.234                    #afsdb2.stanford.edu
-171.64.7.246                    #afsdb3.stanford.edu
->slac.stanford.edu      #Stanford Linear Accelerator Center
-134.79.18.25                    #afsdb1.slac.stanford.edu
-134.79.18.26                    #afsdb2.slac.stanford.edu
-134.79.18.27                    #afsdb3.slac.stanford.edu
->physics.ucsb.edu       #UC Santa Barbara, Physics Dept
-128.111.18.161                  #ledzeppelin.physics.ucsb.edu
->cats.ucsc.edu          #UC Santa Cruz, Comp and Tech Services, California U.S.A
-128.114.123.14                  #elan.ucsc.edu
-128.114.123.15                  #ichabod.ucsc.edu
-128.114.123.18                  #maneki.ucsc.edu
->acm.uiuc.edu           #ACM at the University of Illinois
-128.174.251.8                   #alnitak.acm.uiuc.edu
-128.174.251.9                   #alnilam.acm.uiuc.edu
-128.174.251.10                  #mintaka.acm.uiuc.edu
->illigal.uiuc.edu       #Illinois Genetic Algorithms Labaratory
-128.174.193.200                 #ial.illigal.uiuc.edu
-128.174.193.201                 #cac.illigal.uiuc.edu
-128.174.193.202                 #gcs.illigal.uiuc.edu
->ncsa.uiuc.edu          #University of Illinois
-141.142.3.5                     #congo.ncsa.uiuc.edu
-141.142.3.8                     #nile.ncsa.uiuc.edu
-141.142.3.9                     #kaskaskia.ncsa.uiuc.edu
->umbc.edu               #University of Maryland, Baltimore County
-130.85.24.23                    #db2.afs.umbc.edu
-130.85.24.87                    #db3.afs.umbc.edu
-130.85.24.101                   #db1.afs.umbc.edu
->glue.umd.edu           #University of Maryland - Project Glue
-128.8.70.11                     #olmec.umd.edu
-128.8.236.4                     #egypt.umd.edu
-128.8.236.230                   #babylon.umd.edu
->wam.umd.edu            #University of Maryland Network WAM Project
-128.8.70.9                      #csc-srv.wam.umd.edu
-128.8.236.5                     #avw-srv.wam.umd.edu
-128.8.236.231                   #ptx-srv.wam.umd.edu
->umich.edu              #University of Michigan - Campus
-141.211.1.32                    #fear.ifs.umich.edu
-141.211.1.33                    #surprise.ifs.umich.edu
-141.211.1.34                    #ruthless.ifs.umich.edu
->atlas.umich.edu        #ATLAS group cell in physics at University of Michigan
-141.211.43.102                  #linat02.grid.umich.edu
-141.211.43.103                  #linat03.grid.umich.edu
-141.211.43.104                  #linat04.grid.umich.edu
->citi.umich.edu         #Center for Information Technology Integration
-141.211.133.5                   #babylon.citi.umich.edu
->sph.umich.edu          #University of Michigan -- School of Public  Health
-141.211.51.137                  #afssph7.sph.umich.edu
-141.211.51.139                  #afssph0.sph.umich.edu
-141.211.51.142                  #afssph6.sph.umich.edu
->isis.unc.edu           #Univ. of NC at Chapel Hill - ITS
-152.2.1.5                       #db0.isis.unc.edu
-152.2.1.6                       #db1.isis.unc.edu
-152.2.1.7                       #db2.isis.unc.edu
->physics.unc.edu        #Univ. of NC at Chapel Hill, Dept. of Physics
-152.2.4.1                       #who.physics.unc.edu
-152.2.4.3                       #what.physics.unc.edu
-152.2.4.5                       #when.physics.unc.edu
->uncc.edu               #University of NC at Charlotte Mosaic AFS Cell
-152.15.10.70                    #as-sm1.uncc.edu
-152.15.93.186                   #as-ece1.uncc.edu
-152.15.181.175                  #as-me1.uncc.edu
->eng.utah.edu           #University of Utah - Engineering
-155.98.111.9                    #lenny.eng.utah.edu
-155.98.111.10                   #carl.eng.utah.edu
->cs.uwm.edu             #University of Wisconsin--Milwaukee
-129.89.38.124                   #solomons.cs.uwm.edu
->cs.wisc.edu            #Univ. of Wisconsin-Madison, Computer Sciences Dept.
-128.105.132.14                  #timon.cs.wisc.edu
-128.105.132.15                  #pumbaa.cs.wisc.edu
-128.105.132.16                  #zazu.cs.wisc.edu
->engr.wisc.edu          #University of Wisconsin-Madison, College of Engineering
-144.92.13.14                    #larry.cae.wisc.edu
-144.92.13.15                    #curly.cae.wisc.edu
-144.92.13.16                    #moe.cae.wisc.edu
->hep.wisc.edu           #University of Wisconsin -- High Energy Physics
-128.104.28.219                  #anise.hep.wisc.edu
-144.92.180.7                    #rosemary.hep.wisc.edu
-144.92.180.30                   #fennel.hep.wisc.edu
->physics.wisc.edu       #Univ. of Wisconsin-Madison, Physics Department
-128.104.160.13                  #kendra.physics.wisc.edu
-128.104.160.14                  #fray.physics.wisc.edu
-128.104.160.15                  #buffy.physics.wisc.edu
->ciemat.es              #Ciemat, Madrid, Spain
-130.206.11.42                   #afsdb1.ciemat.es
-130.206.11.217                  #afsdb2.ciemat.es
-130.206.11.247                  #afsdb3.ciemat.es
->ifca.unican.es         #Instituto de Fisica de Cantabria (IFCA), Santander, Spain
-193.144.209.20                  #gridwall.ifca.unican.es
->ific.uv.es             #Instituto de Fisica Corpuscular, Valencia, Spain
-147.156.163.11                  #alpha.ific.uv.es
->biocenter.helsinki.fi  #University of Helsinki, Institute of Biotechnology
-128.214.58.174                  #afsdb1.biocenter.helsinki.fi
-128.214.88.114                  #afsdb2.biocenter.helsinki.fi
->dapnia.saclay.cea.fr   #CEA DAPNIA
-132.166.32.7                    #dphrsg.saclay.cea.fr
-132.166.32.12                   #dphrsl.saclay.cea.fr
->in2p3.fr               #IN2P3 production cell
-134.158.104.11                  #ccafsdb01.in2p3.fr
-134.158.104.12                  #ccafsdb02.in2p3.fr
-134.158.232.11                  #ccafsdb1.in2p3.fr
-134.158.232.12                  #ccafsdb2.in2p3.fr
-134.158.232.13                  #ccafsdb3.in2p3.fr
->mcc.ac.gb              #University of Manchester
-130.88.203.41                   #nevis.mc.man.ac.uk
-130.88.203.144                  #eryri.mc.man.ac.uk
-130.88.203.145                  #scafell.mc.man.ac.uk
->anl.gov                #Argonne National Laboratory
-146.137.96.33                   #arteus.it.anl.gov
-146.137.162.88                  #agamemnon.it.anl.gov
-146.137.194.80                  #antenor.it.anl.gov
->rhic.bnl.gov           #Relativistic Heavy Ion Collider
-130.199.6.51                    #rafs03.rcf.bnl.gov
-130.199.6.52                    #rafs02.rcf.bnl.gov
-130.199.6.69                    #rafs01.rcf.bnl.gov
->usatlas.bnl.gov        #US Atlas Tier 1 Facility at BNL
-130.199.48.32                   #aafs01.usatlas.bnl.gov
-130.199.48.33                   #aafs02.usatlas.bnl.gov
-130.199.48.34                   #aafs03.usatlas.bnl.gov
->fnal.gov               #Fermi National Acclerator Laboratory
-131.225.68.1                    #fsus01.fnal.gov
-131.225.68.4                    #fsus03.fnal.gov
-131.225.68.14                   #fsus04.fnal.gov
->ic-afs.arc.nasa.gov    #Code IC, Ames Research Center
-128.102.105.62                  #udanax.arc.nasa.gov
->jpl.nasa.gov           #Jet Propulsion Laboratory
-137.78.160.21                   #afsdb08.jpl.nasa.gov
-137.78.160.22                   #afsdb09.jpl.nasa.gov
-137.78.160.23                   #afsdb10.jpl.nasa.gov
->nersc.gov              #National Energy Research Supercomputer Center
-128.55.128.250                  #mars.nersc.gov
-128.55.128.252                  #alfred.nersc.gov
-128.55.128.254                  #lurch.nersc.gov
->doe.atomki.hu          #Institute of Nuclear Research (MTA ATOMKI), Debrecen, Hungary
-193.6.179.31                    #afs.doe.atomki.hu
->bme.hu                 #Budapest University of Technology and Economics
-152.66.241.6                    #afs.iit.bme.hu
->kfki.hu                #Research Institute for Nuclear and Particle Physics - Budapest,H
-148.6.8.14                      #afs.kfki.hu
->caspur.it              #CASPUR Inter-University Computing Consortium, Rome
-193.204.5.45                    #pomodoro.caspur.it
-193.204.5.46                    #banana.caspur.it
-193.204.5.50                    #maslo.caspur.it
->enea.it                #ENEA New Tech. Energy & Environment Agency, Italy
-192.107.54.5                    #aixfs.frascati.enea.it
-192.107.54.11                   #rs2ced.frascati.enea.it
-192.107.54.12                   #43p.frascati.enea.it
->fusione.it             #Assoz. FUSIONE/Euratom, ENEA, Frascati-Italy
-192.107.90.2                    #fusafs1.frascati.enea.it
-192.107.90.3                    #fusafs2.frascati.enea.it
-192.107.90.4                    #fusafs3.frascati.enea.it
->icemb.it               #ICEMB, Universita' La Sapienza - Rome - Italy
-193.204.6.130                   #icembfs.caspur.it
->ictp.it                #The Abdus Salam International Centre for Theoretical Physics (IC
-140.105.34.7                    #afsdb1.ictp.it
-140.105.34.8                    #afsdb2.ictp.it
->infn.it                #Istituto Nazionale di Fisica Nucleare (INFN), Italia
-131.154.1.7                     #afscnaf.infn.it
-141.108.26.75                   #afsrm1.roma1.infn.it
-192.84.134.75                   #afsna.na.infn.it
->ba.infn.it             #INFN, Sezione di Bari
-193.206.185.235                 #baafsserver.ba.infn.it
-193.206.185.236                 #debsrv.ba.infn.it
->kloe.infn.it           #INFN, KLOE experiment at Laboratori di Frascati
-192.135.25.111                  #kloeafs1.lnf.infn.it
-192.135.25.112                  #kloeafs2.lnf.infn.it
->le.infn.it             #INFN, Sezione di Lecce
-192.84.152.40                   #afs01.le.infn.it
-192.84.152.148                  #afs02.le.infn.it
->lnf.infn.it            #INFN, Laboratori Nazionali di Frascati
-193.206.84.121                  #afs1.lnf.infn.it
-193.206.84.122                  #afs2.lnf.infn.it
-193.206.84.123                  #afs3.lnf.infn.it
->lngs.infn.it           #INFN, Laboratori Nazionali di Gran Sasso
-192.84.135.21                   #rsgs05.lngs.infn.it
->pi.infn.it             #INFN, Sezione di Pisa
-192.84.133.50                   #aix1.pi.infn.it
-212.189.152.6                   #afs1.pi.infn.it
-212.189.152.7                   #afs2.pi.infn.it
->roma3.infn.it          #Istituto Nazionale di Fisica Nucleare (INFN), Italia
-193.205.159.17                  #afsrm3.roma3.infn.it
->psm.it                 #Progetto San Marco, Universita' di Roma-1
-151.100.1.65                    #atlante.psm.uniroma1.it
->tgrid.it               #CASPUR-CILEA-CINECA Grid Cell
-193.204.5.33                    #cccgrid.caspur.it
->math.unifi.it          #math.unifi.it
-150.217.34.182                  #xeno.math.unifi.it
->ing.uniroma1.it        #Universita' La Sapienza, Fac. Ingeneria
-151.100.85.253                  #alfa.ing.uniroma1.it
->dia.uniroma3.it        #University Roma Tre - DIA
-193.204.161.79                  #plm.dia.uniroma3.it
-193.204.161.118                 #afs.dia.uniroma3.it
->vn.uniroma3.it         #University of Rome 3, Area Vasca Navale
-193.204.161.136                 #alfa.dia.uniroma3.it
-193.204.161.137                 #beta.dia.uniroma3.it
-193.204.161.138                 #gamma.dia.uniroma3.it
->italia                 #Italian public AFS cell
-193.204.5.9                     #afs.caspur.it
->cmf.nrl.navy.mil       #Naval Research Lab - CCS
-134.207.10.68                   #picard.cmf.nrl.navy.mil
-134.207.10.69                   #riker.cmf.nrl.navy.mil
-134.207.10.70                   #kirk.cmf.nrl.navy.mil
->lcp.nrl.navy.mil       #Naval Research Lab - Lab for Computational Physics
-132.250.114.2                   #afs1.lcp.nrl.navy.mil
-132.250.114.4                   #afs2.lcp.nrl.navy.mil
-132.250.114.6                   #afs3.lcp.nrl.navy.mil
->epitech.net            #EPITECH, France
-163.5.255.41                    #afs-db-1.epitech.net
-163.5.255.42                    #afs-db-2.epitech.net
->es.net                 #Energy Sciences Net
-198.128.3.21                    #fs1.es.net
-198.128.3.22                    #fs2.es.net
-198.128.3.23                    #fs3.es.net
->laroia.net             #Laroia Networks
-66.66.102.254                   #supercore.laroia.net
->sinenomine.net         #Sine Nomine Associates
-66.135.48.108                   #tx2srv03.sinenomine.net
-72.73.30.42                     #va.sinenomine.net
->slackers.net           #The Slackers' Network
-199.4.150.159                   #alexandria.slackers.net
->tproa.net              #The People's Republic of Ames
-204.11.35.83                    #service-3.tproa.net
-204.11.35.84                    #service-4.tproa.net
-204.11.35.85                    #service-5.tproa.net
->interdose.net          #Interdose Ltd. & Co. KG, Germany
-80.190.171.42                   #bfd9000.tow5.interdose.net
-80.190.171.43                   #bfd9001.tow5.interdose.net
->nikhef.nl              #The Dutch National Institute for High Energy Physics
-192.16.185.26                   #afs1.nikhef.nl
-192.16.185.27                   #afs2.nikhef.nl
->1ts.org                #1TS.ORG, Cambridge, MA
-69.25.196.51                    #pancake.1ts.org
->acm-csuf.org           #California State Univerisity Fullerton ACM
-137.151.29.193                  #afs1.acm-csuf.org
->adrake.org             #adrake.org
-128.2.98.241                    #afs.adrake.org
->bazquux.org            #Baz Quux Organization
-66.207.142.196                  #baxquux.org
->coed.org               #Adam Pennington's Cell
-66.93.61.184                    #vice1.coed.org
-128.237.157.35                  #vice3.coed.org
->dementia.org           #Dementia Unlimited
-128.2.13.209                    #dedlock.dementia.org
-128.2.235.26                    #meredith.dementia.org
->dsrw.org               #The DSRW
-65.103.82.83                    #straylight.dsrw.org
-65.103.82.84                    #chiba.dsrw.org
-65.103.82.85                    #freeside.dsrw.org
->hackish.org            #Hackish.org
-98.210.160.157                  #kurma.sys.hackish.org
->idahofuturetruck.org   #University of Idaho hybrid vehicle development
-12.18.238.210                   #dsle210.fsr.net
->mrow.org               #MROW.ORG and RITLUG Cell
-88.198.46.111                   #mrow.org
-129.21.205.119                  #mirror.rit.edu
->mrph.org               #Mrph
-66.207.133.1                    #sanber.mrph.org
-128.2.99.209                    #hernandarias.mrph.org
->mstacm.org             #Missouri Science & Technology - ACM
-131.151.88.2                    #acmwork.device.mst.edu
->nimlabs.org            #Nimlabs, Ink. Cell.
-18.238.1.103                    #olfin.nimlabs.org
-18.238.1.105                    #caerbanog.nimlabs.org
->nomh.org               #nomh.org
-204.29.154.12                   #iota.nomh.org
-204.29.154.32                   #adversity.xi.nomh.org
->oc7.org                #The OC7 Project
-128.2.122.140                   #knife.oc7.org
-207.22.77.170                   #spoon.oc7.org
->pfriedma.org           #pfriedma.org
-72.95.215.18                    #vice.pfriedma.org
->riscpkg.org            #The RISC OS Packaging Project
-83.104.175.10                   #delenn.riscpkg.org
->kth.se                 #Royal Institute of Technology, Stockholm, Sweden
-130.237.32.145                  #sonen.e.kth.se
-130.237.48.7                    #anden.e.kth.se
-130.237.48.244                  #fadern.e.kth.se
->isk.kth.se             #Royal Institute of Technology, ISK
-130.237.209.5                   #afsdb2.isk.kth.se
-130.237.216.17                  #afsdb1.isk.kth.se
->it.kth.se              #Royal Institute of Technology, IT
-130.237.212.15                  #ptah.it.kth.se
-130.237.212.16                  #toth.it.kth.se
-130.237.215.7                   #isis.it.kth.se
->md.kth.se              #Royal Institute of Technology, MMK
-130.237.57.21                   #euler.md.kth.se
-130.237.57.68                   #trinity.md.kth.se
-130.237.57.72                   #morpheus.md.kth.se
->mech.kth.se            #Royal Institute of Technology, MECH
-130.237.233.142                 #matterhorn.mech.kth.se
-130.237.233.143                 #castor.mech.kth.se
-130.237.233.144                 #pollux.mech.kth.se
->nada.kth.se            #Royal Institute of Technology, NADA
-130.237.222.20                  #kosmos.nada.kth.se
-130.237.223.12                  #sputnik.nada.kth.se
-130.237.224.78                  #mir.nada.kth.se
-130.237.227.23                  #gagarin.nada.kth.se
-130.237.228.28                  #laika.nada.kth.se
->pdc.kth.se             #Royal Institute of Technology, PDC
-130.237.232.29                  #crab.pdc.kth.se
-130.237.232.112                 #anna.pdc.kth.se
-130.237.232.114                 #hokkigai.pdc.kth.se
->stacken.kth.se         #Stacken Computer Club
-130.237.234.3                   #milko.stacken.kth.se
-130.237.234.43                  #hot.stacken.kth.se
-130.237.234.101                 #fishburger.stacken.kth.se
->syd.kth.se             #Royal Institute of Technology, KTH-Syd
-130.237.83.23                   #afs.haninge.kth.se
->physto.se              #Physics department Stockholm University
-130.237.205.36                  #sysafs1.physto.se
-130.237.205.72                  #sysafs2.physto.se
->sanchin.se             #Sanchin Consulting AB, Sweden
-192.195.148.10                  #sesan.sanchin.se
->su.se                  #Stockholm University
-130.237.162.81                  #afsdb1.su.se
-130.237.162.82                  #afsdb2.su.se
-130.237.162.230                 #afsdb3.su.se
->f9.ijs.si              #F9, Jozef Stefan Institue
-194.249.156.1                   #brenta.ijs.si
->p-ng.si                #Nova Gorica Polytechnic
-193.2.120.2                     #solkan.p-ng.si
->hep-ex.physics.metu.edu.tr #METU Department of Physics, Experimental HEP group, Ankara/Turke
-144.122.31.131                  #neutrino.physics.metu.edu.tr
->phy.bris.ac.uk         #Bristol University - phyics
-137.222.58.9                    #afs1.phy.bris.ac.uk
->inf.ed.ac.uk           #School of Informatics, University of Edinburgh
-129.215.64.16                   #afsdb0.inf.ed.ac.uk
-129.215.64.17                   #afsdb1.inf.ed.ac.uk
-129.215.64.18                   #afsdb2.inf.ed.ac.uk
->ic.ac.uk               #Imperial College London
-155.198.63.148                  #icafs2.cc.ic.ac.uk
-155.198.63.149                  #icafs1.cc.ic.ac.uk
->hep.man.ac.uk          #Manchester HEP
-194.36.2.3                      #afs1.hep.man.ac.uk
-194.36.2.4                      #afs2.hep.man.ac.uk
-194.36.2.5                      #afs3.hep.man.ac.uk
->rl.ac.uk               #Rutherford Appleton Lab, England
-130.246.183.203                 #afs1.gridpp.rl.ac.uk
-130.246.183.204                 #afs2.gridpp.rl.ac.uk
-130.246.183.205                 #afs3.gridpp.rl.ac.uk
diff --git a/modules/services/network-filesystems/openafs-client/default.nix b/modules/services/network-filesystems/openafs-client/default.nix
index bd6a456d693..1ff985e49e0 100644
--- a/modules/services/network-filesystems/openafs-client/default.nix
+++ b/modules/services/network-filesystems/openafs-client/default.nix
@@ -2,8 +2,14 @@
 
 let
   inherit (pkgs.lib) mkOption mkIf;
+
   cfg = config.services.openafsClient;
-  cellServDB = ./CellServDB;
+
+  cellServDB = pkgs.fetchurl {
+    url = http://dl.central.org/dl/cellservdb/CellServDB.2009-06-29;
+    sha256 = "be566f850e88130333ab8bc3462872ad90c9482e025c60a92f728b5bac1b4fa9";
+  };
+
   afsConfig = pkgs.runCommand "afsconfig" {} ''
     ensureDir $out
     echo ${cfg.cellName} > $out/ThisCell
-- 
GitLab


From 6d11d63ba313cf2ca839df20edd98d816cecd527 Mon Sep 17 00:00:00 2001
From: Sander van der Burg <s.vanderburg@tudelft.nl>
Date: Wed, 18 Nov 2009 14:50:48 +0000
Subject: [PATCH 2021/5331] Removed the nasty sleep hack of tomcat, since
 upstart-0,6 is also capable of only executing start and stop scripts

svn path=/nixos/branches/upstart-0.6/; revision=18430
---
 modules/services/web-servers/tomcat.nix | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/modules/services/web-servers/tomcat.nix b/modules/services/web-servers/tomcat.nix
index 4eb5b3fc5b5..1a2c17dcf1b 100644
--- a/modules/services/web-servers/tomcat.nix
+++ b/modules/services/web-servers/tomcat.nix
@@ -304,13 +304,10 @@ in
 		done    
 		''
 	    else ""}
-          ''; # */
 
-        exec =
-          ''
-            ${pkgs.su}/bin/su -s ${pkgs.bash}/bin/sh ${cfg.user} -c 'CATALINA_BASE=${cfg.baseDir} JAVA_HOME=${pkgs.jdk} JAVA_OPTS="${cfg.javaOpts}" CATALINA_OPTS="${cfg.catalinaOpts}" ${pkgs.tomcat6}/bin/startup.sh; sleep 1000d'
+            ${pkgs.su}/bin/su -s ${pkgs.bash}/bin/sh ${cfg.user} -c 'CATALINA_BASE=${cfg.baseDir} JAVA_HOME=${pkgs.jdk} JAVA_OPTS="${cfg.javaOpts}" CATALINA_OPTS="${cfg.catalinaOpts}" ${pkgs.tomcat6}/bin/startup.sh'
           '';
-
+	
         postStop =
           ''
             echo "Stopping tomcat..."
-- 
GitLab


From 26f83d65e4be2448753f55e9666f3e386c6ec3f7 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Wed, 18 Nov 2009 14:54:37 +0000
Subject: [PATCH 2022/5331] Adding GVPE service

svn path=/nixos/trunk/; revision=18431
---
 modules/module-list.nix              |   1 +
 modules/services/networking/gvpe.nix | 140 +++++++++++++++++++++++++++
 2 files changed, 141 insertions(+)
 create mode 100644 modules/services/networking/gvpe.nix

diff --git a/modules/module-list.nix b/modules/module-list.nix
index c9b414ca420..f6480537abf 100644
--- a/modules/module-list.nix
+++ b/modules/module-list.nix
@@ -72,6 +72,7 @@
   ./services/networking/ejabberd.nix
   ./services/networking/firewall.nix
   ./services/networking/gnunet.nix
+  ./services/networking/gvpe.nix
   ./services/networking/gw6c.nix
   ./services/networking/ifplugd.nix
   ./services/networking/ircd-hybrid.nix
diff --git a/modules/services/networking/gvpe.nix b/modules/services/networking/gvpe.nix
new file mode 100644
index 00000000000..7f5c2285a55
--- /dev/null
+++ b/modules/services/networking/gvpe.nix
@@ -0,0 +1,140 @@
+# GNU Virtual Private Ethernet
+
+{config, pkgs, ...}: 
+
+let 
+  inherit (pkgs.lib) mkOption mkIf;
+  cfg = config.services.gvpe;
+  finalConfig = if cfg.configFile != null then 
+    cfg.configFile
+  else if cfg.configText != null then
+    pkgs.writeTextFile {
+      name = "gvpe.conf";
+      text = cfg.configText;
+    }
+  else 
+    throw "You must either specify contents of the config file or the config file itself for GVPE";
+  ifupScript = if cfg.ipAddress == null || cfg.subnet == null then 
+     throw "Specify IP address and subnet (with mask) for GVPE" 
+   else if cfg.nodename == null then 
+     throw "You must set node name for GVPE" 
+   else
+   (pkgs.writeTextFile { 
+    name = "gvpe-if-up";
+    text = ''
+      #! /bin/sh
+      
+      export PATH=$PATH:${pkgs.iproute}/sbin
+
+      ip link set $IFNAME up
+      ip address add ${cfg.ipAddress} dev $IFNAME
+      ip route add ${cfg.subnet} dev $IFNAME
+
+      ${cfg.customIFSetup}
+    '';
+    executable = true;
+  });
+  exec = "${pkgs.gvpe}/sbin/gvpe -c /var/gvpe -D ${cfg.nodename} "
+    + " ${cfg.nodename}.pid-file=/var/gvpe/gvpe.pid"
+    + " ${cfg.nodename}.if-up=if-up"
+    + " &> /var/log/gvpe";
+  inherit (cfg) startOn stopOn;
+in
+
+{
+  options = {
+    services.gvpe = {
+      enable = mkOption {
+        default = false;
+        description = ''
+          Whether to run gvpe
+        '';
+      };
+      startOn = mkOption {
+        default = "network-interfaces/started";
+        description = ''
+          Condition to start GVPE
+        '';
+      };
+      stopOn = mkOption {
+        default = "network-interfaces/stop";
+        description = ''
+          Condition to stop GVPE
+        '';
+      };
+      nodename = mkOption {
+        default = null;
+        description =''
+          GVPE node name
+        '';
+      };
+      configText = mkOption {
+        default = null;
+        example = ''
+          tcp-port = 655
+          udp-port = 655
+          mtu = 1480
+          ifname = vpn0
+          
+          node = alpha
+          hostname = alpha.example.org
+          connect = always
+          enable-udp = true
+          enable-tcp = true
+          on alpha if-up = if-up-0
+          on alpha pid-file = /var/gvpe/gvpe.pid
+        '';
+        description = ''
+          GVPE config contents
+        '';
+      };
+      configFile = mkOption {
+        default = null;
+        example = "/root/my-gvpe-conf";
+        description = ''
+          GVPE config file, if already present
+        '';
+      };
+      ipAddress = mkOption {
+        default = null;
+        description = ''
+          IP address to assign to GVPE interface
+        '';
+      };
+      subnet = mkOption {
+        default = null;
+        example = "10.0.0.0/8";
+        description = ''
+          IP subnet assigned to GVPE network
+        '';
+      };
+      customIFSetup = mkOption {
+        default = "";
+        description = ''
+          Additional commands to apply in ifup script
+        '';
+      };
+    };
+  };
+  config = mkIf cfg.enable 
+  {
+    jobs.gvpe = {
+      description = "GNU Virtual Private Ethernet node";
+      
+      inherit startOn stopOn;
+
+      preStart = ''
+        mkdir -p /var/gvpe
+        mkdir -p /var/gvpe/pubkey
+        chown root /var/gvpe
+        chmod 700 /var/gvpe
+        cp ${finalConfig} /var/gvpe/gvpe.conf
+	cp ${ifupScript} /var/gvpe/if-up
+      '';
+
+      inherit exec;
+
+      respawn = true;
+    };
+  };
+}
-- 
GitLab


From ea2417ac870bd93218e6372970aa7ded32b6690e Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Wed, 18 Nov 2009 15:11:54 +0000
Subject: [PATCH 2023/5331] Apply Eelco Dolstra's formatting suggestions

svn path=/nixos/trunk/; revision=18436
---
 modules/services/networking/gvpe.nix | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/modules/services/networking/gvpe.nix b/modules/services/networking/gvpe.nix
index 7f5c2285a55..72b45df26af 100644
--- a/modules/services/networking/gvpe.nix
+++ b/modules/services/networking/gvpe.nix
@@ -4,7 +4,9 @@
 
 let 
   inherit (pkgs.lib) mkOption mkIf;
+
   cfg = config.services.gvpe;
+
   finalConfig = if cfg.configFile != null then 
     cfg.configFile
   else if cfg.configText != null then
@@ -14,6 +16,7 @@ let
     }
   else 
     throw "You must either specify contents of the config file or the config file itself for GVPE";
+
   ifupScript = if cfg.ipAddress == null || cfg.subnet == null then 
      throw "Specify IP address and subnet (with mask) for GVPE" 
    else if cfg.nodename == null then 
@@ -34,10 +37,12 @@ let
     '';
     executable = true;
   });
+
   exec = "${pkgs.gvpe}/sbin/gvpe -c /var/gvpe -D ${cfg.nodename} "
     + " ${cfg.nodename}.pid-file=/var/gvpe/gvpe.pid"
     + " ${cfg.nodename}.if-up=if-up"
     + " &> /var/log/gvpe";
+
   inherit (cfg) startOn stopOn;
 in
 
@@ -116,8 +121,7 @@ in
       };
     };
   };
-  config = mkIf cfg.enable 
-  {
+  config = mkIf cfg.enable {
     jobs.gvpe = {
       description = "GNU Virtual Private Ethernet node";
       
@@ -129,7 +133,7 @@ in
         chown root /var/gvpe
         chmod 700 /var/gvpe
         cp ${finalConfig} /var/gvpe/gvpe.conf
-	cp ${ifupScript} /var/gvpe/if-up
+        cp ${ifupScript} /var/gvpe/if-up
       '';
 
       inherit exec;
-- 
GitLab


From 27d0d2927eca16ca02acdf78d3c505278845b6d7 Mon Sep 17 00:00:00 2001
From: Sander van der Burg <s.vanderburg@tudelft.nl>
Date: Wed, 18 Nov 2009 16:19:04 +0000
Subject: [PATCH 2024/5331] Added initialDatabases option to the MySQL service.
 This is useful for e.g. automatically intialing databases in a test VM

svn path=/nixos/branches/upstart-0.6/; revision=18437
---
 modules/services/databases/mysql.nix | 40 +++++++++++++++++++++++++++-
 1 file changed, 39 insertions(+), 1 deletion(-)

diff --git a/modules/services/databases/mysql.nix b/modules/services/databases/mysql.nix
index 230d36dfe91..50d00c0e5ba 100644
--- a/modules/services/databases/mysql.nix
+++ b/modules/services/databases/mysql.nix
@@ -55,7 +55,15 @@ in
         default = "/var/run/mysql";
         description = "Location of the file which stores the PID of the MySQL server";
       };
-
+      
+      initialDatabases = mkOption {
+        default = [];
+        description = "List of database names and their initial schemas that should be used to create databases on the first startup of MySQL";
+	example = [
+	  { name = "foodatabase"; schema = ./foodatabase.sql; }
+	  { name = "bardatabase"; schema = ./bardatabase.sql; }
+	];
+      };
     };
     
   };
@@ -90,6 +98,36 @@ in
           '';
 
         exec = "${mysql}/libexec/mysqld ${mysqldOptions}";
+	
+	postStart =
+	  ''
+            # Wait until the MySQL server is available for use
+            count=0
+            while [ ! -e /tmp/mysql.sock ]
+            do
+                if [ $count -eq 30 ]
+                then
+                  echo "Tried 30 times, giving up..."
+	          exit 1
+                 fi
+
+                 echo "MySQL daemon not yet started. Waiting for 1 second..."
+                 count=$((count++))
+                 sleep 1
+            done
+
+            # Create initial databases
+
+            ${concatMapStrings (database: 
+              ''
+                if ! test -e "${cfg.dataDir}/${database.name}"; then
+                    echo "Creating initial database: ${database.name}"
+                    ( echo "create database ${database.name};"
+                      echo "use ${database.name};"
+                      cat ${database.schema} ) | ${mysql}/bin/mysql -u root -N
+                fi
+              '') cfg.initialDatabases}            
+	  '';
 
         # !!! Need a postStart script to wait until mysqld is ready to
         # accept connections.
-- 
GitLab


From e171b6d86eedc6fedba31db91131a42c497e3934 Mon Sep 17 00:00:00 2001
From: Sander van der Burg <s.vanderburg@tudelft.nl>
Date: Wed, 18 Nov 2009 21:56:47 +0000
Subject: [PATCH 2025/5331] Added option to specify directories as a path for
 MySQL database schemas.

By using this approach we no longer have to specify schemas like this:

schema = "${myDatabaseSchemaDrvFun}/prefix/to/the/sqlfile.sql";

but like this:

schema = myDataBaseSchemaDrv;

which is in some cases more convenient.


svn path=/nixos/branches/upstart-0.6/; revision=18450
---
 modules/services/databases/mysql.nix | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/modules/services/databases/mysql.nix b/modules/services/databases/mysql.nix
index 50d00c0e5ba..e3c92adee5a 100644
--- a/modules/services/databases/mysql.nix
+++ b/modules/services/databases/mysql.nix
@@ -124,7 +124,14 @@ in
                     echo "Creating initial database: ${database.name}"
                     ( echo "create database ${database.name};"
                       echo "use ${database.name};"
-                      cat ${database.schema} ) | ${mysql}/bin/mysql -u root -N
+		      if [ -f "${database.schema}" ]
+		      then
+                          cat ${database.schema}
+		      elif [ -d "${database.schema}" ]
+		      then
+		          cat ${database.schema}/mysql-databases/*.sql
+		      fi
+		    ) | ${mysql}/bin/mysql -u root -N
                 fi
               '') cfg.initialDatabases}            
 	  '';
-- 
GitLab


From a5cdfcbdb2da9f4ecac892a1a91ebe1d02c8ac11 Mon Sep 17 00:00:00 2001
From: Sander van der Burg <s.vanderburg@tudelft.nl>
Date: Thu, 19 Nov 2009 13:15:15 +0000
Subject: [PATCH 2026/5331] Removed the dirty sleep hack from the ejabberd
 service

svn path=/nixos/branches/upstart-0.6/; revision=18456
---
 modules/services/networking/ejabberd.nix | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/modules/services/networking/ejabberd.nix b/modules/services/networking/ejabberd.nix
index ae8cf47b2fa..14476d3e337 100644
--- a/modules/services/networking/ejabberd.nix
+++ b/modules/services/networking/ejabberd.nix
@@ -56,6 +56,10 @@ in
 
         startOn = "started network-interface";
         stopOn = "stopping network-interfaces";
+	
+	environment = {
+	  PATH = "$PATH:${pkgs.ejabberd}/sbin:${pkgs.ejabberd}/bin:${pkgs.coreutils}/bin:${pkgs.bash}/bin:${pkgs.gnused}/bin";
+	};
 
         preStart =
           ''
@@ -73,13 +77,13 @@ in
 	        cp ${pkgs.ejabberd}/etc/ejabberd/* ${cfg.confDir}
 	        sed -e 's|{hosts, \["localhost"\]}.|{hosts, \[${cfg.virtualHosts}\]}.|' ${pkgs.ejabberd}/etc/ejabberd/ejabberd.cfg > ${cfg.confDir}/ejabberd.cfg
 	    fi
+	    
+	    ejabberdctl --config-dir ${cfg.confDir} --logs ${cfg.logsDir} --spool ${cfg.spoolDir} start
           '';
 
-        exec = "${pkgs.bash}/bin/sh -c 'export PATH=$PATH:${pkgs.ejabberd}/sbin:${pkgs.coreutils}/bin:${pkgs.bash}/bin; ejabberdctl --config-dir ${cfg.confDir} --logs ${cfg.logsDir} --spool ${cfg.spoolDir} start; sleep 1d'";
-
         postStop =
           ''        
-            ${pkgs.ejabberd}/sbin/ejabberdctl stop
+            ejabberdctl --config-dir ${cfg.confDir} --logs ${cfg.logsDir} --spool ${cfg.spoolDir} stop
           '';
       };
 
-- 
GitLab


From 9b000b3dcff1cf3636bc7a07cc1ad2055946986a Mon Sep 17 00:00:00 2001
From: Sander van der Burg <s.vanderburg@tudelft.nl>
Date: Thu, 19 Nov 2009 15:12:05 +0000
Subject: [PATCH 2027/5331] Added loadDumps option, which makes it possible to
 load a specific ejabberd configuration on the first startup

svn path=/nixos/branches/upstart-0.6/; revision=18461
---
 modules/services/networking/ejabberd.nix | 33 ++++++++++++++++++++++++
 1 file changed, 33 insertions(+)

diff --git a/modules/services/networking/ejabberd.nix b/modules/services/networking/ejabberd.nix
index 14476d3e337..82a51267a80 100644
--- a/modules/services/networking/ejabberd.nix
+++ b/modules/services/networking/ejabberd.nix
@@ -41,6 +41,11 @@ in
         description = "Virtualhosts that ejabberd should host. Hostnames are surrounded with doublequotes and separated by commas";
       };
 
+      loadDumps = mkOption {
+        default = [];
+        description = "Configuration dump that should be loaded on the first startup";
+	example = [ ./myejabberd.dump ];
+      };
     };
     
   };
@@ -68,6 +73,7 @@ in
 
             if ! test -d ${cfg.spoolDir}
             then
+	        initialize=1
                 cp -av ${pkgs.ejabberd}/var/lib/ejabberd /var/lib
             fi
             
@@ -79,6 +85,33 @@ in
 	    fi
 	    
 	    ejabberdctl --config-dir ${cfg.confDir} --logs ${cfg.logsDir} --spool ${cfg.spoolDir} start
+	    
+	    ${if cfg.loadDumps == [] then "" else
+	      ''
+	        # Wait until the ejabberd server is available for use
+                count=0
+                while ! ejabberdctl --config-dir ${cfg.confDir} --logs ${cfg.logsDir} --spool ${cfg.spoolDir} status
+                do
+                    if [ $count -eq 30 ]
+                    then
+                        echo "Tried 30 times, giving up..."
+	                exit 1
+                    fi
+
+                    echo "Ejabberd daemon not yet started. Waiting for 1 second..."
+                    count=$((count++))
+                    sleep 1
+                done
+	      
+	        if [ "$initialize" = "1" ]
+	        then
+	            ${concatMapStrings (dump:
+		      ''
+		        echo "Importing dump: ${dump}"
+		        ejabberdctl --config-dir ${cfg.confDir} --logs ${cfg.logsDir} --spool ${cfg.spoolDir} load ${dump}
+		      '') cfg.loadDumps}
+	        fi
+	      ''}
           '';
 
         postStop =
-- 
GitLab


From dd0f8b36d50bd0840ca6f5cbd34269ee188a702d Mon Sep 17 00:00:00 2001
From: Sander van der Burg <s.vanderburg@tudelft.nl>
Date: Thu, 19 Nov 2009 15:17:04 +0000
Subject: [PATCH 2028/5331] Moved ejabberd initialization check loop inside the
 if statement, since we only have to check for it in the first startup

svn path=/nixos/branches/upstart-0.6/; revision=18464
---
 modules/services/networking/ejabberd.nix | 32 ++++++++++++------------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/modules/services/networking/ejabberd.nix b/modules/services/networking/ejabberd.nix
index 82a51267a80..6643d4f9c52 100644
--- a/modules/services/networking/ejabberd.nix
+++ b/modules/services/networking/ejabberd.nix
@@ -87,24 +87,24 @@ in
 	    ejabberdctl --config-dir ${cfg.confDir} --logs ${cfg.logsDir} --spool ${cfg.spoolDir} start
 	    
 	    ${if cfg.loadDumps == [] then "" else
-	      ''
-	        # Wait until the ejabberd server is available for use
-                count=0
-                while ! ejabberdctl --config-dir ${cfg.confDir} --logs ${cfg.logsDir} --spool ${cfg.spoolDir} status
-                do
-                    if [ $count -eq 30 ]
-                    then
-                        echo "Tried 30 times, giving up..."
-	                exit 1
-                    fi
-
-                    echo "Ejabberd daemon not yet started. Waiting for 1 second..."
-                    count=$((count++))
-                    sleep 1
-                done
-	      
+	      ''	      
 	        if [ "$initialize" = "1" ]
 	        then
+	            # Wait until the ejabberd server is available for use
+                    count=0
+                    while ! ejabberdctl --config-dir ${cfg.confDir} --logs ${cfg.logsDir} --spool ${cfg.spoolDir} status
+                    do
+                        if [ $count -eq 30 ]
+                        then
+                            echo "Tried 30 times, giving up..."
+	                    exit 1
+                        fi
+
+                        echo "Ejabberd daemon not yet started. Waiting for 1 second..."
+                        count=$((count++))
+                        sleep 1
+                    done
+
 	            ${concatMapStrings (dump:
 		      ''
 		        echo "Importing dump: ${dump}"
-- 
GitLab


From ebbde6f8d38e824fcd07d6e97979397bcfc087b2 Mon Sep 17 00:00:00 2001
From: Sander van der Burg <s.vanderburg@tudelft.nl>
Date: Fri, 20 Nov 2009 15:35:01 +0000
Subject: [PATCH 2029/5331] Added directory option for ejabberd dumps so that
 we can use derivations on a convenient way, e.g. loadDumps = [ myDumpDrvFun
 ];

svn path=/nixos/branches/upstart-0.6/; revision=18487
---
 modules/services/networking/ejabberd.nix | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/modules/services/networking/ejabberd.nix b/modules/services/networking/ejabberd.nix
index 6643d4f9c52..1d714cb0280 100644
--- a/modules/services/networking/ejabberd.nix
+++ b/modules/services/networking/ejabberd.nix
@@ -108,7 +108,17 @@ in
 	            ${concatMapStrings (dump:
 		      ''
 		        echo "Importing dump: ${dump}"
-		        ejabberdctl --config-dir ${cfg.confDir} --logs ${cfg.logsDir} --spool ${cfg.spoolDir} load ${dump}
+			
+			if [ -f ${dump} ]
+			then
+		            ejabberdctl --config-dir ${cfg.confDir} --logs ${cfg.logsDir} --spool ${cfg.spoolDir} load ${dump}
+			elif [ -d ${dump} ]
+			then
+			    for i in ${dump}/ejabberd-dump/*
+			    do
+			        ejabberdctl --config-dir ${cfg.confDir} --logs ${cfg.logsDir} --spool ${cfg.spoolDir} load $i
+			    done
+			fi
 		      '') cfg.loadDumps}
 	        fi
 	      ''}
-- 
GitLab


From 2c8d2c2268ec4325e59faf84e0ffad3012e6f1e7 Mon Sep 17 00:00:00 2001
From: Sander van der Burg <s.vanderburg@tudelft.nl>
Date: Fri, 20 Nov 2009 16:20:57 +0000
Subject: [PATCH 2030/5331] Small bugfix which automatically creates tomcat
 configuration dirs. Otherwise the startup would fail

svn path=/nixos/branches/upstart-0.6/; revision=18488
---
 modules/services/web-servers/tomcat.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/modules/services/web-servers/tomcat.nix b/modules/services/web-servers/tomcat.nix
index 1a2c17dcf1b..3d50e42bfae 100644
--- a/modules/services/web-servers/tomcat.nix
+++ b/modules/services/web-servers/tomcat.nix
@@ -215,6 +215,7 @@ in
 		    then
 			for j in $i/conf/Catalina/*
 			do
+			    mkdir -p ${cfg.baseDir}/conf/Catalina/localhost
 			    ln -sfn $j ${cfg.baseDir}/conf/Catalina/localhost/`basename $j`
 			done
 		    fi
@@ -251,6 +252,7 @@ in
 		      then
 			  for j in $i/conf/Catalina/*
 			  do
+			      mkdir -p ${cfg.baseDir}/conf/Catalina/${virtualHost.name}
 			      ln -sfn $j ${cfg.baseDir}/conf/Catalina/${virtualHost.name}/`basename $j`
 			  done
 		      fi
-- 
GitLab


From 66d8af6d091af58aa2cc7bdc4e85c3545f8d3ae2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Sat, 21 Nov 2009 22:14:01 +0000
Subject: [PATCH 2031/5331] X: Add support for starting the GnuPG agent.

svn path=/nixos/trunk/; revision=18509
---
 .../services/x11/display-managers/default.nix | 11 ++++++++
 modules/services/x11/xserver.nix              | 28 +++++++++++++++----
 2 files changed, 34 insertions(+), 5 deletions(-)

diff --git a/modules/services/x11/display-managers/default.nix b/modules/services/x11/display-managers/default.nix
index f62c38bf711..7cc270cf247 100644
--- a/modules/services/x11/display-managers/default.nix
+++ b/modules/services/x11/display-managers/default.nix
@@ -43,6 +43,17 @@ let
         fi
       ''}
 
+      ${optionalString cfg.startGnuPGAgent ''
+        if test -z "$SSH_AUTH_SOCK"; then
+            # Restart this script as a child of the GnuPG agent.
+            exec "${pkgs.gnupg2}/bin/gpg-agent"                         \
+              --enable-ssh-support --daemon                             \
+              --pinentry-program "${pkgs.pinentry}/bin/pinentry-gtk-2"  \
+              --write-env-file "$HOME/.gpg-agent-info"                  \
+              "$0" "$sessionType"
+        fi
+      ''}
+
       # Start a ConsoleKit session so that we get ownership of various
       # devices.
       if test -z "$XDG_SESSION_COOKIE"; then
diff --git a/modules/services/x11/xserver.nix b/modules/services/x11/xserver.nix
index e14c9762bd0..ee6f7c50f12 100644
--- a/modules/services/x11/xserver.nix
+++ b/modules/services/x11/xserver.nix
@@ -208,6 +208,16 @@ in
         '';
       };
 
+      startGnuPGAgent = mkOption {
+        default = true;
+        description = ''
+          Whether to start the GnuPG agent when you log in.  The GnuPG agent
+          remembers private keys for you so that you don't have to type in
+          passphrases every time you make an SSH connection or sign/encrypt
+          data.  Use <command>ssh-add</command> to add a key to the agent.
+        '';
+      };
+
       layout = mkOption {
         default = "us";
         description = ''
@@ -322,13 +332,21 @@ in
 
 
   ###### implementation
-  
+
   config = mkIf cfg.enable {
 
-    assertions = singleton
-      { assertion = config.services.hal.enable == true;
-        message = "The X server needs HAL running. Set services.hal.enable to true";
-      };
+    assertions =
+      [ { assertion = config.services.hal.enable == true;
+          message = "The X server needs HAL running. Set services.hal.enable to true";
+        }
+
+        { assertion = (cfg.startSSHAgent -> !cfg.startGnuPGAgent)
+                       && (cfg.startGnuPGAgent -> !cfg.startSSHAgent);
+          message =
+            "The OpenSSH SSH agent and GnuPG agent cannot be started " +
+            "both.  Choose between `startSSHAgent' and `startGnuPGAgent'.";
+        }
+      ];
 
     boot.extraModulePackages =
       optional (elem "nvidia" driverNames) kernelPackages.nvidia_x11 ++ 
-- 
GitLab


From 8c349a9e71961c9b599c0cfa46aa11c085085e63 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Sun, 22 Nov 2009 00:40:48 +0000
Subject: [PATCH 2032/5331] Fix the OpenSSH/GnuPG agent assertion.

svn path=/nixos/trunk/; revision=18514
---
 modules/services/x11/xserver.nix | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/modules/services/x11/xserver.nix b/modules/services/x11/xserver.nix
index ee6f7c50f12..62fb26f829e 100644
--- a/modules/services/x11/xserver.nix
+++ b/modules/services/x11/xserver.nix
@@ -340,11 +340,14 @@ in
           message = "The X server needs HAL running. Set services.hal.enable to true";
         }
 
-        { assertion = (cfg.startSSHAgent -> !cfg.startGnuPGAgent)
-                       && (cfg.startGnuPGAgent -> !cfg.startSSHAgent);
+        { assertion = if cfg.startSSHAgent
+                      then !cfg.startGnuPGAgent
+                      else (if cfg.startGnuPGAgent
+                            then !cfg.startSSHAgent
+                            else true);
           message =
-            "The OpenSSH SSH agent and GnuPG agent cannot be started " +
-            "both.  Choose between `startSSHAgent' and `startGnuPGAgent'.";
+            "The OpenSSH agent and GnuPG agent cannot be started both.  "
+            "Choose between `startSSHAgent' and `startGnuPGAgent'.";
         }
       ];
 
-- 
GitLab


From ab3332a2eb530a40d5eb77ead2c40515cd28a65c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Sun, 22 Nov 2009 00:40:53 +0000
Subject: [PATCH 2033/5331] Rename `startSSHAgent' to `startOpenSSHAgent'.

svn path=/nixos/trunk/; revision=18515
---
 modules/rename.nix                                |  3 +++
 modules/services/x11/display-managers/default.nix |  2 +-
 modules/services/x11/xserver.nix                  | 10 +++++-----
 3 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/modules/rename.nix b/modules/rename.nix
index a3b40da4213..77470d93200 100644
--- a/modules/rename.nix
+++ b/modules/rename.nix
@@ -71,6 +71,9 @@ in zipModules ([]
 ++ rename obsolete "boot.bootMount" to "boot.loader.grub.bootDevice"
 ++ rename obsolete "boot.grubSplashImage" to "boot.loader.grub.splashImage"
 
+# X11
+++ rename obsolete "services.xserver.startSSHAgent" to "services.xserver.startOpenSSHAgent"
+
 # KDE
 ++ rename deprecated "kde.extraPackages" to "environment.kdePackages"
 
diff --git a/modules/services/x11/display-managers/default.nix b/modules/services/x11/display-managers/default.nix
index 7cc270cf247..805016fe438 100644
--- a/modules/services/x11/display-managers/default.nix
+++ b/modules/services/x11/display-managers/default.nix
@@ -32,7 +32,7 @@ let
         exec > ~/.xsession-errors 2>&1
       ''}
 
-      ${optionalString cfg.startSSHAgent ''
+      ${optionalString cfg.startOpenSSHAgent ''
         if test -z "$SSH_AUTH_SOCK"; then
             # Restart this script as a child of the SSH agent.  (It is
             # also possible to start the agent as a child that prints
diff --git a/modules/services/x11/xserver.nix b/modules/services/x11/xserver.nix
index 62fb26f829e..1ea26c5af0a 100644
--- a/modules/services/x11/xserver.nix
+++ b/modules/services/x11/xserver.nix
@@ -198,10 +198,10 @@ in
         '';
       };
 
-      startSSHAgent = mkOption {
+      startOpenSSHAgent = mkOption {
         default = true;
         description = ''
-          Whether to start the SSH agent when you log in.  The SSH agent
+          Whether to start the OpenSSH agent when you log in.  The OpenSSH agent
           remembers private keys for you so that you don't have to type in
           passphrases every time you make an SSH connection.  Use
           <command>ssh-add</command> to add a key to the agent.
@@ -340,14 +340,14 @@ in
           message = "The X server needs HAL running. Set services.hal.enable to true";
         }
 
-        { assertion = if cfg.startSSHAgent
+        { assertion = if cfg.startOpenSSHAgent
                       then !cfg.startGnuPGAgent
                       else (if cfg.startGnuPGAgent
-                            then !cfg.startSSHAgent
+                            then !cfg.startOpenSSHAgent
                             else true);
           message =
             "The OpenSSH agent and GnuPG agent cannot be started both.  "
-            "Choose between `startSSHAgent' and `startGnuPGAgent'.";
+            "Choose between `startOpenSSHAgent' and `startGnuPGAgent'.";
         }
       ];
 
-- 
GitLab


From d912b510f50d63344db64f7becaf74d15cf2171a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Sun, 22 Nov 2009 00:46:37 +0000
Subject: [PATCH 2034/5331] Hopefully really fix the OpenSSH/GnuPG agent
 assertion.

svn path=/nixos/trunk/; revision=18516
---
 modules/services/x11/xserver.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/modules/services/x11/xserver.nix b/modules/services/x11/xserver.nix
index 1ea26c5af0a..baf224975a2 100644
--- a/modules/services/x11/xserver.nix
+++ b/modules/services/x11/xserver.nix
@@ -342,9 +342,9 @@ in
 
         { assertion = if cfg.startOpenSSHAgent
                       then !cfg.startGnuPGAgent
-                      else (if cfg.startGnuPGAgent
-                            then !cfg.startOpenSSHAgent
-                            else true);
+                      else if cfg.startGnuPGAgent
+                           then !cfg.startOpenSSHAgent
+                           else true;
           message =
             "The OpenSSH agent and GnuPG agent cannot be started both.  "
             "Choose between `startOpenSSHAgent' and `startGnuPGAgent'.";
-- 
GitLab


From 1966f9d2975856cee902f71300781d3b9eef5af8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Sun, 22 Nov 2009 00:54:01 +0000
Subject: [PATCH 2035/5331] Hopefully really fix the OpenSSH/GnuPG agent
 assertion (yes!).

svn path=/nixos/trunk/; revision=18517
---
 modules/services/x11/xserver.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/modules/services/x11/xserver.nix b/modules/services/x11/xserver.nix
index baf224975a2..b4554ac5c52 100644
--- a/modules/services/x11/xserver.nix
+++ b/modules/services/x11/xserver.nix
@@ -342,11 +342,11 @@ in
 
         { assertion = if cfg.startOpenSSHAgent
                       then !cfg.startGnuPGAgent
-                      else if cfg.startGnuPGAgent
-                           then !cfg.startOpenSSHAgent
-                           else true;
+                      else (if cfg.startGnuPGAgent
+                            then !cfg.startOpenSSHAgent
+                            else true);
           message =
-            "The OpenSSH agent and GnuPG agent cannot be started both.  "
+            "The OpenSSH agent and GnuPG agent cannot be started both.  " +
             "Choose between `startOpenSSHAgent' and `startGnuPGAgent'.";
         }
       ];
-- 
GitLab


From 69a2842d01dfa592137a652dbeaf5592a8424840 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Sun, 22 Nov 2009 14:34:53 +0000
Subject: [PATCH 2036/5331] Switch off one of the two conflicting on-by-default
 options

svn path=/nixos/trunk/; revision=18519
---
 modules/services/x11/xserver.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/services/x11/xserver.nix b/modules/services/x11/xserver.nix
index b4554ac5c52..3afad9d7615 100644
--- a/modules/services/x11/xserver.nix
+++ b/modules/services/x11/xserver.nix
@@ -209,7 +209,7 @@ in
       };
 
       startGnuPGAgent = mkOption {
-        default = true;
+        default = false;
         description = ''
           Whether to start the GnuPG agent when you log in.  The GnuPG agent
           remembers private keys for you so that you don't have to type in
-- 
GitLab


From 7fc40ca2f185ddbb0b7f93e164a47966d9fb6a9b Mon Sep 17 00:00:00 2001
From: Sander van der Burg <s.vanderburg@tudelft.nl>
Date: Mon, 23 Nov 2009 13:26:33 +0000
Subject: [PATCH 2037/5331] Enabled startOn event of the MySQL and Tomcat
 server so that they are initialised on startup

svn path=/nixos/branches/upstart-0.6/; revision=18556
---
 modules/services/databases/mysql.nix    | 2 +-
 modules/services/web-servers/tomcat.nix | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/modules/services/databases/mysql.nix b/modules/services/databases/mysql.nix
index e3c92adee5a..31d5676b8d7 100644
--- a/modules/services/databases/mysql.nix
+++ b/modules/services/databases/mysql.nix
@@ -83,7 +83,7 @@ in
     jobs.mysql =
       { description = "MySQL server";
 
-        startOn = "started filesystems";
+        startOn = "started network-interfaces";
 
         preStart =
           ''
diff --git a/modules/services/web-servers/tomcat.nix b/modules/services/web-servers/tomcat.nix
index 3d50e42bfae..ef569a8fedf 100644
--- a/modules/services/web-servers/tomcat.nix
+++ b/modules/services/web-servers/tomcat.nix
@@ -100,11 +100,11 @@ in
         description = "Tomcat user";
         home = "/homeless-shelter";
       };
-      
+            
     jobs.tomcat =
       { description = "Apache Tomcat server";
 
-        startOn = "started network-interface";
+        startOn = "started network-interfaces";
         stopOn = "stopping network-interfaces";
 
         preStart =
-- 
GitLab


From ff177a01a707de9a6fcbe0aef1fb793da3fa4f1e Mon Sep 17 00:00:00 2001
From: Sander van der Burg <s.vanderburg@tudelft.nl>
Date: Mon, 23 Nov 2009 13:29:47 +0000
Subject: [PATCH 2038/5331] Fixed ejabberd service so that it will be started
 on startup

svn path=/nixos/branches/upstart-0.6/; revision=18557
---
 modules/services/networking/ejabberd.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/services/networking/ejabberd.nix b/modules/services/networking/ejabberd.nix
index 1d714cb0280..b85dc26d2fc 100644
--- a/modules/services/networking/ejabberd.nix
+++ b/modules/services/networking/ejabberd.nix
@@ -59,7 +59,7 @@ in
     jobs.ejabberd =
       { description = "EJabberd server";
 
-        startOn = "started network-interface";
+        startOn = "started network-interfaces";
         stopOn = "stopping network-interfaces";
 	
 	environment = {
-- 
GitLab


From 88b26c47ad6108435e3ced58b5a5fce55f431227 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 24 Nov 2009 14:20:33 +0000
Subject: [PATCH 2039/5331] * Run cronjobs with a more userfriendly $PATH.

svn path=/nixos/trunk/; revision=18595
---
 modules/services/scheduling/cron.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/services/scheduling/cron.nix b/modules/services/scheduling/cron.nix
index 930162f1c73..1b283b2e01a 100644
--- a/modules/services/scheduling/cron.nix
+++ b/modules/services/scheduling/cron.nix
@@ -9,8 +9,8 @@ let
   # Put all the system cronjobs together.
   systemCronJobsFile = pkgs.writeText "system-crontab"
     ''
-      SHELL=${pkgs.bash}/bin/sh
-      PATH=${pkgs.coreutils}/bin:${pkgs.findutils}/bin:${pkgs.gnused}/bin:${pkgs.su}/bin
+      SHELL=${pkgs.bash}/bin/bash
+      PATH=/var/run/current-system/sw/bin:/var/run/current-system/sw/sbin
       MAILTO="${config.services.cron.mailto}"
       ${pkgs.lib.concatStrings (map (job: job + "\n") config.services.cron.systemCronJobs)}
     '';
-- 
GitLab


From e76f14714b9e1488deceb829617816f4db2dc4a1 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 24 Nov 2009 15:05:08 +0000
Subject: [PATCH 2040/5331] svn path=/nixos/trunk/; revision=18599

---
 modules/programs/bash/bash.nix       | 1 -
 modules/services/scheduling/cron.nix | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/modules/programs/bash/bash.nix b/modules/programs/bash/bash.nix
index 38ed7c7a186..1e2730b04b9 100644
--- a/modules/programs/bash/bash.nix
+++ b/modules/programs/bash/bash.nix
@@ -32,7 +32,6 @@ in
           src = ./bashrc.sh;
 
           bash = pkgs.bash;
-          systemPath = config.system.path;
           wrapperDir = config.security.wrapperDir;
           modulesTree = config.system.modulesTree;
           shellInit = config.environment.shellInit;
diff --git a/modules/services/scheduling/cron.nix b/modules/services/scheduling/cron.nix
index 1b283b2e01a..8408fe6e003 100644
--- a/modules/services/scheduling/cron.nix
+++ b/modules/services/scheduling/cron.nix
@@ -10,7 +10,7 @@ let
   systemCronJobsFile = pkgs.writeText "system-crontab"
     ''
       SHELL=${pkgs.bash}/bin/bash
-      PATH=/var/run/current-system/sw/bin:/var/run/current-system/sw/sbin
+      PATH=${config.system.path}/bin:${config.system.path}/sbin
       MAILTO="${config.services.cron.mailto}"
       ${pkgs.lib.concatStrings (map (job: job + "\n") config.services.cron.systemCronJobs)}
     '';
-- 
GitLab


From ed6daf4ea463dfbff391d834b8c5eaab174353ed Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 24 Nov 2009 17:07:23 +0000
Subject: [PATCH 2041/5331] * Doh!  I lost ${flags} somewhere along the way, so
 Postgres   wouldn't get the -i option anymore...

svn path=/nixos/branches/upstart-0.6/; revision=18606
---
 modules/services/databases/postgresql.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/services/databases/postgresql.nix b/modules/services/databases/postgresql.nix
index cd1f9dc8094..1e96483662e 100644
--- a/modules/services/databases/postgresql.nix
+++ b/modules/services/databases/postgresql.nix
@@ -138,7 +138,7 @@ in
             # database is up, but it requires a `postgres' user to
             # exist.  And we can't call `createuser' before the
             # database is running.
-            ${run} -c '${postgresql}/bin/pg_ctl start'
+            ${run} -c '${postgresql}/bin/pg_ctl start -o "${toString flags}"'
 
             # So wait until the server is running.
             while ! ${run} -c '${postgresql}/bin/pg_ctl status'; do
-- 
GitLab


From 8e8b3f9313e79ef630e5a99a147f43b6ec224bb4 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 24 Nov 2009 17:25:35 +0000
Subject: [PATCH 2042/5331] * Mount /var/run/nscd only once.

svn path=/nixos/branches/upstart-0.6/; revision=18607
---
 modules/system/activation/activation-script.nix | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/modules/system/activation/activation-script.nix b/modules/system/activation/activation-script.nix
index c29c82dd7ae..df3806b834b 100644
--- a/modules/system/activation/activation-script.nix
+++ b/modules/system/activation/activation-script.nix
@@ -89,8 +89,10 @@ let
       # (Upstart 0.6 apparently uses nscd to do some name lookups,
       # resulting in it holding some mmap mapping to deleted files in
       # /var/run/nscd.)
-      mkdir -p /var/run/nscd
-      ${pkgs.utillinux}/bin/mount -t tmpfs -o "mode=755" none /var/run/nscd
+      if [ ! -e /var/run/nscd ]; then
+          mkdir -p /var/run/nscd
+          ${pkgs.utillinux}/bin/mount -t tmpfs -o "mode=755" none /var/run/nscd
+      fi
 
       mkdir -m 0755 -p /var/log
 
-- 
GitLab


From 7cefe762dbaccfd8ae7bf1ee852121a9f6f6457a Mon Sep 17 00:00:00 2001
From: Marco Maggesi <maggesi@math.unifi.it>
Date: Thu, 26 Nov 2009 13:11:56 +0000
Subject: [PATCH 2043/5331] Fix openafs-client for the new Upstart 0.6

svn path=/nixos/trunk/; revision=18644
---
 .../services/network-filesystems/openafs-client/default.nix   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/services/network-filesystems/openafs-client/default.nix b/modules/services/network-filesystems/openafs-client/default.nix
index 1ff985e49e0..c5205b34052 100644
--- a/modules/services/network-filesystems/openafs-client/default.nix
+++ b/modules/services/network-filesystems/openafs-client/default.nix
@@ -65,8 +65,8 @@ in
 
         description = "AFS client";
 
-        startOn = "network-interfaces/started";
-        stopOn = "network-interfaces/stop";
+        startOn = "start network-interfaces";
+        stopOn = "stop network-interfaces";
 
 	preStart = ''
 	  mkdir -m 0755 /afs || true
-- 
GitLab


From 729bf2e2f0fa18e04627547497dfe9f332db0cff Mon Sep 17 00:00:00 2001
From: Marco Maggesi <maggesi@math.unifi.it>
Date: Thu, 26 Nov 2009 14:12:19 +0000
Subject: [PATCH 2044/5331] Fix wrong upstart directives in openafs-client

svn path=/nixos/trunk/; revision=18645
---
 .../services/network-filesystems/openafs-client/default.nix   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/services/network-filesystems/openafs-client/default.nix b/modules/services/network-filesystems/openafs-client/default.nix
index c5205b34052..52aaa7d633b 100644
--- a/modules/services/network-filesystems/openafs-client/default.nix
+++ b/modules/services/network-filesystems/openafs-client/default.nix
@@ -65,8 +65,8 @@ in
 
         description = "AFS client";
 
-        startOn = "start network-interfaces";
-        stopOn = "stop network-interfaces";
+        startOn = "started network-interfaces";
+        stopOn = "stopping network-interfaces";
 
 	preStart = ''
 	  mkdir -m 0755 /afs || true
-- 
GitLab


From d29072d2149aec60a4813ab9f7abe135b8038b17 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 2 Dec 2009 17:18:25 +0000
Subject: [PATCH 2045/5331] * Generate a postgresql.conf and use it to specify
 the paths to   pg_hba.conf and pg_ident.conf. * Turn on syslog logging for
 PostgreSQL.

svn path=/nixos/trunk/; revision=18768
---
 modules/services/databases/postgresql.nix | 31 ++++++++++++-----------
 1 file changed, 16 insertions(+), 15 deletions(-)

diff --git a/modules/services/databases/postgresql.nix b/modules/services/databases/postgresql.nix
index 1e96483662e..16056ab96a7 100644
--- a/modules/services/databases/postgresql.nix
+++ b/modules/services/databases/postgresql.nix
@@ -14,6 +14,14 @@ let
 
   flags = if cfg.enableTCPIP then ["-i"] else [];
 
+  # The main PostgreSQL configuration file.
+  configFile = pkgs.writeText "postgresql.conf"
+    ''
+      hba_file = '${pkgs.writeText "pg_hba.conf" cfg.authentication}'
+      ident_file = '${pkgs.writeText "pg_ident.conf" cfg.identMap}'
+      log_destination = 'syslog'
+    '';  
+
 in
 
 {
@@ -52,14 +60,6 @@ in
         '';
       };
       
-      subServices = mkOption {
-        default = [];
-        description = ''
-          Subservices list. As it is already implememnted, 
-          here is an interface...
-        '';
-      };
-      
       authentication = mkOption {
         default = ''
           # Generated file; do not edit!
@@ -68,14 +68,14 @@ in
           host  all all ::1/128      md5
         '';
         description = ''
-          Hosts (except localhost), who you allow to connect.
+          Defines how users authenticate themselves to the server.
         '';
       };
       
-      allowedHosts = mkOption {
-        default = [];
+      identMap = mkOption {
+        default = "";
         description = ''
-          Hosts (except localhost), who you allow to connect.
+          Defines the mapping from system users to database users.
         '';
       };
       
@@ -130,9 +130,10 @@ in
                 mkdir -m 0700 -p ${cfg.dataDir}
                 chown -R postgres ${cfg.dataDir}
                 ${run} -c '${postgresql}/bin/initdb -U root'
+                rm -f ${cfg.dataDir}/*.conf
             fi
-            
-            cp -f ${pkgs.writeText "pg_hba.conf" cfg.authentication} ${cfg.dataDir}/pg_hba.conf
+
+            ln -sfn ${configFile} ${cfg.dataDir}/postgresql.conf
 
             # We'd like to use the `-w' flag here to wait until the
             # database is up, but it requires a `postgres' user to
@@ -144,7 +145,7 @@ in
             while ! ${run} -c '${postgresql}/bin/pg_ctl status'; do
                 sleep 1
             done
-          '';
+          ''; # */
 
         postStop =
           ''
-- 
GitLab


From f99d9b06586dcbd50765df89a59c76bc87120640 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 2 Dec 2009 17:59:17 +0000
Subject: [PATCH 2046/5331] =?UTF-8?q?*=20Basic=20MediaWiki=20module.=20=20?=
 =?UTF-8?q?Thanks=20to=20Dario=20Vodopivec,=20Milan=20Sene=C5=A1i=20and=20?=
 =?UTF-8?q?=20=20Nasir=20Shadravan.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

svn path=/nixos/trunk/; revision=18769
---
 .../web-servers/apache-httpd/mediawiki.nix    | 176 ++++++++++++++++++
 1 file changed, 176 insertions(+)
 create mode 100644 modules/services/web-servers/apache-httpd/mediawiki.nix

diff --git a/modules/services/web-servers/apache-httpd/mediawiki.nix b/modules/services/web-servers/apache-httpd/mediawiki.nix
new file mode 100644
index 00000000000..b2d6c31299a
--- /dev/null
+++ b/modules/services/web-servers/apache-httpd/mediawiki.nix
@@ -0,0 +1,176 @@
+{ config, pkgs, serverInfo, ... }:
+
+with pkgs.lib;
+
+let
+
+  mediawikiConfig = pkgs.writeText "LocalSettings.php"
+    ''
+      <?php
+        # Copied verbatim from the default (generated) LocalSettings.php.
+        if( defined( 'MW_INSTALL_PATH' ) ) {
+                $IP = MW_INSTALL_PATH;
+        } else {
+                $IP = dirname( __FILE__ );
+        }
+
+        $path = array( $IP, "$IP/includes", "$IP/languages" );
+        set_include_path( implode( PATH_SEPARATOR, $path ) . PATH_SEPARATOR . get_include_path() );
+
+        require_once( "$IP/includes/DefaultSettings.php" );
+
+        if ( $wgCommandLineMode ) {
+                if ( isset( $_SERVER ) && array_key_exists( 'REQUEST_METHOD', $_SERVER ) ) {
+                        die( "This script must be run from the command line\n" );
+                }
+        }
+
+        $wgScriptPath = "${config.urlPrefix}";
+
+        # We probably need to set $wgSecretKey and $wgCacheEpoch.
+
+        # Paths to external programs.
+        $wgDiff3 = "${pkgs.diffutils}/bin/diff3";
+        $wgDiff = "${pkgs.diffutils}/bin/diff";
+        $wgImageMagickConvertCommand = "${pkgs.imagemagick}/bin/convert";
+
+        $wgDebugLogFile = "/tmp/mediawiki_debug_log.txt";
+
+        # Database configuration.
+        $wgDBtype = "postgres";
+        $wgDBserver = "";
+        $wgDBuser = "wwwrun";
+        $wgDBname = "mediawiki";
+      ?>
+    '';
+
+  # Unpack Mediawiki and put the config file in its root directory.
+  mediawikiRoot = pkgs.stdenv.mkDerivation rec {
+    name= "mediawiki-1.15.1";
+    
+    src = pkgs.fetchurl {
+      url = "http://download.wikimedia.org/mediawiki/1.15/${name}.tar.gz";
+      sha256 = "0i6sb6p4ng38i8s3az42j6wnw6fpxvv3l9cvraav6wsn2cdj4jh4";
+    };
+
+    buildPhase = "true";
+
+    installPhase =
+      ''
+        ensureDir $out
+        cp -r * $out
+        cp ${mediawikiConfig} $out/LocalSettings.php
+      '';
+  };
+  
+in
+
+{
+
+  extraConfig =
+    ''
+      Alias ${config.urlPrefix} ${mediawikiRoot}
+
+      <Directory ${mediawikiRoot}>
+          Order allow,deny
+          Allow from all
+          DirectoryIndex index.php
+      </Directory>
+    '';
+
+  options = {
+
+    /*
+    dbName = mkOption {
+      example = "wikidb";
+      default = "wikidb";
+      description = "
+        Name of the wiki database that holds MediaWiki data.
+      ";
+    };
+    
+    dbEmergencyContact = mkOption {
+      example = "admin@example.com";
+      default = "e.dolstra@tudelft.nl";
+      description = "
+	In case of emergency, contact this e-mail.
+      ";
+    };
+    
+    dbPasswordSender = mkOption {
+      example = "passwordrecovery@example.com";
+      default = "e.dolstra@tudelft.nl";
+      description = "
+	From which e-mail the recovery password for database users will be sent
+      ";
+    };
+
+    dbType = mkOption {
+      example = "mysql";
+      default = "mysql";
+      description = "
+	Which type of database should be used
+      ";
+    };
+
+    dbServer = mkOption {
+      example = "10.0.2.2";
+      default = "10.0.2.2";
+      description = "
+	The location of the database server, e.g. localhost or remote ip address.
+      ";
+    };
+
+    dbPortNumber = mkOption {
+      example = "3306";
+      default = "3306";
+      description = "
+	Portnumber used to connect to the database server. Default: 3306.
+      ";
+    };
+
+    dbUser = mkOption {
+      example = "root";
+      default = "root";
+      description = "
+	The username for accessing the database.
+      ";
+    };
+    
+    dbPassword = mkOption {
+      example = "foobar";
+      default = "";
+      description = "
+	The dbUser's password.
+      ";
+    };
+    
+    dbSiteName = mkOption {
+      example = "wikipedia";
+      default = "wiki";
+      description = "
+	Name of the wiki site.
+      ";
+    };
+    */
+
+    urlPrefix = mkOption {
+      example = "/wiki";
+      default = "/wiki";
+      description = ''
+        The URL prefix under which the Mediawiki service appears.
+      '';
+    };
+
+  };
+
+  startupScript = pkgs.writeScript "mediawiki_startup.sh"
+    ''
+      if ! ${pkgs.postgresql}/bin/psql -l | grep -q ' mediawiki ' ; then
+          ${pkgs.postgresql}/bin/createuser --no-superuser --no-createdb --no-createrole wwwrun || true
+          ${pkgs.postgresql}/bin/createdb mediawiki -O wwwrun
+          ${pkgs.su}/bin/su -s ${pkgs.stdenv.shell} wwwrun -c "(echo 'CREATE LANGUAGE plpgsql;'; cat /nix/store/q9gdf3f4362yhsdi8inlhpk26d9b8af6-mediawiki-1.15.1/maintenance/postgres/tables.sql; echo 'CREATE TEXT SEARCH CONFIGURATION public.default ( COPY = pg_catalog.english );'; echo COMMIT) | ${pkgs.postgresql}/bin/psql mediawiki"
+      fi
+    '';
+
+}
-- 
GitLab


From 81c3454cdbf6e42fc4a5a6761d8749158f127f24 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 3 Dec 2009 08:25:16 +0000
Subject: [PATCH 2047/5331] * Allow Mediawiki (and other PHP applications) to
 send email through   the `sendmail' command (i.e. ssmtp).  This is hacky -
 there should   be some global config value that specifies the path to
 sendmail,   which the ssmtp module and others can then set.

svn path=/nixos/trunk/; revision=18777
---
 .../web-servers/apache-httpd/default.nix      | 93 +++----------------
 .../web-servers/apache-httpd/mediawiki.nix    |  4 +-
 2 files changed, 17 insertions(+), 80 deletions(-)

diff --git a/modules/services/web-servers/apache-httpd/default.nix b/modules/services/web-servers/apache-httpd/default.nix
index c70d99db964..91fce4f8dff 100644
--- a/modules/services/web-servers/apache-httpd/default.nix
+++ b/modules/services/web-servers/apache-httpd/default.nix
@@ -464,84 +464,6 @@ in
         '';
       };
 
-
-      subservices = {
-
-        # !!! remove this
-        subversion = {
-
-          enable = mkOption {
-            default = false;
-            description = "
-              Whether to enable the Subversion subservice in the webserver.
-            ";
-          };
-
-          notificationSender = mkOption {
-            default = "svn-server@example.org";
-            example = "svn-server@example.org";
-            description = "
-              The email address used in the Sender field of commit
-              notification messages sent by the Subversion subservice.
-            ";
-          };
-
-          userCreationDomain = mkOption {
-            default = "example.org"; 
-            example = "example.org";
-            description = "
-              The domain from which user creation is allowed.  A client can
-              only create a new user account if its IP address resolves to
-              this domain.
-            ";
-          };
-
-          autoVersioning = mkOption {
-            default = false;
-            description = "
-              Whether you want the Subversion subservice to support
-              auto-versioning, which enables Subversion repositories to be
-              mounted as read/writable file systems on operating systems that
-              support WebDAV.
-            ";
-          };
-
-          dataDir = mkOption {
-            default = "/no/such/path/exists";
-            description = "
-              Place to put SVN repository.
-            ";
-          };
-
-          organization = {
-
-            name = mkOption {
-              default = null;
-              description = "
-                Name of the organization hosting the Subversion service.
-              ";
-            };
-
-            url = mkOption {
-              default = null;
-              description = "
-                URL of the website of the organization hosting the Subversion service.
-              ";
-            };
-
-            logo = mkOption {
-              default = null;
-              description = "
-                Logo the organization hosting the Subversion service.
-              ";
-            };
-
-          };
-
-        };
-
-      };
-
     }
 
     # Include the options shared between the main server and virtual hosts.
@@ -590,7 +512,20 @@ in
             # with coverage enabled.
            GCOV_PREFIX = "/tmp/coverage-data";
 
-           PATH = "${pkgs.coreutils}/bin:${pkgs.gnugrep}/bin:${concatStringsSep ":" (concatMap (svc: svc.extraServerPath) allSubservices)}";
+           PATH = concatStringsSep ":" (
+             [ "${pkgs.coreutils}/bin" "${pkgs.gnugrep}/bin" ]
+             ++ # Needed for PHP's mail() function.  !!! Probably the
+                # ssmtp module should export the path to sendmail in
+                # some way.
+                optional config.networking.defaultMailServer.directDelivery "${pkgs.ssmtp}/sbin"
+             ++ (concatMap (svc: svc.extraServerPath) allSubservices) );
+
+           PHPRC = pkgs.writeText "php.ini"
+             ''
+               ; Needed for PHP's mail() function.
+               sendmail_path = sendmail -t -i
+             '';
+           
           } // (listToAttrs (concatMap (svc: svc.globalEnvVars) allSubservices));
 
         preStart =
diff --git a/modules/services/web-servers/apache-httpd/mediawiki.nix b/modules/services/web-servers/apache-httpd/mediawiki.nix
index b2d6c31299a..3ae8d54a816 100644
--- a/modules/services/web-servers/apache-httpd/mediawiki.nix
+++ b/modules/services/web-servers/apache-httpd/mediawiki.nix
@@ -41,6 +41,9 @@ let
         $wgDBserver = "";
         $wgDBuser = "wwwrun";
         $wgDBname = "mediawiki";
+
+        $wgEmergencyContact = "${serverInfo.serverConfig.adminAddr}";
+        $wgPasswordSender = $wgEmergencyContact;
       ?>
     '';
 
@@ -172,5 +175,4 @@ in
           ${pkgs.su}/bin/su -s ${pkgs.stdenv.shell} wwwrun -c "(echo 'CREATE LANGUAGE plpgsql;'; cat /nix/store/q9gdf3f4362yhsdi8inlhpk26d9b8af6-mediawiki-1.15.1/maintenance/postgres/tables.sql; echo 'CREATE TEXT SEARCH CONFIGURATION public.default ( COPY = pg_catalog.english );'; echo COMMIT) | ${pkgs.postgresql}/bin/psql mediawiki"
       fi
     '';
-
 }
-- 
GitLab


From c7e0a7b31c8e13897b914912e60dcc2706d8def2 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 3 Dec 2009 08:44:54 +0000
Subject: [PATCH 2048/5331] * Make it configurable.

svn path=/nixos/trunk/; revision=18778
---
 .../web-servers/apache-httpd/mediawiki.nix    | 145 +++++++++---------
 1 file changed, 76 insertions(+), 69 deletions(-)

diff --git a/modules/services/web-servers/apache-httpd/mediawiki.nix b/modules/services/web-servers/apache-httpd/mediawiki.nix
index 3ae8d54a816..a2f5197b3f5 100644
--- a/modules/services/web-servers/apache-httpd/mediawiki.nix
+++ b/modules/services/web-servers/apache-httpd/mediawiki.nix
@@ -37,13 +37,19 @@ let
         $wgDebugLogFile = "/tmp/mediawiki_debug_log.txt";
 
         # Database configuration.
-        $wgDBtype = "postgres";
-        $wgDBserver = "";
-        $wgDBuser = "wwwrun";
-        $wgDBname = "mediawiki";
+        $wgDBtype = "${config.dbType}";
+        $wgDBserver = "${config.dbServer}";
+        $wgDBuser = "${config.dbUser}";
+        $wgDBpassword = "${config.dbPassword}";
+        $wgDBname = "${config.dbName}";
 
-        $wgEmergencyContact = "${serverInfo.serverConfig.adminAddr}";
-        $wgPasswordSender = $wgEmergencyContact;
+        # E-mail.
+        $wgEmergencyContact = "${config.emergencyContact}";
+        $wgPasswordSender = "${config.passwordSender}";
+
+        $wgSitename = "${config.siteName}";
+
+        ${config.extraConfig}
       ?>
     '';
 
@@ -83,79 +89,65 @@ in
 
   options = {
 
-    /*
-    dbName = mkOption {
-      example = "wikidb";
-      default = "wikidb";
-      description = "
-        Name of the wiki database that holds MediaWiki data.
-      ";
-    };
-    
-    dbEmergencyContact = mkOption {
-      example = "admin@example.com";
-      default = "e.dolstra@tudelft.nl";
-      description = "
-	In case of emergency, contact this e-mail.
-      ";
-    };
-    
-    dbPasswordSender = mkOption {
-      example = "passwordrecovery@example.com";
-      default = "e.dolstra@tudelft.nl";
-      description = "
-	From which e-mail the recovery password for database users will be sent
-      ";
-    };
-
     dbType = mkOption {
+      default = "postgres";
       example = "mysql";
-      default = "mysql";
-      description = "
-	Which type of database should be used
-      ";
+      description = "Database type.";
     };
 
+    dbName = mkOption {
+      default = "mediawiki";
+      description = "Name of the database that holds the MediaWiki data.";
+    };
+    
     dbServer = mkOption {
+      default = ""; # use a Unix domain socket
       example = "10.0.2.2";
-      default = "10.0.2.2";
-      description = "
-	The location of the database server, e.g. localhost or remote ip address.
-      ";
-    };
-
-    dbPortNumber = mkOption {
-      example = "3306";
-      default = "3306";
-      description = "
-	Portnumber used to connect to the database server. Default: 3306.
-      ";
+      description = ''
+	The location of the database server.  Leave empty to use a
+        database server running on the same machine through a Unix
+        domain socket.
+      '';
     };
 
     dbUser = mkOption {
-      example = "root";
-      default = "root";
-      description = "
-	The username for accessing the database.
-      ";
+      default = "wwwrun";
+      example = "mediawiki";
+      description = "The user name for accessing the database.";
     };
     
     dbPassword = mkOption {
-      example = "foobar";
       default = "";
-      description = "
-	The dbUser's password.
-      ";
+      example = "foobar";
+      description = ''
+        The password of the database user.  Warning: this is stored in
+        cleartext in the Nix store!
+      '';
     };
     
-    dbSiteName = mkOption {
-      example = "wikipedia";
-      default = "wiki";
-      description = "
-	Name of the wiki site.
-      ";
+    emergencyContact = mkOption {
+      default = serverInfo.serverConfig.adminAddr;
+      example = "admin@example.com";
+      description = ''
+        Emergency contact e-mail address.  Defaults to the Apache
+        admin address.
+      '';
+    };
+    
+    passwordSender = mkOption {
+      default = serverInfo.serverConfig.adminAddr;
+      example = "password@example.com";
+      description = ''
+        E-mail address from which password confirmations originate.
+        Defaults to the Apache admin address.
+      '';
+    };
+
+    siteName = mkOption {
+      default = "MediaWiki";
+      example = "Foobar Wiki";
+      description = "Name of the wiki";
     };
-    */
 
     urlPrefix = mkOption {
       example = "/wiki";
@@ -165,14 +157,29 @@ in
       '';
     };
 
+    extraConfig = mkOption {
+      default = "";
+      example =
+        ''
+          $wgEnableEmail = false;
+        '';
+      description = ''
+        Any additional text to be appended to MediaWiki's
+        configuration file.  This is a PHP script.  For configuration
+        settings, see <link xlink:href='http://www.mediawiki.org/wiki/Manual:Configuration_settings'/>.
+      '';
+    };
+
   };
 
   startupScript = pkgs.writeScript "mediawiki_startup.sh"
-    ''
-      if ! ${pkgs.postgresql}/bin/psql -l | grep -q ' mediawiki ' ; then
-          ${pkgs.postgresql}/bin/createuser --no-superuser --no-createdb --no-createrole wwwrun || true
-          ${pkgs.postgresql}/bin/createdb mediawiki -O wwwrun
-          ${pkgs.su}/bin/su -s ${pkgs.stdenv.shell} wwwrun -c "(echo 'CREATE LANGUAGE plpgsql;'; cat /nix/store/q9gdf3f4362yhsdi8inlhpk26d9b8af6-mediawiki-1.15.1/maintenance/postgres/tables.sql; echo 'CREATE TEXT SEARCH CONFIGURATION public.default ( COPY = pg_catalog.english );'; echo COMMIT) | ${pkgs.postgresql}/bin/psql mediawiki"
+    # Initialise the database automagically if we're using a Postgres
+    # server on localhost.
+    (optionalString (config.dbType == "postgres" && config.dbServer == "") ''
+      if ! ${pkgs.postgresql}/bin/psql -l | grep -q ' ${config.dbName} ' ; then
+          ${pkgs.postgresql}/bin/createuser --no-superuser --no-createdb --no-createrole "${config.dbUser}" || true
+          ${pkgs.postgresql}/bin/createdb "${config.dbName}" -O "${config.dbUser}"
+          ${pkgs.su}/bin/su -s ${pkgs.stdenv.shell} "${config.dbUser}" -c "(echo 'CREATE LANGUAGE plpgsql;'; cat ${mediawikiRoot}/maintenance/postgres/tables.sql; echo 'CREATE TEXT SEARCH CONFIGURATION public.default ( COPY = pg_catalog.english );'; echo COMMIT) | ${pkgs.postgresql}/bin/psql ${config.dbName}"
       fi
-    '';
+    '');
 }
-- 
GitLab


From 9f8fc09fc31071c606df18e58b188365194237ab Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 3 Dec 2009 11:56:03 +0000
Subject: [PATCH 2049/5331] * Create a user "mediawiki" and give root and
 wwwrun ident-based   access.

svn path=/nixos/trunk/; revision=18779
---
 modules/services/databases/postgresql.nix               | 8 ++++++++
 modules/services/web-servers/apache-httpd/mediawiki.nix | 9 ++++++---
 2 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/modules/services/databases/postgresql.nix b/modules/services/databases/postgresql.nix
index 16056ab96a7..4a51d47b038 100644
--- a/modules/services/databases/postgresql.nix
+++ b/modules/services/databases/postgresql.nix
@@ -63,6 +63,7 @@ in
       authentication = mkOption {
         default = ''
           # Generated file; do not edit!
+          local all mediawiki        ident mediawiki-users
           local all all              ident sameuser
           host  all all 127.0.0.1/32 md5
           host  all all ::1/128      md5
@@ -113,6 +114,13 @@ in
 
     environment.systemPackages = [postgresql];
 
+    # !!! This should be be in the mediawiki module, obviously.
+    services.postgresql.identMap =
+      ''
+        mediawiki-users root   mediawiki
+        mediawiki-users wwwrun mediawiki
+      '';
+
     jobs.postgresql =
       { description = "PostgreSQL server";
 
diff --git a/modules/services/web-servers/apache-httpd/mediawiki.nix b/modules/services/web-servers/apache-httpd/mediawiki.nix
index a2f5197b3f5..f694f1701e6 100644
--- a/modules/services/web-servers/apache-httpd/mediawiki.nix
+++ b/modules/services/web-servers/apache-httpd/mediawiki.nix
@@ -111,8 +111,7 @@ in
     };
 
     dbUser = mkOption {
-      default = "wwwrun";
-      example = "mediawiki";
+      default = "mediawiki";
       description = "The user name for accessing the database.";
     };
     
@@ -179,7 +178,11 @@ in
       if ! ${pkgs.postgresql}/bin/psql -l | grep -q ' ${config.dbName} ' ; then
           ${pkgs.postgresql}/bin/createuser --no-superuser --no-createdb --no-createrole "${config.dbUser}" || true
           ${pkgs.postgresql}/bin/createdb "${config.dbName}" -O "${config.dbUser}"
-          ${pkgs.su}/bin/su -s ${pkgs.stdenv.shell} "${config.dbUser}" -c "(echo 'CREATE LANGUAGE plpgsql;'; cat ${mediawikiRoot}/maintenance/postgres/tables.sql; echo 'CREATE TEXT SEARCH CONFIGURATION public.default ( COPY = pg_catalog.english );'; echo COMMIT) | ${pkgs.postgresql}/bin/psql ${config.dbName}"
+          ( echo 'CREATE LANGUAGE plpgsql;'
+            cat ${mediawikiRoot}/maintenance/postgres/tables.sql
+            echo 'CREATE TEXT SEARCH CONFIGURATION public.default ( COPY = pg_catalog.english );'
+            echo COMMIT
+          ) | ${pkgs.postgresql}/bin/psql -U "${config.dbUser}" "${config.dbName}"
       fi
     '');
 }
-- 
GitLab


From aacd16cff0d5e6ee97aaf05eeefdbee2b22b5020 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 3 Dec 2009 12:20:24 +0000
Subject: [PATCH 2050/5331] * Make various MediaWiki scripts available in
 $PATH,   e.g. mediawiki-<id>-changePassword (where <id> is usually "main").

svn path=/nixos/trunk/; revision=18780
---
 modules/services/databases/postgresql.nix     |  7 +++---
 .../web-servers/apache-httpd/mediawiki.nix    | 23 +++++++++++++++++++
 2 files changed, 27 insertions(+), 3 deletions(-)

diff --git a/modules/services/databases/postgresql.nix b/modules/services/databases/postgresql.nix
index 4a51d47b038..df41fdad513 100644
--- a/modules/services/databases/postgresql.nix
+++ b/modules/services/databases/postgresql.nix
@@ -1,7 +1,8 @@
-{pkgs, config, ...}:
+{ config, pkgs, ... }:
+
+with pkgs.lib;
 
 let
-  inherit (pkgs.lib) mkOption mkIf singleton;
 
   cfg = config.services.postgresql;
 
@@ -12,7 +13,7 @@ let
 
   run = "${pkgs.su}/bin/su -s ${pkgs.stdenv.shell} postgres";
 
-  flags = if cfg.enableTCPIP then ["-i"] else [];
+  flags = optional cfg.enableTCPIP "-i";
 
   # The main PostgreSQL configuration file.
   configFile = pkgs.writeText "postgresql.conf"
diff --git a/modules/services/web-servers/apache-httpd/mediawiki.nix b/modules/services/web-servers/apache-httpd/mediawiki.nix
index f694f1701e6..13dee652bcc 100644
--- a/modules/services/web-servers/apache-httpd/mediawiki.nix
+++ b/modules/services/web-servers/apache-httpd/mediawiki.nix
@@ -71,6 +71,16 @@ let
         cp ${mediawikiConfig} $out/LocalSettings.php
       '';
   };
+
+  mediawikiScripts = pkgs.runCommand "mediawiki-${config.id}-scripts"
+    { buildInputs = [ pkgs.makeWrapper ]; }
+    ''
+      ensureDir $out/bin
+      for i in changePassword.php createAndPromote.php userOptions.php edit.php nukePage.php; do
+        makeWrapper ${pkgs.php}/bin/php $out/bin/mediawiki-${config.id}-$(basename $i .php) \
+          --add-flags ${mediawikiRoot}/maintenance/$i
+      done
+    '';
   
 in
 
@@ -89,6 +99,16 @@ in
 
   options = {
 
+    id = mkOption {
+      default = "main";
+      description = ''
+        A unique identifier necessary to keep multiple MediaWiki server
+        instances on the same machine apart.  This is used to
+        disambiguate the administrative scripts, which get names like
+        mediawiki-$id-change-password.
+      '';
+    };
+
     dbType = mkOption {
       default = "postgres";
       example = "mysql";
@@ -171,6 +191,8 @@ in
 
   };
 
+  extraPath = [ mediawikiScripts ];
+  
   startupScript = pkgs.writeScript "mediawiki_startup.sh"
     # Initialise the database automagically if we're using a Postgres
     # server on localhost.
@@ -185,4 +207,5 @@ in
           ) | ${pkgs.postgresql}/bin/psql -U "${config.dbUser}" "${config.dbName}"
       fi
     '');
+    
 }
-- 
GitLab


From 4eabed3f0f31d8ed53e046fd01989629f03500fc Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 3 Dec 2009 13:34:36 +0000
Subject: [PATCH 2051/5331] * Support short URLs (http://server/wiki/Page
 instead of   http://server/w/index.php?title=Page).

svn path=/nixos/trunk/; revision=18783
---
 .../web-servers/apache-httpd/mediawiki.nix    | 41 +++++++++++++++++--
 1 file changed, 38 insertions(+), 3 deletions(-)

diff --git a/modules/services/web-servers/apache-httpd/mediawiki.nix b/modules/services/web-servers/apache-httpd/mediawiki.nix
index 13dee652bcc..83aa243b7b5 100644
--- a/modules/services/web-servers/apache-httpd/mediawiki.nix
+++ b/modules/services/web-servers/apache-httpd/mediawiki.nix
@@ -49,6 +49,14 @@ let
 
         $wgSitename = "${config.siteName}";
 
+        ${optionalString (config.logo != "") ''
+          $wgLogo = "${config.logo}";
+        ''}
+
+        ${optionalString (config.articleUrlPrefix != "") ''
+          $wgArticlePath = "${config.articleUrlPrefix}/$1";
+        ''}
+
         ${config.extraConfig}
       ?>
     '';
@@ -95,6 +103,10 @@ in
           Allow from all
           DirectoryIndex index.php
       </Directory>
+
+      ${optionalString (config.articleUrlPrefix != "") ''
+        Alias ${config.articleUrlPrefix} ${mediawikiRoot}/index.php
+      ''}
     '';
 
   options = {
@@ -168,14 +180,29 @@ in
       description = "Name of the wiki";
     };
 
+    logo = mkOption {
+      default = "";
+      example = "/images/logo.png";
+      description = "The URL of the site's logo (which should be a 135x135px image).";
+    };
+
     urlPrefix = mkOption {
-      example = "/wiki";
-      default = "/wiki";
+      default = "/w";
       description = ''
         The URL prefix under which the Mediawiki service appears.
       '';
     };
 
+    articleUrlPrefix = mkOption {
+      default = "/wiki";
+      example = "";
+      description = ''
+        The URL prefix under which article pages appear,
+        e.g. http://server/wiki/Page.  Leave empty to use the main URL
+        prefix, e.g. http://server/w/index.php?title=Page.
+      '';
+    };
+
     extraConfig = mkOption {
       default = "";
       example =
@@ -207,5 +234,13 @@ in
           ) | ${pkgs.postgresql}/bin/psql -U "${config.dbUser}" "${config.dbName}"
       fi
     '');
-    
+
+  robotsEntries = optionalString (config.articleUrlPrefix != "")
+    ''
+      User-agent: *
+      Disallow: ${config.urlPrefix}/
+      Disallow: ${config.articleUrlPrefix}/Special:Search
+      Disallow: ${config.articleUrlPrefix}/Special:Random
+    '';
+
 }
-- 
GitLab


From f4a6f9e84bd51611a924aecf6c7c23e149f13215 Mon Sep 17 00:00:00 2001
From: Nicolas Pierron <nicolas.b.pierron@gmail.com>
Date: Fri, 4 Dec 2009 12:50:44 +0000
Subject: [PATCH 2052/5331] * Add options to handle automatic calls to the
 garbage collector.

  These options avoid manual references to pkgs.nixUnstable which might be
  changed with environment.nix option.

svn path=/nixos/trunk/; revision=18798
---
 modules/module-list.nix          |  1 +
 modules/services/misc/nix-gc.nix | 54 ++++++++++++++++++++++++++++++++
 2 files changed, 55 insertions(+)
 create mode 100644 modules/services/misc/nix-gc.nix

diff --git a/modules/module-list.nix b/modules/module-list.nix
index f80d4d6a586..d793c715202 100644
--- a/modules/module-list.nix
+++ b/modules/module-list.nix
@@ -54,6 +54,7 @@
   ./services/misc/disnix.nix
   ./services/misc/gpsd.nix
   ./services/misc/nix-daemon.nix
+  ./services/misc/nix-gc.nix
   ./services/misc/nixos-manual.nix
   ./services/misc/rogue.nix
   ./services/misc/synergy.nix
diff --git a/modules/services/misc/nix-gc.nix b/modules/services/misc/nix-gc.nix
new file mode 100644
index 00000000000..942e7996da0
--- /dev/null
+++ b/modules/services/misc/nix-gc.nix
@@ -0,0 +1,54 @@
+{ config, pkgs, ... }:
+
+with pkgs.lib;
+
+let
+  nix = config.environment.nix;
+  cfg = config.nix.gc;
+in
+
+{
+
+  ###### interface
+
+  options = {
+    nix.gc = {
+
+      automatic = mkOption {
+        default = false;
+        example = true;
+        description = "
+          Automatically run the garbage collector at specified dates.
+        ";
+      };
+
+      dates = mkOption {
+        default = "15 03 * * *";
+        description = "
+          Run the garbage collector at specified dates to avoid full
+          hard-drives.
+        ";
+      };
+
+      options = mkOption {
+        default = "";
+        example = "--max-freed $((64 * 1024**3))";
+        description = "
+          Options given to <filename>nix-collect-garbage</filename> when the
+          garbage collector is run automatically.
+        ";
+      };
+
+    };
+  };
+
+
+  ###### implementation
+
+  config = mkIf cfg.automatic {
+    services.cron.systemCronJobs = [
+      "${cfg.dates} root ${nix}/bin/nix-collect-garbage ${cfg.options} > /var/log/gc.log 2>&1"
+    ];
+  };
+
+}
-- 
GitLab


From 05c23802bb30f522b229dae762e0ed78979e84a8 Mon Sep 17 00:00:00 2001
From: Nicolas Pierron <nicolas.b.pierron@gmail.com>
Date: Fri, 4 Dec 2009 12:50:49 +0000
Subject: [PATCH 2053/5331] Fix synergy client. * Add serverAddress option. *
 Evaluate the client daemon in foreground, otherwise upstart get the hand  
 and tries to restart it.

svn path=/nixos/trunk/; revision=18799
---
 modules/services/misc/synergy.nix | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/modules/services/misc/synergy.nix b/modules/services/misc/synergy.nix
index 96616fa7a73..5d21e281b75 100644
--- a/modules/services/misc/synergy.nix
+++ b/modules/services/misc/synergy.nix
@@ -32,6 +32,13 @@ in
             ourselfs to the server.
             ";
         };
+        serverAddress = mkOption {
+          description = " 
+            The server address is of the form: [hostname][:port].  The
+            hostname must be the address or hostname of the server.  The
+            port overrides the default port, 24800.
+          ";
+        };
       };
 
       server = {
@@ -79,7 +86,10 @@ in
             startOn = "started network-interfaces";
             stopOn = "stopping network-interfaces";
 
-            exec = "${pkgs.synergy}/bin/synergyc ${if cfgS.screenName == "" then "" else "-n ${cfgS.screenName}" }";
+            exec = ''${pkgs.synergy}/bin/synergyc \
+              -f ${if cfgC.screenName == "" then "" else "-n ${cfgC.screenName}"} \
+              ${cfgC.serverAddress}
+            '';
           };
         }
         
-- 
GitLab


From 82a891dc46ac335ddc989a753b8081c9677777ec Mon Sep 17 00:00:00 2001
From: Nicolas Pierron <nicolas.b.pierron@gmail.com>
Date: Sat, 5 Dec 2009 19:21:57 +0000
Subject: [PATCH 2054/5331] Add support for require attributes inside children
 configurations.

svn path=/nixos/trunk/; revision=18820
---
 modules/system/activation/top-level.nix | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/modules/system/activation/top-level.nix b/modules/system/activation/top-level.nix
index 1d1fef29902..6bae1616df1 100644
--- a/modules/system/activation/top-level.nix
+++ b/modules/system/activation/top-level.nix
@@ -41,16 +41,17 @@ let
   # you can provide an easy way to boot the same configuration 
   # as you use, but with another kernel
   # !!! fix this
-  children =
+  children = with pkgs.lib;
     map (childConfig:
-      (import ../../../default.nix {
-        configuration =
-          pkgs.lib.recursiveUpdate childConfig {
+      (import ../../../lib/eval-config.nix {
+        modules = [
+          (recursiveUpdate childConfig {
             boot.loader.grub.device = "";
             # undefined the obsolete name of the previous option.
             boot.grubDevice = pkgs.lib.mkNotdef;
-          };
-      }).system
+          })
+        ] ++ attrByPath ["require"] [] childConfig;
+      }).config.system.build.toplevel
     ) config.nesting.children;
 
 
-- 
GitLab


From 12401536fcfc24ee6d82f68af5a5035a711badcc Mon Sep 17 00:00:00 2001
From: Nicolas Pierron <nicolas.b.pierron@gmail.com>
Date: Sat, 5 Dec 2009 19:22:02 +0000
Subject: [PATCH 2055/5331] Replace the check function with a function
 specialized for modules.

svn path=/nixos/trunk/; revision=18821
---
 lib/eval-config.nix | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/lib/eval-config.nix b/lib/eval-config.nix
index a0d34b4701f..28db11e45c5 100644
--- a/lib/eval-config.nix
+++ b/lib/eval-config.nix
@@ -61,7 +61,8 @@ rec {
 
   # Optionally check wether all config values have corresponding
   # option declarations.
-  config = pkgs.checker optionDefinitions
-    optionDefinitions.environment.checkConfigurationOptions
-    options optionDefinitions;
+  config =
+    let doCheck = optionDefinitions.environment.checkConfigurationOptions; in
+    assert doCheck -> pkgs.lib.checkModule "" systemModule;
+    systemModule.config;
 }
-- 
GitLab


From ed6d8c6881c530d55ecb95f369ef8e18ffbb56db Mon Sep 17 00:00:00 2001
From: Rob Vermaas <rob.vermaas@gmail.com>
Date: Tue, 8 Dec 2009 11:41:21 +0000
Subject: [PATCH 2056/5331] due to new upstart version, vm tests didn't work
 anymore

svn path=/nixos/trunk/; revision=18840
---
 lib/test-driver/Machine.pm               | 4 ++--
 modules/testing/test-instrumentation.nix | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib/test-driver/Machine.pm b/lib/test-driver/Machine.pm
index 782a50956f7..3d145cc32ab 100644
--- a/lib/test-driver/Machine.pm
+++ b/lib/test-driver/Machine.pm
@@ -180,7 +180,7 @@ sub waitForJob {
     my ($self, $jobName) = @_;
     while (1) {
         my ($status, $out) = $self->execute("initctl status $jobName");
-        return if $out =~ /\(start\)\s+running/;
+        return if $out =~ /start\/running/;
         sleep 1;
         # !!! need a timeout
     }
@@ -204,7 +204,7 @@ sub stopJob {
     $self->execute("initctl stop $jobName");
     while (1) {
         my ($status, $out) = $self->execute("initctl status $jobName");
-        return if $out =~ /\(stop\)\s+waiting/;
+        return if $out =~ /stop\/waiting/;
         sleep 1;
         # !!! need a timeout
     }
diff --git a/modules/testing/test-instrumentation.nix b/modules/testing/test-instrumentation.nix
index 64f7729cd73..a573d2b9f90 100644
--- a/modules/testing/test-instrumentation.nix
+++ b/modules/testing/test-instrumentation.nix
@@ -10,7 +10,7 @@ with pkgs.lib;
   config = {
 
     jobs.backdoor =
-      { startOn = "network-interfaces";
+      { startOn = "started network-interfaces";
         
         preStart =
           ''
-- 
GitLab


From e0d69c92a89eeeaeb7ce857377d3418756b8998b Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 9 Dec 2009 15:05:13 +0000
Subject: [PATCH 2057/5331] * Added a manpage for nixos-rebuild.

svn path=/nixos/trunk/; revision=18855
---
 doc/manual/man-nixos-rebuild.xml | 307 +++++++++++++++++++++++++++++++
 doc/manual/man-pages.xml         |   1 +
 2 files changed, 308 insertions(+)
 create mode 100644 doc/manual/man-nixos-rebuild.xml

diff --git a/doc/manual/man-nixos-rebuild.xml b/doc/manual/man-nixos-rebuild.xml
new file mode 100644
index 00000000000..0bdc925efd9
--- /dev/null
+++ b/doc/manual/man-nixos-rebuild.xml
@@ -0,0 +1,307 @@
+<refentry xmlns="http://docbook.org/ns/docbook"
+          xmlns:xlink="http://www.w3.org/1999/xlink"
+          xmlns:xi="http://www.w3.org/2001/XInclude">
+  
+<refmeta>
+  <refentrytitle><command>nixos-rebuild</command></refentrytitle>
+  <manvolnum>8</manvolnum>
+  <refmiscinfo class="source">NixOS</refmiscinfo>
+  <!-- <refmiscinfo class="version"><xi:include href="version.txt" parse="text"/></refmiscinfo> -->
+</refmeta>
+
+<refnamediv>
+  <refname><command>nixos-rebuild</command></refname>
+  <refpurpose>reconfigure a NixOS machine</refpurpose>
+</refnamediv>
+
+<refsynopsisdiv>
+  <cmdsynopsis>
+    <command>nixos-rebuild</command>
+    <group choice='req'>
+      <arg choice='plain'><option>switch</option></arg>
+      <arg choice='plain'><option>boot</option></arg>
+      <arg choice='plain'><option>test</option></arg>
+      <arg choice='plain'><option>build</option></arg>
+      <arg choice='plain'><option>dry-run</option></arg>
+      <arg choice='plain'><option>build-vm</option></arg>
+    </group>
+    <sbr />
+    <arg><option>--install-grub</option></arg>
+    <arg><option>--no-pull</option></arg>
+    <arg><option>--no-build-nix</option></arg>
+    <arg><option>--fast</option></arg>
+    <arg><option>--rollback</option></arg>
+    <sbr />
+    <arg><option>--show-trace</option></arg>
+  </cmdsynopsis>
+</refsynopsisdiv>
+
+
+<refsection><title>Description</title>
+
+<para>This command updates the system so that it corresponds to the
+configuration specified in
+<filename>/etc/nixos/configuration.nix</filename>.  Thus, every time
+you modify <filename>/etc/nixos/configuration.nix</filename> or any
+NixOS module, you must run <command>nixos-rebuild</command> to make
+the changes take effect.  It builds the new system in
+<filename>/nix/store</filename>, runs its activation script, and stop
+and (re)starts any system services if needed.</para>
+
+<para>This command has one required argument, which specifies the
+desired operation.  It must be one of the following:
+
+<variablelist>
+
+  <varlistentry>
+    <term><option>switch</option></term>
+    <listitem>
+      <para>Build and activate the new configuration, and make it the
+      boot default.  That is, the configuration is added to the GRUB
+      boot menu as the default meny entry, so that subsequent reboots
+      will boot the system into the new configuration.  Previous
+      configurations activated with <command>nixos-rebuild
+      switch</command> or <command>nixos-rebuild boot</command> remain
+      available in the GRUB menu.</para>
+    </listitem>
+  </varlistentry>
+
+  <varlistentry>
+    <term><option>boot</option></term>
+    <listitem>
+      <para>Build the new configuration and make it the boot default
+      (as with <command>nixos-rebuild switch</command>), but do not
+      activate it.  That is, the system continues to run the previous
+      configuration until the next reboot.</para>
+    </listitem>
+  </varlistentry>
+
+  <varlistentry>
+    <term><option>test</option></term>
+    <listitem>
+      <para>Build and activate the new configuration, but do not add
+      it to the GRUB boot menu.  Thus, if you reboot the system (or if
+      it crashes), you will automatically revert to the default
+      configuration (i.e. the configuration resulting from the last
+      call to <command>nixos-rebuild switch</command> or
+      <command>nixos-rebuild boot</command>).</para>
+    </listitem>
+  </varlistentry>
+
+  <varlistentry>
+    <term><option>build</option></term>
+    <listitem>
+      <para>Build the new configuration, but neither activate it nor
+      add it to the GRUB boot menu.  It leaves a symlink named
+      <filename>result</filename> in the current directory, which
+      points to the output of the top-level “system” derivation.  This
+      is essentially the same as doing
+<screen>
+$ nix-build /etc/nixos/nixos -A system
+</screen>
+      Note that you do not need to be <literal>root</literal> to run
+      <command>nixos-rebuild build</command>.</para>
+    </listitem>
+  </varlistentry>
+
+  <varlistentry>
+    <term><option>dry-run</option></term>
+    <listitem>
+      <para>Simply show what store paths would be built or downloaded
+      by any of the operations above.</para>
+    </listitem>
+  </varlistentry>
+
+  <varlistentry>
+    <term><option>build-vm</option></term>
+    <listitem>
+      <para>Build a script that starts a NixOS virtual machine with
+      the desired configuration.  It leaves a symlink
+      <filename>result</filename> in the current directory that points
+      (under
+      <filename>result/bin/run-<replaceable>hostname</replaceable>-vm</filename>)
+      at the script that starts the VM.  Thus, to test a NixOS
+      configuration in a virtual machine, you should do the following:
+<screen>
+$ nixos-rebuild build-vm
+$ ./result/bin/run-*-vm
+</screen></para>
+
+      <para>The VM is implemented using the
+      <literal>qemu-kvm</literal> package.  For best performance, you
+      should load the <literal>kvm-intel</literal> or
+      <literal>kvm-amd</literal> kernel modules.</para>
+
+      <para>The VM mounts the Nix store of the host through the CIFS
+      filesystem.  (<literal>qemu-kvm</literal> automatically starts a
+      Samba daemon for this purpose.)  The host Nix store is
+      read-only, so Nix commands that modify the Nix store will not
+      work in the VM.  This includes commands such as
+      <command>nixos-rebuild</command>; to change the VM’s
+      configuration, you must halt the VM and re-run the commands
+      above.
+      </para>
+
+      <para>The VM has its own <literal>ext3</literal> root
+      filesystem, which is automatically created when the VM is first
+      started, and is persistent across reboots of the VM.  It is
+      stored in <literal>./<replaceable>hostname</replaceable>.qcow2</literal>.
+      The entire filesystem hierarchy of the host is available in the
+      VM under <filename>/hostfs</filename>.</para>
+    </listitem>
+  </varlistentry>
+
+</variablelist>
+
+</para>
+
+
+</refsection>
+
+
+<refsection><title>Options</title>
+
+<para>This command accepts the following options:</para>
+
+<variablelist>
+
+  <varlistentry>
+    <term><option>--install-grub</option></term>
+    <listitem>
+      <para>Causes the GRUB boot loader to be (re)installed on the
+      device specified by the
+      <varname>boot.loader.grub.device</varname> configuration
+      option.</para>
+    </listitem>
+  </varlistentry>
+
+  <varlistentry>
+    <term><option>--no-pull</option></term>
+    <listitem>
+      <para>Normally, <command>nixos-rebuild</command> calls
+      <command>nix-pull</command> to obtain the set of available
+      pre-built binaries in the Nixpkgs channel.  This option causes
+      the call to <command>nix-pull</command> to be skipped.  Note
+      that the result of previous invocations of
+      <command>nix-pull</command> may still be available in
+      <filename>/nix/var/nix/manifests</filename>, so to disable the
+      use of pre-built binaries, you should clear that directory in
+      addition to using <option>--no-pull</option>.</para>
+    </listitem>
+  </varlistentry>
+
+  <varlistentry>
+    <term><option>--no-build-nix</option></term>
+    <listitem>
+      <para>Normally, <command>nixos-rebuild</command> first builds
+      the <varname>nixUnstable</varname> attribute in Nixpkgs, and
+      uses the resulting instance of the Nix package manager to build
+      the new system configuration.  This is necessary if the NixOS
+      modules use features not provided by the currently installed
+      version of Nix.  This option disables building a new Nix.</para>
+    </listitem>
+  </varlistentry>
+
+  <varlistentry>
+    <term><option>--fast</option></term>
+    <listitem>
+      <para>Equivalent to <option>--no-pull</option>
+      <option>--no-build-nix</option> <option>--show-trace</option>.
+      This option is useful if you call
+      <command>nixos-rebuild</command> frequently (e.g. if you’re
+      hacking on a NixOS module).</para>
+    </listitem>
+  </varlistentry>
+
+  <varlistentry>
+    <term><option>--rollback</option></term>
+    <listitem>
+      <para>Instead of building a new configuration as specified by
+      <filename>/etc/nixos/configuration.nix</filename>, roll back to
+      the previous configuration.  (The previous configuration is
+      defined as the one before the “current” generation of the
+      profile <filename>/nix/var/nix/profiles/system</filename>.)</para>
+    </listitem>
+  </varlistentry>
+
+</variablelist>
+
+<para>In addition, <command>nixos-rebuild</command> accepts various
+Nix-related flags, including <option>--max-jobs</option> /
+<option>-j</option>, <option>--show-trace</option>,
+<option>--keep-failed</option>, <option>--keep-going</option> and
+<option>--verbose</option> / <option>-v</option>.  See
+the Nix manual for details.</para>
+
+</refsection>
+
+
+<refsection><title>Environment</title>
+
+<variablelist>
+
+  <varlistentry>
+    <term><envar>NIXOS</envar></term>
+    <listitem>
+      <para>Path to the NixOS source tree.  Defaults to
+      <filename>/etc/nixos/nixos</filename>.</para>
+    </listitem>
+  </varlistentry>
+
+  <varlistentry>
+    <term><envar>NIXPKGS</envar></term>
+    <listitem>
+      <para>Path to the Nixpkgs source tree.  Defaults to
+      <filename>/etc/nixos/nixpkgs</filename>.</para>
+    </listitem>
+  </varlistentry>
+
+  <varlistentry>
+    <term><envar>NIXOS_CONFIG</envar></term>
+    <listitem>
+      <para>Path to the main NixOS configuration module.  Defaults to
+      <filename>/etc/nixos/configuration.nix</filename>.</para>
+    </listitem>
+  </varlistentry>
+
+</variablelist>
+
+</refsection>
+
+
+<refsection><title>Files</title>
+
+<variablelist>
+
+  <varlistentry>
+    <term><filename>/var/run/current-system</filename></term>
+    <listitem>
+      <para>A symlink to the currently active system configuration in
+      the Nix store.</para>
+    </listitem>
+  </varlistentry>
+
+  <varlistentry>
+    <term><filename>/nix/var/nix/profiles/system</filename></term>
+    <listitem>
+      <para>The Nix profile that contains the current and previous
+      system configurations.  Used to generate the GRUB boot
+      menu.</para>
+    </listitem>
+  </varlistentry>
+
+</variablelist>
+
+</refsection>
+
+
+<refsection><title>Bugs</title>
+
+<para>This command should be renamed to something more
+descriptive.</para>
+
+</refsection>
+
+
+
+</refentry>
diff --git a/doc/manual/man-pages.xml b/doc/manual/man-pages.xml
index ccd0ebfc6da..e706574d889 100644
--- a/doc/manual/man-pages.xml
+++ b/doc/manual/man-pages.xml
@@ -24,5 +24,6 @@
   </info>
   
   <xi:include href="man-configuration.xml" />
+  <xi:include href="man-nixos-rebuild.xml" />
 
 </reference>
-- 
GitLab


From f26080c5f4a0cfc94ce33a778885645c7803fb71 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 9 Dec 2009 18:23:48 +0000
Subject: [PATCH 2058/5331] * Clean up the nixos-rebuild output a bit.

svn path=/nixos/trunk/; revision=18859
---
 modules/installer/tools/nixos-rebuild.sh             | 10 ++++++----
 modules/system/activation/switch-to-configuration.sh |  3 ---
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/modules/installer/tools/nixos-rebuild.sh b/modules/installer/tools/nixos-rebuild.sh
index cad1308355f..bb69c372aa4 100644
--- a/modules/installer/tools/nixos-rebuild.sh
+++ b/modules/installer/tools/nixos-rebuild.sh
@@ -132,8 +132,9 @@ fi
 # current one.  Of course, the same goes for Nixpkgs, but Nixpkgs is
 # more conservative.
 if test -n "$buildNix"; then
-    if ! nix-build $NIXOS -A nixFallback -o $tmpDir/nix; then
-        nix-build $NIXPKGS -A nixUnstable -o $tmpDir/nix
+    echo "building Nix..." >&2
+    if ! nix-build $NIXOS -A nixFallback -o $tmpDir/nix > /dev/null; then
+        nix-build $NIXPKGS -A nixUnstable -o $tmpDir/nix > /dev/null
     fi
     PATH=$tmpDir/nix/bin:$PATH
 fi
@@ -143,14 +144,15 @@ fi
 # or "boot"), or just build it and create a symlink "result" in the
 # current directory (for "build" and "test").
 if test -z "$rollback"; then
+    echo "building the system configuration..." >&2
     if test "$action" = switch -o "$action" = boot; then
         nix-env -p /nix/var/nix/profiles/system -f $NIXOS --set -A system $extraBuildFlags
         pathToConfig=/nix/var/nix/profiles/system
     elif test "$action" = test -o "$action" = build -o "$action" = dry-run; then
-        nix-build $NIXOS -A system -K -k $extraBuildFlags
+        nix-build $NIXOS -A system -K -k $extraBuildFlags > /dev/null
         pathToConfig=./result
     elif test "$action" = build-vm; then
-        nix-build $NIXOS -A vm -K -k $extraBuildFlags
+        nix-build $NIXOS -A vm -K -k $extraBuildFlags > /dev/null
         pathToConfig=./result
     else
         showSyntax
diff --git a/modules/system/activation/switch-to-configuration.sh b/modules/system/activation/switch-to-configuration.sh
index 18a0664daa7..d4b70c3b379 100644
--- a/modules/system/activation/switch-to-configuration.sh
+++ b/modules/system/activation/switch-to-configuration.sh
@@ -57,9 +57,6 @@ EOF
     oldJobs=$(readlink -f /etc/static/init)
     newJobs=$(readlink -f @out@/etc/init)
 
-    echo "old: $oldJobs"
-    echo "new: $newJobs"
-
     stopJob() {
         local job=$1
         initctl stop "$job" || true
-- 
GitLab


From 38aeb2fdc87c945443c8c31b8cefe9d5ee6000dc Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 9 Dec 2009 19:35:59 +0000
Subject: [PATCH 2059/5331] svn path=/nixos/trunk/; revision=18860

---
 modules/system/boot/modprobe.nix | 2 --
 1 file changed, 2 deletions(-)

diff --git a/modules/system/boot/modprobe.nix b/modules/system/boot/modprobe.nix
index 520a7b19767..4496106a231 100644
--- a/modules/system/boot/modprobe.nix
+++ b/modules/system/boot/modprobe.nix
@@ -2,8 +2,6 @@
 
 with pkgs.lib;
 
-# blacklist "cirrusfb" "i2c_piix4"
-
 {
 
   ###### interface
-- 
GitLab


From b005e22952ee13027b7a746c39672cd5f27149de Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Wed, 9 Dec 2009 20:30:40 +0000
Subject: [PATCH 2060/5331] Adding a not-very-nice option to allow setting the
 wpa_supplicant interface. (eth1 in my PC, instead of the previously hardcoded
 wlan0)

svn path=/nixos/trunk/; revision=18862
---
 modules/services/networking/wpa_supplicant.nix | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/modules/services/networking/wpa_supplicant.nix b/modules/services/networking/wpa_supplicant.nix
index 93450f8eac1..10c9041cf3e 100644
--- a/modules/services/networking/wpa_supplicant.nix
+++ b/modules/services/networking/wpa_supplicant.nix
@@ -28,6 +28,13 @@ in
       '';
     };
 
+    networking.WLANInterface = mkOption {
+      default = "wlan0";
+      description = ''
+        The interface wpa_supplicant will use, if enableWLAN is enabled.
+      '';
+    };
+
   };
 
 
@@ -49,7 +56,7 @@ in
 
         exec =
           "${pkgs.wpa_supplicant}/sbin/wpa_supplicant " +
-          "-C /var/run/wpa_supplicant -c ${configFile} -iwlan0";
+          "-C /var/run/wpa_supplicant -c ${configFile} -i${config.networking.WLANInterface}";
       };
   
   };
-- 
GitLab


From 60b856b115d236c19764936d32e6708e9d585d81 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Wed, 9 Dec 2009 21:45:59 +0000
Subject: [PATCH 2061/5331] Adding a module for system health monitoring
 (getting graphs generated by rrdtool of usual system counters). It sets up
 some cron jobs for collecting the data, and not that often, generating the
 graphs. Then the httpd server is configured with a directory with the
 generated static files.

http://www.brianlane.com/software/systemhealth/

svn path=/nixos/trunk/; revision=18866
---
 modules/module-list.nix                      |   1 +
 modules/services/monitoring/systemhealth.nix | 130 +++++++++++++++++++
 2 files changed, 131 insertions(+)
 create mode 100644 modules/services/monitoring/systemhealth.nix

diff --git a/modules/module-list.nix b/modules/module-list.nix
index d793c715202..62f8638020c 100644
--- a/modules/module-list.nix
+++ b/modules/module-list.nix
@@ -60,6 +60,7 @@
   ./services/misc/synergy.nix
   ./services/monitoring/monit.nix
   ./services/monitoring/nagios/default.nix
+  ./services/monitoring/systemhealth.nix
   ./services/monitoring/zabbix-agent.nix
   ./services/monitoring/zabbix-server.nix
   ./services/network-filesystems/nfs-kernel.nix
diff --git a/modules/services/monitoring/systemhealth.nix b/modules/services/monitoring/systemhealth.nix
new file mode 100644
index 00000000000..8d531b526f3
--- /dev/null
+++ b/modules/services/monitoring/systemhealth.nix
@@ -0,0 +1,130 @@
+{config, pkgs, ...}:
+
+with pkgs.lib;
+
+let
+  cfg = config.services.systemhealth;
+
+  systemhealth = with pkgs; stdenv.mkDerivation {
+    name = "systemhealth-1.0";
+    src = fetchurl {
+      url = "http://www.brianlane.com/software/systemhealth/src/systemhealth-1.0.tar.bz2";
+      sha256 = "1q69lz7hmpbdpbz36zb06nzfkj651413n9icx0njmyr3xzq1j9qy";
+    };
+    buildInputs = [ python ];
+    installPhase = ''
+      ensureDir $out/bin
+      cp system_health.py $out/bin
+    '';
+  };
+
+  rrdDir = "/var/lib/health/rrd";
+  htmlDir = "/var/lib/health/html";
+
+  configFile = rrdDir + "/.syshealthrc";
+  # The program will try to read $HOME/.syshealthrc, so we set the proper home.
+  command = "HOME=${rrdDir} ${systemhealth}/bin/system_health.py";
+
+  cronJob = ''
+    */5 * * * * wwwrun ${command} --log
+    5 * * * * wwwrun ${command} --graph
+  '';
+
+  nameEqualName = s: "${s} = ${s}";
+  interfacesSection = concatStringsSep "\n" (map nameEqualName cfg.interfaces);
+
+  driveLine = d: "${d.path} = ${d.name}";
+  drivesSection = concatStringsSep "\n" (map driveLine cfg.drives);
+
+in
+{
+  options = {
+    services.systemhealth = {
+      enable = mkOption {
+        default = false;
+        description = ''
+          Enable the system health monitor and its generation of graphs.
+        '';
+      };
+
+      urlPrefix = mkOption {
+        default = "/health";
+        description = ''
+          The URL prefix under which the System Health web pages appear in httpd.
+        '';
+      };
+
+      interfaces = mkOption {
+        default = [ "lo" ];
+        example = [ "lo" "eth0" "eth1" ];
+        description = ''
+          Interfaces to monitor (minimum one).
+        '';
+      };
+
+      drives = mkOption {
+        default = [ ];
+        example = [ { name = "root"; path = "/"; } ];
+        description = ''
+          Drives to monitor.
+        '';
+      };
+    };
+  };
+
+  config = mkIf cfg.enable {
+    services.cron.systemCronJobs = [ cronJob ];
+
+    system.activationScripts.systemhealth = fullDepEntry ''
+      mkdir -p ${rrdDir} ${htmlDir}
+      chown wwwrun.wwwrun ${rrdDir} ${htmlDir}
+
+      cat >${configFile} << EOF
+      [paths]
+      rrdtool = ${pkgs.rrdtool}/bin/rrdtool
+      loadavg_rrd = loadavg
+      ps = /var/run/current-system/sw/bin/ps
+      df = /var/run/current-system/sw/bin/df
+      meminfo_rrd = meminfo
+      uptime_rrd = uptime
+      rrd_path = ${rrdDir}
+      png_path = ${htmlDir}
+
+      [processes]
+
+      [interfaces]
+      ${interfacesSection}
+
+      [drives]
+      ${drivesSection}
+
+      [graphs]
+      width = 400
+      time = ['-3hours', '-32hours', '-8days', '-5weeks', '-13months']
+      height = 100
+
+      [external]
+
+      EOF
+
+      chown wwwrun.wwwrun ${configFile}
+
+      ${pkgs.su}/bin/su -s "/bin/sh" -c "${command} --check" wwwrun
+      ${pkgs.su}/bin/su -s "/bin/sh" -c "${command} --html" wwwrun
+    '' [ "var" ];
+
+    services.httpd.extraSubservices = [
+      { function = f: {
+          extraConfig = ''
+            Alias ${cfg.urlPrefix} ${htmlDir}
+            
+            <Directory ${htmlDir}>
+                Order allow,deny
+                Allow from all
+            </Directory>
+          '';
+        };
+      }
+    ];
+  };
+}
-- 
GitLab


From 9682f0ed900fc7ae2af3baa169365f696068ffb7 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 10 Dec 2009 09:22:45 +0000
Subject: [PATCH 2062/5331] svn path=/nixos/trunk/; revision=18872

---
 modules/services/web-servers/apache-httpd/mediawiki.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/modules/services/web-servers/apache-httpd/mediawiki.nix b/modules/services/web-servers/apache-httpd/mediawiki.nix
index 83aa243b7b5..c1a232e0499 100644
--- a/modules/services/web-servers/apache-httpd/mediawiki.nix
+++ b/modules/services/web-servers/apache-httpd/mediawiki.nix
@@ -219,6 +219,8 @@ in
   };
 
   extraPath = [ mediawikiScripts ];
+
+  # !!! Need to specify that Apache has a dependency on PostgreSQL!
   
   startupScript = pkgs.writeScript "mediawiki_startup.sh"
     # Initialise the database automagically if we're using a Postgres
-- 
GitLab


From 038180bab853b2d06f4316649b78bd7688b844df Mon Sep 17 00:00:00 2001
From: Rob Vermaas <rob.vermaas@gmail.com>
Date: Thu, 10 Dec 2009 14:45:41 +0000
Subject: [PATCH 2063/5331]   * sshd.nix: ports attribute, to allow listening
 to multiple ports

svn path=/nixos/trunk/; revision=18877
---
 modules/services/networking/ssh/sshd.nix | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/modules/services/networking/ssh/sshd.nix b/modules/services/networking/ssh/sshd.nix
index 87cb942f2f9..9bddba959b6 100644
--- a/modules/services/networking/ssh/sshd.nix
+++ b/modules/services/networking/ssh/sshd.nix
@@ -15,6 +15,9 @@ let
 
       UsePAM yes
 
+      ${ pkgs.lib.concatMapStrings (port : ''Port ${toString port}
+                                           '') cfg.ports}
+
       ${if cfg.forwardX11 then "
         X11Forwarding yes
         XAuthLocation ${pkgs.xlibs.xauth}/bin/xauth
@@ -91,6 +94,13 @@ in
           <manvolnum>5</manvolnum></citerefentry>.
         '';
       };
+
+      ports = mkOption {
+        default = [22];
+        description = ''
+          Specifies on which ports the SSH daemon listens.
+        '';
+      };
       
     };
 
@@ -130,7 +140,7 @@ in
         exec = "${openssh}/sbin/sshd -h /etc/ssh/ssh_host_dsa_key -f ${sshdConfig}";
       };
 
-    networking.firewall.allowedTCPPorts = [22];
+    networking.firewall.allowedTCPPorts = cfg.ports ;
           
   };
 
-- 
GitLab


From 086c3d632865fd11a84122fab0e8b75c79e65880 Mon Sep 17 00:00:00 2001
From: Marc Weber <marco-oweber@gmx.de>
Date: Fri, 11 Dec 2009 00:51:07 +0000
Subject: [PATCH 2064/5331] making default and timeout of grub overridable also
 updating grub option names to current names

svn path=/nixos/trunk/; revision=18886
---
 modules/installer/cd-dvd/iso-image.nix      |  5 +++--
 modules/installer/grub/grub-menu-builder.sh |  8 ++++----
 modules/installer/grub/grub.nix             | 16 +++++++++++++++-
 3 files changed, 22 insertions(+), 7 deletions(-)

diff --git a/modules/installer/cd-dvd/iso-image.nix b/modules/installer/cd-dvd/iso-image.nix
index 6c1151ca217..3cc558a346d 100644
--- a/modules/installer/cd-dvd/iso-image.nix
+++ b/modules/installer/cd-dvd/iso-image.nix
@@ -68,8 +68,8 @@ let
   # The configuration file for Grub.
   grubCfg = 
     ''
-      set default=0
-      set timeout=10
+      set default=${builtins.toString config.boot.loader.grub.default}
+      set timeout=${builtins.toString config.boot.loader.grub.timeout}
 
       if loadfont /boot/grub/unicode.pf2; then
         set gfxmode=640x480
@@ -189,6 +189,7 @@ in
         initrd /boot/initrd
       }
     '';
+  boot.loader.grub.timeout = 10;
 
   # Create the ISO image.
   system.build.isoImage = import ../../../lib/make-iso9660-image.nix {
diff --git a/modules/installer/grub/grub-menu-builder.sh b/modules/installer/grub/grub-menu-builder.sh
index 9db2bbfa41c..c09b13f801d 100644
--- a/modules/installer/grub/grub-menu-builder.sh
+++ b/modules/installer/grub/grub-menu-builder.sh
@@ -41,8 +41,8 @@ prologue() {
 	1)
 	    cat > "$1" << GRUBEND
 # Automatically generated.  DO NOT EDIT THIS FILE!
-default 0
-timeout 5
+default @default@
+timeout @timeout@
 GRUBEND
 	    if test -n "@splashImage@"; then
 		echo "splashimage $splashLocation" >> "$1"
@@ -51,8 +51,8 @@ GRUBEND
 	2)
 	    cat > "$1" <<EOF
 # Automatically generated.  DO NOT EDIT THIS FILE!
-set default=0
-set timeout=5
+set default=@default@
+set timeout=@timeout@
 if loadfont @grub@/share/grub/unicode.pf2 ; then
   set gfxmode=640x480
   insmod gfxterm
diff --git a/modules/installer/grub/grub.nix b/modules/installer/grub/grub.nix
index 9fe65a7bceb..1d1180f3759 100644
--- a/modules/installer/grub/grub.nix
+++ b/modules/installer/grub/grub.nix
@@ -13,7 +13,7 @@ let
     inherit (pkgs) bash;
     path = [pkgs.coreutils pkgs.gnused pkgs.gnugrep];
     inherit (config.boot.loader.grub) copyKernels extraEntries extraEntriesBeforeNixOS
-      splashImage bootDevice configurationLimit version;
+      splashImage bootDevice configurationLimit version default timeout;
   };
   
 in
@@ -126,6 +126,20 @@ in
         '';
       };
 
+      timeout = mkOption {
+        default = 5;
+        description = ''
+          after timeout seconds grub will boot the default menu item.
+        '';
+      };
+
+      default = mkOption {
+        default = 1;
+        description = ''
+          index of grub menu item which will be booted
+        '';
+      };
+
     };
 
   };
-- 
GitLab


From 4d7e344f69825e06d2d48ab7e735f35f57311672 Mon Sep 17 00:00:00 2001
From: Marc Weber <marco-oweber@gmx.de>
Date: Fri, 11 Dec 2009 00:51:13 +0000
Subject: [PATCH 2065/5331] Adding initial version of the nixos cd insallation
 test script using qemu_kvm. Installation doesn't take place yet. VM is
 started printing a remote controlled "Hello".

This serves as example how to run a vm within a bulid job.

svn path=/nixos/trunk/; revision=18887
---
 .../installation-cd-minimal-test-insecure.nix |  54 ++++++++
 modules/services/networking/openvpn.nix       |   4 +-
 modules/services/networking/ssh/sshd.nix      |   1 +
 .../system/activation/activation-script.nix   |   2 +-
 release.nix                                   |   5 +
 tests/test-nixos-install-from-cd-config.nix   |  26 ++++
 tests/test-nixos-install-from-cd.nix          | 125 ++++++++++++++++++
 7 files changed, 214 insertions(+), 3 deletions(-)
 create mode 100644 modules/installer/cd-dvd/installation-cd-minimal-test-insecure.nix
 create mode 100644 tests/test-nixos-install-from-cd-config.nix
 create mode 100644 tests/test-nixos-install-from-cd.nix

diff --git a/modules/installer/cd-dvd/installation-cd-minimal-test-insecure.nix b/modules/installer/cd-dvd/installation-cd-minimal-test-insecure.nix
new file mode 100644
index 00000000000..e25e2e72129
--- /dev/null
+++ b/modules/installer/cd-dvd/installation-cd-minimal-test-insecure.nix
@@ -0,0 +1,54 @@
+# See installation-cd-minimal.nix
+# it's called insecure because it allows logging in as root without password
+# So don't boot this cdrom to install your system :-)
+
+{config, pkgs, ...}:
+
+let
+  doOverride = pkgs.lib.mkOverride 0 {};
+in
+
+{
+  require = [ ./installation-cd-minimal.nix ];
+
+  installer.configModule = "./nixos/modules/installer/cd-dvd/installation-cd-minimal-test-insecure";
+
+  services.sshd.permitRootLogin = "yes";
+  jobs.sshd = {
+    startOn = doOverride "started network-interfaces";
+  };
+
+
+  boot.initrd.extraKernelModules =
+    ["cifs" "virtio_net" "virtio_pci" "virtio_blk" "virtio_balloon" "nls_utf8"];
+
+  environment.systemPackages = [ pkgs.vim_configurable ];
+
+  boot.loader.grub.timeout = doOverride 0; 
+  boot.loader.grub.default = 2;
+
+  # FIXME: rewrite pam.services the to be an attr list
+  # I only want to override sshd
+  security.pam.services = doOverride
+      # Most of these should be moved to specific modules.
+      [ { name = "cups"; }
+        { name = "ejabberd"; }
+        { name = "ftp"; }
+        { name = "lshd"; rootOK =true; allowNullPassword =true; }
+        { name = "passwd"; }
+        { name = "samba"; }
+        { name = "sshd"; rootOK = true; allowNullPassword =true; }
+        { name = "xlock"; }
+        { name = "chsh"; rootOK = true; }
+        { name = "su"; rootOK = true; forwardXAuth = true; }
+        # Note: useradd, groupadd etc. aren't setuid root, so it
+        # doesn't really matter what the PAM config says as long as it
+        # lets root in.
+        { name = "useradd"; rootOK = true; }
+        # Used by groupadd etc.
+        { name = "shadow"; rootOK = true; }
+        { name = "login"; ownDevices = true; allowNullPassword = true; }
+      ];
+
+}
+
diff --git a/modules/services/networking/openvpn.nix b/modules/services/networking/openvpn.nix
index 78873db67fa..0d2025d9ce3 100644
--- a/modules/services/networking/openvpn.nix
+++ b/modules/services/networking/openvpn.nix
@@ -34,8 +34,8 @@ let
     in {
       description = "OpenVPN-${name}";
 
-      startOn = "network-interfaces/started";
-      stopOn = "network-interfaces/stop";
+      startOn = "started network-interfaces";
+      stopOn = "stopping network-interfaces";
 
       environment = { PATH = "${pkgs.coreutils}/bin"; };
 
diff --git a/modules/services/networking/ssh/sshd.nix b/modules/services/networking/ssh/sshd.nix
index 9bddba959b6..f99e871c448 100644
--- a/modules/services/networking/ssh/sshd.nix
+++ b/modules/services/networking/ssh/sshd.nix
@@ -82,6 +82,7 @@ in
           <literal>yes</literal>, <literal>without-password</literal>,
           <literal>forced-commands-only</literal> or
           <literal>no</literal>.
+          If without-password doesn't work try <literal>yes</literal>.
         '';
       };
 
diff --git a/modules/system/activation/activation-script.nix b/modules/system/activation/activation-script.nix
index df3806b834b..21c52abe49f 100644
--- a/modules/system/activation/activation-script.nix
+++ b/modules/system/activation/activation-script.nix
@@ -2,7 +2,7 @@
 {pkgs, config, ...}:
 
 let
-  inherit (pkgs.lib) mkOption mergeTypedOption mergeAttrs mapRecordFlatten
+  inherit (pkgs.lib) mkOption mergeTypedOption mergeAttrs
     mapAttrs addErrorContext fold id filter textClosureMap noDepEntry
     fullDepEntry;
   inherit (builtins) attrNames;
diff --git a/release.nix b/release.nix
index 9520ac02698..8a3b69b7261 100644
--- a/release.nix
+++ b/release.nix
@@ -90,6 +90,11 @@ let
       description = "minimal";
     };
 
+    iso_minimal_test_insecure = makeIso {
+      module = ./modules/installer/cd-dvd/installation-cd-minimal-test-insecure.nix;
+      description = "minimal-testing-only";
+    };
+
     iso_minimal_fresh_kernel = makeIso {
       module = ./modules/installer/cd-dvd/installation-cd-minimal-fresh-kernel.nix;
       description = "minimal with 2.6.31-zen-branch";
diff --git a/tests/test-nixos-install-from-cd-config.nix b/tests/test-nixos-install-from-cd-config.nix
new file mode 100644
index 00000000000..758ab2328da
--- /dev/null
+++ b/tests/test-nixos-install-from-cd-config.nix
@@ -0,0 +1,26 @@
+# this is the configuration which will be installed.
+# The configuration is prebuild before starting the vm because starting the vm
+# causes some overhead.
+{pkgs, config, ...}: {
+
+  # make system boot and accessible:
+  require = [ ../modules/installer/cd-dvd/installation-cd-minimal-test-insecure.nix ];
+
+  boot.loader.grub = {
+    device = "/dev/sda";
+    copyKernels = true;
+    bootDevice = "(hd0,0)";
+  };
+
+  fileSystems = [
+    { mountPoint = "/";
+      device = "/dev/sda1";
+      neededForBoot = true;
+    }
+  ];
+
+  fonts = {
+    enableFontConfig = false; 
+  };
+
+}
diff --git a/tests/test-nixos-install-from-cd.nix b/tests/test-nixos-install-from-cd.nix
new file mode 100644
index 00000000000..d654cdbd69f
--- /dev/null
+++ b/tests/test-nixos-install-from-cd.nix
@@ -0,0 +1,125 @@
+{ nixos ? ./..
+, nixpkgs ? ../../nixpkgs
+, services ? ../../nixos/services
+, system ? builtins.currentSystem
+, configPath ? ./test-nixos-install-from-cd.nix
+}:
+
+let
+
+/*
+
+   test nixos installation automatically using a build job (unfinished)
+
+   run this test this way:
+   nix-build --no-out-link --show-trace tests/test-nixos-install-from-cd.nix
+
+   --no-out-link is important because creating ./result will cause rebuilding of
+   the iso as the nixos repository is included in the iso.
+
+   To prevent this make these paths point to another location:
+   nixosTarball = makeTarball "nixos.tar.bz2" (cleanSource ../../..);
+   nixpkgsTarball = makeTarball "nixpkgs.tar.bz2" (cleanSource pkgs.path);
+
+*/
+
+  isos = (import ../release.nix) { inherit nixpkgs; };
+
+  isoFile = 
+    # passed system = systom of iso 
+    (isos.iso_minimal_test_insecure { inherit system; }).iso;
+
+  configuration = /pr/system_nixos_installer/nixos/tests/test-nixos-install-from-cd-config.nix;
+
+  eval = import ../lib/eval-config.nix {
+    inherit system nixpkgs;
+    modules = [ configuration ];
+  };
+
+
+  inherit (eval) pkgs config;
+
+  inherit (pkgs) qemu_kvm;
+
+  # prebuild system which will be installed for two reasons:
+  # build derivations are in store and can be reused
+  # the iso is only build when this suceeds (?)
+  systemDerivation = builtins.addErrorContext "while building system" config.system.build.toplevel;
+
+in
+
+rec {
+
+  test = 
+    # FIXME: support i686 as well 
+    # FIXME: X shouldn't be required
+    # Is there a way to use kvm when not running as root?
+    # Would using uml provide any advantages?
+    pkgs.runCommand "nixos-installation-test" { inherit systemDerivation; } ''
+
+    for path in ${pkgs.socat} ${pkgs.openssh} ${qemu_kvm}; do
+      PATH=$path/bin:$PATH
+    done
+
+    echo "creating image file"
+    qemu-img create -f qcow2 image 512M
+
+    # install the system
+
+    export DISPLAY=localhost:0.0
+
+    cat >> run-kvm.sh << EOF
+    #!/bin/sh
+    qemu-system-x86_64 -m 620 \
+        -no-kvm-irqchip \
+        -net nic -net user -smb \
+        -hda image \
+        -cdrom $(echo ${isoFile}/iso/*.iso) \
+        "\$@"
+    EOF
+    chmod +x run-kvm.sh
+
+    SOCKET_NAME=65535.socket
+
+    # run qemu-kvm in a background process
+    { ./run-kvm.sh -boot d -redir tcp:''${SOCKET_NAME/.socket/}::22 \
+      || { echo "starting kvm failed, exiting" 1>&2; pkill -9 $$; }
+    } &
+    
+    # check that vm is still running
+    checkVM(){ [ -n "$(jobs -l)" ] || { echo "kvm died!?"; exit 1; }; }
+
+    waitTill(){
+      echo $1
+      while ! eval "$2"; do sleep 1; checkVM; done
+    }
+
+    SSH(){
+      ssh -v -o UserKnownHostsFile=/dev/null \
+        -o StrictHostKeyChecking=no \
+        -o ProxyCommand="socat stdio ./$SOCKET_NAME" \
+        root@127.0.0.1 \
+        "$@";
+    }
+
+    # wait for socket
+
+    waitTill "waiting for socket in $TMP" '[ ! -e ./$SOCKET_NAME ]'
+    waitTill "waiting for sshd job" "SSH 'echo Hello > /dev/tty1'"
+
+    # INSTALLATION
+    echo "installation should take place"  
+
+    # REBOOT 
+    echo "rebooting should take place"  
+
+    # CHECK
+    echo "verify system is up and running"  
+
+    # SHUTDOWN
+    SSH "shutdown -h now"
+
+    echo waiting for kvm to shutdown..
+    wait
+  '';
+}
-- 
GitLab


From 83d657b1023203ec307ae1ab9b03f3f561e1f3e7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Sun, 13 Dec 2009 15:29:42 +0000
Subject: [PATCH 2066/5331] Change the Nix build users to have no supplementary
 group.

For details, see:
http://thread.gmane.org/gmane.linux.distributions.nixos/3264
http://thread.gmane.org/gmane.linux.distributions.nixos/3263/focus=3289

svn path=/nixos/trunk/; revision=18918
---
 modules/config/users-groups.nix | 21 ++++++++++++++++++---
 1 file changed, 18 insertions(+), 3 deletions(-)

diff --git a/modules/config/users-groups.nix b/modules/config/users-groups.nix
index ffc43a63b46..38b11784c6d 100644
--- a/modules/config/users-groups.nix
+++ b/modules/config/users-groups.nix
@@ -23,14 +23,19 @@ let
             description = "Unprivileged account (don't use!)";
           }
         ];
-      
+
       makeNixBuildUser = nr:
         { name = "nixbld${toString nr}";
           description = "Nix build user ${toString nr}";
+
+          /* For consistency with the setgid(2), setuid(2), and setgroups(2)
+             calls in `libstore/build.cc', don't add any supplementary group
+             here.  */
           uid = builtins.add ids.uids.nixbld nr;
-          extraGroups = ["nixbld"];
+          group = "nixbld";
+          extraGroups = [];
         };
-        
+
       nixBuildUsers = map makeNixBuildUser (pkgs.lib.range 1 10);
       
       addAttrs =
@@ -208,6 +213,16 @@ in
                     --groups "$extraGroups" \
                     ''${home:+--home "$home"} \
                     --shell "$shell"
+                if test -z "$extraGroups"
+                then
+                    # Make sure the user is listed as belonging to its
+                    # primary group when it has no supplementary groups.  The
+                    # main reason is to have the `nixbld[0-9]' users be
+                    # listed as `nixbld' members; this allows `nix-store' to
+                    # get the UIDs of all the build users by doing a
+                    # getprnam("nixbld") call.
+                    groupmod "$group" -A "$name"
+                fi
             fi
 
         done
-- 
GitLab


From 1dfab1d7ea5da1825c359e50f42b323e6ac49d22 Mon Sep 17 00:00:00 2001
From: Rob Vermaas <rob.vermaas@gmail.com>
Date: Mon, 14 Dec 2009 11:15:37 +0000
Subject: [PATCH 2067/5331] * virtualisation.memorySize option to set memory
 size of virtual machine

svn path=/nixos/trunk/; revision=18933
---
 modules/virtualisation/qemu-vm.nix | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/modules/virtualisation/qemu-vm.nix b/modules/virtualisation/qemu-vm.nix
index 68ba340e6c2..5d4d458de46 100644
--- a/modules/virtualisation/qemu-vm.nix
+++ b/modules/virtualisation/qemu-vm.nix
@@ -16,7 +16,14 @@ let
   vmName = config.networking.hostName;
 
   options = {
-
+    virtualisation.memorySize = 
+      mkOption {
+        default = 384;
+        description =
+          ''
+            Memory size (M) of virtual machine.
+          '';
+      };
     virtualisation.diskImage =
       mkOption {
         default = "./${vmName}.qcow2";
@@ -46,7 +53,7 @@ let
       
       # -no-kvm-irqchip is needed to prevent the CIFS mount from
       # hanging the VM on x86_64.
-      exec ${pkgs.qemu_kvm}/bin/qemu-system-x86_64 -m 384 \
+      exec ${pkgs.qemu_kvm}/bin/qemu-system-x86_64 -m ${toString config.virtualisation.memorySize} \
           -no-kvm-irqchip \
           -net nic,model=virtio -net user -smb / \
           -drive file=$NIX_DISK_IMAGE,if=virtio,boot=on \
-- 
GitLab


From 243bc84f08501d4bddbaa5eca7b990eb40236161 Mon Sep 17 00:00:00 2001
From: Rob Vermaas <rob.vermaas@gmail.com>
Date: Mon, 14 Dec 2009 15:30:57 +0000
Subject: [PATCH 2068/5331] ensure nix-support dir before running tests

svn path=/nixos/trunk/; revision=18938
---
 lib/build-vms.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/build-vms.nix b/lib/build-vms.nix
index 2989708bdc8..5c6315eb30c 100644
--- a/lib/build-vms.nix
+++ b/lib/build-vms.nix
@@ -129,6 +129,7 @@ rec {
         ''
           mkdir $out
           cp ${./test-driver/Machine.pm} Machine.pm
+          ensureDir $out/nix-support
           
           ${perl}/bin/perl ${./test-driver/test-driver.pl} ${network}/vms/*/bin/run-*-vm
           
@@ -138,7 +139,6 @@ rec {
           done
 
           for i in $out/*.png; do
-            ensureDir $out/nix-support
             echo "report screenshot $i" >> $out/nix-support/hydra-build-products
           done
         ''; # */
-- 
GitLab


From fe490f2edc872c99d96faba93d293c67f326489a Mon Sep 17 00:00:00 2001
From: Rob Vermaas <rob.vermaas@gmail.com>
Date: Mon, 14 Dec 2009 17:57:37 +0000
Subject: [PATCH 2069/5331] * mysql-backup: option for which user to use for
 performing backups

svn path=/nixos/trunk/; revision=18942
---
 modules/services/backup/mysql-backup.nix | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/modules/services/backup/mysql-backup.nix b/modules/services/backup/mysql-backup.nix
index adb9f1d74f8..e06f2bb581d 100644
--- a/modules/services/backup/mysql-backup.nix
+++ b/modules/services/backup/mysql-backup.nix
@@ -7,7 +7,7 @@ let
   location = config.services.mysqlBackup.location ;
 
   mysqlBackupCron = db : ''
-    ${config.services.mysqlBackup.period} mysql ${mysql}/bin/mysqldump ${db} | ${gzip}/bin/gzip -c > ${location}/${db}.gz
+    ${config.services.mysqlBackup.period} ${config.services.mysqlBackup.user} ${mysql}/bin/mysqldump ${db} | ${gzip}/bin/gzip -c > ${location}/${db}.gz
   ''; 
 
 in
@@ -33,6 +33,13 @@ in
         '';
       };
 
+      user = mkOption {
+        default = "mysql";
+        description = ''
+          User to be used to perform backup.
+        '';
+      };
+
       databases = mkOption {
         default = [];
         description = ''
@@ -57,7 +64,7 @@ in
 
     system.activationScripts.mysqlBackup = pkgs.stringsWithDeps.fullDepEntry ''
          mkdir -m 0700 -p ${config.services.mysqlBackup.location}
-         chown mysql ${config.services.mysqlBackup.location}
+         chown ${config.services.mysqlBackup.user} ${config.services.mysqlBackup.location}
     '' [ "stdio" "defaultPath" "systemConfig" "users" ];
   };
   
-- 
GitLab


From 401fd84ae156531b53cd8732fe1fa432a312684f Mon Sep 17 00:00:00 2001
From: Marc Weber <marco-oweber@gmx.de>
Date: Tue, 15 Dec 2009 06:37:32 +0000
Subject: [PATCH 2070/5331] kvm installation test update + NixOS installation
 archive

You can run the kvm nixos installation test by:
  nix-build --no-out-link tests/test-nixos-install-from-cd.nix
It boots the installed system.
It still fails sshd isn't started (yet)

adding nixos-bootstrapping-archive:
You can install NixOS easily using any live cd now.
See README-BOOTSTRAP-NIXOS

svn path=/nixos/trunk/; revision=18950
---
 .../installation-cd-minimal-test-insecure.nix |   1 +
 .../test-nixos-install-from-cd-config.nix     |   4 +-
 .../tools/installer2/nixos-bootstrap.sh       | 134 +++++++++++
 .../tools/installer2/nixos-prepare-install.sh | 227 ++++++++++++++++++
 .../tools/installer2/run-in-chroot.sh         |  93 +++++++
 .../README-BOOTSTRAP-NIXOS                    |  16 ++
 .../tools/nixos-bootstrap-archive/default.nix |  20 ++
 modules/installer/tools/nixos-install.sh      |   2 +
 modules/installer/tools/tools.nix             |  51 +++-
 tests/test-nixos-install-from-cd.nix          | 124 +++++++---
 tests/test-nixos-installer2.nix               |  71 ++++++
 11 files changed, 711 insertions(+), 32 deletions(-)
 rename {tests => modules/installer/cd-dvd}/test-nixos-install-from-cd-config.nix (80%)
 create mode 100644 modules/installer/tools/installer2/nixos-bootstrap.sh
 create mode 100644 modules/installer/tools/installer2/nixos-prepare-install.sh
 create mode 100644 modules/installer/tools/installer2/run-in-chroot.sh
 create mode 100644 modules/installer/tools/nixos-bootstrap-archive/README-BOOTSTRAP-NIXOS
 create mode 100644 modules/installer/tools/nixos-bootstrap-archive/default.nix
 create mode 100644 tests/test-nixos-installer2.nix

diff --git a/modules/installer/cd-dvd/installation-cd-minimal-test-insecure.nix b/modules/installer/cd-dvd/installation-cd-minimal-test-insecure.nix
index e25e2e72129..b531ccaaf3d 100644
--- a/modules/installer/cd-dvd/installation-cd-minimal-test-insecure.nix
+++ b/modules/installer/cd-dvd/installation-cd-minimal-test-insecure.nix
@@ -26,6 +26,7 @@ in
 
   boot.loader.grub.timeout = doOverride 0; 
   boot.loader.grub.default = 2;
+  boot.loader.grub.version = doOverride 2;
 
   # FIXME: rewrite pam.services the to be an attr list
   # I only want to override sshd
diff --git a/tests/test-nixos-install-from-cd-config.nix b/modules/installer/cd-dvd/test-nixos-install-from-cd-config.nix
similarity index 80%
rename from tests/test-nixos-install-from-cd-config.nix
rename to modules/installer/cd-dvd/test-nixos-install-from-cd-config.nix
index 758ab2328da..e0dcea6e061 100644
--- a/tests/test-nixos-install-from-cd-config.nix
+++ b/modules/installer/cd-dvd/test-nixos-install-from-cd-config.nix
@@ -4,11 +4,11 @@
 {pkgs, config, ...}: {
 
   # make system boot and accessible:
-  require = [ ../modules/installer/cd-dvd/installation-cd-minimal-test-insecure.nix ];
+  require = [ ./installation-cd-minimal-test-insecure.nix ];
 
   boot.loader.grub = {
     device = "/dev/sda";
-    copyKernels = true;
+    copyKernels = false;
     bootDevice = "(hd0,0)";
   };
 
diff --git a/modules/installer/tools/installer2/nixos-bootstrap.sh b/modules/installer/tools/installer2/nixos-bootstrap.sh
new file mode 100644
index 00000000000..97e66bc88ed
--- /dev/null
+++ b/modules/installer/tools/installer2/nixos-bootstrap.sh
@@ -0,0 +1,134 @@
+#! @shell@
+# runs in chroot
+# creates mandatory directories such as /var
+# finally runs switch-to-configuration optionally registering grub
+set -e
+
+usage(){
+  cat << EOF
+  script --install [--fast] [--no-grub]
+
+  --no-pull:  don't do a nix-pull to get the latest Nixpkgs
+              channel manifest
+
+  --no-grub:  don't install grub ( you don't want this ..)
+
+  --debug:    set -x
+
+  -j n   : will be passed to nix-env = number of build tasks done simultaniously
+
+  Description:
+  This scripts installs NixOS and should be run within the target chroot.
+
+  The minimal nix system must have been installed previously.
+  Eg nixos-prepare-install.sh does this for you.
+
+  Probably this script is distributed along with the minimal nix closure used
+  for bootstrapping
+EOF
+  exit 1
+}
+
+die(){ echo "!>> " $@; exit 1; }
+
+check(){
+  [ -e "$1" ] || die "$1 not found $2"
+}
+WARN(){ echo "WARNING: $@"; }
+INFO(){ echo "INFO: " $@; }
+
+# == configuration ==
+
+HOME=${HOME:-/root}
+NIXOS=${NIXOS:-/etc/nixos/nixos}
+NIXPKGS=${NIXPKGS:-/etc/nixos/nixpkgs}
+NIXOS_CONFIG=${NIXOS_CONFIG:-/etc/nixos/configuration.nix}
+NIXOS_PULL=${NIXOS_PULL:-1}
+NIXOS_INSTALL_GRUB=${NIXOS_INSTALL_GRUB:-1} 
+
+ps="with-prepared-chroot.sh"
+
+check "$NIXOS_CONFIG"
+check "$NIXOS/modules"  "nixos repo not found"
+check "$NIXPKGS/pkgs/top-level/all-packages.nix"  "nixpgks repo not found"
+for d in /dev /sys /proc; do
+  check "$d" "It should have been mounted by $ps"
+done
+
+# try reusing binaries from host system (which is most likely an installation CD)
+if [ -d /host-system/nix ]; then
+  export NIX_OTHER_STORES=/host-system/nix${NIX_OTHER_STORES:+:}$NIX_OTHER_STORES
+else
+  WARN "/host-system/nix not found. It should have been --bind mounted by $ps.
+  I won't be able to take binaries from the installation media.
+  "
+fi
+
+# == configuration end ==
+
+INSTALL=
+
+for arg in $@; do
+  case $arg in
+    --no-pull) NIXOS_PULL=0;;
+    --install) INSTALL=1;;
+    --no-grub) NIXOS_INSTALL_GRUB=;;
+    --debug)   set -x;;
+    -j*)       NIX_ENV_ARGS="$NIX_ENV_ARGS $arg";;
+    *)         usage;
+  esac
+done
+
+if [ "$INSTALL" != 1 ]; then
+  usage
+fi
+
+
+# We don't have locale-archive in the chroot, so clear $LANG.
+export LANG=
+
+export PATH=@coreutils@/bin
+
+mkdir -m 01777 -p /tmp
+mkdir -m 0755 -p /var
+
+# Create the necessary Nix directories on the target device, if they
+# don't already exist.
+mkdir -m 0755 -p \
+    /nix/var/nix/gcroots \
+    /nix/var/nix/temproots \
+    /nix/var/nix/manifests \
+    /nix/var/nix/userpool \
+    /nix/var/nix/profiles \
+    /nix/var/nix/db \
+    /nix/var/log/nix/drvs
+
+# Do a nix-pull to speed up building.
+if test -n "@nixpkgsURL@" -a ${NIXOS_PULL} != 0; then
+    @nix@/bin/nix-pull @nixpkgsURL@/MANIFEST || true
+fi
+
+# Build the specified Nix expression in the target store and install
+# it into the system configuration profile.
+INFO "building the system configuration..."
+@nix@/bin/nix-env \
+    -p /nix/var/nix/profiles/system \
+    -f "$NIXOS" \
+    --arg configuration "import $NIXOS_CONFIG" \
+    --set -A system \
+    $NIX_ENV_ARGS
+
+# Mark the target as a NixOS installation, otherwise
+# switch-to-configuration will chicken out.
+touch /etc/NIXOS
+
+# Grub needs an mtab.
+ln -sfn /proc/mounts /etc/mtab
+
+
+# Switch to the new system configuration.  This will install Grub with
+# a menu default pointing at the kernel/initrd/etc of the new
+# configuration.
+INFO "finalising the installation..."
+export NIXOS_INSTALL_GRUB
+/nix/var/nix/profiles/system/bin/switch-to-configuration boot
diff --git a/modules/installer/tools/installer2/nixos-prepare-install.sh b/modules/installer/tools/installer2/nixos-prepare-install.sh
new file mode 100644
index 00000000000..b85ef2b9eaa
--- /dev/null
+++ b/modules/installer/tools/installer2/nixos-prepare-install.sh
@@ -0,0 +1,227 @@
+#!/bin/sh
+
+# prepare installation by putting in place unless present:
+# /etc/nixos/nixpkgs
+# /etc/nixos/nixos
+# /etc/nixos/configuration.nix
+
+
+set -e
+
+usage(){
+  cat << EOF
+  script options [list of actions]
+
+  actions:
+
+    guess-config:     run nixos-hardware-scan > T/configuration.nix
+    copy-nix:         copy minimal nix system which can bootstrap the whole system
+                      This creates the $mountPoint/bin/sh symlink
+                      If you're bootstrapping from an archive store paths are registered valid only
+    copy-nixos-bootstrap:
+                      copy the nixos-bootstrap script to /nix/store where it will be
+                      garbage collected later
+    copy-sources:     copy repos   into T/
+    checkout-sources: svn checkout official repos into T/
+
+
+    where T=$T
+      and repos = $ALL_REPOS
+
+  options:
+    --force: If targets exist no action will taken unless you use --force
+             in which case target is renamed before action is run
+    --dir-ok: allow installing into directory (omits is mount point check)
+
+    --debug: set -x
+
+
+  default list of actions: $DEFAULTS
+EOF
+  exit 1
+}
+
+
+INFO(){ echo "INFO: " $@; }
+
+# = configuration =
+
+FORCE_ACTIONS=${FORCE_ACTIONS:-}
+ALL_REPOS="nixpkgs nixos"
+mountPoint=${mountPoint:-/mnt}
+
+if [ -e $mountPoint/README-BOOTSTRAP-NIXOS ]; then
+  INFO "$mountPoint/README-BOOTSTRAP-NIXOS found, assuming your're bootstrapping from an archive. Nix files should be in place"
+  FROM_ARCHIVE=1
+  DEFAULTS="guess-config copy-nix"
+else
+  FROM_ARCHIVE=0
+  DEFAULTS="guess-config copy-nixos-bootstrap copy-nix copy-sources"
+fi
+
+backupTimestamp=$(date "+%Y%m%d%H%M%S")
+SRC_BASE=${SRC_BASE:-"/etc/nixos"}
+SVN_BASE="https://svn.nixos.org/repos/nix"
+MUST_BE_MOUNTPOINT=${MUST_BE_MOUNTPOINT:-1}
+T="$mountPoint/etc/nixos"
+
+NIX_CLOSURE=${NIX_CLOSURE:-@nixClosure@}
+
+die(){ echo "!>> " $@; exit 1; }
+
+## = read options =
+# actions is used by main loop at the end
+ACTIONS=""
+# check and handle options:
+for a in $@; do
+  case "$a" in
+    copy-nix|copy-nixos-bootstrap|guess-config|copy-sources|checkout-sources)
+      ACTIONS="$ACTIONS $a"
+    ;;
+    --dir-ok)
+      MUST_BE_MOUNTPOINT=false
+    ;;
+    --force)
+      FORCE_ACTIONS=1
+    ;;
+    --debug)
+      set -x
+    ;;
+    *)
+      echo "unkown option: $a"
+      usage
+    ;;
+  esac
+done
+[ -n "$ACTIONS" ] || ACTIONS="$DEFAULTS"
+
+
+if ! grep -F -q " $mountPoint " /proc/mounts && [ "$MUST_BE_MOUNTPOINT" = 1 ]; then
+    die "$mountPoint doesn't appear to be a mount point"
+fi
+
+# Get the store paths to copy from the references graph.
+storePaths=$(@perl@/bin/perl @pathsFromGraph@ @nixClosure@)
+# = utils =
+
+backup(){
+  local dst="$(dirname "$1")/$(basename "$1")-$backupTimestamp"
+  INFO "backing up: $1 -> $dst"
+  mv "$1" "$dst"
+}
+
+# = implementation =
+
+# exit status  = 0: target exists
+# exti status != 0: target must be rebuild either because --force was given or
+#                   because it didn't exist yet
+target_realised(){
+  if [ -e "$1" ] && [ "$FORCE_ACTIONS" = 1 ]; then
+      backup "$1"
+  fi
+
+  [ -e "$1" ] && {
+    INFO "not realsing $1. Target already exists. Use --force to force."
+  }
+}
+
+createDirs(){
+  mkdir -m 0755 -p $mountPoint/etc/nixos
+  mkdir -m 1777 -p $mountPoint/nix/store
+}
+
+
+realise_repo(){
+  local action=$1
+  local repo=$2
+
+  createDirs
+
+  if [ "$action" == "copy-sources" ]; then
+
+    local repo_sources="${repo}_SOURCES"
+    rsync -a -r "${SRC_BASE}/$repo" "$T"
+
+  else
+
+    INFO "checking out $repo"
+    svn co "$SVN_BASE/$repo/trunk" "$T/$repo"
+
+  fi
+
+}
+
+# = run actions: =
+for a in $ACTIONS; do
+  case "$a" in
+
+    guess_config)
+      local config="$T/configuration.nix"
+      target_realised "$config" || {
+        INFO "creating simple configuration file"
+        nixos-hardware-scan > "$config"
+        echo
+        INFO "Note: you can start customizing $config while remaining actions will are being executed"
+        echo
+      }
+    ;;
+
+    copy-nixos-bootstrap)
+      createDirs
+      # this script will be garbage collected somewhen:
+      cp @nixosBootstrap@/bin/nixos-bootstrap $mountPoint/nix/store/
+    ;;
+
+    copy-nix)
+      if [ -n "$FROM_ARCHIVE" ]; then
+        NIX_CLOSURE=${mountPoint}@nixClosure@
+      else
+        INFO "Copy Nix to the Nix store on the target device."
+        createDirs
+        echo "copying Nix to $mountPoint...."
+        for i in $storePaths; do
+            echo "  $i"
+            rsync -a $i $mountPoint/nix/store/
+        done
+
+      fi
+
+      [ -e "$NIX_CLOSURE" ] || die "Couldn't find nixClosure $NIX_CLOSURE anywhere. Can't register inital store paths valid. Exiting"
+
+      # Create the required /bin/sh symlink; otherwise lots of things
+      # (notably the system() function) won't work.
+      mkdir -m 0755 -p $mountPoint/bin
+      ln -sf @shell@ $mountPoint/bin/sh
+
+      INFO "registering bootstrapping store paths as valid so that they won't be rebuild"
+      # Register the paths in the Nix closure as valid.  This is necessary
+      # to prevent them from being deleted the first time we install
+      # something.  (I.e., Nix will see that, e.g., the glibc path is not
+      # valid, delete it to get it out of the way, but as a result nothing
+      # will work anymore.)
+      # TODO: check permissions so that paths can't be changed later?
+      chroot "$mountPoint" @nix@/bin/nix-store --register-validity < $NIX_CLOSURE
+
+    ;;
+
+    copy-sources|checkout-sources)
+
+      for repo in $ALL_REPOS; do
+        target_realised "$T/$repo" || realise_repo $a $repo
+      done
+
+    ;;
+  esac
+done
+
+if [ -e "$T/nixos" ] && [ -e "$T/nixpkgs" ] && [ -e "$T/configuration.nix" ]; then
+  cat << EOF
+    To realise your NixOS installtion execute:
+
+    run-in-chroot "/nix/store/nixos-bootstrap --install"
+EOF
+else
+  for t in "$T/configuration.nix" "$T/nixpkgs" "$T/configuration.nix"; do
+    INFO "you can't start because $t is missing"
+  done
+fi
diff --git a/modules/installer/tools/installer2/run-in-chroot.sh b/modules/installer/tools/installer2/run-in-chroot.sh
new file mode 100644
index 00000000000..1d4deb921ee
--- /dev/null
+++ b/modules/installer/tools/installer2/run-in-chroot.sh
@@ -0,0 +1,93 @@
+#!/bin/sh
+# helper script preparing chroot by mounting /dev /proc /sys etc
+
+set -e
+
+usage(){
+  cat << EOF
+  $SCRIPT OPTS or cmd
+  OPTS:
+  --prepare    : only mount
+  --unprepare  : only unmount
+  --debug      : set -x
+
+  requisites: perl
+
+  $SCRIPT --prepare:   prepare chroot only
+  $SCRIPT --unprepare: unprepare chroot only
+  $SCRIPT command:     run /bin/sh command in chroot
+
+  usage example run a shell in chroot:
+    $SCRIPT path-to-sh
+
+EOF
+  exit 1
+}
+
+die(){ echo "!>> " $@; exit 1; }
+INFO(){ echo "INFO: " $@; }
+
+# this is no longer needed because umount -l unmounts rescursive --rbound mounts as well
+#umountUnder() {
+#    local dir="$1"
+#    for i in $(grep -F " $dir" /proc/mounts \
+#        | perl -e 'while (<>) { /^\S+\s+(\S+)\s+/; print "$1\n"; }' \
+#        | sort -r);
+#    do
+#        echo umount $i || true
+#    done
+#}
+
+
+prepare(){
+  INFO "Enable networking: copying /etc/resolv.conf"
+  mkdir -m 0755 -p $mountPoint/etc
+  touch /etc/resolv.conf 
+  cp /etc/resolv.conf $mountPoint/etc/
+
+  INFO "mounting /proc /sys /dev and / to /host-system"
+  mkdir -m 0755 -p $mountPoint/{dev,proc,sys,host-system}
+  mount --bind /dev $mountPoint/dev
+  mount --bind /proc $mountPoint/proc
+  mount --bind /sys $mountPoint/sys
+  mount --rbind / $mountPoint/host-system
+}
+
+unprepare(){
+  INFO "unmounting /proc /sys /dev and removing /host-system if empty"
+  for d in $mountPoint/{host-system,dev,proc,sys}; do
+    umount -l "$d"
+  done
+  # no -fr !!
+  rmdir $mountPoint/host-system
+}
+
+run_cmd(){
+  prepare
+  trap "unprepare" EXIT
+  chroot $mountPoint $@
+}
+
+
+SCRIPT="$(basename "$0")"
+mountPoint=${mountPoint:-/mnt}
+
+[ -d $mountPoint ] || die "$mountPoint is not a directory"
+
+while [ "$#" > 0 ]; do
+  case $1 in
+
+    --debug)     shift; set -x;;
+
+    -h|--help)   shift; usage;;
+
+    --prepare)   shift; prepare;;
+
+    --unprepare) shift; unprepare;;
+
+    *)
+      run_cmd "$@"
+      exit 0
+    ;;
+  esac
+done
diff --git a/modules/installer/tools/nixos-bootstrap-archive/README-BOOTSTRAP-NIXOS b/modules/installer/tools/nixos-bootstrap-archive/README-BOOTSTRAP-NIXOS
new file mode 100644
index 00000000000..041588bb7e4
--- /dev/null
+++ b/modules/installer/tools/nixos-bootstrap-archive/README-BOOTSTRAP-NIXOS
@@ -0,0 +1,16 @@
+HOWTO install NixOS from a bootstrap archive
+=============================================
+
+export mountPoint=$target # defaults to /mnt
+tar xfj $ARCHIV -C $mountPoint 
+
+bash $mountPoint/nix/store/nixos-prepare-install # see --help
+
+$EDITOR $mountPoint/etc/nixos/configuration.nix
+
+# you can replace --install by --help to get more info
+bash $mountPoint/nix/store/run-in-chroot "/nix/store/nixos-bootstrap --install"
+
+
+This archive is create by
+nix-build $NIXOS -A config.system.build.minimalInstaller
diff --git a/modules/installer/tools/nixos-bootstrap-archive/default.nix b/modules/installer/tools/nixos-bootstrap-archive/default.nix
new file mode 100644
index 00000000000..d383ad081e1
--- /dev/null
+++ b/modules/installer/tools/nixos-bootstrap-archive/default.nix
@@ -0,0 +1,20 @@
+args: with args;
+
+# TODO  add revision number or such
+runCommand "nixos-bootstrap-archive" { } ''
+  PATH=${perl}/bin:${coreutils}/bin:${gnutar}/bin:${bzip2}/bin
+  storePaths=$(perl ${pathsFromGraph} ${nixClosure})
+
+  s(){ echo -C $(dirname $1) $(basename $1); }
+
+  mkdir $out
+  tar cf tmp.tar ${nixClosure} $storePaths 
+  cp ${./README-BOOTSTRAP-NIXOS} README-BOOTSTRAP-NIXOS
+  tar --append -f tmp.tar README-BOOTSTRAP-NIXOS
+  tar --append -f tmp.tar --transform 's@^@/nix/store/@' \
+      $(s ${nixosPrepareInstall}/bin/nixos-prepare-install ) \
+      $(s ${runInChroot}/bin/run-in-chroot ) \
+      $(s ${nixosBootstrap}/bin/nixos-bootstrap )
+      
+  cat tmp.tar | bzip2 > $out/nixos-install-archive.tar.bz2
+''
diff --git a/modules/installer/tools/nixos-install.sh b/modules/installer/tools/nixos-install.sh
index bc935f7c8e3..5ae1a89b52f 100644
--- a/modules/installer/tools/nixos-install.sh
+++ b/modules/installer/tools/nixos-install.sh
@@ -60,6 +60,8 @@ mount --bind /proc $mountPoint/proc
 mount --bind /sys $mountPoint/sys
 mount --rbind / $mountPoint/mnt
 
+# Note: probably umount -l is enough. It umounts recursive mount points having been mounted by --rbind!
+# Probably umountUnder can be removed ?
 umountUnder() {
     local dir="$1"
     for i in $(grep -F " $dir" /proc/mounts \
diff --git a/modules/installer/tools/tools.nix b/modules/installer/tools/tools.nix
index 45df2a50e92..f9027c3448f 100644
--- a/modules/installer/tools/tools.nix
+++ b/modules/installer/tools/tools.nix
@@ -53,6 +53,47 @@ let
       "cp refs $out";
   };
 
+  # rewrite of nixosInstall: each tool does exactly one job.
+  # So they get more useful.
+  installer2 =
+  let nixClosure = pkgs.runCommand "closure"
+        {exportReferencesGraph = ["refs" config.environment.nix];}
+        "cp refs $out";
+
+      nix = config.environment.nix;
+  in rec {
+
+    nixosPrepareInstall = makeProg {
+      name = "nixos-prepare-install";
+      src = ./installer2/nixos-prepare-install.sh;
+
+      inherit (pkgs) perl pathsFromGraph;
+      inherit nix nixClosure nixosBootstrap;
+    };
+
+    runInChroot = makeProg {
+     name = "run-in-chroot";
+       src = ./installer2/run-in-chroot.sh;
+    };
+
+    nixosBootstrap = makeProg {
+      name = "nixos-bootstrap";
+      src = ./installer2/nixos-bootstrap.sh;
+
+      inherit (pkgs) coreutils;
+      inherit nixClosure nix;
+
+      # TODO shell ?
+      nixpkgsURL = config.installer.nixpkgsURL;
+    };
+
+    # see ./nixos-bootstrap-archive/README
+    minimalInstaller = import ./nixos-bootstrap-archive {
+      inherit (pkgs) stdenv runCommand perl pathsFromGraph gnutar coreutils bzip2;
+      inherit nixosPrepareInstall runInChroot nixosBootstrap nixClosure;
+    };
+  };
+
   nixosRebuild = makeProg {
     name = "nixos-rebuild";
     src = ./nixos-rebuild.sh;
@@ -79,7 +120,15 @@ in
       nixosRebuild
       nixosHardwareScan
       nixosGenSeccureKeys
+
+      installer2.runInChroot
+      installer2.nixosPrepareInstall
     ];
 
-  system.build = { inherit nixosInstall; };
+  system.build = {
+    inherit nixosInstall;
+
+    # expose scripts
+    inherit (installer2) nixosPrepareInstall runInChroot nixosBootstrap minimalInstaller;
+  };
 }
diff --git a/tests/test-nixos-install-from-cd.nix b/tests/test-nixos-install-from-cd.nix
index d654cdbd69f..f832d6d464f 100644
--- a/tests/test-nixos-install-from-cd.nix
+++ b/tests/test-nixos-install-from-cd.nix
@@ -29,7 +29,7 @@ let
     # passed system = systom of iso 
     (isos.iso_minimal_test_insecure { inherit system; }).iso;
 
-  configuration = /pr/system_nixos_installer/nixos/tests/test-nixos-install-from-cd-config.nix;
+  configuration = ../modules/installer/cd-dvd/test-nixos-install-from-cd-config.nix;
 
   eval = import ../lib/eval-config.nix {
     inherit system nixpkgs;
@@ -46,6 +46,8 @@ let
   # the iso is only build when this suceeds (?)
   systemDerivation = builtins.addErrorContext "while building system" config.system.build.toplevel;
 
+  # TODO test both: copyKernels = true and false. true doesn't work ?
+
 in
 
 rec {
@@ -57,69 +59,133 @@ rec {
     # Would using uml provide any advantages?
     pkgs.runCommand "nixos-installation-test" { inherit systemDerivation; } ''
 
+    INFO(){ echo $@; }
+
+    die(){ echo $@; exit 1; }
+
+    if ${pkgs.procps}/bin/ps aux | grep -v grep | grep sbin/nmbd ; then
+      die "!! aborting: -smb won't work when host is running samba!"
+    fi 
+
+    [ -e /dev/kvm ] || die "modprobe a kvm-* module /dev/kvm not present. You want it for speed reasons!"
+
     for path in ${pkgs.socat} ${pkgs.openssh} ${qemu_kvm}; do
       PATH=$path/bin:$PATH
     done
 
-    echo "creating image file"
-    qemu-img create -f qcow2 image 512M
+    # without samba -smb doesn't work
+    PATH=${pkgs.samba}/sbin:$PATH
 
     # install the system
 
     export DISPLAY=localhost:0.0
 
+    SOCKET_NAME=65535.socket
+
+    # creating shell script for debugging purposes
     cat >> run-kvm.sh << EOF
-    #!/bin/sh
-    qemu-system-x86_64 -m 620 \
+    #!/bin/sh -e
+    # maybe swap should be used ?
+    exec qemu-system-x86_64 -m 2048 \
         -no-kvm-irqchip \
-        -net nic -net user -smb \
+        -net nic,model=virtio -net user -smb /nix \
         -hda image \
-        -cdrom $(echo ${isoFile}/iso/*.iso) \
+        -redir tcp:''${SOCKET_NAME/.socket/}::22 \
         "\$@"
     EOF
     chmod +x run-kvm.sh
 
-    SOCKET_NAME=65535.socket
-
-    # run qemu-kvm in a background process
-    { ./run-kvm.sh -boot d -redir tcp:''${SOCKET_NAME/.socket/}::22 \
-      || { echo "starting kvm failed, exiting" 1>&2; pkill -9 $$; }
-    } &
-    
-    # check that vm is still running
-    checkVM(){ [ -n "$(jobs -l)" ] || { echo "kvm died!?"; exit 1; }; }
+    RUN_KVM(){
+      INFO "launching qemu-kvm in a background process"
+      { ./run-kvm.sh "$@" \
+        || { echo "starting kvm failed, exiting" 1>&2; kill -9 $$; }
+      } &
+    }
 
     waitTill(){
       echo $1
-      while ! eval "$2"; do sleep 1; checkVM; done
+      while ! eval "$2"; do sleep 1; done
     }
 
     SSH(){
-      ssh -v -o UserKnownHostsFile=/dev/null \
+      ssh -o UserKnownHostsFile=/dev/null \
         -o StrictHostKeyChecking=no \
         -o ProxyCommand="socat stdio ./$SOCKET_NAME" \
         root@127.0.0.1 \
         "$@";
     }
+    SSH_STDIN_E(){ { echo "set -e;"; cat; } | SSH; }
+
+    SHUTDOWN_VM(){
+      SSH 'shutdown -h now';
+      INFO "waiting for kvm to shutown"
+      wait
+    }
 
     # wait for socket
 
-    waitTill "waiting for socket in $TMP" '[ ! -e ./$SOCKET_NAME ]'
-    waitTill "waiting for sshd job" "SSH 'echo Hello > /dev/tty1'"
+    waitForSSHD(){
+      waitTill "waiting for socket in $TMP" '[ ! -e ./$SOCKET_NAME ]'
+      waitTill "waiting for sshd job" "SSH 'echo Hello > /dev/tty1' &> /dev/null"
+    }
+
+
+
+    ### test installting NixOS: install system then reboot
+
+
+    INFO "creating image file"
+    qemu-img create -f qcow2 image 2G
+
+    RUN_KVM -boot d -cdrom $(echo ${isoFile}/iso/*.iso)
+    
+    waitForSSHD
 
     # INSTALLATION
-    echo "installation should take place"  
+    INFO "creating filesystem .."
+    SSH_STDIN_E << EOF
+      parted /dev/sda mklabel msdos
+      parted /dev/sda mkpart primary 0 2G
+      while [ ! -e /dev/sda1 ]; do
+        echo "waiting for /dev/sda1 to appear"
+        sleep 1;
+      done
+      mkfs.ext3 /dev/sda1
+      mount /dev/sda1 /mnt
+      mkdir -p /mnt/nix-on-host
+      mount //10.0.2.4/qemu -oguest,username=nobody,noperm -tcifs /mnt/nix-on-host
+    EOF
 
-    # REBOOT 
-    echo "rebooting should take place"  
 
-    # CHECK
-    echo "verify system is up and running"  
+    SSH_STDIN_E << EOF
+      # simple nixos-hardware-scan syntax check:
+      nixos-hardware-scan > /tmp/test.nix
+    EOF
+
+    INFO "copying sources and Nix, preparing configuration, starting installation"
+    SSH_STDIN_E << EOF
+
+      nixos-prepare-install
+
+      # has the generated configuration.nix file syntax errors?
+      nix-instantiate --eval-only /tmp/test.nix
+
+      # NixOS sources are in /etc/nixos, copy those configuration files.
+      cp /etc/nixos/nixos/modules/installer/cd-dvd/test-nixos-install-from-cd-config.nix /mnt/etc/nixos/configuration.nix
+      # the configuration file is referencing additional files:
+      cp -r /etc/nixos/nixos/modules/installer/cd-dvd/*.nix /mnt/etc/nixos/
+      export NIX_OTHER_STORES=/nix-on-host
+      run-in-chroot "/nix/store/nixos-bootstrap --install"
+      #nixos-install
+    EOF
+
+    SHUTDOWN_VM
 
-    # SHUTDOWN
-    SSH "shutdown -h now"
+    INFO "booting installed system"
+    RUN_KVM -boot c
+    waitForSSHD
+    SHUTDOWN_VM
 
-    echo waiting for kvm to shutdown..
-    wait
+    echo "$(date) success" > $out
   '';
 }
diff --git a/tests/test-nixos-installer2.nix b/tests/test-nixos-installer2.nix
new file mode 100644
index 00000000000..7afb9cd892e
--- /dev/null
+++ b/tests/test-nixos-installer2.nix
@@ -0,0 +1,71 @@
+# A test script is created testing the installer2 scripts
+# This can't be a build job because chroot is required - sudo is used
+# 
+# # build test script:
+# nix-build tests/test-nixos-installer2.nix -A test
+# 
+# # run:
+# sudo result/bin/test
+
+{ nixos ? ./..
+, nixpkgs ? ../../nixpkgs
+, services ? ../../nixos/services
+, system ? builtins.currentSystem
+, configPath ? ./test-nixos-install-from-cd.nix
+}:
+
+let
+
+  isos = (import ../release.nix) { inherit nixpkgs; };
+
+  # using same configuration as ased by kvm test.
+  configuration = ../modules/installer/cd-dvd/test-nixos-install-from-cd-config.nix;
+
+  eval = import ../lib/eval-config.nix {
+    inherit system nixpkgs;
+    modules = [ configuration ];
+  };
+
+
+  inherit (eval) pkgs config;
+
+  inherit (pkgs) qemu_kvm;
+
+  # prebuild system which will be installed for two reasons:
+  # build derivations are in store and can be reused
+  # the iso is only build when this suceeds (?)
+  systemDerivation = builtins.addErrorContext "while building system" config.system.build.toplevel;
+
+
+  tools = config.system.build;
+
+in
+
+rec {
+
+  test = pkgs.writeScriptBin "test"  ''
+    #!/bin/sh -e
+    # DEBUG can be set to --debug to force set -x in scripts
+
+    export mountPoint=''${mountPoint:-`pwd`/mountPoint}
+    if [ -e "$mountPoint" ]; then
+      echo "mountPoint $mountPoint exists, delete? [y] | other key: continue"
+      read -n1 delete
+      if [ "$delete" == "y" ]; then
+        rm -fr $mountPoint
+      fi
+    fi
+    mkdir -p $mountPoint
+
+    set -x
+
+    ${tools.nixosPrepareInstall}/bin/nixos-prepare-install $DEBUG --dir-ok copy-nixos-bootstrap copy-nix copy-sources
+
+    cp ${configuration} $mountPoint/etc/nixos/configuration.nix
+
+    # at least one of those files is referenced. So copy all - they don't hurt
+    cp -r ${builtins.dirOf (builtins.toString configuration)}/* $mountPoint/etc/nixos
+
+    ${tools.runInChroot}/bin/run-in-chroot $DEBUG "/nix/store/nixos-bootstrap $DEBUG --install --no-grub"
+  '';
+}
-- 
GitLab


From 3f2348ef91e63538d76be025c56caa2b89a00274 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Tue, 15 Dec 2009 13:02:23 +0000
Subject: [PATCH 2071/5331] Start networking services on `ip-up' when it makes
 sense.

svn path=/nixos/trunk/; revision=18962
---
 modules/services/misc/gpsd.nix               | 4 ++--
 modules/services/networking/avahi-daemon.nix | 4 ++--
 modules/services/networking/bitlbee.nix      | 4 ++--
 modules/services/networking/portmap.nix      | 4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/modules/services/misc/gpsd.nix b/modules/services/misc/gpsd.nix
index 83cc6bae1d5..ea9347aba7d 100644
--- a/modules/services/misc/gpsd.nix
+++ b/modules/services/misc/gpsd.nix
@@ -88,8 +88,8 @@ in
     jobs.gpsd =
       { description = "GPSD daemon";
 
-        startOn = "started network-interfaces";
-        stopOn = "stopping network-interfaces";
+        startOn = "ip-up";
+        stopOn = "ip-down";
 
         exec =
           ''
diff --git a/modules/services/networking/avahi-daemon.nix b/modules/services/networking/avahi-daemon.nix
index 82693c7399e..689abc593aa 100644
--- a/modules/services/networking/avahi-daemon.nix
+++ b/modules/services/networking/avahi-daemon.nix
@@ -118,8 +118,8 @@ in
     jobs.avahi_daemon =
       { name = "avahi-daemon";
 
-        startOn = "started network-interfaces";
-        stopOn = "stopping network-interfaces";
+        startOn = "ip-up";
+        stopOn = "ip-down";
 
         script =
           ''
diff --git a/modules/services/networking/bitlbee.nix b/modules/services/networking/bitlbee.nix
index f61227e0984..d9b7475f61e 100644
--- a/modules/services/networking/bitlbee.nix
+++ b/modules/services/networking/bitlbee.nix
@@ -67,8 +67,8 @@ in
     jobs.bitlbee =
       { description = "BitlBee IRC to other chat networks gateway";
 
-        startOn = "started network-interfaces";
-        stopOn = "stopping network-interfaces";
+        startOn = "ip-up";
+        stopOn = "ip-down";
 
         preStart =
           ''
diff --git a/modules/services/networking/portmap.nix b/modules/services/networking/portmap.nix
index 5a51836efad..2004c2c825a 100644
--- a/modules/services/networking/portmap.nix
+++ b/modules/services/networking/portmap.nix
@@ -66,8 +66,8 @@ in
     jobs.portmap =
       { description = "ONC RPC portmap";
 
-        startOn = "started network-interfaces";
-        stopOn = "stopping network-interfaces";
+        startOn = "ip-up";
+        stopOn = "ip-down";
 
         exec =
           ''
-- 
GitLab


From d6108919b1f1b8cc7b88684fce12acf96d6a7221 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 15 Dec 2009 13:09:06 +0000
Subject: [PATCH 2072/5331] * The loopback device is in a module now.  Since
 it's not   automatically loaded by the kernel, load it at boot time. * Put
 the ext2 module (which used to be built in) in the initrd to   prevent
 unexpected breakage.

svn path=/nixos/trunk/; revision=18963
---
 modules/system/boot/kernel.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/modules/system/boot/kernel.nix b/modules/system/boot/kernel.nix
index d7facd76519..d167789d77c 100644
--- a/modules/system/boot/kernel.nix
+++ b/modules/system/boot/kernel.nix
@@ -98,7 +98,7 @@ let
             "ide_generic"
             
             # Filesystems.
-            "ext3"
+            "ext2" "ext3"
             
             # Support USB keyboards, in case the boot fails and we only have
             # a USB keyboard.
@@ -171,6 +171,8 @@ in
   system.build = { inherit kernel; };
   system.modulesTree = [ kernel ] ++ config.boot.extraModulePackages;
 
+  boot.kernelModules = [ "loop" ];
+
   # The Linux kernel >= 2.6.27 provides firmware.
   hardware.firmware = [ "${kernel}/lib/firmware" ];
 }
-- 
GitLab


From b628ca221ddeaf515f3802616b724db9e7100640 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Tue, 15 Dec 2009 13:32:10 +0000
Subject: [PATCH 2073/5331] Fix Monit upstart dependency

svn path=/nixos/trunk/; revision=18964
---
 modules/services/monitoring/monit.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/services/monitoring/monit.nix b/modules/services/monitoring/monit.nix
index e51e6d1872a..c723e1cd837 100644
--- a/modules/services/monitoring/monit.nix
+++ b/modules/services/monitoring/monit.nix
@@ -20,7 +20,7 @@ in
         description = "monit.conf content";
       };
       startOn = mkOption {
-        default = "networking/started";
+        default = "network-interfaces/started";
         description = "What Monit supposes to be already present";
       };
     };
-- 
GitLab


From a612fd0d5e7453c127821873bbe521ae62a7608f Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 15 Dec 2009 14:05:01 +0000
Subject: [PATCH 2074/5331] * Obsoleted boot.initrd.extraKernelModules (use  
 boot.initrd.kernelModules instead).

svn path=/nixos/trunk/; revision=18969
---
 doc/config-examples/root-on-lvm.nix           |  4 +--
 doc/config-examples/x86_64-usbstick.nix       |  2 +-
 doc/manual/installation.xml                   | 22 ++++++----------
 doc/manual/manual.xml                         |  8 ++++++
 doc/manual/troubleshooting.xml                |  3 +--
 .../installer/cd-dvd/installation-cd-base.nix |  5 +++-
 .../installation-cd-minimal-fresh-kernel.nix  |  2 +-
 .../installation-cd-minimal-test-insecure.nix |  2 +-
 .../cd-dvd/installation-cd-rescue.nix         |  2 +-
 modules/installer/cd-dvd/iso-image.nix        | 10 +++++---
 .../installer/tools/nixos-hardware-scan.pl    |  2 +-
 modules/rename.nix                            |  2 ++
 modules/system/boot/kernel.nix                | 25 +++++--------------
 modules/system/boot/stage-1.nix               |  4 +--
 modules/virtualisation/qemu-vm.nix            |  4 +--
 15 files changed, 43 insertions(+), 54 deletions(-)

diff --git a/doc/config-examples/root-on-lvm.nix b/doc/config-examples/root-on-lvm.nix
index 6ee1da32c44..4fd4ca3a65c 100644
--- a/doc/config-examples/root-on-lvm.nix
+++ b/doc/config-examples/root-on-lvm.nix
@@ -14,9 +14,7 @@
 {
   boot = {
     grubDevice = "/dev/sda";
-    initrd = {
-      extraKernelModules = ["ata_piix"];
-    };
+    initrd.kernelModules = ["ata_piix"];
     copyKernels = true;
     bootMount = "(hd0,0)";
   };
diff --git a/doc/config-examples/x86_64-usbstick.nix b/doc/config-examples/x86_64-usbstick.nix
index 0ce79ae86dc..b76a07b0d57 100644
--- a/doc/config-examples/x86_64-usbstick.nix
+++ b/doc/config-examples/x86_64-usbstick.nix
@@ -4,7 +4,7 @@
   boot = {
     grubDevice = "/dev/sda";
     initrd = {
-      extraKernelModules = ["usb_storage" "ehci_hcd" "ohci_hcd"];
+      kernelModules = ["usb_storage" "ehci_hcd" "ohci_hcd"];
       enableSplashScreen = false;
     };
   };
diff --git a/doc/manual/installation.xml b/doc/manual/installation.xml
index b73da06b5c2..b2efbf2d5d5 100644
--- a/doc/manual/installation.xml
+++ b/doc/manual/installation.xml
@@ -177,10 +177,10 @@ $ nixos-hardware-scan > /mnt/etc/nixos/configuration.nix</screen>
     xlink:href="https://svn.nixos.org/repos/nix/configurations/trunk/"/>.</para>
 
     <note><para>It is very important that you specify in the option
-    <option>boot.initrd.extraKernelModules</option> all kernel modules
-    that are necessary for mounting the root file system, otherwise
-    the installed system will not be able to boot.  (If this happens,
-    boot from CD again, mount the target file system on
+    <option>boot.initrd.kernelModules</option> all kernel modules that
+    are necessary for mounting the root file system, otherwise the
+    installed system will not be able to boot.  (If this happens, boot
+    from CD again, mount the target file system on
     <filename>/mnt</filename>, fix
     <filename>/mnt/etc/nixos/configuration.nix</filename> and rerun
     <filename>nixos-install</filename>.)
@@ -279,12 +279,8 @@ $ reboot</screen>
 <example xml:id='ex-config'><title>NixOS configuration</title>
 <screen>
 {
-  boot = {
-    initrd = {
-      extraKernelModules = [ "ata_piix" ];
-    };
-    grubDevice = "/dev/sda";
-  };
+  boot.initrd.kernelModules = [ "ata_piix" ];
+  boot.grubDevice = "/dev/sda";
 
   fileSystems = [
     { mountPoint = "/";
@@ -296,11 +292,7 @@ $ reboot</screen>
     { label = "swap"; }
   ];
   
-  services = {
-    sshd = {
-      enable = true;
-    };
-  };
+  services.sshd.enable = true;
 }</screen>
 </example>
 
diff --git a/doc/manual/manual.xml b/doc/manual/manual.xml
index 6ad59ae8486..b12b6175c61 100644
--- a/doc/manual/manual.xml
+++ b/doc/manual/manual.xml
@@ -13,9 +13,17 @@
       </personname>
     </author>
 
+    <author>
+      <personname>
+        <firstname>Nicolas</firstname>
+        <surname>Pierron</surname>
+      </personname>
+    </author>
+
     <copyright>
       <year>2007</year>
       <year>2008</year>
+      <year>2009</year>
       <holder>Eelco Dolstra</holder>
     </copyright>
     
diff --git a/doc/manual/troubleshooting.xml b/doc/manual/troubleshooting.xml
index 66de9795b59..ff19607844f 100644
--- a/doc/manual/troubleshooting.xml
+++ b/doc/manual/troubleshooting.xml
@@ -33,8 +33,7 @@ no services have been started.</para>
 <literal>safemode</literal> to the kernel command line.  This will
 disable auto-loading of modules for your PCI devices.  However, you
 will probably need to explicitly add modules to
-<option>boot.extraKernelModules</option> to get network support
-etc.</para>
+<option>boot.kernelModules</option> to get network support etc.</para>
 
 </section>
 
diff --git a/modules/installer/cd-dvd/installation-cd-base.nix b/modules/installer/cd-dvd/installation-cd-base.nix
index 0fb1156dc71..428b262f75f 100644
--- a/modules/installer/cd-dvd/installation-cd-base.nix
+++ b/modules/installer/cd-dvd/installation-cd-base.nix
@@ -114,7 +114,7 @@ in
 
   # The initrd has to contain any module that might be necessary for
   # mounting the CD/DVD.
-  boot.initrd.extraKernelModules =
+  boot.initrd.kernelModules =
     [ # SATA/PATA support.
       "ahci"
 
@@ -158,6 +158,9 @@ in
       # Add vfat to enable people to copy the contents of the CD to a
       # bootable USB stick.
       "vfat"
+
+      # And of course we need to be able to mount the CD.
+      "iso9660" "loop" "squashfs"
     ];
 
   # nixos-install will do a pull from this channel to speed up the
diff --git a/modules/installer/cd-dvd/installation-cd-minimal-fresh-kernel.nix b/modules/installer/cd-dvd/installation-cd-minimal-fresh-kernel.nix
index 0bdd6ebdb34..407fc6929db 100644
--- a/modules/installer/cd-dvd/installation-cd-minimal-fresh-kernel.nix
+++ b/modules/installer/cd-dvd/installation-cd-minimal-fresh-kernel.nix
@@ -31,7 +31,7 @@ rec {
     ln -s /bin "$out/var/run/current-system/sw/sbin"
   '';
 
-  boot.initrd.extraKernelModules = [
+  boot.initrd.kernelModules = [
     "iso9660" "loop" "squashfs"
     ];
   boot.initrd.allowMissing = true;
diff --git a/modules/installer/cd-dvd/installation-cd-minimal-test-insecure.nix b/modules/installer/cd-dvd/installation-cd-minimal-test-insecure.nix
index b531ccaaf3d..2992724373e 100644
--- a/modules/installer/cd-dvd/installation-cd-minimal-test-insecure.nix
+++ b/modules/installer/cd-dvd/installation-cd-minimal-test-insecure.nix
@@ -19,7 +19,7 @@ in
   };
 
 
-  boot.initrd.extraKernelModules =
+  boot.initrd.kernelModules =
     ["cifs" "virtio_net" "virtio_pci" "virtio_blk" "virtio_balloon" "nls_utf8"];
 
   environment.systemPackages = [ pkgs.vim_configurable ];
diff --git a/modules/installer/cd-dvd/installation-cd-rescue.nix b/modules/installer/cd-dvd/installation-cd-rescue.nix
index 9be701e1bd2..43bb4c40930 100644
--- a/modules/installer/cd-dvd/installation-cd-rescue.nix
+++ b/modules/installer/cd-dvd/installation-cd-rescue.nix
@@ -34,7 +34,7 @@
   ];
 
   boot.kernelPackages = pkgs.kernelPackages_2_6_31_rc4_old_i686;
-  boot.initrd.extraKernelModules = ["evdev" "i8042" "pcips2" "serio"
+  boot.initrd.kernelModules = ["evdev" "i8042" "pcips2" "serio"
     "sd_mod" "libata" "unix" "usbhid" "uhci_hcd" "atkbd" "xtkbd" "fbdev"
     "iso9660" "udf" "loop"];
   boot.kernelModules = ["fbcon" "radeonfb" "intelfb" "sisfb" "nvidiafb"
diff --git a/modules/installer/cd-dvd/iso-image.nix b/modules/installer/cd-dvd/iso-image.nix
index 3cc558a346d..1d23acb36d1 100644
--- a/modules/installer/cd-dvd/iso-image.nix
+++ b/modules/installer/cd-dvd/iso-image.nix
@@ -123,10 +123,12 @@ in
 
   # We need squashfs in the initrd to mount the compressed Nix store,
   # and aufs to make the root filesystem appear writable.
-  boot.extraModulePackages = (optional 
-    (! config.boot.kernelPackages.kernel.features ? aufs) 
-    config.boot.kernelPackages.aufs);
-  boot.initrd.extraKernelModules = ["aufs" "squashfs"];
+  boot.extraModulePackages =
+    optional 
+      (! config.boot.kernelPackages.kernel.features ? aufs) 
+      config.boot.kernelPackages.aufs;
+      
+  boot.initrd.kernelModules = ["aufs" "squashfs"];
 
   # Tell stage 1 of the boot to mount a tmpfs on top of the CD using
   # AUFS.  !!! It would be nicer to make the stage 1 init pluggable
diff --git a/modules/installer/tools/nixos-hardware-scan.pl b/modules/installer/tools/nixos-hardware-scan.pl
index 73f65a6d83e..50ce8a043f6 100644
--- a/modules/installer/tools/nixos-hardware-scan.pl
+++ b/modules/installer/tools/nixos-hardware-scan.pl
@@ -216,7 +216,7 @@ print <<EOF ;
 # This is a generated file.  Do not modify!
 # Make changes to /etc/nixos/configuration.nix instead.
 {
-  boot.initrd.extraKernelModules = [ $initrdKernelModules ];
+  boot.initrd.kernelModules = [ $initrdKernelModules ];
   boot.kernelModules = [ $kernelModules ];
 
   nix.maxJobs = $cpus;
diff --git a/modules/rename.nix b/modules/rename.nix
index 77470d93200..9b71c46d10d 100644
--- a/modules/rename.nix
+++ b/modules/rename.nix
@@ -71,6 +71,8 @@ in zipModules ([]
 ++ rename obsolete "boot.bootMount" to "boot.loader.grub.bootDevice"
 ++ rename obsolete "boot.grubSplashImage" to "boot.loader.grub.splashImage"
 
+++ rename obsolete "boot.initrd.extraKernelModules" to "boot.initrd.kernelModules"
+
 # X11
 ++ rename obsolete "services.xserver.startSSHAgent" to "services.xserver.startOpenSSHAgent"
 
diff --git a/modules/system/boot/kernel.nix b/modules/system/boot/kernel.nix
index d167789d77c..afe453e47bc 100644
--- a/modules/system/boot/kernel.nix
+++ b/modules/system/boot/kernel.nix
@@ -61,13 +61,12 @@ let
 
       kernelModules = mkOption {
         default = [];
-        description = "
+        description = ''
           The set of kernel modules to be loaded in the second stage of
-          the boot process.  That is, these modules are not included in
-          the initial ramdisk, so they'd better not be required for
-          mounting the root file system.  Add them to
-          <option>boot.initrd.extraKernelModules</option> if they are.
-        ";
+          the boot process.  Note that modules that are needed to
+          mount the root file system should be added to
+          <option>boot.initrd.kernelModules</option>.
+        '';
       };
 
       initrd = {
@@ -122,19 +121,7 @@ let
             system (e.g., ext3).  The set specified here is automatically
             closed under the module dependency relation, i.e., all
             dependencies of the modules list here are included
-            automatically.  If you want to add additional
-            modules, it's best to set
-            <option>boot.initrd.extraKernelModules</option>.
-          ";
-        };
-
-        extraKernelModules = mkOption {
-          default = [];
-          description = "
-            Additional kernel modules for the initial ramdisk.  These are
-            loaded before the modules listed in
-            <option>boot.initrd.kernelModules</option>, so they take
-            precedence.
+            automatically.
           ";
         };
 
diff --git a/modules/system/boot/stage-1.nix b/modules/system/boot/stage-1.nix
index 4d6502ba66b..907f5b7260a 100644
--- a/modules/system/boot/stage-1.nix
+++ b/modules/system/boot/stage-1.nix
@@ -110,9 +110,7 @@ let
 
   # Determine the set of modules that we need to mount the root FS.
   modulesClosure = pkgs.makeModulesClosure {
-    rootModules =
-      config.boot.initrd.extraKernelModules ++
-      config.boot.initrd.kernelModules;
+    rootModules = config.boot.initrd.kernelModules;
     kernel = modulesTree;
     allowMissing = config.boot.initrd.allowMissing;
   };
diff --git a/modules/virtualisation/qemu-vm.nix b/modules/virtualisation/qemu-vm.nix
index 5d4d458de46..8f00f69548b 100644
--- a/modules/virtualisation/qemu-vm.nix
+++ b/modules/virtualisation/qemu-vm.nix
@@ -7,7 +7,7 @@
 # the VM in the host.  On the other hand, the root filesystem is a
 # read/writable disk image persistent across VM reboots.
 
-{config, pkgs, ...}:
+{ config, pkgs, ... }:
 
 with pkgs.lib;
 
@@ -71,7 +71,7 @@ in
   # All the modules the initrd needs to mount the host filesystem via
   # CIFS.  Also use paravirtualised network and block devices for
   # performance.
-  boot.initrd.extraKernelModules =
+  boot.initrd.kernelModules =
     ["cifs" "virtio_net" "virtio_pci" "virtio_blk" "virtio_balloon" "nls_utf8"];
 
   boot.initrd.extraUtilsCommands =
-- 
GitLab


From e8372257a10649f0b897cca963da3a5276b5ce00 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 15 Dec 2009 14:10:06 +0000
Subject: [PATCH 2075/5331] * Reformat.

svn path=/nixos/trunk/; revision=18970
---
 modules/system/boot/kernel.nix | 266 ++++++++++++++++-----------------
 1 file changed, 127 insertions(+), 139 deletions(-)

diff --git a/modules/system/boot/kernel.nix b/modules/system/boot/kernel.nix
index afe453e47bc..973fe33b09e 100644
--- a/modules/system/boot/kernel.nix
+++ b/modules/system/boot/kernel.nix
@@ -2,164 +2,152 @@
 
 with pkgs.lib;
 
-###### interface
-let
+let kernel = config.boot.kernelPackages.kernel; in
+
+{
+
+  ###### interface
 
   options = {
-    boot = {
-      kernelPackages = mkOption {
-        default = pkgs.kernelPackages;
-        example = pkgs.kernelPackages_2_6_25;
-        description = "
-          This option allows you to override the Linux kernel used by
-          NixOS.  Since things like external kernel module packages are
-          tied to the kernel you're using, it also overrides those.
-          This option is a function that takes Nixpkgs as an argument
-          (as a convenience), and returns an attribute set containing at
-          the very least an attribute <varname>kernel</varname>.
-          Additional attributes may be needed depending on your
-          configuration.  For instance, if you use the NVIDIA X driver,
-          then it also needs to contain an attribute
-          <varname>nvidia_x11</varname>.
-        ";
-      };
-
-      kernelParams = mkOption {
-        default = [
-          "selinux=0"
-          "apm=on"
-          "acpi=on"
-          "console=tty1"
-          "splash=verbose"
-          "vga=0x317"
-        ];
-        description = "
-          The kernel parameters.  If you want to add additional
-          parameters, it's best to set
-          <option>boot.extraKernelParams</option>.
-        ";
-      };
-
-      extraKernelParams = mkOption {
-        default = [
-        ];
-        example = [
-          "debugtrace"
-        ];
-        description = "
-          Additional user-defined kernel parameters.
-        ";
-      };
-
-      extraModulePackages = mkOption {
-        default = [];
-        # !!! example = [pkgs.aufs pkgs.nvidia_x11];
-        description = ''
-          A list of additional packages supplying kernel modules.
-        '';
-      };
-
-      kernelModules = mkOption {
-        default = [];
-        description = ''
-          The set of kernel modules to be loaded in the second stage of
-          the boot process.  Note that modules that are needed to
-          mount the root file system should be added to
-          <option>boot.initrd.kernelModules</option>.
-        '';
-      };
-
-      initrd = {
-
-        kernelModules = mkOption {
-          default = [
-            # Note: most of these (especially the SATA/PATA modules)
-            # shouldn't be included by default since nixos-hardware-scan
-            # detects them, but I'm keeping them for now for backwards
-            # compatibility.
-            
-            # Some SATA/PATA stuff.        
-            "ahci"
-            "sata_nv"
-            "sata_via"
-            "sata_sis"
-            "sata_uli"
-            "ata_piix"
-            "pata_marvell"
-            
-            # Standard SCSI stuff.
-            "sd_mod"
-            "sr_mod"
-            
-            # Standard IDE stuff.
-            "ide_cd"
-            "ide_disk"
-            "ide_generic"
-            
-            # Filesystems.
-            "ext2" "ext3"
-            
-            # Support USB keyboards, in case the boot fails and we only have
-            # a USB keyboard.
-            "uhci_hcd"
-            "ehci_hcd"
-            "ohci_hcd"
-            "usbhid"
-
-            # LVM.
-            "dm_mod"
-
-	    # All-mod-config case:
-	    "unix"
-	    "i8042" "pcips2" "serio" "atkbd" "xtkbd"
-          ];
-          description = "
-            The set of kernel modules in the initial ramdisk used during the
-            boot process.  This set must include all modules necessary for
-            mounting the root device.  That is, it should include modules
-            for the physical device (e.g., SCSI drivers) and for the file
-            system (e.g., ext3).  The set specified here is automatically
-            closed under the module dependency relation, i.e., all
-            dependencies of the modules list here are included
-            automatically.
-          ";
-        };
-
-      };
+  
+    boot.kernelPackages = mkOption {
+      default = pkgs.kernelPackages;
+      example = pkgs.kernelPackages_2_6_25;
+      description = ''
+        This option allows you to override the Linux kernel used by
+        NixOS.  Since things like external kernel module packages are
+        tied to the kernel you're using, it also overrides those.
+        This option is a function that takes Nixpkgs as an argument
+        (as a convenience), and returns an attribute set containing at
+        the very least an attribute <varname>kernel</varname>.
+        Additional attributes may be needed depending on your
+        configuration.  For instance, if you use the NVIDIA X driver,
+        then it also needs to contain an attribute
+        <varname>nvidia_x11</varname>.
+      '';
+    };
+
+    boot.kernelParams = mkOption {
+      default = [
+        "selinux=0"
+        "apm=on"
+        "acpi=on"
+        "console=tty1"
+        "splash=verbose"
+        "vga=0x317"
+      ];
+      description = ''
+        The kernel parameters.  If you want to add additional
+        parameters, it's best to set
+        <option>boot.extraKernelParams</option>.
+      '';
+    };
+
+    boot.extraKernelParams = mkOption {
+      default = [ ];
+      example = [ "debugtrace" ];
+      description = "Additional user-defined kernel parameters.";
+    };
+
+    boot.extraModulePackages = mkOption {
+      default = [];
+      # !!! example = [pkgs.aufs pkgs.nvidia_x11];
+      description = "A list of additional packages supplying kernel modules.";
+    };
+
+    boot.kernelModules = mkOption {
+      default = [];
+      description = ''
+        The set of kernel modules to be loaded in the second stage of
+        the boot process.  Note that modules that are needed to
+        mount the root file system should be added to
+        <option>boot.initrd.kernelModules</option>.
+      '';
+    };
+
+    boot.initrd.kernelModules = mkOption {
+      default = [
+        # Note: most of these (especially the SATA/PATA modules)
+        # shouldn't be included by default since nixos-hardware-scan
+        # detects them, but I'm keeping them for now for backwards
+        # compatibility.
+
+        # Some SATA/PATA stuff.        
+        "ahci"
+        "sata_nv"
+        "sata_via"
+        "sata_sis"
+        "sata_uli"
+        "ata_piix"
+        "pata_marvell"
+
+        # Standard SCSI stuff.
+        "sd_mod"
+        "sr_mod"
+
+        # Standard IDE stuff.
+        "ide_cd"
+        "ide_disk"
+        "ide_generic"
+
+        # Filesystems.
+        "ext2" "ext3"
+
+        # Support USB keyboards, in case the boot fails and we only have
+        # a USB keyboard.
+        "uhci_hcd"
+        "ehci_hcd"
+        "ohci_hcd"
+        "usbhid"
+
+        # LVM.
+        "dm_mod"
+
+        # All-mod-config case:
+        "unix"
+        "i8042" "pcips2" "serio" "atkbd" "xtkbd"
+      ];
+      description = ''
+        The set of kernel modules in the initial ramdisk used during the
+        boot process.  This set must include all modules necessary for
+        mounting the root device.  That is, it should include modules
+        for the physical device (e.g., SCSI drivers) and for the file
+        system (e.g., ext3).  The set specified here is automatically
+        closed under the module dependency relation, i.e., all
+        dependencies of the modules list here are included
+        automatically.
+      '';
     };
 
     system.modulesTree = mkOption {
       internal = true;
       default = [];
-      description = "
+      description = ''
         Tree of kernel modules.  This includes the kernel, plus modules
         built outside of the kernel.  Combine these into a single tree of
         symlinks because modprobe only supports one directory.
-      ";
+      '';
       merge = mergeListOption;
-
       # Convert the list of path to only one path.
       apply = pkgs.aggregateModules;
     };
 
   };
-  
-in
 
-###### implementation
-let
-  kernelPackages = config.boot.kernelPackages;
-  kernel = kernelPackages.kernel;
-in
 
-{
-  require = [ options ];
+  ###### implementation
+
+  config = {
+
+    system.build = { inherit kernel; };
+    
+    system.modulesTree = [ kernel ] ++ config.boot.extraModulePackages;
 
-  system.build = { inherit kernel; };
-  system.modulesTree = [ kernel ] ++ config.boot.extraModulePackages;
+    boot.kernelModules = [ "loop" ];
 
-  boot.kernelModules = [ "loop" ];
+    # The Linux kernel >= 2.6.27 provides firmware.
+    hardware.firmware = [ "${kernel}/lib/firmware" ];
 
-  # The Linux kernel >= 2.6.27 provides firmware.
-  hardware.firmware = [ "${kernel}/lib/firmware" ];
+  };
+  
 }
-- 
GitLab


From 6c9059e7178de44c6017438c3a464d4f312fe173 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 15 Dec 2009 16:38:20 +0000
Subject: [PATCH 2076/5331] * Added an option
 `boot.initrd.availableKernelModules' that specifies   modules that should be
 added to the initrd, but should only be   loaded on demand (e.g. by the
 kernel or by udev).  This is   especially useful in the installation CD,
 where we now only load the   modules needed by the hardware. * Enable
 automatic modprobing by udev in the initrd.

svn path=/nixos/trunk/; revision=18975
---
 .../installer/cd-dvd/installation-cd-base.nix |   6 +-
 modules/installer/cd-dvd/iso-image.nix        |   2 +-
 modules/system/boot/kernel.nix                | 103 +++++++++++-------
 modules/system/boot/stage-1-init.sh           |  31 ++----
 modules/system/boot/stage-1.nix               |  56 +++++-----
 modules/virtualisation/qemu-vm.nix            |   4 +-
 6 files changed, 106 insertions(+), 96 deletions(-)

diff --git a/modules/installer/cd-dvd/installation-cd-base.nix b/modules/installer/cd-dvd/installation-cd-base.nix
index 428b262f75f..64eb4ee5b75 100644
--- a/modules/installer/cd-dvd/installation-cd-base.nix
+++ b/modules/installer/cd-dvd/installation-cd-base.nix
@@ -114,7 +114,7 @@ in
 
   # The initrd has to contain any module that might be necessary for
   # mounting the CD/DVD.
-  boot.initrd.kernelModules =
+  boot.initrd.availableKernelModules =
     [ # SATA/PATA support.
       "ahci"
 
@@ -160,9 +160,11 @@ in
       "vfat"
 
       # And of course we need to be able to mount the CD.
-      "iso9660" "loop" "squashfs"
+      "iso9660"
     ];
 
+  boot.initrd.kernelModules = [ "loop" ];
+
   # nixos-install will do a pull from this channel to speed up the
   # installation.
   installer.nixpkgsURL = http://nixos.org/releases/nixpkgs/channels/nixpkgs-unstable;
diff --git a/modules/installer/cd-dvd/iso-image.nix b/modules/installer/cd-dvd/iso-image.nix
index 1d23acb36d1..e711a582334 100644
--- a/modules/installer/cd-dvd/iso-image.nix
+++ b/modules/installer/cd-dvd/iso-image.nix
@@ -128,7 +128,7 @@ in
       (! config.boot.kernelPackages.kernel.features ? aufs) 
       config.boot.kernelPackages.aufs;
       
-  boot.initrd.kernelModules = ["aufs" "squashfs"];
+  boot.initrd.availableKernelModules = [ "aufs" "squashfs" ];
 
   # Tell stage 1 of the boot to mount a tmpfs on top of the CD using
   # AUFS.  !!! It would be nicer to make the stage 1 init pluggable
diff --git a/modules/system/boot/kernel.nix b/modules/system/boot/kernel.nix
index 973fe33b09e..69b1b944de7 100644
--- a/modules/system/boot/kernel.nix
+++ b/modules/system/boot/kernel.nix
@@ -61,13 +61,65 @@ let kernel = config.boot.kernelPackages.kernel; in
         The set of kernel modules to be loaded in the second stage of
         the boot process.  Note that modules that are needed to
         mount the root file system should be added to
+        <option>boot.initrd.availableKernelModules</option> or
         <option>boot.initrd.kernelModules</option>.
       '';
     };
 
+    boot.initrd.availableKernelModules = mkOption {
+      default = [];
+      example = [ "sata_nv" "ext3" ];
+      description = ''
+        The set of kernel modules in the initial ramdisk used during the
+        boot process.  This set must include all modules necessary for
+        mounting the root device.  That is, it should include modules
+        for the physical device (e.g., SCSI drivers) and for the file
+        system (e.g., ext3).  The set specified here is automatically
+        closed under the module dependency relation, i.e., all
+        dependencies of the modules list here are included
+        automatically.  The modules listed here are available in the
+        initrd, but are only loaded on demand (e.g., the ext3 module is
+        loaded automatically when an ext3 filesystem is mounted, and
+        modules for PCI devices are loaded when they match the PCI ID
+        of a device in your system).  To force a module to be loaded,
+        include it in <option>boot.initrd.kernelModules</option>.
+      '';
+    };
+    
     boot.initrd.kernelModules = mkOption {
       default = [
-        # Note: most of these (especially the SATA/PATA modules)
+      ];
+      description = "List of modules that are always loaded by the initrd.";
+    };
+
+    system.modulesTree = mkOption {
+      internal = true;
+      default = [];
+      description = ''
+        Tree of kernel modules.  This includes the kernel, plus modules
+        built outside of the kernel.  Combine these into a single tree of
+        symlinks because modprobe only supports one directory.
+      '';
+      merge = mergeListOption;
+      # Convert the list of path to only one path.
+      apply = pkgs.aggregateModules;
+    };
+
+  };
+
+
+  ###### implementation
+
+  config = {
+
+    system.build = { inherit kernel; };
+    
+    system.modulesTree = [ kernel ] ++ config.boot.extraModulePackages;
+
+    boot.kernelModules = [ "loop" ];
+
+    boot.initrd.availableKernelModules =
+      [ # Note: most of these (especially the SATA/PATA modules)
         # shouldn't be included by default since nixos-hardware-scan
         # detects them, but I'm keeping them for now for backwards
         # compatibility.
@@ -100,50 +152,17 @@ let kernel = config.boot.kernelPackages.kernel; in
         "ohci_hcd"
         "usbhid"
 
-        # LVM.
-        "dm_mod"
-
-        # All-mod-config case:
+        # Unix domain sockets (needed by udev).
         "unix"
+        
+        # Misc. stuff.
         "i8042" "pcips2" "serio" "atkbd" "xtkbd"
       ];
-      description = ''
-        The set of kernel modules in the initial ramdisk used during the
-        boot process.  This set must include all modules necessary for
-        mounting the root device.  That is, it should include modules
-        for the physical device (e.g., SCSI drivers) and for the file
-        system (e.g., ext3).  The set specified here is automatically
-        closed under the module dependency relation, i.e., all
-        dependencies of the modules list here are included
-        automatically.
-      '';
-    };
-
-    system.modulesTree = mkOption {
-      internal = true;
-      default = [];
-      description = ''
-        Tree of kernel modules.  This includes the kernel, plus modules
-        built outside of the kernel.  Combine these into a single tree of
-        symlinks because modprobe only supports one directory.
-      '';
-      merge = mergeListOption;
-      # Convert the list of path to only one path.
-      apply = pkgs.aggregateModules;
-    };
-
-  };
-
-
-  ###### implementation
-
-  config = {
-
-    system.build = { inherit kernel; };
-    
-    system.modulesTree = [ kernel ] ++ config.boot.extraModulePackages;
-
-    boot.kernelModules = [ "loop" ];
+      
+    boot.initrd.kernelModules =
+      [ # For LVM.
+        "dm_mod"
+      ];
 
     # The Linux kernel >= 2.6.27 provides firmware.
     hardware.firmware = [ "${kernel}/lib/firmware" ];
diff --git a/modules/system/boot/stage-1-init.sh b/modules/system/boot/stage-1-init.sh
index 182fe7e98e1..616f14156a4 100644
--- a/modules/system/boot/stage-1-init.sh
+++ b/modules/system/boot/stage-1-init.sh
@@ -3,6 +3,7 @@
 targetRoot=/mnt-root
 
 export LD_LIBRARY_PATH=@extraUtils@/lib
+export PATH=@extraUtils@/bin:@klibc@/bin
 
 
 fail() {
@@ -43,16 +44,6 @@ echo "<<< NixOS Stage 1 >>>"
 echo
 
 
-# Set the PATH.
-export PATH=/empty
-for i in @path@; do
-    PATH=$PATH:$i/bin
-    if test -e $i/sbin; then
-        PATH=$PATH:$i/sbin
-    fi
-done
-
-
 # Mount special file systems.
 mkdir -p /etc # to shut up mount
 echo -n > /etc/fstab # idem
@@ -87,10 +78,11 @@ for o in $(cat /proc/cmdline); do
 done
 
 
-# Load some kernel modules.
-for i in $(cat @modulesClosure@/insmod-list); do
+# Load the required kernel modules.
+echo @extraUtils@/bin/modprobe > /proc/sys/kernel/modprobe
+for i in @kernelModules@; do
     echo "loading module $(basename $i)..."
-    insmod $i || true
+    modprobe $i || true
 done
 
 
@@ -107,12 +99,13 @@ if test -e /sys/power/tuxonice/resume; then
 fi
 
 if test -e /sys/power/resume -a -e /sys/power/disk; then
-  echo "@resumeDevice@" > /sys/power/resume 2> /dev/null || echo "failed to resume..."
-  echo shutdown > /sys/power/disk
+    echo "@resumeDevice@" > /sys/power/resume 2> /dev/null || echo "failed to resume..."
+    echo shutdown > /sys/power/disk
 fi
 
 
 # Create device nodes in /dev.
+echo "running udev..."
 export UDEV_CONFIG_FILE=@udevConf@
 mkdir -p /dev/.udev # !!! bug in udev?
 udevd --daemon
@@ -120,10 +113,10 @@ udevadm trigger
 udevadm settle
 
 if type -p dmsetup > /dev/null; then
-  echo "starting device mapper and LVM..."
-  dmsetup mknodes
-  lvm vgscan --ignorelockingfailure
-  lvm vgchange -ay --ignorelockingfailure
+    echo "starting device mapper and LVM..."
+    dmsetup mknodes
+    lvm vgscan --ignorelockingfailure
+    lvm vgchange -ay --ignorelockingfailure
 fi
 
 if test -n "$debug1devices"; then fail; fi
diff --git a/modules/system/boot/stage-1.nix b/modules/system/boot/stage-1.nix
index 907f5b7260a..4b51ce1b024 100644
--- a/modules/system/boot/stage-1.nix
+++ b/modules/system/boot/stage-1.nix
@@ -3,7 +3,7 @@
 # the modules necessary to mount the root file system, then calls the
 # init in the root file system to start the second boot stage.
 
-{pkgs, config, ...}:
+{ config, pkgs, ... }:
 
 let
 
@@ -30,15 +30,6 @@ let
       ";
     };
 
-    boot.initrd.allowMissing = mkOption {
-      default = true;
-      description = ''
-        Allow some initrd components to be missing. Useful for
-        custom kernel that are changed too often to track needed
-        kernelModules.
-      '';
-    };
-
     boot.initrd.lvm = mkOption {
       default = true;
       description = "
@@ -82,6 +73,7 @@ let
     };
 
     boot.initrd.extraUtilsCommands = mkOption {
+      internal = true;
       default = "";
       merge = pkgs.lib.mergeStringOption;
       description = ''
@@ -110,9 +102,9 @@ let
 
   # Determine the set of modules that we need to mount the root FS.
   modulesClosure = pkgs.makeModulesClosure {
-    rootModules = config.boot.initrd.kernelModules;
+    rootModules = config.boot.initrd.availableKernelModules ++ config.boot.initrd.kernelModules;
     kernel = modulesTree;
-    allowMissing = config.boot.initrd.allowMissing;
+    allowMissing = true;
   };
 
 
@@ -125,7 +117,7 @@ let
     { buildInputs = [pkgs.nukeReferences];
       devicemapper = if config.boot.initrd.lvm then pkgs.devicemapper else null;
       lvm2 = if config.boot.initrd.lvm then pkgs.lvm2 else null;
-      allowedReferences = ["out"]; # prevent accidents like glibc being included in the initrd
+      allowedReferences = [ "out" modulesClosure ]; # prevent accidents like glibc being included in the initrd
       doublePatchelf = (pkgs.stdenv.system == "armv5tel-linux");
     }
     ''
@@ -179,9 +171,9 @@ let
       cp ${pkgs.bash}/bin/bash $out/bin
       ln -s bash $out/bin/sh
 
-      # Copy insmod.
-      cp ${pkgs.module_init_tools}/sbin/insmod $out/bin
-      
+      # Copy modprobe.
+      cp ${pkgs.module_init_tools}/sbin/modprobe $out/bin/modprobe.real
+
       ${config.boot.initrd.extraUtilsCommands}
 
       # Run patchelf to make the programs refer to the copied libraries.
@@ -191,12 +183,20 @@ let
           if ! test -L $i; then
               echo "patching $i..."
               patchelf --set-interpreter $out/lib/ld-linux*.so.? --set-rpath $out/lib $i || true
-              if [ "$doublePatchelf" -eq 1 ]; then
+              if [ -n "$doublePatchelf" ]; then
                   patchelf --set-interpreter $out/lib/ld-linux*.so.? --set-rpath $out/lib $i || true
               fi
           fi
       done
 
+      # Make the modprobe wrapper that sets $MODULE_DIR.
+      cat > $out/bin/modprobe <<EOF
+      #! $out/bin/bash
+      export MODULE_DIR=${modulesClosure}/lib/modules
+      exec $out/bin/modprobe.real "\$@"
+      EOF
+      chmod u+x $out/bin/modprobe
+      
       # Make sure that the patchelf'ed binaries still work.
       echo "testing patched programs..."
       $out/bin/bash --version
@@ -215,7 +215,7 @@ let
       $out/bin/reiserfsck -V
       $out/bin/mdadm --version
       $out/bin/basename --version
-      $out/bin/insmod --version
+      $out/bin/modprobe --version
     ''; # */
   
 
@@ -234,6 +234,7 @@ let
       
       cp ${pkgs.udev}/libexec/rules.d/60-cdrom_id.rules $out/
       cp ${pkgs.udev}/libexec/rules.d/60-persistent-storage.rules $out/
+      cp ${pkgs.udev}/libexec/rules.d/80-drivers.rules $out/
 
       for i in $out/*.rules; do
           substituteInPlace $i \
@@ -243,7 +244,8 @@ let
             --replace path_id ${extraUtils}/bin/path_id \
             --replace vol_id ${extraUtils}/bin/vol_id \
             --replace cdrom_id ${extraUtils}/bin/cdrom_id \
-            --replace /sbin/blkid ${extraUtils}/bin/blkid
+            --replace /sbin/blkid ${extraUtils}/bin/blkid \
+            --replace /sbin/modprobe ${extraUtils}/bin/modprobe
       done
 
       # Remove rule preventing creation of a by-label symlink
@@ -272,12 +274,14 @@ let
 
     isExecutable = true;
 
-    inherit modulesClosure udevConf extraUtils;
-    
+    klibc = pkgs.klibcShrunk;
+
+    inherit udevConf extraUtils;
+
     inherit (config.boot) isLiveCD resumeDevice;
 
     inherit (config.boot.initrd) checkJournalingFS
-      postDeviceCommands postMountCommands;
+      postDeviceCommands postMountCommands kernelModules;
 
     # !!! copy&pasted from upstart-jobs/filesystems.nix.
     mountPoints =
@@ -287,14 +291,6 @@ let
     devices = map (fs: if fs.device != null then fs.device else "/dev/disk/by-label/${fs.label}") fileSystems;
     fsTypes = map (fs: fs.fsType) fileSystems;
     optionss = map (fs: fs.options) fileSystems;
-
-    path = [
-      # `extraUtils' comes first because it overrides the `mount'
-      # command provided by klibc (which isn't capable of
-      # auto-detecting FS types).
-      extraUtils
-      pkgs.klibcShrunk
-    ];
   };
 
 
diff --git a/modules/virtualisation/qemu-vm.nix b/modules/virtualisation/qemu-vm.nix
index 8f00f69548b..9380cdef553 100644
--- a/modules/virtualisation/qemu-vm.nix
+++ b/modules/virtualisation/qemu-vm.nix
@@ -71,8 +71,8 @@ in
   # All the modules the initrd needs to mount the host filesystem via
   # CIFS.  Also use paravirtualised network and block devices for
   # performance.
-  boot.initrd.kernelModules =
-    ["cifs" "virtio_net" "virtio_pci" "virtio_blk" "virtio_balloon" "nls_utf8"];
+  boot.initrd.availableKernelModules =
+    [ "cifs" "virtio_net" "virtio_pci" "virtio_blk" "virtio_balloon" "nls_utf8" ];
 
   boot.initrd.extraUtilsCommands =
     ''
-- 
GitLab


From cea70d24e97f29ed458ae3d23a50d69b188fef22 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 15 Dec 2009 18:21:55 +0000
Subject: [PATCH 2077/5331] * The default default menu item (sic) should be 0,
 not 1.  (Or is this   different for GRUB 2?) * Clean up the option
 descriptions.

svn path=/nixos/trunk/; revision=18976
---
 modules/installer/grub/grub.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/modules/installer/grub/grub.nix b/modules/installer/grub/grub.nix
index 1d1180f3759..7919b71b9d7 100644
--- a/modules/installer/grub/grub.nix
+++ b/modules/installer/grub/grub.nix
@@ -129,14 +129,14 @@ in
       timeout = mkOption {
         default = 5;
         description = ''
-          after timeout seconds grub will boot the default menu item.
+          Timeout (in seconds) until GRUB boots the default menu item.          
         '';
       };
 
       default = mkOption {
-        default = 1;
+        default = 0;
         description = ''
-          index of grub menu item which will be booted
+          Index of the default menu item to be booted.
         '';
       };
 
-- 
GitLab


From daa814980e37629298e85115cf8db64dba2a8472 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 15 Dec 2009 18:31:21 +0000
Subject: [PATCH 2078/5331] * At the end of stage 1, reset
 /proc/sys/kernel/modprobe to   /sbin/modprobe because the sactivation script
 in stage 2 expects it   to be so.

svn path=/nixos/trunk/; revision=18977
---
 modules/system/boot/stage-1-init.sh | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/modules/system/boot/stage-1-init.sh b/modules/system/boot/stage-1-init.sh
index 616f14156a4..db712f48ee1 100644
--- a/modules/system/boot/stage-1-init.sh
+++ b/modules/system/boot/stage-1-init.sh
@@ -291,6 +291,10 @@ if ! test -e $targetRoot/dev/console; then
 fi
 
 
+# Restore /proc/sys/kernel/modprobe to its original value.
+echo /sbin/modprobe > /proc/sys/kernel/modprobe
+
+
 # Start stage 2.  `run-init' deletes all files in the ramfs on the
 # current /.  Note that $stage2Init might be an absolute symlink, in
 # which case "-e" won't work because we're not in the chroot yet.
-- 
GitLab


From 79073c7b3d474a5fcbf2ed657aa74712aaa1abb3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Tue, 15 Dec 2009 18:49:34 +0000
Subject: [PATCH 2079/5331] Adding a virtualisation option: run qemu without
 graphics.

svn path=/nixos/trunk/; revision=18978
---
 modules/virtualisation/qemu-vm.nix | 19 ++++++++++++++++++-
 1 file changed, 18 insertions(+), 1 deletion(-)

diff --git a/modules/virtualisation/qemu-vm.nix b/modules/virtualisation/qemu-vm.nix
index 9380cdef553..1952c15638b 100644
--- a/modules/virtualisation/qemu-vm.nix
+++ b/modules/virtualisation/qemu-vm.nix
@@ -34,9 +34,23 @@ let
             exist.
           '';
       };
+    virtualisation.graphics =
+      mkOption {
+        default = true;
+        description =
+          ''
+            Whether to run qemu with a graphics window, or access
+            the guest computer serial port through the host tty.
+          '';
+      };
 
   };
 
+  cfg = config.virtualisation;
+
+  qemuGraphics = if (cfg.graphics) then "" else "-nographic";
+  kernelConsole = if (cfg.graphics) then "" else "console=ttyS0";
+  ttys = [ "tty1" "tty2" "tty3" "tty4" "tty5" "tty6" ];
 
   # Shell script to start the VM.
   startVM =
@@ -59,8 +73,9 @@ let
           -drive file=$NIX_DISK_IMAGE,if=virtio,boot=on \
           -kernel ${config.system.build.toplevel}/kernel \
           -initrd ${config.system.build.toplevel}/initrd \
+          ${qemuGraphics} \
           $QEMU_OPTS \
-          -append "$(cat ${config.system.build.toplevel}/kernel-params) init=${config.system.build.bootStage2} systemConfig=${config.system.build.toplevel} $QEMU_KERNEL_PARAMS"
+          -append "$(cat ${config.system.build.toplevel}/kernel-params) init=${config.system.build.bootStage2} systemConfig=${config.system.build.toplevel} ${kernelConsole} $QEMU_KERNEL_PARAMS"
     '';
 
 in
@@ -156,6 +171,8 @@ in
   services.xserver.defaultDepth = mkOverride 50 {} 0;
   services.xserver.resolutions = mkOverride 50 {} [];
 
+  services.mingetty.ttys = ttys ++ optional (!cfg.graphics) "ttyS0";
+
   # Wireless won't work in the VM.
   networking.enableWLAN = mkOverride 50 {} false;
 }
-- 
GitLab


From 79bcc7618e2cebf761f59bc641d55fa5c6057149 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 15 Dec 2009 21:11:39 +0000
Subject: [PATCH 2080/5331] * Make the graphical boot work on GRUB 2 in the
 case where /nix/store   is not on the same partition as /boot (i.e. when  
 boot.loader.grub.bootDevice is set): just copy the background image   and the
 font to /boot.

svn path=/nixos/trunk/; revision=18979
---
 modules/installer/grub/grub-menu-builder.sh | 25 ++++++++-------------
 modules/installer/grub/grub.nix             | 17 ++++----------
 2 files changed, 13 insertions(+), 29 deletions(-)

diff --git a/modules/installer/grub/grub-menu-builder.sh b/modules/installer/grub/grub-menu-builder.sh
index c09b13f801d..1cce302fdf0 100644
--- a/modules/installer/grub/grub-menu-builder.sh
+++ b/modules/installer/grub/grub-menu-builder.sh
@@ -28,32 +28,25 @@ esac
 
 
 prologue() {
-    if test -n "@splashImage@"; then
-	splashLocation="@splashImage@"
-	if test "$grubVersion" -eq 1 ; then
-    	    # Splash images in /nix/store don't seem to work, so copy them.
-	    cp -f $splashLocation /boot/background.xpm.gz
-	    splashLocation="$bootDevice/background.xpm.gz"
-	fi
-    fi
-
     case "$grubVersion" in
 	1)
+            cp -f "@splashImage@" /boot/background.xpm.gz
 	    cat > "$1" << GRUBEND
 # Automatically generated.  DO NOT EDIT THIS FILE!
 default @default@
 timeout @timeout@
 GRUBEND
 	    if test -n "@splashImage@"; then
-		echo "splashimage $splashLocation" >> "$1"
+		echo "splashimage $bootDevice/background.xpm.gz" >> "$1"
 	    fi
 	    ;;
 	2)
+            cp -f @grub@/share/grub/unicode.pf2 /boot/grub/unicode.pf2
 	    cat > "$1" <<EOF
 # Automatically generated.  DO NOT EDIT THIS FILE!
 set default=@default@
 set timeout=@timeout@
-if loadfont @grub@/share/grub/unicode.pf2 ; then
+if loadfont $bootDevice/grub/unicode.pf2; then
   set gfxmode=640x480
   insmod gfxterm
   insmod vbe
@@ -61,13 +54,14 @@ if loadfont @grub@/share/grub/unicode.pf2 ; then
 fi
 EOF
 	    if test -n "@splashImage@"; then
+                cp -f "@splashImage@" /boot/background.png
 		# FIXME: GRUB 1.97 doesn't resize the background image
 		# if it doesn't match the video resolution.
 		cat >> "$1" <<EOF
 insmod png
-if background_image $splashLocation ; then
-  set color_normal=black/black
-  set color_highlight=magenta/black
+if background_image $bootDevice/background.png; then
+  set color_normal=white/black
+  set color_highlight=black/white
 else
   set menu_color_normal=cyan/blue
   set menu_color_highlight=white/blue
@@ -244,8 +238,7 @@ for generation in $(
 done
 
 
-# Atomically update /boot/grub/menu.lst.  !!! should do an fsync()
-# here on $tmp, especially on ext4.
+# Atomically update the GRUB configuration file.
 mv $tmp $target
 
 
diff --git a/modules/installer/grub/grub.nix b/modules/installer/grub/grub.nix
index 7919b71b9d7..4bc36114f38 100644
--- a/modules/installer/grub/grub.nix
+++ b/modules/installer/grub/grub.nix
@@ -4,12 +4,12 @@ with pkgs.lib;
 
 let
 
+  grub = if config.boot.loader.grub.version == 1 then pkgs.grub else pkgs.grub2;
+
   grubMenuBuilder = pkgs.substituteAll {
     src = ./grub-menu-builder.sh;
     isExecutable = true;
-    grub = if config.boot.loader.grub.version == 1
-           then pkgs.grub
-           else pkgs.grub2;
+    inherit grub;
     inherit (pkgs) bash;
     path = [pkgs.coreutils pkgs.gnused pkgs.gnugrep];
     inherit (config.boot.loader.grub) copyKernels extraEntries extraEntriesBeforeNixOS
@@ -156,17 +156,8 @@ in
     system.boot.loader.id = "grub";
     system.boot.loader.kernelFile = "vmlinuz";
 
-    environment.systemPackages =
-      mkIf config.boot.loader.grub.enable
-           (let version = config.boot.loader.grub.version; in
-              assert version != 1 -> version == 2;
-
-              if version == 1
-              then [ pkgs.grub ]
-              else [ pkgs.grub2 ]);
+    environment.systemPackages = mkIf config.boot.loader.grub.enable [ grub ];
 
-    # and many other things that have to be moved inside this file.
-    
   };
   
 }
-- 
GitLab


From 4b5864666ed9155f3c24223525ffc0fda8e811d8 Mon Sep 17 00:00:00 2001
From: Marc Weber <marco-oweber@gmx.de>
Date: Tue, 15 Dec 2009 23:26:52 +0000
Subject: [PATCH 2081/5331] * refactoring kvm test and bootstrapping image.  
 expose makeInfo (used by test now)   expose config hack * Adding tests to
 release.nix * fixes * removing dependency on perl

refactoring details:
Move all configuration modules used by the NixOS installation test script
into one directory.

svn path=/nixos/trunk/; revision=18982
---
 .../tools/installer2/nixos-bootstrap.sh       | 20 +++---
 .../tools/installer2/nixos-prepare-install.sh | 22 ++++--
 .../tools/installer2/run-in-chroot.sh         | 14 ----
 .../README-BOOTSTRAP-NIXOS                    |  4 --
 modules/installer/tools/tools.nix             |  9 +--
 release.nix                                   | 31 +++++---
 .../configuration-iso.nix                     | 26 +++++++
 .../configuration.nix                         | 10 +--
 .../module-insecure.nix                       | 23 +++---
 .../test.nix}                                 | 72 ++++++++++++-------
 tests/test-nixos-installer2.nix               |  4 +-
 11 files changed, 147 insertions(+), 88 deletions(-)
 create mode 100644 tests/test-nixos-install-from-cd/configuration-iso.nix
 rename modules/installer/cd-dvd/test-nixos-install-from-cd-config.nix => tests/test-nixos-install-from-cd/configuration.nix (60%)
 rename modules/installer/cd-dvd/installation-cd-minimal-test-insecure.nix => tests/test-nixos-install-from-cd/module-insecure.nix (71%)
 rename tests/{test-nixos-install-from-cd.nix => test-nixos-install-from-cd/test.nix} (71%)

diff --git a/modules/installer/tools/installer2/nixos-bootstrap.sh b/modules/installer/tools/installer2/nixos-bootstrap.sh
index 97e66bc88ed..ad9baad4dd7 100644
--- a/modules/installer/tools/installer2/nixos-bootstrap.sh
+++ b/modules/installer/tools/installer2/nixos-bootstrap.sh
@@ -15,7 +15,10 @@ usage(){
 
   --debug:    set -x
 
-  -j n   : will be passed to nix-env = number of build tasks done simultaniously
+  options which will be passed to nix-env:
+
+  -j n        : number of build tasks done simultaniously
+  --keep-going: Build as much as possible.
 
   Description:
   This scripts installs NixOS and should be run within the target chroot.
@@ -46,7 +49,7 @@ NIXOS_CONFIG=${NIXOS_CONFIG:-/etc/nixos/configuration.nix}
 NIXOS_PULL=${NIXOS_PULL:-1}
 NIXOS_INSTALL_GRUB=${NIXOS_INSTALL_GRUB:-1} 
 
-ps="with-prepared-chroot.sh"
+ps="run-in-chroot"
 
 check "$NIXOS_CONFIG"
 check "$NIXOS/modules"  "nixos repo not found"
@@ -70,12 +73,13 @@ INSTALL=
 
 for arg in $@; do
   case $arg in
-    --no-pull) NIXOS_PULL=0;;
-    --install) INSTALL=1;;
-    --no-grub) NIXOS_INSTALL_GRUB=;;
-    --debug)   set -x;;
-    -j*)       NIX_ENV_ARGS="$NIX_ENV_ARGS $arg";;
-    *)         usage;
+    --no-pull)     NIXOS_PULL=0;;
+    --install)     INSTALL=1;;
+    --no-grub)     NIXOS_INSTALL_GRUB=;;
+    --debug)       set -x;;
+    -j*)           NIX_ENV_ARGS="$NIX_ENV_ARGS $arg";;
+    --keep-going)  NIX_ENV_ARGS="$NIX_ENV_ARGS $arg";;
+    *)             usage;
   esac
 done
 
diff --git a/modules/installer/tools/installer2/nixos-prepare-install.sh b/modules/installer/tools/installer2/nixos-prepare-install.sh
index b85ef2b9eaa..548581f0c21 100644
--- a/modules/installer/tools/installer2/nixos-prepare-install.sh
+++ b/modules/installer/tools/installer2/nixos-prepare-install.sh
@@ -100,8 +100,6 @@ if ! grep -F -q " $mountPoint " /proc/mounts && [ "$MUST_BE_MOUNTPOINT" = 1 ]; t
     die "$mountPoint doesn't appear to be a mount point"
 fi
 
-# Get the store paths to copy from the references graph.
-storePaths=$(@perl@/bin/perl @pathsFromGraph@ @nixClosure@)
 # = utils =
 
 backup(){
@@ -151,6 +149,19 @@ realise_repo(){
 
 }
 
+# only keep /nix/store/* lines
+# print them only once
+pathsFromGraph(){
+  declare -A a
+  local prefix=/nix/store/
+  while read l; do
+    if [ "${l/#$prefix/}" != "$l" ] && [ -z "${a["$l"]}" ]; then
+      echo "$l";
+      a["$l"]=1;
+    fi
+  done
+}
+
 # = run actions: =
 for a in $ACTIONS; do
   case "$a" in
@@ -173,13 +184,14 @@ for a in $ACTIONS; do
     ;;
 
     copy-nix)
-      if [ -n "$FROM_ARCHIVE" ]; then
+      if [ "$FROM_ARCHIVE" = 1 ]; then
         NIX_CLOSURE=${mountPoint}@nixClosure@
       else
         INFO "Copy Nix to the Nix store on the target device."
         createDirs
         echo "copying Nix to $mountPoint...."
-        for i in $storePaths; do
+
+        for i in `cat $NIX_CLOSURE | pathsFromGraph`; do
             echo "  $i"
             rsync -a $i $mountPoint/nix/store/
         done
@@ -218,7 +230,7 @@ if [ -e "$T/nixos" ] && [ -e "$T/nixpkgs" ] && [ -e "$T/configuration.nix" ]; th
   cat << EOF
     To realise your NixOS installtion execute:
 
-    run-in-chroot "/nix/store/nixos-bootstrap --install"
+    run-in-chroot "/nix/store/nixos-bootstrap --install -j2 --keep-going"
 EOF
 else
   for t in "$T/configuration.nix" "$T/nixpkgs" "$T/configuration.nix"; do
diff --git a/modules/installer/tools/installer2/run-in-chroot.sh b/modules/installer/tools/installer2/run-in-chroot.sh
index 1d4deb921ee..f4cc4cb9523 100644
--- a/modules/installer/tools/installer2/run-in-chroot.sh
+++ b/modules/installer/tools/installer2/run-in-chroot.sh
@@ -11,8 +11,6 @@ usage(){
   --unprepare  : only unmount
   --debug      : set -x
 
-  requisites: perl
-
   $SCRIPT --prepare:   prepare chroot only
   $SCRIPT --unprepare: unprepare chroot only
   $SCRIPT command:     run /bin/sh command in chroot
@@ -27,18 +25,6 @@ EOF
 die(){ echo "!>> " $@; exit 1; }
 INFO(){ echo "INFO: " $@; }
 
-# this is no longer needed because umount -l unmounts rescursive --rbound mounts as well
-#umountUnder() {
-#    local dir="$1"
-#    for i in $(grep -F " $dir" /proc/mounts \
-#        | perl -e 'while (<>) { /^\S+\s+(\S+)\s+/; print "$1\n"; }' \
-#        | sort -r);
-#    do
-#        echo umount $i || true
-#    done
-#}
-
-
 prepare(){
   INFO "Enable networking: copying /etc/resolv.conf"
   mkdir -m 0755 -p $mountPoint/etc
diff --git a/modules/installer/tools/nixos-bootstrap-archive/README-BOOTSTRAP-NIXOS b/modules/installer/tools/nixos-bootstrap-archive/README-BOOTSTRAP-NIXOS
index 041588bb7e4..b70dc010cc3 100644
--- a/modules/installer/tools/nixos-bootstrap-archive/README-BOOTSTRAP-NIXOS
+++ b/modules/installer/tools/nixos-bootstrap-archive/README-BOOTSTRAP-NIXOS
@@ -10,7 +10,3 @@ $EDITOR $mountPoint/etc/nixos/configuration.nix
 
 # you can replace --install by --help to get more info
 bash $mountPoint/nix/store/run-in-chroot "/nix/store/nixos-bootstrap --install"
-
-
-This archive is create by
-nix-build $NIXOS -A config.system.build.minimalInstaller
diff --git a/modules/installer/tools/tools.nix b/modules/installer/tools/tools.nix
index f9027c3448f..7a0e8dbf936 100644
--- a/modules/installer/tools/tools.nix
+++ b/modules/installer/tools/tools.nix
@@ -67,7 +67,6 @@ let
       name = "nixos-prepare-install";
       src = ./installer2/nixos-prepare-install.sh;
 
-      inherit (pkgs) perl pathsFromGraph;
       inherit nix nixClosure nixosBootstrap;
     };
 
@@ -87,8 +86,10 @@ let
       nixpkgsURL = config.installer.nixpkgsURL;
     };
 
-    # see ./nixos-bootstrap-archive/README
-    minimalInstaller = import ./nixos-bootstrap-archive {
+    # see ./nixos-bootstrap-archive/README-BOOTSTRAP-NIXOS
+    # TODO refactor: It should *not* depend on configuration.nix
+    # maybe even move this in nixpkgs?
+    minimalInstallArchive = import ./nixos-bootstrap-archive {
       inherit (pkgs) stdenv runCommand perl pathsFromGraph gnutar coreutils bzip2;
       inherit nixosPrepareInstall runInChroot nixosBootstrap nixClosure;
     };
@@ -129,6 +130,6 @@ in
     inherit nixosInstall;
 
     # expose scripts
-    inherit (installer2) nixosPrepareInstall runInChroot nixosBootstrap minimalInstaller;
+    inherit (installer2) nixosPrepareInstall runInChroot nixosBootstrap minimalInstallArchive;
   };
 }
diff --git a/release.nix b/release.nix
index 8a3b69b7261..412e660857a 100644
--- a/release.nix
+++ b/release.nix
@@ -17,11 +17,13 @@ let
       version = builtins.readFile ./VERSION + (if officialRelease then "" else "pre${toString nixosSrc.rev}");
 
       versionModule = { system.nixosVersion = version; };
-      
-      iso = (import lib/eval-config.nix {
+
+      config = (import lib/eval-config.nix {
         inherit system nixpkgs;
         modules = [ module versionModule ];
-      }).config.system.build.isoImage;
+      }).config;
+      
+      iso = config.system.build.isoImage;
 
     in
       # Declare the ISO as a build product so that it shows up in Hydra.
@@ -31,6 +33,7 @@ let
             maintainers = map (x: lib.getAttr x lib.maintainers) maintainers;
           };
           inherit iso;
+          passthru = { inherit config; };
         }
         ''
           ensureDir $out/nix-support
@@ -40,6 +43,8 @@ let
 
   jobs = rec {
 
+    inherit makeIso; # used by tests/test-nixos-install-from-cd/
+
 
     tarball =
       { nixosSrc ? {outPath = ./.; rev = 1234;}
@@ -90,11 +95,6 @@ let
       description = "minimal";
     };
 
-    iso_minimal_test_insecure = makeIso {
-      module = ./modules/installer/cd-dvd/installation-cd-minimal-test-insecure.nix;
-      description = "minimal-testing-only";
-    };
-
     iso_minimal_fresh_kernel = makeIso {
       module = ./modules/installer/cd-dvd/installation-cd-minimal-fresh-kernel.nix;
       description = "minimal with 2.6.31-zen-branch";
@@ -113,6 +113,9 @@ let
       description = "graphical";
     };
 
+    # Hacky: doesn't depend on configuration. Yet configuration is evaluated (TODO)
+    minimal_install_archive = {system ? "i686-linux"}: (iso_minimal {inherit system;})
+      .config.system.build.minimalInstallArchive;
 
     tests.subversion =
       { services ? ../services }:
@@ -138,6 +141,18 @@ let
         system = "i686-linux";
       }).test;
 
+    ### tests about installing NixOS
+
+    # installs NixOs in a qemu_kvm instance using a tweaked iso.
+    tests.nixosInstallation = 
+      (import ./tests/test-nixos-install-from-cd/test.nix {
+        inherit nixpkgs;
+      }).test;
+
+    # the archive installer can't be tested without chroot which requires being root
+    # options: run in kvm or uml ?
+    # TODO
+
   };
   
 
diff --git a/tests/test-nixos-install-from-cd/configuration-iso.nix b/tests/test-nixos-install-from-cd/configuration-iso.nix
new file mode 100644
index 00000000000..e203734e74c
--- /dev/null
+++ b/tests/test-nixos-install-from-cd/configuration-iso.nix
@@ -0,0 +1,26 @@
+# configuration used to build ISO used to install NixOS when running NixOS kvm installation test
+
+# The configuration is prebuild before starting the vm because starting the vm
+# causes some overhead.
+{pkgs, config, ...}:
+
+let
+  doOverride = pkgs.lib.mkOverride 0 {};
+in
+
+{
+
+  # make system boot and accessible:
+  require = [ ./module-insecure.nix
+              ../../modules/installer/cd-dvd/installation-cd-minimal.nix
+            ];
+
+  fonts = {
+    enableFontConfig = false; 
+  };
+
+  boot.loader.grub.timeout = doOverride 0; 
+  boot.loader.grub.default = 2;
+  boot.loader.grub.version = doOverride 2;
+
+}
diff --git a/modules/installer/cd-dvd/test-nixos-install-from-cd-config.nix b/tests/test-nixos-install-from-cd/configuration.nix
similarity index 60%
rename from modules/installer/cd-dvd/test-nixos-install-from-cd-config.nix
rename to tests/test-nixos-install-from-cd/configuration.nix
index e0dcea6e061..7ec29b4382f 100644
--- a/modules/installer/cd-dvd/test-nixos-install-from-cd-config.nix
+++ b/tests/test-nixos-install-from-cd/configuration.nix
@@ -1,10 +1,10 @@
-# this is the configuration which will be installed.
-# The configuration is prebuild before starting the vm because starting the vm
-# causes some overhead.
+# configuration being installed by NixOS kvm installation test
 {pkgs, config, ...}: {
 
   # make system boot and accessible:
-  require = [ ./installation-cd-minimal-test-insecure.nix ];
+  require = [
+    ./module-insecure.nix
+  ];
 
   boot.loader.grub = {
     device = "/dev/sda";
@@ -19,6 +19,8 @@
     }
   ];
 
+  swapDevices = [ { device = "/dev/sda2"; } ];
+
   fonts = {
     enableFontConfig = false; 
   };
diff --git a/modules/installer/cd-dvd/installation-cd-minimal-test-insecure.nix b/tests/test-nixos-install-from-cd/module-insecure.nix
similarity index 71%
rename from modules/installer/cd-dvd/installation-cd-minimal-test-insecure.nix
rename to tests/test-nixos-install-from-cd/module-insecure.nix
index 2992724373e..68240204ff2 100644
--- a/modules/installer/cd-dvd/installation-cd-minimal-test-insecure.nix
+++ b/tests/test-nixos-install-from-cd/module-insecure.nix
@@ -1,33 +1,29 @@
-# See installation-cd-minimal.nix
-# it's called insecure because it allows logging in as root without password
-# So don't boot this cdrom to install your system :-)
+# this allows logging in as root without password.
 
-{config, pkgs, ...}:
+# This module is shared by the iso configuration and the system configuration
+# which is build by the test
+
+{pkgs, config, ...}:
 
 let
   doOverride = pkgs.lib.mkOverride 0 {};
 in
 
 {
-  require = [ ./installation-cd-minimal.nix ];
-
-  installer.configModule = "./nixos/modules/installer/cd-dvd/installation-cd-minimal-test-insecure";
 
-  services.sshd.permitRootLogin = "yes";
+  services.sshd = {
+    enable = true;
+    permitRootLogin = "yes";
+  };
   jobs.sshd = {
     startOn = doOverride "started network-interfaces";
   };
 
-
   boot.initrd.kernelModules =
     ["cifs" "virtio_net" "virtio_pci" "virtio_blk" "virtio_balloon" "nls_utf8"];
 
   environment.systemPackages = [ pkgs.vim_configurable ];
 
-  boot.loader.grub.timeout = doOverride 0; 
-  boot.loader.grub.default = 2;
-  boot.loader.grub.version = doOverride 2;
-
   # FIXME: rewrite pam.services the to be an attr list
   # I only want to override sshd
   security.pam.services = doOverride
@@ -52,4 +48,3 @@ in
       ];
 
 }
-
diff --git a/tests/test-nixos-install-from-cd.nix b/tests/test-nixos-install-from-cd/test.nix
similarity index 71%
rename from tests/test-nixos-install-from-cd.nix
rename to tests/test-nixos-install-from-cd/test.nix
index f832d6d464f..18b46b82c1b 100644
--- a/tests/test-nixos-install-from-cd.nix
+++ b/tests/test-nixos-install-from-cd/test.nix
@@ -1,8 +1,7 @@
-{ nixos ? ./..
-, nixpkgs ? ../../nixpkgs
-, services ? ../../nixos/services
+{ nixos ? ../..
+, nixpkgs ? ../../../nixpkgs
+, services ? ../../../nixos/services
 , system ? builtins.currentSystem
-, configPath ? ./test-nixos-install-from-cd.nix
 }:
 
 let
@@ -21,22 +20,30 @@ let
    nixosTarball = makeTarball "nixos.tar.bz2" (cleanSource ../../..);
    nixpkgsTarball = makeTarball "nixpkgs.tar.bz2" (cleanSource pkgs.path);
 
+   If test fails at "waiting for socket" rerun the test
+
 */
 
-  isos = (import ../release.nix) { inherit nixpkgs; };
+  configuration_iso =  ./configuration-iso.nix;
+  configuration_install = ./configuration.nix;
 
-  isoFile = 
-    # passed system = systom of iso 
-    (isos.iso_minimal_test_insecure { inherit system; }).iso;
+  release = (import ../../release.nix) { inherit nixpkgs; };
 
-  configuration = ../modules/installer/cd-dvd/test-nixos-install-from-cd-config.nix;
+  isoFile = (
+    release.makeIso 
+      {
+        module = configuration_iso;
+        description = "minimal-testing-only";
+        maintainers = ["MarcWeber"];
+      }
+      { inherit system; }
+      ).iso;
 
-  eval = import ../lib/eval-config.nix {
+  eval = import ../../lib/eval-config.nix {
     inherit system nixpkgs;
-    modules = [ configuration ];
+    modules = [ configuration_install ];
   };
 
-
   inherit (eval) pkgs config;
 
   inherit (pkgs) qemu_kvm;
@@ -57,9 +64,13 @@ rec {
     # FIXME: X shouldn't be required
     # Is there a way to use kvm when not running as root?
     # Would using uml provide any advantages?
+
+    # TODO add nix-env -i command and verify that root can install additional
+    # tools such as git or sshfs-fuse!
+    # run this test when booting both: the iso and the installed system
     pkgs.runCommand "nixos-installation-test" { inherit systemDerivation; } ''
 
-    INFO(){ echo $@; }
+    INFO(){ echo "INFO: " $@; }
 
     die(){ echo $@; exit 1; }
 
@@ -86,7 +97,7 @@ rec {
     cat >> run-kvm.sh << EOF
     #!/bin/sh -e
     # maybe swap should be used ?
-    exec qemu-system-x86_64 -m 2048 \
+    exec qemu-system-x86_64 -m 512 \
         -no-kvm-irqchip \
         -net nic,model=virtio -net user -smb /nix \
         -hda image \
@@ -135,7 +146,10 @@ rec {
 
 
     INFO "creating image file"
-    qemu-img create -f qcow2 image 2G
+    # 2GB = data; 1GB=swap
+    # Maybe using 1GB swap is much. But qcow2 doesn't fill holes so it only
+    # used when required (?)
+    qemu-img create -f qcow2 image 3G
 
     RUN_KVM -boot d -cdrom $(echo ${isoFile}/iso/*.iso)
     
@@ -144,13 +158,22 @@ rec {
     # INSTALLATION
     INFO "creating filesystem .."
     SSH_STDIN_E << EOF
+      set -x
       parted /dev/sda mklabel msdos
       parted /dev/sda mkpart primary 0 2G
-      while [ ! -e /dev/sda1 ]; do
-        echo "waiting for /dev/sda1 to appear"
-        sleep 1;
-      done
+      parted /dev/sda mkpart primary 1G 3G
+      waitFor(){
+        while [ ! -e "\$1" ]; do
+          echo "waiting for \$1 to appear"; sleep 1;
+        done
+      }
+      waitFor /dev/sda2
+      mkswap /dev/sda2
+      swapon /dev/sda2
+
+      waitFor /dev/sda1
       mkfs.ext3 /dev/sda1
+
       mount /dev/sda1 /mnt
       mkdir -p /mnt/nix-on-host
       mount //10.0.2.4/qemu -oguest,username=nobody,noperm -tcifs /mnt/nix-on-host
@@ -162,7 +185,7 @@ rec {
       nixos-hardware-scan > /tmp/test.nix
     EOF
 
-    INFO "copying sources and Nix, preparing configuration, starting installation"
+    INFO "copying sources and Nix, starting installation"
     SSH_STDIN_E << EOF
 
       nixos-prepare-install
@@ -170,12 +193,11 @@ rec {
       # has the generated configuration.nix file syntax errors?
       nix-instantiate --eval-only /tmp/test.nix
 
-      # NixOS sources are in /etc/nixos, copy those configuration files.
-      cp /etc/nixos/nixos/modules/installer/cd-dvd/test-nixos-install-from-cd-config.nix /mnt/etc/nixos/configuration.nix
-      # the configuration file is referencing additional files:
-      cp -r /etc/nixos/nixos/modules/installer/cd-dvd/*.nix /mnt/etc/nixos/
+      echo 'export NIXOS_CONFIG=/etc/nixos/nixos/tests/test-nixos-install-from-cd/configuration.nix' >> /root/.bashrc
+      . ~/.bashrc
       export NIX_OTHER_STORES=/nix-on-host
-      run-in-chroot "/nix/store/nixos-bootstrap --install"
+
+      run-in-chroot "/nix/store/nixos-bootstrap --install --no-pull"
       #nixos-install
     EOF
 
diff --git a/tests/test-nixos-installer2.nix b/tests/test-nixos-installer2.nix
index 7afb9cd892e..ec7ce0965c0 100644
--- a/tests/test-nixos-installer2.nix
+++ b/tests/test-nixos-installer2.nix
@@ -18,8 +18,8 @@ let
 
   isos = (import ../release.nix) { inherit nixpkgs; };
 
-  # using same configuration as ased by kvm test.
-  configuration = ../modules/installer/cd-dvd/test-nixos-install-from-cd-config.nix;
+  # using same configuration as used by kvm test.
+  configuration = ./test-nixos-install-from-cd/configuration.nix;
 
   eval = import ../lib/eval-config.nix {
     inherit system nixpkgs;
-- 
GitLab


From 181f4bee26174615619b954b26da3bdf2192ac88 Mon Sep 17 00:00:00 2001
From: Marc Weber <marco-oweber@gmx.de>
Date: Tue, 15 Dec 2009 23:26:55 +0000
Subject: [PATCH 2082/5331] fix nixos-intall(2). Now the configuration is built
 correctly. Passing --arg configuration does no longer work!

svn path=/nixos/trunk/; revision=18983
---
 modules/installer/tools/installer2/nixos-bootstrap.sh | 1 -
 modules/installer/tools/nixos-install.sh              | 1 -
 2 files changed, 2 deletions(-)

diff --git a/modules/installer/tools/installer2/nixos-bootstrap.sh b/modules/installer/tools/installer2/nixos-bootstrap.sh
index ad9baad4dd7..9c972bd6d95 100644
--- a/modules/installer/tools/installer2/nixos-bootstrap.sh
+++ b/modules/installer/tools/installer2/nixos-bootstrap.sh
@@ -118,7 +118,6 @@ INFO "building the system configuration..."
 @nix@/bin/nix-env \
     -p /nix/var/nix/profiles/system \
     -f "$NIXOS" \
-    --arg configuration "import $NIXOS_CONFIG" \
     --set -A system \
     $NIX_ENV_ARGS
 
diff --git a/modules/installer/tools/nixos-install.sh b/modules/installer/tools/nixos-install.sh
index 5ae1a89b52f..43d84aba032 100644
--- a/modules/installer/tools/nixos-install.sh
+++ b/modules/installer/tools/nixos-install.sh
@@ -152,7 +152,6 @@ echo "building the system configuration..."
 NIXPKGS=/mnt/etc/nixos/nixpkgs chroot $mountPoint @nix@/bin/nix-env \
     -p /nix/var/nix/profiles/system \
     -f "/mnt$NIXOS" \
-    --arg configuration "import $NIXOS_CONFIG" \
     --set -A system
 
 
-- 
GitLab


From 273ecdf0703629f3e308339ecf549a8b0b2d2a4c Mon Sep 17 00:00:00 2001
From: Marc Weber <marco-oweber@gmx.de>
Date: Tue, 15 Dec 2009 23:26:57 +0000
Subject: [PATCH 2083/5331] adding nix-env -i check in booted system. It fails
 because nixbldN don't belong to the nixbld group Manually removing socket
 file. Somehow the socket is not always created when rebooting the second time
 (?) I have to look into that later.

svn path=/nixos/trunk/; revision=18984
---
 tests/test-nixos-install-from-cd/test.nix | 26 +++++++++++++++++++++--
 1 file changed, 24 insertions(+), 2 deletions(-)

diff --git a/tests/test-nixos-install-from-cd/test.nix b/tests/test-nixos-install-from-cd/test.nix
index 18b46b82c1b..99907438a28 100644
--- a/tests/test-nixos-install-from-cd/test.nix
+++ b/tests/test-nixos-install-from-cd/test.nix
@@ -67,7 +67,6 @@ rec {
 
     # TODO add nix-env -i command and verify that root can install additional
     # tools such as git or sshfs-fuse!
-    # run this test when booting both: the iso and the installed system
     pkgs.runCommand "nixos-installation-test" { inherit systemDerivation; } ''
 
     INFO(){ echo "INFO: " $@; }
@@ -96,7 +95,10 @@ rec {
     # creating shell script for debugging purposes
     cat >> run-kvm.sh << EOF
     #!/bin/sh -e
-    # maybe swap should be used ?
+
+    # don't ask me why I have to remove the socket.. If I don't it won't be
+    # reused by kvm_qemu!
+    rm $SOCKET_NAME || true
     exec qemu-system-x86_64 -m 512 \
         -no-kvm-irqchip \
         -net nic,model=virtio -net user -smb /nix \
@@ -206,6 +208,26 @@ rec {
     INFO "booting installed system"
     RUN_KVM -boot c
     waitForSSHD
+
+
+    INFO "verifying that nix-env -i works"
+
+    SSH_STDIN_E << EOF
+
+      cat >> test.nix << EOF_TEST
+      let pkgs = import /etc/nixos/nixpkgs/pkgs/top-level/all-packages.nix {};
+      in pkgs.stdenv.mkDerivation {
+        name = "test";
+        phases = "create_out";
+        create_out = "mkdir -p $out/ok";
+      }
+    EOF_TEST
+
+      set -x
+      nix-env -i -f test.nix
+      [ -e ~/.nix-profile/ok ]
+    EOF
+
     SHUTDOWN_VM
 
     echo "$(date) success" > $out
-- 
GitLab


From 6c30ba3e483ab7d0b471b296aec9db2ccda8a1d1 Mon Sep 17 00:00:00 2001
From: Marc Weber <marco-oweber@gmx.de>
Date: Wed, 16 Dec 2009 04:55:31 +0000
Subject: [PATCH 2084/5331] fix nix-build trouble after fresh install:

problem:
Nix only recognizes nixbld users which have nixbld set in extraGroups.
After installation the user was created by activate with group='nixbld'
and extraGroups=[]
After rebooting a conditional shell script fixed this by adding
extraGroups=["nixbld"].

This patches creates the user they way it was in the past with
group='nobody' and extraGroups=["nixbld"].

Another solution would be making nix be aware of the primary group as
well. However this would require everyone to update Nix after updating
NixOS.

svn path=/nixos/trunk/; revision=18985
---
 modules/config/users-groups.nix | 14 ++------------
 1 file changed, 2 insertions(+), 12 deletions(-)

diff --git a/modules/config/users-groups.nix b/modules/config/users-groups.nix
index 38b11784c6d..552764b3aea 100644
--- a/modules/config/users-groups.nix
+++ b/modules/config/users-groups.nix
@@ -32,8 +32,8 @@ let
              calls in `libstore/build.cc', don't add any supplementary group
              here.  */
           uid = builtins.add ids.uids.nixbld nr;
-          group = "nixbld";
-          extraGroups = [];
+          group = "nogroup";
+          extraGroups = ["nixbld"];
         };
 
       nixBuildUsers = map makeNixBuildUser (pkgs.lib.range 1 10);
@@ -213,16 +213,6 @@ in
                     --groups "$extraGroups" \
                     ''${home:+--home "$home"} \
                     --shell "$shell"
-                if test -z "$extraGroups"
-                then
-                    # Make sure the user is listed as belonging to its
-                    # primary group when it has no supplementary groups.  The
-                    # main reason is to have the `nixbld[0-9]' users be
-                    # listed as `nixbld' members; this allows `nix-store' to
-                    # get the UIDs of all the build users by doing a
-                    # getprnam("nixbld") call.
-                    groupmod "$group" -A "$name"
-                fi
             fi
 
         done
-- 
GitLab


From 5bf9fdbe416fbfe5f3ac78e153be3f9b068523b7 Mon Sep 17 00:00:00 2001
From: Marc Weber <marco-oweber@gmx.de>
Date: Wed, 16 Dec 2009 04:55:35 +0000
Subject: [PATCH 2085/5331] cleaned up kvm installation test. It works now.

svn path=/nixos/trunk/; revision=18986
---
 tests/test-nixos-install-from-cd/test.nix | 79 ++++++++++++++---------
 1 file changed, 47 insertions(+), 32 deletions(-)

diff --git a/tests/test-nixos-install-from-cd/test.nix b/tests/test-nixos-install-from-cd/test.nix
index 99907438a28..74fb9375dd9 100644
--- a/tests/test-nixos-install-from-cd/test.nix
+++ b/tests/test-nixos-install-from-cd/test.nix
@@ -20,8 +20,6 @@ let
    nixosTarball = makeTarball "nixos.tar.bz2" (cleanSource ../../..);
    nixpkgsTarball = makeTarball "nixpkgs.tar.bz2" (cleanSource pkgs.path);
 
-   If test fails at "waiting for socket" rerun the test
-
 */
 
   configuration_iso =  ./configuration-iso.nix;
@@ -55,6 +53,15 @@ let
 
   # TODO test both: copyKernels = true and false. true doesn't work ?
 
+  debug = if false then ''
+    export DISPLAY=localhost:0.0
+  ''
+  else
+  # That's crazy: You see nothing but your computer is doing a *lot* of work :-)
+  ''
+    KVM_OPTIONS="-nographic"
+  '';
+
 in
 
 rec {
@@ -65,10 +72,13 @@ rec {
     # Is there a way to use kvm when not running as root?
     # Would using uml provide any advantages?
 
-    # TODO add nix-env -i command and verify that root can install additional
-    # tools such as git or sshfs-fuse!
+
+    # TODO: Run installation withoun networking support ?
+    # This can be done by using either firewalls or building system by .drv path?
     pkgs.runCommand "nixos-installation-test" { inherit systemDerivation; } ''
 
+    set -e
+
     INFO(){ echo "INFO: " $@; }
 
     die(){ echo $@; exit 1; }
@@ -87,8 +97,7 @@ rec {
     PATH=${pkgs.samba}/sbin:$PATH
 
     # install the system
-
-    export DISPLAY=localhost:0.0
+    ${debug}
 
     SOCKET_NAME=65535.socket
 
@@ -96,14 +105,12 @@ rec {
     cat >> run-kvm.sh << EOF
     #!/bin/sh -e
 
-    # don't ask me why I have to remove the socket.. If I don't it won't be
-    # reused by kvm_qemu!
-    rm $SOCKET_NAME || true
     exec qemu-system-x86_64 -m 512 \
         -no-kvm-irqchip \
         -net nic,model=virtio -net user -smb /nix \
         -hda image \
         -redir tcp:''${SOCKET_NAME/.socket/}::22 \
+        $KVM_OPTIONS \
         "\$@"
     EOF
     chmod +x run-kvm.sh
@@ -117,13 +124,19 @@ rec {
 
     waitTill(){
       echo $1
-      while ! eval "$2"; do sleep 1; done
+      eval "while ! $2; do sleep 1; done"
     }
 
     SSH(){
+      # if timout occurs ssh command will be retried.
+      # Waiting forever doesn't seem to work because
+      # there seems to be a race condition where
+      # SSH connects but sshd doesn't notice it.
+      # Thus fail and retry
       ssh -o UserKnownHostsFile=/dev/null \
         -o StrictHostKeyChecking=no \
         -o ProxyCommand="socat stdio ./$SOCKET_NAME" \
+        -o ConnectTimeout=1 \
         root@127.0.0.1 \
         "$@";
     }
@@ -138,11 +151,28 @@ rec {
     # wait for socket
 
     waitForSSHD(){
-      waitTill "waiting for socket in $TMP" '[ ! -e ./$SOCKET_NAME ]'
       waitTill "waiting for sshd job" "SSH 'echo Hello > /dev/tty1' &> /dev/null"
     }
 
+    nixBuildTest(){
+    INFO "verifying that nix-env -i works"
 
+    SSH_STDIN_E << EOF
+
+      cat >> test.nix << EOF_TEST
+      let pkgs = import /etc/nixos/nixpkgs/pkgs/top-level/all-packages.nix {};
+      in pkgs.stdenv.mkDerivation {
+        name = "test";
+        phases = "create_out";
+        create_out = "mkdir -p \\\$out/ok";
+      }
+    EOF_TEST
+
+      nix-build test.nix
+      [ -e result/ok ]
+    EOF
+
+    }
 
     ### test installting NixOS: install system then reboot
 
@@ -157,10 +187,11 @@ rec {
     
     waitForSSHD
 
+    nixBuildTest
+
     # INSTALLATION
     INFO "creating filesystem .."
     SSH_STDIN_E << EOF
-      set -x
       parted /dev/sda mklabel msdos
       parted /dev/sda mkpart primary 0 2G
       parted /dev/sda mkpart primary 1G 3G
@@ -195,8 +226,9 @@ rec {
       # has the generated configuration.nix file syntax errors?
       nix-instantiate --eval-only /tmp/test.nix
 
-      echo 'export NIXOS_CONFIG=/etc/nixos/nixos/tests/test-nixos-install-from-cd/configuration.nix' >> /root/.bashrc
-      . ~/.bashrc
+      mkdir /mnt/root
+      echo 'export NIXOS_CONFIG=/etc/nixos/nixos/tests/test-nixos-install-from-cd/configuration.nix' >> /mnt/root/.bashrc
+      . /mnt/root/.bashrc
       export NIX_OTHER_STORES=/nix-on-host
 
       run-in-chroot "/nix/store/nixos-bootstrap --install --no-pull"
@@ -209,24 +241,7 @@ rec {
     RUN_KVM -boot c
     waitForSSHD
 
-
-    INFO "verifying that nix-env -i works"
-
-    SSH_STDIN_E << EOF
-
-      cat >> test.nix << EOF_TEST
-      let pkgs = import /etc/nixos/nixpkgs/pkgs/top-level/all-packages.nix {};
-      in pkgs.stdenv.mkDerivation {
-        name = "test";
-        phases = "create_out";
-        create_out = "mkdir -p $out/ok";
-      }
-    EOF_TEST
-
-      set -x
-      nix-env -i -f test.nix
-      [ -e ~/.nix-profile/ok ]
-    EOF
+    nixBuildTest
 
     SHUTDOWN_VM
 
-- 
GitLab


From 0d095de38a3a78b4a9a129672d3d454bba1b932a Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 16 Dec 2009 13:35:03 +0000
Subject: [PATCH 2086/5331] * Revert r18985, but now handle the case where a
 nixbld user doesn't   exist yet.  Ludo's original patch only worked in the
 "update" case.   Also, do this only for the nixbld group.

svn path=/nixos/trunk/; revision=18990
---
 modules/config/users-groups.nix | 19 +++++++++++++++----
 1 file changed, 15 insertions(+), 4 deletions(-)

diff --git a/modules/config/users-groups.nix b/modules/config/users-groups.nix
index 552764b3aea..1b66d3ff4c9 100644
--- a/modules/config/users-groups.nix
+++ b/modules/config/users-groups.nix
@@ -32,8 +32,8 @@ let
              calls in `libstore/build.cc', don't add any supplementary group
              here.  */
           uid = builtins.add ids.uids.nixbld nr;
-          group = "nogroup";
-          extraGroups = ["nixbld"];
+          group = "nixbld";
+          extraGroups = [];
         };
 
       nixBuildUsers = map makeNixBuildUser (pkgs.lib.range 1 10);
@@ -169,6 +169,8 @@ in
 
     system.activationScripts.users = fullDepEntry
       ''
+        echo "updating users..."
+
         cat ${usersFile} | while true; do
             read name || break
             read description
@@ -181,7 +183,6 @@ in
             read password
 
             if ! curEnt=$(getent passwd "$name"); then
-                echo "creating user $name..."
                 useradd --system \
                     "$name" \
                     --comment "$description" \
@@ -215,17 +216,27 @@ in
                     --shell "$shell"
             fi
 
+            if test "$group" = nixbld; then
+                # As a special hack, add users that have nixbld as the
+                # primary group to the /etc/group entry for the nixbld
+                # group.  `nix-store' currently expects this in order
+                # to get the UIDs of all the build users by doing a
+                # getprnam("nixbld") call.
+                groupmod "$group" -A "$name"
+            fi
+
         done
       '' [ "groups" ];
 
     system.activationScripts.groups = fullDepEntry
       ''
+        echo "updating groups..."
+        
         while true; do
             read name || break
             read gid
 
             if ! curEnt=$(getent group "$name"); then
-                echo "creating group $name..."
                 groupadd --system \
                     "$name" \
                     ''${gid:+--gid $gid}
-- 
GitLab


From 52284859c53d6bb064a1f7f8babd2198f973c1ba Mon Sep 17 00:00:00 2001
From: Rob Vermaas <rob.vermaas@gmail.com>
Date: Wed, 16 Dec 2009 14:54:36 +0000
Subject: [PATCH 2087/5331]  * allow configuration of mysql version

svn path=/nixos/trunk/; revision=18993
---
 modules/services/databases/mysql.nix | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/modules/services/databases/mysql.nix b/modules/services/databases/mysql.nix
index 31d5676b8d7..cb7f7fe30ab 100644
--- a/modules/services/databases/mysql.nix
+++ b/modules/services/databases/mysql.nix
@@ -6,7 +6,7 @@ let
 
   cfg = config.services.mysql;
 
-  mysql = pkgs.mysql;
+  mysql = cfg.mysql;
 
   pidFile = "${cfg.pidDir}/mysqld.pid";
 
@@ -31,6 +31,13 @@ in
         ";
       };
 
+      mysql = mkOption {
+        default = pkgs.mysql;
+        description = "
+          Which MySQL derivation to use.
+        ";
+      };
+
       port = mkOption {
         default = "3306";
         description = "Port of MySQL"; 
-- 
GitLab


From 48d5ea107704edc47d79154e5a9c46dbc4850807 Mon Sep 17 00:00:00 2001
From: Rob Vermaas <rob.vermaas@gmail.com>
Date: Wed, 16 Dec 2009 15:24:15 +0000
Subject: [PATCH 2088/5331] mysql.mysql becomes mysql.package because eelco
 likes it better

svn path=/nixos/trunk/; revision=18994
---
 modules/services/databases/mysql.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/services/databases/mysql.nix b/modules/services/databases/mysql.nix
index cb7f7fe30ab..9ec77e2d474 100644
--- a/modules/services/databases/mysql.nix
+++ b/modules/services/databases/mysql.nix
@@ -6,7 +6,7 @@ let
 
   cfg = config.services.mysql;
 
-  mysql = cfg.mysql;
+  mysql = cfg.package;
 
   pidFile = "${cfg.pidDir}/mysqld.pid";
 
@@ -31,7 +31,7 @@ in
         ";
       };
 
-      mysql = mkOption {
+      package = mkOption {
         default = pkgs.mysql;
         description = "
           Which MySQL derivation to use.
-- 
GitLab


From 8d588424d2333438df51a80df7144fd0336db4d4 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 16 Dec 2009 18:11:26 +0000
Subject: [PATCH 2089/5331] * switch-to-configuration: force a reinstallation
 of GRUB whenever the   GRUB version changes.  (That's the complete version
 from the name   attribute, not the boot.loader.grub.version attribute.)  The
 current   version is recorded in /boot/grub/version.  This is required to  
 prevent massive breakage when we change the default value of  
 boot.loader.grub.version to "2".

svn path=/nixos/trunk/; revision=18997
---
 modules/installer/grub/grub.nix               |  2 ++
 .../activation/switch-to-configuration.sh     | 26 ++++++++++++++-----
 modules/system/activation/top-level.nix       |  8 +++---
 3 files changed, 26 insertions(+), 10 deletions(-)

diff --git a/modules/installer/grub/grub.nix b/modules/installer/grub/grub.nix
index 4bc36114f38..0939abd6e18 100644
--- a/modules/installer/grub/grub.nix
+++ b/modules/installer/grub/grub.nix
@@ -158,6 +158,8 @@ in
 
     environment.systemPackages = mkIf config.boot.loader.grub.enable [ grub ];
 
+    system.build.grub = grub;
+
   };
   
 }
diff --git a/modules/system/activation/switch-to-configuration.sh b/modules/system/activation/switch-to-configuration.sh
index d4b70c3b379..86775ad62a8 100644
--- a/modules/system/activation/switch-to-configuration.sh
+++ b/modules/system/activation/switch-to-configuration.sh
@@ -21,26 +21,38 @@ EOF
     exit 1
 fi
 
-if test "$action" = "switch" -o "$action" = "boot"; then
-    if [ "@bootLoader@" == "grub" ]; then
-      if test -n "@grubDevice@"; then
+# Install or update the bootloader.
+if [ "$action" = "switch" -o "$action" = "boot" ]; then
+    
+    if [ "@bootLoader@" = "grub" ]; then
+        
+      if [ -n "@grubDevice@" ]; then
           mkdir -m 0700 -p /boot/grub
           @menuBuilder@ @out@
-          if test "$NIXOS_INSTALL_GRUB" = 1; then
-	      echo "running \`@grub@/sbin/grub-install'..."
+
+          # If the GRUB version has changed, then force a reinstall.
+          oldGrubVersion="$(cat /boot/grub/version 2>/dev/null || true)"
+          newGrubVersion="@grubVersion@"
+
+          if [ "$NIXOS_INSTALL_GRUB" = 1 -o "$oldGrubVersion" != "$newGrubVersion" ]; then
+	      echo "installing the GRUB bootloader..."
               @grub@/sbin/grub-install "@grubDevice@" --no-floppy --recheck
+              echo "$newGrubVersion" > /boot/grub/version
           fi
+          
       else
           echo "Warning: don't know how to make this configuration bootable; please set \`boot.grubDevice'." 1>&2
       fi
-    elif [ "@bootLoader@" == "generationsDir" ]; then
+      
+    elif [ "@bootLoader@" = "generationsDir" ]; then
           @menuBuilder@ @out@
     else
           echo "Warning: don't know how to make this configuration bootable; please enable a boot loader." 1>&2
     fi
 fi
 
-if test "$action" = "switch" -o "$action" = "test"; then
+# Activate the new configuration.
+if [ "$action" = "switch" -o "$action" = "test" ]; then
 
     oldVersion=$(cat /var/run/current-system/upstart-interface-version 2> /dev/null || echo 0)
     newVersion=$(cat @out@/upstart-interface-version 2> /dev/null || echo 0)
diff --git a/modules/system/activation/top-level.nix b/modules/system/activation/top-level.nix
index 6bae1616df1..d2c20e90929 100644
--- a/modules/system/activation/top-level.nix
+++ b/modules/system/activation/top-level.nix
@@ -122,10 +122,12 @@ let
     bootLoader = config.system.boot.loader.id;
     grub =
       if config.boot.loader.grub.enable
-      then (if config.boot.loader.grub.version == 1
-            then pkgs.grub
-            else pkgs.grub2)
+      then config.system.build.grub
       else null;
+    grubVersion = 
+      if config.boot.loader.grub.enable
+      then (builtins.parseDrvName config.system.build.grub.name).version
+      else "";
     grubDevice = config.boot.loader.grub.device;
     configurationName = config.boot.loader.grub.configurationName;
   };
-- 
GitLab


From deb4f88c2c2ec0eeb0c80fbf174d3e670ef5c8da Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 16 Dec 2009 18:57:02 +0000
Subject: [PATCH 2090/5331] * Let the GRUB menu builder detect whether /boot is
 on a different   partition from /.  If so, copy the kernels and initrds to
 /boot and   use paths relative to /boot in the GRUB configuration file.  This
   makes the boot.loader.grub.bootDevice option obsolete.  (Is there a   way
 to mark obsolete options?)  It also makes it unnecessary to set  
 boot.loader.grub.copyKernels, although that option is still   available since
 it can speed up GRUB if the Nix store is very   large.

svn path=/nixos/trunk/; revision=18998
---
 doc/config-examples/root-on-lvm.nix         | 13 ++----
 modules/installer/grub/grub-menu-builder.sh | 48 ++++++++++++---------
 modules/installer/grub/grub.nix             | 15 +++----
 3 files changed, 35 insertions(+), 41 deletions(-)

diff --git a/doc/config-examples/root-on-lvm.nix b/doc/config-examples/root-on-lvm.nix
index 4fd4ca3a65c..2ea1e547921 100644
--- a/doc/config-examples/root-on-lvm.nix
+++ b/doc/config-examples/root-on-lvm.nix
@@ -1,9 +1,6 @@
 # This configuration has / on a LVM volume.  Since Grub
 # doesn't know about LVM, a separate /boot is therefore
-# needed.  In particular you need to set "copyKernels"
-# to tell NixOS to copy kernels and initrds from /nix/store
-# to /boot, and "bootMount" to tell Grub the /boot device
-# in Grub syntax (e.g. (hd0,0) for /dev/sda1).
+# needed.
 #
 # In this example, labels are used for file systems and
 # swap devices: "boot" might be /dev/sda1, "root" might be
@@ -12,12 +9,8 @@
 # that / is on LVM; that's figured out automatically.
 
 {
-  boot = {
-    grubDevice = "/dev/sda";
-    initrd.kernelModules = ["ata_piix"];
-    copyKernels = true;
-    bootMount = "(hd0,0)";
-  };
+  boot.loader.grub.device = "/dev/sda";
+  boot.initrd.kernelModules = ["ata_piix"];
 
   fileSystems = [
     { mountPoint = "/";
diff --git a/modules/installer/grub/grub-menu-builder.sh b/modules/installer/grub/grub-menu-builder.sh
index 1cce302fdf0..72ea17875c5 100644
--- a/modules/installer/grub/grub-menu-builder.sh
+++ b/modules/installer/grub/grub-menu-builder.sh
@@ -12,8 +12,6 @@ fi
 
 grubVersion="@version@"
 defaultConfig="$1"
-bootDevice="@bootDevice@"
-if test -z "$bootDevice"; then bootDevice=/boot; fi
 
 case "$grubVersion" in
     1|2)
@@ -27,6 +25,20 @@ case "$grubVersion" in
 esac
 
 
+# Discover whether /boot is on the same filesystem as /.  If not, then
+# all kernels and initrds must be copied to /boot, and all paths in
+# the GRUB config file must be relative to the root of the /boot
+# filesystem.  `$bootRoot' is the path to be prepended to paths under
+# /boot.
+if [ "$(stat -f -c '%i' /)" = "$(stat -f -c '%i' /boot)" ]; then
+    bootRoot=/boot
+    copyKernels="@copyKernels@" # user can override in the NixOS config
+else
+    bootRoot=
+    copyKernels=1
+fi
+
+
 prologue() {
     case "$grubVersion" in
 	1)
@@ -37,7 +49,7 @@ default @default@
 timeout @timeout@
 GRUBEND
 	    if test -n "@splashImage@"; then
-		echo "splashimage $bootDevice/background.xpm.gz" >> "$1"
+		echo "splashimage $bootRoot/background.xpm.gz" >> "$1"
 	    fi
 	    ;;
 	2)
@@ -46,7 +58,7 @@ GRUBEND
 # Automatically generated.  DO NOT EDIT THIS FILE!
 set default=@default@
 set timeout=@timeout@
-if loadfont $bootDevice/grub/unicode.pf2; then
+if loadfont $bootRoot/grub/unicode.pf2; then
   set gfxmode=640x480
   insmod gfxterm
   insmod vbe
@@ -59,7 +71,7 @@ EOF
 		# if it doesn't match the video resolution.
 		cat >> "$1" <<EOF
 insmod png
-if background_image $bootDevice/background.png; then
+if background_image $bootRoot/background.png; then
   set color_normal=white/black
   set color_highlight=black/white
 else
@@ -106,7 +118,8 @@ declare -A filesCopied
 
 copyToKernelsDir() {
     local src="$1"
-    local dst="/boot/kernels/$(cleanName $src)"
+    local p="kernels/$(cleanName $src)"
+    local dst="/boot/$p"
     # Don't copy the file if $dst already exists.  This means that we
     # have to create $dst atomically to prevent partially copied
     # kernels or initrd if this script is ever interrupted.
@@ -116,7 +129,7 @@ copyToKernelsDir() {
         mv $dstTmp $dst
     fi
     filesCopied[$dst]=1
-    result=$dst
+    result="$bootRoot/$p"
 }
 
 
@@ -147,34 +160,27 @@ addEntry() {
 	    1)
 		cat > /boot/nixos-grub-config <<EOF
 	title Emergency boot
-	kernel ${bootDevice:-/boot}/nixos-kernel systemConfig=$(readlink -f "$path") init=/boot/nixos-init $(cat "$path/kernel-params")
-	initrd ${bootDevice:-/boot}/nixos-initrd
+	kernel $bootRoot/nixos-kernel systemConfig=$(readlink -f "$path") init=/boot/nixos-init $(cat "$path/kernel-params")
+	initrd $bootRoot/nixos-initrd
 EOF
 		;;
 	    2)
 		cat > /boot/nixos-grub-config <<EOF
         menuentry "Emergency boot" {
-          linux  ${bootDevice:-/boot}/nixos-kernel systemConfig=$(readlink -f "$path") init=/boot/nixos-init $(cat "$path/kernel-params")
-          initrd ${bootDevice:-/boot}/initrd
+          linux  $bootRoot/nixos-kernel systemConfig=$(readlink -f "$path") init=/boot/nixos-init $(cat "$path/kernel-params")
+          initrd $bootRoot/initrd
         }
 EOF
 		;;
 	esac
     fi
 
-    if test -n "@copyKernels@"; then
+    if test -n "$copyKernels"; then
         copyToKernelsDir $kernel; kernel=$result
         copyToKernelsDir $initrd; initrd=$result
     fi
     
-    if test -n "$bootDevice"; then
-        kernel=$(echo $kernel | sed -e "s^/boot^$bootDevice^")
-        initrd=$(echo $initrd | sed -e "s^/boot^$bootDevice^")
-    fi
-    
-    local confName=$(if test -e $path/configuration-name; then 
-	cat $path/configuration-name; 
-    fi)
+    local confName=$(cat $path/configuration-name 2>/dev/null)
     if test -n "$confName"; then
 	name="$confName $3"
     fi
@@ -199,7 +205,7 @@ GRUBEND
 }
 
 
-if test -n "@copyKernels@"; then
+if test -n "$copyKernels"; then
     mkdir -p /boot/kernels
 fi
 
diff --git a/modules/installer/grub/grub.nix b/modules/installer/grub/grub.nix
index 0939abd6e18..e3df1593e71 100644
--- a/modules/installer/grub/grub.nix
+++ b/modules/installer/grub/grub.nix
@@ -13,7 +13,7 @@ let
     inherit (pkgs) bash;
     path = [pkgs.coreutils pkgs.gnused pkgs.gnugrep];
     inherit (config.boot.loader.grub) copyKernels extraEntries extraEntriesBeforeNixOS
-      splashImage bootDevice configurationLimit version default timeout;
+      splashImage configurationLimit version default timeout;
   };
   
 in
@@ -53,15 +53,10 @@ in
         '';
       };
 
+      # !!! How can we mark options as obsolete?
       bootDevice = mkOption {
         default = "";
-        example = "(hd0,0)";
-        description = ''
-          If the system partition may be wiped on reinstall, it is better
-          to have /boot on a small partition. To do it, we need to explain
-          to GRUB where the kernels live. Specify the partition here (in 
-          GRUB notation).
-        '';
+        description = "Obsolete.";
       };
 
       configurationName = mkOption {
@@ -121,8 +116,8 @@ in
         default = false;
         description = ''
           Whether the GRUB menu builder should copy kernels and initial
-          ramdisks to /boot.  This is necessary when /nix is on a
-          different file system than /boot.
+          ramdisks to /boot.  This is done automatically if /boot is
+          on a different partition than /.
         '';
       };
 
-- 
GitLab


From 0ca7619e62f3dd5600b07f5dda30ff6a4aaf302c Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 16 Dec 2009 18:58:34 +0000
Subject: [PATCH 2091/5331] svn path=/nixos/trunk/; revision=18999

---
 modules/installer/grub/grub-menu-builder.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/installer/grub/grub-menu-builder.sh b/modules/installer/grub/grub-menu-builder.sh
index 72ea17875c5..cf2041002e7 100644
--- a/modules/installer/grub/grub-menu-builder.sh
+++ b/modules/installer/grub/grub-menu-builder.sh
@@ -180,7 +180,7 @@ EOF
         copyToKernelsDir $initrd; initrd=$result
     fi
     
-    local confName=$(cat $path/configuration-name 2>/dev/null)
+    local confName=$(cat $path/configuration-name 2>/dev/null || true)
     if test -n "$confName"; then
 	name="$confName $3"
     fi
-- 
GitLab


From 4e8270f695f38fe0058681225dd1571f6d5dda2b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Wed, 16 Dec 2009 19:45:11 +0000
Subject: [PATCH 2092/5331] Upstart considers that syslog is ready (runs
 openlog()) after the connection to dbus worked. So I set dbus depend also on
 syslogd.

svn path=/nixos/trunk/; revision=19002
---
 modules/services/system/dbus.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/services/system/dbus.nix b/modules/services/system/dbus.nix
index b0c8dc66ae5..6dbee3e6a04 100644
--- a/modules/services/system/dbus.nix
+++ b/modules/services/system/dbus.nix
@@ -113,7 +113,7 @@ in
       };
 
     jobs.dbus =
-      { startOn = "started udev";
+      { startOn = "started udev and started syslogd";
 
         preStart =
           ''
-- 
GitLab


From ee434cc3d61c48e90378a66c35433419abe94a34 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Wed, 16 Dec 2009 19:45:19 +0000
Subject: [PATCH 2093/5331] Using wpa_supplicant feature to log to syslog,
 instead of stdout (which, in the actual upstart job, meant /dev/console)

svn path=/nixos/trunk/; revision=19003
---
 modules/services/networking/wpa_supplicant.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/modules/services/networking/wpa_supplicant.nix b/modules/services/networking/wpa_supplicant.nix
index 10c9041cf3e..abf79c5d554 100644
--- a/modules/services/networking/wpa_supplicant.nix
+++ b/modules/services/networking/wpa_supplicant.nix
@@ -56,7 +56,8 @@ in
 
         exec =
           "${pkgs.wpa_supplicant}/sbin/wpa_supplicant " +
-          "-C /var/run/wpa_supplicant -c ${configFile} -i${config.networking.WLANInterface}";
+          "-s -C /var/run/wpa_supplicant " +
+          "-c ${configFile} -i${config.networking.WLANInterface}";
       };
   
   };
-- 
GitLab


From 3f6ca969671addd4e80a7c93c7cfc6434388a2b3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Wed, 16 Dec 2009 20:51:25 +0000
Subject: [PATCH 2094/5331] Adding an option to disable nscd.

svn path=/nixos/trunk/; revision=19004
---
 modules/services/system/nscd.nix | 24 +++++++++++++++++++++++-
 1 file changed, 23 insertions(+), 1 deletion(-)

diff --git a/modules/services/system/nscd.nix b/modules/services/system/nscd.nix
index 1e3a4ff75c9..ede6c4213db 100644
--- a/modules/services/system/nscd.nix
+++ b/modules/services/system/nscd.nix
@@ -1,5 +1,7 @@
 {pkgs, config, ...}:
 
+with pkgs.lib;
+
 let
 
   nssModulesPath = config.system.nssModules.path;
@@ -9,7 +11,27 @@ let
 in
 
 {
-  config = {
+
+  ###### interface
+
+  options = {
+
+    services.nscd = {
+
+      enable = mkOption {
+        default = true;
+        description = "
+          Whether to enable the Name Service Cache Daemon.
+        ";
+      };
+
+    };
+
+  };
+
+  ###### implementation
+
+  config = mkIf config.services.nscd.enable {
   
     users.extraUsers = singleton
       { name = "nscd";
-- 
GitLab


From eea026d32184304dcca8276d3fdfb8b37b0ce1a6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Wed, 16 Dec 2009 23:45:10 +0000
Subject: [PATCH 2095/5331] Enabling back the i8042 module loading at initrd.
 Otherwise, some may not get any keyboard driver loaded (as I experienced).

svn path=/nixos/trunk/; revision=19006
---
 modules/system/boot/kernel.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/modules/system/boot/kernel.nix b/modules/system/boot/kernel.nix
index 69b1b944de7..4cb862a3a00 100644
--- a/modules/system/boot/kernel.nix
+++ b/modules/system/boot/kernel.nix
@@ -156,12 +156,14 @@ let kernel = config.boot.kernelPackages.kernel; in
         "unix"
         
         # Misc. stuff.
-        "i8042" "pcips2" "serio" "atkbd" "xtkbd"
+        "pcips2" "serio" "atkbd" "xtkbd"
       ];
       
     boot.initrd.kernelModules =
       [ # For LVM.
         "dm_mod"
+        # For usual AT keyboards
+        "i8042" 
       ];
 
     # The Linux kernel >= 2.6.27 provides firmware.
-- 
GitLab


From aa445933a7d4440f6c7196414d7218298e58a4ce Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 16 Dec 2009 23:52:02 +0000
Subject: [PATCH 2096/5331] * Include some more firmware in the installation
 CD.

svn path=/nixos/trunk/; revision=19007
---
 modules/installer/cd-dvd/installation-cd-base.nix | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/modules/installer/cd-dvd/installation-cd-base.nix b/modules/installer/cd-dvd/installation-cd-base.nix
index 64eb4ee5b75..74a2236fb6d 100644
--- a/modules/installer/cd-dvd/installation-cd-base.nix
+++ b/modules/installer/cd-dvd/installation-cd-base.nix
@@ -203,9 +203,11 @@ in
         else ""
       }
     '';
-  
-  # Have the redistributable firmware of rt73 wifi nics.
+
+  # Include the firmware for various wireless cards.
   networking.enableRT73Firmware = true;
+  networking.enableIntel2200BGFirmware = true;
+  networking.enableIntel3945ABGFirmware = true;
 
   # To speed up installation a little bit, include the complete stdenv
   # in the Nix store on the CD.
-- 
GitLab


From 483ee6219ecb610c45aff24a2277cf71ce04c25b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Wed, 16 Dec 2009 23:59:05 +0000
Subject: [PATCH 2097/5331] Fixing the shutdown script, for the
 not-that-strange case of having /nix bind mounted from a fs not rootfs.

As niksnut found, if the sources of bind mounted directories are
umounted before remounting them as "ro", a "mount -o remount,ro" on the
bind targets will not leave the filesystem properly umounted, the same
way as a "-o remount,ro" would do on a usual filesystem.

So, the trick of always remounting as 'ro' before attempting an umount seems
to fix the problem.

svn path=/nixos/trunk/; revision=19008
---
 modules/system/upstart-events/shutdown.nix | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/modules/system/upstart-events/shutdown.nix b/modules/system/upstart-events/shutdown.nix
index fa264979c6c..ff208a80b5a 100644
--- a/modules/system/upstart-events/shutdown.nix
+++ b/modules/system/upstart-events/shutdown.nix
@@ -97,17 +97,21 @@ with pkgs.lib;
                   device=$(getDevice $mp)
                   echo "unmounting $mp..."
 
+                  # We need to remount,ro before attempting any
+                  # umount, or bind mounts may get confused, with
+                  # the fs not being properly flushed at the end.
+
+                  # `-i' is to workaround a bug in mount.cifs (it
+                  # doesn't recognise the `remount' option, and
+                  # instead mounts the FS again).
+                  mount -n -i -o remount,ro "$mp"
+
                   # Note: don't use `umount -f'; it's very buggy.
                   # (For instance, when applied to a bind-mount it
                   # unmounts the target of the bind-mount.)  !!! But
                   # we should use `-f' for NFS.
                   if umount -n "$mp"; then
                       if test "$mp" != /; then tryAgain=1; fi
-                  else
-                      # `-i' is to workaround a bug in mount.cifs (it
-                      # doesn't recognise the `remount' option, and
-                      # instead mounts the FS again).
-                      mount -n -i -o remount,ro "$mp"
                   fi
       
                   # Hack: work around a bug in mount (mount -o remount on a
@@ -138,4 +142,4 @@ with pkgs.lib;
         '';
     };
 
-}
\ No newline at end of file
+}
-- 
GitLab


From 4ff6821a03680ad92db08701555be3a6f5c735e3 Mon Sep 17 00:00:00 2001
From: Marc Weber <marco-oweber@gmx.de>
Date: Thu, 17 Dec 2009 06:04:36 +0000
Subject: [PATCH 2098/5331] module creating /sbin/init

svn path=/nixos/trunk/; revision=19009
---
 .../init-script/init-script-builder.sh        | 89 +++++++++++++++++++
 modules/installer/init-script/init-script.nix | 51 +++++++++++
 modules/module-list.nix                       |  1 +
 .../activation/switch-to-configuration.sh     |  2 +
 modules/system/activation/top-level.nix       |  1 +
 5 files changed, 144 insertions(+)
 create mode 100644 modules/installer/init-script/init-script-builder.sh
 create mode 100644 modules/installer/init-script/init-script.nix

diff --git a/modules/installer/init-script/init-script-builder.sh b/modules/installer/init-script/init-script-builder.sh
new file mode 100644
index 00000000000..24128ae9abc
--- /dev/null
+++ b/modules/installer/init-script/init-script-builder.sh
@@ -0,0 +1,89 @@
+
+#! @bash@/bin/sh -e
+
+shopt -s nullglob
+
+export PATH=/empty
+for i in @path@; do PATH=$PATH:$i/bin; done
+
+if test $# -ne 1; then
+    echo "Usage: grub-menu-builder.sh DEFAULT-CONFIG"
+    exit 1
+fi
+
+defaultConfig="$1"
+
+
+[ "$(stat -f -c '%i' /)" = "$(stat -f -c '%i' /boot)" ] || {
+  # see grub-menu-builder.sh
+  echo "WARNING: /boot being on a different filesystem not supported by init-script-builder.sh"
+}
+
+
+
+target="/sbin/init"
+targetOther="/boot/init-other-configurations-contents.txt"
+
+tmp="$target.tmp"
+tmpOther="$targetOther.tmp"
+
+
+configurationCounter=0
+numAlienEntries=`cat <<EOF | egrep '^[[:space:]]*title' | wc -l
+@extraEntries@
+EOF`
+
+
+
+
+# Add an entry to $targetOther
+addEntry() {
+    local name="$1"
+    local path="$2"
+    local shortSuffix="$3"
+
+    configurationCounter=$((configurationCounter + 1))
+
+    local stage2=$(readlink $path/init)
+
+    content="$(
+      echo "#!/bin/sh"
+      echo "# $name"
+      echo "# created by init-script-builder.sh"
+      echo "export systemConfig=$(readlink -f $path)"
+      echo "exec $stage2"
+    )"
+
+    [ "$path" != "$defaultConfig" ] || { 
+      echo "$content" > $tmp
+      echo "# older configurations: $targetOther" >> $tmp
+      chmod +x $tmp
+    }
+
+    echo -e "$content\n\n" >> $tmpOther
+}
+
+
+mkdir -p /boot /sbin
+
+addEntry "NixOS - Default" $defaultConfig ""
+
+# Add all generations of the system profile to the menu, in reverse
+# (most recent to least recent) order.
+for link in $((ls -d $defaultConfig/fine-tune/* ) | sort -n); do
+    date=$(stat --printf="%y\n" $link | sed 's/\..*//')
+    addEntry "NixOS - variation" $link ""
+done
+
+for generation in $(
+    (cd /nix/var/nix/profiles && ls -d system-*-link) \
+    | sed 's/system-\([0-9]\+\)-link/\1/' \
+    | sort -n -r); do
+    link=/nix/var/nix/profiles/system-$generation-link
+    date=$(stat --printf="%y\n" $link | sed 's/\..*//')
+    kernelVersion=$(cd $(dirname $(readlink -f $link/kernel))/lib/modules && echo *)
+    addEntry "NixOS - Configuration $generation ($date - $kernelVersion)" $link "$generation ($date)"
+done
+
+mv $tmpOther $targetOther
+mv $tmp $target
diff --git a/modules/installer/init-script/init-script.nix b/modules/installer/init-script/init-script.nix
new file mode 100644
index 00000000000..ff656b1c442
--- /dev/null
+++ b/modules/installer/init-script/init-script.nix
@@ -0,0 +1,51 @@
+{ config, pkgs, ... }:
+
+with pkgs.lib;
+
+let
+
+  initScriptBuilder = pkgs.substituteAll {
+    src = ./init-script-builder.sh;
+    isExecutable = true;
+    inherit (pkgs) bash;
+    path = [pkgs.coreutils pkgs.gnused pkgs.gnugrep];
+  };
+  
+in
+
+{
+
+  ###### interface
+
+  options = {
+
+    boot.loader.initScript = {
+
+      enable = mkOption {
+        default = true;
+        description = ''
+          Some systems require a /sbin/init script which is started.
+          Or having it makes starting NixOS easier.
+          This applies to some kind of hosting services and user mode linux.
+
+          Additionaly this script will create
+          /boot/init-other-configurations-contents.txt containing
+          contents of remaining configurations. You can copy paste them into
+          /sbin/init manually running a recue system or such.
+        '';
+      };
+    };
+
+  };
+  
+
+  ###### implementation
+
+  config = {
+  
+    system.build.initScriptBuilder =
+       if config.boot.loader.initScript.enable then initScriptBuilder else "";
+
+  };
+  
+}
diff --git a/modules/module-list.nix b/modules/module-list.nix
index 62f8638020c..702822f506a 100644
--- a/modules/module-list.nix
+++ b/modules/module-list.nix
@@ -15,6 +15,7 @@
   ./hardware/network/rt73.nix 
   ./hardware/pcmcia.nix
   ./installer/grub/grub.nix
+  ./installer/init-script/init-script.nix
   ./installer/generations-dir/generations-dir.nix
   ./installer/tools/nixos-checkout.nix
   ./installer/tools/tools.nix
diff --git a/modules/system/activation/switch-to-configuration.sh b/modules/system/activation/switch-to-configuration.sh
index 86775ad62a8..2a8e29bb841 100644
--- a/modules/system/activation/switch-to-configuration.sh
+++ b/modules/system/activation/switch-to-configuration.sh
@@ -49,6 +49,8 @@ if [ "$action" = "switch" -o "$action" = "boot" ]; then
     else
           echo "Warning: don't know how to make this configuration bootable; please enable a boot loader." 1>&2
     fi
+
+    @initScriptBuilder@ @out@
 fi
 
 # Activate the new configuration.
diff --git a/modules/system/activation/top-level.nix b/modules/system/activation/top-level.nix
index d2c20e90929..2fdaa6fd945 100644
--- a/modules/system/activation/top-level.nix
+++ b/modules/system/activation/top-level.nix
@@ -108,6 +108,7 @@ let
     kernelParams =
       config.boot.kernelParams ++ config.boot.extraKernelParams;
     menuBuilder = config.system.build.menuBuilder;
+    initScriptBuilder = config.system.build.initScriptBuilder;
     # Most of these are needed by grub-install.
     path = [
       pkgs.coreutils
-- 
GitLab


From 44dafe885b302dda6e9710db6524947f833f860a Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 17 Dec 2009 11:43:12 +0000
Subject: [PATCH 2099/5331] * Don't enable this by default.

svn path=/nixos/trunk/; revision=19012
---
 modules/installer/init-script/init-script.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/installer/init-script/init-script.nix b/modules/installer/init-script/init-script.nix
index ff656b1c442..9eeadca109f 100644
--- a/modules/installer/init-script/init-script.nix
+++ b/modules/installer/init-script/init-script.nix
@@ -22,7 +22,7 @@ in
     boot.loader.initScript = {
 
       enable = mkOption {
-        default = true;
+        default = false;
         description = ''
           Some systems require a /sbin/init script which is started.
           Or having it makes starting NixOS easier.
-- 
GitLab


From 01491abbfa31f70e290a468aeb4a2c3073df51f5 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 17 Dec 2009 12:35:58 +0000
Subject: [PATCH 2100/5331] * Handle the case where initScriptBuilder is not
 set.

svn path=/nixos/trunk/; revision=19014
---
 modules/system/activation/switch-to-configuration.sh | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/modules/system/activation/switch-to-configuration.sh b/modules/system/activation/switch-to-configuration.sh
index 2a8e29bb841..207b17fd4ca 100644
--- a/modules/system/activation/switch-to-configuration.sh
+++ b/modules/system/activation/switch-to-configuration.sh
@@ -45,12 +45,14 @@ if [ "$action" = "switch" -o "$action" = "boot" ]; then
       fi
       
     elif [ "@bootLoader@" = "generationsDir" ]; then
-          @menuBuilder@ @out@
+        @menuBuilder@ @out@
     else
-          echo "Warning: don't know how to make this configuration bootable; please enable a boot loader." 1>&2
+        echo "Warning: don't know how to make this configuration bootable; please enable a boot loader." 1>&2
     fi
 
-    @initScriptBuilder@ @out@
+    if [ -n "@initScriptBuilder@" ]; then
+        @initScriptBuilder@ @out@
+    fi
 fi
 
 # Activate the new configuration.
-- 
GitLab


From 93cb9f819d12de4a5ee0976d098c0b4d96c91f2e Mon Sep 17 00:00:00 2001
From: Marc Weber <marco-oweber@gmx.de>
Date: Fri, 18 Dec 2009 15:08:50 +0000
Subject: [PATCH 2101/5331] cosmetic: remove redundancy

svn path=/nixos/trunk/; revision=19040
---
 .../generations-dir-builder.sh                | 24 +++++--------------
 1 file changed, 6 insertions(+), 18 deletions(-)

diff --git a/modules/installer/generations-dir/generations-dir-builder.sh b/modules/installer/generations-dir/generations-dir-builder.sh
index 20fd51f9abd..e723b9eb7cb 100644
--- a/modules/installer/generations-dir/generations-dir-builder.sh
+++ b/modules/installer/generations-dir/generations-dir-builder.sh
@@ -46,8 +46,7 @@ copyToKernelsDir() {
 }
 
 
-# Add an entry for a configuration to the Grub menu, and if
-# appropriate, copy its kernel and initrd to /boot/kernels.
+# Copy its kernel and initrd to /boot/kernels.
 addEntry() {
     local path="$1"
     local generation="$2"
@@ -77,22 +76,11 @@ addEntry() {
       cp "$(readlink -f "$path/init")" /boot/nixos-init
 
       mkdir -p /boot/default
-      if [ -e /boot/default/system ]; then
-        rm /boot/default/system
-      fi
-      ln -sf $(readlink -f $path) /boot/default/system
-      if [ -e /boot/default/init ]; then
-        rm /boot/default/init
-      fi
-      ln -sf $(readlink -f $path/init) /boot/default/init
-      if [ -e /boot/default/initrd ]; then
-        rm /boot/default/initrd
-      fi
-      ln -sf $initrd /boot/default/initrd
-      if [ -e /boot/default/kernel ]; then
-        rm /boot/default/kernel
-      fi
-      ln -sf $kernel /boot/default/kernel
+      # ln -sfT: overrides target even if it exists.
+      ln -sfT $(readlink -f $path) /boot/default/system
+      ln -sfT $(readlink -f $path/init) /boot/default/init
+      ln -sfT $initrd /boot/default/initrd
+      ln -sfT $kernel /boot/default/kernel
     fi
 }
 
-- 
GitLab


From 57f70db611cde0bd5aa26a32df4f0bfc6378eb19 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sun, 20 Dec 2009 16:51:22 +0000
Subject: [PATCH 2102/5331] * Revert r19003 for now, because wpa_supplicant
 0.6.9 (in the Nixpkgs   trunk) doesn't have a -s flag.  0.7.0 in the stdenv
 branch   presumably does, but it's marked as unstable upstream.

svn path=/nixos/trunk/; revision=19047
---
 modules/services/networking/wpa_supplicant.nix | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/modules/services/networking/wpa_supplicant.nix b/modules/services/networking/wpa_supplicant.nix
index abf79c5d554..10c9041cf3e 100644
--- a/modules/services/networking/wpa_supplicant.nix
+++ b/modules/services/networking/wpa_supplicant.nix
@@ -56,8 +56,7 @@ in
 
         exec =
           "${pkgs.wpa_supplicant}/sbin/wpa_supplicant " +
-          "-s -C /var/run/wpa_supplicant " +
-          "-c ${configFile} -i${config.networking.WLANInterface}";
+          "-C /var/run/wpa_supplicant -c ${configFile} -i${config.networking.WLANInterface}";
       };
   
   };
-- 
GitLab


From 9c465fedfae8a8d74312948b4126181dee715d15 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sun, 20 Dec 2009 22:03:32 +0000
Subject: [PATCH 2103/5331] * Reinstate the -s flag.

svn path=/nixos/trunk/; revision=19055
---
 modules/services/networking/wpa_supplicant.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/modules/services/networking/wpa_supplicant.nix b/modules/services/networking/wpa_supplicant.nix
index 10c9041cf3e..abf79c5d554 100644
--- a/modules/services/networking/wpa_supplicant.nix
+++ b/modules/services/networking/wpa_supplicant.nix
@@ -56,7 +56,8 @@ in
 
         exec =
           "${pkgs.wpa_supplicant}/sbin/wpa_supplicant " +
-          "-C /var/run/wpa_supplicant -c ${configFile} -i${config.networking.WLANInterface}";
+          "-s -C /var/run/wpa_supplicant " +
+          "-c ${configFile} -i${config.networking.WLANInterface}";
       };
   
   };
-- 
GitLab


From aaac043ae57e1219aee40737fd1e0242ed9af71d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Thu, 24 Dec 2009 12:05:34 +0000
Subject: [PATCH 2104/5331] Making an explicit dependency for nfs-kernel on
 portmap

svn path=/nixos/trunk/; revision=19090
---
 modules/services/network-filesystems/nfs-kernel.nix | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/modules/services/network-filesystems/nfs-kernel.nix b/modules/services/network-filesystems/nfs-kernel.nix
index 2f6904457b2..249d777727e 100644
--- a/modules/services/network-filesystems/nfs-kernel.nix
+++ b/modules/services/network-filesystems/nfs-kernel.nix
@@ -71,6 +71,11 @@ in
 
   config = mkIf config.services.nfsKernel.enable {
 
+    assertions = singleton
+      { assertion = config.services.portmap.enable;
+        message = "Please enable portmap (services.portmap.enable) to use nfs-kernel.";
+      };
+
     environment.etc = singleton
       { source = exports;
         target = "exports";
@@ -111,7 +116,7 @@ in
 
         description = "Kernel NFS server";
 
-        startOn = "started nfs-kernel-exports";
+        startOn = "started nfs-kernel-exports and started portmap";
         stopOn = "stopping nfs-kernel-exports";
 
         exec = "${pkgs.nfsUtils}/sbin/rpc.nfsd ${if cfg.hostName != null then "-H ${cfg.hostName}" else ""} ${builtins.toString cfg.nproc}";
@@ -122,7 +127,7 @@ in
 
         description = "Kernel NFS server - mount daemon";
 
-        startOn = "started nfs-kernel-nfsd";
+        startOn = "started nfs-kernel-nfsd and started portmap";
         stopOn = "stopping nfs-kernel-exports";
 
         exec = "${pkgs.nfsUtils}/sbin/rpc.mountd -F -f ${exports}";
@@ -133,8 +138,8 @@ in
       
         description = "Kernel NFS server - Network Status Monitor";
       
-        startOn = "started nfs-kernel-nfsd";
-	stopOn = "stopping nfs-kernel-exports";
+        startOn = "started nfs-kernel-nfsd and started portmap";
+        stopOn = "stopping nfs-kernel-exports";
 
         preStart =
           ''	
-- 
GitLab


From c0c4d575d2eec96191f90d3d8a8ace33d2b2a98d Mon Sep 17 00:00:00 2001
From: Marc Weber <marco-oweber@gmx.de>
Date: Fri, 25 Dec 2009 06:39:43 +0000
Subject: [PATCH 2105/5331] autofs job fixes: use exec so that upstart knows
 when automount shuts down. If a mount is used upstart will send SIGKILL.
 Automount doesn't clean up. So unmount everything using a post script.

svn path=/nixos/trunk/; revision=19105
---
 modules/services/misc/autofs.nix | 46 +++++++++++++++++++++++++++-----
 1 file changed, 39 insertions(+), 7 deletions(-)

diff --git a/modules/services/misc/autofs.nix b/modules/services/misc/autofs.nix
index 079c684d086..d3d19241598 100644
--- a/modules/services/misc/autofs.nix
+++ b/modules/services/misc/autofs.nix
@@ -6,6 +6,10 @@ let
 
   cfg = config.services.autofs;
 
+  mount = config.system.sbin.mount;
+
+  autoMaster = pkgs.writeText "auto.master" cfg.autoMaster;
+
 in
 
 {
@@ -19,7 +23,8 @@ in
       enable = mkOption {
         default = false;
         description = "
-          automatically mount and unmount filesystems
+          Mount filesystems on demand. Unmount them automatically.
+          You may also be interested in afuese.
         ";
       };
 
@@ -43,11 +48,15 @@ in
         '';
         description = "
           file contents of /etc/auto.master. See man auto.master
-          see 
-          man auto.master and man 5 autofs
+          See man 5 auto.master and man 5 autofs.
         ";
       };
 
+      kernelModules = mkOption {
+        default = ["fuse"];
+        description="kernel modules to load";
+      };
+
       timeout = mkOption {
         default = 600;
         description = "Set the global minimum timeout, in seconds, until directories are unmounted";
@@ -55,9 +64,11 @@ in
 
       debug = mkOption {
         default = false;
-        description = "pass -d to automount and write log to /var/log/autofs";
+        description = "
+        pass -d and -7 to automount and write log to /var/log/autofs
+        ";
       };
-      
+
     };
 
   };
@@ -83,14 +94,35 @@ in
           };
 
         preStart =
+          pkgs.lib.concatMapStrings (module : "modprobe ${module} || true\n")
+                                    (["autofs4"] ++ cfg.kernelModules);
+
+        preStop = 
+          ''
+            set -e; while :; do pkill -TERM automount; sleep 1; done
+          '';
+
+        # automount doesn't clean up when receiving SIGKILL.
+        # umount -l should unmount the directories recursively when they are no longer used
+        # It does, but traces are left in /etc/mtab. So unmount recursively..
+        postStop =
           ''
-            modprobe autofs4 || true
+          PATH=${pkgs.gnused}/bin:${pkgs.coreutils}/bin
+          exec &> /tmp/logss
+          # double quote for sed:
+          escapeSpaces(){ sed 's/ /\\\\040/g'; }
+          unescapeSpaces(){ sed 's/\\040/ /g'; }
+          sed -n 's@^\s*\(\([^\\ ]\|\\ \)*\)\s.*@\1@p' ${autoMaster} | sed 's/[\\]//' | while read mountPoint; do
+            sed -n "s@[^ ]\+\s\+\($(echo "$mountPoint"| escapeSpaces)[^ ]*\).*@\1@p" /proc/mounts | sort -r | unescapeSpaces| while read smountP; do
+              ${mount}/bin/umount -l "$smountP" || true
+            done
+          done
           '';
 
         script =
           ''
             ${if cfg.debug then "exec &> /var/log/autofs" else ""}
-            ${pkgs.autofs5}/sbin/automount -f -t ${builtins.toString cfg.timeout} ${if cfg.debug then "-d" else ""} "${pkgs.writeText "auto.master" cfg.autoMaster}"
+            exec ${pkgs.autofs5}/sbin/automount ${if cfg.debug then "-d" else ""} -f -t ${builtins.toString cfg.timeout} "${autoMaster}" ${if cfg.debug then "-l7" else ""}
           '';
       };
           
-- 
GitLab


From 246dae96fe55a9da9513cc35e0258a58ae422405 Mon Sep 17 00:00:00 2001
From: Nicolas Pierron <nicolas.b.pierron@gmail.com>
Date: Sat, 26 Dec 2009 16:20:00 +0000
Subject: [PATCH 2106/5331] Add an option to cipher swap partitions.

! Not tested yet: cryptsetup depends on a missing
! udev binary.

svn path=/nixos/trunk/; revision=19131
---
 modules/tasks/swap.nix | 85 +++++++++++++++++++++++++++++-------------
 1 file changed, 60 insertions(+), 25 deletions(-)

diff --git a/modules/tasks/swap.nix b/modules/tasks/swap.nix
index ad9d94f8ea6..af8cac45f82 100644
--- a/modules/tasks/swap.nix
+++ b/modules/tasks/swap.nix
@@ -4,10 +4,8 @@ with pkgs.lib;
 
 let
 
-  inherit (pkgs) utillinux;
+  inherit (pkgs) cryptsetup utillinux;
 
-  toPath = x: if x.device != null then x.device else "/dev/disk/by-label/${x.label}";
-  
 in
 
 {
@@ -35,24 +33,65 @@ in
 
       type = types.list types.optionSet;
 
-      options = {
-
-        device = mkOption {
-          default = null;
-          example = "/dev/sda3";
-          type = types.nullOr types.string;
-          description = ''
-            Path of the device.
-          '';
+      options = {config, options, ...}: {
+
+        options = {
+          device = mkOption {
+            example = "/dev/sda3";
+            type = types.string;
+            description = ''
+              Path of the device.
+            '';
+          };
+
+          label = mkOption {
+            example = "swap";
+            type = types.string;
+            description = "
+              Label of the device.  Can be used instead of <varname>device</varname>.
+            ";
+          };
+
+          cipher = mkOption {
+            default = false;
+            example = true;
+            type = types.bool;
+            description = "
+              Cipher the swap device to protect swapped data.
+            ";
+          };
+
+          command = mkOption {
+            description = "
+              Command used to activate the swap device.
+            ";
+          };
         };
 
-        label = mkOption {
-          default = null;
-          example = "swap";
-          type = types.nullOr types.string;
-          description = "
-            Label of the device.  Can be used instead of <varname>device</varname>.
-          ";
+        config = {
+          device =
+            if options.label.isDefined then
+              "/dev/disk/by-label/${config.label}"
+            else
+              mkNotdef;
+
+          command = ''
+            if test -e "${config.device}"; then
+              ${if config.cipher then ''
+                # swap labels could be preserved by using --skip (PAGE_SIZE / key size)
+                # The current settings won't work on system with a PAGE_SIZE != 4096.
+                oldDevice="${config.device}"
+                device="crypt$(echo "$oldDevice" | sed -e 's,/,.,')"
+                ${cryptsetup}/sbin/cryptsetup --skip 16 -c blowfish -s 256 -d /dev/urandom create "$device" "$oldDevice"
+                ${utillinux}/sbin/swapon "/dev/mapper/$newDevice" || true
+              ''
+              else ''
+                device="${config.device}"
+                ${utillinux}/sbin/swapon "${config.device}" || true
+              ''}
+              swapDevices="$swapDevices $device"
+            fi
+          '';
         };
 
       };
@@ -72,12 +111,8 @@ in
         startOn = ["startup" "new-devices"];
 
         script =
-          ''        
-            swapDevices=${toString (map toPath config.swapDevices)}
-          
-            for device in $swapDevices; do
-                ${utillinux}/sbin/swapon "$device" || true
-            done
+          ''
+            ${toString (map (x: x.command) config.swapDevices)}
 
             # Remove swap devices not listed in swapDevices.
             for used in $(cat /proc/swaps | grep '^/' | sed 's/ .*//'); do
-- 
GitLab


From e70214c8532ae35999ba5c363d938b8974313b1c Mon Sep 17 00:00:00 2001
From: Nicolas Pierron <nicolas.b.pierron@gmail.com>
Date: Tue, 29 Dec 2009 10:04:54 +0000
Subject: [PATCH 2107/5331] Remove loop of new-device messages.  Add a shell
 script to watch new devices.

svn path=/nixos/trunk/; revision=19142
---
 modules/tasks/swraid.nix | 26 ++++++++++++++++++++++----
 1 file changed, 22 insertions(+), 4 deletions(-)

diff --git a/modules/tasks/swraid.nix b/modules/tasks/swraid.nix
index b9465822601..c51664d7e32 100644
--- a/modules/tasks/swraid.nix
+++ b/modules/tasks/swraid.nix
@@ -5,15 +5,28 @@
 let
 
   tempConf = "/var/run/mdadm.conf";
+  logFile = "/var/log/mdadmEvents.log";
   modprobe = config.system.sbin.modprobe;
   inherit (pkgs) mdadm;
 
+  mdadmEventHandler = pkgs.writeScript "mdadmEventHandler.sh" ''
+    #!/bin/sh
+
+    echo "$@" >> ${logFile}
+    case $1 in
+      (NewArray)
+        initctl emit -n new-devices
+        ;;
+      (*) ;;
+    esac
+  '';
+
 in
   
 {
 
   jobs.swraid =
-    { startOn = "started udev or new-devices";
+    { startOn = [ "startup" "new-devices" ];
       
       script =
         ''
@@ -30,11 +43,16 @@ in
       
           # Activate each device found.
           ${mdadm}/sbin/mdadm --assemble -c ${tempConf} --scan
-      
-          initctl emit -n new-devices
         '';
 
-      task = true;        
+      task = true;
     };
 
+  jobs.swraidEvents = {
+    name = "swraid-events";
+    description = "Watch mdadm events.";
+    startOn = [ "startup" ];
+    exec = "${mdadm}/sbin/mdadm --monitor --scan --program ${mdadmEventHandler}";
+  };
+
 }
-- 
GitLab


From 4cf78fdb7794e7d703b91a0adbf5e6335590d58c Mon Sep 17 00:00:00 2001
From: Nicolas Pierron <nicolas.b.pierron@gmail.com>
Date: Tue, 29 Dec 2009 14:10:05 +0000
Subject: [PATCH 2108/5331] * Use postStart instead of preStart. * Assemble
 devices only if there is a new entry. * Add 'new-raid-array' flag to assemble
 new arrays. * Emit new-devices flag to triggers the 'filesystems' task.

svn path=/nixos/trunk/; revision=19145
---
 modules/tasks/swraid.nix | 64 +++++++++++++++++++++++++---------------
 1 file changed, 41 insertions(+), 23 deletions(-)

diff --git a/modules/tasks/swraid.nix b/modules/tasks/swraid.nix
index c51664d7e32..a662f06c215 100644
--- a/modules/tasks/swraid.nix
+++ b/modules/tasks/swraid.nix
@@ -15,7 +15,7 @@ let
     echo "$@" >> ${logFile}
     case $1 in
       (NewArray)
-        initctl emit -n new-devices
+        initctl emit -n new-raid-array
         ;;
       (*) ;;
     esac
@@ -25,33 +25,51 @@ in
   
 {
 
-  jobs.swraid =
-    { startOn = [ "startup" "new-devices" ];
-      
-      script =
-        ''
-          # Load the necessary RAID personalities.
-          # !!! hm, doesn't the kernel load these automatically?
-          for mod in raid0 raid1 raid5; do
-              ${modprobe}/sbin/modprobe $mod || true
-          done
-      
-          # Scan /proc/partitions for RAID devices.
-          ${mdadm}/sbin/mdadm --examine --brief --scan -c partitions > ${tempConf}
-          
-          if ! test -s ${tempConf}; then exit 0; fi
-      
-          # Activate each device found.
-          ${mdadm}/sbin/mdadm --assemble -c ${tempConf} --scan
-        '';
-
-      task = true;
-    };
+  jobs.swraid = {
+    startOn = [ "new-raid-array" ];
+    description = "Assemble RAID arrays.";
+
+    script = ''
+      # Load the necessary RAID personalities.
+      # !!! hm, doesn't the kernel load these automatically?
+      for mod in raid0 raid1 raid5; do
+        ${modprobe}/sbin/modprobe $mod || true
+      done
+
+      # Save previous probe
+      mv ${tempConf} ${tempConf}.old
+
+      # Scan /proc/partitions for RAID devices.
+      ${mdadm}/sbin/mdadm --examine --brief --scan -c partitions > ${tempConf}
+
+      if ! diff ${tempConf} ${tempConf}.old > /dev/null; then
+        # Activate each device found.
+        ${mdadm}/sbin/mdadm --assemble -c ${tempConf} --scan
+
+        # Send notifications.
+        initctl emit -n new-devices
+      fi
+
+      # Remove previous configuration.
+      rm ${tempConf}.old
+    '';
+
+    task = true;
+  };
 
   jobs.swraidEvents = {
     name = "swraid-events";
     description = "Watch mdadm events.";
     startOn = [ "startup" ];
+
+    postStart = ''
+      echo > ${tempConf}
+
+      # Assemble early raid devices.
+      initctl emit -n new-raid-array
+    '';
+
+    # !!! Someone should ensure that this is indeed doing what the manual says.
     exec = "${mdadm}/sbin/mdadm --monitor --scan --program ${mdadmEventHandler}";
   };
 
-- 
GitLab


From df21f0f06d4e40f44ca9d96a97e758a9d71454c8 Mon Sep 17 00:00:00 2001
From: Sander van der Burg <s.vanderburg@tudelft.nl>
Date: Tue, 29 Dec 2009 21:23:22 +0000
Subject: [PATCH 2109/5331] Made a small fix because I kept receiving errors
 about: diff command not found. It also makes my system horribly slow.

svn path=/nixos/trunk/; revision=19148
---
 modules/tasks/swraid.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/tasks/swraid.nix b/modules/tasks/swraid.nix
index a662f06c215..dfdb9e9a34d 100644
--- a/modules/tasks/swraid.nix
+++ b/modules/tasks/swraid.nix
@@ -7,7 +7,7 @@ let
   tempConf = "/var/run/mdadm.conf";
   logFile = "/var/log/mdadmEvents.log";
   modprobe = config.system.sbin.modprobe;
-  inherit (pkgs) mdadm;
+  inherit (pkgs) mdadm diffutils;
 
   mdadmEventHandler = pkgs.writeScript "mdadmEventHandler.sh" ''
     #!/bin/sh
@@ -42,7 +42,7 @@ in
       # Scan /proc/partitions for RAID devices.
       ${mdadm}/sbin/mdadm --examine --brief --scan -c partitions > ${tempConf}
 
-      if ! diff ${tempConf} ${tempConf}.old > /dev/null; then
+      if ! ${diffutils}/bin/diff ${tempConf} ${tempConf}.old > /dev/null; then
         # Activate each device found.
         ${mdadm}/sbin/mdadm --assemble -c ${tempConf} --scan
 
-- 
GitLab


From 81d621b4f7d9636362cffff4f1ec591ec16cb202 Mon Sep 17 00:00:00 2001
From: Nicolas Pierron <nicolas.b.pierron@gmail.com>
Date: Thu, 31 Dec 2009 13:56:47 +0000
Subject: [PATCH 2110/5331] * Replace blowfish by AES, since recent CPU could
 have optimisation for it. * Miss-interpretation of the --skip option of
 cryptsetup.  Ciphered partition labels are not supported.  Labels are erased
 when doing mkswap on the ciphered partition. * Avoid doing swapon on devices
 which are already listed in /proc/swaps. * Remove no longer listed devices
 with only one swapoff command.

svn path=/nixos/trunk/; revision=19164
---
 modules/tasks/swap.nix | 51 +++++++++++++++++++++---------------------
 1 file changed, 25 insertions(+), 26 deletions(-)

diff --git a/modules/tasks/swap.nix b/modules/tasks/swap.nix
index af8cac45f82..066914a3e43 100644
--- a/modules/tasks/swap.nix
+++ b/modules/tasks/swap.nix
@@ -57,7 +57,8 @@ in
             example = true;
             type = types.bool;
             description = "
-              Cipher the swap device to protect swapped data.
+              Cipher the swap device to protect swapped data.  This option
+              does not work with labels.
             ";
           };
 
@@ -78,18 +79,24 @@ in
           command = ''
             if test -e "${config.device}"; then
               ${if config.cipher then ''
-                # swap labels could be preserved by using --skip (PAGE_SIZE / key size)
-                # The current settings won't work on system with a PAGE_SIZE != 4096.
-                oldDevice="${config.device}"
-                device="crypt$(echo "$oldDevice" | sed -e 's,/,.,')"
-                ${cryptsetup}/sbin/cryptsetup --skip 16 -c blowfish -s 256 -d /dev/urandom create "$device" "$oldDevice"
-                ${utillinux}/sbin/swapon "/dev/mapper/$newDevice" || true
-              ''
-              else ''
-                device="${config.device}"
-                ${utillinux}/sbin/swapon "${config.device}" || true
-              ''}
-              swapDevices="$swapDevices $device"
+                  plainDevice="${config.device}"
+                  name="crypt$(echo "$plainDevice" | sed -e 's,/,.,g')"
+                  device="/dev/mapper/$name"
+                  if ! test -e "$device"; then
+                    ${cryptsetup}/sbin/cryptsetup -c aes -s 128 -d /dev/urandom create "$name" "$plainDevice"
+                    ${utillinux}/sbin/mkswap -f "$device" || true
+                  fi
+                ''
+                else ''
+                  device="${config.device}"
+                ''
+              }
+              # Add new swap devices.
+              if echo $unused | grep -q "^$device\$"; then
+                unused="$(echo $unused | grep -v "^$device\$")"
+              else
+                ${utillinux}/sbin/swapon "$device" || true
+              fi
             fi
           '';
         };
@@ -99,7 +106,6 @@ in
     };
 
   };
-  
 
   ###### implementation
 
@@ -107,24 +113,17 @@ in
 
     jobs.swap =
       { task = true;
-        
+
         startOn = ["startup" "new-devices"];
 
         script =
           ''
+            unused="$(sed '1d; s/ .*//' /proc/swaps)"
+
             ${toString (map (x: x.command) config.swapDevices)}
 
-            # Remove swap devices not listed in swapDevices.
-            for used in $(cat /proc/swaps | grep '^/' | sed 's/ .*//'); do
-                found=
-                for device in $swapDevices; do
-                    device=$(readlink -f $device)
-                    if test "$used" = "$device"; then found=1; fi
-                done
-                if test -z "$found"; then
-                    ${utillinux}/sbin/swapoff "$used" || true
-                fi
-            done
+            # Remove remaining swap devices.
+            test -n "$unused" && ${utillinux}/sbin/swapoff $unused || true
           '';
       };
 
-- 
GitLab


From 64c75274e13253c721d3b3e175f8ede6f804a305 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 1 Jan 2010 16:26:01 +0000
Subject: [PATCH 2111/5331] * Use Linux 2.6.32 on the installation CD.

svn path=/nixos/trunk/; revision=19166
---
 modules/installer/cd-dvd/installation-cd-base.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/installer/cd-dvd/installation-cd-base.nix b/modules/installer/cd-dvd/installation-cd-base.nix
index 74a2236fb6d..55b367da968 100644
--- a/modules/installer/cd-dvd/installation-cd-base.nix
+++ b/modules/installer/cd-dvd/installation-cd-base.nix
@@ -84,8 +84,8 @@ in
     
   isoImage.volumeID = "NIXOS_INSTALL_CD_${config.system.nixosVersion}";
   
-  # Use Linux 2.6.29.
-  boot.kernelPackages = pkgs.kernelPackages_2_6_29;
+  # Use Linux 2.6.32.
+  boot.kernelPackages = pkgs.kernelPackages_2_6_32;
 
   # Show the manual.
   services.nixosManual.showManual = true;
-- 
GitLab


From d2901e979db48c6bba1b0847d319d0995af0692c Mon Sep 17 00:00:00 2001
From: Nicolas Pierron <nicolas.b.pierron@gmail.com>
Date: Sun, 3 Jan 2010 11:59:08 +0000
Subject: [PATCH 2112/5331] * Add support for pam_usb.

svn path=/nixos/trunk/; revision=19185
---
 modules/module-list.nix      |  1 +
 modules/security/pam.nix     |  7 +++++-
 modules/security/pam_usb.nix | 41 ++++++++++++++++++++++++++++++++++++
 3 files changed, 48 insertions(+), 1 deletion(-)
 create mode 100644 modules/security/pam_usb.nix

diff --git a/modules/module-list.nix b/modules/module-list.nix
index 702822f506a..0f8b47eb764 100644
--- a/modules/module-list.nix
+++ b/modules/module-list.nix
@@ -33,6 +33,7 @@
   ./rename.nix
   ./security/consolekit.nix
   ./security/pam.nix
+  ./security/pam_usb.nix
   ./security/policykit.nix
   #./security/polkit.nix # Currently disabled; using the old policykit.
   ./security/setuid-wrappers.nix
diff --git a/modules/security/pam.nix b/modules/security/pam.nix
index 904cf438bff..d693255a55b 100644
--- a/modules/security/pam.nix
+++ b/modules/security/pam.nix
@@ -7,7 +7,7 @@ with pkgs.lib;
 
 let
 
-  inherit (pkgs) pam_unix2 pam_ldap;
+  inherit (pkgs) pam_unix2 pam_usb pam_ldap;
 
   otherService = pkgs.writeText "other.pam"
     ''
@@ -26,6 +26,9 @@ let
     , # If set, root doesn't need to authenticate (e.g. for the "chsh"
       # service).
       rootOK ? false
+    , # If set, user listed in /etc/pamusb.conf are able to log in with
+      # the associated usb key.
+      usbAuth ? config.security.pam.usb.enable
     , # If set, use ConsoleKit's PAM connector module to claim
       # ownership of audio devices etc.
       ownDevices ? false
@@ -55,6 +58,8 @@ let
           # Authentication management.
           ${optionalString rootOK
               "auth sufficient pam_rootok.so"}
+          ${optionalString usbAuth
+              "auth sufficient ${pam_usb}/lib/security/pam_usb.so"}
           ${optionalString config.users.ldap.enable
               "auth sufficient ${pam_ldap}/lib/security/pam_ldap.so"}
           auth sufficient ${pam_unix2}/lib/security/pam_unix2.so ${
diff --git a/modules/security/pam_usb.nix b/modules/security/pam_usb.nix
new file mode 100644
index 00000000000..1c2a6a05f26
--- /dev/null
+++ b/modules/security/pam_usb.nix
@@ -0,0 +1,41 @@
+{config, pkgs, ...}:
+
+with pkgs.lib;
+
+let
+
+  inherit (pkgs) pam_usb;
+
+  cfg = config.security.pam.usb;
+
+  anyUsbAuth = any (attrByPath ["usbAuth"] false) config.security.pam.services;
+
+in
+
+{
+  options = {
+
+    security.pam.usb = {
+      enable = mkOption {
+        default = false;
+        description = ''
+          Enable USB login for all login system unless the service disabled
+          it.  For more information, visit <link
+          xlink:href="http://pamusb.org/doc/quickstart#setting_up" />.
+        '';
+      };
+
+    };
+
+  };
+
+  config = mkIf (cfg.enable || anyUsbAuth) {
+
+    # pmount need to have a set-uid bit to make pam_usb works in user
+    # environment. (like su, sudo)
+
+    security.setuidPrograms = [ "pmount" "pumount" ];
+    environment.systemPackages = [ pkgs.pmount ];
+
+  };
+}
-- 
GitLab


From 43780181640a147316ad2ec505b3f7d30fab62ef Mon Sep 17 00:00:00 2001
From: Marc Weber <marco-oweber@gmx.de>
Date: Sun, 3 Jan 2010 13:36:23 +0000
Subject: [PATCH 2113/5331] nixos-rebuild: allow passing --fallback replacing
 if .. fi by case .. esac

svn path=/nixos/trunk/; revision=19186
---
 modules/installer/tools/nixos-rebuild.sh | 35 +++++++++++++++---------
 1 file changed, 22 insertions(+), 13 deletions(-)

diff --git a/modules/installer/tools/nixos-rebuild.sh b/modules/installer/tools/nixos-rebuild.sh
index bb69c372aa4..d799ee6037d 100644
--- a/modules/installer/tools/nixos-rebuild.sh
+++ b/modules/installer/tools/nixos-rebuild.sh
@@ -59,33 +59,42 @@ rollback=
 
 while test "$#" -gt 0; do
     i="$1"; shift 1
-    if test "$i" = "--help"; then
+    case "$i" in
+      --help)
         showSyntax
-    elif test "$i" = switch -o "$i" = boot -o "$i" = test -o "$i" = build \
-        -o "$i" = dry-run -o "$i" = build-vm; then
+      ;;
+      switch|boot|test|build|dry-run|build-vm)
         action="$i"
-    elif test "$i" = --install-grub; then
+      ;;
+      --install-grub)
         export NIXOS_INSTALL_GRUB=1
-    elif test "$i" = --no-pull; then
+      ;;
+      --no-pull)
         pullManifest=
-    elif test "$i" = --no-build-nix; then
+      ;;
+      --no-build-nix)
         buildNix=
-    elif test "$i" = --rollback; then
+      ;;
+      --rollback)
         rollback=1
-    elif test "$i" = --show-trace -o "$i" = --no-build-hook -o "$i" = --keep-failed -o "$i" = -K \
-        -o "$i" = --keep-going -o "$i" = -k -o "$i" = --verbose -o "$i" = -v; then
+      ;;
+      --show-trace|--no-build-hook|--keep-failed|-K|--keep-going|-k|--verbose|-v|--fallback)
         extraBuildFlags="$extraBuildFlags $i"
-    elif test "$i" = --max-jobs -o "$i" = -j; then
+      ;;
+      --max-jobs|-j)
         j="$1"; shift 1
         extraBuildFlags="$extraBuildFlags $i $j"
-    elif test "$i" = --fast; then
+      ;;
+      --fast)
         buildNix=
         pullManifest=
         extraBuildFlags="$extraBuildFlags --show-trace"
-    else
+      ;;
+      *)
         echo "$0: unknown option \`$i'"
         exit 1
-    fi
+      ;;
+    esac
 done
 
 if test -z "$action"; then showSyntax; fi
-- 
GitLab


From 21216b046190245b5bd3b132663d98eb0b375c96 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sun, 3 Jan 2010 16:29:17 +0000
Subject: [PATCH 2114/5331] * Move some kernel modules around.

svn path=/nixos/trunk/; revision=19187
---
 .../installer/cd-dvd/installation-cd-base.nix | 24 +++++++------------
 modules/installer/cd-dvd/iso-image.nix        |  4 +++-
 2 files changed, 11 insertions(+), 17 deletions(-)

diff --git a/modules/installer/cd-dvd/installation-cd-base.nix b/modules/installer/cd-dvd/installation-cd-base.nix
index 55b367da968..836f8c45f89 100644
--- a/modules/installer/cd-dvd/installation-cd-base.nix
+++ b/modules/installer/cd-dvd/installation-cd-base.nix
@@ -125,25 +125,20 @@ in
       "sata_uli" "sata_via" "sata_vsc"
 
       "pata_ali" "pata_amd" "pata_artop" "pata_atiixp"
-      "pata_cs5520" "pata_cs5530" /* "pata_cs5535" */ "pata_efar"
+      "pata_cs5520" "pata_cs5530" "pata_cs5535" "pata_efar"
       "pata_hpt366" "pata_hpt37x" "pata_hpt3x2n" "pata_hpt3x3"
       "pata_it8213" "pata_it821x" "pata_jmicron" "pata_marvell"
       "pata_mpiix" "pata_netcell" "pata_ns87410" "pata_oldpiix"
-      "pata_pcmcia" "pata_pdc2027x" /* "pata_qdi" */ "pata_rz1000"
+      "pata_pcmcia" "pata_pdc2027x" "pata_qdi" "pata_rz1000"
       "pata_sc1200" "pata_serverworks" "pata_sil680" "pata_sis"
       "pata_sl82c105" "pata_triflex" "pata_via"
-      # "pata_winbond" <-- causes timeouts in sd_mod
+      "pata_winbond"
 
       # SCSI support (incomplete).
       "3w-9xxx" "3w-xxxx" "aic79xx" "aic7xxx" "arcmsr" 
 
       # USB support, especially for booting from USB CD-ROM
-      # drives.  Also include USB keyboard support for when
-      # something goes wrong in stage 1.
-      "ehci_hcd"
-      "ohci_hcd"
-      "uhci_hcd"
-      "usbhid"
+      # drives.
       "usb_storage"
 
       # Firewire support.  Not tested.
@@ -152,18 +147,15 @@ in
       # Virtio (QEMU, KVM etc.) support.
       "virtio_net" "virtio_pci" "virtio_blk" "virtio_balloon"
 
-      # Wait for SCSI devices to appear.
-      "scsi_wait_scan"
-
       # Add vfat to enable people to copy the contents of the CD to a
       # bootable USB stick.
       "vfat"
-
-      # And of course we need to be able to mount the CD.
-      "iso9660"
     ];
 
-  boot.initrd.kernelModules = [ "loop" ];
+  boot.initrd.kernelModules =
+    [ # Wait for SCSI devices to appear.
+      "scsi_wait_scan"
+    ];
 
   # nixos-install will do a pull from this channel to speed up the
   # installation.
diff --git a/modules/installer/cd-dvd/iso-image.nix b/modules/installer/cd-dvd/iso-image.nix
index e711a582334..4fa7db9298b 100644
--- a/modules/installer/cd-dvd/iso-image.nix
+++ b/modules/installer/cd-dvd/iso-image.nix
@@ -128,8 +128,10 @@ in
       (! config.boot.kernelPackages.kernel.features ? aufs) 
       config.boot.kernelPackages.aufs;
       
-  boot.initrd.availableKernelModules = [ "aufs" "squashfs" ];
+  boot.initrd.availableKernelModules = [ "aufs" "squashfs" "iso9660" ];
 
+  boot.initrd.kernelModules = [ "loop" ];
+  
   # Tell stage 1 of the boot to mount a tmpfs on top of the CD using
   # AUFS.  !!! It would be nicer to make the stage 1 init pluggable
   # and move that bit of code here.
-- 
GitLab


From 790368e31578bc4c1539c2acdee892839fdd30ff Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sun, 3 Jan 2010 17:13:30 +0000
Subject: [PATCH 2115/5331] * Removed installation-cd-minimal-fresh-kernel.nix
 since the kernel in   installation-cd-minimal.nix is now 2.6.32.  Added most
 of its extra   tools to installation-cd-base.nix. * Put memtest86 at the
 bottom of the GRUB menu.  (There is currently   no good way to do this other
 than to change the module inclusion   order.)

svn path=/nixos/trunk/; revision=19188
---
 .../installer/cd-dvd/installation-cd-base.nix | 41 ++++++++++++++-
 .../installation-cd-minimal-fresh-kernel.nix  | 52 -------------------
 .../cd-dvd/installation-cd-minimal.nix        |  6 ---
 modules/installer/cd-dvd/iso-image.nix        | 11 ++++
 release.nix                                   |  6 ---
 5 files changed, 50 insertions(+), 66 deletions(-)
 delete mode 100644 modules/installer/cd-dvd/installation-cd-minimal-fresh-kernel.nix

diff --git a/modules/installer/cd-dvd/installation-cd-base.nix b/modules/installer/cd-dvd/installation-cd-base.nix
index 836f8c45f89..07d63c76fe1 100644
--- a/modules/installer/cd-dvd/installation-cd-base.nix
+++ b/modules/installer/cd-dvd/installation-cd-base.nix
@@ -73,8 +73,8 @@ in
 {
   require =
     [ options
-      ./iso-image.nix
       ./memtest.nix
+      ./iso-image.nix
       ../../hardware/network/intel-3945abg.nix
       ../../hardware/network/rt73.nix
     ];
@@ -107,9 +107,40 @@ in
       pkgs.w3m # needed for the manual anyway
       pkgs.testdisk # useful for repairing boot problems
       pkgs.mssys # for writing Microsoft boot sectors / MBRs
-      pkgs.ntfsprogs # for resizing NTFS partitions
       pkgs.parted
+      pkgs.ddrescue
+      pkgs.ccrypt
+      pkgs.cryptsetup # needed for dm-crypt volumes
+
+      # Some networking tools.
       pkgs.sshfsFuse
+      pkgs.socat
+      pkgs.screen
+      pkgs.wpa_supplicant # !!! should use the wpa module
+
+      # Hardware-related tools.
+      pkgs.sdparm
+      pkgs.hdparm
+      pkgs.dmraid
+
+      # Tools to create / manipulate filesystems.
+      pkgs.ntfsprogs # for resizing NTFS partitions
+      pkgs.btrfsProgs
+      pkgs.xfsprogs
+      pkgs.jfsutils
+      pkgs.jfsrec
+
+      # Some compression/archiver tools.
+      pkgs.unrar
+      pkgs.unzip
+      pkgs.zip
+      pkgs.xz
+      pkgs.dar # disk archiver
+      
+      # Some editors.
+      pkgs.nvi
+      pkgs.bvi # binary editor
+      pkgs.joe
     ];
 
   # The initrd has to contain any module that might be necessary for
@@ -204,4 +235,10 @@ in
   # To speed up installation a little bit, include the complete stdenv
   # in the Nix store on the CD.
   isoImage.storeContents = [pkgs.stdenv];
+
+  # Allow sshd to be started manually through "start sshd".  It should
+  # not be started by default on the installation CD because the
+  # default root password is empty.
+  services.sshd.enable = true;
+  jobs.sshd.startOn = pkgs.lib.mkOverride 50 {} "";
 }
diff --git a/modules/installer/cd-dvd/installation-cd-minimal-fresh-kernel.nix b/modules/installer/cd-dvd/installation-cd-minimal-fresh-kernel.nix
deleted file mode 100644
index 407fc6929db..00000000000
--- a/modules/installer/cd-dvd/installation-cd-minimal-fresh-kernel.nix
+++ /dev/null
@@ -1,52 +0,0 @@
-# This module defines a small NixOS installation CD.  It does not
-# contain any graphical stuff.
-
-{config, pkgs, ...}:
-
-rec {
-  require = [./installation-cd-base.nix];
-
-  installer.configModule = "./nixos/modules/installer/cd-dvd/installation-cd-minimal-fresh-kernel.nix";
-
-  # Allow sshd to be started manually through "start sshd".  It should
-  # not be started by default on the installation CD because the
-  # default root password is empty.
-  services.sshd.enable = true;
-  jobs.sshd.startOn = pkgs.lib.mkOverride 50 {} "";
-
-  # Don't include X libraries.
-  environment.noXlibs = true;
-
-  # Most users will download it anyway
-  security.sudo.enable = true;
-
-  # Use Linux 2.6.31-zen (with aufs2).
-  boot.kernelPackages = pkgs.kernelPackages_2_6_31_zen;
-
-  # We need squashfs and aufs. Zen Linux Kernel contains kernel side.
-  boot.initrd.extraUtilsCommands = ''
-    cp ${config.boot.kernelPackages.aufs2Utils}/sbin/mount.aufs $out/bin
-    cp ${config.boot.kernelPackages.aufs2Utils}/sbin/umount.aufs $out/bin
-    mkdir -p $out/var/run/current-system/sw
-    ln -s /bin "$out/var/run/current-system/sw/sbin"
-  '';
-
-  boot.initrd.kernelModules = [
-    "iso9660" "loop" "squashfs"
-    ];
-  boot.initrd.allowMissing = true;
-
-  environment.systemPackages = with pkgs; [
-    klibc dmraid cryptsetup ccrypt 
-    utillinuxCurses ddrescue testdisk
-    pciutils sdparm hdparm usbutils
-    btrfsProgs xfsprogs jfsutils jfsrec
-    wpa_supplicant iproute 
-    manpages openssh openssl ncat socat
-    fuse ntfs3g gnupg gnupg2
-    patch which diffutils gcc binutils bc file
-    gnused gnumake ncurses gnugrep findutils ed
-    screen bvi joe nvi dar xz lsof
-    unrar unzip zip lzma cpio 
-    ];
-}
diff --git a/modules/installer/cd-dvd/installation-cd-minimal.nix b/modules/installer/cd-dvd/installation-cd-minimal.nix
index dc7188d8dc2..ae520e64101 100644
--- a/modules/installer/cd-dvd/installation-cd-minimal.nix
+++ b/modules/installer/cd-dvd/installation-cd-minimal.nix
@@ -8,12 +8,6 @@
 
   installer.configModule = "./nixos/modules/installer/cd-dvd/installation-cd-minimal.nix";
 
-  # Allow sshd to be started manually through "start sshd".  It should
-  # not be started by default on the installation CD because the
-  # default root password is empty.
-  services.sshd.enable = true;
-  jobs.sshd.startOn = pkgs.lib.mkOverride 50 {} "";
-
   # Don't include X libraries.
   services.sshd.forwardX11 = false;
   services.dbus.enable = false; # depends on libX11
diff --git a/modules/installer/cd-dvd/iso-image.nix b/modules/installer/cd-dvd/iso-image.nix
index 4fa7db9298b..7e624244048 100644
--- a/modules/installer/cd-dvd/iso-image.nix
+++ b/modules/installer/cd-dvd/iso-image.nix
@@ -137,6 +137,17 @@ in
   # and move that bit of code here.
   boot.isLiveCD = true;
 
+  # AUFS 2 support (currently unused).
+  /*
+  boot.initrd.extraUtilsCommands =
+    ''
+      cp ${config.boot.kernelPackages.aufs2Utils}/sbin/mount.aufs $out/bin
+      cp ${config.boot.kernelPackages.aufs2Utils}/sbin/umount.aufs $out/bin
+      mkdir -p $out/var/run/current-system/sw
+      ln -s /bin "$out/var/run/current-system/sw/sbin"
+    '';
+  */
+
   # Closures to be copied to the Nix store on the CD, namely the init
   # script and the top-level system configuration directory.
   isoImage.storeContents =
diff --git a/release.nix b/release.nix
index 412e660857a..e12989fa57e 100644
--- a/release.nix
+++ b/release.nix
@@ -95,12 +95,6 @@ let
       description = "minimal";
     };
 
-    iso_minimal_fresh_kernel = makeIso {
-      module = ./modules/installer/cd-dvd/installation-cd-minimal-fresh-kernel.nix;
-      description = "minimal with 2.6.31-zen-branch";
-      maintainers = ["raskin"];
-    };
-
     /*    
     iso_rescue = makeIso {
       module = ./modules/installer/cd-dvd/installation-cd-rescue.nix;
-- 
GitLab


From 73c5a61a68b59c02de80360019051ec27e4b1855 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sun, 3 Jan 2010 17:57:38 +0000
Subject: [PATCH 2116/5331] * Fix the Subversion test.

svn path=/nixos/trunk/; revision=19191
---
 tests/subversion.nix | 24 ++++++------------------
 1 file changed, 6 insertions(+), 18 deletions(-)

diff --git a/tests/subversion.nix b/tests/subversion.nix
index c49d74f5975..6f3fe09ccb9 100644
--- a/tests/subversion.nix
+++ b/tests/subversion.nix
@@ -9,10 +9,11 @@ with import ../lib/build-vms.nix { inherit nixos nixpkgs services system; };
 let
 
   # Build some packages with coverage instrumentation.
-  overrides = pkgs:  
+  overrides = pkgs:
+    with pkgs.stdenvAdapters;
     let
       do = pkg: pkg.override (args: {
-        stdenv = pkgs.addCoverageInstrumentation args.stdenv;
+        stdenv = addCoverageInstrumentation args.stdenv;
       });
     in
       rec {
@@ -24,22 +25,9 @@ let
 
         # To build the kernel with coverage instrumentation, we need a
         # special patch to make coverage data available under /proc.
-        kernel_2_6_28 = pkgs.kernel_2_6_28.override (orig: {
-          stdenv = pkgs.cleanupBuildTree (pkgs.keepBuildTree orig.stdenv);
-          kernelPatches = orig.kernelPatches ++ pkgs.lib.singleton
-            { name = "gcov";
-              patch = pkgs.fetchurl {
-                url = http://buildfarm.st.ewi.tudelft.nl/~eelco/dist/linux-2.6.28-gcov.patch;
-                sha256 = "0ck9misa3pgh3vzyb7714ibf7ix7piyg5dvfa9r42v15scjqiyny";
-              };
-              extraConfig =
-                ''
-                  CONFIG_GCOV_PROFILE=y
-                  CONFIG_GCOV_ALL=y
-                  CONFIG_GCOV_PROC=m
-                  CONFIG_GCOV_HAMMER=n
-                '';
-            };
+        kernel = pkgs.kernel.override (orig: {
+          stdenv = cleanupBuildTree (keepBuildTree orig.stdenv);
+          kernelPatches = orig.kernelPatches ++ pkgs.lib.singleton pkgs.kernelPatches.gcov_2_6_28;
         });
       };
 
-- 
GitLab


From 7707ceaddf24d637c192833904ecc965372b5d9e Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sun, 3 Jan 2010 23:34:44 +0000
Subject: [PATCH 2117/5331] * The test doesn't work with the default bit depth.

svn path=/nixos/trunk/; revision=19194
---
 tests/quake3.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tests/quake3.nix b/tests/quake3.nix
index 4ee6d63619e..b08e679e1e1 100644
--- a/tests/quake3.nix
+++ b/tests/quake3.nix
@@ -13,6 +13,7 @@ rec {
 
     { services.xserver.enable = true;
       services.xserver.driSupport = true;
+      services.xserver.defaultDepth = pkgs.lib.mkOverride 0 {} 16;
       environment.systemPackages = [ pkgs.scrot pkgs.icewm pkgs.quake3demo ];
     };
 
-- 
GitLab


From 13878cb78dc0632043eb89c5ba3193160caaf311 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 4 Jan 2010 09:51:57 +0000
Subject: [PATCH 2118/5331] * Panic on out-of-memory.

svn path=/nixos/trunk/; revision=19200
---
 modules/testing/test-instrumentation.nix | 8 ++++++++
 modules/virtualisation/qemu-vm.nix       | 7 +++++--
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/modules/testing/test-instrumentation.nix b/modules/testing/test-instrumentation.nix
index a573d2b9f90..75133b72a22 100644
--- a/modules/testing/test-instrumentation.nix
+++ b/modules/testing/test-instrumentation.nix
@@ -24,6 +24,14 @@ with pkgs.lib;
   
     boot.postBootCommands =
       ''
+        # Panic on out-of-memory conditions rather than letting the
+        # OOM killer randomly get rid of processes, since this leads
+        # to failures that are hard to diagnose.
+        echo 2 > /proc/sys/vm/panic_on_oom
+
+        # Coverage data is written into /tmp/coverage-data.  Symlink
+        # it to the host filesystem so that we don't need to copy it
+        # on shutdown.
         ( eval $(cat /proc/cmdline)
           mkdir /hostfs/$hostTmpDir/coverage-data
           ln -s /hostfs/$hostTmpDir/coverage-data /tmp/coverage-data
diff --git a/modules/virtualisation/qemu-vm.nix b/modules/virtualisation/qemu-vm.nix
index 1952c15638b..3455d8f9244 100644
--- a/modules/virtualisation/qemu-vm.nix
+++ b/modules/virtualisation/qemu-vm.nix
@@ -16,6 +16,7 @@ let
   vmName = config.networking.hostName;
 
   options = {
+  
     virtualisation.memorySize = 
       mkOption {
         default = 384;
@@ -24,6 +25,7 @@ let
             Memory size (M) of virtual machine.
           '';
       };
+      
     virtualisation.diskImage =
       mkOption {
         default = "./${vmName}.qcow2";
@@ -34,6 +36,7 @@ let
             exist.
           '';
       };
+      
     virtualisation.graphics =
       mkOption {
         default = true;
@@ -48,8 +51,8 @@ let
 
   cfg = config.virtualisation;
 
-  qemuGraphics = if (cfg.graphics) then "" else "-nographic";
-  kernelConsole = if (cfg.graphics) then "" else "console=ttyS0";
+  qemuGraphics = if cfg.graphics then "" else "-nographic";
+  kernelConsole = if cfg.graphics then "" else "console=ttyS0";
   ttys = [ "tty1" "tty2" "tty3" "tty4" "tty5" "tty6" ];
 
   # Shell script to start the VM.
-- 
GitLab


From 9aa0a336bc89e2f69495e1a4f6aab3866200368e Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 4 Jan 2010 13:22:43 +0000
Subject: [PATCH 2119/5331] * Updated the coverage analysis handling for Linux
 2.6.32.  Gcov is   now merged in the kernel, and the gcda files are exported
 through   debugfs in /sys/kernel/debug/gcov.

svn path=/nixos/trunk/; revision=19207
---
 lib/test-driver/test-driver.pl           | 13 +++++--------
 modules/testing/test-instrumentation.nix |  4 ++++
 tests/subversion.nix                     |  6 +++++-
 3 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/lib/test-driver/test-driver.pl b/lib/test-driver/test-driver.pl
index 739753baeb1..88bce47b23f 100644
--- a/lib/test-driver/test-driver.pl
+++ b/lib/test-driver/test-driver.pl
@@ -26,7 +26,9 @@ sub runTests {
     # Copy the kernel coverage data for each machine, if the kernel
     # has been compiled with coverage instrumentation.
     foreach my $vm (values %vms) {
-        my ($status, $out) = $vm->execute("test -e /proc/gcov");
+        my $gcovDir = "/sys/kernel/debug/gcov";
+
+        my ($status, $out) = $vm->execute("test -e $gcovDir");
         next if $status != 0;
 
         # Figure out where to put the *.gcda files so that the report
@@ -35,13 +37,8 @@ sub runTests {
         chomp $kernelDir;
         my $coverageDir = "/hostfs" . $vm->stateDir() . "/coverage-data/$kernelDir";
 
-        # Copy all the *.gcda files.  The ones under
-        # /proc/gcov/module/nix/store are the kernel modules in the
-        # initrd to which we have applied nuke-refs in
-        # makeModuleClosure.  This confuses the gcov module a bit.
-        $vm->execute("for i in \$(cd /proc/gcov && find -name module -prune -o -name '*.gcda'); do echo \$i; mkdir -p $coverageDir/\$(dirname \$i); cp -v /proc/gcov/\$i $coverageDir/\$i; done");
-
-        $vm->execute("for i in \$(cd /proc/gcov/module/nix/store/*/.build/* && find -name module -prune -o -name '*.gcda'); do mkdir -p $coverageDir/\$(dirname \$i); cp /proc/gcov/module/nix/store/*/.build/*/\$i $coverageDir/\$i; done");
+        # Copy all the *.gcda files.
+        $vm->execute("for d in $gcovDir/nix/store/*/.build/linux-*; do for i in \$(cd \$d && find -name '*.gcda'); do echo \$i; mkdir -p $coverageDir/\$(dirname \$i); cp -v \$d/\$i $coverageDir/\$i; done; done");
     }
 }
 
diff --git a/modules/testing/test-instrumentation.nix b/modules/testing/test-instrumentation.nix
index 75133b72a22..4c6b1a54afd 100644
--- a/modules/testing/test-instrumentation.nix
+++ b/modules/testing/test-instrumentation.nix
@@ -36,6 +36,10 @@ with pkgs.lib;
           mkdir /hostfs/$hostTmpDir/coverage-data
           ln -s /hostfs/$hostTmpDir/coverage-data /tmp/coverage-data
         )
+
+        # Mount debugfs to gain access to the kernel coverage data (if
+        # available).
+        mount -t debugfs none /sys/kernel/debug || true
       '';
 
     # If the kernel has been built with coverage instrumentation, make
diff --git a/tests/subversion.nix b/tests/subversion.nix
index 6f3fe09ccb9..43eba8e1659 100644
--- a/tests/subversion.nix
+++ b/tests/subversion.nix
@@ -27,7 +27,11 @@ let
         # special patch to make coverage data available under /proc.
         kernel = pkgs.kernel.override (orig: {
           stdenv = cleanupBuildTree (keepBuildTree orig.stdenv);
-          kernelPatches = orig.kernelPatches ++ pkgs.lib.singleton pkgs.kernelPatches.gcov_2_6_28;
+          extraConfig =
+            ''
+              GCOV_KERNEL y
+              GCOV_PROFILE_ALL y
+            '';
         });
       };
 
-- 
GitLab


From 0ecac5a6f9c490e3d3757bae0a52cdc4e8bfcd66 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 4 Jan 2010 16:30:26 +0000
Subject: [PATCH 2120/5331] * Attach stdin to /dev/null, otherwise qemu grabs
 the terminal   (unpleasant for interactive testing of the test driver).

svn path=/nixos/trunk/; revision=19209
---
 lib/test-driver/Machine.pm | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/lib/test-driver/Machine.pm b/lib/test-driver/Machine.pm
index 3d145cc32ab..df1ace15453 100644
--- a/lib/test-driver/Machine.pm
+++ b/lib/test-driver/Machine.pm
@@ -70,6 +70,8 @@ sub start {
         open LOG, "| sed --unbuffered 's|^|$name console: |'" or die;
         dup2(fileno(LOG), fileno(STDOUT));
         dup2(fileno(LOG), fileno(STDERR));
+        open NUL, "</dev/null" or die;
+        dup2(fileno(NUL), fileno(STDIN));
         $ENV{TMPDIR} = $self->{stateDir};
         $ENV{QEMU_OPTS} = "-nographic -no-reboot -redir tcp:65535::514 -net nic,vlan=1 -net socket,vlan=1,mcast=$mcastAddr";
         $ENV{QEMU_KERNEL_PARAMS} = "console=ttyS0 panic=1 hostTmpDir=$ENV{TMPDIR}";
-- 
GitLab


From 5730c27aedb5ecf957a6125b130a43107a68b61d Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 4 Jan 2010 16:30:54 +0000
Subject: [PATCH 2121/5331] * For debugging, if $tests is not set, read
 commands from stdin.

svn path=/nixos/trunk/; revision=19210
---
 lib/test-driver/test-driver.pl | 11 +++++++++--
 tests/kde4.nix                 |  2 +-
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/lib/test-driver/test-driver.pl b/lib/test-driver/test-driver.pl
index 88bce47b23f..10efcbb690c 100644
--- a/lib/test-driver/test-driver.pl
+++ b/lib/test-driver/test-driver.pl
@@ -20,8 +20,15 @@ sub startAll {
 
 
 sub runTests {
-    eval "$context $ENV{tests}";
-    die $@ if $@;
+    if (defined $ENV{tests}) {
+        eval "$context $ENV{tests}";
+        die $@ if $@;
+    } else {
+        while (<STDIN>) {
+            eval "$context $_\n";
+            warn $@ if $@;
+        }
+    }
 
     # Copy the kernel coverage data for each machine, if the kernel
     # has been compiled with coverage instrumentation.
diff --git a/tests/kde4.nix b/tests/kde4.nix
index 3dc5e35a1c5..33ef1e006fd 100644
--- a/tests/kde4.nix
+++ b/tests/kde4.nix
@@ -62,7 +62,7 @@ rec {
 
       sleep 10;
       
-      print STDERR $client->execute("DISPLAY=:0.0 scrot /hostfs/$ENV{out}/screen.png");
+      print STDERR $client->mustSucceed("DISPLAY=:0.0 scrot /hostfs/$ENV{out}/screen.png");
     '';
   
 }
-- 
GitLab


From 170331be30ce02b37746d10b5fdcf307cc660bfb Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 4 Jan 2010 18:04:57 +0000
Subject: [PATCH 2122/5331] * Don't use /hostfs to signal the test driver that
 a VM is up, but   write some magic string to ttyS0.  This removes the
 dependency on   having a CIFS mount. * Use a thread to process the
 stdout/stderr of each QEMU instance. * Add a kernel command line parameter
 "stage1panic" to tell stage 1 to   panic if an error occurs.  This is faster
 than waiting until   connect() times out.

svn path=/nixos/trunk/; revision=19212
---
 lib/test-driver/Machine.pm               | 39 +++++++++++++++++-------
 modules/system/boot/stage-1-init.sh      |  7 ++++-
 modules/testing/test-instrumentation.nix |  9 ++++--
 3 files changed, 40 insertions(+), 15 deletions(-)

diff --git a/lib/test-driver/Machine.pm b/lib/test-driver/Machine.pm
index df1ace15453..85ef80f0d37 100644
--- a/lib/test-driver/Machine.pm
+++ b/lib/test-driver/Machine.pm
@@ -1,9 +1,12 @@
 package Machine;
 
 use strict;
+use threads;
+use Thread::Queue;
 use Socket;
 use IO::Handle;
 use POSIX qw(dup2);
+use FileHandle;
 
 
 # Stuff our PID in the multicast address/port to prevent collissions
@@ -26,6 +29,7 @@ sub new {
         booted => 0,
         pid => 0,
         connected => 0,
+        connectedQueue => Thread::Queue->new(),
         socket => undef,
         stateDir => "$tmpDir/$name",
     };
@@ -62,14 +66,15 @@ sub start {
 
     $self->log("starting vm");
 
+    my ($read, $write) = FileHandle::pipe;
+
     my $pid = fork();
     die if $pid == -1;
 
     if ($pid == 0) {
-        my $name = $self->{name};
-        open LOG, "| sed --unbuffered 's|^|$name console: |'" or die;
-        dup2(fileno(LOG), fileno(STDOUT));
-        dup2(fileno(LOG), fileno(STDERR));
+        close $read;
+        dup2(fileno($write), fileno(STDOUT));
+        dup2(fileno($write), fileno(STDERR));
         open NUL, "</dev/null" or die;
         dup2(fileno(NUL), fileno(STDIN));
         $ENV{TMPDIR} = $self->{stateDir};
@@ -79,7 +84,22 @@ sub start {
         exec $self->{script};
         die;
     }
-    
+
+    close $write;
+
+    threads->create(\&processQemuOutput)->detach;
+
+    sub processQemuOutput {
+        $/ = "\r\n";
+        while (<$read>) {
+            chomp;
+            print STDERR $self->name, "# $_\n";
+            $self->{connectedQueue}->enqueue(1) if $_ eq "===UP===";
+        }
+        # If the child dies, wake up connect().
+        $self->{connectedQueue}->enqueue(1);
+    }
+
     $self->log("vm running as pid $pid");
     $self->{pid} = $pid;
     $self->{booted} = 1;
@@ -92,12 +112,9 @@ sub connect {
 
     $self->start;
 
-    my $try = 0;
-    while (1) {
-        last if -e ($self->{stateDir} . "/running");
-        sleep 1;
-        die ("VM " . $self->{name} . " timed out") if $try++ > 300;
-    }
+    # Wait until the processQemuOutput thread signals that the machine
+    # is up.
+    $self->{connectedQueue}->dequeue();
 
     while (1) {
         $self->log("trying to connect");
diff --git a/modules/system/boot/stage-1-init.sh b/modules/system/boot/stage-1-init.sh
index db712f48ee1..e0d7869f910 100644
--- a/modules/system/boot/stage-1-init.sh
+++ b/modules/system/boot/stage-1-init.sh
@@ -7,13 +7,15 @@ export PATH=@extraUtils@/bin:@klibc@/bin
 
 
 fail() {
+    if [ -n "$panicOnFail" ]; then exit 1; fi
+    
     # If starting stage 2 failed, allow the user to repair the problem
     # in an interactive shell.
     cat <<EOF
 
 An error occured in stage 1 of the boot process, which must mount the
 root filesystem on \`$targetRoot' and then start stage 2.  Press one
-of the following keys within $timeout seconds:
+of the following keys:
 
   i) to launch an interactive shell;
   f) to start an interactive shell having pid 1 (needed if you want to
@@ -74,6 +76,9 @@ for o in $(cat /proc/cmdline); do
         debug1mounts) # stop after mounting file systems
             debug1mounts=1
             ;;
+        stage1panic)
+            panicOnFail=1
+            ;;
     esac
 done
 
diff --git a/modules/testing/test-instrumentation.nix b/modules/testing/test-instrumentation.nix
index 4c6b1a54afd..da664793a4c 100644
--- a/modules/testing/test-instrumentation.nix
+++ b/modules/testing/test-instrumentation.nix
@@ -14,9 +14,8 @@ with pkgs.lib;
         
         preStart =
           ''
-            eval $(cat /proc/cmdline)
-            echo "guest running, will write in $hostTmpDir on host" > /dev/ttyS0
-            touch /hostfs/$hostTmpDir/running
+            echo "guest running" > /dev/ttyS0
+            echo "===UP===" > dev/ttyS0
           '';
           
         exec = "${pkgs.socat}/bin/socat tcp-listen:514,fork exec:/bin/sh,stderr";
@@ -45,6 +44,10 @@ with pkgs.lib;
     # If the kernel has been built with coverage instrumentation, make
     # it available under /proc/gcov.
     boot.kernelModules = [ "gcov-proc" ];
+
+    # Panic if an error occurs in stage 1 (rather than waiting for
+    # user intervention). 
+    boot.kernelParams = [ "stage1panic" ];
       
   };
 
-- 
GitLab


From 9e98910a7216d48f73cbb52fb3cf7075ceaa9df0 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 5 Jan 2010 09:20:43 +0000
Subject: [PATCH 2123/5331] * Obsolete.

svn path=/nixos/trunk/; revision=19213
---
 .../remote-install-scripts/install-launch.sh  | 10 ---
 .../remote-install-scripts/install-script.sh  | 87 -------------------
 tests/remote-install-scripts/install-start.sh | 12 ---
 tests/remote-install-scripts/install-test.sh  | 71 ---------------
 4 files changed, 180 deletions(-)
 delete mode 100755 tests/remote-install-scripts/install-launch.sh
 delete mode 100755 tests/remote-install-scripts/install-script.sh
 delete mode 100755 tests/remote-install-scripts/install-start.sh
 delete mode 100755 tests/remote-install-scripts/install-test.sh

diff --git a/tests/remote-install-scripts/install-launch.sh b/tests/remote-install-scripts/install-launch.sh
deleted file mode 100755
index ed2b81b90c5..00000000000
--- a/tests/remote-install-scripts/install-launch.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-#! /bin/sh
-
-stop dhclient
-ifconfig eth0 10.0.253.250 netmask 255.255.0.0 up
-
-chmod a+x install-script.sh install-start.sh
-scp -i id_livedvd -o StrictHostKeyChecking=no install-script.sh 10.0.253.251: 
-scp -i id_livedvd -o StrictHostKeyChecking=no install-start.sh 10.0.253.251: 
-ssh -i id_livedvd -o StrictHostKeyChecking=no 10.0.253.251 bash ./install-start.sh 
-
diff --git a/tests/remote-install-scripts/install-script.sh b/tests/remote-install-scripts/install-script.sh
deleted file mode 100755
index 8bcadaaba56..00000000000
--- a/tests/remote-install-scripts/install-script.sh
+++ /dev/null
@@ -1,87 +0,0 @@
-dd if=/dev/zero of=/dev/sda bs=1048576 count=1
-
-sfdisk /dev/sda -uM << EOF
-,512,L
-,1024,S
-,,L
-EOF
-
-mkfs.ext3 /dev/sda1 ; mkswap /dev/sda2 ; mkfs.ext3 /dev/sda3
-
-mount /dev/sda3 /mnt ; mkdir /mnt/boot ; mount /dev/sda1 /mnt/boot
-
-mkdir -p /mnt/etc/nixos
-
-cat > /mnt/etc/nixos/configuration.nix <<EOF
-
-{pkgs, config, ...}: {
-  boot = {
-    grubDevice = "/dev/sda";
-    copyKernels = true;
-    bootMount = "(hd0,0)";
-  };
-
-  fileSystems = [
-    { mountPoint = "/";
-      device = "/dev/sda3";
-    }
-    { mountPoint = "/boot";
-      device = "/dev/sda1";
-      neededForBoot = true;
-    }
-  ];
-
-  swapDevices = [
-    { device = "/dev/sda2"; }
-  ];
-  
-  services = {
-    sshd = {
-      enable = true;
-    };
-
-    extraJobs = [
-      {
-        name = "Host-call-back";
-        job = ''
-          start on network-interfaces/started
-          script
-            while ! /var/run/current-system/sw/sbin/ifconfig eth0 | 
-                /var/run/current-system/sw/bin/grep "inet addr:" &>/dev/null; do
-                    sleep 1;
-            done
-            echo -e "Installation finished\nOK" | /var/run/current-system/sw/bin/socat stdio tcp:10.0.2.2:4424 | {
-                read;
-                if [ "\\\$REPLY" = "reboot" ] ; then 
-                        /var/run/current-system/sw/sbin/start ctrl-alt-delete;
-                fi;
-            }
-          end script
-        '';
-      }
-    ];
-  };
-
-  fonts = { 
-    enableFontConfig = false; 
-  };
-
-  environment = {
-    systemPackages = [
-      pkgs.socat (pkgs.lowPrio pkgs.nixUnstable)
-    ];
-    nix = pkgs.nixCustomFun (pkgs.nixUnstable.src)
-      ""
-      ["nix-reduce-build" "nix-http-export.cgi"]
-      ["--with-docbook-xsl=\\\${pkgs.docbook5_xsl}/xml/xsl/docbook/"];
-  };
-}
-
-EOF
-
-nixos-install
-
-echo Installation finished
-
-start ctrl-alt-delete
-
diff --git a/tests/remote-install-scripts/install-start.sh b/tests/remote-install-scripts/install-start.sh
deleted file mode 100755
index a8cb4baa422..00000000000
--- a/tests/remote-install-scripts/install-start.sh
+++ /dev/null
@@ -1,12 +0,0 @@
-#! /bin/sh
-
-nohup bash -c 'NIX_REMOTE= ./install-script.sh &>/dev/tty11' &
-
-sleep 1;
-
-chvt 11 || true;
-
-disown 
-
-exit
-
diff --git a/tests/remote-install-scripts/install-test.sh b/tests/remote-install-scripts/install-test.sh
deleted file mode 100755
index 8b68c6a3bb1..00000000000
--- a/tests/remote-install-scripts/install-test.sh
+++ /dev/null
@@ -1,71 +0,0 @@
-#! /bin/sh -i 
-
-if test -z "$INSTALL_TEST_RUNNING" ; then
-    export INSTALL_TEST_RUNNING=1;
-    export ORIGINAL_NAME="$0";
-    sh -i < "$ORIGINAL_NAME";
-    exit;
-fi;
-
-if ! eval ' ( sleep 0.1; exit 0; ) & fg ' ; then
-    echo "Failing job control test";
-    exit;
-fi;
-
-set -x 
-
-echo "Installation starting.." > report
-
-nix-build -o socat /etc/nixos/nixpkgs -A socat || { echo "Failed to build socat" >&2 ;  exit 2; };
-nix-build -o qemu /etc/nixos/nixpkgs -A ${QEMU_PACKAGE:-qemu} || { echo "Failed to build qemu" >&2 ;  exit 2; };
-
-echo "reboot" | ./socat/bin/socat tcp-listen:4424 stdio >> report &  
-
-if ( ! [ -d dvd/iso ] ) || ( [ -z "$USE_LEFTOVER_DVD" ] ); then
-    rm dvd
-    # unset NIXPKGS_CONFIG to reduce host -> image configuration leak
-    NIXPKGS_CONFIG= nix-build -o dvd /etc/nixos/nixos/installer/cd-dvd/closed-install.nix || 
-      { echo "Failed to build LiveDVD" >&2 ;  exit 2; };
-fi;
-
-if ( ! [ -f install-test.img ] ) || ( [ -z "$JUST_BOOT" ] ); then
-    rm install-test.img
-    ./qemu/bin/qemu-img create -f qcow2 install-test.img 5G
-
-    ./qemu/bin/qemu --kernel-kqemu -m 512 -cdrom dvd/iso/nixos-*.iso -hda install-test.img -boot d -no-reboot &
-    ./socat/bin/socat tcp-listen:4425 tcp-listen:3737 &
-    sleep 1;
-
-    sed -e '/^127[.]0[.]0[.]1/d; /^\[127[.]0[.]0[.]1/d' -i ~/.ssh/known_hosts || true;
-
-    (
-        echo "cat > install-script.sh <<BIGEOF"
-        cat $(dirname "$ORIGINAL_NAME")/install-script.sh
-        echo BIGEOF
-
-        echo "cat > install-start.sh <<BIGEOF"
-        cat $(dirname "$ORIGINAL_NAME")/install-start.sh 
-        echo BIGEOF
-
-        echo 'chmod a+x *.sh'
-        echo './install-start.sh'
-    ) | ssh -l root -i /var/certs/ssh/id_livedvd -o StrictHostKeyChecking=no 127.0.0.1 -p 4425
-fi;
-
-./qemu/bin/qemu --kernel-kqemu -m 128 install-test.img -no-reboot 
-
-echo "Report contains: "
-cat report
-
-set +x
-
-if [ -n "$GC_DVD" ] ; then 
-    rm dvd; nix-store --delete $(readlink -f dvd);
-fi;
-
-if [ -n "$DO_CLEANUP" ]; then
-    rm dvd ; rm socat ; rm qemu ; rm install-test.img ;
-fi;
-
-test OK = "$(tail -1 report)";
-
-- 
GitLab


From ff86799d42abf507bace415da4f8406871a763c8 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 5 Jan 2010 10:35:30 +0000
Subject: [PATCH 2124/5331] * Hm, Perl threads and lexical closures don't
 interact in the way   you'd expect...

svn path=/nixos/trunk/; revision=19214
---
 lib/test-driver/Machine.pm | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/lib/test-driver/Machine.pm b/lib/test-driver/Machine.pm
index 85ef80f0d37..cc965517d91 100644
--- a/lib/test-driver/Machine.pm
+++ b/lib/test-driver/Machine.pm
@@ -87,9 +87,10 @@ sub start {
 
     close $write;
 
-    threads->create(\&processQemuOutput)->detach;
+    threads->create(\&processQemuOutput, $self, $read)->detach;
 
     sub processQemuOutput {
+        my ($self, $read) = @_;
         $/ = "\r\n";
         while (<$read>) {
             chomp;
-- 
GitLab


From 51097933ab1413fe6a1e853d39a273a7b9969c26 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 5 Jan 2010 11:18:43 +0000
Subject: [PATCH 2125/5331] * Moved test-related stuff from lib/build-vms.nix
 to lib/testing.nix. * Factored out some commonality between tests to make
 them a bit   simpler to write.  A test is a function { pkgs, ... }: -> {
 nodes,   testScript } or { machine, testScript }.  So it's no longer  
 necessary to have a "vms" attribute in every test.

svn path=/nixos/trunk/; revision=19220
---
 lib/build-vms.nix    | 86 +++--------------------------------------
 lib/testing.nix      | 79 +++++++++++++++++++++++++++++++++++++
 release.nix          | 35 +++++++----------
 tests/default.nix    | 29 ++++++++++++++
 tests/kde4.nix       | 92 +++++++++++++++++++-------------------------
 tests/quake3.nix     | 16 ++------
 tests/subversion.nix | 16 ++------
 7 files changed, 174 insertions(+), 179 deletions(-)
 create mode 100644 lib/testing.nix
 create mode 100644 tests/default.nix

diff --git a/lib/build-vms.nix b/lib/build-vms.nix
index 5c6315eb30c..473bd01ad93 100644
--- a/lib/build-vms.nix
+++ b/lib/build-vms.nix
@@ -1,8 +1,4 @@
-{ nixos ? ./..
-, nixpkgs ? ../../nixpkgs
-, services ? ../../nixos/services
-, system ? builtins.currentSystem
-}:
+{ nixpkgs, services, system }:
 
 let pkgs = import nixpkgs { config = {}; inherit system; }; in
 
@@ -55,12 +51,12 @@ rec {
   buildVM =
     nodes: configurations:
 
-    import "${nixos}/lib/eval-config.nix" {
+    import ./eval-config.nix {
       inherit nixpkgs services system;
-      modules = configurations ++ [
-        "${nixos}/modules/virtualisation/qemu-vm.nix" # !!!
-        "${nixos}/modules/testing/test-instrumentation.nix" # !!! should only get added for automated test runs
-      ];
+      modules = configurations ++
+        [ ../modules/virtualisation/qemu-vm.nix # !!!
+          ../modules/testing/test-instrumentation.nix # !!! should only get added for automated test runs
+        ];
       extraArgs = { inherit nodes; };
       /* !!! bug in the module/option handling: this ignores the
          config from assignIPAddresses.  Too much magic. 
@@ -117,74 +113,4 @@ rec {
     else [];
 
 
-  # Run an automated test suite in the given virtual network.
-  # `network' must be the result of a call to the
-  # `buildVirtualNetwork' function.  `tests' is a Perl fragment
-  # describing the tests.
-  runTests = network: tests:
-    stdenv.mkDerivation {
-      name = "vm-test-run";
-      inherit tests;
-      buildCommand =
-        ''
-          mkdir $out
-          cp ${./test-driver/Machine.pm} Machine.pm
-          ensureDir $out/nix-support
-          
-          ${perl}/bin/perl ${./test-driver/test-driver.pl} ${network}/vms/*/bin/run-*-vm
-          
-          for i in */coverage-data; do
-            ensureDir $out/coverage-data
-            mv $i $out/coverage-data/$(dirname $i)
-          done
-
-          for i in $out/*.png; do
-            echo "report screenshot $i" >> $out/nix-support/hydra-build-products
-          done
-        ''; # */
-    };
-
-
-  # Generate a coverage report from the coverage data produced by
-  # runTests.
-  makeReport = x: runCommand "report" { buildInputs = [rsync]; }
-    ''
-      for d in ${x}/coverage-data/*; do
-
-          echo "doing $d"
-
-          ensureDir $TMPDIR/gcov/
-
-          for i in $(cd $d/nix/store && ls); do
-              if ! test -e $TMPDIR/gcov/nix/store/$i; then
-                  echo "copying $i"
-                  mkdir -p $TMPDIR/gcov/$(echo $i | cut -c34-)
-                  rsync -rv /nix/store/$i/.build/* $TMPDIR/gcov/
-              fi
-          done
-
-          chmod -R u+w $TMPDIR/gcov
-
-          find $TMPDIR/gcov -name "*.gcda" -exec rm {} \;
-
-          for i in $(cd $d/nix/store && ls); do
-              rsync -rv $d/nix/store/$i/.build/* $TMPDIR/gcov/
-          done
-
-          find $TMPDIR/gcov -name "*.gcda" -exec chmod 644 {} \;
-          
-          echo "producing info..."
-          ${pkgs.lcov}/bin/geninfo --ignore-errors source,gcov $TMPDIR/gcov --output-file $TMPDIR/app.info
-          cat $TMPDIR/app.info >> $TMPDIR/full.info
-      done
-            
-      echo "making report..."
-      ensureDir $out/coverage
-      ${pkgs.lcov}/bin/genhtml --show-details $TMPDIR/full.info -o $out/coverage
-      cp $TMPDIR/full.info $out/coverage/
-
-      ensureDir $out/nix-support
-      echo "report coverage $out/coverage" >> $out/nix-support/hydra-build-products
-    ''; # */
-    
 }
diff --git a/lib/testing.nix b/lib/testing.nix
new file mode 100644
index 00000000000..cbd7077eeaa
--- /dev/null
+++ b/lib/testing.nix
@@ -0,0 +1,79 @@
+{ nixpkgs, services, system }:
+
+with import ./build-vms.nix { inherit nixpkgs services system; };
+with pkgs;
+
+rec {
+
+
+  # Run an automated test suite in the given virtual network.
+  # `network' must be the result of a call to the
+  # `buildVirtualNetwork' function.  `tests' is a Perl fragment
+  # describing the tests.
+  runTests = network: tests:
+    stdenv.mkDerivation {
+      name = "vm-test-run";
+      inherit tests;
+      buildCommand =
+        ''
+          mkdir $out
+          cp ${./test-driver/Machine.pm} Machine.pm
+          ensureDir $out/nix-support
+          
+          ${perl}/bin/perl ${./test-driver/test-driver.pl} ${network}/vms/*/bin/run-*-vm
+          
+          for i in */coverage-data; do
+            ensureDir $out/coverage-data
+            mv $i $out/coverage-data/$(dirname $i)
+          done
+
+          for i in $out/*.png; do
+            echo "report screenshot $i" >> $out/nix-support/hydra-build-products
+          done
+        ''; # */
+    };
+
+
+  # Generate a coverage report from the coverage data produced by
+  # runTests.
+  makeReport = x: runCommand "report" { buildInputs = [rsync]; }
+    ''
+      for d in ${x}/coverage-data/*; do
+
+          echo "doing $d"
+
+          ensureDir $TMPDIR/gcov/
+
+          for i in $(cd $d/nix/store && ls); do
+              if ! test -e $TMPDIR/gcov/nix/store/$i; then
+                  echo "copying $i"
+                  mkdir -p $TMPDIR/gcov/$(echo $i | cut -c34-)
+                  rsync -rv /nix/store/$i/.build/* $TMPDIR/gcov/
+              fi
+          done
+
+          chmod -R u+w $TMPDIR/gcov
+
+          find $TMPDIR/gcov -name "*.gcda" -exec rm {} \;
+
+          for i in $(cd $d/nix/store && ls); do
+              rsync -rv $d/nix/store/$i/.build/* $TMPDIR/gcov/
+          done
+
+          find $TMPDIR/gcov -name "*.gcda" -exec chmod 644 {} \;
+          
+          echo "producing info..."
+          ${pkgs.lcov}/bin/geninfo --ignore-errors source,gcov $TMPDIR/gcov --output-file $TMPDIR/app.info
+          cat $TMPDIR/app.info >> $TMPDIR/full.info
+      done
+            
+      echo "making report..."
+      ensureDir $out/coverage
+      ${pkgs.lcov}/bin/genhtml --show-details $TMPDIR/full.info -o $out/coverage
+      cp $TMPDIR/full.info $out/coverage/
+
+      ensureDir $out/nix-support
+      echo "report coverage $out/coverage" >> $out/nix-support/hydra-build-products
+    ''; # */
+    
+}
diff --git a/release.nix b/release.nix
index e12989fa57e..c99131bf3bd 100644
--- a/release.nix
+++ b/release.nix
@@ -111,30 +111,20 @@ let
     minimal_install_archive = {system ? "i686-linux"}: (iso_minimal {inherit system;})
       .config.system.build.minimalInstallArchive;
 
-    tests.subversion =
+    tests = 
       { services ? ../services }:
+      let
+        t = import ./tests { 
+          inherit nixpkgs services;
+          system = "i686-linux";
+        };
+      in {
+        subversion = t.subversion.report;
+        kde4 = t.kde4.test;
+        quake3 = t.quake3.test;
+      };
 
-      (import ./tests/subversion.nix {
-        inherit nixpkgs services;
-        system = "i686-linux";
-      }).report;
-    
-    tests.kde4 =
-      { services ? ../services }:
-
-      (import ./tests/kde4.nix {
-        inherit nixpkgs services;
-        system = "i686-linux";
-      }).test;
-
-    tests.quake3 =
-      { services ? ../services }:
-
-      (import ./tests/quake3.nix {
-        inherit nixpkgs services;
-        system = "i686-linux";
-      }).test;
-
+    /*
     ### tests about installing NixOS
 
     # installs NixOs in a qemu_kvm instance using a tweaked iso.
@@ -142,6 +132,7 @@ let
       (import ./tests/test-nixos-install-from-cd/test.nix {
         inherit nixpkgs;
       }).test;
+    */
 
     # the archive installer can't be tested without chroot which requires being root
     # options: run in kvm or uml ?
diff --git a/tests/default.nix b/tests/default.nix
new file mode 100644
index 00000000000..269b1bffa6a
--- /dev/null
+++ b/tests/default.nix
@@ -0,0 +1,29 @@
+{ nixpkgs ? ../../nixpkgs
+, services ? ../../services
+, system ? builtins.currentSystem
+}:
+
+let
+
+  testLib = 
+    (import ../lib/build-vms.nix { inherit nixpkgs services system; }) //
+    (import ../lib/testing.nix { inherit nixpkgs services system; });
+
+  apply = testFun:
+    with testLib;
+    let
+      t = testFun { inherit pkgs testLib; };
+    in t // rec {
+      nodes = if t ? nodes then t.nodes else { machine = t.machine; };
+      vms = buildVirtualNetwork { inherit nodes; };
+      test = runTests vms t.testScript;
+      report = makeReport test;
+    };
+
+in
+
+{
+  kde4 = apply (import ./kde4.nix);
+  quake3 = apply (import ./quake3.nix);
+  subversion = apply (import ./subversion.nix);
+}
diff --git a/tests/kde4.nix b/tests/kde4.nix
index 33ef1e006fd..44b8cda038b 100644
--- a/tests/kde4.nix
+++ b/tests/kde4.nix
@@ -1,68 +1,56 @@
-{ nixos ? ./..
-, nixpkgs ? ../../nixpkgs
-, services ? ../../nixos/services
-, system ? builtins.currentSystem
-}:
-
-with import ../lib/build-vms.nix { inherit nixos nixpkgs services system; };
-
-rec {
-
-  nodes =
-    { client =
-        { config, pkgs, ... }:
-
-        { services.xserver.enable = true;
-        
-          services.httpd.enable = true;
-          services.httpd.adminAddr = "foo@example.org";
-          services.httpd.documentRoot = "${pkgs.valgrind}/share/doc/valgrind/html";
-  
-          services.xserver.displayManager.slim.enable = false;
-          services.xserver.displayManager.kdm.enable = true;
-          services.xserver.displayManager.kdm.extraConfig =
-            ''
-              [X-:0-Core]
-              AutoLoginEnable=true
-              AutoLoginUser=alice
-              AutoLoginPass=foobar
-            '';
-            
-          services.xserver.desktopManager.default = "kde4";
-          services.xserver.desktopManager.kde4.enable = true;
-
-          users.extraUsers = pkgs.lib.singleton
-            { name = "alice";
-              description = "Alice Foobar";
-              home = "/home/alice";
-              createHome = true;
-              useDefaultShell = true;
-              password = "foobar";
-            };
-
-          environment.systemPackages = [ pkgs.scrot ];
+{ pkgs, ... }:
+
+{
+
+  machine = 
+    { config, pkgs, ... }:
+
+    { services.xserver.enable = true;
+
+      services.httpd.enable = true;
+      services.httpd.adminAddr = "foo@example.org";
+      services.httpd.documentRoot = "${pkgs.valgrind}/share/doc/valgrind/html";
+
+      services.xserver.displayManager.slim.enable = false;
+      services.xserver.displayManager.kdm.enable = true;
+      services.xserver.displayManager.kdm.extraConfig =
+        ''
+          [X-:0-Core]
+          AutoLoginEnable=true
+          AutoLoginUser=alice
+          AutoLoginPass=foobar
+        '';
+
+      services.xserver.desktopManager.default = "kde4";
+      services.xserver.desktopManager.kde4.enable = true;
+
+      users.extraUsers = pkgs.lib.singleton
+        { name = "alice";
+          description = "Alice Foobar";
+          home = "/home/alice";
+          createHome = true;
+          useDefaultShell = true;
+          password = "foobar";
         };
-    };
 
-  vms = buildVirtualNetwork { inherit nodes; };
+      environment.systemPackages = [ pkgs.scrot ];
+    };
 
-  test = runTests vms
+  testScript =
     ''
-      startAll;
-
-      $client->waitForFile("/tmp/.X11-unix/X0");
+      $machine->waitForFile("/tmp/.X11-unix/X0");
 
       sleep 70;
 
-      print STDERR $client->execute("su - alice -c 'DISPLAY=:0.0 kwrite /var/log/messages &'");
+      print STDERR $machine->execute("su - alice -c 'DISPLAY=:0.0 kwrite /var/log/messages &'");
 
       sleep 10;
       
-      print STDERR $client->execute("su - alice -c 'DISPLAY=:0.0 konqueror http://localhost/ &'");
+      print STDERR $machine->execute("su - alice -c 'DISPLAY=:0.0 konqueror http://localhost/ &'");
 
       sleep 10;
       
-      print STDERR $client->mustSucceed("DISPLAY=:0.0 scrot /hostfs/$ENV{out}/screen.png");
+      print STDERR $machine->mustSucceed("DISPLAY=:0.0 scrot /hostfs/$ENV{out}/screen.png");
     '';
   
 }
diff --git a/tests/quake3.nix b/tests/quake3.nix
index b08e679e1e1..c3c047bdab8 100644
--- a/tests/quake3.nix
+++ b/tests/quake3.nix
@@ -1,10 +1,4 @@
-{ nixos ? ./..
-, nixpkgs ? /etc/nixos/nixpkgs
-, services ? /etc/nixos/services
-, system ? builtins.currentSystem
-}:
-
-with import ../lib/build-vms.nix { inherit nixos nixpkgs services system; };
+{ pkgs, ... }:
 
 rec {
 
@@ -34,9 +28,7 @@ rec {
       client2 = client;
     };
 
-  vms = buildVirtualNetwork { inherit nodes; };
-
-  test = runTests vms
+  testScript =
     ''
       startAll;
 
@@ -57,8 +49,8 @@ rec {
       $server->mustSucceed("grep -q 'Foo.*entered the game' /tmp/log");
       $server->mustSucceed("grep -q 'Bar.*entered the game' /tmp/log");
       
-      print STDERR $client1->execute("DISPLAY=:0.0 scrot /hostfs/$ENV{out}/screen1.png");
-      print STDERR $client2->execute("DISPLAY=:0.0 scrot /hostfs/$ENV{out}/screen2.png");
+      print STDERR $client1->mustSucceed("DISPLAY=:0.0 scrot /hostfs/$ENV{out}/screen1.png");
+      print STDERR $client2->mustSucceed("DISPLAY=:0.0 scrot /hostfs/$ENV{out}/screen2.png");
     '';
   
 }
diff --git a/tests/subversion.nix b/tests/subversion.nix
index 43eba8e1659..d8386a76a9f 100644
--- a/tests/subversion.nix
+++ b/tests/subversion.nix
@@ -1,10 +1,4 @@
-{ nixos ? ./..
-, nixpkgs ? ../../nixpkgs
-, services ? ../../services
-, system ? builtins.currentSystem
-}:
-
-with import ../lib/build-vms.nix { inherit nixos nixpkgs services system; };
+{ pkgs, ... }:
 
 let
 
@@ -37,7 +31,7 @@ let
 
 in
       
-rec {
+{
 
   nodes =
     { webserver =
@@ -66,9 +60,7 @@ rec {
 
     };
 
-  vms = buildVirtualNetwork { inherit nodes; };
-
-  test = runTests vms
+  testScript =
     ''
       startAll;
 
@@ -125,6 +117,4 @@ rec {
       $webserver->execute("sleep 10"); # !!!
     '';
 
-  report = makeReport test;
-    
 }
-- 
GitLab


From fbda972090b9bae33df43664fbf1fa020510a900 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 5 Jan 2010 11:29:30 +0000
Subject: [PATCH 2126/5331] * This sleep should no longer be needed because in
 Upstart 0.6   "initctl stop" doesn't return until the job has stopped.

svn path=/nixos/trunk/; revision=19224
---
 tests/subversion.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/tests/subversion.nix b/tests/subversion.nix
index d8386a76a9f..075dc0e35a3 100644
--- a/tests/subversion.nix
+++ b/tests/subversion.nix
@@ -114,7 +114,6 @@ in
 
       # Stop Apache to gather all the coverage data.
       $webserver->stopJob("httpd");
-      $webserver->execute("sleep 10"); # !!!
     '';
 
 }
-- 
GitLab


From 5af12b6afe03f7627867b817c2cda52686828b36 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 5 Jan 2010 11:35:59 +0000
Subject: [PATCH 2127/5331] * Provide a function for taking a screenshot.

svn path=/nixos/trunk/; revision=19225
---
 lib/test-driver/Machine.pm | 8 ++++++++
 lib/testing.nix            | 1 +
 tests/kde4.nix             | 6 ++----
 tests/quake3.nix           | 8 ++++----
 4 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/lib/test-driver/Machine.pm b/lib/test-driver/Machine.pm
index cc965517d91..34ea4e5e65c 100644
--- a/lib/test-driver/Machine.pm
+++ b/lib/test-driver/Machine.pm
@@ -279,4 +279,12 @@ sub unblock {
 }
 
 
+# Take a screenshot of the X server on :0.0.
+sub screenshot {
+    my ($self, $filename) = @_;
+    my $scrot = $ENV{'scrot'} or die;
+    $self->mustSucceed("DISPLAY=:0.0 $scrot /hostfs/$ENV{out}/${filename}.png");
+}
+
+
 1;
diff --git a/lib/testing.nix b/lib/testing.nix
index cbd7077eeaa..28ee564517e 100644
--- a/lib/testing.nix
+++ b/lib/testing.nix
@@ -14,6 +14,7 @@ rec {
     stdenv.mkDerivation {
       name = "vm-test-run";
       inherit tests;
+      scrot = "${pkgs.scrot}/bin/scrot";
       buildCommand =
         ''
           mkdir $out
diff --git a/tests/kde4.nix b/tests/kde4.nix
index 44b8cda038b..e1e323f4a6f 100644
--- a/tests/kde4.nix
+++ b/tests/kde4.nix
@@ -32,8 +32,6 @@
           useDefaultShell = true;
           password = "foobar";
         };
-
-      environment.systemPackages = [ pkgs.scrot ];
     };
 
   testScript =
@@ -49,8 +47,8 @@
       print STDERR $machine->execute("su - alice -c 'DISPLAY=:0.0 konqueror http://localhost/ &'");
 
       sleep 10;
-      
-      print STDERR $machine->mustSucceed("DISPLAY=:0.0 scrot /hostfs/$ENV{out}/screen.png");
+
+      $machine->screenshot("screen");
     '';
   
 }
diff --git a/tests/quake3.nix b/tests/quake3.nix
index c3c047bdab8..ee95d95a98a 100644
--- a/tests/quake3.nix
+++ b/tests/quake3.nix
@@ -8,7 +8,7 @@ rec {
     { services.xserver.enable = true;
       services.xserver.driSupport = true;
       services.xserver.defaultDepth = pkgs.lib.mkOverride 0 {} 16;
-      environment.systemPackages = [ pkgs.scrot pkgs.icewm pkgs.quake3demo ];
+      environment.systemPackages = [ pkgs.icewm pkgs.quake3demo ];
     };
 
   nodes =
@@ -48,9 +48,9 @@ rec {
 
       $server->mustSucceed("grep -q 'Foo.*entered the game' /tmp/log");
       $server->mustSucceed("grep -q 'Bar.*entered the game' /tmp/log");
-      
-      print STDERR $client1->mustSucceed("DISPLAY=:0.0 scrot /hostfs/$ENV{out}/screen1.png");
-      print STDERR $client2->mustSucceed("DISPLAY=:0.0 scrot /hostfs/$ENV{out}/screen2.png");
+
+      $client1->screenshot("screen1");
+      $client2->screenshot("screen2");
     '';
   
 }
-- 
GitLab


From 7541141a7ac8af26d8a3abb4651e75f235e24de5 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 5 Jan 2010 11:42:08 +0000
Subject: [PATCH 2128/5331] * Send stderr to /dev/ttyS0 (so that it doesn't
 pollute the socket   connection).

svn path=/nixos/trunk/; revision=19226
---
 modules/testing/test-instrumentation.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/testing/test-instrumentation.nix b/modules/testing/test-instrumentation.nix
index da664793a4c..2dd1a90b966 100644
--- a/modules/testing/test-instrumentation.nix
+++ b/modules/testing/test-instrumentation.nix
@@ -18,7 +18,7 @@ with pkgs.lib;
             echo "===UP===" > dev/ttyS0
           '';
           
-        exec = "${pkgs.socat}/bin/socat tcp-listen:514,fork exec:/bin/sh,stderr";
+        exec = "${pkgs.socat}/bin/socat tcp-listen:514,fork exec:/bin/sh 2> /dev/ttyS0";
       };
   
     boot.postBootCommands =
-- 
GitLab


From ff20b4548623028576193ec1de50804237e28c28 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 5 Jan 2010 11:43:38 +0000
Subject: [PATCH 2129/5331] * Don't buffer stderr.

svn path=/nixos/trunk/; revision=19227
---
 lib/test-driver/test-driver.pl | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/lib/test-driver/test-driver.pl b/lib/test-driver/test-driver.pl
index 10efcbb690c..65d051eb170 100644
--- a/lib/test-driver/test-driver.pl
+++ b/lib/test-driver/test-driver.pl
@@ -3,6 +3,8 @@ use Machine;
 
 $SIG{PIPE} = 'IGNORE'; # because Unix domain sockets may die unexpectedly
 
+STDERR->autoflush(1);
+
 my %vms;
 my $context = "";
 
-- 
GitLab


From 8343b8b902782c5b4bf35bf8a315821b67e653d7 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 5 Jan 2010 11:57:17 +0000
Subject: [PATCH 2130/5331] * More cleanups.

svn path=/nixos/trunk/; revision=19228
---
 tests/default.nix    |  1 +
 tests/kde4.nix       |  4 ++--
 tests/quake3.nix     |  8 ++++----
 tests/subversion.nix |  6 ++----
 tests/trac.nix       | 20 ++++++--------------
 5 files changed, 15 insertions(+), 24 deletions(-)

diff --git a/tests/default.nix b/tests/default.nix
index 269b1bffa6a..eb0b3909322 100644
--- a/tests/default.nix
+++ b/tests/default.nix
@@ -26,4 +26,5 @@ in
   kde4 = apply (import ./kde4.nix);
   quake3 = apply (import ./quake3.nix);
   subversion = apply (import ./subversion.nix);
+  trac = apply (import ./trac.nix);
 }
diff --git a/tests/kde4.nix b/tests/kde4.nix
index e1e323f4a6f..f13b87b0763 100644
--- a/tests/kde4.nix
+++ b/tests/kde4.nix
@@ -40,11 +40,11 @@
 
       sleep 70;
 
-      print STDERR $machine->execute("su - alice -c 'DISPLAY=:0.0 kwrite /var/log/messages &'");
+      $machine->execute("su - alice -c 'DISPLAY=:0.0 kwrite /var/log/messages &'");
 
       sleep 10;
       
-      print STDERR $machine->execute("su - alice -c 'DISPLAY=:0.0 konqueror http://localhost/ &'");
+      $machine->execute("su - alice -c 'DISPLAY=:0.0 konqueror http://localhost/ &'");
 
       sleep 10;
 
diff --git a/tests/quake3.nix b/tests/quake3.nix
index ee95d95a98a..9af01214b6c 100644
--- a/tests/quake3.nix
+++ b/tests/quake3.nix
@@ -38,11 +38,11 @@ rec {
 
       sleep 20;
 
-      print STDERR $client1->execute("DISPLAY=:0.0 icewm &");
-      print STDERR $client1->execute("DISPLAY=:0.0 quake3 '+set r_fullscreen 0' '+set name Foo' '+connect server' &");
+      $client1->execute("DISPLAY=:0.0 icewm &");
+      $client1->execute("DISPLAY=:0.0 quake3 '+set r_fullscreen 0' '+set name Foo' '+connect server' &");
  
-      print STDERR $client2->execute("DISPLAY=:0.0 icewm &");
-      print STDERR $client2->execute("DISPLAY=:0.0 quake3 '+set r_fullscreen 0' '+set name Bar' '+connect server' &");
+      $client2->execute("DISPLAY=:0.0 icewm &");
+      $client2->execute("DISPLAY=:0.0 quake3 '+set r_fullscreen 0' '+set name Bar' '+connect server' &");
  
       sleep 40;
 
diff --git a/tests/subversion.nix b/tests/subversion.nix
index 075dc0e35a3..5354a40452b 100644
--- a/tests/subversion.nix
+++ b/tests/subversion.nix
@@ -66,11 +66,9 @@ in
 
       $webserver->waitForOpenPort(80);
 
-      my $out = $client->mustSucceed("svn --version");
-      print STDERR "GOT: $out";
+      print STDERR $client->mustSucceed("svn --version");
 
-      my $out = $client->mustSucceed("curl --fail http://webserver/");
-      print STDERR "GOT: $out";
+      print STDERR $client->mustSucceed("curl --fail http://webserver/");
 
       # Create a new user through the web interface.
       $client->mustSucceed("curl --fail -F username=alice -F fullname='Alice Lastname' -F address=alice\@example.org -F password=foobar -F password_again=foobar http://webserver/repoman/adduser");
diff --git a/tests/trac.nix b/tests/trac.nix
index 6db5a382802..f544c5e99cd 100644
--- a/tests/trac.nix
+++ b/tests/trac.nix
@@ -1,12 +1,6 @@
-{ nixos ? ./..
-, nixpkgs ? /etc/nixos/nixpkgs
-, services ? /etc/nixos/services
-, system ? builtins.currentSystem
-}:
+{ pkgs, ... }:
 
-with import ../lib/build-vms.nix { inherit nixos nixpkgs services system; };
-
-rec {
+{
   nodes = {
     storage = 
       {pkgs, config, ...}:
@@ -77,13 +71,11 @@ rec {
       };
   };
     
-  vms = buildVirtualNetwork { inherit nodes; };
-
-  test = runTests vms
+  testScript =
     ''
       startAll;
       
-      $postgresql->waitForFile("/tmp/.s.PGSQL.5432");
+      $postgresql->waitForJob("postgresql");
       $postgresql->mustSucceed("createdb trac");
       
       $webserver->mustSucceed("mkdir -p /repos/trac");
@@ -96,9 +88,9 @@ rec {
       $client->waitForFile("/tmp/.X11-unix/X0");
       sleep 60;
       
-      print STDERR $client->execute("su - alice -c 'DISPLAY=:0.0 konqueror http://webserver/projects/test &'");
+      $client->execute("su - alice -c 'DISPLAY=:0.0 konqueror http://webserver/projects/test &'");
       sleep 120;
       
-      print STDERR $client->execute("DISPLAY=:0.0 scrot /hostfs/$ENV{out}/screen1.png");
+      $client->screenshot("screen");
     '';
 }
-- 
GitLab


From d6b52e7236d64e5b5bffd2f73ed74938bdddc069 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 5 Jan 2010 12:04:04 +0000
Subject: [PATCH 2131/5331] * Enable the trac test.

svn path=/nixos/trunk/; revision=19230
---
 release.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/release.nix b/release.nix
index c99131bf3bd..ec5e5aeccfa 100644
--- a/release.nix
+++ b/release.nix
@@ -119,9 +119,10 @@ let
           system = "i686-linux";
         };
       in {
-        subversion = t.subversion.report;
         kde4 = t.kde4.test;
         quake3 = t.quake3.test;
+        subversion = t.subversion.report;
+        trac = t.trac.test;
       };
 
     /*
-- 
GitLab


From 9889d9f9f8f38f74bc42dd2e658a9f29a184fefb Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 5 Jan 2010 13:11:12 +0000
Subject: [PATCH 2132/5331] * Remove most default kernel options since they
 have no effect.  Also,   don't put them in a default, so that they can easily
 be added to.

svn path=/nixos/trunk/; revision=19232
---
 modules/system/boot/kernel.nix | 14 ++++++--------
 tests/trac.nix                 |  1 -
 2 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/modules/system/boot/kernel.nix b/modules/system/boot/kernel.nix
index 4cb862a3a00..60bc47cdc65 100644
--- a/modules/system/boot/kernel.nix
+++ b/modules/system/boot/kernel.nix
@@ -28,14 +28,7 @@ let kernel = config.boot.kernelPackages.kernel; in
     };
 
     boot.kernelParams = mkOption {
-      default = [
-        "selinux=0"
-        "apm=on"
-        "acpi=on"
-        "console=tty1"
-        "splash=verbose"
-        "vga=0x317"
-      ];
+      default = [ ];
       description = ''
         The kernel parameters.  If you want to add additional
         parameters, it's best to set
@@ -116,6 +109,11 @@ let kernel = config.boot.kernelPackages.kernel; in
     
     system.modulesTree = [ kernel ] ++ config.boot.extraModulePackages;
 
+    boot.kernelParams =
+      [ "splash=verbose"
+        "vga=0x317"
+      ];
+      
     boot.kernelModules = [ "loop" ];
 
     boot.initrd.availableKernelModules =
diff --git a/tests/trac.nix b/tests/trac.nix
index f544c5e99cd..7fe85dbabfe 100644
--- a/tests/trac.nix
+++ b/tests/trac.nix
@@ -67,7 +67,6 @@
           useDefaultShell = true;
           password = "foobar";
         };
-        environment.systemPackages = [ pkgs.scrot ];
       };
   };
     
-- 
GitLab


From bc8445a89e54f61489bed928384474a2acd00b0a Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 5 Jan 2010 14:12:51 +0000
Subject: [PATCH 2133/5331] * Add a simple Firefox test.

svn path=/nixos/trunk/; revision=19234
---
 tests/default.nix |  1 +
 tests/firefox.nix | 29 +++++++++++++++++++++++++++++
 2 files changed, 30 insertions(+)
 create mode 100644 tests/firefox.nix

diff --git a/tests/default.nix b/tests/default.nix
index eb0b3909322..206db700b19 100644
--- a/tests/default.nix
+++ b/tests/default.nix
@@ -24,6 +24,7 @@ in
 
 {
   kde4 = apply (import ./kde4.nix);
+  firefox = apply (import ./firefox.nix);
   quake3 = apply (import ./quake3.nix);
   subversion = apply (import ./subversion.nix);
   trac = apply (import ./trac.nix);
diff --git a/tests/firefox.nix b/tests/firefox.nix
new file mode 100644
index 00000000000..17bfc3f9e4a
--- /dev/null
+++ b/tests/firefox.nix
@@ -0,0 +1,29 @@
+{ pkgs, ... }:
+
+{
+
+  machine = 
+    { config, pkgs, ... }:
+
+    { services.xserver.enable = true;
+      environment.systemPackages = [ pkgs.icewm pkgs.firefox ];
+    };
+
+  testScript =
+    ''
+      $machine->waitForFile("/tmp/.X11-unix/X0");
+
+      sleep 10;
+
+      $machine->execute("DISPLAY=:0.0 icewm &");
+
+      sleep 10;
+      
+      $machine->execute("DISPLAY=:0.0 HOME=/root firefox file://${pkgs.valgrind}/share/doc/valgrind/html/index.html &");
+
+      sleep 30;
+
+      $machine->screenshot("screen");
+    '';
+  
+}
-- 
GitLab


From 62476f2816aeeadf1fff657a6949eaafbac6df6e Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 5 Jan 2010 15:30:56 +0000
Subject: [PATCH 2134/5331] * Added a module for IceWM.

svn path=/nixos/trunk/; revision=19238
---
 .../services/x11/window-managers/icewm.nix    | 42 +++++++++++++++
 modules/services/x11/window-managers/twm.nix  | 52 +++++++++----------
 2 files changed, 67 insertions(+), 27 deletions(-)
 create mode 100644 modules/services/x11/window-managers/icewm.nix

diff --git a/modules/services/x11/window-managers/icewm.nix b/modules/services/x11/window-managers/icewm.nix
new file mode 100644
index 00000000000..1aec252dea5
--- /dev/null
+++ b/modules/services/x11/window-managers/icewm.nix
@@ -0,0 +1,42 @@
+{ config, pkgs, ... }:
+
+with pkgs.lib;
+
+let
+
+  cfg = config.services.xserver.windowManager.icewm;
+
+in
+
+{
+
+  ###### interface
+
+  options = {
+  
+    services.xserver.windowManager.icewm.enable = mkOption {
+      default = false;
+      description = "Enable the IceWM window manager.";
+    };
+
+  };
+
+
+  ###### implementation
+
+  config = mkIf cfg.enable {
+
+    services.xserver.windowManager.session = singleton
+      { name = "icewm";
+        start =
+          ''
+            ${pkgs.icewm}/bin/icewm &
+            waitPID=$!
+          '';
+      };
+
+    environment.x11Packages = [ pkgs.icewm ];
+    
+  };
+
+}
diff --git a/modules/services/x11/window-managers/twm.nix b/modules/services/x11/window-managers/twm.nix
index 6b67934feb7..3c4780386ce 100644
--- a/modules/services/x11/window-managers/twm.nix
+++ b/modules/services/x11/window-managers/twm.nix
@@ -1,44 +1,42 @@
-{pkgs, config, ...}:
+{ config, pkgs, ... }:
+
+with pkgs.lib;
 
 let
-  inherit (pkgs.lib) mkOption mkIf;
+
   cfg = config.services.xserver.windowManager.twm;
-  xorg = pkgs.xorg;
 
-  option = { services = { xserver = { windowManager = {
+in
 
-    twm = {
-      enable = mkOption {
-        default = false;
-        example = true;
-        description = "Enable the twm window manager.";
-      };
+{
+
+  ###### interface
 
+  options = {
+  
+    services.xserver.windowManager.twm.enable = mkOption {
+      default = false;
+      description = "Enable the twm window manager.";
     };
 
-  }; }; }; };
-in
+  };
+
 
-mkIf cfg.enable {
-  require = option;
+  ###### implementation
 
-  services = {
-    xserver = {
+  config = mkIf cfg.enable {
 
-      windowManager = {
-        session = [{
-          name = "twm";
-          start = "
-            ${xorg.twm}/bin/twm &
+    services.xserver.windowManager.session = singleton
+      { name = "twm";
+        start =
+          ''
+            ${pkgs.xorg.twm}/bin/twm &
             waitPID=$!
-          ";
-        }];
+          '';
       };
 
-    };
+    environment.x11Packages = [ pkgs.xorg.twm ];
+    
   };
 
-  environment = {
-    x11Packages = [ xorg.twm ];
-  };
 }
-- 
GitLab


From 73668f41dafd3570987fef58808f125a1534c8c7 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 5 Jan 2010 15:32:14 +0000
Subject: [PATCH 2135/5331] * Added an "auto" pseudo display manager that logs
 in a user   automatically.  This is mostly useful for testing.  (KDM also has
   this feature, but it's nice not to depend on KDE for non-KDE tests.)

svn path=/nixos/trunk/; revision=19239
---
 modules/module-list.nix                       |  2 +
 .../services/x11/desktop-managers/none.nix    | 17 ++----
 .../services/x11/display-managers/auto.nix    | 55 +++++++++++++++++++
 modules/services/x11/display-managers/kdm.nix |  2 +-
 tests/firefox.nix                             | 14 +++--
 5 files changed, 72 insertions(+), 18 deletions(-)
 create mode 100644 modules/services/x11/display-managers/auto.nix

diff --git a/modules/module-list.nix b/modules/module-list.nix
index 0f8b47eb764..b81512efc08 100644
--- a/modules/module-list.nix
+++ b/modules/module-list.nix
@@ -112,12 +112,14 @@
   ./services/x11/desktop-managers/none.nix
   ./services/x11/desktop-managers/xterm.nix
   ./services/x11/display-managers/default.nix
+  ./services/x11/display-managers/auto.nix
   ./services/x11/display-managers/kdm.nix
   ./services/x11/display-managers/slim.nix
   ./services/x11/hardware/synaptics.nix
   ./services/x11/hardware/wacom.nix
   ./services/x11/window-managers/compiz.nix
   ./services/x11/window-managers/default.nix
+  ./services/x11/window-managers/icewm.nix
   ./services/x11/window-managers/kwm.nix
   ./services/x11/window-managers/metacity.nix
   ./services/x11/window-managers/none.nix
diff --git a/modules/services/x11/desktop-managers/none.nix b/modules/services/x11/desktop-managers/none.nix
index a86bd5a7415..af7a376ae02 100644
--- a/modules/services/x11/desktop-managers/none.nix
+++ b/modules/services/x11/desktop-managers/none.nix
@@ -1,14 +1,7 @@
 {
-  services = {
-    xserver = {
-
-      desktopManager = {
-        session = [{
-          name = "none";
-          start = "";
-        }];
-      };
-
-    };
-  };
+  services.xserver.desktopManager.session =
+    [ { name = "none";
+        start = "";
+      }
+    ];
 }
diff --git a/modules/services/x11/display-managers/auto.nix b/modules/services/x11/display-managers/auto.nix
new file mode 100644
index 00000000000..8805fbfd383
--- /dev/null
+++ b/modules/services/x11/display-managers/auto.nix
@@ -0,0 +1,55 @@
+{ config, pkgs, ... }:
+
+with pkgs.lib;
+
+let
+
+  dmcfg = config.services.xserver.displayManager;
+  cfg = dmcfg.auto;
+
+in
+
+{
+
+  ###### interface
+
+  options = {
+  
+    services.xserver.displayManager.auto = {
+    
+      enable = mkOption {
+        default = false;
+        description = ''
+          Whether to enable the fake "auto" display manager, which
+          automatically logs in the user specified in the
+          <option>user</option> option.  This is mostly useful for
+          automated tests.
+        '';
+      };
+
+      user = mkOption {
+        default = "root";
+        description = "The user account to login automatically.";
+      };
+
+    };
+
+  };
+
+
+  ###### implementation
+
+  config = mkIf cfg.enable {
+
+    services.xserver.displayManager.job =
+      { execCmd =
+          ''
+            ${pkgs.xorg.xinit}/bin/xinit \
+              ${pkgs.su}/bin/su -c ${dmcfg.session.script} ${cfg.user} \
+              -- ${dmcfg.xserverBin} ${dmcfg.xserverArgs}
+          '';
+      };
+
+  };
+
+}
diff --git a/modules/services/x11/display-managers/kdm.nix b/modules/services/x11/display-managers/kdm.nix
index 18a6623eb85..9ce87d64e48 100644
--- a/modules/services/x11/display-managers/kdm.nix
+++ b/modules/services/x11/display-managers/kdm.nix
@@ -72,7 +72,7 @@ in
       enableXDMCP = mkOption {
         default = false;
 	description = ''
-	  Whether to enable XDMCP, which allows remote logins";
+	  Whether to enable XDMCP, which allows remote logins.
 	'';
       };
 
diff --git a/tests/firefox.nix b/tests/firefox.nix
index 17bfc3f9e4a..a76d46bb7bb 100644
--- a/tests/firefox.nix
+++ b/tests/firefox.nix
@@ -6,7 +6,15 @@
     { config, pkgs, ... }:
 
     { services.xserver.enable = true;
-      environment.systemPackages = [ pkgs.icewm pkgs.firefox ];
+      services.xserver.displayManager.slim.enable = false;
+      services.xserver.displayManager.auto.enable = true;
+
+      services.xserver.windowManager.default = "icewm";
+      services.xserver.windowManager.icewm.enable = true;
+
+      services.xserver.desktopManager.default = "none";
+            
+      environment.systemPackages = [ pkgs.firefox ];
     };
 
   testScript =
@@ -15,10 +23,6 @@
 
       sleep 10;
 
-      $machine->execute("DISPLAY=:0.0 icewm &");
-
-      sleep 10;
-      
       $machine->execute("DISPLAY=:0.0 HOME=/root firefox file://${pkgs.valgrind}/share/doc/valgrind/html/index.html &");
 
       sleep 30;
-- 
GitLab


From bc238be01a6d812d06784464bac99a5ac135acaa Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 5 Jan 2010 17:08:57 +0000
Subject: [PATCH 2136/5331] * Factor out the X11 configuration.

svn path=/nixos/trunk/; revision=19241
---
 lib/build-vms.nix    | 18 ++++--------------
 tests/common/x11.nix | 13 +++++++++++++
 tests/firefox.nix    | 10 +---------
 tests/quake3.nix     |  4 +---
 4 files changed, 19 insertions(+), 26 deletions(-)
 create mode 100644 tests/common/x11.nix

diff --git a/lib/build-vms.nix b/lib/build-vms.nix
index 473bd01ad93..11eed8e2339 100644
--- a/lib/build-vms.nix
+++ b/lib/build-vms.nix
@@ -54,21 +54,11 @@ rec {
     import ./eval-config.nix {
       inherit nixpkgs services system;
       modules = configurations ++
-        [ ../modules/virtualisation/qemu-vm.nix # !!!
+        [ ../modules/virtualisation/qemu-vm.nix
           ../modules/testing/test-instrumentation.nix # !!! should only get added for automated test runs
+          { key = "no-manual"; services.nixosManual.enable = false; }
         ];
       extraArgs = { inherit nodes; };
-      /* !!! bug in the module/option handling: this ignores the
-         config from assignIPAddresses.  Too much magic. 
-      configuration = {
-        imports = [configuration "${nixos}/modules/virtualisation/qemu-vm.nix"];
-        config = {
-          # We don't need the manual in a test VM, and leaving it out
-          # speeds up evaluation quite a bit.
-          services.nixosManual.enable = false;
-        };
-      };
-      */
     };
 
 
@@ -88,7 +78,8 @@ rec {
       hosts = lib.concatMapStrings (m: "${m.second} ${m.first}\n") machinesWithIP;
 
       nodes_ = map (m: lib.nameValuePair m.first [
-          { config =
+          { key = "ip-address";
+            config =
               { networking.hostName = m.first;
                 networking.interfaces =
                   [ { name = "eth1";
@@ -96,7 +87,6 @@ rec {
                     }
                   ];
                 networking.extraHosts = hosts;
-                services.nixosManual.enable = false; # !!!
               };
           }
           (lib.getAttr m.first nodes)
diff --git a/tests/common/x11.nix b/tests/common/x11.nix
new file mode 100644
index 00000000000..fa8579d5ff8
--- /dev/null
+++ b/tests/common/x11.nix
@@ -0,0 +1,13 @@
+{ services.xserver.enable = true;
+
+  # Automatically log in.
+  services.xserver.displayManager.slim.enable = false;
+  services.xserver.displayManager.auto.enable = true;
+
+  # Use IceWM as the window manager.
+  services.xserver.windowManager.default = "icewm";
+  services.xserver.windowManager.icewm.enable = true;
+
+  # Don't use a desktop manager.
+  services.xserver.desktopManager.default = "none";
+}
diff --git a/tests/firefox.nix b/tests/firefox.nix
index a76d46bb7bb..46b5d8c2631 100644
--- a/tests/firefox.nix
+++ b/tests/firefox.nix
@@ -5,15 +5,7 @@
   machine = 
     { config, pkgs, ... }:
 
-    { services.xserver.enable = true;
-      services.xserver.displayManager.slim.enable = false;
-      services.xserver.displayManager.auto.enable = true;
-
-      services.xserver.windowManager.default = "icewm";
-      services.xserver.windowManager.icewm.enable = true;
-
-      services.xserver.desktopManager.default = "none";
-            
+    { require = [ ./common/x11.nix ];
       environment.systemPackages = [ pkgs.firefox ];
     };
 
diff --git a/tests/quake3.nix b/tests/quake3.nix
index 9af01214b6c..f743b9d8e91 100644
--- a/tests/quake3.nix
+++ b/tests/quake3.nix
@@ -5,7 +5,7 @@ rec {
   client = 
     { config, pkgs, ... }:
 
-    { services.xserver.enable = true;
+    { require = [ ./common/x11.nix ];
       services.xserver.driSupport = true;
       services.xserver.defaultDepth = pkgs.lib.mkOverride 0 {} 16;
       environment.systemPackages = [ pkgs.icewm pkgs.quake3demo ];
@@ -38,10 +38,8 @@ rec {
 
       sleep 20;
 
-      $client1->execute("DISPLAY=:0.0 icewm &");
       $client1->execute("DISPLAY=:0.0 quake3 '+set r_fullscreen 0' '+set name Foo' '+connect server' &");
  
-      $client2->execute("DISPLAY=:0.0 icewm &");
       $client2->execute("DISPLAY=:0.0 quake3 '+set r_fullscreen 0' '+set name Bar' '+connect server' &");
  
       sleep 40;
-- 
GitLab


From 0f5b178fcfae67bc6a539dfd788c4f3f9e0ce43b Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 5 Jan 2010 17:42:36 +0000
Subject: [PATCH 2137/5331] svn path=/nixos/trunk/; revision=19242

---
 tests/trac.nix | 33 +++++++--------------------------
 1 file changed, 7 insertions(+), 26 deletions(-)

diff --git a/tests/trac.nix b/tests/trac.nix
index 7fe85dbabfe..e5127a522a5 100644
--- a/tests/trac.nix
+++ b/tests/trac.nix
@@ -32,10 +32,9 @@
       {config, pkgs, ...}:
       {
         fileSystems = pkgs.lib.mkOverride 50 {} 
-        [ 
-          { mountPoint = "/repos";
-            device = "storage:/repos"; } 
-        ];
+          [ { mountPoint = "/repos";
+              device = "storage:/repos"; } 
+          ];
       
         services.portmap.enable = true;
         services.httpd.enable = true;
@@ -47,26 +46,8 @@
     client = 
       {config, pkgs, ...}:
       {
-        services.xserver.enable = true;
-        services.xserver.displayManager.slim.enable = false;
-        services.xserver.displayManager.kdm.enable = true;
-        services.xserver.displayManager.kdm.extraConfig =
-          ''
-            [X-:0-Core]
-            AutoLoginEnable=true
-            AutoLoginUser=alice
-            AutoLoginPass=foobar
-          '';
-        services.xserver.desktopManager.default = "kde4";
+        require = [ ./common/x11.nix ];
         services.xserver.desktopManager.kde4.enable = true;
-        users.extraUsers = pkgs.lib.singleton { 
-          name = "alice";
-          description = "Alice Foobar";
-          home = "/home/alice";
-          createHome = true;
-          useDefaultShell = true;
-          password = "foobar";
-        };
       };
   };
     
@@ -85,10 +66,10 @@
       $webserver->mustSucceed("PYTHONPATH=${pkgs.pythonPackages.psycopg2}/lib/python2.5/site-packages trac-admin /var/trac/projects/test initenv Test postgres://root\@postgresql/trac svn /repos/trac");
       
       $client->waitForFile("/tmp/.X11-unix/X0");
-      sleep 60;
+      sleep 20;
       
-      $client->execute("su - alice -c 'DISPLAY=:0.0 konqueror http://webserver/projects/test &'");
-      sleep 120;
+      $client->execute("su - root -c 'DISPLAY=:0.0 konqueror http://webserver/projects/test &'");
+      sleep 90;
       
       $client->screenshot("screen");
     '';
-- 
GitLab


From 5cc99487cbe337072f69ef3cd8b58c3f1aa16bcc Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 5 Jan 2010 23:38:13 +0000
Subject: [PATCH 2138/5331] * A function to wait until a window exists.

svn path=/nixos/trunk/; revision=19246
---
 lib/test-driver/Machine.pm               | 20 ++++++++++++++++++++
 modules/testing/test-instrumentation.nix |  3 +++
 tests/kde4.nix                           | 12 +++++-------
 3 files changed, 28 insertions(+), 7 deletions(-)

diff --git a/lib/test-driver/Machine.pm b/lib/test-driver/Machine.pm
index 34ea4e5e65c..a3c714b3a86 100644
--- a/lib/test-driver/Machine.pm
+++ b/lib/test-driver/Machine.pm
@@ -287,4 +287,24 @@ sub screenshot {
 }
 
 
+sub getWindowNames {
+    my ($self) = @_;
+    my $res = $self->mustSucceed(
+        q{DISPLAY=:0.0 xwininfo -root -tree | sed 's/.*0x[0-9a-f]* \"\([^\"]*\)\".*/\1/; t; d'});
+    return split /\n/, $res;
+}
+
+
+sub waitForWindow {
+    my ($self, $regexp) = @_;
+    while (1) {
+        my @names = $self->getWindowNames;
+        foreach my $n (@names) {
+            return if $n =~ /$regexp/;
+        }
+        sleep 2;
+    }
+};
+
+
 1;
diff --git a/modules/testing/test-instrumentation.nix b/modules/testing/test-instrumentation.nix
index 2dd1a90b966..a563852e22c 100644
--- a/modules/testing/test-instrumentation.nix
+++ b/modules/testing/test-instrumentation.nix
@@ -48,6 +48,9 @@ with pkgs.lib;
     # Panic if an error occurs in stage 1 (rather than waiting for
     # user intervention). 
     boot.kernelParams = [ "stage1panic" ];
+
+    # `xwininfo' is used by the test driver to query open windows.
+    environment.systemPackages = [ pkgs.xorg.xwininfo ];
       
   };
 
diff --git a/tests/kde4.nix b/tests/kde4.nix
index f13b87b0763..3b91b738cb7 100644
--- a/tests/kde4.nix
+++ b/tests/kde4.nix
@@ -36,18 +36,16 @@
 
   testScript =
     ''
-      $machine->waitForFile("/tmp/.X11-unix/X0");
-
-      sleep 70;
+      $machine->waitForWindow(qr/plasma-desktop/);
 
       $machine->execute("su - alice -c 'DISPLAY=:0.0 kwrite /var/log/messages &'");
-
-      sleep 10;
-      
       $machine->execute("su - alice -c 'DISPLAY=:0.0 konqueror http://localhost/ &'");
 
-      sleep 10;
+      $machine->waitForWindow(qr/messages.*KWrite/);
+      $machine->waitForWindow(qr/Valgrind.*Konqueror/);
 
+      sleep 5;
+      
       $machine->screenshot("screen");
     '';
   
-- 
GitLab


From bc68c2985c961147affd47b914fef32fa07ebe21 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 5 Jan 2010 23:59:29 +0000
Subject: [PATCH 2139/5331] * Added a function waitForX, which returns when the
 X server accepts   connections. * In the root shell, source /etc/bashrc and
 set $HOME and $DISPLAY.

svn path=/nixos/trunk/; revision=19247
---
 lib/test-driver/Machine.pm               | 21 ++++++++++++++-------
 modules/testing/test-instrumentation.nix | 10 +++++++++-
 release.nix                              |  1 +
 tests/default.nix                        |  2 +-
 tests/firefox.nix                        | 12 ++++--------
 tests/quake3.nix                         | 11 ++++-------
 tests/trac.nix                           |  9 ++++-----
 7 files changed, 37 insertions(+), 29 deletions(-)

diff --git a/lib/test-driver/Machine.pm b/lib/test-driver/Machine.pm
index a3c714b3a86..8f0bd0a88bc 100644
--- a/lib/test-driver/Machine.pm
+++ b/lib/test-driver/Machine.pm
@@ -134,11 +134,6 @@ sub connect {
 
     $self->log("connected");
     $self->{connected} = 1;
-    
-    print { $self->{socket} } "PATH=/var/run/current-system/sw/bin:/var/run/current-system/sw/sbin:\$PATH\n";
-    print { $self->{socket} } "export GCOV_PREFIX=/tmp/coverage-data\n";
-    print { $self->{socket} } "cd /tmp\n";
-    # !!! Should make sure the commands above don't produce output, otherwise we're out of sync.
 }
 
 
@@ -283,14 +278,26 @@ sub unblock {
 sub screenshot {
     my ($self, $filename) = @_;
     my $scrot = $ENV{'scrot'} or die;
-    $self->mustSucceed("DISPLAY=:0.0 $scrot /hostfs/$ENV{out}/${filename}.png");
+    $self->mustSucceed("$scrot /hostfs/$ENV{out}/${filename}.png");
 }
 
 
+# Wait until it is possible to connect to the X server.  Note that
+# testing the existence of /tmp/.X11-unix/X0 is insufficient.
+sub waitForX {
+    my ($self, $regexp) = @_;
+    while (1) {
+        my ($status, $out) = $self->execute("xwininfo -root > /dev/null 2>&1");
+        return if $status == 0;
+        sleep 1;
+    }
+};
+
+
 sub getWindowNames {
     my ($self) = @_;
     my $res = $self->mustSucceed(
-        q{DISPLAY=:0.0 xwininfo -root -tree | sed 's/.*0x[0-9a-f]* \"\([^\"]*\)\".*/\1/; t; d'});
+        q{xwininfo -root -tree | sed 's/.*0x[0-9a-f]* \"\([^\"]*\)\".*/\1/; t; d'});
     return split /\n/, $res;
 }
 
diff --git a/modules/testing/test-instrumentation.nix b/modules/testing/test-instrumentation.nix
index a563852e22c..fb807060df3 100644
--- a/modules/testing/test-instrumentation.nix
+++ b/modules/testing/test-instrumentation.nix
@@ -18,7 +18,15 @@ with pkgs.lib;
             echo "===UP===" > dev/ttyS0
           '';
           
-        exec = "${pkgs.socat}/bin/socat tcp-listen:514,fork exec:/bin/sh 2> /dev/ttyS0";
+        script =
+          ''
+            export HOME=/root
+            export DISPLAY=:0.0
+            export GCOV_PREFIX=/tmp/coverage-data
+            source /etc/bashrc
+            cd /tmp
+            exec ${pkgs.socat}/bin/socat tcp-listen:514,fork exec:/bin/sh 2> /dev/ttyS0
+          '';
       };
   
     boot.postBootCommands =
diff --git a/release.nix b/release.nix
index ec5e5aeccfa..8180df3dc4b 100644
--- a/release.nix
+++ b/release.nix
@@ -119,6 +119,7 @@ let
           system = "i686-linux";
         };
       in {
+        firefox = t.firefox.test;
         kde4 = t.kde4.test;
         quake3 = t.quake3.test;
         subversion = t.subversion.report;
diff --git a/tests/default.nix b/tests/default.nix
index 206db700b19..833d06b1f5d 100644
--- a/tests/default.nix
+++ b/tests/default.nix
@@ -23,8 +23,8 @@ let
 in
 
 {
-  kde4 = apply (import ./kde4.nix);
   firefox = apply (import ./firefox.nix);
+  kde4 = apply (import ./kde4.nix);
   quake3 = apply (import ./quake3.nix);
   subversion = apply (import ./subversion.nix);
   trac = apply (import ./trac.nix);
diff --git a/tests/firefox.nix b/tests/firefox.nix
index 46b5d8c2631..e2f10fa97ab 100644
--- a/tests/firefox.nix
+++ b/tests/firefox.nix
@@ -11,14 +11,10 @@
 
   testScript =
     ''
-      $machine->waitForFile("/tmp/.X11-unix/X0");
-
-      sleep 10;
-
-      $machine->execute("DISPLAY=:0.0 HOME=/root firefox file://${pkgs.valgrind}/share/doc/valgrind/html/index.html &");
-
-      sleep 30;
-
+      $machine->waitForX;
+      $machine->execute("firefox file://${pkgs.valgrind}/share/doc/valgrind/html/index.html &");
+      $machine->waitForWindow(/Valgrind.*Shiretoko/);
+      sleep 30; # wait until Firefox has finished loading the page
       $machine->screenshot("screen");
     '';
   
diff --git a/tests/quake3.nix b/tests/quake3.nix
index f743b9d8e91..e3a190dda7a 100644
--- a/tests/quake3.nix
+++ b/tests/quake3.nix
@@ -33,14 +33,11 @@ rec {
       startAll;
 
       $server->waitForJob("quake3-server");
-      $client1->waitForFile("/tmp/.X11-unix/X0");
-      $client2->waitForFile("/tmp/.X11-unix/X0");
+      $client1->waitForX;
+      $client2->waitForX;
 
-      sleep 20;
-
-      $client1->execute("DISPLAY=:0.0 quake3 '+set r_fullscreen 0' '+set name Foo' '+connect server' &");
- 
-      $client2->execute("DISPLAY=:0.0 quake3 '+set r_fullscreen 0' '+set name Bar' '+connect server' &");
+      $client1->execute("quake3 '+set r_fullscreen 0' '+set name Foo' '+connect server' &");
+      $client2->execute("quake3 '+set r_fullscreen 0' '+set name Bar' '+connect server' &");
  
       sleep 40;
 
diff --git a/tests/trac.nix b/tests/trac.nix
index e5127a522a5..6bb3413cea9 100644
--- a/tests/trac.nix
+++ b/tests/trac.nix
@@ -65,11 +65,10 @@
       $webserver->mustSucceed("mkdir -p /var/trac/projects/test");
       $webserver->mustSucceed("PYTHONPATH=${pkgs.pythonPackages.psycopg2}/lib/python2.5/site-packages trac-admin /var/trac/projects/test initenv Test postgres://root\@postgresql/trac svn /repos/trac");
       
-      $client->waitForFile("/tmp/.X11-unix/X0");
-      sleep 20;
-      
-      $client->execute("su - root -c 'DISPLAY=:0.0 konqueror http://webserver/projects/test &'");
-      sleep 90;
+      $client->waitForX;
+      $client->execute("konqueror http://webserver/projects/test &");
+      $client->waitForWindow(qr/Test.*Konqueror/);
+      sleep 30; # loading takes a long time
       
       $client->screenshot("screen");
     '';
-- 
GitLab


From c9e4b46d4848f9992444119b92ecef5ff957e189 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 6 Jan 2010 00:25:14 +0000
Subject: [PATCH 2140/5331] * Ugly hack: for CIFS mounts, retry the mount a few
 times (just as in   pkgs/build-support/vm).  This should make the NixOS
 regression tests   more robust on heavily loaded systems, where they now
 frequently   fail:

  server# mounting //10.0.2.4/qemu on /hostfs...
  server# [    8.233991] Slow work thread pool: Starting up
  server# [    8.234721] Slow work thread pool: Ready
  server# [   23.271708]  CIFS VFS: No response for cmd 114 mid 1
  server# [   23.272443]  CIFS VFS: cifs_mount failed w/return code = -112
  server# mount: Host is down
  server# [   23.275188] Kernel panic - not syncing: Attempted to kill init!

  Maybe there is a configurable timeout somewhere, which would be much
  nicer...

svn path=/nixos/trunk/; revision=19248
---
 modules/system/boot/stage-1-init.sh | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/modules/system/boot/stage-1-init.sh b/modules/system/boot/stage-1-init.sh
index e0d7869f910..19478f7c400 100644
--- a/modules/system/boot/stage-1-init.sh
+++ b/modules/system/boot/stage-1-init.sh
@@ -200,8 +200,17 @@ mountFS() {
     checkFS "$device"
 
     mkdir -p "/mnt-root$mountPoint" || true
-    
-    mount -t "$fsType" -o "$options" "$device" /mnt-root$mountPoint || fail
+
+    # For CIFS mounts, retry a few times before giving up.
+    local n=0
+    while true; do
+        if mount -t "$fsType" -o "$options" "$device" /mnt-root$mountPoint; then
+            break
+        fi
+        if [ "$fsType" != cifs -o "$n" -ge 10 ]; then fail; break; fi
+        echo "retrying..."
+        n=$((n + 1))
+    done
 }
 
 
-- 
GitLab


From 1da72333d9aa9cf1a1d1143d0540cdd73e9a2059 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 6 Jan 2010 12:24:20 +0000
Subject: [PATCH 2141/5331] * Put the NixOS boot at the top so that it's the
 default.

svn path=/nixos/trunk/; revision=19255
---
 modules/installer/cd-dvd/iso-image.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/modules/installer/cd-dvd/iso-image.nix b/modules/installer/cd-dvd/iso-image.nix
index 7e624244048..ea9709a9925 100644
--- a/modules/installer/cd-dvd/iso-image.nix
+++ b/modules/installer/cd-dvd/iso-image.nix
@@ -194,15 +194,15 @@ in
   # The Grub menu.
   boot.loader.grub.extraEntries =
     ''
-      menuentry "Boot from hard disk" {
-        set root=(hd0)
-        chainloader +1
-      }
-    
       menuentry "NixOS Installer / Rescue" {
         linux /boot/vmlinuz init=${config.system.build.bootStage2} systemConfig=${config.system.build.toplevel} ${toString config.boot.kernelParams}
         initrd /boot/initrd
       }
+
+      menuentry "Boot from hard disk" {
+        set root=(hd0)
+        chainloader +1
+      }
     '';
   boot.loader.grub.timeout = 10;
 
-- 
GitLab


From 816f12da885b1ac8c961ac628c932297a9f5cd2f Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 6 Jan 2010 13:36:21 +0000
Subject: [PATCH 2142/5331] * Test driver: added support for running from an
 ISO image.  The goal   is to merge test-nixos-install-from-cd so that we have
 a single   testing framework.

svn path=/nixos/trunk/; revision=19259
---
 lib/test-driver/Machine.pm     | 26 ++++++++++++++++++++------
 lib/test-driver/test-driver.pl |  2 +-
 lib/testing.nix                |  4 ++++
 tests/default.nix              |  8 ++++++--
 tests/installer.nix            | 28 ++++++++++++++++++++++++++++
 5 files changed, 59 insertions(+), 9 deletions(-)
 create mode 100644 tests/installer.nix

diff --git a/lib/test-driver/Machine.pm b/lib/test-driver/Machine.pm
index 8f0bd0a88bc..ad39ed62a01 100644
--- a/lib/test-driver/Machine.pm
+++ b/lib/test-driver/Machine.pm
@@ -16,15 +16,29 @@ print STDERR "using multicast address $mcastAddr\n";
 
 
 sub new {
-    my ($class, $vmScript) = @_;
+    my ($class, $args) = @_;
+
+    my $startCommand = $args->{startCommand};
+    if (!$startCommand) {
+        # !!! merge with qemu-vm.nix.
+        $startCommand =
+            "qemu-system-x86_64 -m 384 -no-kvm-irqchip " .
+            "-net nic,model=virtio -net user \$QEMU_OPTS ";
+        $startCommand .= "-cdrom $args->{cdrom} "
+            if defined $args->{cdrom};
+        #-drive file=$NIX_DISK_IMAGE,if=virtio,boot=on
+    }
 
-    $vmScript =~ /run-(.*)-vm$/ or die;
-    my $name = $1;
+    my $name = $args->{name};
+    if (!$name) {
+        $startCommand =~ /run-(.*)-vm$/;
+        $name = $1 || "machine";
+    }
 
     my $tmpDir = $ENV{'TMPDIR'} || "/tmp";
     
     my $self = {
-        script => $vmScript,
+        startCommand => $startCommand,
         name => $name,
         booted => 0,
         pid => 0,
@@ -79,9 +93,9 @@ sub start {
         dup2(fileno(NUL), fileno(STDIN));
         $ENV{TMPDIR} = $self->{stateDir};
         $ENV{QEMU_OPTS} = "-nographic -no-reboot -redir tcp:65535::514 -net nic,vlan=1 -net socket,vlan=1,mcast=$mcastAddr";
-        $ENV{QEMU_KERNEL_PARAMS} = "console=ttyS0 panic=1 hostTmpDir=$ENV{TMPDIR}";
+        $ENV{QEMU_KERNEL_PARAMS} = "console=tty1 console=ttyS0 panic=1 hostTmpDir=$ENV{TMPDIR}";
         chdir $self->{stateDir} or die;
-        exec $self->{script};
+        exec $self->{startCommand};
         die;
     }
 
diff --git a/lib/test-driver/test-driver.pl b/lib/test-driver/test-driver.pl
index 65d051eb170..6bac1f1dd39 100644
--- a/lib/test-driver/test-driver.pl
+++ b/lib/test-driver/test-driver.pl
@@ -10,7 +10,7 @@ my $context = "";
 
 
 foreach my $vmScript (@ARGV) {
-    my $vm = Machine->new($vmScript);
+    my $vm = Machine->new({startCommand => $vmScript});
     $vms{$vm->name} = $vm;
     $context .= "my \$" . $vm->name . " = \$vms{'" . $vm->name . "'}; ";
 }
diff --git a/lib/testing.nix b/lib/testing.nix
index 28ee564517e..6df4cd397dd 100644
--- a/lib/testing.nix
+++ b/lib/testing.nix
@@ -14,7 +14,11 @@ rec {
     stdenv.mkDerivation {
       name = "vm-test-run";
       inherit tests;
+      
       scrot = "${pkgs.scrot}/bin/scrot";
+
+      buildInputs = [ pkgs.qemu_kvm ];
+      
       buildCommand =
         ''
           mkdir $out
diff --git a/tests/default.nix b/tests/default.nix
index 833d06b1f5d..735b8bbbd4a 100644
--- a/tests/default.nix
+++ b/tests/default.nix
@@ -12,9 +12,12 @@ let
   apply = testFun:
     with testLib;
     let
-      t = testFun { inherit pkgs testLib; };
+      t = testFun { inherit pkgs nixpkgs system testLib; };
     in t // rec {
-      nodes = if t ? nodes then t.nodes else { machine = t.machine; };
+      nodes =
+        if t ? nodes then t.nodes else
+        if t ? machine then { machine = t.machine; }
+        else { };
       vms = buildVirtualNetwork { inherit nodes; };
       test = runTests vms t.testScript;
       report = makeReport test;
@@ -24,6 +27,7 @@ in
 
 {
   firefox = apply (import ./firefox.nix);
+  installer = apply (import ./installer.nix);
   kde4 = apply (import ./kde4.nix);
   quake3 = apply (import ./quake3.nix);
   subversion = apply (import ./subversion.nix);
diff --git a/tests/installer.nix b/tests/installer.nix
new file mode 100644
index 00000000000..f57f8e90a3e
--- /dev/null
+++ b/tests/installer.nix
@@ -0,0 +1,28 @@
+{ pkgs, nixpkgs, system, ... }:
+
+rec {
+
+  # Build the ISO.  This is the regular installation CD but with test
+  # instrumentation.
+  iso =
+    (import ../lib/eval-config.nix {
+      inherit nixpkgs system;
+      modules =
+        [ ../modules/installer/cd-dvd/installation-cd-minimal.nix
+          ../modules/testing/test-instrumentation.nix
+          { key = "serial"; 
+            boot.kernelParams = [ "console=tty1" "console=ttyS0" ];
+          }
+        ];
+    }).config.system.build.isoImage;
+
+  testScript =
+    ''
+      #createDisk("harddisk", 2 * 1024);
+
+      my $machine = Machine->new({ hda => "harddisk", cdrom => glob("${iso}/iso/*.iso") });
+      $machine->start;
+
+      $machine->mustSucceed("echo hello");
+    '';   
+}
-- 
GitLab


From 1b21115f61c668c8ca3cd47cda3840f2be3b0032 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 6 Jan 2010 14:37:23 +0000
Subject: [PATCH 2143/5331] * Support creating a virtual disk in the test
 driver.

svn path=/nixos/trunk/; revision=19263
---
 lib/test-driver/Machine.pm             | 21 ++++++++++++++-------
 lib/test-driver/test-driver.pl         |  9 +++++++++
 modules/installer/cd-dvd/iso-image.nix |  1 +
 tests/installer.nix                    | 24 ++++++++++++++++++++++--
 4 files changed, 46 insertions(+), 9 deletions(-)

diff --git a/lib/test-driver/Machine.pm b/lib/test-driver/Machine.pm
index ad39ed62a01..92d390b15c0 100644
--- a/lib/test-driver/Machine.pm
+++ b/lib/test-driver/Machine.pm
@@ -7,6 +7,7 @@ use Socket;
 use IO::Handle;
 use POSIX qw(dup2);
 use FileHandle;
+use Cwd;
 
 
 # Stuff our PID in the multicast address/port to prevent collissions
@@ -24,6 +25,8 @@ sub new {
         $startCommand =
             "qemu-system-x86_64 -m 384 -no-kvm-irqchip " .
             "-net nic,model=virtio -net user \$QEMU_OPTS ";
+        $startCommand .= "-drive file=" . Cwd::abs_path($args->{hda}) . ",if=virtio,boot=on "
+            if defined $args->{hda};
         $startCommand .= "-cdrom $args->{cdrom} "
             if defined $args->{cdrom};
         #-drive file=$NIX_DISK_IMAGE,if=virtio,boot=on
@@ -186,13 +189,17 @@ sub execute {
 
 
 sub mustSucceed {
-    my ($self, $command) = @_;
-    my ($status, $out) = $self->execute($command);
-    if ($status != 0) {
-        $self->log("output: $out");
-        die "command `$command' did not succeed (exit code $status)";
+    my ($self, @commands) = @_;
+    my $res;
+    foreach my $command (@commands) {
+        my ($status, $out) = $self->execute($command);
+        if ($status != 0) {
+            $self->log("output: $out");
+            die "command `$command' did not succeed (exit code $status)";
+        }
+        $res .= $out;
     }
-    return $out;
+    return $res;
 }
 
 
@@ -266,7 +273,7 @@ sub shutdown {
     my ($self) = @_;
     return unless $self->{booted};
 
-    $self->execute("poweroff -f &");
+    $self->execute("poweroff");
 
     $self->waitForShutdown;
 }
diff --git a/lib/test-driver/test-driver.pl b/lib/test-driver/test-driver.pl
index 6bac1f1dd39..2ccc6bd4b9a 100644
--- a/lib/test-driver/test-driver.pl
+++ b/lib/test-driver/test-driver.pl
@@ -52,6 +52,15 @@ sub runTests {
 }
 
 
+# Create an empty qcow2 virtual disk with the given name and size (in
+# MiB).
+sub createDisk {
+    my ($name, $size) = @_;
+    system("qemu-img create -f qcow2 $name ${size}M") == 0
+        or die "cannot create image of size $size";
+}
+
+
 END {
     foreach my $vm (values %vms) {
         if ($vm->{pid}) {
diff --git a/modules/installer/cd-dvd/iso-image.nix b/modules/installer/cd-dvd/iso-image.nix
index ea9709a9925..e97b3a51cdc 100644
--- a/modules/installer/cd-dvd/iso-image.nix
+++ b/modules/installer/cd-dvd/iso-image.nix
@@ -204,6 +204,7 @@ in
         chainloader +1
       }
     '';
+    
   boot.loader.grub.timeout = 10;
 
   # Create the ISO image.
diff --git a/tests/installer.nix b/tests/installer.nix
index f57f8e90a3e..ca712b9fc4d 100644
--- a/tests/installer.nix
+++ b/tests/installer.nix
@@ -12,17 +12,37 @@ rec {
           ../modules/testing/test-instrumentation.nix
           { key = "serial"; 
             boot.kernelParams = [ "console=tty1" "console=ttyS0" ];
+            boot.loader.grub.timeout = pkgs.lib.mkOverride 0 {} 0; 
           }
         ];
     }).config.system.build.isoImage;
 
   testScript =
     ''
-      #createDisk("harddisk", 2 * 1024);
+      createDisk("harddisk", 4 * 1024);
 
       my $machine = Machine->new({ hda => "harddisk", cdrom => glob("${iso}/iso/*.iso") });
-      $machine->start;
 
       $machine->mustSucceed("echo hello");
+
+      # Make sure that we get a login prompt etc.
+      $machine->waitForJob("tty1");
+      $machine->waitForJob("rogue");
+      $machine->waitForJob("nixos-manual");
+
+      # Partition the disk.
+      $machine->mustSucceed(
+          "parted /dev/vda mklabel msdos",
+          "parted /dev/vda mkpart primary linux-swap 0 1G",
+          "parted /dev/vda mkpart primary ext2 1G 3G",
+          # It can take udev a moment to create /dev/vda*.
+          "udevadm settle",
+          "mkswap /dev/vda1 -L swap",
+          "swapon -L swap",
+          "mkfs.ext3 -L nixos /dev/vda2",
+          "mount LABEL=nixos /mnt",
+      );
+
+      $machine->shutdown;
     '';   
 }
-- 
GitLab


From cbca2f72df68320bd8460a1e8ac6eb5092bfae84 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 6 Jan 2010 15:14:26 +0000
Subject: [PATCH 2144/5331] * Put a timeout on all wait* actions.

svn path=/nixos/trunk/; revision=19264
---
 lib/test-driver/Machine.pm | 66 ++++++++++++++++++++------------------
 tests/installer.nix        |  7 +++-
 2 files changed, 40 insertions(+), 33 deletions(-)

diff --git a/lib/test-driver/Machine.pm b/lib/test-driver/Machine.pm
index 92d390b15c0..0d3cd9c947d 100644
--- a/lib/test-driver/Machine.pm
+++ b/lib/test-driver/Machine.pm
@@ -124,6 +124,19 @@ sub start {
 }
 
 
+# Call the given code reference repeatedly, with 1 second intervals,
+# until it returns 1 or a timeout is reached.
+sub retry {
+    my ($coderef) = @_;
+    my $n;
+    for ($n = 0; $n < 300; $n++) {
+        return if &$coderef;
+        sleep 1;
+    }
+    die "action timed out after $n seconds";
+}
+
+
 sub connect {
     my ($self) = @_;
     return if $self->{connected};
@@ -132,9 +145,11 @@ sub connect {
 
     # Wait until the processQemuOutput thread signals that the machine
     # is up.
-    $self->{connectedQueue}->dequeue();
+    retry sub {
+        return 1 if $self->{connectedQueue}->dequeue_nb();
+    };
 
-    while (1) {
+    retry sub {
         $self->log("trying to connect");
         my $socket = new IO::Handle;
         $self->{socket} = $socket;
@@ -145,9 +160,8 @@ sub connect {
         flush $socket;
         my $line = readline($socket);
         chomp $line;
-        last if $line eq "hello";
-        sleep 1;
-    }    
+        return 1 if $line eq "hello";
+    };
 
     $self->log("connected");
     $self->{connected} = 1;
@@ -214,23 +228,19 @@ sub mustFail {
 # Wait for an Upstart job to reach the "running" state.
 sub waitForJob {
     my ($self, $jobName) = @_;
-    while (1) {
+    retry sub {
         my ($status, $out) = $self->execute("initctl status $jobName");
-        return if $out =~ /start\/running/;
-        sleep 1;
-        # !!! need a timeout
-    }
+        return 1 if $out =~ /start\/running/;
+    };
 }
 
 
 # Wait until the specified file exists.
 sub waitForFile {
     my ($self, $fileName) = @_;
-    while (1) {
+    retry sub {
         my ($status, $out) = $self->execute("test -e $fileName");
-        return if $status == 0;
-        sleep 1;
-        # !!! need a timeout
+        return 1 if $status == 0;
     }
 }
 
@@ -238,22 +248,17 @@ sub waitForFile {
 sub stopJob {
     my ($self, $jobName) = @_;
     $self->execute("initctl stop $jobName");
-    while (1) {
-        my ($status, $out) = $self->execute("initctl status $jobName");
-        return if $out =~ /stop\/waiting/;
-        sleep 1;
-        # !!! need a timeout
-    }
+    my ($status, $out) = $self->execute("initctl status $jobName");
+    die "failed to stop $jobName" unless $out =~ /stop\/waiting/;
 }
 
 
 # Wait until the machine is listening on the given TCP port.
 sub waitForOpenPort {
     my ($self, $port) = @_;
-    while (1) {
+    retry sub {
         my ($status, $out) = $self->execute("nc -z localhost $port");
-        return if $status == 0;
-        sleep 1;
+        return 1 if $status == 0;
     }
 }
 
@@ -261,10 +266,9 @@ sub waitForOpenPort {
 # Wait until the machine is not listening on the given TCP port.
 sub waitForClosedPort {
     my ($self, $port) = @_;
-    while (1) {
+    retry sub {
         my ($status, $out) = $self->execute("nc -z localhost $port");
-        return if $status != 0;
-        sleep 1;
+        return 1 if $status != 0;
     }
 }
 
@@ -307,10 +311,9 @@ sub screenshot {
 # testing the existence of /tmp/.X11-unix/X0 is insufficient.
 sub waitForX {
     my ($self, $regexp) = @_;
-    while (1) {
+    retry sub {
         my ($status, $out) = $self->execute("xwininfo -root > /dev/null 2>&1");
-        return if $status == 0;
-        sleep 1;
+        return 1 if $status == 0;
     }
 };
 
@@ -325,12 +328,11 @@ sub getWindowNames {
 
 sub waitForWindow {
     my ($self, $regexp) = @_;
-    while (1) {
+    retry sub {
         my @names = $self->getWindowNames;
         foreach my $n (@names) {
-            return if $n =~ /$regexp/;
+            return 1 if $n =~ /$regexp/;
         }
-        sleep 2;
     }
 };
 
diff --git a/tests/installer.nix b/tests/installer.nix
index ca712b9fc4d..c8665415044 100644
--- a/tests/installer.nix
+++ b/tests/installer.nix
@@ -44,5 +44,10 @@ rec {
       );
 
       $machine->shutdown;
-    '';   
+
+      # Now see if we can boot the installation.
+      my $machine = Machine->new({ hda => "harddisk" });
+      $machine->mustSucceed("echo hello");
+      $machine->shutdown;
+    '';
 }
-- 
GitLab


From 1d549cf6df0af5e72d1e0dfbe5f320a91bebf38e Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 6 Jan 2010 16:46:21 +0000
Subject: [PATCH 2145/5331] * Test whether nix-env -i works.

svn path=/nixos/trunk/; revision=19265
---
 tests/installer.nix | 24 +++++++++++++++++++++++-
 1 file changed, 23 insertions(+), 1 deletion(-)

diff --git a/tests/installer.nix b/tests/installer.nix
index c8665415044..8974121b824 100644
--- a/tests/installer.nix
+++ b/tests/installer.nix
@@ -12,11 +12,16 @@ rec {
           ../modules/testing/test-instrumentation.nix
           { key = "serial"; 
             boot.kernelParams = [ "console=tty1" "console=ttyS0" ];
-            boot.loader.grub.timeout = pkgs.lib.mkOverride 0 {} 0; 
+            boot.loader.grub.timeout = pkgs.lib.mkOverride 0 {} 0;
+            # The test cannot access the network, so any sources we
+            # need must be included in the ISO.
+            isoImage.storeContents = [ pkgs.hello.src ];
           }
         ];
     }).config.system.build.isoImage;
 
+  # The test script boots the CD, installs NixOS on an empty hard
+  # disk, and then reboot from the hard disk.
   testScript =
     ''
       createDisk("harddisk", 4 * 1024);
@@ -30,6 +35,13 @@ rec {
       $machine->waitForJob("rogue");
       $machine->waitForJob("nixos-manual");
 
+      # Test nix-env.
+      $machine->mustSucceed("source /etc/profile");
+      $machine->mustFail("hello");
+      $machine->mustSucceed("nix-env -i hello");
+      $machine->mustSucceed("hello") =~ /Hello, world/
+          or die "bad `hello' output";
+
       # Partition the disk.
       $machine->mustSucceed(
           "parted /dev/vda mklabel msdos",
@@ -43,6 +55,15 @@ rec {
           "mount LABEL=nixos /mnt",
       );
 
+      # Create a NixOS configuration.
+      $machine->mustSucceed(
+          "mkdir -p /mnt/etc/nixos",
+          "nixos-hardware-scan > /mnt/etc/nixos/hardware.nix",
+      );
+
+      my $cfg = $machine->mustSucceed("cat /mnt/etc/nixos/hardware.nix");
+      print STDERR "Result of the hardware scan:$cfg\n";
+
       $machine->shutdown;
 
       # Now see if we can boot the installation.
@@ -50,4 +71,5 @@ rec {
       $machine->mustSucceed("echo hello");
       $machine->shutdown;
     '';
+
 }
-- 
GitLab


From 99644df67a6f2d092af91b24c5a21b11b9eb65fb Mon Sep 17 00:00:00 2001
From: Marc Weber <marco-oweber@gmx.de>
Date: Wed, 6 Jan 2010 17:05:57 +0000
Subject: [PATCH 2146/5331] customizable PHPRC

svn path=/nixos/trunk/; revision=19267
---
 .../web-servers/apache-httpd/default.nix      | 38 ++++++++++++++++---
 1 file changed, 33 insertions(+), 5 deletions(-)

diff --git a/modules/services/web-servers/apache-httpd/default.nix b/modules/services/web-servers/apache-httpd/default.nix
index 91fce4f8dff..fd03b8b6533 100644
--- a/modules/services/web-servers/apache-httpd/default.nix
+++ b/modules/services/web-servers/apache-httpd/default.nix
@@ -464,6 +464,37 @@ in
         '';
       };
 
+      phpIni = mkOption {
+        default = ''
+           ; Needed for PHP's mail() function.
+           sendmail_path = sendmail -t -i
+         '';
+
+        /*
+         phpIni =  pkgs.phpIniBuilder.override {
+            appendLines = ''
+             sendmail_path = sendmail -t -i
+
+             zend_extension="${pkgs.phpXdebug}/lib/xdebug.so"
+             zend_extension_ts="${pkgs.phpXdebug}/lib/xdebug.so"
+             zend_extension_debug="${pkgs.phpXdebug}/lib/xdebug.so"
+             xdebug.remote_enable=true
+             xdebug.remote_host=127.0.0.1
+             xdebug.remote_port=9000
+             xdebug.remote_handler=dbgp
+             xdebug.profiler_enable=0
+             xdebug.profiler_output_dir="/tmp/xdebug"
+             xdebug.remote_mode=req
+            '';
+          };
+
+        */
+        description = ''
+          You can override php default settings by using a customized php.ini file.
+          Have a look at teh comment above this description to see how to enable Xdebug
+        '';
+      };
+
     }
 
     # Include the options shared between the main server and virtual hosts.
@@ -520,11 +551,8 @@ in
                 optional config.networking.defaultMailServer.directDelivery "${pkgs.ssmtp}/sbin"
              ++ (concatMap (svc: svc.extraServerPath) allSubservices) );
 
-           PHPRC = pkgs.writeText "php.ini"
-             ''
-               ; Needed for PHP's mail() function.
-               sendmail_path = sendmail -t -i
-             '';
+           # only php is using PHPRC. When PHP isn't enabled it doesn't hurt much
+           PHPRC = mainCfg.phpIni;
            
           } // (listToAttrs (concatMap (svc: svc.globalEnvVars) allSubservices));
 
-- 
GitLab


From bb236f99de9b2115c20b163c99b0056b4b5797e1 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 6 Jan 2010 18:03:31 +0000
Subject: [PATCH 2147/5331] * Urgh, socat ignores SIGCHLD, which causes Nix
 builds to fail.

svn path=/nixos/trunk/; revision=19270
---
 modules/testing/test-instrumentation.nix | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

diff --git a/modules/testing/test-instrumentation.nix b/modules/testing/test-instrumentation.nix
index fb807060df3..4b142197932 100644
--- a/modules/testing/test-instrumentation.nix
+++ b/modules/testing/test-instrumentation.nix
@@ -5,6 +5,19 @@
 
 with pkgs.lib;
 
+let
+
+  # Urgh, `socat' sets the SIGCHLD to ignore.  This wreaks havoc with
+  # some programs.
+  rootShell = pkgs.writeScript "shell.pl"
+    ''
+      #! ${pkgs.perl}/bin/perl
+      $SIG{CHLD} = 'DEFAULT';
+      exec "/bin/sh";
+    '';
+
+in
+    
 {
 
   config = {
@@ -20,12 +33,13 @@ with pkgs.lib;
           
         script =
           ''
+            export USER=root
             export HOME=/root
             export DISPLAY=:0.0
             export GCOV_PREFIX=/tmp/coverage-data
-            source /etc/bashrc
+            source /etc/profile
             cd /tmp
-            exec ${pkgs.socat}/bin/socat tcp-listen:514,fork exec:/bin/sh 2> /dev/ttyS0
+            exec ${pkgs.socat}/bin/socat tcp-listen:514,fork exec:${rootShell} 2> /dev/ttyS0
           '';
       };
   
-- 
GitLab


From 8ebde1ea8a59cabe61bcde80aea4738669420406 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 6 Jan 2010 20:09:53 +0000
Subject: [PATCH 2148/5331] * Add the modules for all block devices.

svn path=/nixos/trunk/; revision=19271
---
 modules/installer/tools/nixos-hardware-scan.pl | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/modules/installer/tools/nixos-hardware-scan.pl b/modules/installer/tools/nixos-hardware-scan.pl
index 50ce8a043f6..dd522f543bd 100644
--- a/modules/installer/tools/nixos-hardware-scan.pl
+++ b/modules/installer/tools/nixos-hardware-scan.pl
@@ -176,6 +176,19 @@ foreach my $path (glob "/sys/bus/usb/devices/*") {
 }
 
 
+# Add the modules for all block devices.
+
+foreach my $path (glob "/sys/class/block/*") {
+    my $module;
+    print STDERR "$path\n";
+    if (-e "$path/device/driver/module") {
+        $module = basename `readlink -f $path/device/driver/module`;
+        chomp $module;
+        push @initrdKernelModules, $module;
+    }
+}
+
+
 # Generate the configuration file.
 
 sub removeDups {
-- 
GitLab


From 83478a08005a8fc1db204a5559e51147b52a8292 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 6 Jan 2010 20:51:10 +0000
Subject: [PATCH 2149/5331] * Add klibc and klibcShrunk to the CD because
 they're always needed   during an installation.

svn path=/nixos/trunk/; revision=19273
---
 modules/installer/cd-dvd/installation-cd-base.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/installer/cd-dvd/installation-cd-base.nix b/modules/installer/cd-dvd/installation-cd-base.nix
index 07d63c76fe1..2cd75b4a544 100644
--- a/modules/installer/cd-dvd/installation-cd-base.nix
+++ b/modules/installer/cd-dvd/installation-cd-base.nix
@@ -234,7 +234,7 @@ in
 
   # To speed up installation a little bit, include the complete stdenv
   # in the Nix store on the CD.
-  isoImage.storeContents = [pkgs.stdenv];
+  isoImage.storeContents = [ pkgs.stdenv pkgs.klibc pkgs.klibcShrunk ];
 
   # Allow sshd to be started manually through "start sshd".  It should
   # not be started by default on the installation CD because the
-- 
GitLab


From bffb5450e5b666d1328419a77df9ceb327d63ad9 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 6 Jan 2010 20:52:05 +0000
Subject: [PATCH 2150/5331] * Perform a full installation and boot from the
 installed system.

svn path=/nixos/trunk/; revision=19274
---
 lib/test-driver/Machine.pm |  7 +++++
 tests/installer.nix        | 64 +++++++++++++++++++++++++++++++++-----
 2 files changed, 63 insertions(+), 8 deletions(-)

diff --git a/lib/test-driver/Machine.pm b/lib/test-driver/Machine.pm
index 0d3cd9c947d..64f62adab16 100644
--- a/lib/test-driver/Machine.pm
+++ b/lib/test-driver/Machine.pm
@@ -337,4 +337,11 @@ sub waitForWindow {
 };
 
 
+sub copyFileFromHost {
+    my ($self, $from, $to) = @_;
+    my $s = `cat $from` or die;
+    $self->mustSucceed("echo '$s' > $to"); # !!! escaping
+}
+
+
 1;
diff --git a/tests/installer.nix b/tests/installer.nix
index 8974121b824..c44990a3451 100644
--- a/tests/installer.nix
+++ b/tests/installer.nix
@@ -8,18 +8,50 @@ rec {
     (import ../lib/eval-config.nix {
       inherit nixpkgs system;
       modules =
-        [ ../modules/installer/cd-dvd/installation-cd-minimal.nix
+        [ ../modules/installer/cd-dvd/installation-cd-graphical.nix
           ../modules/testing/test-instrumentation.nix
           { key = "serial"; 
-            boot.kernelParams = [ "console=tty1" "console=ttyS0" ];
+            boot.kernelParams = [ "console=tty1" "console=ttyS0" "panic=1" ];
             boot.loader.grub.timeout = pkgs.lib.mkOverride 0 {} 0;
+            
             # The test cannot access the network, so any sources we
             # need must be included in the ISO.
-            isoImage.storeContents = [ pkgs.hello.src ];
+            isoImage.storeContents =
+              [ pkgs.hello.src
+                pkgs.glibcLocales
+                pkgs.sudo
+                pkgs.docbook5
+              ];
           }
         ];
     }).config.system.build.isoImage;
 
+  # The configuration to install.
+  config = pkgs.writeText "configuration.nix"
+    ''
+      { config, pkgs, modulesPath, ... }:
+
+      { require =
+          [ ./hardware.nix
+            "''${modulesPath}/testing/test-instrumentation.nix"
+          ];
+
+        boot.loader.grub.version = 2;
+        boot.loader.grub.device = "/dev/vda";
+        boot.initrd.kernelModules = [ "ext3" ];
+        boot.kernelParams = [ "console=tty1" "console=ttyS0" "panic=1" ];
+      
+        fileSystems =
+          [ { mountPoint = "/";
+              device = "/dev/disk/by-label/nixos";
+            }
+          ];
+          
+        swapDevices =
+          [ { label = "swap"; } ];
+      }
+    '';
+
   # The test script boots the CD, installs NixOS on an empty hard
   # disk, and then reboot from the hard disk.
   testScript =
@@ -35,8 +67,11 @@ rec {
       $machine->waitForJob("rogue");
       $machine->waitForJob("nixos-manual");
 
+      # Make sure that we don't try to download anything.
+      $machine->stopJob("dhclient");
+      $machine->mustSucceed("rm /etc/resolv.conf");
+
       # Test nix-env.
-      $machine->mustSucceed("source /etc/profile");
       $machine->mustFail("hello");
       $machine->mustSucceed("nix-env -i hello");
       $machine->mustSucceed("hello") =~ /Hello, world/
@@ -45,8 +80,8 @@ rec {
       # Partition the disk.
       $machine->mustSucceed(
           "parted /dev/vda mklabel msdos",
-          "parted /dev/vda mkpart primary linux-swap 0 1G",
-          "parted /dev/vda mkpart primary ext2 1G 3G",
+          "parted /dev/vda -- mkpart primary linux-swap 1M 1024M",
+          "parted /dev/vda -- mkpart primary ext2 1024M -1s",
           # It can take udev a moment to create /dev/vda*.
           "udevadm settle",
           "mkswap /dev/vda1 -L swap",
@@ -55,20 +90,33 @@ rec {
           "mount LABEL=nixos /mnt",
       );
 
-      # Create a NixOS configuration.
+      # Create the NixOS configuration.
       $machine->mustSucceed(
           "mkdir -p /mnt/etc/nixos",
           "nixos-hardware-scan > /mnt/etc/nixos/hardware.nix",
       );
 
       my $cfg = $machine->mustSucceed("cat /mnt/etc/nixos/hardware.nix");
-      print STDERR "Result of the hardware scan:$cfg\n";
+      print STDERR "Result of the hardware scan:\n$cfg\n";
+
+      $machine->copyFileFromHost("${config}", "/mnt/etc/nixos/configuration.nix");
 
+      # Perform the installation.
+      $machine->mustSucceed("nixos-install >&2");
+      
       $machine->shutdown;
 
       # Now see if we can boot the installation.
       my $machine = Machine->new({ hda => "harddisk" });
+      
       $machine->mustSucceed("echo hello");
+
+      $machine->mustSucceed("nix-env -i coreutils");
+      $machine->mustSucceed("type -tP ls") =~ /profiles/
+          or die "nix-env failed";
+
+      #$machine->mustSucceed("nixos-rebuild switch");
+
       $machine->shutdown;
     '';
 
-- 
GitLab


From ec3398e4b2b987eaa0615ee2bab49ee9133e340d Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 6 Jan 2010 21:16:57 +0000
Subject: [PATCH 2151/5331] * Move the serial console kernel parameters to
 test-instrumentation.nix.

svn path=/nixos/trunk/; revision=19275
---
 lib/test-driver/Machine.pm               | 2 +-
 modules/testing/test-instrumentation.nix | 3 ++-
 release.nix                              | 1 +
 tests/installer.nix                      | 4 +---
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/lib/test-driver/Machine.pm b/lib/test-driver/Machine.pm
index 64f62adab16..069d60261a1 100644
--- a/lib/test-driver/Machine.pm
+++ b/lib/test-driver/Machine.pm
@@ -96,7 +96,7 @@ sub start {
         dup2(fileno(NUL), fileno(STDIN));
         $ENV{TMPDIR} = $self->{stateDir};
         $ENV{QEMU_OPTS} = "-nographic -no-reboot -redir tcp:65535::514 -net nic,vlan=1 -net socket,vlan=1,mcast=$mcastAddr";
-        $ENV{QEMU_KERNEL_PARAMS} = "console=tty1 console=ttyS0 panic=1 hostTmpDir=$ENV{TMPDIR}";
+        $ENV{QEMU_KERNEL_PARAMS} = "hostTmpDir=$ENV{TMPDIR}";
         chdir $self->{stateDir} or die;
         exec $self->{startCommand};
         die;
diff --git a/modules/testing/test-instrumentation.nix b/modules/testing/test-instrumentation.nix
index 4b142197932..c404e044f63 100644
--- a/modules/testing/test-instrumentation.nix
+++ b/modules/testing/test-instrumentation.nix
@@ -69,7 +69,8 @@ in
 
     # Panic if an error occurs in stage 1 (rather than waiting for
     # user intervention). 
-    boot.kernelParams = [ "stage1panic" ];
+    boot.kernelParams =
+      [ "console=tty1" "console=ttyS0" "panic=1" "stage1panic" ];
 
     # `xwininfo' is used by the test driver to query open windows.
     environment.systemPackages = [ pkgs.xorg.xwininfo ];
diff --git a/release.nix b/release.nix
index 8180df3dc4b..0cfa377a5df 100644
--- a/release.nix
+++ b/release.nix
@@ -120,6 +120,7 @@ let
         };
       in {
         firefox = t.firefox.test;
+        installer = t.installer.test;
         kde4 = t.kde4.test;
         quake3 = t.quake3.test;
         subversion = t.subversion.report;
diff --git a/tests/installer.nix b/tests/installer.nix
index c44990a3451..115f7a82a46 100644
--- a/tests/installer.nix
+++ b/tests/installer.nix
@@ -11,7 +11,6 @@ rec {
         [ ../modules/installer/cd-dvd/installation-cd-graphical.nix
           ../modules/testing/test-instrumentation.nix
           { key = "serial"; 
-            boot.kernelParams = [ "console=tty1" "console=ttyS0" "panic=1" ];
             boot.loader.grub.timeout = pkgs.lib.mkOverride 0 {} 0;
             
             # The test cannot access the network, so any sources we
@@ -39,7 +38,6 @@ rec {
         boot.loader.grub.version = 2;
         boot.loader.grub.device = "/dev/vda";
         boot.initrd.kernelModules = [ "ext3" ];
-        boot.kernelParams = [ "console=tty1" "console=ttyS0" "panic=1" ];
       
         fileSystems =
           [ { mountPoint = "/";
@@ -115,7 +113,7 @@ rec {
       $machine->mustSucceed("type -tP ls") =~ /profiles/
           or die "nix-env failed";
 
-      #$machine->mustSucceed("nixos-rebuild switch");
+      #$machine->mustSucceed("nixos-rebuild switch >&2");
 
       $machine->shutdown;
     '';
-- 
GitLab


From ed7d09662471d32f86eac72215a0b3c58031f026 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 6 Jan 2010 22:41:59 +0000
Subject: [PATCH 2152/5331] * Resolve $device (e.g. from /dev/disk/by-label/foo
 -> /dev/sda2),   because /proc/swaps contains resolved paths as well. 
 Without this,   the swap device will be turned off again by the $unused code.

svn path=/nixos/trunk/; revision=19278
---
 modules/tasks/swap.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/modules/tasks/swap.nix b/modules/tasks/swap.nix
index 066914a3e43..333cf674c07 100644
--- a/modules/tasks/swap.nix
+++ b/modules/tasks/swap.nix
@@ -91,6 +91,7 @@ in
                   device="${config.device}"
                 ''
               }
+              device=$(readlink -f "$device")
               # Add new swap devices.
               if echo $unused | grep -q "^$device\$"; then
                 unused="$(echo $unused | grep -v "^$device\$")"
-- 
GitLab


From 381a38f5febec6d6e31c0207f78703ae28deec84 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 6 Jan 2010 22:53:27 +0000
Subject: [PATCH 2153/5331] * Do a nixos-rebuild in the installed machine and
 then reboot again to   see if the system still boots.

svn path=/nixos/trunk/; revision=19279
---
 tests/installer.nix | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/tests/installer.nix b/tests/installer.nix
index 115f7a82a46..ec1a39602ce 100644
--- a/tests/installer.nix
+++ b/tests/installer.nix
@@ -109,13 +109,19 @@ rec {
       
       $machine->mustSucceed("echo hello");
 
-      $machine->mustSucceed("nix-env -i coreutils");
+      $machine->mustSucceed("nix-env -i coreutils >&2");
       $machine->mustSucceed("type -tP ls") =~ /profiles/
           or die "nix-env failed";
 
-      #$machine->mustSucceed("nixos-rebuild switch >&2");
+      $machine->mustSucceed("nixos-rebuild switch >&2");
 
       $machine->shutdown;
+
+      # And just to be sure, check that the machine still boots after
+      # "nixos-rebuild switch".
+      my $machine = Machine->new({ hda => "harddisk" });
+      $machine->mustSucceed("echo hello");
+      $machine->shutdown;
     '';
 
 }
-- 
GitLab


From ac7c404debfaf84b1f361993b1e647902d6cafe9 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 6 Jan 2010 23:37:30 +0000
Subject: [PATCH 2154/5331] * Revert r19267 - it causes a corrupt Apache
 Upstart job to be   generated.  E.g. in  
 http://hydra.nixos.org/build/208321/nixlog/8/raw:

    webserver# init:/etc/init/httpd.conf:14: Unexpected token

svn path=/nixos/trunk/; revision=19280
---
 .../web-servers/apache-httpd/default.nix      | 38 +++----------------
 1 file changed, 5 insertions(+), 33 deletions(-)

diff --git a/modules/services/web-servers/apache-httpd/default.nix b/modules/services/web-servers/apache-httpd/default.nix
index fd03b8b6533..91fce4f8dff 100644
--- a/modules/services/web-servers/apache-httpd/default.nix
+++ b/modules/services/web-servers/apache-httpd/default.nix
@@ -464,37 +464,6 @@ in
         '';
       };
 
-      phpIni = mkOption {
-        default = ''
-           ; Needed for PHP's mail() function.
-           sendmail_path = sendmail -t -i
-         '';
-
-        /*
-         phpIni =  pkgs.phpIniBuilder.override {
-            appendLines = ''
-             sendmail_path = sendmail -t -i
-
-             zend_extension="${pkgs.phpXdebug}/lib/xdebug.so"
-             zend_extension_ts="${pkgs.phpXdebug}/lib/xdebug.so"
-             zend_extension_debug="${pkgs.phpXdebug}/lib/xdebug.so"
-             xdebug.remote_enable=true
-             xdebug.remote_host=127.0.0.1
-             xdebug.remote_port=9000
-             xdebug.remote_handler=dbgp
-             xdebug.profiler_enable=0
-             xdebug.profiler_output_dir="/tmp/xdebug"
-             xdebug.remote_mode=req
-            '';
-          };
-
-        */
-        description = ''
-          You can override php default settings by using a customized php.ini file.
-          Have a look at teh comment above this description to see how to enable Xdebug
-        '';
-      };
-
     }
 
     # Include the options shared between the main server and virtual hosts.
@@ -551,8 +520,11 @@ in
                 optional config.networking.defaultMailServer.directDelivery "${pkgs.ssmtp}/sbin"
              ++ (concatMap (svc: svc.extraServerPath) allSubservices) );
 
-           # only php is using PHPRC. When PHP isn't enabled it doesn't hurt much
-           PHPRC = mainCfg.phpIni;
+           PHPRC = pkgs.writeText "php.ini"
+             ''
+               ; Needed for PHP's mail() function.
+               sendmail_path = sendmail -t -i
+             '';
            
           } // (listToAttrs (concatMap (svc: svc.globalEnvVars) allSubservices));
 
-- 
GitLab


From fdc63c54e42f317865d3d7b17dc16325a97821fc Mon Sep 17 00:00:00 2001
From: Marc Weber <marco-oweber@gmx.de>
Date: Thu, 7 Jan 2010 09:01:40 +0000
Subject: [PATCH 2155/5331] enhance phpIni documentation

readd r19267 (the issue should be fixed now)

Eelco Dolstra and Nicolas Pierron both kept asking me to pay attention
to the rendered manual. There is one catch: example settings such as
pkgs.kernelPackages_2_6_25 are correct however they don't render
properly. Moreover you don't want those examples to be evaluated (maybe
compiling a kernel ?) when building the manual only.
So use Strings and add a copy & paste note.
This is still a hacky. Maybe a kind of typed "verbatim" expression
should be added (?)

svn path=/nixos/trunk/; revision=19281
---
 .../web-servers/apache-httpd/default.nix      | 58 +++++++++++++++++--
 modules/system/boot/kernel.nix                |  6 +-
 2 files changed, 57 insertions(+), 7 deletions(-)

diff --git a/modules/services/web-servers/apache-httpd/default.nix b/modules/services/web-servers/apache-httpd/default.nix
index 91fce4f8dff..878e1c1f371 100644
--- a/modules/services/web-servers/apache-httpd/default.nix
+++ b/modules/services/web-servers/apache-httpd/default.nix
@@ -464,6 +464,56 @@ in
         '';
       };
 
+      phpIni = mkOption {
+        default = pkgs.writeText "php.ini" ''
+           ; Needed for PHP's mail() function.
+           sendmail_path = sendmail -t -i
+         '';
+
+        example = ''
+        Example code (copy & paste):
+
+         most simple:
+         phpIni pkgs.writeText "php.ini" '''
+           ; Needed for PHP's mail() function.
+           sendmail_path = sendmail -t -i
+         ''';
+
+         using recommended settings and enabling Xdebug:
+         phpIni =  pkgs.phpIniBuilder.override {
+            appendLines = '''
+             sendmail_path = sendmail -t -i
+             zend_extension="''\${pkgs.phpXdebug}/lib/xdebug.so"
+             zend_extension_ts="''\${pkgs.phpXdebug}/lib/xdebug.so"
+             zend_extension_debug="''\${pkgs.phpXdebug}/lib/xdebug.so"
+             xdebug.remote_enable=true
+             xdebug.remote_host=127.0.0.1
+             xdebug.remote_port=9000
+             xdebug.remote_handler=dbgp
+             xdebug.profiler_enable=0
+             xdebug.profiler_output_dir="/tmp/xdebug"
+             xdebug.remote_mode=req
+            ''';
+          };
+        '';
+
+
+        description = ''
+          The contents of this option are used as global php.ini file by the
+          PHP interpreter used by Apache. You have to enable PHP explicitly.
+          See extraModules options.
+
+          This file defaults to defining sendmail_path only.
+
+          Note: Depending on your configuration you can set PHP ini values using .htaccess files and the
+          php_value option.
+
+          The example shows how to enable Xdebug and use the recommended
+          php.ini values which are contained in the PHP distribution.
+          I don't know whether they are equal to defaults
+        '';
+      };
+
     }
 
     # Include the options shared between the main server and virtual hosts.
@@ -520,12 +570,8 @@ in
                 optional config.networking.defaultMailServer.directDelivery "${pkgs.ssmtp}/sbin"
              ++ (concatMap (svc: svc.extraServerPath) allSubservices) );
 
-           PHPRC = pkgs.writeText "php.ini"
-             ''
-               ; Needed for PHP's mail() function.
-               sendmail_path = sendmail -t -i
-             '';
-           
+           PHPRC = mainCfg.phpIni;
+
           } // (listToAttrs (concatMap (svc: svc.globalEnvVars) allSubservices));
 
         preStart =
diff --git a/modules/system/boot/kernel.nix b/modules/system/boot/kernel.nix
index 60bc47cdc65..ea93f86e321 100644
--- a/modules/system/boot/kernel.nix
+++ b/modules/system/boot/kernel.nix
@@ -12,7 +12,11 @@ let kernel = config.boot.kernelPackages.kernel; in
   
     boot.kernelPackages = mkOption {
       default = pkgs.kernelPackages;
-      example = pkgs.kernelPackages_2_6_25;
+      example = ''
+        Example code (copy & paste):
+        pkgs.kernelPackages_2_6_25
+      '';
+
       description = ''
         This option allows you to override the Linux kernel used by
         NixOS.  Since things like external kernel module packages are
-- 
GitLab


From a776afb0852961fed4da081a494f4a3f878f2daa Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 7 Jan 2010 13:19:38 +0000
Subject: [PATCH 2156/5331] * Parameterize the installer test to support
 different partitioning   schemes. * Added a test for installing NixOS with a
 separate /boot partition.

svn path=/nixos/trunk/; revision=19283
---
 release.nix         | 21 +++-------
 tests/default.nix   | 30 +++++++-------
 tests/installer.nix | 98 ++++++++++++++++++++++++++++++++++++---------
 3 files changed, 102 insertions(+), 47 deletions(-)

diff --git a/release.nix b/release.nix
index 0cfa377a5df..e33031e8041 100644
--- a/release.nix
+++ b/release.nix
@@ -111,6 +111,10 @@ let
     minimal_install_archive = {system ? "i686-linux"}: (iso_minimal {inherit system;})
       .config.system.build.minimalInstallArchive;
 
+    # the archive installer can't be tested without chroot which requires being root
+    # options: run in kvm or uml ?
+    # TODO
+
     tests = 
       { services ? ../services }:
       let
@@ -120,27 +124,14 @@ let
         };
       in {
         firefox = t.firefox.test;
-        installer = t.installer.test;
+        installer.simple = t.installer.simple.test;
+        installer.separateBoot = t.installer.separateBoot.test;
         kde4 = t.kde4.test;
         quake3 = t.quake3.test;
         subversion = t.subversion.report;
         trac = t.trac.test;
       };
 
-    /*
-    ### tests about installing NixOS
-
-    # installs NixOs in a qemu_kvm instance using a tweaked iso.
-    tests.nixosInstallation = 
-      (import ./tests/test-nixos-install-from-cd/test.nix {
-        inherit nixpkgs;
-      }).test;
-    */
-
-    # the archive installer can't be tested without chroot which requires being root
-    # options: run in kvm or uml ?
-    # TODO
-
   };
   
 
diff --git a/tests/default.nix b/tests/default.nix
index 735b8bbbd4a..5045375e10d 100644
--- a/tests/default.nix
+++ b/tests/default.nix
@@ -9,25 +9,27 @@ let
     (import ../lib/build-vms.nix { inherit nixpkgs services system; }) //
     (import ../lib/testing.nix { inherit nixpkgs services system; });
 
-  apply = testFun:
-    with testLib;
-    let
-      t = testFun { inherit pkgs nixpkgs system testLib; };
-    in t // rec {
-      nodes =
-        if t ? nodes then t.nodes else
-        if t ? machine then { machine = t.machine; }
-        else { };
-      vms = buildVirtualNetwork { inherit nodes; };
-      test = runTests vms t.testScript;
-      report = makeReport test;
-    };
+in with testLib; let 
+
+  call = f: f { inherit pkgs nixpkgs system testLib; };
+    
+  apply = testFun: complete (call testFun);
+
+  complete = t: t // rec {
+    nodes =
+      if t ? nodes then t.nodes else
+      if t ? machine then { machine = t.machine; }
+      else { };
+    vms = buildVirtualNetwork { inherit nodes; };
+    test = runTests vms t.testScript;
+    report = makeReport test;
+  };
 
 in
 
 {
   firefox = apply (import ./firefox.nix);
-  installer = apply (import ./installer.nix);
+  installer = pkgs.lib.mapAttrs (name: complete) (call (import ./installer.nix));
   kde4 = apply (import ./kde4.nix);
   quake3 = apply (import ./quake3.nix);
   subversion = apply (import ./subversion.nix);
diff --git a/tests/installer.nix b/tests/installer.nix
index ec1a39602ce..ae6eab172a7 100644
--- a/tests/installer.nix
+++ b/tests/installer.nix
@@ -1,6 +1,6 @@
 { pkgs, nixpkgs, system, ... }:
 
-rec {
+let
 
   # Build the ISO.  This is the regular installation CD but with test
   # instrumentation.
@@ -26,7 +26,7 @@ rec {
     }).config.system.build.isoImage;
 
   # The configuration to install.
-  config = pkgs.writeText "configuration.nix"
+  config = { fileSystems }: pkgs.writeText "configuration.nix"
     ''
       { config, pkgs, modulesPath, ... }:
 
@@ -40,9 +40,7 @@ rec {
         boot.initrd.kernelModules = [ "ext3" ];
       
         fileSystems =
-          [ { mountPoint = "/";
-              device = "/dev/disk/by-label/nixos";
-            }
+          [ ${fileSystems}
           ];
           
         swapDevices =
@@ -50,9 +48,23 @@ rec {
       }
     '';
 
+  rootFS =
+    ''
+      { mountPoint = "/";
+        device = "/dev/disk/by-label/nixos";
+      }
+    '';
+    
+  bootFS =
+    ''
+      { mountPoint = "/boot";
+        device = "/dev/disk/by-label/boot";
+      }
+    '';
+
   # The test script boots the CD, installs NixOS on an empty hard
   # disk, and then reboot from the hard disk.
-  testScript =
+  testScriptFun = { createPartitions, fileSystems }:
     ''
       createDisk("harddisk", 4 * 1024);
 
@@ -76,17 +88,7 @@ rec {
           or die "bad `hello' output";
 
       # Partition the disk.
-      $machine->mustSucceed(
-          "parted /dev/vda mklabel msdos",
-          "parted /dev/vda -- mkpart primary linux-swap 1M 1024M",
-          "parted /dev/vda -- mkpart primary ext2 1024M -1s",
-          # It can take udev a moment to create /dev/vda*.
-          "udevadm settle",
-          "mkswap /dev/vda1 -L swap",
-          "swapon -L swap",
-          "mkfs.ext3 -L nixos /dev/vda2",
-          "mount LABEL=nixos /mnt",
-      );
+      ${createPartitions}
 
       # Create the NixOS configuration.
       $machine->mustSucceed(
@@ -97,11 +99,15 @@ rec {
       my $cfg = $machine->mustSucceed("cat /mnt/etc/nixos/hardware.nix");
       print STDERR "Result of the hardware scan:\n$cfg\n";
 
-      $machine->copyFileFromHost("${config}", "/mnt/etc/nixos/configuration.nix");
+      $machine->copyFileFromHost(
+          "${ config { inherit fileSystems; } }",
+          "/mnt/etc/nixos/configuration.nix");
 
       # Perform the installation.
       $machine->mustSucceed("nixos-install >&2");
       
+      $machine->mustSucceed("cat /boot/grub/grub.cfg >&2");
+      
       $machine->shutdown;
 
       # Now see if we can boot the installation.
@@ -109,12 +115,18 @@ rec {
       
       $machine->mustSucceed("echo hello");
 
+      # Did /boot get mounted, if appropriate?
+      $machine->mustSucceed("initctl start filesystems");
+      $machine->mustSucceed("test -e /boot/grub/grub.cfg");
+      
       $machine->mustSucceed("nix-env -i coreutils >&2");
       $machine->mustSucceed("type -tP ls") =~ /profiles/
           or die "nix-env failed";
 
       $machine->mustSucceed("nixos-rebuild switch >&2");
 
+      $machine->mustSucceed("cat /boot/grub/grub.cfg >&2");
+      
       $machine->shutdown;
 
       # And just to be sure, check that the machine still boots after
@@ -124,4 +136,54 @@ rec {
       $machine->shutdown;
     '';
 
+  makeTest = { createPartitions, fileSystems }:
+    { inherit iso;
+      testScript = testScriptFun { inherit createPartitions fileSystems; };
+    };
+    
+
+in {
+
+  # The (almost) simplest partitioning scheme: a swap partition and
+  # one big filesystem partition.
+  simple = makeTest
+    { createPartitions = 
+        ''
+          $machine->mustSucceed(
+              "parted /dev/vda mklabel msdos",
+              "parted /dev/vda -- mkpart primary linux-swap 1M 1024M",
+              "parted /dev/vda -- mkpart primary ext2 1024M -1s",
+              # It can take udev a moment to create /dev/vda*.
+              "udevadm settle",
+              "mkswap /dev/vda1 -L swap",
+              "swapon -L swap",
+              "mkfs.ext3 -L nixos /dev/vda2",
+              "mount LABEL=nixos /mnt",
+          );
+        '';
+      fileSystems = rootFS;
+    };
+      
+  # Same as the previous, but now with a separate /boot partition.
+  separateBoot = makeTest
+    { createPartitions =
+        ''
+          $machine->mustSucceed(
+              "parted /dev/vda mklabel msdos",
+              "parted /dev/vda -- mkpart primary ext2 1M 50MB", # /boot
+              "parted /dev/vda -- mkpart primary linux-swap 50MB 1024M",
+              "parted /dev/vda -- mkpart primary ext2 1024M -1s", # /
+              "udevadm settle",
+              "mkswap /dev/vda2 -L swap",
+              "swapon -L swap",
+              "mkfs.ext3 -L nixos /dev/vda3",
+              "mount LABEL=nixos /mnt",
+              "mkfs.ext3 -L boot /dev/vda1",
+              "mkdir /mnt/boot",
+              "mount LABEL=boot /mnt/boot",
+          );
+        '';
+      fileSystems = rootFS + bootFS;
+    };
+  
 }
-- 
GitLab


From 34341d810a67a159e261f2e480dc67bbf926ea00 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 7 Jan 2010 13:53:09 +0000
Subject: [PATCH 2157/5331] * Remove a debug line.

svn path=/nixos/trunk/; revision=19285
---
 modules/installer/tools/nixos-hardware-scan.pl | 1 -
 1 file changed, 1 deletion(-)

diff --git a/modules/installer/tools/nixos-hardware-scan.pl b/modules/installer/tools/nixos-hardware-scan.pl
index dd522f543bd..ce1085f8ebc 100644
--- a/modules/installer/tools/nixos-hardware-scan.pl
+++ b/modules/installer/tools/nixos-hardware-scan.pl
@@ -180,7 +180,6 @@ foreach my $path (glob "/sys/bus/usb/devices/*") {
 
 foreach my $path (glob "/sys/class/block/*") {
     my $module;
-    print STDERR "$path\n";
     if (-e "$path/device/driver/module") {
         $module = basename `readlink -f $path/device/driver/module`;
         chomp $module;
-- 
GitLab


From b74432218d0f92a13cd5af79e55d91f3571492cf Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 7 Jan 2010 14:19:19 +0000
Subject: [PATCH 2158/5331] * Test LVM installs.

svn path=/nixos/trunk/; revision=19289
---
 tests/installer.nix | 48 +++++++++++++++++++++++++++++++++++++++------
 1 file changed, 42 insertions(+), 6 deletions(-)

diff --git a/tests/installer.nix b/tests/installer.nix
index ae6eab172a7..c7b59f1b198 100644
--- a/tests/installer.nix
+++ b/tests/installer.nix
@@ -63,7 +63,10 @@ let
     '';
 
   # The test script boots the CD, installs NixOS on an empty hard
-  # disk, and then reboot from the hard disk.
+  # disk, and then reboot from the hard disk.  It's parameterized with
+  # a test script fragment `createPartitions', which must create
+  # partitions and filesystems, and a configuration.nix fragment
+  # `fileSystems'.
   testScriptFun = { createPartitions, fileSystems }:
     ''
       createDisk("harddisk", 4 * 1024);
@@ -106,18 +109,16 @@ let
       # Perform the installation.
       $machine->mustSucceed("nixos-install >&2");
       
-      $machine->mustSucceed("cat /boot/grub/grub.cfg >&2");
+      $machine->mustSucceed("cat /mnt/boot/grub/grub.cfg >&2");
       
       $machine->shutdown;
 
       # Now see if we can boot the installation.
       my $machine = Machine->new({ hda => "harddisk" });
       
-      $machine->mustSucceed("echo hello");
-
       # Did /boot get mounted, if appropriate?
-      $machine->mustSucceed("initctl start filesystems");
-      $machine->mustSucceed("test -e /boot/grub/grub.cfg");
+      #$machine->mustSucceed("initctl start filesystems");
+      #$machine->mustSucceed("test -e /boot/grub/grub.cfg");
       
       $machine->mustSucceed("nix-env -i coreutils >&2");
       $machine->mustSucceed("type -tP ls") =~ /profiles/
@@ -186,4 +187,39 @@ in {
       fileSystems = rootFS + bootFS;
     };
   
+  # Create two physical LVM partitions combined into one volume group
+  # that contains the logical swap and root partitions.
+  lvm = makeTest
+    { createPartitions =
+        ''
+          $machine->mustSucceed(
+              "parted /dev/vda mklabel msdos",
+              "parted /dev/vda -- mkpart primary ext2 1M 50MB", # /boot
+              "parted /dev/vda -- mkpart primary 1024M 2048M", # first PV
+              "parted /dev/vda -- set 2 lvm on",
+              "parted /dev/vda -- mkpart primary 2048M -1s", # second PV
+              "parted /dev/vda -- set 3 lvm on",
+              "fdisk -l /dev/vda >&2",
+              "udevadm settle",
+              "pvcreate /dev/vda2 /dev/vda3",
+              "vgcreate MyVolGroup /dev/vda2 /dev/vda3",
+              "lvcreate --size 1G --name swap MyVolGroup",
+              "lvcreate --size 2G --name nixos MyVolGroup",
+              "mkswap -f /dev/MyVolGroup/swap -L swap",
+              "swapon -L swap",
+              "mkfs.ext3 -L nixos /dev/MyVolGroup/nixos",
+              "mount LABEL=nixos /mnt",
+              "mkfs.ext3 -L boot /dev/vda1",
+              "mkdir /mnt/boot",
+              "mount LABEL=boot /mnt/boot",
+          );
+        '';
+      fileSystems =
+        ''
+          { mountPoint = "/";
+            device = " /dev/MyVolGroup/nixos";
+          }
+        '' + bootFS;
+    };
+  
 }
-- 
GitLab


From eee4b381cea2f36e32d3ee942cbaaa177e145f23 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 7 Jan 2010 14:59:43 +0000
Subject: [PATCH 2159/5331] * LVM test: don't use a /boot partition.  GRUB 2
 can boot directly   from LVM.

svn path=/nixos/trunk/; revision=19291
---
 tests/installer.nix | 23 +++++++++++++----------
 1 file changed, 13 insertions(+), 10 deletions(-)

diff --git a/tests/installer.nix b/tests/installer.nix
index c7b59f1b198..b606b6caf00 100644
--- a/tests/installer.nix
+++ b/tests/installer.nix
@@ -117,8 +117,15 @@ let
       my $machine = Machine->new({ hda => "harddisk" });
       
       # Did /boot get mounted, if appropriate?
+      # !!! There is currently no good way to wait for the
+      # `filesystems' tash to finish.
       #$machine->mustSucceed("initctl start filesystems");
       #$machine->mustSucceed("test -e /boot/grub/grub.cfg");
+
+      # Did the swap device get activated?
+      # !!! Idem.
+      # $machine->waitForJob("swap");
+      #$machine->mustSucceed("cat /proc/swaps | grep -q /dev");
       
       $machine->mustSucceed("nix-env -i coreutils >&2");
       $machine->mustSucceed("type -tP ls") =~ /profiles/
@@ -194,24 +201,20 @@ in {
         ''
           $machine->mustSucceed(
               "parted /dev/vda mklabel msdos",
-              "parted /dev/vda -- mkpart primary ext2 1M 50MB", # /boot
-              "parted /dev/vda -- mkpart primary 1024M 2048M", # first PV
-              "parted /dev/vda -- set 2 lvm on",
+              "parted /dev/vda -- mkpart primary 1M 2048M", # first PV
+              "parted /dev/vda -- set 1 lvm on",
               "parted /dev/vda -- mkpart primary 2048M -1s", # second PV
-              "parted /dev/vda -- set 3 lvm on",
+              "parted /dev/vda -- set 2 lvm on",
               "fdisk -l /dev/vda >&2",
               "udevadm settle",
-              "pvcreate /dev/vda2 /dev/vda3",
-              "vgcreate MyVolGroup /dev/vda2 /dev/vda3",
+              "pvcreate /dev/vda1 /dev/vda2",
+              "vgcreate MyVolGroup /dev/vda1 /dev/vda2",
               "lvcreate --size 1G --name swap MyVolGroup",
               "lvcreate --size 2G --name nixos MyVolGroup",
               "mkswap -f /dev/MyVolGroup/swap -L swap",
               "swapon -L swap",
               "mkfs.ext3 -L nixos /dev/MyVolGroup/nixos",
               "mount LABEL=nixos /mnt",
-              "mkfs.ext3 -L boot /dev/vda1",
-              "mkdir /mnt/boot",
-              "mount LABEL=boot /mnt/boot",
           );
         '';
       fileSystems =
@@ -219,7 +222,7 @@ in {
           { mountPoint = "/";
             device = " /dev/MyVolGroup/nixos";
           }
-        '' + bootFS;
+        '';
     };
   
 }
-- 
GitLab


From 9a0789a81e1442139c0b4cb5178af1bde34800fc Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 7 Jan 2010 15:55:05 +0000
Subject: [PATCH 2160/5331] * Add devicemapper to the system path.

svn path=/nixos/trunk/; revision=19292
---
 modules/config/system-path.nix | 1 -
 modules/tasks/lvm.nix          | 3 +++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/modules/config/system-path.nix b/modules/config/system-path.nix
index 50617ec91da..a8c85f65b2d 100644
--- a/modules/config/system-path.nix
+++ b/modules/config/system-path.nix
@@ -32,7 +32,6 @@ let
       pkgs.gzip
       pkgs.less
       pkgs.libcap
-      pkgs.lvm2
       pkgs.man
       pkgs.mdadm
       pkgs.module_init_tools
diff --git a/modules/tasks/lvm.nix b/modules/tasks/lvm.nix
index 4aebb33767e..a7c3c7540c0 100644
--- a/modules/tasks/lvm.nix
+++ b/modules/tasks/lvm.nix
@@ -15,6 +15,7 @@
             ${config.system.sbin.modprobe}/sbin/modprobe dm_mod || true
 
             ${pkgs.devicemapper}/sbin/dmsetup mknodes
+            
             # Scan for block devices that might contain LVM physical volumes
             # and volume groups.
             ${pkgs.lvm2}/sbin/vgscan --mknodes
@@ -29,6 +30,8 @@
         task = true;
       };
 
+    environment.systemPackages = [ pkgs.devicemapper pkgs.lvm2 ];
+
   };
   
 }
-- 
GitLab


From 0595b7f89d8bc13668b06a9a4ed1db322f90d0c5 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 7 Jan 2010 16:14:50 +0000
Subject: [PATCH 2161/5331] * devicemapper -> lvm2.

svn path=/nixos/trunk/; revision=19294
---
 modules/system/boot/stage-1.nix | 13 ++++++-------
 modules/tasks/lvm.nix           |  4 ++--
 2 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/modules/system/boot/stage-1.nix b/modules/system/boot/stage-1.nix
index 4b51ce1b024..a62f79aab15 100644
--- a/modules/system/boot/stage-1.nix
+++ b/modules/system/boot/stage-1.nix
@@ -115,7 +115,6 @@ let
   # work.
   extraUtils = pkgs.runCommand "extra-utils"
     { buildInputs = [pkgs.nukeReferences];
-      devicemapper = if config.boot.initrd.lvm then pkgs.devicemapper else null;
       lvm2 = if config.boot.initrd.lvm then pkgs.lvm2 else null;
       allowedReferences = [ "out" modulesClosure ]; # prevent accidents like glibc being included in the initrd
       doublePatchelf = (pkgs.stdenv.system == "armv5tel-linux");
@@ -153,11 +152,11 @@ let
 
       cp -pd ${pkgs.e2fsprogs}/lib/lib*.so.* $out/lib
 
-      # Copy devicemapper and lvm, if we need it.
-      if test -n "$devicemapper"; then
-        cp $devicemapper/sbin/dmsetup $out/bin/dmsetup
-        cp $devicemapper/lib/libdevmapper.so.*.* $out/lib
+      # Copy dmsetup and lvm, if we need it.
+      if test -n "$lvm2"; then
+        cp $lvm2/sbin/dmsetup $out/bin/dmsetup
         cp $lvm2/sbin/lvm $out/bin/lvm
+        cp $lvm2/lib/libdevmapper.so.*.* $out/lib
       fi
 
       # Add RAID mdadm tool.
@@ -208,8 +207,8 @@ let
       $out/bin/fsck -N
       $out/bin/udevadm --version
       $out/bin/blkid -v 2>&1 | grep "blkid from util-linux-ng"
-      if test -n "$devicemapper"; then
-          $out/bin/dmsetup --version | grep "version:"
+      if test -n "$lvm2"; then
+          $out/bin/dmsetup --version 2>&1 | grep "version:"
           LVM_SYSTEM_DIR=$out $out/bin/lvm 2>&1 | grep "LVM"
       fi
       $out/bin/reiserfsck -V
diff --git a/modules/tasks/lvm.nix b/modules/tasks/lvm.nix
index a7c3c7540c0..d5204f1deba 100644
--- a/modules/tasks/lvm.nix
+++ b/modules/tasks/lvm.nix
@@ -14,7 +14,7 @@
             # Load the device mapper.
             ${config.system.sbin.modprobe}/sbin/modprobe dm_mod || true
 
-            ${pkgs.devicemapper}/sbin/dmsetup mknodes
+            ${pkgs.lvm2}/sbin/dmsetup mknodes
             
             # Scan for block devices that might contain LVM physical volumes
             # and volume groups.
@@ -30,7 +30,7 @@
         task = true;
       };
 
-    environment.systemPackages = [ pkgs.devicemapper pkgs.lvm2 ];
+    environment.systemPackages = [ pkgs.lvm2 ];
 
   };
   
-- 
GitLab


From 8e375da98ec98db8f475062cabed1de18f76098e Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 7 Jan 2010 16:45:35 +0000
Subject: [PATCH 2162/5331] svn path=/nixos/trunk/; revision=19295

---
 release.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/release.nix b/release.nix
index e33031e8041..143d698e045 100644
--- a/release.nix
+++ b/release.nix
@@ -124,8 +124,9 @@ let
         };
       in {
         firefox = t.firefox.test;
-        installer.simple = t.installer.simple.test;
+        installer.lvm = t.installer.lvm.test;
         installer.separateBoot = t.installer.separateBoot.test;
+        installer.simple = t.installer.simple.test;
         kde4 = t.kde4.test;
         quake3 = t.quake3.test;
         subversion = t.subversion.report;
-- 
GitLab


From 4c2fe97acc10b5a8e6fbf35e4d68242cd650d1b4 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 7 Jan 2010 16:50:26 +0000
Subject: [PATCH 2163/5331] * Always create hydra-build-products, otherwise the
 build is made   available as a one-click install which is not useful.

svn path=/nixos/trunk/; revision=19296
---
 lib/testing.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/lib/testing.nix b/lib/testing.nix
index 6df4cd397dd..bcd23d4278d 100644
--- a/lib/testing.nix
+++ b/lib/testing.nix
@@ -32,6 +32,8 @@ rec {
             mv $i $out/coverage-data/$(dirname $i)
           done
 
+          touch $out/nix-support/hydra-build-products
+
           for i in $out/*.png; do
             echo "report screenshot $i" >> $out/nix-support/hydra-build-products
           done
-- 
GitLab


From fa2a6f835f1447e3bc347e370b633942fb865b15 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Thu, 7 Jan 2010 17:53:03 +0000
Subject: [PATCH 2164/5331] Adding wicd, taking in the patch sent by roconnor
 to nix-dev on 2010-01-07.

svn path=/nixos/trunk/; revision=19298
---
 modules/module-list.nix              |  1 +
 modules/services/networking/wicd.nix | 41 ++++++++++++++++++++++++++++
 2 files changed, 42 insertions(+)
 create mode 100644 modules/services/networking/wicd.nix

diff --git a/modules/module-list.nix b/modules/module-list.nix
index b81512efc08..40b31082902 100644
--- a/modules/module-list.nix
+++ b/modules/module-list.nix
@@ -90,6 +90,7 @@
   ./services/networking/ssh/sshd.nix
   ./services/networking/tftpd.nix
   ./services/networking/vsftpd.nix
+  ./services/networking/wicd.nix
   ./services/networking/wpa_supplicant.nix
   ./services/networking/xinetd.nix
   ./services/printing/cupsd.nix
diff --git a/modules/services/networking/wicd.nix b/modules/services/networking/wicd.nix
new file mode 100644
index 00000000000..b26511bcb52
--- /dev/null
+++ b/modules/services/networking/wicd.nix
@@ -0,0 +1,41 @@
+{ config, pkgs, ... }:
+
+with pkgs.lib;
+
+{
+
+  ###### interface
+
+  options = {
+  
+    networking.wicd.enable = mkOption {
+      default = false;
+      description = ''
+        Whether to start <command>wicd</command>. Wired and
+        wireless network configurations can then be managed by
+        wicd-client.
+      '';
+    };
+  };
+
+
+  ###### implementation
+  
+  config = mkIf config.networking.wicd.enable {
+
+    environment.systemPackages = [pkgs.wicd];
+
+    jobs.wicd = 
+      { startOn = "started network-interfaces";
+        stopOn = "stopping network-interfaces";
+
+        script =
+          "${pkgs.wicd}/sbin/wicd -f";
+      };
+
+    services.dbus.enable = true;
+    services.dbus.packages = [pkgs.wicd];
+  
+  };
+
+}
-- 
GitLab


From 6f8a3ba7c74199b245fbec0f03efcd5b81d76c0e Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 7 Jan 2010 22:39:35 +0000
Subject: [PATCH 2165/5331] * Create devicemapper/lvm device nodes from udev
 (using the rules   supplied by the lvm package).  This makes the "lvm"
 Upstart task   unnecessary.  Also, we now get /dev/disk/by-{label,uuid}
 symlinks   for LVM logical disks.

svn path=/nixos/trunk/; revision=19300
---
 modules/services/hardware/udev.nix | 26 ++++++++++++++++----------
 modules/tasks/lvm.nix              | 26 ++------------------------
 2 files changed, 18 insertions(+), 34 deletions(-)

diff --git a/modules/services/hardware/udev.nix b/modules/services/hardware/udev.nix
index 798b9a4e381..af653f59c88 100644
--- a/modules/services/hardware/udev.nix
+++ b/modules/services/hardware/udev.nix
@@ -44,12 +44,21 @@ let
       # called by 50-firmware.rules works properly.
       echo 'ENV{FIRMWARE_DIRS}="${toString config.hardware.firmware}"' >> $out/00-path.rules
       
-      # Fix some paths in the standard udev rules.
+      # Add the udev rules from other packages.
+      for i in ${toString cfg.packages}; do
+        for j in $i/*/udev/rules.d/*; do
+          ln -s $j $out/$(basename $j)
+        done
+      done
+
+      # Fix some paths in the standard udev rules.  Hacky.
       for i in $out/*.rules; do
         substituteInPlace $i \
           --replace /sbin/modprobe ${modprobe}/sbin/modprobe \
           --replace /sbin/blkid ${pkgs.utillinux}/sbin/blkid \
-          --replace /sbin/mdadm ${pkgs.mdadm}/sbin/madm
+          --replace /sbin/mdadm ${pkgs.mdadm}/sbin/madm \
+          --replace '$env{DM_SBIN_PATH}/blkid' ${pkgs.utillinux}/sbin/blkid \
+          --replace 'ENV{DM_SBIN_PATH}="/sbin"' 'ENV{DM_SBIN_PATH}="${pkgs.lvm2}/sbin"'
       done
 
       # If auto-configuration is disabled, then remove
@@ -57,13 +66,6 @@ let
       # automatically calling modprobe.
       ${if !config.boot.hardwareScan then "rm $out/80-drivers.rules" else ""}
 
-      # Add the udev rules from other packages.
-      for i in ${toString cfg.packages}; do
-        for j in $i/*/udev/rules.d/*; do
-          ln -s $j $out/$(basename $j)
-        done
-      done
-
       # Use the persistent device rules (naming for CD/DVD and
       # network devices) stored in 
       # /var/lib/udev/rules.d/70-persistent-{cd,net}.rules.  These are
@@ -186,8 +188,12 @@ in
           ''
             # Let udev create device nodes for all modules that have already
             # been loaded into the kernel (or for which support is built into
-            # the kernel).
+            # the kernel).  The `STARTUP' variable is needed to force
+            # the LVM rules to create device nodes.  See
+            # http://www.mail-archive.com/fedora-devel-list@redhat.com/msg10261.html
+            ${udev}/sbin/udevadm control --env=STARTUP=1
             ${udev}/sbin/udevadm trigger
+            ${udev}/sbin/udevadm control --env=STARTUP=
             ${udev}/sbin/udevadm settle # wait for udev to finish
 
             initctl emit -n new-devices
diff --git a/modules/tasks/lvm.nix b/modules/tasks/lvm.nix
index d5204f1deba..8b60cd4c0b9 100644
--- a/modules/tasks/lvm.nix
+++ b/modules/tasks/lvm.nix
@@ -6,32 +6,10 @@
 
   config = {
 
-    jobs.lvm =
-      { startOn = "started udev or new-devices";
-
-        script =
-          ''
-            # Load the device mapper.
-            ${config.system.sbin.modprobe}/sbin/modprobe dm_mod || true
-
-            ${pkgs.lvm2}/sbin/dmsetup mknodes
-            
-            # Scan for block devices that might contain LVM physical volumes
-            # and volume groups.
-            ${pkgs.lvm2}/sbin/vgscan --mknodes
-
-            # Make all logical volumes on all volume groups available, i.e.,
-            # make them appear in /dev.
-            ${pkgs.lvm2}/sbin/vgchange --available y
-
-            initctl emit -n new-devices
-          '';
-
-        task = true;
-      };
-
     environment.systemPackages = [ pkgs.lvm2 ];
 
+    services.udev.packages = [ pkgs.lvm2 ];
+
   };
   
 }
-- 
GitLab


From b59cfde3112d839b8b7e7f941650e69f80d4f202 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Sat, 9 Jan 2010 14:23:20 +0000
Subject: [PATCH 2166/5331] Making /dev/pts files have group owner 'tty', so
 'mesg y' will work.

svn path=/nixos/trunk/; revision=19317
---
 modules/system/boot/stage-2-init.sh | 2 +-
 modules/system/boot/stage-2.nix     | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/modules/system/boot/stage-2-init.sh b/modules/system/boot/stage-2-init.sh
index 5343aa9eae9..adab3bf5d06 100644
--- a/modules/system/boot/stage-2-init.sh
+++ b/modules/system/boot/stage-2-init.sh
@@ -74,7 +74,7 @@ mount -t tmpfs -o "mode=0755" none /dev
 mkdir -m 0777 /dev/shm
 mount -t tmpfs -o "rw,nosuid,nodev" tmpfs /dev/shm
 mkdir -m 0755 -p /dev/pts
-mount -t devpts -o mode=0600 none /dev/pts 
+mount -t devpts -o mode=0600,gid=@ttyGid@ none /dev/pts 
 [ -e /proc/bus/usb ] && mount -t usbfs none /proc/bus/usb # uml doesn't have usb by default
 mkdir -m 01777 -p /tmp 
 mkdir -m 0755 -p /var
diff --git a/modules/system/boot/stage-2.nix b/modules/system/boot/stage-2.nix
index 5c3c3560be3..2e5e2e524dd 100644
--- a/modules/system/boot/stage-2.nix
+++ b/modules/system/boot/stage-2.nix
@@ -23,6 +23,7 @@ let
     src = ./stage-2-init.sh;
     isExecutable = true;
     inherit kernel activateConfiguration;
+    ttyGid = config.ids.gids.tty;
     upstart = config.system.build.upstart;
     path =
       [ coreutils
-- 
GitLab


From 39796e26b4820197ca54eea2d579d992dd416cc3 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sat, 9 Jan 2010 15:13:06 +0000
Subject: [PATCH 2167/5331] * Removed the boot.isLiveCD option.  Moved the code
 for mounting a   tmpfs on top of the CD to iso-image.nix.

svn path=/nixos/trunk/; revision=19318
---
 modules/installer/cd-dvd/iso-image.nix | 21 ++++++++++++++++-----
 modules/system/boot/stage-1-init.sh    | 16 ----------------
 modules/system/boot/stage-1.nix        | 12 +-----------
 3 files changed, 17 insertions(+), 32 deletions(-)

diff --git a/modules/installer/cd-dvd/iso-image.nix b/modules/installer/cd-dvd/iso-image.nix
index e97b3a51cdc..3135fa2cda4 100644
--- a/modules/installer/cd-dvd/iso-image.nix
+++ b/modules/installer/cd-dvd/iso-image.nix
@@ -131,11 +131,22 @@ in
   boot.initrd.availableKernelModules = [ "aufs" "squashfs" "iso9660" ];
 
   boot.initrd.kernelModules = [ "loop" ];
-  
-  # Tell stage 1 of the boot to mount a tmpfs on top of the CD using
-  # AUFS.  !!! It would be nicer to make the stage 1 init pluggable
-  # and move that bit of code here.
-  boot.isLiveCD = true;
+
+  # In stage 1, mount a tmpfs on top of / (the ISO image) and
+  # /nix/store (the squashfs image) to make this a live CD.
+  boot.initrd.postMountCommands =
+    ''
+      mkdir /mnt-root-tmpfs
+      mount -t tmpfs -o "mode=755" none /mnt-root-tmpfs
+      mkdir /mnt-root-union
+      mount -t aufs -o dirs=/mnt-root-tmpfs=rw:$targetRoot=ro none /mnt-root-union
+      targetRoot=/mnt-root-union
+
+      mkdir /mnt-store-tmpfs
+      mount -t tmpfs -o "mode=755" none /mnt-store-tmpfs
+      mkdir -p $targetRoot/nix/store
+      mount -t aufs -o dirs=/mnt-store-tmpfs=rw:/mnt-root/nix/store=ro none /mnt-root-union/nix/store
+    '';
 
   # AUFS 2 support (currently unused).
   /*
diff --git a/modules/system/boot/stage-1-init.sh b/modules/system/boot/stage-1-init.sh
index 19478f7c400..e74e363c83d 100644
--- a/modules/system/boot/stage-1-init.sh
+++ b/modules/system/boot/stage-1-init.sh
@@ -272,22 +272,6 @@ for ((n = 0; n < ${#mountPoints[*]}; n++)); do
 done
 
 
-# If this is a live-CD/DVD, then union-mount a tmpfs on top of the
-# original root.
-if test -n "@isLiveCD@"; then
-    mkdir /mnt-root-tmpfs
-    mount -t tmpfs -o "mode=755" none /mnt-root-tmpfs
-    mkdir /mnt-root-union
-    mount -t aufs -o dirs=/mnt-root-tmpfs=rw:$targetRoot=ro none /mnt-root-union
-    targetRoot=/mnt-root-union
-
-    mkdir /mnt-store-tmpfs
-    mount -t tmpfs -o "mode=755" none /mnt-store-tmpfs
-    mkdir -p $targetRoot/nix/store
-    mount -t aufs -o dirs=/mnt-store-tmpfs=rw:/mnt-root/nix/store=ro none /mnt-root-union/nix/store
-fi
-
-
 @postMountCommands@
 
 
diff --git a/modules/system/boot/stage-1.nix b/modules/system/boot/stage-1.nix
index a62f79aab15..4f24783b5c6 100644
--- a/modules/system/boot/stage-1.nix
+++ b/modules/system/boot/stage-1.nix
@@ -11,16 +11,6 @@ let
 
   options = {
 
-    boot.isLiveCD = mkOption {
-      default = false;
-      description = "
-        If set to true, the root device will be mounted read-only and
-        a ramdisk will be mounted on top of it using unionfs to
-        provide a writable root.  This is used for the NixOS
-        Live-CD/DVD.
-      ";
-    };
-
     boot.resumeDevice = mkOption {
       default = "";
       example = "0:0";
@@ -277,7 +267,7 @@ let
 
     inherit udevConf extraUtils;
 
-    inherit (config.boot) isLiveCD resumeDevice;
+    inherit (config.boot) resumeDevice;
 
     inherit (config.boot.initrd) checkJournalingFS
       postDeviceCommands postMountCommands kernelModules;
-- 
GitLab


From 79add5ecbc42c75f03282e10abb6460c2bf9432a Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sun, 10 Jan 2010 01:20:30 +0000
Subject: [PATCH 2168/5331] * Make the Nix store in the guest writable.

svn path=/nixos/trunk/; revision=19326
---
 modules/virtualisation/qemu-vm.nix | 49 +++++++++++++++++++++++++-----
 1 file changed, 41 insertions(+), 8 deletions(-)

diff --git a/modules/virtualisation/qemu-vm.nix b/modules/virtualisation/qemu-vm.nix
index 3455d8f9244..09764c09b90 100644
--- a/modules/virtualisation/qemu-vm.nix
+++ b/modules/virtualisation/qemu-vm.nix
@@ -42,11 +42,24 @@ let
         default = true;
         description =
           ''
-            Whether to run qemu with a graphics window, or access
+            Whether to run QEMU with a graphics window, or access
             the guest computer serial port through the host tty.
           '';
       };
 
+    virtualisation.pathsInNixDB =
+      mkOption {
+        default = [];
+        description =
+          ''
+            The list of paths whose closure is registered in the Nix
+            database in the VM.  All other paths in the host Nix store
+            appear in the guest Nix store as well, but are considered
+            garbage (because they are not registered in the Nix
+            database in the guest).
+          '';
+      };
+      
   };
 
   cfg = config.virtualisation;
@@ -78,7 +91,17 @@ let
           -initrd ${config.system.build.toplevel}/initrd \
           ${qemuGraphics} \
           $QEMU_OPTS \
-          -append "$(cat ${config.system.build.toplevel}/kernel-params) init=${config.system.build.bootStage2} systemConfig=${config.system.build.toplevel} ${kernelConsole} $QEMU_KERNEL_PARAMS"
+          -append "$(cat ${config.system.build.toplevel}/kernel-params) init=${config.system.build.bootStage2} systemConfig=${config.system.build.toplevel} regInfo=${regInfo} ${kernelConsole} $QEMU_KERNEL_PARAMS"
+    '';
+
+    
+  regInfo = pkgs.runCommand "reginfo"
+    { exportReferencesGraph =
+        map (x: [("closure-" + baseNameOf x) x]) config.virtualisation.pathsInNixDB;
+      buildInputs = [ pkgs.perl ];
+    }
+    ''
+      printRegistration=1 perl ${pkgs.pathsFromGraph} closure-* > $out
     '';
 
 in
@@ -111,6 +134,22 @@ in
       fi
     '';
 
+  # After booting, register the closure of the paths in
+  # `virtualisation.pathsInNixDB' in the Nix database in the VM.  This
+  # allows Nix operations to work in the VM.  The path to the
+  # registration file is passed through the kernel command line to
+  # allow `system.build.toplevel' to be included.  (If we had a direct
+  # reference to ${regInfo} here, then we would get a cyclic
+  # dependency.)
+  boot.postBootCommands =
+    ''
+      ( source /proc/cmdline
+        ${config.environment.nix}/bin/nix-store --load-db < $regInfo
+      )
+    '';
+      
+  virtualisation.pathsInNixDB = [ config.system.build.toplevel ];
+  
   # Mount the host filesystem via CIFS, and bind-mount the Nix store
   # of the host into our own filesystem.  We use mkOverride to allow
   # this module to be applied to "normal" NixOS system configuration,
@@ -132,12 +171,6 @@ in
         options = "bind";
         neededForBoot = true;
       }
-      # Mount the host's Nix database.  This allows read-only Nix
-      # operations in the guest to work properly.
-      { mountPoint = "/nix/var/nix/db";
-        device = "/hostfs/nix/var/nix/db";
-        options = "bind";
-      }
     ];
 
   # Starting DHCP brings down eth0, which kills the connection to the
-- 
GitLab


From 1a0bb659015cb45e4aedf78faf8b35e586829b3a Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sun, 10 Jan 2010 01:26:01 +0000
Subject: [PATCH 2169/5331] * Added a regression test for whether the Nixpkgs
 channel works.  This   is done by instantiating a webserver that simulates
 nixos.org.   Using nix-push we create a channel that contains some stuff
 (namely   the GNU Hello source tarball and the rlwrap program).  This was a  
 bit tricky because nix-push requires a writable Nix store.  Using   AUFS this
 is possible, but not on recent Linux kernels (AUFS1 over   CIFS fails).

svn path=/nixos/trunk/; revision=19327
---
 modules/installer/tools/nixos-install.sh |   1 +
 tests/installer.nix                      | 101 ++++++++++++++++++-----
 2 files changed, 81 insertions(+), 21 deletions(-)

diff --git a/modules/installer/tools/nixos-install.sh b/modules/installer/tools/nixos-install.sh
index 43d84aba032..a9500f7e680 100644
--- a/modules/installer/tools/nixos-install.sh
+++ b/modules/installer/tools/nixos-install.sh
@@ -52,6 +52,7 @@ NIXOS=$(readlink -f "$NIXOS")
 mkdir -m 0755 -p $mountPoint/etc
 touch /etc/resolv.conf 
 cp /etc/resolv.conf $mountPoint/etc/
+cp /etc/hosts $mountPoint/etc/
 
 # Mount some stuff in the target root directory.
 mkdir -m 0755 -p $mountPoint/dev $mountPoint/proc $mountPoint/sys $mountPoint/mnt
diff --git a/tests/installer.nix b/tests/installer.nix
index b606b6caf00..12e7a0bc6c9 100644
--- a/tests/installer.nix
+++ b/tests/installer.nix
@@ -1,5 +1,7 @@
 { pkgs, nixpkgs, system, ... }:
 
+with pkgs.lib;
+
 let
 
   # Build the ISO.  This is the regular installation CD but with test
@@ -11,13 +13,12 @@ let
         [ ../modules/installer/cd-dvd/installation-cd-graphical.nix
           ../modules/testing/test-instrumentation.nix
           { key = "serial"; 
-            boot.loader.grub.timeout = pkgs.lib.mkOverride 0 {} 0;
+            boot.loader.grub.timeout = mkOverride 0 {} 0;
             
             # The test cannot access the network, so any sources we
             # need must be included in the ISO.
             isoImage.storeContents =
-              [ pkgs.hello.src
-                pkgs.glibcLocales
+              [ pkgs.glibcLocales
                 pkgs.sudo
                 pkgs.docbook5
               ];
@@ -25,8 +26,9 @@ let
         ];
     }).config.system.build.isoImage;
 
+    
   # The configuration to install.
-  config = { fileSystems }: pkgs.writeText "configuration.nix"
+  config = { fileSystems, testChannel }: pkgs.writeText "configuration.nix"
     ''
       { config, pkgs, modulesPath, ... }:
 
@@ -39,12 +41,10 @@ let
         boot.loader.grub.device = "/dev/vda";
         boot.initrd.kernelModules = [ "ext3" ];
       
-        fileSystems =
-          [ ${fileSystems}
-          ];
-          
-        swapDevices =
-          [ { label = "swap"; } ];
+        fileSystems = [ ${fileSystems} ];
+        swapDevices = [ { label = "swap"; } ];
+
+        environment.systemPackages = [ ${optionalString testChannel "pkgs.rlwrap"} ];
       }
     '';
 
@@ -62,20 +62,65 @@ let
       }
     '';
 
+    
+  # Configuration of a web server that simulates the Nixpkgs channel
+  # distribution server.
+  webserver = 
+    { config, pkgs, ... }:
+
+    { services.httpd.enable = true;
+      services.httpd.adminAddr = "foo@example.org";
+      services.httpd.servedDirs = singleton
+        { urlPath = "/releases/nixpkgs/channels/nixpkgs-unstable";
+          dir = "/tmp/channel";
+        };
+
+      # Make the Nix store in this VM writable using AUFS.  Use Linux
+      # 2.6.27 because 2.6.32 doesn't work (probably we need AUFS2).
+      # This should probably be moved to qemu-vm.nix.
+      boot.kernelPackages = pkgs.kernelPackages_2_6_27;
+      boot.extraModulePackages = [ config.boot.kernelPackages.aufs ];
+      boot.initrd.availableKernelModules = [ "aufs" ];
+
+      boot.initrd.postMountCommands =
+        ''
+          mkdir /mnt-store-tmpfs
+          mount -t tmpfs -o "mode=755" none /mnt-store-tmpfs
+          mount -t aufs -o dirs=/mnt-store-tmpfs=rw:$targetRoot/nix/store=rr none $targetRoot/nix/store
+        '';
+
+      virtualisation.pathsInNixDB = channelContents;
+    };
+
+  channelContents = [ pkgs.hello.src pkgs.rlwrap ];
+  
+
   # The test script boots the CD, installs NixOS on an empty hard
   # disk, and then reboot from the hard disk.  It's parameterized with
   # a test script fragment `createPartitions', which must create
   # partitions and filesystems, and a configuration.nix fragment
   # `fileSystems'.
-  testScriptFun = { createPartitions, fileSystems }:
+  testScriptFun = { createPartitions, fileSystems, testChannel }:
     ''
       createDisk("harddisk", 4 * 1024);
 
       my $machine = Machine->new({ hda => "harddisk", cdrom => glob("${iso}/iso/*.iso") });
+      $machine->start;
 
-      $machine->mustSucceed("echo hello");
-
+      ${optionalString testChannel ''
+        # Create a channel on the web server containing a few packages
+        # to simulate the Nixpkgs channel.
+        $webserver->start;
+        $webserver->waitForJob("httpd");
+        $webserver->mustSucceed("mkdir /tmp/channel");
+        $webserver->mustSucceed(
+            "nix-push file:///tmp/channel " .
+            "http://nixos.org/releases/nixpkgs/channels/nixpkgs-unstable " .
+            "file:///tmp/channel/MANIFEST ${toString channelContents} >&2");
+      ''}
+      
       # Make sure that we get a login prompt etc.
+      $machine->mustSucceed("echo hello");
       $machine->waitForJob("tty1");
       $machine->waitForJob("rogue");
       $machine->waitForJob("nixos-manual");
@@ -84,11 +129,20 @@ let
       $machine->stopJob("dhclient");
       $machine->mustSucceed("rm /etc/resolv.conf");
 
-      # Test nix-env.
-      $machine->mustFail("hello");
-      $machine->mustSucceed("nix-env -i hello");
-      $machine->mustSucceed("hello") =~ /Hello, world/
-          or die "bad `hello' output";
+      ${optionalString testChannel ''
+        # Allow the machine to talk to the fake nixos.org.
+        $machine->mustSucceed(
+            "echo 192.168.1.1 nixos.org >> /etc/hosts",
+            "ifconfig eth1 up 192.168.1.2",
+            "nix-pull http://nixos.org/releases/nixpkgs/channels/nixpkgs-unstable/MANIFEST",
+        );
+
+        # Test nix-env.
+        $machine->mustFail("hello");
+        $machine->mustSucceed("nix-env -i hello");
+        $machine->mustSucceed("hello") =~ /Hello, world/
+            or die "bad `hello' output";
+      ''}
 
       # Partition the disk.
       ${createPartitions}
@@ -103,7 +157,7 @@ let
       print STDERR "Result of the hardware scan:\n$cfg\n";
 
       $machine->copyFileFromHost(
-          "${ config { inherit fileSystems; } }",
+          "${ config { inherit fileSystems testChannel; } }",
           "/mnt/etc/nixos/configuration.nix");
 
       # Perform the installation.
@@ -144,9 +198,13 @@ let
       $machine->shutdown;
     '';
 
-  makeTest = { createPartitions, fileSystems }:
+    
+  makeTest = { createPartitions, fileSystems, testChannel ? false }:
     { inherit iso;
-      testScript = testScriptFun { inherit createPartitions fileSystems; };
+      nodes = if testChannel then { inherit webserver; } else { };
+      testScript = testScriptFun {
+        inherit createPartitions fileSystems testChannel;
+      };
     };
     
 
@@ -170,6 +228,7 @@ in {
           );
         '';
       fileSystems = rootFS;
+      testChannel = true;
     };
       
   # Same as the previous, but now with a separate /boot partition.
-- 
GitLab


From 6cfe5e27460f18eb3f4dd2baad3efaeb520b0671 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sun, 10 Jan 2010 15:22:09 +0000
Subject: [PATCH 2170/5331] * Add some more "udevadm settle" calls.  Hopefully
 this fixes random   failures like this:

machine: running command: parted /dev/vda -- mkpart primary 1M 2048M
machine: exit status 0
machine: running command: parted /dev/vda -- set 1 lvm on
machine: exit status 1
machine: output:

Warning: WARNING: the kernel failed to re-read the partition table on /dev/vda
(Device or resource busy).  As a result, it may not reflect all of your changes
until after reboot.
command `parted /dev/vda -- set 1 lvm on' did not succeed (exit code 1) at Machine.pm line 212, <GEN2> line 24.

svn path=/nixos/trunk/; revision=19328
---
 tests/installer.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/installer.nix b/tests/installer.nix
index 12e7a0bc6c9..0f5b828f108 100644
--- a/tests/installer.nix
+++ b/tests/installer.nix
@@ -261,11 +261,11 @@ in {
           $machine->mustSucceed(
               "parted /dev/vda mklabel msdos",
               "parted /dev/vda -- mkpart primary 1M 2048M", # first PV
+              "udevadm settle",
               "parted /dev/vda -- set 1 lvm on",
               "parted /dev/vda -- mkpart primary 2048M -1s", # second PV
-              "parted /dev/vda -- set 2 lvm on",
-              "fdisk -l /dev/vda >&2",
               "udevadm settle",
+              "parted /dev/vda -- set 2 lvm on",
               "pvcreate /dev/vda1 /dev/vda2",
               "vgcreate MyVolGroup /dev/vda1 /dev/vda2",
               "lvcreate --size 1G --name swap MyVolGroup",
-- 
GitLab


From dcdbf68a6874fd481e9035d064075fe9c6183bf6 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sun, 10 Jan 2010 16:31:19 +0000
Subject: [PATCH 2171/5331] * Add a sleep before initialising the Trac
 database.  This shouldn't   be necessary, because waitForJob shouldn't return
 until Postgres is   up and running, but we still get errors like this:

postgresql: running command: initctl status postgresql
postgresql: exit status 0
postgresql: running command: createdb trac
postgresql# createdb: could not connect to database postgres: FATAL:  the database system is starting up
postgresql: exit status 1


svn path=/nixos/trunk/; revision=19329
---
 tests/trac.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tests/trac.nix b/tests/trac.nix
index 6bb3413cea9..4a2fc665bf7 100644
--- a/tests/trac.nix
+++ b/tests/trac.nix
@@ -56,6 +56,7 @@
       startAll;
       
       $postgresql->waitForJob("postgresql");
+      sleep 10; # !!! should not be needed
       $postgresql->mustSucceed("createdb trac");
       
       $webserver->mustSucceed("mkdir -p /repos/trac");
-- 
GitLab


From e50a7e5f327787f242fa07057725c594235a5889 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sun, 10 Jan 2010 16:32:30 +0000
Subject: [PATCH 2172/5331] * Removed the boot.initrd.lvm option for
 simplicity.

svn path=/nixos/trunk/; revision=19330
---
 modules/system/boot/stage-1-init.sh | 10 ++++------
 modules/system/boot/stage-1.nix     | 23 +++++------------------
 2 files changed, 9 insertions(+), 24 deletions(-)

diff --git a/modules/system/boot/stage-1-init.sh b/modules/system/boot/stage-1-init.sh
index e74e363c83d..2d95042d109 100644
--- a/modules/system/boot/stage-1-init.sh
+++ b/modules/system/boot/stage-1-init.sh
@@ -117,12 +117,10 @@ udevd --daemon
 udevadm trigger
 udevadm settle
 
-if type -p dmsetup > /dev/null; then
-    echo "starting device mapper and LVM..."
-    dmsetup mknodes
-    lvm vgscan --ignorelockingfailure
-    lvm vgchange -ay --ignorelockingfailure
-fi
+echo "starting device mapper and LVM..."
+dmsetup mknodes
+lvm vgscan --ignorelockingfailure
+lvm vgchange -ay --ignorelockingfailure
 
 if test -n "$debug1devices"; then fail; fi
 
diff --git a/modules/system/boot/stage-1.nix b/modules/system/boot/stage-1.nix
index 4f24783b5c6..137eaa9e379 100644
--- a/modules/system/boot/stage-1.nix
+++ b/modules/system/boot/stage-1.nix
@@ -20,14 +20,6 @@ let
       ";
     };
 
-    boot.initrd.lvm = mkOption {
-      default = true;
-      description = "
-        Whether to include lvm in the initial ramdisk. You should use this option
-        if your ROOT device is on lvm volume.
-      ";
-    };
-
     boot.initrd.enableSplashScreen = mkOption {
       default = true;
       description = "
@@ -105,7 +97,6 @@ let
   # work.
   extraUtils = pkgs.runCommand "extra-utils"
     { buildInputs = [pkgs.nukeReferences];
-      lvm2 = if config.boot.initrd.lvm then pkgs.lvm2 else null;
       allowedReferences = [ "out" modulesClosure ]; # prevent accidents like glibc being included in the initrd
       doublePatchelf = (pkgs.stdenv.system == "armv5tel-linux");
     }
@@ -143,11 +134,9 @@ let
       cp -pd ${pkgs.e2fsprogs}/lib/lib*.so.* $out/lib
 
       # Copy dmsetup and lvm, if we need it.
-      if test -n "$lvm2"; then
-        cp $lvm2/sbin/dmsetup $out/bin/dmsetup
-        cp $lvm2/sbin/lvm $out/bin/lvm
-        cp $lvm2/lib/libdevmapper.so.*.* $out/lib
-      fi
+      cp ${pkgs.lvm2}/sbin/dmsetup $out/bin/dmsetup
+      cp ${pkgs.lvm2}/sbin/lvm $out/bin/lvm
+      cp ${pkgs.lvm2}/lib/libdevmapper.so.*.* $out/lib
 
       # Add RAID mdadm tool.
       cp ${pkgs.mdadm}/sbin/mdadm $out/bin/mdadm
@@ -197,10 +186,8 @@ let
       $out/bin/fsck -N
       $out/bin/udevadm --version
       $out/bin/blkid -v 2>&1 | grep "blkid from util-linux-ng"
-      if test -n "$lvm2"; then
-          $out/bin/dmsetup --version 2>&1 | grep "version:"
-          LVM_SYSTEM_DIR=$out $out/bin/lvm 2>&1 | grep "LVM"
-      fi
+      $out/bin/dmsetup --version 2>&1 | grep "version:"
+      LVM_SYSTEM_DIR=$out $out/bin/lvm 2>&1 | grep "LVM"
       $out/bin/reiserfsck -V
       $out/bin/mdadm --version
       $out/bin/basename --version
-- 
GitLab


From cf06d2b9cf84a19de98b0cba9bc3fabb317e531a Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sun, 10 Jan 2010 18:23:13 +0000
Subject: [PATCH 2173/5331] * Don't start the filesystems task on a startup
 event.  It's pointless   to do so until udev has created device nodes.

svn path=/nixos/trunk/; revision=19332
---
 modules/tasks/filesystems.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/tasks/filesystems.nix b/modules/tasks/filesystems.nix
index 8225a618325..710cb112572 100644
--- a/modules/tasks/filesystems.nix
+++ b/modules/tasks/filesystems.nix
@@ -224,7 +224,7 @@ in
     environment.systemPackages = [pkgs.ntfs3g pkgs.mount_cifs pkgs.nfsUtils];
     
     jobs.filesystems =
-      { startOn = [ "startup" "new-devices" "ip-up" ];
+      { startOn = [ "new-devices" "ip-up" ];
 
         script = task;
 
-- 
GitLab


From 5c66611f3ea82c690cf978b9b24eda7b2970c0bc Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sun, 10 Jan 2010 18:34:32 +0000
Subject: [PATCH 2174/5331] svn path=/nixos/trunk/; revision=19333

---
 modules/installer/cd-dvd/installation-cd-base.nix | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/modules/installer/cd-dvd/installation-cd-base.nix b/modules/installer/cd-dvd/installation-cd-base.nix
index 2cd75b4a544..5008e149bc4 100644
--- a/modules/installer/cd-dvd/installation-cd-base.nix
+++ b/modules/installer/cd-dvd/installation-cd-base.nix
@@ -84,9 +84,6 @@ in
     
   isoImage.volumeID = "NIXOS_INSTALL_CD_${config.system.nixosVersion}";
   
-  # Use Linux 2.6.32.
-  boot.kernelPackages = pkgs.kernelPackages_2_6_32;
-
   # Show the manual.
   services.nixosManual.showManual = true;
 
-- 
GitLab


From ac8a2ae57700e65e11396027993aab17b7187b51 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sun, 10 Jan 2010 19:00:29 +0000
Subject: [PATCH 2175/5331] * Use the LVM udev rules in stage 1.  This makes  
 /dev/disk/by-{label,uuid} paths available for LVM volumes.

svn path=/nixos/trunk/; revision=19334
---
 modules/system/boot/stage-1-init.sh | 9 +++++----
 modules/system/boot/stage-1.nix     | 7 +++++--
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/modules/system/boot/stage-1-init.sh b/modules/system/boot/stage-1-init.sh
index 2d95042d109..76c2be8a048 100644
--- a/modules/system/boot/stage-1-init.sh
+++ b/modules/system/boot/stage-1-init.sh
@@ -114,14 +114,15 @@ echo "running udev..."
 export UDEV_CONFIG_FILE=@udevConf@
 mkdir -p /dev/.udev # !!! bug in udev?
 udevd --daemon
+udevadm control --env=STARTUP=1
 udevadm trigger
+udevadm control --env=STARTUP=
 udevadm settle
 
 echo "starting device mapper and LVM..."
-dmsetup mknodes
-lvm vgscan --ignorelockingfailure
-lvm vgchange -ay --ignorelockingfailure
-
+lvm vgscan
+lvm vgchange -ay
+                                                                        
 if test -n "$debug1devices"; then fail; fi
 
 
diff --git a/modules/system/boot/stage-1.nix b/modules/system/boot/stage-1.nix
index 137eaa9e379..504b1080bb7 100644
--- a/modules/system/boot/stage-1.nix
+++ b/modules/system/boot/stage-1.nix
@@ -133,7 +133,7 @@ let
 
       cp -pd ${pkgs.e2fsprogs}/lib/lib*.so.* $out/lib
 
-      # Copy dmsetup and lvm, if we need it.
+      # Copy dmsetup and lvm.
       cp ${pkgs.lvm2}/sbin/dmsetup $out/bin/dmsetup
       cp ${pkgs.lvm2}/sbin/lvm $out/bin/lvm
       cp ${pkgs.lvm2}/lib/libdevmapper.so.*.* $out/lib
@@ -211,6 +211,7 @@ let
       cp ${pkgs.udev}/libexec/rules.d/60-cdrom_id.rules $out/
       cp ${pkgs.udev}/libexec/rules.d/60-persistent-storage.rules $out/
       cp ${pkgs.udev}/libexec/rules.d/80-drivers.rules $out/
+      cp ${pkgs.lvm2}/lib/udev/rules.d/*.rules $out/
 
       for i in $out/*.rules; do
           substituteInPlace $i \
@@ -221,7 +222,9 @@ let
             --replace vol_id ${extraUtils}/bin/vol_id \
             --replace cdrom_id ${extraUtils}/bin/cdrom_id \
             --replace /sbin/blkid ${extraUtils}/bin/blkid \
-            --replace /sbin/modprobe ${extraUtils}/bin/modprobe
+            --replace /sbin/modprobe ${extraUtils}/bin/modprobe \
+            --replace '$env{DM_SBIN_PATH}/blkid' ${extraUtils}/bin/blkid \
+            --replace 'ENV{DM_SBIN_PATH}="/sbin"' 'ENV{DM_SBIN_PATH}="${extraUtils}/bin"'
       done
 
       # Remove rule preventing creation of a by-label symlink
-- 
GitLab


From 3219ad5587ccf4dd530e21ae93fbc05f416173bd Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sun, 10 Jan 2010 19:05:30 +0000
Subject: [PATCH 2176/5331] * LVM test: use /dev/disk/by-label/nixos to see
 whether by-label works   for LVM. * Add even more udevadm settle calls. 
 Urgh.

svn path=/nixos/trunk/; revision=19336
---
 tests/installer.nix | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/tests/installer.nix b/tests/installer.nix
index 0f5b828f108..7adabe93601 100644
--- a/tests/installer.nix
+++ b/tests/installer.nix
@@ -217,9 +217,10 @@ in {
         ''
           $machine->mustSucceed(
               "parted /dev/vda mklabel msdos",
+              "udevadm settle",
               "parted /dev/vda -- mkpart primary linux-swap 1M 1024M",
+              "udevadm settle",
               "parted /dev/vda -- mkpart primary ext2 1024M -1s",
-              # It can take udev a moment to create /dev/vda*.
               "udevadm settle",
               "mkswap /dev/vda1 -L swap",
               "swapon -L swap",
@@ -238,7 +239,9 @@ in {
           $machine->mustSucceed(
               "parted /dev/vda mklabel msdos",
               "parted /dev/vda -- mkpart primary ext2 1M 50MB", # /boot
+              "udevadm settle",
               "parted /dev/vda -- mkpart primary linux-swap 50MB 1024M",
+              "udevadm settle",
               "parted /dev/vda -- mkpart primary ext2 1024M -1s", # /
               "udevadm settle",
               "mkswap /dev/vda2 -L swap",
@@ -263,6 +266,7 @@ in {
               "parted /dev/vda -- mkpart primary 1M 2048M", # first PV
               "udevadm settle",
               "parted /dev/vda -- set 1 lvm on",
+              "udevadm settle",
               "parted /dev/vda -- mkpart primary 2048M -1s", # second PV
               "udevadm settle",
               "parted /dev/vda -- set 2 lvm on",
@@ -276,12 +280,7 @@ in {
               "mount LABEL=nixos /mnt",
           );
         '';
-      fileSystems =
-        ''
-          { mountPoint = "/";
-            device = " /dev/MyVolGroup/nixos";
-          }
-        '';
+      fileSystems = rootFS;
     };
   
 }
-- 
GitLab


From cac502e35b4f23da844f30a3955e7a387d21cb58 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sun, 10 Jan 2010 19:14:42 +0000
Subject: [PATCH 2177/5331] * Okay, so we do need an "lvm" task to run
 vgscan/vgchange.  It's only   needed though for devices that were not already
 found and activated   in the initrd.

svn path=/nixos/trunk/; revision=19337
---
 modules/tasks/lvm.nix | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/modules/tasks/lvm.nix b/modules/tasks/lvm.nix
index 8b60cd4c0b9..38277976d6d 100644
--- a/modules/tasks/lvm.nix
+++ b/modules/tasks/lvm.nix
@@ -6,6 +6,25 @@
 
   config = {
 
+    jobs.lvm =
+      { startOn = "started udev or new-devices";
+
+        script =
+          ''
+            # Scan for block devices that might contain LVM physical volumes
+            # and volume groups.
+            ${pkgs.lvm2}/sbin/vgscan --mknodes
+
+            # Make all logical volumes on all volume groups available, i.e.,
+            # make them appear in /dev.
+            ${pkgs.lvm2}/sbin/vgchange --available y
+
+            initctl emit -n new-devices
+          '';
+
+        task = true;
+      };
+
     environment.systemPackages = [ pkgs.lvm2 ];
 
     services.udev.packages = [ pkgs.lvm2 ];
-- 
GitLab


From f22a548c0db29956bb9f87720dfc790fec341028 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sun, 10 Jan 2010 19:19:52 +0000
Subject: [PATCH 2178/5331] * Grrrr.

svn path=/nixos/trunk/; revision=19338
---
 tests/installer.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tests/installer.nix b/tests/installer.nix
index 7adabe93601..ace42492424 100644
--- a/tests/installer.nix
+++ b/tests/installer.nix
@@ -270,6 +270,7 @@ in {
               "parted /dev/vda -- mkpart primary 2048M -1s", # second PV
               "udevadm settle",
               "parted /dev/vda -- set 2 lvm on",
+              "udevadm settle",
               "pvcreate /dev/vda1 /dev/vda2",
               "vgcreate MyVolGroup /dev/vda1 /dev/vda2",
               "lvcreate --size 1G --name swap MyVolGroup",
-- 
GitLab


From b02cf8d20eeacf20fc4856a4f3b57abb49ae3667 Mon Sep 17 00:00:00 2001
From: Nicolas Pierron <nicolas.b.pierron@gmail.com>
Date: Sun, 10 Jan 2010 19:36:53 +0000
Subject: [PATCH 2179/5331] Check that 'mdadm --assemble' is effective before
 continuing.

svn path=/nixos/trunk/; revision=19339
---
 modules/tasks/swraid.nix | 20 +++++++++++++++++---
 1 file changed, 17 insertions(+), 3 deletions(-)

diff --git a/modules/tasks/swraid.nix b/modules/tasks/swraid.nix
index dfdb9e9a34d..ca37b716c62 100644
--- a/modules/tasks/swraid.nix
+++ b/modules/tasks/swraid.nix
@@ -5,6 +5,7 @@
 let
 
   tempConf = "/var/run/mdadm.conf";
+  tempStatus = "/var/run/mdadm.status";
   logFile = "/var/log/mdadmEvents.log";
   modprobe = config.system.sbin.modprobe;
   inherit (pkgs) mdadm diffutils;
@@ -42,9 +43,21 @@ in
       # Scan /proc/partitions for RAID devices.
       ${mdadm}/sbin/mdadm --examine --brief --scan -c partitions > ${tempConf}
 
-      if ! ${diffutils}/bin/diff ${tempConf} ${tempConf}.old > /dev/null; then
-        # Activate each device found.
-        ${mdadm}/sbin/mdadm --assemble -c ${tempConf} --scan
+      if ! -q ${diffutils}/bin/diff ${tempConf} ${tempConf}.old > /dev/null; then
+        
+        try=0
+        while ! test -e /proc/mdstat || ! ${diffutils}/bin/diff -q /proc/mdstat ${tempStatus} > /dev/null; do
+          test $try -gt 6 && break
+          test $try -neq 0 && sleep 10
+
+          # Activate each device found.
+          ${mdadm}/sbin/mdadm --assemble -c ${tempConf} --scan
+
+          try=$(($try + 1))
+        done
+
+        # Register the new status
+        cp /proc/mdstat ${tempStatus}
 
         # Send notifications.
         initctl emit -n new-devices
@@ -64,6 +77,7 @@ in
 
     postStart = ''
       echo > ${tempConf}
+      echo > ${tempStatus}
 
       # Assemble early raid devices.
       initctl emit -n new-raid-array
-- 
GitLab


From eccddb67fae7222cfef512648726e023a8ebb60e Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sun, 10 Jan 2010 20:07:23 +0000
Subject: [PATCH 2180/5331] * --mknodes is no longer needed (in fact it might
 interfere with   udev).

svn path=/nixos/trunk/; revision=19340
---
 modules/tasks/lvm.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/tasks/lvm.nix b/modules/tasks/lvm.nix
index 38277976d6d..875bf97ff25 100644
--- a/modules/tasks/lvm.nix
+++ b/modules/tasks/lvm.nix
@@ -13,7 +13,7 @@
           ''
             # Scan for block devices that might contain LVM physical volumes
             # and volume groups.
-            ${pkgs.lvm2}/sbin/vgscan --mknodes
+            ${pkgs.lvm2}/sbin/vgscan
 
             # Make all logical volumes on all volume groups available, i.e.,
             # make them appear in /dev.
-- 
GitLab


From ee005424bf57df6bcba873c0de3980ea41390172 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sun, 10 Jan 2010 20:08:35 +0000
Subject: [PATCH 2181/5331] * Doh, subtle race condition: STARTUP must be
 cleared after "udevadm   settle".  Otherwise some rules may be processed with
 STARTUP   cleared, causing LVM devices not to be created.

svn path=/nixos/trunk/; revision=19341
---
 modules/services/hardware/udev.nix  | 2 +-
 modules/system/boot/stage-1-init.sh | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/services/hardware/udev.nix b/modules/services/hardware/udev.nix
index af653f59c88..e7c9d84033c 100644
--- a/modules/services/hardware/udev.nix
+++ b/modules/services/hardware/udev.nix
@@ -193,8 +193,8 @@ in
             # http://www.mail-archive.com/fedora-devel-list@redhat.com/msg10261.html
             ${udev}/sbin/udevadm control --env=STARTUP=1
             ${udev}/sbin/udevadm trigger
-            ${udev}/sbin/udevadm control --env=STARTUP=
             ${udev}/sbin/udevadm settle # wait for udev to finish
+            ${udev}/sbin/udevadm control --env=STARTUP=
 
             initctl emit -n new-devices
           '';
diff --git a/modules/system/boot/stage-1-init.sh b/modules/system/boot/stage-1-init.sh
index 76c2be8a048..5f882f67aa0 100644
--- a/modules/system/boot/stage-1-init.sh
+++ b/modules/system/boot/stage-1-init.sh
@@ -116,8 +116,8 @@ mkdir -p /dev/.udev # !!! bug in udev?
 udevd --daemon
 udevadm control --env=STARTUP=1
 udevadm trigger
-udevadm control --env=STARTUP=
 udevadm settle
+udevadm control --env=STARTUP=
 
 echo "starting device mapper and LVM..."
 lvm vgscan
-- 
GitLab


From 73bdc861b7232e57c800bcf64ed549aefc941271 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 11 Jan 2010 15:58:15 +0000
Subject: [PATCH 2182/5331] * Added a test for a simple load-balancing web
 server.  The tests   verify whether the reverse proxy works correctly if the
 back-ends go   down and come up.  (Moved from the varia repo.)

svn path=/nixos/trunk/; revision=19356
---
 release.nix       |  1 +
 tests/default.nix |  1 +
 tests/proxy.nix   | 94 +++++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 96 insertions(+)
 create mode 100644 tests/proxy.nix

diff --git a/release.nix b/release.nix
index 143d698e045..957e65b681d 100644
--- a/release.nix
+++ b/release.nix
@@ -128,6 +128,7 @@ let
         installer.separateBoot = t.installer.separateBoot.test;
         installer.simple = t.installer.simple.test;
         kde4 = t.kde4.test;
+        proxy = t.proxy.test;
         quake3 = t.quake3.test;
         subversion = t.subversion.report;
         trac = t.trac.test;
diff --git a/tests/default.nix b/tests/default.nix
index 5045375e10d..2efe151ab79 100644
--- a/tests/default.nix
+++ b/tests/default.nix
@@ -31,6 +31,7 @@ in
   firefox = apply (import ./firefox.nix);
   installer = pkgs.lib.mapAttrs (name: complete) (call (import ./installer.nix));
   kde4 = apply (import ./kde4.nix);
+  proxy = apply (import ./proxy.nix);
   quake3 = apply (import ./quake3.nix);
   subversion = apply (import ./subversion.nix);
   trac = apply (import ./trac.nix);
diff --git a/tests/proxy.nix b/tests/proxy.nix
new file mode 100644
index 00000000000..81833060d43
--- /dev/null
+++ b/tests/proxy.nix
@@ -0,0 +1,94 @@
+{ pkgs, ... }:
+
+let
+
+  backend = 
+    { config, pkgs, ... }:
+
+    {
+      services.sshd.enable = true;
+
+      services.httpd.enable = true;
+      services.httpd.adminAddr = "foo@example.org";
+      services.httpd.documentRoot = "${pkgs.valgrind}/share/doc/valgrind/html";
+    };
+
+in
+
+{
+
+  nodes =
+    { proxy =
+        { config, pkgs, nodes, ... }:
+
+        {
+          services.httpd.enable = true;
+          services.httpd.adminAddr = "bar@example.org";
+          services.httpd.extraModules = ["proxy_balancer"];
+
+          services.httpd.extraConfig =
+            ''
+              ExtendedStatus on
+
+              <Location /server-status>
+                Order deny,allow
+                Allow from all
+                SetHandler server-status
+              </Location>
+
+              <Proxy balancer://cluster>
+                Allow from all
+                BalancerMember http://${nodes.backend1.config.networking.hostName} retry=0
+                BalancerMember http://${nodes.backend2.config.networking.hostName} retry=0
+              </Proxy>
+
+              ProxyStatus       full
+              ProxyPass         /server-status !
+              ProxyPass         /       balancer://cluster/
+              ProxyPassReverse  /       balancer://cluster/
+
+              # For testing; don't want to wait forever for dead backend servers.
+              ProxyTimeout      5
+            '';
+        };
+
+      backend1 = backend;
+      backend2 = backend;
+
+      client = { config, pkgs, ... }: { };
+    };
+
+  testScript =
+    ''
+      startAll;
+
+      $proxy->waitForJob("httpd");
+      $backend1->waitForJob("httpd");
+      $backend2->waitForJob("httpd");
+
+      # With the back-ends up, the proxy should work.
+      $client->mustSucceed("curl --fail http://proxy/");
+
+      $client->mustSucceed("curl --fail http://proxy/server-status");
+
+      # Block the first back-end.
+      $backend1->block;
+
+      # The proxy should still work.
+      $client->mustSucceed("curl --fail http://proxy/");
+
+      $client->mustSucceed("curl --fail http://proxy/");
+
+      # Block the second back-end.
+      $backend2->block;
+
+      # Now the proxy should fail as well.
+      $client->mustFail("curl --fail http://proxy/");
+
+      # But if the second back-end comes back, the proxy should start
+      # working again.
+      $backend2->unblock;
+      $client->mustSucceed("curl --fail http://proxy/");
+    '';
+
+}
-- 
GitLab


From d45a3fbdc9e8def061d435cd3400c0ea2105a2a5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Mon, 11 Jan 2010 21:56:01 +0000
Subject: [PATCH 2183/5331] Adding the pcscd daemon (this daemon manages
 smartcard reader drivers), and offers a common interface to programs dealing
 with smartcards (like users of the opensc lib).

svn path=/nixos/trunk/; revision=19360
---
 modules/module-list.nix             |  1 +
 modules/services/hardware/pcscd.nix | 46 +++++++++++++++++++++++++++++
 2 files changed, 47 insertions(+)
 create mode 100644 modules/services/hardware/pcscd.nix

diff --git a/modules/module-list.nix b/modules/module-list.nix
index 40b31082902..d140f7ad335 100644
--- a/modules/module-list.nix
+++ b/modules/module-list.nix
@@ -47,6 +47,7 @@
   ./services/databases/postgresql.nix
   ./services/hardware/acpid.nix
   ./services/hardware/hal.nix
+  ./services/hardware/pcscd.nix
   ./services/hardware/udev.nix
   ./services/logging/klogd.nix
   ./services/logging/syslogd.nix
diff --git a/modules/services/hardware/pcscd.nix b/modules/services/hardware/pcscd.nix
new file mode 100644
index 00000000000..45684e17416
--- /dev/null
+++ b/modules/services/hardware/pcscd.nix
@@ -0,0 +1,46 @@
+{ config, pkgs, ... }:
+
+with pkgs.lib;
+
+{
+
+  ###### interface
+
+  options = {
+  
+    services.pcscd = {
+
+      enable = mkOption {
+        default = false;
+        description = "Whether to enable the PCSC-Lite daemon.";
+      };
+      
+    };
+    
+  };
+  
+
+  ###### implementation
+
+  config = mkIf config.services.pcscd.enable {
+
+    jobs.pcscd =
+      { description = "PCSC-Lite daemon";
+
+        startOn = "started udev";
+
+        daemonType = "daemon";
+
+        # Add to the drivers directory the only drivers we have by now: ccid
+        preStart = ''
+            mkdir -p /var/lib/pcsc
+            rm -Rf /var/lib/pcsc/drivers
+            ln -s ${pkgs.ccid}/pcsc/drivers /var/lib/pcsc/
+        '';
+
+        exec = "${pkgs.pcsclite}/sbin/pcscd";
+      };
+      
+  };
+  
+}
-- 
GitLab


From c68f5fbae430c3f660ceb3c50f35ac902dba0f4c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Tue, 12 Jan 2010 11:02:23 +0000
Subject: [PATCH 2184/5331] Add support for pam_limits.

svn path=/nixos/trunk/; revision=19370
---
 modules/security/pam.nix | 64 ++++++++++++++++++++++++++++++++++++++--
 1 file changed, 62 insertions(+), 2 deletions(-)

diff --git a/modules/security/pam.nix b/modules/security/pam.nix
index d693255a55b..fd1aae65ac9 100644
--- a/modules/security/pam.nix
+++ b/modules/security/pam.nix
@@ -21,6 +21,14 @@ let
       session  required pam_deny.so
     '';
 
+  # Create a limits.conf(5) file.
+  makeLimitsConf = limits:
+    pkgs.writeText "limits.conf"
+      (concatStringsSep "\n"
+           (map ({ domain, type, item, value }:
+                 concatStringsSep " " [ domain type item value ])
+                limits));
+
   makePAMService =
     { name
     , # If set, root doesn't need to authenticate (e.g. for the "chsh"
@@ -43,6 +51,8 @@ let
       # accounts with hashed empty passwords are always allowed to log
       # in.
       allowNullPassword ? false
+    , # The limits, as per limits.conf(5).
+      limits ? []
     }:
 
     { source = pkgs.writeText "${name}.pam"
@@ -81,6 +91,8 @@ let
               "session optional ${pkgs.consolekit}/lib/security/pam_ck_connector.so"}
           ${optionalString forwardXAuth
               "session optional pam_xauth.so xauthpath=${pkgs.xorg.xauth}/bin/xauth systemuser=99"}
+          ${optionalString (limits != [])
+              "session required ${pkgs.pam}/lib/security/pam_limits.so conf=${makeLimitsConf limits}"}
         '';
       target = "pam.d/${name}";
     };
@@ -93,9 +105,47 @@ in
 
   options = {
 
+    security.pam.loginLimits = mkOption {
+      default = [];
+      example =
+        [ { domain = "ftp";
+            type   = "hard";
+            item   = "nproc";
+            value  = "0";
+          }
+          { domain = "@student";
+            type   = "-";
+            item   = "maxlogins";
+            value  = "4";
+          }
+       ];
+
+     description =
+       '' Define resource limits that should apply to users or groups for the
+          <command>login</command> service.  Each item in the list should be
+          an attribute set with a <varname>domain</varname>,
+          <varname>type</varname>, <varname>item</varname>, and
+          <varname>value</varname> attribute.  The syntax and semantics of
+          these attributes must be that described in the limits.conf(5) man
+          page.
+       '';
+    };
+
     security.pam.services = mkOption {
       default = [];
-      example = [ { name = "chsh"; rootOK = true; } ];
+      example = [
+        { name = "chsh"; rootOK = true; }
+        { name = "login"; ownDevices = true; allowNullPassword = true;
+          limits = [
+            { domain = "ftp";
+              type   = "hard";
+              item   = "nproc";
+              value  = "0";
+            }
+          ];
+        }
+      ];
+
       description =
         ''
           This option defines the PAM services.  A service typically
@@ -113,6 +163,14 @@ in
           whether X authentication keys should be passed from the
           calling user to the target user (e.g. for
           <command>su</command>).
+
+          The attribute <varname>limits</varname> defines resource limits
+          that should apply to users or groups for the service.  Each item in
+          the list should be an attribute set with a
+          <varname>domain</varname>, <varname>type</varname>,
+          <varname>item</varname>, and <varname>value</varname> attribute.
+          The syntax and semantics of these attributes must be that described
+          in the limits.conf(5) man page.
         '';
     };
 
@@ -153,7 +211,9 @@ in
         { name = "useradd"; rootOK = true; }
         # Used by groupadd etc.
         { name = "shadow"; rootOK = true; }
-        { name = "login"; ownDevices = true; allowNullPassword = true; }
+        { name = "login"; ownDevices = true; allowNullPassword = true;
+          limits = config.security.pam.loginLimits;
+        }
       ];
 
   };
-- 
GitLab


From b5ade0119947539b17269f003feab5ff886d3e5e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Tue, 12 Jan 2010 11:08:27 +0000
Subject: [PATCH 2185/5331] Make network-interfaces emit the ip-up if there are
 interfaces defined *OR* there are localCommands (which potentially can bring
 up interfaces).

svn path=/nixos/trunk/; revision=19371
---
 modules/tasks/network-interfaces.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/tasks/network-interfaces.nix b/modules/tasks/network-interfaces.nix
index 2868c251fca..95cc5041765 100644
--- a/modules/tasks/network-interfaces.nix
+++ b/modules/tasks/network-interfaces.nix
@@ -179,8 +179,8 @@ in
             # Run any user-specified commands.
             ${pkgs.stdenv.shell} ${pkgs.writeText "local-net-cmds" cfg.localCommands} || true
 
-            # Emit the ip-up event (e.g. to start ntpd).
-            ${optionalString (cfg.interfaces != []) ''
+            ${optionalString (cfg.interfaces != [] && cfg.localCommands != "") ''
+              # Emit the ip-up event (e.g. to start ntpd).
               initctl emit -n ip-up
             ''}
           '';
-- 
GitLab


From f89e46bc12daeb75343e8025fe10f0e099ac27aa Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 13 Jan 2010 10:37:58 +0000
Subject: [PATCH 2186/5331] * Revert r19339 because it doesn't work and gives a
 lot of errors:

client# /dev/fd/9: line 13: -q: command not found
client# /dev/fd/9: line 18: test: -neq: binary operator expected
client# mdadm: No arrays found in config file

svn path=/nixos/trunk/; revision=19386
---
 modules/tasks/swraid.nix | 20 +++-----------------
 1 file changed, 3 insertions(+), 17 deletions(-)

diff --git a/modules/tasks/swraid.nix b/modules/tasks/swraid.nix
index ca37b716c62..dfdb9e9a34d 100644
--- a/modules/tasks/swraid.nix
+++ b/modules/tasks/swraid.nix
@@ -5,7 +5,6 @@
 let
 
   tempConf = "/var/run/mdadm.conf";
-  tempStatus = "/var/run/mdadm.status";
   logFile = "/var/log/mdadmEvents.log";
   modprobe = config.system.sbin.modprobe;
   inherit (pkgs) mdadm diffutils;
@@ -43,21 +42,9 @@ in
       # Scan /proc/partitions for RAID devices.
       ${mdadm}/sbin/mdadm --examine --brief --scan -c partitions > ${tempConf}
 
-      if ! -q ${diffutils}/bin/diff ${tempConf} ${tempConf}.old > /dev/null; then
-        
-        try=0
-        while ! test -e /proc/mdstat || ! ${diffutils}/bin/diff -q /proc/mdstat ${tempStatus} > /dev/null; do
-          test $try -gt 6 && break
-          test $try -neq 0 && sleep 10
-
-          # Activate each device found.
-          ${mdadm}/sbin/mdadm --assemble -c ${tempConf} --scan
-
-          try=$(($try + 1))
-        done
-
-        # Register the new status
-        cp /proc/mdstat ${tempStatus}
+      if ! ${diffutils}/bin/diff ${tempConf} ${tempConf}.old > /dev/null; then
+        # Activate each device found.
+        ${mdadm}/sbin/mdadm --assemble -c ${tempConf} --scan
 
         # Send notifications.
         initctl emit -n new-devices
@@ -77,7 +64,6 @@ in
 
     postStart = ''
       echo > ${tempConf}
-      echo > ${tempStatus}
 
       # Assemble early raid devices.
       initctl emit -n new-raid-array
-- 
GitLab


From 13ee7353950548b008b2a318d12148ffe80cd741 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Thu, 14 Jan 2010 19:50:49 +0000
Subject: [PATCH 2187/5331] Making nixos work well with the new names
 'linuxPackages' in stdenv-updates, additionally to the nixpkgs trunk
 'kernelPackages'. Seeing a strange kernelPackages mentioned in
 installation-cd-rescue (2.6.31_something) I update that to 2.6.32.

svn path=/nixos/trunk/; revision=19443
---
 modules/installer/cd-dvd/installation-cd-rescue.nix | 3 ++-
 modules/system/boot/kernel.nix                      | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/modules/installer/cd-dvd/installation-cd-rescue.nix b/modules/installer/cd-dvd/installation-cd-rescue.nix
index 43bb4c40930..dd3a72c49c6 100644
--- a/modules/installer/cd-dvd/installation-cd-rescue.nix
+++ b/modules/installer/cd-dvd/installation-cd-rescue.nix
@@ -33,7 +33,8 @@
     lsof
   ];
 
-  boot.kernelPackages = pkgs.kernelPackages_2_6_31_rc4_old_i686;
+  boot.kernelPackages = (if (nixpkgs ? linuxlPackages then
+    pkgs.linuxPackages_2_6_32 else pkgs.kernelPackages_2_6_32);
   boot.initrd.kernelModules = ["evdev" "i8042" "pcips2" "serio"
     "sd_mod" "libata" "unix" "usbhid" "uhci_hcd" "atkbd" "xtkbd" "fbdev"
     "iso9660" "udf" "loop"];
diff --git a/modules/system/boot/kernel.nix b/modules/system/boot/kernel.nix
index ea93f86e321..d5d54d6f813 100644
--- a/modules/system/boot/kernel.nix
+++ b/modules/system/boot/kernel.nix
@@ -11,7 +11,8 @@ let kernel = config.boot.kernelPackages.kernel; in
   options = {
   
     boot.kernelPackages = mkOption {
-      default = pkgs.kernelPackages;
+      default = (if pkgs ? linuxPackages then pkgs.linuxPackages
+        else pkgs.kernelPackages);
       example = ''
         Example code (copy & paste):
         pkgs.kernelPackages_2_6_25
-- 
GitLab


From 473c9d8881c8282ebab321ba04ef556bc822f1c8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Thu, 14 Jan 2010 20:23:03 +0000
Subject: [PATCH 2188/5331] Fixing an additional missing check for
 linuxPackages/kernelPackages in tests.

svn path=/nixos/trunk/; revision=19444
---
 tests/installer.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/tests/installer.nix b/tests/installer.nix
index ace42492424..bd2e79b9fe3 100644
--- a/tests/installer.nix
+++ b/tests/installer.nix
@@ -78,7 +78,8 @@ let
       # Make the Nix store in this VM writable using AUFS.  Use Linux
       # 2.6.27 because 2.6.32 doesn't work (probably we need AUFS2).
       # This should probably be moved to qemu-vm.nix.
-      boot.kernelPackages = pkgs.kernelPackages_2_6_27;
+      boot.kernelPackages = (if pkgs ? linuxPackages then
+        pkgs.linuxPackages_2_6_27 else pkgs.kernelPackages_2_6_27);
       boot.extraModulePackages = [ config.boot.kernelPackages.aufs ];
       boot.initrd.availableKernelModules = [ "aufs" ];
 
-- 
GitLab


From 8d5037ad62949c13d3018fb4e743df44878b09c4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Fri, 15 Jan 2010 11:20:57 +0000
Subject: [PATCH 2189/5331] network-interfaces and emitting ip-up: I was still
 learning boolean logic.

svn path=/nixos/trunk/; revision=19464
---
 modules/tasks/network-interfaces.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/tasks/network-interfaces.nix b/modules/tasks/network-interfaces.nix
index 95cc5041765..d2268e47b01 100644
--- a/modules/tasks/network-interfaces.nix
+++ b/modules/tasks/network-interfaces.nix
@@ -179,7 +179,7 @@ in
             # Run any user-specified commands.
             ${pkgs.stdenv.shell} ${pkgs.writeText "local-net-cmds" cfg.localCommands} || true
 
-            ${optionalString (cfg.interfaces != [] && cfg.localCommands != "") ''
+            ${optionalString (cfg.interfaces != [] || cfg.localCommands != "") ''
               # Emit the ip-up event (e.g. to start ntpd).
               initctl emit -n ip-up
             ''}
-- 
GitLab


From 6502806689113c1a12b944be2695664ea7e7f26a Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Fri, 15 Jan 2010 21:55:51 +0000
Subject: [PATCH 2190/5331] Allow turning off VESA framebuffer

svn path=/nixos/trunk/; revision=19473
---
 modules/system/boot/kernel.nix | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/modules/system/boot/kernel.nix b/modules/system/boot/kernel.nix
index d5d54d6f813..66b83107ec2 100644
--- a/modules/system/boot/kernel.nix
+++ b/modules/system/boot/kernel.nix
@@ -47,6 +47,14 @@ let kernel = config.boot.kernelPackages.kernel; in
       description = "Additional user-defined kernel parameters.";
     };
 
+    boot.vesa = mkOption {
+      default = true;
+      example = false;
+      description = ''
+        Whether to activate VESA video mode on boot
+      '';
+    };
+
     boot.extraModulePackages = mkOption {
       default = [];
       # !!! example = [pkgs.aufs pkgs.nvidia_x11];
@@ -115,9 +123,8 @@ let kernel = config.boot.kernelPackages.kernel; in
     system.modulesTree = [ kernel ] ++ config.boot.extraModulePackages;
 
     boot.kernelParams =
-      [ "splash=verbose"
-        "vga=0x317"
-      ];
+      [ "splash=verbose"] ++ 
+      optional config.boot.vesa "vga=0x317";
       
     boot.kernelModules = [ "loop" ];
 
-- 
GitLab


From 8a6346e4774910348fcbe149f2b2892556518bf5 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 20 Jan 2010 14:22:47 +0000
Subject: [PATCH 2191/5331] * Provide a bundle of CA certificates in
 /etc/ca-bundle.crt, and set   the CURL_CA_BUNDLE environment variable.  This
 allows curl to work   without the `-k' flag on https sites with a properly
 signed   certificate.

svn path=/nixos/trunk/; revision=19572
---
 modules/module-list.nix |  1 +
 modules/security/ca.nix | 21 +++++++++++++++++++++
 2 files changed, 22 insertions(+)
 create mode 100644 modules/security/ca.nix

diff --git a/modules/module-list.nix b/modules/module-list.nix
index d140f7ad335..e51237f1ca0 100644
--- a/modules/module-list.nix
+++ b/modules/module-list.nix
@@ -31,6 +31,7 @@
   ./programs/ssh.nix
   ./programs/ssmtp.nix
   ./rename.nix
+  ./security/ca.nix
   ./security/consolekit.nix
   ./security/pam.nix
   ./security/pam_usb.nix
diff --git a/modules/security/ca.nix b/modules/security/ca.nix
new file mode 100644
index 00000000000..efa32f5e8f3
--- /dev/null
+++ b/modules/security/ca.nix
@@ -0,0 +1,21 @@
+{ config, pkgs, ... }:
+
+with pkgs.lib;
+
+{
+
+  config = {
+
+    environment.etc = singleton
+      { source = "${pkgs.cacert}/etc/ca-bundle.crt";
+        target = "ca-bundle.crt";
+      };
+
+    environment.shellInit =
+      ''
+        export CURL_CA_BUNDLE=/etc/ca-bundle.crt
+      '';
+      
+  };
+
+}
-- 
GitLab


From 6d21e007767d5d8b7bd28c4118b3da3fd699290a Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 20 Jan 2010 18:06:33 +0000
Subject: [PATCH 2192/5331] * Some hacks to support running NixOS on Amazon EC2
 (and other hosting   environment where you don't get to run stage 1 of the
 boot).

svn path=/nixos/trunk/; revision=19579
---
 modules/system/boot/stage-2-init.sh | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/modules/system/boot/stage-2-init.sh b/modules/system/boot/stage-2-init.sh
index adab3bf5d06..0ce9f90a54e 100644
--- a/modules/system/boot/stage-2-init.sh
+++ b/modules/system/boot/stage-2-init.sh
@@ -3,6 +3,11 @@
 # !!! copied from stage 1; remove duplication
 
 
+# If no `systemConfig' parameter is specified on the kernel command
+# line, use `/system' as a fallback.
+systemConfig=/system
+
+
 # Print a greeting.
 echo
 echo -e "\e[1;32m<<< NixOS Stage 2 >>>\e[0m"
@@ -24,6 +29,13 @@ setPath() {
 setPath "@path@"
 
 
+# Normally, stage 1 mounts the root filesystem read/writable.
+# However, in some environments (such as Amazon EC2), stage 2 is
+# executed directly, and the root is read-only.  So make it writable
+# here.
+mount -n -o remount,rw none /
+
+
 # Mount special file systems.
 mkdir -m 0755 -p /etc
 test -e /etc/fstab || touch /etc/fstab # to shut up mount
-- 
GitLab


From 590acc193c1d823d99ca216f19fbbb9588f8c3ef Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 20 Jan 2010 18:10:02 +0000
Subject: [PATCH 2193/5331] * A module for generating a disk image suitable for
 use with Amazon's   Elastic Compute Cloud (EC2).  TODO: run ec2-bundle-image
 here.

svn path=/nixos/trunk/; revision=19580
---
 modules/virtualisation/amazon-image.nix | 43 +++++++++++++++++++++++++
 1 file changed, 43 insertions(+)
 create mode 100644 modules/virtualisation/amazon-image.nix

diff --git a/modules/virtualisation/amazon-image.nix b/modules/virtualisation/amazon-image.nix
new file mode 100644
index 00000000000..e834b392c6f
--- /dev/null
+++ b/modules/virtualisation/amazon-image.nix
@@ -0,0 +1,43 @@
+{ config, pkgs, ... }:
+
+with pkgs.lib;
+
+{
+  system.build.ext2Image =
+    pkgs.vmTools.runInLinuxVM (
+      pkgs.runCommand "amazon-image"
+        { preVM =
+            ''
+              mkdir $out
+              diskImage=$out/nixos.img
+              qemu-img create -f raw $diskImage "1024M"
+            '';
+          buildInputs = [ pkgs.utillinux pkgs.perl pkgs.rsync ];
+          exportReferencesGraph = 
+            [ "closure" config.system.build.toplevel ];
+        }
+        ''
+          # Create an empty filesysten and mount it.
+          ${pkgs.e2fsprogs}/sbin/mkfs.ext3 /dev/vda
+          mkdir /mnt
+          mount /dev/vda /mnt
+
+          # Copy all paths in the closure to the filesystem.
+          storePaths=$(perl ${pkgs.pathsFromGraph} $ORIG_TMPDIR/closure)
+
+          mkdir -p /mnt/nix/store
+          rsync -av $storePaths /mnt/nix/store/
+
+          # Amazon assumes that there is a /sbin/init, so symlink it
+          # to the stage 2 init script.  Since we cannot set the path
+          # to the system configuration via the systemConfig kernel
+          # parameter, use a /system symlink.
+          mkdir -p /mnt/sbin
+          ln -s ${config.system.build.bootStage2} /mnt/sbin/init
+          ln -s ${config.system.build.toplevel} /mnt/system
+
+          umount /mnt
+        ''
+    );
+
+}
-- 
GitLab


From dc137c54eb16955dec3e7b9bdbc3d0dd6173221e Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 20 Jan 2010 21:03:53 +0000
Subject: [PATCH 2194/5331] * Configuration used to generate an Amazon image. 
 This doesn't belong   in `tests' but I don't have a better place right now.

svn path=/nixos/trunk/; revision=19583
---
 tests/amazon.nix | 33 +++++++++++++++++++++++++++++++++
 1 file changed, 33 insertions(+)
 create mode 100644 tests/amazon.nix

diff --git a/tests/amazon.nix b/tests/amazon.nix
new file mode 100644
index 00000000000..a1fe7525301
--- /dev/null
+++ b/tests/amazon.nix
@@ -0,0 +1,33 @@
+rec {
+
+  machine =
+    { config, pkgs, ... }:
+    
+    {
+      services.httpd.enable = true;
+      services.httpd.adminAddr = "e.dolstra@tudelft.nl";
+      services.httpd.documentRoot = "${pkgs.valgrind}/share/doc/valgrind/html";
+
+      nixpkgs.config.packageOverrides = pkgsOld:
+        { dhcp = pkgs.lib.overrideDerivation pkgsOld.dhcp (oldAttrs:
+            { configureFlags = "--disable-dhcpv6";
+            });
+        };
+
+      fileSystems = [ ];
+
+      swapDevices =
+        [ { device = "/dev/sda2"; } ];
+
+      services.sshd.enable = true;
+      services.sshd.permitRootLogin = "without-password";
+
+      services.mingetty.ttys = [ ];
+    };
+
+  config = (import ./lib/eval-config.nix {
+    system = "i686-linux";
+    modules = [ machine ./modules/virtualisation/amazon-image.nix ];
+  }).config;
+
+}
-- 
GitLab


From 97668574dc8c8f34d2933cb3347c66a8829d19f9 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 20 Jan 2010 21:04:10 +0000
Subject: [PATCH 2195/5331] * Doh.

svn path=/nixos/trunk/; revision=19584
---
 tests/amazon.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/amazon.nix b/tests/amazon.nix
index a1fe7525301..a016b8947d1 100644
--- a/tests/amazon.nix
+++ b/tests/amazon.nix
@@ -25,9 +25,9 @@ rec {
       services.mingetty.ttys = [ ];
     };
 
-  config = (import ./lib/eval-config.nix {
+  config = (import ../lib/eval-config.nix {
     system = "i686-linux";
-    modules = [ machine ./modules/virtualisation/amazon-image.nix ];
+    modules = [ machine ../modules/virtualisation/amazon-image.nix ];
   }).config;
 
 }
-- 
GitLab


From 3e3448a7df115b3102014fa4a55b2d652a63bc59 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 21 Jan 2010 08:03:58 +0000
Subject: [PATCH 2196/5331] * Added an Upstart job to fetch the SSH key for
 logging into the root   account of the VM.  However, it doesn't work yet (the
 machine   doesn't boot properly and there is no console output).  So use a  
 hard-coded password for now (very dangerous!).

svn path=/nixos/trunk/; revision=19589
---
 modules/virtualisation/amazon-image.nix | 65 +++++++++++++++++++++++--
 tests/amazon.nix                        | 16 ------
 2 files changed, 62 insertions(+), 19 deletions(-)

diff --git a/modules/virtualisation/amazon-image.nix b/modules/virtualisation/amazon-image.nix
index e834b392c6f..f0f2545993b 100644
--- a/modules/virtualisation/amazon-image.nix
+++ b/modules/virtualisation/amazon-image.nix
@@ -3,7 +3,7 @@
 with pkgs.lib;
 
 {
-  system.build.ext2Image =
+  system.build.amazonImage =
     pkgs.vmTools.runInLinuxVM (
       pkgs.runCommand "amazon-image"
         { preVM =
@@ -12,7 +12,7 @@ with pkgs.lib;
               diskImage=$out/nixos.img
               qemu-img create -f raw $diskImage "1024M"
             '';
-          buildInputs = [ pkgs.utillinux pkgs.perl pkgs.rsync ];
+          buildInputs = [ pkgs.utillinux pkgs.perl ];
           exportReferencesGraph = 
             [ "closure" config.system.build.toplevel ];
         }
@@ -26,7 +26,7 @@ with pkgs.lib;
           storePaths=$(perl ${pkgs.pathsFromGraph} $ORIG_TMPDIR/closure)
 
           mkdir -p /mnt/nix/store
-          rsync -av $storePaths /mnt/nix/store/
+          cp -prvd $storePaths /mnt/nix/store/
 
           # Amazon assumes that there is a /sbin/init, so symlink it
           # to the stage 2 init script.  Since we cannot set the path
@@ -36,8 +36,67 @@ with pkgs.lib;
           ln -s ${config.system.build.bootStage2} /mnt/sbin/init
           ln -s ${config.system.build.toplevel} /mnt/system
 
+          set -x
+          sync
           umount /mnt
+          sync
         ''
     );
 
+  # On EC2 we don't get to supply our own kernel, so we can't load any
+  # modules.  However, dhclient fails if the ipv6 module isn't loaded,
+  # unless it's compiled without IPv6 support.  So do that.
+  nixpkgs.config.packageOverrides = pkgsOld:
+    { dhcp = pkgs.lib.overrideDerivation pkgsOld.dhcp (oldAttrs:
+        { configureFlags = "--disable-dhcpv6";
+        });
+    };
+
+  # The root filesystem is mounted by Amazon's kernel/initrd.
+  fileSystems = [ ];
+
+  swapDevices =
+    [ { device = "/dev/sda2"; } ];
+
+  # There are no virtual consoles.
+  services.mingetty.ttys = [ ];
+
+  # Allow root logins only using the SSH key that the user specified
+  # at instance creation time.
+  services.sshd.enable = true;
+  #services.sshd.permitRootLogin = "without-password";
+
+  boot.postBootCommands =
+    ''
+      echo xyzzy_foobar | ${pkgs.pwdutils}/bin/passwd --stdin
+    '';
+
+  # Obtain the SSH key at startup time.
+  /*
+  jobs.fetchSSHKey =
+    { name = "fetch-ssh-key";
+
+      startOn = "ip-up";
+
+      task = true;
+
+      script =
+        ''
+          set -x
+          echo "obtaining SSH key..."
+          mkdir -p /root/.ssh
+          ${pkgs.curl}/bin/curl --retry 3 --retry-delay 0 --fail \
+            -o /root/key.pub \
+            http://169.254.169.254/1.0/meta-data/public-keys/0/openssh-key
+          if [ $? -eq 0 -a -e /root/key.pub ]; then
+              if ! grep -q -f /root/key.pub /root/.ssh/authorized_keys; then
+                  cat /root/key.pub >> /root/.ssh/authorized_keys
+                  echo "new key added to authorized_keys"
+              fi
+              chmod 600 /root/.ssh/authorized_keys
+              rm -f /root/key.pub
+          fi
+        '';
+    };
+  */
 }
diff --git a/tests/amazon.nix b/tests/amazon.nix
index a016b8947d1..223bfb947d1 100644
--- a/tests/amazon.nix
+++ b/tests/amazon.nix
@@ -7,22 +7,6 @@ rec {
       services.httpd.enable = true;
       services.httpd.adminAddr = "e.dolstra@tudelft.nl";
       services.httpd.documentRoot = "${pkgs.valgrind}/share/doc/valgrind/html";
-
-      nixpkgs.config.packageOverrides = pkgsOld:
-        { dhcp = pkgs.lib.overrideDerivation pkgsOld.dhcp (oldAttrs:
-            { configureFlags = "--disable-dhcpv6";
-            });
-        };
-
-      fileSystems = [ ];
-
-      swapDevices =
-        [ { device = "/dev/sda2"; } ];
-
-      services.sshd.enable = true;
-      services.sshd.permitRootLogin = "without-password";
-
-      services.mingetty.ttys = [ ];
     };
 
   config = (import ../lib/eval-config.nix {
-- 
GitLab


From 12a0a6874966af8a2cadd97a00fd0e235d31136a Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 22 Jan 2010 17:31:23 +0000
Subject: [PATCH 2197/5331] * Initialise the Nix database in the VM. * Set the
 hostname at startup. * Mount the ephemeral data disk (/dev/sda2).

svn path=/nixos/trunk/; revision=19619
---
 modules/system/boot/stage-2-init.sh     |  4 +-
 modules/virtualisation/amazon-image.nix | 68 ++++++++++++++-----------
 2 files changed, 40 insertions(+), 32 deletions(-)

diff --git a/modules/system/boot/stage-2-init.sh b/modules/system/boot/stage-2-init.sh
index 0ce9f90a54e..79836b7d9a8 100644
--- a/modules/system/boot/stage-2-init.sh
+++ b/modules/system/boot/stage-2-init.sh
@@ -4,8 +4,8 @@
 
 
 # If no `systemConfig' parameter is specified on the kernel command
-# line, use `/system' as a fallback.
-systemConfig=/system
+# line, use a fallback.
+systemConfig=/nix/var/nix/profiles/system
 
 
 # Print a greeting.
diff --git a/modules/virtualisation/amazon-image.nix b/modules/virtualisation/amazon-image.nix
index f0f2545993b..baf23f605f1 100644
--- a/modules/virtualisation/amazon-image.nix
+++ b/modules/virtualisation/amazon-image.nix
@@ -18,7 +18,8 @@ with pkgs.lib;
         }
         ''
           # Create an empty filesysten and mount it.
-          ${pkgs.e2fsprogs}/sbin/mkfs.ext3 /dev/vda
+          ${pkgs.e2fsprogs}/sbin/mkfs.ext3 -L nixos /dev/vda
+          ${pkgs.e2fsprogs}/sbin/tune2fs -c 0 -i 0 /dev/vda
           mkdir /mnt
           mount /dev/vda /mnt
 
@@ -28,35 +29,47 @@ with pkgs.lib;
           mkdir -p /mnt/nix/store
           cp -prvd $storePaths /mnt/nix/store/
 
+          # Register the paths in the Nix database.
+          printRegistration=1 perl ${pkgs.pathsFromGraph} $ORIG_TMPDIR/closure | \
+              chroot /mnt ${config.environment.nix}/bin/nix-store --load-db
+
+          # Create the system profile to allow nixos-rebuild to work.
+          chroot /mnt ${config.environment.nix}/bin/nix-env \
+              -p /nix/var/nix/profiles/system --set ${config.system.build.toplevel}
+
+          # `nixos-rebuild' requires an /etc/NIXOS.
+          mkdir -p /mnt/etc
+          touch /mnt/etc/NIXOS
+                    
           # Amazon assumes that there is a /sbin/init, so symlink it
-          # to the stage 2 init script.  Since we cannot set the path
-          # to the system configuration via the systemConfig kernel
-          # parameter, use a /system symlink.
+          # to the stage 2 init script.
           mkdir -p /mnt/sbin
-          ln -s ${config.system.build.bootStage2} /mnt/sbin/init
-          ln -s ${config.system.build.toplevel} /mnt/system
+          ln -s /nix/var/nix/profiles/system/init /mnt/sbin/init
 
-          set -x
-          sync
           umount /mnt
-          sync
         ''
     );
 
   # On EC2 we don't get to supply our own kernel, so we can't load any
   # modules.  However, dhclient fails if the ipv6 module isn't loaded,
   # unless it's compiled without IPv6 support.  So do that.
-  nixpkgs.config.packageOverrides = pkgsOld:
-    { dhcp = pkgs.lib.overrideDerivation pkgsOld.dhcp (oldAttrs:
-        { configureFlags = "--disable-dhcpv6";
-        });
-    };
-
-  # The root filesystem is mounted by Amazon's kernel/initrd.
-  fileSystems = [ ];
+  nixpkgs.config.packageOverrides = pkgsOld:                                        
+    { dhcp = pkgs.lib.overrideDerivation pkgsOld.dhcp (oldAttrs:                    
+        { configureFlags = "--disable-dhcpv6";                                      
+        });                                                                         
+    };                                                                              
+
+  fileSystems =
+    [ { mountPoint = "/";
+        device = "/dev/disk/by-label/nixos";
+      }
+      { mountPoint = "/mnt";
+        device = "/dev/sda2";
+      }
+    ];
 
   swapDevices =
-    [ { device = "/dev/sda2"; } ];
+    [ { device = "/dev/sda3"; } ];
 
   # There are no virtual consoles.
   services.mingetty.ttys = [ ];
@@ -64,17 +77,11 @@ with pkgs.lib;
   # Allow root logins only using the SSH key that the user specified
   # at instance creation time.
   services.sshd.enable = true;
-  #services.sshd.permitRootLogin = "without-password";
-
-  boot.postBootCommands =
-    ''
-      echo xyzzy_foobar | ${pkgs.pwdutils}/bin/passwd --stdin
-    '';
+  services.sshd.permitRootLogin = "without-password";
 
-  # Obtain the SSH key at startup time.
-  /*
-  jobs.fetchSSHKey =
-    { name = "fetch-ssh-key";
+  # Obtain the SSH key and host name at startup time.
+  jobs.fetchEC2Data =
+    { name = "fetch-ec2-data";
 
       startOn = "ip-up";
 
@@ -82,7 +89,6 @@ with pkgs.lib;
 
       script =
         ''
-          set -x
           echo "obtaining SSH key..."
           mkdir -p /root/.ssh
           ${pkgs.curl}/bin/curl --retry 3 --retry-delay 0 --fail \
@@ -96,7 +102,9 @@ with pkgs.lib;
               chmod 600 /root/.ssh/authorized_keys
               rm -f /root/key.pub
           fi
+
+          echo "setting host name..."
+          ${pkgs.nettools}/bin/hostname $(${pkgs.curl}/bin/curl http://169.254.169.254/1.0/meta-data/hostname)
         '';
     };
-  */
 }
-- 
GitLab


From 9094ecb5463004a4d47637db704d7654b12a49c2 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 22 Jan 2010 20:22:40 +0000
Subject: [PATCH 2198/5331] * Some hacks to get the image to work with newer
 EC2 kernels/initrds.

svn path=/nixos/trunk/; revision=19622
---
 modules/virtualisation/amazon-image.nix | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/modules/virtualisation/amazon-image.nix b/modules/virtualisation/amazon-image.nix
index baf23f605f1..8e50827dfd1 100644
--- a/modules/virtualisation/amazon-image.nix
+++ b/modules/virtualisation/amazon-image.nix
@@ -23,6 +23,9 @@ with pkgs.lib;
           mkdir /mnt
           mount /dev/vda /mnt
 
+          # The initrd expects these directories to exist.
+          mkdir /mnt/dev /mnt/proc /mnt/sys
+
           # Copy all paths in the closure to the filesystem.
           storePaths=$(perl ${pkgs.pathsFromGraph} $ORIG_TMPDIR/closure)
 
@@ -41,10 +44,13 @@ with pkgs.lib;
           mkdir -p /mnt/etc
           touch /mnt/etc/NIXOS
                     
-          # Amazon assumes that there is a /sbin/init, so symlink it
-          # to the stage 2 init script.
+          # Amazon assumes that there is a /sbin/init, so create one.
+          # Note that simply creating /sbin/init as a symlink breaks
+          # some EC2 initrds (like Ubuntu's) because they do a "test
+          # -x $mountPoint/sbin/init".
           mkdir -p /mnt/sbin
-          ln -s /nix/var/nix/profiles/system/init /mnt/sbin/init
+          echo "#! /nix/var/nix/profiles/system/init" > /mnt/sbin/init
+          chmod +x /mnt/sbin/init
 
           umount /mnt
         ''
-- 
GitLab


From 50430f19e1facd8190bafdbc02b156726a7dfb49 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 22 Jan 2010 20:34:32 +0000
Subject: [PATCH 2199/5331] * Only run dhclient on interfaces of type 1,
 otherwise it fails to   start if the machine has weird network devices (e.g.
 "eql").

svn path=/nixos/trunk/; revision=19623
---
 modules/services/networking/dhclient.nix | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/modules/services/networking/dhclient.nix b/modules/services/networking/dhclient.nix
index a714562444e..db3a4b55783 100644
--- a/modules/services/networking/dhclient.nix
+++ b/modules/services/networking/dhclient.nix
@@ -7,7 +7,7 @@ let
   inherit (pkgs) nettools dhcp lib;
 
   # Don't start dhclient on explicitly configured interfaces.
-  ignoredInterfaces = ["lo" "wmaster0"] ++
+  ignoredInterfaces = 
     map (i: i.name) (lib.filter (i: i ? ipAddress) config.networking.interfaces);
 
   stateDir = "/var/lib/dhcp"; # Don't use /var/state/dhcp; not FHS-compliant.
@@ -77,9 +77,13 @@ in
             interfaces=
 
             for i in $(cd /sys/class/net && ls -d *); do
-                if ! for j in ${toString ignoredInterfaces}; do echo $j; done | grep -F -x -q "$i"; then
-                    echo "Running dhclient on $i"
-                    interfaces="$interfaces $i"
+                # Only run dhclient on interfaces of type ARPHRD_ETHER
+                # (1), i.e. Ethernet.
+                if [ "$(cat /sys/class/net/$i/type)" = 1 ]; then 
+                    if ! for j in ${toString ignoredInterfaces}; do echo $j; done | grep -F -x -q "$i"; then
+                        echo "Running dhclient on $i"
+                        interfaces="$interfaces $i"
+                    fi
                 fi
             done
 
-- 
GitLab


From cb728f833f4ab5c6aa2e608080b3841637685ede Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 22 Jan 2010 21:07:06 +0000
Subject: [PATCH 2200/5331] svn path=/nixos/trunk/; revision=19624

---
 modules/virtualisation/amazon-image.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/modules/virtualisation/amazon-image.nix b/modules/virtualisation/amazon-image.nix
index 8e50827dfd1..6c3e223dde0 100644
--- a/modules/virtualisation/amazon-image.nix
+++ b/modules/virtualisation/amazon-image.nix
@@ -69,8 +69,9 @@ with pkgs.lib;
     [ { mountPoint = "/";
         device = "/dev/disk/by-label/nixos";
       }
-      { mountPoint = "/mnt";
+      { mountPoint = "/data";
         device = "/dev/sda2";
+        autocreate = true;
       }
     ];
 
-- 
GitLab


From 06aeb7d87f0acfd2c5c38f7a17348e1c5485a73d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Sat, 23 Jan 2010 15:47:33 +0000
Subject: [PATCH 2201/5331] GNUnet: Add options; add as a system package;
 provide /etc/gnunetd.conf.

svn path=/nixos/trunk/; revision=19630
---
 modules/services/networking/gnunet.nix | 51 ++++++++++++++++++++++----
 1 file changed, 43 insertions(+), 8 deletions(-)

diff --git a/modules/services/networking/gnunet.nix b/modules/services/networking/gnunet.nix
index 53223f1df22..a717ff47f02 100644
--- a/modules/services/networking/gnunet.nix
+++ b/modules/services/networking/gnunet.nix
@@ -12,21 +12,27 @@ let
       GNUNETD_HOME = ${home}
 
       [GNUNETD]
-      HOSTLISTURL = ${lib.concatStringsSep " " hostLists}
-      APPLICATIONS = ${lib.concatStringsSep " " applications}
-      TRANSPORTS = ${lib.concatStringsSep " " transports}
+      HOSTLISTURL = ${concatStringsSep " " hostLists}
+      APPLICATIONS = ${concatStringsSep " " applications}
+      TRANSPORTS = ${concatStringsSep " " transports}
 
       [LOAD]
       MAXNETDOWNBPSTOTAL = ${toString load.maxNetDownBandwidth}
       MAXNETUPBPSTOTAL = ${toString load.maxNetUpBandwidth}
       HARDUPLIMIT = ${toString load.hardNetUpBandwidth}
       MAXCPULOAD = ${toString load.maxCPULoad}
-      INTERFACES = ${lib.concatStringsSep " " load.interfaces}
+      INTERFACES = ${concatStringsSep " " load.interfaces}
 
       [FS]
       QUOTA = ${toString fileSharing.quota}
       ACTIVEMIGRATION = ${if fileSharing.activeMigration then "YES" else "NO"}
 
+      [UDP]
+      PORT = ${toString udp.port}
+
+      [TCP]
+      PORT = ${toString tcp.port}
+
       [MODULES]
       sqstore = sqstore_sqlite
       dstore = dstore_sqlite
@@ -122,6 +128,24 @@ in
         };
       };
 
+      udp = {
+        port = mkOption {
+          default = 2086;  # assigned by IANA
+          description = ''
+            The UDP port for use by GNUnet.
+          '';
+        };
+      };
+
+      tcp = {
+        port = mkOption {
+          default = 2086;  # assigned by IANA
+          description = ''
+            The TCP port for use by GNUnet.
+          '';
+        };
+      };
+
       load = {
         maxNetDownBandwidth = mkOption {
           default = 50000;
@@ -191,6 +215,17 @@ in
         home = "/var/empty";
       };
 
+    # The user tools that talk to `gnunetd' should come from the same source,
+    # so install them globally.
+    environment.systemPackages = [ pkgs.gnunet ];
+
+    environment.etc = [
+      # Tools such as `gnunet-transport-check' expect /etc/gnunetd.conf.
+      { source = configFile;
+        target = "gnunetd.conf";
+      }
+    ];
+
     jobs.gnunetd =
       { description = "The GNUnet Daemon";
 
@@ -205,10 +240,10 @@ in
 
         exec =
           ''
-            ${pkgs.gnunet}/bin/gnunetd              \
-              ${if debug then "--debug" else "" }           \
-              --user="gnunetd"                              \
-              --config="${configFile}"                      \
+            ${pkgs.gnunet}/bin/gnunetd                  \
+              ${if cfg.debug then "--debug" else "" }   \
+              --user="gnunetd"                          \
+              --config="${configFile}"                  \
               --log="${cfg.logLevel}"
           '';
       };
-- 
GitLab


From aad3d21ceb1d052de873b60685296f0fba74b356 Mon Sep 17 00:00:00 2001
From: Marc Weber <marco-oweber@gmx.de>
Date: Sat, 23 Jan 2010 22:38:30 +0000
Subject: [PATCH 2202/5331] upstart: quote environment vars. John Altobelli hit
 the case TZ=New York

svn path=/nixos/trunk/; revision=19633
---
 modules/system/upstart/upstart.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/system/upstart/upstart.nix b/modules/system/upstart/upstart.nix
index f7c9eaaa6ef..c4897d1259d 100644
--- a/modules/system/upstart/upstart.nix
+++ b/modules/system/upstart/upstart.nix
@@ -40,7 +40,7 @@ let
           ${optionalString (job.stopOn != "") "stop on ${job.stopOn}"}
 
           env PATH=${makeSearchPath "bin" upstartPath}:${makeSearchPath "sbin" upstartPath}
-          ${concatMapStrings (n: "env ${n}=${getAttr n job.environment}\n") (attrNames job.environment)}
+          ${concatMapStrings (n: "env ${n}=\"${getAttr n job.environment}\"\n") (attrNames job.environment)}
           
           ${optionalString (job.preStart != "") ''
             pre-start script
-- 
GitLab


From 32995b3d36f8091147454c8b78e4fa308366c679 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 25 Jan 2010 10:40:08 +0000
Subject: [PATCH 2203/5331] * Make the AMI disk a bit bigger.  Thanks to sparse
 images and   compression this shouldn't be expensive.

svn path=/nixos/trunk/; revision=19647
---
 modules/virtualisation/amazon-image.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/virtualisation/amazon-image.nix b/modules/virtualisation/amazon-image.nix
index 6c3e223dde0..f314f522887 100644
--- a/modules/virtualisation/amazon-image.nix
+++ b/modules/virtualisation/amazon-image.nix
@@ -10,7 +10,7 @@ with pkgs.lib;
             ''
               mkdir $out
               diskImage=$out/nixos.img
-              qemu-img create -f raw $diskImage "1024M"
+              qemu-img create -f raw $diskImage "4G"
             '';
           buildInputs = [ pkgs.utillinux pkgs.perl ];
           exportReferencesGraph = 
-- 
GitLab


From 442093d27dfd1822b42066e069a7465dccae5118 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 26 Jan 2010 09:56:53 +0000
Subject: [PATCH 2204/5331] * grep returns a non-zero exit code if no line
 matches, causing the   swap task to fail.  So ignore that.

svn path=/nixos/trunk/; revision=19660
---
 modules/tasks/swap.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/tasks/swap.nix b/modules/tasks/swap.nix
index 333cf674c07..ab81185532e 100644
--- a/modules/tasks/swap.nix
+++ b/modules/tasks/swap.nix
@@ -94,7 +94,7 @@ in
               device=$(readlink -f "$device")
               # Add new swap devices.
               if echo $unused | grep -q "^$device\$"; then
-                unused="$(echo $unused | grep -v "^$device\$")"
+                unused="$(echo $unused | grep -v "^$device\$" || true)"
               else
                 ${utillinux}/sbin/swapon "$device" || true
               fi
-- 
GitLab


From 043276639931093ff45dad23d27180df65158ebd Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 26 Jan 2010 21:45:13 +0000
Subject: [PATCH 2205/5331] * Fall back to the kernel modules used at boot time
 if the modules in   the current configuration don't match the running kernel.
  This   ensures that modprobe still works after a "nixos-rebuild switch" to  
 a configuration that has a different kernel version.

svn path=/nixos/trunk/; revision=19696
---
 modules/system/activation/top-level.nix | 1 +
 modules/system/boot/modprobe.nix        | 8 ++++++++
 2 files changed, 9 insertions(+)

diff --git a/modules/system/activation/top-level.nix b/modules/system/activation/top-level.nix
index 2fdaa6fd945..0128ffb0c26 100644
--- a/modules/system/activation/top-level.nix
+++ b/modules/system/activation/top-level.nix
@@ -69,6 +69,7 @@ let
         false
       fi
       ln -s ${kernelPath} $out/kernel
+      ln -s ${config.system.modulesTree} $out/kernel-modules
       if [ -n "$grub" ]; then 
         ln -s $grub $out/grub
       fi
diff --git a/modules/system/boot/modprobe.nix b/modules/system/boot/modprobe.nix
index 4496106a231..65b3f6fd292 100644
--- a/modules/system/boot/modprobe.nix
+++ b/modules/system/boot/modprobe.nix
@@ -19,6 +19,14 @@ with pkgs.lib;
           ''
             #! ${pkgs.stdenv.shell}
             export MODULE_DIR=${config.system.modulesTree}/lib/modules
+            
+            # Fall back to the kernel modules used at boot time if the
+            # modules in the current configuration don't match the
+            # running kernel.
+            if [ ! -d "$MODULE_DIR/$(${pkgs.coreutils}/bin/uname -r)" ]; then
+                MODULE_DIR=/var/run/booted-system/kernel-modules/lib/modules
+            fi
+            
             exec ${pkgs.module_init_tools}/sbin/modprobe "$@"
           '';
       };
-- 
GitLab


From 31f2d8ffbc1ff0da7f1e5aabbc5f505da6db2055 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Tue, 26 Jan 2010 23:55:22 +0000
Subject: [PATCH 2206/5331] Add simple portmap test.

svn path=/nixos/trunk/; revision=19700
---
 tests/default.nix |  1 +
 tests/portmap.nix | 17 +++++++++++++++++
 2 files changed, 18 insertions(+)
 create mode 100644 tests/portmap.nix

diff --git a/tests/default.nix b/tests/default.nix
index 2efe151ab79..46b3218168f 100644
--- a/tests/default.nix
+++ b/tests/default.nix
@@ -31,6 +31,7 @@ in
   firefox = apply (import ./firefox.nix);
   installer = pkgs.lib.mapAttrs (name: complete) (call (import ./installer.nix));
   kde4 = apply (import ./kde4.nix);
+  portmap = apply (import ./portmap.nix);
   proxy = apply (import ./proxy.nix);
   quake3 = apply (import ./quake3.nix);
   subversion = apply (import ./subversion.nix);
diff --git a/tests/portmap.nix b/tests/portmap.nix
new file mode 100644
index 00000000000..4ee4eb02890
--- /dev/null
+++ b/tests/portmap.nix
@@ -0,0 +1,17 @@
+{ pkgs, ... }:
+
+{
+
+  machine =
+    { config, pkgs, ... }:
+
+    { services.portmap.enable = true; };
+
+  testScript =
+    ''
+       # The `portmap' service must be registered once for TCP and once for
+       # UDP.
+       $machine->mustSucceed("test `rpcinfo -p | grep portmapper | wc -l` -eq 2");
+    '';
+
+}
-- 
GitLab


From fc583b70548b5098afd6b71dc78376427fd0a797 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 27 Jan 2010 10:36:43 +0000
Subject: [PATCH 2207/5331] * When QEMU encounters a "disk full" condition on
 the host filesystem,   its default behaviour is to stop the emulator (i.e.
 suspend the VM).   For automated tests, this is bad, because is makes the VM
 appear to   hang without any error message.  The "werror=report" flag causes 
  QEMU to report the problem to the VM.  As a side effect QEMU exits   very
 elegantly:

    [    2.308668] end_request: I/O error, dev vda, sector 534400
    [    2.309611] Buffer I/O error on device vda, logical block 66800
    ...
    *** glibc detected *** /nix/store/yhngqrww53j0aw7z7v4bv948x5g5fc3d-qemu-kvm-0.12.1.2/bin/qemu-system-x86_64: double free or corruption (!prev): 0x08e3e040 ***
    Aborted

  So I guess we now depend on a bug in QEMU :-)

svn path=/nixos/trunk/; revision=19703
---
 lib/test-driver/Machine.pm         | 2 +-
 modules/virtualisation/qemu-vm.nix | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/test-driver/Machine.pm b/lib/test-driver/Machine.pm
index 069d60261a1..43463eb7134 100644
--- a/lib/test-driver/Machine.pm
+++ b/lib/test-driver/Machine.pm
@@ -25,7 +25,7 @@ sub new {
         $startCommand =
             "qemu-system-x86_64 -m 384 -no-kvm-irqchip " .
             "-net nic,model=virtio -net user \$QEMU_OPTS ";
-        $startCommand .= "-drive file=" . Cwd::abs_path($args->{hda}) . ",if=virtio,boot=on "
+        $startCommand .= "-drive file=" . Cwd::abs_path($args->{hda}) . ",if=virtio,boot=on,werror=report "
             if defined $args->{hda};
         $startCommand .= "-cdrom $args->{cdrom} "
             if defined $args->{cdrom};
diff --git a/modules/virtualisation/qemu-vm.nix b/modules/virtualisation/qemu-vm.nix
index 09764c09b90..a17e167cb46 100644
--- a/modules/virtualisation/qemu-vm.nix
+++ b/modules/virtualisation/qemu-vm.nix
@@ -86,7 +86,7 @@ let
       exec ${pkgs.qemu_kvm}/bin/qemu-system-x86_64 -m ${toString config.virtualisation.memorySize} \
           -no-kvm-irqchip \
           -net nic,model=virtio -net user -smb / \
-          -drive file=$NIX_DISK_IMAGE,if=virtio,boot=on \
+          -drive file=$NIX_DISK_IMAGE,if=virtio,boot=on,werror=report \
           -kernel ${config.system.build.toplevel}/kernel \
           -initrd ${config.system.build.toplevel}/initrd \
           ${qemuGraphics} \
-- 
GitLab


From 160b28baa03d2d7a60e12aa3783ae89e7a538ea3 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 27 Jan 2010 12:46:53 +0000
Subject: [PATCH 2208/5331] * Increase the timeout.

svn path=/nixos/trunk/; revision=19708
---
 lib/test-driver/Machine.pm | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/lib/test-driver/Machine.pm b/lib/test-driver/Machine.pm
index 43463eb7134..9d638dfe0bd 100644
--- a/lib/test-driver/Machine.pm
+++ b/lib/test-driver/Machine.pm
@@ -29,7 +29,6 @@ sub new {
             if defined $args->{hda};
         $startCommand .= "-cdrom $args->{cdrom} "
             if defined $args->{cdrom};
-        #-drive file=$NIX_DISK_IMAGE,if=virtio,boot=on
     }
 
     my $name = $args->{name};
@@ -129,7 +128,7 @@ sub start {
 sub retry {
     my ($coderef) = @_;
     my $n;
-    for ($n = 0; $n < 300; $n++) {
+    for ($n = 0; $n < 900; $n++) {
         return if &$coderef;
         sleep 1;
     }
-- 
GitLab


From 86b42fdfbfe77e6ce7ea30e43585c8cec0b14a50 Mon Sep 17 00:00:00 2001
From: Marco Maggesi <maggesi@math.unifi.it>
Date: Mon, 1 Feb 2010 16:29:15 +0000
Subject: [PATCH 2209/5331] Fix bugs and improve
 modules/services/network-filesystems/openafs-client

svn path=/nixos/trunk/; revision=19751
---
 .../network-filesystems/openafs-client/default.nix     | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/modules/services/network-filesystems/openafs-client/default.nix b/modules/services/network-filesystems/openafs-client/default.nix
index 52aaa7d633b..4a888b64bd3 100644
--- a/modules/services/network-filesystems/openafs-client/default.nix
+++ b/modules/services/network-filesystems/openafs-client/default.nix
@@ -16,6 +16,8 @@ let
     cp ${cellServDB} $out/CellServDB
     echo "/afs:${cfg.cacheDirectory}:${cfg.cacheSize}" > $out/cacheinfo
   '';
+
+  openafsPkgs = config.boot.kernelPackages.openafsClient;
 in
 {
   ###### interface
@@ -52,7 +54,7 @@ in
 
   config = mkIf cfg.enable {
 
-    environment.systemPackages = [pkgs.openafsClient];
+    environment.systemPackages = [ openafsPkgs ];
 
     environment.etc = [
       { source = afsConfig;
@@ -71,13 +73,13 @@ in
 	preStart = ''
 	  mkdir -m 0755 /afs || true
 	  mkdir -m 0755 -p ${cfg.cacheDirectory} || true
-          ${pkgs.module_init_tools}/sbin/insmod ${pkgs.openafsClient}/lib/openafs/libafs-*.ko || true
-          ${pkgs.openafsClient}/sbin/afsd -confdir ${afsConfig} -cachedir ${cfg.cacheDirectory} -dynroot -fakestat
+          ${pkgs.module_init_tools}/sbin/insmod ${openafsPkgs}/lib/openafs/libafs-*.ko || true
+          ${openafsPkgs}/sbin/afsd -confdir ${afsConfig} -cachedir ${cfg.cacheDirectory} -dynroot -fakestat
 	'';
 
 	postStop = ''
 	  umount /afs
-          ${pkgs.openafsClient}/sbin/afsd -shutdown
+          ${openafsPkgs}/sbin/afsd -shutdown
 	  rmmod libafs
 	'';
 
-- 
GitLab


From 051e9342b3df478d85f0d2ca36a905c763ca3a4d Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 1 Feb 2010 17:05:02 +0000
Subject: [PATCH 2210/5331] * Use the moduli file.  This shuts up the "WARNING:
 /etc/ssh/moduli   does not exist, using fixed modulus" message in
 /var/log/messages.

svn path=/nixos/trunk/; revision=19754
---
 modules/services/networking/ssh/sshd.nix | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/modules/services/networking/ssh/sshd.nix b/modules/services/networking/ssh/sshd.nix
index f99e871c448..61f169df97d 100644
--- a/modules/services/networking/ssh/sshd.nix
+++ b/modules/services/networking/ssh/sshd.nix
@@ -1,8 +1,9 @@
-{pkgs, config, ...}:
+{ config, pkgs, ... }:
+
+with pkgs.lib;
 
 let
 
-  inherit (pkgs.lib) mkOption mkIf;
   inherit (pkgs) openssh;
 
   cfg = config.services.sshd;
@@ -15,7 +16,7 @@ let
 
       UsePAM yes
 
-      ${ pkgs.lib.concatMapStrings (port : ''Port ${toString port}
+      ${ concatMapStrings (port : ''Port ${toString port}
                                            '') cfg.ports}
 
       ${if cfg.forwardX11 then "
@@ -112,13 +113,18 @@ in
 
   config = mkIf config.services.sshd.enable {
 
-    users.extraUsers = pkgs.lib.singleton
+    users.extraUsers = singleton
       { name = "sshd";
         uid = config.ids.uids.sshd;
         description = "SSH privilege separation user";
         home = "/var/empty";
       };
 
+    environment.etc = singleton
+      { source = "${openssh}/etc/ssh/moduli";
+        target = "ssh/moduli";
+      };
+
     jobs.sshd = {
 
         description = "OpenSSH server";
@@ -141,7 +147,7 @@ in
         exec = "${openssh}/sbin/sshd -h /etc/ssh/ssh_host_dsa_key -f ${sshdConfig}";
       };
 
-    networking.firewall.allowedTCPPorts = cfg.ports ;
+    networking.firewall.allowedTCPPorts = cfg.ports;
           
   };
 
-- 
GitLab


From 6a06118f85670ba403556b01db969330868f1431 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 3 Feb 2010 22:49:50 +0000
Subject: [PATCH 2211/5331] * Use the build flags given on the command line
 while building Nix.

svn path=/nixos/trunk/; revision=19799
---
 modules/installer/tools/nixos-rebuild.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/installer/tools/nixos-rebuild.sh b/modules/installer/tools/nixos-rebuild.sh
index d799ee6037d..c5dce0a1807 100644
--- a/modules/installer/tools/nixos-rebuild.sh
+++ b/modules/installer/tools/nixos-rebuild.sh
@@ -142,8 +142,8 @@ fi
 # more conservative.
 if test -n "$buildNix"; then
     echo "building Nix..." >&2
-    if ! nix-build $NIXOS -A nixFallback -o $tmpDir/nix > /dev/null; then
-        nix-build $NIXPKGS -A nixUnstable -o $tmpDir/nix > /dev/null
+    if ! nix-build $NIXOS -A nixFallback -o $tmpDir/nix $extraBuildFlags > /dev/null; then
+        nix-build $NIXPKGS -A nixUnstable -o $tmpDir/nix $extraBuildFlags > /dev/null
     fi
     PATH=$tmpDir/nix/bin:$PATH
 fi
-- 
GitLab


From 0f56bd755a85bacc7f85b0b6e55dc02f98feb524 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 4 Feb 2010 09:15:46 +0000
Subject: [PATCH 2212/5331] * Disable bash completion for now.  It gives login
 errors:

    bash: BASH_COMPLETION_DIR: readonly variable
    bash: BASH_COMPLETION: readonly variable

  And in the non-interactive shell, we get:

    /nix/store/654xcqk8h2a409mxsnsbnj5c0cp9mjhm-bash-4.1-p2/etc/bash_completion: line 75: shopt: progcomp: invalid shell option name

svn path=/nixos/trunk/; revision=19809
---
 modules/programs/bash/bashrc.sh | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/modules/programs/bash/bashrc.sh b/modules/programs/bash/bashrc.sh
index b09e3230a5d..eeecc743c68 100644
--- a/modules/programs/bash/bashrc.sh
+++ b/modules/programs/bash/bashrc.sh
@@ -62,12 +62,10 @@ alias l="ls -alh"
 alias which="type -p"
 
 # Completion.
-if [ -d "@bash@/etc/bash_completion.d" ]
-then
-    export BASH_COMPLETION_DIR="@bash@/etc/bash_completion.d"
-fi
-if [ -f "@bash@/etc/bash_completion" ]
-then
-    export BASH_COMPLETION="@bash@/etc/bash_completion"
-    source "$BASH_COMPLETION"
-fi
+#if [ -d "@bash@/etc/bash_completion.d" ]; then
+#    export BASH_COMPLETION_DIR="@bash@/etc/bash_completion.d"
+#fi
+#if [ -f "@bash@/etc/bash_completion" ]; then
+#    export BASH_COMPLETION="@bash@/etc/bash_completion"
+#    source "$BASH_COMPLETION"
+#fi
-- 
GitLab


From 5b60c280d7a5eb861d28889fb4f4fa55021e61c5 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 4 Feb 2010 13:59:31 +0000
Subject: [PATCH 2213/5331] * Make the Quake 3 test less timing-sensitive.

svn path=/nixos/trunk/; revision=19816
---
 lib/test-driver/Machine.pm | 9 +++++++++
 tests/quake3.nix           | 6 +++---
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/lib/test-driver/Machine.pm b/lib/test-driver/Machine.pm
index 9d638dfe0bd..063346b57b9 100644
--- a/lib/test-driver/Machine.pm
+++ b/lib/test-driver/Machine.pm
@@ -216,6 +216,15 @@ sub mustSucceed {
 }
 
 
+sub waitUntilSucceeds {
+    my ($self, $command) = @_;
+    retry sub {
+        my ($status, $out) = $self->execute($command);
+        return 1 if $status == 0;
+    };
+}
+
+
 sub mustFail {
     my ($self, $command) = @_;
     my ($status, $out) = $self->execute($command);
diff --git a/tests/quake3.nix b/tests/quake3.nix
index e3a190dda7a..a31a14ea18e 100644
--- a/tests/quake3.nix
+++ b/tests/quake3.nix
@@ -39,10 +39,10 @@ rec {
       $client1->execute("quake3 '+set r_fullscreen 0' '+set name Foo' '+connect server' &");
       $client2->execute("quake3 '+set r_fullscreen 0' '+set name Bar' '+connect server' &");
  
-      sleep 40;
+      $server->waitUntilSucceeds("grep -q 'Foo.*entered the game' /tmp/log");
+      $server->waitUntilSucceeds("grep -q 'Bar.*entered the game' /tmp/log");
 
-      $server->mustSucceed("grep -q 'Foo.*entered the game' /tmp/log");
-      $server->mustSucceed("grep -q 'Bar.*entered the game' /tmp/log");
+      sleep 30; # wait for a while to get a nice screenshot
 
       $client1->screenshot("screen1");
       $client2->screenshot("screen2");
-- 
GitLab


From fc805fe541c5844064a33f24c3dd709452ff1af0 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 5 Feb 2010 16:51:37 +0000
Subject: [PATCH 2214/5331] * In the test driver, connect to the QEMU monitor
 so that we can send   it special commands such as "screendump", "sendkey" and
 so on. * Take screenshots using the "screendump" command.  This has the  
 advantage over "scrot" that it also supports taking a picture of the  
 console, and is not affected by weird X visuals.

svn path=/nixos/trunk/; revision=19837
---
 lib/test-driver/Machine.pm | 69 +++++++++++++++++++++++++++++++-------
 lib/testing.nix            |  4 +--
 2 files changed, 58 insertions(+), 15 deletions(-)

diff --git a/lib/test-driver/Machine.pm b/lib/test-driver/Machine.pm
index 063346b57b9..6840f4e2af0 100644
--- a/lib/test-driver/Machine.pm
+++ b/lib/test-driver/Machine.pm
@@ -48,6 +48,7 @@ sub new {
         connectedQueue => Thread::Queue->new(),
         socket => undef,
         stateDir => "$tmpDir/$name",
+        monitor => undef,
     };
 
     mkdir $self->{stateDir}, 0700;
@@ -82,33 +83,50 @@ sub start {
 
     $self->log("starting vm");
 
-    my ($read, $write) = FileHandle::pipe;
+    # Create a socket pair for the serial line input/output of the VM.
+    my ($serialP, $serialC);
+    socketpair($serialP, $serialC, PF_UNIX, SOCK_STREAM, 0) or die;
 
+    # Create a Unix domain socket to which QEMU's monitor will connect.
+    my $monitorPath = $self->{stateDir} . "/monitor";
+    unlink $monitorPath;
+    my $monitorS;
+    socket($monitorS, PF_UNIX, SOCK_STREAM, 0) or die;
+    bind($monitorS, sockaddr_un($monitorPath)) or die "cannot bind monitor socket: $!";
+    listen($monitorS, 1) or die;
+
+    # Start the VM.
     my $pid = fork();
     die if $pid == -1;
 
     if ($pid == 0) {
-        close $read;
-        dup2(fileno($write), fileno(STDOUT));
-        dup2(fileno($write), fileno(STDERR));
+        close $serialP;
+        close $monitorS;
         open NUL, "</dev/null" or die;
         dup2(fileno(NUL), fileno(STDIN));
+        dup2(fileno($serialC), fileno(STDOUT));
+        dup2(fileno($serialC), fileno(STDERR));
         $ENV{TMPDIR} = $self->{stateDir};
-        $ENV{QEMU_OPTS} = "-nographic -no-reboot -redir tcp:65535::514 -net nic,vlan=1 -net socket,vlan=1,mcast=$mcastAddr";
+        $ENV{QEMU_OPTS} = "-nographic -no-reboot -redir tcp:65535::514 -net nic,vlan=1 -net socket,vlan=1,mcast=$mcastAddr -monitor unix:./monitor";
         $ENV{QEMU_KERNEL_PARAMS} = "hostTmpDir=$ENV{TMPDIR}";
         chdir $self->{stateDir} or die;
         exec $self->{startCommand};
         die;
     }
 
-    close $write;
+    # Wait until QEMU connects to the monitor.
+    accept($self->{monitor}, $monitorS) or die;
+    $self->waitForMonitorPrompt;
+
+    # Process serial line output.
+    close $serialC;
 
-    threads->create(\&processQemuOutput, $self, $read)->detach;
+    threads->create(\&processSerialOutput, $self, $serialP)->detach;
 
-    sub processQemuOutput {
-        my ($self, $read) = @_;
+    sub processSerialOutput {
+        my ($self, $serialP) = @_;
         $/ = "\r\n";
-        while (<$read>) {
+        while (<$serialP>) {
             chomp;
             print STDERR $self->name, "# $_\n";
             $self->{connectedQueue}->enqueue(1) if $_ eq "===UP===";
@@ -123,6 +141,29 @@ sub start {
 }
 
 
+# Send a command to the monitor and wait for it to finish.  TODO: QEMU
+# also has a JSON-based monitor interface now, but it doesn't support
+# all commands yet.  We should use it once it does.
+sub sendMonitorCommand {
+    my ($self, $command) = @_;
+    syswrite $self->{monitor}, "$command\n";
+    return $self->waitForMonitorPrompt;
+}
+
+
+# Wait until the monitor sends "(qemu) ".
+sub waitForMonitorPrompt {
+    my ($self) = @_;
+    my $res = "";
+    my $s;
+    while (sysread($self->{monitor}, $s, 1024)) {
+        $res .= $s;
+        last if $res =~ s/\(qemu\) $//;
+    }
+    return $res;
+}
+
+
 # Call the given code reference repeatedly, with 1 second intervals,
 # until it returns 1 or a timeout is reached.
 sub retry {
@@ -310,8 +351,12 @@ sub unblock {
 # Take a screenshot of the X server on :0.0.
 sub screenshot {
     my ($self, $filename) = @_;
-    my $scrot = $ENV{'scrot'} or die;
-    $self->mustSucceed("$scrot /hostfs/$ENV{out}/${filename}.png");
+    $filename = "$ENV{'out'}/${filename}.png" if $filename =~ /^\w+$/;
+    my $tmp = "${filename}.ppm";
+    $self->sendMonitorCommand("screendump $tmp");
+    system("convert $tmp ${filename}") == 0
+        or die "cannot convert screenshot";
+    unlink $tmp;
 }
 
 
diff --git a/lib/testing.nix b/lib/testing.nix
index bcd23d4278d..834fa04ec0b 100644
--- a/lib/testing.nix
+++ b/lib/testing.nix
@@ -15,9 +15,7 @@ rec {
       name = "vm-test-run";
       inherit tests;
       
-      scrot = "${pkgs.scrot}/bin/scrot";
-
-      buildInputs = [ pkgs.qemu_kvm ];
+      buildInputs = [ pkgs.qemu_kvm pkgs.imagemagick ];
       
       buildCommand =
         ''
-- 
GitLab


From 55c349fe201a6dd09364afc846517c87eb9cf767 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sat, 6 Feb 2010 13:08:15 +0000
Subject: [PATCH 2215/5331] * Added a test that checks whether users can log in
 on a virtual   console.  This uses the `sendkey' command in the QEMU monitor.
 * For the block/unblock primitives, use the `set_link' command in the   QEMU
 monitor.

svn path=/nixos/trunk/; revision=19854
---
 lib/build-vms.nix              |  2 +-
 lib/test-driver/Machine.pm     | 43 ++++++++++++++++++++++++++++++----
 lib/test-driver/test-driver.pl |  2 ++
 release.nix                    |  1 +
 tests/default.nix              |  1 +
 tests/login.nix                | 37 +++++++++++++++++++++++++++++
 6 files changed, 80 insertions(+), 6 deletions(-)
 create mode 100644 tests/login.nix

diff --git a/lib/build-vms.nix b/lib/build-vms.nix
index 11eed8e2339..88806683d3e 100644
--- a/lib/build-vms.nix
+++ b/lib/build-vms.nix
@@ -40,7 +40,7 @@ rec {
           for i in $out/vms/*; do
             port2=\$((port++))
             echo "forwarding localhost:\$port2 to \$(basename \$i):80"
-            QEMU_OPTS="-redir tcp:\$port2::80 -net nic,vlan=1 -net socket,vlan=1,mcast=232.0.1.1:1234" \$i/bin/run-*-vm &
+            QEMU_OPTS="-redir tcp:\$port2::80 -net nic,vlan=1,model=virtio -net socket,vlan=1,mcast=232.0.1.1:1234" \$i/bin/run-*-vm &
           done
           EOF
           chmod +x $out/bin/run-vms
diff --git a/lib/test-driver/Machine.pm b/lib/test-driver/Machine.pm
index 6840f4e2af0..634f566bd1a 100644
--- a/lib/test-driver/Machine.pm
+++ b/lib/test-driver/Machine.pm
@@ -107,7 +107,7 @@ sub start {
         dup2(fileno($serialC), fileno(STDOUT));
         dup2(fileno($serialC), fileno(STDERR));
         $ENV{TMPDIR} = $self->{stateDir};
-        $ENV{QEMU_OPTS} = "-nographic -no-reboot -redir tcp:65535::514 -net nic,vlan=1 -net socket,vlan=1,mcast=$mcastAddr -monitor unix:./monitor";
+        $ENV{QEMU_OPTS} = "-nographic -no-reboot -redir tcp:65535::514 -net nic,vlan=1,model=virtio -net socket,vlan=1,mcast=$mcastAddr -monitor unix:./monitor";
         $ENV{QEMU_KERNEL_PARAMS} = "hostTmpDir=$ENV{TMPDIR}";
         chdir $self->{stateDir} or die;
         exec $self->{startCommand};
@@ -146,6 +146,7 @@ sub start {
 # all commands yet.  We should use it once it does.
 sub sendMonitorCommand {
     my ($self, $command) = @_;
+    $self->log("sending monitor command: $command");
     syswrite $self->{monitor}, "$command\n";
     return $self->waitForMonitorPrompt;
 }
@@ -215,6 +216,13 @@ sub waitForShutdown {
     waitpid $self->{pid}, 0;
     $self->{pid} = 0;
     $self->{booted} = 0;
+    $self->{connected} = 0;
+}
+
+
+sub isUp {
+    my ($self) = @_;
+    return $self->{booted} && $self->{connected};
 }
 
 
@@ -266,6 +274,15 @@ sub waitUntilSucceeds {
 }
 
 
+sub waitUntilFails {
+    my ($self, $command) = @_;
+    retry sub {
+        my ($status, $out) = $self->execute($command);
+        return 1 if $status != 0;
+    };
+}
+
+
 sub mustFail {
     my ($self, $command) = @_;
     my ($status, $out) = $self->execute($command);
@@ -337,14 +354,14 @@ sub shutdown {
 # the test driver can continue to talk to the machine.
 sub block {
     my ($self) = @_;
-    $self->mustSucceed("ifconfig eth1 down");
+    $self->sendMonitorCommand("set_link virtio-net-pci.1 down");
 }
 
 
 # Make the machine reachable.
 sub unblock {
     my ($self) = @_;
-    $self->mustSucceed("ifconfig eth1 up");
+    $self->sendMonitorCommand("set_link virtio-net-pci.1 up");
 }
 
 
@@ -368,7 +385,7 @@ sub waitForX {
         my ($status, $out) = $self->execute("xwininfo -root > /dev/null 2>&1");
         return 1 if $status == 0;
     }
-};
+}
 
 
 sub getWindowNames {
@@ -387,7 +404,7 @@ sub waitForWindow {
             return 1 if $n =~ /$regexp/;
         }
     }
-};
+}
 
 
 sub copyFileFromHost {
@@ -397,4 +414,20 @@ sub copyFileFromHost {
 }
 
 
+sub sendKeys {
+    my ($self, @keys) = @_;
+    foreach my $key (@keys) {
+        $key = "spc" if $key eq " ";
+        $key = "ret" if $key eq "\n";
+        $self->sendMonitorCommand("sendkey $key");
+    }
+}
+
+
+sub sendChars {
+    my ($self, $chars) = @_;
+    $self->sendKeys(split //, $chars);
+}
+
+
 1;
diff --git a/lib/test-driver/test-driver.pl b/lib/test-driver/test-driver.pl
index 2ccc6bd4b9a..98666d6c775 100644
--- a/lib/test-driver/test-driver.pl
+++ b/lib/test-driver/test-driver.pl
@@ -37,6 +37,8 @@ sub runTests {
     foreach my $vm (values %vms) {
         my $gcovDir = "/sys/kernel/debug/gcov";
 
+        next unless $vm->isUp();
+
         my ($status, $out) = $vm->execute("test -e $gcovDir");
         next if $status != 0;
 
diff --git a/release.nix b/release.nix
index 957e65b681d..d803414de48 100644
--- a/release.nix
+++ b/release.nix
@@ -128,6 +128,7 @@ let
         installer.separateBoot = t.installer.separateBoot.test;
         installer.simple = t.installer.simple.test;
         kde4 = t.kde4.test;
+        login = t.login.test;
         proxy = t.proxy.test;
         quake3 = t.quake3.test;
         subversion = t.subversion.report;
diff --git a/tests/default.nix b/tests/default.nix
index 46b3218168f..a9661d33957 100644
--- a/tests/default.nix
+++ b/tests/default.nix
@@ -31,6 +31,7 @@ in
   firefox = apply (import ./firefox.nix);
   installer = pkgs.lib.mapAttrs (name: complete) (call (import ./installer.nix));
   kde4 = apply (import ./kde4.nix);
+  login = apply (import ./login.nix);
   portmap = apply (import ./portmap.nix);
   proxy = apply (import ./proxy.nix);
   quake3 = apply (import ./quake3.nix);
diff --git a/tests/login.nix b/tests/login.nix
new file mode 100644
index 00000000000..ef00d191dce
--- /dev/null
+++ b/tests/login.nix
@@ -0,0 +1,37 @@
+{ pkgs, ... }:
+
+{
+
+  machine = { config, pkgs, ... }: { };
+
+  testScript =
+    ''
+      $machine->mustSucceed("useradd -m alice");
+      $machine->mustSucceed("echo foobar | passwd --stdin alice");
+
+      # Log in as alice on a virtual console.      
+      $machine->waitForJob("tty1");
+      $machine->sendChars("alice\n");
+      $machine->waitUntilSucceeds("pgrep login");
+      $machine->execute("sleep 2"); # urgh: wait for `Password:'
+      $machine->sendChars("foobar\n");
+      $machine->waitUntilSucceeds("pgrep -u alice bash");
+      $machine->sendChars("touch done\n");
+      $machine->waitForFile("/home/alice/done");
+      $machine->sendChars("exit\n");
+      $machine->waitUntilFails("pgrep -u alice bash");
+      $machine->screenshot("mingetty");
+      
+      # Check whether switching VTs works.
+      $machine->sendKeys("alt-f10");
+      $machine->waitUntilSucceeds("[ \$(fgconsole) = 10 ]");
+      $machine->execute("sleep 2"); # allow fbcondecor to catch up (not important)
+      $machine->screenshot("syslog");
+
+      # Check whether ctrl-alt-delete works.
+      $machine->sendKeys("alt-f1");
+      $machine->sendKeys("ctrl-alt-delete");
+      $machine->waitForShutdown;
+    '';
+  
+}
-- 
GitLab


From c04d68b898e2b8fe16aef6d28afd7f60950d2414 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 10 Feb 2010 11:43:10 +0000
Subject: [PATCH 2216/5331] * Having makeIso in jobs causes a Hydra evaluation
 error.

svn path=/nixos/trunk/; revision=19897
---
 release.nix | 2 --
 1 file changed, 2 deletions(-)

diff --git a/release.nix b/release.nix
index d803414de48..de9fb2a5fe2 100644
--- a/release.nix
+++ b/release.nix
@@ -43,8 +43,6 @@ let
 
   jobs = rec {
 
-    inherit makeIso; # used by tests/test-nixos-install-from-cd/
-
 
     tarball =
       { nixosSrc ? {outPath = ./.; rev = 1234;}
-- 
GitLab


From 07cc5ac2fdf81c40ca14b25f2dce7678b3e32626 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 10 Feb 2010 12:39:47 +0000
Subject: [PATCH 2217/5331] * "python2.5" -> ${pkgs.python.libPrefix}

svn path=/nixos/trunk/; revision=19901
---
 .../web-servers/apache-httpd/subversion.nix   |  4 +-
 .../web-servers/apache-httpd/trac.nix         | 60 +++++++++++--------
 release.nix                                   |  4 --
 tests/trac.nix                                |  2 +-
 4 files changed, 37 insertions(+), 33 deletions(-)

diff --git a/modules/services/web-servers/apache-httpd/subversion.nix b/modules/services/web-servers/apache-httpd/subversion.nix
index d9febdf44c0..e10156432dc 100644
--- a/modules/services/web-servers/apache-httpd/subversion.nix
+++ b/modules/services/web-servers/apache-httpd/subversion.nix
@@ -137,7 +137,7 @@ let
     <Location ${urlPrefix}/viewvc>
         AddHandler python-program .py
         # Note: we write \" instead of ' to work around a lexer bug in Nix 0.11.
-        PythonPath "[\"${viewvc}/viewvc/bin/mod_python\", \"${subversion}/lib/python2.5/site-packages\"] + sys.path"
+        PythonPath "[\"${viewvc}/viewvc/bin/mod_python\", \"${subversion}/lib/${pkgs.python.libPrefix}/site-packages\"] + sys.path"
         PythonHandler handler
         ${viewerConfig "viewvc"}
     </Location>
@@ -333,7 +333,7 @@ in {
   # mod_python's own Python modules must be in the initial Python
   # path, they cannot be set through the PythonPath directive.
   globalEnvVars = [
-    { name = "PYTHONPATH"; value = "${pkgs.mod_python}/lib/python2.5/site-packages"; }
+    { name = "PYTHONPATH"; value = "${pkgs.mod_python}/lib/${pkgs.python.libPrefix}/site-packages"; }
   ];
 
   
diff --git a/modules/services/web-servers/apache-httpd/trac.nix b/modules/services/web-servers/apache-httpd/trac.nix
index d5588e1162c..61cb2fbca04 100644
--- a/modules/services/web-servers/apache-httpd/trac.nix
+++ b/modules/services/web-servers/apache-httpd/trac.nix
@@ -1,7 +1,8 @@
 { config, pkgs, serverInfo, ... }:
 
+with pkgs.lib;
+
 let
-  inherit (pkgs.lib) mkOption;
   
   # Build a Subversion instance with Apache modules and Swig/Python bindings.
   subversion = pkgs.subversion.override (origArgs: {
@@ -11,9 +12,15 @@ let
     compressionSupport = true;
     pythonBindings = true;
   });
+
+  pythonLib = p: "${p}/";
+  
 in
+
 {
+
   options = {
+  
     projectsLocation = mkOption {
       description = "URL path in which Trac projects can be accessed";
       default = "/projects";
@@ -22,30 +29,29 @@ in
     projects = mkOption {
       description = "List of projects that should be provided by Trac. If they are not defined yet empty projects are created.";
       default = [];
-      example = [ { identifier = "myproject";
-                    name = "My Project";
-                    databaseURL="postgres://root:password@/tracdb";
-                    subversionRepository="/data/subversion/myproject"; } ];
+      example =
+        [ { identifier = "myproject";
+            name = "My Project";
+            databaseURL="postgres://root:password@/tracdb";
+            subversionRepository="/data/subversion/myproject";
+          }
+        ];
     };
     
     user = mkOption {
       default = "wwwrun";
-      description = "
-        User account under which Trac runs.
-      ";
+      description = "User account under which Trac runs.";
     };
 
     group = mkOption {
       default = "wwwrun";
-      description = "
-        Group under which Trac runs.
-      ";
+      description = "Group under which Trac runs.";
     };
+    
   };
 
-  extraModules = [
-    { name = "python"; path = "${pkgs.mod_python}/modules/mod_python.so"; }
-  ];
+  extraModules = singleton
+    { name = "python"; path = "${pkgs.mod_python}/modules/mod_python.so"; };
   
   extraConfig = ''
     <Location ${config.projectsLocation}>
@@ -57,29 +63,31 @@ in
     </Location>
   '';
   
-  globalEnvVars = [
+  globalEnvVars = singleton
     { name = "PYTHONPATH";
-      value = 
-        "${pkgs.mod_python}/lib/python2.5/site-packages:" +
-	"${pkgs.pythonPackages.trac}/lib/python2.5/site-packages:" +
-	"${pkgs.setuptools}/lib/python2.5/site-packages:" +
-	"${pkgs.pythonPackages.genshi}/lib/python2.5/site-packages:" +
-	"${pkgs.pythonPackages.psycopg2}/lib/python2.5/site-packages:" +
-	"${subversion}/lib/python2.5/site-packages";
-    }
-  ];
+      value =
+        makeSearchPath "lib/${pkgs.python.libPrefix}/site-packages"
+          [ pkgs.mod_python
+            pkgs.pythonPackages.trac
+            pkgs.setuptools
+            pkgs.pythonPackages.genshi
+            pkgs.pythonPackages.psycopg2
+            subversion
+          ];
+    };
   
   startupScript = pkgs.writeScript "activateTrac" ''
     mkdir -p /var/trac
     chown ${config.user}:${config.group} /var/trac
     
-    ${pkgs.lib.concatMapStrings (project:
+    ${concatMapStrings (project:
       ''
         if [ ! -d /var/trac/${project.identifier} ]
 	then
-	    export PYTHONPATH=${pkgs.pythonPackages.psycopg2}/lib/python2.5/site-packages
+	    export PYTHONPATH=${pkgs.pythonPackages.psycopg2}/lib/${pkgs.python.libPrefix}/site-packages
 	    ${pkgs.pythonPackages.trac}/bin/trac-admin /var/trac/${project.identifier} initenv "${project.name}" "${project.databaseURL}" svn "${project.subversionRepository}"
 	fi
       '' ) (config.projects)}
   '';
+  
 }
diff --git a/release.nix b/release.nix
index de9fb2a5fe2..91aa722e2a9 100644
--- a/release.nix
+++ b/release.nix
@@ -109,10 +109,6 @@ let
     minimal_install_archive = {system ? "i686-linux"}: (iso_minimal {inherit system;})
       .config.system.build.minimalInstallArchive;
 
-    # the archive installer can't be tested without chroot which requires being root
-    # options: run in kvm or uml ?
-    # TODO
-
     tests = 
       { services ? ../services }:
       let
diff --git a/tests/trac.nix b/tests/trac.nix
index 4a2fc665bf7..59f19310dee 100644
--- a/tests/trac.nix
+++ b/tests/trac.nix
@@ -64,7 +64,7 @@
       
       $webserver->waitForFile("/var/trac");      
       $webserver->mustSucceed("mkdir -p /var/trac/projects/test");
-      $webserver->mustSucceed("PYTHONPATH=${pkgs.pythonPackages.psycopg2}/lib/python2.5/site-packages trac-admin /var/trac/projects/test initenv Test postgres://root\@postgresql/trac svn /repos/trac");
+      $webserver->mustSucceed("PYTHONPATH=${pkgs.pythonPackages.psycopg2}/lib/${pkgs.python.libPrefix}/site-packages trac-admin /var/trac/projects/test initenv Test postgres://root\@postgresql/trac svn /repos/trac");
       
       $client->waitForX;
       $client->execute("konqueror http://webserver/projects/test &");
-- 
GitLab


From b7b1f5d1ccdda107a4502c9b9453aee95e36b755 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Wed, 10 Feb 2010 13:22:38 +0000
Subject: [PATCH 2218/5331] X11: Add a few more basic X clients to
 `systemPackages'.

svn path=/nixos/trunk/; revision=19902
---
 modules/services/x11/xserver.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/modules/services/x11/xserver.nix b/modules/services/x11/xserver.nix
index 4ceb5579533..e40800074e7 100644
--- a/modules/services/x11/xserver.nix
+++ b/modules/services/x11/xserver.nix
@@ -372,8 +372,11 @@ in
         xorg.xrdb
         xorg.setxkbmap
         xorg.iceauth # required for KDE applications (it's called by dcopserver)
+        xorg.xlsclients
+        xorg.xset
         xorg.xsetroot
         xorg.xprop
+        pkgs.xterm
       ]
       ++ optional (elem "nvidia" driverNames) kernelPackages.nvidia_x11
       ++ optional (elem "nvidiaLegacy" driverNames) kernelPackages.nvidia_x11_legacy
-- 
GitLab


From dbc03fbf6835b9e19879df18f9d43e04cbd4f74a Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 10 Feb 2010 14:31:46 +0000
Subject: [PATCH 2219/5331] * nixos-install: copy /etc/nsswitch.conf to the
 chroot.  This seems   necessary to have it use /etc/hosts.

svn path=/nixos/trunk/; revision=19905
---
 modules/installer/tools/nixos-install.sh | 7 +++++--
 tests/installer.nix                      | 9 ++++-----
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/modules/installer/tools/nixos-install.sh b/modules/installer/tools/nixos-install.sh
index a9500f7e680..5b7746b6162 100644
--- a/modules/installer/tools/nixos-install.sh
+++ b/modules/installer/tools/nixos-install.sh
@@ -51,8 +51,11 @@ NIXOS=$(readlink -f "$NIXOS")
 # Enable networking in the chroot.
 mkdir -m 0755 -p $mountPoint/etc
 touch /etc/resolv.conf 
-cp /etc/resolv.conf $mountPoint/etc/
-cp /etc/hosts $mountPoint/etc/
+cp -f /etc/resolv.conf $mountPoint/etc/
+rm -f $mountPoint/etc/hosts
+cat /etc/hosts > $mountPoint/etc/hosts
+rm -f $mountPoint/etc/nsswitch.conf
+cat /etc/nsswitch.conf > $mountPoint/etc/nsswitch.conf
 
 # Mount some stuff in the target root directory.
 mkdir -m 0755 -p $mountPoint/dev $mountPoint/proc $mountPoint/sys $mountPoint/mnt
diff --git a/tests/installer.nix b/tests/installer.nix
index bd2e79b9fe3..657846ae074 100644
--- a/tests/installer.nix
+++ b/tests/installer.nix
@@ -133,7 +133,8 @@ let
       ${optionalString testChannel ''
         # Allow the machine to talk to the fake nixos.org.
         $machine->mustSucceed(
-            "echo 192.168.1.1 nixos.org >> /etc/hosts",
+            "rm /etc/hosts",
+            "echo 192.168.1.1 nixos.org > /etc/hosts",
             "ifconfig eth1 up 192.168.1.2",
             "nix-pull http://nixos.org/releases/nixpkgs/channels/nixpkgs-unstable/MANIFEST",
         );
@@ -174,13 +175,11 @@ let
       # Did /boot get mounted, if appropriate?
       # !!! There is currently no good way to wait for the
       # `filesystems' tash to finish.
-      #$machine->mustSucceed("initctl start filesystems");
-      #$machine->mustSucceed("test -e /boot/grub/grub.cfg");
+      $machine->waitForFile("/boot/grub/grub.cfg");
 
       # Did the swap device get activated?
       # !!! Idem.
-      # $machine->waitForJob("swap");
-      #$machine->mustSucceed("cat /proc/swaps | grep -q /dev");
+      $machine->waitUntilSucceeds("cat /proc/swaps | grep -q /dev");
       
       $machine->mustSucceed("nix-env -i coreutils >&2");
       $machine->mustSucceed("type -tP ls") =~ /profiles/
-- 
GitLab


From c373ac846d1fa331d28c517902362871559e0dec Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 11 Feb 2010 16:14:47 +0000
Subject: [PATCH 2220/5331] * Update test-upstart-job.sh for Upstart 0.6.

svn path=/nixos/trunk/; revision=19939
---
 tests/test-upstart-job.sh | 21 ++++++---------------
 1 file changed, 6 insertions(+), 15 deletions(-)

diff --git a/tests/test-upstart-job.sh b/tests/test-upstart-job.sh
index 86be01bf602..d0fba23d625 100755
--- a/tests/test-upstart-job.sh
+++ b/tests/test-upstart-job.sh
@@ -1,29 +1,20 @@
 #! /bin/sh -e
 
-tmpDir=/tmp/event.d
-
-mkdir -p /tmp/event.d
-
-if test "$(readlink -f /etc/event.d)" != /tmp/event.d; then 
-    cp -prd "$(readlink -f /etc/event.d)"/* /tmp/event.d/
-fi
-
 for i in $*; do
     echo "building job $i..."
-    nix-build /etc/nixos/nixos -A "tests.upstartJobs.$i" -o $tmpDir/.result
-    ln -sfn $(readlink -f $tmpDir/.result)/etc/event.d/* /tmp/event.d/
+    nix-build /etc/nixos/nixos -A "config.jobs.$i" -o $tmpDir/.result
+    # !!! Here we assume that the attribute name equals the Upstart
+    # job name.
+    ln -sfn $(readlink -f $tmpDir/.result) /etc/init/"$i".conf
 done
 
-ln -sfn /tmp/event.d /etc/event.d
-
 echo "restarting init..."
-kill -TERM 1 
+initctl reload-configuration
 
 sleep 1
 
 for i in $*; do
     echo "restarting job $i..."
-    initctl stop "$i"
-    sleep 1
+    initctl stop "$i" || true
     initctl start "$i"
 done    
-- 
GitLab


From 5cb934da598d819a6cc2746a8953aaa303ed46df Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Sat, 13 Feb 2010 00:07:12 +0000
Subject: [PATCH 2221/5331] Fix Bash completion support.

svn path=/nixos/trunk/; revision=19971
---
 modules/programs/bash/bashrc.sh | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/modules/programs/bash/bashrc.sh b/modules/programs/bash/bashrc.sh
index eeecc743c68..6fd7b10f255 100644
--- a/modules/programs/bash/bashrc.sh
+++ b/modules/programs/bash/bashrc.sh
@@ -61,11 +61,15 @@ alias ll="ls -l"
 alias l="ls -alh"
 alias which="type -p"
 
-# Completion.
-#if [ -d "@bash@/etc/bash_completion.d" ]; then
-#    export BASH_COMPLETION_DIR="@bash@/etc/bash_completion.d"
-#fi
-#if [ -f "@bash@/etc/bash_completion" ]; then
-#    export BASH_COMPLETION="@bash@/etc/bash_completion"
-#    source "$BASH_COMPLETION"
-#fi
+# The "non-interactive" Bash build does not support programmable
+# completion so check whether it's available.
+if shopt -q progcomp 2> /dev/null; then
+    # Completion.
+    if [ -z "$BASH_COMPLETION_DIR" -a -d "@bash@/etc/bash_completion.d" ]; then
+	BASH_COMPLETION_DIR="@bash@/etc/bash_completion.d"
+    fi
+    if [ -z "$BASH_COMPLETION" -a -f "@bash@/etc/bash_completion" ]; then
+	BASH_COMPLETION="@bash@/etc/bash_completion"
+	source "$BASH_COMPLETION"
+    fi
+fi
-- 
GitLab


From 4253490fd44c664a24a507f2fc8dea80eab9561d Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 15 Feb 2010 15:55:54 +0000
Subject: [PATCH 2222/5331] svn path=/nixos/trunk/; revision=20016

---
 modules/system/upstart/upstart.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/system/upstart/upstart.nix b/modules/system/upstart/upstart.nix
index c4897d1259d..3fd9e2a5a22 100644
--- a/modules/system/upstart/upstart.nix
+++ b/modules/system/upstart/upstart.nix
@@ -4,7 +4,7 @@ with pkgs.lib;
 
 let
 
-  upstart = pkgs.upstart06;
+  upstart = pkgs.upstart;
 
 
   # Path for Upstart jobs.  Should be quite minimal.
-- 
GitLab


From 014ffaac5d48f64073994b8644f659ee98c3023f Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 15 Feb 2010 17:13:43 +0000
Subject: [PATCH 2223/5331] * Update the Zabbix agent module.

svn path=/nixos/trunk/; revision=20019
---
 modules/services/monitoring/zabbix-agent.nix | 29 +++++++++++---------
 1 file changed, 16 insertions(+), 13 deletions(-)

diff --git a/modules/services/monitoring/zabbix-agent.nix b/modules/services/monitoring/zabbix-agent.nix
index 3691405e1e2..65bb2c3d417 100644
--- a/modules/services/monitoring/zabbix-agent.nix
+++ b/modules/services/monitoring/zabbix-agent.nix
@@ -21,7 +21,7 @@ let
   
       PidFile = ${pidFile}
 
-      StartAgents = 5
+      StartAgents = 1
     '';
 
 in
@@ -65,7 +65,7 @@ in
       };
 
     jobs.zabbix_agent =
-      { #name = "zabbix-agent"; !!! mkIf bug
+      { name = "zabbix-agent";
 
         description = "Zabbix agent daemon";
 
@@ -76,24 +76,27 @@ in
           ''
             mkdir -m 0755 -p ${stateDir} ${logDir}
             chown zabbix ${stateDir} ${logDir}
-        
+
+            # Grrr, zabbix_agentd cannot be properly monitored by
+            # Upstart.  Upstart's "expect fork/daemon" feature doesn't
+            # work because zabbix_agentd runs some programs on
+            # startup, and zabbix_agentd doesn't have a flag to
+            # prevent daemonizing.
             export PATH=${pkgs.nettools}/bin:$PATH
-            ${pkgs.zabbixAgent}/sbin/zabbix_agentd --config ${configFile}
+            ${pkgs.zabbix.agent}/sbin/zabbix_agentd --config ${configFile}
           '';
 
         postStop =
-          ''      
-            # !!! this seems to leave processes behind.
-            #pid=$(cat ${pidFile})
-            #if test -n "$pid"; then
-            #  kill $pid 
-            #fi
-
-            # So instead kill the agent in a brutal fashion.
-            while ${pkgs.procps}/bin/pkill -u zabbix zabbix_agentd; do true; done
+          ''
+            pid=$(cat ${pidFile})
+            test -n "$pid" && kill "$pid"
+            # Wait until they're really gone.
+            while ${pkgs.procps}/bin/pgrep -u zabbix zabbix_agentd > /dev/null; do sleep 1; done
           '';
       };
 
+    environment.systemPackages = [ pkgs.zabbix.agent ];
+
   };
 
 }
-- 
GitLab


From 83b76bc2cfd8d0d3d2205f08a73f36ab17d9ad3e Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 15 Feb 2010 19:02:42 +0000
Subject: [PATCH 2224/5331] * Option `services.apache.phpIni' (which is of type
 derivation)   replaced by `services.apache.phpOptions' (of type string). *
 Allow Apache subservices to add to phpOptions. * Set the TZ environment
 variable in Apache. * Updated the Zabbix web interface.

svn path=/nixos/trunk/; revision=20023
---
 modules/services/monitoring/zabbix-server.nix | 15 ++--
 .../web-servers/apache-httpd/default.nix      | 84 ++++++++-----------
 .../web-servers/apache-httpd/zabbix.nix       | 26 +++---
 3 files changed, 58 insertions(+), 67 deletions(-)

diff --git a/modules/services/monitoring/zabbix-server.nix b/modules/services/monitoring/zabbix-server.nix
index d38e955ed4f..fa38cc0a048 100644
--- a/modules/services/monitoring/zabbix-server.nix
+++ b/modules/services/monitoring/zabbix-server.nix
@@ -45,6 +45,8 @@ in
 
   config = mkIf config.services.zabbixServer.enable {
 
+    services.postgresql.enable = true;
+
     users.extraUsers = singleton
       { name = "zabbix";
         uid = config.ids.uids.zabbix;
@@ -52,7 +54,7 @@ in
       };
 
     jobs.zabbix_server =
-      { #name = "zabbix-server"; !!! mkIf bug
+      { name = "zabbix-server";
 
         description = "Zabbix server daemon";
 
@@ -67,18 +69,21 @@ in
             if ! test -e "${libDir}/db-created"; then
                 ${pkgs.postgresql}/bin/createuser --no-superuser --no-createdb --no-createrole zabbix || true
                 ${pkgs.postgresql}/bin/createdb --owner zabbix zabbix || true
-                cat ${pkgs.zabbixServer}/share/zabbix/db/schema/postgresql.sql | ${pkgs.su}/bin/su -s "$SHELL" zabbix -c 'psql zabbix'
-                cat ${pkgs.zabbixServer}/share/zabbix/db/data/data.sql | ${pkgs.su}/bin/su -s "$SHELL" zabbix -c 'psql zabbix'
-                cat ${pkgs.zabbixServer}/share/zabbix/db/data/images_pgsql.sql | ${pkgs.su}/bin/su -s "$SHELL" zabbix -c 'psql zabbix'
+                cat ${pkgs.zabbix.server}/share/zabbix/db/schema/postgresql.sql | ${pkgs.su}/bin/su -s "$SHELL" zabbix -c '${pkgs.postgresql}/bin/psql zabbix'
+                cat ${pkgs.zabbix.server}/share/zabbix/db/data/data.sql | ${pkgs.su}/bin/su -s "$SHELL" zabbix -c '${pkgs.postgresql}/bin/psql zabbix'
+                cat ${pkgs.zabbix.server}/share/zabbix/db/data/images_pgsql.sql | ${pkgs.su}/bin/su -s "$SHELL" zabbix -c '${pkgs.postgresql}/bin/psql zabbix'
                 touch "${libDir}/db-created"
             fi
 
             export PATH=${pkgs.nettools}/bin:$PATH
-            ${pkgs.zabbixServer}/sbin/zabbix_server --config ${configFile}
+            ${pkgs.zabbix.server}/sbin/zabbix_server --config ${configFile}
           '';
 
         postStop =
           ''
+            pid=$(cat ${pidFile})
+            test -n "$pid" && kill "$pid"
+            # Wait until they're really gone.
             while ${pkgs.procps}/bin/pkill -u zabbix zabbix_server; do true; done
           '';
       };
diff --git a/modules/services/web-servers/apache-httpd/default.nix b/modules/services/web-servers/apache-httpd/default.nix
index 878e1c1f371..3659b75f22d 100644
--- a/modules/services/web-servers/apache-httpd/default.nix
+++ b/modules/services/web-servers/apache-httpd/default.nix
@@ -68,6 +68,7 @@ let
           globalEnvVars = [];
           robotsEntries = "";
           startupScript = "";
+          phpOptions = "";
           options = {};
         };
         res = defaults // svcFunction {inherit config pkgs serverInfo servicesPath;};
@@ -358,7 +359,18 @@ let
     }
   '';
 
-    
+
+  # Generate the PHP configuration file.  Should probably be factored
+  # out into a separate module.
+  phpIni = pkgs.runCommand "php.ini"
+    { options = concatStringsSep "\n"
+        ([ mainCfg.phpOptions ] ++ (map (svc: svc.phpOptions) allSubservices));
+    }
+    ''
+      cat ${pkgs.php}/etc/php-recommended.ini > $out
+      echo "$options" >> $out
+    '';
+
 in
 
 
@@ -464,54 +476,14 @@ in
         '';
       };
 
-      phpIni = mkOption {
-        default = pkgs.writeText "php.ini" ''
-           ; Needed for PHP's mail() function.
-           sendmail_path = sendmail -t -i
-         '';
-
-        example = ''
-        Example code (copy & paste):
-
-         most simple:
-         phpIni pkgs.writeText "php.ini" '''
-           ; Needed for PHP's mail() function.
-           sendmail_path = sendmail -t -i
-         ''';
-
-         using recommended settings and enabling Xdebug:
-         phpIni =  pkgs.phpIniBuilder.override {
-            appendLines = '''
-             sendmail_path = sendmail -t -i
-             zend_extension="''\${pkgs.phpXdebug}/lib/xdebug.so"
-             zend_extension_ts="''\${pkgs.phpXdebug}/lib/xdebug.so"
-             zend_extension_debug="''\${pkgs.phpXdebug}/lib/xdebug.so"
-             xdebug.remote_enable=true
-             xdebug.remote_host=127.0.0.1
-             xdebug.remote_port=9000
-             xdebug.remote_handler=dbgp
-             xdebug.profiler_enable=0
-             xdebug.profiler_output_dir="/tmp/xdebug"
-             xdebug.remote_mode=req
-            ''';
-          };
-        '';
-
-
-        description = ''
-          The contents of this option are used as global php.ini file by the
-          PHP interpreter used by Apache. You have to enable PHP explicitly.
-          See extraModules options.
-
-          This file defaults to defining sendmail_path only.
-
-          Note: Depending on your configuration you can set PHP ini values using .htaccess files and the
-          php_value option.
-
-          The example shows how to enable Xdebug and use the recommended
-          php.ini values which are contained in the PHP distribution.
-          I don't know whether they are equal to defaults
-        '';
+      phpOptions = mkOption {
+        default = "";
+        example =
+          ''
+            date.timezone = "CET"
+          '';
+        description =
+          "Options appended to the PHP configuration file <filename>php.ini</filename>.";
       };
 
     }
@@ -540,6 +512,15 @@ in
 
     environment.systemPackages = [httpd] ++ concatMap (svc: svc.extraPath) allSubservices;
 
+    services.httpd.phpOptions =
+      ''
+        ; Needed for PHP's mail() function.
+        sendmail_path = sendmail -t -i
+
+        ; Apparently PHP doesn't use $TZ.
+        date.timezone = "${config.time.timeZone}"
+      '';
+
     jobs.httpd =
       { # Statically verify the syntactic correctness of the generated
         # httpd.conf.  !!! this is impure!  It doesn't just check for
@@ -570,7 +551,9 @@ in
                 optional config.networking.defaultMailServer.directDelivery "${pkgs.ssmtp}/sbin"
              ++ (concatMap (svc: svc.extraServerPath) allSubservices) );
 
-           PHPRC = mainCfg.phpIni;
+           PHPRC = phpIni;
+
+           TZ = config.time.timeZone;
 
           } // (listToAttrs (concatMap (svc: svc.globalEnvVars) allSubservices));
 
@@ -606,4 +589,3 @@ in
   };
   
 }
-
diff --git a/modules/services/web-servers/apache-httpd/zabbix.nix b/modules/services/web-servers/apache-httpd/zabbix.nix
index 2d9a80f69ed..608c3e48fd0 100644
--- a/modules/services/web-servers/apache-httpd/zabbix.nix
+++ b/modules/services/web-servers/apache-httpd/zabbix.nix
@@ -9,23 +9,27 @@ let
   # Note that different instances of the frontend will therefore end
   # up with their own copies of the PHP sources.  !!! Alternatively,
   # we could generate zabbix.conf.php declaratively.
-  zabbixPHP = pkgs.runCommand "${pkgs.zabbixServer.name}-php" {} ''
-    cp -rs ${pkgs.zabbixServer}/share/zabbix/php $out
-    chmod -R u+w $out
-    #rm -rf $out/conf
-    ln -s ${config.stateDir}/zabbix.conf.php $out/conf/zabbix.conf.php
-  '';
+  zabbixPHP = pkgs.runCommand "${pkgs.zabbix.server.name}-php" {}
+    ''
+      cp -rs ${pkgs.zabbix.server}/share/zabbix/php $out
+      chmod -R u+w $out
+      #rm -rf $out/conf
+      ln -s ${config.stateDir}/zabbix.conf.php $out/conf/zabbix.conf.php
+    '';
 
 in
 
 {
 
-  extraModules = [
-    { name = "php5"; path = "${pkgs.php}/modules/libphp5.so"; }
-  ];
+  extraModules =
+    [ { name = "php5"; path = "${pkgs.php}/modules/libphp5.so"; } ];
 
-  # !!! should also declare PHP options that Zabbix needs like the
-  # timezone and timeout.
+  phpOptions =
+    ''
+      post_max_size = 32M
+      max_execution_time = 300
+      mbstring.func_overload = 2
+    '';
   
   extraConfig = ''
     Alias ${config.urlPrefix}/ ${zabbixPHP}/
-- 
GitLab


From cc90f62ceb6ca1e3a701ef03dded324ac4f785d2 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 15 Feb 2010 19:29:54 +0000
Subject: [PATCH 2225/5331] * Use `psql' with an empty command to check whether
 PostgreSQL is up   and running.  `pg_ctl status' merely checks whether
 PostgreSQL is   running, not whether it is already accepting connections. 
 This   causes Upstart jobs that depend on PostgreSQL to fail.

svn path=/nixos/trunk/; revision=20024
---
 modules/services/databases/postgresql.nix | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/modules/services/databases/postgresql.nix b/modules/services/databases/postgresql.nix
index df41fdad513..c943b662459 100644
--- a/modules/services/databases/postgresql.nix
+++ b/modules/services/databases/postgresql.nix
@@ -150,8 +150,10 @@ in
             # database is running.
             ${run} -c '${postgresql}/bin/pg_ctl start -o "${toString flags}"'
 
-            # So wait until the server is running.
-            while ! ${run} -c '${postgresql}/bin/pg_ctl status'; do
+            # So wait until the server is up.  `pg_ctl status' doesn't
+            # work (apparently, it just checks whether the server is
+            # running), so try to connect with psql.
+            while ! ${postgresql}/bin/psql postgres -c ""; do
                 sleep 1
             done
           ''; # */
-- 
GitLab


From eed3f9a118f585cba33fb0a5abbcdf9f78325b77 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 15 Feb 2010 19:30:35 +0000
Subject: [PATCH 2226/5331] * Remove a sleep that hopefully is no longer
 needed.

svn path=/nixos/trunk/; revision=20025
---
 tests/trac.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/tests/trac.nix b/tests/trac.nix
index 59f19310dee..4092bf037a6 100644
--- a/tests/trac.nix
+++ b/tests/trac.nix
@@ -56,7 +56,6 @@
       startAll;
       
       $postgresql->waitForJob("postgresql");
-      sleep 10; # !!! should not be needed
       $postgresql->mustSucceed("createdb trac");
       
       $webserver->mustSucceed("mkdir -p /repos/trac");
-- 
GitLab


From 97f30fb17bbfdbc0352dba68b4c14f8f863daf9f Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 15 Feb 2010 20:34:01 +0000
Subject: [PATCH 2227/5331] * The Zabbix agent should start after the hostname
 is set.

svn path=/nixos/trunk/; revision=20029
---
 modules/services/monitoring/zabbix-agent.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/services/monitoring/zabbix-agent.nix b/modules/services/monitoring/zabbix-agent.nix
index 65bb2c3d417..3de08ba37ed 100644
--- a/modules/services/monitoring/zabbix-agent.nix
+++ b/modules/services/monitoring/zabbix-agent.nix
@@ -69,7 +69,7 @@ in
 
         description = "Zabbix agent daemon";
 
-        startOn = "started network-interfaces";
+        startOn = "ip-up";
         stopOn = "stopping network-interfaces";
 
         preStart =
-- 
GitLab


From 1dd3162d7cae31814dcc468d78c1f59e5351da0d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Mon, 15 Feb 2010 23:27:51 +0000
Subject: [PATCH 2228/5331] First attempt at trying to get a tarball of a
 bootable nixos system. What I want with this derivation is to allow the
 sheevaplug nixos to build a tarball with all the needed files to boot. Then,
 this can be unpacked into an SD card, or into a NFS/TFTP server, and then the
 user can boot the system with help of the uboot console. By now, I have only
 tried to build the tarball in a PC, in order to develop the nix expressions
 quicker.

There is nothing written specialy for the Sheevaplug in all this,
by now.


svn path=/nixos/trunk/; revision=20035
---
 lib/make-system-tarball.nix                   |  38 ++++
 lib/make-system-tarball.sh                    |  56 ++++++
 .../installer/cd-dvd/system-tarball-pc.nix    | 178 ++++++++++++++++++
 modules/installer/cd-dvd/system-tarball.nix   | 126 +++++++++++++
 release.nix                                   |  37 ++++
 5 files changed, 435 insertions(+)
 create mode 100644 lib/make-system-tarball.nix
 create mode 100644 lib/make-system-tarball.sh
 create mode 100644 modules/installer/cd-dvd/system-tarball-pc.nix
 create mode 100644 modules/installer/cd-dvd/system-tarball.nix

diff --git a/lib/make-system-tarball.nix b/lib/make-system-tarball.nix
new file mode 100644
index 00000000000..0fa34a186ad
--- /dev/null
+++ b/lib/make-system-tarball.nix
@@ -0,0 +1,38 @@
+{ stdenv, perl, xz, pathsFromGraph
+
+, # The file name of the resulting tarball
+  fileName ? "nixos-built.tar.bz2"
+
+, # The files and directories to be placed in the tarball.
+  # This is a list of attribute sets {source, target} where `source'
+  # is the file system object (regular file or directory) to be
+  # grafted in the file system at path `target'.
+  contents
+
+, # In addition to `contents', the closure of the store paths listed
+  # in `packages' are also placed in the Nix store of the tarball.  This is
+  # a list of attribute sets {object, symlink} where `object' if a
+  # store path whose closure will be copied, and `symlink' is a
+  # symlink to `object' that will be added to the tarball.
+  storeContents ? []
+}:
+
+stdenv.mkDerivation {
+  name = "tarball";
+  builder = ./make-system-tarball.sh;
+  buildInputs = [perl xz];
+  
+  inherit fileName pathsFromGraph;
+
+  # !!! should use XML.
+  sources = map (x: x.source) contents;
+  targets = map (x: x.target) contents;
+
+  # !!! should use XML.
+  objects = map (x: x.object) storeContents;
+  symlinks = map (x: x.symlink) storeContents;
+  
+  # For obtaining the closure of `storeContents'.
+  exportReferencesGraph =
+    map (x: [("closure-" + baseNameOf x.object) x.object]) storeContents;
+}
diff --git a/lib/make-system-tarball.sh b/lib/make-system-tarball.sh
new file mode 100644
index 00000000000..5465c3497aa
--- /dev/null
+++ b/lib/make-system-tarball.sh
@@ -0,0 +1,56 @@
+source $stdenv/setup
+set -x
+
+sources_=($sources)
+targets_=($targets)
+
+echo $objects
+objects=($objects)
+symlinks=($symlinks)
+
+
+# Remove the initial slash from a path, since genisofs likes it that way.
+stripSlash() {
+    res="$1"
+    if test "${res:0:1}" = /; then res=${res:1}; fi
+}
+
+touch pathlist
+
+# Add the individual files.
+for ((i = 0; i < ${#targets_[@]}; i++)); do
+    stripSlash "${targets_[$i]}"
+    mkdir -p "$(dirname "$res")"
+    cp -a "${sources_[$i]}" "$res"
+done
+
+
+# Add the closures of the top-level store objects.
+mkdir -p nix/store
+storePaths=$(perl $pathsFromGraph closure-*)
+for i in $storePaths; do
+    cp -a "$i" "${i:1}"
+done
+
+
+# TODO tar ruxo 
+# Also include a manifest of the closures in a format suitable for
+# nix-store --load-db.
+printRegistration=1 perl $pathsFromGraph closure-* > nix-path-registration
+
+# Add symlinks to the top-level store objects.
+for ((n = 0; n < ${#objects[*]}; n++)); do
+    object=${objects[$n]}
+    symlink=${symlinks[$n]}
+    if test "$symlink" != "none"; then
+        mkdir -p $(dirname ./$symlink)
+        ln -s $object ./$symlink
+    fi
+done
+
+ensureDir $out/tarball
+
+tar cvJf $out/tarball/$fileName.tar.xz *
+
+ensureDir $out/nix-support
+echo $system > $out/nix-support/system
diff --git a/modules/installer/cd-dvd/system-tarball-pc.nix b/modules/installer/cd-dvd/system-tarball-pc.nix
new file mode 100644
index 00000000000..7774876447b
--- /dev/null
+++ b/modules/installer/cd-dvd/system-tarball-pc.nix
@@ -0,0 +1,178 @@
+# This module contains the basic configuration for building a NixOS
+# installation CD.
+
+{ config, pkgs, ... }:
+
+with pkgs.lib;
+
+let
+
+  # A dummy /etc/nixos/configuration.nix in the booted CD that
+  # rebuilds the CD's configuration (and allows the configuration to
+  # be modified, of course, providing a true live CD).  Problem is
+  # that we don't really know how the CD was built - the Nix
+  # expression language doesn't allow us to query the expression being
+  # evaluated.  So we'll just hope for the best.
+  dummyConfiguration = pkgs.writeText "configuration.nix"
+    ''
+      {config, pkgs, ...}:
+
+      {
+        require = [ ];
+
+        # Add your own options below and run "nixos-rebuild switch".
+        # E.g.,
+        #   services.sshd.enable = true;
+      }
+    '';
+  
+
+  pkgs2storeContents = l : map (x: { object = x; symlink = "none"; }) l;
+
+  options = {
+
+    system.nixosVersion = mkOption {
+      default = "${builtins.readFile ../../../VERSION}";
+      description = ''
+        NixOS version number.
+      '';
+    };
+  };
+  
+in
+
+{
+  require =
+    [ options
+      ./system-tarball.nix
+      ../../hardware/network/rt73.nix
+    ];
+
+
+  # Disable some other stuff we don't need.
+  security.sudo.enable = false;
+
+  # Include only the en_US locale.  This saves 75 MiB or so compared to
+  # the full glibcLocales package.
+  i18n.supportedLocales = ["en_US.UTF-8/UTF-8" "en_US/ISO-8859-1"];
+
+  # Include some utilities that are useful for installing or repairing
+  # the system.
+  environment.systemPackages =
+    [ pkgs.subversion # for nixos-checkout
+      pkgs.w3m # needed for the manual anyway
+      pkgs.testdisk # useful for repairing boot problems
+      pkgs.mssys # for writing Microsoft boot sectors / MBRs
+      pkgs.parted
+      pkgs.ddrescue
+      pkgs.ccrypt
+      pkgs.cryptsetup # needed for dm-crypt volumes
+
+      # Some networking tools.
+      pkgs.sshfsFuse
+      pkgs.socat
+      pkgs.screen
+      pkgs.wpa_supplicant # !!! should use the wpa module
+
+      # Hardware-related tools.
+      pkgs.sdparm
+      pkgs.hdparm
+      pkgs.dmraid
+
+      # Tools to create / manipulate filesystems.
+      pkgs.ntfsprogs # for resizing NTFS partitions
+      pkgs.btrfsProgs
+      pkgs.xfsprogs
+      pkgs.jfsutils
+      pkgs.jfsrec
+
+      # Some compression/archiver tools.
+      pkgs.unrar
+      pkgs.unzip
+      pkgs.zip
+      pkgs.xz
+      pkgs.dar # disk archiver
+      
+      # Some editors.
+      pkgs.nvi
+      pkgs.bvi # binary editor
+      pkgs.joe
+    ];
+
+  # The initrd has to contain any module that might be necessary for
+  # mounting the CD/DVD.
+  boot.initrd.availableKernelModules =
+    [ # SATA/PATA support.
+      "ahci"
+
+      "ata_piix"
+
+      "sata_inic162x" "sata_nv" "sata_promise" "sata_qstor"
+      "sata_sil" "sata_sil24" "sata_sis" "sata_svw" "sata_sx4"
+      "sata_uli" "sata_via" "sata_vsc"
+
+      "pata_ali" "pata_amd" "pata_artop" "pata_atiixp"
+      "pata_cs5520" "pata_cs5530" "pata_cs5535" "pata_efar"
+      "pata_hpt366" "pata_hpt37x" "pata_hpt3x2n" "pata_hpt3x3"
+      "pata_it8213" "pata_it821x" "pata_jmicron" "pata_marvell"
+      "pata_mpiix" "pata_netcell" "pata_ns87410" "pata_oldpiix"
+      "pata_pcmcia" "pata_pdc2027x" "pata_qdi" "pata_rz1000"
+      "pata_sc1200" "pata_serverworks" "pata_sil680" "pata_sis"
+      "pata_sl82c105" "pata_triflex" "pata_via"
+      "pata_winbond"
+
+      # SCSI support (incomplete).
+      "3w-9xxx" "3w-xxxx" "aic79xx" "aic7xxx" "arcmsr" 
+
+      # USB support, especially for booting from USB CD-ROM
+      # drives.
+      "usb_storage"
+
+      # Firewire support.  Not tested.
+      "ohci1394" "sbp2"
+
+      # Virtio (QEMU, KVM etc.) support.
+      "virtio_net" "virtio_pci" "virtio_blk" "virtio_balloon"
+
+      # Add vfat to enable people to copy the contents of the CD to a
+      # bootable USB stick.
+      "vfat"
+    ];
+
+  boot.initrd.kernelModules =
+    [ # Wait for SCSI devices to appear.
+      "scsi_wait_scan"
+    ];
+
+  boot.postBootCommands =
+    ''
+      mkdir -p /mnt
+
+      cp ${dummyConfiguration} /etc/nixos/configuration.nix
+    '';
+
+  # Some more help text.
+  services.mingetty.helpLine =
+    ''
+        
+      Log in as "root" with an empty password.  ${
+        if config.services.xserver.enable then
+          "Type `start xserver' to start\nthe graphical user interface."
+        else ""
+      }
+    '';
+
+  # Include the firmware for various wireless cards.
+  networking.enableRT73Firmware = true;
+  networking.enableIntel2200BGFirmware = true;
+
+  # To speed up further installation of packages, include the complete stdenv
+  # in the Nix store of the tarball.
+  tarball.storeContents = pkgs2storeContents [ pkgs.stdenv pkgs.klibc pkgs.klibcShrunk ];
+
+  # Allow sshd to be started manually through "start sshd".  It should
+  # not be started by default on the installation CD because the
+  # default root password is empty.
+  services.sshd.enable = true;
+  jobs.sshd.startOn = pkgs.lib.mkOverride 50 {} "";
+}
diff --git a/modules/installer/cd-dvd/system-tarball.nix b/modules/installer/cd-dvd/system-tarball.nix
new file mode 100644
index 00000000000..f5684c7c1eb
--- /dev/null
+++ b/modules/installer/cd-dvd/system-tarball.nix
@@ -0,0 +1,126 @@
+# This module creates a bootable ISO image containing the given NixOS
+# configuration.  The derivation for the ISO image will be placed in
+# config.system.build.tarball.
+
+{ config, pkgs, ... }:
+
+with pkgs.lib;
+
+let
+
+  options = {
+    tarball.contents = mkOption {
+      example =
+        [ { source = pkgs.memtest86 + "/memtest.bin";
+            target = "boot/memtest.bin";
+          }
+        ];
+      description = ''
+        This option lists files to be copied to fixed locations in the
+        generated ISO image.
+      '';
+    };
+
+    tarball.storeContents = mkOption {
+      example = [pkgs.stdenv];
+      description = ''
+        This option lists additional derivations to be included in the
+        Nix store in the generated ISO image.
+      '';
+    };
+
+  };
+
+  # A clue for the uboot loading
+  ubootKernelParams = pkgs.writeText "uboot-kernel-params.txt" ''
+    Kernel Parameters:
+      init=${config.system.build.bootStage2}
+      systemConfig=${config.system.build.toplevel}
+      ${toString config.boot.kernelParams}
+  '';
+
+  versionFile = pkgs.writeText "nixos-version" config.system.nixosVersion;
+
+in
+
+{
+  require = options;
+
+  # Don't build the GRUB menu builder script, since we don't need it
+  # here and it causes a cyclic dependency.
+  boot.loader.grub.enable = false;
+
+  # !!! Hack - attributes expected by other modules.
+  system.build.menuBuilder = "true";
+  system.boot.loader.kernelFile = "vmlinuz";
+  environment.systemPackages = [ pkgs.grub2 ];
+
+  # In stage 1 of the boot, mount the CD/DVD as the root FS by label
+  # so that we don't need to know its device.
+  fileSystems =
+    [ { mountPoint = "/";
+        label = "rootfs";
+      }
+    ];
+
+  # boot.initrd.availableKernelModules = [ "mvsdio" "mmc_block" "reiserfs" "ext3" "ext4" ];
+
+  # boot.initrd.kernelModules = [ "rtc_mv" ];
+
+  # Closures to be copied to the Nix store on the CD, namely the init
+  # script and the top-level system configuration directory.
+  tarball.storeContents =
+    [ {
+        object = config.system.build.bootStage2;
+        symlink = "none";
+      }
+      {
+        object = config.system.build.toplevel;
+        symlink = "/var/run/current-system";
+      }
+    ];
+
+  # Individual files to be included on the CD, outside of the Nix
+  # store on the CD.
+  tarball.contents =
+    [ { source = config.boot.kernelPackages.kernel + "/vmlinuz";
+        target = "/boot/vmlinuz";
+      }
+      { source = config.system.build.initialRamdisk + "/initrd";
+        target = "/boot/initrd";
+      }
+      { source = "${pkgs.grub2}/share/grub/unicode.pf2";
+        target = "/boot/grub/unicode.pf2";
+      }
+      { source = config.boot.loader.grub.splashImage;
+        target = "/boot/grub/splash.png";
+      }
+/*
+      { source = pkgs.ubootKernelParams;
+        target = "/uboot-kernelparams.txt";
+      }
+*/
+      { source = versionFile;
+        target = "/nixos-version.txt";
+      }
+    ];
+
+  # Create the tarball
+  system.build.tarball = import ../../../lib/make-system-tarball.nix {
+    inherit (pkgs) stdenv perl xz pathsFromGraph;
+    
+    inherit (config.tarball) contents storeContents;
+  };
+
+  boot.postBootCommands =
+    ''
+      # After booting, register the contents of the Nix store on the
+      # CD in the Nix database in the tmpfs.
+      ${config.environment.nix}/bin/nix-store --load-db < /nix/store/nix-path-registration
+
+      # nixos-rebuild also requires a "system" profile and an
+      # /etc/NIXOS tag.
+      touch /etc/NIXOS
+      ${config.environment.nix}/bin/nix-env -p /nix/var/nix/profiles/system --set /var/run/current-system
+    '';
+}
diff --git a/release.nix b/release.nix
index 91aa722e2a9..cecb773b434 100644
--- a/release.nix
+++ b/release.nix
@@ -40,6 +40,35 @@ let
           echo "file iso" $iso/iso/*.iso* >> $out/nix-support/hydra-build-products
         ''; # */
 
+  makeSystemTarball =
+    { module, maintainers ? ["viric"]}:
+    { nixosSrc ? {outPath = ./.; rev = 1234;}
+    , officialRelease ? false
+    , system ? "i686-linux"
+    }:
+
+    with import nixpkgs {inherit system;};
+
+    let
+
+      version = builtins.readFile ./VERSION + (if officialRelease then "" else "pre${toString nixosSrc.rev}");
+
+      versionModule = { system.nixosVersion = version; };
+
+      config = (import lib/eval-config.nix {
+        inherit system nixpkgs;
+        modules = [ module versionModule ];
+      }).config;
+      
+      tarball = config.system.build.tarball;
+    in
+      tarball //
+        { meta = {
+            description = "NixOS system tarball for ${system} - ${platform.name}";
+            maintainers = map (x: lib.getAttr x lib.maintainers) maintainers;
+          };
+        };
+
 
   jobs = rec {
 
@@ -105,6 +134,14 @@ let
       description = "graphical";
     };
 
+    # Provide a tarball that can be unpacked into an SD card, and easily
+    # boot that system from uboot (like for the sheevaplug).
+    # The pc variant helps preparing the expression for the system tarball
+    # in a machine faster than the sheevpalug
+    system_tarball_pc = makeSystemTarball {
+      module = ./modules/installer/cd-dvd/system-tarball-pc.nix;
+    };
+
     # Hacky: doesn't depend on configuration. Yet configuration is evaluated (TODO)
     minimal_install_archive = {system ? "i686-linux"}: (iso_minimal {inherit system;})
       .config.system.build.minimalInstallArchive;
-- 
GitLab


From 9127795e4adc53c7d95da37e11c246f9cf18b997 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 16 Feb 2010 10:10:59 +0000
Subject: [PATCH 2229/5331] * Make sure that Upstart notices when the Zabbix
 server crashes so   that it can be restarted.  Zabbix is kind of hard to
 monitor, so use   a trick with an open fifo to detect when it goes down.

svn path=/nixos/trunk/; revision=20039
---
 modules/services/monitoring/zabbix-server.nix | 20 ++++++++++++++++---
 1 file changed, 17 insertions(+), 3 deletions(-)

diff --git a/modules/services/monitoring/zabbix-server.nix b/modules/services/monitoring/zabbix-server.nix
index fa38cc0a048..65b1a3cafa9 100644
--- a/modules/services/monitoring/zabbix-server.nix
+++ b/modules/services/monitoring/zabbix-server.nix
@@ -74,15 +74,29 @@ in
                 cat ${pkgs.zabbix.server}/share/zabbix/db/data/images_pgsql.sql | ${pkgs.su}/bin/su -s "$SHELL" zabbix -c '${pkgs.postgresql}/bin/psql zabbix'
                 touch "${libDir}/db-created"
             fi
+          '';
 
+        # Zabbix doesn't have an option not to daemonize, and doesn't
+        # daemonize in a way that allows Upstart to track it.  So to
+        # make sure that we notice when it goes down, we start Zabbix
+        # with an open connection to a fifo, with a `cat' on the other
+        # side.  If Zabbix dies, then `cat' will exit as well, so we
+        # just monitor `cat'.
+        script =
+          ''
             export PATH=${pkgs.nettools}/bin:$PATH
-            ${pkgs.zabbix.server}/sbin/zabbix_server --config ${configFile}
+            rm -f ${stateDir}/dummy
+            mkfifo ${stateDir}/dummy
+            cat ${stateDir}/dummy &
+            pid=$!
+            ${pkgs.zabbix.server}/sbin/zabbix_server --config ${configFile} 100>${stateDir}/dummy
+            wait "$pid"
           '';
 
         postStop =
           ''
-            pid=$(cat ${pidFile})
-            test -n "$pid" && kill "$pid"
+            pid=$(cat ${pidFile} 2> /dev/null || true)
+            (test -n "$pid" && kill "$pid") || true
             # Wait until they're really gone.
             while ${pkgs.procps}/bin/pkill -u zabbix zabbix_server; do true; done
           '';
-- 
GitLab


From f013236f1e273ae0c835d65e3a07a85bb816e73b Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 16 Feb 2010 10:15:20 +0000
Subject: [PATCH 2230/5331] * Idem for zabbix-agent.

svn path=/nixos/trunk/; revision=20040
---
 modules/services/monitoring/zabbix-agent.nix | 27 +++++++++++++-------
 1 file changed, 18 insertions(+), 9 deletions(-)

diff --git a/modules/services/monitoring/zabbix-agent.nix b/modules/services/monitoring/zabbix-agent.nix
index 3de08ba37ed..deeb5a00790 100644
--- a/modules/services/monitoring/zabbix-agent.nix
+++ b/modules/services/monitoring/zabbix-agent.nix
@@ -76,20 +76,29 @@ in
           ''
             mkdir -m 0755 -p ${stateDir} ${logDir}
             chown zabbix ${stateDir} ${logDir}
+          '';
 
-            # Grrr, zabbix_agentd cannot be properly monitored by
-            # Upstart.  Upstart's "expect fork/daemon" feature doesn't
-            # work because zabbix_agentd runs some programs on
-            # startup, and zabbix_agentd doesn't have a flag to
-            # prevent daemonizing.
+        # Zabbix doesn't have an option not to daemonize, and doesn't
+        # daemonize in a way that allows Upstart to track it.  So to
+        # make sure that we notice when it goes down, we start Zabbix
+        # with an open connection to a fifo, with a `cat' on the other
+        # side.  If Zabbix dies, then `cat' will exit as well, so we
+        # just monitor `cat'.
+        script =
+          ''
             export PATH=${pkgs.nettools}/bin:$PATH
-            ${pkgs.zabbix.agent}/sbin/zabbix_agentd --config ${configFile}
+            rm -f ${stateDir}/dummy2
+            mkfifo ${stateDir}/dummy2
+            cat ${stateDir}/dummy2 &
+            pid=$!
+            ${pkgs.zabbix.agent}/sbin/zabbix_agentd --config ${configFile} 100>${stateDir}/dummy2
+            wait "$pid"
           '';
-
+        
         postStop =
           ''
-            pid=$(cat ${pidFile})
-            test -n "$pid" && kill "$pid"
+            pid=$(cat ${pidFile} 2> /dev/null || true)
+            (test -n "$pid" && kill "$pid") || true
             # Wait until they're really gone.
             while ${pkgs.procps}/bin/pgrep -u zabbix zabbix_agentd > /dev/null; do sleep 1; done
           '';
-- 
GitLab


From c17a76279dab7dd8dca83b6245757a6265fef80f Mon Sep 17 00:00:00 2001
From: Rob Vermaas <rob.vermaas@gmail.com>
Date: Tue, 16 Feb 2010 12:51:28 +0000
Subject: [PATCH 2231/5331] zabbix agent: extraConfig

svn path=/nixos/trunk/; revision=20048
---
 modules/services/monitoring/zabbix-agent.nix | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/modules/services/monitoring/zabbix-agent.nix b/modules/services/monitoring/zabbix-agent.nix
index deeb5a00790..8f598b8a7a1 100644
--- a/modules/services/monitoring/zabbix-agent.nix
+++ b/modules/services/monitoring/zabbix-agent.nix
@@ -22,6 +22,8 @@ let
       PidFile = ${pidFile}
 
       StartAgents = 1
+
+      ${config.services.zabbixAgent.extraConfig}
     '';
 
 in
@@ -49,6 +51,13 @@ in
         '';
       };
 
+      extraConfig = mkOption {
+        default = "";
+        description = ''
+          Configuration that is injected verbatim into the configuration file.
+        '';
+      };
+
     };
 
   };
-- 
GitLab


From d79d934d85ac340b8792cc6398c69256d9f46277 Mon Sep 17 00:00:00 2001
From: Rob Vermaas <rob.vermaas@gmail.com>
Date: Wed, 17 Feb 2010 09:37:22 +0000
Subject: [PATCH 2232/5331] move functions to lib/testing to allow easier use
 outside of nixos

svn path=/nixos/trunk/; revision=20072
---
 lib/testing.nix   | 16 +++++++++++++++-
 tests/default.nix | 18 +-----------------
 2 files changed, 16 insertions(+), 18 deletions(-)

diff --git a/lib/testing.nix b/lib/testing.nix
index 834fa04ec0b..1b0c3889190 100644
--- a/lib/testing.nix
+++ b/lib/testing.nix
@@ -80,5 +80,19 @@ rec {
       ensureDir $out/nix-support
       echo "report coverage $out/coverage" >> $out/nix-support/hydra-build-products
     ''; # */
-    
+
+  call = f: f { inherit pkgs nixpkgs system; };
+
+  apply = testFun: complete (call testFun);
+
+  complete = t: t // rec {
+    nodes =
+      if t ? nodes then t.nodes else
+      if t ? machine then { machine = t.machine; }
+      else { };
+    vms = buildVirtualNetwork { inherit nodes; };
+    test = runTests vms t.testScript;
+    report = makeReport test;
+  };
+   
 }
diff --git a/tests/default.nix b/tests/default.nix
index a9661d33957..9c058ccadcc 100644
--- a/tests/default.nix
+++ b/tests/default.nix
@@ -9,23 +9,7 @@ let
     (import ../lib/build-vms.nix { inherit nixpkgs services system; }) //
     (import ../lib/testing.nix { inherit nixpkgs services system; });
 
-in with testLib; let 
-
-  call = f: f { inherit pkgs nixpkgs system testLib; };
-    
-  apply = testFun: complete (call testFun);
-
-  complete = t: t // rec {
-    nodes =
-      if t ? nodes then t.nodes else
-      if t ? machine then { machine = t.machine; }
-      else { };
-    vms = buildVirtualNetwork { inherit nodes; };
-    test = runTests vms t.testScript;
-    report = makeReport test;
-  };
-
-in
+in with testLib;
 
 {
   firefox = apply (import ./firefox.nix);
-- 
GitLab


From f1438d3d2731d890d8ccdda967fd7ab63d8d1d05 Mon Sep 17 00:00:00 2001
From: Rob Vermaas <rob.vermaas@gmail.com>
Date: Wed, 17 Feb 2010 12:32:19 +0000
Subject: [PATCH 2233/5331] tomcat: add option to enable accesslog per virtual
 host (default: off)

svn path=/nixos/trunk/; revision=20075
---
 modules/services/web-servers/tomcat.nix | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/modules/services/web-servers/tomcat.nix b/modules/services/web-servers/tomcat.nix
index ef569a8fedf..bc633cb6459 100644
--- a/modules/services/web-servers/tomcat.nix
+++ b/modules/services/web-servers/tomcat.nix
@@ -66,6 +66,11 @@ in
         description = "List consisting of a virtual host name and a list of web applications to deploy on each virtual host";
       };
 
+      logPerVirtualHost = mkOption {
+        default = false; 
+        description = "Whether to enable logging per virtual host.";
+      }; 
+
       axis2 = {
       
         enable = mkOption {
@@ -125,6 +130,9 @@ in
 	        ln -sfn ${pkgs.tomcat6}/conf/$i ${cfg.baseDir}/conf/`basename $i`
 	    done
 	    
+            # Create subdirectory for virtual hosts
+            mkdir -p ${cfg.baseDir}/virtualhosts
+ 
 	    # Create a modified catalina.properties file 
 	    # Change all references from CATALINA_HOME to CATALINA_BASE and add support for shared libraries
 	    sed -e 's|''${catalina.home}|''${catalina.base}|g' \
@@ -132,7 +140,8 @@ in
 		${pkgs.tomcat6}/conf/catalina.properties > ${cfg.baseDir}/conf/catalina.properties
 	    
 	    # Create a modified server.xml which also includes all virtual hosts
-	    sed -e "/<Engine name=\"Catalina\" defaultHost=\"localhost\">/a\  ${toString (map (virtualHost: ''<Host name=\"${virtualHost.name}\" appBase=\"virtualhosts/${virtualHost.name}/webapps\" unpackWARs=\"true\" autoDeploy=\"true\" xmlValidation=\"false\" xmlNamespaceAware=\"false\" />'' ) cfg.virtualHosts)}" \
+	    sed -e "/<Engine name=\"Catalina\" defaultHost=\"localhost\">/a\  ${
+                         toString (map (virtualHost: ''<Host name=\"${virtualHost.name}\" appBase=\"virtualhosts/${virtualHost.name}/webapps\" unpackWARs=\"true\" autoDeploy=\"true\" xmlValidation=\"false\" xmlNamespaceAware=\"false\" >${if cfg.logPerVirtualHost then ''<Valve className=\"org.apache.catalina.valves.AccessLogValve\" directory=\"logs\"  prefix=\"${virtualHost.name}_access_log.\" pattern=\"combined\" resolveHosts=\"false\"/>'' else ""}</Host>'') cfg.virtualHosts)}" \
 	        ${pkgs.tomcat6}/conf/server.xml > ${cfg.baseDir}/conf/server.xml
 	    
 	    # Create a logs/ directory
@@ -231,7 +240,7 @@ in
 	      
 	      # Symlink all the given web applications files or paths into the webapps/ directory
 	      # of this virtual host
-	      for i in ${toString virtualHost.webapps}
+	      for i in "${if virtualHost ? webapps then toString virtualHost.webapps else ""}"
 	      do
 		  if [ -f $i ]
 		  then
-- 
GitLab


From 093b51a56238ca358f67744e6fe9c36a064a09f0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Thu, 18 Feb 2010 11:35:39 +0000
Subject: [PATCH 2234/5331] Removing references to linux kernel 'vmlinuz', and
 making them point to 'bzImage'. That should match with a related change in
 nixpkgs.

svn path=/nixos/trunk/; revision=20095
---
 doc/manual/development.xml                            | 2 +-
 modules/installer/cd-dvd/iso-image.nix                | 8 ++++----
 modules/installer/cd-dvd/system-tarball.nix           | 6 +++---
 modules/installer/generations-dir/generations-dir.nix | 2 +-
 modules/installer/grub/grub.nix                       | 2 +-
 5 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/doc/manual/development.xml b/doc/manual/development.xml
index 56c071cce98..5ddf5d935d1 100644
--- a/doc/manual/development.xml
+++ b/doc/manual/development.xml
@@ -334,7 +334,7 @@ boot correctly is to use QEMU’s <option>-kernel</option> and
 <screen>
 $ nix-build /etc/nixos/nixos -A config.system.build.initialRamdisk -o initrd
 $ nix-build /etc/nixos/nixos -A config.system.build.kernel -o kernel
-$ qemu-system-x86_64 -kernel ./kernel/vmlinuz -initrd ./initrd/initrd -hda /dev/null
+$ qemu-system-x86_64 -kernel ./kernel/bzImage -initrd ./initrd/initrd -hda /dev/null
 </screen>
 
 </para>
diff --git a/modules/installer/cd-dvd/iso-image.nix b/modules/installer/cd-dvd/iso-image.nix
index 3135fa2cda4..f84233e923a 100644
--- a/modules/installer/cd-dvd/iso-image.nix
+++ b/modules/installer/cd-dvd/iso-image.nix
@@ -104,7 +104,7 @@ in
 
   # !!! Hack - attributes expected by other modules.
   system.build.menuBuilder = "true";
-  system.boot.loader.kernelFile = "vmlinuz";
+  system.boot.loader.kernelFile = "bzImage";
   environment.systemPackages = [ pkgs.grub2 ];
 
   # In stage 1 of the boot, mount the CD/DVD as the root FS by label
@@ -181,8 +181,8 @@ in
       { source = pkgs.writeText "grub.cfg" grubCfg;
         target = "/boot/grub/grub.cfg";
       }
-      { source = config.boot.kernelPackages.kernel + "/vmlinuz";
-        target = "/boot/vmlinuz";
+      { source = config.boot.kernelPackages.kernel + "/bzImage";
+        target = "/boot/bzImage";
       }
       { source = config.system.build.initialRamdisk + "/initrd";
         target = "/boot/initrd";
@@ -206,7 +206,7 @@ in
   boot.loader.grub.extraEntries =
     ''
       menuentry "NixOS Installer / Rescue" {
-        linux /boot/vmlinuz init=${config.system.build.bootStage2} systemConfig=${config.system.build.toplevel} ${toString config.boot.kernelParams}
+        linux /boot/bzImage init=${config.system.build.bootStage2} systemConfig=${config.system.build.toplevel} ${toString config.boot.kernelParams}
         initrd /boot/initrd
       }
 
diff --git a/modules/installer/cd-dvd/system-tarball.nix b/modules/installer/cd-dvd/system-tarball.nix
index f5684c7c1eb..70bb12eac00 100644
--- a/modules/installer/cd-dvd/system-tarball.nix
+++ b/modules/installer/cd-dvd/system-tarball.nix
@@ -52,7 +52,7 @@ in
 
   # !!! Hack - attributes expected by other modules.
   system.build.menuBuilder = "true";
-  system.boot.loader.kernelFile = "vmlinuz";
+  system.boot.loader.kernelFile = "bzImage";
   environment.systemPackages = [ pkgs.grub2 ];
 
   # In stage 1 of the boot, mount the CD/DVD as the root FS by label
@@ -83,8 +83,8 @@ in
   # Individual files to be included on the CD, outside of the Nix
   # store on the CD.
   tarball.contents =
-    [ { source = config.boot.kernelPackages.kernel + "/vmlinuz";
-        target = "/boot/vmlinuz";
+    [ { source = config.boot.kernelPackages.kernel + "/bzImage";
+        target = "/boot/bzImage";
       }
       { source = config.system.build.initialRamdisk + "/initrd";
         target = "/boot/initrd";
diff --git a/modules/installer/generations-dir/generations-dir.nix b/modules/installer/generations-dir/generations-dir.nix
index 4b999a8d5a4..304fb1a6a42 100644
--- a/modules/installer/generations-dir/generations-dir.nix
+++ b/modules/installer/generations-dir/generations-dir.nix
@@ -61,6 +61,6 @@ in
     boot.loader.kernelFile = (
        if (platform.name == "sheevaplug") then "uImage"
        else if (platform.name == "versatileARM") then "zImage"
-       else "vmlinuz");
+       else "bzImage");
   };
 }
diff --git a/modules/installer/grub/grub.nix b/modules/installer/grub/grub.nix
index e3df1593e71..f393d04955a 100644
--- a/modules/installer/grub/grub.nix
+++ b/modules/installer/grub/grub.nix
@@ -149,7 +149,7 @@ in
     # Common attribute for boot loaders so only one of them can be
     # set at once.
     system.boot.loader.id = "grub";
-    system.boot.loader.kernelFile = "vmlinuz";
+    system.boot.loader.kernelFile = "bzImage";
 
     environment.systemPackages = mkIf config.boot.loader.grub.enable [ grub ];
 
-- 
GitLab


From a87ee76cb390cb721242ea21534150781292b0c9 Mon Sep 17 00:00:00 2001
From: Rob Vermaas <rob.vermaas@gmail.com>
Date: Fri, 19 Feb 2010 09:48:24 +0000
Subject: [PATCH 2235/5331]  * hydra: added option to self manage nix.machines
 (for buildfarm purposes)

svn path=/nixos/trunk/; revision=20121
---
 modules/services/misc/nix-daemon.nix | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/modules/services/misc/nix-daemon.nix b/modules/services/misc/nix-daemon.nix
index 69a7149c2be..b4f8091b163 100644
--- a/modules/services/misc/nix-daemon.nix
+++ b/modules/services/misc/nix-daemon.nix
@@ -66,6 +66,14 @@ in
         ";
       };
 
+      manualNixMachines = mkOption {
+        default = false;
+        description = "
+          Whether to manually manage the list of buildmachines used in distributed 
+          builds in /etc/nix.machines. 
+        ";
+      };
+
       daemonNiceLevel = mkOption {
         default = 10;
         description = "
@@ -182,7 +190,7 @@ in
         }
       ]
 
-      ++ optional config.nix.distributedBuilds
+      ++ optional (config.nix.distributedBuilds && !config.nix.manualNixMachines)
         { # List of machines for distributed Nix builds in the format expected
           # by build-remote.pl.
           source = pkgs.writeText "nix.machines"
@@ -205,6 +213,9 @@ in
           ''
             export PATH=${if config.nix.distributedBuilds then "${pkgs.openssh}/bin:${pkgs.gzip}/bin:" else ""}${pkgs.openssl}/bin:${nix}/bin:$PATH
             ${config.nix.envVars}
+            # To reduce the load on Hydra, don't start all those
+            # unnecessary substituter processes.
+            export NIX_SUBSTITUTERS=
             exec \
               nice -n ${builtins.toString config.nix.daemonNiceLevel} \
               ${pkgs.utillinux}/bin/ionice -n ${builtins.toString config.nix.daemonIONiceLevel} \
-- 
GitLab


From 2b7da40351fbb7371126deca9b7d8f3bbbfe8ac5 Mon Sep 17 00:00:00 2001
From: Rob Vermaas <rob.vermaas@gmail.com>
Date: Fri, 19 Feb 2010 09:55:28 +0000
Subject: [PATCH 2236/5331] revert unintended part of the previous commit

svn path=/nixos/trunk/; revision=20123
---
 modules/services/misc/nix-daemon.nix | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/modules/services/misc/nix-daemon.nix b/modules/services/misc/nix-daemon.nix
index b4f8091b163..ee7136212d5 100644
--- a/modules/services/misc/nix-daemon.nix
+++ b/modules/services/misc/nix-daemon.nix
@@ -213,9 +213,6 @@ in
           ''
             export PATH=${if config.nix.distributedBuilds then "${pkgs.openssh}/bin:${pkgs.gzip}/bin:" else ""}${pkgs.openssl}/bin:${nix}/bin:$PATH
             ${config.nix.envVars}
-            # To reduce the load on Hydra, don't start all those
-            # unnecessary substituter processes.
-            export NIX_SUBSTITUTERS=
             exec \
               nice -n ${builtins.toString config.nix.daemonNiceLevel} \
               ${pkgs.utillinux}/bin/ionice -n ${builtins.toString config.nix.daemonIONiceLevel} \
-- 
GitLab


From 0fb8300bb6055223abb53bf29a3a97589c5b6e9b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Sun, 21 Feb 2010 16:26:33 +0000
Subject: [PATCH 2237/5331] Updating the nixos NFS related expressions. Thanks
 to Oleksandr for the help. I tried not to break the tests.

svn path=/nixos/trunk/; revision=20157
---
 .../network-filesystems/nfs-kernel.nix        | 103 +++++++++---------
 tests/check-filesystems.nix                   |   8 +-
 tests/trac.nix                                |   7 +-
 3 files changed, 62 insertions(+), 56 deletions(-)

diff --git a/modules/services/network-filesystems/nfs-kernel.nix b/modules/services/network-filesystems/nfs-kernel.nix
index 249d777727e..387bd2faa3e 100644
--- a/modules/services/network-filesystems/nfs-kernel.nix
+++ b/modules/services/network-filesystems/nfs-kernel.nix
@@ -8,11 +8,6 @@ let
 
   cfg = config.services.nfsKernel;
 
-  exports =
-    if builtins.pathExists cfg.exports
-    then cfg.exports
-    else pkgs.writeText "exports" cfg.exports;
-
 in
 
 {
@@ -23,43 +18,51 @@ in
   
     services.nfsKernel = {
 
-      enable = mkOption {
+      client.enable = mkOption {
         default = false;
         description = ''
-          Whether to enable the kernel's NFS server.
-        '';
-      };
-
-      # !!! Why is this a file?  Why not a list of export entries?
-      exports = mkOption {
-        check = v: v != "/etc/exports"; # this won't work
-        description = ''
-          The file listing the directories to be exported.  See
-          <citerefentry><refentrytitle>exports</refentrytitle>
-          <manvolnum>5</manvolnum></citerefentry> for the format.
+          Whether to enable the kernel's NFS client daemons.
         '';
       };
 
-      hostName = mkOption {
-        default = null;
-        description = ''
-          Hostname or address on which NFS requests will be accepted.
-          Default is all.  See the <option>-H</option> option in
-          <citerefentry><refentrytitle>nfsd</refentrytitle>
-          <manvolnum>8</manvolnum></citerefentry>.
-        '';
-      };
+      server = {
+        enable = mkOption {
+          default = false;
+          description = ''
+            Whether to enable the kernel's NFS server.
+          '';
+        };
+
+        exports = mkOption {
+          default = "";
+          description = ''
+            Contents of the /etc/exports file.  See
+            <citerefentry><refentrytitle>exports</refentrytitle>
+            <manvolnum>5</manvolnum></citerefentry> for the format.
+          '';
+        };
+
+        hostName = mkOption {
+          default = null;
+          description = ''
+            Hostname or address on which NFS requests will be accepted.
+            Default is all.  See the <option>-H</option> option in
+            <citerefentry><refentrytitle>nfsd</refentrytitle>
+            <manvolnum>8</manvolnum></citerefentry>.
+          '';
+        };
       
-      nproc = mkOption {
-        default = 8;
-        description = ''
-          Number of NFS server threads.  Defaults to the recommended value of 8.
-        '';
-      };
+        nproc = mkOption {
+          default = 8;
+          description = ''
+            Number of NFS server threads.  Defaults to the recommended value of 8.
+          '';
+        };
 
-      createMountPoints = mkOption {
-        default = false;
-        description = "Whether to create the mount points in the exports file at startup time.";
+        createMountPoints = mkOption {
+          default = false;
+          description = "Whether to create the mount points in the exports file at startup time.";
+        };
       };
       
     };
@@ -69,19 +72,19 @@ in
 
   ###### implementation
 
-  config = mkIf config.services.nfsKernel.enable {
+  config = {
 
-    assertions = singleton
+    assertions = mkIf (cfg.client.enable || cfg.server.enable) (singleton
       { assertion = config.services.portmap.enable;
         message = "Please enable portmap (services.portmap.enable) to use nfs-kernel.";
-      };
+      });
 
-    environment.etc = singleton
-      { source = exports;
+    environment.etc = mkIf cfg.server.enable (singleton
+      { source = cfg.server.exports;
         target = "exports";
-      };
+      });
 
-    jobs.nfs_kernel_exports =
+    jobs.nfs_kernel_exports = mkIf cfg.server.enable 
       { name = "nfs-kernel-exports";
       
         description = "Kernel NFS server";
@@ -95,23 +98,23 @@ in
             mkdir -p /var/lib/nfs
             ${config.system.sbin.modprobe}/sbin/modprobe nfsd || true
 
-            ${optionalString cfg.createMountPoints
+            ${optionalString cfg.server.createMountPoints
               ''
                 # create export directories:
                 # skip comments, take first col which may either be a quoted
                 # "foo bar" or just foo (-> man export)
-                sed '/^#.*/d;s/^"\([^"]*\)".*/\1/;t;s/[ ].*//' ${exports} \
+                sed '/^#.*/d;s/^"\([^"]*\)".*/\1/;t;s/[ ].*//' ${cfg.server.exports} \
                 | xargs -d '\n' mkdir -p
 	      ''
             }
 	    	  
-            # exports file is ${exports}
+            # exports file is ${cfg.server.exports}
             # keep this comment so that this job is restarted whenever exports changes!
             exportfs -ra
           '';
       };
 
-    jobs.nfs_kernel_nfsd =
+    jobs.nfs_kernel_nfsd = mkIf cfg.server.enable 
       { name = "nfs-kernel-nfsd";
 
         description = "Kernel NFS server";
@@ -119,10 +122,10 @@ in
         startOn = "started nfs-kernel-exports and started portmap";
         stopOn = "stopping nfs-kernel-exports";
 
-        exec = "${pkgs.nfsUtils}/sbin/rpc.nfsd ${if cfg.hostName != null then "-H ${cfg.hostName}" else ""} ${builtins.toString cfg.nproc}";
+        exec = "${pkgs.nfsUtils}/sbin/rpc.nfsd ${if cfg.server.hostName != null then "-H ${cfg.server.hostName}" else ""} ${builtins.toString cfg.server.nproc}";
       };
 
-    jobs.nfs_kernel_mountd =
+    jobs.nfs_kernel_mountd = mkIf cfg.server.enable 
       { name = "nfs-kernel-mountd";
 
         description = "Kernel NFS server - mount daemon";
@@ -130,10 +133,10 @@ in
         startOn = "started nfs-kernel-nfsd and started portmap";
         stopOn = "stopping nfs-kernel-exports";
 
-        exec = "${pkgs.nfsUtils}/sbin/rpc.mountd -F -f ${exports}";
+        exec = "${pkgs.nfsUtils}/sbin/rpc.mountd -F -f ${cfg.server.exports}";
       };
 
-    jobs.nfs_kernel_statd =
+    jobs.nfs_kernel_statd = mkIf (cfg.client.enable || cfg.server.enable)
       { name = "nfs-kernel-statd";
       
         description = "Kernel NFS server - Network Status Monitor";
diff --git a/tests/check-filesystems.nix b/tests/check-filesystems.nix
index d455d7b021f..ee62ac805fb 100644
--- a/tests/check-filesystems.nix
+++ b/tests/check-filesystems.nix
@@ -10,12 +10,13 @@ rec {
   nodes = {
     share = {pkgs, config, ...}: {
       services.portmap.enable = true;
-      services.nfsKernel.enable = true;
-      services.nfsKernel.exports = ''
+      services.nfsKernel.client.enable = true;
+      services.nfsKernel.server.enable = true;
+      services.nfsKernel.server.exports = ''
         /repos1 192.168.1.0/255.255.255.0(rw,no_root_squash)
         /repos2 192.168.1.0/255.255.255.0(rw,no_root_squash)
       '';
-      services.nfsKernel.createMountPoints = true;
+      services.nfsKernel.server.createMountPoints = true;
 
       jobs.checkable = {
         startOn = [
@@ -29,6 +30,7 @@ rec {
     fsCheck = {pkgs, config, ...}: {
       # enable nfs import
       services.portmap.enable = true;
+      services.nfsKernel.client.enable = true;
 
       fileSystems =
         let
diff --git a/tests/trac.nix b/tests/trac.nix
index 4092bf037a6..b9b73ad673e 100644
--- a/tests/trac.nix
+++ b/tests/trac.nix
@@ -6,11 +6,11 @@
       {pkgs, config, ...}:
       {
         services.portmap.enable = true;
-        services.nfsKernel.enable = true;
-        services.nfsKernel.exports = ''
+        services.nfsKernel.server.enable = true;
+        services.nfsKernel.server.exports = ''
           /repos 192.168.1.0/255.255.255.0(rw,no_root_squash)
         '';
-        services.nfsKernel.createMountPoints = true;
+        services.nfsKernel.server.createMountPoints = true;
       };
 
     postgresql =
@@ -37,6 +37,7 @@
           ];
       
         services.portmap.enable = true;
+        services.nfsKernel.client.enable = true;
         services.httpd.enable = true;
         services.httpd.adminAddr = "root@localhost";
         services.httpd.extraSubservices = [ { serviceType = "trac"; } ];
-- 
GitLab


From cc0a2a6944d2c422226463c31e9bfb90169a6a71 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 22 Feb 2010 17:12:26 +0000
Subject: [PATCH 2238/5331] * Don't say `jobs.foo = mkIf condition { ... }'
 because that will   create an empty job `foo' if the condition is false. 
 Instead use   `jobs = optionalAttrs condition { foo = { ... }; }'. * Enable
 portmap automatically when using the NFS server or client.

svn path=/nixos/trunk/; revision=20178
---
 .../network-filesystems/nfs-kernel.nix        | 139 ++++++++++--------
 1 file changed, 75 insertions(+), 64 deletions(-)

diff --git a/modules/services/network-filesystems/nfs-kernel.nix b/modules/services/network-filesystems/nfs-kernel.nix
index 387bd2faa3e..8b2d6158443 100644
--- a/modules/services/network-filesystems/nfs-kernel.nix
+++ b/modules/services/network-filesystems/nfs-kernel.nix
@@ -74,8 +74,10 @@ in
 
   config = {
 
+    services.portmap.enable = cfg.client.enable || cfg.server.enable;
+    
     assertions = mkIf (cfg.client.enable || cfg.server.enable) (singleton
-      { assertion = config.services.portmap.enable;
+      { assertion = cfg.client.enable || cfg.server.enable;
         message = "Please enable portmap (services.portmap.enable) to use nfs-kernel.";
       });
 
@@ -84,73 +86,82 @@ in
         target = "exports";
       });
 
-    jobs.nfs_kernel_exports = mkIf cfg.server.enable 
-      { name = "nfs-kernel-exports";
+    jobs =
+      optionalAttrs cfg.server.enable
+        { nfs_kernel_exports = 
+          { name = "nfs-kernel-exports";
       
-        description = "Kernel NFS server";
+            description = "Kernel NFS server";
 
-        startOn = "started network-interfaces";
-        stopOn = "stopping network-interfaces";
+            startOn = "started network-interfaces";
+            stopOn = "stopping network-interfaces";
 
-        preStart =
-          ''
-            export PATH=${pkgs.nfsUtils}/sbin:$PATH
-            mkdir -p /var/lib/nfs
-            ${config.system.sbin.modprobe}/sbin/modprobe nfsd || true
-
-            ${optionalString cfg.server.createMountPoints
+            preStart =
               ''
-                # create export directories:
-                # skip comments, take first col which may either be a quoted
-                # "foo bar" or just foo (-> man export)
-                sed '/^#.*/d;s/^"\([^"]*\)".*/\1/;t;s/[ ].*//' ${cfg.server.exports} \
-                | xargs -d '\n' mkdir -p
-	      ''
-            }
-	    	  
-            # exports file is ${cfg.server.exports}
-            # keep this comment so that this job is restarted whenever exports changes!
-            exportfs -ra
-          '';
-      };
-
-    jobs.nfs_kernel_nfsd = mkIf cfg.server.enable 
-      { name = "nfs-kernel-nfsd";
-
-        description = "Kernel NFS server";
-
-        startOn = "started nfs-kernel-exports and started portmap";
-        stopOn = "stopping nfs-kernel-exports";
-
-        exec = "${pkgs.nfsUtils}/sbin/rpc.nfsd ${if cfg.server.hostName != null then "-H ${cfg.server.hostName}" else ""} ${builtins.toString cfg.server.nproc}";
-      };
-
-    jobs.nfs_kernel_mountd = mkIf cfg.server.enable 
-      { name = "nfs-kernel-mountd";
-
-        description = "Kernel NFS server - mount daemon";
-
-        startOn = "started nfs-kernel-nfsd and started portmap";
-        stopOn = "stopping nfs-kernel-exports";
-
-        exec = "${pkgs.nfsUtils}/sbin/rpc.mountd -F -f ${cfg.server.exports}";
-      };
-
-    jobs.nfs_kernel_statd = mkIf (cfg.client.enable || cfg.server.enable)
-      { name = "nfs-kernel-statd";
-      
-        description = "Kernel NFS server - Network Status Monitor";
-      
-        startOn = "started nfs-kernel-nfsd and started portmap";
-        stopOn = "stopping nfs-kernel-exports";
-
-        preStart =
-          ''	
-            mkdir -p /var/lib/nfs
-          '';
-
-        exec = "${pkgs.nfsUtils}/sbin/rpc.statd -F";
-      };
+                export PATH=${pkgs.nfsUtils}/sbin:$PATH
+                mkdir -p /var/lib/nfs
+                ${config.system.sbin.modprobe}/sbin/modprobe nfsd || true
+
+                ${optionalString cfg.server.createMountPoints
+                  ''
+                    # create export directories:
+                    # skip comments, take first col which may either be a quoted
+                    # "foo bar" or just foo (-> man export)
+                    sed '/^#.*/d;s/^"\([^"]*\)".*/\1/;t;s/[ ].*//' ${cfg.server.exports} \
+                    | xargs -d '\n' mkdir -p
+                  ''
+                }
+
+                # exports file is ${cfg.server.exports}
+                # keep this comment so that this job is restarted whenever exports changes!
+                exportfs -ra
+              '';
+          };
+        }
+    
+      // optionalAttrs cfg.server.enable
+        { nfs_kernel_nfsd = 
+          { name = "nfs-kernel-nfsd";
+
+            description = "Kernel NFS server";
+
+            startOn = "started nfs-kernel-exports and started portmap";
+            stopOn = "stopping nfs-kernel-exports";
+
+            exec = "${pkgs.nfsUtils}/sbin/rpc.nfsd ${if cfg.server.hostName != null then "-H ${cfg.server.hostName}" else ""} ${builtins.toString cfg.server.nproc}";
+          };
+        }
+
+      // optionalAttrs cfg.server.enable
+        { nfs_kernel_mountd =
+          { name = "nfs-kernel-mountd";
+
+            description = "Kernel NFS server - mount daemon";
+
+            startOn = "started nfs-kernel-nfsd and started portmap";
+            stopOn = "stopping nfs-kernel-exports";
+
+            exec = "${pkgs.nfsUtils}/sbin/rpc.mountd -F -f ${cfg.server.exports}";
+          };
+        }
+
+      // optionalAttrs (cfg.client.enable || cfg.server.enable)
+        { nfs_kernel_statd = 
+          { name = "nfs-kernel-statd";
+
+            description = "Kernel NFS server - Network Status Monitor";
+
+            startOn = "started nfs-kernel-nfsd and started portmap";
+            stopOn = "stopping nfs-kernel-exports";
+
+            preStart =
+              ''	
+                mkdir -p /var/lib/nfs
+              '';
+
+            exec = "${pkgs.nfsUtils}/sbin/rpc.statd -F";
+          };
+        };
       
   };
   
-- 
GitLab


From 0bae6c2c187d2f69a597603720ee875a73edae39 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 22 Feb 2010 17:20:12 +0000
Subject: [PATCH 2239/5331] * Disable the "smart" tab completion again, because
 it causes lots of   problems:
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

  - It doesn't support filenames with spaces.
  - It inserts a space after the filename when tab-completing in an
    "svn" command.
  - Many people find it annoying that tab-completion on commands like
    "tar" only matches filenames with the "right" extension.
  - Lluís reported bash apparently crashing on some tab completions.

  We should probably make this optional, and maybe use a subset of the
  bash_completion file in the bash distribution that works.

svn path=/nixos/trunk/; revision=20179
---
 modules/programs/bash/bashrc.sh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/modules/programs/bash/bashrc.sh b/modules/programs/bash/bashrc.sh
index 6fd7b10f255..7bb7cef5bbe 100644
--- a/modules/programs/bash/bashrc.sh
+++ b/modules/programs/bash/bashrc.sh
@@ -63,7 +63,8 @@ alias which="type -p"
 
 # The "non-interactive" Bash build does not support programmable
 # completion so check whether it's available.
-if shopt -q progcomp 2> /dev/null; then
+if false; then
+#if shopt -q progcomp 2> /dev/null; then
     # Completion.
     if [ -z "$BASH_COMPLETION_DIR" -a -d "@bash@/etc/bash_completion.d" ]; then
 	BASH_COMPLETION_DIR="@bash@/etc/bash_completion.d"
-- 
GitLab


From bc4e159d0e78cef78a5b12cb9ea21a3df3593272 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Mon, 22 Feb 2010 21:41:49 +0000
Subject: [PATCH 2240/5331] Fixing a terrible bug in nixos nfs-kernel server,
 related to the exports file. The file contents were taken as a file path.
 This resulted in a system with a totally broken /etc: lrwxrwxrwx 1 root
 nixbld   51 22 feb 21:45 bashrc ->
 /nix/store/gh71a6w50cxrl4124kxfn24yi0b7aaka-useradd lrwxrwxrwx 1 root nixbld 
  44 22 feb 21:45 nix.conf -> 192.168.1.4(rw,no_root_squash,no_all_squash)
 lrwxrwxrwx 1 root nixbld   58 22 feb 21:45 inputrc ->
 /nix/store/1czhdj7q74dc556frqrh51jyshfsxhl3-bashrc-user.sh lrwxrwxrwx 1 root
 nixbld   51 22 feb 21:45 nsswitch.conf ->
 /nix/store/qsgsli992hd1g8245d8am9izn9xmw90x-inputrc lrwxrwxrwx 1 root nixbld 
  20 22 feb 21:45 exports -> /home/sheevaplugroot

Notice that the inputrc has strange contents. In my case, that disabled me to type 's' or 'i' (at least) in any new interactive shell.

If you notice, the 'exports' symlink should point to a store file, which contents had to look like:
/home/sheevaplugroot 192.168.1.4(rw,no_root_squash,no_all_squash)

This patch achieves this later behaviour rather than the former.


svn path=/nixos/trunk/; revision=20181
---
 modules/services/network-filesystems/nfs-kernel.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/services/network-filesystems/nfs-kernel.nix b/modules/services/network-filesystems/nfs-kernel.nix
index 8b2d6158443..24817c6178b 100644
--- a/modules/services/network-filesystems/nfs-kernel.nix
+++ b/modules/services/network-filesystems/nfs-kernel.nix
@@ -82,7 +82,7 @@ in
       });
 
     environment.etc = mkIf cfg.server.enable (singleton
-      { source = cfg.server.exports;
+      { source = pkgs.writeText "exports" cfg.server.exports;
         target = "exports";
       });
 
-- 
GitLab


From 90023351019defa926292287bcf4c42e497a1a51 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Sat, 27 Feb 2010 18:37:12 +0000
Subject: [PATCH 2241/5331] Making nixos handle the nixpkgs 'platform'
 parameter.

svn path=/nixos/trunk/; revision=20274
---
 lib/eval-config.nix      | 15 +++++++++------
 modules/misc/nixpkgs.nix |  9 ++++++++-
 2 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/lib/eval-config.nix b/lib/eval-config.nix
index 28db11e45c5..77c20caf604 100644
--- a/lib/eval-config.nix
+++ b/lib/eval-config.nix
@@ -47,17 +47,20 @@ rec {
   pkgs =
     if pkgs_ != null
     then pkgs_
-    else import nixpkgs {
-      inherit system;
-      config =
-        (import ./eval-config.nix {
+    else import nixpkgs (
+      let
+        nixpkgsOptions = (import ./eval-config.nix {
           inherit system nixpkgs services extraArgs modules;
           # For efficiency, leave out most NixOS modules; they don't
           # define nixpkgs.config, so it's pointless to evaluate them.
           baseModules = [ ../modules/misc/nixpkgs.nix ];
           pkgs = import nixpkgs { inherit system; config = {}; };
-        }).optionDefinitions.nixpkgs.config;
-    };
+        }).optionDefinitions.nixpkgs;
+      in
+      {
+        inherit system;
+        inherit (nixpkgsOptions) config platform;
+      });
 
   # Optionally check wether all config values have corresponding
   # option declarations.
diff --git a/modules/misc/nixpkgs.nix b/modules/misc/nixpkgs.nix
index 68e7e2517f9..8173d716d84 100644
--- a/modules/misc/nixpkgs.nix
+++ b/modules/misc/nixpkgs.nix
@@ -13,5 +13,12 @@
       '';
     };
 
+    nixpkgs.platform = pkgs.lib.mkOption {
+      default = pkgs.platforms.pc;
+      description = ''
+        The platform for the Nix Packages collection.
+      '';
+    };
+
   };
-}
\ No newline at end of file
+}
-- 
GitLab


From b6090bff9d8ab6941e0a80aa2fb63497cf85b3d9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Sat, 27 Feb 2010 22:17:10 +0000
Subject: [PATCH 2242/5331] Making the bootloaders respect the
 platform.kernelTarget set in nixpkgs.

svn path=/nixos/trunk/; revision=20283
---
 modules/installer/generations-dir/generations-dir.nix | 8 ++------
 modules/installer/grub/grub.nix                       | 2 +-
 2 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/modules/installer/generations-dir/generations-dir.nix b/modules/installer/generations-dir/generations-dir.nix
index 304fb1a6a42..a56dd6a19ff 100644
--- a/modules/installer/generations-dir/generations-dir.nix
+++ b/modules/installer/generations-dir/generations-dir.nix
@@ -42,8 +42,7 @@ let
   };
 
   # Temporary check, for nixos to cope both with nixpkgs stdenv-updates and trunk
-  platform = (if pkgs ? platform then pkgs.platform else
-    { name = "pc"; uboot = null; });
+  platform = pkgs.stdenv.platform;
 in
 {
   require = [
@@ -58,9 +57,6 @@ in
       menuBuilder = generationsDirBuilder;
     };
     boot.loader.id = "generationsDir";
-    boot.loader.kernelFile = (
-       if (platform.name == "sheevaplug") then "uImage"
-       else if (platform.name == "versatileARM") then "zImage"
-       else "bzImage");
+    boot.loader.kernelFile = platform.kernelTarget;
   };
 }
diff --git a/modules/installer/grub/grub.nix b/modules/installer/grub/grub.nix
index f393d04955a..4217e0d481c 100644
--- a/modules/installer/grub/grub.nix
+++ b/modules/installer/grub/grub.nix
@@ -149,7 +149,7 @@ in
     # Common attribute for boot loaders so only one of them can be
     # set at once.
     system.boot.loader.id = "grub";
-    system.boot.loader.kernelFile = "bzImage";
+    system.boot.loader.kernelFile = pkgs.stdenv.platform.kernelTarget;
 
     environment.systemPackages = mkIf config.boot.loader.grub.enable [ grub ];
 
-- 
GitLab


From 3d87a133a092629426cbf67061917a9fb4936594 Mon Sep 17 00:00:00 2001
From: Sander van der Burg <s.vanderburg@tudelft.nl>
Date: Wed, 3 Mar 2010 13:22:06 +0000
Subject: [PATCH 2243/5331] Added gstreamer plugins to the systemPackages, so
 that Phonon does not crash on shutdown when using KDE 4.4.x

svn path=/nixos/trunk/; revision=20350
---
 modules/programs/bash/bashrc.sh                | 1 +
 modules/services/x11/desktop-managers/kde4.nix | 3 +++
 2 files changed, 4 insertions(+)

diff --git a/modules/programs/bash/bashrc.sh b/modules/programs/bash/bashrc.sh
index 7bb7cef5bbe..f12b95637b4 100644
--- a/modules/programs/bash/bashrc.sh
+++ b/modules/programs/bash/bashrc.sh
@@ -11,6 +11,7 @@ export NIXPKGS_ALL=/etc/nixos/nixpkgs
 export PAGER="less -R"
 export EDITOR=nano
 export LOCATE_PATH=/var/cache/locatedb
+export GST_PLUGIN_PATH=/var/run/current-system/sw/lib/gstreamer-0.10
 @shellInit@
 
 
diff --git a/modules/services/x11/desktop-managers/kde4.nix b/modules/services/x11/desktop-managers/kde4.nix
index a4c63616347..885ecfebca2 100644
--- a/modules/services/x11/desktop-managers/kde4.nix
+++ b/modules/services/x11/desktop-managers/kde4.nix
@@ -52,6 +52,9 @@ in
         pkgs.kde4.kdebase_runtime
         pkgs.kde4.kdebase_workspace
         pkgs.shared_mime_info
+	pkgs.gst_all.gstreamer
+	pkgs.gst_all.gstPluginsBase
+	pkgs.gst_all.gstPluginsGood
       ] ++ optional (pkgs.kde4 ? oxygen_icons) pkgs.kde4.oxygen_icons;
 
     environment.x11Packages =
-- 
GitLab


From 787b5cd7b973f0e1670b577d0aacf491d24a7760 Mon Sep 17 00:00:00 2001
From: Sander van der Burg <s.vanderburg@tudelft.nl>
Date: Wed, 3 Mar 2010 14:01:13 +0000
Subject: [PATCH 2244/5331] Implemented enableOSSEmulation option, which can be
 used to disable OSS emulation. On my home PC OSS emulation gives me a lot of
 annoying problems

svn path=/nixos/trunk/; revision=20351
---
 modules/services/audio/alsa.nix | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

diff --git a/modules/services/audio/alsa.nix b/modules/services/audio/alsa.nix
index 78d6a004418..81dd0ede208 100644
--- a/modules/services/audio/alsa.nix
+++ b/modules/services/audio/alsa.nix
@@ -26,6 +26,13 @@ in
         '';
         merge = mergeEnableOption;
       };
+      
+      enableOSSEmulation = mkOption {
+        default = true;
+	description = ''
+	  Whether to enable ALSA OSS emulation (with certain cards sound mixing may not work!).
+	'';
+      };
 
     };
     
@@ -53,9 +60,14 @@ in
             mkdir -m 0755 -p $(dirname ${soundState})
 
             # Load some additional modules.
-            for mod in snd_pcm_oss; do
-                ${config.system.sbin.modprobe}/sbin/modprobe $mod || true
-            done
+	    
+	    ${optionalString config.sound.enableOSSEmulation
+	      ''
+                for mod in snd_pcm_oss; do
+                  ${config.system.sbin.modprobe}/sbin/modprobe $mod || true
+                done
+	      ''
+	    }
 
             # Restore the sound state.
             ${alsaUtils}/sbin/alsactl -f ${soundState} restore
-- 
GitLab


From 1065e8664238b7466bfe43ec44a0672a72f5443d Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 4 Mar 2010 14:38:53 +0000
Subject: [PATCH 2245/5331] * In nixos-rebuild, build config.environment.nix
 before trying nixFallback or nixUnstable.

svn path=/nixos/trunk/; revision=20376
---
 modules/installer/tools/nixos-rebuild.sh | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/modules/installer/tools/nixos-rebuild.sh b/modules/installer/tools/nixos-rebuild.sh
index c5dce0a1807..5c1faf7eb4f 100644
--- a/modules/installer/tools/nixos-rebuild.sh
+++ b/modules/installer/tools/nixos-rebuild.sh
@@ -142,8 +142,10 @@ fi
 # more conservative.
 if test -n "$buildNix"; then
     echo "building Nix..." >&2
-    if ! nix-build $NIXOS -A nixFallback -o $tmpDir/nix $extraBuildFlags > /dev/null; then
-        nix-build $NIXPKGS -A nixUnstable -o $tmpDir/nix $extraBuildFlags > /dev/null
+    if ! nix-build $NIXOS -A config.environment.nix -o $tmpDir/nix $extraBuildFlags > /dev/null; then
+        if ! nix-build $NIXOS -A nixFallback -o $tmpDir/nix $extraBuildFlags > /dev/null; then
+            nix-build $NIXPKGS -A nixUnstable -o $tmpDir/nix $extraBuildFlags > /dev/null
+        fi
     fi
     PATH=$tmpDir/nix/bin:$PATH
 fi
-- 
GitLab


From dfb89ec8c3c278e33da5687a0640ae5e7cef0619 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Fri, 5 Mar 2010 11:05:37 +0000
Subject: [PATCH 2246/5331] nfs: the statd daemon should be started after nfs
 only if the nfs server is enabled.

OTH, I don't know why statd may depend at all on nfsd being started.


svn path=/nixos/trunk/; revision=20402
---
 modules/services/network-filesystems/nfs-kernel.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/services/network-filesystems/nfs-kernel.nix b/modules/services/network-filesystems/nfs-kernel.nix
index 24817c6178b..7987ae3ef65 100644
--- a/modules/services/network-filesystems/nfs-kernel.nix
+++ b/modules/services/network-filesystems/nfs-kernel.nix
@@ -151,7 +151,7 @@ in
 
             description = "Kernel NFS server - Network Status Monitor";
 
-            startOn = "started nfs-kernel-nfsd and started portmap";
+            startOn = "started ${if cfg.server.enable then "nfs-kernel-nfsd and " else ""} started portmap";
             stopOn = "stopping nfs-kernel-exports";
 
             preStart =
-- 
GitLab


From 0bb4ba3168471aec896e210c5b49efcca45c56e0 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 5 Mar 2010 18:42:37 +0000
Subject: [PATCH 2247/5331] svn path=/nixos/trunk/; revision=20430

---
 release.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/release.nix b/release.nix
index cecb773b434..e565e5b1d83 100644
--- a/release.nix
+++ b/release.nix
@@ -40,6 +40,7 @@ let
           echo "file iso" $iso/iso/*.iso* >> $out/nix-support/hydra-build-products
         ''; # */
 
+
   makeSystemTarball =
     { module, maintainers ? ["viric"]}:
     { nixosSrc ? {outPath = ./.; rev = 1234;}
-- 
GitLab


From 16e7565214ec52a538284e7043fe60acf3a2849e Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 9 Mar 2010 10:04:46 +0000
Subject: [PATCH 2248/5331] * The "STABLE" file is no longer used.

svn path=/nixos/trunk/; revision=20482
---
 STABLE | 1 -
 1 file changed, 1 deletion(-)
 delete mode 100644 STABLE

diff --git a/STABLE b/STABLE
deleted file mode 100644
index c227083464f..00000000000
--- a/STABLE
+++ /dev/null
@@ -1 +0,0 @@
-0
\ No newline at end of file
-- 
GitLab


From 358f3cd79c2b6711fcacca40e913db351641db4c Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 9 Mar 2010 10:14:45 +0000
Subject: [PATCH 2249/5331] * In tests/default.nix, only import
 lib/testing.nix.

svn path=/nixos/trunk/; revision=20483
---
 lib/testing.nix   | 2 ++
 tests/default.nix | 8 +-------
 2 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/lib/testing.nix b/lib/testing.nix
index 1b0c3889190..f9e275e5c8d 100644
--- a/lib/testing.nix
+++ b/lib/testing.nix
@@ -5,6 +5,8 @@ with pkgs;
 
 rec {
 
+  inherit pkgs;
+
 
   # Run an automated test suite in the given virtual network.
   # `network' must be the result of a call to the
diff --git a/tests/default.nix b/tests/default.nix
index 9c058ccadcc..a6a7b27fe2a 100644
--- a/tests/default.nix
+++ b/tests/default.nix
@@ -3,13 +3,7 @@
 , system ? builtins.currentSystem
 }:
 
-let
-
-  testLib = 
-    (import ../lib/build-vms.nix { inherit nixpkgs services system; }) //
-    (import ../lib/testing.nix { inherit nixpkgs services system; });
-
-in with testLib;
+with import ../lib/testing.nix { inherit nixpkgs services system; };
 
 {
   firefox = apply (import ./firefox.nix);
-- 
GitLab


From 89d599bab1ce2086e2fe9e40f3aa17fa4a72f121 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 9 Mar 2010 11:38:24 +0000
Subject: [PATCH 2250/5331] * When switching between virtual terminals, check
 whether   ConsoleKit/udev change device ownership to the logged in user.

svn path=/nixos/trunk/; revision=20485
---
 tests/login.nix | 19 +++++++++++++++----
 1 file changed, 15 insertions(+), 4 deletions(-)

diff --git a/tests/login.nix b/tests/login.nix
index ef00d191dce..78b54760849 100644
--- a/tests/login.nix
+++ b/tests/login.nix
@@ -18,9 +18,6 @@
       $machine->waitUntilSucceeds("pgrep -u alice bash");
       $machine->sendChars("touch done\n");
       $machine->waitForFile("/home/alice/done");
-      $machine->sendChars("exit\n");
-      $machine->waitUntilFails("pgrep -u alice bash");
-      $machine->screenshot("mingetty");
       
       # Check whether switching VTs works.
       $machine->sendKeys("alt-f10");
@@ -28,8 +25,22 @@
       $machine->execute("sleep 2"); # allow fbcondecor to catch up (not important)
       $machine->screenshot("syslog");
 
+      # Check whether ConsoleKit/udev gives and removes device
+      # ownership as needed.
+      $machine->mustSucceed("chvt 1");
+      $machine->execute("sleep 1"); # urgh
+      $machine->mustSucceed("getfacl /dev/snd/timer | grep -q alice");
+      $machine->mustSucceed("chvt 2");
+      $machine->execute("sleep 1"); # urgh
+      $machine->mustFail("getfacl /dev/snd/timer | grep -q alice");
+
+      # Log out.
+      $machine->mustSucceed("chvt 1");
+      $machine->sendChars("exit\n");
+      $machine->waitUntilFails("pgrep -u alice bash");
+      $machine->screenshot("mingetty");
+      
       # Check whether ctrl-alt-delete works.
-      $machine->sendKeys("alt-f1");
       $machine->sendKeys("ctrl-alt-delete");
       $machine->waitForShutdown;
     '';
-- 
GitLab


From a8aefffa09a28396bc6604071a7029d3747e37bd Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 9 Mar 2010 11:43:56 +0000
Subject: [PATCH 2251/5331] * Test whether logging into X assigns device
 ownership properly.

svn path=/nixos/trunk/; revision=20486
---
 tests/kde4.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/tests/kde4.nix b/tests/kde4.nix
index 3b91b738cb7..379863f6a22 100644
--- a/tests/kde4.nix
+++ b/tests/kde4.nix
@@ -38,6 +38,9 @@
     ''
       $machine->waitForWindow(qr/plasma-desktop/);
 
+      # Check that logging in has given the user ownership of devices.
+      $machine->mustSucceed("getfacl /dev/snd/timer | grep -q alice");
+
       $machine->execute("su - alice -c 'DISPLAY=:0.0 kwrite /var/log/messages &'");
       $machine->execute("su - alice -c 'DISPLAY=:0.0 konqueror http://localhost/ &'");
 
-- 
GitLab


From cfcb5a1544159febc61de491530bea561b07b553 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 9 Mar 2010 12:21:26 +0000
Subject: [PATCH 2252/5331] * Start of a GNU integration test (i.e. a variant
 of the NixOS   ISOs/tests that use the latest tarballs for GNU packages to
 provide   a regression test for those GNU projects).

svn path=/nixos/trunk/; revision=20488
---
 tests/default.nix         |  1 +
 tests/gnu-integration.nix | 20 ++++++++++++++++++++
 2 files changed, 21 insertions(+)
 create mode 100644 tests/gnu-integration.nix

diff --git a/tests/default.nix b/tests/default.nix
index a6a7b27fe2a..6806ca64adf 100644
--- a/tests/default.nix
+++ b/tests/default.nix
@@ -7,6 +7,7 @@ with import ../lib/testing.nix { inherit nixpkgs services system; };
 
 {
   firefox = apply (import ./firefox.nix);
+  gnuIntegration = apply (import ./gnu-integration.nix);
   installer = pkgs.lib.mapAttrs (name: complete) (call (import ./installer.nix));
   kde4 = apply (import ./kde4.nix);
   login = apply (import ./login.nix);
diff --git a/tests/gnu-integration.nix b/tests/gnu-integration.nix
new file mode 100644
index 00000000000..199df9538d5
--- /dev/null
+++ b/tests/gnu-integration.nix
@@ -0,0 +1,20 @@
+{ pkgs, ... }:
+
+{
+  machine =
+    { config, pkgs, ... }:
+
+    {
+      nixpkgs.config.packageOverrides = origPkgs: {
+        cpio = pkgs.lib.overrideDerivation origPkgs.cpio (origAttrs: {
+          src = /home/eelco/Dev/nixpkgs/cpio-2.10.91.tar.bz2;
+          patches = [];
+        });
+      };
+    };
+
+  testScript =
+    ''
+      $machine->mustSucceed("cpio --help");
+    '';
+}
-- 
GitLab


From 43d6b17d879a3247a118af1cde69cdebb70fe0a8 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 9 Mar 2010 13:31:20 +0000
Subject: [PATCH 2253/5331] * In the NixOS tests, send syslog messages to the
 serial port (so that   they appear in the build log of the test).

svn path=/nixos/trunk/; revision=20490
---
 modules/services/logging/syslogd.nix     | 10 ++++++++++
 modules/testing/test-instrumentation.nix |  7 ++++++-
 2 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/modules/services/logging/syslogd.nix b/modules/services/logging/syslogd.nix
index 7c3e54cadb0..64b158742ec 100644
--- a/modules/services/logging/syslogd.nix
+++ b/modules/services/logging/syslogd.nix
@@ -19,6 +19,8 @@ let
     *.crit                        /var/log/warn
 
     *.*;mail.none;local1.none    -/var/log/messages
+
+    ${config.services.syslogd.extraConfig}
   '';
 
 in
@@ -37,6 +39,14 @@ in
           messages.
         '';
       };
+
+      extraConfig = mkOption {
+        default = "";
+        example = "news.* -/var/log/news";
+        description = ''
+          Additional text appended to <filename>syslog.conf</filename>.
+        '';
+      };
       
     };
     
diff --git a/modules/testing/test-instrumentation.nix b/modules/testing/test-instrumentation.nix
index c404e044f63..5e62c698f27 100644
--- a/modules/testing/test-instrumentation.nix
+++ b/modules/testing/test-instrumentation.nix
@@ -74,7 +74,12 @@ in
 
     # `xwininfo' is used by the test driver to query open windows.
     environment.systemPackages = [ pkgs.xorg.xwininfo ];
-      
+
+    # Send all of /var/log/messages to the serial port (except for
+    # kernel messages through klogd, which already appear on the
+    # serial port).
+    services.syslogd.extraConfig = "*.*,kern.none /dev/ttyS0";
+
   };
 
 }
-- 
GitLab


From 48e9e1282ad65329007478453118cc695bf3577c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Tue, 9 Mar 2010 14:37:59 +0000
Subject: [PATCH 2254/5331] Fixing the evaluation of the "system tarball pc",
 adapting it to the latest nixpkgs changes about 'platform'.

svn path=/nixos/trunk/; revision=20494
---
 modules/services/mail/postfix.nix | 6 ++++--
 release.nix                       | 2 +-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/modules/services/mail/postfix.nix b/modules/services/mail/postfix.nix
index ae85dd43f23..93596028678 100644
--- a/modules/services/mail/postfix.nix
+++ b/modules/services/mail/postfix.nix
@@ -283,7 +283,9 @@ in
       # accurate way is unlikely to be better.
       { description = "Postfix mail server";
 
-        startOn = "started ${startingDependency}";
+        startOn = "started ${startingDependency} and filesystems";
+
+        daemonType = "fork";
 
         script =
           ''
@@ -304,7 +306,7 @@ in
 
             ${pkgs.postfix}/sbin/postalias -c /var/postfix/conf /var/postfix/conf/aliases
             
-            ${pkgs.postfix}/sbin/postfix -c /var/postfix/conf start
+            exec ${pkgs.postfix}/sbin/postfix -c /var/postfix/conf start
           ''; # */
 
       };
diff --git a/release.nix b/release.nix
index e565e5b1d83..a0144cc7536 100644
--- a/release.nix
+++ b/release.nix
@@ -65,7 +65,7 @@ let
     in
       tarball //
         { meta = {
-            description = "NixOS system tarball for ${system} - ${platform.name}";
+            description = "NixOS system tarball for ${system} - ${stdenv.platform.name}";
             maintainers = map (x: lib.getAttr x lib.maintainers) maintainers;
           };
         };
-- 
GitLab


From c4ae499f3d12b0b25fb01b918b64bae945ccfcea Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 10 Mar 2010 22:51:53 +0000
Subject: [PATCH 2255/5331] svn path=/nixos/trunk/; revision=20545

---
 lib/testing.nix | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/lib/testing.nix b/lib/testing.nix
index f9e275e5c8d..5e6b20e7514 100644
--- a/lib/testing.nix
+++ b/lib/testing.nix
@@ -83,6 +83,8 @@ rec {
       echo "report coverage $out/coverage" >> $out/nix-support/hydra-build-products
     ''; # */
 
+
+  # !!! Rename these functions to something more sensible.    
   call = f: f { inherit pkgs nixpkgs system; };
 
   apply = testFun: complete (call testFun);
@@ -96,5 +98,7 @@ rec {
     test = runTests vms t.testScript;
     report = makeReport test;
   };
-   
+
+  simpleTest = as: (apply ({ ... }: as)).test;
+
 }
-- 
GitLab


From 9f5d77f78d71a6057da556bf043f473dc035cc15 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Thu, 11 Mar 2010 12:56:40 +0000
Subject: [PATCH 2256/5331] Still problems with nfs-kernel with only the client
 enabled. Fix the upstart script 'start on' part.

svn path=/nixos/trunk/; revision=20555
---
 modules/services/network-filesystems/nfs-kernel.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/services/network-filesystems/nfs-kernel.nix b/modules/services/network-filesystems/nfs-kernel.nix
index 7987ae3ef65..c0cccac5343 100644
--- a/modules/services/network-filesystems/nfs-kernel.nix
+++ b/modules/services/network-filesystems/nfs-kernel.nix
@@ -151,7 +151,7 @@ in
 
             description = "Kernel NFS server - Network Status Monitor";
 
-            startOn = "started ${if cfg.server.enable then "nfs-kernel-nfsd and " else ""} started portmap";
+            startOn = "${if cfg.server.enable then "started nfs-kernel-nfsd and " else ""} started portmap";
             stopOn = "stopping nfs-kernel-exports";
 
             preStart =
-- 
GitLab


From 3fae175c104c43159ff1c3ac52effd7625f96b29 Mon Sep 17 00:00:00 2001
From: Rob Vermaas <rob.vermaas@gmail.com>
Date: Thu, 11 Mar 2010 13:11:06 +0000
Subject: [PATCH 2257/5331]  * nixos/lib/testing.nix: added runinmachine
 function to build derivation in machine given a nixos configuration

svn path=/nixos/trunk/; revision=20556
---
 lib/testing.nix | 40 ++++++++++++++++++++++++++++++++++++++++
 1 file changed, 40 insertions(+)

diff --git a/lib/testing.nix b/lib/testing.nix
index 5e6b20e7514..97de42f6546 100644
--- a/lib/testing.nix
+++ b/lib/testing.nix
@@ -99,6 +99,46 @@ rec {
     report = makeReport test;
   };
 
+  runInMachine = {
+    drv
+  , machine
+  , preBuild ? ""
+  , postBuild ? ""
+  }:
+    let
+      vms =
+        buildVirtualNetwork { nodes = { client = machine; } ; };
+
+      buildrunner = writeText "vm-build" ''
+        source $1
+        ${coreutils}/bin/mkdir -p $TMPDIR
+        exec $origBuilder $origArgs &> /hostfs/$TMPDIR/logzzzz
+      '';
+
+      testscript = ''
+        startAll;
+        ${preBuild}
+        print STDERR $client->mustSucceed("source ${buildrunner} /hostfs".$client->stateDir."/saved-env");
+        ${postBuild}
+      '';
+
+      vmRunCommand = writeText "vm-run" ''
+        ${coreutils}/bin/mkdir -p client
+        export > client/saved-env
+        export PATH=${qemu_kvm}/bin:${coreutils}/bin
+        cp ${./test-driver/Machine.pm} Machine.pm
+        export tests='${testscript}'
+        ${perl}/bin/perl ${./test-driver/test-driver.pl} ${vms}/vms/*/bin/run-*-vm
+      '';
+
+    in
+      lib.overrideDerivation drv (attrs: {
+        builder = "${bash}/bin/sh";
+        args = ["-e" vmRunCommand];
+        origArgs = attrs.args;
+        origBuilder = attrs.builder;
+      });
+   
   simpleTest = as: (apply ({ ... }: as)).test;
 
 }
-- 
GitLab


From 95f2e60c5d4c6b7a58a3f0dd938d38e2b9c9234f Mon Sep 17 00:00:00 2001
From: Rob Vermaas <rob.vermaas@gmail.com>
Date: Thu, 11 Mar 2010 13:12:17 +0000
Subject: [PATCH 2258/5331] remove debugging

svn path=/nixos/trunk/; revision=20557
---
 lib/testing.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/testing.nix b/lib/testing.nix
index 97de42f6546..f70cf9a7e71 100644
--- a/lib/testing.nix
+++ b/lib/testing.nix
@@ -112,7 +112,7 @@ rec {
       buildrunner = writeText "vm-build" ''
         source $1
         ${coreutils}/bin/mkdir -p $TMPDIR
-        exec $origBuilder $origArgs &> /hostfs/$TMPDIR/logzzzz
+        exec $origBuilder $origArgs 
       '';
 
       testscript = ''
-- 
GitLab


From 131b1e57fe5593fed88b541b5f943c35c95bf611 Mon Sep 17 00:00:00 2001
From: Rob Vermaas <rob.vermaas@gmail.com>
Date: Thu, 11 Mar 2010 15:09:10 +0000
Subject: [PATCH 2259/5331] nixos: add runinmachinewithx variant

svn path=/nixos/trunk/; revision=20561
---
 lib/testing.nix | 23 ++++++++++++++++++++++-
 1 file changed, 22 insertions(+), 1 deletion(-)

diff --git a/lib/testing.nix b/lib/testing.nix
index f70cf9a7e71..ca0b7297251 100644
--- a/lib/testing.nix
+++ b/lib/testing.nix
@@ -138,7 +138,28 @@ rec {
         origArgs = attrs.args;
         origBuilder = attrs.builder;
       });
-   
+
+  runInMachineWithX = args :
+    let
+      client =
+        { config, pkgs, ... }:
+        {
+          virtualisation.memorySize = 1024;
+          services.xserver.enable = true;
+          services.xserver.displayManager.slim.enable = false;
+          services.xserver.displayManager.auto.enable = true;
+          services.xserver.windowManager.default = "icewm";
+          services.xserver.windowManager.icewm.enable = true;
+          services.xserver.desktopManager.default = "none";
+        };
+    in
+      runInMachine ({
+            machine = client;
+            preBuild = ''
+              $client->waitForX ;
+            '' ;
+          } // args );   
+
   simpleTest = as: (apply ({ ... }: as)).test;
 
 }
-- 
GitLab


From a104f07a071c9223d5cf76f7649e74223cdce98b Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 11 Mar 2010 16:50:08 +0000
Subject: [PATCH 2260/5331] =?UTF-8?q?*=20Move=20the=20definition=20of=20th?=
 =?UTF-8?q?e=20Nix=20build=20users=20out=20of=20user-groups.nix=20to=20=20?=
 =?UTF-8?q?=20nix-daemon.nix.=20*=20Add=20an=20option=20=E2=80=98nix.nrBui?=
 =?UTF-8?q?ldUsers=E2=80=99=20to=20allow=20the=20number=20of=20build=20use?=
 =?UTF-8?q?rs=20=20=20to=20be=20overriden.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

svn path=/nixos/trunk/; revision=20571
---
 modules/config/users-groups.nix      | 16 +---------------
 modules/services/misc/nix-daemon.nix | 28 ++++++++++++++++++++++++++++
 2 files changed, 29 insertions(+), 15 deletions(-)

diff --git a/modules/config/users-groups.nix b/modules/config/users-groups.nix
index 1b66d3ff4c9..72d3e21f203 100644
--- a/modules/config/users-groups.nix
+++ b/modules/config/users-groups.nix
@@ -24,20 +24,6 @@ let
           }
         ];
 
-      makeNixBuildUser = nr:
-        { name = "nixbld${toString nr}";
-          description = "Nix build user ${toString nr}";
-
-          /* For consistency with the setgid(2), setuid(2), and setgroups(2)
-             calls in `libstore/build.cc', don't add any supplementary group
-             here.  */
-          uid = builtins.add ids.uids.nixbld nr;
-          group = "nixbld";
-          extraGroups = [];
-        };
-
-      nixBuildUsers = map makeNixBuildUser (pkgs.lib.range 1 10);
-      
       addAttrs =
         { name
         , description
@@ -52,7 +38,7 @@ let
         }:
         { inherit name description uid group extraGroups home shell createHome password; };
 
-    in map addAttrs (defaultUsers ++ nixBuildUsers ++ config.users.extraUsers);
+    in map addAttrs (defaultUsers ++ config.users.extraUsers);
 
 
   # Groups to be created/updated by NixOS.
diff --git a/modules/services/misc/nix-daemon.nix b/modules/services/misc/nix-daemon.nix
index ee7136212d5..f347fb8ce47 100644
--- a/modules/services/misc/nix-daemon.nix
+++ b/modules/services/misc/nix-daemon.nix
@@ -5,6 +5,18 @@ with pkgs.lib;
 let
 
   inherit (config.environment) nix;
+  
+  makeNixBuildUser = nr:
+    { name = "nixbld${toString nr}";
+      description = "Nix build user ${toString nr}";
+
+      /* For consistency with the setgid(2), setuid(2), and setgroups(2)
+         calls in `libstore/build.cc', don't add any supplementary group
+         here.  */
+      uid = builtins.add config.ids.uids.nixbld nr;
+      group = "nixbld";
+      extraGroups = [];
+    };
 
 in
 
@@ -148,6 +160,17 @@ in
           Environment variables used by Nix.
         ";
       };
+
+      nrBuildUsers = mkOption {
+        default = 10;
+        description = ''
+          Number of <literal>nixbld</literal> user accounts created to
+          perform secure concurrent builds.  If you receive an error
+          message saying that “all build users are currently in use”,
+          you should increase this value.
+        '';
+      };
+      
     };
   };
 
@@ -213,6 +236,9 @@ in
           ''
             export PATH=${if config.nix.distributedBuilds then "${pkgs.openssh}/bin:${pkgs.gzip}/bin:" else ""}${pkgs.openssl}/bin:${nix}/bin:$PATH
             ${config.nix.envVars}
+            # To reduce the load on Hydra, don't start all those
+            # unnecessary substituter processes.
+            export NIX_SUBSTITUTERS=
             exec \
               nice -n ${builtins.toString config.nix.daemonNiceLevel} \
               ${pkgs.utillinux}/bin/ionice -n ${builtins.toString config.nix.daemonIONiceLevel} \
@@ -261,6 +287,8 @@ in
         export ftp_proxy=${config.nix.proxy}
       '';
 
+    users.extraUsers = map makeNixBuildUser (pkgs.lib.range 1 config.nix.nrBuildUsers);
+
   };
 
 }
-- 
GitLab


From bcd3cd85f360817db18468ded2086d96267315dc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Thu, 11 Mar 2010 17:02:36 +0000
Subject: [PATCH 2261/5331] installation-cd: Add an `installer.basePackages'
 option.

svn path=/nixos/trunk/; revision=20573
---
 .../installer/cd-dvd/installation-cd-base.nix | 92 ++++++++++---------
 1 file changed, 51 insertions(+), 41 deletions(-)

diff --git a/modules/installer/cd-dvd/installation-cd-base.nix b/modules/installer/cd-dvd/installation-cd-base.nix
index 5008e149bc4..856dc7ec04d 100644
--- a/modules/installer/cd-dvd/installation-cd-base.nix
+++ b/modules/installer/cd-dvd/installation-cd-base.nix
@@ -24,7 +24,56 @@ let
         in live CDs.
       '';
     };
-  
+
+    installer.basePackages = mkOption {
+      description = ''
+        The list of base packages available in the system profile of the
+        installation CD.  Note that modules such as
+        <literal>installation-cd-graphical.nix</literal> add
+        packages to this list.
+      '';
+
+      default =
+        [ pkgs.subversion # for nixos-checkout
+          pkgs.w3m # needed for the manual anyway
+          pkgs.testdisk # useful for repairing boot problems
+          pkgs.mssys # for writing Microsoft boot sectors / MBRs
+          pkgs.parted
+          pkgs.ddrescue
+          pkgs.ccrypt
+          pkgs.cryptsetup # needed for dm-crypt volumes
+
+          # Some networking tools.
+          pkgs.sshfsFuse
+          pkgs.socat
+          pkgs.screen
+          pkgs.wpa_supplicant # !!! should use the wpa module
+
+          # Hardware-related tools.
+          pkgs.sdparm
+          pkgs.hdparm
+          pkgs.dmraid
+
+          # Tools to create / manipulate filesystems.
+          pkgs.ntfsprogs # for resizing NTFS partitions
+          pkgs.btrfsProgs
+          pkgs.xfsprogs
+          pkgs.jfsutils
+          pkgs.jfsrec
+
+          # Some compression/archiver tools.
+          pkgs.unrar
+          pkgs.unzip
+          pkgs.zip
+          pkgs.xz
+          pkgs.dar # disk archiver
+
+          # Some editors.
+          pkgs.nvi
+          pkgs.bvi # binary editor
+          pkgs.joe
+        ];
+     };
   };
 
 
@@ -99,46 +148,7 @@ in
 
   # Include some utilities that are useful for installing or repairing
   # the system.
-  environment.systemPackages =
-    [ pkgs.subversion # for nixos-checkout
-      pkgs.w3m # needed for the manual anyway
-      pkgs.testdisk # useful for repairing boot problems
-      pkgs.mssys # for writing Microsoft boot sectors / MBRs
-      pkgs.parted
-      pkgs.ddrescue
-      pkgs.ccrypt
-      pkgs.cryptsetup # needed for dm-crypt volumes
-
-      # Some networking tools.
-      pkgs.sshfsFuse
-      pkgs.socat
-      pkgs.screen
-      pkgs.wpa_supplicant # !!! should use the wpa module
-
-      # Hardware-related tools.
-      pkgs.sdparm
-      pkgs.hdparm
-      pkgs.dmraid
-
-      # Tools to create / manipulate filesystems.
-      pkgs.ntfsprogs # for resizing NTFS partitions
-      pkgs.btrfsProgs
-      pkgs.xfsprogs
-      pkgs.jfsutils
-      pkgs.jfsrec
-
-      # Some compression/archiver tools.
-      pkgs.unrar
-      pkgs.unzip
-      pkgs.zip
-      pkgs.xz
-      pkgs.dar # disk archiver
-      
-      # Some editors.
-      pkgs.nvi
-      pkgs.bvi # binary editor
-      pkgs.joe
-    ];
+  environment.systemPackages = config.installer.basePackages;
 
   # The initrd has to contain any module that might be necessary for
   # mounting the CD/DVD.
-- 
GitLab


From d1b4b7fd282e880541bd2d24a468e1514c5eae1d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Thu, 11 Mar 2010 17:02:49 +0000
Subject: [PATCH 2262/5331] Rename `services.sshd' to `services.openssh'.

svn path=/nixos/trunk/; revision=20574
---
 modules/rename.nix                       |  8 +++++++-
 modules/services/networking/ssh/sshd.nix | 25 +++++++++++-------------
 2 files changed, 18 insertions(+), 15 deletions(-)

diff --git a/modules/rename.nix b/modules/rename.nix
index 9b71c46d10d..dbbc23dcfdf 100644
--- a/modules/rename.nix
+++ b/modules/rename.nix
@@ -73,7 +73,13 @@ in zipModules ([]
 
 ++ rename obsolete "boot.initrd.extraKernelModules" to "boot.initrd.kernelModules"
 
-# X11
+# OpenSSH
+++ rename obsolete "services.sshd.ports" to "services.openssh.ports"
+++ rename obsolete "services.sshd.enable" to "services.openssh.enable"
+++ rename obsolete "services.sshd.allowSFTP" to "services.openssh.allowSFTP"
+++ rename obsolete "services.sshd.forwardX11" to "services.openssh.forwardX11"
+++ rename obsolete "services.sshd.gatewayPorts" to "services.openssh.gatewayPorts"
+++ rename obsolete "services.sshd.permitRootLogin" to "services.openssh.permitRootLogin"
 ++ rename obsolete "services.xserver.startSSHAgent" to "services.xserver.startOpenSSHAgent"
 
 # KDE
diff --git a/modules/services/networking/ssh/sshd.nix b/modules/services/networking/ssh/sshd.nix
index 61f169df97d..38812754a69 100644
--- a/modules/services/networking/ssh/sshd.nix
+++ b/modules/services/networking/ssh/sshd.nix
@@ -4,9 +4,7 @@ with pkgs.lib;
 
 let
 
-  inherit (pkgs) openssh;
-
-  cfg = config.services.sshd;
+  cfg = config.services.openssh;
 
   nssModulesPath = config.system.nssModules.path;
 
@@ -27,7 +25,7 @@ let
       "}
 
       ${if cfg.allowSFTP then "
-        Subsystem sftp ${openssh}/libexec/sftp-server
+        Subsystem sftp ${pkgs.openssh}/libexec/sftp-server
       " else "
       "}
 
@@ -49,13 +47,13 @@ in
   
   options = {
   
-    services.sshd = {
+    services.openssh = {
 
       enable = mkOption {
         default = false;
         description = ''
-          Whether to enable the Secure Shell daemon, which allows secure
-          remote logins.
+          Whether to enable the OpenSSH secure shell daemon, which
+          allows secure remote logins.
         '';
       };
 
@@ -111,21 +109,21 @@ in
 
   ###### implementation
 
-  config = mkIf config.services.sshd.enable {
+  config = mkIf config.services.openssh.enable {
 
     users.extraUsers = singleton
-      { name = "sshd";
+      { name = "opensshd";
         uid = config.ids.uids.sshd;
         description = "SSH privilege separation user";
         home = "/var/empty";
       };
 
     environment.etc = singleton
-      { source = "${openssh}/etc/ssh/moduli";
+      { source = "${pkgs.openssh}/etc/ssh/moduli";
         target = "ssh/moduli";
       };
 
-    jobs.sshd = {
+    jobs.openssh = {
 
         description = "OpenSSH server";
 
@@ -138,17 +136,16 @@ in
             mkdir -m 0755 -p /etc/ssh
 
             if ! test -f /etc/ssh/ssh_host_dsa_key; then
-                ${openssh}/bin/ssh-keygen -t dsa -b 1024 -f /etc/ssh/ssh_host_dsa_key -N ""
+                ${pkgs.openssh}/bin/ssh-keygen -t dsa -b 1024 -f /etc/ssh/ssh_host_dsa_key -N ""
             fi
           '';
 
         daemonType = "fork";
 
-        exec = "${openssh}/sbin/sshd -h /etc/ssh/ssh_host_dsa_key -f ${sshdConfig}";
+        exec = "${pkgs.openssh}/sbin/sshd -h /etc/ssh/ssh_host_dsa_key -f ${sshdConfig}";
       };
 
     networking.firewall.allowedTCPPorts = cfg.ports;
-          
   };
 
 }
-- 
GitLab


From 8e16742b7949b24781eb99158a117dff4922778f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Thu, 11 Mar 2010 17:02:53 +0000
Subject: [PATCH 2263/5331] Update users of `services.sshd'.

svn path=/nixos/trunk/; revision=20575
---
 modules/installer/cd-dvd/installation-cd-base.nix    | 4 ++--
 modules/installer/cd-dvd/installation-cd-minimal.nix | 2 +-
 modules/installer/cd-dvd/installation-cd-rescue.nix  | 2 +-
 modules/installer/cd-dvd/system-tarball-pc.nix       | 4 ++--
 modules/programs/ssh.nix                             | 2 +-
 modules/services/networking/ssh/sshd.nix             | 2 +-
 modules/virtualisation/amazon-image.nix              | 4 ++--
 tests/proxy.nix                                      | 2 +-
 tests/test-nixos-install-from-cd/module-insecure.nix | 2 +-
 tests/trac.nix                                       | 2 +-
 10 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/modules/installer/cd-dvd/installation-cd-base.nix b/modules/installer/cd-dvd/installation-cd-base.nix
index 856dc7ec04d..6eb4675a69c 100644
--- a/modules/installer/cd-dvd/installation-cd-base.nix
+++ b/modules/installer/cd-dvd/installation-cd-base.nix
@@ -112,7 +112,7 @@ let
 
         # Add your own options below and run "nixos-rebuild switch".
         # E.g.,
-        #   services.sshd.enable = true;
+        #   services.openssh.enable = true;
       }
     '';
   
@@ -246,6 +246,6 @@ in
   # Allow sshd to be started manually through "start sshd".  It should
   # not be started by default on the installation CD because the
   # default root password is empty.
-  services.sshd.enable = true;
+  services.openssh.enable = true;
   jobs.sshd.startOn = pkgs.lib.mkOverride 50 {} "";
 }
diff --git a/modules/installer/cd-dvd/installation-cd-minimal.nix b/modules/installer/cd-dvd/installation-cd-minimal.nix
index ae520e64101..4d85b7c8a80 100644
--- a/modules/installer/cd-dvd/installation-cd-minimal.nix
+++ b/modules/installer/cd-dvd/installation-cd-minimal.nix
@@ -9,7 +9,7 @@
   installer.configModule = "./nixos/modules/installer/cd-dvd/installation-cd-minimal.nix";
 
   # Don't include X libraries.
-  services.sshd.forwardX11 = false;
+  services.openssh.forwardX11 = false;
   services.dbus.enable = false; # depends on libX11
   services.hal.enable = false; # depends on dbus
   fonts.enableFontConfig = false;
diff --git a/modules/installer/cd-dvd/installation-cd-rescue.nix b/modules/installer/cd-dvd/installation-cd-rescue.nix
index dd3a72c49c6..9db626e5a9d 100644
--- a/modules/installer/cd-dvd/installation-cd-rescue.nix
+++ b/modules/installer/cd-dvd/installation-cd-rescue.nix
@@ -9,7 +9,7 @@
   installer.configModule = "./nixos/modules/installer/cd-dvd/installation-cd-minimal.nix";
 
   # Don't include X libraries.
-  services.sshd.forwardX11 = false;
+  services.openssh.forwardX11 = false;
   services.dbus.enable = false; # depends on libX11
   services.hal.enable = false; # depends on dbus
   fonts.enableFontConfig = false;
diff --git a/modules/installer/cd-dvd/system-tarball-pc.nix b/modules/installer/cd-dvd/system-tarball-pc.nix
index 7774876447b..3245a8c34b3 100644
--- a/modules/installer/cd-dvd/system-tarball-pc.nix
+++ b/modules/installer/cd-dvd/system-tarball-pc.nix
@@ -22,7 +22,7 @@ let
 
         # Add your own options below and run "nixos-rebuild switch".
         # E.g.,
-        #   services.sshd.enable = true;
+        #   services.openssh.enable = true;
       }
     '';
   
@@ -173,6 +173,6 @@ in
   # Allow sshd to be started manually through "start sshd".  It should
   # not be started by default on the installation CD because the
   # default root password is empty.
-  services.sshd.enable = true;
+  services.openssh.enable = true;
   jobs.sshd.startOn = pkgs.lib.mkOverride 50 {} "";
 }
diff --git a/modules/programs/ssh.nix b/modules/programs/ssh.nix
index c325a4bea34..ce07c4f3b32 100644
--- a/modules/programs/ssh.nix
+++ b/modules/programs/ssh.nix
@@ -7,7 +7,7 @@
     [ { # SSH configuration.  Slight duplication of the sshd_config
         # generation in the sshd service.
         source = pkgs.writeText "ssh_config" ''
-          ${if config.services.sshd.forwardX11 then ''
+          ${if config.services.openssh.forwardX11 then ''
             ForwardX11 yes
             XAuthLocation ${pkgs.xorg.xauth}/bin/xauth
           '' else ''
diff --git a/modules/services/networking/ssh/sshd.nix b/modules/services/networking/ssh/sshd.nix
index 38812754a69..e0fef518592 100644
--- a/modules/services/networking/ssh/sshd.nix
+++ b/modules/services/networking/ssh/sshd.nix
@@ -123,7 +123,7 @@ in
         target = "ssh/moduli";
       };
 
-    jobs.openssh = {
+    jobs.sshd = {
 
         description = "OpenSSH server";
 
diff --git a/modules/virtualisation/amazon-image.nix b/modules/virtualisation/amazon-image.nix
index f314f522887..acb0c22ab61 100644
--- a/modules/virtualisation/amazon-image.nix
+++ b/modules/virtualisation/amazon-image.nix
@@ -83,8 +83,8 @@ with pkgs.lib;
 
   # Allow root logins only using the SSH key that the user specified
   # at instance creation time.
-  services.sshd.enable = true;
-  services.sshd.permitRootLogin = "without-password";
+  services.openssh.enable = true;
+  services.openssh.permitRootLogin = "without-password";
 
   # Obtain the SSH key and host name at startup time.
   jobs.fetchEC2Data =
diff --git a/tests/proxy.nix b/tests/proxy.nix
index 81833060d43..685d5a36f5d 100644
--- a/tests/proxy.nix
+++ b/tests/proxy.nix
@@ -6,7 +6,7 @@ let
     { config, pkgs, ... }:
 
     {
-      services.sshd.enable = true;
+      services.openssh.enable = true;
 
       services.httpd.enable = true;
       services.httpd.adminAddr = "foo@example.org";
diff --git a/tests/test-nixos-install-from-cd/module-insecure.nix b/tests/test-nixos-install-from-cd/module-insecure.nix
index 68240204ff2..03bbc8e515a 100644
--- a/tests/test-nixos-install-from-cd/module-insecure.nix
+++ b/tests/test-nixos-install-from-cd/module-insecure.nix
@@ -11,7 +11,7 @@ in
 
 {
 
-  services.sshd = {
+  services.openssh = {
     enable = true;
     permitRootLogin = "yes";
   };
diff --git a/tests/trac.nix b/tests/trac.nix
index b9b73ad673e..837e1de5da8 100644
--- a/tests/trac.nix
+++ b/tests/trac.nix
@@ -16,7 +16,7 @@
     postgresql =
       {config, pkgs, ...}:
       {
-        services.sshd.enable = true;
+        services.openssh.enable = true;
         services.postgresql.enable = true;
         services.postgresql.enableTCPIP = true;
         services.postgresql.authentication = ''
-- 
GitLab


From a6b89666fd232ae12201824b0a58cee2245f368a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Thu, 11 Mar 2010 17:02:57 +0000
Subject: [PATCH 2264/5331] First stab at a GNU module.

svn path=/nixos/trunk/; revision=20576
---
 modules/config/gnu.nix  | 47 +++++++++++++++++++++++++++++++++++++++++
 modules/module-list.nix |  1 +
 2 files changed, 48 insertions(+)
 create mode 100644 modules/config/gnu.nix

diff --git a/modules/config/gnu.nix b/modules/config/gnu.nix
new file mode 100644
index 00000000000..43fcf71977d
--- /dev/null
+++ b/modules/config/gnu.nix
@@ -0,0 +1,47 @@
+{ config, pkgs, ... }:
+
+with pkgs.lib;
+
+{
+  options = {
+    gnu = mkOption {
+      default = false;
+      description =
+        '' When enable, GNU software is chosent by default whenever a there is
+           a choice between GNU and non-GNU software (e.g., GNU lsh
+           vs. OpenSSH).
+        '';
+    };
+  };
+
+  require =
+    [ ../installer/grub/grub.nix
+      ../services/networking/ssh/sshd.nix
+      ../services/networking/ssh/lshd.nix
+    ];
+
+  config = mkIf config.gnu {
+
+    environment.systemPackages = with pkgs;
+      # TODO: Adjust `requiredPackages' from `system-path.nix'.
+      # TODO: Add Inetutils once it has the new `ifconfig'.
+      [ grub2 parted fdisk
+        nano zile
+        texinfo # for the stand-alone Info reader
+      ];
+
+    # GNU GRUB.
+    boot.loader.grub.enable = true;
+    boot.loader.grub.version = 2;
+
+    # GNU lsh.
+    services.openssh.enable = false;
+    services.lshd.enable = true;
+    services.xserver.startOpenSSHAgent = false;
+    services.xserver.startGnuPGAgent = true;
+
+    # TODO: GNU dico.
+    # TODO: GNU Inetutils' inetd.
+    # TODO: GNU Pies.
+  };
+}
diff --git a/modules/module-list.nix b/modules/module-list.nix
index e51237f1ca0..3cf8096dac1 100644
--- a/modules/module-list.nix
+++ b/modules/module-list.nix
@@ -1,4 +1,5 @@
 [ ./config/fonts.nix
+  ./config/gnu.nix
   ./config/i18n.nix
   ./config/krb5.nix
   ./config/ldap.nix
-- 
GitLab


From 176f6c52dd28575410ff8cb342415505b78c51c0 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 11 Mar 2010 18:07:20 +0000
Subject: [PATCH 2265/5331] * Change the name of the SSH privilege separation
 user account back to   "sshd" because changing it to "opensshd" causes
 breakage (like the   activation script saying "useradd: UID 2 is not
 unique.").  Also,   OpenSSH requires it to be named "sshd", I think.

svn path=/nixos/trunk/; revision=20577
---
 modules/services/networking/ssh/sshd.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/services/networking/ssh/sshd.nix b/modules/services/networking/ssh/sshd.nix
index e0fef518592..dc1d8537142 100644
--- a/modules/services/networking/ssh/sshd.nix
+++ b/modules/services/networking/ssh/sshd.nix
@@ -112,7 +112,7 @@ in
   config = mkIf config.services.openssh.enable {
 
     users.extraUsers = singleton
-      { name = "opensshd";
+      { name = "sshd";
         uid = config.ids.uids.sshd;
         description = "SSH privilege separation user";
         home = "/var/empty";
-- 
GitLab


From 18542f64244125eabf2367eb450ac3f87d1ceef9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Thu, 11 Mar 2010 22:54:47 +0000
Subject: [PATCH 2266/5331] GNU: Don't require modules since we don't need to.

svn path=/nixos/trunk/; revision=20584
---
 modules/config/gnu.nix | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/modules/config/gnu.nix b/modules/config/gnu.nix
index 43fcf71977d..70ddca66876 100644
--- a/modules/config/gnu.nix
+++ b/modules/config/gnu.nix
@@ -14,12 +14,6 @@ with pkgs.lib;
     };
   };
 
-  require =
-    [ ../installer/grub/grub.nix
-      ../services/networking/ssh/sshd.nix
-      ../services/networking/ssh/lshd.nix
-    ];
-
   config = mkIf config.gnu {
 
     environment.systemPackages = with pkgs;
-- 
GitLab


From 5b5aefa0302c159d2b53ac9ef4879b5d7843d91a Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 15 Mar 2010 13:41:21 +0000
Subject: [PATCH 2267/5331] * Remove some obsolete stuff.

svn path=/nixos/trunk/; revision=20631
---
 modules/system/upstart/upstart.nix | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

diff --git a/modules/system/upstart/upstart.nix b/modules/system/upstart/upstart.nix
index 3fd9e2a5a22..74095d093ca 100644
--- a/modules/system/upstart/upstart.nix
+++ b/modules/system/upstart/upstart.nix
@@ -265,6 +265,7 @@ let
 
   
   upstartJob = {name, config, ...}: {
+  
     options = {
       jobDrv = mkOption {
         default = makeJob config;
@@ -282,6 +283,7 @@ let
         replaceChars ["<" ">" "*"] ["_" "_" "_name_"] name
       );
     };
+    
   };
 
 in
@@ -331,15 +333,6 @@ in
     # do status queries.
     services.dbus.packages = [ upstart ];
 
-    # !!! fix this
-    /*
-    tests.upstartJobs = { recurseForDerivations = true; } //
-      builtins.listToAttrs (map (job: {
-        name = removePrefix "upstart-" job.name;
-        value = job;
-      }) jobs);
-    */
-  
   };
 
 }
-- 
GitLab


From c1e313b5e1737018a46f903772eabf2e7fa49666 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 16 Mar 2010 12:10:06 +0000
Subject: [PATCH 2268/5331] * Remove obsolete references to kernelPackages in
 Nixpkgs.

svn path=/nixos/trunk/; revision=20647
---
 modules/installer/cd-dvd/installation-cd-rescue.nix | 3 +--
 modules/system/boot/kernel.nix                      | 9 ++-------
 release.nix                                         | 7 -------
 tests/installer.nix                                 | 3 +--
 4 files changed, 4 insertions(+), 18 deletions(-)

diff --git a/modules/installer/cd-dvd/installation-cd-rescue.nix b/modules/installer/cd-dvd/installation-cd-rescue.nix
index 9db626e5a9d..7b220680b6c 100644
--- a/modules/installer/cd-dvd/installation-cd-rescue.nix
+++ b/modules/installer/cd-dvd/installation-cd-rescue.nix
@@ -33,8 +33,7 @@
     lsof
   ];
 
-  boot.kernelPackages = (if (nixpkgs ? linuxlPackages then
-    pkgs.linuxPackages_2_6_32 else pkgs.kernelPackages_2_6_32);
+  boot.kernelPackages = pkgs.linuxPackages_2_6_32;
   boot.initrd.kernelModules = ["evdev" "i8042" "pcips2" "serio"
     "sd_mod" "libata" "unix" "usbhid" "uhci_hcd" "atkbd" "xtkbd" "fbdev"
     "iso9660" "udf" "loop"];
diff --git a/modules/system/boot/kernel.nix b/modules/system/boot/kernel.nix
index 66b83107ec2..99941c63a70 100644
--- a/modules/system/boot/kernel.nix
+++ b/modules/system/boot/kernel.nix
@@ -11,13 +11,8 @@ let kernel = config.boot.kernelPackages.kernel; in
   options = {
   
     boot.kernelPackages = mkOption {
-      default = (if pkgs ? linuxPackages then pkgs.linuxPackages
-        else pkgs.kernelPackages);
-      example = ''
-        Example code (copy & paste):
-        pkgs.kernelPackages_2_6_25
-      '';
-
+      default = pkgs.linuxPackages;
+      example = "pkgs.linuxPackages_2_6_25";
       description = ''
         This option allows you to override the Linux kernel used by
         NixOS.  Since things like external kernel module packages are
diff --git a/release.nix b/release.nix
index a0144cc7536..2441ff2952a 100644
--- a/release.nix
+++ b/release.nix
@@ -123,13 +123,6 @@ let
       description = "minimal";
     };
 
-    /*    
-    iso_rescue = makeIso {
-      module = ./modules/installer/cd-dvd/installation-cd-rescue.nix;
-      description = "rescue";
-    };
-    */
-    
     iso_graphical = makeIso {
       module = ./modules/installer/cd-dvd/installation-cd-graphical.nix;
       description = "graphical";
diff --git a/tests/installer.nix b/tests/installer.nix
index 657846ae074..10ac14332b0 100644
--- a/tests/installer.nix
+++ b/tests/installer.nix
@@ -78,8 +78,7 @@ let
       # Make the Nix store in this VM writable using AUFS.  Use Linux
       # 2.6.27 because 2.6.32 doesn't work (probably we need AUFS2).
       # This should probably be moved to qemu-vm.nix.
-      boot.kernelPackages = (if pkgs ? linuxPackages then
-        pkgs.linuxPackages_2_6_27 else pkgs.kernelPackages_2_6_27);
+      boot.kernelPackages = pkgs.linuxPackages_2_6_27;
       boot.extraModulePackages = [ config.boot.kernelPackages.aufs ];
       boot.initrd.availableKernelModules = [ "aufs" ];
 
-- 
GitLab


From 9d253ceca3dbd134b3b547aa7b8305f29fa45cf9 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 16 Mar 2010 12:10:50 +0000
Subject: [PATCH 2269/5331] * Remove the obsolete gnu-integration.nix.

svn path=/nixos/trunk/; revision=20648
---
 tests/default.nix         |  1 -
 tests/gnu-integration.nix | 20 --------------------
 2 files changed, 21 deletions(-)
 delete mode 100644 tests/gnu-integration.nix

diff --git a/tests/default.nix b/tests/default.nix
index 6806ca64adf..a6a7b27fe2a 100644
--- a/tests/default.nix
+++ b/tests/default.nix
@@ -7,7 +7,6 @@ with import ../lib/testing.nix { inherit nixpkgs services system; };
 
 {
   firefox = apply (import ./firefox.nix);
-  gnuIntegration = apply (import ./gnu-integration.nix);
   installer = pkgs.lib.mapAttrs (name: complete) (call (import ./installer.nix));
   kde4 = apply (import ./kde4.nix);
   login = apply (import ./login.nix);
diff --git a/tests/gnu-integration.nix b/tests/gnu-integration.nix
deleted file mode 100644
index 199df9538d5..00000000000
--- a/tests/gnu-integration.nix
+++ /dev/null
@@ -1,20 +0,0 @@
-{ pkgs, ... }:
-
-{
-  machine =
-    { config, pkgs, ... }:
-
-    {
-      nixpkgs.config.packageOverrides = origPkgs: {
-        cpio = pkgs.lib.overrideDerivation origPkgs.cpio (origAttrs: {
-          src = /home/eelco/Dev/nixpkgs/cpio-2.10.91.tar.bz2;
-          patches = [];
-        });
-      };
-    };
-
-  testScript =
-    ''
-      $machine->mustSucceed("cpio --help");
-    '';
-}
-- 
GitLab


From bd81b7a1738deb97d4c1ddd930d207056824592b Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 16 Mar 2010 15:15:17 +0000
Subject: [PATCH 2270/5331] * Urgh, this should never have been committed.

svn path=/nixos/trunk/; revision=20660
---
 modules/services/misc/nix-daemon.nix | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/modules/services/misc/nix-daemon.nix b/modules/services/misc/nix-daemon.nix
index f347fb8ce47..a39361e7fc7 100644
--- a/modules/services/misc/nix-daemon.nix
+++ b/modules/services/misc/nix-daemon.nix
@@ -236,9 +236,6 @@ in
           ''
             export PATH=${if config.nix.distributedBuilds then "${pkgs.openssh}/bin:${pkgs.gzip}/bin:" else ""}${pkgs.openssl}/bin:${nix}/bin:$PATH
             ${config.nix.envVars}
-            # To reduce the load on Hydra, don't start all those
-            # unnecessary substituter processes.
-            export NIX_SUBSTITUTERS=
             exec \
               nice -n ${builtins.toString config.nix.daemonNiceLevel} \
               ${pkgs.utillinux}/bin/ionice -n ${builtins.toString config.nix.daemonIONiceLevel} \
-- 
GitLab


From 11f8647d73742558a300aff247528251acad7833 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Tue, 16 Mar 2010 16:34:27 +0000
Subject: [PATCH 2271/5331] Add a default share to Samba to make creating
 simple fileserver easier

svn path=/nixos/trunk/; revision=20665
---
 .../services/network-filesystems/samba.nix    | 23 +++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/modules/services/network-filesystems/samba.nix b/modules/services/network-filesystems/samba.nix
index 814ca7e2316..be7406cd5df 100644
--- a/modules/services/network-filesystems/samba.nix
+++ b/modules/services/network-filesystems/samba.nix
@@ -49,6 +49,13 @@ let
       private dir = ${privateDir}
       ${optionalString cfg.syncPasswordsByPam "pam password change = true"}
 
+      ${if cfg.defaultShare.enable then ''
+      [default]
+      path = /home/smbd
+      read only = ${if cfg.defaultShare.writeable then "no" else "yes"}
+      guest ok = ${if cfg.defaultShare.guest then "yes" else "no"}
+      ''else ""}
+
       ${cfg.extraConfig}
     '';
 
@@ -136,6 +143,22 @@ in
           internal use to pass filepath to samba pam module
         ";
       };
+
+      defaultShare = {
+        enable = mkOption {
+	  description = "Whether to share /home/smbd as 'default'";
+	  default = false;
+	};
+        writeable = mkOption {
+	  description = "Whether to allow write access to default share";
+	  default = false;
+	};
+        guest = mkOption {
+	  description = "Whether to allow guest access to default share";
+	  default = true;
+	};
+      };
+
     };
 
   };
-- 
GitLab


From 6788d457dca309e35fd2d1a9902a6fde3920443e Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Tue, 16 Mar 2010 17:17:37 +0000
Subject: [PATCH 2272/5331] Make security type configurable

svn path=/nixos/trunk/; revision=20667
---
 modules/services/network-filesystems/samba.nix | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/modules/services/network-filesystems/samba.nix b/modules/services/network-filesystems/samba.nix
index be7406cd5df..29c44d46e68 100644
--- a/modules/services/network-filesystems/samba.nix
+++ b/modules/services/network-filesystems/samba.nix
@@ -124,7 +124,7 @@ in
             log file = /var/log/samba/log.%m
             log level = 10
             max log size = 50000
-            security = user
+            security = ${cfg.securityType}
 
             client lanman auth = Yes
             dns proxy = no
@@ -159,6 +159,12 @@ in
 	};
       };
 
+      securityType = mkOption {
+        description = "Samba security type";
+	default = "user";
+	example = "share";
+      };
+
     };
 
   };
-- 
GitLab


From 97c20c8f4d9ad03343e435cc5531ef6f4dc0ca7b Mon Sep 17 00:00:00 2001
From: Sander van der Burg <s.vanderburg@tudelft.nl>
Date: Thu, 18 Mar 2010 13:07:56 +0000
Subject: [PATCH 2273/5331] Added openssh testcase

svn path=/nixos/trunk/; revision=20732
---
 release.nix       |  1 +
 tests/default.nix |  1 +
 tests/openssh.nix | 35 +++++++++++++++++++++++++++++++++++
 3 files changed, 37 insertions(+)
 create mode 100644 tests/openssh.nix

diff --git a/release.nix b/release.nix
index 2441ff2952a..eb9fb3731f7 100644
--- a/release.nix
+++ b/release.nix
@@ -154,6 +154,7 @@ let
         installer.simple = t.installer.simple.test;
         kde4 = t.kde4.test;
         login = t.login.test;
+	openssh = t.openssh.test;
         proxy = t.proxy.test;
         quake3 = t.quake3.test;
         subversion = t.subversion.report;
diff --git a/tests/default.nix b/tests/default.nix
index a6a7b27fe2a..90d629f7978 100644
--- a/tests/default.nix
+++ b/tests/default.nix
@@ -10,6 +10,7 @@ with import ../lib/testing.nix { inherit nixpkgs services system; };
   installer = pkgs.lib.mapAttrs (name: complete) (call (import ./installer.nix));
   kde4 = apply (import ./kde4.nix);
   login = apply (import ./login.nix);
+  openssh = apply (import ./openssh.nix);
   portmap = apply (import ./portmap.nix);
   proxy = apply (import ./proxy.nix);
   quake3 = apply (import ./quake3.nix);
diff --git a/tests/openssh.nix b/tests/openssh.nix
new file mode 100644
index 00000000000..c6875bcc73c
--- /dev/null
+++ b/tests/openssh.nix
@@ -0,0 +1,35 @@
+{pkgs, ...}:
+
+{
+  nodes = {
+    server = 
+      {pkgs, config, ...}:
+      
+      {
+        services.openssh.enable = true;
+      }
+    ;
+    client = 
+      {pkgs, config, ...}:
+      
+      {
+      }      
+    ;
+  };
+  
+  testScript =
+  ''
+    my $key=`${pkgs.openssh}/bin/ssh-keygen -t dsa -f key -N ""`;
+    
+    $server->mustSucceed("mkdir /root/.ssh");
+    $server->mustSucceed("chmod 700 /root/.ssh");
+    $server->copyFileFromHost("key.pub", "/root/.ssh/authorized_keys");
+    
+    $client->mustSucceed("mkdir /root/.ssh");
+    $client->mustSucceed("chmod 700 /root/.ssh");
+    $client->copyFileFromHost("key", "/root/.ssh/id_dsa");
+    $client->mustSucceed("chmod 600 /root/.ssh/id_dsa");
+    
+    $client->mustSucceed("ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no server 'echo hello world'");
+  '';
+}
-- 
GitLab


From b90495479309227125952cf95134b37bb8bec869 Mon Sep 17 00:00:00 2001
From: Sander van der Burg <s.vanderburg@tudelft.nl>
Date: Thu, 1 Apr 2010 14:53:17 +0000
Subject: [PATCH 2274/5331] Updated disnix service for the 0.1 release

svn path=/nixos/trunk/; revision=20917
---
 modules/services/misc/disnix.nix | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/modules/services/misc/disnix.nix b/modules/services/misc/disnix.nix
index 886c86e7fab..67d5df84701 100644
--- a/modules/services/misc/disnix.nix
+++ b/modules/services/misc/disnix.nix
@@ -42,12 +42,11 @@ in
         startOn = "started dbus";
 
         script =
-          ''    
-            export ACTIVATION_SCRIPTS=${pkgs.disnix_activation_scripts}/libexec/disnix/activation-scripts
-            export PATH=${pkgs.nixUnstable}/bin
+          ''                
+            export PATH=/var/run/current-system/sw/bin:/var/run/current-system/sw/sbin
             export HOME=/root
 	
-            ${pkgs.disnix}/bin/disnix-service
+            ${pkgs.disnix}/bin/disnix-service --activation-modules-dir=${pkgs.disnix_activation_scripts}/libexec/disnix/activation-scripts
           '';
       };
 
-- 
GitLab


From 02e4a78c71e94d6478b96d3a1fe8f7e52aa6c808 Mon Sep 17 00:00:00 2001
From: Sander van der Burg <s.vanderburg@tudelft.nl>
Date: Mon, 5 Apr 2010 20:35:08 +0000
Subject: [PATCH 2275/5331] Disnix should also remain active during a switch

svn path=/nixos/trunk/; revision=20949
---
 modules/system/activation/switch-to-configuration.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/system/activation/switch-to-configuration.sh b/modules/system/activation/switch-to-configuration.sh
index 207b17fd4ca..3a25d574a72 100644
--- a/modules/system/activation/switch-to-configuration.sh
+++ b/modules/system/activation/switch-to-configuration.sh
@@ -105,7 +105,7 @@ EOF
         # Another hack: don't restart the X server (that would kill all the clients).
         # And don't restart dbus, since that causes ConsoleKit to
         # forget about current sessions.
-        if echo "$job" | grep -q "^shutdown$\|^control-alt-delete$\|^xserver$\|^dbus$"; then continue; fi
+        if echo "$job" | grep -q "^shutdown$\|^control-alt-delete$\|^xserver$\|^dbus$\|^disnix$"; then continue; fi
 
         if ! test -e "$oldJobs/$job.conf"; then
             echo "starting $job..."
-- 
GitLab


From 755ee8bd0829475a9bb19508b174a524c2a41c00 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 6 Apr 2010 11:57:15 +0000
Subject: [PATCH 2276/5331] * Add a configuration option
 `services.printing.cupsdConf' to allow   appending verbatim text to the CUPS
 daemon configuration file. * cupsd.conf: set ErrorLog properly.

svn path=/nixos/trunk/; revision=20954
---
 modules/services/printing/cupsd.nix | 147 +++++++++++++++-------------
 1 file changed, 77 insertions(+), 70 deletions(-)

diff --git a/modules/services/printing/cupsd.nix b/modules/services/printing/cupsd.nix
index 546eb7be396..e9e03251421 100644
--- a/modules/services/printing/cupsd.nix
+++ b/modules/services/printing/cupsd.nix
@@ -39,75 +39,6 @@ let
       ln -s ${pkgs.ghostscript}/lib/cups/filter/* $out/lib/cups/filter/
       ${cfg.bindirCmds}
     ''; # */
-  
-
-  cupsdConfig = pkgs.writeText "cupsd.conf"
-    ''
-      LogLevel debug
-
-      SystemGroup root
-
-      Listen localhost:631
-      Listen /var/run/cups/cups.sock
-
-      # Note: we can't use ${cups}/etc/cups as the ServerRoot, since
-      # CUPS will write in the ServerRoot when e.g. adding new printers
-      # through the web interface.
-      ServerRoot /etc/cups
-
-      ServerBin ${bindir}/lib/cups
-
-      AccessLog ${logDir}/access_log
-      ErrorLog ${logDir}/access_log
-      PageLog ${logDir}/page_log
-
-      TempDir /tmp
-
-      Browsing On
-      BrowseOrder allow,deny
-      BrowseAllow @LOCAL
-
-      DefaultAuthType Basic
-
-      <Location />
-        Order allow,deny
-        Allow localhost
-      </Location>
-
-      <Location /admin>
-        Order allow,deny
-        Allow localhost
-      </Location>
-
-      <Location /admin/conf>
-        AuthType Basic
-        Require user @SYSTEM
-        Order allow,deny
-        Allow localhost
-      </Location>
-
-      <Policy default>
-        <Limit Send-Document Send-URI Hold-Job Release-Job Restart-Job Purge-Jobs Set-Job-Attributes Create-Job-Subscription Renew-Subscription Cancel-Subscription Get-Notifications Reprocess-Job Cancel-Current-Job Suspend-Current-Job Resume-Job CUPS-Move-Job>
-          Require user @OWNER @SYSTEM
-          Order deny,allow
-        </Limit>
-
-        <Limit Pause-Printer Resume-Printer Set-Printer-Attributes Enable-Printer Disable-Printer Pause-Printer-After-Current-Job Hold-New-Jobs Release-Held-New-Jobs Deactivate-Printer Activate-Printer Restart-Printer Shutdown-Printer Startup-Printer Promote-Job Schedule-Job-After CUPS-Add-Printer CUPS-Delete-Printer CUPS-Add-Class CUPS-Delete-Class CUPS-Accept-Jobs CUPS-Reject-Jobs CUPS-Set-Default>
-          AuthType Basic
-          Require user @SYSTEM
-          Order deny,allow
-        </Limit>
-
-        <Limit Cancel-Job CUPS-Authenticate-Job>
-          Require user @OWNER @SYSTEM
-          Order deny,allow
-        </Limit>
-
-        <Limit All>
-          Order deny,allow
-        </Limit>
-      </Policy>
-    '';
 
 in
 
@@ -134,6 +65,14 @@ in
         '';
       };
 
+      cupsdConf = mkOption {
+        default = "";
+        description = ''
+          The contents of the configuration file of the CUPS daemon
+          (<filename>cupsd.conf</filename>).
+        '';
+      };
+
     };
 
   };
@@ -173,9 +112,77 @@ in
             ${modprobe}/sbin/modprobe usblp || true
           '';
 
-        exec = "${cups}/sbin/cupsd -c ${cupsdConfig} -F";
+        exec = "${cups}/sbin/cupsd -c ${pkgs.writeText "cupsd.conf" cfg.cupsdConf} -F";
       };
 
+    services.printing.cupsdConf = 
+      ''
+        LogLevel debug
+
+        SystemGroup root
+
+        Listen localhost:631
+        Listen /var/run/cups/cups.sock
+
+        # Note: we can't use ${cups}/etc/cups as the ServerRoot, since
+        # CUPS will write in the ServerRoot when e.g. adding new printers
+        # through the web interface.
+        ServerRoot /etc/cups
+
+        ServerBin ${bindir}/lib/cups
+
+        AccessLog ${logDir}/access_log
+        ErrorLog ${logDir}/error_log
+        PageLog ${logDir}/page_log
+
+        TempDir /tmp
+
+        Browsing On
+        BrowseOrder allow,deny
+        BrowseAllow @LOCAL
+
+        DefaultAuthType Basic
+
+        <Location />
+          Order allow,deny
+          Allow localhost
+        </Location>
+
+        <Location /admin>
+          Order allow,deny
+          Allow localhost
+        </Location>
+
+        <Location /admin/conf>
+          AuthType Basic
+          Require user @SYSTEM
+          Order allow,deny
+          Allow localhost
+        </Location>
+
+        <Policy default>
+          <Limit Send-Document Send-URI Hold-Job Release-Job Restart-Job Purge-Jobs Set-Job-Attributes Create-Job-Subscription Renew-Subscription Cancel-Subscription Get-Notifications Reprocess-Job Cancel-Current-Job Suspend-Current-Job Resume-Job CUPS-Move-Job>
+            Require user @OWNER @SYSTEM
+            Order deny,allow
+          </Limit>
+
+          <Limit Pause-Printer Resume-Printer Set-Printer-Attributes Enable-Printer Disable-Printer Pause-Printer-After-Current-Job Hold-New-Jobs Release-Held-New-Jobs Deactivate-Printer Activate-Printer Restart-Printer Shutdown-Printer Startup-Printer Promote-Job Schedule-Job-After CUPS-Add-Printer CUPS-Delete-Printer CUPS-Add-Class CUPS-Delete-Class CUPS-Accept-Jobs CUPS-Reject-Jobs CUPS-Set-Default>
+            AuthType Basic
+            Require user @SYSTEM
+            Order deny,allow
+          </Limit>
+
+          <Limit Cancel-Job CUPS-Authenticate-Job>
+            Require user @OWNER @SYSTEM
+            Order deny,allow
+          </Limit>
+
+          <Limit All>
+            Order deny,allow
+          </Limit>
+        </Policy>
+      '';
+
   };
   
 }
-- 
GitLab


From 6c710f7d2b39dd9b38ea346f20c7f9b4bd53dcdc Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 6 Apr 2010 13:25:00 +0000
Subject: [PATCH 2277/5331] * Provide an example for
 services.printing.cupsdConf. * Change the default CUPS log level to "info".

svn path=/nixos/trunk/; revision=20957
---
 modules/services/printing/cupsd.nix | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/modules/services/printing/cupsd.nix b/modules/services/printing/cupsd.nix
index e9e03251421..fb430df5b90 100644
--- a/modules/services/printing/cupsd.nix
+++ b/modules/services/printing/cupsd.nix
@@ -67,6 +67,11 @@ in
 
       cupsdConf = mkOption {
         default = "";
+        example =
+          ''
+            BrowsePoll cups.example.com
+            LogLevel debug
+          '';
         description = ''
           The contents of the configuration file of the CUPS daemon
           (<filename>cupsd.conf</filename>).
@@ -117,7 +122,7 @@ in
 
     services.printing.cupsdConf = 
       ''
-        LogLevel debug
+        LogLevel info
 
         SystemGroup root
 
-- 
GitLab


From e3afda0a88d5e2adb2997434034930c36f666bf1 Mon Sep 17 00:00:00 2001
From: "Yury G. Kudryashov" <urkud.urkud@gmail.com>
Date: Thu, 8 Apr 2010 09:19:10 +0000
Subject: [PATCH 2278/5331] Don't use deprecated config options

svn path=/nixos/trunk/; revision=20979
---
 doc/config-examples/basic.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/doc/config-examples/basic.nix b/doc/config-examples/basic.nix
index 718cfb7f83c..976630d0607 100644
--- a/doc/config-examples/basic.nix
+++ b/doc/config-examples/basic.nix
@@ -1,6 +1,6 @@
 {
   boot = {
-    grubDevice = "/dev/sda";
+    loader.grub.device = "/dev/sda";
   };
 
   fileSystems = [
@@ -14,7 +14,7 @@
   ];
   
   services = {
-    sshd = {
+    openssh = {
       enable = true;
     };
   };
-- 
GitLab


From 289dcec9db00e2086a45c37065e6556d4e3fd8e6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andres=20L=C3=B6h?= <mail@andres-loeh.de>
Date: Thu, 8 Apr 2010 15:27:20 +0000
Subject: [PATCH 2279/5331] Make acpid actions configurable.

svn path=/nixos/trunk/; revision=20986
---
 modules/services/hardware/acpid.nix | 20 +++++++++++++++++++-
 1 file changed, 19 insertions(+), 1 deletion(-)

diff --git a/modules/services/hardware/acpid.nix b/modules/services/hardware/acpid.nix
index e9fd8e46dc9..a846f3b7117 100644
--- a/modules/services/hardware/acpid.nix
+++ b/modules/services/hardware/acpid.nix
@@ -29,6 +29,7 @@ let
       action = 
         ''
           #! ${pkgs.bash}/bin/sh
+          ${config.services.acpid.powerEventCommands}
         '';
     };
   
@@ -39,6 +40,7 @@ let
       action =
         ''
           #! ${pkgs.bash}/bin/sh
+          ${config.services.acpid.lidEventCommands}
         '';
     };
   
@@ -49,6 +51,7 @@ let
       action = 
         ''
           #! ${pkgs.bash}/bin/sh
+          ${config.services.acpid.acEventCommands}
         '';
     };
 
@@ -66,7 +69,22 @@ in
         default = false;
         description = "Whether to enable the ACPI daemon.";
       };
-      
+
+      powerEventCommands = mkOption {
+        default = "";
+        description = "Shell commands to execute on a button/power.* event.";
+      };
+
+      lidEventCommands = mkOption {
+        default = "";
+        description = "Shell commands to execute on a button/lid.* event.";
+      };
+
+      acEventCommands = mkOption {
+        default = "";
+        description = "Shell commands to execute on a ac_adapter.* event.";
+      };
+
     };
     
   };
-- 
GitLab


From eea16605325cbde61c7454c10c25dd79689330f9 Mon Sep 17 00:00:00 2001
From: "Yury G. Kudryashov" <urkud.urkud@gmail.com>
Date: Sun, 11 Apr 2010 14:47:06 +0000
Subject: [PATCH 2280/5331] no-x-libs: s/sshd/openssh/

svn path=/nixos/trunk/; revision=21009
---
 modules/config/no-x-libs.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/config/no-x-libs.nix b/modules/config/no-x-libs.nix
index fbefc5b6b3e..667d1b8e905 100644
--- a/modules/config/no-x-libs.nix
+++ b/modules/config/no-x-libs.nix
@@ -7,14 +7,14 @@
       example = true;
       description = ''
         Switch off the options in the default configuration that require X libraries.
-	Currently this includes: sshd.forwardX11, dbus, hal, fonts.enableCoreFonts,
+	Currently this includes: openssh.forwardX11, dbus, hal, fonts.enableCoreFonts,
 	fonts.enableFontConfig
       '';
     };
   };
   config = pkgs.lib.mkIf config.environment.noXlibs {
     services = {
-      sshd = {
+      openssh = {
         forwardX11 = false;
       };
       dbus.enable = false;
-- 
GitLab


From 9cce36182d8beb60ae9b28fa828ca0d4cc3aae51 Mon Sep 17 00:00:00 2001
From: "Yury G. Kudryashov" <urkud.urkud@gmail.com>
Date: Sun, 11 Apr 2010 20:41:06 +0000
Subject: [PATCH 2281/5331] Remove linuxwacom: it is not compatible with new
 xserver

svn path=/nixos/trunk/; revision=21015
---
 modules/module-list.nix                 |  1 -
 modules/services/x11/hardware/wacom.nix | 88 -------------------------
 modules/services/x11/xserver.nix        |  2 +-
 3 files changed, 1 insertion(+), 90 deletions(-)
 delete mode 100644 modules/services/x11/hardware/wacom.nix

diff --git a/modules/module-list.nix b/modules/module-list.nix
index 3cf8096dac1..58446c37e8d 100644
--- a/modules/module-list.nix
+++ b/modules/module-list.nix
@@ -120,7 +120,6 @@
   ./services/x11/display-managers/kdm.nix
   ./services/x11/display-managers/slim.nix
   ./services/x11/hardware/synaptics.nix
-  ./services/x11/hardware/wacom.nix
   ./services/x11/window-managers/compiz.nix
   ./services/x11/window-managers/default.nix
   ./services/x11/window-managers/icewm.nix
diff --git a/modules/services/x11/hardware/wacom.nix b/modules/services/x11/hardware/wacom.nix
deleted file mode 100644
index 2ad2c12c495..00000000000
--- a/modules/services/x11/hardware/wacom.nix
+++ /dev/null
@@ -1,88 +0,0 @@
-{ config, pkgs, ... }:
-
-with pkgs.lib;
-
-let
-
-  cfg = config.services.xserver.wacom;
-
-in
-
-{
-
-  options = {
-
-    services.xserver.wacom = {
-      
-      enable = mkOption {
-        default = false;
-        description = "Whether to enable the Wacom touchscreen/digitizer.";
-      };
-
-      device = mkOption {
-        default = "/dev/ttyS0";
-        description = "Device to use.";
-      };
-
-      forceDeviceType = mkOption {
-        default = "ISDV4";
-        example = null;
-        description = "Some models (think touchscreen) require the device type to be specified.";
-      };
-
-    };
-
-  };
-
-
-  config = mkIf cfg.enable {
-
-    services.xserver.modules = [ pkgs.linuxwacom ];
-
-    services.udev.packages = [ pkgs.linuxwacom ];
-
-    services.xserver.serverLayoutSection =
-      ''
-        InputDevice "Wacom_stylus"
-        InputDevice "Wacom_cursor"
-        InputDevice "Wacom_eraser"
-      '';
-
-    services.xserver.config =
-      ''
-        Section "InputDevice"
-          Driver "wacom"
-          Identifier "Wacom_stylus"
-          Option "Device" "${cfg.device}"
-          Option "Type" "stylus"
-          ${optionalString (cfg.forceDeviceType != null) ''
-            Option "ForceDevice" "${cfg.forceDeviceType}"
-          ''}
-          Option "Button2" "3"
-        EndSection
-        
-        Section "InputDevice"
-          Driver "wacom"
-          Identifier "Wacom_eraser"
-          Option "Device" "${cfg.device}"
-          Option "Type" "eraser"
-          ${optionalString (cfg.forceDeviceType != null) ''
-            Option "ForceDevice" "${cfg.forceDeviceType}"
-          ''}
-          Option "Button1" "2"
-        EndSection
-        
-        Section "InputDevice"
-          Driver "wacom"
-          Identifier "Wacom_cursor"
-          Option "Device" "${cfg.device}"
-          Option "Type" "cursor"
-          ${optionalString (cfg.forceDeviceType != null) ''
-            Option "ForceDevice" "${cfg.forceDeviceType}"
-          ''}
-        EndSection
-      '';
-        
-  };
-
-}
diff --git a/modules/services/x11/xserver.nix b/modules/services/x11/xserver.nix
index e40800074e7..e1f62f89c11 100644
--- a/modules/services/x11/xserver.nix
+++ b/modules/services/x11/xserver.nix
@@ -155,7 +155,7 @@ in
 
       modules = mkOption {
         default = [];
-        example = [ pkgs.linuxwacom ];
+        example = [ pkgs.synaptics ];
         description = "Packages to be added to the module search path of the X server.";
       };
 
-- 
GitLab


From 4c9ff7f904dd29fb6fd3d29d1fa6ba1d0808a4e4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Tue, 13 Apr 2010 22:47:34 +0000
Subject: [PATCH 2282/5331] Making postfix properly start on boot. We could not
 start on 'filesystems', because filesystems is written as an upstart task.

Additionally, as upstart calls the postfix start/stop script and it does not act as a
daemon, we write it as a preStart/postStop job. Then we don't have monitoring or respawn,
but at least upstart does not get confused on its state.


svn path=/nixos/trunk/; revision=21061
---
 modules/services/mail/postfix.nix | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/modules/services/mail/postfix.nix b/modules/services/mail/postfix.nix
index 93596028678..939260632c9 100644
--- a/modules/services/mail/postfix.nix
+++ b/modules/services/mail/postfix.nix
@@ -283,11 +283,13 @@ in
       # accurate way is unlikely to be better.
       { description = "Postfix mail server";
 
-        startOn = "started ${startingDependency} and filesystems";
+        startOn = "started ${startingDependency}";
 
-        daemonType = "fork";
+        daemonType = "none";
 
-        script =
+        respawn = false;
+
+        preStart =
           ''
             if ! [ -d /var/spool/postfix ]; then
               ${pkgs.coreutils}/bin/mkdir -p /var/spool/mail /var/postfix/conf /var/postfix/queue
@@ -309,6 +311,10 @@ in
             exec ${pkgs.postfix}/sbin/postfix -c /var/postfix/conf start
           ''; # */
 
+        preStop = ''
+            exec ${pkgs.postfix}/sbin/postfix -c /var/postfix/conf stop
+        '';
+
       };
 
   };
-- 
GitLab


From b42c2ecc13e5b20a2c91fe9cdff5899f0124b2c8 Mon Sep 17 00:00:00 2001
From: Rob Vermaas <rob.vermaas@gmail.com>
Date: Wed, 14 Apr 2010 09:31:23 +0000
Subject: [PATCH 2283/5331]  * tomcat module: access logging per virtual host
 and pass right timezone

svn path=/nixos/trunk/; revision=21065
---
 modules/services/web-servers/tomcat.nix | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/modules/services/web-servers/tomcat.nix b/modules/services/web-servers/tomcat.nix
index bc633cb6459..baf05e06a09 100644
--- a/modules/services/web-servers/tomcat.nix
+++ b/modules/services/web-servers/tomcat.nix
@@ -112,6 +112,8 @@ in
         startOn = "started network-interfaces";
         stopOn = "stopping network-interfaces";
 
+        environment = { TZ = config.time.timeZone; };
+
         preStart =
           ''        
 	    # Create the base directory
@@ -141,12 +143,17 @@ in
 	    
 	    # Create a modified server.xml which also includes all virtual hosts
 	    sed -e "/<Engine name=\"Catalina\" defaultHost=\"localhost\">/a\  ${
-                         toString (map (virtualHost: ''<Host name=\"${virtualHost.name}\" appBase=\"virtualhosts/${virtualHost.name}/webapps\" unpackWARs=\"true\" autoDeploy=\"true\" xmlValidation=\"false\" xmlNamespaceAware=\"false\" >${if cfg.logPerVirtualHost then ''<Valve className=\"org.apache.catalina.valves.AccessLogValve\" directory=\"logs\"  prefix=\"${virtualHost.name}_access_log.\" pattern=\"combined\" resolveHosts=\"false\"/>'' else ""}</Host>'') cfg.virtualHosts)}" \
+                         toString (map (virtualHost: ''<Host name=\"${virtualHost.name}\" appBase=\"virtualhosts/${virtualHost.name}/webapps\" unpackWARs=\"true\" autoDeploy=\"true\" xmlValidation=\"false\" xmlNamespaceAware=\"false\" >${if cfg.logPerVirtualHost then ''<Valve className=\"org.apache.catalina.valves.AccessLogValve\" directory=\"logs/${virtualHost.name}\"  prefix=\"${virtualHost.name}_access_log.\" pattern=\"combined\" resolveHosts=\"false\"/>'' else ""}</Host>'') cfg.virtualHosts)}" \
 	        ${pkgs.tomcat6}/conf/server.xml > ${cfg.baseDir}/conf/server.xml
 	    
 	    # Create a logs/ directory
 	    mkdir -p ${cfg.baseDir}/logs
 	    chown ${cfg.user}:${cfg.group} ${cfg.baseDir}/logs
+            ${if cfg.logPerVirtualHost then 
+               toString (map (h: ''
+                                    mkdir -p ${cfg.baseDir}/logs/${h.name}
+                                    chown ${cfg.user}:${cfg.group} ${cfg.baseDir}/logs/${h.name}
+                                 '') cfg.virtualHosts) else ''''}
 	    
 	    # Create a temp/ directory
 	    mkdir -p ${cfg.baseDir}/temp
-- 
GitLab


From 37746e4fb3fa0a2b320c0e925f4da26e9849b2ec Mon Sep 17 00:00:00 2001
From: Marco Maggesi <maggesi@math.unifi.it>
Date: Thu, 15 Apr 2010 12:11:33 +0000
Subject: [PATCH 2284/5331] Add support for BLCR: modules/programs/blcr.nix

svn path=/nixos/trunk/; revision=21092
---
 modules/module-list.nix   |  1 +
 modules/programs/blcr.nix | 59 +++++++++++++++++++++++++++++++++++++++
 2 files changed, 60 insertions(+)
 create mode 100644 modules/programs/blcr.nix

diff --git a/modules/module-list.nix b/modules/module-list.nix
index 58446c37e8d..0d48e71aa9e 100644
--- a/modules/module-list.nix
+++ b/modules/module-list.nix
@@ -27,6 +27,7 @@
   ./misc/nixpkgs.nix
   ./misc/passthru.nix
   ./programs/bash/bash.nix
+  ./programs/blcr.nix
   ./programs/info.nix
   ./programs/pwdutils/pwdutils.nix
   ./programs/ssh.nix
diff --git a/modules/programs/blcr.nix b/modules/programs/blcr.nix
new file mode 100644
index 00000000000..084d7c5753a
--- /dev/null
+++ b/modules/programs/blcr.nix
@@ -0,0 +1,59 @@
+{ config, pkgs, ... }:
+
+let
+  inherit (pkgs.lib) mkOption mkIf;
+
+  cfg = config.environment.blcr;
+
+  blcrPkg = config.boot.kernelPackages.blcr;
+
+  insmod = "${pkgs.module_init_tools}/sbin/insmod";
+  rmmod  = "${pkgs.module_init_tools}/sbin/rmmod";
+
+  modulesDir      = "${blcrPkg}/lib/modules/${pkgs.linux.version}";
+  blcr_imports_ko = "${modulesDir}/blcr_imports.ko";
+  blcr_ko         = "${modulesDir}/blcr.ko";
+in
+
+{
+  ###### interface
+
+  options = {
+    environment.blcr.enable = mkOption {
+      default = false;
+      description =
+        "Wheter to enable support for the BLCR checkpoingint tool.";
+    };
+
+    environment.blcr.autorun = mkOption {
+      default = true;
+      description =
+        "Whether to load BLCR kernel modules automatically at boot.";
+    };
+  };
+
+
+  ###### implementation
+
+  config = mkIf cfg.enable {
+    environment.systemPackages = [ blcrPkg ];
+
+    jobs.openafsClient = {
+        name        = "blcr";
+        description = "Loads BLCR kernel modules";
+	task        = true;
+
+        startOn = if cfg.autorun then "started udev" else null;
+        stopOn  = "shutdown";
+
+	preStart = ''
+          ${insmod} ${blcr_imports_ko}
+          ${insmod} ${blcr_ko}
+	'';
+	postStop = ''
+          ${rmmod} ${blcr_ko}
+          ${rmmod} ${blcr_imports_ko}
+	'';
+      };
+  };
+}
-- 
GitLab


From 916fbfa0709731dfaaf2b9f129a96d0909120fea Mon Sep 17 00:00:00 2001
From: "Yury G. Kudryashov" <urkud.urkud@gmail.com>
Date: Thu, 15 Apr 2010 15:46:38 +0000
Subject: [PATCH 2285/5331] Add xf86-linux-wacom.

Mostly reverts my previous commit.

svn path=/nixos/trunk/; revision=21099
---
 modules/module-list.nix                 |  1 +
 modules/services/x11/hardware/wacom.nix | 88 +++++++++++++++++++++++++
 modules/services/x11/xserver.nix        |  2 +-
 3 files changed, 90 insertions(+), 1 deletion(-)
 create mode 100644 modules/services/x11/hardware/wacom.nix

diff --git a/modules/module-list.nix b/modules/module-list.nix
index 0d48e71aa9e..0788e6b31b9 100644
--- a/modules/module-list.nix
+++ b/modules/module-list.nix
@@ -121,6 +121,7 @@
   ./services/x11/display-managers/kdm.nix
   ./services/x11/display-managers/slim.nix
   ./services/x11/hardware/synaptics.nix
+  ./services/x11/hardware/wacom.nix
   ./services/x11/window-managers/compiz.nix
   ./services/x11/window-managers/default.nix
   ./services/x11/window-managers/icewm.nix
diff --git a/modules/services/x11/hardware/wacom.nix b/modules/services/x11/hardware/wacom.nix
new file mode 100644
index 00000000000..98717ce5a5b
--- /dev/null
+++ b/modules/services/x11/hardware/wacom.nix
@@ -0,0 +1,88 @@
+{ config, pkgs, ... }:
+
+with pkgs.lib;
+
+let
+
+  cfg = config.services.xserver.wacom;
+
+in
+
+{
+
+  options = {
+
+    services.xserver.wacom = {
+
+      enable = mkOption {
+        default = false;
+        description = "Whether to enable the Wacom touchscreen/digitizer.";
+      };
+
+      device = mkOption {
+        default = "/dev/ttyS0";
+        description = "Device to use.";
+      };
+
+      forceDeviceType = mkOption {
+        default = "ISDV4";
+        example = null;
+        description = "Some models (think touchscreen) require the device type to be specified.";
+      };
+
+    };
+
+  };
+
+
+  config = mkIf cfg.enable {
+
+    services.xserver.modules = [ pkgs.xf86_input_wacom ];
+
+    services.udev.packages = [ pkgs.xf86_input_wacom ];
+
+    services.xserver.serverLayoutSection =
+      ''
+        InputDevice "Wacom_stylus"
+        InputDevice "Wacom_cursor"
+        InputDevice "Wacom_eraser"
+      '';
+
+    services.xserver.config =
+      ''
+        Section "InputDevice"
+          Driver "wacom"
+          Identifier "Wacom_stylus"
+          Option "Device" "${cfg.device}"
+          Option "Type" "stylus"
+          ${optionalString (cfg.forceDeviceType != null) ''
+            Option "ForceDevice" "${cfg.forceDeviceType}"
+          ''}
+          Option "Button2" "3"
+        EndSection
+
+        Section "InputDevice"
+          Driver "wacom"
+          Identifier "Wacom_eraser"
+          Option "Device" "${cfg.device}"
+          Option "Type" "eraser"
+          ${optionalString (cfg.forceDeviceType != null) ''
+            Option "ForceDevice" "${cfg.forceDeviceType}"
+          ''}
+          Option "Button1" "2"
+        EndSection
+
+        Section "InputDevice"
+          Driver "wacom"
+          Identifier "Wacom_cursor"
+          Option "Device" "${cfg.device}"
+          Option "Type" "cursor"
+          ${optionalString (cfg.forceDeviceType != null) ''
+            Option "ForceDevice" "${cfg.forceDeviceType}"
+          ''}
+        EndSection
+      '';
+
+  };
+
+}
diff --git a/modules/services/x11/xserver.nix b/modules/services/x11/xserver.nix
index e1f62f89c11..c96e7041f35 100644
--- a/modules/services/x11/xserver.nix
+++ b/modules/services/x11/xserver.nix
@@ -155,7 +155,7 @@ in
 
       modules = mkOption {
         default = [];
-        example = [ pkgs.synaptics ];
+        example = [ pkgs.xf86_input_wacom ];
         description = "Packages to be added to the module search path of the X server.";
       };
 
-- 
GitLab


From 4d39d70406add7ba1898cb4468dd910a960e523e Mon Sep 17 00:00:00 2001
From: "Yury G. Kudryashov" <urkud.urkud@gmail.com>
Date: Thu, 15 Apr 2010 15:46:47 +0000
Subject: [PATCH 2286/5331] Start ssh-agent or gpg-agent even if called by kdm

svn path=/nixos/trunk/; revision=21100
---
 modules/services/x11/display-managers/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/modules/services/x11/display-managers/default.nix b/modules/services/x11/display-managers/default.nix
index 805016fe438..acc724c8663 100644
--- a/modules/services/x11/display-managers/default.nix
+++ b/modules/services/x11/display-managers/default.nix
@@ -21,9 +21,6 @@ let
     ''
       #! /bin/sh
 
-      # Handle being called by kdm.
-      if test "''${1:0:1}" = /; then eval exec "$1"; fi
-
       # The first argument of this script is the session type.
       sessionType="$1"
       if test "$sessionType" = default; then sessionType=""; fi
@@ -60,6 +57,9 @@ let
           exec ${pkgs.consolekit}/bin/ck-launch-session "$0" "$sessionType"
       fi
 
+      # Handle being called by kdm.
+      if test "''${1:0:1}" = /; then eval exec "$1"; fi
+
       # Load X defaults.
       if test -e ~/.Xdefaults; then
           ${xorg.xrdb}/bin/xrdb -merge ~/.Xdefaults
-- 
GitLab


From dcd0be3351f674ba63ed9803fe4b78a9603d0380 Mon Sep 17 00:00:00 2001
From: "Yury G. Kudryashov" <urkud.urkud@gmail.com>
Date: Thu, 15 Apr 2010 15:46:55 +0000
Subject: [PATCH 2287/5331] Allow additions to pathsToLink

svn path=/nixos/trunk/; revision=21101
---
 modules/config/system-path.nix | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/modules/config/system-path.nix b/modules/config/system-path.nix
index a8c85f65b2d..e085ef2acb3 100644
--- a/modules/config/system-path.nix
+++ b/modules/config/system-path.nix
@@ -77,13 +77,23 @@ let
       };
 
       pathsToLink = mkOption {
+        # Note: We need `/lib' to be among `pathsToLink' for NSS modules
+        # to work.
         default = ["/bin" "/sbin" "/lib" "/share/man" "/share/info" "/man" "/info"];
         example = ["/"];
         description = "
           Lists directories to be symlinked in `/var/run/current-system/sw'.
+          Use extraLinkPaths if you want just to add some additional paths.
         ";
       };
 
+      extraLinkPaths = mkOption {
+          default = [];
+          example = ["/"];
+          description = "
+            Extra directories to be symlinked in /var/run/current-system/sw.
+          ";
+      };
     };
 
     system = {
@@ -97,9 +107,7 @@ let
           name = "system-path";
           paths = list;
 
-          # Note: We need `/lib' to be among `pathsToLink' for NSS modules
-          # to work.
-          inherit (config.environment) pathsToLink;
+          pathsToLink = with config.environment; pathsToLink ++ extraLinkPaths;
 
           ignoreCollisions = true;
         };
-- 
GitLab


From a26d31d04cb83dc405cd912e63384c52dde86ab7 Mon Sep 17 00:00:00 2001
From: "Yury G. Kudryashov" <urkud.urkud@gmail.com>
Date: Thu, 15 Apr 2010 15:47:07 +0000
Subject: [PATCH 2288/5331] Add support for custom CUPS drivers

Use buildEnv for cups-prog.

svn path=/nixos/trunk/; revision=21102
---
 modules/services/printing/cupsd.nix | 39 +++++++++++++++--------------
 1 file changed, 20 insertions(+), 19 deletions(-)

diff --git a/modules/services/printing/cupsd.nix b/modules/services/printing/cupsd.nix
index fb430df5b90..de1da1bc3e5 100644
--- a/modules/services/printing/cupsd.nix
+++ b/modules/services/printing/cupsd.nix
@@ -17,28 +17,20 @@ let
   # we can't update ${cups}/lib/cups itself, we create a symlink tree
   # here and add the additional programs.  The ServerBin directive in
   # cupsd.conf tells cupsd to use this tree.
-  bindir = pkgs.runCommand "cups-progs" {}
-    ''
-      ensureDir $out/lib/cups
-      ln -s ${cups}/lib/cups/* $out/lib/cups/
-
-      # Provide support for printing via SMB.    
-      rm $out/lib/cups/backend
-      ensureDir $out/lib/cups/backend
-      ln -s ${cups}/lib/cups/backend/* $out/lib/cups/backend/
-      ln -s ${pkgs.samba}/bin/smbspool $out/lib/cups/backend/smb
+  bindir = pkgs.buildEnv {
+    name = "cups-progs";
+    paths = cfg.drivers;
+    pathsToLink = [ "/lib/cups" "/share/cups" ];
+    postBuild =  ''
+      ${pkgs.coreutils}/bin/mkdir -p $out/lib/cups/backend
+      ${pkgs.coreutils}/bin/ln -s ${pkgs.samba}/bin/smbspool $out/lib/cups/backend/smb
 
       # Provide support for printing via HTTPS.
-      ln -s ipp $out/lib/cups/backend/https
-
-      # Provide Ghostscript rasterisation, necessary for non-Postscript
-      # printers.
-      rm $out/lib/cups/filter
-      ensureDir $out/lib/cups/filter
-      ln -s ${cups}/lib/cups/filter/* $out/lib/cups/filter/
-      ln -s ${pkgs.ghostscript}/lib/cups/filter/* $out/lib/cups/filter/
+      ${pkgs.coreutils}/bin/ln -s ipp $out/lib/cups/backend/https
+
       ${cfg.bindirCmds}
-    ''; # */
+    '';
+  };
 
 in
 
@@ -78,6 +70,13 @@ in
         '';
       };
 
+      drivers = mkOption {
+        example = [ pkgs.splix ];
+        description = ''
+          CUPS drivers (CUPS, gs and samba are added unconditionally).
+        '';
+      };
+
     };
 
   };
@@ -120,6 +119,7 @@ in
         exec = "${cups}/sbin/cupsd -c ${pkgs.writeText "cupsd.conf" cfg.cupsdConf} -F";
       };
 
+    services.printing.drivers = [ pkgs.cups pkgs.ghostscript ];
     services.printing.cupsdConf = 
       ''
         LogLevel info
@@ -135,6 +135,7 @@ in
         ServerRoot /etc/cups
 
         ServerBin ${bindir}/lib/cups
+        DataDir ${bindir}/share/cups
 
         AccessLog ${logDir}/access_log
         ErrorLog ${logDir}/error_log
-- 
GitLab


From 8324ccf75567c736592fd121ad5353a7dbdacbad Mon Sep 17 00:00:00 2001
From: "Yury G. Kudryashov" <urkud.urkud@gmail.com>
Date: Thu, 15 Apr 2010 15:47:15 +0000
Subject: [PATCH 2289/5331] Add /var/run/current-system/sw to NIX_PROFILES

Also adds a possibility to just add KDE packages to systemPackages.

svn path=/nixos/trunk/; revision=21103
---
 modules/programs/bash/bashrc.sh                          | 9 +++++----
 .../services/x11/desktop-managers/kde-environment.nix    | 9 +++------
 2 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/modules/programs/bash/bashrc.sh b/modules/programs/bash/bashrc.sh
index f12b95637b4..8f5a417bcc2 100644
--- a/modules/programs/bash/bashrc.sh
+++ b/modules/programs/bash/bashrc.sh
@@ -3,7 +3,6 @@ if [ -n "$NOSYSBASHRC" ]; then
 fi
 
 # Initialise a bunch of environment variables.
-export PATH=/var/run/current-system/sw/bin:/var/run/current-system/sw/sbin
 export LD_LIBRARY_PATH=/var/run/opengl-driver/lib
 export MODULE_DIR=@modulesTree@/lib/modules
 export NIXPKGS_CONFIG=/nix/etc/config.nix
@@ -11,14 +10,15 @@ export NIXPKGS_ALL=/etc/nixos/nixpkgs
 export PAGER="less -R"
 export EDITOR=nano
 export LOCATE_PATH=/var/cache/locatedb
-export GST_PLUGIN_PATH=/var/run/current-system/sw/lib/gstreamer-0.10
-@shellInit@
 
 
 # Include the various profiles in the appropriate environment variables.
 NIX_USER_PROFILE_DIR=/nix/var/nix/profiles/per-user/$USER
 
-NIX_PROFILES="/nix/var/nix/profiles/default $NIX_USER_PROFILE_DIR/profile"
+NIX_PROFILES="/var/run/current-system/sw /nix/var/nix/profiles/default $NIX_USER_PROFILE_DIR/profile"
+
+unset PATH INFOPATH PKG_CONFIG_PATH PERL5LIB GST_PLUGIN_PATH KDEDIRS
+unset XDG_CONFIG_DIRS XDG_DATA_DIRS
 
 for i in $NIX_PROFILES; do # !!! reverse
     export PATH=$i/bin:$i/sbin:$PATH
@@ -37,6 +37,7 @@ for i in $NIX_PROFILES; do # !!! reverse
     export XDG_CONFIG_DIRS=$i/etc/xdg:$XDG_CONFIG_DIRS
     export XDG_DATA_DIRS=$i/share:$XDG_DATA_DIRS
 done
+@shellInit@
 
 
 # Search directory for Aspell dictionaries.
diff --git a/modules/services/x11/desktop-managers/kde-environment.nix b/modules/services/x11/desktop-managers/kde-environment.nix
index 98b92e42b85..19f092b0706 100644
--- a/modules/services/x11/desktop-managers/kde-environment.nix
+++ b/modules/services/x11/desktop-managers/kde-environment.nix
@@ -15,6 +15,8 @@ let
         description = ''
           Additional KDE packages to be used when you use KDE as a desktop
           manager.  By default, you only get the KDE base packages.
+          Just adds packages to systemPackages and x11Packages. Will be removed
+          in the future.
         '';
       };
 
@@ -27,11 +29,6 @@ mkIf (kdePackages != [] && config.services.xserver.enable) {
 
   environment = {
     x11Packages = kdePackages;
-
-    shellInit = ''
-      export KDEDIRS="${pkgs.lib.concatStringsSep ":" kdePackages}"
-      export XDG_CONFIG_DIRS="${pkgs.lib.makeSearchPath "etc/xdg" kdePackages}"
-      export XDG_DATA_DIRS="${pkgs.lib.makeSearchPath "share" kdePackages}"
-    '';
+    systemPackages = kdePackages;
   };
 }
-- 
GitLab


From 1e83fe612253efde42fc7aa906268892d60218fd Mon Sep 17 00:00:00 2001
From: "Yury G. Kudryashov" <urkud.urkud@gmail.com>
Date: Thu, 15 Apr 2010 15:47:26 +0000
Subject: [PATCH 2290/5331] Remove tabs

svn path=/nixos/trunk/; revision=21104
---
 modules/config/krb5.nix                       | 224 +++++++++---------
 modules/config/no-x-libs.nix                  |   4 +-
 modules/services/scheduling/fcron.nix         |  16 +-
 .../web-servers/apache-httpd/mediawiki.nix    |   2 +-
 .../web-servers/apache-httpd/trac.nix         |   8 +-
 .../services/x11/desktop-managers/kde4.nix    |   6 +-
 modules/services/x11/display-managers/kdm.nix |   6 +-
 modules/services/x11/xserver.nix              |   2 +-
 .../activation/switch-to-configuration.sh     |   2 +-
 modules/system/etc/make-etc.sh                |   2 +-
 10 files changed, 136 insertions(+), 136 deletions(-)

diff --git a/modules/config/krb5.nix b/modules/config/krb5.nix
index 960ef850084..6543bbafc7d 100644
--- a/modules/config/krb5.nix
+++ b/modules/config/krb5.nix
@@ -48,134 +48,134 @@ mkIf config.krb5.enable {
       { source = pkgs.writeText "krb5.conf"
           ''
 [libdefaults]
-	default_realm = ${cfg.defaultRealm}
+    default_realm = ${cfg.defaultRealm}
 
 # The following krb5.conf variables are only for MIT Kerberos.
-	krb4_config = /etc/krb.conf
-	krb4_realms = /etc/krb.realms
-	kdc_timesync = 1
-	ccache_type = 4
-	forwardable = true
-	proxiable = true
+    krb4_config = /etc/krb.conf
+    krb4_realms = /etc/krb.realms
+    kdc_timesync = 1
+    ccache_type = 4
+    forwardable = true
+    proxiable = true
 
 # The following encryption type specification will be used by MIT Kerberos
 # if uncommented.  In general, the defaults in the MIT Kerberos code are
 # correct and overriding these specifications only serves to disable new
 # encryption types as they are added, creating interoperability problems.
 
-#	default_tgs_enctypes = aes256-cts arcfour-hmac-md5 des3-hmac-sha1 des-cbc-crc des-cbc-md5
-#	default_tkt_enctypes = aes256-cts arcfour-hmac-md5 des3-hmac-sha1 des-cbc-crc des-cbc-md5
-#	permitted_enctypes = aes256-cts arcfour-hmac-md5 des3-hmac-sha1 des-cbc-crc des-cbc-md5
+#   default_tgs_enctypes = aes256-cts arcfour-hmac-md5 des3-hmac-sha1 des-cbc-crc des-cbc-md5
+#   default_tkt_enctypes = aes256-cts arcfour-hmac-md5 des3-hmac-sha1 des-cbc-crc des-cbc-md5
+#   permitted_enctypes = aes256-cts arcfour-hmac-md5 des3-hmac-sha1 des-cbc-crc des-cbc-md5
 
 # The following libdefaults parameters are only for Heimdal Kerberos.
-	v4_instance_resolve = false
-	v4_name_convert = {
-		host = {
-			rcmd = host
-			ftp = ftp
-		}
-		plain = {
-			something = something-else
-		}
-	}
-	fcc-mit-ticketflags = true
+    v4_instance_resolve = false
+    v4_name_convert = {
+        host = {
+            rcmd = host
+            ftp = ftp
+        }
+        plain = {
+            something = something-else
+        }
+    }
+    fcc-mit-ticketflags = true
 
 [realms]
-	${cfg.defaultRealm} = {
-		kdc = ${cfg.kdc}
-		admin_server = ${cfg.kerberosAdminServer}
-	}
-	ATHENA.MIT.EDU = {
-		kdc = kerberos.mit.edu:88
-		kdc = kerberos-1.mit.edu:88
-		kdc = kerberos-2.mit.edu:88
-		admin_server = kerberos.mit.edu
-		default_domain = mit.edu
-	}
-	MEDIA-LAB.MIT.EDU = {
-		kdc = kerberos.media.mit.edu
-		admin_server = kerberos.media.mit.edu
-	}
-	ZONE.MIT.EDU = {
-		kdc = casio.mit.edu
-		kdc = seiko.mit.edu
-		admin_server = casio.mit.edu
-	}
-	MOOF.MIT.EDU = {
-		kdc = three-headed-dogcow.mit.edu:88
-		kdc = three-headed-dogcow-1.mit.edu:88
-		admin_server = three-headed-dogcow.mit.edu
-	}
-	CSAIL.MIT.EDU = {
-		kdc = kerberos-1.csail.mit.edu
-		kdc = kerberos-2.csail.mit.edu
-		admin_server = kerberos.csail.mit.edu
-		default_domain = csail.mit.edu
-		krb524_server = krb524.csail.mit.edu
-	}
-	IHTFP.ORG = {
-		kdc = kerberos.ihtfp.org
-		admin_server = kerberos.ihtfp.org
-	}
-	GNU.ORG = {
-		kdc = kerberos.gnu.org
-		kdc = kerberos-2.gnu.org
-		kdc = kerberos-3.gnu.org
-		admin_server = kerberos.gnu.org
-	}
-	1TS.ORG = {
-		kdc = kerberos.1ts.org
-		admin_server = kerberos.1ts.org
-	}
-	GRATUITOUS.ORG = {
-		kdc = kerberos.gratuitous.org
-		admin_server = kerberos.gratuitous.org
-	}
-	DOOMCOM.ORG = {
-		kdc = kerberos.doomcom.org
-		admin_server = kerberos.doomcom.org
-	}
-	ANDREW.CMU.EDU = {
-		kdc = vice28.fs.andrew.cmu.edu
-		kdc = vice2.fs.andrew.cmu.edu
-		kdc = vice11.fs.andrew.cmu.edu
-		kdc = vice12.fs.andrew.cmu.edu
-		admin_server = vice28.fs.andrew.cmu.edu
-		default_domain = andrew.cmu.edu
-	}
-	CS.CMU.EDU = {
-		kdc = kerberos.cs.cmu.edu
-		kdc = kerberos-2.srv.cs.cmu.edu
-		admin_server = kerberos.cs.cmu.edu
-	}
-	DEMENTIA.ORG = {
-		kdc = kerberos.dementia.org
-		kdc = kerberos2.dementia.org
-		admin_server = kerberos.dementia.org
-	}
-	stanford.edu = {
-		kdc = krb5auth1.stanford.edu
-		kdc = krb5auth2.stanford.edu
-		kdc = krb5auth3.stanford.edu
-		admin_server = krb5-admin.stanford.edu
-		default_domain = stanford.edu
-	}
+    ${cfg.defaultRealm} = {
+        kdc = ${cfg.kdc}
+        admin_server = ${cfg.kerberosAdminServer}
+    }
+    ATHENA.MIT.EDU = {
+        kdc = kerberos.mit.edu:88
+        kdc = kerberos-1.mit.edu:88
+        kdc = kerberos-2.mit.edu:88
+        admin_server = kerberos.mit.edu
+        default_domain = mit.edu
+    }
+    MEDIA-LAB.MIT.EDU = {
+        kdc = kerberos.media.mit.edu
+        admin_server = kerberos.media.mit.edu
+    }
+    ZONE.MIT.EDU = {
+        kdc = casio.mit.edu
+        kdc = seiko.mit.edu
+        admin_server = casio.mit.edu
+    }
+    MOOF.MIT.EDU = {
+        kdc = three-headed-dogcow.mit.edu:88
+        kdc = three-headed-dogcow-1.mit.edu:88
+        admin_server = three-headed-dogcow.mit.edu
+    }
+    CSAIL.MIT.EDU = {
+        kdc = kerberos-1.csail.mit.edu
+        kdc = kerberos-2.csail.mit.edu
+        admin_server = kerberos.csail.mit.edu
+        default_domain = csail.mit.edu
+        krb524_server = krb524.csail.mit.edu
+    }
+    IHTFP.ORG = {
+        kdc = kerberos.ihtfp.org
+        admin_server = kerberos.ihtfp.org
+    }
+    GNU.ORG = {
+        kdc = kerberos.gnu.org
+        kdc = kerberos-2.gnu.org
+        kdc = kerberos-3.gnu.org
+        admin_server = kerberos.gnu.org
+    }
+    1TS.ORG = {
+        kdc = kerberos.1ts.org
+        admin_server = kerberos.1ts.org
+    }
+    GRATUITOUS.ORG = {
+        kdc = kerberos.gratuitous.org
+        admin_server = kerberos.gratuitous.org
+    }
+    DOOMCOM.ORG = {
+        kdc = kerberos.doomcom.org
+        admin_server = kerberos.doomcom.org
+    }
+    ANDREW.CMU.EDU = {
+        kdc = vice28.fs.andrew.cmu.edu
+        kdc = vice2.fs.andrew.cmu.edu
+        kdc = vice11.fs.andrew.cmu.edu
+        kdc = vice12.fs.andrew.cmu.edu
+        admin_server = vice28.fs.andrew.cmu.edu
+        default_domain = andrew.cmu.edu
+    }
+    CS.CMU.EDU = {
+        kdc = kerberos.cs.cmu.edu
+        kdc = kerberos-2.srv.cs.cmu.edu
+        admin_server = kerberos.cs.cmu.edu
+    }
+    DEMENTIA.ORG = {
+        kdc = kerberos.dementia.org
+        kdc = kerberos2.dementia.org
+        admin_server = kerberos.dementia.org
+    }
+    stanford.edu = {
+        kdc = krb5auth1.stanford.edu
+        kdc = krb5auth2.stanford.edu
+        kdc = krb5auth3.stanford.edu
+        admin_server = krb5-admin.stanford.edu
+        default_domain = stanford.edu
+    }
 
 [domain_realm]
-	.mit.edu = ATHENA.MIT.EDU
-	mit.edu = ATHENA.MIT.EDU
-	.media.mit.edu = MEDIA-LAB.MIT.EDU
-	media.mit.edu = MEDIA-LAB.MIT.EDU
-	.csail.mit.edu = CSAIL.MIT.EDU
-	csail.mit.edu = CSAIL.MIT.EDU
-	.whoi.edu = ATHENA.MIT.EDU
-	whoi.edu = ATHENA.MIT.EDU
-	.stanford.edu = stanford.edu
+    .mit.edu = ATHENA.MIT.EDU
+    mit.edu = ATHENA.MIT.EDU
+    .media.mit.edu = MEDIA-LAB.MIT.EDU
+    media.mit.edu = MEDIA-LAB.MIT.EDU
+    .csail.mit.edu = CSAIL.MIT.EDU
+    csail.mit.edu = CSAIL.MIT.EDU
+    .whoi.edu = ATHENA.MIT.EDU
+    whoi.edu = ATHENA.MIT.EDU
+    .stanford.edu = stanford.edu
 
 [login]
-	krb4_convert = true
-	krb4_get_tickets = false
-	    
+    krb4_convert = true
+    krb4_get_tickets = false
+        
           '';
         target = "krb5.conf";
       }
diff --git a/modules/config/no-x-libs.nix b/modules/config/no-x-libs.nix
index 667d1b8e905..f4b255eefe9 100644
--- a/modules/config/no-x-libs.nix
+++ b/modules/config/no-x-libs.nix
@@ -7,8 +7,8 @@
       example = true;
       description = ''
         Switch off the options in the default configuration that require X libraries.
-	Currently this includes: openssh.forwardX11, dbus, hal, fonts.enableCoreFonts,
-	fonts.enableFontConfig
+        Currently this includes: openssh.forwardX11, dbus, hal, fonts.enableCoreFonts,
+        fonts.enableFontConfig
       '';
     };
   };
diff --git a/modules/services/scheduling/fcron.nix b/modules/services/scheduling/fcron.nix
index fbd1288a55f..f217449cf0c 100644
--- a/modules/services/scheduling/fcron.nix
+++ b/modules/services/scheduling/fcron.nix
@@ -81,14 +81,14 @@ in
         (allowdeny "deny" cfg.deny)
         # see man 5 fcron.conf
         { source = pkgs.writeText "fcon.conf" ''
-            fcrontabs	=	/var/spool/fcron
-            pidfile	=	/var/run/fcron.pid
-            fifofile	=	/var/run/fcron.fifo
-            fcronallow	=	/etc/fcron.allow
-            fcrondeny	=	/etc/fcron.deny
-            shell	=	/bin/sh
-            sendmail	=	/var/setuid-wrappers/sendmail
-            editor	=	/var/run/current-system/sw/bin/vi
+            fcrontabs   =       /var/spool/fcron
+            pidfile     =       /var/run/fcron.pid
+            fifofile    =       /var/run/fcron.fifo
+            fcronallow  =       /etc/fcron.allow
+            fcrondeny   =       /etc/fcron.deny
+            shell       =       /bin/sh
+            sendmail    =       /var/setuid-wrappers/sendmail
+            editor      =       /var/run/current-system/sw/bin/vi
           '';
           target = "fcron.conf";
           mode = "0600"; # max allowed is 644
diff --git a/modules/services/web-servers/apache-httpd/mediawiki.nix b/modules/services/web-servers/apache-httpd/mediawiki.nix
index c1a232e0499..a0d8a653fb9 100644
--- a/modules/services/web-servers/apache-httpd/mediawiki.nix
+++ b/modules/services/web-servers/apache-httpd/mediawiki.nix
@@ -136,7 +136,7 @@ in
       default = ""; # use a Unix domain socket
       example = "10.0.2.2";
       description = ''
-	The location of the database server.  Leave empty to use a
+        The location of the database server.  Leave empty to use a
         database server running on the same machine through a Unix
         domain socket.
       '';
diff --git a/modules/services/web-servers/apache-httpd/trac.nix b/modules/services/web-servers/apache-httpd/trac.nix
index 61cb2fbca04..f8eb62ddfa1 100644
--- a/modules/services/web-servers/apache-httpd/trac.nix
+++ b/modules/services/web-servers/apache-httpd/trac.nix
@@ -83,10 +83,10 @@ in
     ${concatMapStrings (project:
       ''
         if [ ! -d /var/trac/${project.identifier} ]
-	then
-	    export PYTHONPATH=${pkgs.pythonPackages.psycopg2}/lib/${pkgs.python.libPrefix}/site-packages
-	    ${pkgs.pythonPackages.trac}/bin/trac-admin /var/trac/${project.identifier} initenv "${project.name}" "${project.databaseURL}" svn "${project.subversionRepository}"
-	fi
+        then
+            export PYTHONPATH=${pkgs.pythonPackages.psycopg2}/lib/${pkgs.python.libPrefix}/site-packages
+            ${pkgs.pythonPackages.trac}/bin/trac-admin /var/trac/${project.identifier} initenv "${project.name}" "${project.databaseURL}" svn "${project.subversionRepository}"
+        fi
       '' ) (config.projects)}
   '';
   
diff --git a/modules/services/x11/desktop-managers/kde4.nix b/modules/services/x11/desktop-managers/kde4.nix
index 885ecfebca2..7fd978b64cd 100644
--- a/modules/services/x11/desktop-managers/kde4.nix
+++ b/modules/services/x11/desktop-managers/kde4.nix
@@ -52,9 +52,9 @@ in
         pkgs.kde4.kdebase_runtime
         pkgs.kde4.kdebase_workspace
         pkgs.shared_mime_info
-	pkgs.gst_all.gstreamer
-	pkgs.gst_all.gstPluginsBase
-	pkgs.gst_all.gstPluginsGood
+        pkgs.gst_all.gstreamer
+        pkgs.gst_all.gstPluginsBase
+        pkgs.gst_all.gstPluginsGood
       ] ++ optional (pkgs.kde4 ? oxygen_icons) pkgs.kde4.oxygen_icons;
 
     environment.x11Packages =
diff --git a/modules/services/x11/display-managers/kdm.nix b/modules/services/x11/display-managers/kdm.nix
index 9ce87d64e48..438846d3043 100644
--- a/modules/services/x11/display-managers/kdm.nix
+++ b/modules/services/x11/display-managers/kdm.nix
@@ -71,9 +71,9 @@ in
 
       enableXDMCP = mkOption {
         default = false;
-	description = ''
-	  Whether to enable XDMCP, which allows remote logins.
-	'';
+  description = ''
+    Whether to enable XDMCP, which allows remote logins.
+  '';
       };
 
       extraConfig = mkOption {
diff --git a/modules/services/x11/xserver.nix b/modules/services/x11/xserver.nix
index c96e7041f35..1dc12ce0ff0 100644
--- a/modules/services/x11/xserver.nix
+++ b/modules/services/x11/xserver.nix
@@ -409,7 +409,7 @@ in
               if elem "nvidia" driverNames then ''
                 ln -sf ${kernelPackages.nvidia_x11} /var/run/opengl-driver
               ''
-	      else if elem "nvidiaLegacy" driverNames then ''
+        else if elem "nvidiaLegacy" driverNames then ''
                 ln -sf ${kernelPackages.nvidia_x11_legacy} /var/run/opengl-driver
               ''
               else if cfg.driSupport then
diff --git a/modules/system/activation/switch-to-configuration.sh b/modules/system/activation/switch-to-configuration.sh
index 3a25d574a72..c741aeccdac 100644
--- a/modules/system/activation/switch-to-configuration.sh
+++ b/modules/system/activation/switch-to-configuration.sh
@@ -35,7 +35,7 @@ if [ "$action" = "switch" -o "$action" = "boot" ]; then
           newGrubVersion="@grubVersion@"
 
           if [ "$NIXOS_INSTALL_GRUB" = 1 -o "$oldGrubVersion" != "$newGrubVersion" ]; then
-	      echo "installing the GRUB bootloader..."
+              echo "installing the GRUB bootloader..."
               @grub@/sbin/grub-install "@grubDevice@" --no-floppy --recheck
               echo "$newGrubVersion" > /boot/grub/version
           fi
diff --git a/modules/system/etc/make-etc.sh b/modules/system/etc/make-etc.sh
index f05d74b55fc..70cb57bc635 100644
--- a/modules/system/etc/make-etc.sh
+++ b/modules/system/etc/make-etc.sh
@@ -13,7 +13,7 @@ for ((i = 0; i < ${#targets_[@]}; i++)); do
         echo "Duplicate entry ${targets_[$i]} -> ${sources_[$i]}"
         if test "$(readlink $out/etc/${targets_[$i]})" != "${sources_[$i]}"; then
             echo "Mismatched duplicate entry $(readlink $out/etc/${targets_[$i]}) <-> ${sources_[$i]}"
-	    exit 1
+            exit 1
         fi
     fi;
     if test "${modes_[$i]}" != symlink; then
-- 
GitLab


From 267e0af8db915d46c0f6f478cbe9a8b205054344 Mon Sep 17 00:00:00 2001
From: "Yury G. Kudryashov" <urkud.urkud@gmail.com>
Date: Thu, 15 Apr 2010 17:02:33 +0000
Subject: [PATCH 2291/5331] A few typos in previous commits

svn path=/nixos/trunk/; revision=21105
---
 modules/programs/bash/bashrc.sh                           | 1 +
 modules/services/x11/desktop-managers/kde-environment.nix | 1 +
 2 files changed, 2 insertions(+)

diff --git a/modules/programs/bash/bashrc.sh b/modules/programs/bash/bashrc.sh
index 8f5a417bcc2..cffd817663a 100644
--- a/modules/programs/bash/bashrc.sh
+++ b/modules/programs/bash/bashrc.sh
@@ -34,6 +34,7 @@ for i in $NIX_PROFILES; do # !!! reverse
 
     # KDE/Gnome stuff.
     export KDEDIRS=$i:$KDEDIRS
+	export QT_PLUGIN_PATH=$i/plugins:$QT_PLUGIN_PATH
     export XDG_CONFIG_DIRS=$i/etc/xdg:$XDG_CONFIG_DIRS
     export XDG_DATA_DIRS=$i/share:$XDG_DATA_DIRS
 done
diff --git a/modules/services/x11/desktop-managers/kde-environment.nix b/modules/services/x11/desktop-managers/kde-environment.nix
index 19f092b0706..d6ebaa96a21 100644
--- a/modules/services/x11/desktop-managers/kde-environment.nix
+++ b/modules/services/x11/desktop-managers/kde-environment.nix
@@ -30,5 +30,6 @@ mkIf (kdePackages != [] && config.services.xserver.enable) {
   environment = {
     x11Packages = kdePackages;
     systemPackages = kdePackages;
+    extraLinkPaths = [ "/share" "/plugins" ];
   };
 }
-- 
GitLab


From c423f16f69f71bf68b8c7227ad99e5800553f6c8 Mon Sep 17 00:00:00 2001
From: Marco Maggesi <maggesi@math.unifi.it>
Date: Thu, 15 Apr 2010 17:14:44 +0000
Subject: [PATCH 2292/5331] Fix job name in nixos/modules/programs/blcr.nix

svn path=/nixos/trunk/; revision=21106
---
 modules/programs/blcr.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/programs/blcr.nix b/modules/programs/blcr.nix
index 084d7c5753a..b2b7aee4ab6 100644
--- a/modules/programs/blcr.nix
+++ b/modules/programs/blcr.nix
@@ -38,7 +38,7 @@ in
   config = mkIf cfg.enable {
     environment.systemPackages = [ blcrPkg ];
 
-    jobs.openafsClient = {
+    jobs.blcr = {
         name        = "blcr";
         description = "Loads BLCR kernel modules";
 	task        = true;
-- 
GitLab


From 8e8554242f5bada7e506663670a245756fe1f321 Mon Sep 17 00:00:00 2001
From: "Yury G. Kudryashov" <urkud.urkud@gmail.com>
Date: Fri, 16 Apr 2010 05:09:10 +0000
Subject: [PATCH 2293/5331] Remove extraLinkPaths, thanks to Pierron for
 explanation

Now pathsToLink=["/include"] in configuration.nix will add /include instead of overwriting.

svn path=/nixos/trunk/; revision=21111
---
 modules/config/system-path.nix                  | 17 +++++------------
 .../x11/desktop-managers/kde-environment.nix    |  4 ++--
 2 files changed, 7 insertions(+), 14 deletions(-)

diff --git a/modules/config/system-path.nix b/modules/config/system-path.nix
index e085ef2acb3..82b4c1e582b 100644
--- a/modules/config/system-path.nix
+++ b/modules/config/system-path.nix
@@ -7,6 +7,7 @@ with pkgs.lib;
 
 let
 
+  cfg = config.environment;
   requiredPackages =
     [ config.system.sbin.modprobe # must take precedence over module_init_tools
       config.system.sbin.mount # must take precedence over util-linux
@@ -79,27 +80,18 @@ let
       pathsToLink = mkOption {
         # Note: We need `/lib' to be among `pathsToLink' for NSS modules
         # to work.
-        default = ["/bin" "/sbin" "/lib" "/share/man" "/share/info" "/man" "/info"];
+        default = [];
         example = ["/"];
         description = "
           Lists directories to be symlinked in `/var/run/current-system/sw'.
-          Use extraLinkPaths if you want just to add some additional paths.
         ";
       };
-
-      extraLinkPaths = mkOption {
-          default = [];
-          example = ["/"];
-          description = "
-            Extra directories to be symlinked in /var/run/current-system/sw.
-          ";
-      };
     };
 
     system = {
 
       path = mkOption {
-        default = config.environment.systemPackages;
+        default = cfg.systemPackages;
         description = ''
           The packages you want in the boot environment.
         '';
@@ -107,7 +99,7 @@ let
           name = "system-path";
           paths = list;
 
-          pathsToLink = with config.environment; pathsToLink ++ extraLinkPaths;
+          inherit (cfg) pathsToLink;
 
           ignoreCollisions = true;
         };
@@ -124,4 +116,5 @@ in
   require = [options];
 
   environment.systemPackages = requiredPackages;
+  environment.pathsToLink = ["/bin" "/sbin" "/lib" "/share/man" "/share/info" "/man" "/info"];
 }
diff --git a/modules/services/x11/desktop-managers/kde-environment.nix b/modules/services/x11/desktop-managers/kde-environment.nix
index d6ebaa96a21..f4eba9bba14 100644
--- a/modules/services/x11/desktop-managers/kde-environment.nix
+++ b/modules/services/x11/desktop-managers/kde-environment.nix
@@ -1,7 +1,7 @@
 {pkgs, config, ...}:
 
 let
-  inherit (pkgs.lib) mkOption mkIf types;
+  inherit (pkgs.lib) mkDefaultValue mkOption mkIf types;
   kdePackages = config.environment.kdePackages;
 
   options = {
@@ -30,6 +30,6 @@ mkIf (kdePackages != [] && config.services.xserver.enable) {
   environment = {
     x11Packages = kdePackages;
     systemPackages = kdePackages;
-    extraLinkPaths = [ "/share" "/plugins" ];
+    pathsToLink = [ "/share" "/plugins" ];
   };
 }
-- 
GitLab


From b75d15a9a88c5f8e31d1c91d44cbaaf00e3bb8f2 Mon Sep 17 00:00:00 2001
From: Rob Vermaas <rob.vermaas@gmail.com>
Date: Fri, 16 Apr 2010 15:09:47 +0000
Subject: [PATCH 2294/5331] virtualisation: add option to switch off readonly
 host fs in vm

svn path=/nixos/trunk/; revision=21126
---
 lib/testing.nix                    |  1 +
 modules/virtualisation/qemu-vm.nix | 11 ++++++++++-
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/lib/testing.nix b/lib/testing.nix
index ca0b7297251..392ae8ca9b0 100644
--- a/lib/testing.nix
+++ b/lib/testing.nix
@@ -145,6 +145,7 @@ rec {
         { config, pkgs, ... }:
         {
           virtualisation.memorySize = 1024;
+          virtualisation.readonlyHostFS = false;
           services.xserver.enable = true;
           services.xserver.displayManager.slim.enable = false;
           services.xserver.displayManager.auto.enable = true;
diff --git a/modules/virtualisation/qemu-vm.nix b/modules/virtualisation/qemu-vm.nix
index a17e167cb46..c8b45f86b82 100644
--- a/modules/virtualisation/qemu-vm.nix
+++ b/modules/virtualisation/qemu-vm.nix
@@ -60,6 +60,15 @@ let
           '';
       };
       
+    virtualisation.readonlyHostFS =
+      mkOption {
+        default = true;
+        description =
+          ''
+            Whether to mount the hostfs read-only.
+          '';
+      };
+      
   };
 
   cfg = config.virtualisation;
@@ -163,7 +172,7 @@ in
       { mountPoint = "/hostfs";
         device = "//10.0.2.4/qemu";
         fsType = "cifs";
-        options = "guest,username=nobody,noperm";
+        options = "guest,username=nobody${if config.virtualisation.readonlyHostFS then ",noperm" else ""}";
         neededForBoot = true;
       }
       { mountPoint = "/nix/store";
-- 
GitLab


From 46b109e97e629de1ac37573b98ae588b817cf111 Mon Sep 17 00:00:00 2001
From: Rob Vermaas <rob.vermaas@gmail.com>
Date: Fri, 16 Apr 2010 15:45:59 +0000
Subject: [PATCH 2295/5331] revert previous commit

svn path=/nixos/trunk/; revision=21128
---
 modules/virtualisation/qemu-vm.nix | 11 +----------
 1 file changed, 1 insertion(+), 10 deletions(-)

diff --git a/modules/virtualisation/qemu-vm.nix b/modules/virtualisation/qemu-vm.nix
index c8b45f86b82..a17e167cb46 100644
--- a/modules/virtualisation/qemu-vm.nix
+++ b/modules/virtualisation/qemu-vm.nix
@@ -60,15 +60,6 @@ let
           '';
       };
       
-    virtualisation.readonlyHostFS =
-      mkOption {
-        default = true;
-        description =
-          ''
-            Whether to mount the hostfs read-only.
-          '';
-      };
-      
   };
 
   cfg = config.virtualisation;
@@ -172,7 +163,7 @@ in
       { mountPoint = "/hostfs";
         device = "//10.0.2.4/qemu";
         fsType = "cifs";
-        options = "guest,username=nobody${if config.virtualisation.readonlyHostFS then ",noperm" else ""}";
+        options = "guest,username=nobody,noperm";
         neededForBoot = true;
       }
       { mountPoint = "/nix/store";
-- 
GitLab


From 94e36ec1c7a0fc7c64721ee0f7cb7e7b655da782 Mon Sep 17 00:00:00 2001
From: Rob Vermaas <rob.vermaas@gmail.com>
Date: Fri, 16 Apr 2010 15:53:54 +0000
Subject: [PATCH 2296/5331] virtualisation/qemu-kvm.nix: use noacl option for
 hostfs mount

svn path=/nixos/trunk/; revision=21129
---
 modules/virtualisation/qemu-vm.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/virtualisation/qemu-vm.nix b/modules/virtualisation/qemu-vm.nix
index a17e167cb46..4152aeeaeb5 100644
--- a/modules/virtualisation/qemu-vm.nix
+++ b/modules/virtualisation/qemu-vm.nix
@@ -163,7 +163,7 @@ in
       { mountPoint = "/hostfs";
         device = "//10.0.2.4/qemu";
         fsType = "cifs";
-        options = "guest,username=nobody,noperm";
+        options = "guest,username=nobody,noperm,noacl";
         neededForBoot = true;
       }
       { mountPoint = "/nix/store";
-- 
GitLab


From 1c9eb048c960a1864682526284e034b0bfde8445 Mon Sep 17 00:00:00 2001
From: Sander van der Burg <s.vanderburg@tudelft.nl>
Date: Fri, 16 Apr 2010 18:06:23 +0000
Subject: [PATCH 2297/5331] - Implemented rootPassword option to automatically
 configure the root password (by default it's empty, which you usually don't
 want) - Implemented initialScript option to configure database properties on
 first startup (such as granting permissions)

svn path=/nixos/trunk/; revision=21135
---
 modules/services/databases/mysql.nix | 83 +++++++++++++++++++---------
 1 file changed, 58 insertions(+), 25 deletions(-)

diff --git a/modules/services/databases/mysql.nix b/modules/services/databases/mysql.nix
index 9ec77e2d474..19c0bcc418a 100644
--- a/modules/services/databases/mysql.nix
+++ b/modules/services/databases/mysql.nix
@@ -61,7 +61,7 @@ in
       pidDir = mkOption {
         default = "/var/run/mysql";
         description = "Location of the file which stores the PID of the MySQL server";
-      };
+      };           
       
       initialDatabases = mkOption {
         default = [];
@@ -71,6 +71,16 @@ in
 	  { name = "bardatabase"; schema = ./bardatabase.sql; }
 	];
       };
+      
+      initialScript = mkOption {
+        default = null;
+	description = "A file containing SQL statements to be executed on the first startup. Can be used for granting certain permissions on the database";
+      };
+      
+      rootPassword = mkOption {
+        default = null;
+	description = "Path to a file containing the root password, modified on the first startup. Not specifying a root password will leave the root password empty.";	
+      };
     };
     
   };
@@ -98,6 +108,7 @@ in
                 mkdir -m 0700 -p ${cfg.dataDir}
                 chown -R ${cfg.user} ${cfg.dataDir}
                 ${mysql}/bin/mysql_install_db ${mysqldOptions}
+		touch /tmp/mysql_init
             fi
 
             mkdir -m 0700 -p ${cfg.pidDir}
@@ -114,35 +125,57 @@ in
             do
                 if [ $count -eq 30 ]
                 then
-                  echo "Tried 30 times, giving up..."
-	          exit 1
-                 fi
+                    echo "Tried 30 times, giving up..."
+	            exit 1
+                fi
 
-                 echo "MySQL daemon not yet started. Waiting for 1 second..."
-                 count=$((count++))
-                 sleep 1
+                echo "MySQL daemon not yet started. Waiting for 1 second..."
+                count=$((count++))
+                sleep 1
             done
 
-            # Create initial databases
-
-            ${concatMapStrings (database: 
-              ''
-                if ! test -e "${cfg.dataDir}/${database.name}"; then
-                    echo "Creating initial database: ${database.name}"
-                    ( echo "create database ${database.name};"
-                      echo "use ${database.name};"
-		      if [ -f "${database.schema}" ]
-		      then
-                          cat ${database.schema}
-		      elif [ -d "${database.schema}" ]
-		      then
-		          cat ${database.schema}/mysql-databases/*.sql
-		      fi
+	    if [ -f /tmp/mysql_init ]
+	    then
+	        # Create initial databases
+
+                ${concatMapStrings (database: 
+                  ''
+                    if ! test -e "${cfg.dataDir}/${database.name}"; then
+                        echo "Creating initial database: ${database.name}"
+                        ( echo "create database ${database.name};"
+                          echo "use ${database.name};"
+		          if [ -f "${database.schema}" ]
+		          then
+                              cat ${database.schema}
+		          elif [ -d "${database.schema}" ]
+		          then
+		              cat ${database.schema}/mysql-databases/*.sql
+		          fi
+		        ) | ${mysql}/bin/mysql -u root -N
+                    fi
+                  '') cfg.initialDatabases}            
+	
+	        # Execute initial script
+		
+		${optionalString (cfg.initialScript != null)
+		  ''
+		    cat ${cfg.initialScript} | ${mysql}/bin/mysql -u root -N
+		  ''}
+		
+	        # Change root password
+		
+		${optionalString (cfg.rootPassword != null)
+		  ''
+		    ( echo "use mysql;"
+		      echo "update user set Password=password('$(cat ${cfg.rootPassword})') where User='root';"
+		      echo "flush privileges;"
 		    ) | ${mysql}/bin/mysql -u root -N
-                fi
-              '') cfg.initialDatabases}            
+		  ''}
+		  
+	      rm /tmp/mysql_init
+	    fi
 	  '';
-
+	  	  
         # !!! Need a postStart script to wait until mysqld is ready to
         # accept connections.
 
-- 
GitLab


From 33ed225a84d2ce053f1acb0a0f4517a04a64dcc9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Sat, 17 Apr 2010 15:20:13 +0000
Subject: [PATCH 2298/5331] Making the /dev and /dev/shm tmpfs sizes
 configurable. By default, they take the usual value of "50% of physical RAM".

As /dev/shm can be filled by anyone, and tmpfs does not trigger the OOM killer (and
can hang the machine due to a lack of RAM), I need to configure that down
in order to avoid crashes.

There is still left the /var/run/nscd tmpfs filesystem, also created with 50%
of the RAM, but at least not writeable by anyone. We could find a reasonable
low value for that, or allow configuration.


svn path=/nixos/trunk/; revision=21140
---
 modules/system/boot/stage-2-init.sh |  4 ++--
 modules/system/boot/stage-2.nix     | 36 +++++++++++++++++++++++------
 2 files changed, 31 insertions(+), 9 deletions(-)

diff --git a/modules/system/boot/stage-2-init.sh b/modules/system/boot/stage-2-init.sh
index 79836b7d9a8..6035f43d3ad 100644
--- a/modules/system/boot/stage-2-init.sh
+++ b/modules/system/boot/stage-2-init.sh
@@ -82,9 +82,9 @@ done
 mkdir -m 0755 -p /sys 
 mount -t sysfs none /sys
 mkdir -m 0755 -p /dev
-mount -t tmpfs -o "mode=0755" none /dev
+mount -t tmpfs -o "mode=0755,size=@devSize@" none /dev
 mkdir -m 0777 /dev/shm
-mount -t tmpfs -o "rw,nosuid,nodev" tmpfs /dev/shm
+mount -t tmpfs -o "rw,nosuid,nodev,size=@devShmSize@" tmpfs /dev/shm
 mkdir -m 0755 -p /dev/pts
 mount -t devpts -o mode=0600,gid=@ttyGid@ none /dev/pts 
 [ -e /proc/bus/usb ] && mount -t usbfs none /proc/bus/usb # uml doesn't have usb by default
diff --git a/modules/system/boot/stage-2.nix b/modules/system/boot/stage-2.nix
index 2e5e2e524dd..fc510dcbaea 100644
--- a/modules/system/boot/stage-2.nix
+++ b/modules/system/boot/stage-2.nix
@@ -4,13 +4,34 @@ let
 
   options = {
 
-    boot.postBootCommands = pkgs.lib.mkOption {
-      default = "";
-      example = "rm -f /var/log/messages";
-      merge = pkgs.lib.mergeStringOption;
-      description = ''
-        Shell commands to be executed just before Upstart is started.
-      '';
+    boot = {
+      postBootCommands = pkgs.lib.mkOption {
+        default = "";
+        example = "rm -f /var/log/messages";
+        merge = pkgs.lib.mergeStringOption;
+        description = ''
+          Shell commands to be executed just before Upstart is started.
+        '';
+      };
+
+      devSize = pkgs.lib.mkOption {
+        default = "50%";
+        example = "32m";
+        description = ''
+          Size limit for the /dev tmpfs. Look at mount(8), tmpfs size option,
+          for the accepted syntax.
+        '';
+      };
+
+      devShmSize = pkgs.lib.mkOption {
+        default = "50%";
+        example = "256m";
+        description = ''
+          Size limit for the /dev/shm tmpfs. Look at mount(8), tmpfs size option,
+          for the accepted syntax.
+        '';
+      };
+
     };
 
   };
@@ -23,6 +44,7 @@ let
     src = ./stage-2-init.sh;
     isExecutable = true;
     inherit kernel activateConfiguration;
+    inherit (config.boot) devSize devShmSize;
     ttyGid = config.ids.gids.tty;
     upstart = config.system.build.upstart;
     path =
-- 
GitLab


From e18b352ce000a76b6dd8341f5773a6d73ec28a98 Mon Sep 17 00:00:00 2001
From: Rob Vermaas <rob.vermaas@gmail.com>
Date: Mon, 19 Apr 2010 07:42:27 +0000
Subject: [PATCH 2299/5331] remove obsolete option from machine spec

svn path=/nixos/trunk/; revision=21151
---
 lib/testing.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/lib/testing.nix b/lib/testing.nix
index 392ae8ca9b0..ca0b7297251 100644
--- a/lib/testing.nix
+++ b/lib/testing.nix
@@ -145,7 +145,6 @@ rec {
         { config, pkgs, ... }:
         {
           virtualisation.memorySize = 1024;
-          virtualisation.readonlyHostFS = false;
           services.xserver.enable = true;
           services.xserver.displayManager.slim.enable = false;
           services.xserver.displayManager.auto.enable = true;
-- 
GitLab


From a008d6b391b92ec0960fee076395d33dc8d3aa3c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Mon, 19 Apr 2010 10:54:39 +0000
Subject: [PATCH 2300/5331] Fixing the cups-progs build problems, for the cupsd
 module. It wrote over other store paths.

svn path=/nixos/trunk/; revision=21161
---
 modules/services/printing/cupsd.nix | 21 +++++++++++++--------
 1 file changed, 13 insertions(+), 8 deletions(-)

diff --git a/modules/services/printing/cupsd.nix b/modules/services/printing/cupsd.nix
index de1da1bc3e5..e2107b61cf9 100644
--- a/modules/services/printing/cupsd.nix
+++ b/modules/services/printing/cupsd.nix
@@ -12,6 +12,17 @@ let
 
   cfg = config.services.printing;
 
+  additionalBackends = pkgs.stdenv.mkDerivation {
+    name = "additional-cups-backends";
+    builder = pkgs.writeScript "additional-backends-builder.sh" ''
+      ${pkgs.coreutils}/bin/mkdir -p $out/lib/cups/backend
+      ${pkgs.coreutils}/bin/ln -s ${pkgs.samba}/bin/smbspool $out/lib/cups/backend/smb
+
+      # Provide support for printing via HTTPS.
+      ${pkgs.coreutils}/bin/ln -s ipp $out/lib/cups/backend/https
+    '';
+  };
+
   # Here we can enable additional backends, filters, etc. that are not
   # part of CUPS itself, e.g. the SMB backend is part of Samba.  Since
   # we can't update ${cups}/lib/cups itself, we create a symlink tree
@@ -19,15 +30,9 @@ let
   # cupsd.conf tells cupsd to use this tree.
   bindir = pkgs.buildEnv {
     name = "cups-progs";
-    paths = cfg.drivers;
+    paths =  cfg.drivers;
     pathsToLink = [ "/lib/cups" "/share/cups" ];
     postBuild =  ''
-      ${pkgs.coreutils}/bin/mkdir -p $out/lib/cups/backend
-      ${pkgs.coreutils}/bin/ln -s ${pkgs.samba}/bin/smbspool $out/lib/cups/backend/smb
-
-      # Provide support for printing via HTTPS.
-      ${pkgs.coreutils}/bin/ln -s ipp $out/lib/cups/backend/https
-
       ${cfg.bindirCmds}
     '';
   };
@@ -119,7 +124,7 @@ in
         exec = "${cups}/sbin/cupsd -c ${pkgs.writeText "cupsd.conf" cfg.cupsdConf} -F";
       };
 
-    services.printing.drivers = [ pkgs.cups pkgs.ghostscript ];
+    services.printing.drivers = [ pkgs.cups pkgs.ghostscript additionalBackends ];
     services.printing.cupsdConf = 
       ''
         LogLevel info
-- 
GitLab


From 2936d7062dd158f8a924fef214f8771d555f32f7 Mon Sep 17 00:00:00 2001
From: Sander van der Burg <s.vanderburg@tudelft.nl>
Date: Mon, 19 Apr 2010 13:26:21 +0000
Subject: [PATCH 2301/5331] Added creation of the disnix group on first
 startup, if the disnix service is enabled

svn path=/nixos/trunk/; revision=21164
---
 modules/misc/ids.nix             | 3 ++-
 modules/services/misc/disnix.nix | 5 +++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/modules/misc/ids.nix b/modules/misc/ids.nix
index 7ddb11cf6ca..87e2eacf911 100644
--- a/modules/misc/ids.nix
+++ b/modules/misc/ids.nix
@@ -51,7 +51,7 @@ in
     uptimed = 29;
     ddclient = 30;
     davfs2 = 31;
-    privoxy = 32;
+    privoxy = 32;    
     # When adding a uid, make sure it doesn't match an existing gid.
 
     nixbld = 30000; # start of range of uids
@@ -89,6 +89,7 @@ in
     polkituser = 28;
     davfs2 = 31;
     privoxy = 32;
+    disnix = 33;
     # When adding a gid, make sure it doesn't match an existing uid.
 
     users = 100;
diff --git a/modules/services/misc/disnix.nix b/modules/services/misc/disnix.nix
index 67d5df84701..09b9cf8fe08 100644
--- a/modules/services/misc/disnix.nix
+++ b/modules/services/misc/disnix.nix
@@ -36,6 +36,11 @@ in
     services.dbus.enable = true;
     services.dbus.packages = [ pkgs.disnix ];
 
+    users.extraGroups = singleton
+      { name = "disnix";
+        gid = config.ids.gids.disnix;
+      };
+      
     jobs.disnix =
       { description = "Disnix server";
 
-- 
GitLab


From 6c16ff29a5a2751417584b5b0fefbd313326cf34 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 20 Apr 2010 14:35:12 +0000
Subject: [PATCH 2302/5331] * Don't do "kbd_mode -u" because it kicks the X
 server out of raw   mode, and isn't needed anyway.

svn path=/nixos/trunk/; revision=21182
---
 modules/tasks/kbd.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/modules/tasks/kbd.nix b/modules/tasks/kbd.nix
index 8ed4b44f91b..0d746f648f0 100644
--- a/modules/tasks/kbd.nix
+++ b/modules/tasks/kbd.nix
@@ -88,7 +88,10 @@ in
             done
 
             # Set the keyboard driver in UTF-8 mode.
-            ${pkgs.kbd}/bin/kbd_mode -u
+            # !!! Commented out because it running this while the X
+            # server is running kicks the X server out of raw mode.
+            # UTF-8 mode is the default nowadays anyway.
+            # ${pkgs.kbd}/bin/kbd_mode -u
 
           else
 
-- 
GitLab


From 8874226fa3a9477475610733ec163854000dd9a9 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 21 Apr 2010 11:37:52 +0000
Subject: [PATCH 2303/5331] * Add rfkill to the system path.

svn path=/nixos/trunk/; revision=21201
---
 modules/services/networking/wpa_supplicant.nix | 2 +-
 modules/tasks/network-interfaces.nix           | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/modules/services/networking/wpa_supplicant.nix b/modules/services/networking/wpa_supplicant.nix
index abf79c5d554..52241da023a 100644
--- a/modules/services/networking/wpa_supplicant.nix
+++ b/modules/services/networking/wpa_supplicant.nix
@@ -42,7 +42,7 @@ in
   
   config = mkIf config.networking.enableWLAN {
 
-    environment.systemPackages = [pkgs.wpa_supplicant];
+    environment.systemPackages =  [ pkgs.wpa_supplicant ];
 
     jobs.wpa_supplicant = 
       { startOn = "started network-interfaces";
diff --git a/modules/tasks/network-interfaces.nix b/modules/tasks/network-interfaces.nix
index d2268e47b01..28372450f24 100644
--- a/modules/tasks/network-interfaces.nix
+++ b/modules/tasks/network-interfaces.nix
@@ -130,6 +130,7 @@ in
         pkgs.iputils
         pkgs.nettools
         pkgs.wirelesstools
+        pkgs.rfkill
       ];
     
     jobs.networkInterfaces = 
-- 
GitLab


From 41bf426a661899dacda7b056c2e49784bfca0161 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Wed, 21 Apr 2010 20:55:57 +0000
Subject: [PATCH 2304/5331] Making the httpd prefork basic settings
 configurable. I kept the defaults as they where, to avoid surprises. (150
 httpd processes simultaneously answering? Too much for my machines)

svn path=/nixos/trunk/; revision=21220
---
 .../web-servers/apache-httpd/default.nix         | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/modules/services/web-servers/apache-httpd/default.nix b/modules/services/web-servers/apache-httpd/default.nix
index 3659b75f22d..d9a1e7d05fe 100644
--- a/modules/services/web-servers/apache-httpd/default.nix
+++ b/modules/services/web-servers/apache-httpd/default.nix
@@ -283,8 +283,8 @@ let
     PidFile ${mainCfg.stateDir}/httpd.pid
 
     <IfModule prefork.c>
-        MaxClients           150
-        MaxRequestsPerChild  0
+        MaxClients           ${toString mainCfg.maxClients}
+        MaxRequestsPerChild  ${toString mainCfg.maxRequestsPerChild}
     </IfModule>
 
     ${let
@@ -486,6 +486,18 @@ in
           "Options appended to the PHP configuration file <filename>php.ini</filename>.";
       };
 
+      maxClients = mkOption {
+        default = 150;
+        example = 8;
+        description = "Maximum number of httpd processes (prefork)";
+      };
+
+      maxRequestsPerChild = mkOption {
+        default = 0;
+        example = 500;
+        description =
+          "Maximum number of httpd requests answered per httpd child (prefork), 0 means unlimited";
+      };
     }
 
     # Include the options shared between the main server and virtual hosts.
-- 
GitLab


From b7dab319e555f7bf1ba7c8f9445b23e48d0836a2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Thu, 22 Apr 2010 10:11:32 +0000
Subject: [PATCH 2305/5331] Fixing the tty group and permissions for vt
 consoles

svn path=/nixos/trunk/; revision=21231
---
 modules/programs/pwdutils/login.defs | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/modules/programs/pwdutils/login.defs b/modules/programs/pwdutils/login.defs
index d146275b9f5..a310ca5af5a 100644
--- a/modules/programs/pwdutils/login.defs
+++ b/modules/programs/pwdutils/login.defs
@@ -9,3 +9,6 @@ SYSTEM_GID_MIN            100
 SYSTEM_GID_MAX            499
 GID_MIN                  1000
 GID_MAX                 29999
+
+TTYGROUP  tty
+TTYPERM   0620
-- 
GitLab


From d7406769acd06fbd83ab066da9a0fca985f71c2d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Thu, 22 Apr 2010 13:56:26 +0000
Subject: [PATCH 2306/5331] Making /var/run/utmp writable by the 'utmp' group.
 Then, people can choose a setgid utmp for their xterm, konsole or whatever to
 get the terminals reported there.

svn path=/nixos/trunk/; revision=21238
---
 modules/config/users-groups.nix                 | 3 +++
 modules/misc/ids.nix                            | 1 +
 modules/system/activation/activation-script.nix | 3 ++-
 3 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/modules/config/users-groups.nix b/modules/config/users-groups.nix
index 72d3e21f203..cb84117090b 100644
--- a/modules/config/users-groups.nix
+++ b/modules/config/users-groups.nix
@@ -90,6 +90,9 @@ let
           { name = "nixbld";
             gid = ids.gids.nixbld;
           }
+          { name = "utmp";
+            gid = ids.gids.utmp;
+          }
         ];
 
       addAttrs =
diff --git a/modules/misc/ids.nix b/modules/misc/ids.nix
index 87e2eacf911..041b0badd0e 100644
--- a/modules/misc/ids.nix
+++ b/modules/misc/ids.nix
@@ -87,6 +87,7 @@ in
     video = 26;
     dialout = 27;
     polkituser = 28;
+    utmp = 29;
     davfs2 = 31;
     privoxy = 32;
     disnix = 33;
diff --git a/modules/system/activation/activation-script.nix b/modules/system/activation/activation-script.nix
index 21c52abe49f..b87429008a5 100644
--- a/modules/system/activation/activation-script.nix
+++ b/modules/system/activation/activation-script.nix
@@ -79,7 +79,8 @@ let
       mkdir -m 0755 -p /var/run/console # for pam_console
 
       touch /var/run/utmp # must exist
-      chmod 644 /var/run/utmp
+      chgrp ${config.ids.gids.utmp} /var/run/utmp
+      chmod 664 /var/run/utmp
 
       mkdir -m 0755 -p /var/run/nix/current-load # for distributed builds
       mkdir -m 0700 -p /var/run/nix/remote-stores
-- 
GitLab


From a37743794d47d29b8223a46574ade05d7a857f55 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Thu, 22 Apr 2010 14:54:09 +0000
Subject: [PATCH 2307/5331] I forgot a 'toString' in front of an integer

svn path=/nixos/trunk/; revision=21242
---
 modules/system/activation/activation-script.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/system/activation/activation-script.nix b/modules/system/activation/activation-script.nix
index b87429008a5..744a35f54f4 100644
--- a/modules/system/activation/activation-script.nix
+++ b/modules/system/activation/activation-script.nix
@@ -79,7 +79,7 @@ let
       mkdir -m 0755 -p /var/run/console # for pam_console
 
       touch /var/run/utmp # must exist
-      chgrp ${config.ids.gids.utmp} /var/run/utmp
+      chgrp ${toString config.ids.gids.utmp} /var/run/utmp
       chmod 664 /var/run/utmp
 
       mkdir -m 0755 -p /var/run/nix/current-load # for distributed builds
-- 
GitLab


From d9528767af45f08527418d3e10ea26057c1e608e Mon Sep 17 00:00:00 2001
From: Sander van der Burg <s.vanderburg@tudelft.nl>
Date: Thu, 22 Apr 2010 15:13:50 +0000
Subject: [PATCH 2308/5331] Added preliminary Apache Felix service

svn path=/nixos/trunk/; revision=21244
---
 modules/misc/ids.nix            |   2 +
 modules/module-list.nix         |   1 +
 modules/services/misc/felix.nix | 110 ++++++++++++++++++++++++++++++++
 3 files changed, 113 insertions(+)
 create mode 100644 modules/services/misc/felix.nix

diff --git a/modules/misc/ids.nix b/modules/misc/ids.nix
index 041b0badd0e..c2ebd407b2a 100644
--- a/modules/misc/ids.nix
+++ b/modules/misc/ids.nix
@@ -52,6 +52,7 @@ in
     ddclient = 30;
     davfs2 = 31;
     privoxy = 32;    
+    osgi = 34;
     # When adding a uid, make sure it doesn't match an existing gid.
 
     nixbld = 30000; # start of range of uids
@@ -91,6 +92,7 @@ in
     davfs2 = 31;
     privoxy = 32;
     disnix = 33;
+    osgi = 34;
     # When adding a gid, make sure it doesn't match an existing uid.
 
     users = 100;
diff --git a/modules/module-list.nix b/modules/module-list.nix
index 0788e6b31b9..aa6c5347e88 100644
--- a/modules/module-list.nix
+++ b/modules/module-list.nix
@@ -58,6 +58,7 @@
   ./services/mail/postfix.nix
   ./services/misc/autofs.nix
   ./services/misc/disnix.nix
+  ./services/misc/felix.nix
   ./services/misc/gpsd.nix
   ./services/misc/nix-daemon.nix
   ./services/misc/nix-gc.nix
diff --git a/modules/services/misc/felix.nix b/modules/services/misc/felix.nix
new file mode 100644
index 00000000000..f05abc38f08
--- /dev/null
+++ b/modules/services/misc/felix.nix
@@ -0,0 +1,110 @@
+# Felix server
+{ config, pkgs, ... }:
+
+with pkgs.lib;
+
+let
+
+  cfg = config.services.felix;
+
+in
+
+{
+
+  ###### interface
+  
+  options = {
+  
+    services.felix = {
+    
+      enable = mkOption {
+        default = false;
+        description = "Whether to enable the Apache Felix OSGi service";
+      };
+      
+      bundles = mkOption {
+        default = [ pkgs.felix_remoteshell ];
+        description = "List of bundles that should be activated on startup";
+      };
+
+      user = mkOption {
+        default = "osgi";
+        description = "User account under which Apache Felix runs.";
+      };      
+
+      group = mkOption {
+        default = "osgi";
+        description = "Group account under which Apache Felix runs.";
+      };      
+      
+    };
+    
+  };
+  
+
+  ###### implementation
+
+  config = mkIf cfg.enable {
+    users.extraGroups = singleton
+      { name = "osgi";
+        gid = config.ids.gids.osgi;
+      };
+      
+    users.extraUsers = singleton
+      { name = "osgi";
+        uid = config.ids.uids.osgi;
+        description = "OSGi user";
+        home = "/homeless-shelter";
+      };
+
+    jobs.felix =
+      { description = "Felix server";
+
+        preStart = 
+	  ''
+	    # Initialise felix instance on first startup
+	    if [ ! -d /var/felix ]
+	    then
+	        # Symlink system files
+		
+	        mkdir -p /var/felix
+		chown ${cfg.user}:${cfg.group} /var/felix
+		
+		for i in ${pkgs.felix}/*
+		do
+		    if [ "$i" != "${pkgs.felix}/bundle" ]
+		    then
+		        ln -sfn $i /var/felix/$(basename $i)
+		    fi
+		done
+		
+		# Symlink bundles
+		mkdir -p /var/felix/bundle
+		chown ${cfg.user}:${cfg.group} /var/felix/bundle
+		
+		for i in ${pkgs.felix}/bundle/* ${toString cfg.bundles}
+		do
+		    if [ -f $i ]
+		    then
+		        ln -sfn $i /var/felix/bundle/$(basename $i)
+		    elif [ -d $i ]
+		    then
+		        for j in $i/bundle/*
+			do
+			    ln -sfn $j /var/felix/bundle/$(basename $j)
+			done
+		    fi
+		done
+	    fi
+	  '';
+	  
+        script =
+          ''
+	    cd /var/felix
+            ${pkgs.su}/bin/su -s ${pkgs.bash}/bin/sh ${cfg.user} -c '${pkgs.jre}/bin/java -jar bin/felix.jar'
+          '';
+      };
+
+  };
+
+}
-- 
GitLab


From a30637aba51d9ab0fc85a8ba70c001b3f9d5bc3f Mon Sep 17 00:00:00 2001
From: "Yury G. Kudryashov" <urkud.urkud@gmail.com>
Date: Sun, 25 Apr 2010 18:26:51 +0000
Subject: [PATCH 2309/5331] Really use nix-worker in nixos-rebuild

svn path=/nixos/trunk/; revision=21307
---
 modules/installer/tools/nixos-rebuild.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/installer/tools/nixos-rebuild.sh b/modules/installer/tools/nixos-rebuild.sh
index 5c1faf7eb4f..8d87b59bfb2 100644
--- a/modules/installer/tools/nixos-rebuild.sh
+++ b/modules/installer/tools/nixos-rebuild.sh
@@ -119,7 +119,7 @@ trap 'rm -rf "$tmpDir"' EXIT
 # This matters if the new Nix in Nixpkgs has a schema change.  It
 # would upgrade the schema, which should only happen once we actually
 # switch to the new configuration.
-if initctl status nix-daemon 2>&1 | grep -q ' running'; then
+if initctl status nix-daemon 2>&1 | grep -q 'running'; then
     export NIX_REMOTE=${NIX_REMOTE:-daemon}
 fi
 
-- 
GitLab


From a5718503e5ce756caa9f1c50058fb128737276b3 Mon Sep 17 00:00:00 2001
From: "Yury G. Kudryashov" <urkud.urkud@gmail.com>
Date: Sun, 25 Apr 2010 18:26:56 +0000
Subject: [PATCH 2310/5331] Change firmware handling

This way should work with both old udev and new one.

svn path=/nixos/trunk/; revision=21308
---
 modules/services/hardware/udev.nix      | 10 ++++++++--
 modules/system/activation/top-level.nix |  1 +
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/modules/services/hardware/udev.nix b/modules/services/hardware/udev.nix
index e7c9d84033c..e34d52a4ed5 100644
--- a/modules/services/hardware/udev.nix
+++ b/modules/services/hardware/udev.nix
@@ -134,7 +134,7 @@ in
     
     hardware.firmware = mkOption {
       default = [];
-      example = ["/root/my-firmware"];
+      example = [/root/my-firmware];
       merge = mergeListOption; 
       description = ''
         List of directories containing firmware files.  Such files
@@ -142,6 +142,11 @@ in
         (i.e., when it has detected specific hardware that requires
         firmware to function).
       '';
+      apply = list: pkgs.buildEnv {
+        name = "firmware";
+        paths = list;
+        pathsToLink = [ "/" ];
+      };
     };
     
   };
@@ -157,7 +162,8 @@ in
 
     # As a fallback, allow firmware to be placed in
     # /root/test-firmware (primarily for testing).
-    hardware.firmware = [ "/root/test-firmware" ];
+    hardware.firmware = pkgs.lib.optional
+      (builtins.pathExists /root/test-firmware) /root/test-firmware;
 
     jobs.udev =
       { startOn = "startup";
diff --git a/modules/system/activation/top-level.nix b/modules/system/activation/top-level.nix
index 0128ffb0c26..8cd23cd933d 100644
--- a/modules/system/activation/top-level.nix
+++ b/modules/system/activation/top-level.nix
@@ -79,6 +79,7 @@ let
       ln -s ${config.system.build.etc}/etc $out/etc
       ln -s ${config.system.path} $out/sw
       ln -s ${config.system.build.upstart} $out/upstart
+      ln -s ${config.hardware.firmware} $out/firmware
 
       echo "$kernelParams" > $out/kernel-params
       echo "$configurationName" > $out/configuration-name
-- 
GitLab


From 226a9c8bbbe4be4bbd8e53cc5b55f8058c29d008 Mon Sep 17 00:00:00 2001
From: "Yury G. Kudryashov" <urkud.urkud@gmail.com>
Date: Sun, 25 Apr 2010 18:27:00 +0000
Subject: [PATCH 2311/5331] Update CUPS module

* Create symlinks in cups-progs only if they aren't already here
* add tmpDir option

svn path=/nixos/trunk/; revision=21309
---
 modules/services/printing/cupsd.nix | 35 +++++++++++++++++++----------
 1 file changed, 23 insertions(+), 12 deletions(-)

diff --git a/modules/services/printing/cupsd.nix b/modules/services/printing/cupsd.nix
index e2107b61cf9..cbf67d391b5 100644
--- a/modules/services/printing/cupsd.nix
+++ b/modules/services/printing/cupsd.nix
@@ -15,11 +15,18 @@ let
   additionalBackends = pkgs.stdenv.mkDerivation {
     name = "additional-cups-backends";
     builder = pkgs.writeScript "additional-backends-builder.sh" ''
-      ${pkgs.coreutils}/bin/mkdir -p $out/lib/cups/backend
-      ${pkgs.coreutils}/bin/ln -s ${pkgs.samba}/bin/smbspool $out/lib/cups/backend/smb
+      PATH=${pkgs.coreutils}/bin
+      mkdir -p $out
+      if [[ ! -e ${pkgs.samba}/lib/cups/backend/smb ]]; then
+        mkdir -p $out/lib/cups/backend
+        ln -s ${pkgs.samba}/bin/smbspool $out/lib/cups/backend/smb
+      fi
 
       # Provide support for printing via HTTPS.
-      ${pkgs.coreutils}/bin/ln -s ipp $out/lib/cups/backend/https
+      if [[ ! -e ${pkgs.cups}/lib/cups/backend/https ]]; then
+        mkdir -p $out/lib/cups/backend
+        ln -s ipp $out/lib/cups/backend/https
+      fi
     '';
   };
 
@@ -30,11 +37,9 @@ let
   # cupsd.conf tells cupsd to use this tree.
   bindir = pkgs.buildEnv {
     name = "cups-progs";
-    paths =  cfg.drivers;
+    paths = cfg.drivers;
     pathsToLink = [ "/lib/cups" "/share/cups" ];
-    postBuild =  ''
-      ${cfg.bindirCmds}
-    '';
+    postBuild = cfg.bindirCmds;
   };
 
 in
@@ -44,7 +49,6 @@ in
   ###### interface
 
   options = {
-  
     services.printing = {
 
       enable = mkOption {
@@ -82,11 +86,18 @@ in
         '';
       };
 
+      tempDir = mkOption {
+        default = "/tmp";
+        example = "/tmp/cups";
+        description = ''
+          CUPSd temporary directory.
+        '';
+      };
     };
 
   };
 
-    
+
   ###### implementation
 
   config = mkIf config.services.printing.enable {
@@ -116,6 +127,7 @@ in
             mkdir -m 0755 -p ${logDir}
             mkdir -m 0700 -p /var/cache/cups
             mkdir -m 0700 -p /var/spool/cups
+            mkdir -m 0755 -p ${cfg.tempDir}
 
             # Make USB printers show up.
             ${modprobe}/sbin/modprobe usblp || true
@@ -125,7 +137,7 @@ in
       };
 
     services.printing.drivers = [ pkgs.cups pkgs.ghostscript additionalBackends ];
-    services.printing.cupsdConf = 
+    services.printing.cupsdConf =
       ''
         LogLevel info
 
@@ -146,7 +158,7 @@ in
         ErrorLog ${logDir}/error_log
         PageLog ${logDir}/page_log
 
-        TempDir /tmp
+        TempDir ${cfg.tempDir}
 
         Browsing On
         BrowseOrder allow,deny
@@ -195,5 +207,4 @@ in
       '';
 
   };
-  
 }
-- 
GitLab


From be3df19bd5cab4ca448dcb5ab36544d9de8726b2 Mon Sep 17 00:00:00 2001
From: "Yury G. Kudryashov" <urkud.urkud@gmail.com>
Date: Mon, 26 Apr 2010 09:04:24 +0000
Subject: [PATCH 2312/5331] Don't try to copy /root/test-firmware to /nix/store

svn path=/nixos/trunk/; revision=21316
---
 modules/services/hardware/udev.nix | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/modules/services/hardware/udev.nix b/modules/services/hardware/udev.nix
index e34d52a4ed5..eb19185260d 100644
--- a/modules/services/hardware/udev.nix
+++ b/modules/services/hardware/udev.nix
@@ -160,11 +160,6 @@ in
     
     services.udev.packages = [extraUdevRules];
 
-    # As a fallback, allow firmware to be placed in
-    # /root/test-firmware (primarily for testing).
-    hardware.firmware = pkgs.lib.optional
-      (builtins.pathExists /root/test-firmware) /root/test-firmware;
-
     jobs.udev =
       { startOn = "startup";
 
-- 
GitLab


From 69697a35bb812fc9cb71c90e7c36e04f9dd4f6e1 Mon Sep 17 00:00:00 2001
From: "Yury G. Kudryashov" <urkud.urkud@gmail.com>
Date: Mon, 26 Apr 2010 09:08:05 +0000
Subject: [PATCH 2313/5331] Add /root/test-firmware to FIRMWARE_DIRS

svn path=/nixos/trunk/; revision=21317
---
 modules/services/hardware/udev.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/services/hardware/udev.nix b/modules/services/hardware/udev.nix
index eb19185260d..6ce5bfced9a 100644
--- a/modules/services/hardware/udev.nix
+++ b/modules/services/hardware/udev.nix
@@ -42,7 +42,7 @@ let
 
       # Set the firmware search path so that the firmware.sh helper
       # called by 50-firmware.rules works properly.
-      echo 'ENV{FIRMWARE_DIRS}="${toString config.hardware.firmware}"' >> $out/00-path.rules
+      echo 'ENV{FIRMWARE_DIRS}="/root/test-firmware ${toString config.hardware.firmware}"' >> $out/00-path.rules
       
       # Add the udev rules from other packages.
       for i in ${toString cfg.packages}; do
-- 
GitLab


From ce15e270f2e712991447cb30fbe657ad8eb8dbb2 Mon Sep 17 00:00:00 2001
From: "Yury G. Kudryashov" <urkud.urkud@gmail.com>
Date: Mon, 26 Apr 2010 15:57:06 +0000
Subject: [PATCH 2314/5331] Fix non-bc change

svn path=/nixos/trunk/; revision=21326
---
 modules/services/x11/display-managers/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/services/x11/display-managers/default.nix b/modules/services/x11/display-managers/default.nix
index acc724c8663..0cebbbf6be1 100644
--- a/modules/services/x11/display-managers/default.nix
+++ b/modules/services/x11/display-managers/default.nix
@@ -43,7 +43,7 @@ let
       ${optionalString cfg.startGnuPGAgent ''
         if test -z "$SSH_AUTH_SOCK"; then
             # Restart this script as a child of the GnuPG agent.
-            exec "${pkgs.gnupg2}/bin/gpg-agent"                         \
+            exec "${if pkgs ? gnupg2 then pkgs.gnupg2 else pkgs.gnupg}/bin/gpg-agent"                         \
               --enable-ssh-support --daemon                             \
               --pinentry-program "${pkgs.pinentry}/bin/pinentry-gtk-2"  \
               --write-env-file "$HOME/.gpg-agent-info"                  \
-- 
GitLab


From 835522e40d732ccc5e0bcaccfa60fa14f194762e Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 27 Apr 2010 12:24:16 +0000
Subject: [PATCH 2315/5331] * Wait a bit more.

svn path=/nixos/trunk/; revision=21340
---
 tests/firefox.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/firefox.nix b/tests/firefox.nix
index e2f10fa97ab..6bc202de84b 100644
--- a/tests/firefox.nix
+++ b/tests/firefox.nix
@@ -14,7 +14,7 @@
       $machine->waitForX;
       $machine->execute("firefox file://${pkgs.valgrind}/share/doc/valgrind/html/index.html &");
       $machine->waitForWindow(/Valgrind.*Shiretoko/);
-      sleep 30; # wait until Firefox has finished loading the page
+      sleep 40; # wait until Firefox has finished loading the page
       $machine->screenshot("screen");
     '';
   
-- 
GitLab


From d1e87dfc86b71b1b238ccdb5696044c1a89b81ad Mon Sep 17 00:00:00 2001
From: Marc Weber <marco-oweber@gmx.de>
Date: Wed, 28 Apr 2010 14:55:26 +0000
Subject: [PATCH 2316/5331] =?UTF-8?q?adding=20two=20new=20options:=20-=20s?=
 =?UTF-8?q?ystem.copySystemConfiguration=20(requested=20by=20Ludovic=20Cou?=
 =?UTF-8?q?rt=C3=A8s)=20-=20system.extraSystemBuilderCmds?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

svn path=/nixos/trunk/; revision=21406
---
 lib/from-env.nix                        |  1 +
 modules/system/activation/top-level.nix | 36 +++++++++++++++++++++++++
 2 files changed, 37 insertions(+)

diff --git a/lib/from-env.nix b/lib/from-env.nix
index a7a339b5f2e..6bd71e40e9a 100644
--- a/lib/from-env.nix
+++ b/lib/from-env.nix
@@ -1,3 +1,4 @@
+# TODO: remove this file. There is lib.maybeEnv now
 name: default:
 let value = builtins.getEnv name; in
 if value == "" then default else value
diff --git a/modules/system/activation/top-level.nix b/modules/system/activation/top-level.nix
index 8cd23cd933d..2893ef076ea 100644
--- a/modules/system/activation/top-level.nix
+++ b/modules/system/activation/top-level.nix
@@ -31,6 +31,36 @@ let
         Name of the kernel file to be passed to the bootloader.
       '';
     };
+
+    system.copySystemConfiguration = pkgs.lib.mkOption {
+      default = true;
+      description = ''
+        Unless set to false copies the nixos configuration file
+        <literal>$NIXOS_CONFIG</literal> defaulting to
+        <filename>/etc/nixos/configuration.nix</filename>
+        to the system store path.
+        See <option>extraSystemBuilderCmds</option>
+        if you want to do add more customized info
+        to your system storepath.
+      '';
+    };
+
+    system.extraSystemBuilderCmds = pkgs.lib.mkOption {
+      default = "";
+      merge = pkgs.lib.concatStringsSep "\n";
+      description = ''
+        This code will be added to the builder creating the system store path.
+        This use case copies your configuration file into the system derivation:
+        <command>
+        cp ${pkgs.lib.maybeEnv "NIXOS_CONFIG" "/etc/nixos/configuration.nix"} $out
+        </command>
+        Of course you could add code saving a svn diff or svn revision number
+        of both nixos and nixpkgs repositories as well. Keep in mind that when
+        you build in chroots that you have do either copy sources to store or
+        add them to the chroot somehow.
+        You still should consider putting your configuration into a VCS.
+      '';
+    };
     
   };
 
@@ -95,6 +125,8 @@ let
       ensureDir $out/bin
       substituteAll ${./switch-to-configuration.sh} $out/bin/switch-to-configuration
       chmod +x $out/bin/switch-to-configuration
+
+      ${config.system.extraSystemBuilderCmds}
     '';
 
   
@@ -139,5 +171,9 @@ let
 in {
   require = [options];
 
+  system.extraSystemBuilderCmds =
+      pkgs.lib.optionalString
+          config.system.copySystemConfiguration
+          "cp ${pkgs.lib.maybeEnv "NIXOS_CONFIG" "/etc/nixos/configuration.nix"} $out";
   system.build.toplevel = system;
 }
-- 
GitLab


From 8754644faf09716db6310b96d63feb62b926cb2d Mon Sep 17 00:00:00 2001
From: Marc Weber <marco-oweber@gmx.de>
Date: Wed, 28 Apr 2010 19:52:00 +0000
Subject: [PATCH 2317/5331] add more documentation to distributedBuilds and
 what can be done if buildmachines are not always up

svn path=/nixos/trunk/; revision=21409
---
 modules/services/misc/nix-daemon.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/modules/services/misc/nix-daemon.nix b/modules/services/misc/nix-daemon.nix
index a39361e7fc7..924913ac986 100644
--- a/modules/services/misc/nix-daemon.nix
+++ b/modules/services/misc/nix-daemon.nix
@@ -75,6 +75,12 @@ in
         description = "
           Whether to distribute builds to the machines listed in
           <option>nix.buildMachines</option>.
+          If you know that the <option>buildMachines</buildMachines> are not
+          always available either use nixos
+          <command>nixos-rebuild --no-build-hook</command>
+          or consider managing <filename>/etc/nix.machines</filename> manually
+          by setting <option>manualNixMachines</option>. Then you can comment
+          unavailable buildmachines.
         ";
       };
 
-- 
GitLab


From ce642f0cc2d1891697b574ff6f1cadc3db2921ad Mon Sep 17 00:00:00 2001
From: Marc Weber <marco-oweber@gmx.de>
Date: Wed, 28 Apr 2010 19:52:03 +0000
Subject: [PATCH 2318/5331] nixos-rebuild: accept both: -jn and -j n

svn path=/nixos/trunk/; revision=21410
---
 modules/installer/tools/nixos-rebuild.sh | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/modules/installer/tools/nixos-rebuild.sh b/modules/installer/tools/nixos-rebuild.sh
index 8d87b59bfb2..6ed294ebf64 100644
--- a/modules/installer/tools/nixos-rebuild.sh
+++ b/modules/installer/tools/nixos-rebuild.sh
@@ -81,9 +81,15 @@ while test "$#" -gt 0; do
       --show-trace|--no-build-hook|--keep-failed|-K|--keep-going|-k|--verbose|-v|--fallback)
         extraBuildFlags="$extraBuildFlags $i"
       ;;
-      --max-jobs|-j)
-        j="$1"; shift 1
-        extraBuildFlags="$extraBuildFlags $i $j"
+      --max-jobs|-j*)
+        if [ -z "${i:2}" ]; then
+          # -j n
+          extraBuildFlags="$extraBuildFlags $i $1"
+          shift 1
+        else
+          # -jn
+          extraBuildFlags="$extraBuildFlags $i"
+        fi
       ;;
       --fast)
         buildNix=
-- 
GitLab


From 310eefffe7a3fbd8054eb79f3a6569c4d0635112 Mon Sep 17 00:00:00 2001
From: Rob Vermaas <rob.vermaas@gmail.com>
Date: Thu, 29 Apr 2010 12:37:26 +0000
Subject: [PATCH 2319/5331] added virtualisation.diskSize option to specify
 default image size of disk in qemu-kvm vm

svn path=/nixos/trunk/; revision=21422
---
 modules/virtualisation/qemu-vm.nix | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/modules/virtualisation/qemu-vm.nix b/modules/virtualisation/qemu-vm.nix
index 4152aeeaeb5..64910ed45c9 100644
--- a/modules/virtualisation/qemu-vm.nix
+++ b/modules/virtualisation/qemu-vm.nix
@@ -26,6 +26,15 @@ let
           '';
       };
       
+    virtualisation.diskSize = 
+      mkOption {
+        default = 512;
+        description =
+          ''
+            Disk size (M) of virtual machine.
+          '';
+      };
+      
     virtualisation.diskImage =
       mkOption {
         default = "./${vmName}.qcow2";
@@ -78,7 +87,7 @@ let
       NIX_DISK_IMAGE=''${NIX_DISK_IMAGE:-${config.virtualisation.diskImage}}
 
       if ! test -e "$NIX_DISK_IMAGE"; then
-          ${pkgs.qemu_kvm}/bin/qemu-img create -f qcow2 "$NIX_DISK_IMAGE" 512M || exit 1
+          ${pkgs.qemu_kvm}/bin/qemu-img create -f qcow2 "$NIX_DISK_IMAGE" ${toString config.virtualisation.diskSize}M || exit 1
       fi
       
       # -no-kvm-irqchip is needed to prevent the CIFS mount from
-- 
GitLab


From a4516ec98a4b89c41f6669d290b4791bcab692fc Mon Sep 17 00:00:00 2001
From: Rob Vermaas <rob.vermaas@gmail.com>
Date: Thu, 29 Apr 2010 12:45:22 +0000
Subject: [PATCH 2320/5331] workaround for some fs problems experienced by some
 tests of webdsl/crawljax. also added require argument to runinmachinewithx
 function

svn path=/nixos/trunk/; revision=21423
---
 lib/testing.nix | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/lib/testing.nix b/lib/testing.nix
index ca0b7297251..3a33ca69f08 100644
--- a/lib/testing.nix
+++ b/lib/testing.nix
@@ -104,15 +104,29 @@ rec {
   , machine
   , preBuild ? ""
   , postBuild ? ""
+  , ...
   }:
     let
       vms =
         buildVirtualNetwork { nodes = { client = machine; } ; };
 
+      # ugly workaround, until we figure out why some fs actions work properly inside 
+      # the vm. (e.g. unlink gives access denied over smb in qemu). note that the function
+      # now only works for derivations that lead to a directory in the store, not a file. 
       buildrunner = writeText "vm-build" ''
         source $1
+        oldout=$out
+        out=$TMPDIR$out
+        ${coreutils}/bin/mkdir -p $out
+        ${coreutils}/bin/mkdir -p $oldout
+        ${coreutils}/bin/ln -s $out $oldout
+
         ${coreutils}/bin/mkdir -p $TMPDIR
         exec $origBuilder $origArgs 
+
+        ${coreutils}/bin/rm -v $oldout
+        ${coreutils}/bin/cp -Rv $out/* $oldout/
+        out=$oldout 
       '';
 
       testscript = ''
@@ -139,11 +153,12 @@ rec {
         origBuilder = attrs.builder;
       });
 
-  runInMachineWithX = args :
+  runInMachineWithX = { require ? [], ...}@args :
     let
       client =
         { config, pkgs, ... }:
         {
+          inherit require;
           virtualisation.memorySize = 1024;
           services.xserver.enable = true;
           services.xserver.displayManager.slim.enable = false;
-- 
GitLab


From b47c2186f61389b027bd5cfd5fd6b4e59d2037ec Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Thu, 29 Apr 2010 18:54:08 +0000
Subject: [PATCH 2321/5331] Adding logrotate to nixos. Not a very clever
 logrotate, though: options 'enable' (cronjob every hour) and the config flie
 contents passed as a string.

svn path=/nixos/trunk/; revision=21438
---
 modules/module-list.nix                |  1 +
 modules/services/logging/logrotate.nix | 38 ++++++++++++++++++++++++++
 2 files changed, 39 insertions(+)
 create mode 100644 modules/services/logging/logrotate.nix

diff --git a/modules/module-list.nix b/modules/module-list.nix
index aa6c5347e88..fbea5e66fe6 100644
--- a/modules/module-list.nix
+++ b/modules/module-list.nix
@@ -53,6 +53,7 @@
   ./services/hardware/pcscd.nix
   ./services/hardware/udev.nix
   ./services/logging/klogd.nix
+  ./services/logging/logrotate.nix
   ./services/logging/syslogd.nix
   ./services/mail/dovecot.nix
   ./services/mail/postfix.nix
diff --git a/modules/services/logging/logrotate.nix b/modules/services/logging/logrotate.nix
new file mode 100644
index 00000000000..59091cc2473
--- /dev/null
+++ b/modules/services/logging/logrotate.nix
@@ -0,0 +1,38 @@
+{config, pkgs, ...}:
+
+with pkgs.lib;
+
+let
+  cfg = config.services.logrotate;
+
+  configFile = pkgs.writeText "logrotate.conf"
+    cfg.config;
+
+  cronJob = ''
+    5 * * * * ${pkgs.logrotate}/sbin/logrotate ${configFile}
+  '';
+
+in
+{
+  options = {
+    services.logrotate = {
+      enable = mkOption {
+        default = false;
+        description = ''
+          Enable the logrotate cron job
+        '';
+      };
+
+      config = mkOption {
+        default = "";
+        description = ''
+          The contents of the logrotate config file
+        '';
+      };
+    };
+  };
+
+  config = mkIf cfg.enable {
+    services.cron.systemCronJobs = [ cronJob ];
+  };
+}
-- 
GitLab


From cf3f1e9f2345bd66b92b4c7eac5df0f87feefe3e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Thu, 29 Apr 2010 18:59:05 +0000
Subject: [PATCH 2322/5331] INFOPATH fix; the info.nix module should not set
 the INFOPATH variable in bashrc, because the bashrc already cares on that,
 even taking into account all the usual nixos profiles.

As a side change, I changed a tab to spaces in bashrc.


svn path=/nixos/trunk/; revision=21439
---
 modules/programs/bash/bashrc.sh | 2 +-
 modules/programs/info.nix       | 5 -----
 2 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/modules/programs/bash/bashrc.sh b/modules/programs/bash/bashrc.sh
index cffd817663a..9c2ff17c6cb 100644
--- a/modules/programs/bash/bashrc.sh
+++ b/modules/programs/bash/bashrc.sh
@@ -34,7 +34,7 @@ for i in $NIX_PROFILES; do # !!! reverse
 
     # KDE/Gnome stuff.
     export KDEDIRS=$i:$KDEDIRS
-	export QT_PLUGIN_PATH=$i/plugins:$QT_PLUGIN_PATH
+    export QT_PLUGIN_PATH=$i/plugins:$QT_PLUGIN_PATH
     export XDG_CONFIG_DIRS=$i/etc/xdg:$XDG_CONFIG_DIRS
     export XDG_DATA_DIRS=$i/share:$XDG_DATA_DIRS
 done
diff --git a/modules/programs/info.nix b/modules/programs/info.nix
index a12aef6a7d0..e3b8025f933 100644
--- a/modules/programs/info.nix
+++ b/modules/programs/info.nix
@@ -33,9 +33,4 @@ in
 
 {
   environment.systemPackages = [infoWrapper];
-  
-  environment.shellInit =
-    ''
-      export INFOPATH=/var/run/current-system/sw/info:/var/run/current-system/sw/share/info  
-    '';
 }
-- 
GitLab


From 27886d8288bbb91c34fd56e06170d760ea58a946 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Thu, 29 Apr 2010 19:06:18 +0000
Subject: [PATCH 2323/5331] Fixing an xml manual tag (the manual did not
 validate, so, its build failed)

svn path=/nixos/trunk/; revision=21440
---
 modules/services/misc/nix-daemon.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/services/misc/nix-daemon.nix b/modules/services/misc/nix-daemon.nix
index 924913ac986..214e091886a 100644
--- a/modules/services/misc/nix-daemon.nix
+++ b/modules/services/misc/nix-daemon.nix
@@ -75,7 +75,7 @@ in
         description = "
           Whether to distribute builds to the machines listed in
           <option>nix.buildMachines</option>.
-          If you know that the <option>buildMachines</buildMachines> are not
+          If you know that the <option>buildMachines</option> are not
           always available either use nixos
           <command>nixos-rebuild --no-build-hook</command>
           or consider managing <filename>/etc/nix.machines</filename> manually
-- 
GitLab


From 9d33d052696bc5d0372bb30c7f81a1b282aaa9c8 Mon Sep 17 00:00:00 2001
From: "Yury G. Kudryashov" <urkud.urkud@gmail.com>
Date: Fri, 30 Apr 2010 07:36:19 +0000
Subject: [PATCH 2324/5331] Add $profile/lib/qt4/plugins to QT_PLUGIN_PATH

svn path=/nixos/trunk/; revision=21448
---
 modules/programs/bash/bashrc.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/programs/bash/bashrc.sh b/modules/programs/bash/bashrc.sh
index 9c2ff17c6cb..2a54449a4ce 100644
--- a/modules/programs/bash/bashrc.sh
+++ b/modules/programs/bash/bashrc.sh
@@ -34,7 +34,7 @@ for i in $NIX_PROFILES; do # !!! reverse
 
     # KDE/Gnome stuff.
     export KDEDIRS=$i:$KDEDIRS
-    export QT_PLUGIN_PATH=$i/plugins:$QT_PLUGIN_PATH
+    export QT_PLUGIN_PATH=$i/plugins:$i/lib/qt4/plugins:$QT_PLUGIN_PATH
     export XDG_CONFIG_DIRS=$i/etc/xdg:$XDG_CONFIG_DIRS
     export XDG_DATA_DIRS=$i/share:$XDG_DATA_DIRS
 done
-- 
GitLab


From 0829b8ea8cf807394cd3c9d79c561986b2255fc1 Mon Sep 17 00:00:00 2001
From: "Yury G. Kudryashov" <urkud.urkud@gmail.com>
Date: Fri, 30 Apr 2010 07:36:24 +0000
Subject: [PATCH 2325/5331] Link /etc/{xdg,dbus-1} if KDE is enabled

svn path=/nixos/trunk/; revision=21449
---
 modules/services/x11/desktop-managers/kde-environment.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/services/x11/desktop-managers/kde-environment.nix b/modules/services/x11/desktop-managers/kde-environment.nix
index f4eba9bba14..bb0f82b00dc 100644
--- a/modules/services/x11/desktop-managers/kde-environment.nix
+++ b/modules/services/x11/desktop-managers/kde-environment.nix
@@ -30,6 +30,6 @@ mkIf (kdePackages != [] && config.services.xserver.enable) {
   environment = {
     x11Packages = kdePackages;
     systemPackages = kdePackages;
-    pathsToLink = [ "/share" "/plugins" ];
+    pathsToLink = [ "/etc/xdg" "/etc/dbus-1" "/share" "/plugins" ];
   };
 }
-- 
GitLab


From 6daed6b8d2d93edcd2a657cd2da582890a99c52e Mon Sep 17 00:00:00 2001
From: Marc Weber <marco-oweber@gmx.de>
Date: Fri, 30 Apr 2010 07:43:29 +0000
Subject: [PATCH 2326/5331] setting default of copySystemConfiguration to
 false. http://thread.gmane.org/gmane.linux.distributions.nixos/3990

svn path=/nixos/trunk/; revision=21450
---
 modules/system/activation/top-level.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/system/activation/top-level.nix b/modules/system/activation/top-level.nix
index 2893ef076ea..871172f3039 100644
--- a/modules/system/activation/top-level.nix
+++ b/modules/system/activation/top-level.nix
@@ -33,7 +33,7 @@ let
     };
 
     system.copySystemConfiguration = pkgs.lib.mkOption {
-      default = true;
+      default = false;
       description = ''
         Unless set to false copies the nixos configuration file
         <literal>$NIXOS_CONFIG</literal> defaulting to
-- 
GitLab


From 65a4991eee4554ee95da3dd51836ce0bc76f20a1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Sat, 1 May 2010 13:23:32 +0000
Subject: [PATCH 2327/5331] I forgot the username in the system cron job for
 logrotate. So it did not work until now.

svn path=/nixos/trunk/; revision=21479
---
 modules/services/logging/logrotate.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/services/logging/logrotate.nix b/modules/services/logging/logrotate.nix
index 59091cc2473..c6c0d2ea238 100644
--- a/modules/services/logging/logrotate.nix
+++ b/modules/services/logging/logrotate.nix
@@ -9,7 +9,7 @@ let
     cfg.config;
 
   cronJob = ''
-    5 * * * * ${pkgs.logrotate}/sbin/logrotate ${configFile}
+    5 * * * * root ${pkgs.logrotate}/sbin/logrotate ${configFile}
   '';
 
 in
-- 
GitLab


From b6907519564461d058d7a18c81ef9be84fd6c3b6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Sat, 1 May 2010 20:25:57 +0000
Subject: [PATCH 2328/5331] Fixing the kwm nixos module - the kde3 attribute
 path changed in nixpkgs.

svn path=/nixos/trunk/; revision=21549
---
 modules/services/x11/window-managers/kwm.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/modules/services/x11/window-managers/kwm.nix b/modules/services/x11/window-managers/kwm.nix
index 3d946f213a3..6488ce3d324 100644
--- a/modules/services/x11/window-managers/kwm.nix
+++ b/modules/services/x11/window-managers/kwm.nix
@@ -28,7 +28,7 @@ mkIf cfg.enable {
         session = [{
           name = "kwm";
           start = "
-            ${pkgs.kdebase}/bin/kwin &
+            ${pkgs.kde3.kdebase}/bin/kwin &
             waitPID=$!
           ";
         }];
@@ -39,8 +39,8 @@ mkIf cfg.enable {
 
   environment = {
     x11Packages = [
-      pkgs.kdelibs
-      pkgs.kdebase
+      pkgs.kde3.kdelibs
+      pkgs.kde3.kdebase
     ];
   };
 }
-- 
GitLab


From e4e3789dadbe1a7a51fe77cd8dba6c47905f38b7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Sun, 2 May 2010 04:38:45 +0000
Subject: [PATCH 2329/5331] Make privoxy run with uid=privoxy. Patch by Russell
 O'Connor, sent to nix-dev.

svn path=/nixos/trunk/; revision=21551
---
 modules/services/networking/privoxy.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/services/networking/privoxy.nix b/modules/services/networking/privoxy.nix
index eee020a1f0e..a63a32996eb 100644
--- a/modules/services/networking/privoxy.nix
+++ b/modules/services/networking/privoxy.nix
@@ -12,7 +12,7 @@ let
 
   modprobe = config.system.sbin.modprobe;
 
-  privoxyFlags = "--no-daemon ${privoxyCfg}";
+  privoxyFlags = "--no-daemon --user ${privoxyUser} ${privoxyCfg}";
 
   privoxyCfg = pkgs.writeText "privoxy.conf" ''
     listen-address  ${config.services.privoxy.listenAddress}
-- 
GitLab


From 8fcbaefd2ee400cca2f8903808a154220da75abc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Thu, 6 May 2010 20:52:06 +0000
Subject: [PATCH 2330/5331] Refer to IceCat instead of Firefox.

svn path=/nixos/trunk/; revision=21636
---
 modules/config/system-path.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/config/system-path.nix b/modules/config/system-path.nix
index 82b4c1e582b..38be78876fb 100644
--- a/modules/config/system-path.nix
+++ b/modules/config/system-path.nix
@@ -65,7 +65,7 @@ let
 
       systemPackages = mkOption {
         default = [];
-        example = [pkgs.firefox pkgs.thunderbird];
+        example = [pkgs.icecat3 pkgs.thunderbird];
         description = ''
           The set of packages that appear in
           /var/run/current-system/sw.  These packages are
-- 
GitLab


From c1f7622512185b5680c9a3dd5f2b42d353227525 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 7 May 2010 15:14:50 +0000
Subject: [PATCH 2331/5331] * Improve obsolete/deprecated option warnings.

svn path=/nixos/trunk/; revision=21653
---
 modules/rename.nix | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/modules/rename.nix b/modules/rename.nix
index dbbc23dcfdf..19cf11b4fca 100644
--- a/modules/rename.nix
+++ b/modules/rename.nix
@@ -13,17 +13,17 @@ let
   obsolete = from: to: {
     name = "Obsolete name";
     msg.use = x:
-      builtins.trace "Option '${from}' is used instead of '${to}'." x;
+      builtins.trace "Obsolete option `${from}' is used instead of `${to}'." x;
     msg.define = x:
-      builtins.trace "Option '${from}' is defined instead of '${to}'." x;
+      builtins.trace "Obsolete option `${from}' is defined instead of `${to}'." x;
   };
 
   deprecated = from: to: {
     name = "Deprecated name";
     msg.use = x:
-      abort "Option '${from}' is used instead of '${to}'.";
+      abort "Deprecated option `${from}' is used instead of `${to}'.";
     msg.define = x:
-      abort "Option '${from}' is defined instead of '${to}'.";
+      abort "Deprecated option `${from}' is defined instead of `${to}'.";
   };
 
 
@@ -38,9 +38,9 @@ let
       setTo = setAttrByPath (splitString "." to);
       setFrom = setAttrByPath (splitString "." from);
       toOf = attrByPath (splitString "." to)
-        (abort "Renaming Error: option '${to}' does not exists.");
+        (abort "Renaming error: option `${to}' does not exists.");
       fromOf = attrByPath (splitString "." from)
-        (abort "Internal Error: option '${from}' should be declared.");
+        (abort "Internal error: option `${from}' should be declared.");
     in
       [{
         options = setFrom (mkOption {
-- 
GitLab


From 43fcf8a2b22db72a624f79b6b86687fb8f8d8621 Mon Sep 17 00:00:00 2001
From: Nicolas Pierron <nicolas.b.pierron@gmail.com>
Date: Sat, 8 May 2010 17:18:16 +0000
Subject: [PATCH 2332/5331] Fix swraid device detection on boot.

svn path=/nixos/trunk/; revision=21661
---
 modules/tasks/swraid.nix | 43 ++++++++++++++++++++++++++++++----------
 1 file changed, 33 insertions(+), 10 deletions(-)

diff --git a/modules/tasks/swraid.nix b/modules/tasks/swraid.nix
index dfdb9e9a34d..0c4a91db225 100644
--- a/modules/tasks/swraid.nix
+++ b/modules/tasks/swraid.nix
@@ -5,6 +5,7 @@
 let
 
   tempConf = "/var/run/mdadm.conf";
+  tempStatus = "/var/run/mdadm.status";
   logFile = "/var/log/mdadmEvents.log";
   modprobe = config.system.sbin.modprobe;
   inherit (pkgs) mdadm diffutils;
@@ -36,22 +37,43 @@ in
         ${modprobe}/sbin/modprobe $mod || true
       done
 
-      # Save previous probe
-      mv ${tempConf} ${tempConf}.old
+      # Wait until we can fetch the status of mdadm devices.
+      while ! test -e /proc/mdstat; do
+        sleep 10
+      done
 
       # Scan /proc/partitions for RAID devices.
       ${mdadm}/sbin/mdadm --examine --brief --scan -c partitions > ${tempConf}
 
-      if ! ${diffutils}/bin/diff ${tempConf} ${tempConf}.old > /dev/null; then
-        # Activate each device found.
-        ${mdadm}/sbin/mdadm --assemble -c ${tempConf} --scan
+      # If the status has changed.
+      if ! ${diffutils}/bin/diff -q /proc/mdstat ${tempStatus} > /dev/null; then
 
-        # Send notifications.
-        initctl emit -n new-devices
-      fi
+        # Keep the previous status to watch changes.
+        cp ${tempStatus} ${tempStatus}.old
+
+        try=0
+        # Loop until the status change.
+        while ${diffutils}/bin/diff -q ${tempStatus} ${tempStatus}.old > /dev/null; do
+          test "$try" -gt 12 && break
+          test "$try" -ne 0 && sleep 10
+
+          # Activate each device found.
+          ${mdadm}/sbin/mdadm --assemble -c ${tempConf} --scan
 
-      # Remove previous configuration.
-      rm ${tempConf}.old
+          # Register the new status
+          cp /proc/mdstat ${tempStatus}
+
+          try=$(($try + 1))
+        done
+
+        if test "$try" -le 6; then
+          # Send notifications.
+          initctl emit -n new-devices
+        fi
+
+        # Remove previous status.
+        rm ${tempStatus}.old
+      fi
     '';
 
     task = true;
@@ -64,6 +86,7 @@ in
 
     postStart = ''
       echo > ${tempConf}
+      echo > ${tempStatus}
 
       # Assemble early raid devices.
       initctl emit -n new-raid-array
-- 
GitLab


From 1ba1b66efd7fc5e96c5054a0c14d684dfbb88753 Mon Sep 17 00:00:00 2001
From: Nicolas Pierron <nicolas.b.pierron@gmail.com>
Date: Sat, 8 May 2010 17:18:22 +0000
Subject: [PATCH 2333/5331] Add services.xserver.screenSection to add
 additional screen options.

svn path=/nixos/trunk/; revision=21662
---
 modules/services/x11/xserver.nix | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/modules/services/x11/xserver.nix b/modules/services/x11/xserver.nix
index 1dc12ce0ff0..658a5d4e144 100644
--- a/modules/services/x11/xserver.nix
+++ b/modules/services/x11/xserver.nix
@@ -254,6 +254,14 @@ in
         description = "Contents of the first Device section of the X server configuration file.";
       };
 
+      screenSection = mkOption {
+        default = "";
+        example = ''
+          Option "RandRRotation" "on"
+        '';
+        description = "Contents of the first Screen section of the X server configuration file.";
+      };
+
       monitorSection = mkOption {
         default = "";
         example = "HorizSync 28-49";
@@ -485,6 +493,8 @@ in
             Identifier "Screen-${driver.name}[0]"
             Device "Device-${driver.name}[0]"
 
+            ${cfg.screenSection}
+
             ${optionalString (cfg.defaultDepth != 0) ''
               DefaultDepth ${toString cfg.defaultDepth}
             ''}
-- 
GitLab


From 06bfb319fe0d16474483ed5d9343740c93429842 Mon Sep 17 00:00:00 2001
From: Nicolas Pierron <nicolas.b.pierron@gmail.com>
Date: Sat, 8 May 2010 17:18:26 +0000
Subject: [PATCH 2334/5331] Add extra module argument to provide a
 nesting.clone option.  This option does the same as nesting.children except
 that each configuration inherits from the top-level configuration.

svn path=/nixos/trunk/; revision=21663
---
 lib/eval-config.nix                     |  2 +-
 modules/system/activation/no-clone.nix  | 13 +++++++++++
 modules/system/activation/top-level.nix | 30 ++++++++++++++++---------
 3 files changed, 34 insertions(+), 11 deletions(-)
 create mode 100644 modules/system/activation/no-clone.nix

diff --git a/lib/eval-config.nix b/lib/eval-config.nix
index 77c20caf604..49057f2d6da 100644
--- a/lib/eval-config.nix
+++ b/lib/eval-config.nix
@@ -30,7 +30,7 @@ rec {
   # These are the extra arguments passed to every module.  In
   # particular, Nixpkgs is passed through the "pkgs" argument.
   extraArgs = extraArgs_ // {
-    inherit pkgs;
+    inherit pkgs modules baseModules;
     modulesPath = ../modules;
     servicesPath = services;
   };
diff --git a/modules/system/activation/no-clone.nix b/modules/system/activation/no-clone.nix
new file mode 100644
index 00000000000..ca106807513
--- /dev/null
+++ b/modules/system/activation/no-clone.nix
@@ -0,0 +1,13 @@
+# This configuration is not made to figure inside the module-list.nix to
+# allow clone of the first level.
+{pkgs, ...}:
+
+with pkgs.lib;
+
+{
+  boot.loader.grub.device = mkOverride 0 {} "";
+  # undefined the obsolete name of the previous option.
+  boot.grubDevice = mkOverride 0 {} pkgs.lib.mkNotdef;
+  nesting.children = mkOverride 0 {} [];
+  nesting.clone = mkOverride 0 {} [];
+}
diff --git a/modules/system/activation/top-level.nix b/modules/system/activation/top-level.nix
index 871172f3039..262a3bb9ae7 100644
--- a/modules/system/activation/top-level.nix
+++ b/modules/system/activation/top-level.nix
@@ -1,4 +1,4 @@
-{pkgs, config, ...}:
+{pkgs, config, modules, baseModules, ...}:
 
 let
 
@@ -18,6 +18,14 @@ let
       '';
     };
 
+    nesting.clone = pkgs.lib.mkOption {
+      default = [];
+      description = ''
+        Additional configurations to build based on the current
+        configuration which is has a lower priority.
+      '';
+    };
+
     system.boot.loader.id = pkgs.lib.mkOption {
       default = "";
       description = ''
@@ -71,18 +79,20 @@ let
   # you can provide an easy way to boot the same configuration 
   # as you use, but with another kernel
   # !!! fix this
-  children = with pkgs.lib;
+  cloner = inheritParent: list: with pkgs.lib;
     map (childConfig:
       (import ../../../lib/eval-config.nix {
-        modules = [
-          (recursiveUpdate childConfig {
-            boot.loader.grub.device = "";
-            # undefined the obsolete name of the previous option.
-            boot.grubDevice = pkgs.lib.mkNotdef;
-          })
-        ] ++ attrByPath ["require"] [] childConfig;
+        inherit baseModules;
+        modules =
+           (optionals inheritParent modules)
+        ++ [ ./no-clone.nix ]
+        ++ [ childConfig ];
       }).config.system.build.toplevel
-    ) config.nesting.children;
+    ) list;
+
+  children =
+     cloner false config.nesting.children
+  ++ cloner true config.nesting.clone;
 
 
   systemBuilder =
-- 
GitLab


From f8ff75202e1139ca1482f8f6ca508eabf46b6016 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Sat, 8 May 2010 19:02:54 +0000
Subject: [PATCH 2335/5331] Fixing the mountd nfs upstart script (about
 /etc/exports and its contents)

svn path=/nixos/trunk/; revision=21668
---
 modules/services/network-filesystems/nfs-kernel.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/services/network-filesystems/nfs-kernel.nix b/modules/services/network-filesystems/nfs-kernel.nix
index c0cccac5343..d28aef0ed52 100644
--- a/modules/services/network-filesystems/nfs-kernel.nix
+++ b/modules/services/network-filesystems/nfs-kernel.nix
@@ -141,7 +141,7 @@ in
             startOn = "started nfs-kernel-nfsd and started portmap";
             stopOn = "stopping nfs-kernel-exports";
 
-            exec = "${pkgs.nfsUtils}/sbin/rpc.mountd -F -f ${cfg.server.exports}";
+            exec = "${pkgs.nfsUtils}/sbin/rpc.mountd -F -f /etc/exports";
           };
         }
 
-- 
GitLab


From 0d92459fb515a156a73d7c47dba1ada72f077769 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Sat, 8 May 2010 19:12:36 +0000
Subject: [PATCH 2336/5331] Fixing vsftpd regarding the anonymous user (some
 script lines had to be run only in the case the anonymous user service were
 enabled)

svn path=/nixos/trunk/; revision=21669
---
 modules/services/networking/vsftpd.nix | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/modules/services/networking/vsftpd.nix b/modules/services/networking/vsftpd.nix
index 4c6b6f411cd..6c688da17eb 100644
--- a/modules/services/networking/vsftpd.nix
+++ b/modules/services/networking/vsftpd.nix
@@ -123,8 +123,11 @@ in
             secure_chroot_dir=/var/ftp/empty
             EOF
 
-            mkdir -p ${cfg.anonymousUserHome}
-            chown -R ftp:ftp ${cfg.anonymousUserHome}
+            ${if cfg.anonymousUser then ''
+              mkdir -p ${cfg.anonymousUserHome}
+              chown -R ftp:ftp ${cfg.anonymousUserHome}
+            '' else ""}
+            }
           '';
 
         exec = "${vsftpd}/sbin/vsftpd /etc/vsftpd.conf";
-- 
GitLab


From 4c1af311e13a89b75947de9d33b2bb1296a97aaa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Sat, 8 May 2010 22:28:26 +0000
Subject: [PATCH 2337/5331] avahi-daemon: Ensure that /var/run/avahi-daemon
 exists.

svn path=/nixos/trunk/; revision=21673
---
 modules/services/networking/avahi-daemon.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/modules/services/networking/avahi-daemon.nix b/modules/services/networking/avahi-daemon.nix
index 689abc593aa..b0e332cba09 100644
--- a/modules/services/networking/avahi-daemon.nix
+++ b/modules/services/networking/avahi-daemon.nix
@@ -129,6 +129,8 @@ in
             # return a sensible value.
             export LD_LIBRARY_PATH="${config.system.nssModules.path}"
 
+            mkdir -p /var/run/avahi-daemon
+
             exec ${avahi}/sbin/avahi-daemon --daemonize -f "${avahiDaemonConf}"
           '';
       };
-- 
GitLab


From 825923a051366cb44fbe9e65869bd2dfea9dfac8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Sat, 8 May 2010 23:24:00 +0000
Subject: [PATCH 2338/5331] Adding the 'awesome' window manager to nixos. I
 made the system sw path include /etc/xdg - awesome looks for some file in the
 XDG_CONFIG_DIRS, which in bashrc is set to point to the profiles/etc/xdg

svn path=/nixos/trunk/; revision=21675
---
 modules/config/system-path.nix                |  2 +-
 modules/module-list.nix                       |  1 +
 .../services/x11/window-managers/awesome.nix  | 42 +++++++++++++++++++
 3 files changed, 44 insertions(+), 1 deletion(-)
 create mode 100644 modules/services/x11/window-managers/awesome.nix

diff --git a/modules/config/system-path.nix b/modules/config/system-path.nix
index 38be78876fb..18afb71e7b5 100644
--- a/modules/config/system-path.nix
+++ b/modules/config/system-path.nix
@@ -116,5 +116,5 @@ in
   require = [options];
 
   environment.systemPackages = requiredPackages;
-  environment.pathsToLink = ["/bin" "/sbin" "/lib" "/share/man" "/share/info" "/man" "/info"];
+  environment.pathsToLink = ["/bin" "/sbin" "/lib" "/share/man" "/share/info" "/man" "/info" "/etc/xdg"];
 }
diff --git a/modules/module-list.nix b/modules/module-list.nix
index fbea5e66fe6..4ff6ac24978 100644
--- a/modules/module-list.nix
+++ b/modules/module-list.nix
@@ -124,6 +124,7 @@
   ./services/x11/display-managers/slim.nix
   ./services/x11/hardware/synaptics.nix
   ./services/x11/hardware/wacom.nix
+  ./services/x11/window-managers/awesome.nix
   ./services/x11/window-managers/compiz.nix
   ./services/x11/window-managers/default.nix
   ./services/x11/window-managers/icewm.nix
diff --git a/modules/services/x11/window-managers/awesome.nix b/modules/services/x11/window-managers/awesome.nix
new file mode 100644
index 00000000000..0746bd34b9d
--- /dev/null
+++ b/modules/services/x11/window-managers/awesome.nix
@@ -0,0 +1,42 @@
+{ config, pkgs, ... }:
+
+with pkgs.lib;
+
+let
+
+  cfg = config.services.xserver.windowManager.awesome;
+
+in
+
+{
+
+  ###### interface
+
+  options = {
+  
+    services.xserver.windowManager.awesome.enable = mkOption {
+      default = false;
+      description = "Enable the Awesome window manager.";
+    };
+
+  };
+
+
+  ###### implementation
+
+  config = mkIf cfg.enable {
+
+    services.xserver.windowManager.session = singleton
+      { name = "awesome";
+        start =
+          ''
+            ${pkgs.awesome}/bin/awesome &
+            waitPID=$!
+          '';
+      };
+
+    environment.x11Packages = [ pkgs.awesome ];
+    
+  };
+
+}
-- 
GitLab


From 4ee2a8a29a4d730b8bdce76ff446e600c03b4669 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Sun, 9 May 2010 12:45:57 +0000
Subject: [PATCH 2339/5331] Fixing the UTF-8 in openssh sshd (passing to it the
 LOCALE_ARCHIVE - that requieres a patch in openssh that I just commited to
 nixpkgs)

Before this, in the shell spawned, backspace could not work over UTF-8 strings in the readline.


svn path=/nixos/trunk/; revision=21679
---
 modules/services/networking/ssh/sshd.nix | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/modules/services/networking/ssh/sshd.nix b/modules/services/networking/ssh/sshd.nix
index dc1d8537142..e02b755a516 100644
--- a/modules/services/networking/ssh/sshd.nix
+++ b/modules/services/networking/ssh/sshd.nix
@@ -129,7 +129,11 @@ in
 
         startOn = "started network-interfaces";
 
-        environment = { LD_LIBRARY_PATH = nssModulesPath; };
+        environment = {
+          LD_LIBRARY_PATH = nssModulesPath;
+          # Duplicated from bashrc. OpenSSH needs a patch for this.
+          LOCALE_ARCHIVE = "/var/run/current-system/sw/lib/locale/locale-archive";
+        };
 
         preStart =
           ''
-- 
GitLab


From 8b69834669ec7e0458b5b0b78071217fab5692c5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Sun, 9 May 2010 15:38:48 +0000
Subject: [PATCH 2340/5331] Fixing a syntax error in the vsftpd module I added
 in a recent commit.

svn path=/nixos/trunk/; revision=21687
---
 modules/services/networking/vsftpd.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/modules/services/networking/vsftpd.nix b/modules/services/networking/vsftpd.nix
index 6c688da17eb..f891a92e7f5 100644
--- a/modules/services/networking/vsftpd.nix
+++ b/modules/services/networking/vsftpd.nix
@@ -127,7 +127,6 @@ in
               mkdir -p ${cfg.anonymousUserHome}
               chown -R ftp:ftp ${cfg.anonymousUserHome}
             '' else ""}
-            }
           '';
 
         exec = "${vsftpd}/sbin/vsftpd /etc/vsftpd.conf";
-- 
GitLab


From 680818c2cc61308fee8e7e318a8a95bade36ff7b Mon Sep 17 00:00:00 2001
From: Marc Weber <marco-oweber@gmx.de>
Date: Sun, 9 May 2010 20:42:00 +0000
Subject: [PATCH 2341/5331] postgresql: allow adding plugins ot $libdir

svn path=/nixos/trunk/; revision=21692
---
 modules/services/databases/postgresql.nix | 37 ++++++++++++++++++++++-
 1 file changed, 36 insertions(+), 1 deletion(-)

diff --git a/modules/services/databases/postgresql.nix b/modules/services/databases/postgresql.nix
index c943b662459..ae6ac463dad 100644
--- a/modules/services/databases/postgresql.nix
+++ b/modules/services/databases/postgresql.nix
@@ -6,7 +6,27 @@ let
 
   cfg = config.services.postgresql;
 
-  postgresql = pkgs.postgresql;
+  # see description of extraPlugins
+  postgresqlAndPlugins = pg:
+    if cfg.extraPlugins == [] then pg
+    else pkgs.runCommand "postgresql-and-plugins" {
+      inherit (pkgs) perl;
+      inherit pg;
+      # used by env builder:
+      paths = [ pg ] ++ cfg.extraPlugins;
+      pathsToLink = "/";
+      ignoreCollisions = 0;
+      manifest = null;
+    }
+      ''
+        perlScript=${pkgs.buildEnvScript}
+        mkdir -p $out/bin
+        $perl/bin/perl $perlScript
+        rm $out/bin/{pg_config,postgres,pg_ctl}
+        cp --target-directory=$out/bin $pg/bin/{postgres,pg_config,pg_ctl}
+      '';
+
+  postgresql = postgresqlAndPlugins pkgs.postgresql;
 
   startDependency = if config.services.gw6c.enable then 
     "gw6c" else "network-interfaces";
@@ -95,6 +115,21 @@ in
           Whether to run PostgreSQL with -i flag to enable TCP/IP connections.
         '';
       };
+
+      extraPlugins = mkOption {
+        default = [];
+        example = "pkgs.postgis"; # of course don't use a string here!
+        description = ''
+          When this list contains elemnts a new store path is created.
+          Postgresql and the elments are symlinked into it. Then pg_config,
+          postgres and pc_ctl are copied to make them use the new
+          $out/lib directory as pkglibdir. This make it possible to use postgis
+          without patching the .sql files which reference $libdir/postgis-1.5.
+        '';
+        # Note: the duplication of executables is about 4MB size.
+        # So a nicer solution was patching postgresql to allow setting the
+        # libdir explicitely.
+      };
       
     };
 
-- 
GitLab


From 03caab45729f3f7e01cbde7f7832bbbfa6a78fac Mon Sep 17 00:00:00 2001
From: "Yury G. Kudryashov" <urkud.urkud@gmail.com>
Date: Fri, 14 May 2010 20:28:04 +0000
Subject: [PATCH 2342/5331] Enable polkit-1

Now both polkit-1 and old policykit are enabled. Packages that can use both will
be migrated to new polkit-1, than old one can be disabled.

svn path=/nixos/trunk/; revision=21776
---
 modules/module-list.nix     |  2 +-
 modules/security/polkit.nix | 50 +++++++++++++++++++++++++++++++++----
 2 files changed, 46 insertions(+), 6 deletions(-)

diff --git a/modules/module-list.nix b/modules/module-list.nix
index 4ff6ac24978..095ac35e838 100644
--- a/modules/module-list.nix
+++ b/modules/module-list.nix
@@ -38,7 +38,7 @@
   ./security/pam.nix
   ./security/pam_usb.nix
   ./security/policykit.nix
-  #./security/polkit.nix # Currently disabled; using the old policykit.
+  ./security/polkit.nix
   ./security/setuid-wrappers.nix
   ./security/sudo.nix
   ./services/audio/alsa.nix
diff --git a/modules/security/polkit.nix b/modules/security/polkit.nix
index ed0496485cb..2c726128d95 100644
--- a/modules/security/polkit.nix
+++ b/modules/security/polkit.nix
@@ -2,23 +2,63 @@
 
 with pkgs.lib;
 
+let
+  pkWrapper = pkgs.stdenv.mkDerivation {
+    name = "polkit-wrapper";
+    helper = "polkit-agent-helper-1";
+    buildInputs = [ pkgs.xorg.lndir ];
+
+    builder = pkgs.writeScript "pkwrap-builder" ''
+      source $stdenv/setup
+
+      mkdir -p $out
+      lndir ${pkgs.polkit} $out
+      new=$out/libexec/$helper
+
+      mv $new $out/libexec/.$helper.orig
+      echo "exec ${config.security.wrapperDir}/$helper \"\$@\"" > $new
+      chmod +x $new
+      '';
+  };
+in
+
 {
 
   config = {
 
-    environment.systemPackages = [ pkgs.polkit ];
+    environment = {
+      systemPackages = [ pkWrapper ];
+      pathsToLink = [ "/share/polkit-1" "/etc/polkit-1" ];
+      etc = [
+        {
+          source = "${config.system.path}/etc/polkit-1";
+          target = "polkit-1";
+        }
+      ];
+    };
 
-    services.dbus.packages = [ pkgs.polkit ];
+    services.dbus.packages = [ pkWrapper ];
 
-    security.pam.services = [ { name = "polkit-1"; } ];
+    security = {
+      pam.services = [ { name = "polkit-1"; } ];
+      setuidPrograms = [ "pkexec" ];
 
-    security.setuidPrograms = [ "pkexec" ];
+      setuidOwners = [
+        {
+          program = pkWrapper.helper;
+          owner = "root";
+          group = "root";
+          setuid = true;
+          source = pkWrapper + "/libexec/." + pkWrapper.helper + ".orig";
+        }
+      ];
+    };
 
     system.activationScripts.policyKit = pkgs.stringsWithDeps.noDepEntry
       ''
         mkdir -p /var/lib/polkit-1
+        chmod 700 /var/lib/polkit-1
       '';
-
   };
 
 }
-- 
GitLab


From 7ae39feedbe7dcf31ced3a4a744e29057e87301f Mon Sep 17 00:00:00 2001
From: "Yury G. Kudryashov" <urkud.urkud@gmail.com>
Date: Fri, 14 May 2010 21:01:06 +0000
Subject: [PATCH 2343/5331] Get rid of extraSetuidPrograms.

Also state in description that it is obsolete.

svn path=/nixos/trunk/; revision=21777
---
 modules/security/setuid-wrappers.nix          | 3 +--
 modules/security/sudo.nix                     | 2 +-
 modules/services/x11/desktop-managers/kde.nix | 6 +-----
 3 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/modules/security/setuid-wrappers.nix b/modules/security/setuid-wrappers.nix
index 5450bbb7bab..510c99b2f58 100644
--- a/modules/security/setuid-wrappers.nix
+++ b/modules/security/setuid-wrappers.nix
@@ -32,13 +32,12 @@ in
       '';
     };
 
-    # !!! obsolete
     security.extraSetuidPrograms = mkOption {
       default = [];
       example = ["fusermount"];
       description = ''
         This option lists additional programs that must be made setuid
-        root.
+        root. Obsolete, use setuidPrograms instead.
       '';
     };
 
diff --git a/modules/security/sudo.nix b/modules/security/sudo.nix
index e911a257bbf..845371050cc 100644
--- a/modules/security/sudo.nix
+++ b/modules/security/sudo.nix
@@ -51,7 +51,7 @@ in
 
   config = mkIf cfg.enable {
 
-    security.extraSetuidPrograms = [ "sudo" ];
+    security.setuidPrograms = [ "sudo" ];
 
     environment.systemPackages = [ sudo ];
 
diff --git a/modules/services/x11/desktop-managers/kde.nix b/modules/services/x11/desktop-managers/kde.nix
index 45c4c464f9a..442a79fde4f 100644
--- a/modules/services/x11/desktop-managers/kde.nix
+++ b/modules/services/x11/desktop-managers/kde.nix
@@ -52,11 +52,7 @@ mkIf (xcfg.enable && cfg.enable) {
     };
   };
 
-  security = {
-    extraSetuidPrograms = [
-      "kcheckpass"
-    ];
-  };
+  security.setuidPrograms = [ "kcheckpass" ];
 
   environment = {
     kdePackages = [
-- 
GitLab


From 7836f89242bda6b8cc5134366e55129b0f802c09 Mon Sep 17 00:00:00 2001
From: "Yury G. Kudryashov" <urkud.urkud@gmail.com>
Date: Sat, 15 May 2010 21:28:31 +0000
Subject: [PATCH 2344/5331] stage-1.nix: copy libudev.so, verbose log

svn path=/nixos/trunk/; revision=21793
---
 modules/system/boot/stage-1.nix | 71 +++++++++++++++++----------------
 1 file changed, 36 insertions(+), 35 deletions(-)

diff --git a/modules/system/boot/stage-1.nix b/modules/system/boot/stage-1.nix
index 504b1080bb7..7a081ce8e99 100644
--- a/modules/system/boot/stage-1.nix
+++ b/modules/system/boot/stage-1.nix
@@ -105,52 +105,53 @@ let
       ensureDir $out/lib
       
       # Copy what we need from Glibc.
-      cp -p ${pkgs.glibc}/lib/ld-linux*.so.? $out/lib
-      cp -p ${pkgs.glibc}/lib/libc.so.* $out/lib
-      cp -p ${pkgs.glibc}/lib/libpthread.so.* $out/lib
-      cp -p ${pkgs.glibc}/lib/librt.so.* $out/lib
-      cp -p ${pkgs.glibc}/lib/libdl.so.* $out/lib
-      cp -p ${pkgs.gcc.gcc}/lib*/libgcc_s.so.* $out/lib
+      cp -pv ${pkgs.glibc}/lib/ld-linux*.so.? $out/lib
+      cp -pv ${pkgs.glibc}/lib/libc.so.* $out/lib
+      cp -pv ${pkgs.glibc}/lib/libpthread.so.* $out/lib
+      cp -pv ${pkgs.glibc}/lib/librt.so.* $out/lib
+      cp -pv ${pkgs.glibc}/lib/libdl.so.* $out/lib
+      cp -pv ${pkgs.gcc.gcc}/lib*/libgcc_s.so.* $out/lib
 
       # Copy some utillinux stuff.
-      cp ${pkgs.utillinux}/bin/mount ${pkgs.utillinux}/bin/umount \
+      cp -v ${pkgs.utillinux}/bin/mount ${pkgs.utillinux}/bin/umount \
          ${pkgs.utillinux}/sbin/fsck ${pkgs.utillinux}/sbin/pivot_root \
          ${pkgs.utillinux}/sbin/blkid $out/bin
-      cp -pd ${pkgs.utillinux}/lib/libblkid*.so.* $out/lib
-      cp -pd ${pkgs.utillinux}/lib/libuuid*.so.* $out/lib
+      cp -pdv ${pkgs.utillinux}/lib/libblkid*.so.* $out/lib
+      cp -pdv ${pkgs.utillinux}/lib/libuuid*.so.* $out/lib
 
       # Copy some coreutils.
-      cp ${pkgs.coreutils}/bin/basename $out/bin
+      cp -v ${pkgs.coreutils}/bin/basename $out/bin
 
       # Copy e2fsck and friends.      
-      cp ${pkgs.e2fsprogs}/sbin/e2fsck $out/bin
-      cp ${pkgs.e2fsprogs}/sbin/tune2fs $out/bin
-      cp ${pkgs.reiserfsprogs}/sbin/reiserfsck $out/bin
-      ln -s e2fsck $out/bin/fsck.ext2
-      ln -s e2fsck $out/bin/fsck.ext3
-      ln -s e2fsck $out/bin/fsck.ext4
-      ln -s reiserfsck $out/bin/fsck.reiserfs
+      cp -v ${pkgs.e2fsprogs}/sbin/e2fsck $out/bin
+      cp -v ${pkgs.e2fsprogs}/sbin/tune2fs $out/bin
+      cp -v ${pkgs.reiserfsprogs}/sbin/reiserfsck $out/bin
+      ln -sv e2fsck $out/bin/fsck.ext2
+      ln -sv e2fsck $out/bin/fsck.ext3
+      ln -sv e2fsck $out/bin/fsck.ext4
+      ln -sv reiserfsck $out/bin/fsck.reiserfs
 
-      cp -pd ${pkgs.e2fsprogs}/lib/lib*.so.* $out/lib
+      cp -pdv ${pkgs.e2fsprogs}/lib/lib*.so.* $out/lib
 
       # Copy dmsetup and lvm.
-      cp ${pkgs.lvm2}/sbin/dmsetup $out/bin/dmsetup
-      cp ${pkgs.lvm2}/sbin/lvm $out/bin/lvm
-      cp ${pkgs.lvm2}/lib/libdevmapper.so.*.* $out/lib
+      cp -v ${pkgs.lvm2}/sbin/dmsetup $out/bin/dmsetup
+      cp -v ${pkgs.lvm2}/sbin/lvm $out/bin/lvm
+      cp -v ${pkgs.lvm2}/lib/libdevmapper.so.*.* $out/lib
 
       # Add RAID mdadm tool.
-      cp ${pkgs.mdadm}/sbin/mdadm $out/bin/mdadm
+      cp -v ${pkgs.mdadm}/sbin/mdadm $out/bin/mdadm
 
       # Copy udev.
-      cp ${pkgs.udev}/sbin/udevd ${pkgs.udev}/sbin/udevadm $out/bin
-      cp ${pkgs.udev}/libexec/*_id $out/bin
+      cp -v ${pkgs.udev}/sbin/udevd ${pkgs.udev}/sbin/udevadm $out/bin
+      cp -v ${pkgs.udev}/libexec/*_id $out/bin
+      cp -pdv ${pkgs.udev}/lib/libudev.so.* $out/lib
       
       # Copy bash.
-      cp ${pkgs.bash}/bin/bash $out/bin
-      ln -s bash $out/bin/sh
+      cp -v ${pkgs.bash}/bin/bash $out/bin
+      ln -sv bash $out/bin/sh
 
       # Copy modprobe.
-      cp ${pkgs.module_init_tools}/sbin/modprobe $out/bin/modprobe.real
+      cp -v ${pkgs.module_init_tools}/sbin/modprobe $out/bin/modprobe.real
 
       ${config.boot.initrd.extraUtilsCommands}
 
@@ -177,17 +178,17 @@ let
       
       # Make sure that the patchelf'ed binaries still work.
       echo "testing patched programs..."
-      $out/bin/bash --version
+      $out/bin/bash --version | grep "bash, version"
       export LD_LIBRARY_PATH=$out/lib
-      $out/bin/mount --version
-      $out/bin/umount --version
-      $out/bin/e2fsck -V
+      $out/bin/mount --version | grep "mount from"
+      $out/bin/umount --version | grep "umount "
+      $out/bin/e2fsck -V 2>&1 | grep "e2fsck "
       $out/bin/tune2fs 2> /dev/null | grep "tune2fs "
-      $out/bin/fsck -N
+      $out/bin/fsck -N | grep "fsck from"
       $out/bin/udevadm --version
-      $out/bin/blkid -v 2>&1 | grep "blkid from util-linux-ng"
-      $out/bin/dmsetup --version 2>&1 | grep "version:"
-      LVM_SYSTEM_DIR=$out $out/bin/lvm 2>&1 | grep "LVM"
+      $out/bin/blkid -v 2>&1 | tee -a $out/log | grep "blkid from util-linux-ng"
+      $out/bin/dmsetup --version 2>&1 | tee -a $out/log | grep "version:"
+      LVM_SYSTEM_DIR=$out $out/bin/lvm 2>&1 | tee -a $out/log | grep "LVM"
       $out/bin/reiserfsck -V
       $out/bin/mdadm --version
       $out/bin/basename --version
-- 
GitLab


From 8989d7a3d5efe6414e5e42afa040c8be2628d1f5 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sun, 16 May 2010 09:39:41 +0000
Subject: [PATCH 2345/5331] * Udev no longer likes the "%k" name in the kqemu
 rule, so remove it.

svn path=/nixos/trunk/; revision=21794
---
 modules/services/hardware/udev.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/modules/services/hardware/udev.nix b/modules/services/hardware/udev.nix
index 6ce5bfced9a..562bbe1b17e 100644
--- a/modules/services/hardware/udev.nix
+++ b/modules/services/hardware/udev.nix
@@ -21,9 +21,9 @@ let
     # Miscellaneous devices.
     KERNEL=="sonypi",               MODE="0666"
     KERNEL=="kvm",                  MODE="0666"
-    KERNEL=="kqemu",                NAME="%k", MODE="0666"
-    KERNEL=="vboxdrv", NAME="vboxdrv", OWNER="root", GROUP="root", MODE="0666"
-    KERNEL=="vboxadd", NAME="vboxadd", OWNER="root", GROUP="root", MODE="0660"
+    KERNEL=="kqemu",                MODE="0666"
+    KERNEL=="vboxdrv",  NAME="vboxdrv",  OWNER="root", GROUP="root", MODE="0666"
+    KERNEL=="vboxadd",  NAME="vboxadd",  OWNER="root", GROUP="root", MODE="0660"
     KERNEL=="vboxuser", NAME="vboxuser", OWNER="root", GROUP="root", MODE="0666"
   '';
   
-- 
GitLab


From a862661835810b037f8919691e04aa423f752567 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Sun, 16 May 2010 16:20:00 +0000
Subject: [PATCH 2346/5331] Adding the Tor service (patch by roconnor)

svn path=/nixos/trunk/; revision=21795
---
 modules/misc/ids.nix              |   1 +
 modules/module-list.nix           |   1 +
 modules/services/security/tor.nix | 174 ++++++++++++++++++++++++++++++
 3 files changed, 176 insertions(+)
 create mode 100644 modules/services/security/tor.nix

diff --git a/modules/misc/ids.nix b/modules/misc/ids.nix
index c2ebd407b2a..c100ae73456 100644
--- a/modules/misc/ids.nix
+++ b/modules/misc/ids.nix
@@ -53,6 +53,7 @@ in
     davfs2 = 31;
     privoxy = 32;    
     osgi = 34;
+    tor = 35;    
     # When adding a uid, make sure it doesn't match an existing gid.
 
     nixbld = 30000; # start of range of uids
diff --git a/modules/module-list.nix b/modules/module-list.nix
index 095ac35e838..5ba6fe69bea 100644
--- a/modules/module-list.nix
+++ b/modules/module-list.nix
@@ -103,6 +103,7 @@
   ./services/scheduling/atd.nix
   ./services/scheduling/cron.nix
   ./services/scheduling/fcron.nix
+  ./services/security/tor.nix
   ./services/system/dbus.nix
   ./services/system/nscd.nix
   ./services/system/uptimed.nix
diff --git a/modules/services/security/tor.nix b/modules/services/security/tor.nix
new file mode 100644
index 00000000000..47c7ea730a2
--- /dev/null
+++ b/modules/services/security/tor.nix
@@ -0,0 +1,174 @@
+{ config, pkgs, ... }:
+
+with pkgs.lib;
+
+let
+
+  inherit (pkgs) tor privoxy;
+
+  stateDir = "/var/lib/tor";
+  privoxyDir = stateDir+"/privoxy";
+
+  modprobe = config.system.sbin.modprobe;
+
+  torUser = "tor";
+
+in
+
+{
+
+  ###### interface
+  
+  options = {
+  
+    services.tor = {
+
+      enable = mkOption {
+        default = false;
+        description = ''
+          Whether to enable the Tor anonymous routing daemon.
+        '';
+      };
+
+      socksListenAddress = mkOption {
+        default = "127.0.0.1:9050";
+        example = "192.168.0.1";
+        description = ''
+          Bind to this address to listen for connections from Socks-speaking 
+          applications. You can also specify a port.
+        '';
+      };
+
+      config = mkOption {
+        default = "";
+        description = ''
+          Extra configuration. Contents will be added verbatim to the 
+          configuration file.
+        '';
+      };
+
+      enablePrivoxy = mkOption {
+        default = true;
+        description = ''
+          Whether to enable a special instance of privoxy dedicated to Tor.
+          To have anonymity, protocols need to be scrubbed of identifying 
+          information.
+          Most people using Tor want to anonymize their web traffic, so by 
+          default we enable an special instance of privoxy specifically for
+          Tor.
+          However, if you are only going to use Tor only as a relay then you
+          can disable this option.
+        '';
+      };
+      
+      privoxyListenAddress = mkOption {
+        default = "127.0.0.1:8118";
+        description = ''
+          Address that Tor's instance of privoxy is listening to.
+          *This does not configure the standard NixOS instance of privoxy.*  
+          This is for Tor connections only! 
+          See services.privoxy.listenAddress to configure the standard NixOS 
+          instace of privoxy.
+        '';
+      };
+
+      privoxyConfig = mkOption {
+        default = "";
+        description = ''
+          Extra configuration for Tor's instance of privoxy. Contents will be 
+          added verbatim to the configuration file.
+          *This does not configure the standard NixOS instance of privoxy.* 
+          This is for Tor connections only! 
+          See services.privoxy.extraConfig to configure the standard NixOS 
+          instace of privoxy.
+        '';
+      };
+    };
+
+  };
+
+
+  ###### implementation
+
+  config = mkIf config.services.tor.enable {
+    environment.systemPackages = [ tor ];  # provides tor-resolve and torify
+  
+    users.extraUsers = singleton
+      { name = torUser;
+        uid = config.ids.uids.tor;
+        description = "Tor daemon user";
+        home = stateDir;
+      };
+
+    jobs.tor =
+      { name = "Tor";
+
+        startOn = "started network-interfaces";
+        stopOn = "stopping network-interfaces";
+
+        preStart =
+          ''
+            mkdir -m 0755 -p ${stateDir}
+            chown ${torUser} ${stateDir}
+          '';
+        exec = "${tor}/bin/tor -f ${pkgs.writeText "torrc" config.services.tor.config}";
+      };
+
+    jobs.torPrivoxy = mkIf config.services.tor.enablePrivoxy 
+      { name = "Tor-privoxy";
+
+        startOn = "starting Tor";
+        stopOn = "stopping Tor"; 
+
+        preStart =
+          ''
+            mkdir -m 0755 -p ${privoxyDir}
+            chown ${torUser} ${privoxyDir}
+
+            # Needed to run privoxy as an unprivileged user?
+            ${modprobe}/sbin/modprobe capability || true
+          '';
+        exec = "${privoxy}/sbin/privoxy --no-daemon --user ${torUser} ${pkgs.writeText "torPrivoxy.conf" config.services.tor.privoxyConfig}";
+      };
+
+      services.tor.config = ''
+        DataDirectory ${stateDir}
+        User ${torUser}
+        SocksListenAddress ${config.services.tor.socksListenAddress}
+    
+        # Extra configurations go here
+      '';
+    
+      services.tor.privoxyConfig = ''
+        # Generally, this file goes in /etc/privoxy/config
+        #
+        # Tor listens as a SOCKS4a proxy here:
+        forward-socks4a / ${config.services.tor.socksListenAddress} .
+        confdir ${privoxy}/etc
+        logdir ${privoxyDir}
+        # actionsfile standard  # Internal purpose, recommended
+        actionsfile default.action   # Main actions file
+        actionsfile user.action      # User customizations
+        filterfile default.filter
+        
+        # Don't log interesting things, only startup messages, warnings and errors
+        logfile logfile
+        #jarfile jarfile
+        #debug   0    # show each GET/POST/CONNECT request
+        debug   4096 # Startup banner and warnings
+        debug   8192 # Errors - *we highly recommended enabling this*
+        
+        user-manual ${privoxy}/doc/privoxy/user-manual
+        listen-address  ${config.services.tor.privoxyListenAddress}
+        toggle  1
+        enable-remote-toggle 0
+        enable-edit-actions 0
+        enable-remote-http-toggle 0
+        buffer-limit 4096
+    
+        # Extra config goes here
+      '';
+     
+  };
+  
+}
-- 
GitLab


From 49dcb07bd9b08a267da34e78c917a618340f13ec Mon Sep 17 00:00:00 2001
From: Nicolas Pierron <nicolas.b.pierron@gmail.com>
Date: Sun, 16 May 2010 16:35:51 +0000
Subject: [PATCH 2347/5331] Fix bad substitution of mdadm program name.

svn path=/nixos/trunk/; revision=21799
---
 modules/services/hardware/udev.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/services/hardware/udev.nix b/modules/services/hardware/udev.nix
index 562bbe1b17e..9c1e863d76c 100644
--- a/modules/services/hardware/udev.nix
+++ b/modules/services/hardware/udev.nix
@@ -56,7 +56,7 @@ let
         substituteInPlace $i \
           --replace /sbin/modprobe ${modprobe}/sbin/modprobe \
           --replace /sbin/blkid ${pkgs.utillinux}/sbin/blkid \
-          --replace /sbin/mdadm ${pkgs.mdadm}/sbin/madm \
+          --replace /sbin/mdadm ${pkgs.mdadm}/sbin/mdadm \
           --replace '$env{DM_SBIN_PATH}/blkid' ${pkgs.utillinux}/sbin/blkid \
           --replace 'ENV{DM_SBIN_PATH}="/sbin"' 'ENV{DM_SBIN_PATH}="${pkgs.lvm2}/sbin"'
       done
-- 
GitLab


From 1f2db38e9ae5ec5d39257cacfd0f51940dd2ae4f Mon Sep 17 00:00:00 2001
From: Nicolas Pierron <nicolas.b.pierron@gmail.com>
Date: Sun, 16 May 2010 16:36:01 +0000
Subject: [PATCH 2348/5331] Fix swraid for config which do not have any raid
 devices.

svn path=/nixos/trunk/; revision=21800
---
 modules/tasks/swraid.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/modules/tasks/swraid.nix b/modules/tasks/swraid.nix
index 0c4a91db225..de9b6858006 100644
--- a/modules/tasks/swraid.nix
+++ b/modules/tasks/swraid.nix
@@ -45,8 +45,9 @@ in
       # Scan /proc/partitions for RAID devices.
       ${mdadm}/sbin/mdadm --examine --brief --scan -c partitions > ${tempConf}
 
-      # If the status has changed.
-      if ! ${diffutils}/bin/diff -q /proc/mdstat ${tempStatus} > /dev/null; then
+      # If there is some array to assemble and if the status has changed.
+      if test -e /proc/mdstat -a -s ${tempConf} &&
+         ! ${diffutils}/bin/diff -q /proc/mdstat ${tempStatus} > /dev/null; then
 
         # Keep the previous status to watch changes.
         cp ${tempStatus} ${tempStatus}.old
-- 
GitLab


From edee37088309079ed3a3139a26a9b133f822ec5e Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sun, 16 May 2010 19:02:45 +0000
Subject: [PATCH 2349/5331] * The default action for `udevadm trigger' changed
 from `add' to   `change'.  At boot time, however, we want an `add' event to
 trigger   certain rules (e.g. LVM and mdadm).

svn path=/nixos/trunk/; revision=21804
---
 modules/services/hardware/udev.nix  | 2 +-
 modules/system/boot/stage-1-init.sh | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/services/hardware/udev.nix b/modules/services/hardware/udev.nix
index 9c1e863d76c..0088072121e 100644
--- a/modules/services/hardware/udev.nix
+++ b/modules/services/hardware/udev.nix
@@ -193,7 +193,7 @@ in
             # the LVM rules to create device nodes.  See
             # http://www.mail-archive.com/fedora-devel-list@redhat.com/msg10261.html
             ${udev}/sbin/udevadm control --env=STARTUP=1
-            ${udev}/sbin/udevadm trigger
+            ${udev}/sbin/udevadm trigger --action=add
             ${udev}/sbin/udevadm settle # wait for udev to finish
             ${udev}/sbin/udevadm control --env=STARTUP=
 
diff --git a/modules/system/boot/stage-1-init.sh b/modules/system/boot/stage-1-init.sh
index 5f882f67aa0..aead7573161 100644
--- a/modules/system/boot/stage-1-init.sh
+++ b/modules/system/boot/stage-1-init.sh
@@ -115,7 +115,7 @@ export UDEV_CONFIG_FILE=@udevConf@
 mkdir -p /dev/.udev # !!! bug in udev?
 udevd --daemon
 udevadm control --env=STARTUP=1
-udevadm trigger
+udevadm trigger --action=add
 udevadm settle
 udevadm control --env=STARTUP=
 
-- 
GitLab


From 74847741724385febb3481cdf43fc9e25cf75d8e Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sun, 16 May 2010 20:40:04 +0000
Subject: [PATCH 2350/5331] * Activate software RAID devices from udev.  This
 makes the swraid   Upstart jobs unnecessary. * Support having the root
 filesystem on swraid.

svn path=/nixos/trunk/; revision=21807
---
 modules/config/system-path.nix      |  1 -
 modules/system/boot/stage-1-init.sh |  1 +
 modules/system/boot/stage-1.nix     |  4 +-
 modules/tasks/swraid.nix            | 99 ++---------------------------
 4 files changed, 9 insertions(+), 96 deletions(-)

diff --git a/modules/config/system-path.nix b/modules/config/system-path.nix
index 18afb71e7b5..036d77b1e8d 100644
--- a/modules/config/system-path.nix
+++ b/modules/config/system-path.nix
@@ -34,7 +34,6 @@ let
       pkgs.less
       pkgs.libcap
       pkgs.man
-      pkgs.mdadm
       pkgs.module_init_tools
       pkgs.nano
       pkgs.ncurses
diff --git a/modules/system/boot/stage-1-init.sh b/modules/system/boot/stage-1-init.sh
index aead7573161..32121ca1169 100644
--- a/modules/system/boot/stage-1-init.sh
+++ b/modules/system/boot/stage-1-init.sh
@@ -113,6 +113,7 @@ fi
 echo "running udev..."
 export UDEV_CONFIG_FILE=@udevConf@
 mkdir -p /dev/.udev # !!! bug in udev?
+mkdir -p /dev/.mdadm
 udevd --daemon
 udevadm control --env=STARTUP=1
 udevadm trigger --action=add
diff --git a/modules/system/boot/stage-1.nix b/modules/system/boot/stage-1.nix
index 7a081ce8e99..013872aa2a7 100644
--- a/modules/system/boot/stage-1.nix
+++ b/modules/system/boot/stage-1.nix
@@ -213,6 +213,7 @@ let
       cp ${pkgs.udev}/libexec/rules.d/60-persistent-storage.rules $out/
       cp ${pkgs.udev}/libexec/rules.d/80-drivers.rules $out/
       cp ${pkgs.lvm2}/lib/udev/rules.d/*.rules $out/
+      cp ${pkgs.mdadm}/lib/udev/rules.d/*.rules $out/
 
       for i in $out/*.rules; do
           substituteInPlace $i \
@@ -225,7 +226,8 @@ let
             --replace /sbin/blkid ${extraUtils}/bin/blkid \
             --replace /sbin/modprobe ${extraUtils}/bin/modprobe \
             --replace '$env{DM_SBIN_PATH}/blkid' ${extraUtils}/bin/blkid \
-            --replace 'ENV{DM_SBIN_PATH}="/sbin"' 'ENV{DM_SBIN_PATH}="${extraUtils}/bin"'
+            --replace 'ENV{DM_SBIN_PATH}="/sbin"' 'ENV{DM_SBIN_PATH}="${extraUtils}/bin"' \
+            --replace /sbin/mdadm ${extraUtils}/bin/mdadm
       done
 
       # Remove rule preventing creation of a by-label symlink
diff --git a/modules/tasks/swraid.nix b/modules/tasks/swraid.nix
index de9b6858006..21fe809f058 100644
--- a/modules/tasks/swraid.nix
+++ b/modules/tasks/swraid.nix
@@ -1,100 +1,11 @@
 { config, pkgs, ... }:
 
-###### implementation
-
-let
-
-  tempConf = "/var/run/mdadm.conf";
-  tempStatus = "/var/run/mdadm.status";
-  logFile = "/var/log/mdadmEvents.log";
-  modprobe = config.system.sbin.modprobe;
-  inherit (pkgs) mdadm diffutils;
-
-  mdadmEventHandler = pkgs.writeScript "mdadmEventHandler.sh" ''
-    #!/bin/sh
-
-    echo "$@" >> ${logFile}
-    case $1 in
-      (NewArray)
-        initctl emit -n new-raid-array
-        ;;
-      (*) ;;
-    esac
-  '';
-
-in
-  
 {
 
-  jobs.swraid = {
-    startOn = [ "new-raid-array" ];
-    description = "Assemble RAID arrays.";
-
-    script = ''
-      # Load the necessary RAID personalities.
-      # !!! hm, doesn't the kernel load these automatically?
-      for mod in raid0 raid1 raid5; do
-        ${modprobe}/sbin/modprobe $mod || true
-      done
-
-      # Wait until we can fetch the status of mdadm devices.
-      while ! test -e /proc/mdstat; do
-        sleep 10
-      done
-
-      # Scan /proc/partitions for RAID devices.
-      ${mdadm}/sbin/mdadm --examine --brief --scan -c partitions > ${tempConf}
-
-      # If there is some array to assemble and if the status has changed.
-      if test -e /proc/mdstat -a -s ${tempConf} &&
-         ! ${diffutils}/bin/diff -q /proc/mdstat ${tempStatus} > /dev/null; then
-
-        # Keep the previous status to watch changes.
-        cp ${tempStatus} ${tempStatus}.old
-
-        try=0
-        # Loop until the status change.
-        while ${diffutils}/bin/diff -q ${tempStatus} ${tempStatus}.old > /dev/null; do
-          test "$try" -gt 12 && break
-          test "$try" -ne 0 && sleep 10
-
-          # Activate each device found.
-          ${mdadm}/sbin/mdadm --assemble -c ${tempConf} --scan
-
-          # Register the new status
-          cp /proc/mdstat ${tempStatus}
-
-          try=$(($try + 1))
-        done
-
-        if test "$try" -le 6; then
-          # Send notifications.
-          initctl emit -n new-devices
-        fi
-
-        # Remove previous status.
-        rm ${tempStatus}.old
-      fi
-    '';
-
-    task = true;
-  };
-
-  jobs.swraidEvents = {
-    name = "swraid-events";
-    description = "Watch mdadm events.";
-    startOn = [ "startup" ];
-
-    postStart = ''
-      echo > ${tempConf}
-      echo > ${tempStatus}
-
-      # Assemble early raid devices.
-      initctl emit -n new-raid-array
-    '';
-
-    # !!! Someone should ensure that this is indeed doing what the manual says.
-    exec = "${mdadm}/sbin/mdadm --monitor --scan --program ${mdadmEventHandler}";
-  };
+  environment.systemPackages = [ pkgs.mdadm ];
+  
+  services.udev.packages = [ pkgs.mdadm ];
 
+  boot.initrd.availableKernelModules = [ "md_mod" "raid0" "raid1" "raid456" ];
+  
 }
-- 
GitLab


From ec33622b48d33497caf9bc81e5df7f16bc94c29a Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sun, 16 May 2010 20:44:45 +0000
Subject: [PATCH 2351/5331] * A test for installing NixOS on software RAID. 
 Doesn't quite work   yet though - GRUB fails mysteriously on the second
 reboot.

svn path=/nixos/trunk/; revision=21808
---
 release.nix         |  1 +
 tests/installer.nix | 29 +++++++++++++++++++++++++++--
 2 files changed, 28 insertions(+), 2 deletions(-)

diff --git a/release.nix b/release.nix
index eb9fb3731f7..6f9adbc3843 100644
--- a/release.nix
+++ b/release.nix
@@ -152,6 +152,7 @@ let
         installer.lvm = t.installer.lvm.test;
         installer.separateBoot = t.installer.separateBoot.test;
         installer.simple = t.installer.simple.test;
+        installer.swraid = t.installer.swraid.test;
         kde4 = t.kde4.test;
         login = t.login.test;
 	openssh = t.openssh.test;
diff --git a/tests/installer.nix b/tests/installer.nix
index 10ac14332b0..26423cd9d06 100644
--- a/tests/installer.nix
+++ b/tests/installer.nix
@@ -173,7 +173,7 @@ let
       
       # Did /boot get mounted, if appropriate?
       # !!! There is currently no good way to wait for the
-      # `filesystems' tash to finish.
+      # `filesystems' task to finish.
       $machine->waitForFile("/boot/grub/grub.cfg");
 
       # Did the swap device get activated?
@@ -209,6 +209,9 @@ let
 
 in {
 
+  # !!! `parted mkpart' seems to silently create overlapping partitions.
+
+
   # The (almost) simplest partitioning scheme: a swap partition and
   # one big filesystem partition.
   simple = makeTest
@@ -282,5 +285,27 @@ in {
         '';
       fileSystems = rootFS;
     };
-  
+
+  swraid = makeTest
+    { createPartitions =
+        ''
+          $machine->mustSucceed(
+              "parted /dev/vda mklabel msdos",
+              "parted /dev/vda -- mkpart primary 1M 1000M", # md0 (root), first device
+              "parted /dev/vda -- mkpart primary 1024M 2024M", # md0 (root), second device
+              "parted /dev/vda -- mkpart primary 2048M 2548M", # md1 (swap), first device
+              "parted /dev/vda -- mkpart primary 2560M 3060M", # md1 (swap), second device
+              "udevadm settle",
+              # Note that GRUB2 doesn't work with version 1.2 metadata.
+              "mdadm --create --force /dev/md0 --metadata 0.90 --level=raid1 --raid-devices=2 /dev/vda1 /dev/vda2",
+              "mdadm --create --force /dev/md1 --metadata 1.2 --level=raid1 --raid-devices=2 /dev/vda3 /dev/vda4",
+              "mkswap -f /dev/md1 -L swap",
+              "swapon -L swap",
+              "mkfs.ext3 -L nixos /dev/md0",
+              "mount LABEL=nixos /mnt",
+          );
+        '';
+      fileSystems = rootFS;
+    };
+      
 }
-- 
GitLab


From b15e5759616a32887e9e0da62143f21410c4dca3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Sun, 16 May 2010 22:22:34 +0000
Subject: [PATCH 2352/5331] Renaming the tor services lowercase.

svn path=/nixos/trunk/; revision=21810
---
 modules/services/security/tor.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/modules/services/security/tor.nix b/modules/services/security/tor.nix
index 47c7ea730a2..89f4245145e 100644
--- a/modules/services/security/tor.nix
+++ b/modules/services/security/tor.nix
@@ -101,7 +101,7 @@ in
       };
 
     jobs.tor =
-      { name = "Tor";
+      { name = "tor";
 
         startOn = "started network-interfaces";
         stopOn = "stopping network-interfaces";
@@ -115,10 +115,10 @@ in
       };
 
     jobs.torPrivoxy = mkIf config.services.tor.enablePrivoxy 
-      { name = "Tor-privoxy";
+      { name = "tor-privoxy";
 
-        startOn = "starting Tor";
-        stopOn = "stopping Tor"; 
+        startOn = "starting tor";
+        stopOn = "stopping tor"; 
 
         preStart =
           ''
-- 
GitLab


From f13cf2cee0fbf705ffd321dffb87aa05e90ef5e8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Mon, 17 May 2010 14:09:22 +0000
Subject: [PATCH 2353/5331] Adding example for the fonts.extraFonts (thanks
 roconnor)

svn path=/nixos/trunk/; revision=21817
---
 modules/config/fonts.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/modules/config/fonts.nix b/modules/config/fonts.nix
index 3076f0cbebc..c94f16992bd 100644
--- a/modules/config/fonts.nix
+++ b/modules/config/fonts.nix
@@ -73,8 +73,9 @@ let
 
       extraFonts = mkOption {
         default = [];
+        example = [ pkgs.dejavu_fonts ];
         description = ''
-          List of additional fonts.
+          List of packages with additional fonts.
         '';
       };
 
-- 
GitLab


From ee8ba3bb79a5e633e1caef717cd9597985758967 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Mon, 17 May 2010 14:15:18 +0000
Subject: [PATCH 2354/5331] Updating bashrc, so it does not leave in PATH (and
 other environment variables) a void element, which the linux kernel would
 take as '.'. This fixes the bug of linux looking into '.' for executables.

svn path=/nixos/trunk/; revision=21818
---
 modules/programs/bash/bashrc.sh | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/modules/programs/bash/bashrc.sh b/modules/programs/bash/bashrc.sh
index 2a54449a4ce..c4046870746 100644
--- a/modules/programs/bash/bashrc.sh
+++ b/modules/programs/bash/bashrc.sh
@@ -21,22 +21,23 @@ unset PATH INFOPATH PKG_CONFIG_PATH PERL5LIB GST_PLUGIN_PATH KDEDIRS
 unset XDG_CONFIG_DIRS XDG_DATA_DIRS
 
 for i in $NIX_PROFILES; do # !!! reverse
-    export PATH=$i/bin:$i/sbin:$PATH
-    export INFOPATH=$i/info:$i/share/info:$INFOPATH
-    export PKG_CONFIG_PATH="$i/lib/pkgconfig:$PKG_CONFIG_PATH"
+    # We have to care not leaving an empty PATH element, because that means '.' to Linux
+    export PATH=$i/bin:$i/sbin${PATH:+:}$PATH
+    export INFOPATH=$i/info:$i/share/info${INFOPATH:+:}$INFOPATH
+    export PKG_CONFIG_PATH="$i/lib/pkgconfig${PKG_CONFIG_PATH:+:}$PKG_CONFIG_PATH"
 
     # "lib/site_perl" is for backwards compatibility with packages
     # from Nixpkgs <= 0.12.
-    export PERL5LIB="$i/lib/perl5/site_perl:$i/lib/site_perl:$PERL5LIB"
+    export PERL5LIB="$i/lib/perl5/site_perl:$i/lib/site_perl${PERL5LIB:+:}$PERL5LIB"
 
     # GStreamer.
-    export GST_PLUGIN_PATH="$i/lib/gstreamer-0.10:$GST_PLUGIN_PATH"
+    export GST_PLUGIN_PATH="$i/lib/gstreamer-0.10${GST_PLUGIN_PATH:+:}$GST_PLUGIN_PATH"
 
     # KDE/Gnome stuff.
-    export KDEDIRS=$i:$KDEDIRS
-    export QT_PLUGIN_PATH=$i/plugins:$i/lib/qt4/plugins:$QT_PLUGIN_PATH
-    export XDG_CONFIG_DIRS=$i/etc/xdg:$XDG_CONFIG_DIRS
-    export XDG_DATA_DIRS=$i/share:$XDG_DATA_DIRS
+    export KDEDIRS=$i${KDEDIRS:+:}$KDEDIRS
+    export QT_PLUGIN_PATH=$i/plugins:$i/lib/qt4/plugins${QT_PLUGIN_PATH:+:}$QT_PLUGIN_PATH
+    export XDG_CONFIG_DIRS=$i/etc/xdg${XDG_CONFIG_DIRS:+:}$XDG_CONFIG_DIRS
+    export XDG_DATA_DIRS=$i/share${XDG_DATA_DIRS:+:}$XDG_DATA_DIRS
 done
 @shellInit@
 
-- 
GitLab


From 1133f664bd60a7beb86d044017d53d2e4391d242 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 18 May 2010 15:19:52 +0000
Subject: [PATCH 2355/5331] * Fix https printing (the symlink to ipp was
 broken).

svn path=/nixos/trunk/; revision=21841
---
 modules/services/printing/cupsd.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/modules/services/printing/cupsd.nix b/modules/services/printing/cupsd.nix
index cbf67d391b5..40760ec8af5 100644
--- a/modules/services/printing/cupsd.nix
+++ b/modules/services/printing/cupsd.nix
@@ -17,15 +17,15 @@ let
     builder = pkgs.writeScript "additional-backends-builder.sh" ''
       PATH=${pkgs.coreutils}/bin
       mkdir -p $out
-      if [[ ! -e ${pkgs.samba}/lib/cups/backend/smb ]]; then
+      if [ ! -e ${pkgs.samba}/lib/cups/backend/smb ]; then
         mkdir -p $out/lib/cups/backend
         ln -s ${pkgs.samba}/bin/smbspool $out/lib/cups/backend/smb
       fi
 
       # Provide support for printing via HTTPS.
-      if [[ ! -e ${pkgs.cups}/lib/cups/backend/https ]]; then
+      if [ ! -e ${pkgs.cups}/lib/cups/backend/https ]; then
         mkdir -p $out/lib/cups/backend
-        ln -s ipp $out/lib/cups/backend/https
+        ln -s ${pkgs.cups}/lib/cups/backend/ipp $out/lib/cups/backend/https
       fi
     '';
   };
-- 
GitLab


From a0b97de2602fbc94635bdb76410e5f8961fc4a05 Mon Sep 17 00:00:00 2001
From: "Yury G. Kudryashov" <urkud.urkud@gmail.com>
Date: Tue, 18 May 2010 16:46:32 +0000
Subject: [PATCH 2356/5331] Use polkit-agent-helper-1 from libexec/polkit-1

svn path=/nixos/trunk/; revision=21844
---
 modules/security/polkit.nix | 20 +++++++++-----------
 1 file changed, 9 insertions(+), 11 deletions(-)

diff --git a/modules/security/polkit.nix b/modules/security/polkit.nix
index 2c726128d95..0a8ff4c7ea2 100644
--- a/modules/security/polkit.nix
+++ b/modules/security/polkit.nix
@@ -5,19 +5,17 @@ with pkgs.lib;
 let
   pkWrapper = pkgs.stdenv.mkDerivation {
     name = "polkit-wrapper";
-    helper = "polkit-agent-helper-1";
+    helper = "libexec/polkit-1/polkit-agent-helper-1";
     buildInputs = [ pkgs.xorg.lndir ];
 
     builder = pkgs.writeScript "pkwrap-builder" ''
       source $stdenv/setup
 
-      mkdir -p $out
+      mkdir -pv $out
       lndir ${pkgs.polkit} $out
-      new=$out/libexec/$helper
 
-      mv $new $out/libexec/.$helper.orig
-      echo "exec ${config.security.wrapperDir}/$helper \"\$@\"" > $new
-      chmod +x $new
+      rm $out/$helper
+      ln -sv ${config.security.wrapperDir}/polkit-agent-helper-1 $out/$helper
       '';
   };
 in
@@ -45,19 +43,19 @@ in
 
       setuidOwners = [
         {
-          program = pkWrapper.helper;
+          program = "polkit-agent-helper-1";
           owner = "root";
           group = "root";
           setuid = true;
-          source = pkWrapper + "/libexec/." + pkWrapper.helper + ".orig";
+          source = pkgs.polkit + "/" + pkWrapper.helper;
         }
       ];
     };
 
-    system.activationScripts.policyKit = pkgs.stringsWithDeps.noDepEntry
+    system.activationScripts.polikit = pkgs.stringsWithDeps.noDepEntry
       ''
-        mkdir -p /var/lib/polkit-1
-        chmod 700 /var/lib/polkit-1
+        mkdir -p /var/lib/polkit-1/localauthority
+        chmod 700 /var/lib/polkit-1{/localauthority,}
       '';
   };
 
-- 
GitLab


From 7d6db6ac0cdfaa11271a0c7fc7c952c5a72ef033 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Tue, 18 May 2010 17:57:03 +0000
Subject: [PATCH 2357/5331] Fixing the pcscd job (daemonType)

svn path=/nixos/trunk/; revision=21845
---
 modules/services/hardware/pcscd.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/services/hardware/pcscd.nix b/modules/services/hardware/pcscd.nix
index 45684e17416..6f4e848ee69 100644
--- a/modules/services/hardware/pcscd.nix
+++ b/modules/services/hardware/pcscd.nix
@@ -29,7 +29,7 @@ with pkgs.lib;
 
         startOn = "started udev";
 
-        daemonType = "daemon";
+        daemonType = "fork";
 
         # Add to the drivers directory the only drivers we have by now: ccid
         preStart = ''
-- 
GitLab


From 674d3965768605ad2731b2cb6af8b9721b392fbc Mon Sep 17 00:00:00 2001
From: Marc Weber <marco-oweber@gmx.de>
Date: Tue, 18 May 2010 19:36:11 +0000
Subject: [PATCH 2358/5331] adding initial support for proprietary ati drivers
 You have to add some impure paths, see:
 http://thread.gmane.org/gmane.linux.distributions.nixos/4145

svn path=/nixos/trunk/; revision=21847
---
 modules/services/x11/xserver.nix | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/modules/services/x11/xserver.nix b/modules/services/x11/xserver.nix
index 658a5d4e144..34eefd3023d 100644
--- a/modules/services/x11/xserver.nix
+++ b/modules/services/x11/xserver.nix
@@ -14,6 +14,7 @@ let
   # Map video driver names to driver packages.
   knownVideoDrivers = {
     ati          = { modules = [ xorg.xf86videoati ]; };
+    ati_unfree   = { modules = [ kernelPackages.ati_drivers_x11 ]; driverName = "fglrx"; };
     cirrus       = { modules = [ xorg.xf86videocirrus ]; };
     i810         = { modules = [ xorg.xf86videoi810 ]; };
     intel        = { modules = [ xorg.xf86videointel ]; };
@@ -362,7 +363,8 @@ in
     boot.extraModulePackages =
       optional (elem "nvidia" driverNames) kernelPackages.nvidia_x11 ++ 
       optional (elem "nvidiaLegacy" driverNames) kernelPackages.nvidia_x11_legacy ++
-      optional (elem "virtualbox" driverNames) kernelPackages.virtualboxGuestAdditions;
+      optional (elem "virtualbox" driverNames) kernelPackages.virtualboxGuestAdditions ++
+      optional (elem "ati_unfree" driverNames) kernelPackages.ati_drivers_x11;
 
     environment.etc = optionals cfg.exportConfiguration
       [ { source = "${configFile}";
@@ -388,7 +390,8 @@ in
       ]
       ++ optional (elem "nvidia" driverNames) kernelPackages.nvidia_x11
       ++ optional (elem "nvidiaLegacy" driverNames) kernelPackages.nvidia_x11_legacy
-      ++ optional (elem "virtualbox" driverNames) xorg.xrefresh;
+      ++ optional (elem "virtualbox" driverNames) xorg.xrefresh
+      ++ optional (elem "ati_unfree" driverNames) kernelPackages.ati_drivers_x11;
       
     environment.systemPackages = config.environment.x11Packages;
     
@@ -408,6 +411,9 @@ in
             LD_LIBRARY_PATH = "${xorg.libX11}/lib:${xorg.libXext}/lib:${kernelPackages.nvidia_x11}/lib";
           } // optionalAttrs (elem "nvidiaLegacy" driverNames) {
             LD_LIBRARY_PATH = "${xorg.libX11}/lib:${xorg.libXext}/lib:${kernelPackages.nvidia_x11_legacy}/lib";
+          } // optionalAttrs (elem "ati_unfree" driverNames) {
+            LD_LIBRARY_PATH = "${xorg.libX11}/lib:${xorg.libXext}/lib:${kernelPackages.ati_drivers_x11}/lib:${kernelPackages.ati_drivers_x11}/X11R6/lib64/modules/linux";
+            XORG_DRI_DRIVER_PATH = "${kernelPackages.ati_drivers_x11}/lib/dri"; # is ignored because ati drivers ship their own unpatched libglx.so !
           } // cfg.displayManager.job.environment;
 
         preStart =
-- 
GitLab


From 12e43068cfc498355f9863fc582d4117a152d9ba Mon Sep 17 00:00:00 2001
From: "Yury G. Kudryashov" <urkud.urkud@gmail.com>
Date: Wed, 19 May 2010 19:15:49 +0000
Subject: [PATCH 2359/5331] More verbose udev log

svn path=/nixos/trunk/; revision=21881
---
 modules/services/hardware/udev.nix | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/modules/services/hardware/udev.nix b/modules/services/hardware/udev.nix
index 0088072121e..c8b35785ceb 100644
--- a/modules/services/hardware/udev.nix
+++ b/modules/services/hardware/udev.nix
@@ -35,7 +35,7 @@ let
       shopt -s nullglob
 
       # Use all the default udev rules.
-      cp ${udev}/libexec/rules.d/*.rules $out/
+      cp -v ${udev}/libexec/rules.d/*.rules $out/
 
       # Set a reasonable $PATH for programs called by udev rules.
       echo 'ENV{PATH}="${pkgs.coreutils}/bin:${pkgs.gnused}/bin:${pkgs.utillinux}/bin"' > $out/00-path.rules
@@ -46,8 +46,9 @@ let
       
       # Add the udev rules from other packages.
       for i in ${toString cfg.packages}; do
+        echo "Add rules for package $i"
         for j in $i/*/udev/rules.d/*; do
-          ln -s $j $out/$(basename $j)
+          ln -sv $j $out/$(basename $j)
         done
       done
 
@@ -72,8 +73,8 @@ let
       # modified by the write_{cd,net}_rules helpers called from
       # 75-cd-aliases-generator.rules and
       # 75-persistent-net-generator.rules.
-      ln -s /var/lib/udev/rules.d/70-persistent-cd.rules $out/
-      ln -s /var/lib/udev/rules.d/70-persistent-net.rules $out/
+      ln -sv /var/lib/udev/rules.d/70-persistent-cd.rules $out/
+      ln -sv /var/lib/udev/rules.d/70-persistent-net.rules $out/
     ''; # */
   };
 
@@ -169,7 +170,7 @@ in
           ''
             echo "" > /proc/sys/kernel/hotplug
 
-            mkdir -p /var/lib/udev/rules.d
+            mkdir -pv /var/lib/udev/rules.d
 
             # Do the loading of additional stage 2 kernel modules.
             # Maybe this isn't the best place...
@@ -178,7 +179,7 @@ in
                 ${modprobe}/sbin/modprobe $i || true
             done
 
-            mkdir -p /dev/.udev # !!! bug in udev?
+            mkdir -pv /dev/.udev # !!! bug in udev?
           '';
 
         daemonType = "fork";
-- 
GitLab


From 2dfd9b51ae5643c71304bff3c3475a91107d58fa Mon Sep 17 00:00:00 2001
From: "Yury G. Kudryashov" <urkud.urkud@gmail.com>
Date: Wed, 19 May 2010 21:11:46 +0000
Subject: [PATCH 2360/5331] gnupg2 is now called gnupg

svn path=/nixos/trunk/; revision=21889
---
 modules/installer/cd-dvd/installation-cd-rescue.nix | 2 +-
 modules/services/x11/display-managers/default.nix   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/installer/cd-dvd/installation-cd-rescue.nix b/modules/installer/cd-dvd/installation-cd-rescue.nix
index 7b220680b6c..fe067df03fb 100644
--- a/modules/installer/cd-dvd/installation-cd-rescue.nix
+++ b/modules/installer/cd-dvd/installation-cd-rescue.nix
@@ -24,7 +24,7 @@
     fuse ntfs3g smbfsFuse sshfsFuse
     manpages irssi elinks mcabber mutt openssh lftp 
     openssl ncat socat
-    gnupg gnupg2
+    gnupg1 gnupg
     patch which diffutils gcc binutils bc file
     screen
     bvi joe nvi 
diff --git a/modules/services/x11/display-managers/default.nix b/modules/services/x11/display-managers/default.nix
index 0cebbbf6be1..197ba7631e9 100644
--- a/modules/services/x11/display-managers/default.nix
+++ b/modules/services/x11/display-managers/default.nix
@@ -43,7 +43,7 @@ let
       ${optionalString cfg.startGnuPGAgent ''
         if test -z "$SSH_AUTH_SOCK"; then
             # Restart this script as a child of the GnuPG agent.
-            exec "${if pkgs ? gnupg2 then pkgs.gnupg2 else pkgs.gnupg}/bin/gpg-agent"                         \
+            exec "${pkgs.gnupg}/bin/gpg-agent"                         \
               --enable-ssh-support --daemon                             \
               --pinentry-program "${pkgs.pinentry}/bin/pinentry-gtk-2"  \
               --write-env-file "$HOME/.gpg-agent-info"                  \
-- 
GitLab


From ad8ed39285d217e1476e5552faeffb5713a720cf Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 20 May 2010 14:51:46 +0000
Subject: [PATCH 2361/5331] * It should not be necessary to run ntpd in the
 guest.

svn path=/nixos/trunk/; revision=21925
---
 modules/virtualisation/qemu-vm.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/modules/virtualisation/qemu-vm.nix b/modules/virtualisation/qemu-vm.nix
index 64910ed45c9..6c14fb3ade4 100644
--- a/modules/virtualisation/qemu-vm.nix
+++ b/modules/virtualisation/qemu-vm.nix
@@ -195,6 +195,9 @@ in
       ipAddress = "10.0.2.15";
     };
 
+  # Don't run ntpd in the guest.  It should get the correct time from KVM.
+  services.ntp.enable = false;
+    
   system.build.vm = pkgs.runCommand "nixos-vm" {}
     ''
       ensureDir $out/bin
-- 
GitLab


From 85bd5bad32906698a82626ee9f5a1704ac1db588 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 20 May 2010 14:56:04 +0000
Subject: [PATCH 2362/5331] * Another distributed test example: Bittorrent.

svn path=/nixos/trunk/; revision=21926
---
 tests/bittorrent.nix | 53 ++++++++++++++++++++++++++++++++++++++++++++
 tests/default.nix    |  1 +
 2 files changed, 54 insertions(+)
 create mode 100644 tests/bittorrent.nix

diff --git a/tests/bittorrent.nix b/tests/bittorrent.nix
new file mode 100644
index 00000000000..01640e899d7
--- /dev/null
+++ b/tests/bittorrent.nix
@@ -0,0 +1,53 @@
+{ pkgs, ... }:
+
+let
+
+  # Some random file to serve.
+  file = pkgs.nixUnstable.src;
+  
+in
+
+{
+
+  nodes =
+    { tracker = 
+        { config, pkgs, ... }:
+        { environment.systemPackages = [ pkgs.transmission pkgs.bittorrent ];
+
+          # We need Apache on the tracker to serve the torrents.
+          services.httpd.enable = true;
+          services.httpd.adminAddr = "foo@example.org";
+          services.httpd.documentRoot = "/tmp";
+        };
+
+      client = 
+        { config, pkgs, ... }:
+        { environment.systemPackages = [ pkgs.transmission ];
+        };
+    };
+
+  testScript =
+    ''
+      startAll;
+
+      # Create the torrent.
+      $tracker->mustSucceed("mkdir /tmp/data");
+      $tracker->mustSucceed("cp ${file} /tmp/data/test.tar.bz2");
+      $tracker->mustSucceed("transmissioncli -n /tmp/data/test.tar.bz2 -a http://tracker:6969/announce /tmp/test.torrent");
+      $tracker->mustSucceed("chmod 644 /tmp/test.torrent");
+
+      # Start the tracker.  !!! use a less crappy tracker
+      $tracker->mustSucceed("bittorrent-tracker --port 6969 --dfile /tmp/dstate >&2 &");
+      $tracker->waitForOpenPort(6969);
+
+      # Start the initial seeder.
+      $tracker->mustSucceed("transmissioncli /tmp/test.torrent -M -w /tmp/data >&2 &");
+
+      # Now we should be able to download from the client.
+      $tracker->waitForJob("httpd");
+      $client->mustSucceed("transmissioncli http://tracker/test.torrent -M -w /tmp >&2 &");
+      $client->waitForFile("/tmp/test.tar.bz2");
+      $client->mustSucceed("cmp /tmp/test.tar.bz2 ${file}");
+    '';
+  
+}
diff --git a/tests/default.nix b/tests/default.nix
index 90d629f7978..7ba89601807 100644
--- a/tests/default.nix
+++ b/tests/default.nix
@@ -6,6 +6,7 @@
 with import ../lib/testing.nix { inherit nixpkgs services system; };
 
 {
+  bittorrent = apply (import ./bittorrent.nix);
   firefox = apply (import ./firefox.nix);
   installer = pkgs.lib.mapAttrs (name: complete) (call (import ./installer.nix));
   kde4 = apply (import ./kde4.nix);
-- 
GitLab


From 4dac9e581461f1aadf552c1237f6e21e09c05919 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 20 May 2010 21:07:32 +0000
Subject: [PATCH 2363/5331] * Allow more complex network topologies in
 distributed tests.  Each   machine can now declare an option
 `virtualisation.vlans' that causes   it to have network interfaces connected
 to each listed virtual   network.  For instance,

    virtualisation.vlans = [ 1 2 ];

  causes the machine to have two interfaces (in addition to eth0, used
  by the test driver to control the machine): eth1 connected to
  network 1 with IP address 192.168.1.<i>, and eth2 connected to
  network 2 with address 192.168.2.<i> (where <i> is the index of the
  machine in the `nodes' attribute set).  On the other hand,

    virtualisation.vlans = [ 2 ];

  causes the machine to only have an eth1 connected to network 2 with
  address 192.168.2.<i>.  So each virtual network <n> is assigned the
  IP range 192.168.<n>.0/24.

  Each virtual network is implemented using a separate multicast
  address on the host, so guests really cannot talk to networks to
  which they are not connected.

* Added a simple NAT test to demonstrate this.

* Added an option `virtualisation.qemu.options' to specify QEMU
  command-line options.  Used to factor out some commonality between
  the test driver script and the interactive test script.

svn path=/nixos/trunk/; revision=21928
---
 lib/build-vms.nix                  | 71 +++++++++++++++++++++---------
 lib/test-driver/Machine.pm         | 13 ++++--
 modules/virtualisation/qemu-vm.nix | 38 ++++++++++++++--
 tests/default.nix                  |  1 +
 tests/nat.nix                      | 55 +++++++++++++++++++++++
 5 files changed, 151 insertions(+), 27 deletions(-)
 create mode 100644 tests/nat.nix

diff --git a/lib/build-vms.nix b/lib/build-vms.nix
index 88806683d3e..a84f55435c8 100644
--- a/lib/build-vms.nix
+++ b/lib/build-vms.nix
@@ -40,7 +40,7 @@ rec {
           for i in $out/vms/*; do
             port2=\$((port++))
             echo "forwarding localhost:\$port2 to \$(basename \$i):80"
-            QEMU_OPTS="-redir tcp:\$port2::80 -net nic,vlan=1,model=virtio -net socket,vlan=1,mcast=232.0.1.1:1234" \$i/bin/run-*-vm &
+            QEMU_OPTS="-redir tcp:\$port2::80" \$i/bin/run-*-vm &
           done
           EOF
           chmod +x $out/bin/run-vms
@@ -71,26 +71,57 @@ rec {
     
       machines = lib.attrNames nodes;
 
-      machinesWithIP = zip machines
-        (map (n: "192.168.1.${toString n}") (lib.range 1 254));
-
-      # Generate a /etc/hosts file.
-      hosts = lib.concatMapStrings (m: "${m.second} ${m.first}\n") machinesWithIP;
-
-      nodes_ = map (m: lib.nameValuePair m.first [
-          { key = "ip-address";
-            config =
-              { networking.hostName = m.first;
-                networking.interfaces =
-                  [ { name = "eth1";
-                      ipAddress = m.second;
-                    }
-                  ];
-                networking.extraHosts = hosts;
-              };
-          }
+      machinesNumbered = zip machines (lib.range 1 254);
+
+      nodes_ = lib.flip map machinesNumbered (m: lib.nameValuePair m.first
+        [ ( { config, pkgs, nodes, ... }:
+            let
+              interfacesNumbered = zip config.virtualisation.vlans (lib.range 1 255);
+              interfaces = 
+                lib.flip map interfacesNumbered ({ first, second }:
+                  { name = "eth${toString second}";
+                    ipAddress = "192.168.${toString first}.${toString m.second}";
+                  }
+                );
+            in
+            { key = "ip-address";
+              config =
+                { networking.hostName = m.first;
+                
+                  networking.interfaces = interfaces;
+                    
+                  networking.primaryIPAddress =
+                    lib.optionalString (interfaces != []) (lib.head interfaces).ipAddress;
+                  
+                  # Put the IP addresses of all VMs in this machine's
+                  # /etc/hosts file.  If a machine has multiple
+                  # interfaces, use the IP address corresponding to
+                  # the first interface (i.e. the first network in its
+                  # virtualisation.vlans option).
+                  networking.extraHosts = lib.flip lib.concatMapStrings machines
+                    (m: let config = (lib.getAttr m nodes).config; in
+                      lib.optionalString (config.networking.primaryIPAddress != "")
+                        ("${config.networking.primaryIPAddress} " +
+                         "${config.networking.hostName}\n"));
+                  
+                  virtualisation.qemu.options =
+                    lib.flip lib.concatMapStrings interfacesNumbered ({ first, second }:
+                      "-net nic,vlan=${toString second},model=virtio " +
+                      # Use 232.0.1.<vlan> as the multicast address to
+                      # connect VMs on the same vlan, but allow it to
+                      # be overriden using the $QEMU_MCAST_ADDR_<vlan>
+                      # environment variable.  The test driver sets
+                      # this variable to prevent collisions between
+                      # parallel builds.
+                      "-net socket,vlan=${toString second},mcast=" +
+                      "\${QEMU_MCAST_ADDR_${toString first}:-232.0.1.${toString first}:1234} "
+                    );
+
+                };
+            }
+          )
           (lib.getAttr m.first nodes)
-        ]) machinesWithIP;
+        ] );
 
     in lib.listToAttrs nodes_;
 
diff --git a/lib/test-driver/Machine.pm b/lib/test-driver/Machine.pm
index 634f566bd1a..a832e7cab48 100644
--- a/lib/test-driver/Machine.pm
+++ b/lib/test-driver/Machine.pm
@@ -11,9 +11,14 @@ use Cwd;
 
 
 # Stuff our PID in the multicast address/port to prevent collissions
-# with other NixOS VM networks.
-my $mcastAddr = "232.18.1." . ($$ >> 8) . ":" . (64000 + ($$ & 0xff));
-print STDERR "using multicast address $mcastAddr\n";
+# with other NixOS VM networks.  See
+# http://www.iana.org/assignments/multicast-addresses/.
+my $mcastPrefix = "232.18";
+my $mcastSuffix = ($$ >> 8) . ":" . (64000 + ($$ & 0xff));
+print STDERR "using multicast addresses $mcastPrefix.<vlan>.$mcastSuffix\n";
+for (my $n = 0; $n < 256; $n++) {
+    $ENV{"QEMU_MCAST_ADDR_$n"} = "$mcastPrefix.$n.$mcastSuffix";
+}
 
 
 sub new {
@@ -107,7 +112,7 @@ sub start {
         dup2(fileno($serialC), fileno(STDOUT));
         dup2(fileno($serialC), fileno(STDERR));
         $ENV{TMPDIR} = $self->{stateDir};
-        $ENV{QEMU_OPTS} = "-nographic -no-reboot -redir tcp:65535::514 -net nic,vlan=1,model=virtio -net socket,vlan=1,mcast=$mcastAddr -monitor unix:./monitor";
+        $ENV{QEMU_OPTS} = "-nographic -no-reboot -redir tcp:65535::514 -monitor unix:./monitor";
         $ENV{QEMU_KERNEL_PARAMS} = "hostTmpDir=$ENV{TMPDIR}";
         chdir $self->{stateDir} or die;
         exec $self->{startCommand};
diff --git a/modules/virtualisation/qemu-vm.nix b/modules/virtualisation/qemu-vm.nix
index 6c14fb3ade4..7763b5ac9dc 100644
--- a/modules/virtualisation/qemu-vm.nix
+++ b/modules/virtualisation/qemu-vm.nix
@@ -68,6 +68,37 @@ let
             database in the guest).
           '';
       };
+
+    virtualisation.vlans = 
+      mkOption {
+        default = [ 1 ];
+        example = [ 1 2 ];
+        description =
+          ''
+            Virtual networks to which the VM is connected.  Each
+            number <replaceable>N</replaceable> in this list causes
+            the VM to have a virtual Ethernet interface attached to a
+            separate virtual network on which it will be assigned IP
+            address
+            <literal>192.168.<replaceable>N</replaceable>.<replaceable>M</replaceable></literal>,
+            where <replaceable>M</replaceable> is the index of this VM
+            in the list of VMs.
+          '';
+      };
+
+    networking.primaryIPAddress =
+      mkOption {
+        default = "";
+        internal = true;
+        description = "Primary IP address used in /etc/hosts.";
+      };
+
+    virtualisation.qemu.options =
+      mkOption {
+        default = "";
+        example = "-vga std";
+        description = "Options passed to QEMU.";
+      };
       
   };
 
@@ -94,13 +125,14 @@ let
       # hanging the VM on x86_64.
       exec ${pkgs.qemu_kvm}/bin/qemu-system-x86_64 -m ${toString config.virtualisation.memorySize} \
           -no-kvm-irqchip \
-          -net nic,model=virtio -net user -smb / \
+          -net nic,vlan=0,model=virtio -net user,vlan=0 -smb / \
           -drive file=$NIX_DISK_IMAGE,if=virtio,boot=on,werror=report \
           -kernel ${config.system.build.toplevel}/kernel \
           -initrd ${config.system.build.toplevel}/initrd \
           ${qemuGraphics} \
           $QEMU_OPTS \
-          -append "$(cat ${config.system.build.toplevel}/kernel-params) init=${config.system.build.bootStage2} systemConfig=${config.system.build.toplevel} regInfo=${regInfo} ${kernelConsole} $QEMU_KERNEL_PARAMS"
+          -append "$(cat ${config.system.build.toplevel}/kernel-params) init=${config.system.build.bootStage2} systemConfig=${config.system.build.toplevel} regInfo=${regInfo} ${kernelConsole} $QEMU_KERNEL_PARAMS" \
+          ${config.virtualisation.qemu.options}
     '';
 
     
@@ -186,7 +218,7 @@ in
   # host filesystem and thus deadlocks the system.
   networking.useDHCP = false;
 
-  networking.defaultGateway = "10.0.2.2";
+  networking.defaultGateway = mkOverride 200 {} "10.0.2.2";
 
   networking.nameservers = [ "10.0.2.3" ];
 
diff --git a/tests/default.nix b/tests/default.nix
index 7ba89601807..21f9a66de08 100644
--- a/tests/default.nix
+++ b/tests/default.nix
@@ -11,6 +11,7 @@ with import ../lib/testing.nix { inherit nixpkgs services system; };
   installer = pkgs.lib.mapAttrs (name: complete) (call (import ./installer.nix));
   kde4 = apply (import ./kde4.nix);
   login = apply (import ./login.nix);
+  nat = apply (import ./nat.nix);
   openssh = apply (import ./openssh.nix);
   portmap = apply (import ./portmap.nix);
   proxy = apply (import ./proxy.nix);
diff --git a/tests/nat.nix b/tests/nat.nix
new file mode 100644
index 00000000000..611a4ff1325
--- /dev/null
+++ b/tests/nat.nix
@@ -0,0 +1,55 @@
+# This is a simple distributed test involving a topology with two
+# separate virtual networks - the "inside" and the "outside" - with a
+# client on the inside network, a server on the outside network, and a
+# router connected to both that performs Network Address Translation
+# for the client.
+
+{ pkgs, ... }:
+
+{
+
+  nodes =
+    { client = 
+        { config, pkgs, ... }:
+        { virtualisation.vlans = [ 1 ];
+          networking.defaultGateway = "192.168.1.2"; # !!! ugly
+        };
+
+      router = 
+        { config, pkgs, ... }:
+        { virtualisation.vlans = [ 2 1 ];
+          environment.systemPackages = [ pkgs.iptables ];
+        };
+
+      server = 
+        { config, pkgs, ... }:
+        { virtualisation.vlans = [ 2 ];
+          services.httpd.enable = true;
+          services.httpd.adminAddr = "foo@example.org";
+        };
+    };
+
+  testScript =
+    ''
+      startAll;
+
+      # The router should have access to the server.
+      $server->waitForJob("httpd");
+      $router->mustSucceed("curl --fail http://server/ >&2");
+
+      # But the client shouldn't be able to reach the server.
+      $client->mustFail("curl --fail --connect-timeout 5 http://server/ >&2");
+
+      # Enable NAT on the router.
+      $router->mustSucceed(
+          "iptables -t nat -F",
+          "iptables -t nat -A POSTROUTING -s 192.168.1.0/24 -d 192.168.1.0/24 -j ACCEPT",
+          "iptables -t nat -A POSTROUTING -s 192.168.1.0/24 -j SNAT --to-source 192.168.2.2", # !!! ugly
+          "echo 1 > /proc/sys/net/ipv4/ip_forward"
+      );
+
+      # Now the client should be able to connect.
+      $client->mustSucceed("curl --fail http://server/ >&2");
+    '';
+
+}
-- 
GitLab


From 3c7a6eb53cb9895225e705544b3289e3cd79bedd Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 20 May 2010 23:07:21 +0000
Subject: [PATCH 2364/5331] * Make the Bittorrent test more interesting by
 putting one client   behind a NAT router and verifying that another client
 can connect to   it through the NAT (using a UPnP-IGD mapping created
 automatically   by miniupnpd).

svn path=/nixos/trunk/; revision=21932
---
 tests/bittorrent.nix | 60 +++++++++++++++++++++++++++++++++++++++-----
 1 file changed, 54 insertions(+), 6 deletions(-)

diff --git a/tests/bittorrent.nix b/tests/bittorrent.nix
index 01640e899d7..26b7f106865 100644
--- a/tests/bittorrent.nix
+++ b/tests/bittorrent.nix
@@ -1,9 +1,24 @@
+# This test runs a Bittorrent tracker on one machine, and verifies
+# that two client machines can download the torrent using
+# `transmission'.  The first client (behind a NAT router) downloads
+# from the initial seeder running on the tracker.  Then we kill the
+# initial seeder.  The second client downloads from the first client,
+# which only works if the first client successfully uses the UPnP-IGD
+# protocol to poke a hole in the NAT.
+
 { pkgs, ... }:
 
 let
 
   # Some random file to serve.
   file = pkgs.nixUnstable.src;
+
+  miniupnpdConf = pkgs.writeText "miniupnpd.conf"
+    ''
+      ext_ifname=eth1
+      listening_ip=192.168.2.3/24
+      allow 1024-65535 192.168.2.0/24 1024-65535
+    '';
   
 in
 
@@ -20,7 +35,20 @@ in
           services.httpd.documentRoot = "/tmp";
         };
 
-      client = 
+      router = 
+        { config, pkgs, ... }:
+        { environment.systemPackages = [ pkgs.iptables pkgs.miniupnpd ];
+          virtualisation.vlans = [ 1 2 ];
+        };
+
+      client1 = 
+        { config, pkgs, ... }:
+        { environment.systemPackages = [ pkgs.transmission ];
+          virtualisation.vlans = [ 2 ];
+          networking.defaultGateway = "192.168.2.3"; # !!! ugly
+        };
+
+      client2 = 
         { config, pkgs, ... }:
         { environment.systemPackages = [ pkgs.transmission ];
         };
@@ -30,6 +58,17 @@ in
     ''
       startAll;
 
+      # Enable NAT on the router and start miniupnpd.
+      $router->mustSucceed(
+          "iptables -t nat -F",
+          "iptables -t nat -A POSTROUTING -s 192.168.2.0/24 -d 192.168.2.0/24 -j ACCEPT",
+          "iptables -t nat -A POSTROUTING -s 192.168.2.0/24 -j SNAT --to-source 192.168.1.3", # !!! ugly
+          "iptables -t nat -N MINIUPNPD",
+          "iptables -t nat -A PREROUTING -i eth1 -j MINIUPNPD",
+          "echo 1 > /proc/sys/net/ipv4/ip_forward",
+          "miniupnpd -f ${miniupnpdConf}"
+      );
+
       # Create the torrent.
       $tracker->mustSucceed("mkdir /tmp/data");
       $tracker->mustSucceed("cp ${file} /tmp/data/test.tar.bz2");
@@ -41,13 +80,22 @@ in
       $tracker->waitForOpenPort(6969);
 
       # Start the initial seeder.
-      $tracker->mustSucceed("transmissioncli /tmp/test.torrent -M -w /tmp/data >&2 &");
+      my $pid = $tracker->mustSucceed("transmissioncli /tmp/test.torrent -M -w /tmp/data >&2 & echo \$!");
 
-      # Now we should be able to download from the client.
+      # Now we should be able to download from the client behind the NAT.
       $tracker->waitForJob("httpd");
-      $client->mustSucceed("transmissioncli http://tracker/test.torrent -M -w /tmp >&2 &");
-      $client->waitForFile("/tmp/test.tar.bz2");
-      $client->mustSucceed("cmp /tmp/test.tar.bz2 ${file}");
+      $client1->mustSucceed("transmissioncli http://tracker/test.torrent -w /tmp >&2 &");
+      $client1->waitForFile("/tmp/test.tar.bz2");
+      $client1->mustSucceed("cmp /tmp/test.tar.bz2 ${file}");
+
+      # Bring down the initial seeder.
+      $tracker->mustSucceed("kill -9 $pid");
+
+      # Now download from the second client.  This can only succeed if
+      # the first client created a NAT hole in the router.
+      $client2->mustSucceed("transmissioncli http://tracker/test.torrent -M -w /tmp >&2 &");
+      $client2->waitForFile("/tmp/test.tar.bz2");
+      $client2->mustSucceed("cmp /tmp/test.tar.bz2 ${file}");
     '';
   
 }
-- 
GitLab


From fa183e54723e62f015813b01f848e855297d1538 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 21 May 2010 14:12:03 +0000
Subject: [PATCH 2365/5331] * Expose networking.interfaces as an attribute set
 keyed on the   interface name through the derived option networking.ifaces. 
 This   makes it easier to get information about specific interfaces   (e.g.
 `nodes.router.config.networking.ifaces.eth2.ipAddress').   Really
 networking.interfaces should be an attribute set.

svn path=/nixos/trunk/; revision=21938
---
 modules/tasks/network-interfaces.nix | 10 ++++++++++
 tests/bittorrent.nix                 |  5 +++--
 tests/nat.nix                        |  5 +++--
 3 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/modules/tasks/network-interfaces.nix b/modules/tasks/network-interfaces.nix
index 28372450f24..836950f42a6 100644
--- a/modules/tasks/network-interfaces.nix
+++ b/modules/tasks/network-interfaces.nix
@@ -117,6 +117,16 @@ in
       
     };
 
+    networking.ifaces = mkOption {
+      default = listToAttrs
+        (map (iface: { name = iface.name; value = iface; }) config.networking.interfaces);
+      internal = true;
+      description = ''
+        The network interfaces in <option>networking.interfaces</option>
+        as an attribute set keyed on the interface name.
+      '';
+    };
+    
   };
 
 
diff --git a/tests/bittorrent.nix b/tests/bittorrent.nix
index 26b7f106865..ac42fb33a85 100644
--- a/tests/bittorrent.nix
+++ b/tests/bittorrent.nix
@@ -42,10 +42,11 @@ in
         };
 
       client1 = 
-        { config, pkgs, ... }:
+        { config, pkgs, nodes, ... }:
         { environment.systemPackages = [ pkgs.transmission ];
           virtualisation.vlans = [ 2 ];
-          networking.defaultGateway = "192.168.2.3"; # !!! ugly
+          networking.defaultGateway =
+            nodes.router.config.networking.ifaces.eth2.ipAddress;
         };
 
       client2 = 
diff --git a/tests/nat.nix b/tests/nat.nix
index 611a4ff1325..7f2d8c6432f 100644
--- a/tests/nat.nix
+++ b/tests/nat.nix
@@ -10,9 +10,10 @@
 
   nodes =
     { client = 
-        { config, pkgs, ... }:
+        { config, pkgs, nodes, ... }:
         { virtualisation.vlans = [ 1 ];
-          networking.defaultGateway = "192.168.1.2"; # !!! ugly
+          networking.defaultGateway =
+            nodes.router.config.networking.ifaces.eth2.ipAddress;
         };
 
       router = 
-- 
GitLab


From dd813117147899b6aac82f82766a1a44559319db Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 21 May 2010 14:31:05 +0000
Subject: [PATCH 2366/5331] * Optionally pass the computed `nodes' to the test
 script as a   function argument, so that the test script can refer to
 computed   values such as the assigned IP addresses of the virtual machines.

svn path=/nixos/trunk/; revision=21939
---
 lib/build-vms.nix    |  1 +
 lib/testing.nix      | 18 ++++++++++--------
 tests/bittorrent.nix | 10 ++++++----
 tests/nat.nix        |  4 +++-
 4 files changed, 20 insertions(+), 13 deletions(-)

diff --git a/lib/build-vms.nix b/lib/build-vms.nix
index a84f55435c8..a32e1448939 100644
--- a/lib/build-vms.nix
+++ b/lib/build-vms.nix
@@ -45,6 +45,7 @@ rec {
           EOF
           chmod +x $out/bin/run-vms
         ''; # */
+      passthru = { nodes = nodes_; };
     };
 
 
diff --git a/lib/testing.nix b/lib/testing.nix
index 3a33ca69f08..f2cc29a33eb 100644
--- a/lib/testing.nix
+++ b/lib/testing.nix
@@ -95,17 +95,19 @@ rec {
       if t ? machine then { machine = t.machine; }
       else { };
     vms = buildVirtualNetwork { inherit nodes; };
-    test = runTests vms t.testScript;
+    test = runTests vms
+      # Call the test script with the computed nodes.
+      (if builtins.isFunction t.testScript then t.testScript { inherit (vms) nodes; } else t.testScript);
     report = makeReport test;
   };
 
-  runInMachine = {
-    drv
-  , machine
-  , preBuild ? ""
-  , postBuild ? ""
-  , ...
-  }:
+  runInMachine =
+    { drv
+    , machine
+    , preBuild ? ""
+    , postBuild ? ""
+    , ...
+    }:
     let
       vms =
         buildVirtualNetwork { nodes = { client = machine; } ; };
diff --git a/tests/bittorrent.nix b/tests/bittorrent.nix
index ac42fb33a85..051454da5cc 100644
--- a/tests/bittorrent.nix
+++ b/tests/bittorrent.nix
@@ -13,10 +13,10 @@ let
   # Some random file to serve.
   file = pkgs.nixUnstable.src;
 
-  miniupnpdConf = pkgs.writeText "miniupnpd.conf"
+  miniupnpdConf = nodes: pkgs.writeText "miniupnpd.conf"
     ''
       ext_ifname=eth1
-      listening_ip=192.168.2.3/24
+      listening_ip=${nodes.router.config.networking.ifaces.eth2.ipAddress}/24
       allow 1024-65535 192.168.2.0/24 1024-65535
     '';
   
@@ -56,6 +56,7 @@ in
     };
 
   testScript =
+    { nodes, ... }:
     ''
       startAll;
 
@@ -63,11 +64,12 @@ in
       $router->mustSucceed(
           "iptables -t nat -F",
           "iptables -t nat -A POSTROUTING -s 192.168.2.0/24 -d 192.168.2.0/24 -j ACCEPT",
-          "iptables -t nat -A POSTROUTING -s 192.168.2.0/24 -j SNAT --to-source 192.168.1.3", # !!! ugly
+          "iptables -t nat -A POSTROUTING -s 192.168.2.0/24 -j SNAT "
+          . "--to-source ${nodes.router.config.networking.ifaces.eth1.ipAddress}",
           "iptables -t nat -N MINIUPNPD",
           "iptables -t nat -A PREROUTING -i eth1 -j MINIUPNPD",
           "echo 1 > /proc/sys/net/ipv4/ip_forward",
-          "miniupnpd -f ${miniupnpdConf}"
+          "miniupnpd -f ${miniupnpdConf nodes}"
       );
 
       # Create the torrent.
diff --git a/tests/nat.nix b/tests/nat.nix
index 7f2d8c6432f..88aa609774f 100644
--- a/tests/nat.nix
+++ b/tests/nat.nix
@@ -31,6 +31,7 @@
     };
 
   testScript =
+    { nodes, ... }:
     ''
       startAll;
 
@@ -45,7 +46,8 @@
       $router->mustSucceed(
           "iptables -t nat -F",
           "iptables -t nat -A POSTROUTING -s 192.168.1.0/24 -d 192.168.1.0/24 -j ACCEPT",
-          "iptables -t nat -A POSTROUTING -s 192.168.1.0/24 -j SNAT --to-source 192.168.2.2", # !!! ugly
+          "iptables -t nat -A POSTROUTING -s 192.168.1.0/24 -j SNAT "
+          . "--to-source ${nodes.router.config.networking.ifaces.eth1.ipAddress}",
           "echo 1 > /proc/sys/net/ipv4/ip_forward"
       );
 
-- 
GitLab


From 07df264e0c617f56de871d85f70b50fef2f339d6 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sat, 22 May 2010 21:27:38 +0000
Subject: [PATCH 2367/5331] * mustSucceed -> succeed.

svn path=/nixos/trunk/; revision=21943
---
 lib/test-driver/Machine.pm | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/lib/test-driver/Machine.pm b/lib/test-driver/Machine.pm
index a832e7cab48..ed43d8d255a 100644
--- a/lib/test-driver/Machine.pm
+++ b/lib/test-driver/Machine.pm
@@ -255,7 +255,7 @@ sub execute {
 }
 
 
-sub mustSucceed {
+sub succeed {
     my ($self, @commands) = @_;
     my $res;
     foreach my $command (@commands) {
@@ -270,6 +270,11 @@ sub mustSucceed {
 }
 
 
+sub mustSucceed {
+    succeed @_;
+}
+
+
 sub waitUntilSucceeds {
     my ($self, $command) = @_;
     retry sub {
-- 
GitLab


From fa89713c78749601b23d5de5df2d972a027894bf Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sun, 23 May 2010 12:02:54 +0000
Subject: [PATCH 2368/5331] * Rename `apply' and `call'.

svn path=/nixos/trunk/; revision=21944
---
 lib/testing.nix   | 11 ++++++-----
 tests/default.nix | 24 ++++++++++++------------
 2 files changed, 18 insertions(+), 17 deletions(-)

diff --git a/lib/testing.nix b/lib/testing.nix
index f2cc29a33eb..3486dd6fc9e 100644
--- a/lib/testing.nix
+++ b/lib/testing.nix
@@ -84,10 +84,11 @@ rec {
     ''; # */
 
 
-  # !!! Rename these functions to something more sensible.    
-  call = f: f { inherit pkgs nixpkgs system; };
+  makeTest = testFun: complete (call testFun);
+  makeTests = testsFun: lib.mapAttrs (name: complete) (call testsFun);
 
-  apply = testFun: complete (call testFun);
+  apply = makeTest; # compatibility
+  call = f: f { inherit pkgs nixpkgs system; };
 
   complete = t: t // rec {
     nodes =
@@ -173,10 +174,10 @@ rec {
       runInMachine ({
             machine = client;
             preBuild = ''
-              $client->waitForX ;
+              $client->waitForX;
             '' ;
           } // args );   
 
-  simpleTest = as: (apply ({ ... }: as)).test;
+  simpleTest = as: (makeTest ({ ... }: as)).test;
 
 }
diff --git a/tests/default.nix b/tests/default.nix
index 21f9a66de08..dfccce3851c 100644
--- a/tests/default.nix
+++ b/tests/default.nix
@@ -6,16 +6,16 @@
 with import ../lib/testing.nix { inherit nixpkgs services system; };
 
 {
-  bittorrent = apply (import ./bittorrent.nix);
-  firefox = apply (import ./firefox.nix);
-  installer = pkgs.lib.mapAttrs (name: complete) (call (import ./installer.nix));
-  kde4 = apply (import ./kde4.nix);
-  login = apply (import ./login.nix);
-  nat = apply (import ./nat.nix);
-  openssh = apply (import ./openssh.nix);
-  portmap = apply (import ./portmap.nix);
-  proxy = apply (import ./proxy.nix);
-  quake3 = apply (import ./quake3.nix);
-  subversion = apply (import ./subversion.nix);
-  trac = apply (import ./trac.nix);
+  bittorrent = makeTest (import ./bittorrent.nix);
+  firefox = makeTest (import ./firefox.nix);
+  installer = makeTests (import ./installer.nix);
+  kde4 = makeTest (import ./kde4.nix);
+  login = makeTest (import ./login.nix);
+  nat = makeTest (import ./nat.nix);
+  openssh = makeTest (import ./openssh.nix);
+  portmap = makeTest (import ./portmap.nix);
+  proxy = makeTest (import ./proxy.nix);
+  quake3 = makeTest (import ./quake3.nix);
+  subversion = makeTest (import ./subversion.nix);
+  trac = makeTest (import ./trac.nix);
 }
-- 
GitLab


From 32d41f439d78243e6404f2b20f629e6298cd75bc Mon Sep 17 00:00:00 2001
From: "Yury G. Kudryashov" <urkud.urkud@gmail.com>
Date: Thu, 27 May 2010 09:35:36 +0000
Subject: [PATCH 2369/5331] Remove KDE3 desktop

We have no full KDE3 desktop anyway. KDE3 desktop was broken for a while, and nobody noticed.

svn path=/nixos/trunk/; revision=21996
---
 modules/module-list.nix                       |  2 -
 .../services/x11/desktop-managers/default.nix |  1 -
 .../x11/desktop-managers/kde-environment.nix  | 35 ---------
 modules/services/x11/desktop-managers/kde.nix | 73 -------------------
 .../services/x11/desktop-managers/kde4.nix    | 33 +++++----
 5 files changed, 20 insertions(+), 124 deletions(-)
 delete mode 100644 modules/services/x11/desktop-managers/kde-environment.nix
 delete mode 100644 modules/services/x11/desktop-managers/kde.nix

diff --git a/modules/module-list.nix b/modules/module-list.nix
index 5ba6fe69bea..8c22e92b6ad 100644
--- a/modules/module-list.nix
+++ b/modules/module-list.nix
@@ -114,8 +114,6 @@
   ./services/web-servers/tomcat.nix
   ./services/x11/desktop-managers/default.nix
   ./services/x11/desktop-managers/gnome.nix
-  ./services/x11/desktop-managers/kde-environment.nix
-  ./services/x11/desktop-managers/kde.nix
   ./services/x11/desktop-managers/kde4.nix
   ./services/x11/desktop-managers/none.nix
   ./services/x11/desktop-managers/xterm.nix
diff --git a/modules/services/x11/desktop-managers/default.nix b/modules/services/x11/desktop-managers/default.nix
index a775684b47d..d8303d4680a 100644
--- a/modules/services/x11/desktop-managers/default.nix
+++ b/modules/services/x11/desktop-managers/default.nix
@@ -12,7 +12,6 @@ in
 
 {
   imports = [
-    ./kde.nix
     ./kde4.nix
     ./gnome.nix
     ./xterm.nix
diff --git a/modules/services/x11/desktop-managers/kde-environment.nix b/modules/services/x11/desktop-managers/kde-environment.nix
deleted file mode 100644
index bb0f82b00dc..00000000000
--- a/modules/services/x11/desktop-managers/kde-environment.nix
+++ /dev/null
@@ -1,35 +0,0 @@
-{pkgs, config, ...}:
-
-let
-  inherit (pkgs.lib) mkDefaultValue mkOption mkIf types;
-  kdePackages = config.environment.kdePackages;
-
-  options = {
-
-    environment = {
-
-      kdePackages = mkOption {
-        default = [];
-        example = [ pkgs.kde4.kdegames ];
-        type = types.list types.package;
-        description = ''
-          Additional KDE packages to be used when you use KDE as a desktop
-          manager.  By default, you only get the KDE base packages.
-          Just adds packages to systemPackages and x11Packages. Will be removed
-          in the future.
-        '';
-      };
-
-    };
-  };
-in
-
-mkIf (kdePackages != [] && config.services.xserver.enable) {
-  require = options;
-
-  environment = {
-    x11Packages = kdePackages;
-    systemPackages = kdePackages;
-    pathsToLink = [ "/etc/xdg" "/etc/dbus-1" "/share" "/plugins" ];
-  };
-}
diff --git a/modules/services/x11/desktop-managers/kde.nix b/modules/services/x11/desktop-managers/kde.nix
deleted file mode 100644
index 442a79fde4f..00000000000
--- a/modules/services/x11/desktop-managers/kde.nix
+++ /dev/null
@@ -1,73 +0,0 @@
-{pkgs, config, ...}:
-
-let
-  inherit (pkgs.lib) mkOption mkIf;
-  xcfg = config.services.xserver;
-  cfg = xcfg.desktopManager.kde;
-  xorg = xcfg.package;
-
-  options = { services = { xserver = { desktopManager = {
-
-    kde = {
-      enable = mkOption {
-        default = false;
-        example = true;
-        description = "Enable the kde desktop manager.";
-      };
-    };
-
-  }; }; }; };
-in
-
-mkIf (xcfg.enable && cfg.enable) {
-  require = [
-    options
-
-    # environment.kdePackages
-    ./kde-environment.nix
-  ];
-
-  services = {
-    xserver = {
-
-      desktopManager = {
-        session = [{
-          name = "kde";
-          start = ''
-            # A quick hack to make KDE screen locking work.  It calls
-            # kcheckpass, which needs to be setuid in order to read the
-            # shadow password file.  We have a setuid wrapper around
-            # kcheckpass.  However, startkde adds $kdebase/bin to the start
-            # of $PATH if it's not already in $PATH, thus overriding the
-            # setuid wrapper directory.  So here we add $kdebase/bin to the
-            # end of $PATH to keep startkde from doing that.
-            export PATH=$PATH:${pkgs.kdebase}/bin
-            
-            # Start KDE.
-            exec ${pkgs.kdebase}/bin/startkde
-          '';
-        }];
-      };
-
-    };
-  };
-
-  security.setuidPrograms = [ "kcheckpass" ];
-
-  environment = {
-    kdePackages = [
-      pkgs.kdelibs
-      pkgs.kdebase
-    ];
-
-    x11Packages = [
-      xorg.xset # used by startkde, non-essential
-    ];
-
-    etc = [
-      { source = "${pkgs.xkeyboard_config}/etc/X11/xkb";
-        target = "X11/xkb";
-      }
-    ];
-  };
-}
diff --git a/modules/services/x11/desktop-managers/kde4.nix b/modules/services/x11/desktop-managers/kde4.nix
index 7fd978b64cd..5f47fa638f0 100644
--- a/modules/services/x11/desktop-managers/kde4.nix
+++ b/modules/services/x11/desktop-managers/kde4.nix
@@ -11,10 +11,6 @@ let
 in
 
 {
-
-  imports = [ ./kde-environment.nix ];
-
-    
   options = {
 
     services.xserver.desktopManager.kde4.enable = mkOption {
@@ -23,6 +19,14 @@ in
       description = "Enable the KDE 4 desktop environment.";
     };
 
+    environment.kdePackages = mkOption {
+      default = [];
+      example = [ pkgs.kde4.digikam ];
+      type = types.list types.package;
+      description = "Additional KDE 4 programs. Only minimal set is installed by
+        default.";
+    };
+
   };
 
   
@@ -46,28 +50,31 @@ in
 
     security.setuidPrograms = [ "kcheckpass" ];
 
-    environment.kdePackages =
-      [ pkgs.kde4.kdelibs
+    environment = {
+      kdePackages = [
+        pkgs.kde4.kdelibs
         pkgs.kde4.kdebase
         pkgs.kde4.kdebase_runtime
         pkgs.kde4.kdebase_workspace
+        pkgs.kde4.oxygen_icons
+        pkgs.kde4.qt4 # needed for qdbus
         pkgs.shared_mime_info
         pkgs.gst_all.gstreamer
         pkgs.gst_all.gstPluginsBase
         pkgs.gst_all.gstPluginsGood
-      ] ++ optional (pkgs.kde4 ? oxygen_icons) pkgs.kde4.oxygen_icons;
-
-    environment.x11Packages =
-      [ xorg.xmessage # so that startkde can show error messages
-        pkgs.kde4.qt4 # needed for qdbus
+        xorg.xmessage # so that startkde can show error messages
         xorg.xset # used by startkde, non-essential
       ];
 
-    environment.etc = singleton
+      x11Packages = config.environment.kdePackages;
+
+      pathsToLink = [ "/etc/xdg" "/etc/dbus-1" "/share" ];
+
+      etc = singleton
       { source = "${pkgs.xkeyboard_config}/etc/X11/xkb";
         target = "X11/xkb";
       };
-
+    };
   };
 
 }
-- 
GitLab


From 3f0a341c45806d944682db7ec869d2469d6dd1cf Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 27 May 2010 10:04:31 +0000
Subject: [PATCH 2370/5331] * Enable the Bittorrent test.

svn path=/nixos/trunk/; revision=21997
---
 release.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/release.nix b/release.nix
index 6f9adbc3843..10f9362ec87 100644
--- a/release.nix
+++ b/release.nix
@@ -148,6 +148,7 @@ let
           system = "i686-linux";
         };
       in {
+        bittorrent = t.bittorrent.test;
         firefox = t.firefox.test;
         installer.lvm = t.installer.lvm.test;
         installer.separateBoot = t.installer.separateBoot.test;
@@ -155,7 +156,7 @@ let
         installer.swraid = t.installer.swraid.test;
         kde4 = t.kde4.test;
         login = t.login.test;
-	openssh = t.openssh.test;
+        openssh = t.openssh.test;
         proxy = t.proxy.test;
         quake3 = t.quake3.test;
         subversion = t.subversion.report;
-- 
GitLab


From 894435ce5e783badca4e63d36860337b16bedeb4 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 27 May 2010 10:05:17 +0000
Subject: [PATCH 2371/5331] * Slight cleanup.

svn path=/nixos/trunk/; revision=21998
---
 tests/openssh.nix | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/tests/openssh.nix b/tests/openssh.nix
index c6875bcc73c..ca96e6ccfc9 100644
--- a/tests/openssh.nix
+++ b/tests/openssh.nix
@@ -2,31 +2,29 @@
 
 {
   nodes = {
+  
     server = 
       {pkgs, config, ...}:
       
       {
         services.openssh.enable = true;
-      }
-    ;
+      };
+      
     client = 
       {pkgs, config, ...}:
       
       {
-      }      
-    ;
+      };
   };
   
   testScript =
   ''
     my $key=`${pkgs.openssh}/bin/ssh-keygen -t dsa -f key -N ""`;
     
-    $server->mustSucceed("mkdir /root/.ssh");
-    $server->mustSucceed("chmod 700 /root/.ssh");
+    $server->mustSucceed("mkdir -m 700 /root/.ssh");
     $server->copyFileFromHost("key.pub", "/root/.ssh/authorized_keys");
     
-    $client->mustSucceed("mkdir /root/.ssh");
-    $client->mustSucceed("chmod 700 /root/.ssh");
+    $client->mustSucceed("mkdir -m 700 /root/.ssh");
     $client->copyFileFromHost("key", "/root/.ssh/id_dsa");
     $client->mustSucceed("chmod 600 /root/.ssh/id_dsa");
     
-- 
GitLab


From 77a4004df109c5d7a82386fd6080f055a9eba966 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 27 May 2010 12:20:37 +0000
Subject: [PATCH 2372/5331] * The installer test lost the QEMU flags to set up
 the NIC to talk to   the web server somewhere, so put them back in  
 (http://hydra.nixos.org/build/424923).

svn path=/nixos/trunk/; revision=22003
---
 lib/qemu-flags.nix         | 15 +++++++++++++++
 lib/test-driver/Machine.pm |  1 +
 tests/installer.nix        |  3 ++-
 3 files changed, 18 insertions(+), 1 deletion(-)
 create mode 100644 lib/qemu-flags.nix

diff --git a/lib/qemu-flags.nix b/lib/qemu-flags.nix
new file mode 100644
index 00000000000..05edc1d2cc6
--- /dev/null
+++ b/lib/qemu-flags.nix
@@ -0,0 +1,15 @@
+# QEMU flags shared between various Nix expressions.
+
+{
+
+  qemuNICFlags = nic: net:
+    "-net nic,vlan=${toString nic},model=virtio " +
+    # Use 232.0.1.<vlan> as the multicast address to connect VMs on
+    # the same vlan, but allow it to be overriden using the
+    # $QEMU_MCAST_ADDR_<vlan> environment variable.  The test driver
+    # sets this variable to prevent collisions between parallel
+    # builds.
+    "-net socket,vlan=${toString nic},mcast=" +
+    "\${QEMU_MCAST_ADDR_${toString net}:-232.0.1.${toString net}:1234} ";
+    
+}
diff --git a/lib/test-driver/Machine.pm b/lib/test-driver/Machine.pm
index ed43d8d255a..5ff7bf6cea1 100644
--- a/lib/test-driver/Machine.pm
+++ b/lib/test-driver/Machine.pm
@@ -34,6 +34,7 @@ sub new {
             if defined $args->{hda};
         $startCommand .= "-cdrom $args->{cdrom} "
             if defined $args->{cdrom};
+        $startCommand .= $args->{qemuFlags} || "";
     }
 
     my $name = $args->{name};
diff --git a/tests/installer.nix b/tests/installer.nix
index 26423cd9d06..883138f1760 100644
--- a/tests/installer.nix
+++ b/tests/installer.nix
@@ -1,6 +1,7 @@
 { pkgs, nixpkgs, system, ... }:
 
 with pkgs.lib;
+with import ../lib/qemu-flags.nix;
 
 let
 
@@ -104,7 +105,7 @@ let
     ''
       createDisk("harddisk", 4 * 1024);
 
-      my $machine = Machine->new({ hda => "harddisk", cdrom => glob("${iso}/iso/*.iso") });
+      my $machine = Machine->new({ hda => "harddisk", cdrom => glob("${iso}/iso/*.iso"), qemuFlags => '${qemuNICFlags 1 1}' });
       $machine->start;
 
       ${optionalString testChannel ''
-- 
GitLab


From 62675aa0cf1e98eb8caa66175f67378a0caf18b5 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 27 May 2010 13:43:16 +0000
Subject: [PATCH 2373/5331] * Doh, forgot to commit.

svn path=/nixos/trunk/; revision=22005
---
 lib/build-vms.nix | 17 ++++-------------
 1 file changed, 4 insertions(+), 13 deletions(-)

diff --git a/lib/build-vms.nix b/lib/build-vms.nix
index a32e1448939..d52aefdf6b0 100644
--- a/lib/build-vms.nix
+++ b/lib/build-vms.nix
@@ -3,6 +3,7 @@
 let pkgs = import nixpkgs { config = {}; inherit system; }; in
 
 with pkgs;
+with import ../lib/qemu-flags.nix;
 
 rec {
 
@@ -106,18 +107,8 @@ rec {
                          "${config.networking.hostName}\n"));
                   
                   virtualisation.qemu.options =
-                    lib.flip lib.concatMapStrings interfacesNumbered ({ first, second }:
-                      "-net nic,vlan=${toString second},model=virtio " +
-                      # Use 232.0.1.<vlan> as the multicast address to
-                      # connect VMs on the same vlan, but allow it to
-                      # be overriden using the $QEMU_MCAST_ADDR_<vlan>
-                      # environment variable.  The test driver sets
-                      # this variable to prevent collisions between
-                      # parallel builds.
-                      "-net socket,vlan=${toString second},mcast=" +
-                      "\${QEMU_MCAST_ADDR_${toString first}:-232.0.1.${toString first}:1234} "
-                    );
-
+                    lib.flip lib.concatMapStrings interfacesNumbered
+                      ({ first, second }: qemuNICFlags second first );
                 };
             }
           )
@@ -126,7 +117,7 @@ rec {
 
     in lib.listToAttrs nodes_;
 
-    
+
   # Zip two lists together.  Should be moved to pkgs.lib.
   zip = xs: ys:
     if xs != [] && ys != [] then
-- 
GitLab


From f70798352d176c573ee3d91ca01008b474e6cd80 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 28 May 2010 06:27:31 +0000
Subject: [PATCH 2374/5331] * Don't include an empty `nix-path-registration' on
 the CD.

svn path=/nixos/trunk/; revision=22030
---
 lib/make-iso9660-image.sh | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/lib/make-iso9660-image.sh b/lib/make-iso9660-image.sh
index 3305b8856e2..01b0fafa112 100644
--- a/lib/make-iso9660-image.sh
+++ b/lib/make-iso9660-image.sh
@@ -54,8 +54,10 @@ done
 
 # Also include a manifest of the closures in a format suitable for
 # nix-store --load-db.
-printRegistration=1 perl $pathsFromGraph closure-* > nix-path-registration
-echo "nix-path-registration=nix-path-registration" >> pathlist
+if [ -n "$object"; ]; then
+    printRegistration=1 perl $pathsFromGraph closure-* > nix-path-registration
+    echo "nix-path-registration=nix-path-registration" >> pathlist
+fi
 
 
 # Add symlinks to the top-level store objects.
-- 
GitLab


From f9f224972a15bc1f9c2a298013ddf06bb3246eda Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 28 May 2010 07:09:34 +0000
Subject: [PATCH 2375/5331] * Use AUFS2.

svn path=/nixos/trunk/; revision=22033
---
 modules/installer/cd-dvd/iso-image.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/installer/cd-dvd/iso-image.nix b/modules/installer/cd-dvd/iso-image.nix
index f84233e923a..bcee17bfdba 100644
--- a/modules/installer/cd-dvd/iso-image.nix
+++ b/modules/installer/cd-dvd/iso-image.nix
@@ -126,7 +126,7 @@ in
   boot.extraModulePackages =
     optional 
       (! config.boot.kernelPackages.kernel.features ? aufs) 
-      config.boot.kernelPackages.aufs;
+      config.boot.kernelPackages.aufs2;
       
   boot.initrd.availableKernelModules = [ "aufs" "squashfs" "iso9660" ];
 
-- 
GitLab


From 046af078bbc9f72bc996243c65b02d054c6b1133 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 28 May 2010 07:10:17 +0000
Subject: [PATCH 2376/5331] * We don't need Linux 2.6.27 anymore in the tests
 to get a writable   Nix store.  AUFS2 on 2.6.32 seems to work.

svn path=/nixos/trunk/; revision=22034
---
 tests/installer.nix | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/tests/installer.nix b/tests/installer.nix
index 883138f1760..a15b5587511 100644
--- a/tests/installer.nix
+++ b/tests/installer.nix
@@ -76,11 +76,9 @@ let
           dir = "/tmp/channel";
         };
 
-      # Make the Nix store in this VM writable using AUFS.  Use Linux
-      # 2.6.27 because 2.6.32 doesn't work (probably we need AUFS2).
-      # This should probably be moved to qemu-vm.nix.
-      boot.kernelPackages = pkgs.linuxPackages_2_6_27;
-      boot.extraModulePackages = [ config.boot.kernelPackages.aufs ];
+      # Make the Nix store in this VM writable using AUFS.  This
+      # should probably be moved to qemu-vm.nix.
+      boot.extraModulePackages = [ config.boot.kernelPackages.aufs2 ];
       boot.initrd.availableKernelModules = [ "aufs" ];
 
       boot.initrd.postMountCommands =
-- 
GitLab


From ca1910e4b015684e4581e139b6b05f389b3ab0dc Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 28 May 2010 09:35:24 +0000
Subject: [PATCH 2377/5331] * Seems that we don't need the aufs2 mount helper.

svn path=/nixos/trunk/; revision=22038
---
 modules/installer/cd-dvd/iso-image.nix | 11 -----------
 1 file changed, 11 deletions(-)

diff --git a/modules/installer/cd-dvd/iso-image.nix b/modules/installer/cd-dvd/iso-image.nix
index bcee17bfdba..e5f438ab5ab 100644
--- a/modules/installer/cd-dvd/iso-image.nix
+++ b/modules/installer/cd-dvd/iso-image.nix
@@ -148,17 +148,6 @@ in
       mount -t aufs -o dirs=/mnt-store-tmpfs=rw:/mnt-root/nix/store=ro none /mnt-root-union/nix/store
     '';
 
-  # AUFS 2 support (currently unused).
-  /*
-  boot.initrd.extraUtilsCommands =
-    ''
-      cp ${config.boot.kernelPackages.aufs2Utils}/sbin/mount.aufs $out/bin
-      cp ${config.boot.kernelPackages.aufs2Utils}/sbin/umount.aufs $out/bin
-      mkdir -p $out/var/run/current-system/sw
-      ln -s /bin "$out/var/run/current-system/sw/sbin"
-    '';
-  */
-
   # Closures to be copied to the Nix store on the CD, namely the init
   # script and the top-level system configuration directory.
   isoImage.storeContents =
-- 
GitLab


From eade772338e5b32b4adff316f50b05cbe1232afc Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 28 May 2010 11:21:40 +0000
Subject: [PATCH 2378/5331] * Don't show the contents of linuxPackages in the
 manual.

svn path=/nixos/trunk/; revision=22044
---
 modules/system/boot/kernel.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/modules/system/boot/kernel.nix b/modules/system/boot/kernel.nix
index 99941c63a70..742ce3f223d 100644
--- a/modules/system/boot/kernel.nix
+++ b/modules/system/boot/kernel.nix
@@ -12,6 +12,9 @@ let kernel = config.boot.kernelPackages.kernel; in
   
     boot.kernelPackages = mkOption {
       default = pkgs.linuxPackages;
+      # We don't want to evaluate all of linuxPackages for the manual
+      # - some of it might not even evaluate correctly.
+      defaultText = "pkgs.linuxPackages";
       example = "pkgs.linuxPackages_2_6_25";
       description = ''
         This option allows you to override the Linux kernel used by
-- 
GitLab


From 7d9644f725d3af23a3c4302d2eebf115c2a7f942 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 28 May 2010 11:24:41 +0000
Subject: [PATCH 2379/5331] svn path=/nixos/trunk/; revision=22045

---
 modules/config/system-path.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/modules/config/system-path.nix b/modules/config/system-path.nix
index 036d77b1e8d..4a22aabc946 100644
--- a/modules/config/system-path.nix
+++ b/modules/config/system-path.nix
@@ -8,6 +8,7 @@ with pkgs.lib;
 let
 
   cfg = config.environment;
+  
   requiredPackages =
     [ config.system.sbin.modprobe # must take precedence over module_init_tools
       config.system.sbin.mount # must take precedence over util-linux
@@ -64,7 +65,7 @@ let
 
       systemPackages = mkOption {
         default = [];
-        example = [pkgs.icecat3 pkgs.thunderbird];
+        example = "[ pkgs.icecat3 pkgs.thunderbird ]";
         description = ''
           The set of packages that appear in
           /var/run/current-system/sw.  These packages are
-- 
GitLab


From 39ea835dbc8b3af356e51cd674c66b4de5f0fffa Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 28 May 2010 11:48:41 +0000
Subject: [PATCH 2380/5331] * Add a license, finally :-)

svn path=/nixos/trunk/; revision=22046
---
 COPYING | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)
 create mode 100644 COPYING

diff --git a/COPYING b/COPYING
new file mode 100644
index 00000000000..c9b44cb8aae
--- /dev/null
+++ b/COPYING
@@ -0,0 +1,18 @@
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-- 
GitLab


From 540c673364ecef13bd0b810d8d7b0dde901bbf78 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 28 May 2010 14:59:34 +0000
Subject: [PATCH 2381/5331] * Enable the `chfn' program.  Note that by default
 non-root users are   still not permitted to change their account information,
 as   specified in login.defs.

svn path=/nixos/trunk/; revision=22049
---
 modules/programs/pwdutils/login.defs | 4 ++++
 modules/security/pam.nix             | 1 +
 modules/security/setuid-wrappers.nix | 2 +-
 3 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/modules/programs/pwdutils/login.defs b/modules/programs/pwdutils/login.defs
index a310ca5af5a..98610a88ca8 100644
--- a/modules/programs/pwdutils/login.defs
+++ b/modules/programs/pwdutils/login.defs
@@ -12,3 +12,7 @@ GID_MAX                 29999
 
 TTYGROUP  tty
 TTYPERM   0620
+
+# Uncomment this to allow non-root users to change their account
+#information.  This should be made configurable.
+#CHFN_RESTRICT frwh
diff --git a/modules/security/pam.nix b/modules/security/pam.nix
index fd1aae65ac9..0ee7595a5e1 100644
--- a/modules/security/pam.nix
+++ b/modules/security/pam.nix
@@ -204,6 +204,7 @@ in
         { name = "sshd"; }
         { name = "xlock"; }
         { name = "chsh"; rootOK = true; }
+        { name = "chfn"; rootOK = true; }
         { name = "su"; rootOK = true; forwardXAuth = true; }
         # Note: useradd, groupadd etc. aren't setuid root, so it
         # doesn't really matter what the PAM config says as long as it
diff --git a/modules/security/setuid-wrappers.nix b/modules/security/setuid-wrappers.nix
index 510c99b2f58..aa85ee20dc9 100644
--- a/modules/security/setuid-wrappers.nix
+++ b/modules/security/setuid-wrappers.nix
@@ -74,7 +74,7 @@ in
   config = {
 
     security.setuidPrograms =
-      [ "passwd" "su" "crontab" "ping" "ping6"
+      [ "passwd" "chfn" "su" "crontab" "ping" "ping6"
         "fusermount" "wodim" "cdrdao" "growisofs"
       ];
 
-- 
GitLab


From eb4c33eecabf30b9e5dd298e396d3046daa60001 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sun, 30 May 2010 22:00:52 +0000
Subject: [PATCH 2382/5331] * Added an option to enable support for 32-bit
 binaries (such as Wine   or Google Earth) on 64-bit NixOS on NVIDIA hardware.
  The 32-bit   OpenGL library is symlinked from /var/run/opengl-driver-32,
 which is   added to the LD_LIBRARY_PATH so that 32-bit binaries can find it.

svn path=/nixos/trunk/; revision=22062
---
 lib/eval-config.nix              |  1 +
 modules/programs/bash/bashrc.sh  |  2 +-
 modules/services/x11/xserver.nix | 27 +++++++++++++++++++--------
 3 files changed, 21 insertions(+), 9 deletions(-)

diff --git a/lib/eval-config.nix b/lib/eval-config.nix
index 49057f2d6da..8a7b225e850 100644
--- a/lib/eval-config.nix
+++ b/lib/eval-config.nix
@@ -33,6 +33,7 @@ rec {
     inherit pkgs modules baseModules;
     modulesPath = ../modules;
     servicesPath = services;
+    pkgs_i686 = import nixpkgs { system = "i686-linux"; };
   };
 
   # Import Nixpkgs, allowing the NixOS option nixpkgs.config to
diff --git a/modules/programs/bash/bashrc.sh b/modules/programs/bash/bashrc.sh
index c4046870746..e43b716a0ce 100644
--- a/modules/programs/bash/bashrc.sh
+++ b/modules/programs/bash/bashrc.sh
@@ -3,7 +3,7 @@ if [ -n "$NOSYSBASHRC" ]; then
 fi
 
 # Initialise a bunch of environment variables.
-export LD_LIBRARY_PATH=/var/run/opengl-driver/lib
+export LD_LIBRARY_PATH=/var/run/opengl-driver/lib:/var/run/opengl-driver-32/lib # !!! only set if needed
 export MODULE_DIR=@modulesTree@/lib/modules
 export NIXPKGS_CONFIG=/nix/etc/config.nix
 export NIXPKGS_ALL=/etc/nixos/nixpkgs
diff --git a/modules/services/x11/xserver.nix b/modules/services/x11/xserver.nix
index 34eefd3023d..a5a4c908bef 100644
--- a/modules/services/x11/xserver.nix
+++ b/modules/services/x11/xserver.nix
@@ -1,4 +1,4 @@
-{ config, pkgs, ... }:
+{ config, pkgs, pkgs_i686, ... }:
 
 with pkgs.lib;
 
@@ -199,6 +199,15 @@ in
         '';
       };
 
+      driSupport32Bit = mkOption {
+        default = false;
+        description = ''
+          On 64-bit systems, whether to support Direct Rendering for
+          32-bit applications (such as Wine).  This is currently only
+          supported for the <literal>nvidia</literal> driver.
+        '';
+      };
+
       startOpenSSHAgent = mkOption {
         default = true;
         description = ''
@@ -420,16 +429,18 @@ in
           ''
             rm -f /var/run/opengl-driver
             ${# !!! The OpenGL driver depends on what's detected at runtime.
-              if elem "nvidia" driverNames then ''
-                ln -sf ${kernelPackages.nvidia_x11} /var/run/opengl-driver
-              ''
-        else if elem "nvidiaLegacy" driverNames then ''
-                ln -sf ${kernelPackages.nvidia_x11_legacy} /var/run/opengl-driver
-              ''
+              if elem "nvidia" driverNames then
+                ''
+                  ln -sf ${kernelPackages.nvidia_x11} /var/run/opengl-driver
+                  ${optionalString (pkgs.stdenv.system == "x86_64-linux" && cfg.driSupport32Bit)
+                    "ln -sf ${pkgs_i686.linuxPackages.nvidia_x11.override { libsOnly = true; kernel = null; } } /var/run/opengl-driver-32"}
+                ''
+              else if elem "nvidiaLegacy" driverNames then
+                "ln -sf ${kernelPackages.nvidia_x11_legacy} /var/run/opengl-driver"
               else if cfg.driSupport then
                 "ln -sf ${pkgs.mesa} /var/run/opengl-driver"
               else ""
-             }
+            }
 
             ${cfg.displayManager.job.preStart}
 
-- 
GitLab


From dc49a0ce3f79587e61ea2017be37fca21bf3c0d8 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 1 Jun 2010 15:53:24 +0000
Subject: [PATCH 2383/5331] * Don't use klibc in the initrd.  It's simpler (and
 slightly smaller)   to use the standard (coreutils) tools. * Use util-linux's
 `switch_root' to switch over to the target root   FS.  It automatically moves
 over the /dev, /proc and /sys from stage   1, so stage 2 doesn't need to set
 them up again.

svn path=/nixos/trunk/; revision=22085
---
 modules/services/hardware/udev.nix  |  4 ++--
 modules/system/boot/stage-1-init.sh | 27 +++++++++++----------------
 modules/system/boot/stage-1.nix     | 10 ++++++----
 modules/system/boot/stage-2-init.sh | 20 ++++----------------
 modules/system/boot/stage-2.nix     |  2 +-
 modules/virtualisation/qemu-vm.nix  | 13 ++++++++-----
 6 files changed, 32 insertions(+), 44 deletions(-)

diff --git a/modules/services/hardware/udev.nix b/modules/services/hardware/udev.nix
index c8b35785ceb..d5955f88fbd 100644
--- a/modules/services/hardware/udev.nix
+++ b/modules/services/hardware/udev.nix
@@ -170,7 +170,7 @@ in
           ''
             echo "" > /proc/sys/kernel/hotplug
 
-            mkdir -pv /var/lib/udev/rules.d
+            mkdir -p /var/lib/udev/rules.d
 
             # Do the loading of additional stage 2 kernel modules.
             # Maybe this isn't the best place...
@@ -179,7 +179,7 @@ in
                 ${modprobe}/sbin/modprobe $i || true
             done
 
-            mkdir -pv /dev/.udev # !!! bug in udev?
+            mkdir -p /dev/.udev # !!! bug in udev?
           '';
 
         daemonType = "fork";
diff --git a/modules/system/boot/stage-1-init.sh b/modules/system/boot/stage-1-init.sh
index 32121ca1169..c6a09d1e9a3 100644
--- a/modules/system/boot/stage-1-init.sh
+++ b/modules/system/boot/stage-1-init.sh
@@ -3,7 +3,7 @@
 targetRoot=/mnt-root
 
 export LD_LIBRARY_PATH=@extraUtils@/lib
-export PATH=@extraUtils@/bin:@klibc@/bin
+export PATH=@extraUtils@/bin
 
 
 fail() {
@@ -53,6 +53,7 @@ mkdir -p /proc
 mount -t proc none /proc
 mkdir -p /sys
 mount -t sysfs none /sys
+mount -t tmpfs -o "mode=0755,size=@devSize@" none /dev
 
 
 # Process the kernel command line.
@@ -144,7 +145,7 @@ checkFS() {
     # Only check block devices.
     if ! test -b "$device"; then return 0; fi
 
-    eval $(fstype "$device")
+    FSTYPE=$(blkid -o value -s TYPE "$device" || true)
 
     # Don't check ROM filesystems.
     if test "$FSTYPE" = iso9660 -o "$FSTYPE" = udf; then return 0; fi
@@ -276,33 +277,27 @@ done
 
 
 # Stop udevd.
-kill $(minips -C udevd -o pid=) 2> /dev/null
+kill -- -1
 
 
 if test -n "$debug1mounts"; then fail; fi
 
 
-# `run-init' needs a /dev/console on the target FS.
-if ! test -e $targetRoot/dev/console; then
-    mkdir -p $targetRoot/dev
-    mknod $targetRoot/dev/console c 5 1
-fi
-
-
 # Restore /proc/sys/kernel/modprobe to its original value.
 echo /sbin/modprobe > /proc/sys/kernel/modprobe
 
 
-# Start stage 2.  `run-init' deletes all files in the ramfs on the
-# current /.  Note that $stage2Init might be an absolute symlink, in
-# which case "-e" won't work because we're not in the chroot yet.
+# Start stage 2.  `switch_root' deletes all files in the ramfs on the
+# current root.  It also moves the /proc, /sys and /dev mounts over to
+# the new root.  Note that $stage2Init might be an absolute symlink,
+# in which case "-e" won't work because we're not in the chroot yet.
 if ! test -e "$targetRoot/$stage2Init" -o -L "$targetRoot/$stage2Init"; then
     echo "stage 2 init script not found"
     fail
 fi
 
-umount /sys
-umount /proc
-exec run-init "$targetRoot" "$stage2Init"
+mkdir -m 0755 -p $targetRoot/proc $targetRoot/sys $targetRoot/dev
+
+exec switch_root "$targetRoot" "$stage2Init"
 
 fail # should never be reached
diff --git a/modules/system/boot/stage-1.nix b/modules/system/boot/stage-1.nix
index 013872aa2a7..c822c848b30 100644
--- a/modules/system/boot/stage-1.nix
+++ b/modules/system/boot/stage-1.nix
@@ -114,13 +114,17 @@ let
 
       # Copy some utillinux stuff.
       cp -v ${pkgs.utillinux}/bin/mount ${pkgs.utillinux}/bin/umount \
-         ${pkgs.utillinux}/sbin/fsck ${pkgs.utillinux}/sbin/pivot_root \
+         ${pkgs.utillinux}/sbin/fsck ${pkgs.utillinux}/sbin/switch_root \
          ${pkgs.utillinux}/sbin/blkid $out/bin
       cp -pdv ${pkgs.utillinux}/lib/libblkid*.so.* $out/lib
       cp -pdv ${pkgs.utillinux}/lib/libuuid*.so.* $out/lib
 
       # Copy some coreutils.
       cp -v ${pkgs.coreutils}/bin/basename $out/bin
+      cp -v ${pkgs.coreutils}/bin/mkdir $out/bin
+      cp -v ${pkgs.coreutils}/bin/mknod $out/bin
+      cp -v ${pkgs.coreutils}/bin/cat $out/bin
+      cp -v ${pkgs.coreutils}/bin/chroot $out/bin
 
       # Copy e2fsck and friends.      
       cp -v ${pkgs.e2fsprogs}/sbin/e2fsck $out/bin
@@ -256,11 +260,9 @@ let
 
     isExecutable = true;
 
-    klibc = pkgs.klibcShrunk;
-
     inherit udevConf extraUtils;
 
-    inherit (config.boot) resumeDevice;
+    inherit (config.boot) resumeDevice devSize;
 
     inherit (config.boot.initrd) checkJournalingFS
       postDeviceCommands postMountCommands kernelModules;
diff --git a/modules/system/boot/stage-2-init.sh b/modules/system/boot/stage-2-init.sh
index 6035f43d3ad..609bf0a95a4 100644
--- a/modules/system/boot/stage-2-init.sh
+++ b/modules/system/boot/stage-2-init.sh
@@ -36,13 +36,12 @@ setPath "@path@"
 mount -n -o remount,rw none /
 
 
-# Mount special file systems.
+# Mount special file systems.  Note that /dev, /proc and /sys are
+# already mounted by `switch_root' in the initrd.
 mkdir -m 0755 -p /etc
 test -e /etc/fstab || touch /etc/fstab # to shut up mount
 test -s /etc/mtab && rm /etc/mtab # while installing a symlink is created (see man mount), if it's still there for whateever reason remove it
 rm -f /etc/mtab* # not that we care about stale locks
-mkdir -m 0755 -p /proc
-mount -n -t proc none /proc
 
 rm -f /etc/mtab
 cat /proc/mounts > /etc/mtab
@@ -79,15 +78,11 @@ done
 
 
 # More special file systems, initialise required directories.
-mkdir -m 0755 -p /sys 
-mount -t sysfs none /sys
-mkdir -m 0755 -p /dev
-mount -t tmpfs -o "mode=0755,size=@devSize@" none /dev
 mkdir -m 0777 /dev/shm
 mount -t tmpfs -o "rw,nosuid,nodev,size=@devShmSize@" tmpfs /dev/shm
 mkdir -m 0755 -p /dev/pts
 mount -t devpts -o mode=0600,gid=@ttyGid@ none /dev/pts 
-[ -e /proc/bus/usb ] && mount -t usbfs none /proc/bus/usb # uml doesn't have usb by default
+[ -e /proc/bus/usb ] && mount -t usbfs none /proc/bus/usb # UML doesn't have USB by default
 mkdir -m 01777 -p /tmp 
 mkdir -m 0755 -p /var
 mkdir -m 0755 -p /nix/var
@@ -113,22 +108,15 @@ rm -rf /var/lock
 rm -rf /nix/var/nix/chroots # recreated in activate-configuration.sh
 
 
-# Create the minimal device nodes needed for the activation scripts
-# and Upstart.
-mknod -m 0666 /dev/null c 1 3
-mknod -m 0644 /dev/urandom c 1 9 # needed for passwd
-mknod -m 0644 /dev/console c 5 1
-
-
 # Clear the resume device.
 if test -n "$resumeDevice"; then
     mkswap "$resumeDevice" || echo 'Failed to clear saved image.'
 fi
 
-echo "running activation script..."
 
 # Run the script that performs all configuration activation that does
 # not have to be done at boot time.
+echo "running activation script..."
 @activateConfiguration@ "$systemConfig"
 
 
diff --git a/modules/system/boot/stage-2.nix b/modules/system/boot/stage-2.nix
index fc510dcbaea..279f454c5db 100644
--- a/modules/system/boot/stage-2.nix
+++ b/modules/system/boot/stage-2.nix
@@ -44,7 +44,7 @@ let
     src = ./stage-2-init.sh;
     isExecutable = true;
     inherit kernel activateConfiguration;
-    inherit (config.boot) devSize devShmSize;
+    inherit (config.boot) devShmSize;
     ttyGid = config.ids.gids.tty;
     upstart = config.system.build.upstart;
     path =
diff --git a/modules/virtualisation/qemu-vm.nix b/modules/virtualisation/qemu-vm.nix
index 7763b5ac9dc..6e4e372c1bf 100644
--- a/modules/virtualisation/qemu-vm.nix
+++ b/modules/virtualisation/qemu-vm.nix
@@ -160,17 +160,20 @@ in
     ''
       # We need mke2fs in the initrd.
       cp ${pkgs.e2fsprogs}/sbin/mke2fs $out/bin
+
+      # And `ifconfig'.
+      cp ${pkgs.nettools}/sbin/ifconfig $out/bin
     '';
       
   boot.initrd.postDeviceCommands =
     ''
       # Set up networking.  Needed for CIFS mounting.
-      ipconfig 10.0.2.15:::::eth0:none
+      ifconfig eth0 up 10.0.2.15
 
-      # If the disk image appears to be empty (fstype "unknown";
-      # hacky!!!), run mke2fs to initialise.
-      eval $(fstype /dev/vda)
-      if test "$FSTYPE" = unknown; then
+      # If the disk image appears to be empty, run mke2fs to
+      # initialise.
+      FSTYPE=$(blkid -o value -s TYPE /dev/vda || true)
+      if test -z "$FSTYPE"; then
           mke2fs -t ext3 /dev/vda
       fi
     '';
-- 
GitLab


From 9c900ee15c3e6315965a94f6e8406568ba4c517c Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 1 Jun 2010 16:38:42 +0000
Subject: [PATCH 2384/5331] * Updates for the dynamically linked splash helper.

svn path=/nixos/trunk/; revision=22087
---
 modules/system/boot/stage-1.nix | 42 +++++++++++++++++----------------
 1 file changed, 22 insertions(+), 20 deletions(-)

diff --git a/modules/system/boot/stage-1.nix b/modules/system/boot/stage-1.nix
index c822c848b30..22ae196a0f2 100644
--- a/modules/system/boot/stage-1.nix
+++ b/modules/system/boot/stage-1.nix
@@ -5,9 +5,9 @@
 
 { config, pkgs, ... }:
 
-let
+with pkgs.lib;
 
-  inherit (pkgs.lib) mkOption types;
+let
 
   options = {
 
@@ -37,7 +37,7 @@ let
 
     boot.initrd.postDeviceCommands = mkOption {
       default = "";
-      merge = pkgs.lib.mergeStringOption;
+      merge = mergeStringOption;
       description = ''
         Shell commands to be executed immediately after stage 1 of the
         boot has loaded kernel modules and created device nodes in
@@ -47,7 +47,7 @@ let
 
     boot.initrd.postMountCommands = mkOption {
       default = "";
-      merge = pkgs.lib.mergeStringOption;
+      merge = mergeStringOption;
       description = ''
         Shell commands to be executed immediately after the stage 1
         filesystems have been mounted.
@@ -57,7 +57,7 @@ let
     boot.initrd.extraUtilsCommands = mkOption {
       internal = true;
       default = "";
-      merge = pkgs.lib.mergeStringOption;
+      merge = mergeStringOption;
       description = ''
         Shell commands to be executed in the builder of the
         extra-utils derivation.  This can be used to provide
@@ -90,6 +90,10 @@ let
   };
 
 
+  enableSplashScreen =
+    config.boot.initrd.enableSplashScreen && kernelPackages.splashutils != null;
+
+
   # Some additional utilities needed in stage 1, like mount, lvm, fsck
   # etc.  We don't want to bring in all of those packages, so we just
   # copy what we need.  Instead of using statically linked binaries,
@@ -157,6 +161,11 @@ let
       # Copy modprobe.
       cp -v ${pkgs.module_init_tools}/sbin/modprobe $out/bin/modprobe.real
 
+      # Maybe copy splashutils.
+      ${optionalString enableSplashScreen ''
+        cp ${kernelPackages.splashutils}/${kernelPackages.splashutils.helperName} $out/bin/splash_helper
+      ''}
+
       ${config.boot.initrd.extraUtilsCommands}
 
       # Run patchelf to make the programs refer to the copied libraries.
@@ -203,7 +212,7 @@ let
   # The initrd only has to mount / or any FS marked as necessary for
   # booting (such as the FS containing /nix/store, or an FS needed for
   # mounting /, like / on a loopback).
-  fileSystems = pkgs.lib.filter
+  fileSystems = filter
     (fs: fs.mountPoint == "/" || fs.neededForBoot)
     config.fileSystems;
 
@@ -281,22 +290,15 @@ let
   # The closure of the init script of boot stage 1 is what we put in
   # the initial RAM disk.
   initialRamdisk = pkgs.makeInitrd {
-    contents = [
-      { object = bootStage1;
-        symlink = "/init";
-      }
-    ] ++
-      pkgs.lib.optionals
-        (config.boot.initrd.enableSplashScreen && kernelPackages.splashutils != null)
-        [
-          { object = pkgs.runCommand "splashutils" {allowedReferences = []; buildInputs = [pkgs.nukeReferences];} ''
-              ensureDir $out/bin
-              cp ${kernelPackages.splashutils}/${kernelPackages.splashutils.helperName} $out/bin/splash_helper
-              nuke-refs $out/bin/*
-            '';
+    contents =
+      [ { object = bootStage1;
+          symlink = "/init";
+        }
+      ] ++ optionals enableSplashScreen
+        [ { object = extraUtils;
             suffix = "/bin/splash_helper";
             symlink = "/${kernelPackages.splashutils.helperName}";
-          } # */
+          }
           { object = import ../../../lib/unpack-theme.nix {
               inherit (pkgs) stdenv;
               theme = config.services.ttyBackgrounds.defaultTheme;
-- 
GitLab


From 18fd0a61de2e5d3dbfbab285cc2b84015c5bdf7e Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 1 Jun 2010 17:09:34 +0000
Subject: [PATCH 2385/5331] * Add `sleep' to the initrd.

svn path=/nixos/trunk/; revision=22089
---
 modules/system/boot/stage-1.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/modules/system/boot/stage-1.nix b/modules/system/boot/stage-1.nix
index 22ae196a0f2..ab94c157874 100644
--- a/modules/system/boot/stage-1.nix
+++ b/modules/system/boot/stage-1.nix
@@ -129,6 +129,7 @@ let
       cp -v ${pkgs.coreutils}/bin/mknod $out/bin
       cp -v ${pkgs.coreutils}/bin/cat $out/bin
       cp -v ${pkgs.coreutils}/bin/chroot $out/bin
+      cp -v ${pkgs.coreutils}/bin/sleep $out/bin
 
       # Copy e2fsck and friends.      
       cp -v ${pkgs.e2fsprogs}/sbin/e2fsck $out/bin
-- 
GitLab


From e450e4551f98acaa4e5e9a282c57dd68ef17daf2 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 1 Jun 2010 18:30:17 +0000
Subject: [PATCH 2386/5331] * tty-backgrounds: don't do a setcfg action on the
 console if the   current theme is the same.  This prevents the console from
 being   blanked during boot.

svn path=/nixos/trunk/; revision=22092
---
 modules/tasks/tty-backgrounds-combine.sh | 25 ++++++++++--------------
 modules/tasks/tty-backgrounds.nix        | 16 ++++++++-------
 2 files changed, 19 insertions(+), 22 deletions(-)

diff --git a/modules/tasks/tty-backgrounds-combine.sh b/modules/tasks/tty-backgrounds-combine.sh
index 66113864f7b..d7ac3c31c6b 100644
--- a/modules/tasks/tty-backgrounds-combine.sh
+++ b/modules/tasks/tty-backgrounds-combine.sh
@@ -5,27 +5,23 @@ themes=($themes)
 
 ensureDir $out
 
-default=
+defaultName=$(cd $default && ls | grep -v default)
+echo $defaultName
+ln -s $default/default $out/default
+ln -s $defaultName $out/$defaultName
 
 for ((n = 0; n < ${#ttys[*]}; n++)); do
     tty=${ttys[$n]}
     theme=${themes[$n]}
 
-    if test "$theme" = "default"; then
-        if test -z "$default"; then
-            echo "No default theme!"
-            exit 1
-        fi
-        theme=$default
-    fi
-        
-    if test -z "$default"; then default=$theme; fi
-
     echo "TTY $tty -> $theme"
 
-    themeName=$(cd $theme && ls | grep -v default)
-
-    ln -sfn $theme/$themeName $out/$themeName
+    if [ "$theme" != default ]; then
+        themeName=$(cd $theme && ls | grep -v default)
+        ln -sfn $theme/$themeName $out/$themeName
+    else
+        themeName=default
+    fi
 
     if test -e $out/$tty; then
         echo "Multiple themes defined for the same TTY!"
@@ -33,5 +29,4 @@ for ((n = 0; n < ${#ttys[*]}; n++)); do
     fi
 
     ln -sfn $themeName $out/$tty
-    
 done
diff --git a/modules/tasks/tty-backgrounds.nix b/modules/tasks/tty-backgrounds.nix
index 5f557ac7f5c..8ba46e1b6b3 100644
--- a/modules/tasks/tty-backgrounds.nix
+++ b/modules/tasks/tty-backgrounds.nix
@@ -24,18 +24,15 @@ let
         filter (x: !(elem x overridenTTYs)) requiredTTYs;
 
     in      
-      (map (tty: {
-        inherit tty;
-        theme = config.services.ttyBackgrounds.defaultTheme;
-      }) defaultTTYs)
-      ++ specificThemes;
+      (map (tty: { inherit tty; }) defaultTTYs) ++ specificThemes;
 
   themesUnpacked = stdenv.mkDerivation {
     name = "splash-themes";
     builder = ./tty-backgrounds-combine.sh;
+    default = unpackTheme config.services.ttyBackgrounds.defaultTheme;
     # !!! Should use XML here.
     ttys = map (x: x.tty) backgrounds;
-    themes = map (x: if x ? theme then (unpackTheme x.theme) else "default") backgrounds;
+    themes = map (x: if x ? theme then unpackTheme x.theme else "default") backgrounds;
   };
 
   unpackTheme = theme: import ../../lib/unpack-theme.nix {
@@ -124,7 +121,12 @@ in
                 # above.  Note that splashutils needs a TTY number
                 # instead of a device name, hence the ''${tty:3}.
                 theme=$(readlink ${themesUnpacked}/$tty)
-                ${splashutils}/${splashutils.controlName} --tty ''${tty:3} -c setcfg -t $theme || true
+                prevTheme=$(${splashutils}/${splashutils.controlName} --tty ''${tty:3} -c getcfg |
+                    sed 's/theme: *\(.*\)/\1/;t;d' || true)
+                echo $tty $theme $prevTheme
+                if [ "$theme" != "$prevTheme" ]; then
+                    ${splashutils}/${splashutils.controlName} --tty ''${tty:3} -c setcfg -t $theme || true
+                fi
                 ${splashutils}/${splashutils.controlName} --tty ''${tty:3} -c setpic -t $theme || true
                 ${splashutils}/${splashutils.controlName} --tty ''${tty:3} -c on || true
             done
-- 
GitLab


From 95a9c5dd771e709f6e1fefc681ad4eb6a3bd593a Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 1 Jun 2010 19:44:23 +0000
Subject: [PATCH 2387/5331] * Log the standard output/error of Upstart jobs to 
  /var/log/upstart/<jobname> rather than spamming the console with it.

svn path=/nixos/trunk/; revision=22093
---
 modules/services/scheduling/atd.nix             |  2 +-
 modules/services/x11/display-managers/auto.nix  |  2 +-
 modules/services/x11/display-managers/kdm.nix   |  8 ++++----
 modules/services/x11/display-managers/slim.nix  |  2 +-
 modules/system/activation/activation-script.nix |  1 +
 modules/system/boot/stage-2-init.sh             |  1 +
 modules/system/upstart/upstart.nix              | 10 +++++++---
 modules/tasks/tty-backgrounds.nix               |  1 -
 8 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/modules/services/scheduling/atd.nix b/modules/services/scheduling/atd.nix
index 19fda42928a..9538a332f7c 100644
--- a/modules/services/scheduling/atd.nix
+++ b/modules/services/scheduling/atd.nix
@@ -66,7 +66,7 @@ in
     jobs.atd =
       { description = "at daemon (atd)";
 
-        startOn = "startup";
+        startOn = "started udev";
 
         preStart =
           ''
diff --git a/modules/services/x11/display-managers/auto.nix b/modules/services/x11/display-managers/auto.nix
index 8805fbfd383..507d24cd3ce 100644
--- a/modules/services/x11/display-managers/auto.nix
+++ b/modules/services/x11/display-managers/auto.nix
@@ -44,7 +44,7 @@ in
     services.xserver.displayManager.job =
       { execCmd =
           ''
-            ${pkgs.xorg.xinit}/bin/xinit \
+            exec ${pkgs.xorg.xinit}/bin/xinit \
               ${pkgs.su}/bin/su -c ${dmcfg.session.script} ${cfg.user} \
               -- ${dmcfg.xserverBin} ${dmcfg.xserverArgs}
           '';
diff --git a/modules/services/x11/display-managers/kdm.nix b/modules/services/x11/display-managers/kdm.nix
index 438846d3043..15553ba386b 100644
--- a/modules/services/x11/display-managers/kdm.nix
+++ b/modules/services/x11/display-managers/kdm.nix
@@ -71,9 +71,9 @@ in
 
       enableXDMCP = mkOption {
         default = false;
-  description = ''
-    Whether to enable XDMCP, which allows remote logins.
-  '';
+        description = ''
+          Whether to enable XDMCP, which allows remote logins.
+        '';
       };
 
       extraConfig = mkOption {
@@ -94,7 +94,7 @@ in
   config = mkIf cfg.enable {
   
     services.xserver.displayManager.job =
-      { execCmd = "PATH=${pkgs.grub}/sbin:$PATH ${kdebase_workspace}/bin/kdm -config ${kdmrc}";
+      { execCmd = "PATH=${pkgs.grub}/sbin:$PATH exec ${kdebase_workspace}/bin/kdm -config ${kdmrc} -nodaemon";
         logsXsession = true;
       };
 
diff --git a/modules/services/x11/display-managers/slim.nix b/modules/services/x11/display-managers/slim.nix
index ad767e199a1..cdb4dc785e2 100644
--- a/modules/services/x11/display-managers/slim.nix
+++ b/modules/services/x11/display-managers/slim.nix
@@ -101,7 +101,7 @@ in
           { SLIM_CFGFILE = slimConfig;
             SLIM_THEMESDIR = slimThemesDir;
           };
-        execCmd = "${pkgs.slim}/bin/slim";
+        execCmd = "exec ${pkgs.slim}/bin/slim";
       };
 
     # Allow null passwords so that the user can login as root on the
diff --git a/modules/system/activation/activation-script.nix b/modules/system/activation/activation-script.nix
index 744a35f54f4..9a3a73e66d9 100644
--- a/modules/system/activation/activation-script.nix
+++ b/modules/system/activation/activation-script.nix
@@ -96,6 +96,7 @@ let
       fi
 
       mkdir -m 0755 -p /var/log
+      mkdir -m 0755 -p /var/log/upstart
 
       touch /var/log/wtmp # must exist
       chmod 644 /var/log/wtmp
diff --git a/modules/system/boot/stage-2-init.sh b/modules/system/boot/stage-2-init.sh
index 609bf0a95a4..de9b136d02a 100644
--- a/modules/system/boot/stage-2-init.sh
+++ b/modules/system/boot/stage-2-init.sh
@@ -95,6 +95,7 @@ mkdir -m 0755 -p /etc/nixos
 # Miscellaneous boot time cleanup.
 rm -rf /var/run
 rm -rf /var/lock
+rm -rf /var/log/upstart
 
 #echo -n "cleaning \`/tmp'..."
 #rm -rf --one-file-system /tmp/*
diff --git a/modules/system/upstart/upstart.nix b/modules/system/upstart/upstart.nix
index 74095d093ca..e0c0f0bb99f 100644
--- a/modules/system/upstart/upstart.nix
+++ b/modules/system/upstart/upstart.nix
@@ -23,13 +23,12 @@ let
     let
 
       jobText =
+        let log = "/var/log/upstart/${job.name}"; in
         ''
           # Upstart job `${job.name}'.  This is a generated file.  Do not edit.
         
           description "${job.description}"
 
-          console output
-
           ${if isList job.startOn then
               "start on ${concatStringsSep " or " job.startOn}"
             else if job.startOn != "" then
@@ -44,6 +43,7 @@ let
           
           ${optionalString (job.preStart != "") ''
             pre-start script
+              exec >> ${log} 2>&1
               ${job.preStart}
             end script
           ''}
@@ -53,18 +53,20 @@ let
             else if job.script != "" then
               ''
                 script
+                  exec >> ${log} 2>&1
                   ${job.script}
                 end script
               ''
             else if job.exec != "" then
               ''
-                exec ${job.exec}
+                exec ${job.exec} >> ${log} 2>&1
               ''
             else ""
           }
 
           ${optionalString (job.postStart != "") ''
             post-start script
+              exec >> ${log} 2>&1
               ${job.postStart}
             end script
           ''}
@@ -74,12 +76,14 @@ let
 
           ${optionalString (job.preStop != "") ''
             pre-stop script
+              exec >> ${log} 2>&1
               ${job.preStop}
             end script
           ''}
 
           ${optionalString (job.postStop != "") ''
             post-stop script
+              exec >> ${log} 2>&1
               ${job.postStop}
             end script
           ''}
diff --git a/modules/tasks/tty-backgrounds.nix b/modules/tasks/tty-backgrounds.nix
index 8ba46e1b6b3..b273dc8e599 100644
--- a/modules/tasks/tty-backgrounds.nix
+++ b/modules/tasks/tty-backgrounds.nix
@@ -123,7 +123,6 @@ in
                 theme=$(readlink ${themesUnpacked}/$tty)
                 prevTheme=$(${splashutils}/${splashutils.controlName} --tty ''${tty:3} -c getcfg |
                     sed 's/theme: *\(.*\)/\1/;t;d' || true)
-                echo $tty $theme $prevTheme
                 if [ "$theme" != "$prevTheme" ]; then
                     ${splashutils}/${splashutils.controlName} --tty ''${tty:3} -c setcfg -t $theme || true
                 fi
-- 
GitLab


From 94b226819226d2d00e430330852b6c1767ec18db Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 1 Jun 2010 20:41:59 +0000
Subject: [PATCH 2388/5331] * Start "exec" jobs using the "script" stanza to
 allow redirects in   the job's "exec" to work properly.

svn path=/nixos/trunk/; revision=22094
---
 modules/system/upstart/upstart.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/modules/system/upstart/upstart.nix b/modules/system/upstart/upstart.nix
index e0c0f0bb99f..b3a6c0b1c9e 100644
--- a/modules/system/upstart/upstart.nix
+++ b/modules/system/upstart/upstart.nix
@@ -59,7 +59,10 @@ let
               ''
             else if job.exec != "" then
               ''
-                exec ${job.exec} >> ${log} 2>&1
+                script
+                  exec >> ${log} 2>&1
+                  exec ${job.exec}
+                end script
               ''
             else ""
           }
-- 
GitLab


From b135e38bea4c41866e7286c21c28fd52a45e989a Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 1 Jun 2010 20:42:33 +0000
Subject: [PATCH 2389/5331] * atd's postStop action should be unnecessary.

svn path=/nixos/trunk/; revision=22095
---
 modules/services/scheduling/atd.nix | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/modules/services/scheduling/atd.nix b/modules/services/scheduling/atd.nix
index 9538a332f7c..be27e4b3bc6 100644
--- a/modules/services/scheduling/atd.nix
+++ b/modules/services/scheduling/atd.nix
@@ -101,11 +101,6 @@ in
         daemonType = "fork";
 
         exec = "${at}/sbin/atd";
-
-        postStop =
-          ''
-            test -e /var/run/atd.pid && kill $(cat /var/run/atd.pid)
-          '';
       };
 
   };
-- 
GitLab


From ad93acc29552aa254dac6aa02695c470e316104b Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 2 Jun 2010 16:04:08 +0000
Subject: [PATCH 2390/5331] * Make all Upstart jobs shut down on the `starting
 shutdown' event.   This ensures that they're gone by the time the shutdown
 job runs, so   it doesn't have to stop them itself. * Don't respawn tasks, as
 it doesn't seem useful (if they fail they're   likely to fail again if
 they're restarted).

svn path=/nixos/trunk/; revision=22099
---
 modules/system/upstart-events/runlevel.nix |  6 +++---
 modules/system/upstart-events/shutdown.nix | 25 +++++++++-------------
 modules/system/upstart/upstart.nix         |  4 ++--
 3 files changed, 15 insertions(+), 20 deletions(-)

diff --git a/modules/system/upstart-events/runlevel.nix b/modules/system/upstart-events/runlevel.nix
index 750d9a07f50..96864594509 100644
--- a/modules/system/upstart-events/runlevel.nix
+++ b/modules/system/upstart-events/runlevel.nix
@@ -14,9 +14,9 @@ with pkgs.lib;
       script =
         ''
           case "$RUNLEVEL" in
-              0) initctl start shutdown MODE=poweroff;;
-              1) initctl start shutdown MODE=maintenance;;
-              6) initctl start shutdown MODE=reboot;;
+              0) initctl start shutdown --no-wait MODE=poweroff;;
+              1) initctl start shutdown --no-wait MODE=maintenance;;
+              6) initctl start shutdown --no-wait MODE=reboot;;
               *) echo "Unsupported runlevel: $RUNLEVEL";;
           esac
         '';
diff --git a/modules/system/upstart-events/shutdown.nix b/modules/system/upstart-events/shutdown.nix
index ff208a80b5a..66d5a7b588b 100644
--- a/modules/system/upstart-events/shutdown.nix
+++ b/modules/system/upstart-events/shutdown.nix
@@ -9,8 +9,12 @@ with pkgs.lib;
 
       task = true;
 
+      stopOn = ""; # must override the default ("starting shutdown")
+
       environment = { MODE = "poweroff"; };
 
+      extraConfig = "console owner";
+
       script =
         ''
           set +e # continue in case of errors
@@ -29,24 +33,10 @@ with pkgs.lib;
           export PATH=${pkgs.utillinux}/bin:${pkgs.utillinux}/sbin:$PATH
       
 
-          # Set the hardware clock to the system time.
-          echo "setting the hardware clock..."
-          hwclock --systohc --utc
-      
-      
           # Do an initial sync just in case.
           sync
 
 
-          # Stop all Upstart jobs.
-          initctl list | while IFS=", " read jobName status rest; do
-              if test "$jobName" != shutdown -a "$status" != "stop/waiting"; then
-                  echo "stopping $jobName..."
-                  stop "$jobName"
-              fi
-          done
-      
-      
           # Kill all remaining processes except init and this one.
           echo "sending the TERM signal to all processes..."
           kill -TERM -1
@@ -64,12 +54,17 @@ with pkgs.lib;
               echo ""
               echo "<<< Maintenance shell >>>"
               echo ""
-              while ! ${pkgs.bash}/bin/bash --login; do true; done
+              ${pkgs.pam_login}/bin/login root
               initctl emit -n startup
               exit 0
           fi
                 
       
+          # Set the hardware clock to the system time.
+          echo "setting the hardware clock..."
+          hwclock --systohc --utc
+      
+      
           # Unmount helper functions.
           getMountPoints() {
               cat /proc/mounts \
diff --git a/modules/system/upstart/upstart.nix b/modules/system/upstart/upstart.nix
index b3a6c0b1c9e..3110f376eec 100644
--- a/modules/system/upstart/upstart.nix
+++ b/modules/system/upstart/upstart.nix
@@ -75,7 +75,7 @@ let
           ''}
           
           ${optionalString job.task "task"}
-          ${optionalString job.respawn "respawn"}
+          ${optionalString (!job.task && job.respawn) "respawn"}
 
           ${optionalString (job.preStop != "") ''
             pre-stop script
@@ -153,7 +153,7 @@ let
 
     stopOn = mkOption {
       type = types.string;
-      default = "shutdown";
+      default = "starting shutdown";
       description = ''
         The Upstart event that triggers this job to be stopped.
       '';
-- 
GitLab


From 8519e72ccc5b1055418be470d0a24b14acdb52d8 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 2 Jun 2010 16:04:30 +0000
Subject: [PATCH 2391/5331] * Don't stop tty-backgrounds during shutdown.

svn path=/nixos/trunk/; revision=22100
---
 modules/tasks/tty-backgrounds.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/modules/tasks/tty-backgrounds.nix b/modules/tasks/tty-backgrounds.nix
index b273dc8e599..8d079edc934 100644
--- a/modules/tasks/tty-backgrounds.nix
+++ b/modules/tasks/tty-backgrounds.nix
@@ -104,6 +104,10 @@ in
 
         startOn = "started udev";
 
+        # Don't stop tty-backgrounds during shutdown; it's not needed,
+        # and it just causes intrusive blanking of the screen.
+        stopOn = "";
+
         preStart =
           ''
             # Critical: tell the kernel where to find splash_helper.  It calls
-- 
GitLab


From d317d83ba8e548eb32f83fe6ae974604b632e904 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 2 Jun 2010 16:05:09 +0000
Subject: [PATCH 2392/5331] * Remove `stopOn = "shutdown"' which doesn't work.

svn path=/nixos/trunk/; revision=22101
---
 modules/programs/blcr.nix             | 3 +--
 modules/services/monitoring/monit.nix | 3 ++-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/modules/programs/blcr.nix b/modules/programs/blcr.nix
index b2b7aee4ab6..b6407ee603b 100644
--- a/modules/programs/blcr.nix
+++ b/modules/programs/blcr.nix
@@ -22,7 +22,7 @@ in
     environment.blcr.enable = mkOption {
       default = false;
       description =
-        "Wheter to enable support for the BLCR checkpoingint tool.";
+        "Wheter to enable support for the BLCR checkpointing tool.";
     };
 
     environment.blcr.autorun = mkOption {
@@ -44,7 +44,6 @@ in
 	task        = true;
 
         startOn = if cfg.autorun then "started udev" else null;
-        stopOn  = "shutdown";
 
 	preStart = ''
           ${insmod} ${blcr_imports_ko}
diff --git a/modules/services/monitoring/monit.nix b/modules/services/monitoring/monit.nix
index c723e1cd837..35f483411b2 100644
--- a/modules/services/monitoring/monit.nix
+++ b/modules/services/monitoring/monit.nix
@@ -27,6 +27,7 @@ in
   };
   
   config = mkIf config.services.monit.enable {
+  
     environment.etc = [
       {
         source = pkgs.writeTextFile {
@@ -37,11 +38,11 @@ in
         mode = "0400";
       }
     ];
+    
     jobs.monit = {
       description = "Monit system watcher";
       
       startOn = config.services.monit.startOn;
-      stopOn = "shutdown";
 
       exec = "${pkgs.monit}/bin/monit -I -c /etc/monit.conf";
 
-- 
GitLab


From d67e6e62850d782746af8ba2a1c36f969cd7ee14 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 2 Jun 2010 16:19:48 +0000
Subject: [PATCH 2393/5331] * Remove some `stopOn = "ip-down"' declarations
 since they probably   don't do the right thing (e.g. they don't distinguish
 between   network interfaces).

svn path=/nixos/trunk/; revision=22102
---
 modules/services/misc/gpsd.nix               | 1 -
 modules/services/networking/avahi-daemon.nix | 1 -
 modules/services/networking/bitlbee.nix      | 1 -
 modules/services/networking/ntpd.nix         | 1 -
 modules/services/networking/portmap.nix      | 1 -
 5 files changed, 5 deletions(-)

diff --git a/modules/services/misc/gpsd.nix b/modules/services/misc/gpsd.nix
index ea9347aba7d..0d12bbc29f3 100644
--- a/modules/services/misc/gpsd.nix
+++ b/modules/services/misc/gpsd.nix
@@ -89,7 +89,6 @@ in
       { description = "GPSD daemon";
 
         startOn = "ip-up";
-        stopOn = "ip-down";
 
         exec =
           ''
diff --git a/modules/services/networking/avahi-daemon.nix b/modules/services/networking/avahi-daemon.nix
index b0e332cba09..369b6d4f0fc 100644
--- a/modules/services/networking/avahi-daemon.nix
+++ b/modules/services/networking/avahi-daemon.nix
@@ -119,7 +119,6 @@ in
       { name = "avahi-daemon";
 
         startOn = "ip-up";
-        stopOn = "ip-down";
 
         script =
           ''
diff --git a/modules/services/networking/bitlbee.nix b/modules/services/networking/bitlbee.nix
index d9b7475f61e..573feda5462 100644
--- a/modules/services/networking/bitlbee.nix
+++ b/modules/services/networking/bitlbee.nix
@@ -68,7 +68,6 @@ in
       { description = "BitlBee IRC to other chat networks gateway";
 
         startOn = "ip-up";
-        stopOn = "ip-down";
 
         preStart =
           ''
diff --git a/modules/services/networking/ntpd.nix b/modules/services/networking/ntpd.nix
index eaf5b5532ac..a50229125d1 100644
--- a/modules/services/networking/ntpd.nix
+++ b/modules/services/networking/ntpd.nix
@@ -74,7 +74,6 @@ in
       { description = "NTP daemon";
 
         startOn = "ip-up";
-        stopOn = "ip-down";
 
         preStart =
           ''
diff --git a/modules/services/networking/portmap.nix b/modules/services/networking/portmap.nix
index 2004c2c825a..62d1c459f10 100644
--- a/modules/services/networking/portmap.nix
+++ b/modules/services/networking/portmap.nix
@@ -67,7 +67,6 @@ in
       { description = "ONC RPC portmap";
 
         startOn = "ip-up";
-        stopOn = "ip-down";
 
         exec =
           ''
-- 
GitLab


From 8b308272dfc52c6465895ea104407bb32f10efd2 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 2 Jun 2010 17:11:20 +0000
Subject: [PATCH 2394/5331] * We don't use pam_console anymore.

svn path=/nixos/trunk/; revision=22104
---
 modules/system/activation/activation-script.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/modules/system/activation/activation-script.nix b/modules/system/activation/activation-script.nix
index 9a3a73e66d9..19548f208d9 100644
--- a/modules/system/activation/activation-script.nix
+++ b/modules/system/activation/activation-script.nix
@@ -76,7 +76,6 @@ let
     var = fullDepEntry ''
       # Various log/runtime directories.
       mkdir -m 0755 -p /var/run
-      mkdir -m 0755 -p /var/run/console # for pam_console
 
       touch /var/run/utmp # must exist
       chgrp ${toString config.ids.gids.utmp} /var/run/utmp
-- 
GitLab


From 876954d15d541716a95da690d1e9332e818ca613 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 2 Jun 2010 19:59:44 +0000
Subject: [PATCH 2395/5331] * Use pam_unix (from the PAM package) instead of
 pam_unix2.  All the   functionality we needed from pam_unix2 (more secure
 hashes, and,   uh...) has been merged into pam_unix.

svn path=/nixos/trunk/; revision=22106
---
 modules/security/pam.nix | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/modules/security/pam.nix b/modules/security/pam.nix
index 0ee7595a5e1..f92c0e106db 100644
--- a/modules/security/pam.nix
+++ b/modules/security/pam.nix
@@ -7,7 +7,7 @@ with pkgs.lib;
 
 let
 
-  inherit (pkgs) pam_unix2 pam_usb pam_ldap;
+  inherit (pkgs) pam_usb pam_ldap;
 
   otherService = pkgs.writeText "other.pam"
     ''
@@ -47,7 +47,7 @@ let
       # set (i.e., have an empty password field in /etc/passwd or
       # /etc/group).  This does not enable logging into disabled
       # accounts (i.e., that have the password field set to `!').
-      # Note that regardless of what the pam_unix2 documentation says,
+      # Note that regardless of what the pam_unix documentation says,
       # accounts with hashed empty passwords are always allowed to log
       # in.
       allowNullPassword ? false
@@ -63,7 +63,7 @@ let
           # Account management.
           ${optionalString config.users.ldap.enable
               "account optional ${pam_ldap}/lib/security/pam_ldap.so"}
-          account required ${pam_unix2}/lib/security/pam_unix2.so
+          account required pam_unix.so
 
           # Authentication management.
           ${optionalString rootOK
@@ -72,21 +72,21 @@ let
               "auth sufficient ${pam_usb}/lib/security/pam_usb.so"}
           ${optionalString config.users.ldap.enable
               "auth sufficient ${pam_ldap}/lib/security/pam_ldap.so"}
-          auth sufficient ${pam_unix2}/lib/security/pam_unix2.so ${
+          auth sufficient pam_unix.so ${
             optionalString allowNullPassword "nullok"}
           auth required   pam_deny.so
 
           # Password management.
           ${optionalString config.users.ldap.enable
               "password sufficient ${pam_ldap}/lib/security/pam_ldap.so"}
-          password requisite ${pam_unix2}/lib/security/pam_unix2.so nullok
+          password requisite pam_unix.so nullok sha512
           ${optionalString config.services.samba.syncPasswordsByPam
               "password optional ${pkgs.samba}/lib/security/pam_smbpass.so nullok use_authtok try_first_pass"}
 
           # Session management.
           ${optionalString config.users.ldap.enable
               "session optional ${pam_ldap}/lib/security/pam_ldap.so"}
-          session required ${pam_unix2}/lib/security/pam_unix2.so
+          session required pam_unix.so
           ${optionalString ownDevices
               "session optional ${pkgs.consolekit}/lib/security/pam_ck_connector.so"}
           ${optionalString forwardXAuth
@@ -183,7 +183,7 @@ in
   
     environment.systemPackages =
       # Include the PAM modules in the system path mostly for the manpages.
-      [ pkgs.pam pam_unix2 ]
+      [ pkgs.pam ]
       ++ optional config.users.ldap.enable pam_ldap;
 
     environment.etc =
-- 
GitLab


From c089738bdcff78a3bf75911665301f7a93a73ba9 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 2 Jun 2010 21:10:48 +0000
Subject: [PATCH 2396/5331] * Use the `shadow' package instead of `pwdutils',
 `pam_login' and   `su'. * The `usermod' from `shadow' allows setting a
 supplementary group   equal to the user's primary group, so the special hack
 for the   `nixbld' group is no longer needed. * Removed /etc/default/passwd
 since it's not used by the new passwd.   The hash is configured in pam_unix.
 * Move some values for `security.setuidPrograms' and  
 `security.pam.services' to the appropriate modules.

svn path=/nixos/trunk/; revision=22107
---
 modules/config/system-path.nix                |  2 -
 modules/config/users-groups.nix               | 25 ++----
 modules/programs/pwdutils/login.defs          |  8 +-
 modules/programs/pwdutils/passwd.conf         | 15 ----
 modules/programs/pwdutils/pwdutils.nix        | 88 ++++++++++++-------
 modules/security/pam.nix                      | 13 ---
 modules/security/setuid-wrappers.nix          |  4 +-
 modules/services/misc/nix-daemon.nix          |  4 +-
 modules/services/ttys/mingetty.nix            |  2 +-
 .../system/activation/activation-script.nix   |  2 +-
 modules/system/upstart-events/shutdown.nix    |  2 +-
 modules/tasks/network-interfaces.nix          |  2 +
 12 files changed, 74 insertions(+), 93 deletions(-)
 delete mode 100644 modules/programs/pwdutils/passwd.conf

diff --git a/modules/config/system-path.nix b/modules/config/system-path.nix
index 4a22aabc946..d9074732418 100644
--- a/modules/config/system-path.nix
+++ b/modules/config/system-path.nix
@@ -44,12 +44,10 @@ let
       pkgs.pciutils
       pkgs.perl
       pkgs.procps
-      pkgs.pwdutils
       pkgs.reiserfsprogs
       pkgs.rsync
       pkgs.seccure
       pkgs.strace
-      pkgs.su
       pkgs.sysklogd
       pkgs.sysvtools
       pkgs.time
diff --git a/modules/config/users-groups.nix b/modules/config/users-groups.nix
index cb84117090b..6beb7b311aa 100644
--- a/modules/config/users-groups.nix
+++ b/modules/config/users-groups.nix
@@ -173,16 +173,16 @@ in
 
             if ! curEnt=$(getent passwd "$name"); then
                 useradd --system \
-                    "$name" \
                     --comment "$description" \
                     ''${uid:+--uid $uid} \
                     --gid "$group" \
                     --groups "$extraGroups" \
                     --home "$home" \
                     --shell "$shell" \
-                    ''${createHome:+--create-home}
+                    ''${createHome:+--create-home} \
+                    "$name"
                 if test "''${password:0:1}" = 'X'; then
-                    echo "''${password:1}" | ${pkgs.pwdutils}/bin/passwd --stdin "$name"
+                    echo "''${password:1}" | ${pkgs.shadow}/bin/passwd --stdin "$name"
                 fi
             else
                 #echo "updating user $name..."
@@ -196,22 +196,13 @@ in
                 # unnecessary warnings about logged in users.
                 if test "$prevHome" = "$home"; then unset home; fi
                 usermod \
-                    "$name" \
                     --comment "$description" \
                     ''${uid:+--uid $uid} \
                     --gid "$group" \
                     --groups "$extraGroups" \
                     ''${home:+--home "$home"} \
-                    --shell "$shell"
-            fi
-
-            if test "$group" = nixbld; then
-                # As a special hack, add users that have nixbld as the
-                # primary group to the /etc/group entry for the nixbld
-                # group.  `nix-store' currently expects this in order
-                # to get the UIDs of all the build users by doing a
-                # getprnam("nixbld") call.
-                groupmod "$group" -A "$name"
+                    --shell "$shell" \
+                    "$name"
             fi
 
         done
@@ -227,14 +218,14 @@ in
 
             if ! curEnt=$(getent group "$name"); then
                 groupadd --system \
-                    "$name" \
-                    ''${gid:+--gid $gid}
+                    ''${gid:+--gid $gid} \
+                    "$name"
             else
                 #echo "updating group $name..."
                 oldIFS="$IFS"; IFS=:; set -- $curEnt; IFS="$oldIFS"
                 prevGid=$3
                 if test -n "$gid" -a "$prevGid" != "$gid"; then
-                    groupmod "$name" --gid $gid
+                    groupmod --gid $gid "$name"
                 fi
             fi
         done <<EndOfGroupList
diff --git a/modules/programs/pwdutils/login.defs b/modules/programs/pwdutils/login.defs
index 98610a88ca8..9d789fe7805 100644
--- a/modules/programs/pwdutils/login.defs
+++ b/modules/programs/pwdutils/login.defs
@@ -1,12 +1,12 @@
 DEFAULT_HOME            yes
 
-SYSTEM_UID_MIN            100
-SYSTEM_UID_MAX            499
+SYS_UID_MIN               100
+SYS_UID_MAX               499
 UID_MIN                  1000
 UID_MAX                 29999
 
-SYSTEM_GID_MIN            100
-SYSTEM_GID_MAX            499
+SYS_GID_MIN               100
+SYS_GID_MAX               499
 GID_MIN                  1000
 GID_MAX                 29999
 
diff --git a/modules/programs/pwdutils/passwd.conf b/modules/programs/pwdutils/passwd.conf
deleted file mode 100644
index 3b10fa350b5..00000000000
--- a/modules/programs/pwdutils/passwd.conf
+++ /dev/null
@@ -1,15 +0,0 @@
-# Define default crypt hash
-# CRYPT={des,md5,blowfish}
-CRYPT=des
-
-# for local files, use a more secure hash. We
-# don't need to be portable here:
-CRYPT_FILES=@filesCipher@
-
-# sometimes we need to specify special options for
-# a hash (variable is prepended by the name of the
-# crypt hash).
-BLOWFISH_CRYPT_FILES=10
-
-# For NIS, we should always use DES:
-CRYPT_YP=des
diff --git a/modules/programs/pwdutils/pwdutils.nix b/modules/programs/pwdutils/pwdutils.nix
index a690d7dab3e..cb77a0e4346 100644
--- a/modules/programs/pwdutils/pwdutils.nix
+++ b/modules/programs/pwdutils/pwdutils.nix
@@ -4,6 +4,12 @@
 
 let
 
+in
+
+{
+
+  ###### interface
+  
   options = {
 
     users.defaultUserShell = pkgs.lib.mkOption {
@@ -19,39 +25,53 @@ let
   
   };
 
-in
+  
+  ###### implementation
 
-{
-  require = [options];
-
-  environment.etc =
-    [ { # /etc/login.defs: global configuration for pwdutils.  You
-        # cannot login without it! 
-        source = ./login.defs;
-        target = "login.defs";
-      } 
-
-      { # /etc/default/passwd: configuration for passwd and friends
-        # (e.g., hash algorithm for /etc/passwd).
-        source = pkgs.substituteAll {
-          src = ./passwd.conf;
-          # This depends on pam_unix2 being built with libxcrypt or libc's libcrypt.
-          # Only in the first case it will understand 'blowfish'. And pam_unix2
-          # is not built with libxcrypt at the time of writing (it did not build)
-          filesCipher = if (pkgs.stdenv.system == "armv5tel-linux") then
-            "des" else "blowfish";
-        };
-        target = "default/passwd";
-      }
-
-      { # /etc/default/useradd: configuration for useradd.
-        source = pkgs.writeText "useradd"
-          ''
-            GROUP=100
-            HOME=/home
-            SHELL=${config.users.defaultUserShell}
-          '';
-        target = "default/useradd";
-      }
-    ];
+  config = {
+
+    environment.systemPackages = [ pkgs.shadow ];
+
+    environment.etc =
+      [ { # /etc/login.defs: global configuration for pwdutils.  You
+          # cannot login without it! 
+          source = ./login.defs;
+          target = "login.defs";
+        } 
+
+        { # /etc/default/useradd: configuration for useradd.
+          source = pkgs.writeText "useradd"
+            ''
+              GROUP=100
+              HOME=/home
+              SHELL=${config.users.defaultUserShell}
+            '';
+          target = "default/useradd";
+        }
+      ];
+
+    security.pam.services =
+      [ { name = "chsh"; rootOK = true; }
+        { name = "chfn"; rootOK = true; }
+        { name = "su"; rootOK = true; forwardXAuth = true; }
+        { name = "passwd"; }
+        # Note: useradd, groupadd etc. aren't setuid root, so it
+        # doesn't really matter what the PAM config says as long as it
+        # lets root in.
+        { name = "useradd"; rootOK = true; }
+        { name = "usermod"; rootOK = true; }
+        { name = "userdel"; rootOK = true; }
+        { name = "groupadd"; rootOK = true; }
+        { name = "groupmod"; rootOK = true; } 
+        { name = "groupmems"; rootOK = true; }
+        { name = "groupdel"; rootOK = true; }
+        { name = "login"; ownDevices = true; allowNullPassword = true;
+          limits = config.security.pam.loginLimits;
+        }
+      ];
+      
+    security.setuidPrograms = [ "passwd" "chfn" "su" ];
+    
+  };
+  
 }
diff --git a/modules/security/pam.nix b/modules/security/pam.nix
index f92c0e106db..20868140cfa 100644
--- a/modules/security/pam.nix
+++ b/modules/security/pam.nix
@@ -199,22 +199,9 @@ in
         { name = "ejabberd"; }
         { name = "ftp"; }
         { name = "lshd"; }
-        { name = "passwd"; }
         { name = "samba"; }
         { name = "sshd"; }
         { name = "xlock"; }
-        { name = "chsh"; rootOK = true; }
-        { name = "chfn"; rootOK = true; }
-        { name = "su"; rootOK = true; forwardXAuth = true; }
-        # Note: useradd, groupadd etc. aren't setuid root, so it
-        # doesn't really matter what the PAM config says as long as it
-        # lets root in.
-        { name = "useradd"; rootOK = true; }
-        # Used by groupadd etc.
-        { name = "shadow"; rootOK = true; }
-        { name = "login"; ownDevices = true; allowNullPassword = true;
-          limits = config.security.pam.loginLimits;
-        }
       ];
 
   };
diff --git a/modules/security/setuid-wrappers.nix b/modules/security/setuid-wrappers.nix
index aa85ee20dc9..a7513477353 100644
--- a/modules/security/setuid-wrappers.nix
+++ b/modules/security/setuid-wrappers.nix
@@ -74,9 +74,7 @@ in
   config = {
 
     security.setuidPrograms =
-      [ "passwd" "chfn" "su" "crontab" "ping" "ping6"
-        "fusermount" "wodim" "cdrdao" "growisofs"
-      ];
+      [ "crontab" "fusermount" "wodim" "cdrdao" "growisofs" ];
 
     system.activationScripts.setuid =
       let
diff --git a/modules/services/misc/nix-daemon.nix b/modules/services/misc/nix-daemon.nix
index 214e091886a..a9a0bc70f1e 100644
--- a/modules/services/misc/nix-daemon.nix
+++ b/modules/services/misc/nix-daemon.nix
@@ -12,10 +12,10 @@ let
 
       /* For consistency with the setgid(2), setuid(2), and setgroups(2)
          calls in `libstore/build.cc', don't add any supplementary group
-         here.  */
+         here except "nixbld".  */
       uid = builtins.add config.ids.uids.nixbld nr;
       group = "nixbld";
-      extraGroups = [];
+      extraGroups = [ "nixbld" ];
     };
 
 in
diff --git a/modules/services/ttys/mingetty.nix b/modules/services/ttys/mingetty.nix
index 5f6b1d0f14c..445fdcd78ed 100644
--- a/modules/services/ttys/mingetty.nix
+++ b/modules/services/ttys/mingetty.nix
@@ -57,7 +57,7 @@ with pkgs.lib;
     
       startOn = "started udev";
 
-      exec = "${pkgs.mingetty}/sbin/mingetty --loginprog=${pkgs.pam_login}/bin/login --noclear ${tty}";
+      exec = "${pkgs.mingetty}/sbin/mingetty --loginprog=${pkgs.shadow}/bin/login --noclear ${tty}";
       
     }) config.services.mingetty.ttys);
 
diff --git a/modules/system/activation/activation-script.nix b/modules/system/activation/activation-script.nix
index 19548f208d9..5327740c631 100644
--- a/modules/system/activation/activation-script.nix
+++ b/modules/system/activation/activation-script.nix
@@ -28,7 +28,7 @@ let
       let path = [
         pkgs.coreutils pkgs.gnugrep pkgs.findutils
         pkgs.glibc # needed for getent
-        pkgs.pwdutils
+        pkgs.shadow
         pkgs.nettools # needed for hostname
       ]; in noDepEntry ''
         export PATH=/empty
diff --git a/modules/system/upstart-events/shutdown.nix b/modules/system/upstart-events/shutdown.nix
index 66d5a7b588b..9db5fafa46c 100644
--- a/modules/system/upstart-events/shutdown.nix
+++ b/modules/system/upstart-events/shutdown.nix
@@ -54,7 +54,7 @@ with pkgs.lib;
               echo ""
               echo "<<< Maintenance shell >>>"
               echo ""
-              ${pkgs.pam_login}/bin/login root
+              ${pkgs.shadow}/bin/login root
               initctl emit -n startup
               exit 0
           fi
diff --git a/modules/tasks/network-interfaces.nix b/modules/tasks/network-interfaces.nix
index 836950f42a6..46d608dbb9b 100644
--- a/modules/tasks/network-interfaces.nix
+++ b/modules/tasks/network-interfaces.nix
@@ -142,6 +142,8 @@ in
         pkgs.wirelesstools
         pkgs.rfkill
       ];
+
+    security.setuidPrograms = [ "ping" "ping6" ];
     
     jobs.networkInterfaces = 
       { name = "network-interfaces";
-- 
GitLab


From 0cdce12006b7e25d0ad62e9034c5134c5d3ee0ea Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 2 Jun 2010 21:16:27 +0000
Subject: [PATCH 2397/5331] * Rename the `pwdutils' module to `shadow'.

svn path=/nixos/trunk/; revision=22109
---
 modules/module-list.nix                       |  2 +-
 modules/programs/pwdutils/login.defs          | 18 --------------
 .../{pwdutils/pwdutils.nix => shadow.nix}     | 24 ++++++++++++++++++-
 3 files changed, 24 insertions(+), 20 deletions(-)
 delete mode 100644 modules/programs/pwdutils/login.defs
 rename modules/programs/{pwdutils/pwdutils.nix => shadow.nix} (80%)

diff --git a/modules/module-list.nix b/modules/module-list.nix
index 8c22e92b6ad..8e12fd14129 100644
--- a/modules/module-list.nix
+++ b/modules/module-list.nix
@@ -29,7 +29,7 @@
   ./programs/bash/bash.nix
   ./programs/blcr.nix
   ./programs/info.nix
-  ./programs/pwdutils/pwdutils.nix
+  ./programs/shadow.nix
   ./programs/ssh.nix
   ./programs/ssmtp.nix
   ./rename.nix
diff --git a/modules/programs/pwdutils/login.defs b/modules/programs/pwdutils/login.defs
deleted file mode 100644
index 9d789fe7805..00000000000
--- a/modules/programs/pwdutils/login.defs
+++ /dev/null
@@ -1,18 +0,0 @@
-DEFAULT_HOME            yes
-
-SYS_UID_MIN               100
-SYS_UID_MAX               499
-UID_MIN                  1000
-UID_MAX                 29999
-
-SYS_GID_MIN               100
-SYS_GID_MAX               499
-GID_MIN                  1000
-GID_MAX                 29999
-
-TTYGROUP  tty
-TTYPERM   0620
-
-# Uncomment this to allow non-root users to change their account
-#information.  This should be made configurable.
-#CHFN_RESTRICT frwh
diff --git a/modules/programs/pwdutils/pwdutils.nix b/modules/programs/shadow.nix
similarity index 80%
rename from modules/programs/pwdutils/pwdutils.nix
rename to modules/programs/shadow.nix
index cb77a0e4346..711156918df 100644
--- a/modules/programs/pwdutils/pwdutils.nix
+++ b/modules/programs/shadow.nix
@@ -4,6 +4,28 @@
 
 let
 
+  loginDefs =
+    ''
+      DEFAULT_HOME yes
+
+      SYS_UID_MIN  100
+      SYS_UID_MAX  499
+      UID_MIN      1000
+      UID_MAX      29999
+
+      SYS_GID_MIN  100
+      SYS_GID_MAX  499
+      GID_MIN      1000
+      GID_MAX      29999
+
+      TTYGROUP     tty
+      TTYPERM      0620
+
+      # Uncomment this to allow non-root users to change their account
+      #information.  This should be made configurable.
+      #CHFN_RESTRICT frwh
+    '';
+
 in
 
 {
@@ -35,7 +57,7 @@ in
     environment.etc =
       [ { # /etc/login.defs: global configuration for pwdutils.  You
           # cannot login without it! 
-          source = ./login.defs;
+          source = pkgs.writeText "login.defs" loginDefs;
           target = "login.defs";
         } 
 
-- 
GitLab


From 48255afa61cd8198dd82c0fcfa0e6a67574fac03 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 2 Jun 2010 21:59:19 +0000
Subject: [PATCH 2398/5331] * This passwd doesn't have a --stdin flag.

svn path=/nixos/trunk/; revision=22110
---
 tests/login.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/login.nix b/tests/login.nix
index 78b54760849..c4524612295 100644
--- a/tests/login.nix
+++ b/tests/login.nix
@@ -7,7 +7,7 @@
   testScript =
     ''
       $machine->mustSucceed("useradd -m alice");
-      $machine->mustSucceed("echo foobar | passwd --stdin alice");
+      $machine->mustSucceed("(echo foobar; echo foobar) | passwd alice");
 
       # Log in as alice on a virtual console.      
       $machine->waitForJob("tty1");
-- 
GitLab


From 6676bbe61d23e108bf027b6e1054ce3731e490ca Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 2 Jun 2010 23:02:09 +0000
Subject: [PATCH 2399/5331] svn path=/nixos/trunk/; revision=22111

---
 modules/config/users-groups.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/config/users-groups.nix b/modules/config/users-groups.nix
index 6beb7b311aa..447dc96f818 100644
--- a/modules/config/users-groups.nix
+++ b/modules/config/users-groups.nix
@@ -182,7 +182,7 @@ in
                     ''${createHome:+--create-home} \
                     "$name"
                 if test "''${password:0:1}" = 'X'; then
-                    echo "''${password:1}" | ${pkgs.shadow}/bin/passwd --stdin "$name"
+                    (echo "''${password:1}"; echo "''${password:1}") | ${pkgs.shadow}/bin/passwd "$name"
                 fi
             else
                 #echo "updating user $name..."
-- 
GitLab


From 7f41d2bb864a25432ca49924bd26c34b5a7ac9e3 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 3 Jun 2010 14:32:23 +0000
Subject: [PATCH 2400/5331] svn path=/nixos/trunk/; revision=22126

---
 modules/tasks/filesystems.nix        | 2 +-
 modules/tasks/network-interfaces.nix | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/tasks/filesystems.nix b/modules/tasks/filesystems.nix
index 710cb112572..d42a4449edc 100644
--- a/modules/tasks/filesystems.nix
+++ b/modules/tasks/filesystems.nix
@@ -221,7 +221,7 @@ in
   config = {
 
     # Add the mount helpers to the system path so that `mount' can find them.
-    environment.systemPackages = [pkgs.ntfs3g pkgs.mount_cifs pkgs.nfsUtils];
+    environment.systemPackages = [pkgs.ntfs3g pkgs.cifs_utils pkgs.nfsUtils];
     
     jobs.filesystems =
       { startOn = [ "new-devices" "ip-up" ];
diff --git a/modules/tasks/network-interfaces.nix b/modules/tasks/network-interfaces.nix
index 46d608dbb9b..8495955cecb 100644
--- a/modules/tasks/network-interfaces.nix
+++ b/modules/tasks/network-interfaces.nix
@@ -137,7 +137,7 @@ in
     environment.systemPackages =
       [ pkgs.host
         pkgs.iproute
-        pkgs.iputils
+        pkgs.inetutils
         pkgs.nettools
         pkgs.wirelesstools
         pkgs.rfkill
-- 
GitLab


From de8d0c3e147f1c0a1a9ea708a77b9371ba2ec004 Mon Sep 17 00:00:00 2001
From: Rob Vermaas <rob.vermaas@gmail.com>
Date: Fri, 4 Jun 2010 13:18:19 +0000
Subject: [PATCH 2401/5331] added some debugging

svn path=/nixos/trunk/; revision=22142
---
 lib/testing.nix | 40 +++++++++++++++++++++++++++++++++-------
 1 file changed, 33 insertions(+), 7 deletions(-)

diff --git a/lib/testing.nix b/lib/testing.nix
index 3486dd6fc9e..8b2af1f7ebf 100644
--- a/lib/testing.nix
+++ b/lib/testing.nix
@@ -118,18 +118,44 @@ rec {
       # now only works for derivations that lead to a directory in the store, not a file. 
       buildrunner = writeText "vm-build" ''
         source $1
-        oldout=$out
+        origout=$out
         out=$TMPDIR$out
+
+        echo "--------------------------------"
+        echo "Creating $out"
+        echo "--------------------------------"
         ${coreutils}/bin/mkdir -p $out
-        ${coreutils}/bin/mkdir -p $oldout
-        ${coreutils}/bin/ln -s $out $oldout
 
+        echo "--------------------------------"
+        echo "Linking $origout to $out "
+        echo "--------------------------------"
+        ${coreutils}/bin/ln -s $out $origout
+
+        echo "--------------------------------"
+        echo "Creating $TMPDIR"
+        echo "--------------------------------"
         ${coreutils}/bin/mkdir -p $TMPDIR
-        exec $origBuilder $origArgs 
 
-        ${coreutils}/bin/rm -v $oldout
-        ${coreutils}/bin/cp -Rv $out/* $oldout/
-        out=$oldout 
+        echo "--------------------------------"
+        echo "Running builder"
+        echo "--------------------------------"
+        $origBuilder $origArgs 
+
+        echo "--------------------------------"
+        echo "Removing link $origout"
+        echo "--------------------------------"
+        ${coreutils}/bin/rm -vf $origout
+
+        echo "--------------------------------"
+        echo "Creating $origout"
+        echo "--------------------------------"
+        ${coreutils}/bin/mkdir -p $origout
+
+        echo "--------------------------------"
+        echo "Copying $out/* to $origout/"
+        echo "--------------------------------"
+        ${coreutils}/bin/cp -Rv $out/* $origout/
+        out=$origout 
       '';
 
       testscript = ''
-- 
GitLab


From 531605944271e7762642072840890f23e14f3834 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 4 Jun 2010 14:00:56 +0000
Subject: [PATCH 2402/5331] * Revert an unintended commit.

svn path=/nixos/trunk/; revision=22145
---
 modules/tasks/network-interfaces.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/tasks/network-interfaces.nix b/modules/tasks/network-interfaces.nix
index 8495955cecb..46d608dbb9b 100644
--- a/modules/tasks/network-interfaces.nix
+++ b/modules/tasks/network-interfaces.nix
@@ -137,7 +137,7 @@ in
     environment.systemPackages =
       [ pkgs.host
         pkgs.iproute
-        pkgs.inetutils
+        pkgs.iputils
         pkgs.nettools
         pkgs.wirelesstools
         pkgs.rfkill
-- 
GitLab


From dbadf6e9c20bacb54a8d3df442f4e0069224a111 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 4 Jun 2010 14:22:11 +0000
Subject: [PATCH 2403/5331] =?UTF-8?q?*=20Use=20mountall=20to=20mount=20all?=
 =?UTF-8?q?=20filesystems=20and=20activate=20all=20swap=20devices=20=20=20?=
 =?UTF-8?q?during=20boot.=20=20Mountall=20ensures=20that=20these=20are=20d?=
 =?UTF-8?q?one=20in=20the=20right=20=20=20order.=20=20It's=20informed=20by?=
 =?UTF-8?q?=20udev=20about=20devices=20becoming=20available.=20=20It=20=20?=
 =?UTF-8?q?=20emits=20some=20Upstart=20events=20upon=20reaching=20certain?=
 =?UTF-8?q?=20states,=20in=20=20=20particular=20=E2=80=98local-filesystems?=
 =?UTF-8?q?=E2=80=99=20after=20all=20local=20filesystems=20have=20been=20?=
 =?UTF-8?q?=20=20mounted=20successfully,=20=E2=80=98remote-filesystems?=
 =?UTF-8?q?=E2=80=99=20after=20all=20network=20=20=20filesystems=20have=20?=
 =?UTF-8?q?been=20mounted,=20and=20=E2=80=98filesystem=E2=80=99=20(sic)=20?=
 =?UTF-8?q?when=20all=20=20=20filesystems=20have=20been=20mounted.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

  Currently, if a filesystem fails to mount or doesn't exist, then the
  mingettys won't start and the boot will appear to hang.  This is
  because mountall doesn't emit an event for failing filesystems and
  waits indefinitely for the filesystems to become available.

* The ‘filesystems’ and ‘swap’ Upstart jobs are gone.  (Support for
  encrypted swap devices is temporarily gone.)

* Generate a proper /etc/fstab from the ‘fileSystems’ and
  ‘swapDevices’ options.

svn path=/nixos/branches/boot-order/; revision=22148
---
 modules/services/ttys/mingetty.nix |   2 +-
 modules/tasks/filesystems.nix      | 142 ++++++++---------------------
 modules/tasks/swap.nix             |  75 ++-------------
 3 files changed, 45 insertions(+), 174 deletions(-)

diff --git a/modules/services/ttys/mingetty.nix b/modules/services/ttys/mingetty.nix
index 445fdcd78ed..8299580a8cf 100644
--- a/modules/services/ttys/mingetty.nix
+++ b/modules/services/ttys/mingetty.nix
@@ -55,7 +55,7 @@ with pkgs.lib;
     # Generate a separate job for each tty.  
     jobs = listToAttrs (map (tty: nameValuePair tty {
     
-      startOn = "started udev";
+      startOn = "started udev and local-filesystems";
 
       exec = "${pkgs.mingetty}/sbin/mingetty --loginprog=${pkgs.shadow}/bin/login --noclear ${tty}";
       
diff --git a/modules/tasks/filesystems.nix b/modules/tasks/filesystems.nix
index d42a4449edc..791ecccf4c8 100644
--- a/modules/tasks/filesystems.nix
+++ b/modules/tasks/filesystems.nix
@@ -2,108 +2,6 @@
 
 with pkgs.lib;
 
-let
-
-  fileSystems = config.fileSystems;
-  mount = config.system.sbin.mount;
-
-  task =
-    ''
-      PATH=${pkgs.e2fsprogs}/sbin:${pkgs.utillinuxng}/sbin:$PATH
-
-      newDevices=1
-
-      # If we mount any file system, we repeat this loop, because new
-      # mount opportunities may have become available (such as images
-      # for loopback mounts).
-
-      while test -n "$newDevices"; do
-        newDevices=
-
-        ${flip concatMapStrings fileSystems (fs: ''
-          for dummy in x; do # make `continue' work
-            mountPoint='${fs.mountPoint}'
-            device='${if fs.device != null then fs.device else "/dev/disk/by-label/${fs.label}"}'
-            fsType='${fs.fsType}'
-          
-            # A device is a pseudo-device (i.e. not an actual device
-            # node) if it's not an absolute path (e.g. an NFS server
-            # such as machine:/path), if it starts with // (a CIFS FS),
-            # a known pseudo filesystem (such as tmpfs), or the device
-            # is a directory (e.g. a bind mount).
-            isPseudo=
-            test "''${device:0:1}" != / -o "''${device:0:2}" = // -o "$fsType" = "tmpfs" \
-                -o -d "$device" && isPseudo=1
-
-            if ! test -n "$isPseudo" -o -e "$device"; then
-                echo "skipping $device, doesn't exist (yet)"
-                continue
-            fi
-
-            # !!! quick hack: if the mount point is already mounted, try
-            # a remount to change the options but nothing else.
-            if cat /proc/mounts | grep -F -q " $mountPoint "; then
-                if test "''${device:0:2}" != //; then
-                    echo "remounting $device on $mountPoint"
-                    ${mount}/bin/mount -t "$fsType" \
-                        -o remount,"${fs.options}" \
-                        "$device" "$mountPoint" || true
-                fi
-                continue
-            fi
-
-            # If $device is already mounted somewhere else, unmount it first.
-            # !!! Note: we use /etc/mtab, not /proc/mounts, because mtab
-            # contains more accurate info when using loop devices.
-
-            if test -z "$isPseudo"; then
-
-              device=$(readlink -f "$device")
-
-              prevMountPoint=$(
-                  cat /etc/mtab \
-                  | grep "^$device " \
-                  | sed 's|^[^ ]\+ \+\([^ ]\+\).*|\1|' \
-              )
-
-              if test "$prevMountPoint" = "$mountPoint"; then
-                  echo "remounting $device on $mountPoint"
-                  ${mount}/bin/mount -t "$fsType" \
-                      -o remount,"${fs.options}" \
-                      "$device" "$mountPoint" || true
-                  continue
-              fi
-
-              if test -n "$prevMountPoint"; then
-                  echo "unmount $device from $prevMountPoint"
-                  ${mount}/bin/umount "$prevMountPoint" || true
-              fi
-
-            fi
-
-            echo "mounting $device on $mountPoint"
-
-            # !!! should do something with the result; also prevent repeated fscks.
-            if test -z "$isPseudo"; then
-                fsck -a "$device" || true
-            fi
-
-            ${optionalString fs.autocreate
-              ''
-                mkdir -p "$mountPoint"
-              ''
-            }
-
-            if ${mount}/bin/mount -t "$fsType" -o "${fs.options}" "$device" "$mountPoint"; then
-                newDevices=1
-            fi
-          done
-        '')}
-      done
-    '';
-
-in
-
 {
 
   ###### interface
@@ -221,12 +119,44 @@ in
   config = {
 
     # Add the mount helpers to the system path so that `mount' can find them.
-    environment.systemPackages = [pkgs.ntfs3g pkgs.cifs_utils pkgs.nfsUtils];
+    environment.systemPackages = [ pkgs.ntfs3g pkgs.cifs_utils pkgs.nfsUtils pkgs.mountall ];
     
-    jobs.filesystems =
-      { startOn = [ "new-devices" "ip-up" ];
+    environment.etc = singleton
+      { source = pkgs.writeText "fstab"
+          ''
+            # This is a generated file.  Do not edit!
+
+            # Filesystems.
+            ${flip concatMapStrings config.fileSystems (fs:
+                (if fs.device != null then fs.device else "/dev/disk/by-label/${fs.label}")
+                + " " + fs.mountPoint
+                + " " + fs.fsType
+                + " " + fs.options
+                + " 0"
+                + " " + (if fs.mountPoint == "/" then "1" else "2")
+                + "\n"
+            )}
+
+            # Swap devices.
+            ${flip concatMapStrings config.swapDevices (sw:
+                 "${sw.device} none swap\n"
+            )}
+          '';
+        target = "fstab";
+      };
+
+    jobs.mountall =
+      { startOn = "started udev";
+
+        script =
+          ''
+            exec > /dev/console 2>&1
+            export PATH=${config.system.sbin.mount}/bin:${pkgs.utillinux}/sbin:$PATH
+            ${pkgs.mountall}/sbin/mountall --verbose --debug
+            echo DONE
+          '';
 
-        script = task;
+        extraConfig = "console owner";
 
         task = true;
       };
diff --git a/modules/tasks/swap.nix b/modules/tasks/swap.nix
index ab81185532e..a3f241fc8c5 100644
--- a/modules/tasks/swap.nix
+++ b/modules/tasks/swap.nix
@@ -2,12 +2,6 @@
 
 with pkgs.lib;
 
-let
-
-  inherit (pkgs) cryptsetup utillinux;
-
-in
-
 {
 
   ###### interface
@@ -36,37 +30,31 @@ in
       options = {config, options, ...}: {
 
         options = {
+        
           device = mkOption {
             example = "/dev/sda3";
             type = types.string;
-            description = ''
-              Path of the device.
-            '';
+            description = "Path of the device.";
           };
 
           label = mkOption {
             example = "swap";
             type = types.string;
-            description = "
+            description = ''
               Label of the device.  Can be used instead of <varname>device</varname>.
-            ";
+            '';
           };
 
           cipher = mkOption {
             default = false;
             example = true;
             type = types.bool;
-            description = "
-              Cipher the swap device to protect swapped data.  This option
+            description = ''
+              Encrypt the swap device to protect swapped data.  This option
               does not work with labels.
-            ";
+            '';
           };
 
-          command = mkOption {
-            description = "
-              Command used to activate the swap device.
-            ";
-          };
         };
 
         config = {
@@ -75,59 +63,12 @@ in
               "/dev/disk/by-label/${config.label}"
             else
               mkNotdef;
-
-          command = ''
-            if test -e "${config.device}"; then
-              ${if config.cipher then ''
-                  plainDevice="${config.device}"
-                  name="crypt$(echo "$plainDevice" | sed -e 's,/,.,g')"
-                  device="/dev/mapper/$name"
-                  if ! test -e "$device"; then
-                    ${cryptsetup}/sbin/cryptsetup -c aes -s 128 -d /dev/urandom create "$name" "$plainDevice"
-                    ${utillinux}/sbin/mkswap -f "$device" || true
-                  fi
-                ''
-                else ''
-                  device="${config.device}"
-                ''
-              }
-              device=$(readlink -f "$device")
-              # Add new swap devices.
-              if echo $unused | grep -q "^$device\$"; then
-                unused="$(echo $unused | grep -v "^$device\$" || true)"
-              else
-                ${utillinux}/sbin/swapon "$device" || true
-              fi
-            fi
-          '';
         };
-
+        
       };
       
     };
 
   };
 
-  ###### implementation
-
-  config = {
-
-    jobs.swap =
-      { task = true;
-
-        startOn = ["startup" "new-devices"];
-
-        script =
-          ''
-            unused="$(sed '1d; s/ .*//' /proc/swaps)"
-
-            ${toString (map (x: x.command) config.swapDevices)}
-
-            # Remove remaining swap devices.
-            test -n "$unused" && ${utillinux}/sbin/swapoff $unused || true
-          '';
-      };
-
-  };
-
 }
-- 
GitLab


From 5702557a65c32661944a2b9f8f08509a3b3a3d4f Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 4 Jun 2010 15:35:32 +0000
Subject: [PATCH 2404/5331] * Put e2fsprogs etc. in mountall's $PATH so that
 fsck works.

svn path=/nixos/branches/boot-order/; revision=22151
---
 modules/config/system-path.nix |  2 --
 modules/tasks/filesystems.nix  | 13 +++++++++++--
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/modules/config/system-path.nix b/modules/config/system-path.nix
index d9074732418..7e04af21997 100644
--- a/modules/config/system-path.nix
+++ b/modules/config/system-path.nix
@@ -22,7 +22,6 @@ let
       pkgs.cpio
       pkgs.curl
       pkgs.diffutils
-      pkgs.e2fsprogs
       pkgs.eject # HAL depends on it anyway
       pkgs.findutils
       pkgs.gawk
@@ -44,7 +43,6 @@ let
       pkgs.pciutils
       pkgs.perl
       pkgs.procps
-      pkgs.reiserfsprogs
       pkgs.rsync
       pkgs.seccure
       pkgs.strace
diff --git a/modules/tasks/filesystems.nix b/modules/tasks/filesystems.nix
index 791ecccf4c8..387a093ee69 100644
--- a/modules/tasks/filesystems.nix
+++ b/modules/tasks/filesystems.nix
@@ -2,6 +2,13 @@
 
 with pkgs.lib;
 
+let
+
+  # Packages that provide fsck backends.
+  fsPackages = [ pkgs.e2fsprogs pkgs.reiserfsprogs ];
+
+in
+
 {
 
   ###### interface
@@ -119,7 +126,9 @@ with pkgs.lib;
   config = {
 
     # Add the mount helpers to the system path so that `mount' can find them.
-    environment.systemPackages = [ pkgs.ntfs3g pkgs.cifs_utils pkgs.nfsUtils pkgs.mountall ];
+    environment.systemPackages =
+      [ pkgs.ntfs3g pkgs.cifs_utils pkgs.nfsUtils pkgs.mountall ]
+      ++ fsPackages;
     
     environment.etc = singleton
       { source = pkgs.writeText "fstab"
@@ -151,7 +160,7 @@ with pkgs.lib;
         script =
           ''
             exec > /dev/console 2>&1
-            export PATH=${config.system.sbin.mount}/bin:${pkgs.utillinux}/sbin:$PATH
+            export PATH=${config.system.sbin.mount}/bin:${makeSearchPath "sbin" ([pkgs.utillinux] ++ fsPackages)}:$PATH
             ${pkgs.mountall}/sbin/mountall --verbose --debug
             echo DONE
           '';
-- 
GitLab


From 629078824740451e90b9b1d8865661882ac84b94 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 7 Jun 2010 12:15:55 +0000
Subject: [PATCH 2405/5331] * If mountall fails to mount all filesystems, start
 an emergency shell   to allow the user to fix or ignore the problem.

svn path=/nixos/branches/boot-order/; revision=22165
---
 modules/services/ttys/mingetty.nix |  2 +-
 modules/tasks/filesystems.nix      | 56 ++++++++++++++++++++++++++++--
 2 files changed, 54 insertions(+), 4 deletions(-)

diff --git a/modules/services/ttys/mingetty.nix b/modules/services/ttys/mingetty.nix
index 8299580a8cf..239231b3699 100644
--- a/modules/services/ttys/mingetty.nix
+++ b/modules/services/ttys/mingetty.nix
@@ -55,7 +55,7 @@ with pkgs.lib;
     # Generate a separate job for each tty.  
     jobs = listToAttrs (map (tty: nameValuePair tty {
     
-      startOn = "started udev and local-filesystems";
+      startOn = "started udev and filesystem";
 
       exec = "${pkgs.mingetty}/sbin/mingetty --loginprog=${pkgs.shadow}/bin/login --noclear ${tty}";
       
diff --git a/modules/tasks/filesystems.nix b/modules/tasks/filesystems.nix
index 387a093ee69..81e7446ff83 100644
--- a/modules/tasks/filesystems.nix
+++ b/modules/tasks/filesystems.nix
@@ -157,17 +157,67 @@ in
     jobs.mountall =
       { startOn = "started udev";
 
+        task = true;
+        
         script =
           ''
             exec > /dev/console 2>&1
+            echo "mounting filesystems..."
             export PATH=${config.system.sbin.mount}/bin:${makeSearchPath "sbin" ([pkgs.utillinux] ++ fsPackages)}:$PATH
-            ${pkgs.mountall}/sbin/mountall --verbose --debug
-            echo DONE
+            ${pkgs.mountall}/sbin/mountall
           '';
+      };
 
-        extraConfig = "console owner";
+    # The `mount-failed' event is emitted synchronously, but we don't
+    # want `mountall' to wait for the emergency shell.  So use this
+    # intermediate job to make the event asynchronous.
+    jobs.mountFailed =
+      { name = "mount-failed";
+        task = true;
+        startOn = "mount-failed";
+        script =
+          ''
+            start --no-wait emergency-shell \
+              DEVICE="$DEVICE" MOUNTPOINT="$MOUNTPOINT"
+          '';
+      };
+
+    jobs.emergencyShell =
+      { name = "emergency-shell";
 
         task = true;
+
+        stopOn = "filesystem";
+
+        extraConfig = "console owner";
+
+        script =
+          ''
+            exec < /dev/console > /dev/console 2>&1
+
+            cat <<EOF
+
+            <<< Emergency shell >>>
+
+            The filesystem \`$DEVICE' could not be mounted on \`$MOUNTPOINT'.
+
+            Please do one of the following:
+
+            - Repair the filesystem (\`fsck $DEVICE') and exit the emergency
+              shell to resume booting.
+
+            - Ignore any failed filesystems and continue booting by running
+              \`initctl emit filesystem'.
+
+            - Remove the failed filesystem from the system configuration in
+              /etc/nixos/configuration.nix and run \`nixos-rebuild switch'.
+            
+            EOF
+
+            ${pkgs.shadow}/bin/login root || false
+
+            initctl start --no-wait mountall
+          '';
       };
 
   };
-- 
GitLab


From 085a47c88a0622c6e0132a5798c118f961038bf9 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 7 Jun 2010 12:16:59 +0000
Subject: [PATCH 2406/5331] * Bind mounts should have filesystem type "none" to
 prevent an   invocation of "fsck.auto" at boot time.

svn path=/nixos/branches/boot-order/; revision=22166
---
 modules/virtualisation/qemu-vm.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/modules/virtualisation/qemu-vm.nix b/modules/virtualisation/qemu-vm.nix
index 6e4e372c1bf..1c725d946f5 100644
--- a/modules/virtualisation/qemu-vm.nix
+++ b/modules/virtualisation/qemu-vm.nix
@@ -212,6 +212,7 @@ in
       }
       { mountPoint = "/nix/store";
         device = "/hostfs/nix/store";
+        fsType = "none";
         options = "bind";
         neededForBoot = true;
       }
-- 
GitLab


From 48fdc931a4ee497979db40f57f3bccca57bf889c Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 7 Jun 2010 12:39:50 +0000
Subject: [PATCH 2407/5331] * Run udevtrigger in a separate job.  This speeds
 up booting because   it allows the `mountall' task to start mounting
 filesystems as soon   as udev is running and devices become available (i.e.
 it doesn't   have to wait for all devices).  This means that some jobs should
   depend on "stopped udevtrigger" instead of "started udev".

svn path=/nixos/branches/boot-order/; revision=22167
---
 modules/services/hardware/udev.nix | 11 ++++++++---
 modules/services/x11/xserver.nix   |  2 +-
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/modules/services/hardware/udev.nix b/modules/services/hardware/udev.nix
index d5955f88fbd..f730e0c1f17 100644
--- a/modules/services/hardware/udev.nix
+++ b/modules/services/hardware/udev.nix
@@ -185,8 +185,14 @@ in
         daemonType = "fork";
 
         exec = "${udev}/sbin/udevd --daemon";
+      };
+
+    jobs.udevtrigger =
+      { startOn = "started udev";
+
+        task = true;
 
-        postStart =
+        script =
           ''
             # Let udev create device nodes for all modules that have already
             # been loaded into the kernel (or for which support is built into
@@ -200,9 +206,8 @@ in
 
             initctl emit -n new-devices
           '';
-        
       };
-
+      
   };
 
 }
diff --git a/modules/services/x11/xserver.nix b/modules/services/x11/xserver.nix
index a5a4c908bef..97c96ef8be9 100644
--- a/modules/services/x11/xserver.nix
+++ b/modules/services/x11/xserver.nix
@@ -408,7 +408,7 @@ in
       optional (elem "virtualbox" driverNames) kernelPackages.virtualboxGuestAdditions;
 
     jobs.xserver =
-      { startOn = if cfg.autorun then "started udev and started hal" else "";
+      { startOn = if cfg.autorun then "filesystem and stopped udevtrigger and started hal" else "";
  
         environment =
           { FONTCONFIG_FILE = "/etc/fonts/fonts.conf"; # !!! cleanup
-- 
GitLab


From 4b3a76f3fce92ba018372f0446d88387b5962259 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 7 Jun 2010 13:54:15 +0000
Subject: [PATCH 2408/5331] * Fix coverage analysis of the kernel.

svn path=/nixos/trunk/; revision=22168
---
 tests/subversion.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/subversion.nix b/tests/subversion.nix
index 5354a40452b..d43e369b437 100644
--- a/tests/subversion.nix
+++ b/tests/subversion.nix
@@ -19,7 +19,7 @@ let
 
         # To build the kernel with coverage instrumentation, we need a
         # special patch to make coverage data available under /proc.
-        kernel = pkgs.kernel.override (orig: {
+        linux = pkgs.linux.override (orig: {
           stdenv = cleanupBuildTree (keepBuildTree orig.stdenv);
           extraConfig =
             ''
-- 
GitLab


From 9e275ffa58c1c1c88a995c0bf1c098b1f06f605f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Mon, 7 Jun 2010 21:09:27 +0000
Subject: [PATCH 2409/5331] Trying to improve the cups expression a bit, so it
 can print also with local usb printers. (Thank you Oleksandr)

svn path=/nixos/trunk/; revision=22173
---
 modules/services/printing/cupsd.nix | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/modules/services/printing/cupsd.nix b/modules/services/printing/cupsd.nix
index 40760ec8af5..39ca4f68325 100644
--- a/modules/services/printing/cupsd.nix
+++ b/modules/services/printing/cupsd.nix
@@ -106,6 +106,11 @@ in
 
     services.dbus.packages = [cups];
 
+    # cups uses libusb to talk to printers, and does not use the
+    # linux kernel driver. If the driver is not in a black list, it
+    # gets loaded, and then cups cannot access the printers.
+    boot.blacklistedKernelModules = [ "usblp" ];
+
     environment.etc =
       [ # CUPS expects the following files in its ServerRoot.
         { source = "${cups}/etc/cups/mime.convs";
@@ -122,15 +127,17 @@ in
         startOn = "started network-interfaces";
         stopOn = "stopping network-interfaces";
 
+        environment = {
+          # Cups scripts for printing (psto...) require awk, sed, grep, ...
+          PATH = config.system.path;
+        };
+
         preStart =
           ''
             mkdir -m 0755 -p ${logDir}
             mkdir -m 0700 -p /var/cache/cups
             mkdir -m 0700 -p /var/spool/cups
             mkdir -m 0755 -p ${cfg.tempDir}
-
-            # Make USB printers show up.
-            ${modprobe}/sbin/modprobe usblp || true
           '';
 
         exec = "${cups}/sbin/cupsd -c ${pkgs.writeText "cupsd.conf" cfg.cupsdConf} -F";
-- 
GitLab


From dadd6d63e760ef5e3cbb57c3f9fbd5ea01f22024 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Mon, 7 Jun 2010 21:44:06 +0000
Subject: [PATCH 2410/5331] oops. Fixing the cupsd path. How to set a single
 path there in the job? I don't know.

svn path=/nixos/trunk/; revision=22174
---
 modules/services/printing/cupsd.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/services/printing/cupsd.nix b/modules/services/printing/cupsd.nix
index 39ca4f68325..0ac52fe1038 100644
--- a/modules/services/printing/cupsd.nix
+++ b/modules/services/printing/cupsd.nix
@@ -129,7 +129,7 @@ in
 
         environment = {
           # Cups scripts for printing (psto...) require awk, sed, grep, ...
-          PATH = config.system.path;
+          PATH = "${config.system.path}/bin";
         };
 
         preStart =
-- 
GitLab


From 23cc979f61882cd2fc75758e0419a4cde4666b81 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 8 Jun 2010 10:06:00 +0000
Subject: [PATCH 2411/5331] * Run `swapoff -a' during shutdown.  Otherwise
 filesystems containing   swapfiles cannot be unmounted or even remounted
 read-only. * In the remount, pass `-t none' to get a more informative error  
 message if the filesystem is in use.

svn path=/nixos/branches/boot-order/; revision=22179
---
 modules/system/upstart-events/shutdown.nix | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/modules/system/upstart-events/shutdown.nix b/modules/system/upstart-events/shutdown.nix
index 9db5fafa46c..368886a6302 100644
--- a/modules/system/upstart-events/shutdown.nix
+++ b/modules/system/upstart-events/shutdown.nix
@@ -63,6 +63,10 @@ with pkgs.lib;
           # Set the hardware clock to the system time.
           echo "setting the hardware clock..."
           hwclock --systohc --utc
+
+
+          # Stop all swap devices.
+          swapoff -a
       
       
           # Unmount helper functions.
@@ -99,7 +103,7 @@ with pkgs.lib;
                   # `-i' is to workaround a bug in mount.cifs (it
                   # doesn't recognise the `remount' option, and
                   # instead mounts the FS again).
-                  mount -n -i -o remount,ro "$mp"
+                  mount -t none -n -i -o remount,ro none "$mp"
 
                   # Note: don't use `umount -f'; it's very buggy.
                   # (For instance, when applied to a bind-mount it
@@ -118,8 +122,8 @@ with pkgs.lib;
                   fi
               done
           done
-      
-      
+
+
           # Final sync.
           sync
       
-- 
GitLab


From 7c3ae9e716fac68645d3595a457a3d155049ade6 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 8 Jun 2010 11:52:16 +0000
Subject: [PATCH 2412/5331] * During shutdown, warn explicitly about
 filesystems that could not be   unmounted or remounted read-only. * Don't try
 to unmount / or /nix/store.

svn path=/nixos/branches/boot-order/; revision=22181
---
 modules/system/upstart-events/shutdown.nix | 52 +++++++++-------------
 1 file changed, 22 insertions(+), 30 deletions(-)

diff --git a/modules/system/upstart-events/shutdown.nix b/modules/system/upstart-events/shutdown.nix
index 368886a6302..283782fb4d1 100644
--- a/modules/system/upstart-events/shutdown.nix
+++ b/modules/system/upstart-events/shutdown.nix
@@ -69,31 +69,19 @@ with pkgs.lib;
           swapoff -a
       
       
-          # Unmount helper functions.
-          getMountPoints() {
-              cat /proc/mounts \
-              | grep -v '^rootfs' \
-              | sed 's|^[^ ]\+ \+\([^ ]\+\).*|\1|' \
-              | grep -v '/proc\|/sys\|/dev'
-          }
-      
-          getDevice() {
-              local mountPoint=$1
-              cat /proc/mounts \
-              | grep -v '^rootfs' \
-              | grep "^[^ ]\+ \+$mountPoint \+" \
-              | sed 's|^\([^ ]\+\).*|\1|'
-          }
-      
           # Unmount file systems.  We repeat this until no more file systems
           # can be unmounted.  This is to handle loopback devices, file
           # systems  mounted on other file systems and so on.
           tryAgain=1
           while test -n "$tryAgain"; do
               tryAgain=
-      
-              for mp in $(getMountPoints); do
-                  device=$(getDevice $mp)
+              failed= # list of mount points that couldn't be unmounted/remounted
+
+              cp /proc/mounts /dev/.mounts # don't read /proc/mounts while it's changing
+              exec 4< /dev/.mounts
+              while read -u 4 device mp fstype options rest; do
+                  if [ "$mp" = /proc -o "$mp" = /sys -o "$mp" = /dev -o "$device" = "rootfs" -o "$mp" = /var/run/nscd ]; then continue; fi
+              
                   echo "unmounting $mp..."
 
                   # We need to remount,ro before attempting any
@@ -103,27 +91,31 @@ with pkgs.lib;
                   # `-i' is to workaround a bug in mount.cifs (it
                   # doesn't recognise the `remount' option, and
                   # instead mounts the FS again).
-                  mount -t none -n -i -o remount,ro none "$mp"
+                  success=
+                  if mount -t "$fstype" -n -i -o remount,ro "device" "$mp"; then success=1; fi
 
                   # Note: don't use `umount -f'; it's very buggy.
                   # (For instance, when applied to a bind-mount it
                   # unmounts the target of the bind-mount.)  !!! But
                   # we should use `-f' for NFS.
-                  if umount -n "$mp"; then
-                      if test "$mp" != /; then tryAgain=1; fi
-                  fi
-      
-                  # Hack: work around a bug in mount (mount -o remount on a
-                  # loop device forgets the loop=/dev/loopN entry in
-                  # /etc/mtab).
-                  if echo "$device" | grep -q '/dev/loop'; then
-                      echo "removing loop device $device..."
-                      losetup -d "$device"
+                  if [ "$mp" != / -a "$mp" != /nix/store ]; then
+                      if umount -n "$mp"; then success=1; tryAgain=1; fi
                   fi
+
+                  if [ -z "$success" ]; then failed="$failed $mp"; fi
               done
           done
 
 
+          # Warn about filesystems that could not be unmounted or
+          # remounted read-only.
+          if [ -n "$failed" ]; then
+              echo "warning: the following filesystems could not be unmounted:"
+              for mp in $failed; do echo "  $mp"; done
+              sleep 5
+          fi
+
+
           # Final sync.
           sync
       
-- 
GitLab


From 3eac0038003818a5a91a82da9039a5119ae292fa Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 8 Jun 2010 12:48:16 +0000
Subject: [PATCH 2413/5331] * Maintain /var/log/wtmp correctly during
 boot/shutdown.

svn path=/nixos/branches/boot-order/; revision=22182
---
 modules/system/boot/stage-2-init.sh        | 2 ++
 modules/system/upstart-events/runlevel.nix | 9 +++++++++
 modules/system/upstart-events/shutdown.nix | 8 ++++++--
 3 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/modules/system/boot/stage-2-init.sh b/modules/system/boot/stage-2-init.sh
index de9b136d02a..69c67de6e3a 100644
--- a/modules/system/boot/stage-2-init.sh
+++ b/modules/system/boot/stage-2-init.sh
@@ -134,9 +134,11 @@ export MODULE_DIR=@kernel@/lib/modules/
 # Run any user-specified commands.
 @shell@ @postBootCommands@
 
+
 # For debugging Upstart.
 #@shell@ --login < /dev/console > /dev/console 2>&1 &
 
+
 # Start Upstart's init.
 echo "starting Upstart..."
 PATH=/var/run/current-system/upstart/sbin exec init
diff --git a/modules/system/upstart-events/runlevel.nix b/modules/system/upstart-events/runlevel.nix
index 96864594509..10d108d9f40 100644
--- a/modules/system/upstart-events/runlevel.nix
+++ b/modules/system/upstart-events/runlevel.nix
@@ -4,6 +4,15 @@ with pkgs.lib;
 
 {
 
+  # After booting, go to runlevel 2.  (NixOS doesn't really use
+  # runlevels, but this keeps wtmp happy.)
+  jobs.boot =
+    { name = "boot";
+      startOn = "startup";
+      task = true;
+      script = "telinit 2";
+    };
+
   jobs.runlevel =
     { name = "runlevel";
 
diff --git a/modules/system/upstart-events/shutdown.nix b/modules/system/upstart-events/shutdown.nix
index 283782fb4d1..2aad17cd1ac 100644
--- a/modules/system/upstart-events/shutdown.nix
+++ b/modules/system/upstart-events/shutdown.nix
@@ -58,8 +58,12 @@ with pkgs.lib;
               initctl emit -n startup
               exit 0
           fi
-                
-      
+
+
+          # Write a shutdown record to wtmp while /var/log is still writable.
+          reboot --wtmp-only
+
+
           # Set the hardware clock to the system time.
           echo "setting the hardware clock..."
           hwclock --systohc --utc
-- 
GitLab


From a9e8bf6491ed3d0f618b5fbbaef6c58781d996a2 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 8 Jun 2010 16:01:31 +0000
Subject: [PATCH 2414/5331] * nfsd: run rpc.nfsd from the pre-start script
 since it's not actually   a daemon (it just starts some kernel threads).  In
 the post-stop   script, stop the kernel threads. * exportfs: fix the
 createMountPoints option. * Mount the nfsd filesystem on /proc/fs/nfsd
 because mountd prefers   this.

svn path=/nixos/branches/boot-order/; revision=22187
---
 .../services/network-filesystems/nfs-kernel.nix  | 16 ++++++++++++----
 modules/tasks/filesystems.nix                    |  4 +---
 2 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/modules/services/network-filesystems/nfs-kernel.nix b/modules/services/network-filesystems/nfs-kernel.nix
index d28aef0ed52..1baa0305183 100644
--- a/modules/services/network-filesystems/nfs-kernel.nix
+++ b/modules/services/network-filesystems/nfs-kernel.nix
@@ -8,6 +8,8 @@ let
 
   cfg = config.services.nfsKernel;
 
+  exports = pkgs.writeText "exports" cfg.server.exports;
+
 in
 
 {
@@ -82,7 +84,7 @@ in
       });
 
     environment.etc = mkIf cfg.server.enable (singleton
-      { source = pkgs.writeText "exports" cfg.server.exports;
+      { source = exports;
         target = "exports";
       });
 
@@ -100,19 +102,23 @@ in
               ''
                 export PATH=${pkgs.nfsUtils}/sbin:$PATH
                 mkdir -p /var/lib/nfs
+                
                 ${config.system.sbin.modprobe}/sbin/modprobe nfsd || true
 
+                ${pkgs.sysvtools}/bin/mountpoint -q /proc/fs/nfsd \
+                || ${config.system.sbin.mount}/bin/mount -t nfsd none /proc/fs/nfsd
+
                 ${optionalString cfg.server.createMountPoints
                   ''
                     # create export directories:
                     # skip comments, take first col which may either be a quoted
                     # "foo bar" or just foo (-> man export)
-                    sed '/^#.*/d;s/^"\([^"]*\)".*/\1/;t;s/[ ].*//' ${cfg.server.exports} \
+                    sed '/^#.*/d;s/^"\([^"]*\)".*/\1/;t;s/[ ].*//' ${exports} \
                     | xargs -d '\n' mkdir -p
                   ''
                 }
 
-                # exports file is ${cfg.server.exports}
+                # exports file is ${exports}
                 # keep this comment so that this job is restarted whenever exports changes!
                 exportfs -ra
               '';
@@ -128,7 +134,9 @@ in
             startOn = "started nfs-kernel-exports and started portmap";
             stopOn = "stopping nfs-kernel-exports";
 
-            exec = "${pkgs.nfsUtils}/sbin/rpc.nfsd ${if cfg.server.hostName != null then "-H ${cfg.server.hostName}" else ""} ${builtins.toString cfg.server.nproc}";
+            preStart = "${pkgs.nfsUtils}/sbin/rpc.nfsd ${if cfg.server.hostName != null then "-H ${cfg.server.hostName}" else ""} ${builtins.toString cfg.server.nproc}";
+
+            postStop = "${pkgs.nfsUtils}/sbin/rpc.nfsd 0";
           };
         }
 
diff --git a/modules/tasks/filesystems.nix b/modules/tasks/filesystems.nix
index 81e7446ff83..fe231d94ec8 100644
--- a/modules/tasks/filesystems.nix
+++ b/modules/tasks/filesystems.nix
@@ -142,7 +142,7 @@ in
                 + " " + fs.fsType
                 + " " + fs.options
                 + " 0"
-                + " " + (if fs.mountPoint == "/" then "1" else "2")
+                + " " + (if fs.fsType == "none" then "0" else if fs.mountPoint == "/" then "1" else "2")
                 + "\n"
             )}
 
@@ -187,8 +187,6 @@ in
 
         task = true;
 
-        stopOn = "filesystem";
-
         extraConfig = "console owner";
 
         script =
-- 
GitLab


From 2678f947fb5d094fe65e13660625e7cae5bdfd1a Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 8 Jun 2010 16:02:22 +0000
Subject: [PATCH 2415/5331] * Add a test for the NFS server/client.

svn path=/nixos/branches/boot-order/; revision=22188
---
 tests/default.nix |  1 +
 tests/nfs.nix     | 47 +++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 48 insertions(+)
 create mode 100644 tests/nfs.nix

diff --git a/tests/default.nix b/tests/default.nix
index dfccce3851c..015eb071a15 100644
--- a/tests/default.nix
+++ b/tests/default.nix
@@ -12,6 +12,7 @@ with import ../lib/testing.nix { inherit nixpkgs services system; };
   kde4 = makeTest (import ./kde4.nix);
   login = makeTest (import ./login.nix);
   nat = makeTest (import ./nat.nix);
+  nfs = makeTest (import ./nfs.nix);
   openssh = makeTest (import ./openssh.nix);
   portmap = makeTest (import ./portmap.nix);
   proxy = makeTest (import ./proxy.nix);
diff --git a/tests/nfs.nix b/tests/nfs.nix
new file mode 100644
index 00000000000..b0739ab92ab
--- /dev/null
+++ b/tests/nfs.nix
@@ -0,0 +1,47 @@
+{ pkgs, ... }:
+
+{
+
+  nodes =
+    { client = 
+        { config, pkgs, ... }:
+        { services.nfsKernel.client.enable = true;
+          fileSystems = pkgs.lib.mkOverride 50 {} 
+            [ { mountPoint = "/data";
+                device = "server:/data";
+                fsType = "nfs";
+                options = "bootwait";
+              } 
+            ];
+        };
+
+      server = 
+        { config, pkgs, ... }:
+        { services.nfsKernel.server.enable = true;
+          services.nfsKernel.server.exports =
+            ''
+              /data 192.168.1.0/255.255.255.0(rw,no_root_squash)
+            '';
+          services.nfsKernel.server.createMountPoints = true;
+        };
+    };
+
+  testScript =
+    ''
+      startAll;
+
+      $server->waitForJob("nfs-kernel-nfsd");
+      $server->waitForJob("nfs-kernel-mountd");
+      $server->waitForJob("nfs-kernel-statd");
+
+      $client->waitForJob("nfs-kernel-statd");
+
+      $client->waitForJob("tty1"); # depends on filesystems
+
+      $client->succeed("echo bar > /data/foo");
+      $server->succeed("test -e /data/foo");
+
+      $client->shutdown;
+    '';
+
+}
-- 
GitLab


From 5ddaf9b963cfe0819788846c6d90d514a93e09ec Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 8 Jun 2010 16:14:41 +0000
Subject: [PATCH 2416/5331] * Set `services.nfsKernel.client.enable'
 automatically if there is a   filesystem with type "nfs" or "nfs4".

svn path=/nixos/branches/boot-order/; revision=22189
---
 modules/services/network-filesystems/nfs-kernel.nix | 2 +-
 tests/nfs.nix                                       | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/modules/services/network-filesystems/nfs-kernel.nix b/modules/services/network-filesystems/nfs-kernel.nix
index 1baa0305183..2a9f78e7d2f 100644
--- a/modules/services/network-filesystems/nfs-kernel.nix
+++ b/modules/services/network-filesystems/nfs-kernel.nix
@@ -21,7 +21,7 @@ in
     services.nfsKernel = {
 
       client.enable = mkOption {
-        default = false;
+        default = any (fs: fs.fsType == "nfs" || fs.fsType == "nfs4") config.fileSystems;
         description = ''
           Whether to enable the kernel's NFS client daemons.
         '';
diff --git a/tests/nfs.nix b/tests/nfs.nix
index b0739ab92ab..91a1005da94 100644
--- a/tests/nfs.nix
+++ b/tests/nfs.nix
@@ -5,8 +5,7 @@
   nodes =
     { client = 
         { config, pkgs, ... }:
-        { services.nfsKernel.client.enable = true;
-          fileSystems = pkgs.lib.mkOverride 50 {} 
+        { fileSystems = pkgs.lib.mkOverride 50 {} 
             [ { mountPoint = "/data";
                 device = "server:/data";
                 fsType = "nfs";
-- 
GitLab


From c1ecdf708ffe6cc0c49a4b918bf20386e8afc032 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 9 Jun 2010 10:51:05 +0000
Subject: [PATCH 2417/5331] * Put the hostname of the VM in the window title.

svn path=/nixos/branches/boot-order/; revision=22191
---
 modules/virtualisation/qemu-vm.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/modules/virtualisation/qemu-vm.nix b/modules/virtualisation/qemu-vm.nix
index 1c725d946f5..2f554a591a8 100644
--- a/modules/virtualisation/qemu-vm.nix
+++ b/modules/virtualisation/qemu-vm.nix
@@ -123,7 +123,9 @@ let
       
       # -no-kvm-irqchip is needed to prevent the CIFS mount from
       # hanging the VM on x86_64.
-      exec ${pkgs.qemu_kvm}/bin/qemu-system-x86_64 -m ${toString config.virtualisation.memorySize} \
+      exec ${pkgs.qemu_kvm}/bin/qemu-system-x86_64 \
+          -name ${vmName} \
+          -m ${toString config.virtualisation.memorySize} \
           -no-kvm-irqchip \
           -net nic,vlan=0,model=virtio -net user,vlan=0 -smb / \
           -drive file=$NIX_DISK_IMAGE,if=virtio,boot=on,werror=report \
-- 
GitLab


From d837ae49141abb62368f749cb003966773414d52 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 9 Jun 2010 11:15:25 +0000
Subject: [PATCH 2418/5331] * portmap: don't use the -f flag to ensure that
 when the job reaches   the "started" state, portmap is actually up.

svn path=/nixos/branches/boot-order/; revision=22192
---
 modules/services/networking/portmap.nix | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/modules/services/networking/portmap.nix b/modules/services/networking/portmap.nix
index 62d1c459f10..eead1c52ff0 100644
--- a/modules/services/networking/portmap.nix
+++ b/modules/services/networking/portmap.nix
@@ -54,7 +54,7 @@ in
     users.extraUsers = singleton
       { name = "portmap";
         inherit uid;
-        description = "portmap daemon user";
+        description = "Portmap daemon user";
         home = "/var/empty";
       };
 
@@ -66,14 +66,15 @@ in
     jobs.portmap =
       { description = "ONC RPC portmap";
 
-        startOn = "ip-up";
+        startOn = "started network-interfaces";
+
+        daemonType = "fork";
 
         exec =
           ''
-            ${portmap}/sbin/portmap -f \
-              ${if config.services.portmap.chroot == ""
-                then ""
-                else "-t \"${config.services.portmap.chroot}\""} \
+            ${portmap}/sbin/portmap \
+              ${optionalString (config.services.portmap.chroot != "")
+                "-t '${config.services.portmap.chroot}'"} \
               ${if config.services.portmap.verbose then "-v" else ""}
           '';
       };
-- 
GitLab


From 156ba2def2b7734eaff34b84f5b4d3544ab13f89 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 9 Jun 2010 13:15:15 +0000
Subject: [PATCH 2419/5331] * Don't use the "kvm-clock" clock source because
 it's unreliable.   When starting multiple VMs, some will have perfectly
 synchronised   clocks, while others will have their clocks run much slower
 (say, a   factor of 5).

svn path=/nixos/branches/boot-order/; revision=22195
---
 modules/virtualisation/qemu-vm.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/modules/virtualisation/qemu-vm.nix b/modules/virtualisation/qemu-vm.nix
index 2f554a591a8..6f8deebc69a 100644
--- a/modules/virtualisation/qemu-vm.nix
+++ b/modules/virtualisation/qemu-vm.nix
@@ -169,6 +169,9 @@ in
       
   boot.initrd.postDeviceCommands =
     ''
+      # Workaround for massive clock drift with the "kvm-clock" clock source.
+      echo hpet > /sys/devices/system/clocksource/clocksource0/current_clocksource
+    
       # Set up networking.  Needed for CIFS mounting.
       ifconfig eth0 up 10.0.2.15
 
-- 
GitLab


From 645ed8d3b46c839040c543a23f5be3d87e511a76 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 9 Jun 2010 13:18:01 +0000
Subject: [PATCH 2420/5331] * Start NFS daemons in the right order as described
 in the nfs-utils   README (i.e. for the server: exportfs, mountd, statd,
 nfsd,   sm-notify; for the client: statd / sm-notify before mountall).  This 
  is important to allow locking to work correctly.

svn path=/nixos/branches/boot-order/; revision=22196
---
 .../network-filesystems/nfs-kernel.nix        | 27 +++++++++++++++----
 1 file changed, 22 insertions(+), 5 deletions(-)

diff --git a/modules/services/network-filesystems/nfs-kernel.nix b/modules/services/network-filesystems/nfs-kernel.nix
index 2a9f78e7d2f..f249b79357a 100644
--- a/modules/services/network-filesystems/nfs-kernel.nix
+++ b/modules/services/network-filesystems/nfs-kernel.nix
@@ -146,8 +146,8 @@ in
 
             description = "Kernel NFS server - mount daemon";
 
-            startOn = "started nfs-kernel-nfsd and started portmap";
-            stopOn = "stopping nfs-kernel-exports";
+            startOn = "starting nfs-kernel-nfsd and started portmap";
+            stopOn = "stopped nfs-kernel-nfsd";
 
             exec = "${pkgs.nfsUtils}/sbin/rpc.mountd -F -f /etc/exports";
           };
@@ -159,15 +159,32 @@ in
 
             description = "Kernel NFS server - Network Status Monitor";
 
-            startOn = "${if cfg.server.enable then "started nfs-kernel-nfsd and " else ""} started portmap";
-            stopOn = "stopping nfs-kernel-exports";
+            startOn = "${if cfg.server.enable then "starting nfs-kernel-nfsd and " else ""} started portmap";
+            stopOn = if cfg.server.enable then "stopped nfs-kernel-nfsd" else "starting shutdown";
 
             preStart =
               ''	
                 mkdir -p /var/lib/nfs
+                mkdir -p /var/lib/nfs/sm
+                mkdir -p /var/lib/nfs/sm.bak
               '';
 
-            exec = "${pkgs.nfsUtils}/sbin/rpc.statd -F";
+            exec = "${pkgs.nfsUtils}/sbin/rpc.statd --foreground --no-notify";
+          };
+        }
+      
+      // optionalAttrs (cfg.client.enable || cfg.server.enable)
+        { nfs_kernel_sm_notify = 
+          { name = "nfs-kernel-sm-notify";
+
+            description = "Kernel NFS server - Reboot notification";
+
+            startOn = "started nfs-kernel-statd"
+              + (if cfg.client.enable then " and starting mountall" else "");
+
+            task = true;
+
+            exec = "${pkgs.nfsUtils}/sbin/sm-notify -d";
           };
         };
       
-- 
GitLab


From 6e27ce8e8eba4f1734f78a39e91d34f91cf44bfa Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 9 Jun 2010 13:18:49 +0000
Subject: [PATCH 2421/5331] * Test whether distributed locking works on NFS.

svn path=/nixos/branches/boot-order/; revision=22197
---
 tests/nfs.nix | 49 +++++++++++++++++++++++++++++++++----------------
 1 file changed, 33 insertions(+), 16 deletions(-)

diff --git a/tests/nfs.nix b/tests/nfs.nix
index 91a1005da94..367a5bf3ab3 100644
--- a/tests/nfs.nix
+++ b/tests/nfs.nix
@@ -1,18 +1,25 @@
 { pkgs, ... }:
 
+let
+
+  client = 
+    { config, pkgs, ... }:
+    { fileSystems = pkgs.lib.mkOverride 50 {} 
+        [ { mountPoint = "/data";
+            device = "server:/data";
+            fsType = "nfs";
+            options = "bootwait";
+          } 
+        ];
+    };
+
+in
+
 {
 
   nodes =
-    { client = 
-        { config, pkgs, ... }:
-        { fileSystems = pkgs.lib.mkOverride 50 {} 
-            [ { mountPoint = "/data";
-                device = "server:/data";
-                fsType = "nfs";
-                options = "bootwait";
-              } 
-            ];
-        };
+    { client1 = client;
+      client2 = client;
 
       server = 
         { config, pkgs, ... }:
@@ -33,14 +40,24 @@
       $server->waitForJob("nfs-kernel-mountd");
       $server->waitForJob("nfs-kernel-statd");
 
-      $client->waitForJob("nfs-kernel-statd");
-
-      $client->waitForJob("tty1"); # depends on filesystems
-
-      $client->succeed("echo bar > /data/foo");
+      $client1->waitForJob("tty1"); # depends on filesystems
+      $client1->succeed("echo bla > /data/foo");
       $server->succeed("test -e /data/foo");
 
-      $client->shutdown;
+      $client2->waitForJob("tty1"); # depends on filesystems
+      $client2->succeed("echo bla > /data/bar");
+      $server->succeed("test -e /data/bar");
+
+      # Test whether we can get a lock.  !!! This step takes about 90
+      # seconds because the NFS server waits that long after booting
+      # before accepting new locks.
+      $client2->succeed("time flock -n -s /data/lock true >&2");
+      
+      # Test locking: client 1 acquires an exclusive lock, so client 2
+      # should then fail to acquire a shared lock.
+      $client1->succeed("flock -x /data/lock -c 'touch locked; sleep 100000' &");
+      $client1->waitForFile("locked");
+      $client2->fail("flock -n -s /data/lock true");
     '';
 
 }
-- 
GitLab


From 94088e9b4865cf10981b69b6922fe8d70e16187b Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 9 Jun 2010 13:45:51 +0000
Subject: [PATCH 2422/5331] * Daemonise mountd/statd.

svn path=/nixos/branches/boot-order/; revision=22198
---
 modules/services/network-filesystems/nfs-kernel.nix | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/modules/services/network-filesystems/nfs-kernel.nix b/modules/services/network-filesystems/nfs-kernel.nix
index f249b79357a..c3974881f0a 100644
--- a/modules/services/network-filesystems/nfs-kernel.nix
+++ b/modules/services/network-filesystems/nfs-kernel.nix
@@ -149,7 +149,9 @@ in
             startOn = "starting nfs-kernel-nfsd and started portmap";
             stopOn = "stopped nfs-kernel-nfsd";
 
-            exec = "${pkgs.nfsUtils}/sbin/rpc.mountd -F -f /etc/exports";
+            daemonType = "fork";
+
+            exec = "${pkgs.nfsUtils}/sbin/rpc.mountd -f /etc/exports";
           };
         }
 
@@ -169,7 +171,9 @@ in
                 mkdir -p /var/lib/nfs/sm.bak
               '';
 
-            exec = "${pkgs.nfsUtils}/sbin/rpc.statd --foreground --no-notify";
+            daemonType = "fork";
+
+            exec = "${pkgs.nfsUtils}/sbin/rpc.statd --no-notify";
           };
         }
       
-- 
GitLab


From b56b4c22d5ac3b453aafd25c927a17244219c88f Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 9 Jun 2010 13:46:18 +0000
Subject: [PATCH 2423/5331] * Test whether clients release their locks when
 they reboot.

svn path=/nixos/branches/boot-order/; revision=22199
---
 tests/nfs.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/tests/nfs.nix b/tests/nfs.nix
index 367a5bf3ab3..4a0ffe9a0d6 100644
--- a/tests/nfs.nix
+++ b/tests/nfs.nix
@@ -58,6 +58,12 @@ in
       $client1->succeed("flock -x /data/lock -c 'touch locked; sleep 100000' &");
       $client1->waitForFile("locked");
       $client2->fail("flock -n -s /data/lock true");
+
+      # Test whether client 2 obtains the lock if we reset client 1.
+      $client2->succeed("flock -s /data/lock -c 'echo acquired; touch locked' >&2 &");
+      $client1->crash;
+      $client1->start;
+      $client2->waitForFile("locked");
     '';
 
 }
-- 
GitLab


From 483c322a6235e358563ce3db9057bb840cf85fd7 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 9 Jun 2010 13:46:52 +0000
Subject: [PATCH 2424/5331] * mustFail -> fail. * Added a function to crash a
 VM.

svn path=/nixos/branches/boot-order/; revision=22200
---
 lib/test-driver/Machine.pm | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/lib/test-driver/Machine.pm b/lib/test-driver/Machine.pm
index 5ff7bf6cea1..e0792ac928d 100644
--- a/lib/test-driver/Machine.pm
+++ b/lib/test-driver/Machine.pm
@@ -294,7 +294,7 @@ sub waitUntilFails {
 }
 
 
-sub mustFail {
+sub fail {
     my ($self, $command) = @_;
     my ($status, $out) = $self->execute($command);
     die "command `$command' unexpectedly succeeded"
@@ -302,6 +302,11 @@ sub mustFail {
 }
 
 
+sub mustFail {
+    fail @_;
+}
+
+
 # Wait for an Upstart job to reach the "running" state.
 sub waitForJob {
     my ($self, $jobName) = @_;
@@ -360,6 +365,16 @@ sub shutdown {
 }
 
 
+sub crash {
+    my ($self) = @_;
+    return unless $self->{booted};
+
+    $self->sendMonitorCommand("quit");
+
+    $self->waitForShutdown;
+}
+
+
 # Make the machine unreachable by shutting down eth1 (the multicast
 # interface used to talk to the other VMs).  We keep eth0 up so that
 # the test driver can continue to talk to the machine.
-- 
GitLab


From e519b0652a0fd17a9aca6240ef017f10e23cc27e Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 9 Jun 2010 15:11:46 +0000
Subject: [PATCH 2425/5331] * Test whether locks survive a reboot of the
 server.

svn path=/nixos/branches/boot-order/; revision=22201
---
 tests/nfs.nix | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/tests/nfs.nix b/tests/nfs.nix
index 4a0ffe9a0d6..1e021eb10c1 100644
--- a/tests/nfs.nix
+++ b/tests/nfs.nix
@@ -51,7 +51,7 @@ in
       # Test whether we can get a lock.  !!! This step takes about 90
       # seconds because the NFS server waits that long after booting
       # before accepting new locks.
-      $client2->succeed("time flock -n -s /data/lock true >&2");
+      $client2->succeed("time flock -n -s /data/lock true");
       
       # Test locking: client 1 acquires an exclusive lock, so client 2
       # should then fail to acquire a shared lock.
@@ -60,10 +60,17 @@ in
       $client2->fail("flock -n -s /data/lock true");
 
       # Test whether client 2 obtains the lock if we reset client 1.
-      $client2->succeed("flock -s /data/lock -c 'echo acquired; touch locked' >&2 &");
+      $client2->succeed("flock -x /data/lock -c 'echo acquired; touch locked; sleep 100000' >&2 &");
       $client1->crash;
       $client1->start;
       $client2->waitForFile("locked");
+
+      # Test whether locks survive a reboot of the server.
+      $client1->waitForJob("tty1"); # depends on filesystems
+      $server->shutdown;
+      $server->start;
+      $client1->succeed("touch /data/xyzzy");
+      $client1->fail("time flock -n -s /data/lock true");
     '';
 
 }
-- 
GitLab


From a5c433696cabd9e1f75e03b1de2df4de8b51acf2 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 9 Jun 2010 22:29:06 +0000
Subject: [PATCH 2426/5331] * Put all of /var/run (not just /var/run/nscd) on a
 tmpfs to simplify   shutdown.  (Portmap and statd are needed during shutdown
 to unmount   NFS volumes but have open files in /var/run.) * In the shutdown
 job, don't kill PIDs belonging to Upstart jobs that   are still running.  If
 they don't stop on the "starting shutdown"   event, then they're needed
 during shutdown (such as portmap and   statd). * NFS test: test whether the
 shutdown quickly unmounts NFS volumes   (i.e. whether portmap and statd are
 still running).

svn path=/nixos/branches/boot-order/; revision=22204
---
 .../services/network-filesystems/nfs-kernel.nix |  2 +-
 modules/services/networking/portmap.nix         |  1 +
 modules/system/activation/activation-script.nix | 11 -----------
 modules/system/boot/stage-2-init.sh             | 10 ++++++++++
 modules/system/upstart-events/shutdown.nix      | 17 +++++++++++------
 tests/nfs.nix                                   |  8 ++++++++
 6 files changed, 31 insertions(+), 18 deletions(-)

diff --git a/modules/services/network-filesystems/nfs-kernel.nix b/modules/services/network-filesystems/nfs-kernel.nix
index c3974881f0a..e9c42237e0d 100644
--- a/modules/services/network-filesystems/nfs-kernel.nix
+++ b/modules/services/network-filesystems/nfs-kernel.nix
@@ -162,7 +162,7 @@ in
             description = "Kernel NFS server - Network Status Monitor";
 
             startOn = "${if cfg.server.enable then "starting nfs-kernel-nfsd and " else ""} started portmap";
-            stopOn = if cfg.server.enable then "stopped nfs-kernel-nfsd" else "starting shutdown";
+            stopOn = "never";
 
             preStart =
               ''	
diff --git a/modules/services/networking/portmap.nix b/modules/services/networking/portmap.nix
index eead1c52ff0..9c0d559f867 100644
--- a/modules/services/networking/portmap.nix
+++ b/modules/services/networking/portmap.nix
@@ -67,6 +67,7 @@ in
       { description = "ONC RPC portmap";
 
         startOn = "started network-interfaces";
+        stopOn = "never";
 
         daemonType = "fork";
 
diff --git a/modules/system/activation/activation-script.nix b/modules/system/activation/activation-script.nix
index 5327740c631..637f2503466 100644
--- a/modules/system/activation/activation-script.nix
+++ b/modules/system/activation/activation-script.nix
@@ -75,7 +75,6 @@ let
 
     var = fullDepEntry ''
       # Various log/runtime directories.
-      mkdir -m 0755 -p /var/run
 
       touch /var/run/utmp # must exist
       chgrp ${toString config.ids.gids.utmp} /var/run/utmp
@@ -84,16 +83,6 @@ let
       mkdir -m 0755 -p /var/run/nix/current-load # for distributed builds
       mkdir -m 0700 -p /var/run/nix/remote-stores
 
-      # Use a tmpfs for /var/run/nscd to ensure that / or /var can be
-      # unmounted or at least remounted read-only during shutdown.
-      # (Upstart 0.6 apparently uses nscd to do some name lookups,
-      # resulting in it holding some mmap mapping to deleted files in
-      # /var/run/nscd.)
-      if [ ! -e /var/run/nscd ]; then
-          mkdir -p /var/run/nscd
-          ${pkgs.utillinux}/bin/mount -t tmpfs -o "mode=755" none /var/run/nscd
-      fi
-
       mkdir -m 0755 -p /var/log
       mkdir -m 0755 -p /var/log/upstart
 
diff --git a/modules/system/boot/stage-2-init.sh b/modules/system/boot/stage-2-init.sh
index 69c67de6e3a..201c539bb6b 100644
--- a/modules/system/boot/stage-2-init.sh
+++ b/modules/system/boot/stage-2-init.sh
@@ -109,6 +109,16 @@ rm -rf /var/log/upstart
 rm -rf /nix/var/nix/chroots # recreated in activate-configuration.sh
 
 
+# Use a tmpfs for /var/run to ensure that / or /var can be unmounted
+# or at least remounted read-only during shutdown.  (Upstart 0.6
+# apparently uses nscd to do some name lookups, resulting in it
+# holding some mmap mapping to deleted files in /var/run/nscd.
+# Similarly, portmap and statd have open files in /var/run and are
+# needed during shutdown to unmount NFS volumes.)
+mkdir -m 0755 -p /var/run
+mount -t tmpfs -o "mode=755" none /var/run
+
+
 # Clear the resume device.
 if test -n "$resumeDevice"; then
     mkswap "$resumeDevice" || echo 'Failed to clear saved image.'
diff --git a/modules/system/upstart-events/shutdown.nix b/modules/system/upstart-events/shutdown.nix
index 2aad17cd1ac..1b2b63cd9c0 100644
--- a/modules/system/upstart-events/shutdown.nix
+++ b/modules/system/upstart-events/shutdown.nix
@@ -37,14 +37,19 @@ with pkgs.lib;
           sync
 
 
-          # Kill all remaining processes except init and this one.
+          # Kill all remaining processes except init, this one and any
+          # Upstart jobs that don't stop on the "starting shutdown"
+          # event, as these are necessary to complete the shutdown.
+          omittedPids=$(initctl list | sed -e 's/.*process \([0-9]\+\)/-o \1/;t;d')
+          #echo "saved PIDs: $omittedPids"
+          
           echo "sending the TERM signal to all processes..."
-          kill -TERM -1
+          ${pkgs.sysvtools}/bin/killall5 -15 $job $omittedPids
       
           sleep 1 # wait briefly
 
           echo "sending the KILL signal to all processes..."
-          kill -KILL -1
+          ${pkgs.sysvtools}/bin/killall5 -9 $job $omittedPids
 
 
           # If maintenance mode is requested, start a root shell, and
@@ -71,8 +76,8 @@ with pkgs.lib;
 
           # Stop all swap devices.
           swapoff -a
-      
-      
+
+
           # Unmount file systems.  We repeat this until no more file systems
           # can be unmounted.  This is to handle loopback devices, file
           # systems  mounted on other file systems and so on.
@@ -84,7 +89,7 @@ with pkgs.lib;
               cp /proc/mounts /dev/.mounts # don't read /proc/mounts while it's changing
               exec 4< /dev/.mounts
               while read -u 4 device mp fstype options rest; do
-                  if [ "$mp" = /proc -o "$mp" = /sys -o "$mp" = /dev -o "$device" = "rootfs" -o "$mp" = /var/run/nscd ]; then continue; fi
+                  if [ "$mp" = /proc -o "$mp" = /sys -o "$mp" = /dev -o "$device" = "rootfs" -o "$mp" = /var/run ]; then continue; fi
               
                   echo "unmounting $mp..."
 
diff --git a/tests/nfs.nix b/tests/nfs.nix
index 1e021eb10c1..f8d1cf951f3 100644
--- a/tests/nfs.nix
+++ b/tests/nfs.nix
@@ -71,6 +71,14 @@ in
       $server->start;
       $client1->succeed("touch /data/xyzzy");
       $client1->fail("time flock -n -s /data/lock true");
+
+      # Test whether unmounting during shutdown happens quickly.  This
+      # requires portmap and statd to keep running during the
+      # shutdown.
+      my $t1 = time;
+      $client1->shutdown;
+      my $duration = time - $t1;
+      die "shutdown took too long ($duration seconds)" if $duration > 30;
     '';
 
 }
-- 
GitLab


From b25771532af934ea18589f237cfa57da2430fea4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Fri, 11 Jun 2010 21:44:06 +0000
Subject: [PATCH 2427/5331] Fixing the postfix start/stop (through an upstart
 job script code that will monitor the life of postfix)

Adding an assert to upstart jobs, so those with preStop will always need an exec or
script, otherwise the preStop will not be run.


svn path=/nixos/trunk/; revision=22225
---
 modules/services/mail/postfix.nix  | 10 +++++++++-
 modules/system/upstart/upstart.nix |  7 +++++--
 2 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/modules/services/mail/postfix.nix b/modules/services/mail/postfix.nix
index 939260632c9..03c77885d06 100644
--- a/modules/services/mail/postfix.nix
+++ b/modules/services/mail/postfix.nix
@@ -287,7 +287,15 @@ in
 
         daemonType = "none";
 
-        respawn = false;
+        respawn = true;
+
+        script = ''
+          while ${pkgs.procps}/bin/ps `${pkgs.coreutils}/bin/cat /var/postfix/queue/pid/master.pid` |
+            grep -q postfix
+          do
+            ${pkgs.coreutils}/bin/sleep 1m
+          done
+        '';
 
         preStart =
           ''
diff --git a/modules/system/upstart/upstart.nix b/modules/system/upstart/upstart.nix
index 3110f376eec..cb3975e694c 100644
--- a/modules/system/upstart/upstart.nix
+++ b/modules/system/upstart/upstart.nix
@@ -21,6 +21,7 @@ let
   makeJob = job:
 
     let
+      hasMain = job.script != "" || job.exec != "";
 
       jobText =
         let log = "/var/log/upstart/${job.name}"; in
@@ -77,12 +78,14 @@ let
           ${optionalString job.task "task"}
           ${optionalString (!job.task && job.respawn) "respawn"}
 
-          ${optionalString (job.preStop != "") ''
+          ${ # preStop is run only if there is exec or script.
+             # (upstart 0.6.5, job.c:562)
+            optionalString (job.preStop != "") (assert hasMain; ''
             pre-stop script
               exec >> ${log} 2>&1
               ${job.preStop}
             end script
-          ''}
+          '')}
 
           ${optionalString (job.postStop != "") ''
             post-stop script
-- 
GitLab


From b1b73f3c0813c67efb39ee7e955c1481567a09b6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Sat, 12 Jun 2010 08:44:51 +0000
Subject: [PATCH 2428/5331] Noting the booted-system as a gcroot

svn path=/nixos/trunk/; revision=22228
---
 modules/system/boot/stage-2-init.sh | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/modules/system/boot/stage-2-init.sh b/modules/system/boot/stage-2-init.sh
index de9b136d02a..3047a210506 100644
--- a/modules/system/boot/stage-2-init.sh
+++ b/modules/system/boot/stage-2-init.sh
@@ -121,9 +121,15 @@ echo "running activation script..."
 @activateConfiguration@ "$systemConfig"
 
 
-# Record the boot configuration.  !!! Should this be a GC root?
+# Record the boot configuration.
 if test -n "$systemConfig"; then
     ln -sfn "$systemConfig" /var/run/booted-system
+
+    # Prevent the booted system form being garbage-collected
+    # If it weren't a gcroot, if we were running a different kernel,
+    # switched system, and garbage collected all, we could not load
+    # kernel modules anymore.
+    ln -sfn /var/run/booted-system /nix/var/nix/gcroots/booted-system
 fi
 
 
-- 
GitLab


From 03f77ca82bb792abc77f7b8f968122e5cadf2f81 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sun, 13 Jun 2010 20:59:49 +0000
Subject: [PATCH 2429/5331] * PostgreSQL / MySQL: depend on the "filesystem"
 event.

svn path=/nixos/branches/boot-order/; revision=22247
---
 modules/services/databases/mysql.nix      |  2 +-
 modules/services/databases/postgresql.nix | 11 ++++-------
 2 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/modules/services/databases/mysql.nix b/modules/services/databases/mysql.nix
index 19c0bcc418a..9c97a15d751 100644
--- a/modules/services/databases/mysql.nix
+++ b/modules/services/databases/mysql.nix
@@ -100,7 +100,7 @@ in
     jobs.mysql =
       { description = "MySQL server";
 
-        startOn = "started network-interfaces";
+        startOn = "filesystem";
 
         preStart =
           ''
diff --git a/modules/services/databases/postgresql.nix b/modules/services/databases/postgresql.nix
index ae6ac463dad..38d2568613e 100644
--- a/modules/services/databases/postgresql.nix
+++ b/modules/services/databases/postgresql.nix
@@ -28,9 +28,6 @@ let
 
   postgresql = postgresqlAndPlugins pkgs.postgresql;
 
-  startDependency = if config.services.gw6c.enable then 
-    "gw6c" else "network-interfaces";
-
   run = "${pkgs.su}/bin/su -s ${pkgs.stdenv.shell} postgres";
 
   flags = optional cfg.enableTCPIP "-i";
@@ -120,10 +117,10 @@ in
         default = [];
         example = "pkgs.postgis"; # of course don't use a string here!
         description = ''
-          When this list contains elemnts a new store path is created.
-          Postgresql and the elments are symlinked into it. Then pg_config,
+          When this list contains elements a new store path is created.
+          PostgreSQL and the elments are symlinked into it. Then pg_config,
           postgres and pc_ctl are copied to make them use the new
-          $out/lib directory as pkglibdir. This make it possible to use postgis
+          $out/lib directory as pkglibdir. This makes it possible to use postgis
           without patching the .sql files which reference $libdir/postgis-1.5.
         '';
         # Note: the duplication of executables is about 4MB size.
@@ -160,7 +157,7 @@ in
     jobs.postgresql =
       { description = "PostgreSQL server";
 
-        startOn = "started ${startDependency}";
+        startOn = "filesystem";
 
         environment =
           { TZ = config.time.timeZone;
-- 
GitLab


From e2dbfbdcf49380f3b972b65a64032c0e3b135373 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sun, 13 Jun 2010 23:36:55 +0000
Subject: [PATCH 2430/5331] =?UTF-8?q?*=20Use=20writeback=20caching=20for?=
 =?UTF-8?q?=20virtual=20disks=20instead=20of=20writethrough=20=20=20cachin?=
 =?UTF-8?q?g.=20=20This=20makes=20a=20huge=20performance=20difference=20(e?=
 =?UTF-8?q?.g.=20from=204=20MB/s=20=20=20`dd'=20throughput=20to=20140=20MB?=
 =?UTF-8?q?/s=20on=20the=20Hydra=20machines).=20=20As=20the=20QEMU=20=20?=
 =?UTF-8?q?=20manual=20says:=20"Some=20block=20drivers=20perform=20badly?=
 =?UTF-8?q?=20with=20=20=20=E2=80=98cache=3Dwritethrough=E2=80=99,=20most?=
 =?UTF-8?q?=20notably,=20qcow2."?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

svn path=/nixos/branches/boot-order/; revision=22248
---
 modules/virtualisation/qemu-vm.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/virtualisation/qemu-vm.nix b/modules/virtualisation/qemu-vm.nix
index 6f8deebc69a..1cae5fef7c8 100644
--- a/modules/virtualisation/qemu-vm.nix
+++ b/modules/virtualisation/qemu-vm.nix
@@ -128,7 +128,7 @@ let
           -m ${toString config.virtualisation.memorySize} \
           -no-kvm-irqchip \
           -net nic,vlan=0,model=virtio -net user,vlan=0 -smb / \
-          -drive file=$NIX_DISK_IMAGE,if=virtio,boot=on,werror=report \
+          -drive file=$NIX_DISK_IMAGE,if=virtio,boot=on,cache=writeback,werror=report \
           -kernel ${config.system.build.toplevel}/kernel \
           -initrd ${config.system.build.toplevel}/initrd \
           ${qemuGraphics} \
-- 
GitLab


From 46ac1375a74112ee842fc208733b26d0541f2e28 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 15 Jun 2010 16:15:17 +0000
Subject: [PATCH 2431/5331] * Don't use -smb and -no-kvm-irqchip.  Maybe this
 makes VM builds more   reliable.

svn path=/nixos/branches/boot-order/; revision=22280
---
 lib/test-driver/Machine.pm         |  1 +
 modules/virtualisation/qemu-vm.nix | 25 ++++++++++++++++---------
 2 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/lib/test-driver/Machine.pm b/lib/test-driver/Machine.pm
index e0792ac928d..c7da5b1ecad 100644
--- a/lib/test-driver/Machine.pm
+++ b/lib/test-driver/Machine.pm
@@ -113,6 +113,7 @@ sub start {
         dup2(fileno($serialC), fileno(STDOUT));
         dup2(fileno($serialC), fileno(STDERR));
         $ENV{TMPDIR} = $self->{stateDir};
+        $ENV{USE_TMPDIR} = 1;
         $ENV{QEMU_OPTS} = "-nographic -no-reboot -redir tcp:65535::514 -monitor unix:./monitor";
         $ENV{QEMU_KERNEL_PARAMS} = "hostTmpDir=$ENV{TMPDIR}";
         chdir $self->{stateDir} or die;
diff --git a/modules/virtualisation/qemu-vm.nix b/modules/virtualisation/qemu-vm.nix
index 1cae5fef7c8..46462bbc6cc 100644
--- a/modules/virtualisation/qemu-vm.nix
+++ b/modules/virtualisation/qemu-vm.nix
@@ -113,21 +113,28 @@ let
     ''
       #! ${pkgs.stdenv.shell}
       
-      export PATH=${pkgs.samba}/sbin:$PATH
-
-      NIX_DISK_IMAGE=''${NIX_DISK_IMAGE:-${config.virtualisation.diskImage}}
+      NIX_DISK_IMAGE=$(readlink -f ''${NIX_DISK_IMAGE:-${config.virtualisation.diskImage}})
 
       if ! test -e "$NIX_DISK_IMAGE"; then
-          ${pkgs.qemu_kvm}/bin/qemu-img create -f qcow2 "$NIX_DISK_IMAGE" ${toString config.virtualisation.diskSize}M || exit 1
+          ${pkgs.qemu_kvm}/bin/qemu-img create -f qcow2 "$NIX_DISK_IMAGE" \
+            ${toString config.virtualisation.diskSize}M || exit 1
       fi
-      
-      # -no-kvm-irqchip is needed to prevent the CIFS mount from
-      # hanging the VM on x86_64.
+
+      # Start Samba (which wants to put its socket and config files in TMPDIR).
+      if [ -z "$TMPDIR" -o -z "$USE_TMPDIR" ]; then
+          TMPDIR=$(mktemp -d nix-vm-smbd.XXXXXXXXXX --tmpdir)
+      fi
+      cd $TMPDIR
+
+      ${pkgs.vmTools.startSamba}
+
+      # Start QEMU.
       exec ${pkgs.qemu_kvm}/bin/qemu-system-x86_64 \
           -name ${vmName} \
           -m ${toString config.virtualisation.memorySize} \
-          -no-kvm-irqchip \
-          -net nic,vlan=0,model=virtio -net user,vlan=0 -smb / \
+          -net nic,vlan=0,model=virtio \
+          -chardev socket,id=samba,path=./samba \
+          -net user,vlan=0,guestfwd=tcp:10.0.2.4:139-chardev:samba \
           -drive file=$NIX_DISK_IMAGE,if=virtio,boot=on,cache=writeback,werror=report \
           -kernel ${config.system.build.toplevel}/kernel \
           -initrd ${config.system.build.toplevel}/initrd \
-- 
GitLab


From eab5aff8d0e1978675defa6d6c3fbb1f5876f994 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 15 Jun 2010 18:00:56 +0000
Subject: [PATCH 2432/5331] * Drop the -no-kvm-irqchip flag here as well.

svn path=/nixos/branches/boot-order/; revision=22281
---
 lib/test-driver/Machine.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/test-driver/Machine.pm b/lib/test-driver/Machine.pm
index c7da5b1ecad..77ff1734247 100644
--- a/lib/test-driver/Machine.pm
+++ b/lib/test-driver/Machine.pm
@@ -28,7 +28,7 @@ sub new {
     if (!$startCommand) {
         # !!! merge with qemu-vm.nix.
         $startCommand =
-            "qemu-system-x86_64 -m 384 -no-kvm-irqchip " .
+            "qemu-system-x86_64 -m 384 " .
             "-net nic,model=virtio -net user \$QEMU_OPTS ";
         $startCommand .= "-drive file=" . Cwd::abs_path($args->{hda}) . ",if=virtio,boot=on,werror=report "
             if defined $args->{hda};
-- 
GitLab


From d0fd8da8f0df124680fef1d3a0d049e9d25abd5a Mon Sep 17 00:00:00 2001
From: Marc Weber <marco-oweber@gmx.de>
Date: Tue, 15 Jun 2010 19:04:06 +0000
Subject: [PATCH 2433/5331] example how to pass options to nix-daemon

svn path=/nixos/trunk/; revision=22286
---
 modules/services/misc/nix-daemon.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/modules/services/misc/nix-daemon.nix b/modules/services/misc/nix-daemon.nix
index a9a0bc70f1e..fcdcc8fb299 100644
--- a/modules/services/misc/nix-daemon.nix
+++ b/modules/services/misc/nix-daemon.nix
@@ -162,6 +162,10 @@ in
         internal = true;
         default = "";
         merge = mergeStringOption;
+        example = ''
+          export NIX_TARGET_LOAD=$(( 3 * $(${pkgs.coreutils}/bin/nproc) / 2 ))
+          export NIX_MAX_PARALLELIZATION=$NIX_TARGET_LOAD
+        '';
         description = "
           Environment variables used by Nix.
         ";
-- 
GitLab


From fbb3046a87b059647359cc91c101c3bc7e52ffeb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Wed, 16 Jun 2010 13:58:15 +0000
Subject: [PATCH 2434/5331] Making the grub menu builder take a better path at
 distinguishing if / and /boot are different fs. I chose %D over %d because I
 like hex more.

svn path=/nixos/trunk/; revision=22294
---
 modules/installer/grub/grub-menu-builder.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/installer/grub/grub-menu-builder.sh b/modules/installer/grub/grub-menu-builder.sh
index cf2041002e7..323ff43e85d 100644
--- a/modules/installer/grub/grub-menu-builder.sh
+++ b/modules/installer/grub/grub-menu-builder.sh
@@ -30,7 +30,7 @@ esac
 # the GRUB config file must be relative to the root of the /boot
 # filesystem.  `$bootRoot' is the path to be prepended to paths under
 # /boot.
-if [ "$(stat -f -c '%i' /)" = "$(stat -f -c '%i' /boot)" ]; then
+if [ "$(stat -f -c '%D' /)" = "$(stat -f -c '%D' /boot)" ]; then
     bootRoot=/boot
     copyKernels="@copyKernels@" # user can override in the NixOS config
 else
-- 
GitLab


From f69d7b1768396ecdf8bd0b952a3aa16fb94f8954 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Wed, 16 Jun 2010 15:17:02 +0000
Subject: [PATCH 2435/5331] Fixing my previous bad commit on stat. Thank you
 David!

svn path=/nixos/trunk/; revision=22297
---
 modules/installer/grub/grub-menu-builder.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/installer/grub/grub-menu-builder.sh b/modules/installer/grub/grub-menu-builder.sh
index 323ff43e85d..90bedf9543d 100644
--- a/modules/installer/grub/grub-menu-builder.sh
+++ b/modules/installer/grub/grub-menu-builder.sh
@@ -30,7 +30,7 @@ esac
 # the GRUB config file must be relative to the root of the /boot
 # filesystem.  `$bootRoot' is the path to be prepended to paths under
 # /boot.
-if [ "$(stat -f -c '%D' /)" = "$(stat -f -c '%D' /boot)" ]; then
+if [ "$(stat -c '%D' /.)" = "$(stat -c '%D' /boot/.)" ]; then
     bootRoot=/boot
     copyKernels="@copyKernels@" # user can override in the NixOS config
 else
-- 
GitLab


From 69c71754041d0a4eaf807d1a1f33ea6852e04cd2 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 16 Jun 2010 22:16:43 +0000
Subject: [PATCH 2436/5331] * During shutdown, don't unmount mount points that
 don't exist (in the   current namespace).  This prevents warnings about the
 aufs/tmpfs   mounts from the initrd used by the installation CD.

svn path=/nixos/branches/boot-order/; revision=22299
---
 modules/system/upstart-events/shutdown.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/modules/system/upstart-events/shutdown.nix b/modules/system/upstart-events/shutdown.nix
index 1b2b63cd9c0..b7a004724be 100644
--- a/modules/system/upstart-events/shutdown.nix
+++ b/modules/system/upstart-events/shutdown.nix
@@ -89,7 +89,10 @@ with pkgs.lib;
               cp /proc/mounts /dev/.mounts # don't read /proc/mounts while it's changing
               exec 4< /dev/.mounts
               while read -u 4 device mp fstype options rest; do
-                  if [ "$mp" = /proc -o "$mp" = /sys -o "$mp" = /dev -o "$device" = "rootfs" -o "$mp" = /var/run ]; then continue; fi
+                  # Skip various special filesystems.  Non-existent
+                  # mount points are typically tmpfs/aufs mounts from
+                  # the initrd.
+                  if [ "$mp" = /proc -o "$mp" = /sys -o "$mp" = /dev -o "$device" = "rootfs" -o "$mp" = /var/run -o ! -e "$mp" ]; then continue; fi
               
                   echo "unmounting $mp..."
 
-- 
GitLab


From a65b5ec81c699b21fc635ce909332dcda4346027 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 16 Jun 2010 22:18:26 +0000
Subject: [PATCH 2437/5331] * Added an option boot.loader.grub.extraConfig to
 add commands to   grub.cfg before the menu entries.  (This could also be done
 using   `extraEntriesBeforeNixOS', but then you can't have entries *after*  
 the main entry anymore.) * In the installer test, redirect GRUB output to the
 serial port.

svn path=/nixos/branches/boot-order/; revision=22300
---
 modules/installer/grub/grub-menu-builder.sh |  4 ++++
 modules/installer/grub/grub.nix             | 12 +++++++++++-
 tests/installer.nix                         |  1 +
 3 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/modules/installer/grub/grub-menu-builder.sh b/modules/installer/grub/grub-menu-builder.sh
index cf2041002e7..ecb69ceb263 100644
--- a/modules/installer/grub/grub-menu-builder.sh
+++ b/modules/installer/grub/grub-menu-builder.sh
@@ -216,6 +216,10 @@ extraEntries=`cat <<EOF
 EOF`
 
 
+cat >> $tmp <<EOF
+@extraConfig@
+EOF
+
 if test -n "@extraEntriesBeforeNixOS@"; then 
     echo "$extraEntries" >> $tmp
 fi
diff --git a/modules/installer/grub/grub.nix b/modules/installer/grub/grub.nix
index 4217e0d481c..40c2ca60675 100644
--- a/modules/installer/grub/grub.nix
+++ b/modules/installer/grub/grub.nix
@@ -12,7 +12,8 @@ let
     inherit grub;
     inherit (pkgs) bash;
     path = [pkgs.coreutils pkgs.gnused pkgs.gnugrep];
-    inherit (config.boot.loader.grub) copyKernels extraEntries extraEntriesBeforeNixOS
+    inherit (config.boot.loader.grub) copyKernels
+      extraConfig extraEntries extraEntriesBeforeNixOS
       splashImage configurationLimit version default timeout;
   };
   
@@ -67,6 +68,15 @@ in
         '';
       };
 
+      extraConfig = mkOption {
+        default = "";
+        example = "serial; terminal_output.serial";
+        description = ''
+          Additional GRUB commands inserted in the configuration file
+          just before the menu entries.
+        '';
+      };
+
       extraEntries = mkOption {
         default = "";
         example = ''
diff --git a/tests/installer.nix b/tests/installer.nix
index a15b5587511..1f9ada808b2 100644
--- a/tests/installer.nix
+++ b/tests/installer.nix
@@ -40,6 +40,7 @@ let
 
         boot.loader.grub.version = 2;
         boot.loader.grub.device = "/dev/vda";
+        boot.loader.grub.extraConfig = "serial; terminal_output.serial";
         boot.initrd.kernelModules = [ "ext3" ];
       
         fileSystems = [ ${fileSystems} ];
-- 
GitLab


From ac22e5369fae1632b33ce86e53bf6f1f602c30dd Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 18 Jun 2010 13:21:01 +0000
Subject: [PATCH 2438/5331] * Prevent tests from accessing the host's network
 accidentally.  For   instance, `nixos-rebuild' in the installer test does a
 `nix-pull'   from nixos.org.

svn path=/nixos/branches/boot-order/; revision=22325
---
 modules/testing/test-instrumentation.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/modules/testing/test-instrumentation.nix b/modules/testing/test-instrumentation.nix
index 5e62c698f27..dd61e68d9d1 100644
--- a/modules/testing/test-instrumentation.nix
+++ b/modules/testing/test-instrumentation.nix
@@ -80,6 +80,10 @@ in
     # serial port).
     services.syslogd.extraConfig = "*.*,kern.none /dev/ttyS0";
 
+    # Prevent tests from accessing the Internet.
+    networking.defaultGateway = mkOverride 50 {} "";
+    networking.nameservers = mkOverride 50 {} [ ];
+
   };
 
 }
-- 
GitLab


From cf7e902283af830b3221da8b853753ab1ebbd1e5 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 18 Jun 2010 15:30:36 +0000
Subject: [PATCH 2439/5331] * Intercept SIGCHLD to prevent accept() from
 waiting forever if QEMU   dies before connecting to the monitor.

svn path=/nixos/branches/boot-order/; revision=22328
---
 lib/test-driver/Machine.pm | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/lib/test-driver/Machine.pm b/lib/test-driver/Machine.pm
index 77ff1734247..b5989d54076 100644
--- a/lib/test-driver/Machine.pm
+++ b/lib/test-driver/Machine.pm
@@ -121,10 +121,6 @@ sub start {
         die;
     }
 
-    # Wait until QEMU connects to the monitor.
-    accept($self->{monitor}, $monitorS) or die;
-    $self->waitForMonitorPrompt;
-
     # Process serial line output.
     close $serialC;
 
@@ -132,9 +128,9 @@ sub start {
 
     sub processSerialOutput {
         my ($self, $serialP) = @_;
-        $/ = "\r\n";
         while (<$serialP>) {
             chomp;
+            s/\r$//;
             print STDERR $self->name, "# $_\n";
             $self->{connectedQueue}->enqueue(1) if $_ eq "===UP===";
         }
@@ -142,7 +138,17 @@ sub start {
         $self->{connectedQueue}->enqueue(1);
     }
 
-    $self->log("vm running as pid $pid");
+    # Wait until QEMU connects to the monitor.
+    eval {
+        local $SIG{CHLD} = sub { die "QEMU died prematurely\n"; };
+        accept($self->{monitor}, $monitorS) or die;
+    };
+    die "$@" if $@;
+    
+    $self->waitForMonitorPrompt;
+
+    $self->log("QEMU running (pid $pid)");
+    
     $self->{pid} = $pid;
     $self->{booted} = 1;
 }
-- 
GitLab


From 200a8b9a56ec3bf84cc6e023fcc1e1e98f2905cc Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 18 Jun 2010 18:53:13 +0000
Subject: [PATCH 2440/5331] * Change the priority to make the NAT and
 Bittorrent tests work.

svn path=/nixos/branches/boot-order/; revision=22329
---
 modules/testing/test-instrumentation.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/testing/test-instrumentation.nix b/modules/testing/test-instrumentation.nix
index dd61e68d9d1..84671028ba0 100644
--- a/modules/testing/test-instrumentation.nix
+++ b/modules/testing/test-instrumentation.nix
@@ -81,8 +81,8 @@ in
     services.syslogd.extraConfig = "*.*,kern.none /dev/ttyS0";
 
     # Prevent tests from accessing the Internet.
-    networking.defaultGateway = mkOverride 50 {} "";
-    networking.nameservers = mkOverride 50 {} [ ];
+    networking.defaultGateway = mkOverride 200 {} "";
+    networking.nameservers = mkOverride 200 {} [ ];
 
   };
 
-- 
GitLab


From 7eb7e8d732df6cab760f5c78d7230dcb876be824 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 18 Jun 2010 19:14:33 +0000
Subject: [PATCH 2441/5331] * Enable some tests.

svn path=/nixos/branches/boot-order/; revision=22330
---
 release.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/release.nix b/release.nix
index 10f9362ec87..1b013b9db36 100644
--- a/release.nix
+++ b/release.nix
@@ -156,6 +156,8 @@ let
         installer.swraid = t.installer.swraid.test;
         kde4 = t.kde4.test;
         login = t.login.test;
+        nat = t.nat.test;
+        nfs = t.nfs.test;
         openssh = t.openssh.test;
         proxy = t.proxy.test;
         quake3 = t.quake3.test;
-- 
GitLab


From 363806e89ba1e638b0459a2eb8b30bad8189d370 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 18 Jun 2010 19:31:02 +0000
Subject: [PATCH 2442/5331] * To establish the connection to the root shell in
 the guest, let the   guest connect to a Unix domain socket on the host rather
 than the   other way around.  The former is a QEMU feature (guestfwd to a  
 socket) while the latter requires a patch (which we can now get rid   of).

svn path=/nixos/branches/boot-order/; revision=22331
---
 lib/test-driver/Machine.pm               | 50 +++++++++++-------------
 lib/test-driver/test-driver.pl           |  3 --
 modules/testing/test-instrumentation.nix | 10 ++---
 modules/virtualisation/qemu-vm.nix       |  2 +-
 4 files changed, 26 insertions(+), 39 deletions(-)

diff --git a/lib/test-driver/Machine.pm b/lib/test-driver/Machine.pm
index b5989d54076..c18e0e33162 100644
--- a/lib/test-driver/Machine.pm
+++ b/lib/test-driver/Machine.pm
@@ -2,7 +2,6 @@ package Machine;
 
 use strict;
 use threads;
-use Thread::Queue;
 use Socket;
 use IO::Handle;
 use POSIX qw(dup2);
@@ -51,7 +50,6 @@ sub new {
         booted => 0,
         pid => 0,
         connected => 0,
-        connectedQueue => Thread::Queue->new(),
         socket => undef,
         stateDir => "$tmpDir/$name",
         monitor => undef,
@@ -101,6 +99,14 @@ sub start {
     bind($monitorS, sockaddr_un($monitorPath)) or die "cannot bind monitor socket: $!";
     listen($monitorS, 1) or die;
 
+    # Create a Unix domain socket to which the root shell in the guest will connect.
+    my $shellPath = $self->{stateDir} . "/shell";
+    unlink $shellPath;
+    my $shellS;
+    socket($shellS, PF_UNIX, SOCK_STREAM, 0) or die;
+    bind($shellS, sockaddr_un($shellPath)) or die "cannot bind shell socket: $!";
+    listen($shellS, 1) or die;
+
     # Start the VM.
     my $pid = fork();
     die if $pid == -1;
@@ -108,13 +114,15 @@ sub start {
     if ($pid == 0) {
         close $serialP;
         close $monitorS;
+        close $shellS;
         open NUL, "</dev/null" or die;
         dup2(fileno(NUL), fileno(STDIN));
         dup2(fileno($serialC), fileno(STDOUT));
         dup2(fileno($serialC), fileno(STDERR));
         $ENV{TMPDIR} = $self->{stateDir};
         $ENV{USE_TMPDIR} = 1;
-        $ENV{QEMU_OPTS} = "-nographic -no-reboot -redir tcp:65535::514 -monitor unix:./monitor";
+        $ENV{QEMU_OPTS} = "-nographic -no-reboot -monitor unix:./monitor -chardev socket,id=shell,path=./shell";
+        $ENV{QEMU_NET_OPTS} = "guestfwd=tcp:10.0.2.6:23-chardev:shell";
         $ENV{QEMU_KERNEL_PARAMS} = "hostTmpDir=$ENV{TMPDIR}";
         chdir $self->{stateDir} or die;
         exec $self->{startCommand};
@@ -132,16 +140,20 @@ sub start {
             chomp;
             s/\r$//;
             print STDERR $self->name, "# $_\n";
-            $self->{connectedQueue}->enqueue(1) if $_ eq "===UP===";
         }
-        # If the child dies, wake up connect().
-        $self->{connectedQueue}->enqueue(1);
     }
 
-    # Wait until QEMU connects to the monitor.
     eval {
         local $SIG{CHLD} = sub { die "QEMU died prematurely\n"; };
+        
+        # Wait until QEMU connects to the monitor.
         accept($self->{monitor}, $monitorS) or die;
+
+        # Wait until QEMU connects to the root shell socket.  QEMU
+        # does so immediately; this doesn't mean that the root shell
+        # has connected yet inside the guest.
+        accept($self->{socket}, $shellS) or die;
+        $self->{socket}->autoflush(1);
     };
     die "$@" if $@;
     
@@ -197,27 +209,9 @@ sub connect {
 
     $self->start;
 
-    # Wait until the processQemuOutput thread signals that the machine
-    # is up.
-    retry sub {
-        return 1 if $self->{connectedQueue}->dequeue_nb();
-    };
-
-    retry sub {
-        $self->log("trying to connect");
-        my $socket = new IO::Handle;
-        $self->{socket} = $socket;
-        socket($socket, PF_UNIX, SOCK_STREAM, 0) or die;
-        connect($socket, sockaddr_un($self->{stateDir} . "/65535.socket")) or die;
-        $socket->autoflush(1);
-        print $socket "echo hello\n" or next;
-        flush $socket;
-        my $line = readline($socket);
-        chomp $line;
-        return 1 if $line eq "hello";
-    };
-
-    $self->log("connected");
+    my $line = readline $self->{socket} or die;
+    $self->log("connected to guest root shell");
+    
     $self->{connected} = 1;
 }
 
diff --git a/lib/test-driver/test-driver.pl b/lib/test-driver/test-driver.pl
index 98666d6c775..ad1af5a6fbf 100644
--- a/lib/test-driver/test-driver.pl
+++ b/lib/test-driver/test-driver.pl
@@ -74,6 +74,3 @@ END {
 
 
 runTests;
-
-
-print STDERR "DONE\n";
diff --git a/modules/testing/test-instrumentation.nix b/modules/testing/test-instrumentation.nix
index 84671028ba0..2515edf6192 100644
--- a/modules/testing/test-instrumentation.nix
+++ b/modules/testing/test-instrumentation.nix
@@ -13,6 +13,7 @@ let
     ''
       #! ${pkgs.perl}/bin/perl
       $SIG{CHLD} = 'DEFAULT';
+      print "\n";
       exec "/bin/sh";
     '';
 
@@ -25,12 +26,6 @@ in
     jobs.backdoor =
       { startOn = "started network-interfaces";
         
-        preStart =
-          ''
-            echo "guest running" > /dev/ttyS0
-            echo "===UP===" > dev/ttyS0
-          '';
-          
         script =
           ''
             export USER=root
@@ -39,7 +34,8 @@ in
             export GCOV_PREFIX=/tmp/coverage-data
             source /etc/profile
             cd /tmp
-            exec ${pkgs.socat}/bin/socat tcp-listen:514,fork exec:${rootShell} 2> /dev/ttyS0
+            echo "connecting to host..." > /dev/ttyS0
+            exec ${pkgs.socat}/bin/socat tcp:10.0.2.6:23 exec:${rootShell} 2> /dev/ttyS0
           '';
       };
   
diff --git a/modules/virtualisation/qemu-vm.nix b/modules/virtualisation/qemu-vm.nix
index 46462bbc6cc..e054b537d43 100644
--- a/modules/virtualisation/qemu-vm.nix
+++ b/modules/virtualisation/qemu-vm.nix
@@ -134,7 +134,7 @@ let
           -m ${toString config.virtualisation.memorySize} \
           -net nic,vlan=0,model=virtio \
           -chardev socket,id=samba,path=./samba \
-          -net user,vlan=0,guestfwd=tcp:10.0.2.4:139-chardev:samba \
+          -net user,vlan=0,guestfwd=tcp:10.0.2.4:139-chardev:samba''${QEMU_NET_OPTS:+,$QEMU_NET_OPTS} \
           -drive file=$NIX_DISK_IMAGE,if=virtio,boot=on,cache=writeback,werror=report \
           -kernel ${config.system.build.toplevel}/kernel \
           -initrd ${config.system.build.toplevel}/initrd \
-- 
GitLab


From 411139148df295dd9d620d9fc4f073d1af2c862d Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sat, 19 Jun 2010 21:57:20 +0000
Subject: [PATCH 2443/5331] * Put a timeout on the call to readline.

svn path=/nixos/branches/boot-order/; revision=22338
---
 lib/test-driver/Machine.pm | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/lib/test-driver/Machine.pm b/lib/test-driver/Machine.pm
index c18e0e33162..46fbf6d60cd 100644
--- a/lib/test-driver/Machine.pm
+++ b/lib/test-driver/Machine.pm
@@ -209,9 +209,12 @@ sub connect {
 
     $self->start;
 
-    my $line = readline $self->{socket} or die;
+    local $SIG{ALRM} = sub { die "timed out waiting for the guest to connect\n"; };
+    alarm 300;
+    readline $self->{socket} or die;
+    alarm 0;
+        
     $self->log("connected to guest root shell");
-    
     $self->{connected} = 1;
 }
 
-- 
GitLab


From 20a88efffa6a69b97a293b3a923c052501a964d7 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sun, 20 Jun 2010 15:33:44 +0000
Subject: [PATCH 2444/5331] * Fix networking in the installer test. * If
 connecting to the host fails in the guest, then shutdown   immediately.

svn path=/nixos/branches/boot-order/; revision=22341
---
 lib/test-driver/Machine.pm               | 2 +-
 modules/testing/test-instrumentation.nix | 9 ++++++---
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/lib/test-driver/Machine.pm b/lib/test-driver/Machine.pm
index 46fbf6d60cd..9f5971d70a1 100644
--- a/lib/test-driver/Machine.pm
+++ b/lib/test-driver/Machine.pm
@@ -28,7 +28,7 @@ sub new {
         # !!! merge with qemu-vm.nix.
         $startCommand =
             "qemu-system-x86_64 -m 384 " .
-            "-net nic,model=virtio -net user \$QEMU_OPTS ";
+            "-net nic,model=virtio -net user,\$QEMU_NET_OPTS \$QEMU_OPTS ";
         $startCommand .= "-drive file=" . Cwd::abs_path($args->{hda}) . ",if=virtio,boot=on,werror=report "
             if defined $args->{hda};
         $startCommand .= "-cdrom $args->{cdrom} "
diff --git a/modules/testing/test-instrumentation.nix b/modules/testing/test-instrumentation.nix
index 2515edf6192..655cda31ed6 100644
--- a/modules/testing/test-instrumentation.nix
+++ b/modules/testing/test-instrumentation.nix
@@ -24,7 +24,8 @@ in
   config = {
 
     jobs.backdoor =
-      { startOn = "started network-interfaces";
+      { startOn = "ip-up";
+        stopOn = "never";
         
         script =
           ''
@@ -35,10 +36,12 @@ in
             source /etc/profile
             cd /tmp
             echo "connecting to host..." > /dev/ttyS0
-            exec ${pkgs.socat}/bin/socat tcp:10.0.2.6:23 exec:${rootShell} 2> /dev/ttyS0
+            ${pkgs.socat}/bin/socat tcp:10.0.2.6:23 exec:${rootShell} 2> /dev/ttyS0 || poweroff -f
           '';
+
+        respawn = false;
       };
-  
+
     boot.postBootCommands =
       ''
         # Panic on out-of-memory conditions rather than letting the
-- 
GitLab


From 1371f4e6c8107cd7d7945fa8c0fe714963d26949 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sun, 20 Jun 2010 16:05:15 +0000
Subject: [PATCH 2445/5331] * Apparantly GRUB 2 cannot boot from a software
 RAID partition, so use   a separate /boot.

svn path=/nixos/branches/boot-order/; revision=22344
---
 tests/installer.nix | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/tests/installer.nix b/tests/installer.nix
index 1f9ada808b2..8577e5b76cd 100644
--- a/tests/installer.nix
+++ b/tests/installer.nix
@@ -291,21 +291,25 @@ in {
         ''
           $machine->mustSucceed(
               "parted /dev/vda mklabel msdos",
-              "parted /dev/vda -- mkpart primary 1M 1000M", # md0 (root), first device
-              "parted /dev/vda -- mkpart primary 1024M 2024M", # md0 (root), second device
-              "parted /dev/vda -- mkpart primary 2048M 2548M", # md1 (swap), first device
-              "parted /dev/vda -- mkpart primary 2560M 3060M", # md1 (swap), second device
+              "parted /dev/vda -- mkpart primary ext2 1M 30MB", # /boot
+              "parted /dev/vda -- mkpart extended 30M -1s", # extended partition
+              "parted /dev/vda -- mkpart logical 30M 1000M", # md0 (root), first device
+              "parted /dev/vda -- mkpart logical 1024M 2000M", # md0 (root), second device
+              "parted /dev/vda -- mkpart logical 2048M 2548M", # md1 (swap), first device
+              "parted /dev/vda -- mkpart logical 2560M 3060M", # md1 (swap), second device
               "udevadm settle",
-              # Note that GRUB2 doesn't work with version 1.2 metadata.
-              "mdadm --create --force /dev/md0 --metadata 0.90 --level=raid1 --raid-devices=2 /dev/vda1 /dev/vda2",
-              "mdadm --create --force /dev/md1 --metadata 1.2 --level=raid1 --raid-devices=2 /dev/vda3 /dev/vda4",
+              "mdadm --create --force /dev/md0 --metadata 1.2 --level=raid1 --raid-devices=2 /dev/vda5 /dev/vda6",
+              "mdadm --create --force /dev/md1 --metadata 1.2 --level=raid1 --raid-devices=2 /dev/vda7 /dev/vda8",
               "mkswap -f /dev/md1 -L swap",
               "swapon -L swap",
               "mkfs.ext3 -L nixos /dev/md0",
               "mount LABEL=nixos /mnt",
+              "mkfs.ext3 -L boot /dev/vda1",
+              "mkdir /mnt/boot",
+              "mount LABEL=boot /mnt/boot",
           );
         '';
-      fileSystems = rootFS;
+      fileSystems = rootFS + bootFS;
     };
       
 }
-- 
GitLab


From eab091cc119cdc89060b123ac81d78263319078f Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sun, 20 Jun 2010 16:15:30 +0000
Subject: [PATCH 2446/5331] * Remove some redundant calls to `udevadm settle'.

svn path=/nixos/branches/boot-order/; revision=22345
---
 tests/installer.nix | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/tests/installer.nix b/tests/installer.nix
index 8577e5b76cd..bfecca48cc0 100644
--- a/tests/installer.nix
+++ b/tests/installer.nix
@@ -219,9 +219,7 @@ in {
         ''
           $machine->mustSucceed(
               "parted /dev/vda mklabel msdos",
-              "udevadm settle",
               "parted /dev/vda -- mkpart primary linux-swap 1M 1024M",
-              "udevadm settle",
               "parted /dev/vda -- mkpart primary ext2 1024M -1s",
               "udevadm settle",
               "mkswap /dev/vda1 -L swap",
@@ -241,9 +239,7 @@ in {
           $machine->mustSucceed(
               "parted /dev/vda mklabel msdos",
               "parted /dev/vda -- mkpart primary ext2 1M 50MB", # /boot
-              "udevadm settle",
               "parted /dev/vda -- mkpart primary linux-swap 50MB 1024M",
-              "udevadm settle",
               "parted /dev/vda -- mkpart primary ext2 1024M -1s", # /
               "udevadm settle",
               "mkswap /dev/vda2 -L swap",
@@ -266,11 +262,8 @@ in {
           $machine->mustSucceed(
               "parted /dev/vda mklabel msdos",
               "parted /dev/vda -- mkpart primary 1M 2048M", # first PV
-              "udevadm settle",
               "parted /dev/vda -- set 1 lvm on",
-              "udevadm settle",
               "parted /dev/vda -- mkpart primary 2048M -1s", # second PV
-              "udevadm settle",
               "parted /dev/vda -- set 2 lvm on",
               "udevadm settle",
               "pvcreate /dev/vda1 /dev/vda2",
-- 
GitLab


From 593a110c4715a21a6973bf76a1ef1df30b2611d9 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sun, 20 Jun 2010 19:22:23 +0000
Subject: [PATCH 2447/5331] * Make sure that kernel log messages appear in the
 VM output.  The   comment was incorrect - when klogd is running, kernel
 messages no   longer appear on the serial port.

svn path=/nixos/branches/boot-order/; revision=22346
---
 modules/testing/test-instrumentation.nix | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/modules/testing/test-instrumentation.nix b/modules/testing/test-instrumentation.nix
index 655cda31ed6..268a208e7fa 100644
--- a/modules/testing/test-instrumentation.nix
+++ b/modules/testing/test-instrumentation.nix
@@ -74,10 +74,8 @@ in
     # `xwininfo' is used by the test driver to query open windows.
     environment.systemPackages = [ pkgs.xorg.xwininfo ];
 
-    # Send all of /var/log/messages to the serial port (except for
-    # kernel messages through klogd, which already appear on the
-    # serial port).
-    services.syslogd.extraConfig = "*.*,kern.none /dev/ttyS0";
+    # Send all of /var/log/messages to the serial port.
+    services.syslogd.extraConfig = "*.* /dev/ttyS0";
 
     # Prevent tests from accessing the Internet.
     networking.defaultGateway = mkOverride 200 {} "";
-- 
GitLab


From 061ea1674fec3adfe9cf07aebc1452534dc2885d Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sun, 20 Jun 2010 20:52:42 +0000
Subject: [PATCH 2448/5331] * Increase the CIFS timeout here as well.

svn path=/nixos/branches/boot-order/; revision=22348
---
 modules/testing/test-instrumentation.nix | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/modules/testing/test-instrumentation.nix b/modules/testing/test-instrumentation.nix
index 268a208e7fa..b70c6e03f27 100644
--- a/modules/testing/test-instrumentation.nix
+++ b/modules/testing/test-instrumentation.nix
@@ -81,6 +81,13 @@ in
     networking.defaultGateway = mkOverride 200 {} "";
     networking.nameservers = mkOverride 200 {} [ ];
 
+    # Apply a patch to the kernel to increase the 15s CIFS timeout.
+    nixpkgs.config.packageOverrides = pkgs: {
+      linux = pkgs.linux.override (orig: {
+        kernelPatches = orig.kernelPatches ++ [ pkgs.kernelPatches.cifs_timeout ];
+      });
+    };
+
   };
 
 }
-- 
GitLab


From d43d321e864cad2ac5ff6ae7633166925d2a2125 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sun, 20 Jun 2010 20:54:31 +0000
Subject: [PATCH 2449/5331] * Sync with the trunk.

svn path=/nixos/branches/boot-order/; revision=22349
---
 modules/installer/grub/grub-menu-builder.sh |  2 +-
 modules/services/mail/postfix.nix           | 10 +++++++++-
 modules/services/misc/nix-daemon.nix        |  4 ++++
 modules/services/printing/cupsd.nix         | 13 ++++++++++---
 modules/system/boot/stage-2-init.sh         |  8 +++++++-
 modules/system/upstart/upstart.nix          |  7 +++++--
 tests/subversion.nix                        |  2 +-
 7 files changed, 37 insertions(+), 9 deletions(-)

diff --git a/modules/installer/grub/grub-menu-builder.sh b/modules/installer/grub/grub-menu-builder.sh
index ecb69ceb263..f23184b0a06 100644
--- a/modules/installer/grub/grub-menu-builder.sh
+++ b/modules/installer/grub/grub-menu-builder.sh
@@ -30,7 +30,7 @@ esac
 # the GRUB config file must be relative to the root of the /boot
 # filesystem.  `$bootRoot' is the path to be prepended to paths under
 # /boot.
-if [ "$(stat -f -c '%i' /)" = "$(stat -f -c '%i' /boot)" ]; then
+if [ "$(stat -c '%D' /.)" = "$(stat -c '%D' /boot/.)" ]; then
     bootRoot=/boot
     copyKernels="@copyKernels@" # user can override in the NixOS config
 else
diff --git a/modules/services/mail/postfix.nix b/modules/services/mail/postfix.nix
index 939260632c9..03c77885d06 100644
--- a/modules/services/mail/postfix.nix
+++ b/modules/services/mail/postfix.nix
@@ -287,7 +287,15 @@ in
 
         daemonType = "none";
 
-        respawn = false;
+        respawn = true;
+
+        script = ''
+          while ${pkgs.procps}/bin/ps `${pkgs.coreutils}/bin/cat /var/postfix/queue/pid/master.pid` |
+            grep -q postfix
+          do
+            ${pkgs.coreutils}/bin/sleep 1m
+          done
+        '';
 
         preStart =
           ''
diff --git a/modules/services/misc/nix-daemon.nix b/modules/services/misc/nix-daemon.nix
index a9a0bc70f1e..fcdcc8fb299 100644
--- a/modules/services/misc/nix-daemon.nix
+++ b/modules/services/misc/nix-daemon.nix
@@ -162,6 +162,10 @@ in
         internal = true;
         default = "";
         merge = mergeStringOption;
+        example = ''
+          export NIX_TARGET_LOAD=$(( 3 * $(${pkgs.coreutils}/bin/nproc) / 2 ))
+          export NIX_MAX_PARALLELIZATION=$NIX_TARGET_LOAD
+        '';
         description = "
           Environment variables used by Nix.
         ";
diff --git a/modules/services/printing/cupsd.nix b/modules/services/printing/cupsd.nix
index 40760ec8af5..0ac52fe1038 100644
--- a/modules/services/printing/cupsd.nix
+++ b/modules/services/printing/cupsd.nix
@@ -106,6 +106,11 @@ in
 
     services.dbus.packages = [cups];
 
+    # cups uses libusb to talk to printers, and does not use the
+    # linux kernel driver. If the driver is not in a black list, it
+    # gets loaded, and then cups cannot access the printers.
+    boot.blacklistedKernelModules = [ "usblp" ];
+
     environment.etc =
       [ # CUPS expects the following files in its ServerRoot.
         { source = "${cups}/etc/cups/mime.convs";
@@ -122,15 +127,17 @@ in
         startOn = "started network-interfaces";
         stopOn = "stopping network-interfaces";
 
+        environment = {
+          # Cups scripts for printing (psto...) require awk, sed, grep, ...
+          PATH = "${config.system.path}/bin";
+        };
+
         preStart =
           ''
             mkdir -m 0755 -p ${logDir}
             mkdir -m 0700 -p /var/cache/cups
             mkdir -m 0700 -p /var/spool/cups
             mkdir -m 0755 -p ${cfg.tempDir}
-
-            # Make USB printers show up.
-            ${modprobe}/sbin/modprobe usblp || true
           '';
 
         exec = "${cups}/sbin/cupsd -c ${pkgs.writeText "cupsd.conf" cfg.cupsdConf} -F";
diff --git a/modules/system/boot/stage-2-init.sh b/modules/system/boot/stage-2-init.sh
index 201c539bb6b..aaf135fe51a 100644
--- a/modules/system/boot/stage-2-init.sh
+++ b/modules/system/boot/stage-2-init.sh
@@ -131,9 +131,15 @@ echo "running activation script..."
 @activateConfiguration@ "$systemConfig"
 
 
-# Record the boot configuration.  !!! Should this be a GC root?
+# Record the boot configuration.
 if test -n "$systemConfig"; then
     ln -sfn "$systemConfig" /var/run/booted-system
+
+    # Prevent the booted system form being garbage-collected
+    # If it weren't a gcroot, if we were running a different kernel,
+    # switched system, and garbage collected all, we could not load
+    # kernel modules anymore.
+    ln -sfn /var/run/booted-system /nix/var/nix/gcroots/booted-system
 fi
 
 
diff --git a/modules/system/upstart/upstart.nix b/modules/system/upstart/upstart.nix
index 3110f376eec..cb3975e694c 100644
--- a/modules/system/upstart/upstart.nix
+++ b/modules/system/upstart/upstart.nix
@@ -21,6 +21,7 @@ let
   makeJob = job:
 
     let
+      hasMain = job.script != "" || job.exec != "";
 
       jobText =
         let log = "/var/log/upstart/${job.name}"; in
@@ -77,12 +78,14 @@ let
           ${optionalString job.task "task"}
           ${optionalString (!job.task && job.respawn) "respawn"}
 
-          ${optionalString (job.preStop != "") ''
+          ${ # preStop is run only if there is exec or script.
+             # (upstart 0.6.5, job.c:562)
+            optionalString (job.preStop != "") (assert hasMain; ''
             pre-stop script
               exec >> ${log} 2>&1
               ${job.preStop}
             end script
-          ''}
+          '')}
 
           ${optionalString (job.postStop != "") ''
             post-stop script
diff --git a/tests/subversion.nix b/tests/subversion.nix
index 5354a40452b..d43e369b437 100644
--- a/tests/subversion.nix
+++ b/tests/subversion.nix
@@ -19,7 +19,7 @@ let
 
         # To build the kernel with coverage instrumentation, we need a
         # special patch to make coverage data available under /proc.
-        kernel = pkgs.kernel.override (orig: {
+        linux = pkgs.linux.override (orig: {
           stdenv = cleanupBuildTree (keepBuildTree orig.stdenv);
           extraConfig =
             ''
-- 
GitLab


From 0dd9b4caafa8a12f1f2cfad55ccf57d6c924a8b7 Mon Sep 17 00:00:00 2001
From: Marc Weber <marco-oweber@gmx.de>
Date: Mon, 21 Jun 2010 14:17:19 +0000
Subject: [PATCH 2450/5331] reverting -r22286

svn path=/nixos/trunk/; revision=22358
---
 modules/services/misc/nix-daemon.nix | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/modules/services/misc/nix-daemon.nix b/modules/services/misc/nix-daemon.nix
index fcdcc8fb299..a9a0bc70f1e 100644
--- a/modules/services/misc/nix-daemon.nix
+++ b/modules/services/misc/nix-daemon.nix
@@ -162,10 +162,6 @@ in
         internal = true;
         default = "";
         merge = mergeStringOption;
-        example = ''
-          export NIX_TARGET_LOAD=$(( 3 * $(${pkgs.coreutils}/bin/nproc) / 2 ))
-          export NIX_MAX_PARALLELIZATION=$NIX_TARGET_LOAD
-        '';
         description = "
           Environment variables used by Nix.
         ";
-- 
GitLab


From 6c6710b85a71964c117aff278cb9c074cb0163ad Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 21 Jun 2010 22:00:48 +0000
Subject: [PATCH 2451/5331] svn path=/nixos/branches/boot-order/;
 revision=22367

---
 lib/make-iso9660-image.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/make-iso9660-image.sh b/lib/make-iso9660-image.sh
index 01b0fafa112..c6996e8db9a 100644
--- a/lib/make-iso9660-image.sh
+++ b/lib/make-iso9660-image.sh
@@ -54,7 +54,7 @@ done
 
 # Also include a manifest of the closures in a format suitable for
 # nix-store --load-db.
-if [ -n "$object"; ]; then
+if [ -n "$object" ]; then
     printRegistration=1 perl $pathsFromGraph closure-* > nix-path-registration
     echo "nix-path-registration=nix-path-registration" >> pathlist
 fi
-- 
GitLab


From 2e5387ac492493b60a12ce587c8cf6a4b8bf733d Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 23 Jun 2010 09:59:26 +0000
Subject: [PATCH 2452/5331] * Fix evaluation of the manual.

svn path=/nixos/branches/boot-order/; revision=22392
---
 release.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/release.nix b/release.nix
index 1b013b9db36..983b16f96d7 100644
--- a/release.nix
+++ b/release.nix
@@ -111,7 +111,7 @@ let
         options =
           (import lib/eval-config.nix {
             inherit nixpkgs;
-            modules = [ ];
+            modules = [ { fileSystems = []; } ];
           }).options;
         revision = with nixosSrc;
           if rev == 1234 then "HEAD" else toString rev;
-- 
GitLab


From 1f97de224f24d232d2c46a7c349cfcd3dd849de2 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 23 Jun 2010 10:41:37 +0000
Subject: [PATCH 2453/5331] svn path=/nixos/branches/boot-order/;
 revision=22395

---
 release.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/release.nix b/release.nix
index 983b16f96d7..204a636568d 100644
--- a/release.nix
+++ b/release.nix
@@ -113,8 +113,8 @@ let
             inherit nixpkgs;
             modules = [ { fileSystems = []; } ];
           }).options;
-        revision = with nixosSrc;
-          if rev == 1234 then "HEAD" else toString rev;
+        revision = 
+          if nixosSrc.rev == 1234 then "HEAD" else toString nixosSrc.rev;
       };
 
 
-- 
GitLab


From ebd9fb6cf397388137fc1e3fc3c252c9cd951bb8 Mon Sep 17 00:00:00 2001
From: Evgeny Egorochkin <phreedom.stdin@gmail.com>
Date: Mon, 28 Jun 2010 18:36:37 +0000
Subject: [PATCH 2454/5331] Added Quassel IRC client service

svn path=/nixos/trunk/; revision=22425
---
 modules/module-list.nix                 |  1 +
 modules/services/networking/quassel.nix | 97 +++++++++++++++++++++++++
 2 files changed, 98 insertions(+)
 create mode 100644 modules/services/networking/quassel.nix

diff --git a/modules/module-list.nix b/modules/module-list.nix
index 8e12fd14129..2925f5a1809 100644
--- a/modules/module-list.nix
+++ b/modules/module-list.nix
@@ -92,6 +92,7 @@
   ./services/networking/openvpn.nix
   ./services/networking/portmap.nix
   ./services/networking/privoxy.nix
+  ./services/networking/quassel.nix
   ./services/networking/ssh/lshd.nix
   ./services/networking/ssh/sshd.nix
   ./services/networking/tftpd.nix
diff --git a/modules/services/networking/quassel.nix b/modules/services/networking/quassel.nix
new file mode 100644
index 00000000000..d4795f3b57d
--- /dev/null
+++ b/modules/services/networking/quassel.nix
@@ -0,0 +1,97 @@
+{ config, pkgs, ... }:
+
+with pkgs.lib;
+
+let
+  quassel = pkgs.quassel.override { daemon = true; monolithic = false; client = false; };
+  cfg = config.services.quassel;
+in
+
+{
+
+  ###### interface
+
+  options = {
+  
+    services.quassel = {
+
+      enable = mkOption {
+        default = false;
+        description = ''
+          Whether to run the Quassel IRC client daemon.
+        '';
+      };
+
+      interface = mkOption {
+        default = "127.0.0.1";
+        description = ''
+          The interface the Quassel daemon will be listening to.  If `127.0.0.1',
+          only clients on the local host can connect to it; if `0.0.0.0', clients
+          can access it from any network interface.
+        '';
+      };
+
+      portNumber = mkOption {
+        default = 4242;
+        description = ''
+          The port number the Quassel daemon will be listening to.
+        '';
+      };
+
+      logFile = mkOption {
+        default = "/var/log/quassel.log";
+        description = "Location of the logfile of the Quassel daemon.";
+      };
+
+      dataDir = mkOption {
+        default = ''/home/${cfg.user}/.config/quassel-irc.org'';
+        description = ''
+          The directory holding configuration files, the SQlite database and the SSL Cert.
+        '';
+      };
+
+      user = mkOption {
+        default = "quassel";
+        description = ''
+          The user the Quassel daemon should run as.
+        '';
+      };
+
+    };
+
+  };
+  
+
+  ###### implementation
+
+  config = mkIf cfg.enable {
+
+    users.extraUsers = singleton
+      { name = cfg.user;
+        description = "Quassel IRC client daemon";
+      };
+    
+
+    jobs.quassel =
+      { description = "Quassel IRC client daemon";
+
+        startOn = "ip-up";
+
+        preStart = ''
+            mkdir -p ${cfg.dataDir}
+            chown ${cfg.user} ${cfg.dataDir}
+            touch ${cfg.logFile} && chown ${cfg.user} ${cfg.logFile}
+        '';
+
+        exec = ''
+            ${pkgs.su}/bin/su -s ${pkgs.stdenv.shell} ${cfg.user} \
+                -c '${quassel}/bin/quasselcore --listen=${cfg.interface}\
+                    --port=${toString cfg.portNumber} --configdir=${cfg.dataDir} --logfile=${cfg.logFile}'
+        '';
+      };
+
+    environment.systemPackages = [ quassel ];
+
+  };
+  
+}
-- 
GitLab


From 41cc6ecdbbf043fd994a5ee03b6af9d641a85214 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Thu, 1 Jul 2010 17:54:03 +0000
Subject: [PATCH 2455/5331] Trying to make the nixos-bootstrap-archive
 (nixos-minimal-archive in other places named) to have an hydra build product
 for easy tarball download.

svn path=/nixos/trunk/; revision=22440
---
 modules/installer/tools/nixos-bootstrap-archive/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/modules/installer/tools/nixos-bootstrap-archive/default.nix b/modules/installer/tools/nixos-bootstrap-archive/default.nix
index d383ad081e1..3fa287bf898 100644
--- a/modules/installer/tools/nixos-bootstrap-archive/default.nix
+++ b/modules/installer/tools/nixos-bootstrap-archive/default.nix
@@ -17,4 +17,6 @@ runCommand "nixos-bootstrap-archive" { } ''
       $(s ${nixosBootstrap}/bin/nixos-bootstrap )
       
   cat tmp.tar | bzip2 > $out/nixos-install-archive.tar.bz2
+  ensureDir $out/nix-support
+  echo "file tarball" $out/nixos-install-archive.tar.bz2 > $out/nix-support/hydra-build-products
 ''
-- 
GitLab


From 2335cb65a393b45949b18fb484eee1d2a09e5252 Mon Sep 17 00:00:00 2001
From: Wouter den Breejen <uu@denbreejen.net>
Date: Sat, 3 Jul 2010 15:10:48 +0000
Subject: [PATCH 2456/5331] Added sabnzbd :)

SABnzbd makes Usenet as simple and streamlined as possible by automating everything we can. All you have to do is add an .nzb. SABnzbd takes over from there, where it will be automatically downloaded, verified, repaired, extracted and filed away with zero human interaction.

http://sabnzbd.org/

svn path=/nixos/trunk/; revision=22446
---
 modules/misc/ids.nix                    |  1 +
 modules/module-list.nix                 |  1 +
 modules/services/networking/sabnzbd.nix | 52 +++++++++++++++++++++++++
 3 files changed, 54 insertions(+)
 create mode 100644 modules/services/networking/sabnzbd.nix

diff --git a/modules/misc/ids.nix b/modules/misc/ids.nix
index c100ae73456..8d516946868 100644
--- a/modules/misc/ids.nix
+++ b/modules/misc/ids.nix
@@ -53,6 +53,7 @@ in
     davfs2 = 31;
     privoxy = 32;    
     osgi = 34;
+    sabnzbd = 33;
     tor = 35;    
     # When adding a uid, make sure it doesn't match an existing gid.
 
diff --git a/modules/module-list.nix b/modules/module-list.nix
index 2925f5a1809..841a6b11a5f 100644
--- a/modules/module-list.nix
+++ b/modules/module-list.nix
@@ -97,6 +97,7 @@
   ./services/networking/ssh/sshd.nix
   ./services/networking/tftpd.nix
   ./services/networking/vsftpd.nix
+  ./services/networking/sabnzbd.nix
   ./services/networking/wicd.nix
   ./services/networking/wpa_supplicant.nix
   ./services/networking/xinetd.nix
diff --git a/modules/services/networking/sabnzbd.nix b/modules/services/networking/sabnzbd.nix
new file mode 100644
index 00000000000..7f87343cbb9
--- /dev/null
+++ b/modules/services/networking/sabnzbd.nix
@@ -0,0 +1,52 @@
+{ config, pkgs, ... }:
+
+with pkgs.lib;
+
+let 
+
+  cfg = config.services.sabnzbd;
+  inherit (pkgs) sabnzbd;
+
+in
+
+{
+
+  ###### interface
+
+  options = {
+    services.sabnzbd = {
+      enable = mkOption {
+        default = false;
+        description = "Whether to enable the sabnzbd FTP server.";
+      };
+      configFile = mkOption {
+        default = "/var/sabnzbd/sabnzbd.ini";
+        description = "Path to config file. (You need to create this file yourself!)";
+      };
+    };
+  };
+  
+
+  ###### implementation
+
+  config = mkIf cfg.enable {
+
+    users.extraUsers =
+      [ { name = "sabnzbd";
+          uid = config.ids.uids.sabnzbd;
+          description = "sabnzbd user";
+          home = "/homeless-shelter";
+        }
+      ];
+
+    jobs.sabnzbd =
+      { description = "sabnzbd server";
+
+        startOn = "network-interfaces/started";
+        stopOn = "network-interfaces/stop";
+
+        exec = "${sabnzbd}/bin/sabnzbd -d -f ${cfg.configFile}";
+      };
+
+  };
+}
-- 
GitLab


From 4225181fa11c49bf0cf732f6539840a778b06d1b Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 5 Jul 2010 09:28:22 +0000
Subject: [PATCH 2457/5331] =?UTF-8?q?*=20Ensure=20that=20the=20=E2=80=98mo?=
 =?UTF-8?q?unt-failed=E2=80=99=20and=20=E2=80=98emergency-shell=E2=80=99?=
 =?UTF-8?q?=20tasks=20don't=20get=20=20=20started=20by=20=E2=80=98switch-t?=
 =?UTF-8?q?o-configuration.sh=E2=80=99.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

svn path=/nixos/branches/boot-order/; revision=22473
---
 modules/tasks/filesystems.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/modules/tasks/filesystems.nix b/modules/tasks/filesystems.nix
index fe231d94ec8..7d53824d050 100644
--- a/modules/tasks/filesystems.nix
+++ b/modules/tasks/filesystems.nix
@@ -177,6 +177,7 @@ in
         startOn = "mount-failed";
         script =
           ''
+            [ -n "$MOUNTPOINT" ] || exit 0
             start --no-wait emergency-shell \
               DEVICE="$DEVICE" MOUNTPOINT="$MOUNTPOINT"
           '';
@@ -191,6 +192,8 @@ in
 
         script =
           ''
+            [ -n "$MOUNTPOINT" ] || exit 0
+            
             exec < /dev/console > /dev/console 2>&1
 
             cat <<EOF
-- 
GitLab


From da0d5c564547cc09388147e90cac9a1e0f66c4fd Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 5 Jul 2010 14:33:11 +0000
Subject: [PATCH 2458/5331] * Use config.system.build.grub rather than
 pkgs.grub to get the right   GRUB when version 2 is enabled.

svn path=/nixos/branches/boot-order/; revision=22479
---
 modules/services/x11/display-managers/kdm.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/modules/services/x11/display-managers/kdm.nix b/modules/services/x11/display-managers/kdm.nix
index 15553ba386b..a88b34dc5ac 100644
--- a/modules/services/x11/display-managers/kdm.nix
+++ b/modules/services/x11/display-managers/kdm.nix
@@ -94,7 +94,9 @@ in
   config = mkIf cfg.enable {
   
     services.xserver.displayManager.job =
-      { execCmd = "PATH=${pkgs.grub}/sbin:$PATH exec ${kdebase_workspace}/bin/kdm -config ${kdmrc} -nodaemon";
+      { execCmd =
+          (optionalString (config.system.boot.loader.id == "grub") "PATH=${config.system.build.grub}/sbin:$PATH ") +
+          "exec ${kdebase_workspace}/bin/kdm -config ${kdmrc} -nodaemon";
         logsXsession = true;
       };
 
-- 
GitLab


From bb2d97770e99310da64d862b08db71ec92702be8 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 6 Jul 2010 09:01:15 +0000
Subject: [PATCH 2459/5331] * Move the swap module to config/ because it
 doesn't provide a task   anymore.  Activating swap devices is now handled by
 the mountall   task.

svn path=/nixos/branches/boot-order/; revision=22489
---
 modules/{tasks => config}/swap.nix | 0
 modules/module-list.nix            | 2 +-
 2 files changed, 1 insertion(+), 1 deletion(-)
 rename modules/{tasks => config}/swap.nix (100%)

diff --git a/modules/tasks/swap.nix b/modules/config/swap.nix
similarity index 100%
rename from modules/tasks/swap.nix
rename to modules/config/swap.nix
diff --git a/modules/module-list.nix b/modules/module-list.nix
index 841a6b11a5f..7bc98858506 100644
--- a/modules/module-list.nix
+++ b/modules/module-list.nix
@@ -7,6 +7,7 @@
   ./config/no-x-libs.nix
   ./config/nsswitch.nix
   ./config/power-management.nix
+  ./config/swap.nix
   ./config/system-path.nix
   ./config/timezone.nix
   ./config/unix-odbc-drivers.nix
@@ -152,7 +153,6 @@
   ./tasks/kbd.nix
   ./tasks/lvm.nix
   ./tasks/network-interfaces.nix
-  ./tasks/swap.nix
   ./tasks/swraid.nix
   ./tasks/tty-backgrounds.nix
 ]
-- 
GitLab


From d0342b4cf582dbcf255791b25042817246840585 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 6 Jul 2010 11:03:23 +0000
Subject: [PATCH 2460/5331] * The `network-interfaces' task should wait until
 `udevtrigger' has   finished, because it loads the kernel modules for the
 network   devices.

svn path=/nixos/trunk/; revision=22492
---
 modules/tasks/network-interfaces.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/tasks/network-interfaces.nix b/modules/tasks/network-interfaces.nix
index 46d608dbb9b..8c419810c57 100644
--- a/modules/tasks/network-interfaces.nix
+++ b/modules/tasks/network-interfaces.nix
@@ -148,7 +148,7 @@ in
     jobs.networkInterfaces = 
       { name = "network-interfaces";
 
-        startOn = "started udev";
+        startOn = "stopped udevtrigger";
 
         preStart =
           ''
-- 
GitLab


From 9ac60a3aa3771e8d6612bbce261d8c7045f26566 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 7 Jul 2010 12:11:29 +0000
Subject: [PATCH 2461/5331] =?UTF-8?q?*=20Merge=20the=20=E2=80=98nfs-kernel?=
 =?UTF-8?q?-sm-notify=E2=80=99=20task=20into=20the=20post-start=20script?=
 =?UTF-8?q?=20of=20=20=20the=20=E2=80=98nfs-kernel-statd=E2=80=99=20task.?=
 =?UTF-8?q?=20*=20Work=20around=20an=20apparent=20bug=20in=20Upstart:=20th?=
 =?UTF-8?q?e=20=E2=80=98mountall=E2=80=99=20task=20cannot=20=20=20be=20res?=
 =?UTF-8?q?tarted=20because=20of=20the=20=E2=80=98starting=20mountall?=
 =?UTF-8?q?=E2=80=99=20condition=20in=20the=20=20=20statd=20task.=20=20So?=
 =?UTF-8?q?=20instead=20make=20=E2=80=98mountall=E2=80=99=20depend=20on=20?=
 =?UTF-8?q?=E2=80=98started=20=20=20nfs-kernel-statd=E2=80=99.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

svn path=/nixos/trunk/; revision=22508
---
 .../network-filesystems/nfs-kernel.nix         | 18 +++---------------
 modules/tasks/filesystems.nix                  |  8 +++++++-
 2 files changed, 10 insertions(+), 16 deletions(-)

diff --git a/modules/services/network-filesystems/nfs-kernel.nix b/modules/services/network-filesystems/nfs-kernel.nix
index e9c42237e0d..de41015c82d 100644
--- a/modules/services/network-filesystems/nfs-kernel.nix
+++ b/modules/services/network-filesystems/nfs-kernel.nix
@@ -161,7 +161,7 @@ in
 
             description = "Kernel NFS server - Network Status Monitor";
 
-            startOn = "${if cfg.server.enable then "starting nfs-kernel-nfsd and " else ""} started portmap";
+            startOn = "started portmap" + optionalString cfg.server.enable " and starting nfs-kernel-nfsd";
             stopOn = "never";
 
             preStart =
@@ -174,21 +174,9 @@ in
             daemonType = "fork";
 
             exec = "${pkgs.nfsUtils}/sbin/rpc.statd --no-notify";
-          };
-        }
-      
-      // optionalAttrs (cfg.client.enable || cfg.server.enable)
-        { nfs_kernel_sm_notify = 
-          { name = "nfs-kernel-sm-notify";
-
-            description = "Kernel NFS server - Reboot notification";
-
-            startOn = "started nfs-kernel-statd"
-              + (if cfg.client.enable then " and starting mountall" else "");
-
-            task = true;
 
-            exec = "${pkgs.nfsUtils}/sbin/sm-notify -d";
+            postStart = optionalString cfg.client.enable
+              "${pkgs.nfsUtils}/sbin/sm-notify -d";
           };
         };
       
diff --git a/modules/tasks/filesystems.nix b/modules/tasks/filesystems.nix
index 7d53824d050..22df9dd2a32 100644
--- a/modules/tasks/filesystems.nix
+++ b/modules/tasks/filesystems.nix
@@ -155,7 +155,13 @@ in
       };
 
     jobs.mountall =
-      { startOn = "started udev";
+      { startOn = "started udev"
+          # !!! The `started nfs-kernel-statd' condition shouldn't be
+          # here.  The `nfs-kernel-statd' job should have a `starting
+          # mountall' condition.  However, that doesn't work if
+          # `mountall' is restarted due to an apparent bug in Upstart:
+          # `mountall' hangs forever in the `start/starting' state.
+          + optionalString config.services.nfsKernel.client.enable " and started nfs-kernel-statd";
 
         task = true;
         
-- 
GitLab


From 6856c60ba3beb69464dbd8b87e2fff6e0cc8be77 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 7 Jul 2010 12:32:56 +0000
Subject: [PATCH 2462/5331] * There is no "samba-control" job.

svn path=/nixos/trunk/; revision=22509
---
 modules/services/network-filesystems/samba.nix | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/modules/services/network-filesystems/samba.nix b/modules/services/network-filesystems/samba.nix
index 29c44d46e68..9a285aa7728 100644
--- a/modules/services/network-filesystems/samba.nix
+++ b/modules/services/network-filesystems/samba.nix
@@ -64,7 +64,7 @@ let
       description = "Samba Service daemon ${appName}";
 
       startOn = "started samba";
-      stopOn = "stopping samba-control";
+      stopOn = "stopping samba";
 
       exec = "${samba}/sbin/${appName} ${args}";
     };
@@ -84,9 +84,8 @@ in
       enable = mkOption {
         default = false;
         description = "
-          Whether to enable the samba server. (to communicate with, and provide windows shares)
-          use start / stop samba-control to start/stop all daemons.
-          smbd and nmbd are not shutdown correctly yet. so just pkill them and restart those jobs.
+          Whether to enable Samba, which provides file and print
+          services to Windows clients through the SMB/CIFS protocol.
         ";
       };
 
@@ -146,15 +145,15 @@ in
 
       defaultShare = {
         enable = mkOption {
-	  description = "Whether to share /home/smbd as 'default'";
+	  description = "Whether to share /home/smbd as 'default'.";
 	  default = false;
 	};
         writeable = mkOption {
-	  description = "Whether to allow write access to default share";
+	  description = "Whether to allow write access to default share.";
 	  default = false;
 	};
         guest = mkOption {
-	  description = "Whether to allow guest access to default share";
+	  description = "Whether to allow guest access to default share.";
 	  default = true;
 	};
       };
-- 
GitLab


From b076121430a6db5ff52adbd9fe7ffdc63a8bd121 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 7 Jul 2010 14:25:16 +0000
Subject: [PATCH 2463/5331] * Don't use the -v flag because not every fsck
 backend knows it.

svn path=/nixos/trunk/; revision=22512
---
 modules/system/boot/stage-1-init.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/system/boot/stage-1-init.sh b/modules/system/boot/stage-1-init.sh
index c6a09d1e9a3..727322c6b40 100644
--- a/modules/system/boot/stage-1-init.sh
+++ b/modules/system/boot/stage-1-init.sh
@@ -168,7 +168,7 @@ checkFS() {
         return 0
     fi
 
-    FSTAB_FILE="/etc/mtab" fsck -V -v -C -a "$device"
+    FSTAB_FILE="/etc/mtab" fsck -V -C -a "$device"
     fsckResult=$?
 
     if test $(($fsckResult | 2)) = $fsckResult; then
-- 
GitLab


From 7123115d6f1610b78b268d75566596edf95db580 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 8 Jul 2010 12:55:18 +0000
Subject: [PATCH 2464/5331] * Call update-mime-database.

svn path=/nixos/trunk/; revision=22528
---
 modules/config/system-path.nix | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/modules/config/system-path.nix b/modules/config/system-path.nix
index 7e04af21997..03256aa9596 100644
--- a/modules/config/system-path.nix
+++ b/modules/config/system-path.nix
@@ -91,14 +91,20 @@ let
         description = ''
           The packages you want in the boot environment.
         '';
+        
         apply = list: pkgs.buildEnv {
           name = "system-path";
           paths = list;
-
           inherit (cfg) pathsToLink;
-
           ignoreCollisions = true;
+          postBuild =
+            ''
+              if [ -x $out/bin/update-mime-database -a -d $out/share/mime/packages ]; then
+                  $out/bin/update-mime-database -V $out/share/mime
+              fi
+            '';
         };
+        
       };
 
     };
-- 
GitLab


From 5c0f6619cf6aa73a3c28f4d347cb15981bbf6222 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 8 Jul 2010 15:54:10 +0000
Subject: [PATCH 2465/5331] * Idem.

svn path=/nixos/trunk/; revision=22535
---
 .../web-servers/apache-httpd/subversion.nix        | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/modules/services/web-servers/apache-httpd/subversion.nix b/modules/services/web-servers/apache-httpd/subversion.nix
index e10156432dc..256e3ca3105 100644
--- a/modules/services/web-servers/apache-httpd/subversion.nix
+++ b/modules/services/web-servers/apache-httpd/subversion.nix
@@ -36,7 +36,7 @@ let
     # The variables to substitute:
     
     inherit reposDir dbDir logDir distsDir backupsDir tmpDir
-      urlPrefix adminAddr fsType subversion postCommitHook;
+      urlPrefix adminAddr fsType subversion postCommitHook mailer;
     inherit (config) notificationSender userCreationDomain;
     orgUrl = config.organisation.url;
     orgLogoUrl = config.organisation.logo;
@@ -46,7 +46,7 @@ let
 
     sendmail = "${pkgs.ssmtp}/sbin/sendmail";
     
-    inherit (pkgs) libxslt enscript db4 coreutils bzip2;
+    inherit (pkgs) libxslt enscript db4 coreutils diffutils bzip2 python;
 
     inherit (serverInfo) canonicalName;
 
@@ -61,6 +61,8 @@ let
       pkgs.perlPackages.StringMkPasswd
     ];
 
+    pythonPath = "${subversion}/lib/${pkgs.python.libPrefix}/site-packages";
+
     # Do a syntax check on the generated file.
     postInstall = ''
       $perl -c -T $out/cgi-bin/repoman.pl
@@ -73,6 +75,14 @@ let
     '';
   };
 
+
+  # Extract the mailer script from the Subversion source distribution.
+  mailer = pkgs.runCommand "svn-mailer.py" { inherit (subversion) src; }
+    ''
+      unpackFile $src
+      cp subversion-*/tools/hook-scripts/mailer/mailer.py $out
+    '';
+
   
   # Build our custom authentication modules.
   authModules = import "${servicesPath}/subversion/src/auth" {
-- 
GitLab


From 54a4eead20134108659b7ced0787ea7f06c77edc Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 8 Jul 2010 16:21:55 +0000
Subject: [PATCH 2466/5331] * Typos.

svn path=/nixos/trunk/; revision=22537
---
 modules/services/networking/wpa_supplicant.nix | 2 +-
 modules/system/boot/kernel.nix                 | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/services/networking/wpa_supplicant.nix b/modules/services/networking/wpa_supplicant.nix
index 52241da023a..a349a721b12 100644
--- a/modules/services/networking/wpa_supplicant.nix
+++ b/modules/services/networking/wpa_supplicant.nix
@@ -31,7 +31,7 @@ in
     networking.WLANInterface = mkOption {
       default = "wlan0";
       description = ''
-        The interface wpa_supplicant will use, if enableWLAN is enabled.
+        The interface wpa_supplicant will use, if enableWLAN is set.
       '';
     };
 
diff --git a/modules/system/boot/kernel.nix b/modules/system/boot/kernel.nix
index 742ce3f223d..0dd1d93dd43 100644
--- a/modules/system/boot/kernel.nix
+++ b/modules/system/boot/kernel.nix
@@ -121,7 +121,7 @@ let kernel = config.boot.kernelPackages.kernel; in
     system.modulesTree = [ kernel ] ++ config.boot.extraModulePackages;
 
     boot.kernelParams =
-      [ "splash=verbose"] ++ 
+      [ "splash=verbose" ] ++ 
       optional config.boot.vesa "vga=0x317";
       
     boot.kernelModules = [ "loop" ];
-- 
GitLab


From abbc2f4f2be6846b6492b3c575c0eac7a05113b5 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 9 Jul 2010 12:35:06 +0000
Subject: [PATCH 2467/5331] * Make acpid depend on syslogd (to prevent it
 printing startup   messages to the console).

svn path=/nixos/trunk/; revision=22545
---
 modules/services/hardware/acpid.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/services/hardware/acpid.nix b/modules/services/hardware/acpid.nix
index a846f3b7117..4be882c1f1e 100644
--- a/modules/services/hardware/acpid.nix
+++ b/modules/services/hardware/acpid.nix
@@ -97,7 +97,7 @@ in
     jobs.acpid =
       { description = "ACPI daemon";
 
-        startOn = "started udev";
+        startOn = "stopped udevtrigger and started syslogd";
 
         exec = "${pkgs.acpid}/sbin/acpid --foreground --confdir ${acpiConfDir}";
       };
-- 
GitLab


From a86b1bd43de6cbe796b8d20c3e1bbd23c6ac5902 Mon Sep 17 00:00:00 2001
From: Evgeny Egorochkin <phreedom.stdin@gmail.com>
Date: Mon, 12 Jul 2010 06:03:52 +0000
Subject: [PATCH 2468/5331] Improved the TOR service to be able to act as a TOR
 relay and disable the client functionality. Doesn't change the behavior of
 the existing TOR configurations.

svn path=/nixos/trunk/; revision=22554
---
 modules/services/security/tor.nix | 165 +++++++++++++++++++++++++++---
 1 file changed, 153 insertions(+), 12 deletions(-)

diff --git a/modules/services/security/tor.nix b/modules/services/security/tor.nix
index 89f4245145e..d3fceae3608 100644
--- a/modules/services/security/tor.nix
+++ b/modules/services/security/tor.nix
@@ -11,8 +11,12 @@ let
 
   modprobe = config.system.sbin.modprobe;
 
+  cfg = config.services.tor;
+
   torUser = "tor";
 
+  opt = name: value: if value != "" then "${name} ${value}" else "";
+  optint = name: value: if value != 0 then "${name} ${toString value}" else "";
 in
 
 {
@@ -30,15 +34,33 @@ in
         '';
       };
 
+      enableClient = mkOption {
+        default = true;
+        description = ''
+          Whether to enable Tor daemon to route application connections.
+          You might want to disable this if you plan running a dedicated Tor relay.
+        '';
+      };
+
       socksListenAddress = mkOption {
         default = "127.0.0.1:9050";
-        example = "192.168.0.1";
+        example = "127.0.0.1:9050, 192.168.0.1:9100";
         description = ''
-          Bind to this address to listen for connections from Socks-speaking 
+          Bind to this address(es) to listen for connections from Socks-speaking 
           applications. You can also specify a port.
         '';
       };
 
+      socksPolicy = mkOption {
+        default = "";
+        example = "accept 192.168.0.0/16, reject *";
+        description = ''
+          Entry policies to allow/deny SOCKS requests based on IP address.
+          First entry that matches wins. If no SocksPolicy is set, we accept
+          all (and only) requests from SocksListenAddress.
+        '';
+      };
+
       config = mkOption {
         default = "";
         description = ''
@@ -83,6 +105,107 @@ in
           instace of privoxy.
         '';
       };
+
+      enableRelay = mkOption {
+        default = false;
+        description = ''
+          Whether to enable relaying traffic for others.
+
+          See https://www.torproject.org/docs/tor-doc-relay for details.
+        '';
+      };
+
+      isBridgeRelay = mkOption {
+        default = false;
+        description = ''
+          Bridge relays (or "bridges" ) are Tor relays that aren't listed in the
+          main directory. Since there is no complete public list of them, even if an
+          ISP is filtering connections to all the known Tor relays, they probably
+          won't be able to block all the bridges.
+
+          A bridge relay can't be an exit relay.
+
+          You need to set enableRelay to true for this option to take effect.
+
+          See https://www.torproject.org/bridges.html.en for more info.
+        '';
+      };
+
+      isExitRelay = mkOption {
+        default = false;
+        description = ''
+          An exit relay allows Tor users to access regular Internet services.
+
+          Unlike running a non-exit relay, running an exit relay may expose
+          you to abuse complaints. See https://www.torproject.org/faq.html.en#ExitPolicies for more info.
+
+          You can specify which services Tor users may access via your exit relay using exitPolicy option.
+        '';
+      };
+
+      nickname = mkOption {
+        default = "anonymous";
+        description = ''
+          A unique handle for your TOR relay.
+        '';
+      };
+
+      relayBandwidthRate = mkOption {
+        default = 0;
+        example = 100;
+        description = ''
+          Specify this to limit the bandwidth usage of relayed (server)
+          traffic. Your own traffic is still unthrottled. Units: kilobytes/second.
+        '';
+      };
+
+      relayBandwidthBurst = mkOption {
+        default = 0;
+        example = 200;
+        description = ''
+          Specify this to allow bursts of the bandwidth usage of relayed (server)
+          traffic. The average usage will still be as specified in relayBandwidthRate.
+          Your own traffic is still unthrottled. Units: kilobytes/second.
+        '';
+      };
+
+      relayPort = mkOption {
+        default = 9001;
+        description = ''
+          What port to advertise for Tor connections.
+        '';
+      };
+
+      relayListenAddress = mkOption {
+        default = "";
+        example = "0.0.0.0:9090";
+        description = ''
+          Set this if you need to listen on a port other than the one advertised
+          in relayPort (e.g. to advertise 443 but bind to 9090). You'll need to do
+          ipchains or other port forwarding yourself to make this work.
+        '';
+      };
+
+      exitPolicy = mkOption {
+        default = "";
+        example = "accept *:6660-6667,reject *:*";
+        description = ''
+          A comma-separated list of exit policies. They're considered first
+          to last, and the first match wins. If you want to _replace_
+          the default exit policy, end this with either a reject *:* or an
+          accept *:*. Otherwise, you're _augmenting_ (prepending to) the
+          default exit policy. Leave commented to just use the default, which is
+          available in the man page or at https://www.torproject.org/documentation.html
+
+          Look at https://www.torproject.org/faq-abuse.html#TypicalAbuses
+          for issues you might encounter if you use the default exit policy.
+
+          If certain IPs and ports are blocked externally, e.g. by your firewall,
+          you should update your exit policy to reflect this -- otherwise Tor
+          users will be told that those destinations are down.
+        '';
+      };
+
     };
 
   };
@@ -90,9 +213,17 @@ in
 
   ###### implementation
 
-  config = mkIf config.services.tor.enable {
+  config = mkIf cfg.enable {
     environment.systemPackages = [ tor ];  # provides tor-resolve and torify
-  
+
+    assertions = [{
+      assertion = cfg.enableRelay || cfg.enableClient;
+      message = "Need to either enable TOR client or relay functionality";
+    } {
+      assertion = cfg.enableRelay -> !(cfg.isBridgeRelay && cfg.isExitRelay);
+      message = "Can't be both an exit and a bridge relay at the same time";
+    } ];
+
     users.extraUsers = singleton
       { name = torUser;
         uid = config.ids.uids.tor;
@@ -111,10 +242,10 @@ in
             mkdir -m 0755 -p ${stateDir}
             chown ${torUser} ${stateDir}
           '';
-        exec = "${tor}/bin/tor -f ${pkgs.writeText "torrc" config.services.tor.config}";
+        exec = "${tor}/bin/tor -f ${pkgs.writeText "torrc" cfg.config}";
       };
 
-    jobs.torPrivoxy = mkIf config.services.tor.enablePrivoxy 
+    jobs.torPrivoxy = mkIf (cfg.enablePrivoxy && cfg.enableClient)
       { name = "tor-privoxy";
 
         startOn = "starting tor";
@@ -128,22 +259,32 @@ in
             # Needed to run privoxy as an unprivileged user?
             ${modprobe}/sbin/modprobe capability || true
           '';
-        exec = "${privoxy}/sbin/privoxy --no-daemon --user ${torUser} ${pkgs.writeText "torPrivoxy.conf" config.services.tor.privoxyConfig}";
+        exec = "${privoxy}/sbin/privoxy --no-daemon --user ${torUser} ${pkgs.writeText "torPrivoxy.conf" cfg.privoxyConfig}";
       };
 
       services.tor.config = ''
         DataDirectory ${stateDir}
         User ${torUser}
-        SocksListenAddress ${config.services.tor.socksListenAddress}
-    
-        # Extra configurations go here
+      ''
+      + optionalString cfg.enableClient  ''
+        SocksListenAddress ${cfg.socksListenAddress}
+        ${opt "SocksPolicy" cfg.socksPolicy}
+      ''
+      + optionalString cfg.enableRelay ''
+        ORPort ${toString cfg.relayPort}
+        ${opt "ORListenAddress" cfg.relayListenAddress }
+        ${opt "Nickname" cfg.nickname}
+        ${optint "RelayBandwidthRate" cfg.relayBandwidthRate}
+        ${optint "RelayBandwidthBurst" cfg.relayBandwidthBurst}
+        ${if cfg.isExitRelay then opt "ExitPolicy" cfg.exitPolicy else "ExitPolicy reject *:*"}
+        ${if cfg.isBridgeRelay then "BridgeRelay 1" else ""}
       '';
     
       services.tor.privoxyConfig = ''
         # Generally, this file goes in /etc/privoxy/config
         #
         # Tor listens as a SOCKS4a proxy here:
-        forward-socks4a / ${config.services.tor.socksListenAddress} .
+        forward-socks4a / ${cfg.socksListenAddress} .
         confdir ${privoxy}/etc
         logdir ${privoxyDir}
         # actionsfile standard  # Internal purpose, recommended
@@ -159,7 +300,7 @@ in
         debug   8192 # Errors - *we highly recommended enabling this*
         
         user-manual ${privoxy}/doc/privoxy/user-manual
-        listen-address  ${config.services.tor.privoxyListenAddress}
+        listen-address  ${cfg.privoxyListenAddress}
         toggle  1
         enable-remote-toggle 0
         enable-edit-actions 0
-- 
GitLab


From ddf6dae8956c883dd128b2e1fe734610dc0d11a1 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 12 Jul 2010 12:35:25 +0000
Subject: [PATCH 2469/5331] * Urgh, we do need to wait after each parted call  
 (http://hydra.nixos.org/build/483571).

svn path=/nixos/trunk/; revision=22558
---
 tests/installer.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/tests/installer.nix b/tests/installer.nix
index bfecca48cc0..35f734cd71d 100644
--- a/tests/installer.nix
+++ b/tests/installer.nix
@@ -285,10 +285,15 @@ in {
           $machine->mustSucceed(
               "parted /dev/vda mklabel msdos",
               "parted /dev/vda -- mkpart primary ext2 1M 30MB", # /boot
+              "udevadm settle",
               "parted /dev/vda -- mkpart extended 30M -1s", # extended partition
+              "udevadm settle",
               "parted /dev/vda -- mkpart logical 30M 1000M", # md0 (root), first device
+              "udevadm settle",
               "parted /dev/vda -- mkpart logical 1024M 2000M", # md0 (root), second device
+              "udevadm settle",
               "parted /dev/vda -- mkpart logical 2048M 2548M", # md1 (swap), first device
+              "udevadm settle",
               "parted /dev/vda -- mkpart logical 2560M 3060M", # md1 (swap), second device
               "udevadm settle",
               "mdadm --create --force /dev/md0 --metadata 1.2 --level=raid1 --raid-devices=2 /dev/vda5 /dev/vda6",
-- 
GitLab


From b51e309c89532a4f578e95e54064ce71a83daf50 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 12 Jul 2010 13:03:27 +0000
Subject: [PATCH 2470/5331] * `sm-notify' should also run on the server  
 (http://hydra.nixos.org/build/483567).  I love regression tests.

svn path=/nixos/trunk/; revision=22559
---
 modules/services/network-filesystems/nfs-kernel.nix | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/modules/services/network-filesystems/nfs-kernel.nix b/modules/services/network-filesystems/nfs-kernel.nix
index de41015c82d..ca59a27dc36 100644
--- a/modules/services/network-filesystems/nfs-kernel.nix
+++ b/modules/services/network-filesystems/nfs-kernel.nix
@@ -175,8 +175,7 @@ in
 
             exec = "${pkgs.nfsUtils}/sbin/rpc.statd --no-notify";
 
-            postStart = optionalString cfg.client.enable
-              "${pkgs.nfsUtils}/sbin/sm-notify -d";
+            postStart = "${pkgs.nfsUtils}/sbin/sm-notify -d";
           };
         };
       
-- 
GitLab


From aa3230979ba2d6dac5997107e50023e5a6df0ad7 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 12 Jul 2010 13:41:22 +0000
Subject: [PATCH 2471/5331] * Set the priorities right.

svn path=/nixos/trunk/; revision=22560
---
 modules/testing/test-instrumentation.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/testing/test-instrumentation.nix b/modules/testing/test-instrumentation.nix
index b70c6e03f27..7e4bca6ed41 100644
--- a/modules/testing/test-instrumentation.nix
+++ b/modules/testing/test-instrumentation.nix
@@ -78,8 +78,8 @@ in
     services.syslogd.extraConfig = "*.* /dev/ttyS0";
 
     # Prevent tests from accessing the Internet.
-    networking.defaultGateway = mkOverride 200 {} "";
-    networking.nameservers = mkOverride 200 {} [ ];
+    networking.defaultGatewayte = mkOverride 150 {} "";
+    networking.nameservers = mkOverride 150 {} [ ];
 
     # Apply a patch to the kernel to increase the 15s CIFS timeout.
     nixpkgs.config.packageOverrides = pkgs: {
-- 
GitLab


From ae539b77903209b268fa3c8b04659a5b8ccac75e Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 12 Jul 2010 13:42:59 +0000
Subject: [PATCH 2472/5331] * Oops.

svn path=/nixos/trunk/; revision=22561
---
 modules/testing/test-instrumentation.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/testing/test-instrumentation.nix b/modules/testing/test-instrumentation.nix
index 7e4bca6ed41..ee445ef2f45 100644
--- a/modules/testing/test-instrumentation.nix
+++ b/modules/testing/test-instrumentation.nix
@@ -78,7 +78,7 @@ in
     services.syslogd.extraConfig = "*.* /dev/ttyS0";
 
     # Prevent tests from accessing the Internet.
-    networking.defaultGatewayte = mkOverride 150 {} "";
+    networking.defaultGateway = mkOverride 150 {} "";
     networking.nameservers = mkOverride 150 {} [ ];
 
     # Apply a patch to the kernel to increase the 15s CIFS timeout.
-- 
GitLab


From 9600035e02619d6d58d7828b4f9ce893b520538a Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 12 Jul 2010 15:14:26 +0000
Subject: [PATCH 2473/5331] * Don't use "starting" events because they
 basically don't work - they   cause restarting of jobs to hang indefinitely
 because the required   "start on" condition never triggers.

  For instance, after "stop nfs-kernel-nfsd", "start nfs-kernel-nfsd"
  will hang until we do "stop portmap; start portmap".  This is due to
  the "starting nfs-kernel-nfsd and started portmap" condition in
  the nfs-kernel-mountd job.  Apparently, because portmap is already
  running, the condition "started portmap" never happens because no
  event is emitted.

svn path=/nixos/trunk/; revision=22562
---
 modules/services/network-filesystems/nfs-kernel.nix | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/modules/services/network-filesystems/nfs-kernel.nix b/modules/services/network-filesystems/nfs-kernel.nix
index ca59a27dc36..8e9729f5f8b 100644
--- a/modules/services/network-filesystems/nfs-kernel.nix
+++ b/modules/services/network-filesystems/nfs-kernel.nix
@@ -96,7 +96,6 @@ in
             description = "Kernel NFS server";
 
             startOn = "started network-interfaces";
-            stopOn = "stopping network-interfaces";
 
             preStart =
               ''
@@ -131,7 +130,7 @@ in
 
             description = "Kernel NFS server";
 
-            startOn = "started nfs-kernel-exports and started portmap";
+            startOn = "started nfs-kernel-exports and started nfs-kernel-mountd and started nfs-kernel-statd and started portmap";
             stopOn = "stopping nfs-kernel-exports";
 
             preStart = "${pkgs.nfsUtils}/sbin/rpc.nfsd ${if cfg.server.hostName != null then "-H ${cfg.server.hostName}" else ""} ${builtins.toString cfg.server.nproc}";
@@ -146,7 +145,7 @@ in
 
             description = "Kernel NFS server - mount daemon";
 
-            startOn = "starting nfs-kernel-nfsd and started portmap";
+            startOn = "started portmap";
             stopOn = "stopped nfs-kernel-nfsd";
 
             daemonType = "fork";
@@ -161,7 +160,7 @@ in
 
             description = "Kernel NFS server - Network Status Monitor";
 
-            startOn = "started portmap" + optionalString cfg.server.enable " and starting nfs-kernel-nfsd";
+            startOn = "started portmap";
             stopOn = "never";
 
             preStart =
-- 
GitLab


From c50948309d2cf52c7f2be9cb29eaaa997bf04cac Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 12 Jul 2010 15:32:23 +0000
Subject: [PATCH 2474/5331] * Add a missing dependency.

svn path=/nixos/trunk/; revision=22563
---
 modules/services/network-filesystems/nfs-kernel.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/services/network-filesystems/nfs-kernel.nix b/modules/services/network-filesystems/nfs-kernel.nix
index 8e9729f5f8b..603e63f6005 100644
--- a/modules/services/network-filesystems/nfs-kernel.nix
+++ b/modules/services/network-filesystems/nfs-kernel.nix
@@ -145,7 +145,7 @@ in
 
             description = "Kernel NFS server - mount daemon";
 
-            startOn = "started portmap";
+            startOn = "started portmap and started nfs-kernel-exports";
             stopOn = "stopped nfs-kernel-nfsd";
 
             daemonType = "fork";
-- 
GitLab


From 14ddf8e096e8d03c2adca059f2d6352df02f2773 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 12 Jul 2010 16:07:26 +0000
Subject: [PATCH 2475/5331] * On an `ip-up' event, notify mountall so that it
 retries mounting   remote filesystems.

svn path=/nixos/trunk/; revision=22564
---
 modules/tasks/filesystems.nix | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

diff --git a/modules/tasks/filesystems.nix b/modules/tasks/filesystems.nix
index 22df9dd2a32..9b8ddfb8eb5 100644
--- a/modules/tasks/filesystems.nix
+++ b/modules/tasks/filesystems.nix
@@ -170,6 +170,7 @@ in
             exec > /dev/console 2>&1
             echo "mounting filesystems..."
             export PATH=${config.system.sbin.mount}/bin:${makeSearchPath "sbin" ([pkgs.utillinux] ++ fsPackages)}:$PATH
+            mv /etc/hosts /etc/hosts_
             ${pkgs.mountall}/sbin/mountall
           '';
       };
@@ -177,7 +178,7 @@ in
     # The `mount-failed' event is emitted synchronously, but we don't
     # want `mountall' to wait for the emergency shell.  So use this
     # intermediate job to make the event asynchronous.
-    jobs.mountFailed =
+    jobs.mount_failed =
       { name = "mount-failed";
         task = true;
         startOn = "mount-failed";
@@ -189,7 +190,20 @@ in
           '';
       };
 
-    jobs.emergencyShell =
+    # On an `ip-up' event, notify mountall so that it retries mounting
+    # remote filesystems.
+    jobs.mountall_ip_up =
+      {
+        name = "mountall-ip-up";
+        task = true;
+        startOn = "ip-up";
+        script =
+          ''
+            ${pkgs.procps}/bin/pkill -USR1 -u root mountall || true
+          '';
+      };
+
+    jobs.emergency_shell =
       { name = "emergency-shell";
 
         task = true;
-- 
GitLab


From 158c3daec141dafafd146238631ef2efe21106a1 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 12 Jul 2010 16:09:02 +0000
Subject: [PATCH 2476/5331] * Don't do the "poweroff -f" fallback because that
 prevents   interactive testing ("nix-build tests/ -A nfs.vms;  
 ./result/bin/run-vms").

svn path=/nixos/trunk/; revision=22565
---
 modules/testing/test-instrumentation.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/testing/test-instrumentation.nix b/modules/testing/test-instrumentation.nix
index ee445ef2f45..f0922682b2a 100644
--- a/modules/testing/test-instrumentation.nix
+++ b/modules/testing/test-instrumentation.nix
@@ -36,7 +36,7 @@ in
             source /etc/profile
             cd /tmp
             echo "connecting to host..." > /dev/ttyS0
-            ${pkgs.socat}/bin/socat tcp:10.0.2.6:23 exec:${rootShell} 2> /dev/ttyS0 || poweroff -f
+            ${pkgs.socat}/bin/socat tcp:10.0.2.6:23 exec:${rootShell} 2> /dev/ttyS0 # || poweroff -f
           '';
 
         respawn = false;
-- 
GitLab


From dc0db647a94dda616a17575828a35ab7742bf1c9 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 12 Jul 2010 16:40:02 +0000
Subject: [PATCH 2477/5331] * Remove a debug line that should not have been
 committed.

svn path=/nixos/trunk/; revision=22566
---
 modules/tasks/filesystems.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/modules/tasks/filesystems.nix b/modules/tasks/filesystems.nix
index 9b8ddfb8eb5..5735d943c51 100644
--- a/modules/tasks/filesystems.nix
+++ b/modules/tasks/filesystems.nix
@@ -170,7 +170,6 @@ in
             exec > /dev/console 2>&1
             echo "mounting filesystems..."
             export PATH=${config.system.sbin.mount}/bin:${makeSearchPath "sbin" ([pkgs.utillinux] ++ fsPackages)}:$PATH
-            mv /etc/hosts /etc/hosts_
             ${pkgs.mountall}/sbin/mountall
           '';
       };
-- 
GitLab


From 86d53a5b8b9067121336c4f52b720622014f2df9 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 12 Jul 2010 17:50:02 +0000
Subject: [PATCH 2478/5331] * Load the cpufreq modules, since these are not
 loaded automatically   by udev.  The kernel can load governors on demand, but
 if they are   not loaded, HAL doesn't know about them and they don't show up
 in   the KDE System Settings.

svn path=/nixos/trunk/; revision=22567
---
 modules/config/power-management.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/modules/config/power-management.nix b/modules/config/power-management.nix
index dd241e4e815..5e5a568f2ff 100644
--- a/modules/config/power-management.nix
+++ b/modules/config/power-management.nix
@@ -69,6 +69,8 @@ in
       { source = sleepHook;
         target = "pm/sleep.d/00sleep-hook";
       };
+
+    boot.kernelModules = [ "acpi_cpufreq" "cpufreq_performance" "cpufreq_powersave" "cpufreq_ondemand" ];
     
   };
 
-- 
GitLab


From 44656be396fd9b7d46d133f8d5238db521793750 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 13 Jul 2010 09:22:52 +0000
Subject: [PATCH 2479/5331] =?UTF-8?q?*=20dbus-daemon:=20use=20/etc/dbus-1/?=
 =?UTF-8?q?system.conf=20(i.e.=20=E2=80=98--system=E2=80=99)=20rather=20th?=
 =?UTF-8?q?an=20=20=20${configDir}/system.conf.=20=20This=20is=20necessary?=
 =?UTF-8?q?=20to=20enable=20dbus=20to=20=20=20reload=20its=20configuration?=
 =?UTF-8?q?=20on=20SIGHUP=20after=20a=20nixos-rebuild.=20=20(The=20=20=20d?=
 =?UTF-8?q?aemon=20cannot=20be=20restarted=20because=20then=20console-kit-?=
 =?UTF-8?q?daemon=20loses=20its=20=20=20state.)=20*=20Generate=20a=20prope?=
 =?UTF-8?q?r=20/etc/dbus-1/session.conf.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

svn path=/nixos/trunk/; revision=22572
---
 modules/services/system/dbus.nix | 33 +++++++++++++++++++++-----------
 1 file changed, 22 insertions(+), 11 deletions(-)

diff --git a/modules/services/system/dbus.nix b/modules/services/system/dbus.nix
index 6dbee3e6a04..d6e647ac2dd 100644
--- a/modules/services/system/dbus.nix
+++ b/modules/services/system/dbus.nix
@@ -1,5 +1,6 @@
-# D-Bus system-wide daemon.
-{pkgs, config, ...}:
+# D-Bus configuration and system bus daemon.
+
+{ config, pkgs, ... }:
 
 with pkgs.lib;
 
@@ -16,27 +17,33 @@ let
     buildCommand = ''
       ensureDir $out
       
-      ln -s ${dbus}/etc/dbus-1/session.conf $out/session.conf
-      
       cp ${dbus}/etc/dbus-1/system.conf $out/system.conf
 
+      # !!! Hm, these `sed' calls are rather error-prone...
+
       # Tell the daemon where the setuid wrapper around
       # dbus-daemon-launch-helper lives.      
       sed -i $out/system.conf \
           -e 's|<servicehelper>.*/libexec/dbus-daemon-launch-helper|<servicehelper>${config.security.wrapperDir}/dbus-daemon-launch-helper|'
 
-      # Add the system-services directories to the daemon's search path.
+      # Add the system-services and system.d directories to the system
+      # bus search path.
       sed -i $out/system.conf \
           -e 's|<standard_system_servicedirs/>|${systemServiceDirs}|'
-          
-      # Note: system.conf includes ./system.d (i.e. it has a relative,
-      # not absolute path).
+
+      cp ${dbus}/etc/dbus-1/session.conf $out/session.conf
+      
+      # Add the services and session.d directories to the session bus
+      # search path.
+      sed -i $out/session.conf \
+          -e 's|<standard_session_servicedirs />|${sessionServiceDirs}|'
+
       ensureDir $out/session.d
       ensureDir $out/system.d
       
       for i in ${toString cfg.packages}; do
         for j in $i/etc/dbus-1/session.d/*; do
-          ln -s $j  $out/session.d/
+          ln -s $j $out/session.d/
         done
         for j in $i/etc/dbus-1/system.d/*; do
           ln -s $j $out/system.d/
@@ -49,6 +56,10 @@ let
     (d: "<servicedir>${d}/share/dbus-1/system-services</servicedir> ")
     cfg.packages;
 
+  sessionServiceDirs = concatMapStrings
+    (d: "<servicedir>${d}/share/dbus-1/services</servicedir> ")
+    cfg.packages;
+
 in
 
 {
@@ -88,7 +99,7 @@ in
 
   config = mkIf cfg.enable {
 
-    environment.systemPackages = [dbus.daemon dbus.tools];
+    environment.systemPackages = [ dbus.daemon dbus.tools ];
 
     environment.etc = singleton
       # We need /etc/dbus-1/system.conf for now, because
@@ -128,7 +139,7 @@ in
 
         daemonType = "fork";
 
-        exec = "${dbus}/bin/dbus-daemon --config-file=${configDir}/system.conf";
+        exec = "${dbus}/bin/dbus-daemon --system";
 
         postStop =
           ''
-- 
GitLab


From 2b7ac80b3d9fea141d2aa41dec38683c357e344f Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 13 Jul 2010 09:23:35 +0000
Subject: [PATCH 2480/5331] * Style changes.

svn path=/nixos/trunk/; revision=22573
---
 modules/services/scheduling/atd.nix | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/modules/services/scheduling/atd.nix b/modules/services/scheduling/atd.nix
index be27e4b3bc6..2934e2117c7 100644
--- a/modules/services/scheduling/atd.nix
+++ b/modules/services/scheduling/atd.nix
@@ -81,19 +81,20 @@ in
 
             for dir in "$spooldir" "$jobdir" "$etcdir"; do
               if [ ! -d "$dir" ]; then
-                  mkdir -p "$dir" && chown atd:atd "$dir"
+                  mkdir -p "$dir"
+                  chown atd:atd "$dir"
               fi
             done
             chmod 1770 "$spooldir" "$jobdir"
             ${if cfg.allowEveryone then ''chmod a+rwxt "$spooldir" "$jobdir" '' else ""}
             if [ ! -f "$etcdir"/at.deny ]; then
-                touch "$etcdir"/at.deny && \
-                chown root:atd "$etcdir"/at.deny && \
+                touch "$etcdir"/at.deny
+                chown root:atd "$etcdir"/at.deny
                 chmod 640 "$etcdir"/at.deny
             fi
             if [ ! -f "$jobdir"/.SEQ ]; then
-                touch "$jobdir"/.SEQ && \
-                chown atd:atd "$jobdir"/.SEQ && \
+                touch "$jobdir"/.SEQ
+                chown atd:atd "$jobdir"/.SEQ
                 chmod 600 "$jobdir"/.SEQ
             fi
           '';
-- 
GitLab


From baf54c517d9b90f34b97f4b5c8fddf26e7a94ba4 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 13 Jul 2010 11:48:40 +0000
Subject: [PATCH 2481/5331] * Fix the terminal_output command.  (This used to
 work but not with   the latest GRUB I guess.)

svn path=/nixos/trunk/; revision=22575
---
 modules/installer/cd-dvd/iso-image.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/installer/cd-dvd/iso-image.nix b/modules/installer/cd-dvd/iso-image.nix
index e5f438ab5ab..71b797b0d95 100644
--- a/modules/installer/cd-dvd/iso-image.nix
+++ b/modules/installer/cd-dvd/iso-image.nix
@@ -75,7 +75,7 @@ let
         set gfxmode=640x480
         insmod gfxterm
         insmod vbe
-        terminal_output.gfxterm
+        terminal_output gfxterm
 
         insmod png
         if background_image /boot/grub/splash.png; then
-- 
GitLab


From 2a6819e03d74fc5746133ad64ca999d78a9d80e8 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 13 Jul 2010 11:57:12 +0000
Subject: [PATCH 2482/5331] * swraid test: Fix the alignment of the first
 logical partition.  GNU   parted 2.3 barfs on this
 (http://hydra.nixos.org/build/484788),   while 2.2 accepts it.

svn path=/nixos/trunk/; revision=22576
---
 tests/installer.nix | 22 ++++++++++------------
 1 file changed, 10 insertions(+), 12 deletions(-)

diff --git a/tests/installer.nix b/tests/installer.nix
index 35f734cd71d..eea72756ea0 100644
--- a/tests/installer.nix
+++ b/tests/installer.nix
@@ -283,19 +283,17 @@ in {
     { createPartitions =
         ''
           $machine->mustSucceed(
-              "parted /dev/vda mklabel msdos",
-              "parted /dev/vda -- mkpart primary ext2 1M 30MB", # /boot
-              "udevadm settle",
-              "parted /dev/vda -- mkpart extended 30M -1s", # extended partition
-              "udevadm settle",
-              "parted /dev/vda -- mkpart logical 30M 1000M", # md0 (root), first device
-              "udevadm settle",
-              "parted /dev/vda -- mkpart logical 1024M 2000M", # md0 (root), second device
-              "udevadm settle",
-              "parted /dev/vda -- mkpart logical 2048M 2548M", # md1 (swap), first device
-              "udevadm settle",
-              "parted /dev/vda -- mkpart logical 2560M 3060M", # md1 (swap), second device
+              "parted /dev/vda --"
+              . " mklabel msdos"
+              . " mkpart primary ext2 1M 30MB" # /boot
+              . " mkpart extended 30M -1s"
+              . " mkpart logical 31M 1000M" # md0 (root), first device
+              . " mkpart logical 1024M 2000M" # md0 (root), second device
+              . " mkpart logical 2048M 2548M" # md1 (swap), first device
+              . " mkpart logical 2560M 3060M", # md1 (swap), second device
               "udevadm settle",
+              "ls -l /dev/vda* >&2",
+              "cat /proc/partitions >&2",
               "mdadm --create --force /dev/md0 --metadata 1.2 --level=raid1 --raid-devices=2 /dev/vda5 /dev/vda6",
               "mdadm --create --force /dev/md1 --metadata 1.2 --level=raid1 --raid-devices=2 /dev/vda7 /dev/vda8",
               "mkswap -f /dev/md1 -L swap",
-- 
GitLab


From e058f7ea4540e278c5288f45f3580816f5de015c Mon Sep 17 00:00:00 2001
From: Wouter den Breejen <uu@denbreejen.net>
Date: Tue, 13 Jul 2010 14:45:44 +0000
Subject: [PATCH 2483/5331] sabnzbd now really starts at boot

svn path=/nixos/trunk/; revision=22579
---
 modules/services/networking/sabnzbd.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/services/networking/sabnzbd.nix b/modules/services/networking/sabnzbd.nix
index 7f87343cbb9..06c528188b6 100644
--- a/modules/services/networking/sabnzbd.nix
+++ b/modules/services/networking/sabnzbd.nix
@@ -42,8 +42,8 @@ in
     jobs.sabnzbd =
       { description = "sabnzbd server";
 
-        startOn = "network-interfaces/started";
-        stopOn = "network-interfaces/stop";
+        startOn = "started network-interfaces";
+        stopOn = "stopping network-interfaces";
 
         exec = "${sabnzbd}/bin/sabnzbd -d -f ${cfg.configFile}";
       };
-- 
GitLab


From 4b018d1294fa364f4e56b1ce231169d7d6265366 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 13 Jul 2010 20:47:31 +0000
Subject: [PATCH 2484/5331] svn path=/nixos/trunk/; revision=22587

---
 modules/virtualisation/amazon-image.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/virtualisation/amazon-image.nix b/modules/virtualisation/amazon-image.nix
index acb0c22ab61..be201786055 100644
--- a/modules/virtualisation/amazon-image.nix
+++ b/modules/virtualisation/amazon-image.nix
@@ -10,7 +10,7 @@ with pkgs.lib;
             ''
               mkdir $out
               diskImage=$out/nixos.img
-              qemu-img create -f raw $diskImage "4G"
+              ${pkgs.vmTools.kvm}/bin/qemu-img create -f raw $diskImage "4G"
             '';
           buildInputs = [ pkgs.utillinux pkgs.perl ];
           exportReferencesGraph = 
-- 
GitLab


From fb97b5b1224ff891400b2c8a697d2a670cc3514f Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 13 Jul 2010 21:11:35 +0000
Subject: [PATCH 2485/5331] * MediaWiki 1.15.4.

svn path=/nixos/trunk/; revision=22589
---
 modules/services/web-servers/apache-httpd/mediawiki.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/modules/services/web-servers/apache-httpd/mediawiki.nix b/modules/services/web-servers/apache-httpd/mediawiki.nix
index a0d8a653fb9..71ad6f2ad76 100644
--- a/modules/services/web-servers/apache-httpd/mediawiki.nix
+++ b/modules/services/web-servers/apache-httpd/mediawiki.nix
@@ -34,7 +34,7 @@ let
         $wgDiff = "${pkgs.diffutils}/bin/diff";
         $wgImageMagickConvertCommand = "${pkgs.imagemagick}/bin/convert";
 
-        $wgDebugLogFile = "/tmp/mediawiki_debug_log.txt";
+        #$wgDebugLogFile = "/tmp/mediawiki_debug_log.txt";
 
         # Database configuration.
         $wgDBtype = "${config.dbType}";
@@ -63,11 +63,11 @@ let
 
   # Unpack Mediawiki and put the config file in its root directory.
   mediawikiRoot = pkgs.stdenv.mkDerivation rec {
-    name= "mediawiki-1.15.1";
+    name= "mediawiki-1.15.4";
     
     src = pkgs.fetchurl {
       url = "http://download.wikimedia.org/mediawiki/1.15/${name}.tar.gz";
-      sha256 = "0i6sb6p4ng38i8s3az42j6wnw6fpxvv3l9cvraav6wsn2cdj4jh4";
+      sha256 = "1blf79lhnaxixc8z96f9z4xi2jlg906ps3kd4x8b9ipg2dgl3vy9";
     };
 
     buildPhase = "true";
-- 
GitLab


From bfe46a653ba2f8ff9902128f485cbd87c49cbca7 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 14 Jul 2010 10:55:45 +0000
Subject: [PATCH 2486/5331] * Mount /dev, /proc and /sys when booting without a
 stage 1 (e.g. on   Amazon).

svn path=/nixos/trunk/; revision=22598
---
 modules/system/boot/stage-2-init.sh | 24 +++++++++++++++++++-----
 1 file changed, 19 insertions(+), 5 deletions(-)

diff --git a/modules/system/boot/stage-2-init.sh b/modules/system/boot/stage-2-init.sh
index aaf135fe51a..6a8bf5cbdb4 100644
--- a/modules/system/boot/stage-2-init.sh
+++ b/modules/system/boot/stage-2-init.sh
@@ -36,14 +36,28 @@ setPath "@path@"
 mount -n -o remount,rw none /
 
 
-# Mount special file systems.  Note that /dev, /proc and /sys are
-# already mounted by `switch_root' in the initrd.
+# Likewise, stage 1 mounts /proc, /dev and /sys, so if we don't have a
+# stage 1, we need to do that here.
+if [ ! -e /proc/1 ]; then
+    mkdir -m 0755 -p /proc
+    mount -n -t proc none /proc
+    mkdir -m 0755 -p /sys 
+    mount -t sysfs none /sys
+    mkdir -m 0755 -p /dev
+    mount -t tmpfs -o "mode=0755" none /dev
+
+    # Create the minimal device nodes needed for the activation scripts
+    # and Upstart.
+    mknod -m 0666 /dev/null c 1 3
+    mknod -m 0644 /dev/urandom c 1 9 # needed for passwd
+    mknod -m 0644 /dev/console c 5 1
+fi
+
+
+# Provide a /etc/mtab.
 mkdir -m 0755 -p /etc
 test -e /etc/fstab || touch /etc/fstab # to shut up mount
-test -s /etc/mtab && rm /etc/mtab # while installing a symlink is created (see man mount), if it's still there for whateever reason remove it
 rm -f /etc/mtab* # not that we care about stale locks
-
-rm -f /etc/mtab
 cat /proc/mounts > /etc/mtab
 
 
-- 
GitLab


From f0b647c326c1a341fc00be26c4aea41a2cc63d02 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 14 Jul 2010 12:58:38 +0000
Subject: [PATCH 2487/5331] * Allow the Apache submodules to declare whether
 they need PHP.   Don't depend on PHP unless this is the case.

svn path=/nixos/trunk/; revision=22600
---
 .../web-servers/apache-httpd/default.nix       | 18 +++++++++++++-----
 .../web-servers/apache-httpd/mediawiki.nix     |  2 ++
 .../web-servers/apache-httpd/subversion.nix    |  3 ++-
 .../web-servers/apache-httpd/zabbix.nix        |  3 +--
 4 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/modules/services/web-servers/apache-httpd/default.nix b/modules/services/web-servers/apache-httpd/default.nix
index d9a1e7d05fe..d31d62a0308 100644
--- a/modules/services/web-servers/apache-httpd/default.nix
+++ b/modules/services/web-servers/apache-httpd/default.nix
@@ -68,6 +68,7 @@ let
           globalEnvVars = [];
           robotsEntries = "";
           startupScript = "";
+          enablePHP = false;
           phpOptions = "";
           options = {};
         };
@@ -109,7 +110,9 @@ let
       "mime" "dav" "status" "autoindex" "asis" "info" "cgi" "dav_fs"
       "vhost_alias" "negotiation" "dir" "imagemap" "actions" "speling"
       "userdir" "alias" "rewrite" "proxy" "proxy_http"
-    ] ++ optional enableSSL "ssl" ++ extraApacheModules;
+    ] 
+    ++ optional enableSSL "ssl"
+    ++ extraApacheModules;
     
 
   loggingConf = ''
@@ -299,9 +302,11 @@ let
     ${let
         load = {name, path}: "LoadModule ${name}_module ${path}\n";
         allModules =
-          concatMap (svc: svc.extraModulesPre) allSubservices ++
-          map (name: {inherit name; path = "${httpd}/modules/mod_${name}.so";}) apacheModules ++
-          concatMap (svc: svc.extraModules) allSubservices ++ extraForeignModules;
+          concatMap (svc: svc.extraModulesPre) allSubservices
+          ++ map (name: {inherit name; path = "${httpd}/modules/mod_${name}.so";}) apacheModules
+          ++ optional enablePHP { name = "php5"; path = "${pkgs.php}/modules/libphp5.so"; }
+          ++ concatMap (svc: svc.extraModules) allSubservices 
+          ++ extraForeignModules;
       in concatMapStrings load allModules
     }
 
@@ -360,6 +365,9 @@ let
   '';
 
 
+  enablePHP = any (svc: svc.enablePHP) allSubservices;
+
+
   # Generate the PHP configuration file.  Should probably be factored
   # out into a separate module.
   phpIni = pkgs.runCommand "php.ini"
@@ -563,7 +571,7 @@ in
                 optional config.networking.defaultMailServer.directDelivery "${pkgs.ssmtp}/sbin"
              ++ (concatMap (svc: svc.extraServerPath) allSubservices) );
 
-           PHPRC = phpIni;
+           PHPRC = if enablePHP then phpIni else "";
 
            TZ = config.time.timeZone;
 
diff --git a/modules/services/web-servers/apache-httpd/mediawiki.nix b/modules/services/web-servers/apache-httpd/mediawiki.nix
index 71ad6f2ad76..bbd407043c8 100644
--- a/modules/services/web-servers/apache-httpd/mediawiki.nix
+++ b/modules/services/web-servers/apache-httpd/mediawiki.nix
@@ -109,6 +109,8 @@ in
       ''}
     '';
 
+  enablePHP = true;
+
   options = {
 
     id = mkOption {
diff --git a/modules/services/web-servers/apache-httpd/subversion.nix b/modules/services/web-servers/apache-httpd/subversion.nix
index 256e3ca3105..a96d38cd266 100644
--- a/modules/services/web-servers/apache-httpd/subversion.nix
+++ b/modules/services/web-servers/apache-httpd/subversion.nix
@@ -296,10 +296,11 @@ in {
 
   extraModules = [
     { name = "python";  path = "${pkgs.mod_python}/modules/mod_python.so"; }
-    { name = "php5";    path = "${pkgs.php}/modules/libphp5.so"; }
     { name = "dav_svn"; path = "${subversion}/modules/mod_dav_svn.so"; }
   ];
 
+  enablePHP = true;
+
   
   extraConfig = ''
   
diff --git a/modules/services/web-servers/apache-httpd/zabbix.nix b/modules/services/web-servers/apache-httpd/zabbix.nix
index 608c3e48fd0..3c2a30322f4 100644
--- a/modules/services/web-servers/apache-httpd/zabbix.nix
+++ b/modules/services/web-servers/apache-httpd/zabbix.nix
@@ -21,8 +21,7 @@ in
 
 {
 
-  extraModules =
-    [ { name = "php5"; path = "${pkgs.php}/modules/libphp5.so"; } ];
+  enablePHP = true;
 
   phpOptions =
     ''
-- 
GitLab


From f1dde44ac15e0f3fcea27cf72628b8ab8f0dedf9 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 14 Jul 2010 14:18:27 +0000
Subject: [PATCH 2488/5331] * Added an action `nixos-rebuild pull' to just pull
 the Nixpkgs   channel manifest and exit.  Useful if you don't want to use  
 nix-channel.

svn path=/nixos/trunk/; revision=22601
---
 modules/installer/tools/nixos-rebuild.sh | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/modules/installer/tools/nixos-rebuild.sh b/modules/installer/tools/nixos-rebuild.sh
index 6ed294ebf64..4d01ff53f89 100644
--- a/modules/installer/tools/nixos-rebuild.sh
+++ b/modules/installer/tools/nixos-rebuild.sh
@@ -23,6 +23,7 @@ The operation is one of the following:
   build-vm: build a virtual machine containing the configuration
             (useful for testing)
   dry-run:  just show what store paths would be built/downloaded
+  pull:     just pull the Nixpkgs channel manifest and exit
 
 Options:
 
@@ -63,7 +64,7 @@ while test "$#" -gt 0; do
       --help)
         showSyntax
       ;;
-      switch|boot|test|build|dry-run|build-vm)
+      switch|boot|test|build|dry-run|build-vm|pull)
         action="$i"
       ;;
       --install-grub)
@@ -142,6 +143,8 @@ if test -n "$pullManifest"; then
     done
 fi
 
+if [ "$action" = pull ]; then exit 0; fi 
+
 
 # First build Nix, since NixOS may require a newer version than the
 # current one.  Of course, the same goes for Nixpkgs, but Nixpkgs is
-- 
GitLab


From b614179eed786a90b0172054d3a573715c6d3468 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 15 Jul 2010 11:09:30 +0000
Subject: [PATCH 2489/5331] * Install a configuration.nix in the AMI.

svn path=/nixos/trunk/; revision=22607
---
 modules/virtualisation/amazon-config.nix | 5 +++++
 modules/virtualisation/amazon-image.nix  | 4 ++++
 2 files changed, 9 insertions(+)
 create mode 100644 modules/virtualisation/amazon-config.nix

diff --git a/modules/virtualisation/amazon-config.nix b/modules/virtualisation/amazon-config.nix
new file mode 100644
index 00000000000..836c46caae8
--- /dev/null
+++ b/modules/virtualisation/amazon-config.nix
@@ -0,0 +1,5 @@
+{ config, pkgs, modulesPath, ... }:
+
+{
+  require = [ "${modulesPath}/virtualisation/amazon-image.nix" ];
+}
diff --git a/modules/virtualisation/amazon-image.nix b/modules/virtualisation/amazon-image.nix
index be201786055..812bb8faf32 100644
--- a/modules/virtualisation/amazon-image.nix
+++ b/modules/virtualisation/amazon-image.nix
@@ -43,6 +43,10 @@ with pkgs.lib;
           # `nixos-rebuild' requires an /etc/NIXOS.
           mkdir -p /mnt/etc
           touch /mnt/etc/NIXOS
+
+          # Install a configuration.nix.
+          mkdir -p /mnt/etc/nixos
+          cp ${./amazon-config.nix} /mnt/etc/nixos/configuration.nix
                     
           # Amazon assumes that there is a /sbin/init, so create one.
           # Note that simply creating /sbin/init as a symlink breaks
-- 
GitLab


From f3e16077589c5dfa0319b46fb4240bdca2ce6934 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 15 Jul 2010 12:31:18 +0000
Subject: [PATCH 2490/5331] * Don't run the emergency-shell task after
 nixos-rebuild because it   screws up the X server (CPU usage goes to 100%,
 switching virtual   consoles no longer works, etc.).  TODO: we need some
 generic way to   mark jobs that shouldn't be started automatically.

svn path=/nixos/trunk/; revision=22608
---
 modules/system/activation/switch-to-configuration.sh | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/modules/system/activation/switch-to-configuration.sh b/modules/system/activation/switch-to-configuration.sh
index c741aeccdac..ccb3d230e8d 100644
--- a/modules/system/activation/switch-to-configuration.sh
+++ b/modules/system/activation/switch-to-configuration.sh
@@ -105,7 +105,9 @@ EOF
         # Another hack: don't restart the X server (that would kill all the clients).
         # And don't restart dbus, since that causes ConsoleKit to
         # forget about current sessions.
-        if echo "$job" | grep -q "^shutdown$\|^control-alt-delete$\|^xserver$\|^dbus$\|^disnix$"; then continue; fi
+        # Idem for the emergeny-shell, because its `console owner'
+        # line screws up the X server.
+        if echo "$job" | grep -q "^shutdown$\|^control-alt-delete$\|^xserver$\|^dbus$\|^disnix$\|^emergency-shell$"; then continue; fi
 
         if ! test -e "$oldJobs/$job.conf"; then
             echo "starting $job..."
-- 
GitLab


From 575950aa5de17d56b01d9a85e406282e67083ae4 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 15 Jul 2010 13:28:36 +0000
Subject: [PATCH 2491/5331] svn path=/nixos/trunk/; revision=22609

---
 tests/amazon.nix | 17 -----------------
 1 file changed, 17 deletions(-)
 delete mode 100644 tests/amazon.nix

diff --git a/tests/amazon.nix b/tests/amazon.nix
deleted file mode 100644
index 223bfb947d1..00000000000
--- a/tests/amazon.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-rec {
-
-  machine =
-    { config, pkgs, ... }:
-    
-    {
-      services.httpd.enable = true;
-      services.httpd.adminAddr = "e.dolstra@tudelft.nl";
-      services.httpd.documentRoot = "${pkgs.valgrind}/share/doc/valgrind/html";
-    };
-
-  config = (import ../lib/eval-config.nix {
-    system = "i686-linux";
-    modules = [ machine ../modules/virtualisation/amazon-image.nix ];
-  }).config;
-
-}
-- 
GitLab


From b835f7f0dd577af99730b29be7a605d9295910cd Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 15 Jul 2010 21:21:16 +0000
Subject: [PATCH 2492/5331] * Fix PostgreSQL boot.

svn path=/nixos/trunk/; revision=22615
---
 modules/services/databases/postgresql.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/services/databases/postgresql.nix b/modules/services/databases/postgresql.nix
index 38d2568613e..6d58b757421 100644
--- a/modules/services/databases/postgresql.nix
+++ b/modules/services/databases/postgresql.nix
@@ -157,7 +157,7 @@ in
     jobs.postgresql =
       { description = "PostgreSQL server";
 
-        startOn = "filesystem";
+        startOn = "started network-interfaces and filesystem";
 
         environment =
           { TZ = config.time.timeZone;
-- 
GitLab


From b14f80c89a30df5242c367c4e16a64ce21413e32 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sun, 18 Jul 2010 20:19:27 +0000
Subject: [PATCH 2493/5331] * The modprobe wrapper nowadays checks whether the
 version of the   current kernel module tree matches the booted kernel, so it
 should   be safe to use after an upgrade.

svn path=/nixos/trunk/; revision=22627
---
 modules/system/activation/activation-script.nix | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/modules/system/activation/activation-script.nix b/modules/system/activation/activation-script.nix
index 637f2503466..5c6ca55add8 100644
--- a/modules/system/activation/activation-script.nix
+++ b/modules/system/activation/activation-script.nix
@@ -61,14 +61,8 @@ let
       # Allow the kernel to find our wrapped modprobe (which searches
       # in the right location in the Nix store for kernel modules).
       # We need this when the kernel (or some module) auto-loads a
-      # module.  This is only done at boot time to make sure that we
-      # don't use modules that don't match the running kernel.
-      # !!! We should check whether the new kernel modules are
-      # compatible with the running kernel so that we can upgrade
-      # kernel modules (e.g. the NVIDIA driver) in a running system.
-      if [ "$(cat /proc/sys/kernel/modprobe)" = "/sbin/modprobe" ]; then
-        echo ${config.system.sbin.modprobe}/sbin/modprobe > /proc/sys/kernel/modprobe
-      fi
+      # module.
+      echo ${config.system.sbin.modprobe}/sbin/modprobe > /proc/sys/kernel/modprobe
     '' [
       # ?
     ];
-- 
GitLab


From 1a5c18d1b603497e2a99ccee1b6834fc1769fdde Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sun, 18 Jul 2010 22:29:40 +0000
Subject: [PATCH 2494/5331] svn path=/nixos/trunk/; revision=22647

---
 modules/testing/test-instrumentation.nix | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/modules/testing/test-instrumentation.nix b/modules/testing/test-instrumentation.nix
index f0922682b2a..a22b280d931 100644
--- a/modules/testing/test-instrumentation.nix
+++ b/modules/testing/test-instrumentation.nix
@@ -81,13 +81,13 @@ in
     networking.defaultGateway = mkOverride 150 {} "";
     networking.nameservers = mkOverride 150 {} [ ];
 
-    # Apply a patch to the kernel to increase the 15s CIFS timeout.
-    nixpkgs.config.packageOverrides = pkgs: {
-      linux = pkgs.linux.override (orig: {
-        kernelPatches = orig.kernelPatches ++ [ pkgs.kernelPatches.cifs_timeout ];
-      });
-    };
-
+    # Require a patch to the kernel to increase the 15s CIFS timeout.
+    assertions =
+      [ { assertion = config.boot.kernelPackages.kernel.features ? cifsTimeout;
+          message = "VM tests require that the kernel has the CIFS timeout patch.";
+        }
+      ];
+      
   };
 
 }
-- 
GitLab


From 63962dd7d69d5fb1859a3372b80be7b4e0ce30dc Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 20 Jul 2010 13:49:04 +0000
Subject: [PATCH 2495/5331] * Disable the test to see whether $stage2Init
 exists.  For some   unfathomable reason this test fails on EC2 if it's a
 symlink   (despite the -L test).  I give up.

svn path=/nixos/trunk/; revision=22676
---
 modules/system/boot/stage-1-init.sh | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/modules/system/boot/stage-1-init.sh b/modules/system/boot/stage-1-init.sh
index 727322c6b40..0c9f1d46b2f 100644
--- a/modules/system/boot/stage-1-init.sh
+++ b/modules/system/boot/stage-1-init.sh
@@ -291,10 +291,10 @@ echo /sbin/modprobe > /proc/sys/kernel/modprobe
 # current root.  It also moves the /proc, /sys and /dev mounts over to
 # the new root.  Note that $stage2Init might be an absolute symlink,
 # in which case "-e" won't work because we're not in the chroot yet.
-if ! test -e "$targetRoot/$stage2Init" -o -L "$targetRoot/$stage2Init"; then
-    echo "stage 2 init script not found"
-    fail
-fi
+#if ! test -e "$targetRoot/$stage2Init" -o -L "$targetRoot/$stage2Init"; then
+#    echo "stage 2 init script ($targetRoot/$stage2Init) not found"
+#    fail
+#fi
 
 mkdir -m 0755 -p $targetRoot/proc $targetRoot/sys $targetRoot/dev
 
-- 
GitLab


From 1b04d3a8135df19f3c91468cd19a18021b144116 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 20 Jul 2010 13:50:10 +0000
Subject: [PATCH 2496/5331] * Absolutise $systemConfig in case it's a symlink.

svn path=/nixos/trunk/; revision=22677
---
 modules/system/boot/stage-2-init.sh | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/modules/system/boot/stage-2-init.sh b/modules/system/boot/stage-2-init.sh
index 6a8bf5cbdb4..7070683d9b9 100644
--- a/modules/system/boot/stage-2-init.sh
+++ b/modules/system/boot/stage-2-init.sh
@@ -3,11 +3,6 @@
 # !!! copied from stage 1; remove duplication
 
 
-# If no `systemConfig' parameter is specified on the kernel command
-# line, use a fallback.
-systemConfig=/nix/var/nix/profiles/system
-
-
 # Print a greeting.
 echo
 echo -e "\e[1;32m<<< NixOS Stage 2 >>>\e[0m"
@@ -61,6 +56,11 @@ rm -f /etc/mtab* # not that we care about stale locks
 cat /proc/mounts > /etc/mtab
 
 
+# If no `systemConfig' parameter is specified on the kernel command
+# line, use a fallback.
+systemConfig=/nix/var/nix/profiles/system
+
+
 # Process the kernel command line.
 for o in $(cat /proc/cmdline); do
     case $o in
@@ -90,6 +90,8 @@ for o in $(cat /proc/cmdline); do
     esac
 done
 
+systemConfig="$(readlink -f "$systemConfig")"
+
 
 # More special file systems, initialise required directories.
 mkdir -m 0777 /dev/shm
-- 
GitLab


From d7f638da0c6d337acc201789c3b8113e01ec3942 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 20 Jul 2010 13:53:14 +0000
Subject: [PATCH 2497/5331] * Amazon now supports booting a custom kernel in
 the AMI using   pv-grub, so supply a GRUB menu that starts our own kernel and
   initrd.

svn path=/nixos/trunk/; revision=22678
---
 modules/virtualisation/amazon-image.nix | 43 ++++++++++++++-----------
 1 file changed, 24 insertions(+), 19 deletions(-)

diff --git a/modules/virtualisation/amazon-image.nix b/modules/virtualisation/amazon-image.nix
index 812bb8faf32..81f6a25758e 100644
--- a/modules/virtualisation/amazon-image.nix
+++ b/modules/virtualisation/amazon-image.nix
@@ -2,6 +2,20 @@
 
 with pkgs.lib;
 
+let
+
+  grubMenu = pkgs.writeText "pv-grub-menu.lst"
+    ''
+      default 0
+      timeout 0
+      title EC2
+        root (hd0)
+        kernel /nix/var/nix/profiles/system/kernel systemConfig=/nix/var/nix/profiles/system init=/nix/var/nix/profiles/system/init
+        initrd /nix/var/nix/profiles/system/initrd
+    '';
+
+in
+
 {
   system.build.amazonImage =
     pkgs.vmTools.runInLinuxVM (
@@ -47,40 +61,31 @@ with pkgs.lib;
           # Install a configuration.nix.
           mkdir -p /mnt/etc/nixos
           cp ${./amazon-config.nix} /mnt/etc/nixos/configuration.nix
-                    
-          # Amazon assumes that there is a /sbin/init, so create one.
-          # Note that simply creating /sbin/init as a symlink breaks
-          # some EC2 initrds (like Ubuntu's) because they do a "test
-          # -x $mountPoint/sbin/init".
-          mkdir -p /mnt/sbin
-          echo "#! /nix/var/nix/profiles/system/init" > /mnt/sbin/init
-          chmod +x /mnt/sbin/init
+
+          # Amazon uses `pv-grub', which expects a
+          # /boot/grub/menu.lst.
+          mkdir -p /mnt/boot/grub
+          cp ${grubMenu} /mnt/boot/grub/menu.lst
 
           umount /mnt
         ''
     );
 
-  # On EC2 we don't get to supply our own kernel, so we can't load any
-  # modules.  However, dhclient fails if the ipv6 module isn't loaded,
-  # unless it's compiled without IPv6 support.  So do that.
-  nixpkgs.config.packageOverrides = pkgsOld:                                        
-    { dhcp = pkgs.lib.overrideDerivation pkgsOld.dhcp (oldAttrs:                    
-        { configureFlags = "--disable-dhcpv6";                                      
-        });                                                                         
-    };                                                                              
-
   fileSystems =
     [ { mountPoint = "/";
         device = "/dev/disk/by-label/nixos";
       }
       { mountPoint = "/data";
-        device = "/dev/sda2";
+        device = "/dev/xvdc";
         autocreate = true;
       }
     ];
 
   swapDevices =
-    [ { device = "/dev/sda3"; } ];
+    [ { device = "/dev/xvdb"; } ];
+
+  boot.initrd.kernelModules = [ "xen-blkfront" ];
+  boot.kernelModules = [ "xen-netfront" ];
 
   # There are no virtual consoles.
   services.mingetty.ttys = [ ];
-- 
GitLab


From e7c0c929ede4ce9762b9aae99f75748af6fc82ed Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 21 Jul 2010 21:15:54 +0000
Subject: [PATCH 2498/5331] * Work around a bug in QEMU, which doesn't
 implement the "READ DISC   INFORMATION" SCSI command:

    https://bugzilla.redhat.com/show_bug.cgi?id=609049

  As a result, `cdrom_id' doesn't print
  ID_CDROM_MEDIA_TRACK_COUNT_DATA, which in turn prevents the
  /dev/disk/by-label symlinks from being created.  We need these in
  the NixOS installation CD, so use ID_CDROM_MEDIA in the
  corresponding udev rules for now.  This was the behaviour in udev <=
  154.  See also

    http://www.spinics.net/lists/hotplug/msg03935.html

svn path=/nixos/trunk/; revision=22691
---
 modules/system/boot/stage-1.nix | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/modules/system/boot/stage-1.nix b/modules/system/boot/stage-1.nix
index ab94c157874..eb823a88757 100644
--- a/modules/system/boot/stage-1.nix
+++ b/modules/system/boot/stage-1.nix
@@ -249,7 +249,20 @@ let
       # Such a link can get obsolete in a running system, but 
       # during boot stage 1 it is unlikely. We need this change
       # to be able to boot on a wider choice of CD drives.
-      sed -e '/^ENV[{]DEVTYPE[}]=="disk", .*GOTO/d' -i $out/60-persistent-storage.rules 
+      sed -e '/^ENV[{]DEVTYPE[}]=="disk", .*GOTO/d' -i $out/60-persistent-storage.rules
+
+      # Work around a bug in QEMU, which doesn't implement the "READ
+      # DISC INFORMATION" SCSI command:
+      #   https://bugzilla.redhat.com/show_bug.cgi?id=609049
+      # As a result, `cdrom_id' doesn't print
+      # ID_CDROM_MEDIA_TRACK_COUNT_DATA, which in turn prevents the
+      # /dev/disk/by-label symlinks from being created.  We need these
+      # in the NixOS installation CD, so use ID_CDROM_MEDIA in the
+      # corresponding udev rules for now.  This was the behaviour in
+      # udev <= 154.  See also
+      #   http://www.spinics.net/lists/hotplug/msg03935.html
+      substituteInPlace $out/60-persistent-storage.rules \
+        --replace ID_CDROM_MEDIA_TRACK_COUNT_DATA ID_CDROM_MEDIA
     ''; # */
   };
 
-- 
GitLab


From 3a0f2953371250126f3ac8fdbaa56fae45d7589b Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 21 Jul 2010 21:20:42 +0000
Subject: [PATCH 2499/5331] * The swraid installer test needs more disk space  
 (http://hydra.nixos.org/build/494390).

svn path=/nixos/trunk/; revision=22692
---
 tests/installer.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/tests/installer.nix b/tests/installer.nix
index eea72756ea0..5a71f246b58 100644
--- a/tests/installer.nix
+++ b/tests/installer.nix
@@ -287,10 +287,10 @@ in {
               . " mklabel msdos"
               . " mkpart primary ext2 1M 30MB" # /boot
               . " mkpart extended 30M -1s"
-              . " mkpart logical 31M 1000M" # md0 (root), first device
-              . " mkpart logical 1024M 2000M" # md0 (root), second device
-              . " mkpart logical 2048M 2548M" # md1 (swap), first device
-              . " mkpart logical 2560M 3060M", # md1 (swap), second device
+              . " mkpart logical 31M 1531M" # md0 (root), first device
+              . " mkpart logical 1540M 3040M" # md0 (root), second device
+              . " mkpart logical 3050M 3306M" # md1 (swap), first device
+              . " mkpart logical 3320M 3576M", # md1 (swap), second device
               "udevadm settle",
               "ls -l /dev/vda* >&2",
               "cat /proc/partitions >&2",
-- 
GitLab


From d65948820912d9f86d64f51f7aae0880aea8edee Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 22 Jul 2010 14:40:29 +0000
Subject: [PATCH 2500/5331] * Use the regular GRUB menu builder for Amazon. 
 There are two issues:   we want to generate the GRUB menu without actually
 installing GRUB   (because Amazon supplies its own pv-grub), and each menu
 entry   requires "root (hd0)".  For the first, allow boot.loader.grub.device 
  to be set to "nodev" to indicate that the GRUB menu should be   generated
 without installing GRUB.  For the second, add an option  
 boot.loader.grub.extraPerEntryConfig to allow commands to be added   to each
 GRUB menu entry (in this case, "root (hd0)").

svn path=/nixos/trunk/; revision=22712
---
 modules/installer/grub/grub-menu-builder.sh   | 16 ++++++------
 modules/installer/grub/grub.nix               | 20 ++++++++++++---
 .../activation/switch-to-configuration.sh     | 19 ++++++++------
 modules/system/boot/stage-1-init.sh           |  8 +++---
 modules/virtualisation/amazon-image.nix       | 25 ++++++-------------
 5 files changed, 47 insertions(+), 41 deletions(-)

diff --git a/modules/installer/grub/grub-menu-builder.sh b/modules/installer/grub/grub-menu-builder.sh
index f23184b0a06..0d5ddf60787 100644
--- a/modules/installer/grub/grub-menu-builder.sh
+++ b/modules/installer/grub/grub-menu-builder.sh
@@ -159,17 +159,17 @@ addEntry() {
 	case "$grubVersion" in
 	    1)
 		cat > /boot/nixos-grub-config <<EOF
-	title Emergency boot
-	kernel $bootRoot/nixos-kernel systemConfig=$(readlink -f "$path") init=/boot/nixos-init $(cat "$path/kernel-params")
-	initrd $bootRoot/nixos-initrd
+title Emergency boot
+  kernel $bootRoot/nixos-kernel systemConfig=$(readlink -f "$path") init=/boot/nixos-init $(cat "$path/kernel-params")
+  initrd $bootRoot/nixos-initrd
 EOF
 		;;
 	    2)
 		cat > /boot/nixos-grub-config <<EOF
-        menuentry "Emergency boot" {
-          linux  $bootRoot/nixos-kernel systemConfig=$(readlink -f "$path") init=/boot/nixos-init $(cat "$path/kernel-params")
-          initrd $bootRoot/initrd
-        }
+menuentry "Emergency boot" {
+  linux  $bootRoot/nixos-kernel systemConfig=$(readlink -f "$path") init=/boot/nixos-init $(cat "$path/kernel-params")
+  initrd $bootRoot/initrd
+}
 EOF
 		;;
 	esac
@@ -189,6 +189,7 @@ EOF
 	1)
 	    cat >> "$tmp" << GRUBEND
 title $name
+  @extraPerEntryConfig@
   kernel $kernel systemConfig=$(readlink -f $path) init=$(readlink -f $path/init) $(cat $path/kernel-params)
   initrd $initrd
 GRUBEND
@@ -196,6 +197,7 @@ GRUBEND
 	2)
 	    cat >> "$tmp" << GRUBEND
 menuentry "$name" {
+  @extraPerEntryConfig@
   linux  $kernel systemConfig=$(readlink -f $path) init=$(readlink -f $path/init) $(cat $path/kernel-params)
   initrd $initrd
 }
diff --git a/modules/installer/grub/grub.nix b/modules/installer/grub/grub.nix
index 40c2ca60675..50ae0ddb596 100644
--- a/modules/installer/grub/grub.nix
+++ b/modules/installer/grub/grub.nix
@@ -13,7 +13,7 @@ let
     inherit (pkgs) bash;
     path = [pkgs.coreutils pkgs.gnused pkgs.gnugrep];
     inherit (config.boot.loader.grub) copyKernels
-      extraConfig extraEntries extraEntriesBeforeNixOS
+      extraConfig extraEntries extraEntriesBeforeNixOS extraPerEntryConfig
       splashImage configurationLimit version default timeout;
   };
   
@@ -48,9 +48,12 @@ in
         example = "/dev/hda";
         type = with pkgs.lib.types; uniq string;
         description = ''
-          The device on which the boot loader, GRUB, will be installed.
-          If empty, GRUB won't be installed and it's your responsibility
-          to make the system bootable.
+          The device on which the boot loader, GRUB, will be
+          installed.  If empty, GRUB won't be installed and it's your
+          responsibility to make the system bootable.  The special
+          value <literal>nodev</literal> means that a GRUB boot menu
+          will be generated, but GRUB itself will not actually be
+          installed.
         '';
       };
 
@@ -77,6 +80,15 @@ in
         '';
       };
 
+      extraPerEntryConfig = mkOption {
+        default = "";
+        example = "root (hd0)";
+        description = ''
+          Additional GRUB commands inserted in the configuration file
+          at the start of each NixOS menu entry.
+        '';
+      };
+
       extraEntries = mkOption {
         default = "";
         example = ''
diff --git a/modules/system/activation/switch-to-configuration.sh b/modules/system/activation/switch-to-configuration.sh
index ccb3d230e8d..bc7af231b97 100644
--- a/modules/system/activation/switch-to-configuration.sh
+++ b/modules/system/activation/switch-to-configuration.sh
@@ -30,14 +30,17 @@ if [ "$action" = "switch" -o "$action" = "boot" ]; then
           mkdir -m 0700 -p /boot/grub
           @menuBuilder@ @out@
 
-          # If the GRUB version has changed, then force a reinstall.
-          oldGrubVersion="$(cat /boot/grub/version 2>/dev/null || true)"
-          newGrubVersion="@grubVersion@"
-
-          if [ "$NIXOS_INSTALL_GRUB" = 1 -o "$oldGrubVersion" != "$newGrubVersion" ]; then
-              echo "installing the GRUB bootloader..."
-              @grub@/sbin/grub-install "@grubDevice@" --no-floppy --recheck
-              echo "$newGrubVersion" > /boot/grub/version
+          if [ "@grubDevice@" != nodev ]; then
+              
+              # If the GRUB version has changed, then force a reinstall.
+              oldGrubVersion="$(cat /boot/grub/version 2>/dev/null || true)"
+              newGrubVersion="@grubVersion@"
+
+              if [ "$NIXOS_INSTALL_GRUB" = 1 -o "$oldGrubVersion" != "$newGrubVersion" ]; then
+                  echo "installing the GRUB bootloader..."
+                  @grub@/sbin/grub-install "@grubDevice@" --no-floppy --recheck
+                  echo "$newGrubVersion" > /boot/grub/version
+              fi
           fi
           
       else
diff --git a/modules/system/boot/stage-1-init.sh b/modules/system/boot/stage-1-init.sh
index 0c9f1d46b2f..11a10629d7c 100644
--- a/modules/system/boot/stage-1-init.sh
+++ b/modules/system/boot/stage-1-init.sh
@@ -291,10 +291,10 @@ echo /sbin/modprobe > /proc/sys/kernel/modprobe
 # current root.  It also moves the /proc, /sys and /dev mounts over to
 # the new root.  Note that $stage2Init might be an absolute symlink,
 # in which case "-e" won't work because we're not in the chroot yet.
-#if ! test -e "$targetRoot/$stage2Init" -o -L "$targetRoot/$stage2Init"; then
-#    echo "stage 2 init script ($targetRoot/$stage2Init) not found"
-#    fail
-#fi
+if ! test -e "$targetRoot/$stage2Init" -o -L "$targetRoot/$stage2Init"; then
+    echo "stage 2 init script ($targetRoot/$stage2Init) not found"
+    fail
+fi
 
 mkdir -m 0755 -p $targetRoot/proc $targetRoot/sys $targetRoot/dev
 
diff --git a/modules/virtualisation/amazon-image.nix b/modules/virtualisation/amazon-image.nix
index 81f6a25758e..a0fc9cce908 100644
--- a/modules/virtualisation/amazon-image.nix
+++ b/modules/virtualisation/amazon-image.nix
@@ -2,20 +2,6 @@
 
 with pkgs.lib;
 
-let
-
-  grubMenu = pkgs.writeText "pv-grub-menu.lst"
-    ''
-      default 0
-      timeout 0
-      title EC2
-        root (hd0)
-        kernel /nix/var/nix/profiles/system/kernel systemConfig=/nix/var/nix/profiles/system init=/nix/var/nix/profiles/system/init
-        initrd /nix/var/nix/profiles/system/initrd
-    '';
-
-in
-
 {
   system.build.amazonImage =
     pkgs.vmTools.runInLinuxVM (
@@ -62,10 +48,8 @@ in
           mkdir -p /mnt/etc/nixos
           cp ${./amazon-config.nix} /mnt/etc/nixos/configuration.nix
 
-          # Amazon uses `pv-grub', which expects a
-          # /boot/grub/menu.lst.
-          mkdir -p /mnt/boot/grub
-          cp ${grubMenu} /mnt/boot/grub/menu.lst
+          # Generate the GRUB menu.
+          chroot /mnt ${config.system.build.toplevel}/bin/switch-to-configuration boot
 
           umount /mnt
         ''
@@ -87,6 +71,11 @@ in
   boot.initrd.kernelModules = [ "xen-blkfront" ];
   boot.kernelModules = [ "xen-netfront" ];
 
+  # Generate a GRUB menu.  Amazon's pv-grub uses this to boot our kernel/initrd.
+  boot.loader.grub.device = "nodev";
+  boot.loader.grub.timeout = 0;
+  boot.loader.grub.extraPerEntryConfig = "root (hd0)";
+
   # There are no virtual consoles.
   services.mingetty.ttys = [ ];
 
-- 
GitLab


From 88a400f57860462bc3b4a4085a7dafe52c023b14 Mon Sep 17 00:00:00 2001
From: Evgeny Egorochkin <phreedom.stdin@gmail.com>
Date: Thu, 22 Jul 2010 22:45:24 +0000
Subject: [PATCH 2501/5331] Fix LVM failing test due to /proc/devices not being
 available in some of OpenVZ containers

svn path=/nixos/trunk/; revision=22717
---
 modules/system/boot/stage-1.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/system/boot/stage-1.nix b/modules/system/boot/stage-1.nix
index eb823a88757..0a5cec8b1d2 100644
--- a/modules/system/boot/stage-1.nix
+++ b/modules/system/boot/stage-1.nix
@@ -202,7 +202,7 @@ let
       $out/bin/udevadm --version
       $out/bin/blkid -v 2>&1 | tee -a $out/log | grep "blkid from util-linux-ng"
       $out/bin/dmsetup --version 2>&1 | tee -a $out/log | grep "version:"
-      LVM_SYSTEM_DIR=$out $out/bin/lvm 2>&1 | tee -a $out/log | grep "LVM"
+      LVM_SYSTEM_DIR=$out $out/bin/lvm version 2>&1 | tee -a $out/log | grep "LVM"
       $out/bin/reiserfsck -V
       $out/bin/mdadm --version
       $out/bin/basename --version
-- 
GitLab


From 21e62884e7336c910546a450412136c73c31274e Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 23 Jul 2010 10:52:51 +0000
Subject: [PATCH 2502/5331] * switch-to-configuration.sh: Signal dbus to reload
 its configuration.

svn path=/nixos/trunk/; revision=22718
---
 modules/system/activation/switch-to-configuration.sh | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/modules/system/activation/switch-to-configuration.sh b/modules/system/activation/switch-to-configuration.sh
index bc7af231b97..6aec8225fdf 100644
--- a/modules/system/activation/switch-to-configuration.sh
+++ b/modules/system/activation/switch-to-configuration.sh
@@ -121,4 +121,9 @@ EOF
             initctl start "$job" || true
         fi
     done
+
+    # Signal dbus to reload its configuration.
+    dbusPid=$(initctl status dbus 2> /dev/null | sed -e 's/.*process \([0-9]\+\)/\1/;t;d')
+    [ -n "$dbusPid" ] && kill -HUP "$dbusPid"
+    
 fi
-- 
GitLab


From 5dab679f9fbaa6199893d554c94a580297eed1ac Mon Sep 17 00:00:00 2001
From: Rob Vermaas <rob.vermaas@gmail.com>
Date: Fri, 23 Jul 2010 13:59:50 +0000
Subject: [PATCH 2503/5331] lib/testing.nix: remove workaround

svn path=/nixos/trunk/; revision=22719
---
 lib/testing.nix | 50 ++++++++-----------------------------------------
 1 file changed, 8 insertions(+), 42 deletions(-)

diff --git a/lib/testing.nix b/lib/testing.nix
index 8b2af1f7ebf..17103115325 100644
--- a/lib/testing.nix
+++ b/lib/testing.nix
@@ -113,55 +113,21 @@ rec {
       vms =
         buildVirtualNetwork { nodes = { client = machine; } ; };
 
-      # ugly workaround, until we figure out why some fs actions work properly inside 
-      # the vm. (e.g. unlink gives access denied over smb in qemu). note that the function
-      # now only works for derivations that lead to a directory in the store, not a file. 
       buildrunner = writeText "vm-build" ''
         source $1
-        origout=$out
-        out=$TMPDIR$out
-
-        echo "--------------------------------"
-        echo "Creating $out"
-        echo "--------------------------------"
-        ${coreutils}/bin/mkdir -p $out
-
-        echo "--------------------------------"
-        echo "Linking $origout to $out "
-        echo "--------------------------------"
-        ${coreutils}/bin/ln -s $out $origout
-
-        echo "--------------------------------"
-        echo "Creating $TMPDIR"
-        echo "--------------------------------"
+ 
         ${coreutils}/bin/mkdir -p $TMPDIR
-
-        echo "--------------------------------"
-        echo "Running builder"
-        echo "--------------------------------"
-        $origBuilder $origArgs 
-
-        echo "--------------------------------"
-        echo "Removing link $origout"
-        echo "--------------------------------"
-        ${coreutils}/bin/rm -vf $origout
-
-        echo "--------------------------------"
-        echo "Creating $origout"
-        echo "--------------------------------"
-        ${coreutils}/bin/mkdir -p $origout
-
-        echo "--------------------------------"
-        echo "Copying $out/* to $origout/"
-        echo "--------------------------------"
-        ${coreutils}/bin/cp -Rv $out/* $origout/
-        out=$origout 
+        cd $TMPDIR
+        
+        $origBuilder $origArgs
+         
+        echo "Exit code:" $?
       '';
 
       testscript = ''
         startAll;
         ${preBuild}
-        print STDERR $client->mustSucceed("source ${buildrunner} /hostfs".$client->stateDir."/saved-env");
+        print STDERR $client->mustSucceed("env -i ${pkgs.bash}/bin/bash ${buildrunner} /hostfs".$client->stateDir."/saved-env");
         ${postBuild}
       '';
 
@@ -179,7 +145,7 @@ rec {
         builder = "${bash}/bin/sh";
         args = ["-e" vmRunCommand];
         origArgs = attrs.args;
-        origBuilder = attrs.builder;
+        origBuilder = attrs.builder;   
       });
 
   runInMachineWithX = { require ? [], ...}@args :
-- 
GitLab


From 82be7d8d651b4ef09323efaac76a1dc9ce374ee5 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 23 Jul 2010 14:23:08 +0000
Subject: [PATCH 2504/5331] * `pam_console' maintains the set of locally logged
 in users in   /var/run/console.  This is obsolete, but D-Bus still uses it
 for its   `at_console' feature.  So maintain it using a ConsoleKit session  
 script.  Borrowed from  
 http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/sys-auth/consolekit/files/pam-foreground-compat.ck

svn path=/nixos/trunk/; revision=22720
---
 modules/security/consolekit.nix | 40 ++++++++++++++++++++++++++++++++-
 1 file changed, 39 insertions(+), 1 deletion(-)

diff --git a/modules/security/consolekit.nix b/modules/security/consolekit.nix
index d1636d23378..2745aa10e29 100644
--- a/modules/security/consolekit.nix
+++ b/modules/security/consolekit.nix
@@ -2,6 +2,44 @@
 
 with pkgs.lib;
 
+let
+
+  # `pam_console' maintains the set of locally logged in users in
+  # /var/run/console.  This is obsolete, but D-Bus still uses it for
+  # its `at_console' feature.  So maintain it using a ConsoleKit
+  # session script.  Borrowed from
+  # http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/sys-auth/consolekit/files/pam-foreground-compat.ck
+  updateVarRunConsole = pkgs.writeTextFile {
+    name = "var-run-console.ck";
+    destination = "/etc/ConsoleKit/run-session.d/var-run-console.ck";
+    executable = true;
+    
+    text =
+      ''
+        #! ${pkgs.stdenv.shell} -e
+        PATH=${pkgs.coreutils}/bin:${pkgs.gnused}/bin:${pkgs.glibc}/bin
+        TAGDIR=/var/run/console
+
+        exec >> /tmp/xyzzy 2>&1
+
+        [ -n "$CK_SESSION_USER_UID" ] || exit 1
+
+        TAGFILE="$TAGDIR/`getent passwd $CK_SESSION_USER_UID | cut -f 1 -d:`"
+
+        if [ "$1" = "session_added" ]; then
+            mkdir -p "$TAGDIR"
+            echo "$CK_SESSION_ID" >> "$TAGFILE"
+        fi
+
+        if [ "$1" = "session_removed" ] && [ -e "$TAGFILE" ]; then
+            sed -i "\%^$CK_SESSION_ID\$%d" "$TAGFILE"
+            [ -s "$TAGFILE" ] || rm -f "$TAGFILE"
+        fi
+      '';
+  };
+
+in
+
 {
 
   config = {
@@ -14,7 +52,7 @@ with pkgs.lib;
       { source = (pkgs.buildEnv {
           name = "consolekit-config";
           pathsToLink = [ "/etc/ConsoleKit" ];
-          paths = [ pkgs.consolekit pkgs.udev ];
+          paths = [ pkgs.consolekit pkgs.udev updateVarRunConsole ];
         }) + "/etc/ConsoleKit";
         target = "ConsoleKit";
       };
-- 
GitLab


From 2e9851cec22d6d520ede6ef19ff51267f07deb6c Mon Sep 17 00:00:00 2001
From: Evgeny Egorochkin <phreedom.stdin@gmail.com>
Date: Sat, 24 Jul 2010 22:05:27 +0000
Subject: [PATCH 2505/5331] Fix udev startup issue in OpenVZ guest environment

svn path=/nixos/trunk/; revision=22725
---
 modules/services/hardware/udev.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/services/hardware/udev.nix b/modules/services/hardware/udev.nix
index f730e0c1f17..8c1a79f9128 100644
--- a/modules/services/hardware/udev.nix
+++ b/modules/services/hardware/udev.nix
@@ -168,7 +168,7 @@ in
 
         preStart =
           ''
-            echo "" > /proc/sys/kernel/hotplug
+            echo "" > /proc/sys/kernel/hotplug || true
 
             mkdir -p /var/lib/udev/rules.d
 
-- 
GitLab


From c52cbca24d01392c8a99fd241f242fdaa7d4836d Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sun, 25 Jul 2010 09:52:20 +0000
Subject: [PATCH 2506/5331] * Set $TZ in the X server job (mostly so that the
 kdm clock shows the   right time).

svn path=/nixos/trunk/; revision=22728
---
 modules/services/x11/xserver.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/modules/services/x11/xserver.nix b/modules/services/x11/xserver.nix
index 97c96ef8be9..43c4a53c21f 100644
--- a/modules/services/x11/xserver.nix
+++ b/modules/services/x11/xserver.nix
@@ -413,6 +413,7 @@ in
         environment =
           { FONTCONFIG_FILE = "/etc/fonts/fonts.conf"; # !!! cleanup
             XKB_BINDIR = "${xorg.xkbcomp}/bin"; # Needed for the Xkb extension.
+            TZ = config.time.timeZone;
           } # !!! Depends on the driver selected at runtime.
             // optionalAttrs (!elem "nvidia" driverNames) {
             XORG_DRI_DRIVER_PATH = "${pkgs.mesa}/lib/dri";
-- 
GitLab


From 25fd35862a71a78a00597b0b720f29b8a260422e Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 26 Jul 2010 14:10:04 +0000
Subject: [PATCH 2507/5331] * Add /nix/var/nix/profiles/default and
 config.system.path to the list   of DBus configuration directories.  Thus
 packages with DBus   configuration files installed in the default profile
 will be found   automatically.  (It would be nice to include
 $HOME/.nix-profile in   the session bus search path, but I don't think that's
 possible.)

svn path=/nixos/trunk/; revision=22737
---
 modules/services/system/dbus.nix | 35 ++++++++++++++++----------------
 1 file changed, 17 insertions(+), 18 deletions(-)

diff --git a/modules/services/system/dbus.nix b/modules/services/system/dbus.nix
index d6e647ac2dd..fedb5efff06 100644
--- a/modules/services/system/dbus.nix
+++ b/modules/services/system/dbus.nix
@@ -29,26 +29,16 @@ let
       # Add the system-services and system.d directories to the system
       # bus search path.
       sed -i $out/system.conf \
-          -e 's|<standard_system_servicedirs/>|${systemServiceDirs}|'
+          -e 's|<standard_system_servicedirs/>|${systemServiceDirs}|' \
+          -e 's|<includedir>system.d</includedir>|${systemIncludeDirs}|'
 
       cp ${dbus}/etc/dbus-1/session.conf $out/session.conf
       
       # Add the services and session.d directories to the session bus
       # search path.
       sed -i $out/session.conf \
-          -e 's|<standard_session_servicedirs />|${sessionServiceDirs}|'
-
-      ensureDir $out/session.d
-      ensureDir $out/system.d
-      
-      for i in ${toString cfg.packages}; do
-        for j in $i/etc/dbus-1/session.d/*; do
-          ln -s $j $out/session.d/
-        done
-        for j in $i/etc/dbus-1/system.d/*; do
-          ln -s $j $out/system.d/
-        done
-      done
+          -e 's|<standard_session_servicedirs />|${sessionServiceDirs}|' \
+          -e 's|<includedir>session.d</includedir>|${sessionIncludeDirs}|'
     ''; # */
   };
 
@@ -56,10 +46,18 @@ let
     (d: "<servicedir>${d}/share/dbus-1/system-services</servicedir> ")
     cfg.packages;
 
+  systemIncludeDirs = concatMapStrings
+    (d: "<includedir>${d}/etc/dbus-1/system.d</includedir> ")
+    cfg.packages;
+
   sessionServiceDirs = concatMapStrings
     (d: "<servicedir>${d}/share/dbus-1/services</servicedir> ")
     cfg.packages;
 
+  sessionIncludeDirs = concatMapStrings
+    (d: "<includedir>${d}/etc/dbus-1/session.d</includedir> ")
+    cfg.packages;
+
 in
 
 {
@@ -102,10 +100,6 @@ in
     environment.systemPackages = [ dbus.daemon dbus.tools ];
 
     environment.etc = singleton
-      # We need /etc/dbus-1/system.conf for now, because
-      # dbus-daemon-launch-helper is called with an empty environment
-      # and no arguments.  So we have no way to tell it the location
-      # of our config file.
       { source = configDir;
         target = "dbus-1";
       };
@@ -162,6 +156,11 @@ in
         permissions = "u+rx,g+rx,o-rx";
       };
 
+    services.dbus.packages =
+      [ "/nix/var/nix/profiles/default"
+        config.system.path
+      ];
+
   };
  
 }
-- 
GitLab


From 388c8e0c608eee521b2c88befeb8beecd24d156b Mon Sep 17 00:00:00 2001
From: Sander van der Burg <s.vanderburg@tudelft.nl>
Date: Mon, 2 Aug 2010 16:11:44 +0000
Subject: [PATCH 2508/5331] Removed the zip function, since it is in pkgs.lib
 now

svn path=/nixos/trunk/; revision=22883
---
 lib/build-vms.nix | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/lib/build-vms.nix b/lib/build-vms.nix
index d52aefdf6b0..37be44ab6b0 100644
--- a/lib/build-vms.nix
+++ b/lib/build-vms.nix
@@ -117,13 +117,4 @@ rec {
 
     in lib.listToAttrs nodes_;
 
-
-  # Zip two lists together.  Should be moved to pkgs.lib.
-  zip = xs: ys:
-    if xs != [] && ys != [] then
-      [ {first = lib.head xs; second = lib.head ys;} ]
-      ++ zip (lib.tail xs) (lib.tail ys)
-    else [];
-
-
 }
-- 
GitLab


From 58204f0a8afc555311f5d9367974b57281a188d3 Mon Sep 17 00:00:00 2001
From: Sander van der Burg <s.vanderburg@tudelft.nl>
Date: Mon, 2 Aug 2010 16:24:24 +0000
Subject: [PATCH 2509/5331] Changed zip into lib.zip. Sorry :$

svn path=/nixos/trunk/; revision=22884
---
 lib/build-vms.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/build-vms.nix b/lib/build-vms.nix
index 37be44ab6b0..ba3e3eb5bbd 100644
--- a/lib/build-vms.nix
+++ b/lib/build-vms.nix
@@ -73,12 +73,12 @@ rec {
     
       machines = lib.attrNames nodes;
 
-      machinesNumbered = zip machines (lib.range 1 254);
+      machinesNumbered = lib.zip machines (lib.range 1 254);
 
       nodes_ = lib.flip map machinesNumbered (m: lib.nameValuePair m.first
         [ ( { config, pkgs, nodes, ... }:
             let
-              interfacesNumbered = zip config.virtualisation.vlans (lib.range 1 255);
+              interfacesNumbered = lib.zip config.virtualisation.vlans (lib.range 1 255);
               interfaces = 
                 lib.flip map interfacesNumbered ({ first, second }:
                   { name = "eth${toString second}";
-- 
GitLab


From 21eb6ed4128090df34496c51882070c6ab7511d6 Mon Sep 17 00:00:00 2001
From: Sander van der Burg <s.vanderburg@tudelft.nl>
Date: Mon, 2 Aug 2010 16:51:33 +0000
Subject: [PATCH 2510/5331] Renamed lib.zip into lib.zipTwoLists, since it
 refers to the wrong function

svn path=/nixos/trunk/; revision=22888
---
 lib/build-vms.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/build-vms.nix b/lib/build-vms.nix
index ba3e3eb5bbd..7505f6f49f3 100644
--- a/lib/build-vms.nix
+++ b/lib/build-vms.nix
@@ -73,12 +73,12 @@ rec {
     
       machines = lib.attrNames nodes;
 
-      machinesNumbered = lib.zip machines (lib.range 1 254);
+      machinesNumbered = lib.zipTwoLists machines (lib.range 1 254);
 
       nodes_ = lib.flip map machinesNumbered (m: lib.nameValuePair m.first
         [ ( { config, pkgs, nodes, ... }:
             let
-              interfacesNumbered = lib.zip config.virtualisation.vlans (lib.range 1 255);
+              interfacesNumbered = lib.zipTwoLists config.virtualisation.vlans (lib.range 1 255);
               interfaces = 
                 lib.flip map interfacesNumbered ({ first, second }:
                   { name = "eth${toString second}";
-- 
GitLab


From 02bf0db39e6edff24cebce45625af9d5e6ea7d98 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Mon, 2 Aug 2010 19:06:42 +0000
Subject: [PATCH 2511/5331] Making the X keyboard settings go in xorg.conf, and
 not in HAL anymore. Setting to the synaptics default speeds the speeds I
 like. I think we were having defaults still from the time the values meant
 some different speeds.

The 'synclient' program now does not work, but the 'xinput' program (xorg.xinput)
can modify in runtime the touchpad settings too.


svn path=/nixos/trunk/; revision=22904
---
 modules/services/x11/hardware/synaptics.nix | 10 ++++--
 modules/services/x11/xserver.nix            | 37 ++++++---------------
 2 files changed, 18 insertions(+), 29 deletions(-)

diff --git a/modules/services/x11/hardware/synaptics.nix b/modules/services/x11/hardware/synaptics.nix
index 57e5318f481..ed1996eabd4 100644
--- a/modules/services/x11/hardware/synaptics.nix
+++ b/modules/services/x11/hardware/synaptics.nix
@@ -22,12 +22,12 @@ let cfg = config.services.xserver.synaptics; in
       };
 
       minSpeed = mkOption {
-        default = "0.06";
+        default = "0.6";
         description = "Cursor speed factor for precision finger motion.";
       };
 
       maxSpeed = mkOption {
-        default = "0.12";
+        default = "1.0";
         description = "Cursor speed factor for highest-speed finger motion.";
       };
 
@@ -36,6 +36,11 @@ let cfg = config.services.xserver.synaptics; in
         description = "Whether to enable two-finger drag-scrolling.";
       };
 
+      vertEdgeScroll = mkOption {
+        default = true;
+        description = "Whether to enable vertical edge drag-scrolling.";
+      };
+
     };
 
   };
@@ -71,6 +76,7 @@ let cfg = config.services.xserver.synaptics; in
           Option "TapButton3" "3"
           Option "VertTwoFingerScroll" "${if cfg.twoFingerScroll then "1" else "0"}"
           Option "HorizTwoFingerScroll" "${if cfg.twoFingerScroll then "1" else "0"}"
+          Option "VertEdgeScroll" "${if cfg.vertEdgeScroll then "1" else "0"}"
         EndSection
       '';
 
diff --git a/modules/services/x11/xserver.nix b/modules/services/x11/xserver.nix
index 43c4a53c21f..e94dc8dc8a1 100644
--- a/modules/services/x11/xserver.nix
+++ b/modules/services/x11/xserver.nix
@@ -83,31 +83,6 @@ let
       ''; # */
   };
 
-
-  halConfigFiles = singleton (pkgs.writeTextFile
-    { name = "hal-policy-keymap";
-      destination = "/share/hal/fdi/policy/30-keymap.fdi";
-      text =
-        ''
-          <?xml version="1.0" encoding="ISO-8859-1"?>
-          <deviceinfo version="0.2">
-            <device>
-              <match key="info.capabilities" contains="input.keymap">
-                <append key="info.callouts.add" type="strlist">hal-setup-keymap</append>
-              </match>
-
-              <match key="info.capabilities" contains="input.keys">
-                <merge key="input.x11_options.XkbRules" type="string">base</merge>
-                <merge key="input.x11_options.XkbModel" type="string">${cfg.xkbModel}</merge>
-                <merge key="input.x11_options.XkbLayout" type="string">${cfg.layout}</merge>
-                <append key="input.x11_options.XkbOptions" type="strlist">${cfg.xkbOptions}</append>
-              </match>
-            </device>
-          </deviceinfo>
-        '';
-    });
-
-  
 in
 
 {
@@ -404,8 +379,7 @@ in
       
     environment.systemPackages = config.environment.x11Packages;
     
-    services.hal.packages = halConfigFiles ++
-      optional (elem "virtualbox" driverNames) kernelPackages.virtualboxGuestAdditions;
+    services.hal.packages = optional (elem "virtualbox" driverNames) kernelPackages.virtualboxGuestAdditions;
 
     jobs.xserver =
       { startOn = if cfg.autorun then "filesystem and stopped udevtrigger and started hal" else "";
@@ -483,6 +457,15 @@ in
           ${cfg.monitorSection}
         EndSection
 
+        Section "InputClass"
+          Identifier "Keyboards catch all"
+          MatchIsKeyboard "on"
+          Option "XkbRules" "base"
+          Option "XkbModel" "${cfg.xkbModel}"
+          Option "XkbLayout" "${cfg.layout}"
+          Option "XkbOptions" "${cfg.xkbOptions}"
+        EndSection
+
         Section "ServerLayout"
           Identifier "Layout[all]"
           ${cfg.serverLayoutSection}
-- 
GitLab


From 9a94e561a5e53c882f5c7f7fd883692f920c224f Mon Sep 17 00:00:00 2001
From: Sander van der Burg <s.vanderburg@tudelft.nl>
Date: Tue, 3 Aug 2010 13:48:08 +0000
Subject: [PATCH 2512/5331] The DocumentRoot directory is now automatically
 created if it does not exists. This will prevent the service from working if
 a user forgets to create the DocumentRoot directory himself and this also
 makes automated testing easier.

svn path=/nixos/trunk/; revision=22929
---
 modules/services/web-servers/apache-httpd/default.nix | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/modules/services/web-servers/apache-httpd/default.nix b/modules/services/web-servers/apache-httpd/default.nix
index d31d62a0308..c0505a427aa 100644
--- a/modules/services/web-servers/apache-httpd/default.nix
+++ b/modules/services/web-servers/apache-httpd/default.nix
@@ -582,6 +582,13 @@ in
             mkdir -m 0700 -p ${mainCfg.stateDir}
             mkdir -m 0700 -p ${mainCfg.logDir}
 
+            ${optionalString (mainCfg.documentRoot != null)
+            ''
+              # Create the document root directory if does not exists yet
+              mkdir -p ${mainCfg.documentRoot}
+            ''
+            }
+
             # Get rid of old semaphores.  These tend to accumulate across
             # server restarts, eventually preventing it from restarting
             # succesfully.
-- 
GitLab


From e3c2a1f49efaa4c1b0517483fe59dec3f26e6ae3 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 4 Aug 2010 14:05:14 +0000
Subject: [PATCH 2513/5331] * Fix the dump feature.

svn path=/nixos/trunk/; revision=22950
---
 modules/services/web-servers/apache-httpd/subversion.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/services/web-servers/apache-httpd/subversion.nix b/modules/services/web-servers/apache-httpd/subversion.nix
index a96d38cd266..3229138d172 100644
--- a/modules/services/web-servers/apache-httpd/subversion.nix
+++ b/modules/services/web-servers/apache-httpd/subversion.nix
@@ -46,7 +46,7 @@ let
 
     sendmail = "${pkgs.ssmtp}/sbin/sendmail";
     
-    inherit (pkgs) libxslt enscript db4 coreutils diffutils bzip2 python;
+    inherit (pkgs) libxslt enscript db4 coreutils diffutils gzip bzip2 python;
 
     inherit (serverInfo) canonicalName;
 
-- 
GitLab


From 255a56fbc5cc4c1426cc2049e71fb86a2d2707b9 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Wed, 4 Aug 2010 20:07:58 +0000
Subject: [PATCH 2514/5331] allow wildcard Synaptics configuration

svn path=/nixos/trunk/; revision=22954
---
 modules/services/x11/hardware/synaptics.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/modules/services/x11/hardware/synaptics.nix b/modules/services/x11/hardware/synaptics.nix
index ed1996eabd4..5f832ab7d22 100644
--- a/modules/services/x11/hardware/synaptics.nix
+++ b/modules/services/x11/hardware/synaptics.nix
@@ -18,7 +18,8 @@ let cfg = config.services.xserver.synaptics; in
 
       dev = mkOption {
         default = "/dev/input/event0";
-        description = "Event device for Synaptics touchpad.";
+	example = null;
+        description = "Event device for Synaptics touchpad, null to omit specification.";
       };
 
       minSpeed = mkOption {
@@ -55,7 +56,7 @@ let cfg = config.services.xserver.synaptics; in
         Section "InputDevice"
           Identifier "Touchpad[0]"
           Driver "synaptics"
-          Option "Device" "${cfg.dev}"
+          ${if cfg.dev != null then ''Option "Device" "${cfg.dev}"'' else ""}
           Option "Protocol" "PS/2"
           Option "LeftEdge" "1700"
           Option "RightEdge" "5300"
-- 
GitLab


From 793767870a342d42059c2d874d86f8b36668ddb5 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 5 Aug 2010 13:32:58 +0000
Subject: [PATCH 2515/5331] * Disable writing dhclient debug info to
 /tmp/dhcp-exit.

svn path=/nixos/trunk/; revision=22962
---
 modules/services/networking/dhclient.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/services/networking/dhclient.nix b/modules/services/networking/dhclient.nix
index db3a4b55783..7b334a8e51e 100644
--- a/modules/services/networking/dhclient.nix
+++ b/modules/services/networking/dhclient.nix
@@ -14,8 +14,8 @@ let
 
   dhclientExitHooks = pkgs.writeText "dhclient-exit-hooks"
     ''
-      echo "$reason" >> /tmp/dhcp-exit
-      echo "$exit_status" >> /tmp/dhcp-exit
+      #echo "$reason" >> /tmp/dhcp-exit
+      #echo "$exit_status" >> /tmp/dhcp-exit
 
       if test "$reason" = BOUND -o "$reason" = REBOOT; then
           ${pkgs.glibc}/sbin/nscd --invalidate hosts
-- 
GitLab


From 6436ed1de4fda6549949f9f1336968a62c57d028 Mon Sep 17 00:00:00 2001
From: David Guibert <david.guibert@gmail.com>
Date: Fri, 6 Aug 2010 08:49:08 +0000
Subject: [PATCH 2516/5331] nixos: kerberos services for the server.

svn path=/nixos/trunk/; revision=22985
---
 modules/module-list.nix                |  1 +
 modules/services/networking/xinetd.nix |  7 +++
 modules/services/system/kerberos.nix   | 71 ++++++++++++++++++++++++++
 3 files changed, 79 insertions(+)
 create mode 100644 modules/services/system/kerberos.nix

diff --git a/modules/module-list.nix b/modules/module-list.nix
index 7bc98858506..537e6181469 100644
--- a/modules/module-list.nix
+++ b/modules/module-list.nix
@@ -110,6 +110,7 @@
   ./services/system/dbus.nix
   ./services/system/nscd.nix
   ./services/system/uptimed.nix
+  ./services/system/kerberos.nix
   ./services/ttys/gpm.nix
   ./services/ttys/mingetty.nix
   ./services/web-servers/apache-httpd/default.nix
diff --git a/modules/services/networking/xinetd.nix b/modules/services/networking/xinetd.nix
index 4729ba9d2e4..5b74d7e420a 100644
--- a/modules/services/networking/xinetd.nix
+++ b/modules/services/networking/xinetd.nix
@@ -26,6 +26,7 @@ let
       {
         protocol    = ${srv.protocol}
         ${optionalString srv.unlisted "type        = UNLISTED"}
+        ${optionalString (srv.flags != "") "flags = ${srv.flags}"}
         socket_type = ${if srv.protocol == "udp" then "dgram" else "stream"}
         ${if srv.port != 0 then "port        = ${toString srv.port}" else ""}
         wait        = ${if srv.protocol == "udp" then "yes" else "no"}
@@ -98,6 +99,12 @@ in
           description = "Command-line arguments for the server program.";
         };
 
+        flags = mkOption {
+          type = types.string;
+          default = "";
+          description = "";
+        };
+
         unlisted = mkOption {
           type = types.bool;
           default = false;
diff --git a/modules/services/system/kerberos.nix b/modules/services/system/kerberos.nix
new file mode 100644
index 00000000000..4ca9a0169bf
--- /dev/null
+++ b/modules/services/system/kerberos.nix
@@ -0,0 +1,71 @@
+{pkgs, config, ...}:
+
+let
+
+  inherit (pkgs.lib) mkOption mkIf singleton;
+
+  inherit (pkgs) heimdal;
+
+  stateDir = "/var/heimdal";
+in
+
+{
+
+  ###### interface
+  
+  options = {
+  
+    services.kerberos_server = {
+
+      enable = mkOption {
+        default = false;
+        description = ''
+          Enable the kerberos authentification server.
+        '';
+      };
+
+    };
+
+  };
+
+
+  ###### implementation
+
+  config = mkIf config.services.kerberos_server.enable {
+  
+    environment.systemPackages = [ heimdal ];
+  
+    services.xinetd.enable = true;
+    services.xinetd.services = pkgs.lib.singleton
+      { name = "kerberos-adm";
+        flags = "REUSE NAMEINARGS";
+        protocol = "tcp";
+        user = "root";
+        server = "${pkgs.tcpWrapper}/sbin/tcpd";
+        serverArgs = "${pkgs.heimdal}/sbin/kadmind";
+      };
+
+    jobs.kdc =
+      { description = "Kerberos Domain Controller daemon";
+
+        startOn = "ip-up";
+
+        preStart =
+          ''
+            mkdir -m 0755 -p ${stateDir}
+          '';
+
+        exec = "${heimdal}/sbin/kdc";
+
+      };
+
+    jobs.kpasswdd =
+      { description = "Kerberos Domain Controller daemon";
+
+        startOn = "ip-up";
+
+        exec = "${heimdal}/sbin/kpasswdd";
+      };
+  };
+  
+}
-- 
GitLab


From 6c8c1f935ab503d4af2a4072a76de895925e3169 Mon Sep 17 00:00:00 2001
From: David Guibert <david.guibert@gmail.com>
Date: Fri, 6 Aug 2010 08:50:48 +0000
Subject: [PATCH 2517/5331] nixos: authenticate through kerberos

config.krb5.enable needs to be set as true.
Also use pam_ccreds to cache Kerberos credentials for offline logins.

svn path=/nixos/trunk/; revision=22986
---
 modules/config/krb5.nix  | 28 ++++++++++++++++++++++++----
 modules/security/pam.nix | 16 ++++++++++++++--
 2 files changed, 38 insertions(+), 6 deletions(-)

diff --git a/modules/config/krb5.nix b/modules/config/krb5.nix
index 6543bbafc7d..7ff0b498562 100644
--- a/modules/config/krb5.nix
+++ b/modules/config/krb5.nix
@@ -6,8 +6,6 @@ let
 
   cfg = config.krb5;
 
-  #myPkgs = import /home/nixer/nix/my-expr.nix { system = "x86_64-linux"; };
-
   options = {
     krb5 = {
 
@@ -21,6 +19,11 @@ let
         description = "Default realm.";
       };
 
+      domainRealm = mkOption {
+        default = "atena.mit.edu";
+        description = "Default domain realm.";
+      };
+
       kdc = mkOption {
         default = "kerberos.mit.edu";
         description = "Kerberos Domain Controller";
@@ -49,6 +52,7 @@ mkIf config.krb5.enable {
           ''
 [libdefaults]
     default_realm = ${cfg.defaultRealm}
+    encrypt = true
 
 # The following krb5.conf variables are only for MIT Kerberos.
     krb4_config = /etc/krb.conf
@@ -84,6 +88,7 @@ mkIf config.krb5.enable {
     ${cfg.defaultRealm} = {
         kdc = ${cfg.kdc}
         admin_server = ${cfg.kerberosAdminServer}
+#        kpasswd_server = ${cfg.kerberosAdminServer}
     }
     ATHENA.MIT.EDU = {
         kdc = kerberos.mit.edu:88
@@ -162,6 +167,8 @@ mkIf config.krb5.enable {
     }
 
 [domain_realm]
+    .${cfg.domainRealm} = ${cfg.defaultRealm}
+    ${cfg.domainRealm} = ${cfg.defaultRealm}
     .mit.edu = ATHENA.MIT.EDU
     mit.edu = ATHENA.MIT.EDU
     .media.mit.edu = MEDIA-LAB.MIT.EDU
@@ -172,10 +179,23 @@ mkIf config.krb5.enable {
     whoi.edu = ATHENA.MIT.EDU
     .stanford.edu = stanford.edu
 
-[login]
+[logging]
+    kdc = SYSLOG:INFO:DAEMON
+    admin_server = SYSLOG:INFO:DAEMON
+    default = SYSLOG:INFO:DAEMON
     krb4_convert = true
     krb4_get_tickets = false
-        
+
+
+[appdefaults]
+    pam = {
+        debug = false
+        ticket_lifetime = 36000
+        renew_lifetime = 36000
+        max_timeout = 30
+        timeout_shift = 2
+        initial_timeout = 1
+    }
           '';
         target = "krb5.conf";
       }
diff --git a/modules/security/pam.nix b/modules/security/pam.nix
index 20868140cfa..5c59282fe8a 100644
--- a/modules/security/pam.nix
+++ b/modules/security/pam.nix
@@ -7,7 +7,7 @@ with pkgs.lib;
 
 let
 
-  inherit (pkgs) pam_usb pam_ldap;
+  inherit (pkgs) pam_usb pam_ldap pam_krb5 pam_ccreds;
 
   otherService = pkgs.writeText "other.pam"
     ''
@@ -63,6 +63,8 @@ let
           # Account management.
           ${optionalString config.users.ldap.enable
               "account optional ${pam_ldap}/lib/security/pam_ldap.so"}
+          ${optionalString config.krb5.enable
+              "account sufficient ${pam_krb5}/lib/security/pam_krb5.so"}
           account required pam_unix.so
 
           # Authentication management.
@@ -74,11 +76,18 @@ let
               "auth sufficient ${pam_ldap}/lib/security/pam_ldap.so"}
           auth sufficient pam_unix.so ${
             optionalString allowNullPassword "nullok"}
+          ${optionalString config.krb5.enable
+''auth [default=ignore success=1 service_err=reset] ${pam_krb5}/lib/security/pam_krb5.so use_first_pass
+auth [default=die success=done] ${pam_ccreds}/lib/security/pam_ccreds.so action=validate use_first_pass
+auth sufficient ${pam_ccreds}/lib/security/pam_ccreds.so action=store use_first_pass
+          ''}
           auth required   pam_deny.so
 
           # Password management.
           ${optionalString config.users.ldap.enable
               "password sufficient ${pam_ldap}/lib/security/pam_ldap.so"}
+          ${optionalString config.krb5.enable
+              "password sufficient ${pam_krb5}/lib/security/pam_krb5.so use_first_pass"}
           password requisite pam_unix.so nullok sha512
           ${optionalString config.services.samba.syncPasswordsByPam
               "password optional ${pkgs.samba}/lib/security/pam_smbpass.so nullok use_authtok try_first_pass"}
@@ -86,6 +95,8 @@ let
           # Session management.
           ${optionalString config.users.ldap.enable
               "session optional ${pam_ldap}/lib/security/pam_ldap.so"}
+          ${optionalString config.krb5.enable
+              "session optional ${pam_krb5}/lib/security/pam_krb5.so"}
           session required pam_unix.so
           ${optionalString ownDevices
               "session optional ${pkgs.consolekit}/lib/security/pam_ck_connector.so"}
@@ -184,7 +195,8 @@ in
     environment.systemPackages =
       # Include the PAM modules in the system path mostly for the manpages.
       [ pkgs.pam ]
-      ++ optional config.users.ldap.enable pam_ldap;
+      ++ optional config.users.ldap.enable pam_ldap
+      ++ optional config.krb5.enable [pam_krb5 pam_ccreds];
 
     environment.etc =
       map makePAMService config.security.pam.services
-- 
GitLab


From ea49707f85a880493b453a331d67259ad30cf3b4 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 6 Aug 2010 14:52:09 +0000
Subject: [PATCH 2518/5331] * Run CUPS' external programs in the "lp" group so
 that they can   access printer devices in /dev.  Also use a "cups" user
 instead of   "nobody".

svn path=/nixos/trunk/; revision=23003
---
 modules/misc/ids.nix                |  3 ++-
 modules/services/printing/cupsd.nix | 20 +++++++++++++++++---
 2 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/modules/misc/ids.nix b/modules/misc/ids.nix
index 8d516946868..11f41aa0827 100644
--- a/modules/misc/ids.nix
+++ b/modules/misc/ids.nix
@@ -54,7 +54,8 @@ in
     privoxy = 32;    
     osgi = 34;
     sabnzbd = 33;
-    tor = 35;    
+    tor = 35;
+    cups = 36;
     # When adding a uid, make sure it doesn't match an existing gid.
 
     nixbld = 30000; # start of range of uids
diff --git a/modules/services/printing/cupsd.nix b/modules/services/printing/cupsd.nix
index 0ac52fe1038..8599512a5f5 100644
--- a/modules/services/printing/cupsd.nix
+++ b/modules/services/printing/cupsd.nix
@@ -102,11 +102,18 @@ in
 
   config = mkIf config.services.printing.enable {
 
-    environment.systemPackages = [cups];
+    users.extraUsers = singleton
+      { name = "cups";
+        uid = config.ids.uids.cups;
+        group = "lp";
+        description = "CUPS printing services";
+      };
+
+    environment.systemPackages = [ cups ];
 
-    services.dbus.packages = [cups];
+    services.dbus.packages = [ cups ];
 
-    # cups uses libusb to talk to printers, and does not use the
+    # Cups uses libusb to talk to printers, and does not use the
     # linux kernel driver. If the driver is not in a black list, it
     # gets loaded, and then cups cannot access the printers.
     boot.blacklistedKernelModules = [ "usblp" ];
@@ -167,6 +174,13 @@ in
 
         TempDir ${cfg.tempDir}
 
+        # User and group used to run external programs, including
+        # those that actually send the job to the printer.  Note that
+        # Udev sets the group of printer devices to `lp', so we want
+        # these programs to run as `lp' as well.
+        User cups
+        Group lp
+
         Browsing On
         BrowseOrder allow,deny
         BrowseAllow @LOCAL
-- 
GitLab


From 05fc10f3a82217154145e0d02a6e133fdd183b39 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 6 Aug 2010 18:52:00 +0000
Subject: [PATCH 2519/5331] * Add dosfstools to the installation CD (for  
 {mkfs,fsck}.{vfat,msdos}).

svn path=/nixos/trunk/; revision=23006
---
 modules/installer/cd-dvd/installation-cd-base.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/modules/installer/cd-dvd/installation-cd-base.nix b/modules/installer/cd-dvd/installation-cd-base.nix
index 6eb4675a69c..3f673885941 100644
--- a/modules/installer/cd-dvd/installation-cd-base.nix
+++ b/modules/installer/cd-dvd/installation-cd-base.nix
@@ -57,6 +57,7 @@ let
           # Tools to create / manipulate filesystems.
           pkgs.ntfsprogs # for resizing NTFS partitions
           pkgs.btrfsProgs
+          pkgs.dosfstools
           pkgs.xfsprogs
           pkgs.jfsutils
           pkgs.jfsrec
-- 
GitLab


From d7d2d5e3d5d88d4de70d01999795ddf0114516e7 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 6 Aug 2010 23:09:37 +0000
Subject: [PATCH 2520/5331] * Add some NLS modules required to mount FAT
 filesystems.  We need   this to boot the NixOS installer from a USB stick.

svn path=/nixos/trunk/; revision=23019
---
 modules/installer/cd-dvd/installation-cd-base.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/installer/cd-dvd/installation-cd-base.nix b/modules/installer/cd-dvd/installation-cd-base.nix
index 3f673885941..69089d600e4 100644
--- a/modules/installer/cd-dvd/installation-cd-base.nix
+++ b/modules/installer/cd-dvd/installation-cd-base.nix
@@ -188,7 +188,7 @@ in
 
       # Add vfat to enable people to copy the contents of the CD to a
       # bootable USB stick.
-      "vfat"
+      "vfat" "nls_cp437" "nls_iso8859-1"
     ];
 
   boot.initrd.kernelModules =
-- 
GitLab


From dec807946845852315902141cf8fae930c94f4e2 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Sat, 7 Aug 2010 10:26:37 +0000
Subject: [PATCH 2521/5331] Fix stdenv reference

svn path=/nixos/trunk/; revision=23020
---
 modules/services/x11/display-managers/slim.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/services/x11/display-managers/slim.nix b/modules/services/x11/display-managers/slim.nix
index cdb4dc785e2..a98657b7c80 100644
--- a/modules/services/x11/display-managers/slim.nix
+++ b/modules/services/x11/display-managers/slim.nix
@@ -13,7 +13,7 @@ let
       default_xserver ${dmcfg.xserverBin}
       xserver_arguments ${dmcfg.xserverArgs}
       sessions ${pkgs.lib.concatStringsSep "," (dmcfg.session.names ++ ["custom"])}
-      login_cmd exec ${pkgs.stdenv.bash}/bin/sh ${dmcfg.session.script} "%session"
+      login_cmd exec ${pkgs.stdenv.shell}/bin/sh ${dmcfg.session.script} "%session"
       halt_cmd ${config.system.build.upstart}/sbin/shutdown -h now
       reboot_cmd ${config.system.build.upstart}/sbin/shutdown -r now
       ${if cfg.defaultUser != "" then "default_user " + cfg.defaultUser else ""}
-- 
GitLab


From 3cab6d3e1cbbf7aa5156c7760a994af890845970 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Sat, 7 Aug 2010 11:16:06 +0000
Subject: [PATCH 2522/5331] Fixing extra /bin/sh in the shell - noticed by
 Eelco Dolstra

svn path=/nixos/trunk/; revision=23021
---
 modules/services/x11/display-managers/slim.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/services/x11/display-managers/slim.nix b/modules/services/x11/display-managers/slim.nix
index a98657b7c80..bc1fceeefc5 100644
--- a/modules/services/x11/display-managers/slim.nix
+++ b/modules/services/x11/display-managers/slim.nix
@@ -13,7 +13,7 @@ let
       default_xserver ${dmcfg.xserverBin}
       xserver_arguments ${dmcfg.xserverArgs}
       sessions ${pkgs.lib.concatStringsSep "," (dmcfg.session.names ++ ["custom"])}
-      login_cmd exec ${pkgs.stdenv.shell}/bin/sh ${dmcfg.session.script} "%session"
+      login_cmd exec ${pkgs.stdenv.shell} ${dmcfg.session.script} "%session"
       halt_cmd ${config.system.build.upstart}/sbin/shutdown -h now
       reboot_cmd ${config.system.build.upstart}/sbin/shutdown -r now
       ${if cfg.defaultUser != "" then "default_user " + cfg.defaultUser else ""}
-- 
GitLab


From e8e7ee356c7356345be059bb1f412162a2462f76 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sat, 7 Aug 2010 14:16:18 +0000
Subject: [PATCH 2523/5331] * In the installation CD, pass the label of the CD
 through the   root=... kernel command line parameter, instead of hard-coding
 it in   `fileSystems'.  This is to allow CD-to-USB converters such as  
 UNetbootin to rewrite the kernel command line to the label or UUID   of the
 USB stick.

svn path=/nixos/trunk/; revision=23024
---
 modules/installer/cd-dvd/iso-image.nix | 17 ++++++++++++++---
 modules/system/boot/stage-1-init.sh    | 14 ++++++++++++++
 modules/system/boot/stage-1.nix        |  1 +
 3 files changed, 29 insertions(+), 3 deletions(-)

diff --git a/modules/installer/cd-dvd/iso-image.nix b/modules/installer/cd-dvd/iso-image.nix
index 71b797b0d95..9ce05522f48 100644
--- a/modules/installer/cd-dvd/iso-image.nix
+++ b/modules/installer/cd-dvd/iso-image.nix
@@ -107,11 +107,22 @@ in
   system.boot.loader.kernelFile = "bzImage";
   environment.systemPackages = [ pkgs.grub2 ];
 
-  # In stage 1 of the boot, mount the CD/DVD as the root FS by label
-  # so that we don't need to know its device.
+  # In stage 1 of the boot, mount the CD as the root FS by label so
+  # that we don't need to know its device.  We pass the label of the
+  # root filesystem on the kernel command line, rather than in
+  # `fileSystems' below.  This allows CD-to-USB converters such as
+  # UNetbootin to rewrite the kernel command line to pass the label or
+  # UUID of the USB stick.  It would be nicer to write
+  # `root=/dev/disk/by-label/...' here, but UNetbootin doesn't
+  # recognise that.
+  boot.kernelParams = [ "root=LABEL=${config.isoImage.volumeID}" ];
+
+  # Note that /dev/root is a symlink to the actual root device
+  # specified on the kernel command line, created in the stage 1 init
+  # script.
   fileSystems =
     [ { mountPoint = "/";
-        label = config.isoImage.volumeID;
+        device = "/dev/root";
       }
       { mountPoint = "/nix/store";
         fsType = "squashfs";
diff --git a/modules/system/boot/stage-1-init.sh b/modules/system/boot/stage-1-init.sh
index 11a10629d7c..080016dc32c 100644
--- a/modules/system/boot/stage-1-init.sh
+++ b/modules/system/boot/stage-1-init.sh
@@ -80,6 +80,20 @@ for o in $(cat /proc/cmdline); do
         stage1panic)
             panicOnFail=1
             ;;
+        root=*)
+            # If a root device is specified on the kernel command
+            # line, make it available through the symlink /dev/root.
+            # Recognise LABEL= and UUID= to support UNetbootin.
+            set -- $(IFS==; echo $o)
+            if [ $2 = "LABEL" ]; then
+                root="/dev/disk/by-label/$3"
+            elif [ $2 = "UUID" ]; then
+                root="/dev/disk/by-uuid/$3"
+            else
+                root=$2
+            fi
+            ln -s "$root" /dev/root
+            ;;
     esac
 done
 
diff --git a/modules/system/boot/stage-1.nix b/modules/system/boot/stage-1.nix
index 0a5cec8b1d2..4eb0eedf0b4 100644
--- a/modules/system/boot/stage-1.nix
+++ b/modules/system/boot/stage-1.nix
@@ -130,6 +130,7 @@ let
       cp -v ${pkgs.coreutils}/bin/cat $out/bin
       cp -v ${pkgs.coreutils}/bin/chroot $out/bin
       cp -v ${pkgs.coreutils}/bin/sleep $out/bin
+      cp -v ${pkgs.coreutils}/bin/ln $out/bin
 
       # Copy e2fsck and friends.      
       cp -v ${pkgs.e2fsprogs}/sbin/e2fsck $out/bin
-- 
GitLab


From 622a7d3d4631b2e4d81b51b3331d4155b768947d Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sun, 8 Aug 2010 12:39:00 +0000
Subject: [PATCH 2524/5331] * If kdm is enabled, disabled slim automatically. 
 This is so that   users don't have to write

    services.xserver.displayManager.kdm.enable = true;
    services.xserver.displayManager.slim.enable = false;

  to enable kdm, but just

    services.xserver.displayManager.kdm.enable = true;


svn path=/nixos/trunk/; revision=23033
---
 modules/services/x11/desktop-managers/default.nix | 2 ++
 modules/services/x11/display-managers/kdm.nix     | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/modules/services/x11/desktop-managers/default.nix b/modules/services/x11/desktop-managers/default.nix
index d8303d4680a..8afe14b743d 100644
--- a/modules/services/x11/desktop-managers/default.nix
+++ b/modules/services/x11/desktop-managers/default.nix
@@ -19,6 +19,7 @@ in
   ];
 
   options = {
+  
     services.xserver.desktopManager = {
 
       session = mkOption {
@@ -63,6 +64,7 @@ in
       };
 
     };
+    
   };
 
   config = {
diff --git a/modules/services/x11/display-managers/kdm.nix b/modules/services/x11/display-managers/kdm.nix
index a88b34dc5ac..74b430e298c 100644
--- a/modules/services/x11/display-managers/kdm.nix
+++ b/modules/services/x11/display-managers/kdm.nix
@@ -92,6 +92,8 @@ in
   ###### implementation
   
   config = mkIf cfg.enable {
+
+    services.xserver.displayManager.slim.enable = false;
   
     services.xserver.displayManager.job =
       { execCmd =
-- 
GitLab


From cbc05c1480234a558df4b0b3bdc30a9f020d3b37 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sun, 8 Aug 2010 13:55:35 +0000
Subject: [PATCH 2525/5331] * Enable wpa_supplicant on the installation CD.

svn path=/nixos/trunk/; revision=23034
---
 modules/installer/cd-dvd/installation-cd-base.nix   | 5 ++++-
 modules/installer/cd-dvd/installation-cd-rescue.nix | 2 +-
 modules/installer/cd-dvd/live-dvd.nix               | 1 -
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/modules/installer/cd-dvd/installation-cd-base.nix b/modules/installer/cd-dvd/installation-cd-base.nix
index 69089d600e4..0fc7fa581a1 100644
--- a/modules/installer/cd-dvd/installation-cd-base.nix
+++ b/modules/installer/cd-dvd/installation-cd-base.nix
@@ -47,7 +47,6 @@ let
           pkgs.sshfsFuse
           pkgs.socat
           pkgs.screen
-          pkgs.wpa_supplicant # !!! should use the wpa module
 
           # Hardware-related tools.
           pkgs.sdparm
@@ -249,4 +248,8 @@ in
   # default root password is empty.
   services.openssh.enable = true;
   jobs.sshd.startOn = pkgs.lib.mkOverride 50 {} "";
+
+  # Enable wpa_supplicant, but don't start it by default.
+  networking.enableWLAN = true;
+  jobs.wpa_supplicant.startOn = pkgs.lib.mkOverride 50 {} "";
 }
diff --git a/modules/installer/cd-dvd/installation-cd-rescue.nix b/modules/installer/cd-dvd/installation-cd-rescue.nix
index fe067df03fb..ed5184c69cb 100644
--- a/modules/installer/cd-dvd/installation-cd-rescue.nix
+++ b/modules/installer/cd-dvd/installation-cd-rescue.nix
@@ -20,7 +20,7 @@
     utillinuxCurses ddrescue 
     pciutils sdparm hdparm hddtemp usbutils
     btrfsProgs xfsprogs jfsutils jfsrec
-    wpa_supplicant iproute 
+    iproute 
     fuse ntfs3g smbfsFuse sshfsFuse
     manpages irssi elinks mcabber mutt openssh lftp 
     openssl ncat socat
diff --git a/modules/installer/cd-dvd/live-dvd.nix b/modules/installer/cd-dvd/live-dvd.nix
index 655376fdea4..70fa301ef1f 100644
--- a/modules/installer/cd-dvd/live-dvd.nix
+++ b/modules/installer/cd-dvd/live-dvd.nix
@@ -10,7 +10,6 @@
   # Include lots of packages.
   environment.systemPackages =
     [ pkgs.utillinuxCurses
-      pkgs.wpa_supplicant 
       pkgs.upstartJobControl
       pkgs.iproute
       pkgs.bc
-- 
GitLab


From 87dcdc05feed09169250ad51832ee76acd686770 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sun, 8 Aug 2010 13:57:21 +0000
Subject: [PATCH 2526/5331] * Fix example.

svn path=/nixos/trunk/; revision=23035
---
 modules/services/hardware/udev.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/services/hardware/udev.nix b/modules/services/hardware/udev.nix
index 8c1a79f9128..f89f29222dc 100644
--- a/modules/services/hardware/udev.nix
+++ b/modules/services/hardware/udev.nix
@@ -135,7 +135,7 @@ in
     
     hardware.firmware = mkOption {
       default = [];
-      example = [/root/my-firmware];
+      example = [ "/root/my-firmware" ];
       merge = mergeListOption; 
       description = ''
         List of directories containing firmware files.  Such files
-- 
GitLab


From 6e118cd66bad40207e1a85b5c703cb27bbdc655a Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sun, 8 Aug 2010 14:05:32 +0000
Subject: [PATCH 2527/5331] * Change the default desktop manager from "xterm"
 to the last imported   and enabled desktop manager (e.g. "kde" if KDE is
 enabled, and   "xterm" if nothing is explicitly enabled).  This means that
 you   don't have to write

    services.xserver.desktopManager.default = "kde4";

  anymore in addition to

    services.xserver.desktopManager.kde4.enable = true;

  to make KDE the default desktop environment.

* Remove the "none + none" session type.

* Remove the "+ none" string at the end of session types.  I.e. now
  it's "kde", not "kde + none".

* In kdm, add coreutils to its SystemPath so that it can remove the
  temporary directories in /tmp that it creates.

svn path=/nixos/trunk/; revision=23036
---
 modules/module-list.nix                       |  4 --
 .../services/x11/desktop-managers/default.nix | 38 +++++++++----------
 .../services/x11/display-managers/default.nix |  6 ++-
 modules/services/x11/display-managers/kdm.nix |  2 +
 4 files changed, 25 insertions(+), 25 deletions(-)

diff --git a/modules/module-list.nix b/modules/module-list.nix
index 537e6181469..f0a17bcd870 100644
--- a/modules/module-list.nix
+++ b/modules/module-list.nix
@@ -117,10 +117,6 @@
   ./services/web-servers/jboss.nix
   ./services/web-servers/tomcat.nix
   ./services/x11/desktop-managers/default.nix
-  ./services/x11/desktop-managers/gnome.nix
-  ./services/x11/desktop-managers/kde4.nix
-  ./services/x11/desktop-managers/none.nix
-  ./services/x11/desktop-managers/xterm.nix
   ./services/x11/display-managers/default.nix
   ./services/x11/display-managers/auto.nix
   ./services/x11/display-managers/kdm.nix
diff --git a/modules/services/x11/desktop-managers/default.nix b/modules/services/x11/desktop-managers/default.nix
index 8afe14b743d..04fda6d2232 100644
--- a/modules/services/x11/desktop-managers/default.nix
+++ b/modules/services/x11/desktop-managers/default.nix
@@ -1,22 +1,23 @@
-{pkgs, config, ...}:
+{ config, pkgs, ... }:
+
+with pkgs.lib;
 
 let
-  inherit (pkgs.lib) mkOption mergeOneOption mkIf filter optionalString any;
+
   xcfg = config.services.xserver;
   cfg = xcfg.desktopManager;
 
   # Whether desktop manager `d' is capable of setting a background.
   # If it isn't, the `feh' program is used as a fallback.
   needBGCond = d: ! (d ? bgSupport && d.bgSupport);
+  
 in
 
 {
-  imports = [
-    ./kde4.nix
-    ./gnome.nix
-    ./xterm.nix
-    ./none.nix
-  ];
+  # Note: the order in which desktop manager modules are imported here
+  # determines the default: later modules (if enabled) are preferred.
+  # E.g., if KDE is enabled, it supersedes xterm.
+  imports = [ ./none.nix ./xterm.nix ./gnome.nix ./kde4.nix ];
 
   options = {
   
@@ -24,11 +25,11 @@ in
 
       session = mkOption {
         default = [];
-        example = [{
-          name = "kde";
-          bgSupport = true;
-          start = "...";
-        }];
+        example = singleton
+          { name = "kde";
+            bgSupport = true;
+            start = "...";
+          };
         description = "
           Internal option used to add some common line to desktop manager
           scripts before forwarding the value to the
@@ -48,16 +49,15 @@ in
         };
       };
 
-
       default = mkOption {
-        default = "xterm";
+        default = "";
         example = "none";
-        description = "
-          Default desktop manager loaded if none have been chosen.
-        ";
+        description = "Default desktop manager loaded if none have been chosen.";
         merge = mergeOneOption;
         apply = defaultDM:
-          if any (w: w.name == defaultDM) cfg.session.list then
+          if defaultDM == "" && cfg.session.list != [] then
+            (head cfg.session.list).name
+          else if any (w: w.name == defaultDM) cfg.session.list then
             defaultDM
           else
             throw "Default desktop manager ($(defaultDM)) not found.";
diff --git a/modules/services/x11/display-managers/default.nix b/modules/services/x11/display-managers/default.nix
index 197ba7631e9..d2b01a61ba8 100644
--- a/modules/services/x11/display-managers/default.nix
+++ b/modules/services/x11/display-managers/default.nix
@@ -23,7 +23,7 @@ let
 
       # The first argument of this script is the session type.
       sessionType="$1"
-      if test "$sessionType" = default; then sessionType=""; fi
+      if [ "$sessionType" = default ]; then sessionType=""; fi
 
       ${optionalString (!cfg.displayManager.job.logsXsession) ''
         exec > ~/.xsession-errors 2>&1
@@ -180,7 +180,9 @@ in
         apply = list: rec {
           wm = filter (s: s.manage == "window") list;
           dm = filter (s: s.manage == "desktop") list;
-          names = concatMap (d: map (w: d.name + " + " + w.name) wm) dm;
+          names = flip concatMap dm
+            (d: map (w: d.name + optionalString (w.name != "none") (" + " + w.name))
+              (filter (w: d.name != "none" || w.name != "none") wm));
           desktops = mkDesktops names;
           script = xsession wm dm;
         };
diff --git a/modules/services/x11/display-managers/kdm.nix b/modules/services/x11/display-managers/kdm.nix
index 74b430e298c..7dd979376d6 100644
--- a/modules/services/x11/display-managers/kdm.nix
+++ b/modules/services/x11/display-managers/kdm.nix
@@ -26,6 +26,8 @@ let
 
       [X-:*-Core]
       ServerCmd=${dmcfg.xserverBin} ${dmcfg.xserverArgs}
+      # KDM calls `rm' somewhere to clean up some temporary directory.
+      SystemPath=${pkgs.coreutils}/bin
       # The default timeout (15) is too short in a heavily loaded boot process.
       ServerTimeout=60
       # Needed to prevent the X server from dying on logout and not coming back:
-- 
GitLab


From 5041cdddbdf469a496e83f55ea1ea835ec2fc45a Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sun, 8 Aug 2010 22:45:54 +0000
Subject: [PATCH 2528/5331] * Start of an Xfce desktop manager module. 
 Currently it just starts   Xfwm and Terminal.

svn path=/nixos/trunk/; revision=23048
---
 .../services/x11/desktop-managers/default.nix |  2 +-
 .../services/x11/desktop-managers/kde4.nix    |  3 +-
 .../services/x11/desktop-managers/xfce.nix    | 43 +++++++++++++++++++
 3 files changed, 45 insertions(+), 3 deletions(-)
 create mode 100644 modules/services/x11/desktop-managers/xfce.nix

diff --git a/modules/services/x11/desktop-managers/default.nix b/modules/services/x11/desktop-managers/default.nix
index 04fda6d2232..d1343c1c0ec 100644
--- a/modules/services/x11/desktop-managers/default.nix
+++ b/modules/services/x11/desktop-managers/default.nix
@@ -17,7 +17,7 @@ in
   # Note: the order in which desktop manager modules are imported here
   # determines the default: later modules (if enabled) are preferred.
   # E.g., if KDE is enabled, it supersedes xterm.
-  imports = [ ./none.nix ./xterm.nix ./gnome.nix ./kde4.nix ];
+  imports = [ ./none.nix ./xterm.nix ./xfce.nix ./gnome.nix ./kde4.nix ];
 
   options = {
   
diff --git a/modules/services/x11/desktop-managers/kde4.nix b/modules/services/x11/desktop-managers/kde4.nix
index 5f47fa638f0..4b6f770c694 100644
--- a/modules/services/x11/desktop-managers/kde4.nix
+++ b/modules/services/x11/desktop-managers/kde4.nix
@@ -23,8 +23,7 @@ in
       default = [];
       example = [ pkgs.kde4.digikam ];
       type = types.list types.package;
-      description = "Additional KDE 4 programs. Only minimal set is installed by
-        default.";
+      description = "Additional KDE 4 programs. Only a minimal set is installed by default.";
     };
 
   };
diff --git a/modules/services/x11/desktop-managers/xfce.nix b/modules/services/x11/desktop-managers/xfce.nix
new file mode 100644
index 00000000000..7403138b70c
--- /dev/null
+++ b/modules/services/x11/desktop-managers/xfce.nix
@@ -0,0 +1,43 @@
+{ config, pkgs, ... }:
+
+with pkgs.lib;
+
+let
+
+  xcfg = config.services.xserver;
+  cfg = xcfg.desktopManager.xfce;
+
+in
+
+{
+  options = {
+
+    services.xserver.desktopManager.xfce.enable = mkOption {
+      default = false;
+      example = true;
+      description = "Enable the Xfce desktop environment.";
+    };
+
+  };
+
+  
+  config = mkIf (xcfg.enable && cfg.enable) {
+
+    services.xserver.desktopManager.session = singleton
+      { name = "xfce";
+        bgSupport = true;
+        start =
+          ''
+            ${pkgs.xfce.xfwm4}/bin/xfwm4 --daemon
+            exec ${pkgs.xfce.terminal}/bin/terminal
+          '';
+      };
+
+    environment.systemPackages =
+      [ pkgs.xfce.xfwm4
+        pkgs.xfce.terminal
+      ];
+
+  };
+
+}
-- 
GitLab


From e41e6a65bb2ca992fd471435ed9dd4f6006ad576 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 9 Aug 2010 10:59:20 +0000
Subject: [PATCH 2529/5331] * Make sure that /tmp/.ICE-unix is owned by root
 and has 1777   permissions.  Otherwise it ends up being owned by the first
 user to   log in, and other users' iceauth calls fail.

svn path=/nixos/trunk/; revision=23052
---
 modules/system/boot/stage-2-init.sh | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/modules/system/boot/stage-2-init.sh b/modules/system/boot/stage-2-init.sh
index 7070683d9b9..8859e5716ff 100644
--- a/modules/system/boot/stage-2-init.sh
+++ b/modules/system/boot/stage-2-init.sh
@@ -118,6 +118,11 @@ rm -rf /var/log/upstart
 #echo " done"
 
 
+# Get rid of ICE locks and ensure that it's owned by root.
+rm -rf /tmp/.ICE-unix
+mkdir -m 1777 /tmp/.ICE-unix
+
+
 # This is a good time to clean up /nix/var/nix/chroots.  Doing an `rm
 # -rf' on it isn't safe in general because it can contain bind mounts
 # to /nix/store and other places.  But after rebooting these are all
-- 
GitLab


From fc8204c0e45cc9d748b1650f23f41d7230acdad0 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 9 Aug 2010 11:42:32 +0000
Subject: [PATCH 2530/5331] * Always symlink etc/dbus-1 and share/dbus-1 in the
 system path, not   just when KDE is enabled.

svn path=/nixos/trunk/; revision=23053
---
 modules/services/system/dbus.nix               | 2 ++
 modules/services/x11/desktop-managers/kde4.nix | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/modules/services/system/dbus.nix b/modules/services/system/dbus.nix
index fedb5efff06..e083707751a 100644
--- a/modules/services/system/dbus.nix
+++ b/modules/services/system/dbus.nix
@@ -161,6 +161,8 @@ in
         config.system.path
       ];
 
+    environment.pathsToLink = [ "/etc/dbus-1" "/share/dbus-1" ];
+    
   };
  
 }
diff --git a/modules/services/x11/desktop-managers/kde4.nix b/modules/services/x11/desktop-managers/kde4.nix
index 4b6f770c694..12dea185674 100644
--- a/modules/services/x11/desktop-managers/kde4.nix
+++ b/modules/services/x11/desktop-managers/kde4.nix
@@ -67,7 +67,7 @@ in
 
       x11Packages = config.environment.kdePackages;
 
-      pathsToLink = [ "/etc/xdg" "/etc/dbus-1" "/share" ];
+      pathsToLink = [ "/etc/xdg" "/share" ];
 
       etc = singleton
       { source = "${pkgs.xkeyboard_config}/etc/X11/xkb";
-- 
GitLab


From f6497fa576dd21e2e986322f8e63bf6ff8f855ec Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 9 Aug 2010 11:51:44 +0000
Subject: [PATCH 2531/5331] * Use the proper Xfce session start script. 
 Include the desktop and   the panel.

svn path=/nixos/trunk/; revision=23055
---
 modules/services/x11/desktop-managers/xfce.nix | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/modules/services/x11/desktop-managers/xfce.nix b/modules/services/x11/desktop-managers/xfce.nix
index 7403138b70c..10457a2eeb6 100644
--- a/modules/services/x11/desktop-managers/xfce.nix
+++ b/modules/services/x11/desktop-managers/xfce.nix
@@ -28,14 +28,21 @@ in
         bgSupport = true;
         start =
           ''
-            ${pkgs.xfce.xfwm4}/bin/xfwm4 --daemon
-            exec ${pkgs.xfce.terminal}/bin/terminal
+            exec ${pkgs.stdenv.shell} ${pkgs.xfce.xfceutils}/etc/xdg/xfce4/xinitrc
           '';
       };
 
     environment.systemPackages =
-      [ pkgs.xfce.xfwm4
+      [
+        pkgs.which # Needed by the xfce's xinitrc script.
+        pkgs.xfce.exo
         pkgs.xfce.terminal
+        pkgs.xfce.xfce4panel
+        pkgs.xfce.xfce4session
+        pkgs.xfce.xfceutils
+        pkgs.xfce.xfconf
+        pkgs.xfce.xfdesktop
+        pkgs.xfce.xfwm4
       ];
 
   };
-- 
GitLab


From ea1ba40374ea824e887862a2ad399486e0f22b24 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 9 Aug 2010 11:58:26 +0000
Subject: [PATCH 2532/5331] svn path=/nixos/trunk/; revision=23056

---
 tests/kde4.nix | 2 --
 1 file changed, 2 deletions(-)

diff --git a/tests/kde4.nix b/tests/kde4.nix
index 379863f6a22..2460bb27265 100644
--- a/tests/kde4.nix
+++ b/tests/kde4.nix
@@ -11,7 +11,6 @@
       services.httpd.adminAddr = "foo@example.org";
       services.httpd.documentRoot = "${pkgs.valgrind}/share/doc/valgrind/html";
 
-      services.xserver.displayManager.slim.enable = false;
       services.xserver.displayManager.kdm.enable = true;
       services.xserver.displayManager.kdm.extraConfig =
         ''
@@ -21,7 +20,6 @@
           AutoLoginPass=foobar
         '';
 
-      services.xserver.desktopManager.default = "kde4";
       services.xserver.desktopManager.kde4.enable = true;
 
       users.extraUsers = pkgs.lib.singleton
-- 
GitLab


From 057602f3f2e64cf9b01339a4dab5988fbcdf4288 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 9 Aug 2010 18:04:55 +0000
Subject: [PATCH 2533/5331] * Some subdirectories should always be symlinked in
 the system path   when X11 is enabled (e.g. etc/xdg, share/icons...).

svn path=/nixos/trunk/; revision=23062
---
 modules/services/x11/desktop-managers/kde4.nix | 2 +-
 modules/services/x11/xserver.nix               | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/modules/services/x11/desktop-managers/kde4.nix b/modules/services/x11/desktop-managers/kde4.nix
index 12dea185674..027d53f76cb 100644
--- a/modules/services/x11/desktop-managers/kde4.nix
+++ b/modules/services/x11/desktop-managers/kde4.nix
@@ -67,7 +67,7 @@ in
 
       x11Packages = config.environment.kdePackages;
 
-      pathsToLink = [ "/etc/xdg" "/share" ];
+      pathsToLink = [ "/share" ];
 
       etc = singleton
       { source = "${pkgs.xkeyboard_config}/etc/X11/xkb";
diff --git a/modules/services/x11/xserver.nix b/modules/services/x11/xserver.nix
index e94dc8dc8a1..ddb6047df21 100644
--- a/modules/services/x11/xserver.nix
+++ b/modules/services/x11/xserver.nix
@@ -378,7 +378,10 @@ in
       ++ optional (elem "ati_unfree" driverNames) kernelPackages.ati_drivers_x11;
       
     environment.systemPackages = config.environment.x11Packages;
-    
+
+    environment.pathsToLink =
+      [ "/etc/xdg" "/share/xdg" "/share/applications" "/share/icons" "/share/pixmaps" ];
+        
     services.hal.packages = optional (elem "virtualbox" driverNames) kernelPackages.virtualboxGuestAdditions;
 
     jobs.xserver =
-- 
GitLab


From 31db968be471f8fcec844f2127530bd0435ed57b Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 9 Aug 2010 20:10:16 +0000
Subject: [PATCH 2534/5331] * In QEMU, set a higher refresh rate in xorg.conf
 so that resolutions   higher than 800x600 work. * Add a "Monitor" statement
 to the "Screen" section, because otherwise   the Monitor section is ignored.

svn path=/nixos/trunk/; revision=23068
---
 modules/services/x11/xserver.nix   | 12 +++++++++---
 modules/virtualisation/qemu-vm.nix |  7 ++++++-
 2 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/modules/services/x11/xserver.nix b/modules/services/x11/xserver.nix
index ddb6047df21..38822b2627a 100644
--- a/modules/services/x11/xserver.nix
+++ b/modules/services/x11/xserver.nix
@@ -137,6 +137,7 @@ in
 
       resolutions = mkOption {
         default = [];
+        example = [ { x = 1600; y = 1200; } { x = 1024; y = 786; } ];
         description = ''
           The screen resolutions for the X server.  The first element
           is the default resolution.  If this list is empty, the X
@@ -496,6 +497,9 @@ in
           Section "Screen"
             Identifier "Screen-${driver.name}[0]"
             Device "Device-${driver.name}[0]"
+            ${optionalString (cfg.monitorSection != "") ''
+              Monitor "Monitor[0]"
+            ''}
 
             ${cfg.screenSection}
 
@@ -508,9 +512,11 @@ in
             ''}
 
             ${optionalString
-                (driver.name != "virtualbox" && (cfg.resolutions != []
-                 || cfg.extraDisplaySettings != "" || cfg.virtualScreen != null)) (
-              let
+                (driver.name != "virtualbox" &&
+                 (cfg.resolutions != [] ||
+                  cfg.extraDisplaySettings != "" ||
+                  cfg.virtualScreen != null))
+              (let
                 f = depth:
                   ''
                     SubSection "Display"
diff --git a/modules/virtualisation/qemu-vm.nix b/modules/virtualisation/qemu-vm.nix
index e054b537d43..73d527a91ca 100644
--- a/modules/virtualisation/qemu-vm.nix
+++ b/modules/virtualisation/qemu-vm.nix
@@ -265,7 +265,12 @@ in
   services.xserver.videoDriver = mkOverride 50 {} null;
   services.xserver.videoDrivers = mkOverride 50 {} [ "cirrus" "vesa" ];
   services.xserver.defaultDepth = mkOverride 50 {} 0;
-  services.xserver.resolutions = mkOverride 50 {} [];
+  services.xserver.monitorSection =
+    ''
+      # Set a higher refresh rate so that resolutions > 800x600 work.
+      HorizSync 30-140
+      VertRefresh 50-160
+    '';
 
   services.mingetty.ttys = ttys ++ optional (!cfg.graphics) "ttyS0";
 
-- 
GitLab


From c388446bb0a78c1c33778345f61db310910d9395 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 9 Aug 2010 21:59:34 +0000
Subject: [PATCH 2535/5331] * Xfce is now more or less functional.

svn path=/nixos/trunk/; revision=23075
---
 modules/config/system-path.nix                |  5 ++++
 .../services/x11/desktop-managers/xfce.nix    | 23 +++++++++++++++++++
 2 files changed, 28 insertions(+)

diff --git a/modules/config/system-path.nix b/modules/config/system-path.nix
index 03256aa9596..69466674b70 100644
--- a/modules/config/system-path.nix
+++ b/modules/config/system-path.nix
@@ -97,11 +97,16 @@ let
           paths = list;
           inherit (cfg) pathsToLink;
           ignoreCollisions = true;
+          # !!! Hacky, should modularise.
           postBuild =
             ''
               if [ -x $out/bin/update-mime-database -a -d $out/share/mime/packages ]; then
                   $out/bin/update-mime-database -V $out/share/mime
               fi
+
+              if [ -x $out/bin/gtk-update-icon-cache -a -d $out/share/icons/hicolor ]; then
+                  $out/bin/gtk-update-icon-cache $out/share/icons/hicolor
+              fi
             '';
         };
         
diff --git a/modules/services/x11/desktop-managers/xfce.nix b/modules/services/x11/desktop-managers/xfce.nix
index 10457a2eeb6..4508820f271 100644
--- a/modules/services/x11/desktop-managers/xfce.nix
+++ b/modules/services/x11/desktop-managers/xfce.nix
@@ -28,23 +28,46 @@ in
         bgSupport = true;
         start =
           ''
+            # Set GTK_PATH so that GTK+ can find the Xfce theme engine.
+            export GTK_PATH=${pkgs.xfce.gtk_xfce_engine}/lib/gtk-2.0
+            
+            # Set GTK_DATA_PREFIX so that GTK+ can find the Xfce themes.
+            export GTK_DATA_PREFIX=${config.system.path}
+            
             exec ${pkgs.stdenv.shell} ${pkgs.xfce.xfceutils}/etc/xdg/xfce4/xinitrc
           '';
       };
 
     environment.systemPackages =
       [
+        pkgs.gtkLibs.gtk # To get GTK+'s themes.
+        pkgs.hicolor_icon_theme
+        pkgs.shared_mime_info
         pkgs.which # Needed by the xfce's xinitrc script.
         pkgs.xfce.exo
+        pkgs.xfce.gtk_xfce_engine
+        pkgs.xfce.libxfcegui4 # For the icons.
+        pkgs.xfce.mousepad
+        pkgs.xfce.ristretto
         pkgs.xfce.terminal
+        pkgs.xfce.thunar
+        pkgs.xfce.xfce4icontheme
         pkgs.xfce.xfce4panel
         pkgs.xfce.xfce4session
+        pkgs.xfce.xfce4settings
         pkgs.xfce.xfceutils
         pkgs.xfce.xfconf
         pkgs.xfce.xfdesktop
         pkgs.xfce.xfwm4
+
+        # This supplies some "abstract" icons such as
+        # "utilities-terminal" and "accessories-text-editor".
+        pkgs.gnome.gnomeicontheme
       ];
 
+    environment.pathsToLink =
+      [ "/share/xfce4" "/share/themes" "/share/mime" ];
+      
   };
 
 }
-- 
GitLab


From 8de6ab7dffcb0c552bcff8495844d29fe7026558 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 9 Aug 2010 23:15:39 +0000
Subject: [PATCH 2536/5331] * Enable the Xfce power manager.

svn path=/nixos/trunk/; revision=23079
---
 modules/services/x11/desktop-managers/xfce.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/services/x11/desktop-managers/xfce.nix b/modules/services/x11/desktop-managers/xfce.nix
index 4508820f271..ced6ba4f26a 100644
--- a/modules/services/x11/desktop-managers/xfce.nix
+++ b/modules/services/x11/desktop-managers/xfce.nix
@@ -59,11 +59,11 @@ in
         pkgs.xfce.xfconf
         pkgs.xfce.xfdesktop
         pkgs.xfce.xfwm4
-
         # This supplies some "abstract" icons such as
         # "utilities-terminal" and "accessories-text-editor".
         pkgs.gnome.gnomeicontheme
-      ];
+      ]
+      ++ optional config.powerManagement.enable pkgs.xfce.xfce4_power_manager;
 
     environment.pathsToLink =
       [ "/share/xfce4" "/share/themes" "/share/mime" ];
-- 
GitLab


From 163a54886c809b15e2320d4f546f9ff2f8887ab5 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 10 Aug 2010 00:03:36 +0000
Subject: [PATCH 2537/5331] * Include fontconfig in the system path (for
 fc-list, fc-match etc.).

svn path=/nixos/trunk/; revision=23080
---
 modules/config/fonts.nix | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/modules/config/fonts.nix b/modules/config/fonts.nix
index c94f16992bd..8b7ba6fab94 100644
--- a/modules/config/fonts.nix
+++ b/modules/config/fonts.nix
@@ -1,8 +1,10 @@
-{pkgs, config, ...}:
+{ config, pkgs, ... }:
+
+with pkgs.lib;
 
 ###### interface
+
 let
-  inherit (pkgs.lib) mkOption;
 
   options = {
 
@@ -19,7 +21,7 @@ let
         ";
       };
 
-      # should be move elsewhere.
+      # Should be moved elsewhere.
       enableGhostscriptFonts = mkOption {
         default = false;
         description = "
@@ -66,8 +68,8 @@ let
           pkgs.xorg.fontmiscmisc
           pkgs.xorg.fontcursormisc
         ]
-        ++ pkgs.lib.optional config.fonts.enableCoreFonts pkgs.corefonts
-        ++ pkgs.lib.optional config.fonts.enableGhostscriptFonts "${pkgs.ghostscript}/share/ghostscript/fonts"
+        ++ optional config.fonts.enableCoreFonts pkgs.corefonts
+        ++ optional config.fonts.enableGhostscriptFonts "${pkgs.ghostscript}/share/ghostscript/fonts"
         ++ config.fonts.extraFonts;
       };
 
@@ -156,7 +158,6 @@ let
     };
   };
 
-  inherit (pkgs.lib) mkIf;
 in
 
 {
@@ -180,5 +181,6 @@ in
     '';
 
   environment.systemPackages =
-    pkgs.lib.optional config.fonts.enableFontDir config.system.build.x11Fonts;
+    optional config.fonts.enableFontDir config.system.build.x11Fonts ++
+    optional config.fonts.enableFontConfig pkgs.fontconfig;
 }
-- 
GitLab


From cddc67a6538e67bc6409fc81be2b8148d74b5f19 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 10 Aug 2010 01:00:09 +0000
Subject: [PATCH 2538/5331] * Try to load the p4_clockmod kernel module, which
 provides   CPU frequency scaling on some Intel CPUs.

svn path=/nixos/trunk/; revision=23082
---
 modules/config/power-management.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/modules/config/power-management.nix b/modules/config/power-management.nix
index 5e5a568f2ff..ce67285140e 100644
--- a/modules/config/power-management.nix
+++ b/modules/config/power-management.nix
@@ -70,7 +70,10 @@ in
         target = "pm/sleep.d/00sleep-hook";
       };
 
-    boot.kernelModules = [ "acpi_cpufreq" "cpufreq_performance" "cpufreq_powersave" "cpufreq_ondemand" ];
+    boot.kernelModules = 
+      [ "acpi_cpufreq" "cpufreq_performance" "cpufreq_powersave" "cpufreq_ondemand" 
+        "p4_clockmod"
+      ];
     
   };
 
-- 
GitLab


From 8c960af98488c7585ef05a21013700783b1adede Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 10 Aug 2010 08:36:59 +0000
Subject: [PATCH 2539/5331] * Handle the case where /boot is on the same
 filesystem as /   but on a different filesystem than /nix/store.  In that
 case   we need to copy the kernels and initrds to /boot.

svn path=/nixos/trunk/; revision=23085
---
 modules/installer/grub/grub-menu-builder.sh | 21 ++++++++++++---------
 1 file changed, 12 insertions(+), 9 deletions(-)

diff --git a/modules/installer/grub/grub-menu-builder.sh b/modules/installer/grub/grub-menu-builder.sh
index 0d5ddf60787..fc246847eed 100644
--- a/modules/installer/grub/grub-menu-builder.sh
+++ b/modules/installer/grub/grub-menu-builder.sh
@@ -25,17 +25,20 @@ case "$grubVersion" in
 esac
 
 
-# Discover whether /boot is on the same filesystem as /.  If not, then
-# all kernels and initrds must be copied to /boot, and all paths in
-# the GRUB config file must be relative to the root of the /boot
-# filesystem.  `$bootRoot' is the path to be prepended to paths under
-# /boot.
-if [ "$(stat -c '%D' /.)" = "$(stat -c '%D' /boot/.)" ]; then
-    bootRoot=/boot
-    copyKernels="@copyKernels@" # user can override in the NixOS config
-else
+# Discover whether /boot is on the same filesystem as / and
+# /nix/store.  If not, then all kernels and initrds must be copied to
+# /boot, and all paths in the GRUB config file must be relative to the
+# root of the /boot filesystem.  `$bootRoot' is the path to be
+# prepended to paths under /boot.
+if [ "$(stat -c '%D' /.)" != "$(stat -c '%D' /boot/.)" ]; then
     bootRoot=
     copyKernels=1
+elif [ "$(stat -c '%D' /boot/.)" != "$(stat -c '%D' /nix/store/.)" ]; then
+    bootRoot=/boot
+    copyKernels=1
+else
+    bootRoot=/boot
+    copyKernels="@copyKernels@" # user can override in the NixOS config
 fi
 
 
-- 
GitLab


From 313629adcf1a7039bb5e7f985b755a1acff935b6 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 10 Aug 2010 10:12:18 +0000
Subject: [PATCH 2540/5331] * Add ext4 to the default initrd.

svn path=/nixos/trunk/; revision=23088
---
 modules/system/boot/kernel.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/system/boot/kernel.nix b/modules/system/boot/kernel.nix
index 0dd1d93dd43..1f7ea8674fa 100644
--- a/modules/system/boot/kernel.nix
+++ b/modules/system/boot/kernel.nix
@@ -151,7 +151,7 @@ let kernel = config.boot.kernelPackages.kernel; in
         "ide_generic"
 
         # Filesystems.
-        "ext2" "ext3"
+        "ext2" "ext3" "ext4"
 
         # Support USB keyboards, in case the boot fails and we only have
         # a USB keyboard.
-- 
GitLab


From 5456815016195630c0d07b4f25465515b5c72e4f Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 10 Aug 2010 12:37:39 +0000
Subject: [PATCH 2541/5331] * Re-enable ctrl-alt-backspace to kill the X
 server.

svn path=/nixos/trunk/; revision=23089
---
 modules/services/x11/xserver.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/services/x11/xserver.nix b/modules/services/x11/xserver.nix
index 38822b2627a..8276f116223 100644
--- a/modules/services/x11/xserver.nix
+++ b/modules/services/x11/xserver.nix
@@ -220,7 +220,7 @@ in
       };
 
       xkbOptions = mkOption {
-        default = "";
+        default = "terminate:ctrl_alt_bksp";
         example = "grp:caps_toggle, grp_led:scroll";
         description = ''
           X keyboard options; layout switching goes here.
-- 
GitLab


From 2e0a569187991b815af91773e0c23546e1184a16 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 10 Aug 2010 14:13:57 +0000
Subject: [PATCH 2542/5331] * Use InputClass in the synaptics module to
 automatically use the   synaptics driver for all touchpads (unless the "dev"
 option is set). * Get rid of some synaptics options: SHMConfig, Repeater
 (obsolete);   *Edge (usually auto-detected), Protocol (use auto-detect
 instead).

svn path=/nixos/trunk/; revision=23092
---
 modules/services/x11/hardware/synaptics.nix | 33 ++++++++-------------
 modules/services/x11/xserver.nix            |  2 +-
 2 files changed, 13 insertions(+), 22 deletions(-)

diff --git a/modules/services/x11/hardware/synaptics.nix b/modules/services/x11/hardware/synaptics.nix
index 5f832ab7d22..a8abe87ea2b 100644
--- a/modules/services/x11/hardware/synaptics.nix
+++ b/modules/services/x11/hardware/synaptics.nix
@@ -17,9 +17,13 @@ let cfg = config.services.xserver.synaptics; in
       };
 
       dev = mkOption {
-        default = "/dev/input/event0";
-	example = null;
-        description = "Event device for Synaptics touchpad, null to omit specification.";
+        default = null;
+	example = "/dev/input/event0";
+        description = 
+          ''
+            Path for touchpad device.  Set to null to apply to any
+            auto-detected touchpad.
+          '';
       };
 
       minSpeed = mkOption {
@@ -53,25 +57,17 @@ let cfg = config.services.xserver.synaptics; in
 
     services.xserver.config =
       ''
-        Section "InputDevice"
-          Identifier "Touchpad[0]"
+        # Automatically enable the synaptics driver for all touchpads.
+        Section "InputClass"
+          Identifier "touchpad catchall"
           Driver "synaptics"
-          ${if cfg.dev != null then ''Option "Device" "${cfg.dev}"'' else ""}
-          Option "Protocol" "PS/2"
-          Option "LeftEdge" "1700"
-          Option "RightEdge" "5300"
-          Option "TopEdge" "1700"
-          Option "BottomEdge" "4200"
-          Option "FingerLow" "25"
-          Option "FingerHigh" "30"
+          MatchIsTouchpad "on"
+          ${optionalString (cfg.dev != null) ''MatchDevicePath "${cfg.dev}"''}
           Option "MaxTapTime" "180"
           Option "MaxTapMove" "220"
-          Option "VertScrollDelta" "100"
           Option "MinSpeed" "${cfg.minSpeed}"
           Option "MaxSpeed" "${cfg.maxSpeed}"
           Option "AccelFactor" "0.0010"
-          Option "SHMConfig" "on"
-          Option "Repeater" "/dev/input/mice"
           Option "TapButton1" "1"
           Option "TapButton2" "2"
           Option "TapButton3" "3"
@@ -81,11 +77,6 @@ let cfg = config.services.xserver.synaptics; in
         EndSection
       '';
 
-    services.xserver.serverLayoutSection =
-      ''
-        InputDevice "Touchpad[0]" "CorePointer"
-      '';
-
   };
 
 }
diff --git a/modules/services/x11/xserver.nix b/modules/services/x11/xserver.nix
index 8276f116223..900ed00f4b4 100644
--- a/modules/services/x11/xserver.nix
+++ b/modules/services/x11/xserver.nix
@@ -462,7 +462,7 @@ in
         EndSection
 
         Section "InputClass"
-          Identifier "Keyboards catch all"
+          Identifier "Keyboard catchall"
           MatchIsKeyboard "on"
           Option "XkbRules" "base"
           Option "XkbModel" "${cfg.xkbModel}"
-- 
GitLab


From 310fffa9749172c0dac39715ba9a7e59e43b90a8 Mon Sep 17 00:00:00 2001
From: Rob Vermaas <rob.vermaas@gmail.com>
Date: Wed, 11 Aug 2010 07:40:16 +0000
Subject: [PATCH 2543/5331] nixos/lib/testing.nix: propogate exit code in
 runInVM function

svn path=/nixos/trunk/; revision=23102
---
 lib/testing.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/testing.nix b/lib/testing.nix
index 17103115325..747419301b7 100644
--- a/lib/testing.nix
+++ b/lib/testing.nix
@@ -121,7 +121,7 @@ rec {
         
         $origBuilder $origArgs
          
-        echo "Exit code:" $?
+        exit $?
       '';
 
       testscript = ''
-- 
GitLab


From 2ec105cc85eea3c37e88f2e0a893604499ab6e00 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 11 Aug 2010 12:28:53 +0000
Subject: [PATCH 2544/5331] * Separate building of the NixOS manual and
 manpages.  Usually we only   need the manpages, and the manual takes much
 longer to build.

svn path=/nixos/trunk/; revision=23112
---
 doc/manual/default.nix                 | 35 ++++++++++++++++++++------
 modules/services/misc/nixos-manual.nix |  4 +--
 release.nix                            |  4 +--
 3 files changed, 32 insertions(+), 11 deletions(-)

diff --git a/doc/manual/default.nix b/doc/manual/default.nix
index 54301dadf44..53b7ec2d783 100644
--- a/doc/manual/default.nix
+++ b/doc/manual/default.nix
@@ -3,7 +3,7 @@
 , revision ? "HEAD"
 }:
 
-let
+let 
 
   # To prevent infinite recursion, remove system.path from the
   # options.  Not sure why this happens.
@@ -20,12 +20,15 @@ let
       -o $out ${./options-to-docbook.xsl} ${optionsXML}
   '';
 
+in rec {
+
+  # Generate the NixOS manual.
   manual = pkgs.stdenv.mkDerivation {
     name = "nixos-manual";
 
     sources = pkgs.lib.sourceFilesBySuffices ./. [".xml"];
 
-    buildInputs = [pkgs.libxml2 pkgs.libxslt];
+    buildInputs = [ pkgs.libxml2 pkgs.libxslt ];
 
     xsltFlags = ''
       --param section.autolabel 1
@@ -38,7 +41,6 @@ let
     '';
 
     buildCommand = ''
-      
       ln -s $sources/*.xml . # */
       ln -s ${optionsDocBook} options-db.xml
 
@@ -57,6 +59,28 @@ let
 
       ln -s ${pkgs.docbook5_xsl}/xml/xsl/docbook/images $dst/
       cp ${./style.css} $dst/style.css
+      
+      ensureDir $out/nix-support
+      echo "doc manual $dst manual.html" >> $out/nix-support/hydra-build-products
+    '';
+  };
+
+  # Generate the NixOS manpages.
+  manpages = pkgs.stdenv.mkDerivation {
+    name = "nixos-manpages";
+
+    sources = pkgs.lib.sourceFilesBySuffices ./. [".xml"];
+
+    buildInputs = [ pkgs.libxml2 pkgs.libxslt ];
+
+    buildCommand = ''
+      ln -s $sources/*.xml . # */
+      ln -s ${optionsDocBook} options-db.xml
+
+      # Check the validity of the manual sources.
+      xmllint --noout --nonet --xinclude --noxincludenode \
+        --relaxng ${pkgs.docbook5}/xml/rng/docbook/docbook.rng \
+        ./man-pages.xml
 
       # Generate manpages.
       ensureDir $out/share/man
@@ -66,10 +90,7 @@ let
         --param man.endnotes.are.numbered 0 \
         ${pkgs.docbook5_xsl}/xml/xsl/docbook/manpages/docbook.xsl \
         ./man-pages.xml
-      
-      ensureDir $out/nix-support
-      echo "doc manual $dst manual.html" >> $out/nix-support/hydra-build-products
     '';
   };
 
-in manual
+}
\ No newline at end of file
diff --git a/modules/services/misc/nixos-manual.nix b/modules/services/misc/nixos-manual.nix
index ed2972e5b5b..f463a91998e 100644
--- a/modules/services/misc/nixos-manual.nix
+++ b/modules/services/misc/nixos-manual.nix
@@ -68,7 +68,7 @@ in
 
     system.build.manual = manual;
 
-    environment.systemPackages = [manual];
+    environment.systemPackages = [ manual.manpages ];
 
     boot.extraTTYs = mkIf cfg.showManual ["tty${cfg.ttyNumber}"];
 
@@ -82,7 +82,7 @@ in
 
           exec =
             ''
-              ${cfg.browser} ${manual}/share/doc/nixos/manual.html \
+              ${cfg.browser} ${manual.manual}/share/doc/nixos/manual.html \
                 < /dev/tty${toString cfg.ttyNumber} > /dev/tty${toString cfg.ttyNumber} 2>&1
             '';
         };
diff --git a/release.nix b/release.nix
index 204a636568d..3d65e7054a3 100644
--- a/release.nix
+++ b/release.nix
@@ -106,7 +106,7 @@ let
       , officialRelease ? false
       }:
 
-      import "${nixosSrc}/doc/manual" {
+      (import "${nixosSrc}/doc/manual" {
         pkgs = import nixpkgs {};
         options =
           (import lib/eval-config.nix {
@@ -115,7 +115,7 @@ let
           }).options;
         revision = 
           if nixosSrc.rev == 1234 then "HEAD" else toString nixosSrc.rev;
-      };
+      }).manual;
 
 
     iso_minimal = makeIso {
-- 
GitLab


From cfb465c7a548b044d7e874dacce5600fff7c390f Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 11 Aug 2010 15:10:17 +0000
Subject: [PATCH 2545/5331] svn path=/nixos/trunk/; revision=23115

---
 modules/config/system-path.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/config/system-path.nix b/modules/config/system-path.nix
index 69466674b70..1bc7ccc2326 100644
--- a/modules/config/system-path.nix
+++ b/modules/config/system-path.nix
@@ -104,7 +104,7 @@ let
                   $out/bin/update-mime-database -V $out/share/mime
               fi
 
-              if [ -x $out/bin/gtk-update-icon-cache -a -d $out/share/icons/hicolor ]; then
+              if [ -x $out/bin/gtk-update-icon-cache -a -f $out/share/icons/hicolor/index.theme ]; then
                   $out/bin/gtk-update-icon-cache $out/share/icons/hicolor
               fi
             '';
-- 
GitLab


From f0eb823a34f103bceef4b6fcf0406634b08f937d Mon Sep 17 00:00:00 2001
From: "Yury G. Kudryashov" <urkud.urkud@gmail.com>
Date: Fri, 13 Aug 2010 14:07:34 +0000
Subject: [PATCH 2546/5331] Add unix_chkpwd suid wrapper

svn path=/nixos/trunk/; revision=23165
---
 modules/security/pam.nix             | 12 ++++++++++--
 modules/security/setuid-wrappers.nix |  3 ++-
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/modules/security/pam.nix b/modules/security/pam.nix
index 5c59282fe8a..a5491792f7e 100644
--- a/modules/security/pam.nix
+++ b/modules/security/pam.nix
@@ -191,7 +191,7 @@ in
   ###### implementation
 
   config = {
-  
+
     environment.systemPackages =
       # Include the PAM modules in the system path mostly for the manpages.
       [ pkgs.pam ]
@@ -205,6 +205,14 @@ in
           target = "pam.d/other";
         };
 
+    security.setuidOwners = [ {
+      program = "unix_chkpwd";
+      source = "${pkgs.pam}/sbin/unix_chkpwd.orig";
+      owner = "root";
+      setuid = true;
+    } ];
+
+
     security.pam.services =
       # Most of these should be moved to specific modules.
       [ { name = "cups"; }
@@ -217,5 +225,5 @@ in
       ];
 
   };
-  
+
 }
diff --git a/modules/security/setuid-wrappers.nix b/modules/security/setuid-wrappers.nix
index a7513477353..3c4a08c16b7 100644
--- a/modules/security/setuid-wrappers.nix
+++ b/modules/security/setuid-wrappers.nix
@@ -62,7 +62,8 @@ in
       default = "/var/setuid-wrappers";
       description = ''
         This option defines the path to the setuid wrappers.  It
-        should generally not be overriden.
+        should generally not be overriden. Some packages in nixpkgs rely on
+        wrapperDir == /var/setuid-wrappers
       '';
     };
 
-- 
GitLab


From 295df77f21e880c7cf4026fadc2adac61df200dc Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Sat, 14 Aug 2010 20:12:05 +0000
Subject: [PATCH 2547/5331] Move resume section after udev launch - on some
 systems devices are recognized by kernel only after udev works.

svn path=/nixos/trunk/; revision=23176
---
 modules/system/boot/stage-1-init.sh | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/modules/system/boot/stage-1-init.sh b/modules/system/boot/stage-1-init.sh
index 080016dc32c..24c55d47e59 100644
--- a/modules/system/boot/stage-1-init.sh
+++ b/modules/system/boot/stage-1-init.sh
@@ -110,20 +110,6 @@ done
 mknod /dev/null c 1 3
 
 
-# Try to resume - all modules are loaded now.
-if test -e /sys/power/tuxonice/resume; then
-    if test -n "$(cat /sys/power/tuxonice/resume)"; then
-        echo 0 > /sys/power/tuxonice/user_interface/enabled
-        echo 1 > /sys/power/tuxonice/do_resume || echo "failed to resume..."
-    fi
-fi
-
-if test -e /sys/power/resume -a -e /sys/power/disk; then
-    echo "@resumeDevice@" > /sys/power/resume 2> /dev/null || echo "failed to resume..."
-    echo shutdown > /sys/power/disk
-fi
-
-
 # Create device nodes in /dev.
 echo "running udev..."
 export UDEV_CONFIG_FILE=@udevConf@
@@ -145,6 +131,20 @@ if test -n "$debug1devices"; then fail; fi
 @postDeviceCommands@
 
 
+# Try to resume - all modules are loaded now, and devices exist
+if test -e /sys/power/tuxonice/resume; then
+    if test -n "$(cat /sys/power/tuxonice/resume)"; then
+        echo 0 > /sys/power/tuxonice/user_interface/enabled
+        echo 1 > /sys/power/tuxonice/do_resume || echo "failed to resume..."
+    fi
+fi
+
+if test -e /sys/power/resume -a -e /sys/power/disk; then
+    echo "@resumeDevice@" > /sys/power/resume 2> /dev/null || echo "failed to resume..."
+    echo shutdown > /sys/power/disk
+fi
+
+
 # Return true if the machine is on AC power, or if we can't determine
 # whether it's on AC power.
 onACPower() {
-- 
GitLab


From 751ec4f845bf614a37faf9b56c76ccb344a94584 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 16 Aug 2010 07:48:06 +0000
Subject: [PATCH 2548/5331] * Xfce requires desktop-file-utils to create/update
 .desktop files.

svn path=/nixos/trunk/; revision=23183
---
 modules/services/x11/desktop-managers/xfce.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/modules/services/x11/desktop-managers/xfce.nix b/modules/services/x11/desktop-managers/xfce.nix
index ced6ba4f26a..46b054989e0 100644
--- a/modules/services/x11/desktop-managers/xfce.nix
+++ b/modules/services/x11/desktop-managers/xfce.nix
@@ -62,6 +62,7 @@ in
         # This supplies some "abstract" icons such as
         # "utilities-terminal" and "accessories-text-editor".
         pkgs.gnome.gnomeicontheme
+        pkgs.desktop_file_utils
       ]
       ++ optional config.powerManagement.enable pkgs.xfce.xfce4_power_manager;
 
-- 
GitLab


From 1fcefe39a185d8a79a66cdbc358eae5a5329a82e Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 16 Aug 2010 08:00:18 +0000
Subject: [PATCH 2549/5331] * Add share/emacs to the paths to symlink.

svn path=/nixos/trunk/; revision=23184
---
 modules/config/system-path.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/config/system-path.nix b/modules/config/system-path.nix
index 1bc7ccc2326..80602468869 100644
--- a/modules/config/system-path.nix
+++ b/modules/config/system-path.nix
@@ -123,5 +123,5 @@ in
   require = [options];
 
   environment.systemPackages = requiredPackages;
-  environment.pathsToLink = ["/bin" "/sbin" "/lib" "/share/man" "/share/info" "/man" "/info" "/etc/xdg"];
+  environment.pathsToLink = ["/bin" "/sbin" "/lib" "/share/man" "/share/info" "/share/emacs" "/man" "/info" "/etc/xdg"];
 }
-- 
GitLab


From e87a298c33dbd232073d8cb8b8f10d7015335d5d Mon Sep 17 00:00:00 2001
From: Rob Vermaas <rob.vermaas@gmail.com>
Date: Thu, 19 Aug 2010 08:32:31 +0000
Subject: [PATCH 2550/5331] qemu virtualiztion: do not pass username on guest
 cifs mount, use sec=none in stead

svn path=/nixos/trunk/; revision=23243
---
 modules/virtualisation/qemu-vm.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/virtualisation/qemu-vm.nix b/modules/virtualisation/qemu-vm.nix
index 73d527a91ca..3d3b241ed73 100644
--- a/modules/virtualisation/qemu-vm.nix
+++ b/modules/virtualisation/qemu-vm.nix
@@ -219,7 +219,7 @@ in
       { mountPoint = "/hostfs";
         device = "//10.0.2.4/qemu";
         fsType = "cifs";
-        options = "guest,username=nobody,noperm,noacl";
+        options = "guest,sec=none,noperm,noacl";
         neededForBoot = true;
       }
       { mountPoint = "/nix/store";
-- 
GitLab


From c55f496c5284808109aa2904cea941d85f449fc0 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 19 Aug 2010 11:55:52 +0000
Subject: [PATCH 2551/5331] * The ALSA job shouldn't be started until
 udevtrigger has finished.   Otherwise the sound card drivers may not have
 been loaded yet, and   restoring the mixer settings will fail.  Also, since
 the ALSA job   itself will fail, it won't save the mixer settings on
 shutdown.

svn path=/nixos/trunk/; revision=23245
---
 modules/services/audio/alsa.nix | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/modules/services/audio/alsa.nix b/modules/services/audio/alsa.nix
index 81dd0ede208..9181a86b377 100644
--- a/modules/services/audio/alsa.nix
+++ b/modules/services/audio/alsa.nix
@@ -53,14 +53,13 @@ in
       };
 
     jobs.alsa =
-      { startOn = "started udev";
+      { startOn = "stopped udevtrigger";
 
         preStart =
           ''
             mkdir -m 0755 -p $(dirname ${soundState})
 
             # Load some additional modules.
-	    
 	    ${optionalString config.sound.enableOSSEmulation
 	      ''
                 for mod in snd_pcm_oss; do
@@ -70,7 +69,7 @@ in
 	    }
 
             # Restore the sound state.
-            ${alsaUtils}/sbin/alsactl -f ${soundState} restore
+            ${alsaUtils}/sbin/alsactl -f ${soundState} restore || true
           '';
 
         postStop =
-- 
GitLab


From 4c8fb8d4b2f467880e08ab6da9768e073754924f Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 19 Aug 2010 14:50:48 +0000
Subject: [PATCH 2552/5331] * The "atd" job tends to fail randomly on startup
 for unknown   reasons.  Doing "atd -f" seems to work better.

svn path=/nixos/trunk/; revision=23251
---
 modules/services/scheduling/atd.nix | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/modules/services/scheduling/atd.nix b/modules/services/scheduling/atd.nix
index 2934e2117c7..3c3aca6f5a2 100644
--- a/modules/services/scheduling/atd.nix
+++ b/modules/services/scheduling/atd.nix
@@ -99,9 +99,7 @@ in
             fi
           '';
 
-        daemonType = "fork";
-
-        exec = "${at}/sbin/atd";
+        exec = "${at}/sbin/atd -f";
       };
 
   };
-- 
GitLab


From a7d7f1630fbb248c16ffe5afdcb8f2c8eda67b5c Mon Sep 17 00:00:00 2001
From: "Yury G. Kudryashov" <urkud.urkud@gmail.com>
Date: Thu, 19 Aug 2010 23:07:14 +0000
Subject: [PATCH 2553/5331] Will move digikam outside of kde4 in kde4.5, so
 change example

svn path=/nixos/trunk/; revision=23266
---
 modules/services/x11/desktop-managers/kde4.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/services/x11/desktop-managers/kde4.nix b/modules/services/x11/desktop-managers/kde4.nix
index 027d53f76cb..bc18c6ad2a5 100644
--- a/modules/services/x11/desktop-managers/kde4.nix
+++ b/modules/services/x11/desktop-managers/kde4.nix
@@ -21,7 +21,7 @@ in
 
     environment.kdePackages = mkOption {
       default = [];
-      example = [ pkgs.kde4.digikam ];
+      example = [ pkgs.kde4.kdesdk ];
       type = types.list types.package;
       description = "Additional KDE 4 programs. Only a minimal set is installed by default.";
     };
-- 
GitLab


From fe2f7eae17ee83b1e4535845ca2add65a624118f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Sat, 21 Aug 2010 18:23:55 +0000
Subject: [PATCH 2554/5331] Making the stage1 work on mips too (for the name of
 the dynamic loader)

svn path=/nixos/trunk/; revision=23325
---
 modules/system/boot/stage-1.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/modules/system/boot/stage-1.nix b/modules/system/boot/stage-1.nix
index 4eb0eedf0b4..9a324124a9d 100644
--- a/modules/system/boot/stage-1.nix
+++ b/modules/system/boot/stage-1.nix
@@ -109,7 +109,7 @@ let
       ensureDir $out/lib
       
       # Copy what we need from Glibc.
-      cp -pv ${pkgs.glibc}/lib/ld-linux*.so.? $out/lib
+      cp -pv ${pkgs.glibc}/lib/ld*.so.? $out/lib
       cp -pv ${pkgs.glibc}/lib/libc.so.* $out/lib
       cp -pv ${pkgs.glibc}/lib/libpthread.so.* $out/lib
       cp -pv ${pkgs.glibc}/lib/librt.so.* $out/lib
@@ -176,9 +176,9 @@ let
       for i in $out/bin/*; do
           if ! test -L $i; then
               echo "patching $i..."
-              patchelf --set-interpreter $out/lib/ld-linux*.so.? --set-rpath $out/lib $i || true
+              patchelf --set-interpreter $out/lib/ld*.so.? --set-rpath $out/lib $i || true
               if [ -n "$doublePatchelf" ]; then
-                  patchelf --set-interpreter $out/lib/ld-linux*.so.? --set-rpath $out/lib $i || true
+                  patchelf --set-interpreter $out/lib/ld*.so.? --set-rpath $out/lib $i || true
               fi
           fi
       done
-- 
GitLab


From 392275f1856f14b02f113a1116671ac0b14069e8 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 24 Aug 2010 12:59:16 +0000
Subject: [PATCH 2555/5331] * Move support for writable Nix stores to
 qemu-vm.nix.

svn path=/nixos/trunk/; revision=23393
---
 modules/virtualisation/qemu-vm.nix | 27 ++++++++++++++++++++++++++-
 tests/installer.nix                | 13 +------------
 2 files changed, 27 insertions(+), 13 deletions(-)

diff --git a/modules/virtualisation/qemu-vm.nix b/modules/virtualisation/qemu-vm.nix
index 3d3b241ed73..739dc8a2b52 100644
--- a/modules/virtualisation/qemu-vm.nix
+++ b/modules/virtualisation/qemu-vm.nix
@@ -86,6 +86,17 @@ let
           '';
       };
 
+    virtualisation.writableStore = 
+      mkOption {
+        default = false;
+        description =
+          ''
+            If enabled, the Nix store in the VM is made writable by
+            layering an AUFS/tmpfs filesystem on top of the host's Nix
+            store.
+          '';
+      };
+
     networking.primaryIPAddress =
       mkOption {
         default = "";
@@ -163,7 +174,11 @@ in
   # CIFS.  Also use paravirtualised network and block devices for
   # performance.
   boot.initrd.availableKernelModules =
-    [ "cifs" "virtio_net" "virtio_pci" "virtio_blk" "virtio_balloon" "nls_utf8" ];
+    [ "cifs" "virtio_net" "virtio_pci" "virtio_blk" "virtio_balloon" "nls_utf8" ]
+    ++ optional cfg.writableStore [ "aufs" ];
+
+  boot.extraModulePackages =
+    optional cfg.writableStore config.boot.kernelPackages.aufs2;
 
   boot.initrd.extraUtilsCommands =
     ''
@@ -190,6 +205,16 @@ in
       fi
     '';
 
+  boot.initrd.postMountCommands =
+    ''
+      mount -o remount,ro $targetRoot/nix/store
+      ${optionalString cfg.writableStore ''
+        mkdir /mnt-store-tmpfs
+        mount -t tmpfs -o "mode=755" none /mnt-store-tmpfs
+        mount -t aufs -o dirs=/mnt-store-tmpfs=rw:$targetRoot/nix/store=rr none $targetRoot/nix/store
+      ''}
+    '';
+    
   # After booting, register the closure of the paths in
   # `virtualisation.pathsInNixDB' in the Nix database in the VM.  This
   # allows Nix operations to work in the VM.  The path to the
diff --git a/tests/installer.nix b/tests/installer.nix
index 5a71f246b58..ed1bb2b9028 100644
--- a/tests/installer.nix
+++ b/tests/installer.nix
@@ -77,18 +77,7 @@ let
           dir = "/tmp/channel";
         };
 
-      # Make the Nix store in this VM writable using AUFS.  This
-      # should probably be moved to qemu-vm.nix.
-      boot.extraModulePackages = [ config.boot.kernelPackages.aufs2 ];
-      boot.initrd.availableKernelModules = [ "aufs" ];
-
-      boot.initrd.postMountCommands =
-        ''
-          mkdir /mnt-store-tmpfs
-          mount -t tmpfs -o "mode=755" none /mnt-store-tmpfs
-          mount -t aufs -o dirs=/mnt-store-tmpfs=rw:$targetRoot/nix/store=rr none $targetRoot/nix/store
-        '';
-
+      virtualisation.writableStore = true;
       virtualisation.pathsInNixDB = channelContents;
     };
 
-- 
GitLab


From 3f10cf70f6f26df6d3db27dd156fb6530448eebe Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 24 Aug 2010 13:27:28 +0000
Subject: [PATCH 2556/5331] * Regression test for the build hook mechanism.

svn path=/nixos/trunk/; revision=23395
---
 modules/system/activation/top-level.nix |  3 +-
 modules/system/boot/stage-1.nix         |  1 +
 tests/default.nix                       |  1 +
 tests/remote-builds.nix                 | 73 +++++++++++++++++++++++++
 4 files changed, 76 insertions(+), 2 deletions(-)
 create mode 100644 tests/remote-builds.nix

diff --git a/modules/system/activation/top-level.nix b/modules/system/activation/top-level.nix
index 262a3bb9ae7..cb3c4e8941d 100644
--- a/modules/system/activation/top-level.nix
+++ b/modules/system/activation/top-level.nix
@@ -99,8 +99,7 @@ let
     let
       kernelPath = "${config.boot.kernelPackages.kernel}/" +
         "${config.system.boot.loader.kernelFile}";
-    in 
-      ''
+    in ''
       ensureDir $out
 
       if [ ! -f ${kernelPath} ]; then
diff --git a/modules/system/boot/stage-1.nix b/modules/system/boot/stage-1.nix
index 9a324124a9d..7f8287e7e4b 100644
--- a/modules/system/boot/stage-1.nix
+++ b/modules/system/boot/stage-1.nix
@@ -329,5 +329,6 @@ in {
 
   system.build.bootStage1 = bootStage1;
   system.build.initialRamdisk = initialRamdisk;
+  system.build.extraUtils = extraUtils;
 
 }
diff --git a/tests/default.nix b/tests/default.nix
index 015eb071a15..e99bce510ec 100644
--- a/tests/default.nix
+++ b/tests/default.nix
@@ -17,6 +17,7 @@ with import ../lib/testing.nix { inherit nixpkgs services system; };
   portmap = makeTest (import ./portmap.nix);
   proxy = makeTest (import ./proxy.nix);
   quake3 = makeTest (import ./quake3.nix);
+  remote_builds = makeTest (import ./remote-builds.nix);
   subversion = makeTest (import ./subversion.nix);
   trac = makeTest (import ./trac.nix);
 }
diff --git a/tests/remote-builds.nix b/tests/remote-builds.nix
new file mode 100644
index 00000000000..b567c2547f7
--- /dev/null
+++ b/tests/remote-builds.nix
@@ -0,0 +1,73 @@
+# Test Nix's remote build feature.
+
+{ pkgs, ... }:
+
+let
+
+  # The configuration of the build slaves.
+  slave = 
+    { config, pkgs, ... }:
+    { services.openssh.enable = true;
+      virtualisation.writableStore = true;
+    };
+
+  # Trivial Nix expression to build remotely.
+  expr = config: pkgs.writeText "expr.nix"
+    ''
+      let utils = builtins.storePath ${config.system.build.extraUtils}; in
+      derivation {
+        name = "hello";
+        system = "i686-linux";
+        PATH = "''${utils}/bin";
+        builder = "''${utils}/bin/sh";
+        args = [ "-c" "echo Hello; mkdir $out; cat /proc/sys/kernel/hostname > $out/host" ];
+      }
+    '';
+
+in
+
+{
+
+  nodes =
+    { slave1 = slave;
+      #slave2 = slave;
+
+      client =
+        { config, pkgs, ... }:
+        { nix.maxJobs = 0; # force remote building
+          nix.distributedBuilds = true;
+          nix.buildMachines =
+            [ { hostName = "slave1";
+                sshUser = "root";
+                sshKey = "/root/.ssh/id_dsa";
+                system = "i686-linux";
+                maxJobs = 1;
+              }
+            ];
+          virtualisation.writableStore = true;
+          virtualisation.pathsInNixDB = [ config.system.build.extraUtils ];
+        };
+    };
+
+  testScript = { nodes }:
+    ''
+      startAll;
+
+      # Create an SSH key on the client.
+      my $key = `${pkgs.openssh}/bin/ssh-keygen -t dsa -f key -N ""`;
+      $client->succeed("mkdir -m 700 /root/.ssh");
+      $client->copyFileFromHost("key", "/root/.ssh/id_dsa");
+      $client->succeed("chmod 600 /root/.ssh/id_dsa");
+
+      # Install the SSH key on the slaves.
+      $slave1->succeed("mkdir -m 700 /root/.ssh");
+      $slave1->copyFileFromHost("key.pub", "/root/.ssh/authorized_keys");
+      $slave1->waitForJob("sshd");
+      $client->succeed("ssh -o StrictHostKeyChecking=no slave1 'echo hello world'");
+
+      # Perform a build and check that it was performed on the slave.
+      my $out = $client->succeed("nix-build ${expr nodes.client.config}");
+      $slave1->succeed("test -e $out");
+    '';
+
+}
-- 
GitLab


From bfb2e304ddabc6acd7cdf30779c80e68b4feeb19 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 24 Aug 2010 13:56:18 +0000
Subject: [PATCH 2557/5331] * Test using multiple build machines in parallel.

svn path=/nixos/trunk/; revision=23396
---
 tests/remote-builds.nix | 32 +++++++++++++++++++++++---------
 1 file changed, 23 insertions(+), 9 deletions(-)

diff --git a/tests/remote-builds.nix b/tests/remote-builds.nix
index b567c2547f7..fd371024b40 100644
--- a/tests/remote-builds.nix
+++ b/tests/remote-builds.nix
@@ -12,15 +12,15 @@ let
     };
 
   # Trivial Nix expression to build remotely.
-  expr = config: pkgs.writeText "expr.nix"
+  expr = config: nr: pkgs.writeText "expr.nix"
     ''
       let utils = builtins.storePath ${config.system.build.extraUtils}; in
       derivation {
-        name = "hello";
+        name = "hello-${toString nr}";
         system = "i686-linux";
         PATH = "''${utils}/bin";
         builder = "''${utils}/bin/sh";
-        args = [ "-c" "echo Hello; mkdir $out; cat /proc/sys/kernel/hostname > $out/host" ];
+        args = [ "-c" "echo Hello; mkdir $out; cat /proc/sys/kernel/hostname > $out/host; sleep 3" ];
       }
     '';
 
@@ -30,7 +30,7 @@ in
 
   nodes =
     { slave1 = slave;
-      #slave2 = slave;
+      slave2 = slave;
 
       client =
         { config, pkgs, ... }:
@@ -43,6 +43,12 @@ in
                 system = "i686-linux";
                 maxJobs = 1;
               }
+              { hostName = "slave2";
+                sshUser = "root";
+                sshKey = "/root/.ssh/id_dsa";
+                system = "i686-linux";
+                maxJobs = 1;
+              }
             ];
           virtualisation.writableStore = true;
           virtualisation.pathsInNixDB = [ config.system.build.extraUtils ];
@@ -60,14 +66,22 @@ in
       $client->succeed("chmod 600 /root/.ssh/id_dsa");
 
       # Install the SSH key on the slaves.
-      $slave1->succeed("mkdir -m 700 /root/.ssh");
-      $slave1->copyFileFromHost("key.pub", "/root/.ssh/authorized_keys");
-      $slave1->waitForJob("sshd");
-      $client->succeed("ssh -o StrictHostKeyChecking=no slave1 'echo hello world'");
+      foreach my $slave ($slave1, $slave2) {
+          $slave->succeed("mkdir -m 700 /root/.ssh");
+          $slave->copyFileFromHost("key.pub", "/root/.ssh/authorized_keys");
+          $slave->waitForJob("sshd");
+          $client->succeed("ssh -o StrictHostKeyChecking=no " . $slave->name() . " 'echo hello world'");
+      }
 
       # Perform a build and check that it was performed on the slave.
-      my $out = $client->succeed("nix-build ${expr nodes.client.config}");
+      my $out = $client->succeed("nix-build ${expr nodes.client.config 1}");
       $slave1->succeed("test -e $out");
+
+      # And a parallel build.
+      my ($out1, $out2) = split /\s/,
+          $client->succeed("nix-store -r \$(nix-instantiate ${expr nodes.client.config 2} ${expr nodes.client.config 3})");
+      $slave1->succeed("test -e $out1 -o -e $out2");
+      $slave2->succeed("test -e $out1 -o -e $out2");
     '';
 
 }
-- 
GitLab


From b9282b17529a797733bdf57a45513219d0814d0d Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 24 Aug 2010 14:01:19 +0000
Subject: [PATCH 2558/5331] * Test whether the build hook automatically skips
 unavailable slaves.   (This is in fact currently broken.)

svn path=/nixos/trunk/; revision=23398
---
 tests/remote-builds.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/tests/remote-builds.nix b/tests/remote-builds.nix
index fd371024b40..f55520b3501 100644
--- a/tests/remote-builds.nix
+++ b/tests/remote-builds.nix
@@ -82,6 +82,10 @@ in
           $client->succeed("nix-store -r \$(nix-instantiate ${expr nodes.client.config 2} ${expr nodes.client.config 3})");
       $slave1->succeed("test -e $out1 -o -e $out2");
       $slave2->succeed("test -e $out1 -o -e $out2");
+
+      # Test whether the build hook automatically skips unavailable slaves.
+      $slave1->block;
+      $client->succeed("nix-build ${expr nodes.client.config 4}");
     '';
 
 }
-- 
GitLab


From 1e7058d025aa3535d16b0585542cc48b10188a65 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Tue, 24 Aug 2010 18:24:06 +0000
Subject: [PATCH 2559/5331] Removing the NvAGP special option for nvidiaLegacy.
 Although it helped in suspending the machine, it also slowed down the
 graphics (specially 2D) quite a lot. firefox flash, firefox scrolling was a
 pain.

I'll leave that up to the nixos user with the cfg.deviceSection.


svn path=/nixos/trunk/; revision=23407
---
 modules/services/x11/xserver.nix | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/modules/services/x11/xserver.nix b/modules/services/x11/xserver.nix
index 900ed00f4b4..345493443e5 100644
--- a/modules/services/x11/xserver.nix
+++ b/modules/services/x11/xserver.nix
@@ -487,10 +487,6 @@ in
           Section "Device"
             Identifier "Device-${driver.name}[0]"
             Driver "${driver.driverName}"
-            ${optionalString (driver.name == "nvidiaLegacy") ''
-              # This option allows suspending with a nvidiaLegacy card
-              Option "NvAGP" "1"
-            ''}
             ${cfg.deviceSection}
           EndSection
 
-- 
GitLab


From 63c3d72aa6d95e47a25bdd5dc3d365346e85a90b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Tue, 24 Aug 2010 22:00:18 +0000
Subject: [PATCH 2560/5331] Updating the nvidiaLegacy nixos xserver driver to a
 numbered name, to match the current *two* possibilities of nvidia legacy
 driver in nixpkgs.

svn path=/nixos/trunk/; revision=23412
---
 modules/services/x11/xserver.nix | 21 ++++++++++++++-------
 1 file changed, 14 insertions(+), 7 deletions(-)

diff --git a/modules/services/x11/xserver.nix b/modules/services/x11/xserver.nix
index 345493443e5..02e15c0343b 100644
--- a/modules/services/x11/xserver.nix
+++ b/modules/services/x11/xserver.nix
@@ -20,7 +20,8 @@ let
     intel        = { modules = [ xorg.xf86videointel ]; };
     nv           = { modules = [ xorg.xf86videonv ]; };
     nvidia       = { modules = [ kernelPackages.nvidia_x11 ]; };
-    nvidiaLegacy = { modules = [ kernelPackages.nvidia_x11_legacy ]; driverName = "nvidia"; };
+    nvidiaLegacy96 = { modules = [ kernelPackages.nvidia_x11_legacy96 ]; driverName = "nvidia"; };
+    nvidiaLegacy173 = { modules = [ kernelPackages.nvidia_x11_legacy173 ]; driverName = "nvidia"; };
     openchrome   = { modules = [ xorg.xf86videoopenchrome ]; };
     sis          = { modules = [ xorg.xf86videosis ]; };
     unichrome    = { modules = [ pkgs.xorgVideoUnichrome ]; };
@@ -347,7 +348,8 @@ in
 
     boot.extraModulePackages =
       optional (elem "nvidia" driverNames) kernelPackages.nvidia_x11 ++ 
-      optional (elem "nvidiaLegacy" driverNames) kernelPackages.nvidia_x11_legacy ++
+      optional (elem "nvidiaLegacy96" driverNames) kernelPackages.nvidia_x11_legacy96 ++
+      optional (elem "nvidiaLegacy173" driverNames) kernelPackages.nvidia_x11_legacy173 ++
       optional (elem "virtualbox" driverNames) kernelPackages.virtualboxGuestAdditions ++
       optional (elem "ati_unfree" driverNames) kernelPackages.ati_drivers_x11;
 
@@ -374,7 +376,8 @@ in
         pkgs.xterm
       ]
       ++ optional (elem "nvidia" driverNames) kernelPackages.nvidia_x11
-      ++ optional (elem "nvidiaLegacy" driverNames) kernelPackages.nvidia_x11_legacy
+      ++ optional (elem "nvidiaLegacy96" driverNames) kernelPackages.nvidia_x11_legacy96
+      ++ optional (elem "nvidiaLegacy173" driverNames) kernelPackages.nvidia_x11_legacy173
       ++ optional (elem "virtualbox" driverNames) xorg.xrefresh
       ++ optional (elem "ati_unfree" driverNames) kernelPackages.ati_drivers_x11;
       
@@ -397,8 +400,10 @@ in
             XORG_DRI_DRIVER_PATH = "${pkgs.mesa}/lib/dri";
           } // optionalAttrs (elem "nvidia" driverNames) {
             LD_LIBRARY_PATH = "${xorg.libX11}/lib:${xorg.libXext}/lib:${kernelPackages.nvidia_x11}/lib";
-          } // optionalAttrs (elem "nvidiaLegacy" driverNames) {
-            LD_LIBRARY_PATH = "${xorg.libX11}/lib:${xorg.libXext}/lib:${kernelPackages.nvidia_x11_legacy}/lib";
+          } // optionalAttrs (elem "nvidiaLegacy96" driverNames) {
+            LD_LIBRARY_PATH = "${xorg.libX11}/lib:${xorg.libXext}/lib:${kernelPackages.nvidia_x11_legacy96}/lib";
+          } // optionalAttrs (elem "nvidiaLegacy173" driverNames) {
+            LD_LIBRARY_PATH = "${xorg.libX11}/lib:${xorg.libXext}/lib:${kernelPackages.nvidia_x11_legacy173}/lib";
           } // optionalAttrs (elem "ati_unfree" driverNames) {
             LD_LIBRARY_PATH = "${xorg.libX11}/lib:${xorg.libXext}/lib:${kernelPackages.ati_drivers_x11}/lib:${kernelPackages.ati_drivers_x11}/X11R6/lib64/modules/linux";
             XORG_DRI_DRIVER_PATH = "${kernelPackages.ati_drivers_x11}/lib/dri"; # is ignored because ati drivers ship their own unpatched libglx.so !
@@ -414,8 +419,10 @@ in
                   ${optionalString (pkgs.stdenv.system == "x86_64-linux" && cfg.driSupport32Bit)
                     "ln -sf ${pkgs_i686.linuxPackages.nvidia_x11.override { libsOnly = true; kernel = null; } } /var/run/opengl-driver-32"}
                 ''
-              else if elem "nvidiaLegacy" driverNames then
-                "ln -sf ${kernelPackages.nvidia_x11_legacy} /var/run/opengl-driver"
+              else if elem "nvidiaLegacy96" driverNames then
+                "ln -sf ${kernelPackages.nvidia_x11_legacy96} /var/run/opengl-driver"
+              else if elem "nvidiaLegacy173" driverNames then
+                "ln -sf ${kernelPackages.nvidia_x11_legacy173} /var/run/opengl-driver"
               else if cfg.driSupport then
                 "ln -sf ${pkgs.mesa} /var/run/opengl-driver"
               else ""
-- 
GitLab


From f067d179abb73fdf4153e25c7f64380a68ae7777 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 25 Aug 2010 11:59:04 +0000
Subject: [PATCH 2561/5331] * Create /nix/var/nix/gcroots/tmp in the activation
 script.  The   build hook uses this directory to store temporary GC roots. 
 (It   creates it if it doesn't exist, but it's better to do it here as   well
 to ensure the right ownership and permissions.) * Clear
 /nix/var/nix/gcroots/tmp and /nix/var/nix/temproots at boot   time.

svn path=/nixos/trunk/; revision=23417
---
 modules/system/activation/activation-script.nix | 1 +
 modules/system/boot/stage-2-init.sh             | 4 ++++
 2 files changed, 5 insertions(+)

diff --git a/modules/system/activation/activation-script.nix b/modules/system/activation/activation-script.nix
index 5c6ca55add8..8924041ae60 100644
--- a/modules/system/activation/activation-script.nix
+++ b/modules/system/activation/activation-script.nix
@@ -133,6 +133,7 @@ let
           /nix/var/nix/chroots
       mkdir -m 1777 -p /nix/var/nix/gcroots/per-user
       mkdir -m 1777 -p /nix/var/nix/profiles/per-user
+      mkdir -m 1777 -p /nix/var/nix/gcroots/tmp
 
       ln -sf /nix/var/nix/profiles /nix/var/nix/gcroots/
       ln -sf /nix/var/nix/manifests /nix/var/nix/gcroots/
diff --git a/modules/system/boot/stage-2-init.sh b/modules/system/boot/stage-2-init.sh
index 8859e5716ff..834ad9548ed 100644
--- a/modules/system/boot/stage-2-init.sh
+++ b/modules/system/boot/stage-2-init.sh
@@ -130,6 +130,10 @@ mkdir -m 1777 /tmp/.ICE-unix
 rm -rf /nix/var/nix/chroots # recreated in activate-configuration.sh
 
 
+# Also get rid of temporary GC roots.
+rm -rf /nix/var/nix/gcroots/tmp /nix/var/nix/temproots
+
+
 # Use a tmpfs for /var/run to ensure that / or /var can be unmounted
 # or at least remounted read-only during shutdown.  (Upstart 0.6
 # apparently uses nscd to do some name lookups, resulting in it
-- 
GitLab


From b548ff10f46e1c0a0e7967f434e9e865c079e15f Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 27 Aug 2010 11:20:34 +0000
Subject: [PATCH 2562/5331] * Enable the remote builds test.

svn path=/nixos/trunk/; revision=23481
---
 release.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/release.nix b/release.nix
index 3d65e7054a3..d0ae398289f 100644
--- a/release.nix
+++ b/release.nix
@@ -161,6 +161,7 @@ let
         openssh = t.openssh.test;
         proxy = t.proxy.test;
         quake3 = t.quake3.test;
+        remote_builds = t.remote_builds.test;
         subversion = t.subversion.report;
         trac = t.trac.test;
       };
-- 
GitLab


From 4bca74376620e44e4d65e71a3f10ad6e93836c72 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 27 Aug 2010 15:31:04 +0000
Subject: [PATCH 2563/5331] * Typo.

svn path=/nixos/trunk/; revision=23485
---
 modules/virtualisation/amazon-image.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/virtualisation/amazon-image.nix b/modules/virtualisation/amazon-image.nix
index a0fc9cce908..7a37a74dc69 100644
--- a/modules/virtualisation/amazon-image.nix
+++ b/modules/virtualisation/amazon-image.nix
@@ -17,7 +17,7 @@ with pkgs.lib;
             [ "closure" config.system.build.toplevel ];
         }
         ''
-          # Create an empty filesysten and mount it.
+          # Create an empty filesystem and mount it.
           ${pkgs.e2fsprogs}/sbin/mkfs.ext3 -L nixos /dev/vda
           ${pkgs.e2fsprogs}/sbin/tune2fs -c 0 -i 0 /dev/vda
           mkdir /mnt
-- 
GitLab


From 59b29535e57b30b3c9df000a3be824e197e7049f Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 27 Aug 2010 15:32:49 +0000
Subject: [PATCH 2564/5331] * Include the Bluetooth module in module-list.nix.

svn path=/nixos/trunk/; revision=23486
---
 modules/module-list.nix                 | 11 ++++++-----
 modules/services/hardware/bluetooth.nix | 15 +++++++++++----
 modules/services/hardware/udev.nix      |  2 +-
 3 files changed, 18 insertions(+), 10 deletions(-)

diff --git a/modules/module-list.nix b/modules/module-list.nix
index f0a17bcd870..d5d0accf7da 100644
--- a/modules/module-list.nix
+++ b/modules/module-list.nix
@@ -16,9 +16,9 @@
   ./hardware/network/intel-3945abg.nix
   ./hardware/network/rt73.nix 
   ./hardware/pcmcia.nix
+  ./installer/generations-dir/generations-dir.nix
   ./installer/grub/grub.nix
   ./installer/init-script/init-script.nix
-  ./installer/generations-dir/generations-dir.nix
   ./installer/tools/nixos-checkout.nix
   ./installer/tools/tools.nix
   ./misc/assertions.nix
@@ -50,6 +50,7 @@
   ./services/databases/mysql.nix
   ./services/databases/postgresql.nix
   ./services/hardware/acpid.nix
+  ./services/hardware/bluetooth.nix
   ./services/hardware/hal.nix
   ./services/hardware/pcscd.nix
   ./services/hardware/udev.nix
@@ -78,8 +79,8 @@
   ./services/networking/avahi-daemon.nix
   ./services/networking/bind.nix
   ./services/networking/bitlbee.nix
-  ./services/networking/dhclient.nix
   ./services/networking/ddclient.nix
+  ./services/networking/dhclient.nix
   ./services/networking/dhcpd.nix
   ./services/networking/ejabberd.nix
   ./services/networking/firewall.nix
@@ -94,11 +95,11 @@
   ./services/networking/portmap.nix
   ./services/networking/privoxy.nix
   ./services/networking/quassel.nix
+  ./services/networking/sabnzbd.nix
   ./services/networking/ssh/lshd.nix
   ./services/networking/ssh/sshd.nix
   ./services/networking/tftpd.nix
   ./services/networking/vsftpd.nix
-  ./services/networking/sabnzbd.nix
   ./services/networking/wicd.nix
   ./services/networking/wpa_supplicant.nix
   ./services/networking/xinetd.nix
@@ -108,17 +109,17 @@
   ./services/scheduling/fcron.nix
   ./services/security/tor.nix
   ./services/system/dbus.nix
+  ./services/system/kerberos.nix
   ./services/system/nscd.nix
   ./services/system/uptimed.nix
-  ./services/system/kerberos.nix
   ./services/ttys/gpm.nix
   ./services/ttys/mingetty.nix
   ./services/web-servers/apache-httpd/default.nix
   ./services/web-servers/jboss.nix
   ./services/web-servers/tomcat.nix
   ./services/x11/desktop-managers/default.nix
-  ./services/x11/display-managers/default.nix
   ./services/x11/display-managers/auto.nix
+  ./services/x11/display-managers/default.nix
   ./services/x11/display-managers/kdm.nix
   ./services/x11/display-managers/slim.nix
   ./services/x11/hardware/synaptics.nix
diff --git a/modules/services/hardware/bluetooth.nix b/modules/services/hardware/bluetooth.nix
index 2359ef73e0e..f32e033081c 100644
--- a/modules/services/hardware/bluetooth.nix
+++ b/modules/services/hardware/bluetooth.nix
@@ -1,4 +1,4 @@
-{pkgs, config, ...}:
+{ config, pkgs, ... }:
 
 with pkgs.lib;
 
@@ -7,17 +7,24 @@ with pkgs.lib;
   ###### interface
 
   options = {
+
+    hardware.bluetooth.enable = mkOption {
+      default = false;
+      description = "Whether to enable support for Bluetooth.";
+    };
   
   };
 
 
   ###### implementation
   
-  config = {
+  config = mkIf config.hardware.bluetooth.enable {
+
+    environment.systemPackages = [ pkgs.bluez pkgs.openobex pkgs.obexftp ];
 
-    environment.systemPackages = [pkgs.bluez pkgs.openobex pkgs.obexftp];
+    services.udev.packages = [ pkgs.bluez ];
 
-    services.udev.packages = [pkgs.bluez];
+    services.dbus.packages = [ pkgs.bluez ];
     
   };  
   
diff --git a/modules/services/hardware/udev.nix b/modules/services/hardware/udev.nix
index f89f29222dc..c3661e0c0b5 100644
--- a/modules/services/hardware/udev.nix
+++ b/modules/services/hardware/udev.nix
@@ -46,7 +46,7 @@ let
       
       # Add the udev rules from other packages.
       for i in ${toString cfg.packages}; do
-        echo "Add rules for package $i"
+        echo "Adding rules for package $i"
         for j in $i/*/udev/rules.d/*; do
           ln -sv $j $out/$(basename $j)
         done
-- 
GitLab


From 597e083d82741781dbb25cba6ef34dff9ab21096 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Sun, 29 Aug 2010 12:11:31 +0000
Subject: [PATCH 2565/5331] Adding an option to include build dependencies into
 ISO image

svn path=/nixos/trunk/; revision=23502
---
 modules/installer/cd-dvd/iso-image.nix | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/modules/installer/cd-dvd/iso-image.nix b/modules/installer/cd-dvd/iso-image.nix
index 9ce05522f48..15ac3449207 100644
--- a/modules/installer/cd-dvd/iso-image.nix
+++ b/modules/installer/cd-dvd/iso-image.nix
@@ -54,6 +54,18 @@ let
       '';
     };
 
+    isoImage.includeSystemBuildDependencies = mkOption {
+      default = false;
+      example = true;
+      description = ''
+        Set this option to include all the needed sources etc in the
+        image. It significantly increases image size. Use that when
+        you want to be able to keep all the sources needed to build your
+        system or when you are going to install the system on a computer
+        with slow on non-existent network connection.
+      '';
+    };
+
   };
 
 
@@ -164,7 +176,9 @@ in
   isoImage.storeContents =
     [ config.system.build.bootStage2
       config.system.build.toplevel
-    ];
+    ] ++ 
+    (optional config.isoImage.includeSystemBuildDependencies
+      config.system.build.toplevel.drvPath);
 
   # Create the squashfs image that contains the Nix store.
   system.build.squashfsStore = import ../../../lib/make-squashfs.nix {
-- 
GitLab


From 4963f769d91461e250a720c8ba89d3571b91b8c1 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sun, 29 Aug 2010 21:03:22 +0000
Subject: [PATCH 2566/5331] * Print the host public key on the console so that
 the user can obtain   it securely by parsing the output of
 ec2-get-console-output.

svn path=/nixos/trunk/; revision=23524
---
 modules/virtualisation/amazon-image.nix | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/modules/virtualisation/amazon-image.nix b/modules/virtualisation/amazon-image.nix
index 7a37a74dc69..a81f40cc759 100644
--- a/modules/virtualisation/amazon-image.nix
+++ b/modules/virtualisation/amazon-image.nix
@@ -108,6 +108,13 @@ with pkgs.lib;
               rm -f /root/key.pub
           fi
 
+          # Print the host public key on the console so that the user
+          # can obtain it securely by parsing the output of
+          # ec2-get-console-output.
+          echo "-----BEGIN SSH HOST KEY FINGERPRINTS-----" > /dev/console
+          ${pkgs.openssh}/bin/ssh-keygen -l -f /etc/ssh/ssh_host_dsa_key.pub > /dev/console
+          echo "-----END SSH HOST KEY FINGERPRINTS-----" > /dev/console
+
           echo "setting host name..."
           ${pkgs.nettools}/bin/hostname $(${pkgs.curl}/bin/curl http://169.254.169.254/1.0/meta-data/hostname)
         '';
-- 
GitLab


From a242602b40284e16f748372b25f9d4e9b1df26e2 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sun, 29 Aug 2010 22:09:15 +0000
Subject: [PATCH 2567/5331] * /data -> /ephemeral0. * Put /tmp and /var on the
 /ephemeral0, as it has much more   space than the root filesystem. * Panic on
 stage 1 errors since they cannot be repaired anyway.

svn path=/nixos/trunk/; revision=23532
---
 modules/virtualisation/amazon-image.nix | 20 ++++++++++++++++++--
 1 file changed, 18 insertions(+), 2 deletions(-)

diff --git a/modules/virtualisation/amazon-image.nix b/modules/virtualisation/amazon-image.nix
index a81f40cc759..ac31f67cf1a 100644
--- a/modules/virtualisation/amazon-image.nix
+++ b/modules/virtualisation/amazon-image.nix
@@ -59,9 +59,9 @@ with pkgs.lib;
     [ { mountPoint = "/";
         device = "/dev/disk/by-label/nixos";
       }
-      { mountPoint = "/data";
+      { mountPoint = "/ephemeral0";
         device = "/dev/xvdc";
-        autocreate = true;
+        neededForBoot = true;
       }
     ];
 
@@ -71,11 +71,27 @@ with pkgs.lib;
   boot.initrd.kernelModules = [ "xen-blkfront" ];
   boot.kernelModules = [ "xen-netfront" ];
 
+  # Panic if an error occurs in stage 1, because there is nothing anybody can
+  # do about it.
+  boot.kernelParams = [ "stage1panic" ];
+
   # Generate a GRUB menu.  Amazon's pv-grub uses this to boot our kernel/initrd.
   boot.loader.grub.device = "nodev";
   boot.loader.grub.timeout = 0;
   boot.loader.grub.extraPerEntryConfig = "root (hd0)";
 
+  # Put /tmp and /var on /ephemeral0, which has a lot more space.  
+  # Unfortunately we can't do this with the `fileSystems' option 
+  # because it has no support for creating the source of a bind 
+  # mount.
+  boot.initrd.postMountCommands =
+    ''
+      mkdir -m 1777 -p $targetRoot/ephemeral0/tmp
+      mount --bind $targetRoot/ephemeral0/tmp $targetRoot/tmp
+      mkdir -m 755 -p $targetRoot/ephemeral0/var
+      mount --bind $targetRoot/ephemeral0/var $targetRoot/var
+    '';
+
   # There are no virtual consoles.
   services.mingetty.ttys = [ ];
 
-- 
GitLab


From 34719e0c4acf62adaea4bc5234f76ba6f6fa0123 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sun, 29 Aug 2010 22:11:33 +0000
Subject: [PATCH 2568/5331] * On second thought, panicking in stage 1 doesn't
 help because it   won't actually cause the instance to be terminated (even if
   "panic=1" were to be set), merely rebooted.

svn path=/nixos/trunk/; revision=23533
---
 modules/virtualisation/amazon-image.nix | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/modules/virtualisation/amazon-image.nix b/modules/virtualisation/amazon-image.nix
index ac31f67cf1a..3a56116eec6 100644
--- a/modules/virtualisation/amazon-image.nix
+++ b/modules/virtualisation/amazon-image.nix
@@ -71,10 +71,6 @@ with pkgs.lib;
   boot.initrd.kernelModules = [ "xen-blkfront" ];
   boot.kernelModules = [ "xen-netfront" ];
 
-  # Panic if an error occurs in stage 1, because there is nothing anybody can
-  # do about it.
-  boot.kernelParams = [ "stage1panic" ];
-
   # Generate a GRUB menu.  Amazon's pv-grub uses this to boot our kernel/initrd.
   boot.loader.grub.device = "nodev";
   boot.loader.grub.timeout = 0;
-- 
GitLab


From 68ebbb6093e64c89fbacd7332862a10c9ef48c9c Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sun, 29 Aug 2010 22:29:10 +0000
Subject: [PATCH 2569/5331] * Put /nix on /ephemeral0 using AUFS (with the
 original /nix from the   AMI as a base) because the root filesystem is rather
 small.

svn path=/nixos/trunk/; revision=23534
---
 modules/virtualisation/amazon-image.nix | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/modules/virtualisation/amazon-image.nix b/modules/virtualisation/amazon-image.nix
index 3a56116eec6..5108eb4f58e 100644
--- a/modules/virtualisation/amazon-image.nix
+++ b/modules/virtualisation/amazon-image.nix
@@ -68,9 +68,11 @@ with pkgs.lib;
   swapDevices =
     [ { device = "/dev/xvdb"; } ];
 
-  boot.initrd.kernelModules = [ "xen-blkfront" ];
+  boot.initrd.kernelModules = [ "xen-blkfront" "aufs" ];
   boot.kernelModules = [ "xen-netfront" ];
 
+  boot.extraModulePackages = [ config.boot.kernelPackages.aufs2 ];
+
   # Generate a GRUB menu.  Amazon's pv-grub uses this to boot our kernel/initrd.
   boot.loader.grub.device = "nodev";
   boot.loader.grub.timeout = 0;
@@ -79,13 +81,18 @@ with pkgs.lib;
   # Put /tmp and /var on /ephemeral0, which has a lot more space.  
   # Unfortunately we can't do this with the `fileSystems' option 
   # because it has no support for creating the source of a bind 
-  # mount.
+  # mount.  Also, "move" /nix to /ephemeral0 by layering an AUFS
+  # on top of it so we have a lot more space for Nix operations.
   boot.initrd.postMountCommands =
     ''
       mkdir -m 1777 -p $targetRoot/ephemeral0/tmp
       mount --bind $targetRoot/ephemeral0/tmp $targetRoot/tmp
+
       mkdir -m 755 -p $targetRoot/ephemeral0/var
       mount --bind $targetRoot/ephemeral0/var $targetRoot/var
+
+      mkdir -m 755 -p $targetRoot/ephemeral0/nix
+      mount -t aufs -o dirs=$targetRoot/ephemeral0/nix=rw:$targetRoot/nix=rr none $targetRoot/nix
     '';
 
   # There are no virtual consoles.
-- 
GitLab


From 0bfba4cbf5983ea0039838e6764e86f5449275c5 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sun, 29 Aug 2010 23:24:54 +0000
Subject: [PATCH 2570/5331] * Require KVM.

svn path=/nixos/trunk/; revision=23538
---
 lib/testing.nix | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/lib/testing.nix b/lib/testing.nix
index 747419301b7..02c011c5bc8 100644
--- a/lib/testing.nix
+++ b/lib/testing.nix
@@ -15,10 +15,13 @@ rec {
   runTests = network: tests:
     stdenv.mkDerivation {
       name = "vm-test-run";
+      
+      requiredSystemFeatures = [ "kvm" ];
+      
       inherit tests;
       
       buildInputs = [ pkgs.qemu_kvm pkgs.imagemagick ];
-      
+
       buildCommand =
         ''
           mkdir $out
@@ -138,10 +141,11 @@ rec {
         cp ${./test-driver/Machine.pm} Machine.pm
         export tests='${testscript}'
         ${perl}/bin/perl ${./test-driver/test-driver.pl} ${vms}/vms/*/bin/run-*-vm
-      '';
+      ''; # */
 
     in
       lib.overrideDerivation drv (attrs: {
+        requiredSystemFeatures = [ "kvm" ];
         builder = "${bash}/bin/sh";
         args = ["-e" vmRunCommand];
         origArgs = attrs.args;
-- 
GitLab


From 2ac462c3c757422eb89936006b0b59f9b87a9765 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 31 Aug 2010 12:57:47 +0000
Subject: [PATCH 2571/5331] * Set NIX_CONF_DIR in cronjobs.  Otherwise the
 garbage collector won't see   the system nix.conf.

svn path=/nixos/trunk/; revision=23561
---
 modules/services/scheduling/cron.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/modules/services/scheduling/cron.nix b/modules/services/scheduling/cron.nix
index 478a9800c77..e769caefdf5 100644
--- a/modules/services/scheduling/cron.nix
+++ b/modules/services/scheduling/cron.nix
@@ -12,6 +12,7 @@ let
       SHELL=${pkgs.bash}/bin/bash
       PATH=${config.system.path}/bin:${config.system.path}/sbin
       MAILTO="${config.services.cron.mailto}"
+      NIX_CONF_DIR=/nix/etc/nix
       ${pkgs.lib.concatStrings (map (job: job + "\n") config.services.cron.systemCronJobs)}
     '';
   
-- 
GitLab


From d550cc6d63cd2fce044a16f5f644bed71156d9fe Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 1 Sep 2010 11:00:35 +0000
Subject: [PATCH 2572/5331] * Grmbl.  Create the missing mount points.

svn path=/nixos/trunk/; revision=23592
---
 modules/virtualisation/amazon-image.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/modules/virtualisation/amazon-image.nix b/modules/virtualisation/amazon-image.nix
index 5108eb4f58e..4334f04325b 100644
--- a/modules/virtualisation/amazon-image.nix
+++ b/modules/virtualisation/amazon-image.nix
@@ -86,9 +86,11 @@ with pkgs.lib;
   boot.initrd.postMountCommands =
     ''
       mkdir -m 1777 -p $targetRoot/ephemeral0/tmp
+      mkdir -m 1777 -p $targetRoot/tmp
       mount --bind $targetRoot/ephemeral0/tmp $targetRoot/tmp
 
       mkdir -m 755 -p $targetRoot/ephemeral0/var
+      mkdir -m 755 -p $targetRoot/var
       mount --bind $targetRoot/ephemeral0/var $targetRoot/var
 
       mkdir -m 755 -p $targetRoot/ephemeral0/nix
-- 
GitLab


From f1a6a8b6e0b701ca3881c1a8ac49038e921a8852 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 3 Sep 2010 11:39:48 +0000
Subject: [PATCH 2573/5331] svn path=/nixos/trunk/; revision=23614

---
 modules/system/upstart-events/shutdown.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/system/upstart-events/shutdown.nix b/modules/system/upstart-events/shutdown.nix
index b7a004724be..51b741d54e0 100644
--- a/modules/system/upstart-events/shutdown.nix
+++ b/modules/system/upstart-events/shutdown.nix
@@ -80,7 +80,7 @@ with pkgs.lib;
 
           # Unmount file systems.  We repeat this until no more file systems
           # can be unmounted.  This is to handle loopback devices, file
-          # systems  mounted on other file systems and so on.
+          # systems mounted on other file systems and so on.
           tryAgain=1
           while test -n "$tryAgain"; do
               tryAgain=
@@ -110,7 +110,7 @@ with pkgs.lib;
                   # (For instance, when applied to a bind-mount it
                   # unmounts the target of the bind-mount.)  !!! But
                   # we should use `-f' for NFS.
-                  if [ "$mp" != / -a "$mp" != /nix/store ]; then
+                  if [ "$mp" != / -a "$mp" != /nix -a "$mp" != /nix/store ]; then
                       if umount -n "$mp"; then success=1; tryAgain=1; fi
                   fi
 
-- 
GitLab


From 6fa66ff7b9e5a09ac276100fc9d0d58c6a40f009 Mon Sep 17 00:00:00 2001
From: Nicolas Pierron <nicolas.b.pierron@gmail.com>
Date: Fri, 3 Sep 2010 19:10:45 +0000
Subject: [PATCH 2574/5331] Move matches just below the identifier.

svn path=/nixos/trunk/; revision=23628
---
 modules/services/x11/hardware/synaptics.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/services/x11/hardware/synaptics.nix b/modules/services/x11/hardware/synaptics.nix
index a8abe87ea2b..9328dbbad6c 100644
--- a/modules/services/x11/hardware/synaptics.nix
+++ b/modules/services/x11/hardware/synaptics.nix
@@ -59,10 +59,10 @@ let cfg = config.services.xserver.synaptics; in
       ''
         # Automatically enable the synaptics driver for all touchpads.
         Section "InputClass"
-          Identifier "touchpad catchall"
-          Driver "synaptics"
+          Identifier "synaptics touchpad catchall"
           MatchIsTouchpad "on"
           ${optionalString (cfg.dev != null) ''MatchDevicePath "${cfg.dev}"''}
+          Driver "synaptics"
           Option "MaxTapTime" "180"
           Option "MaxTapMove" "220"
           Option "MinSpeed" "${cfg.minSpeed}"
-- 
GitLab


From 9e04f67b3d7f1b2870dc38329692645bdd645534 Mon Sep 17 00:00:00 2001
From: Nicolas Pierron <nicolas.b.pierron@gmail.com>
Date: Fri, 3 Sep 2010 19:10:50 +0000
Subject: [PATCH 2575/5331] Add nixos-option tool to investigate option details
 on the cmd-line.

svn path=/nixos/trunk/; revision=23629
---
 modules/installer/tools/nixos-option.sh | 164 ++++++++++++++++++++++++
 modules/installer/tools/tools.nix       |   6 +
 2 files changed, 170 insertions(+)
 create mode 100644 modules/installer/tools/nixos-option.sh

diff --git a/modules/installer/tools/nixos-option.sh b/modules/installer/tools/nixos-option.sh
new file mode 100644
index 00000000000..5195ed8cf69
--- /dev/null
+++ b/modules/installer/tools/nixos-option.sh
@@ -0,0 +1,164 @@
+#! @shell@ -e
+
+# Allow the location of NixOS sources and the system configuration
+# file to be overridden.
+: ${NIXOS_PATH=/etc/nixos/nixos}
+: ${NIXOS=/etc/nixos/nixos}
+: ${NIXPKGS=/etc/nixos/nixpkgs}
+: ${NIXOS_CONFIG=/etc/nixos/configuration.nix}
+export NIXOS_PATH
+
+usage () {
+  echo 1>&2 "
+Usage: $0 OPTION_NAME [-v] [-d] [-l]
+
+This program is used to explore NixOS options by looking at their values or
+by looking at their description.  It is helpful for understanding the how
+your configuration is working.
+
+Options:
+
+  -v | --value          Display the current value, based on your
+                        configuration.
+  -d | --default        Display the default value, the example and the
+                        description.
+  -l | --lookup         Display where the option is defined and where it
+                        is declared.
+  --help                Show this message.
+
+Environment variables affecting nixos-option:
+
+  \$NIXOS_PATH          Path where the NixOS repository is located.
+  \$NIXOS_CONFIG        Path to your configuration file.
+  \$NIXPKGS             Path to Nix packages.
+
+"
+
+  exit 1;
+}
+
+#####################
+# Process Arguments #
+#####################
+
+desc=false
+defs=false
+value=false
+verbose=false
+
+option=""
+
+argfun=""
+for arg; do
+  if test -z "$argfun"; then
+    case $arg in
+      -d|--description) desc=true;;
+      -v|--value) value=true;;
+      -l|--lookup) defs=true;;
+      --verbose) verbose=true;;
+      --help) usage;;
+      -*) usage;;
+      *) if test -z "$option"; then
+           option="$arg"
+         else
+           usage
+         fi;;
+    esac
+  else
+    case $argfun in
+      set_*)
+        var=$(echo $argfun | sed 's,^set_,,')
+        eval $var=$arg
+        ;;
+    esac
+    argfun=""
+  fi
+done
+
+if ! $defs && ! $desc; then
+  value=true
+fi
+
+if $verbose; then
+  set -x
+else
+  set +x
+fi
+
+#############################
+# Process the configuration #
+#############################
+
+evalAttr(){
+  local prefix=$1
+  local suffix=$2
+  local strict=$3
+  echo "(import $NIXOS_PATH {}).$prefix${option:+.$option}${suffix:+.$suffix}" |
+    nix-instantiate - --eval-only ${strict:+--strict}
+}
+
+evalOpt(){
+  evalAttr "eval.options" "$@"
+}
+
+evalCfg(){
+  evalAttr "config" "$@"
+}
+
+findSources(){
+  local suffix=$1
+  echo "builtins.map (f: f.source) (import $NIXOS_PATH {}).eval.options${option:+.$option}.$suffix" |
+    nix-instantiate - --eval-only --strict
+}
+
+
+
+if test "$(evalOpt "_type" 2> /dev/null)" = '"option"'; then
+  $value && evalCfg;
+
+  if $desc; then
+    $value && echo;
+
+    if default=$(evalOpt "default" - 2> /dev/null); then
+      echo "Default: $default"
+    else
+      echo "Default: <None>"
+    fi
+    if example=$(evalOpt "example" - 2> /dev/null); then
+      echo "Example: $example"
+    fi
+    echo "Description:"
+    eval printf $(evalOpt "description")
+  fi
+
+  if $defs; then
+    $desc || $value && echo;
+
+    echo "Declared by:"
+    for f in $(findSources "declarations"); do
+      test $f = '[' -o $f = ']' && continue;
+      echo "  $f"
+    done
+    echo ""
+    echo "Defined by:"
+    for f in $(findSources "definitions"); do
+      test $f = '[' -o $f = ']' && continue;
+      echo "  $f"
+    done
+    echo ""
+  fi
+
+else
+  # echo 1>&2 "Warning: This value is not an option."
+
+  result=$(evalCfg)
+  if names=$(echo "builtins.attrNames $result" | sed 's,<CODE>,"<CODE>",g' | nix-instantiate - --eval-only --strict 2> /dev/null); then
+    echo 1>&2 "This attribute set contains:" 
+    for attr in $names; do
+      test $attr = '[' -o $attr = ']' && continue;
+      eval echo $attr # escape extra double-quotes in the attribute name.
+    done
+  else
+    echo $result
+  fi
+fi
diff --git a/modules/installer/tools/tools.nix b/modules/installer/tools/tools.nix
index 7a0e8dbf936..9785cfe0db5 100644
--- a/modules/installer/tools/tools.nix
+++ b/modules/installer/tools/tools.nix
@@ -111,6 +111,11 @@ let
     inherit (pkgs) perl;
   };
 
+  nixosOption = makeProg {
+    name = "nixos-option";
+    src = ./nixos-option.sh;
+  };
+
 in
 
 {
@@ -121,6 +126,7 @@ in
       nixosRebuild
       nixosHardwareScan
       nixosGenSeccureKeys
+      nixosOption
 
       installer2.runInChroot
       installer2.nixosPrepareInstall
-- 
GitLab


From 1f69bc4b9d295d677ea332fb41d7ffe86c849ee7 Mon Sep 17 00:00:00 2001
From: Nicolas Pierron <nicolas.b.pierron@gmail.com>
Date: Fri, 3 Sep 2010 19:10:54 +0000
Subject: [PATCH 2576/5331] Remove deprecated notation in tools.nix.

svn path=/nixos/trunk/; revision=23630
---
 modules/installer/tools/tools.nix | 82 +++++++++++++++----------------
 1 file changed, 39 insertions(+), 43 deletions(-)

diff --git a/modules/installer/tools/tools.nix b/modules/installer/tools/tools.nix
index 9785cfe0db5..d9ebb58a9f8 100644
--- a/modules/installer/tools/tools.nix
+++ b/modules/installer/tools/tools.nix
@@ -4,35 +4,6 @@
 {config, pkgs, ...}:
 
 let
-
-  ### interface
-
-  options = {
-  
-    installer.nixpkgsURL = pkgs.lib.mkOption {
-      default = "";
-      example = http://nixos.org/releases/nix/nixpkgs-0.11pre7577;
-      description = ''
-        URL of the Nixpkgs distribution to use when building the
-        installation CD.
-      '';
-    };
-
-    installer.manifests = pkgs.lib.mkOption {
-      default = [http://nixos.org/releases/nixpkgs/channels/nixpkgs-unstable/MANIFEST];
-      example =
-        [ http://nixos.org/releases/nixpkgs/channels/nixpkgs-unstable/MANIFEST
-          http://nixos.org/releases/nixpkgs/channels/nixpkgs-stable/MANIFEST
-        ];
-      description = ''
-        URLs of manifests to be downloaded when you run
-        <command>nixos-rebuild</command> to speed up builds.
-      '';
-    };
-    
-  };
-
-
   ### implementation
 
   makeProg = args: pkgs.substituteAll (args // {
@@ -119,23 +90,48 @@ let
 in
 
 {
-  require = options;
+  options = {
+  
+    installer.nixpkgsURL = pkgs.lib.mkOption {
+      default = "";
+      example = http://nixos.org/releases/nix/nixpkgs-0.11pre7577;
+      description = ''
+        URL of the Nixpkgs distribution to use when building the
+        installation CD.
+      '';
+    };
+
+    installer.manifests = pkgs.lib.mkOption {
+      default = [http://nixos.org/releases/nixpkgs/channels/nixpkgs-unstable/MANIFEST];
+      example =
+        [ http://nixos.org/releases/nixpkgs/channels/nixpkgs-unstable/MANIFEST
+          http://nixos.org/releases/nixpkgs/channels/nixpkgs-stable/MANIFEST
+        ];
+      description = ''
+        URLs of manifests to be downloaded when you run
+        <command>nixos-rebuild</command> to speed up builds.
+      '';
+    };
+    
+  };
 
-  environment.systemPackages =
-    [ nixosInstall
-      nixosRebuild
-      nixosHardwareScan
-      nixosGenSeccureKeys
-      nixosOption
+  config = {
+    environment.systemPackages =
+      [ nixosInstall
+        nixosRebuild
+         nixosHardwareScan
+         nixosGenSeccureKeys
+         nixosOption
 
-      installer2.runInChroot
-      installer2.nixosPrepareInstall
-    ];
+         installer2.runInChroot
+         installer2.nixosPrepareInstall
+      ];
 
-  system.build = {
-    inherit nixosInstall;
+    system.build = {
+      inherit nixosInstall;
 
-    # expose scripts
-    inherit (installer2) nixosPrepareInstall runInChroot nixosBootstrap minimalInstallArchive;
+      # expose scripts
+      inherit (installer2) nixosPrepareInstall runInChroot nixosBootstrap minimalInstallArchive;
+    };
   };
 }
-- 
GitLab


From c9dc3651da725046c1cbfda9139bad77484604cd Mon Sep 17 00:00:00 2001
From: Nicolas Pierron <nicolas.b.pierron@gmail.com>
Date: Fri, 3 Sep 2010 19:10:59 +0000
Subject: [PATCH 2577/5331] Replace mkOverride by its alias mkOverrideTemplate
 to remove the unused template argument of mkOverride later.

svn path=/nixos/trunk/; revision=23631
---
 modules/installer/cd-dvd/installation-cd-base.nix  |  4 ++--
 modules/installer/cd-dvd/system-tarball-pc.nix     |  2 +-
 modules/services/x11/desktop-managers/kde4.nix     |  2 +-
 modules/system/activation/no-clone.nix             |  8 ++++----
 modules/testing/test-instrumentation.nix           |  4 ++--
 modules/virtualisation/qemu-vm.nix                 | 14 +++++++-------
 tests/check-filesystems.nix                        |  2 +-
 tests/installer.nix                                |  2 +-
 tests/nfs.nix                                      |  2 +-
 tests/quake3.nix                                   |  2 +-
 .../configuration-iso.nix                          |  2 +-
 .../test-nixos-install-from-cd/module-insecure.nix |  2 +-
 tests/trac.nix                                     |  2 +-
 13 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/modules/installer/cd-dvd/installation-cd-base.nix b/modules/installer/cd-dvd/installation-cd-base.nix
index 0fc7fa581a1..c83faa28a04 100644
--- a/modules/installer/cd-dvd/installation-cd-base.nix
+++ b/modules/installer/cd-dvd/installation-cd-base.nix
@@ -247,9 +247,9 @@ in
   # not be started by default on the installation CD because the
   # default root password is empty.
   services.openssh.enable = true;
-  jobs.sshd.startOn = pkgs.lib.mkOverride 50 {} "";
+  jobs.sshd.startOn = pkgs.lib.mkOverrideTemplate 50 {} "";
 
   # Enable wpa_supplicant, but don't start it by default.
   networking.enableWLAN = true;
-  jobs.wpa_supplicant.startOn = pkgs.lib.mkOverride 50 {} "";
+  jobs.wpa_supplicant.startOn = pkgs.lib.mkOverrideTemplate 50 {} "";
 }
diff --git a/modules/installer/cd-dvd/system-tarball-pc.nix b/modules/installer/cd-dvd/system-tarball-pc.nix
index 3245a8c34b3..5a01dec5202 100644
--- a/modules/installer/cd-dvd/system-tarball-pc.nix
+++ b/modules/installer/cd-dvd/system-tarball-pc.nix
@@ -174,5 +174,5 @@ in
   # not be started by default on the installation CD because the
   # default root password is empty.
   services.openssh.enable = true;
-  jobs.sshd.startOn = pkgs.lib.mkOverride 50 {} "";
+  jobs.sshd.startOn = pkgs.lib.mkOverrideTemplate 50 {} "";
 }
diff --git a/modules/services/x11/desktop-managers/kde4.nix b/modules/services/x11/desktop-managers/kde4.nix
index bc18c6ad2a5..cf4faef223f 100644
--- a/modules/services/x11/desktop-managers/kde4.nix
+++ b/modules/services/x11/desktop-managers/kde4.nix
@@ -35,7 +35,7 @@ in
     # overriden by the user's configuration).
     # !!! doesn't work yet ("Multiple definitions. Only one is allowed
     # for this option.")
-    # services.xserver.desktopManager.default = mkOverride 900 "kde4";
+    # services.xserver.desktopManager.default = mkOverrideTemplate 900 "kde4";
 
     services.xserver.desktopManager.session = singleton
       { name = "kde4";
diff --git a/modules/system/activation/no-clone.nix b/modules/system/activation/no-clone.nix
index ca106807513..74df217a01a 100644
--- a/modules/system/activation/no-clone.nix
+++ b/modules/system/activation/no-clone.nix
@@ -5,9 +5,9 @@
 with pkgs.lib;
 
 {
-  boot.loader.grub.device = mkOverride 0 {} "";
+  boot.loader.grub.device = mkOverrideTemplate 0 {} "";
   # undefined the obsolete name of the previous option.
-  boot.grubDevice = mkOverride 0 {} pkgs.lib.mkNotdef;
-  nesting.children = mkOverride 0 {} [];
-  nesting.clone = mkOverride 0 {} [];
+  boot.grubDevice = mkOverrideTemplate 0 {} pkgs.lib.mkNotdef;
+  nesting.children = mkOverrideTemplate 0 {} [];
+  nesting.clone = mkOverrideTemplate 0 {} [];
 }
diff --git a/modules/testing/test-instrumentation.nix b/modules/testing/test-instrumentation.nix
index a22b280d931..6f47a6a9c39 100644
--- a/modules/testing/test-instrumentation.nix
+++ b/modules/testing/test-instrumentation.nix
@@ -78,8 +78,8 @@ in
     services.syslogd.extraConfig = "*.* /dev/ttyS0";
 
     # Prevent tests from accessing the Internet.
-    networking.defaultGateway = mkOverride 150 {} "";
-    networking.nameservers = mkOverride 150 {} [ ];
+    networking.defaultGateway = mkOverrideTemplate 150 {} "";
+    networking.nameservers = mkOverrideTemplate 150 {} [ ];
 
     # Require a patch to the kernel to increase the 15s CIFS timeout.
     assertions =
diff --git a/modules/virtualisation/qemu-vm.nix b/modules/virtualisation/qemu-vm.nix
index 739dc8a2b52..cf527391e2c 100644
--- a/modules/virtualisation/qemu-vm.nix
+++ b/modules/virtualisation/qemu-vm.nix
@@ -232,12 +232,12 @@ in
   virtualisation.pathsInNixDB = [ config.system.build.toplevel ];
   
   # Mount the host filesystem via CIFS, and bind-mount the Nix store
-  # of the host into our own filesystem.  We use mkOverride to allow
+  # of the host into our own filesystem.  We use mkOverrideTemplate to allow
   # this module to be applied to "normal" NixOS system configuration,
   # where the regular value for the `fileSystems' attribute should be
   # disregarded for the purpose of building a VM test image (since
   # those filesystems don't exist in the VM).
-  fileSystems = mkOverride 50 {}
+  fileSystems = mkOverrideTemplate 50 {}
     [ { mountPoint = "/";
         device = "/dev/vda";
       }
@@ -259,7 +259,7 @@ in
   # host filesystem and thus deadlocks the system.
   networking.useDHCP = false;
 
-  networking.defaultGateway = mkOverride 200 {} "10.0.2.2";
+  networking.defaultGateway = mkOverrideTemplate 200 {} "10.0.2.2";
 
   networking.nameservers = [ "10.0.2.3" ];
 
@@ -287,9 +287,9 @@ in
 
   # When building a regular system configuration, override whatever
   # video driver the host uses.
-  services.xserver.videoDriver = mkOverride 50 {} null;
-  services.xserver.videoDrivers = mkOverride 50 {} [ "cirrus" "vesa" ];
-  services.xserver.defaultDepth = mkOverride 50 {} 0;
+  services.xserver.videoDriver = mkOverrideTemplate 50 {} null;
+  services.xserver.videoDrivers = mkOverrideTemplate 50 {} [ "cirrus" "vesa" ];
+  services.xserver.defaultDepth = mkOverrideTemplate 50 {} 0;
   services.xserver.monitorSection =
     ''
       # Set a higher refresh rate so that resolutions > 800x600 work.
@@ -300,5 +300,5 @@ in
   services.mingetty.ttys = ttys ++ optional (!cfg.graphics) "ttyS0";
 
   # Wireless won't work in the VM.
-  networking.enableWLAN = mkOverride 50 {} false;
+  networking.enableWLAN = mkOverrideTemplate 50 {} false;
 }
diff --git a/tests/check-filesystems.nix b/tests/check-filesystems.nix
index ee62ac805fb..8fb0dfc1584 100644
--- a/tests/check-filesystems.nix
+++ b/tests/check-filesystems.nix
@@ -45,7 +45,7 @@ rec {
             autocreate = true;
             device = "share:/repos2";
           };
-        in pkgs.lib.mkOverride 50 {} [ 
+        in pkgs.lib.mkOverrideTemplate 50 {} [ 
           repos1
           repos1 # check remount 
           repos2 # check after remount
diff --git a/tests/installer.nix b/tests/installer.nix
index ed1bb2b9028..62684c48e5a 100644
--- a/tests/installer.nix
+++ b/tests/installer.nix
@@ -14,7 +14,7 @@ let
         [ ../modules/installer/cd-dvd/installation-cd-graphical.nix
           ../modules/testing/test-instrumentation.nix
           { key = "serial"; 
-            boot.loader.grub.timeout = mkOverride 0 {} 0;
+            boot.loader.grub.timeout = mkOverrideTemplate 0 {} 0;
             
             # The test cannot access the network, so any sources we
             # need must be included in the ISO.
diff --git a/tests/nfs.nix b/tests/nfs.nix
index f8d1cf951f3..db91179aca2 100644
--- a/tests/nfs.nix
+++ b/tests/nfs.nix
@@ -4,7 +4,7 @@ let
 
   client = 
     { config, pkgs, ... }:
-    { fileSystems = pkgs.lib.mkOverride 50 {} 
+    { fileSystems = pkgs.lib.mkOverrideTemplate 50 {} 
         [ { mountPoint = "/data";
             device = "server:/data";
             fsType = "nfs";
diff --git a/tests/quake3.nix b/tests/quake3.nix
index a31a14ea18e..6bc7b8f9119 100644
--- a/tests/quake3.nix
+++ b/tests/quake3.nix
@@ -7,7 +7,7 @@ rec {
 
     { require = [ ./common/x11.nix ];
       services.xserver.driSupport = true;
-      services.xserver.defaultDepth = pkgs.lib.mkOverride 0 {} 16;
+      services.xserver.defaultDepth = pkgs.lib.mkOverrideTemplate 0 {} 16;
       environment.systemPackages = [ pkgs.icewm pkgs.quake3demo ];
     };
 
diff --git a/tests/test-nixos-install-from-cd/configuration-iso.nix b/tests/test-nixos-install-from-cd/configuration-iso.nix
index e203734e74c..5e9637d33cf 100644
--- a/tests/test-nixos-install-from-cd/configuration-iso.nix
+++ b/tests/test-nixos-install-from-cd/configuration-iso.nix
@@ -5,7 +5,7 @@
 {pkgs, config, ...}:
 
 let
-  doOverride = pkgs.lib.mkOverride 0 {};
+  doOverride = pkgs.lib.mkOverrideTemplate 0 {};
 in
 
 {
diff --git a/tests/test-nixos-install-from-cd/module-insecure.nix b/tests/test-nixos-install-from-cd/module-insecure.nix
index 03bbc8e515a..493f55141d0 100644
--- a/tests/test-nixos-install-from-cd/module-insecure.nix
+++ b/tests/test-nixos-install-from-cd/module-insecure.nix
@@ -6,7 +6,7 @@
 {pkgs, config, ...}:
 
 let
-  doOverride = pkgs.lib.mkOverride 0 {};
+  doOverride = pkgs.lib.mkOverrideTemplate 0 {};
 in
 
 {
diff --git a/tests/trac.nix b/tests/trac.nix
index 837e1de5da8..a6a7756c5ae 100644
--- a/tests/trac.nix
+++ b/tests/trac.nix
@@ -31,7 +31,7 @@
     webserver = 
       {config, pkgs, ...}:
       {
-        fileSystems = pkgs.lib.mkOverride 50 {} 
+        fileSystems = pkgs.lib.mkOverrideTemplate 50 {} 
           [ { mountPoint = "/repos";
               device = "storage:/repos"; } 
           ];
-- 
GitLab


From 10a3bd6ffe9784c21ffc895d154013913aab6353 Mon Sep 17 00:00:00 2001
From: Sander van der Burg <s.vanderburg@tudelft.nl>
Date: Tue, 7 Sep 2010 13:28:17 +0000
Subject: [PATCH 2578/5331] Added virtualbox service, which fixes the RandR
 problem and also keeps the guest's clock in sync with the host

svn path=/nixos/trunk/; revision=23672
---
 modules/module-list.nix              |  1 +
 modules/services/misc/virtualbox.nix | 46 ++++++++++++++++++++++++++++
 2 files changed, 47 insertions(+)
 create mode 100644 modules/services/misc/virtualbox.nix

diff --git a/modules/module-list.nix b/modules/module-list.nix
index d5d0accf7da..5a1efdabf41 100644
--- a/modules/module-list.nix
+++ b/modules/module-list.nix
@@ -68,6 +68,7 @@
   ./services/misc/nixos-manual.nix
   ./services/misc/rogue.nix
   ./services/misc/synergy.nix
+  ./services/misc/virtualbox.nix
   ./services/monitoring/monit.nix
   ./services/monitoring/nagios/default.nix
   ./services/monitoring/systemhealth.nix
diff --git a/modules/services/misc/virtualbox.nix b/modules/services/misc/virtualbox.nix
new file mode 100644
index 00000000000..9f11004e771
--- /dev/null
+++ b/modules/services/misc/virtualbox.nix
@@ -0,0 +1,46 @@
+# VirtualBox server
+{ config, pkgs, ... }:
+
+with pkgs.lib;
+
+let
+
+  cfg = config.services.virtualbox;
+
+in
+
+{
+
+  ###### interface
+  
+  options = {
+  
+    services.virtualbox = {
+    
+      enable = mkOption {
+        default = false;
+        description = "Whether to enable the VirtualBox service and other guest additions.";
+      };        
+
+    };
+    
+  };
+  
+
+  ###### implementation
+
+  config = mkIf cfg.enable {
+
+    environment.systemPackages = [ ];
+    
+    jobs.virtualbox =
+      { description = "VirtualBox service";
+      
+        startOn = "started udev";
+
+        exec = "${pkgs.linuxPackages.virtualboxGuestAdditions}/sbin/VBoxService";
+      };
+
+  };
+
+}
-- 
GitLab


From 7fe1c5fe90a24780ca52c1315f76416a4bdbe2c2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Wed, 8 Sep 2010 16:52:15 +0000
Subject: [PATCH 2579/5331] Making eval-config not pass 'platform' as a nixpkgs
 parameter, but expect a nixpkgs config attribute.

svn path=/nixos/branches/stdenv-updates/; revision=23688
---
 lib/eval-config.nix      | 2 +-
 modules/misc/nixpkgs.nix | 7 -------
 2 files changed, 1 insertion(+), 8 deletions(-)

diff --git a/lib/eval-config.nix b/lib/eval-config.nix
index 8a7b225e850..e3bccb775aa 100644
--- a/lib/eval-config.nix
+++ b/lib/eval-config.nix
@@ -60,7 +60,7 @@ rec {
       in
       {
         inherit system;
-        inherit (nixpkgsOptions) config platform;
+        inherit (nixpkgsOptions) config;
       });
 
   # Optionally check wether all config values have corresponding
diff --git a/modules/misc/nixpkgs.nix b/modules/misc/nixpkgs.nix
index 8173d716d84..2fb61f686f0 100644
--- a/modules/misc/nixpkgs.nix
+++ b/modules/misc/nixpkgs.nix
@@ -13,12 +13,5 @@
       '';
     };
 
-    nixpkgs.platform = pkgs.lib.mkOption {
-      default = pkgs.platforms.pc;
-      description = ''
-        The platform for the Nix Packages collection.
-      '';
-    };
-
   };
 }
-- 
GitLab


From ccf7852e115fd4d5a7dd0255f2f18debc4dcd1ed Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Wed, 8 Sep 2010 16:53:36 +0000
Subject: [PATCH 2580/5331] Updating the system-tarball work, having just
 tested that of the fuloong2f.

svn path=/nixos/branches/stdenv-updates/; revision=23689
---
 lib/make-system-tarball.nix                   |   2 +-
 .../cd-dvd/system-tarball-fuloong2f.nix       | 152 ++++++++++++++++++
 .../installer/cd-dvd/system-tarball-pc.nix    |   6 +
 modules/installer/cd-dvd/system-tarball.nix   |  30 +---
 release.nix                                   |  12 +-
 5 files changed, 171 insertions(+), 31 deletions(-)
 create mode 100644 modules/installer/cd-dvd/system-tarball-fuloong2f.nix

diff --git a/lib/make-system-tarball.nix b/lib/make-system-tarball.nix
index 0fa34a186ad..301294e1964 100644
--- a/lib/make-system-tarball.nix
+++ b/lib/make-system-tarball.nix
@@ -1,7 +1,7 @@
 { stdenv, perl, xz, pathsFromGraph
 
 , # The file name of the resulting tarball
-  fileName ? "nixos-built.tar.bz2"
+  fileName ? "nixos-system-${stdenv.system}"
 
 , # The files and directories to be placed in the tarball.
   # This is a list of attribute sets {source, target} where `source'
diff --git a/modules/installer/cd-dvd/system-tarball-fuloong2f.nix b/modules/installer/cd-dvd/system-tarball-fuloong2f.nix
new file mode 100644
index 00000000000..8ef112cc476
--- /dev/null
+++ b/modules/installer/cd-dvd/system-tarball-fuloong2f.nix
@@ -0,0 +1,152 @@
+{ config, pkgs, ... }:
+
+with pkgs.lib;
+
+let
+
+  # A dummy /etc/nixos/configuration.nix in the booted CD that
+  # rebuilds the CD's configuration (and allows the configuration to
+  # be modified, of course, providing a true live CD).  Problem is
+  # that we don't really know how the CD was built - the Nix
+  # expression language doesn't allow us to query the expression being
+  # evaluated.  So we'll just hope for the best.
+  dummyConfiguration = pkgs.writeText "configuration.nix"
+    ''
+      {config, pkgs, ...}:
+
+      {
+        require = [ ];
+
+        # Add your own options below and run "nixos-rebuild switch".
+        # E.g.,
+        #   services.openssh.enable = true;
+      }
+    '';
+  
+
+  pkgs2storeContents = l : map (x: { object = x; symlink = "none"; }) l;
+
+  options = {
+
+    system.nixosVersion = mkOption {
+      default = "${builtins.readFile ../../../VERSION}";
+      description = ''
+        NixOS version number.
+      '';
+    };
+  };
+  
+in
+
+{
+  require =
+    [ options
+      ./system-tarball.nix
+      ../../hardware/network/rt73.nix
+    ];
+
+
+  # Disable some other stuff we don't need.
+  security.sudo.enable = false;
+
+  # Include only the en_US locale.  This saves 75 MiB or so compared to
+  # the full glibcLocales package.
+  i18n.supportedLocales = ["en_US.UTF-8/UTF-8" "en_US/ISO-8859-1"];
+
+  # Include some utilities that are useful for installing or repairing
+  # the system.
+  environment.systemPackages =
+    [ pkgs.subversion # for nixos-checkout
+      pkgs.w3m # needed for the manual anyway
+      pkgs.testdisk # useful for repairing boot problems
+      pkgs.mssys # for writing Microsoft boot sectors / MBRs
+      pkgs.parted
+      pkgs.ddrescue
+      pkgs.ccrypt
+      pkgs.cryptsetup # needed for dm-crypt volumes
+
+      # Some networking tools.
+      pkgs.sshfsFuse
+      pkgs.socat
+      pkgs.screen
+      pkgs.wpa_supplicant # !!! should use the wpa module
+
+      # Hardware-related tools.
+      pkgs.sdparm
+      pkgs.hdparm
+      pkgs.dmraid
+
+      # Tools to create / manipulate filesystems.
+      pkgs.ntfsprogs # for resizing NTFS partitions
+      pkgs.btrfsProgs
+      pkgs.jfsutils
+      pkgs.jfsrec
+
+      # Some compression/archiver tools.
+      pkgs.unrar
+      pkgs.unzip
+      pkgs.zip
+      pkgs.xz
+      pkgs.dar # disk archiver
+      
+      # Some editors.
+      pkgs.nvi
+      pkgs.bvi # binary editor
+      pkgs.joe
+    ];
+
+  # The initrd has to contain any module that might be necessary for
+  # mounting the CD/DVD.
+  boot.initrd.availableKernelModules =
+    [ "vfat" "reiserfs" ];
+
+  boot.kernelPackages = pkgs.linuxPackages_2_6_35;
+
+  boot.initrd.kernelModules =
+    [ # Wait for SCSI devices to appear.
+      "scsi_wait_scan"
+    ];
+
+  boot.postBootCommands =
+    ''
+      mkdir -p /mnt
+
+      cp ${dummyConfiguration} /etc/nixos/configuration.nix
+    '';
+
+  # Some more help text.
+  services.mingetty.helpLine =
+    ''
+        
+      Log in as "root" with an empty password.  ${
+        if config.services.xserver.enable then
+          "Type `start xserver' to start\nthe graphical user interface."
+        else ""
+      }
+    '';
+
+  # Include the firmware for various wireless cards.
+  networking.enableRT73Firmware = true;
+  networking.enableIntel2200BGFirmware = true;
+
+  # To speed up further installation of packages, include the complete stdenv
+  # in the Nix store of the tarball.
+  tarball.storeContents = pkgs2storeContents [ pkgs.stdenv ];
+
+  # Allow sshd to be started manually through "start sshd".  It should
+  # not be started by default on the installation CD because the
+  # default root password is empty.
+  services.openssh.enable = true;
+
+  jobs.openssh.startOn = pkgs.lib.mkOverride 50 {} "";
+
+  services.ttyBackgrounds.enable = false;
+
+  boot.loader.grub.enable = false;
+  boot.loader.generationsDir.enable = false;
+  system.boot.loader.kernelFile = "/vmlinux";
+
+  nixpkgs.config = {
+    platform = (import /etc/nixos/nixpkgs/pkgs/top-level/platforms.nix).fuloong2f_n32;
+  };
+}
diff --git a/modules/installer/cd-dvd/system-tarball-pc.nix b/modules/installer/cd-dvd/system-tarball-pc.nix
index 5a01dec5202..0c0069c6058 100644
--- a/modules/installer/cd-dvd/system-tarball-pc.nix
+++ b/modules/installer/cd-dvd/system-tarball-pc.nix
@@ -170,6 +170,12 @@ in
   # in the Nix store of the tarball.
   tarball.storeContents = pkgs2storeContents [ pkgs.stdenv pkgs.klibc pkgs.klibcShrunk ];
 
+  tarball.contents =
+    [ { source = config.boot.kernelPackages.kernel + "/vmlinuz";
+        target = "/boot/vmlinuz";
+      }
+    ];
+     
   # Allow sshd to be started manually through "start sshd".  It should
   # not be started by default on the installation CD because the
   # default root password is empty.
diff --git a/modules/installer/cd-dvd/system-tarball.nix b/modules/installer/cd-dvd/system-tarball.nix
index 70bb12eac00..e5902de05e9 100644
--- a/modules/installer/cd-dvd/system-tarball.nix
+++ b/modules/installer/cd-dvd/system-tarball.nix
@@ -31,14 +31,6 @@ let
 
   };
 
-  # A clue for the uboot loading
-  ubootKernelParams = pkgs.writeText "uboot-kernel-params.txt" ''
-    Kernel Parameters:
-      init=${config.system.build.bootStage2}
-      systemConfig=${config.system.build.toplevel}
-      ${toString config.boot.kernelParams}
-  '';
-
   versionFile = pkgs.writeText "nixos-version" config.system.nixosVersion;
 
 in
@@ -52,14 +44,12 @@ in
 
   # !!! Hack - attributes expected by other modules.
   system.build.menuBuilder = "true";
-  system.boot.loader.kernelFile = "bzImage";
-  environment.systemPackages = [ pkgs.grub2 ];
 
   # In stage 1 of the boot, mount the CD/DVD as the root FS by label
   # so that we don't need to know its device.
   fileSystems =
     [ { mountPoint = "/";
-        label = "rootfs";
+        device = "/dev/sda";
       }
     ];
 
@@ -83,23 +73,9 @@ in
   # Individual files to be included on the CD, outside of the Nix
   # store on the CD.
   tarball.contents =
-    [ { source = config.boot.kernelPackages.kernel + "/bzImage";
-        target = "/boot/bzImage";
-      }
-      { source = config.system.build.initialRamdisk + "/initrd";
+    [ { source = config.system.build.initialRamdisk + "/initrd";
         target = "/boot/initrd";
       }
-      { source = "${pkgs.grub2}/share/grub/unicode.pf2";
-        target = "/boot/grub/unicode.pf2";
-      }
-      { source = config.boot.loader.grub.splashImage;
-        target = "/boot/grub/splash.png";
-      }
-/*
-      { source = pkgs.ubootKernelParams;
-        target = "/uboot-kernelparams.txt";
-      }
-*/
       { source = versionFile;
         target = "/nixos-version.txt";
       }
@@ -116,7 +92,7 @@ in
     ''
       # After booting, register the contents of the Nix store on the
       # CD in the Nix database in the tmpfs.
-      ${config.environment.nix}/bin/nix-store --load-db < /nix/store/nix-path-registration
+      ${config.environment.nix}/bin/nix-store --load-db < /nix-path-registration
 
       # nixos-rebuild also requires a "system" profile and an
       # /etc/NIXOS tag.
diff --git a/release.nix b/release.nix
index d0ae398289f..dacbeab0cbe 100644
--- a/release.nix
+++ b/release.nix
@@ -49,9 +49,7 @@ let
     }:
 
     with import nixpkgs {inherit system;};
-
     let
-
       version = builtins.readFile ./VERSION + (if officialRelease then "" else "pre${toString nixosSrc.rev}");
 
       versionModule = { system.nixosVersion = version; };
@@ -60,7 +58,7 @@ let
         inherit system nixpkgs;
         modules = [ module versionModule ];
       }).config;
-      
+
       tarball = config.system.build.tarball;
     in
       tarball //
@@ -136,6 +134,14 @@ let
       module = ./modules/installer/cd-dvd/system-tarball-pc.nix;
     };
 
+    system_tarball_fuloong2f = makeSystemTarball {
+      module = ./modules/installer/cd-dvd/system-tarball-fuloong2f.nix;
+    } { system = "mips64-linux"; };
+
+    system_tarball_sheevaplug = makeSystemTarball {
+      module = ./modules/installer/cd-dvd/system-tarball-sheevaplug.nix;
+    } { system = "armv5tel-linux"; };
+
     # Hacky: doesn't depend on configuration. Yet configuration is evaluated (TODO)
     minimal_install_archive = {system ? "i686-linux"}: (iso_minimal {inherit system;})
       .config.system.build.minimalInstallArchive;
-- 
GitLab


From 9ba735714a6c5c445d145ca4d5df3fe698133e45 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Wed, 8 Sep 2010 17:15:31 +0000
Subject: [PATCH 2581/5331] Adding a system-tarball expression for the
 sheevaplug (which a previous commit already put a reference to)

svn path=/nixos/branches/stdenv-updates/; revision=23690
---
 .../cd-dvd/system-tarball-sheevaplug.nix      | 190 ++++++++++++++++++
 1 file changed, 190 insertions(+)
 create mode 100644 modules/installer/cd-dvd/system-tarball-sheevaplug.nix

diff --git a/modules/installer/cd-dvd/system-tarball-sheevaplug.nix b/modules/installer/cd-dvd/system-tarball-sheevaplug.nix
new file mode 100644
index 00000000000..b834ae3ab3d
--- /dev/null
+++ b/modules/installer/cd-dvd/system-tarball-sheevaplug.nix
@@ -0,0 +1,190 @@
+# This module contains the basic configuration for building a NixOS
+# installation CD.
+
+{ config, pkgs, ... }:
+
+with pkgs.lib;
+
+let
+
+  # A dummy /etc/nixos/configuration.nix in the booted CD that
+  # rebuilds the CD's configuration (and allows the configuration to
+  # be modified, of course, providing a true live CD).  Problem is
+  # that we don't really know how the CD was built - the Nix
+  # expression language doesn't allow us to query the expression being
+  # evaluated.  So we'll just hope for the best.
+  dummyConfiguration = pkgs.writeText "configuration.nix"
+    ''
+      {config, pkgs, ...}:
+
+      {
+        require = [ ];
+
+        # Add your own options below and run "nixos-rebuild switch".
+        # E.g.,
+        #   services.sshd.enable = true;
+      }
+    '';
+  
+
+  pkgs2storeContents = l : map (x: { object = x; symlink = "none"; }) l;
+
+  options = {
+
+    system.nixosVersion = mkOption {
+      default = "${builtins.readFile ../../../VERSION}";
+      description = ''
+        NixOS version number.
+      '';
+    };
+  };
+
+  # A clue for the uboot loading
+  kernelParams = pkgs.writeText "kernel-params.txt" ''
+    Kernel Parameters:
+      init=${config.system.build.bootStage2}
+      systemConfig=${config.system.build.toplevel}
+      ${toString config.boot.kernelParams}
+  '';
+
+  
+in
+
+{
+  require =
+    [ options
+      ./system-tarball.nix
+      ../../hardware/network/rt73.nix
+    ];
+
+  # Disable some other stuff we don't need.
+  security.sudo.enable = false;
+
+  # Include only the en_US locale.  This saves 75 MiB or so compared to
+  # the full glibcLocales package.
+  i18n.supportedLocales = ["en_US.UTF-8/UTF-8" "en_US/ISO-8859-1"];
+
+  # Include some utilities that are useful for installing or repairing
+  # the system.
+  environment.systemPackages =
+    [ pkgs.subversion # for nixos-checkout
+      pkgs.w3m # needed for the manual anyway
+      pkgs.ddrescue
+      pkgs.ccrypt
+      pkgs.cryptsetup # needed for dm-crypt volumes
+
+      # Some networking tools.
+      pkgs.sshfsFuse
+      pkgs.socat
+      pkgs.screen
+      pkgs.wpa_supplicant # !!! should use the wpa module
+
+      # Hardware-related tools.
+      pkgs.sdparm
+      pkgs.hdparm
+      pkgs.dmraid
+
+      # Tools to create / manipulate filesystems.
+      pkgs.btrfsProgs
+
+      # Some compression/archiver tools.
+      pkgs.unrar
+      pkgs.unzip
+      pkgs.zip
+      pkgs.xz
+      pkgs.dar # disk archiver
+      
+      # Some editors.
+      pkgs.nvi
+      pkgs.bvi # binary editor
+      pkgs.joe
+    ];
+
+  boot.loader.grub.enable = false;
+  boot.loader.generationsDir.enable = false;
+  system.boot.loader.kernelFile = "/uImage";
+
+  boot.initrd.availableKernelModules =
+    [ "mvsdio" "mmc_block" "reiserfs" "ext3" "ums-cypress" "rtc_mv"
+      "ext4" ];
+
+  boot.initrd.kernelModules =
+    [
+      "scsi_wait_scan"
+    ];
+
+  boot.postBootCommands =
+    ''
+      mkdir -p /mnt
+
+      cp ${dummyConfiguration} /etc/nixos/configuration.nix
+    '';
+
+  boot.initrd.extraUtilsCommands =
+    ''
+      cp ${pkgs.utillinux}/sbin/hwclock $out/bin
+    '';
+
+  boot.initrd.postDeviceCommands =
+    ''
+      hwclock -s
+    '';
+
+  boot.kernelParams =
+    [
+      "selinux=0"
+      "console=tty1"
+    ];
+
+  boot.kernelPackages = pkgs.linuxPackages_2_6_35;
+
+  services.mingetty = {
+    ttys = [ "ttyS0" ];
+
+    # Some more help text.
+    helpLine = ''
+      Log in as "root" with an empty password.  ${
+        if config.services.xserver.enable then
+          "Type `start xserver' to start\nthe graphical user interface."
+        else ""
+      }
+    '';
+  };
+
+  # Setting vesa, we don't get the nvidia driver, which can't work in arm.
+  services.xserver.videoDriver = "vesa";
+  services.xserver.videoDrivers = [];
+  services.nixosManual.enable = false;
+
+  # Include the firmware for various wireless cards.
+  networking.enableRT73Firmware = true;
+  networking.enableIntel2200BGFirmware = true;
+
+  # To speed up further installation of packages, include the complete stdenv
+  # in the Nix store of the tarball.
+  tarball.storeContents = pkgs2storeContents [ pkgs.stdenv ];
+  tarball.contents = [
+    { source = kernelParams;
+      target = "/kernelparams.txt";
+    }
+    { source = config.boot.kernelPackages.kernel + config.system.boot.loader.kernelFile;
+      target = "/boot/uImage";
+    }
+    { source = pkgs.ubootSheevaplug;
+      target = "/boot/uboot";
+    }
+  ];
+
+  # Allow sshd to be started manually through "start sshd".  It should
+  # not be started by default on the installation CD because the
+  # default root password is empty.
+  services.openssh.enable = true;
+  services.ttyBackgrounds.enable = false;
+  jobs.openssh.startOn = pkgs.lib.mkOverride 50 {} "";
+
+  nixpkgs.config = {
+    packageOverrides = pkgs : rec {
+    };
+    platform = (import /etc/nixos/nixpkgs/pkgs/top-level/platforms.nix).sheevaplug;
+  };
+}
-- 
GitLab


From 7b635ee4ed643acba338c38948e1261f6c4831a5 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 10 Sep 2010 12:25:59 +0000
Subject: [PATCH 2582/5331] * "ls -d" -> "echo", since "ls" prints the current
 directory if   nothing matches.

svn path=/nixos/trunk/; revision=23716
---
 modules/installer/grub/grub-menu-builder.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/installer/grub/grub-menu-builder.sh b/modules/installer/grub/grub-menu-builder.sh
index fc246847eed..1b6c6ce5f5d 100644
--- a/modules/installer/grub/grub-menu-builder.sh
+++ b/modules/installer/grub/grub-menu-builder.sh
@@ -243,7 +243,7 @@ for link in $((ls -d $defaultConfig/fine-tune/* ) | sort -n); do
 done
 
 for generation in $(
-    (cd /nix/var/nix/profiles && ls -d system-*-link) \
+    (cd /nix/var/nix/profiles && echo system-*-link) \
     | sed 's/system-\([0-9]\+\)-link/\1/' \
     | sort -n -r); do
     link=/nix/var/nix/profiles/system-$generation-link
-- 
GitLab


From 6258845b618dfca28cf0a04910cf124742abde59 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 10 Sep 2010 15:25:58 +0000
Subject: [PATCH 2583/5331] svn path=/nixos/trunk/; revision=23727

---
 modules/system/boot/stage-1.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/modules/system/boot/stage-1.nix b/modules/system/boot/stage-1.nix
index 7f8287e7e4b..7a38883af57 100644
--- a/modules/system/boot/stage-1.nix
+++ b/modules/system/boot/stage-1.nix
@@ -199,7 +199,6 @@ let
       $out/bin/umount --version | grep "umount "
       $out/bin/e2fsck -V 2>&1 | grep "e2fsck "
       $out/bin/tune2fs 2> /dev/null | grep "tune2fs "
-      $out/bin/fsck -N | grep "fsck from"
       $out/bin/udevadm --version
       $out/bin/blkid -v 2>&1 | tee -a $out/log | grep "blkid from util-linux-ng"
       $out/bin/dmsetup --version 2>&1 | tee -a $out/log | grep "version:"
-- 
GitLab


From 8f4139987eb2122f661f905c1d9f02c1ca916a02 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 10 Sep 2010 15:47:06 +0000
Subject: [PATCH 2584/5331] * Regex listing the system generations was
 selecting the number from   only the first generation in the list.  (From
 Karn Kallio.)

svn path=/nixos/trunk/; revision=23728
---
 modules/installer/grub/grub-menu-builder.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/installer/grub/grub-menu-builder.sh b/modules/installer/grub/grub-menu-builder.sh
index 1b6c6ce5f5d..27ad6860403 100644
--- a/modules/installer/grub/grub-menu-builder.sh
+++ b/modules/installer/grub/grub-menu-builder.sh
@@ -244,7 +244,7 @@ done
 
 for generation in $(
     (cd /nix/var/nix/profiles && echo system-*-link) \
-    | sed 's/system-\([0-9]\+\)-link/\1/' \
+    | sed 's/system-\([0-9]\+\)-link/\1/g' \
     | sort -n -r); do
     link=/nix/var/nix/profiles/system-$generation-link
     date=$(stat --printf="%y\n" $link | sed 's/\..*//')
-- 
GitLab


From 4ae4b7d47f5e7e67d31535b27da3cf2cee0d17b1 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 10 Sep 2010 17:15:35 +0000
Subject: [PATCH 2585/5331] * Support booting Xen in the Grub menu builder.

svn path=/nixos/trunk/; revision=23730
---
 modules/installer/grub/grub-menu-builder.sh | 21 ++++++++++++++-------
 1 file changed, 14 insertions(+), 7 deletions(-)

diff --git a/modules/installer/grub/grub-menu-builder.sh b/modules/installer/grub/grub-menu-builder.sh
index 27ad6860403..0605df5f52c 100644
--- a/modules/installer/grub/grub-menu-builder.sh
+++ b/modules/installer/grub/grub-menu-builder.sh
@@ -52,8 +52,8 @@ default @default@
 timeout @timeout@
 GRUBEND
 	    if test -n "@splashImage@"; then
-		echo "splashimage $bootRoot/background.xpm.gz" >> "$1"
-	    fi
+                echo "splashimage $bootRoot/background.xpm.gz" >> "$1"
+            fi
 	    ;;
 	2)
             cp -f @grub@/share/grub/unicode.pf2 /boot/grub/unicode.pf2
@@ -154,6 +154,7 @@ addEntry() {
 
     local kernel=$(readlink -f $path/kernel)
     local initrd=$(readlink -f $path/initrd)
+    local xen=$([ -f $path/xen.gz ] && readlink -f $path/xen.gz)
 
     if test "$path" = "$defaultConfig"; then
 	cp "$kernel" /boot/nixos-kernel
@@ -181,28 +182,34 @@ EOF
     if test -n "$copyKernels"; then
         copyToKernelsDir $kernel; kernel=$result
         copyToKernelsDir $initrd; initrd=$result
+        if [ -n "$xen" ]; then copyToKernelsDir $xen; xen=$result; fi
     fi
-    
+
     local confName=$(cat $path/configuration-name 2>/dev/null || true)
     if test -n "$confName"; then
 	name="$confName $3"
     fi
 
+    local kernelArgs="systemConfig=$(readlink -f $path) init=$(readlink -f $path/init) $(cat $path/kernel-params)"
+    local xenArgs="loglvl=all guest_loglvl=all"
+
     case "$grubVersion" in
 	1)
 	    cat >> "$tmp" << GRUBEND
 title $name
   @extraPerEntryConfig@
-  kernel $kernel systemConfig=$(readlink -f $path) init=$(readlink -f $path/init) $(cat $path/kernel-params)
-  initrd $initrd
+  ${xen:+kernel $xen $xenArgs}
+  $(if [ -z "$xen" ]; then echo kernel; else echo module; fi) $kernel $kernelArgs
+  module $initrd
 GRUBEND
 	    ;;
 	2)
 	    cat >> "$tmp" << GRUBEND
 menuentry "$name" {
   @extraPerEntryConfig@
-  linux  $kernel systemConfig=$(readlink -f $path) init=$(readlink -f $path/init) $(cat $path/kernel-params)
-  initrd $initrd
+  ${xen:+multiboot $xen $xenArgs}
+  $(if [ -z "$xen" ]; then echo linux; else echo module; fi) $kernel $kernelArgs
+  $(if [ -z "$xen" ]; then echo initrd; else echo module; fi) $initrd
 }
 GRUBEND
 	    ;;
-- 
GitLab


From 8edefa2960a48c0e97845b602f95c6366d34010b Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 10 Sep 2010 17:35:13 +0000
Subject: [PATCH 2586/5331] * Grrr.  Fix the sort order.

svn path=/nixos/trunk/; revision=23732
---
 modules/installer/grub/grub-menu-builder.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/installer/grub/grub-menu-builder.sh b/modules/installer/grub/grub-menu-builder.sh
index 0605df5f52c..4caafe9da63 100644
--- a/modules/installer/grub/grub-menu-builder.sh
+++ b/modules/installer/grub/grub-menu-builder.sh
@@ -250,8 +250,8 @@ for link in $((ls -d $defaultConfig/fine-tune/* ) | sort -n); do
 done
 
 for generation in $(
-    (cd /nix/var/nix/profiles && echo system-*-link) \
-    | sed 's/system-\([0-9]\+\)-link/\1/g' \
+    (cd /nix/var/nix/profiles && for i in system-*-link; do echo $i; done) \
+    | sed 's/system-\([0-9]\+\)-link/\1/' \
     | sort -n -r); do
     link=/nix/var/nix/profiles/system-$generation-link
     date=$(stat --printf="%y\n" $link | sed 's/\..*//')
-- 
GitLab


From 9f06fb806c3c8a49af84a796f2d1dc38038d4258 Mon Sep 17 00:00:00 2001
From: Evgeny Egorochkin <phreedom.stdin@gmail.com>
Date: Sat, 11 Sep 2010 11:43:09 +0000
Subject: [PATCH 2587/5331] Fix TOR option descriptions: kbytes-> bytes

svn path=/nixos/trunk/; revision=23735
---
 modules/services/security/tor.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/services/security/tor.nix b/modules/services/security/tor.nix
index d3fceae3608..35201775ec7 100644
--- a/modules/services/security/tor.nix
+++ b/modules/services/security/tor.nix
@@ -155,7 +155,7 @@ in
         example = 100;
         description = ''
           Specify this to limit the bandwidth usage of relayed (server)
-          traffic. Your own traffic is still unthrottled. Units: kilobytes/second.
+          traffic. Your own traffic is still unthrottled. Units: bytes/second.
         '';
       };
 
@@ -165,7 +165,7 @@ in
         description = ''
           Specify this to allow bursts of the bandwidth usage of relayed (server)
           traffic. The average usage will still be as specified in relayBandwidthRate.
-          Your own traffic is still unthrottled. Units: kilobytes/second.
+          Your own traffic is still unthrottled. Units: bytes/second.
         '';
       };
 
-- 
GitLab


From 987dd768113dc1dc727e3fb8c82818759b27cfdf Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sun, 12 Sep 2010 22:43:45 +0000
Subject: [PATCH 2588/5331] * Added a module to enable the Xen hypervisor.

svn path=/nixos/trunk/; revision=23739
---
 modules/installer/grub/grub-menu-builder.sh | 12 ++--
 modules/module-list.nix                     |  1 +
 modules/system/activation/top-level.nix     | 27 +++-----
 modules/virtualisation/xen.nix              | 76 +++++++++++++++++++++
 4 files changed, 92 insertions(+), 24 deletions(-)
 create mode 100644 modules/virtualisation/xen.nix

diff --git a/modules/installer/grub/grub-menu-builder.sh b/modules/installer/grub/grub-menu-builder.sh
index 4caafe9da63..8934c9bd24d 100644
--- a/modules/installer/grub/grub-menu-builder.sh
+++ b/modules/installer/grub/grub-menu-builder.sh
@@ -190,16 +190,16 @@ EOF
 	name="$confName $3"
     fi
 
-    local kernelArgs="systemConfig=$(readlink -f $path) init=$(readlink -f $path/init) $(cat $path/kernel-params)"
-    local xenArgs="loglvl=all guest_loglvl=all"
+    local kernelParams="systemConfig=$(readlink -f $path) init=$(readlink -f $path/init) $(cat $path/kernel-params)"
+    local xenParams="$([ -n "$xen" ] && cat $path/xen-params)"
 
     case "$grubVersion" in
 	1)
 	    cat >> "$tmp" << GRUBEND
 title $name
   @extraPerEntryConfig@
-  ${xen:+kernel $xen $xenArgs}
-  $(if [ -z "$xen" ]; then echo kernel; else echo module; fi) $kernel $kernelArgs
+  ${xen:+kernel $xen $xenParams}
+  $(if [ -z "$xen" ]; then echo kernel; else echo module; fi) $kernel $kernelParams
   module $initrd
 GRUBEND
 	    ;;
@@ -207,8 +207,8 @@ GRUBEND
 	    cat >> "$tmp" << GRUBEND
 menuentry "$name" {
   @extraPerEntryConfig@
-  ${xen:+multiboot $xen $xenArgs}
-  $(if [ -z "$xen" ]; then echo linux; else echo module; fi) $kernel $kernelArgs
+  ${xen:+multiboot $xen $xenParams}
+  $(if [ -z "$xen" ]; then echo linux; else echo module; fi) $kernel $kernelParams
   $(if [ -z "$xen" ]; then echo initrd; else echo module; fi) $initrd
 }
 GRUBEND
diff --git a/modules/module-list.nix b/modules/module-list.nix
index 5a1efdabf41..973c3a3e493 100644
--- a/modules/module-list.nix
+++ b/modules/module-list.nix
@@ -154,4 +154,5 @@
   ./tasks/network-interfaces.nix
   ./tasks/swraid.nix
   ./tasks/tty-backgrounds.nix
+  ./virtualisation/xen.nix
 ]
diff --git a/modules/system/activation/top-level.nix b/modules/system/activation/top-level.nix
index cb3c4e8941d..f2bbbc5ffb0 100644
--- a/modules/system/activation/top-level.nix
+++ b/modules/system/activation/top-level.nix
@@ -43,30 +43,19 @@ let
     system.copySystemConfiguration = pkgs.lib.mkOption {
       default = false;
       description = ''
-        Unless set to false copies the nixos configuration file
-        <literal>$NIXOS_CONFIG</literal> defaulting to
-        <filename>/etc/nixos/configuration.nix</filename>
+        If enabled, copies the NixOS configuration file
+        <literal>$NIXOS_CONFIG</literal> (usually
+        <filename>/etc/nixos/configuration.nix</filename>)
         to the system store path.
-        See <option>extraSystemBuilderCmds</option>
-        if you want to do add more customized info
-        to your system storepath.
       '';
     };
 
     system.extraSystemBuilderCmds = pkgs.lib.mkOption {
       default = "";
+      internal = true;
       merge = pkgs.lib.concatStringsSep "\n";
       description = ''
         This code will be added to the builder creating the system store path.
-        This use case copies your configuration file into the system derivation:
-        <command>
-        cp ${pkgs.lib.maybeEnv "NIXOS_CONFIG" "/etc/nixos/configuration.nix"} $out
-        </command>
-        Of course you could add code saving a svn diff or svn revision number
-        of both nixos and nixpkgs repositories as well. Keep in mind that when
-        you build in chroots that you have do either copy sources to store or
-        add them to the chroot somehow.
-        You still should consider putting your configuration into a VCS.
       '';
     };
     
@@ -107,6 +96,7 @@ let
         echo "(Expecting ${kernelPath})"
         false
       fi
+
       ln -s ${kernelPath} $out/kernel
       ln -s ${config.system.modulesTree} $out/kernel-modules
       if [ -n "$grub" ]; then 
@@ -181,8 +171,9 @@ in {
   require = [options];
 
   system.extraSystemBuilderCmds =
-      pkgs.lib.optionalString
-          config.system.copySystemConfiguration
-          "cp ${pkgs.lib.maybeEnv "NIXOS_CONFIG" "/etc/nixos/configuration.nix"} $out";
+    pkgs.lib.optionalString
+      config.system.copySystemConfiguration
+      "cp ${pkgs.lib.maybeEnv "NIXOS_CONFIG" "/etc/nixos/configuration.nix"} $out";
+
   system.build.toplevel = system;
 }
diff --git a/modules/virtualisation/xen.nix b/modules/virtualisation/xen.nix
new file mode 100644
index 00000000000..5e8bb902b2a
--- /dev/null
+++ b/modules/virtualisation/xen.nix
@@ -0,0 +1,76 @@
+# Xen hypervisor support.
+
+{ config, pkgs, ... }:
+
+with pkgs.lib;
+
+let cfg = config.virtualisation.xen; in
+
+{
+  ###### interface
+
+  options = {
+
+    virtualisation.xen.enable = 
+      mkOption {
+        default = false;
+        description =
+          ''
+            Setting this option enables the Xen hypervisor, a
+            virtualisation technology that allows multiple virtual
+            machines, known as <emphasis>domains</emphasis>, to run
+            concurrently on the physical machine.  NixOS runs as the
+            privileged <emphasis>Domain 0</emphasis>.  This option
+            requires a reboot to take effect.
+          '';
+      };
+
+    virtualisation.xen.bootParams = 
+      mkOption {
+        default = "";
+        description =
+          ''
+            Parameters passed to the Xen hypervisor at boot time.
+          '';
+      };
+
+    virtualisation.xen.domain0MemorySize = 
+      mkOption {
+        default = 0;
+        example = 512;
+        description =
+          ''
+            Amount of memory (in MiB) allocated to Domain 0 on boot.
+            If set to 0, all memory is assigned to Domain 0.
+          '';
+      };
+
+  };
+
+
+  ###### implementation
+
+  config = mkIf cfg.enable {
+
+    environment.systemPackages = [ pkgs.xen ];
+
+    # Domain 0 requires a pvops-enabled kernel.
+    boot.kernelPackages = pkgs.linuxPackages_2_6_32_xen;
+
+    # The radeonfb kernel module causes the screen to go black as soon
+    # as it's loaded, so don't load it.
+    boot.blacklistedKernelModules = [ "radeonfb" ];
+
+    virtualisation.xen.bootParams = 
+      [ "loglvl=all" "guest_loglvl=all" ] ++
+      optional (cfg.domain0MemorySize != 0) "dom0_mem=${toString cfg.domain0MemorySize}M";
+
+    system.extraSystemBuilderCmds =
+      ''
+        ln -s ${pkgs.xen}/boot/xen.gz $out/xen.gz
+        echo "${toString cfg.bootParams}" > $out/xen-params
+      '';
+
+  };
+
+}
-- 
GitLab


From 6b2844c6b241b6f64746c4c42ace7910d247baed Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sun, 12 Sep 2010 22:56:54 +0000
Subject: [PATCH 2589/5331] * Mount /proc/xen.

svn path=/nixos/trunk/; revision=23741
---
 modules/virtualisation/xen.nix | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/modules/virtualisation/xen.nix b/modules/virtualisation/xen.nix
index 5e8bb902b2a..b2218fb3fdd 100644
--- a/modules/virtualisation/xen.nix
+++ b/modules/virtualisation/xen.nix
@@ -71,6 +71,15 @@ let cfg = config.virtualisation.xen; in
         echo "${toString cfg.bootParams}" > $out/xen-params
       '';
 
+    # Mount the /proc/xen pseudo-filesystem.
+    system.activationScripts.xen = noDepEntry
+      ''
+        if [ -d /proc/xen ]; then
+            ${pkgs.sysvtools}/bin/mountpoint -q /proc/xen || \
+                ${pkgs.utillinux}/bin/mount -t xenfs none /proc/xen
+        fi
+      '';
+
   };
 
 }
-- 
GitLab


From e871e841598a503c2bf0049f66b3e72bed2b272f Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 13 Sep 2010 11:33:05 +0000
Subject: [PATCH 2590/5331] * mkOverrideTemplate -> mkOverride.

svn path=/nixos/trunk/; revision=23743
---
 modules/virtualisation/qemu-vm.nix | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/modules/virtualisation/qemu-vm.nix b/modules/virtualisation/qemu-vm.nix
index cf527391e2c..fb4779c63a1 100644
--- a/modules/virtualisation/qemu-vm.nix
+++ b/modules/virtualisation/qemu-vm.nix
@@ -232,12 +232,12 @@ in
   virtualisation.pathsInNixDB = [ config.system.build.toplevel ];
   
   # Mount the host filesystem via CIFS, and bind-mount the Nix store
-  # of the host into our own filesystem.  We use mkOverrideTemplate to allow
+  # of the host into our own filesystem.  We use mkOverride to allow
   # this module to be applied to "normal" NixOS system configuration,
   # where the regular value for the `fileSystems' attribute should be
   # disregarded for the purpose of building a VM test image (since
   # those filesystems don't exist in the VM).
-  fileSystems = mkOverrideTemplate 50 {}
+  fileSystems = mkOverride 50
     [ { mountPoint = "/";
         device = "/dev/vda";
       }
@@ -259,7 +259,7 @@ in
   # host filesystem and thus deadlocks the system.
   networking.useDHCP = false;
 
-  networking.defaultGateway = mkOverrideTemplate 200 {} "10.0.2.2";
+  networking.defaultGateway = mkOverride 200 "10.0.2.2";
 
   networking.nameservers = [ "10.0.2.3" ];
 
@@ -287,9 +287,9 @@ in
 
   # When building a regular system configuration, override whatever
   # video driver the host uses.
-  services.xserver.videoDriver = mkOverrideTemplate 50 {} null;
-  services.xserver.videoDrivers = mkOverrideTemplate 50 {} [ "cirrus" "vesa" ];
-  services.xserver.defaultDepth = mkOverrideTemplate 50 {} 0;
+  services.xserver.videoDriver = mkOverride 50 null;
+  services.xserver.videoDrivers = mkOverride 50 [ "cirrus" "vesa" ];
+  services.xserver.defaultDepth = mkOverride 50 0;
   services.xserver.monitorSection =
     ''
       # Set a higher refresh rate so that resolutions > 800x600 work.
@@ -300,5 +300,5 @@ in
   services.mingetty.ttys = ttys ++ optional (!cfg.graphics) "ttyS0";
 
   # Wireless won't work in the VM.
-  networking.enableWLAN = mkOverrideTemplate 50 {} false;
+  networking.enableWLAN = mkOverride 50 false;
 }
-- 
GitLab


From b756a1ee81071017a90cac1535166f467dff96ee Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 13 Sep 2010 11:46:35 +0000
Subject: [PATCH 2591/5331] * Added an option to disable fsck on particular
 filesystems.

svn path=/nixos/trunk/; revision=23744
---
 modules/tasks/filesystems.nix | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/modules/tasks/filesystems.nix b/modules/tasks/filesystems.nix
index 5735d943c51..699e9b3c33c 100644
--- a/modules/tasks/filesystems.nix
+++ b/modules/tasks/filesystems.nix
@@ -94,9 +94,7 @@ in
           example = "data=journal";
           type = types.string;
           merge = pkgs.lib.concatStringsSep ",";
-          description = "
-            Option used to mount the file system.
-          ";
+          description = "Options used to mount the file system.";
         };
 
         autocreate = mkOption {
@@ -107,6 +105,12 @@ in
             <option>fileSystems.*.mountPoint</option>.
           ";
         };
+
+        noCheck = mkOption {
+          default = false;
+          type = types.bool;
+          description = "Disable running fsck on this filesystem.";
+        };
       };
     };
   
@@ -142,7 +146,8 @@ in
                 + " " + fs.fsType
                 + " " + fs.options
                 + " 0"
-                + " " + (if fs.fsType == "none" then "0" else if fs.mountPoint == "/" then "1" else "2")
+                + " " + (if fs.fsType == "none" || fs.noCheck then "0" else
+                         if fs.mountPoint == "/" then "1" else "2")
                 + "\n"
             )}
 
-- 
GitLab


From c1295661c4bc68d9120c834e2a456e8125e9fe18 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 13 Sep 2010 12:34:58 +0000
Subject: [PATCH 2592/5331] * Added a command `nixos-rebuild
 build-vm-with-bootloader'.  This is   like `build-vm', but boots using the
 regular boot loader (i.e. GRUB   1 or 2) rather than booting directly from
 the kernel/initrd.  Thus   it allows testing of GRUB.

svn path=/nixos/trunk/; revision=23747
---
 default.nix                                   | 15 ++-
 doc/manual/man-nixos-rebuild.xml              | 31 +++++++
 modules/installer/tools/nixos-rebuild.sh      |  9 +-
 .../activation/switch-to-configuration.sh     |  2 +-
 modules/virtualisation/qemu-vm.nix            | 92 +++++++++++++++++--
 5 files changed, 137 insertions(+), 12 deletions(-)

diff --git a/default.nix b/default.nix
index e63a76cd03f..6b929537ee4 100644
--- a/default.nix
+++ b/default.nix
@@ -11,11 +11,22 @@ let
 
   inherit (eval) config pkgs;
 
+  # This is for `nixos-rebuild build-vm'.
   vmConfig = (import ./lib/eval-config.nix {
     inherit system;
     modules = [ configuration ./modules/virtualisation/qemu-vm.nix ];
   }).config;
-    
+
+  # This is for `nixos-rebuild build-vm-with-bootloader'.
+  vmWithBootLoaderConfig = (import ./lib/eval-config.nix {
+    inherit system;
+    modules =
+      [ configuration
+        ./modules/virtualisation/qemu-vm.nix
+        { virtualisation.useBootLoader = true; }
+      ];
+  }).config;
+      
 in
 
 {
@@ -25,6 +36,8 @@ in
 
   vm = vmConfig.system.build.vm;
 
+  vmWithBootLoader = vmWithBootLoaderConfig.system.build.vm;
+
   # The following are used by nixos-rebuild.
   nixFallback = pkgs.nixUnstable;
   manifests = config.installer.manifests;
diff --git a/doc/manual/man-nixos-rebuild.xml b/doc/manual/man-nixos-rebuild.xml
index 0bdc925efd9..6f888172d48 100644
--- a/doc/manual/man-nixos-rebuild.xml
+++ b/doc/manual/man-nixos-rebuild.xml
@@ -24,6 +24,8 @@
       <arg choice='plain'><option>build</option></arg>
       <arg choice='plain'><option>dry-run</option></arg>
       <arg choice='plain'><option>build-vm</option></arg>
+      <arg choice='plain'><option>build-vm-with-bootloader</option></arg>
+      <arg choice='plain'><option>pull</option></arg>
     </group>
     <sbr />
     <arg><option>--install-grub</option></arg>
@@ -151,6 +153,35 @@ $ ./result/bin/run-*-vm
     </listitem>
   </varlistentry>
 
+  <varlistentry>
+    <term><option>build-vm-with-bootloader</option></term>
+    <listitem>
+      <para>Like <option>build-vm</option>, but boots using the
+      regular boot loader of your configuration (e.g., GRUB 1 or 2),
+      rather than booting directly into the kernel and initial ramdisk
+      of the system.  This allows you to test whether the boot loader
+      works correctly.  However, it does not guarantee that your NixOS
+      configuration will boot successfully on the host hardware (i.e.,
+      after running <command>nixos-rebuild switch</command>), because
+      the hardware and boot loader configuration in the VM are
+      different.  The boot loader is installed on an automatically
+      generated virtual disk containing a <filename>/boot</filename>
+      partition, which is mounted read-only in the VM.</para>
+    </listitem>
+  </varlistentry>
+  
+  <varlistentry>
+    <term><option>pull</option></term>
+    <listitem>
+      <para>This operation merely fetches the latest manifest in the
+      Nixpkgs channel to speed up subsequent
+      <command>nix-env</command> operations.  This is useful if you
+      are not using <command>nix-channel</command> but still want to
+      use pre-built binary packages.  It doesn’t reconfigure the
+      system at all.</para>
+    </listitem>
+  </varlistentry>
+
 </variablelist>
 
 </para>
diff --git a/modules/installer/tools/nixos-rebuild.sh b/modules/installer/tools/nixos-rebuild.sh
index 4d01ff53f89..41b74494337 100644
--- a/modules/installer/tools/nixos-rebuild.sh
+++ b/modules/installer/tools/nixos-rebuild.sh
@@ -22,6 +22,8 @@ The operation is one of the following:
             activate it
   build-vm: build a virtual machine containing the configuration
             (useful for testing)
+  build-vm-with-bootloader:
+            like build-vm, but include a boot loader in the VM
   dry-run:  just show what store paths would be built/downloaded
   pull:     just pull the Nixpkgs channel manifest and exit
 
@@ -64,7 +66,7 @@ while test "$#" -gt 0; do
       --help)
         showSyntax
       ;;
-      switch|boot|test|build|dry-run|build-vm|pull)
+      switch|boot|test|build|dry-run|build-vm|build-vm-with-bootloader|pull)
         action="$i"
       ;;
       --install-grub)
@@ -171,9 +173,12 @@ if test -z "$rollback"; then
     elif test "$action" = test -o "$action" = build -o "$action" = dry-run; then
         nix-build $NIXOS -A system -K -k $extraBuildFlags > /dev/null
         pathToConfig=./result
-    elif test "$action" = build-vm; then
+    elif [ "$action" = build-vm ]; then
         nix-build $NIXOS -A vm -K -k $extraBuildFlags > /dev/null
         pathToConfig=./result
+    elif [ "$action" = build-vm-with-bootloader ]; then
+        nix-build $NIXOS -A vmWithBootLoader -K -k $extraBuildFlags > /dev/null
+        pathToConfig=./result
     else
         showSyntax
     fi
diff --git a/modules/system/activation/switch-to-configuration.sh b/modules/system/activation/switch-to-configuration.sh
index 6aec8225fdf..ffc9845622c 100644
--- a/modules/system/activation/switch-to-configuration.sh
+++ b/modules/system/activation/switch-to-configuration.sh
@@ -38,7 +38,7 @@ if [ "$action" = "switch" -o "$action" = "boot" ]; then
 
               if [ "$NIXOS_INSTALL_GRUB" = 1 -o "$oldGrubVersion" != "$newGrubVersion" ]; then
                   echo "installing the GRUB bootloader..."
-                  @grub@/sbin/grub-install "@grubDevice@" --no-floppy --recheck
+                  @grub@/sbin/grub-install "@grubDevice@" --no-floppy
                   echo "$newGrubVersion" > /boot/grub/version
               fi
           fi
diff --git a/modules/virtualisation/qemu-vm.nix b/modules/virtualisation/qemu-vm.nix
index fb4779c63a1..bc36b32a778 100644
--- a/modules/virtualisation/qemu-vm.nix
+++ b/modules/virtualisation/qemu-vm.nix
@@ -110,7 +110,24 @@ let
         example = "-vga std";
         description = "Options passed to QEMU.";
       };
-      
+
+    virtualisation.useBootLoader =
+      mkOption {
+        default = true;
+        description =
+          ''
+            If enabled, the virtual machine will be booted using the
+            regular boot loader (i.e., GRUB 1 or 2).  This allows
+            testing of the boot loader.  However, it does not
+            guarantee that your NixOS configuration will boot
+            successfully on the host hardware, because the hardware
+            and boot loader configuration in the VM are different.  If
+            disabled (the default), the VM directly boots the NixOS
+            kernel and initial ramdisk, bypassing the boot loader
+            altogether.
+          '';
+      };
+            
   };
 
   cfg = config.virtualisation;
@@ -146,12 +163,17 @@ let
           -net nic,vlan=0,model=virtio \
           -chardev socket,id=samba,path=./samba \
           -net user,vlan=0,guestfwd=tcp:10.0.2.4:139-chardev:samba''${QEMU_NET_OPTS:+,$QEMU_NET_OPTS} \
-          -drive file=$NIX_DISK_IMAGE,if=virtio,boot=on,cache=writeback,werror=report \
-          -kernel ${config.system.build.toplevel}/kernel \
-          -initrd ${config.system.build.toplevel}/initrd \
+          ${if cfg.useBootLoader then ''
+            -drive index=0,file=$NIX_DISK_IMAGE,if=virtio,cache=writeback,werror=report \
+            -drive index=1,file=${bootDisk}/disk.img,if=virtio,boot=on \
+          '' else ''
+            -drive file=$NIX_DISK_IMAGE,if=virtio,boot=on,cache=writeback,werror=report \
+            -kernel ${config.system.build.toplevel}/kernel \
+            -initrd ${config.system.build.toplevel}/initrd \
+            -append "$(cat ${config.system.build.toplevel}/kernel-params) init=${config.system.build.bootStage2} systemConfig=${config.system.build.toplevel} regInfo=${regInfo} ${kernelConsole} $QEMU_KERNEL_PARAMS" \
+          ''}
           ${qemuGraphics} \
           $QEMU_OPTS \
-          -append "$(cat ${config.system.build.toplevel}/kernel-params) init=${config.system.build.bootStage2} systemConfig=${config.system.build.toplevel} regInfo=${regInfo} ${kernelConsole} $QEMU_KERNEL_PARAMS" \
           ${config.virtualisation.qemu.options}
     '';
 
@@ -165,11 +187,54 @@ let
       printRegistration=1 perl ${pkgs.pathsFromGraph} closure-* > $out
     '';
 
+
+  # Generate a hard disk image containing a /boot partition and GRUB
+  # in the MBR.  Used when the `useBootLoader' option is set.
+  bootDisk =
+    pkgs.vmTools.runInLinuxVM (
+      pkgs.runCommand "nixos-boot-disk"
+        { preVM =
+            ''
+              mkdir $out
+              diskImage=$out/disk.img
+              ${pkgs.vmTools.kvm}/bin/qemu-img create -f qcow2 $diskImage "32M"
+            '';
+          buildInputs = [ pkgs.utillinux ];
+        }
+        ''
+          # Create a single /boot partition.
+          ${pkgs.parted}/sbin/parted /dev/vda mklabel msdos
+          ${pkgs.parted}/sbin/parted /dev/vda -- mkpart primary ext2 1M -1s
+          . /sys/class/block/vda1/uevent
+          mknod /dev/vda1 b $MAJOR $MINOR
+          . /sys/class/block/vda/uevent
+          ${pkgs.e2fsprogs}/sbin/mkfs.ext3 -L boot /dev/vda1
+          ${pkgs.e2fsprogs}/sbin/tune2fs -c 0 -i 0 /dev/vda1
+
+          # Mount /boot.
+          mkdir /boot
+          mount /dev/vda1 /boot
+
+          # This is needed for GRUB 0.97, which doesn't know about virtio devices.
+          mkdir /boot/grub
+          echo '(hd0) /dev/vda' > /boot/grub/device.map
+
+          # Install GRUB and generate the GRUB boot menu.
+          touch /etc/NIXOS 
+          mkdir -p /nix/var/nix/profiles
+          ${config.system.build.toplevel}/bin/switch-to-configuration boot
+
+          umount /boot
+        ''
+    );
+    
 in
 
 {
   require = options;
 
+  boot.loader.grub.device = mkOverride 50 "/dev/vda";
+  
   # All the modules the initrd needs to mount the host filesystem via
   # CIFS.  Also use paravirtualised network and block devices for
   # performance.
@@ -207,6 +272,7 @@ in
 
   boot.initrd.postMountCommands =
     ''
+      mkdir -p $targetRoot/boot
       mount -o remount,ro $targetRoot/nix/store
       ${optionalString cfg.writableStore ''
         mkdir /mnt-store-tmpfs
@@ -225,7 +291,9 @@ in
   boot.postBootCommands =
     ''
       ( source /proc/cmdline
-        ${config.environment.nix}/bin/nix-store --load-db < $regInfo
+        if [ -n "$regInfo" ]; then
+            ${config.environment.nix}/bin/nix-store --load-db < $regInfo
+        fi
       )
     '';
       
@@ -237,7 +305,7 @@ in
   # where the regular value for the `fileSystems' attribute should be
   # disregarded for the purpose of building a VM test image (since
   # those filesystems don't exist in the VM).
-  fileSystems = mkOverride 50
+  fileSystems = mkOverride 50 (
     [ { mountPoint = "/";
         device = "/dev/vda";
       }
@@ -253,7 +321,15 @@ in
         options = "bind";
         neededForBoot = true;
       }
-    ];
+    ] ++ optional cfg.useBootLoader
+      { mountPoint = "/boot";
+        device = "/dev/disk/by-label/boot";
+        fsType = "ext3";
+        options = "ro";
+        noCheck = true; # fsck fails on a r/o filesystem
+      });
+
+  swapDevices = mkOverride 50 [ ];
 
   # Starting DHCP brings down eth0, which kills the connection to the
   # host filesystem and thus deadlocks the system.
-- 
GitLab


From f99e42cfbc860c37185ca0c4ff7d9578ffec3d9a Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 13 Sep 2010 13:43:53 +0000
Subject: [PATCH 2593/5331] * Doh.

svn path=/nixos/trunk/; revision=23748
---
 modules/virtualisation/qemu-vm.nix | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/modules/virtualisation/qemu-vm.nix b/modules/virtualisation/qemu-vm.nix
index bc36b32a778..9b21fd4c172 100644
--- a/modules/virtualisation/qemu-vm.nix
+++ b/modules/virtualisation/qemu-vm.nix
@@ -113,15 +113,12 @@ let
 
     virtualisation.useBootLoader =
       mkOption {
-        default = true;
+        default = false;
         description =
           ''
             If enabled, the virtual machine will be booted using the
             regular boot loader (i.e., GRUB 1 or 2).  This allows
-            testing of the boot loader.  However, it does not
-            guarantee that your NixOS configuration will boot
-            successfully on the host hardware, because the hardware
-            and boot loader configuration in the VM are different.  If
+            testing of the boot loader.  If
             disabled (the default), the VM directly boots the NixOS
             kernel and initial ramdisk, bypassing the boot loader
             altogether.
-- 
GitLab


From f729f12e4e8f03540e33aaf07292934747417787 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 13 Sep 2010 15:41:38 +0000
Subject: [PATCH 2594/5331] Some cleanups in the activation script: * Moved
 some scriptlets to the appropriate modules. * Put the scriptlet that sets the
 default path at the start, since it   never makes sense not to have it there.
  It no longer needs to be   declared as a dependency. * If a scriptlet has no
 dependencies, it can be denoted as a plain   string (i.e., `noDepEntry' is
 not needed anymore).

svn path=/nixos/trunk/; revision=23762
---
 modules/config/users-groups.nix               |  24 +-
 modules/programs/bash/bash.nix                |  17 +-
 modules/security/policykit.nix                |   4 +-
 modules/security/polkit.nix                   |  18 +-
 modules/security/setuid-wrappers.nix          |   4 +-
 modules/services/backup/mysql-backup.nix      |  21 +-
 modules/services/backup/postgresql-backup.nix |  25 +-
 modules/services/backup/sitecopy-backup.nix   |  79 +++--
 modules/services/misc/nix-daemon.nix          |  29 +-
 modules/services/monitoring/systemhealth.nix  |  57 ++--
 .../system/activation/activation-script.nix   | 308 +++++++-----------
 modules/system/boot/modprobe.nix              |   9 +
 modules/system/etc/etc.nix                    |  81 +++--
 modules/tasks/network-interfaces.nix          |  15 +-
 modules/virtualisation/xen.nix                |   2 +-
 15 files changed, 340 insertions(+), 353 deletions(-)

diff --git a/modules/config/users-groups.nix b/modules/config/users-groups.nix
index 447dc96f818..6d57209a4ac 100644
--- a/modules/config/users-groups.nix
+++ b/modules/config/users-groups.nix
@@ -156,7 +156,23 @@ in
 
   config = {
 
-    system.activationScripts.users = fullDepEntry
+    system.activationScripts.rootPasswd = stringAfter [ "etc" ]
+      ''
+        # If there is no password file yet, create a root account with an
+        # empty password.
+        if ! test -e /etc/passwd; then
+            rootHome=/root
+            touch /etc/passwd; chmod 0644 /etc/passwd
+            touch /etc/group; chmod 0644 /etc/group
+            touch /etc/shadow; chmod 0600 /etc/shadow
+            # Can't use useradd, since it complains that it doesn't know us
+            # (bootstrap problem!).
+            echo "root:x:0:0:System administrator:$rootHome:${config.users.defaultUserShell}" >> /etc/passwd
+            echo "root::::::::" >> /etc/shadow
+        fi
+      '';
+
+    system.activationScripts.users = stringAfter [ "groups" ]
       ''
         echo "updating users..."
 
@@ -206,9 +222,9 @@ in
             fi
 
         done
-      '' [ "groups" ];
+      '';
 
-    system.activationScripts.groups = fullDepEntry
+    system.activationScripts.groups = stringAfter [ "rootPasswd" "binsh" "etc" "var" ]
       ''
         echo "updating groups..."
         
@@ -231,7 +247,7 @@ in
         done <<EndOfGroupList
         ${concatStringsSep "\n" (map serializedGroup groups)}
         EndOfGroupList
-      '' [ "rootPasswd" "binsh" "etc" "var" ];
+      '';
 
   };
 
diff --git a/modules/programs/bash/bash.nix b/modules/programs/bash/bash.nix
index 1e2730b04b9..f99d04e6335 100644
--- a/modules/programs/bash/bash.nix
+++ b/modules/programs/bash/bash.nix
@@ -1,19 +1,21 @@
 # This module defines global configuration for the Bash shell, in
 # particular /etc/bashrc and /etc/profile.
 
-{config, pkgs, ...}:
+{ config, pkgs, ... }:
+
+with pkgs.lib;
 
 let
 
   options = {
 
-    environment.shellInit = pkgs.lib.mkOption {
+    environment.shellInit = mkOption {
         default = "";
         example = ''export PATH=/godi/bin/:$PATH'';
         description = "
           Script used to initialized user shell environments.
         ";
-        merge = pkgs.lib.mergeStringOption;
+        merge = mergeStringOption;
       };
 
   };
@@ -57,4 +59,13 @@ in
     ];
 
   system.build.binsh = pkgs.bashInteractive;
+
+  system.activationScripts.binsh = stringAfter [ "stdio" ]
+    ''
+      # Create the required /bin/sh symlink; otherwise lots of things
+      # (notably the system() function) won't work.
+      mkdir -m 0755 -p /bin
+      ln -sfn ${config.system.build.binsh}/bin/sh /bin/sh
+    '';
+  
 }
diff --git a/modules/security/policykit.nix b/modules/security/policykit.nix
index 6d7b507d033..39075dd760f 100644
--- a/modules/security/policykit.nix
+++ b/modules/security/policykit.nix
@@ -51,7 +51,7 @@ in
         }
       ];
       
-    system.activationScripts.policyKit = fullDepEntry
+    system.activationScripts.policyKit = stringAfter [ "users" ]
       ''
         mkdir -m 0770 -p /var/run/PolicyKit
         chown root.polkituser /var/run/PolicyKit
@@ -63,7 +63,7 @@ in
         touch /var/lib/misc/PolicyKit.reload
         chmod 0664 /var/lib/misc/PolicyKit.reload
         chown polkituser.polkituser /var/lib/misc/PolicyKit.reload
-      '' [ "users" ];
+      '';
 
   };
 
diff --git a/modules/security/polkit.nix b/modules/security/polkit.nix
index 0a8ff4c7ea2..3723a621827 100644
--- a/modules/security/polkit.nix
+++ b/modules/security/polkit.nix
@@ -27,12 +27,10 @@ in
     environment = {
       systemPackages = [ pkWrapper ];
       pathsToLink = [ "/share/polkit-1" "/etc/polkit-1" ];
-      etc = [
-        {
-          source = "${config.system.path}/etc/polkit-1";
+      etc = singleton
+        { source = "${config.system.path}/etc/polkit-1";
           target = "polkit-1";
-        }
-      ];
+        };
     };
 
     services.dbus.packages = [ pkWrapper ];
@@ -41,18 +39,16 @@ in
       pam.services = [ { name = "polkit-1"; } ];
       setuidPrograms = [ "pkexec" ];
 
-      setuidOwners = [
-        {
-          program = "polkit-agent-helper-1";
+      setuidOwners = singleton
+        { program = "polkit-agent-helper-1";
           owner = "root";
           group = "root";
           setuid = true;
           source = pkgs.polkit + "/" + pkWrapper.helper;
-        }
-      ];
+        };
     };
 
-    system.activationScripts.polikit = pkgs.stringsWithDeps.noDepEntry
+    system.activationScripts.polkit =
       ''
         mkdir -p /var/lib/polkit-1/localauthority
         chmod 700 /var/lib/polkit-1{/localauthority,}
diff --git a/modules/security/setuid-wrappers.nix b/modules/security/setuid-wrappers.nix
index 3c4a08c16b7..edbae5d55c8 100644
--- a/modules/security/setuid-wrappers.nix
+++ b/modules/security/setuid-wrappers.nix
@@ -110,7 +110,7 @@ in
             chmod "u${if setuid then "+" else "-"}s,g${if setgid then "+" else "-"}s,${permissions}" ${wrapperDir}/${program}
           '';
 
-      in pkgs.stringsWithDeps.fullDepEntry
+      in stringAfter [ "users" ] 
         ''
           # Look in the system path and in the default profile for
           # programs to be wrapped.
@@ -120,7 +120,7 @@ in
           mkdir -p ${wrapperDir}
 
           ${concatMapStrings makeSetuidWrapper setuidPrograms}
-        '' [ "defaultPath" "users" ];
+        '';
 
   };
   
diff --git a/modules/services/backup/mysql-backup.nix b/modules/services/backup/mysql-backup.nix
index e06f2bb581d..b6d42b8782a 100644
--- a/modules/services/backup/mysql-backup.nix
+++ b/modules/services/backup/mysql-backup.nix
@@ -1,7 +1,9 @@
-{pkgs, config, ...}:
+{ config, pkgs, ... }:
+
+with pkgs.lib;
 
 let
-  inherit (pkgs.lib) mkOption mkIf singleton concatStrings;
+
   inherit (pkgs) mysql gzip;
 
   location = config.services.mysqlBackup.location ;
@@ -58,14 +60,15 @@ in
   };
 
   config = mkIf config.services.mysqlBackup.enable {
-    services.cron = {
-      systemCronJobs = map mysqlBackupCron config.services.mysqlBackup.databases;
-    };
+  
+    services.cron.systemCronJobs = map mysqlBackupCron config.services.mysqlBackup.databases;
 
-    system.activationScripts.mysqlBackup = pkgs.stringsWithDeps.fullDepEntry ''
-         mkdir -m 0700 -p ${config.services.mysqlBackup.location}
-         chown ${config.services.mysqlBackup.user} ${config.services.mysqlBackup.location}
-    '' [ "stdio" "defaultPath" "systemConfig" "users" ];
+    system.activationScripts.mysqlBackup = stringAfter [ "stdio" "defaultPath" "systemConfig" "users" ]
+      ''
+        mkdir -m 0700 -p ${config.services.mysqlBackup.location}
+        chown ${config.services.mysqlBackup.user} ${config.services.mysqlBackup.location}
+      '';
+    
   };
   
 }
diff --git a/modules/services/backup/postgresql-backup.nix b/modules/services/backup/postgresql-backup.nix
index 61bafed7bfa..edbbbdac635 100644
--- a/modules/services/backup/postgresql-backup.nix
+++ b/modules/services/backup/postgresql-backup.nix
@@ -1,14 +1,16 @@
-{pkgs, config, ...}:
+{ config, pkgs, ... }:
+
+with pkgs.lib;
 
 let
-  inherit (pkgs.lib) mkOption mkIf singleton concatStrings;
   inherit (pkgs) postgresql gzip;
 
   location = config.services.postgresqlBackup.location ;
 
-  postgresqlBackupCron = db : ''
-    ${config.services.postgresqlBackup.period} root ${postgresql}/bin/pg_dump ${db} | ${gzip}/bin/gzip -c > ${location}/${db}.gz
-  ''; 
+  postgresqlBackupCron = db:
+    ''
+      ${config.services.postgresqlBackup.period} root ${postgresql}/bin/pg_dump ${db} | ${gzip}/bin/gzip -c > ${location}/${db}.gz
+    ''; 
 
 in
 
@@ -52,14 +54,13 @@ in
   };
 
   config = mkIf config.services.postgresqlBackup.enable {
-    services.cron = {
-      systemCronJobs = map postgresqlBackupCron config.services.postgresqlBackup.databases;
-    };
+    services.cron.systemCronJobs = map postgresqlBackupCron config.services.postgresqlBackup.databases;
 
-    system.activationScripts.postgresqlBackup = pkgs.stringsWithDeps.fullDepEntry ''
-         mkdir -m 0700 -p ${config.services.postgresqlBackup.location}
-         chown root ${config.services.postgresqlBackup.location}
-    '' [ "stdio" "defaultPath" "systemConfig" "users" ];
+    system.activationScripts.postgresqlBackup = stringAfter [ "stdio" "defaultPath" "systemConfig" "users" ]
+      ''
+        mkdir -m 0700 -p ${config.services.postgresqlBackup.location}
+        chown root ${config.services.postgresqlBackup.location}
+      '';
   };
   
 }
diff --git a/modules/services/backup/sitecopy-backup.nix b/modules/services/backup/sitecopy-backup.nix
index 310a5e78b08..f30002b6ee8 100644
--- a/modules/services/backup/sitecopy-backup.nix
+++ b/modules/services/backup/sitecopy-backup.nix
@@ -1,7 +1,8 @@
-{pkgs, config, ...}:
+{ config, pkgs, ... }:
+
+with pkgs.lib;
 
 let
-  inherit (pkgs.lib) mkOption mkIf singleton concatStrings;
   inherit (pkgs) sitecopy;
 
   stateDir = "/var/spool/sitecopy";
@@ -63,45 +64,41 @@ in
   config = mkIf config.services.sitecopy.enable {
     environment.systemPackages = [ sitecopy ];
 
-    services.cron = {
-      systemCronJobs = map sitecopyCron config.services.sitecopy.backups;
-    };
-
-
-    system.activationScripts.sitecopyBackup = 
-      pkgs.stringsWithDeps.fullDepEntry ''  
-          mkdir -m 0700 -p ${stateDir}
-          chown root ${stateDir}
-          touch ${stateDir}/sitecopy.secrets
-          chown root ${stateDir}/sitecopy.secrets
-
-          ${pkgs.lib.concatStrings (map ( b: ''
-              unset secrets
-              unset secret
-              secrets=`grep '^${b.server}' ${stateDir}/sitecopy.secrets | head -1`
-              secret=($secrets)
-              cat > ${stateDir}/${b.name}.conf << EOF
-                site ${b.name}
-                server ${b.server}
-                protocol ${b.protocol}
-                username ''${secret[1]}
-                password ''${secret[2]}
-                local ${b.local}
-                remote ${b.remote}
-                symlinks ${b.symlinks}
-                ${if b.https then "http secure" else ""}
-              EOF
-              chmod 0600 ${stateDir}/${b.name}.conf
-              if ! test -e ${stateDir}/${b.name} ; then
-                echo " * Initializing sitecopy '${b.name}'"
-                ${sitecopy}/bin/sitecopy --storepath=${stateDir} --rcfile=${stateDir}/${b.name}.conf --initialize ${b.name}
-              else
-                echo " * Sitecopy '${b.name}' already initialized"
-              fi
-            '' ) config.services.sitecopy.backups 
-         )}
-
-      '' [ "stdio" "defaultPath" "systemConfig" "users" ] ;
+    services.cron.systemCronJobs = map sitecopyCron config.services.sitecopy.backups;
+
+    system.activationScripts.sitecopyBackup = stringAfter [ "stdio" "systemConfig" "users" ]
+      ''  
+        mkdir -m 0700 -p ${stateDir}
+        chown root ${stateDir}
+        touch ${stateDir}/sitecopy.secrets
+        chown root ${stateDir}/sitecopy.secrets
+
+        ${pkgs.lib.concatStrings (map ( b: ''
+            unset secrets
+            unset secret
+            secrets=`grep '^${b.server}' ${stateDir}/sitecopy.secrets | head -1`
+            secret=($secrets)
+            cat > ${stateDir}/${b.name}.conf << EOF
+              site ${b.name}
+              server ${b.server}
+              protocol ${b.protocol}
+              username ''${secret[1]}
+              password ''${secret[2]}
+              local ${b.local}
+              remote ${b.remote}
+              symlinks ${b.symlinks}
+              ${if b.https then "http secure" else ""}
+            EOF
+            chmod 0600 ${stateDir}/${b.name}.conf
+            if ! test -e ${stateDir}/${b.name} ; then
+              echo " * Initializing sitecopy '${b.name}'"
+              ${sitecopy}/bin/sitecopy --storepath=${stateDir} --rcfile=${stateDir}/${b.name}.conf --initialize ${b.name}
+            else
+              echo " * Sitecopy '${b.name}' already initialized"
+            fi
+          '' ) config.services.sitecopy.backups 
+        )}
+      '';
   };
   
 }
diff --git a/modules/services/misc/nix-daemon.nix b/modules/services/misc/nix-daemon.nix
index a9a0bc70f1e..2be7789cc5f 100644
--- a/modules/services/misc/nix-daemon.nix
+++ b/modules/services/misc/nix-daemon.nix
@@ -277,7 +277,7 @@ in
         # do this, mount the remote file system on a subdirectory of
         # /var/run/nix/remote-stores.
         export NIX_OTHER_STORES=/var/run/nix/remote-stores/*/nix
-      '' 
+      '' # */
       + optionalString config.nix.distributedBuilds ''
         export NIX_BUILD_HOOK=${config.environment.nix}/libexec/nix/build-remote.pl
         export NIX_REMOTE_SYSTEMS=/etc/nix.machines
@@ -292,6 +292,33 @@ in
 
     users.extraUsers = map makeNixBuildUser (pkgs.lib.range 1 config.nix.nrBuildUsers);
 
+    system.activationScripts.nix = stringAfter [ "etc" "users" ]
+      ''
+        # Set up Nix.
+        mkdir -p /nix/etc/nix
+        ln -sfn /etc/nix.conf /nix/etc/nix/nix.conf
+        chown root.nixbld /nix/store
+        chmod 1775 /nix/store
+
+        # Nix initialisation.
+        mkdir -m 0755 -p \
+          /nix/var/nix/gcroots \
+          /nix/var/nix/temproots \
+          /nix/var/nix/manifests \
+          /nix/var/nix/userpool \
+          /nix/var/nix/profiles \
+          /nix/var/nix/db \
+          /nix/var/log/nix/drvs \
+          /nix/var/nix/channel-cache \
+          /nix/var/nix/chroots
+        mkdir -m 1777 -p /nix/var/nix/gcroots/per-user
+        mkdir -m 1777 -p /nix/var/nix/profiles/per-user
+        mkdir -m 1777 -p /nix/var/nix/gcroots/tmp
+
+        ln -sf /nix/var/nix/profiles /nix/var/nix/gcroots/
+        ln -sf /nix/var/nix/manifests /nix/var/nix/gcroots/
+      '';
+
   };
 
 }
diff --git a/modules/services/monitoring/systemhealth.nix b/modules/services/monitoring/systemhealth.nix
index 8d531b526f3..85f297cfb71 100644
--- a/modules/services/monitoring/systemhealth.nix
+++ b/modules/services/monitoring/systemhealth.nix
@@ -75,43 +75,44 @@ in
   config = mkIf cfg.enable {
     services.cron.systemCronJobs = [ cronJob ];
 
-    system.activationScripts.systemhealth = fullDepEntry ''
-      mkdir -p ${rrdDir} ${htmlDir}
-      chown wwwrun.wwwrun ${rrdDir} ${htmlDir}
+    system.activationScripts.systemhealth = stringAfter [ "var" ]
+      ''
+        mkdir -p ${rrdDir} ${htmlDir}
+        chown wwwrun.wwwrun ${rrdDir} ${htmlDir}
 
-      cat >${configFile} << EOF
-      [paths]
-      rrdtool = ${pkgs.rrdtool}/bin/rrdtool
-      loadavg_rrd = loadavg
-      ps = /var/run/current-system/sw/bin/ps
-      df = /var/run/current-system/sw/bin/df
-      meminfo_rrd = meminfo
-      uptime_rrd = uptime
-      rrd_path = ${rrdDir}
-      png_path = ${htmlDir}
+        cat >${configFile} << EOF
+        [paths]
+        rrdtool = ${pkgs.rrdtool}/bin/rrdtool
+        loadavg_rrd = loadavg
+        ps = /var/run/current-system/sw/bin/ps
+        df = /var/run/current-system/sw/bin/df
+        meminfo_rrd = meminfo
+        uptime_rrd = uptime
+        rrd_path = ${rrdDir}
+        png_path = ${htmlDir}
 
-      [processes]
+        [processes]
 
-      [interfaces]
-      ${interfacesSection}
+        [interfaces]
+        ${interfacesSection}
 
-      [drives]
-      ${drivesSection}
+        [drives]
+        ${drivesSection}
 
-      [graphs]
-      width = 400
-      time = ['-3hours', '-32hours', '-8days', '-5weeks', '-13months']
-      height = 100
+        [graphs]
+        width = 400
+        time = ['-3hours', '-32hours', '-8days', '-5weeks', '-13months']
+        height = 100
 
-      [external]
+        [external]
 
-      EOF
+        EOF
 
-      chown wwwrun.wwwrun ${configFile}
+        chown wwwrun.wwwrun ${configFile}
 
-      ${pkgs.su}/bin/su -s "/bin/sh" -c "${command} --check" wwwrun
-      ${pkgs.su}/bin/su -s "/bin/sh" -c "${command} --html" wwwrun
-    '' [ "var" ];
+        ${pkgs.su}/bin/su -s "/bin/sh" -c "${command} --check" wwwrun
+        ${pkgs.su}/bin/su -s "/bin/sh" -c "${command} --html" wwwrun
+      '';
 
     services.httpd.extraSubservices = [
       { function = f: {
diff --git a/modules/system/activation/activation-script.nix b/modules/system/activation/activation-script.nix
index 8924041ae60..222addb58d2 100644
--- a/modules/system/activation/activation-script.nix
+++ b/modules/system/activation/activation-script.nix
@@ -1,220 +1,140 @@
 # generate the script used to activate the configuration.
-{pkgs, config, ...}:
+{ config, pkgs, ... }:
+
+with pkgs.lib;
 
 let
-  inherit (pkgs.lib) mkOption mergeTypedOption mergeAttrs
-    mapAttrs addErrorContext fold id filter textClosureMap noDepEntry
-    fullDepEntry;
-  inherit (builtins) attrNames;
 
   addAttributeName = mapAttrs (a: v: v // {
-      text = ''
-        #### actionScripts snippet ${a} :
-        #    ========================================
-        ${v.text}
-      '';
-    });
-
-  defaultScripts = {
-  
-    systemConfig = noDepEntry ''
-      systemConfig="$1"
-      if test -z "$systemConfig"; then
-        systemConfig="/system" # for the installation CD
-      fi
+    text = ''
+      #### Activation script snippet ${a}:
+      ${v.text}
     '';
+  });
 
-    defaultPath =
-      let path = [
-        pkgs.coreutils pkgs.gnugrep pkgs.findutils
-        pkgs.glibc # needed for getent
-        pkgs.shadow
-        pkgs.nettools # needed for hostname
-      ]; in noDepEntry ''
-        export PATH=/empty
-        for i in ${toString path}; do
-          PATH=$PATH:$i/bin:$i/sbin;
-        done
-      '';
-
-    stdio = fullDepEntry ''
-      # Needed by some programs.
-      ln -sfn /proc/self/fd /dev/fd
-      ln -sfn /proc/self/fd/0 /dev/stdin
-      ln -sfn /proc/self/fd/1 /dev/stdout
-      ln -sfn /proc/self/fd/2 /dev/stderr
-    '' [
-      "defaultPath" # path to ln
+  path =
+    [ pkgs.coreutils pkgs.gnugrep pkgs.findutils
+      pkgs.glibc # needed for getent
+      pkgs.shadow
+      pkgs.nettools # needed for hostname
     ];
+    
+in
 
-    binsh = fullDepEntry ''
-      # Create the required /bin/sh symlink; otherwise lots of things
-      # (notably the system() function) won't work.
-      mkdir -m 0755 -p $mountPoint/bin
-      ln -sfn ${config.system.build.binsh}/bin/sh $mountPoint/bin/sh
-    '' [
-      "defaultPath" # path to ln & mkdir
-      "stdio" # ?
-    ];
+{
 
-    modprobe = fullDepEntry ''
-      # Allow the kernel to find our wrapped modprobe (which searches
-      # in the right location in the Nix store for kernel modules).
-      # We need this when the kernel (or some module) auto-loads a
-      # module.
-      echo ${config.system.sbin.modprobe}/sbin/modprobe > /proc/sys/kernel/modprobe
-    '' [
-      # ?
-    ];
+  ###### interface
+  
+  options = {
+  
+    system.activationScripts = mkOption {
+      default = {};
+      
+      example = {
+        stdio = {
+          text = ''
+            # Needed by some programs.
+            ln -sfn /proc/self/fd /dev/fd
+            ln -sfn /proc/self/fd/0 /dev/stdin
+            ln -sfn /proc/self/fd/1 /dev/stdout
+            ln -sfn /proc/self/fd/2 /dev/stderr
+          '';
+          deps = [];
+        };
+      };
+      
+      description = ''
+        Activate the new configuration (i.e., update /etc, make accounts,
+        and so on).
+      '';
+      
+      merge = mergeTypedOption "script" builtins.isAttrs (fold mergeAttrs {});
+      
+      apply = set: {
+        script = pkgs.writeScript "nixos-activation-script"
+          ''
+            #! ${pkgs.stdenv.shell}
+
+            export PATH=/empty
+            for i in ${toString path}; do
+                PATH=$PATH:$i/bin:$i/sbin;
+            done
+            
+            ${
+              let
+                set' = mapAttrs (n: v: if builtins.isString v then noDepEntry v else v) set;
+                withHeadlines = addAttributeName set';
+              in textClosureMap id (withHeadlines) (attrNames withHeadlines)
+            }
+
+            # Make this configuration the current configuration.
+            # The readlink is there to ensure that when $systemConfig = /system
+            # (which is a symlink to the store), /var/run/current-system is still
+            # used as a garbage collection root.
+            ln -sfn "$(readlink -f "$systemConfig")" /var/run/current-system
+
+            # Prevent the current configuration from being garbage-collected.
+            ln -sfn /var/run/current-system /nix/var/nix/gcroots/current-system
+          '';
+      };
+      
+    };
+    
+  };
 
-    var = fullDepEntry ''
-      # Various log/runtime directories.
+  
+  ###### implementation
 
-      touch /var/run/utmp # must exist
-      chgrp ${toString config.ids.gids.utmp} /var/run/utmp
-      chmod 664 /var/run/utmp
+  config = {
 
-      mkdir -m 0755 -p /var/run/nix/current-load # for distributed builds
-      mkdir -m 0700 -p /var/run/nix/remote-stores
+    system.activationScripts.systemConfig =
+      ''
+        systemConfig="$1"
+        if test -z "$systemConfig"; then
+          systemConfig="/system" # for the installation CD
+        fi
+      '';
 
-      mkdir -m 0755 -p /var/log
-      mkdir -m 0755 -p /var/log/upstart
+    system.activationScripts.stdio =
+      ''
+        # Needed by some programs.
+        ln -sfn /proc/self/fd /dev/fd
+        ln -sfn /proc/self/fd/0 /dev/stdin
+        ln -sfn /proc/self/fd/1 /dev/stdout
+        ln -sfn /proc/self/fd/2 /dev/stderr
+      '';
 
-      touch /var/log/wtmp # must exist
-      chmod 644 /var/log/wtmp
+    system.activationScripts.var =
+      ''
+        # Various log/runtime directories.
 
-      touch /var/log/lastlog
-      chmod 644 /var/log/lastlog
+        touch /var/run/utmp # must exist
+        chgrp ${toString config.ids.gids.utmp} /var/run/utmp
+        chmod 664 /var/run/utmp
 
-      mkdir -m 1777 -p /var/tmp
+        mkdir -m 0755 -p /var/run/nix/current-load # for distributed builds
+        mkdir -m 0700 -p /var/run/nix/remote-stores
 
-      # Empty, read-only home directory of many system accounts.
-      mkdir -m 0555 -p /var/empty
-    '' [
-      "defaultPath" # path to mkdir & touch & chmod
-    ];
+        mkdir -m 0755 -p /var/log
+        mkdir -m 0755 -p /var/log/upstart
 
-    rootPasswd = fullDepEntry ''
-      # If there is no password file yet, create a root account with an
-      # empty password.
-      if ! test -e /etc/passwd; then
-          rootHome=/root
-          touch /etc/passwd; chmod 0644 /etc/passwd
-          touch /etc/group; chmod 0644 /etc/group
-          touch /etc/shadow; chmod 0600 /etc/shadow
-          # Can't use useradd, since it complains that it doesn't know us
-          # (bootstrap problem!).
-          echo "root:x:0:0:System administrator:$rootHome:${config.users.defaultUserShell}" >> /etc/passwd
-          echo "root::::::::" >> /etc/shadow
-      fi
-    '' [
-      "defaultPath" # path to touch & passwd
-      "etc" # for /etc
-      # ?
-    ];
+        touch /var/log/wtmp # must exist
+        chmod 644 /var/log/wtmp
 
-    nix = fullDepEntry ''
-      # Set up Nix.
-      mkdir -p /nix/etc/nix
-      ln -sfn /etc/nix.conf /nix/etc/nix/nix.conf
-      chown root.nixbld /nix/store
-      chmod 1775 /nix/store
-
-      # Nix initialisation.
-      mkdir -m 0755 -p \
-          /nix/var/nix/gcroots \
-          /nix/var/nix/temproots \
-          /nix/var/nix/manifests \
-          /nix/var/nix/userpool \
-          /nix/var/nix/profiles \
-          /nix/var/nix/db \
-          /nix/var/log/nix/drvs \
-          /nix/var/nix/channel-cache \
-          /nix/var/nix/chroots
-      mkdir -m 1777 -p /nix/var/nix/gcroots/per-user
-      mkdir -m 1777 -p /nix/var/nix/profiles/per-user
-      mkdir -m 1777 -p /nix/var/nix/gcroots/tmp
-
-      ln -sf /nix/var/nix/profiles /nix/var/nix/gcroots/
-      ln -sf /nix/var/nix/manifests /nix/var/nix/gcroots/
-    '' [
-      "defaultPath"
-      "etc" # /etc/nix.conf
-      "users" # nixbld group
-    ];
+        touch /var/log/lastlog
+        chmod 644 /var/log/lastlog
 
-    hostname = fullDepEntry ''
-      # Set the host name.  Don't clear it if it's not configured in the
-      # NixOS configuration, since it may have been set by dhclient in the
-      # meantime.
-      ${if config.networking.hostName != "" then
-          ''hostname "${config.networking.hostName}"''
-      else ''
-          # dhclient won't do anything if the hostname isn't empty.
-          if test "$(hostname)" = "(none)"; then
-            hostname ""
-          fi
-      ''}
-    '' [ "defaultPath" ];
-
-    # The activation has to be done at the end. This is forced at the apply
-    # function of activationScripts option
-    activate = noDepEntry ''
-      # Make this configuration the current configuration.
-      # The readlink is there to ensure that when $systemConfig = /system
-      # (which is a symlink to the store), /var/run/current-system is still
-      # used as a garbage collection root.
-      ln -sfn "$(readlink -f "$systemConfig")" /var/run/current-system
-
-      # Prevent the current configuration from being garbage-collected.
-      ln -sfn /var/run/current-system /nix/var/nix/gcroots/current-system
-    '';
+        mkdir -m 1777 -p /var/tmp
 
-    media = noDepEntry ''
-      mkdir -p /media
-    '';
+        # Empty, read-only home directory of many system accounts.
+        mkdir -m 0555 -p /var/empty
+      '';
+
+    system.activationScripts.media =
+      ''
+        mkdir -p /media
+      '';
     
   };
   
-    
-in
-
-{
-  require = {
-    system = {
-      activationScripts = mkOption {
-        default = [];
-        example = {
-          stdio = {
-            text = "
-              # Needed by some programs.
-              ln -sfn /proc/self/fd /dev/fd
-              ln -sfn /proc/self/fd/0 /dev/stdin
-              ln -sfn /proc/self/fd/1 /dev/stdout
-              ln -sfn /proc/self/fd/2 /dev/stderr
-            ";
-            deps = [];
-          };
-        };
-        description = ''
-          Activate the new configuration (i.e., update /etc, make accounts,
-          and so on).
-        '';
-        merge = mergeTypedOption "script" builtins.isAttrs (fold mergeAttrs {});
-        apply = set:
-          let withHeadlines = addAttributeName set;
-              activateLib = removeAttrs withHeadlines ["activate"];
-              activateLibNames = attrNames activateLib;
-          in {
-          script = pkgs.writeScript "nixos-activation-script"
-            ("#! ${pkgs.stdenv.shell}\n"
-             + textClosureMap id activateLib activateLibNames + "\n"
-               # make sure that the activate snippet is added last.
-             + withHeadlines.activate.text);
-        };
-      };
-    };
-  };
-
-  system.activationScripts = defaultScripts;
 }
diff --git a/modules/system/boot/modprobe.nix b/modules/system/boot/modprobe.nix
index 65b3f6fd292..aa4d023a9f4 100644
--- a/modules/system/boot/modprobe.nix
+++ b/modules/system/boot/modprobe.nix
@@ -88,6 +88,15 @@ with pkgs.lib;
         # too?
       ];
 
+    system.activationScripts.modprobe =
+      ''
+        # Allow the kernel to find our wrapped modprobe (which searches
+        # in the right location in the Nix store for kernel modules).
+        # We need this when the kernel (or some module) auto-loads a
+        # module.
+        echo ${config.system.sbin.modprobe}/sbin/modprobe > /proc/sys/kernel/modprobe
+      '';
+      
   };
 
 }
diff --git a/modules/system/etc/etc.nix b/modules/system/etc/etc.nix
index 4ae420017a5..0a2f6665be0 100644
--- a/modules/system/etc/etc.nix
+++ b/modules/system/etc/etc.nix
@@ -1,9 +1,10 @@
-# produce a script to generate /etc
-{config, pkgs, ...}:
+# Produce a script to generate /etc.
+{ config, pkgs, ... }:
+
+with pkgs.lib;
 
 ###### interface
 let
-  inherit (pkgs.lib) mkOption;
 
   option = {
     environment.etc = mkOption {
@@ -52,47 +53,39 @@ in
 {
   require = [option];
 
-  system = {
-    build = {
-      etc = makeEtc;
-    };
+  system.build.etc = makeEtc;
 
-    activationScripts = {
-      etc = pkgs.lib.fullDepEntry ''
-        # Set up the statically computed bits of /etc.
-        echo "setting up /etc..."
-        staticEtc=/etc/static
-        rm -f $staticEtc
-        ln -s ${makeEtc}/etc $staticEtc
-        for i in $(cd $staticEtc && find * -type l); do
-            mkdir -p /etc/$(dirname $i)
-            rm -f /etc/$i
-            if test -e "$staticEtc/$i.mode"; then
-                # Create a regular file in /etc.
-                cp $staticEtc/$i /etc/$i
-                chown 0.0 /etc/$i
-                chmod "$(cat "$staticEtc/$i.mode")" /etc/$i
-            else
-                # Create a symlink in /etc.
-                ln -s $staticEtc/$i /etc/$i
-            fi
-        done
+  system.activationScripts.etc = stringAfter [ "systemConfig" "stdio" ]
+    ''
+      # Set up the statically computed bits of /etc.
+      echo "setting up /etc..."
+      staticEtc=/etc/static
+      rm -f $staticEtc
+      ln -s ${makeEtc}/etc $staticEtc
+      for i in $(cd $staticEtc && find * -type l); do
+          mkdir -p /etc/$(dirname $i)
+          rm -f /etc/$i
+          if test -e "$staticEtc/$i.mode"; then
+              # Create a regular file in /etc.
+              cp $staticEtc/$i /etc/$i
+              chown 0.0 /etc/$i
+              chmod "$(cat "$staticEtc/$i.mode")" /etc/$i
+          else
+              # Create a symlink in /etc.
+              ln -s $staticEtc/$i /etc/$i
+          fi
+      done
+
+      # Remove dangling symlinks that point to /etc/static.  These are
+      # configuration files that existed in a previous configuration but not
+      # in the current one.  For efficiency, don't look under /etc/nixos
+      # (where all the NixOS sources live).
+      for i in $(find /etc/ \( -path /etc/nixos -prune \) -o -type l); do
+          target=$(readlink "$i")
+          if test "''${target:0:''${#staticEtc}}" = "$staticEtc" -a ! -e "$i"; then
+              rm -f "$i"
+          fi
+      done
+    '';
 
-        # Remove dangling symlinks that point to /etc/static.  These are
-        # configuration files that existed in a previous configuration but not
-        # in the current one.  For efficiency, don't look under /etc/nixos
-        # (where all the NixOS sources live).
-        for i in $(find /etc/ \( -path /etc/nixos -prune \) -o -type l); do
-            target=$(readlink "$i")
-            if test "''${target:0:''${#staticEtc}}" = "$staticEtc" -a ! -e "$i"; then
-                rm -f "$i"
-            fi
-        done
-      '' [
-        "systemConfig"
-        "defaultPath" # path to cp, chmod, chown
-        "stdio"
-      ];
-    };
-  };
 }
diff --git a/modules/tasks/network-interfaces.nix b/modules/tasks/network-interfaces.nix
index 8c419810c57..2e1514a82cf 100644
--- a/modules/tasks/network-interfaces.nix
+++ b/modules/tasks/network-interfaces.nix
@@ -205,7 +205,20 @@ in
             #    ${nettools}/sbin/ifconfig $i down || true
             #done
           '';
-    };
+      };
+
+    # Set the host name in the activation script.  Don't clear it if
+    # it's not configured in the NixOS configuration, since it may
+    # have been set by dhclient in the meantime.
+    system.activationScripts.hostname =
+      (if config.networking.hostName != "" then ''
+        hostname "${config.networking.hostName}"
+      '' else ''
+        # dhclient won't do anything if the hostname isn't empty.
+        if test "$(hostname)" = "(none)"; then
+          hostname ""
+        fi
+      '');
 
   };
   
diff --git a/modules/virtualisation/xen.nix b/modules/virtualisation/xen.nix
index b2218fb3fdd..f0ac5944e42 100644
--- a/modules/virtualisation/xen.nix
+++ b/modules/virtualisation/xen.nix
@@ -72,7 +72,7 @@ let cfg = config.virtualisation.xen; in
       '';
 
     # Mount the /proc/xen pseudo-filesystem.
-    system.activationScripts.xen = noDepEntry
+    system.activationScripts.xen =
       ''
         if [ -d /proc/xen ]; then
             ${pkgs.sysvtools}/bin/mountpoint -q /proc/xen || \
-- 
GitLab


From f8f04aa756eb97bd886841f81df262ed381de171 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 13 Sep 2010 16:02:54 +0000
Subject: [PATCH 2595/5331] * Fix the tests.

svn path=/nixos/trunk/; revision=23764
---
 modules/virtualisation/qemu-vm.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/virtualisation/qemu-vm.nix b/modules/virtualisation/qemu-vm.nix
index 9b21fd4c172..cac221d8c22 100644
--- a/modules/virtualisation/qemu-vm.nix
+++ b/modules/virtualisation/qemu-vm.nix
@@ -168,7 +168,7 @@ let
             -kernel ${config.system.build.toplevel}/kernel \
             -initrd ${config.system.build.toplevel}/initrd \
             -append "$(cat ${config.system.build.toplevel}/kernel-params) init=${config.system.build.bootStage2} systemConfig=${config.system.build.toplevel} regInfo=${regInfo} ${kernelConsole} $QEMU_KERNEL_PARAMS" \
-          ''}
+          ''} \
           ${qemuGraphics} \
           $QEMU_OPTS \
           ${config.virtualisation.qemu.options}
-- 
GitLab


From 0fccd7bb492fabe8985087f2790ec6d2168978d1 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 13 Sep 2010 16:06:07 +0000
Subject: [PATCH 2596/5331] * Add a trivial test that just starts a machine and
 shuts it down.

svn path=/nixos/trunk/; revision=23765
---
 tests/default.nix |  1 +
 tests/simple.nix  | 11 +++++++++++
 2 files changed, 12 insertions(+)
 create mode 100644 tests/simple.nix

diff --git a/tests/default.nix b/tests/default.nix
index e99bce510ec..37ca37e0728 100644
--- a/tests/default.nix
+++ b/tests/default.nix
@@ -18,6 +18,7 @@ with import ../lib/testing.nix { inherit nixpkgs services system; };
   proxy = makeTest (import ./proxy.nix);
   quake3 = makeTest (import ./quake3.nix);
   remote_builds = makeTest (import ./remote-builds.nix);
+  simple = makeTest (import ./simple.nix);
   subversion = makeTest (import ./subversion.nix);
   trac = makeTest (import ./trac.nix);
 }
diff --git a/tests/simple.nix b/tests/simple.nix
new file mode 100644
index 00000000000..eee13a10133
--- /dev/null
+++ b/tests/simple.nix
@@ -0,0 +1,11 @@
+{ pkgs, ... }:
+
+{
+  machine = { config, pkgs, ... }: { };
+
+  testScript =
+    ''
+      startAll;
+      $machine->shutdown;
+    '';
+}
-- 
GitLab


From c8d1774f0977325ffa5bab56487ae48e072b3f2d Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 13 Sep 2010 17:26:42 +0000
Subject: [PATCH 2597/5331] * Speed up the initialisation of /etc in the
 activation script a lot   by doing it in Perl instead of in Bash.  Forking a
 zillion times is   slow.

svn path=/nixos/trunk/; revision=23766
---
 modules/system/etc/etc.nix      | 32 ++--------------
 modules/system/etc/setup-etc.pl | 65 +++++++++++++++++++++++++++++++++
 2 files changed, 68 insertions(+), 29 deletions(-)
 create mode 100644 modules/system/etc/setup-etc.pl

diff --git a/modules/system/etc/etc.nix b/modules/system/etc/etc.nix
index 0a2f6665be0..3dec801b407 100644
--- a/modules/system/etc/etc.nix
+++ b/modules/system/etc/etc.nix
@@ -37,7 +37,7 @@ let
       chmod ${mode} "$target"
     '';
 
-  makeEtc = pkgs.stdenv.mkDerivation {
+  etc = pkgs.stdenv.mkDerivation {
     name = "etc";
 
     builder = ./make-etc.sh;
@@ -53,39 +53,13 @@ in
 {
   require = [option];
 
-  system.build.etc = makeEtc;
+  system.build.etc = etc;
 
   system.activationScripts.etc = stringAfter [ "systemConfig" "stdio" ]
     ''
       # Set up the statically computed bits of /etc.
       echo "setting up /etc..."
-      staticEtc=/etc/static
-      rm -f $staticEtc
-      ln -s ${makeEtc}/etc $staticEtc
-      for i in $(cd $staticEtc && find * -type l); do
-          mkdir -p /etc/$(dirname $i)
-          rm -f /etc/$i
-          if test -e "$staticEtc/$i.mode"; then
-              # Create a regular file in /etc.
-              cp $staticEtc/$i /etc/$i
-              chown 0.0 /etc/$i
-              chmod "$(cat "$staticEtc/$i.mode")" /etc/$i
-          else
-              # Create a symlink in /etc.
-              ln -s $staticEtc/$i /etc/$i
-          fi
-      done
-
-      # Remove dangling symlinks that point to /etc/static.  These are
-      # configuration files that existed in a previous configuration but not
-      # in the current one.  For efficiency, don't look under /etc/nixos
-      # (where all the NixOS sources live).
-      for i in $(find /etc/ \( -path /etc/nixos -prune \) -o -type l); do
-          target=$(readlink "$i")
-          if test "''${target:0:''${#staticEtc}}" = "$staticEtc" -a ! -e "$i"; then
-              rm -f "$i"
-          fi
-      done
+      ${pkgs.perl}/bin/perl ${./setup-etc.pl} ${etc}/etc
     '';
 
 }
diff --git a/modules/system/etc/setup-etc.pl b/modules/system/etc/setup-etc.pl
new file mode 100644
index 00000000000..c6b932cf202
--- /dev/null
+++ b/modules/system/etc/setup-etc.pl
@@ -0,0 +1,65 @@
+use strict;
+use File::Find;
+use File::Copy;
+use File::Path;
+use File::Basename;
+
+my $etc = $ARGV[0] or die;
+my $static = "/etc/static";
+
+sub atomicSymlink {
+    my ($source, $target) = @_;
+    my $tmp = "$target.tmp";
+    unlink $tmp;
+    symlink $source, $tmp or return 1;
+    rename $tmp, $target or return 1;
+    return 1;
+}
+
+
+# Atomically update /etc/static to point at the etc files of the
+# current configuration.
+atomicSymlink $etc, $static or die;
+
+
+# For every file in the etc tree, create a corresponding symlink in
+# /etc to /etc/static.  The indirection through /etc/static is to make
+# switching to a new configuration somewhat more atomic.
+sub link {
+    my $fn = substr $File::Find::name, length($etc) + 1 or next;
+    my $target = "/etc/$fn";
+    File::Path::make_path(dirname $target);
+    if (-e "$_.mode") {
+        open MODE, "<$_.mode";
+        my $mode = <MODE>; chomp $mode;
+        close MODE;
+        copy "$static/$fn", "$target.tmp" or warn;
+        chmod oct($mode), "$target.tmp" or warn;
+        rename "$target.tmp", $target or warn;
+    } elsif (-l "$_") {
+        atomicSymlink "$static/$fn", $target or warn;
+    }
+}
+
+find(\&link, $etc);
+
+
+# Remove dangling symlinks that point to /etc/static.  These are
+# configuration files that existed in a previous configuration but not
+# in the current one.  For efficiency, don't look under /etc/nixos
+# (where all the NixOS sources live).
+sub cleanup {
+    if ($File::Find::name eq "/etc/nixos") {
+        $File::Find::prune = 1;
+        return;
+    }
+    if (-l $_) {
+        my $target = readlink $_;
+        if (substr($target, 0, length $static) eq $static) {
+            my $x = "/etc/static/" . substr($File::Find::name, length "/etc/");
+            unlink "$_" unless -e "$x";
+        }
+    }
+}
+
+find(\&cleanup, "/etc");
-- 
GitLab


From d48e2fdb4d01094ae2d8d00c1e505ba21cefec78 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 13 Sep 2010 17:36:01 +0000
Subject: [PATCH 2598/5331] * Don't print kernel log messages twice.

svn path=/nixos/trunk/; revision=23769
---
 modules/testing/test-instrumentation.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/modules/testing/test-instrumentation.nix b/modules/testing/test-instrumentation.nix
index 6f47a6a9c39..5ff7201acd3 100644
--- a/modules/testing/test-instrumentation.nix
+++ b/modules/testing/test-instrumentation.nix
@@ -77,6 +77,10 @@ in
     # Send all of /var/log/messages to the serial port.
     services.syslogd.extraConfig = "*.* /dev/ttyS0";
 
+    # Clear the kernel log buffer before starting klogd to prevent it
+    # from printing messages that we have already seen.
+    jobs.klogd.preStart = "dmesg -c > /dev/null";
+
     # Prevent tests from accessing the Internet.
     networking.defaultGateway = mkOverrideTemplate 150 {} "";
     networking.nameservers = mkOverrideTemplate 150 {} [ ];
-- 
GitLab


From 4046056cdc3140871421bcff81a220f2be5a44cd Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 13 Sep 2010 18:19:15 +0000
Subject: [PATCH 2599/5331] * In the activation script, don't require the path
 to the "system"   derivation on the command line.

svn path=/nixos/trunk/; revision=23770
---
 modules/system/activation/activation-script.nix | 14 ++++----------
 modules/system/activation/top-level.nix         | 11 +++++++++--
 modules/system/boot/stage-2-init.sh             |  2 +-
 modules/system/boot/stage-2.nix                 |  2 +-
 modules/system/etc/etc.nix                      |  2 +-
 modules/testing/test-instrumentation.nix        |  4 ++--
 6 files changed, 18 insertions(+), 17 deletions(-)

diff --git a/modules/system/activation/activation-script.nix b/modules/system/activation/activation-script.nix
index 222addb58d2..1aad1f37c2d 100644
--- a/modules/system/activation/activation-script.nix
+++ b/modules/system/activation/activation-script.nix
@@ -51,15 +51,17 @@ in
       merge = mergeTypedOption "script" builtins.isAttrs (fold mergeAttrs {});
       
       apply = set: {
-        script = pkgs.writeScript "nixos-activation-script"
+        script =
           ''
             #! ${pkgs.stdenv.shell}
 
+            systemConfig=@out@
+            
             export PATH=/empty
             for i in ${toString path}; do
                 PATH=$PATH:$i/bin:$i/sbin;
             done
-            
+
             ${
               let
                 set' = mapAttrs (n: v: if builtins.isString v then noDepEntry v else v) set;
@@ -87,14 +89,6 @@ in
 
   config = {
 
-    system.activationScripts.systemConfig =
-      ''
-        systemConfig="$1"
-        if test -z "$systemConfig"; then
-          systemConfig="/system" # for the installation CD
-        fi
-      '';
-
     system.activationScripts.stdio =
       ''
         # Needed by some programs.
diff --git a/modules/system/activation/top-level.nix b/modules/system/activation/top-level.nix
index f2bbbc5ffb0..36f8b05c9d2 100644
--- a/modules/system/activation/top-level.nix
+++ b/modules/system/activation/top-level.nix
@@ -102,9 +102,15 @@ let
       if [ -n "$grub" ]; then 
         ln -s $grub $out/grub
       fi
+      
       ln -s ${config.system.build.bootStage2} $out/init
       ln -s ${config.system.build.initialRamdisk}/initrd $out/initrd
-      ln -s ${config.system.activationScripts.script} $out/activate
+      
+      echo "$activationScript" > $out/activate
+      substituteInPlace $out/activate --subst-var out
+      chmod u+x $out/activate
+      unset activationScript
+      
       ln -s ${config.system.build.etc}/etc $out/etc
       ln -s ${config.system.path} $out/sw
       ln -s ${config.system.build.upstart} $out/upstart
@@ -116,7 +122,7 @@ let
 
       mkdir $out/fine-tune
       childCount=0;
-      for i in $children; do 
+      for i in $children; do
         childCount=$(( childCount + 1 ));
         ln -s $i $out/fine-tune/child-$childCount;
       done
@@ -142,6 +148,7 @@ let
       config.boot.kernelParams ++ config.boot.extraKernelParams;
     menuBuilder = config.system.build.menuBuilder;
     initScriptBuilder = config.system.build.initScriptBuilder;
+    activationScript = config.system.activationScripts.script;
     # Most of these are needed by grub-install.
     path = [
       pkgs.coreutils
diff --git a/modules/system/boot/stage-2-init.sh b/modules/system/boot/stage-2-init.sh
index 834ad9548ed..9a1d49c981c 100644
--- a/modules/system/boot/stage-2-init.sh
+++ b/modules/system/boot/stage-2-init.sh
@@ -153,7 +153,7 @@ fi
 # Run the script that performs all configuration activation that does
 # not have to be done at boot time.
 echo "running activation script..."
-@activateConfiguration@ "$systemConfig"
+"$systemConfig"/activate
 
 
 # Record the boot configuration.
diff --git a/modules/system/boot/stage-2.nix b/modules/system/boot/stage-2.nix
index 279f454c5db..8934a33cd04 100644
--- a/modules/system/boot/stage-2.nix
+++ b/modules/system/boot/stage-2.nix
@@ -43,7 +43,7 @@ let
   bootStage2 = substituteAll {
     src = ./stage-2-init.sh;
     isExecutable = true;
-    inherit kernel activateConfiguration;
+    inherit kernel;
     inherit (config.boot) devShmSize;
     ttyGid = config.ids.gids.tty;
     upstart = config.system.build.upstart;
diff --git a/modules/system/etc/etc.nix b/modules/system/etc/etc.nix
index 3dec801b407..7a764a8397b 100644
--- a/modules/system/etc/etc.nix
+++ b/modules/system/etc/etc.nix
@@ -55,7 +55,7 @@ in
 
   system.build.etc = etc;
 
-  system.activationScripts.etc = stringAfter [ "systemConfig" "stdio" ]
+  system.activationScripts.etc = stringAfter [ "stdio" ]
     ''
       # Set up the statically computed bits of /etc.
       echo "setting up /etc..."
diff --git a/modules/testing/test-instrumentation.nix b/modules/testing/test-instrumentation.nix
index 5ff7201acd3..610d5fcc832 100644
--- a/modules/testing/test-instrumentation.nix
+++ b/modules/testing/test-instrumentation.nix
@@ -82,8 +82,8 @@ in
     jobs.klogd.preStart = "dmesg -c > /dev/null";
 
     # Prevent tests from accessing the Internet.
-    networking.defaultGateway = mkOverrideTemplate 150 {} "";
-    networking.nameservers = mkOverrideTemplate 150 {} [ ];
+    networking.defaultGateway = mkOverride 150 "";
+    networking.nameservers = mkOverride 150 [ ];
 
     # Require a patch to the kernel to increase the 15s CIFS timeout.
     assertions =
-- 
GitLab


From 245df33c6c158eed36d9ee17fa41944437d536d0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Mon, 13 Sep 2010 20:52:49 +0000
Subject: [PATCH 2600/5331] Making the system tarballs of fuloong and
 sheevaplug reference the proper nixpkgs, and not that of /etc/...

svn path=/nixos/branches/stdenv-updates/; revision=23772
---
 modules/installer/cd-dvd/system-tarball-fuloong2f.nix  | 2 +-
 modules/installer/cd-dvd/system-tarball-sheevaplug.nix | 4 +---
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/modules/installer/cd-dvd/system-tarball-fuloong2f.nix b/modules/installer/cd-dvd/system-tarball-fuloong2f.nix
index 8ef112cc476..72b358f846d 100644
--- a/modules/installer/cd-dvd/system-tarball-fuloong2f.nix
+++ b/modules/installer/cd-dvd/system-tarball-fuloong2f.nix
@@ -147,6 +147,6 @@ in
   system.boot.loader.kernelFile = "/vmlinux";
 
   nixpkgs.config = {
-    platform = (import /etc/nixos/nixpkgs/pkgs/top-level/platforms.nix).fuloong2f_n32;
+    platform = pkgs.platforms.fuloong2f_n32;
   };
 }
diff --git a/modules/installer/cd-dvd/system-tarball-sheevaplug.nix b/modules/installer/cd-dvd/system-tarball-sheevaplug.nix
index b834ae3ab3d..745e756a0b4 100644
--- a/modules/installer/cd-dvd/system-tarball-sheevaplug.nix
+++ b/modules/installer/cd-dvd/system-tarball-sheevaplug.nix
@@ -183,8 +183,6 @@ in
   jobs.openssh.startOn = pkgs.lib.mkOverride 50 {} "";
 
   nixpkgs.config = {
-    packageOverrides = pkgs : rec {
-    };
-    platform = (import /etc/nixos/nixpkgs/pkgs/top-level/platforms.nix).sheevaplug;
+    platform = pkgs.platforms.sheevaplug;
   };
 }
-- 
GitLab


From c4f910f55015b150bebe3d3ecdea76c1aa8bbcca Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 13 Sep 2010 22:10:25 +0000
Subject: [PATCH 2601/5331] * Substitute the path of the system derivation
 directly in the stage 2   init script.  This removes the need for the
 `systemConfig' boot   parameter; `init=<stage-2-init>' is enough.  However,
 the GRUB menu   builder still needs to add `systemConfig' to the kernel
 command line   for compatibility with old configurations.

svn path=/nixos/trunk/; revision=23775
---
 modules/installer/cd-dvd/iso-image.nix      | 10 +++----
 modules/installer/cd-dvd/system-tarball.nix | 10 ++-----
 modules/system/activation/top-level.nix     |  4 ++-
 modules/system/boot/stage-2-init.sh         | 30 ++++++---------------
 modules/virtualisation/qemu-vm.nix          |  2 +-
 5 files changed, 18 insertions(+), 38 deletions(-)

diff --git a/modules/installer/cd-dvd/iso-image.nix b/modules/installer/cd-dvd/iso-image.nix
index 15ac3449207..8117d8631f5 100644
--- a/modules/installer/cd-dvd/iso-image.nix
+++ b/modules/installer/cd-dvd/iso-image.nix
@@ -174,11 +174,9 @@ in
   # Closures to be copied to the Nix store on the CD, namely the init
   # script and the top-level system configuration directory.
   isoImage.storeContents =
-    [ config.system.build.bootStage2
-      config.system.build.toplevel
-    ] ++ 
-    (optional config.isoImage.includeSystemBuildDependencies
-      config.system.build.toplevel.drvPath);
+    [ config.system.build.toplevel ] ++ 
+    optional config.isoImage.includeSystemBuildDependencies
+      config.system.build.toplevel.drvPath;
 
   # Create the squashfs image that contains the Nix store.
   system.build.squashfsStore = import ../../../lib/make-squashfs.nix {
@@ -220,7 +218,7 @@ in
   boot.loader.grub.extraEntries =
     ''
       menuentry "NixOS Installer / Rescue" {
-        linux /boot/bzImage init=${config.system.build.bootStage2} systemConfig=${config.system.build.toplevel} ${toString config.boot.kernelParams}
+        linux /boot/bzImage init=${config.system.build.toplevel}/init ${toString config.boot.kernelParams}
         initrd /boot/initrd
       }
 
diff --git a/modules/installer/cd-dvd/system-tarball.nix b/modules/installer/cd-dvd/system-tarball.nix
index 70bb12eac00..5ca6b0e9fef 100644
--- a/modules/installer/cd-dvd/system-tarball.nix
+++ b/modules/installer/cd-dvd/system-tarball.nix
@@ -34,8 +34,7 @@ let
   # A clue for the uboot loading
   ubootKernelParams = pkgs.writeText "uboot-kernel-params.txt" ''
     Kernel Parameters:
-      init=${config.system.build.bootStage2}
-      systemConfig=${config.system.build.toplevel}
+      init=${config.system.build.toplevel}/init
       ${toString config.boot.kernelParams}
   '';
 
@@ -70,12 +69,7 @@ in
   # Closures to be copied to the Nix store on the CD, namely the init
   # script and the top-level system configuration directory.
   tarball.storeContents =
-    [ {
-        object = config.system.build.bootStage2;
-        symlink = "none";
-      }
-      {
-        object = config.system.build.toplevel;
+    [ { object = config.system.build.toplevel;
         symlink = "/var/run/current-system";
       }
     ];
diff --git a/modules/system/activation/top-level.nix b/modules/system/activation/top-level.nix
index 36f8b05c9d2..92615c78f32 100644
--- a/modules/system/activation/top-level.nix
+++ b/modules/system/activation/top-level.nix
@@ -103,13 +103,15 @@ let
         ln -s $grub $out/grub
       fi
       
-      ln -s ${config.system.build.bootStage2} $out/init
       ln -s ${config.system.build.initialRamdisk}/initrd $out/initrd
       
       echo "$activationScript" > $out/activate
       substituteInPlace $out/activate --subst-var out
       chmod u+x $out/activate
       unset activationScript
+
+      cp ${config.system.build.bootStage2} $out/init
+      substituteInPlace $out/init --subst-var-by systemConfig $out
       
       ln -s ${config.system.build.etc}/etc $out/etc
       ln -s ${config.system.path} $out/sw
diff --git a/modules/system/boot/stage-2-init.sh b/modules/system/boot/stage-2-init.sh
index 9a1d49c981c..b00baf8a075 100644
--- a/modules/system/boot/stage-2-init.sh
+++ b/modules/system/boot/stage-2-init.sh
@@ -1,6 +1,6 @@
 #! @shell@
 
-# !!! copied from stage 1; remove duplication
+systemConfig=@systemConfig@
 
 
 # Print a greeting.
@@ -56,11 +56,6 @@ rm -f /etc/mtab* # not that we care about stale locks
 cat /proc/mounts > /etc/mtab
 
 
-# If no `systemConfig' parameter is specified on the kernel command
-# line, use a fallback.
-systemConfig=/nix/var/nix/profiles/system
-
-
 # Process the kernel command line.
 for o in $(cat /proc/cmdline); do
     case $o in
@@ -79,10 +74,6 @@ for o in $(cat /proc/cmdline); do
         safemode)
             safeMode=1
             ;;
-        systemConfig=*)
-            set -- $(IFS==; echo $o)
-            systemConfig=$2
-            ;;
         resume=*)
             set -- $(IFS==; echo $o)
             resumeDevice=$2
@@ -90,8 +81,6 @@ for o in $(cat /proc/cmdline); do
     esac
 done
 
-systemConfig="$(readlink -f "$systemConfig")"
-
 
 # More special file systems, initialise required directories.
 mkdir -m 0777 /dev/shm
@@ -153,19 +142,16 @@ fi
 # Run the script that performs all configuration activation that does
 # not have to be done at boot time.
 echo "running activation script..."
-"$systemConfig"/activate
+$systemConfig/activate
 
 
 # Record the boot configuration.
-if test -n "$systemConfig"; then
-    ln -sfn "$systemConfig" /var/run/booted-system
-
-    # Prevent the booted system form being garbage-collected
-    # If it weren't a gcroot, if we were running a different kernel,
-    # switched system, and garbage collected all, we could not load
-    # kernel modules anymore.
-    ln -sfn /var/run/booted-system /nix/var/nix/gcroots/booted-system
-fi
+ln -sfn "$systemConfig" /var/run/booted-system
+
+# Prevent the booted system form being garbage-collected If it weren't
+# a gcroot, if we were running a different kernel, switched system,
+# and garbage collected all, we could not load kernel modules anymore.
+ln -sfn /var/run/booted-system /nix/var/nix/gcroots/booted-system
 
 
 # Ensure that the module tools can find the kernel modules.
diff --git a/modules/virtualisation/qemu-vm.nix b/modules/virtualisation/qemu-vm.nix
index cac221d8c22..005e4ebfb54 100644
--- a/modules/virtualisation/qemu-vm.nix
+++ b/modules/virtualisation/qemu-vm.nix
@@ -167,7 +167,7 @@ let
             -drive file=$NIX_DISK_IMAGE,if=virtio,boot=on,cache=writeback,werror=report \
             -kernel ${config.system.build.toplevel}/kernel \
             -initrd ${config.system.build.toplevel}/initrd \
-            -append "$(cat ${config.system.build.toplevel}/kernel-params) init=${config.system.build.bootStage2} systemConfig=${config.system.build.toplevel} regInfo=${regInfo} ${kernelConsole} $QEMU_KERNEL_PARAMS" \
+            -append "$(cat ${config.system.build.toplevel}/kernel-params) init=${config.system.build.toplevel}/init regInfo=${regInfo} ${kernelConsole} $QEMU_KERNEL_PARAMS" \
           ''} \
           ${qemuGraphics} \
           $QEMU_OPTS \
-- 
GitLab


From ea4d3e2c8c35f2060677c18df45143efd0f9d4df Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 14 Sep 2010 11:17:48 +0000
Subject: [PATCH 2602/5331] * Don't run dhclient on Xen's peth* devices.

svn path=/nixos/trunk/; revision=23779
---
 modules/services/networking/dhclient.nix | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/modules/services/networking/dhclient.nix b/modules/services/networking/dhclient.nix
index 7b334a8e51e..bd3f781c19a 100644
--- a/modules/services/networking/dhclient.nix
+++ b/modules/services/networking/dhclient.nix
@@ -78,9 +78,13 @@ in
 
             for i in $(cd /sys/class/net && ls -d *); do
                 # Only run dhclient on interfaces of type ARPHRD_ETHER
-                # (1), i.e. Ethernet.
-                if [ "$(cat /sys/class/net/$i/type)" = 1 ]; then 
-                    if ! for j in ${toString ignoredInterfaces}; do echo $j; done | grep -F -x -q "$i"; then
+                # (1), i.e. Ethernet.  Ignore peth* devices; on Xen,
+                # they're renamed physical Ethernet cards used for
+                # bridging.
+                if [ "$(cat /sys/class/net/$i/type)" = 1 ]; then
+                    if ! for j in ${toString ignoredInterfaces}; do echo $j; done | grep -F -x -q "$i" &&
+                       ! echo "$i" | grep -x -q "peth.*";
+		    then
                         echo "Running dhclient on $i"
                         interfaces="$interfaces $i"
                     fi
-- 
GitLab


From 8a6fad83f421bac4c59e1a0d424d1be49ababa35 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 14 Sep 2010 11:22:17 +0000
Subject: [PATCH 2603/5331] * Add a job attribute (path) to allow adding
 packages to the job's   $PATH environment variable.

svn path=/nixos/trunk/; revision=23780
---
 modules/system/upstart/upstart.nix | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/modules/system/upstart/upstart.nix b/modules/system/upstart/upstart.nix
index cb3975e694c..535e612ed32 100644
--- a/modules/system/upstart/upstart.nix
+++ b/modules/system/upstart/upstart.nix
@@ -39,7 +39,8 @@ let
           
           ${optionalString (job.stopOn != "") "stop on ${job.stopOn}"}
 
-          env PATH=${makeSearchPath "bin" upstartPath}:${makeSearchPath "sbin" upstartPath}
+          env PATH=${makeSearchPath "bin" (job.path ++ upstartPath)}:${makeSearchPath "sbin" (job.path ++ upstartPath)}
+
           ${concatMapStrings (n: "env ${n}=\"${getAttr n job.environment}\"\n") (attrNames job.environment)}
           
           ${optionalString (job.preStart != "") ''
@@ -271,6 +272,15 @@ let
       '';
     };
 
+    path = mkOption {
+      default = [ ];
+      description = ''
+        Packages added to the job's <envar>PATH</envar> environment variable.
+        Both the <filename>bin</filename> and <filename>sbin</filename> 
+        subdirectories of each package are added.
+      '';
+    };
+
   };
 
   
-- 
GitLab


From 72d9235992deb21169a1001f823c93627adc2f96 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 14 Sep 2010 11:22:50 +0000
Subject: [PATCH 2604/5331] * Added an Upstart job for the Xen control daemon
 (xend).

svn path=/nixos/trunk/; revision=23781
---
 modules/virtualisation/xen.nix | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/modules/virtualisation/xen.nix b/modules/virtualisation/xen.nix
index f0ac5944e42..b4e6a07e6ed 100644
--- a/modules/virtualisation/xen.nix
+++ b/modules/virtualisation/xen.nix
@@ -57,6 +57,8 @@ let cfg = config.virtualisation.xen; in
     # Domain 0 requires a pvops-enabled kernel.
     boot.kernelPackages = pkgs.linuxPackages_2_6_32_xen;
 
+    boot.kernelModules = [ "xen_evtchn" "xen_gntdev" ];
+
     # The radeonfb kernel module causes the screen to go black as soon
     # as it's loaded, so don't load it.
     boot.blacklistedKernelModules = [ "radeonfb" ];
@@ -80,6 +82,21 @@ let cfg = config.virtualisation.xen; in
         fi
       '';
 
+    jobs.xend =
+      { description = "Xen control daemon";
+
+        startOn = "stopped udevtrigger";
+
+        path = 
+          [ pkgs.bridge_utils pkgs.gawk pkgs.iproute pkgs.nettools 
+            pkgs.utillinux pkgs.bash pkgs.xen pkgs.pciutils pkgs.procps
+          ];
+
+        preStart = "${pkgs.xen}/sbin/xend start";
+
+        postStop = "${pkgs.xen}/sbin/xend stop";
+      };
+
   };
 
 }
-- 
GitLab


From 071b192c9d48984c78aec75c05251eeeaa5e2d1e Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 14 Sep 2010 11:58:06 +0000
Subject: [PATCH 2605/5331] * Start dhclient after xend.

svn path=/nixos/trunk/; revision=23782
---
 modules/virtualisation/xen.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/modules/virtualisation/xen.nix b/modules/virtualisation/xen.nix
index b4e6a07e6ed..095ce6b78df 100644
--- a/modules/virtualisation/xen.nix
+++ b/modules/virtualisation/xen.nix
@@ -97,6 +97,11 @@ let cfg = config.virtualisation.xen; in
         postStop = "${pkgs.xen}/sbin/xend stop";
       };
 
+    # To prevent a race between dhclient and xend's bridge setup
+    # script (which renames eth* to peth* and recreates eth* as a
+    # virtual device), start dhclient after xend.
+    jobs.dhclient.startOn = mkOverride 50 "started xend";
+
   };
 
 }
-- 
GitLab


From 5b3fd663ed04f9c6fa87dac755df6c7e0b8520a9 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 14 Sep 2010 11:58:55 +0000
Subject: [PATCH 2606/5331] * Don't set hostname to "", dhclient no longer
 needs it.

svn path=/nixos/trunk/; revision=23783
---
 modules/tasks/network-interfaces.nix | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/modules/tasks/network-interfaces.nix b/modules/tasks/network-interfaces.nix
index 2e1514a82cf..562a945d832 100644
--- a/modules/tasks/network-interfaces.nix
+++ b/modules/tasks/network-interfaces.nix
@@ -211,14 +211,9 @@ in
     # it's not configured in the NixOS configuration, since it may
     # have been set by dhclient in the meantime.
     system.activationScripts.hostname =
-      (if config.networking.hostName != "" then ''
+      optionalString (config.networking.hostName != "") ''
         hostname "${config.networking.hostName}"
-      '' else ''
-        # dhclient won't do anything if the hostname isn't empty.
-        if test "$(hostname)" = "(none)"; then
-          hostname ""
-        fi
-      '');
+      '';
 
   };
   
-- 
GitLab


From 7672c36a70436841cfa25a620cc08c60cf3bd919 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Wed, 15 Sep 2010 21:36:56 +0000
Subject: [PATCH 2607/5331] Trying to get system-tarball-pc build properly.

svn path=/nixos/branches/stdenv-updates/; revision=23814
---
 modules/installer/cd-dvd/system-tarball.nix | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/modules/installer/cd-dvd/system-tarball.nix b/modules/installer/cd-dvd/system-tarball.nix
index e5902de05e9..3418afc9c3d 100644
--- a/modules/installer/cd-dvd/system-tarball.nix
+++ b/modules/installer/cd-dvd/system-tarball.nix
@@ -38,13 +38,6 @@ in
 {
   require = options;
 
-  # Don't build the GRUB menu builder script, since we don't need it
-  # here and it causes a cyclic dependency.
-  boot.loader.grub.enable = false;
-
-  # !!! Hack - attributes expected by other modules.
-  system.build.menuBuilder = "true";
-
   # In stage 1 of the boot, mount the CD/DVD as the root FS by label
   # so that we don't need to know its device.
   fileSystems =
-- 
GitLab


From dc8eff071aa4cd924a38fb22ed94ee338c3ec135 Mon Sep 17 00:00:00 2001
From: Evgeny Egorochkin <phreedom.stdin@gmail.com>
Date: Thu, 16 Sep 2010 02:06:44 +0000
Subject: [PATCH 2608/5331] Added Folding@Home service

svn path=/nixos/trunk/; revision=23816
---
 modules/misc/ids.nix                      |  1 +
 modules/module-list.nix                   |  1 +
 modules/services/misc/folding-at-home.nix | 75 +++++++++++++++++++++++
 3 files changed, 77 insertions(+)
 create mode 100644 modules/services/misc/folding-at-home.nix

diff --git a/modules/misc/ids.nix b/modules/misc/ids.nix
index 11f41aa0827..f69ae2f3b9f 100644
--- a/modules/misc/ids.nix
+++ b/modules/misc/ids.nix
@@ -56,6 +56,7 @@ in
     sabnzbd = 33;
     tor = 35;
     cups = 36;
+    foldingAtHome = 37;
     # When adding a uid, make sure it doesn't match an existing gid.
 
     nixbld = 30000; # start of range of uids
diff --git a/modules/module-list.nix b/modules/module-list.nix
index 973c3a3e493..29c2101b707 100644
--- a/modules/module-list.nix
+++ b/modules/module-list.nix
@@ -62,6 +62,7 @@
   ./services/misc/autofs.nix
   ./services/misc/disnix.nix
   ./services/misc/felix.nix
+  ./services/misc/folding-at-home.nix
   ./services/misc/gpsd.nix
   ./services/misc/nix-daemon.nix
   ./services/misc/nix-gc.nix
diff --git a/modules/services/misc/folding-at-home.nix b/modules/services/misc/folding-at-home.nix
new file mode 100644
index 00000000000..691b752c63c
--- /dev/null
+++ b/modules/services/misc/folding-at-home.nix
@@ -0,0 +1,75 @@
+{ config, pkgs, ... }:
+with pkgs.lib;
+let
+  stateDir = "/var/lib/foldingathome";
+  cfg = config.services.foldingAtHome;
+  fahUser = "foldingathome";
+in {
+
+  ###### interface
+  
+  options = {
+  
+    services.foldingAtHome = {
+
+      enable = mkOption {
+        default = false;
+        description = ''
+          Whether to enable the Folding@Home to use idle CPU time.
+        '';
+      };
+
+      nickname = mkOption {
+        default = "Anonymous";
+        description = ''
+          A unique handle for statistics.
+        '';
+      };
+
+      config = mkOption {
+        default = "";
+        description = ''
+          Extra configuration. Contents will be added verbatim to the 
+          configuration file.
+        '';
+      };
+
+    };
+
+  };
+
+  ###### implementation
+
+  config = mkIf cfg.enable {
+    environment.systemPackages = [ pkgs.foldingathome ];
+
+    users.extraUsers = singleton
+      { name = fahUser;
+        uid = config.ids.uids.foldingAtHome;
+        description = "Folding@Home user";
+        home = stateDir;
+      };
+
+    jobs.foldingAtHome =
+      { name = "foldingathome";
+
+        startOn = "started network-interfaces";
+        stopOn = "stopping network-interfaces";
+
+        preStart =
+          ''
+            mkdir -m 0755 -p ${stateDir}
+            chown ${fahUser} ${stateDir}
+            cp -f ${pkgs.writeText "client.cfg" cfg.config} ${stateDir}/client.cfg
+          '';
+        exec = "${pkgs.su}/bin/su -s ${pkgs.stdenv.shell} ${fahUser} -c 'cd ${stateDir}; ${pkgs.foldingathome}/bin/fah6'";
+      };
+
+      services.foldingAtHome.config = ''
+          [settings]
+          username=${cfg.nickname}
+      '';
+
+  };
+
+}
\ No newline at end of file
-- 
GitLab


From 82f97b5fb2cb05693d549eedb0d10c143f8cf0fb Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 16 Sep 2010 15:23:12 +0000
Subject: [PATCH 2609/5331] * Allow modules to add packages to the $PATH seen
 by programs called   from udev rules.  This is slightly tricky because udev
 has a   512-character limit on environment variables, so we create a symlink 
  tree to work around this.

svn path=/nixos/trunk/; revision=23822
---
 modules/services/hardware/udev.nix | 26 +++++++++++++++++++++++---
 1 file changed, 23 insertions(+), 3 deletions(-)

diff --git a/modules/services/hardware/udev.nix b/modules/services/hardware/udev.nix
index c3661e0c0b5..e84150d2492 100644
--- a/modules/services/hardware/udev.nix
+++ b/modules/services/hardware/udev.nix
@@ -38,7 +38,7 @@ let
       cp -v ${udev}/libexec/rules.d/*.rules $out/
 
       # Set a reasonable $PATH for programs called by udev rules.
-      echo 'ENV{PATH}="${pkgs.coreutils}/bin:${pkgs.gnused}/bin:${pkgs.utillinux}/bin"' > $out/00-path.rules
+      echo 'ENV{PATH}="${udevPath}/bin:${udevPath}/sbin"' > $out/00-path.rules
 
       # Set the firmware search path so that the firmware.sh helper
       # called by 50-firmware.rules works properly.
@@ -84,6 +84,15 @@ let
     #udev_log="debug"
   '';
 
+  # Udev has a 512-character limit for ENV{PATH}, so create a symlink
+  # tree to work around this.
+  udevPath = pkgs.buildEnv {
+    name = "udev-path";
+    paths = cfg.path;
+    pathsToLink = [ "/bin" "/sbin" ];
+    ignoreCollisions = true;
+  };
+
 in
 
 {
@@ -118,6 +127,15 @@ in
         '';
       };
 
+      path = mkOption {
+        default = [];
+        merge = mergeListOption;
+        description = ''
+          Packages added to the <envar>PATH</envar> environment variable when
+          executing programs from Udev rules.
+        '';
+      };
+
       extraRules = mkOption {
         default = "";
         example = ''
@@ -159,7 +177,9 @@ in
 
     services.udev.extraRules = nixosRules;
     
-    services.udev.packages = [extraUdevRules];
+    services.udev.packages = [ extraUdevRules ];
+
+    services.udev.path = [ pkgs.coreutils pkgs.gnused pkgs.gnugrep pkgs.utillinux ];
 
     jobs.udev =
       { startOn = "startup";
@@ -207,7 +227,7 @@ in
             initctl emit -n new-devices
           '';
       };
-      
+
   };
 
 }
-- 
GitLab


From 0442e7e82adbc767afee2601680be47fa1d8f25b Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 16 Sep 2010 15:24:46 +0000
Subject: [PATCH 2610/5331] * Add Xen's udev rules.  This is necessary to get
 automatically   created block and network devices to work.

svn path=/nixos/trunk/; revision=23823
---
 modules/virtualisation/xen.nix | 41 ++++++++++++++++++++++++++++------
 1 file changed, 34 insertions(+), 7 deletions(-)

diff --git a/modules/virtualisation/xen.nix b/modules/virtualisation/xen.nix
index 095ce6b78df..95c777b17c9 100644
--- a/modules/virtualisation/xen.nix
+++ b/modules/virtualisation/xen.nix
@@ -4,7 +4,20 @@
 
 with pkgs.lib;
 
-let cfg = config.virtualisation.xen; in
+let 
+
+  cfg = config.virtualisation.xen; 
+
+  xen = pkgs.xen;
+
+  xendConfig = pkgs.writeText "xend-config.sxp"
+    ''
+      (loglevel DEBUG)
+      (network-script network-bridge)
+      (vif-script vif-bridge)
+    '';
+
+in
 
 {
   ###### interface
@@ -52,12 +65,12 @@ let cfg = config.virtualisation.xen; in
 
   config = mkIf cfg.enable {
 
-    environment.systemPackages = [ pkgs.xen ];
+    environment.systemPackages = [ xen ];
 
     # Domain 0 requires a pvops-enabled kernel.
     boot.kernelPackages = pkgs.linuxPackages_2_6_32_xen;
 
-    boot.kernelModules = [ "xen_evtchn" "xen_gntdev" ];
+    boot.kernelModules = [ "xen_evtchn" "xen_gntdev" "xen_blkback" "xen_netback" "xen_pciback" "blktap" ];
 
     # The radeonfb kernel module causes the screen to go black as soon
     # as it's loaded, so don't load it.
@@ -69,7 +82,7 @@ let cfg = config.virtualisation.xen; in
 
     system.extraSystemBuilderCmds =
       ''
-        ln -s ${pkgs.xen}/boot/xen.gz $out/xen.gz
+        ln -s ${xen}/boot/xen.gz $out/xen.gz
         echo "${toString cfg.bootParams}" > $out/xen-params
       '';
 
@@ -89,12 +102,12 @@ let cfg = config.virtualisation.xen; in
 
         path = 
           [ pkgs.bridge_utils pkgs.gawk pkgs.iproute pkgs.nettools 
-            pkgs.utillinux pkgs.bash pkgs.xen pkgs.pciutils pkgs.procps
+            pkgs.utillinux pkgs.bash xen pkgs.pciutils pkgs.procps
           ];
 
-        preStart = "${pkgs.xen}/sbin/xend start";
+        preStart = "${xen}/sbin/xend start";
 
-        postStop = "${pkgs.xen}/sbin/xend stop";
+        postStop = "${xen}/sbin/xend stop";
       };
 
     # To prevent a race between dhclient and xend's bridge setup
@@ -102,6 +115,20 @@ let cfg = config.virtualisation.xen; in
     # virtual device), start dhclient after xend.
     jobs.dhclient.startOn = mkOverride 50 "started xend";
 
+    environment.etc =
+      [ { source = xendConfig;
+          target = "xen/xend-config.sxp";
+        }
+        { source = "${xen}/etc/xen/scripts";
+          target = "xen/scripts";
+        }
+      ];
+
+    # Xen provides udev rules.
+    services.udev.packages = [ xen ];
+
+    services.udev.path = [ pkgs.bridge_utils pkgs.iproute ];
+
   };
 
 }
-- 
GitLab


From 83d012ba13c03ec373baa2b4cc0abbf8b6674e7d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Thu, 16 Sep 2010 19:24:52 +0000
Subject: [PATCH 2611/5331] Trying to fix again system-tarball-pc (again, the
 kernel file name)

svn path=/nixos/branches/stdenv-updates/; revision=23824
---
 modules/installer/cd-dvd/system-tarball-pc.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/installer/cd-dvd/system-tarball-pc.nix b/modules/installer/cd-dvd/system-tarball-pc.nix
index 0c0069c6058..49d0e4eea54 100644
--- a/modules/installer/cd-dvd/system-tarball-pc.nix
+++ b/modules/installer/cd-dvd/system-tarball-pc.nix
@@ -171,8 +171,8 @@ in
   tarball.storeContents = pkgs2storeContents [ pkgs.stdenv pkgs.klibc pkgs.klibcShrunk ];
 
   tarball.contents =
-    [ { source = config.boot.kernelPackages.kernel + "/vmlinuz";
-        target = "/boot/vmlinuz";
+    [ { source = config.boot.kernelPackages.kernel + config.system.boot.loader.kernelFile;
+        target = "/boot/" + config.system.boot.loader.kernelFile;
       }
     ];
      
-- 
GitLab


From 3b216865d22301a0b7b85a0f34198704b9849923 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Thu, 16 Sep 2010 19:25:29 +0000
Subject: [PATCH 2612/5331] Writing better some sheevaplug system-tarball lines
 (kernel parameters in a single line, for example)

svn path=/nixos/branches/stdenv-updates/; revision=23825
---
 modules/installer/cd-dvd/system-tarball-sheevaplug.nix | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/modules/installer/cd-dvd/system-tarball-sheevaplug.nix b/modules/installer/cd-dvd/system-tarball-sheevaplug.nix
index 745e756a0b4..5eb0cd503d7 100644
--- a/modules/installer/cd-dvd/system-tarball-sheevaplug.nix
+++ b/modules/installer/cd-dvd/system-tarball-sheevaplug.nix
@@ -39,12 +39,10 @@ let
     };
   };
 
-  # A clue for the uboot loading
+  # A clue for the kernel loading
   kernelParams = pkgs.writeText "kernel-params.txt" ''
     Kernel Parameters:
-      init=${config.system.build.bootStage2}
-      systemConfig=${config.system.build.toplevel}
-      ${toString config.boot.kernelParams}
+      init=${config.system.build.bootStage2} systemConfig=${config.system.build.toplevel} ${toString config.boot.kernelParams}
   '';
 
   
-- 
GitLab


From 743b75fbaf69f01e4ca75016e66d9db80bb2456d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Thu, 16 Sep 2010 19:26:34 +0000
Subject: [PATCH 2613/5331] Making the fuloong2f system-tarball more specific
 for the fuloong, so, helping in how to use the system more easily.

svn path=/nixos/branches/stdenv-updates/; revision=23826
---
 .../cd-dvd/system-tarball-fuloong2f.nix       | 46 ++++++++++++++++++-
 1 file changed, 44 insertions(+), 2 deletions(-)

diff --git a/modules/installer/cd-dvd/system-tarball-fuloong2f.nix b/modules/installer/cd-dvd/system-tarball-fuloong2f.nix
index 72b358f846d..127b6d30bc7 100644
--- a/modules/installer/cd-dvd/system-tarball-fuloong2f.nix
+++ b/modules/installer/cd-dvd/system-tarball-fuloong2f.nix
@@ -17,9 +17,11 @@ let
       {
         require = [ ];
 
-        # Add your own options below and run "nixos-rebuild switch".
+        # Add your own options below
         # E.g.,
         #   services.openssh.enable = true;
+
+        nixpkgs.config.platform = pkgs.platforms.fuloong2f_n32;
       }
     '';
   
@@ -35,6 +37,20 @@ let
       '';
     };
   };
+
+  # A clue for the kernel loading
+  kernelParams = pkgs.writeText "kernel-params.txt" ''
+    Kernel Parameters:
+      init=/boot/init systemConfig=/boot/init ${toString config.boot.kernelParams}
+  '';
+
+  # System wide nixpkgs config
+  nixpkgsUserConfig = pkgs.writeText "config.nix" ''
+    pkgs:
+    {
+      platform = pkgs.platforms.fuloong2f_n32;
+    }
+  '';
   
 in
 
@@ -101,6 +117,7 @@ in
     [ "vfat" "reiserfs" ];
 
   boot.kernelPackages = pkgs.linuxPackages_2_6_35;
+  boot.kernelParams = [ "console=tty" ];
 
   boot.initrd.kernelModules =
     [ # Wait for SCSI devices to appear.
@@ -131,7 +148,29 @@ in
 
   # To speed up further installation of packages, include the complete stdenv
   # in the Nix store of the tarball.
-  tarball.storeContents = pkgs2storeContents [ pkgs.stdenv ];
+  tarball.storeContents = pkgs2storeContents [ pkgs.stdenv ]
+    ++ [
+      {
+        object = config.system.build.bootStage2;
+        symlink = "/boot/init";
+      }
+      {
+        object = config.system.build.toplevel;
+        symlink = "/boot/system";
+      }
+    ];
+
+  tarball.contents = [
+    { source = kernelParams;
+      target = "/kernelparams.txt";
+    }
+    { source = config.boot.kernelPackages.kernel + config.system.boot.loader.kernelFile;
+      target = "/boot/vmlinux";
+    }
+    { source = nixpkgsUserConfig;
+      target = "/root/.nixpkgs/config.nix";
+    }
+  ];
 
   # Allow sshd to be started manually through "start sshd".  It should
   # not be started by default on the installation CD because the
@@ -146,6 +185,9 @@ in
   boot.loader.generationsDir.enable = false;
   system.boot.loader.kernelFile = "/vmlinux";
 
+  # Needed for nixos to evaluate
+  system.build.menuBuilder = "true";
+
   nixpkgs.config = {
     platform = pkgs.platforms.fuloong2f_n32;
   };
-- 
GitLab


From c1e4586ed1a7f68fc2e0de0f0df9f8c84f463fd6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Fri, 17 Sep 2010 17:25:46 +0000
Subject: [PATCH 2614/5331] Again trying to get the kernelFile paths right

svn path=/nixos/branches/stdenv-updates/; revision=23836
---
 modules/installer/cd-dvd/system-tarball-fuloong2f.nix  | 6 +++---
 modules/installer/cd-dvd/system-tarball-pc.nix         | 2 +-
 modules/installer/cd-dvd/system-tarball-sheevaplug.nix | 6 +++---
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/modules/installer/cd-dvd/system-tarball-fuloong2f.nix b/modules/installer/cd-dvd/system-tarball-fuloong2f.nix
index 127b6d30bc7..41386069e73 100644
--- a/modules/installer/cd-dvd/system-tarball-fuloong2f.nix
+++ b/modules/installer/cd-dvd/system-tarball-fuloong2f.nix
@@ -164,8 +164,8 @@ in
     { source = kernelParams;
       target = "/kernelparams.txt";
     }
-    { source = config.boot.kernelPackages.kernel + config.system.boot.loader.kernelFile;
-      target = "/boot/vmlinux";
+    { source = config.boot.kernelPackages.kernel + "/" + config.system.boot.loader.kernelFile;
+      target = "/boot/" + config.system.boot.loader.kernelFile;
     }
     { source = nixpkgsUserConfig;
       target = "/root/.nixpkgs/config.nix";
@@ -183,7 +183,7 @@ in
 
   boot.loader.grub.enable = false;
   boot.loader.generationsDir.enable = false;
-  system.boot.loader.kernelFile = "/vmlinux";
+  system.boot.loader.kernelFile = "vmlinux";
 
   # Needed for nixos to evaluate
   system.build.menuBuilder = "true";
diff --git a/modules/installer/cd-dvd/system-tarball-pc.nix b/modules/installer/cd-dvd/system-tarball-pc.nix
index 49d0e4eea54..b81b7d5d0a9 100644
--- a/modules/installer/cd-dvd/system-tarball-pc.nix
+++ b/modules/installer/cd-dvd/system-tarball-pc.nix
@@ -171,7 +171,7 @@ in
   tarball.storeContents = pkgs2storeContents [ pkgs.stdenv pkgs.klibc pkgs.klibcShrunk ];
 
   tarball.contents =
-    [ { source = config.boot.kernelPackages.kernel + config.system.boot.loader.kernelFile;
+    [ { source = config.boot.kernelPackages.kernel + "/" + config.system.boot.loader.kernelFile;
         target = "/boot/" + config.system.boot.loader.kernelFile;
       }
     ];
diff --git a/modules/installer/cd-dvd/system-tarball-sheevaplug.nix b/modules/installer/cd-dvd/system-tarball-sheevaplug.nix
index 5eb0cd503d7..f50d4353b34 100644
--- a/modules/installer/cd-dvd/system-tarball-sheevaplug.nix
+++ b/modules/installer/cd-dvd/system-tarball-sheevaplug.nix
@@ -100,7 +100,7 @@ in
 
   boot.loader.grub.enable = false;
   boot.loader.generationsDir.enable = false;
-  system.boot.loader.kernelFile = "/uImage";
+  system.boot.loader.kernelFile = "uImage";
 
   boot.initrd.availableKernelModules =
     [ "mvsdio" "mmc_block" "reiserfs" "ext3" "ums-cypress" "rtc_mv"
@@ -165,8 +165,8 @@ in
     { source = kernelParams;
       target = "/kernelparams.txt";
     }
-    { source = config.boot.kernelPackages.kernel + config.system.boot.loader.kernelFile;
-      target = "/boot/uImage";
+    { source = config.boot.kernelPackages.kernel + "/" + config.system.boot.loader.kernelFile;
+      target = "/boot/" + config.system.boot.loader.kernelFile;
     }
     { source = pkgs.ubootSheevaplug;
       target = "/boot/uboot";
-- 
GitLab


From 1b4c811d41dfe359a042ba1adf66eb66949d902a Mon Sep 17 00:00:00 2001
From: Evgeny Egorochkin <phreedom.stdin@gmail.com>
Date: Sat, 18 Sep 2010 11:30:04 +0000
Subject: [PATCH 2615/5331] Added AMule daemon service

svn path=/nixos/trunk/; revision=23848
---
 modules/module-list.nix                |  1 +
 modules/services/networking/amuled.nix | 72 ++++++++++++++++++++++++++
 2 files changed, 73 insertions(+)
 create mode 100644 modules/services/networking/amuled.nix

diff --git a/modules/module-list.nix b/modules/module-list.nix
index 29c2101b707..9113d249ae8 100644
--- a/modules/module-list.nix
+++ b/modules/module-list.nix
@@ -78,6 +78,7 @@
   ./services/network-filesystems/nfs-kernel.nix
   ./services/network-filesystems/openafs-client/default.nix
   ./services/network-filesystems/samba.nix
+  ./services/networking/amuled.nix
   ./services/networking/avahi-daemon.nix
   ./services/networking/bind.nix
   ./services/networking/bitlbee.nix
diff --git a/modules/services/networking/amuled.nix b/modules/services/networking/amuled.nix
new file mode 100644
index 00000000000..5e60a824619
--- /dev/null
+++ b/modules/services/networking/amuled.nix
@@ -0,0 +1,72 @@
+{ config, pkgs, ... }:
+
+with pkgs.lib;
+
+let
+  cfg = config.services.amule;
+in
+
+{
+
+  ###### interface
+
+  options = {
+  
+    services.amule = {
+
+      enable = mkOption {
+        default = false;
+        description = ''
+          Whether to run the AMule daemon. You need to manually run "amuled --ec-config" to configure the service for the first time.
+        '';
+      };
+
+      dataDir = mkOption {
+        default = ''/home/${cfg.user}/'';
+        description = ''
+          The directory holding configuration, incoming and temporary files.
+        '';
+      };
+
+      user = mkOption {
+        default = "amule";
+        description = ''
+          The user the AMule daemon should run as.
+        '';
+      };
+
+    };
+
+  };
+  
+
+  ###### implementation
+
+  config = mkIf cfg.enable {
+
+    users.extraUsers = singleton
+      { name = cfg.user;
+        description = "AMule daemon";
+      };
+
+    jobs.amuled =
+      { description = "AMule daemon";
+
+        startOn = "ip-up";
+
+        preStart = ''
+            mkdir -p ${cfg.dataDir}
+            chown ${cfg.user} ${cfg.dataDir}
+        '';
+
+        exec = ''
+            ${pkgs.su}/bin/su -s ${pkgs.stdenv.shell} ${cfg.user} \
+                -c 'HOME="${cfg.dataDir}" ${pkgs.amuleDaemon}/bin/amuled'
+        '';
+      };
+
+    environment.systemPackages = [ pkgs.amuleDaemon ];
+
+  };
+  
+}
-- 
GitLab


From 259c007f703a11f0333fb426bec64aefdeabf5a9 Mon Sep 17 00:00:00 2001
From: Evgeny Egorochkin <phreedom.stdin@gmail.com>
Date: Sat, 18 Sep 2010 11:30:09 +0000
Subject: [PATCH 2616/5331] Quassel: use the convenience daemon package.

svn path=/nixos/trunk/; revision=23849
---
 modules/services/networking/quassel.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/services/networking/quassel.nix b/modules/services/networking/quassel.nix
index d4795f3b57d..6793ee39a06 100644
--- a/modules/services/networking/quassel.nix
+++ b/modules/services/networking/quassel.nix
@@ -3,7 +3,7 @@
 with pkgs.lib;
 
 let
-  quassel = pkgs.quassel.override { daemon = true; monolithic = false; client = false; };
+  quassel = pkgs.quasselDaemon;
   cfg = config.services.quassel;
 in
 
-- 
GitLab


From b2b227c99f364929732324d1bf909022f915c02d Mon Sep 17 00:00:00 2001
From: Evgeny Egorochkin <phreedom.stdin@gmail.com>
Date: Sat, 18 Sep 2010 11:30:14 +0000
Subject: [PATCH 2617/5331] TOR service: refactored options to avoid mess

svn path=/nixos/trunk/; revision=23850
---
 modules/services/security/tor.nix | 352 +++++++++++++++---------------
 1 file changed, 177 insertions(+), 175 deletions(-)

diff --git a/modules/services/security/tor.nix b/modules/services/security/tor.nix
index 35201775ec7..e5e0ba4e70f 100644
--- a/modules/services/security/tor.nix
+++ b/modules/services/security/tor.nix
@@ -27,40 +27,6 @@ in
   
     services.tor = {
 
-      enable = mkOption {
-        default = false;
-        description = ''
-          Whether to enable the Tor anonymous routing daemon.
-        '';
-      };
-
-      enableClient = mkOption {
-        default = true;
-        description = ''
-          Whether to enable Tor daemon to route application connections.
-          You might want to disable this if you plan running a dedicated Tor relay.
-        '';
-      };
-
-      socksListenAddress = mkOption {
-        default = "127.0.0.1:9050";
-        example = "127.0.0.1:9050, 192.168.0.1:9100";
-        description = ''
-          Bind to this address(es) to listen for connections from Socks-speaking 
-          applications. You can also specify a port.
-        '';
-      };
-
-      socksPolicy = mkOption {
-        default = "";
-        example = "accept 192.168.0.0/16, reject *";
-        description = ''
-          Entry policies to allow/deny SOCKS requests based on IP address.
-          First entry that matches wins. If no SocksPolicy is set, we accept
-          all (and only) requests from SocksListenAddress.
-        '';
-      };
-
       config = mkOption {
         default = "";
         description = ''
@@ -69,141 +35,180 @@ in
         '';
       };
 
-      enablePrivoxy = mkOption {
-        default = true;
-        description = ''
-          Whether to enable a special instance of privoxy dedicated to Tor.
-          To have anonymity, protocols need to be scrubbed of identifying 
-          information.
-          Most people using Tor want to anonymize their web traffic, so by 
-          default we enable an special instance of privoxy specifically for
-          Tor.
-          However, if you are only going to use Tor only as a relay then you
-          can disable this option.
-        '';
-      };
-      
-      privoxyListenAddress = mkOption {
-        default = "127.0.0.1:8118";
-        description = ''
-          Address that Tor's instance of privoxy is listening to.
-          *This does not configure the standard NixOS instance of privoxy.*  
-          This is for Tor connections only! 
-          See services.privoxy.listenAddress to configure the standard NixOS 
-          instace of privoxy.
-        '';
-      };
+      client = {
 
-      privoxyConfig = mkOption {
-        default = "";
-        description = ''
-          Extra configuration for Tor's instance of privoxy. Contents will be 
-          added verbatim to the configuration file.
-          *This does not configure the standard NixOS instance of privoxy.* 
-          This is for Tor connections only! 
-          See services.privoxy.extraConfig to configure the standard NixOS 
-          instace of privoxy.
-        '';
-      };
-
-      enableRelay = mkOption {
-        default = false;
-        description = ''
-          Whether to enable relaying traffic for others.
+        enable = mkOption {
+          default = true;
+          description = ''
+            Whether to enable Tor daemon to route application connections.
+            You might want to disable this if you plan running a dedicated Tor relay.
+          '';
+        };
+
+        socksListenAddress = mkOption {
+          default = "127.0.0.1:9050";
+          example = "127.0.0.1:9050, 192.168.0.1:9100";
+          description = ''
+            Bind to this address(es) to listen for connections from Socks-speaking 
+            applications. You can also specify a port.
+          '';
+        };
+
+        socksPolicy = mkOption {
+          default = "";
+          example = "accept 192.168.0.0/16, reject *";
+          description = ''
+            Entry policies to allow/deny SOCKS requests based on IP address.
+            First entry that matches wins. If no SocksPolicy is set, we accept
+            all (and only) requests from SocksListenAddress.
+          '';
+        };
+
+        privoxy = {
+
+          enable = mkOption {
+            default = true;
+            description = ''
+              Whether to enable a special instance of privoxy dedicated to Tor.
+              To have anonymity, protocols need to be scrubbed of identifying 
+              information.
+              Most people using Tor want to anonymize their web traffic, so by 
+              default we enable an special instance of privoxy specifically for
+              Tor.
+              However, if you are only going to use Tor only for other kinds of
+              traffic then you can disable this option.
+            '';
+          };
+
+          listenAddress = mkOption {
+            default = "127.0.0.1:8118";
+            description = ''
+              Address that Tor's instance of privoxy is listening to.
+              *This does not configure the standard NixOS instance of privoxy.*  
+              This is for Tor connections only! 
+              See services.privoxy.listenAddress to configure the standard NixOS 
+              instace of privoxy.
+            '';
+          };
+
+          config = mkOption {
+            default = "";
+            description = ''
+              Extra configuration for Tor's instance of privoxy. Contents will be 
+              added verbatim to the configuration file.
+              *This does not configure the standard NixOS instance of privoxy.* 
+              This is for Tor connections only! 
+              See services.privoxy.extraConfig to configure the standard NixOS 
+              instace of privoxy.
+            '';
+          };
+
+        };
 
-          See https://www.torproject.org/docs/tor-doc-relay for details.
-        '';
       };
 
-      isBridgeRelay = mkOption {
-        default = false;
-        description = ''
-          Bridge relays (or "bridges" ) are Tor relays that aren't listed in the
-          main directory. Since there is no complete public list of them, even if an
-          ISP is filtering connections to all the known Tor relays, they probably
-          won't be able to block all the bridges.
+      relay = {      
 
-          A bridge relay can't be an exit relay.
+        enable = mkOption {
+          default = false;
+          description = ''
+            Whether to enable relaying TOR traffic for others.
 
-          You need to set enableRelay to true for this option to take effect.
+            See https://www.torproject.org/docs/tor-doc-relay for details.
+          '';
+        };
 
-          See https://www.torproject.org/bridges.html.en for more info.
-        '';
-      };
+        isBridge = mkOption {
+          default = false;
+          description = ''
+            Bridge relays (or "bridges" ) are Tor relays that aren't listed in the
+            main directory. Since there is no complete public list of them, even if an
+            ISP is filtering connections to all the known Tor relays, they probably
+            won't be able to block all the bridges.
 
-      isExitRelay = mkOption {
-        default = false;
-        description = ''
-          An exit relay allows Tor users to access regular Internet services.
+            A bridge relay can't be an exit relay.
 
-          Unlike running a non-exit relay, running an exit relay may expose
-          you to abuse complaints. See https://www.torproject.org/faq.html.en#ExitPolicies for more info.
+            You need to set enableRelay to true for this option to take effect.
 
-          You can specify which services Tor users may access via your exit relay using exitPolicy option.
-        '';
-      };
+            See https://www.torproject.org/bridges.html.en for more info.
+          '';
+        };
 
-      nickname = mkOption {
-        default = "anonymous";
-        description = ''
-          A unique handle for your TOR relay.
-        '';
-      };
+        isExit = mkOption {
+          default = false;
+          description = ''
+            An exit relay allows Tor users to access regular Internet services.
 
-      relayBandwidthRate = mkOption {
-        default = 0;
-        example = 100;
-        description = ''
-          Specify this to limit the bandwidth usage of relayed (server)
-          traffic. Your own traffic is still unthrottled. Units: bytes/second.
-        '';
-      };
+            Unlike running a non-exit relay, running an exit relay may expose
+            you to abuse complaints. See https://www.torproject.org/faq.html.en#ExitPolicies for more info.
 
-      relayBandwidthBurst = mkOption {
-        default = 0;
-        example = 200;
-        description = ''
-          Specify this to allow bursts of the bandwidth usage of relayed (server)
-          traffic. The average usage will still be as specified in relayBandwidthRate.
-          Your own traffic is still unthrottled. Units: bytes/second.
-        '';
-      };
+            You can specify which services Tor users may access via your exit relay using exitPolicy option.
+          '';
+        };
 
-      relayPort = mkOption {
-        default = 9001;
-        description = ''
-          What port to advertise for Tor connections.
-        '';
-      };
+        nickname = mkOption {
+          default = "anonymous";
+          description = ''
+            A unique handle for your TOR relay.
+          '';
+        };
+
+        bandwidthRate = mkOption {
+          default = 0;
+          example = 100;
+          description = ''
+            Specify this to limit the bandwidth usage of relayed (server)
+            traffic. Your own traffic is still unthrottled. Units: bytes/second.
+          '';
+        };
+
+        bandwidthBurst = mkOption {
+          default = 0;
+          example = 200;
+          description = ''
+            Specify this to allow bursts of the bandwidth usage of relayed (server)
+            traffic. The average usage will still be as specified in relayBandwidthRate.
+            Your own traffic is still unthrottled. Units: bytes/second.
+          '';
+        };
 
-      relayListenAddress = mkOption {
-        default = "";
-        example = "0.0.0.0:9090";
-        description = ''
-          Set this if you need to listen on a port other than the one advertised
-          in relayPort (e.g. to advertise 443 but bind to 9090). You'll need to do
-          ipchains or other port forwarding yourself to make this work.
-        '';
-      };
+        port = mkOption {
+          default = 9001;
+          description = ''
+            What port to advertise for Tor connections.
+          '';
+        };
+
+        listenAddress = mkOption {
+          default = "";
+          example = "0.0.0.0:9090";
+          description = ''
+            Set this if you need to listen on a port other than the one advertised
+            in relayPort (e.g. to advertise 443 but bind to 9090). You'll need to do
+            ipchains or other port forwsarding yourself to make this work.
+          '';
+        };
+
+        exitPolicy = mkOption {
+          default = "";
+          example = "accept *:6660-6667,reject *:*";
+          description = ''
+            A comma-separated list of exit policies. They're considered first
+            to last, and the first match wins. If you want to _replace_
+            the default exit policy, end this with either a reject *:* or an
+            accept *:*. Otherwise, you're _augmenting_ (prepending to) the
+            default exit policy. Leave commented to just use the default, which is
+            available in the man page or at https://www.torproject.org/documentation.html
+
+            Look at https://www.torproject.org/faq-abuse.html#TypicalAbuses
+            for issues you might encounter if you use the default exit policy.
+
+            If certain IPs and ports are blocked externally, e.g. by your firewall,
+            you should update your exit policy to reflect this -- otherwise Tor
+            users will be told that those destinations are down.
+          '';
+        };
 
-      exitPolicy = mkOption {
-        default = "";
-        example = "accept *:6660-6667,reject *:*";
-        description = ''
-          A comma-separated list of exit policies. They're considered first
-          to last, and the first match wins. If you want to _replace_
-          the default exit policy, end this with either a reject *:* or an
-          accept *:*. Otherwise, you're _augmenting_ (prepending to) the
-          default exit policy. Leave commented to just use the default, which is
-          available in the man page or at https://www.torproject.org/documentation.html
-
-          Look at https://www.torproject.org/faq-abuse.html#TypicalAbuses
-          for issues you might encounter if you use the default exit policy.
-
-          If certain IPs and ports are blocked externally, e.g. by your firewall,
-          you should update your exit policy to reflect this -- otherwise Tor
-          users will be told that those destinations are down.
-        '';
       };
 
     };
@@ -213,14 +218,11 @@ in
 
   ###### implementation
 
-  config = mkIf cfg.enable {
+  config = mkIf (cfg.client.enable || cfg.relay.enable) {
     environment.systemPackages = [ tor ];  # provides tor-resolve and torify
 
-    assertions = [{
-      assertion = cfg.enableRelay || cfg.enableClient;
-      message = "Need to either enable TOR client or relay functionality";
-    } {
-      assertion = cfg.enableRelay -> !(cfg.isBridgeRelay && cfg.isExitRelay);
+    assertions = [ {
+      assertion = cfg.relay.enable -> !(cfg.relay.isBridge && cfg.relay.isExit);
       message = "Can't be both an exit and a bridge relay at the same time";
     } ];
 
@@ -245,7 +247,7 @@ in
         exec = "${tor}/bin/tor -f ${pkgs.writeText "torrc" cfg.config}";
       };
 
-    jobs.torPrivoxy = mkIf (cfg.enablePrivoxy && cfg.enableClient)
+    jobs.torPrivoxy = mkIf (cfg.client.privoxy.enable && cfg.client.enable)
       { name = "tor-privoxy";
 
         startOn = "starting tor";
@@ -259,32 +261,32 @@ in
             # Needed to run privoxy as an unprivileged user?
             ${modprobe}/sbin/modprobe capability || true
           '';
-        exec = "${privoxy}/sbin/privoxy --no-daemon --user ${torUser} ${pkgs.writeText "torPrivoxy.conf" cfg.privoxyConfig}";
+        exec = "${privoxy}/sbin/privoxy --no-daemon --user ${torUser} ${pkgs.writeText "torPrivoxy.conf" cfg.client.privoxy.config}";
       };
 
       services.tor.config = ''
         DataDirectory ${stateDir}
         User ${torUser}
       ''
-      + optionalString cfg.enableClient  ''
-        SocksListenAddress ${cfg.socksListenAddress}
-        ${opt "SocksPolicy" cfg.socksPolicy}
+      + optionalString cfg.client.enable  ''
+        SocksListenAddress ${cfg.client.socksListenAddress}
+        ${opt "SocksPolicy" cfg.client.socksPolicy}
       ''
-      + optionalString cfg.enableRelay ''
-        ORPort ${toString cfg.relayPort}
-        ${opt "ORListenAddress" cfg.relayListenAddress }
-        ${opt "Nickname" cfg.nickname}
-        ${optint "RelayBandwidthRate" cfg.relayBandwidthRate}
-        ${optint "RelayBandwidthBurst" cfg.relayBandwidthBurst}
-        ${if cfg.isExitRelay then opt "ExitPolicy" cfg.exitPolicy else "ExitPolicy reject *:*"}
-        ${if cfg.isBridgeRelay then "BridgeRelay 1" else ""}
+      + optionalString cfg.relay.enable ''
+        ORPort ${toString cfg.relay.port}
+        ${opt "ORListenAddress" cfg.relay.listenAddress }
+        ${opt "Nickname" cfg.relay.nickname}
+        ${optint "RelayBandwidthRate" cfg.relay.bandwidthRate}
+        ${optint "RelayBandwidthBurst" cfg.relay.bandwidthBurst}
+        ${if cfg.relay.isExit then opt "ExitPolicy" cfg.relay.exitPolicy else "ExitPolicy reject *:*"}
+        ${if cfg.relay.isBridge then "BridgeRelay 1" else ""}
       '';
     
-      services.tor.privoxyConfig = ''
+      services.tor.client.privoxy.config = ''
         # Generally, this file goes in /etc/privoxy/config
         #
         # Tor listens as a SOCKS4a proxy here:
-        forward-socks4a / ${cfg.socksListenAddress} .
+        forward-socks4a / ${cfg.client.socksListenAddress} .
         confdir ${privoxy}/etc
         logdir ${privoxyDir}
         # actionsfile standard  # Internal purpose, recommended
@@ -300,7 +302,7 @@ in
         debug   8192 # Errors - *we highly recommended enabling this*
         
         user-manual ${privoxy}/doc/privoxy/user-manual
-        listen-address  ${cfg.privoxyListenAddress}
+        listen-address  ${cfg.client.privoxy.listenAddress}
         toggle  1
         enable-remote-toggle 0
         enable-edit-actions 0
-- 
GitLab


From 41530c8e7679e7a982a41720d026d7f00b81dc7a Mon Sep 17 00:00:00 2001
From: Evgeny Egorochkin <phreedom.stdin@gmail.com>
Date: Sat, 18 Sep 2010 12:43:48 +0000
Subject: [PATCH 2618/5331] TOR service: sane default for burst rate

svn path=/nixos/trunk/; revision=23851
---
 modules/services/security/tor.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/services/security/tor.nix b/modules/services/security/tor.nix
index e5e0ba4e70f..5607fcbcdd6 100644
--- a/modules/services/security/tor.nix
+++ b/modules/services/security/tor.nix
@@ -163,7 +163,7 @@ in
         };
 
         bandwidthBurst = mkOption {
-          default = 0;
+          default = cfg.relay.bandwidthRate;
           example = 200;
           description = ''
             Specify this to allow bursts of the bandwidth usage of relayed (server)
-- 
GitLab


From 39193fa1e7c2109694f2eec897297e262ee84aee Mon Sep 17 00:00:00 2001
From: Evgeny Egorochkin <phreedom.stdin@gmail.com>
Date: Sat, 18 Sep 2010 12:44:03 +0000
Subject: [PATCH 2619/5331] Folding@Home service: don't make binaries visible

svn path=/nixos/trunk/; revision=23852
---
 modules/services/misc/folding-at-home.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/modules/services/misc/folding-at-home.nix b/modules/services/misc/folding-at-home.nix
index 691b752c63c..06223bc56e0 100644
--- a/modules/services/misc/folding-at-home.nix
+++ b/modules/services/misc/folding-at-home.nix
@@ -41,7 +41,6 @@ in {
   ###### implementation
 
   config = mkIf cfg.enable {
-    environment.systemPackages = [ pkgs.foldingathome ];
 
     users.extraUsers = singleton
       { name = fahUser;
-- 
GitLab


From 764f5f34fd513c1826cbb517c4971ea48ecf8d18 Mon Sep 17 00:00:00 2001
From: Evgeny Egorochkin <phreedom.stdin@gmail.com>
Date: Sat, 18 Sep 2010 12:50:55 +0000
Subject: [PATCH 2620/5331] Quassel: use the generic logging for jobs instead
 of rolling your own.

svn path=/nixos/trunk/; revision=23854
---
 modules/services/networking/quassel.nix | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/modules/services/networking/quassel.nix b/modules/services/networking/quassel.nix
index 6793ee39a06..6c8fd9bbd80 100644
--- a/modules/services/networking/quassel.nix
+++ b/modules/services/networking/quassel.nix
@@ -38,11 +38,6 @@ in
         '';
       };
 
-      logFile = mkOption {
-        default = "/var/log/quassel.log";
-        description = "Location of the logfile of the Quassel daemon.";
-      };
-
       dataDir = mkOption {
         default = ''/home/${cfg.user}/.config/quassel-irc.org'';
         description = ''
@@ -86,7 +81,7 @@ in
         exec = ''
             ${pkgs.su}/bin/su -s ${pkgs.stdenv.shell} ${cfg.user} \
                 -c '${quassel}/bin/quasselcore --listen=${cfg.interface}\
-                    --port=${toString cfg.portNumber} --configdir=${cfg.dataDir} --logfile=${cfg.logFile}'
+                    --port=${toString cfg.portNumber} --configdir=${cfg.dataDir}'
         '';
       };
 
-- 
GitLab


From 385ec8981797329edc5b989b98e82dc43e7d1a2e Mon Sep 17 00:00:00 2001
From: Evgeny Egorochkin <phreedom.stdin@gmail.com>
Date: Sat, 18 Sep 2010 16:36:03 +0000
Subject: [PATCH 2621/5331] TOR: client should be disabled by default

svn path=/nixos/trunk/; revision=23860
---
 modules/services/security/tor.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/services/security/tor.nix b/modules/services/security/tor.nix
index 5607fcbcdd6..72f49f30eb8 100644
--- a/modules/services/security/tor.nix
+++ b/modules/services/security/tor.nix
@@ -38,7 +38,7 @@ in
       client = {
 
         enable = mkOption {
-          default = true;
+          default = false;
           description = ''
             Whether to enable Tor daemon to route application connections.
             You might want to disable this if you plan running a dedicated Tor relay.
-- 
GitLab


From b9aa56969fbf2af1aebbf13b03f21937a86d12ec Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Sun, 19 Sep 2010 00:21:30 +0000
Subject: [PATCH 2622/5331] Applying patch sent by roconnor about allowing
 "nix-env -S" in NixOS. I agree with the change.

svn path=/nixos/trunk/; revision=23861
---
 modules/programs/bash/bashrc.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/programs/bash/bashrc.sh b/modules/programs/bash/bashrc.sh
index e43b716a0ce..6fe59e92b95 100644
--- a/modules/programs/bash/bashrc.sh
+++ b/modules/programs/bash/bashrc.sh
@@ -15,7 +15,7 @@ export LOCATE_PATH=/var/cache/locatedb
 # Include the various profiles in the appropriate environment variables.
 NIX_USER_PROFILE_DIR=/nix/var/nix/profiles/per-user/$USER
 
-NIX_PROFILES="/var/run/current-system/sw /nix/var/nix/profiles/default $NIX_USER_PROFILE_DIR/profile"
+NIX_PROFILES="/var/run/current-system/sw /nix/var/nix/profiles/default $HOME/.nix-profile"
 
 unset PATH INFOPATH PKG_CONFIG_PATH PERL5LIB GST_PLUGIN_PATH KDEDIRS
 unset XDG_CONFIG_DIRS XDG_DATA_DIRS
@@ -43,7 +43,7 @@ done
 
 
 # Search directory for Aspell dictionaries.
-export ASPELL_CONF="dict-dir $NIX_USER_PROFILE_DIR/profile/lib/aspell"
+export ASPELL_CONF="dict-dir $HOME/.nix-profile/lib/aspell"
 
 
 # ~/bin and the setuid wrappers override other bin directories.
-- 
GitLab


From e5aea56bb53316b1bff8c2c41c6a524740d398f7 Mon Sep 17 00:00:00 2001
From: Evgeny Egorochkin <phreedom.stdin@gmail.com>
Date: Sun, 19 Sep 2010 15:40:03 +0000
Subject: [PATCH 2623/5331] TOR: prevent creation of torPrivoxy.conf if Privoxy
 is disabled. Patch by Russel O'Connor

svn path=/nixos/trunk/; revision=23862
---
 modules/services/security/tor.nix | 57 +++++++++++++++----------------
 1 file changed, 27 insertions(+), 30 deletions(-)

diff --git a/modules/services/security/tor.nix b/modules/services/security/tor.nix
index 72f49f30eb8..943c4c9274e 100644
--- a/modules/services/security/tor.nix
+++ b/modules/services/security/tor.nix
@@ -233,36 +233,33 @@ in
         home = stateDir;
       };
 
-    jobs.tor =
-      { name = "tor";
-
-        startOn = "started network-interfaces";
-        stopOn = "stopping network-interfaces";
-
-        preStart =
-          ''
-            mkdir -m 0755 -p ${stateDir}
-            chown ${torUser} ${stateDir}
-          '';
-        exec = "${tor}/bin/tor -f ${pkgs.writeText "torrc" cfg.config}";
-      };
-
-    jobs.torPrivoxy = mkIf (cfg.client.privoxy.enable && cfg.client.enable)
-      { name = "tor-privoxy";
-
-        startOn = "starting tor";
-        stopOn = "stopping tor"; 
-
-        preStart =
-          ''
-            mkdir -m 0755 -p ${privoxyDir}
-            chown ${torUser} ${privoxyDir}
-
-            # Needed to run privoxy as an unprivileged user?
-            ${modprobe}/sbin/modprobe capability || true
-          '';
-        exec = "${privoxy}/sbin/privoxy --no-daemon --user ${torUser} ${pkgs.writeText "torPrivoxy.conf" cfg.client.privoxy.config}";
-      };
+    jobs = {
+      tor = { name = "tor";
+
+              startOn = "started network-interfaces";
+              stopOn = "stopping network-interfaces";
+
+              preStart = ''
+                mkdir -m 0755 -p ${stateDir}
+                chown ${torUser} ${stateDir}
+              '';
+              exec = "${tor}/bin/tor -f ${pkgs.writeText "torrc" cfg.config}";
+    }; }
+    // optionalAttrs (cfg.client.privoxy.enable && cfg.client.enable) {
+      torPrivoxy = { name = "tor-privoxy";
+
+                     startOn = "starting tor";
+                     stopOn = "stopping tor"; 
+
+                     preStart = ''
+                       mkdir -m 0755 -p ${privoxyDir}
+                       chown ${torUser} ${privoxyDir}
+
+                       # Needed to run privoxy as an unprivileged user?
+                       ${modprobe}/sbin/modprobe capability || true
+                     '';
+                     exec = "${privoxy}/sbin/privoxy --no-daemon --user ${torUser} ${pkgs.writeText "torPrivoxy.conf" cfg.client.privoxy.config}";
+    }; };
 
       services.tor.config = ''
         DataDirectory ${stateDir}
-- 
GitLab


From 36fe7f69c64625ffcf53f863e2a070fe6422048c Mon Sep 17 00:00:00 2001
From: Evgeny Egorochkin <phreedom.stdin@gmail.com>
Date: Mon, 20 Sep 2010 01:44:07 +0000
Subject: [PATCH 2624/5331] Quassel: get rid of custom logging remnants

svn path=/nixos/trunk/; revision=23867
---
 modules/services/networking/quassel.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/modules/services/networking/quassel.nix b/modules/services/networking/quassel.nix
index 6c8fd9bbd80..5547b237c99 100644
--- a/modules/services/networking/quassel.nix
+++ b/modules/services/networking/quassel.nix
@@ -75,7 +75,6 @@ in
         preStart = ''
             mkdir -p ${cfg.dataDir}
             chown ${cfg.user} ${cfg.dataDir}
-            touch ${cfg.logFile} && chown ${cfg.user} ${cfg.logFile}
         '';
 
         exec = ''
-- 
GitLab


From ca4b60d059f9d9a89410d51aa6f0a3ff95ee91fe Mon Sep 17 00:00:00 2001
From: "Yury G. Kudryashov" <urkud.urkud@gmail.com>
Date: Mon, 20 Sep 2010 14:10:46 +0000
Subject: [PATCH 2625/5331] Auto add $prefix/lib/kde4/plugins to QT_PLUGIN_PATH

svn path=/nixos/trunk/; revision=23872
---
 modules/programs/bash/bashrc.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/programs/bash/bashrc.sh b/modules/programs/bash/bashrc.sh
index 6fe59e92b95..7e39e98135a 100644
--- a/modules/programs/bash/bashrc.sh
+++ b/modules/programs/bash/bashrc.sh
@@ -35,7 +35,7 @@ for i in $NIX_PROFILES; do # !!! reverse
 
     # KDE/Gnome stuff.
     export KDEDIRS=$i${KDEDIRS:+:}$KDEDIRS
-    export QT_PLUGIN_PATH=$i/plugins:$i/lib/qt4/plugins${QT_PLUGIN_PATH:+:}$QT_PLUGIN_PATH
+    export QT_PLUGIN_PATH=$i/lib/qt4/plugins:$i/lib/kde4/plugins${QT_PLUGIN_PATH:+:}$QT_PLUGIN_PATH
     export XDG_CONFIG_DIRS=$i/etc/xdg${XDG_CONFIG_DIRS:+:}$XDG_CONFIG_DIRS
     export XDG_DATA_DIRS=$i/share${XDG_DATA_DIRS:+:}$XDG_DATA_DIRS
 done
-- 
GitLab


From 1319531f28ed5795516a7887dfc5f661b3727dc4 Mon Sep 17 00:00:00 2001
From: "Yury G. Kudryashov" <urkud.urkud@gmail.com>
Date: Tue, 21 Sep 2010 09:16:47 +0000
Subject: [PATCH 2626/5331] Add system.path to PATH instead of overriding

svn path=/nixos/trunk/; revision=23879
---
 modules/services/printing/cupsd.nix | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/modules/services/printing/cupsd.nix b/modules/services/printing/cupsd.nix
index 8599512a5f5..ebc0215d06d 100644
--- a/modules/services/printing/cupsd.nix
+++ b/modules/services/printing/cupsd.nix
@@ -134,10 +134,7 @@ in
         startOn = "started network-interfaces";
         stopOn = "stopping network-interfaces";
 
-        environment = {
-          # Cups scripts for printing (psto...) require awk, sed, grep, ...
-          PATH = "${config.system.path}/bin";
-        };
+        path = [ config.system.path ];
 
         preStart =
           ''
-- 
GitLab


From c0751f83e9e2a3053c52095c9a609b1f456abd1c Mon Sep 17 00:00:00 2001
From: Evgeny Egorochkin <phreedom.stdin@gmail.com>
Date: Wed, 22 Sep 2010 23:07:52 +0000
Subject: [PATCH 2627/5331] Quassel: don't pollute profiles with useless files

svn path=/nixos/trunk/; revision=23904
---
 modules/services/networking/quassel.nix | 2 --
 1 file changed, 2 deletions(-)

diff --git a/modules/services/networking/quassel.nix b/modules/services/networking/quassel.nix
index 5547b237c99..591bd6e6ce2 100644
--- a/modules/services/networking/quassel.nix
+++ b/modules/services/networking/quassel.nix
@@ -84,8 +84,6 @@ in
         '';
       };
 
-    environment.systemPackages = [ quassel ];
-
   };
   
 }
-- 
GitLab


From 910103246fd2805d083bc78a7a68cb6447c86709 Mon Sep 17 00:00:00 2001
From: Evgeny Egorochkin <phreedom.stdin@gmail.com>
Date: Wed, 22 Sep 2010 23:07:59 +0000
Subject: [PATCH 2628/5331] TOR: make torify work(only when enabled as a
 service. nix-env -i tor replaces it with a broken version.)

svn path=/nixos/trunk/; revision=23905
---
 modules/module-list.nix              |  1 +
 modules/services/security/tor.nix    |  1 -
 modules/services/security/torify.nix | 69 ++++++++++++++++++++++++++++
 3 files changed, 70 insertions(+), 1 deletion(-)
 create mode 100644 modules/services/security/torify.nix

diff --git a/modules/module-list.nix b/modules/module-list.nix
index 9113d249ae8..71ba9d06e24 100644
--- a/modules/module-list.nix
+++ b/modules/module-list.nix
@@ -111,6 +111,7 @@
   ./services/scheduling/cron.nix
   ./services/scheduling/fcron.nix
   ./services/security/tor.nix
+  ./services/security/torify.nix
   ./services/system/dbus.nix
   ./services/system/kerberos.nix
   ./services/system/nscd.nix
diff --git a/modules/services/security/tor.nix b/modules/services/security/tor.nix
index 943c4c9274e..8ddc468aa38 100644
--- a/modules/services/security/tor.nix
+++ b/modules/services/security/tor.nix
@@ -219,7 +219,6 @@ in
   ###### implementation
 
   config = mkIf (cfg.client.enable || cfg.relay.enable) {
-    environment.systemPackages = [ tor ];  # provides tor-resolve and torify
 
     assertions = [ {
       assertion = cfg.relay.enable -> !(cfg.relay.isBridge && cfg.relay.isExit);
diff --git a/modules/services/security/torify.nix b/modules/services/security/torify.nix
new file mode 100644
index 00000000000..b91d7d58505
--- /dev/null
+++ b/modules/services/security/torify.nix
@@ -0,0 +1,69 @@
+{ config, pkgs, ... }:
+with pkgs.lib;
+let
+
+  cfg = config.services.tor;
+
+  torify = pkgs.writeTextFile {
+    name = "torify";
+    text = ''
+        #!${pkgs.stdenv.shell}
+        TSOCKS_CONF_FILE=${pkgs.writeText "tsocks.conf" cfg.torify.config} LD_PRELOAD="${pkgs.tsocks}/lib/libtsocks.so $LD_PRELOAD" $@
+    '';
+    executable = true;
+    destination = "/bin/torify";
+  };
+
+in
+
+{
+
+  ###### interface
+  
+  options = {
+  
+    services.tor.torify = {
+
+      enable = mkOption {
+        default = cfg.client.enable;
+        description = ''
+          Whether to build torify scipt to relay application traffic via TOR.
+        '';
+      };
+
+      server = mkOption {
+        default = "localhost:9050";
+        example = "192.168.0.20";
+        description = ''
+          IP address of TOR client to use.
+        '';
+      };
+
+      config = mkOption {
+        default = "";
+        description = ''
+          Extra configuration. Contents will be added verbatim to TSocks
+          configuration file.
+        '';
+      };
+
+    };
+
+  };
+
+  ###### implementation
+
+  config = mkIf cfg.torify.enable {
+
+    environment.systemPackages = [ torify ];  # expose it to the users
+
+    services.tor.torify.config = ''
+      server = ${toString(head (splitString ":" cfg.torify.server))}
+      server_port = ${toString(tail (splitString ":" cfg.torify.server))}
+
+      local = 127.0.0.0/255.128.0.0
+      local = 127.128.0.0/255.192.0.0
+    '';
+  };
+
+}
\ No newline at end of file
-- 
GitLab


From 9b7533c2fdeb3eb3fdc383d8690734b74ad5fa24 Mon Sep 17 00:00:00 2001
From: Evgeny Egorochkin <phreedom.stdin@gmail.com>
Date: Wed, 22 Sep 2010 23:08:05 +0000
Subject: [PATCH 2629/5331] KDE4: fix suid for kcheckpass, although suid
 doesn't seem to be needed if you use PAM

svn path=/nixos/trunk/; revision=23906
---
 modules/services/x11/desktop-managers/kde4.nix | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/modules/services/x11/desktop-managers/kde4.nix b/modules/services/x11/desktop-managers/kde4.nix
index cf4faef223f..5ed501e4b02 100644
--- a/modules/services/x11/desktop-managers/kde4.nix
+++ b/modules/services/x11/desktop-managers/kde4.nix
@@ -47,7 +47,13 @@ in
           '';
       };
 
-    security.setuidPrograms = [ "kcheckpass" ];
+    security.setuidOwners = [ {
+      program = "kcheckpass";
+      source = "${pkgs.kde4.kdebase_workspace}/lib/kde4/libexec/kcheckpass";
+      owner = "root";
+      group = "root";
+      setuid = true;
+    } ];
 
     environment = {
       kdePackages = [
-- 
GitLab


From de1ba135ac7abd293a20be10db9279a890971a4c Mon Sep 17 00:00:00 2001
From: Nicolas Pierron <nicolas.b.pierron@gmail.com>
Date: Sat, 25 Sep 2010 09:18:42 +0000
Subject: [PATCH 2630/5331] Fix installer tests.

svn path=/nixos/trunk/; revision=23907
---
 tests/installer.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/installer.nix b/tests/installer.nix
index 62684c48e5a..aebb7c764a1 100644
--- a/tests/installer.nix
+++ b/tests/installer.nix
@@ -170,7 +170,7 @@ let
       $machine->waitUntilSucceeds("cat /proc/swaps | grep -q /dev");
       
       $machine->mustSucceed("nix-env -i coreutils >&2");
-      $machine->mustSucceed("type -tP ls") =~ /profiles/
+      $machine->mustSucceed("type -tP ls | tee /dev/stderr") =~ /.nix-profile/
           or die "nix-env failed";
 
       $machine->mustSucceed("nixos-rebuild switch >&2");
-- 
GitLab


From 1a232545a043bfc527824498f827633d71e6a37b Mon Sep 17 00:00:00 2001
From: Nicolas Pierron <nicolas.b.pierron@gmail.com>
Date: Sat, 25 Sep 2010 09:32:22 +0000
Subject: [PATCH 2631/5331] Test that CD configuration can be rebuild.

svn path=/nixos/trunk/; revision=23908
---
 tests/installer.nix | 38 ++++++++++++++++++++++++++++++++++++++
 1 file changed, 38 insertions(+)

diff --git a/tests/installer.nix b/tests/installer.nix
index aebb7c764a1..c1569b3e50f 100644
--- a/tests/installer.nix
+++ b/tests/installer.nix
@@ -296,5 +296,43 @@ in {
         '';
       fileSystems = rootFS + bootFS;
     };
+
+  # Rebuild the CD configuration with a little modification.
+  rebuildCD = 
+    { inherit iso;
+      nodes = { };
+      testScript =
+    ''
+      # damn, it's costly to evaluate nixos-rebuild (1G of ram)
+      my $machine = Machine->new({ cdrom => glob("${iso}/iso/*.iso"), qemuFlags => '${qemuNICFlags 1 1} -m 1024' });
+      $machine->start;
       
+      # Make sure that we get a login prompt etc.
+      $machine->mustSucceed("echo hello");
+      $machine->waitForJob("tty1");
+      $machine->waitForJob("rogue");
+      $machine->waitForJob("nixos-manual");
+
+      # Make sure that we don't try to download anything.
+      $machine->stopJob("dhclient");
+      $machine->mustSucceed("rm /etc/resolv.conf");
+
+      # Enable sshd service.
+      $machine->mustSucceed(
+        "sed -i 's,^}\$,jobs.sshd.startOn = pkgs.lib.mkOverride 0 \"startup\"; },' /etc/nixos/configuration.nix"
+      );
+
+      my $cfg = $machine->mustSucceed("cat /etc/nixos/configuration.nix");
+      print STDERR "New CD config:\n$cfg\n";
+
+      # Apply the new CD configuration.
+      $machine->mustSucceed("nixos-rebuild build --no-pull"); # test / switch make it fails :(
+
+      # Connect to it-self.
+      #$machine->waitForJob("sshd");
+      #$machine->mustSucceed("ssh root@127.0.0.1 echo hello");
+
+      $machine->shutdown;
+    '';
+    };
 }
-- 
GitLab


From d304d12f37ee23c570814628b672c054ee3e6afc Mon Sep 17 00:00:00 2001
From: Nicolas Pierron <nicolas.b.pierron@gmail.com>
Date: Sat, 25 Sep 2010 09:32:27 +0000
Subject: [PATCH 2632/5331] Extract a base profile from the basic installation
 cd.

svn path=/nixos/trunk/; revision=23909
---
 .../installer/cd-dvd/installation-cd-base.nix | 100 +-----------------
 modules/profiles/base.nix                     |  92 ++++++++++++++++
 2 files changed, 93 insertions(+), 99 deletions(-)
 create mode 100644 modules/profiles/base.nix

diff --git a/modules/installer/cd-dvd/installation-cd-base.nix b/modules/installer/cd-dvd/installation-cd-base.nix
index c83faa28a04..a6d880fc6ed 100644
--- a/modules/installer/cd-dvd/installation-cd-base.nix
+++ b/modules/installer/cd-dvd/installation-cd-base.nix
@@ -24,56 +24,6 @@ let
         in live CDs.
       '';
     };
-
-    installer.basePackages = mkOption {
-      description = ''
-        The list of base packages available in the system profile of the
-        installation CD.  Note that modules such as
-        <literal>installation-cd-graphical.nix</literal> add
-        packages to this list.
-      '';
-
-      default =
-        [ pkgs.subversion # for nixos-checkout
-          pkgs.w3m # needed for the manual anyway
-          pkgs.testdisk # useful for repairing boot problems
-          pkgs.mssys # for writing Microsoft boot sectors / MBRs
-          pkgs.parted
-          pkgs.ddrescue
-          pkgs.ccrypt
-          pkgs.cryptsetup # needed for dm-crypt volumes
-
-          # Some networking tools.
-          pkgs.sshfsFuse
-          pkgs.socat
-          pkgs.screen
-
-          # Hardware-related tools.
-          pkgs.sdparm
-          pkgs.hdparm
-          pkgs.dmraid
-
-          # Tools to create / manipulate filesystems.
-          pkgs.ntfsprogs # for resizing NTFS partitions
-          pkgs.btrfsProgs
-          pkgs.dosfstools
-          pkgs.xfsprogs
-          pkgs.jfsutils
-          pkgs.jfsrec
-
-          # Some compression/archiver tools.
-          pkgs.unrar
-          pkgs.unzip
-          pkgs.zip
-          pkgs.xz
-          pkgs.dar # disk archiver
-
-          # Some editors.
-          pkgs.nvi
-          pkgs.bvi # binary editor
-          pkgs.joe
-        ];
-     };
   };
 
 
@@ -126,6 +76,7 @@ in
       ./iso-image.nix
       ../../hardware/network/intel-3945abg.nix
       ../../hardware/network/rt73.nix
+      ../../profiles/base.nix
     ];
 
   # ISO naming.
@@ -146,55 +97,6 @@ in
   # the full glibcLocales package.
   i18n.supportedLocales = ["en_US.UTF-8/UTF-8" "en_US/ISO-8859-1"];
 
-  # Include some utilities that are useful for installing or repairing
-  # the system.
-  environment.systemPackages = config.installer.basePackages;
-
-  # The initrd has to contain any module that might be necessary for
-  # mounting the CD/DVD.
-  boot.initrd.availableKernelModules =
-    [ # SATA/PATA support.
-      "ahci"
-
-      "ata_piix"
-
-      "sata_inic162x" "sata_nv" "sata_promise" "sata_qstor"
-      "sata_sil" "sata_sil24" "sata_sis" "sata_svw" "sata_sx4"
-      "sata_uli" "sata_via" "sata_vsc"
-
-      "pata_ali" "pata_amd" "pata_artop" "pata_atiixp"
-      "pata_cs5520" "pata_cs5530" "pata_cs5535" "pata_efar"
-      "pata_hpt366" "pata_hpt37x" "pata_hpt3x2n" "pata_hpt3x3"
-      "pata_it8213" "pata_it821x" "pata_jmicron" "pata_marvell"
-      "pata_mpiix" "pata_netcell" "pata_ns87410" "pata_oldpiix"
-      "pata_pcmcia" "pata_pdc2027x" "pata_qdi" "pata_rz1000"
-      "pata_sc1200" "pata_serverworks" "pata_sil680" "pata_sis"
-      "pata_sl82c105" "pata_triflex" "pata_via"
-      "pata_winbond"
-
-      # SCSI support (incomplete).
-      "3w-9xxx" "3w-xxxx" "aic79xx" "aic7xxx" "arcmsr" 
-
-      # USB support, especially for booting from USB CD-ROM
-      # drives.
-      "usb_storage"
-
-      # Firewire support.  Not tested.
-      "ohci1394" "sbp2"
-
-      # Virtio (QEMU, KVM etc.) support.
-      "virtio_net" "virtio_pci" "virtio_blk" "virtio_balloon"
-
-      # Add vfat to enable people to copy the contents of the CD to a
-      # bootable USB stick.
-      "vfat" "nls_cp437" "nls_iso8859-1"
-    ];
-
-  boot.initrd.kernelModules =
-    [ # Wait for SCSI devices to appear.
-      "scsi_wait_scan"
-    ];
-
   # nixos-install will do a pull from this channel to speed up the
   # installation.
   installer.nixpkgsURL = http://nixos.org/releases/nixpkgs/channels/nixpkgs-unstable;
diff --git a/modules/profiles/base.nix b/modules/profiles/base.nix
new file mode 100644
index 00000000000..68456e81f54
--- /dev/null
+++ b/modules/profiles/base.nix
@@ -0,0 +1,92 @@
+{config, pkgs, ...}:
+
+{
+
+  # The initrd has to contain any module that might be necessary for
+  # mounting the CD/DVD.
+  boot.initrd.availableKernelModules =
+    [ # SATA/PATA support.
+      "ahci"
+
+      "ata_piix"
+
+      "sata_inic162x" "sata_nv" "sata_promise" "sata_qstor"
+      "sata_sil" "sata_sil24" "sata_sis" "sata_svw" "sata_sx4"
+      "sata_uli" "sata_via" "sata_vsc"
+
+      "pata_ali" "pata_amd" "pata_artop" "pata_atiixp"
+      "pata_cs5520" "pata_cs5530" "pata_cs5535" "pata_efar"
+      "pata_hpt366" "pata_hpt37x" "pata_hpt3x2n" "pata_hpt3x3"
+      "pata_it8213" "pata_it821x" "pata_jmicron" "pata_marvell"
+      "pata_mpiix" "pata_netcell" "pata_ns87410" "pata_oldpiix"
+      "pata_pcmcia" "pata_pdc2027x" "pata_qdi" "pata_rz1000"
+      "pata_sc1200" "pata_serverworks" "pata_sil680" "pata_sis"
+      "pata_sl82c105" "pata_triflex" "pata_via"
+      "pata_winbond"
+
+      # SCSI support (incomplete).
+      "3w-9xxx" "3w-xxxx" "aic79xx" "aic7xxx" "arcmsr" 
+
+      # USB support, especially for booting from USB CD-ROM
+      # drives.
+      "usb_storage"
+
+      # Firewire support.  Not tested.
+      "ohci1394" "sbp2"
+
+      # Virtio (QEMU, KVM etc.) support.
+      "virtio_net" "virtio_pci" "virtio_blk" "virtio_balloon"
+
+      # Add vfat to enable people to copy the contents of the CD to a
+      # bootable USB stick.
+      "vfat" "nls_cp437" "nls_iso8859-1"
+    ];
+
+  boot.initrd.kernelModules =
+    [ # Wait for SCSI devices to appear.
+      "scsi_wait_scan"
+    ];
+
+  # Include some utilities that are useful for installing or repairing
+  # the system.
+  environment.systemPackages = [
+    pkgs.subversion # for nixos-checkout
+    pkgs.w3m # needed for the manual anyway
+    pkgs.testdisk # useful for repairing boot problems
+    pkgs.mssys # for writing Microsoft boot sectors / MBRs
+    pkgs.parted
+    pkgs.ddrescue
+    pkgs.ccrypt
+    pkgs.cryptsetup # needed for dm-crypt volumes
+
+    # Some networking tools.
+    pkgs.sshfsFuse
+    pkgs.socat
+    pkgs.screen
+
+    # Hardware-related tools.
+    pkgs.sdparm
+    pkgs.hdparm
+    pkgs.dmraid
+
+    # Tools to create / manipulate filesystems.
+    pkgs.ntfsprogs # for resizing NTFS partitions
+    pkgs.btrfsProgs
+    pkgs.dosfstools
+    pkgs.xfsprogs
+    pkgs.jfsutils
+    pkgs.jfsrec
+
+    # Some compression/archiver tools.
+    pkgs.unrar
+    pkgs.unzip
+    pkgs.zip
+    pkgs.xz
+    pkgs.dar # disk archiver
+
+    # Some editors.
+    pkgs.nvi
+    pkgs.bvi # binary editor
+    pkgs.joe
+  ];
+}
-- 
GitLab


From c90a7b9be45e4ea6ab8da01d8024f8fa9b4b7d07 Mon Sep 17 00:00:00 2001
From: Nicolas Pierron <nicolas.b.pierron@gmail.com>
Date: Sat, 25 Sep 2010 09:32:32 +0000
Subject: [PATCH 2633/5331] Remove duplicated (modules-list) includes from the
 basic installation cd.

svn path=/nixos/trunk/; revision=23910
---
 modules/installer/cd-dvd/installation-cd-base.nix | 2 --
 1 file changed, 2 deletions(-)

diff --git a/modules/installer/cd-dvd/installation-cd-base.nix b/modules/installer/cd-dvd/installation-cd-base.nix
index a6d880fc6ed..2f7a44863c6 100644
--- a/modules/installer/cd-dvd/installation-cd-base.nix
+++ b/modules/installer/cd-dvd/installation-cd-base.nix
@@ -74,8 +74,6 @@ in
     [ options
       ./memtest.nix
       ./iso-image.nix
-      ../../hardware/network/intel-3945abg.nix
-      ../../hardware/network/rt73.nix
       ../../profiles/base.nix
     ];
 
-- 
GitLab


From cf103b8d4df4c5f364f8e9bb9682a21c925bc2e6 Mon Sep 17 00:00:00 2001
From: Nicolas Pierron <nicolas.b.pierron@gmail.com>
Date: Sat, 25 Sep 2010 09:32:37 +0000
Subject: [PATCH 2634/5331] Add 2 index file to define the default case for
 detected and not-detected devices.  These are used to replace hand made
 listings in the basic installation CD.

The configuration file, which is generated by nixos-hardware-scan, enables
not-detected devices by default.

svn path=/nixos/trunk/; revision=23911
---
 modules/installer/cd-dvd/installation-cd-base.nix | 10 +++++-----
 modules/installer/scan/detected.nix               | 13 +++++++++++++
 modules/installer/scan/not-detected.nix           | 12 ++++++++++++
 modules/installer/tools/nixos-hardware-scan.pl    |  6 ++++++
 4 files changed, 36 insertions(+), 5 deletions(-)
 create mode 100644 modules/installer/scan/detected.nix
 create mode 100644 modules/installer/scan/not-detected.nix

diff --git a/modules/installer/cd-dvd/installation-cd-base.nix b/modules/installer/cd-dvd/installation-cd-base.nix
index 2f7a44863c6..3a4f2965d00 100644
--- a/modules/installer/cd-dvd/installation-cd-base.nix
+++ b/modules/installer/cd-dvd/installation-cd-base.nix
@@ -75,6 +75,11 @@ in
       ./memtest.nix
       ./iso-image.nix
       ../../profiles/base.nix
+
+      # Enable devices which are usually scanned, because we don't know the
+      # target system.
+      ../scan/detected.nix
+      ../scan/not-detected.nix
     ];
 
   # ISO naming.
@@ -134,11 +139,6 @@ in
       }
     '';
 
-  # Include the firmware for various wireless cards.
-  networking.enableRT73Firmware = true;
-  networking.enableIntel2200BGFirmware = true;
-  networking.enableIntel3945ABGFirmware = true;
-
   # To speed up installation a little bit, include the complete stdenv
   # in the Nix store on the CD.
   isoImage.storeContents = [ pkgs.stdenv pkgs.klibc pkgs.klibcShrunk ];
diff --git a/modules/installer/scan/detected.nix b/modules/installer/scan/detected.nix
new file mode 100644
index 00000000000..09d04608e68
--- /dev/null
+++ b/modules/installer/scan/detected.nix
@@ -0,0 +1,13 @@
+# List all devices which are detected by nixos-hardware-scan.
+# Common devices are enabled by default.
+{config, pkgs, ...}:
+
+with pkgs.lib;
+
+{
+  config = mkDefault {
+    # Wireless card firmware
+    networking.enableIntel2200BGFirmware = true;
+    networking.enableIntel3945ABGFirmware = true;
+  };
+}
diff --git a/modules/installer/scan/not-detected.nix b/modules/installer/scan/not-detected.nix
new file mode 100644
index 00000000000..3a4a7f40fc6
--- /dev/null
+++ b/modules/installer/scan/not-detected.nix
@@ -0,0 +1,12 @@
+# List all devices which are _not_ detected by nixos-hardware-scan.
+# Common devices are enabled by default.
+{config, pkgs, ...}:
+
+with pkgs.lib;
+
+{
+  config = mkDefault {
+    # Wireless card firmware
+    networking.enableRT73Firmware = true;
+  };
+}
diff --git a/modules/installer/tools/nixos-hardware-scan.pl b/modules/installer/tools/nixos-hardware-scan.pl
index ce1085f8ebc..25ef0afe67a 100644
--- a/modules/installer/tools/nixos-hardware-scan.pl
+++ b/modules/installer/tools/nixos-hardware-scan.pl
@@ -227,7 +227,13 @@ my $attrs = multiLineList("  ", removeDups @attrs);
 print <<EOF ;
 # This is a generated file.  Do not modify!
 # Make changes to /etc/nixos/configuration.nix instead.
+{modulesPath, ...}:
+
 {
+  require = [
+    "\${modulesPath}/installer/scan/not-detected.nix"
+  ];
+
   boot.initrd.kernelModules = [ $initrdKernelModules ];
   boot.kernelModules = [ $kernelModules ];
 
-- 
GitLab


From 112cd0c4d45062fbbddbaf6869c8972c50882fa9 Mon Sep 17 00:00:00 2001
From: Nicolas Pierron <nicolas.b.pierron@gmail.com>
Date: Sat, 25 Sep 2010 09:32:43 +0000
Subject: [PATCH 2635/5331] Add an installation device profile, and use it it
 the basic installation CD.

svn path=/nixos/trunk/; revision=23912
---
 .../installer/cd-dvd/installation-cd-base.nix | 34 ++-----------
 modules/profiles/installation-device.nix      | 48 +++++++++++++++++++
 2 files changed, 51 insertions(+), 31 deletions(-)
 create mode 100644 modules/profiles/installation-device.nix

diff --git a/modules/installer/cd-dvd/installation-cd-base.nix b/modules/installer/cd-dvd/installation-cd-base.nix
index 3a4f2965d00..e8d51da090d 100644
--- a/modules/installer/cd-dvd/installation-cd-base.nix
+++ b/modules/installer/cd-dvd/installation-cd-base.nix
@@ -74,7 +74,10 @@ in
     [ options
       ./memtest.nix
       ./iso-image.nix
+
+      # Profiles of this basic installation CD.
       ../../profiles/base.nix
+      ../../profiles/installation-device.nix
 
       # Enable devices which are usually scanned, because we don't know the
       # target system.
@@ -87,30 +90,10 @@ in
     
   isoImage.volumeID = "NIXOS_INSTALL_CD_${config.system.nixosVersion}";
   
-  # Show the manual.
-  services.nixosManual.showManual = true;
-
-  # Let the user play Rogue on TTY 8 during the installation.
-  services.rogue.enable = true;
-
-  # Disable some other stuff we don't need.
-  security.sudo.enable = false;
-
-  # Include only the en_US locale.  This saves 75 MiB or so compared to
-  # the full glibcLocales package.
-  i18n.supportedLocales = ["en_US.UTF-8/UTF-8" "en_US/ISO-8859-1"];
-
-  # nixos-install will do a pull from this channel to speed up the
-  # installation.
-  installer.nixpkgsURL = http://nixos.org/releases/nixpkgs/channels/nixpkgs-unstable;
-
   boot.postBootCommands =
     ''
       export PATH=${pkgs.gnutar}/bin:${pkgs.bzip2}/bin:$PATH
 
-      # Provide a mount point for nixos-install.
-      mkdir -p /mnt
-
       # Provide the NixOS/Nixpkgs sources in /etc/nixos.  This is required
       # for nixos-install.
       ${optionalString includeSources ''
@@ -128,17 +111,6 @@ in
       cp ${dummyConfiguration} /etc/nixos/configuration.nix
     '';
 
-  # Some more help text.
-  services.mingetty.helpLine =
-    ''
-        
-      Log in as "root" with an empty password.  ${
-        if config.services.xserver.enable then
-          "Type `start xserver' to start\nthe graphical user interface."
-        else ""
-      }
-    '';
-
   # To speed up installation a little bit, include the complete stdenv
   # in the Nix store on the CD.
   isoImage.storeContents = [ pkgs.stdenv pkgs.klibc pkgs.klibcShrunk ];
diff --git a/modules/profiles/installation-device.nix b/modules/profiles/installation-device.nix
new file mode 100644
index 00000000000..54ce32eb0e8
--- /dev/null
+++ b/modules/profiles/installation-device.nix
@@ -0,0 +1,48 @@
+{config, pkgs, ...}:
+
+{
+  # Show the manual.
+  services.nixosManual.showManual = true;
+
+  # Let the user play Rogue on TTY 8 during the installation.
+  services.rogue.enable = true;
+
+  # Disable some other stuff we don't need.
+  security.sudo.enable = false;
+
+  # Include only the en_US locale.  This saves 75 MiB or so compared to
+  # the full glibcLocales package.
+  i18n.supportedLocales = ["en_US.UTF-8/UTF-8" "en_US/ISO-8859-1"];
+
+  # nixos-install will do a pull from this channel to speed up the
+  # installation.
+  installer.nixpkgsURL = http://nixos.org/releases/nixpkgs/channels/nixpkgs-unstable;
+
+  boot.postBootCommands =
+    ''
+      # Provide a mount point for nixos-install.
+      mkdir -p /mnt
+    '';
+
+  # Some more help text.
+  services.mingetty.helpLine =
+    ''
+        
+      Log in as "root" with an empty password.  ${
+        if config.services.xserver.enable then
+          "Type `start xserver' to start\nthe graphical user interface."
+        else ""
+      }
+    '';
+
+
+  # Allow sshd to be started manually through "start sshd".  It should
+  # not be started by default on the installation CD because the
+  # default root password is empty.
+  services.openssh.enable = true;
+  jobs.sshd.startOn = pkgs.lib.mkOverride 50 "";
+
+  # Enable wpa_supplicant, but don't start it by default.
+  networking.enableWLAN = true;
+  jobs.wpa_supplicant.startOn = pkgs.lib.mkOverride 50 "";
+}
\ No newline at end of file
-- 
GitLab


From d2d139e920f3f50c8479d7be6282582b9ac9e56c Mon Sep 17 00:00:00 2001
From: Nicolas Pierron <nicolas.b.pierron@gmail.com>
Date: Sat, 25 Sep 2010 09:32:48 +0000
Subject: [PATCH 2636/5331] Move the generation of the dummy configuration file
 into the installation device profile.

TODO: The current configuration does not reproduce exactly the CD
configuration, fix it.

svn path=/nixos/trunk/; revision=23913
---
 .../installer/cd-dvd/installation-cd-base.nix |  35 +----
 modules/profiles/installation-device.nix      | 143 +++++++++++++-----
 2 files changed, 110 insertions(+), 68 deletions(-)

diff --git a/modules/installer/cd-dvd/installation-cd-base.nix b/modules/installer/cd-dvd/installation-cd-base.nix
index e8d51da090d..23c1e02be43 100644
--- a/modules/installer/cd-dvd/installation-cd-base.nix
+++ b/modules/installer/cd-dvd/installation-cd-base.nix
@@ -9,13 +9,8 @@ let
 
   options = {
 
-    system.nixosVersion = mkOption {
-      default = "${builtins.readFile ../../../VERSION}";
-      description = ''
-        NixOS version number.
-      '';
-    };
-
+    # you can retrieve the profiles which have been used by looking at the
+    # list of modules use to configure the installation device.
     installer.configModule = mkOption {
       example = "./nixos/modules/installer/cd-dvd/installation-cd.nix";
       description = ''
@@ -45,27 +40,6 @@ let
   nixpkgsTarball = makeTarball "nixpkgs.tar.bz2" (cleanSource pkgs.path);
 
   includeSources = true;
-
-
-  # A dummy /etc/nixos/configuration.nix in the booted CD that
-  # rebuilds the CD's configuration (and allows the configuration to
-  # be modified, of course, providing a true live CD).  Problem is
-  # that we don't really know how the CD was built - the Nix
-  # expression language doesn't allow us to query the expression being
-  # evaluated.  So we'll just hope for the best.
-  dummyConfiguration = pkgs.writeText "configuration.nix"
-    ''
-      {config, pkgs, ...}:
-
-      {
-        require = [${config.installer.configModule}];
-
-        # Add your own options below and run "nixos-rebuild switch".
-        # E.g.,
-        #   services.openssh.enable = true;
-      }
-    '';
-  
   
 in
 
@@ -104,11 +78,6 @@ in
         tar xjf ${nixpkgsTarball}/nixpkgs.tar.bz2 -C /etc/nixos/nixpkgs
         chown -R root.root /etc/nixos
      ''}
-
-      # Provide a configuration for the CD/DVD itself, to allow users
-      # to run nixos-rebuild to change the configuration of the
-      # running system on the CD/DVD.
-      cp ${dummyConfiguration} /etc/nixos/configuration.nix
     '';
 
   # To speed up installation a little bit, include the complete stdenv
diff --git a/modules/profiles/installation-device.nix b/modules/profiles/installation-device.nix
index 54ce32eb0e8..32f356cdd29 100644
--- a/modules/profiles/installation-device.nix
+++ b/modules/profiles/installation-device.nix
@@ -1,48 +1,121 @@
 {config, pkgs, ...}:
 
-{
-  # Show the manual.
-  services.nixosManual.showManual = true;
-
-  # Let the user play Rogue on TTY 8 during the installation.
-  services.rogue.enable = true;
+with pkgs.lib;
 
-  # Disable some other stuff we don't need.
-  security.sudo.enable = false;
+let
+  # Location of the repository on the harddrive
+  profilePath = toString ./.;
 
-  # Include only the en_US locale.  This saves 75 MiB or so compared to
-  # the full glibcLocales package.
-  i18n.supportedLocales = ["en_US.UTF-8/UTF-8" "en_US/ISO-8859-1"];
+  # Check if the path is from the NixOS repository
+  isProfile = path:
+    let s = toString path; in
+      removePrefix profilePath s != s;
 
-  # nixos-install will do a pull from this channel to speed up the
-  # installation.
-  installer.nixpkgsURL = http://nixos.org/releases/nixpkgs/channels/nixpkgs-unstable;
+  # Rename NixOS modules used to setup the current device to make findable form
+  # the default location of the configuration.nix file.
+  getProfileModules =
+    map (path: "./nixos/modules/profiles" + removePrefix isProfile (toString path))
+      filter (m: isPath m && isProfile m) modules;
 
-  boot.postBootCommands =
+  # A dummy /etc/nixos/configuration.nix in the booted CD that
+  # rebuilds the CD's configuration (and allows the configuration to
+  # be modified, of course, providing a true live CD).  Problem is
+  # that we don't really know how the CD was built - the Nix
+  # expression language doesn't allow us to query the expression being
+  # evaluated.  So we'll just hope for the best.
+  configClone = pkgs.writeText "configuration.nix"
     ''
-      # Provide a mount point for nixos-install.
-      mkdir -p /mnt
-    '';
+      {config, pkgs, ...}:
 
-  # Some more help text.
-  services.mingetty.helpLine =
-    ''
-        
-      Log in as "root" with an empty password.  ${
-        if config.services.xserver.enable then
-          "Type `start xserver' to start\nthe graphical user interface."
-        else ""
+      {
+        require = [${toString config.installer.cloneConfigIncludes}];
+
+        # Add your own options below and run "nixos-rebuild switch".
+        # E.g.,
+        #   services.openssh.enable = true;
       }
     '';
+in
+
+{
+  options = {
+    system.nixosVersion = mkOption {
+      default = "${builtins.readFile ../../VERSION}";
+      description = ''
+        NixOS version number.
+      '';
+    };
+
+    installer.cloneConfig = mkOption {
+      default = true;
+      description = ''
+        Try to clone the installation-device configuration by re-using it's
+        profile from the list of imported modules.
+      '';
+    };
+
+    installer.cloneConfigIncludes = mkOption {
+      default = [];
+      example = [ "./nixos/modules/hardware/network/rt73.nix" ];
+      description = ''
+        List of modules used to re-build this installation device profile.
+      '';
+    };
+  };
+
+  config = {
+    installer.cloneConfigIncludes = getProfileModules;
+
+    # Show the manual.
+    services.nixosManual.showManual = true;
+
+    # Let the user play Rogue on TTY 8 during the installation.
+    services.rogue.enable = true;
+
+    # Disable some other stuff we don't need.
+    security.sudo.enable = false;
+
+    # Include only the en_US locale.  This saves 75 MiB or so compared to
+    # the full glibcLocales package.
+    i18n.supportedLocales = ["en_US.UTF-8/UTF-8" "en_US/ISO-8859-1"];
+
+    # nixos-install will do a pull from this channel to speed up the
+    # installation.
+    installer.nixpkgsURL = http://nixos.org/releases/nixpkgs/channels/nixpkgs-unstable;
+
+    boot.postBootCommands =
+      ''
+        # Provide a mount point for nixos-install.
+        mkdir -p /mnt
+
+        ${optionalString config.installer.cloneConfig ''
+          # Provide a configuration for the CD/DVD itself, to allow users
+          # to run nixos-rebuild to change the configuration of the
+          # running system on the CD/DVD.
+          cp ${configClone} /etc/nixos/configuration.nix
+       ''}
+      '';
+
+    # Some more help text.
+    services.mingetty.helpLine =
+      ''
+          
+        Log in as "root" with an empty password.  ${
+          if config.services.xserver.enable then
+            "Type `start xserver' to start\nthe graphical user interface."
+          else ""
+        }
+      '';
 
 
-  # Allow sshd to be started manually through "start sshd".  It should
-  # not be started by default on the installation CD because the
-  # default root password is empty.
-  services.openssh.enable = true;
-  jobs.sshd.startOn = pkgs.lib.mkOverride 50 "";
+    # Allow sshd to be started manually through "start sshd".  It should
+    # not be started by default on the installation CD because the
+    # default root password is empty.
+    services.openssh.enable = true;
+    jobs.sshd.startOn = pkgs.lib.mkOverride 50 "";
 
-  # Enable wpa_supplicant, but don't start it by default.
-  networking.enableWLAN = true;
-  jobs.wpa_supplicant.startOn = pkgs.lib.mkOverride 50 "";
-}
\ No newline at end of file
+    # Enable wpa_supplicant, but don't start it by default.
+    networking.enableWLAN = true;
+    jobs.wpa_supplicant.startOn = pkgs.lib.mkOverride 50 "";
+  };
+}
-- 
GitLab


From 59429aa449cf988a1ea9d4b387f8878436c84b3f Mon Sep 17 00:00:00 2001
From: Nicolas Pierron <nicolas.b.pierron@gmail.com>
Date: Sat, 25 Sep 2010 09:32:52 +0000
Subject: [PATCH 2637/5331] Change the policy used to select files added in the
 import list of the generated configuration.  Use all files listed as modules
 of eval-config.

svn path=/nixos/trunk/; revision=23914
---
 .../installer/cd-dvd/installation-cd-base.nix | 18 +-----
 modules/profiles/installation-device.nix      | 58 +++++++++++++++----
 2 files changed, 47 insertions(+), 29 deletions(-)

diff --git a/modules/installer/cd-dvd/installation-cd-base.nix b/modules/installer/cd-dvd/installation-cd-base.nix
index 23c1e02be43..0df44fac116 100644
--- a/modules/installer/cd-dvd/installation-cd-base.nix
+++ b/modules/installer/cd-dvd/installation-cd-base.nix
@@ -7,21 +7,6 @@ with pkgs.lib;
 
 let
 
-  options = {
-
-    # you can retrieve the profiles which have been used by looking at the
-    # list of modules use to configure the installation device.
-    installer.configModule = mkOption {
-      example = "./nixos/modules/installer/cd-dvd/installation-cd.nix";
-      description = ''
-        Filename of the configuration module that builds the CD
-        configuration.  Must be specified to support reconfiguration
-        in live CDs.
-      '';
-    };
-  };
-
-
   # 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.  !!! Once
@@ -45,8 +30,7 @@ in
 
 {
   require =
-    [ options
-      ./memtest.nix
+    [ ./memtest.nix
       ./iso-image.nix
 
       # Profiles of this basic installation CD.
diff --git a/modules/profiles/installation-device.nix b/modules/profiles/installation-device.nix
index 32f356cdd29..cea967cc36d 100644
--- a/modules/profiles/installation-device.nix
+++ b/modules/profiles/installation-device.nix
@@ -1,21 +1,40 @@
-{config, pkgs, ...}:
+# Provide a basic cponfiguration for installation devices like CDs.
+{config, pkgs, modules, ...}:
 
 with pkgs.lib;
 
 let
   # Location of the repository on the harddrive
-  profilePath = toString ./.;
+  nixosPath = toString ../../.;
 
   # Check if the path is from the NixOS repository
-  isProfile = path:
+  isNixOSFile = path:
     let s = toString path; in
-      removePrefix profilePath s != s;
-
-  # Rename NixOS modules used to setup the current device to make findable form
-  # the default location of the configuration.nix file.
-  getProfileModules =
-    map (path: "./nixos/modules/profiles" + removePrefix isProfile (toString path))
-      filter (m: isPath m && isProfile m) modules;
+      removePrefix nixosPath s != s;
+
+  # Copy modules given as extra configuration files.  Unfortunately, we
+  # cannot serialized attribute set given in the list of modules (that's why
+  # you should use files).
+  moduleFiles =
+    filter isPath modules;
+
+  # Partition module files because between NixOS and non-NixOS files.  NixOS
+  # files may change if the repository is updated.
+  partitionnedModuleFiles =
+    let p = partition isNixOSFile moduleFiles; in
+    { nixos = p.right; others = p.wrong; };
+
+  # Path transformed to be valid on the installation device.  Thus the
+  # device configuration could be rebuild.
+  relocatedModuleFiles =
+    let
+      relocateNixOS = path:
+        "/etc/nixos/nixos" + removePrefix nixosPath (toString path);
+      relocateOthers = null;
+    in
+      { nixos = map relocateNixOS partitionnedModuleFiles.nixos;
+        others = []; # TODO: copy the modules to the install-device repository.
+      };
 
   # A dummy /etc/nixos/configuration.nix in the booted CD that
   # rebuilds the CD's configuration (and allows the configuration to
@@ -28,7 +47,9 @@ let
       {config, pkgs, ...}:
 
       {
-        require = [${toString config.installer.cloneConfigIncludes}];
+        require = [
+          ${toString config.installer.cloneConfigIncludes}
+        ];
 
         # Add your own options below and run "nixos-rebuild switch".
         # E.g.,
@@ -61,10 +82,23 @@ in
         List of modules used to re-build this installation device profile.
       '';
     };
+
+    # Ignored. Kept for Backward compatibiliy.
+    # you can retrieve the profiles which have been used by looking at the
+    # list of modules use to configure the installation device.
+    installer.configModule = mkOption {
+      example = "./nixos/modules/installer/cd-dvd/installation-cd.nix";
+      description = ''
+        Filename of the configuration module that builds the CD
+        configuration.  Must be specified to support reconfiguration
+        in live CDs.
+      '';
+    };
   };
 
   config = {
-    installer.cloneConfigIncludes = getProfileModules;
+    installer.cloneConfigIncludes =
+      relocatedModuleFiles.nixos ++ relocatedModuleFiles.others;
 
     # Show the manual.
     services.nixosManual.showManual = true;
-- 
GitLab


From f3cc01bd3bf3cdfbdb342ce20dc90479ffedec28 Mon Sep 17 00:00:00 2001
From: Nicolas Pierron <nicolas.b.pierron@gmail.com>
Date: Sat, 25 Sep 2010 09:32:57 +0000
Subject: [PATCH 2638/5331] Extract graphical and minimal profiles from the
 installation CDs.

svn path=/nixos/trunk/; revision=23915
---
 .../cd-dvd/installation-cd-graphical.nix        | 15 ++++-----------
 .../cd-dvd/installation-cd-minimal.nix          | 14 ++++----------
 modules/profiles/graphical.nix                  | 17 +++++++++++++++++
 modules/profiles/installation-device.nix        |  4 ++++
 modules/profiles/minimal.nix                    | 15 +++++++++++++++
 5 files changed, 44 insertions(+), 21 deletions(-)
 create mode 100644 modules/profiles/graphical.nix
 create mode 100644 modules/profiles/minimal.nix

diff --git a/modules/installer/cd-dvd/installation-cd-graphical.nix b/modules/installer/cd-dvd/installation-cd-graphical.nix
index 5f600022dce..a3c533bb715 100644
--- a/modules/installer/cd-dvd/installation-cd-graphical.nix
+++ b/modules/installer/cd-dvd/installation-cd-graphical.nix
@@ -4,15 +4,8 @@
 {config, pkgs, ...}:
 
 {
-  require = [./installation-cd-base.nix];
-
-  installer.configModule = "./nixos/modules/installer/cd-dvd/installation-cd-graphical.nix";
-
-  services.xserver = {
-    enable = true;
-    autorun = false;
-    defaultDepth = 16;
-    desktopManager.default = "kde4";
-    desktopManager.kde4.enable = true;
-  };
+  require = [
+    ./installation-cd-base.nix
+    ../../profiles/graphical.nix
+  ];
 }
diff --git a/modules/installer/cd-dvd/installation-cd-minimal.nix b/modules/installer/cd-dvd/installation-cd-minimal.nix
index 4d85b7c8a80..c166e3f4ad0 100644
--- a/modules/installer/cd-dvd/installation-cd-minimal.nix
+++ b/modules/installer/cd-dvd/installation-cd-minimal.nix
@@ -4,14 +4,8 @@
 {config, pkgs, ...}:
 
 {
-  require = [./installation-cd-base.nix];
-
-  installer.configModule = "./nixos/modules/installer/cd-dvd/installation-cd-minimal.nix";
-
-  # Don't include X libraries.
-  services.openssh.forwardX11 = false;
-  services.dbus.enable = false; # depends on libX11
-  services.hal.enable = false; # depends on dbus
-  fonts.enableFontConfig = false;
-  fonts.enableCoreFonts = false;
+  require = [
+    ./installation-cd-base.nix
+    ../../profiles/minimal.nix
+  ];
 }
diff --git a/modules/profiles/graphical.nix b/modules/profiles/graphical.nix
new file mode 100644
index 00000000000..58b4ffa7c1a
--- /dev/null
+++ b/modules/profiles/graphical.nix
@@ -0,0 +1,17 @@
+# This module defines a NixOS configuration that contains X11 and
+# KDE 4.
+{config, pkgs, ...}:
+
+{
+  require = [
+    ./base.nix
+  ];
+
+  services.xserver = {
+    enable = true;
+    autorun = true;
+    defaultDepth = 24;
+    desktopManager.default = "kde4";
+    desktopManager.kde4.enable = true;
+  };
+}
diff --git a/modules/profiles/installation-device.nix b/modules/profiles/installation-device.nix
index cea967cc36d..51072f25825 100644
--- a/modules/profiles/installation-device.nix
+++ b/modules/profiles/installation-device.nix
@@ -130,6 +130,10 @@ in
        ''}
       '';
 
+    # Force the xserver autorun to false.
+    services.xserver.autorun = mkForce false;
+    services.xserver.defaultDepth = mkForce 16;
+
     # Some more help text.
     services.mingetty.helpLine =
       ''
diff --git a/modules/profiles/minimal.nix b/modules/profiles/minimal.nix
new file mode 100644
index 00000000000..acc56d94edc
--- /dev/null
+++ b/modules/profiles/minimal.nix
@@ -0,0 +1,15 @@
+# This module defines a small NixOS configuration.  It does not
+# contain any graphical stuff.
+
+{config, pkgs, ...}:
+
+{
+  require = [ ./base.nix ];
+
+  # Don't include X libraries.
+  services.openssh.forwardX11 = false;
+  services.dbus.enable = false; # depends on libX11
+  services.hal.enable = false; # depends on dbus
+  fonts.enableFontConfig = false;
+  fonts.enableCoreFonts = false;
+}
-- 
GitLab


From 9936a6f525e0dbbc9977f4255ce373d4e9951bb9 Mon Sep 17 00:00:00 2001
From: Nicolas Pierron <nicolas.b.pierron@gmail.com>
Date: Sat, 25 Sep 2010 09:33:03 +0000
Subject: [PATCH 2639/5331] Simplify system-tarball-pc.nix.  Factor detected /
 undetected devices into the instalaltion-device profile.

svn path=/nixos/trunk/; revision=23916
---
 .../installer/cd-dvd/installation-cd-base.nix |   5 -
 .../installer/cd-dvd/system-tarball-pc.nix    | 166 +-----------------
 modules/profiles/installation-device.nix      |   7 +
 3 files changed, 14 insertions(+), 164 deletions(-)

diff --git a/modules/installer/cd-dvd/installation-cd-base.nix b/modules/installer/cd-dvd/installation-cd-base.nix
index 0df44fac116..85f83b106cb 100644
--- a/modules/installer/cd-dvd/installation-cd-base.nix
+++ b/modules/installer/cd-dvd/installation-cd-base.nix
@@ -36,11 +36,6 @@ in
       # Profiles of this basic installation CD.
       ../../profiles/base.nix
       ../../profiles/installation-device.nix
-
-      # Enable devices which are usually scanned, because we don't know the
-      # target system.
-      ../scan/detected.nix
-      ../scan/not-detected.nix
     ];
 
   # ISO naming.
diff --git a/modules/installer/cd-dvd/system-tarball-pc.nix b/modules/installer/cd-dvd/system-tarball-pc.nix
index 5a01dec5202..cb9d5135240 100644
--- a/modules/installer/cd-dvd/system-tarball-pc.nix
+++ b/modules/installer/cd-dvd/system-tarball-pc.nix
@@ -7,172 +7,20 @@ with pkgs.lib;
 
 let
 
-  # A dummy /etc/nixos/configuration.nix in the booted CD that
-  # rebuilds the CD's configuration (and allows the configuration to
-  # be modified, of course, providing a true live CD).  Problem is
-  # that we don't really know how the CD was built - the Nix
-  # expression language doesn't allow us to query the expression being
-  # evaluated.  So we'll just hope for the best.
-  dummyConfiguration = pkgs.writeText "configuration.nix"
-    ''
-      {config, pkgs, ...}:
-
-      {
-        require = [ ];
-
-        # Add your own options below and run "nixos-rebuild switch".
-        # E.g.,
-        #   services.openssh.enable = true;
-      }
-    '';
-  
-
   pkgs2storeContents = l : map (x: { object = x; symlink = "none"; }) l;
 
-  options = {
-
-    system.nixosVersion = mkOption {
-      default = "${builtins.readFile ../../../VERSION}";
-      description = ''
-        NixOS version number.
-      '';
-    };
-  };
-  
 in
 
 {
-  require =
-    [ options
-      ./system-tarball.nix
-      ../../hardware/network/rt73.nix
-    ];
-
-
-  # Disable some other stuff we don't need.
-  security.sudo.enable = false;
-
-  # Include only the en_US locale.  This saves 75 MiB or so compared to
-  # the full glibcLocales package.
-  i18n.supportedLocales = ["en_US.UTF-8/UTF-8" "en_US/ISO-8859-1"];
-
-  # Include some utilities that are useful for installing or repairing
-  # the system.
-  environment.systemPackages =
-    [ pkgs.subversion # for nixos-checkout
-      pkgs.w3m # needed for the manual anyway
-      pkgs.testdisk # useful for repairing boot problems
-      pkgs.mssys # for writing Microsoft boot sectors / MBRs
-      pkgs.parted
-      pkgs.ddrescue
-      pkgs.ccrypt
-      pkgs.cryptsetup # needed for dm-crypt volumes
-
-      # Some networking tools.
-      pkgs.sshfsFuse
-      pkgs.socat
-      pkgs.screen
-      pkgs.wpa_supplicant # !!! should use the wpa module
-
-      # Hardware-related tools.
-      pkgs.sdparm
-      pkgs.hdparm
-      pkgs.dmraid
-
-      # Tools to create / manipulate filesystems.
-      pkgs.ntfsprogs # for resizing NTFS partitions
-      pkgs.btrfsProgs
-      pkgs.xfsprogs
-      pkgs.jfsutils
-      pkgs.jfsrec
-
-      # Some compression/archiver tools.
-      pkgs.unrar
-      pkgs.unzip
-      pkgs.zip
-      pkgs.xz
-      pkgs.dar # disk archiver
-      
-      # Some editors.
-      pkgs.nvi
-      pkgs.bvi # binary editor
-      pkgs.joe
-    ];
-
-  # The initrd has to contain any module that might be necessary for
-  # mounting the CD/DVD.
-  boot.initrd.availableKernelModules =
-    [ # SATA/PATA support.
-      "ahci"
-
-      "ata_piix"
-
-      "sata_inic162x" "sata_nv" "sata_promise" "sata_qstor"
-      "sata_sil" "sata_sil24" "sata_sis" "sata_svw" "sata_sx4"
-      "sata_uli" "sata_via" "sata_vsc"
-
-      "pata_ali" "pata_amd" "pata_artop" "pata_atiixp"
-      "pata_cs5520" "pata_cs5530" "pata_cs5535" "pata_efar"
-      "pata_hpt366" "pata_hpt37x" "pata_hpt3x2n" "pata_hpt3x3"
-      "pata_it8213" "pata_it821x" "pata_jmicron" "pata_marvell"
-      "pata_mpiix" "pata_netcell" "pata_ns87410" "pata_oldpiix"
-      "pata_pcmcia" "pata_pdc2027x" "pata_qdi" "pata_rz1000"
-      "pata_sc1200" "pata_serverworks" "pata_sil680" "pata_sis"
-      "pata_sl82c105" "pata_triflex" "pata_via"
-      "pata_winbond"
-
-      # SCSI support (incomplete).
-      "3w-9xxx" "3w-xxxx" "aic79xx" "aic7xxx" "arcmsr" 
-
-      # USB support, especially for booting from USB CD-ROM
-      # drives.
-      "usb_storage"
-
-      # Firewire support.  Not tested.
-      "ohci1394" "sbp2"
-
-      # Virtio (QEMU, KVM etc.) support.
-      "virtio_net" "virtio_pci" "virtio_blk" "virtio_balloon"
-
-      # Add vfat to enable people to copy the contents of the CD to a
-      # bootable USB stick.
-      "vfat"
-    ];
-
-  boot.initrd.kernelModules =
-    [ # Wait for SCSI devices to appear.
-      "scsi_wait_scan"
-    ];
-
-  boot.postBootCommands =
-    ''
-      mkdir -p /mnt
-
-      cp ${dummyConfiguration} /etc/nixos/configuration.nix
-    '';
-
-  # Some more help text.
-  services.mingetty.helpLine =
-    ''
-        
-      Log in as "root" with an empty password.  ${
-        if config.services.xserver.enable then
-          "Type `start xserver' to start\nthe graphical user interface."
-        else ""
-      }
-    '';
-
-  # Include the firmware for various wireless cards.
-  networking.enableRT73Firmware = true;
-  networking.enableIntel2200BGFirmware = true;
+  require = [
+    ./system-tarball.nix
+ 
+   # Profiles of this basic installation.
+    ../../profiles/base.nix
+    ../../profiles/installation-device.nix
+  ];
 
   # To speed up further installation of packages, include the complete stdenv
   # in the Nix store of the tarball.
   tarball.storeContents = pkgs2storeContents [ pkgs.stdenv pkgs.klibc pkgs.klibcShrunk ];
-
-  # Allow sshd to be started manually through "start sshd".  It should
-  # not be started by default on the installation CD because the
-  # default root password is empty.
-  services.openssh.enable = true;
-  jobs.sshd.startOn = pkgs.lib.mkOverrideTemplate 50 {} "";
 }
diff --git a/modules/profiles/installation-device.nix b/modules/profiles/installation-device.nix
index 51072f25825..ccd982c9ce9 100644
--- a/modules/profiles/installation-device.nix
+++ b/modules/profiles/installation-device.nix
@@ -59,6 +59,13 @@ let
 in
 
 {
+  imports = [
+    # Enable devices which are usually scanned, because we don't know the
+    # target system.
+    ../installer/scan/detected.nix
+    ../installer/scan/not-detected.nix
+  ];
+
   options = {
     system.nixosVersion = mkOption {
       default = "${builtins.readFile ../../VERSION}";
-- 
GitLab


From 5fb80fcc4b5b338ae5e69777449b3429a4051f9b Mon Sep 17 00:00:00 2001
From: Nicolas Pierron <nicolas.b.pierron@gmail.com>
Date: Sat, 25 Sep 2010 09:33:09 +0000
Subject: [PATCH 2640/5331] Extract rescue profile from the the corresponding
 CD.

svn path=/nixos/trunk/; revision=23917
---
 .../cd-dvd/installation-cd-rescue.nix         | 46 ++--------------
 modules/profiles/rescue.nix                   | 52 +++++++++++++++++++
 2 files changed, 55 insertions(+), 43 deletions(-)
 create mode 100644 modules/profiles/rescue.nix

diff --git a/modules/installer/cd-dvd/installation-cd-rescue.nix b/modules/installer/cd-dvd/installation-cd-rescue.nix
index ed5184c69cb..43b9c9e2b7c 100644
--- a/modules/installer/cd-dvd/installation-cd-rescue.nix
+++ b/modules/installer/cd-dvd/installation-cd-rescue.nix
@@ -4,48 +4,8 @@
 {config, pkgs, ...}:
 
 {
-  require = [./installation-cd-base.nix];
-
-  installer.configModule = "./nixos/modules/installer/cd-dvd/installation-cd-minimal.nix";
-
-  # Don't include X libraries.
-  services.openssh.forwardX11 = false;
-  services.dbus.enable = false; # depends on libX11
-  services.hal.enable = false; # depends on dbus
-  fonts.enableFontConfig = false;
-  fonts.enableCoreFonts = false;
-
-  # Useful for rescue..
-  environment.systemPackages = with pkgs; [
-    utillinuxCurses ddrescue 
-    pciutils sdparm hdparm hddtemp usbutils
-    btrfsProgs xfsprogs jfsutils jfsrec
-    iproute 
-    fuse ntfs3g smbfsFuse sshfsFuse
-    manpages irssi elinks mcabber mutt openssh lftp 
-    openssl ncat socat
-    gnupg1 gnupg
-    patch which diffutils gcc binutils bc file
-    screen
-    bvi joe nvi 
-    subversion16 monotone git darcs mercurial bazaar cvs
-    unrar unzip zip lzma cabextract cpio 
-    lsof
+  require = [
+    ./installation-cd-base.nix
+    ../../profiles/rescue.nix
   ];
-
-  boot.kernelPackages = pkgs.linuxPackages_2_6_32;
-  boot.initrd.kernelModules = ["evdev" "i8042" "pcips2" "serio"
-    "sd_mod" "libata" "unix" "usbhid" "uhci_hcd" "atkbd" "xtkbd" "fbdev"
-    "iso9660" "udf" "loop"];
-  boot.kernelModules = ["fbcon" "radeonfb" "intelfb" "sisfb" "nvidiafb"
-    "cirrusfb"];
-  boot.kernelParams = [
-      "selinux=0"
-      "acpi=on"
-      "apm=off"
-      "console=tty1"
-      "splash=verbose"
-    ];
-
-  services.ttyBackgrounds.enable = false;
 }
diff --git a/modules/profiles/rescue.nix b/modules/profiles/rescue.nix
new file mode 100644
index 00000000000..b3b830e6618
--- /dev/null
+++ b/modules/profiles/rescue.nix
@@ -0,0 +1,52 @@
+# This module defines a small NixOS configuration.  It does not contain any
+# graphical stuff but contains many tools useful for the rescue.
+
+{config, pkgs, ...}:
+
+{
+  require = [ ./minimal.nix ];
+
+  # Useful for rescue..
+  environment.systemPackages = with pkgs; [
+    utillinuxCurses ddrescue 
+    pciutils sdparm hdparm hddtemp usbutils
+    btrfsProgs xfsprogs jfsutils jfsrec
+    iproute 
+    fuse ntfs3g smbfsFuse sshfsFuse
+    manpages irssi elinks mcabber mutt openssh lftp 
+    openssl ncat socat
+    gnupg1 gnupg
+    patch which diffutils gcc binutils bc file
+    screen
+    bvi joe nvi 
+    subversion16 monotone git darcs mercurial bazaar cvs
+    unrar unzip zip lzma cabextract cpio 
+    lsof
+  ];
+
+  boot.kernelPackages = pkgs.linuxPackages_2_6_32;
+
+  boot.initrd.kernelModules = [
+    "evdev" "i8042" "pcips2" "serio" "sd_mod" "libata" "unix" "usbhid"
+    "uhci_hcd" "atkbd" "xtkbd" "fbdev" "iso9660" "udf" "loop"
+  ];
+
+  boot.kernelModules = [
+    "fbcon"
+    "radeonfb"
+    "intelfb"
+    "sisfb"
+    "nvidiafb"
+    "cirrusfb"
+  ];
+
+  boot.kernelParams = [
+    "selinux=0"
+    "acpi=on"
+    "apm=off"
+    "console=tty1"
+    "splash=verbose"
+  ];
+
+  services.ttyBackgrounds.enable = false;
+}
-- 
GitLab


From c18fe31160960d4a35753a510d74c6bfb34a921c Mon Sep 17 00:00:00 2001
From: Nicolas Pierron <nicolas.b.pierron@gmail.com>
Date: Sat, 25 Sep 2010 09:33:13 +0000
Subject: [PATCH 2641/5331] Make nixos-hardware-scan adding a profile to the
 generated configuration file.

svn path=/nixos/trunk/; revision=23918
---
 modules/installer/tools/nixos-hardware-scan.pl | 1 +
 modules/installer/tools/tools.nix              | 9 +++++++++
 2 files changed, 10 insertions(+)

diff --git a/modules/installer/tools/nixos-hardware-scan.pl b/modules/installer/tools/nixos-hardware-scan.pl
index 25ef0afe67a..56549f99235 100644
--- a/modules/installer/tools/nixos-hardware-scan.pl
+++ b/modules/installer/tools/nixos-hardware-scan.pl
@@ -231,6 +231,7 @@ print <<EOF ;
 
 {
   require = [
+    "\${modulesPath}/profiles/@profile@.nix"
     "\${modulesPath}/installer/scan/not-detected.nix"
   ];
 
diff --git a/modules/installer/tools/tools.nix b/modules/installer/tools/tools.nix
index d9ebb58a9f8..4b0a186d6c4 100644
--- a/modules/installer/tools/tools.nix
+++ b/modules/installer/tools/tools.nix
@@ -80,6 +80,7 @@ let
     name = "nixos-hardware-scan";
     src = ./nixos-hardware-scan.pl;
     inherit (pkgs) perl;
+    profile = config.installer.installProfile;
   };
 
   nixosOption = makeProg {
@@ -112,6 +113,14 @@ in
         <command>nixos-rebuild</command> to speed up builds.
       '';
     };
+
+    installer.installProfile = pkgs.lib.mkOption {
+      default = "base";
+      example = "graphical";
+      description = ''
+        Name of the profile used when generating the hardware-scan.
+      '';
+    };
     
   };
 
-- 
GitLab


From e20ef7564e6cf4eff9280846b960e3d17a7e8cac Mon Sep 17 00:00:00 2001
From: Nicolas Pierron <nicolas.b.pierron@gmail.com>
Date: Sat, 25 Sep 2010 09:33:17 +0000
Subject: [PATCH 2642/5331] Update live-dvd configuration.

svn path=/nixos/trunk/; revision=23919
---
 modules/installer/cd-dvd/live-dvd.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/installer/cd-dvd/live-dvd.nix b/modules/installer/cd-dvd/live-dvd.nix
index 70fa301ef1f..4857900389c 100644
--- a/modules/installer/cd-dvd/live-dvd.nix
+++ b/modules/installer/cd-dvd/live-dvd.nix
@@ -1,7 +1,7 @@
 {config, pkgs, ...}:
 
 {
-  require = [./installation-cd.nix];
+  require = [./installation-cd-base.nix];
 
   # Build the build-time dependencies of this configuration on the DVD
   # to speed up installation.
-- 
GitLab


From 6cc0032074fead198f5e46d67633dadcd27bef78 Mon Sep 17 00:00:00 2001
From: Nicolas Pierron <nicolas.b.pierron@gmail.com>
Date: Sat, 25 Sep 2010 09:33:21 +0000
Subject: [PATCH 2643/5331] Installation CD: Check that the current system can
 be replaced.

svn path=/nixos/trunk/; revision=23920
---
 tests/installer.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/installer.nix b/tests/installer.nix
index c1569b3e50f..e8337ebe2bb 100644
--- a/tests/installer.nix
+++ b/tests/installer.nix
@@ -326,7 +326,7 @@ in {
       print STDERR "New CD config:\n$cfg\n";
 
       # Apply the new CD configuration.
-      $machine->mustSucceed("nixos-rebuild build --no-pull"); # test / switch make it fails :(
+      $machine->mustSucceed("nixos-rebuild test --no-pull");
 
       # Connect to it-self.
       #$machine->waitForJob("sshd");
-- 
GitLab


From fe7c1eb16bd74c76da8b36f43727ea49c36cbe30 Mon Sep 17 00:00:00 2001
From: Nicolas Pierron <nicolas.b.pierron@gmail.com>
Date: Sat, 25 Sep 2010 09:44:48 +0000
Subject: [PATCH 2644/5331] Remove duplicated definitions.

svn path=/nixos/trunk/; revision=23921
---
 modules/installer/cd-dvd/installation-cd-base.nix | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/modules/installer/cd-dvd/installation-cd-base.nix b/modules/installer/cd-dvd/installation-cd-base.nix
index 85f83b106cb..f4aa5c5451d 100644
--- a/modules/installer/cd-dvd/installation-cd-base.nix
+++ b/modules/installer/cd-dvd/installation-cd-base.nix
@@ -62,14 +62,4 @@ in
   # To speed up installation a little bit, include the complete stdenv
   # in the Nix store on the CD.
   isoImage.storeContents = [ pkgs.stdenv pkgs.klibc pkgs.klibcShrunk ];
-
-  # Allow sshd to be started manually through "start sshd".  It should
-  # not be started by default on the installation CD because the
-  # default root password is empty.
-  services.openssh.enable = true;
-  jobs.sshd.startOn = pkgs.lib.mkOverrideTemplate 50 {} "";
-
-  # Enable wpa_supplicant, but don't start it by default.
-  networking.enableWLAN = true;
-  jobs.wpa_supplicant.startOn = pkgs.lib.mkOverrideTemplate 50 {} "";
 }
-- 
GitLab


From 58ce746eb0bfd0f380633d6d02a0a1c719e0b818 Mon Sep 17 00:00:00 2001
From: Nicolas Pierron <nicolas.b.pierron@gmail.com>
Date: Sat, 25 Sep 2010 22:29:42 +0000
Subject: [PATCH 2645/5331] Add empty profile.

svn path=/nixos/trunk/; revision=23922
---
 modules/profiles/empty.nix | 8 ++++++++
 1 file changed, 8 insertions(+)
 create mode 100644 modules/profiles/empty.nix

diff --git a/modules/profiles/empty.nix b/modules/profiles/empty.nix
new file mode 100644
index 00000000000..bb40a31470d
--- /dev/null
+++ b/modules/profiles/empty.nix
@@ -0,0 +1,8 @@
+# Empty profiles, used to avoid the case where no profiles are selected for
+# nixos-hardware-scan.
+
+{
+  imports = [];
+  options = {};
+  config = {};
+}
-- 
GitLab


From 7ea957fd3d20a6fb24c1105ba0f12dd126158322 Mon Sep 17 00:00:00 2001
From: Nicolas Pierron <nicolas.b.pierron@gmail.com>
Date: Sat, 25 Sep 2010 22:29:50 +0000
Subject: [PATCH 2646/5331] Add --install option for nixos-option which is used
 to handle options of the target system (when installing) and also to generate
 a template configuration file for users.

svn path=/nixos/trunk/; revision=23923
---
 modules/installer/tools/nixos-option.sh | 193 ++++++++++++++++++++++--
 1 file changed, 178 insertions(+), 15 deletions(-)

diff --git a/modules/installer/tools/nixos-option.sh b/modules/installer/tools/nixos-option.sh
index 5195ed8cf69..962546ebb6e 100644
--- a/modules/installer/tools/nixos-option.sh
+++ b/modules/installer/tools/nixos-option.sh
@@ -2,15 +2,17 @@
 
 # Allow the location of NixOS sources and the system configuration
 # file to be overridden.
+
+: ${mountPoint=/mnt}
 : ${NIXOS_PATH=/etc/nixos/nixos}
-: ${NIXOS=/etc/nixos/nixos}
-: ${NIXPKGS=/etc/nixos/nixpkgs}
 : ${NIXOS_CONFIG=/etc/nixos/configuration.nix}
+: ${NIXPKGS=/etc/nixos/nixpkgs}
 export NIXOS_PATH
 
 usage () {
   echo 1>&2 "
-Usage: $0 OPTION_NAME [-v] [-d] [-l]
+Usage: $0 [--install] [-v] [-d] [-l] OPTION_NAME
+       $0 [--install]
 
 This program is used to explore NixOS options by looking at their values or
 by looking at their description.  It is helpful for understanding the how
@@ -18,6 +20,11 @@ your configuration is working.
 
 Options:
 
+  -i | --install        Use the configuration on
+                        ${mountPoint:+$mountPoint/}$NIXOS_CONFIG instead of
+                        the current system configuration.  Generate a
+                        template configuration if no option name is
+                        specified.
   -v | --value          Display the current value, based on your
                         configuration.
   -d | --default        Display the default value, the example and the
@@ -26,8 +33,9 @@ Options:
                         is declared.
   --help                Show this message.
 
-Environment variables affecting nixos-option:
+Environment variables affecting $0:
 
+  \$mountPoint          Path to the target file system.
   \$NIXOS_PATH          Path where the NixOS repository is located.
   \$NIXOS_CONFIG        Path to your configuration file.
   \$NIXPKGS             Path to Nix packages.
@@ -44,6 +52,7 @@ Environment variables affecting nixos-option:
 desc=false
 defs=false
 value=false
+install=false
 verbose=false
 
 option=""
@@ -52,18 +61,39 @@ argfun=""
 for arg; do
   if test -z "$argfun"; then
     case $arg in
-      -d|--description) desc=true;;
-      -v|--value) value=true;;
-      -l|--lookup) defs=true;;
-      --verbose) verbose=true;;
-      --help) usage;;
-      -*) usage;;
-      *) if test -z "$option"; then
-           option="$arg"
-         else
-           usage
-         fi;;
+      -*)
+        longarg=""
+        sarg="$arg"
+        while test "$sarg" != "-"; do
+          case $sarg in
+            --*) longarg=$arg;;
+            -d*) longarg="$longarg --description";;
+            -v*) longarg="$longarg --value";;
+            -l*) longarg="$longarg --lookup";;
+            -i*) longarg="$longarg --install";;
+            -*) usage;;
+          esac
+          sarg="-${sarg#??}"
+        done
+        ;;
+      *) longarg=$arg;;
     esac
+    for larg in $longarg; do
+      case $larg in
+        --description) desc=true;;
+        --value) value=true;;
+        --lookup) defs=true;;
+        --install) install=true;;
+        --verbose) verbose=true;;
+        --help) usage;;
+        -*) usage;;
+        *) if test -z "$option"; then
+             option="$larg"
+           else
+             usage
+           fi;;
+      esac
+    done
   else
     case $argfun in
       set_*)
@@ -75,6 +105,16 @@ for arg; do
   fi
 done
 
+# --install cannot be used with -d -v -l without option name.
+if $value || $desc || $defs && $install && test -z "$option"; then
+  usage
+fi
+
+generate=false
+if ! $defs && ! $desc && ! $value && $install && test -z "$option"; then
+  generate=true
+fi
+
 if ! $defs && ! $desc; then
   value=true
 fi
@@ -111,7 +151,130 @@ findSources(){
     nix-instantiate - --eval-only --strict
 }
 
+if $install; then
+  if test -e "$mountPoint$NIXOS_PATH"; then
+    export NIXOS_PATH="$mountPoint$NIXOS_PATH"
+  fi
+  if test -e "$mountPoint$NIXPKGS"; then
+    export NIXPKGS="$mountPoint$NIXPKGS"
+  fi
+  export NIXOS_CONFIG="$mountPoint$NIXOS_CONFIG"
+fi
+
+if $generate; then
+  mkdir -p $(dirname "$NIXOS_CONFIG")
+
+  # Scan the hardware and add the result to /etc/nixos/hardware-scan.nix.
+  hardware_config="${NIXOS_CONFIG%/configuration.nix}/hardware-configuration.nix"
+  if test -e "$hardware_config"; then
+    echo "A hardware configuration file exists, generation skipped."
+  else
+    echo "Scan your hardware to generate a hardware configuration file."
+    nixos-hardware-scan > "$hardware_config"
+  fi
+
+  if test -e "$NIXOS_CONFIG"; then
+    echo 1>&2 "error: Cannot generate a template configuration because a configuration file exists."
+    exit 1
+  fi
+
+  echo "Generate a template configuration that you should edit."
+
+  # Generate a template configuration file where the user has to
+  # fill the gaps.
+  echo > "$NIXOS_CONFIG" \
+'# Edit this configuration file which defines what would be installed on the
+# system.  To Help while choosing option value, you can watch at the manual
+# page of configuration.nix or at the last chapter of the manual available
+# on the virtual console 8 (Alt+F8).
+
+{config, pkgs, ...}:
+
+{
+  require = [
+    # Include the configuration for part of your system which have been
+    # detected automatically.  In addition, it includes the same
+    # configuration as the installation device that you used.
+    ./hardware-configuration.nix
+  ];
+
+  boot.initrd.kernelModules = [
+    # Specify all kernel modules that are necessary for mounting the root
+    # file system.
+    #
+    # "ext4" "ata_piix"
+  ];
+
+  boot.loader.grub = {
+    # Use grub 2 as boot loader.
+    enable = true;
+    version = 2;
+
+    # Define on which hard drive you want to install Grub.
+    # device = "/dev/sda";
+  };
+
+  networking = {
+    # hostName = "nixos"; # Define your hostname.
+    interfaceMonitor.enable = true; # Watch for plugged cable.
+    enableWLAN = true;  # Enables Wireless.
+  };
+
+  # Add file system entries for each partition that you want to see mounted
+  # at boot time.  You can add filesystems which are not mounted at boot by
+  # adding the noauto option.
+  fileSystems = [
+    # Mount the root file system
+    #
+    # { mountPoint = "/";
+    #   device = "/dev/sda2";
+    # }
+
+    # Copy & Paste & Uncomment & Modify to add any other file system.
+    #
+    # { mountPoint = "/data"; # where you want to mount the device
+    #   device = "/dev/sdb"; # the device or the label of the device
+    #   # label = "data";
+    #   fsType = "ext3";      # the type of the partition.
+    #   options = "data=journal";
+    # }
+  ];
+
+  swapDevices = [
+    # List swap partitions that are mounted at boot time.
+    #
+    # { device = "/dev/sda1"; }
+  ];
+
+  # Select internationalisation properties.
+  # i18n = {
+  #   consoleFont = "lat9w-16";
+  #   consoleKeyMap = "us";
+  #   defaultLocale = "en_US.UTF-8";
+  # };
+
+  # List services that you want to enable:
+
+  # Add an OpenSSH daemon.
+  # services.openssh.enable = true;
+
+  # Add CUPS to print documents.
+  # services.printing.enable = true;
+
+  # Add XServer (default if you have used a graphical iso)
+  # service.xserver = {
+  #   enable = true;
+  #   layout = "us";
+  #   xkbOptions = "eurosign:e";
+  # };
+
+  # Add the NixOS Manual on virtual console 8
+  services.nixosManual.showManual = true;
+}
+'
 
+  exit 0
+fi;
 
 if test "$(evalOpt "_type" 2> /dev/null)" = '"option"'; then
   $value && evalCfg;
-- 
GitLab


From 757a0002a208c98aad410e619cb13ae97d4a66cd Mon Sep 17 00:00:00 2001
From: Nicolas Pierron <nicolas.b.pierron@gmail.com>
Date: Sat, 25 Sep 2010 22:29:54 +0000
Subject: [PATCH 2647/5331] Simplify the installation instruction for building
 a CD.

svn path=/nixos/trunk/; revision=23924
---
 doc/manual/installation.xml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/doc/manual/installation.xml b/doc/manual/installation.xml
index b2efbf2d5d5..f9b670ef6e6 100644
--- a/doc/manual/installation.xml
+++ b/doc/manual/installation.xml
@@ -38,9 +38,8 @@ $ nix-channel --update</screen>
   xlink:href="https://svn.nixos.org/repos/nix/nixos/trunk"/> as
   <literal>nixos</literal>.</para></listitem>
 
-  <listitem><para>If you don’t already have Nixpkgs checkout, Check
-  out Nixpkgs from <link
-  xlink:href="https://svn.nixos.org/repos/nix/nixos/trunk"/> as
+  <listitem><para>Check out Nixpkgs from
+  <link xlink:href="https://svn.nixos.org/repos/nix/nixos/trunk"/> as
   <literal>nixpkgs</literal>.</para></listitem>
 
   <listitem><para>In the directory <literal>nixos</literal>, make a
@@ -138,7 +137,8 @@ $ lvcreate --size 1G --name smalldisk MyVolGroup</screen>
   </para></listitem>
     
   <listitem><para>Mount the target file system on
-  <filename>/mnt</filename>.</para></listitem>
+  <filename>/mnt</filename> on which NixOS would be installed.</para>
+  </listitem>
 
   <listitem>
 
-- 
GitLab


From 93029d3c4f1f410f9e44879aaf107dcc6ac8cf7f Mon Sep 17 00:00:00 2001
From: Nicolas Pierron <nicolas.b.pierron@gmail.com>
Date: Sat, 25 Sep 2010 22:29:58 +0000
Subject: [PATCH 2648/5331] Update installation instructions.

svn path=/nixos/trunk/; revision=23925
---
 doc/manual/installation.xml | 20 ++++++--------------
 1 file changed, 6 insertions(+), 14 deletions(-)

diff --git a/doc/manual/installation.xml b/doc/manual/installation.xml
index f9b670ef6e6..09f97b235b7 100644
--- a/doc/manual/installation.xml
+++ b/doc/manual/installation.xml
@@ -42,19 +42,10 @@ $ nix-channel --update</screen>
   <link xlink:href="https://svn.nixos.org/repos/nix/nixos/trunk"/> as
   <literal>nixpkgs</literal>.</para></listitem>
 
-  <listitem><para>In the directory <literal>nixos</literal>, make a
-  symbolic link <literal>pkgs</literal> to the <literal>pkgs</literal>
-  directory of the Nixpkgs tree, e.g.,
-
-<screen>
-$ ln -s nixpkgs/pkgs nixos/</screen>
-
-  </para></listitem>
-
   <listitem><para>Build the ISO image:
 
 <screen>
-$ nix-build configuration/rescue-cd.nix -A rescueCD</screen>
+$ nix-build ./nixos/release.nix -A iso_minimal.iso</screen>
 
   If everything goes well, you’ll end up with an ISO image in
   <filename>./result/iso/nixos-<replaceable>version</replaceable>-<replaceable>platform</replaceable>.iso</filename>
@@ -62,7 +53,7 @@ $ nix-build configuration/rescue-cd.nix -A rescueCD</screen>
   your favourite virtual machine software.</para></listitem>
 
 </orderedlist>
-  
+
 </para>
 
 </section>
@@ -88,8 +79,8 @@ $ nix-build configuration/rescue-cd.nix -A rescueCD</screen>
   server on your network.  Otherwise configure
   manually.</para></listitem>
 
-  <listitem><para>The NixOS manual is available on virtual console 7
-  (press Alt+F7 to access).</para></listitem>
+  <listitem><para>The NixOS manual is available on virtual console 8
+  (press Alt+F8 to access).</para></listitem>
 
   <listitem><para>Login as <literal>root</literal>, empty
   password.</para></listitem>
@@ -280,7 +271,8 @@ $ reboot</screen>
 <screen>
 {
   boot.initrd.kernelModules = [ "ata_piix" ];
-  boot.grubDevice = "/dev/sda";
+  boot.loader.grub.enable = true;
+  boot.loader.grub.device = "/dev/sda";
 
   fileSystems = [
     { mountPoint = "/";
-- 
GitLab


From 26417566c47f643c3e8e1a5a7793938bb93f04b8 Mon Sep 17 00:00:00 2001
From: Nicolas Pierron <nicolas.b.pierron@gmail.com>
Date: Sat, 25 Sep 2010 22:30:02 +0000
Subject: [PATCH 2649/5331] Re-word installation, and use "nixos-option
 --install" to generate a template for configuration.nix which uses the result
 of nixos-hardware-scan.

svn path=/nixos/trunk/; revision=23926
---
 doc/manual/installation.xml | 51 +++++++++++++++++--------------------
 1 file changed, 24 insertions(+), 27 deletions(-)

diff --git a/doc/manual/installation.xml b/doc/manual/installation.xml
index 09f97b235b7..330ef14e0fd 100644
--- a/doc/manual/installation.xml
+++ b/doc/manual/installation.xml
@@ -133,39 +133,32 @@ $ lvcreate --size 1G --name smalldisk MyVolGroup</screen>
 
   <listitem>
 
-    <para>The installation is declarative; you need to write a
-    description of the configuration that you want to be built and
-    activated.  The configuration is specified in a Nix expression and
-    must be stored <emphasis>on the target file system</emphasis> in
-    <filename>/mnt/etc/nixos/configuration.nix</filename>.  See
-    <filename>/etc/nixos/nixos/doc/config-examples</filename> for
-    example machine configurations.  You can copy and edit one of
-    those (e.g., copy
-    <filename>/etc/nixos/nixos/doc/config-examples/basic.nix</filename>
-    to <filename>/mnt/etc/nixos/configuration.nix</filename>).  See
-    <xref linkend="ch-options"/> for a list of the available
-    configuration options.  The text editors <command>nano</command>
-    and <command>vim</command> are available.</para>
-
-    <para>In particular you need to specify a root file system in
-    <option>fileSystems</option> and the target device for the Grub
-    boot loader in <option>boot.grubDevice</option>.</para>
-
-    <para>The command <command>nixos-hardware-scan</command> can
+    <para>Generate a template configuration for the target system:</para>
+
+    <para>The command <command>nixos-option</command> can
     generate an initial configuration file for you, i.e.,
 
 <screen>
-$ mkdir -p /mnt/etc/nixos
-$ nixos-hardware-scan > /mnt/etc/nixos/configuration.nix</screen>
+$ nixos-option --install</screen>
 
     It tries to figure out the modules necessary for mounting the root
     device, as well as various other hardware characteristics.
-    However, it doesn’t try to figure out the
+    However, it doesn’t try to figure out the 
     <option>fileSystems</option> option yet.</para>
 
-    <para>More examples of NixOS configurations for some actual
-    machines can be found at <link
-    xlink:href="https://svn.nixos.org/repos/nix/configurations/trunk/"/>.</para>
+    <para>Edit <filename>/mnt/etc/nixos/configuration.nix</filename> to
+    configure your system.  The installation is declarative; you need to
+    write a description of the configuration that you want to be built and
+    activated.  The configuration is specified in a Nix expression and must
+    be stored <emphasis>on the target file system</emphasis>.  The text
+    editors <command>nano</command> and <command>vim</command> are
+    available.</para>
+
+    <para>You need to specify a root file system in
+    <option>fileSystems</option> and the target device for the Grub boot
+    loader in <option>boot.grubDevice</option>.  See
+    <xref linkend="ch-options"/> for a list of the available configuration
+    options.</para>
 
     <note><para>It is very important that you specify in the option
     <option>boot.initrd.kernelModules</option> all kernel modules that
@@ -178,6 +171,11 @@ $ nixos-hardware-scan > /mnt/etc/nixos/configuration.nix</screen>
     <command>nixos-hardware-scan</command> should figure out the
     required modules in most cases.</para></note>
 
+    <para>Examples are available in
+    <filename>/etc/nixos/nixos/doc/config-examples</filename> and some
+    actual NixOS configuration can be found at <link
+    xlink:href="https://svn.nixos.org/repos/nix/configurations/trunk/"/>.</para>
+
   </listitem>
 
   <listitem><para>If your machine has a limited amount of memory, you
@@ -259,8 +257,7 @@ $ fdisk /dev/sda <lineannotation>(or whatever device you want to install on)</li
 $ mke2fs -j -L nixos /dev/sda1 <lineannotation>(idem)</lineannotation>
 $ mkswap -L swap /dev/sda2 <lineannotation>(idem)</lineannotation>
 $ mount LABEL=nixos /mnt
-$ mkdir -p /mnt/etc/nixos
-$ nixos-hardware-scan > /mnt/etc/nixos/configuration.nix
+$ nixos-option --install
 $ nano /mnt/etc/nixos/configuration.nix
 <lineannotation>(in particular, set the fileSystems and swapDevices options)</lineannotation>
 $ nixos-install
-- 
GitLab


From d8c72719aa82ccdd832aeca31fa43c63c1bca608 Mon Sep 17 00:00:00 2001
From: Evgeny Egorochkin <phreedom.stdin@gmail.com>
Date: Sun, 26 Sep 2010 01:58:44 +0000
Subject: [PATCH 2650/5331] Quassel: Create quassel user only if cfg.user is
 left empty to avoid messing up existing users. This solution is still
 suboptimal but others are even worse.

svn path=/nixos/trunk/; revision=23927
---
 modules/services/networking/quassel.nix | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/modules/services/networking/quassel.nix b/modules/services/networking/quassel.nix
index 591bd6e6ce2..7e6ad5c8e81 100644
--- a/modules/services/networking/quassel.nix
+++ b/modules/services/networking/quassel.nix
@@ -5,6 +5,7 @@ with pkgs.lib;
 let
   quassel = pkgs.quasselDaemon;
   cfg = config.services.quassel;
+  user = if cfg.user != null then cfg.user else "quassel";
 in
 
 {
@@ -39,16 +40,16 @@ in
       };
 
       dataDir = mkOption {
-        default = ''/home/${cfg.user}/.config/quassel-irc.org'';
+        default = ''/home/${user}/.config/quassel-irc.org'';
         description = ''
           The directory holding configuration files, the SQlite database and the SSL Cert.
         '';
       };
 
       user = mkOption {
-        default = "quassel";
+        default = null;
         description = ''
-          The user the Quassel daemon should run as.
+          The existing user the Quassel daemon should run as. If left empty, a default "quassel" user will be created.
         '';
       };
 
@@ -61,10 +62,10 @@ in
 
   config = mkIf cfg.enable {
 
-    users.extraUsers = singleton
+    users.extraUsers = mkIf (cfg.user == null) [
       { name = cfg.user;
         description = "Quassel IRC client daemon";
-      };
+      }];
     
 
     jobs.quassel =
@@ -74,11 +75,11 @@ in
 
         preStart = ''
             mkdir -p ${cfg.dataDir}
-            chown ${cfg.user} ${cfg.dataDir}
+            chown ${user} ${cfg.dataDir}
         '';
 
         exec = ''
-            ${pkgs.su}/bin/su -s ${pkgs.stdenv.shell} ${cfg.user} \
+            ${pkgs.su}/bin/su -s ${pkgs.stdenv.shell} ${user} \
                 -c '${quassel}/bin/quasselcore --listen=${cfg.interface}\
                     --port=${toString cfg.portNumber} --configdir=${cfg.dataDir}'
         '';
-- 
GitLab


From 3bca96e1bd4e465a23b2c883828cf8ba8930cf1c Mon Sep 17 00:00:00 2001
From: Evgeny Egorochkin <phreedom.stdin@gmail.com>
Date: Sun, 26 Sep 2010 02:04:06 +0000
Subject: [PATCH 2651/5331] AMule: create the user only if the user option is
 null, don't pollute the system profile with useless packages.

svn path=/nixos/trunk/; revision=23928
---
 modules/services/networking/amuled.nix | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/modules/services/networking/amuled.nix b/modules/services/networking/amuled.nix
index 5e60a824619..3531451fd7c 100644
--- a/modules/services/networking/amuled.nix
+++ b/modules/services/networking/amuled.nix
@@ -4,6 +4,7 @@ with pkgs.lib;
 
 let
   cfg = config.services.amule;
+  user = if cfg.user != null then cfg.user else "amule";
 in
 
 {
@@ -22,14 +23,14 @@ in
       };
 
       dataDir = mkOption {
-        default = ''/home/${cfg.user}/'';
+        default = ''/home/${user}/'';
         description = ''
           The directory holding configuration, incoming and temporary files.
         '';
       };
 
       user = mkOption {
-        default = "amule";
+        default = null;
         description = ''
           The user the AMule daemon should run as.
         '';
@@ -44,10 +45,10 @@ in
 
   config = mkIf cfg.enable {
 
-    users.extraUsers = singleton
+    users.extraUsers = mkIf (cfg.user == null) [
       { name = cfg.user;
         description = "AMule daemon";
-      };
+      } ];
 
     jobs.amuled =
       { description = "AMule daemon";
@@ -56,17 +57,15 @@ in
 
         preStart = ''
             mkdir -p ${cfg.dataDir}
-            chown ${cfg.user} ${cfg.dataDir}
+            chown ${user} ${cfg.dataDir}
         '';
 
         exec = ''
-            ${pkgs.su}/bin/su -s ${pkgs.stdenv.shell} ${cfg.user} \
+            ${pkgs.su}/bin/su -s ${pkgs.stdenv.shell} ${user} \
                 -c 'HOME="${cfg.dataDir}" ${pkgs.amuleDaemon}/bin/amuled'
         '';
       };
 
-    environment.systemPackages = [ pkgs.amuleDaemon ];
-
   };
   
 }
-- 
GitLab


From b766f8ac8d8dc5b598d29dd9712b5267f22e6619 Mon Sep 17 00:00:00 2001
From: Evgeny Egorochkin <phreedom.stdin@gmail.com>
Date: Sun, 26 Sep 2010 02:09:34 +0000
Subject: [PATCH 2652/5331] AMule: quick fix

svn path=/nixos/trunk/; revision=23929
---
 modules/services/networking/amuled.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/services/networking/amuled.nix b/modules/services/networking/amuled.nix
index 3531451fd7c..f499e72c0d2 100644
--- a/modules/services/networking/amuled.nix
+++ b/modules/services/networking/amuled.nix
@@ -46,7 +46,7 @@ in
   config = mkIf cfg.enable {
 
     users.extraUsers = mkIf (cfg.user == null) [
-      { name = cfg.user;
+      { name = "amule";
         description = "AMule daemon";
       } ];
 
-- 
GitLab


From 88b24ece7fbc5c476cef1e75eff6a7594e37b031 Mon Sep 17 00:00:00 2001
From: Evgeny Egorochkin <phreedom.stdin@gmail.com>
Date: Sun, 26 Sep 2010 02:10:23 +0000
Subject: [PATCH 2653/5331] Quassel: quick fix

svn path=/nixos/trunk/; revision=23930
---
 modules/services/networking/quassel.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/services/networking/quassel.nix b/modules/services/networking/quassel.nix
index 7e6ad5c8e81..916694c6910 100644
--- a/modules/services/networking/quassel.nix
+++ b/modules/services/networking/quassel.nix
@@ -63,7 +63,7 @@ in
   config = mkIf cfg.enable {
 
     users.extraUsers = mkIf (cfg.user == null) [
-      { name = cfg.user;
+      { name = "quassel";
         description = "Quassel IRC client daemon";
       }];
     
-- 
GitLab


From bf3a8dfbe47c91e4cda0d7f2c2e8d711e9750a4c Mon Sep 17 00:00:00 2001
From: Evgeny Egorochkin <phreedom.stdin@gmail.com>
Date: Sun, 26 Sep 2010 03:49:33 +0000
Subject: [PATCH 2654/5331] bashrc: make ALSA plugins discoverable

svn path=/nixos/trunk/; revision=23932
---
 modules/programs/bash/bashrc.sh | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/modules/programs/bash/bashrc.sh b/modules/programs/bash/bashrc.sh
index 7e39e98135a..d9e1c82c253 100644
--- a/modules/programs/bash/bashrc.sh
+++ b/modules/programs/bash/bashrc.sh
@@ -30,6 +30,9 @@ for i in $NIX_PROFILES; do # !!! reverse
     # from Nixpkgs <= 0.12.
     export PERL5LIB="$i/lib/perl5/site_perl:$i/lib/site_perl${PERL5LIB:+:}$PERL5LIB"
 
+    # ALSA plugins
+    export ALSA_PLUGIN_DIRS="$i/lib/alsa-lib${ALSA_PLUGIN_DIRS:+:}$ALSA_PLUGIN_DIRS"
+
     # GStreamer.
     export GST_PLUGIN_PATH="$i/lib/gstreamer-0.10${GST_PLUGIN_PATH:+:}$GST_PLUGIN_PATH"
 
-- 
GitLab


From 62c9591d0b39ac39815bd8aeb8f2184be9e779d9 Mon Sep 17 00:00:00 2001
From: Nicolas Pierron <nicolas.b.pierron@gmail.com>
Date: Sun, 26 Sep 2010 08:43:55 +0000
Subject: [PATCH 2655/5331] Fix usage message (-description) and honor $NIXOS
 instead of $NIXOS_PATH.

svn path=/nixos/trunk/; revision=23937
---
 modules/installer/tools/nixos-option.sh | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/modules/installer/tools/nixos-option.sh b/modules/installer/tools/nixos-option.sh
index 962546ebb6e..e1ddfa5ea07 100644
--- a/modules/installer/tools/nixos-option.sh
+++ b/modules/installer/tools/nixos-option.sh
@@ -4,10 +4,10 @@
 # file to be overridden.
 
 : ${mountPoint=/mnt}
-: ${NIXOS_PATH=/etc/nixos/nixos}
+: ${NIXOS=/etc/nixos/nixos}
 : ${NIXOS_CONFIG=/etc/nixos/configuration.nix}
 : ${NIXPKGS=/etc/nixos/nixpkgs}
-export NIXOS_PATH
+export NIXOS
 
 usage () {
   echo 1>&2 "
@@ -15,8 +15,8 @@ Usage: $0 [--install] [-v] [-d] [-l] OPTION_NAME
        $0 [--install]
 
 This program is used to explore NixOS options by looking at their values or
-by looking at their description.  It is helpful for understanding the how
-your configuration is working.
+by looking at their description.  It is helpful for understanding how your
+configuration is working.
 
 Options:
 
@@ -27,7 +27,7 @@ Options:
                         specified.
   -v | --value          Display the current value, based on your
                         configuration.
-  -d | --default        Display the default value, the example and the
+  -d | --description    Display the default value, the example and the
                         description.
   -l | --lookup         Display where the option is defined and where it
                         is declared.
@@ -36,7 +36,7 @@ Options:
 Environment variables affecting $0:
 
   \$mountPoint          Path to the target file system.
-  \$NIXOS_PATH          Path where the NixOS repository is located.
+  \$NIXOS               Path where the NixOS repository is located.
   \$NIXOS_CONFIG        Path to your configuration file.
   \$NIXPKGS             Path to Nix packages.
 
@@ -133,7 +133,7 @@ evalAttr(){
   local prefix=$1
   local suffix=$2
   local strict=$3
-  echo "(import $NIXOS_PATH {}).$prefix${option:+.$option}${suffix:+.$suffix}" |
+  echo "(import $NIXOS {}).$prefix${option:+.$option}${suffix:+.$suffix}" |
     nix-instantiate - --eval-only ${strict:+--strict}
 }
 
@@ -147,13 +147,13 @@ evalCfg(){
 
 findSources(){
   local suffix=$1
-  echo "builtins.map (f: f.source) (import $NIXOS_PATH {}).eval.options${option:+.$option}.$suffix" |
+  echo "builtins.map (f: f.source) (import $NIXOS {}).eval.options${option:+.$option}.$suffix" |
     nix-instantiate - --eval-only --strict
 }
 
 if $install; then
-  if test -e "$mountPoint$NIXOS_PATH"; then
-    export NIXOS_PATH="$mountPoint$NIXOS_PATH"
+  if test -e "$mountPoint$NIXOS"; then
+    export NIXOS="$mountPoint$NIXOS"
   fi
   if test -e "$mountPoint$NIXPKGS"; then
     export NIXPKGS="$mountPoint$NIXPKGS"
-- 
GitLab


From 0a9b2f6e442da1cf4dd5b682dfa1f2010f240a2b Mon Sep 17 00:00:00 2001
From: Nicolas Pierron <nicolas.b.pierron@gmail.com>
Date: Sun, 26 Sep 2010 08:43:59 +0000
Subject: [PATCH 2656/5331] Add a man page for nixos-option.

svn path=/nixos/trunk/; revision=23938
---
 doc/manual/man-nixos-option.xml | 186 ++++++++++++++++++++++++++++++++
 doc/manual/man-pages.xml        |   1 +
 2 files changed, 187 insertions(+)
 create mode 100644 doc/manual/man-nixos-option.xml

diff --git a/doc/manual/man-nixos-option.xml b/doc/manual/man-nixos-option.xml
new file mode 100644
index 00000000000..ed31226f536
--- /dev/null
+++ b/doc/manual/man-nixos-option.xml
@@ -0,0 +1,186 @@
+<refentry xmlns="http://docbook.org/ns/docbook"
+          xmlns:xlink="http://www.w3.org/1999/xlink"
+          xmlns:xi="http://www.w3.org/2001/XInclude">
+  
+<refmeta>
+  <refentrytitle><command>nixos-option</command></refentrytitle>
+  <manvolnum>8</manvolnum>
+  <refmiscinfo class="source">NixOS</refmiscinfo>
+  <!-- <refmiscinfo class="version"><xi:include href="version.txt" parse="text"/></refmiscinfo> -->
+</refmeta>
+
+<refnamediv>
+  <refname><command>nixos-option</command></refname>
+  <refpurpose>inspect a NixOS configuration</refpurpose>
+</refnamediv>
+
+<refsynopsisdiv>
+  <cmdsynopsis>
+    <command>nixos-option</command>
+    <group choice="opt">
+      <option>-i</option>
+      <option>v</option>
+      <option>d</option>
+      <option>l</option>
+    </group>
+    <arg choice='plain'><replaceable>option.name</replaceable></arg>
+  </cmdsynopsis>
+  <cmdsynopsis>
+    <command>nixos-option</command>
+    <arg choice='plain'><option>--install</option></arg>
+  </cmdsynopsis>
+</refsynopsisdiv>
+
+
+<refsection><title>Description</title>
+
+<para>This command evaluates the configuration specified in
+<filename>/etc/nixos/configuration.nix</filename> and returns the properties
+of the option name given as argument.  By default, it returns the value of
+the option.</para>
+
+<para>When the option name is not an option prints the list of attributes in
+case of an attribute set.  This could used to provide completion in some
+editors.</para>
+
+<para>When the option <option>--install</option> (or <option>-i</option>) is
+used with no option name, this command generates a template configuration
+with a scan of the target system.  It produces a template configuration
+in <filename>/etc/nixos/configuration.nix</filename>, and a scan of the
+machine in <filename>/etc/nixos/hardware-configuration.nix</filename>.  The
+scan of the machine is produced
+by <command>nixos-hardware-scan</command>.</para>
+
+</refsection>
+
+<refsection><title>Options</title>
+
+<para>This command accepts the following options:</para>
+
+<variablelist>
+
+  <varlistentry>
+    <term><option>--install</option>, <option>-i</option></term>
+    <listitem>
+      <para>Use the installation configuration instead of current system
+      configuration.  Generate a template configuration if no option name is
+      specified.</para>
+    </listitem>
+  </varlistentry>
+
+  <varlistentry>
+    <term><option>--value</option>, <option>-v</option></term>
+    <listitem>
+      <para>Returns the value of the option.  This is the default operation
+      if no other options are defined.</para>
+    </listitem>
+  </varlistentry>
+
+  <varlistentry>
+    <term><option>--description</option>, <option>-d</option></term>
+    <listitem>
+      <para>Return the default value, the example and the description of the
+      option when available.</para>
+    </listitem>
+  </varlistentry>
+
+  <varlistentry>
+    <term><option>--lookup</option>, <option>-l</option></term>
+    <listitem>
+      <para>Return the locations where the option is declared and where it
+      is defined.  This is extremely useful to find sources of errors in
+      your configuration.</para>
+    </listitem>
+  </varlistentry>
+
+</variablelist>
+
+</refsection>
+
+
+<refsection><title>Environment</title>
+
+<variablelist>
+
+  <varlistentry>
+    <term><envar>mountPoint</envar></term>
+    <listitem>
+      <para>Location of the target file system.  Defaults to
+      <filename>/mnt</filename>.  This environment variable is only used in
+      combinaison with <option>--install</option> option.</para>
+    </listitem>
+  </varlistentry>
+
+  <varlistentry>
+    <term><envar>NIXOS</envar></term>
+    <listitem>
+      <para>Path to the NixOS source tree.  Defaults to
+      <filename>/etc/nixos/nixos</filename>.</para>
+    </listitem>
+  </varlistentry>
+
+  <varlistentry>
+    <term><envar>NIXPKGS</envar></term>
+    <listitem>
+      <para>Path to the Nixpkgs source tree.  Defaults to
+      <filename>/etc/nixos/nixpkgs</filename>.</para>
+    </listitem>
+  </varlistentry>
+
+  <varlistentry>
+    <term><envar>NIXOS_CONFIG</envar></term>
+    <listitem>
+      <para>Path to the main NixOS configuration module.  Defaults to
+      <filename>/etc/nixos/configuration.nix</filename>.</para>
+    </listitem>
+  </varlistentry>
+
+</variablelist>
+
+</refsection>
+
+
+<refsection><title>Examples</title>
+
+<para>Investigate option values:
+
+<screen>$ nixos-option boot.loader
+This attribute set contains:
+generationsDir
+grub
+initScript
+
+$ nixos-option boot.loader.grub.enable
+true</screen></para>
+
+<para>Prints option informations:
+
+<screen>$ nixos-option -d networking.hostName
+Default: "nixos"
+Description:
+The name of the machine. Leave it empty if you want to obtain
+it from a DHCP server (if using DHCP).</screen></para>
+
+<para>Find the locations which are declaring and defining an option:
+
+<screen>$ nixos-option -l hardware.firmware
+Declared by:
+  /mnt/data/nix-sources/nixos/modules/services/hardware/udev.nix
+
+Defined by:
+  /etc/nixos/nixos/modules/system/boot/kernel.nix
+  /etc/nixos/nixos/modules/hardware/network/rt73.nix
+  /etc/nixos/nixos/modules/hardware/network/intel-3945abg.nix
+  /etc/nixos/nixos/modules/hardware/network/intel-2200bg.nix</screen></para>
+
+</refsection>
+
+<refsection><title>Bugs</title>
+
+<para>The author listed in the following section is wrong.  If there is any
+  other bug, please report to Nicolas Pierron.</para>
+
+</refsection>
+
+
+</refentry>
diff --git a/doc/manual/man-pages.xml b/doc/manual/man-pages.xml
index e706574d889..e3b3a5bc289 100644
--- a/doc/manual/man-pages.xml
+++ b/doc/manual/man-pages.xml
@@ -25,5 +25,6 @@
   
   <xi:include href="man-configuration.xml" />
   <xi:include href="man-nixos-rebuild.xml" />
+  <xi:include href="man-nixos-option.xml" />
 
 </reference>
-- 
GitLab


From 567f37f3e45a45a02e262cc8a6fdeaa746fd0533 Mon Sep 17 00:00:00 2001
From: Nicolas Pierron <nicolas.b.pierron@gmail.com>
Date: Sun, 26 Sep 2010 13:39:16 +0000
Subject: [PATCH 2657/5331] Export tools which may be useful for users that
 want to switch to NixOS without using a live CD.

svn path=/nixos/trunk/; revision=23939
---
 modules/installer/tools/tools.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/installer/tools/tools.nix b/modules/installer/tools/tools.nix
index 4b0a186d6c4..cb4c52f31ef 100644
--- a/modules/installer/tools/tools.nix
+++ b/modules/installer/tools/tools.nix
@@ -137,7 +137,7 @@ in
       ];
 
     system.build = {
-      inherit nixosInstall;
+      inherit nixosInstall nixosHardwareScan nixosOption;
 
       # expose scripts
       inherit (installer2) nixosPrepareInstall runInChroot nixosBootstrap minimalInstallArchive;
-- 
GitLab


From b6f2fde0e0a5b9a0cb3ab04ac482bd2c6901b87f Mon Sep 17 00:00:00 2001
From: Nicolas Pierron <nicolas.b.pierron@gmail.com>
Date: Sun, 26 Sep 2010 13:46:44 +0000
Subject: [PATCH 2658/5331] man nixos-option: Fix typos.

svn path=/nixos/trunk/; revision=23940
---
 doc/manual/man-nixos-option.xml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/doc/manual/man-nixos-option.xml b/doc/manual/man-nixos-option.xml
index ed31226f536..b88daa51db6 100644
--- a/doc/manual/man-nixos-option.xml
+++ b/doc/manual/man-nixos-option.xml
@@ -39,9 +39,9 @@
 of the option name given as argument.  By default, it returns the value of
 the option.</para>
 
-<para>When the option name is not an option prints the list of attributes in
-case of an attribute set.  This could used to provide completion in some
-editors.</para>
+<para>When the option name is not an option, the command prints the list of
+attributes in contained in the attribute set.  This could used to provide
+completion in some editors.</para>
 
 <para>When the option <option>--install</option> (or <option>-i</option>) is
 used with no option name, this command generates a template configuration
@@ -153,7 +153,7 @@ initScript
 $ nixos-option boot.loader.grub.enable
 true</screen></para>
 
-<para>Prints option informations:
+<para>Prints option information:
 
 <screen>$ nixos-option -d networking.hostName
 Default: "nixos"
-- 
GitLab


From deca72f3cfdba40013e63f0de66e350069fce9de Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 27 Sep 2010 16:32:42 +0000
Subject: [PATCH 2659/5331] * Xen (or rather QEMU) needs /dev/net/tun, so load
 the tap   module.

svn path=/nixos/trunk/; revision=23970
---
 modules/virtualisation/xen.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/modules/virtualisation/xen.nix b/modules/virtualisation/xen.nix
index 95c777b17c9..c2973d3a6ab 100644
--- a/modules/virtualisation/xen.nix
+++ b/modules/virtualisation/xen.nix
@@ -70,7 +70,10 @@ in
     # Domain 0 requires a pvops-enabled kernel.
     boot.kernelPackages = pkgs.linuxPackages_2_6_32_xen;
 
-    boot.kernelModules = [ "xen_evtchn" "xen_gntdev" "xen_blkback" "xen_netback" "xen_pciback" "blktap" ];
+    boot.kernelModules = 
+      [ "xen_evtchn" "xen_gntdev" "xen_blkback" "xen_netback" "xen_pciback" 
+        "blktap" "tap"
+      ];
 
     # The radeonfb kernel module causes the screen to go black as soon
     # as it's loaded, so don't load it.
-- 
GitLab


From 8a3750035576265e306b7ef8a23cad46626f6a86 Mon Sep 17 00:00:00 2001
From: Rob Vermaas <rob.vermaas@gmail.com>
Date: Wed, 29 Sep 2010 11:31:09 +0000
Subject: [PATCH 2660/5331] initial try for a nixos module for hydra channel
 mirroring

svn path=/nixos/trunk/; revision=23990
---
 modules/module-list.nix                  |  1 +
 modules/services/backup/hydra-mirror.nix | 93 ++++++++++++++++++++++++
 2 files changed, 94 insertions(+)
 create mode 100644 modules/services/backup/hydra-mirror.nix

diff --git a/modules/module-list.nix b/modules/module-list.nix
index 71ba9d06e24..ce131b8a55d 100644
--- a/modules/module-list.nix
+++ b/modules/module-list.nix
@@ -44,6 +44,7 @@
   ./security/sudo.nix
   ./services/audio/alsa.nix
   ./services/audio/pulseaudio.nix
+  ./services/backup/hydra-mirror.nix
   ./services/backup/mysql-backup.nix
   ./services/backup/postgresql-backup.nix
   ./services/backup/sitecopy-backup.nix
diff --git a/modules/services/backup/hydra-mirror.nix b/modules/services/backup/hydra-mirror.nix
new file mode 100644
index 00000000000..89971095763
--- /dev/null
+++ b/modules/services/backup/hydra-mirror.nix
@@ -0,0 +1,93 @@
+{ config, pkgs, ... }:
+
+with pkgs.lib;
+
+let 
+  cfg = config.services.hydraChannelMirror ;
+  mirrorChannel = pkgs.fetchsvn {
+    url = https://svn.nixos.org/repos/nix/release/trunk/channels/mirror-channel.pl;
+    rev = 23988;
+    sha256 = "1h06clvhr3zz378d8fblhwynvzk1smq7fipv7caakakfd31cv8i6";
+  };
+  cronjob = jobset : ''
+    ${cfg.period} root perl -I${config.environment.nix}/libexec/nix ${mirrorChannel} \
+        ${cfg.hydraURL}/jobset/${jobset.project}/${jobset.jobset}/channel/latest \
+        ${cfg.dataDir}/channels/${jobset.relURL} \
+        ${cfg.dataDir}/nars \
+        ${cfg.mirrorURL}/nars \
+        ${cfg.dataDir}/patches \
+        ${cfg.mirrorURL}/patches \
+        ${if jobset.nixexprs == "" then "" else "${cfg.hydraURL}/job/${jobset.project}/${jobset.jobset}/${jobset.nixexprs}/latest/download-by-type/file/source-dist"} \
+        >> ${cfg.dataDir}/logs/${jobset.name}.log
+  '';
+in
+{
+  options = {
+  
+    services.hydraChannelMirror = {
+
+      enable = mkOption {
+        default = false;
+        description = ''
+          Whether to enable Hydra channel mirroring.
+        '';
+      };
+
+      period = mkOption {
+        default = "15 * * * *";
+        description = ''
+          This option defines (in the format used by cron) when the
+          mirroring should occur.
+        '';
+      };
+
+      jobsets = mkOption {
+        default = [ rec { name = "nixpkgs-unstable"; project = "nixpkgs"; jobset = "trunk"; nixexprs = "tarball"; relURL = "nixpkgs/channels/${name}"; } ];
+        description = ''
+          List of jobsets to mirror.
+        '';
+      };
+ 
+      hydraURL = mkOption {
+        default = "http://hydra.nixos.org";
+        description = ''
+          Location (URL) of Hydra instance
+        '';
+      };
+
+      mirrorURL = mkOption {
+        default = "http://nixos.org/releases";
+        description = ''
+          Location (URL) of Hydra mirror
+        '';
+      };
+
+      dataDir = mkOption {
+        default = "/data/hydra-mirror";
+        description = ''
+          Location of Hydra mirror data
+        '';
+      };
+    };
+
+  };
+
+  config = mkIf cfg.enable {
+  
+    services.cron.systemCronJobs = map cronjob cfg.jobsets ;
+
+    system.activationScripts.hydraChannelMirror = stringAfter [ "stdio" "users" ]
+      ''
+        mkdir -m 0755 -p ${cfg.dataDir}
+        mkdir -m 0755 -p ${cfg.dataDir}/nars
+        mkdir -m 0755 -p ${cfg.dataDir}/patches
+        mkdir -m 0755 -p ${cfg.dataDir}/channels
+        mkdir -m 0755 -p ${cfg.dataDir}/logs
+        ${concatMapStrings (j : ''
+        mkdir -m 0755 -p ${cfg.dataDir}/channels/${j.relURL}
+        '') cfg.jobsets}
+      '';
+    
+  };
+  
+}
-- 
GitLab


From 02f2b1f64011cbcf10bb887b9a3025f971d4cfc3 Mon Sep 17 00:00:00 2001
From: Evgeny Egorochkin <phreedom.stdin@gmail.com>
Date: Thu, 30 Sep 2010 05:08:33 +0000
Subject: [PATCH 2661/5331] Fix lots of KDE functionality

svn path=/nixos/trunk/; revision=23992
---
 modules/programs/bash/bashrc.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/programs/bash/bashrc.sh b/modules/programs/bash/bashrc.sh
index d9e1c82c253..8d1e4833a2d 100644
--- a/modules/programs/bash/bashrc.sh
+++ b/modules/programs/bash/bashrc.sh
@@ -22,7 +22,7 @@ unset XDG_CONFIG_DIRS XDG_DATA_DIRS
 
 for i in $NIX_PROFILES; do # !!! reverse
     # We have to care not leaving an empty PATH element, because that means '.' to Linux
-    export PATH=$i/bin:$i/sbin${PATH:+:}$PATH
+    export PATH=$i/bin:$i/sbin:$i/lib/kde4/libexec${PATH:+:}$PATH
     export INFOPATH=$i/info:$i/share/info${INFOPATH:+:}$INFOPATH
     export PKG_CONFIG_PATH="$i/lib/pkgconfig${PKG_CONFIG_PATH:+:}$PKG_CONFIG_PATH"
 
-- 
GitLab


From ab8a6d43c43ae5158af7407462554f3b650ad1b7 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 30 Sep 2010 13:53:30 +0000
Subject: [PATCH 2662/5331] svn path=/nixos/trunk/; revision=23998

---
 modules/services/web-servers/tomcat.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/services/web-servers/tomcat.nix b/modules/services/web-servers/tomcat.nix
index baf05e06a09..e63abfb15d2 100644
--- a/modules/services/web-servers/tomcat.nix
+++ b/modules/services/web-servers/tomcat.nix
@@ -282,7 +282,7 @@ in
 	    mkdir -p ${cfg.baseDir}/work
 	    chown ${cfg.user}:${cfg.group} ${cfg.baseDir}/work
 	    
-	    ${if cfg.axis2.enable == true then
+	    ${if cfg.axis2.enable then
 		''
 		# Copy the Axis2 web application
 		cp -av ${pkgs.axis2}/webapps/axis2 ${cfg.baseDir}/webapps
-- 
GitLab


From 2811c7270a25ebbb13fe182d2684836b92603212 Mon Sep 17 00:00:00 2001
From: Russell O'Connor <roconnor@theorem.ca>
Date: Fri, 1 Oct 2010 03:41:43 +0000
Subject: [PATCH 2663/5331] Replacing tsocks with torsocks.

tsocks leaks DNS requests and is less secure than torsocks.

torsocks is a fork of tsocks that is patched specifically for Tor.


svn path=/nixos/trunk/; revision=24012
---
 modules/module-list.nix                |  2 +-
 modules/services/security/tor.nix      |  4 +-
 modules/services/security/torify.nix   | 69 ------------------------
 modules/services/security/torsocks.nix | 72 ++++++++++++++++++++++++++
 4 files changed, 75 insertions(+), 72 deletions(-)
 delete mode 100644 modules/services/security/torify.nix
 create mode 100644 modules/services/security/torsocks.nix

diff --git a/modules/module-list.nix b/modules/module-list.nix
index ce131b8a55d..7433b82e4ab 100644
--- a/modules/module-list.nix
+++ b/modules/module-list.nix
@@ -112,7 +112,7 @@
   ./services/scheduling/cron.nix
   ./services/scheduling/fcron.nix
   ./services/security/tor.nix
-  ./services/security/torify.nix
+  ./services/security/torsocks.nix
   ./services/system/dbus.nix
   ./services/system/kerberos.nix
   ./services/system/nscd.nix
diff --git a/modules/services/security/tor.nix b/modules/services/security/tor.nix
index 8ddc468aa38..de96a7638d1 100644
--- a/modules/services/security/tor.nix
+++ b/modules/services/security/tor.nix
@@ -47,9 +47,9 @@ in
 
         socksListenAddress = mkOption {
           default = "127.0.0.1:9050";
-          example = "127.0.0.1:9050, 192.168.0.1:9100";
+          example = "192.168.0.1:9100";
           description = ''
-            Bind to this address(es) to listen for connections from Socks-speaking 
+            Bind to this address to listen for connections from Socks-speaking 
             applications. You can also specify a port.
           '';
         };
diff --git a/modules/services/security/torify.nix b/modules/services/security/torify.nix
deleted file mode 100644
index b91d7d58505..00000000000
--- a/modules/services/security/torify.nix
+++ /dev/null
@@ -1,69 +0,0 @@
-{ config, pkgs, ... }:
-with pkgs.lib;
-let
-
-  cfg = config.services.tor;
-
-  torify = pkgs.writeTextFile {
-    name = "torify";
-    text = ''
-        #!${pkgs.stdenv.shell}
-        TSOCKS_CONF_FILE=${pkgs.writeText "tsocks.conf" cfg.torify.config} LD_PRELOAD="${pkgs.tsocks}/lib/libtsocks.so $LD_PRELOAD" $@
-    '';
-    executable = true;
-    destination = "/bin/torify";
-  };
-
-in
-
-{
-
-  ###### interface
-  
-  options = {
-  
-    services.tor.torify = {
-
-      enable = mkOption {
-        default = cfg.client.enable;
-        description = ''
-          Whether to build torify scipt to relay application traffic via TOR.
-        '';
-      };
-
-      server = mkOption {
-        default = "localhost:9050";
-        example = "192.168.0.20";
-        description = ''
-          IP address of TOR client to use.
-        '';
-      };
-
-      config = mkOption {
-        default = "";
-        description = ''
-          Extra configuration. Contents will be added verbatim to TSocks
-          configuration file.
-        '';
-      };
-
-    };
-
-  };
-
-  ###### implementation
-
-  config = mkIf cfg.torify.enable {
-
-    environment.systemPackages = [ torify ];  # expose it to the users
-
-    services.tor.torify.config = ''
-      server = ${toString(head (splitString ":" cfg.torify.server))}
-      server_port = ${toString(tail (splitString ":" cfg.torify.server))}
-
-      local = 127.0.0.0/255.128.0.0
-      local = 127.128.0.0/255.192.0.0
-    '';
-  };
-
-}
\ No newline at end of file
diff --git a/modules/services/security/torsocks.nix b/modules/services/security/torsocks.nix
new file mode 100644
index 00000000000..5257327b384
--- /dev/null
+++ b/modules/services/security/torsocks.nix
@@ -0,0 +1,72 @@
+{ config, pkgs, ... }:
+with pkgs.lib;
+let
+
+  cfg = config.services.tor;
+
+  torsocks = pkgs.writeTextFile {
+    name = "torsocks";
+    text = ''
+        #!${pkgs.stdenv.shell}
+        TORSOCKS_CONF_FILE=${pkgs.writeText "torsocks.conf" cfg.torsocks.config} LD_PRELOAD="${pkgs.torsocks}/lib/torsocks/libtorsocks.so $LD_PRELOAD" $@
+    '';
+    executable = true;
+    destination = "/bin/torsocks";
+  };
+
+in
+
+{
+
+  ###### interface
+  
+  options = {
+  
+    services.tor.torsocks = {
+
+      enable = mkOption {
+        default = cfg.client.enable;
+        description = ''
+          Whether to build torsocks scipt to relay application traffic via TOR.
+        '';
+      };
+
+      server = mkOption {
+        default = cfg.client.socksListenAddress;
+        example = "192.168.0.20";
+        description = ''
+          IP address of TOR client to use.
+        '';
+      };
+
+      config = mkOption {
+        default = "";
+        description = ''
+          Extra configuration. Contents will be added verbatim to torsocks
+          configuration file.
+        '';
+      };
+
+    };
+
+  };
+
+  ###### implementation
+
+  config = mkIf cfg.torsocks.enable {
+
+    environment.systemPackages = [ torsocks ];  # expose it to the users
+
+    services.tor.torsocks.config = ''
+      server = ${toString(head (splitString ":" cfg.torsocks.server))}
+      server_port = ${toString(tail (splitString ":" cfg.torsocks.server))}
+
+      local = 127.0.0.0/255.128.0.0
+      local = 127.128.0.0/255.192.0.0
+      local = 169.254.0.0/255.255.0.0
+      local = 172.16.0.0/255.240.0.0
+      local = 192.168.0.0/255.255.0.0
+    '';
+  };
+
+}
-- 
GitLab


From 7468ad50e01ae1ee8909bf70ce13633f8acacf9f Mon Sep 17 00:00:00 2001
From: Rob Vermaas <rob.vermaas@gmail.com>
Date: Fri, 1 Oct 2010 06:31:27 +0000
Subject: [PATCH 2664/5331] nixos-option.sh: fix typo

svn path=/nixos/trunk/; revision=24015
---
 modules/installer/tools/nixos-option.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/installer/tools/nixos-option.sh b/modules/installer/tools/nixos-option.sh
index e1ddfa5ea07..fc4380d00c4 100644
--- a/modules/installer/tools/nixos-option.sh
+++ b/modules/installer/tools/nixos-option.sh
@@ -262,7 +262,7 @@ if $generate; then
   # services.printing.enable = true;
 
   # Add XServer (default if you have used a graphical iso)
-  # service.xserver = {
+  # services.xserver = {
   #   enable = true;
   #   layout = "us";
   #   xkbOptions = "eurosign:e";
-- 
GitLab


From ac7ef33e4a317d338ff2701862965a93fd40951b Mon Sep 17 00:00:00 2001
From: Evgeny Egorochkin <phreedom.stdin@gmail.com>
Date: Sat, 2 Oct 2010 02:19:17 +0000
Subject: [PATCH 2665/5331] Tor: socksListenAddress must always be in ip:port
 format

svn path=/nixos/trunk/; revision=24022
---
 modules/services/security/tor.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/services/security/tor.nix b/modules/services/security/tor.nix
index de96a7638d1..65b7abafd6a 100644
--- a/modules/services/security/tor.nix
+++ b/modules/services/security/tor.nix
@@ -50,7 +50,7 @@ in
           example = "192.168.0.1:9100";
           description = ''
             Bind to this address to listen for connections from Socks-speaking 
-            applications. You can also specify a port.
+            applications.
           '';
         };
 
-- 
GitLab


From 17213c4f2a4dca5129c39966c808567d2862d6af Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 5 Oct 2010 13:11:30 +0000
Subject: [PATCH 2666/5331] * When generating a GRUB 1 menu, don't use the
 "module" command to   load the initrd, because pv-grub doesn't like it.

svn path=/nixos/trunk/; revision=24068
---
 modules/installer/grub/grub-menu-builder.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/installer/grub/grub-menu-builder.sh b/modules/installer/grub/grub-menu-builder.sh
index 8934c9bd24d..cc82665f2ee 100644
--- a/modules/installer/grub/grub-menu-builder.sh
+++ b/modules/installer/grub/grub-menu-builder.sh
@@ -200,7 +200,7 @@ title $name
   @extraPerEntryConfig@
   ${xen:+kernel $xen $xenParams}
   $(if [ -z "$xen" ]; then echo kernel; else echo module; fi) $kernel $kernelParams
-  module $initrd
+  $(if [ -z "$xen" ]; then echo initrd; else echo module; fi) $initrd
 GRUBEND
 	    ;;
 	2)
-- 
GitLab


From c8fc492acf4cae1bc4924f998f8f3d010c6154d0 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 5 Oct 2010 14:22:06 +0000
Subject: [PATCH 2667/5331] * Start atd when udev has finished completely. 
 Hopefully this fixes   the random atd failures at boot time, which seem to be
 caused by a   race with the creation of /dev/null or something.

svn path=/nixos/trunk/; revision=24077
---
 modules/services/scheduling/atd.nix | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/modules/services/scheduling/atd.nix b/modules/services/scheduling/atd.nix
index 3c3aca6f5a2..8f6d1667bdb 100644
--- a/modules/services/scheduling/atd.nix
+++ b/modules/services/scheduling/atd.nix
@@ -66,7 +66,7 @@ in
     jobs.atd =
       { description = "at daemon (atd)";
 
-        startOn = "started udev";
+        startOn = "stopped udevtrigger";
 
         preStart =
           ''
@@ -99,7 +99,9 @@ in
             fi
           '';
 
-        exec = "${at}/sbin/atd -f";
+        exec = "${at}/sbin/atd";
+
+        daemonType = "fork";
       };
 
   };
-- 
GitLab


From c5b39e70ef7c797da5d2017e43aa3aae8e667dae Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 5 Oct 2010 14:23:12 +0000
Subject: [PATCH 2668/5331] * Rename the xen module to xen-dom0.

svn path=/nixos/trunk/; revision=24078
---
 modules/module-list.nix                          | 2 +-
 modules/virtualisation/{xen.nix => xen-dom0.nix} | 0
 2 files changed, 1 insertion(+), 1 deletion(-)
 rename modules/virtualisation/{xen.nix => xen-dom0.nix} (100%)

diff --git a/modules/module-list.nix b/modules/module-list.nix
index 7433b82e4ab..83657d922fe 100644
--- a/modules/module-list.nix
+++ b/modules/module-list.nix
@@ -158,5 +158,5 @@
   ./tasks/network-interfaces.nix
   ./tasks/swraid.nix
   ./tasks/tty-backgrounds.nix
-  ./virtualisation/xen.nix
+  ./virtualisation/xen-dom0.nix
 ]
diff --git a/modules/virtualisation/xen.nix b/modules/virtualisation/xen-dom0.nix
similarity index 100%
rename from modules/virtualisation/xen.nix
rename to modules/virtualisation/xen-dom0.nix
-- 
GitLab


From 35562ea4a3f3557449121e4eae1fe3b4d0471304 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 5 Oct 2010 15:17:09 +0000
Subject: [PATCH 2669/5331] * Don't daemonize; otherwise Upstart will respawn
 it.

svn path=/nixos/trunk/; revision=24081
---
 modules/services/networking/avahi-daemon.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/services/networking/avahi-daemon.nix b/modules/services/networking/avahi-daemon.nix
index 369b6d4f0fc..784ac21e89e 100644
--- a/modules/services/networking/avahi-daemon.nix
+++ b/modules/services/networking/avahi-daemon.nix
@@ -130,7 +130,7 @@ in
 
             mkdir -p /var/run/avahi-daemon
 
-            exec ${avahi}/sbin/avahi-daemon --daemonize -f "${avahiDaemonConf}"
+            exec ${avahi}/sbin/avahi-daemon --syslog -f "${avahiDaemonConf}"
           '';
       };
 
-- 
GitLab


From 8b5fba494220b31726a90409db18dbd123224cb5 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 5 Oct 2010 15:44:40 +0000
Subject: [PATCH 2670/5331] * Added a module that provides common configuration
 for DomU   machines.

svn path=/nixos/trunk/; revision=24084
---
 modules/virtualisation/xen-dom0.nix |  2 +-
 modules/virtualisation/xen-domU.nix | 23 +++++++++++++++++++++++
 2 files changed, 24 insertions(+), 1 deletion(-)
 create mode 100644 modules/virtualisation/xen-domU.nix

diff --git a/modules/virtualisation/xen-dom0.nix b/modules/virtualisation/xen-dom0.nix
index c2973d3a6ab..65158bc5f81 100644
--- a/modules/virtualisation/xen-dom0.nix
+++ b/modules/virtualisation/xen-dom0.nix
@@ -1,4 +1,4 @@
-# Xen hypervisor support.
+# Xen hypervisor (Dom0) support.
 
 { config, pkgs, ... }:
 
diff --git a/modules/virtualisation/xen-domU.nix b/modules/virtualisation/xen-domU.nix
new file mode 100644
index 00000000000..f4cbaf24c2b
--- /dev/null
+++ b/modules/virtualisation/xen-domU.nix
@@ -0,0 +1,23 @@
+# Common configuration for Xen DomU NixOS virtual machines.
+
+{ config, pkgs, ... }:
+
+{
+  # We're being booted using pv-grub, which means that we need to
+  # generate a GRUB 1 menu without actually installing GRUB.
+  boot.loader.grub.version = 1;
+  boot.loader.grub.device = "nodev";
+  boot.loader.grub.extraPerEntryConfig = "root (hd0)";
+
+  boot.initrd.kernelModules = [ "xen-blkfront" ];
+
+  # Backgrounds don't work, so don't bother.
+  services.ttyBackgrounds.enable = false;
+
+  # Send syslog messages to the Xen console.
+  services.syslogd.tty = "hvc0";
+
+  # Start a mingetty on the Xen console (so that you can login using
+  # "xm console" in Dom0). 
+  services.mingetty.ttys = [ "hvc0" "tty1" "tty2" ];
+}
-- 
GitLab


From aeb89fc753c6f95c9d143e6f5346f92e4a02fa67 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 5 Oct 2010 17:58:58 +0000
Subject: [PATCH 2671/5331] * Set /proc/sys/kernel/poweroff_cmd to Upstart's
 poweroff command   (rather than /sbin/poweroff).  Xen's "xm shutdown" needs
 this to   enable the host to cleanly shutdown the guest.

svn path=/nixos/trunk/; revision=24094
---
 modules/system/upstart-events/control-alt-delete.nix | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/modules/system/upstart-events/control-alt-delete.nix b/modules/system/upstart-events/control-alt-delete.nix
index 5fa2bd87eb9..f0f146160e5 100644
--- a/modules/system/upstart-events/control-alt-delete.nix
+++ b/modules/system/upstart-events/control-alt-delete.nix
@@ -15,4 +15,12 @@
           shutdown -r now 'Ctrl-Alt-Delete pressed'
         '';
     };
+
+  system.activationScripts.poweroff =
+    ''
+      # Allow the kernel to find the poweroff command.  This is used
+      # (for instance) by Xen's "xm shutdown" command to signal a
+      # guest to shut down cleanly.
+      echo ${config.system.build.upstart}/sbin/poweroff > /proc/sys/kernel/poweroff_cmd
+    '';
 }
-- 
GitLab


From 8d60cad42a4dfbab65c74f51baa7011b3c3e3e8d Mon Sep 17 00:00:00 2001
From: Rob Vermaas <rob.vermaas@gmail.com>
Date: Wed, 6 Oct 2010 11:21:15 +0000
Subject: [PATCH 2672/5331] mercurial: initial version for hgweb apache module

svn path=/nixos/trunk/; revision=24111
---
 .../web-servers/apache-httpd/mercurial.nix    | 76 +++++++++++++++++++
 1 file changed, 76 insertions(+)
 create mode 100644 modules/services/web-servers/apache-httpd/mercurial.nix

diff --git a/modules/services/web-servers/apache-httpd/mercurial.nix b/modules/services/web-servers/apache-httpd/mercurial.nix
new file mode 100644
index 00000000000..cecc486160b
--- /dev/null
+++ b/modules/services/web-servers/apache-httpd/mercurial.nix
@@ -0,0 +1,76 @@
+{ config, pkgs, serverInfo, servicesPath, ... }:
+
+let
+  inherit (pkgs) mercurial;
+  inherit (pkgs.lib) mkOption;
+
+  urlPrefix = config.urlPrefix;
+  
+  cgi = pkgs.stdenv.mkDerivation {
+    name = "mercurial-cgi";  
+    buildCommand = ''
+      ensureDir $out
+      cp -v ${mercurial}/share/cgi-bin/hgweb.cgi $out
+      sed -i "s|/path/to/repo/or/config|$out/hgweb.config|" $out/hgweb.cgi
+      echo "
+      [collections]
+      ${config.dataDir} = ${config.dataDir}
+      [web]
+      style = gitweb
+      allow_push = *
+      " > $out/hgweb.config
+    '';
+  };
+      
+in {
+
+  extraConfig = ''
+    RewriteEngine on
+    RewriteRule /(.*) ${cgi}/hgweb.cgi/$1
+
+    <Location "${urlPrefix}">
+        AuthType Basic
+        AuthName "Mercurial repositories"
+        AuthUserFile ${config.dataDir}/hgusers
+        <LimitExcept GET>
+            Require valid-user
+        </LimitExcept>
+    </Location>
+    <Directory "${cgi}">
+        Order allow,deny
+        Allow from all
+        AllowOverride All
+        Options ExecCGI
+        AddHandler cgi-script .cgi
+        SetEnv PYTHONPATH "${mercurial}/lib/${pkgs.python.libPrefix}/site-packages"
+        PassEnv PYTHONPATH
+    </Directory>
+  '';
+  
+  robotsEntries = ''
+    User-agent: *
+    Disallow: ${urlPrefix}
+  '';
+  
+  extraServerPath = [
+    (pkgs.python+"/bin")    
+  ];
+  
+  options = {
+    urlPrefix = mkOption {
+      default = "/hg";
+      description = "
+        The URL prefix under which the Mercurial service appears.
+        Use the empty string to have it appear in the server root.
+      ";
+    };
+    
+    dataDir = mkOption {
+      example = "/data/mercurial";
+      description = "
+        Path to the directory that holds the repositories.
+      ";
+    };
+  };
+  
+}
-- 
GitLab


From f2f048db4d6ad640dd2e24a671ae682fb0c94b1b Mon Sep 17 00:00:00 2001
From: Rob Vermaas <rob.vermaas@gmail.com>
Date: Wed, 6 Oct 2010 12:38:37 +0000
Subject: [PATCH 2673/5331] mercurial/apache: put PYTHONPATH in globalEnvVars

svn path=/nixos/trunk/; revision=24115
---
 modules/services/web-servers/apache-httpd/mercurial.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/modules/services/web-servers/apache-httpd/mercurial.nix b/modules/services/web-servers/apache-httpd/mercurial.nix
index cecc486160b..d2d9e66d4f8 100644
--- a/modules/services/web-servers/apache-httpd/mercurial.nix
+++ b/modules/services/web-servers/apache-httpd/mercurial.nix
@@ -42,7 +42,6 @@ in {
         AllowOverride All
         Options ExecCGI
         AddHandler cgi-script .cgi
-        SetEnv PYTHONPATH "${mercurial}/lib/${pkgs.python.libPrefix}/site-packages"
         PassEnv PYTHONPATH
     </Directory>
   '';
@@ -56,6 +55,8 @@ in {
     (pkgs.python+"/bin")    
   ];
   
+  globalEnvVars = [ { name = "PYTHONPATH"; value = "${mercurial}/lib/${pkgs.python.libPrefix}/site-packages"; } ];
+  
   options = {
     urlPrefix = mkOption {
       default = "/hg";
-- 
GitLab


From 102a1e15ba050cf9e3440b1671ce9772c31f3aef Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 6 Oct 2010 16:03:37 +0000
Subject: [PATCH 2674/5331] * Use the "iburst" flag.  This makes ntpd
 synchronise in a few seconds rather than   a few minutes by sending an
 initial burst of messages to the time servers.

svn path=/nixos/trunk/; revision=24119
---
 modules/services/networking/ntpd.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/services/networking/ntpd.nix b/modules/services/networking/ntpd.nix
index a50229125d1..f0b96951eb1 100644
--- a/modules/services/networking/ntpd.nix
+++ b/modules/services/networking/ntpd.nix
@@ -20,7 +20,7 @@ let
     # chroot to ${stateDir}, we have to specify it as /ntp.drift.
     driftfile /ntp.drift
 
-    ${toString (map (server: "server " + server + "\n") servers)}
+    ${toString (map (server: "server " + server + " iburst\n") servers)}
   '';
 
   ntpFlags = "-c ${configFile} -u ${ntpUser}:nogroup -i ${stateDir}";
-- 
GitLab


From cda2e41c017f68f0f4a522d8c5b039ec86e05b92 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 6 Oct 2010 16:07:16 +0000
Subject: [PATCH 2675/5331] * Added a "xendomains" job to automatically start
 the domains defined   in /etc/xen/auto at boot time, to save all running
 domains during   shutdown, and to restore all saved domains at boot time.

svn path=/nixos/trunk/; revision=24121
---
 .../activation/switch-to-configuration.sh     |  6 +++-
 modules/virtualisation/xen-dom0.nix           | 30 ++++++++++++++++++-
 2 files changed, 34 insertions(+), 2 deletions(-)

diff --git a/modules/system/activation/switch-to-configuration.sh b/modules/system/activation/switch-to-configuration.sh
index ffc9845622c..3249ee3ea34 100644
--- a/modules/system/activation/switch-to-configuration.sh
+++ b/modules/system/activation/switch-to-configuration.sh
@@ -110,7 +110,11 @@ EOF
         # forget about current sessions.
         # Idem for the emergeny-shell, because its `console owner'
         # line screws up the X server.
-        if echo "$job" | grep -q "^shutdown$\|^control-alt-delete$\|^xserver$\|^dbus$\|^disnix$\|^emergency-shell$"; then continue; fi
+        # Idem for xendomains because we don't want to save/restore
+	# Xen domains unless we have to.
+        # TODO: Jobs should be able to declare that they should not be
+	# auto-restarted.
+        if echo "$job" | grep -q "^shutdown$\|^control-alt-delete$\|^xserver$\|^dbus$\|^disnix$\|^emergency-shell$\|^xendomains$"; then continue; fi
 
         if ! test -e "$oldJobs/$job.conf"; then
             echo "starting $job..."
diff --git a/modules/virtualisation/xen-dom0.nix b/modules/virtualisation/xen-dom0.nix
index 65158bc5f81..e10713466f7 100644
--- a/modules/virtualisation/xen-dom0.nix
+++ b/modules/virtualisation/xen-dom0.nix
@@ -108,11 +108,39 @@ in
             pkgs.utillinux pkgs.bash xen pkgs.pciutils pkgs.procps
           ];
 
-        preStart = "${xen}/sbin/xend start";
+        preStart = 
+          ''
+            ${xen}/sbin/xend start
+  
+            # Wait until Xend is running.
+            for ((i = 0; i < 60; i++)); do echo "waiting for xend..."; ${xen}/sbin/xend status && break; done
+
+            ${xen}/sbin/xend status || exit 1
+          '';
 
         postStop = "${xen}/sbin/xend stop";
       };
 
+    jobs.xendomains =
+      { description = "Automatically starts, saves and restores Xen domains on startup/shutdown";
+
+        startOn = "started xend";
+
+        stopOn = "starting shutdown and stopping xend";
+
+        path = [ pkgs.xen ];
+
+        environment.XENDOM_CONFIG = "${xen}/etc/sysconfig/xendomains";
+
+        preStart = 
+          ''
+            mkdir -p /var/lock/subsys -m 755
+            ${xen}/etc/init.d/xendomains start
+          '';
+
+        postStop = "${xen}/etc/init.d/xendomains stop";
+      };
+
     # To prevent a race between dhclient and xend's bridge setup
     # script (which renames eth* to peth* and recreates eth* as a
     # virtual device), start dhclient after xend.
-- 
GitLab


From 81dbac4af3026cdc507459832805aa4c8c375ec5 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 6 Oct 2010 20:22:36 +0000
Subject: [PATCH 2676/5331] * Don't run ntpd in DomU.

svn path=/nixos/trunk/; revision=24125
---
 modules/virtualisation/xen-domU.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/modules/virtualisation/xen-domU.nix b/modules/virtualisation/xen-domU.nix
index f4cbaf24c2b..a83e5dc612e 100644
--- a/modules/virtualisation/xen-domU.nix
+++ b/modules/virtualisation/xen-domU.nix
@@ -20,4 +20,7 @@
   # Start a mingetty on the Xen console (so that you can login using
   # "xm console" in Dom0). 
   services.mingetty.ttys = [ "hvc0" "tty1" "tty2" ];
+
+  # Don't run ntpd, since we should get the correct time from Dom0.
+  services.ntp.enable = false;
 }
-- 
GitLab


From d556b86f752cbc37deac14ee980b159f9e94ad02 Mon Sep 17 00:00:00 2001
From: Rob Vermaas <rob.vermaas@gmail.com>
Date: Thu, 7 Oct 2010 12:46:26 +0000
Subject: [PATCH 2677/5331] hydra-mirror: enable binary patches

svn path=/nixos/trunk/; revision=24133
---
 modules/services/backup/hydra-mirror.nix | 16 +++++-----------
 1 file changed, 5 insertions(+), 11 deletions(-)

diff --git a/modules/services/backup/hydra-mirror.nix b/modules/services/backup/hydra-mirror.nix
index 89971095763..a328a9a159a 100644
--- a/modules/services/backup/hydra-mirror.nix
+++ b/modules/services/backup/hydra-mirror.nix
@@ -6,19 +6,11 @@ let
   cfg = config.services.hydraChannelMirror ;
   mirrorChannel = pkgs.fetchsvn {
     url = https://svn.nixos.org/repos/nix/release/trunk/channels/mirror-channel.pl;
-    rev = 23988;
-    sha256 = "1h06clvhr3zz378d8fblhwynvzk1smq7fipv7caakakfd31cv8i6";
+    rev = 24132;
+    sha256 = "02xvswbbr2sj9k1wfraa0j9053vf6w88nhk15qwzs8nkm180n820";
   };
   cronjob = jobset : ''
-    ${cfg.period} root perl -I${config.environment.nix}/libexec/nix ${mirrorChannel} \
-        ${cfg.hydraURL}/jobset/${jobset.project}/${jobset.jobset}/channel/latest \
-        ${cfg.dataDir}/channels/${jobset.relURL} \
-        ${cfg.dataDir}/nars \
-        ${cfg.mirrorURL}/nars \
-        ${cfg.dataDir}/patches \
-        ${cfg.mirrorURL}/patches \
-        ${if jobset.nixexprs == "" then "" else "${cfg.hydraURL}/job/${jobset.project}/${jobset.jobset}/${jobset.nixexprs}/latest/download-by-type/file/source-dist"} \
-        >> ${cfg.dataDir}/logs/${jobset.name}.log
+    ${cfg.period} root ENABLE_PATCHES=1 PATH=${config.environment.nix}/libexec/nix:$PATH perl -I${config.environment.nix}/libexec/nix ${mirrorChannel} ${cfg.hydraURL}/jobset/${jobset.project}/${jobset.jobset}/channel/latest ${cfg.dataDir}/channels/${jobset.relURL} ${cfg.dataDir}/nars ${cfg.mirrorURL}/nars ${cfg.dataDir}/patches ${cfg.mirrorURL}/patches ${if jobset.nixexprs == "" then "" else "${cfg.hydraURL}/job/${jobset.project}/${jobset.jobset}/${jobset.nixexprs}/latest/download-by-type/file/source-dist"} >> ${cfg.dataDir}/logs/${jobset.name}.log
   '';
 in
 {
@@ -82,6 +74,8 @@ in
         mkdir -m 0755 -p ${cfg.dataDir}/nars
         mkdir -m 0755 -p ${cfg.dataDir}/patches
         mkdir -m 0755 -p ${cfg.dataDir}/channels
+        ln -fs ${cfg.dataDir}/nars ${cfg.dataDir}/channels/nars 
+        ln -fs ${cfg.dataDir}/patches ${cfg.dataDir}/channels/patches 
         mkdir -m 0755 -p ${cfg.dataDir}/logs
         ${concatMapStrings (j : ''
         mkdir -m 0755 -p ${cfg.dataDir}/channels/${j.relURL}
-- 
GitLab


From 122e125d6b75f7e0913e10427bf34529a51fd97e Mon Sep 17 00:00:00 2001
From: Sander van der Burg <s.vanderburg@tudelft.nl>
Date: Thu, 7 Oct 2010 14:30:52 +0000
Subject: [PATCH 2678/5331] Added the nixos-deploy-network tool. With this tool
 you can write a network of NixOS configurations, e.g.:

{
  test1 = {pkgs, config, ...}:
    {
       # NixOS config of machine test1
       ...
    };

  test2 = {pkgs, config, ...}:
    {
       # NixOS config of machine test2
       ...
    };
}

And an infrastructure expression, e.g:

{
  test1 = {
    hostName = "test1.example.org";
    system = "i686-linux";
  };
  test2 = {
    hostName = "test2.example.org";
    system = "x86_64-linux";
  };
}

And by executing:

nixos-deploy-network -n network.nix -i infrastructure.nix

The system configurations in the network expression are built, transferred to the machines in the network and finally activated.


svn path=/nixos/trunk/; revision=24146
---
 .../tools/nixos-deploy-network/deploy.nix     | 61 ++++++++++++++++
 .../nixos-deploy-network.sh                   | 73 +++++++++++++++++++
 modules/installer/tools/tools.nix             |  8 +-
 3 files changed, 141 insertions(+), 1 deletion(-)
 create mode 100644 modules/installer/tools/nixos-deploy-network/deploy.nix
 create mode 100644 modules/installer/tools/nixos-deploy-network/nixos-deploy-network.sh

diff --git a/modules/installer/tools/nixos-deploy-network/deploy.nix b/modules/installer/tools/nixos-deploy-network/deploy.nix
new file mode 100644
index 00000000000..8d426780b10
--- /dev/null
+++ b/modules/installer/tools/nixos-deploy-network/deploy.nix
@@ -0,0 +1,61 @@
+{ nixos ? /etc/nixos/nixos
+, nixpkgs ? /etc/nixos/nixpkgs
+, networkExpr
+, infrastructureExpr
+}:
+
+let
+  pkgs = import nixpkgs {};
+  
+  inherit (builtins) attrNames getAttr listToAttrs concatMapStrings;
+  
+  network = import networkExpr;
+  infrastructure = import infrastructureExpr;
+ 
+  generateScript = network: infrastructure: configs:
+    concatMapStrings (configurationName: 
+      let
+        infrastructureElement = getAttr configurationName infrastructure;
+	config = getAttr configurationName configs;
+      in
+      ''
+        echo "=== upgrading ${infrastructureElement.hostName} ==="
+        nix-copy-closure --to ${infrastructureElement.hostName} ${config.system.build.toplevel} \
+        && ssh $NIX_SSHOPTS ${infrastructureElement.hostName} nix-env -p /nix/var/nix/profiles/system --set ${config.system.build.toplevel} \
+        && ssh $NIX_SSHOPTS ${infrastructureElement.hostName} ${config.system.build.toplevel}/bin/switch-to-configuration switch \
+        && { succeeded=$((succeeded + 1)); } \
+        || { failed=$((failed + 1)); echo 'WARNING: upgrade of ${infrastructureElement.hostName} failed!'; }
+      ''
+    ) (attrNames network)
+  ;
+
+  evaluateMachines = network: infrastructure:
+    listToAttrs (map (configurationName:
+      let
+        configuration = getAttr configurationName network;
+        system = (getAttr configurationName infrastructure).system;
+      in
+      { name = configurationName;
+        value = (import "${nixos}/lib/eval-config.nix" {
+          inherit nixpkgs system;
+          modules = [ configuration ];
+          extraArgs = evaluateMachines network infrastructure;
+        }).config; }
+    ) (attrNames (network)))
+  ;
+
+  configs = evaluateMachines network infrastructure;
+in
+pkgs.stdenv.mkDerivation {
+  name = "deploy-script";
+  buildCommand = ''
+    ensureDir $out/bin
+    cat > $out/bin/deploy-systems << "EOF"
+    #! ${pkgs.stdenv.shell} -e
+    failed=0; succeeded=0
+    ${generateScript network infrastructure configs}
+    echo "Upgrade of $failed machines failed, $succeeded machines succeeded.";
+    EOF
+    chmod +x $out/bin/deploy-systems
+  '';
+}
diff --git a/modules/installer/tools/nixos-deploy-network/nixos-deploy-network.sh b/modules/installer/tools/nixos-deploy-network/nixos-deploy-network.sh
new file mode 100644
index 00000000000..62463285f0f
--- /dev/null
+++ b/modules/installer/tools/nixos-deploy-network/nixos-deploy-network.sh
@@ -0,0 +1,73 @@
+#! @shell@ -e
+
+# Shows the usage of this command to the user
+
+showUsage()
+{
+    echo "Usage: $0 -n network_expr -i infrastructure_expr"
+    echo "Options:"
+    echo
+    echo "-n,--network        Network Nix expression which captures properties of machines in the network"
+    echo "-i,--infrastructure Infrastructure Nix expression which captures properties of machines in the network"
+    echo "-h,--help           Shows the usage of this command"
+}
+
+# Parse valid argument options
+
+PARAMS=`getopt -n $0 -o n:i:h -l network:,infrastructure:,show-trace,help -- "$@"`
+
+if [ $? != 0 ]
+then
+    showUsage
+    exit 1
+fi
+
+eval set -- "$PARAMS"
+
+# Evaluate valid options
+
+while [ "$1" != "--" ]
+do
+    case "$1" in
+	-n|--network)
+	    networkExpr=`readlink -f $2`
+	    ;;
+	-i|--infrastructure)
+	    infrastructureExpr=`readlink -f $2`
+	    ;;
+	--show-trace)
+	    showTraceArg="--show-trace"
+	    ;;
+	-h|--help)
+	    showUsage
+	    exit 0
+	    ;;
+    esac
+    
+    shift
+done
+
+# Validate the given options
+
+if [ "$infrastructureExpr" = "" ]
+then
+    echo "ERROR: A infrastructure expression must be specified!" >&2
+    exit 1
+fi
+
+if [ "$networkExpr" = "" ]
+then
+    echo "ERROR: A network expression must be specified!" >&2
+    exit 1
+fi
+
+if [ -z "$NIXOS" ]
+then
+    NIXOS=/etc/nixos/nixos
+fi
+
+# Deploy the network
+
+nix-build $NIXOS/deploy.nix --argstr networkExpr $networkExpr --argstr infrastructureExpr $infrastructureExpr $showTraceArg
+./result/bin/deploy-systems
+rm -f result
diff --git a/modules/installer/tools/tools.nix b/modules/installer/tools/tools.nix
index cb4c52f31ef..8dd07c67f91 100644
--- a/modules/installer/tools/tools.nix
+++ b/modules/installer/tools/tools.nix
@@ -11,6 +11,11 @@ let
     isExecutable = true;
   });
   
+  nixosDeployNetwork = makeProg {
+    name = "nixos-deploy-network";
+    src = ./nixos-deploy-network/nixos-deploy-network.sh;
+  };
+  
   nixosInstall = makeProg {
     name = "nixos-install";
     src = ./nixos-install.sh;
@@ -126,7 +131,8 @@ in
 
   config = {
     environment.systemPackages =
-      [ nixosInstall
+      [ nixosDeployNetwork
+        nixosInstall
         nixosRebuild
          nixosHardwareScan
          nixosGenSeccureKeys
-- 
GitLab


From 2b2b7820a9fc3c80c8c60e55c86bc357c5edd765 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Thu, 7 Oct 2010 16:58:07 +0000
Subject: [PATCH 2679/5331] Add an Avahi (mDNS/DNS-SD) and NSS-mDNS test.

svn path=/nixos/trunk/; revision=24148
---
 tests/avahi.nix   | 60 +++++++++++++++++++++++++++++++++++++++++++++++
 tests/default.nix |  1 +
 2 files changed, 61 insertions(+)
 create mode 100644 tests/avahi.nix

diff --git a/tests/avahi.nix b/tests/avahi.nix
new file mode 100644
index 00000000000..fe50edc2858
--- /dev/null
+++ b/tests/avahi.nix
@@ -0,0 +1,60 @@
+{ pkgs, ... }:
+
+with pkgs;
+
+{
+  nodes = {
+    one =
+      { config, pkgs, ... }: {
+        services.avahi.enable = true;
+        services.avahi.nssmdns = true;
+      };
+
+    two =
+      { config, pkgs, ... }: {
+        services.avahi.enable = true;
+        services.avahi.nssmdns = true;
+      };
+  };
+
+  # Test whether `avahi-daemon' and `libnss-mdns' work as expected.
+  testScript =
+    '' startAll;
+
+       # mDNS.
+       print STDERR
+        $one->mustSucceed("avahi-resolve-host-name one.local | tee out");
+       $one->mustSucceed("test \"`cut -f1 < out`\" = one.local");
+       print STDERR
+        $one->mustSucceed("avahi-resolve-host-name two.local | tee out");
+       $one->mustSucceed("test \"`cut -f1 < out`\" = two.local");
+
+       print STDERR
+        $two->mustSucceed("avahi-resolve-host-name one.local | tee out");
+       $two->mustSucceed("test \"`cut -f1 < out`\" = one.local");
+       print STDERR
+        $two->mustSucceed("avahi-resolve-host-name two.local | tee out");
+       $two->mustSucceed("test \"`cut -f1 < out`\" = two.local");
+
+       # Basic DNS-SD.
+       print STDERR
+        $one->mustSucceed("avahi-browse -r -t _workstation._tcp | tee out");
+       $one->mustSucceed("test `wc -l < out` -gt 0");
+       print STDERR
+        $two->mustSucceed("avahi-browse -r -t _workstation._tcp | tee out");
+       $two->mustSucceed("test `wc -l < out` -gt 0");
+
+       # More DNS-SD.
+       $one->execute("avahi-publish -s \"This is a test\" _test._tcp 123 one=1 &");
+       sleep 5;
+       print STDERR
+        $two->mustSucceed("avahi-browse -r -t _test._tcp | tee out");
+       $two->mustSucceed("test `wc -l < out` -gt 0");
+
+       # NSS-mDNS.
+       print STDERR $one->mustSucceed("ping -c1 one.local");
+       print STDERR $one->mustSucceed("ping -c1 two.local");
+       print STDERR $two->mustSucceed("ping -c1 one.local");
+       print STDERR $two->mustSucceed("ping -c1 two.local");
+    '';
+}
diff --git a/tests/default.nix b/tests/default.nix
index 37ca37e0728..12a7244d6e1 100644
--- a/tests/default.nix
+++ b/tests/default.nix
@@ -6,6 +6,7 @@
 with import ../lib/testing.nix { inherit nixpkgs services system; };
 
 {
+  avahi = makeTest (import ./avahi.nix);
   bittorrent = makeTest (import ./bittorrent.nix);
   firefox = makeTest (import ./firefox.nix);
   installer = makeTests (import ./installer.nix);
-- 
GitLab


From dc18e5488a2bb4d04f97f6f0b242630f1a0f07fc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Thu, 7 Oct 2010 20:10:40 +0000
Subject: [PATCH 2680/5331] NSS-mDNS: Allow both IPv4 and IPv6 address
 resolution.

svn path=/nixos/trunk/; revision=24150
---
 modules/config/nsswitch-mdns.conf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/config/nsswitch-mdns.conf b/modules/config/nsswitch-mdns.conf
index eefbd0c4203..61dd436682d 100644
--- a/modules/config/nsswitch-mdns.conf
+++ b/modules/config/nsswitch-mdns.conf
@@ -4,7 +4,7 @@ passwd:         ldap files
 group:          ldap files
 shadow:         ldap files
 
-hosts:          files mdns4_minimal [NOTFOUND=return] dns mdns4
+hosts:          files mdns_minimal [NOTFOUND=return] dns mdns
 networks:       files dns
 
 services:       files
-- 
GitLab


From 5e6186418ef2bdf253262aa6d1e4e54e356e4c8e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Thu, 7 Oct 2010 20:10:45 +0000
Subject: [PATCH 2681/5331] Avahi test: Use `getent hosts' instead of `ping
 -c1'.

svn path=/nixos/trunk/; revision=24151
---
 tests/avahi.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/tests/avahi.nix b/tests/avahi.nix
index fe50edc2858..2bf811b5cb3 100644
--- a/tests/avahi.nix
+++ b/tests/avahi.nix
@@ -52,9 +52,9 @@ with pkgs;
        $two->mustSucceed("test `wc -l < out` -gt 0");
 
        # NSS-mDNS.
-       print STDERR $one->mustSucceed("ping -c1 one.local");
-       print STDERR $one->mustSucceed("ping -c1 two.local");
-       print STDERR $two->mustSucceed("ping -c1 one.local");
-       print STDERR $two->mustSucceed("ping -c1 two.local");
+       print STDERR $one->mustSucceed("getent hosts one.local");
+       print STDERR $one->mustSucceed("getent hosts two.local");
+       print STDERR $two->mustSucceed("getent hosts one.local");
+       print STDERR $two->mustSucceed("getent hosts two.local");
     '';
 }
-- 
GitLab


From 8d88e37b27318dede6a128f60ec8124648e98bc5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Thu, 7 Oct 2010 20:10:49 +0000
Subject: [PATCH 2682/5331] avahi-daemon: Remove outdated and confusing
 comment.

svn path=/nixos/trunk/; revision=24152
---
 modules/services/networking/avahi-daemon.nix | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/modules/services/networking/avahi-daemon.nix b/modules/services/networking/avahi-daemon.nix
index 784ac21e89e..0ca9869db0b 100644
--- a/modules/services/networking/avahi-daemon.nix
+++ b/modules/services/networking/avahi-daemon.nix
@@ -81,12 +81,6 @@ in
           Whether to enable the mDNS NSS (Name Service Switch) plug-in.
           Enabling it allows applications to resolve names in the `.local'
           domain by transparently querying the Avahi daemon.
-
-          Warning: Currently, enabling this option breaks DNS lookups after
-          a `nixos-rebuild'.  This is because `/etc/nsswitch.conf' is
-          updated to use `nss-mdns' but `libnss_mdns' is not in
-          applications' `LD_LIBRARY_PATH'.  The next time `/etc/profile' is
-          sourced, it will set up an appropriate `LD_LIBRARY_PATH', though.
         '';
       };
       
-- 
GitLab


From 3c6e5ef88e4b8296e648794f00d1f119d5ee095b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Thu, 7 Oct 2010 21:03:23 +0000
Subject: [PATCH 2683/5331] Updating from trunk.

I had to fix conflicts in the pcre expression, and as usual, all-packages.nix about stdenv2.


svn path=/nixos/branches/stdenv-updates/; revision=24153
---
 release.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/release.nix b/release.nix
index dacbeab0cbe..8a48f46ad35 100644
--- a/release.nix
+++ b/release.nix
@@ -1,4 +1,4 @@
-{ nixpkgs ? ../nixpkgs }:
+{ nixpkgs ? ../stdenv-updates-svn }:
 
 let
 
@@ -66,6 +66,7 @@ let
             description = "NixOS system tarball for ${system} - ${stdenv.platform.name}";
             maintainers = map (x: lib.getAttr x lib.maintainers) maintainers;
           };
+          inherit config;
         };
 
 
-- 
GitLab


From 7eb7abdfd21c09530c76ab966850f71f7795fca2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Thu, 7 Oct 2010 21:16:05 +0000
Subject: [PATCH 2684/5331] Set assertions requiring specific systems for some
 system tarballs.

svn path=/nixos/branches/stdenv-updates/; revision=24154
---
 release.nix | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/release.nix b/release.nix
index 8a48f46ad35..aa1fdb8469e 100644
--- a/release.nix
+++ b/release.nix
@@ -135,11 +135,15 @@ let
       module = ./modules/installer/cd-dvd/system-tarball-pc.nix;
     };
 
-    system_tarball_fuloong2f = makeSystemTarball {
+    system_tarball_fuloong2f =
+        assert builtins.currentSystem == "mips64-linux";
+      makeSystemTarball {
       module = ./modules/installer/cd-dvd/system-tarball-fuloong2f.nix;
     } { system = "mips64-linux"; };
 
-    system_tarball_sheevaplug = makeSystemTarball {
+    system_tarball_sheevaplug =
+        assert builtins.currentSystem == "armv5tel-linux";
+      makeSystemTarball {
       module = ./modules/installer/cd-dvd/system-tarball-sheevaplug.nix;
     } { system = "armv5tel-linux"; };
 
-- 
GitLab


From f9d4df1e04ca14041c15c1b2cf5d9604cc2d30af Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 8 Oct 2010 12:57:21 +0000
Subject: [PATCH 2685/5331] svn path=/nixos/trunk/; revision=24185

---
 modules/services/web-servers/apache-httpd/twiki.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/services/web-servers/apache-httpd/twiki.nix b/modules/services/web-servers/apache-httpd/twiki.nix
index e55197ade67..dca92062fa8 100644
--- a/modules/services/web-servers/apache-httpd/twiki.nix
+++ b/modules/services/web-servers/apache-httpd/twiki.nix
@@ -20,7 +20,7 @@ let
   defaultUrlHost = "";
 
   # Build the TWiki CGI and configuration files.
-  twikiRoot = (import /etc/nixos/services/twiki/twiki-instance.nix).twiki {
+  twikiRoot = (import /etc/nixos/services/twiki/twiki-instance.nix { inherit pkgs; }).twiki {
     name = "wiki-instance";
     pubdir = pubDir;
     datadir = dataDir;
@@ -143,4 +143,4 @@ in {
 
   };  
 
-}
\ No newline at end of file
+}
-- 
GitLab


From a069fcffc6022debe23c11f146bacd7ce5a7db5b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Sun, 10 Oct 2010 10:43:28 +0000
Subject: [PATCH 2686/5331] Making a nixos option about the system 'sendmail',
 which postfix sets, for example.

svn path=/nixos/trunk/; revision=24193
---
 modules/module-list.nix           |  2 ++
 modules/services/mail/mail.nix    | 33 +++++++++++++++++++++++++++++++
 modules/services/mail/postfix.nix | 27 +++++++++++++++++++++----
 3 files changed, 58 insertions(+), 4 deletions(-)
 create mode 100644 modules/services/mail/mail.nix

diff --git a/modules/module-list.nix b/modules/module-list.nix
index 83657d922fe..4bc46544d10 100644
--- a/modules/module-list.nix
+++ b/modules/module-list.nix
@@ -14,6 +14,7 @@
   ./config/users-groups.nix
   ./hardware/network/intel-2200bg.nix
   ./hardware/network/intel-3945abg.nix
+  ./hardware/network/rt2870.nix 
   ./hardware/network/rt73.nix 
   ./hardware/pcmcia.nix
   ./installer/generations-dir/generations-dir.nix
@@ -59,6 +60,7 @@
   ./services/logging/logrotate.nix
   ./services/logging/syslogd.nix
   ./services/mail/dovecot.nix
+  ./services/mail/mail.nix
   ./services/mail/postfix.nix
   ./services/misc/autofs.nix
   ./services/misc/disnix.nix
diff --git a/modules/services/mail/mail.nix b/modules/services/mail/mail.nix
new file mode 100644
index 00000000000..bdf6b28ffbc
--- /dev/null
+++ b/modules/services/mail/mail.nix
@@ -0,0 +1,33 @@
+{ config, pkgs, ... }:
+
+with pkgs.lib;
+
+{
+
+  ###### interface
+
+  options = {
+  
+    services.mail = {
+    
+      sendmailSetuidWrapper = mkOption {
+        default = null;
+        description = ''
+          Configuration for the sendmail setuid wrwapper (like an element of
+          security.setuidOwners)";
+        '';
+      };
+
+    };
+
+  };
+
+  ###### implementation
+
+  config = mkIf (config.services.mail.sendmailSetuidWrapper != null) {
+
+    security.setuidOwners = [ config.services.mail.sendmailSetuidWrapper ];
+
+  };
+
+}
diff --git a/modules/services/mail/postfix.nix b/modules/services/mail/postfix.nix
index 03c77885d06..3eda558f1c5 100644
--- a/modules/services/mail/postfix.nix
+++ b/modules/services/mail/postfix.nix
@@ -111,6 +111,11 @@ in
         default = false;
         description = "Whether to run the Postfix mail server.";
       };
+
+      setSendmail = mkOption {
+        default = true;
+        description = "Whether to set the system sendmail to postfix's.";
+      };
       
       user = mkOption {
         default = "postfix";
@@ -254,10 +259,24 @@ in
 
   config = mkIf config.services.postfix.enable {
 
-    environment.etc = singleton
-      { source = "/var/postfix/conf";
-        target = "postfix";
-      };
+    environment = {
+      etc = singleton
+        { source = "/var/postfix/conf";
+          target = "postfix";
+        };
+
+      # This makes comfortable for root to run 'postqueue' for example.
+      systemPackages = [ pkgs.postfix ];
+    };
+
+    services.mail.sendmailSetuidWrapper = mkIf config.services.postfix.setSendmail {
+      program = "sendmail";
+      source = "${pkgs.postfix}/bin/sendmail";
+      owner = "nobody";
+      group = "postdrop";
+      setuid = false;
+      setgid = true;
+    };
 
     users.extraUsers = singleton
       { name = user;
-- 
GitLab


From 70a2ad789877422ebe7b76fa8be09637ab4c4665 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Sun, 10 Oct 2010 11:08:10 +0000
Subject: [PATCH 2687/5331] Requiring nixpkgs 24196, I made nixos set the
 sendmail path to vixie cron, so now vixie cron can send mail properly, for
 example if a user enabled the 'postfix' service.

svn path=/nixos/trunk/; revision=24197
---
 modules/services/scheduling/cron.nix | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/modules/services/scheduling/cron.nix b/modules/services/scheduling/cron.nix
index e769caefdf5..c6af4995079 100644
--- a/modules/services/scheduling/cron.nix
+++ b/modules/services/scheduling/cron.nix
@@ -15,6 +15,13 @@ let
       NIX_CONF_DIR=/nix/etc/nix
       ${pkgs.lib.concatStrings (map (job: job + "\n") config.services.cron.systemCronJobs)}
     '';
+
+  # Vixie cron requires build-time configuration for the sendmail path.
+  cronNixosPkg = pkgs.cron.override {
+    # The mail.nix nixos module, if there is any local mail system enabled,
+    # should have sendmail in this path.
+    sendmailPath = "/var/setuid-wrappers/sendmail";
+  };
   
 in
 
@@ -65,7 +72,7 @@ in
         mode = "0600"; # Cron requires this.
       };
 
-    environment.systemPackages = [pkgs.cron];
+    environment.systemPackages = [ cronNixosPkg ];
 
     jobs.cron =
       { description = "Cron daemon";
@@ -86,7 +93,7 @@ in
             fi
           '';
 
-        exec = "${pkgs.cron}/sbin/cron -n";
+        exec = "${cronNixosPkg}/sbin/cron -n";
       };
 
   };
-- 
GitLab


From dc11ce585f0487da095374edf9e3285b1208089a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Sun, 10 Oct 2010 11:14:02 +0000
Subject: [PATCH 2688/5331] Making vixie cron have the usual enable/disable
 nixos service option.

svn path=/nixos/trunk/; revision=24198
---
 modules/services/scheduling/cron.nix | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/modules/services/scheduling/cron.nix b/modules/services/scheduling/cron.nix
index c6af4995079..04c85eecf74 100644
--- a/modules/services/scheduling/cron.nix
+++ b/modules/services/scheduling/cron.nix
@@ -33,6 +33,11 @@ in
   
     services.cron = {
 
+      enable = mkOption {
+        default = true;
+        description = "Whether to enable the `vixie cron' daemon.";
+      };
+
       mailto = mkOption {
         default = "";
         description = " The job output will be mailed to this email address. ";
@@ -63,7 +68,7 @@ in
 
   ###### implementation
 
-  config = {  
+  config = mkIf config.services.cron.enable {  
 
     environment.etc = singleton
       # The system-wide crontab.
-- 
GitLab


From 79ded36abfc003550170f6edfec3b3824682986f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Sun, 10 Oct 2010 11:35:15 +0000
Subject: [PATCH 2689/5331] Making cron/fcron set their setuid wrappers. And
 made fcron use the nixos systemCrontabJobs by default. It does not look very
 modular, and the manual may not look very good, but I think it works better
 than before. And setting cron.enable = false and fcron.enable = true works
 fine.

svn path=/nixos/trunk/; revision=24199
---
 modules/security/setuid-wrappers.nix  |  2 +-
 modules/services/scheduling/cron.nix  |  8 +++++++-
 modules/services/scheduling/fcron.nix | 23 +++++++++++------------
 3 files changed, 19 insertions(+), 14 deletions(-)

diff --git a/modules/security/setuid-wrappers.nix b/modules/security/setuid-wrappers.nix
index edbae5d55c8..a7238b9add5 100644
--- a/modules/security/setuid-wrappers.nix
+++ b/modules/security/setuid-wrappers.nix
@@ -75,7 +75,7 @@ in
   config = {
 
     security.setuidPrograms =
-      [ "crontab" "fusermount" "wodim" "cdrdao" "growisofs" ];
+      [ "fusermount" "wodim" "cdrdao" "growisofs" ];
 
     system.activationScripts.setuid =
       let
diff --git a/modules/services/scheduling/cron.nix b/modules/services/scheduling/cron.nix
index 04c85eecf74..555cde92876 100644
--- a/modules/services/scheduling/cron.nix
+++ b/modules/services/scheduling/cron.nix
@@ -58,6 +58,10 @@ in
           If neither /var/cron/cron.deny nor /var/cron/cron.allow exist only root
           will is allowed to have its own crontab file. The /var/cron/cron.deny file
           is created automatically for you. So every user can use a crontab.
+
+          Many nixos modules set systemCronJobs, so if you decide to disable vixie cron
+          and enable another cron daemon, you may want it to get its system crontab
+          based on systemCronJobs.
         '';
       };
 
@@ -68,7 +72,7 @@ in
 
   ###### implementation
 
-  config = mkIf config.services.cron.enable {  
+  config = mkIf config.services.cron.enable {
 
     environment.etc = singleton
       # The system-wide crontab.
@@ -77,6 +81,8 @@ in
         mode = "0600"; # Cron requires this.
       };
 
+    security.setuidPrograms = [ "crontab" ];
+
     environment.systemPackages = [ cronNixosPkg ];
 
     jobs.cron =
diff --git a/modules/services/scheduling/fcron.nix b/modules/services/scheduling/fcron.nix
index f217449cf0c..5bff33b3e27 100644
--- a/modules/services/scheduling/fcron.nix
+++ b/modules/services/scheduling/fcron.nix
@@ -4,20 +4,17 @@ with pkgs.lib;
 
 let
 
-  # Put all the system cronjobs together.
-  # TODO allow using fcron only..
-  #systemCronJobs =
-  #  config.services.cron.systemCronJobs;
   cfg = config.services.fcron;
   
   queuelen = if cfg.queuelen == "" then "" else "-q ${toString cfg.queuelen}";
 
-  # shell is set to /sh in config..
-  # ${pkgs.lib.concatStrings (map (job: job + "\n") systemCronJobs)}
-  systemCronJobsFile = pkgs.writeText "fcron-systab"
+  systemCronJobsFile = pkgs.writeText "system-crontab"
     ''
-      SHELL=${pkgs.bash}/bin/sh
-      PATH=${pkgs.coreutils}/bin:${pkgs.findutils}/bin:${pkgs.gnused}/bin
+      SHELL=${pkgs.bash}/bin/bash
+      PATH=${config.system.path}/bin:${config.system.path}/sbin
+      MAILTO="${config.services.cron.mailto}"
+      NIX_CONF_DIR=/nix/etc/nix
+      ${pkgs.lib.concatStrings (map (job: job + "\n") config.services.cron.systemCronJobs)}
     '';
 
   allowdeny = target: users:
@@ -42,7 +39,7 @@ in
       };
       
       allow = mkOption {
-        default = [];
+        default = [ "all" ];
         description = ''
           Users allowed to use fcrontab and fcrondyn (one name per line, "all" for everyone).
         '';
@@ -64,7 +61,7 @@ in
       };
       
       systab = mkOption {
-        default = "";
+        default = systemCronJobsFile;
         description = ''The "system" crontab contents.'';
       };
     };
@@ -77,7 +74,7 @@ in
   config = mkIf cfg.enable {
 
     environment.etc =
-      [ (allowdeny "allow" (["root"] ++ cfg.allow))
+      [ (allowdeny "allow" (cfg.allow))
         (allowdeny "deny" cfg.deny)
         # see man 5 fcron.conf
         { source = pkgs.writeText "fcon.conf" ''
@@ -97,6 +94,8 @@ in
 
     environment.systemPackages = [ pkgs.fcron ];
 
+    security.setuidPrograms = [ "fcrontab" ];
+
     jobs.fcron =
       { description = "fcron daemon";
 
-- 
GitLab


From 098a593fb437093a04768a790a1a2b4cb8350272 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Sun, 10 Oct 2010 11:50:50 +0000
Subject: [PATCH 2690/5331] Removing a nixos module reference I commited by
 error.

svn path=/nixos/trunk/; revision=24202
---
 modules/module-list.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/modules/module-list.nix b/modules/module-list.nix
index 4bc46544d10..f70473f1b9b 100644
--- a/modules/module-list.nix
+++ b/modules/module-list.nix
@@ -14,7 +14,6 @@
   ./config/users-groups.nix
   ./hardware/network/intel-2200bg.nix
   ./hardware/network/intel-3945abg.nix
-  ./hardware/network/rt2870.nix 
   ./hardware/network/rt73.nix 
   ./hardware/pcmcia.nix
   ./installer/generations-dir/generations-dir.nix
-- 
GitLab


From 4894a15c70563e12d777efdc36564b58ca73c651 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Sun, 10 Oct 2010 11:55:05 +0000
Subject: [PATCH 2691/5331] I had did a merge from trunk when nixos trunk was
 broken. Remerging after the trunk fix.

svn path=/nixos/branches/stdenv-updates/; revision=24203
---
 modules/module-list.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/modules/module-list.nix b/modules/module-list.nix
index 4bc46544d10..f70473f1b9b 100644
--- a/modules/module-list.nix
+++ b/modules/module-list.nix
@@ -14,7 +14,6 @@
   ./config/users-groups.nix
   ./hardware/network/intel-2200bg.nix
   ./hardware/network/intel-3945abg.nix
-  ./hardware/network/rt2870.nix 
   ./hardware/network/rt73.nix 
   ./hardware/pcmcia.nix
   ./installer/generations-dir/generations-dir.nix
-- 
GitLab


From 968437c5d073b2e5e3af741f15b2156b76eb68b0 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sun, 10 Oct 2010 22:35:18 +0000
Subject: [PATCH 2692/5331] * Enable xfce4-mixer.

svn path=/nixos/trunk/; revision=24208
---
 modules/services/x11/desktop-managers/xfce.nix | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/modules/services/x11/desktop-managers/xfce.nix b/modules/services/x11/desktop-managers/xfce.nix
index 46b054989e0..4e8689f7ca7 100644
--- a/modules/services/x11/desktop-managers/xfce.nix
+++ b/modules/services/x11/desktop-managers/xfce.nix
@@ -33,7 +33,11 @@ in
             
             # Set GTK_DATA_PREFIX so that GTK+ can find the Xfce themes.
             export GTK_DATA_PREFIX=${config.system.path}
-            
+
+            # Necessary to get xfce4-mixer to find GST's ALSA plugin.
+            # Ugly.
+            export GST_PLUGIN_PATH=${config.system.path}/lib
+
             exec ${pkgs.stdenv.shell} ${pkgs.xfce.xfceutils}/etc/xdg/xfce4/xinitrc
           '';
       };
@@ -55,6 +59,7 @@ in
         pkgs.xfce.xfce4panel
         pkgs.xfce.xfce4session
         pkgs.xfce.xfce4settings
+        pkgs.xfce.xfce4mixer
         pkgs.xfce.xfceutils
         pkgs.xfce.xfconf
         pkgs.xfce.xfdesktop
-- 
GitLab


From 26bae39a1f25d1e92f8e3acc2b3130035e913e8d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Sun, 10 Oct 2010 22:37:41 +0000
Subject: [PATCH 2693/5331] Have Hydra execute the Avahi test.

svn path=/nixos/trunk/; revision=24209
---
 release.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/release.nix b/release.nix
index d0ae398289f..5e042945b43 100644
--- a/release.nix
+++ b/release.nix
@@ -148,6 +148,7 @@ let
           system = "i686-linux";
         };
       in {
+        avahi = t.avahi.test;
         bittorrent = t.bittorrent.test;
         firefox = t.firefox.test;
         installer.lvm = t.installer.lvm.test;
-- 
GitLab


From 4695f790cf44976b3f920bac38e046a82fceae5b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Sun, 10 Oct 2010 22:37:45 +0000
Subject: [PATCH 2694/5331] test-driver: Add `startJob' method.

svn path=/nixos/trunk/; revision=24210
---
 lib/test-driver/Machine.pm | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/lib/test-driver/Machine.pm b/lib/test-driver/Machine.pm
index 9f5971d70a1..daa40f78f9f 100644
--- a/lib/test-driver/Machine.pm
+++ b/lib/test-driver/Machine.pm
@@ -330,6 +330,12 @@ sub waitForFile {
     }
 }
 
+sub startJob {
+    my ($self, $jobName) = @_;
+    $self->execute("initctl start $jobName");
+    my ($status, $out) = $self->execute("initctl status $jobName");
+    die "failed to start $jobName" unless $out =~ /start\/running/;
+}
 
 sub stopJob {
     my ($self, $jobName) = @_;
-- 
GitLab


From 1c2a5b495db1ffbe35f4af10a28bc0381bc33def Mon Sep 17 00:00:00 2001
From: Nicolas Pierron <nicolas.b.pierron@gmail.com>
Date: Sun, 10 Oct 2010 22:55:42 +0000
Subject: [PATCH 2695/5331] Make Hydra check that CD configuration can be
 updated without any connection.

svn path=/nixos/trunk/; revision=24211
---
 release.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/release.nix b/release.nix
index 5e042945b43..ffbc764de18 100644
--- a/release.nix
+++ b/release.nix
@@ -155,6 +155,7 @@ let
         installer.separateBoot = t.installer.separateBoot.test;
         installer.simple = t.installer.simple.test;
         installer.swraid = t.installer.swraid.test;
+        installer.rebuildCD = t.installer.rebuildCD.test;
         kde4 = t.kde4.test;
         login = t.login.test;
         nat = t.nat.test;
-- 
GitLab


From fa04ae9738523393a40edb4f8a4e9de56cf0d9a6 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 11 Oct 2010 17:06:49 +0000
Subject: [PATCH 2696/5331] * It's "tun", not "tap".

svn path=/nixos/trunk/; revision=24217
---
 modules/virtualisation/xen-dom0.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/virtualisation/xen-dom0.nix b/modules/virtualisation/xen-dom0.nix
index e10713466f7..18fbf7bc62b 100644
--- a/modules/virtualisation/xen-dom0.nix
+++ b/modules/virtualisation/xen-dom0.nix
@@ -72,7 +72,7 @@ in
 
     boot.kernelModules = 
       [ "xen_evtchn" "xen_gntdev" "xen_blkback" "xen_netback" "xen_pciback" 
-        "blktap" "tap"
+        "blktap" "tun"
       ];
 
     # The radeonfb kernel module causes the screen to go black as soon
-- 
GitLab


From 52a8a529b3a2fd3e2ad5f8c7a40837030ea403e2 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 12 Oct 2010 22:03:50 +0000
Subject: [PATCH 2697/5331] * Fix indentation.

svn path=/nixos/trunk/; revision=24254
---
 tests/installer.nix | 46 ++++++++++++++++++++-------------------------
 1 file changed, 20 insertions(+), 26 deletions(-)

diff --git a/tests/installer.nix b/tests/installer.nix
index e8337ebe2bb..4dcb08f7076 100644
--- a/tests/installer.nix
+++ b/tests/installer.nix
@@ -302,37 +302,31 @@ in {
     { inherit iso;
       nodes = { };
       testScript =
-    ''
-      # damn, it's costly to evaluate nixos-rebuild (1G of ram)
-      my $machine = Machine->new({ cdrom => glob("${iso}/iso/*.iso"), qemuFlags => '${qemuNICFlags 1 1} -m 1024' });
-      $machine->start;
-      
-      # Make sure that we get a login prompt etc.
-      $machine->mustSucceed("echo hello");
-      $machine->waitForJob("tty1");
-      $machine->waitForJob("rogue");
-      $machine->waitForJob("nixos-manual");
+        ''
+          # damn, it's costly to evaluate nixos-rebuild (1G of ram)
+          my $machine = Machine->new({ cdrom => glob("${iso}/iso/*.iso"), qemuFlags => '${qemuNICFlags 1 1} -m 1024' });
+          $machine->start;
 
-      # Make sure that we don't try to download anything.
-      $machine->stopJob("dhclient");
-      $machine->mustSucceed("rm /etc/resolv.conf");
+          # Make sure that we don't try to download anything.
+          $machine->stopJob("dhclient");
+          $machine->mustSucceed("rm /etc/resolv.conf");
 
-      # Enable sshd service.
-      $machine->mustSucceed(
-        "sed -i 's,^}\$,jobs.sshd.startOn = pkgs.lib.mkOverride 0 \"startup\"; },' /etc/nixos/configuration.nix"
-      );
+          # Enable sshd service.
+          $machine->mustSucceed(
+            "sed -i 's,^}\$,jobs.sshd.startOn = pkgs.lib.mkOverride 0 \"startup\"; },' /etc/nixos/configuration.nix"
+          );
 
-      my $cfg = $machine->mustSucceed("cat /etc/nixos/configuration.nix");
-      print STDERR "New CD config:\n$cfg\n";
+          my $cfg = $machine->mustSucceed("cat /etc/nixos/configuration.nix");
+          print STDERR "New CD config:\n$cfg\n";
 
-      # Apply the new CD configuration.
-      $machine->mustSucceed("nixos-rebuild test --no-pull");
+          # Apply the new CD configuration.
+          $machine->mustSucceed("nixos-rebuild test --no-pull");
 
-      # Connect to it-self.
-      #$machine->waitForJob("sshd");
-      #$machine->mustSucceed("ssh root@127.0.0.1 echo hello");
+          # Connect to it-self.
+          #$machine->waitForJob("sshd");
+          #$machine->mustSucceed("ssh root@127.0.0.1 echo hello");
 
-      $machine->shutdown;
-    '';
+          $machine->shutdown;
+        '';
     };
 }
-- 
GitLab


From 9def3a8dbcac3267f98f0dafa85bb6150f2f030c Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 12 Oct 2010 22:04:10 +0000
Subject: [PATCH 2698/5331] * Use mkOverride.

svn path=/nixos/trunk/; revision=24255
---
 tests/quake3.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/quake3.nix b/tests/quake3.nix
index 6bc7b8f9119..1a9f53d1a56 100644
--- a/tests/quake3.nix
+++ b/tests/quake3.nix
@@ -7,8 +7,8 @@ rec {
 
     { require = [ ./common/x11.nix ];
       services.xserver.driSupport = true;
-      services.xserver.defaultDepth = pkgs.lib.mkOverrideTemplate 0 {} 16;
-      environment.systemPackages = [ pkgs.icewm pkgs.quake3demo ];
+      services.xserver.defaultDepth = pkgs.lib.mkOverride 0 16;
+      environment.systemPackages = [ pkgs.quake3demo ];
     };
 
   nodes =
-- 
GitLab


From f9a62453b08ee6799304233c6b06c6c047fb7560 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 14 Oct 2010 12:11:37 +0000
Subject: [PATCH 2699/5331] * Set KDEDIRS in kdm, otherwise it can't find the
 wallpaper.

svn path=/nixos/trunk/; revision=24282
---
 modules/services/x11/display-managers/kdm.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/services/x11/display-managers/kdm.nix b/modules/services/x11/display-managers/kdm.nix
index 7dd979376d6..1fa5b4f210f 100644
--- a/modules/services/x11/display-managers/kdm.nix
+++ b/modules/services/x11/display-managers/kdm.nix
@@ -100,7 +100,7 @@ in
     services.xserver.displayManager.job =
       { execCmd =
           (optionalString (config.system.boot.loader.id == "grub") "PATH=${config.system.build.grub}/sbin:$PATH ") +
-          "exec ${kdebase_workspace}/bin/kdm -config ${kdmrc} -nodaemon";
+          "KDEDIRS=${kdebase_workspace} exec ${kdebase_workspace}/bin/kdm -config ${kdmrc} -nodaemon";
         logsXsession = true;
       };
 
-- 
GitLab


From 6cd14e37841e96d1e9bda2514fd73f74706e4598 Mon Sep 17 00:00:00 2001
From: Evgeny Egorochkin <phreedom.stdin@gmail.com>
Date: Thu, 14 Oct 2010 12:33:20 +0000
Subject: [PATCH 2700/5331] Intel 2100 wifi firmware: packaged

svn path=/nixos/trunk/; revision=24285
---
 modules/hardware/network/intel-2100bg.nix | 34 +++++++++++++++++++++++
 modules/module-list.nix                   |  1 +
 2 files changed, 35 insertions(+)
 create mode 100644 modules/hardware/network/intel-2100bg.nix

diff --git a/modules/hardware/network/intel-2100bg.nix b/modules/hardware/network/intel-2100bg.nix
new file mode 100644
index 00000000000..aec4f9748dc
--- /dev/null
+++ b/modules/hardware/network/intel-2100bg.nix
@@ -0,0 +1,34 @@
+{pkgs, config, ...}:
+
+{
+
+  ###### interface
+
+  options = {
+  
+    networking.enableIntel2100BGFirmware = pkgs.lib.mkOption {
+      default = false;
+      type = pkgs.lib.types.bool;
+      description = ''
+        Turn on this option if you want firmware for the Intel
+        PRO/Wireless 2100BG to be loaded automatically.  This is
+        required if you want to use this device.  Intel requires you to
+        accept the license for this firmware, see
+        <link xlink:href='http://ipw2100.sourceforge.net/firmware.php?fid=2'/>.
+      '';
+    };
+
+  };
+
+
+  ###### implementation
+  
+  config = pkgs.lib.mkIf config.networking.enableIntel2100BGFirmware {
+  
+    # Warning: setting this option requires acceptance of the firmware
+    # license, see http://ipw2100.sourceforge.net/firmware.php?fid=2.
+    hardware.firmware = [ pkgs.ipw2100fw ];
+
+  };
+  
+}
diff --git a/modules/module-list.nix b/modules/module-list.nix
index f70473f1b9b..5e6ed0095f2 100644
--- a/modules/module-list.nix
+++ b/modules/module-list.nix
@@ -12,6 +12,7 @@
   ./config/timezone.nix
   ./config/unix-odbc-drivers.nix
   ./config/users-groups.nix
+  ./hardware/network/intel-2100bg.nix
   ./hardware/network/intel-2200bg.nix
   ./hardware/network/intel-3945abg.nix
   ./hardware/network/rt73.nix 
-- 
GitLab


From 5e11683abc800d44860530727ec201a9739a1556 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 14 Oct 2010 13:57:15 +0000
Subject: [PATCH 2701/5331] * Remove the useless "to" function.  This ain't
 COBOL.

svn path=/nixos/trunk/; revision=24289
---
 modules/rename.nix | 39 ++++++++++++++++++---------------------
 1 file changed, 18 insertions(+), 21 deletions(-)

diff --git a/modules/rename.nix b/modules/rename.nix
index 19cf11b4fca..a6cb65cb990 100644
--- a/modules/rename.nix
+++ b/modules/rename.nix
@@ -1,8 +1,6 @@
 {pkgs, options, config, ...}:
 
-
 let
-  to = throw "This is just a dummy keyword";
 
   alias = from: to: {
     name = "Alias";
@@ -32,7 +30,7 @@ let
       if tail v != [] then zipModules v else head v
     ) list;
 
-  rename = statusTemplate: from: keyword: to: with pkgs.lib;
+  rename = statusTemplate: from: to: with pkgs.lib;
     let
       status = statusTemplate from to;
       setTo = setAttrByPath (splitString "." to);
@@ -60,30 +58,29 @@ let
 in zipModules ([]
 
 # usage example:
-# ++ rename alias "services.xserver.slim.theme" to "services.xserver.displayManager.slim.theme"
-++ rename obsolete "environment.extraPackages" to "environment.systemPackages"
+# ++ rename alias "services.xserver.slim.theme" "services.xserver.displayManager.slim.theme"
+++ rename obsolete "environment.extraPackages" "environment.systemPackages"
 
 # Old Grub-related options.
-++ rename obsolete "boot.copyKernels" to "boot.loader.grub.copyKernels"
-++ rename obsolete "boot.extraGrubEntries" to "boot.loader.grub.extraEntries"
-++ rename obsolete "boot.extraGrubEntriesBeforeNixos" to "boot.loader.grub.extraEntriesBeforeNixOS"
-++ rename obsolete "boot.grubDevice" to "boot.loader.grub.device"
-++ rename obsolete "boot.bootMount" to "boot.loader.grub.bootDevice"
-++ rename obsolete "boot.grubSplashImage" to "boot.loader.grub.splashImage"
+++ rename obsolete "boot.copyKernels" "boot.loader.grub.copyKernels"
+++ rename obsolete "boot.extraGrubEntries" "boot.loader.grub.extraEntries"
+++ rename obsolete "boot.extraGrubEntriesBeforeNixos" "boot.loader.grub.extraEntriesBeforeNixOS"
+++ rename obsolete "boot.grubDevice" "boot.loader.grub.device"
+++ rename obsolete "boot.bootMount" "boot.loader.grub.bootDevice"
+++ rename obsolete "boot.grubSplashImage" "boot.loader.grub.splashImage"
 
-++ rename obsolete "boot.initrd.extraKernelModules" to "boot.initrd.kernelModules"
+++ rename obsolete "boot.initrd.extraKernelModules" "boot.initrd.kernelModules"
 
 # OpenSSH
-++ rename obsolete "services.sshd.ports" to "services.openssh.ports"
-++ rename obsolete "services.sshd.enable" to "services.openssh.enable"
-++ rename obsolete "services.sshd.allowSFTP" to "services.openssh.allowSFTP"
-++ rename obsolete "services.sshd.forwardX11" to "services.openssh.forwardX11"
-++ rename obsolete "services.sshd.gatewayPorts" to "services.openssh.gatewayPorts"
-++ rename obsolete "services.sshd.permitRootLogin" to "services.openssh.permitRootLogin"
-++ rename obsolete "services.xserver.startSSHAgent" to "services.xserver.startOpenSSHAgent"
+++ rename obsolete "services.sshd.ports" "services.openssh.ports"
+++ rename obsolete "services.sshd.enable" "services.openssh.enable"
+++ rename obsolete "services.sshd.allowSFTP" "services.openssh.allowSFTP"
+++ rename obsolete "services.sshd.forwardX11" "services.openssh.forwardX11"
+++ rename obsolete "services.sshd.gatewayPorts" "services.openssh.gatewayPorts"
+++ rename obsolete "services.sshd.permitRootLogin" "services.openssh.permitRootLogin"
+++ rename obsolete "services.xserver.startSSHAgent" "services.xserver.startOpenSSHAgent"
 
 # KDE
-++ rename deprecated "kde.extraPackages" to "environment.kdePackages"
-
+++ rename deprecated "kde.extraPackages" "environment.kdePackages"
 
 ) # do not add renaming after this.
-- 
GitLab


From 1b55007d635db29ee3273f7c6cde8c9809abaf5c Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 14 Oct 2010 14:57:38 +0000
Subject: [PATCH 2702/5331] * Don't use environment.kdePackages;
 environment.systemPackages works   just as well.

svn path=/nixos/trunk/; revision=24290
---
 modules/rename.nix                             | 1 +
 modules/services/x11/desktop-managers/kde4.nix | 8 +++-----
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/modules/rename.nix b/modules/rename.nix
index a6cb65cb990..2d5a938c628 100644
--- a/modules/rename.nix
+++ b/modules/rename.nix
@@ -82,5 +82,6 @@ in zipModules ([]
 
 # KDE
 ++ rename deprecated "kde.extraPackages" "environment.kdePackages"
+# ++ rename obsolete "environment.kdePackages" "environment.systemPackages" # !!! doesn't work!
 
 ) # do not add renaming after this.
diff --git a/modules/services/x11/desktop-managers/kde4.nix b/modules/services/x11/desktop-managers/kde4.nix
index 5ed501e4b02..2841c9426ff 100644
--- a/modules/services/x11/desktop-managers/kde4.nix
+++ b/modules/services/x11/desktop-managers/kde4.nix
@@ -23,7 +23,7 @@ in
       default = [];
       example = [ pkgs.kde4.kdesdk ];
       type = types.list types.package;
-      description = "Additional KDE 4 programs. Only a minimal set is installed by default.";
+      description = "This option is obsolete.  Please use <option>environment.systemPackages</option> instead.";
     };
 
   };
@@ -56,7 +56,7 @@ in
     } ];
 
     environment = {
-      kdePackages = [
+      systemPackages = [
         pkgs.kde4.kdelibs
         pkgs.kde4.kdebase
         pkgs.kde4.kdebase_runtime
@@ -69,9 +69,7 @@ in
         pkgs.gst_all.gstPluginsGood
         xorg.xmessage # so that startkde can show error messages
         xorg.xset # used by startkde, non-essential
-      ];
-
-      x11Packages = config.environment.kdePackages;
+      ] ++ config.environment.kdePackages;
 
       pathsToLink = [ "/share" ];
 
-- 
GitLab


From 40df597205a135a25d13fceed93c2fc18ae9e5f9 Mon Sep 17 00:00:00 2001
From: Nicolas Pierron <nicolas.b.pierron@gmail.com>
Date: Thu, 14 Oct 2010 18:18:38 +0000
Subject: [PATCH 2703/5331] Enables the following renaming A -> C & B -> C and
 A -> B & B -> C.

svn path=/nixos/trunk/; revision=24295
---
 modules/rename.nix | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/modules/rename.nix b/modules/rename.nix
index 2d5a938c628..ebad3821270 100644
--- a/modules/rename.nix
+++ b/modules/rename.nix
@@ -27,7 +27,13 @@ let
 
   zipModules = list: with pkgs.lib;
     zip (n: v:
-      if tail v != [] then zipModules v else head v
+      if tail v != [] then
+        if n == "_type" then builtins.trace "Merge _type" (head v)
+        else if n == "extraConfigs" then builtins.trace "Merge extraConfigs" (concatLists v)
+        else if n == "description" || n == "apply" then
+          abort "Cannot rename an option to multiple options."
+        else zipModules v
+      else head v
     ) list;
 
   rename = statusTemplate: from: to: with pkgs.lib;
-- 
GitLab


From 2bb4a618e2d1a988d59c87f09e88c60ad9d32f67 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 18 Oct 2010 10:31:41 +0000
Subject: [PATCH 2704/5331] * Added an option "services.openssh.extraConfig"
 that allows   setting arbitrary options in sshd_config, e.g.,

    services.openssh.extraConfig = "PermitTunnel yes";

svn path=/nixos/trunk/; revision=24341
---
 modules/services/networking/ssh/sshd.nix | 62 ++++++++++++++----------
 1 file changed, 36 insertions(+), 26 deletions(-)

diff --git a/modules/services/networking/ssh/sshd.nix b/modules/services/networking/ssh/sshd.nix
index e02b755a516..0533201e021 100644
--- a/modules/services/networking/ssh/sshd.nix
+++ b/modules/services/networking/ssh/sshd.nix
@@ -8,31 +8,6 @@ let
 
   nssModulesPath = config.system.nssModules.path;
 
-  sshdConfig = pkgs.writeText "sshd_config"
-    ''
-      Protocol 2
-
-      UsePAM yes
-
-      ${ concatMapStrings (port : ''Port ${toString port}
-                                           '') cfg.ports}
-
-      ${if cfg.forwardX11 then "
-        X11Forwarding yes
-        XAuthLocation ${pkgs.xlibs.xauth}/bin/xauth
-      " else "
-        X11Forwarding no
-      "}
-
-      ${if cfg.allowSFTP then "
-        Subsystem sftp ${pkgs.openssh}/libexec/sftp-server
-      " else "
-      "}
-
-      PermitRootLogin ${cfg.permitRootLogin}
-      GatewayPorts ${cfg.gatewayPorts}
-    '';
-
   permitRootLoginCheck = v:
     v == "yes" ||
     v == "without-password" ||
@@ -102,6 +77,11 @@ in
         '';
       };
       
+      extraConfig = mkOption {
+        default = "";
+        description = "Verbatim contents of <filename>sshd_config</filename>.";
+      };
+      
     };
 
   };
@@ -146,10 +126,40 @@ in
 
         daemonType = "fork";
 
-        exec = "${pkgs.openssh}/sbin/sshd -h /etc/ssh/ssh_host_dsa_key -f ${sshdConfig}";
+        exec = 
+          ''
+            ${pkgs.openssh}/sbin/sshd -h /etc/ssh/ssh_host_dsa_key \
+              -f ${pkgs.writeText "sshd_config" cfg.extraConfig}
+          '';
       };
 
     networking.firewall.allowedTCPPorts = cfg.ports;
+
+    services.openssh.extraConfig =
+      ''
+        Protocol 2
+
+        UsePAM yes
+
+        ${concatMapStrings (port: ''
+          Port ${toString port}
+        '') cfg.ports}
+
+        ${if cfg.forwardX11 then ''
+          X11Forwarding yes
+          XAuthLocation ${pkgs.xlibs.xauth}/bin/xauth
+        '' else ''
+          X11Forwarding no
+        ''}
+
+        ${optionalString cfg.allowSFTP ''
+          Subsystem sftp ${pkgs.openssh}/libexec/sftp-server
+        ''}
+
+        PermitRootLogin ${cfg.permitRootLogin}
+        GatewayPorts ${cfg.gatewayPorts}
+      '';
+
   };
 
 }
-- 
GitLab


From 341698c3672ae6784226502fb9d8e6d9ca0f81cb Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 18 Oct 2010 10:40:08 +0000
Subject: [PATCH 2705/5331] * OpenVPN: add it to the system path when enabled.

svn path=/nixos/trunk/; revision=24343
---
 modules/services/networking/openvpn.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/modules/services/networking/openvpn.nix b/modules/services/networking/openvpn.nix
index 0d2025d9ce3..772a9509064 100644
--- a/modules/services/networking/openvpn.nix
+++ b/modules/services/networking/openvpn.nix
@@ -155,7 +155,11 @@ in
   ###### implementation
 
   config = mkIf cfg.enable {
+
     jobs = listToAttrs (mapAttrsFlatten (name: value: nameValuePair "openvpn-${name}" (makeOpenVPNJob value name)) cfg.servers);
+
+    environment.systemPackages = [ openvpn ];
+
   };
   
 }
-- 
GitLab


From 936e4e73d72a0eaa4547dc238752bb5f6dee1d85 Mon Sep 17 00:00:00 2001
From: Sander van der Burg <s.vanderburg@tudelft.nl>
Date: Mon, 18 Oct 2010 19:47:46 +0000
Subject: [PATCH 2706/5331] Modified the nixos-deploy-network script to use a
 2PC-like approach illustrated in the Disnix HotSWUp paper for system
 configurations

svn path=/nixos/trunk/; revision=24352
---
 .../tools/nixos-deploy-network/deploy.nix     | 80 +++++++++++++++----
 .../nixos-deploy-network.sh                   |  2 +-
 2 files changed, 67 insertions(+), 15 deletions(-)

diff --git a/modules/installer/tools/nixos-deploy-network/deploy.nix b/modules/installer/tools/nixos-deploy-network/deploy.nix
index 8d426780b10..10210fb0bea 100644
--- a/modules/installer/tools/nixos-deploy-network/deploy.nix
+++ b/modules/installer/tools/nixos-deploy-network/deploy.nix
@@ -2,33 +2,71 @@
 , nixpkgs ? /etc/nixos/nixpkgs
 , networkExpr
 , infrastructureExpr
+, targetProperty ? "hostname"
 }:
 
 let
   pkgs = import nixpkgs {};
   
-  inherit (builtins) attrNames getAttr listToAttrs concatMapStrings;
+  inherit (builtins) attrNames getAttr listToAttrs;
+  inherit (pkgs.lib) concatMapStrings;
   
   network = import networkExpr;
   infrastructure = import infrastructureExpr;
- 
-  generateScript = network: infrastructure: configs:
+  
+  generateRollbackSucceededPhase = network: infrastructure: configs:
     concatMapStrings (configurationName: 
       let
         infrastructureElement = getAttr configurationName infrastructure;
 	config = getAttr configurationName configs;
       in
       ''
-        echo "=== upgrading ${infrastructureElement.hostName} ==="
-        nix-copy-closure --to ${infrastructureElement.hostName} ${config.system.build.toplevel} \
-        && ssh $NIX_SSHOPTS ${infrastructureElement.hostName} nix-env -p /nix/var/nix/profiles/system --set ${config.system.build.toplevel} \
-        && ssh $NIX_SSHOPTS ${infrastructureElement.hostName} ${config.system.build.toplevel}/bin/switch-to-configuration switch \
-        && { succeeded=$((succeeded + 1)); } \
-        || { failed=$((failed + 1)); echo 'WARNING: upgrade of ${infrastructureElement.hostName} failed!'; }
+        if [ "$rollback" != "$succeeded" ]
+	then
+	    ssh $NIX_SSHOPTS ${getAttr targetProperty infrastructureElement} nix-env -p /nix/var/nix/profiles/system --rollback
+	    ssh $NIX_SSHOPTS ${getAttr targetProperty infrastructureElement} /nix/var/nix/profiles/bin/switch-to-configuration switch
+	    
+	    rollback=$((rollback + 1))
+	fi
+      ''
+    ) (attrNames network)  
+  ;
+  
+  generateDistributionPhase = network: infrastructure: configs:
+    concatMapStrings (configurationName: 
+      let
+        infrastructureElement = getAttr configurationName infrastructure;
+	config = getAttr configurationName configs;
+      in
+      ''
+        echo "=== copy system closure to ${getAttr targetProperty infrastructureElement} ==="
+        nix-copy-closure --to ${getAttr targetProperty infrastructureElement} ${config.system.build.toplevel}
       ''
     ) (attrNames network)
   ;
-
+  
+  generateActivationPhase = network: infrastructure: configs:
+    concatMapStrings (configurationName: 
+      let
+        infrastructureElement = getAttr configurationName infrastructure;
+	config = getAttr configurationName configs;
+      in
+      ''
+        echo "=== activating system configuration on ${getAttr targetProperty infrastructureElement} ==="
+	ssh $NIX_SSHOPTS ${getAttr targetProperty infrastructureElement} nix-env -p /nix/var/nix/profiles/system --set ${config.system.build.toplevel} || 
+	  (ssh $NIX_SSHOPTS ${getAttr targetProperty infrastructureElement} nix-env -p /nix/var/nix/profiles/system --rollback; rollbackSucceeded)
+	
+        ssh $NIX_SSHOPTS ${getAttr targetProperty infrastructureElement} /nix/var/nix/profiles/bin/switch-to-configuration switch ||
+	  ( ssh $NIX_SSHOPTS ${getAttr targetProperty infrastructureElement} nix-env -p /nix/var/nix/profiles/system --rollback
+	    ssh $NIX_SSHOPTS ${getAttr targetProperty infrastructureElement} /nix/var/nix/profiles/bin/switch-to-configuration switch
+	    rollbackSucceeded
+	  )
+	
+	succeeded=$((succeeded + 1))
+      ''
+    ) (attrNames network)
+  ;
+  
   evaluateMachines = network: infrastructure:
     listToAttrs (map (configurationName:
       let
@@ -48,13 +86,27 @@ let
 in
 pkgs.stdenv.mkDerivation {
   name = "deploy-script";
-  buildCommand = ''
+  buildCommand = 
+  ''
     ensureDir $out/bin
     cat > $out/bin/deploy-systems << "EOF"
     #! ${pkgs.stdenv.shell} -e
-    failed=0; succeeded=0
-    ${generateScript network infrastructure configs}
-    echo "Upgrade of $failed machines failed, $succeeded machines succeeded.";
+    
+    rollbackSucceeded()
+    {
+        rollback=0
+        ${generateRollbackSucceededPhase network infrastructure configs}
+    }
+    
+    # Distribution phase
+    
+    ${generateDistributionPhase network infrastructure configs}
+    
+    # Activation phase
+    
+    succeeded=0
+    
+    ${generateActivationPhase network infrastructure configs}
     EOF
     chmod +x $out/bin/deploy-systems
   '';
diff --git a/modules/installer/tools/nixos-deploy-network/nixos-deploy-network.sh b/modules/installer/tools/nixos-deploy-network/nixos-deploy-network.sh
index 62463285f0f..9b6d716f343 100644
--- a/modules/installer/tools/nixos-deploy-network/nixos-deploy-network.sh
+++ b/modules/installer/tools/nixos-deploy-network/nixos-deploy-network.sh
@@ -68,6 +68,6 @@ fi
 
 # Deploy the network
 
-nix-build $NIXOS/deploy.nix --argstr networkExpr $networkExpr --argstr infrastructureExpr $infrastructureExpr $showTraceArg
+nix-build $NIXOS/modules/installer/tools/nixos-deploy-network/deploy.nix --argstr networkExpr $networkExpr --argstr infrastructureExpr $infrastructureExpr $showTraceArg
 ./result/bin/deploy-systems
 rm -f result
-- 
GitLab


From 6a08a791c99718d99716b3cac22f04ee2e8cceae Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Mon, 18 Oct 2010 21:45:21 +0000
Subject: [PATCH 2707/5331] Fixing the reference to nixpkgs. I might have
 committed what there was on error.

svn path=/nixos/branches/stdenv-updates/; revision=24353
---
 release.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/release.nix b/release.nix
index aa1fdb8469e..c50cfa03095 100644
--- a/release.nix
+++ b/release.nix
@@ -1,4 +1,4 @@
-{ nixpkgs ? ../stdenv-updates-svn }:
+{ nixpkgs ? ../nixpkgs }:
 
 let
 
-- 
GitLab


From baaf7bd6e3221089e588e642d93160e9de6393ee Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 19 Oct 2010 23:25:53 +0000
Subject: [PATCH 2708/5331] * Updated the Compiz module: add the plugins, put
 ccsm in the PATH,   and don't use GConf anymore.

svn path=/nixos/trunk/; revision=24374
---
 .../services/x11/window-managers/compiz.nix   | 83 +++++++++----------
 1 file changed, 41 insertions(+), 42 deletions(-)

diff --git a/modules/services/x11/window-managers/compiz.nix b/modules/services/x11/window-managers/compiz.nix
index bf159582663..fd439a3cddc 100644
--- a/modules/services/x11/window-managers/compiz.nix
+++ b/modules/services/x11/window-managers/compiz.nix
@@ -1,64 +1,63 @@
-{pkgs, config, ...}:
+{ config, pkgs, ... }:
+
+with pkgs.lib;
 
 let
-  inherit (pkgs.lib) mkOption mkIf;
+
   cfg = config.services.xserver.windowManager.compiz;
   xorg = config.services.xserver.package;
-  gnome = pkgs.gnome;
 
-  options = { services = { xserver = { windowManager = {
+in
+  
+{
+
+  options = {
 
-    compiz = {
+    services.xserver.windowManager.compiz = {
+    
       enable = mkOption {
         default = false;
-        example = true;
-        description = "Enable the compiz window manager.";
+        description = "Enable the Compiz window manager.";
       };
 
-
       renderingFlag = mkOption {
         default = "";
         example = "--indirect-rendering";
-        description = "
-          Possibly pass --indierct-rendering to Compiz.
-        ";
+        description = "Pass the <option>--indirect-rendering</option> flag to Compiz.";
       };
+      
     };
 
-  }; }; }; };
-in
-
-mkIf cfg.enable {
-  require = options;
-
-  services = {
-    xserver = {
-
-      windowManager = {
-        session = [{
-          name = "compiz";
-          start = ''
-            # !!! Hack: load the schemas for Compiz.
-            GCONF_CONFIG_SOURCE=xml::~/.gconf ${gnome.GConf}/bin/gconftool-2 \
-              --makefile-install-rule ${pkgs.compiz}/etc/gconf/schemas/*.schemas # */
-
-            # !!! Hack: turn on most Compiz modules.
-            ${gnome.GConf}/bin/gconftool-2 -t list --list-type=string \
-              --set /apps/compiz/general/allscreens/options/active_plugins \
-              [gconf,png,decoration,wobbly,fade,minimize,move,resize,cube,switcher,rotate,place,scale,water]
-
-            # Start Compiz and the GTK-style window decorator.
-            env LD_LIBRARY_PATH=${xorg.libX11}/lib:${xorg.libXext}/lib:/usr/lib/
-            ${pkgs.compiz}/bin/compiz gconf ${cfg.renderingFlag} &
-            ${pkgs.compiz}/bin/gtk-window-decorator --sync &
+  };
+  
+
+  config = mkIf cfg.enable {
+  
+    services.xserver.windowManager.session = singleton
+      { name = "compiz";
+        start =
+          ''
+            # Start Compiz using the flat-file configuration backend
+            # (ccp).
+            export COMPIZ_PLUGINDIR=${config.system.path}/lib/compiz
+            export COMPIZ_METADATADIR=${config.system.path}/share/compiz
+            ${pkgs.compiz}/bin/compiz ccp ${cfg.renderingFlag} &
+
+            # Start GTK-style window decorator.
+            ${pkgs.compiz}/bin/gtk-window-decorator &
           '';
-        }];
       };
 
-    };
-  };
+    environment.systemPackages =
+      [ pkgs.compiz
+        pkgs.compiz_ccsm
+        pkgs.compiz_plugins_main
+        pkgs.compiz_plugins_extra
+        pkgs.libcompizconfig # for the "ccp" plugin
+      ];
+
+    environment.pathsToLink = [ "/lib/compiz" "/share/compiz" ];
 
-  environment = {
-    x11Packages = [ pkgs.compiz ];
   };
+
 }
-- 
GitLab


From f6bc3d61cf0a195d28256e85901eb96db315739c Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Wed, 20 Oct 2010 09:29:02 +0000
Subject: [PATCH 2709/5331] To prevent glibc bug exploitation, make
 setuid-wrappers unreadable to non-root users

svn path=/nixos/trunk/; revision=24378
---
 modules/security/setuid-wrappers.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/security/setuid-wrappers.nix b/modules/security/setuid-wrappers.nix
index a7238b9add5..027032a7c27 100644
--- a/modules/security/setuid-wrappers.nix
+++ b/modules/security/setuid-wrappers.nix
@@ -92,7 +92,7 @@ in
           , group ? "nogroup"
           , setuid ? false
           , setgid ? false
-          , permissions ? "u+rx,g+rx,o+rx"
+          , permissions ? "u+rx,g+x,o+x"
           }:
 
           ''
-- 
GitLab


From 9c722e474d5b1b63d910e2c685a88c8db777404f Mon Sep 17 00:00:00 2001
From: Sander van der Burg <s.vanderburg@tudelft.nl>
Date: Thu, 21 Oct 2010 22:50:12 +0000
Subject: [PATCH 2710/5331] - Added nixos-build-vms command, which builds a
 virtual network from a network.nix expression (also used by
 nixos-deploy-network) - Added a backdoor option to the interactive run-vms
 script. This allows me to intergrate the virtual network approach with Disnix
 - Small documentation fixes

Some explanation:

The nixos-build-vms command line tool can be used to build a virtual network of a network.nix specification.
For example, a network configuration (network.nix) could look like this:

{
  test1 =
    {pkgs, config, ...}:

    {
      services.openssh.enable = true;
      ...
    };

  test2 =
    {pkgs, config, ...}:

    {
      services.openssh.enable = true;
      services.xserver.enable = true;
    }

    ;
}

By typing the following instruction:

$ nixos-build-vms -n network.nix

a virtual network is built, which can be started by typing:

$ ./result/bin/run-vms

It is also possible to enable a backdoor. In this case *.socket files are stored in the current directory
which can be used by the end-user to invoke remote instruction on a VM in the network through a Unix
domain socket.

For example by building the network with the following instructions:

$ nixos-build-vms -n network.nix --use-backdoor

and launching the virtual network:

$ ./result/bin/run-vms

You can find two socket files in your current directory, namely: test1.socket and test2.socket.
These Unix domain sockets can be used to remotely administer the test1 and test2 machine
in the virtual network.

For example by running:

$ socat ./test1.socket stdio
ls /root

You can retrieve the contents of the /root directory of the virtual machine with identifier test1


svn path=/nixos/trunk/; revision=24410
---
 lib/build-vms.nix                             |  4 +-
 .../tools/nixos-build-vms/build-vms.nix       | 16 +++++
 .../tools/nixos-build-vms/nixos-build-vms.sh  | 66 +++++++++++++++++++
 .../nixos-deploy-network.sh                   |  1 +
 modules/installer/tools/tools.nix             |  8 ++-
 modules/virtualisation/qemu-vm.nix            | 29 +++++++-
 6 files changed, 120 insertions(+), 4 deletions(-)
 create mode 100644 modules/installer/tools/nixos-build-vms/build-vms.nix
 create mode 100644 modules/installer/tools/nixos-build-vms/nixos-build-vms.sh

diff --git a/lib/build-vms.nix b/lib/build-vms.nix
index 7505f6f49f3..efd1ce3b8d3 100644
--- a/lib/build-vms.nix
+++ b/lib/build-vms.nix
@@ -1,4 +1,4 @@
-{ nixpkgs, services, system }:
+{ nixpkgs, services, system, useBackdoor ? false }:
 
 let pkgs = import nixpkgs { config = {}; inherit system; }; in
 
@@ -58,7 +58,7 @@ rec {
       modules = configurations ++
         [ ../modules/virtualisation/qemu-vm.nix
           ../modules/testing/test-instrumentation.nix # !!! should only get added for automated test runs
-          { key = "no-manual"; services.nixosManual.enable = false; }
+          { key = "no-manual"; services.nixosManual.enable = false; virtualisation.useBackdoor = useBackdoor; }
         ];
       extraArgs = { inherit nodes; };
     };
diff --git a/modules/installer/tools/nixos-build-vms/build-vms.nix b/modules/installer/tools/nixos-build-vms/build-vms.nix
new file mode 100644
index 00000000000..bedabecad2d
--- /dev/null
+++ b/modules/installer/tools/nixos-build-vms/build-vms.nix
@@ -0,0 +1,16 @@
+{ nixos
+, nixpkgs
+, services ? "/etc/nixos/services"
+, system ? builtins.currentSystem
+, networkExpr
+, useBackdoor ? false
+}:
+
+let nodes = import networkExpr;
+in
+(import "${nixos}/lib/build-vms.nix" {
+  inherit nixpkgs services system useBackdoor;
+})
+.buildVirtualNetwork {
+  inherit nodes;
+}
diff --git a/modules/installer/tools/nixos-build-vms/nixos-build-vms.sh b/modules/installer/tools/nixos-build-vms/nixos-build-vms.sh
new file mode 100644
index 00000000000..709b9051fc4
--- /dev/null
+++ b/modules/installer/tools/nixos-build-vms/nixos-build-vms.sh
@@ -0,0 +1,66 @@
+#! @shell@ -e
+
+# Shows the usage of this command to the user
+
+showUsage()
+{
+    echo "Usage: $0 -n network_expr -i infrastructure_expr"
+    echo "Options:"
+    echo
+    echo "-n,--network        Network Nix expression which captures properties of machines in the network"
+    echo "--use-backdoor      Indicates that the backdoor must be enabled so that the VMs can be accessed through a UNIX domain socket" 
+    echo "--show-trace        Shows the output trace"
+    echo "-h,--help           Shows the usage of this command"
+}
+
+# Parse valid argument options
+
+PARAMS=`getopt -n $0 -o n:h -l network:,use-backdoor,show-trace,help -- "$@"`
+
+if [ $? != 0 ]
+then
+    showUsage
+    exit 1
+fi
+
+eval set -- "$PARAMS"
+
+# Evaluate valid options
+
+while [ "$1" != "--" ]
+do
+    case "$1" in
+	-n|--network)
+	    networkExpr=`readlink -f $2`
+	    ;;
+	--use-backdoor)
+	    useBackdoorArg="--arg useBackdoor true"
+	    ;;
+	--show-trace)
+	    showTraceArg="--show-trace"
+	    ;;
+	-h|--help)
+	    showUsage
+	    exit 0
+	    ;;
+    esac
+    
+    shift
+done
+
+# Validate the given options
+
+if [ "$networkExpr" = "" ]
+then
+    echo "ERROR: A network expression must be specified!" >&2
+    exit 1
+fi
+
+if [ -z "$NIXOS" ]
+then
+    NIXOS=/etc/nixos/nixos
+fi
+
+# Build a network of VMs
+
+nix-build $NIXOS/modules/installer/tools/nixos-build-vms/build-vms.nix --argstr networkExpr $networkExpr --argstr nixos $NIXOS --argstr nixpkgs $NIXPKGS_ALL $useBackdoorArg $showTraceArg
diff --git a/modules/installer/tools/nixos-deploy-network/nixos-deploy-network.sh b/modules/installer/tools/nixos-deploy-network/nixos-deploy-network.sh
index 9b6d716f343..08370a15dc8 100644
--- a/modules/installer/tools/nixos-deploy-network/nixos-deploy-network.sh
+++ b/modules/installer/tools/nixos-deploy-network/nixos-deploy-network.sh
@@ -9,6 +9,7 @@ showUsage()
     echo
     echo "-n,--network        Network Nix expression which captures properties of machines in the network"
     echo "-i,--infrastructure Infrastructure Nix expression which captures properties of machines in the network"
+    echo "--show-trace        Shows an output trace"
     echo "-h,--help           Shows the usage of this command"
 }
 
diff --git a/modules/installer/tools/tools.nix b/modules/installer/tools/tools.nix
index 8dd07c67f91..b735863a34c 100644
--- a/modules/installer/tools/tools.nix
+++ b/modules/installer/tools/tools.nix
@@ -11,6 +11,11 @@ let
     isExecutable = true;
   });
   
+  nixosBuildVMS = makeProg {
+    name = "nixos-build-vms";
+    src = ./nixos-build-vms/nixos-build-vms.sh;
+  };
+  
   nixosDeployNetwork = makeProg {
     name = "nixos-deploy-network";
     src = ./nixos-deploy-network/nixos-deploy-network.sh;
@@ -131,7 +136,8 @@ in
 
   config = {
     environment.systemPackages =
-      [ nixosDeployNetwork
+      [ nixosBuildVMS
+        nixosDeployNetwork
         nixosInstall
         nixosRebuild
          nixosHardwareScan
diff --git a/modules/virtualisation/qemu-vm.nix b/modules/virtualisation/qemu-vm.nix
index 005e4ebfb54..50b07435bda 100644
--- a/modules/virtualisation/qemu-vm.nix
+++ b/modules/virtualisation/qemu-vm.nix
@@ -111,6 +111,17 @@ let
         description = "Options passed to QEMU.";
       };
 
+    virtualisation.useBackdoor =
+      mkOption {
+        default = false;
+	description =
+	''
+	  If enabled, the virtual machine makes a connection through TCP port 23
+	  to a daemon running on the host system acting as a proxy.
+	  This option makes it possible to connect to a VM through a socket file.
+	'';
+      };
+
     virtualisation.useBootLoader =
       mkOption {
         default = false;
@@ -145,6 +156,11 @@ let
             ${toString config.virtualisation.diskSize}M || exit 1
       fi
 
+      ${pkgs.lib.optionalString cfg.useBackdoor ''
+        # Remember the current working directory
+        WORKDIR=$(pwd)
+      ''}
+      
       # Start Samba (which wants to put its socket and config files in TMPDIR).
       if [ -z "$TMPDIR" -o -z "$USE_TMPDIR" ]; then
           TMPDIR=$(mktemp -d nix-vm-smbd.XXXXXXXXXX --tmpdir)
@@ -153,13 +169,24 @@ let
 
       ${pkgs.vmTools.startSamba}
 
+      ${pkgs.lib.optionalString cfg.useBackdoor ''
+        # Create a shell socket file to which the VM can connect and create in the
+	# current working directory a socket file which can be used to remotely access
+	# the VM through the shell interface
+	
+        ${pkgs.socat}/bin/socat UNIX-LISTEN:./shell UNIX-LISTEN:$WORKDIR/${vmName}.socket,fork &
+	
+	while [ ! -e ./shell ]; do sleep 0.1; done # Wait until the socket file is there
+      ''}
+
       # Start QEMU.
       exec ${pkgs.qemu_kvm}/bin/qemu-system-x86_64 \
           -name ${vmName} \
           -m ${toString config.virtualisation.memorySize} \
           -net nic,vlan=0,model=virtio \
           -chardev socket,id=samba,path=./samba \
-          -net user,vlan=0,guestfwd=tcp:10.0.2.4:139-chardev:samba''${QEMU_NET_OPTS:+,$QEMU_NET_OPTS} \
+          -net user,vlan=0,guestfwd=tcp:10.0.2.4:139-chardev:samba${if cfg.useBackdoor then ",guestfwd=tcp:10.0.2.6:23-chardev:shell" else ""}''${QEMU_NET_OPTS:+,$QEMU_NET_OPTS} \
+	  ${if cfg.useBackdoor then "-chardev socket,id=shell,path=./shell" else ""} \
           ${if cfg.useBootLoader then ''
             -drive index=0,file=$NIX_DISK_IMAGE,if=virtio,cache=writeback,werror=report \
             -drive index=1,file=${bootDisk}/disk.img,if=virtio,boot=on \
-- 
GitLab


From 2118288557109c2994b18326377c159286456f8b Mon Sep 17 00:00:00 2001
From: Evgeny Egorochkin <phreedom.stdin@gmail.com>
Date: Fri, 22 Oct 2010 13:18:22 +0000
Subject: [PATCH 2711/5331] KDE4: mp3 playback out of the box

svn path=/nixos/trunk/; revision=24416
---
 modules/services/x11/desktop-managers/kde4.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/modules/services/x11/desktop-managers/kde4.nix b/modules/services/x11/desktop-managers/kde4.nix
index 2841c9426ff..7f64609e406 100644
--- a/modules/services/x11/desktop-managers/kde4.nix
+++ b/modules/services/x11/desktop-managers/kde4.nix
@@ -67,6 +67,7 @@ in
         pkgs.gst_all.gstreamer
         pkgs.gst_all.gstPluginsBase
         pkgs.gst_all.gstPluginsGood
+        pkgs.gst_all.gstFfmpeg # for mp3 playback
         xorg.xmessage # so that startkde can show error messages
         xorg.xset # used by startkde, non-essential
       ] ++ config.environment.kdePackages;
-- 
GitLab


From 88fb000fc184f32c716bd3358fb2c2ef08ae6c7b Mon Sep 17 00:00:00 2001
From: Evgeny Egorochkin <phreedom.stdin@gmail.com>
Date: Fri, 22 Oct 2010 13:18:26 +0000
Subject: [PATCH 2712/5331] Fix UID and GID clash between diferent packages

svn path=/nixos/trunk/; revision=24417
---
 modules/misc/ids.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/misc/ids.nix b/modules/misc/ids.nix
index f69ae2f3b9f..2db841194e3 100644
--- a/modules/misc/ids.nix
+++ b/modules/misc/ids.nix
@@ -53,10 +53,10 @@ in
     davfs2 = 31;
     privoxy = 32;    
     osgi = 34;
-    sabnzbd = 33;
     tor = 35;
     cups = 36;
     foldingAtHome = 37;
+    sabnzbd = 38;
     # When adding a uid, make sure it doesn't match an existing gid.
 
     nixbld = 30000; # start of range of uids
-- 
GitLab


From 791c758b413ce7c2ceb188432166e4cf02a05d6f Mon Sep 17 00:00:00 2001
From: Evgeny Egorochkin <phreedom.stdin@gmail.com>
Date: Mon, 25 Oct 2010 00:57:30 +0000
Subject: [PATCH 2713/5331] Encrypted root support via LUKS

svn path=/nixos/trunk/; revision=24459
---
 modules/module-list.nix          |  1 +
 modules/system/boot/luksroot.nix | 45 ++++++++++++++++++++++++++++++++
 2 files changed, 46 insertions(+)
 create mode 100644 modules/system/boot/luksroot.nix

diff --git a/modules/module-list.nix b/modules/module-list.nix
index 5e6ed0095f2..1364b28182d 100644
--- a/modules/module-list.nix
+++ b/modules/module-list.nix
@@ -146,6 +146,7 @@
   ./system/activation/activation-script.nix
   ./system/activation/top-level.nix
   ./system/boot/kernel.nix
+  ./system/boot/luksroot.nix
   ./system/boot/modprobe.nix
   ./system/boot/stage-1.nix
   ./system/boot/stage-2.nix
diff --git a/modules/system/boot/luksroot.nix b/modules/system/boot/luksroot.nix
new file mode 100644
index 00000000000..f345db459f0
--- /dev/null
+++ b/modules/system/boot/luksroot.nix
@@ -0,0 +1,45 @@
+{pkgs, config, ...}:
+
+with pkgs.lib;
+
+let
+  luksRoot = config.boot.initrd.luksRoot;
+in
+{
+
+  options = {
+
+    boot.initrd.luksRoot = mkOption {
+      default = null;
+      example = "/dev/sda3";
+      description = '';
+        The device that should be decrypted using LUKS before trying to mount the
+        root partition. This works for both LVM-over-LUKS and LUKS-over-LVM setups.
+         
+        Make sure that initrd has the crypto modules needed for decryption.
+
+        The decrypted device name is /dev/mapper/luksroot.
+      '';
+    };
+
+  };
+
+
+
+  config = mkIf (luksRoot != null) {
+
+    boot.initrd.extraUtilsCommands = ''
+      cp -r ${pkgs.cryptsetup}/lib/* $out/lib/
+      cp -r ${pkgs.popt}/lib/* $out/lib
+      cp ${pkgs.cryptsetup}/sbin/* $out/bin
+    '';
+
+    boot.initrd.postDeviceCommands = ''
+      cryptsetup luksOpen ${luksRoot} luksroot
+      lvm vgscan
+      lvm vgchange -ay
+    '';
+
+  };
+
+}
\ No newline at end of file
-- 
GitLab


From 006f7291e40eb28d881a248a2c0ef984197295d3 Mon Sep 17 00:00:00 2001
From: Evgeny Egorochkin <phreedom.stdin@gmail.com>
Date: Mon, 25 Oct 2010 01:46:30 +0000
Subject: [PATCH 2714/5331] Make Strigi indexing work in Nepomuk

svn path=/nixos/trunk/; revision=24460
---
 modules/programs/bash/bashrc.sh                | 5 +++--
 modules/services/x11/desktop-managers/kde4.nix | 4 ++++
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/modules/programs/bash/bashrc.sh b/modules/programs/bash/bashrc.sh
index 8d1e4833a2d..37b87887e4f 100644
--- a/modules/programs/bash/bashrc.sh
+++ b/modules/programs/bash/bashrc.sh
@@ -17,8 +17,8 @@ NIX_USER_PROFILE_DIR=/nix/var/nix/profiles/per-user/$USER
 
 NIX_PROFILES="/var/run/current-system/sw /nix/var/nix/profiles/default $HOME/.nix-profile"
 
-unset PATH INFOPATH PKG_CONFIG_PATH PERL5LIB GST_PLUGIN_PATH KDEDIRS
-unset XDG_CONFIG_DIRS XDG_DATA_DIRS
+unset PATH INFOPATH PKG_CONFIG_PATH PERL5LIB ALSA_PLUGIN_DIRS GST_PLUGIN_PATH KDEDIRS
+unset QT_PLUGIN_PATH STRIGI_PLUGIN_PATH XDG_CONFIG_DIRS XDG_DATA_DIRS
 
 for i in $NIX_PROFILES; do # !!! reverse
     # We have to care not leaving an empty PATH element, because that means '.' to Linux
@@ -38,6 +38,7 @@ for i in $NIX_PROFILES; do # !!! reverse
 
     # KDE/Gnome stuff.
     export KDEDIRS=$i${KDEDIRS:+:}$KDEDIRS
+    export STRIGI_PLUGIN_PATH=$i/lib/strigi/${STRIGI_PLUGIN_PATH:+:}$STRIGI_PLUGIN_PATH
     export QT_PLUGIN_PATH=$i/lib/qt4/plugins:$i/lib/kde4/plugins${QT_PLUGIN_PATH:+:}$QT_PLUGIN_PATH
     export XDG_CONFIG_DIRS=$i/etc/xdg${XDG_CONFIG_DIRS:+:}$XDG_CONFIG_DIRS
     export XDG_DATA_DIRS=$i/share${XDG_DATA_DIRS:+:}$XDG_DATA_DIRS
diff --git a/modules/services/x11/desktop-managers/kde4.nix b/modules/services/x11/desktop-managers/kde4.nix
index 7f64609e406..0d088d8e970 100644
--- a/modules/services/x11/desktop-managers/kde4.nix
+++ b/modules/services/x11/desktop-managers/kde4.nix
@@ -57,6 +57,10 @@ in
 
     environment = {
       systemPackages = [
+        # temporary workarounds
+        pkgs.shared_desktop_ontologies 
+        pkgs.kde4.strigi
+
         pkgs.kde4.kdelibs
         pkgs.kde4.kdebase
         pkgs.kde4.kdebase_runtime
-- 
GitLab


From f6f40521c3b83302c1f1d1746b93652cfe18ee0b Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 25 Oct 2010 16:19:32 +0000
Subject: [PATCH 2715/5331] * Disable the luksroot module for now because it
 gives an   evaluation error ("cannot coerce null to string").

svn path=/nixos/trunk/; revision=24472
---
 modules/module-list.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/module-list.nix b/modules/module-list.nix
index 1364b28182d..1753bdc8418 100644
--- a/modules/module-list.nix
+++ b/modules/module-list.nix
@@ -146,7 +146,7 @@
   ./system/activation/activation-script.nix
   ./system/activation/top-level.nix
   ./system/boot/kernel.nix
-  ./system/boot/luksroot.nix
+  #./system/boot/luksroot.nix
   ./system/boot/modprobe.nix
   ./system/boot/stage-1.nix
   ./system/boot/stage-2.nix
-- 
GitLab


From 421a80ae8f2aa82f6173f077b0cf50aa82a06220 Mon Sep 17 00:00:00 2001
From: Evgeny Egorochkin <phreedom.stdin@gmail.com>
Date: Mon, 25 Oct 2010 16:44:21 +0000
Subject: [PATCH 2716/5331] Make flash work in QtWebkit

svn path=/nixos/trunk/; revision=24474
---
 modules/programs/bash/bashrc.sh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/modules/programs/bash/bashrc.sh b/modules/programs/bash/bashrc.sh
index 37b87887e4f..f8d124879aa 100644
--- a/modules/programs/bash/bashrc.sh
+++ b/modules/programs/bash/bashrc.sh
@@ -18,7 +18,7 @@ NIX_USER_PROFILE_DIR=/nix/var/nix/profiles/per-user/$USER
 NIX_PROFILES="/var/run/current-system/sw /nix/var/nix/profiles/default $HOME/.nix-profile"
 
 unset PATH INFOPATH PKG_CONFIG_PATH PERL5LIB ALSA_PLUGIN_DIRS GST_PLUGIN_PATH KDEDIRS
-unset QT_PLUGIN_PATH STRIGI_PLUGIN_PATH XDG_CONFIG_DIRS XDG_DATA_DIRS
+unset QT_PLUGIN_PATH QTWEBKIT_PLUGIN_PATH STRIGI_PLUGIN_PATH XDG_CONFIG_DIRS XDG_DATA_DIRS
 
 for i in $NIX_PROFILES; do # !!! reverse
     # We have to care not leaving an empty PATH element, because that means '.' to Linux
@@ -40,6 +40,7 @@ for i in $NIX_PROFILES; do # !!! reverse
     export KDEDIRS=$i${KDEDIRS:+:}$KDEDIRS
     export STRIGI_PLUGIN_PATH=$i/lib/strigi/${STRIGI_PLUGIN_PATH:+:}$STRIGI_PLUGIN_PATH
     export QT_PLUGIN_PATH=$i/lib/qt4/plugins:$i/lib/kde4/plugins${QT_PLUGIN_PATH:+:}$QT_PLUGIN_PATH
+    export QTWEBKIT_PLUGIN_PATH=$i/lib/mozilla/plugins/${QTWEBKIT_PLUGIN_PATH:+:}$QTWEBKIT_PLUGIN_PATH
     export XDG_CONFIG_DIRS=$i/etc/xdg${XDG_CONFIG_DIRS:+:}$XDG_CONFIG_DIRS
     export XDG_DATA_DIRS=$i/share${XDG_DATA_DIRS:+:}$XDG_DATA_DIRS
 done
-- 
GitLab


From dff372db3c423dd0efba2723187d85572b089d62 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 25 Oct 2010 22:21:51 +0000
Subject: [PATCH 2717/5331] * Fix evaluation of the luksroot module when
 luksRoot == null.  The   problem is that configuration values below a mkIf
 are evaluated   strictly even if the condition is false.  Thus "${luksRoot}"
 causes   an evaluation error.  As a workaround, use the empty string instead 
  of `null' as the default value.  However, we should really fix the  
 laziness of mkIf.  It's likely that NixOS evaluation would be much   faster
 if it didn't have to evaluate disabled configuration values.

svn path=/nixos/trunk/; revision=24477
---
 modules/module-list.nix          | 2 +-
 modules/system/boot/luksroot.nix | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/modules/module-list.nix b/modules/module-list.nix
index 1753bdc8418..1364b28182d 100644
--- a/modules/module-list.nix
+++ b/modules/module-list.nix
@@ -146,7 +146,7 @@
   ./system/activation/activation-script.nix
   ./system/activation/top-level.nix
   ./system/boot/kernel.nix
-  #./system/boot/luksroot.nix
+  ./system/boot/luksroot.nix
   ./system/boot/modprobe.nix
   ./system/boot/stage-1.nix
   ./system/boot/stage-2.nix
diff --git a/modules/system/boot/luksroot.nix b/modules/system/boot/luksroot.nix
index f345db459f0..a01395647a3 100644
--- a/modules/system/boot/luksroot.nix
+++ b/modules/system/boot/luksroot.nix
@@ -10,7 +10,7 @@ in
   options = {
 
     boot.initrd.luksRoot = mkOption {
-      default = null;
+      default = "";
       example = "/dev/sda3";
       description = '';
         The device that should be decrypted using LUKS before trying to mount the
@@ -26,7 +26,7 @@ in
 
 
 
-  config = mkIf (luksRoot != null) {
+  config = mkIf (luksRoot != "") {
 
     boot.initrd.extraUtilsCommands = ''
       cp -r ${pkgs.cryptsetup}/lib/* $out/lib/
-- 
GitLab


From c4dd77ae9c5209112ead8e731756496d23d75d56 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Sat, 30 Oct 2010 20:05:38 +0000
Subject: [PATCH 2718/5331] Make apache start when filesystems are ready.

svn path=/nixos/trunk/; revision=24544
---
 modules/services/web-servers/apache-httpd/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/services/web-servers/apache-httpd/default.nix b/modules/services/web-servers/apache-httpd/default.nix
index c0505a427aa..ddb8e4f90de 100644
--- a/modules/services/web-servers/apache-httpd/default.nix
+++ b/modules/services/web-servers/apache-httpd/default.nix
@@ -555,7 +555,7 @@ in
 
         description = "Apache HTTPD";
 
-        startOn = "started ${startingDependency}";
+        startOn = "started ${startingDependency} and filesystem";
 
         environment =
           { # !!! This should be added in test-instrumentation.nix.  It
-- 
GitLab


From edb5870deb7e53070eed1057378125b5bce394c4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Sat, 30 Oct 2010 20:40:33 +0000
Subject: [PATCH 2719/5331] Fixing the xterm PS1 for changing the window title,
 so it is properly bracketed for bash not to count the control sequences as
 printable characters.

svn path=/nixos/trunk/; revision=24545
---
 modules/programs/bash/bashrc.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/programs/bash/bashrc.sh b/modules/programs/bash/bashrc.sh
index f8d124879aa..50768635d36 100644
--- a/modules/programs/bash/bashrc.sh
+++ b/modules/programs/bash/bashrc.sh
@@ -60,7 +60,7 @@ PROMPT_COLOR="1;31m"
 let $UID && PROMPT_COLOR="1;32m"
 PS1="\n\[\033[$PROMPT_COLOR\][\u@\h:\w]\\$\[\033[0m\] "
 if test "$TERM" = "xterm"; then
-    PS1="\033]2;\h:\u:\w\007$PS1"
+    PS1="\[\033]2;\h:\u:\w\007\]$PS1"
 fi
 
 
-- 
GitLab


From 8c27201ce0170a0fb38e5c808f359cea2bbcbe2d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Sun, 31 Oct 2010 19:34:39 +0000
Subject: [PATCH 2720/5331] Fixing mkOverride and openssh things on
 system-tarballs

svn path=/nixos/branches/stdenv-updates/; revision=24554
---
 modules/installer/cd-dvd/system-tarball-fuloong2f.nix  | 2 +-
 modules/installer/cd-dvd/system-tarball-pc.nix         | 2 +-
 modules/installer/cd-dvd/system-tarball-sheevaplug.nix | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/modules/installer/cd-dvd/system-tarball-fuloong2f.nix b/modules/installer/cd-dvd/system-tarball-fuloong2f.nix
index 41386069e73..7ece0716df6 100644
--- a/modules/installer/cd-dvd/system-tarball-fuloong2f.nix
+++ b/modules/installer/cd-dvd/system-tarball-fuloong2f.nix
@@ -177,7 +177,7 @@ in
   # default root password is empty.
   services.openssh.enable = true;
 
-  jobs.openssh.startOn = pkgs.lib.mkOverride 50 {} "";
+  jobs.openssh.startOn = pkgs.lib.mkOverrideTemplate 50 {} "";
 
   services.ttyBackgrounds.enable = false;
 
diff --git a/modules/installer/cd-dvd/system-tarball-pc.nix b/modules/installer/cd-dvd/system-tarball-pc.nix
index 62b32c48144..a67f60a2c34 100644
--- a/modules/installer/cd-dvd/system-tarball-pc.nix
+++ b/modules/installer/cd-dvd/system-tarball-pc.nix
@@ -34,5 +34,5 @@ in
   # not be started by default on the installation CD because the
   # default root password is empty.
   services.openssh.enable = true;
-  jobs.sshd.startOn = pkgs.lib.mkOverrideTemplate 50 {} "";
+  jobs.openssh.startOn = pkgs.lib.mkOverrideTemplate 50 {} "";
 }
diff --git a/modules/installer/cd-dvd/system-tarball-sheevaplug.nix b/modules/installer/cd-dvd/system-tarball-sheevaplug.nix
index f50d4353b34..77e09ec2265 100644
--- a/modules/installer/cd-dvd/system-tarball-sheevaplug.nix
+++ b/modules/installer/cd-dvd/system-tarball-sheevaplug.nix
@@ -22,7 +22,7 @@ let
 
         # Add your own options below and run "nixos-rebuild switch".
         # E.g.,
-        #   services.sshd.enable = true;
+        #   services.openssh.enable = true;
       }
     '';
   
@@ -178,7 +178,7 @@ in
   # default root password is empty.
   services.openssh.enable = true;
   services.ttyBackgrounds.enable = false;
-  jobs.openssh.startOn = pkgs.lib.mkOverride 50 {} "";
+  jobs.openssh.startOn = pkgs.lib.mkOverrideTemplate 50 {} "";
 
   nixpkgs.config = {
     platform = pkgs.platforms.sheevaplug;
-- 
GitLab


From 9359ebf9753fc0c8133a3b358a2734a6c6cf1fac Mon Sep 17 00:00:00 2001
From: Sander van der Burg <s.vanderburg@tudelft.nl>
Date: Mon, 1 Nov 2010 17:33:54 +0000
Subject: [PATCH 2721/5331] Implemented an option to enable to DisnixWebService
 on Apache Tomcat

svn path=/nixos/trunk/; revision=24560
---
 modules/services/misc/disnix.nix | 30 +++++++++++++++++++++++-------
 1 file changed, 23 insertions(+), 7 deletions(-)

diff --git a/modules/services/misc/disnix.nix b/modules/services/misc/disnix.nix
index 09b9cf8fe08..3688f8c3fc7 100644
--- a/modules/services/misc/disnix.nix
+++ b/modules/services/misc/disnix.nix
@@ -6,7 +6,14 @@ with pkgs.lib;
 let
 
   cfg = config.services.disnix;
-
+  
+  disnix_activation_scripts = pkgs.disnix_activation_scripts.override (origArgs: {
+    enableApacheWebApplication = config.services.httpd.enable;
+    enableAxis2WebService = config.services.tomcat.axis2.enable;
+    enableEjabberdDump = config.services.ejabberd.enable;
+    enableMySQLDatabase = config.services.mysql.enable;
+    enableTomcatWebApplication = config.services.tomcat.enable;
+  });
 in
 
 {
@@ -20,7 +27,12 @@ in
       enable = mkOption {
         default = false;
         description = "Whether to enable Disnix";
-      };        
+      };
+      
+      useWebServiceInterface = mkOption {
+        default = false;
+	description = "Whether to enable the DisnixWebService interface running on Apache Tomcat";
+      };
 
     };
     
@@ -36,6 +48,13 @@ in
     services.dbus.enable = true;
     services.dbus.packages = [ pkgs.disnix ];
 
+    services.tomcat.enable = cfg.useWebServiceInterface;
+    services.tomcat.javaOpts = "${optionalString cfg.useWebServiceInterface "-Djava.library.path=${pkgs.libmatthew_java}/lib/jni"} ";
+    services.tomcat.sharedLibs = []
+                                 ++ optional cfg.useWebServiceInterface "${pkgs.DisnixWebService}/share/java/DisnixConnection.jar"
+				 ++ optional cfg.useWebServiceInterface "${pkgs.dbus_java}/share/java/dbus.jar";
+    services.tomcat.webapps = [] ++ optional cfg.useWebServiceInterface pkgs.DisnixWebService;
+
     users.extraGroups = singleton
       { name = "disnix";
         gid = config.ids.gids.disnix;
@@ -47,11 +66,8 @@ in
         startOn = "started dbus";
 
         script =
-          ''                
-            export PATH=/var/run/current-system/sw/bin:/var/run/current-system/sw/sbin
-            export HOME=/root
-	
-            ${pkgs.disnix}/bin/disnix-service --activation-modules-dir=${pkgs.disnix_activation_scripts}/libexec/disnix/activation-scripts
+          ''
+            ${pkgs.disnix}/bin/disnix-service --activation-modules-dir=${disnix_activation_scripts}/libexec/disnix/activation-scripts
           '';
       };
 
-- 
GitLab


From e39b10a4d92cb4c0c0957ba071879135d44b4eb0 Mon Sep 17 00:00:00 2001
From: Sander van der Burg <s.vanderburg@tudelft.nl>
Date: Mon, 1 Nov 2010 19:01:26 +0000
Subject: [PATCH 2722/5331] - The Disnix service needs Nix in its PATH for now
 - Implemented an extraGroups property for tomcat to grant a tomcat
 application access to the Disnix service

svn path=/nixos/trunk/; revision=24561
---
 modules/services/misc/disnix.nix        | 4 ++++
 modules/services/web-servers/tomcat.nix | 7 +++++++
 2 files changed, 11 insertions(+)

diff --git a/modules/services/misc/disnix.nix b/modules/services/misc/disnix.nix
index 3688f8c3fc7..abf664c9031 100644
--- a/modules/services/misc/disnix.nix
+++ b/modules/services/misc/disnix.nix
@@ -49,6 +49,7 @@ in
     services.dbus.packages = [ pkgs.disnix ];
 
     services.tomcat.enable = cfg.useWebServiceInterface;
+    services.tomcat.extraGroups = [ "disnix" ];
     services.tomcat.javaOpts = "${optionalString cfg.useWebServiceInterface "-Djava.library.path=${pkgs.libmatthew_java}/lib/jni"} ";
     services.tomcat.sharedLibs = []
                                  ++ optional cfg.useWebServiceInterface "${pkgs.DisnixWebService}/share/java/DisnixConnection.jar"
@@ -67,6 +68,9 @@ in
 
         script =
           ''
+	    export PATH=/var/run/current-system/sw/bin:/var/run/current-system/sw/sbin
+            export HOME=/root
+
             ${pkgs.disnix}/bin/disnix-service --activation-modules-dir=${disnix_activation_scripts}/libexec/disnix/activation-scripts
           '';
       };
diff --git a/modules/services/web-servers/tomcat.nix b/modules/services/web-servers/tomcat.nix
index e63abfb15d2..83b95655011 100644
--- a/modules/services/web-servers/tomcat.nix
+++ b/modules/services/web-servers/tomcat.nix
@@ -26,6 +26,12 @@ in
         description = "Location where Tomcat stores configuration files, webapplications and logfiles";
       };
 
+      extraGroups = mkOption {
+        default = [];
+	example = [ "users" ];
+	description = "Defines extra groups to which the tomcat user belongs.";
+      };
+      
       user = mkOption {
         default = "tomcat";
         description = "User account under which Apache Tomcat runs.";
@@ -104,6 +110,7 @@ in
         uid = config.ids.uids.tomcat;
         description = "Tomcat user";
         home = "/homeless-shelter";
+	extraGroups = cfg.extraGroups;
       };
             
     jobs.tomcat =
-- 
GitLab


From 4858ab9da83f94459632fc635277822a181903a6 Mon Sep 17 00:00:00 2001
From: Sander van der Burg <s.vanderburg@tudelft.nl>
Date: Tue, 2 Nov 2010 04:20:37 +0000
Subject: [PATCH 2723/5331] The DisnixWebService is now also part of the
 systemPackages so that a user can invoke the client tool from the
 command-line

svn path=/nixos/trunk/; revision=24564
---
 modules/services/misc/disnix.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/services/misc/disnix.nix b/modules/services/misc/disnix.nix
index abf664c9031..63b8394c280 100644
--- a/modules/services/misc/disnix.nix
+++ b/modules/services/misc/disnix.nix
@@ -43,7 +43,7 @@ in
 
   config = mkIf cfg.enable {
 
-    environment.systemPackages = [ pkgs.disnix ];
+    environment.systemPackages = [ pkgs.disnix ] ++ optional cfg.useWebServiceInterface pkgs.DisnixWebService;
 
     services.dbus.enable = true;
     services.dbus.packages = [ pkgs.disnix ];
-- 
GitLab


From cf84a442725add49f837b7a6a35eac0e63b2d459 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 3 Nov 2010 22:37:39 +0000
Subject: [PATCH 2724/5331] * Use buildEnv with a postBuild hook rather than
 buildEnvScript.

svn path=/nixos/trunk/; revision=24593
---
 modules/services/databases/postgresql.nix | 24 +++++++++--------------
 1 file changed, 9 insertions(+), 15 deletions(-)

diff --git a/modules/services/databases/postgresql.nix b/modules/services/databases/postgresql.nix
index 6d58b757421..56e98e4a3f9 100644
--- a/modules/services/databases/postgresql.nix
+++ b/modules/services/databases/postgresql.nix
@@ -9,22 +9,16 @@ let
   # see description of extraPlugins
   postgresqlAndPlugins = pg:
     if cfg.extraPlugins == [] then pg
-    else pkgs.runCommand "postgresql-and-plugins" {
-      inherit (pkgs) perl;
-      inherit pg;
-      # used by env builder:
+    else pkgs.buildEnv {
+      name = "postgresql-and-plugins";
       paths = [ pg ] ++ cfg.extraPlugins;
-      pathsToLink = "/";
-      ignoreCollisions = 0;
-      manifest = null;
-    }
-      ''
-        perlScript=${pkgs.buildEnvScript}
-        mkdir -p $out/bin
-        $perl/bin/perl $perlScript
-        rm $out/bin/{pg_config,postgres,pg_ctl}
-        cp --target-directory=$out/bin $pg/bin/{postgres,pg_config,pg_ctl}
-      '';
+      postBuild =
+        ''
+          mkdir -p $out/bin
+          rm $out/bin/{pg_config,postgres,pg_ctl}
+          cp --target-directory=$out/bin ${pg}/bin/{postgres,pg_config,pg_ctl}
+        '';
+    };
 
   postgresql = postgresqlAndPlugins pkgs.postgresql;
 
-- 
GitLab


From f34d7250b3e42d0e8b1379a3382f54c0295e29ab Mon Sep 17 00:00:00 2001
From: Rob Vermaas <rob.vermaas@gmail.com>
Date: Thu, 4 Nov 2010 08:13:57 +0000
Subject: [PATCH 2725/5331] mysql-backup.nix: add option to use single
 transaction for dumps

svn path=/nixos/trunk/; revision=24594
---
 modules/services/backup/mysql-backup.nix | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/modules/services/backup/mysql-backup.nix b/modules/services/backup/mysql-backup.nix
index b6d42b8782a..7c091fcfe26 100644
--- a/modules/services/backup/mysql-backup.nix
+++ b/modules/services/backup/mysql-backup.nix
@@ -6,10 +6,10 @@ let
 
   inherit (pkgs) mysql gzip;
 
-  location = config.services.mysqlBackup.location ;
-
+  cfg = config.services.mysqlBackup ;
+  location = cfg.location ;
   mysqlBackupCron = db : ''
-    ${config.services.mysqlBackup.period} ${config.services.mysqlBackup.user} ${mysql}/bin/mysqldump ${db} | ${gzip}/bin/gzip -c > ${location}/${db}.gz
+    ${cfg.period} ${cfg.user} ${mysql}/bin/mysqldump ${if cfg.singleTransaction then "--single-transaction" else ""} ${db} | ${gzip}/bin/gzip -c > ${location}/${db}.gz
   ''; 
 
 in
@@ -55,6 +55,13 @@ in
           Location to put the gzipped MySQL database dumps.
         '';
       };
+
+      singleTransaction = mkOption {
+        default = false;
+        description = ''
+          Whether to create database dump in a single transaction
+        '';
+      };
     };
 
   };
-- 
GitLab


From f319ca67c5a0282f4b3f3b7f626f46867b9a1554 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Sat, 6 Nov 2010 18:13:48 +0000
Subject: [PATCH 2726/5331] Trying to improve the message hit by new users, if
 they use the 2.6.36 kernelPackages and don't disable the ttyBackgrounds. Some
 users got confused by the previous message.

svn path=/nixos/trunk/; revision=24612
---
 modules/tasks/tty-backgrounds.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/modules/tasks/tty-backgrounds.nix b/modules/tasks/tty-backgrounds.nix
index 8d079edc934..d376c6a4b89 100644
--- a/modules/tasks/tty-backgrounds.nix
+++ b/modules/tasks/tty-backgrounds.nix
@@ -86,7 +86,8 @@ in
 
     assertions = singleton
       { assertion = kernelPackages.splashutils != null;
-        message = "kernelPackages.splashutils may not be false";
+        message = "The kernelPackages does not provide splashutils, as required by ttyBackgrounds. " +
+          "Either provide kernelPackages with splashutils, or disable ttyBackgrounds.";
       };
 
     services.ttyBackgrounds.specificThemes = singleton
-- 
GitLab


From 30943d2dc03671299d10ee618fe7b68067e127a1 Mon Sep 17 00:00:00 2001
From: Nicolas Pierron <nicolas.b.pierron@gmail.com>
Date: Tue, 9 Nov 2010 18:42:59 +0000
Subject: [PATCH 2727/5331] Fix nixos-option, accept long arguments.

svn path=/nixos/trunk/; revision=24631
---
 modules/installer/tools/nixos-option.sh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/modules/installer/tools/nixos-option.sh b/modules/installer/tools/nixos-option.sh
index fc4380d00c4..456e2b275d0 100644
--- a/modules/installer/tools/nixos-option.sh
+++ b/modules/installer/tools/nixos-option.sh
@@ -66,13 +66,14 @@ for arg; do
         sarg="$arg"
         while test "$sarg" != "-"; do
           case $sarg in
-            --*) longarg=$arg;;
+            --*) longarg=$arg; sarg="--";;
             -d*) longarg="$longarg --description";;
             -v*) longarg="$longarg --value";;
             -l*) longarg="$longarg --lookup";;
             -i*) longarg="$longarg --install";;
             -*) usage;;
           esac
+          # remove the first letter option
           sarg="-${sarg#??}"
         done
         ;;
-- 
GitLab


From c77c3ab22c578e4a7d3f1a94cb76588fa5a7e745 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Thu, 11 Nov 2010 13:24:37 +0000
Subject: [PATCH 2728/5331] Remove ttmkfdir reference

svn path=/nixos/trunk/; revision=24662
---
 modules/config/fonts.nix | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

diff --git a/modules/config/fonts.nix b/modules/config/fonts.nix
index 8b7ba6fab94..bb75a1e29ab 100644
--- a/modules/config/fonts.nix
+++ b/modules/config/fonts.nix
@@ -98,7 +98,7 @@ in
 
 ###### implementation
 let
-  inherit (pkgs) builderDefs ttmkfdir;
+  inherit (pkgs) builderDefs;
   inherit (pkgs.xorg) mkfontdir mkfontscale fontalias;
 
   fontDirs = config.fonts.fonts;
@@ -107,7 +107,7 @@ let
   localDefs = with builderDefs; builderDefs.passthru.function rec {
     src = "";/* put a fetchurl here */
 
-    buildInputs = [mkfontdir mkfontscale ttmkfdir];
+    buildInputs = [mkfontdir mkfontscale];
     configureFlags = [];
     inherit fontDirs;
     installPhase = fullDepEntry ("
@@ -135,13 +135,6 @@ let
     rm fonts.alias
     mkfontdir
     mkfontscale
-    mv fonts.scale fonts.scale.old
-    mv fonts.dir fonts.dir.old
-    ttmkfdir
-    cat fonts.scale.old >> fonts.scale
-    cat fonts.dir.old >> fonts.dir
-    rm fonts.dir.old
-    rm fonts.scale.old
     cat \$( find ${fontalias}/ -name fonts.alias) >fonts.alias
   ") ["minInit" "addInputs"];
   };
-- 
GitLab


From ad48c7c534bddc6e8536500f6d49826c137d82be Mon Sep 17 00:00:00 2001
From: Sander van der Burg <s.vanderburg@tudelft.nl>
Date: Sun, 21 Nov 2010 13:28:48 +0000
Subject: [PATCH 2729/5331] Initial implementation for the Disnix avahi
 publisher

svn path=/nixos/trunk/; revision=24789
---
 modules/services/misc/disnix.nix | 27 ++++++++++++++++++++++++++-
 1 file changed, 26 insertions(+), 1 deletion(-)

diff --git a/modules/services/misc/disnix.nix b/modules/services/misc/disnix.nix
index 63b8394c280..5714e8ddc79 100644
--- a/modules/services/misc/disnix.nix
+++ b/modules/services/misc/disnix.nix
@@ -33,6 +33,11 @@ in
         default = false;
 	description = "Whether to enable the DisnixWebService interface running on Apache Tomcat";
       };
+      
+      publishAvahi = mkOption {
+        default = false;
+	description = "Whether to publish capabilities/properties as a Disnix service through Avahi";
+      };
 
     };
     
@@ -75,6 +80,26 @@ in
           '';
       };
 
+  } //
+  mkIf cfg.publishAvahi {
+  
+    services.avahi.enable = true;
+  
+    jobs.disnixAvahi =
+      { description = "Disnix Avahi publisher";
+      
+        startOn = "started avahi-daemon";
+	
+	exec =
+        ''
+          ${pkgs.avahi}/bin/avahi-publish-service disnix-$(${pkgs.nettools}/bin/hostname) _disnix._tcp 22 \
+            "hostname=\"$(${pkgs.nettools}/bin/hostname)\"" \
+	    "mem=$(grep 'MemTotal:' /proc/meminfo | sed -e 's/kB//' -e 's/MemTotal://' -e 's/ //g')" \
+            ${optionalString (config.services.httpd.enable) ''"documentRoot=\"${config.services.httpd.documentRoot}\""''} \
+            ${optionalString (config.services.mysql.enable) ''"mysqlPort=3306"''} \
+            ${optionalString (config.services.tomcat.enable) ''"tomcatPort=8080"''} \
+            "supportedTypes=[$(for i in ${disnix_activation_scripts}/libexec/disnix/activation-scripts/*; do echo -n " \"$(basename $i)\""; done) ]"
+        '';
+      };
   };
-
 }
-- 
GitLab


From fcf53be5bd1ce31bd0862bdeb5144e388a07a4b7 Mon Sep 17 00:00:00 2001
From: Sander van der Burg <s.vanderburg@tudelft.nl>
Date: Sun, 21 Nov 2010 16:04:26 +0000
Subject: [PATCH 2730/5331] The DisnixWebService is also published through
 Avahi

svn path=/nixos/trunk/; revision=24792
---
 modules/services/misc/disnix.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/modules/services/misc/disnix.nix b/modules/services/misc/disnix.nix
index 5714e8ddc79..7eeed998d2d 100644
--- a/modules/services/misc/disnix.nix
+++ b/modules/services/misc/disnix.nix
@@ -95,6 +95,7 @@ in
           ${pkgs.avahi}/bin/avahi-publish-service disnix-$(${pkgs.nettools}/bin/hostname) _disnix._tcp 22 \
             "hostname=\"$(${pkgs.nettools}/bin/hostname)\"" \
 	    "mem=$(grep 'MemTotal:' /proc/meminfo | sed -e 's/kB//' -e 's/MemTotal://' -e 's/ //g')" \
+	    ${optionalString (cfg.useWebServiceInterface) ''"targetEPR=\"http://(${pkgs.nettools}/bin/hostname):8080/DisnixWebService/services/DisnixWebService\""''} \
             ${optionalString (config.services.httpd.enable) ''"documentRoot=\"${config.services.httpd.documentRoot}\""''} \
             ${optionalString (config.services.mysql.enable) ''"mysqlPort=3306"''} \
             ${optionalString (config.services.tomcat.enable) ''"tomcatPort=8080"''} \
-- 
GitLab


From c958902d4473e6abec41e383d43c28f7ec674a09 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 23 Nov 2010 16:07:00 +0000
Subject: [PATCH 2731/5331] * Added an option "nixpkgs.system" to specify the
 system type for   which NixOS should be built.  This is useful in NixOS
 network   specifications, because it allows machines in the network to have  
 different types, e.g.,

    {
      machine1 =
        { config, pkgs, ... }:
        { nixpkgs.system = "i686-linux";
          ... other config ...
        };

      machine2 =
        { config, pkgs, ... }:
        { nixpkgs.system = "x86_64-linux";
          ... other config ...
        };
    }

  It can also be useful in distributed NixOS tests.

svn path=/nixos/trunk/; revision=24823
---
 lib/eval-config.nix      |  8 +++++---
 modules/misc/nixpkgs.nix | 11 +++++++++++
 2 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/lib/eval-config.nix b/lib/eval-config.nix
index 8a7b225e850..d34a73fd166 100644
--- a/lib/eval-config.nix
+++ b/lib/eval-config.nix
@@ -11,7 +11,7 @@
 , modules
 }:
 
-let extraArgs_ = extraArgs; pkgs_ = pkgs; in
+let extraArgs_ = extraArgs; pkgs_ = pkgs; system_ = system; in
 
 rec {
 
@@ -39,7 +39,8 @@ rec {
   # Import Nixpkgs, allowing the NixOS option nixpkgs.config to
   # specify the Nixpkgs configuration (e.g., to set package options
   # such as firefox.enableGeckoMediaPlayer, or to apply global
-  # overrides such as changing GCC throughout the system).  This is
+  # overrides such as changing GCC throughout the system), and the
+  # option nixpkgs.system to override the platform type.  This is
   # tricky, because we have to prevent an infinite recursion: "pkgs"
   # is passed as an argument to NixOS modules, but the value of "pkgs"
   # depends on config.nixpkgs.config, which we get from the modules.
@@ -50,12 +51,13 @@ rec {
     then pkgs_
     else import nixpkgs (
       let
+        system = if nixpkgsOptions.system != "" then nixpkgsOptions.system else system_;
         nixpkgsOptions = (import ./eval-config.nix {
           inherit system nixpkgs services extraArgs modules;
           # For efficiency, leave out most NixOS modules; they don't
           # define nixpkgs.config, so it's pointless to evaluate them.
           baseModules = [ ../modules/misc/nixpkgs.nix ];
-          pkgs = import nixpkgs { inherit system; config = {}; };
+          pkgs = import nixpkgs { system = system_; config = {}; };
         }).optionDefinitions.nixpkgs;
       in
       {
diff --git a/modules/misc/nixpkgs.nix b/modules/misc/nixpkgs.nix
index 8173d716d84..d940b32dbd5 100644
--- a/modules/misc/nixpkgs.nix
+++ b/modules/misc/nixpkgs.nix
@@ -13,6 +13,17 @@
       '';
     };
 
+    nixpkgs.system = pkgs.lib.mkOption {
+      default = "";
+      description = ''
+        Specifies the Nix platform type for which NixOS should be built.
+        If unset, it defaults to the platform type of your host system
+        (<literal>${builtins.currentSystem}</literal>).
+        Specifying this option is useful when doing distributed
+        multi-platform deployment, or when building virtual machines.
+      '';
+    };
+
     nixpkgs.platform = pkgs.lib.mkOption {
       default = pkgs.platforms.pc;
       description = ''
-- 
GitLab


From 1b41b6d16d7a8b8402c1679a1fd18a4aa2d999b1 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Wed, 24 Nov 2010 06:13:37 +0000
Subject: [PATCH 2732/5331] Fix Monit startOn parameter

svn path=/nixos/trunk/; revision=24832
---
 modules/services/monitoring/monit.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/services/monitoring/monit.nix b/modules/services/monitoring/monit.nix
index 35f483411b2..40ad8456d7c 100644
--- a/modules/services/monitoring/monit.nix
+++ b/modules/services/monitoring/monit.nix
@@ -20,7 +20,7 @@ in
         description = "monit.conf content";
       };
       startOn = mkOption {
-        default = "network-interfaces/started";
+        default = "started network-interfaces";
         description = "What Monit supposes to be already present";
       };
     };
-- 
GitLab


From f58efe3336dec26eafc417ce91fbd779ec52ff6c Mon Sep 17 00:00:00 2001
From: "Yury G. Kudryashov" <urkud.urkud@gmail.com>
Date: Wed, 24 Nov 2010 10:45:34 +0000
Subject: [PATCH 2733/5331] Add kdm user. Kdm doesn't work here without kdm
 user

svn path=/nixos/trunk/; revision=24835
---
 modules/misc/ids.nix                          | 1 +
 modules/services/x11/display-managers/kdm.nix | 7 +++++++
 2 files changed, 8 insertions(+)

diff --git a/modules/misc/ids.nix b/modules/misc/ids.nix
index 2db841194e3..f8219c23068 100644
--- a/modules/misc/ids.nix
+++ b/modules/misc/ids.nix
@@ -57,6 +57,7 @@ in
     cups = 36;
     foldingAtHome = 37;
     sabnzbd = 38;
+    kdm = 39;
     # When adding a uid, make sure it doesn't match an existing gid.
 
     nixbld = 30000; # start of range of uids
diff --git a/modules/services/x11/display-managers/kdm.nix b/modules/services/x11/display-managers/kdm.nix
index 1fa5b4f210f..2c5a720f815 100644
--- a/modules/services/x11/display-managers/kdm.nix
+++ b/modules/services/x11/display-managers/kdm.nix
@@ -106,6 +106,13 @@ in
 
     security.pam.services = [ { name = "kde"; } ];
       
+    users.extraUsers = singleton
+      { name = "kdm";
+        uid = config.ids.uids.kdm;
+        description = "kdm user";
+        home = "/tmp/kdm";
+      };
+
   };
   
 }
-- 
GitLab


From 50d8698fd8fc89301db1cce56d73132da76772d7 Mon Sep 17 00:00:00 2001
From: Evgeny Egorochkin <phreedom.stdin@gmail.com>
Date: Wed, 24 Nov 2010 22:58:42 +0000
Subject: [PATCH 2734/5331] network-interfaces: cleanup

svn path=/nixos/trunk/; revision=24845
---
 modules/tasks/network-interfaces.nix | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/modules/tasks/network-interfaces.nix b/modules/tasks/network-interfaces.nix
index 562a945d832..d24f7c923ce 100644
--- a/modules/tasks/network-interfaces.nix
+++ b/modules/tasks/network-interfaces.nix
@@ -8,6 +8,8 @@ let
 
   cfg = config.networking;
 
+  ifconfig = "${nettools}/sbin/ifconfig";
+
 in 
 
 {
@@ -157,7 +159,7 @@ in
 
             for i in $(cd /sys/class/net && ls -d *); do
                 echo "Bringing up network device $i..."
-                ${nettools}/sbin/ifconfig $i up || true
+                ${ifconfig} $i up || true
             done
 
             # Configure the manually specified interfaces.
@@ -169,7 +171,7 @@ in
                   if test -n "${i.subnetMask}"; then
                       extraFlags="$extraFlags netmask ${i.subnetMask}"
                   fi
-                  ${nettools}/sbin/ifconfig "${i.name}" "${i.ipAddress}" $extraFlags || true
+                  ${ifconfig} "${i.name}" "${i.ipAddress}" $extraFlags || true
                 ''
               else "") cfg.interfaces}
 
@@ -202,7 +204,7 @@ in
           ''
             #for i in $(cd /sys/class/net && ls -d *); do
             #    echo "Taking down network device $i..."
-            #    ${nettools}/sbin/ifconfig $i down || true
+            #    ${ifconfig} $i down || true
             #done
           '';
       };
-- 
GitLab


From 72422d41262b4f48f5bf20fd58f1714292750a13 Mon Sep 17 00:00:00 2001
From: Evgeny Egorochkin <phreedom.stdin@gmail.com>
Date: Wed, 24 Nov 2010 22:58:48 +0000
Subject: [PATCH 2735/5331] network-interfaces: support changing MAC addresses
 of interfaces

svn path=/nixos/trunk/; revision=24846
---
 modules/tasks/network-interfaces.nix | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/modules/tasks/network-interfaces.nix b/modules/tasks/network-interfaces.nix
index d24f7c923ce..0c1180af645 100644
--- a/modules/tasks/network-interfaces.nix
+++ b/modules/tasks/network-interfaces.nix
@@ -115,6 +115,15 @@ in
           '';
         };
 
+        macAddress = mkOption {
+          default = "";
+          example = "00:11:22:33:44:55";
+          type = types.string;
+          description = ''
+            MAC address of the interface. Leave empty to use the default.
+          '';
+        };
+
       };
       
     };
@@ -157,6 +166,16 @@ in
             export PATH=${config.system.sbin.modprobe}/sbin:$PATH
             modprobe af_packet || true
 
+            ${pkgs.lib.concatMapStrings (i:
+              if i.macAddress != "" then
+                ''
+                  echo "Configuring interface ${i.name}..."
+                  ${ifconfig} "${i.name}" down || true
+                  ${ifconfig} hw ether "${i.name}" "${i.macAddress}" || true
+                ''
+              else "") cfg.interfaces
+            }
+
             for i in $(cd /sys/class/net && ls -d *); do
                 echo "Bringing up network device $i..."
                 ${ifconfig} $i up || true
-- 
GitLab


From 2224d78b33b07686dcea8a192944b3f622109541 Mon Sep 17 00:00:00 2001
From: Evgeny Egorochkin <phreedom.stdin@gmail.com>
Date: Wed, 24 Nov 2010 22:58:53 +0000
Subject: [PATCH 2736/5331] network-interfaces: MAC address support take 2: now
 it seems to work

svn path=/nixos/trunk/; revision=24847
---
 modules/services/networking/dhclient.nix | 2 +-
 modules/tasks/network-interfaces.nix     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/services/networking/dhclient.nix b/modules/services/networking/dhclient.nix
index bd3f781c19a..454bd361b12 100644
--- a/modules/services/networking/dhclient.nix
+++ b/modules/services/networking/dhclient.nix
@@ -8,7 +8,7 @@ let
 
   # Don't start dhclient on explicitly configured interfaces.
   ignoredInterfaces = 
-    map (i: i.name) (lib.filter (i: i ? ipAddress) config.networking.interfaces);
+    map (i: i.name) (lib.filter (i: i ? ipAddress && i.ipAddress != "" ) config.networking.interfaces);
 
   stateDir = "/var/lib/dhcp"; # Don't use /var/state/dhcp; not FHS-compliant.
 
diff --git a/modules/tasks/network-interfaces.nix b/modules/tasks/network-interfaces.nix
index 0c1180af645..640ef0821fc 100644
--- a/modules/tasks/network-interfaces.nix
+++ b/modules/tasks/network-interfaces.nix
@@ -171,7 +171,7 @@ in
                 ''
                   echo "Configuring interface ${i.name}..."
                   ${ifconfig} "${i.name}" down || true
-                  ${ifconfig} hw ether "${i.name}" "${i.macAddress}" || true
+                  ${ifconfig} "${i.name}" hw ether "${i.macAddress}" || true
                 ''
               else "") cfg.interfaces
             }
-- 
GitLab


From 31b8ac8120c8acc5223468bce6fee0c5ed5f6be8 Mon Sep 17 00:00:00 2001
From: Sander van der Burg <s.vanderburg@tudelft.nl>
Date: Wed, 24 Nov 2010 23:00:21 +0000
Subject: [PATCH 2737/5331] Implemented 'deployment' option to capture custom
 attributes related to the system configuration

svn path=/nixos/trunk/; revision=24848
---
 modules/misc/deployment.nix | 23 +++++++++++++++++++++++
 modules/module-list.nix     |  1 +
 2 files changed, 24 insertions(+)
 create mode 100644 modules/misc/deployment.nix

diff --git a/modules/misc/deployment.nix b/modules/misc/deployment.nix
new file mode 100644
index 00000000000..08559cc2a16
--- /dev/null
+++ b/modules/misc/deployment.nix
@@ -0,0 +1,23 @@
+{ config, pkgs, ... }:
+
+with pkgs.lib;
+
+{
+  options = {
+
+    deployment = mkOption {
+      description = ''
+        This option captures various custom attributes related to the configuration of the system, which
+        are not directly used for building a system configuration. Usually these attributes
+        are used by external tooling, such as the nixos-deploy-network tool or the Disnix Avahi
+        publisher.
+      '';
+      default = {};
+      example = {
+        description = "My production machine";
+	hostname = "my.test.org";
+	country = "NL";
+      };
+    };
+  };
+}
diff --git a/modules/module-list.nix b/modules/module-list.nix
index 1364b28182d..8c927aa6142 100644
--- a/modules/module-list.nix
+++ b/modules/module-list.nix
@@ -24,6 +24,7 @@
   ./installer/tools/tools.nix
   ./misc/assertions.nix
   ./misc/check-config.nix
+  ./misc/deployment.nix
   ./misc/ids.nix
   ./misc/locate.nix
   ./misc/nixpkgs.nix
-- 
GitLab


From b064f5c80ecc012b252d9856784485d4a82714e1 Mon Sep 17 00:00:00 2001
From: Sander van der Burg <s.vanderburg@tudelft.nl>
Date: Wed, 24 Nov 2010 23:00:52 +0000
Subject: [PATCH 2738/5331] The Disnix avahi server now also publishes the
 'system' attribute and the properties defined in config.deployment

svn path=/nixos/trunk/; revision=24849
---
 modules/services/misc/disnix.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/modules/services/misc/disnix.nix b/modules/services/misc/disnix.nix
index 7eeed998d2d..dee19b0577a 100644
--- a/modules/services/misc/disnix.nix
+++ b/modules/services/misc/disnix.nix
@@ -94,12 +94,14 @@ in
         ''
           ${pkgs.avahi}/bin/avahi-publish-service disnix-$(${pkgs.nettools}/bin/hostname) _disnix._tcp 22 \
             "hostname=\"$(${pkgs.nettools}/bin/hostname)\"" \
+	    "system=\"$(uname -m)-linux\"" \
 	    "mem=$(grep 'MemTotal:' /proc/meminfo | sed -e 's/kB//' -e 's/MemTotal://' -e 's/ //g')" \
 	    ${optionalString (cfg.useWebServiceInterface) ''"targetEPR=\"http://(${pkgs.nettools}/bin/hostname):8080/DisnixWebService/services/DisnixWebService\""''} \
             ${optionalString (config.services.httpd.enable) ''"documentRoot=\"${config.services.httpd.documentRoot}\""''} \
             ${optionalString (config.services.mysql.enable) ''"mysqlPort=3306"''} \
             ${optionalString (config.services.tomcat.enable) ''"tomcatPort=8080"''} \
-            "supportedTypes=[$(for i in ${disnix_activation_scripts}/libexec/disnix/activation-scripts/*; do echo -n " \"$(basename $i)\""; done) ]"
+            "supportedTypes=[$(for i in ${disnix_activation_scripts}/libexec/disnix/activation-scripts/*; do echo -n " \"$(basename $i)\""; done) ]" \
+	    ${concatMapStrings (deploymentAttrName: let deploymentAttrValue = getAttr deploymentAttrName (config.deployment); in ''${deploymentAttrName}=\"${deploymentAttrValue}\" '' ) (attrNames (config.deployment))}
         '';
       };
   };
-- 
GitLab


From 636307c62b9e57a108d2759f6a284dfc0ec91996 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 25 Nov 2010 16:51:07 +0000
Subject: [PATCH 2739/5331] * Create /var/lib/nfs/v4recovery.

svn path=/nixos/trunk/; revision=24858
---
 modules/services/network-filesystems/nfs-kernel.nix | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/modules/services/network-filesystems/nfs-kernel.nix b/modules/services/network-filesystems/nfs-kernel.nix
index 603e63f6005..290622b0997 100644
--- a/modules/services/network-filesystems/nfs-kernel.nix
+++ b/modules/services/network-filesystems/nfs-kernel.nix
@@ -133,7 +133,15 @@ in
             startOn = "started nfs-kernel-exports and started nfs-kernel-mountd and started nfs-kernel-statd and started portmap";
             stopOn = "stopping nfs-kernel-exports";
 
-            preStart = "${pkgs.nfsUtils}/sbin/rpc.nfsd ${if cfg.server.hostName != null then "-H ${cfg.server.hostName}" else ""} ${builtins.toString cfg.server.nproc}";
+            preStart = 
+              ''
+                # Create a state directory required by NFSv4.
+                mkdir -p /var/lib/nfs/v4recovery
+
+                ${pkgs.nfsUtils}/sbin/rpc.nfsd \
+                  ${if cfg.server.hostName != null then "-H ${cfg.server.hostName}" else ""} \
+                  ${builtins.toString cfg.server.nproc}
+              '';
 
             postStop = "${pkgs.nfsUtils}/sbin/rpc.nfsd 0";
           };
-- 
GitLab


From bef46f15531ede38beb0136833688c22164f3f4b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Fri, 26 Nov 2010 09:57:38 +0000
Subject: [PATCH 2740/5331] Moving which to type -P, so 'which ls', 'which
 time', ... work.

svn path=/nixos/trunk/; revision=24862
---
 modules/programs/bash/bashrc.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/programs/bash/bashrc.sh b/modules/programs/bash/bashrc.sh
index 50768635d36..c301ffde73a 100644
--- a/modules/programs/bash/bashrc.sh
+++ b/modules/programs/bash/bashrc.sh
@@ -68,7 +68,7 @@ fi
 alias ls="ls --color=tty"
 alias ll="ls -l"
 alias l="ls -alh"
-alias which="type -p"
+alias which="type -P"
 
 # The "non-interactive" Bash build does not support programmable
 # completion so check whether it's available.
-- 
GitLab


From 1c451d351fe48ba0a3e0b844b5311c153089e9e0 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 26 Nov 2010 22:50:57 +0000
Subject: [PATCH 2741/5331] * Make the location of the database configurable.

svn path=/nixos/trunk/; revision=24888
---
 modules/services/monitoring/zabbix-server.nix | 20 ++++++++++++++++++-
 1 file changed, 19 insertions(+), 1 deletion(-)

diff --git a/modules/services/monitoring/zabbix-server.nix b/modules/services/monitoring/zabbix-server.nix
index 65b1a3cafa9..0dc3aaf75f5 100644
--- a/modules/services/monitoring/zabbix-server.nix
+++ b/modules/services/monitoring/zabbix-server.nix
@@ -5,6 +5,8 @@ with pkgs.lib;
 
 let
 
+  cfg = config.services.zabbixServer;
+
   stateDir = "/var/run/zabbix";
 
   logDir = "/var/log/zabbix";
@@ -19,9 +21,15 @@ let
   
       PidFile = ${pidFile}
 
+      DBHost = ${cfg.dbServer}
+
       DBName = zabbix
 
       DBUser = zabbix
+
+      ${optionalString (cfg.dbPassword != "") ''
+        DBPassword = ${cfg.dbPassword}
+      ''}
     '';
 
 in
@@ -39,11 +47,21 @@ in
       '';
     };
 
+    services.zabbixServer.dbServer = mkOption {
+      default = "localhost";
+      description = "Hostname or IP address of the database server.";
+    };
+
+    services.zabbixServer.dbPassword = mkOption {
+      default = "";
+      description = "Password used to connect to the database server.";
+    };
+
   };
 
   ###### implementation
 
-  config = mkIf config.services.zabbixServer.enable {
+  config = mkIf cfg.enable {
 
     services.postgresql.enable = true;
 
-- 
GitLab


From 1b8dd6cf2772efc23d53e6aff0ada0c1d8f159d5 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 1 Dec 2010 12:36:19 +0000
Subject: [PATCH 2742/5331] * "systemConfig" doesn't exist anymore.

svn path=/nixos/trunk/; revision=24947
---
 modules/services/backup/sitecopy-backup.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/services/backup/sitecopy-backup.nix b/modules/services/backup/sitecopy-backup.nix
index f30002b6ee8..c540e8fcfa0 100644
--- a/modules/services/backup/sitecopy-backup.nix
+++ b/modules/services/backup/sitecopy-backup.nix
@@ -66,7 +66,7 @@ in
 
     services.cron.systemCronJobs = map sitecopyCron config.services.sitecopy.backups;
 
-    system.activationScripts.sitecopyBackup = stringAfter [ "stdio" "systemConfig" "users" ]
+    system.activationScripts.sitecopyBackup = stringAfter [ "stdio" "users" ]
       ''  
         mkdir -m 0700 -p ${stateDir}
         chown root ${stateDir}
-- 
GitLab


From 29813b418c03964581ab2837b68a402f453120de Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 1 Dec 2010 16:14:44 +0000
Subject: [PATCH 2743/5331] * Don't run dhclient on Xen's vif* and tap*
 interfaces.

svn path=/nixos/trunk/; revision=24948
---
 modules/services/networking/dhclient.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/services/networking/dhclient.nix b/modules/services/networking/dhclient.nix
index 454bd361b12..7d45350fe6b 100644
--- a/modules/services/networking/dhclient.nix
+++ b/modules/services/networking/dhclient.nix
@@ -80,10 +80,10 @@ in
                 # Only run dhclient on interfaces of type ARPHRD_ETHER
                 # (1), i.e. Ethernet.  Ignore peth* devices; on Xen,
                 # they're renamed physical Ethernet cards used for
-                # bridging.
+                # bridging.  Likewise for vif* and tap*.
                 if [ "$(cat /sys/class/net/$i/type)" = 1 ]; then
                     if ! for j in ${toString ignoredInterfaces}; do echo $j; done | grep -F -x -q "$i" &&
-                       ! echo "$i" | grep -x -q "peth.*";
+                       ! echo "$i" | grep -x -q "peth.*\|vif.*\|tap.*";
 		    then
                         echo "Running dhclient on $i"
                         interfaces="$interfaces $i"
-- 
GitLab


From e97a3d9cb64cca2f29a9377a15eaff47756cf261 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 2 Dec 2010 17:22:24 +0000
Subject: [PATCH 2744/5331] * Fix incorrect path to switch-to-configuration.

svn path=/nixos/trunk/; revision=24955
---
 modules/installer/tools/nixos-deploy-network/deploy.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/modules/installer/tools/nixos-deploy-network/deploy.nix b/modules/installer/tools/nixos-deploy-network/deploy.nix
index 10210fb0bea..3402a3a34bd 100644
--- a/modules/installer/tools/nixos-deploy-network/deploy.nix
+++ b/modules/installer/tools/nixos-deploy-network/deploy.nix
@@ -24,7 +24,7 @@ let
         if [ "$rollback" != "$succeeded" ]
 	then
 	    ssh $NIX_SSHOPTS ${getAttr targetProperty infrastructureElement} nix-env -p /nix/var/nix/profiles/system --rollback
-	    ssh $NIX_SSHOPTS ${getAttr targetProperty infrastructureElement} /nix/var/nix/profiles/bin/switch-to-configuration switch
+	    ssh $NIX_SSHOPTS ${getAttr targetProperty infrastructureElement} /nix/var/nix/profiles/system/bin/switch-to-configuration switch
 	    
 	    rollback=$((rollback + 1))
 	fi
@@ -56,9 +56,9 @@ let
 	ssh $NIX_SSHOPTS ${getAttr targetProperty infrastructureElement} nix-env -p /nix/var/nix/profiles/system --set ${config.system.build.toplevel} || 
 	  (ssh $NIX_SSHOPTS ${getAttr targetProperty infrastructureElement} nix-env -p /nix/var/nix/profiles/system --rollback; rollbackSucceeded)
 	
-        ssh $NIX_SSHOPTS ${getAttr targetProperty infrastructureElement} /nix/var/nix/profiles/bin/switch-to-configuration switch ||
+        ssh $NIX_SSHOPTS ${getAttr targetProperty infrastructureElement} /nix/var/nix/profiles/system/bin/switch-to-configuration switch ||
 	  ( ssh $NIX_SSHOPTS ${getAttr targetProperty infrastructureElement} nix-env -p /nix/var/nix/profiles/system --rollback
-	    ssh $NIX_SSHOPTS ${getAttr targetProperty infrastructureElement} /nix/var/nix/profiles/bin/switch-to-configuration switch
+	    ssh $NIX_SSHOPTS ${getAttr targetProperty infrastructureElement} /nix/var/nix/profiles/system/bin/switch-to-configuration switch
 	    rollbackSucceeded
 	  )
 	
-- 
GitLab


From 651a38019ddd3aae4a80384ef2c527dcd85c0c74 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 2 Dec 2010 18:09:53 +0000
Subject: [PATCH 2745/5331] * nixos-deploy-network: build the deploy script
 locally as an   optimisation and workaround for Nix/210.

svn path=/nixos/trunk/; revision=24956
---
 modules/installer/tools/nixos-deploy-network/deploy.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/modules/installer/tools/nixos-deploy-network/deploy.nix b/modules/installer/tools/nixos-deploy-network/deploy.nix
index 3402a3a34bd..58d6adfefaf 100644
--- a/modules/installer/tools/nixos-deploy-network/deploy.nix
+++ b/modules/installer/tools/nixos-deploy-network/deploy.nix
@@ -86,6 +86,11 @@ let
 in
 pkgs.stdenv.mkDerivation {
   name = "deploy-script";
+
+  # This script has a zillion dependencies and is trivial to build, so
+  # we don't want to build it remotely.
+  preferLocalBuild = true;
+  
   buildCommand = 
   ''
     ensureDir $out/bin
-- 
GitLab


From d5fb41795f93127e6d20dac7ee532400e2d5a64d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Thu, 2 Dec 2010 20:23:45 +0000
Subject: [PATCH 2746/5331] Adding a wake on lan module.

svn path=/nixos/trunk/; revision=24958
---
 modules/config/power-management.nix        | 22 +++++++--
 modules/module-list.nix                    |  1 +
 modules/services/networking/wakeonlan.nix  | 56 ++++++++++++++++++++++
 modules/system/upstart-events/shutdown.nix |  4 +-
 4 files changed, 79 insertions(+), 4 deletions(-)
 create mode 100644 modules/services/networking/wakeonlan.nix

diff --git a/modules/config/power-management.nix b/modules/config/power-management.nix
index ce67285140e..6baefa12791 100644
--- a/modules/config/power-management.nix
+++ b/modules/config/power-management.nix
@@ -10,9 +10,14 @@ let
     ''
       #! ${pkgs.stdenv.shell}
       action="$1"
-      if [ "$action" = "resume" ]; then
-          ${cfg.resumeCommands}
-          ${cfg.powerUpCommands}
+      case "$action" in
+          hibernate|suspend)
+              ${cfg.powerDownCommands}
+              ;;
+          thaw|resume)
+              ${cfg.resumeCommands}
+              ${cfg.powerUpCommands}
+              ;;
       fi
     '';
 
@@ -50,6 +55,17 @@ in
             it resumes from suspend or hibernation.
           '';
       };
+
+      powerDownCommands = mkOption {
+        default = "";
+        example = "${pkgs.hdparm}/sbin/hdparm -B 255 /dev/sda";
+        description =
+          ''
+            Commands executed when the machine powers down.  That is,
+            they're executed both when the system shuts down and when
+            it goes to suspend or hibernation.
+          '';
+      };
       
     };
     
diff --git a/modules/module-list.nix b/modules/module-list.nix
index 8c927aa6142..0c7b9b6592f 100644
--- a/modules/module-list.nix
+++ b/modules/module-list.nix
@@ -107,6 +107,7 @@
   ./services/networking/ssh/sshd.nix
   ./services/networking/tftpd.nix
   ./services/networking/vsftpd.nix
+  ./services/networking/wakeonlan.nix
   ./services/networking/wicd.nix
   ./services/networking/wpa_supplicant.nix
   ./services/networking/xinetd.nix
diff --git a/modules/services/networking/wakeonlan.nix b/modules/services/networking/wakeonlan.nix
new file mode 100644
index 00000000000..936936d2948
--- /dev/null
+++ b/modules/services/networking/wakeonlan.nix
@@ -0,0 +1,56 @@
+{ config, pkgs, ... }:
+
+with pkgs.lib;
+
+let
+  interfaces = config.services.wakeonlan.interfaces;
+
+  ethtool = "${pkgs.ethtool}/sbin/ethtool";
+
+  passwordParameter = password : if (password == "") then "" else
+    "sopass ${password}";
+
+  methodParameter = {method, password} :
+    if method == "magicpacket" then "wol g"
+    else if method == "password" then "wol s so ${passwordParameter password}"
+    else throw "Wake-On-Lan method not supported";
+    
+  line = { interface, method ? "magicpacket", password ? "" }: ''
+    ${ethtool} -s ${interface} ${methodParameter {inherit method password;}}
+  '';
+
+  concatStrings = fold (x: y: x + y) "";
+  lines = concatStrings (map (l: line l) interfaces);
+
+in
+{
+
+  ###### interface
+  
+  options = {
+
+    services.wakeonlan.interfaces = mkOption {
+      default = [ ];
+      example = [
+        {
+          interface = "eth0";
+          method = "password";
+          password = "00:11:22:33:44:55";
+        }
+      ];
+      description = ''
+        Interfaces where to enable Wake-On-LAN, and how. Two methods available:
+        "magickey" and "password". The password has the shape of six bytes
+        in hexadecimal separated by a colon each. For more information,
+        check the ethtool manual.
+      '';
+    };
+
+  };
+
+
+  ###### implementation
+
+  config.powerManagement.powerDownCommands = lines;
+
+}
diff --git a/modules/system/upstart-events/shutdown.nix b/modules/system/upstart-events/shutdown.nix
index 51b741d54e0..85ad601914d 100644
--- a/modules/system/upstart-events/shutdown.nix
+++ b/modules/system/upstart-events/shutdown.nix
@@ -29,9 +29,11 @@ with pkgs.lib;
               echo "<<< System shutdown >>>"
           fi
           echo ""
+
+          ${config.powerManagement.powerDownCommands}
       
           export PATH=${pkgs.utillinux}/bin:${pkgs.utillinux}/sbin:$PATH
-      
+
 
           # Do an initial sync just in case.
           sync
-- 
GitLab


From 8e168edebcc829a53401a723d4f106b5f01a17d7 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 6 Dec 2010 09:54:08 +0000
Subject: [PATCH 2747/5331] * Increase the number of loopback devices from the
 default (8),   which is way too small because every VM virtual disk requires 
  a loopback device.

svn path=/nixos/trunk/; revision=24988
---
 modules/virtualisation/xen-dom0.nix | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/modules/virtualisation/xen-dom0.nix b/modules/virtualisation/xen-dom0.nix
index 18fbf7bc62b..7b8c5f3dd90 100644
--- a/modules/virtualisation/xen-dom0.nix
+++ b/modules/virtualisation/xen-dom0.nix
@@ -79,6 +79,14 @@ in
     # as it's loaded, so don't load it.
     boot.blacklistedKernelModules = [ "radeonfb" ];
 
+    # Increase the number of loopback devices from the default (8),
+    # which is way too small because every VM virtual disk requires a
+    # loopback device.
+    boot.extraModprobeConfig =
+      ''
+        options loop max_loop=64
+      '';
+
     virtualisation.xen.bootParams = 
       [ "loglvl=all" "guest_loglvl=all" ] ++
       optional (cfg.domain0MemorySize != 0) "dom0_mem=${toString cfg.domain0MemorySize}M";
-- 
GitLab


From 796b48c367637ecc49b8e1233a9fedaa246b31a8 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 6 Dec 2010 19:02:24 +0000
Subject: [PATCH 2748/5331] * Run smbd in its own session / process group
 (setsid) because smbd   now kills its process group when it exits.  Without
 setsid, this   ends up killing the parent (i.e., the builder). * Use port 445
 instead of 139 because the CIFS kernel module tries   port 445 first.  If
 there is an actual Samba running on the host, it   would end up connecting to
 that one instead of our own and fail.

svn path=/nixos/trunk/; revision=25016
---
 modules/virtualisation/qemu-vm.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/virtualisation/qemu-vm.nix b/modules/virtualisation/qemu-vm.nix
index 50b07435bda..4aef6848ac8 100644
--- a/modules/virtualisation/qemu-vm.nix
+++ b/modules/virtualisation/qemu-vm.nix
@@ -185,7 +185,7 @@ let
           -m ${toString config.virtualisation.memorySize} \
           -net nic,vlan=0,model=virtio \
           -chardev socket,id=samba,path=./samba \
-          -net user,vlan=0,guestfwd=tcp:10.0.2.4:139-chardev:samba${if cfg.useBackdoor then ",guestfwd=tcp:10.0.2.6:23-chardev:shell" else ""}''${QEMU_NET_OPTS:+,$QEMU_NET_OPTS} \
+          -net user,vlan=0,guestfwd=tcp:10.0.2.4:445-chardev:samba${if cfg.useBackdoor then ",guestfwd=tcp:10.0.2.6:23-chardev:shell" else ""}''${QEMU_NET_OPTS:+,$QEMU_NET_OPTS} \
 	  ${if cfg.useBackdoor then "-chardev socket,id=shell,path=./shell" else ""} \
           ${if cfg.useBootLoader then ''
             -drive index=0,file=$NIX_DISK_IMAGE,if=virtio,cache=writeback,werror=report \
-- 
GitLab


From 755c30c7a2dcd30bffab17478cc06e4c9088d62d Mon Sep 17 00:00:00 2001
From: Sander van der Burg <s.vanderburg@tudelft.nl>
Date: Mon, 6 Dec 2010 22:02:37 +0000
Subject: [PATCH 2749/5331] - nixos-deploy-network no longer uses an
 infrastructure model => use nixpkgs.system and deployment.hostname instead -
 implemented --no-out-link option so that invoking these tools from scripts
 leave no garbage behind - some misc. cleanups

svn path=/nixos/trunk/; revision=25019
---
 .../tools/nixos-build-vms/nixos-build-vms.sh  | 34 ++++++++------
 .../tools/nixos-deploy-network/deploy.nix     | 46 ++++++++-----------
 .../nixos-deploy-network.sh                   | 43 ++++++++---------
 3 files changed, 57 insertions(+), 66 deletions(-)

diff --git a/modules/installer/tools/nixos-build-vms/nixos-build-vms.sh b/modules/installer/tools/nixos-build-vms/nixos-build-vms.sh
index 709b9051fc4..88dfff6cec6 100644
--- a/modules/installer/tools/nixos-build-vms/nixos-build-vms.sh
+++ b/modules/installer/tools/nixos-build-vms/nixos-build-vms.sh
@@ -4,18 +4,18 @@
 
 showUsage()
 {
-    echo "Usage: $0 -n network_expr -i infrastructure_expr"
+    echo "Usage: $0 network_expr"
     echo "Options:"
     echo
-    echo "-n,--network        Network Nix expression which captures properties of machines in the network"
-    echo "--use-backdoor      Indicates that the backdoor must be enabled so that the VMs can be accessed through a UNIX domain socket" 
-    echo "--show-trace        Shows the output trace"
-    echo "-h,--help           Shows the usage of this command"
+    echo "--use-backdoor  Indicates that the backdoor must be enabled so that the VMs can be accessed through a UNIX domain socket"
+    echo "--no-out-link   Do not create a 'result' symlink"
+    echo "--show-trace    Shows the output trace"
+    echo "-h,--help       Shows the usage of this command"
 }
 
 # Parse valid argument options
 
-PARAMS=`getopt -n $0 -o n:h -l network:,use-backdoor,show-trace,help -- "$@"`
+PARAMS=`getopt -n $0 -o h -l use-backdoor,show-trace,help -- "$@"`
 
 if [ $? != 0 ]
 then
@@ -30,12 +30,12 @@ eval set -- "$PARAMS"
 while [ "$1" != "--" ]
 do
     case "$1" in
-	-n|--network)
-	    networkExpr=`readlink -f $2`
-	    ;;
 	--use-backdoor)
 	    useBackdoorArg="--arg useBackdoor true"
 	    ;;
+	--no-out-link)
+	    noOutLinkArg="--no-out-link"
+	    ;;
 	--show-trace)
 	    showTraceArg="--show-trace"
 	    ;;
@@ -48,19 +48,23 @@ do
     shift
 done
 
+shift
+
 # Validate the given options
 
-if [ "$networkExpr" = "" ]
+if [ -z "$NIXOS" ]
 then
-    echo "ERROR: A network expression must be specified!" >&2
-    exit 1
+    NIXOS=/etc/nixos/nixos
 fi
 
-if [ -z "$NIXOS" ]
+if [ "$@" = "" ]
 then
-    NIXOS=/etc/nixos/nixos
+    echo "ERROR: A network expression must be specified!" >&2
+    exit 1
+else
+    networkExpr=$(readlink -f $@)
 fi
 
 # Build a network of VMs
 
-nix-build $NIXOS/modules/installer/tools/nixos-build-vms/build-vms.nix --argstr networkExpr $networkExpr --argstr nixos $NIXOS --argstr nixpkgs $NIXPKGS_ALL $useBackdoorArg $showTraceArg
+nix-build $NIXOS/modules/installer/tools/nixos-build-vms/build-vms.nix --argstr networkExpr $networkExpr --argstr nixos $NIXOS --argstr nixpkgs $NIXPKGS_ALL $useBackdoorArg $noOutLinkArg $showTraceArg
diff --git a/modules/installer/tools/nixos-deploy-network/deploy.nix b/modules/installer/tools/nixos-deploy-network/deploy.nix
index 58d6adfefaf..630be914d4b 100644
--- a/modules/installer/tools/nixos-deploy-network/deploy.nix
+++ b/modules/installer/tools/nixos-deploy-network/deploy.nix
@@ -1,7 +1,6 @@
 { nixos ? /etc/nixos/nixos
 , nixpkgs ? /etc/nixos/nixpkgs
 , networkExpr
-, infrastructureExpr
 , targetProperty ? "hostname"
 }:
 
@@ -12,19 +11,17 @@ let
   inherit (pkgs.lib) concatMapStrings;
   
   network = import networkExpr;
-  infrastructure = import infrastructureExpr;
   
-  generateRollbackSucceededPhase = network: infrastructure: configs:
+  generateRollbackSucceededPhase = network: configs:
     concatMapStrings (configurationName: 
       let
-        infrastructureElement = getAttr configurationName infrastructure;
 	config = getAttr configurationName configs;
       in
       ''
         if [ "$rollback" != "$succeeded" ]
 	then
-	    ssh $NIX_SSHOPTS ${getAttr targetProperty infrastructureElement} nix-env -p /nix/var/nix/profiles/system --rollback
-	    ssh $NIX_SSHOPTS ${getAttr targetProperty infrastructureElement} /nix/var/nix/profiles/system/bin/switch-to-configuration switch
+	    ssh $NIX_SSHOPTS ${getAttr targetProperty (config.deployment)} nix-env -p /nix/var/nix/profiles/system --rollback
+	    ssh $NIX_SSHOPTS ${getAttr targetProperty (config.deployment)} /nix/var/nix/profiles/system/bin/switch-to-configuration switch
 	    
 	    rollback=$((rollback + 1))
 	fi
@@ -32,33 +29,31 @@ let
     ) (attrNames network)  
   ;
   
-  generateDistributionPhase = network: infrastructure: configs:
+  generateDistributionPhase = network: configs:
     concatMapStrings (configurationName: 
       let
-        infrastructureElement = getAttr configurationName infrastructure;
 	config = getAttr configurationName configs;
       in
       ''
-        echo "=== copy system closure to ${getAttr targetProperty infrastructureElement} ==="
-        nix-copy-closure --to ${getAttr targetProperty infrastructureElement} ${config.system.build.toplevel}
+        echo "=== copy system closure to ${getAttr targetProperty (config.deployment)} ==="
+        nix-copy-closure --to ${getAttr targetProperty (config.deployment)} ${config.system.build.toplevel}
       ''
     ) (attrNames network)
   ;
   
-  generateActivationPhase = network: infrastructure: configs:
+  generateActivationPhase = network: configs:
     concatMapStrings (configurationName: 
       let
-        infrastructureElement = getAttr configurationName infrastructure;
 	config = getAttr configurationName configs;
       in
       ''
-        echo "=== activating system configuration on ${getAttr targetProperty infrastructureElement} ==="
-	ssh $NIX_SSHOPTS ${getAttr targetProperty infrastructureElement} nix-env -p /nix/var/nix/profiles/system --set ${config.system.build.toplevel} || 
-	  (ssh $NIX_SSHOPTS ${getAttr targetProperty infrastructureElement} nix-env -p /nix/var/nix/profiles/system --rollback; rollbackSucceeded)
+        echo "=== activating system configuration on ${getAttr targetProperty (config.deployment)} ==="
+	ssh $NIX_SSHOPTS ${getAttr targetProperty (config.deployment)} nix-env -p /nix/var/nix/profiles/system --set ${config.system.build.toplevel} || 
+	  (ssh $NIX_SSHOPTS ${getAttr targetProperty (config.deployment)} nix-env -p /nix/var/nix/profiles/system --rollback; rollbackSucceeded)
 	
-        ssh $NIX_SSHOPTS ${getAttr targetProperty infrastructureElement} /nix/var/nix/profiles/system/bin/switch-to-configuration switch ||
-	  ( ssh $NIX_SSHOPTS ${getAttr targetProperty infrastructureElement} nix-env -p /nix/var/nix/profiles/system --rollback
-	    ssh $NIX_SSHOPTS ${getAttr targetProperty infrastructureElement} /nix/var/nix/profiles/system/bin/switch-to-configuration switch
+        ssh $NIX_SSHOPTS ${getAttr targetProperty (config.deployment)} /nix/var/nix/profiles/system/bin/switch-to-configuration switch ||
+	  ( ssh $NIX_SSHOPTS ${getAttr targetProperty (config.deployment)} nix-env -p /nix/var/nix/profiles/system --rollback
+	    ssh $NIX_SSHOPTS ${getAttr targetProperty (config.deployment)} /nix/var/nix/profiles/system/bin/switch-to-configuration switch
 	    rollbackSucceeded
 	  )
 	
@@ -67,22 +62,21 @@ let
     ) (attrNames network)
   ;
   
-  evaluateMachines = network: infrastructure:
+  evaluateMachines = network:
     listToAttrs (map (configurationName:
       let
         configuration = getAttr configurationName network;
-        system = (getAttr configurationName infrastructure).system;
       in
       { name = configurationName;
         value = (import "${nixos}/lib/eval-config.nix" {
-          inherit nixpkgs system;
+          inherit nixpkgs;
           modules = [ configuration ];
-          extraArgs = evaluateMachines network infrastructure;
+          extraArgs = evaluateMachines network;
         }).config; }
     ) (attrNames (network)))
   ;
 
-  configs = evaluateMachines network infrastructure;
+  configs = evaluateMachines network;
 in
 pkgs.stdenv.mkDerivation {
   name = "deploy-script";
@@ -100,18 +94,18 @@ pkgs.stdenv.mkDerivation {
     rollbackSucceeded()
     {
         rollback=0
-        ${generateRollbackSucceededPhase network infrastructure configs}
+        ${generateRollbackSucceededPhase network configs}
     }
     
     # Distribution phase
     
-    ${generateDistributionPhase network infrastructure configs}
+    ${generateDistributionPhase network configs}
     
     # Activation phase
     
     succeeded=0
     
-    ${generateActivationPhase network infrastructure configs}
+    ${generateActivationPhase network configs}
     EOF
     chmod +x $out/bin/deploy-systems
   '';
diff --git a/modules/installer/tools/nixos-deploy-network/nixos-deploy-network.sh b/modules/installer/tools/nixos-deploy-network/nixos-deploy-network.sh
index 08370a15dc8..dc2b2198cfc 100644
--- a/modules/installer/tools/nixos-deploy-network/nixos-deploy-network.sh
+++ b/modules/installer/tools/nixos-deploy-network/nixos-deploy-network.sh
@@ -4,18 +4,17 @@
 
 showUsage()
 {
-    echo "Usage: $0 -n network_expr -i infrastructure_expr"
+    echo "Usage: $0 network_expr"
     echo "Options:"
     echo
-    echo "-n,--network        Network Nix expression which captures properties of machines in the network"
-    echo "-i,--infrastructure Infrastructure Nix expression which captures properties of machines in the network"
-    echo "--show-trace        Shows an output trace"
-    echo "-h,--help           Shows the usage of this command"
+    echo "--show-trace  Shows an output trace"
+    echo "--no-out-link Do not create a 'result' symlink"
+    echo "-h,--help     Shows the usage of this command"
 }
 
 # Parse valid argument options
 
-PARAMS=`getopt -n $0 -o n:i:h -l network:,infrastructure:,show-trace,help -- "$@"`
+PARAMS=`getopt -n $0 -o h -l show-trace,no-out-link,help -- "$@"`
 
 if [ $? != 0 ]
 then
@@ -30,15 +29,12 @@ eval set -- "$PARAMS"
 while [ "$1" != "--" ]
 do
     case "$1" in
-	-n|--network)
-	    networkExpr=`readlink -f $2`
-	    ;;
-	-i|--infrastructure)
-	    infrastructureExpr=`readlink -f $2`
-	    ;;
 	--show-trace)
 	    showTraceArg="--show-trace"
 	    ;;
+	--no-out-link)
+	    noOutLinkArg="--no-out-link"
+	    ;;
 	-h|--help)
 	    showUsage
 	    exit 0
@@ -48,27 +44,24 @@ do
     shift
 done
 
+shift
+
 # Validate the given options
 
-if [ "$infrastructureExpr" = "" ]
+if [ -z "$NIXOS" ]
 then
-    echo "ERROR: A infrastructure expression must be specified!" >&2
-    exit 1
+    NIXOS=/etc/nixos/nixos
 fi
 
-if [ "$networkExpr" = "" ]
+if [ "$@" = "" ]
 then
-    echo "ERROR: A network expression must be specified!" >&2
+    echo "ERROR: A network Nix expression must be specified!" >&2
     exit 1
-fi
-
-if [ -z "$NIXOS" ]
-then
-    NIXOS=/etc/nixos/nixos
+else
+    networkExpr=$(readlink -f $@)
 fi
 
 # Deploy the network
 
-nix-build $NIXOS/modules/installer/tools/nixos-deploy-network/deploy.nix --argstr networkExpr $networkExpr --argstr infrastructureExpr $infrastructureExpr $showTraceArg
-./result/bin/deploy-systems
-rm -f result
+vms=`nix-build $NIXOS/modules/installer/tools/nixos-deploy-network/deploy.nix --argstr networkExpr $networkExpr $showTraceArg $noOutLinkArg`
+$vms/bin/deploy-systems
-- 
GitLab


From 2e38d8cd317b0d88d569b197648cb5cb65292328 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 7 Dec 2010 00:44:29 +0000
Subject: [PATCH 2750/5331] * ZOMG, fixed a giant bug in the networking of
 distributed VM tests.   It turns out that all network interfaces in all VMs
 had the same   Ethernet address (52:54:00:12:34:56) because we didn't specify
 any   with the macaddr=... option.  This can obviously lead to great  
 confusion.  For instance, when a router forwards a packet, it can   actually
 end up sending the packet to itself because the target   machine has the same
 Ethernet address (causing a loop until the TTL   expires), while the target
 *also* receives the packet.  It's amazing   anything worked at all, really.

  So now we just set the Ethernet addresses to 52:54:00:12:<virtual
  network number>:<machine number>.

svn path=/nixos/trunk/; revision=25020
---
 lib/build-vms.nix  | 2 +-
 lib/qemu-flags.nix | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib/build-vms.nix b/lib/build-vms.nix
index efd1ce3b8d3..2c867a0985b 100644
--- a/lib/build-vms.nix
+++ b/lib/build-vms.nix
@@ -108,7 +108,7 @@ rec {
                   
                   virtualisation.qemu.options =
                     lib.flip lib.concatMapStrings interfacesNumbered
-                      ({ first, second }: qemuNICFlags second first );
+                      ({ first, second }: qemuNICFlags second first m.second);
                 };
             }
           )
diff --git a/lib/qemu-flags.nix b/lib/qemu-flags.nix
index 05edc1d2cc6..7831c8f149a 100644
--- a/lib/qemu-flags.nix
+++ b/lib/qemu-flags.nix
@@ -2,8 +2,8 @@
 
 {
 
-  qemuNICFlags = nic: net:
-    "-net nic,vlan=${toString nic},model=virtio " +
+  qemuNICFlags = nic: net: machine:
+    "-net nic,vlan=${toString nic},macaddr=52:54:00:12:${toString net}:${toString machine},model=virtio " +
     # Use 232.0.1.<vlan> as the multicast address to connect VMs on
     # the same vlan, but allow it to be overriden using the
     # $QEMU_MCAST_ADDR_<vlan> environment variable.  The test driver
-- 
GitLab


From 9df8293d63edb2bedacf453e63432fdb07269bdd Mon Sep 17 00:00:00 2001
From: Sander van der Burg <s.vanderburg@tudelft.nl>
Date: Tue, 7 Dec 2010 16:33:18 +0000
Subject: [PATCH 2751/5331] Wrote manual pages for the nixos-deploy-network and
 nixos-build-vms commands

svn path=/nixos/trunk/; revision=25030
---
 doc/manual/man-nixos-build-vms.xml      | 147 ++++++++++++++++++++++++
 doc/manual/man-nixos-deploy-network.xml | 134 +++++++++++++++++++++
 doc/manual/man-pages.xml                |   3 +-
 3 files changed, 283 insertions(+), 1 deletion(-)
 create mode 100644 doc/manual/man-nixos-build-vms.xml
 create mode 100644 doc/manual/man-nixos-deploy-network.xml

diff --git a/doc/manual/man-nixos-build-vms.xml b/doc/manual/man-nixos-build-vms.xml
new file mode 100644
index 00000000000..3bbf9defb11
--- /dev/null
+++ b/doc/manual/man-nixos-build-vms.xml
@@ -0,0 +1,147 @@
+<refentry xmlns="http://docbook.org/ns/docbook"
+          xmlns:xlink="http://www.w3.org/1999/xlink"
+          xmlns:xi="http://www.w3.org/2001/XInclude">
+  
+<refmeta>
+  <refentrytitle><command>nixos-build-vms</command></refentrytitle>
+  <manvolnum>8</manvolnum>
+  <refmiscinfo class="source">NixOS</refmiscinfo>
+  <!-- <refmiscinfo class="version"><xi:include href="version.txt" parse="text"/></refmiscinfo> -->
+</refmeta>
+
+<refnamediv>
+  <refname><command>nixos-build-vms</command></refname>
+  <refpurpose>build a network of virtual machines from a network of NixOS configurations</refpurpose>
+</refnamediv>
+
+<refsynopsisdiv>
+  <cmdsynopsis>
+    <command>nixos-deploy-network</command>
+    <arg><option>--use-backdoor</option></arg>
+    <arg><option>--show-trace</option></arg>
+    <arg><option>--no-out-link</option></arg>
+    <arg><option>--help</option></arg>
+    <arg choice="plain"><replaceable>network.nix</replaceable></arg>
+  </cmdsynopsis>
+</refsynopsisdiv>
+
+<refsection><title>Description</title>
+
+<para>This command builds a network of QEMU-KVM virtual machines of a Nix expression
+specifying a network of NixOS machines. The virtual network can be started by
+executing the <filename>bin/run-vms</filename> shell script that is generated by
+this command. By default, a <filename>result</filename> symlink is produced that
+points to the generated virtual network.
+</para>
+
+<para>This command also provides the <option>--use-backdoor</option> option,
+which spawns UNIX domain sockets in the current working directory by using the
+<command>socat</command> command. This allows
+users to remotely script a generated virtual machine.</para>
+
+<para>A network Nix expression has the following structure:
+
+<screen>
+{
+  test1 = {pkgs, config, ...}:
+    {
+      services.openssh.enable = true;
+      nixpkgs.system = "i686-linux";
+      deployment.hostname = "test1.example.net";
+      
+      # Other NixOS options
+    };
+    
+  test2 = {pkgs, config, ...}:
+    {
+      services.openssh.enable = true;
+      services.httpd.enable = true;
+      environment.systemPackages = [ pkgs.lynx ];
+      nixpkgs.system = "x86_64-linux";
+      deployment.hostname = "test2.example.net";
+      
+      # Other NixOS options
+    };
+}
+</screen>
+
+Each attribute in the expression represents a machine in the network
+(e.g. <varname>test1</varname> and <varname>test2</varname>)
+referring to a function defining a NixOS configuration.
+In each NixOS configuration, two attributes have a special meaning.
+The <varname>deployment.hostname</varname> specifies the hostname
+of the system which is used by <command>ssh</command> to perform
+remote deployment operations. The <varname>nixpkgs.system</varname>
+attribute can be used to specify an architecture for the target machine,
+such as <varname>i686-linux</varname> which builds a 32-bit NixOS
+configuration. Omitting this property will build the configuration
+for the same architecture as the host system.
+</para>
+
+</refsection>
+
+<refsection><title>Options</title>
+
+<para>This command accepts the following options:</para>
+
+<variablelist>
+
+  <varlistentry>
+    <term><option>--use-backdoor</option></term>
+    <listitem>
+      <para>Indicates that the backdoor must be enabled so that the VMs can be
+      accessed through a UNIX domain socket. The UNIX domain sockets are
+      created in the current working directory.</para>
+    </listitem>
+  </varlistentry>
+
+  <varlistentry>
+    <term><option>--show-trace</option></term>
+    <listitem>
+      <para>Shows a trace of the output.</para>
+    </listitem>
+  </varlistentry>
+
+  <varlistentry>
+    <term><option>--no-out-link</option></term>
+    <listitem>
+      <para>Do not create a 'result' symlink.</para>
+    </listitem>
+  </varlistentry>
+
+  <varlistentry>
+    <term><option>-h</option>, <option>--help</option></term>
+    <listitem>
+      <para>Shows the usage of this command to the user.</para>
+    </listitem>
+  </varlistentry>
+
+</variablelist>
+
+</refsection>
+
+
+<refsection><title>Environment variables</title>
+
+<variablelist>
+
+  <varlistentry>
+    <term><envar>NIXOS</envar></term>
+    <listitem>
+      <para>Path to the NixOS source tree.  Defaults to
+      <filename>/etc/nixos/nixos</filename>.</para>
+    </listitem>
+  </varlistentry>
+
+  <varlistentry>
+    <term><envar>NIXPKGS_ALL</envar></term>
+    <listitem>
+      <para>Path to the Nixpkgs source tree.  Defaults to
+      <filename>/etc/nixos/nixpkgs</filename>.</para>
+    </listitem>
+  </varlistentry>
+</variablelist>
+
+</refsection>
+
+</refentry>
diff --git a/doc/manual/man-nixos-deploy-network.xml b/doc/manual/man-nixos-deploy-network.xml
new file mode 100644
index 00000000000..0a84ebefeea
--- /dev/null
+++ b/doc/manual/man-nixos-deploy-network.xml
@@ -0,0 +1,134 @@
+<refentry xmlns="http://docbook.org/ns/docbook"
+          xmlns:xlink="http://www.w3.org/1999/xlink"
+          xmlns:xi="http://www.w3.org/2001/XInclude">
+  
+<refmeta>
+  <refentrytitle><command>nixos-deploy-network</command></refentrytitle>
+  <manvolnum>8</manvolnum>
+  <refmiscinfo class="source">NixOS</refmiscinfo>
+  <!-- <refmiscinfo class="version"><xi:include href="version.txt" parse="text"/></refmiscinfo> -->
+</refmeta>
+
+<refnamediv>
+  <refname><command>nixos-deploy-network</command></refname>
+  <refpurpose>deploy a network of NixOS configurations into a network of machines</refpurpose>
+</refnamediv>
+
+<refsynopsisdiv>
+  <cmdsynopsis>
+    <command>nixos-deploy-network</command>
+    <arg><option>--show-trace</option></arg>
+    <arg><option>--no-out-link</option></arg>
+    <arg><option>--help</option></arg>
+    <arg choice="plain"><replaceable>network.nix</replaceable></arg>
+  </cmdsynopsis>
+</refsynopsisdiv>
+
+<refsection><title>Description</title>
+
+<para>This command automatically deploys a network of NixOS
+configurations into a network of machines.
+First, it tries to build all the system derivations defined
+in the network expression. Then it efficiently transfers
+the closures to the machines in the network. Finally, the configurations
+are activated. In case of a failure, a rollback is performed,
+which brings all the updated configurations back into the previous
+state.</para>
+
+<para>A network Nix expression has the following structure:
+
+<screen>
+{
+  test1 = {pkgs, config, ...}:
+    {
+      services.openssh.enable = true;
+      nixpkgs.system = "i686-linux";
+      deployment.hostname = "test1.example.net";
+      
+      # Other NixOS options
+    };
+    
+  test2 = {pkgs, config, ...}:
+    {
+      services.openssh.enable = true;
+      services.httpd.enable = true;
+      environment.systemPackages = [ pkgs.lynx ];
+      nixpkgs.system = "x86_64-linux";
+      deployment.hostname = "test2.example.net";
+      
+      # Other NixOS options
+    };
+}
+</screen>
+
+Each attribute in the expression represents a machine in the network
+(e.g. <varname>test1</varname> and <varname>test2</varname>)
+referring to a function defining a NixOS configuration.
+In each NixOS configuration, two attributes have a special meaning.
+The <varname>deployment.hostname</varname> specifies the hostname
+of the system which is used by <command>ssh</command> to perform
+remote deployment operations. The <varname>nixpkgs.system</varname>
+attribute can be used to specify an architecture for the target machine,
+such as <varname>i686-linux</varname> which builds a 32-bit NixOS
+configuration. Omitting this property will build the configuration
+for the same architecture as the host system.
+</para>
+
+</refsection>
+
+<refsection><title>Options</title>
+
+<para>This command accepts the following options:</para>
+
+<variablelist>
+
+  <varlistentry>
+    <term><option>--show-trace</option></term>
+    <listitem>
+      <para>Shows a trace of the output.</para>
+    </listitem>
+  </varlistentry>
+
+  <varlistentry>
+    <term><option>--no-out-link</option></term>
+    <listitem>
+      <para>Do not create a 'result' symlink.</para>
+    </listitem>
+  </varlistentry>
+
+  <varlistentry>
+    <term><option>-h</option>, <option>--help</option></term>
+    <listitem>
+      <para>Shows the usage of this command to the user.</para>
+    </listitem>
+  </varlistentry>
+
+</variablelist>
+
+</refsection>
+
+
+<refsection><title>Environment variables</title>
+
+<variablelist>
+
+  <varlistentry>
+    <term><envar>NIXOS</envar></term>
+    <listitem>
+      <para>Path to the NixOS source tree.  Defaults to
+      <filename>/etc/nixos/nixos</filename>.</para>
+    </listitem>
+  </varlistentry>
+
+  <varlistentry>
+    <term><envar>NIXPKGS_ALL</envar></term>
+    <listitem>
+      <para>Path to the Nixpkgs source tree.  Defaults to
+      <filename>/etc/nixos/nixpkgs</filename>.</para>
+    </listitem>
+  </varlistentry>
+</variablelist>
+
+</refsection>
+
+</refentry>
diff --git a/doc/manual/man-pages.xml b/doc/manual/man-pages.xml
index e3b3a5bc289..ffe0100c5ed 100644
--- a/doc/manual/man-pages.xml
+++ b/doc/manual/man-pages.xml
@@ -26,5 +26,6 @@
   <xi:include href="man-configuration.xml" />
   <xi:include href="man-nixos-rebuild.xml" />
   <xi:include href="man-nixos-option.xml" />
-
+  <xi:include href="man-nixos-deploy-network.xml" />
+  <xi:include href="man-nixos-build-vms.xml" />
 </reference>
-- 
GitLab


From 11d2cd78e0e0f433b30a80339a7e1fbec1cc073d Mon Sep 17 00:00:00 2001
From: Sander van der Burg <s.vanderburg@tudelft.nl>
Date: Tue, 7 Dec 2010 20:13:50 +0000
Subject: [PATCH 2752/5331] - deployment.targetHost is now used for connecting
 to remote hosts instead of deployment.hostname. This makes more sense. -
 fixed error in the manual (nixos-deploy-network => nixos-build-vms)

svn path=/nixos/trunk/; revision=25031
---
 doc/manual/man-nixos-build-vms.xml                      | 9 +++++----
 doc/manual/man-nixos-deploy-network.xml                 | 7 ++++---
 modules/installer/tools/nixos-deploy-network/deploy.nix | 2 +-
 3 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/doc/manual/man-nixos-build-vms.xml b/doc/manual/man-nixos-build-vms.xml
index 3bbf9defb11..1650f33064f 100644
--- a/doc/manual/man-nixos-build-vms.xml
+++ b/doc/manual/man-nixos-build-vms.xml
@@ -16,7 +16,7 @@
 
 <refsynopsisdiv>
   <cmdsynopsis>
-    <command>nixos-deploy-network</command>
+    <command>nixos-build-vms</command>
     <arg><option>--use-backdoor</option></arg>
     <arg><option>--show-trace</option></arg>
     <arg><option>--no-out-link</option></arg>
@@ -47,7 +47,7 @@ users to remotely script a generated virtual machine.</para>
     {
       services.openssh.enable = true;
       nixpkgs.system = "i686-linux";
-      deployment.hostname = "test1.example.net";
+      deployment.targetHost = "test1.example.net";
       
       # Other NixOS options
     };
@@ -58,7 +58,7 @@ users to remotely script a generated virtual machine.</para>
       services.httpd.enable = true;
       environment.systemPackages = [ pkgs.lynx ];
       nixpkgs.system = "x86_64-linux";
-      deployment.hostname = "test2.example.net";
+      deployment.targetHost = "test2.example.net";
       
       # Other NixOS options
     };
@@ -69,7 +69,8 @@ Each attribute in the expression represents a machine in the network
 (e.g. <varname>test1</varname> and <varname>test2</varname>)
 referring to a function defining a NixOS configuration.
 In each NixOS configuration, two attributes have a special meaning.
-The <varname>deployment.hostname</varname> specifies the hostname
+The <varname>deployment.targetHost</varname> specifies the address
+(domain name or IP address)
 of the system which is used by <command>ssh</command> to perform
 remote deployment operations. The <varname>nixpkgs.system</varname>
 attribute can be used to specify an architecture for the target machine,
diff --git a/doc/manual/man-nixos-deploy-network.xml b/doc/manual/man-nixos-deploy-network.xml
index 0a84ebefeea..2a1f78f6ff8 100644
--- a/doc/manual/man-nixos-deploy-network.xml
+++ b/doc/manual/man-nixos-deploy-network.xml
@@ -43,7 +43,7 @@ state.</para>
     {
       services.openssh.enable = true;
       nixpkgs.system = "i686-linux";
-      deployment.hostname = "test1.example.net";
+      deployment.targetHost = "test1.example.net";
       
       # Other NixOS options
     };
@@ -54,7 +54,7 @@ state.</para>
       services.httpd.enable = true;
       environment.systemPackages = [ pkgs.lynx ];
       nixpkgs.system = "x86_64-linux";
-      deployment.hostname = "test2.example.net";
+      deployment.targetHost = "test2.example.net";
       
       # Other NixOS options
     };
@@ -65,7 +65,8 @@ Each attribute in the expression represents a machine in the network
 (e.g. <varname>test1</varname> and <varname>test2</varname>)
 referring to a function defining a NixOS configuration.
 In each NixOS configuration, two attributes have a special meaning.
-The <varname>deployment.hostname</varname> specifies the hostname
+The <varname>deployment.targetHost</varname> specifies the address
+(domain name or IP address)
 of the system which is used by <command>ssh</command> to perform
 remote deployment operations. The <varname>nixpkgs.system</varname>
 attribute can be used to specify an architecture for the target machine,
diff --git a/modules/installer/tools/nixos-deploy-network/deploy.nix b/modules/installer/tools/nixos-deploy-network/deploy.nix
index 630be914d4b..bf2f88b831a 100644
--- a/modules/installer/tools/nixos-deploy-network/deploy.nix
+++ b/modules/installer/tools/nixos-deploy-network/deploy.nix
@@ -1,7 +1,7 @@
 { nixos ? /etc/nixos/nixos
 , nixpkgs ? /etc/nixos/nixpkgs
 , networkExpr
-, targetProperty ? "hostname"
+, targetProperty ? "targetHost"
 }:
 
 let
-- 
GitLab


From c318bd097e61fb5655eeaf8290797c70b3540be9 Mon Sep 17 00:00:00 2001
From: Sander van der Burg <s.vanderburg@tudelft.nl>
Date: Wed, 8 Dec 2010 14:30:55 +0000
Subject: [PATCH 2753/5331] Fixed the --no-out-link option

svn path=/nixos/trunk/; revision=25034
---
 modules/installer/tools/nixos-build-vms/nixos-build-vms.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/installer/tools/nixos-build-vms/nixos-build-vms.sh b/modules/installer/tools/nixos-build-vms/nixos-build-vms.sh
index 88dfff6cec6..681ec0387c8 100644
--- a/modules/installer/tools/nixos-build-vms/nixos-build-vms.sh
+++ b/modules/installer/tools/nixos-build-vms/nixos-build-vms.sh
@@ -15,7 +15,7 @@ showUsage()
 
 # Parse valid argument options
 
-PARAMS=`getopt -n $0 -o h -l use-backdoor,show-trace,help -- "$@"`
+PARAMS=`getopt -n $0 -o h -l use-backdoor,no-out-link,show-trace,help -- "$@"`
 
 if [ $? != 0 ]
 then
-- 
GitLab


From ef243b7fc26ecd68459ca48bbabf323b4384a202 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 8 Dec 2010 19:46:52 +0000
Subject: [PATCH 2754/5331] * Fix a syntax error in the sleep hook that broke
 suspend.

svn path=/nixos/trunk/; revision=25038
---
 modules/config/power-management.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/config/power-management.nix b/modules/config/power-management.nix
index 6baefa12791..97b7f61c473 100644
--- a/modules/config/power-management.nix
+++ b/modules/config/power-management.nix
@@ -18,7 +18,7 @@ let
               ${cfg.resumeCommands}
               ${cfg.powerUpCommands}
               ;;
-      fi
+      esac
     '';
 
 in
-- 
GitLab


From 05c25d3fb2ae7de877695593a4189c0d4c23fab3 Mon Sep 17 00:00:00 2001
From: Tobias Hammerschmidt <tobias.hammerschmidt@gmx.de>
Date: Thu, 9 Dec 2010 19:08:33 +0000
Subject: [PATCH 2755/5331] =?UTF-8?q?check=20for=20broadcom=20wireless=20d?=
 =?UTF-8?q?river=20-=20patch=20by=20Vladim=C3=ADr=20=C4=8Cun=C3=A1t?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

svn path=/nixos/trunk/; revision=25045
---
 .../installer/tools/nixos-hardware-scan.pl    | 23 +++++++++++++++++--
 1 file changed, 21 insertions(+), 2 deletions(-)

diff --git a/modules/installer/tools/nixos-hardware-scan.pl b/modules/installer/tools/nixos-hardware-scan.pl
index 56549f99235..b26358e1078 100644
--- a/modules/installer/tools/nixos-hardware-scan.pl
+++ b/modules/installer/tools/nixos-hardware-scan.pl
@@ -7,6 +7,7 @@ use File::Basename;
 my @attrs = ();
 my @kernelModules = ();
 my @initrdKernelModules = ();
+my @modulePackages = ();
 
 
 sub debug {
@@ -93,6 +94,19 @@ sub pciCheck {
         }
     }
 
+    # broadcom STA driver (wl.ko)
+    # list taken from http://www.broadcom.com/docs/linux_sta/README.txt
+    if ($vendor eq "0x14e4" &&
+        ($device eq "0x4311" || $device eq "0x4312" || $device eq "0x4313" ||
+         $device eq "0x4315" || $device eq "0x4327" || $device eq "0x4328" ||
+         $device eq "0x4329" || $device eq "0x432a" || $device eq "0x432b" ||
+         $device eq "0x432c" || $device eq "0x432d" || $device eq "0x4353" ||
+         $device eq "0x4357") )
+     {
+        push @modulePackages, "kernelPackages.broadcom_sta";
+        push @kernelModules, "wl";
+     }
+
     # Can't rely on $module here, since the module may not be loaded
     # due to missing firmware.  Ideally we would check modules.pcimap
     # here.
@@ -222,6 +236,7 @@ sub multiLineList {
 
 my $initrdKernelModules = toNixExpr(removeDups @initrdKernelModules);
 my $kernelModules = toNixExpr(removeDups @kernelModules);
+my $modulePackages = toNixExpr(removeDups @modulePackages);
 my $attrs = multiLineList("  ", removeDups @attrs);
 
 print <<EOF ;
@@ -235,8 +250,12 @@ print <<EOF ;
     "\${modulesPath}/installer/scan/not-detected.nix"
   ];
 
-  boot.initrd.kernelModules = [ $initrdKernelModules ];
-  boot.kernelModules = [ $kernelModules ];
+  boot = rec {
+    initrd.kernelModules = [ $initrdKernelModules ];
+    kernelModules = [ $kernelModules ];
+    kernelPackages = pkgs.linuxPackages;
+    extraModulePackages = [ $modulePackages ];
+  };
 
   nix.maxJobs = $cpus;
 
-- 
GitLab


From e51fcac73c16a85807905da3f09f94ab575a8e19 Mon Sep 17 00:00:00 2001
From: Sander van der Burg <s.vanderburg@tudelft.nl>
Date: Fri, 10 Dec 2010 14:22:00 +0000
Subject: [PATCH 2756/5331] - deployment.targetHost is now defined as an option
 - developed services.disnix.infrastructure option, which contains properties
 for the Disnix infrastructure model (these properties can be either used by
 Disnix itself or the Avahi publisher)

svn path=/nixos/trunk/; revision=25052
---
 modules/misc/deployment.nix      | 18 ++----
 modules/services/misc/disnix.nix | 95 +++++++++++++++++++++-----------
 2 files changed, 68 insertions(+), 45 deletions(-)

diff --git a/modules/misc/deployment.nix b/modules/misc/deployment.nix
index 08559cc2a16..2e0d9d2d082 100644
--- a/modules/misc/deployment.nix
+++ b/modules/misc/deployment.nix
@@ -5,18 +5,12 @@ with pkgs.lib;
 {
   options = {
 
-    deployment = mkOption {
-      description = ''
-        This option captures various custom attributes related to the configuration of the system, which
-        are not directly used for building a system configuration. Usually these attributes
-        are used by external tooling, such as the nixos-deploy-network tool or the Disnix Avahi
-        publisher.
-      '';
-      default = {};
-      example = {
-        description = "My production machine";
-	hostname = "my.test.org";
-	country = "NL";
+    deployment = {
+      targetHost = mkOption {
+        description = ''
+          This option specifies a hostname or IP address which can be used by nixos-deploy-network
+	  to execute remote deployment operations.
+        '';
       };
     };
   };
diff --git a/modules/services/misc/disnix.nix b/modules/services/misc/disnix.nix
index dee19b0577a..20cbe9b9f40 100644
--- a/modules/services/misc/disnix.nix
+++ b/modules/services/misc/disnix.nix
@@ -34,6 +34,23 @@ in
 	description = "Whether to enable the DisnixWebService interface running on Apache Tomcat";
       };
       
+      publishInfrastructure = {
+        enable = mkOption {
+          default = false;
+	  description = "Whether to publish capabilities/properties of this machine in as attributes in the infrastructure option";
+	};
+	
+	enableAuthentication = mkOption {
+	  default = false;
+	  description = "Whether to publish authentication credentials through the infrastructure attribute (not recommended in combination with Avahi)";
+	};
+      };            
+      
+      infrastructure = mkOption {
+        default = {};
+	description = "List of name value pairs containing properties for the infrastructure model";
+      };
+      
       publishAvahi = mkOption {
         default = false;
 	description = "Whether to publish capabilities/properties as a Disnix service through Avahi";
@@ -47,62 +64,74 @@ in
   ###### implementation
 
   config = mkIf cfg.enable {
-
     environment.systemPackages = [ pkgs.disnix ] ++ optional cfg.useWebServiceInterface pkgs.DisnixWebService;
 
     services.dbus.enable = true;
     services.dbus.packages = [ pkgs.disnix ];
 
+    services.avahi.enable = cfg.publishAvahi;
+
     services.tomcat.enable = cfg.useWebServiceInterface;
     services.tomcat.extraGroups = [ "disnix" ];
     services.tomcat.javaOpts = "${optionalString cfg.useWebServiceInterface "-Djava.library.path=${pkgs.libmatthew_java}/lib/jni"} ";
-    services.tomcat.sharedLibs = []
-                                 ++ optional cfg.useWebServiceInterface "${pkgs.DisnixWebService}/share/java/DisnixConnection.jar"
+    services.tomcat.sharedLibs = optional cfg.useWebServiceInterface "${pkgs.DisnixWebService}/share/java/DisnixConnection.jar"
 				 ++ optional cfg.useWebServiceInterface "${pkgs.dbus_java}/share/java/dbus.jar";
-    services.tomcat.webapps = [] ++ optional cfg.useWebServiceInterface pkgs.DisnixWebService;
+    services.tomcat.webapps = optional cfg.useWebServiceInterface pkgs.DisnixWebService;
 
     users.extraGroups = singleton
       { name = "disnix";
         gid = config.ids.gids.disnix;
       };
-      
-    jobs.disnix =
-      { description = "Disnix server";
+    
+    services.disnix.infrastructure =
+      optionalAttrs (cfg.publishInfrastructure.enable)
+      ( { hostname = config.networking.hostName;
+          targetHost = config.deployment.targetHost;
+        }
+        // optionalAttrs (config.nixpkgs.system != "") { system = config.nixpkgs.system; }
+        // optionalAttrs (cfg.useWebServiceInterface) { targetEPR = "http://${config.deployment.targetHost}:8080/DisnixWebService/services/DisnixWebService"; }
+        // optionalAttrs (config.services.httpd.enable) { documentRoot = config.services.httpd.documentRoot; }
+        // optionalAttrs (config.services.mysql.enable) { mysqlPort = config.services.mysql.port; }
+        // optionalAttrs (config.services.tomcat.enable) { tomcatPort = 8080; }
+	// optionalAttrs (cfg.publishInfrastructure.enableAuthentication) (
+          optionalAttrs (config.services.mysql.enable) { mysqlUsername = "root"; mysqlPassword = builtins.readFile config.services.mysql.rootPassword; }) 
+	)
+    ;
+    
+    jobs = {
+      disnix =
+        { description = "Disnix server";
 
-        startOn = "started dbus";
+          startOn = "started dbus";
 
-        script =
+          script =
           ''
 	    export PATH=/var/run/current-system/sw/bin:/var/run/current-system/sw/sbin
             export HOME=/root
 
             ${pkgs.disnix}/bin/disnix-service --activation-modules-dir=${disnix_activation_scripts}/libexec/disnix/activation-scripts
           '';
-      };
-
-  } //
-  mkIf cfg.publishAvahi {
-  
-    services.avahi.enable = true;
-  
-    jobs.disnixAvahi =
-      { description = "Disnix Avahi publisher";
+        };
+    } // optionalAttrs cfg.publishAvahi {
+      disnixAvahi =
+        { description = "Disnix Avahi publisher";
       
-        startOn = "started avahi-daemon";
+          startOn = "started avahi-daemon";
 	
-	exec =
-        ''
-          ${pkgs.avahi}/bin/avahi-publish-service disnix-$(${pkgs.nettools}/bin/hostname) _disnix._tcp 22 \
-            "hostname=\"$(${pkgs.nettools}/bin/hostname)\"" \
-	    "system=\"$(uname -m)-linux\"" \
-	    "mem=$(grep 'MemTotal:' /proc/meminfo | sed -e 's/kB//' -e 's/MemTotal://' -e 's/ //g')" \
-	    ${optionalString (cfg.useWebServiceInterface) ''"targetEPR=\"http://(${pkgs.nettools}/bin/hostname):8080/DisnixWebService/services/DisnixWebService\""''} \
-            ${optionalString (config.services.httpd.enable) ''"documentRoot=\"${config.services.httpd.documentRoot}\""''} \
-            ${optionalString (config.services.mysql.enable) ''"mysqlPort=3306"''} \
-            ${optionalString (config.services.tomcat.enable) ''"tomcatPort=8080"''} \
-            "supportedTypes=[$(for i in ${disnix_activation_scripts}/libexec/disnix/activation-scripts/*; do echo -n " \"$(basename $i)\""; done) ]" \
-	    ${concatMapStrings (deploymentAttrName: let deploymentAttrValue = getAttr deploymentAttrName (config.deployment); in ''${deploymentAttrName}=\"${deploymentAttrValue}\" '' ) (attrNames (config.deployment))}
-        '';
-      };
+	  exec =
+          ''
+            ${pkgs.avahi}/bin/avahi-publish-service disnix-$(${pkgs.nettools}/bin/hostname) _disnix._tcp 22 \
+              "hostname=\"$(${pkgs.nettools}/bin/hostname)\"" \
+	      "system=\"$(uname -m)-linux\"" \
+	      "mem=$(grep 'MemTotal:' /proc/meminfo | sed -e 's/kB//' -e 's/MemTotal://' -e 's/ //g')" \
+	      ${optionalString (cfg.useWebServiceInterface) ''"targetEPR=\"http://(${pkgs.nettools}/bin/hostname):8080/DisnixWebService/services/DisnixWebService\""''} \
+              ${optionalString (config.services.httpd.enable) ''"documentRoot=\"${config.services.httpd.documentRoot}\""''} \
+              ${optionalString (config.services.mysql.enable) ''"mysqlPort=3306"''} \
+              ${optionalString (config.services.tomcat.enable) ''"tomcatPort=8080"''} \
+              "supportedTypes=[$(for i in ${disnix_activation_scripts}/libexec/disnix/activation-scripts/*; do echo -n " \"$(basename $i)\""; done) ]" \
+	      ${concatMapStrings (deploymentAttrName: let deploymentAttrValue = getAttr deploymentAttrName (config.deployment); in ''${deploymentAttrName}=\"${deploymentAttrValue}\" '' ) (attrNames (config.deployment))}
+          '';
+        };
+    };
   };
 }
-- 
GitLab


From b3c4444c26680683e839a8baf6ab67c25ab77f47 Mon Sep 17 00:00:00 2001
From: Sander van der Burg <s.vanderburg@tudelft.nl>
Date: Fri, 10 Dec 2010 15:39:41 +0000
Subject: [PATCH 2757/5331] The targetHost property defaults to the hostName of
 the system if not defined

svn path=/nixos/trunk/; revision=25057
---
 modules/misc/deployment.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/modules/misc/deployment.nix b/modules/misc/deployment.nix
index 2e0d9d2d082..eead0f40bec 100644
--- a/modules/misc/deployment.nix
+++ b/modules/misc/deployment.nix
@@ -7,6 +7,7 @@ with pkgs.lib;
 
     deployment = {
       targetHost = mkOption {
+        default = config.networking.hostName;
         description = ''
           This option specifies a hostname or IP address which can be used by nixos-deploy-network
 	  to execute remote deployment operations.
-- 
GitLab


From 281f3b077607860ea5ba6e77c144f2f4b1418ec7 Mon Sep 17 00:00:00 2001
From: Sander van der Burg <s.vanderburg@tudelft.nl>
Date: Fri, 10 Dec 2010 23:58:57 +0000
Subject: [PATCH 2758/5331] Fixed the avahi service and do some better
 formatting of the key=value pairs

svn path=/nixos/trunk/; revision=25060
---
 modules/services/misc/disnix.nix | 23 ++++++++++++++---------
 1 file changed, 14 insertions(+), 9 deletions(-)

diff --git a/modules/services/misc/disnix.nix b/modules/services/misc/disnix.nix
index 20cbe9b9f40..ef4d7922e98 100644
--- a/modules/services/misc/disnix.nix
+++ b/modules/services/misc/disnix.nix
@@ -87,8 +87,8 @@ in
       optionalAttrs (cfg.publishInfrastructure.enable)
       ( { hostname = config.networking.hostName;
           targetHost = config.deployment.targetHost;
+	  system = if config.nixpkgs.system == "" then builtins.currentSystem else config.nixpkgs.system;
         }
-        // optionalAttrs (config.nixpkgs.system != "") { system = config.nixpkgs.system; }
         // optionalAttrs (cfg.useWebServiceInterface) { targetEPR = "http://${config.deployment.targetHost}:8080/DisnixWebService/services/DisnixWebService"; }
         // optionalAttrs (config.services.httpd.enable) { documentRoot = config.services.httpd.documentRoot; }
         // optionalAttrs (config.services.mysql.enable) { mysqlPort = config.services.mysql.port; }
@@ -98,6 +98,8 @@ in
 	)
     ;
     
+    services.disnix.publishInfrastructure.enable = cfg.publishAvahi;
+    
     jobs = {
       disnix =
         { description = "Disnix server";
@@ -120,16 +122,19 @@ in
 	
 	  exec =
           ''
-            ${pkgs.avahi}/bin/avahi-publish-service disnix-$(${pkgs.nettools}/bin/hostname) _disnix._tcp 22 \
-              "hostname=\"$(${pkgs.nettools}/bin/hostname)\"" \
-	      "system=\"$(uname -m)-linux\"" \
+            ${pkgs.avahi}/bin/avahi-publish-service disnix-${config.networking.hostName} _disnix._tcp 22 \
 	      "mem=$(grep 'MemTotal:' /proc/meminfo | sed -e 's/kB//' -e 's/MemTotal://' -e 's/ //g')" \
-	      ${optionalString (cfg.useWebServiceInterface) ''"targetEPR=\"http://(${pkgs.nettools}/bin/hostname):8080/DisnixWebService/services/DisnixWebService\""''} \
-              ${optionalString (config.services.httpd.enable) ''"documentRoot=\"${config.services.httpd.documentRoot}\""''} \
-              ${optionalString (config.services.mysql.enable) ''"mysqlPort=3306"''} \
-              ${optionalString (config.services.tomcat.enable) ''"tomcatPort=8080"''} \
               "supportedTypes=[$(for i in ${disnix_activation_scripts}/libexec/disnix/activation-scripts/*; do echo -n " \"$(basename $i)\""; done) ]" \
-	      ${concatMapStrings (deploymentAttrName: let deploymentAttrValue = getAttr deploymentAttrName (config.deployment); in ''${deploymentAttrName}=\"${deploymentAttrValue}\" '' ) (attrNames (config.deployment))}
+	      ${concatMapStrings (infrastructureAttrName:
+	        let infrastructureAttrValue = getAttr infrastructureAttrName (cfg.infrastructure);
+		in
+		if builtins.isInt infrastructureAttrValue then
+		''${infrastructureAttrName}=${infrastructureAttrValue} \
+		''
+		else
+                ''${infrastructureAttrName}=\"${infrastructureAttrValue}\" \
+                ''
+		) (attrNames (cfg.infrastructure))}
           '';
         };
     };
-- 
GitLab


From 47157986f2f7215e2dad66c85d74856723256a94 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 13 Dec 2010 08:53:43 +0000
Subject: [PATCH 2759/5331] * Unbreak the NixOS installer tests.

svn path=/nixos/trunk/; revision=25096
---
 tests/installer.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/installer.nix b/tests/installer.nix
index 4dcb08f7076..eead83053ed 100644
--- a/tests/installer.nix
+++ b/tests/installer.nix
@@ -93,7 +93,7 @@ let
     ''
       createDisk("harddisk", 4 * 1024);
 
-      my $machine = Machine->new({ hda => "harddisk", cdrom => glob("${iso}/iso/*.iso"), qemuFlags => '${qemuNICFlags 1 1}' });
+      my $machine = Machine->new({ hda => "harddisk", cdrom => glob("${iso}/iso/*.iso"), qemuFlags => '${qemuNICFlags 1 1 1}' });
       $machine->start;
 
       ${optionalString testChannel ''
-- 
GitLab


From 332f0418f7baa07a559f0c35b607fea979720066 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 14 Dec 2010 11:48:07 +0000
Subject: [PATCH 2760/5331] * Make `services.sshd.enable' an alias rather than
 an obsolete option.   It's really an abstract configuration option that
 specifies that *some*   SSH daemon should be enabled (which could be
 OpenSSH).

svn path=/nixos/trunk/; revision=25119
---
 modules/rename.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/rename.nix b/modules/rename.nix
index ebad3821270..9f1d00dd648 100644
--- a/modules/rename.nix
+++ b/modules/rename.nix
@@ -79,7 +79,7 @@ in zipModules ([]
 
 # OpenSSH
 ++ rename obsolete "services.sshd.ports" "services.openssh.ports"
-++ rename obsolete "services.sshd.enable" "services.openssh.enable"
+++ rename alias "services.sshd.enable" "services.openssh.enable"
 ++ rename obsolete "services.sshd.allowSFTP" "services.openssh.allowSFTP"
 ++ rename obsolete "services.sshd.forwardX11" "services.openssh.forwardX11"
 ++ rename obsolete "services.sshd.gatewayPorts" "services.openssh.gatewayPorts"
-- 
GitLab


From 37a9ffffb04330efbc40acda6520340d3db73494 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 14 Dec 2010 13:36:54 +0000
Subject: [PATCH 2761/5331] * Provide a default hostname and deployment target
 equal to the   attribute name of the machine in the model.  This allows  
 networking.hostName and deployment.targetHost to be omitted for   typical
 networks.

svn path=/nixos/trunk/; revision=25125
---
 .../tools/nixos-deploy-network/deploy.nix         | 13 ++++++++++---
 modules/misc/deployment.nix                       | 15 ++++++---------
 2 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/modules/installer/tools/nixos-deploy-network/deploy.nix b/modules/installer/tools/nixos-deploy-network/deploy.nix
index bf2f88b831a..c060ce41756 100644
--- a/modules/installer/tools/nixos-deploy-network/deploy.nix
+++ b/modules/installer/tools/nixos-deploy-network/deploy.nix
@@ -70,11 +70,18 @@ let
       { name = configurationName;
         value = (import "${nixos}/lib/eval-config.nix" {
           inherit nixpkgs;
-          modules = [ configuration ];
+          modules =
+            [ configuration
+              # Provide a default hostname and deployment target equal
+              # to the attribute name of the machine in the model.
+              { key = "set-default-hostname";
+                networking.hostName = pkgs.lib.mkOverride 900 configurationName;
+                deployment.targetHost = pkgs.lib.mkOverride 900 configurationName;
+              }
+            ];
           extraArgs = evaluateMachines network;
         }).config; }
-    ) (attrNames (network)))
-  ;
+    ) (attrNames (network)));
 
   configs = evaluateMachines network;
 in
diff --git a/modules/misc/deployment.nix b/modules/misc/deployment.nix
index eead0f40bec..91a0e9040dd 100644
--- a/modules/misc/deployment.nix
+++ b/modules/misc/deployment.nix
@@ -4,15 +4,12 @@ with pkgs.lib;
 
 {
   options = {
-
-    deployment = {
-      targetHost = mkOption {
-        default = config.networking.hostName;
-        description = ''
-          This option specifies a hostname or IP address which can be used by nixos-deploy-network
-	  to execute remote deployment operations.
-        '';
-      };
+    deployment.targetHost = mkOption {
+      default = config.networking.hostName;
+      description = ''
+        This option specifies a hostname or IP address which can be used by nixos-deploy-network
+        to execute remote deployment operations.
+      '';
     };
   };
 }
-- 
GitLab


From 652a22f0dac0e45d1bfb0dafe954c9eb2f659b88 Mon Sep 17 00:00:00 2001
From: Evgeny Egorochkin <phreedom.stdin@gmail.com>
Date: Wed, 15 Dec 2010 02:19:44 +0000
Subject: [PATCH 2762/5331] Ghost One: packaged.

svn path=/nixos/trunk/; revision=25136
---
 modules/misc/ids.nix                 |   2 +
 modules/module-list.nix              |   1 +
 modules/services/games/ghost-one.nix | 103 +++++++++++++++++++++++++++
 3 files changed, 106 insertions(+)
 create mode 100644 modules/services/games/ghost-one.nix

diff --git a/modules/misc/ids.nix b/modules/misc/ids.nix
index f8219c23068..22e62348394 100644
--- a/modules/misc/ids.nix
+++ b/modules/misc/ids.nix
@@ -58,6 +58,7 @@ in
     foldingAtHome = 37;
     sabnzbd = 38;
     kdm = 39;
+    ghostOne = 40;
     # When adding a uid, make sure it doesn't match an existing gid.
 
     nixbld = 30000; # start of range of uids
@@ -98,6 +99,7 @@ in
     privoxy = 32;
     disnix = 33;
     osgi = 34;
+    ghostOne = 40;
     # When adding a gid, make sure it doesn't match an existing uid.
 
     users = 100;
diff --git a/modules/module-list.nix b/modules/module-list.nix
index 0c7b9b6592f..20ed8d08568 100644
--- a/modules/module-list.nix
+++ b/modules/module-list.nix
@@ -52,6 +52,7 @@
   ./services/backup/sitecopy-backup.nix
   ./services/databases/mysql.nix
   ./services/databases/postgresql.nix
+  ./services/games/ghost-one.nix
   ./services/hardware/acpid.nix
   ./services/hardware/bluetooth.nix
   ./services/hardware/hal.nix
diff --git a/modules/services/games/ghost-one.nix b/modules/services/games/ghost-one.nix
new file mode 100644
index 00000000000..2b4610df29c
--- /dev/null
+++ b/modules/services/games/ghost-one.nix
@@ -0,0 +1,103 @@
+{pkgs, config, ...}:
+with pkgs.lib;
+let
+
+  cfg = config.services.ghostOne;
+  ghostUser = "ghostone";
+  stateDir = "/var/lib/ghost-one";
+in
+{
+
+  ###### interface
+  
+  options = {
+    services.ghostOne = {
+
+      enable = mkOption {
+        default = false;
+        description = "Enable Ghost-One Warcraft3 game hosting server.";
+      };
+
+      language = mkOption {
+        default = "English";
+        description = "The language of bot messages: English, Spanish, Russian, Serbian or Turkish.";
+      };
+      
+      war3path = mkOption {
+        default = "";
+        description = ''
+          The path to your local Warcraft III directory, which must contain war3.exe, storm.dll, and game.dll.
+        '';
+      };
+
+      mappath = mkOption {
+        default = "";
+        description = ''
+          The path to the directory where you keep your map files. GHost One doesn't require
+          map files but if it has access to them it can send them to players and automatically
+          calculate most map config values. GHost One will search [bot_mappath + map_localpath]
+          for the map file (map_localpath is set in each map's config file).
+        '';
+      };
+
+      config = mkOption {
+        default = "";
+        description = "Extra configuration options.";
+      };
+
+    };
+  };
+
+  ###### implementation
+
+  config = mkIf cfg.enable {
+
+    users.extraUsers = singleton
+      { name = ghostUser;
+        uid = config.ids.uids.ghostOne;
+        description = "Ghost One game server user";
+        home = stateDir;
+      };
+
+    users.extraGroups = singleton
+      { name = ghostUser;
+        gid = config.ids.gids.ghostOne;
+      };
+
+    services.ghostOne.config = ''
+#      bot_log = /dev/stderr
+      bot_language = ${pkgs.ghostOne}/share/ghost-one/languages/${cfg.language}.cfg
+      bot_war3path = ${cfg.war3path}
+
+      bot_mapcfgpath = mapcfgs
+      bot_savegamepath = savegames
+      bot_mappath = ${cfg.mappath}
+      bot_replaypath = replays
+    '';
+
+    jobs.ghostOne = {
+      name = "ghost-one";
+      script = ''
+        mkdir -p ${stateDir}
+        cd ${stateDir}
+        chown ${ghostUser}:${ghostUser} .
+
+        mkdir -p mapcfgs
+        chown ${ghostUser}:${ghostUser} mapcfgs
+
+        mkdir -p replays
+        chown ${ghostUser}:${ghostUser} replays
+
+        mkdir -p savegames
+        chown ${ghostUser}:${ghostUser} savegames
+
+        ln -sf ${pkgs.writeText "ghost.cfg" cfg.config} ghost.cfg
+        ln -sf ${pkgs.ghostOne}/share/ghost-one/ip-to-country.csv
+        ${pkgs.su}/bin/su -s ${pkgs.stdenv.shell} ${ghostUser} \
+          -c "LANG=C ${pkgs.ghostOne}/bin/ghost++"
+      '';
+    };
+
+  };
+
+}
\ No newline at end of file
-- 
GitLab


From 6039c22da407ec96e36e6712cf450b5d83f13c40 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 15 Dec 2010 12:10:17 +0000
Subject: [PATCH 2763/5331] svn path=/nixos/trunk/; revision=25141

---
 tests/nfs.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/nfs.nix b/tests/nfs.nix
index db91179aca2..c8ead3d8930 100644
--- a/tests/nfs.nix
+++ b/tests/nfs.nix
@@ -4,7 +4,7 @@ let
 
   client = 
     { config, pkgs, ... }:
-    { fileSystems = pkgs.lib.mkOverrideTemplate 50 {} 
+    { fileSystems = pkgs.lib.mkOverride 50 
         [ { mountPoint = "/data";
             device = "server:/data";
             fsType = "nfs";
-- 
GitLab


From 0887471e4ea9ca982075bf1a338834325031e40f Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 15 Dec 2010 12:53:44 +0000
Subject: [PATCH 2764/5331] * Mediawiki 1.15.5.

svn path=/nixos/trunk/; revision=25144
---
 modules/services/web-servers/apache-httpd/mediawiki.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/services/web-servers/apache-httpd/mediawiki.nix b/modules/services/web-servers/apache-httpd/mediawiki.nix
index bbd407043c8..784f560ee37 100644
--- a/modules/services/web-servers/apache-httpd/mediawiki.nix
+++ b/modules/services/web-servers/apache-httpd/mediawiki.nix
@@ -63,11 +63,11 @@ let
 
   # Unpack Mediawiki and put the config file in its root directory.
   mediawikiRoot = pkgs.stdenv.mkDerivation rec {
-    name= "mediawiki-1.15.4";
+    name= "mediawiki-1.15.5";
     
     src = pkgs.fetchurl {
       url = "http://download.wikimedia.org/mediawiki/1.15/${name}.tar.gz";
-      sha256 = "1blf79lhnaxixc8z96f9z4xi2jlg906ps3kd4x8b9ipg2dgl3vy9";
+      sha256 = "1d8afbdh3lsg54b69mnh6a47psb3lg978xpp277qs08yz15cjf7q";
     };
 
     buildPhase = "true";
-- 
GitLab


From ec16a59845a8b94e1952e93307d65dc18086bc1d Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 15 Dec 2010 13:21:21 +0000
Subject: [PATCH 2765/5331] * Support file uploads in MediaWiki.

svn path=/nixos/trunk/; revision=25145
---
 .../web-servers/apache-httpd/mediawiki.nix    | 26 +++++++++++++++++++
 1 file changed, 26 insertions(+)

diff --git a/modules/services/web-servers/apache-httpd/mediawiki.nix b/modules/services/web-servers/apache-httpd/mediawiki.nix
index 784f560ee37..4b005a1b1cd 100644
--- a/modules/services/web-servers/apache-httpd/mediawiki.nix
+++ b/modules/services/web-servers/apache-httpd/mediawiki.nix
@@ -57,6 +57,11 @@ let
           $wgArticlePath = "${config.articleUrlPrefix}/$1";
         ''}
 
+        ${optionalString config.enableUploads ''
+          $wgEnableUploads = true;
+          $wgUploadDirectory = "${config.uploadDir}";
+        ''}
+
         ${config.extraConfig}
       ?>
     '';
@@ -96,6 +101,16 @@ in
 
   extraConfig =
     ''
+      ${optionalString config.enableUploads ''
+        Alias ${config.urlPrefix}/images ${config.uploadDir}
+
+        <Directory ${config.uploadDir}>
+            Order allow,deny
+            Allow from all
+            Options -Indexes
+        </Directory>
+      ''}
+      
       Alias ${config.urlPrefix} ${mediawikiRoot}
 
       <Directory ${mediawikiRoot}>
@@ -205,6 +220,17 @@ in
       '';
     };
 
+    enableUploads = mkOption {
+      default = false;
+      description = "Whether to enable file uploads.";
+    };
+
+    uploadDir = mkOption {
+      default = throw "You must specify `uploadDir'.";
+      example = "/data/mediawiki-upload";
+      description = "The directory that stores uploaded files.";
+    };
+
     extraConfig = mkOption {
       default = "";
       example =
-- 
GitLab


From bedc715ecd98d352940e27a5e44eed0f5a54c2d2 Mon Sep 17 00:00:00 2001
From: "Yury G. Kudryashov" <urkud.urkud@gmail.com>
Date: Wed, 15 Dec 2010 22:36:39 +0000
Subject: [PATCH 2766/5331] Be more verbose

svn path=/nixos/trunk/; revision=25152
---
 modules/services/printing/cupsd.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/modules/services/printing/cupsd.nix b/modules/services/printing/cupsd.nix
index ebc0215d06d..03f2528bff7 100644
--- a/modules/services/printing/cupsd.nix
+++ b/modules/services/printing/cupsd.nix
@@ -16,16 +16,16 @@ let
     name = "additional-cups-backends";
     builder = pkgs.writeScript "additional-backends-builder.sh" ''
       PATH=${pkgs.coreutils}/bin
-      mkdir -p $out
+      mkdir -pv $out
       if [ ! -e ${pkgs.samba}/lib/cups/backend/smb ]; then
-        mkdir -p $out/lib/cups/backend
-        ln -s ${pkgs.samba}/bin/smbspool $out/lib/cups/backend/smb
+        mkdir -pv $out/lib/cups/backend
+        ln -sv ${pkgs.samba}/bin/smbspool $out/lib/cups/backend/smb
       fi
 
       # Provide support for printing via HTTPS.
       if [ ! -e ${pkgs.cups}/lib/cups/backend/https ]; then
-        mkdir -p $out/lib/cups/backend
-        ln -s ${pkgs.cups}/lib/cups/backend/ipp $out/lib/cups/backend/https
+        mkdir -pv $out/lib/cups/backend
+        ln -sv ${pkgs.cups}/lib/cups/backend/ipp $out/lib/cups/backend/https
       fi
     '';
   };
-- 
GitLab


From aaf3247e800e885413e106452d834ad0f07c90df Mon Sep 17 00:00:00 2001
From: "Yury G. Kudryashov" <urkud.urkud@gmail.com>
Date: Wed, 15 Dec 2010 22:36:54 +0000
Subject: [PATCH 2767/5331] Add cups_pdf_filter to default drivers list

svn path=/nixos/trunk/; revision=25153
---
 modules/services/printing/cupsd.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/services/printing/cupsd.nix b/modules/services/printing/cupsd.nix
index 03f2528bff7..b6dff75ed81 100644
--- a/modules/services/printing/cupsd.nix
+++ b/modules/services/printing/cupsd.nix
@@ -147,7 +147,7 @@ in
         exec = "${cups}/sbin/cupsd -c ${pkgs.writeText "cupsd.conf" cfg.cupsdConf} -F";
       };
 
-    services.printing.drivers = [ pkgs.cups pkgs.ghostscript additionalBackends ];
+    services.printing.drivers = [ pkgs.cups pkgs.cups_pdf_filter pkgs.ghostscript additionalBackends ];
     services.printing.cupsdConf =
       ''
         LogLevel info
-- 
GitLab


From 8496dbf350c5a6692e293107e0e5ce5b0bee40b9 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 16 Dec 2010 13:53:17 +0000
Subject: [PATCH 2768/5331] * Absolutize the path to the VM start script.

svn path=/nixos/trunk/; revision=25154
---
 lib/test-driver/Machine.pm | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/lib/test-driver/Machine.pm b/lib/test-driver/Machine.pm
index daa40f78f9f..28596a5d634 100644
--- a/lib/test-driver/Machine.pm
+++ b/lib/test-driver/Machine.pm
@@ -24,6 +24,13 @@ sub new {
     my ($class, $args) = @_;
 
     my $startCommand = $args->{startCommand};
+    
+    my $name = $args->{name};
+    if (!$name) {
+        $startCommand =~ /run-(.*)-vm$/;
+        $name = $1 || "machine";
+    }
+
     if (!$startCommand) {
         # !!! merge with qemu-vm.nix.
         $startCommand =
@@ -34,12 +41,8 @@ sub new {
         $startCommand .= "-cdrom $args->{cdrom} "
             if defined $args->{cdrom};
         $startCommand .= $args->{qemuFlags} || "";
-    }
-
-    my $name = $args->{name};
-    if (!$name) {
-        $startCommand =~ /run-(.*)-vm$/;
-        $name = $1 || "machine";
+    } else {
+        $startCommand = Cwd::abs_path $startCommand;
     }
 
     my $tmpDir = $ENV{'TMPDIR'} || "/tmp";
@@ -126,7 +129,7 @@ sub start {
         $ENV{QEMU_KERNEL_PARAMS} = "hostTmpDir=$ENV{TMPDIR}";
         chdir $self->{stateDir} or die;
         exec $self->{startCommand};
-        die;
+        die "running VM script: $!";
     }
 
     # Process serial line output.
-- 
GitLab


From 445827ad450741fe79e25824f050da5b703bad20 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 16 Dec 2010 15:54:15 +0000
Subject: [PATCH 2769/5331] * Added a convenience derivation for running the
 test driver   interactively on a network specification.  For instance:

  $ nix-build tests/ -A quake3.driver
  $ ./result/bin/nixos-test-driver
  > startAll;
  client1: starting vm
  client1: QEMU running (pid 14971)
  server: starting vm
  server: QEMU running (pid 14982)
  ...
  > $client1->execute("quake3 ...");

* Use the GNU readline library in interactive mode.

svn path=/nixos/trunk/; revision=25156
---
 lib/test-driver/Machine.pm     |  8 ++++---
 lib/test-driver/test-driver.pl | 10 +++++++-
 lib/testing.nix                | 42 +++++++++++++++++++++++++++++-----
 3 files changed, 50 insertions(+), 10 deletions(-)

diff --git a/lib/test-driver/Machine.pm b/lib/test-driver/Machine.pm
index 28596a5d634..b9dae819b49 100644
--- a/lib/test-driver/Machine.pm
+++ b/lib/test-driver/Machine.pm
@@ -251,7 +251,8 @@ sub execute {
     my $out = "";
 
     while (1) {
-        my $line = readline($self->{socket}) or die "connection to VM lost unexpectedly";
+        my $line = readline($self->{socket});
+        die "connection to VM lost unexpectedly" unless defined $line;
         #$self->log("got line: $line");
         if ($line =~ /^(.*)\|\!\=EOF\s+(\d+)$/) {
             $out .= $1;
@@ -270,7 +271,7 @@ sub succeed {
         my ($status, $out) = $self->execute($command);
         if ($status != 0) {
             $self->log("output: $out");
-            die "command `$command' did not succeed (exit code $status)";
+            die "command `$command' did not succeed (exit code $status)\n";
         }
         $res .= $out;
     }
@@ -407,7 +408,8 @@ sub unblock {
 # Take a screenshot of the X server on :0.0.
 sub screenshot {
     my ($self, $filename) = @_;
-    $filename = "$ENV{'out'}/${filename}.png" if $filename =~ /^\w+$/;
+    my $dir = $ENV{'out'} || Cwd::abs_path(".");
+    $filename = "$dir/${filename}.png" if $filename =~ /^\w+$/;
     my $tmp = "${filename}.ppm";
     $self->sendMonitorCommand("screendump $tmp");
     system("convert $tmp ${filename}") == 0
diff --git a/lib/test-driver/test-driver.pl b/lib/test-driver/test-driver.pl
index ad1af5a6fbf..6735b52dd69 100644
--- a/lib/test-driver/test-driver.pl
+++ b/lib/test-driver/test-driver.pl
@@ -1,8 +1,13 @@
+#! @perl@ -w -I@libDir@ -I@readline@
+
 use strict;
 use Machine;
+use Term::ReadLine;
 
 $SIG{PIPE} = 'IGNORE'; # because Unix domain sockets may die unexpectedly
 
+$ENV{PATH} = "@extraPath@:$ENV{PATH}";
+
 STDERR->autoflush(1);
 
 my %vms;
@@ -26,10 +31,13 @@ sub runTests {
         eval "$context $ENV{tests}";
         die $@ if $@;
     } else {
-        while (<STDIN>) {
+        my $term = Term::ReadLine->new('nixos-vm-test');
+        $term->ReadHistory;
+        while (defined ($_ = $term->readline("> "))) {
             eval "$context $_\n";
             warn $@ if $@;
         }
+        $term->WriteHistory;
     }
 
     # Copy the kernel coverage data for each machine, if the kernel
diff --git a/lib/testing.nix b/lib/testing.nix
index 02c011c5bc8..f7c25d938a8 100644
--- a/lib/testing.nix
+++ b/lib/testing.nix
@@ -8,6 +8,27 @@ rec {
   inherit pkgs;
 
 
+  testDriver = stdenv.mkDerivation {
+    name = "nixos-test-driver";
+    buildCommand =
+      ''
+        mkdir -p $out/bin
+        cp ${./test-driver/test-driver.pl} $out/bin/nixos-test-driver
+        chmod u+x $out/bin/nixos-test-driver
+        
+        libDir=$out/lib/perl5/site_perl
+        mkdir -p $libDir
+        cp ${./test-driver/Machine.pm} $libDir/Machine.pm
+
+        substituteInPlace $out/bin/nixos-test-driver \
+          --subst-var-by perl "${perl}/bin/perl" \
+          --subst-var-by readline "${perlPackages.TermReadLineGnu}/lib/perl5/site_perl" \
+          --subst-var-by extraPath "${imagemagick}/bin" \
+          --subst-var libDir
+      '';
+  };
+
+
   # Run an automated test suite in the given virtual network.
   # `network' must be the result of a call to the
   # `buildVirtualNetwork' function.  `tests' is a Perl fragment
@@ -20,15 +41,13 @@ rec {
       
       inherit tests;
       
-      buildInputs = [ pkgs.qemu_kvm pkgs.imagemagick ];
+      buildInputs = [ pkgs.qemu_kvm ];
 
       buildCommand =
         ''
-          mkdir $out
-          cp ${./test-driver/Machine.pm} Machine.pm
           ensureDir $out/nix-support
-          
-          ${perl}/bin/perl ${./test-driver/test-driver.pl} ${network}/vms/*/bin/run-*-vm
+
+          ${testDriver}/bin/nixos-test-driver ${network}/vms/*/bin/run-*-vm
           
           for i in */coverage-data; do
             ensureDir $out/coverage-data
@@ -103,6 +122,17 @@ rec {
       # Call the test script with the computed nodes.
       (if builtins.isFunction t.testScript then t.testScript { inherit (vms) nodes; } else t.testScript);
     report = makeReport test;
+
+    # Generate a convenience wrapper for running the test driver
+    # interactively with the specified network.
+    driver = runCommand "nixos-test-driver" { buildInputs = [ makeWrapper]; }
+      ''
+        mkdir -p $out/bin
+        ln -s ${vms}/bin/* $out/bin/
+        ln -s ${testDriver}/bin/* $out/bin/
+        wrapProgram $out/bin/nixos-test-driver \
+          --add-flags "${vms}/vms/*/bin/run-*-vm"
+      ''; # "
   };
 
   runInMachine =
@@ -140,7 +170,7 @@ rec {
         export PATH=${qemu_kvm}/bin:${coreutils}/bin
         cp ${./test-driver/Machine.pm} Machine.pm
         export tests='${testscript}'
-        ${perl}/bin/perl ${./test-driver/test-driver.pl} ${vms}/vms/*/bin/run-*-vm
+        ${testDriver}/bin/nixos-test-driver ${vms}/vms/*/bin/run-*-vm
       ''; # */
 
     in
-- 
GitLab


From dac1936869420f035077f81a1c79ed16dc4c1fee Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 16 Dec 2010 16:58:06 +0000
Subject: [PATCH 2770/5331] * If $DISPLAY is set (i.e. in interactive mode),
 show QEMU's graphical   output.

svn path=/nixos/trunk/; revision=25157
---
 lib/test-driver/Machine.pm | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/lib/test-driver/Machine.pm b/lib/test-driver/Machine.pm
index b9dae819b49..abf08c7fcf2 100644
--- a/lib/test-driver/Machine.pm
+++ b/lib/test-driver/Machine.pm
@@ -19,6 +19,8 @@ for (my $n = 0; $n < 256; $n++) {
     $ENV{"QEMU_MCAST_ADDR_$n"} = "$mcastPrefix.$n.$mcastSuffix";
 }
 
+my $showGraphics = defined $ENV{'DISPLAY'};
+
 
 sub new {
     my ($class, $args) = @_;
@@ -54,7 +56,7 @@ sub new {
         pid => 0,
         connected => 0,
         socket => undef,
-        stateDir => "$tmpDir/$name",
+        stateDir => "$tmpDir/vm-state-$name",
         monitor => undef,
     };
 
@@ -124,7 +126,9 @@ sub start {
         dup2(fileno($serialC), fileno(STDERR));
         $ENV{TMPDIR} = $self->{stateDir};
         $ENV{USE_TMPDIR} = 1;
-        $ENV{QEMU_OPTS} = "-nographic -no-reboot -monitor unix:./monitor -chardev socket,id=shell,path=./shell";
+        $ENV{QEMU_OPTS} =
+            "-no-reboot -monitor unix:./monitor -chardev socket,id=shell,path=./shell " .
+            ($showGraphics ? "-serial stdio" : "-nographic");
         $ENV{QEMU_NET_OPTS} = "guestfwd=tcp:10.0.2.6:23-chardev:shell";
         $ENV{QEMU_KERNEL_PARAMS} = "hostTmpDir=$ENV{TMPDIR}";
         chdir $self->{stateDir} or die;
-- 
GitLab


From e90a1cfc595483bde6046461cc1351220027625f Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 16 Dec 2010 19:35:43 +0000
Subject: [PATCH 2771/5331] * A quick hack to enable debugging of VM test
 scripts: the test script   is now made available in the interactive test
 driver.  For instance,   you can do

  $ nix-build tests/ -A quake3.driver
  $ ./result/bin/nixos-test-driver
  > eval $ENV{'testScript'};
  ... see VMs + X11 + Quake get started, bots running around ...
  >

  So after this you can run commands interactively on the VMs in the
  state they were in after the conclusion of the test script.

svn path=/nixos/trunk/; revision=25158
---
 lib/testing.nix | 24 ++++++++++++++++++++----
 1 file changed, 20 insertions(+), 4 deletions(-)

diff --git a/lib/testing.nix b/lib/testing.nix
index f7c25d938a8..6c7a9edac69 100644
--- a/lib/testing.nix
+++ b/lib/testing.nix
@@ -117,24 +117,38 @@ rec {
       if t ? nodes then t.nodes else
       if t ? machine then { machine = t.machine; }
       else { };
+      
     vms = buildVirtualNetwork { inherit nodes; };
-    test = runTests vms
+    
+    testScript =
       # Call the test script with the computed nodes.
-      (if builtins.isFunction t.testScript then t.testScript { inherit (vms) nodes; } else t.testScript);
+      if builtins.isFunction t.testScript
+      then t.testScript { inherit (vms) nodes; }
+      else t.testScript;
+      
+    test = runTests vms testScript;
+      
     report = makeReport test;
 
     # Generate a convenience wrapper for running the test driver
     # interactively with the specified network.
-    driver = runCommand "nixos-test-driver" { buildInputs = [ makeWrapper]; }
+    driver = runCommand "nixos-test-driver"
+      { buildInputs = [ makeWrapper];
+        inherit testScript;
+      }
       ''
         mkdir -p $out/bin
         ln -s ${vms}/bin/* $out/bin/
         ln -s ${testDriver}/bin/* $out/bin/
         wrapProgram $out/bin/nixos-test-driver \
-          --add-flags "${vms}/vms/*/bin/run-*-vm"
+          --add-flags "${vms}/vms/*/bin/run-*-vm" \
+          --run "testScript=\"\$(cat $out/test-script)\"" \
+          --set testScript '"$testScript"'
+        echo "$testScript" > $out/test-script
       ''; # "
   };
 
+  
   runInMachine =
     { drv
     , machine
@@ -182,6 +196,7 @@ rec {
         origBuilder = attrs.builder;   
       });
 
+      
   runInMachineWithX = { require ? [], ...}@args :
     let
       client =
@@ -204,6 +219,7 @@ rec {
             '' ;
           } // args );   
 
+          
   simpleTest = as: (makeTest ({ ... }: as)).test;
 
 }
-- 
GitLab


From 5055c6dc29e8c85524c10776fb8db45bb76d6817 Mon Sep 17 00:00:00 2001
From: Evgeny Egorochkin <phreedom.stdin@gmail.com>
Date: Fri, 17 Dec 2010 07:33:03 +0000
Subject: [PATCH 2772/5331] Ghost One: add a check for language property
 values.

svn path=/nixos/trunk/; revision=25162
---
 modules/services/games/ghost-one.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/modules/services/games/ghost-one.nix b/modules/services/games/ghost-one.nix
index 2b4610df29c..2d1195a043d 100644
--- a/modules/services/games/ghost-one.nix
+++ b/modules/services/games/ghost-one.nix
@@ -5,6 +5,7 @@ let
   cfg = config.services.ghostOne;
   ghostUser = "ghostone";
   stateDir = "/var/lib/ghost-one";
+
 in
 {
 
@@ -20,6 +21,7 @@ in
 
       language = mkOption {
         default = "English";
+        check = lang: elem lang [ "English" "Spanish" "Russian" "Serbian" "Turkish" ];
         description = "The language of bot messages: English, Spanish, Russian, Serbian or Turkish.";
       };
       
-- 
GitLab


From 3b28efd00dae785a941832c305f249fe3317995d Mon Sep 17 00:00:00 2001
From: Evgeny Egorochkin <phreedom.stdin@gmail.com>
Date: Fri, 17 Dec 2010 07:33:20 +0000
Subject: [PATCH 2773/5331] Git daemon: packaged.

svn path=/nixos/trunk/; revision=25163
---
 modules/misc/ids.nix                       |   2 +
 modules/module-list.nix                    |   1 +
 modules/services/networking/git-daemon.nix | 112 +++++++++++++++++++++
 3 files changed, 115 insertions(+)
 create mode 100644 modules/services/networking/git-daemon.nix

diff --git a/modules/misc/ids.nix b/modules/misc/ids.nix
index 22e62348394..385c6d63e00 100644
--- a/modules/misc/ids.nix
+++ b/modules/misc/ids.nix
@@ -59,6 +59,7 @@ in
     sabnzbd = 38;
     kdm = 39;
     ghostOne = 40;
+    git = 41;
     # When adding a uid, make sure it doesn't match an existing gid.
 
     nixbld = 30000; # start of range of uids
@@ -100,6 +101,7 @@ in
     disnix = 33;
     osgi = 34;
     ghostOne = 40;
+    git = 41;
     # When adding a gid, make sure it doesn't match an existing uid.
 
     users = 100;
diff --git a/modules/module-list.nix b/modules/module-list.nix
index 20ed8d08568..0d342413250 100644
--- a/modules/module-list.nix
+++ b/modules/module-list.nix
@@ -92,6 +92,7 @@
   ./services/networking/dhcpd.nix
   ./services/networking/ejabberd.nix
   ./services/networking/firewall.nix
+  ./services/networking/git-daemon.nix
   ./services/networking/gnunet.nix
   ./services/networking/gvpe.nix
   ./services/networking/gw6c.nix
diff --git a/modules/services/networking/git-daemon.nix b/modules/services/networking/git-daemon.nix
new file mode 100644
index 00000000000..b3841d4f074
--- /dev/null
+++ b/modules/services/networking/git-daemon.nix
@@ -0,0 +1,112 @@
+{pkgs, config, ...}:
+with pkgs.lib;
+let
+
+  cfg = config.services.gitDaemon;
+  gitUser = "git";
+
+in
+{
+
+  ###### interface
+  
+  options = {
+    services.gitDaemon = {
+
+      enable = mkOption {
+        default = false;
+        description = ''
+          Enable Git daemon, which allows public hosting  of git repositories
+          without any access controls. This is mostly intended for read-only access.
+          
+          You can allow write access by setting daemon.receivepack configuration
+          item of the repository to true. This is solely meant for a closed LAN setting
+          where everybody is friendly.
+
+          If you need any access controls, use something else.
+        '';
+      };
+
+      basePath = mkOption {
+        default = "";
+        example = "/srv/git/";
+        description = ''
+          Remap all the path requests as relative to the given path. For example,
+          if you set base-path to /srv/git, then if you later try to pull
+          git://example.com/hello.git, Git daemon will interpret the path as /srv/git/hello.git.
+        '';
+      };
+
+      exportAll = mkOption {
+        default = false;
+        description = ''
+          Publish all directories that look like Git repositories (have the objects
+          and refs subdirectories), even if they do not have the git-daemon-export-ok file.
+
+          If disabled, you need to touch .git/git-daemon-export-ok in each repository
+          you want the daemon to publish.
+
+          Warning: enabling this without a repository whitelist or basePath
+          publishes every git repository you have.
+        '';
+      };
+
+      repositories = mkOption {
+        default = [];
+        example = [ "/srv/git" "/home/user/git/repo2" ];
+        description = ''
+          A whitelist of paths of git repositories, or directories containing repositories
+          all of which would be published. Paths must not end in "/".
+
+          Warning: leaving this empty and enabling exportAll publishes all
+          repositories in your filesystem or basePath if specified.
+        '';
+      };
+
+      listenAddress = mkOption {
+        default = "";
+        example = "example.com";
+        description = "Listen on a specific IP address or hostname.";
+      };
+
+      port = mkOption {
+        default = 9418;
+        description = "Port to listen on.";
+      };
+
+      options = mkOption {
+        default = "";
+        description = "Extra configuration options to be passed to Git daemon.";
+      };
+
+    };
+  };
+
+  ###### implementation
+
+  config = mkIf cfg.enable {
+
+    users.extraUsers = singleton
+      { name = gitUser;
+        uid = config.ids.uids.git;
+        description = "Git daemon user";
+      };
+
+    users.extraGroups = singleton
+      { name = gitUser;
+        gid = config.ids.gids.git;
+      };
+
+    jobs.gitDaemon = {
+      name = "git-daemon";
+      startOn = "ip-up";
+      exec = "${pkgs.git}/bin/git daemon --reuseaddr "
+        + (optionalString (cfg.basePath != "") "--basepath=${cfg.basePath} ")
+        + (optionalString (cfg.listenAddress != "") "--listen=${cfg.listenAddress} ")
+        + "--port=${toString cfg.port} --user=${gitUser} --group=${gitUser} ${cfg.options} "
+        + "--verbose " + (optionalString cfg.exportAll "--export-all")  + concatStringsSep " " cfg.repositories;
+    };
+
+  };
+
+}
\ No newline at end of file
-- 
GitLab


From ba459a0bf380a4da440c3162ffeecd03d11be301 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sat, 18 Dec 2010 17:56:04 +0000
Subject: [PATCH 2774/5331] * Fix the broken installer
 (http://hydra.nixos.org/build/811980).  The   hardware scan was generating a
 hardware.nix containing   "pkgs.linuxPackages" without having "pkgs" in
 scope.  Also, it   shouldn't define boot.kernelPackages.

svn path=/nixos/trunk/; revision=25192
---
 modules/installer/tools/nixos-hardware-scan.pl | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/modules/installer/tools/nixos-hardware-scan.pl b/modules/installer/tools/nixos-hardware-scan.pl
index b26358e1078..38220c4fb78 100644
--- a/modules/installer/tools/nixos-hardware-scan.pl
+++ b/modules/installer/tools/nixos-hardware-scan.pl
@@ -103,7 +103,7 @@ sub pciCheck {
          $device eq "0x432c" || $device eq "0x432d" || $device eq "0x4353" ||
          $device eq "0x4357") )
      {
-        push @modulePackages, "kernelPackages.broadcom_sta";
+        push @modulePackages, "config.boot.kernelPackages.broadcom_sta";
         push @kernelModules, "wl";
      }
 
@@ -242,7 +242,7 @@ my $attrs = multiLineList("  ", removeDups @attrs);
 print <<EOF ;
 # This is a generated file.  Do not modify!
 # Make changes to /etc/nixos/configuration.nix instead.
-{modulesPath, ...}:
+{ config, pkgs, modulesPath, ... }:
 
 {
   require = [
@@ -250,12 +250,9 @@ print <<EOF ;
     "\${modulesPath}/installer/scan/not-detected.nix"
   ];
 
-  boot = rec {
-    initrd.kernelModules = [ $initrdKernelModules ];
-    kernelModules = [ $kernelModules ];
-    kernelPackages = pkgs.linuxPackages;
-    extraModulePackages = [ $modulePackages ];
-  };
+  boot.initrd.kernelModules = [ $initrdKernelModules ];
+  boot.kernelModules = [ $kernelModules ];
+  boot.extraModulePackages = [ $modulePackages ];
 
   nix.maxJobs = $cpus;
 
-- 
GitLab


From 747e284e752199dac3046f3f6f97bee6ababb1b7 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sat, 18 Dec 2010 18:07:25 +0000
Subject: [PATCH 2775/5331] * Fix an evaluation error in
 tests.installer.rebuildCD.

svn path=/nixos/trunk/; revision=25193
---
 tests/installer.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/installer.nix b/tests/installer.nix
index eead83053ed..994d1173c2d 100644
--- a/tests/installer.nix
+++ b/tests/installer.nix
@@ -304,7 +304,7 @@ in {
       testScript =
         ''
           # damn, it's costly to evaluate nixos-rebuild (1G of ram)
-          my $machine = Machine->new({ cdrom => glob("${iso}/iso/*.iso"), qemuFlags => '${qemuNICFlags 1 1} -m 1024' });
+          my $machine = Machine->new({ cdrom => glob("${iso}/iso/*.iso"), qemuFlags => '${qemuNICFlags 1 1 1} -m 1024' });
           $machine->start;
 
           # Make sure that we don't try to download anything.
-- 
GitLab


From 5d7b524bd3ef3ab536eafeacfd80b708021a1e0a Mon Sep 17 00:00:00 2001
From: Rob Vermaas <rob.vermaas@gmail.com>
Date: Mon, 20 Dec 2010 14:14:29 +0000
Subject: [PATCH 2776/5331] updated hydra mirror module

svn path=/nixos/trunk/; revision=25211
---
 modules/services/backup/hydra-mirror.nix | 61 +++++++++++++++++++-----
 1 file changed, 49 insertions(+), 12 deletions(-)

diff --git a/modules/services/backup/hydra-mirror.nix b/modules/services/backup/hydra-mirror.nix
index a328a9a159a..35be60987ec 100644
--- a/modules/services/backup/hydra-mirror.nix
+++ b/modules/services/backup/hydra-mirror.nix
@@ -3,16 +3,30 @@
 with pkgs.lib;
 
 let 
-  cfg = config.services.hydraChannelMirror ;
+
+  cfg = config.services.hydraChannelMirror;
+
   mirrorChannel = pkgs.fetchsvn {
     url = https://svn.nixos.org/repos/nix/release/trunk/channels/mirror-channel.pl;
-    rev = 24132;
-    sha256 = "02xvswbbr2sj9k1wfraa0j9053vf6w88nhk15qwzs8nkm180n820";
+    rev = 25210;
+    sha256 = "0gspqid1rpsj1z1mr29nakh7di278nlv6v2knafvmm3g8ah3yxgz";
   };
-  cronjob = jobset : ''
-    ${cfg.period} root ENABLE_PATCHES=1 PATH=${config.environment.nix}/libexec/nix:$PATH perl -I${config.environment.nix}/libexec/nix ${mirrorChannel} ${cfg.hydraURL}/jobset/${jobset.project}/${jobset.jobset}/channel/latest ${cfg.dataDir}/channels/${jobset.relURL} ${cfg.dataDir}/nars ${cfg.mirrorURL}/nars ${cfg.dataDir}/patches ${cfg.mirrorURL}/patches ${if jobset.nixexprs == "" then "" else "${cfg.hydraURL}/job/${jobset.project}/${jobset.jobset}/${jobset.nixexprs}/latest/download-by-type/file/source-dist"} >> ${cfg.dataDir}/logs/${jobset.name}.log
-  '';
+
+  cronjob = jobset:
+    "${cfg.period} ${cfg.user}"
+    + optionalString cfg.enableBinaryPatches " ENABLE_PATCHES=1"
+    + " perl -I${config.environment.nix}/libexec/nix ${mirrorChannel}"
+    + " ${cfg.hydraURL}/jobset/${jobset.project}/${jobset.jobset}/channel/latest"
+    + " ${cfg.dataDir}/${jobset.project}/channels/${jobset.name}"
+    + " ${cfg.dataDir}/nars"
+    + " ${cfg.mirrorURL}/nars"
+    + " ${cfg.dataDir}/patches"
+    + " ${cfg.mirrorURL}/patches"
+    + " ${if jobset.nixexprs == "" then "" else "${cfg.hydraURL}/job/${jobset.project}/${jobset.jobset}/${jobset.nixexprs}/latest/download-by-type/file/source-dist"}"
+    + " >> ${cfg.dataDir}/logs/${jobset.name}.log 2>&1\n";
+
 in
+
 {
   options = {
   
@@ -33,8 +47,15 @@ in
         '';
       };
 
+      user = mkOption {
+        default = "hydra-mirror";
+        description = ''
+          User running the Hydra mirror script.
+        '';
+      };
+
       jobsets = mkOption {
-        default = [ rec { name = "nixpkgs-unstable"; project = "nixpkgs"; jobset = "trunk"; nixexprs = "tarball"; relURL = "nixpkgs/channels/${name}"; } ];
+        default = [ { name = "nixpkgs-unstable"; project = "nixpkgs"; jobset = "trunk"; nixexprs = "tarball"; } ];
         description = ''
           List of jobsets to mirror.
         '';
@@ -60,25 +81,41 @@ in
           Location of Hydra mirror data
         '';
       };
+
+      enableBinaryPatches = mkOption {
+        default = false;
+        description = ''
+          Whether to enable generating binary patches for the mirrored channels.
+        '';
+      };
     };
 
   };
 
   config = mkIf cfg.enable {
   
-    services.cron.systemCronJobs = map cronjob cfg.jobsets ;
+    users.extraUsers = singleton
+      { name = cfg.user; };
+
+    services.cron.systemCronJobs = map cronjob cfg.jobsets;
 
     system.activationScripts.hydraChannelMirror = stringAfter [ "stdio" "users" ]
       ''
         mkdir -m 0755 -p ${cfg.dataDir}
+        chown ${cfg.user} ${cfg.dataDir}
+
         mkdir -m 0755 -p ${cfg.dataDir}/nars
+        chown ${cfg.user} ${cfg.dataDir}/nars
+
         mkdir -m 0755 -p ${cfg.dataDir}/patches
-        mkdir -m 0755 -p ${cfg.dataDir}/channels
-        ln -fs ${cfg.dataDir}/nars ${cfg.dataDir}/channels/nars 
-        ln -fs ${cfg.dataDir}/patches ${cfg.dataDir}/channels/patches 
+        chown ${cfg.user} ${cfg.dataDir}/patches
+
         mkdir -m 0755 -p ${cfg.dataDir}/logs
+        chown ${cfg.user} ${cfg.dataDir}/logs
+
         ${concatMapStrings (j : ''
-        mkdir -m 0755 -p ${cfg.dataDir}/channels/${j.relURL}
+          mkdir -m 0755 -p ${cfg.dataDir}/{j.project}/channels/${j.name}
+          chown ${cfg.user} ${cfg.dataDir}/{j.project}/channels/${j.name}
         '') cfg.jobsets}
       '';
     
-- 
GitLab


From e1c4b6a1f51aab68899bdcaae2e75cf5fe9de695 Mon Sep 17 00:00:00 2001
From: Rob Vermaas <rob.vermaas@gmail.com>
Date: Mon, 20 Dec 2010 14:17:30 +0000
Subject: [PATCH 2777/5331] hydra-mirror.nix: forgot description for user

svn path=/nixos/trunk/; revision=25212
---
 modules/services/backup/hydra-mirror.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/services/backup/hydra-mirror.nix b/modules/services/backup/hydra-mirror.nix
index 35be60987ec..dc37e4e92d5 100644
--- a/modules/services/backup/hydra-mirror.nix
+++ b/modules/services/backup/hydra-mirror.nix
@@ -95,7 +95,7 @@ in
   config = mkIf cfg.enable {
   
     users.extraUsers = singleton
-      { name = cfg.user; };
+      { name = cfg.user; description = "Hydra mirror"; };
 
     services.cron.systemCronJobs = map cronjob cfg.jobsets;
 
-- 
GitLab


From c8afc67f6a55c3d9bd0711a980f9e15535780219 Mon Sep 17 00:00:00 2001
From: Rob Vermaas <rob.vermaas@gmail.com>
Date: Tue, 21 Dec 2010 10:57:19 +0000
Subject: [PATCH 2778/5331] lib/testing.nix: vm state of nixos machines in
 network changed location

svn path=/nixos/trunk/; revision=25222
---
 lib/testing.nix | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/lib/testing.nix b/lib/testing.nix
index 6c7a9edac69..3cf0bc5bf40 100644
--- a/lib/testing.nix
+++ b/lib/testing.nix
@@ -179,10 +179,9 @@ rec {
       '';
 
       vmRunCommand = writeText "vm-run" ''
-        ${coreutils}/bin/mkdir -p client
-        export > client/saved-env
+        ${coreutils}/bin/mkdir -p vm-state-client
+        export > vm-state-client/saved-env
         export PATH=${qemu_kvm}/bin:${coreutils}/bin
-        cp ${./test-driver/Machine.pm} Machine.pm
         export tests='${testscript}'
         ${testDriver}/bin/nixos-test-driver ${vms}/vms/*/bin/run-*-vm
       ''; # */
-- 
GitLab


From edcf526c32bc4ee798d5500f6a90f24f95bd5da2 Mon Sep 17 00:00:00 2001
From: Sander van der Burg <s.vanderburg@tudelft.nl>
Date: Wed, 22 Dec 2010 13:32:16 +0000
Subject: [PATCH 2779/5331] Added svnserve module, to serve Subversion
 repositories through the SVN protocol

svn path=/nixos/trunk/; revision=25235
---
 modules/module-list.nix            |  1 +
 modules/services/misc/svnserve.nix | 46 ++++++++++++++++++++++++++++++
 2 files changed, 47 insertions(+)
 create mode 100644 modules/services/misc/svnserve.nix

diff --git a/modules/module-list.nix b/modules/module-list.nix
index 0d342413250..3d2a11db5bb 100644
--- a/modules/module-list.nix
+++ b/modules/module-list.nix
@@ -73,6 +73,7 @@
   ./services/misc/nix-gc.nix
   ./services/misc/nixos-manual.nix
   ./services/misc/rogue.nix
+  ./services/misc/svnserve.nix
   ./services/misc/synergy.nix
   ./services/misc/virtualbox.nix
   ./services/monitoring/monit.nix
diff --git a/modules/services/misc/svnserve.nix b/modules/services/misc/svnserve.nix
new file mode 100644
index 00000000000..c1acf5723d8
--- /dev/null
+++ b/modules/services/misc/svnserve.nix
@@ -0,0 +1,46 @@
+# SVN server
+{ config, pkgs, ... }:
+
+with pkgs.lib;
+
+let
+
+  cfg = config.services.svnserve;
+  
+in
+
+{
+
+  ###### interface
+  
+  options = {
+  
+    services.svnserve = {
+    
+      enable = mkOption {
+        default = false;
+        description = "Whether to enable svnserve to serve Subversion repositories through the SVN protocol.";
+      };
+      
+      svnBaseDir = mkOption {
+        default = "/repos";
+	description = "Base directory from which Subversion repositories are accessed.";
+      };
+    };
+    
+  };
+  
+
+  ###### implementation
+
+  config = mkIf cfg.enable {
+    jobs.svnserve = {
+      startOn = "started network-interfaces";
+      stopOn = "stopping network-interfaces";
+      
+      preStart = "mkdir -p ${cfg.svnBaseDir}";
+      
+      exec = "${pkgs.subversion}/bin/svnserve -r ${cfg.svnBaseDir} -d --foreground --pid-file=/var/run/svnserve.pid";
+    };
+  };
+}
-- 
GitLab


From 70402c939712e962c927f96a68ce7d898ed2fc89 Mon Sep 17 00:00:00 2001
From: Sander van der Burg <s.vanderburg@tudelft.nl>
Date: Wed, 22 Dec 2010 13:32:51 +0000
Subject: [PATCH 2780/5331] Adapted Disnix module to publish the svnBaseDir and
 to support the postgresql and subversion types

svn path=/nixos/trunk/; revision=25236
---
 modules/services/misc/disnix.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/modules/services/misc/disnix.nix b/modules/services/misc/disnix.nix
index ef4d7922e98..0773b61c551 100644
--- a/modules/services/misc/disnix.nix
+++ b/modules/services/misc/disnix.nix
@@ -12,6 +12,8 @@ let
     enableAxis2WebService = config.services.tomcat.axis2.enable;
     enableEjabberdDump = config.services.ejabberd.enable;
     enableMySQLDatabase = config.services.mysql.enable;
+    enablePostgreSQLDatabase = config.services.postgresql.enable;
+    enableSubversionRepository = config.services.svnserve.enable;
     enableTomcatWebApplication = config.services.tomcat.enable;
   });
 in
@@ -93,6 +95,7 @@ in
         // optionalAttrs (config.services.httpd.enable) { documentRoot = config.services.httpd.documentRoot; }
         // optionalAttrs (config.services.mysql.enable) { mysqlPort = config.services.mysql.port; }
         // optionalAttrs (config.services.tomcat.enable) { tomcatPort = 8080; }
+	// optionalAttrs (config.services.svnserve.enable) { svnBaseDir = config.services.svnserve.svnBaseDir; }
 	// optionalAttrs (cfg.publishInfrastructure.enableAuthentication) (
           optionalAttrs (config.services.mysql.enable) { mysqlUsername = "root"; mysqlPassword = builtins.readFile config.services.mysql.rootPassword; }) 
 	)
-- 
GitLab


From c65c03099f9ce1678d96bb8503fac7307411ccdf Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 23 Dec 2010 11:00:20 +0000
Subject: [PATCH 2781/5331] * Use "initctl restart".

svn path=/nixos/trunk/; revision=25249
---
 modules/services/networking/dhclient.nix | 13 ++-----------
 1 file changed, 2 insertions(+), 11 deletions(-)

diff --git a/modules/services/networking/dhclient.nix b/modules/services/networking/dhclient.nix
index 7d45350fe6b..52612ee403b 100644
--- a/modules/services/networking/dhclient.nix
+++ b/modules/services/networking/dhclient.nix
@@ -114,17 +114,8 @@ in
     powerManagement.resumeCommands =
       ''
         export PATH=${config.system.build.upstart}/sbin:$PATH
-      
-        restart() {
-            local job="$1"
-            if initctl status "$job" 2> /dev/null | grep -q 'running'; then
-                initctl stop "$job"
-                initctl start "$job"
-            fi
-        }
-
-        restart wpa_supplicant      
-        restart dhclient
+        initctl restart wpa_supplicant
+        initctl restart dhclient
       '';
 
   };  
-- 
GitLab


From 6ba45109a1d5a3045b8d1046af0589cb984124e9 Mon Sep 17 00:00:00 2001
From: Sander van der Burg <s.vanderburg@tudelft.nl>
Date: Fri, 24 Dec 2010 16:34:18 +0000
Subject: [PATCH 2782/5331] Integers must be converted to strings, of course

svn path=/nixos/trunk/; revision=25274
---
 modules/services/misc/disnix.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/services/misc/disnix.nix b/modules/services/misc/disnix.nix
index 0773b61c551..f3dd55b64d9 100644
--- a/modules/services/misc/disnix.nix
+++ b/modules/services/misc/disnix.nix
@@ -132,7 +132,7 @@ in
 	        let infrastructureAttrValue = getAttr infrastructureAttrName (cfg.infrastructure);
 		in
 		if builtins.isInt infrastructureAttrValue then
-		''${infrastructureAttrName}=${infrastructureAttrValue} \
+		''${infrastructureAttrName}=${toString infrastructureAttrValue} \
 		''
 		else
                 ''${infrastructureAttrName}=\"${infrastructureAttrValue}\" \
-- 
GitLab


From 09c30053a2b257f8a425f9277673cad71eace625 Mon Sep 17 00:00:00 2001
From: Sander van der Burg <s.vanderburg@tudelft.nl>
Date: Fri, 24 Dec 2010 16:42:31 +0000
Subject: [PATCH 2783/5331] Also pass the location of NixOS as argument to the
 deployment expression

svn path=/nixos/trunk/; revision=25275
---
 .../tools/nixos-deploy-network/nixos-deploy-network.sh          | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/installer/tools/nixos-deploy-network/nixos-deploy-network.sh b/modules/installer/tools/nixos-deploy-network/nixos-deploy-network.sh
index dc2b2198cfc..f1668ce780d 100644
--- a/modules/installer/tools/nixos-deploy-network/nixos-deploy-network.sh
+++ b/modules/installer/tools/nixos-deploy-network/nixos-deploy-network.sh
@@ -63,5 +63,5 @@ fi
 
 # Deploy the network
 
-vms=`nix-build $NIXOS/modules/installer/tools/nixos-deploy-network/deploy.nix --argstr networkExpr $networkExpr $showTraceArg $noOutLinkArg`
+vms=`nix-build $NIXOS/modules/installer/tools/nixos-deploy-network/deploy.nix --argstr networkExpr $networkExpr --argstr nixos $NIXOS $showTraceArg $noOutLinkArg`
 $vms/bin/deploy-systems
-- 
GitLab


From ddc6f84d9c07d2b9556e23e62965b4ecad2fcd68 Mon Sep 17 00:00:00 2001
From: Tobias Hammerschmidt <tobias.hammerschmidt@gmx.de>
Date: Sun, 2 Jan 2011 11:05:46 +0000
Subject: [PATCH 2784/5331] updated broadcom wl driver

svn path=/nixos/trunk/; revision=25334
---
 modules/installer/tools/nixos-hardware-scan.pl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/installer/tools/nixos-hardware-scan.pl b/modules/installer/tools/nixos-hardware-scan.pl
index 38220c4fb78..eede139f40d 100644
--- a/modules/installer/tools/nixos-hardware-scan.pl
+++ b/modules/installer/tools/nixos-hardware-scan.pl
@@ -101,7 +101,7 @@ sub pciCheck {
          $device eq "0x4315" || $device eq "0x4327" || $device eq "0x4328" ||
          $device eq "0x4329" || $device eq "0x432a" || $device eq "0x432b" ||
          $device eq "0x432c" || $device eq "0x432d" || $device eq "0x4353" ||
-         $device eq "0x4357") )
+         $device eq "0x4357" || $device eq "0x4358" || $device eq "0x4359" ) )
      {
         push @modulePackages, "config.boot.kernelPackages.broadcom_sta";
         push @kernelModules, "wl";
-- 
GitLab


From 23f98ee250184ebff56ea0cd19c1e0bd7ddbf648 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Sun, 2 Jan 2011 18:49:11 +0000
Subject: [PATCH 2785/5331] Applying patch by chaoflow to get create
 services.postfix.extraConfig

svn path=/nixos/trunk/; revision=25345
---
 modules/services/mail/postfix.nix | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/modules/services/mail/postfix.nix b/modules/services/mail/postfix.nix
index 3eda558f1c5..3a28e81eb15 100644
--- a/modules/services/mail/postfix.nix
+++ b/modules/services/mail/postfix.nix
@@ -81,8 +81,8 @@ let
       smtpd_use_tls = yes 
 
       recipientDelimiter = ${cfg.recipientDelimiter}
-
-    '';
+    ''
+    + cfg.extraConfig;
 
   aliases = 
     optionalString (cfg.postmasterAlias != "") ''
@@ -227,6 +227,13 @@ in
         ";
       };
 
+      extraConfig = mkOption {
+        default = "";
+        description = "
+          Extra configuration, will be added verbatim to the configuration file.
+        ";
+      };
+
       sslCert = mkOption {
         default = "";
         description = "SSL certificate to use.";
-- 
GitLab


From d8ad975a1f20011afc860066babc81e9413b780e Mon Sep 17 00:00:00 2001
From: Evgeny Egorochkin <phreedom.stdin@gmail.com>
Date: Sun, 2 Jan 2011 22:13:56 +0000
Subject: [PATCH 2786/5331] nixos-checkout: add support for git svn. Patch by
 Florian Friesdorf.

svn path=/nixos/trunk/; revision=25349
---
 modules/installer/tools/nixos-checkout.nix | 23 ++++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/modules/installer/tools/nixos-checkout.nix b/modules/installer/tools/nixos-checkout.nix
index 313e8dea7a0..e5bb7432e68 100644
--- a/modules/installer/tools/nixos-checkout.nix
+++ b/modules/installer/tools/nixos-checkout.nix
@@ -55,6 +55,7 @@ let
       default = {
         svn = { valid = "[ -d .svn ]"; env = [ pkgs.coreutils pkgs.subversion ]; };
         git = { valid = "[ -d .git ]"; env = [ pkgs.coreutils pkgs.git pkgs.gnused /*  FIXME: use full path to sed in nix-pull */ ]; };
+        gitsvn = { valid = "[ -d .git/svn ]"; env = [ pkgs.coreutils pkgs.gitFull pkgs.gnused ]; };
       };
       description = ''
         Defines, for each supported version control system
@@ -111,6 +112,28 @@ let
     [ -d ${t} ] || { echo "git initialize failed to create target directory ${t}"; exit 1; }
     ${update}'';
     }
+    else  if attrs.type == "gitsvn" then # sanity check for existing attrs
+      let
+        a = {
+          # add gitsvn defaults
+          url = "https://svn.nixos.org/repos/nix/${repo}";
+	   # XXX: same default target as svn: good/bad?
+          target = "/etc/nixos/${repo}";
+          initialize = "git svn clone -s ${a.url} ${a.target}";
+          # splitting this in fetch and rebase -l helps to recover partly cloned repo
+          update = "git svn fetch && git svn rebase -l";
+        } // attrs;
+        t = escapeShellArg a.target;
+      in
+      rec {
+        inherit (a) type target;
+        default =  if a ? default then a.default else false;
+        update = "cd ${t} && ${a.update}";
+        initialize =  ''
+          cd $(dirname ${t}) && ${a.initialize}
+          [ -d ${t} ] || { echo "gitsvn initialize failed to create target directory ${t}"; exit 1; }
+          ${update}'';
+      }
     else throw "unkown repo type ${attrs.type}";
 
   # apply prepareRepoAttrs on each repo definition
-- 
GitLab


From efa2dccf44d9d0e58fafe34acb6723fbde16cf46 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Mon, 3 Jan 2011 18:36:31 +0000
Subject: [PATCH 2787/5331] Fixing the systab in fcron.

svn path=/nixos/trunk/; revision=25368
---
 modules/services/scheduling/fcron.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/services/scheduling/fcron.nix b/modules/services/scheduling/fcron.nix
index 5bff33b3e27..632e57826d8 100644
--- a/modules/services/scheduling/fcron.nix
+++ b/modules/services/scheduling/fcron.nix
@@ -8,7 +8,7 @@ let
   
   queuelen = if cfg.queuelen == "" then "" else "-q ${toString cfg.queuelen}";
 
-  systemCronJobsFile = pkgs.writeText "system-crontab"
+  systemCronJobs =
     ''
       SHELL=${pkgs.bash}/bin/bash
       PATH=${config.system.path}/bin:${config.system.path}/sbin
@@ -61,7 +61,7 @@ in
       };
       
       systab = mkOption {
-        default = systemCronJobsFile;
+        default = systemCronJobs;
         description = ''The "system" crontab contents.'';
       };
     };
-- 
GitLab


From 0829a9977d92f60c2379e1d3ec68b8505d9f4f94 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 5 Jan 2011 10:42:39 +0000
Subject: [PATCH 2788/5331] * Fix the infinite recursion in fcron while
 evaluating the manual.

svn path=/nixos/trunk/; revision=25418
---
 modules/services/scheduling/fcron.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/modules/services/scheduling/fcron.nix b/modules/services/scheduling/fcron.nix
index 632e57826d8..4521b3c5760 100644
--- a/modules/services/scheduling/fcron.nix
+++ b/modules/services/scheduling/fcron.nix
@@ -61,7 +61,7 @@ in
       };
       
       systab = mkOption {
-        default = systemCronJobs;
+        default = "";
         description = ''The "system" crontab contents.'';
       };
     };
@@ -73,6 +73,8 @@ in
 
   config = mkIf cfg.enable {
 
+    services.fcron.systab = systemCronJobs;
+
     environment.etc =
       [ (allowdeny "allow" (cfg.allow))
         (allowdeny "deny" cfg.deny)
-- 
GitLab


From c8bca42355368449cb996b5acc21cefc61c73035 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 5 Jan 2011 11:52:45 +0000
Subject: [PATCH 2789/5331] * Update the Bittorrent test for Transmission 2.

svn path=/nixos/trunk/; revision=25422
---
 tests/bittorrent.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/tests/bittorrent.nix b/tests/bittorrent.nix
index 051454da5cc..7fbace9d41b 100644
--- a/tests/bittorrent.nix
+++ b/tests/bittorrent.nix
@@ -75,7 +75,7 @@ in
       # Create the torrent.
       $tracker->mustSucceed("mkdir /tmp/data");
       $tracker->mustSucceed("cp ${file} /tmp/data/test.tar.bz2");
-      $tracker->mustSucceed("transmissioncli -n /tmp/data/test.tar.bz2 -a http://tracker:6969/announce /tmp/test.torrent");
+      $tracker->mustSucceed("transmission-create /tmp/data/test.tar.bz2 -t http://tracker:6969/announce -o /tmp/test.torrent");
       $tracker->mustSucceed("chmod 644 /tmp/test.torrent");
 
       # Start the tracker.  !!! use a less crappy tracker
@@ -83,11 +83,11 @@ in
       $tracker->waitForOpenPort(6969);
 
       # Start the initial seeder.
-      my $pid = $tracker->mustSucceed("transmissioncli /tmp/test.torrent -M -w /tmp/data >&2 & echo \$!");
+      my $pid = $tracker->mustSucceed("transmission-cli /tmp/test.torrent -M -w /tmp/data >&2 & echo \$!");
 
       # Now we should be able to download from the client behind the NAT.
       $tracker->waitForJob("httpd");
-      $client1->mustSucceed("transmissioncli http://tracker/test.torrent -w /tmp >&2 &");
+      $client1->mustSucceed("transmission-cli http://tracker/test.torrent -w /tmp >&2 &");
       $client1->waitForFile("/tmp/test.tar.bz2");
       $client1->mustSucceed("cmp /tmp/test.tar.bz2 ${file}");
 
@@ -96,7 +96,7 @@ in
 
       # Now download from the second client.  This can only succeed if
       # the first client created a NAT hole in the router.
-      $client2->mustSucceed("transmissioncli http://tracker/test.torrent -M -w /tmp >&2 &");
+      $client2->mustSucceed("transmission-cli http://tracker/test.torrent -M -w /tmp >&2 &");
       $client2->waitForFile("/tmp/test.tar.bz2");
       $client2->mustSucceed("cmp /tmp/test.tar.bz2 ${file}");
     '';
-- 
GitLab


From 09668545907f10b839e1fc5d8ccc5dda6876da03 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 5 Jan 2011 14:04:38 +0000
Subject: [PATCH 2790/5331] * Use makeWrapper in building the test driver. * In
 the interactive test driver, provide a function "testScript" to   run the
 non-interactive test script.

svn path=/nixos/trunk/; revision=25426
---
 lib/test-driver/test-driver.pl | 16 ++++++++++++----
 lib/testing.nix                | 15 +++++++++------
 2 files changed, 21 insertions(+), 10 deletions(-)

diff --git a/lib/test-driver/test-driver.pl b/lib/test-driver/test-driver.pl
index 6735b52dd69..36257220524 100644
--- a/lib/test-driver/test-driver.pl
+++ b/lib/test-driver/test-driver.pl
@@ -1,19 +1,19 @@
-#! @perl@ -w -I@libDir@ -I@readline@
+#! /somewhere/perl
 
 use strict;
 use Machine;
 use Term::ReadLine;
+use IO::File;
+use XML::Writer;
 
 $SIG{PIPE} = 'IGNORE'; # because Unix domain sockets may die unexpectedly
 
-$ENV{PATH} = "@extraPath@:$ENV{PATH}";
-
 STDERR->autoflush(1);
 
+
 my %vms;
 my $context = "";
 
-
 foreach my $vmScript (@ARGV) {
     my $vm = Machine->new({startCommand => $vmScript});
     $vms{$vm->name} = $vm;
@@ -26,6 +26,14 @@ sub startAll {
 }
 
 
+# In interactive tests, this allows the non-interactive test script to
+# be executed conveniently.
+sub testScript {
+    eval "$context $ENV{testScript};\n";
+    warn $@ if $@;
+}
+
+
 sub runTests {
     if (defined $ENV{tests}) {
         eval "$context $ENV{tests}";
diff --git a/lib/testing.nix b/lib/testing.nix
index 3cf0bc5bf40..46ca9954ccd 100644
--- a/lib/testing.nix
+++ b/lib/testing.nix
@@ -10,7 +10,12 @@ rec {
 
   testDriver = stdenv.mkDerivation {
     name = "nixos-test-driver";
-    buildCommand =
+
+    buildInputs = [ makeWrapper perl ];
+
+    unpackPhase = "true";
+    
+    installPhase =
       ''
         mkdir -p $out/bin
         cp ${./test-driver/test-driver.pl} $out/bin/nixos-test-driver
@@ -20,11 +25,9 @@ rec {
         mkdir -p $libDir
         cp ${./test-driver/Machine.pm} $libDir/Machine.pm
 
-        substituteInPlace $out/bin/nixos-test-driver \
-          --subst-var-by perl "${perl}/bin/perl" \
-          --subst-var-by readline "${perlPackages.TermReadLineGnu}/lib/perl5/site_perl" \
-          --subst-var-by extraPath "${imagemagick}/bin" \
-          --subst-var libDir
+        wrapProgram $out/bin/nixos-test-driver \
+          --prefix PATH : "${imagemagick}/bin" \
+          --prefix PERL5LIB : "${lib.makePerlPath [ perlPackages.TermReadLineGnu perlPackages.XMLWriter ]}:$out/lib/perl5/site_perl"
       '';
   };
 
-- 
GitLab


From 7378e17f7426fd459e86ff72eb1abe8ec0d48a0c Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 5 Jan 2011 15:27:21 +0000
Subject: [PATCH 2791/5331] * Test driver: write structured log info to
 $out/log.xml (not finished   yet). * Machine->new -> createMachine (because
 VMs must be tracked in the   %vms hash).

svn path=/nixos/trunk/; revision=25427
---
 lib/test-driver/test-driver.pl | 18 +++++++++++++++---
 lib/testing.nix                |  2 +-
 tests/installer.nix            |  8 ++++----
 3 files changed, 20 insertions(+), 8 deletions(-)

diff --git a/lib/test-driver/test-driver.pl b/lib/test-driver/test-driver.pl
index 36257220524..77df6cd2bd2 100644
--- a/lib/test-driver/test-driver.pl
+++ b/lib/test-driver/test-driver.pl
@@ -1,4 +1,4 @@
-#! /somewhere/perl
+#! /somewhere/perl -w
 
 use strict;
 use Machine;
@@ -10,13 +10,23 @@ $SIG{PIPE} = 'IGNORE'; # because Unix domain sockets may die unexpectedly
 
 STDERR->autoflush(1);
 
+my $logFile = defined $ENV{LOGFILE} ? "$ENV{LOGFILE}" : "/dev/null";
+my $log = new XML::Writer(OUTPUT => new IO::File(">$logFile"));
+$log->startTag("logfile");
+
 
 my %vms;
 my $context = "";
 
-foreach my $vmScript (@ARGV) {
-    my $vm = Machine->new({startCommand => $vmScript});
+sub createMachine {
+    my ($args) = @_;
+    my $vm = Machine->new($args);
     $vms{$vm->name} = $vm;
+    return $vm;
+}
+
+foreach my $vmScript (@ARGV) {
+    my $vm = createMachine({startCommand => $vmScript});
     $context .= "my \$" . $vm->name . " = \$vms{'" . $vm->name . "'}; ";
 }
 
@@ -86,6 +96,8 @@ END {
             kill 9, $vm->{pid};
         }
     }
+    $log->endTag("logfile");
+    $log->end;
 }
 
 
diff --git a/lib/testing.nix b/lib/testing.nix
index 46ca9954ccd..4d1c389de48 100644
--- a/lib/testing.nix
+++ b/lib/testing.nix
@@ -50,7 +50,7 @@ rec {
         ''
           ensureDir $out/nix-support
 
-          ${testDriver}/bin/nixos-test-driver ${network}/vms/*/bin/run-*-vm
+          LOGFILE=$out/log.xml ${testDriver}/bin/nixos-test-driver ${network}/vms/*/bin/run-*-vm
           
           for i in */coverage-data; do
             ensureDir $out/coverage-data
diff --git a/tests/installer.nix b/tests/installer.nix
index 994d1173c2d..f4d4281a073 100644
--- a/tests/installer.nix
+++ b/tests/installer.nix
@@ -93,7 +93,7 @@ let
     ''
       createDisk("harddisk", 4 * 1024);
 
-      my $machine = Machine->new({ hda => "harddisk", cdrom => glob("${iso}/iso/*.iso"), qemuFlags => '${qemuNICFlags 1 1 1}' });
+      my $machine = createMachine({ hda => "harddisk", cdrom => glob("${iso}/iso/*.iso"), qemuFlags => '${qemuNICFlags 1 1 1}' });
       $machine->start;
 
       ${optionalString testChannel ''
@@ -158,7 +158,7 @@ let
       $machine->shutdown;
 
       # Now see if we can boot the installation.
-      my $machine = Machine->new({ hda => "harddisk" });
+      my $machine = createMachine({ hda => "harddisk" });
       
       # Did /boot get mounted, if appropriate?
       # !!! There is currently no good way to wait for the
@@ -181,7 +181,7 @@ let
 
       # And just to be sure, check that the machine still boots after
       # "nixos-rebuild switch".
-      my $machine = Machine->new({ hda => "harddisk" });
+      my $machine = createMachine({ hda => "harddisk" });
       $machine->mustSucceed("echo hello");
       $machine->shutdown;
     '';
@@ -304,7 +304,7 @@ in {
       testScript =
         ''
           # damn, it's costly to evaluate nixos-rebuild (1G of ram)
-          my $machine = Machine->new({ cdrom => glob("${iso}/iso/*.iso"), qemuFlags => '${qemuNICFlags 1 1 1} -m 1024' });
+          my $machine = createMachine({ cdrom => glob("${iso}/iso/*.iso"), qemuFlags => '${qemuNICFlags 1 1 1} -m 1024' });
           $machine->start;
 
           # Make sure that we don't try to download anything.
-- 
GitLab


From f2a0929116a3e034533f61677de3ae7c53e26e03 Mon Sep 17 00:00:00 2001
From: Rob Vermaas <rob.vermaas@gmail.com>
Date: Thu, 6 Jan 2011 10:21:38 +0000
Subject: [PATCH 2792/5331] typo

svn path=/nixos/trunk/; revision=25438
---
 modules/services/backup/hydra-mirror.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/services/backup/hydra-mirror.nix b/modules/services/backup/hydra-mirror.nix
index dc37e4e92d5..58cccda709f 100644
--- a/modules/services/backup/hydra-mirror.nix
+++ b/modules/services/backup/hydra-mirror.nix
@@ -114,8 +114,8 @@ in
         chown ${cfg.user} ${cfg.dataDir}/logs
 
         ${concatMapStrings (j : ''
-          mkdir -m 0755 -p ${cfg.dataDir}/{j.project}/channels/${j.name}
-          chown ${cfg.user} ${cfg.dataDir}/{j.project}/channels/${j.name}
+          mkdir -m 0755 -p ${cfg.dataDir}/${j.project}/channels/${j.name}
+          chown ${cfg.user} ${cfg.dataDir}/${j.project}/channels/${j.name}
         '') cfg.jobsets}
       '';
     
-- 
GitLab


From e343a16a36ae05aaeb171fcdba32ff251e0de53c Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 6 Jan 2011 17:28:35 +0000
Subject: [PATCH 2793/5331] * Improved logging in the test driver. * Support
 subtests.

svn path=/nixos/trunk/; revision=25451
---
 lib/test-driver/Logger.pm      |  68 +++++++++++++++
 lib/test-driver/Machine.pm     | 147 +++++++++++++++++++++------------
 lib/test-driver/test-driver.pl |  35 ++++++--
 lib/testing.nix                |   1 +
 tests/login.nix                |  66 +++++++++------
 5 files changed, 229 insertions(+), 88 deletions(-)
 create mode 100644 lib/test-driver/Logger.pm

diff --git a/lib/test-driver/Logger.pm b/lib/test-driver/Logger.pm
new file mode 100644
index 00000000000..b2d31b8820f
--- /dev/null
+++ b/lib/test-driver/Logger.pm
@@ -0,0 +1,68 @@
+package Logger;
+
+use strict;
+use Thread::Queue;
+use XML::Writer;
+
+sub new {
+    my ($class) = @_;
+    
+    my $logFile = defined $ENV{LOGFILE} ? "$ENV{LOGFILE}" : "/dev/null";
+    my $log = new XML::Writer(OUTPUT => new IO::File(">$logFile"));
+    
+    my $self = {
+        log => $log,
+        logQueue => Thread::Queue->new()
+    };
+    
+    $self->{log}->startTag("logfile");
+    
+    bless $self, $class;
+    return $self;
+}
+
+sub close {
+    my ($self) = @_;
+    $self->{log}->endTag("logfile");
+    $self->{log}->end;
+}
+
+sub drainLogQueue {
+    my ($self) = @_;
+    while (defined (my $item = $self->{logQueue}->dequeue_nb())) {
+        $self->{log}->dataElement("line", sanitise($item->{msg}), 'machine' => $item->{machine}, 'type' => 'serial');
+    }
+}
+
+sub maybePrefix {
+    my ($msg, $attrs) = @_;
+    $msg = $attrs->{machine} . ": " . $msg if defined $attrs->{machine};
+    return $msg;
+}
+
+sub nest {
+    my ($self, $msg, $coderef, $attrs) = @_;
+    print STDERR maybePrefix("$msg\n", $attrs);
+    $self->{log}->startTag("nest");
+    $self->{log}->dataElement("head", $msg, %{$attrs});
+    $self->drainLogQueue();
+    &$coderef;
+    $self->drainLogQueue();
+    $self->{log}->endTag("nest");
+}
+
+sub sanitise {
+    my ($s) = @_;
+    $s =~ s/[[:cntrl:]\xff]//g;
+    return $s;
+}
+
+sub log {
+    my ($self, $msg, $attrs) = @_;
+    chomp $msg;
+    print STDERR maybePrefix("$msg\n", $attrs);
+    $self->drainLogQueue();
+    $self->{log}->dataElement("line", $msg, %{$attrs});
+}
+
+1;
diff --git a/lib/test-driver/Machine.pm b/lib/test-driver/Machine.pm
index abf08c7fcf2..e540da7b1c5 100644
--- a/lib/test-driver/Machine.pm
+++ b/lib/test-driver/Machine.pm
@@ -7,6 +7,7 @@ use IO::Handle;
 use POSIX qw(dup2);
 use FileHandle;
 use Cwd;
+use File::Basename;
 
 
 # Stuff our PID in the multicast address/port to prevent collissions
@@ -58,6 +59,7 @@ sub new {
         socket => undef,
         stateDir => "$tmpDir/vm-state-$name",
         monitor => undef,
+        log => $args->{log},
     };
 
     mkdir $self->{stateDir}, 0700;
@@ -69,8 +71,13 @@ sub new {
 
 sub log {
     my ($self, $msg) = @_;
-    chomp $msg;
-    print STDERR $self->{name}, ": $msg\n";
+    $self->{log}->log($msg, { machine => $self->{name} });
+}
+
+
+sub nest {
+    my ($self, $msg, $coderef, $attrs) = @_;
+    $self->{log}->nest($msg, $coderef, { %{$attrs || {}}, machine => $self->{name} });
 }
 
 
@@ -146,7 +153,8 @@ sub start {
         while (<$serialP>) {
             chomp;
             s/\r$//;
-            print STDERR $self->name, "# $_\n";
+            print STDERR $self->{name}, "# $_\n";
+            $self->{log}->{logQueue}->enqueue({msg => $_, machine => $self->{name}}); # !!!
         }
     }
 
@@ -214,26 +222,32 @@ sub connect {
     my ($self) = @_;
     return if $self->{connected};
 
-    $self->start;
+    $self->nest("waiting for the VM to finish booting", sub {
 
-    local $SIG{ALRM} = sub { die "timed out waiting for the guest to connect\n"; };
-    alarm 300;
-    readline $self->{socket} or die;
-    alarm 0;
+        $self->start;
+
+        local $SIG{ALRM} = sub { die "timed out waiting for the guest to connect\n"; };
+        alarm 300;
+        readline $self->{socket} or die;
+        alarm 0;
         
-    $self->log("connected to guest root shell");
-    $self->{connected} = 1;
+        $self->log("connected to guest root shell");
+        $self->{connected} = 1;
+
+    });
 }
 
 
 sub waitForShutdown {
     my ($self) = @_;
     return unless $self->{booted};
-    
-    waitpid $self->{pid}, 0;
-    $self->{pid} = 0;
-    $self->{booted} = 0;
-    $self->{connected} = 0;
+
+    $self->nest("waiting for the VM to power off", sub {
+        waitpid $self->{pid}, 0;
+        $self->{pid} = 0;
+        $self->{booted} = 0;
+        $self->{connected} = 0;
+    });
 }
 
 
@@ -243,13 +257,11 @@ sub isUp {
 }
 
 
-sub execute {
+sub execute_ {
     my ($self, $command) = @_;
     
     $self->connect;
 
-    $self->log("running command: $command");
-
     print { $self->{socket} } ("( $command ); echo '|!=EOF' \$?\n");
 
     my $out = "";
@@ -268,17 +280,31 @@ sub execute {
 }
 
 
+sub execute {
+    my ($self, $command) = @_;
+    my @res;
+    $self->nest("running command: $command", sub {
+        @res = $self->execute_($command);
+    });
+    return @res;
+}
+
+
 sub succeed {
     my ($self, @commands) = @_;
+
     my $res;
     foreach my $command (@commands) {
-        my ($status, $out) = $self->execute($command);
-        if ($status != 0) {
-            $self->log("output: $out");
-            die "command `$command' did not succeed (exit code $status)\n";
-        }
-        $res .= $out;
+        $self->nest("must succeed: $command", sub {
+            my ($status, $out) = $self->execute_($command);
+            if ($status != 0) {
+                $self->log("output: $out");
+                die "command `$command' did not succeed (exit code $status)\n";
+            }
+            $res .= $out;
+        });
     }
+
     return $res;
 }
 
@@ -290,27 +316,33 @@ sub mustSucceed {
 
 sub waitUntilSucceeds {
     my ($self, $command) = @_;
-    retry sub {
-        my ($status, $out) = $self->execute($command);
-        return 1 if $status == 0;
-    };
+    $self->nest("waiting for success: $command", sub {
+        retry sub {
+            my ($status, $out) = $self->execute($command);
+            return 1 if $status == 0;
+        };
+    });
 }
 
 
 sub waitUntilFails {
     my ($self, $command) = @_;
-    retry sub {
-        my ($status, $out) = $self->execute($command);
-        return 1 if $status != 0;
-    };
+    $self->nest("waiting for failure: $command", sub {
+        retry sub {
+            my ($status, $out) = $self->execute($command);
+            return 1 if $status != 0;
+        };
+    });
 }
 
 
 sub fail {
     my ($self, $command) = @_;
-    my ($status, $out) = $self->execute($command);
-    die "command `$command' unexpectedly succeeded"
-        if $status == 0;
+    $self->nest("must fail: $command", sub {
+        my ($status, $out) = $self->execute_($command);
+        die "command `$command' unexpectedly succeeded"
+            if $status == 0;
+    });
 }
 
 
@@ -322,20 +354,24 @@ sub mustFail {
 # Wait for an Upstart job to reach the "running" state.
 sub waitForJob {
     my ($self, $jobName) = @_;
-    retry sub {
-        my ($status, $out) = $self->execute("initctl status $jobName");
-        return 1 if $out =~ /start\/running/;
-    };
+    $self->nest("waiting for job ‘$jobName’", sub {
+        retry sub {
+            my ($status, $out) = $self->execute("initctl status $jobName");
+            return 1 if $out =~ /start\/running/;
+        };
+    });
 }
 
 
 # Wait until the specified file exists.
 sub waitForFile {
     my ($self, $fileName) = @_;
-    retry sub {
-        my ($status, $out) = $self->execute("test -e $fileName");
-        return 1 if $status == 0;
-    }
+    $self->nest("waiting for file ‘$fileName’", sub {
+        retry sub {
+            my ($status, $out) = $self->execute("test -e $fileName");
+            return 1 if $status == 0;
+        }
+    });
 }
 
 sub startJob {
@@ -356,10 +392,12 @@ sub stopJob {
 # Wait until the machine is listening on the given TCP port.
 sub waitForOpenPort {
     my ($self, $port) = @_;
-    retry sub {
-        my ($status, $out) = $self->execute("nc -z localhost $port");
-        return 1 if $status == 0;
-    }
+    $self->nest("waiting for TCP port $port", sub {
+        retry sub {
+            my ($status, $out) = $self->execute("nc -z localhost $port");
+            return 1 if $status == 0;
+        }
+    });
 }
 
 
@@ -415,10 +453,13 @@ sub screenshot {
     my $dir = $ENV{'out'} || Cwd::abs_path(".");
     $filename = "$dir/${filename}.png" if $filename =~ /^\w+$/;
     my $tmp = "${filename}.ppm";
-    $self->sendMonitorCommand("screendump $tmp");
-    system("convert $tmp ${filename}") == 0
-        or die "cannot convert screenshot";
-    unlink $tmp;
+    my $name = basename($filename);
+    $self->nest("making screenshot ‘$name’", sub {
+        $self->sendMonitorCommand("screendump $tmp");
+        system("convert $tmp ${filename}") == 0
+            or die "cannot convert screenshot";
+        unlink $tmp;
+    }, { image => $name } );
 }
 
 
@@ -471,7 +512,9 @@ sub sendKeys {
 
 sub sendChars {
     my ($self, $chars) = @_;
-    $self->sendKeys(split //, $chars);
+    $self->nest("sending keys ‘$chars’", sub {
+        $self->sendKeys(split //, $chars);
+    });
 }
 
 
diff --git a/lib/test-driver/test-driver.pl b/lib/test-driver/test-driver.pl
index 77df6cd2bd2..db92a951b16 100644
--- a/lib/test-driver/test-driver.pl
+++ b/lib/test-driver/test-driver.pl
@@ -4,15 +4,13 @@ use strict;
 use Machine;
 use Term::ReadLine;
 use IO::File;
-use XML::Writer;
+use Logger;
 
 $SIG{PIPE} = 'IGNORE'; # because Unix domain sockets may die unexpectedly
 
 STDERR->autoflush(1);
 
-my $logFile = defined $ENV{LOGFILE} ? "$ENV{LOGFILE}" : "/dev/null";
-my $log = new XML::Writer(OUTPUT => new IO::File(">$logFile"));
-$log->startTag("logfile");
+my $log = new Logger;
 
 
 my %vms;
@@ -20,7 +18,7 @@ my $context = "";
 
 sub createMachine {
     my ($args) = @_;
-    my $vm = Machine->new($args);
+    my $vm = Machine->new({%{$args}, log => $log});
     $vms{$vm->name} = $vm;
     return $vm;
 }
@@ -32,7 +30,9 @@ foreach my $vmScript (@ARGV) {
 
 
 sub startAll {
-    $_->start foreach values %vms;
+    $log->nest("starting all VMs", sub {
+        $_->start foreach values %vms;
+    });
 }
 
 
@@ -44,6 +44,20 @@ sub testScript {
 }
 
 
+my $nrTests = 0;
+my $nrSucceeded = 0;
+
+
+sub subtest {
+    my ($name, $coderef) = @_;
+    $log->nest("subtest: $name", sub {
+        $nrTests++;
+        &$coderef;
+        $nrSucceeded++;
+    });
+}
+
+
 sub runTests {
     if (defined $ENV{tests}) {
         eval "$context $ENV{tests}";
@@ -77,6 +91,10 @@ sub runTests {
         # Copy all the *.gcda files.
         $vm->execute("for d in $gcovDir/nix/store/*/.build/linux-*; do for i in \$(cd \$d && find -name '*.gcda'); do echo \$i; mkdir -p $coverageDir/\$(dirname \$i); cp -v \$d/\$i $coverageDir/\$i; done; done");
     }
+
+    if ($nrTests != 0) {
+        #$log->dataElement("line", "$nrSucceeded out of $nrTests tests succeeded");
+    }
 }
 
 
@@ -92,12 +110,11 @@ sub createDisk {
 END {
     foreach my $vm (values %vms) {
         if ($vm->{pid}) {
-            print STDERR "killing ", $vm->{name}, " (pid ", $vm->{pid}, ")\n";
+            $log->log("killing " . $vm->{name} . " (pid " . $vm->{pid} . ")");
             kill 9, $vm->{pid};
         }
     }
-    $log->endTag("logfile");
-    $log->end;
+    $log->close();
 }
 
 
diff --git a/lib/testing.nix b/lib/testing.nix
index 4d1c389de48..f02d4de251c 100644
--- a/lib/testing.nix
+++ b/lib/testing.nix
@@ -24,6 +24,7 @@ rec {
         libDir=$out/lib/perl5/site_perl
         mkdir -p $libDir
         cp ${./test-driver/Machine.pm} $libDir/Machine.pm
+        cp ${./test-driver/Logger.pm} $libDir/Logger.pm
 
         wrapProgram $out/bin/nixos-test-driver \
           --prefix PATH : "${imagemagick}/bin" \
diff --git a/tests/login.nix b/tests/login.nix
index c4524612295..944d9932fcc 100644
--- a/tests/login.nix
+++ b/tests/login.nix
@@ -6,43 +6,55 @@
 
   testScript =
     ''
-      $machine->mustSucceed("useradd -m alice");
-      $machine->mustSucceed("(echo foobar; echo foobar) | passwd alice");
+      subtest "create user", sub {
+          $machine->succeed("useradd -m alice");
+          $machine->succeed("(echo foobar; echo foobar) | passwd alice");
+      };
 
-      # Log in as alice on a virtual console.      
-      $machine->waitForJob("tty1");
-      $machine->sendChars("alice\n");
-      $machine->waitUntilSucceeds("pgrep login");
-      $machine->execute("sleep 2"); # urgh: wait for `Password:'
-      $machine->sendChars("foobar\n");
-      $machine->waitUntilSucceeds("pgrep -u alice bash");
-      $machine->sendChars("touch done\n");
-      $machine->waitForFile("/home/alice/done");
+      # Log in as alice on a virtual console.
+      subtest "virtual console login", sub {
+          $machine->waitForJob("tty1");
+          $machine->sendChars("alice\n");
+          $machine->waitUntilSucceeds("pgrep login");
+          $machine->execute("sleep 2"); # urgh: wait for `Password:'
+          $machine->sendChars("foobar\n");
+          $machine->waitUntilSucceeds("pgrep -u alice bash");
+          $machine->sendChars("touch done\n");
+          $machine->waitForFile("/home/alice/done");
+      };
       
       # Check whether switching VTs works.
-      $machine->sendKeys("alt-f10");
-      $machine->waitUntilSucceeds("[ \$(fgconsole) = 10 ]");
-      $machine->execute("sleep 2"); # allow fbcondecor to catch up (not important)
-      $machine->screenshot("syslog");
+      subtest "virtual console switching", sub {
+          $machine->sendKeys("alt-f10");
+          $machine->waitUntilSucceeds("[ \$(fgconsole) = 10 ]");
+          $machine->execute("sleep 2"); # allow fbcondecor to catch up (not important)
+          $machine->screenshot("syslog");
+      };
 
       # Check whether ConsoleKit/udev gives and removes device
       # ownership as needed.
-      $machine->mustSucceed("chvt 1");
-      $machine->execute("sleep 1"); # urgh
-      $machine->mustSucceed("getfacl /dev/snd/timer | grep -q alice");
-      $machine->mustSucceed("chvt 2");
-      $machine->execute("sleep 1"); # urgh
-      $machine->mustFail("getfacl /dev/snd/timer | grep -q alice");
+      subtest "device permissions", sub {
+          $machine->succeed("chvt 1");
+          $machine->execute("sleep 1"); # urgh
+          $machine->succeed("getfacl /dev/snd/timer | grep -q alice");
+          $machine->succeed("chvt 2");
+          $machine->execute("sleep 1"); # urgh
+          $machine->fail("getfacl /dev/snd/timer | grep -q alice");
+      };
 
       # Log out.
-      $machine->mustSucceed("chvt 1");
-      $machine->sendChars("exit\n");
-      $machine->waitUntilFails("pgrep -u alice bash");
-      $machine->screenshot("mingetty");
+      subtest "virtual console logout", sub {
+          $machine->succeed("chvt 1");
+          $machine->sendChars("exit\n");
+          $machine->waitUntilFails("pgrep -u alice bash");
+          $machine->screenshot("mingetty");
+      };
       
       # Check whether ctrl-alt-delete works.
-      $machine->sendKeys("ctrl-alt-delete");
-      $machine->waitForShutdown;
+      subtest "ctrl-alt-delete", sub {
+          $machine->sendKeys("ctrl-alt-delete");
+          $machine->waitForShutdown;
+      };
     '';
   
 }
-- 
GitLab


From 405e4dd42e60719b8835e21f8e8c2bb37bf7bacf Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sun, 9 Jan 2011 15:44:48 +0000
Subject: [PATCH 2794/5331] * Somewhere "set_link" stopped accepting "down" and
 "up" as valid   parameters.

svn path=/nixos/trunk/; revision=25466
---
 lib/test-driver/Machine.pm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/test-driver/Machine.pm b/lib/test-driver/Machine.pm
index e540da7b1c5..5d8d967431c 100644
--- a/lib/test-driver/Machine.pm
+++ b/lib/test-driver/Machine.pm
@@ -436,14 +436,14 @@ sub crash {
 # the test driver can continue to talk to the machine.
 sub block {
     my ($self) = @_;
-    $self->sendMonitorCommand("set_link virtio-net-pci.1 down");
+    $self->sendMonitorCommand("set_link virtio-net-pci.1 off");
 }
 
 
 # Make the machine reachable.
 sub unblock {
     my ($self) = @_;
-    $self->sendMonitorCommand("set_link virtio-net-pci.1 up");
+    $self->sendMonitorCommand("set_link virtio-net-pci.1 on");
 }
 
 
-- 
GitLab


From e4c1fb3ea72417cf0e253556eefba926905e80b7 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sun, 9 Jan 2011 17:58:52 +0000
Subject: [PATCH 2795/5331] * Pretty-print the VM build log and publish it as a
 build product.

svn path=/nixos/trunk/; revision=25468
---
 lib/test-driver/log2html.xsl   | 117 +++++++++++++++++++++++++++++++++
 lib/test-driver/logfile.css    | 110 +++++++++++++++++++++++++++++++
 lib/test-driver/test-driver.pl |   6 +-
 lib/test-driver/treebits.js    |  40 +++++++++++
 lib/testing.nix                |   9 ++-
 5 files changed, 279 insertions(+), 3 deletions(-)
 create mode 100644 lib/test-driver/log2html.xsl
 create mode 100644 lib/test-driver/logfile.css
 create mode 100644 lib/test-driver/treebits.js

diff --git a/lib/test-driver/log2html.xsl b/lib/test-driver/log2html.xsl
new file mode 100644
index 00000000000..cf7f8f8c057
--- /dev/null
+++ b/lib/test-driver/log2html.xsl
@@ -0,0 +1,117 @@
+<?xml version="1.0"?>
+
+<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
+
+  <xsl:output method='html' encoding="UTF-8"
+              doctype-public="-//W3C//DTD HTML 4.01//EN"
+              doctype-system="http://www.w3.org/TR/html4/strict.dtd" />
+
+  <xsl:template match="logfile">
+    <html>
+      <head>
+        <script type="text/javascript" src="jquery.min.js"></script> 
+        <script type="text/javascript" src="jquery-ui.min.js"></script>
+        <script type="text/javascript" src="treebits.js" />
+        <link rel="stylesheet" href="logfile.css" type="text/css" />
+        <title>Log File</title>
+      </head>
+      <body>
+        [<a href="javascript:" class="logTreeExpandAll">Expand all</a>]
+        [<a href="javascript:" class="logTreeCollapseAll">Collapse all</a>]
+        <ul class='toplevel'>
+          <xsl:for-each select='line|nest'>
+            <li>
+              <xsl:apply-templates select='.'/>
+            </li>
+          </xsl:for-each>
+        </ul>
+      </body>
+    </html>
+  </xsl:template>
+
+  
+  <xsl:template match="nest">
+
+    <!-- The tree should be collapsed by default if all children are
+         unimportant or if the header is unimportant. -->
+    <xsl:variable name="collapsed" select="not(./head[@expanded]) and count(.//*[@error]) = 0"/>
+                  
+    <xsl:variable name="style"><xsl:if test="$collapsed">display: none;</xsl:if></xsl:variable>
+
+    <xsl:if test="line|nest">
+      <a href="javascript:" class="logTreeToggle"></a>
+      <xsl:text> </xsl:text>
+    </xsl:if>
+    
+    <xsl:apply-templates select='head'/>
+
+    <!-- Be careful to only generate <ul>s if there are <li>s, otherwise it’s malformed. -->
+    <xsl:if test="line|nest">
+      
+      <ul class='nesting' style="{$style}">
+        <xsl:for-each select='line|nest'>
+
+          <!-- Is this the last line?  If so, mark it as such so that it
+               can be rendered differently. -->
+          <xsl:variable  name="class"><xsl:choose><xsl:when test="position() != last()">line</xsl:when><xsl:otherwise>lastline</xsl:otherwise></xsl:choose></xsl:variable>
+        
+          <li class='{$class}'>
+            <span class='lineconn' />
+            <span class='linebody'>
+              <xsl:apply-templates select='.'/>
+            </span>
+          </li>
+        </xsl:for-each>
+      </ul>
+    </xsl:if>
+    
+  </xsl:template>
+
+  
+  <xsl:template match="head|line">
+    <code>
+      <xsl:if test="@error">
+        <xsl:attribute name="class">errorLine</xsl:attribute>
+      </xsl:if>
+      <xsl:if test="@warning">
+        <xsl:attribute name="class">warningLine</xsl:attribute>
+      </xsl:if>
+      <xsl:if test="@priority = 3">
+        <xsl:attribute name="class">prio3</xsl:attribute>
+      </xsl:if>
+
+      <xsl:if test="@type = 'serial'">
+        <xsl:attribute name="class">serial</xsl:attribute>
+      </xsl:if>
+      
+      <xsl:if test="@machine">
+        <xsl:choose>
+          <xsl:when test="@type = 'serial'">
+            <span class="machine"><xsl:value-of select="@machine"/># </span>
+          </xsl:when>
+          <xsl:otherwise>
+            <span class="machine"><xsl:value-of select="@machine"/>: </span>
+          </xsl:otherwise>
+        </xsl:choose>
+      </xsl:if>
+      
+      <xsl:choose>
+        <xsl:when test="@image">
+          <a href="{@image}"><xsl:apply-templates/></a>
+        </xsl:when>
+        <xsl:otherwise>
+          <xsl:apply-templates/>
+        </xsl:otherwise>
+      </xsl:choose>        
+    </code>
+  </xsl:template>
+
+  
+  <xsl:template match="storeref">
+    <em class='storeref'>
+      <span class='popup'><xsl:apply-templates/></span>
+      <span class='elided'>/...</span><xsl:apply-templates select='name'/><xsl:apply-templates select='path'/>
+    </em>
+  </xsl:template>
+  
+</xsl:stylesheet>
\ No newline at end of file
diff --git a/lib/test-driver/logfile.css b/lib/test-driver/logfile.css
new file mode 100644
index 00000000000..a7f83b4c925
--- /dev/null
+++ b/lib/test-driver/logfile.css
@@ -0,0 +1,110 @@
+body {
+    font-family: sans-serif;
+    background: white;
+}
+
+
+ul.nesting, ul.toplevel {
+    padding: 0;
+    margin: 0;
+}
+
+ul.toplevel {
+    list-style-type: none;
+}
+
+.line, .head {
+    padding-top: 0em;
+}
+
+ul.nesting li.line, ul.nesting li.lastline {
+    position: relative;
+    list-style-type: none;
+}
+
+ul.nesting li.line {
+    padding-left: 2.0em;
+}
+
+ul.nesting li.lastline {
+    padding-left: 2.1em; /* for the 0.1em border-left in .lastline > .lineconn */
+}
+
+li.line {
+    border-left: 0.1em solid #6185a0;
+}
+
+li.line > span.lineconn, li.lastline > span.lineconn {
+    position: absolute;
+    height: 0.65em;
+    left: 0em;
+    width: 1.5em;
+    border-bottom: 0.1em solid #6185a0;
+}
+
+li.lastline > span.lineconn {
+    border-left: 0.1em solid #6185a0;
+}
+
+
+em.storeref {
+    color: #500000;
+    position: relative; 
+    width: 100%;
+}
+
+em.storeref:hover {
+    background-color: #eeeeee;
+}
+
+*.popup {
+    display: none;
+/*    background: url('http://losser.st-lab.cs.uu.nl/~mbravenb/menuback.png') repeat; */
+    background: #ffffcd;
+    border: solid #555555 1px;
+    position: absolute;
+    top: 0em;
+    left: 0em;
+    margin: 0;
+    padding: 0;
+    z-index: 100;
+}
+
+em.storeref:hover span.popup {
+    display: inline;
+    width: 40em;
+}
+
+
+.logTreeToggle {
+    text-decoration: none;
+    font-family: monospace;
+    font-size: larger;
+}
+
+.errorLine {
+    color: #ff0000;
+    font-weight: bold;
+}
+
+.warningLine {
+    color: darkorange;
+    font-weight: bold;
+}
+
+.prio3 {
+    font-style: italic;
+}
+
+code {
+    white-space: pre-wrap;
+}
+
+.serial {
+    color: #56115c;
+}
+
+.machine {
+    color: #002399;
+    font-style: italic;
+}
diff --git a/lib/test-driver/test-driver.pl b/lib/test-driver/test-driver.pl
index db92a951b16..0ccde63fc3e 100644
--- a/lib/test-driver/test-driver.pl
+++ b/lib/test-driver/test-driver.pl
@@ -60,8 +60,10 @@ sub subtest {
 
 sub runTests {
     if (defined $ENV{tests}) {
-        eval "$context $ENV{tests}";
-        die $@ if $@;
+        $log->nest("running the VM test script", sub {
+            eval "$context $ENV{tests}";
+            die $@ if $@;
+        }, { expanded => 1 });
     } else {
         my $term = Term::ReadLine->new('nixos-vm-test');
         $term->ReadHistory;
diff --git a/lib/test-driver/treebits.js b/lib/test-driver/treebits.js
new file mode 100644
index 00000000000..d88ac075fd9
--- /dev/null
+++ b/lib/test-driver/treebits.js
@@ -0,0 +1,40 @@
+$(document).ready(function() {
+
+    /* Set the appearance of the toggle depending on whether the
+       corresponding subtree is initially shown or hidden. */
+    $(".logTreeToggle").map(function() {
+        if ($(this).siblings("ul:hidden").length == 0) {
+            $(this).text("-");
+        } else {
+            $(this).text("+");
+        }
+    });
+
+    /* When a toggle is clicked, show or hide the subtree. */
+    $(".logTreeToggle").click(function() {
+        if ($(this).siblings("ul:hidden").length != 0) {
+            $(this).siblings("ul").show();
+            $(this).text("-");
+        } else {
+            $(this).siblings("ul").hide();
+            $(this).text("+");
+        }
+    });
+
+    /* Implementation of the expand all link. */
+    $(".logTreeExpandAll").click(function() {
+        $(".logTreeToggle", $(this).siblings(".toplevel")).map(function() {
+            $(this).siblings("ul").show();
+            $(this).text("-");
+        });
+    });
+
+    /* Implementation of the collapse all link. */
+    $(".logTreeCollapseAll").click(function() {
+        $(".logTreeToggle", $(this).siblings(".toplevel")).map(function() {
+            $(this).siblings("ul").hide();
+            $(this).text("+");
+        });
+    });
+
+});
diff --git a/lib/testing.nix b/lib/testing.nix
index f02d4de251c..7a0e9ea4347 100644
--- a/lib/testing.nix
+++ b/lib/testing.nix
@@ -45,7 +45,7 @@ rec {
       
       inherit tests;
       
-      buildInputs = [ pkgs.qemu_kvm ];
+      buildInputs = [ pkgs.qemu_kvm pkgs.libxslt ];
 
       buildCommand =
         ''
@@ -58,7 +58,14 @@ rec {
             mv $i $out/coverage-data/$(dirname $i)
           done
 
+          xsltproc --output $out/log.html ${./test-driver/log2html.xsl} $out/log.xml
+          ln -s ${./test-driver/logfile.css} $out/logfile.css
+          ln -s ${./test-driver/treebits.js} $out/treebits.js
+          ln -s ${pkgs.jquery_ui}/js/jquery.min.js $out/
+          ln -s ${pkgs.jquery_ui}/js/jquery-ui.min.js $out/
+
           touch $out/nix-support/hydra-build-products
+          echo "report testlog $i" >> $out/nix-support/hydra-build-products
 
           for i in $out/*.png; do
             echo "report screenshot $i" >> $out/nix-support/hydra-build-products
-- 
GitLab


From a3aa97009c9619a21c21292de2c0ac890ba69fd3 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sun, 9 Jan 2011 18:16:59 +0000
Subject: [PATCH 2796/5331] * Doh.

svn path=/nixos/trunk/; revision=25469
---
 lib/testing.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/testing.nix b/lib/testing.nix
index 7a0e9ea4347..ebc5cd46946 100644
--- a/lib/testing.nix
+++ b/lib/testing.nix
@@ -65,7 +65,7 @@ rec {
           ln -s ${pkgs.jquery_ui}/js/jquery-ui.min.js $out/
 
           touch $out/nix-support/hydra-build-products
-          echo "report testlog $i" >> $out/nix-support/hydra-build-products
+          echo "report testlog log.html" >> $out/nix-support/hydra-build-products
 
           for i in $out/*.png; do
             echo "report screenshot $i" >> $out/nix-support/hydra-build-products
-- 
GitLab


From 7adc21218fb16a210bbd6fac8e03a2fb696d96c5 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sun, 9 Jan 2011 18:17:17 +0000
Subject: [PATCH 2797/5331] * Simulate connection interruptions.

svn path=/nixos/trunk/; revision=25470
---
 tests/quake3.nix | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/tests/quake3.nix b/tests/quake3.nix
index 1a9f53d1a56..faaf8d2c539 100644
--- a/tests/quake3.nix
+++ b/tests/quake3.nix
@@ -42,10 +42,21 @@ rec {
       $server->waitUntilSucceeds("grep -q 'Foo.*entered the game' /tmp/log");
       $server->waitUntilSucceeds("grep -q 'Bar.*entered the game' /tmp/log");
 
-      sleep 30; # wait for a while to get a nice screenshot
+      sleep 10; # wait for a while to get a nice screenshot
+
+      $client1->block();
+
+      sleep 20;
 
       $client1->screenshot("screen1");
       $client2->screenshot("screen2");
+
+      $client1->unblock();
+
+      sleep 10;
+
+      $client1->screenshot("screen3");
+      $client2->screenshot("screen4");
     '';
   
 }
-- 
GitLab


From 260d9faee70846b99439417f91671a1211074448 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sun, 9 Jan 2011 18:31:03 +0000
Subject: [PATCH 2798/5331] * Urgh.

svn path=/nixos/trunk/; revision=25471
---
 lib/testing.nix | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/lib/testing.nix b/lib/testing.nix
index ebc5cd46946..045b5b646b8 100644
--- a/lib/testing.nix
+++ b/lib/testing.nix
@@ -65,11 +65,7 @@ rec {
           ln -s ${pkgs.jquery_ui}/js/jquery-ui.min.js $out/
 
           touch $out/nix-support/hydra-build-products
-          echo "report testlog log.html" >> $out/nix-support/hydra-build-products
-
-          for i in $out/*.png; do
-            echo "report screenshot $i" >> $out/nix-support/hydra-build-products
-          done
+          echo "report testlog $out/log.html" >> $out/nix-support/hydra-build-products
         ''; # */
     };
 
-- 
GitLab


From 7fd8ce0d95032cefba81f689f868e415f20f6190 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sun, 9 Jan 2011 18:46:02 +0000
Subject: [PATCH 2799/5331] * If a subtest fails, continue to the next subtest.

svn path=/nixos/trunk/; revision=25472
---
 lib/test-driver/Logger.pm      |  4 +++-
 lib/test-driver/test-driver.pl | 11 ++++++++---
 lib/testing.nix                |  2 +-
 3 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/lib/test-driver/Logger.pm b/lib/test-driver/Logger.pm
index b2d31b8820f..6e62fdfd770 100644
--- a/lib/test-driver/Logger.pm
+++ b/lib/test-driver/Logger.pm
@@ -46,9 +46,11 @@ sub nest {
     $self->{log}->startTag("nest");
     $self->{log}->dataElement("head", $msg, %{$attrs});
     $self->drainLogQueue();
-    &$coderef;
+    eval { &$coderef };
+    my $res = $@;
     $self->drainLogQueue();
     $self->{log}->endTag("nest");
+    die $@ if $@;
 }
 
 sub sanitise {
diff --git a/lib/test-driver/test-driver.pl b/lib/test-driver/test-driver.pl
index 0ccde63fc3e..1007546804b 100644
--- a/lib/test-driver/test-driver.pl
+++ b/lib/test-driver/test-driver.pl
@@ -52,8 +52,12 @@ sub subtest {
     my ($name, $coderef) = @_;
     $log->nest("subtest: $name", sub {
         $nrTests++;
-        &$coderef;
-        $nrSucceeded++;
+        eval { &$coderef };
+        if ($@) {
+            $log->log("error: $@", { error => 1 });
+        } else {
+            $nrSucceeded++;
+        }
     });
 }
 
@@ -95,7 +99,8 @@ sub runTests {
     }
 
     if ($nrTests != 0) {
-        #$log->dataElement("line", "$nrSucceeded out of $nrTests tests succeeded");
+        $log->log("$nrSucceeded out of $nrTests tests succeeded",
+            ($nrSucceeded != $nrTests ? { error => 1 } : { }));
     }
 }
 
diff --git a/lib/testing.nix b/lib/testing.nix
index 045b5b646b8..16e38771172 100644
--- a/lib/testing.nix
+++ b/lib/testing.nix
@@ -65,7 +65,7 @@ rec {
           ln -s ${pkgs.jquery_ui}/js/jquery-ui.min.js $out/
 
           touch $out/nix-support/hydra-build-products
-          echo "report testlog $out/log.html" >> $out/nix-support/hydra-build-products
+          echo "report testlog $out log.html" >> $out/nix-support/hydra-build-products
         ''; # */
     };
 
-- 
GitLab


From b5b7375eea15614d984c1696fbe74895719260dd Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sun, 9 Jan 2011 18:56:11 +0000
Subject: [PATCH 2800/5331] * If a subtest fails, mark the build as failed.

svn path=/nixos/trunk/; revision=25474
---
 lib/test-driver/test-driver.pl |  4 +++-
 lib/testing.nix                | 15 +++++++++------
 2 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/lib/test-driver/test-driver.pl b/lib/test-driver/test-driver.pl
index 1007546804b..0162832db87 100644
--- a/lib/test-driver/test-driver.pl
+++ b/lib/test-driver/test-driver.pl
@@ -100,7 +100,7 @@ sub runTests {
 
     if ($nrTests != 0) {
         $log->log("$nrSucceeded out of $nrTests tests succeeded",
-            ($nrSucceeded != $nrTests ? { error => 1 } : { }));
+            ($nrSucceeded < $nrTests ? { error => 1 } : { }));
     }
 }
 
@@ -126,3 +126,5 @@ END {
 
 
 runTests;
+
+exit ($nrSucceeded < $nrTests ? 1 : 0);
diff --git a/lib/testing.nix b/lib/testing.nix
index 16e38771172..1cc237cba9d 100644
--- a/lib/testing.nix
+++ b/lib/testing.nix
@@ -51,13 +51,9 @@ rec {
         ''
           ensureDir $out/nix-support
 
-          LOGFILE=$out/log.xml ${testDriver}/bin/nixos-test-driver ${network}/vms/*/bin/run-*-vm
-          
-          for i in */coverage-data; do
-            ensureDir $out/coverage-data
-            mv $i $out/coverage-data/$(dirname $i)
-          done
+          LOGFILE=$out/log.xml ${testDriver}/bin/nixos-test-driver ${network}/vms/*/bin/run-*-vm || failed=1
 
+          # Generate a pretty-printed log.          
           xsltproc --output $out/log.html ${./test-driver/log2html.xsl} $out/log.xml
           ln -s ${./test-driver/logfile.css} $out/logfile.css
           ln -s ${./test-driver/treebits.js} $out/treebits.js
@@ -66,6 +62,13 @@ rec {
 
           touch $out/nix-support/hydra-build-products
           echo "report testlog $out log.html" >> $out/nix-support/hydra-build-products
+
+          for i in */coverage-data; do
+            ensureDir $out/coverage-data
+            mv $i $out/coverage-data/$(dirname $i)
+          done
+
+          [ -z "$failed" ] || touch $out/nix-support/failed
         ''; # */
     };
 
-- 
GitLab


From 20b8258e6839d110deda224b9f4c89e02f8bd7de Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sun, 9 Jan 2011 21:37:01 +0000
Subject: [PATCH 2801/5331] * Handle the case where a machine produces no
 coverage data.

svn path=/nixos/trunk/; revision=25477
---
 lib/testing.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib/testing.nix b/lib/testing.nix
index 1cc237cba9d..c7acbfa13c1 100644
--- a/lib/testing.nix
+++ b/lib/testing.nix
@@ -77,11 +77,11 @@ rec {
   # runTests.
   makeReport = x: runCommand "report" { buildInputs = [rsync]; }
     ''
-      for d in ${x}/coverage-data/*; do
+      mkdir -p $TMPDIR/gcov/
 
+      for d in ${x}/coverage-data/*; do
           echo "doing $d"
-
-          ensureDir $TMPDIR/gcov/
+          [ -n "$(ls -A "$d")" ] || continue
 
           for i in $(cd $d/nix/store && ls); do
               if ! test -e $TMPDIR/gcov/nix/store/$i; then
-- 
GitLab


From c2f7256101f5091be42bf7998953efcab948bfbc Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sun, 9 Jan 2011 22:00:41 +0000
Subject: [PATCH 2802/5331] * Added an option `system.upstartEnvironment' to
 add a variable to all   Upstart jobs.

svn path=/nixos/trunk/; revision=25478
---
 modules/system/upstart/upstart.nix | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/modules/system/upstart/upstart.nix b/modules/system/upstart/upstart.nix
index 535e612ed32..7373bed5390 100644
--- a/modules/system/upstart/upstart.nix
+++ b/modules/system/upstart/upstart.nix
@@ -1,4 +1,4 @@
-{config, pkgs, ...}:
+{ config, pkgs, ... }:
 
 with pkgs.lib;
 
@@ -23,6 +23,8 @@ let
     let
       hasMain = job.script != "" || job.exec != "";
 
+      env = config.system.upstartEnvironment // job.environment;
+
       jobText =
         let log = "/var/log/upstart/${job.name}"; in
         ''
@@ -41,7 +43,7 @@ let
 
           env PATH=${makeSearchPath "bin" (job.path ++ upstartPath)}:${makeSearchPath "sbin" (job.path ++ upstartPath)}
 
-          ${concatMapStrings (n: "env ${n}=\"${getAttr n job.environment}\"\n") (attrNames job.environment)}
+          ${concatMapStrings (n: "env ${n}=\"${getAttr n env}\"\n") (attrNames env)}
           
           ${optionalString (job.preStart != "") ''
             pre-start script
@@ -334,6 +336,15 @@ in
       '';
     };
     
+    system.upstartEnvironment = mkOption {
+      type = types.attrs;
+      default = {};
+      example = { TZ = "CET"; };
+      description = ''
+        Environment variables passed to <emphasis>all</emphasis> Upstart jobs.
+      '';
+    };
+
   };
 
 
-- 
GitLab


From d0108cd95103e1bb1f1e27458ff1718a2f817a47 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sun, 9 Jan 2011 22:01:18 +0000
Subject: [PATCH 2803/5331] * Set GCOV_PREFIX for all Upstart jobs.

svn path=/nixos/trunk/; revision=25479
---
 modules/testing/test-instrumentation.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/modules/testing/test-instrumentation.nix b/modules/testing/test-instrumentation.nix
index 610d5fcc832..24fc1a81659 100644
--- a/modules/testing/test-instrumentation.nix
+++ b/modules/testing/test-instrumentation.nix
@@ -32,7 +32,6 @@ in
             export USER=root
             export HOME=/root
             export DISPLAY=:0.0
-            export GCOV_PREFIX=/tmp/coverage-data
             source /etc/profile
             cd /tmp
             echo "connecting to host..." > /dev/ttyS0
@@ -91,6 +90,8 @@ in
           message = "VM tests require that the kernel has the CIFS timeout patch.";
         }
       ];
+
+    system.upstartEnvironment.GCOV_PREFIX = "/tmp/coverage-data";
       
   };
 
-- 
GitLab


From ef82cd9c48a2f1da6d7029554bc043c09c8ef28b Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sun, 9 Jan 2011 22:21:22 +0000
Subject: [PATCH 2804/5331] * Coverage report: propagate the build products of
 the VM test run. * Run the Quake 3 with coverage instrumentation.

svn path=/nixos/trunk/; revision=25480
---
 lib/testing.nix  | 10 ++++++----
 release.nix      |  2 +-
 tests/quake3.nix | 14 ++++++++++++++
 3 files changed, 21 insertions(+), 5 deletions(-)

diff --git a/lib/testing.nix b/lib/testing.nix
index c7acbfa13c1..6f66ec72601 100644
--- a/lib/testing.nix
+++ b/lib/testing.nix
@@ -49,7 +49,7 @@ rec {
 
       buildCommand =
         ''
-          ensureDir $out/nix-support
+          mkdir -p $out/nix-support
 
           LOGFILE=$out/log.xml ${testDriver}/bin/nixos-test-driver ${network}/vms/*/bin/run-*-vm || failed=1
 
@@ -64,7 +64,7 @@ rec {
           echo "report testlog $out log.html" >> $out/nix-support/hydra-build-products
 
           for i in */coverage-data; do
-            ensureDir $out/coverage-data
+            mkdir -p $out/coverage-data
             mv $i $out/coverage-data/$(dirname $i)
           done
 
@@ -107,12 +107,14 @@ rec {
       done
             
       echo "making report..."
-      ensureDir $out/coverage
+      mkdir -p $out/coverage
       ${pkgs.lcov}/bin/genhtml --show-details $TMPDIR/full.info -o $out/coverage
       cp $TMPDIR/full.info $out/coverage/
 
-      ensureDir $out/nix-support
+      mkdir -p $out/nix-support
+      cat ${x}/nix-support/hydra-build-products >> $out/nix-support/hydra-build-products
       echo "report coverage $out/coverage" >> $out/nix-support/hydra-build-products
+      [ ! -e ${x}/nix-support/failed ] || touch $out/nix-support/failed
     ''; # */
 
 
diff --git a/release.nix b/release.nix
index 62fc2387aad..a2ce651770b 100644
--- a/release.nix
+++ b/release.nix
@@ -173,7 +173,7 @@ let
         nfs = t.nfs.test;
         openssh = t.openssh.test;
         proxy = t.proxy.test;
-        quake3 = t.quake3.test;
+        quake3 = t.quake3.report;
         remote_builds = t.remote_builds.test;
         subversion = t.subversion.report;
         trac = t.trac.test;
diff --git a/tests/quake3.nix b/tests/quake3.nix
index faaf8d2c539..8a18030a934 100644
--- a/tests/quake3.nix
+++ b/tests/quake3.nix
@@ -1,5 +1,17 @@
 { pkgs, ... }:
 
+let
+
+  # Build Quake with coverage instrumentation.
+  overrides = pkgs:
+    rec {
+      quake3game = pkgs.quake3game.override (args: {
+        stdenv = pkgs.stdenvAdapters.addCoverageInstrumentation args.stdenv;
+      });
+    };
+
+in
+      
 rec {
 
   client = 
@@ -9,6 +21,7 @@ rec {
       services.xserver.driSupport = true;
       services.xserver.defaultDepth = pkgs.lib.mkOverride 0 16;
       environment.systemPackages = [ pkgs.quake3demo ];
+      nixpkgs.config.packageOverrides = overrides;
     };
 
   nodes =
@@ -22,6 +35,7 @@ rec {
                 "${pkgs.quake3demo}/bin/quake3 '+set dedicated 1' '+set g_gametype 0' " +
                 "'+map q3dm7' '+addbot grunt' '+addbot daemia' 2> /tmp/log";
             };
+          nixpkgs.config.packageOverrides = overrides;
         };
 
       client1 = client;
-- 
GitLab


From 261430df54179627d275f04da0313f79d3819300 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sun, 9 Jan 2011 22:33:21 +0000
Subject: [PATCH 2805/5331] * Flush the coverage data by doing a shutdown.

svn path=/nixos/trunk/; revision=25481
---
 tests/quake3.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/tests/quake3.nix b/tests/quake3.nix
index 8a18030a934..298c9078e74 100644
--- a/tests/quake3.nix
+++ b/tests/quake3.nix
@@ -71,6 +71,10 @@ rec {
 
       $client1->screenshot("screen3");
       $client2->screenshot("screen4");
+
+      $client1->shutdown();
+      $client2->shutdown();
+      $server->shutdown();
     '';
   
 }
-- 
GitLab


From 8f831338df6d0a6362ee1e56f0d33307de48643e Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sun, 9 Jan 2011 22:52:27 +0000
Subject: [PATCH 2806/5331] * Log top-level errors.

svn path=/nixos/trunk/; revision=25482
---
 lib/test-driver/test-driver.pl | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/lib/test-driver/test-driver.pl b/lib/test-driver/test-driver.pl
index 0162832db87..9f5054f7721 100644
--- a/lib/test-driver/test-driver.pl
+++ b/lib/test-driver/test-driver.pl
@@ -66,7 +66,10 @@ sub runTests {
     if (defined $ENV{tests}) {
         $log->nest("running the VM test script", sub {
             eval "$context $ENV{tests}";
-            die $@ if $@;
+            if ($@) {
+                $log->log("error: $@", { error => 1 });
+                die $@;
+            }
         }, { expanded => 1 });
     } else {
         my $term = Term::ReadLine->new('nixos-vm-test');
-- 
GitLab


From e09faf4bb3fa27342ca279a7cf5ecbf304c106bf Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 10 Jan 2011 12:22:24 +0000
Subject: [PATCH 2807/5331] * Handle the case where /tmp/coverage-data already
 exists.

svn path=/nixos/trunk/; revision=25486
---
 modules/testing/test-instrumentation.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/testing/test-instrumentation.nix b/modules/testing/test-instrumentation.nix
index 24fc1a81659..0373ad0cf93 100644
--- a/modules/testing/test-instrumentation.nix
+++ b/modules/testing/test-instrumentation.nix
@@ -52,8 +52,8 @@ in
         # it to the host filesystem so that we don't need to copy it
         # on shutdown.
         ( eval $(cat /proc/cmdline)
-          mkdir /hostfs/$hostTmpDir/coverage-data
-          ln -s /hostfs/$hostTmpDir/coverage-data /tmp/coverage-data
+          mkdir -p /hostfs/$hostTmpDir/coverage-data
+          ln -sfn /hostfs/$hostTmpDir/coverage-data /tmp/coverage-data
         )
 
         # Mount debugfs to gain access to the kernel coverage data (if
-- 
GitLab


From 7e3873f75e3e6e8716a4260b10edd5d815537fb2 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 10 Jan 2011 12:25:13 +0000
Subject: [PATCH 2808/5331] * Use the dedicated server.

svn path=/nixos/trunk/; revision=25488
---
 tests/quake3.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/quake3.nix b/tests/quake3.nix
index 298c9078e74..f684b9a09cb 100644
--- a/tests/quake3.nix
+++ b/tests/quake3.nix
@@ -32,7 +32,7 @@ rec {
             { name = "quake3-server";
               startOn = "startup";
               exec =
-                "${pkgs.quake3demo}/bin/quake3 '+set dedicated 1' '+set g_gametype 0' " +
+                "${pkgs.quake3demo}/bin/quake3-server '+set g_gametype 0' " +
                 "'+map q3dm7' '+addbot grunt' '+addbot daemia' 2> /tmp/log";
             };
           nixpkgs.config.packageOverrides = overrides;
@@ -74,7 +74,7 @@ rec {
 
       $client1->shutdown();
       $client2->shutdown();
-      $server->shutdown();
+      $server->succeed("stop quake3-server");
     '';
   
 }
-- 
GitLab


From ecaf1d9f08978372d3e0dd1719848c85a478859d Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 10 Jan 2011 13:32:09 +0000
Subject: [PATCH 2809/5331] * Using hpet no longer seems necessary.  Maybe
 upstream fixed it.

svn path=/nixos/trunk/; revision=25489
---
 modules/virtualisation/qemu-vm.nix | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/modules/virtualisation/qemu-vm.nix b/modules/virtualisation/qemu-vm.nix
index 4aef6848ac8..494dfa52fb1 100644
--- a/modules/virtualisation/qemu-vm.nix
+++ b/modules/virtualisation/qemu-vm.nix
@@ -280,9 +280,6 @@ in
       
   boot.initrd.postDeviceCommands =
     ''
-      # Workaround for massive clock drift with the "kvm-clock" clock source.
-      echo hpet > /sys/devices/system/clocksource/clocksource0/current_clocksource
-    
       # Set up networking.  Needed for CIFS mounting.
       ifconfig eth0 up 10.0.2.15
 
-- 
GitLab


From 8db3bdc4fc1d48f3ea441ef2e1a2639d586e1bf0 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 10 Jan 2011 14:22:38 +0000
Subject: [PATCH 2810/5331] * In VM tests, use acpi_pm as the clock source. 
 This causes the guest   clock to slow down under high host load.  This is
 usually a bad   thing, but for VM tests it should provide a bit more
 determinism   (e.g. if the VM runs at lower speed, then timeouts in the VM
 should   also be delayed).

svn path=/nixos/trunk/; revision=25490
---
 modules/testing/test-instrumentation.nix | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/modules/testing/test-instrumentation.nix b/modules/testing/test-instrumentation.nix
index 0373ad0cf93..6c8f6cfa797 100644
--- a/modules/testing/test-instrumentation.nix
+++ b/modules/testing/test-instrumentation.nix
@@ -41,6 +41,16 @@ in
         respawn = false;
       };
 
+    boot.initrd.postDeviceCommands =
+      ''
+        # Using acpi_pm as a clock source causes the guest clock to
+        # slow down under high host load.  This is usually a bad
+        # thing, but for VM tests it should provide a bit more
+        # determinism (e.g. if the VM runs at lower speed, then
+        # timeouts in the VM should also be delayed).
+        echo acpi_pm > /sys/devices/system/clocksource/clocksource0/current_clocksource
+      '';
+    
     boot.postBootCommands =
       ''
         # Panic on out-of-memory conditions rather than letting the
-- 
GitLab


From 60b6eb757922d7d755c2bfaa629362ff36c42556 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 10 Jan 2011 14:41:16 +0000
Subject: [PATCH 2811/5331] * Add a method Machine::sleep to sleep N seconds in
 virtual (guest)   time rather than host real time.

svn path=/nixos/trunk/; revision=25491
---
 lib/test-driver/Machine.pm | 29 ++++++++++++++++++++---------
 tests/avahi.nix            |  2 +-
 tests/firefox.nix          |  4 ++--
 tests/kde4.nix             |  2 +-
 tests/login.nix            |  8 ++++----
 tests/quake3.nix           |  6 +++---
 tests/trac.nix             |  2 +-
 7 files changed, 32 insertions(+), 21 deletions(-)

diff --git a/lib/test-driver/Machine.pm b/lib/test-driver/Machine.pm
index 5d8d967431c..81d96ee81e1 100644
--- a/lib/test-driver/Machine.pm
+++ b/lib/test-driver/Machine.pm
@@ -467,10 +467,12 @@ sub screenshot {
 # testing the existence of /tmp/.X11-unix/X0 is insufficient.
 sub waitForX {
     my ($self, $regexp) = @_;
-    retry sub {
-        my ($status, $out) = $self->execute("xwininfo -root > /dev/null 2>&1");
-        return 1 if $status == 0;
-    }
+    $self->nest("waiting for the X11 server", sub {
+        retry sub {
+            my ($status, $out) = $self->execute("xwininfo -root > /dev/null 2>&1");
+            return 1 if $status == 0;
+        }
+    });
 }
 
 
@@ -484,12 +486,14 @@ sub getWindowNames {
 
 sub waitForWindow {
     my ($self, $regexp) = @_;
-    retry sub {
-        my @names = $self->getWindowNames;
-        foreach my $n (@names) {
-            return 1 if $n =~ /$regexp/;
+    $self->nest("waiting for a window to appear", sub {
+        retry sub {
+            my @names = $self->getWindowNames;
+            foreach my $n (@names) {
+                return 1 if $n =~ /$regexp/;
+            }
         }
-    }
+    });
 }
 
 
@@ -518,4 +522,11 @@ sub sendChars {
 }
 
 
+# Sleep N seconds (in virtual guest time, not real time).
+sub sleep {
+    my ($self, $time) = @_;
+    $self->succeed("sleep $time");
+}
+
+
 1;
diff --git a/tests/avahi.nix b/tests/avahi.nix
index 2bf811b5cb3..9aac6fe2d21 100644
--- a/tests/avahi.nix
+++ b/tests/avahi.nix
@@ -46,7 +46,7 @@ with pkgs;
 
        # More DNS-SD.
        $one->execute("avahi-publish -s \"This is a test\" _test._tcp 123 one=1 &");
-       sleep 5;
+       $one->sleep(5);
        print STDERR
         $two->mustSucceed("avahi-browse -r -t _test._tcp | tee out");
        $two->mustSucceed("test `wc -l < out` -gt 0");
diff --git a/tests/firefox.nix b/tests/firefox.nix
index 6bc202de84b..7e1e192c808 100644
--- a/tests/firefox.nix
+++ b/tests/firefox.nix
@@ -13,8 +13,8 @@
     ''
       $machine->waitForX;
       $machine->execute("firefox file://${pkgs.valgrind}/share/doc/valgrind/html/index.html &");
-      $machine->waitForWindow(/Valgrind.*Shiretoko/);
-      sleep 40; # wait until Firefox has finished loading the page
+      $machine->waitForWindow(qr/Valgrind/);
+      $machine->sleep(40); # wait until Firefox has finished loading the page
       $machine->screenshot("screen");
     '';
   
diff --git a/tests/kde4.nix b/tests/kde4.nix
index 2460bb27265..dd8b84ff387 100644
--- a/tests/kde4.nix
+++ b/tests/kde4.nix
@@ -45,7 +45,7 @@
       $machine->waitForWindow(qr/messages.*KWrite/);
       $machine->waitForWindow(qr/Valgrind.*Konqueror/);
 
-      sleep 5;
+      $machine->sleep(5);
       
       $machine->screenshot("screen");
     '';
diff --git a/tests/login.nix b/tests/login.nix
index 944d9932fcc..cfc0b6c8f68 100644
--- a/tests/login.nix
+++ b/tests/login.nix
@@ -16,7 +16,7 @@
           $machine->waitForJob("tty1");
           $machine->sendChars("alice\n");
           $machine->waitUntilSucceeds("pgrep login");
-          $machine->execute("sleep 2"); # urgh: wait for `Password:'
+          $machine->sleep(2); # urgh: wait for `Password:'
           $machine->sendChars("foobar\n");
           $machine->waitUntilSucceeds("pgrep -u alice bash");
           $machine->sendChars("touch done\n");
@@ -27,7 +27,7 @@
       subtest "virtual console switching", sub {
           $machine->sendKeys("alt-f10");
           $machine->waitUntilSucceeds("[ \$(fgconsole) = 10 ]");
-          $machine->execute("sleep 2"); # allow fbcondecor to catch up (not important)
+          $machine->sleep(2); # allow fbcondecor to catch up (not important)
           $machine->screenshot("syslog");
       };
 
@@ -35,10 +35,10 @@
       # ownership as needed.
       subtest "device permissions", sub {
           $machine->succeed("chvt 1");
-          $machine->execute("sleep 1"); # urgh
+          $machine->sleep(1); # urgh
           $machine->succeed("getfacl /dev/snd/timer | grep -q alice");
           $machine->succeed("chvt 2");
-          $machine->execute("sleep 1"); # urgh
+          $machine->sleep(1); # urgh
           $machine->fail("getfacl /dev/snd/timer | grep -q alice");
       };
 
diff --git a/tests/quake3.nix b/tests/quake3.nix
index f684b9a09cb..c21a1506b65 100644
--- a/tests/quake3.nix
+++ b/tests/quake3.nix
@@ -56,18 +56,18 @@ rec {
       $server->waitUntilSucceeds("grep -q 'Foo.*entered the game' /tmp/log");
       $server->waitUntilSucceeds("grep -q 'Bar.*entered the game' /tmp/log");
 
-      sleep 10; # wait for a while to get a nice screenshot
+      $server->sleep(10); # wait for a while to get a nice screenshot
 
       $client1->block();
 
-      sleep 20;
+      $server->sleep(20);
 
       $client1->screenshot("screen1");
       $client2->screenshot("screen2");
 
       $client1->unblock();
 
-      sleep 10;
+      $server->sleep(10);
 
       $client1->screenshot("screen3");
       $client2->screenshot("screen4");
diff --git a/tests/trac.nix b/tests/trac.nix
index a6a7756c5ae..daf59a6f29d 100644
--- a/tests/trac.nix
+++ b/tests/trac.nix
@@ -69,7 +69,7 @@
       $client->waitForX;
       $client->execute("konqueror http://webserver/projects/test &");
       $client->waitForWindow(qr/Test.*Konqueror/);
-      sleep 30; # loading takes a long time
+      $client->sleep(30); # loading takes a long time
       
       $client->screenshot("screen");
     '';
-- 
GitLab


From 0b33ba7e5322e838edddca2cad31aae0b51192f8 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 10 Jan 2011 15:17:38 +0000
Subject: [PATCH 2812/5331] * Clean up the presentation of the log file a bit.

svn path=/nixos/trunk/; revision=25493
---
 lib/test-driver/log2html.xsl | 17 +++++++++++++++--
 lib/test-driver/logfile.css  | 19 +++++++++++++++++++
 lib/test-driver/treebits.js  |  4 ++--
 3 files changed, 36 insertions(+), 4 deletions(-)

diff --git a/lib/test-driver/log2html.xsl b/lib/test-driver/log2html.xsl
index cf7f8f8c057..d41584f6b90 100644
--- a/lib/test-driver/log2html.xsl
+++ b/lib/test-driver/log2html.xsl
@@ -16,8 +16,11 @@
         <title>Log File</title>
       </head>
       <body>
-        [<a href="javascript:" class="logTreeExpandAll">Expand all</a>]
-        [<a href="javascript:" class="logTreeCollapseAll">Collapse all</a>]
+        <h1>VM build log</h1>
+        <p>
+          <a href="javascript:" class="logTreeExpandAll">Expand all</a> |
+          <a href="javascript:" class="logTreeCollapseAll">Collapse all</a>
+        </p>
         <ul class='toplevel'>
           <xsl:for-each select='line|nest'>
             <li>
@@ -25,6 +28,16 @@
             </li>
           </xsl:for-each>
         </ul>
+
+        <xsl:if test=".//*[@image]">
+          <h1>Screenshots</h1>
+          <ul class="vmScreenshots">
+            <xsl:for-each select='.//*[@image]'>
+              <li><a href="{@image}"><xsl:value-of select="@image" /></a></li>
+            </xsl:for-each>
+          </ul>
+        </xsl:if>
+        
       </body>
     </html>
   </xsl:template>
diff --git a/lib/test-driver/logfile.css b/lib/test-driver/logfile.css
index a7f83b4c925..a54d8504a86 100644
--- a/lib/test-driver/logfile.css
+++ b/lib/test-driver/logfile.css
@@ -3,6 +3,16 @@ body {
     background: white;
 }
 
+h1
+{
+    color: #005aa0;
+    font-size: 180%;
+}
+
+a {
+    text-decoration: none;
+}
+
 
 ul.nesting, ul.toplevel {
     padding: 0;
@@ -108,3 +118,12 @@ code {
     color: #002399;
     font-style: italic;
 }
+
+ul.vmScreenshots {
+    padding-left: 1em;
+}
+
+ul.vmScreenshots li {
+    font-family: monospace;
+    list-style: square;
+}
diff --git a/lib/test-driver/treebits.js b/lib/test-driver/treebits.js
index d88ac075fd9..271ec9e4031 100644
--- a/lib/test-driver/treebits.js
+++ b/lib/test-driver/treebits.js
@@ -23,7 +23,7 @@ $(document).ready(function() {
 
     /* Implementation of the expand all link. */
     $(".logTreeExpandAll").click(function() {
-        $(".logTreeToggle", $(this).siblings(".toplevel")).map(function() {
+        $(".logTreeToggle", $(this).parent().siblings(".toplevel")).map(function() {
             $(this).siblings("ul").show();
             $(this).text("-");
         });
@@ -31,7 +31,7 @@ $(document).ready(function() {
 
     /* Implementation of the collapse all link. */
     $(".logTreeCollapseAll").click(function() {
-        $(".logTreeToggle", $(this).siblings(".toplevel")).map(function() {
+        $(".logTreeToggle", $(this).parent().siblings(".toplevel")).map(function() {
             $(this).siblings("ul").hide();
             $(this).text("+");
         });
-- 
GitLab


From 5560e422ad091eab8135f88df510f19ab0dbaa44 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 10 Jan 2011 15:29:22 +0000
Subject: [PATCH 2813/5331] * Prerender the tree toggle.

svn path=/nixos/trunk/; revision=25494
---
 lib/test-driver/log2html.xsl |  9 +++++++--
 lib/test-driver/treebits.js  | 10 ----------
 2 files changed, 7 insertions(+), 12 deletions(-)

diff --git a/lib/test-driver/log2html.xsl b/lib/test-driver/log2html.xsl
index d41584f6b90..0123fc53760 100644
--- a/lib/test-driver/log2html.xsl
+++ b/lib/test-driver/log2html.xsl
@@ -52,7 +52,12 @@
     <xsl:variable name="style"><xsl:if test="$collapsed">display: none;</xsl:if></xsl:variable>
 
     <xsl:if test="line|nest">
-      <a href="javascript:" class="logTreeToggle"></a>
+      <a href="javascript:" class="logTreeToggle">
+        <xsl:choose>
+          <xsl:when test="$collapsed"><xsl:text>+</xsl:text></xsl:when>
+          <xsl:otherwise><xsl:text>-</xsl:text></xsl:otherwise>
+        </xsl:choose>
+      </a>
       <xsl:text> </xsl:text>
     </xsl:if>
     
@@ -66,7 +71,7 @@
 
           <!-- Is this the last line?  If so, mark it as such so that it
                can be rendered differently. -->
-          <xsl:variable  name="class"><xsl:choose><xsl:when test="position() != last()">line</xsl:when><xsl:otherwise>lastline</xsl:otherwise></xsl:choose></xsl:variable>
+          <xsl:variable name="class"><xsl:choose><xsl:when test="position() != last()">line</xsl:when><xsl:otherwise>lastline</xsl:otherwise></xsl:choose></xsl:variable>
         
           <li class='{$class}'>
             <span class='lineconn' />
diff --git a/lib/test-driver/treebits.js b/lib/test-driver/treebits.js
index 271ec9e4031..9754093dfd0 100644
--- a/lib/test-driver/treebits.js
+++ b/lib/test-driver/treebits.js
@@ -1,15 +1,5 @@
 $(document).ready(function() {
 
-    /* Set the appearance of the toggle depending on whether the
-       corresponding subtree is initially shown or hidden. */
-    $(".logTreeToggle").map(function() {
-        if ($(this).siblings("ul:hidden").length == 0) {
-            $(this).text("-");
-        } else {
-            $(this).text("+");
-        }
-    });
-
     /* When a toggle is clicked, show or hide the subtree. */
     $(".logTreeToggle").click(function() {
         if ($(this).siblings("ul:hidden").length != 0) {
-- 
GitLab


From 04b43f1e3f1a7eb2b80898ca4a6ad4908e1967bf Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 12 Jan 2011 15:40:46 +0000
Subject: [PATCH 2814/5331] * Remove tabs because this causes the shell script
 to be misindented.

svn path=/nixos/trunk/; revision=25522
---
 modules/virtualisation/qemu-vm.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/modules/virtualisation/qemu-vm.nix b/modules/virtualisation/qemu-vm.nix
index 494dfa52fb1..0490d530f9e 100644
--- a/modules/virtualisation/qemu-vm.nix
+++ b/modules/virtualisation/qemu-vm.nix
@@ -171,12 +171,12 @@ let
 
       ${pkgs.lib.optionalString cfg.useBackdoor ''
         # Create a shell socket file to which the VM can connect and create in the
-	# current working directory a socket file which can be used to remotely access
-	# the VM through the shell interface
+        # current working directory a socket file which can be used to remotely access
+        # the VM through the shell interface
 	
         ${pkgs.socat}/bin/socat UNIX-LISTEN:./shell UNIX-LISTEN:$WORKDIR/${vmName}.socket,fork &
-	
-	while [ ! -e ./shell ]; do sleep 0.1; done # Wait until the socket file is there
+
+        while [ ! -e ./shell ]; do sleep 0.1; done # Wait until the socket file is there
       ''}
 
       # Start QEMU.
@@ -186,7 +186,7 @@ let
           -net nic,vlan=0,model=virtio \
           -chardev socket,id=samba,path=./samba \
           -net user,vlan=0,guestfwd=tcp:10.0.2.4:445-chardev:samba${if cfg.useBackdoor then ",guestfwd=tcp:10.0.2.6:23-chardev:shell" else ""}''${QEMU_NET_OPTS:+,$QEMU_NET_OPTS} \
-	  ${if cfg.useBackdoor then "-chardev socket,id=shell,path=./shell" else ""} \
+          ${if cfg.useBackdoor then "-chardev socket,id=shell,path=./shell" else ""} \
           ${if cfg.useBootLoader then ''
             -drive index=0,file=$NIX_DISK_IMAGE,if=virtio,cache=writeback,werror=report \
             -drive index=1,file=${bootDisk}/disk.img,if=virtio,boot=on \
-- 
GitLab


From fd4885528445b94aea7dd15a09bee85c2bc1defe Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 12 Jan 2011 17:36:15 +0000
Subject: [PATCH 2815/5331] * No wonder the OpenSSH test was so unreliable: it
 didn't wait for the   sshd Upstart job to finish.

svn path=/nixos/trunk/; revision=25524
---
 tests/openssh.nix | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/tests/openssh.nix b/tests/openssh.nix
index ca96e6ccfc9..1c93f8a3b41 100644
--- a/tests/openssh.nix
+++ b/tests/openssh.nix
@@ -1,25 +1,26 @@
-{pkgs, ...}:
+{ pkgs, ... }:
 
 {
   nodes = {
   
     server = 
-      {pkgs, config, ...}:
+      { config, pkgs, ... }:
       
       {
         services.openssh.enable = true;
       };
       
     client = 
-      {pkgs, config, ...}:
+      { config, pkgs, ... }: { };
       
-      {
-      };
   };
   
-  testScript =
-  ''
+  testScript = ''
+    startAll;
+    
     my $key=`${pkgs.openssh}/bin/ssh-keygen -t dsa -f key -N ""`;
+
+    $server->waitForJob("sshd");
     
     $server->mustSucceed("mkdir -m 700 /root/.ssh");
     $server->copyFileFromHost("key.pub", "/root/.ssh/authorized_keys");
-- 
GitLab


From b3dbcbe249480f59fde6c118fa161eb6af53664d Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 12 Jan 2011 18:47:23 +0000
Subject: [PATCH 2816/5331] * Use vde_switch instead of QEMU's multicast
 feature to tie QEMU VMs   together into virtual networks.  This has several
 advantages:

  - It's more secure because the QEMU instances use Unix domain
    sockets to talk to the switch.

  - It doesn't depend on the host's network interfaces.  (Local
    multicast fails if there is no default gateway, so for instance it
    fails if a laptop is not connected to any network.)

  - VDE devices can be connected together to form arbitrary network
    topologies.

  - VDE has a "wirefilter" tool to emulate delays and packet loss,
    which are useful for network testing.

svn path=/nixos/trunk/; revision=25526
---
 lib/qemu-flags.nix             | 10 ++-----
 lib/test-driver/Machine.pm     | 10 -------
 lib/test-driver/test-driver.pl | 55 +++++++++++++++++++++++-----------
 lib/testing.nix                | 27 ++++++++---------
 4 files changed, 51 insertions(+), 51 deletions(-)

diff --git a/lib/qemu-flags.nix b/lib/qemu-flags.nix
index 7831c8f149a..5d8e898c534 100644
--- a/lib/qemu-flags.nix
+++ b/lib/qemu-flags.nix
@@ -4,12 +4,6 @@
 
   qemuNICFlags = nic: net: machine:
     "-net nic,vlan=${toString nic},macaddr=52:54:00:12:${toString net}:${toString machine},model=virtio " +
-    # Use 232.0.1.<vlan> as the multicast address to connect VMs on
-    # the same vlan, but allow it to be overriden using the
-    # $QEMU_MCAST_ADDR_<vlan> environment variable.  The test driver
-    # sets this variable to prevent collisions between parallel
-    # builds.
-    "-net socket,vlan=${toString nic},mcast=" +
-    "\${QEMU_MCAST_ADDR_${toString net}:-232.0.1.${toString net}:1234} ";
-    
+    "-net vde,vlan=${toString nic},sock=$QEMU_VDE_SOCKET_${toString net} ";
+
 }
diff --git a/lib/test-driver/Machine.pm b/lib/test-driver/Machine.pm
index 81d96ee81e1..7b48f26fb82 100644
--- a/lib/test-driver/Machine.pm
+++ b/lib/test-driver/Machine.pm
@@ -10,16 +10,6 @@ use Cwd;
 use File::Basename;
 
 
-# Stuff our PID in the multicast address/port to prevent collissions
-# with other NixOS VM networks.  See
-# http://www.iana.org/assignments/multicast-addresses/.
-my $mcastPrefix = "232.18";
-my $mcastSuffix = ($$ >> 8) . ":" . (64000 + ($$ & 0xff));
-print STDERR "using multicast addresses $mcastPrefix.<vlan>.$mcastSuffix\n";
-for (my $n = 0; $n < 256; $n++) {
-    $ENV{"QEMU_MCAST_ADDR_$n"} = "$mcastPrefix.$n.$mcastSuffix";
-}
-
 my $showGraphics = defined $ENV{'DISPLAY'};
 
 
diff --git a/lib/test-driver/test-driver.pl b/lib/test-driver/test-driver.pl
index 9f5054f7721..841017ea0a3 100644
--- a/lib/test-driver/test-driver.pl
+++ b/lib/test-driver/test-driver.pl
@@ -5,6 +5,7 @@ use Machine;
 use Term::ReadLine;
 use IO::File;
 use Logger;
+use Cwd;
 
 $SIG{PIPE} = 'IGNORE'; # because Unix domain sockets may die unexpectedly
 
@@ -13,6 +14,19 @@ STDERR->autoflush(1);
 my $log = new Logger;
 
 
+# Start vde_switch for each network required by the test.
+my %vlans;
+foreach my $vlan (split / /, $ENV{VLANS} || "") {
+    next if defined $vlans{$vlan};
+    $log->log("starting VDE switch for network $vlan");
+    my $socket = Cwd::abs_path "./vde$vlan.ctl";
+    system("vde_switch -d -s $socket") == 0
+        or die "cannot start vde_switch";
+    $ENV{"QEMU_VDE_SOCKET_$vlan"} = $socket;
+    $vlans{$vlan} = 1;
+}
+
+
 my %vms;
 my $context = "";
 
@@ -83,23 +97,26 @@ sub runTests {
 
     # Copy the kernel coverage data for each machine, if the kernel
     # has been compiled with coverage instrumentation.
-    foreach my $vm (values %vms) {
-        my $gcovDir = "/sys/kernel/debug/gcov";
+    $log->nest("collecting coverage data", sub {
+        foreach my $vm (values %vms) {
+            my $gcovDir = "/sys/kernel/debug/gcov";
 
-        next unless $vm->isUp();
+            next unless $vm->isUp();
 
-        my ($status, $out) = $vm->execute("test -e $gcovDir");
-        next if $status != 0;
+            my ($status, $out) = $vm->execute("test -e $gcovDir");
+            next if $status != 0;
 
-        # Figure out where to put the *.gcda files so that the report
-        # generator can find the corresponding kernel sources.
-        my $kernelDir = $vm->mustSucceed("echo \$(dirname \$(readlink -f /var/run/current-system/kernel))/.build/linux-*");
-        chomp $kernelDir;
-        my $coverageDir = "/hostfs" . $vm->stateDir() . "/coverage-data/$kernelDir";
+            # Figure out where to put the *.gcda files so that the
+            # report generator can find the corresponding kernel
+            # sources.
+            my $kernelDir = $vm->mustSucceed("echo \$(dirname \$(readlink -f /var/run/current-system/kernel))/.build/linux-*");
+            chomp $kernelDir;
+            my $coverageDir = "/hostfs" . $vm->stateDir() . "/coverage-data/$kernelDir";
 
-        # Copy all the *.gcda files.
-        $vm->execute("for d in $gcovDir/nix/store/*/.build/linux-*; do for i in \$(cd \$d && find -name '*.gcda'); do echo \$i; mkdir -p $coverageDir/\$(dirname \$i); cp -v \$d/\$i $coverageDir/\$i; done; done");
-    }
+            # Copy all the *.gcda files.
+            $vm->execute("for d in $gcovDir/nix/store/*/.build/linux-*; do for i in \$(cd \$d && find -name '*.gcda'); do echo \$i; mkdir -p $coverageDir/\$(dirname \$i); cp -v \$d/\$i $coverageDir/\$i; done; done");
+        }
+    });
 
     if ($nrTests != 0) {
         $log->log("$nrSucceeded out of $nrTests tests succeeded",
@@ -118,12 +135,14 @@ sub createDisk {
 
 
 END {
-    foreach my $vm (values %vms) {
-        if ($vm->{pid}) {
-            $log->log("killing " . $vm->{name} . " (pid " . $vm->{pid} . ")");
-            kill 9, $vm->{pid};
+    $log->nest("cleaning up", sub {
+        foreach my $vm (values %vms) {
+            if ($vm->{pid}) {
+                $log->log("killing " . $vm->{name} . " (pid " . $vm->{pid} . ")");
+                kill 9, $vm->{pid};
+            }
         }
-    }
+    });
     $log->close();
 }
 
diff --git a/lib/testing.nix b/lib/testing.nix
index 6f66ec72601..7ed1ba04275 100644
--- a/lib/testing.nix
+++ b/lib/testing.nix
@@ -27,31 +27,27 @@ rec {
         cp ${./test-driver/Logger.pm} $libDir/Logger.pm
 
         wrapProgram $out/bin/nixos-test-driver \
-          --prefix PATH : "${imagemagick}/bin" \
+          --prefix PATH : "${pkgs.qemu_kvm}/bin:${pkgs.vde2}/bin:${imagemagick}/bin" \
           --prefix PERL5LIB : "${lib.makePerlPath [ perlPackages.TermReadLineGnu perlPackages.XMLWriter ]}:$out/lib/perl5/site_perl"
       '';
   };
 
 
   # Run an automated test suite in the given virtual network.
-  # `network' must be the result of a call to the
-  # `buildVirtualNetwork' function.  `tests' is a Perl fragment
-  # describing the tests.
-  runTests = network: tests:
+  # `driver' is the script that runs the network.
+  runTests = driver:
     stdenv.mkDerivation {
       name = "vm-test-run";
       
       requiredSystemFeatures = [ "kvm" ];
       
-      inherit tests;
-      
-      buildInputs = [ pkgs.qemu_kvm pkgs.libxslt ];
+      buildInputs = [ pkgs.libxslt ];
 
       buildCommand =
         ''
           mkdir -p $out/nix-support
 
-          LOGFILE=$out/log.xml ${testDriver}/bin/nixos-test-driver ${network}/vms/*/bin/run-*-vm || failed=1
+          LOGFILE=$out/log.xml tests="testScript" ${driver}/bin/nixos-test-driver || failed=1
 
           # Generate a pretty-printed log.          
           xsltproc --output $out/log.html ${./test-driver/log2html.xsl} $out/log.xml
@@ -138,10 +134,6 @@ rec {
       then t.testScript { inherit (vms) nodes; }
       else t.testScript;
       
-    test = runTests vms testScript;
-      
-    report = makeReport test;
-
     # Generate a convenience wrapper for running the test driver
     # interactively with the specified network.
     driver = runCommand "nixos-test-driver"
@@ -150,14 +142,19 @@ rec {
       }
       ''
         mkdir -p $out/bin
+        echo "$testScript" > $out/test-script
         ln -s ${vms}/bin/* $out/bin/
         ln -s ${testDriver}/bin/* $out/bin/
         wrapProgram $out/bin/nixos-test-driver \
           --add-flags "${vms}/vms/*/bin/run-*-vm" \
           --run "testScript=\"\$(cat $out/test-script)\"" \
-          --set testScript '"$testScript"'
-        echo "$testScript" > $out/test-script
+          --set testScript '"$testScript"' \
+          --set VLANS '"${toString (map (m: m.config.virtualisation.vlans) (lib.attrValues vms.nodes))}"' \
       ''; # "
+
+    test = runTests driver;
+      
+    report = makeReport test;
   };
 
   
-- 
GitLab


From 06a239a699be863149511111564e59de9bc42189 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 13 Jan 2011 10:54:07 +0000
Subject: [PATCH 2817/5331] * runInMachine: use buildVM rather than
 buildVirtualNetwork since   there is only one machine. * Add a simple test
 case for runInMachine.

svn path=/nixos/trunk/; revision=25535
---
 lib/testing.nix          | 28 +++++++++++++++-------------
 tests/run-in-machine.nix | 11 +++++++++++
 2 files changed, 26 insertions(+), 13 deletions(-)
 create mode 100644 tests/run-in-machine.nix

diff --git a/lib/testing.nix b/lib/testing.nix
index 7ed1ba04275..38e84b67ce7 100644
--- a/lib/testing.nix
+++ b/lib/testing.nix
@@ -27,7 +27,7 @@ rec {
         cp ${./test-driver/Logger.pm} $libDir/Logger.pm
 
         wrapProgram $out/bin/nixos-test-driver \
-          --prefix PATH : "${pkgs.qemu_kvm}/bin:${pkgs.vde2}/bin:${imagemagick}/bin" \
+          --prefix PATH : "${pkgs.qemu_kvm}/bin:${pkgs.vde2}/bin:${imagemagick}/bin:${coreutils}/bin" \
           --prefix PERL5LIB : "${lib.makePerlPath [ perlPackages.TermReadLineGnu perlPackages.XMLWriter ]}:$out/lib/perl5/site_perl"
       '';
   };
@@ -163,11 +163,13 @@ rec {
     , machine
     , preBuild ? ""
     , postBuild ? ""
-    , ...
+    , ... # ???
     }:
     let
-      vms =
-        buildVirtualNetwork { nodes = { client = machine; } ; };
+      vm = buildVM { }
+        [ ({ config, pkgs, ... }: { networking.hostName = "client"; })
+          machine
+        ];
 
       buildrunner = writeText "vm-build" ''
         source $1
@@ -183,16 +185,15 @@ rec {
       testscript = ''
         startAll;
         ${preBuild}
-        print STDERR $client->mustSucceed("env -i ${pkgs.bash}/bin/bash ${buildrunner} /hostfs".$client->stateDir."/saved-env");
+        $client->succeed("env -i ${pkgs.bash}/bin/bash ${buildrunner} /hostfs".$client->stateDir."/saved-env >&2");
         ${postBuild}
       '';
 
       vmRunCommand = writeText "vm-run" ''
         ${coreutils}/bin/mkdir -p vm-state-client
         export > vm-state-client/saved-env
-        export PATH=${qemu_kvm}/bin:${coreutils}/bin
         export tests='${testscript}'
-        ${testDriver}/bin/nixos-test-driver ${vms}/vms/*/bin/run-*-vm
+        ${testDriver}/bin/nixos-test-driver ${vm.config.system.build.vm}/bin/run-*-vm
       ''; # */
 
     in
@@ -205,7 +206,7 @@ rec {
       });
 
       
-  runInMachineWithX = { require ? [], ...}@args :
+  runInMachineWithX = { require ? [], ... } @ args:
     let
       client =
         { config, pkgs, ... }:
@@ -221,11 +222,12 @@ rec {
         };
     in
       runInMachine ({
-            machine = client;
-            preBuild = ''
-              $client->waitForX;
-            '' ;
-          } // args );   
+        machine = client;
+        preBuild =
+          ''
+            $client->waitForX;
+          '';
+      } // args);
 
           
   simpleTest = as: (makeTest ({ ... }: as)).test;
diff --git a/tests/run-in-machine.nix b/tests/run-in-machine.nix
new file mode 100644
index 00000000000..9903c37b73a
--- /dev/null
+++ b/tests/run-in-machine.nix
@@ -0,0 +1,11 @@
+{ nixpkgs ? ../../nixpkgs
+, services ? ../../services
+, system ? builtins.currentSystem
+}:
+
+with import ../lib/testing.nix { inherit nixpkgs services system; };
+
+runInMachine {
+  drv = (import nixpkgs { }).aterm;
+  machine = { config, pkgs, ... }: { };
+}
\ No newline at end of file
-- 
GitLab


From 2ac09578c0957422668b58c22f3ab7644afb59f7 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 13 Jan 2011 11:39:03 +0000
Subject: [PATCH 2818/5331] * runInMachine: properly evaluate the machine
 configuration.

svn path=/nixos/trunk/; revision=25536
---
 lib/testing.nix          | 4 ++--
 tests/run-in-machine.nix | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/lib/testing.nix b/lib/testing.nix
index 38e84b67ce7..999d27883e2 100644
--- a/lib/testing.nix
+++ b/lib/testing.nix
@@ -167,8 +167,8 @@ rec {
     }:
     let
       vm = buildVM { }
-        [ ({ config, pkgs, ... }: { networking.hostName = "client"; })
-          machine
+        [ machine
+          { key = "hostname"; networking.hostName = "client"; }
         ];
 
       buildrunner = writeText "vm-build" ''
diff --git a/tests/run-in-machine.nix b/tests/run-in-machine.nix
index 9903c37b73a..5f790a11aba 100644
--- a/tests/run-in-machine.nix
+++ b/tests/run-in-machine.nix
@@ -7,5 +7,5 @@ with import ../lib/testing.nix { inherit nixpkgs services system; };
 
 runInMachine {
   drv = (import nixpkgs { }).aterm;
-  machine = { config, pkgs, ... }: { };
-}
\ No newline at end of file
+  machine = { config, pkgs, ... }: { services.sshd.enable = true; };
+}
-- 
GitLab


From 88a4fda7d8ad26e2db363eb7c0d985ebedfba738 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 14 Jan 2011 16:01:47 +0000
Subject: [PATCH 2819/5331] * Don't daemonise vde_switch so that it's cleaned
 up automatically.   This is useful for interactive use.

svn path=/nixos/trunk/; revision=25570
---
 lib/test-driver/test-driver.pl | 23 ++++++++++++++++++++---
 lib/testing.nix                |  2 +-
 2 files changed, 21 insertions(+), 4 deletions(-)

diff --git a/lib/test-driver/test-driver.pl b/lib/test-driver/test-driver.pl
index 841017ea0a3..bdb3f40ca6c 100644
--- a/lib/test-driver/test-driver.pl
+++ b/lib/test-driver/test-driver.pl
@@ -4,8 +4,10 @@ use strict;
 use Machine;
 use Term::ReadLine;
 use IO::File;
+use IO::Pty;
 use Logger;
 use Cwd;
+use POSIX qw(_exit dup2);
 
 $SIG{PIPE} = 'IGNORE'; # because Unix domain sockets may die unexpectedly
 
@@ -18,12 +20,27 @@ my $log = new Logger;
 my %vlans;
 foreach my $vlan (split / /, $ENV{VLANS} || "") {
     next if defined $vlans{$vlan};
+    # Start vde_switch as a child process.  We don't run it in daemon
+    # mode because we want the child process to be cleaned up when we
+    # die.  Since we have to make sure that the control socket is
+    # ready, we send a dummy command to vde_switch (via stdin) and
+    # wait for a reply.  Note that vde_switch requires stdin to be a
+    # TTY, so we create one.
     $log->log("starting VDE switch for network $vlan");
     my $socket = Cwd::abs_path "./vde$vlan.ctl";
-    system("vde_switch -d -s $socket") == 0
-        or die "cannot start vde_switch";
+    my $pty = new IO::Pty;
+    my ($stdoutR, $stdoutW); pipe $stdoutR, $stdoutW;
+    my $pid = fork(); die "cannot fork" unless defined $pid;
+    if ($pid == 0) {
+        dup2(fileno($pty->slave), 0);
+        dup2(fileno($stdoutW), 1);
+        exec "vde_switch -s $socket" or _exit(1);
+    }
+    close $stdoutW;
+    print $pty "version\n";
+    readline $pty or die "cannot start vde_switch";
     $ENV{"QEMU_VDE_SOCKET_$vlan"} = $socket;
-    $vlans{$vlan} = 1;
+    $vlans{$vlan} = $pty;
 }
 
 
diff --git a/lib/testing.nix b/lib/testing.nix
index 999d27883e2..0869ff7c8be 100644
--- a/lib/testing.nix
+++ b/lib/testing.nix
@@ -28,7 +28,7 @@ rec {
 
         wrapProgram $out/bin/nixos-test-driver \
           --prefix PATH : "${pkgs.qemu_kvm}/bin:${pkgs.vde2}/bin:${imagemagick}/bin:${coreutils}/bin" \
-          --prefix PERL5LIB : "${lib.makePerlPath [ perlPackages.TermReadLineGnu perlPackages.XMLWriter ]}:$out/lib/perl5/site_perl"
+          --prefix PERL5LIB : "${lib.makePerlPath [ perlPackages.TermReadLineGnu perlPackages.XMLWriter perlPackages.IOTty ]}:$out/lib/perl5/site_perl"
       '';
   };
 
-- 
GitLab


From 41fcad19fb552f3525786c1081a19d8545f7d608 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Sat, 15 Jan 2011 21:51:56 +0000
Subject: [PATCH 2820/5331] manual: Recommend `-O dir_index'.

svn path=/nixos/trunk/; revision=25580
---
 doc/manual/installation.xml | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/doc/manual/installation.xml b/doc/manual/installation.xml
index 330ef14e0fd..225dd5239d9 100644
--- a/doc/manual/installation.xml
+++ b/doc/manual/installation.xml
@@ -96,11 +96,12 @@ $ nix-build ./nixos/release.nix -A iso_minimal.iso</screen>
     
     <listitem><para>For initialising Ext2/Ext3 partitions:
     <command>mke2fs</command>.  Ext3 is recommended; use the
-    <option>-j</option> to create a journalled file system.  It is
-    also recommended that you assign a unique symbolic label to the
-    file system using the option <option>-L
-    <replaceable>label</replaceable></option>.  This will make the
-    file system configuration independent from device
+    <option>-j</option> to create a journalled file system.  For
+    faster access to the Nix store, you may also want to use the
+    <option>-O dir_index</option>.  It is also recommended that you
+    assign a unique symbolic label to the file system using the option
+    <option>-L <replaceable>label</replaceable></option>.  This will
+    make the file system configuration independent from device
     changes.</para></listitem>
 
     <listitem><para>For creating swap partitions:
-- 
GitLab


From a634fd84bf63691390afe56b7d5e1a8f15efddbe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Sat, 15 Jan 2011 21:52:10 +0000
Subject: [PATCH 2821/5331] mingetty: Show the kernel name.

svn path=/nixos/trunk/; revision=25581
---
 modules/services/ttys/mingetty.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/services/ttys/mingetty.nix b/modules/services/ttys/mingetty.nix
index 239231b3699..d8abc129e2d 100644
--- a/modules/services/ttys/mingetty.nix
+++ b/modules/services/ttys/mingetty.nix
@@ -28,7 +28,7 @@ with pkgs.lib;
       };
 
       greetingLine = mkOption {
-        default = ''<<< Welcome to NixOS (\m) - Kernel \r (\l) >>>'';
+        default = ''<<< Welcome to NixOS (\m) - \s \r (\l) >>>'';
         description = ''
           Welcome line printed by mingetty.
         '';
-- 
GitLab


From c56e039107beaf96c5c23101d886b52232b4ebe4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Sat, 15 Jan 2011 22:38:28 +0000
Subject: [PATCH 2822/5331] system-tarball-sheevaplug: Fix `kernelparams.txt'.

This is a followup to r23775 ("Substitute the path of the system
derivation directly in the stage 2 init script.").

svn path=/nixos/trunk/; revision=25582
---
 modules/installer/cd-dvd/system-tarball-sheevaplug.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/installer/cd-dvd/system-tarball-sheevaplug.nix b/modules/installer/cd-dvd/system-tarball-sheevaplug.nix
index 77e09ec2265..177496c24c7 100644
--- a/modules/installer/cd-dvd/system-tarball-sheevaplug.nix
+++ b/modules/installer/cd-dvd/system-tarball-sheevaplug.nix
@@ -42,7 +42,7 @@ let
   # A clue for the kernel loading
   kernelParams = pkgs.writeText "kernel-params.txt" ''
     Kernel Parameters:
-      init=${config.system.build.bootStage2} systemConfig=${config.system.build.toplevel} ${toString config.boot.kernelParams}
+      init=${config.system.build.toplevel}/init ${toString config.boot.kernelParams}
   '';
 
   
-- 
GitLab


From ef54cd3d1ff3de9f74aa4de8a32902e5eeb964ba Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Sat, 15 Jan 2011 22:42:07 +0000
Subject: [PATCH 2823/5331] system-tarball-sheevaplug: Add hint about the
 serial console parameters.

svn path=/nixos/trunk/; revision=25583
---
 modules/installer/cd-dvd/system-tarball-sheevaplug.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/modules/installer/cd-dvd/system-tarball-sheevaplug.nix b/modules/installer/cd-dvd/system-tarball-sheevaplug.nix
index 177496c24c7..f8b6b632ea7 100644
--- a/modules/installer/cd-dvd/system-tarball-sheevaplug.nix
+++ b/modules/installer/cd-dvd/system-tarball-sheevaplug.nix
@@ -132,6 +132,7 @@ in
     [
       "selinux=0"
       "console=tty1"
+      # "console=ttyS0,115200n8"  # serial console
     ];
 
   boot.kernelPackages = pkgs.linuxPackages_2_6_35;
-- 
GitLab


From 066f76e65ff4d073da4c91f666d2466dc394b535 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sun, 16 Jan 2011 14:21:47 +0000
Subject: [PATCH 2824/5331] * Remove "nix-build tests -A foo.vms;
 ./result/bin/run-vms" as a way   to run the VMs of a test.  Instead, you can
 do

    $ nix-build tests -A foo.driver
    $ ./result/bin/nixos-run-vms

  This uses the test driver infrastructure, which is necessary in
  order to set up the VDE switches.

svn path=/nixos/trunk/; revision=25586
---
 lib/build-vms.nix | 38 +++-----------------------------------
 lib/testing.nix   | 32 ++++++++++++++++++++------------
 2 files changed, 23 insertions(+), 47 deletions(-)

diff --git a/lib/build-vms.nix b/lib/build-vms.nix
index 2c867a0985b..618194fd1db 100644
--- a/lib/build-vms.nix
+++ b/lib/build-vms.nix
@@ -12,42 +12,10 @@ rec {
   
   # Build a virtual network from an attribute set `{ machine1 =
   # config1; ... machineN = configN; }', where `machineX' is the
-  # hostname and `configX' is a NixOS system configuration.  The
-  # result is a script that starts a QEMU instance for each virtual
-  # machine.  Each machine is given an arbitrary IP address in the
-  # virtual network.
+  # hostname and `configX' is a NixOS system configuration.  Each
+  # machine is given an arbitrary IP address in the virtual network.
   buildVirtualNetwork =
-    { nodes }:
-
-    let nodes_ = lib.mapAttrs (n: buildVM nodes_) (assignIPAddresses nodes); in
-
-    stdenv.mkDerivation {
-      name = "vms";
-      buildCommand =
-        ''
-          ensureDir $out/vms
-          ${
-            lib.concatMapStrings (vm:
-              ''
-                ln -sn ${vm.config.system.build.vm} $out/vms/${vm.config.networking.hostName}
-              ''
-            ) (lib.attrValues nodes_)
-          }
-
-          ensureDir $out/bin
-          cat > $out/bin/run-vms <<EOF
-          #! ${stdenv.shell}
-          port=8080
-          for i in $out/vms/*; do
-            port2=\$((port++))
-            echo "forwarding localhost:\$port2 to \$(basename \$i):80"
-            QEMU_OPTS="-redir tcp:\$port2::80" \$i/bin/run-*-vm &
-          done
-          EOF
-          chmod +x $out/bin/run-vms
-        ''; # */
-      passthru = { nodes = nodes_; };
-    };
+    nodes: let nodesOut = lib.mapAttrs (n: buildVM nodesOut) (assignIPAddresses nodes); in nodesOut;
 
 
   buildVM =
diff --git a/lib/testing.nix b/lib/testing.nix
index 0869ff7c8be..c0d3b4cd135 100644
--- a/lib/testing.nix
+++ b/lib/testing.nix
@@ -121,21 +121,24 @@ rec {
   call = f: f { inherit pkgs nixpkgs system; };
 
   complete = t: t // rec {
-    nodes =
+    nodes = buildVirtualNetwork (
       if t ? nodes then t.nodes else
       if t ? machine then { machine = t.machine; }
-      else { };
-      
-    vms = buildVirtualNetwork { inherit nodes; };
-    
+      else { } );
+
     testScript =
       # Call the test script with the computed nodes.
       if builtins.isFunction t.testScript
-      then t.testScript { inherit (vms) nodes; }
+      then t.testScript { inherit nodes; }
       else t.testScript;
       
-    # Generate a convenience wrapper for running the test driver
-    # interactively with the specified network.
+    vlans = map (m: m.config.virtualisation.vlans) (lib.attrValues nodes);
+
+    vms = map (m: m.config.system.build.vm) (lib.attrValues nodes);
+    
+    # Generate onvenience wrappers for running the test driver
+    # interactively with the specified network, and for starting the
+    # VMs from the command line.
     driver = runCommand "nixos-test-driver"
       { buildInputs = [ makeWrapper];
         inherit testScript;
@@ -143,13 +146,18 @@ rec {
       ''
         mkdir -p $out/bin
         echo "$testScript" > $out/test-script
-        ln -s ${vms}/bin/* $out/bin/
-        ln -s ${testDriver}/bin/* $out/bin/
+        ln -s ${testDriver}/bin/nixos-test-driver $out/bin/
+        vms="$(for i in ${toString vms}; do echo $i/bin/run-*-vm; done)"
         wrapProgram $out/bin/nixos-test-driver \
-          --add-flags "${vms}/vms/*/bin/run-*-vm" \
+          --add-flags "$vms" \
           --run "testScript=\"\$(cat $out/test-script)\"" \
           --set testScript '"$testScript"' \
-          --set VLANS '"${toString (map (m: m.config.virtualisation.vlans) (lib.attrValues vms.nodes))}"' \
+          --set VLANS '"${toString vlans}"'
+        ln -s ${testDriver}/bin/nixos-test-driver $out/bin/nixos-run-vms
+        wrapProgram $out/bin/nixos-run-vms \
+          --add-flags "$vms" \
+          --set tests '"startAll; sleep 1e9;"' \
+          --set VLANS '"${toString vlans}"'
       ''; # "
 
     test = runTests driver;
-- 
GitLab


From 51d66f647a5a2ca2b2073b3cb2987a82d0982023 Mon Sep 17 00:00:00 2001
From: Sander van der Burg <s.vanderburg@tudelft.nl>
Date: Sun, 16 Jan 2011 21:57:09 +0000
Subject: [PATCH 2825/5331] Fixed nixos-build-vms to use the new test driver.
 Backdoor option does not work anymore though. I have to look for another
 solution

svn path=/nixos/trunk/; revision=25591
---
 modules/installer/tools/nixos-build-vms/build-vms.nix | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/modules/installer/tools/nixos-build-vms/build-vms.nix b/modules/installer/tools/nixos-build-vms/build-vms.nix
index bedabecad2d..0b8d2720068 100644
--- a/modules/installer/tools/nixos-build-vms/build-vms.nix
+++ b/modules/installer/tools/nixos-build-vms/build-vms.nix
@@ -8,9 +8,6 @@
 
 let nodes = import networkExpr;
 in
-(import "${nixos}/lib/build-vms.nix" {
-  inherit nixpkgs services system useBackdoor;
-})
-.buildVirtualNetwork {
-  inherit nodes;
-}
+with import "${nixos}/lib/testing.nix" { inherit nixpkgs services system useBackdoor; };
+
+(complete { inherit nodes; testScript = ""; }).driver
-- 
GitLab


From c7a5960101d9302a0bded14f93b7bf616f7bbca7 Mon Sep 17 00:00:00 2001
From: Sander van der Burg <s.vanderburg@tudelft.nl>
Date: Sun, 16 Jan 2011 21:59:17 +0000
Subject: [PATCH 2826/5331] Removed backdoor argument

svn path=/nixos/trunk/; revision=25592
---
 modules/installer/tools/nixos-build-vms/build-vms.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/installer/tools/nixos-build-vms/build-vms.nix b/modules/installer/tools/nixos-build-vms/build-vms.nix
index 0b8d2720068..3d49cecb2ed 100644
--- a/modules/installer/tools/nixos-build-vms/build-vms.nix
+++ b/modules/installer/tools/nixos-build-vms/build-vms.nix
@@ -8,6 +8,6 @@
 
 let nodes = import networkExpr;
 in
-with import "${nixos}/lib/testing.nix" { inherit nixpkgs services system useBackdoor; };
+with import "${nixos}/lib/testing.nix" { inherit nixpkgs services system; };
 
 (complete { inherit nodes; testScript = ""; }).driver
-- 
GitLab


From 96b769c979b35588f42e88fa8da7c27c2c70197a Mon Sep 17 00:00:00 2001
From: Sander van der Burg <s.vanderburg@tudelft.nl>
Date: Mon, 17 Jan 2011 16:15:59 +0000
Subject: [PATCH 2827/5331] Removed the backdoor, because it does not work
 anymore and it has also become obsolete (Disnix uses something else now)

svn path=/nixos/trunk/; revision=25601
---
 doc/manual/man-nixos-build-vms.xml            | 15 ----------
 lib/build-vms.nix                             |  4 +--
 .../tools/nixos-build-vms/build-vms.nix       |  1 -
 .../tools/nixos-build-vms/nixos-build-vms.sh  |  8 ++---
 modules/virtualisation/qemu-vm.nix            | 29 +------------------
 5 files changed, 5 insertions(+), 52 deletions(-)

diff --git a/doc/manual/man-nixos-build-vms.xml b/doc/manual/man-nixos-build-vms.xml
index 1650f33064f..328d8d4f2ed 100644
--- a/doc/manual/man-nixos-build-vms.xml
+++ b/doc/manual/man-nixos-build-vms.xml
@@ -17,7 +17,6 @@
 <refsynopsisdiv>
   <cmdsynopsis>
     <command>nixos-build-vms</command>
-    <arg><option>--use-backdoor</option></arg>
     <arg><option>--show-trace</option></arg>
     <arg><option>--no-out-link</option></arg>
     <arg><option>--help</option></arg>
@@ -34,11 +33,6 @@ this command. By default, a <filename>result</filename> symlink is produced that
 points to the generated virtual network.
 </para>
 
-<para>This command also provides the <option>--use-backdoor</option> option,
-which spawns UNIX domain sockets in the current working directory by using the
-<command>socat</command> command. This allows
-users to remotely script a generated virtual machine.</para>
-
 <para>A network Nix expression has the following structure:
 
 <screen>
@@ -87,15 +81,6 @@ for the same architecture as the host system.
 
 <variablelist>
 
-  <varlistentry>
-    <term><option>--use-backdoor</option></term>
-    <listitem>
-      <para>Indicates that the backdoor must be enabled so that the VMs can be
-      accessed through a UNIX domain socket. The UNIX domain sockets are
-      created in the current working directory.</para>
-    </listitem>
-  </varlistentry>
-
   <varlistentry>
     <term><option>--show-trace</option></term>
     <listitem>
diff --git a/lib/build-vms.nix b/lib/build-vms.nix
index 618194fd1db..32d0a4811eb 100644
--- a/lib/build-vms.nix
+++ b/lib/build-vms.nix
@@ -1,4 +1,4 @@
-{ nixpkgs, services, system, useBackdoor ? false }:
+{ nixpkgs, services, system }:
 
 let pkgs = import nixpkgs { config = {}; inherit system; }; in
 
@@ -26,7 +26,7 @@ rec {
       modules = configurations ++
         [ ../modules/virtualisation/qemu-vm.nix
           ../modules/testing/test-instrumentation.nix # !!! should only get added for automated test runs
-          { key = "no-manual"; services.nixosManual.enable = false; virtualisation.useBackdoor = useBackdoor; }
+          { key = "no-manual"; services.nixosManual.enable = false; }
         ];
       extraArgs = { inherit nodes; };
     };
diff --git a/modules/installer/tools/nixos-build-vms/build-vms.nix b/modules/installer/tools/nixos-build-vms/build-vms.nix
index 3d49cecb2ed..df4152b30d6 100644
--- a/modules/installer/tools/nixos-build-vms/build-vms.nix
+++ b/modules/installer/tools/nixos-build-vms/build-vms.nix
@@ -3,7 +3,6 @@
 , services ? "/etc/nixos/services"
 , system ? builtins.currentSystem
 , networkExpr
-, useBackdoor ? false
 }:
 
 let nodes = import networkExpr;
diff --git a/modules/installer/tools/nixos-build-vms/nixos-build-vms.sh b/modules/installer/tools/nixos-build-vms/nixos-build-vms.sh
index 681ec0387c8..70c1ecaf5ac 100644
--- a/modules/installer/tools/nixos-build-vms/nixos-build-vms.sh
+++ b/modules/installer/tools/nixos-build-vms/nixos-build-vms.sh
@@ -7,7 +7,6 @@ showUsage()
     echo "Usage: $0 network_expr"
     echo "Options:"
     echo
-    echo "--use-backdoor  Indicates that the backdoor must be enabled so that the VMs can be accessed through a UNIX domain socket"
     echo "--no-out-link   Do not create a 'result' symlink"
     echo "--show-trace    Shows the output trace"
     echo "-h,--help       Shows the usage of this command"
@@ -15,7 +14,7 @@ showUsage()
 
 # Parse valid argument options
 
-PARAMS=`getopt -n $0 -o h -l use-backdoor,no-out-link,show-trace,help -- "$@"`
+PARAMS=`getopt -n $0 -o h -l no-out-link,show-trace,help -- "$@"`
 
 if [ $? != 0 ]
 then
@@ -30,9 +29,6 @@ eval set -- "$PARAMS"
 while [ "$1" != "--" ]
 do
     case "$1" in
-	--use-backdoor)
-	    useBackdoorArg="--arg useBackdoor true"
-	    ;;
 	--no-out-link)
 	    noOutLinkArg="--no-out-link"
 	    ;;
@@ -67,4 +63,4 @@ fi
 
 # Build a network of VMs
 
-nix-build $NIXOS/modules/installer/tools/nixos-build-vms/build-vms.nix --argstr networkExpr $networkExpr --argstr nixos $NIXOS --argstr nixpkgs $NIXPKGS_ALL $useBackdoorArg $noOutLinkArg $showTraceArg
+nix-build $NIXOS/modules/installer/tools/nixos-build-vms/build-vms.nix --argstr networkExpr $networkExpr --argstr nixos $NIXOS --argstr nixpkgs $NIXPKGS_ALL $noOutLinkArg $showTraceArg
diff --git a/modules/virtualisation/qemu-vm.nix b/modules/virtualisation/qemu-vm.nix
index 0490d530f9e..c26b27c7b8f 100644
--- a/modules/virtualisation/qemu-vm.nix
+++ b/modules/virtualisation/qemu-vm.nix
@@ -111,17 +111,6 @@ let
         description = "Options passed to QEMU.";
       };
 
-    virtualisation.useBackdoor =
-      mkOption {
-        default = false;
-	description =
-	''
-	  If enabled, the virtual machine makes a connection through TCP port 23
-	  to a daemon running on the host system acting as a proxy.
-	  This option makes it possible to connect to a VM through a socket file.
-	'';
-      };
-
     virtualisation.useBootLoader =
       mkOption {
         default = false;
@@ -156,11 +145,6 @@ let
             ${toString config.virtualisation.diskSize}M || exit 1
       fi
 
-      ${pkgs.lib.optionalString cfg.useBackdoor ''
-        # Remember the current working directory
-        WORKDIR=$(pwd)
-      ''}
-      
       # Start Samba (which wants to put its socket and config files in TMPDIR).
       if [ -z "$TMPDIR" -o -z "$USE_TMPDIR" ]; then
           TMPDIR=$(mktemp -d nix-vm-smbd.XXXXXXXXXX --tmpdir)
@@ -169,24 +153,13 @@ let
 
       ${pkgs.vmTools.startSamba}
 
-      ${pkgs.lib.optionalString cfg.useBackdoor ''
-        # Create a shell socket file to which the VM can connect and create in the
-        # current working directory a socket file which can be used to remotely access
-        # the VM through the shell interface
-	
-        ${pkgs.socat}/bin/socat UNIX-LISTEN:./shell UNIX-LISTEN:$WORKDIR/${vmName}.socket,fork &
-
-        while [ ! -e ./shell ]; do sleep 0.1; done # Wait until the socket file is there
-      ''}
-
       # Start QEMU.
       exec ${pkgs.qemu_kvm}/bin/qemu-system-x86_64 \
           -name ${vmName} \
           -m ${toString config.virtualisation.memorySize} \
           -net nic,vlan=0,model=virtio \
           -chardev socket,id=samba,path=./samba \
-          -net user,vlan=0,guestfwd=tcp:10.0.2.4:445-chardev:samba${if cfg.useBackdoor then ",guestfwd=tcp:10.0.2.6:23-chardev:shell" else ""}''${QEMU_NET_OPTS:+,$QEMU_NET_OPTS} \
-          ${if cfg.useBackdoor then "-chardev socket,id=shell,path=./shell" else ""} \
+          -net user,vlan=0,guestfwd=tcp:10.0.2.4:445-chardev:samba''${QEMU_NET_OPTS:+,$QEMU_NET_OPTS} \
           ${if cfg.useBootLoader then ''
             -drive index=0,file=$NIX_DISK_IMAGE,if=virtio,cache=writeback,werror=report \
             -drive index=1,file=${bootDisk}/disk.img,if=virtio,boot=on \
-- 
GitLab


From 66ead8002676dda48e0b97aaefa128bad9536ae4 Mon Sep 17 00:00:00 2001
From: Sander van der Burg <s.vanderburg@tudelft.nl>
Date: Wed, 19 Jan 2011 12:59:32 +0000
Subject: [PATCH 2828/5331] Disnix now also waits for the services it supports
 before it starts the Disnix daemon itself

svn path=/nixos/trunk/; revision=25626
---
 modules/services/misc/disnix.nix | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/modules/services/misc/disnix.nix b/modules/services/misc/disnix.nix
index f3dd55b64d9..d0ef5d34a64 100644
--- a/modules/services/misc/disnix.nix
+++ b/modules/services/misc/disnix.nix
@@ -107,7 +107,11 @@ in
       disnix =
         { description = "Disnix server";
 
-          startOn = "started dbus";
+          startOn = "started dbus"
+	  + optionalString config.services.httpd.enable " and started httpd"
+	  + optionalString config.services.mysql.enable " and started mysql"
+	  + optionalString config.services.tomcat.enable " and started tomcat"
+	  + optionalString config.services.svnserve.enable " and started svnserve";
 
           script =
           ''
-- 
GitLab


From 8361444f9b0eb10e1595a57b69ac5fa4147b1c8b Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 21 Jan 2011 13:38:30 +0000
Subject: [PATCH 2829/5331] * Disable compositing for now in the graphical
 installation CD.  It   seems to cause problems with KDE 4.5 on some graphics
 drivers (such   as Cirrus and VGA in QEMU).  (NixOS/121)

svn path=/nixos/trunk/; revision=25659
---
 .../installer/cd-dvd/installation-cd-graphical.nix    | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/modules/installer/cd-dvd/installation-cd-graphical.nix b/modules/installer/cd-dvd/installation-cd-graphical.nix
index a3c533bb715..bda613a2532 100644
--- a/modules/installer/cd-dvd/installation-cd-graphical.nix
+++ b/modules/installer/cd-dvd/installation-cd-graphical.nix
@@ -1,11 +1,20 @@
 # This module defines a NixOS installation CD that contains X11 and
 # KDE 4.
 
-{config, pkgs, ...}:
+{ config, pkgs, ... }:
 
 {
   require = [
     ./installation-cd-base.nix
     ../../profiles/graphical.nix
   ];
+
+  # Disable compositing for now.  It seems to cause problems with KDE
+  # 4.5 on some graphics drivers (such as Cirrus and VGA in QEMU).
+  services.xserver.config =
+    ''
+      Section "Extensions"
+        Option "Composite" "Disable"
+      EndSection
+    '';
 }
-- 
GitLab


From 7edc419f657b18392d41c362af16c3293630fc5a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Sat, 29 Jan 2011 23:06:52 +0000
Subject: [PATCH 2830/5331] lshd: Streamline first use.

svn path=/nixos/trunk/; revision=25716
---
 modules/services/networking/ssh/lshd.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/modules/services/networking/ssh/lshd.nix b/modules/services/networking/ssh/lshd.nix
index f5d52c82101..63943990f61 100644
--- a/modules/services/networking/ssh/lshd.nix
+++ b/modules/services/networking/ssh/lshd.nix
@@ -135,7 +135,8 @@ in
                 # XXX: It would be nice to provide feedback to the
                 # user when this fails, so that they can retry it
                 # manually.
-                ${lsh}/bin/lsh-make-seed -o /var/spool/lsh/yarrow-seed-file
+                ${lsh}/bin/lsh-make-seed --sloppy \
+                   -o /var/spool/lsh/yarrow-seed-file
             fi
 
             if ! test -f "${cfg.hostKey}"
-- 
GitLab


From ebb8f55a10eadc63ab18d31316fe8c971b15915f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Sat, 29 Jan 2011 23:06:57 +0000
Subject: [PATCH 2831/5331] Mingetty: Default to `ttyS0' for ARM devices.

svn path=/nixos/trunk/; revision=25717
---
 modules/services/ttys/mingetty.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/modules/services/ttys/mingetty.nix b/modules/services/ttys/mingetty.nix
index d8abc129e2d..e924d38dd60 100644
--- a/modules/services/ttys/mingetty.nix
+++ b/modules/services/ttys/mingetty.nix
@@ -11,7 +11,10 @@ with pkgs.lib;
     services.mingetty = {
 
       ttys = mkOption {
-        default = [ "tty1" "tty2" "tty3" "tty4" "tty5" "tty6" ];
+        default =
+          if pkgs.stdenv.isArm
+          then [ "ttyS0" ] # presumably an embedded platform such as a plug
+          else [ "tty1" "tty2" "tty3" "tty4" "tty5" "tty6" ];
         description = ''
           The list of tty devices on which to start a login prompt.
         '';
-- 
GitLab


From 0513b31f73084c1483e8d6c01f2e96c8079b1ec0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Sat, 29 Jan 2011 23:07:02 +0000
Subject: [PATCH 2832/5331] Improve the documentation of `generationsDir'.

svn path=/nixos/trunk/; revision=25718
---
 .../installer/generations-dir/generations-dir.nix  | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/modules/installer/generations-dir/generations-dir.nix b/modules/installer/generations-dir/generations-dir.nix
index a56dd6a19ff..db9fa32c55a 100644
--- a/modules/installer/generations-dir/generations-dir.nix
+++ b/modules/installer/generations-dir/generations-dir.nix
@@ -12,8 +12,18 @@ let
           enable = mkOption {
             default = false;
             description = ''
-              Whether to enable the simple preparation of symlinks to the system
-              generations in /boot.
+              Whether to create symlinks to the system generations under
+              <literal>/boot</literal>.  When enabled,
+              <literal>/boot/default/kernel</literal>,
+              <literal>/boot/default/initrd</literal>, etc., are updated to
+              point to the current generation's kernel image, initial RAM
+              disk, and other bootstrap files.
+
+              This optional is not necessary with bootloads such as GNU GRUB
+              for which the menu is updated to point to the latest bootstrap
+              files.  However, it is needed for U-Boot on platforms where the
+              boot command line is stored in flash memory rather than in a
+              menu file.
             '';
           };
 
-- 
GitLab


From 9d984837c9d7d5b1f3afe396cceaa526baf9682b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Sat, 29 Jan 2011 23:07:06 +0000
Subject: [PATCH 2833/5331] GNU: Disable GRUB by default on ARM.

svn path=/nixos/trunk/; revision=25719
---
 modules/config/gnu.nix | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/modules/config/gnu.nix b/modules/config/gnu.nix
index 70ddca66876..ddc1527285f 100644
--- a/modules/config/gnu.nix
+++ b/modules/config/gnu.nix
@@ -19,13 +19,15 @@ with pkgs.lib;
     environment.systemPackages = with pkgs;
       # TODO: Adjust `requiredPackages' from `system-path.nix'.
       # TODO: Add Inetutils once it has the new `ifconfig'.
-      [ grub2 parted fdisk
+      [ parted fdisk
         nano zile
         texinfo # for the stand-alone Info reader
-      ];
+      ]
+      ++ stdenv.lib.optional !stdenv.isArm grub2;
 
-    # GNU GRUB.
-    boot.loader.grub.enable = true;
+
+    # GNU GRUB, where available.
+    boot.loader.grub.enable = !stdenv.isArm;
     boot.loader.grub.version = 2;
 
     # GNU lsh.
-- 
GitLab


From f30f71b7fafe72616fcd0d1bbdf13e2d9c31e4f2 Mon Sep 17 00:00:00 2001
From: Sander van der Burg <s.vanderburg@tudelft.nl>
Date: Sun, 30 Jan 2011 16:13:47 +0000
Subject: [PATCH 2834/5331] Fixed a syntax error

svn path=/nixos/trunk/; revision=25727
---
 modules/config/gnu.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/config/gnu.nix b/modules/config/gnu.nix
index ddc1527285f..dc79dc5c429 100644
--- a/modules/config/gnu.nix
+++ b/modules/config/gnu.nix
@@ -23,7 +23,7 @@ with pkgs.lib;
         nano zile
         texinfo # for the stand-alone Info reader
       ]
-      ++ stdenv.lib.optional !stdenv.isArm grub2;
+      ++ stdenv.lib.optional (!stdenv.isArm) grub2;
 
 
     # GNU GRUB, where available.
-- 
GitLab


From aa2e768fe49c212b40fbcde3b6fc79b5d51cb957 Mon Sep 17 00:00:00 2001
From: Sander van der Burg <s.vanderburg@tudelft.nl>
Date: Sun, 30 Jan 2011 17:27:24 +0000
Subject: [PATCH 2835/5331] Another strange error, which I fixed

svn path=/nixos/trunk/; revision=25730
---
 modules/config/gnu.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/config/gnu.nix b/modules/config/gnu.nix
index dc79dc5c429..760f90ff2ea 100644
--- a/modules/config/gnu.nix
+++ b/modules/config/gnu.nix
@@ -27,7 +27,7 @@ with pkgs.lib;
 
 
     # GNU GRUB, where available.
-    boot.loader.grub.enable = !stdenv.isArm;
+    boot.loader.grub.enable = !pkgs.stdenv.isArm;
     boot.loader.grub.version = 2;
 
     # GNU lsh.
-- 
GitLab


From e995f317ae2864652da71ab827bcaca1a7e19db5 Mon Sep 17 00:00:00 2001
From: Sander van der Burg <s.vanderburg@tudelft.nl>
Date: Fri, 4 Feb 2011 13:33:52 +0000
Subject: [PATCH 2836/5331] Fixed NFS mount to storage machine

svn path=/nixos/trunk/; revision=25773
---
 tests/trac.nix | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/tests/trac.nix b/tests/trac.nix
index daf59a6f29d..9f3ea90261f 100644
--- a/tests/trac.nix
+++ b/tests/trac.nix
@@ -31,9 +31,11 @@
     webserver = 
       {config, pkgs, ...}:
       {
-        fileSystems = pkgs.lib.mkOverrideTemplate 50 {} 
+        fileSystems = pkgs.lib.mkOverride 50  
           [ { mountPoint = "/repos";
-              device = "storage:/repos"; } 
+              device = "storage:/repos";
+	      fsType = "nfs";
+	      options = "bootwait"; } 
           ];
       
         services.portmap.enable = true;
-- 
GitLab


From 28e4ac1af230d3252fef6769d194a876a020cb0b Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sat, 5 Feb 2011 06:58:15 +0000
Subject: [PATCH 2837/5331] * Generically handle the case where
 $out/share/mime/packages or one of   its parents is a symlink.

svn path=/nixos/trunk/; revision=25776
---
 modules/config/system-path.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/config/system-path.nix b/modules/config/system-path.nix
index 80602468869..26685ae15f4 100644
--- a/modules/config/system-path.nix
+++ b/modules/config/system-path.nix
@@ -100,7 +100,7 @@ let
           # !!! Hacky, should modularise.
           postBuild =
             ''
-              if [ -x $out/bin/update-mime-database -a -d $out/share/mime/packages ]; then
+              if [ -x $out/bin/update-mime-database -a -w $out/share/mime/packages ]; then
                   $out/bin/update-mime-database -V $out/share/mime
               fi
 
-- 
GitLab


From 7104acfa8b629fcd6af3cfb969e98fc68e815c11 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 8 Feb 2011 14:58:41 +0000
Subject: [PATCH 2838/5331] * Set the checkwinsize option in interactive
 shells.  Otherwise   bash may miss resize events (I guess SIGWINCH is only
 sent to   the foreground process).

svn path=/nixos/trunk/; revision=25815
---
 modules/programs/bash/bashrc.sh | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/modules/programs/bash/bashrc.sh b/modules/programs/bash/bashrc.sh
index c301ffde73a..5ce6b0ebd88 100644
--- a/modules/programs/bash/bashrc.sh
+++ b/modules/programs/bash/bashrc.sh
@@ -2,6 +2,11 @@ if [ -n "$NOSYSBASHRC" ]; then
     return
 fi
 
+# In interactive shells, check the window size after every command.
+if [ -n "$PS1" ]; then
+    shopt -s checkwinsize
+fi
+
 # Initialise a bunch of environment variables.
 export LD_LIBRARY_PATH=/var/run/opengl-driver/lib:/var/run/opengl-driver-32/lib # !!! only set if needed
 export MODULE_DIR=@modulesTree@/lib/modules
-- 
GitLab


From 163769ace5dc8d67f7a6f18b71698ca569b46395 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 10 Feb 2011 12:27:12 +0000
Subject: [PATCH 2839/5331] * Write hypervisor log messages to
 /var/log/xen/console.

svn path=/nixos/trunk/; revision=25882
---
 modules/virtualisation/xen-dom0.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/modules/virtualisation/xen-dom0.nix b/modules/virtualisation/xen-dom0.nix
index 7b8c5f3dd90..cb71f4137ab 100644
--- a/modules/virtualisation/xen-dom0.nix
+++ b/modules/virtualisation/xen-dom0.nix
@@ -116,8 +116,12 @@ in
             pkgs.utillinux pkgs.bash xen pkgs.pciutils pkgs.procps
           ];
 
+        environment.XENCONSOLED_TRACE = "hv";
+
         preStart = 
           ''
+            mkdir -p /var/log/xen/console -m 0700
+
             ${xen}/sbin/xend start
   
             # Wait until Xend is running.
-- 
GitLab


From 433679537b6100734f61d62781c9c4e5b32a719b Mon Sep 17 00:00:00 2001
From: Florian Friesdorf <flo@chaoflow.net>
Date: Thu, 10 Feb 2011 17:36:56 +0000
Subject: [PATCH 2840/5331] intel wifi 6000 firmware

svn path=/nixos/trunk/; revision=25889
---
 modules/hardware/network/intel-6000.nix | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 modules/hardware/network/intel-6000.nix

diff --git a/modules/hardware/network/intel-6000.nix b/modules/hardware/network/intel-6000.nix
new file mode 100644
index 00000000000..89dd5ba4b88
--- /dev/null
+++ b/modules/hardware/network/intel-6000.nix
@@ -0,0 +1,5 @@
+{pkgs, config, ...}:
+
+{
+  hardware.firmware = [ pkgs.iwlwifi6000ucode ];
+}
-- 
GitLab


From 49213aa80a47cfad0bddfc57c2b00e7e655e91fc Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 15 Feb 2011 15:04:17 +0000
Subject: [PATCH 2841/5331] * Doh! Exceptions outside of subtests were silently
 ignored.

svn path=/nixos/trunk/; revision=25981
---
 lib/testing.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/testing.nix b/lib/testing.nix
index c0d3b4cd135..670a1dd6ac2 100644
--- a/lib/testing.nix
+++ b/lib/testing.nix
@@ -47,7 +47,7 @@ rec {
         ''
           mkdir -p $out/nix-support
 
-          LOGFILE=$out/log.xml tests="testScript" ${driver}/bin/nixos-test-driver || failed=1
+          LOGFILE=$out/log.xml tests='eval $ENV{testScript}; die $@ if $@;' ${driver}/bin/nixos-test-driver || failed=1
 
           # Generate a pretty-printed log.          
           xsltproc --output $out/log.html ${./test-driver/log2html.xsl} $out/log.xml
-- 
GitLab


From 32aa967ee1eada7ea2e67087e0a0df285093c133 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 16 Feb 2011 10:07:28 +0000
Subject: [PATCH 2842/5331] * Only add a VDE NIC if there is a webserver.

svn path=/nixos/trunk/; revision=25986
---
 lib/test-driver/Machine.pm | 2 +-
 tests/installer.nix        | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/lib/test-driver/Machine.pm b/lib/test-driver/Machine.pm
index 7b48f26fb82..49e5fd767ee 100644
--- a/lib/test-driver/Machine.pm
+++ b/lib/test-driver/Machine.pm
@@ -20,7 +20,7 @@ sub new {
     
     my $name = $args->{name};
     if (!$name) {
-        $startCommand =~ /run-(.*)-vm$/;
+        $startCommand =~ /run-(.*)-vm$/ if defined $startCommand;
         $name = $1 || "machine";
     }
 
diff --git a/tests/installer.nix b/tests/installer.nix
index f4d4281a073..b356eff4947 100644
--- a/tests/installer.nix
+++ b/tests/installer.nix
@@ -93,7 +93,8 @@ let
     ''
       createDisk("harddisk", 4 * 1024);
 
-      my $machine = createMachine({ hda => "harddisk", cdrom => glob("${iso}/iso/*.iso"), qemuFlags => '${qemuNICFlags 1 1 1}' });
+      my $machine = createMachine({ hda => "harddisk", cdrom => glob("${iso}/iso/*.iso"), 
+        qemuFlags => '${if testChannel then qemuNICFlags 1 1 1 else ""}'});
       $machine->start;
 
       ${optionalString testChannel ''
-- 
GitLab


From 44ea6a7e4d2b9de189cabff72bebb43e3e0e269c Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 16 Feb 2011 10:24:25 +0000
Subject: [PATCH 2843/5331] * Typo.

svn path=/nixos/trunk/; revision=25987
---
 modules/profiles/installation-device.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/modules/profiles/installation-device.nix b/modules/profiles/installation-device.nix
index ccd982c9ce9..9573b933320 100644
--- a/modules/profiles/installation-device.nix
+++ b/modules/profiles/installation-device.nix
@@ -5,7 +5,7 @@ with pkgs.lib;
 
 let
   # Location of the repository on the harddrive
-  nixosPath = toString ../../.;
+  nixosPath = toString ../..;
 
   # Check if the path is from the NixOS repository
   isNixOSFile = path:
@@ -20,7 +20,7 @@ let
 
   # Partition module files because between NixOS and non-NixOS files.  NixOS
   # files may change if the repository is updated.
-  partitionnedModuleFiles =
+  partitionedModuleFiles =
     let p = partition isNixOSFile moduleFiles; in
     { nixos = p.right; others = p.wrong; };
 
@@ -32,7 +32,7 @@ let
         "/etc/nixos/nixos" + removePrefix nixosPath (toString path);
       relocateOthers = null;
     in
-      { nixos = map relocateNixOS partitionnedModuleFiles.nixos;
+      { nixos = map relocateNixOS partitionedModuleFiles.nixos;
         others = []; # TODO: copy the modules to the install-device repository.
       };
 
-- 
GitLab


From fce06b0a2edd1c651c1030840694dcb3f53cb12a Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 16 Feb 2011 12:29:05 +0000
Subject: [PATCH 2844/5331] svn path=/nixos/trunk/; revision=25989

---
 modules/profiles/graphical.nix | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/modules/profiles/graphical.nix b/modules/profiles/graphical.nix
index 58b4ffa7c1a..14f9b74d800 100644
--- a/modules/profiles/graphical.nix
+++ b/modules/profiles/graphical.nix
@@ -1,11 +1,9 @@
 # This module defines a NixOS configuration that contains X11 and
 # KDE 4.
-{config, pkgs, ...}:
+{ config, pkgs, ... }:
 
 {
-  require = [
-    ./base.nix
-  ];
+  require = [ ./base.nix ];
 
   services.xserver = {
     enable = true;
-- 
GitLab


From 131f3c8e637aae133dedec5c53785f79687d1da8 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 16 Feb 2011 14:38:52 +0000
Subject: [PATCH 2845/5331] * Because cdrom_id now links against libpthread,
 LD_LIBRARY_PATH must   be set when udevd calls external programs.  (The udev
 manpage claims   that udevd passes its own environment variables, but this is
 not the   case.) * Get rid of some udev rule hacks that no longer seem
 needed.

svn path=/nixos/trunk/; revision=25991
---
 modules/system/boot/stage-1.nix | 22 ++--------------------
 1 file changed, 2 insertions(+), 20 deletions(-)

diff --git a/modules/system/boot/stage-1.nix b/modules/system/boot/stage-1.nix
index 7a38883af57..b2769f63ac9 100644
--- a/modules/system/boot/stage-1.nix
+++ b/modules/system/boot/stage-1.nix
@@ -222,6 +222,8 @@ let
     name = "udev-rules";
     buildCommand = ''
       ensureDir $out
+
+      echo 'ENV{LD_LIBRARY_PATH}="${extraUtils}/lib"' > $out/00-env.rules
       
       cp ${pkgs.udev}/libexec/rules.d/60-cdrom_id.rules $out/
       cp ${pkgs.udev}/libexec/rules.d/60-persistent-storage.rules $out/
@@ -243,26 +245,6 @@ let
             --replace 'ENV{DM_SBIN_PATH}="/sbin"' 'ENV{DM_SBIN_PATH}="${extraUtils}/bin"' \
             --replace /sbin/mdadm ${extraUtils}/bin/mdadm
       done
-
-      # Remove rule preventing creation of a by-label symlink
-      # for a CD-ROM if disk removal will not be properly reported.
-      # Such a link can get obsolete in a running system, but 
-      # during boot stage 1 it is unlikely. We need this change
-      # to be able to boot on a wider choice of CD drives.
-      sed -e '/^ENV[{]DEVTYPE[}]=="disk", .*GOTO/d' -i $out/60-persistent-storage.rules
-
-      # Work around a bug in QEMU, which doesn't implement the "READ
-      # DISC INFORMATION" SCSI command:
-      #   https://bugzilla.redhat.com/show_bug.cgi?id=609049
-      # As a result, `cdrom_id' doesn't print
-      # ID_CDROM_MEDIA_TRACK_COUNT_DATA, which in turn prevents the
-      # /dev/disk/by-label symlinks from being created.  We need these
-      # in the NixOS installation CD, so use ID_CDROM_MEDIA in the
-      # corresponding udev rules for now.  This was the behaviour in
-      # udev <= 154.  See also
-      #   http://www.spinics.net/lists/hotplug/msg03935.html
-      substituteInPlace $out/60-persistent-storage.rules \
-        --replace ID_CDROM_MEDIA_TRACK_COUNT_DATA ID_CDROM_MEDIA
     ''; # */
   };
 
-- 
GitLab


From 5427b0f83771e54ee9fac1833b7c8d14112bcc2e Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 16 Feb 2011 15:33:54 +0000
Subject: [PATCH 2846/5331] * Use kdm on the installation CD.

svn path=/nixos/trunk/; revision=25994
---
 modules/profiles/graphical.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/modules/profiles/graphical.nix b/modules/profiles/graphical.nix
index 14f9b74d800..d714e142f73 100644
--- a/modules/profiles/graphical.nix
+++ b/modules/profiles/graphical.nix
@@ -9,6 +9,7 @@
     enable = true;
     autorun = true;
     defaultDepth = 24;
+    displayManager.kdm.enable = true;
     desktopManager.default = "kde4";
     desktopManager.kde4.enable = true;
   };
-- 
GitLab


From 63bd2744b74ef68f3e960026e133585f12c0cbcc Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 16 Feb 2011 16:48:34 +0000
Subject: [PATCH 2847/5331] * Partially revert r25991 because it depends on the
 x-updates branch.

svn path=/nixos/trunk/; revision=25995
---
 modules/system/boot/stage-1.nix | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/modules/system/boot/stage-1.nix b/modules/system/boot/stage-1.nix
index b2769f63ac9..cdfbdbbf432 100644
--- a/modules/system/boot/stage-1.nix
+++ b/modules/system/boot/stage-1.nix
@@ -245,6 +245,21 @@ let
             --replace 'ENV{DM_SBIN_PATH}="/sbin"' 'ENV{DM_SBIN_PATH}="${extraUtils}/bin"' \
             --replace /sbin/mdadm ${extraUtils}/bin/mdadm
       done
+
+      # !!! Remove this after merging the x-updates branch:
+
+      # Work around a bug in QEMU, which doesn't implement the "READ
+      # DISC INFORMATION" SCSI command:
+      #   https://bugzilla.redhat.com/show_bug.cgi?id=609049
+      # As a result, `cdrom_id' doesn't print
+      # ID_CDROM_MEDIA_TRACK_COUNT_DATA, which in turn prevents the
+      # /dev/disk/by-label symlinks from being created.  We need these
+      # in the NixOS installation CD, so use ID_CDROM_MEDIA in the
+      # corresponding udev rules for now.  This was the behaviour in
+      # udev <= 154.  See also
+      #   http://www.spinics.net/lists/hotplug/msg03935.html
+      substituteInPlace $out/60-persistent-storage.rules \
+        --replace ID_CDROM_MEDIA_TRACK_COUNT_DATA ID_CDROM_MEDIA
     ''; # */
   };
 
-- 
GitLab


From 559834437ac2166819d1c9af3fcb8f5308a93b8c Mon Sep 17 00:00:00 2001
From: "Yury G. Kudryashov" <urkud.urkud@gmail.com>
Date: Wed, 16 Feb 2011 21:03:14 +0000
Subject: [PATCH 2848/5331] ejabberd: tabs->spaces, remove trailing whitespace

svn path=/nixos/trunk/; revision=25996
---
 modules/services/networking/ejabberd.nix | 88 ++++++++++++------------
 1 file changed, 44 insertions(+), 44 deletions(-)

diff --git a/modules/services/networking/ejabberd.nix b/modules/services/networking/ejabberd.nix
index b85dc26d2fc..6d233e543e2 100644
--- a/modules/services/networking/ejabberd.nix
+++ b/modules/services/networking/ejabberd.nix
@@ -13,9 +13,9 @@ in
   ###### interface
 
   options = {
-  
+
     services.ejabberd = {
-    
+
       enable = mkOption {
         default = false;
         description = "Whether to enable ejabberd server";
@@ -44,12 +44,12 @@ in
       loadDumps = mkOption {
         default = [];
         description = "Configuration dump that should be loaded on the first startup";
-	example = [ ./myejabberd.dump ];
+        example = [ ./myejabberd.dump ];
       };
     };
-    
+
   };
-  
+
 
   ###### implementation
 
@@ -61,10 +61,10 @@ in
 
         startOn = "started network-interfaces";
         stopOn = "stopping network-interfaces";
-	
-	environment = {
-	  PATH = "$PATH:${pkgs.ejabberd}/sbin:${pkgs.ejabberd}/bin:${pkgs.coreutils}/bin:${pkgs.bash}/bin:${pkgs.gnused}/bin";
-	};
+
+        environment = {
+          PATH = "$PATH:${pkgs.ejabberd}/sbin:${pkgs.ejabberd}/bin:${pkgs.coreutils}/bin:${pkgs.bash}/bin:${pkgs.gnused}/bin";
+        };
 
         preStart =
           ''
@@ -73,31 +73,31 @@ in
 
             if ! test -d ${cfg.spoolDir}
             then
-	        initialize=1
+                initialize=1
                 cp -av ${pkgs.ejabberd}/var/lib/ejabberd /var/lib
             fi
-            
+
             if ! test -d ${cfg.confDir}
-	    then
-		mkdir -p ${cfg.confDir}
-	        cp ${pkgs.ejabberd}/etc/ejabberd/* ${cfg.confDir}
-	        sed -e 's|{hosts, \["localhost"\]}.|{hosts, \[${cfg.virtualHosts}\]}.|' ${pkgs.ejabberd}/etc/ejabberd/ejabberd.cfg > ${cfg.confDir}/ejabberd.cfg
-	    fi
-	    
-	    ejabberdctl --config-dir ${cfg.confDir} --logs ${cfg.logsDir} --spool ${cfg.spoolDir} start
-	    
-	    ${if cfg.loadDumps == [] then "" else
-	      ''	      
-	        if [ "$initialize" = "1" ]
-	        then
-	            # Wait until the ejabberd server is available for use
+            then
+                mkdir -p ${cfg.confDir}
+                cp ${pkgs.ejabberd}/etc/ejabberd/* ${cfg.confDir}
+                sed -e 's|{hosts, \["localhost"\]}.|{hosts, \[${cfg.virtualHosts}\]}.|' ${pkgs.ejabberd}/etc/ejabberd/ejabberd.cfg > ${cfg.confDir}/ejabberd.cfg
+            fi
+
+            ejabberdctl --config-dir ${cfg.confDir} --logs ${cfg.logsDir} --spool ${cfg.spoolDir} start
+
+            ${if cfg.loadDumps == [] then "" else
+              ''
+                if [ "$initialize" = "1" ]
+                then
+                    # Wait until the ejabberd server is available for use
                     count=0
                     while ! ejabberdctl --config-dir ${cfg.confDir} --logs ${cfg.logsDir} --spool ${cfg.spoolDir} status
                     do
                         if [ $count -eq 30 ]
                         then
                             echo "Tried 30 times, giving up..."
-	                    exit 1
+                            exit 1
                         fi
 
                         echo "Ejabberd daemon not yet started. Waiting for 1 second..."
@@ -105,31 +105,31 @@ in
                         sleep 1
                     done
 
-	            ${concatMapStrings (dump:
-		      ''
-		        echo "Importing dump: ${dump}"
-			
-			if [ -f ${dump} ]
-			then
-		            ejabberdctl --config-dir ${cfg.confDir} --logs ${cfg.logsDir} --spool ${cfg.spoolDir} load ${dump}
-			elif [ -d ${dump} ]
-			then
-			    for i in ${dump}/ejabberd-dump/*
-			    do
-			        ejabberdctl --config-dir ${cfg.confDir} --logs ${cfg.logsDir} --spool ${cfg.spoolDir} load $i
-			    done
-			fi
-		      '') cfg.loadDumps}
-	        fi
-	      ''}
+                    ${concatMapStrings (dump:
+                      ''
+                        echo "Importing dump: ${dump}"
+
+                        if [ -f ${dump} ]
+                        then
+                            ejabberdctl --config-dir ${cfg.confDir} --logs ${cfg.logsDir} --spool ${cfg.spoolDir} load ${dump}
+                        elif [ -d ${dump} ]
+                        then
+                            for i in ${dump}/ejabberd-dump/*
+                            do
+                                ejabberdctl --config-dir ${cfg.confDir} --logs ${cfg.logsDir} --spool ${cfg.spoolDir} load $i
+                            done
+                        fi
+                      '') cfg.loadDumps}
+                fi
+              ''}
           '';
 
         postStop =
-          ''        
+          ''
             ejabberdctl --config-dir ${cfg.confDir} --logs ${cfg.logsDir} --spool ${cfg.spoolDir} stop
           '';
       };
 
   };
-  
+
 }
-- 
GitLab


From 10119c9abcbd4cc3cd96285df9c5ce07691049b9 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 17 Feb 2011 13:00:55 +0000
Subject: [PATCH 2849/5331] * Give the installation VM a different MAC/IP from
 the fake nixos.org   VM.  MAC collisions don't work at all with VDE.

svn path=/nixos/trunk/; revision=26009
---
 tests/installer.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/installer.nix b/tests/installer.nix
index b356eff4947..817b8b7488e 100644
--- a/tests/installer.nix
+++ b/tests/installer.nix
@@ -94,7 +94,7 @@ let
       createDisk("harddisk", 4 * 1024);
 
       my $machine = createMachine({ hda => "harddisk", cdrom => glob("${iso}/iso/*.iso"), 
-        qemuFlags => '${if testChannel then qemuNICFlags 1 1 1 else ""}'});
+        qemuFlags => '${if testChannel then qemuNICFlags 1 1 2 else ""}'});
       $machine->start;
 
       ${optionalString testChannel ''
@@ -305,7 +305,7 @@ in {
       testScript =
         ''
           # damn, it's costly to evaluate nixos-rebuild (1G of ram)
-          my $machine = createMachine({ cdrom => glob("${iso}/iso/*.iso"), qemuFlags => '${qemuNICFlags 1 1 1} -m 1024' });
+          my $machine = createMachine({ cdrom => glob("${iso}/iso/*.iso"), qemuFlags => '${qemuNICFlags 1 1 2} -m 1024' });
           $machine->start;
 
           # Make sure that we don't try to download anything.
-- 
GitLab


From 8f5f70b292652e73cbc6ec6f0181260254800cbd Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 17 Feb 2011 14:38:02 +0000
Subject: [PATCH 2850/5331] * We don't really need a display manager on the
 installation CD.  Just   log in as root automatically.

svn path=/nixos/trunk/; revision=26014
---
 modules/profiles/graphical.nix                 | 2 +-
 modules/services/x11/display-managers/auto.nix | 2 ++
 tests/common/x11.nix                           | 1 -
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/modules/profiles/graphical.nix b/modules/profiles/graphical.nix
index d714e142f73..1c279a73ac9 100644
--- a/modules/profiles/graphical.nix
+++ b/modules/profiles/graphical.nix
@@ -9,7 +9,7 @@
     enable = true;
     autorun = true;
     defaultDepth = 24;
-    displayManager.kdm.enable = true;
+    displayManager.auto.enable = true;
     desktopManager.default = "kde4";
     desktopManager.kde4.enable = true;
   };
diff --git a/modules/services/x11/display-managers/auto.nix b/modules/services/x11/display-managers/auto.nix
index 507d24cd3ce..e2b1ee42e83 100644
--- a/modules/services/x11/display-managers/auto.nix
+++ b/modules/services/x11/display-managers/auto.nix
@@ -41,6 +41,8 @@ in
 
   config = mkIf cfg.enable {
 
+    services.xserver.displayManager.slim.enable = false;
+  
     services.xserver.displayManager.job =
       { execCmd =
           ''
diff --git a/tests/common/x11.nix b/tests/common/x11.nix
index fa8579d5ff8..c5a7c165d12 100644
--- a/tests/common/x11.nix
+++ b/tests/common/x11.nix
@@ -1,7 +1,6 @@
 { services.xserver.enable = true;
 
   # Automatically log in.
-  services.xserver.displayManager.slim.enable = false;
   services.xserver.displayManager.auto.enable = true;
 
   # Use IceWM as the window manager.
-- 
GitLab


From 5bdc1a9db79de461aa86c9533b56092bb1f45d18 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 17 Feb 2011 15:41:28 +0000
Subject: [PATCH 2851/5331] * Fix the Subversion test.

svn path=/nixos/trunk/; revision=26017
---
 tests/subversion.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/subversion.nix b/tests/subversion.nix
index d43e369b437..4a1ed62978e 100644
--- a/tests/subversion.nix
+++ b/tests/subversion.nix
@@ -96,7 +96,7 @@ in
 
       # Bob should not be able change the ACLs of the repo.
       # !!! Repoman should really return a 403 here.
-      $client->execute("curl --fail -u bob:fnord -F description=Xyzzy -F readers=alice,bob -F writers=alice -F watchers= -F tardirs= http://webserver/repoman/update/xyzzy")
+      $client->succeed("curl --fail -u bob:fnord -F description=Xyzzy -F readers=alice,bob -F writers=alice -F watchers= -F tardirs= http://webserver/repoman/update/xyzzy")
           =~ /not authorised/ or die;
       
       # Give Bob access.
-- 
GitLab


From 9f755eb3a48ce9bc689be4bff902d2f2ae98e41c Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sat, 19 Feb 2011 17:21:29 +0000
Subject: [PATCH 2852/5331] * Enable IPv6 support by default.  (Note that most
 NixOS systems   already had the ipv6 kernel module loaded, because dhclient
 needs   it.)

svn path=/nixos/trunk/; revision=26034
---
 modules/services/mail/postfix.nix    | 2 +-
 modules/tasks/network-interfaces.nix | 9 +++++----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/modules/services/mail/postfix.nix b/modules/services/mail/postfix.nix
index 3a28e81eb15..2cb07bd05c0 100644
--- a/modules/services/mail/postfix.nix
+++ b/modules/services/mail/postfix.nix
@@ -21,7 +21,7 @@ let
       default_privs = nobody
 
     ''
-    + optionalString (config.services.gw6c.enable || config.networking.nativeIPv6) (''
+    + optionalString (config.services.gw6c.enable || config.networking.enableIPv6) (''
       inet_protocols = all
     '')
     + (if cfg.networks != null then
diff --git a/modules/tasks/network-interfaces.nix b/modules/tasks/network-interfaces.nix
index 640ef0821fc..6c92e499c07 100644
--- a/modules/tasks/network-interfaces.nix
+++ b/modules/tasks/network-interfaces.nix
@@ -26,11 +26,10 @@ in
       '';
     };
 
-    networking.nativeIPv6 = mkOption {
-      default = false;
+    networking.enableIPv6 = mkOption {
+      default = true;
       description = ''
-        Whether to use IPv6 even though gw6c is not used. For example, 
-        for Postfix.
+        Whether to enable support for IPv6.
       '';
     };
 
@@ -145,6 +144,8 @@ in
 
   config = {
 
+    boot.kernelModules = optional cfg.enableIPv6 "ipv6";
+
     environment.systemPackages =
       [ pkgs.host
         pkgs.iproute
-- 
GitLab


From b61c6320061845f2e1a9839b7be2cfe1e9f6af3a Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sat, 19 Feb 2011 19:19:55 +0000
Subject: [PATCH 2853/5331] * Add a module for radvd.

svn path=/nixos/trunk/; revision=26035
---
 modules/module-list.nix               |  1 +
 modules/services/networking/radvd.nix | 77 +++++++++++++++++++++++++++
 2 files changed, 78 insertions(+)
 create mode 100644 modules/services/networking/radvd.nix

diff --git a/modules/module-list.nix b/modules/module-list.nix
index 3d2a11db5bb..6dee2a4aad3 100644
--- a/modules/module-list.nix
+++ b/modules/module-list.nix
@@ -105,6 +105,7 @@
   ./services/networking/portmap.nix
   ./services/networking/privoxy.nix
   ./services/networking/quassel.nix
+  ./services/networking/radvd.nix
   ./services/networking/sabnzbd.nix
   ./services/networking/ssh/lshd.nix
   ./services/networking/ssh/sshd.nix
diff --git a/modules/services/networking/radvd.nix b/modules/services/networking/radvd.nix
new file mode 100644
index 00000000000..4da60525e38
--- /dev/null
+++ b/modules/services/networking/radvd.nix
@@ -0,0 +1,77 @@
+# Module for the IPv6 Router Advertisement Daemon.
+
+{ config, pkgs, ... }:
+
+with pkgs.lib;
+
+let
+
+  cfg = config.services.radvd;
+
+  confFile = pkgs.writeText "radvd.conf" cfg.config;
+
+in
+
+{
+
+  ###### interface
+
+  options = {
+  
+    services.radvd.enable = mkOption {
+      default = false;
+      description =
+        ''
+          Whether to enable the Router Advertisement Daemon
+          (<command>radvd</command>), which provides link-local
+          advertisements of IPv6 router addresses and prefixes using
+          the Neighbor Discovery Protocol (NDP).  This enables
+          stateless address autoconfiguration in IPv6 clients on the
+          network.
+        '';
+    };
+
+    services.radvd.config = mkOption {
+      example =
+        ''
+          interface eth0 {
+            AdvSendAdvert on;
+            prefix 2001:db8:1234:5678::/64 { };
+          };
+        '';
+      description =
+        ''
+          The contents of the radvd configuration file.
+        '';
+    };
+
+  };
+
+
+  ###### implementation
+
+  config = mkIf cfg.enable {
+
+    environment.systemPackages = [ pkgs.radvd ];
+    
+    jobs.radvd =
+      { description = "IPv6 Router Advertisement Daemon";
+      
+        startOn = "started network-interfaces";
+
+        preStart =
+          ''
+            # !!! Radvd only works if IPv6 forwarding is enabled.  But
+            # this should probably be done somewhere else (and not
+            # necessarily for all interfaces).
+            echo 1 > /proc/sys/net/ipv6/conf/all/forwarding
+          '';
+        
+        exec = "${pkgs.radvd}/sbin/radvd -m syslog -s -C ${confFile}";
+
+        daemonType = "fork";
+      };
+
+  };
+  
+}
\ No newline at end of file
-- 
GitLab


From b70ba07ec15bdc05e01d8a812645fe7816801312 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sat, 19 Feb 2011 19:21:19 +0000
Subject: [PATCH 2854/5331] * Add a test of IPv6 support.

svn path=/nixos/trunk/; revision=26036
---
 tests/default.nix |  1 +
 tests/ipv6.nix    | 76 +++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 77 insertions(+)
 create mode 100644 tests/ipv6.nix

diff --git a/tests/default.nix b/tests/default.nix
index 12a7244d6e1..081a4773084 100644
--- a/tests/default.nix
+++ b/tests/default.nix
@@ -10,6 +10,7 @@ with import ../lib/testing.nix { inherit nixpkgs services system; };
   bittorrent = makeTest (import ./bittorrent.nix);
   firefox = makeTest (import ./firefox.nix);
   installer = makeTests (import ./installer.nix);
+  ipv6 = makeTest (import ./ipv6.nix);
   kde4 = makeTest (import ./kde4.nix);
   login = makeTest (import ./login.nix);
   nat = makeTest (import ./nat.nix);
diff --git a/tests/ipv6.nix b/tests/ipv6.nix
new file mode 100644
index 00000000000..76958ab445d
--- /dev/null
+++ b/tests/ipv6.nix
@@ -0,0 +1,76 @@
+# Test of IPv6 functionality in NixOS, including whether router
+# solicication/advertisement using radvd works.
+
+{ pkgs, ... }:
+
+{
+
+  nodes =
+    { client = { config, pkgs, ... }: { };
+    
+      server =
+        { config, pkgs, ... }:
+        { services.httpd.enable = true;
+          services.httpd.adminAddr = "foo@example.org";
+        };
+
+      router = 
+        { config, pkgs, ... }:
+        { services.radvd.enable = true;
+          services.radvd.config =
+            ''
+              interface eth1 {
+                AdvSendAdvert on;
+                # ULA prefix (RFC 4193).
+                prefix fd60:cc69:b537:1::/64 { };
+              };
+            '';
+        };
+    };
+
+  testScript =
+    ''
+      # Start the router first so that it respond to router solicitations.
+      $router->waitForJob("radvd");
+    
+      startAll;
+    
+      $client->waitForJob("network-interfaces");
+      $server->waitForJob("network-interfaces");
+
+      # Wait until the given interface has a non-tentative address of
+      # the desired scope (i.e. has completed Duplicate Address
+      # Detection).
+      sub waitForAddress {
+          my ($machine, $iface, $scope) = @_;
+          $machine->waitUntilSucceeds("[ `ip -o -6 addr show dev $iface scope $scope | grep -v tentative | wc -l` -eq 1 ]");
+          my $ip = (split /[ \/]+/, $machine->succeed("ip -o -6 addr show dev $iface scope $scope"))[3];
+          $machine->log("$scope address on $iface is $ip");
+          return $ip;
+      }
+      
+      subtest "loopback address", sub {
+          $client->succeed("ping6 -c 1 ::1 >&2");  
+          $client->fail("ping6 -c 1 ::2 >&2");  
+      };
+    
+      subtest "local link addressing", sub {
+          my $clientIp = waitForAddress $client, "eth1", "link";
+          my $serverIp = waitForAddress $server, "eth1", "link";
+          $client->succeed("ping6 -c 1 -I eth1 $clientIp >&2");
+          $client->succeed("ping6 -c 1 -I eth1 $serverIp >&2");
+      };
+
+      subtest "global addressing", sub {
+          my $clientIp = waitForAddress $client, "eth1", "global";
+          my $serverIp = waitForAddress $server, "eth1", "global";
+          $client->succeed("ping6 -c 1 $clientIp >&2");
+          $client->succeed("ping6 -c 1 $serverIp >&2");
+          $client->succeed("curl --fail -g http://[$serverIp]");
+          $client->fail("curl --fail -g http://[$clientIp]");
+      };
+
+      # TODO: test reachability of a machine on another network.
+    '';
+
+}
-- 
GitLab


From 228004604def36693da76b1ed69aa9f5b95820d3 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 21 Feb 2011 10:24:42 +0000
Subject: [PATCH 2855/5331] svn path=/nixos/trunk/; revision=26040

---
 release.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/release.nix b/release.nix
index a2ce651770b..2e4098a6de2 100644
--- a/release.nix
+++ b/release.nix
@@ -1,4 +1,4 @@
-{ nixpkgs ? ../nixpkgs }:
+{ nixpkgs ? ../nixpkgs-wc }:
 
 let
 
@@ -167,6 +167,7 @@ let
         installer.simple = t.installer.simple.test;
         installer.swraid = t.installer.swraid.test;
         installer.rebuildCD = t.installer.rebuildCD.test;
+        ipv6 = t.ipv6.test;
         kde4 = t.kde4.test;
         login = t.login.test;
         nat = t.nat.test;
-- 
GitLab


From 158a60465f3487bf38f728a2678aa45acb568ad2 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 22 Feb 2011 10:41:11 +0000
Subject: [PATCH 2856/5331] * The vde_switch startup code was reading from the
 wrong filehandle,   so the startup synchronisation didn't work, causing
 spurious QEMU   failures ("Device 'vde' could not be initialized").

svn path=/nixos/trunk/; revision=26055
---
 lib/test-driver/test-driver.pl | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/lib/test-driver/test-driver.pl b/lib/test-driver/test-driver.pl
index bdb3f40ca6c..547f1da1af7 100644
--- a/lib/test-driver/test-driver.pl
+++ b/lib/test-driver/test-driver.pl
@@ -38,9 +38,10 @@ foreach my $vlan (split / /, $ENV{VLANS} || "") {
     }
     close $stdoutW;
     print $pty "version\n";
-    readline $pty or die "cannot start vde_switch";
+    readline $stdoutR or die "cannot start vde_switch";
     $ENV{"QEMU_VDE_SOCKET_$vlan"} = $socket;
     $vlans{$vlan} = $pty;
+    die unless -e "$socket/ctl";
 }
 
 
-- 
GitLab


From 0ea15a8f768ca5c43f32e539ff66d1b661b8bbb6 Mon Sep 17 00:00:00 2001
From: Karn Kallio <tierpluspluslists@gmail.com>
Date: Tue, 22 Feb 2011 16:39:40 +0000
Subject: [PATCH 2857/5331] Strigi has moved out of kde4

svn path=/nixos/trunk/; revision=26061
---
 modules/services/x11/desktop-managers/kde4.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/services/x11/desktop-managers/kde4.nix b/modules/services/x11/desktop-managers/kde4.nix
index 0d088d8e970..b89cbe2f9e4 100644
--- a/modules/services/x11/desktop-managers/kde4.nix
+++ b/modules/services/x11/desktop-managers/kde4.nix
@@ -59,7 +59,7 @@ in
       systemPackages = [
         # temporary workarounds
         pkgs.shared_desktop_ontologies 
-        pkgs.kde4.strigi
+        pkgs.strigi
 
         pkgs.kde4.kdelibs
         pkgs.kde4.kdebase
-- 
GitLab


From 91f88ba9af02ff3359d0fbb7277be4c5be4083aa Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 23 Feb 2011 13:52:19 +0000
Subject: [PATCH 2858/5331] * Disable the minimal_install_archive job, as
 system_tarball serves   essentially the same purpose, as far as I can tell.

svn path=/nixos/trunk/; revision=26070
---
 release.nix | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/release.nix b/release.nix
index 2e4098a6de2..390a15afb3e 100644
--- a/release.nix
+++ b/release.nix
@@ -1,4 +1,4 @@
-{ nixpkgs ? ../nixpkgs-wc }:
+{ nixpkgs ? ../nixpkgs }:
 
 let
 
@@ -147,10 +147,6 @@ let
       module = ./modules/installer/cd-dvd/system-tarball-sheevaplug.nix;
     } { system = "armv5tel-linux"; };
 
-    # Hacky: doesn't depend on configuration. Yet configuration is evaluated (TODO)
-    minimal_install_archive = {system ? "i686-linux"}: (iso_minimal {inherit system;})
-      .config.system.build.minimalInstallArchive;
-
     tests = 
       { services ? ../services }:
       let
-- 
GitLab


From 9fca36bfa350373fc0cd29de6ad49f1c607a96b9 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 23 Feb 2011 19:06:14 +0000
Subject: [PATCH 2859/5331] * Add the Intel 5000/6000 firmwares to the
 installation media.

svn path=/nixos/trunk/; revision=26081
---
 modules/installer/scan/not-detected.nix        | 7 ++++++-
 modules/services/x11/desktop-managers/xfce.nix | 9 ++++++++-
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/modules/installer/scan/not-detected.nix b/modules/installer/scan/not-detected.nix
index 3a4a7f40fc6..e5a53bc8a0f 100644
--- a/modules/installer/scan/not-detected.nix
+++ b/modules/installer/scan/not-detected.nix
@@ -1,10 +1,15 @@
 # List all devices which are _not_ detected by nixos-hardware-scan.
 # Common devices are enabled by default.
-{config, pkgs, ...}:
+{ config, pkgs, ... }:
 
 with pkgs.lib;
 
 {
+  imports =
+    [ ../../hardware/network/intel-5000.nix
+      ../../hardware/network/intel-6000.nix
+    ];
+
   config = mkDefault {
     # Wireless card firmware
     networking.enableRT73Firmware = true;
diff --git a/modules/services/x11/desktop-managers/xfce.nix b/modules/services/x11/desktop-managers/xfce.nix
index 4e8689f7ca7..dc502ccadb1 100644
--- a/modules/services/x11/desktop-managers/xfce.nix
+++ b/modules/services/x11/desktop-managers/xfce.nix
@@ -7,6 +7,13 @@ let
   xcfg = config.services.xserver;
   cfg = xcfg.desktopManager.xfce;
 
+  fakeXfdesktop = pkgs.runCommand "xfdesktop" {}
+    ''
+      mkdir -p $out/bin
+      echo 'true' > $out/bin/xfdesktop
+      chmod u+x $out/bin/xfdesktop
+    '';
+
 in
 
 {
@@ -43,7 +50,7 @@ in
       };
 
     environment.systemPackages =
-      [
+      [ fakeXfdesktop
         pkgs.gtkLibs.gtk # To get GTK+'s themes.
         pkgs.hicolor_icon_theme
         pkgs.shared_mime_info
-- 
GitLab


From e740badcc6b16c4bfcf3a950c4029b1eedc26249 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 23 Feb 2011 19:06:59 +0000
Subject: [PATCH 2860/5331] * Revert unintended commit.

svn path=/nixos/trunk/; revision=26082
---
 modules/services/x11/desktop-managers/xfce.nix | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/modules/services/x11/desktop-managers/xfce.nix b/modules/services/x11/desktop-managers/xfce.nix
index dc502ccadb1..4e8689f7ca7 100644
--- a/modules/services/x11/desktop-managers/xfce.nix
+++ b/modules/services/x11/desktop-managers/xfce.nix
@@ -7,13 +7,6 @@ let
   xcfg = config.services.xserver;
   cfg = xcfg.desktopManager.xfce;
 
-  fakeXfdesktop = pkgs.runCommand "xfdesktop" {}
-    ''
-      mkdir -p $out/bin
-      echo 'true' > $out/bin/xfdesktop
-      chmod u+x $out/bin/xfdesktop
-    '';
-
 in
 
 {
@@ -50,7 +43,7 @@ in
       };
 
     environment.systemPackages =
-      [ fakeXfdesktop
+      [
         pkgs.gtkLibs.gtk # To get GTK+'s themes.
         pkgs.hicolor_icon_theme
         pkgs.shared_mime_info
-- 
GitLab


From 34dea57f8aa7367e4bd63684b4b9678e827cfb74 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 23 Feb 2011 19:11:32 +0000
Subject: [PATCH 2861/5331] * Add wicd to the NixOS CD.

svn path=/nixos/trunk/; revision=26083
---
 modules/installer/cd-dvd/installation-cd-graphical.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/modules/installer/cd-dvd/installation-cd-graphical.nix b/modules/installer/cd-dvd/installation-cd-graphical.nix
index bda613a2532..29e01b0e6ae 100644
--- a/modules/installer/cd-dvd/installation-cd-graphical.nix
+++ b/modules/installer/cd-dvd/installation-cd-graphical.nix
@@ -9,6 +9,9 @@
     ../../profiles/graphical.nix
   ];
 
+  # Provide wicd for easy wireless configuration.
+  networking.wicd.enable = true;
+
   # Disable compositing for now.  It seems to cause problems with KDE
   # 4.5 on some graphics drivers (such as Cirrus and VGA in QEMU).
   services.xserver.config =
-- 
GitLab


From e0fef9c333b0cec24d6e3dd2b7c6d41201d93935 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 24 Feb 2011 21:47:56 +0000
Subject: [PATCH 2862/5331] * Drop the unnecessary boot=on flag.

svn path=/nixos/trunk/; revision=26103
---
 modules/virtualisation/qemu-vm.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/virtualisation/qemu-vm.nix b/modules/virtualisation/qemu-vm.nix
index c26b27c7b8f..e97dde69092 100644
--- a/modules/virtualisation/qemu-vm.nix
+++ b/modules/virtualisation/qemu-vm.nix
@@ -164,7 +164,7 @@ let
             -drive index=0,file=$NIX_DISK_IMAGE,if=virtio,cache=writeback,werror=report \
             -drive index=1,file=${bootDisk}/disk.img,if=virtio,boot=on \
           '' else ''
-            -drive file=$NIX_DISK_IMAGE,if=virtio,boot=on,cache=writeback,werror=report \
+            -drive file=$NIX_DISK_IMAGE,if=virtio,cache=writeback,werror=report \
             -kernel ${config.system.build.toplevel}/kernel \
             -initrd ${config.system.build.toplevel}/initrd \
             -append "$(cat ${config.system.build.toplevel}/kernel-params) init=${config.system.build.toplevel}/init regInfo=${regInfo} ${kernelConsole} $QEMU_KERNEL_PARAMS" \
-- 
GitLab


From e46fca2185f63ed439f63a322a23ca8522f01fcd Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 25 Feb 2011 14:31:15 +0000
Subject: [PATCH 2863/5331] * Mount /dev/cgroup to enable cgroup support.

svn path=/nixos/trunk/; revision=26112
---
 modules/system/activation/activation-script.nix | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/modules/system/activation/activation-script.nix b/modules/system/activation/activation-script.nix
index 1aad1f37c2d..a8e67f8ebce 100644
--- a/modules/system/activation/activation-script.nix
+++ b/modules/system/activation/activation-script.nix
@@ -129,6 +129,14 @@ in
         mkdir -p /media
       '';
     
+    system.activationScripts.cgroups =
+      ''
+        if ! ${pkgs.sysvtools}/bin/mountpoint -q /dev/cgroup; then
+            mkdir -p /dev/cgroup
+            ${pkgs.utillinux}/bin/mount -t cgroup none /dev/cgroup
+        fi
+      '';
+    
   };
   
 }
-- 
GitLab


From 6fd7f8e0e690e8c97ce419b522e38f900deea7e1 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 25 Feb 2011 15:07:52 +0000
Subject: [PATCH 2864/5331] * Add an Upstart job for libvirtd.

svn path=/nixos/trunk/; revision=26114
---
 modules/module-list.nix             |  1 +
 modules/virtualisation/libvirtd.nix | 64 +++++++++++++++++++++++++++++
 2 files changed, 65 insertions(+)
 create mode 100644 modules/virtualisation/libvirtd.nix

diff --git a/modules/module-list.nix b/modules/module-list.nix
index 6dee2a4aad3..5c1f3deab4c 100644
--- a/modules/module-list.nix
+++ b/modules/module-list.nix
@@ -167,5 +167,6 @@
   ./tasks/network-interfaces.nix
   ./tasks/swraid.nix
   ./tasks/tty-backgrounds.nix
+  ./virtualisation/libvirtd.nix
   ./virtualisation/xen-dom0.nix
 ]
diff --git a/modules/virtualisation/libvirtd.nix b/modules/virtualisation/libvirtd.nix
new file mode 100644
index 00000000000..951139ee66a
--- /dev/null
+++ b/modules/virtualisation/libvirtd.nix
@@ -0,0 +1,64 @@
+# Upstart jobs for libvirtd.
+
+{ config, pkgs, ... }:
+
+with pkgs.lib;
+
+let 
+
+  cfg = config.virtualisation.libvirtd; 
+
+in
+
+{
+  ###### interface
+
+  options = {
+
+    virtualisation.libvirtd.enable = 
+      mkOption {
+        default = false;
+        description =
+          ''
+            This option enables libvirtd, a daemon that manages
+            virtual machines.  You can interact with the daemon
+            (e.g. to start or stop VMs) using the
+            <command>virsh</command> command line tool, among others.
+          '';
+      };
+
+    virtualisation.libvirtd.enableKVM = 
+      mkOption {
+        default = true;
+        description =
+          ''
+            This option enables support for QEMU/KVM in libvirtd.
+          '';
+      };
+
+  };
+
+
+  ###### implementation
+
+  config = mkIf cfg.enable {
+
+    environment.systemPackages = [ pkgs.libvirt ];
+
+    jobs.libvirtd =
+      { description = "Libvirtd virtual machine management daemon";
+
+        startOn = "stopped udevtrigger";
+
+        path =
+          [ pkgs.bridge_utils pkgs.dmidecode
+          ] ++ optional cfg.enableKVM pkgs.qemu_kvm;
+
+        exec = "${pkgs.libvirt}/sbin/libvirtd --daemon --verbose";
+
+        daemonType = "daemon";
+      };
+
+  };
+
+}
-- 
GitLab


From 08426fb7179b93368147ef1e6a5122cda2420e18 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 25 Feb 2011 15:56:49 +0000
Subject: [PATCH 2865/5331] * Add an Upstart job for libvirt-guests.

svn path=/nixos/trunk/; revision=26121
---
 modules/virtualisation/libvirtd.nix | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/modules/virtualisation/libvirtd.nix b/modules/virtualisation/libvirtd.nix
index 951139ee66a..b95226f325d 100644
--- a/modules/virtualisation/libvirtd.nix
+++ b/modules/virtualisation/libvirtd.nix
@@ -59,6 +59,28 @@ in
         daemonType = "daemon";
       };
 
+    jobs.libvirt_guests =
+      { name = "libvirt-guests";
+      
+        description = "Job to save/restore libvirtd VMs";
+
+        startOn = "started libvirtd";
+
+        # We want to suspend VMs only on shutdown, but Upstart is broken.
+        #stopOn = "starting shutdown and stopping libvirtd";
+        stopOn = "stopping libvirtd";
+
+        path = [ pkgs.gettext pkgs.libvirt pkgs.gawk ];
+
+        preStart = 
+          ''
+            mkdir -p /var/lock/subsys -m 755
+            ${pkgs.libvirt}/etc/rc.d/init.d/libvirt-guests start
+          '';
+
+        postStop = "${pkgs.libvirt}/etc/rc.d/init.d/libvirt-guests stop";
+      };
+
   };
 
 }
-- 
GitLab


From c31c4290cce9290752f1e7e1bca2725326a90ffe Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 3 Mar 2011 12:00:54 +0000
Subject: [PATCH 2866/5331] * Style fix.

svn path=/nixos/trunk/; revision=26140
---
 modules/services/x11/desktop-managers/kde4.nix | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/modules/services/x11/desktop-managers/kde4.nix b/modules/services/x11/desktop-managers/kde4.nix
index b89cbe2f9e4..411490d857b 100644
--- a/modules/services/x11/desktop-managers/kde4.nix
+++ b/modules/services/x11/desktop-managers/kde4.nix
@@ -55,9 +55,8 @@ in
       setuid = true;
     } ];
 
-    environment = {
-      systemPackages = [
-        # temporary workarounds
+    environment.systemPackages =
+      [ # temporary workarounds
         pkgs.shared_desktop_ontologies 
         pkgs.strigi
 
@@ -76,13 +75,13 @@ in
         xorg.xset # used by startkde, non-essential
       ] ++ config.environment.kdePackages;
 
-      pathsToLink = [ "/share" ];
+    environment.pathsToLink = [ "/share" ];
 
-      etc = singleton
+    environment.etc = singleton
       { source = "${pkgs.xkeyboard_config}/etc/X11/xkb";
         target = "X11/xkb";
       };
-    };
+
   };
 
 }
-- 
GitLab


From 0c6129bb90bdd0eb6bf0097ffd65a417578453ee Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 4 Mar 2011 10:28:02 +0000
Subject: [PATCH 2867/5331] * Hopefully fix the rebuildCD job.

svn path=/nixos/trunk/; revision=26155
---
 tests/installer.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/installer.nix b/tests/installer.nix
index 817b8b7488e..759bd3e2068 100644
--- a/tests/installer.nix
+++ b/tests/installer.nix
@@ -305,7 +305,7 @@ in {
       testScript =
         ''
           # damn, it's costly to evaluate nixos-rebuild (1G of ram)
-          my $machine = createMachine({ cdrom => glob("${iso}/iso/*.iso"), qemuFlags => '${qemuNICFlags 1 1 2} -m 1024' });
+          my $machine = createMachine({ cdrom => glob("${iso}/iso/*.iso"), qemuFlags => '-m 1024' });
           $machine->start;
 
           # Make sure that we don't try to download anything.
-- 
GitLab


From 00f3a816a9abf3fc4f0b5101786eb9208fc44532 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Sun, 6 Mar 2011 15:39:05 +0000
Subject: [PATCH 2868/5331] Adding a possibility to add more paths to chroots
 used by nix-daemons. The use-case is building the latest version from
 repository with very large checkouts. That way you do not get extra copy in
 store every time you rebuild, and you can implement a saner version checking
 than checksumming all the data

svn path=/nixos/trunk/; revision=26174
---
 modules/services/misc/nix-daemon.nix | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/modules/services/misc/nix-daemon.nix b/modules/services/misc/nix-daemon.nix
index 2be7789cc5f..aa4947adad6 100644
--- a/modules/services/misc/nix-daemon.nix
+++ b/modules/services/misc/nix-daemon.nix
@@ -69,6 +69,16 @@ in
           This option allows to append lines to nix.conf. 
         ";
       };
+      
+      extraChrootPaths = mkOption {
+        default = [];
+	example = ["/var/dist"];
+	description = ''
+	  Extra paths to include in chroot. May be useful if you build
+	  from private repository mirrors to avoid extra checksumming 
+	  and copying to store.
+	'';
+      };
 
       distributedBuilds = mkOption {
         default = false;
@@ -176,7 +186,6 @@ in
           you should increase this value.
         '';
       };
-      
     };
   };
 
@@ -211,7 +220,7 @@ in
                 build-users-group = nixbld
                 build-max-jobs = ${toString (config.nix.maxJobs)}
                 build-use-chroot = ${if config.nix.useChroot then "true" else "false"}
-                build-chroot-dirs = /dev /dev/pts /proc /bin $(echo $extraPaths)
+                build-chroot-dirs = /dev /dev/pts /proc /bin $(echo $extraPaths) ${builtins.toString config.nix.extraChrootPaths}
                 $extraOptions
                 END
               '';
-- 
GitLab


From 75d4861077a737c99d5d2e07e847e1da4fe0a5c7 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Mon, 7 Mar 2011 07:55:53 +0000
Subject: [PATCH 2869/5331] Fix Nixpkgs link; typo noticed by Shea Levy

svn path=/nixos/trunk/; revision=26181
---
 doc/manual/installation.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/manual/installation.xml b/doc/manual/installation.xml
index 225dd5239d9..9b87b40ccaa 100644
--- a/doc/manual/installation.xml
+++ b/doc/manual/installation.xml
@@ -39,7 +39,7 @@ $ nix-channel --update</screen>
   <literal>nixos</literal>.</para></listitem>
 
   <listitem><para>Check out Nixpkgs from
-  <link xlink:href="https://svn.nixos.org/repos/nix/nixos/trunk"/> as
+  <link xlink:href="https://svn.nixos.org/repos/nix/nixpkgs/trunk"/> as
   <literal>nixpkgs</literal>.</para></listitem>
 
   <listitem><para>Build the ISO image:
-- 
GitLab


From 10e8a801b6971025ff5a14cebe4566dddf5cbf70 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 7 Mar 2011 08:20:24 +0000
Subject: [PATCH 2870/5331] * Refactor: extraChrootPaths -> chrootDirs.  This
 allows disabling the   default chroot paths using mkOverride.

svn path=/nixos/trunk/; revision=26183
---
 modules/services/misc/nix-daemon.nix | 24 +++++++++++++-----------
 1 file changed, 13 insertions(+), 11 deletions(-)

diff --git a/modules/services/misc/nix-daemon.nix b/modules/services/misc/nix-daemon.nix
index aa4947adad6..842ba0b88ba 100644
--- a/modules/services/misc/nix-daemon.nix
+++ b/modules/services/misc/nix-daemon.nix
@@ -59,6 +59,16 @@ in
         ";
       };
 
+      chrootDirs = mkOption {
+        default = [];
+	example = [ "/dev" "/proc" ];
+	description =
+	  ''
+	    Directories from the host filesystem to be included
+	    in the chroot.
+	  '';
+      };
+
       extraOptions = mkOption {
         default = "";
         example = "
@@ -70,16 +80,6 @@ in
         ";
       };
       
-      extraChrootPaths = mkOption {
-        default = [];
-	example = ["/var/dist"];
-	description = ''
-	  Extra paths to include in chroot. May be useful if you build
-	  from private repository mirrors to avoid extra checksumming 
-	  and copying to store.
-	'';
-      };
-
       distributedBuilds = mkOption {
         default = false;
         description = "
@@ -194,6 +194,8 @@ in
 
   config = {
 
+    nix.chrootDirs = [ "/dev" "/dev/pts" "/proc" "/bin" ];
+
     environment.etc =
       [ { # Nix configuration.
           source =
@@ -220,7 +222,7 @@ in
                 build-users-group = nixbld
                 build-max-jobs = ${toString (config.nix.maxJobs)}
                 build-use-chroot = ${if config.nix.useChroot then "true" else "false"}
-                build-chroot-dirs = /dev /dev/pts /proc /bin $(echo $extraPaths) ${builtins.toString config.nix.extraChrootPaths}
+                build-chroot-dirs = ${toString config.nix.chrootDirs} $(echo $extraPaths)
                 $extraOptions
                 END
               '';
-- 
GitLab


From 908a025b2229d8d0793a2e6787773ca76e9519a8 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 7 Mar 2011 08:21:39 +0000
Subject: [PATCH 2871/5331] * Die tabs die.

svn path=/nixos/trunk/; revision=26184
---
 modules/services/misc/nix-daemon.nix | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/modules/services/misc/nix-daemon.nix b/modules/services/misc/nix-daemon.nix
index 842ba0b88ba..11a7aa19f23 100644
--- a/modules/services/misc/nix-daemon.nix
+++ b/modules/services/misc/nix-daemon.nix
@@ -61,12 +61,12 @@ in
 
       chrootDirs = mkOption {
         default = [];
-	example = [ "/dev" "/proc" ];
-	description =
-	  ''
-	    Directories from the host filesystem to be included
-	    in the chroot.
-	  '';
+        example = [ "/dev" "/proc" ];
+        description =
+          ''
+            Directories from the host filesystem to be included
+            in the chroot.
+          '';
       };
 
       extraOptions = mkOption {
-- 
GitLab


From 5cff6eda3d29e220157cb1793b1f9279c5ee539c Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 7 Mar 2011 12:12:39 +0000
Subject: [PATCH 2872/5331] * Revert r21410 because it breaks handling of
 "--max-jobs".

svn path=/nixos/trunk/; revision=26187
---
 modules/installer/tools/nixos-rebuild.sh | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

diff --git a/modules/installer/tools/nixos-rebuild.sh b/modules/installer/tools/nixos-rebuild.sh
index 41b74494337..6789d48ace3 100644
--- a/modules/installer/tools/nixos-rebuild.sh
+++ b/modules/installer/tools/nixos-rebuild.sh
@@ -84,15 +84,9 @@ while test "$#" -gt 0; do
       --show-trace|--no-build-hook|--keep-failed|-K|--keep-going|-k|--verbose|-v|--fallback)
         extraBuildFlags="$extraBuildFlags $i"
       ;;
-      --max-jobs|-j*)
-        if [ -z "${i:2}" ]; then
-          # -j n
-          extraBuildFlags="$extraBuildFlags $i $1"
-          shift 1
-        else
-          # -jn
-          extraBuildFlags="$extraBuildFlags $i"
-        fi
+      --max-jobs|-j)
+        j="$1"; shift 1
+        extraBuildFlags="$extraBuildFlags $i $j"
       ;;
       --fast)
         buildNix=
-- 
GitLab


From f1277862cd75d3184cc06f7cfb9480f7813de70e Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 7 Mar 2011 12:12:53 +0000
Subject: [PATCH 2873/5331] * Handle --cores.

svn path=/nixos/trunk/; revision=26188
---
 modules/installer/tools/nixos-rebuild.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/installer/tools/nixos-rebuild.sh b/modules/installer/tools/nixos-rebuild.sh
index 6789d48ace3..62a5f09f549 100644
--- a/modules/installer/tools/nixos-rebuild.sh
+++ b/modules/installer/tools/nixos-rebuild.sh
@@ -84,7 +84,7 @@ while test "$#" -gt 0; do
       --show-trace|--no-build-hook|--keep-failed|-K|--keep-going|-k|--verbose|-v|--fallback)
         extraBuildFlags="$extraBuildFlags $i"
       ;;
-      --max-jobs|-j)
+      --max-jobs|-j|--cores)
         j="$1"; shift 1
         extraBuildFlags="$extraBuildFlags $i $j"
       ;;
-- 
GitLab


From 79a322f050e654b86265d5d6312a67e28f21c819 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Tue, 8 Mar 2011 20:55:43 +0000
Subject: [PATCH 2874/5331] doc: Add a section on VM testing, mostly copied
 from the wiki.

svn path=/nixos/trunk/; revision=26211
---
 doc/manual/development.xml | 104 +++++++++++++++++++++++++++++++++++++
 1 file changed, 104 insertions(+)

diff --git a/doc/manual/development.xml b/doc/manual/development.xml
index 5ddf5d935d1..44edc54f814 100644
--- a/doc/manual/development.xml
+++ b/doc/manual/development.xml
@@ -341,5 +341,109 @@ $ qemu-system-x86_64 -kernel ./kernel/bzImage -initrd ./initrd/initrd -hda /dev/
 
 </section>
 
+<section>
+
+  <title>Whole-system testing using virtual machines</title>
+
+  <para>
+    Complete NixOS GNU/Linux systems can be tested in virtual machines
+    (VMs).  This makes it possible to test a system upgrade or
+    configuration change before rebooting into it, using the
+    <command>nixos-rebuild build-vm</command> or
+    <command>nixos-rebuild build-vm-with-bootloader</command> command.
+  </para>
+
+  <para>
+    <!-- The following is adapted from
+         http://wiki.nixos.org/wiki/NixOS_VM_tests, by Eelco Dolstra. -->
+
+    The <filename>tests/</filename> directory in the NixOS source tree
+    contains several <emphasis>whole-system unit tests</emphasis>.
+    These tests can be run<note><para>NixOS tests can be run both from
+    NixOS and from a non-NixOS GNU/Linux distribution, provided the
+    Nix package manager is installed.</para></note> from the NixOS
+    source tree as follows:
+
+    <screen>
+      $ nix-build tests/ -A nfs.test
+    </screen>
+
+    This performs an automated test of the NFS client and server
+    functionality in the Linux kernel, including file locking
+    semantics (e.g., whether locks are maintained across server
+    crashes).  It will first build or download all the dependencies of
+    the test (e.g., all packages needed to run a NixOS VM). The test
+    is defined in <link
+    xlink:href="https://svn.nixos.org/repos/nix/nixos/trunk/tests/nfs.nix">
+    <filename>tests/nfs.nix</filename></link>.  If the test succeeds,
+    <command>nix-build</command> will place a symlink
+    <filename>./result</filename> in the current directory pointing at
+    the location in the Nix store of the test results (e.g.,
+    screenshots, test reports, and so on).  In particular, a
+    pretty-printed log of the test is written to
+    <filename>log.html</filename>, which can be viewed using something
+    like:
+
+    <screen>
+      $ icecat result/log.html
+    </screen>
+  </para>
+
+  <para>
+    It is also possible to run the test environment interactively,
+    allowing you to experiment with the VMs.  For example:
+
+    <screen>
+      $ nix-build tests/ -A nfs.driver
+      $ ./result/bin/nixos-run-vms
+    </screen>
+
+    The script <command>nixos-run-vms</command> starts the three
+    virtual machines defined in the NFS test using QEMU/KVM.  The root
+    file system of the VMs is created on the fly and kept across VM
+    restarts in
+    <filename>./<varname>hostname</varname>.qcow2</filename>.
+  </para>
+
+  <para>
+    Finally, the test itself can be run interactively.  This is
+    particularly useful when developing or debugging a test:
+
+    <screen>
+      $ nix-build tests/ -A nfs.driver
+      $ ./result/bin/nixos-test-driver
+      starting VDE switch for network 1
+      >
+    </screen>
+
+    Perl statements can now be typed in to start or manipulate the
+    VMs:
+
+    <screen>
+      > startAll;
+      (the VMs start booting)
+      > $server->waitForJob("nfs-kernel-nfsd");
+      > $client1->succeed("flock -x /data/lock -c 'sleep 100000' &");
+      > $client2->fail("flock -n -s /data/lock true");
+      > $client1->shutdown;
+      (this releases client1's lock)
+      > $client2->succeed("flock -n -s /data/lock true");
+    </screen>
+
+    The function <command>testScript</command> executes the entire
+    test script and drops you back into the test driver command line
+    upon its completion.  This allows you to inspect the state of the
+    VMs after the test (e.g. to debug the test script).
+  </para>
+
+  <para>
+    This and other tests are continuously run on <link
+    xlink:href="http://hydra.nixos.org/jobset/nixos/trunk/with-status">the
+    Hydra instance at <literal>nixos.org</literal></link>, which
+    allows developers to be notified of any regressions introduced by
+    a NixOS or Nixpkgs change.
+  </para>
+
+</section>
 
 </chapter>
-- 
GitLab


From d028ec95d0fc465fc178d8ee67ab1ec5c9eb54b2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Tue, 8 Mar 2011 21:14:21 +0000
Subject: [PATCH 2875/5331] doc: Escape `>'.

svn path=/nixos/trunk/; revision=26212
---
 doc/manual/development.xml | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/doc/manual/development.xml b/doc/manual/development.xml
index 44edc54f814..b661e44b082 100644
--- a/doc/manual/development.xml
+++ b/doc/manual/development.xml
@@ -413,21 +413,21 @@ $ qemu-system-x86_64 -kernel ./kernel/bzImage -initrd ./initrd/initrd -hda /dev/
       $ nix-build tests/ -A nfs.driver
       $ ./result/bin/nixos-test-driver
       starting VDE switch for network 1
-      >
+      &gt;
     </screen>
 
     Perl statements can now be typed in to start or manipulate the
     VMs:
 
     <screen>
-      > startAll;
+      &gt; startAll;
       (the VMs start booting)
-      > $server->waitForJob("nfs-kernel-nfsd");
-      > $client1->succeed("flock -x /data/lock -c 'sleep 100000' &");
-      > $client2->fail("flock -n -s /data/lock true");
-      > $client1->shutdown;
+      &gt; $server-&gt;waitForJob("nfs-kernel-nfsd");
+      &gt; $client1-&gt;succeed("flock -x /data/lock -c 'sleep 100000' &");
+      &gt; $client2-&gt;fail("flock -n -s /data/lock true");
+      &gt; $client1-&gt;shutdown;
       (this releases client1's lock)
-      > $client2->succeed("flock -n -s /data/lock true");
+      &gt; $client2-&gt;succeed("flock -n -s /data/lock true");
     </screen>
 
     The function <command>testScript</command> executes the entire
-- 
GitLab


From 36cf4ba40bb37c11905067494c1b4dd2d1719d63 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Tue, 8 Mar 2011 21:31:00 +0000
Subject: [PATCH 2876/5331] doc: Escape `&'.

svn path=/nixos/trunk/; revision=26213
---
 doc/manual/development.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/manual/development.xml b/doc/manual/development.xml
index b661e44b082..4ae2ba03896 100644
--- a/doc/manual/development.xml
+++ b/doc/manual/development.xml
@@ -423,7 +423,7 @@ $ qemu-system-x86_64 -kernel ./kernel/bzImage -initrd ./initrd/initrd -hda /dev/
       &gt; startAll;
       (the VMs start booting)
       &gt; $server-&gt;waitForJob("nfs-kernel-nfsd");
-      &gt; $client1-&gt;succeed("flock -x /data/lock -c 'sleep 100000' &");
+      &gt; $client1-&gt;succeed("flock -x /data/lock -c 'sleep 100000' &amp;");
       &gt; $client2-&gt;fail("flock -n -s /data/lock true");
       &gt; $client1-&gt;shutdown;
       (this releases client1's lock)
-- 
GitLab


From 7cb3958e4ba0b12fcc7cfa802c930b67d419e8ed Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Tue, 8 Mar 2011 21:54:18 +0000
Subject: [PATCH 2877/5331] doc: Use a <footnote>, not a <note>.

svn path=/nixos/trunk/; revision=26214
---
 doc/manual/development.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/doc/manual/development.xml b/doc/manual/development.xml
index 4ae2ba03896..0278c617d51 100644
--- a/doc/manual/development.xml
+++ b/doc/manual/development.xml
@@ -359,9 +359,9 @@ $ qemu-system-x86_64 -kernel ./kernel/bzImage -initrd ./initrd/initrd -hda /dev/
 
     The <filename>tests/</filename> directory in the NixOS source tree
     contains several <emphasis>whole-system unit tests</emphasis>.
-    These tests can be run<note><para>NixOS tests can be run both from
+    These tests can be run<footnote><para>NixOS tests can be run both from
     NixOS and from a non-NixOS GNU/Linux distribution, provided the
-    Nix package manager is installed.</para></note> from the NixOS
+    Nix package manager is installed.</para></footnote> from the NixOS
     source tree as follows:
 
     <screen>
-- 
GitLab


From b7a8b26d097a3c9e616c0396662b6a229bed7663 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Wed, 9 Mar 2011 10:38:18 +0000
Subject: [PATCH 2878/5331] doc: Fix the manual.

svn path=/nixos/trunk/; revision=26220
---
 doc/manual/development.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/doc/manual/development.xml b/doc/manual/development.xml
index 0278c617d51..9d0b42c4349 100644
--- a/doc/manual/development.xml
+++ b/doc/manual/development.xml
@@ -381,8 +381,8 @@ $ qemu-system-x86_64 -kernel ./kernel/bzImage -initrd ./initrd/initrd -hda /dev/
     the location in the Nix store of the test results (e.g.,
     screenshots, test reports, and so on).  In particular, a
     pretty-printed log of the test is written to
-    <filename>log.html</filename>, which can be viewed using something
-    like:
+    <filename>log.html</filename>, which can be viewed using a web
+    browser like this:
 
     <screen>
       $ icecat result/log.html
@@ -402,7 +402,7 @@ $ qemu-system-x86_64 -kernel ./kernel/bzImage -initrd ./initrd/initrd -hda /dev/
     virtual machines defined in the NFS test using QEMU/KVM.  The root
     file system of the VMs is created on the fly and kept across VM
     restarts in
-    <filename>./<varname>hostname</varname>.qcow2</filename>.
+    <filename>./</filename><varname>hostname</varname><filename>.qcow2</filename>.
   </para>
 
   <para>
-- 
GitLab


From f300833ebcf5ccb9c016f2e7febb9180128bfd5a Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 9 Mar 2011 11:48:29 +0000
Subject: [PATCH 2879/5331] * Add iproute to the path used by
 networking.localCommands.

svn path=/nixos/trunk/; revision=26222
---
 modules/tasks/network-interfaces.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/tasks/network-interfaces.nix b/modules/tasks/network-interfaces.nix
index 6c92e499c07..2a760decab9 100644
--- a/modules/tasks/network-interfaces.nix
+++ b/modules/tasks/network-interfaces.nix
@@ -164,7 +164,7 @@ in
 
         preStart =
           ''
-            export PATH=${config.system.sbin.modprobe}/sbin:$PATH
+            export PATH=${config.system.sbin.modprobe}/sbin:${pkgs.iproute}/sbin:$PATH
             modprobe af_packet || true
 
             ${pkgs.lib.concatMapStrings (i:
-- 
GitLab


From 6f1068b0b7982cf22b747742cb87704b580b1939 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 9 Mar 2011 12:14:06 +0000
Subject: [PATCH 2880/5331] * Remove the unnecessary warning printed by
 `nixos-rebuild test'.  The   current configuration (/var/run/current-system)
 is always a GC root.

svn path=/nixos/trunk/; revision=26227
---
 modules/installer/tools/nixos-rebuild.sh | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/modules/installer/tools/nixos-rebuild.sh b/modules/installer/tools/nixos-rebuild.sh
index 62a5f09f549..90df386faa9 100644
--- a/modules/installer/tools/nixos-rebuild.sh
+++ b/modules/installer/tools/nixos-rebuild.sh
@@ -200,16 +200,6 @@ if test "$action" = switch -o "$action" = boot -o "$action" = test; then
 fi
 
 
-if test "$action" = test; then
-    cat >&2 <<EOF
-
-Warning: if you remove or overwrite the symlink \`$pathToConfig', the
-active system configuration may be garbage collected!  This may render
-the system inoperable (though a reboot will fix things).
-EOF
-fi
-
-
 if test "$action" = build-vm; then
     cat >&2 <<EOF
 
-- 
GitLab


From 843e1f6c1ea9702c57b690eff0d1979207e49872 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 9 Mar 2011 12:28:44 +0000
Subject: [PATCH 2881/5331] * Cleanup.

svn path=/nixos/trunk/; revision=26228
---
 modules/services/networking/firewall.nix | 26 ++++++++++++------------
 modules/tasks/network-interfaces.nix     |  3 ++-
 2 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/modules/services/networking/firewall.nix b/modules/services/networking/firewall.nix
index 28c43ef3370..6cefd0e7d07 100644
--- a/modules/services/networking/firewall.nix
+++ b/modules/services/networking/firewall.nix
@@ -4,8 +4,6 @@ with pkgs.lib;
 
 let
 
-  iptables = "${pkgs.iptables}/sbin/iptables";
-
   cfg = config.networking.firewall;
 
 in
@@ -76,47 +74,49 @@ in
   # holds).
   config = mkIf config.networking.firewall.enable {
 
-    environment.systemPackages = [pkgs.iptables];
+    environment.systemPackages = [ pkgs.iptables ];
 
     jobs.firewall =
       { startOn = "started network-interfaces";
 
+        path = [ pkgs.iptables ];
+
         preStart =
           ''
-            ${iptables} -F
+            iptables -F
 
             # Accept all traffic on the loopback interface.
-            ${iptables} -A INPUT -i lo -j ACCEPT
+            iptables -A INPUT -i lo -j ACCEPT
 
             # Accept packets from established or related connections.
-            ${iptables} -A INPUT -m conntrack --ctstate ESTABLISHED,RELATED -j ACCEPT
+            iptables -A INPUT -m conntrack --ctstate ESTABLISHED,RELATED -j ACCEPT
 
             # Accept connections to the allowed TCP ports.            
             ${concatMapStrings (port:
                 ''
-                  ${iptables} -A INPUT -p tcp --dport ${toString port} -j ACCEPT
+                  iptables -A INPUT -p tcp --dport ${toString port} -j ACCEPT
                 ''
               ) config.networking.firewall.allowedTCPPorts
             }
 
             # Accept multicast.  Not a big security risk since
             # probably nobody is listening anyway.
-            ${iptables} -A INPUT -d 224.0.0.0/4 -j ACCEPT
+            iptables -A INPUT -d 224.0.0.0/4 -j ACCEPT
 
             # Drop everything else.
             ${optionalString cfg.logRefusedConnections ''
-              ${iptables} -A INPUT -p tcp --syn -j LOG --log-level info --log-prefix "rejected connection: "
+              iptables -A INPUT -p tcp --syn -j LOG --log-level info --log-prefix "rejected connection: "
             ''}
             ${optionalString cfg.logRefusedPackets ''
-              ${iptables} -A INPUT -j LOG --log-level info --log-prefix "rejected packet: "
+              iptables -A INPUT -j LOG --log-level info --log-prefix "rejected packet: "
             ''}
-            ${iptables} -A INPUT -j ${if cfg.rejectPackets then "REJECT" else "DROP"}
+            iptables -A INPUT -j ${if cfg.rejectPackets then "REJECT" else "DROP"}
           '';
 
         postStop =
           ''
-            ${iptables} -F
-          '';     
+            iptables -F
+          '';
       };
 
   };
diff --git a/modules/tasks/network-interfaces.nix b/modules/tasks/network-interfaces.nix
index 2a760decab9..cbac5a60b91 100644
--- a/modules/tasks/network-interfaces.nix
+++ b/modules/tasks/network-interfaces.nix
@@ -162,9 +162,10 @@ in
 
         startOn = "stopped udevtrigger";
 
+        path = [ config.system.sbin.modprobe pkgs.iproute ];
+
         preStart =
           ''
-            export PATH=${config.system.sbin.modprobe}/sbin:${pkgs.iproute}/sbin:$PATH
             modprobe af_packet || true
 
             ${pkgs.lib.concatMapStrings (i:
-- 
GitLab


From 66716f9dd5901ad6fc0df78114d69bcfa91d4967 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 9 Mar 2011 14:41:48 +0000
Subject: [PATCH 2882/5331] * Firewall: support IPv6.

svn path=/nixos/trunk/; revision=26231
---
 modules/services/networking/firewall.nix | 29 ++++++++++++++++--------
 1 file changed, 20 insertions(+), 9 deletions(-)

diff --git a/modules/services/networking/firewall.nix b/modules/services/networking/firewall.nix
index 6cefd0e7d07..0c703caac20 100644
--- a/modules/services/networking/firewall.nix
+++ b/modules/services/networking/firewall.nix
@@ -83,39 +83,50 @@ in
 
         preStart =
           ''
-            iptables -F
+            # Helper command to manipulate both the IPv4 and IPv6 filters.
+            ip46tables() {
+              iptables "$@"
+              ip6tables "$@"
+            }
+
+            ip46tables -F
 
             # Accept all traffic on the loopback interface.
-            iptables -A INPUT -i lo -j ACCEPT
+            ip46tables -A INPUT -i lo -j ACCEPT
 
             # Accept packets from established or related connections.
-            iptables -A INPUT -m conntrack --ctstate ESTABLISHED,RELATED -j ACCEPT
+            ip46tables -A INPUT -m conntrack --ctstate ESTABLISHED,RELATED -j ACCEPT
 
-            # Accept connections to the allowed TCP ports.            
+            # Accept connections to the allowed TCP ports.
             ${concatMapStrings (port:
                 ''
-                  iptables -A INPUT -p tcp --dport ${toString port} -j ACCEPT
+                  ip46tables -A INPUT -p tcp --dport ${toString port} -j ACCEPT
                 ''
               ) config.networking.firewall.allowedTCPPorts
             }
 
-            # Accept multicast.  Not a big security risk since
+            # Accept IPv4 multicast.  Not a big security risk since
             # probably nobody is listening anyway.
             iptables -A INPUT -d 224.0.0.0/4 -j ACCEPT
 
+            # Accept IPv6 ICMP packets on the local link.  Otherwise
+            # stuff like neighbor/router solicitation won't work.
+            ip6tables -A INPUT -s fe80::/10 -p icmpv6 -j ACCEPT
+
             # Drop everything else.
             ${optionalString cfg.logRefusedConnections ''
-              iptables -A INPUT -p tcp --syn -j LOG --log-level info --log-prefix "rejected connection: "
+              ip46tables -A INPUT -p tcp --syn -j LOG --log-level info --log-prefix "rejected connection: "
             ''}
             ${optionalString cfg.logRefusedPackets ''
-              iptables -A INPUT -j LOG --log-level info --log-prefix "rejected packet: "
+              ip46tables -A INPUT -j LOG --log-level info --log-prefix "rejected packet: "
             ''}
-            iptables -A INPUT -j ${if cfg.rejectPackets then "REJECT" else "DROP"}
+            ip46tables -A INPUT -j ${if cfg.rejectPackets then "REJECT" else "DROP"}
           '';
 
         postStop =
           ''
             iptables -F
+            ip6tables -F
           '';
       };
 
-- 
GitLab


From e4051e105c2dc677e7a4650e0c8a9d4053b3b836 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 9 Mar 2011 15:11:01 +0000
Subject: [PATCH 2883/5331] * Use a separate chain for logging and rejecting.

svn path=/nixos/trunk/; revision=26232
---
 modules/services/networking/firewall.nix | 29 +++++++++++++++++-------
 1 file changed, 21 insertions(+), 8 deletions(-)

diff --git a/modules/services/networking/firewall.nix b/modules/services/networking/firewall.nix
index 0c703caac20..2f0fe4f81c2 100644
--- a/modules/services/networking/firewall.nix
+++ b/modules/services/networking/firewall.nix
@@ -90,6 +90,23 @@ in
             }
 
             ip46tables -F
+            ip46tables -X # flush unused chains
+            ip46tables -P INPUT DROP
+
+
+            # The "FW_REFUSE" chain performs logging and
+            # rejecting/dropping of packets.
+            ip46tables -N FW_REFUSE
+
+            ${optionalString cfg.logRefusedConnections ''
+              ip46tables -A FW_REFUSE -p tcp --syn -j LOG --log-level info --log-prefix "rejected connection: "
+            ''}
+            ${optionalString cfg.logRefusedPackets ''
+              ip46tables -A FW_REFUSE -j LOG --log-level info --log-prefix "rejected packet: "
+            ''}
+
+            ip46tables -A FW_REFUSE -j ${if cfg.rejectPackets then "REJECT" else "DROP"}
+
 
             # Accept all traffic on the loopback interface.
             ip46tables -A INPUT -i lo -j ACCEPT
@@ -113,20 +130,16 @@ in
             # stuff like neighbor/router solicitation won't work.
             ip6tables -A INPUT -s fe80::/10 -p icmpv6 -j ACCEPT
 
-            # Drop everything else.
-            ${optionalString cfg.logRefusedConnections ''
-              ip46tables -A INPUT -p tcp --syn -j LOG --log-level info --log-prefix "rejected connection: "
-            ''}
-            ${optionalString cfg.logRefusedPackets ''
-              ip46tables -A INPUT -j LOG --log-level info --log-prefix "rejected packet: "
-            ''}
-            ip46tables -A INPUT -j ${if cfg.rejectPackets then "REJECT" else "DROP"}
+            # Reject/drop everything else.
+            ip46tables -A INPUT -j FW_REFUSE
           '';
 
         postStop =
           ''
             iptables -F
+            iptables -P INPUT ACCEPT
             ip6tables -F
+            ip6tables -P INPUT ACCEPT
           '';
       };
 
-- 
GitLab


From 12161f3183ce0b4d538fbd80b6e05ee947e03e04 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 9 Mar 2011 15:28:47 +0000
Subject: [PATCH 2884/5331] * Add a firewall option to allow pings.  (Maybe
 this should   be enabled by default.)

svn path=/nixos/trunk/; revision=26233
---
 modules/services/networking/firewall.nix | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/modules/services/networking/firewall.nix b/modules/services/networking/firewall.nix
index 2f0fe4f81c2..9c46acd3af8 100644
--- a/modules/services/networking/firewall.nix
+++ b/modules/services/networking/firewall.nix
@@ -62,6 +62,15 @@ in
         '';
     };
   
+    networking.firewall.allowPing = mkOption {
+      default = false;
+      type = types.bool;
+      description =
+        ''
+          Whether to respond to incoming ICMP echo requests ("pings").
+        '';
+    };
+  
   };
 
 
@@ -130,6 +139,12 @@ in
             # stuff like neighbor/router solicitation won't work.
             ip6tables -A INPUT -s fe80::/10 -p icmpv6 -j ACCEPT
 
+            # Optionally respond to pings.
+            ${optionalString cfg.allowPing ''
+              iptables -A INPUT -p icmp --icmp-type echo-request -j ACCEPT
+              ip6tables -A INPUT -p icmpv6 --icmpv6-type echo-request -j ACCEPT
+            ''}
+
             # Reject/drop everything else.
             ip46tables -A INPUT -j FW_REFUSE
           '';
-- 
GitLab


From d8b69f2fad1496a4ba40ef9481df6c5572816eb2 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 9 Mar 2011 16:26:03 +0000
Subject: [PATCH 2885/5331] * grub-mkimage now requires a format flag.  Also,
 the "sh" module has   disappeared.  Hopefully it's not important :-)

svn path=/nixos/trunk/; revision=26234
---
 modules/installer/cd-dvd/iso-image.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/installer/cd-dvd/iso-image.nix b/modules/installer/cd-dvd/iso-image.nix
index 8117d8631f5..e17dce4f71c 100644
--- a/modules/installer/cd-dvd/iso-image.nix
+++ b/modules/installer/cd-dvd/iso-image.nix
@@ -72,7 +72,7 @@ let
   # The Grub image.
   grubImage = pkgs.runCommand "grub_eltorito" {}
     ''
-      ${pkgs.grub2}/bin/grub-mkimage -o tmp biosdisk iso9660 help linux linux16 sh chain gfxterm vbe png jpeg
+      ${pkgs.grub2}/bin/grub-mkimage -O i386-pc -o tmp biosdisk iso9660 help linux linux16 chain gfxterm vbe png jpeg
       cat ${pkgs.grub2}/lib/grub/*/cdboot.img tmp > $out
     ''; # */
 
-- 
GitLab


From e884cbed7d96a5d15bc8f22f18fd8bfdb91024d7 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 9 Mar 2011 16:37:16 +0000
Subject: [PATCH 2886/5331] * Add an option for opening UDP ports. * Accept
 packets destined for link-local addresses (fe80::/10).

svn path=/nixos/trunk/; revision=26236
---
 modules/services/networking/firewall.nix | 21 ++++++++++++++++++++-
 1 file changed, 20 insertions(+), 1 deletion(-)

diff --git a/modules/services/networking/firewall.nix b/modules/services/networking/firewall.nix
index 9c46acd3af8..c7ccc65ca37 100644
--- a/modules/services/networking/firewall.nix
+++ b/modules/services/networking/firewall.nix
@@ -53,7 +53,7 @@ in
   
     networking.firewall.allowedTCPPorts = mkOption {
       default = [];
-      example = [22 80];
+      example = [ 22 80 ];
       type = types.list types.int;
       description =
         ''
@@ -62,6 +62,16 @@ in
         '';
     };
   
+    networking.firewall.allowedUDPPorts = mkOption {
+      default = [];
+      example = [ 53 ];
+      type = types.list types.int;
+      description =
+        ''
+          List of open UDP ports.
+        '';
+    };
+  
     networking.firewall.allowPing = mkOption {
       default = false;
       type = types.bool;
@@ -131,6 +141,14 @@ in
               ) config.networking.firewall.allowedTCPPorts
             }
 
+            # Accept packets on the allowed UDP ports.
+            ${concatMapStrings (port:
+                ''
+                  ip46tables -A INPUT -p udp --dport ${toString port} -j ACCEPT
+                ''
+              ) config.networking.firewall.allowedUDPPorts
+            }
+
             # Accept IPv4 multicast.  Not a big security risk since
             # probably nobody is listening anyway.
             iptables -A INPUT -d 224.0.0.0/4 -j ACCEPT
@@ -138,6 +156,7 @@ in
             # Accept IPv6 ICMP packets on the local link.  Otherwise
             # stuff like neighbor/router solicitation won't work.
             ip6tables -A INPUT -s fe80::/10 -p icmpv6 -j ACCEPT
+            ip6tables -A INPUT -d fe80::/10 -p icmpv6 -j ACCEPT
 
             # Optionally respond to pings.
             ${optionalString cfg.allowPing ''
-- 
GitLab


From d6424efbfbe8baafbebaa8eda50c84bebf8937a6 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 10 Mar 2011 09:39:17 +0000
Subject: [PATCH 2887/5331] * Cleanup.

svn path=/nixos/trunk/; revision=26244
---
 modules/services/networking/firewall.nix | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/modules/services/networking/firewall.nix b/modules/services/networking/firewall.nix
index c7ccc65ca37..30ba36e27d0 100644
--- a/modules/services/networking/firewall.nix
+++ b/modules/services/networking/firewall.nix
@@ -1,3 +1,5 @@
+# This module enables a simple firewall.
+
 { config, pkgs, ... }:
 
 with pkgs.lib;
@@ -18,7 +20,10 @@ in
       default = false;
       description =
         ''
-          Whether to enable the firewall.
+          Whether to enable the firewall.  This is a simple stateful
+          firewall that blocks connection attempts to unauthorised TCP
+          or UDP ports on this machine.  It does not affect packet
+          forwarding.
         '';
     };
   
@@ -91,7 +96,7 @@ in
   # doesn't deal with such Upstart jobs properly (it starts them if
   # they are changed, regardless of whether the start condition
   # holds).
-  config = mkIf config.networking.firewall.enable {
+  config = mkIf cfg.enable {
 
     environment.systemPackages = [ pkgs.iptables ];
 
@@ -102,7 +107,7 @@ in
 
         preStart =
           ''
-            # Helper command to manipulate both the IPv4 and IPv6 filters.
+            # Helper command to manipulate both the IPv4 and IPv6 tables.
             ip46tables() {
               iptables "$@"
               ip6tables "$@"
@@ -138,7 +143,7 @@ in
                 ''
                   ip46tables -A INPUT -p tcp --dport ${toString port} -j ACCEPT
                 ''
-              ) config.networking.firewall.allowedTCPPorts
+              ) cfg.allowedTCPPorts
             }
 
             # Accept packets on the allowed UDP ports.
@@ -146,7 +151,7 @@ in
                 ''
                   ip46tables -A INPUT -p udp --dport ${toString port} -j ACCEPT
                 ''
-              ) config.networking.firewall.allowedUDPPorts
+              ) cfg.allowedUDPPorts
             }
 
             # Accept IPv4 multicast.  Not a big security risk since
-- 
GitLab


From e2e7b689b47c70580af87f64a5b1e9cd5a5cc835 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 10 Mar 2011 11:39:37 +0000
Subject: [PATCH 2888/5331] * Fix `nixos-rebuild build-vm-with-bootloader':
 QEMU now requires the   `readonly' flag if the disk image is not writable.

svn path=/nixos/trunk/; revision=26245
---
 modules/virtualisation/qemu-vm.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/virtualisation/qemu-vm.nix b/modules/virtualisation/qemu-vm.nix
index e97dde69092..7eb2d076986 100644
--- a/modules/virtualisation/qemu-vm.nix
+++ b/modules/virtualisation/qemu-vm.nix
@@ -162,7 +162,7 @@ let
           -net user,vlan=0,guestfwd=tcp:10.0.2.4:445-chardev:samba''${QEMU_NET_OPTS:+,$QEMU_NET_OPTS} \
           ${if cfg.useBootLoader then ''
             -drive index=0,file=$NIX_DISK_IMAGE,if=virtio,cache=writeback,werror=report \
-            -drive index=1,file=${bootDisk}/disk.img,if=virtio,boot=on \
+            -drive index=1,file=${bootDisk}/disk.img,if=virtio,boot=on,readonly \
           '' else ''
             -drive file=$NIX_DISK_IMAGE,if=virtio,cache=writeback,werror=report \
             -kernel ${config.system.build.toplevel}/kernel \
-- 
GitLab


From 9bf4ac079ec08f68d825982cc15ab2b8f4ab664e Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 10 Mar 2011 12:08:39 +0000
Subject: [PATCH 2889/5331] * Add a module for doing Network Address
 Translation.

svn path=/nixos/trunk/; revision=26246
---
 modules/module-list.nix             |  1 +
 modules/services/networking/nat.nix | 95 +++++++++++++++++++++++++++++
 tests/nat.nix                       | 39 ++++++------
 3 files changed, 118 insertions(+), 17 deletions(-)
 create mode 100644 modules/services/networking/nat.nix

diff --git a/modules/module-list.nix b/modules/module-list.nix
index 5c1f3deab4c..453d09653fb 100644
--- a/modules/module-list.nix
+++ b/modules/module-list.nix
@@ -99,6 +99,7 @@
   ./services/networking/gw6c.nix
   ./services/networking/ifplugd.nix
   ./services/networking/ircd-hybrid.nix
+  ./services/networking/nat.nix
   ./services/networking/ntpd.nix
   ./services/networking/openfire.nix
   ./services/networking/openvpn.nix
diff --git a/modules/services/networking/nat.nix b/modules/services/networking/nat.nix
new file mode 100644
index 00000000000..2f9715e9fab
--- /dev/null
+++ b/modules/services/networking/nat.nix
@@ -0,0 +1,95 @@
+# This module enables Network Address Translation (NAT).
+
+{ config, pkgs, ... }:
+
+with pkgs.lib;
+
+let
+
+  cfg = config.networking.nat;
+
+in
+
+{
+
+  ###### interface
+
+  options = {
+  
+    networking.nat.enable = mkOption {
+      default = false;
+      description =
+        ''
+          Whether to enable Network Address Translation (NAT).
+        '';
+    };
+  
+    networking.nat.internalIPs = mkOption {
+      example = "192.168.1.0/24";
+      description =
+        ''
+          The IP address range for which to perform NAT.  Packets
+          coming from these addresses and destined for the external
+          interface will be rewritten.
+        '';
+    };
+  
+    networking.nat.externalInterface = mkOption {
+      example = "eth1";
+      description =
+        ''
+          The name of the external network interface.
+        '';
+    };
+  
+    networking.nat.externalIP = mkOption {
+      default = "";
+      example = "203.0.113.123";
+      description =
+        ''
+          The public IP address to which packets from the local
+          network are to be rewritten.  If this is left empty, the
+          IP address associated with the external interface will be
+          used.
+        '';
+    };
+  
+  };
+
+
+  ###### implementation
+
+  config = mkIf config.networking.nat.enable {
+
+    environment.systemPackages = [ pkgs.iptables ];
+
+    jobs.nat =
+      { description = "Network Address Translation";
+
+        startOn = "started network-interfaces";
+
+        path = [ pkgs.iptables ];
+
+        preStart =
+          ''
+            iptables -t nat -F
+            iptables -t nat -X
+
+            iptables -t nat -A POSTROUTING \
+              -s ${cfg.internalIPs} -o ${cfg.externalInterface} \
+              ${if cfg.externalIP == ""
+                then "-j MASQUERADE"
+                else "-j SNAT --to-source ${cfg.externalIP}"}
+
+            echo 1 > /proc/sys/net/ipv4/ip_forward
+          '';
+
+        postStop =
+          ''
+            iptables -t nat -F
+          '';
+      };
+
+  };
+
+}
diff --git a/tests/nat.nix b/tests/nat.nix
index 88aa609774f..6b0c7306bd9 100644
--- a/tests/nat.nix
+++ b/tests/nat.nix
@@ -19,7 +19,9 @@
       router = 
         { config, pkgs, ... }:
         { virtualisation.vlans = [ 2 1 ];
-          environment.systemPackages = [ pkgs.iptables ];
+          networking.nat.enable = true;
+          networking.nat.internalIPs = "192.168.1.0/24";
+          networking.nat.externalInterface = "eth1";
         };
 
       server = 
@@ -37,22 +39,25 @@
 
       # The router should have access to the server.
       $server->waitForJob("httpd");
-      $router->mustSucceed("curl --fail http://server/ >&2");
-
-      # But the client shouldn't be able to reach the server.
-      $client->mustFail("curl --fail --connect-timeout 5 http://server/ >&2");
-
-      # Enable NAT on the router.
-      $router->mustSucceed(
-          "iptables -t nat -F",
-          "iptables -t nat -A POSTROUTING -s 192.168.1.0/24 -d 192.168.1.0/24 -j ACCEPT",
-          "iptables -t nat -A POSTROUTING -s 192.168.1.0/24 -j SNAT "
-          . "--to-source ${nodes.router.config.networking.ifaces.eth1.ipAddress}",
-          "echo 1 > /proc/sys/net/ipv4/ip_forward"
-      );
-
-      # Now the client should be able to connect.
-      $client->mustSucceed("curl --fail http://server/ >&2");
+      $router->succeed("curl --fail http://server/ >&2");
+
+      # The client should be also able to connect via the NAT router.
+      $router->waitForJob("nat");
+      $client->succeed("curl --fail http://server/ >&2");
+      $client->succeed("ping -c 1 server >&2");
+      
+      # If we turn off NAT, the client shouldn't be able to reach the server.
+      $router->succeed("stop nat");
+      $client->fail("curl --fail --connect-timeout 5 http://server/ >&2");
+      $client->fail("ping -c 1 server >&2");
+
+      # And make sure that restarting the NAT job works.
+      $router->succeed("start nat");
+      $client->succeed("curl --fail http://server/ >&2");
+      $client->succeed("ping -c 1 server >&2");
+
+      $client->succeed("ping -c 1 router >&2");
+      $router->succeed("ping -c 1 client >&2");
     '';
 
 }
-- 
GitLab


From 53bc6d3efa5b5358c8f8b884536930e43b98eea3 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 10 Mar 2011 13:03:47 +0000
Subject: [PATCH 2890/5331] * NAT module: support active FTP.

svn path=/nixos/trunk/; revision=26247
---
 modules/services/networking/nat.nix |  2 ++
 tests/nat.nix                       | 17 ++++++++++++++---
 2 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/modules/services/networking/nat.nix b/modules/services/networking/nat.nix
index 2f9715e9fab..89950067a80 100644
--- a/modules/services/networking/nat.nix
+++ b/modules/services/networking/nat.nix
@@ -63,6 +63,8 @@ in
 
     environment.systemPackages = [ pkgs.iptables ];
 
+    boot.kernelModules = [ "nf_nat_ftp" ];
+
     jobs.nat =
       { description = "Network Address Translation";
 
diff --git a/tests/nat.nix b/tests/nat.nix
index 6b0c7306bd9..80a395dc123 100644
--- a/tests/nat.nix
+++ b/tests/nat.nix
@@ -29,6 +29,8 @@
         { virtualisation.vlans = [ 2 ];
           services.httpd.enable = true;
           services.httpd.adminAddr = "foo@example.org";
+          services.vsftpd.enable = true;
+          services.vsftpd.anonymousUser = true;
         };
     };
 
@@ -46,6 +48,18 @@
       $client->succeed("curl --fail http://server/ >&2");
       $client->succeed("ping -c 1 server >&2");
       
+      # Test whether passive FTP works.
+      $server->waitForJob("vsftpd");
+      $server->succeed("echo Hello World > /home/ftp/foo.txt");
+      $client->succeed("curl -v ftp://server/foo.txt >&2");
+      
+      # Test whether active FTP works.
+      $client->succeed("curl -v -P - ftp://server/foo.txt >&2");
+
+      # Test ICMP.
+      $client->succeed("ping -c 1 router >&2");
+      $router->succeed("ping -c 1 client >&2");
+      
       # If we turn off NAT, the client shouldn't be able to reach the server.
       $router->succeed("stop nat");
       $client->fail("curl --fail --connect-timeout 5 http://server/ >&2");
@@ -55,9 +69,6 @@
       $router->succeed("start nat");
       $client->succeed("curl --fail http://server/ >&2");
       $client->succeed("ping -c 1 server >&2");
-
-      $client->succeed("ping -c 1 router >&2");
-      $router->succeed("ping -c 1 client >&2");
     '';
 
 }
-- 
GitLab


From 0ea9f6611ab6024a03e44b0b3e61e06d6fb30e5c Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 10 Mar 2011 16:25:08 +0000
Subject: [PATCH 2891/5331] * Add some more rules to allow ICMPv6
 router/neighbour advertisements   in.  Maybe we're better off accepting all
 ICMPv6 messages *except*   echo requests.

svn path=/nixos/trunk/; revision=26260
---
 modules/services/networking/firewall.nix | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/modules/services/networking/firewall.nix b/modules/services/networking/firewall.nix
index 30ba36e27d0..44cb401c273 100644
--- a/modules/services/networking/firewall.nix
+++ b/modules/services/networking/firewall.nix
@@ -158,10 +158,19 @@ in
             # probably nobody is listening anyway.
             iptables -A INPUT -d 224.0.0.0/4 -j ACCEPT
 
-            # Accept IPv6 ICMP packets on the local link.  Otherwise
-            # stuff like neighbor/router solicitation won't work.
+            # Accept IPv6 ICMP packets on the local link.
             ip6tables -A INPUT -s fe80::/10 -p icmpv6 -j ACCEPT
             ip6tables -A INPUT -d fe80::/10 -p icmpv6 -j ACCEPT
+            
+            # Accept neighbour solicitations from solicited-node
+            # addresses.  Otherwise other nodes cannot reach us at
+            # all.
+            ip6tables -A INPUT -d ff02::1:ff00:0/104 -p icmpv6 --icmpv6-type neighbour-solicitation -j ACCEPT
+
+            # Accept router and neighbour advertisements from
+            # anywhere.  Would be nice to be more specific.
+            ip6tables -A INPUT -p icmpv6 --icmpv6-type router-advertisement -j ACCEPT
+            ip6tables -A INPUT -p icmpv6 --icmpv6-type neighbour-advertisement -j ACCEPT
 
             # Optionally respond to pings.
             ${optionalString cfg.allowPing ''
-- 
GitLab


From f672aa71bf0d0c14091d624df6d8c137b4df3602 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 11 Mar 2011 11:08:16 +0000
Subject: [PATCH 2892/5331] * RFC 4890 says that local nodes should not filter
 pretty much any   ICMPv6 messages (including echo requests), so don't do
 that.

svn path=/nixos/trunk/; revision=26270
---
 modules/services/networking/firewall.nix | 29 ++++++++++--------------
 1 file changed, 12 insertions(+), 17 deletions(-)

diff --git a/modules/services/networking/firewall.nix b/modules/services/networking/firewall.nix
index 44cb401c273..f719e6777a7 100644
--- a/modules/services/networking/firewall.nix
+++ b/modules/services/networking/firewall.nix
@@ -82,7 +82,10 @@ in
       type = types.bool;
       description =
         ''
-          Whether to respond to incoming ICMP echo requests ("pings").
+          Whether to respond to incoming ICMPv4 echo requests
+          ("pings").  ICMPv6 pings are always allowed because the
+          larger address space of IPv6 makes network scanning much
+          less effective.
         '';
     };
   
@@ -158,26 +161,18 @@ in
             # probably nobody is listening anyway.
             iptables -A INPUT -d 224.0.0.0/4 -j ACCEPT
 
-            # Accept IPv6 ICMP packets on the local link.
-            ip6tables -A INPUT -s fe80::/10 -p icmpv6 -j ACCEPT
-            ip6tables -A INPUT -d fe80::/10 -p icmpv6 -j ACCEPT
-            
-            # Accept neighbour solicitations from solicited-node
-            # addresses.  Otherwise other nodes cannot reach us at
-            # all.
-            ip6tables -A INPUT -d ff02::1:ff00:0/104 -p icmpv6 --icmpv6-type neighbour-solicitation -j ACCEPT
-
-            # Accept router and neighbour advertisements from
-            # anywhere.  Would be nice to be more specific.
-            ip6tables -A INPUT -p icmpv6 --icmpv6-type router-advertisement -j ACCEPT
-            ip6tables -A INPUT -p icmpv6 --icmpv6-type neighbour-advertisement -j ACCEPT
-
-            # Optionally respond to pings.
+            # Optionally respond to ICMPv4 pings.
             ${optionalString cfg.allowPing ''
               iptables -A INPUT -p icmp --icmp-type echo-request -j ACCEPT
-              ip6tables -A INPUT -p icmpv6 --icmpv6-type echo-request -j ACCEPT
             ''}
 
+            # Accept all ICMPv6 messages except redirects and node
+            # information queries (type 139).  See RFC 4890, section
+            # 4.4.
+            ip6tables -A INPUT -p icmpv6 --icmpv6-type redirect -j DROP
+            ip6tables -A INPUT -p icmpv6 --icmpv6-type 139 -j DROP
+            ip6tables -A INPUT -p icmpv6 -j ACCEPT
+
             # Reject/drop everything else.
             ip46tables -A INPUT -j FW_REFUSE
           '';
-- 
GitLab


From ab0ce6734baf6b05f59cf9e83f5be38ff920f9d1 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 11 Mar 2011 11:53:18 +0000
Subject: [PATCH 2893/5331] * firewall.nix: Only flush/delete the chains
 created by us.

svn path=/nixos/trunk/; revision=26271
---
 modules/services/networking/firewall.nix | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/modules/services/networking/firewall.nix b/modules/services/networking/firewall.nix
index f719e6777a7..15e937b6736 100644
--- a/modules/services/networking/firewall.nix
+++ b/modules/services/networking/firewall.nix
@@ -116,7 +116,8 @@ in
               ip6tables "$@"
             }
 
-            ip46tables -F
+            ip46tables -F INPUT
+            ip46tables -F FW_REFUSE || true
             ip46tables -X # flush unused chains
             ip46tables -P INPUT DROP
 
@@ -179,9 +180,9 @@ in
 
         postStop =
           ''
-            iptables -F
+            iptables -F INPUT
             iptables -P INPUT ACCEPT
-            ip6tables -F
+            ip6tables -F INPUT
             ip6tables -P INPUT ACCEPT
           '';
       };
-- 
GitLab


From 416c60550ed90a5702df689adba267e2e777b149 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 11 Mar 2011 12:18:01 +0000
Subject: [PATCH 2894/5331] * Delete some obsolete installation tests.

svn path=/nixos/trunk/; revision=26272
---
 .../configuration-iso.nix                     |  26 --
 .../configuration.nix                         |  28 --
 .../module-insecure.nix                       |  50 ----
 tests/test-nixos-install-from-cd/test.nix     | 250 ------------------
 tests/test-nixos-installer2.nix               |  71 -----
 5 files changed, 425 deletions(-)
 delete mode 100644 tests/test-nixos-install-from-cd/configuration-iso.nix
 delete mode 100644 tests/test-nixos-install-from-cd/configuration.nix
 delete mode 100644 tests/test-nixos-install-from-cd/module-insecure.nix
 delete mode 100644 tests/test-nixos-install-from-cd/test.nix
 delete mode 100644 tests/test-nixos-installer2.nix

diff --git a/tests/test-nixos-install-from-cd/configuration-iso.nix b/tests/test-nixos-install-from-cd/configuration-iso.nix
deleted file mode 100644
index 5e9637d33cf..00000000000
--- a/tests/test-nixos-install-from-cd/configuration-iso.nix
+++ /dev/null
@@ -1,26 +0,0 @@
-# configuration used to build ISO used to install NixOS when running NixOS kvm installation test
-
-# The configuration is prebuild before starting the vm because starting the vm
-# causes some overhead.
-{pkgs, config, ...}:
-
-let
-  doOverride = pkgs.lib.mkOverrideTemplate 0 {};
-in
-
-{
-
-  # make system boot and accessible:
-  require = [ ./module-insecure.nix
-              ../../modules/installer/cd-dvd/installation-cd-minimal.nix
-            ];
-
-  fonts = {
-    enableFontConfig = false; 
-  };
-
-  boot.loader.grub.timeout = doOverride 0; 
-  boot.loader.grub.default = 2;
-  boot.loader.grub.version = doOverride 2;
-
-}
diff --git a/tests/test-nixos-install-from-cd/configuration.nix b/tests/test-nixos-install-from-cd/configuration.nix
deleted file mode 100644
index 7ec29b4382f..00000000000
--- a/tests/test-nixos-install-from-cd/configuration.nix
+++ /dev/null
@@ -1,28 +0,0 @@
-# configuration being installed by NixOS kvm installation test
-{pkgs, config, ...}: {
-
-  # make system boot and accessible:
-  require = [
-    ./module-insecure.nix
-  ];
-
-  boot.loader.grub = {
-    device = "/dev/sda";
-    copyKernels = false;
-    bootDevice = "(hd0,0)";
-  };
-
-  fileSystems = [
-    { mountPoint = "/";
-      device = "/dev/sda1";
-      neededForBoot = true;
-    }
-  ];
-
-  swapDevices = [ { device = "/dev/sda2"; } ];
-
-  fonts = {
-    enableFontConfig = false; 
-  };
-
-}
diff --git a/tests/test-nixos-install-from-cd/module-insecure.nix b/tests/test-nixos-install-from-cd/module-insecure.nix
deleted file mode 100644
index 493f55141d0..00000000000
--- a/tests/test-nixos-install-from-cd/module-insecure.nix
+++ /dev/null
@@ -1,50 +0,0 @@
-# this allows logging in as root without password.
-
-# This module is shared by the iso configuration and the system configuration
-# which is build by the test
-
-{pkgs, config, ...}:
-
-let
-  doOverride = pkgs.lib.mkOverrideTemplate 0 {};
-in
-
-{
-
-  services.openssh = {
-    enable = true;
-    permitRootLogin = "yes";
-  };
-  jobs.sshd = {
-    startOn = doOverride "started network-interfaces";
-  };
-
-  boot.initrd.kernelModules =
-    ["cifs" "virtio_net" "virtio_pci" "virtio_blk" "virtio_balloon" "nls_utf8"];
-
-  environment.systemPackages = [ pkgs.vim_configurable ];
-
-  # FIXME: rewrite pam.services the to be an attr list
-  # I only want to override sshd
-  security.pam.services = doOverride
-      # Most of these should be moved to specific modules.
-      [ { name = "cups"; }
-        { name = "ejabberd"; }
-        { name = "ftp"; }
-        { name = "lshd"; rootOK =true; allowNullPassword =true; }
-        { name = "passwd"; }
-        { name = "samba"; }
-        { name = "sshd"; rootOK = true; allowNullPassword =true; }
-        { name = "xlock"; }
-        { name = "chsh"; rootOK = true; }
-        { name = "su"; rootOK = true; forwardXAuth = true; }
-        # Note: useradd, groupadd etc. aren't setuid root, so it
-        # doesn't really matter what the PAM config says as long as it
-        # lets root in.
-        { name = "useradd"; rootOK = true; }
-        # Used by groupadd etc.
-        { name = "shadow"; rootOK = true; }
-        { name = "login"; ownDevices = true; allowNullPassword = true; }
-      ];
-
-}
diff --git a/tests/test-nixos-install-from-cd/test.nix b/tests/test-nixos-install-from-cd/test.nix
deleted file mode 100644
index 74fb9375dd9..00000000000
--- a/tests/test-nixos-install-from-cd/test.nix
+++ /dev/null
@@ -1,250 +0,0 @@
-{ nixos ? ../..
-, nixpkgs ? ../../../nixpkgs
-, services ? ../../../nixos/services
-, system ? builtins.currentSystem
-}:
-
-let
-
-/*
-
-   test nixos installation automatically using a build job (unfinished)
-
-   run this test this way:
-   nix-build --no-out-link --show-trace tests/test-nixos-install-from-cd.nix
-
-   --no-out-link is important because creating ./result will cause rebuilding of
-   the iso as the nixos repository is included in the iso.
-
-   To prevent this make these paths point to another location:
-   nixosTarball = makeTarball "nixos.tar.bz2" (cleanSource ../../..);
-   nixpkgsTarball = makeTarball "nixpkgs.tar.bz2" (cleanSource pkgs.path);
-
-*/
-
-  configuration_iso =  ./configuration-iso.nix;
-  configuration_install = ./configuration.nix;
-
-  release = (import ../../release.nix) { inherit nixpkgs; };
-
-  isoFile = (
-    release.makeIso 
-      {
-        module = configuration_iso;
-        description = "minimal-testing-only";
-        maintainers = ["MarcWeber"];
-      }
-      { inherit system; }
-      ).iso;
-
-  eval = import ../../lib/eval-config.nix {
-    inherit system nixpkgs;
-    modules = [ configuration_install ];
-  };
-
-  inherit (eval) pkgs config;
-
-  inherit (pkgs) qemu_kvm;
-
-  # prebuild system which will be installed for two reasons:
-  # build derivations are in store and can be reused
-  # the iso is only build when this suceeds (?)
-  systemDerivation = builtins.addErrorContext "while building system" config.system.build.toplevel;
-
-  # TODO test both: copyKernels = true and false. true doesn't work ?
-
-  debug = if false then ''
-    export DISPLAY=localhost:0.0
-  ''
-  else
-  # That's crazy: You see nothing but your computer is doing a *lot* of work :-)
-  ''
-    KVM_OPTIONS="-nographic"
-  '';
-
-in
-
-rec {
-
-  test = 
-    # FIXME: support i686 as well 
-    # FIXME: X shouldn't be required
-    # Is there a way to use kvm when not running as root?
-    # Would using uml provide any advantages?
-
-
-    # TODO: Run installation withoun networking support ?
-    # This can be done by using either firewalls or building system by .drv path?
-    pkgs.runCommand "nixos-installation-test" { inherit systemDerivation; } ''
-
-    set -e
-
-    INFO(){ echo "INFO: " $@; }
-
-    die(){ echo $@; exit 1; }
-
-    if ${pkgs.procps}/bin/ps aux | grep -v grep | grep sbin/nmbd ; then
-      die "!! aborting: -smb won't work when host is running samba!"
-    fi 
-
-    [ -e /dev/kvm ] || die "modprobe a kvm-* module /dev/kvm not present. You want it for speed reasons!"
-
-    for path in ${pkgs.socat} ${pkgs.openssh} ${qemu_kvm}; do
-      PATH=$path/bin:$PATH
-    done
-
-    # without samba -smb doesn't work
-    PATH=${pkgs.samba}/sbin:$PATH
-
-    # install the system
-    ${debug}
-
-    SOCKET_NAME=65535.socket
-
-    # creating shell script for debugging purposes
-    cat >> run-kvm.sh << EOF
-    #!/bin/sh -e
-
-    exec qemu-system-x86_64 -m 512 \
-        -no-kvm-irqchip \
-        -net nic,model=virtio -net user -smb /nix \
-        -hda image \
-        -redir tcp:''${SOCKET_NAME/.socket/}::22 \
-        $KVM_OPTIONS \
-        "\$@"
-    EOF
-    chmod +x run-kvm.sh
-
-    RUN_KVM(){
-      INFO "launching qemu-kvm in a background process"
-      { ./run-kvm.sh "$@" \
-        || { echo "starting kvm failed, exiting" 1>&2; kill -9 $$; }
-      } &
-    }
-
-    waitTill(){
-      echo $1
-      eval "while ! $2; do sleep 1; done"
-    }
-
-    SSH(){
-      # if timout occurs ssh command will be retried.
-      # Waiting forever doesn't seem to work because
-      # there seems to be a race condition where
-      # SSH connects but sshd doesn't notice it.
-      # Thus fail and retry
-      ssh -o UserKnownHostsFile=/dev/null \
-        -o StrictHostKeyChecking=no \
-        -o ProxyCommand="socat stdio ./$SOCKET_NAME" \
-        -o ConnectTimeout=1 \
-        root@127.0.0.1 \
-        "$@";
-    }
-    SSH_STDIN_E(){ { echo "set -e;"; cat; } | SSH; }
-
-    SHUTDOWN_VM(){
-      SSH 'shutdown -h now';
-      INFO "waiting for kvm to shutown"
-      wait
-    }
-
-    # wait for socket
-
-    waitForSSHD(){
-      waitTill "waiting for sshd job" "SSH 'echo Hello > /dev/tty1' &> /dev/null"
-    }
-
-    nixBuildTest(){
-    INFO "verifying that nix-env -i works"
-
-    SSH_STDIN_E << EOF
-
-      cat >> test.nix << EOF_TEST
-      let pkgs = import /etc/nixos/nixpkgs/pkgs/top-level/all-packages.nix {};
-      in pkgs.stdenv.mkDerivation {
-        name = "test";
-        phases = "create_out";
-        create_out = "mkdir -p \\\$out/ok";
-      }
-    EOF_TEST
-
-      nix-build test.nix
-      [ -e result/ok ]
-    EOF
-
-    }
-
-    ### test installting NixOS: install system then reboot
-
-
-    INFO "creating image file"
-    # 2GB = data; 1GB=swap
-    # Maybe using 1GB swap is much. But qcow2 doesn't fill holes so it only
-    # used when required (?)
-    qemu-img create -f qcow2 image 3G
-
-    RUN_KVM -boot d -cdrom $(echo ${isoFile}/iso/*.iso)
-    
-    waitForSSHD
-
-    nixBuildTest
-
-    # INSTALLATION
-    INFO "creating filesystem .."
-    SSH_STDIN_E << EOF
-      parted /dev/sda mklabel msdos
-      parted /dev/sda mkpart primary 0 2G
-      parted /dev/sda mkpart primary 1G 3G
-      waitFor(){
-        while [ ! -e "\$1" ]; do
-          echo "waiting for \$1 to appear"; sleep 1;
-        done
-      }
-      waitFor /dev/sda2
-      mkswap /dev/sda2
-      swapon /dev/sda2
-
-      waitFor /dev/sda1
-      mkfs.ext3 /dev/sda1
-
-      mount /dev/sda1 /mnt
-      mkdir -p /mnt/nix-on-host
-      mount //10.0.2.4/qemu -oguest,username=nobody,noperm -tcifs /mnt/nix-on-host
-    EOF
-
-
-    SSH_STDIN_E << EOF
-      # simple nixos-hardware-scan syntax check:
-      nixos-hardware-scan > /tmp/test.nix
-    EOF
-
-    INFO "copying sources and Nix, starting installation"
-    SSH_STDIN_E << EOF
-
-      nixos-prepare-install
-
-      # has the generated configuration.nix file syntax errors?
-      nix-instantiate --eval-only /tmp/test.nix
-
-      mkdir /mnt/root
-      echo 'export NIXOS_CONFIG=/etc/nixos/nixos/tests/test-nixos-install-from-cd/configuration.nix' >> /mnt/root/.bashrc
-      . /mnt/root/.bashrc
-      export NIX_OTHER_STORES=/nix-on-host
-
-      run-in-chroot "/nix/store/nixos-bootstrap --install --no-pull"
-      #nixos-install
-    EOF
-
-    SHUTDOWN_VM
-
-    INFO "booting installed system"
-    RUN_KVM -boot c
-    waitForSSHD
-
-    nixBuildTest
-
-    SHUTDOWN_VM
-
-    echo "$(date) success" > $out
-  '';
-}
diff --git a/tests/test-nixos-installer2.nix b/tests/test-nixos-installer2.nix
deleted file mode 100644
index ec7ce0965c0..00000000000
--- a/tests/test-nixos-installer2.nix
+++ /dev/null
@@ -1,71 +0,0 @@
-# A test script is created testing the installer2 scripts
-# This can't be a build job because chroot is required - sudo is used
-# 
-# # build test script:
-# nix-build tests/test-nixos-installer2.nix -A test
-# 
-# # run:
-# sudo result/bin/test
-
-{ nixos ? ./..
-, nixpkgs ? ../../nixpkgs
-, services ? ../../nixos/services
-, system ? builtins.currentSystem
-, configPath ? ./test-nixos-install-from-cd.nix
-}:
-
-let
-
-  isos = (import ../release.nix) { inherit nixpkgs; };
-
-  # using same configuration as used by kvm test.
-  configuration = ./test-nixos-install-from-cd/configuration.nix;
-
-  eval = import ../lib/eval-config.nix {
-    inherit system nixpkgs;
-    modules = [ configuration ];
-  };
-
-
-  inherit (eval) pkgs config;
-
-  inherit (pkgs) qemu_kvm;
-
-  # prebuild system which will be installed for two reasons:
-  # build derivations are in store and can be reused
-  # the iso is only build when this suceeds (?)
-  systemDerivation = builtins.addErrorContext "while building system" config.system.build.toplevel;
-
-
-  tools = config.system.build;
-
-in
-
-rec {
-
-  test = pkgs.writeScriptBin "test"  ''
-    #!/bin/sh -e
-    # DEBUG can be set to --debug to force set -x in scripts
-
-    export mountPoint=''${mountPoint:-`pwd`/mountPoint}
-    if [ -e "$mountPoint" ]; then
-      echo "mountPoint $mountPoint exists, delete? [y] | other key: continue"
-      read -n1 delete
-      if [ "$delete" == "y" ]; then
-        rm -fr $mountPoint
-      fi
-    fi
-    mkdir -p $mountPoint
-
-    set -x
-
-    ${tools.nixosPrepareInstall}/bin/nixos-prepare-install $DEBUG --dir-ok copy-nixos-bootstrap copy-nix copy-sources
-
-    cp ${configuration} $mountPoint/etc/nixos/configuration.nix
-
-    # at least one of those files is referenced. So copy all - they don't hurt
-    cp -r ${builtins.dirOf (builtins.toString configuration)}/* $mountPoint/etc/nixos
-
-    ${tools.runInChroot}/bin/run-in-chroot $DEBUG "/nix/store/nixos-bootstrap $DEBUG --install --no-grub"
-  '';
-}
-- 
GitLab


From 6160100a9ad6b9eee60b38b829d5a9da8ab9eba5 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 11 Mar 2011 12:56:04 +0000
Subject: [PATCH 2895/5331] * Don't run klogd in tests to prevent duplicate
 kernel messages in the   log output.  (It wasn't running anyway because the
 preStart command   was broken.)  Note that "dmesg -c" doesn't have an effect
 on klogd,   and "klogd -o" is broken.

svn path=/nixos/trunk/; revision=26273
---
 modules/testing/test-instrumentation.nix | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/modules/testing/test-instrumentation.nix b/modules/testing/test-instrumentation.nix
index 6c8f6cfa797..5fff8fc84e8 100644
--- a/modules/testing/test-instrumentation.nix
+++ b/modules/testing/test-instrumentation.nix
@@ -86,9 +86,8 @@ in
     # Send all of /var/log/messages to the serial port.
     services.syslogd.extraConfig = "*.* /dev/ttyS0";
 
-    # Clear the kernel log buffer before starting klogd to prevent it
-    # from printing messages that we have already seen.
-    jobs.klogd.preStart = "dmesg -c > /dev/null";
+    # Don't run klogd.  Kernel messages appear on the serial console anyway.
+    jobs.klogd.startOn = mkOverride 50 "";
 
     # Prevent tests from accessing the Internet.
     networking.defaultGateway = mkOverride 150 "";
-- 
GitLab


From 005ca15f648992aa2db18d2d509db7bcba9f97e8 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 11 Mar 2011 13:04:17 +0000
Subject: [PATCH 2896/5331] * Firewall: add an option to allow extra firewall
 rules to be added.

* Firewall: change the policy of the INPUT chain back to ACCEPT to
  prevent a lockup when the Nix store is mounted over the network
  (i.e. in our VM tests).  This is because as soon as the policy is
  set to DROP, the iptables modules that enable access to the network
  filesystem cannot be acccessed anymore.

svn path=/nixos/trunk/; revision=26274
---
 modules/services/networking/firewall.nix | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/modules/services/networking/firewall.nix b/modules/services/networking/firewall.nix
index 15e937b6736..287a2e472cd 100644
--- a/modules/services/networking/firewall.nix
+++ b/modules/services/networking/firewall.nix
@@ -89,6 +89,18 @@ in
         '';
     };
   
+    networking.firewall.extraCommands = mkOption {
+      default = "";
+      example = "iptables -A INPUT -p icmp -j ACCEPT";
+      description =
+        ''
+          Additional shell commands executed as part of the firewall
+          initialisation script.  These are executed just before the
+          final "reject" firewall rule is added, so they can be used
+          to allow packets that would otherwise be refused.
+        '';
+    };
+  
   };
 
 
@@ -119,7 +131,7 @@ in
             ip46tables -F INPUT
             ip46tables -F FW_REFUSE || true
             ip46tables -X # flush unused chains
-            ip46tables -P INPUT DROP
+            ip46tables -P INPUT ACCEPT
 
 
             # The "FW_REFUSE" chain performs logging and
@@ -174,6 +186,8 @@ in
             ip6tables -A INPUT -p icmpv6 --icmpv6-type 139 -j DROP
             ip6tables -A INPUT -p icmpv6 -j ACCEPT
 
+            ${cfg.extraCommands}
+
             # Reject/drop everything else.
             ip46tables -A INPUT -j FW_REFUSE
           '';
-- 
GitLab


From 64d871c0d9cc870b3a9aad81a34df465c8ffc211 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 11 Mar 2011 13:34:17 +0000
Subject: [PATCH 2897/5331] * Enable FTP connection tracking in the firewall.

svn path=/nixos/trunk/; revision=26275
---
 modules/services/networking/firewall.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/modules/services/networking/firewall.nix b/modules/services/networking/firewall.nix
index 287a2e472cd..a8dd253d70b 100644
--- a/modules/services/networking/firewall.nix
+++ b/modules/services/networking/firewall.nix
@@ -115,6 +115,8 @@ in
 
     environment.systemPackages = [ pkgs.iptables ];
 
+    boot.kernelModules = [ "nf_conntrack_ftp" ];
+
     jobs.firewall =
       { startOn = "started network-interfaces";
 
-- 
GitLab


From ee4e004cc49a665f1afa7a64f91f94b824d09b4c Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 11 Mar 2011 13:38:52 +0000
Subject: [PATCH 2898/5331] * Add a test for the firewall.

svn path=/nixos/trunk/; revision=26276
---
 modules/testing/test-instrumentation.nix |  5 ++-
 tests/default.nix                        |  1 +
 tests/firewall.nix                       | 47 ++++++++++++++++++++++++
 3 files changed, 52 insertions(+), 1 deletion(-)
 create mode 100644 tests/firewall.nix

diff --git a/modules/testing/test-instrumentation.nix b/modules/testing/test-instrumentation.nix
index 5fff8fc84e8..78ce250675d 100644
--- a/modules/testing/test-instrumentation.nix
+++ b/modules/testing/test-instrumentation.nix
@@ -24,7 +24,10 @@ in
   config = {
 
     jobs.backdoor =
-      { startOn = "ip-up";
+      { # If the firewall is enabled, this job must start *after* the
+        # firewall, otherwise connection tracking won't know about
+        # this connection.
+        startOn = if config.networking.firewall.enable then "started firewall" else "ip-up";
         stopOn = "never";
         
         script =
diff --git a/tests/default.nix b/tests/default.nix
index 081a4773084..d156db58c5c 100644
--- a/tests/default.nix
+++ b/tests/default.nix
@@ -9,6 +9,7 @@ with import ../lib/testing.nix { inherit nixpkgs services system; };
   avahi = makeTest (import ./avahi.nix);
   bittorrent = makeTest (import ./bittorrent.nix);
   firefox = makeTest (import ./firefox.nix);
+  firewall = makeTest (import ./firewall.nix);
   installer = makeTests (import ./installer.nix);
   ipv6 = makeTest (import ./ipv6.nix);
   kde4 = makeTest (import ./kde4.nix);
diff --git a/tests/firewall.nix b/tests/firewall.nix
new file mode 100644
index 00000000000..82071e2d040
--- /dev/null
+++ b/tests/firewall.nix
@@ -0,0 +1,47 @@
+# Test the firewall module.
+
+{ pkgs, ... }:
+
+{
+
+  nodes =
+    { walled = 
+        { config, pkgs, nodes, ... }:
+        { networking.firewall.enable = true;
+          networking.firewall.logRefusedPackets = true;
+          services.httpd.enable = true;
+          services.httpd.adminAddr = "foo@example.org";
+        };
+
+      attacker = 
+        { config, pkgs, ... }:
+        { services.httpd.enable = true;
+          services.httpd.adminAddr = "foo@example.org";
+        };
+    };
+
+  testScript =
+    { nodes, ... }:
+    ''
+      startAll;
+
+      $walled->waitForJob("firewall");
+      $walled->waitForJob("httpd");
+
+      # Local connections should still work.
+      $walled->succeed("curl -v http://localhost/ >&2");
+
+      # Connections to the firewalled machine should fail.
+      $attacker->fail("curl -v http://walled/ >&2");
+      $attacker->fail("ping -c 1 walled >&2");
+
+      # Outgoing connections/pings should still work.
+      $walled->succeed("curl -v http://attacker/ >&2");
+      $walled->succeed("ping -c 1 attacker >&2");
+
+      # If we stop the firewall, then connections should succeed.
+      $walled->succeed("stop firewall");
+      $attacker->succeed("curl -v http://walled/ >&2");
+    '';
+
+}
-- 
GitLab


From 7205c31ea33dfd6f6c0c2a28d7d2ce7dd0b90730 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 11 Mar 2011 13:57:48 +0000
Subject: [PATCH 2899/5331] * Remove "modprobe af_packet".  It's loaded
 automatically when needed.

svn path=/nixos/trunk/; revision=26277
---
 modules/tasks/network-interfaces.nix | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/modules/tasks/network-interfaces.nix b/modules/tasks/network-interfaces.nix
index cbac5a60b91..138a11cf21c 100644
--- a/modules/tasks/network-interfaces.nix
+++ b/modules/tasks/network-interfaces.nix
@@ -162,12 +162,10 @@ in
 
         startOn = "stopped udevtrigger";
 
-        path = [ config.system.sbin.modprobe pkgs.iproute ];
+        path = [ pkgs.iproute ];
 
         preStart =
           ''
-            modprobe af_packet || true
-
             ${pkgs.lib.concatMapStrings (i:
               if i.macAddress != "" then
                 ''
-- 
GitLab


From d6090b9d1e9b28d32bd1013fbbfc5332279e5dd7 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 11 Mar 2011 13:59:01 +0000
Subject: [PATCH 2900/5331] svn path=/nixos/trunk/; revision=26278

---
 release.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/release.nix b/release.nix
index 390a15afb3e..fd2f8ea6677 100644
--- a/release.nix
+++ b/release.nix
@@ -158,6 +158,7 @@ let
         avahi = t.avahi.test;
         bittorrent = t.bittorrent.test;
         firefox = t.firefox.test;
+        firewall = t.firewall.test;
         installer.lvm = t.installer.lvm.test;
         installer.separateBoot = t.installer.separateBoot.test;
         installer.simple = t.installer.simple.test;
-- 
GitLab


From 8ce36ffb3ac5773ea91c1cc183a13c5a1c7fc58f Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 11 Mar 2011 14:50:11 +0000
Subject: [PATCH 2901/5331] * Use "ip" instead of "ifconfig" for setting up
 network interfaces,   since the latter is rather deprecated and has been
 unmaintained   since 2001.  Note that "ip" doesn't know about classful
 addressing,   so you can no longer get away with not specifying the subnet
 mask   for explicitly configured interfaces.  So if you had

    networking.interfaces =
      [ { name = "eth0"; ipAddress = "192.168.1.1"; } ];

  this should be changed to

    networking.interfaces =
      [ { name = "eth0";
          ipAddress = "192.168.1.1";
          subnetMask = "255.255.255.0";
        }
     ];

  otherwise you end up with a subnet mask of 255.255.255.255.

svn path=/nixos/trunk/; revision=26279
---
 lib/build-vms.nix                    |  1 +
 modules/tasks/network-interfaces.nix | 47 +++++++++-------------------
 2 files changed, 16 insertions(+), 32 deletions(-)

diff --git a/lib/build-vms.nix b/lib/build-vms.nix
index 32d0a4811eb..8d4592b48bd 100644
--- a/lib/build-vms.nix
+++ b/lib/build-vms.nix
@@ -51,6 +51,7 @@ rec {
                 lib.flip map interfacesNumbered ({ first, second }:
                   { name = "eth${toString second}";
                     ipAddress = "192.168.${toString first}.${toString m.second}";
+                    subnetMask = "255.255.255.0";
                   }
                 );
             in
diff --git a/modules/tasks/network-interfaces.nix b/modules/tasks/network-interfaces.nix
index 138a11cf21c..f6343815a95 100644
--- a/modules/tasks/network-interfaces.nix
+++ b/modules/tasks/network-interfaces.nix
@@ -4,12 +4,8 @@ with pkgs.lib;
 
 let
 
-  inherit (pkgs) nettools;
-
   cfg = config.networking;
 
-  ifconfig = "${nettools}/sbin/ifconfig";
-
 in 
 
 {
@@ -166,33 +162,28 @@ in
 
         preStart =
           ''
-            ${pkgs.lib.concatMapStrings (i:
-              if i.macAddress != "" then
-                ''
-                  echo "Configuring interface ${i.name}..."
-                  ${ifconfig} "${i.name}" down || true
-                  ${ifconfig} "${i.name}" hw ether "${i.macAddress}" || true
+            ${flip concatMapStrings cfg.interfaces (i:
+              optionalString (i.macAddress != "")
                 ''
-              else "") cfg.interfaces
+                  echo "Setting MAC address of ${i.name} to ${i.macAddress}..."
+                  ip link set "${i.name}" address "${i.macAddress}" || true
+                '')
             }
 
             for i in $(cd /sys/class/net && ls -d *); do
                 echo "Bringing up network device $i..."
-                ${ifconfig} $i up || true
+                ip link set "$i" up || true
             done
 
             # Configure the manually specified interfaces.
-            ${pkgs.lib.concatMapStrings (i:
-              if i.ipAddress != "" then
+            ${flip concatMapStrings cfg.interfaces (i:
+              optionalString (i.ipAddress != "")
                 ''
                   echo "Configuring interface ${i.name}..."
-                  extraFlags=
-                  if test -n "${i.subnetMask}"; then
-                      extraFlags="$extraFlags netmask ${i.subnetMask}"
-                  fi
-                  ${ifconfig} "${i.name}" "${i.ipAddress}" $extraFlags || true
-                ''
-              else "") cfg.interfaces}
+                  ip addr add "${i.ipAddress}""${optionalString (i.subnetMask != "") ("/" + i.subnetMask)}" \
+                    dev "${i.name}" || true
+                '')
+            }
 
             # Set the nameservers.
             if test -n "${toString cfg.nameservers}"; then
@@ -206,9 +197,9 @@ in
             fi
 
             # Set the default gateway.
-            if test -n "${cfg.defaultGateway}"; then
-                ${nettools}/sbin/route add default gw "${cfg.defaultGateway}" || true
-            fi
+            ${optionalString (cfg.defaultGateway != "") ''
+                ip route add default via "${cfg.defaultGateway}" || true
+            ''}
 
             # Run any user-specified commands.
             ${pkgs.stdenv.shell} ${pkgs.writeText "local-net-cmds" cfg.localCommands} || true
@@ -218,14 +209,6 @@ in
               initctl emit -n ip-up
             ''}
           '';
-
-        postStop =
-          ''
-            #for i in $(cd /sys/class/net && ls -d *); do
-            #    echo "Taking down network device $i..."
-            #    ${ifconfig} $i down || true
-            #done
-          '';
       };
 
     # Set the host name in the activation script.  Don't clear it if
-- 
GitLab


From cd30b40da7bd1550d9ac83fb2dc05e06f65abd83 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 11 Mar 2011 14:59:36 +0000
Subject: [PATCH 2902/5331] * Replace ifconfig by ip in the initrd of VM tests.

svn path=/nixos/trunk/; revision=26280
---
 modules/virtualisation/qemu-vm.nix | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/modules/virtualisation/qemu-vm.nix b/modules/virtualisation/qemu-vm.nix
index 7eb2d076986..44d6a999d44 100644
--- a/modules/virtualisation/qemu-vm.nix
+++ b/modules/virtualisation/qemu-vm.nix
@@ -247,14 +247,16 @@ in
       # We need mke2fs in the initrd.
       cp ${pkgs.e2fsprogs}/sbin/mke2fs $out/bin
 
-      # And `ifconfig'.
-      cp ${pkgs.nettools}/sbin/ifconfig $out/bin
+      # And `ip' (which needs libresolv.so).
+      cp ${pkgs.iproute}/sbin/ip $out/bin
+      cp ${pkgs.glibc}/lib/libresolv.so.* $out/lib
     '';
       
   boot.initrd.postDeviceCommands =
     ''
       # Set up networking.  Needed for CIFS mounting.
-      ifconfig eth0 up 10.0.2.15
+      ip link set eth0 up
+      ip addr add 10.0.2.15/24 dev eth0
 
       # If the disk image appears to be empty, run mke2fs to
       # initialise.
-- 
GitLab


From ff458f3fc8a76162dbf394157a8fb507937c3f8a Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 11 Mar 2011 17:00:10 +0000
Subject: [PATCH 2903/5331] * Add a very basic test for Xfce.

svn path=/nixos/trunk/; revision=26284
---
 release.nix       |  1 +
 tests/default.nix |  1 +
 tests/xfce.nix    | 35 +++++++++++++++++++++++++++++++++++
 3 files changed, 37 insertions(+)
 create mode 100644 tests/xfce.nix

diff --git a/release.nix b/release.nix
index fd2f8ea6677..2a5b389c755 100644
--- a/release.nix
+++ b/release.nix
@@ -175,6 +175,7 @@ let
         remote_builds = t.remote_builds.test;
         subversion = t.subversion.report;
         trac = t.trac.test;
+        xfce = t.trac.xfce;
       };
 
   };
diff --git a/tests/default.nix b/tests/default.nix
index d156db58c5c..1e5d1a71848 100644
--- a/tests/default.nix
+++ b/tests/default.nix
@@ -24,4 +24,5 @@ with import ../lib/testing.nix { inherit nixpkgs services system; };
   simple = makeTest (import ./simple.nix);
   subversion = makeTest (import ./subversion.nix);
   trac = makeTest (import ./trac.nix);
+  xfce = makeTest (import ./xfce.nix);
 }
diff --git a/tests/xfce.nix b/tests/xfce.nix
new file mode 100644
index 00000000000..2ebe7a7e5b9
--- /dev/null
+++ b/tests/xfce.nix
@@ -0,0 +1,35 @@
+{ pkgs, ... }:
+
+{
+
+  machine = 
+    { config, pkgs, ... }:
+
+    { services.xserver.enable = true;
+
+      services.xserver.displayManager.auto.enable = true;
+      services.xserver.displayManager.auto.user = "alice";
+      
+      services.xserver.desktopManager.xfce.enable = true;
+
+      users.extraUsers = pkgs.lib.singleton
+        { name = "alice";
+          description = "Alice Foobar";
+          home = "/home/alice";
+          createHome = true;
+          useDefaultShell = true;
+          password = "foobar";
+        };
+    };
+
+  testScript =
+    ''
+      $machine->waitForWindow(qr/Tips/);
+      $machine->sleep(10);
+      $machine->succeed("su - alice -c 'DISPLAY=:0.0 Terminal &'");
+      $machine->waitForWindow(qr/Terminal/);
+      $machine->sleep(10);
+      $machine->screenshot("screen");
+    '';
+  
+}
-- 
GitLab


From ee09d34b5147666e5fc7e2c1315631683ebc63b1 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 14 Mar 2011 08:08:34 +0000
Subject: [PATCH 2904/5331] * Doh.

svn path=/nixos/trunk/; revision=26294
---
 release.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/release.nix b/release.nix
index 2a5b389c755..ca178f1290b 100644
--- a/release.nix
+++ b/release.nix
@@ -175,7 +175,7 @@ let
         remote_builds = t.remote_builds.test;
         subversion = t.subversion.report;
         trac = t.trac.test;
-        xfce = t.trac.xfce;
+        xfce = t.xfce.test;
       };
 
   };
-- 
GitLab


From b1b36ec5105d52cfde6e025a847886916d1588ef Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 15 Mar 2011 07:23:37 +0000
Subject: [PATCH 2905/5331] * KDM seems to die if we call xwininfo while it's
 starting (!).  So   don't do that.

svn path=/nixos/trunk/; revision=26307
---
 tests/kde4.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tests/kde4.nix b/tests/kde4.nix
index dd8b84ff387..56c8acbc8dc 100644
--- a/tests/kde4.nix
+++ b/tests/kde4.nix
@@ -34,6 +34,7 @@
 
   testScript =
     ''
+      $machine->waitUntilSucceeds("pgrep plasma-desktop");
       $machine->waitForWindow(qr/plasma-desktop/);
 
       # Check that logging in has given the user ownership of devices.
-- 
GitLab


From f833492c68c8448c364b46c10175ab5cb8216535 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 15 Mar 2011 09:42:49 +0000
Subject: [PATCH 2906/5331] * Add dnsmasq to libvirtd's PATH.  This is required
 for networking.

svn path=/nixos/trunk/; revision=26313
---
 modules/virtualisation/libvirtd.nix | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/modules/virtualisation/libvirtd.nix b/modules/virtualisation/libvirtd.nix
index b95226f325d..5fdf9731c55 100644
--- a/modules/virtualisation/libvirtd.nix
+++ b/modules/virtualisation/libvirtd.nix
@@ -51,9 +51,14 @@ in
         startOn = "stopped udevtrigger";
 
         path =
-          [ pkgs.bridge_utils pkgs.dmidecode
+          [ pkgs.bridge_utils pkgs.dmidecode pkgs.dnsmasq
           ] ++ optional cfg.enableKVM pkgs.qemu_kvm;
 
+        preStart = 
+          ''
+            mkdir -p /var/log/libvirt/qemu -m 755
+          '';
+
         exec = "${pkgs.libvirt}/sbin/libvirtd --daemon --verbose";
 
         daemonType = "daemon";
-- 
GitLab


From f45866d0e7eba8fcfcdb4f3badbcc879f7511fa7 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 15 Mar 2011 10:52:44 +0000
Subject: [PATCH 2907/5331] * The NAT networking in libvirt requires the "tun"
 module.

svn path=/nixos/trunk/; revision=26314
---
 modules/virtualisation/libvirtd.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/modules/virtualisation/libvirtd.nix b/modules/virtualisation/libvirtd.nix
index 5fdf9731c55..fa3e181248e 100644
--- a/modules/virtualisation/libvirtd.nix
+++ b/modules/virtualisation/libvirtd.nix
@@ -45,6 +45,8 @@ in
 
     environment.systemPackages = [ pkgs.libvirt ];
 
+    boot.kernelModules = [ "tun" ];
+
     jobs.libvirtd =
       { description = "Libvirtd virtual machine management daemon";
 
-- 
GitLab


From 3cb7a54dbafb93cb7f8f0f0b315676b367172466 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 15 Mar 2011 15:13:48 +0000
Subject: [PATCH 2908/5331] * Added an option `networking.bridges' to allow
 Ethernet bridges to be   defined.

svn path=/nixos/trunk/; revision=26325
---
 modules/services/networking/dhclient.nix |  6 ++--
 modules/tasks/network-interfaces.nix     | 44 +++++++++++++++++++++++-
 2 files changed, 47 insertions(+), 3 deletions(-)

diff --git a/modules/services/networking/dhclient.nix b/modules/services/networking/dhclient.nix
index 52612ee403b..dc8b378e875 100644
--- a/modules/services/networking/dhclient.nix
+++ b/modules/services/networking/dhclient.nix
@@ -6,9 +6,11 @@ let
 
   inherit (pkgs) nettools dhcp lib;
 
-  # Don't start dhclient on explicitly configured interfaces.
+  # Don't start dhclient on explicitly configured interfaces or on
+  # interfaces that are part of a bridge.
   ignoredInterfaces = 
-    map (i: i.name) (lib.filter (i: i ? ipAddress && i.ipAddress != "" ) config.networking.interfaces);
+    map (i: i.name) (lib.filter (i: i ? ipAddress && i.ipAddress != "" ) config.networking.interfaces)
+    ++ concatLists (attrValues (mapAttrs (n: v: v.interfaces) config.networking.bridges));
 
   stateDir = "/var/lib/dhcp"; # Don't use /var/state/dhcp; not FHS-compliant.
 
diff --git a/modules/tasks/network-interfaces.nix b/modules/tasks/network-interfaces.nix
index f6343815a95..eb94315b063 100644
--- a/modules/tasks/network-interfaces.nix
+++ b/modules/tasks/network-interfaces.nix
@@ -133,6 +133,36 @@ in
       '';
     };
     
+    networking.bridges = mkOption {
+      default = { };
+      example =
+        { br0.interfaces = [ "eth0" "eth1" ];
+          br1.interfaces = [ "eth2" "wlan0" ];
+        };
+      description =
+        ''
+          This option allows you to define Ethernet bridge devices
+          that connect physical networks together.  The value of this
+          option is an attribute set.  Each attribute specifies a
+          bridge, with the attribute name specifying the name of the
+          bridge's network interface.
+        '';
+
+      type = types.attrsOf types.optionSet;
+
+      options = {
+
+        interfaces = mkOption {
+          example = [ "eth0" "eth1" ];
+          type = types.listOf types.string;
+          description =
+            "The physical network interfaces connected by the bridge.";
+        };
+
+      };
+      
+    };
+
   };
 
 
@@ -149,7 +179,7 @@ in
         pkgs.nettools
         pkgs.wirelesstools
         pkgs.rfkill
-      ];
+      ] ++ optional (cfg.bridges != {}) [ pkgs.bridge_utils ];
 
     security.setuidPrograms = [ "ping" "ping6" ];
     
@@ -204,6 +234,18 @@ in
             # Run any user-specified commands.
             ${pkgs.stdenv.shell} ${pkgs.writeText "local-net-cmds" cfg.localCommands} || true
 
+            # Create bridge devices.
+            ${concatStrings (attrValues (flip mapAttrs cfg.bridges (n: v: ''
+                echo "Creating bridge ${n}..."
+                ${pkgs.bridge_utils}/sbin/brctl addbr "${n}" || true
+                ${flip concatMapStrings v.interfaces (i: ''
+                  ${pkgs.bridge_utils}/sbin/brctl addif "${n}" "${i}" || true
+                  ip addr flush dev "${i}" || true
+                '')}
+                # !!! Should delete (brctl delif) any interfaces that
+                # no longer belong to the bridge.
+            '')))}
+            
             ${optionalString (cfg.interfaces != [] || cfg.localCommands != "") ''
               # Emit the ip-up event (e.g. to start ntpd).
               initctl emit -n ip-up
-- 
GitLab


From f71bd3f93ca15efd4e64c93f35eafc5d2cc95943 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 15 Mar 2011 15:30:12 +0000
Subject: [PATCH 2909/5331] * dhclient: ignore libvirt's network interfaces.

svn path=/nixos/trunk/; revision=26327
---
 modules/services/networking/dhclient.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/modules/services/networking/dhclient.nix b/modules/services/networking/dhclient.nix
index dc8b378e875..2acef81e1e5 100644
--- a/modules/services/networking/dhclient.nix
+++ b/modules/services/networking/dhclient.nix
@@ -82,10 +82,11 @@ in
                 # Only run dhclient on interfaces of type ARPHRD_ETHER
                 # (1), i.e. Ethernet.  Ignore peth* devices; on Xen,
                 # they're renamed physical Ethernet cards used for
-                # bridging.  Likewise for vif* and tap*.
+                # bridging.  Likewise for vif* and tap* (Xen) and
+                # virbr* and vnet* (libvirt). 
                 if [ "$(cat /sys/class/net/$i/type)" = 1 ]; then
                     if ! for j in ${toString ignoredInterfaces}; do echo $j; done | grep -F -x -q "$i" &&
-                       ! echo "$i" | grep -x -q "peth.*\|vif.*\|tap.*";
+                       ! echo "$i" | grep -x -q "peth.*\|vif.*\|tap.*\|virbr.*\|vnet.*";
 		    then
                         echo "Running dhclient on $i"
                         interfaces="$interfaces $i"
-- 
GitLab


From 6646268c95c0168e089d3b496497a5c014ab96f1 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 15 Mar 2011 18:47:56 +0000
Subject: [PATCH 2910/5331] * This should no longer be needed.

svn path=/nixos/trunk/; revision=26331
---
 modules/installer/cd-dvd/installation-cd-graphical.nix | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/modules/installer/cd-dvd/installation-cd-graphical.nix b/modules/installer/cd-dvd/installation-cd-graphical.nix
index 29e01b0e6ae..629167f8aca 100644
--- a/modules/installer/cd-dvd/installation-cd-graphical.nix
+++ b/modules/installer/cd-dvd/installation-cd-graphical.nix
@@ -11,13 +11,4 @@
 
   # Provide wicd for easy wireless configuration.
   networking.wicd.enable = true;
-
-  # Disable compositing for now.  It seems to cause problems with KDE
-  # 4.5 on some graphics drivers (such as Cirrus and VGA in QEMU).
-  services.xserver.config =
-    ''
-      Section "Extensions"
-        Option "Composite" "Disable"
-      EndSection
-    '';
 }
-- 
GitLab


From 8add65502865246905c7cbf2cc5a4d68e929c193 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 16 Mar 2011 12:31:06 +0000
Subject: [PATCH 2911/5331] * Add qemu_kvm to the system path.

svn path=/nixos/trunk/; revision=26359
---
 modules/virtualisation/libvirtd.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/modules/virtualisation/libvirtd.nix b/modules/virtualisation/libvirtd.nix
index fa3e181248e..9aacd02f95a 100644
--- a/modules/virtualisation/libvirtd.nix
+++ b/modules/virtualisation/libvirtd.nix
@@ -43,7 +43,9 @@ in
 
   config = mkIf cfg.enable {
 
-    environment.systemPackages = [ pkgs.libvirt ];
+    environment.systemPackages = 
+      [ pkgs.libvirt ]
+       ++ optional cfg.enableKVM pkgs.qemu_kvm;
 
     boot.kernelModules = [ "tun" ];
 
-- 
GitLab


From a19849914a8f54b7be1201daaee8a46a027546fd Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 16 Mar 2011 13:52:52 +0000
Subject: [PATCH 2912/5331] * libvirtd: Remove the pid on startup.  If it
 exists, libvirtd   tends to segfault.

svn path=/nixos/trunk/; revision=26365
---
 modules/virtualisation/libvirtd.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/modules/virtualisation/libvirtd.nix b/modules/virtualisation/libvirtd.nix
index 9aacd02f95a..5d82bf1e07a 100644
--- a/modules/virtualisation/libvirtd.nix
+++ b/modules/virtualisation/libvirtd.nix
@@ -61,6 +61,7 @@ in
         preStart = 
           ''
             mkdir -p /var/log/libvirt/qemu -m 755
+            rm -f /var/run/libvirtd.pid
           '';
 
         exec = "${pkgs.libvirt}/sbin/libvirtd --daemon --verbose";
-- 
GitLab


From 6ee609a0a3155afb85efd4909e7bdbf044c17c75 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 16 Mar 2011 15:17:54 +0000
Subject: [PATCH 2913/5331] * On the installation CD, set the overcommit
 heuristic to "always   overcommit".  This makes it less likely that the
 installer fails   randomly in low memory environments.

svn path=/nixos/trunk/; revision=26369
---
 modules/installer/cd-dvd/installation-cd-base.nix | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/modules/installer/cd-dvd/installation-cd-base.nix b/modules/installer/cd-dvd/installation-cd-base.nix
index f4aa5c5451d..e3a458cb92c 100644
--- a/modules/installer/cd-dvd/installation-cd-base.nix
+++ b/modules/installer/cd-dvd/installation-cd-base.nix
@@ -57,6 +57,13 @@ in
         tar xjf ${nixpkgsTarball}/nixpkgs.tar.bz2 -C /etc/nixos/nixpkgs
         chown -R root.root /etc/nixos
      ''}
+
+     # Make the installer more likely to succeed in low memory
+     # environments.  The kernel's overcommit heustistics bite us
+     # fairly often, preventing processes such as nix-worker or
+     # download-using-manifests.pl from forking even if there is
+     # plenty of free memory.
+     echo 1 > /proc/sys/vm/overcommit_memory
     '';
 
   # To speed up installation a little bit, include the complete stdenv
-- 
GitLab


From c52aeacf1ade6897501920e9928ac69741010da9 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 17 Mar 2011 14:04:47 +0000
Subject: [PATCH 2914/5331] * Factor out some test commonality.

svn path=/nixos/trunk/; revision=26394
---
 tests/common/user-account.nix | 11 +++++++++++
 tests/kde4.nix                | 13 +++----------
 tests/xfce.nix                | 13 +++----------
 3 files changed, 17 insertions(+), 20 deletions(-)
 create mode 100644 tests/common/user-account.nix

diff --git a/tests/common/user-account.nix b/tests/common/user-account.nix
new file mode 100644
index 00000000000..8157cf8d263
--- /dev/null
+++ b/tests/common/user-account.nix
@@ -0,0 +1,11 @@
+{ pkgs, ... }:
+
+{ users.extraUsers = pkgs.lib.singleton
+    { name = "alice";
+      description = "Alice Foobar";
+      home = "/home/alice";
+      createHome = true;
+      useDefaultShell = true;
+      password = "foobar";
+    };
+}
diff --git a/tests/kde4.nix b/tests/kde4.nix
index 56c8acbc8dc..ff75758429d 100644
--- a/tests/kde4.nix
+++ b/tests/kde4.nix
@@ -5,7 +5,9 @@
   machine = 
     { config, pkgs, ... }:
 
-    { services.xserver.enable = true;
+    { require = [ ./common/user-account.nix ];
+
+      services.xserver.enable = true;
 
       services.httpd.enable = true;
       services.httpd.adminAddr = "foo@example.org";
@@ -21,15 +23,6 @@
         '';
 
       services.xserver.desktopManager.kde4.enable = true;
-
-      users.extraUsers = pkgs.lib.singleton
-        { name = "alice";
-          description = "Alice Foobar";
-          home = "/home/alice";
-          createHome = true;
-          useDefaultShell = true;
-          password = "foobar";
-        };
     };
 
   testScript =
diff --git a/tests/xfce.nix b/tests/xfce.nix
index 2ebe7a7e5b9..3d0a6f7ee12 100644
--- a/tests/xfce.nix
+++ b/tests/xfce.nix
@@ -5,21 +5,14 @@
   machine = 
     { config, pkgs, ... }:
 
-    { services.xserver.enable = true;
+    { require = [ ./common/user-account.nix ];
+
+      services.xserver.enable = true;
 
       services.xserver.displayManager.auto.enable = true;
       services.xserver.displayManager.auto.user = "alice";
       
       services.xserver.desktopManager.xfce.enable = true;
-
-      users.extraUsers = pkgs.lib.singleton
-        { name = "alice";
-          description = "Alice Foobar";
-          home = "/home/alice";
-          createHome = true;
-          useDefaultShell = true;
-          password = "foobar";
-        };
     };
 
   testScript =
-- 
GitLab


From be0fca57810cf2c342dc15d0f034622fde8c3684 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 18 Mar 2011 12:38:22 +0000
Subject: [PATCH 2915/5331] * Use QEMU/KVM's paravirtualised console device for
 the backdoor.   This has the advantage that it doesn't depend on networking
 being   up. * Move common QEMU/KVM guest configuration to
 profiles/qemu-guest.nix.

svn path=/nixos/trunk/; revision=26421
---
 lib/test-driver/Machine.pm               |  2 +-
 modules/profiles/qemu-guest.nix          |  8 ++++++++
 modules/testing/test-instrumentation.nix | 11 +++++------
 modules/virtualisation/qemu-vm.nix       |  4 ++--
 4 files changed, 16 insertions(+), 9 deletions(-)
 create mode 100644 modules/profiles/qemu-guest.nix

diff --git a/lib/test-driver/Machine.pm b/lib/test-driver/Machine.pm
index 49e5fd767ee..4f8dcf441a8 100644
--- a/lib/test-driver/Machine.pm
+++ b/lib/test-driver/Machine.pm
@@ -125,8 +125,8 @@ sub start {
         $ENV{USE_TMPDIR} = 1;
         $ENV{QEMU_OPTS} =
             "-no-reboot -monitor unix:./monitor -chardev socket,id=shell,path=./shell " .
+            "-device virtio-serial -device virtconsole,chardev=shell " .
             ($showGraphics ? "-serial stdio" : "-nographic");
-        $ENV{QEMU_NET_OPTS} = "guestfwd=tcp:10.0.2.6:23-chardev:shell";
         $ENV{QEMU_KERNEL_PARAMS} = "hostTmpDir=$ENV{TMPDIR}";
         chdir $self->{stateDir} or die;
         exec $self->{startCommand};
diff --git a/modules/profiles/qemu-guest.nix b/modules/profiles/qemu-guest.nix
new file mode 100644
index 00000000000..60a52ce6e12
--- /dev/null
+++ b/modules/profiles/qemu-guest.nix
@@ -0,0 +1,8 @@
+# Common configuration for virtual machines running under QEMU (using
+# virtio).
+
+{ config, pkgs, ... }:
+
+{
+  boot.initrd.kernelModules = [ "virtio_net" "virtio_pci" "virtio_blk" "virtio_balloon" "virtio_console" ];
+}
diff --git a/modules/testing/test-instrumentation.nix b/modules/testing/test-instrumentation.nix
index 78ce250675d..6a9e2aee293 100644
--- a/modules/testing/test-instrumentation.nix
+++ b/modules/testing/test-instrumentation.nix
@@ -24,10 +24,7 @@ in
   config = {
 
     jobs.backdoor =
-      { # If the firewall is enabled, this job must start *after* the
-        # firewall, otherwise connection tracking won't know about
-        # this connection.
-        startOn = if config.networking.firewall.enable then "started firewall" else "ip-up";
+      { startOn = "startup";
         stopOn = "never";
         
         script =
@@ -37,8 +34,10 @@ in
             export DISPLAY=:0.0
             source /etc/profile
             cd /tmp
-            echo "connecting to host..." > /dev/ttyS0
-            ${pkgs.socat}/bin/socat tcp:10.0.2.6:23 exec:${rootShell} 2> /dev/ttyS0 # || poweroff -f
+            exec < /dev/hvc0 > /dev/hvc0 2> /dev/ttyS0
+            echo "connecting to host..." >&2
+            stty -F /dev/hvc0 raw # prevent nl -> cr/nl conversion
+            ${pkgs.socat}/bin/socat stdio exec:${rootShell}
           '';
 
         respawn = false;
diff --git a/modules/virtualisation/qemu-vm.nix b/modules/virtualisation/qemu-vm.nix
index 44d6a999d44..efa37146f21 100644
--- a/modules/virtualisation/qemu-vm.nix
+++ b/modules/virtualisation/qemu-vm.nix
@@ -228,7 +228,7 @@ let
 in
 
 {
-  require = options;
+  require = [ options ../profiles/qemu-guest.nix ];
 
   boot.loader.grub.device = mkOverride 50 "/dev/vda";
   
@@ -236,7 +236,7 @@ in
   # CIFS.  Also use paravirtualised network and block devices for
   # performance.
   boot.initrd.availableKernelModules =
-    [ "cifs" "virtio_net" "virtio_pci" "virtio_blk" "virtio_balloon" "nls_utf8" ]
+    [ "cifs" "nls_utf8" ]
     ++ optional cfg.writableStore [ "aufs" ];
 
   boot.extraModulePackages =
-- 
GitLab


From ef07a945c4f5fcbd0b67188244b71c550412a2d8 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 18 Mar 2011 13:16:40 +0000
Subject: [PATCH 2916/5331] * Don't echo characters on /dev/hvc0, otherwise the
 stdout of commands   gets screwed up.

svn path=/nixos/trunk/; revision=26422
---
 modules/testing/test-instrumentation.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/testing/test-instrumentation.nix b/modules/testing/test-instrumentation.nix
index 6a9e2aee293..4834df5f252 100644
--- a/modules/testing/test-instrumentation.nix
+++ b/modules/testing/test-instrumentation.nix
@@ -36,7 +36,7 @@ in
             cd /tmp
             exec < /dev/hvc0 > /dev/hvc0 2> /dev/ttyS0
             echo "connecting to host..." >&2
-            stty -F /dev/hvc0 raw # prevent nl -> cr/nl conversion
+            stty -F /dev/hvc0 raw -echo # prevent nl -> cr/nl conversion
             ${pkgs.socat}/bin/socat stdio exec:${rootShell}
           '';
 
-- 
GitLab


From 6c55079ab05ea53a4cfa35e6c2390b461ec51cd7 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 18 Mar 2011 13:52:09 +0000
Subject: [PATCH 2917/5331] * nixos-hardware-scan: It's not necessary to detect
 Intel graphics   cards because the default X config contains the Intel
 driver.   Likewise, there is no need for the "vesa" default. *
 nixos-hardware-scan: Clean up the output a bit.

svn path=/nixos/trunk/; revision=26423
---
 .../installer/tools/nixos-hardware-scan.pl    | 43 ++++++-------------
 1 file changed, 12 insertions(+), 31 deletions(-)

diff --git a/modules/installer/tools/nixos-hardware-scan.pl b/modules/installer/tools/nixos-hardware-scan.pl
index eede139f40d..5187068e069 100644
--- a/modules/installer/tools/nixos-hardware-scan.pl
+++ b/modules/installer/tools/nixos-hardware-scan.pl
@@ -58,7 +58,7 @@ push @kernelModules, "kvm-amd" if hasCPUFeature "svm";
 # modules are auto-detected so we don't need to list them here.
 # However, some are needed in the initrd to boot the system.
 
-my $videoDriver = "vesa";
+my $videoDriver;
 
 sub pciCheck {
     my $path = shift;
@@ -120,27 +120,6 @@ sub pciCheck {
         ($device eq "0x4229" || $device eq "0x4230" ||
          $device eq "0x4222" || $device eq "0x4227");
 
-    # Hm, can we extract the PCI ids supported by X drivers somehow?
-    # cf. http://www.calel.org/pci-devices/xorg-device-list.html
-    $videoDriver = "intel" if $vendor eq "0x8086" &&
-        ($device eq "0x1132" ||
-         $device eq "0x2572" ||
-         $device eq "0x2592" ||
-         $device eq "0x2772" ||
-         $device eq "0x2776" ||
-         $device eq "0x2782" ||
-         $device eq "0x2792" ||
-         $device eq "0x2792" ||
-         $device eq "0x27a2" ||
-         $device eq "0x27a6" ||
-         $device eq "0x29a2" ||
-         $device eq "0x3582" ||
-         $device eq "0x7121" ||
-         $device eq "0x7123" ||
-         $device eq "0x7125" ||
-         $device eq "0x7128"
-        );
-
     # Assume that all NVIDIA cards are supported by the NVIDIA driver.
     # There may be exceptions (e.g. old cards).
     $videoDriver = "nvidia" if $vendor eq "0x10de" && $class =~ /^0x03/;
@@ -202,6 +181,11 @@ foreach my $path (glob "/sys/class/block/*") {
 }
 
 
+if ($videoDriver) {
+    push @attrs, "services.xserver.videoDrivers = [ \"$videoDriver\" ];";
+}
+
+
 # Generate the configuration file.
 
 sub removeDups {
@@ -227,10 +211,10 @@ sub toNixExpr {
 sub multiLineList {
     my $indent = shift;
     my $res = "";
+    $res = "\n" if scalar @_ > 0;
     foreach my $s (@_) {
-        $res .= "\n$indent$s";
+        $res .= "$indent$s\n";
     }
-    $res .= "\n$indent";
     return $res;
 }
 
@@ -250,13 +234,10 @@ print <<EOF ;
     "\${modulesPath}/installer/scan/not-detected.nix"
   ];
 
-  boot.initrd.kernelModules = [ $initrdKernelModules ];
-  boot.kernelModules = [ $kernelModules ];
-  boot.extraModulePackages = [ $modulePackages ];
+  boot.initrd.kernelModules = [$initrdKernelModules ];
+  boot.kernelModules = [$kernelModules ];
+  boot.extraModulePackages = [$modulePackages ];
 
   nix.maxJobs = $cpus;
-
-  services.xserver.videoDriver = "$videoDriver";
-  $attrs
-}
+$attrs}
 EOF
-- 
GitLab


From c430bf5cc304945f152be81efd0a59ef28353388 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sat, 19 Mar 2011 08:58:56 +0000
Subject: [PATCH 2918/5331] * Add virtio_console to the CD because the backdoor
 requires it. * The booted CD no longer requires "-net user".

svn path=/nixos/trunk/; revision=26427
---
 lib/test-driver/Machine.pm |  2 +-
 modules/profiles/base.nix  |  2 +-
 tests/installer.nix        | 13 +++----------
 3 files changed, 5 insertions(+), 12 deletions(-)

diff --git a/lib/test-driver/Machine.pm b/lib/test-driver/Machine.pm
index 4f8dcf441a8..919ab7c0764 100644
--- a/lib/test-driver/Machine.pm
+++ b/lib/test-driver/Machine.pm
@@ -28,7 +28,7 @@ sub new {
         # !!! merge with qemu-vm.nix.
         $startCommand =
             "qemu-system-x86_64 -m 384 " .
-            "-net nic,model=virtio -net user,\$QEMU_NET_OPTS \$QEMU_OPTS ";
+            "-net nic,model=virtio \$QEMU_OPTS ";
         $startCommand .= "-drive file=" . Cwd::abs_path($args->{hda}) . ",if=virtio,boot=on,werror=report "
             if defined $args->{hda};
         $startCommand .= "-cdrom $args->{cdrom} "
diff --git a/modules/profiles/base.nix b/modules/profiles/base.nix
index 68456e81f54..e8c583f7693 100644
--- a/modules/profiles/base.nix
+++ b/modules/profiles/base.nix
@@ -35,7 +35,7 @@
       "ohci1394" "sbp2"
 
       # Virtio (QEMU, KVM etc.) support.
-      "virtio_net" "virtio_pci" "virtio_blk" "virtio_balloon"
+      "virtio_net" "virtio_pci" "virtio_blk" "virtio_balloon" "virtio_console"
 
       # Add vfat to enable people to copy the contents of the CD to a
       # bootable USB stick.
diff --git a/tests/installer.nix b/tests/installer.nix
index 759bd3e2068..bc88c7c68a4 100644
--- a/tests/installer.nix
+++ b/tests/installer.nix
@@ -41,7 +41,7 @@ let
         boot.loader.grub.version = 2;
         boot.loader.grub.device = "/dev/vda";
         boot.loader.grub.extraConfig = "serial; terminal_output.serial";
-        boot.initrd.kernelModules = [ "ext3" ];
+        boot.initrd.kernelModules = [ "ext3" "virtio_console" ];
       
         fileSystems = [ ${fileSystems} ];
         swapDevices = [ { label = "swap"; } ];
@@ -114,10 +114,7 @@ let
       $machine->waitForJob("tty1");
       $machine->waitForJob("rogue");
       $machine->waitForJob("nixos-manual");
-
-      # Make sure that we don't try to download anything.
-      $machine->stopJob("dhclient");
-      $machine->mustSucceed("rm /etc/resolv.conf");
+      $machine->waitForJob("dhclient");
 
       ${optionalString testChannel ''
         # Allow the machine to talk to the fake nixos.org.
@@ -183,7 +180,7 @@ let
       # And just to be sure, check that the machine still boots after
       # "nixos-rebuild switch".
       my $machine = createMachine({ hda => "harddisk" });
-      $machine->mustSucceed("echo hello");
+      $machine->waitForJob("network-interfaces");
       $machine->shutdown;
     '';
 
@@ -308,10 +305,6 @@ in {
           my $machine = createMachine({ cdrom => glob("${iso}/iso/*.iso"), qemuFlags => '-m 1024' });
           $machine->start;
 
-          # Make sure that we don't try to download anything.
-          $machine->stopJob("dhclient");
-          $machine->mustSucceed("rm /etc/resolv.conf");
-
           # Enable sshd service.
           $machine->mustSucceed(
             "sed -i 's,^}\$,jobs.sshd.startOn = pkgs.lib.mkOverride 0 \"startup\"; },' /etc/nixos/configuration.nix"
-- 
GitLab


From f10376611e1f98348f33858dae07e24f63cfbeb9 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 21 Mar 2011 13:01:23 +0000
Subject: [PATCH 2919/5331] * Fix the Avahi test: the start condition for the
 backdoor changed, so   it's now necessary to wait until networking is up. 
 Also, don't   print to stderr.

svn path=/nixos/trunk/; revision=26441
---
 tests/avahi.nix | 31 +++++++++++++------------------
 1 file changed, 13 insertions(+), 18 deletions(-)

diff --git a/tests/avahi.nix b/tests/avahi.nix
index 9aac6fe2d21..d29e0ff77c6 100644
--- a/tests/avahi.nix
+++ b/tests/avahi.nix
@@ -22,39 +22,34 @@ with pkgs;
     '' startAll;
 
        # mDNS.
-       print STDERR
-        $one->mustSucceed("avahi-resolve-host-name one.local | tee out");
+       $one->waitForJob("network-interfaces");
+       $one->mustSucceed("avahi-resolve-host-name one.local | tee out >&2");
        $one->mustSucceed("test \"`cut -f1 < out`\" = one.local");
-       print STDERR
-        $one->mustSucceed("avahi-resolve-host-name two.local | tee out");
+       $one->mustSucceed("avahi-resolve-host-name two.local | tee out >&2");
        $one->mustSucceed("test \"`cut -f1 < out`\" = two.local");
 
-       print STDERR
-        $two->mustSucceed("avahi-resolve-host-name one.local | tee out");
+       $two->waitForJob("network-interfaces");
+       $two->mustSucceed("avahi-resolve-host-name one.local | tee out >&2");
        $two->mustSucceed("test \"`cut -f1 < out`\" = one.local");
-       print STDERR
-        $two->mustSucceed("avahi-resolve-host-name two.local | tee out");
+       $two->mustSucceed("avahi-resolve-host-name two.local | tee out >&2");
        $two->mustSucceed("test \"`cut -f1 < out`\" = two.local");
 
        # Basic DNS-SD.
-       print STDERR
-        $one->mustSucceed("avahi-browse -r -t _workstation._tcp | tee out");
+       $one->mustSucceed("avahi-browse -r -t _workstation._tcp | tee out >&2");
        $one->mustSucceed("test `wc -l < out` -gt 0");
-       print STDERR
-        $two->mustSucceed("avahi-browse -r -t _workstation._tcp | tee out");
+       $two->mustSucceed("avahi-browse -r -t _workstation._tcp | tee out >&2");
        $two->mustSucceed("test `wc -l < out` -gt 0");
 
        # More DNS-SD.
        $one->execute("avahi-publish -s \"This is a test\" _test._tcp 123 one=1 &");
        $one->sleep(5);
-       print STDERR
-        $two->mustSucceed("avahi-browse -r -t _test._tcp | tee out");
+       $two->mustSucceed("avahi-browse -r -t _test._tcp | tee out >&2");
        $two->mustSucceed("test `wc -l < out` -gt 0");
 
        # NSS-mDNS.
-       print STDERR $one->mustSucceed("getent hosts one.local");
-       print STDERR $one->mustSucceed("getent hosts two.local");
-       print STDERR $two->mustSucceed("getent hosts one.local");
-       print STDERR $two->mustSucceed("getent hosts two.local");
+       $one->mustSucceed("getent hosts one.local >&2");
+       $one->mustSucceed("getent hosts two.local >&2");
+       $two->mustSucceed("getent hosts one.local >&2");
+       $two->mustSucceed("getent hosts two.local >&2");
     '';
 }
-- 
GitLab


From 69c4a662deca38057b69944f1fb9cefac21c895b Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 21 Mar 2011 13:14:50 +0000
Subject: [PATCH 2920/5331] * Fix the Bittorrent test.

svn path=/nixos/trunk/; revision=26443
---
 tests/bittorrent.nix | 37 ++++++++++++++++++++-----------------
 1 file changed, 20 insertions(+), 17 deletions(-)

diff --git a/tests/bittorrent.nix b/tests/bittorrent.nix
index 7fbace9d41b..dce8e3b3725 100644
--- a/tests/bittorrent.nix
+++ b/tests/bittorrent.nix
@@ -37,8 +37,11 @@ in
 
       router = 
         { config, pkgs, ... }:
-        { environment.systemPackages = [ pkgs.iptables pkgs.miniupnpd ];
+        { environment.systemPackages = [ pkgs.miniupnpd ];
           virtualisation.vlans = [ 1 2 ];
+          networking.nat.enable = true;
+          networking.nat.internalIPs = "192.168.2.0/24";
+          networking.nat.externalInterface = "eth1";
         };
 
       client1 = 
@@ -61,11 +64,8 @@ in
       startAll;
 
       # Enable NAT on the router and start miniupnpd.
-      $router->mustSucceed(
-          "iptables -t nat -F",
-          "iptables -t nat -A POSTROUTING -s 192.168.2.0/24 -d 192.168.2.0/24 -j ACCEPT",
-          "iptables -t nat -A POSTROUTING -s 192.168.2.0/24 -j SNAT "
-          . "--to-source ${nodes.router.config.networking.ifaces.eth1.ipAddress}",
+      $router->waitForJob("nat");
+      $router->succeed(
           "iptables -t nat -N MINIUPNPD",
           "iptables -t nat -A PREROUTING -i eth1 -j MINIUPNPD",
           "echo 1 > /proc/sys/net/ipv4/ip_forward",
@@ -73,32 +73,35 @@ in
       );
 
       # Create the torrent.
-      $tracker->mustSucceed("mkdir /tmp/data");
-      $tracker->mustSucceed("cp ${file} /tmp/data/test.tar.bz2");
-      $tracker->mustSucceed("transmission-create /tmp/data/test.tar.bz2 -t http://tracker:6969/announce -o /tmp/test.torrent");
-      $tracker->mustSucceed("chmod 644 /tmp/test.torrent");
+      $tracker->succeed("mkdir /tmp/data");
+      $tracker->succeed("cp ${file} /tmp/data/test.tar.bz2");
+      $tracker->succeed("transmission-create /tmp/data/test.tar.bz2 -t http://tracker:6969/announce -o /tmp/test.torrent");
+      $tracker->succeed("chmod 644 /tmp/test.torrent");
 
       # Start the tracker.  !!! use a less crappy tracker
-      $tracker->mustSucceed("bittorrent-tracker --port 6969 --dfile /tmp/dstate >&2 &");
+      $tracker->waitForJob("network-interfaces");
+      $tracker->succeed("bittorrent-tracker --port 6969 --dfile /tmp/dstate >&2 &");
       $tracker->waitForOpenPort(6969);
 
       # Start the initial seeder.
-      my $pid = $tracker->mustSucceed("transmission-cli /tmp/test.torrent -M -w /tmp/data >&2 & echo \$!");
+      my $pid = $tracker->succeed("transmission-cli /tmp/test.torrent -M -w /tmp/data >&2 & echo \$!");
 
       # Now we should be able to download from the client behind the NAT.
       $tracker->waitForJob("httpd");
-      $client1->mustSucceed("transmission-cli http://tracker/test.torrent -w /tmp >&2 &");
+      $client1->waitForJob("network-interfaces");
+      $client1->succeed("transmission-cli http://tracker/test.torrent -w /tmp >&2 &");
       $client1->waitForFile("/tmp/test.tar.bz2");
-      $client1->mustSucceed("cmp /tmp/test.tar.bz2 ${file}");
+      $client1->succeed("cmp /tmp/test.tar.bz2 ${file}");
 
       # Bring down the initial seeder.
-      $tracker->mustSucceed("kill -9 $pid");
+      $tracker->succeed("kill -9 $pid");
 
       # Now download from the second client.  This can only succeed if
       # the first client created a NAT hole in the router.
-      $client2->mustSucceed("transmission-cli http://tracker/test.torrent -M -w /tmp >&2 &");
+      $client2->waitForJob("network-interfaces");
+      $client2->succeed("transmission-cli http://tracker/test.torrent -M -w /tmp >&2 &");
       $client2->waitForFile("/tmp/test.tar.bz2");
-      $client2->mustSucceed("cmp /tmp/test.tar.bz2 ${file}");
+      $client2->succeed("cmp /tmp/test.tar.bz2 ${file}");
     '';
   
 }
-- 
GitLab


From b2d6dfecbcbf9e518322eab7d88bfaeb7f776184 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 24 Mar 2011 16:23:28 +0000
Subject: [PATCH 2921/5331] * Add the rdnss daemon. * Add the ndisc6 package to
 the system path if IPv6 is enabled.

svn path=/nixos/trunk/; revision=26496
---
 modules/module-list.nix                |  1 +
 modules/services/networking/rdnssd.nix | 47 ++++++++++++++++++++++++++
 modules/tasks/network-interfaces.nix   |  4 ++-
 3 files changed, 51 insertions(+), 1 deletion(-)
 create mode 100644 modules/services/networking/rdnssd.nix

diff --git a/modules/module-list.nix b/modules/module-list.nix
index 453d09653fb..56ada293a01 100644
--- a/modules/module-list.nix
+++ b/modules/module-list.nix
@@ -107,6 +107,7 @@
   ./services/networking/privoxy.nix
   ./services/networking/quassel.nix
   ./services/networking/radvd.nix
+  ./services/networking/rdnssd.nix
   ./services/networking/sabnzbd.nix
   ./services/networking/ssh/lshd.nix
   ./services/networking/ssh/sshd.nix
diff --git a/modules/services/networking/rdnssd.nix b/modules/services/networking/rdnssd.nix
new file mode 100644
index 00000000000..422070f2106
--- /dev/null
+++ b/modules/services/networking/rdnssd.nix
@@ -0,0 +1,47 @@
+# Module for rdnssd, a daemon that configures DNS servers in
+# /etc/resolv/conf from IPv6 RDNSS advertisements.
+
+{ config, pkgs, ... }:
+
+with pkgs.lib;
+
+{
+
+  ###### interface
+
+  options = {
+  
+    services.rdnssd.enable = mkOption {
+      default = config.networking.enableIPv6;
+      description =
+        ''
+          Whether to enable the RDNSS daemon
+          (<command>rdnssd</command>), which configures DNS servers in
+          <filename>/etc/resolv.conf</filename> from RDNSS
+          advertisements sent by IPv6 routers.
+        '';
+    };
+
+  };
+
+
+  ###### implementation
+
+  config = mkIf config.services.rdnssd.enable {
+
+    jobs.rdnssd =
+      { description = "RDNSS daemon";
+      
+        # Start before the network interfaces are brought up so that
+        # the daemon receives RDNSS advertisements from the kernel.
+        startOn = "starting network-interfaces";
+
+        # !!! Should write to /var/run/rdnssd/resolv.conf and run the daemon under another uid.
+        exec = "${pkgs.ndisc6}/sbin/rdnssd --resolv-file /etc/resolv.conf -u root";
+
+        daemonType = "fork";
+      };
+
+  };
+  
+}
diff --git a/modules/tasks/network-interfaces.nix b/modules/tasks/network-interfaces.nix
index eb94315b063..ac98e385ce1 100644
--- a/modules/tasks/network-interfaces.nix
+++ b/modules/tasks/network-interfaces.nix
@@ -179,7 +179,9 @@ in
         pkgs.nettools
         pkgs.wirelesstools
         pkgs.rfkill
-      ] ++ optional (cfg.bridges != {}) [ pkgs.bridge_utils ];
+      ] 
+      ++ optional (cfg.bridges != {}) pkgs.bridge_utils
+      ++ optional cfg.enableIPv6 pkgs.ndisc6;
 
     security.setuidPrograms = [ "ping" "ping6" ];
     
-- 
GitLab


From 87a2c6d9c5b8fcab36ce0a43f0aa71b790c4fa81 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 25 Mar 2011 09:29:22 +0000
Subject: [PATCH 2922/5331] * Don't enable rdnssd by default for the moment.

svn path=/nixos/trunk/; revision=26505
---
 modules/services/networking/rdnssd.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/modules/services/networking/rdnssd.nix b/modules/services/networking/rdnssd.nix
index 422070f2106..11017b8e250 100644
--- a/modules/services/networking/rdnssd.nix
+++ b/modules/services/networking/rdnssd.nix
@@ -12,7 +12,8 @@ with pkgs.lib;
   options = {
   
     services.rdnssd.enable = mkOption {
-      default = config.networking.enableIPv6;
+      default = false;
+      #default = config.networking.enableIPv6;
       description =
         ''
           Whether to enable the RDNSS daemon
-- 
GitLab


From 96fc9379bab8430c234f87ca81404a7a82a47f5e Mon Sep 17 00:00:00 2001
From: Nicolas Pierron <nicolas.b.pierron@gmail.com>
Date: Wed, 30 Mar 2011 17:52:34 +0000
Subject: [PATCH 2923/5331] Convert assertion option into mkAssert.

svn path=/nixos/trunk/; revision=26614
---
 .../network-filesystems/nfs-kernel.nix        | 13 ++++---
 modules/services/networking/openfire.nix      | 12 +++----
 modules/services/security/tor.nix             | 12 +++----
 modules/services/x11/xfs.nix                  | 12 +++----
 modules/services/x11/xserver.nix              | 34 ++++++++-----------
 modules/tasks/tty-backgrounds.nix             | 14 ++++----
 modules/testing/test-instrumentation.nix      | 13 +++----
 7 files changed, 47 insertions(+), 63 deletions(-)

diff --git a/modules/services/network-filesystems/nfs-kernel.nix b/modules/services/network-filesystems/nfs-kernel.nix
index 290622b0997..bc828d5bbb8 100644
--- a/modules/services/network-filesystems/nfs-kernel.nix
+++ b/modules/services/network-filesystems/nfs-kernel.nix
@@ -74,14 +74,13 @@ in
 
   ###### implementation
 
-  config = {
+  config =
+  mkAssert
+    (cfg.client.enable || cfg.server.enable -> config.services.portmap.enable) "
+    Please enable portmap (services.portmap.enable) to use nfs-kernel.
+  " {
 
-    services.portmap.enable = cfg.client.enable || cfg.server.enable;
-    
-    assertions = mkIf (cfg.client.enable || cfg.server.enable) (singleton
-      { assertion = cfg.client.enable || cfg.server.enable;
-        message = "Please enable portmap (services.portmap.enable) to use nfs-kernel.";
-      });
+    services.portmap.enable = mkAlways (cfg.client.enable || cfg.server.enable);
 
     environment.etc = mkIf cfg.server.enable (singleton
       { source = exports;
diff --git a/modules/services/networking/openfire.nix b/modules/services/networking/openfire.nix
index a46b4fa4294..02e6b4c9aaa 100644
--- a/modules/services/networking/openfire.nix
+++ b/modules/services/networking/openfire.nix
@@ -42,12 +42,10 @@ in
 
   ###### implementation
 
-  config = mkIf config.services.openfire.enable {
-
-    assertions = singleton
-      { assertion = !(config.services.openfire.usePostgreSQL -> config.services.postgresql.enable);
-        message = "openfire assertion failed";
-      };
+  config = mkIf config.services.openfire.enable (
+  mkAssert (!(config.services.openfire.usePostgreSQL -> config.services.postgresql.enable)) "
+    openfire assertion failed
+  " {
 
     jobs.openfire =
       { description = "OpenFire XMPP server";
@@ -69,6 +67,6 @@ in
           ''; # */
       };
 
-  };
+  });
   
 }
diff --git a/modules/services/security/tor.nix b/modules/services/security/tor.nix
index 65b7abafd6a..6e1b2838ead 100644
--- a/modules/services/security/tor.nix
+++ b/modules/services/security/tor.nix
@@ -218,12 +218,10 @@ in
 
   ###### implementation
 
-  config = mkIf (cfg.client.enable || cfg.relay.enable) {
-
-    assertions = [ {
-      assertion = cfg.relay.enable -> !(cfg.relay.isBridge && cfg.relay.isExit);
-      message = "Can't be both an exit and a bridge relay at the same time";
-    } ];
+  config = mkIf (cfg.client.enable || cfg.relay.enable) (
+  mkAssert (cfg.relay.enable -> !(cfg.relay.isBridge && cfg.relay.isExit)) "
+    Can't be both an exit and a bridge relay at the same time
+  " {
 
     users.extraUsers = singleton
       { name = torUser;
@@ -308,6 +306,6 @@ in
         # Extra config goes here
       '';
      
-  };
+  });
   
 }
diff --git a/modules/services/x11/xfs.nix b/modules/services/x11/xfs.nix
index f2b7108debc..424e386b78b 100644
--- a/modules/services/x11/xfs.nix
+++ b/modules/services/x11/xfs.nix
@@ -33,12 +33,10 @@ in
 
   ###### implementation
 
-  config = mkIf config.services.xfs.enable {
-
-    assertions = singleton
-      { assertion = config.fonts.enableFontDir;
-        message = "Please enable fontDir (fonts.enableFontDir) to use xfs.";
-      };
+  config = mkIf config.services.xfs.enable (
+  mkAssert config.fonts.enableFontDir "
+    Please enable fontDir (fonts.enableFontDir) to use xfs.
+  " {
 
     jobs.xfs =
       { description = "X Font Server";
@@ -48,6 +46,6 @@ in
         exec = "${pkgs.xorg.xfs}/bin/xfs -config ${configFile}";
       };
 
-  };
+  });
   
 }
diff --git a/modules/services/x11/xserver.nix b/modules/services/x11/xserver.nix
index 02e15c0343b..0eb19fc9455 100644
--- a/modules/services/x11/xserver.nix
+++ b/modules/services/x11/xserver.nix
@@ -328,23 +328,18 @@ in
 
   ###### implementation
 
-  config = mkIf cfg.enable {
-
-    assertions =
-      [ { assertion = config.services.hal.enable == true;
-          message = "The X server needs HAL running. Set services.hal.enable to true";
-        }
-
-        { assertion = if cfg.startOpenSSHAgent
-                      then !cfg.startGnuPGAgent
-                      else (if cfg.startGnuPGAgent
-                            then !cfg.startOpenSSHAgent
-                            else true);
-          message =
-            "The OpenSSH agent and GnuPG agent cannot be started both.  " +
-            "Choose between `startOpenSSHAgent' and `startGnuPGAgent'.";
-        }
-      ];
+  config = mkIf cfg.enable (
+  mkAssert (config.services.hal.enable == true) "
+    The X server needs HAL running. Set services.hal.enable to true
+  " (
+  mkAssert (if cfg.startOpenSSHAgent
+            then !cfg.startGnuPGAgent
+            else (if cfg.startGnuPGAgent
+                  then !cfg.startOpenSSHAgent
+                  else true)) "
+    The OpenSSH agent and GnuPG agent cannot be started both.
+    Choose between `startOpenSSHAgent' and `startGnuPGAgent'.
+  " {
 
     boot.extraModulePackages =
       optional (elem "nvidia" driverNames) kernelPackages.nvidia_x11 ++ 
@@ -385,7 +380,8 @@ in
 
     environment.pathsToLink =
       [ "/etc/xdg" "/share/xdg" "/share/applications" "/share/icons" "/share/pixmaps" ];
-        
+
+    services.hal.enable = mkAlways cfg.enable;
     services.hal.packages = optional (elem "virtualbox" driverNames) kernelPackages.virtualboxGuestAdditions;
 
     jobs.xserver =
@@ -538,6 +534,6 @@ in
         '')}
       '';
 
-  };
+  }));
 
 }
diff --git a/modules/tasks/tty-backgrounds.nix b/modules/tasks/tty-backgrounds.nix
index d376c6a4b89..b77c6b9acf7 100644
--- a/modules/tasks/tty-backgrounds.nix
+++ b/modules/tasks/tty-backgrounds.nix
@@ -82,13 +82,11 @@ in
 
   ###### implementation
 
-  config = mkIf config.services.ttyBackgrounds.enable {
-
-    assertions = singleton
-      { assertion = kernelPackages.splashutils != null;
-        message = "The kernelPackages does not provide splashutils, as required by ttyBackgrounds. " +
-          "Either provide kernelPackages with splashutils, or disable ttyBackgrounds.";
-      };
+  config = mkIf config.services.ttyBackgrounds.enable (
+  mkAssert (kernelPackages.splashutils != null) "
+    The kernelPackages does not provide splashutils, as required by ttyBackgrounds.
+    Either provide kernelPackages with splashutils, or disable ttyBackgrounds.
+  " {
 
     services.ttyBackgrounds.specificThemes = singleton
       { tty = config.services.syslogd.tty;
@@ -145,6 +143,6 @@ in
           '';
       };
     
-  };
+  });
   
 }
diff --git a/modules/testing/test-instrumentation.nix b/modules/testing/test-instrumentation.nix
index 4834df5f252..991c5d263a5 100644
--- a/modules/testing/test-instrumentation.nix
+++ b/modules/testing/test-instrumentation.nix
@@ -21,7 +21,11 @@ in
     
 {
 
-  config = {
+  config =
+  # Require a patch to the kernel to increase the 15s CIFS timeout.
+  mkAssert (config.boot.kernelPackages.kernel.features ? cifsTimeout) "
+    VM tests require that the kernel has the CIFS timeout patch.
+  " {
 
     jobs.backdoor =
       { startOn = "startup";
@@ -95,13 +99,6 @@ in
     networking.defaultGateway = mkOverride 150 "";
     networking.nameservers = mkOverride 150 [ ];
 
-    # Require a patch to the kernel to increase the 15s CIFS timeout.
-    assertions =
-      [ { assertion = config.boot.kernelPackages.kernel.features ? cifsTimeout;
-          message = "VM tests require that the kernel has the CIFS timeout patch.";
-        }
-      ];
-
     system.upstartEnvironment.GCOV_PREFIX = "/tmp/coverage-data";
       
   };
-- 
GitLab


From e174562ee1eab3ad876e6a4fb105b0e8f50f5aa6 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 31 Mar 2011 15:24:13 +0000
Subject: [PATCH 2924/5331] * Put ebtables in libvirtd's PATH.

svn path=/nixos/trunk/; revision=26629
---
 modules/virtualisation/libvirtd.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/modules/virtualisation/libvirtd.nix b/modules/virtualisation/libvirtd.nix
index 5d82bf1e07a..b9769881059 100644
--- a/modules/virtualisation/libvirtd.nix
+++ b/modules/virtualisation/libvirtd.nix
@@ -56,6 +56,7 @@ in
 
         path =
           [ pkgs.bridge_utils pkgs.dmidecode pkgs.dnsmasq
+            pkgs.ebtables
           ] ++ optional cfg.enableKVM pkgs.qemu_kvm;
 
         preStart = 
-- 
GitLab


From c4a2eeb9f8d947d792d93288eda1e3dbb1f4cfc1 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 31 Mar 2011 17:04:05 +0000
Subject: [PATCH 2925/5331] * Added a module for the RabbitMQ server.

svn path=/nixos/trunk/; revision=26630
---
 modules/module-list.nix            |  1 +
 modules/services/amqp/rabbitmq.nix | 90 ++++++++++++++++++++++++++++++
 2 files changed, 91 insertions(+)
 create mode 100644 modules/services/amqp/rabbitmq.nix

diff --git a/modules/module-list.nix b/modules/module-list.nix
index 56ada293a01..3206c08fef2 100644
--- a/modules/module-list.nix
+++ b/modules/module-list.nix
@@ -44,6 +44,7 @@
   ./security/polkit.nix
   ./security/setuid-wrappers.nix
   ./security/sudo.nix
+  ./services/amqp/rabbitmq.nix
   ./services/audio/alsa.nix
   ./services/audio/pulseaudio.nix
   ./services/backup/hydra-mirror.nix
diff --git a/modules/services/amqp/rabbitmq.nix b/modules/services/amqp/rabbitmq.nix
new file mode 100644
index 00000000000..3322ab329e7
--- /dev/null
+++ b/modules/services/amqp/rabbitmq.nix
@@ -0,0 +1,90 @@
+{ config, pkgs, ... }:
+
+with pkgs.lib;
+
+let
+
+  cfg = config.services.rabbitmq;
+
+  run = cmd: "${pkgs.sudo}/bin/sudo -E -u rabbitmq ${cmd}";
+
+in
+
+{
+
+
+  ###### interface
+  
+  options = {
+  
+    services.rabbitmq = {
+
+      enable = mkOption {
+        default = false;
+        description = ''
+          Whether to enable the RabbitMQ server, an Advanced Message
+          Queuing Protocol (AMQP) broker.
+        '';
+      };
+
+      listenAddress = mkOption {
+        default = "127.0.0.1";
+        example = "";
+        description = ''
+          IP address on which RabbitMQ will listen for AMQP
+          connections.  Set to the empty string to listen on all
+          interfaces.  Note that RabbitMQ creates a user named
+          <literal>guest</literal> with password
+          <literal>guest</literal> by default, so you should delete
+          this user if you intend to allow external access.
+        '';
+      };
+
+    };
+
+  };
+
+
+  ###### implementation
+
+  config = mkIf cfg.enable {
+
+    environment.systemPackages = [ pkgs.rabbitmq_server ];
+
+    users.extraUsers = singleton
+      { name = "rabbitmq";
+        description = "RabbitMQ server user";
+        home = "/var/empty";
+      };
+
+    jobs.rabbitmq = {
+        description = "RabbitMQ server";
+
+        startOn = "started network-interfaces";
+
+        preStart =
+          ''
+            mkdir -m 0700 -p /var/lib/rabbitmq
+            chown rabbitmq /var/lib/rabbitmq
+
+            mkdir -m 0700 -p /var/log/rabbitmq
+            chown rabbitmq /var/log/rabbitmq
+          '';
+
+        environment.HOME = "/var/lib/rabbitmq";
+        environment.RABBITMQ_NODE_IP_ADDRESS = cfg.listenAddress;
+
+        exec = 
+          ''
+            ${run "${pkgs.rabbitmq_server}/sbin/rabbitmq-server"}
+          '';
+
+        preStop =
+          ''
+            ${run "${pkgs.rabbitmq_server}/sbin/rabbitmqctl stop"}
+          '';
+      };
+
+  };
+
+}
-- 
GitLab


From ef80abc886fe562ed19c57bc7de7cb3637a4e52b Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 31 Mar 2011 21:21:55 +0000
Subject: [PATCH 2926/5331] * Remove some dead code.

svn path=/nixos/trunk/; revision=26634
---
 modules/system/etc/etc.nix | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/modules/system/etc/etc.nix b/modules/system/etc/etc.nix
index 7a764a8397b..c84d96829f3 100644
--- a/modules/system/etc/etc.nix
+++ b/modules/system/etc/etc.nix
@@ -25,18 +25,6 @@ in
 ###### implementation
 let
 
-  copyScript = {source, target, mode ? "644", own ? "root.root"}:
-    assert target != "nixos";
-    ''
-      source="${source}"
-      target="/etc/${target}"
-      mkdir -p $(dirname "$target")
-      test -e "$target" && rm -f "$target"
-      cp "$source" "$target"
-      chown ${own} "$target"
-      chmod ${mode} "$target"
-    '';
-
   etc = pkgs.stdenv.mkDerivation {
     name = "etc";
 
-- 
GitLab


From 1e2c0d6284f3198a03ff219aa9172b2a13f66bf1 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 31 Mar 2011 22:10:26 +0000
Subject: [PATCH 2927/5331] * Try to hack around libvirt's stateful use of
 /etc/libvirt.  (Routine   operations such as creating VMs modify the contents
 of   /etc/libvirt.)

svn path=/nixos/trunk/; revision=26644
---
 modules/virtualisation/libvirtd.nix | 19 ++++++++++++++++++-
 1 file changed, 18 insertions(+), 1 deletion(-)

diff --git a/modules/virtualisation/libvirtd.nix b/modules/virtualisation/libvirtd.nix
index b9769881059..339d8e1b019 100644
--- a/modules/virtualisation/libvirtd.nix
+++ b/modules/virtualisation/libvirtd.nix
@@ -63,7 +63,24 @@ in
           ''
             mkdir -p /var/log/libvirt/qemu -m 755
             rm -f /var/run/libvirtd.pid
-          '';
+
+            mkdir -p /var/lib/libvirt -m 700
+            mkdir -p /var/lib/libvirt/dnsmasq -m 700
+
+            # Libvirt unfortunately writes mutable state (such as
+            # runtime changes to VM, network or filter configurations)
+            # to /etc.  So we can't use environment.etc to make the
+            # default network and filter definitions available, since
+            # libvirt will then modify the originals in the Nix store.
+            # So here we copy them instead.  Ugly.
+            for i in $(cd ${pkgs.libvirt}/etc && echo \
+                libvirt/qemu/networks/*.xml libvirt/qemu/networks/autostart/*.xml \
+                libvirt/nwfilter/*.xml );
+            do
+                mkdir -p /etc/$(dirname $i) -m 755
+                cp -fpd ${pkgs.libvirt}/etc/$i /etc/$i
+            done
+          ''; # */
 
         exec = "${pkgs.libvirt}/sbin/libvirtd --daemon --verbose";
 
-- 
GitLab


From f26920697227a69f333b0c19e6fe49f1b115904d Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Thu, 31 Mar 2011 23:03:54 +0000
Subject: [PATCH 2928/5331] Update iso-image.nix to work with kernels that use
 AUFS 2.1 instead of AUFS 2. Older kernels are unaffected.

svn path=/nixos/trunk/; revision=26646
---
 modules/installer/cd-dvd/iso-image.nix | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/modules/installer/cd-dvd/iso-image.nix b/modules/installer/cd-dvd/iso-image.nix
index e17dce4f71c..3001eac3560 100644
--- a/modules/installer/cd-dvd/iso-image.nix
+++ b/modules/installer/cd-dvd/iso-image.nix
@@ -148,8 +148,10 @@ in
   # and aufs to make the root filesystem appear writable.
   boot.extraModulePackages =
     optional 
-      (! config.boot.kernelPackages.kernel.features ? aufs) 
-      config.boot.kernelPackages.aufs2;
+      (! ( config.boot.kernelPackages.kernel.features ? aufs || config.boot.kernelPackages.kernel.features ? aufs2_1 ) ) 
+      config.boot.kernelPackages.aufs2
+      ++ optional( config.boot.kernelPackages.kernel.features ? aufs2_1 )
+      config.boot.kernelPackages.aufs2_1;
       
   boot.initrd.availableKernelModules = [ "aufs" "squashfs" "iso9660" ];
 
-- 
GitLab


From 8dd6f42a917de8d71acea0f6b6e3c0bdc229180d Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Thu, 31 Mar 2011 23:06:36 +0000
Subject: [PATCH 2929/5331] Fixed formatting

svn path=/nixos/trunk/; revision=26647
---
 modules/installer/cd-dvd/iso-image.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/modules/installer/cd-dvd/iso-image.nix b/modules/installer/cd-dvd/iso-image.nix
index 3001eac3560..ee7ce632e51 100644
--- a/modules/installer/cd-dvd/iso-image.nix
+++ b/modules/installer/cd-dvd/iso-image.nix
@@ -150,7 +150,8 @@ in
     optional 
       (! ( config.boot.kernelPackages.kernel.features ? aufs || config.boot.kernelPackages.kernel.features ? aufs2_1 ) ) 
       config.boot.kernelPackages.aufs2
-      ++ optional( config.boot.kernelPackages.kernel.features ? aufs2_1 )
+    ++ optional
+      ( config.boot.kernelPackages.kernel.features ? aufs2_1 )
       config.boot.kernelPackages.aufs2_1;
       
   boot.initrd.availableKernelModules = [ "aufs" "squashfs" "iso9660" ];
-- 
GitLab


From 817cc79cb5d26f893e01ee12abd1abb667bf8b92 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Fri, 1 Apr 2011 12:22:57 +0000
Subject: [PATCH 2930/5331] The live cd contains vi, not vim

svn path=/nixos/trunk/; revision=26654
---
 doc/manual/installation.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/manual/installation.xml b/doc/manual/installation.xml
index 9b87b40ccaa..cf57bcfaf01 100644
--- a/doc/manual/installation.xml
+++ b/doc/manual/installation.xml
@@ -152,7 +152,7 @@ $ nixos-option --install</screen>
     write a description of the configuration that you want to be built and
     activated.  The configuration is specified in a Nix expression and must
     be stored <emphasis>on the target file system</emphasis>.  The text
-    editors <command>nano</command> and <command>vim</command> are
+    editors <command>nano</command> and <command>vi</command> are
     available.</para>
 
     <para>You need to specify a root file system in
-- 
GitLab


From 403accc71fa17c20b6c560d73f0891270bff7007 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 1 Apr 2011 15:05:42 +0000
Subject: [PATCH 2931/5331] * Some hackery to make sure that router
 solicitations get through   after creating a bridge. * Ignore errors (set +e)
 so that we can get rid of all the "|| true"   clauses.

svn path=/nixos/trunk/; revision=26660
---
 modules/tasks/network-interfaces.nix | 28 ++++++++++++++++++++--------
 1 file changed, 20 insertions(+), 8 deletions(-)

diff --git a/modules/tasks/network-interfaces.nix b/modules/tasks/network-interfaces.nix
index ac98e385ce1..c64bb624d34 100644
--- a/modules/tasks/network-interfaces.nix
+++ b/modules/tasks/network-interfaces.nix
@@ -194,17 +194,19 @@ in
 
         preStart =
           ''
+            set +e # continue in case of errors
+          
             ${flip concatMapStrings cfg.interfaces (i:
               optionalString (i.macAddress != "")
                 ''
                   echo "Setting MAC address of ${i.name} to ${i.macAddress}..."
-                  ip link set "${i.name}" address "${i.macAddress}" || true
+                  ip link set "${i.name}" address "${i.macAddress}"
                 '')
             }
 
             for i in $(cd /sys/class/net && ls -d *); do
                 echo "Bringing up network device $i..."
-                ip link set "$i" up || true
+                ip link set "$i" up
             done
 
             # Configure the manually specified interfaces.
@@ -213,7 +215,7 @@ in
                 ''
                   echo "Configuring interface ${i.name}..."
                   ip addr add "${i.ipAddress}""${optionalString (i.subnetMask != "") ("/" + i.subnetMask)}" \
-                    dev "${i.name}" || true
+                    dev "${i.name}"
                 '')
             }
 
@@ -230,20 +232,30 @@ in
 
             # Set the default gateway.
             ${optionalString (cfg.defaultGateway != "") ''
-                ip route add default via "${cfg.defaultGateway}" || true
+                ip route add default via "${cfg.defaultGateway}"
             ''}
 
             # Run any user-specified commands.
-            ${pkgs.stdenv.shell} ${pkgs.writeText "local-net-cmds" cfg.localCommands} || true
+            ${pkgs.stdenv.shell} ${pkgs.writeText "local-net-cmds" cfg.localCommands}
 
             # Create bridge devices.
             ${concatStrings (attrValues (flip mapAttrs cfg.bridges (n: v: ''
                 echo "Creating bridge ${n}..."
-                ${pkgs.bridge_utils}/sbin/brctl addbr "${n}" || true
+                ${pkgs.bridge_utils}/sbin/brctl addbr "${n}"
+                
                 ${flip concatMapStrings v.interfaces (i: ''
-                  ${pkgs.bridge_utils}/sbin/brctl addif "${n}" "${i}" || true
-                  ip addr flush dev "${i}" || true
+                  ${pkgs.bridge_utils}/sbin/brctl addif "${n}" "${i}"
+                  ip addr flush dev "${i}"
                 '')}
+
+                # For some reason enslaving an interface to a bridge
+                # causes traffic to be blocked for a few seconds, long
+                # enough for IPv6 router solicitations to get lost.
+                # So increase the number of attemts.
+                ${optionalString cfg.enableIPv6 ''
+                  echo 5 > /proc/sys/net/ipv6/conf/${n}/router_solicitations
+                ''}
+                
                 # !!! Should delete (brctl delif) any interfaces that
                 # no longer belong to the bridge.
             '')))}
-- 
GitLab


From 2c1084b21bf4b1859d3b88980e341d5296463057 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 1 Apr 2011 18:08:53 +0000
Subject: [PATCH 2932/5331] * libvirtd job: wait until libvirtd is accepting
 connections.

svn path=/nixos/trunk/; revision=26663
---
 modules/virtualisation/libvirtd.nix | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/modules/virtualisation/libvirtd.nix b/modules/virtualisation/libvirtd.nix
index 339d8e1b019..b8cc0cddd6d 100644
--- a/modules/virtualisation/libvirtd.nix
+++ b/modules/virtualisation/libvirtd.nix
@@ -84,9 +84,20 @@ in
 
         exec = "${pkgs.libvirt}/sbin/libvirtd --daemon --verbose";
 
+        # Wait until libvirtd is ready to accept requests.
+        postStart =
+          ''
+            for ((i = 0; i < 60; i++)); do
+                if ${pkgs.libvirt}/bin/virsh list > /dev/null; then exit 0; fi
+                sleep 1
+            done
+            exit 1 # !!! seems to be ignored
+          '';
+
         daemonType = "daemon";
       };
 
+    # !!! Split this into save and restore tasks.
     jobs.libvirt_guests =
       { name = "libvirt-guests";
       
@@ -103,10 +114,12 @@ in
         preStart = 
           ''
             mkdir -p /var/lock/subsys -m 755
-            ${pkgs.libvirt}/etc/rc.d/init.d/libvirt-guests start
+            ${pkgs.libvirt}/etc/rc.d/init.d/libvirt-guests start || true
           '';
 
         postStop = "${pkgs.libvirt}/etc/rc.d/init.d/libvirt-guests stop";
+
+        respawn = false;
       };
 
   };
-- 
GitLab


From fcaec58d27e0d1407f45ef29661dacb766a4fb3b Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 1 Apr 2011 18:09:57 +0000
Subject: [PATCH 2933/5331] * Add a module for setting up a basic (single-node)
 OpenStack Compute   (Nova) cloud.

svn path=/nixos/trunk/; revision=26664
---
 modules/module-list.nix         |   1 +
 modules/virtualisation/nova.nix | 131 ++++++++++++++++++++++++++++++++
 2 files changed, 132 insertions(+)
 create mode 100644 modules/virtualisation/nova.nix

diff --git a/modules/module-list.nix b/modules/module-list.nix
index 3206c08fef2..b908920a460 100644
--- a/modules/module-list.nix
+++ b/modules/module-list.nix
@@ -171,5 +171,6 @@
   ./tasks/swraid.nix
   ./tasks/tty-backgrounds.nix
   ./virtualisation/libvirtd.nix
+  ./virtualisation/nova.nix
   ./virtualisation/xen-dom0.nix
 ]
diff --git a/modules/virtualisation/nova.nix b/modules/virtualisation/nova.nix
new file mode 100644
index 00000000000..033885c2f90
--- /dev/null
+++ b/modules/virtualisation/nova.nix
@@ -0,0 +1,131 @@
+# Module for Nova, a.k.a. OpenStack Compute.
+
+{ config, pkgs, ... }:
+
+with pkgs.lib;
+
+let
+
+  cfg = config.virtualisation.nova;
+
+  nova = pkgs.nova;
+
+in
+
+{
+
+  ###### interface
+
+  options = {
+
+    virtualisation.nova.enableSingleNode = 
+      mkOption {
+        default = false;
+        description =
+          ''
+            This option enables Nova, also known as OpenStack Compute,
+            a cloud computing system, as a single-machine
+            installation.  That is, all of Nova's components are
+            enabled on this machine, using SQLite as Nova's database.
+            This is useful for evaluating and experimenting with Nova.
+            However, for a real cloud computing environment, you'll
+            want to enable some of Nova's services on other machines,
+            and use a database such as MySQL.
+          '';
+      };
+
+  };
+
+
+  ###### implementation
+
+  config = mkIf cfg.enableSingleNode {
+
+    environment.systemPackages = [ nova ];
+
+    environment.etc =
+      [ # The Paste configuration file for nova-api.
+        { source = "${nova}/etc/nova/nova-api.conf";
+          target = "nova/nova-api.conf";
+        }
+      ];
+
+    # Nova requires libvirtd and RabbitMQ.
+    virtualisation.libvirtd.enable = true;
+    services.rabbitmq.enable = true;
+
+    # `qemu-nbd' required the `nbd' kernel module.
+    boot.kernelModules = [ "nbd" ];
+      
+    # `nova-api' receives and executes external client requests from
+    # tools such as euca2ools.  It listens on port 8773 (XML) and 8774
+    # (JSON).
+    jobs.nova_api =
+      { name = "nova-api";
+
+        description = "Nova API service";
+
+        startOn = "ip-up";
+
+        exec = "${nova}/bin/nova-api";
+      };
+
+    # `nova-objectstore' is a simple image server.  Useful if you're
+    # not running the OpenStack Imaging Service (Swift).  It serves
+    # images placed in /var/lib/nova/images/.
+    jobs.nova_objectstore =
+      { name = "nova-objectstore";
+
+        description = "Nova simple object store service";
+
+        startOn = "ip-up";
+
+        exec = "${nova}/bin/nova-objectstore --nodaemon";
+      };
+
+    # `nova-scheduler' schedules VM execution requests.
+    jobs.nova_scheduler =
+      { name = "nova-scheduler";
+
+        description = "Nova scheduler service";
+
+        startOn = "ip-up";
+
+        exec = "${nova}/bin/nova-scheduler --nodaemon --verbose";
+      };
+
+    # `nova-compute' starts and manages virtual machines.
+    jobs.nova_compute =
+      { name = "nova-compute";
+
+        description = "Nova compute service";
+
+        startOn = "ip-up";
+
+        path =
+          [ pkgs.sudo pkgs.vlan pkgs.nettools pkgs.iptables pkgs.qemu_kvm
+            pkgs.e2fsprogs pkgs.utillinux
+          ];
+
+        exec = "${nova}/bin/nova-compute --nodaemon --verbose";
+      };
+
+    # `nova-network' manages networks and allocates IP addresses.
+    jobs.nova_network =
+      { name = "nova-network";
+
+        description = "Nova network service";
+
+        startOn = "ip-up";
+
+        path =
+          [ pkgs.sudo pkgs.vlan pkgs.dnsmasq pkgs.nettools pkgs.iptables
+            pkgs.iproute pkgs.bridge_utils pkgs.radvd
+          ];
+
+        exec = "${nova}/bin/nova-network --nodaemon --verbose";
+      };
+
+  };
+
+}
-- 
GitLab


From 2ddda472c45d11c991d53e7400fffdaf40217978 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Mon, 4 Apr 2011 13:45:16 +0000
Subject: [PATCH 2934/5331] Put vim on the live cd in place of nvi

svn path=/nixos/trunk/; revision=26679
---
 doc/manual/installation.xml | 2 +-
 modules/profiles/base.nix   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/doc/manual/installation.xml b/doc/manual/installation.xml
index cf57bcfaf01..9b87b40ccaa 100644
--- a/doc/manual/installation.xml
+++ b/doc/manual/installation.xml
@@ -152,7 +152,7 @@ $ nixos-option --install</screen>
     write a description of the configuration that you want to be built and
     activated.  The configuration is specified in a Nix expression and must
     be stored <emphasis>on the target file system</emphasis>.  The text
-    editors <command>nano</command> and <command>vi</command> are
+    editors <command>nano</command> and <command>vim</command> are
     available.</para>
 
     <para>You need to specify a root file system in
diff --git a/modules/profiles/base.nix b/modules/profiles/base.nix
index e8c583f7693..4cf39867ec6 100644
--- a/modules/profiles/base.nix
+++ b/modules/profiles/base.nix
@@ -85,7 +85,7 @@
     pkgs.dar # disk archiver
 
     # Some editors.
-    pkgs.nvi
+    pkgs.vim
     pkgs.bvi # binary editor
     pkgs.joe
   ];
-- 
GitLab


From d9cf1c2da0234a67d77335a49335b0c30cb8fa12 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 5 Apr 2011 11:24:36 +0000
Subject: [PATCH 2935/5331] * Install ~/.bashrc as a regular file rather than
 as a symlink.

svn path=/nixos/trunk/; revision=26690
---
 modules/programs/bash/bash.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/modules/programs/bash/bash.nix b/modules/programs/bash/bash.nix
index f99d04e6335..8df97ceac5f 100644
--- a/modules/programs/bash/bash.nix
+++ b/modules/programs/bash/bash.nix
@@ -50,6 +50,7 @@ in
         # starts as a non-login shell.
         source = ./bashrc-user.sh;
         target = "skel/.bashrc";
+        mode = "0644";
       }
       
       { # Configuration for readline in bash.
-- 
GitLab


From 84be6235c3ce0f3bfb15c4e101f6bd00b4e68bb2 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 6 Apr 2011 11:58:13 +0000
Subject: [PATCH 2936/5331] * Get rid of a cyclic symlink to the default theme.

svn path=/nixos/trunk/; revision=26712
---
 modules/tasks/tty-backgrounds-combine.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/tasks/tty-backgrounds-combine.sh b/modules/tasks/tty-backgrounds-combine.sh
index d7ac3c31c6b..1e0d8758a6e 100644
--- a/modules/tasks/tty-backgrounds-combine.sh
+++ b/modules/tasks/tty-backgrounds-combine.sh
@@ -7,8 +7,8 @@ ensureDir $out
 
 defaultName=$(cd $default && ls | grep -v default)
 echo $defaultName
-ln -s $default/default $out/default
-ln -s $defaultName $out/$defaultName
+ln -s $default/$defaultName $out/$defaultName
+ln -s $defaultName $out/default
 
 for ((n = 0; n < ${#ttys[*]}; n++)); do
     tty=${ttys[$n]}
-- 
GitLab


From 2e2282bd5e89f019400c264889bf322cf52390ea Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 6 Apr 2011 15:09:34 +0000
Subject: [PATCH 2937/5331] * Added a module to create a disk image for Nova.

svn path=/nixos/trunk/; revision=26721
---
 modules/virtualisation/amazon-image.nix |  38 +-------
 modules/virtualisation/ec2-data.nix     |  45 +++++++++
 modules/virtualisation/nova-image.nix   | 123 ++++++++++++++++++++++++
 3 files changed, 170 insertions(+), 36 deletions(-)
 create mode 100644 modules/virtualisation/ec2-data.nix
 create mode 100644 modules/virtualisation/nova-image.nix

diff --git a/modules/virtualisation/amazon-image.nix b/modules/virtualisation/amazon-image.nix
index 4334f04325b..ca35480240e 100644
--- a/modules/virtualisation/amazon-image.nix
+++ b/modules/virtualisation/amazon-image.nix
@@ -3,6 +3,8 @@
 with pkgs.lib;
 
 {
+  require = [ ./ec2-data.nix ];
+
   system.build.amazonImage =
     pkgs.vmTools.runInLinuxVM (
       pkgs.runCommand "amazon-image"
@@ -104,40 +106,4 @@ with pkgs.lib;
   # at instance creation time.
   services.openssh.enable = true;
   services.openssh.permitRootLogin = "without-password";
-
-  # Obtain the SSH key and host name at startup time.
-  jobs.fetchEC2Data =
-    { name = "fetch-ec2-data";
-
-      startOn = "ip-up";
-
-      task = true;
-
-      script =
-        ''
-          echo "obtaining SSH key..."
-          mkdir -p /root/.ssh
-          ${pkgs.curl}/bin/curl --retry 3 --retry-delay 0 --fail \
-            -o /root/key.pub \
-            http://169.254.169.254/1.0/meta-data/public-keys/0/openssh-key
-          if [ $? -eq 0 -a -e /root/key.pub ]; then
-              if ! grep -q -f /root/key.pub /root/.ssh/authorized_keys; then
-                  cat /root/key.pub >> /root/.ssh/authorized_keys
-                  echo "new key added to authorized_keys"
-              fi
-              chmod 600 /root/.ssh/authorized_keys
-              rm -f /root/key.pub
-          fi
-
-          # Print the host public key on the console so that the user
-          # can obtain it securely by parsing the output of
-          # ec2-get-console-output.
-          echo "-----BEGIN SSH HOST KEY FINGERPRINTS-----" > /dev/console
-          ${pkgs.openssh}/bin/ssh-keygen -l -f /etc/ssh/ssh_host_dsa_key.pub > /dev/console
-          echo "-----END SSH HOST KEY FINGERPRINTS-----" > /dev/console
-
-          echo "setting host name..."
-          ${pkgs.nettools}/bin/hostname $(${pkgs.curl}/bin/curl http://169.254.169.254/1.0/meta-data/hostname)
-        '';
-    };
 }
diff --git a/modules/virtualisation/ec2-data.nix b/modules/virtualisation/ec2-data.nix
new file mode 100644
index 00000000000..cd1e3da69bd
--- /dev/null
+++ b/modules/virtualisation/ec2-data.nix
@@ -0,0 +1,45 @@
+# This module defines an Upstart job that obtains the SSH key and host
+# name of virtual machines running on Amazon EC2, Eucalyptus and
+# OpenStack Compute (Nova).
+
+{ config, pkgs, ... }:
+
+{
+
+  jobs.fetchEC2Data =
+    { name = "fetch-ec2-data";
+
+      startOn = "ip-up";
+
+      task = true;
+
+      script =
+        ''
+          echo "setting host name..."
+          ${pkgs.nettools}/bin/hostname $(${pkgs.curl}/bin/curl http://169.254.169.254/1.0/meta-data/hostname)
+
+          echo "obtaining SSH key..."
+          mkdir -p /root/.ssh
+          ${pkgs.curl}/bin/curl --retry 3 --retry-delay 0 --fail \
+            -o /root/key.pub \
+            http://169.254.169.254/1.0/meta-data/public-keys/0/openssh-key
+          if [ $? -eq 0 -a -e /root/key.pub ]; then
+              if ! grep -q -f /root/key.pub /root/.ssh/authorized_keys; then
+                  cat /root/key.pub >> /root/.ssh/authorized_keys
+                  echo "new key added to authorized_keys"
+              fi
+              chmod 600 /root/.ssh/authorized_keys
+              rm -f /root/key.pub
+          fi
+
+          # Print the host public key on the console so that the user
+          # can obtain it securely by parsing the output of
+          # ec2-get-console-output.
+          echo "-----BEGIN SSH HOST KEY FINGERPRINTS-----" > /dev/console
+          ${pkgs.openssh}/bin/ssh-keygen -l -f /etc/ssh/ssh_host_dsa_key.pub > /dev/console
+          echo "-----END SSH HOST KEY FINGERPRINTS-----" > /dev/console
+        '';
+    };
+
+
+}
diff --git a/modules/virtualisation/nova-image.nix b/modules/virtualisation/nova-image.nix
new file mode 100644
index 00000000000..3b3fa28d6bb
--- /dev/null
+++ b/modules/virtualisation/nova-image.nix
@@ -0,0 +1,123 @@
+{ config, pkgs, ... }:
+
+with pkgs.lib;
+
+{
+  require = [ ../profiles/qemu-guest.nix ./ec2-data.nix ];
+
+  system.build.novaImage =
+    pkgs.vmTools.runInLinuxVM (
+      pkgs.runCommand "nova-image"
+        { preVM =
+            ''
+              mkdir $out
+              diskImage=$out/image
+              ${pkgs.vmTools.kvm}/bin/qemu-img create -f raw $diskImage "4G"
+            '';
+          buildInputs = [ pkgs.utillinux pkgs.perl ];
+          exportReferencesGraph = 
+            [ "closure" config.system.build.toplevel ];
+        }
+        ''
+          # Create a single / partition.
+          ${pkgs.parted}/sbin/parted /dev/vda mklabel msdos
+          ${pkgs.parted}/sbin/parted /dev/vda -- mkpart primary ext2 1M -1s
+          . /sys/class/block/vda1/uevent
+          mknod /dev/vda1 b $MAJOR $MINOR
+        
+          # Create an empty filesystem and mount it.
+          ${pkgs.e2fsprogs}/sbin/mkfs.ext3 -L nixos /dev/vda1
+          ${pkgs.e2fsprogs}/sbin/tune2fs -c 0 -i 0 /dev/vda1
+          mkdir /mnt
+          mount /dev/vda1 /mnt
+
+          # The initrd expects these directories to exist.
+          mkdir /mnt/dev /mnt/proc /mnt/sys
+          mount --bind /proc /mnt/proc
+          mount --bind /dev /mnt/dev
+          mount --bind /sys /mnt/sys
+
+          # Copy all paths in the closure to the filesystem.
+          storePaths=$(perl ${pkgs.pathsFromGraph} $ORIG_TMPDIR/closure)
+
+          mkdir -p /mnt/nix/store
+          ${pkgs.rsync}/bin/rsync -av $storePaths /mnt/nix/store/
+
+          # Register the paths in the Nix database.
+          printRegistration=1 perl ${pkgs.pathsFromGraph} $ORIG_TMPDIR/closure | \
+              chroot /mnt ${config.environment.nix}/bin/nix-store --load-db
+
+          # Create the system profile to allow nixos-rebuild to work.
+          chroot /mnt ${config.environment.nix}/bin/nix-env \
+              -p /nix/var/nix/profiles/system --set ${config.system.build.toplevel}
+
+          # `nixos-rebuild' requires an /etc/NIXOS.
+          mkdir -p /mnt/etc
+          touch /mnt/etc/NIXOS
+
+          # Install a configuration.nix.
+          mkdir -p /mnt/etc/nixos
+          #cp ${./amazon-config.nix} /mnt/etc/nixos/configuration.nix
+
+          # Generate the GRUB menu.
+          chroot /mnt ${config.system.build.toplevel}/bin/switch-to-configuration boot
+
+          umount /mnt/proc /mnt/dev /mnt/sys
+          umount /mnt
+        ''
+    );
+
+  fileSystems =
+    [ { mountPoint = "/";
+        device = "/dev/disk/by-label/nixos";
+      }
+      #{ mountPoint = "/ephemeral0";
+      #  device = "/dev/xvdc";
+      #  neededForBoot = true;
+      #}
+    ];
+
+  /*
+  swapDevices =
+    [ { device = "/dev/xvdb"; } ];
+  */
+  
+  boot.kernelParams = [ "console=ttyS0" ];
+
+  boot.initrd.kernelModules = [ "aufs" ];
+
+  boot.extraModulePackages = [ config.boot.kernelPackages.aufs2 ];
+
+  boot.loader.grub.version = 2;
+  boot.loader.grub.device = "/dev/vda";
+  boot.loader.grub.timeout = 0;
+
+  # Put /tmp and /var on /ephemeral0, which has a lot more space.  
+  # Unfortunately we can't do this with the `fileSystems' option 
+  # because it has no support for creating the source of a bind 
+  # mount.  Also, "move" /nix to /ephemeral0 by layering an AUFS
+  # on top of it so we have a lot more space for Nix operations.
+  /*
+  boot.initrd.postMountCommands =
+    ''
+      mkdir -m 1777 -p $targetRoot/ephemeral0/tmp
+      mkdir -m 1777 -p $targetRoot/tmp
+      mount --bind $targetRoot/ephemeral0/tmp $targetRoot/tmp
+
+      mkdir -m 755 -p $targetRoot/ephemeral0/var
+      mkdir -m 755 -p $targetRoot/var
+      mount --bind $targetRoot/ephemeral0/var $targetRoot/var
+
+      mkdir -m 755 -p $targetRoot/ephemeral0/nix
+      mount -t aufs -o dirs=$targetRoot/ephemeral0/nix=rw:$targetRoot/nix=rr none $targetRoot/nix
+    '';
+    */
+
+  # There are no virtual consoles.
+  services.mingetty.ttys = [ ];
+
+  # Allow root logins only using the SSH key that the user specified
+  # at instance creation time.
+  services.openssh.enable = true;
+  services.openssh.permitRootLogin = "without-password";
+}
-- 
GitLab


From 4c2a0dc531ca1078cf972b16f3c3374c73550368 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 6 Apr 2011 15:53:03 +0000
Subject: [PATCH 2938/5331] * Add multipath-tools (specifically, kpartx) to
 nova-compute's $PATH   so that it can inject SSH keys into disk images. * Use
 the injected key if available.

svn path=/nixos/trunk/; revision=26724
---
 modules/virtualisation/ec2-data.nix | 26 +++++++++++++++-----------
 modules/virtualisation/nova.nix     |  2 +-
 2 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/modules/virtualisation/ec2-data.nix b/modules/virtualisation/ec2-data.nix
index cd1e3da69bd..7a8c957af09 100644
--- a/modules/virtualisation/ec2-data.nix
+++ b/modules/virtualisation/ec2-data.nix
@@ -18,18 +18,22 @@
           echo "setting host name..."
           ${pkgs.nettools}/bin/hostname $(${pkgs.curl}/bin/curl http://169.254.169.254/1.0/meta-data/hostname)
 
-          echo "obtaining SSH key..."
-          mkdir -p /root/.ssh
-          ${pkgs.curl}/bin/curl --retry 3 --retry-delay 0 --fail \
-            -o /root/key.pub \
-            http://169.254.169.254/1.0/meta-data/public-keys/0/openssh-key
-          if [ $? -eq 0 -a -e /root/key.pub ]; then
-              if ! grep -q -f /root/key.pub /root/.ssh/authorized_keys; then
-                  cat /root/key.pub >> /root/.ssh/authorized_keys
-                  echo "new key added to authorized_keys"
+          # Don't download the SSH key if it has already been injected
+          # into the image (a Nova feature).
+          if ! [ -e /root/.ssh/authorized_keys ]; then
+              echo "obtaining SSH key..."
+              mkdir -p /root/.ssh
+              ${pkgs.curl}/bin/curl --retry 3 --retry-delay 0 --fail \
+                -o /root/key.pub \
+                http://169.254.169.254/1.0/meta-data/public-keys/0/openssh-key
+              if [ $? -eq 0 -a -e /root/key.pub ]; then
+                  if ! grep -q -f /root/key.pub /root/.ssh/authorized_keys; then
+                      cat /root/key.pub >> /root/.ssh/authorized_keys
+                      echo "new key added to authorized_keys"
+                  fi
+                  chmod 600 /root/.ssh/authorized_keys
+                  rm -f /root/key.pub
               fi
-              chmod 600 /root/.ssh/authorized_keys
-              rm -f /root/key.pub
           fi
 
           # Print the host public key on the console so that the user
diff --git a/modules/virtualisation/nova.nix b/modules/virtualisation/nova.nix
index 033885c2f90..a838f7f63d4 100644
--- a/modules/virtualisation/nova.nix
+++ b/modules/virtualisation/nova.nix
@@ -104,7 +104,7 @@ in
 
         path =
           [ pkgs.sudo pkgs.vlan pkgs.nettools pkgs.iptables pkgs.qemu_kvm
-            pkgs.e2fsprogs pkgs.utillinux
+            pkgs.e2fsprogs pkgs.utillinux pkgs.multipath_tools
           ];
 
         exec = "${nova}/bin/nova-compute --nodaemon --verbose";
-- 
GitLab


From 3836e8eb02af239c99d70d9b7fe1497d0906e04a Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 7 Apr 2011 09:59:11 +0000
Subject: [PATCH 2939/5331] * Properly initialise Nova's state.

svn path=/nixos/trunk/; revision=26735
---
 modules/virtualisation/nova.nix | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/modules/virtualisation/nova.nix b/modules/virtualisation/nova.nix
index a838f7f63d4..d858e6947a8 100644
--- a/modules/virtualisation/nova.nix
+++ b/modules/virtualisation/nova.nix
@@ -41,7 +41,7 @@ in
 
   config = mkIf cfg.enableSingleNode {
 
-    environment.systemPackages = [ nova ];
+    environment.systemPackages = [ nova pkgs.euca2ools ];
 
     environment.etc =
       [ # The Paste configuration file for nova-api.
@@ -56,6 +56,19 @@ in
 
     # `qemu-nbd' required the `nbd' kernel module.
     boot.kernelModules = [ "nbd" ];
+
+    system.activationScripts.nova =
+      ''
+        mkdir -m 700 -p /var/lib/nova
+
+        # Allow the CA certificate generation script (called by
+        # nova-api) to work.
+        mkdir -m 700 -p /var/lib/nova/CA /var/lib/nova/CA/private
+        cp -p ${nova}/libexec/nova/openssl.cnf.tmpl /var/lib/nova/CA/
+
+        # Initialise the SQLite database.        
+        ${nova}/bin/nova-manage db sync
+      '';
       
     # `nova-api' receives and executes external client requests from
     # tools such as euca2ools.  It listens on port 8773 (XML) and 8774
@@ -67,6 +80,8 @@ in
 
         startOn = "ip-up";
 
+        path = [ pkgs.openssl ];
+          
         exec = "${nova}/bin/nova-api";
       };
 
-- 
GitLab


From 05ff7baf488c9d7d4f7aff4850caffe91e092f44 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 7 Apr 2011 12:47:20 +0000
Subject: [PATCH 2940/5331] * /var/lib/nova/networks should be readable by the
 `nobody' user,   because dnsmasq runs as nobody and reads its host list from
 there.

svn path=/nixos/trunk/; revision=26740
---
 modules/virtualisation/nova.nix | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/modules/virtualisation/nova.nix b/modules/virtualisation/nova.nix
index d858e6947a8..f9f6af0b0e2 100644
--- a/modules/virtualisation/nova.nix
+++ b/modules/virtualisation/nova.nix
@@ -59,7 +59,10 @@ in
 
     system.activationScripts.nova =
       ''
-        mkdir -m 700 -p /var/lib/nova
+        mkdir -m 755 -p /var/lib/nova
+        mkdir -m 755 -p /var/lib/nova/networks
+        mkdir -m 700 -p /var/lib/nova/instances
+        mkdir -m 700 -p /var/lib/nova/keys
 
         # Allow the CA certificate generation script (called by
         # nova-api) to work.
@@ -80,7 +83,9 @@ in
 
         startOn = "ip-up";
 
-        path = [ pkgs.openssl ];
+        # `openssl' is required to generate the CA.  `openssh' is
+        # required to generate key pairs.
+        path = [ pkgs.openssl pkgs.openssh ];
           
         exec = "${nova}/bin/nova-api";
       };
@@ -95,6 +100,11 @@ in
 
         startOn = "ip-up";
 
+        preStart =
+          ''
+            mkdir -m 700 -p /var/lib/nova/images
+          '';
+
         exec = "${nova}/bin/nova-objectstore --nodaemon";
       };
 
-- 
GitLab


From 97a37f7c12db198152cc37c637e59b04f3227571 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 8 Apr 2011 14:42:35 +0000
Subject: [PATCH 2941/5331] * "stage1panic" -> "stage1panic=1" to get rid of a
 harmless warning.

svn path=/nixos/trunk/; revision=26756
---
 modules/system/boot/stage-1-init.sh      | 2 +-
 modules/testing/test-instrumentation.nix | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/system/boot/stage-1-init.sh b/modules/system/boot/stage-1-init.sh
index 24c55d47e59..53df49599f6 100644
--- a/modules/system/boot/stage-1-init.sh
+++ b/modules/system/boot/stage-1-init.sh
@@ -77,7 +77,7 @@ for o in $(cat /proc/cmdline); do
         debug1mounts) # stop after mounting file systems
             debug1mounts=1
             ;;
-        stage1panic)
+        stage1panic=1)
             panicOnFail=1
             ;;
         root=*)
diff --git a/modules/testing/test-instrumentation.nix b/modules/testing/test-instrumentation.nix
index 991c5d263a5..d1b3fe154d5 100644
--- a/modules/testing/test-instrumentation.nix
+++ b/modules/testing/test-instrumentation.nix
@@ -84,7 +84,7 @@ in
     # Panic if an error occurs in stage 1 (rather than waiting for
     # user intervention). 
     boot.kernelParams =
-      [ "console=tty1" "console=ttyS0" "panic=1" "stage1panic" ];
+      [ "console=tty1" "console=ttyS0" "panic=1" "stage1panic=1" ];
 
     # `xwininfo' is used by the test driver to query open windows.
     environment.systemPackages = [ pkgs.xorg.xwininfo ];
-- 
GitLab


From 9c492e34bb9dae0e41054f0c43d802c47806bacb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Sat, 9 Apr 2011 16:05:36 +0000
Subject: [PATCH 2942/5331] Making the trac module ldap-aware (for the
 authentication) and sqlite aware.

svn path=/nixos/trunk/; revision=26768
---
 .../web-servers/apache-httpd/trac.nix         | 28 +++++++++++++++++++
 1 file changed, 28 insertions(+)

diff --git a/modules/services/web-servers/apache-httpd/trac.nix b/modules/services/web-servers/apache-httpd/trac.nix
index f8eb62ddfa1..5f9a550c9bd 100644
--- a/modules/services/web-servers/apache-httpd/trac.nix
+++ b/modules/services/web-servers/apache-httpd/trac.nix
@@ -47,6 +47,23 @@ in
       default = "wwwrun";
       description = "Group under which Trac runs.";
     };
+
+    ldapAuthentication = {
+      enable = mkOption {
+        default = false;
+        description = "Enable the ldap authentication in trac";
+      };
+
+      url = mkOption {
+        default = "ldap://127.0.0.1/dc=example,dc=co,dc=ke?uid?sub?(objectClass=inetOrgPerson)";
+        description = "URL of the LDAP authentication";
+      };
+
+      name = mkOption {
+        default = "Trac server";
+        description = "AuthName";
+      };
+    };
     
   };
 
@@ -61,6 +78,16 @@ in
       PythonOption TracUriRoot ${config.projectsLocation}
       PythonOption PYTHON_EGG_CACHE /var/trac/egg-cache
     </Location>
+    ${if config.ldapAuthentication.enable then ''
+      <LocationMatch "^${config.projectsLocation}/[^/]+/login$">
+        AuthType Basic
+        AuthName "${config.ldapAuthentication.name}"
+        AuthBasicProvider "ldap"
+        AuthLDAPURL "${config.ldapAuthentication.url}"
+        authzldapauthoritative Off
+        require valid-user
+    '' else ""}
+    </LocationMatch>
   '';
   
   globalEnvVars = singleton
@@ -72,6 +99,7 @@ in
             pkgs.setuptools
             pkgs.pythonPackages.genshi
             pkgs.pythonPackages.psycopg2
+            pkgs.python.modules.sqlite3
             subversion
           ];
     };
-- 
GitLab


From 82a0aa0a8f84a98457c2ebc42ed12f0b31bed15d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Mon, 11 Apr 2011 19:43:48 +0000
Subject: [PATCH 2943/5331] Fixing a path in the trac ldap part. Too much
 slashes make things go wrong.

svn path=/nixos/trunk/; revision=26786
---
 modules/services/web-servers/apache-httpd/trac.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/services/web-servers/apache-httpd/trac.nix b/modules/services/web-servers/apache-httpd/trac.nix
index 5f9a550c9bd..676aaa83178 100644
--- a/modules/services/web-servers/apache-httpd/trac.nix
+++ b/modules/services/web-servers/apache-httpd/trac.nix
@@ -79,7 +79,7 @@ in
       PythonOption PYTHON_EGG_CACHE /var/trac/egg-cache
     </Location>
     ${if config.ldapAuthentication.enable then ''
-      <LocationMatch "^${config.projectsLocation}/[^/]+/login$">
+      <LocationMatch "^${config.projectsLocation}[^/]+/login$">
         AuthType Basic
         AuthName "${config.ldapAuthentication.name}"
         AuthBasicProvider "ldap"
-- 
GitLab


From 22a4047b1b4ca46603d02e6caace768ee00b5e19 Mon Sep 17 00:00:00 2001
From: Rob Vermaas <rob.vermaas@gmail.com>
Date: Tue, 12 Apr 2011 07:45:54 +0000
Subject: [PATCH 2944/5331] NixOS/124: The system_tarball Hydra job should
 define a build product

svn path=/nixos/trunk/; revision=26788
---
 lib/make-system-tarball.sh | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/lib/make-system-tarball.sh b/lib/make-system-tarball.sh
index 5465c3497aa..aadd0f6428c 100644
--- a/lib/make-system-tarball.sh
+++ b/lib/make-system-tarball.sh
@@ -54,3 +54,5 @@ tar cvJf $out/tarball/$fileName.tar.xz *
 
 ensureDir $out/nix-support
 echo $system > $out/nix-support/system
+echo "file system-tarball $out/tarball/$fileName.tar.xz" > $out/nix-support/hydra-build-products
+
-- 
GitLab


From e9b2ebcb9920cc86b018f85c2de4adab26b7b27d Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 12 Apr 2011 11:25:57 +0000
Subject: [PATCH 2945/5331] * Send a TCP RST packet, rather than an ICMP
 port-unreachable packet,   for (apparently) open TCP connections that
 connection tracking   doesn't know about.  This prevents TCP connections to
 this machine   from hanging in CLOSE_WAIT for a long time.

svn path=/nixos/trunk/; revision=26802
---
 modules/services/networking/firewall.nix | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/modules/services/networking/firewall.nix b/modules/services/networking/firewall.nix
index a8dd253d70b..50790ba3135 100644
--- a/modules/services/networking/firewall.nix
+++ b/modules/services/networking/firewall.nix
@@ -147,7 +147,15 @@ in
               ip46tables -A FW_REFUSE -j LOG --log-level info --log-prefix "rejected packet: "
             ''}
 
-            ip46tables -A FW_REFUSE -j ${if cfg.rejectPackets then "REJECT" else "DROP"}
+            ${if cfg.rejectPackets then ''
+              # Send a reset for existing TCP connections that we've
+              # somehow forgotten about.  Send ICMP "port unreachable"
+              # for everything else.
+              ip46tables -A FW_REFUSE -p tcp ! --syn -j REJECT --reject-with tcp-reset
+              ip46tables -A FW_REFUSE -j REJECT
+            '' else ''
+              ip46tables -A FW_REFUSE -j DROP
+            ''}
 
 
             # Accept all traffic on the loopback interface.
-- 
GitLab


From 6824866d6dbd7f7d5d2befaa0175e0768c90d2f3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Wed, 13 Apr 2011 14:09:02 +0000
Subject: [PATCH 2946/5331] Adding a dnsmasq simple module.

svn path=/nixos/trunk/; revision=26820
---
 modules/module-list.nix                 |  1 +
 modules/services/networking/dnsmasq.nix | 57 +++++++++++++++++++++++++
 2 files changed, 58 insertions(+)
 create mode 100644 modules/services/networking/dnsmasq.nix

diff --git a/modules/module-list.nix b/modules/module-list.nix
index b908920a460..265f8e604ab 100644
--- a/modules/module-list.nix
+++ b/modules/module-list.nix
@@ -92,6 +92,7 @@
   ./services/networking/ddclient.nix
   ./services/networking/dhclient.nix
   ./services/networking/dhcpd.nix
+  ./services/networking/dnsmasq.nix
   ./services/networking/ejabberd.nix
   ./services/networking/firewall.nix
   ./services/networking/git-daemon.nix
diff --git a/modules/services/networking/dnsmasq.nix b/modules/services/networking/dnsmasq.nix
new file mode 100644
index 00000000000..3c215d837f9
--- /dev/null
+++ b/modules/services/networking/dnsmasq.nix
@@ -0,0 +1,57 @@
+{ config, pkgs, ... }:
+
+with pkgs.lib;
+
+let
+  cfg = config.services.dnsmasq;
+  dnsmasq = pkgs.dnsmasq;
+
+  serversParam = concatMapStrings (s: "-S ${s} ") cfg.servers;
+
+in
+
+{
+
+  ###### interface
+  
+  options = {
+  
+    services.dnsmasq = {
+
+      enable = mkOption {
+        default = true;
+        description = ''
+          Whether to run dnsmasq.
+        '';
+      };
+
+      servers = mkOption {
+        default = [];
+        example = [ "8.8.8.8" "8.8.4.4" ];
+        description = ''
+          The parameter to dnsmasq -S.
+        '';
+      };
+
+    };
+
+  };
+
+
+  ###### implementation
+
+  config = mkIf config.services.dnsmasq.enable {
+  
+    jobs.dnsmasq =
+      { description = "dnsmasq daemon";
+
+        startOn = "ip-up";
+
+        daemonType = "daemon";
+
+        exec = "${dnsmasq}/bin/dnsmasq -R ${serversParam}";
+      };
+    
+  };
+  
+}
-- 
GitLab


From e7c9266a70f89790df599279f0dfebe7949361a1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Wed, 13 Apr 2011 17:35:19 +0000
Subject: [PATCH 2947/5331] Adding a poor openldap server module.

svn path=/nixos/trunk/; revision=26822
---
 modules/module-list.nix                 |  1 +
 modules/services/databases/openldap.nix | 58 +++++++++++++++++++++++++
 2 files changed, 59 insertions(+)
 create mode 100644 modules/services/databases/openldap.nix

diff --git a/modules/module-list.nix b/modules/module-list.nix
index 265f8e604ab..aa43ccc3741 100644
--- a/modules/module-list.nix
+++ b/modules/module-list.nix
@@ -53,6 +53,7 @@
   ./services/backup/sitecopy-backup.nix
   ./services/databases/mysql.nix
   ./services/databases/postgresql.nix
+  ./services/databases/openldap.nix
   ./services/games/ghost-one.nix
   ./services/hardware/acpid.nix
   ./services/hardware/bluetooth.nix
diff --git a/modules/services/databases/openldap.nix b/modules/services/databases/openldap.nix
new file mode 100644
index 00000000000..b4df790010b
--- /dev/null
+++ b/modules/services/databases/openldap.nix
@@ -0,0 +1,58 @@
+{ config, pkgs, ... }:
+
+with pkgs.lib;
+
+let
+
+  cfg = config.services.openldap;
+  openldap = pkgs.openldap;
+
+  configFile = pkgs.writeText "slapd.conf" cfg.extraConfig;
+
+in
+
+{
+
+  ###### interface
+
+  options = {
+  
+    services.openldap = {
+    
+      enable = mkOption {
+        default = false;
+        description = "
+          Whether to enable the ldap server.
+        ";
+      };
+
+      extraConfig = mkOption {
+        default = "";
+        description = "
+          sldapd.conf configuration
+        ";
+      };
+    };
+    
+  };
+
+
+  ###### implementation
+
+  config = mkIf config.services.openldap.enable {
+
+    environment.systemPackages = [ openldap ];
+
+    jobs.openldap =
+      {
+        description = "LDAP server";
+
+        startOn = "filesystem";
+        daemonType = "fork";
+
+        exec = "${openldap}/libexec/slapd -f ${configFile}";
+      };
+
+  };
+
+}
-- 
GitLab


From d8a702f59f0c5b7510e3026c754a9b676cf9df6c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Wed, 13 Apr 2011 20:06:29 +0000
Subject: [PATCH 2948/5331] Making the samba daemons see the nss modules
 (needed for ldap-unix-pam integration)

svn path=/nixos/trunk/; revision=26830
---
 modules/services/network-filesystems/samba.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/modules/services/network-filesystems/samba.nix b/modules/services/network-filesystems/samba.nix
index 9a285aa7728..1f249716f7c 100644
--- a/modules/services/network-filesystems/samba.nix
+++ b/modules/services/network-filesystems/samba.nix
@@ -59,6 +59,9 @@ let
       ${cfg.extraConfig}
     '';
 
+  # This may include nss_ldap, needed for samba if it has to use ldap.
+  nssModulesPath = config.system.nssModules.path;
+
   daemonJob = appName: args:
     { name = "samba-${appName}";
       description = "Samba Service daemon ${appName}";
@@ -66,6 +69,8 @@ let
       startOn = "started samba";
       stopOn = "stopping samba";
 
+      environment = { LD_LIBRARY_PATH = nssModulesPath; };
+
       exec = "${samba}/sbin/${appName} ${args}";
     };
 
-- 
GitLab


From 84bea7a3512a7e0e96b6385cd56fe48c1587edf5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Wed, 13 Apr 2011 20:48:50 +0000
Subject: [PATCH 2949/5331] I change the ldap settings so pam_unix and 'files'
 always go in front of ldap, instead of the opposite. Thus, /etc/passwd has
 priority over ldap.

svn path=/nixos/trunk/; revision=26834
---
 modules/config/nsswitch.conf |  6 +++---
 modules/security/pam.nix     | 14 +++++++-------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/modules/config/nsswitch.conf b/modules/config/nsswitch.conf
index f557269d5bd..b4890470835 100644
--- a/modules/config/nsswitch.conf
+++ b/modules/config/nsswitch.conf
@@ -1,6 +1,6 @@
-passwd:         ldap files
-group:          ldap files
-shadow:         ldap files
+passwd:         files ldap
+group:          files ldap
+shadow:         files ldap
 
 hosts:          files dns
 networks:       files dns
diff --git a/modules/security/pam.nix b/modules/security/pam.nix
index a5491792f7e..589d7a6c6ac 100644
--- a/modules/security/pam.nix
+++ b/modules/security/pam.nix
@@ -61,21 +61,21 @@ let
         # module provides the right hooks.
         ''
           # Account management.
+          account sufficient pam_unix.so
           ${optionalString config.users.ldap.enable
-              "account optional ${pam_ldap}/lib/security/pam_ldap.so"}
+              "account sufficient ${pam_ldap}/lib/security/pam_ldap.so"}
           ${optionalString config.krb5.enable
               "account sufficient ${pam_krb5}/lib/security/pam_krb5.so"}
-          account required pam_unix.so
 
           # Authentication management.
           ${optionalString rootOK
               "auth sufficient pam_rootok.so"}
           ${optionalString usbAuth
               "auth sufficient ${pam_usb}/lib/security/pam_usb.so"}
-          ${optionalString config.users.ldap.enable
-              "auth sufficient ${pam_ldap}/lib/security/pam_ldap.so"}
           auth sufficient pam_unix.so ${
-            optionalString allowNullPassword "nullok"}
+            optionalString allowNullPassword "nullok"} likeauth
+          ${optionalString config.users.ldap.enable
+              "auth sufficient ${pam_ldap}/lib/security/pam_ldap.so use_first_pass"}
           ${optionalString config.krb5.enable
 ''auth [default=ignore success=1 service_err=reset] ${pam_krb5}/lib/security/pam_krb5.so use_first_pass
 auth [default=die success=done] ${pam_ccreds}/lib/security/pam_ccreds.so action=validate use_first_pass
@@ -84,20 +84,20 @@ auth sufficient ${pam_ccreds}/lib/security/pam_ccreds.so action=store use_first_
           auth required   pam_deny.so
 
           # Password management.
+          password requisite pam_unix.so nullok sha512
           ${optionalString config.users.ldap.enable
               "password sufficient ${pam_ldap}/lib/security/pam_ldap.so"}
           ${optionalString config.krb5.enable
               "password sufficient ${pam_krb5}/lib/security/pam_krb5.so use_first_pass"}
-          password requisite pam_unix.so nullok sha512
           ${optionalString config.services.samba.syncPasswordsByPam
               "password optional ${pkgs.samba}/lib/security/pam_smbpass.so nullok use_authtok try_first_pass"}
 
           # Session management.
+          session required pam_unix.so
           ${optionalString config.users.ldap.enable
               "session optional ${pam_ldap}/lib/security/pam_ldap.so"}
           ${optionalString config.krb5.enable
               "session optional ${pam_krb5}/lib/security/pam_krb5.so"}
-          session required pam_unix.so
           ${optionalString ownDevices
               "session optional ${pkgs.consolekit}/lib/security/pam_ck_connector.so"}
           ${optionalString forwardXAuth
-- 
GitLab


From 7a4685d28d71d92f14bac1c054d27da8af4fc414 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Thu, 14 Apr 2011 09:54:46 +0000
Subject: [PATCH 2950/5331] Openldap needs a directory in /var/run to start,
 and it seems it's clean at every boot.

svn path=/nixos/trunk/; revision=26840
---
 modules/services/databases/openldap.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/modules/services/databases/openldap.nix b/modules/services/databases/openldap.nix
index b4df790010b..4186fdc72ac 100644
--- a/modules/services/databases/openldap.nix
+++ b/modules/services/databases/openldap.nix
@@ -50,6 +50,10 @@ in
         startOn = "filesystem";
         daemonType = "fork";
 
+        preStart =
+          ''
+            mkdir -p /var/run/slapd
+          '';
         exec = "${openldap}/libexec/slapd -f ${configFile}";
       };
 
-- 
GitLab


From a09414065528eebf61af67e9d67f2782a210c690 Mon Sep 17 00:00:00 2001
From: Evgeny Egorochkin <phreedom.stdin@gmail.com>
Date: Fri, 15 Apr 2011 16:10:13 +0000
Subject: [PATCH 2951/5331] 4store database service: packaged

svn path=/nixos/trunk/; revision=26852
---
 modules/misc/ids.nix                  |  2 +
 modules/module-list.nix               |  1 +
 modules/services/databases/4store.nix | 71 +++++++++++++++++++++++++++
 3 files changed, 74 insertions(+)
 create mode 100644 modules/services/databases/4store.nix

diff --git a/modules/misc/ids.nix b/modules/misc/ids.nix
index 385c6d63e00..be979444d56 100644
--- a/modules/misc/ids.nix
+++ b/modules/misc/ids.nix
@@ -60,6 +60,7 @@ in
     kdm = 39;
     ghostOne = 40;
     git = 41;
+    fourStore = 42;
     # When adding a uid, make sure it doesn't match an existing gid.
 
     nixbld = 30000; # start of range of uids
@@ -102,6 +103,7 @@ in
     osgi = 34;
     ghostOne = 40;
     git = 41;
+    fourStore = 42;
     # When adding a gid, make sure it doesn't match an existing uid.
 
     users = 100;
diff --git a/modules/module-list.nix b/modules/module-list.nix
index aa43ccc3741..7fe508554b8 100644
--- a/modules/module-list.nix
+++ b/modules/module-list.nix
@@ -51,6 +51,7 @@
   ./services/backup/mysql-backup.nix
   ./services/backup/postgresql-backup.nix
   ./services/backup/sitecopy-backup.nix
+  ./services/databases/4store.nix
   ./services/databases/mysql.nix
   ./services/databases/postgresql.nix
   ./services/databases/openldap.nix
diff --git a/modules/services/databases/4store.nix b/modules/services/databases/4store.nix
new file mode 100644
index 00000000000..1bc615681b6
--- /dev/null
+++ b/modules/services/databases/4store.nix
@@ -0,0 +1,71 @@
+{ config, pkgs, ... }:
+let
+  cfg = config.services.fourStore;
+  stateDir = "/var/lib/4store";
+  fourStoreUser = "fourstore";
+  run = "${pkgs.su}/bin/su -s ${pkgs.stdenv.shell} ${fourStoreUser}";
+in
+with pkgs.lib;
+{
+
+  ###### interface
+
+  options = {
+  
+    services.fourStore = {
+    
+      enable = mkOption {
+        default = false;
+        description = "Whether to enable 4Store RDF database server.";
+      };
+
+      database = mkOption {
+        default = "";
+        description = "RDF database name. If it doesn't exist, it will be created. Databases are stored in ${stateDir}.";
+      };
+
+      options = mkOption {
+        default = "";
+        description = "Extra CLI options to pass to 4Store.";
+      };
+
+    };
+
+  };
+
+
+  ###### implementation
+
+  config = mkIf cfg.enable (
+    mkAssert (cfg.enable -> cfg.database != "")
+      "Must specify database name" {
+
+    users.extraUsers = singleton
+      { name = fourStoreUser;
+        uid = config.ids.uids.fourStore;
+        description = "4Store database user";
+        home = stateDir;
+      };
+
+    services.avahi.enable = true;
+
+    jobs.fourStore = {
+      name = "4store";
+      startOn = "filesystem";
+
+      preStart = ''
+        mkdir -p ${stateDir}/
+        chown ${fourStoreUser} ${stateDir}
+	if ! test -e "${stateDir}/${cfg.database}"; then
+	  ${run} -c '${pkgs.rdf4store}/bin/4s-backend-setup ${cfg.database}'
+        fi
+      '';
+
+      exec = ''
+	${run} -c '${pkgs.rdf4store}/bin/4s-backend -D ${cfg.options} ${cfg.database}'
+      '';
+    };
+
+  });
+  
+}
-- 
GitLab


From 23df246c9ee04a9fe88cb52404095ab5ec623bde Mon Sep 17 00:00:00 2001
From: Evgeny Egorochkin <phreedom.stdin@gmail.com>
Date: Fri, 15 Apr 2011 16:10:17 +0000
Subject: [PATCH 2952/5331] 4Store SPARQL endpoint: packaged

svn path=/nixos/trunk/; revision=26853
---
 modules/misc/ids.nix                          |  4 ++
 modules/module-list.nix                       |  1 +
 .../services/databases/4store-endpoint.nix    | 72 +++++++++++++++++++
 3 files changed, 77 insertions(+)
 create mode 100644 modules/services/databases/4store-endpoint.nix

diff --git a/modules/misc/ids.nix b/modules/misc/ids.nix
index be979444d56..ccfba68c4d7 100644
--- a/modules/misc/ids.nix
+++ b/modules/misc/ids.nix
@@ -61,6 +61,8 @@ in
     ghostOne = 40;
     git = 41;
     fourStore = 42;
+    fourStoreEndpoint = 43;
+
     # When adding a uid, make sure it doesn't match an existing gid.
 
     nixbld = 30000; # start of range of uids
@@ -104,6 +106,8 @@ in
     ghostOne = 40;
     git = 41;
     fourStore = 42;
+    fourStoreEndpoint = 43;
+
     # When adding a gid, make sure it doesn't match an existing uid.
 
     users = 100;
diff --git a/modules/module-list.nix b/modules/module-list.nix
index 7fe508554b8..69f6133a7ed 100644
--- a/modules/module-list.nix
+++ b/modules/module-list.nix
@@ -52,6 +52,7 @@
   ./services/backup/postgresql-backup.nix
   ./services/backup/sitecopy-backup.nix
   ./services/databases/4store.nix
+  ./services/databases/4store-endpoint.nix
   ./services/databases/mysql.nix
   ./services/databases/postgresql.nix
   ./services/databases/openldap.nix
diff --git a/modules/services/databases/4store-endpoint.nix b/modules/services/databases/4store-endpoint.nix
new file mode 100644
index 00000000000..ac38a9b7d54
--- /dev/null
+++ b/modules/services/databases/4store-endpoint.nix
@@ -0,0 +1,72 @@
+{ config, pkgs, ... }:
+let
+  cfg = config.services.fourStoreEndpoint;
+  endpointUser = "fourstorehttp";
+  run = "${pkgs.su}/bin/su -s ${pkgs.stdenv.shell} ${endpointUser} -c";
+in
+with pkgs.lib;
+{
+
+  ###### interface
+
+  options = {
+  
+    services.fourStoreEndpoint = {
+    
+      enable = mkOption {
+        default = false;
+        description = "Whether to enable 4Store SPARQL endpoint.";
+      };
+
+      database = mkOption {
+        default = config.services.fourStore.database;
+        description = "RDF database name to expose via the endpoint. Defaults to local 4Store database name.";
+      };
+
+      listenAddress = mkOption {
+	default = null;
+        description = "IP address to listen on.";
+      };
+
+      port = mkOption {
+	default = 8080;
+        description = "port to listen on.";
+      };
+
+      options = mkOption {
+        default = "";
+        description = "Extra CLI options to pass to 4Store's 4s-httpd process.";
+      };
+
+    };
+
+  };
+
+
+  ###### implementation
+
+  config = mkIf cfg.enable (
+    mkAssert (cfg.enable -> cfg.database != "")
+      "Must specify database name" {
+
+    users.extraUsers = singleton
+      { name = endpointUser;
+        uid = config.ids.uids.fourStoreEndpoint;
+        description = "4Store SPARQL endpoint user";
+#        home = stateDir;
+      };
+
+    services.avahi.enable = true;
+
+    jobs.fourStoreEndpoint = {
+      name = "4store-endpoint";
+      startOn = "filesystem";
+
+      exec = ''
+	${run} '${pkgs.rdf4store}/bin/4s-httpd -D ${cfg.options} ${if cfg.listenAddress!=null then "-H ${cfg.listenAddress}" else "" } -p ${toString cfg.port} ${cfg.database}'
+      '';
+    };
+
+  });
+  
+}
-- 
GitLab


From 37562ea8646ee38fc1ad04a70c63b15bb21bbcd1 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 19 Apr 2011 13:23:45 +0000
Subject: [PATCH 2953/5331] * Remove a debug statement.

svn path=/nixos/trunk/; revision=26889
---
 modules/security/consolekit.nix | 2 --
 1 file changed, 2 deletions(-)

diff --git a/modules/security/consolekit.nix b/modules/security/consolekit.nix
index 2745aa10e29..6d3121903e3 100644
--- a/modules/security/consolekit.nix
+++ b/modules/security/consolekit.nix
@@ -20,8 +20,6 @@ let
         PATH=${pkgs.coreutils}/bin:${pkgs.gnused}/bin:${pkgs.glibc}/bin
         TAGDIR=/var/run/console
 
-        exec >> /tmp/xyzzy 2>&1
-
         [ -n "$CK_SESSION_USER_UID" ] || exit 1
 
         TAGFILE="$TAGDIR/`getent passwd $CK_SESSION_USER_UID | cut -f 1 -d:`"
-- 
GitLab


From 76d3721a53f3730b163a2ac626bf7a5f5bcfc3ad Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 19 Apr 2011 13:37:31 +0000
Subject: [PATCH 2954/5331] * `dnsmasq' shouldn't run by default.

svn path=/nixos/trunk/; revision=26890
---
 modules/services/networking/dnsmasq.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/services/networking/dnsmasq.nix b/modules/services/networking/dnsmasq.nix
index 3c215d837f9..6ff9e05f4d6 100644
--- a/modules/services/networking/dnsmasq.nix
+++ b/modules/services/networking/dnsmasq.nix
@@ -19,7 +19,7 @@ in
     services.dnsmasq = {
 
       enable = mkOption {
-        default = true;
+        default = false;
         description = ''
           Whether to run dnsmasq.
         '';
-- 
GitLab


From ee3269cbbde932e68eecc532844e3ee0af4a48b2 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 20 Apr 2011 10:48:52 +0000
Subject: [PATCH 2955/5331] * Put "minimal" or "graphical" in the ISO name to
 distinguish between   the files.

svn path=/nixos/trunk/; revision=26901
---
 modules/installer/cd-dvd/installation-cd-base.nix |  2 +-
 modules/installer/cd-dvd/iso-image.nix            |  9 ++++++++-
 release.nix                                       | 11 +++++++----
 3 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/modules/installer/cd-dvd/installation-cd-base.nix b/modules/installer/cd-dvd/installation-cd-base.nix
index e3a458cb92c..a011861ea36 100644
--- a/modules/installer/cd-dvd/installation-cd-base.nix
+++ b/modules/installer/cd-dvd/installation-cd-base.nix
@@ -39,7 +39,7 @@ in
     ];
 
   # ISO naming.
-  isoImage.isoName = "nixos-${config.system.nixosVersion}-${pkgs.stdenv.system}.iso";
+  isoImage.isoName = "${config.isoImage.isoBaseName}-${config.system.nixosVersion}-${pkgs.stdenv.system}.iso";
     
   isoImage.volumeID = "NIXOS_INSTALL_CD_${config.system.nixosVersion}";
   
diff --git a/modules/installer/cd-dvd/iso-image.nix b/modules/installer/cd-dvd/iso-image.nix
index ee7ce632e51..6e1994cffc7 100644
--- a/modules/installer/cd-dvd/iso-image.nix
+++ b/modules/installer/cd-dvd/iso-image.nix
@@ -11,12 +11,19 @@ let
   options = {
 
     isoImage.isoName = mkOption {
-      default = "cd.iso";
+      default = "${config.isoImage.isoName}.iso";
       description = ''
         Name of the generated ISO image file.
       '';
     };
 
+    isoImage.isoBaseName = mkOption {
+      default = "nixos";
+      description = ''
+        Prefix of the name of the generated ISO image file.
+      '';
+    };
+
     isoImage.compressImage = mkOption {
       default = false;
       description = ''
diff --git a/release.nix b/release.nix
index ca178f1290b..f89709c628d 100644
--- a/release.nix
+++ b/release.nix
@@ -4,7 +4,7 @@ let
 
 
   makeIso =
-    { module, description, maintainers ? ["eelco"]}:
+    { module, type, description ? type, maintainers ? ["eelco"] }:
     { nixosSrc ? {outPath = ./.; rev = 1234;}
     , officialRelease ? false
     , system ? "i686-linux"
@@ -16,7 +16,10 @@ let
 
       version = builtins.readFile ./VERSION + (if officialRelease then "" else "pre${toString nixosSrc.rev}");
 
-      versionModule = { system.nixosVersion = version; };
+      versionModule =
+        { system.nixosVersion = version;
+          isoImage.isoBaseName = "nixos-${type}";
+        };
 
       config = (import lib/eval-config.nix {
         inherit system nixpkgs;
@@ -119,12 +122,12 @@ let
 
     iso_minimal = makeIso {
       module = ./modules/installer/cd-dvd/installation-cd-minimal.nix;
-      description = "minimal";
+      type = "minimal";
     };
 
     iso_graphical = makeIso {
       module = ./modules/installer/cd-dvd/installation-cd-graphical.nix;
-      description = "graphical";
+      type = "graphical";
     };
 
     # Provide a tarball that can be unpacked into an SD card, and easily
-- 
GitLab


From 8dfc5d041ad47fa7ca748e7532600edac14c7a41 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Wed, 20 Apr 2011 20:59:07 +0000
Subject: [PATCH 2956/5331] Adding 'ethers' on nsswitch.

svn path=/nixos/trunk/; revision=26913
---
 modules/config/nsswitch.conf | 1 +
 1 file changed, 1 insertion(+)

diff --git a/modules/config/nsswitch.conf b/modules/config/nsswitch.conf
index b4890470835..44beaf5b44c 100644
--- a/modules/config/nsswitch.conf
+++ b/modules/config/nsswitch.conf
@@ -4,6 +4,7 @@ shadow:         files ldap
 
 hosts:          files dns
 networks:       files dns
+ethers:         files
 
 services:       files
 protocols:      files
-- 
GitLab


From ba2d96cf854ce628c2f14a4a278f8e30e3245153 Mon Sep 17 00:00:00 2001
From: Nicolas Pierron <nicolas.b.pierron@gmail.com>
Date: Sat, 23 Apr 2011 17:53:05 +0000
Subject: [PATCH 2957/5331] nixos-option: Handle Lambdas in the injection of
 previously pretty-printed output.

svn path=/nixos/trunk/; revision=26936
---
 modules/installer/tools/nixos-option.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/installer/tools/nixos-option.sh b/modules/installer/tools/nixos-option.sh
index 456e2b275d0..b2a0958ed89 100644
--- a/modules/installer/tools/nixos-option.sh
+++ b/modules/installer/tools/nixos-option.sh
@@ -316,7 +316,7 @@ else
   # echo 1>&2 "Warning: This value is not an option."
 
   result=$(evalCfg)
-  if names=$(echo "builtins.attrNames $result" | sed 's,<CODE>,"<CODE>",g' | nix-instantiate - --eval-only --strict 2> /dev/null); then
+  if names=$(echo "builtins.attrNames $result" | sed 's,<[A-Z]*>,0,g' | nix-instantiate - --eval-only --strict 2> /dev/null); then
     echo 1>&2 "This attribute set contains:" 
     for attr in $names; do
       test $attr = '[' -o $attr = ']' && continue;
-- 
GitLab


From 0265bff8440a8f96e699778e9ab686ea70c1ea69 Mon Sep 17 00:00:00 2001
From: Nicolas Pierron <nicolas.b.pierron@gmail.com>
Date: Sun, 24 Apr 2011 04:19:15 +0000
Subject: [PATCH 2958/5331] Improve nixos-gui: - Can navigate in the tree of
 option. - Provide information on options.

svn path=/nixos/trunk/; revision=26945
---
 gui/application.ini                       |   2 +-
 gui/chrome.manifest                       |   1 +
 gui/chrome/chrome.manifest                |   2 +-
 gui/chrome/content/{nixos-gui => }/io.js  |  65 +++++-
 gui/chrome/content/main.js                |  40 ++++
 gui/chrome/content/myviewer.xul           |  42 ++++
 gui/chrome/content/nixos-gui/main.js      | 171 ----------------
 gui/chrome/content/nixos-gui/myviewer.xul |  30 ---
 gui/chrome/content/nixos-gui/treeView.js  | 117 -----------
 gui/chrome/content/nixos.js               | 205 +++++++++++++++++++
 gui/chrome/content/optionView.js          | 233 ++++++++++++++++++++++
 11 files changed, 587 insertions(+), 321 deletions(-)
 create mode 100644 gui/chrome.manifest
 rename gui/chrome/content/{nixos-gui => }/io.js (54%)
 create mode 100644 gui/chrome/content/main.js
 create mode 100644 gui/chrome/content/myviewer.xul
 delete mode 100644 gui/chrome/content/nixos-gui/main.js
 delete mode 100644 gui/chrome/content/nixos-gui/myviewer.xul
 delete mode 100644 gui/chrome/content/nixos-gui/treeView.js
 create mode 100644 gui/chrome/content/nixos.js
 create mode 100644 gui/chrome/content/optionView.js

diff --git a/gui/application.ini b/gui/application.ini
index 0da5e498dad..a832d9d285b 100644
--- a/gui/application.ini
+++ b/gui/application.ini
@@ -32,4 +32,4 @@ MinVersion=1.9a5
 ; This field is optional.  It specifies the maximum Gecko version that this
 ; application requires.  It should be specified if your application uses
 ; unfrozen interfaces.
-;MaxVersion=1.9.0.*
+MaxVersion=2.*
diff --git a/gui/chrome.manifest b/gui/chrome.manifest
new file mode 100644
index 00000000000..865d6a88fb4
--- /dev/null
+++ b/gui/chrome.manifest
@@ -0,0 +1 @@
+manifest chrome/chrome.manifest
diff --git a/gui/chrome/chrome.manifest b/gui/chrome/chrome.manifest
index 6b524807eaa..775445ee17b 100644
--- a/gui/chrome/chrome.manifest
+++ b/gui/chrome/chrome.manifest
@@ -1 +1 @@
-content nixos-gui content/nixos-gui/
+content nixos-gui content/
diff --git a/gui/chrome/content/nixos-gui/io.js b/gui/chrome/content/io.js
similarity index 54%
rename from gui/chrome/content/nixos-gui/io.js
rename to gui/chrome/content/io.js
index 3e3b080b814..8d9c8c17365 100644
--- a/gui/chrome/content/nixos-gui/io.js
+++ b/gui/chrome/content/io.js
@@ -1,3 +1,66 @@
+
+function inspect(obj, maxLevels, level)
+{
+  var str = '', type, msg;
+
+    // Start Input Validations
+    // Don't touch, we start iterating at level zero
+    if(level == null)  level = 0;
+
+    // At least you want to show the first level
+    if(maxLevels == null) maxLevels = 1;
+    if(maxLevels < 1)
+        return '<font color="red">Error: Levels number must be > 0</font>';
+
+    // We start with a non null object
+    if(obj == null)
+    return '<font color="red">Error: Object <b>NULL</b></font>';
+    // End Input Validations
+
+    // Each Iteration must be indented
+    str += '<ul>';
+
+    // Start iterations for all objects in obj
+    for(property in obj)
+    {
+      try
+      {
+          // Show "property" and "type property"
+          type =  typeof(obj[property]);
+          str += '<li>(' + type + ') ' + property +
+                 ( (obj[property]==null)?(': <b>null</b>'):('')) + '</li>';
+
+          // We keep iterating if this property is an Object, non null
+          // and we are inside the required number of levels
+          if((type == 'object') && (obj[property] != null) && (level+1 < maxLevels))
+          str += inspect(obj[property], maxLevels, level+1);
+      }
+      catch(err)
+      {
+        // Is there some properties in obj we can't access? Print it red.
+        if(typeof(err) == 'string') msg = err;
+        else if(err.message)        msg = err.message;
+        else if(err.description)    msg = err.description;
+        else                        msg = 'Unknown';
+
+        str += '<li><font color="red">(Error) ' + property + ': ' + msg +'</font></li>';
+      }
+    }
+
+      // Close indent
+      str += '</ul>';
+
+    return str;
+}
+
+// Run xulrunner application.ini -jsconsole -console, to see messages.
+function log(str)
+{
+  Components.classes['@mozilla.org/consoleservice;1']
+    .getService(Components.interfaces.nsIConsoleService)
+    .logStringMessage(str);
+}
+
 function makeTempFile(prefix)
 {
   var file = Components.classes["@mozilla.org/file/directory_service;1"]
@@ -29,7 +92,7 @@ function readFromFile(file)
   var sstream = Components.classes["@mozilla.org/scriptableinputstream;1"]
                           .createInstance(Components.interfaces.nsIScriptableInputStream);
   fstream.init(file, -1, 0, 0);
-  sstream.init(fstream); 
+  sstream.init(fstream);
 
   var str = sstream.read(4096);
   while (str.length > 0) {
diff --git a/gui/chrome/content/main.js b/gui/chrome/content/main.js
new file mode 100644
index 00000000000..de272e27378
--- /dev/null
+++ b/gui/chrome/content/main.js
@@ -0,0 +1,40 @@
+// global variables.
+var gNixOS;
+var gOptionView;
+
+/*
+var gProgressBar;
+function setProgress(current, max)
+{
+  if (gProgressBar) {
+    gProgressBar.value = 100 * current / max;
+    log("progress: " + gProgressBar.value + "%");
+  }
+  else
+    log("unknow progress bar");
+}
+*/
+
+function updatePanel(options)
+{
+  log("updatePanel: " + options.length);
+  var t = "";
+  for (var i = 0; i < options.length; i++)
+  {
+    log("Called with " + options[i].path);
+    t += options[i].description;
+  }
+  $("#option-desc").text(t);
+}
+
+
+function onload()
+{
+  var optionTree = document.getElementById("option-tree");
+  // gProgressBar = document.getElementById("progress-bar");
+  // setProgress(0, 1);
+
+  gNixOS = new NixOS();
+  gOptionView = new OptionView(gNixOS.option, updatePanel);
+  optionTree.view = gOptionView;
+}
diff --git a/gui/chrome/content/myviewer.xul b/gui/chrome/content/myviewer.xul
new file mode 100644
index 00000000000..23c6ce0a65d
--- /dev/null
+++ b/gui/chrome/content/myviewer.xul
@@ -0,0 +1,42 @@
+<?xml version="1.0"?>
+<?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
+
+<!DOCTYPE window>
+
+<!-- To edit this file I recommend you to use:
+     http://xulfr.org/outils/xulediteur.xul
+  -->
+
+<window
+  id     = "nixos-gui"
+  title  = "NixOS gui"
+  width  = "800"
+  height = "600"
+  xmlns  = "http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
+  <script src="jquery-1.3.2.js"/>
+  <script src="io.js"/>
+  <script src="nixos.js"/>
+  <script src="optionView.js"/>
+  <script src="main.js"/>
+  <columns height="580">
+    <column width = "300">
+      <tree flex="1" id="option-tree" persist="height" onselect="gOptionView.selectionChanged()">
+        <treecols>
+          <treecol persist="hidden width" flex="1" id="opt-name"
+                   label="Option" primary="true"/>
+          <!-- Uncomment the following column to see the number of option
+               printed below each options. -->
+          <!--
+          <treecol persist="hidden width" flex="1" id="dbg-size"
+                   label="Size"/>
+          -->
+        </treecols>
+        <treechildren id="first-child" flex="1"/>
+      </tree>
+    </column>
+    <column flex="1">
+      <description id="option-desc" hidden="false"></description>
+    </column>
+  </columns>
+<!--  <progressmeter id="progress-bar" value="0%"/> -->
+</window>
diff --git a/gui/chrome/content/nixos-gui/main.js b/gui/chrome/content/nixos-gui/main.js
deleted file mode 100644
index baa934e43e2..00000000000
--- a/gui/chrome/content/nixos-gui/main.js
+++ /dev/null
@@ -1,171 +0,0 @@
-var COPYCOL = 2;
-var gOptionListView = new treeView(["opt-success","opt-name","opt-desc"],
-                                   COPYCOL);
-
-// Run xulrunner application.ini -jsconsole -console, to see messages.
-function log(str)
-{
-  Components.classes['@mozilla.org/consoleservice;1']
-    .getService(Components.interfaces.nsIConsoleService)
-    .logStringMessage(str);
-}
-
-
-// return the DOM of the value returned by nix-instantiate
-function dumpOptions(path)
-{
-  var nixInstantiate = "nix-instantiate"; // "@nix@/bin/nix-instantiate";
-  var nixos = "/etc/nixos/nixos/default.nix"; // "@nixos@/default.nix";
-
-  var o = makeTempFile("nixos-options");
-
-  path = "eval.options" + (path? "." + path : "");
-  log("retrieve options from: " + path);
-
-  runProgram(nixInstantiate+" "+nixos+" -A "+path+" --eval-only --strict --xml 2>/dev/null | tr -d '' >" + o.path);
-
-  var xml = readFromFile(o);
-  o.remove(false);
-
-  // jQuery does a stack overflow when converting the XML to a DOM.
-  var dom = DOMParser().parseFromString(xml, "text/xml");
-  
-  log("return dom");
-  return dom;
-}
-
-
-// Pretty print Nix values.
-function nixPP(value, level)
-{
-  function indent(level) {  ret = ""; while (level--) ret+= "  "; return ret; }
-
-  if (!level) level = 0;
-  var ret = "<no match>";
-  if (value.is("attrs")) {
-    var content = "";
-    value.children().each(function (){
-      var name = $(this).attr("name");
-      var value = nixPP($(this).children(), level + 1);
-      content += indent(level + 1) + name + " = " + value + ";\n";
-    });
-    ret = "{\n" + content + indent(level) + "}";
-  }
-  else if (value.is("list")) {
-    var content = "";
-    value.children().each(function (){
-      content += indent(level + 1) + "(" + nixPP($(this), level + 1) + ")\n";
-    });
-    ret = "[\n" + content + indent(level) + "]";
-  }
-  else if (value.is("bool"))
-    ret = (value.attr("value") == "true");
-  else if (value.is("string"))
-    ret = '"' + value.attr("value") + '"';
-  else if (value.is("path"))
-    ret = value.attr("value");
-  else if (value.is("int"))
-    ret = parseInt(value.attr("value"));
-  else if (value.is("derivation"))
-    ret = value.attr("outPath");
-  else if (value.is("function"))
-    ret = "<function>";
-  else {
-    var content = "";
-    value.children().each(function (){
-      content += indent(level + 1) + "(" + nixPP($(this), level + 1) + ")\n";
-    });
-    ret = "<!--" + value.selector + "--><!--\n" + content + indent(level) + "-->";
-  }
-  return ret;
-}
-
-// Function used to reproduce the select operator on the XML DOM.
-// It return the value contained in the targeted attribute.
-function nixSelect(attrs, selector)
-{
-  var names = selector.split(".");
-  var value = $(attrs);
-  for (var i = 0; i < names.length; i++) {
-    log(nixPP(value) + "." + names[i]);
-    if (value.is("attrs"))
-      value = value.children("attr[name='" + names[i] + "']").children();
-    else {
-      log("Cannot do an attribute selection.");
-      break
-    }
-  }
-
-  log("nixSelect return: " + nixPP(value));
-
-  var ret;
-  if (value.is("attrs") || value.is("list"))
-    ret = value;
-  else if (value.is("bool"))
-    ret = value.attr("value") == "true";
-  else if (value.is("string"))
-    ret = value.attr("value");
-  else if (value.is("int"))
-    ret = parseInt(value.attr("value"));
-  else if (value.is("derivation"))
-    ret = value.attr("outPath");
-  else if (value.is("function"))
-    ret = "<function>";
-
-  return ret;
-}
-
-var gProgressBar;
-function setProgress(current, max)
-{
-  if (gProgressBar) {
-    gProgressBar.value = 100 * current / max;
-    log("progress: " + gProgressBar.value + "%");
-  }
-  else
-    log("unknow progress bar");
-}
-
-// fill the list of options
-function setOptionList(optionDOM)
-{
-  var options = $("attrs", optionDOM).filter(function () {
-    return $(this)
-      .children("attr[name='_type']")
-      .children("string[value='option']")
-      .length != 0;
-  });
-
-  var max = options.length;
-
-  log("Number of options: " + max);
-
-  setProgress(0, max);
-  gOptionListView.clear();
-  options.each(function (index){
-      var success = nixSelect(this, "config.success");
-      var name = nixSelect(this, "name");
-      var desc = nixSelect(this, "description");
-      if (success && name && desc) {
-        log("Add option '" + name + "' in the list.");
-        gOptionListView.addRow([success, name, desc]);
-      }
-      else
-        log("A problem occur while scanning an option.");
-      setProgress(index + 1, max);
-  });
-}
-
-
-function onload()
-{
-  var optionList = document.getElementById("option-list");
-  gProgressBar = document.getElementById("progress-bar");
-  setProgress(0, 1);
-  optionList.view = gOptionListView;
-
-  // try to avoid blocking the rendering, unfortunately this is not perfect.
-  setTimeout(function (){
-    setOptionList(dumpOptions("hardware"));}
-  , 100);
-}
diff --git a/gui/chrome/content/nixos-gui/myviewer.xul b/gui/chrome/content/nixos-gui/myviewer.xul
deleted file mode 100644
index c0c2bd6f822..00000000000
--- a/gui/chrome/content/nixos-gui/myviewer.xul
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0"?>
-<?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
-
-<!DOCTYPE window>
-
-<!-- To edit this file I recommend you to use: 
-     http://xulfr.org/outils/xulediteur.xul
-  -->
-
-<window
-  id     = "nixos-gui"
-  title  = "NixOS gui"
-  xmlns  = "http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
-  <script src="jquery-1.3.2.js"/>
-  <script src="treeView.js"/>
-  <script src="main.js"/>
-  <script src="io.js"/>
-  <tree flex="1" id="option-list" persist="height">
-    <treecols>
-      <treecol persist="hidden width" flex="1" id="opt-success" label="Success"/>
-      <splitter class="tree-splitter"/>
-      <treecol persist="hidden width" flex="30" id="opt-name" label="Option"/>
-      <splitter class="tree-splitter"/>
-      <treecol persist="hidden width" flex="50" id="opt-desc" label="Description"
-               primary="true"/>
-    </treecols>
-    <treechildren id="first-child" flex="1"/>
-  </tree>
-  <progressmeter id="progress-bar" value="0%"/>
-</window>
diff --git a/gui/chrome/content/nixos-gui/treeView.js b/gui/chrome/content/nixos-gui/treeView.js
deleted file mode 100644
index 8ab7c875e68..00000000000
--- a/gui/chrome/content/nixos-gui/treeView.js
+++ /dev/null
@@ -1,117 +0,0 @@
-// Taken from pageInfo.js
-
-//******** define a js object to implement nsITreeView
-function treeView(columnids, copycol)
-{
-  // columnids is an array of strings indicating the names of the columns, in order
-  this.columnids = columnids;
-  this.colcount = columnids.length;
-
-  // copycol is the index number for the column that we want to add to
-  // the copy-n-paste buffer when the user hits accel-c
-  this.copycol = copycol;
-  this.rows = 0;
-  this.tree = null;
-  this.data = [ ];
-  this.selection = null;
-  this.sortcol = null;
-  this.sortdir = 0;
-}
-
-treeView.prototype = {
-  set rowCount(c) { throw "rowCount is a readonly property"; },
-  get rowCount() { return this.rows; },
-
-  setTree: function(tree)
-  {
-    this.tree = tree;
-  },
-
-  getCellText: function(row, column)
-  {
-    // row can be null, but js arrays are 0-indexed.
-    // colidx cannot be null, but can be larger than the number
-    // of columns in the array (when column is a string not in
-    // this.columnids.) In this case it's the fault of
-    // whoever typoed while calling this function.
-    return this.data[row][column.index] || "";
-  },
-
-  setCellValue: function(row, column, value)
-  {
-  },
-
-  setCellText: function(row, column, value)
-  {
-    this.data[row][column.index] = value;
-  },
-
-  addRow: function(row)
-  {
-    this.rows = this.data.push(row);
-    this.rowCountChanged(this.rows - 1, 1);
-  },
-
-  addRows: function(rows)
-  {
-    var length = rows.length;
-    for(var i = 0; i < length; i++)
-      this.rows = this.data.push(rows[i]);
-    this.rowCountChanged(this.rows - length, length);
-  },
-
-  rowCountChanged: function(index, count)
-  {
-    this.tree.rowCountChanged(index, count);
-  },
-
-  invalidate: function()
-  {
-    this.tree.invalidate();
-  },
-
-  clear: function()
-  {
-    if (this.tree)
-      this.tree.rowCountChanged(0, -this.rows);
-    this.rows = 0;
-    this.data = [ ];
-  },
-
-  handleCopy: function(row)
-  {
-    return (row < 0 || this.copycol < 0) ? "" : (this.data[row][this.copycol] || "");
-  },
-
-  performActionOnRow: function(action, row)
-  {
-    if (action == "copy") {
-      var data = this.handleCopy(row)
-      this.tree.treeBody.parentNode.setAttribute("copybuffer", data);
-    }
-  },
-
-  getRowProperties: function(row, prop) { },
-  getCellProperties: function(row, column, prop) { },
-  getColumnProperties: function(column, prop) { },
-  isContainer: function(index) { return false; },
-  isContainerOpen: function(index) { return false; },
-  isSeparator: function(index) { return false; },
-  isSorted: function() { },
-  canDrop: function(index, orientation) { return false; },
-  drop: function(row, orientation) { return false; },
-  getParentIndex: function(index) { return 0; },
-  hasNextSibling: function(index, after) { return false; },
-  getLevel: function(index) { return 0; },
-  getImageSrc: function(row, column) { },
-  getProgressMode: function(row, column) { },
-  getCellValue: function(row, column) { },
-  toggleOpenState: function(index) { },
-  cycleHeader: function(col) { },
-  selectionChanged: function() { },
-  cycleCell: function(row, column) { },
-  isEditable: function(row, column) { return false; },
-  isSelectable: function(row, column) { return false; },
-  performAction: function(action) { },
-  performActionOnCell: function(action, row, column) { }
-};
diff --git a/gui/chrome/content/nixos.js b/gui/chrome/content/nixos.js
new file mode 100644
index 00000000000..411dc844c4f
--- /dev/null
+++ b/gui/chrome/content/nixos.js
@@ -0,0 +1,205 @@
+
+function NixOS () {
+  var env = Components.classes["@mozilla.org/process/environment;1"].
+    getService(Components.interfaces.nsIEnvironment);
+
+  if (env.exists("NIXOS"))
+    this.nixos = env.get("NIXOS");
+  if (env.exists("NIXOS_CONFIG"))
+    this.config = env.get("NIXOS_CONFIG");
+  if (env.exists("NIXPKGS"))
+    this.nixpkgs = env.get("NIXPKGS");
+  if (env.exists("mountPoint"))
+    this.root = env.get("mountPoint");
+  if (env.exists("NIXOS_OPTION"))
+    this.optionBin = env.get("NIXOS_OPTION");
+  this.option = new Option("options", this, null);
+};
+
+NixOS.prototype = {
+  root: "",
+  nixos: "/etc/nixos/nixos",
+  nixpkgs: "/etc/nixos/nixpkgs",
+  config: "/etc/nixos/configuration.nix",
+  instantiateBin: "/var/run/current-system/sw/bin/nix-instantiate",
+  optionBin: "/var/run/current-system/sw/bin/nixos-option",
+  tmpFile: "nixos-gui",
+  option: null
+};
+
+function Option (name, context, parent) {
+  this.name = name;
+  this.context_ = context;
+  if (parent == null)
+    this.path = "";
+  else if (parent.path == "")
+    this.path = name;
+  else
+    this.path = parent.path + "." + name;
+};
+
+Option.prototype = {
+  load: function () {
+    var env = "";
+    env += "'NIXOS=" + this.context_.root + this.context_.nixos + "' ";
+    env += "'NIXOS_PKGS=" + this.context_.root + this.context_.nixpkgs + "' ";
+    env += "'NIXOS_CONFIG=" + this.context_.config + "' ";
+    var out = makeTempFile(this.context_.tmpFile);
+    var prog = this.context_.instantiateBin + " 2>&1 >" + out.path + " ";
+    var args = "";
+    args += " -A eval.options" + (this.path != "" ? "." : "") + this.path;
+    args += " --eval-only --xml --no-location";
+    args += " '" + this.context_.root + this.context_.nixos + "'";
+
+    runProgram(/*env +*/ prog + args);
+    var xml = readFromFile(out);
+    out.remove(false);
+
+    // jQuery does a stack overflow when converting a huge XML to a DOM.
+    var dom = DOMParser().parseFromString(xml, "text/xml");
+    var xmlAttrs = $("attr", dom);
+
+    this.isOption = xmlAttrs
+      .filter (
+        function (idx) {
+          return $(this).attr("name") == "_type";
+          // !!! We could not rely on the value of the attribute because it
+          // !!! may be unevaluated.
+          // $(this).children("string[value='option']").length != 0;
+        })
+      .length != 0;
+
+    if (!this.isOption)
+    {
+      var cur = this;
+      var attrs = new Array();
+
+      xmlAttrs.each(
+        function (index) {
+          var name = $(this).attr("name");
+          var attr = new Option(name, cur.context_, cur);
+          attrs.push(attr);
+        }
+      );
+
+      this.subOptions = attrs;
+    }
+    else
+    {
+      this.loadDesc();
+      // TODO: handle sub-options here.
+    }
+    this.isLoaded = true;
+  },
+
+  loadDesc:  function () {
+    var env = "";
+    env += "'NIXOS=" + this.context_.root + this.context_.nixos + "' ";
+    env += "'NIXOS_PKGS=" + this.context_.root + this.context_.nixpkgs + "' ";
+    env += "'NIXOS_CONFIG=" + this.context_.config + "' ";
+    var out = makeTempFile(this.context_.tmpFile);
+    var prog = this.context_.optionBin + " 2>&1 >" + out.path + " ";
+    var args = " -vdl " + this.path;
+
+    runProgram(/*env + */ prog + args);
+    this.description = readFromFile(out);
+    out.remove(false);
+  },
+
+  // keep the context under which this option has been used.
+  context_: null,
+  // name of the option.
+  name: "",
+  // result of nixos-option.
+  description: "",
+  // path to reach this option
+  path: "",
+
+  // list of options accessible from here.
+  isLoaded: false,
+  isOption: false,
+  subOptions: []
+};
+
+
+/*
+// Pretty print Nix values.
+function nixPP(value, level)
+{
+  function indent(level) {  ret = ""; while (level--) ret+= "  "; return ret; }
+
+  if (!level) level = 0;
+  var ret = "<no match>";
+  if (value.is("attrs")) {
+    var content = "";
+    value.children().each(function (){
+      var name = $(this).attr("name");
+      var value = nixPP($(this).children(), level + 1);
+      content += indent(level + 1) + name + " = " + value + ";\n";
+    });
+    ret = "{\n" + content + indent(level) + "}";
+  }
+  else if (value.is("list")) {
+    var content = "";
+    value.children().each(function (){
+      content += indent(level + 1) + "(" + nixPP($(this), level + 1) + ")\n";
+    });
+    ret = "[\n" + content + indent(level) + "]";
+  }
+  else if (value.is("bool"))
+    ret = (value.attr("value") == "true");
+  else if (value.is("string"))
+    ret = '"' + value.attr("value") + '"';
+  else if (value.is("path"))
+    ret = value.attr("value");
+  else if (value.is("int"))
+    ret = parseInt(value.attr("value"));
+  else if (value.is("derivation"))
+    ret = value.attr("outPath");
+  else if (value.is("function"))
+    ret = "<function>";
+  else {
+    var content = "";
+    value.children().each(function (){
+      content += indent(level + 1) + "(" + nixPP($(this), level + 1) + ")\n";
+    });
+    ret = "<!--" + value.selector + "--><!--\n" + content + indent(level) + "-->";
+  }
+  return ret;
+}
+
+// Function used to reproduce the select operator on the XML DOM.
+// It return the value contained in the targeted attribute.
+function nixSelect(attrs, selector)
+{
+  var names = selector.split(".");
+  var value = $(attrs);
+  for (var i = 0; i < names.length; i++) {
+    log(nixPP(value) + "." + names[i]);
+    if (value.is("attrs"))
+      value = value.children("attr[name='" + names[i] + "']").children();
+    else {
+      log("Cannot do an attribute selection.");
+      break;
+    }
+  }
+
+  log("nixSelect return: " + nixPP(value));
+
+  var ret;
+  if (value.is("attrs") || value.is("list"))
+    ret = value;
+  else if (value.is("bool"))
+    ret = value.attr("value") == "true";
+  else if (value.is("string"))
+    ret = value.attr("value");
+  else if (value.is("int"))
+    ret = parseInt(value.attr("value"));
+  else if (value.is("derivation"))
+    ret = value.attr("outPath");
+  else if (value.is("function"))
+    ret = "<function>";
+
+  return ret;
+}
+*/
\ No newline at end of file
diff --git a/gui/chrome/content/optionView.js b/gui/chrome/content/optionView.js
new file mode 100644
index 00000000000..8e04e282828
--- /dev/null
+++ b/gui/chrome/content/optionView.js
@@ -0,0 +1,233 @@
+// extend NixOS options to handle the Tree View.  Should be better to keep a
+// separation of concern here.
+
+Option.prototype.tv_opened = false;
+Option.prototype.tv_size = 1;
+
+Option.prototype.tv_open = function () {
+  this.tv_opened = true;
+  this.tv_size = 1;
+
+  // load an option if it is not loaded yet, and initialize them to be
+  // read by the Option view.
+  if (!this.isLoaded)
+    this.load();
+
+  // If this is not an option, then add it's lits of sub-options size.
+  if (!this.isOption)
+  {
+    for (var i = 0; i < this.subOptions.length; i++)
+      this.tv_size += this.subOptions[i].tv_size;
+  }
+};
+
+Option.prototype.tv_close = function () {
+  this.tv_opened = false;
+  this.tv_size = 1;
+};
+
+
+
+
+function OptionView (root, selCallback) {
+  root.tv_open();
+  this.rootOption = root;
+  this.selCallback = selCallback;
+}
+
+OptionView.prototype = {
+  rootOption: null,
+  selCallback: null,
+
+  // This function returns the path to option which is at the specified row.
+  reach_cache: null,
+  reachRow: function (row) {
+    var o = this.rootOption; // Current option.
+    var r = 0; // Number of rows traversed.
+    var c = 0; // Child index.
+    var path = [{ row: r, opt: o }]; // new Array();
+    // hypothesis: this.rootOption.tv_size is always open and bigger than
+
+    // Use the previous returned value to avoid making to many checks and to
+    // optimize for frequent access of near rows.
+    if (this.reach_cache != null)
+    {
+      for (var i = this.reach_cache.length - 2; i >= 0; i--) {
+        var p = this.reach_cache[i];
+        // If we will have to go the same path.
+        if (row >= p.row && row < p.row + p.opt.tv_size)
+        {
+          path.unshift(p);
+          r = path[0].row;
+          o = path[0].opt;
+        }
+        else
+          break;
+      };
+    }
+
+    while (r != row)
+    {
+      // Go deeper in the child which contains the requested row.  The
+      // tv_size contains the size of the tree starting from each option.
+      c = 0;
+      while (c < o.subOptions.length && r + o.subOptions[c].tv_size < row)
+      {
+        r += o.subOptions[c].tv_size;
+        c += 1;
+      }
+      if (c < o.subOptions.length && r + o.subOptions[c].tv_size >= row)
+      {
+        // Count the current option as a row.
+        o = o.subOptions[c];
+        r += 1;
+      }
+      else
+        alert("WTF: " + o.name + " ask: " + row + " children: " + o.subOptions + " c: " + c);
+      path.unshift({ row: r, opt: o });
+    }
+
+    this.reach_cache = path;
+    return path;
+  },
+
+  // needs to return true if there is a /row/ at the same level /after/ a
+  // given row.
+  hasNextSibling: function(row, after) {
+    log("sibling " + row + " after " + after);
+    var path = reachRow(row);
+    if (path.length > 1)
+    {
+      var last = path[1].row + path[1].opt.tv_size;
+      // Has a next sibling if the row is not over the size of the
+      // parent and if the current one is not the last child.
+      return after + 1 < last && path[0].row + path[0].opt.tv_size < last;
+    }
+    else
+      // The top-level option has no sibling.
+      return false;
+  },
+
+  // Does the current row contain any sub-options?
+  isContainer: function(row) {
+    return !this.reachRow(row)[0].opt.isOption;
+  },
+  isContainerEmpty: function(row) {
+    return this.reachRow(row)[0].opt.subOptions.length == 0;
+  },
+  isContainerOpen: function(row) {
+    return this.reachRow(row)[0].opt.tv_opened;
+  },
+
+  // Open or close an option.
+  toggleOpenState: function (row) {
+    var path = this.reachRow(row);
+    var delta = -path[0].opt.tv_size;
+    if (path[0].opt.tv_opened)
+      path[0].opt.tv_close();
+    else
+      path[0].opt.tv_open();
+    delta += path[0].opt.tv_size;
+
+    // Parents are alreay opened, but we need to update the tv_size
+    // counters.  Thus we have to invalidate the reach cache.
+    this.reach_cache = null;
+    for (var i = 1; i < path.length; i++)
+      path[i].opt.tv_open();
+
+    this.tree.rowCountChanged(row + 1, delta);
+  },
+
+  // Return the identation level of the option at the line /row/.  The
+  // top-level level is 0.
+  getLevel: function(row) {
+    return this.reachRow(row).length - 1;
+  },
+
+  // Obtain the index of a parent row. If there is no parent row,
+  // returns -1.
+  getParentIndex: function(row) {
+    var path = this.reachRow(row);
+    if (path.length > 1)
+      return path[1].row;
+    else
+      return -1;
+  },
+
+
+  // Return the content of each row base on the column name.
+  getCellText: function(row, column) {
+    if (column.id == "opt-name")
+      return this.reachRow(row)[0].opt.name;
+    if (column.id == "dbg-size")
+      return this.reachRow(row)[0].opt.tv_size;
+    return "";
+  },
+
+  // We have no column with images.
+  getCellValue: function(row, column) { },
+
+
+  isSelectable: function(row, column) { return true; },
+
+  // Get the selection out of the tree and give options to the call back
+  // function.
+  selectionChanged: function() {
+    if (this.selCallback == null)
+      return;
+    var opts = [];
+    var start = new Object();
+    var end = new Object();
+    var numRanges = this.tree.view.selection.getRangeCount();
+
+    for (var t = 0; t < numRanges; t++) {
+      this.tree.view.selection.getRangeAt(t,start,end);
+      for (var v = start.value; v <= end.value; v++) {
+        var opt = this.reachRow(v)[0].opt;
+        if (!opt.isLoaded)
+          opt.load();
+        if (opt.isOption)
+          opts.push(opt);
+      }
+    }
+
+    if (opts.lenght != 0)
+      this.selCallback(opts);
+  },
+
+  set rowCount(c) { throw "rowCount is a readonly property"; },
+  get rowCount() { return this.rootOption.tv_size; },
+
+  // refuse drag-n-drop of options.
+  canDrop: function (index, orientation, dataTransfer) { return false; },
+  drop: function (index, orientation, dataTransfer) { },
+
+  // ?
+  getCellProperties: function(row, column, prop) { },
+  getColumnProperties: function(column, prop) { },
+  getRowProperties: function(row, prop) { },
+  getImageSrc: function(row, column) { },
+
+  // No progress columns are used.
+  getProgressMode: function(row, column) { },
+
+  // Do not add options yet.
+  isEditable: function(row, column) { return false; },
+  setCellValue: function(row, column, value) { },
+  setCellText: function(row, column, value) { },
+
+  // ...
+  isSeparator: function(index) { return false; },
+  isSorted: function() { return false; },
+  performAction: function(action) { },
+  performActionOnCell: function(action, row, column) { },
+  performActionOnRow: function(action, row) { }, // ??
+
+  // ??
+  cycleCell: function (row, col) { },
+  cycleHeader: function(col) { },
+
+  selection: null,
+  tree: null,
+  setTree: function(tree) { this.tree = tree; }
+};
-- 
GitLab


From 66eed7681d707ecf0dd9fe2a22e2fe2846ee60ed Mon Sep 17 00:00:00 2001
From: Nicolas Pierron <nicolas.b.pierron@gmail.com>
Date: Sun, 24 Apr 2011 15:30:25 +0000
Subject: [PATCH 2959/5331] nixos-option: Add xml output to reduce the effort
 in nixos-gui.

svn path=/nixos/trunk/; revision=26950
---
 modules/installer/tools/nixos-option.sh | 71 +++++++++++++++++++++++--
 1 file changed, 68 insertions(+), 3 deletions(-)

diff --git a/modules/installer/tools/nixos-option.sh b/modules/installer/tools/nixos-option.sh
index b2a0958ed89..4b76f824c4c 100644
--- a/modules/installer/tools/nixos-option.sh
+++ b/modules/installer/tools/nixos-option.sh
@@ -11,7 +11,7 @@ export NIXOS
 
 usage () {
   echo 1>&2 "
-Usage: $0 [--install] [-v] [-d] [-l] OPTION_NAME
+Usage: $0 [--install] [-v] [-d] [-l] [--xml] OPTION_NAME
        $0 [--install]
 
 This program is used to explore NixOS options by looking at their values or
@@ -31,6 +31,8 @@ Options:
                         description.
   -l | --lookup         Display where the option is defined and where it
                         is declared.
+  --xml                 Print an XML representation of the result.
+                        Implies -vdl options.
   --help                Show this message.
 
 Environment variables affecting $0:
@@ -52,6 +54,7 @@ Environment variables affecting $0:
 desc=false
 defs=false
 value=false
+xml=false
 install=false
 verbose=false
 
@@ -84,6 +87,7 @@ for arg; do
         --description) desc=true;;
         --value) value=true;;
         --lookup) defs=true;;
+        --xml) xml=true;;
         --install) install=true;;
         --verbose) verbose=true;;
         --help) usage;;
@@ -106,6 +110,12 @@ for arg; do
   fi
 done
 
+if $xml; then
+  value=true
+  desc=true
+  defs=true
+fi
+
 # --install cannot be used with -d -v -l without option name.
 if $value || $desc || $defs && $install && test -z "$option"; then
   usage
@@ -130,12 +140,16 @@ fi
 # Process the configuration #
 #############################
 
+evalNix(){
+  nix-instantiate - --eval-only "$@"
+}
+
 evalAttr(){
   local prefix=$1
   local suffix=$2
   local strict=$3
   echo "(import $NIXOS {}).$prefix${option:+.$option}${suffix:+.$suffix}" |
-    nix-instantiate - --eval-only ${strict:+--strict}
+    evalNix ${strict:+--strict}
 }
 
 evalOpt(){
@@ -149,7 +163,7 @@ evalCfg(){
 findSources(){
   local suffix=$1
   echo "builtins.map (f: f.source) (import $NIXOS {}).eval.options${option:+.$option}.$suffix" |
-    nix-instantiate - --eval-only --strict
+    evalNix --strict
 }
 
 if $install; then
@@ -277,6 +291,57 @@ if $generate; then
   exit 0
 fi;
 
+# This dupplicate the work made below, but it is useful for processing the
+# output of nixos-option with other tools such as nixos-gui.
+if $xml; then
+  evalNix --xml --no-location <<EOF
+let
+  reach = attrs: attrs${option:+.$option};
+  nixos = import $NIXOS {};
+  nixpkgs = import $NIXPKGS {};
+  sources = builtins.map (f: f.source);
+  opt = reach nixos.eval.options;
+  cfg = reach nixos.config;
+in
+
+with nixpkgs.lib;
+
+let
+  optStrict = v:
+    let
+      traverse = x :
+        if isAttrs x then
+          if x ? outPath then true
+          else all id (mapAttrsFlatten (n: traverseNoAttrs) x)
+        else traverseNoAttrs x;
+      traverseNoAttrs = x:
+        # do not continue in attribute sets
+        if isAttrs x then true
+        else if isList x then all id (map traverse x)
+        else true;
+    in assert traverse v; v;
+in
+
+if isOption opt then
+  optStrict ({}
+  // optionalAttrs (opt ? default) { inherit (opt) default; }
+  // optionalAttrs (opt ? example) { inherit (opt) example; }
+  // optionalAttrs (opt ? description) { inherit (opt) description; }
+  // optionalAttrs (opt ? type) { typename = opt.type.name; }
+  // optionalAttrs (opt ? options) { inherit (opt) options; }
+  // {
+    # to disambiguate the xml output.
+    _isOption = true;
+    declarations = sources opt.declarations;
+    definitions = sources opt.definitions;
+    value = cfg;
+  })
+else
+  opt
+EOF
+  exit $?
+fi
+
 if test "$(evalOpt "_type" 2> /dev/null)" = '"option"'; then
   $value && evalCfg;
 
-- 
GitLab


From 97b39bd17cb6d24e84fcab29a51fcafdbab6ee2c Mon Sep 17 00:00:00 2001
From: Nicolas Pierron <nicolas.b.pierron@gmail.com>
Date: Sun, 24 Apr 2011 15:30:30 +0000
Subject: [PATCH 2960/5331] nixos-gui: - Reduce the number of call the
 nix-instantiate. - Improve the option panel, show the name, type,
 description, value, example, default value, declarations and definitions
 files.

svn path=/nixos/trunk/; revision=26951
---
 gui/chrome/content/main.js       |  37 ++++--
 gui/chrome/content/myviewer.xul  |  22 +++-
 gui/chrome/content/nixos.js      | 208 ++++++++++++++++++++++++-------
 gui/chrome/content/optionView.js |  11 +-
 4 files changed, 224 insertions(+), 54 deletions(-)

diff --git a/gui/chrome/content/main.js b/gui/chrome/content/main.js
index de272e27378..ee238993a3d 100644
--- a/gui/chrome/content/main.js
+++ b/gui/chrome/content/main.js
@@ -18,13 +18,36 @@ function setProgress(current, max)
 function updatePanel(options)
 {
   log("updatePanel: " + options.length);
-  var t = "";
-  for (var i = 0; i < options.length; i++)
-  {
-    log("Called with " + options[i].path);
-    t += options[i].description;
-  }
-  $("#option-desc").text(t);
+  if (options.length == 0)
+    return;
+  // FIXME: ignore the rest of the selection for now.
+  var o = options[0];
+  $("#name").attr("label", o.path);
+
+  if (o.typename != null)
+    $("#typename").attr("label", o.typename);
+  else
+    $("#typename").attr("label", "");
+
+  $("#desc").text(o.description);
+
+  if (o.value != null)
+    $("#val").text(o.value);
+  else
+    $("#val").text("");
+
+  if (o.defaultValue != null)
+    $("#def").text(o.defaultValue);
+  else
+    $("#def").text("");
+
+  if (o.example != null)
+    $("#exp").text(o.example);
+  else
+    $("#exp").text("");
+
+  $("#decls").text(o.declarations.join("\n"));
+  $("#defs").text(o.definitions.join("\n"));
 }
 
 
diff --git a/gui/chrome/content/myviewer.xul b/gui/chrome/content/myviewer.xul
index 23c6ce0a65d..732d5d62606 100644
--- a/gui/chrome/content/myviewer.xul
+++ b/gui/chrome/content/myviewer.xul
@@ -13,7 +13,7 @@
   width  = "800"
   height = "600"
   xmlns  = "http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
-  <script src="jquery-1.3.2.js"/>
+  <script src="jquery-1.5.2.js"/>
   <script src="io.js"/>
   <script src="nixos.js"/>
   <script src="optionView.js"/>
@@ -35,7 +35,25 @@
       </tree>
     </column>
     <column flex="1">
-      <description id="option-desc" hidden="false"></description>
+      <caption id="name" label=""/>
+      <caption id="typename" label=""/>
+      <separator/>
+      <description id="desc" hidden="false"></description>
+      <separator/>
+      <caption label="Value:"/>
+      <description id="val" hidden="false"></description>
+      <separator/>
+      <caption label="Default:"/>
+      <description id="def" hidden="false"></description>
+      <separator/>
+      <caption label="Example:"/>
+      <description id="exp" hidden="false"></description>
+      <separator/>
+      <caption label="Declarations:"/>
+      <description id="decls" hidden="false"></description>
+      <separator/>
+      <caption label="Definitions:"/>
+      <description id="defs" hidden="false"></description>
     </column>
   </columns>
 <!--  <progressmeter id="progress-bar" value="0%"/> -->
diff --git a/gui/chrome/content/nixos.js b/gui/chrome/content/nixos.js
index 411dc844c4f..10519f46633 100644
--- a/gui/chrome/content/nixos.js
+++ b/gui/chrome/content/nixos.js
@@ -45,65 +45,78 @@ Option.prototype = {
     env += "'NIXOS_PKGS=" + this.context_.root + this.context_.nixpkgs + "' ";
     env += "'NIXOS_CONFIG=" + this.context_.config + "' ";
     var out = makeTempFile(this.context_.tmpFile);
-    var prog = this.context_.instantiateBin + " 2>&1 >" + out.path + " ";
-    var args = "";
-    args += " -A eval.options" + (this.path != "" ? "." : "") + this.path;
-    args += " --eval-only --xml --no-location";
-    args += " '" + this.context_.root + this.context_.nixos + "'";
+    var prog = this.context_.optionBin + " 2>&1 >" + out.path + " ";
+    var args = " --xml " + this.path;
 
-    runProgram(/*env +*/ prog + args);
+    runProgram(/*env + */ prog + args);
     var xml = readFromFile(out);
     out.remove(false);
 
     // jQuery does a stack overflow when converting a huge XML to a DOM.
     var dom = DOMParser().parseFromString(xml, "text/xml");
-    var xmlAttrs = $("attr", dom);
+    var xmlAttrs = $("expr > attrs > attr", dom);
 
-    this.isOption = xmlAttrs
-      .filter (
-        function (idx) {
-          return $(this).attr("name") == "_type";
-          // !!! We could not rely on the value of the attribute because it
-          // !!! may be unevaluated.
-          // $(this).children("string[value='option']").length != 0;
-        })
-      .length != 0;
+    this.isOption = xmlAttrs.first().attr("name") == "_isOption";
 
     if (!this.isOption)
-    {
-      var cur = this;
-      var attrs = new Array();
-
-      xmlAttrs.each(
-        function (index) {
-          var name = $(this).attr("name");
-          var attr = new Option(name, cur.context_, cur);
-          attrs.push(attr);
+      this.loadSubOptions(xmlAttrs);
+    else
+      this.loadOption(xmlAttrs);
+    this.isLoaded = true;
+  },
+
+  loadSubOptions:  function (xmlAttrs) {
+    var cur = this;
+    var attrs = new Array();
+
+    xmlAttrs.each(
+      function (index) {
+        var name = $(this).attr("name");
+        var attr = new Option(name, cur.context_, cur);
+        attrs.push(attr);
+      }
+    );
+
+    this.subOptions = attrs;
+  },
+
+  optionAttributeMap: {
+    _isOption: function (cur, v) { },
+    value: function (cur, v) { cur.value = xml2nix($(v).children().first()); },
+    default: function (cur, v) { cur.defaultValue = xml2nix($(v).children().first()); },
+    example: function (cur, v) { cur.example = xml2nix($(v).children().first()); },
+    description: function (cur, v) { cur.description = this.string(v); },
+    typename: function (cur, v) { cur.typename = this.string(v); },
+    options: function (cur, v) { cur.loadSubOptions($("attrs", v).children()); },
+    declarations: function (cur, v) { cur.declarations = this.pathList(v); },
+    definitions: function (cur, v) { cur.definitions = this.pathList(v); },
+
+    string: function (v) {
+      return $(v).children("string").first().attr("value");
+    },
+
+    pathList: function (v) {
+      var list = [];
+      $(v).children("list").first().children().each(
+        function (idx) {
+          list.push($(this).attr("value"));
         }
       );
-
-      this.subOptions = attrs;
+      return list;
     }
-    else
-    {
-      this.loadDesc();
-      // TODO: handle sub-options here.
-    }
-    this.isLoaded = true;
   },
 
-  loadDesc:  function () {
-    var env = "";
-    env += "'NIXOS=" + this.context_.root + this.context_.nixos + "' ";
-    env += "'NIXOS_PKGS=" + this.context_.root + this.context_.nixpkgs + "' ";
-    env += "'NIXOS_CONFIG=" + this.context_.config + "' ";
-    var out = makeTempFile(this.context_.tmpFile);
-    var prog = this.context_.optionBin + " 2>&1 >" + out.path + " ";
-    var args = " -vdl " + this.path;
 
-    runProgram(/*env + */ prog + args);
-    this.description = readFromFile(out);
-    out.remove(false);
+  loadOption: function (attrs) {
+    var cur = this;
+
+    attrs.each(
+      function (index) {
+        var name = $(this).attr("name");
+        log("loadOption: " + name);
+        cur.optionAttributeMap[name](cur, this);
+      }
+    );
   },
 
   // keep the context under which this option has been used.
@@ -111,7 +124,13 @@ Option.prototype = {
   // name of the option.
   name: "",
   // result of nixos-option.
+  value: null,
+  typename: null,
+  defaultValue: null,
+  example: null,
   description: "",
+  declarations: [],
+  definitions: [],
   // path to reach this option
   path: "",
 
@@ -121,6 +140,107 @@ Option.prototype = {
   subOptions: []
 };
 
+var xml2nix_pptable = {
+  attrs: function (node, depth, pp) {
+    var out = "";
+    out += "{";
+    var children = node.children().not(
+      function () {
+        var name = $(this).attr("name");
+        return name.charAt(0) == "_";
+      }
+    );
+    if (children.lenght != 0)
+    {
+      depth += 1;
+      children.each(
+        function (idx) { out += pp.dispatch($(this), depth, pp); }
+      );
+      depth -= 1;
+      out += this.indent(depth) + "";
+    }
+    else
+      out += " ";
+    out += "}";
+    return out;
+  },
+  list: function (node, depth, pp) {
+    var out = "";
+    out += "[";
+    var children = node.children();
+    if (children.lenght != 0)
+    {
+      depth += 1;
+      children.each(
+        function (idx) { out += pp.dispatch($(this), depth, pp); }
+      );
+      depth -= 1;
+      out += this.indent(depth);
+    }
+    else
+      out += " ";
+    out += "]";
+    return out;
+  },
+  attr: function (node, depth, pp) {
+    var name = node.attr("name");
+    var out = "";
+    var val = "";
+    out += this.indent(depth);
+    out += name + " = ";
+    depth += 1;
+    val = pp.dispatch(node.children().first(), depth, pp);
+    out += val;
+    if (val.indexOf("\n") != -1)
+      out += this.indent(depth);;
+    depth -= 1;
+    out += ";";
+    return out;
+  },
+  string: function (node, depth, pp) {
+    return "\"" + node.attr("value") + "\"";
+  },
+  bool: function (node, depth, pp) {
+    return node.attr("value");
+  },
+  null: function (node, depth, pp) {
+    return "null";
+  },
+  function: function (node, depth, pp) {
+    return "<function>";
+  },
+  unevaluated: function (node, depth, pp) {
+    return "<unevaluated>";
+  },
+
+  dispatch: function (node, depth, pp) {
+    for (var key in pp)
+    {
+      if(node.is(key))
+      {
+        log(this.indent(depth) + "dispatch: " + key);
+        var out = pp[key](node, depth, pp);
+        log(this.indent(depth) + "dispatch: => " + out);
+        return out;
+      }
+    }
+    return "<dispatch-error>";
+  },
+  indent: function (depth) {
+    var ret = "\n";
+    while (depth--)
+      ret += "  ";
+    return ret;
+  }
+};
+
+function xml2nix(node) {
+  var depth = 0;
+  var pp = xml2nix_pptable;
+  var out = pp.dispatch(node, depth, pp);
+  log("pretty:\n" + out);
+  return out;
+}
 
 /*
 // Pretty print Nix values.
diff --git a/gui/chrome/content/optionView.js b/gui/chrome/content/optionView.js
index 8e04e282828..0d093740fe2 100644
--- a/gui/chrome/content/optionView.js
+++ b/gui/chrome/content/optionView.js
@@ -188,10 +188,19 @@ OptionView.prototype = {
           opt.load();
         if (opt.isOption)
           opts.push(opt);
+
+        // FIXME: no need to make things slowing down, because our current
+        // callback do not handle multiple option display.
+        if (!opts.empty)
+          break;
       }
+      // FIXME: no need to make things slowing down, because our current
+      // callback do not handle multiple option display.
+      if (!opts.empty)
+        break;
     }
 
-    if (opts.lenght != 0)
+    if (!opts.empty)
       this.selCallback(opts);
   },
 
-- 
GitLab


From 921231b555d3656d573401eba7b36b6868914ebc Mon Sep 17 00:00:00 2001
From: Nicolas Pierron <nicolas.b.pierron@gmail.com>
Date: Mon, 25 Apr 2011 01:03:57 +0000
Subject: [PATCH 2961/5331] Add nixos-gui among the installer tools. Add it as
 a default for the graphical profile.

svn path=/nixos/trunk/; revision=26960
---
 gui/README                        | 17 +++++------
 gui/application.ini               |  5 ++--
 gui/nixos-gui                     |  3 --
 modules/installer/tools/tools.nix | 47 ++++++++++++++++++++++++-------
 modules/profiles/graphical.nix    |  2 ++
 5 files changed, 49 insertions(+), 25 deletions(-)
 delete mode 100755 gui/nixos-gui

diff --git a/gui/README b/gui/README
index 7eee9040e3f..c038314a0dc 100644
--- a/gui/README
+++ b/gui/README
@@ -1,19 +1,16 @@
-This file should become a nix expression.
+This file should become a nix expression. (see modules/installer/tools/tools.nix)
 
 you need to:
-- download the latest jQuery from:
-    http://jqueryjs.googlecode.com/files/jquery-1.3.2.js
-    SHA1 Checksum: f0b95e99225f314fbe37ccf6b74ce2f916c517de
+- download the latest jQuery from and copy it to chrome/content:
+    http://code.jquery.com/jquery-1.5.2.js
 
 - install 'xulrunner' with nix:
-    nix-env -i xulrunner
+    nix-env -Ai nixpkgs_sys.firefox40Pkgs.xulrunner
 
-- install and add nix-intantiate in your path
+- make sure nixos-option in your path
 
 - have /etc/nixos/nixpkgs
 - have /etc/nixos/nixos
 
-
-to run it, either:
-- cd /etc/nixos/nixos/gui; ./nixos-gui
-- xulrunner /etc/nixos/nixos/gui/application.ini
+run it:
+- xulrunner /etc/nixos/nixos/gui/application.ini -jsconsole
diff --git a/gui/application.ini b/gui/application.ini
index a832d9d285b..d2494a1a5cd 100644
--- a/gui/application.ini
+++ b/gui/application.ini
@@ -8,15 +8,16 @@ Vendor=NixOS
 Name=NixOS-gui
 ;
 ; This field specifies your application's version.  This field is optional.
-Version=0.0
+Version=0.1
 ;
 ; This field specifies your application's build ID (timestamp).  This field is
 ; required.
-BuildID=20090925
+BuildID=20110424
 ;
 ; This field specifies a compact copyright notice for your application.  This
 ; field is optional.
 ;Copyright=
+
 ;
 ; This ID is just an example.  Every XUL app ought to have it's own unique ID.
 ; You can use the microsoft "guidgen" or "uuidgen" tools, or go on
diff --git a/gui/nixos-gui b/gui/nixos-gui
deleted file mode 100755
index f7728147ad3..00000000000
--- a/gui/nixos-gui
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-exec xulrunner "./application.ini"
diff --git a/modules/installer/tools/tools.nix b/modules/installer/tools/tools.nix
index b735863a34c..ece745096ce 100644
--- a/modules/installer/tools/tools.nix
+++ b/modules/installer/tools/tools.nix
@@ -1,33 +1,34 @@
 # This module generates nixos-install, nixos-rebuild,
 # nixos-hardware-scan, etc.
 
-{config, pkgs, ...}:
+{config, pkgs, modulesPath, ...}:
 
 let
   ### implementation
+  cfg = config.installer;
 
   makeProg = args: pkgs.substituteAll (args // {
     dir = "bin";
     isExecutable = true;
   });
-  
+
   nixosBuildVMS = makeProg {
     name = "nixos-build-vms";
     src = ./nixos-build-vms/nixos-build-vms.sh;
   };
-  
+
   nixosDeployNetwork = makeProg {
     name = "nixos-deploy-network";
     src = ./nixos-deploy-network/nixos-deploy-network.sh;
   };
-  
+
   nixosInstall = makeProg {
     name = "nixos-install";
     src = ./nixos-install.sh;
 
     inherit (pkgs) perl pathsFromGraph;
     nix = config.environment.nix;
-    nixpkgsURL = config.installer.nixpkgsURL;
+    nixpkgsURL = cfg.nixpkgsURL;
 
     nixClosure = pkgs.runCommand "closure"
       {exportReferencesGraph = ["refs" config.environment.nix];}
@@ -64,7 +65,7 @@ let
       inherit nixClosure nix;
 
       # TODO shell ?
-      nixpkgsURL = config.installer.nixpkgsURL;
+      nixpkgsURL = cfg.nixpkgsURL;
     };
 
     # see ./nixos-bootstrap-archive/README-BOOTSTRAP-NIXOS
@@ -90,7 +91,7 @@ let
     name = "nixos-hardware-scan";
     src = ./nixos-hardware-scan.pl;
     inherit (pkgs) perl;
-    profile = config.installer.installProfile;
+    profile = cfg.installProfile;
   };
 
   nixosOption = makeProg {
@@ -98,11 +99,28 @@ let
     src = ./nixos-option.sh;
   };
 
+  nixosGui = pkgs.xulrunnerWrapper {
+    launcher = "nixos-gui";
+    application = pkgs.stdenv.mkDerivation {
+      name = "nixos-gui";
+      buildCommand = ''
+        ensureDir $out
+        cp -r $source $out
+        cp $jquery $out/chrome/content/jquery-1.5.2.js
+      '';
+      sources = pkgs.lib.cleanSource "${modulesPath}/../gui";
+      jquery = pkgs.fetchurl {
+        url = http://code.jquery.com/jquery-1.5.2.min.js;
+        sha256 = "e2107c8ecdb479c36d822d82bda2a8caf4429ab2d2cf9f20d5c931f75275403c";
+      };
+    };
+  };
+
 in
 
 {
   options = {
-  
+
     installer.nixpkgsURL = pkgs.lib.mkOption {
       default = "";
       example = http://nixos.org/releases/nix/nixpkgs-0.11pre7577;
@@ -131,7 +149,16 @@ in
         Name of the profile used when generating the hardware-scan.
       '';
     };
-    
+
+    installer.enableGraphicalTools = pkgs.lib.mkOption {
+      default = false;
+      type = with pkgs.lib.types; bool;
+      example = true;
+      description = ''
+        Enable the installation of graphical tools.
+      '';
+    };
+
   };
 
   config = {
@@ -146,7 +173,7 @@ in
 
          installer2.runInChroot
          installer2.nixosPrepareInstall
-      ];
+      ] ++ pkgs.lib.optional cfg.enableGraphicalTools nixosGui;
 
     system.build = {
       inherit nixosInstall nixosHardwareScan nixosOption;
diff --git a/modules/profiles/graphical.nix b/modules/profiles/graphical.nix
index 1c279a73ac9..fbf6f1d2421 100644
--- a/modules/profiles/graphical.nix
+++ b/modules/profiles/graphical.nix
@@ -13,4 +13,6 @@
     desktopManager.default = "kde4";
     desktopManager.kde4.enable = true;
   };
+
+  installer.enableGraphicalTools = true;
 }
-- 
GitLab


From 6839bddd1b6b754493a0a6fa9d1b09b5527387b5 Mon Sep 17 00:00:00 2001
From: Nicolas Pierron <nicolas.b.pierron@gmail.com>
Date: Mon, 25 Apr 2011 17:48:59 +0000
Subject: [PATCH 2962/5331] modules/installer/tools: nixos-gui: Fix derivation.

svn path=/nixos/trunk/; revision=26972
---
 modules/installer/tools/tools.nix | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/modules/installer/tools/tools.nix b/modules/installer/tools/tools.nix
index ece745096ce..cf2bdb788cf 100644
--- a/modules/installer/tools/tools.nix
+++ b/modules/installer/tools/tools.nix
@@ -104,14 +104,17 @@ let
     application = pkgs.stdenv.mkDerivation {
       name = "nixos-gui";
       buildCommand = ''
-        ensureDir $out
-        cp -r $source $out
-        cp $jquery $out/chrome/content/jquery-1.5.2.js
+        cp -r "$gui" "$out"
+
+        # Do not force the copy if the file exists in the sources (this
+        # happens for developpers)
+        test -e "$out/chrome/content/jquery-1.5.2.js" ||
+          cp -f "$jquery" "$out/chrome/content/jquery-1.5.2.js"
       '';
-      sources = pkgs.lib.cleanSource "${modulesPath}/../gui";
+      gui = pkgs.lib.cleanSource "${modulesPath}/../gui";
       jquery = pkgs.fetchurl {
         url = http://code.jquery.com/jquery-1.5.2.min.js;
-        sha256 = "e2107c8ecdb479c36d822d82bda2a8caf4429ab2d2cf9f20d5c931f75275403c";
+        sha256 = "8f0a19ee8c606b35a10904951e0a27da1896eafe33c6e88cb7bcbe455f05a24a";
       };
     };
   };
-- 
GitLab


From c978e5accc65373ff44fd41d9c2a1820dbaebf7d Mon Sep 17 00:00:00 2001
From: Nicolas Pierron <nicolas.b.pierron@gmail.com>
Date: Mon, 25 Apr 2011 17:49:03 +0000
Subject: [PATCH 2963/5331] nixos-gui: (xml2nix_pptable) Handle path nodes.

svn path=/nixos/trunk/; revision=26973
---
 gui/chrome/content/nixos.js | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/gui/chrome/content/nixos.js b/gui/chrome/content/nixos.js
index 10519f46633..3718cbc53e9 100644
--- a/gui/chrome/content/nixos.js
+++ b/gui/chrome/content/nixos.js
@@ -200,6 +200,9 @@ var xml2nix_pptable = {
   string: function (node, depth, pp) {
     return "\"" + node.attr("value") + "\"";
   },
+  path: function (node, depth, pp) {
+    return node.attr("value");
+  },
   bool: function (node, depth, pp) {
     return node.attr("value");
   },
-- 
GitLab


From 45026f8540a2ca26a9fddaeb75994f066fe60921 Mon Sep 17 00:00:00 2001
From: Nicolas Pierron <nicolas.b.pierron@gmail.com>
Date: Mon, 25 Apr 2011 22:20:30 +0000
Subject: [PATCH 2964/5331] nixos-gui: - Add a scroll bar for option details. -
 Respect text eol and indentation on the ui.

svn path=/nixos/trunk/; revision=26974
---
 gui/chrome/content/main.js      | 23 +++++++++++++++--------
 gui/chrome/content/myviewer.xul | 29 ++++++++++++++++-------------
 2 files changed, 31 insertions(+), 21 deletions(-)

diff --git a/gui/chrome/content/main.js b/gui/chrome/content/main.js
index ee238993a3d..ecfc5a8c5c9 100644
--- a/gui/chrome/content/main.js
+++ b/gui/chrome/content/main.js
@@ -15,6 +15,13 @@ function setProgress(current, max)
 }
 */
 
+function updateTextbox(id, value)
+{
+  // setting the height cause an overflow which resize the textbox to its
+  // content due to its onoverflow attribute.
+  $(id).attr("value", value).attr("height", 1);
+};
+
 function updatePanel(options)
 {
   log("updatePanel: " + options.length);
@@ -32,22 +39,22 @@ function updatePanel(options)
   $("#desc").text(o.description);
 
   if (o.value != null)
-    $("#val").text(o.value);
+    updateTextbox("#val", o.value);
   else
-    $("#val").text("");
+    updateTextbox("#val", "");
 
   if (o.defaultValue != null)
-    $("#def").text(o.defaultValue);
+    updateTextbox("#def", o.defaultValue);
   else
-    $("#def").text("");
+    updateTextbox("#def", "");
 
   if (o.example != null)
-    $("#exp").text(o.example);
+    updateTextbox("#exp", o.example);
   else
-    $("#exp").text("");
+    updateTextbox("#exp", "");
 
-  $("#decls").text(o.declarations.join("\n"));
-  $("#defs").text(o.definitions.join("\n"));
+  updateTextbox("#decls", o.declarations.join("\n"));
+  updateTextbox("#defs", o.definitions.join("\n"));
 }
 
 
diff --git a/gui/chrome/content/myviewer.xul b/gui/chrome/content/myviewer.xul
index 732d5d62606..2aeb9391d07 100644
--- a/gui/chrome/content/myviewer.xul
+++ b/gui/chrome/content/myviewer.xul
@@ -18,43 +18,46 @@
   <script src="nixos.js"/>
   <script src="optionView.js"/>
   <script src="main.js"/>
-  <columns height="580">
-    <column width = "300">
+  <hbox flex="1">
+    <vbox width="250">
       <tree flex="1" id="option-tree" persist="height" onselect="gOptionView.selectionChanged()">
         <treecols>
-          <treecol persist="hidden width" flex="1" id="opt-name"
+          <treecol persist="hidden width" flex="9" id="opt-name"
                    label="Option" primary="true"/>
           <!-- Uncomment the following column to see the number of option
                printed below each options. -->
           <!--
           <treecol persist="hidden width" flex="1" id="dbg-size"
-                   label="Size"/>
+                   label="sz"/>
           -->
         </treecols>
         <treechildren id="first-child" flex="1"/>
       </tree>
-    </column>
-    <column flex="1">
+    </vbox>
+    <vbox flex="3" style="overflow: auto">
       <caption id="name" label=""/>
       <caption id="typename" label=""/>
       <separator/>
       <description id="desc" hidden="false"></description>
       <separator/>
       <caption label="Value:"/>
-      <description id="val" hidden="false"></description>
+      <textbox id="val" readonly="true" multiline="true" value=""
+      class="plain" hidden="false" onoverflow="this.height =
+      this.inputField.scrollHeight;" />
       <separator/>
       <caption label="Default:"/>
-      <description id="def" hidden="false"></description>
+      <textbox id="def" readonly="true" multiline="true" value="" class="plain" hidden="false" onoverflow="this.height = this.inputField.scrollHeight;" />
       <separator/>
       <caption label="Example:"/>
-      <description id="exp" hidden="false"></description>
+      <textbox id="exp" readonly="true" multiline="true" value="" class="plain" hidden="false" onoverflow="this.height = this.inputField.scrollHeight;" />
       <separator/>
       <caption label="Declarations:"/>
-      <description id="decls" hidden="false"></description>
+      <textbox id="decls" readonly="true" multiline="true" value="" class="plain" hidden="false" onoverflow="this.height = this.inputField.scrollHeight;" />
       <separator/>
       <caption label="Definitions:"/>
-      <description id="defs" hidden="false"></description>
-    </column>
-  </columns>
+      <textbox id="defs" readonly="true" multiline="true" value=""
+      class="plain" hidden="false" onoverflow="this.height = this.inputField.scrollHeight;" />
+    </vbox>
+  </hbox>
 <!--  <progressmeter id="progress-bar" value="0%"/> -->
 </window>
-- 
GitLab


From 610fc28e8a9716c9bd0e85f76e06394d0ee586cf Mon Sep 17 00:00:00 2001
From: Nicolas Pierron <nicolas.b.pierron@gmail.com>
Date: Mon, 25 Apr 2011 22:20:39 +0000
Subject: [PATCH 2965/5331] nixos-gui: Improve pretty-print: - Handle int &
 derivations. - Change the new-line policy.

svn path=/nixos/trunk/; revision=26975
---
 gui/chrome/content/nixos.js | 55 +++++++++++++++++++++----------------
 1 file changed, 32 insertions(+), 23 deletions(-)

diff --git a/gui/chrome/content/nixos.js b/gui/chrome/content/nixos.js
index 3718cbc53e9..d880331f076 100644
--- a/gui/chrome/content/nixos.js
+++ b/gui/chrome/content/nixos.js
@@ -142,41 +142,47 @@ Option.prototype = {
 
 var xml2nix_pptable = {
   attrs: function (node, depth, pp) {
-    var out = "";
-    out += "{";
     var children = node.children().not(
       function () {
         var name = $(this).attr("name");
         return name.charAt(0) == "_";
       }
     );
-    if (children.lenght != 0)
-    {
-      depth += 1;
-      children.each(
-        function (idx) { out += pp.dispatch($(this), depth, pp); }
-      );
-      depth -= 1;
-      out += this.indent(depth) + "";
-    }
+    var c = 0;
+    var out = "";
+    out += "{";
+    depth += 1;
+    children.each(
+      function (idx) {
+        c += 1;
+        out += pp.indent(depth);
+        out += pp.dispatch($(this), depth, pp);
+      }
+    );
+    depth -= 1;
+    if (c > 0)
+      out += this.indent(depth);
     else
       out += " ";
     out += "}";
     return out;
   },
   list: function (node, depth, pp) {
+    var children = node.children();
+    var c = 0;
     var out = "";
     out += "[";
-    var children = node.children();
-    if (children.lenght != 0)
-    {
-      depth += 1;
-      children.each(
-        function (idx) { out += pp.dispatch($(this), depth, pp); }
-      );
-      depth -= 1;
+    depth += 1;
+    children.each(
+      function (idx) {
+        c += 1;
+        out += pp.indent(depth);
+        out += pp.dispatch($(this), depth, pp);
+      }
+    );
+    depth -= 1;
+    if (c > 0)
       out += this.indent(depth);
-    }
     else
       out += " ";
     out += "]";
@@ -186,13 +192,10 @@ var xml2nix_pptable = {
     var name = node.attr("name");
     var out = "";
     var val = "";
-    out += this.indent(depth);
     out += name + " = ";
     depth += 1;
     val = pp.dispatch(node.children().first(), depth, pp);
     out += val;
-    if (val.indexOf("\n") != -1)
-      out += this.indent(depth);;
     depth -= 1;
     out += ";";
     return out;
@@ -206,9 +209,15 @@ var xml2nix_pptable = {
   bool: function (node, depth, pp) {
     return node.attr("value");
   },
+  "int": function (node, depth, pp) {
+    return node.attr("value");
+  },
   null: function (node, depth, pp) {
     return "null";
   },
+  derivation: function (node, depth, pp) {
+    return "<derivation>";
+  },
   function: function (node, depth, pp) {
     return "<function>";
   },
-- 
GitLab


From 043159ff250093443685ef32d37ab26878686ff9 Mon Sep 17 00:00:00 2001
From: Nicolas Pierron <nicolas.b.pierron@gmail.com>
Date: Mon, 25 Apr 2011 22:23:12 +0000
Subject: [PATCH 2966/5331] nixos-gui: Remove dead code, Comment debug.

svn path=/nixos/trunk/; revision=26976
---
 gui/chrome/content/nixos.js | 88 ++-----------------------------------
 1 file changed, 3 insertions(+), 85 deletions(-)

diff --git a/gui/chrome/content/nixos.js b/gui/chrome/content/nixos.js
index d880331f076..7b45b6c006a 100644
--- a/gui/chrome/content/nixos.js
+++ b/gui/chrome/content/nixos.js
@@ -230,9 +230,9 @@ var xml2nix_pptable = {
     {
       if(node.is(key))
       {
-        log(this.indent(depth) + "dispatch: " + key);
+        // log(this.indent(depth) + "dispatch: " + key);
         var out = pp[key](node, depth, pp);
-        log(this.indent(depth) + "dispatch: => " + out);
+        // log(this.indent(depth) + "dispatch: => " + out);
         return out;
       }
     }
@@ -250,88 +250,6 @@ function xml2nix(node) {
   var depth = 0;
   var pp = xml2nix_pptable;
   var out = pp.dispatch(node, depth, pp);
-  log("pretty:\n" + out);
+  // log("pretty:\n" + out);
   return out;
 }
-
-/*
-// Pretty print Nix values.
-function nixPP(value, level)
-{
-  function indent(level) {  ret = ""; while (level--) ret+= "  "; return ret; }
-
-  if (!level) level = 0;
-  var ret = "<no match>";
-  if (value.is("attrs")) {
-    var content = "";
-    value.children().each(function (){
-      var name = $(this).attr("name");
-      var value = nixPP($(this).children(), level + 1);
-      content += indent(level + 1) + name + " = " + value + ";\n";
-    });
-    ret = "{\n" + content + indent(level) + "}";
-  }
-  else if (value.is("list")) {
-    var content = "";
-    value.children().each(function (){
-      content += indent(level + 1) + "(" + nixPP($(this), level + 1) + ")\n";
-    });
-    ret = "[\n" + content + indent(level) + "]";
-  }
-  else if (value.is("bool"))
-    ret = (value.attr("value") == "true");
-  else if (value.is("string"))
-    ret = '"' + value.attr("value") + '"';
-  else if (value.is("path"))
-    ret = value.attr("value");
-  else if (value.is("int"))
-    ret = parseInt(value.attr("value"));
-  else if (value.is("derivation"))
-    ret = value.attr("outPath");
-  else if (value.is("function"))
-    ret = "<function>";
-  else {
-    var content = "";
-    value.children().each(function (){
-      content += indent(level + 1) + "(" + nixPP($(this), level + 1) + ")\n";
-    });
-    ret = "<!--" + value.selector + "--><!--\n" + content + indent(level) + "-->";
-  }
-  return ret;
-}
-
-// Function used to reproduce the select operator on the XML DOM.
-// It return the value contained in the targeted attribute.
-function nixSelect(attrs, selector)
-{
-  var names = selector.split(".");
-  var value = $(attrs);
-  for (var i = 0; i < names.length; i++) {
-    log(nixPP(value) + "." + names[i]);
-    if (value.is("attrs"))
-      value = value.children("attr[name='" + names[i] + "']").children();
-    else {
-      log("Cannot do an attribute selection.");
-      break;
-    }
-  }
-
-  log("nixSelect return: " + nixPP(value));
-
-  var ret;
-  if (value.is("attrs") || value.is("list"))
-    ret = value;
-  else if (value.is("bool"))
-    ret = value.attr("value") == "true";
-  else if (value.is("string"))
-    ret = value.attr("value");
-  else if (value.is("int"))
-    ret = parseInt(value.attr("value"));
-  else if (value.is("derivation"))
-    ret = value.attr("outPath");
-  else if (value.is("function"))
-    ret = "<function>";
-
-  return ret;
-}
-*/
\ No newline at end of file
-- 
GitLab


From 0f544f1ea84276cba649b68ed09a5c6a9faf768b Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 27 Apr 2011 09:54:17 +0000
Subject: [PATCH 2967/5331] * Add a command `forwardPort' to forward a TCP port
 on the host to a   TCP port on the guest.  Useful during testing (e.g. to
 access a web   server in the guest through a web browser on the host).

svn path=/nixos/trunk/; revision=26987
---
 lib/test-driver/Machine.pm | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/lib/test-driver/Machine.pm b/lib/test-driver/Machine.pm
index 919ab7c0764..68b374c86aa 100644
--- a/lib/test-driver/Machine.pm
+++ b/lib/test-driver/Machine.pm
@@ -519,4 +519,14 @@ sub sleep {
 }
 
 
+# Forward a TCP port on the host to a TCP port on the guest.  Useful
+# during interactive testing.
+sub forwardPort {
+    my ($self, $hostPort, $guestPort) = @_;
+    $hostPort = 8080 unless defined $hostPort;
+    $guestPort = 80 unless defined $guestPort;
+    $self->sendMonitorCommand("hostfwd_add tcp::$hostPort-:$guestPort");
+}
+
+
 1;
-- 
GitLab


From be7a7a5b78d11e49d0edf55ca7d7ae1de7a9b965 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 27 Apr 2011 13:01:42 +0000
Subject: [PATCH 2968/5331] * nixos-build-vms/build-vms.nix: drop the "nixos"
 function argument,   since the path to the NixOS source tree is known.

svn path=/nixos/trunk/; revision=26989
---
 modules/installer/tools/nixos-build-vms/build-vms.nix    | 9 ++++-----
 .../installer/tools/nixos-build-vms/nixos-build-vms.sh   | 8 ++------
 2 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/modules/installer/tools/nixos-build-vms/build-vms.nix b/modules/installer/tools/nixos-build-vms/build-vms.nix
index df4152b30d6..f83f68f9439 100644
--- a/modules/installer/tools/nixos-build-vms/build-vms.nix
+++ b/modules/installer/tools/nixos-build-vms/build-vms.nix
@@ -1,12 +1,11 @@
-{ nixos
-, nixpkgs
+{ nixpkgs
 , services ? "/etc/nixos/services"
 , system ? builtins.currentSystem
 , networkExpr
 }:
 
-let nodes = import networkExpr;
-in
-with import "${nixos}/lib/testing.nix" { inherit nixpkgs services system; };
+let nodes = import networkExpr; in
+
+with import ../../../../lib/testing.nix { inherit nixpkgs services system; };
 
 (complete { inherit nodes; testScript = ""; }).driver
diff --git a/modules/installer/tools/nixos-build-vms/nixos-build-vms.sh b/modules/installer/tools/nixos-build-vms/nixos-build-vms.sh
index 70c1ecaf5ac..8fa9ea925fb 100644
--- a/modules/installer/tools/nixos-build-vms/nixos-build-vms.sh
+++ b/modules/installer/tools/nixos-build-vms/nixos-build-vms.sh
@@ -48,11 +48,6 @@ shift
 
 # Validate the given options
 
-if [ -z "$NIXOS" ]
-then
-    NIXOS=/etc/nixos/nixos
-fi
-
 if [ "$@" = "" ]
 then
     echo "ERROR: A network expression must be specified!" >&2
@@ -63,4 +58,5 @@ fi
 
 # Build a network of VMs
 
-nix-build $NIXOS/modules/installer/tools/nixos-build-vms/build-vms.nix --argstr networkExpr $networkExpr --argstr nixos $NIXOS --argstr nixpkgs $NIXPKGS_ALL $noOutLinkArg $showTraceArg
+nix-build ${NIXOS:-/etc/nixos/nixos}/modules/installer/tools/nixos-build-vms/build-vms.nix \
+    --argstr networkExpr $networkExpr --argstr nixpkgs "${NIXPKGS_ALL:-/etc/nixos/nixpkgs}" $noOutLinkArg $showTraceArg
-- 
GitLab


From 650d14be8dfda0064b43f4b643759de2ebb64585 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 27 Apr 2011 13:16:33 +0000
Subject: [PATCH 2969/5331] * Remove most references to the "services" tree.

svn path=/nixos/trunk/; revision=26990
---
 lib/build-vms.nix                                     | 4 ++--
 lib/eval-config.nix                                   | 4 +---
 lib/testing.nix                                       | 4 ++--
 modules/installer/tools/nixos-build-vms/build-vms.nix | 3 +--
 modules/module-list.nix                               | 4 ++--
 modules/services/networking/gw6c.nix                  | 4 ++--
 modules/services/web-servers/apache-httpd/default.nix | 4 ++--
 release.nix                                           | 3 +--
 tests/default.nix                                     | 3 +--
 9 files changed, 14 insertions(+), 19 deletions(-)

diff --git a/lib/build-vms.nix b/lib/build-vms.nix
index 8d4592b48bd..913d5276db2 100644
--- a/lib/build-vms.nix
+++ b/lib/build-vms.nix
@@ -1,4 +1,4 @@
-{ nixpkgs, services, system }:
+{ nixpkgs, system }:
 
 let pkgs = import nixpkgs { config = {}; inherit system; }; in
 
@@ -22,7 +22,7 @@ rec {
     nodes: configurations:
 
     import ./eval-config.nix {
-      inherit nixpkgs services system;
+      inherit nixpkgs system;
       modules = configurations ++
         [ ../modules/virtualisation/qemu-vm.nix
           ../modules/testing/test-instrumentation.nix # !!! should only get added for automated test runs
diff --git a/lib/eval-config.nix b/lib/eval-config.nix
index 7697f44a7e5..c646d52c802 100644
--- a/lib/eval-config.nix
+++ b/lib/eval-config.nix
@@ -4,7 +4,6 @@
 
 { system ? builtins.currentSystem
 , nixpkgs ? import ./from-env.nix "NIXPKGS" /etc/nixos/nixpkgs
-, services ? ../../services
 , pkgs ? null
 , baseModules ? import ../modules/module-list.nix
 , extraArgs ? {}
@@ -32,7 +31,6 @@ rec {
   extraArgs = extraArgs_ // {
     inherit pkgs modules baseModules;
     modulesPath = ../modules;
-    servicesPath = services;
     pkgs_i686 = import nixpkgs { system = "i686-linux"; };
   };
 
@@ -53,7 +51,7 @@ rec {
       let
         system = if nixpkgsOptions.system != "" then nixpkgsOptions.system else system_;
         nixpkgsOptions = (import ./eval-config.nix {
-          inherit system nixpkgs services extraArgs modules;
+          inherit system nixpkgs extraArgs modules;
           # For efficiency, leave out most NixOS modules; they don't
           # define nixpkgs.config, so it's pointless to evaluate them.
           baseModules = [ ../modules/misc/nixpkgs.nix ];
diff --git a/lib/testing.nix b/lib/testing.nix
index 670a1dd6ac2..17f4e45c83b 100644
--- a/lib/testing.nix
+++ b/lib/testing.nix
@@ -1,6 +1,6 @@
-{ nixpkgs, services, system }:
+{ nixpkgs, system }:
 
-with import ./build-vms.nix { inherit nixpkgs services system; };
+with import ./build-vms.nix { inherit nixpkgs system; };
 with pkgs;
 
 rec {
diff --git a/modules/installer/tools/nixos-build-vms/build-vms.nix b/modules/installer/tools/nixos-build-vms/build-vms.nix
index f83f68f9439..9ed574a4e24 100644
--- a/modules/installer/tools/nixos-build-vms/build-vms.nix
+++ b/modules/installer/tools/nixos-build-vms/build-vms.nix
@@ -1,11 +1,10 @@
 { nixpkgs
-, services ? "/etc/nixos/services"
 , system ? builtins.currentSystem
 , networkExpr
 }:
 
 let nodes = import networkExpr; in
 
-with import ../../../../lib/testing.nix { inherit nixpkgs services system; };
+with import ../../../../lib/testing.nix { inherit nixpkgs system; };
 
 (complete { inherit nodes; testScript = ""; }).driver
diff --git a/modules/module-list.nix b/modules/module-list.nix
index 69f6133a7ed..f67dbb29384 100644
--- a/modules/module-list.nix
+++ b/modules/module-list.nix
@@ -103,7 +103,7 @@
   ./services/networking/gvpe.nix
   ./services/networking/gw6c.nix
   ./services/networking/ifplugd.nix
-  ./services/networking/ircd-hybrid.nix
+  #./services/networking/ircd-hybrid.nix
   ./services/networking/nat.nix
   ./services/networking/ntpd.nix
   ./services/networking/openfire.nix
@@ -135,7 +135,7 @@
   ./services/ttys/gpm.nix
   ./services/ttys/mingetty.nix
   ./services/web-servers/apache-httpd/default.nix
-  ./services/web-servers/jboss.nix
+  #./services/web-servers/jboss.nix
   ./services/web-servers/tomcat.nix
   ./services/x11/desktop-managers/default.nix
   ./services/x11/display-managers/auto.nix
diff --git a/modules/services/networking/gw6c.nix b/modules/services/networking/gw6c.nix
index eaf84c5f70f..fba9d440ad2 100644
--- a/modules/services/networking/gw6c.nix
+++ b/modules/services/networking/gw6c.nix
@@ -1,4 +1,4 @@
-{ config, pkgs, servicesPath, ... }:
+{ config, pkgs, ... }:
 
 with pkgs.lib;
 
@@ -7,7 +7,7 @@ let
   cfg = config.services.gw6c;
 
   # !!! Move this from the services tree to the nixos tree.
-  gw6cService = import (servicesPath + /gw6c) {
+  gw6cService = import /etc/nixos/services/gw6c {
     inherit (pkgs) stdenv gw6c coreutils 
       procps iputils gnused 
       gnugrep seccure writeScript;
diff --git a/modules/services/web-servers/apache-httpd/default.nix b/modules/services/web-servers/apache-httpd/default.nix
index ddb8e4f90de..7b2f685c2b6 100644
--- a/modules/services/web-servers/apache-httpd/default.nix
+++ b/modules/services/web-servers/apache-httpd/default.nix
@@ -1,4 +1,4 @@
-{ config, pkgs, servicesPath, ... }:
+{ config, pkgs, ... }:
 
 with pkgs.lib;
 
@@ -72,7 +72,7 @@ let
           phpOptions = "";
           options = {};
         };
-        res = defaults // svcFunction {inherit config pkgs serverInfo servicesPath;};
+        res = defaults // svcFunction { inherit config pkgs serverInfo; };
       in res;
     in map f defs;
 
diff --git a/release.nix b/release.nix
index f89709c628d..7681cda16ec 100644
--- a/release.nix
+++ b/release.nix
@@ -151,10 +151,9 @@ let
     } { system = "armv5tel-linux"; };
 
     tests = 
-      { services ? ../services }:
       let
         t = import ./tests { 
-          inherit nixpkgs services;
+          inherit nixpkgs;
           system = "i686-linux";
         };
       in {
diff --git a/tests/default.nix b/tests/default.nix
index 1e5d1a71848..7f34c4927a3 100644
--- a/tests/default.nix
+++ b/tests/default.nix
@@ -1,9 +1,8 @@
 { nixpkgs ? ../../nixpkgs
-, services ? ../../services
 , system ? builtins.currentSystem
 }:
 
-with import ../lib/testing.nix { inherit nixpkgs services system; };
+with import ../lib/testing.nix { inherit nixpkgs system; };
 
 {
   avahi = makeTest (import ./avahi.nix);
-- 
GitLab


From e5966f96b7a7a20ee4f8d1de67b3b1b3a2026509 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 27 Apr 2011 13:33:06 +0000
Subject: [PATCH 2970/5331] * Fix the jboss module.

svn path=/nixos/trunk/; revision=26992
---
 modules/module-list.nix                       |  2 +-
 modules/services/web-servers/jboss/builder.sh | 72 +++++++++++++++++++
 .../{jboss.nix => jboss/default.nix}          |  8 ++-
 3 files changed, 78 insertions(+), 4 deletions(-)
 create mode 100644 modules/services/web-servers/jboss/builder.sh
 rename modules/services/web-servers/{jboss.nix => jboss/default.nix} (91%)

diff --git a/modules/module-list.nix b/modules/module-list.nix
index f67dbb29384..cf0940b49f1 100644
--- a/modules/module-list.nix
+++ b/modules/module-list.nix
@@ -135,7 +135,7 @@
   ./services/ttys/gpm.nix
   ./services/ttys/mingetty.nix
   ./services/web-servers/apache-httpd/default.nix
-  #./services/web-servers/jboss.nix
+  ./services/web-servers/jboss/default.nix
   ./services/web-servers/tomcat.nix
   ./services/x11/desktop-managers/default.nix
   ./services/x11/display-managers/auto.nix
diff --git a/modules/services/web-servers/jboss/builder.sh b/modules/services/web-servers/jboss/builder.sh
new file mode 100644
index 00000000000..2eb89a90f67
--- /dev/null
+++ b/modules/services/web-servers/jboss/builder.sh
@@ -0,0 +1,72 @@
+set -e
+
+source $stdenv/setup
+
+mkdir -p $out/bin
+
+cat > $out/bin/control <<EOF
+mkdir -p $logDir
+chown -R $user $logDir
+export PATH=$PATH:$su/bin
+
+start()
+{
+  su $user -s /bin/sh -c "$jboss/bin/run.sh \
+      -Djboss.server.base.dir=$serverDir \
+      -Djboss.server.base.url=file://$serverDir \
+      -Djboss.server.temp.dir=$tempDir \
+      -Djboss.server.log.dir=$logDir \
+      -Djboss.server.lib.url=$libUrl \
+      -c default"
+}
+
+stop()
+{
+  su $user -s /bin/sh -c "$jboss/bin/shutdown.sh -S"
+}
+
+if test "\$1" = start
+then
+  trap stop 15
+  
+  start
+elif test "\$1" = stop
+then
+  stop  
+elif test "\$1" = init
+then
+  echo "Are you sure you want to create a new server instance (old server instance will be lost!)?"
+  read answer
+
+  if ! test \$answer = "yes"
+  then
+    exit 1
+  fi
+  
+  rm -rf $serverDir
+  mkdir -p $serverDir
+  cd $serverDir
+  cp -av $jboss/server/default .
+  sed -i -e "s|deploy/|$deployDir|" default/conf/jboss-service.xml
+  
+  if ! test "$useJK" = ""
+  then
+    sed -i -e 's|<attribute name="UseJK">false</attribute>|<attribute name="UseJK">true</attribute>|' default/deploy/jboss-web.deployer/META-INF/jboss-service.xml
+    sed -i -e 's|<Engine name="jboss.web" defaultHost="localhost">|<Engine name="jboss.web" defaultHost="localhost" jvmRoute="node1">|' default/deploy/jboss-web.deployer/server.xml
+  fi
+  
+  # Make files accessible for the server user
+  
+  chown -R $user $serverDir
+  for i in \`find $serverDir -type d\`
+  do
+    chmod 755 \$i
+  done
+  for i in \`find $serverDir -type f\`
+  do
+    chmod 644 \$i
+  done
+fi
+EOF
+
+chmod +x $out/bin/*
diff --git a/modules/services/web-servers/jboss.nix b/modules/services/web-servers/jboss/default.nix
similarity index 91%
rename from modules/services/web-servers/jboss.nix
rename to modules/services/web-servers/jboss/default.nix
index bf7a8090b19..a1bdce50eee 100644
--- a/modules/services/web-servers/jboss.nix
+++ b/modules/services/web-servers/jboss/default.nix
@@ -1,4 +1,4 @@
-{ config, pkgs, servicesPath, ... }:
+{ config, pkgs, ... }:
 
 with pkgs.lib;
 
@@ -6,8 +6,10 @@ let
 
   cfg = config.services.jboss;
   
-  jbossService = import (servicesPath + /jboss) {
-    inherit (pkgs) stdenv jboss su;
+  jbossService = pkgs.stdenv.mkDerivation {
+    name = "jboss-server";
+    builder = ./builder.sh;
+    inherit (pkgs) jboss su;
     inherit (cfg) tempDir logDir libUrl deployDir serverDir user useJK;
   };
 
-- 
GitLab


From 1fd2e71c8d8907b08d88db793d8958ab2933150c Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 27 Apr 2011 13:54:23 +0000
Subject: [PATCH 2971/5331] * Don't add nixos-gui to the installation CD (for
 now) because 1)   xulrunner is a big package (> 105 MiB); 2) it breaks the CD
 build   (http://hydra.nixos.org/build/1057258); 3) currently it doesn't do  
 much yet.

  Note that if we do add it, we might as well add Firefox to the CD
  (since it's only a few MiB more on top of xulrunner).

svn path=/nixos/trunk/; revision=26993
---
 modules/profiles/graphical.nix | 2 --
 1 file changed, 2 deletions(-)

diff --git a/modules/profiles/graphical.nix b/modules/profiles/graphical.nix
index fbf6f1d2421..1c279a73ac9 100644
--- a/modules/profiles/graphical.nix
+++ b/modules/profiles/graphical.nix
@@ -13,6 +13,4 @@
     desktopManager.default = "kde4";
     desktopManager.kde4.enable = true;
   };
-
-  installer.enableGraphicalTools = true;
 }
-- 
GitLab


From 150ff09a06b389e16612191a33d5b3573df86b0d Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 27 Apr 2011 14:03:06 +0000
Subject: [PATCH 2972/5331] svn path=/nixos/trunk/; revision=26994

---
 tests/check-filesystems.nix | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/tests/check-filesystems.nix b/tests/check-filesystems.nix
index 8fb0dfc1584..882f5cd3153 100644
--- a/tests/check-filesystems.nix
+++ b/tests/check-filesystems.nix
@@ -1,10 +1,9 @@
 { nixos ? ./..
 , nixpkgs ? /etc/nixos/nixpkgs
-, services ? /etc/nixos/services
 , system ? builtins.currentSystem
 }:
 
-with import ../lib/build-vms.nix { inherit nixos nixpkgs services system; };
+with import ../lib/build-vms.nix { inherit nixos nixpkgs system; };
 
 rec {
   nodes = {
-- 
GitLab


From 257326915bbd5aa865153e8374a35fdbe37c8308 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 27 Apr 2011 14:03:46 +0000
Subject: [PATCH 2973/5331] * gw6c: don't depend on the services tree.

svn path=/nixos/trunk/; revision=26995
---
 modules/module-list.nix                       |   2 +-
 modules/services/networking/gw6c/control.in   |  42 +++
 .../networking/{gw6c.nix => gw6c/default.nix} |  44 ++-
 modules/services/networking/gw6c/gw6c.conf    | 338 ++++++++++++++++++
 4 files changed, 411 insertions(+), 15 deletions(-)
 create mode 100644 modules/services/networking/gw6c/control.in
 rename modules/services/networking/{gw6c.nix => gw6c/default.nix} (76%)
 create mode 100755 modules/services/networking/gw6c/gw6c.conf

diff --git a/modules/module-list.nix b/modules/module-list.nix
index cf0940b49f1..d2cd2e4637b 100644
--- a/modules/module-list.nix
+++ b/modules/module-list.nix
@@ -101,7 +101,7 @@
   ./services/networking/git-daemon.nix
   ./services/networking/gnunet.nix
   ./services/networking/gvpe.nix
-  ./services/networking/gw6c.nix
+  ./services/networking/gw6c/default.nix
   ./services/networking/ifplugd.nix
   #./services/networking/ircd-hybrid.nix
   ./services/networking/nat.nix
diff --git a/modules/services/networking/gw6c/control.in b/modules/services/networking/gw6c/control.in
new file mode 100644
index 00000000000..6193fbeccc4
--- /dev/null
+++ b/modules/services/networking/gw6c/control.in
@@ -0,0 +1,42 @@
+#! @shell@ -e
+
+# Make sure that the environment is deterministic.
+export PATH=@coreutils@/bin
+export PATH=@coreutils@/bin:@gnugrep@/bin:@gnused@/bin:@iputils@/bin:@iputils@/sbin:@procps@/bin:@seccure@/bin
+export BASEDIR=$(dirname $(dirname $0))
+
+	mkdir /tmp/.gw6c || true
+	touch /tmp/.gw6c/gw6c.conf
+	chmod 0700 /tmp/.gw6c
+	chmod 0700 /tmp/.gw6c/gw6c.conf
+	seccure-decrypt -F @privkey@ -i $BASEDIR/conf/gw6c.conf > /tmp/.gw6c/gw6c.conf
+
+stop ()
+{
+	pkill gw6c
+}
+
+ln -s /dev/net/tun /dev/tun || true;
+
+if test "$1" = "start"; then
+	trap 'stop ; exit ' 15
+
+	if test -n "@pingBefore@"; then while ! @iputils@/bin/ping @gw6server@ -c1 -w1 ; do sleep 1; done; fi
+    cd /tmp/.gw6c
+        @coreutils@/bin/yes |       \
+    env - HOME=/tmp/.gw6c $extraEnv \
+	@gw6c@/bin/gw6c -f /tmp/.gw6c/gw6c.conf 2>&1 >/var/log/gw6c.out
+    while @procps@/bin/pgrep gw6c; do 
+	sleep @everPing@; 
+	@iputils@/sbin/traceroute6 $( @coreutils@/bin/cat /var/log/gw6c.log  |
+		 @gnugrep@/bin/grep peer |
+		 @gnused@/bin/sed -e 's/.*with //; s/ .*//' |
+		 @coreutils@/bin/head -1) &
+    done;
+	pkill gw6c; 
+	exit
+fi
+
+if test "$1" = "stop"; then
+	env - HOME=/homeless-shelter @procps@/bin/pkill gw6c;
+fi;
diff --git a/modules/services/networking/gw6c.nix b/modules/services/networking/gw6c/default.nix
similarity index 76%
rename from modules/services/networking/gw6c.nix
rename to modules/services/networking/gw6c/default.nix
index fba9d440ad2..a566679d789 100644
--- a/modules/services/networking/gw6c.nix
+++ b/modules/services/networking/gw6c/default.nix
@@ -6,21 +6,37 @@ let
 
   cfg = config.services.gw6c;
 
-  # !!! Move this from the services tree to the nixos tree.
-  gw6cService = import /etc/nixos/services/gw6c {
-    inherit (pkgs) stdenv gw6c coreutils 
-      procps iputils gnused 
-      gnugrep seccure writeScript;
-    upstart = config.system.build.upstart;
-    username = cfg.username;
-    password = cfg.password;
-    server = cfg.server;
-    keepAlive = cfg.keepAlive;
-    everPing = cfg.everPing;
-    seccureKeys = config.security.seccureKeys;
-    waitPingableBroker = cfg.waitPingableBroker;
+  gw6cService = pkgs.stdenv.mkDerivation {
+    name = "gw6c-service";
+    inherit (pkgs) gw6c coreutils procps upstart iputils gnused gnugrep seccure;
+
+    inherit (cfg) username password keepAlive everPing;
+
+    gw6server = cfg.server;
+    authMethod = if cfg.username == "" then "anonymous" else "any";
+    gw6dir = pkgs.gw6c;
+
+    pingBefore = if cfg.waitPingableBroker then "true" else "";
+
+    pubkey = config.security.seccureKeys.public;
+    privkey = config.security.seccureKeys.private;
+
+    buildCommand =
+      ''
+        mkdir -p $out/bin $out/conf
+
+        mkdir conf
+        chmod 0700 conf
+        touch conf/raw
+        chmod 0700 conf/raw
+
+        substituteAll ${./gw6c.conf} conf/raw
+        $seccure/bin/seccure-encrypt "$(cat $pubkey)" -i conf/raw -o $out/conf/gw6c.conf
+        substituteAll ${./control.in} $out/bin/control
+        chmod a+x $out/bin/control
+      '';
   };
-  
+
 in
 
 {
diff --git a/modules/services/networking/gw6c/gw6c.conf b/modules/services/networking/gw6c/gw6c.conf
new file mode 100755
index 00000000000..943b9170c7d
--- /dev/null
+++ b/modules/services/networking/gw6c/gw6c.conf
@@ -0,0 +1,338 @@
+#-----------------------------------------------------------------------------
+# $Id: gw6c.conf.in,v 1.5 2007/05/09 13:41:32 cnepveu Exp $
+#-----------------------------------------------------------------------------
+
+##########################      READ ME!      ################################
+#
+# Welcome to the Gateway6 Client configuration file.
+# In order to use the client, you need to modify the 'userid', 'passwd' and 
+# 'server' parameters below depending on which of these situations applies:
+# 
+# 1. If you created a Freenet6 account, enter your userid and password below. 
+#    Change the server name to "broker.freenet6.net" and auth_method to 'any'.
+# 2. If you would like to use Freenet6 without creating an account, 
+#    do not make any modifications and close this file. 
+# 3. If this software was provided by your ISP, enter the userid, password and 
+#    server name provided by your ISP below. 
+#
+
+
+########################## BASIC CONFIGURATION ################################
+
+#
+# User Identification and Password:
+#   Specify your user name and password as provided by your ISP or Freenet6.
+#   If you plan to connect anonymously, leave these values empty.
+#   NOTE: Change auth_method option if you are using a username/password.
+#
+#   userid=<your_userid>
+#   passwd=<your_password>
+#
+userid=@username@ 
+passwd=@password@ 
+
+
+#
+# Gateway6 Server:
+#   Specify a Gateway6 server name or IP address (provided by your ISP or 
+#   Freenet6). An optional port number can be added; the default port number 
+#   is 3653.
+#  
+#   Examples:
+#     server=hostname # FQDN
+#     server=A.B.C.D  # IPv4 address
+#     server=[X:X::X:X] # IPv6 address
+#     server=hostname:port_number  
+#     server=A.B.C.D:port_number
+#     server=[X:X::X:X]:port_number
+#
+#   Freenet6 account holders should enter broker.freenet6.net, otherwise use
+#   anon.freenet6.net. Your ISP may provide you with a different server name. 
+#
+#server=anon.freenet6.net
+#server=broker.freenet6.net
+#server=broker.aarnet.net.au
+server=@gw6server@
+
+#
+# Authentication Method:
+#
+#  auth_method=<{anonymous}|{any|passdss-3des-1|digest-md5|plain}>
+#
+#   anonymous:      Sends no username or password
+#
+#   any:            The most secure method will be used. 
+#   passdss-3des-1: The password is sent encrypted.
+#   digest-md5:     The password is sent encrypted.
+#   plain:          Both username and password are sent as plain text.
+#
+# Recommended values:
+#   - any:          If you are authenticating a username / password.
+#   - anonymous:    If you are connecting anonymously.
+#
+#auth_method=anonymous
+#auth_method=any
+auth_method=@authMethod@
+
+
+########################## ROUTING CONFIGURATION ##############################
+# Use these parameters when you wish the client to act as a router and provide 
+# IPv6 connectivity to IPv6-capable devices on your network.
+
+#
+# Local Host Type:
+#   Change this value to 'router' to enable IPv6 advertisements.
+#
+#   host_type=<host|router>
+#
+host_type=host
+
+#
+# Prefix Length:
+#   Length of the requested prefix. Valid values range between 0 and 64 when 
+#   using V6*V4 tunnel modes, and between 0 and 32 when using V4V6 tunnel mode.
+#
+#   prefixlen=<integer>
+#
+prefixlen=64
+
+#
+# Advertisement Interface Prefix:
+#   Name of the interface that will be configured to send router advertisements. 
+#   This is an interface index on Windows (ex: 4) and a name on Linux
+#   and BSD (ex: eth1 or fxp1). 
+#
+#   if_prefix=<interface name>
+#
+if_prefix=
+
+#
+# DNS Server: 
+#   A DNS server list to which the reverse prefix will be delegated. Servers
+#   are separated by the colon(:) delimiter.
+#
+#   Example: dns_server=ns1.domain:ns2.domain:ns3.domain
+#
+dns_server=
+
+
+######################### ADVANCED CONFIGURATION ##############################
+
+#
+# Gateway6 Client Installation Directory:
+#   Directory where the Gateway6 Client will be installed. This value has been 
+#   set during installation.
+#
+gw6_dir=@gw6dir@
+
+#
+# Auto-Retry Connect and Delay:
+#   The time lapse, in seconds, between each reconnection in the case of a 
+#   timeout.
+#
+#   auto_retry_connect=<yes|no>
+#   retry_delay=<integer>
+#
+#   Recommended values: "yes" and 30
+#
+auto_retry_connect=yes
+retry_delay=5
+
+#
+# Keepalive Feature and Message Interval:
+#   Indicates if and how often the client will send data to keep the tunnel 
+#   active.
+#
+#   keepalive=<yes|no>
+#   keepalive_interval=<integer>
+#
+#   Recommended values: "yes" and 30
+#
+keepalive=yes
+keepalive_interval=@keepAlive@
+
+#
+# Tunnel Encapsulation Mode:
+#   v6v4:    IPv6-in-IPv4 tunnel.
+#   v6udpv4: IPv6-in-UDP-in-IPv4 tunnel (for clients behind a NAT).
+#   v6anyv4: Lets the broker choose the best mode for IPv6 tunnel.
+#   v4v6:    IPv4-in-IPv6 tunnel.
+#
+#   Recommended value: v6anyv4
+#
+tunnel_mode=v6anyv4
+
+#
+# Tunnel Interface Name:
+#   The interface name assigned to the tunnel. This value is O/S dependent.
+#
+#   if_tunnel_v6v4 is the tunnel interface name for v6v4 encapsulation mode
+#   if_tunnel_v6udpv4 is the tunnel interface name for v6udpv4 encapsulate mode
+#   if_tunnel_v4v6 is the tunnel interface name for v4v6 encapsulation mode
+#
+#   Default values are set during installation.
+#
+if_tunnel_v6v4=sit1
+if_tunnel_v6udpv4=tun
+if_tunnel_v4v6=sit0
+
+#
+# Local IP Address of the Client:
+#   Allows you to set a specific address as the local tunnel endpoint.
+#
+#   client_v4=<auto|A.B.C.D (valid ipv4 address)>
+#   client_v6=<auto|X:X::X:X (valid ipv6 address)>
+#     auto: The Gateway6 Client will find the local IP address endpoint.
+#
+#   Recommended value: auto
+#
+client_v4=auto
+client_v6=auto
+
+#
+# Script Name:
+#   File name of the script to run to install the tunnel interface. The 
+#   scripts are located in the template directory under the client 
+#   installation directory. 
+#
+#   template=<checktunnel|freebsd|netbsd|openbsd|linux|windows|darwin|cisco|solaris>
+#
+#   Default value is set during installation.
+# 
+template=linux
+
+#
+# Proxy client: 
+#   Indicates that this client will request a tunnel for another endpoint, 
+#   such as a Cisco router. 
+#
+#   proxy_client=<yes|no>
+#
+#   NOTE: NAT traversal is not possible in proxy mode. 
+#
+proxy_client=no
+
+
+############################ BROKER REDIRECTION ###############################
+
+#
+# Broker List File Name:
+#   The 'broker_list' directive specifies the filename where the broker
+#   list received during broker redirection will be saved. 
+#
+#   broker_list=<file_name>
+#  
+broker_list=/tmp/tsp-broker-list.txt
+
+#
+# Last Server Used File Name:
+#   The 'last_server' directive specifies the filename where the address of
+#   the last broker to which a connection was successfully established will 
+#   be saved.
+#
+#   last_server=<file_name>
+#
+last_server=/tmp/tsp-last-server.txt
+
+#
+# Always Use Last Known Working Server:
+#   The value of the 'always_use_same_server' directive determines whether the 
+#   client should always try to connect to the broker found in the 
+#   'last_server' directive filename. 
+#
+#   always_use_same_server=<yes|no>
+#
+always_use_same_server=no
+
+
+#################################### LOGGING ##################################
+
+#
+# Log Verbosity Configuration:
+#   The format is 'log_<destination>=level', where possible values for 
+#   'destination' are:
+#
+#   - console  (logging to the console [AKA stdout])
+#   - stderr   (logging to standard error)
+#   - file     (logging to a file)
+#   - syslog   (logging to syslog [Unix only])
+#
+#   and 'level' is a digit between 0 and 3. A 'level' value of 0 disables 
+#   logging to the destination, while values 1 to 3 request increasing levels 
+#   of log verbosity and detail. If 'level' is not specified, a value of 1 is 
+#   assumed.
+#
+#   Example:
+#     log_file=3   (Maximal logging to a file)
+#     log_stderr=0 (Logging to standard error disabled)
+#     log_console= (Minimal logging to the console) 
+#
+#   - Default configuration on Windows platforms:
+#
+#     log_console=0
+#     log_stderr=0
+#     log_file=1
+#
+#   - Default configuration on Unix platforms:
+#
+#     log_console=0
+#     log_stderr=1
+#     log_file=0
+#     log_syslog=0
+#
+#log_console=
+#log_stderr=
+#log_file=
+#log_syslog=
+log_file=3
+
+#
+# Log File Name:
+#   When logging to file is requested using the 'log_file' directive, the name
+#   and path of the file to use may be specified using this directive.
+#
+#   log_filename=<file_name>
+#
+log_filename=/var/log/gw6c.log
+
+#
+# Log File Rotation:
+#   When logging to file is requested using the 'log_file' directive, log file 
+#   rotation may be enabled. When enabled, the contents of the log file will 
+#   be moved to a backup file just before it reaches the maximum log file size 
+#   specified via this directive.
+#
+#   The name of the backup file is the name of the original log file with 
+#   '.<timestamp>' inserted before the file extension. If the file does not 
+#   have an extension, '.<timestamp>' is appended to the name of the original
+#   log file. The timestamp specifies when the rotation occurred.
+#
+#   After the contents of the log file have been moved to the backup file, the 
+#   original file is cleared, and logging resumes at the beginning of the file. 
+#
+#   log_rotation=<yes|no>
+#
+log_rotation=yes
+
+#
+# Log File Rotation Size:
+#   The 'log_rotation_size' directive specifies the maximum size a log file may 
+#   reach before rotation occurs, if enabled. The value is expressed in 
+#   kilobytes.
+#
+#   log_rotation_size=<16|32|128|1024>
+#
+log_rotation_size=32
+
+#
+# Syslog Logging Facility [Unix Only]:
+#   When logging to syslog is requested using the 'log_syslog' directive, the 
+#   facility to use may be specified using this directive.
+#
+#   syslog_facility=<USER|LOCAL[0-7]>
+#
+syslog_facility=USER
+
+
+# end of gw6c.conf
+#------------------------------------------------------------------------------
-- 
GitLab


From 742881a0f93a04039e74196ae186368b48ebde46 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 27 Apr 2011 14:10:03 +0000
Subject: [PATCH 2974/5331] svn path=/nixos/trunk/; revision=26997

---
 modules/services/networking/gw6c/control.in | 2 ++
 modules/services/networking/gw6c/gw6c.conf  | 0
 2 files changed, 2 insertions(+)
 mode change 100755 => 100644 modules/services/networking/gw6c/gw6c.conf

diff --git a/modules/services/networking/gw6c/control.in b/modules/services/networking/gw6c/control.in
index 6193fbeccc4..0b533232708 100644
--- a/modules/services/networking/gw6c/control.in
+++ b/modules/services/networking/gw6c/control.in
@@ -1,5 +1,7 @@
 #! @shell@ -e
 
+# !!! use a proper Upstart job.
+
 # Make sure that the environment is deterministic.
 export PATH=@coreutils@/bin
 export PATH=@coreutils@/bin:@gnugrep@/bin:@gnused@/bin:@iputils@/bin:@iputils@/sbin:@procps@/bin:@seccure@/bin
diff --git a/modules/services/networking/gw6c/gw6c.conf b/modules/services/networking/gw6c/gw6c.conf
old mode 100755
new mode 100644
-- 
GitLab


From e3a2cd58e0932c4d6b4a40bf5f122525bd9771ea Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 27 Apr 2011 14:10:33 +0000
Subject: [PATCH 2975/5331] svn path=/nixos/trunk/; revision=26998

---
 modules/services/web-servers/apache-httpd/mercurial.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/services/web-servers/apache-httpd/mercurial.nix b/modules/services/web-servers/apache-httpd/mercurial.nix
index d2d9e66d4f8..45cb8197917 100644
--- a/modules/services/web-servers/apache-httpd/mercurial.nix
+++ b/modules/services/web-servers/apache-httpd/mercurial.nix
@@ -1,4 +1,4 @@
-{ config, pkgs, serverInfo, servicesPath, ... }:
+{ config, pkgs, serverInfo, ... }:
 
 let
   inherit (pkgs) mercurial;
-- 
GitLab


From 56f1918e1ca073fd1460badb61281d7202bc1c80 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 27 Apr 2011 14:52:55 +0000
Subject: [PATCH 2976/5331] * Move the Subversion/Repoman module out of the
 NixOS tree.

svn path=/nixos/trunk/; revision=27000
---
 .../web-servers/apache-httpd/subversion.nix   | 458 ------------------
 1 file changed, 458 deletions(-)
 delete mode 100644 modules/services/web-servers/apache-httpd/subversion.nix

diff --git a/modules/services/web-servers/apache-httpd/subversion.nix b/modules/services/web-servers/apache-httpd/subversion.nix
deleted file mode 100644
index 3229138d172..00000000000
--- a/modules/services/web-servers/apache-httpd/subversion.nix
+++ /dev/null
@@ -1,458 +0,0 @@
-{ config, pkgs, serverInfo, servicesPath, ... }:
-
-let
-
-  inherit (pkgs.lib) mkOption;
-
-  urlPrefix = config.urlPrefix;
-  dbDir = "${config.dataDir}/db";
-  reposDir = "${config.dataDir}/repos";
-  backupsDir = "${config.dataDir}/backup";
-  distsDir = "${config.dataDir}/dist";
-  tmpDir = "${config.dataDir}/tmp";
-  logDir = "${config.dataDir}/log";
-  idString = if config.id == "" then "" else "${config.id}-";
-  postCommitHook = "/var/run/current-system/sw/bin/svn-server-${idString}post-commit-hook";
-  fsType = "fsfs";
-  adminAddr = serverInfo.adminAddr;
-  
-
-
-  # Build a Subversion instance with Apache modules and Swig/Python bindings.
-  subversion = pkgs.subversion.override (origArgs: {
-    bdbSupport = true;
-    httpServer = true;
-    sslSupport = true;
-    compressionSupport = true;
-    pythonBindings = true;
-  });
-
-
-  # Build the maintenance scripts and commit hooks.
-  scripts = substituteInAll {
-    name = "svn-server-scripts";
-    src = /* pkgs.lib.cleanSource */ "${servicesPath}/subversion/src/scripts";
-
-    # The variables to substitute:
-    
-    inherit reposDir dbDir logDir distsDir backupsDir tmpDir
-      urlPrefix adminAddr fsType subversion postCommitHook mailer;
-    inherit (config) notificationSender userCreationDomain;
-    orgUrl = config.organisation.url;
-    orgLogoUrl = config.organisation.logo;
-    orgName = config.organisation.name;
-      
-    perl = "${pkgs.perl}/bin/perl";
-
-    sendmail = "${pkgs.ssmtp}/sbin/sendmail";
-    
-    inherit (pkgs) libxslt enscript db4 coreutils diffutils gzip bzip2 python;
-
-    inherit (serverInfo) canonicalName;
-
-    inherit (serverInfo.serverConfig) user group;    
-    
-    # Urgh, most of these are dependencies of Email::Send, should figure them out automatically.
-    perlFlags = map (x: "-I${x}/lib/perl5/site_perl") [
-      pkgs.perlPackages.BerkeleyDB pkgs.perlPackages.EmailSend
-      pkgs.perlPackages.EmailSimple pkgs.perlPackages.ModulePluggable
-      pkgs.perlPackages.ReturnValue pkgs.perlPackages.EmailAddress
-      pkgs.perlPackages.CryptPasswordMD5
-      pkgs.perlPackages.StringMkPasswd
-    ];
-
-    pythonPath = "${subversion}/lib/${pkgs.python.libPrefix}/site-packages";
-
-    # Do a syntax check on the generated file.
-    postInstall = ''
-      $perl -c -T $out/cgi-bin/repoman.pl
-      $perl -c $out/bin/svn-server-create-user.pl
-      if test -n "${config.id}"; then
-        for i in $(cd $out/bin && echo *); do
-          mv "$out/bin/$i" "$out/bin/$(echo $i | sed s^svn-server-^svn-server-${config.id}-^)"
-        done
-      fi
-    '';
-  };
-
-
-  # Extract the mailer script from the Subversion source distribution.
-  mailer = pkgs.runCommand "svn-mailer.py" { inherit (subversion) src; }
-    ''
-      unpackFile $src
-      cp subversion-*/tools/hook-scripts/mailer/mailer.py $out
-    '';
-
-  
-  # Build our custom authentication modules.
-  authModules = import "${servicesPath}/subversion/src/auth" {
-    inherit (pkgs) stdenv apacheHttpd;
-  };
-
-
-  commonAuth = ''
-    AuthType Basic
-    AuthName "Subversion repositories"
-    AuthBasicProvider dbm
-    AuthDBMType DB
-    AuthDBMUserFile ${dbDir}/svn-users
-  '';
-  
-
-  # Access controls for /repos and /repos-xml. 
-  reposConfig = dirName: ''
-    ${commonAuth}
-
-    AuthAllowNone on
-
-    AuthzRepoPrefix ${urlPrefix}/${dirName}/
-    AuthzRepoDBType DB
-    AuthzRepoReaders ${dbDir}/svn-readers
-    AuthzRepoWriters ${dbDir}/svn-writers
-
-    <LimitExcept GET PROPFIND OPTIONS REPORT>
-        Require repo-writer
-    </LimitExcept>
-
-    <Limit GET PROPFIND OPTIONS REPORT>
-        Require repo-reader
-    </Limit>
-
-    DAV svn
-    SVNParentPath ${reposDir}
-    SVNAutoversioning ${if config.autoVersioning then "on" else "off"}
-  '';
-
-
-  # Build ViewVC.
-  viewvc = import "${servicesPath}/subversion/src/viewvc" {
-    inherit (pkgs) fetchurl stdenv python enscript;
-    inherit urlPrefix reposDir adminAddr subversion;
-  };
-
-
-  viewerConfig = dirName: ''
-    ${commonAuth}
-    AuthAllowNone on
-    AuthzRepoPrefix ${urlPrefix}/${dirName}/
-    AuthzRepoDBType DB
-    AuthzRepoReaders ${dbDir}/svn-readers
-    Require repo-reader
-  '';
-
-
-  viewvcConfig = ''
-    ScriptAlias ${urlPrefix}/viewvc ${viewvc}/viewvc/bin/mod_python/viewvc.py
-
-    <Location ${urlPrefix}/viewvc>
-        AddHandler python-program .py
-        # Note: we write \" instead of ' to work around a lexer bug in Nix 0.11.
-        PythonPath "[\"${viewvc}/viewvc/bin/mod_python\", \"${subversion}/lib/${pkgs.python.libPrefix}/site-packages\"] + sys.path"
-        PythonHandler handler
-        ${viewerConfig "viewvc"}
-    </Location>
-
-    Alias ${urlPrefix}/viewvc-doc ${viewvc}/viewvc/templates/docroot
-
-    Redirect permanent ${urlPrefix}/viewcvs ${serverInfo.canonicalName}/${urlPrefix}/viewvc
-  '';
-
-
-  # Build WebSVN.
-  websvn = import "${servicesPath}/subversion/src/websvn" {
-    inherit (pkgs) fetchurl stdenv writeText enscript gnused diffutils;
-    inherit urlPrefix reposDir subversion;
-    cacheDir = tmpDir;
-  };
-
-  
-  websvnConfig = ''
-    Alias ${urlPrefix}/websvn ${websvn}/wsvn.php
-    Alias ${urlPrefix}/templates ${websvn}/templates
-
-    <Location ${urlPrefix}/websvn>
-        ${viewerConfig "websvn"}
-    </Location>
-
-    <Directory ${websvn}/templates>
-        Order allow,deny
-        Allow from all
-    </Directory>
-  '';
-
-
-  distConfig = ''
-    Alias ${urlPrefix}/dist ${distsDir}
-
-    <Directory "${distsDir}">
-        AllowOverride None
-        Options Indexes FollowSymLinks
-        Order allow,deny
-        Allow from all
-        IndexOptions +SuppressDescription +NameWidth=*
-        IndexIgnore *.rev *.lock
-        IndexStyleSheet ${urlPrefix}/style.css
-    </Directory>
-
-    <Location ${urlPrefix}/dist>
-        ${viewerConfig "dist"}
-    </Location>
-  '';
-  
-
-  repomanConfig = ''
-    ScriptAlias ${urlPrefix}/repoman ${scripts}/cgi-bin/repoman.pl
-
-    <Location ${urlPrefix}/repoman/listdetails>
-        ${commonAuth}    
-        Require valid-user
-    </Location>
-
-    <Location ${urlPrefix}/repoman/adduser>
-        Order deny,allow
-        Deny from all
-        Allow from 127.0.0.1
-        Allow from ${config.userCreationDomain}
-    </Location>
-
-    <Location ${urlPrefix}/repoman/edituser>
-        ${commonAuth}    
-        Require valid-user
-    </Location>
-
-    <Location ${urlPrefix}/repoman/create>
-        ${commonAuth}    
-        Require valid-user
-        Order deny,allow
-        Deny from all
-        Allow from 127.0.0.1
-        Allow from ${config.userCreationDomain}
-    </Location>
-
-    <Location ${urlPrefix}/repoman/update>
-        ${commonAuth}    
-        Require valid-user
-    </Location>
-
-    <Location ${urlPrefix}/repoman/dump>
-        ${viewerConfig "repoman/dump"}
-    </Location>
-  '';
-
-
-  staticFiles = substituteInSome {
-    name = "svn-static-files";
-    src = /* pkgs.lib.cleanSource */ "${servicesPath}/subversion/root";
-    files = ["xsl/svnindex.xsl"];
-    inherit urlPrefix;
-  };
-
-  staticFilesConfig = ''
-    Alias ${urlPrefix}/svn-files ${staticFiles}/
-    <Directory ${staticFiles}>
-        Order allow,deny
-        Allow from all
-    </Directory>
-  '';
-
-  
-  # !!! should be in Nixpkgs.
-  substituteInSome = args: pkgs.stdenv.mkDerivation ({
-    buildCommand = ''
-      ensureDir $out
-      cp -prd $src/* $out
-      chmod -R u+w $out
-      for i in $files; do
-        args=
-        substituteAll $out/$i $out/$i
-      done
-    '';
-  } // args); # */
-    
-  substituteInAll = args: pkgs.stdenv.mkDerivation ({
-    buildCommand = ''
-      ensureDir $out
-      cp -prd $src/* $out
-      chmod -R u+w $out
-      find $out -type f -print | while read fn; do
-        args=
-        substituteAll $fn $fn
-      done
-      eval "$postInstall"
-    '';
-  } // args); # */
-
-      
-in {
-
-  extraModulesPre = [
-    # Allow anonymous access to repositories that are world-readable
-    # without prompting for a username/password.
-    { name = "authn_noauth"; path = "${authModules}/modules/mod_authn_noauth.so"; }
-    # Check whether the user is allowed read or write access to a
-    # repository.
-    { name = "authz_dyn";    path = "${authModules}/modules/mod_authz_dyn.so"; }
-  ];
-
-  extraModules = [
-    { name = "python";  path = "${pkgs.mod_python}/modules/mod_python.so"; }
-    { name = "dav_svn"; path = "${subversion}/modules/mod_dav_svn.so"; }
-  ];
-
-  enablePHP = true;
-
-  
-  extraConfig = ''
-  
-    <Location ${urlPrefix}/repos>
-      ${reposConfig "repos"}
-    </Location>
-    
-    <Location ${urlPrefix}/repos-xml>
-      ${reposConfig "repos-xml"}
-      SVNIndexXSLT "${urlPrefix}/svn-files/xsl/svnindex.xsl"
-    </Location>
-
-    ${viewvcConfig}
-
-    ${websvnConfig}
-
-    ${repomanConfig}
-
-    ${distConfig}
-
-    ${staticFilesConfig}
-
-    ${if config.toplevelRedirect then ''
-        <Location ${urlPrefix}/>
-            DirectoryIndex repoman
-        </Location>
-      '' else ""}
-        
-  '';
-
-  
-  robotsEntries = ''
-    User-agent: *
-    Disallow: ${urlPrefix}/viewcvs/
-    Disallow: ${urlPrefix}/viewvc/
-    Disallow: ${urlPrefix}/websvn/
-    Disallow: ${urlPrefix}/repos-xml/
-  '';
-
-  
-  # mod_python's own Python modules must be in the initial Python
-  # path, they cannot be set through the PythonPath directive.
-  globalEnvVars = [
-    { name = "PYTHONPATH"; value = "${pkgs.mod_python}/lib/${pkgs.python.libPrefix}/site-packages"; }
-  ];
-
-  
-  extraServerPath = [
-    # Needed for ViewVC.
-    "${pkgs.diffutils}/bin"
-    "${pkgs.gnused}/bin"
-  ];
-
-  
-  extraPath = [scripts];
-
-
-  startupScript = "${scripts}/bin/svn-server-${idString}startup-hook.sh";
-  
-
-  options = {
-
-    id = mkOption {
-      default = "";
-      example = "test";
-      description = "
-        A unique identifier necessary to keep multiple Subversion server
-        instances on the same machine apart.  This is used to
-        disambiguate the administrative scripts, which get names like
-        svn-server-<id>-delete-repo.pl.  In particular it keeps
-        the post-commit hooks of different instances apart.
-      ";
-    };
-
-    urlPrefix = mkOption {
-      default = "/subversion";
-      description = "
-        The URL prefix under which the Subversion service appears.
-        Use the empty string to have it appear in the server root.
-      ";
-    };
-
-    toplevelRedirect = mkOption {
-      default = true;
-      description = "
-        Whether <varname>urlPrefix</varname> without any suffix
-        (except a slash) should redirect to
-        <varname>urlPrefix</varname><literal>/repoman</literal>.
-      ";
-    };
-
-    notificationSender = mkOption {
-      default = "svn-server@example.org";
-      example = "svn-server@example.org";
-      description = "
-        The email address used in the Sender field of commit
-        notification messages sent by the Subversion subservice.
-      ";
-    };
-
-    userCreationDomain = mkOption {
-      default = "example.org"; 
-      example = "example.org";
-      description = "
-        The domain from which user creation is allowed.  A client can
-        only create a new user account if its IP address resolves to
-        this domain.
-      ";
-    };
-
-    autoVersioning = mkOption {
-      default = false;
-      description = "
-        Whether you want the Subversion subservice to support
-        auto-versioning, which enables Subversion repositories to be
-        mounted as read/writable file systems on operating systems that
-        support WebDAV.
-      ";
-    };
-
-    dataDir = mkOption {
-      example = "/data/subversion";
-      description = "
-        Path to the directory that holds the repositories, user database, etc.
-      ";
-    };
-
-    organisation = {
-
-      name = mkOption {
-        default = null;
-        description = "
-          Name of the organization hosting the Subversion service.
-        ";
-      };
-
-      url = mkOption {
-        default = null;
-        description = "
-          URL of the website of the organization hosting the Subversion service.
-        ";
-      };
-
-      logo = mkOption {
-        default = null;
-        description = "
-          Logo the organization hosting the Subversion service.
-        ";
-      };
-
-    };
-
-  };
-  
-}
-- 
GitLab


From aefa687b02e422f0153faa6fc48499f2b7125ef5 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 27 Apr 2011 15:00:32 +0000
Subject: [PATCH 2977/5331] * Move the twiki module out of the NixOS tree.

svn path=/nixos/trunk/; revision=27001
---
 .../web-servers/apache-httpd/twiki.nix        | 146 ------------------
 1 file changed, 146 deletions(-)
 delete mode 100644 modules/services/web-servers/apache-httpd/twiki.nix

diff --git a/modules/services/web-servers/apache-httpd/twiki.nix b/modules/services/web-servers/apache-httpd/twiki.nix
deleted file mode 100644
index dca92062fa8..00000000000
--- a/modules/services/web-servers/apache-httpd/twiki.nix
+++ /dev/null
@@ -1,146 +0,0 @@
-{ config, pkgs, serverInfo, ... }:
-
-let
-
-  inherit (pkgs.lib) mkOption;
-
-  dataDir = config.dataDir; # "/data/pt-wiki/data";
-  pubDir = config.pubDir; # "/data/pt-wiki/pub";
-
-  scriptUrlPath = "/bin";
-  pubUrlPath    = "/pub";
-  absHostPath   = "/";
-
-  # Hacks for proxying and rewriting
-  dispPubUrlPath    = "/pub";
-  dispScriptUrlPath = "";
-  dispViewPath      = "";
-
-  startWeb = config.startWeb;
-  defaultUrlHost = "";
-
-  # Build the TWiki CGI and configuration files.
-  twikiRoot = (import /etc/nixos/services/twiki/twiki-instance.nix { inherit pkgs; }).twiki {
-    name = "wiki-instance";
-    pubdir = pubDir;
-    datadir = dataDir;
-    inherit scriptUrlPath pubUrlPath absHostPath
-      dispPubUrlPath dispScriptUrlPath dispViewPath defaultUrlHost;
-    twikiName = config.twikiName;
-    registrationDomain = config.registrationDomain;
-  };
-
-  plugins = import /etc/nixos/services/twiki/server-pkgs/twiki-plugins.nix;
-
-in {
-
-  extraConfig = ''
-
-    ScriptAlias ${scriptUrlPath} "${twikiRoot}/bin"
-    Alias ${pubUrlPath} "${pubDir}"
-
-    <Directory "${twikiRoot}/bin">
-       Options +ExecCGI
-       SetHandler cgi-script
-       AllowOverride All
-       Allow from all
-    </Directory>
-    <Directory "${twikiRoot}/templates">
-       deny from all
-    </Directory>
-    <Directory "${twikiRoot}/lib">
-       deny from all
-    </Directory>
-    <Directory "${pubDir}">
-       Options None
-       AllowOverride None
-       Allow from all
-       # Hardening suggested by http://twiki.org/cgi-bin/view/Codev/SecurityAlertSecureFileUploads.
-       php_admin_flag engine off
-       AddType text/plain .html .htm .shtml .php .php3 .phtml .phtm .pl .py .cgi
-    </Directory>
-    <Directory "${dataDir}">
-       deny from all
-    </Directory>
-
-    Alias ${absHostPath} ${twikiRoot}/rewritestub/
-
-    <Directory "${twikiRoot}/rewritestub">
-      RewriteEngine On
-      RewriteBase ${absHostPath}
-
-      # complete bin path
-      RewriteRule ^bin(.*)  bin/$1 [L]
-
-      #@customRewriteRules@
-
-      # Hack for restricted webs.
-      RewriteRule ^pt/(.*)  $1
-
-      # action / web / whatever
-      RewriteRule ^([a-z]+)/([A-Z][^/]+)/(.*)  bin/$1/$2/$3 [L]
-
-      # web / topic
-      RewriteRule ^([A-Z][^/]+)/([^/]+)   bin/view/$1/$2 [L]
-
-      # web
-      RewriteRule ^([A-Z][^/]+)           bin/view/$1/WebHome [L]
-
-      # web/
-      RewriteRule ^([A-Z][^/]+)/          bin/view/$1/WebHome [L]
-
-      RewriteRule ^index.html$            bin/view/${startWeb} [L]
-
-      RewriteRule ^$                      bin/view/${startWeb} [L]
-    </Directory>
-
-  '';
-
-  robotsEntries = ''
-    User-agent: *
-    Disallow: /rdiff/
-    Disallow: /rename/
-    Disallow: /edit/
-    Disallow: /bin/
-    Disallow: /oops/
-    Disallow: /view/
-    Disallow: /search/
-    Disallow: /attach/
-    Disallow: /pt/bin/
-  '';
-
-  options = {
-
-    dataDir = mkOption {
-      example = "/data/wiki/data";
-      description = "
-        Path to the directory that holds the Wiki data.
-      ";
-    };
-
-    pubDir = mkOption {
-      example = "/data/wiki/pub";
-      description = "
-        Path to the directory that holds uploaded files.
-      ";
-    };
-
-    twikiName = mkOption {
-      default = "Wiki";
-      example = "Foobar Wiki";
-      description = "
-        Name of this Wiki.
-      ";
-    };
-
-    registrationDomain = mkOption {
-      example = "example.org";
-      description = "
-        Domain from which registrations are permitted.  Use `all' to
-        permit registrations from anywhere.
-      ";
-    };
-
-  };  
-
-}
-- 
GitLab


From 41a8f23189c28564d05102c6d48e193c810de5b1 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 27 Apr 2011 15:34:33 +0000
Subject: [PATCH 2978/5331] * Revert to the old (r10556) version of the
 nixos-checkout script.  It   was never intended as a generic "check out
 anything" script; it's   just a convenience script to obtain the NixOS trunk
 after   installation.  So that's what it should do.

svn path=/nixos/trunk/; revision=27005
---
 modules/installer/tools/nixos-checkout.nix | 187 +++------------------
 1 file changed, 20 insertions(+), 167 deletions(-)

diff --git a/modules/installer/tools/nixos-checkout.nix b/modules/installer/tools/nixos-checkout.nix
index e5bb7432e68..647e59a4a86 100644
--- a/modules/installer/tools/nixos-checkout.nix
+++ b/modules/installer/tools/nixos-checkout.nix
@@ -8,180 +8,33 @@ with pkgs.lib;
 
 let
 
-  options = {
-
-    # !!! These option (and their implementation) seems
-    # over-engineering.  nixos-checkout was never intended to be a
-    # generic, "check out anything that the user want to have from any
-    # version management system whatsoever", but merely a trivial
-    # convenience script to checkout the NixOS and Nixpkgs trees
-    # during or after a NixOS installation.
-    installer.repos.nixos = mkOption {
-      default = [ { type  = "svn"; } ];
-      example =
-        [ { type = "svn"; url = "https://svn.nixos.org/repos/nix/nixos/branches/stdenv-updates"; target = "/etc/nixos/nixos-stdenv-updates"; }
-          { type = "git"; initialize = ''git clone git://mawercer.de/nixos $target''; update = "git pull origin"; target = "/etc/nixos/nixos-git"; }
-        ];
-      description = ''
-        The NixOS repository from which the system will be built.
-        <command>nixos-checkout</command> will update all working
-        copies of the given repositories,
-        <command>nixos-rebuild</command> will use the first item
-        which has the attribute <literal>default = true</literal>
-        falling back to the first item. The type defines the
-        repository tool added to the path. It also defines a "valid"
-        repository.  If the target directory already exists and it's
-        not valid it will be moved to the backup location
-        <filename><replaceable>dir</replaceable>-date</filename>.
-        For svn the default target and repositories are
-        <filename>/etc/nixos/nixos</filename> and
-        <filename>https://svn.nixos.org/repos/nix/nixos/trunk</filename>.
-        For git repositories update is called after initialization
-        when the repo is initialized.  The initialize code is run
-        from working directory dirname
-        <replaceable>target</replaceable> and should create the
-        directory
-        <filename><replaceable>dir</replaceable></filename>.  For
-        the executables used see <option>repoTypes</option>.
-      '';
-    };
-
-    installer.repos.nixpkgs = mkOption {
-      default = [ { type  = "svn"; }  ];
-      description = "same as <option>repos.nixos</option>";
-    };
-
-    installer.repoTypes = mkOption {
-      default = {
-        svn = { valid = "[ -d .svn ]"; env = [ pkgs.coreutils pkgs.subversion ]; };
-        git = { valid = "[ -d .git ]"; env = [ pkgs.coreutils pkgs.git pkgs.gnused /*  FIXME: use full path to sed in nix-pull */ ]; };
-        gitsvn = { valid = "[ -d .git/svn ]"; env = [ pkgs.coreutils pkgs.gitFull pkgs.gnused ]; };
-      };
-      description = ''
-        Defines, for each supported version control system
-        (e.g. <literal>git</literal>), the dependencies for the
-        mechanism, as well as a test used to determine whether a
-        directory is a checkout created by that version control
-        system.
-      '';
-    };
-      
-  };
-
-
-  ### implementation
-
-  # prepareRepoAttrs adds svn defaults and preparse the repo attribute sets so that they
-  # returns in any case:
-  # { type = git/svn; 
-  #   target = path;
-  #   initialize = cmd; # must create target dir, dirname target will exist
-  #   update = cmd;     # pwd will be target
-  #   default = true/false;
-  # }
-  prepareRepoAttrs = repo : attrs :
-    assert (isAttrs attrs);
-    assert (repo + "" == repo); # assert repo is a string
-    if (! (attrs ? type)) then 
-      throw "repo type is missing of : ${showVal attrs}"
-    # prepare svn repo
-    else if attrs.type == "svn" then
-      let a = { # add svn defaults
-                url = "https://svn.nixos.org/repos/nix/${repo}/trunk";
-                target = "/etc/nixos/${repo}";
-              } // attrs; in
-      rec { 
-        inherit (a) type target;
-        default =  if a ? default then a.default else false;
-        initialize = "svn co ${a.url} ${a.target}"; 
-        update = initialize; # co is just as fine as svn update
-     }
-    # prepare git repo
-    else  if attrs.type == "git" then # sanity check for existing attrs
-      assert (all id (map ( attr : if hasAttr attr attrs then true 
-                                     else throw "git repository item is missing attribute ${attr}")
-                          [ "target" "initialize" "update" ]
-                      ));
-    let t = escapeShellArg attrs.target; in
-    rec {
-      inherit (attrs) type target;
-      default =  if attrs ? default then attrs.default else false;
-      update = "cd ${t}; ${attrs.update}";
-      initialize =  ''
-    cd $(dirname ${t}); ${attrs.initialize}
-    [ -d ${t} ] || { echo "git initialize failed to create target directory ${t}"; exit 1; }
-    ${update}'';
-    }
-    else  if attrs.type == "gitsvn" then # sanity check for existing attrs
-      let
-        a = {
-          # add gitsvn defaults
-          url = "https://svn.nixos.org/repos/nix/${repo}";
-	   # XXX: same default target as svn: good/bad?
-          target = "/etc/nixos/${repo}";
-          initialize = "git svn clone -s ${a.url} ${a.target}";
-          # splitting this in fetch and rebase -l helps to recover partly cloned repo
-          update = "git svn fetch && git svn rebase -l";
-        } // attrs;
-        t = escapeShellArg a.target;
-      in
-      rec {
-        inherit (a) type target;
-        default =  if a ? default then a.default else false;
-        update = "cd ${t} && ${a.update}";
-        initialize =  ''
-          cd $(dirname ${t}) && ${a.initialize}
-          [ -d ${t} ] || { echo "gitsvn initialize failed to create target directory ${t}"; exit 1; }
-          ${update}'';
-      }
-    else throw "unkown repo type ${attrs.type}";
-
-  # apply prepareRepoAttrs on each repo definition
-  repos = mapAttrs ( repo : list : map (x : (prepareRepoAttrs repo x) // { inherit repo; } ) list ) config.installer.repos;
-
-  # function returning the default repo (first one having attribute default or head of list)
-  defaultRepo = list : head ( (filter ( attrs : attrs ? default && attrs.default == true ) list)
-                              ++ list );
-
-  # creates the nixos-checkout script 
   nixosCheckout = pkgs.substituteAll {
     name = "nixos-checkout";
     dir = "bin";
     isExecutable = true;
-    src = pkgs.writeScript "nixos-checkout" (''
-          #! @shell@ -e
-          # this file is automatically generated from nixos configuration file settings (installer.repos)
-          backupTimestamp=$(date "+%Y%m%d%H%M%S")
-          '' + concatMapStrings ( attrs :
-                let repoType = builtins.getAttr attrs.type config.installer.repoTypes; 
-                    target = escapeShellArg attrs.target; in
-                ''
-                  # ${attrs.type} repo ${target}
-                  PATH=
-                  for path in ${toString repoType.env}; do
-                    PATH=$PATH:$path/bin:$path/sbin
-                  done
-                  if [ -d  ${target} ] && { cd ${target} && { ${ repoType.valid}; }; }; then
-                      echo; echo '>>  ' updating ${attrs.type} repo ${target}
-                      set -x; ${attrs.update}; set +x
-                  else # [ make backup and ] initialize
-                      [ -e ${target} ] && mv ${target} ${target}-$backupTimestamp
-                      target=${target}
-                      [ -d "$(dirname ${target})" ] || mkdir -p  "$(dirname ${target})"
-                      echo; echo '>>  'initializing ${attrs.type} repo ${target}
-                      set -x; ${attrs.initialize}; set +x
-                  fi
-                ''
-              ) # flatten all repo definition to one list adding the repository
-               ( concatLists  (flattenAttrs repos) )
-      );
+    src = pkgs.writeScript "nixos-checkout"
+      ''
+        cd /etc/nixos
+
+        # Move any old nixos or nixpkgs directories out of the way.
+        backupTimestamp=$(date "+%Y%m%d%H%M%S")
+
+        if test -e nixos -a ! -e nixos/.svn; then
+            mv nixos nixos-$backupTimestamp
+        fi
+
+        if test -e nixpkgs -a ! -e nixpkgs/.svn; then
+            mv nixpkgs nixpkgs-$backupTimestamp
+        fi
+
+        # Check out the NixOS and Nixpkgs sources.
+        svn co https://svn.nixos.org/repos/nix/nixos/trunk nixos
+        svn co https://svn.nixos.org/repos/nix/nixpkgs/trunk nixpkgs
+      '';
    };
   
-  
 in
 
 {
-  require = options;
-
-  environment.systemPackages = [nixosCheckout];
+  environment.systemPackages = [ nixosCheckout ];
 }
-- 
GitLab


From b8a1e981809f6465220d0633633b074383f9e1e0 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 27 Apr 2011 15:42:14 +0000
Subject: [PATCH 2979/5331] * nixos-checkout depends on subversion.  (The
 original nixos-checkout   did a "nix-env -i subversion", which may be
 preferable to a static   dependency.)

svn path=/nixos/trunk/; revision=27006
---
 modules/installer/tools/nixos-checkout.nix | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/modules/installer/tools/nixos-checkout.nix b/modules/installer/tools/nixos-checkout.nix
index 647e59a4a86..2d7304ea68d 100644
--- a/modules/installer/tools/nixos-checkout.nix
+++ b/modules/installer/tools/nixos-checkout.nix
@@ -28,13 +28,18 @@ let
         fi
 
         # Check out the NixOS and Nixpkgs sources.
-        svn co https://svn.nixos.org/repos/nix/nixos/trunk nixos
-        svn co https://svn.nixos.org/repos/nix/nixpkgs/trunk nixpkgs
+        ${pkgs.subversion}/bin/svn co https://svn.nixos.org/repos/nix/nixos/trunk nixos
+        ${pkgs.subversion}/bin/svn co https://svn.nixos.org/repos/nix/nixpkgs/trunk nixpkgs
       '';
    };
   
 in
 
 {
-  environment.systemPackages = [ nixosCheckout ];
+  environment.systemPackages =
+    [ nixosCheckout
+      # Since the checkout script depends on Subversion, we may as
+      # well put it in $PATH.
+      pkgs.subversion
+    ];
 }
-- 
GitLab


From bf1ba9ca31d559c8b44d5f70389e094bcead7d08 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 27 Apr 2011 15:47:41 +0000
Subject: [PATCH 2980/5331] * Fix indentation.

svn path=/nixos/trunk/; revision=27007
---
 release.nix | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/release.nix b/release.nix
index 7681cda16ec..d32ad5cb000 100644
--- a/release.nix
+++ b/release.nix
@@ -130,6 +130,7 @@ let
       type = "graphical";
     };
 
+    
     # Provide a tarball that can be unpacked into an SD card, and easily
     # boot that system from uboot (like for the sheevaplug).
     # The pc variant helps preparing the expression for the system tarball
@@ -139,16 +140,17 @@ let
     };
 
     system_tarball_fuloong2f =
-        assert builtins.currentSystem == "mips64-linux";
+      assert builtins.currentSystem == "mips64-linux";
       makeSystemTarball {
-      module = ./modules/installer/cd-dvd/system-tarball-fuloong2f.nix;
-    } { system = "mips64-linux"; };
+        module = ./modules/installer/cd-dvd/system-tarball-fuloong2f.nix;
+      } { system = "mips64-linux"; };
 
     system_tarball_sheevaplug =
-        assert builtins.currentSystem == "armv5tel-linux";
+      assert builtins.currentSystem == "armv5tel-linux";
       makeSystemTarball {
-      module = ./modules/installer/cd-dvd/system-tarball-sheevaplug.nix;
-    } { system = "armv5tel-linux"; };
+        module = ./modules/installer/cd-dvd/system-tarball-sheevaplug.nix;
+      } { system = "armv5tel-linux"; };
+
 
     tests = 
       let
-- 
GitLab


From 3ae283e8c33a06c24c674a979d2d40bedad71c09 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 27 Apr 2011 16:16:47 +0000
Subject: [PATCH 2981/5331] * Remove installer2 and nixos-bootstrap-archive for
 lack of   documentation / maintenance / clear use cases.

svn path=/nixos/trunk/; revision=27008
---
 .../tools/installer2/nixos-bootstrap.sh       | 137 ----------
 .../tools/installer2/nixos-prepare-install.sh | 239 ------------------
 .../tools/installer2/run-in-chroot.sh         |  79 ------
 .../README-BOOTSTRAP-NIXOS                    |  12 -
 .../tools/nixos-bootstrap-archive/default.nix |  22 --
 modules/installer/tools/tools.nix             |  54 +---
 6 files changed, 3 insertions(+), 540 deletions(-)
 delete mode 100644 modules/installer/tools/installer2/nixos-bootstrap.sh
 delete mode 100644 modules/installer/tools/installer2/nixos-prepare-install.sh
 delete mode 100644 modules/installer/tools/installer2/run-in-chroot.sh
 delete mode 100644 modules/installer/tools/nixos-bootstrap-archive/README-BOOTSTRAP-NIXOS
 delete mode 100644 modules/installer/tools/nixos-bootstrap-archive/default.nix

diff --git a/modules/installer/tools/installer2/nixos-bootstrap.sh b/modules/installer/tools/installer2/nixos-bootstrap.sh
deleted file mode 100644
index 9c972bd6d95..00000000000
--- a/modules/installer/tools/installer2/nixos-bootstrap.sh
+++ /dev/null
@@ -1,137 +0,0 @@
-#! @shell@
-# runs in chroot
-# creates mandatory directories such as /var
-# finally runs switch-to-configuration optionally registering grub
-set -e
-
-usage(){
-  cat << EOF
-  script --install [--fast] [--no-grub]
-
-  --no-pull:  don't do a nix-pull to get the latest Nixpkgs
-              channel manifest
-
-  --no-grub:  don't install grub ( you don't want this ..)
-
-  --debug:    set -x
-
-  options which will be passed to nix-env:
-
-  -j n        : number of build tasks done simultaniously
-  --keep-going: Build as much as possible.
-
-  Description:
-  This scripts installs NixOS and should be run within the target chroot.
-
-  The minimal nix system must have been installed previously.
-  Eg nixos-prepare-install.sh does this for you.
-
-  Probably this script is distributed along with the minimal nix closure used
-  for bootstrapping
-EOF
-  exit 1
-}
-
-die(){ echo "!>> " $@; exit 1; }
-
-check(){
-  [ -e "$1" ] || die "$1 not found $2"
-}
-WARN(){ echo "WARNING: $@"; }
-INFO(){ echo "INFO: " $@; }
-
-# == configuration ==
-
-HOME=${HOME:-/root}
-NIXOS=${NIXOS:-/etc/nixos/nixos}
-NIXPKGS=${NIXPKGS:-/etc/nixos/nixpkgs}
-NIXOS_CONFIG=${NIXOS_CONFIG:-/etc/nixos/configuration.nix}
-NIXOS_PULL=${NIXOS_PULL:-1}
-NIXOS_INSTALL_GRUB=${NIXOS_INSTALL_GRUB:-1} 
-
-ps="run-in-chroot"
-
-check "$NIXOS_CONFIG"
-check "$NIXOS/modules"  "nixos repo not found"
-check "$NIXPKGS/pkgs/top-level/all-packages.nix"  "nixpgks repo not found"
-for d in /dev /sys /proc; do
-  check "$d" "It should have been mounted by $ps"
-done
-
-# try reusing binaries from host system (which is most likely an installation CD)
-if [ -d /host-system/nix ]; then
-  export NIX_OTHER_STORES=/host-system/nix${NIX_OTHER_STORES:+:}$NIX_OTHER_STORES
-else
-  WARN "/host-system/nix not found. It should have been --bind mounted by $ps.
-  I won't be able to take binaries from the installation media.
-  "
-fi
-
-# == configuration end ==
-
-INSTALL=
-
-for arg in $@; do
-  case $arg in
-    --no-pull)     NIXOS_PULL=0;;
-    --install)     INSTALL=1;;
-    --no-grub)     NIXOS_INSTALL_GRUB=;;
-    --debug)       set -x;;
-    -j*)           NIX_ENV_ARGS="$NIX_ENV_ARGS $arg";;
-    --keep-going)  NIX_ENV_ARGS="$NIX_ENV_ARGS $arg";;
-    *)             usage;
-  esac
-done
-
-if [ "$INSTALL" != 1 ]; then
-  usage
-fi
-
-
-# We don't have locale-archive in the chroot, so clear $LANG.
-export LANG=
-
-export PATH=@coreutils@/bin
-
-mkdir -m 01777 -p /tmp
-mkdir -m 0755 -p /var
-
-# Create the necessary Nix directories on the target device, if they
-# don't already exist.
-mkdir -m 0755 -p \
-    /nix/var/nix/gcroots \
-    /nix/var/nix/temproots \
-    /nix/var/nix/manifests \
-    /nix/var/nix/userpool \
-    /nix/var/nix/profiles \
-    /nix/var/nix/db \
-    /nix/var/log/nix/drvs
-
-# Do a nix-pull to speed up building.
-if test -n "@nixpkgsURL@" -a ${NIXOS_PULL} != 0; then
-    @nix@/bin/nix-pull @nixpkgsURL@/MANIFEST || true
-fi
-
-# Build the specified Nix expression in the target store and install
-# it into the system configuration profile.
-INFO "building the system configuration..."
-@nix@/bin/nix-env \
-    -p /nix/var/nix/profiles/system \
-    -f "$NIXOS" \
-    --set -A system \
-    $NIX_ENV_ARGS
-
-# Mark the target as a NixOS installation, otherwise
-# switch-to-configuration will chicken out.
-touch /etc/NIXOS
-
-# Grub needs an mtab.
-ln -sfn /proc/mounts /etc/mtab
-
-
-# Switch to the new system configuration.  This will install Grub with
-# a menu default pointing at the kernel/initrd/etc of the new
-# configuration.
-INFO "finalising the installation..."
-export NIXOS_INSTALL_GRUB
-/nix/var/nix/profiles/system/bin/switch-to-configuration boot
diff --git a/modules/installer/tools/installer2/nixos-prepare-install.sh b/modules/installer/tools/installer2/nixos-prepare-install.sh
deleted file mode 100644
index 548581f0c21..00000000000
--- a/modules/installer/tools/installer2/nixos-prepare-install.sh
+++ /dev/null
@@ -1,239 +0,0 @@
-#!/bin/sh
-
-# prepare installation by putting in place unless present:
-# /etc/nixos/nixpkgs
-# /etc/nixos/nixos
-# /etc/nixos/configuration.nix
-
-
-set -e
-
-usage(){
-  cat << EOF
-  script options [list of actions]
-
-  actions:
-
-    guess-config:     run nixos-hardware-scan > T/configuration.nix
-    copy-nix:         copy minimal nix system which can bootstrap the whole system
-                      This creates the $mountPoint/bin/sh symlink
-                      If you're bootstrapping from an archive store paths are registered valid only
-    copy-nixos-bootstrap:
-                      copy the nixos-bootstrap script to /nix/store where it will be
-                      garbage collected later
-    copy-sources:     copy repos   into T/
-    checkout-sources: svn checkout official repos into T/
-
-
-    where T=$T
-      and repos = $ALL_REPOS
-
-  options:
-    --force: If targets exist no action will taken unless you use --force
-             in which case target is renamed before action is run
-    --dir-ok: allow installing into directory (omits is mount point check)
-
-    --debug: set -x
-
-
-  default list of actions: $DEFAULTS
-EOF
-  exit 1
-}
-
-
-INFO(){ echo "INFO: " $@; }
-
-# = configuration =
-
-FORCE_ACTIONS=${FORCE_ACTIONS:-}
-ALL_REPOS="nixpkgs nixos"
-mountPoint=${mountPoint:-/mnt}
-
-if [ -e $mountPoint/README-BOOTSTRAP-NIXOS ]; then
-  INFO "$mountPoint/README-BOOTSTRAP-NIXOS found, assuming your're bootstrapping from an archive. Nix files should be in place"
-  FROM_ARCHIVE=1
-  DEFAULTS="guess-config copy-nix"
-else
-  FROM_ARCHIVE=0
-  DEFAULTS="guess-config copy-nixos-bootstrap copy-nix copy-sources"
-fi
-
-backupTimestamp=$(date "+%Y%m%d%H%M%S")
-SRC_BASE=${SRC_BASE:-"/etc/nixos"}
-SVN_BASE="https://svn.nixos.org/repos/nix"
-MUST_BE_MOUNTPOINT=${MUST_BE_MOUNTPOINT:-1}
-T="$mountPoint/etc/nixos"
-
-NIX_CLOSURE=${NIX_CLOSURE:-@nixClosure@}
-
-die(){ echo "!>> " $@; exit 1; }
-
-## = read options =
-# actions is used by main loop at the end
-ACTIONS=""
-# check and handle options:
-for a in $@; do
-  case "$a" in
-    copy-nix|copy-nixos-bootstrap|guess-config|copy-sources|checkout-sources)
-      ACTIONS="$ACTIONS $a"
-    ;;
-    --dir-ok)
-      MUST_BE_MOUNTPOINT=false
-    ;;
-    --force)
-      FORCE_ACTIONS=1
-    ;;
-    --debug)
-      set -x
-    ;;
-    *)
-      echo "unkown option: $a"
-      usage
-    ;;
-  esac
-done
-[ -n "$ACTIONS" ] || ACTIONS="$DEFAULTS"
-
-
-if ! grep -F -q " $mountPoint " /proc/mounts && [ "$MUST_BE_MOUNTPOINT" = 1 ]; then
-    die "$mountPoint doesn't appear to be a mount point"
-fi
-
-# = utils =
-
-backup(){
-  local dst="$(dirname "$1")/$(basename "$1")-$backupTimestamp"
-  INFO "backing up: $1 -> $dst"
-  mv "$1" "$dst"
-}
-
-# = implementation =
-
-# exit status  = 0: target exists
-# exti status != 0: target must be rebuild either because --force was given or
-#                   because it didn't exist yet
-target_realised(){
-  if [ -e "$1" ] && [ "$FORCE_ACTIONS" = 1 ]; then
-      backup "$1"
-  fi
-
-  [ -e "$1" ] && {
-    INFO "not realsing $1. Target already exists. Use --force to force."
-  }
-}
-
-createDirs(){
-  mkdir -m 0755 -p $mountPoint/etc/nixos
-  mkdir -m 1777 -p $mountPoint/nix/store
-}
-
-
-realise_repo(){
-  local action=$1
-  local repo=$2
-
-  createDirs
-
-  if [ "$action" == "copy-sources" ]; then
-
-    local repo_sources="${repo}_SOURCES"
-    rsync -a -r "${SRC_BASE}/$repo" "$T"
-
-  else
-
-    INFO "checking out $repo"
-    svn co "$SVN_BASE/$repo/trunk" "$T/$repo"
-
-  fi
-
-}
-
-# only keep /nix/store/* lines
-# print them only once
-pathsFromGraph(){
-  declare -A a
-  local prefix=/nix/store/
-  while read l; do
-    if [ "${l/#$prefix/}" != "$l" ] && [ -z "${a["$l"]}" ]; then
-      echo "$l";
-      a["$l"]=1;
-    fi
-  done
-}
-
-# = run actions: =
-for a in $ACTIONS; do
-  case "$a" in
-
-    guess_config)
-      local config="$T/configuration.nix"
-      target_realised "$config" || {
-        INFO "creating simple configuration file"
-        nixos-hardware-scan > "$config"
-        echo
-        INFO "Note: you can start customizing $config while remaining actions will are being executed"
-        echo
-      }
-    ;;
-
-    copy-nixos-bootstrap)
-      createDirs
-      # this script will be garbage collected somewhen:
-      cp @nixosBootstrap@/bin/nixos-bootstrap $mountPoint/nix/store/
-    ;;
-
-    copy-nix)
-      if [ "$FROM_ARCHIVE" = 1 ]; then
-        NIX_CLOSURE=${mountPoint}@nixClosure@
-      else
-        INFO "Copy Nix to the Nix store on the target device."
-        createDirs
-        echo "copying Nix to $mountPoint...."
-
-        for i in `cat $NIX_CLOSURE | pathsFromGraph`; do
-            echo "  $i"
-            rsync -a $i $mountPoint/nix/store/
-        done
-
-      fi
-
-      [ -e "$NIX_CLOSURE" ] || die "Couldn't find nixClosure $NIX_CLOSURE anywhere. Can't register inital store paths valid. Exiting"
-
-      # Create the required /bin/sh symlink; otherwise lots of things
-      # (notably the system() function) won't work.
-      mkdir -m 0755 -p $mountPoint/bin
-      ln -sf @shell@ $mountPoint/bin/sh
-
-      INFO "registering bootstrapping store paths as valid so that they won't be rebuild"
-      # Register the paths in the Nix closure as valid.  This is necessary
-      # to prevent them from being deleted the first time we install
-      # something.  (I.e., Nix will see that, e.g., the glibc path is not
-      # valid, delete it to get it out of the way, but as a result nothing
-      # will work anymore.)
-      # TODO: check permissions so that paths can't be changed later?
-      chroot "$mountPoint" @nix@/bin/nix-store --register-validity < $NIX_CLOSURE
-
-    ;;
-
-    copy-sources|checkout-sources)
-
-      for repo in $ALL_REPOS; do
-        target_realised "$T/$repo" || realise_repo $a $repo
-      done
-
-    ;;
-  esac
-done
-
-if [ -e "$T/nixos" ] && [ -e "$T/nixpkgs" ] && [ -e "$T/configuration.nix" ]; then
-  cat << EOF
-    To realise your NixOS installtion execute:
-
-    run-in-chroot "/nix/store/nixos-bootstrap --install -j2 --keep-going"
-EOF
-else
-  for t in "$T/configuration.nix" "$T/nixpkgs" "$T/configuration.nix"; do
-    INFO "you can't start because $t is missing"
-  done
-fi
diff --git a/modules/installer/tools/installer2/run-in-chroot.sh b/modules/installer/tools/installer2/run-in-chroot.sh
deleted file mode 100644
index f4cc4cb9523..00000000000
--- a/modules/installer/tools/installer2/run-in-chroot.sh
+++ /dev/null
@@ -1,79 +0,0 @@
-#!/bin/sh
-# helper script preparing chroot by mounting /dev /proc /sys etc
-
-set -e
-
-usage(){
-  cat << EOF
-  $SCRIPT OPTS or cmd
-  OPTS:
-  --prepare    : only mount
-  --unprepare  : only unmount
-  --debug      : set -x
-
-  $SCRIPT --prepare:   prepare chroot only
-  $SCRIPT --unprepare: unprepare chroot only
-  $SCRIPT command:     run /bin/sh command in chroot
-
-  usage example run a shell in chroot:
-    $SCRIPT path-to-sh
-
-EOF
-  exit 1
-}
-
-die(){ echo "!>> " $@; exit 1; }
-INFO(){ echo "INFO: " $@; }
-
-prepare(){
-  INFO "Enable networking: copying /etc/resolv.conf"
-  mkdir -m 0755 -p $mountPoint/etc
-  touch /etc/resolv.conf 
-  cp /etc/resolv.conf $mountPoint/etc/
-
-  INFO "mounting /proc /sys /dev and / to /host-system"
-  mkdir -m 0755 -p $mountPoint/{dev,proc,sys,host-system}
-  mount --bind /dev $mountPoint/dev
-  mount --bind /proc $mountPoint/proc
-  mount --bind /sys $mountPoint/sys
-  mount --rbind / $mountPoint/host-system
-}
-
-unprepare(){
-  INFO "unmounting /proc /sys /dev and removing /host-system if empty"
-  for d in $mountPoint/{host-system,dev,proc,sys}; do
-    umount -l "$d"
-  done
-  # no -fr !!
-  rmdir $mountPoint/host-system
-}
-
-run_cmd(){
-  prepare
-  trap "unprepare" EXIT
-  chroot $mountPoint $@
-}
-
-
-SCRIPT="$(basename "$0")"
-mountPoint=${mountPoint:-/mnt}
-
-[ -d $mountPoint ] || die "$mountPoint is not a directory"
-
-while [ "$#" > 0 ]; do
-  case $1 in
-
-    --debug)     shift; set -x;;
-
-    -h|--help)   shift; usage;;
-
-    --prepare)   shift; prepare;;
-
-    --unprepare) shift; unprepare;;
-
-    *)
-      run_cmd "$@"
-      exit 0
-    ;;
-  esac
-done
diff --git a/modules/installer/tools/nixos-bootstrap-archive/README-BOOTSTRAP-NIXOS b/modules/installer/tools/nixos-bootstrap-archive/README-BOOTSTRAP-NIXOS
deleted file mode 100644
index b70dc010cc3..00000000000
--- a/modules/installer/tools/nixos-bootstrap-archive/README-BOOTSTRAP-NIXOS
+++ /dev/null
@@ -1,12 +0,0 @@
-HOWTO install NixOS from a bootstrap archive
-=============================================
-
-export mountPoint=$target # defaults to /mnt
-tar xfj $ARCHIV -C $mountPoint 
-
-bash $mountPoint/nix/store/nixos-prepare-install # see --help
-
-$EDITOR $mountPoint/etc/nixos/configuration.nix
-
-# you can replace --install by --help to get more info
-bash $mountPoint/nix/store/run-in-chroot "/nix/store/nixos-bootstrap --install"
diff --git a/modules/installer/tools/nixos-bootstrap-archive/default.nix b/modules/installer/tools/nixos-bootstrap-archive/default.nix
deleted file mode 100644
index 3fa287bf898..00000000000
--- a/modules/installer/tools/nixos-bootstrap-archive/default.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-args: with args;
-
-# TODO  add revision number or such
-runCommand "nixos-bootstrap-archive" { } ''
-  PATH=${perl}/bin:${coreutils}/bin:${gnutar}/bin:${bzip2}/bin
-  storePaths=$(perl ${pathsFromGraph} ${nixClosure})
-
-  s(){ echo -C $(dirname $1) $(basename $1); }
-
-  mkdir $out
-  tar cf tmp.tar ${nixClosure} $storePaths 
-  cp ${./README-BOOTSTRAP-NIXOS} README-BOOTSTRAP-NIXOS
-  tar --append -f tmp.tar README-BOOTSTRAP-NIXOS
-  tar --append -f tmp.tar --transform 's@^@/nix/store/@' \
-      $(s ${nixosPrepareInstall}/bin/nixos-prepare-install ) \
-      $(s ${runInChroot}/bin/run-in-chroot ) \
-      $(s ${nixosBootstrap}/bin/nixos-bootstrap )
-      
-  cat tmp.tar | bzip2 > $out/nixos-install-archive.tar.bz2
-  ensureDir $out/nix-support
-  echo "file tarball" $out/nixos-install-archive.tar.bz2 > $out/nix-support/hydra-build-products
-''
diff --git a/modules/installer/tools/tools.nix b/modules/installer/tools/tools.nix
index cf2bdb788cf..069e45127ef 100644
--- a/modules/installer/tools/tools.nix
+++ b/modules/installer/tools/tools.nix
@@ -35,48 +35,6 @@ let
       "cp refs $out";
   };
 
-  # rewrite of nixosInstall: each tool does exactly one job.
-  # So they get more useful.
-  installer2 =
-  let nixClosure = pkgs.runCommand "closure"
-        {exportReferencesGraph = ["refs" config.environment.nix];}
-        "cp refs $out";
-
-      nix = config.environment.nix;
-  in rec {
-
-    nixosPrepareInstall = makeProg {
-      name = "nixos-prepare-install";
-      src = ./installer2/nixos-prepare-install.sh;
-
-      inherit nix nixClosure nixosBootstrap;
-    };
-
-    runInChroot = makeProg {
-     name = "run-in-chroot";
-       src = ./installer2/run-in-chroot.sh;
-    };
-
-    nixosBootstrap = makeProg {
-      name = "nixos-bootstrap";
-      src = ./installer2/nixos-bootstrap.sh;
-
-      inherit (pkgs) coreutils;
-      inherit nixClosure nix;
-
-      # TODO shell ?
-      nixpkgsURL = cfg.nixpkgsURL;
-    };
-
-    # see ./nixos-bootstrap-archive/README-BOOTSTRAP-NIXOS
-    # TODO refactor: It should *not* depend on configuration.nix
-    # maybe even move this in nixpkgs?
-    minimalInstallArchive = import ./nixos-bootstrap-archive {
-      inherit (pkgs) stdenv runCommand perl pathsFromGraph gnutar coreutils bzip2;
-      inherit nixosPrepareInstall runInChroot nixosBootstrap nixClosure;
-    };
-  };
-
   nixosRebuild = makeProg {
     name = "nixos-rebuild";
     src = ./nixos-rebuild.sh;
@@ -170,19 +128,13 @@ in
         nixosDeployNetwork
         nixosInstall
         nixosRebuild
-         nixosHardwareScan
-         nixosGenSeccureKeys
-         nixosOption
-
-         installer2.runInChroot
-         installer2.nixosPrepareInstall
+        nixosHardwareScan
+        nixosGenSeccureKeys
+        nixosOption
       ] ++ pkgs.lib.optional cfg.enableGraphicalTools nixosGui;
 
     system.build = {
       inherit nixosInstall nixosHardwareScan nixosOption;
-
-      # expose scripts
-      inherit (installer2) nixosPrepareInstall runInChroot nixosBootstrap minimalInstallArchive;
     };
   };
 }
-- 
GitLab


From 6739162d9a19df99cd34d5b0eaf9ac490562fd43 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 27 Apr 2011 16:27:05 +0000
Subject: [PATCH 2982/5331] * Move ircd-hybrid stuff from the services tree to
 the nixos tree.

svn path=/nixos/trunk/; revision=27009
---
 modules/module-list.nix                       |    6 +-
 .../networking/ircd-hybrid/builder.sh         |   31 +
 .../networking/ircd-hybrid/control.in         |   26 +
 .../default.nix}                              |   35 +-
 .../services/networking/ircd-hybrid/ircd.conf | 1051 +++++++++++++++++
 5 files changed, 1131 insertions(+), 18 deletions(-)
 create mode 100644 modules/services/networking/ircd-hybrid/builder.sh
 create mode 100644 modules/services/networking/ircd-hybrid/control.in
 rename modules/services/networking/{ircd-hybrid.nix => ircd-hybrid/default.nix} (72%)
 create mode 100644 modules/services/networking/ircd-hybrid/ircd.conf

diff --git a/modules/module-list.nix b/modules/module-list.nix
index d2cd2e4637b..f14a3ed0939 100644
--- a/modules/module-list.nix
+++ b/modules/module-list.nix
@@ -51,11 +51,11 @@
   ./services/backup/mysql-backup.nix
   ./services/backup/postgresql-backup.nix
   ./services/backup/sitecopy-backup.nix
-  ./services/databases/4store.nix
   ./services/databases/4store-endpoint.nix
+  ./services/databases/4store.nix
   ./services/databases/mysql.nix
-  ./services/databases/postgresql.nix
   ./services/databases/openldap.nix
+  ./services/databases/postgresql.nix
   ./services/games/ghost-one.nix
   ./services/hardware/acpid.nix
   ./services/hardware/bluetooth.nix
@@ -103,7 +103,7 @@
   ./services/networking/gvpe.nix
   ./services/networking/gw6c/default.nix
   ./services/networking/ifplugd.nix
-  #./services/networking/ircd-hybrid.nix
+  ./services/networking/ircd-hybrid/default.nix
   ./services/networking/nat.nix
   ./services/networking/ntpd.nix
   ./services/networking/openfire.nix
diff --git a/modules/services/networking/ircd-hybrid/builder.sh b/modules/services/networking/ircd-hybrid/builder.sh
new file mode 100644
index 00000000000..b8cb836db95
--- /dev/null
+++ b/modules/services/networking/ircd-hybrid/builder.sh
@@ -0,0 +1,31 @@
+source $stdenv/setup
+
+doSub() {
+    local src=$1
+    local dst=$2
+    ensureDir $(dirname $dst)
+    substituteAll $src $dst
+}
+
+subDir=/
+for i in $scripts; do
+    if test "$(echo $i | cut -c1-2)" = "=>"; then
+        subDir=$(echo $i | cut -c3-)
+    else
+        dst=$out/$subDir/$((stripHash $i; echo $strippedName) | sed 's/\.in//')
+        doSub $i $dst
+        chmod +x $dst # !!!
+    fi
+done
+
+subDir=/
+for i in $substFiles; do
+    if test "$(echo $i | cut -c1-2)" = "=>"; then
+        subDir=$(echo $i | cut -c3-)
+    else
+        dst=$out/$subDir/$((stripHash $i; echo $strippedName) | sed 's/\.in//')
+        doSub $i $dst
+    fi
+done
+
+ensureDir $out/bin
diff --git a/modules/services/networking/ircd-hybrid/control.in b/modules/services/networking/ircd-hybrid/control.in
new file mode 100644
index 00000000000..f165b2523ca
--- /dev/null
+++ b/modules/services/networking/ircd-hybrid/control.in
@@ -0,0 +1,26 @@
+#! @shell@ -e
+
+# Make sure that the environment is deterministic.
+export PATH=@coreutils@/bin
+
+if test "$1" = "start"; then
+	if ! @procps@/bin/pgrep ircd; then
+	if @gw6cEnabled@; then 
+		while ! @iproute@/sbin/ip addr | 
+			@gnugrep@/bin/grep inet6 | 
+			@gnugrep@/bin/grep global; do
+			sleep 1;
+		done;
+	fi;
+	rm -rf /home/ircd
+	mkdir -p /home/ircd
+	chown ircd: /home/ircd
+	cd /home/ircd
+    env - HOME=/homeless-shelter $extraEnv \
+        @su@/bin/su ircd --shell=/bin/sh -c ' @ircdHybrid@/bin/ircd -configfile @out@/conf/ircd.conf </dev/null -logfile /home/ircd/ircd.log' 2>&1 >/var/log/ircd-hybrid.out
+	fi;
+fi
+
+if test "$1" = "stop" ; then 
+	@procps@/bin/pkill ircd;
+fi;
diff --git a/modules/services/networking/ircd-hybrid.nix b/modules/services/networking/ircd-hybrid/default.nix
similarity index 72%
rename from modules/services/networking/ircd-hybrid.nix
rename to modules/services/networking/ircd-hybrid/default.nix
index 34c3b13d82d..01278d00e77 100644
--- a/modules/services/networking/ircd-hybrid.nix
+++ b/modules/services/networking/ircd-hybrid/default.nix
@@ -1,4 +1,4 @@
-{ config, pkgs, servicesPath, ... }:
+{ config, pkgs, ... }:
 
 with pkgs.lib;
 
@@ -6,19 +6,24 @@ let
 
   cfg = config.services.ircdHybrid;
   
-  ircdService = import (servicesPath + /ircd-hybrid) {
-    stdenv = pkgs.stdenv;
-    inherit (pkgs) ircdHybrid coreutils 
-            su iproute gnugrep procps;
-    serverName = cfg.serverName;
-    sid = cfg.sid;
-    description = cfg.description;
-    rsaKey = cfg.rsaKey;
-    certificate = cfg.certificate;
-    adminEmail = cfg.adminEmail;
-    extraIPs = cfg.extraIPs;
-    extraPort = cfg.extraPort;
-    gw6cEnabled = config.services.gw6c.enable && config.services.gw6c.autorun;
+  ircdService = pkgs.stdenv.mkDerivation {
+    name = "ircd-hybrid-service";
+    scripts = [ "=>/bin" ./control.in ];
+    substFiles = [ "=>/conf" ./ircd.conf ];
+    inherit (pkgs) ircdHybrid coreutils su iproute gnugrep procps;
+
+    gw6cEnabled = if config.services.gw6c.enable && config.services.gw6c.autorun then "true" else "false";
+
+    inherit (cfg) serverName sid description adminEmail
+            extraPort;
+
+    cryptoSettings = 
+      (optionalString (cfg.rsaKey != null) "rsa_private_key_file = \"${cfg.rsaKey}\";\n") +
+      (optionalString (cfg.certificate != null) "ssl_certificate_file = \"${cfg.certificate}\";\n");
+
+    extraListen = map (ip: "host = \""+ip+"\";\nport = 6665 .. 6669, "+extraPort+"; ") cfg.extraIPs;
+
+    builder = ./builder.sh;
   };
 
   startingDependency = if config.services.gw6c.enable then "gw6c" else "network-interfaces";
@@ -118,7 +123,7 @@ in
       { name = "ircd"; };
 
     jobs.ircd_hybrid =
-      { # name = "ircd-hybrid"; !!! mkIf bug
+      { name = "ircd-hybrid";
 
         description = "IRCD Hybrid server";
 
diff --git a/modules/services/networking/ircd-hybrid/ircd.conf b/modules/services/networking/ircd-hybrid/ircd.conf
new file mode 100644
index 00000000000..bb22832dbdb
--- /dev/null
+++ b/modules/services/networking/ircd-hybrid/ircd.conf
@@ -0,0 +1,1051 @@
+/* doc/example.conf - ircd-hybrid-7 Example configuration file
+ * Copyright (C) 2000-2006 Hybrid Development Team
+ *
+ * Written by ejb, wcampbel, db, leeh and others
+ * Other example configurations can be found in the source dir under
+ * etc/.
+ *
+ * $Id: example.conf 639 2006-06-01 14:12:21Z michael $
+ */
+
+/* IMPORTANT NOTES:
+ *
+ * auth {} blocks MUST be specified in order of precedence.  The first one
+ * that matches a user will be used.  So place spoofs first, then specials,
+ * then general access.
+ *
+ * Shell style (#), C++ style (//) and C style comments are supported.
+ *
+ * Files may be included by either:
+ *        .include "filename"
+ *        .include <filename>
+ *
+ * Times/durations are written as:
+ *        12 hours 30 minutes 1 second
+ *        
+ * Valid units of time:
+ *        month, week, day, hour, minute, second
+ *
+ * Valid units of size:
+ *        megabyte/mbyte/mb, kilobyte/kbyte/kb, byte
+ *
+ * Sizes and times may be singular or plural.  
+ */ 
+
+/* EFNET NOTE:
+ *
+ * This config file is NOT suitable for EFNet.  EFNet admins should use
+ * example.efnet.conf
+ */
+ 
+/*
+ * serverinfo {}:  contains information about the server. (OLD M:)
+ */
+serverinfo {
+	/*
+	 * name: the name of our server.  This cannot be changed at runtime.
+	 */
+	name = "@serverName@";
+
+	/*
+	 * sid: a server's unique ID.  This is three characters long and must
+	 * be in the form [0-9][A-Z0-9][A-Z0-9].  The first character must be
+	 * a digit, followed by 2 alpha-numerical letters.
+	 * NOTE: The letters must be capitalized.  This cannot be changed at runtime.
+	 */
+	sid = "@sid@";
+
+	/*
+	 * description: the description of the server.  '[' and ']' may not
+	 * be used here for compatibility with older servers.
+	 */
+	description = "@description@";
+
+	/*
+	 * network info: the name and description of the network this server
+	 * is on.  Shown in the 005 reply and used with serverhiding.
+	 */
+	network_name = "JustIRCNetwork";
+	network_desc = "This is My Network";
+
+	/*
+	 * hub: allow this server to act as a hub and have multiple servers
+	 * connected to it.  This may not be changed if there are active
+	 * LazyLink servers.
+	 */
+	hub = no;
+
+	/*
+	 * vhost: the IP to bind to when we connect outward to ipv4 servers.
+	 * This should be an ipv4 IP only, or "* for INADDR_ANY.
+	 */
+	#vhost = "192.169.0.1";
+
+	/*
+	 * vhost6: the IP to bind to when we connect outward to ipv6 servers.
+	 * This should be an ipv6 IP only, or "* for INADDR_ANY.
+	 */
+	#vhost6 = "3ffe:80e8:546::2";
+
+	/* max_clients: the maximum number of clients allowed to connect */
+	max_clients = 512;
+
+	/*
+	 * rsa key: the path to the file containing our rsa key for cryptlink.
+	 *
+	 * Example command to store a 2048 bit RSA keypair in
+	 * rsa.key, and the public key in rsa.pub:
+	 * 
+	 * 	openssl genrsa -out rsa.key 2048
+	 *	openssl rsa -in rsa.key -pubout -out rsa.pub
+	 *	chown <ircd-user>.<ircd.group> rsa.key rsa.pub
+	 *	chmod 0600 rsa.key
+	 *	chmod 0644 rsa.pub
+	 */
+	#rsa_private_key_file = "/usr/local/ircd/etc/rsa.key";
+
+	/*
+	 * ssl certificate: the path to the file containing our ssl certificate
+	 * for encrypted client connection.
+	 *
+	 * This assumes your private RSA key is stored in rsa.key. You
+	 * MUST have an RSA key in order to generate the certificate
+	 *
+	 *	openssl req -new -days 365 -x509 -key rsa.key -out cert.pem
+	 *
+	 * See http://www.openssl.org/docs/HOWTO/certificates.txt
+	 *
+	 * Please use the following values when generating the cert
+	 *
+	 *	Organization Name: Network Name
+	 *	Organization Unit Name: changme.someirc.net
+	 *	Common Name: irc.someirc.net
+	 *	E-mail: you@domain.com
+	 */
+	#ssl_certificate_file = "/usr/local/ircd/etc/cert.pem";
+
+	@cryptoSettings@
+};
+
+/*
+ * admin {}:  contains admin information about the server. (OLD A:)
+ */
+admin {
+	name = "Anonymous Hero";
+	description = "Main Server Administrator";
+	email = "@adminEmail@";
+};
+
+/*
+ * log {}:  contains information about logfiles.
+ */
+log {
+	/* Do you want to enable logging to ircd.log? */
+	use_logging = yes;
+
+	/*
+	 * logfiles: the logfiles to use for user connects, /oper uses,
+	 * and failed /oper.  These files must exist for logging to be used.
+	 */
+	fname_userlog = "/home/ircd/logs/userlog";
+	fname_operlog = "/home/ircd/logs/operlog";
+	fname_killlog = "/home/ircd/logs/kill";
+	fname_klinelog = "/home/ircd/logs/kline";
+	fname_glinelog = "/home/ircd/logs/gline";
+
+	/*
+	 * log_level: the amount of detail to log in ircd.log.  The
+	 * higher, the more information is logged.  May be changed
+	 * once the server is running via /quote SET LOG.  Either:
+	 * L_CRIT, L_ERROR, L_WARN, L_NOTICE, L_TRACE, L_INFO or L_DEBUG
+	 */
+	log_level = L_INFO;
+};
+
+/*
+ * class {}:  contains information about classes for users (OLD Y:)
+ */
+class {
+	/* name: the name of the class.  classes are text now */
+	name = "users";
+
+	/*
+	 * ping_time: how often a client must reply to a PING from the
+	 * server before they are dropped.
+	 */
+	ping_time = 90 seconds;
+
+	/*
+	 * number_per_ip: how many local users are allowed to connect
+	 * from one IP  (optional)
+	 */
+	number_per_ip = 10;
+
+	/*
+	 * max_local: how many local users are allowed to connect
+	 * from one ident@host  (optional)
+	 */
+	max_local = 50;
+
+	/*
+	 * max_global: network-wide limit of users per ident@host  (optional)
+	 */
+	max_global = 50;
+
+	/*
+	 * max_number: the maximum number of users allowed in this class (optional)
+	 */
+	max_number = 10000;
+
+	/*
+	 * the following lines are optional and allow you to define
+	 * how many users can connect from one /NN subnet
+	 */
+	/*cidr_bitlen_ipv4 = 24;
+	 *cidr_bitlen_ipv6 = 120;
+	 *number_per_cidr = 16;*/
+
+	/*
+	 * sendq: the amount of data allowed in a clients queue before
+	 * they are dropped.
+	 */
+	sendq = 100 kbytes;
+};
+
+class {
+	name = "opers";
+	ping_time = 90 seconds;
+	number_per_ip = 10;
+	max_number = 100;
+	sendq = 100kbytes;
+};
+
+class {
+	name = "server";
+	ping_time = 90 seconds;
+
+	/*
+	 * ping_warning: how fast a server must reply to a PING before
+	 * a warning to opers is generated.
+	 */
+	ping_warning = 15 seconds;
+
+	/*
+	 * connectfreq: only used in server classes.  Specifies the delay
+	 * between autoconnecting to servers.
+	 */
+	connectfreq = 5 minutes;
+
+	/* max number: the amount of servers to autoconnect to */
+	max_number = 1;
+
+	/* sendq: servers need a higher sendq as they send more data */
+	sendq = 2 megabytes;
+};
+
+/*
+ * listen {}:  contains information about the ports ircd listens on (OLD P:)
+ */
+listen {
+	/*
+	 * port: the specific port to listen on.  If no host is specified
+	 * before, it will listen on all available IPs.
+	 *
+	 * Ports are separated via a comma, a range may be specified using ".."
+	 */
+	
+	/* port: listen on all available IPs, ports 6665 to 6669 */
+	port = 6665 .. 6669;
+
+	/*
+	 * Listen on 192.168.0.1/6697 with ssl enabled and hidden from STATS P
+	 * unless you are an administrator.
+	 *
+	 * NOTE: The "flags" directive has to come before "port".  Always!
+	 */
+	#flags = hidden, ssl;
+	#host = "192.168.0.1";
+	#port = 6697;
+
+	/*
+	 * host: set a specific IP/host the ports after the line will listen 
+	 * on.  This may be ipv4 or ipv6.
+	 */
+	#host = "1.2.3.4";
+	#port = 7000, 7001;
+
+	#host = "3ffe:1234:a:b:c::d";
+	#port = 7002;
+	
+	@extraListen@
+};
+
+auth {
+	user = "*@*";
+	class = "users";
+	#flags = need_ident;
+};
+
+/*
+ * operator {}:  defines ircd operators. (OLD O:)
+ *
+ * ircd-hybrid no longer supports local operators, privileges are
+ * controlled via flags.
+ */
+operator {
+	/* name: the name of the oper */
+	/* NOTE: operator "opername"{} is also supported */
+	name = "god";
+
+	/*
+	 * user: the user@host required for this operator.  CIDR is not
+	 * supported.  Multiple user="" lines are supported.
+	 */
+	user = "*god@*";
+	user = "*@127.0.0.1";
+
+	/*
+	 * password: the password required to oper.  By default this will
+	 * need to be encrypted using 'mkpasswd'.  MD5 is supported.
+	 */
+	password = "iamoperator";
+
+	/*
+	 * encrypted: controls whether the oper password above has been
+	 * encrypted.  (OLD CRYPT_OPER_PASSWORD now optional per operator)
+	 */
+	encrypted = no;
+
+	/*
+	 * rsa_public_key_file: the public key for this oper when using Challenge.
+	 * A password should not be defined when this is used, see 
+	 * doc/challenge.txt for more information.
+	 */
+#	rsa_public_key_file = "/usr/local/ircd/etc/oper.pub";
+
+	/* class: the class the oper joins when they successfully /oper */
+	class = "opers";
+
+	/*
+	 * umodes: default usermodes opers get when they /oper.  If defined,
+	 * it will override oper_umodes settings in general {}.
+	 * Available usermodes:
+	 *
+	 * +b - bots         - See bot and drone flooding notices
+	 * +c - cconn        - Client connection/quit notices
+	 * +D - deaf         - Don't receive channel messages
+	 * +d - debug        - See debugging notices
+	 * +f - full         - See I: line full notices
+	 * +G - softcallerid - Server Side Ignore for users not on your channels
+	 * +g - callerid     - Server Side Ignore (for privmsgs etc)
+	 * +i - invisible    - Not shown in NAMES or WHO unless you share a
+	 *                     a channel
+	 * +k - skill        - See server generated KILL messages
+	 * +l - locops       - See LOCOPS messages
+	 * +n - nchange      - See client nick changes
+	 * +r - rej          - See rejected client notices
+	 * +s - servnotice   - See general server notices
+	 * +u - unauth       - See unauthorized client notices
+	 * +w - wallop       - See server generated WALLOPS
+	 * +x - external     - See remote server connection and split notices
+	 * +y - spy          - See LINKS, STATS, TRACE notices etc.
+	 * +z - operwall     - See oper generated WALLOPS
+	 */
+#	umodes = locops, servnotice, operwall, wallop;
+
+	/*
+	 * privileges: controls the activities and commands an oper is 
+	 * allowed to do on the server.  All options default to no.
+	 * Available options:
+	 *
+	 * global_kill:  allows remote users to be /KILL'd (OLD 'O' flag)
+	 * remote:       allows remote SQUIT and CONNECT   (OLD 'R' flag)
+	 * remoteban:    allows remote KLINE/UNKLINE
+	 * kline:        allows KILL, KLINE and DLINE      (OLD 'K' flag)
+	 * unkline:      allows UNKLINE and UNDLINE        (OLD 'U' flag)
+	 * gline:        allows GLINE                      (OLD 'G' flag)
+	 * xline:         allows XLINE                     (OLD 'X' flag)
+	 * operwall:     allows OPERWALL
+	 * nick_changes: allows oper to see nickchanges    (OLD 'N' flag)
+	 *               via usermode +n
+	 * rehash:       allows oper to REHASH config      (OLD 'H' flag)
+	 * die:          allows DIE and RESTART            (OLD 'D' flag)
+	 * admin:        gives admin privileges.  admins
+	 *               may (un)load modules and see the
+	 *               real IPs of servers.
+	 * hidden_admin: same as 'admin', but noone can recognize you as
+	 *               being an admin
+	 * hidden_oper:  not shown in /stats p (except for other operators)
+	 */
+	/* You can either use
+	 * die = yes;
+	 * rehash = yes;
+	 *
+	 * or in a flags statement i.e.
+	 * flags = die, rehash;
+	 *
+	 * You can also negate a flag with ~ i.e.
+	 * flags = ~remote;
+	 *
+	 */
+	flags = global_kill, remote, kline, unkline, xline,
+		die, rehash, nick_changes, admin, operwall;
+};
+
+/*
+ * shared {}: users that are allowed to remote kline (OLD U:)
+ *
+ * NOTE: This can be effectively used for remote klines.
+ *       Please note that there is no password authentication
+ *       for users setting remote klines.  You must also be
+ *       /oper'd in order to issue a remote kline.
+ */
+shared {
+	/*
+	 * name: the server the user must be on to set klines.  If this is not
+	 * specified, the user will be allowed to kline from all servers.
+	 */
+	name = "irc2.some.server";
+
+	/*
+	 * user: the user@host mask that is allowed to set klines.  If this is
+	 * not specified, all users on the server above will be allowed to set
+	 * a remote kline.
+	 */
+	user = "oper@my.host.is.spoofed";
+
+	/*
+	 * type: list of what to share, options are as follows:
+	 *	kline	- allow oper/server to kline
+	 *	tkline	- allow temporary klines
+	 *	unkline	- allow oper/server to unkline
+	 *	xline	- allow oper/server to xline
+	 * 	txline	- allow temporary xlines
+	 *	unxline	- allow oper/server to unxline
+	 *	resv	- allow oper/server to resv
+	 * 	tresv	- allow temporary resvs
+	 *	unresv	- allow oper/server to unresv
+	 *      locops  - allow oper/server to locops - only used for servers that cluster
+	 *	all	- allow oper/server to do all of the above (default)
+	 */
+	type = kline, unkline, resv;
+};
+
+/*
+ * kill {}:  users that are not allowed to connect (OLD K:)
+ * Oper issued klines will be added to the specified kline config
+ */
+kill {
+	user = "bad@*.hacked.edu";
+	reason = "Obviously hacked account";
+};
+
+kill {
+	user = "^O[[:alpha:]]?[[:digit:]]+(x\.o|\.xo)$@^[[:alnum:]]{4}\.evilnet.org$";
+	type = regex;
+};
+
+/*
+ * deny {}:  IPs that are not allowed to connect (before DNS/ident lookup)
+ * Oper issued dlines will be added to the specified dline config
+ */
+deny {
+	ip = "10.0.1.0/24";
+	reason = "Reconnecting vhosted bots";
+};
+
+/*
+ * exempt {}: IPs that are exempt from deny {} and Dlines. (OLD d:)
+ */
+exempt {
+	ip = "192.168.0.0/16";
+};
+
+/*
+ * resv {}:  nicks and channels users may not use/join (OLD Q:)
+ */
+resv {
+	/* reason: the reason for the proceeding resv's */
+	reason = "There are no services on this network";
+
+	/* resv: the nicks and channels users may not join/use */
+	nick = "nickserv";
+	nick = "chanserv";
+	channel = "#services";
+
+	/* resv: wildcard masks are also supported in nicks only */
+	reason = "Clone bots";
+	nick = "clone*";
+};
+
+/*
+ * gecos {}:  The X: replacement, used for banning users based on
+ * their "realname".
+ */
+gecos {
+	name = "*sex*";
+	reason = "Possible spambot";
+};
+
+gecos {
+	name = "sub7server";
+	reason = "Trojan drone";
+};
+
+gecos {
+	name = "*http*";
+	reason = "Spambot";
+};
+
+gecos {
+	name = "^\[J[0o]hn Do[3e]\]-[0-9]{2,5}$";
+	type = regex;
+};
+
+/*
+ * channel {}:  The channel block contains options pertaining to channels
+ */
+channel {
+	/*
+	 * disable_fake_channels: this option, if set to 'yes', will
+	 * disallow clients to create or join channels that have one
+	 * of the following ASCII characters in their name:
+	 *
+	 *   2 | bold
+	 *   3 | mirc color
+         *  15 | plain text
+	 *  22 | reverse
+	 *  31 | underline
+	 * 160 | non-breaking space
+	 */
+	disable_fake_channels = yes;
+
+	/*
+	 * restrict_channels: reverse channel RESVs logic, only reserved
+	 * channels are allowed
+	 */
+	restrict_channels = no;
+
+	/*
+	 * disable_local_channels: prevent users from joining &channels.
+	 */
+	disable_local_channels = no;
+
+	/*
+	 * use_invex: Enable/disable channel mode +I, a n!u@h list of masks
+	 * that can join a +i channel without an invite.
+	 */
+	use_invex = yes;
+
+	/*
+	 * use_except: Enable/disable channel mode +e, a n!u@h list of masks
+	 * that can join a channel through a ban (+b).
+	 */
+	use_except = yes;
+
+	/*
+	 * use_knock: Allows users to request an invite to a channel that
+	 * is locked somehow (+ikl).  If the channel is +p or you are banned
+	 * the knock will not be sent.
+	 */
+	use_knock = yes;
+
+	/*
+	 * knock_delay: The amount of time a user must wait between issuing
+	 * the knock command.
+	 */
+	knock_delay = 1 minutes;
+
+	/*
+	 * knock_delay_channel: How often a knock to any specific channel
+	 * is permitted, regardless of the user sending the knock.
+	 */
+	knock_delay_channel = 1 minute;
+
+	/*
+	 * burst_topicwho: enable sending of who set topic on topicburst
+	 * default is yes
+	 */
+	burst_topicwho = yes;
+
+	/*
+	 * max_chans_per_user: The maximum number of channels a user can
+	 * join/be on.
+	 */
+	max_chans_per_user = 25;
+
+	/* quiet_on_ban: stop banned people talking in channels. */
+	quiet_on_ban = yes;
+
+	/* max_bans: maximum number of +b/e/I modes in a channel */
+	max_bans = 1000;
+
+	/*
+	 * how many joins in how many seconds constitute a flood, use 0 to
+	 * disable. +b opers will be notified (changeable via /set)
+	 */
+	join_flood_count = 100;
+	join_flood_time = 10 seconds;
+
+	/*
+	 * splitcode: The ircd will now check splitmode every few seconds.
+	 *
+	 * Either split users or split servers can activate splitmode, but
+	 * both conditions must be met for the ircd to deactivate splitmode.
+	 * 
+	 * You may force splitmode to be permanent by /quote set splitmode on
+	 */
+
+	/*
+	 * default_split_user_count: when the usercount is lower than this level,
+	 * consider ourselves split.  This must be set for automatic splitmode.
+	 */
+	default_split_user_count = 0;
+
+	/*
+	 * default_split_server_count: when the servercount is lower than this,
+	 * consider ourselves split.  This must be set for automatic splitmode.
+	 */
+	default_split_server_count = 0;
+
+	/* split no create: disallow users creating channels on split. */
+	no_create_on_split = yes;
+
+	/* split: no join: disallow users joining channels at all on a split */
+	no_join_on_split = no;
+};
+
+/*
+ * serverhide {}:  The serverhide block contains the options regarding
+ * serverhiding
+ */
+serverhide {
+	/*
+	 * flatten_links: this option will show all servers in /links appear
+	 * that they are linked to this current server
+	 */
+	flatten_links = no;
+
+	/*
+	 * links_delay: how often to update the links file when it is
+	 * flattened.
+	 */
+	links_delay = 5 minutes;
+
+	/*
+	 * hidden: hide this server from a /links output on servers that
+	 * support it.  This allows hub servers to be hidden etc.
+	 */
+	hidden = no;
+
+	/*
+	 * disable_hidden: prevent servers hiding themselves from a
+	 * /links output.
+	 */
+	disable_hidden = no;
+
+	/*
+	 * hide_servers: hide remote servernames everywhere and instead use
+	 * hidden_name and network_desc.
+	 */
+	hide_servers = no;
+
+	/*
+	 * Use this as the servername users see if hide_servers = yes.
+	 */
+	hidden_name = "*.hidden.com";
+
+	/*
+	 * hide_server_ips: If this is disabled, opers will be unable to see servers
+	 * ips and will be shown a masked ip, admins will be shown the real ip.
+	 *
+	 * If this is enabled, nobody can see a servers ip.  *This is a kludge*, it
+	 * has the side effect of hiding the ips everywhere, including logfiles.
+	 *
+	 * We recommend you leave this disabled, and just take care with who you
+	 * give admin=yes; to.
+	 */
+	hide_server_ips = no;
+};
+
+/*
+ * general {}:  The general block contains many of the options that were once
+ * compiled in options in config.h.  The general block is read at start time.
+ */
+general {
+	/*
+	 * gline_min_cidr: the minimum required length of a CIDR bitmask
+	 * for IPv4 based glines
+	 */
+	gline_min_cidr = 16;
+
+	/*
+	 * gline_min_cidr6: the minimum required length of a CIDR bitmask
+	 * for IPv6 based glines
+	 */
+	gline_min_cidr6 = 48;
+
+	/*
+	 * Whether to automatically set mode +i on connecting users.
+	 */
+	invisible_on_connect = yes;
+
+	/*
+	 * If you don't explicitly specify burst_away in your connect blocks, then
+	 * they will default to the burst_away value below.
+	 */
+	burst_away = no;
+
+	/*
+	 * Show "actually using host <ip>" on /whois when possible.
+	 */
+	use_whois_actually = yes;
+
+	/*
+	 * Max time from the nickname change that still causes KILL
+	 * automatically to switch for the current nick of that user. (seconds)
+	 */
+	kill_chase_time_limit = 90;
+
+	/*
+	 * If hide_spoof_ips is disabled, opers will be allowed to see the real IP of spoofed
+	 * users in /trace etc.  If this is defined they will be shown a masked IP.
+	 */
+	hide_spoof_ips = yes;
+
+	/*
+	 * Ignore bogus timestamps from other servers.  Yes, this will desync
+	 * the network, but it will allow chanops to resync with a valid non TS 0
+	 *
+	 * This should be enabled network wide, or not at all.
+	 */
+	ignore_bogus_ts = no;
+
+	/*
+	 * disable_auth: completely disable ident lookups; if you enable this,
+	 * be careful of what you set need_ident to in your auth {} blocks
+	 */
+	disable_auth = no;
+
+	/* disable_remote_commands: disable users doing commands on remote servers */
+	disable_remote_commands = no;
+
+	/*
+	 * tkline_expire_notices: enables or disables temporary kline/xline
+	 * expire notices.
+	 */
+	tkline_expire_notices = no;
+
+	/*
+	 * default_floodcount: the default value of floodcount that is configurable
+	 * via /quote set floodcount.  This is the amount of lines a user
+	 * may send to any other user/channel in one second.
+	 */
+	default_floodcount = 10;
+
+	/*
+	 * failed_oper_notice: send a notice to all opers on the server when 
+	 * someone tries to OPER and uses the wrong password, host or ident.
+	 */
+	failed_oper_notice = yes;
+
+	/*
+	 * dots_in_ident: the amount of '.' characters permitted in an ident
+	 * reply before the user is rejected.
+	 */
+	dots_in_ident = 2;
+
+	/*
+	 * dot_in_ip6_addr: ircd-hybrid-6.0 and earlier will disallow hosts 
+	 * without a '.' in them.  This will add one to the end.  Only needed
+	 * for older servers.
+	 */
+	dot_in_ip6_addr = no;
+
+	/*
+	 * min_nonwildcard: the minimum non wildcard characters in k/d/g lines
+	 * placed via the server.  klines hand placed are exempt from limits.
+	 * wildcard chars: '.' ':' '*' '?' '@' '!' '#'
+	 */
+	min_nonwildcard = 4;
+
+	/*
+	 * min_nonwildcard_simple: the minimum non wildcard characters in 
+	 * gecos bans.  wildcard chars: '*' '?' '#'
+	 */
+	min_nonwildcard_simple = 3;
+
+	/* max_accept: maximum allowed /accept's for +g usermode */
+	max_accept = 20;
+
+	/* anti_nick_flood: enable the nickflood control code */
+	anti_nick_flood = yes;
+
+	/* nick flood: the nick changes allowed in the specified period */
+	max_nick_time = 20 seconds;
+	max_nick_changes = 5;
+
+	/*
+	 * anti_spam_exit_message_time: the minimum time a user must be connected
+	 * before custom quit messages are allowed.
+	 */
+	anti_spam_exit_message_time = 5 minutes;
+
+	/*
+	 * ts delta: the time delta allowed between server clocks before
+	 * a warning is given, or before the link is dropped.  all servers
+	 * should run ntpdate/rdate to keep clocks in sync
+	 */
+	ts_warn_delta = 30 seconds;
+	ts_max_delta = 5 minutes;
+
+	/*
+	 * kline_with_reason: show the user the reason why they are k/d/glined 
+	 * on exit.  May give away who set k/dline when set via tcm.
+	 */
+	kline_with_reason = yes;
+
+	/*
+	 * kline_reason: show this message to users on channel
+	 * instead of the oper reason.
+	 */
+	kline_reason = "Connection closed";
+
+	/*
+	 * reject_hold_time: wait this amount of time before disconnecting
+	 * a rejected client. Use 0 to disable.
+	 */
+	reject_hold_time = 0;
+
+	/*
+	 * warn_no_nline: warn opers about servers that try to connect but
+	 * we don't have a connect {} block for.  Twits with misconfigured 
+	 * servers can get really annoying with this enabled.
+	 */
+	warn_no_nline = yes;
+
+	/*
+	 * stats_e_disabled: set this to 'yes' to disable "STATS e" for both
+	 * operators and administrators.  Doing so is a good idea in case
+	 * there are any exempted (exempt{}) server IPs you don't want to
+	 * see leaked.
+	 */
+	stats_e_disabled = no;
+
+	/* stats_o_oper only: make stats o (opers) oper only */
+	stats_o_oper_only = yes;
+
+	/* stats_P_oper_only: make stats P (ports) oper only */
+	stats_P_oper_only = yes;
+
+	/*
+	 * stats i oper only: make stats i (auth {}) oper only. set to:
+	 *     yes:    show users no auth blocks, made oper only.
+	 *     masked: show users first matching auth block
+	 *     no:     show users all auth blocks.
+	 */
+	stats_i_oper_only = yes;
+
+	/*
+	 * stats_k_oper_only: make stats k/K (klines) oper only.  set to:
+	 *     yes:    show users no auth blocks, made oper only
+	 *     masked: show users first matching auth block
+	 *     no:     show users all auth blocks.
+	 */
+	stats_k_oper_only = yes;
+
+	/*
+	 * caller_id_wait: time between notifying a +g user that somebody
+	 * is messaging them.
+	 */
+	caller_id_wait = 1 minute;
+
+	/*
+	 * opers_bypass_callerid: allows operators to bypass +g and message
+	 * anyone who has it set (useful if you use services).
+	 */
+	opers_bypass_callerid = no;
+
+	/*
+	 * pace_wait_simple: time between use of less intensive commands
+	 * (ADMIN, HELP, (L)USERS, VERSION, remote WHOIS)
+	 */
+	pace_wait_simple = 1 second;
+
+	/*
+	 * pace_wait: time between more intensive commands
+	 * (INFO, LINKS, LIST, MAP, MOTD, STATS, WHO, wildcard WHOIS, WHOWAS)
+	 */
+	pace_wait = 10 seconds;
+
+	/*
+	 * short_motd: send clients a notice telling them to read the motd
+	 * instead of forcing a motd to clients who may simply ignore it.
+	 */
+	short_motd = no;
+
+	/*
+	 * ping_cookie: require clients to respond exactly to a ping command,
+	 * can help block certain types of drones and FTP PASV mode spoofing.
+	 */
+	ping_cookie = no;
+
+	/* no_oper_flood: increase flood limits for opers. */
+	no_oper_flood = yes;
+
+	/*
+	 * true_no_oper_flood: completely eliminate flood limits for opers
+	 * and for clients with can_flood = yes in their auth {} blocks
+	 */
+	true_no_oper_flood = yes;
+
+	/* oper_pass_resv: allow opers to over-ride RESVs on nicks/channels */
+	oper_pass_resv = yes;
+
+	/*
+	 * idletime: the maximum amount of time a user may idle before
+	 * they are disconnected
+	 */
+	idletime = 0;
+
+	/* REMOVE ME.  The following line checks you've been reading. */
+	#havent_read_conf = 1;
+
+	/*
+	 * max_targets: the maximum amount of targets in a single 
+	 * PRIVMSG/NOTICE.  Set to 999 NOT 0 for unlimited.
+	 */
+	max_targets = 4;
+
+	/*
+	 * client_flood: maximum amount of data in a clients queue before
+	 * they are dropped for flooding.
+	 */
+	client_flood = 2560 bytes;
+
+	/*
+	 * message_locale: the default message locale
+	 * Use "standard" for the compiled in defaults.
+	 * To install the translated messages, go into messages/ in the
+	 * source directory and run `make install'.
+	 */
+	message_locale = "standard";
+
+	/*
+	 * usermodes configurable: a list of usermodes for the options below
+	 *
+	 * +b - bots         - See bot and drone flooding notices
+	 * +c - cconn        - Client connection/quit notices
+	 * +D - deaf         - Don't receive channel messages
+	 * +d - debug        - See debugging notices
+	 * +f - full         - See I: line full notices
+	 * +G - softcallerid - Server Side Ignore for users not on your channels
+	 * +g - callerid     - Server Side Ignore (for privmsgs etc)
+	 * +i - invisible    - Not shown in NAMES or WHO unless you share a 
+	 *                     a channel
+	 * +k - skill        - See server generated KILL messages
+	 * +l - locops       - See LOCOPS messages
+	 * +n - nchange      - See client nick changes
+	 * +r - rej          - See rejected client notices
+	 * +s - servnotice   - See general server notices
+	 * +u - unauth       - See unauthorized client notices
+	 * +w - wallop       - See server generated WALLOPS
+	 * +x - external     - See remote server connection and split notices
+	 * +y - spy          - See LINKS, STATS, TRACE notices etc.
+	 * +z - operwall     - See oper generated WALLOPS
+	 */
+
+	/* oper_only_umodes: usermodes only opers may set */
+	oper_only_umodes = bots, cconn, debug, full, skill, nchange, 
+			   rej, spy, external, operwall, locops, unauth;
+
+	/* oper_umodes: default usermodes opers get when they /oper */
+	oper_umodes = bots, locops, servnotice, operwall, wallop;
+
+	/*
+	 * servlink_path: path to 'servlink' program used by ircd to handle
+	 * encrypted/compressed server <-> server links.
+	 *
+	 * only define if servlink is not in same directory as ircd itself.
+	 */
+	#servlink_path = "/usr/local/ircd/bin/servlink";
+
+	/*
+	 * default_cipher_preference: default cipher to use for cryptlink when none is
+	 * specified in connect block.
+	 */
+	#default_cipher_preference = "BF/168";
+
+	/*
+	 * use_egd: if your system does not have *random devices yet you
+	 * want to use OpenSSL and encrypted links, enable this.  Beware -
+	 * EGD is *very* CPU intensive when gathering data for its pool
+	 */
+#	use_egd = yes;
+
+	/*
+	 * egdpool_path: path to EGD pool. Not necessary for OpenSSL >= 0.9.7
+	 * which automatically finds the path.
+	 */
+#	egdpool_path = "/var/run/egd-pool";
+
+
+	/*
+	 * compression_level: level of compression for compressed links between
+	 * servers.  
+	 *
+	 * values are between: 1 (least compression, fastest)
+	 *                and: 9 (most compression, slowest).
+	 */
+#	compression_level = 6;
+
+	/*
+	 * throttle_time: the minimum amount of time between connections from
+	 * the same ip.  exempt {} blocks are excluded from this throttling.
+	 * Offers protection against flooders who reconnect quickly.  
+	 * Set to 0 to disable.
+	 */
+	throttle_time = 10;
+};
+
+glines {
+	/* enable: enable glines, network wide temp klines */
+	enable = yes;
+
+	/*
+	 * duration: the amount of time a gline will remain on your
+	 * server before expiring
+	 */
+	duration = 1 day;
+
+	/*
+	 * logging: which types of rules you want to log when triggered
+	 * (choose reject or block)
+	 */
+	logging = reject, block;
+
+	/*
+	 * NOTE: gline ACLs can cause a desync of glines throughout the
+	 * network, meaning some servers may have a gline triggered, and
+	 * others may not. Also, you only need insert rules for glines
+	 * that you want to block and/or reject. If you want to accept and
+	 * propagate the gline, do NOT put a rule for it.
+	 */
+
+	/* user@host for rule to apply to */
+	user = "god@I.still.hate.packets";
+	/* server for rule to apply to */
+	name = "hades.arpa";
+
+	/*
+	 * action: action to take when a matching gline is found. options are:
+	 *  reject	- do not apply the gline locally
+	 *  block	- do not propagate the gline
+	 */
+	action = reject, block;
+
+	user = "god@*";
+	name = "*";
+	action = block;
+};
+
-- 
GitLab


From 0af7c7bdcb76ca8cfa1e7956747592d7fa1cbc9e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Thu, 28 Apr 2011 08:07:17 +0000
Subject: [PATCH 2983/5331] Making the samba services get the timezone.

svn path=/nixos/trunk/; revision=27022
---
 modules/services/network-filesystems/samba.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/modules/services/network-filesystems/samba.nix b/modules/services/network-filesystems/samba.nix
index 1f249716f7c..20a8687cc03 100644
--- a/modules/services/network-filesystems/samba.nix
+++ b/modules/services/network-filesystems/samba.nix
@@ -69,7 +69,10 @@ let
       startOn = "started samba";
       stopOn = "stopping samba";
 
-      environment = { LD_LIBRARY_PATH = nssModulesPath; };
+      environment = {
+        LD_LIBRARY_PATH = nssModulesPath;
+        TZ = config.time.timeZone;
+      };
 
       exec = "${samba}/sbin/${appName} ${args}";
     };
-- 
GitLab


From a61015cfa1303c785cf7fd7ba4ff3a533904a428 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Thu, 28 Apr 2011 08:23:09 +0000
Subject: [PATCH 2984/5331] IRCD expression needs recursive attrsets...

svn path=/nixos/trunk/; revision=27025
---
 modules/services/networking/ircd-hybrid/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/services/networking/ircd-hybrid/default.nix b/modules/services/networking/ircd-hybrid/default.nix
index 01278d00e77..c4bf1878acf 100644
--- a/modules/services/networking/ircd-hybrid/default.nix
+++ b/modules/services/networking/ircd-hybrid/default.nix
@@ -6,7 +6,7 @@ let
 
   cfg = config.services.ircdHybrid;
   
-  ircdService = pkgs.stdenv.mkDerivation {
+  ircdService = pkgs.stdenv.mkDerivation rec {
     name = "ircd-hybrid-service";
     scripts = [ "=>/bin" ./control.in ];
     substFiles = [ "=>/conf" ./ircd.conf ];
-- 
GitLab


From deb6cce4bbb3fa90f8039b9f2a9bacdf72a9b663 Mon Sep 17 00:00:00 2001
From: Sander van der Burg <s.vanderburg@tudelft.nl>
Date: Thu, 28 Apr 2011 11:02:58 +0000
Subject: [PATCH 2985/5331] Adapted deploy-network to accept multiple network
 configurations which are zipped together. With this you can run the tool like
 this:

$ nixos-deploy-network network1.nix network2.nix


svn path=/nixos/trunk/; revision=27028
---
 .../tools/nixos-deploy-network/deploy.nix          | 14 ++++++++------
 .../nixos-deploy-network/nixos-deploy-network.sh   | 11 +++++++----
 2 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/modules/installer/tools/nixos-deploy-network/deploy.nix b/modules/installer/tools/nixos-deploy-network/deploy.nix
index c060ce41756..6f9dd434d2f 100644
--- a/modules/installer/tools/nixos-deploy-network/deploy.nix
+++ b/modules/installer/tools/nixos-deploy-network/deploy.nix
@@ -1,6 +1,6 @@
 { nixos ? /etc/nixos/nixos
 , nixpkgs ? /etc/nixos/nixpkgs
-, networkExpr
+, networkExprs
 , targetProperty ? "targetHost"
 }:
 
@@ -8,9 +8,11 @@ let
   pkgs = import nixpkgs {};
   
   inherit (builtins) attrNames getAttr listToAttrs;
-  inherit (pkgs.lib) concatMapStrings;
+  inherit (pkgs.lib) concatMapStrings zipAttrs;
   
-  network = import networkExpr;
+  networks = map (networkExpr: import networkExpr) networkExprs;
+  
+  network = zipAttrs networks;
   
   generateRollbackSucceededPhase = network: configs:
     concatMapStrings (configurationName: 
@@ -65,14 +67,14 @@ let
   evaluateMachines = network:
     listToAttrs (map (configurationName:
       let
-        configuration = getAttr configurationName network;
+        modules = getAttr configurationName network;
       in
       { name = configurationName;
         value = (import "${nixos}/lib/eval-config.nix" {
           inherit nixpkgs;
           modules =
-            [ configuration
-              # Provide a default hostname and deployment target equal
+	    modules ++
+            [ # Provide a default hostname and deployment target equal
               # to the attribute name of the machine in the model.
               { key = "set-default-hostname";
                 networking.hostName = pkgs.lib.mkOverride 900 configurationName;
diff --git a/modules/installer/tools/nixos-deploy-network/nixos-deploy-network.sh b/modules/installer/tools/nixos-deploy-network/nixos-deploy-network.sh
index f1668ce780d..28580e2f49d 100644
--- a/modules/installer/tools/nixos-deploy-network/nixos-deploy-network.sh
+++ b/modules/installer/tools/nixos-deploy-network/nixos-deploy-network.sh
@@ -4,7 +4,7 @@
 
 showUsage()
 {
-    echo "Usage: $0 network_expr"
+    echo "Usage: $0 network_expr [network_expr2 ...]"
     echo "Options:"
     echo
     echo "--show-trace  Shows an output trace"
@@ -55,13 +55,16 @@ fi
 
 if [ "$@" = "" ]
 then
-    echo "ERROR: A network Nix expression must be specified!" >&2
+    echo "ERROR: At least one network Nix expression must be specified!" >&2
     exit 1
 else
-    networkExpr=$(readlink -f $@)
+    for i in $@
+    do
+	networkExprs="$networkExprs \"$(readlink -f $i)\""
+    done    
 fi
 
 # Deploy the network
 
-vms=`nix-build $NIXOS/modules/installer/tools/nixos-deploy-network/deploy.nix --argstr networkExpr $networkExpr --argstr nixos $NIXOS $showTraceArg $noOutLinkArg`
+vms=`nix-build $NIXOS/modules/installer/tools/nixos-deploy-network/deploy.nix --arg networkExprs "[ $networkExprs ]" --argstr nixos $NIXOS $showTraceArg $noOutLinkArg`
 $vms/bin/deploy-systems
-- 
GitLab


From 311b702c70bb27d4d127d295dd22b9a978554886 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 29 Apr 2011 11:28:43 +0000
Subject: [PATCH 2986/5331] * A bunch of options for the new
 nixos-deploy-network.  Completely   unimplemented of course.

svn path=/nixos/trunk/; revision=27048
---
 modules/misc/deployment.nix | 84 ++++++++++++++++++++++++++++++++++++-
 1 file changed, 82 insertions(+), 2 deletions(-)

diff --git a/modules/misc/deployment.nix b/modules/misc/deployment.nix
index 91a0e9040dd..3a95e89ea5e 100644
--- a/modules/misc/deployment.nix
+++ b/modules/misc/deployment.nix
@@ -4,12 +4,92 @@ with pkgs.lib;
 
 {
   options = {
+  
+    deployment.targetEnv = mkOption {
+      default = "none";
+      example = "ec2";
+      description = ''
+        This option specifies the type of the environment in which the
+        machine is to be deployed by
+        <command>nixos-deploy-network</command>.  Currently, it can
+        have the following values. <literal>"none"</literal> means
+        deploying to a pre-existing physical or virtual NixOS machine,
+        reachable via SSH under the hostname or IP address specified
+        in <option>deployment.targetHost</option>.
+        <literal>"ec2"</literal> means that a virtual machine should be
+        instantiated in an Amazon EC2-compatible cloud environment
+        (see <option>deployment.ec2.*</option>).
+        <literal>"adhoc-cloud"</literal> means that a virtual machine
+        should be instantiated by executing certain commands via SSH
+        on a cloud controller machine (see
+        <option>deployment.adhoc.*</option>).  This is primarily
+        useful for debugging <command>nixos-deploy-network</command>.
+      '';
+    };
+
     deployment.targetHost = mkOption {
       default = config.networking.hostName;
       description = ''
-        This option specifies a hostname or IP address which can be used by nixos-deploy-network
-        to execute remote deployment operations.
+        This option specifies a hostname or IP address which can be
+        used by <command>nixos-deploy-network</command> to execute
+        remote deployment operations.
+      '';
+    };
+
+    # EC2/Nova/Eucalyptus-specific options.
+        
+    deployment.ec2.url = mkOption {
+      example = "https://ec2.eu-west-1.amazonaws.com:443/";
+      description = ''
+        URL of an Amazon EC2-compatible web service, used to create virtual machines.
+      '';
+    };
+
+    deployment.ec2.ami = mkOption {
+      example = "ami-ecb49e98";
+      description = ''
+        EC2 identifier of the AMI disk image used in the virtual
+        machine.  This must be a NixOS image providing SSH access.
+      '';
+    };
+    
+    deployment.ec2.instanceType = mkOption {
+      default = "m1.small";
+      example = "m1.large";
+      description = ''
+        EC2 instance type.  See <link
+        xlink:href='http://aws.amazon.com/ec2/instance-types/'/> for a
+        list of valid Amazon EC2 instance types.
+      '';
+    };
+
+    # Ad hoc cloud options.
+
+    deployment.adhoc.controller = mkOption {
+      example = "https://ec2.eu-west-1.amazonaws.com:443/";
+      description = ''
+        Hostname or IP addres of the machine to which
+        <command>nixos-deploy-network</command> should connect (via
+        SSH) to execute commands to start VMs or query their status.
+      '';
+    };
+    
+    deployment.adhoc.startVMCommand = mkOption {
+      default = "create-vm";
+      description = ''
+        Remote command to create a NixOS virtual machine.  It should
+        print an identifier denoting the VM on standard output.
+      '';
+    };
+    
+    deployment.adhoc.queryVMCommand = mkOption {
+      default = "query-vm";
+      description = ''
+        Remote command to query information about a previously created
+        NixOS virtual machine.  It should print the IPv6 address of
+        the VM on standard output.
       '';
     };
+    
   };
 }
-- 
GitLab


From 07820cb8cbe83bb3cd080ded5ca48c75e8bc6ede Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 29 Apr 2011 13:24:24 +0000
Subject: [PATCH 2987/5331] svn path=/nixos/trunk/; revision=27049

---
 modules/misc/deployment.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/misc/deployment.nix b/modules/misc/deployment.nix
index 3a95e89ea5e..b924dce81de 100644
--- a/modules/misc/deployment.nix
+++ b/modules/misc/deployment.nix
@@ -66,7 +66,7 @@ with pkgs.lib;
     # Ad hoc cloud options.
 
     deployment.adhoc.controller = mkOption {
-      example = "https://ec2.eu-west-1.amazonaws.com:443/";
+      example = "cloud.example.org";
       description = ''
         Hostname or IP addres of the machine to which
         <command>nixos-deploy-network</command> should connect (via
-- 
GitLab


From 4aa86107fd6a4db471f6cc9ed5c826e66e13c2b8 Mon Sep 17 00:00:00 2001
From: Nicolas Pierron <nicolas.b.pierron@gmail.com>
Date: Sun, 1 May 2011 10:24:28 +0000
Subject: [PATCH 2988/5331] Remove references to other kind of VCS from the
 manual.

svn path=/nixos/trunk/; revision=27069
---
 doc/manual/installation.xml | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/doc/manual/installation.xml b/doc/manual/installation.xml
index 9b87b40ccaa..6ae5906c860 100644
--- a/doc/manual/installation.xml
+++ b/doc/manual/installation.xml
@@ -363,11 +363,6 @@ $ nixos-rebuild switch</screen>
 (Or instead of <literal>switch</literal>, use any of the alternatives
 shown in <xref linkend="sec-changing-config"/>.)</para>
 
-<para>To customize your VCS or to handle more repositories with
-<command>nixos-checkout</command>, you can have a look at the
-options <option>installer.repos.nixos</option>
-and <option>installer.repos.nixpkgs</option>.</para>
-
 </section>
 
 
-- 
GitLab


From 1c69051ba8eed28dd092c755feebf4040f461778 Mon Sep 17 00:00:00 2001
From: Nicolas Pierron <nicolas.b.pierron@gmail.com>
Date: Sun, 1 May 2011 10:24:37 +0000
Subject: [PATCH 2989/5331] Manual: Clarify NixOS modules.

svn path=/nixos/trunk/; revision=27070
---
 doc/manual/development.xml | 368 ++++++++++++++++++++-----------------
 1 file changed, 202 insertions(+), 166 deletions(-)

diff --git a/doc/manual/development.xml b/doc/manual/development.xml
index 9d0b42c4349..3887904a92e 100644
--- a/doc/manual/development.xml
+++ b/doc/manual/development.xml
@@ -7,42 +7,209 @@
 NixOS.</para>
 
 
+<!--===============================================================-->
+
 <section>
 
 <title>Extending NixOS</title>
 
-<para>A unique syntax is used to express all system, hardware, computer and
-  service configurations.  This syntax helps for reading and writing new
-  configuration files.  It is coming with some extra strategies defined in
-  NixPkgs which are used to merge and evaluate all configuration files.</para>
+<para>NixOS is based on a modular system for declarative configuration.
+  This system combines multiple <emphasis>modules</emphasis> to produce one
+  configuration.  One of the module which compose your computer
+  configuration is <filename>/etc/nixos/configuration.nix</filename>.  Other
+  modules are available under NixOS <filename>modules</filename>
+  directory</para>
+
+<para>A module is a file which handles one specific part of the
+  configuration.  This part of the configuration could correspond to an
+  hardware, a service, network settings, or preferences.  A module
+  configuration does not have to handle everything from scratch, it can base
+  its configuration on other configurations provided by other modules.  Thus
+  a module can <emphasis>define</emphasis> options to setup its
+  configuration, and it can also <emphasis>declare</emphasis> options to be
+  fed by other modules.</para>
+
+<!-- module syntax -->
+
+<para xml:id="para-module-syn">A module is a file which contains a Nix
+  expression.  This expression should be either an expression which gets
+  evaluated into an attribute set or a function which returns an attribute
+  set.</para>
+
+<para>When the expression is a function, it should expect only one argument
+  which is an attribute set containing an attribute
+  named <varname>config</varname> and another attribute
+  named <varname>pkgs</varname>.  The <varname>config</varname> attribute
+  contains the result of the merge of all modules.  This attribute is
+  evaluated lazily, such as any Nix expression.  For more details on how
+  options are merged, see the details in <xref linkend="para-opt-decl"/>.
+  The <varname>pkgs</varname> attribute
+  contains <emphasis>nixpkgs</emphasis> attribute set of packages.  This
+  attribute is necessary for declaring options.</para>
+
+<example xml:id='module-syntax'><title>Usual module content</title>
+<programlisting>
+{config, pkgs, ...}: <co xml:id='module-syntax-1' />
 
-  <para>A configuration file is the same as your own computer
-  configuration.</para>
+{
+  imports = [
+    <co xml:id='module-syntax-2' />
+  ];
 
-<example xml:id='conf-syntax'><title>Usual configuration file</title>
+  options = {
+    <co xml:id='module-syntax-3' />
+  };
+
+  config = {
+    <co xml:id='module-syntax-4' />
+  };
+}</programlisting>
+</example>
+
+<para><xref linkend='module-syntax' /> Illustrates
+  a <emphasis>module</emphasis> skeleton.
+
+<calloutlist>
+  <callout arearefs='module-syntax-1'>
+    <para>This line makes the current Nix expression a function.  This
+    line can be omitted if there is no reference to <varname>pkgs</varname>
+    and <varname>config</varname> inside the module.</para>
+  </callout>
+
+  <callout arearefs='module-syntax-2'>
+    <para>This list is used to enumerate path to other modules which are
+    declaring options used by the current module.  In NixOS, default modules
+    are listed in the file <filename>modules/module-list.nix</filename>.
+    The default modules don't need to be added in the import list.</para>
+  </callout>
+
+  <callout arearefs='module-syntax-3'>
+    <para>This attribute set contains an attribute set of <emphasis>option
+    declaration</emphasis>.</para>
+  </callout>
+
+  <callout arearefs='module-syntax-4'>
+    <para>This attribute set contains an attribute set of <emphasis>option
+    definitions</emphasis>.  If the module does not have any imported
+    modules or any option declarations, then this attribute set can be used
+    in place of its parent attribute set.  This is a common case for simple
+    modules such
+    as <filename>/etc/nixos/configuration.nix</filename>.</para>
+  </callout>
+</calloutlist>
+
+</para>
+
+<!-- option definitions -->
+
+<para xml:id="para-opt-def">A module defines a configuration which would be
+  interpreted by other modules.  To define a configuration, a module needs
+  to provide option definitions.  An option definition is a simple
+  attribute assignment.</para>
+
+<para>Option definitions are made in a declarative manner.  Without
+  properties, options will always be defined with the same value.  To
+  introduce more flexibility in the system, option definitions are guarded
+  by <emphasis>properties</emphasis>.</para>
+
+<para>Properties are means to introduce conditional values inside option
+  definitions.  This conditional values can be distinguished in two
+  categories.  The condition which are local to the current configuration
+  and conditions which are dependent on others configurations.  Local
+  properties are <varname>mkIf</varname>, <varname>mkAlways</varname>
+  and <varname>mkAssert</varname>.  Global properties
+  are <varname>mkOverride</varname>, <varname>mkDefault</varname>
+  and <varname>mkOrder</varname>.</para>
+
+<para><varname>mkIf</varname> is used to remove the option definitions which
+  are below it if the condition is evaluated to
+  false.  <varname>mkAssert</varname> expects the condition to be evaluated
+  to true otherwise it raises an error message.  <varname>mkAlways</varname>
+  is used to ignore all the <varname>mkIf</varname>
+  and <varname>mkAssert</varname> which have been made
+  previously.  <varname>mkAlways</varname> and <varname>mkAssert</varname>
+  are often used together to set an option value and to ensure that it has
+  not been masked by another one.</para>
+
+<para><varname>mkOverride</varname> is used to mask previous definitions if
+  the current value has a lower mask number.  The mask value is 100 (default)
+  for any option definition which does not use this property.
+  Thus, <varname>mkDefault</varname> is just a short-cut with a higher mask
+  (1000) than the default mask value.  This means that a module can set an
+  option definition as a preference, and still let another module defining
+  it with a different value without using any property.</para>
+
+<para><varname>mkOrder</varname> is used to sort definitions based on the
+  rank number.  The rank number will sort all options definitions before
+  giving the sorted list of option definition to the merge function defined
+  in the option declaration.  A lower rank will move the definition to the
+  beginning and a higher rank will move the option toward the end.  The
+  default rank is 100.</para>
+
+<!-- option declarations -->
+
+<para xml:id="para-opt-decl">A module may declare options which are used by
+  other module to change the configuration provided by the current module.
+  Changes to the option definitions are made with properties which are using
+  values extracted from the result of the merge of all modules
+  (the <varname>config</varname> argument).</para>
+
+<para>The <varname>config</varname> argument reproduce the same hierarchy of
+  all options declared in all modules.  For each option, the result of the
+  option is available, it is either the default value or the merge of all
+  definitions of the option.</para>
+
+<para>Options are declared with the
+  function <varname>pkgs.lib.mkOption</varname>.  This function expects an
+  attribute set which at least provides a description.  A default value, an
+  example, a type, a merge function and a post-process function can be
+  added.</para>
+
+<para>Types are used to provide a merge strategy for options and to ensure
+  the type of each option definitions.  They are defined
+  in <varname>pkgs.lib.types</varname>.</para>
+
+<para>The merge function expects a list of option definitions and merge
+  them to obtain one result of the same type.</para>
+
+<para>The post-process function (named <varname>apply</varname>) takes the
+  result of the merge or of the default value, and produce an output which
+  could have a different type than the type expected by the option.</para>
+
+<!-- end -->
+
+<example xml:id='locate-example'><title>Locate Module Example</title>
 <programlisting>
-{config, modulesPath, pkgs, ...}: <co xml:id='conf-syntax-1' />
+{config, pkgs, ...}:
 
-let
-  inherit (pkgs.lib) mkOption mkIf mkThenElse types; <co xml:id='conf-syntax-2' />
+with pkgs.lib;
 
-  cfg = config.services.locate; <co xml:id='conf-syntax-4' />
+let
+  cfg = config.services.locate;
   locatedb = "/var/cache/locatedb";
   logfile = "/var/log/updatedb";
-  cmd = "root  updatedb --localuser=nobody --output=${locatedb} > ${logfile}";
+  cmd =''root  updatedb --localuser=nobody --output=${locatedb} > ${logfile}'';
+
+  mkCheck = x:
+    mkIf cfg.enable (
+      mkAssert config.services.cron.enable ''
+        The cron daemon is not enabled, required by services.locate.enable.
+      ''
+      x
+    )
 in
 
 {
-  imports = [ <co xml:id='conf-syntax-6' />
-    (modulesPath + /services/scheduling/cron.nix)
+  imports = [
+    /etc/nixos/nixos/modules/services/scheduling/cron.nix
   ];
 
-  options = { <co xml:id='conf-syntax-3' />
+  options = {
     services.locate = {
       enable = mkOption {
         default = false;
         example = true;
-        type = types.bool;
+        type = with types; bool;
         description = ''
           If enabled, NixOS will periodically update the database of
           files used by the <command>locate</command> command.
@@ -51,7 +218,7 @@ in
 
       period = mkOption {
         default = "15 02 * * *";
-        type = types.uniq type.string;
+        type = with types; uniq string;
         description = ''
           This option defines (in the format used by cron) when the
           locate database is updated.
@@ -61,164 +228,29 @@ in
     };
   };
 
-  config = mkIf cfg.enable { <co xml:id='conf-syntax-5' />
+  config = mkCheck {
     services.cron = {
-      systemCronJobs = mkThenElse { <co xml:id='conf-syntax-7' />
-        thenPart = "${cfg.period}  root ${cmd}";
-        elsePart = "";
-      };
+      enable = mkAlways cfg.enable;
+      systemCronJobs = "${cfg.period}  root ${cmd}";
     };
   };
 }</programlisting>
 </example>
 
-<para><xref linkend='conf-syntax' /> shows the <emphasis>configuration
-  file</emphasis> for the locate service which uses cron to update the
-  database at some dates which can be defined by the user.  This nix
-  expression is coming
-  from <filename>upstart-jobs/cron/locate.nix</filename>.  It shows a simple
-  example of a service that can be either distributed on many computer that
-  are using the same configuration or to shared with the community.  This
-  file is divided in two with the interface and the implementation.  Both
-  the interface and the implementation declare a <emphasis>configuration
-  set</emphasis>.
-
-<calloutlist>
-
-  <callout arearefs='conf-syntax-1'>
-
-    <para>This line declares the arguments of the configuration file.  You
-    can omit this line if there is no reference to <varname>pkgs</varname>
-    and <varname>config</varname> inside the configuration file.</para>
-
-    <para>The argument <varname>pkgs</varname> refers to NixPkgs and allow
-    you to access all attributes contained inside it.  In this
-    example <varname>pkgs</varname> is used to retrieve common functions to
-    ease the writing of configuration files
-    like <varname>mkOption</varname>, <varname>mkIf</varname>
-    and <varname>mkThenElse</varname>.</para>
-
-    <para>The argument <varname>config</varname> corresponds to the whole
-    NixOS configuration.  This is a set which is build by merging all
-    configuration files imported to set up the system.  Thus all options
-    declared are contained inside this variable.  In this
-    example <varname>config</varname> is used to retrieve the status of
-    the <varname>enable</varname> flag.  The important point of this
-    argument is that it contains either the result of the merge of different
-    settings or the default value, therefore you cannot assume
-    that <option>config.services.locate.enable</option> is always false
-    because it may have been defined in another configuration file.</para>
-
-  </callout>
-
-  <callout arearefs='conf-syntax-2'>
-
-    <para>This line is used to import a functions that are useful for
-    writing this configuration file.</para>
+<para><xref linkend='locate-example' /> illustrates a module which handles
+  the regular update of the database which index all files on the file
+  system.  This modules has option definitions to rely on the cron service
+  to run the command at predefined dates.  In addition, this modules
+  provides option declarations to enable the indexing and to use different
+  period of time to run the indexing.  Properties are used to prevent
+  ambiguous definitions of option (enable locate service and disable cron
+  services) and to ensure that no options would be defined if the locate
+  service is not enabled.</para>
 
-  </callout>
-
-  <callout arearefs='conf-syntax-3'>
-
-    <para>The variable <varname>options</varname> is
-    a <emphasis>configuration set</emphasis> which is only used to declare
-    options with the function <varname>mkOption</varname> imported
-    from <filename>pkgs/lib/default.nix</filename>.  Options may contained
-    any attribute but only the following have a special
-    meaning: <varname>default</varname>, <varname>example</varname>,
-    <varname>description</varname>, <varname>merge</varname>
-    and <varname>apply</varname>.</para>
-
-    <para>The <varname>merge</varname> attribute is used to merge all values
-    defined in all configuration files and this function return a value
-    which has the same type as the default value.  If the merge function is
-    not defined, then a default function
-    (<varname>pkgs.lib.mergeDefaultOption</varname>) is used to merge
-    values.  The <varname>merge</varname> attribute is a function which
-    expect two arguments: the location of the option and the list of values
-    which have to be merged.</para>
-
-    <para>The <varname>apply</varname> attribute is a function used to
-    process the option.  Thus the value return
-    by <option>config.<replaceable>option</replaceable></option> would be
-    the result of the <varname>apply</varname> function called with either
-    the <varname>default</varname> value or the result of
-    the <varname>merge</varname> function.</para>
-
-  </callout>
-
-  <callout arearefs='conf-syntax-4'>
-
-    <para>This line is a common trick used to reduce the amount of
-    writing.  In this case <varname>cfg</varname> is just a sugar over
-    <option>config.services.locate</option></para>
-
-  </callout>
-
-  <callout arearefs='conf-syntax-5'>
-
-    <para>This line is used to declare a special <emphasis>IF</emphasis>
-    statement.  If you had put a usual <emphasis>IF</emphasis> statement
-    here, with the same condition, then you will get an infinite loop.  The
-    reason is that your condition ask for the value of the
-    option <option>config.services.locate.enable</option> but in order to
-    get this value you have to evaluate all configuration sets including the
-    configuration set contained inside your file.</para>
-
-    <para>To remove this extra complexity, <varname>mkIf</varname> has been
-    introduced to get rid of possible infinite loop and to factor your
-    writing.</para>
-
-  </callout>
-
-  <callout arearefs='conf-syntax-6'>
-
-    <para>The attribute <varname>imports</varname> contains a list of other
-    module location.  These modules should provide option declarations for
-    the current module in order to be evaluated safely.</para>
-
-    <para>When a dependence on a NixOS module has to be made, then you
-    should use the argument <varname>modulesPath</varname> to prefix the
-    location of your NixOS repository.</para>
-
-  </callout>
-
-  <callout arearefs='conf-syntax-7'>
-
-    <para>The attribute <varname>config</varname>, which should not be
-    confused with the argument of the same name, contains a set of option
-    definitions defined by this module. When there is
-    neither <varname>imports</varname> nor <varname>options</varname>, then
-    this attribute set can be return without any enclosing.  This feature
-    allow you to write your <filename>configuration.nix</filename> as a
-    module which does not contains any option declarations.</para>
-
-    <para>As <varname>mkIf</varname> does not need
-    any <emphasis>then</emphasis> part or <emphasis>else</emphasis> part,
-    then you can specify one on each option definition with the
-    function <varname>mkThenElse</varname>.</para>
-
-    <para>To avoid a lot of <varname>mkThenElse</varname> with empty
-    <emphasis>else</emphasis> part, a sugar has been added to infer the
-    corresponding <emphasis>empty</emphasis>-value of your option when the
-    function <varname>mkThenElse</varname> is not used.</para>
-
-    <para>If your <emphasis>then</emphasis> part
-    and <emphasis>else</emphasis> part are identical, then you should use
-    the function <varname>mkAlways</varname> to ignore the condition.</para>
-
-    <para>If you need to add another condition, then you can add <varname>mkIf</varname> to on
-    the appropriate location.  Thus the <emphasis>then</emphasis> part will
-    only be used if all conditions declared with <varname>mkIf</varname>
-    are satisfied.</para>
-
-  </callout>
-
-</calloutlist>
+</section>
 
-</para>
 
-</section>
+<!--===============================================================-->
 
 <section>
 
@@ -271,6 +303,8 @@ config.system.build</command>
 </section>
 
 
+<!--===============================================================-->
+
 <section>
 
 <title>Building your own NixOS CD</title>
@@ -323,6 +357,8 @@ $ ./result/bin/nixos-install</screen>
 </section>
 
 
+<!--===============================================================-->
+
 <section>
 
 <title>Testing the <literal>initrd</literal></title>
-- 
GitLab


From 729d19536cdee97e002c60375340f6972b50819e Mon Sep 17 00:00:00 2001
From: Nicolas Pierron <nicolas.b.pierron@gmail.com>
Date: Sun, 1 May 2011 10:24:41 +0000
Subject: [PATCH 2990/5331] Manual (user configuration): Fix minor typo.

svn path=/nixos/trunk/; revision=27071
---
 doc/manual/userconfiguration.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/manual/userconfiguration.xml b/doc/manual/userconfiguration.xml
index a285532d520..2cad256c742 100644
--- a/doc/manual/userconfiguration.xml
+++ b/doc/manual/userconfiguration.xml
@@ -9,7 +9,7 @@
 <section>
 <title>Compiz Fusion</title>
 <para>
-	Compiz Fusion is just a set of plugins fr Compiz. Your best interest is to have 
+	Compiz Fusion is just a set of plugins for Compiz. Your best interest is to have
 	them found both by Compiz and by Compiz Configuration Settings (also in Compiz Fusion
 	distribution). By default they look in Compiz installation path and in home directory.
 	You do not need to track /nix/store manually - everything is already in 
-- 
GitLab


From dc111c742519aa52128cac5afebb789f48cd18e7 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sun, 1 May 2011 21:50:00 +0000
Subject: [PATCH 2991/5331] svn path=/nixos/trunk/; revision=27077

---
 release.nix       | 2 +-
 tests/default.nix | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/release.nix b/release.nix
index d32ad5cb000..5e60713dde6 100644
--- a/release.nix
+++ b/release.nix
@@ -177,7 +177,7 @@ let
         proxy = t.proxy.test;
         quake3 = t.quake3.report;
         remote_builds = t.remote_builds.test;
-        subversion = t.subversion.report;
+        #subversion = t.subversion.report;
         trac = t.trac.test;
         xfce = t.xfce.test;
       };
diff --git a/tests/default.nix b/tests/default.nix
index 7f34c4927a3..0976ad0c3a2 100644
--- a/tests/default.nix
+++ b/tests/default.nix
@@ -21,7 +21,7 @@ with import ../lib/testing.nix { inherit nixpkgs system; };
   quake3 = makeTest (import ./quake3.nix);
   remote_builds = makeTest (import ./remote-builds.nix);
   simple = makeTest (import ./simple.nix);
-  subversion = makeTest (import ./subversion.nix);
+  #subversion = makeTest (import ./subversion.nix);
   trac = makeTest (import ./trac.nix);
   xfce = makeTest (import ./xfce.nix);
 }
-- 
GitLab


From c4fe98706b903514a0bfdd99f4f9d6f3eb735e10 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Wed, 4 May 2011 12:34:26 +0000
Subject: [PATCH 2992/5331] Fixing the samba daemons. "smbd -i", as we were
 using, handles *one request* and exit. When it was working more or less, it
 was through upstart respawn.

svn path=/nixos/trunk/; revision=27140
---
 modules/services/network-filesystems/samba.nix | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/modules/services/network-filesystems/samba.nix b/modules/services/network-filesystems/samba.nix
index 20a8687cc03..e42316bf8bf 100644
--- a/modules/services/network-filesystems/samba.nix
+++ b/modules/services/network-filesystems/samba.nix
@@ -72,7 +72,10 @@ let
       environment = {
         LD_LIBRARY_PATH = nssModulesPath;
         TZ = config.time.timeZone;
+        LOCALE_ARCHIVE = "/var/run/current-system/sw/lib/locale/locale-archive";
       };
+  
+      daemonType = "fork";
 
       exec = "${samba}/sbin/${appName} ${args}";
     };
@@ -210,13 +213,11 @@ in
         preStart = setupScript;
       };
 
-    # nmbd says "standard input is not a socket, assuming -D option",
-    # but using -i makes it stay in foreground (?)
-    jobs.nmbd = daemonJob "nmbd" " -i -F";
+    jobs.nmbd = daemonJob "nmbd" "-D";
 
-    jobs.smbd = daemonJob "smbd" " -i -F";
+    jobs.smbd = daemonJob "smbd" "-D";
 
-    jobs.winbindd = daemonJob "winbindd" " -F";
+    jobs.winbindd = daemonJob "winbindd" "-D";
 
   };
   
-- 
GitLab


From 9c3d72cf8e87720fdcb1a246b22127ab82a4253c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Thu, 5 May 2011 15:07:37 +0000
Subject: [PATCH 2993/5331] Default to GRUB version 2.

svn path=/nixos/trunk/; revision=27165
---
 modules/installer/grub/grub.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/installer/grub/grub.nix b/modules/installer/grub/grub.nix
index 50ae0ddb596..753326ed719 100644
--- a/modules/installer/grub/grub.nix
+++ b/modules/installer/grub/grub.nix
@@ -35,8 +35,8 @@ in
       };
 
       version = mkOption {
-        default = 1;
-        example = 2;
+        default = 2;
+        example = 1;
         description = ''
           The version of GRUB to use: <literal>1</literal> for GRUB Legacy
           (versions 0.9x), or <literal>2</literal> for GRUB 2.
-- 
GitLab


From f35011e59a391a719a36515841b2a116e3a5d2ee Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sun, 8 May 2011 20:51:40 +0000
Subject: [PATCH 2994/5331] svn path=/nixos/trunk/; revision=27187

---
 modules/misc/deployment.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/misc/deployment.nix b/modules/misc/deployment.nix
index b924dce81de..94fc4ebdf0d 100644
--- a/modules/misc/deployment.nix
+++ b/modules/misc/deployment.nix
@@ -74,7 +74,7 @@ with pkgs.lib;
       '';
     };
     
-    deployment.adhoc.startVMCommand = mkOption {
+    deployment.adhoc.createVMCommand = mkOption {
       default = "create-vm";
       description = ''
         Remote command to create a NixOS virtual machine.  It should
-- 
GitLab


From f24a78fe35b50a352c7787c87a388600db9bcd57 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Mon, 9 May 2011 14:21:02 +0000
Subject: [PATCH 2995/5331] Fix typo in emergency grub config

svn path=/nixos/trunk/; revision=27196
---
 modules/installer/grub/grub-menu-builder.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/installer/grub/grub-menu-builder.sh b/modules/installer/grub/grub-menu-builder.sh
index cc82665f2ee..1c5deab43aa 100644
--- a/modules/installer/grub/grub-menu-builder.sh
+++ b/modules/installer/grub/grub-menu-builder.sh
@@ -172,7 +172,7 @@ EOF
 		cat > /boot/nixos-grub-config <<EOF
 menuentry "Emergency boot" {
   linux  $bootRoot/nixos-kernel systemConfig=$(readlink -f "$path") init=/boot/nixos-init $(cat "$path/kernel-params")
-  initrd $bootRoot/initrd
+  initrd $bootRoot/nixos-initrd
 }
 EOF
 		;;
-- 
GitLab


From d72ba421879e55c9fa81083943848f75a5593635 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 10 May 2011 10:35:20 +0000
Subject: [PATCH 2996/5331] * Revert to GRUB 1 as the default.  The switch to
 GRUB 2 seems to   cause more problems than expected, so we should probably
 think about   the proper migration path for a while.  In the meantime, of
 course,   everybody is encouraged to set boot.loader.grub.version = 2.

svn path=/nixos/trunk/; revision=27209
---
 modules/installer/grub/grub.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/installer/grub/grub.nix b/modules/installer/grub/grub.nix
index 753326ed719..50ae0ddb596 100644
--- a/modules/installer/grub/grub.nix
+++ b/modules/installer/grub/grub.nix
@@ -35,8 +35,8 @@ in
       };
 
       version = mkOption {
-        default = 2;
-        example = 1;
+        default = 1;
+        example = 2;
         description = ''
           The version of GRUB to use: <literal>1</literal> for GRUB Legacy
           (versions 0.9x), or <literal>2</literal> for GRUB 2.
-- 
GitLab


From 6bc3a764394874888fd3460b1ce4560c80de0daa Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 10 May 2011 13:12:35 +0000
Subject: [PATCH 2997/5331] =?UTF-8?q?*=20Add=20an=20option=20=E2=80=98depl?=
 =?UTF-8?q?oyment.adhoc.destroyVMCommand=E2=80=99.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

svn path=/nixos/trunk/; revision=27211
---
 modules/misc/deployment.nix | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/modules/misc/deployment.nix b/modules/misc/deployment.nix
index 94fc4ebdf0d..b45948efdd1 100644
--- a/modules/misc/deployment.nix
+++ b/modules/misc/deployment.nix
@@ -82,6 +82,14 @@ with pkgs.lib;
       '';
     };
     
+    deployment.adhoc.destroyVMCommand = mkOption {
+      default = "destroy-vm";
+      description = ''
+        Remote command to destroy a previously created NixOS virtual
+        machine.
+      '';
+    };
+    
     deployment.adhoc.queryVMCommand = mkOption {
       default = "query-vm";
       description = ''
-- 
GitLab


From 7579933824e25626ebbf526fdaf3221d68cdfc86 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 11 May 2011 09:33:24 +0000
Subject: [PATCH 2998/5331] * Don't mount /dev/cgroup with the "ns" subsystem. 
 If it's mounted,   then every unshare(CLONE_NEWNS) system call causes a new
 entry to be   created in /dev/cgroup/<pid>, which is not removed
 automatically.   This can cause subsequent calls to unshare() to fail if the
 PID has   wrapped around.  Worse, a large number of entries in /dev/cgroup  
 causes a very substantial system slowdown: doing 10,000  
 fork()/unshare(CLONE_NEWNS)/exit() calls took 21s without the "ns"  
 subsystem, but 2m43s with it, and the system slows down permanently   until
 the entries in /dev/cgroup are removed (going to a load of > 6   on my
 laptop).

  This is particularly important for Nix because its chroot feature
  uses unshare(CLONE_NEWNS).  (http://yellowgrass.org/issue/Nix/219)

svn path=/nixos/trunk/; revision=27216
---
 modules/system/activation/activation-script.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/system/activation/activation-script.nix b/modules/system/activation/activation-script.nix
index a8e67f8ebce..b2246a1447d 100644
--- a/modules/system/activation/activation-script.nix
+++ b/modules/system/activation/activation-script.nix
@@ -133,7 +133,7 @@ in
       ''
         if ! ${pkgs.sysvtools}/bin/mountpoint -q /dev/cgroup; then
             mkdir -p /dev/cgroup
-            ${pkgs.utillinux}/bin/mount -t cgroup none /dev/cgroup
+            ${pkgs.utillinux}/bin/mount -t cgroup -o freezer,cpuacct,cpu,cpuset none /dev/cgroup
         fi
       '';
     
-- 
GitLab


From 862fe5ad784700a959c1e8552eb31355cedf2888 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 11 May 2011 13:52:49 +0000
Subject: [PATCH 2999/5331] * Generate a nova.conf file. * Provide a
 configuration.nix in Nova images.

svn path=/nixos/trunk/; revision=27224
---
 modules/virtualisation/nova-config.nix |  5 +++++
 modules/virtualisation/nova-image.nix  | 11 +----------
 modules/virtualisation/nova.nix        | 16 +++++++++++-----
 3 files changed, 17 insertions(+), 15 deletions(-)
 create mode 100644 modules/virtualisation/nova-config.nix

diff --git a/modules/virtualisation/nova-config.nix b/modules/virtualisation/nova-config.nix
new file mode 100644
index 00000000000..df41f8f88af
--- /dev/null
+++ b/modules/virtualisation/nova-config.nix
@@ -0,0 +1,5 @@
+{ config, pkgs, modulesPath, ... }:
+
+{
+  require = [ "${modulesPath}/virtualisation/nova-image.nix" ];
+}
diff --git a/modules/virtualisation/nova-image.nix b/modules/virtualisation/nova-image.nix
index 3b3fa28d6bb..f61801e4c64 100644
--- a/modules/virtualisation/nova-image.nix
+++ b/modules/virtualisation/nova-image.nix
@@ -57,7 +57,7 @@ with pkgs.lib;
 
           # Install a configuration.nix.
           mkdir -p /mnt/etc/nixos
-          #cp ${./amazon-config.nix} /mnt/etc/nixos/configuration.nix
+          cp ${./nova-config.nix} /mnt/etc/nixos/configuration.nix
 
           # Generate the GRUB menu.
           chroot /mnt ${config.system.build.toplevel}/bin/switch-to-configuration boot
@@ -71,17 +71,8 @@ with pkgs.lib;
     [ { mountPoint = "/";
         device = "/dev/disk/by-label/nixos";
       }
-      #{ mountPoint = "/ephemeral0";
-      #  device = "/dev/xvdc";
-      #  neededForBoot = true;
-      #}
     ];
 
-  /*
-  swapDevices =
-    [ { device = "/dev/xvdb"; } ];
-  */
-  
   boot.kernelParams = [ "console=ttyS0" ];
 
   boot.initrd.kernelModules = [ "aufs" ];
diff --git a/modules/virtualisation/nova.nix b/modules/virtualisation/nova.nix
index f9f6af0b0e2..6b0276f76c6 100644
--- a/modules/virtualisation/nova.nix
+++ b/modules/virtualisation/nova.nix
@@ -10,6 +10,12 @@ let
 
   nova = pkgs.nova;
 
+  novaConf = pkgs.writeText "nova.conf"
+    ''
+      --nodaemon
+      --verbose
+    '';
+
 in
 
 {
@@ -87,7 +93,7 @@ in
         # required to generate key pairs.
         path = [ pkgs.openssl pkgs.openssh ];
           
-        exec = "${nova}/bin/nova-api";
+        exec = "${nova}/bin/nova-api --flagfile=${novaConf}";
       };
 
     # `nova-objectstore' is a simple image server.  Useful if you're
@@ -105,7 +111,7 @@ in
             mkdir -m 700 -p /var/lib/nova/images
           '';
 
-        exec = "${nova}/bin/nova-objectstore --nodaemon";
+        exec = "${nova}/bin/nova-objectstore --flagfile=${novaConf}";
       };
 
     # `nova-scheduler' schedules VM execution requests.
@@ -116,7 +122,7 @@ in
 
         startOn = "ip-up";
 
-        exec = "${nova}/bin/nova-scheduler --nodaemon --verbose";
+        exec = "${nova}/bin/nova-scheduler --flagfile=${novaConf}";
       };
 
     # `nova-compute' starts and manages virtual machines.
@@ -132,7 +138,7 @@ in
             pkgs.e2fsprogs pkgs.utillinux pkgs.multipath_tools
           ];
 
-        exec = "${nova}/bin/nova-compute --nodaemon --verbose";
+        exec = "${nova}/bin/nova-compute --flagfile=${novaConf}";
       };
 
     # `nova-network' manages networks and allocates IP addresses.
@@ -148,7 +154,7 @@ in
             pkgs.iproute pkgs.bridge_utils pkgs.radvd
           ];
 
-        exec = "${nova}/bin/nova-network --nodaemon --verbose";
+        exec = "${nova}/bin/nova-network --flagfile=${novaConf}";
       };
 
   };
-- 
GitLab


From 95dc49a89d89de3ba1bc68520f32e02123cb05cd Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 12 May 2011 15:30:56 +0000
Subject: [PATCH 3000/5331] =?UTF-8?q?*=20Add=20an=20option=20=E2=80=98depl?=
 =?UTF-8?q?oyment.ec2.keyPair=E2=80=99.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

svn path=/nixos/trunk/; revision=27238
---
 modules/misc/deployment.nix | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/modules/misc/deployment.nix b/modules/misc/deployment.nix
index b45948efdd1..d8d3f28e42e 100644
--- a/modules/misc/deployment.nix
+++ b/modules/misc/deployment.nix
@@ -38,10 +38,11 @@ with pkgs.lib;
 
     # EC2/Nova/Eucalyptus-specific options.
         
-    deployment.ec2.url = mkOption {
-      example = "https://ec2.eu-west-1.amazonaws.com:443/";
+    deployment.ec2.controller = mkOption {
+      example = https://ec2.eu-west-1.amazonaws.com:443/;
       description = ''
-        URL of an Amazon EC2-compatible web service, used to create virtual machines.
+        URI of an Amazon EC2-compatible cloud controller web service,
+        used to create and manage virtual machines.
       '';
     };
 
@@ -63,6 +64,15 @@ with pkgs.lib;
       '';
     };
 
+    deployment.ec2.keyPair = mkOption {
+      example = "my-keypair";
+      description = ''
+        Name of the SSH key pair to be used to communicate securely
+        with the instance.  Key pairs can be created using the
+        <command>ec2-add-keypair</command> command.
+      '';
+    };
+
     # Ad hoc cloud options.
 
     deployment.adhoc.controller = mkOption {
-- 
GitLab


From 4984fa1ee60af8e806de54870e183dbea8e18fd9 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 16 May 2011 07:46:31 +0000
Subject: [PATCH 3001/5331] * Fix the Nixpkgs mirror script (it didn't have the
 necessary   modules in the Perl search path).

svn path=/nixos/trunk/; revision=27261
---
 modules/services/backup/hydra-mirror.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/services/backup/hydra-mirror.nix b/modules/services/backup/hydra-mirror.nix
index 58cccda709f..3239f8a9432 100644
--- a/modules/services/backup/hydra-mirror.nix
+++ b/modules/services/backup/hydra-mirror.nix
@@ -15,7 +15,7 @@ let
   cronjob = jobset:
     "${cfg.period} ${cfg.user}"
     + optionalString cfg.enableBinaryPatches " ENABLE_PATCHES=1"
-    + " perl -I${config.environment.nix}/libexec/nix ${mirrorChannel}"
+    + " perl -I${config.environment.nix}/libexec/nix -I${pkgs.perlPackages.DBI}/lib/perl5/site_perl -I${pkgs.perlPackages.DBDSQLite}/lib/perl5/site_perl ${mirrorChannel}"
     + " ${cfg.hydraURL}/jobset/${jobset.project}/${jobset.jobset}/channel/latest"
     + " ${cfg.dataDir}/${jobset.project}/channels/${jobset.name}"
     + " ${cfg.dataDir}/nars"
-- 
GitLab


From 25bb8b3d55be5a572e9954afea98177880ec62b8 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Sat, 28 May 2011 19:58:43 +0000
Subject: [PATCH 3002/5331] Link TrueType/OpenType fonts to all-fonts
 directory, too

svn path=/nixos/trunk/; revision=27312
---
 modules/config/fonts.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/config/fonts.nix b/modules/config/fonts.nix
index bb75a1e29ab..865d682cfac 100644
--- a/modules/config/fonts.nix
+++ b/modules/config/fonts.nix
@@ -117,7 +117,7 @@ let
         list=\"\$list \$i\";
       fi;
     done
-    list=\$(find \$list -name fonts.dir);
+    list=\$(find \$list -name fonts.dir -o -name '*.ttf' -o -name '*.otf');
     fontDirs='';
     for i in \$list ; do
       fontDirs=\"\$fontDirs \$(dirname \$i)\";
-- 
GitLab


From be85cdacfd43b92aee2260698c7ca74808e336d8 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Sat, 28 May 2011 20:08:49 +0000
Subject: [PATCH 3003/5331] Fix space-containing name processing

svn path=/nixos/trunk/; revision=27313
---
 modules/config/fonts.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/modules/config/fonts.nix b/modules/config/fonts.nix
index 865d682cfac..af5ebde2d47 100644
--- a/modules/config/fonts.nix
+++ b/modules/config/fonts.nix
@@ -123,10 +123,10 @@ let
       fontDirs=\"\$fontDirs \$(dirname \$i)\";
     done;
     mkdir -p \$out/share/X11-fonts/; 
-    for i in \$(find \$fontDirs -type f -o -type l); do
-      j=\${i##*/}
-      if ! test -e \$out/share/X11-fonts/\${j}; then
-        ln -s \$i \$out/share/X11-fonts/\${j};
+    find \$fontDirs -type f -o -type l | while read i; do
+      j=\"\${i##*/}\"
+      if ! test -e \"\$out/share/X11-fonts/\${j}\"; then
+        ln -s \"\$i\" \"\$out/share/X11-fonts/\${j}\";
       fi;
     done;
     cd \$out/share/X11-fonts/
-- 
GitLab


From 14859264a9aa21630e53fec0db2c40251c57b352 Mon Sep 17 00:00:00 2001
From: Evgeny Egorochkin <phreedom.stdin@gmail.com>
Date: Tue, 31 May 2011 07:44:17 +0000
Subject: [PATCH 3004/5331] Virtuoso database service: packaged

svn path=/nixos/trunk/; revision=27332
---
 modules/misc/ids.nix                    |  2 +
 modules/module-list.nix                 |  1 +
 modules/services/databases/virtuoso.nix | 85 +++++++++++++++++++++++++
 3 files changed, 88 insertions(+)
 create mode 100644 modules/services/databases/virtuoso.nix

diff --git a/modules/misc/ids.nix b/modules/misc/ids.nix
index ccfba68c4d7..02c9cefc315 100644
--- a/modules/misc/ids.nix
+++ b/modules/misc/ids.nix
@@ -62,6 +62,7 @@ in
     git = 41;
     fourStore = 42;
     fourStoreEndpoint = 43;
+    virtuoso = 44;
 
     # When adding a uid, make sure it doesn't match an existing gid.
 
@@ -107,6 +108,7 @@ in
     git = 41;
     fourStore = 42;
     fourStoreEndpoint = 43;
+    virtuoso = 44;
 
     # When adding a gid, make sure it doesn't match an existing uid.
 
diff --git a/modules/module-list.nix b/modules/module-list.nix
index f14a3ed0939..ffc42eb0278 100644
--- a/modules/module-list.nix
+++ b/modules/module-list.nix
@@ -56,6 +56,7 @@
   ./services/databases/mysql.nix
   ./services/databases/openldap.nix
   ./services/databases/postgresql.nix
+  ./services/databases/virtuoso.nix
   ./services/games/ghost-one.nix
   ./services/hardware/acpid.nix
   ./services/hardware/bluetooth.nix
diff --git a/modules/services/databases/virtuoso.nix b/modules/services/databases/virtuoso.nix
new file mode 100644
index 00000000000..1bf6a1caf55
--- /dev/null
+++ b/modules/services/databases/virtuoso.nix
@@ -0,0 +1,85 @@
+{ config, pkgs, ... }:
+let
+  cfg = config.services.virtuoso;
+  virtuosoUser = "virtuoso";
+  stateDir = "/var/lib/virtuoso";
+in
+with pkgs.lib;
+{
+
+  ###### interface
+
+  options = {
+  
+    services.virtuoso = {
+    
+      enable = mkOption {
+        default = false;
+        description = "Whether to enable Virtuoso Opensource database server.";
+      };
+
+      config = mkOption {
+        default = "";
+        description = "Extra options to put into virtuoso configuration file.";
+      };
+
+      listenAddress = mkOption {
+	default = "1111";
+	example = "myserver:1323";
+        description = "ip:port or port to listen on.";
+      };
+
+      httpListenAddress = mkOption {
+	default = null;
+	example = "myserver:8080";
+        description = "ip:port or port for virtuoso HTTP server to listen on.";
+      };
+
+    };
+
+  };
+
+
+  ###### implementation
+
+  config = mkIf cfg.enable {
+
+    users.extraUsers = singleton
+      { name = virtuosoUser;
+        uid = config.ids.uids.virtuoso;
+        description = "virtuoso user";
+        home = stateDir;
+      };
+
+    jobs.virtuoso = {
+      name = "virtuoso";
+      startOn = "filesystem";
+
+      preStart = ''
+	mkdir -p ${stateDir}
+	chown ${virtuosoUser} ${stateDir}
+      '';
+
+      script = ''
+	cd ${stateDir}
+	${pkgs.virtuoso}/bin/virtuoso-t +foreground +configfile ${pkgs.writeText "virtuoso.ini" cfg.config}
+      '';
+    };
+
+    services.virtuoso.config = ''
+      [Database]
+      DatabaseFile=${stateDir}/x-virtuoso.db
+      TransactionFile=${stateDir}/x-virtuoso.trx
+      ErrorLogFile=${stateDir}/x-virtuoso.log
+      xa_persistent_file=${stateDir}/x-virtuoso.pxa
+
+      [Parameters]
+      ServerPort=${cfg.listenAddress}
+
+      [HTTPServer]
+      ${optionalString (cfg.httpListenAddress != null) "ServerPort=${cfg.httpListenAddress}"}
+    '';
+
+  };
+  
+}
-- 
GitLab


From b65a4840b8dc80bff2e8159ca525682fa23f17f3 Mon Sep 17 00:00:00 2001
From: Evgeny Egorochkin <phreedom.stdin@gmail.com>
Date: Tue, 31 May 2011 09:56:55 +0000
Subject: [PATCH 3005/5331] Make virtuoso drop root privileges

svn path=/nixos/trunk/; revision=27334
---
 modules/services/databases/virtuoso.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/modules/services/databases/virtuoso.nix b/modules/services/databases/virtuoso.nix
index 1bf6a1caf55..a185cc343ac 100644
--- a/modules/services/databases/virtuoso.nix
+++ b/modules/services/databases/virtuoso.nix
@@ -75,6 +75,7 @@ with pkgs.lib;
 
       [Parameters]
       ServerPort=${cfg.listenAddress}
+      RunAs=${virtuosoUser}
 
       [HTTPServer]
       ${optionalString (cfg.httpListenAddress != null) "ServerPort=${cfg.httpListenAddress}"}
-- 
GitLab


From cfce376628dfdee2c3b2f37f347b692c315e7d20 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Tue, 31 May 2011 10:21:37 +0000
Subject: [PATCH 3006/5331] Add an MPI test using two nodes.

svn path=/nixos/trunk/; revision=27335
---
 tests/default.nix |  1 +
 tests/mpich.nix   | 40 ++++++++++++++++++++++++++++++++++++++++
 2 files changed, 41 insertions(+)
 create mode 100644 tests/mpich.nix

diff --git a/tests/default.nix b/tests/default.nix
index 0976ad0c3a2..9b0295236e3 100644
--- a/tests/default.nix
+++ b/tests/default.nix
@@ -13,6 +13,7 @@ with import ../lib/testing.nix { inherit nixpkgs system; };
   ipv6 = makeTest (import ./ipv6.nix);
   kde4 = makeTest (import ./kde4.nix);
   login = makeTest (import ./login.nix);
+  mpich = makeTest (import ./mpich.nix);
   nat = makeTest (import ./nat.nix);
   nfs = makeTest (import ./nfs.nix);
   openssh = makeTest (import ./openssh.nix);
diff --git a/tests/mpich.nix b/tests/mpich.nix
new file mode 100644
index 00000000000..0b81bc1d0de
--- /dev/null
+++ b/tests/mpich.nix
@@ -0,0 +1,40 @@
+# Simple example to showcase distributed tests using NixOS VMs.
+
+{ pkgs, ... }:
+
+with pkgs;
+
+{
+  nodes = {
+    master =
+      { config, pkgs, ... }: {
+        environment.systemPackages = [ gcc mpich2 ];
+        #boot.kernelPackages = pkgs.kernelPackages_2_6_29;
+      };
+
+    slave =
+      { config, pkgs, ... }: {
+        environment.systemPackages = [ gcc mpich2 ];
+      };
+  };
+
+  # Start master/slave MPI daemons and compile/run a program that uses both
+  # nodes.
+  testScript =
+    ''
+       startAll;
+
+       $master->mustSucceed("echo 'MPD_SECRETWORD=secret' > /etc/mpd.conf");
+       $master->mustSucceed("chmod 600 /etc/mpd.conf");
+       $master->mustSucceed("mpd --daemon --ifhn=master --listenport=4444");
+
+       $slave->mustSucceed("echo 'MPD_SECRETWORD=secret' > /etc/mpd.conf");
+       $slave->mustSucceed("chmod 600 /etc/mpd.conf");
+       $slave->mustSucceed("mpd --daemon --host=master --port=4444");
+
+       $master->mustSucceed("mpicc -o example -Wall ${./mpich-example.c}");
+       $slave->mustSucceed("mpicc -o example -Wall ${./mpich-example.c}");
+
+       $master->mustSucceed("mpiexec -n 2 ./example >&2");
+    '';
+}
-- 
GitLab


From 733917db0f57218971171a2f21578ec27976a4b7 Mon Sep 17 00:00:00 2001
From: Evgeny Egorochkin <phreedom.stdin@gmail.com>
Date: Tue, 31 May 2011 14:56:56 +0000
Subject: [PATCH 3007/5331] Virtuoso: add dirsAllowed option, minor cleanup

svn path=/nixos/trunk/; revision=27336
---
 modules/services/databases/virtuoso.nix | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/modules/services/databases/virtuoso.nix b/modules/services/databases/virtuoso.nix
index a185cc343ac..413c5db53f1 100644
--- a/modules/services/databases/virtuoso.nix
+++ b/modules/services/databases/virtuoso.nix
@@ -20,7 +20,7 @@ with pkgs.lib;
 
       config = mkOption {
         default = "";
-        description = "Extra options to put into virtuoso configuration file.";
+        description = "Extra options to put into Virtuoso configuration file.";
       };
 
       listenAddress = mkOption {
@@ -32,9 +32,14 @@ with pkgs.lib;
       httpListenAddress = mkOption {
 	default = null;
 	example = "myserver:8080";
-        description = "ip:port or port for virtuoso HTTP server to listen on.";
+        description = "ip:port or port for Virtuoso HTTP server to listen on.";
       };
 
+      dirsAllowed = mkOption {
+	default = null;
+	example = "/www, /home/";
+        description = "A list of directories Virtuoso is allowed to access";
+      };
     };
 
   };
@@ -76,6 +81,7 @@ with pkgs.lib;
       [Parameters]
       ServerPort=${cfg.listenAddress}
       RunAs=${virtuosoUser}
+      ${optionalString (cfg.dirsAllowed != null) "DirsAllowed=${cfg.dirsAllowed}"}
 
       [HTTPServer]
       ${optionalString (cfg.httpListenAddress != null) "ServerPort=${cfg.httpListenAddress}"}
-- 
GitLab


From 488fd420411e307851adaa63bf5051d52bda04cd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Tue, 31 May 2011 15:09:56 +0000
Subject: [PATCH 3008/5331] Add missing file for the MPI test.

svn path=/nixos/trunk/; revision=27337
---
 tests/mpich-example.c | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)
 create mode 100644 tests/mpich-example.c

diff --git a/tests/mpich-example.c b/tests/mpich-example.c
new file mode 100644
index 00000000000..c48e3c45b72
--- /dev/null
+++ b/tests/mpich-example.c
@@ -0,0 +1,21 @@
+#include <stdio.h>
+#include <stdlib.h>
+#include <mpi.h>
+
+int
+main (int argc, char *argv[])
+{
+  int rank, size, length;
+  char name[BUFSIZ];
+
+  MPI_Init (&argc, &argv);
+  MPI_Comm_rank (MPI_COMM_WORLD, &rank);
+  MPI_Comm_size (MPI_COMM_WORLD, &size);
+  MPI_Get_processor_name (name, &length);
+
+  printf ("%s: hello world from process %d of %d\n", name, rank, size);
+
+  MPI_Finalize ();
+
+  return EXIT_SUCCESS;
+}
-- 
GitLab


From bd6eb4ed7a0065cb10c63f8d1c1ce8f5e1d5108b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Wed, 1 Jun 2011 07:37:23 +0000
Subject: [PATCH 3009/5331] Make Hydra run the MPI test.

svn path=/nixos/trunk/; revision=27341
---
 release.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/release.nix b/release.nix
index 5e60713dde6..859880af42a 100644
--- a/release.nix
+++ b/release.nix
@@ -171,6 +171,7 @@ let
         ipv6 = t.ipv6.test;
         kde4 = t.kde4.test;
         login = t.login.test;
+        mpich = t.mpich.test;
         nat = t.nat.test;
         nfs = t.nfs.test;
         openssh = t.openssh.test;
-- 
GitLab


From c734389e90c837b447ff931576742a5cdffc233f Mon Sep 17 00:00:00 2001
From: Evgeny Egorochkin <phreedom.stdin@gmail.com>
Date: Sat, 4 Jun 2011 10:53:07 +0000
Subject: [PATCH 3010/5331] Virtuoso: add parameters section to config

svn path=/nixos/trunk/; revision=27342
---
 modules/services/databases/virtuoso.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/modules/services/databases/virtuoso.nix b/modules/services/databases/virtuoso.nix
index 413c5db53f1..b41bc0f7ad1 100644
--- a/modules/services/databases/virtuoso.nix
+++ b/modules/services/databases/virtuoso.nix
@@ -23,6 +23,11 @@ with pkgs.lib;
         description = "Extra options to put into Virtuoso configuration file.";
       };
 
+      parameters = mkOption {
+        default = "";
+        description = "Extra options to put into [Parameters] section of Virtuoso configuration file.";
+      };
+
       listenAddress = mkOption {
 	default = "1111";
 	example = "myserver:1323";
@@ -82,6 +87,7 @@ with pkgs.lib;
       ServerPort=${cfg.listenAddress}
       RunAs=${virtuosoUser}
       ${optionalString (cfg.dirsAllowed != null) "DirsAllowed=${cfg.dirsAllowed}"}
+      ${cfg.parameters}
 
       [HTTPServer]
       ${optionalString (cfg.httpListenAddress != null) "ServerPort=${cfg.httpListenAddress}"}
-- 
GitLab


From c2a3aa8e7992c70c377ee9c56427857d86b78a81 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 8 Jun 2011 15:55:51 +0000
Subject: [PATCH 3011/5331] * Open UDP port 631 in the firewall to allow CUPS
 to discover   printers on the network.

svn path=/nixos/trunk/; revision=27399
---
 modules/services/printing/cupsd.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/modules/services/printing/cupsd.nix b/modules/services/printing/cupsd.nix
index b6dff75ed81..a5c0bea2713 100644
--- a/modules/services/printing/cupsd.nix
+++ b/modules/services/printing/cupsd.nix
@@ -224,5 +224,8 @@ in
         </Policy>
       '';
 
+    # Allow CUPS to receive IPP printer announcements via UDP.
+    networking.firewall.allowedUDPPorts = [ 631 ];
+
   };
 }
-- 
GitLab


From e9a567f8d2f11b761dc8e9da698de7ba0b2727bf Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 9 Jun 2011 17:11:56 +0000
Subject: [PATCH 3012/5331] * Update the Nova module for the Cactus release.

svn path=/nixos/trunk/; revision=27410
---
 modules/virtualisation/nova.nix | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/modules/virtualisation/nova.nix b/modules/virtualisation/nova.nix
index 6b0276f76c6..f76c97088ee 100644
--- a/modules/virtualisation/nova.nix
+++ b/modules/virtualisation/nova.nix
@@ -47,7 +47,7 @@ in
 
   config = mkIf cfg.enableSingleNode {
 
-    environment.systemPackages = [ nova pkgs.euca2ools ];
+    environment.systemPackages = [ nova pkgs.euca2ools pkgs.novaclient ];
 
     environment.etc =
       [ # The Paste configuration file for nova-api.
@@ -73,7 +73,6 @@ in
         # Allow the CA certificate generation script (called by
         # nova-api) to work.
         mkdir -m 700 -p /var/lib/nova/CA /var/lib/nova/CA/private
-        cp -p ${nova}/libexec/nova/openssl.cnf.tmpl /var/lib/nova/CA/
 
         # Initialise the SQLite database.        
         ${nova}/bin/nova-manage db sync
@@ -91,9 +90,11 @@ in
 
         # `openssl' is required to generate the CA.  `openssh' is
         # required to generate key pairs.
-        path = [ pkgs.openssl pkgs.openssh ];
-          
-        exec = "${nova}/bin/nova-api --flagfile=${novaConf}";
+        path = [ pkgs.openssl pkgs.openssh pkgs.bash ];
+
+        respawn = false;
+        
+        exec = "${nova}/bin/nova-api --flagfile=${novaConf} --api_paste_config=${nova}/etc/nova/api-paste.ini";
       };
 
     # `nova-objectstore' is a simple image server.  Useful if you're
@@ -135,7 +136,8 @@ in
 
         path =
           [ pkgs.sudo pkgs.vlan pkgs.nettools pkgs.iptables pkgs.qemu_kvm
-            pkgs.e2fsprogs pkgs.utillinux pkgs.multipath_tools
+            pkgs.e2fsprogs pkgs.utillinux pkgs.multipath_tools pkgs.iproute
+            pkgs.bridge_utils
           ];
 
         exec = "${nova}/bin/nova-compute --flagfile=${novaConf}";
-- 
GitLab


From 6719446d4be4fdd5317613702bd78f43b64a0a9d Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 15 Jun 2011 12:41:15 +0000
Subject: [PATCH 3013/5331] * Some hackery to get foomatic-filters to work.

svn path=/nixos/trunk/; revision=27471
---
 modules/services/printing/cupsd.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/modules/services/printing/cupsd.nix b/modules/services/printing/cupsd.nix
index a5c0bea2713..1fb5ee6dd2d 100644
--- a/modules/services/printing/cupsd.nix
+++ b/modules/services/printing/cupsd.nix
@@ -27,6 +27,11 @@ let
         mkdir -pv $out/lib/cups/backend
         ln -sv ${pkgs.cups}/lib/cups/backend/ipp $out/lib/cups/backend/https
       fi
+
+      # Awful hack to get programs needed by some PPDs in CUPS'
+      # hard-coded $PATH.
+      mkdir -p $out/lib/cups/filter
+      ln -s ${pkgs.coreutils}/bin/date ${pkgs.coreutils}/bin/cat ${pkgs.gnused}/bin/sed $out/lib/cups/filter/
     '';
   };
 
@@ -148,6 +153,7 @@ in
       };
 
     services.printing.drivers = [ pkgs.cups pkgs.cups_pdf_filter pkgs.ghostscript additionalBackends ];
+    
     services.printing.cupsdConf =
       ''
         LogLevel info
-- 
GitLab


From 7fe48226c0d8af045a9f70d533ef115d9ba1aecf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Wed, 15 Jun 2011 14:12:45 +0000
Subject: [PATCH 3014/5331] doc: Add more details on `lib/testing.nix'.

svn path=/nixos/trunk/; revision=27474
---
 doc/manual/development.xml | 46 ++++++++++++++++++++++++++++++++++++++
 1 file changed, 46 insertions(+)

diff --git a/doc/manual/development.xml b/doc/manual/development.xml
index 3887904a92e..c8001a5c6d7 100644
--- a/doc/manual/development.xml
+++ b/doc/manual/development.xml
@@ -480,6 +480,52 @@ $ qemu-system-x86_64 -kernel ./kernel/bzImage -initrd ./initrd/initrd -hda /dev/
     a NixOS or Nixpkgs change.
   </para>
 
+  <para>
+    The actual Nix programming interface to VM testing is in NixOS,
+    under <link
+    xlink:href="https://svn.nixos.org/repos/nix/nixos/trunk/lib/testing.nix">
+    <filename>lib/testing.nix</filename></link>.  This file defines a
+    function which takes an attribute set containing a
+    <literal>nixpkgs</literal> attribute (the path to a Nixpkgs
+    checkout), and a <literal>system</literal> attribute (the system
+    type).  It returns an attribute set containing several utility
+    functions, among which the main entry point is
+    <literal>makeTest</literal>.
+  </para>
+
+  <para>
+    The <literal>makeTest</literal> function takes a function similar to
+    that found in <link
+    xlink:href="https://svn.nixos.org/repos/nix/nixos/trunk/tests/nfs.nix">
+    <filename>tests/nfs.nix</filename></link> (discussed above).  It
+    returns an attribute set containing (among others):
+
+    <variablelist>
+
+      <varlistentry>
+	<term><varname>test</varname></term>
+	<listitem>A derivation containing the test log as an HTML file,
+	as seen above, suitable for presentation in the Hydra continuous
+	build system.</listitem>
+      </varlistentry>
+
+      <varlistentry>
+	<term><varname>report</varname></term>
+	<listitem>A derivation containing a code coverage report, with
+	meta-data suitable for Hydra.</listitem>
+      </varlistentry>
+
+      <varlistentry>
+	<term><varname>driver</varname></term>
+	<listitem>A derivation containing scripts to run the VM test or
+	interact with the VM network interactively, as seen above.
+	</listitem>
+      </varlistentry>
+
+    </variablelist>
+  </para>
+    
+
 </section>
 
 </chapter>
-- 
GitLab


From 610839eb29bf119c195d8aaa3403aba1df83c0c7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Wed, 15 Jun 2011 14:46:06 +0000
Subject: [PATCH 3015/5331] doc: Attempt to placate Docbook.

svn path=/nixos/trunk/; revision=27476
---
 doc/manual/development.xml | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/doc/manual/development.xml b/doc/manual/development.xml
index c8001a5c6d7..30d9be2b62c 100644
--- a/doc/manual/development.xml
+++ b/doc/manual/development.xml
@@ -504,21 +504,21 @@ $ qemu-system-x86_64 -kernel ./kernel/bzImage -initrd ./initrd/initrd -hda /dev/
 
       <varlistentry>
 	<term><varname>test</varname></term>
-	<listitem>A derivation containing the test log as an HTML file,
+	<listitem><para>A derivation containing the test log as an HTML file,
 	as seen above, suitable for presentation in the Hydra continuous
-	build system.</listitem>
+	build system.</para></listitem>
       </varlistentry>
 
       <varlistentry>
 	<term><varname>report</varname></term>
-	<listitem>A derivation containing a code coverage report, with
-	meta-data suitable for Hydra.</listitem>
+	<listitem><para>A derivation containing a code coverage report, with
+	meta-data suitable for Hydra.</para></listitem>
       </varlistentry>
 
       <varlistentry>
 	<term><varname>driver</varname></term>
-	<listitem>A derivation containing scripts to run the VM test or
-	interact with the VM network interactively, as seen above.
+	<listitem><para>A derivation containing scripts to run the VM test or
+	interact with the VM network interactively, as seen above.</para>
 	</listitem>
       </varlistentry>
 
-- 
GitLab


From e25843d01c511410228c5746da59bfab43dca876 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 16 Jun 2011 14:14:50 +0000
Subject: [PATCH 3016/5331] * Add an option to distinguish between EC2 and Nova
 targets.

svn path=/nixos/trunk/; revision=27482
---
 modules/misc/deployment.nix | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/modules/misc/deployment.nix b/modules/misc/deployment.nix
index d8d3f28e42e..93ae8c97e98 100644
--- a/modules/misc/deployment.nix
+++ b/modules/misc/deployment.nix
@@ -38,6 +38,16 @@ with pkgs.lib;
 
     # EC2/Nova/Eucalyptus-specific options.
         
+    deployment.ec2.type = mkOption {
+      default = "ec2";
+      example = "nova";
+      description = ''
+        Specifies the type of cloud.  This affects the machine
+        configuration.  Current values are <literal>"ec2"</literal>
+        and <literal>"nova"</literal>.
+      '';
+    };
+
     deployment.ec2.controller = mkOption {
       example = https://ec2.eu-west-1.amazonaws.com:443/;
       description = ''
-- 
GitLab


From 545431003b6f94ee5446486fcfe26795248d29db Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 16 Jun 2011 14:15:37 +0000
Subject: [PATCH 3017/5331] * Create some virtual consoles in Nova VMs because
 it provides VNC   access.

svn path=/nixos/trunk/; revision=27483
---
 modules/virtualisation/nova-image.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/modules/virtualisation/nova-image.nix b/modules/virtualisation/nova-image.nix
index f61801e4c64..2a904cdd88c 100644
--- a/modules/virtualisation/nova-image.nix
+++ b/modules/virtualisation/nova-image.nix
@@ -104,8 +104,9 @@ with pkgs.lib;
     '';
     */
 
-  # There are no virtual consoles.
-  services.mingetty.ttys = [ ];
+  # Since Nova allows VNC access to instances, it's nice to start to
+  # start a few virtual consoles.
+  services.mingetty.ttys = [ "tty1" "tty2" ];
 
   # Allow root logins only using the SSH key that the user specified
   # at instance creation time.
-- 
GitLab


From 3cb5ea79bd4b0794f5b6214bfc7da4a3320cba42 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 20 Jun 2011 14:27:06 +0000
Subject: [PATCH 3018/5331] * Add an option virtualisation.nova.extraConfig.

svn path=/nixos/trunk/; revision=27504
---
 modules/virtualisation/nova.nix | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/modules/virtualisation/nova.nix b/modules/virtualisation/nova.nix
index f76c97088ee..fa26b7d54ea 100644
--- a/modules/virtualisation/nova.nix
+++ b/modules/virtualisation/nova.nix
@@ -14,6 +14,7 @@ let
     ''
       --nodaemon
       --verbose
+      ${cfg.extraConfig}
     '';
 
 in
@@ -40,6 +41,16 @@ in
           '';
       };
 
+    virtualisation.nova.extraConfig = 
+      mkOption {
+        default = false;
+        description =
+          ''
+            Additional text appended to <filename>nova.conf</filename>,
+            the main Nova configuration file.
+          '';
+      };
+
   };
 
 
@@ -50,9 +61,8 @@ in
     environment.systemPackages = [ nova pkgs.euca2ools pkgs.novaclient ];
 
     environment.etc =
-      [ # The Paste configuration file for nova-api.
-        { source = "${nova}/etc/nova/nova-api.conf";
-          target = "nova/nova-api.conf";
+      [ { source = novaConf;
+          target = "nova/nova.conf";
         }
       ];
 
-- 
GitLab


From 59355bafe59d15582c0bf67fc12c010c9b7a1744 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 20 Jun 2011 18:12:47 +0000
Subject: [PATCH 3019/5331] * Initialise bridges before doing the configuration
 specified in   networking.interfaces and networking.localCommands.

svn path=/nixos/trunk/; revision=27505
---
 modules/tasks/network-interfaces.nix | 44 ++++++++++++++--------------
 1 file changed, 22 insertions(+), 22 deletions(-)

diff --git a/modules/tasks/network-interfaces.nix b/modules/tasks/network-interfaces.nix
index c64bb624d34..fab61b79c98 100644
--- a/modules/tasks/network-interfaces.nix
+++ b/modules/tasks/network-interfaces.nix
@@ -209,6 +209,28 @@ in
                 ip link set "$i" up
             done
 
+            # Create bridge devices.
+            ${concatStrings (attrValues (flip mapAttrs cfg.bridges (n: v: ''
+                echo "Creating bridge ${n}..."
+                ${pkgs.bridge_utils}/sbin/brctl addbr "${n}"
+                
+                ${flip concatMapStrings v.interfaces (i: ''
+                  ${pkgs.bridge_utils}/sbin/brctl addif "${n}" "${i}"
+                  ip addr flush dev "${i}"
+                '')}
+
+                # For some reason enslaving an interface to a bridge
+                # causes traffic to be blocked for a few seconds, long
+                # enough for IPv6 router solicitations to get lost.
+                # So increase the number of attemts.
+                ${optionalString cfg.enableIPv6 ''
+                  echo 5 > /proc/sys/net/ipv6/conf/${n}/router_solicitations
+                ''}
+                
+                # !!! Should delete (brctl delif) any interfaces that
+                # no longer belong to the bridge.
+            '')))}
+            
             # Configure the manually specified interfaces.
             ${flip concatMapStrings cfg.interfaces (i:
               optionalString (i.ipAddress != "")
@@ -238,28 +260,6 @@ in
             # Run any user-specified commands.
             ${pkgs.stdenv.shell} ${pkgs.writeText "local-net-cmds" cfg.localCommands}
 
-            # Create bridge devices.
-            ${concatStrings (attrValues (flip mapAttrs cfg.bridges (n: v: ''
-                echo "Creating bridge ${n}..."
-                ${pkgs.bridge_utils}/sbin/brctl addbr "${n}"
-                
-                ${flip concatMapStrings v.interfaces (i: ''
-                  ${pkgs.bridge_utils}/sbin/brctl addif "${n}" "${i}"
-                  ip addr flush dev "${i}"
-                '')}
-
-                # For some reason enslaving an interface to a bridge
-                # causes traffic to be blocked for a few seconds, long
-                # enough for IPv6 router solicitations to get lost.
-                # So increase the number of attemts.
-                ${optionalString cfg.enableIPv6 ''
-                  echo 5 > /proc/sys/net/ipv6/conf/${n}/router_solicitations
-                ''}
-                
-                # !!! Should delete (brctl delif) any interfaces that
-                # no longer belong to the bridge.
-            '')))}
-            
             ${optionalString (cfg.interfaces != [] || cfg.localCommands != "") ''
               # Emit the ip-up event (e.g. to start ntpd).
               initctl emit -n ip-up
-- 
GitLab


From a2ad688a63b7f2146a0f654e1069fcad567971eb Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 21 Jun 2011 10:46:21 +0000
Subject: [PATCH 3020/5331] * Handle the case where networking.hostName is
 empty.

svn path=/nixos/trunk/; revision=27510
---
 modules/virtualisation/qemu-vm.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/modules/virtualisation/qemu-vm.nix b/modules/virtualisation/qemu-vm.nix
index efa37146f21..91aeb950a15 100644
--- a/modules/virtualisation/qemu-vm.nix
+++ b/modules/virtualisation/qemu-vm.nix
@@ -13,7 +13,10 @@ with pkgs.lib;
 
 let
 
-  vmName = config.networking.hostName;
+  vmName = 
+    if config.networking.hostName == "" 
+    then "noname" 
+    else config.networking.hostName;
 
   options = {
   
-- 
GitLab


From c41b01ea232db92f9970cdaafe2c85c76055f4df Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 22 Jun 2011 18:22:58 +0000
Subject: [PATCH 3021/5331] * Canonicalize boot.loader.grub.device before
 calling grub-install to   ensure that values such as
 /dev/disk/by-id/ata-WDC... work.

svn path=/nixos/trunk/; revision=27519
---
 modules/system/activation/switch-to-configuration.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/system/activation/switch-to-configuration.sh b/modules/system/activation/switch-to-configuration.sh
index 3249ee3ea34..185a7f75b0b 100644
--- a/modules/system/activation/switch-to-configuration.sh
+++ b/modules/system/activation/switch-to-configuration.sh
@@ -38,13 +38,13 @@ if [ "$action" = "switch" -o "$action" = "boot" ]; then
 
               if [ "$NIXOS_INSTALL_GRUB" = 1 -o "$oldGrubVersion" != "$newGrubVersion" ]; then
                   echo "installing the GRUB bootloader..."
-                  @grub@/sbin/grub-install "@grubDevice@" --no-floppy
+                  @grub@/sbin/grub-install "$(readlink -f "@grubDevice@")" --no-floppy
                   echo "$newGrubVersion" > /boot/grub/version
               fi
           fi
           
       else
-          echo "Warning: don't know how to make this configuration bootable; please set \`boot.grubDevice'." 1>&2
+          echo "Warning: don't know how to make this configuration bootable; please set \`boot.loader.grub.device'." 1>&2
       fi
       
     elif [ "@bootLoader@" = "generationsDir" ]; then
-- 
GitLab


From 1ea24769a088c9231a54f6e4a4f5055c3f04f544 Mon Sep 17 00:00:00 2001
From: Joachim Schiele <js@lastlog.de>
Date: Thu, 23 Jun 2011 20:56:37 +0000
Subject: [PATCH 3022/5331] added support for two custom themes and also wrote
 a nice looking nixos theme

svn path=/nixos/trunk/; revision=27535
---
 .../web-servers/apache-httpd/mediawiki.nix    | 30 ++++++++++++++++++-
 1 file changed, 29 insertions(+), 1 deletion(-)

diff --git a/modules/services/web-servers/apache-httpd/mediawiki.nix b/modules/services/web-servers/apache-httpd/mediawiki.nix
index 4b005a1b1cd..2c592c00634 100644
--- a/modules/services/web-servers/apache-httpd/mediawiki.nix
+++ b/modules/services/web-servers/apache-httpd/mediawiki.nix
@@ -4,6 +4,16 @@ with pkgs.lib;
 
 let
 
+  src_clean_skin = pkgs.fetchurl {
+    url = "http://lastlog.de/misc/clean-1.01.tar.gz"; 
+    sha256 = "5fb1736b64b33ca3429d035f1358cf8217da2d02019d8a80b14c7985367f659f"; 
+  };
+
+  src_nixos_skin = pkgs.fetchurl {
+    url = "http://lastlog.de/misc/nixos-1.0.tar.gz"; 
+    sha256 = "413b0f451bde81ac2dd0bede17dd088f9abcd0f3cea1722279311ca648a855cf"; 
+  };
+
   mediawikiConfig = pkgs.writeText "LocalSettings.php"
     ''
       <?php
@@ -62,6 +72,10 @@ let
           $wgUploadDirectory = "${config.uploadDir}";
         ''}
 
+        ${optionalString (config.defaultSkin != "") ''
+          $wgDefaultSkin = "${config.defaultSkin}";
+        ''}
+
         ${config.extraConfig}
       ?>
     '';
@@ -75,7 +89,15 @@ let
       sha256 = "1d8afbdh3lsg54b69mnh6a47psb3lg978xpp277qs08yz15cjf7q";
     };
 
-    buildPhase = "true";
+    skinTarball = if config.defaultSkin == "clean" then src_clean_skin
+             else if config.defaultSkin == "nixos" then src_nixos_skin
+             else "";
+
+    buildPhase = "
+      if [ '${skinTarball}' ]; then
+         tar xfz ${skinTarball} -C skins/;
+      fi
+    ";
 
     installPhase =
       ''
@@ -231,6 +253,12 @@ in
       description = "The directory that stores uploaded files.";
     };
 
+    defaultSkin = mkOption {
+      default = "standard";
+      example = "nostalgia";
+      description = "Default skin: you can change the default skin.";
+    };
+
     extraConfig = mkOption {
       default = "";
       example =
-- 
GitLab


From ab70d480ab1898b591d2dc948cf107f4c7e789bf Mon Sep 17 00:00:00 2001
From: Sander van der Burg <s.vanderburg@tudelft.nl>
Date: Fri, 24 Jun 2011 12:35:58 +0000
Subject: [PATCH 3023/5331] The machines in the network should be accessed by
 the node function parameter

svn path=/nixos/trunk/; revision=27538
---
 modules/installer/tools/nixos-deploy-network/deploy.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/installer/tools/nixos-deploy-network/deploy.nix b/modules/installer/tools/nixos-deploy-network/deploy.nix
index 6f9dd434d2f..5eda39269ca 100644
--- a/modules/installer/tools/nixos-deploy-network/deploy.nix
+++ b/modules/installer/tools/nixos-deploy-network/deploy.nix
@@ -81,7 +81,7 @@ let
                 deployment.targetHost = pkgs.lib.mkOverride 900 configurationName;
               }
             ];
-          extraArgs = evaluateMachines network;
+          extraArgs = { nodes = evaluateMachines network; };
         }).config; }
     ) (attrNames (network)));
 
-- 
GitLab


From 010a2a755542681c9e18dd90c0b417807b4c5759 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 27 Jun 2011 08:50:30 +0000
Subject: [PATCH 3024/5331] * Support creating non-system user accounts.

svn path=/nixos/trunk/; revision=27545
---
 modules/config/users-groups.nix | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/modules/config/users-groups.nix b/modules/config/users-groups.nix
index 6d57209a4ac..a0210630b0f 100644
--- a/modules/config/users-groups.nix
+++ b/modules/config/users-groups.nix
@@ -24,6 +24,7 @@ let
           }
         ];
 
+      # !!! Use NixOS module system to add default attributes.
       addAttrs =
         { name
         , description
@@ -35,8 +36,9 @@ let
         , createHome ? false
         , useDefaultShell ? false
         , password ? null
+        , isSystemUser ? true
         }:
-        { inherit name description uid group extraGroups home shell createHome password; };
+        { inherit name description uid group extraGroups home shell createHome password isSystemUser; };
 
     in map addAttrs (defaultUsers ++ config.users.extraUsers);
 
@@ -104,7 +106,7 @@ let
 
   # Note: the 'X' in front of the password is to distinguish between
   # having an empty password, and not having a password.
-  serializedUser = u: "${u.name}\n${u.description}\n${toString u.uid}\n${u.group}\n${toString (concatStringsSep "," u.extraGroups)}\n${u.home}\n${u.shell}\n${toString u.createHome}\n${if u.password != null then "X" + u.password else ""}\n";
+  serializedUser = u: "${u.name}\n${u.description}\n${toString u.uid}\n${u.group}\n${toString (concatStringsSep "," u.extraGroups)}\n${u.home}\n${u.shell}\n${toString u.createHome}\n${if u.password != null then "X" + u.password else ""}\n${toString u.isSystemUser}\n";
   serializedGroup = g: "${g.name}\n${toString g.gid}";
   
   # keep this extra file so that cat can be used to pass special chars such as "`" which is used in the avahi daemon
@@ -186,9 +188,10 @@ in
             read shell
             read createHome
             read password
+            read isSystemUser
 
             if ! curEnt=$(getent passwd "$name"); then
-                useradd --system \
+                useradd ''${isSystemUser:+--system} \
                     --comment "$description" \
                     ''${uid:+--uid $uid} \
                     --gid "$group" \
-- 
GitLab


From bf00977ce1c5b5ac5f1c439287c06357abe949a9 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 27 Jun 2011 10:15:26 +0000
Subject: [PATCH 3025/5331] =?UTF-8?q?*=20Add=20an=20option=20=E2=80=98serv?=
 =?UTF-8?q?ices.postgresql.extraConfig=E2=80=99.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

svn path=/nixos/trunk/; revision=27550
---
 modules/services/databases/postgresql.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/modules/services/databases/postgresql.nix b/modules/services/databases/postgresql.nix
index 56e98e4a3f9..8a18020309b 100644
--- a/modules/services/databases/postgresql.nix
+++ b/modules/services/databases/postgresql.nix
@@ -32,6 +32,7 @@ let
       hba_file = '${pkgs.writeText "pg_hba.conf" cfg.authentication}'
       ident_file = '${pkgs.writeText "pg_ident.conf" cfg.identMap}'
       log_destination = 'syslog'
+      ${cfg.extraConfig}
     '';  
 
 in
@@ -122,6 +123,10 @@ in
         # libdir explicitely.
       };
       
+      extraConfig = mkOption {
+        default = "";
+        description = "Additional text to be appended to <filename>postgresql.conf</filename>.";
+      };
     };
 
   };
-- 
GitLab


From 1d09ad240a5a0641fd2f6574b8211ccd5361ae3d Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 4 Jul 2011 15:51:38 +0000
Subject: [PATCH 3026/5331] * Don't set defaultSkin to "default" because that's
 a horrible skin   (does it even exist?).  Use "" instead (which is really
 "monobook").

svn path=/nixos/trunk/; revision=27604
---
 modules/services/web-servers/apache-httpd/mediawiki.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/services/web-servers/apache-httpd/mediawiki.nix b/modules/services/web-servers/apache-httpd/mediawiki.nix
index 2c592c00634..c5c892825f4 100644
--- a/modules/services/web-servers/apache-httpd/mediawiki.nix
+++ b/modules/services/web-servers/apache-httpd/mediawiki.nix
@@ -254,9 +254,9 @@ in
     };
 
     defaultSkin = mkOption {
-      default = "standard";
+      default = "";
       example = "nostalgia";
-      description = "Default skin: you can change the default skin.";
+      description = "Set this value to change the default skin used by MediaWiki.";
     };
 
     extraConfig = mkOption {
-- 
GitLab


From 3bc3dc3940ba7079ca76341ade31c6c6a7580a9f Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 5 Jul 2011 12:51:46 +0000
Subject: [PATCH 3027/5331] =?UTF-8?q?*=20Put=20the=20NixOS=20firewall=20ru?=
 =?UTF-8?q?leset=20in=20its=20own=20chain=20(=E2=80=98nixos-fw=E2=80=99).?=
 =?UTF-8?q?=20=20This=20=20=20should=20make=20it=20easier=20to=20compose?=
 =?UTF-8?q?=20with=20packages=20that=20set=20their=20own=20=20=20firewall?=
 =?UTF-8?q?=20rules,=20such=20as=20Nova=20or=20Libvirt.=20*=20Provide=20a?=
 =?UTF-8?q?=20chain=20for=20accepted=20packets=20(=E2=80=98nixos-fw-accept?=
 =?UTF-8?q?=E2=80=99),=20requested=20=20=20by=20Nicolas=20Pierron.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

svn path=/nixos/trunk/; revision=27607
---
 modules/services/networking/firewall.nix | 139 +++++++++++++++++------
 1 file changed, 102 insertions(+), 37 deletions(-)

diff --git a/modules/services/networking/firewall.nix b/modules/services/networking/firewall.nix
index 50790ba3135..83cb1ad0817 100644
--- a/modules/services/networking/firewall.nix
+++ b/modules/services/networking/firewall.nix
@@ -1,4 +1,24 @@
-# This module enables a simple firewall.
+/* This module enables a simple firewall.
+
+   The firewall can be customised in arbitrary ways by setting
+   ‘networking.firewall.extraCommands’.  For modularity, the firewall
+   uses several chains:
+
+   - ‘nixos-fw-input’ is the main chain for input packet processing.
+   
+   - ‘nixos-fw-log-refuse’ and ‘nixos-fw-refuse’ are called for
+     refused packets.  (The former jumps to the latter after logging
+     the packet.)  If you want additional logging, or want to accept
+     certain packets anyway, you can insert rules at the start of
+     these chain.
+
+   - ‘nixos-fw-accept’ is called for accepted packets.  If you want
+     additional logging, or want to reject certain packets anyway, you
+     can insert rules at the start of this chain.
+
+*/
+  
+
 
 { config, pkgs, ... }:
 
@@ -8,6 +28,15 @@ let
 
   cfg = config.networking.firewall;
 
+  helpers =
+    ''
+      # Helper command to manipulate both the IPv4 and IPv6 tables.
+      ip46tables() {
+        iptables "$@"
+        ip6tables "$@"
+      }
+    '';
+
 in
 
 {
@@ -36,7 +65,7 @@ in
     };
   
     networking.firewall.logRefusedPackets = mkOption {
-      default = false;
+      default = true;
       description =
         ''
           Whether to log all rejected or dropped incoming packets.
@@ -45,6 +74,17 @@ in
         '';
     };
 
+    networking.firewall.logRefusedUnicastsOnly = mkOption {
+      default = true;
+      description =
+        ''
+          If <option>networking.firewall.logRefusedPackets</option>
+          and this option are enabled, then only log packets
+          specifically directed at this machine, i.e., not broadcasts
+          or multicasts.
+        '';
+    };
+
     networking.firewall.rejectPackets = mkOption {
       default = false;
       description =
@@ -124,50 +164,72 @@ in
 
         preStart =
           ''
-            # Helper command to manipulate both the IPv4 and IPv6 tables.
-            ip46tables() {
-              iptables "$@"
-              ip6tables "$@"
-            }
+            ${helpers}
+            set -x
 
-            ip46tables -F INPUT
-            ip46tables -F FW_REFUSE || true
-            ip46tables -X # flush unused chains
-            ip46tables -P INPUT ACCEPT
+            # Flush the old firewall rules.  !!! Ideally, updating the
+            # firewall would be atomic.  Apparently that's possible
+            # with iptables-restore.
+            ip46tables -D INPUT -j nixos-fw || true
+            for chain in nixos-fw nixos-fw-accept nixos-fw-log-refuse nixos-fw-refuse FW_REFUSE; do
+              ip46tables -F "$chain" || true
+              ip46tables -X "$chain" || true
+            done
 
 
-            # The "FW_REFUSE" chain performs logging and
-            # rejecting/dropping of packets.
-            ip46tables -N FW_REFUSE
+            # The "nixos-fw-accept" chain just accepts packets.
+            ip46tables -N nixos-fw-accept
+            ip46tables -A nixos-fw-accept -j ACCEPT
 
-            ${optionalString cfg.logRefusedConnections ''
-              ip46tables -A FW_REFUSE -p tcp --syn -j LOG --log-level info --log-prefix "rejected connection: "
-            ''}
-            ${optionalString cfg.logRefusedPackets ''
-              ip46tables -A FW_REFUSE -j LOG --log-level info --log-prefix "rejected packet: "
-            ''}
 
+            # The "nixos-fw-refuse" chain rejects or drops packets.
+            ip46tables -N nixos-fw-refuse
+            
             ${if cfg.rejectPackets then ''
               # Send a reset for existing TCP connections that we've
               # somehow forgotten about.  Send ICMP "port unreachable"
               # for everything else.
-              ip46tables -A FW_REFUSE -p tcp ! --syn -j REJECT --reject-with tcp-reset
-              ip46tables -A FW_REFUSE -j REJECT
+              ip46tables -A nixos-fw-refuse -p tcp ! --syn -j REJECT --reject-with tcp-reset
+              ip46tables -A nixos-fw-refuse -j REJECT
             '' else ''
-              ip46tables -A FW_REFUSE -j DROP
+              ip46tables -A nixos-fw-refuse -j DROP
             ''}
 
 
+            # The "nixos-fw-log-refuse" chain performs logging, then
+            # jumps to the "nixos-fw-refuse" chain.
+            ip46tables -N nixos-fw-log-refuse
+
+            ${optionalString cfg.logRefusedConnections ''
+              ip46tables -A nixos-fw-log-refuse -p tcp --syn -j LOG --log-level info --log-prefix "rejected connection: "
+            ''}
+            ${optionalString (cfg.logRefusedPackets && !cfg.logRefusedUnicastsOnly) ''
+              ip46tables -A nixos-fw-log-refuse -m pkttype --pkt-type broadcast \
+                -j LOG --log-level info --log-prefix "rejected broadcast: "
+              ip46tables -A nixos-fw-log-refuse -m pkttype --pkt-type multicast \
+                -j LOG --log-level info --log-prefix "rejected multicast: "
+            ''}
+            ip46tables -A nixos-fw-log-refuse -m pkttype ! --pkt-type unicast -j nixos-fw-refuse
+            ${optionalString cfg.logRefusedPackets ''
+              ip46tables -A nixos-fw-log-refuse \
+                -j LOG --log-level info --log-prefix "rejected packet: "
+            ''}
+            ip46tables -A nixos-fw-log-refuse -j nixos-fw-refuse
+
+
+            # The "nixos-fw" chain does the actual work.
+            ip46tables -N nixos-fw
+            
             # Accept all traffic on the loopback interface.
-            ip46tables -A INPUT -i lo -j ACCEPT
+            ip46tables -A nixos-fw -i lo -j nixos-fw-accept
 
             # Accept packets from established or related connections.
-            ip46tables -A INPUT -m conntrack --ctstate ESTABLISHED,RELATED -j ACCEPT
+            ip46tables -A nixos-fw -m conntrack --ctstate ESTABLISHED,RELATED -j nixos-fw-accept
 
             # Accept connections to the allowed TCP ports.
             ${concatMapStrings (port:
                 ''
-                  ip46tables -A INPUT -p tcp --dport ${toString port} -j ACCEPT
+                  ip46tables -A nixos-fw -p tcp --dport ${toString port} -j nixos-fw-accept
                 ''
               ) cfg.allowedTCPPorts
             }
@@ -175,39 +237,42 @@ in
             # Accept packets on the allowed UDP ports.
             ${concatMapStrings (port:
                 ''
-                  ip46tables -A INPUT -p udp --dport ${toString port} -j ACCEPT
+                  ip46tables -A nixos-fw -p udp --dport ${toString port} -j nixos-fw-accept
                 ''
               ) cfg.allowedUDPPorts
             }
 
             # Accept IPv4 multicast.  Not a big security risk since
             # probably nobody is listening anyway.
-            iptables -A INPUT -d 224.0.0.0/4 -j ACCEPT
+            #iptables -A nixos-fw -d 224.0.0.0/4 -j nixos-fw-accept
 
             # Optionally respond to ICMPv4 pings.
             ${optionalString cfg.allowPing ''
-              iptables -A INPUT -p icmp --icmp-type echo-request -j ACCEPT
+              iptables -A nixos-fw -p icmp --icmp-type echo-request -j nixos-fw-accept
             ''}
 
             # Accept all ICMPv6 messages except redirects and node
             # information queries (type 139).  See RFC 4890, section
             # 4.4.
-            ip6tables -A INPUT -p icmpv6 --icmpv6-type redirect -j DROP
-            ip6tables -A INPUT -p icmpv6 --icmpv6-type 139 -j DROP
-            ip6tables -A INPUT -p icmpv6 -j ACCEPT
+            ip6tables -A nixos-fw -p icmpv6 --icmpv6-type redirect -j DROP
+            ip6tables -A nixos-fw -p icmpv6 --icmpv6-type 139 -j DROP
+            ip6tables -A nixos-fw -p icmpv6 -j nixos-fw-accept
 
             ${cfg.extraCommands}
 
             # Reject/drop everything else.
-            ip46tables -A INPUT -j FW_REFUSE
+            ip46tables -A nixos-fw -j nixos-fw-log-refuse
+
+
+            # Enable the firewall.
+            ip46tables -A INPUT -j nixos-fw
           '';
 
         postStop =
           ''
-            iptables -F INPUT
-            iptables -P INPUT ACCEPT
-            ip6tables -F INPUT
-            ip6tables -P INPUT ACCEPT
+            ${helpers}
+            ip46tables -D INPUT -j nixos-fw || true
+            #ip46tables -P INPUT ACCEPT
           '';
       };
 
-- 
GitLab


From 466d798b156bf0f394362933030c174cca863f43 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 5 Jul 2011 12:54:50 +0000
Subject: [PATCH 3028/5331] * Oops.

svn path=/nixos/trunk/; revision=27608
---
 modules/services/networking/firewall.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/services/networking/firewall.nix b/modules/services/networking/firewall.nix
index 83cb1ad0817..b4083d3c9e2 100644
--- a/modules/services/networking/firewall.nix
+++ b/modules/services/networking/firewall.nix
@@ -65,7 +65,7 @@ in
     };
   
     networking.firewall.logRefusedPackets = mkOption {
-      default = true;
+      default = false;
       description =
         ''
           Whether to log all rejected or dropped incoming packets.
-- 
GitLab


From 6857a28f0e1a3c599e4a4fae6f50c02fa584b683 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 7 Jul 2011 19:18:40 +0000
Subject: [PATCH 3029/5331] * Postfix needs TZ to be set, otherwise the
 generated headers are   wrong (reported by Peter Simons).

svn path=/nixos/trunk/; revision=27639
---
 modules/services/mail/postfix.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/modules/services/mail/postfix.nix b/modules/services/mail/postfix.nix
index 2cb07bd05c0..71f3a89f19c 100644
--- a/modules/services/mail/postfix.nix
+++ b/modules/services/mail/postfix.nix
@@ -315,6 +315,8 @@ in
 
         respawn = true;
 
+        environment.TZ = config.time.timeZone;
+
         script = ''
           while ${pkgs.procps}/bin/ps `${pkgs.coreutils}/bin/cat /var/postfix/queue/pid/master.pid` |
             grep -q postfix
-- 
GitLab


From ea84edd52860a583f9ad79529980694f8ae6aa19 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 12 Jul 2011 10:34:27 +0000
Subject: [PATCH 3030/5331] modules/services/networking/ssh/sshd.nix: added new
 boolean options usePAM and passwordAuthentication

Setting both of these options to 'false' configures the OpenSSH daemon to
reject password authentication, i.e. users must have an appropriate key in
~/.ssh/authorized_keys in order to be able to log in.

svn path=/nixos/trunk/; revision=27732
---
 modules/services/networking/ssh/sshd.nix | 23 +++++++++++++++++++++--
 1 file changed, 21 insertions(+), 2 deletions(-)

diff --git a/modules/services/networking/ssh/sshd.nix b/modules/services/networking/ssh/sshd.nix
index 0533201e021..66f2f0961b2 100644
--- a/modules/services/networking/ssh/sshd.nix
+++ b/modules/services/networking/ssh/sshd.nix
@@ -76,7 +76,25 @@ in
           Specifies on which ports the SSH daemon listens.
         '';
       };
-      
+
+      usePAM = mkOption {
+        default = true;
+        description = ''
+          Specifies whether the OpenSSH daemon uses PAM to authenticate
+          login attempts.
+        '';
+      };
+
+      passwordAuthentication = mkOption {
+        default = true;
+        description = ''
+          Specifies whether password authentication is allowed. Note
+          that setting this value to <literal>false</literal> is most
+          probably not going to have the desired effect unless
+          <literal>usePAM</literal> is disabled as well.
+        '';
+      };
+
       extraConfig = mkOption {
         default = "";
         description = "Verbatim contents of <filename>sshd_config</filename>.";
@@ -139,7 +157,7 @@ in
       ''
         Protocol 2
 
-        UsePAM yes
+        UsePAM ${if cfg.usePAM then "yes" else "no"}
 
         ${concatMapStrings (port: ''
           Port ${toString port}
@@ -158,6 +176,7 @@ in
 
         PermitRootLogin ${cfg.permitRootLogin}
         GatewayPorts ${cfg.gatewayPorts}
+        PasswordAuthentication ${if cfg.passwordAuthentication then "yes" else "no"}
       '';
 
   };
-- 
GitLab


From 0ffb794d5d76d066eac5f98a3ea5c7e7f0723ef2 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 12 Jul 2011 10:34:30 +0000
Subject: [PATCH 3031/5331] modules/services/networking/ssh/sshd.nix: strip
 trailing whitespace

svn path=/nixos/trunk/; revision=27733
---
 modules/services/networking/ssh/sshd.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/modules/services/networking/ssh/sshd.nix b/modules/services/networking/ssh/sshd.nix
index 66f2f0961b2..be1dac08022 100644
--- a/modules/services/networking/ssh/sshd.nix
+++ b/modules/services/networking/ssh/sshd.nix
@@ -19,9 +19,9 @@ in
 {
 
   ###### interface
-  
+
   options = {
-  
+
     services.openssh = {
 
       enable = mkOption {
@@ -99,7 +99,7 @@ in
         default = "";
         description = "Verbatim contents of <filename>sshd_config</filename>.";
       };
-      
+
     };
 
   };
@@ -144,7 +144,7 @@ in
 
         daemonType = "fork";
 
-        exec = 
+        exec =
           ''
             ${pkgs.openssh}/sbin/sshd -h /etc/ssh/ssh_host_dsa_key \
               -f ${pkgs.writeText "sshd_config" cfg.extraConfig}
-- 
GitLab


From c548597976f0026b14929d782a05b39ee0e86e73 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 12 Jul 2011 12:45:48 +0000
Subject: [PATCH 3032/5331] * Allow Git to find the CA bundle.

svn path=/nixos/trunk/; revision=27735
---
 modules/security/ca.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/modules/security/ca.nix b/modules/security/ca.nix
index efa32f5e8f3..4c7fe34389b 100644
--- a/modules/security/ca.nix
+++ b/modules/security/ca.nix
@@ -14,6 +14,7 @@ with pkgs.lib;
     environment.shellInit =
       ''
         export CURL_CA_BUNDLE=/etc/ca-bundle.crt
+        export GIT_SSL_CAINFO=/etc/ca-bundle.crt
       '';
       
   };
-- 
GitLab


From 0c68a3440ae94d79093d9a7ffb457df8e6a8f209 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 13 Jul 2011 12:18:23 +0000
Subject: [PATCH 3033/5331] modules/profiles/base.nix: add 'pkgs.sshfsFuse'

The sshfsFuse package -- which is part of the system profile already -- doesn't
work without fuse. It tries to run /var/setuid-wrappers/fusermount, which then
can't find fusermount. Adding fuse to the system profile remedies this problem.

svn path=/nixos/trunk/; revision=27754
---
 modules/profiles/base.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/modules/profiles/base.nix b/modules/profiles/base.nix
index 4cf39867ec6..078a3aedc3c 100644
--- a/modules/profiles/base.nix
+++ b/modules/profiles/base.nix
@@ -60,6 +60,7 @@
     pkgs.cryptsetup # needed for dm-crypt volumes
 
     # Some networking tools.
+    pkgs.fuse
     pkgs.sshfsFuse
     pkgs.socat
     pkgs.screen
-- 
GitLab


From e056880dc48e69af064b48ae4e8f1bd21f143080 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 13 Jul 2011 12:18:25 +0000
Subject: [PATCH 3034/5331] base.nix: strip trailing whitespace

svn path=/nixos/trunk/; revision=27755
---
 modules/profiles/base.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/profiles/base.nix b/modules/profiles/base.nix
index 078a3aedc3c..af256725198 100644
--- a/modules/profiles/base.nix
+++ b/modules/profiles/base.nix
@@ -25,7 +25,7 @@
       "pata_winbond"
 
       # SCSI support (incomplete).
-      "3w-9xxx" "3w-xxxx" "aic79xx" "aic7xxx" "arcmsr" 
+      "3w-9xxx" "3w-xxxx" "aic79xx" "aic7xxx" "arcmsr"
 
       # USB support, especially for booting from USB CD-ROM
       # drives.
-- 
GitLab


From fb1b0c0372271f9ba8c732d0cbbcda9002998799 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 13 Jul 2011 17:47:34 +0000
Subject: [PATCH 3035/5331] modules/services/monitoring/smartd.nix: added
 support for running smart daemon

Set "services.smartd.enable = true" to enable the service.

svn path=/nixos/trunk/; revision=27767
---
 modules/module-list.nix                |  3 +-
 modules/services/monitoring/smartd.nix | 48 ++++++++++++++++++++++++++
 2 files changed, 50 insertions(+), 1 deletion(-)
 create mode 100644 modules/services/monitoring/smartd.nix

diff --git a/modules/module-list.nix b/modules/module-list.nix
index ffc42eb0278..6bb0c916189 100644
--- a/modules/module-list.nix
+++ b/modules/module-list.nix
@@ -15,7 +15,7 @@
   ./hardware/network/intel-2100bg.nix
   ./hardware/network/intel-2200bg.nix
   ./hardware/network/intel-3945abg.nix
-  ./hardware/network/rt73.nix 
+  ./hardware/network/rt73.nix
   ./hardware/pcmcia.nix
   ./installer/generations-dir/generations-dir.nix
   ./installer/grub/grub.nix
@@ -83,6 +83,7 @@
   ./services/misc/virtualbox.nix
   ./services/monitoring/monit.nix
   ./services/monitoring/nagios/default.nix
+  ./services/monitoring/smartd.nix
   ./services/monitoring/systemhealth.nix
   ./services/monitoring/zabbix-agent.nix
   ./services/monitoring/zabbix-server.nix
diff --git a/modules/services/monitoring/smartd.nix b/modules/services/monitoring/smartd.nix
new file mode 100644
index 00000000000..bf523d4f3f8
--- /dev/null
+++ b/modules/services/monitoring/smartd.nix
@@ -0,0 +1,48 @@
+{ config, pkgs, ... }:
+
+with pkgs.lib;
+
+let
+
+  cfg = config.services.smartd;
+
+in
+
+{
+  ###### interface
+
+  options = {
+
+    services.smartd = {
+
+      enable = mkOption {
+        default = false;
+        type = types.bool;
+        example = "true";
+        description = ''
+          Run smartd from the smartmontools package.
+        '';
+      };
+
+    };
+
+  };
+
+
+  ###### implementation
+
+  config = mkIf cfg.enable {
+
+    jobs.smartd =
+      { description = "S.M.A.R.T. Daemon";
+
+        startOn = "started syslogd";
+
+        daemonType = "daemon";
+
+        exec = "${pkgs.smartmontools}/sbin/smartd";
+      };
+
+  };
+
+}
-- 
GitLab


From d7c4900420361dd8b2213b3df407887982f05cf0 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 13 Jul 2011 18:24:53 +0000
Subject: [PATCH 3036/5331] syslogd: extended configuration options

This commit adds the option 'services.syslogd.defaultConfig', which is
the main syslog.conf file used by the daemon. Like before, That file can
be extended by means of 'services.syslogd.extraConfig'. Users who want a
completely different configuration, however, can re-define defaultConfig
to their liking.

Furthermore, the option services.syslogd.tty' is now optional: setting
its value to the empty string "" disables logging to TTY altogether.

svn path=/nixos/trunk/; revision=27769
---
 modules/services/logging/syslogd.nix | 38 ++++++++++++++++++++--------
 1 file changed, 27 insertions(+), 11 deletions(-)

diff --git a/modules/services/logging/syslogd.nix b/modules/services/logging/syslogd.nix
index 64b158742ec..f6eb914b66e 100644
--- a/modules/services/logging/syslogd.nix
+++ b/modules/services/logging/syslogd.nix
@@ -4,9 +4,15 @@ with pkgs.lib;
 
 let
 
+  cfg = config.services.syslogd;
+
   syslogConf = pkgs.writeText "syslog.conf" ''
-    kern.warning;*.err;authpriv.none /dev/${config.services.syslogd.tty}
+    ${if (cfg.tty != "") then "kern.warning;*.err;authpriv.none /dev/${cfg.tty}" else ""}
+    ${cfg.defaultConfig}
+    ${cfg.extraConfig}
+  '';
 
+  defaultConf = ''
     # Send emergency messages to all users.
     *.emerg                       *
 
@@ -19,44 +25,54 @@ let
     *.crit                        /var/log/warn
 
     *.*;mail.none;local1.none    -/var/log/messages
-
-    ${config.services.syslogd.extraConfig}
   '';
-
 in
 
 {
   ###### interface
 
   options = {
-  
+
     services.syslogd = {
 
       tty = mkOption {
+        type = types.string;
         default = "tty10";
         description = ''
           The tty device on which syslogd will print important log
-          messages.
+          messages. Leave this option blank to disable tty logging.
+        '';
+      };
+
+      defaultConfig = mkOption {
+        type = types.string;
+        default = defaultConf;
+        description = ''
+          The default <filename>syslog.conf</filename> file configures a
+          fairly standard setup of log files, which can be extended by
+          means of <varname>extraConfig</varname>.
         '';
       };
 
       extraConfig = mkOption {
+        type = types.string;
         default = "";
         example = "news.* -/var/log/news";
         description = ''
-          Additional text appended to <filename>syslog.conf</filename>.
+          Additional text appended to <filename>syslog.conf</filename>,
+          i.e. the contents of <varname>defaultConfig</varname>.
         '';
       };
-      
+
     };
-    
+
   };
 
 
   ###### implementation
 
   config = {
-  
+
     jobs.syslogd =
       { description = "Syslog daemon";
 
@@ -70,5 +86,5 @@ in
       };
 
   };
-  
+
 }
-- 
GitLab


From c630e528739591351d851775a70f69e91d7d2d39 Mon Sep 17 00:00:00 2001
From: Sander van der Burg <s.vanderburg@tudelft.nl>
Date: Wed, 13 Jul 2011 20:58:48 +0000
Subject: [PATCH 3037/5331] Added MySQL replication support + 2 MySQL testcases
 (including replication)

svn path=/nixos/trunk/; revision=27771
---
 modules/services/databases/mysql.nix | 45 +++++++++++++++++++++-
 tests/default.nix                    |  2 +
 tests/mysql-replication.nix          | 57 ++++++++++++++++++++++++++++
 tests/mysql.nix                      | 22 +++++++++++
 tests/testdb.sql                     | 10 +++++
 5 files changed, 135 insertions(+), 1 deletion(-)
 create mode 100644 tests/mysql-replication.nix
 create mode 100644 tests/mysql.nix
 create mode 100644 tests/testdb.sql

diff --git a/modules/services/databases/mysql.nix b/modules/services/databases/mysql.nix
index 9c97a15d751..60410b133b2 100644
--- a/modules/services/databases/mysql.nix
+++ b/modules/services/databases/mysql.nix
@@ -14,6 +14,20 @@ let
     "--user=${cfg.user} --datadir=${cfg.dataDir} " +
     "--log-error=${cfg.logError} --pid-file=${pidFile}";
 
+  myCnf = pkgs.writeText "my.cnf"
+  ''
+    [mysqld]
+    ${optionalString (cfg.replication.role == "master" || cfg.replication.role == "slave") "log-bin=mysql-bin"}
+    ${optionalString (cfg.replication.role == "master" || cfg.replication.role == "slave") "server-id = ${toString cfg.replication.serverId}"}
+    ${optionalString (cfg.replication.role == "slave")
+    ''
+      master-host = ${cfg.replication.masterHost}
+      master-user = ${cfg.replication.masterUser}
+      master-password = ${cfg.replication.masterPassword}
+      master-port = ${toString cfg.replication.masterPort}
+    ''}
+  '';
+
 in
 
 {
@@ -81,6 +95,35 @@ in
         default = null;
 	description = "Path to a file containing the root password, modified on the first startup. Not specifying a root password will leave the root password empty.";	
       };
+      
+      replication = {
+        role = mkOption {
+	  default = "none";
+	  description = "Role of the MySQL server instance. Can be either: master, slave or none";
+	};
+	
+        serverId = mkOption {
+	  default = 1;
+	  description = "Id of the MySQL server instance. This number must be unique for each instance";
+	};
+	
+	masterHost = mkOption {
+	  description = "Hostname of the MySQL master server";
+	};
+	
+	masterUser = mkOption {
+	  description = "Username of the MySQL replication user";
+	};
+	
+	masterPassword = mkOption {
+	  description = "Password of the MySQL replication user";
+	};
+	
+	masterPort = mkOption {
+	  default = 3306;
+	  description = "Port number on which the MySQL master server runs";
+	};
+      };
     };
     
   };
@@ -115,7 +158,7 @@ in
             chown -R ${cfg.user} ${cfg.pidDir}
           '';
 
-        exec = "${mysql}/libexec/mysqld ${mysqldOptions}";
+        exec = "${mysql}/libexec/mysqld --defaults-extra-file=${myCnf} ${mysqldOptions}";
 	
 	postStart =
 	  ''
diff --git a/tests/default.nix b/tests/default.nix
index 9b0295236e3..767732b53b4 100644
--- a/tests/default.nix
+++ b/tests/default.nix
@@ -14,6 +14,8 @@ with import ../lib/testing.nix { inherit nixpkgs system; };
   kde4 = makeTest (import ./kde4.nix);
   login = makeTest (import ./login.nix);
   mpich = makeTest (import ./mpich.nix);
+  mysql = makeTest (import ./mysql.nix);
+  mysql_replication = makeTest (import ./mysql-replication.nix);
   nat = makeTest (import ./nat.nix);
   nfs = makeTest (import ./nfs.nix);
   openssh = makeTest (import ./openssh.nix);
diff --git a/tests/mysql-replication.nix b/tests/mysql-replication.nix
new file mode 100644
index 00000000000..836495a9e93
--- /dev/null
+++ b/tests/mysql-replication.nix
@@ -0,0 +1,57 @@
+{ pkgs, ... }:
+
+let
+  replicateUser = "replicate";
+  replicatePassword = "secret";
+in
+{
+  nodes = {
+    master = 
+      { pkgs, config, ... }:
+      
+      {
+        services.mysql.enable = true;
+	services.mysql.replication.role = "master";
+	services.mysql.initialDatabases = [ { name = "testdb"; schema = ./testdb.sql; } ];
+	services.mysql.initialScript = pkgs.writeText "initmysql"
+        ''
+	  create user '${replicateUser}'@'%' identified by '${replicatePassword}';
+          grant replication slave on *.* to '${replicateUser}'@'%';
+        '';
+      };
+    
+    slave1 =
+      { pkgs, config, nodes, ... }:
+      
+      {
+        services.mysql.enable = true;
+	services.mysql.replication.role = "slave";
+	services.mysql.replication.serverId = 2;
+	services.mysql.replication.masterHost = "${nodes.master.config.networking.hostName}";
+	services.mysql.replication.masterUser = replicateUser;
+	services.mysql.replication.masterPassword = replicatePassword;	
+      };
+      
+    slave2 =
+      { pkgs, config, nodes, ... }:
+      
+      {
+        services.mysql.enable = true;
+	services.mysql.replication.role = "slave";
+	services.mysql.replication.serverId = 3;
+	services.mysql.replication.masterHost = "${nodes.master.config.networking.hostName}";
+	services.mysql.replication.masterUser = replicateUser;
+	services.mysql.replication.masterPassword = replicatePassword;
+      };
+  };
+  
+  testScript = ''
+    startAll;
+    
+    $master->waitForJob("mysql");
+    $master->waitForJob("mysql");
+    $slave2->waitForJob("mysql");
+    $slave2->sleep(100); # Hopefully this is long enough!!
+    $slave2->mustSucceed("echo 'use testdb; select * from tests' | mysql -u root -N | grep 4");
+  '';
+}
diff --git a/tests/mysql.nix b/tests/mysql.nix
new file mode 100644
index 00000000000..cb8f1247909
--- /dev/null
+++ b/tests/mysql.nix
@@ -0,0 +1,22 @@
+{ pkgs, ... }:
+
+{
+  nodes = {
+    master = 
+      { pkgs, config, ... }:
+      
+      {
+        services.mysql.enable = true;
+	services.mysql.replication.role = "master";
+	services.mysql.initialDatabases = [ { name = "testdb"; schema = ./testdb.sql; } ];
+      };    
+  };
+  
+  testScript = ''
+    startAll;
+    
+    $master->waitForJob("mysql");
+    $master->sleep(10); # Hopefully this is long enough!!
+    $master->mustSucceed("echo 'use testdb; select * from tests' | mysql -u root -N | grep 4");
+  '';
+}
diff --git a/tests/testdb.sql b/tests/testdb.sql
new file mode 100644
index 00000000000..4fb28fea3df
--- /dev/null
+++ b/tests/testdb.sql
@@ -0,0 +1,10 @@
+create table tests
+( Id   INTEGER      NOT NULL,
+  Name VARCHAR(255) NOT NULL,
+  primary key(Id)
+);
+
+insert into tests values (1, 'a');
+insert into tests values (2, 'b');
+insert into tests values (3, 'c');
+insert into tests values (4, 'd');
-- 
GitLab


From aec0ee107c2c972600b684f7034c9cdd984351ce Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 14 Jul 2011 11:35:03 +0000
Subject: [PATCH 3038/5331] modules/services/logging/syslogd.nix: change type
 of 'tty' option to "uniq string"

svn path=/nixos/trunk/; revision=27774
---
 modules/services/logging/syslogd.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/services/logging/syslogd.nix b/modules/services/logging/syslogd.nix
index f6eb914b66e..b600d353fe5 100644
--- a/modules/services/logging/syslogd.nix
+++ b/modules/services/logging/syslogd.nix
@@ -36,7 +36,7 @@ in
     services.syslogd = {
 
       tty = mkOption {
-        type = types.string;
+        type = types.uniq types.string;
         default = "tty10";
         description = ''
           The tty device on which syslogd will print important log
-- 
GitLab


From 6034297c616f40246045770325dda3a5972d4c1f Mon Sep 17 00:00:00 2001
From: Sander van der Burg <s.vanderburg@tudelft.nl>
Date: Thu, 14 Jul 2011 14:42:22 +0000
Subject: [PATCH 3039/5331] Removed some silly Nix expression language usage

svn path=/nixos/trunk/; revision=27780
---
 tests/mysql-replication.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/mysql-replication.nix b/tests/mysql-replication.nix
index 836495a9e93..db72e45f685 100644
--- a/tests/mysql-replication.nix
+++ b/tests/mysql-replication.nix
@@ -27,7 +27,7 @@ in
         services.mysql.enable = true;
 	services.mysql.replication.role = "slave";
 	services.mysql.replication.serverId = 2;
-	services.mysql.replication.masterHost = "${nodes.master.config.networking.hostName}";
+	services.mysql.replication.masterHost = nodes.master.config.networking.hostName;
 	services.mysql.replication.masterUser = replicateUser;
 	services.mysql.replication.masterPassword = replicatePassword;	
       };
@@ -39,7 +39,7 @@ in
         services.mysql.enable = true;
 	services.mysql.replication.role = "slave";
 	services.mysql.replication.serverId = 3;
-	services.mysql.replication.masterHost = "${nodes.master.config.networking.hostName}";
+	services.mysql.replication.masterHost = nodes.master.config.networking.hostName;
 	services.mysql.replication.masterUser = replicateUser;
 	services.mysql.replication.masterPassword = replicatePassword;
       };
-- 
GitLab


From aa61363554f5430b6e5f8e835e00f82cb90cfd75 Mon Sep 17 00:00:00 2001
From: Sander van der Burg <s.vanderburg@tudelft.nl>
Date: Thu, 14 Jul 2011 14:52:43 +0000
Subject: [PATCH 3040/5331] Added MySQL tests

svn path=/nixos/trunk/; revision=27781
---
 release.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/release.nix b/release.nix
index 859880af42a..6f2807652ca 100644
--- a/release.nix
+++ b/release.nix
@@ -172,6 +172,8 @@ let
         kde4 = t.kde4.test;
         login = t.login.test;
         mpich = t.mpich.test;
+	mysql = t.mysql.test;
+	mysql_replication = t.mysql_replication.test;
         nat = t.nat.test;
         nfs = t.nfs.test;
         openssh = t.openssh.test;
-- 
GitLab


From 23d7a822f1f10396a2124452bc463b916a725da9 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sat, 16 Jul 2011 18:40:08 +0000
Subject: [PATCH 3041/5331] * Fix the path to mount in the rule in
 50-udev-default.rules that   mounts /sys/fs/fuse/connections.

svn path=/nixos/trunk/; revision=27802
---
 modules/services/hardware/udev.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/modules/services/hardware/udev.nix b/modules/services/hardware/udev.nix
index e84150d2492..afcc0c402d9 100644
--- a/modules/services/hardware/udev.nix
+++ b/modules/services/hardware/udev.nix
@@ -59,7 +59,8 @@ let
           --replace /sbin/blkid ${pkgs.utillinux}/sbin/blkid \
           --replace /sbin/mdadm ${pkgs.mdadm}/sbin/mdadm \
           --replace '$env{DM_SBIN_PATH}/blkid' ${pkgs.utillinux}/sbin/blkid \
-          --replace 'ENV{DM_SBIN_PATH}="/sbin"' 'ENV{DM_SBIN_PATH}="${pkgs.lvm2}/sbin"'
+          --replace 'ENV{DM_SBIN_PATH}="/sbin"' 'ENV{DM_SBIN_PATH}="${pkgs.lvm2}/sbin"' \
+          --replace /bin/mount ${pkgs.utillinux}/bin/mount
       done
 
       # If auto-configuration is disabled, then remove
-- 
GitLab


From 14636ba0574ef7f50c7a083fe93e7a2c4cb1ed95 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sat, 16 Jul 2011 19:27:45 +0000
Subject: [PATCH 3042/5331] * The Powers That Be have decided that there shall
 be a /run to   replace /var/run and /var/lock.  For instance, udev now keeps
 state   in /run/udev instead of /dev/.udev.  See

    http://lists.fedoraproject.org/pipermail/devel/2011-March/150031.html
    http://bugs.freestandards.org/show_bug.cgi?id=718

  So this patch creates /run as a tmpfs, and symlinks /var/run to /run
  and /var/lock to /run/lock.

  TODO: create /run in stage 1 and propagate it to stage 2.

svn path=/nixos/trunk/; revision=27803
---
 .../services/network-filesystems/samba.nix    |  2 --
 modules/system/boot/stage-2-init.sh           | 23 ++++++++++---------
 modules/system/upstart-events/shutdown.nix    |  2 +-
 3 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/modules/services/network-filesystems/samba.nix b/modules/services/network-filesystems/samba.nix
index e42316bf8bf..7ad597a9fa2 100644
--- a/modules/services/network-filesystems/samba.nix
+++ b/modules/services/network-filesystems/samba.nix
@@ -16,8 +16,6 @@ let
 
   setupScript =
     ''
-      mkdir -p /var/lock
-
       if ! test -d /home/smbd ; then
         mkdir -p /home/smbd
         chown ${user} /home/smbd
diff --git a/modules/system/boot/stage-2-init.sh b/modules/system/boot/stage-2-init.sh
index b00baf8a075..a9c54ec67a8 100644
--- a/modules/system/boot/stage-2-init.sh
+++ b/modules/system/boot/stage-2-init.sh
@@ -98,9 +98,7 @@ mkdir -m 0755 -p /etc/nixos
 
 
 # Miscellaneous boot time cleanup.
-rm -rf /var/run
-rm -rf /var/lock
-rm -rf /var/log/upstart
+rm -rf /run /var/run /var/lock /var/log/upstart
 
 #echo -n "cleaning \`/tmp'..."
 #rm -rf --one-file-system /tmp/*
@@ -123,14 +121,17 @@ rm -rf /nix/var/nix/chroots # recreated in activate-configuration.sh
 rm -rf /nix/var/nix/gcroots/tmp /nix/var/nix/temproots
 
 
-# Use a tmpfs for /var/run to ensure that / or /var can be unmounted
-# or at least remounted read-only during shutdown.  (Upstart 0.6
-# apparently uses nscd to do some name lookups, resulting in it
-# holding some mmap mapping to deleted files in /var/run/nscd.
-# Similarly, portmap and statd have open files in /var/run and are
-# needed during shutdown to unmount NFS volumes.)
-mkdir -m 0755 -p /var/run
-mount -t tmpfs -o "mode=755" none /var/run
+# Create a tmpfs on /run to hold runtime state for programs such as
+# udev.  
+mkdir -m 0755 -p /run
+mount -t tmpfs -o "mode=755" none /run
+mkdir -m 0700 -p /run/lock
+
+
+# For backwards compatibility, symlink /var/run to /run, and /var/lock
+# to /run/lock.
+ln -s /run /var/run
+ln -s /run/lock /var/lock
 
 
 # Clear the resume device.
diff --git a/modules/system/upstart-events/shutdown.nix b/modules/system/upstart-events/shutdown.nix
index 85ad601914d..cc89a97e88d 100644
--- a/modules/system/upstart-events/shutdown.nix
+++ b/modules/system/upstart-events/shutdown.nix
@@ -94,7 +94,7 @@ with pkgs.lib;
                   # Skip various special filesystems.  Non-existent
                   # mount points are typically tmpfs/aufs mounts from
                   # the initrd.
-                  if [ "$mp" = /proc -o "$mp" = /sys -o "$mp" = /dev -o "$device" = "rootfs" -o "$mp" = /var/run -o ! -e "$mp" ]; then continue; fi
+                  if [ "$mp" = /proc -o "$mp" = /sys -o "$mp" = /dev -o "$device" = "rootfs" -o "$mp" = /run -o "$mp" = /var/run -o "$mp" = /var/lock -o ! -e "$mp" ]; then continue; fi
               
                   echo "unmounting $mp..."
 
-- 
GitLab


From 6e7ce112bbc05ec1e967e6b54ab4b5cdb29e8f17 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sun, 17 Jul 2011 10:45:49 +0000
Subject: [PATCH 3043/5331] * Create /etc/shells.  KDM in KDE 4.7 requires it.

svn path=/nixos/trunk/; revision=27804
---
 modules/config/shells.nix | 23 +++++++++++++++++++++++
 modules/module-list.nix   |  1 +
 2 files changed, 24 insertions(+)
 create mode 100644 modules/config/shells.nix

diff --git a/modules/config/shells.nix b/modules/config/shells.nix
new file mode 100644
index 00000000000..53d445b0ead
--- /dev/null
+++ b/modules/config/shells.nix
@@ -0,0 +1,23 @@
+# This module creates /etc/shells, the file that defines the list of
+# permissible login shells for user accounts.
+
+{ config, pkgs, ... }:
+
+with pkgs.lib;
+
+{
+
+  config = {
+
+    environment.etc = singleton
+      { target = "shells";
+        source = pkgs.writeText "shells"
+          ''
+            /var/run/current-system/sw/bin/bash
+            /bin/sh
+          '';
+      };
+
+  };  
+
+}
diff --git a/modules/module-list.nix b/modules/module-list.nix
index 6bb0c916189..821d58a70fe 100644
--- a/modules/module-list.nix
+++ b/modules/module-list.nix
@@ -7,6 +7,7 @@
   ./config/no-x-libs.nix
   ./config/nsswitch.nix
   ./config/power-management.nix
+  ./config/shells.nix
   ./config/swap.nix
   ./config/system-path.nix
   ./config/timezone.nix
-- 
GitLab


From 6490c6ba21f5f16987a10d8460376d18a07c7685 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sun, 17 Jul 2011 10:52:40 +0000
Subject: [PATCH 3044/5331] * Don't use /tmp/kdm as the home directory for the
 kdm user - sounds   insecure. * Create /var/lib/kdm. * In kdmrc, set
 BootManager to "Grub2" if we're using GRUB 2.

svn path=/nixos/trunk/; revision=27805
---
 modules/services/x11/display-managers/kdm.nix | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/modules/services/x11/display-managers/kdm.nix b/modules/services/x11/display-managers/kdm.nix
index 2c5a720f815..613e15b0147 100644
--- a/modules/services/x11/display-managers/kdm.nix
+++ b/modules/services/x11/display-managers/kdm.nix
@@ -1,4 +1,4 @@
-{pkgs, config, ...}:
+{ config, pkgs, ... }:
 
 with pkgs.lib;
 
@@ -15,7 +15,7 @@ let
       HaltCmd=${config.system.build.upstart}/sbin/halt
       RebootCmd=${config.system.build.upstart}/sbin/reboot
       ${optionalString (config.system.boot.loader.id == "grub") ''
-        BootManager=Grub
+        BootManager=${if config.boot.loader.grub.version == 2 then "Grub2" else "Grub"}
       ''}
 
       [X-*-Core]
@@ -99,8 +99,11 @@ in
   
     services.xserver.displayManager.job =
       { execCmd =
-          (optionalString (config.system.boot.loader.id == "grub") "PATH=${config.system.build.grub}/sbin:$PATH ") +
-          "KDEDIRS=${kdebase_workspace} exec ${kdebase_workspace}/bin/kdm -config ${kdmrc} -nodaemon";
+          ''
+            mkdir -p /var/lib/kdm
+            ${(optionalString (config.system.boot.loader.id == "grub") "PATH=${config.system.build.grub}/sbin:$PATH ") +
+              "KDEDIRS=${kdebase_workspace} exec ${kdebase_workspace}/bin/kdm -config ${kdmrc} -nodaemon"}
+          '';
         logsXsession = true;
       };
 
@@ -109,8 +112,7 @@ in
     users.extraUsers = singleton
       { name = "kdm";
         uid = config.ids.uids.kdm;
-        description = "kdm user";
-        home = "/tmp/kdm";
+        description = "KDM user";
       };
 
   };
-- 
GitLab


From c971f2b1ac4c7e4854609060dcead154c628d31a Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sun, 17 Jul 2011 11:01:31 +0000
Subject: [PATCH 3045/5331] * Shut up some udev warnings.

svn path=/nixos/trunk/; revision=27806
---
 modules/services/hardware/udev.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/modules/services/hardware/udev.nix b/modules/services/hardware/udev.nix
index afcc0c402d9..23019ed8fa6 100644
--- a/modules/services/hardware/udev.nix
+++ b/modules/services/hardware/udev.nix
@@ -192,6 +192,7 @@ in
             echo "" > /proc/sys/kernel/hotplug || true
 
             mkdir -p /var/lib/udev/rules.d
+            touch /var/lib/udev/rules.d/70-persistent-cd.rules /var/lib/udev/rules.d/70-persistent-net.rules
 
             # Do the loading of additional stage 2 kernel modules.
             # Maybe this isn't the best place...
-- 
GitLab


From 63e9ece771d476aa857cb2459f2cdcd1bdc0f580 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sun, 17 Jul 2011 11:42:44 +0000
Subject: [PATCH 3046/5331] =?UTF-8?q?*=20Support=20booting=20into=20anothe?=
 =?UTF-8?q?r=20GRUB=20boot=20entry=20via=20=E2=80=98grub-reboot=E2=80=99.?=
 =?UTF-8?q?=20=20=20This=20requires=20grub.conf=20to=20honour=20the=20save?=
 =?UTF-8?q?d=5Fentry=20GRUB=20environment=20=20=20variable.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

svn path=/nixos/trunk/; revision=27807
---
 modules/installer/grub/grub-menu-builder.sh | 23 +++++++++++++++++++--
 1 file changed, 21 insertions(+), 2 deletions(-)

diff --git a/modules/installer/grub/grub-menu-builder.sh b/modules/installer/grub/grub-menu-builder.sh
index 1c5deab43aa..dfe19a9ffe6 100644
--- a/modules/installer/grub/grub-menu-builder.sh
+++ b/modules/installer/grub/grub-menu-builder.sh
@@ -59,8 +59,27 @@ GRUBEND
             cp -f @grub@/share/grub/unicode.pf2 /boot/grub/unicode.pf2
 	    cat > "$1" <<EOF
 # Automatically generated.  DO NOT EDIT THIS FILE!
-set default=@default@
-set timeout=@timeout@
+
+if [ -s \$prefix/grubenv ]; then
+  load_env
+fi
+
+# ‘grub-reboot’ sets a one-time saved entry, which we process here and
+# then delete.
+if [ "\${saved_entry}" ]; then
+  # The next line *has* to look exactly like this, otherwise KDM's
+  # reboot feature won't work properly with GRUB 2.
+  set default="\${saved_entry}"
+  set saved_entry=
+  set prev_saved_entry=
+  save_env saved_entry
+  save_env prev_saved_entry
+  set timeout=1
+else
+  set default=@default@
+  set timeout=@timeout@
+fi
+
 if loadfont $bootRoot/grub/unicode.pf2; then
   set gfxmode=640x480
   insmod gfxterm
-- 
GitLab


From c45356769e78b6c1658a570bd18366b510014951 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 18 Jul 2011 12:36:46 +0000
Subject: [PATCH 3047/5331] =?UTF-8?q?*=20/var/lib/kdm=20needs=20to=20be=20?=
 =?UTF-8?q?owned=20by=20=E2=80=98kdm=E2=80=99.=20*=20Set=20KDEDIRS=20prope?=
 =?UTF-8?q?rly=20in=20kdm.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

svn path=/nixos/trunk/; revision=27817
---
 modules/services/x11/display-managers/kdm.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/modules/services/x11/display-managers/kdm.nix b/modules/services/x11/display-managers/kdm.nix
index 613e15b0147..f82e83d7e49 100644
--- a/modules/services/x11/display-managers/kdm.nix
+++ b/modules/services/x11/display-managers/kdm.nix
@@ -100,9 +100,10 @@ in
     services.xserver.displayManager.job =
       { execCmd =
           ''
-            mkdir -p /var/lib/kdm
+            mkdir -m 0755 -p /var/lib/kdm
+            chown kdm /var/lib/kdm
             ${(optionalString (config.system.boot.loader.id == "grub") "PATH=${config.system.build.grub}/sbin:$PATH ") +
-              "KDEDIRS=${kdebase_workspace} exec ${kdebase_workspace}/bin/kdm -config ${kdmrc} -nodaemon"}
+              "KDEDIRS=/var/run/current-system/sw exec ${kdebase_workspace}/bin/kdm -config ${kdmrc} -nodaemon"}
           '';
         logsXsession = true;
       };
-- 
GitLab


From 68350e646db5b909c7e48e64217fac43935c98a8 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 18 Jul 2011 12:37:13 +0000
Subject: [PATCH 3048/5331] * Support KDE 4.7.

svn path=/nixos/trunk/; revision=27818
---
 .../services/x11/desktop-managers/kde4.nix    | 78 +++++++++++++------
 1 file changed, 53 insertions(+), 25 deletions(-)

diff --git a/modules/services/x11/desktop-managers/kde4.nix b/modules/services/x11/desktop-managers/kde4.nix
index 411490d857b..5c5260cb01e 100644
--- a/modules/services/x11/desktop-managers/kde4.nix
+++ b/modules/services/x11/desktop-managers/kde4.nix
@@ -47,33 +47,61 @@ in
           '';
       };
 
-    security.setuidOwners = [ {
-      program = "kcheckpass";
-      source = "${pkgs.kde4.kdebase_workspace}/lib/kde4/libexec/kcheckpass";
-      owner = "root";
-      group = "root";
-      setuid = true;
-    } ];
+    security.setuidOwners = singleton
+      { program = "kcheckpass";
+        source = "${pkgs.kde4.kdebase_workspace}/lib/kde4/libexec/kcheckpass";
+        owner = "root";
+        group = "root";
+        setuid = true;
+      };
 
     environment.systemPackages =
-      [ # temporary workarounds
-        pkgs.shared_desktop_ontologies 
-        pkgs.strigi
-
-        pkgs.kde4.kdelibs
-        pkgs.kde4.kdebase
-        pkgs.kde4.kdebase_runtime
-        pkgs.kde4.kdebase_workspace
-        pkgs.kde4.oxygen_icons
-        pkgs.kde4.qt4 # needed for qdbus
-        pkgs.shared_mime_info
-        pkgs.gst_all.gstreamer
-        pkgs.gst_all.gstPluginsBase
-        pkgs.gst_all.gstPluginsGood
-        pkgs.gst_all.gstFfmpeg # for mp3 playback
-        xorg.xmessage # so that startkde can show error messages
-        xorg.xset # used by startkde, non-essential
-      ] ++ config.environment.kdePackages;
+      (if pkgs.kde4 ? kdebase then
+        # KDE <= 4.6
+        [ # temporary workarounds
+          pkgs.shared_desktop_ontologies 
+          pkgs.strigi
+
+          pkgs.kde4.kdelibs
+          pkgs.kde4.kdebase
+          pkgs.kde4.kdebase_runtime
+          pkgs.kde4.kdebase_workspace
+          pkgs.kde4.oxygen_icons
+          pkgs.kde4.qt4 # needed for qdbus
+          pkgs.shared_mime_info
+          pkgs.gst_all.gstreamer
+          pkgs.gst_all.gstPluginsBase
+          pkgs.gst_all.gstPluginsGood
+          pkgs.gst_all.gstFfmpeg # for mp3 playback
+          xorg.xmessage # so that startkde can show error messages
+          xorg.xset # used by startkde, non-essential
+        ]
+      else
+        # KDE >= 4.7
+        [ pkgs.kde4.kdelibs
+          pkgs.kde4.kde_baseapps
+          pkgs.kde4.kde_runtime
+          pkgs.kde4.kde_workspace
+          pkgs.kde4.kde_wallpapers # contains kdm's default background
+          pkgs.kde4.oxygen_icons
+          pkgs.kde4.konsole
+          pkgs.kde4.kcolorchooser
+          pkgs.kde4.ksnapshot
+          pkgs.kde4.kate
+          pkgs.kde4.okular
+          pkgs.kde4.gwenview
+
+          # Phonon backends.
+          pkgs.kde4.phonon_backend_gstreamer
+          pkgs.gst_all.gstPluginsBase
+
+          # Miscellaneous runtime dependencies.
+          pkgs.kde4.qt4 # needed for qdbus
+          pkgs.shared_mime_info
+          xorg.xmessage # so that startkde can show error messages
+          xorg.xset # used by startkde, non-essential
+        ]
+      ) ++ config.environment.kdePackages;
 
     environment.pathsToLink = [ "/share" ];
 
-- 
GitLab


From 4e732874567c6c6196320580a0129bbbee15a9fb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Thu, 21 Jul 2011 07:42:05 +0000
Subject: [PATCH 3049/5331] Adding a syslog parameter to receive log from other
 devices through the network.

svn path=/nixos/trunk/; revision=27866
---
 modules/services/logging/syslogd.nix | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/modules/services/logging/syslogd.nix b/modules/services/logging/syslogd.nix
index b600d353fe5..083568b51e3 100644
--- a/modules/services/logging/syslogd.nix
+++ b/modules/services/logging/syslogd.nix
@@ -26,6 +26,9 @@ let
 
     *.*;mail.none;local1.none    -/var/log/messages
   '';
+
+  syslogdParameters = if cfg.enableNetworkInput then "-r " else "";
+
 in
 
 {
@@ -54,6 +57,14 @@ in
         '';
       };
 
+      enableNetworkInput = mkOption {
+        type = types.bool;
+        default = false;
+        description = ''
+          Accept logging through UDP. Option -r of syslogd(8).
+        '';
+      };
+
       extraConfig = mkOption {
         type = types.string;
         default = "";
@@ -82,7 +93,7 @@ in
 
         daemonType = "fork";
 
-        exec = "${pkgs.sysklogd}/sbin/syslogd -f ${syslogConf}";
+        exec = "${pkgs.sysklogd}/sbin/syslogd ${syslogdParameters} -f ${syslogConf}";
       };
 
   };
-- 
GitLab


From 7c6c50a3bff8dea7a3382b8c47e4395b193165e9 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 21 Jul 2011 11:16:46 +0000
Subject: [PATCH 3050/5331] * Nuke the KDE icon cache on login.

svn path=/nixos/trunk/; revision=27867
---
 modules/services/x11/desktop-managers/kde4.nix | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/modules/services/x11/desktop-managers/kde4.nix b/modules/services/x11/desktop-managers/kde4.nix
index 5c5260cb01e..68a3ea79413 100644
--- a/modules/services/x11/desktop-managers/kde4.nix
+++ b/modules/services/x11/desktop-managers/kde4.nix
@@ -42,6 +42,16 @@ in
         bgSupport = true;
         start =
           ''
+            # The KDE icon cache is supposed to update itself
+            # automatically, but it uses the timestamp on the icon
+            # theme directory as a trigger.  Since in Nix the
+            # timestamp is always the same, this doesn't work.  So as
+            # a workaround, nuke the icon cache on login.  This isn't
+            # perfect, since it may require logging out after
+            # installing new applications to update the cache.
+            # See http://lists-archives.org/kde-devel/26175-what-when-will-icon-cache-refresh.html
+            rm -fv $HOME/.kde/cache-*/icon-cache.kcache
+
             # Start KDE.
             exec ${pkgs.kde4.kdebase_workspace}/bin/startkde
           '';
-- 
GitLab


From 3a1b6266e4cae111d0c1e72f7dad5a20220be5fa Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 21 Jul 2011 19:32:15 +0000
Subject: [PATCH 3051/5331] modules/services/monitoring/smartd.nix: added
 services.smartd.devices option to configure list of devices to monitor

By default -- if this option is unset --, all connected devices will be
monitored. Hard-coding the list of devices is worth-while, though, because this
will also configure smartd to send e-mail messages to 'root' when a test fails.

svn path=/nixos/trunk/; revision=27888
---
 modules/services/monitoring/smartd.nix | 41 ++++++++++++++++++++++++--
 1 file changed, 39 insertions(+), 2 deletions(-)

diff --git a/modules/services/monitoring/smartd.nix b/modules/services/monitoring/smartd.nix
index bf523d4f3f8..94a01eafc57 100644
--- a/modules/services/monitoring/smartd.nix
+++ b/modules/services/monitoring/smartd.nix
@@ -6,6 +6,30 @@ let
 
   cfg = config.services.smartd;
 
+  smartdMail = pkgs.writeScript "smartdmail.sh" ''
+    #! /bin/sh
+    TMPNAM=/tmp/smartd-message.$$.tmp
+    if test -n "$SMARTD_ADDRESS"; then
+      echo  >"$TMPNAM" "From: smartd <root>"
+      echo >>"$TMPNAM" 'To: undisclosed-recipients:;'
+      echo >>"$TMPNAM" "Subject: $SMARTD_SUBJECT"
+      echo >>"$TMPNAM"
+      echo >>"$TMPNAM" "Failure on $SMARTD_DEVICESTRING: $SMARTD_FAILTYPE"
+      echo >>"$TMPNAM"
+      cat  >>"$TMPNAM"
+      ${pkgs.smartmontools}/sbin/smartctl >>"$TMPNAM" -a -d "$SMARTD_DEVICETYPE" "$SMARTD_DEVICE"
+      /var/setuid-wrappers/sendmail  <"$TMPNAM" -f "$SENDER" -i "$SMARTD_ADDRESS"
+    fi
+  '';
+
+  smartdConf = pkgs.writeText "smartd.conf" (concatMapStrings (device:
+    ''
+      ${device} -m root -M exec ${smartdMail}
+    ''
+    ) cfg.devices);
+
+  smartdFlags = if (cfg.devices == []) then "" else "--configfile=${smartdConf}";
+
 in
 
 {
@@ -20,10 +44,23 @@ in
         type = types.bool;
         example = "true";
         description = ''
-          Run smartd from the smartmontools package.
+          Run smartd from the smartmontools package. Note that e-mail
+          notifications will not be enabled unless you configure the list of
+          devices with <varname>services.smartd.devices</varname> as well.
         '';
       };
 
+      devices = mkOption {
+        default = [];
+        example = ["/dev/sda" "/dev/sdb"];
+        description = ''
+          List of devices to monitor. By default -- if this list is empty --,
+          smartd will monitor all devices connected to the machine at the time
+          it's being run. Configuring this option has the added benefit of
+          enabling e-mail notifications to "root" every time smartd detects an
+          error.
+        '';
+       };
     };
 
   };
@@ -40,7 +77,7 @@ in
 
         daemonType = "daemon";
 
-        exec = "${pkgs.smartmontools}/sbin/smartd";
+        exec = "${pkgs.smartmontools}/sbin/smartd --pidfile=/var/run/smartd.pid ${smartdFlags}";
       };
 
   };
-- 
GitLab


From 83846d8417e7c3d78dc2fb1091d2d8c59f35d4e7 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sat, 23 Jul 2011 01:30:36 +0000
Subject: [PATCH 3052/5331] * NixOS module for Udisks.

svn path=/nixos/trunk/; revision=27909
---
 modules/module-list.nix              |  1 +
 modules/services/hardware/udisks.nix | 38 ++++++++++++++++++++++++++++
 2 files changed, 39 insertions(+)
 create mode 100644 modules/services/hardware/udisks.nix

diff --git a/modules/module-list.nix b/modules/module-list.nix
index 821d58a70fe..b23eeea8797 100644
--- a/modules/module-list.nix
+++ b/modules/module-list.nix
@@ -62,6 +62,7 @@
   ./services/hardware/acpid.nix
   ./services/hardware/bluetooth.nix
   ./services/hardware/hal.nix
+  ./services/hardware/udisks.nix
   ./services/hardware/pcscd.nix
   ./services/hardware/udev.nix
   ./services/logging/klogd.nix
diff --git a/modules/services/hardware/udisks.nix b/modules/services/hardware/udisks.nix
new file mode 100644
index 00000000000..0b3dbe47d15
--- /dev/null
+++ b/modules/services/hardware/udisks.nix
@@ -0,0 +1,38 @@
+# Udisks daemon.
+
+{ config, pkgs, ... }:
+
+with pkgs.lib;
+
+{
+
+  ###### interface
+  
+  options = {
+  
+    services.udisks = {
+    
+      enable = mkOption {
+        default = false;
+        description = ''
+          Whether to enable support for Udisks, a DBus service that
+          allows applications to query and manipulate storage devices.
+        '';
+      };
+
+    };
+    
+  };
+
+
+  ###### implementation
+  
+  config = mkIf config.services.udisks.enable {
+
+    environment.systemPackages = [ pkgs.udisks ];
+
+    services.dbus.packages = [ pkgs.udisks ];
+
+  };
+
+}
-- 
GitLab


From 5a2d438f242e425f1828c0f412cc608ba2d459d6 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Sat, 23 Jul 2011 18:15:55 +0000
Subject: [PATCH 3053/5331] splashutils is already let-bound to
 kernelPackages.splashutils, so let's take advantage of it.

svn path=/nixos/trunk/; revision=27910
---
 modules/tasks/tty-backgrounds.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/tasks/tty-backgrounds.nix b/modules/tasks/tty-backgrounds.nix
index b77c6b9acf7..e64bc523945 100644
--- a/modules/tasks/tty-backgrounds.nix
+++ b/modules/tasks/tty-backgrounds.nix
@@ -83,7 +83,7 @@ in
   ###### implementation
 
   config = mkIf config.services.ttyBackgrounds.enable (
-  mkAssert (kernelPackages.splashutils != null) "
+  mkAssert (splashutils != null) "
     The kernelPackages does not provide splashutils, as required by ttyBackgrounds.
     Either provide kernelPackages with splashutils, or disable ttyBackgrounds.
   " {
-- 
GitLab


From e5dacbe6a84b86a4e8f2f005ef6ed906905a36cd Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Sat, 23 Jul 2011 18:46:16 +0000
Subject: [PATCH 3054/5331] Only turn ttyBackgrounds on by default when the
 kernel has splashutils

This way users won't need to add ttyBackgrounds.enable = false when upgrading to a new kernel, and if the kernel gets splashutils in the future ttyBackgrounds will be enabled automatically.

svn path=/nixos/trunk/; revision=27911
---
 modules/tasks/tty-backgrounds.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/tasks/tty-backgrounds.nix b/modules/tasks/tty-backgrounds.nix
index e64bc523945..265c7a57bf2 100644
--- a/modules/tasks/tty-backgrounds.nix
+++ b/modules/tasks/tty-backgrounds.nix
@@ -50,7 +50,7 @@ in
     services.ttyBackgrounds = {
 
       enable = mkOption {
-        default = true;
+        default = splashutils != null;
         description = ''
           Whether to enable graphical backgrounds for the virtual consoles.
         '';
-- 
GitLab


From d121bb15b5861eb5a4cff266f9b3e2dd545496ff Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Sat, 23 Jul 2011 23:01:39 +0000
Subject: [PATCH 3055/5331] Add a NixOS module for the rtl8192c firmware

svn path=/nixos/trunk/; revision=27913
---
 modules/hardware/network/rtl8192c.nix | 26 ++++++++++++++++++++++++++
 modules/module-list.nix               |  1 +
 2 files changed, 27 insertions(+)
 create mode 100644 modules/hardware/network/rtl8192c.nix

diff --git a/modules/hardware/network/rtl8192c.nix b/modules/hardware/network/rtl8192c.nix
new file mode 100644
index 00000000000..fe9644c23a2
--- /dev/null
+++ b/modules/hardware/network/rtl8192c.nix
@@ -0,0 +1,26 @@
+{pkgs, config, ...}:
+
+{
+
+  ###### interface
+
+  options = {
+  
+    networking.enableRTL8192cFirmware = pkgs.lib.mkOption {
+      default = false;
+      type = pkgs.lib.types.bool;
+      description = ''
+        Turn on this option if you want firmware for the RTL8192c (and related) NICs
+      '';
+    };
+
+  };
+
+
+  ###### implementation
+  
+  config = pkgs.lib.mkIf config.networking.enableRTL8192cFirmware {
+    hardware.firmware = [ pkgs.rtl8192cfw ];
+  };
+  
+}
diff --git a/modules/module-list.nix b/modules/module-list.nix
index b23eeea8797..369d942d7a6 100644
--- a/modules/module-list.nix
+++ b/modules/module-list.nix
@@ -17,6 +17,7 @@
   ./hardware/network/intel-2200bg.nix
   ./hardware/network/intel-3945abg.nix
   ./hardware/network/rt73.nix
+  ./hardware/network/rtl8192c.nix
   ./hardware/pcmcia.nix
   ./installer/generations-dir/generations-dir.nix
   ./installer/grub/grub.nix
-- 
GitLab


From a9f599154a9f37dee8d2853915b7a82de57a9ecd Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sun, 24 Jul 2011 22:07:58 +0000
Subject: [PATCH 3056/5331] =?UTF-8?q?*=20Remove=20stupid=20=E2=80=98librar?=
 =?UTF-8?q?yPath=E2=80=99=20entries=20from=20~/.config/Trolltech.conf=20?=
 =?UTF-8?q?=20=20that=20can=20randomly=20cause=20KDE=20to=20fail.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

svn path=/nixos/trunk/; revision=27925
---
 modules/services/x11/desktop-managers/kde4.nix | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/modules/services/x11/desktop-managers/kde4.nix b/modules/services/x11/desktop-managers/kde4.nix
index 68a3ea79413..439e8846947 100644
--- a/modules/services/x11/desktop-managers/kde4.nix
+++ b/modules/services/x11/desktop-managers/kde4.nix
@@ -21,7 +21,7 @@ in
 
     environment.kdePackages = mkOption {
       default = [];
-      example = [ pkgs.kde4.kdesdk ];
+      example = "[ pkgs.kde4.kdesdk ]";
       type = types.list types.package;
       description = "This option is obsolete.  Please use <option>environment.systemPackages</option> instead.";
     };
@@ -52,6 +52,17 @@ in
             # See http://lists-archives.org/kde-devel/26175-what-when-will-icon-cache-refresh.html
             rm -fv $HOME/.kde/cache-*/icon-cache.kcache
 
+            # Qt writes a weird ‘libraryPath’ line to
+            # ~/.config/Trolltech.conf that causes the KDE plugin
+            # paths of previous KDE invocations to be searched.
+            # Obviously using mismatching KDE libraries is potentially
+            # disastrous, so here we nuke references to the Nix store
+            # in Trolltech.conf.  A better solution would be to stop
+            # Qt from doing this wackiness in the first place.
+            if [ -e $HOME/.config/Trolltech.conf ]; then
+                sed -e '/nix\\store\|nix\/store/ d' -i $HOME/.config/Trolltech.conf
+            fi
+
             # Start KDE.
             exec ${pkgs.kde4.kdebase_workspace}/bin/startkde
           '';
@@ -110,6 +121,7 @@ in
           pkgs.shared_mime_info
           xorg.xmessage # so that startkde can show error messages
           xorg.xset # used by startkde, non-essential
+          xorg.xauth # used by kdesu
         ]
       ) ++ config.environment.kdePackages;
 
-- 
GitLab


From 1e5bd11a539b992f5bfc950563768a8b7f9b9713 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sun, 24 Jul 2011 23:36:30 +0000
Subject: [PATCH 3057/5331] * Create /run in the initrd and bind-mount it into
 the target root.   This allows Udev to share its database between stage 1 and
 2, which   in turn is expected by the LVM Udev rules.

svn path=/nixos/trunk/; revision=27926
---
 modules/system/boot/stage-1-init.sh |  7 ++++++-
 modules/system/boot/stage-2-init.sh | 12 ++++++++----
 modules/system/boot/stage-2.nix     | 14 +++++++-------
 3 files changed, 21 insertions(+), 12 deletions(-)

diff --git a/modules/system/boot/stage-1-init.sh b/modules/system/boot/stage-1-init.sh
index 53df49599f6..b61e130a1bb 100644
--- a/modules/system/boot/stage-1-init.sh
+++ b/modules/system/boot/stage-1-init.sh
@@ -54,6 +54,8 @@ mount -t proc none /proc
 mkdir -p /sys
 mount -t sysfs none /sys
 mount -t tmpfs -o "mode=0755,size=@devSize@" none /dev
+mkdir -p /run
+mount -t tmpfs none /run
 
 
 # Process the kernel command line.
@@ -310,7 +312,10 @@ if ! test -e "$targetRoot/$stage2Init" -o -L "$targetRoot/$stage2Init"; then
     fail
 fi
 
-mkdir -m 0755 -p $targetRoot/proc $targetRoot/sys $targetRoot/dev
+mkdir -m 0755 -p $targetRoot/proc $targetRoot/sys $targetRoot/dev $targetRoot/run
+
+# `switch_root' doesn't move /run yet, so we have to do it ourselves.
+mount --bind /run $targetRoot/run
 
 exec switch_root "$targetRoot" "$stage2Init"
 
diff --git a/modules/system/boot/stage-2-init.sh b/modules/system/boot/stage-2-init.sh
index a9c54ec67a8..5f3c4170be2 100644
--- a/modules/system/boot/stage-2-init.sh
+++ b/modules/system/boot/stage-2-init.sh
@@ -98,7 +98,7 @@ mkdir -m 0755 -p /etc/nixos
 
 
 # Miscellaneous boot time cleanup.
-rm -rf /run /var/run /var/lock /var/log/upstart
+rm -rf /var/run /var/lock /var/log/upstart
 
 #echo -n "cleaning \`/tmp'..."
 #rm -rf --one-file-system /tmp/*
@@ -122,9 +122,13 @@ rm -rf /nix/var/nix/gcroots/tmp /nix/var/nix/temproots
 
 
 # Create a tmpfs on /run to hold runtime state for programs such as
-# udev.  
-mkdir -m 0755 -p /run
-mount -t tmpfs -o "mode=755" none /run
+# udev (if stage 1 hasn't already done so).
+if ! mountpoint -q /run; then
+    rm -rf /run
+    mkdir -m 0755 -p /run
+    mount -t tmpfs -o "mode=755" none /run
+fi
+
 mkdir -m 0700 -p /run/lock
 
 
diff --git a/modules/system/boot/stage-2.nix b/modules/system/boot/stage-2.nix
index 8934a33cd04..42de07432c8 100644
--- a/modules/system/boot/stage-2.nix
+++ b/modules/system/boot/stage-2.nix
@@ -1,4 +1,4 @@
-{pkgs, config, ...}:
+{ config, pkgs, ... }:
 
 let
 
@@ -36,11 +36,10 @@ let
 
   };
 
-  inherit (pkgs) substituteAll writeText coreutils utillinux udev;
   kernel = config.boot.kernelPackages.kernel;
   activateConfiguration = config.system.activationScripts.script;
 
-  bootStage2 = substituteAll {
+  bootStage2 = pkgs.substituteAll {
     src = ./stage-2-init.sh;
     isExecutable = true;
     inherit kernel;
@@ -48,11 +47,12 @@ let
     ttyGid = config.ids.gids.tty;
     upstart = config.system.build.upstart;
     path =
-      [ coreutils
-        utillinux
-        udev
+      [ pkgs.coreutils
+        pkgs.utillinux
+        pkgs.udev
+        pkgs.sysvtools
       ];
-    postBootCommands = writeText "local-cmds"
+    postBootCommands = pkgs.writeText "local-cmds"
       ''
         ${config.boot.postBootCommands}
         ${config.powerManagement.powerUpCommands}
-- 
GitLab


From fcc9cf2d858e80b2e77f6d0d66e6d0e2dedf274b Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 25 Jul 2011 00:36:41 +0000
Subject: [PATCH 3058/5331] svn path=/nixos/trunk/; revision=27930

---
 modules/hardware/network/rtl8192c.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/hardware/network/rtl8192c.nix b/modules/hardware/network/rtl8192c.nix
index fe9644c23a2..f02948745bb 100644
--- a/modules/hardware/network/rtl8192c.nix
+++ b/modules/hardware/network/rtl8192c.nix
@@ -10,7 +10,7 @@
       default = false;
       type = pkgs.lib.types.bool;
       description = ''
-        Turn on this option if you want firmware for the RTL8192c (and related) NICs
+        Turn on this option if you want firmware for the RTL8192c (and related) NICs.
       '';
     };
 
-- 
GitLab


From 2e4acbcf8bf5b155f4bfaa9f45ca6716aa494671 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 25 Jul 2011 00:45:52 +0000
Subject: [PATCH 3059/5331] * Add a NixOS module for upower.

svn path=/nixos/trunk/; revision=27931
---
 modules/module-list.nix              |  1 +
 modules/services/hardware/udisks.nix |  4 +--
 modules/services/hardware/upower.nix | 38 ++++++++++++++++++++++++++++
 3 files changed, 41 insertions(+), 2 deletions(-)
 create mode 100644 modules/services/hardware/upower.nix

diff --git a/modules/module-list.nix b/modules/module-list.nix
index 369d942d7a6..d7fc7e2ec87 100644
--- a/modules/module-list.nix
+++ b/modules/module-list.nix
@@ -64,6 +64,7 @@
   ./services/hardware/bluetooth.nix
   ./services/hardware/hal.nix
   ./services/hardware/udisks.nix
+  ./services/hardware/upower.nix
   ./services/hardware/pcscd.nix
   ./services/hardware/udev.nix
   ./services/logging/klogd.nix
diff --git a/modules/services/hardware/udisks.nix b/modules/services/hardware/udisks.nix
index 0b3dbe47d15..4a97dae7fa0 100644
--- a/modules/services/hardware/udisks.nix
+++ b/modules/services/hardware/udisks.nix
@@ -15,8 +15,8 @@ with pkgs.lib;
       enable = mkOption {
         default = false;
         description = ''
-          Whether to enable support for Udisks, a DBus service that
-          allows applications to query and manipulate storage devices.
+          Whether to enable Udisks, a DBus service that allows
+          applications to query and manipulate storage devices.
         '';
       };
 
diff --git a/modules/services/hardware/upower.nix b/modules/services/hardware/upower.nix
new file mode 100644
index 00000000000..c529e8b3cdb
--- /dev/null
+++ b/modules/services/hardware/upower.nix
@@ -0,0 +1,38 @@
+# Upower daemon.
+
+{ config, pkgs, ... }:
+
+with pkgs.lib;
+
+{
+
+  ###### interface
+  
+  options = {
+  
+    services.upower = {
+    
+      enable = mkOption {
+        default = false;
+        description = ''
+          Whether to enable Upower, a DBus service that provides power
+          management support to applications.
+        '';
+      };
+
+    };
+    
+  };
+
+
+  ###### implementation
+  
+  config = mkIf config.services.upower.enable {
+
+    environment.systemPackages = [ pkgs.upower ];
+
+    services.dbus.packages = [ pkgs.upower ];
+
+  };
+
+}
-- 
GitLab


From 38fddb224318568f4e9ae5d99f305ac7869ddd02 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 25 Jul 2011 00:50:46 +0000
Subject: [PATCH 3060/5331] * The X server doesn't actually depend on HAL
 anymore.

svn path=/nixos/trunk/; revision=27932
---
 modules/services/x11/xserver.nix | 26 +++++++++-----------------
 1 file changed, 9 insertions(+), 17 deletions(-)

diff --git a/modules/services/x11/xserver.nix b/modules/services/x11/xserver.nix
index 0eb19fc9455..15240d65cee 100644
--- a/modules/services/x11/xserver.nix
+++ b/modules/services/x11/xserver.nix
@@ -328,18 +328,13 @@ in
 
   ###### implementation
 
-  config = mkIf cfg.enable (
-  mkAssert (config.services.hal.enable == true) "
-    The X server needs HAL running. Set services.hal.enable to true
-  " (
-  mkAssert (if cfg.startOpenSSHAgent
-            then !cfg.startGnuPGAgent
-            else (if cfg.startGnuPGAgent
-                  then !cfg.startOpenSSHAgent
-                  else true)) "
-    The OpenSSH agent and GnuPG agent cannot be started both.
-    Choose between `startOpenSSHAgent' and `startGnuPGAgent'.
-  " {
+  config = mkIf cfg.enable
+    (mkAssert (!(cfg.startOpenSSHAgent && cfg.startGnuPGAgent))
+      ''
+        The OpenSSH agent and GnuPG agent cannot be started both.
+        Choose between `startOpenSSHAgent' and `startGnuPGAgent'.
+      ''
+  {
 
     boot.extraModulePackages =
       optional (elem "nvidia" driverNames) kernelPackages.nvidia_x11 ++ 
@@ -381,11 +376,8 @@ in
     environment.pathsToLink =
       [ "/etc/xdg" "/share/xdg" "/share/applications" "/share/icons" "/share/pixmaps" ];
 
-    services.hal.enable = mkAlways cfg.enable;
-    services.hal.packages = optional (elem "virtualbox" driverNames) kernelPackages.virtualboxGuestAdditions;
-
     jobs.xserver =
-      { startOn = if cfg.autorun then "filesystem and stopped udevtrigger and started hal" else "";
+      { startOn = if cfg.autorun then "filesystem and stopped udevtrigger" else "";
  
         environment =
           { FONTCONFIG_FILE = "/etc/fonts/fonts.conf"; # !!! cleanup
@@ -534,6 +526,6 @@ in
         '')}
       '';
 
-  }));
+  });
 
 }
-- 
GitLab


From a1df35a590153b9ce679ca564fe9520f2c7bd643 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 25 Jul 2011 00:52:59 +0000
Subject: [PATCH 3061/5331] * Don't enable HAL by default anymore.  It's
 obsolete.  It's still   enabled by modules that need it (KDE < 4.7, Xfce). *
 Don't enable the PolicyKit module by default either, it's also   obsolete
 (replaced by PolKit).  It's still enabled if HAL is   enabled.

svn path=/nixos/trunk/; revision=27933
---
 modules/security/policykit.nix                 | 12 +++++++++++-
 modules/services/hardware/hal.nix              |  4 +++-
 modules/services/x11/desktop-managers/kde4.nix |  9 ++++++++-
 modules/services/x11/desktop-managers/xfce.nix |  2 ++
 4 files changed, 24 insertions(+), 3 deletions(-)

diff --git a/modules/security/policykit.nix b/modules/security/policykit.nix
index 39075dd760f..747ad24922e 100644
--- a/modules/security/policykit.nix
+++ b/modules/security/policykit.nix
@@ -19,7 +19,17 @@ in
 
 {
 
-  config = {
+  options = {
+  
+    security.policykit.enable = mkOption {
+      default = false;
+      description = "Enable PolicyKit (obsolete).";
+    };
+
+  };
+
+
+  config = mkIf config.security.policykit.enable {
 
     environment.systemPackages = [ pkgs.policykit ];
 
diff --git a/modules/services/hardware/hal.nix b/modules/services/hardware/hal.nix
index 25a24ce5e34..598475d79e7 100644
--- a/modules/services/hardware/hal.nix
+++ b/modules/services/hardware/hal.nix
@@ -26,7 +26,7 @@ in
     services.hal = {
     
       enable = mkOption {
-        default = true;
+        default = false;
         description = ''
           Whether to start the HAL daemon.
         '';
@@ -52,6 +52,8 @@ in
 
     services.hal.packages = [ hal pkgs.hal_info ];
 
+    security.policykit.enable = true;
+
     users.extraUsers = singleton
       { name = "haldaemon";
         uid = config.ids.uids.haldaemon;
diff --git a/modules/services/x11/desktop-managers/kde4.nix b/modules/services/x11/desktop-managers/kde4.nix
index 439e8846947..9cfbee8ecc7 100644
--- a/modules/services/x11/desktop-managers/kde4.nix
+++ b/modules/services/x11/desktop-managers/kde4.nix
@@ -8,6 +8,8 @@ let
   cfg = xcfg.desktopManager.kde4;
   xorg = pkgs.xorg;
 
+  isKDE47 = !(pkgs.kde4 ? kdebase);
+
 in
 
 {
@@ -77,7 +79,7 @@ in
       };
 
     environment.systemPackages =
-      (if pkgs.kde4 ? kdebase then
+      (if !isKDE47 then
         # KDE <= 4.6
         [ # temporary workarounds
           pkgs.shared_desktop_ontologies 
@@ -132,6 +134,11 @@ in
         target = "X11/xkb";
       };
 
+    # Enable required DBus services.
+    services.hal = mkIf (!isKDE47) { enable = true; };
+    services.udisks = mkIf isKDE47 { enable = true; };
+    services.upower = mkIf isKDE47 { enable = true; };
+    
   };
 
 }
diff --git a/modules/services/x11/desktop-managers/xfce.nix b/modules/services/x11/desktop-managers/xfce.nix
index 4e8689f7ca7..a9a0cd27e1a 100644
--- a/modules/services/x11/desktop-managers/xfce.nix
+++ b/modules/services/x11/desktop-managers/xfce.nix
@@ -74,6 +74,8 @@ in
     environment.pathsToLink =
       [ "/share/xfce4" "/share/themes" "/share/mime" ];
       
+    services.hal.enable = true;
+    
   };
 
 }
-- 
GitLab


From 7bdaedb465ed8a04ba8dbfc2a85c61c9a81ec164 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 26 Jul 2011 01:51:56 +0000
Subject: [PATCH 3062/5331] * Add a module to enable PulseAudio.  It causes all
 ALSA applications   to be rerouted to PulseAudio.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

  Note that this is distinct from the already existing module
  ‘services/audio/pulseaudio.nix’ that provides a system-wide
  PulseAudio daemon, which is usually not what you want.

svn path=/nixos/trunk/; revision=27958
---
 modules/config/pulseaudio.nix                 | 47 +++++++++++++++++++
 modules/module-list.nix                       |  1 +
 .../services/x11/desktop-managers/kde4.nix    |  7 +++
 3 files changed, 55 insertions(+)
 create mode 100644 modules/config/pulseaudio.nix

diff --git a/modules/config/pulseaudio.nix b/modules/config/pulseaudio.nix
new file mode 100644
index 00000000000..55270c29037
--- /dev/null
+++ b/modules/config/pulseaudio.nix
@@ -0,0 +1,47 @@
+{ config, pkgs, ... }:
+
+with pkgs.lib;
+
+{
+
+  options = {
+  
+    hardware.pulseaudio.enable = mkOption {
+      default = false;
+      description = ''
+        Whether to enable the PulseAudio sound server.
+      '';
+    };
+
+  };
+  
+
+  config = mkIf config.hardware.pulseaudio.enable {
+
+    environment.systemPackages =
+      [ pkgs.pulseaudio pkgs.alsaPlugins ];
+
+    environment.etc =
+      [ # Write an /etc/asound.conf that causes all ALSA applications to
+        # be re-routed to the PulseAudio server through ALSA's Pulse
+        # plugin.
+        { target = "asound.conf";
+          source = pkgs.writeText "asound.conf"
+            ''
+              pcm.!default {
+                type pulse
+                hint.description "Default Audio Device (via PulseAudio)"
+              }
+              ctl.!default {
+                type pulse
+              }
+            '';
+        }
+      ];
+
+    # Ensure that the ALSA Pulse plugin appears in ALSA's search path.
+    environment.pathsToLink = [ "lib/alsa-lib" ];
+
+  };
+
+}
diff --git a/modules/module-list.nix b/modules/module-list.nix
index d7fc7e2ec87..c2c8d4ee7ab 100644
--- a/modules/module-list.nix
+++ b/modules/module-list.nix
@@ -7,6 +7,7 @@
   ./config/no-x-libs.nix
   ./config/nsswitch.nix
   ./config/power-management.nix
+  ./config/pulseaudio.nix
   ./config/shells.nix
   ./config/swap.nix
   ./config/system-path.nix
diff --git a/modules/services/x11/desktop-managers/kde4.nix b/modules/services/x11/desktop-managers/kde4.nix
index 9cfbee8ecc7..5b68114135a 100644
--- a/modules/services/x11/desktop-managers/kde4.nix
+++ b/modules/services/x11/desktop-managers/kde4.nix
@@ -117,6 +117,11 @@ in
           # Phonon backends.
           pkgs.kde4.phonon_backend_gstreamer
           pkgs.gst_all.gstPluginsBase
+          pkgs.gst_all.gstPluginsGood
+          pkgs.gst_all.gstPluginsUgly
+          pkgs.gst_all.gstPluginsBad
+          pkgs.gst_all.gstFfmpeg # for mp3 playback
+          pkgs.gst_all.gstreamer # needed?
 
           # Miscellaneous runtime dependencies.
           pkgs.kde4.qt4 # needed for qdbus
@@ -138,6 +143,8 @@ in
     services.hal = mkIf (!isKDE47) { enable = true; };
     services.udisks = mkIf isKDE47 { enable = true; };
     services.upower = mkIf isKDE47 { enable = true; };
+
+    hardware.pulseaudio = mkIf isKDE47 { enable = true; };
     
   };
 
-- 
GitLab


From 8bf3c2c1bf4d01119bad0af269833f3af2e288f8 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 26 Jul 2011 13:00:43 +0000
Subject: [PATCH 3063/5331] * The implementation of the ALSA_PLUGIN_DIRS
 variable is buggy:   because it uses strtok() to modify the environment
 variable in   place, it only works correctly the first time it's called.  
 Subsequent calls only see the first directory listed in the   variable.  This
 causes applications such as Audacious to fail   because the Pulse plugin is
 not in the first directory.  However, we   don't actually need
 $ALSA_PLUGIN_DIRS, because /etc/asound.conf   allows the full path to the
 Pulse plugin to be specified.

svn path=/nixos/trunk/; revision=27960
---
 modules/config/pulseaudio.nix | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/modules/config/pulseaudio.nix b/modules/config/pulseaudio.nix
index 55270c29037..0d0dd829782 100644
--- a/modules/config/pulseaudio.nix
+++ b/modules/config/pulseaudio.nix
@@ -19,7 +19,7 @@ with pkgs.lib;
   config = mkIf config.hardware.pulseaudio.enable {
 
     environment.systemPackages =
-      [ pkgs.pulseaudio pkgs.alsaPlugins ];
+      [ pkgs.pulseaudio ];
 
     environment.etc =
       [ # Write an /etc/asound.conf that causes all ALSA applications to
@@ -28,10 +28,19 @@ with pkgs.lib;
         { target = "asound.conf";
           source = pkgs.writeText "asound.conf"
             ''
+              pcm_type.pulse {
+                lib ${pkgs.alsaPlugins}/lib/alsa-lib/libasound_module_pcm_pulse.so
+              }
+            
               pcm.!default {
                 type pulse
                 hint.description "Default Audio Device (via PulseAudio)"
               }
+              
+              ctl_type.pulse {
+                lib ${pkgs.alsaPlugins}/lib/alsa-lib/libasound_module_ctl_pulse.so
+              }
+            
               ctl.!default {
                 type pulse
               }
@@ -39,9 +48,6 @@ with pkgs.lib;
         }
       ];
 
-    # Ensure that the ALSA Pulse plugin appears in ALSA's search path.
-    environment.pathsToLink = [ "lib/alsa-lib" ];
-
   };
 
 }
-- 
GitLab


From 2aaff3aa067e9cca8537de6ded6bfb11165c3b4e Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 26 Jul 2011 14:13:07 +0000
Subject: [PATCH 3064/5331] * Restart polkitd in the activation script to force
 its configuration   to be reloaded.

svn path=/nixos/trunk/; revision=27962
---
 modules/security/polkit.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/modules/security/polkit.nix b/modules/security/polkit.nix
index 3723a621827..c7aa4cde668 100644
--- a/modules/security/polkit.nix
+++ b/modules/security/polkit.nix
@@ -52,7 +52,12 @@ in
       ''
         mkdir -p /var/lib/polkit-1/localauthority
         chmod 700 /var/lib/polkit-1{/localauthority,}
+
+        # Force polkitd to be restarted so that it reloads its
+        # configuration.
+        pkill -INT -u root -x polkitd
       '';
+      
   };
 
 }
-- 
GitLab


From 645205b6001176dd88ee4aaaa0cf0e2378f1f971 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 26 Jul 2011 14:14:10 +0000
Subject: [PATCH 3065/5331] * Add a module for rtkit.  The PulseAudio module
 enables rtkit to   acquire real-time priority.

svn path=/nixos/trunk/; revision=27963
---
 modules/config/pulseaudio.nix |  3 +++
 modules/misc/ids.nix          |  1 +
 modules/module-list.nix       |  1 +
 modules/security/rtkit.nix    | 39 +++++++++++++++++++++++++++++++++++
 4 files changed, 44 insertions(+)
 create mode 100644 modules/security/rtkit.nix

diff --git a/modules/config/pulseaudio.nix b/modules/config/pulseaudio.nix
index 0d0dd829782..35b7cbb0158 100644
--- a/modules/config/pulseaudio.nix
+++ b/modules/config/pulseaudio.nix
@@ -48,6 +48,9 @@ with pkgs.lib;
         }
       ];
 
+    # Allow PulseAudio to get realtime priority using rtkit.
+    security.rtkit.enable = true;
+      
   };
 
 }
diff --git a/modules/misc/ids.nix b/modules/misc/ids.nix
index 02c9cefc315..4181cd53ef8 100644
--- a/modules/misc/ids.nix
+++ b/modules/misc/ids.nix
@@ -63,6 +63,7 @@ in
     fourStore = 42;
     fourStoreEndpoint = 43;
     virtuoso = 44;
+    rtkit = 45;
 
     # When adding a uid, make sure it doesn't match an existing gid.
 
diff --git a/modules/module-list.nix b/modules/module-list.nix
index c2c8d4ee7ab..77acac42802 100644
--- a/modules/module-list.nix
+++ b/modules/module-list.nix
@@ -45,6 +45,7 @@
   ./security/pam_usb.nix
   ./security/policykit.nix
   ./security/polkit.nix
+  ./security/rtkit.nix
   ./security/setuid-wrappers.nix
   ./security/sudo.nix
   ./services/amqp/rabbitmq.nix
diff --git a/modules/security/rtkit.nix b/modules/security/rtkit.nix
new file mode 100644
index 00000000000..060ff87f9ea
--- /dev/null
+++ b/modules/security/rtkit.nix
@@ -0,0 +1,39 @@
+# A module for ‘rtkit’, a DBus system service that hands out realtime
+# scheduling priority to processes that ask for it.
+
+{ config, pkgs, ... }:
+
+with pkgs.lib;
+
+{
+
+  options = {
+  
+    security.rtkit.enable = mkOption {
+      default = false;
+      description = ''
+        Whether to enable the RealtimeKit system service, which hands
+        out realtime scheduling priority to user processes on
+        demand. For example, the PulseAudio server uses this to
+        acquire realtime priority.
+      '';
+    };
+
+  };
+  
+
+  config = mkIf config.security.rtkit.enable {
+
+    environment.systemPackages = [ pkgs.rtkit ];
+
+    services.dbus.packages = [ pkgs.rtkit ];
+
+    users.extraUsers = singleton
+      { name = "rtkit";
+        uid = config.ids.uids.rtkit;
+        description = "RealtimeKit daemon";
+      };
+
+  };
+
+}
-- 
GitLab


From aa5f5ed2e56b60f50d53eac06194046b04be089c Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 26 Jul 2011 14:19:06 +0000
Subject: [PATCH 3066/5331] * I should test first.

svn path=/nixos/trunk/; revision=27964
---
 modules/security/polkit.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/security/polkit.nix b/modules/security/polkit.nix
index c7aa4cde668..44acb1766f5 100644
--- a/modules/security/polkit.nix
+++ b/modules/security/polkit.nix
@@ -55,7 +55,7 @@ in
 
         # Force polkitd to be restarted so that it reloads its
         # configuration.
-        pkill -INT -u root -x polkitd
+        ${pkgs.procps}/bin/pkill -INT -u root -x polkitd
       '';
       
   };
-- 
GitLab


From 77c85b1de749879b6ff302168391d4b6641df8a1 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 26 Jul 2011 17:35:47 +0000
Subject: [PATCH 3067/5331] * Install /etc/pulse/default.pa and
 /etc/pulse/system.pa. * If PulseAudio is disabled in the NixOS config, then
 disable   autospawning of the PulseAudio server in /etc/pulse/client.conf.

svn path=/nixos/trunk/; revision=27966
---
 modules/config/pulseaudio.nix | 28 +++++++++++++++++++++++++---
 1 file changed, 25 insertions(+), 3 deletions(-)

diff --git a/modules/config/pulseaudio.nix b/modules/config/pulseaudio.nix
index 35b7cbb0158..8f2227461b5 100644
--- a/modules/config/pulseaudio.nix
+++ b/modules/config/pulseaudio.nix
@@ -2,6 +2,8 @@
 
 with pkgs.lib;
 
+let cfg = config.hardware.pulseaudio; in
+
 {
 
   options = {
@@ -16,12 +18,23 @@ with pkgs.lib;
   };
   
 
-  config = mkIf config.hardware.pulseaudio.enable {
+  config = mkIf cfg.enable {
 
     environment.systemPackages =
       [ pkgs.pulseaudio ];
 
-    environment.etc =
+    environment.etc = mkAlways (
+      [ # Create pulse/client.conf even if PulseAudio is disabled so
+        # that we can disable the autospawn feature in programs that
+        # are built with PulseAudio support (like KDE).
+        { target = "pulse/client.conf";
+          source = pkgs.writeText "client.conf"
+            ''
+              autospawn=${if cfg.enable then "yes" else "no"}
+            '';
+        }
+        
+      ] ++ optionals cfg.enable
       [ # Write an /etc/asound.conf that causes all ALSA applications to
         # be re-routed to the PulseAudio server through ALSA's Pulse
         # plugin.
@@ -46,7 +59,16 @@ with pkgs.lib;
               }
             '';
         }
-      ];
+
+        { target = "pulse/default.pa";
+          source = "${pkgs.pulseaudio}/etc/pulse/default.pa";
+        }
+
+        { target = "pulse/system.pa";
+          source = "${pkgs.pulseaudio}/etc/pulse/system.pa";
+        }
+
+      ]);
 
     # Allow PulseAudio to get realtime priority using rtkit.
     security.rtkit.enable = true;
-- 
GitLab


From 3fdc209978ea896265dd5c640f7e3a2c6cae5358 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 26 Jul 2011 18:16:24 +0000
Subject: [PATCH 3068/5331] * Start PulseAudio from the X session script.

svn path=/nixos/trunk/; revision=27967
---
 modules/services/x11/display-managers/default.nix | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/modules/services/x11/display-managers/default.nix b/modules/services/x11/display-managers/default.nix
index d2b01a61ba8..9b9c48c8889 100644
--- a/modules/services/x11/display-managers/default.nix
+++ b/modules/services/x11/display-managers/default.nix
@@ -57,6 +57,17 @@ let
           exec ${pkgs.consolekit}/bin/ck-launch-session "$0" "$sessionType"
       fi
 
+      # Start PulseAudio if enabled.
+      ${optionalString config.hardware.pulseaudio.enable ''
+        ${pkgs.pulseaudio}/bin/pulseaudio --start
+
+        # Publish access credentials in the root window.
+        ${pkgs.pulseaudio}/bin/pactl load-module module-x11-publish "display=$DISPLAY"
+
+        # Keep track of devices.  Mostly useful for Phonon/KDE.
+        ${pkgs.pulseaudio}/bin/pactl load-module module-device-manager "do_routing=1"
+      ''}
+
       # Handle being called by kdm.
       if test "''${1:0:1}" = /; then eval exec "$1"; fi
 
-- 
GitLab


From 3b374ea3265d7cada85a90d3217e86a695f1ea8a Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 26 Jul 2011 18:34:10 +0000
Subject: [PATCH 3069/5331] * Move PulseAudio initialisation below the re-exec
 to prevent it from   being started twice.

svn path=/nixos/trunk/; revision=27968
---
 modules/services/x11/display-managers/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/modules/services/x11/display-managers/default.nix b/modules/services/x11/display-managers/default.nix
index 9b9c48c8889..e17cb541af6 100644
--- a/modules/services/x11/display-managers/default.nix
+++ b/modules/services/x11/display-managers/default.nix
@@ -57,6 +57,9 @@ let
           exec ${pkgs.consolekit}/bin/ck-launch-session "$0" "$sessionType"
       fi
 
+      # Handle being called by kdm.
+      if test "''${1:0:1}" = /; then eval exec "$1"; fi
+
       # Start PulseAudio if enabled.
       ${optionalString config.hardware.pulseaudio.enable ''
         ${pkgs.pulseaudio}/bin/pulseaudio --start
@@ -68,9 +71,6 @@ let
         ${pkgs.pulseaudio}/bin/pactl load-module module-device-manager "do_routing=1"
       ''}
 
-      # Handle being called by kdm.
-      if test "''${1:0:1}" = /; then eval exec "$1"; fi
-
       # Load X defaults.
       if test -e ~/.Xdefaults; then
           ${xorg.xrdb}/bin/xrdb -merge ~/.Xdefaults
-- 
GitLab


From d1f1cfcd417624860311dc9418fab9006da99d98 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 26 Jul 2011 18:34:59 +0000
Subject: [PATCH 3070/5331] * Don't make PulseAudio a requirement for KDE, it
 works fine without   it (especially now that KDE doesn't try to start
 PulseAudio   automatically).

svn path=/nixos/trunk/; revision=27969
---
 modules/services/x11/desktop-managers/kde4.nix | 2 --
 1 file changed, 2 deletions(-)

diff --git a/modules/services/x11/desktop-managers/kde4.nix b/modules/services/x11/desktop-managers/kde4.nix
index 5b68114135a..c27633e04e2 100644
--- a/modules/services/x11/desktop-managers/kde4.nix
+++ b/modules/services/x11/desktop-managers/kde4.nix
@@ -144,8 +144,6 @@ in
     services.udisks = mkIf isKDE47 { enable = true; };
     services.upower = mkIf isKDE47 { enable = true; };
 
-    hardware.pulseaudio = mkIf isKDE47 { enable = true; };
-    
   };
 
 }
-- 
GitLab


From abb2779840884d582f929ade49da9f6eb7a2880d Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 26 Jul 2011 21:01:36 +0000
Subject: [PATCH 3071/5331] * The write_cd_rules script in udev needs udev in
 its $PATH.

svn path=/nixos/trunk/; revision=27970
---
 modules/services/hardware/udev.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/services/hardware/udev.nix b/modules/services/hardware/udev.nix
index 23019ed8fa6..7b4f86b93cb 100644
--- a/modules/services/hardware/udev.nix
+++ b/modules/services/hardware/udev.nix
@@ -180,7 +180,7 @@ in
     
     services.udev.packages = [ extraUdevRules ];
 
-    services.udev.path = [ pkgs.coreutils pkgs.gnused pkgs.gnugrep pkgs.utillinux ];
+    services.udev.path = [ pkgs.coreutils pkgs.gnused pkgs.gnugrep pkgs.utillinux pkgs.udev ];
 
     jobs.udev =
       { startOn = "startup";
-- 
GitLab


From e231543033135479f1ae881c70f760845c928be0 Mon Sep 17 00:00:00 2001
From: Nicolas Pierron <nicolas.b.pierron@gmail.com>
Date: Wed, 27 Jul 2011 20:55:28 +0000
Subject: [PATCH 3072/5331] Add new services: freepops, fuppes and ups.

svn path=/nixos/trunk/; revision=27977
---
 modules/module-list.nix                   |   3 +
 modules/services/audio/fuppes.nix         | 114 +++++++++
 modules/services/audio/fuppes/vfolder.cfg | 155 +++++++++++++
 modules/services/mail/freepops.nix        |  87 +++++++
 modules/services/monitoring/ups.nix       | 268 ++++++++++++++++++++++
 5 files changed, 627 insertions(+)
 create mode 100644 modules/services/audio/fuppes.nix
 create mode 100644 modules/services/audio/fuppes/vfolder.cfg
 create mode 100644 modules/services/mail/freepops.nix
 create mode 100644 modules/services/monitoring/ups.nix

diff --git a/modules/module-list.nix b/modules/module-list.nix
index 77acac42802..bf985fe5800 100644
--- a/modules/module-list.nix
+++ b/modules/module-list.nix
@@ -50,6 +50,7 @@
   ./security/sudo.nix
   ./services/amqp/rabbitmq.nix
   ./services/audio/alsa.nix
+  ./services/audio/fuppes.nix
   ./services/audio/pulseaudio.nix
   ./services/backup/hydra-mirror.nix
   ./services/backup/mysql-backup.nix
@@ -73,6 +74,7 @@
   ./services/logging/logrotate.nix
   ./services/logging/syslogd.nix
   ./services/mail/dovecot.nix
+  ./services/mail/freepops.nix
   ./services/mail/mail.nix
   ./services/mail/postfix.nix
   ./services/misc/autofs.nix
@@ -89,6 +91,7 @@
   ./services/misc/virtualbox.nix
   ./services/monitoring/monit.nix
   ./services/monitoring/nagios/default.nix
+  ./services/monitoring/ups.nix
   ./services/monitoring/smartd.nix
   ./services/monitoring/systemhealth.nix
   ./services/monitoring/zabbix-agent.nix
diff --git a/modules/services/audio/fuppes.nix b/modules/services/audio/fuppes.nix
new file mode 100644
index 00000000000..df73e62fc94
--- /dev/null
+++ b/modules/services/audio/fuppes.nix
@@ -0,0 +1,114 @@
+{config, pkgs, ...}:
+
+let
+  cfg = config.services.fuppesd;
+in
+
+with pkgs.lib;
+
+{
+  options = {
+    services.fuppesd = {
+      enable = mkOption {
+        default = false;
+        type = with types; bool;
+        description = ''
+          Enables Fuppes (UPnP A/V Media Server).  Can be used to watch
+          photos, video and listen to music from a phone/tv connected to the
+          local network.
+        '';
+      };
+
+      name = mkOption {
+        example = "Media Center";
+        type = with types; uniq string;
+        description = ''
+          Enables Fuppes (UPnP A/V Media Server).  Can be used to watch
+          photos, video and listen to music from a phone/tv connected to the
+          local network.
+        '';
+      };
+
+      log = {
+        level = mkOption {
+          default = 0;
+          example = 3;
+          type = with types; uniq int;
+          description = ''
+            Logging level of fuppes, An integer between 0 and 3.
+          '';
+        };
+
+        file = mkOption {
+          default = "/var/log/fuppes.log";
+          type = with types; uniq string;
+          description = ''
+            File which will contains the log produced by the daemon.
+          '';
+        };
+      };
+
+      config = mkOption {
+        example = "/etc/fuppes/fuppes.cfg";
+        type = with types; uniq string;
+        description = ''
+          Mutable configuration file which can be edited with the web
+          interface.  Due to possible modification, double quote the full
+          path of the filename stored in your filesystem to avoid attempts
+          to modify the content of the nix store.
+        '';
+      };
+
+      vfolder = mkOption {
+        default = ./fuppes/vfolder.cfg;
+        example = /etc/fuppes/vfolder.cfg;
+        description = ''
+          XML file describing the layout of virtual folder visible by the
+          client.
+        '';
+      };
+
+      database = mkOption {
+        default = "/var/lib/fuppes/fuppes.db";
+        type = with types; uniq string;
+        description = ''
+          Database file which index all shared files.
+        '';
+      };
+
+      ## At the moment, no plugins are packaged.
+      /*
+      plugins = mkOption {
+        type = with types; listOf package;
+        description = ''
+          List of Fuppes plugins.
+        '';
+      };
+      */
+
+      user = mkOption {
+        default = "root"; # The default is not secure.
+        example = "fuppes";
+        type = with types; uniq string;
+        description = ''
+          Name of the user which own the configuration files and under which
+          the fuppes daemon will be executed.
+        '';
+      };
+
+    };
+  };
+
+  config = mkIf cfg.enable {
+    jobs.fuppesd = {
+      description = "UPnP A/V Media Server. (${cfg.name})";
+      startOn = "ip-up";
+      daemonType = "fork";
+      exec = ''/var/setuid-wrappers/sudo -u ${cfg.user} -- ${pkgs.fuppes}/bin/fuppesd --friendly-name ${cfg.name} --log-level ${toString cfg.log.level} --log-file ${cfg.log.file} --config-file ${cfg.config} --vfolder-config-file ${cfg.vfolder} --database-file ${cfg.database}'';
+    };
+
+    services.fuppesd.name = mkDefault config.networking.hostName;
+
+    security.sudo.enable = true;
+  };
+}
diff --git a/modules/services/audio/fuppes/vfolder.cfg b/modules/services/audio/fuppes/vfolder.cfg
new file mode 100644
index 00000000000..35ec3bffeb0
--- /dev/null
+++ b/modules/services/audio/fuppes/vfolder.cfg
@@ -0,0 +1,155 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<fuppes_vfolder_config version="0.2">
+
+ <vfolder_layout device="default" enabled="false">
+
+    <vfolder name="Genre">
+      <vfolders property="genre">
+        <items type="audioItem" />
+      </vfolders>
+    </vfolder>
+
+    <vfolder name="Genre/Artists">
+      <vfolders property="genre">
+        <vfolders property="artist">
+          <items type="audioItem" />
+        </vfolders>
+      </vfolders>
+    </vfolder>
+
+    <vfolder name="Artists/Albums">
+      <vfolders property="artist">
+        <vfolders property="album">
+          <items type="audioItem" />
+        </vfolders>
+      </vfolders>
+    </vfolder> 
+    
+    <vfolder name="ABC/Artists/Albums">
+      <vfolders split="ABC">
+        <vfolders property="artist">
+          <vfolders property="album">
+            <items type="audioItem" />
+          </vfolders>
+        </vfolders>
+      </vfolders>
+    </vfolder>
+       
+    <vfolder name="Photos">
+      <vfolder name="All">
+        <items type="imageItem" />
+      </vfolder>
+      <vfolder name="Folders">
+        <folders filter="contains(imageItem)" />
+      </vfolder>      
+    </vfolder>
+
+    <vfolder name="Videos">
+      <vfolder name="All">
+        <items type="videoItem" />
+      </vfolder>
+      <vfolder name="Folders">
+        <folders filter="contains(videoItem)" />
+      </vfolder>
+    </vfolder>
+    
+    <vfolder name="shared dirs">
+      <shared_dirs full_extend="true" />
+    </vfolder>
+    
+  </vfolder_layout>
+
+  <vfolder_layout device="Xbox 360" enabled="false">
+
+    <vfolder name="Music" id="1">
+      <vfolder name="Album" id="7">
+        <vfolders property="album">
+          <items type="audioItem" />
+        </vfolders>
+      </vfolder>
+            
+      <vfolder name="All Music" id="4">
+        <items type="audioItem" />
+      </vfolder>
+      
+      <vfolder name="Artist" id="6">
+        <vfolders property="artist">
+          <items type="audioItem" />
+        </vfolders>
+      </vfolder>
+      
+      <vfolder name="Folders" id="20">
+        <folders filter="contains(audioItem)" />
+      </vfolder>
+      
+      <vfolder name="Genre" id="5">
+        <vfolders property="genre">
+          <items type="audioItem" />
+        </vfolders>
+      </vfolder>
+      
+      <vfolder name="Playlist" id="15" />
+    </vfolder>
+   
+    <vfolder name="Pictures" id="3">
+      <vfolder name="Album" id="13" />
+      
+      <vfolder name="All Pictures" id="11">
+        <items type="imageItem" />
+      </vfolder>
+      
+      <vfolder name="Date Taken" id="12" />
+      
+      <vfolder name="Folders" id="22">
+        <folders filter="contains(imageItem)" />
+      </vfolder>
+    </vfolder>
+
+    <vfolder name="Playlists" id="18">
+      <vfolder name="All Playlists" id="19" />
+      <vfolder name="Folders" id="23" />
+    </vfolder>
+
+    <vfolder name="Video" id="2">
+      <vfolder name="Actor" id="10" />
+      <vfolder name="Album" id="14" />
+      <vfolder name="All Video" id="8">
+				<items type="videoItem" />
+			</vfolder>
+      <vfolder name="Folders" id="21">
+			   <folders filter="contains(videoItem)" />
+			</vfolder>
+      <vfolder name="Genre" id="9" />
+    </vfolder>
+
+  </vfolder_layout>
+
+  <vfolder_layout device="Yamaha" enabled="false" create_references="true" >
+
+    <vfolder name="Playlists" />
+
+    <vfolder name="Artists">
+      <vfolders property="artist">
+        <items type="audioItem" />
+      </vfolders>
+    </vfolder>
+
+    <vfolder name="Albums">
+      <vfolders property="album">
+        <items type="audioItem" />
+      </vfolders>
+    </vfolder>
+
+    <vfolder name="Songs">
+      <items type="audioItem" />
+    </vfolder>
+
+    <vfolder name="Genres">
+      <vfolders property="genre">
+        <items type="audioItem" />
+      </vfolders>
+    </vfolder>
+
+  </vfolder_layout>
+
+</fuppes_vfolder_config>
diff --git a/modules/services/mail/freepops.nix b/modules/services/mail/freepops.nix
new file mode 100644
index 00000000000..9f8b93d3e33
--- /dev/null
+++ b/modules/services/mail/freepops.nix
@@ -0,0 +1,87 @@
+{config, pkgs, ...}:
+
+with pkgs.lib;
+
+let
+  cfg = config.services.mail.freepopsd;
+in
+
+{
+  options = {
+    services.mail.freepopsd = {
+      enable = mkOption {
+        default = false;
+        type = with types; bool;
+        description = ''
+          Enables Freepops, a POP3 webmail wrapper.
+        '';
+      };
+
+      port = mkOption {
+        default = 2000;
+        type = with types; uniq int;
+        description = ''
+          Port on which the pop server will listen.
+        '';
+      };
+
+      threads = mkOption {
+        default = 5;
+        type = with types; uniq int;
+        description = ''
+          Max simultaneous connections.
+        '';
+      };
+
+      bind = mkOption {
+        default = "0.0.0.0";
+        type = with types; uniq string;
+        description = ''
+          Bind over an IPv4 address instead of any.
+        '';
+      };
+
+      logFile = mkOption {
+        default = "/var/log/freepopsd";
+        example = "syslog";
+        type = with types; uniq string;
+        description = ''
+          Filename of the log file or syslog to rely on the logging daemon.
+        '';
+      };
+
+      suid = {
+        user = mkOption {
+          default = "nobody";
+          type = with types; uniq string;
+          description = ''
+            User name under which freepopsd will be after binding the port.
+          '';
+        };
+
+        group = mkOption {
+          default = "nogroup";
+          type = with types; uniq string;
+          description = ''
+            Group under which freepopsd will be after binding the port.
+          '';
+        };
+      };
+
+    };
+  };
+
+  config = mkIf cfg.enable {
+    jobs.freepopsd = {
+      description = "Freepopsd (webmail over POP3)";
+      startOn = "ip-up";
+      exec = ''${pkgs.freepops}/bin/freepopsd \
+        -p ${toString cfg.port} \
+        -t ${toString cfg.threads} \
+        -b ${cfg.bind} \
+        -vv -l ${cfg.logFile} \
+        -s ${cfg.suid.user}.${cfg.suid.group}
+      '';
+    };
+  };
+}
\ No newline at end of file
diff --git a/modules/services/monitoring/ups.nix b/modules/services/monitoring/ups.nix
new file mode 100644
index 00000000000..8dd80afe42c
--- /dev/null
+++ b/modules/services/monitoring/ups.nix
@@ -0,0 +1,268 @@
+{config, pkgs, ...}:
+
+# TODO: This is not secure, have a look at the file docs/security.txt inside
+# the project sources.
+with pkgs.lib;
+
+let
+  cfg = config.power.ups;
+in
+
+let
+  upsOptions = {name, config, ...}:
+  {
+    options = {
+      # This can be infered from the UPS model by looking at
+      # /nix/store/nut/share/driver.list
+      driver = mkOption {
+        type = types.uniq types.string;
+        description = ''
+          Specify the program to run to talk to this UPS.  apcsmart,
+          bestups, and sec are some examples.
+        '';
+      };
+
+      port = mkOption {
+        type = types.uniq types.string;
+        description = ''
+          The serial port where your UPS is connected.  /dev/ttyS0 is
+          usually the first port on Linux boxes, for example.
+        '';
+      };
+
+      shutdownOrder = mkOption {
+        default = 0;
+        type = types.uniq types.int;
+        description = ''
+          When you have multiple UPSes on your system, you usually need to
+          turn them off in a certain order.  upsdrvctl shuts down all the
+          0s, then the 1s, 2s, and so on.  To exclude a UPS from the
+          shutdown sequence, set this to -1.
+        '';
+      };
+
+      maxStartDelay = mkOption {
+        default = null;
+        type = types.uniq (types.nullOr types.int);
+        description = ''
+          This can be set as a global variable above your first UPS
+          definition and it can also be set in a UPS section.  This value
+          controls how long upsdrvctl will wait for the driver to finish
+          starting.  This keeps your system from getting stuck due to a
+          broken driver or UPS.
+        '';
+      };
+
+      description = mkOption {
+        default = "";
+        type = types.string;
+        description = ''
+          Description of the UPS.
+        '';
+      };
+
+      directives = mkOption {
+        default = [];
+        type = types.listOf types.string;
+        description = ''
+          List of configuration directives for this UPS.
+        '';
+      };
+
+      summary = mkOption {
+        default = "";
+        type = types.string;
+        description = ''
+          Lines which would be added inside ups.conf for handling this UPS.
+        '';
+      };
+
+    };
+
+    config = {
+      directives = mkHeader ([
+        "driver = ${config.driver}"
+        "port = ${config.port}"
+        ''desc = "${config.description}"''
+        "sdorder = ${toString config.shutdownOrder}"
+      ] ++ (optional (config.maxStartDelay != null)
+            "maxstartdelay = ${toString config.maxStartDelay}")
+      );
+
+      summary =
+        concatStringsSep "\n      "
+          (["[${name}]"] ++ config.directives);
+    };
+  };
+
+in
+
+
+{
+  options = {
+    # powerManagement.powerDownCommands
+
+    power.ups = {
+      enable = mkOption {
+        default = false;
+        type = with types; bool;
+        description = ''
+          Enables support for Power Devices, such as Uninterruptible Power
+          Supplies, Power Distribution Units and Solar Controllers.
+        '';
+      };
+
+      # This option is not used yet.
+      mode = mkOption {
+        default = "standalone";
+        type = types.uniq types.string;
+        description = ''
+          The MODE determines which part of the NUT is to be started, and
+          which configuration files must be modified.
+          
+          The values of MODE can be:
+
+          - none: NUT is not configured, or use the Integrated Power
+            Management, or use some external system to startup NUT
+            components. So nothing is to be started.
+
+          - standalone: This mode address a local only configuration, with 1
+            UPS protecting the local system. This implies to start the 3 NUT
+            layers (driver, upsd and upsmon) and the matching configuration
+            files. This mode can also address UPS redundancy.
+
+          - netserver: same as for the standalone configuration, but also
+            need some more ACLs and possibly a specific LISTEN directive in
+            upsd.conf.  Since this MODE is opened to the network, a special
+            care should be applied to security concerns.
+
+          - netclient: this mode only requires upsmon.
+        '';
+      };
+
+      schedulerRules = mkOption {
+        example = "/etc/nixos/upssched.conf";
+        type = types.uniq types.string;
+        description = ''
+          File which contains the rules to handle UPS events.
+        '';
+      };
+
+
+      maxStartDelay = mkOption {
+        default = 45;
+        type = types.uniq types.int;
+        description = ''
+          This can be set as a global variable above your first UPS
+          definition and it can also be set in a UPS section.  This value
+          controls how long upsdrvctl will wait for the driver to finish
+          starting.  This keeps your system from getting stuck due to a
+          broken driver or UPS.
+        '';
+      };
+
+      ups = mkOption {
+        default = {};
+        # see nut/etc/ups.conf.sample
+        description = ''
+          This is where you configure all the UPSes that this system will be
+          monitoring directly.  These are usually attached to serial ports,
+          but USB devices are also supported.
+        '';
+        type = types.attrsOf types.optionSet;
+        options = [ upsOptions ];
+      };
+
+    };
+  };
+
+  config = mkIf cfg.enable {
+
+    environment.systemPackages = [ pkgs.nut ];
+
+    jobs.upsmon = {
+      description = "Uninterruptible Power Supplies (Monitor)";
+      startOn = "ip-up";
+      daemonType = "fork";
+      exec = ''${pkgs.nut}/sbin/upsmon'';
+      environment.NUT_CONFPATH = "/etc/nut/";
+      environment.NUT_STATEPATH = "/var/lib/nut/";
+    };
+
+    jobs.upsd = {
+      description = "Uninterruptible Power Supplies (Daemon)";
+      startOn = "started network-interfaces and upsmon";
+      daemonType = "fork";
+      # TODO: replace 'root' by another username.
+      exec = ''${pkgs.nut}/sbin/upsd -u root'';
+      environment.NUT_CONFPATH = "/etc/nut/";
+      environment.NUT_STATEPATH = "/var/lib/nut/";
+    };
+
+    jobs.upsdrv = {
+      description = "Uninterruptible Power Supplies (Register all UPS)";
+      startOn = "started upsd";
+      # TODO: replace 'root' by another username.
+      exec = ''${pkgs.nut}/bin/upsdrvctl -u root start'';
+      task = true;
+      environment.NUT_CONFPATH = "/etc/nut/";
+      environment.NUT_STATEPATH = "/var/lib/nut/";
+    };
+
+    environment.etc = [
+      { source = pkgs.writeText "nut.conf"
+        ''
+          MODE = ${cfg.mode}
+        '';
+        target = "nut/nut.conf";
+      }
+      { source = pkgs.writeText "ups.conf"
+        ''
+          maxstartdelay = ${toString cfg.maxStartDelay}
+
+          ${flip concatStringsSep (flip map (attrValues cfg.ups) (ups: ups.summary)) "
+
+          "}
+        '';
+        target = "nut/ups.conf";
+      }
+      { source = cfg.schedulerRules;
+        target = "nut/upssched.conf";
+      }
+      # These file are containing private informations and thus should not
+      # be stored inside the Nix store.
+      /*
+      { source = ;
+        target = "nut/upsd.conf";
+      }
+      { source = ;
+        target = "nut/upsd.users";
+      }
+      { source = ;
+        target = "nut/upsmon.conf;
+      }
+      */
+    ];
+
+    power.ups.schedulerRules = mkDefault "${pkgs.nut}/etc/upssched.conf.sample";
+
+/*
+    users.extraUsers = [
+      { name = "nut";
+        uid = 84;
+        home = "/var/lib/nut";
+        createHome = true;
+        group = "nut";
+        description = "UPnP A/V Media Server user";
+      }
+    ];
+  
+    users.extraGroups = [
+      { name = "nut";
+        gid = 84;
+      }
+    ];
+*/
+
+  };
+}
-- 
GitLab


From ef63ea98f4fd69d9ebf83fda3004de2307974218 Mon Sep 17 00:00:00 2001
From: Nicolas Pierron <nicolas.b.pierron@gmail.com>
Date: Wed, 27 Jul 2011 20:55:35 +0000
Subject: [PATCH 3073/5331] Experiment with dual option types (list & attribute
 sets).

svn path=/nixos/trunk/; revision=27978
---
 modules/system/upstart/upstart.nix | 2 +-
 modules/tasks/filesystems.nix      | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/modules/system/upstart/upstart.nix b/modules/system/upstart/upstart.nix
index 7373bed5390..368405badc7 100644
--- a/modules/system/upstart/upstart.nix
+++ b/modules/system/upstart/upstart.nix
@@ -322,7 +322,7 @@ in
         This option defines the system jobs started and managed by the
         Upstart daemon.
       '';
-      type = types.attrsOf types.optionSet;
+      type = types.loaOf types.optionSet;
       options = [ jobOptions upstartJob ];
     };
   
diff --git a/modules/tasks/filesystems.nix b/modules/tasks/filesystems.nix
index 699e9b3c33c..053597a1a5d 100644
--- a/modules/tasks/filesystems.nix
+++ b/modules/tasks/filesystems.nix
@@ -50,7 +50,8 @@ in
         <command>mkdir -p</command> .
       ";
       
-      type = types.nullOr (types.list types.optionSet);
+      type = types.nullOr (types.loaOf types.optionSet);
+      apply = x: attrValues x;
 
       options = {
 
-- 
GitLab


From 66ffeb3fd9063938eb7f213810984cf6afe9063a Mon Sep 17 00:00:00 2001
From: Nicolas Pierron <nicolas.b.pierron@gmail.com>
Date: Wed, 27 Jul 2011 20:55:39 +0000
Subject: [PATCH 3074/5331] UPS: Make sure the driver pid files can be stored.

svn path=/nixos/trunk/; revision=27979
---
 modules/services/monitoring/ups.nix | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/modules/services/monitoring/ups.nix b/modules/services/monitoring/ups.nix
index 8dd80afe42c..b10788c96c4 100644
--- a/modules/services/monitoring/ups.nix
+++ b/modules/services/monitoring/ups.nix
@@ -246,6 +246,13 @@ in
 
     power.ups.schedulerRules = mkDefault "${pkgs.nut}/etc/upssched.conf.sample";
 
+    system.activationScripts.upsSetup = stringAfter [ "users" "groups" ]
+      ''
+        # Used to store pid files of drivers.
+        mkdir -p /var/state/ups
+      '';
+
+
 /*
     users.extraUsers = [
       { name = "nut";
-- 
GitLab


From 2dc81fc9dd3b3f3b8005a10f8c76a8015560492f Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 28 Jul 2011 09:41:07 +0000
Subject: [PATCH 3075/5331] * Shut up warnings about QEMU_OPTS being undefined.

svn path=/nixos/trunk/; revision=27982
---
 lib/test-driver/Machine.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/test-driver/Machine.pm b/lib/test-driver/Machine.pm
index 68b374c86aa..2c6646eee33 100644
--- a/lib/test-driver/Machine.pm
+++ b/lib/test-driver/Machine.pm
@@ -126,7 +126,7 @@ sub start {
         $ENV{QEMU_OPTS} =
             "-no-reboot -monitor unix:./monitor -chardev socket,id=shell,path=./shell " .
             "-device virtio-serial -device virtconsole,chardev=shell " .
-            ($showGraphics ? "-serial stdio" : "-nographic");
+            ($showGraphics ? "-serial stdio" : "-nographic") . " " . ($ENV{QEMU_OPTS} || "");
         $ENV{QEMU_KERNEL_PARAMS} = "hostTmpDir=$ENV{TMPDIR}";
         chdir $self->{stateDir} or die;
         exec $self->{startCommand};
-- 
GitLab


From 31afd2bb2e9a2d3474dfc9c3d61fb17e23985841 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 28 Jul 2011 09:42:20 +0000
Subject: [PATCH 3076/5331] * vsftpd: use /var/empty instead of /var/ftp/empty
 as the empty   chroot (the latter doesn't exist). * vsftpd: make the
 anonymous user's home read-only, otherwise vsftpd   will fail.

svn path=/nixos/trunk/; revision=27983
---
 modules/services/networking/vsftpd.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/services/networking/vsftpd.nix b/modules/services/networking/vsftpd.nix
index f891a92e7f5..837f44c4213 100644
--- a/modules/services/networking/vsftpd.nix
+++ b/modules/services/networking/vsftpd.nix
@@ -120,11 +120,11 @@ in
             background=NO
             listen=YES
             nopriv_user=vsftpd
-            secure_chroot_dir=/var/ftp/empty
+            secure_chroot_dir=/var/empty
             EOF
 
             ${if cfg.anonymousUser then ''
-              mkdir -p ${cfg.anonymousUserHome}
+              mkdir -p -m 555 ${cfg.anonymousUserHome}
               chown -R ftp:ftp ${cfg.anonymousUserHome}
             '' else ""}
           '';
-- 
GitLab


From 9df53632adc9e926f4c69b823728462e92197c97 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 28 Jul 2011 12:10:39 +0000
Subject: [PATCH 3077/5331] * Stupid timing sensitivity...

svn path=/nixos/trunk/; revision=27987
---
 tests/login.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tests/login.nix b/tests/login.nix
index cfc0b6c8f68..47649b47afc 100644
--- a/tests/login.nix
+++ b/tests/login.nix
@@ -14,6 +14,7 @@
       # Log in as alice on a virtual console.
       subtest "virtual console login", sub {
           $machine->waitForJob("tty1");
+          $machine->sleep(2); # urgh: wait for username prompt
           $machine->sendChars("alice\n");
           $machine->waitUntilSucceeds("pgrep login");
           $machine->sleep(2); # urgh: wait for `Password:'
-- 
GitLab


From fc9f6d03957ab11bceb39d8727c9ab6230f8152f Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 28 Jul 2011 16:35:13 +0000
Subject: [PATCH 3078/5331] svn path=/nixos/trunk/; revision=27991

---
 modules/services/x11/desktop-managers/kde4.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/services/x11/desktop-managers/kde4.nix b/modules/services/x11/desktop-managers/kde4.nix
index c27633e04e2..2616bd56a25 100644
--- a/modules/services/x11/desktop-managers/kde4.nix
+++ b/modules/services/x11/desktop-managers/kde4.nix
@@ -115,7 +115,7 @@ in
           pkgs.kde4.gwenview
 
           # Phonon backends.
-          pkgs.kde4.phonon_backend_gstreamer
+          pkgs.phonon_backend_gstreamer
           pkgs.gst_all.gstPluginsBase
           pkgs.gst_all.gstPluginsGood
           pkgs.gst_all.gstPluginsUgly
-- 
GitLab


From d0ad79958256512b96309f993b945cbf6e5e47e1 Mon Sep 17 00:00:00 2001
From: Rob Vermaas <rob.vermaas@gmail.com>
Date: Fri, 29 Jul 2011 14:55:42 +0000
Subject: [PATCH 3079/5331] bind mount /proc in chroot dureing image creation,
 to prevent some error

svn path=/nixos/trunk/; revision=28002
---
 modules/virtualisation/amazon-image.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/modules/virtualisation/amazon-image.nix b/modules/virtualisation/amazon-image.nix
index ca35480240e..109746b0f94 100644
--- a/modules/virtualisation/amazon-image.nix
+++ b/modules/virtualisation/amazon-image.nix
@@ -27,6 +27,8 @@ with pkgs.lib;
 
           # The initrd expects these directories to exist.
           mkdir /mnt/dev /mnt/proc /mnt/sys
+          
+          mount -o bind /proc /mnt/proc
 
           # Copy all paths in the closure to the filesystem.
           storePaths=$(perl ${pkgs.pathsFromGraph} $ORIG_TMPDIR/closure)
@@ -53,6 +55,7 @@ with pkgs.lib;
           # Generate the GRUB menu.
           chroot /mnt ${config.system.build.toplevel}/bin/switch-to-configuration boot
 
+          umount /mnt/proc
           umount /mnt
         ''
     );
-- 
GitLab


From 7d69a82b55416bd708ac9f19b291eb24a241d97e Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 29 Jul 2011 19:06:27 +0000
Subject: [PATCH 3080/5331] * Put the CA certificate bundle in /etc/ssl/certs
 because Qt expects   them there.

svn path=/nixos/trunk/; revision=28009
---
 modules/security/ca.nix | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/modules/security/ca.nix b/modules/security/ca.nix
index 4c7fe34389b..0ac4f565bd6 100644
--- a/modules/security/ca.nix
+++ b/modules/security/ca.nix
@@ -6,15 +6,21 @@ with pkgs.lib;
 
   config = {
 
-    environment.etc = singleton
-      { source = "${pkgs.cacert}/etc/ca-bundle.crt";
-        target = "ca-bundle.crt";
-      };
+    environment.etc =
+      [ { source = "${pkgs.cacert}/etc/ca-bundle.crt";
+          target = "ssl/certs/ca-bundle.crt";
+        }
+
+        # Backward compatibility; may remove at some point.
+        { source = "${pkgs.cacert}/etc/ca-bundle.crt";
+          target = "ca-bundle.crt";
+        }
+      ];
 
     environment.shellInit =
       ''
-        export CURL_CA_BUNDLE=/etc/ca-bundle.crt
-        export GIT_SSL_CAINFO=/etc/ca-bundle.crt
+        export CURL_CA_BUNDLE=/etc/ssl/certs/ca-bundle.crt
+        export GIT_SSL_CAINFO=/etc/ssl/certs/ca-bundle.crt
       '';
       
   };
-- 
GitLab


From af22531d38bef3768be99f50b2fb4a9105b76a7e Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sun, 31 Jul 2011 22:00:29 +0000
Subject: [PATCH 3081/5331] * Remove the hydra-mirror module from NixOS, it's
 too specialised.

svn path=/nixos/trunk/; revision=28024
---
 modules/module-list.nix                  |   1 -
 modules/services/backup/hydra-mirror.nix | 124 -----------------------
 2 files changed, 125 deletions(-)
 delete mode 100644 modules/services/backup/hydra-mirror.nix

diff --git a/modules/module-list.nix b/modules/module-list.nix
index bf985fe5800..fb3bea3b84e 100644
--- a/modules/module-list.nix
+++ b/modules/module-list.nix
@@ -52,7 +52,6 @@
   ./services/audio/alsa.nix
   ./services/audio/fuppes.nix
   ./services/audio/pulseaudio.nix
-  ./services/backup/hydra-mirror.nix
   ./services/backup/mysql-backup.nix
   ./services/backup/postgresql-backup.nix
   ./services/backup/sitecopy-backup.nix
diff --git a/modules/services/backup/hydra-mirror.nix b/modules/services/backup/hydra-mirror.nix
deleted file mode 100644
index 3239f8a9432..00000000000
--- a/modules/services/backup/hydra-mirror.nix
+++ /dev/null
@@ -1,124 +0,0 @@
-{ config, pkgs, ... }:
-
-with pkgs.lib;
-
-let 
-
-  cfg = config.services.hydraChannelMirror;
-
-  mirrorChannel = pkgs.fetchsvn {
-    url = https://svn.nixos.org/repos/nix/release/trunk/channels/mirror-channel.pl;
-    rev = 25210;
-    sha256 = "0gspqid1rpsj1z1mr29nakh7di278nlv6v2knafvmm3g8ah3yxgz";
-  };
-
-  cronjob = jobset:
-    "${cfg.period} ${cfg.user}"
-    + optionalString cfg.enableBinaryPatches " ENABLE_PATCHES=1"
-    + " perl -I${config.environment.nix}/libexec/nix -I${pkgs.perlPackages.DBI}/lib/perl5/site_perl -I${pkgs.perlPackages.DBDSQLite}/lib/perl5/site_perl ${mirrorChannel}"
-    + " ${cfg.hydraURL}/jobset/${jobset.project}/${jobset.jobset}/channel/latest"
-    + " ${cfg.dataDir}/${jobset.project}/channels/${jobset.name}"
-    + " ${cfg.dataDir}/nars"
-    + " ${cfg.mirrorURL}/nars"
-    + " ${cfg.dataDir}/patches"
-    + " ${cfg.mirrorURL}/patches"
-    + " ${if jobset.nixexprs == "" then "" else "${cfg.hydraURL}/job/${jobset.project}/${jobset.jobset}/${jobset.nixexprs}/latest/download-by-type/file/source-dist"}"
-    + " >> ${cfg.dataDir}/logs/${jobset.name}.log 2>&1\n";
-
-in
-
-{
-  options = {
-  
-    services.hydraChannelMirror = {
-
-      enable = mkOption {
-        default = false;
-        description = ''
-          Whether to enable Hydra channel mirroring.
-        '';
-      };
-
-      period = mkOption {
-        default = "15 * * * *";
-        description = ''
-          This option defines (in the format used by cron) when the
-          mirroring should occur.
-        '';
-      };
-
-      user = mkOption {
-        default = "hydra-mirror";
-        description = ''
-          User running the Hydra mirror script.
-        '';
-      };
-
-      jobsets = mkOption {
-        default = [ { name = "nixpkgs-unstable"; project = "nixpkgs"; jobset = "trunk"; nixexprs = "tarball"; } ];
-        description = ''
-          List of jobsets to mirror.
-        '';
-      };
- 
-      hydraURL = mkOption {
-        default = "http://hydra.nixos.org";
-        description = ''
-          Location (URL) of Hydra instance
-        '';
-      };
-
-      mirrorURL = mkOption {
-        default = "http://nixos.org/releases";
-        description = ''
-          Location (URL) of Hydra mirror
-        '';
-      };
-
-      dataDir = mkOption {
-        default = "/data/hydra-mirror";
-        description = ''
-          Location of Hydra mirror data
-        '';
-      };
-
-      enableBinaryPatches = mkOption {
-        default = false;
-        description = ''
-          Whether to enable generating binary patches for the mirrored channels.
-        '';
-      };
-    };
-
-  };
-
-  config = mkIf cfg.enable {
-  
-    users.extraUsers = singleton
-      { name = cfg.user; description = "Hydra mirror"; };
-
-    services.cron.systemCronJobs = map cronjob cfg.jobsets;
-
-    system.activationScripts.hydraChannelMirror = stringAfter [ "stdio" "users" ]
-      ''
-        mkdir -m 0755 -p ${cfg.dataDir}
-        chown ${cfg.user} ${cfg.dataDir}
-
-        mkdir -m 0755 -p ${cfg.dataDir}/nars
-        chown ${cfg.user} ${cfg.dataDir}/nars
-
-        mkdir -m 0755 -p ${cfg.dataDir}/patches
-        chown ${cfg.user} ${cfg.dataDir}/patches
-
-        mkdir -m 0755 -p ${cfg.dataDir}/logs
-        chown ${cfg.user} ${cfg.dataDir}/logs
-
-        ${concatMapStrings (j : ''
-          mkdir -m 0755 -p ${cfg.dataDir}/${j.project}/channels/${j.name}
-          chown ${cfg.user} ${cfg.dataDir}/${j.project}/channels/${j.name}
-        '') cfg.jobsets}
-      '';
-    
-  };
-  
-}
-- 
GitLab


From 44725e50f023af8c5ff74f12085422369b06bc65 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 1 Aug 2011 10:17:18 +0000
Subject: [PATCH 3082/5331] * Apply the resource limits set by
 security.pam.loginLimits to all PAM   services (rather than just login(1)). 
 It's rather unexpected if   resource limits are not applied to (say) users
 logged in via SSH or   X11.

svn path=/nixos/trunk/; revision=28105
---
 modules/programs/shadow.nix |  4 +---
 modules/security/pam.nix    | 16 +++++++---------
 2 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/modules/programs/shadow.nix b/modules/programs/shadow.nix
index 711156918df..81286d9bb5c 100644
--- a/modules/programs/shadow.nix
+++ b/modules/programs/shadow.nix
@@ -87,9 +87,7 @@ in
         { name = "groupmod"; rootOK = true; } 
         { name = "groupmems"; rootOK = true; }
         { name = "groupdel"; rootOK = true; }
-        { name = "login"; ownDevices = true; allowNullPassword = true;
-          limits = config.security.pam.loginLimits;
-        }
+        { name = "login"; ownDevices = true; allowNullPassword = true; }
       ];
       
     security.setuidPrograms = [ "passwd" "chfn" "su" ];
diff --git a/modules/security/pam.nix b/modules/security/pam.nix
index 589d7a6c6ac..4e50c661460 100644
--- a/modules/security/pam.nix
+++ b/modules/security/pam.nix
@@ -52,7 +52,7 @@ let
       # in.
       allowNullPassword ? false
     , # The limits, as per limits.conf(5).
-      limits ? []
+      limits ? config.security.pam.loginLimits
     }:
 
     { source = pkgs.writeText "${name}.pam"
@@ -132,13 +132,12 @@ in
        ];
 
      description =
-       '' Define resource limits that should apply to users or groups for the
-          <command>login</command> service.  Each item in the list should be
-          an attribute set with a <varname>domain</varname>,
-          <varname>type</varname>, <varname>item</varname>, and
-          <varname>value</varname> attribute.  The syntax and semantics of
-          these attributes must be that described in the limits.conf(5) man
-          page.
+       '' Define resource limits that should apply to users or groups.
+          Each item in the list should be an attribute set with a
+          <varname>domain</varname>, <varname>type</varname>,
+          <varname>item</varname>, and <varname>value</varname>
+          attribute.  The syntax and semantics of these attributes
+          must be that described in the limits.conf(5) man page.
        '';
     };
 
@@ -212,7 +211,6 @@ in
       setuid = true;
     } ];
 
-
     security.pam.services =
       # Most of these should be moved to specific modules.
       [ { name = "cups"; }
-- 
GitLab


From 7a7d781e6a031a35bec296c2861734835eb155e3 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 1 Aug 2011 13:26:51 +0000
Subject: [PATCH 3083/5331] * Allow the PulseAudio server to be overriden.

svn path=/nixos/trunk/; revision=28112
---
 modules/config/pulseaudio.nix | 19 ++++++++++++++++---
 1 file changed, 16 insertions(+), 3 deletions(-)

diff --git a/modules/config/pulseaudio.nix b/modules/config/pulseaudio.nix
index 8f2227461b5..943b300b9a7 100644
--- a/modules/config/pulseaudio.nix
+++ b/modules/config/pulseaudio.nix
@@ -15,13 +15,23 @@ let cfg = config.hardware.pulseaudio; in
       '';
     };
 
+    hardware.pulseaudio.package = mkOption {
+      default = pkgs.pulseaudio;
+      example = "pkgs.pulseaudio.override { jackaudioSupport = true; }";
+      description = ''
+        The PulseAudio derivation to use.  This can be used to enable
+        features (such as JACK support) that are not enabled in the
+        default PulseAudio in Nixpkgs.
+      '';
+    };
+
   };
   
 
   config = mkIf cfg.enable {
 
     environment.systemPackages =
-      [ pkgs.pulseaudio ];
+      [ cfg.package ];
 
     environment.etc = mkAlways (
       [ # Create pulse/client.conf even if PulseAudio is disabled so
@@ -31,6 +41,9 @@ let cfg = config.hardware.pulseaudio; in
           source = pkgs.writeText "client.conf"
             ''
               autospawn=${if cfg.enable then "yes" else "no"}
+              ${optionalString cfg.enable ''
+                daemon-binary=${cfg.package}/bin/pulseaudio
+              ''}
             '';
         }
         
@@ -61,11 +74,11 @@ let cfg = config.hardware.pulseaudio; in
         }
 
         { target = "pulse/default.pa";
-          source = "${pkgs.pulseaudio}/etc/pulse/default.pa";
+          source = "${cfg.package}/etc/pulse/default.pa";
         }
 
         { target = "pulse/system.pa";
-          source = "${pkgs.pulseaudio}/etc/pulse/system.pa";
+          source = "${cfg.package}/etc/pulse/system.pa";
         }
 
       ]);
-- 
GitLab


From d890e74d9c62f16c58472db6c594076e05924074 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 1 Aug 2011 14:28:28 +0000
Subject: [PATCH 3084/5331] * Hacks to keep KDE 4.5 working.  The latest D-Bus
 is more strict in   checking function arguments, so DBUS_FATAL_WARNINGS=0 is
 necessary   to prevent KDE from aborting.  Also put the Phonon gstreamer
 backend   in the environment if available.

svn path=/nixos/trunk/; revision=28113
---
 modules/services/x11/desktop-managers/kde4.nix | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/modules/services/x11/desktop-managers/kde4.nix b/modules/services/x11/desktop-managers/kde4.nix
index 2616bd56a25..3c353faf870 100644
--- a/modules/services/x11/desktop-managers/kde4.nix
+++ b/modules/services/x11/desktop-managers/kde4.nix
@@ -65,6 +65,10 @@ in
                 sed -e '/nix\\store\|nix\/store/ d' -i $HOME/.config/Trolltech.conf
             fi
 
+            ${optionalString (!isKDE47) ''
+              export DBUS_FATAL_WARNINGS=0
+            ''}
+
             # Start KDE.
             exec ${pkgs.kde4.kdebase_workspace}/bin/startkde
           '';
@@ -98,7 +102,7 @@ in
           pkgs.gst_all.gstFfmpeg # for mp3 playback
           xorg.xmessage # so that startkde can show error messages
           xorg.xset # used by startkde, non-essential
-        ]
+        ] ++ optional (pkgs ? phonon_backend_gstreamer) pkgs.phonon_backend_gstreamer
       else
         # KDE >= 4.7
         [ pkgs.kde4.kdelibs
-- 
GitLab


From 8aad8c536f544815d5af77d73d1fccf64bfd1e30 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 2 Aug 2011 06:52:10 +0000
Subject: [PATCH 3085/5331] * Make virtualisation.qemu.options a list.

svn path=/nixos/trunk/; revision=28120
---
 lib/build-vms.nix                  |  2 +-
 lib/qemu-flags.nix                 |  5 +++--
 modules/virtualisation/qemu-vm.nix | 10 ++++++----
 3 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/lib/build-vms.nix b/lib/build-vms.nix
index 913d5276db2..f151060344e 100644
--- a/lib/build-vms.nix
+++ b/lib/build-vms.nix
@@ -76,7 +76,7 @@ rec {
                          "${config.networking.hostName}\n"));
                   
                   virtualisation.qemu.options =
-                    lib.flip lib.concatMapStrings interfacesNumbered
+                    lib.flip map interfacesNumbered
                       ({ first, second }: qemuNICFlags second first m.second);
                 };
             }
diff --git a/lib/qemu-flags.nix b/lib/qemu-flags.nix
index 5d8e898c534..de355b08918 100644
--- a/lib/qemu-flags.nix
+++ b/lib/qemu-flags.nix
@@ -3,7 +3,8 @@
 {
 
   qemuNICFlags = nic: net: machine:
-    "-net nic,vlan=${toString nic},macaddr=52:54:00:12:${toString net}:${toString machine},model=virtio " +
-    "-net vde,vlan=${toString nic},sock=$QEMU_VDE_SOCKET_${toString net} ";
+    [ "-net nic,vlan=${toString nic},macaddr=52:54:00:12:${toString net}:${toString machine},model=virtio"
+      "-net vde,vlan=${toString nic},sock=$QEMU_VDE_SOCKET_${toString net}"
+    ];
 
 }
diff --git a/modules/virtualisation/qemu-vm.nix b/modules/virtualisation/qemu-vm.nix
index 91aeb950a15..4b29f38b420 100644
--- a/modules/virtualisation/qemu-vm.nix
+++ b/modules/virtualisation/qemu-vm.nix
@@ -109,8 +109,8 @@ let
 
     virtualisation.qemu.options =
       mkOption {
-        default = "";
-        example = "-vga std";
+        default = [];
+        example = [ "-vga std" ];
         description = "Options passed to QEMU.";
       };
 
@@ -173,8 +173,8 @@ let
             -append "$(cat ${config.system.build.toplevel}/kernel-params) init=${config.system.build.toplevel}/init regInfo=${regInfo} ${kernelConsole} $QEMU_KERNEL_PARAMS" \
           ''} \
           ${qemuGraphics} \
-          $QEMU_OPTS \
-          ${config.virtualisation.qemu.options}
+          ${toString config.virtualisation.qemu.options} \
+          $QEMU_OPTS
     '';
 
     
@@ -297,6 +297,8 @@ in
     '';
       
   virtualisation.pathsInNixDB = [ config.system.build.toplevel ];
+
+  virtualisation.qemu.options = [ "-usbdevice tablet" ];
   
   # Mount the host filesystem via CIFS, and bind-mount the Nix store
   # of the host into our own filesystem.  We use mkOverride to allow
-- 
GitLab


From 3fb602619121f895a47877efc71a77fd9defeb02 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 2 Aug 2011 06:53:09 +0000
Subject: [PATCH 3086/5331] * Add smartmontools.

svn path=/nixos/trunk/; revision=28121
---
 modules/profiles/base.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/modules/profiles/base.nix b/modules/profiles/base.nix
index af256725198..d279f383735 100644
--- a/modules/profiles/base.nix
+++ b/modules/profiles/base.nix
@@ -69,6 +69,7 @@
     pkgs.sdparm
     pkgs.hdparm
     pkgs.dmraid
+    pkgs.smartmontools # for diagnosing hard disks
 
     # Tools to create / manipulate filesystems.
     pkgs.ntfsprogs # for resizing NTFS partitions
-- 
GitLab


From 1df952182a26924a05c10026ebefda25cbd66823 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 4 Aug 2011 15:33:40 +0000
Subject: [PATCH 3087/5331] * Only flush the POSTROUTING chain.

svn path=/nixos/trunk/; revision=28153
---
 modules/services/networking/nat.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/services/networking/nat.nix b/modules/services/networking/nat.nix
index 89950067a80..50b2590b3be 100644
--- a/modules/services/networking/nat.nix
+++ b/modules/services/networking/nat.nix
@@ -74,7 +74,7 @@ in
 
         preStart =
           ''
-            iptables -t nat -F
+            iptables -t nat -F POSTROUTING
             iptables -t nat -X
 
             iptables -t nat -A POSTROUTING \
@@ -88,7 +88,7 @@ in
 
         postStop =
           ''
-            iptables -t nat -F
+            iptables -t nat -F POSTROUTING
           '';
       };
 
-- 
GitLab


From 2af368279cb3fa9e0c7375f2df084600be310bae Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sat, 6 Aug 2011 18:55:00 +0000
Subject: [PATCH 3088/5331] * Set NIX_PATH to something reasonable.

svn path=/nixos/trunk/; revision=28202
---
 modules/programs/bash/bashrc.sh | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/modules/programs/bash/bashrc.sh b/modules/programs/bash/bashrc.sh
index 5ce6b0ebd88..940e3f7cd6b 100644
--- a/modules/programs/bash/bashrc.sh
+++ b/modules/programs/bash/bashrc.sh
@@ -12,6 +12,7 @@ export LD_LIBRARY_PATH=/var/run/opengl-driver/lib:/var/run/opengl-driver-32/lib
 export MODULE_DIR=@modulesTree@/lib/modules
 export NIXPKGS_CONFIG=/nix/etc/config.nix
 export NIXPKGS_ALL=/etc/nixos/nixpkgs
+export NIX_PATH=nixpkgs=/etc/nixos/nixpkgs:nixos=/etc/nixos/nixos:nixos-config=/etc/nixos/configuration.nix:services=/etc/nixos/services
 export PAGER="less -R"
 export EDITOR=nano
 export LOCATE_PATH=/var/cache/locatedb
@@ -49,6 +50,7 @@ for i in $NIX_PROFILES; do # !!! reverse
     export XDG_CONFIG_DIRS=$i/etc/xdg${XDG_CONFIG_DIRS:+:}$XDG_CONFIG_DIRS
     export XDG_DATA_DIRS=$i/share${XDG_DATA_DIRS:+:}$XDG_DATA_DIRS
 done
+
 @shellInit@
 
 
-- 
GitLab


From c36cf7b5919942974fa5e199328c5800f0bc225e Mon Sep 17 00:00:00 2001
From: Karn Kallio <tierpluspluslists@gmail.com>
Date: Sun, 7 Aug 2011 00:52:35 +0000
Subject: [PATCH 3089/5331] Reflect kdegraphics organization.

svn path=/nixos/trunk/; revision=28214
---
 modules/services/x11/desktop-managers/kde4.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/modules/services/x11/desktop-managers/kde4.nix b/modules/services/x11/desktop-managers/kde4.nix
index 3c353faf870..846a4d90e23 100644
--- a/modules/services/x11/desktop-managers/kde4.nix
+++ b/modules/services/x11/desktop-managers/kde4.nix
@@ -113,10 +113,10 @@ in
           pkgs.kde4.oxygen_icons
           pkgs.kde4.konsole
           pkgs.kde4.kcolorchooser
-          pkgs.kde4.ksnapshot
+          pkgs.kde4.kdegraphics.ksnapshot
           pkgs.kde4.kate
-          pkgs.kde4.okular
-          pkgs.kde4.gwenview
+          pkgs.kde4.kdegraphics.okular
+          pkgs.kde4.kdegraphics.gwenview
 
           # Phonon backends.
           pkgs.phonon_backend_gstreamer
-- 
GitLab


From 30861ecbc8c5bdbda7b846f9274ec5adc88c81ed Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Mon, 8 Aug 2011 01:27:44 +0000
Subject: [PATCH 3090/5331] Create multitouch module based off synaptics module

svn path=/nixos/trunk/; revision=28372
---
 modules/services/x11/hardware/multitouch.nix | 82 ++++++++++++++++++++
 1 file changed, 82 insertions(+)
 create mode 100644 modules/services/x11/hardware/multitouch.nix

diff --git a/modules/services/x11/hardware/multitouch.nix b/modules/services/x11/hardware/multitouch.nix
new file mode 100644
index 00000000000..9328dbbad6c
--- /dev/null
+++ b/modules/services/x11/hardware/multitouch.nix
@@ -0,0 +1,82 @@
+{ config, pkgs, ... }:
+
+with pkgs.lib;
+
+let cfg = config.services.xserver.synaptics; in
+
+{
+
+  options = {
+
+    services.xserver.synaptics = {
+      
+      enable = mkOption {
+        default = false;
+        example = true;
+        description = "Whether to enable touchpad support.";
+      };
+
+      dev = mkOption {
+        default = null;
+	example = "/dev/input/event0";
+        description = 
+          ''
+            Path for touchpad device.  Set to null to apply to any
+            auto-detected touchpad.
+          '';
+      };
+
+      minSpeed = mkOption {
+        default = "0.6";
+        description = "Cursor speed factor for precision finger motion.";
+      };
+
+      maxSpeed = mkOption {
+        default = "1.0";
+        description = "Cursor speed factor for highest-speed finger motion.";
+      };
+
+      twoFingerScroll = mkOption {
+        default = false;
+        description = "Whether to enable two-finger drag-scrolling.";
+      };
+
+      vertEdgeScroll = mkOption {
+        default = true;
+        description = "Whether to enable vertical edge drag-scrolling.";
+      };
+
+    };
+
+  };
+
+
+  config = mkIf cfg.enable {
+
+    services.xserver.modules = [ pkgs.xorg.xf86inputsynaptics ];
+
+    services.xserver.config =
+      ''
+        # Automatically enable the synaptics driver for all touchpads.
+        Section "InputClass"
+          Identifier "synaptics touchpad catchall"
+          MatchIsTouchpad "on"
+          ${optionalString (cfg.dev != null) ''MatchDevicePath "${cfg.dev}"''}
+          Driver "synaptics"
+          Option "MaxTapTime" "180"
+          Option "MaxTapMove" "220"
+          Option "MinSpeed" "${cfg.minSpeed}"
+          Option "MaxSpeed" "${cfg.maxSpeed}"
+          Option "AccelFactor" "0.0010"
+          Option "TapButton1" "1"
+          Option "TapButton2" "2"
+          Option "TapButton3" "3"
+          Option "VertTwoFingerScroll" "${if cfg.twoFingerScroll then "1" else "0"}"
+          Option "HorizTwoFingerScroll" "${if cfg.twoFingerScroll then "1" else "0"}"
+          Option "VertEdgeScroll" "${if cfg.vertEdgeScroll then "1" else "0"}"
+        EndSection
+      '';
+
+  };
+
+}
-- 
GitLab


From 9464c99ce230957dd3adbedacc3d4db1ed740179 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Mon, 8 Aug 2011 01:34:36 +0000
Subject: [PATCH 3091/5331] First attempt at a multitouch touchpad module.

Note that the Multitouch X Driver currently has no configuration beyond editing the source code, so the only option is enable or disable

svn path=/nixos/trunk/; revision=28373
---
 modules/services/x11/hardware/multitouch.nix | 63 +++-----------------
 1 file changed, 9 insertions(+), 54 deletions(-)

diff --git a/modules/services/x11/hardware/multitouch.nix b/modules/services/x11/hardware/multitouch.nix
index 9328dbbad6c..a51e29f0e8f 100644
--- a/modules/services/x11/hardware/multitouch.nix
+++ b/modules/services/x11/hardware/multitouch.nix
@@ -2,78 +2,33 @@
 
 with pkgs.lib;
 
-let cfg = config.services.xserver.synaptics; in
-
 {
 
   options = {
 
-    services.xserver.synaptics = {
-      
+    services.xserver.multitouch = {
+
       enable = mkOption {
         default = false;
         example = true;
-        description = "Whether to enable touchpad support.";
-      };
-
-      dev = mkOption {
-        default = null;
-	example = "/dev/input/event0";
-        description = 
-          ''
-            Path for touchpad device.  Set to null to apply to any
-            auto-detected touchpad.
-          '';
-      };
-
-      minSpeed = mkOption {
-        default = "0.6";
-        description = "Cursor speed factor for precision finger motion.";
-      };
-
-      maxSpeed = mkOption {
-        default = "1.0";
-        description = "Cursor speed factor for highest-speed finger motion.";
-      };
-
-      twoFingerScroll = mkOption {
-        default = false;
-        description = "Whether to enable two-finger drag-scrolling.";
-      };
-
-      vertEdgeScroll = mkOption {
-        default = true;
-        description = "Whether to enable vertical edge drag-scrolling.";
+        description = "Whether to enable multitouch touchpad support.";
       };
 
     };
 
   };
 
+  config = mkIf config.services.xserver.multitouch.enable {
 
-  config = mkIf cfg.enable {
-
-    services.xserver.modules = [ pkgs.xorg.xf86inputsynaptics ];
+    services.xserver.modules = [ pkgs.xorg.xf86_input_multitouch ];
 
     services.xserver.config =
       ''
-        # Automatically enable the synaptics driver for all touchpads.
+        # Automatically enable the multitouch driver
         Section "InputClass"
-          Identifier "synaptics touchpad catchall"
-          MatchIsTouchpad "on"
-          ${optionalString (cfg.dev != null) ''MatchDevicePath "${cfg.dev}"''}
-          Driver "synaptics"
-          Option "MaxTapTime" "180"
-          Option "MaxTapMove" "220"
-          Option "MinSpeed" "${cfg.minSpeed}"
-          Option "MaxSpeed" "${cfg.maxSpeed}"
-          Option "AccelFactor" "0.0010"
-          Option "TapButton1" "1"
-          Option "TapButton2" "2"
-          Option "TapButton3" "3"
-          Option "VertTwoFingerScroll" "${if cfg.twoFingerScroll then "1" else "0"}"
-          Option "HorizTwoFingerScroll" "${if cfg.twoFingerScroll then "1" else "0"}"
-          Option "VertEdgeScroll" "${if cfg.vertEdgeScroll then "1" else "0"}"
+          MatchIsTouchpad "true"
+          Identifier "Multitouch Touchpad"
+          Driver "multitouch" 
         EndSection
       '';
 
-- 
GitLab


From b17bb81765efded6f4c00f054afa00c1336fe6b5 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Mon, 8 Aug 2011 01:37:49 +0000
Subject: [PATCH 3092/5331] multitouch: Actually add it to the module list

svn path=/nixos/trunk/; revision=28374
---
 modules/module-list.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/modules/module-list.nix b/modules/module-list.nix
index fb3bea3b84e..f4d593b52fa 100644
--- a/modules/module-list.nix
+++ b/modules/module-list.nix
@@ -153,6 +153,7 @@
   ./services/x11/display-managers/kdm.nix
   ./services/x11/display-managers/slim.nix
   ./services/x11/hardware/synaptics.nix
+  ./services/x11/hardware/multitouch.nix
   ./services/x11/hardware/wacom.nix
   ./services/x11/window-managers/awesome.nix
   ./services/x11/window-managers/compiz.nix
-- 
GitLab


From 843ccae5d5d1a3e64a8464df939f6d19d8d4e644 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Mon, 8 Aug 2011 01:39:26 +0000
Subject: [PATCH 3093/5331] multitouch: Use the right package name

svn path=/nixos/trunk/; revision=28375
---
 modules/services/x11/hardware/multitouch.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/services/x11/hardware/multitouch.nix b/modules/services/x11/hardware/multitouch.nix
index a51e29f0e8f..d360902f2ab 100644
--- a/modules/services/x11/hardware/multitouch.nix
+++ b/modules/services/x11/hardware/multitouch.nix
@@ -20,7 +20,7 @@ with pkgs.lib;
 
   config = mkIf config.services.xserver.multitouch.enable {
 
-    services.xserver.modules = [ pkgs.xorg.xf86_input_multitouch ];
+    services.xserver.modules = [ pkgs.xf86_input_multitouch ];
 
     services.xserver.config =
       ''
-- 
GitLab


From 8b30a8f23f282cdf0ba0f71f628de2774925d495 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 8 Aug 2011 14:40:16 +0000
Subject: [PATCH 3094/5331] * In the VM tests, add "-m 0" to syslogd to kill
 the "-- MARK --"   messages.  These prevent hanging tests from being killed
 after 1   hour of silence.

svn path=/nixos/trunk/; revision=28393
---
 modules/services/logging/syslogd.nix     | 15 ++++++++++++---
 modules/testing/test-instrumentation.nix |  4 ++++
 2 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/modules/services/logging/syslogd.nix b/modules/services/logging/syslogd.nix
index 083568b51e3..bb088c250f6 100644
--- a/modules/services/logging/syslogd.nix
+++ b/modules/services/logging/syslogd.nix
@@ -27,8 +27,6 @@ let
     *.*;mail.none;local1.none    -/var/log/messages
   '';
 
-  syslogdParameters = if cfg.enableNetworkInput then "-r " else "";
-
 in
 
 {
@@ -75,6 +73,15 @@ in
         '';
       };
 
+      extraParams = mkOption {
+        type = types.listOf types.string;
+        default = [ ];
+        example = [ "-m 0" ];
+        description = ''
+          Additional parameters passed to <command>syslogd</command>.
+        '';
+      };
+
     };
 
   };
@@ -84,6 +91,8 @@ in
 
   config = {
 
+    services.syslogd.extraParams = optional cfg.enableNetworkInput "-r";
+
     jobs.syslogd =
       { description = "Syslog daemon";
 
@@ -93,7 +102,7 @@ in
 
         daemonType = "fork";
 
-        exec = "${pkgs.sysklogd}/sbin/syslogd ${syslogdParameters} -f ${syslogConf}";
+        exec = "${pkgs.sysklogd}/sbin/syslogd ${toString cfg.extraParams} -f ${syslogConf}";
       };
 
   };
diff --git a/modules/testing/test-instrumentation.nix b/modules/testing/test-instrumentation.nix
index d1b3fe154d5..e2434aeb9ec 100644
--- a/modules/testing/test-instrumentation.nix
+++ b/modules/testing/test-instrumentation.nix
@@ -92,6 +92,10 @@ in
     # Send all of /var/log/messages to the serial port.
     services.syslogd.extraConfig = "*.* /dev/ttyS0";
 
+    # Disable "-- MARK --" messages.  These prevent hanging tests from
+    # being killed after 1 hour of silence.
+    services.syslogd.extraParams = [ "-m 0" ];
+    
     # Don't run klogd.  Kernel messages appear on the serial console anyway.
     jobs.klogd.startOn = mkOverride 50 "";
 
-- 
GitLab


From eba6e0456b1ed751f19e94ce9d416d47f0009803 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 8 Aug 2011 15:16:42 +0000
Subject: [PATCH 3095/5331] * Use the VESA driver.  It seems to work better
 now.  In particular,   it doesn't turn blue backgrounds into yellow (see  
 e.g. http://hydra.nixos.org/build/1232626/download/1/screen.png).

svn path=/nixos/trunk/; revision=28395
---
 modules/virtualisation/qemu-vm.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/modules/virtualisation/qemu-vm.nix b/modules/virtualisation/qemu-vm.nix
index 4b29f38b420..22a24f062f4 100644
--- a/modules/virtualisation/qemu-vm.nix
+++ b/modules/virtualisation/qemu-vm.nix
@@ -298,7 +298,7 @@ in
       
   virtualisation.pathsInNixDB = [ config.system.build.toplevel ];
 
-  virtualisation.qemu.options = [ "-usbdevice tablet" ];
+  virtualisation.qemu.options = [ "-vga std" "-usbdevice tablet" ];
   
   # Mount the host filesystem via CIFS, and bind-mount the Nix store
   # of the host into our own filesystem.  We use mkOverride to allow
@@ -365,8 +365,9 @@ in
   # When building a regular system configuration, override whatever
   # video driver the host uses.
   services.xserver.videoDriver = mkOverride 50 null;
-  services.xserver.videoDrivers = mkOverride 50 [ "cirrus" "vesa" ];
+  services.xserver.videoDrivers = mkOverride 50 [ "vesa" ];
   services.xserver.defaultDepth = mkOverride 50 0;
+  services.xserver.resolutions = mkOverride 50 [ { x = 1024; y = 768; } ];
   services.xserver.monitorSection =
     ''
       # Set a higher refresh rate so that resolutions > 800x600 work.
-- 
GitLab


From 80d817fcb79b382c5ef3a3205295ee24fe35d8fe Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 8 Aug 2011 17:16:49 +0000
Subject: [PATCH 3096/5331] * Verify whether Xfce users get ownership of
 devices.

svn path=/nixos/trunk/; revision=28396
---
 tests/xfce.nix | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/tests/xfce.nix b/tests/xfce.nix
index 3d0a6f7ee12..b9114baf370 100644
--- a/tests/xfce.nix
+++ b/tests/xfce.nix
@@ -17,8 +17,12 @@
 
   testScript =
     ''
-      $machine->waitForWindow(qr/Tips/);
+      $machine->waitForWindow(qr/Tips/);      
       $machine->sleep(10);
+
+      # Check that logging in has given the user ownership of devices.
+      $machine->succeed("getfacl /dev/snd/timer | grep -q alice");
+      
       $machine->succeed("su - alice -c 'DISPLAY=:0.0 Terminal &'");
       $machine->waitForWindow(qr/Terminal/);
       $machine->sleep(10);
-- 
GitLab


From 45d8c418b5373a741433f02277f7da6dc0331d7c Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 8 Aug 2011 19:28:17 +0000
Subject: [PATCH 3097/5331] * Some hackery to get ConsoleKit to work with the
 SLIM and "auto"   display managers.  This was broken due to a change in
 ConsoleKit   0.4.2:

    https://bugs.freedesktop.org/show_bug.cgi?id=28377

  Using ConsoleKit's pam-ck-connector helps in that it creates local
  sessions; however, they're not marked as active because the
  x11-display-device property is not set.  As a workaround, calling
  ck-launch-session seems to work.

  More details:

    https://bugs.gentoo.org/show_bug.cgi?id=336634
    http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=598150
    https://bugzilla.redhat.com/show_bug.cgi?id=585952

svn path=/nixos/trunk/; revision=28400
---
 modules/programs/shadow.nix                       |  3 ++-
 modules/services/x11/display-managers/auto.nix    |  5 +++++
 modules/services/x11/display-managers/default.nix | 10 ++++++++--
 modules/services/x11/display-managers/slim.nix    | 13 +++++++++++--
 4 files changed, 26 insertions(+), 5 deletions(-)

diff --git a/modules/programs/shadow.nix b/modules/programs/shadow.nix
index 81286d9bb5c..68e9fe38f5b 100644
--- a/modules/programs/shadow.nix
+++ b/modules/programs/shadow.nix
@@ -75,7 +75,8 @@ in
     security.pam.services =
       [ { name = "chsh"; rootOK = true; }
         { name = "chfn"; rootOK = true; }
-        { name = "su"; rootOK = true; forwardXAuth = true; }
+        # Enable ‘ownDevices’ for the services/x11/display-managers/auto.nix module.
+        { name = "su"; rootOK = true; ownDevices = true; forwardXAuth = true; }
         { name = "passwd"; }
         # Note: useradd, groupadd etc. aren't setuid root, so it
         # doesn't really matter what the PAM config says as long as it
diff --git a/modules/services/x11/display-managers/auto.nix b/modules/services/x11/display-managers/auto.nix
index e2b1ee42e83..7518dc350f7 100644
--- a/modules/services/x11/display-managers/auto.nix
+++ b/modules/services/x11/display-managers/auto.nix
@@ -52,6 +52,11 @@ in
           '';
       };
 
+    # The ConsoleKit PAM connector launches a local session, but it's
+    # not set as "active" (maybe because x11-display-device is not
+    # set).  Launching a child session seems to fix that.
+    services.xserver.displayManager.forceCKSession = true;
+    
   };
 
 }
diff --git a/modules/services/x11/display-managers/default.nix b/modules/services/x11/display-managers/default.nix
index e17cb541af6..47743d436a5 100644
--- a/modules/services/x11/display-managers/default.nix
+++ b/modules/services/x11/display-managers/default.nix
@@ -53,8 +53,8 @@ let
 
       # Start a ConsoleKit session so that we get ownership of various
       # devices.
-      if test -z "$XDG_SESSION_COOKIE"; then
-          exec ${pkgs.consolekit}/bin/ck-launch-session "$0" "$sessionType"
+      if [ \( -z "$XDG_SESSION_COOKIE" -o -n "${toString cfg.displayManager.forceCKSession}" \) -a -z "$CK_STARTED" ]; then
+          CK_STARTED=1 exec ${pkgs.consolekit}/bin/ck-launch-session "$0" "$sessionType"
       fi
 
       # Handle being called by kdm.
@@ -162,6 +162,12 @@ in
         apply = toString;
       };
 
+      forceCKSession = mkOption {
+        internal = true;
+        default = false;
+        description = "Whether to force launching of a ConsoleKit session.";
+      };
+
       session = mkOption {
         default = [];
         example = [
diff --git a/modules/services/x11/display-managers/slim.nix b/modules/services/x11/display-managers/slim.nix
index bc1fceeefc5..fb6f1de9d5a 100644
--- a/modules/services/x11/display-managers/slim.nix
+++ b/modules/services/x11/display-managers/slim.nix
@@ -1,4 +1,4 @@
-{pkgs, config, ...}:
+{ config, pkgs, ... }:
 
 with pkgs.lib;
 
@@ -106,8 +106,17 @@ in
 
     # Allow null passwords so that the user can login as root on the
     # installation CD.
-    security.pam.services = [ { name = "slim"; allowNullPassword = true; } ];
+    security.pam.services = singleton
+      { name = "slim";
+        allowNullPassword = true;
+        ownDevices = true;
+      };
 
+    # The ConsoleKit PAM connector launches a local session, but it's
+    # not set as "active" (maybe because x11-display-device is not
+    # set).  Launching a child session seems to fix that.
+    services.xserver.displayManager.forceCKSession = true;
+    
   };
 
 }
-- 
GitLab


From 27a54b1761032a153283842d8930b92192d4d737 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 9 Aug 2011 14:06:04 +0000
Subject: [PATCH 3098/5331] * Fix the runInMachine test.

svn path=/nixos/trunk/; revision=28428
---
 tests/run-in-machine.nix | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/tests/run-in-machine.nix b/tests/run-in-machine.nix
index 5f790a11aba..b36c041d790 100644
--- a/tests/run-in-machine.nix
+++ b/tests/run-in-machine.nix
@@ -1,9 +1,8 @@
 { nixpkgs ? ../../nixpkgs
-, services ? ../../services
 , system ? builtins.currentSystem
 }:
 
-with import ../lib/testing.nix { inherit nixpkgs services system; };
+with import ../lib/testing.nix { inherit nixpkgs system; };
 
 runInMachine {
   drv = (import nixpkgs { }).aterm;
-- 
GitLab


From d75efe4aa184c4fa89241cf3df2f04616f3ba93f Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 9 Aug 2011 14:07:44 +0000
Subject: [PATCH 3099/5331] * For security, don't mount the entire host
 filesystem.

svn path=/nixos/trunk/; revision=28429
---
 lib/test-driver/Machine.pm                    |  1 -
 lib/test-driver/test-driver.pl                |  2 +-
 lib/testing.nix                               | 11 ++++----
 .../web-servers/apache-httpd/default.nix      | 27 ++++++++-----------
 modules/testing/test-instrumentation.nix      | 11 +++-----
 modules/virtualisation/qemu-vm.nix            | 13 ++++-----
 6 files changed, 28 insertions(+), 37 deletions(-)

diff --git a/lib/test-driver/Machine.pm b/lib/test-driver/Machine.pm
index 2c6646eee33..734dba49dd4 100644
--- a/lib/test-driver/Machine.pm
+++ b/lib/test-driver/Machine.pm
@@ -127,7 +127,6 @@ sub start {
             "-no-reboot -monitor unix:./monitor -chardev socket,id=shell,path=./shell " .
             "-device virtio-serial -device virtconsole,chardev=shell " .
             ($showGraphics ? "-serial stdio" : "-nographic") . " " . ($ENV{QEMU_OPTS} || "");
-        $ENV{QEMU_KERNEL_PARAMS} = "hostTmpDir=$ENV{TMPDIR}";
         chdir $self->{stateDir} or die;
         exec $self->{startCommand};
         die "running VM script: $!";
diff --git a/lib/test-driver/test-driver.pl b/lib/test-driver/test-driver.pl
index 547f1da1af7..e4df8721936 100644
--- a/lib/test-driver/test-driver.pl
+++ b/lib/test-driver/test-driver.pl
@@ -129,7 +129,7 @@ sub runTests {
             # sources.
             my $kernelDir = $vm->mustSucceed("echo \$(dirname \$(readlink -f /var/run/current-system/kernel))/.build/linux-*");
             chomp $kernelDir;
-            my $coverageDir = "/hostfs" . $vm->stateDir() . "/coverage-data/$kernelDir";
+            my $coverageDir = "/tmp/xchg/coverage-data/$kernelDir";
 
             # Copy all the *.gcda files.
             $vm->execute("for d in $gcovDir/nix/store/*/.build/linux-*; do for i in \$(cd \$d && find -name '*.gcda'); do echo \$i; mkdir -p $coverageDir/\$(dirname \$i); cp -v \$d/\$i $coverageDir/\$i; done; done");
diff --git a/lib/testing.nix b/lib/testing.nix
index 17f4e45c83b..94f5a4cb70e 100644
--- a/lib/testing.nix
+++ b/lib/testing.nix
@@ -59,9 +59,9 @@ rec {
           touch $out/nix-support/hydra-build-products
           echo "report testlog $out log.html" >> $out/nix-support/hydra-build-products
 
-          for i in */coverage-data; do
+          for i in */xchg/coverage-data; do
             mkdir -p $out/coverage-data
-            mv $i $out/coverage-data/$(dirname $i)
+            mv $i $out/coverage-data/$(dirname $(dirname $i))
           done
 
           [ -z "$failed" ] || touch $out/nix-support/failed
@@ -193,13 +193,14 @@ rec {
       testscript = ''
         startAll;
         ${preBuild}
-        $client->succeed("env -i ${pkgs.bash}/bin/bash ${buildrunner} /hostfs".$client->stateDir."/saved-env >&2");
+        $client->succeed("env -i ${pkgs.bash}/bin/bash ${buildrunner} /tmp/xchg/saved-env >&2");
         ${postBuild}
       '';
 
       vmRunCommand = writeText "vm-run" ''
-        ${coreutils}/bin/mkdir -p vm-state-client
-        export > vm-state-client/saved-env
+        ${coreutils}/bin/mkdir $out
+        ${coreutils}/bin/mkdir -p vm-state-client/xchg
+        export > vm-state-client/xchg/saved-env
         export tests='${testscript}'
         ${testDriver}/bin/nixos-test-driver ${vm.config.system.build.vm}/bin/run-*-vm
       ''; # */
diff --git a/modules/services/web-servers/apache-httpd/default.nix b/modules/services/web-servers/apache-httpd/default.nix
index 7b2f685c2b6..c6cbac5e611 100644
--- a/modules/services/web-servers/apache-httpd/default.nix
+++ b/modules/services/web-servers/apache-httpd/default.nix
@@ -558,22 +558,17 @@ in
         startOn = "started ${startingDependency} and filesystem";
 
         environment =
-          { # !!! This should be added in test-instrumentation.nix.  It
-            # shouldn't hurt though, since packages usually aren't built
-            # with coverage enabled.
-           GCOV_PREFIX = "/tmp/coverage-data";
-
-           PATH = concatStringsSep ":" (
-             [ "${pkgs.coreutils}/bin" "${pkgs.gnugrep}/bin" ]
-             ++ # Needed for PHP's mail() function.  !!! Probably the
-                # ssmtp module should export the path to sendmail in
-                # some way.
-                optional config.networking.defaultMailServer.directDelivery "${pkgs.ssmtp}/sbin"
-             ++ (concatMap (svc: svc.extraServerPath) allSubservices) );
-
-           PHPRC = if enablePHP then phpIni else "";
-
-           TZ = config.time.timeZone;
+          { PATH = concatStringsSep ":" (
+              [ "${pkgs.coreutils}/bin" "${pkgs.gnugrep}/bin" ]
+              ++ # Needed for PHP's mail() function.  !!! Probably the
+                 # ssmtp module should export the path to sendmail in
+                 # some way.
+                 optional config.networking.defaultMailServer.directDelivery "${pkgs.ssmtp}/sbin"
+              ++ (concatMap (svc: svc.extraServerPath) allSubservices) );
+
+            PHPRC = if enablePHP then phpIni else "";
+
+            TZ = config.time.timeZone;
 
           } // (listToAttrs (concatMap (svc: svc.globalEnvVars) allSubservices));
 
diff --git a/modules/testing/test-instrumentation.nix b/modules/testing/test-instrumentation.nix
index e2434aeb9ec..873c8a9d6d0 100644
--- a/modules/testing/test-instrumentation.nix
+++ b/modules/testing/test-instrumentation.nix
@@ -64,13 +64,8 @@ in
         # to failures that are hard to diagnose.
         echo 2 > /proc/sys/vm/panic_on_oom
 
-        # Coverage data is written into /tmp/coverage-data.  Symlink
-        # it to the host filesystem so that we don't need to copy it
-        # on shutdown.
-        ( eval $(cat /proc/cmdline)
-          mkdir -p /hostfs/$hostTmpDir/coverage-data
-          ln -sfn /hostfs/$hostTmpDir/coverage-data /tmp/coverage-data
-        )
+        # Coverage data is written into /tmp/coverage-data.
+        mkdir -p /tmp/xchg/coverage-data
 
         # Mount debugfs to gain access to the kernel coverage data (if
         # available).
@@ -103,7 +98,7 @@ in
     networking.defaultGateway = mkOverride 150 "";
     networking.nameservers = mkOverride 150 [ ];
 
-    system.upstartEnvironment.GCOV_PREFIX = "/tmp/coverage-data";
+    system.upstartEnvironment.GCOV_PREFIX = "/tmp/xchg/coverage-data";
       
   };
 
diff --git a/modules/virtualisation/qemu-vm.nix b/modules/virtualisation/qemu-vm.nix
index 22a24f062f4..0dce6936b81 100644
--- a/modules/virtualisation/qemu-vm.nix
+++ b/modules/virtualisation/qemu-vm.nix
@@ -153,6 +153,7 @@ let
           TMPDIR=$(mktemp -d nix-vm-smbd.XXXXXXXXXX --tmpdir)
       fi
       cd $TMPDIR
+      mkdir -p $TMPDIR/xchg
 
       ${pkgs.vmTools.startSamba}
 
@@ -310,16 +311,16 @@ in
     [ { mountPoint = "/";
         device = "/dev/vda";
       }
-      { mountPoint = "/hostfs";
-        device = "//10.0.2.4/qemu";
+      { mountPoint = "/nix/store";
+        device = "//10.0.2.4/store";
         fsType = "cifs";
         options = "guest,sec=none,noperm,noacl";
         neededForBoot = true;
       }
-      { mountPoint = "/nix/store";
-        device = "/hostfs/nix/store";
-        fsType = "none";
-        options = "bind";
+      { mountPoint = "/tmp/xchg";
+        device = "//10.0.2.4/xchg";
+        fsType = "cifs";
+        options = "guest,sec=none,noperm,noacl";
         neededForBoot = true;
       }
     ] ++ optional cfg.useBootLoader
-- 
GitLab


From 5932de5c1a5d81ec6e0cadaa985194daab53c00a Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 9 Aug 2011 14:08:24 +0000
Subject: [PATCH 3100/5331] svn path=/nixos/trunk/; revision=28430

---
 doc/manual/man-nixos-rebuild.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/doc/manual/man-nixos-rebuild.xml b/doc/manual/man-nixos-rebuild.xml
index 6f888172d48..2e07246cf8d 100644
--- a/doc/manual/man-nixos-rebuild.xml
+++ b/doc/manual/man-nixos-rebuild.xml
@@ -148,8 +148,8 @@ $ ./result/bin/run-*-vm
       filesystem, which is automatically created when the VM is first
       started, and is persistent across reboots of the VM.  It is
       stored in <literal>./<replaceable>hostname</replaceable>.qcow2</literal>.
-      The entire filesystem hierarchy of the host is available in the
-      VM under <filename>/hostfs</filename>.</para>
+      <!-- The entire filesystem hierarchy of the host is available in the
+      VM under <filename>/hostfs</filename>.--></para>
     </listitem>
   </varlistentry>
 
-- 
GitLab


From 74586fd2bb17471908d316c502debff2b14c4897 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 9 Aug 2011 15:32:39 +0000
Subject: [PATCH 3101/5331] * Fix the permissions on /tmp.

svn path=/nixos/trunk/; revision=28435
---
 modules/system/boot/stage-1.nix    | 1 +
 modules/virtualisation/qemu-vm.nix | 3 +++
 2 files changed, 4 insertions(+)

diff --git a/modules/system/boot/stage-1.nix b/modules/system/boot/stage-1.nix
index cdfbdbbf432..e4f935d7253 100644
--- a/modules/system/boot/stage-1.nix
+++ b/modules/system/boot/stage-1.nix
@@ -127,6 +127,7 @@ let
       cp -v ${pkgs.coreutils}/bin/basename $out/bin
       cp -v ${pkgs.coreutils}/bin/mkdir $out/bin
       cp -v ${pkgs.coreutils}/bin/mknod $out/bin
+      cp -v ${pkgs.coreutils}/bin/chmod $out/bin
       cp -v ${pkgs.coreutils}/bin/cat $out/bin
       cp -v ${pkgs.coreutils}/bin/chroot $out/bin
       cp -v ${pkgs.coreutils}/bin/sleep $out/bin
diff --git a/modules/virtualisation/qemu-vm.nix b/modules/virtualisation/qemu-vm.nix
index 0dce6936b81..8881cc5304d 100644
--- a/modules/virtualisation/qemu-vm.nix
+++ b/modules/virtualisation/qemu-vm.nix
@@ -272,6 +272,9 @@ in
 
   boot.initrd.postMountCommands =
     ''
+      # Fix the permissions on /tmp.
+      chmod 1777 $targetRoot/tmp
+      
       mkdir -p $targetRoot/boot
       mount -o remount,ro $targetRoot/nix/store
       ${optionalString cfg.writableStore ''
-- 
GitLab


From 96304c9afc7a7e51fa4724f1e92ccb4a0b4313cb Mon Sep 17 00:00:00 2001
From: David Guibert <david.guibert@gmail.com>
Date: Tue, 9 Aug 2011 19:53:01 +0000
Subject: [PATCH 3102/5331] make the virtualbox guest module loadable by
 modprobe.

svn path=/nixos/trunk/; revision=28436
---
 modules/services/misc/virtualbox.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/modules/services/misc/virtualbox.nix b/modules/services/misc/virtualbox.nix
index 9f11004e771..00b81b2f383 100644
--- a/modules/services/misc/virtualbox.nix
+++ b/modules/services/misc/virtualbox.nix
@@ -32,6 +32,8 @@ in
   config = mkIf cfg.enable {
 
     environment.systemPackages = [ ];
+
+    boot.extraModulePackages = [ pkgs.linuxPackages.virtualboxGuestAdditions ];
     
     jobs.virtualbox =
       { description = "VirtualBox service";
-- 
GitLab


From 38cab9070f0118c4390398ee36a589976a31c198 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Wed, 10 Aug 2011 22:14:46 +0000
Subject: [PATCH 3103/5331] synaptics module: By default, disable edge drag
 scrolling if two finger scrolling is enabled

svn path=/nixos/trunk/; revision=28472
---
 modules/services/x11/hardware/synaptics.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/services/x11/hardware/synaptics.nix b/modules/services/x11/hardware/synaptics.nix
index 9328dbbad6c..2cb85aaeb52 100644
--- a/modules/services/x11/hardware/synaptics.nix
+++ b/modules/services/x11/hardware/synaptics.nix
@@ -42,7 +42,7 @@ let cfg = config.services.xserver.synaptics; in
       };
 
       vertEdgeScroll = mkOption {
-        default = true;
+        default = ! cfg.twoFingerScroll;
         description = "Whether to enable vertical edge drag-scrolling.";
       };
 
-- 
GitLab


From 7e2ea4df32a50f04b166c84b358c6a4833ff5464 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 12 Aug 2011 10:04:43 +0000
Subject: [PATCH 3104/5331] * Xsession script: set the current directory to
 $HOME.

svn path=/nixos/trunk/; revision=28511
---
 modules/services/x11/display-managers/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/modules/services/x11/display-managers/default.nix b/modules/services/x11/display-managers/default.nix
index 47743d436a5..6308ff0f5bb 100644
--- a/modules/services/x11/display-managers/default.nix
+++ b/modules/services/x11/display-managers/default.nix
@@ -21,6 +21,8 @@ let
     ''
       #! /bin/sh
 
+      cd "$HOME"
+
       # The first argument of this script is the session type.
       sessionType="$1"
       if [ "$sessionType" = default ]; then sessionType=""; fi
-- 
GitLab


From 8f6a4be7217883898229f80c596175f6142230d8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Sun, 14 Aug 2011 22:01:58 +0000
Subject: [PATCH 3105/5331] Trying to make the system tarball for pc closer to
 PXE boot.

svn path=/nixos/trunk/; revision=28573
---
 .../installer/cd-dvd/system-tarball-pc.nix    | 75 +++++++++++++++++++
 modules/installer/cd-dvd/system-tarball.nix   | 11 ++-
 2 files changed, 80 insertions(+), 6 deletions(-)

diff --git a/modules/installer/cd-dvd/system-tarball-pc.nix b/modules/installer/cd-dvd/system-tarball-pc.nix
index a67f60a2c34..6162f599096 100644
--- a/modules/installer/cd-dvd/system-tarball-pc.nix
+++ b/modules/installer/cd-dvd/system-tarball-pc.nix
@@ -9,6 +9,27 @@ let
 
   pkgs2storeContents = l : map (x: { object = x; symlink = "none"; }) l;
 
+  # For PXE kernel loading
+  pxeconfig = pkgs.writeText "pxeconfig-default" ''
+    default menu.c32
+    prompt 0
+
+    label bootlocal
+      menu default
+      localboot 0
+      timeout 80
+      TOTALTIMEOUT 9000
+
+    label nixos
+      MENU LABEL ^NixOS base through NFS
+      KERNEL bzImage
+      append initrd=initrd ip=dhcp tnfsroot=IPADDR:/home/pcroot systemConfig=${config.system.build.toplevel} init=${config.system.build.toplevel}/initrd
+
+    label memtest
+      MENU LABEL ^Memtest86+
+      KERNEL memtest.bin
+  '';
+
 in
 
 {
@@ -28,6 +49,18 @@ in
     [ { source = config.boot.kernelPackages.kernel + "/" + config.system.boot.loader.kernelFile;
         target = "/boot/" + config.system.boot.loader.kernelFile;
       }
+      { source = "${pkgs.syslinux}/share/syslinux/pxelinux.0";
+        target = "/boot/pxelinux.0";
+      }
+      { source = "${pkgs.syslinux}/share/syslinux/menu.c32";
+        target = "/boot/menu.c32";
+      }
+      { source = pxeconfig;
+        target = "/boot/pxelinux.cfg/default";
+      }
+      { source = "${pkgs.memtest86}/memtest.bin";
+        target = "/boot/memtest.bin";
+      }
     ];
      
   # Allow sshd to be started manually through "start sshd".  It should
@@ -35,4 +68,46 @@ in
   # default root password is empty.
   services.openssh.enable = true;
   jobs.openssh.startOn = pkgs.lib.mkOverrideTemplate 50 {} "";
+
+  boot.initrd.postMountCommands = ''
+    for o in $(cat /proc/cmdline); do
+      case $o in
+        tnfsroot=*)
+          set -- $(IFS==; echo $o)
+          # TODO: It cannot mount nfs, as maybe it cannot find 'mount.nfs'
+          mount $2 /mnt-root
+          ;;
+        *) ;;
+      esac
+    done
+  '';
+
+  boot.kernelPackages = pkgs.linuxPackages_2_6_39;
+  nixpkgs.config = {
+    packageOverrides = p: rec {
+      linux_2_6_39 = p.linux_2_6_39.override {
+        extraConfig = ''
+          # Enable drivers in kernel for most NICs.
+          E1000 y
+          # E1000E y
+          # ATH5K y
+          8139TOO y
+          NE2K_PCI y
+          ATL1 y
+          ATL1E y
+          ATL1C y
+
+          # Enable nfs root boot
+          IP_PNP y
+          IP_PNP_DHCP y
+          NFS_FS y
+          ROOT_NFS y
+
+          # Enable devtmpfs
+          DEVTMPFS y
+          DEVTMPFS_MOUNT y
+        '';
+      };
+    };
+  };
 }
diff --git a/modules/installer/cd-dvd/system-tarball.nix b/modules/installer/cd-dvd/system-tarball.nix
index 61290d6b460..63c5a3117c4 100644
--- a/modules/installer/cd-dvd/system-tarball.nix
+++ b/modules/installer/cd-dvd/system-tarball.nix
@@ -40,11 +40,7 @@ in
 
   # In stage 1 of the boot, mount the CD/DVD as the root FS by label
   # so that we don't need to know its device.
-  fileSystems =
-    [ { mountPoint = "/";
-        device = "/dev/sda";
-      }
-    ];
+  fileSystems = [ ];
 
   # boot.initrd.availableKernelModules = [ "mvsdio" "mmc_block" "reiserfs" "ext3" "ext4" ];
 
@@ -80,7 +76,10 @@ in
     ''
       # After booting, register the contents of the Nix store on the
       # CD in the Nix database in the tmpfs.
-      ${config.environment.nix}/bin/nix-store --load-db < /nix-path-registration
+      if [ -f /nix-path-registration ]; then
+        ${config.environment.nix}/bin/nix-store --load-db < /nix-path-registration &&
+        rm /nix-path/registration
+      fi
 
       # nixos-rebuild also requires a "system" profile and an
       # /etc/NIXOS tag.
-- 
GitLab


From 4bc0bfec4cb93f51a6106a6b4b32cfe9f49da996 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Mon, 15 Aug 2011 14:37:00 +0000
Subject: [PATCH 3106/5331] Making the system-tarball-pc boot fine with PXE,
 and include help files and a readme file as examples for an easy PXE setup.

This allows booting the NixOS in the system tarball, and thus allows installing nixos.


svn path=/nixos/trunk/; revision=28585
---
 .../installer/cd-dvd/system-tarball-pc.nix    | 109 +++++++++++++++---
 modules/installer/cd-dvd/system-tarball.nix   |   5 +-
 2 files changed, 96 insertions(+), 18 deletions(-)

diff --git a/modules/installer/cd-dvd/system-tarball-pc.nix b/modules/installer/cd-dvd/system-tarball-pc.nix
index 6162f599096..9f81695452c 100644
--- a/modules/installer/cd-dvd/system-tarball-pc.nix
+++ b/modules/installer/cd-dvd/system-tarball-pc.nix
@@ -21,13 +21,92 @@ let
       TOTALTIMEOUT 9000
 
     label nixos
-      MENU LABEL ^NixOS base through NFS
+      MENU LABEL ^NixOS using nfsroot
       KERNEL bzImage
-      append initrd=initrd ip=dhcp tnfsroot=IPADDR:/home/pcroot systemConfig=${config.system.build.toplevel} init=${config.system.build.toplevel}/initrd
+      append ip=dhcp nfsroot=/home/pcroot systemConfig=${config.system.build.toplevel} init=${config.system.build.toplevel}/init
+
+    # I don't know how to make this boot with nfsroot (using the initrd)
+    label nixos_initrd
+      MENU LABEL NixOS booting the poor ^initrd.
+      KERNEL bzImage
+      append initrd=initrd ip=dhcp nfsroot=/home/pcroot systemConfig=${config.system.build.toplevel} init=${config.system.build.toplevel}/init
 
     label memtest
       MENU LABEL ^Memtest86+
-      KERNEL memtest.bin
+      KERNEL memtest
+  '';
+
+  dhcpdExampleConfig = pkgs.writeText "dhcpd.conf-example" ''
+    # Example configuration for booting PXE.
+    allow booting;
+    allow bootp;
+    
+    # Adapt this to your network configuration.
+    option domain-name "local";
+    option subnet-mask 255.255.255.0;
+    option broadcast-address 192.168.1.255;
+    option domain-name-servers 192.168.1.1;
+    option routers 192.168.1.1;
+    
+    # PXE-specific configuration directives...
+    # Some BIOS don't accept slashes for paths inside the tftp servers,
+    # and will report Access Violation if they see slashes.
+    filename "pxelinux.0";
+    # For the TFTP and NFS root server. Set the IP of your server.
+    next-server 192.168.1.34;
+    
+    subnet 192.168.1.0 netmask 255.255.255.0 {
+      range 192.168.1.50 192.168.1.55;
+    }
+  '';
+
+  readme = pkgs.writeText "readme.txt" ''
+    Let all the files in the system tarball sit in a directory served by NFS (the NFS root)
+    like this in exportfs:
+      /home/pcroot    192.168.1.0/24(rw,no_root_squash,no_all_squash)
+
+    Run "exportfs -a" after editing /etc/exportfs, for the nfs server to be aware of the
+    changes.
+
+    Use a tftp server serving the root of boot/ (from the system tarball).
+
+    In order to have PXE boot, use the boot/dhcpd.conf-example file for your dhcpd server,
+    as it will point your PXE clients to pxelinux.0 from the tftp server. Adapt the
+    configuration to your network.
+
+    Adapt the pxelinux configuration (boot/pxelinux.cfg/default) to set the path to your
+    nfrroot. If you use ip=dhcp in the kernel, the nfs server ip will be taken from
+    dhcp and so you don't have to specify it.
+
+    The linux in bzImage includes network drivers for some usual cards.
+
+
+    QEMU Testing
+    ---------------
+
+    You can test qemu pxe boot without having a DHCP server adapted, but having nfsroot,
+    like this:
+      qemu-system-x86_64 -tftp /home/pcroot/boot -net nic -net user,bootfile=pxelinux.0 -boot n 
+
+    I don't know how to use NFS through the qemu '-net user' though.
+
+
+    QEMU Testing with NFS root and bridged network
+    -------------------------------------------------
+
+    This allows testing with qemu as any other host in your LAN.
+
+    Testing with the real dhcpd server requires setting up a bridge and having a tap device.
+      tunctl -t tap0
+      brctl addbr br0
+      brctl addif br0 eth0
+      brctl addif tap0 eth0
+      ifconfig eth0 0.0.0.0 up
+      ifconfig tap0 0.0.0.0 up
+      ifconfig br0 up # With your ip configuration
+
+    Then you can run qemu:
+      qemu-system-x86_64 -boot n -net tap,ifname=tap0,script=no -net nic,model=e1000
   '';
 
 in
@@ -58,8 +137,17 @@ in
       { source = pxeconfig;
         target = "/boot/pxelinux.cfg/default";
       }
+      { source = readme;
+        target = "/readme.txt";
+      }
+      { source = dhcpdExampleConfig;
+        target = "/boot/dhcpd.conf-example";
+      }
       { source = "${pkgs.memtest86}/memtest.bin";
-        target = "/boot/memtest.bin";
+        # We can't leave '.bin', because pxelinux interprets this specially,
+        # and it would not load the image fine.
+        # http://forum.canardpc.com/threads/46464-0104-when-launched-via-pxe
+        target = "/boot/memtest";
       }
     ];
      
@@ -69,19 +157,6 @@ in
   services.openssh.enable = true;
   jobs.openssh.startOn = pkgs.lib.mkOverrideTemplate 50 {} "";
 
-  boot.initrd.postMountCommands = ''
-    for o in $(cat /proc/cmdline); do
-      case $o in
-        tnfsroot=*)
-          set -- $(IFS==; echo $o)
-          # TODO: It cannot mount nfs, as maybe it cannot find 'mount.nfs'
-          mount $2 /mnt-root
-          ;;
-        *) ;;
-      esac
-    done
-  '';
-
   boot.kernelPackages = pkgs.linuxPackages_2_6_39;
   nixpkgs.config = {
     packageOverrides = p: rec {
diff --git a/modules/installer/cd-dvd/system-tarball.nix b/modules/installer/cd-dvd/system-tarball.nix
index 63c5a3117c4..a829b85b59f 100644
--- a/modules/installer/cd-dvd/system-tarball.nix
+++ b/modules/installer/cd-dvd/system-tarball.nix
@@ -72,13 +72,16 @@ in
     inherit (config.tarball) contents storeContents;
   };
 
+  # Otherwise it will collide with the 'ip=dhcp' kernel autoconfig.
+  networking.useDHCP = false;
+
   boot.postBootCommands =
     ''
       # After booting, register the contents of the Nix store on the
       # CD in the Nix database in the tmpfs.
       if [ -f /nix-path-registration ]; then
         ${config.environment.nix}/bin/nix-store --load-db < /nix-path-registration &&
-        rm /nix-path/registration
+        rm /nix-path-registration
       fi
 
       # nixos-rebuild also requires a "system" profile and an
-- 
GitLab


From 4790c147bf702f9f00c731eb967297d97356140b Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 15 Aug 2011 14:48:32 +0000
Subject: [PATCH 3107/5331] * Revert r28400 because ConsoleKit got reverted to
 0.4.1.

svn path=/nixos/trunk/; revision=28587
---
 modules/programs/shadow.nix                       |  3 +--
 modules/services/x11/display-managers/auto.nix    |  5 -----
 modules/services/x11/display-managers/default.nix | 10 ++--------
 modules/services/x11/display-managers/slim.nix    | 11 +----------
 4 files changed, 4 insertions(+), 25 deletions(-)

diff --git a/modules/programs/shadow.nix b/modules/programs/shadow.nix
index 68e9fe38f5b..81286d9bb5c 100644
--- a/modules/programs/shadow.nix
+++ b/modules/programs/shadow.nix
@@ -75,8 +75,7 @@ in
     security.pam.services =
       [ { name = "chsh"; rootOK = true; }
         { name = "chfn"; rootOK = true; }
-        # Enable ‘ownDevices’ for the services/x11/display-managers/auto.nix module.
-        { name = "su"; rootOK = true; ownDevices = true; forwardXAuth = true; }
+        { name = "su"; rootOK = true; forwardXAuth = true; }
         { name = "passwd"; }
         # Note: useradd, groupadd etc. aren't setuid root, so it
         # doesn't really matter what the PAM config says as long as it
diff --git a/modules/services/x11/display-managers/auto.nix b/modules/services/x11/display-managers/auto.nix
index 7518dc350f7..e2b1ee42e83 100644
--- a/modules/services/x11/display-managers/auto.nix
+++ b/modules/services/x11/display-managers/auto.nix
@@ -52,11 +52,6 @@ in
           '';
       };
 
-    # The ConsoleKit PAM connector launches a local session, but it's
-    # not set as "active" (maybe because x11-display-device is not
-    # set).  Launching a child session seems to fix that.
-    services.xserver.displayManager.forceCKSession = true;
-    
   };
 
 }
diff --git a/modules/services/x11/display-managers/default.nix b/modules/services/x11/display-managers/default.nix
index 6308ff0f5bb..7e21f27ff69 100644
--- a/modules/services/x11/display-managers/default.nix
+++ b/modules/services/x11/display-managers/default.nix
@@ -55,8 +55,8 @@ let
 
       # Start a ConsoleKit session so that we get ownership of various
       # devices.
-      if [ \( -z "$XDG_SESSION_COOKIE" -o -n "${toString cfg.displayManager.forceCKSession}" \) -a -z "$CK_STARTED" ]; then
-          CK_STARTED=1 exec ${pkgs.consolekit}/bin/ck-launch-session "$0" "$sessionType"
+      if test -z "$XDG_SESSION_COOKIE"; then
+          exec ${pkgs.consolekit}/bin/ck-launch-session "$0" "$sessionType"
       fi
 
       # Handle being called by kdm.
@@ -164,12 +164,6 @@ in
         apply = toString;
       };
 
-      forceCKSession = mkOption {
-        internal = true;
-        default = false;
-        description = "Whether to force launching of a ConsoleKit session.";
-      };
-
       session = mkOption {
         default = [];
         example = [
diff --git a/modules/services/x11/display-managers/slim.nix b/modules/services/x11/display-managers/slim.nix
index fb6f1de9d5a..0e48cae7423 100644
--- a/modules/services/x11/display-managers/slim.nix
+++ b/modules/services/x11/display-managers/slim.nix
@@ -106,17 +106,8 @@ in
 
     # Allow null passwords so that the user can login as root on the
     # installation CD.
-    security.pam.services = singleton
-      { name = "slim";
-        allowNullPassword = true;
-        ownDevices = true;
-      };
+    security.pam.services = [ { name = "slim"; allowNullPassword = true; } ];
 
-    # The ConsoleKit PAM connector launches a local session, but it's
-    # not set as "active" (maybe because x11-display-device is not
-    # set).  Launching a child session seems to fix that.
-    services.xserver.displayManager.forceCKSession = true;
-    
   };
 
 }
-- 
GitLab


From 9177fc455d81b570753f36647847090fc977e8b5 Mon Sep 17 00:00:00 2001
From: "Yury G. Kudryashov" <urkud.urkud@gmail.com>
Date: Mon, 15 Aug 2011 18:08:12 +0000
Subject: [PATCH 3108/5331] Adjust nixos to latest changes in kde-4.7 in
 nixpkgs

svn path=/nixos/trunk/; revision=28598
---
 modules/services/x11/desktop-managers/kde4.nix | 14 ++++----------
 1 file changed, 4 insertions(+), 10 deletions(-)

diff --git a/modules/services/x11/desktop-managers/kde4.nix b/modules/services/x11/desktop-managers/kde4.nix
index 846a4d90e23..976c74d71ab 100644
--- a/modules/services/x11/desktop-managers/kde4.nix
+++ b/modules/services/x11/desktop-managers/kde4.nix
@@ -8,7 +8,7 @@ let
   cfg = xcfg.desktopManager.kde4;
   xorg = pkgs.xorg;
 
-  isKDE47 = !(pkgs.kde4 ? kdebase);
+  isKDE47 = pkgs.kde4 ? kde_wallpapers;
 
 in
 
@@ -106,17 +106,9 @@ in
       else
         # KDE >= 4.7
         [ pkgs.kde4.kdelibs
-          pkgs.kde4.kde_baseapps
-          pkgs.kde4.kde_runtime
-          pkgs.kde4.kde_workspace
+          pkgs.kde4.kdebase # contains kde-workspace etc.
           pkgs.kde4.kde_wallpapers # contains kdm's default background
           pkgs.kde4.oxygen_icons
-          pkgs.kde4.konsole
-          pkgs.kde4.kcolorchooser
-          pkgs.kde4.kdegraphics.ksnapshot
-          pkgs.kde4.kate
-          pkgs.kde4.kdegraphics.okular
-          pkgs.kde4.kdegraphics.gwenview
 
           # Phonon backends.
           pkgs.phonon_backend_gstreamer
@@ -133,6 +125,8 @@ in
           xorg.xmessage # so that startkde can show error messages
           xorg.xset # used by startkde, non-essential
           xorg.xauth # used by kdesu
+          pkgs.shared_desktop_ontologies # used by nepomuk
+          pkgs.strigi # used by nepomuk
         ]
       ) ++ config.environment.kdePackages;
 
-- 
GitLab


From a84ada1d922f15826e5b2056a4c5cf8c02854926 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 19 Aug 2011 20:44:12 +0000
Subject: [PATCH 3109/5331] modules/services/monitoring/smartd.nix: pass TZ
 variable to smartd to ensure that notification e-mails have a proper time
 zone

svn path=/nixos/trunk/; revision=28702
---
 modules/services/monitoring/smartd.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/modules/services/monitoring/smartd.nix b/modules/services/monitoring/smartd.nix
index 94a01eafc57..fc3626a3048 100644
--- a/modules/services/monitoring/smartd.nix
+++ b/modules/services/monitoring/smartd.nix
@@ -73,6 +73,8 @@ in
     jobs.smartd =
       { description = "S.M.A.R.T. Daemon";
 
+        environment.TZ = config.time.timeZone;
+
         startOn = "started syslogd";
 
         daemonType = "daemon";
-- 
GitLab


From 7980c71d9c56cc0b922f8bf27c24141657c4b9ca Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sun, 21 Aug 2011 20:38:45 +0000
Subject: [PATCH 3110/5331] * Add some options to allow setting PolKit
 permissions.

svn path=/nixos/trunk/; revision=28729
---
 modules/security/polkit.nix | 117 ++++++++++++++++++++++++++++++------
 1 file changed, 97 insertions(+), 20 deletions(-)

diff --git a/modules/security/polkit.nix b/modules/security/polkit.nix
index 44acb1766f5..a9d52bb5bd8 100644
--- a/modules/security/polkit.nix
+++ b/modules/security/polkit.nix
@@ -3,6 +3,9 @@
 with pkgs.lib;
 
 let
+
+  cfg = config.security.polkit;
+
   pkWrapper = pkgs.stdenv.mkDerivation {
     name = "polkit-wrapper";
     helper = "libexec/polkit-1/polkit-agent-helper-1";
@@ -14,40 +17,114 @@ let
       mkdir -pv $out
       lndir ${pkgs.polkit} $out
 
+      # !!! I'm pretty sure the wrapper doesn't work because
+      # libpolkit-agent-1.so has a hard-coded reference to
+      # polkit-agent-helper-1.
       rm $out/$helper
       ln -sv ${config.security.wrapperDir}/polkit-agent-helper-1 $out/$helper
       '';
   };
+  
 in
 
 {
 
-  config = {
+  options = {
 
-    environment = {
-      systemPackages = [ pkWrapper ];
-      pathsToLink = [ "/share/polkit-1" "/etc/polkit-1" ];
-      etc = singleton
-        { source = "${config.system.path}/etc/polkit-1";
-          target = "polkit-1";
-        };
+    security.polkit.enable = mkOption {
+      default = true;
+      description = "Whether to enable PolKit.";
     };
 
-    services.dbus.packages = [ pkWrapper ];
+    security.polkit.permissions = mkOption {
+      default = "";
+      example =
+        ''
+          [Disallow Users To Suspend]
+          Identity=unix-group:users
+          Action=org.freedesktop.upower.*
+          ResultAny=no
+          ResultInactive=no
+          ResultActive=no
 
-    security = {
-      pam.services = [ { name = "polkit-1"; } ];
-      setuidPrograms = [ "pkexec" ];
-
-      setuidOwners = singleton
-        { program = "polkit-agent-helper-1";
-          owner = "root";
-          group = "root";
-          setuid = true;
-          source = pkgs.polkit + "/" + pkWrapper.helper;
-        };
+          [Allow Anybody To Eject Disks]
+          Identity=unix-user:*
+          Action=org.freedesktop.udisks.drive-eject
+          ResultAny=yes
+          ResultInactive=yes
+          ResultActive=yes
+
+          [Allow Alice To Mount Filesystems After Admin Authentication]
+          Identity=unix-user:alice
+          Action=org.freedesktop.udisks.filesystem-mount
+          ResultAny=auth_admin
+          ResultInactive=auth_admin
+          ResultActive=auth_admin
+        '';
+      description =
+        ''
+          Allows the default permissions of privileged actions to be overriden.
+        '';
     };
 
+    security.polkit.adminIdentities = mkOption {
+      default = "unix-user:0;unix-group:wheel";
+      example = "";
+      description =
+        ''
+          Specifies which users are considered “administrators”, for those
+          actions that require the user to authenticate as an
+          administrator (i.e. have a <literal>auth_admin</literal>
+          value).  By default, this is the <literal>root</literal>
+          user and all users in the <literal>wheel</literal> group.
+        '';
+    };
+
+  };
+
+
+  config = mkIf cfg.enable {
+
+    environment.systemPackages = [ pkWrapper ];
+
+    # The polkit daemon reads action files 
+    environment.pathsToLink = [ "/share/polkit-1/actions" ];
+
+    environment.etc =
+      [ # No idea what the "null backend" is, but it seems to need this.
+        { source = "${pkgs.polkit}/etc/polkit-1/nullbackend.conf.d";
+          target = "polkit-1/nullbackend.conf.d";
+        }
+
+        # This file determines what users are considered
+        # "administrators".
+        { source = pkgs.writeText "10-nixos.conf"
+            ''
+              [Configuration]
+              AdminIdentities=${cfg.adminIdentities}
+            '';
+          target = "polkit-1/localauthority.conf.d/10-nixos.conf";
+        }
+        
+        { source = pkgs.writeText "org.nixos.pkla" cfg.permissions;
+          target = "polkit-1/localauthority/10-vendor.d/org.nixos.pkla";
+        }
+      ];
+
+    services.dbus.packages = [ pkWrapper ];
+
+    security.pam.services = [ { name = "polkit-1"; } ];
+    
+    security.setuidPrograms = [ "pkexec" ];
+
+    security.setuidOwners = singleton
+      { program = "polkit-agent-helper-1";
+        owner = "root";
+        group = "root";
+        setuid = true;
+        source = pkgs.polkit + "/" + pkWrapper.helper;
+      };
+
     system.activationScripts.polkit =
       ''
         mkdir -p /var/lib/polkit-1/localauthority
-- 
GitLab


From 13a2563d029f9d51bce8200aa1650e6740d29f1e Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sun, 21 Aug 2011 21:03:02 +0000
Subject: [PATCH 3111/5331] * Create /var/lib/udisks because that's where
 udisks keeps its mtab   file.  Without this, users are not able to unmount
 their own   devices (because udisks doesn't remember who mounted them).

svn path=/nixos/trunk/; revision=28730
---
 modules/services/hardware/udisks.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/modules/services/hardware/udisks.nix b/modules/services/hardware/udisks.nix
index 4a97dae7fa0..8d526e22bad 100644
--- a/modules/services/hardware/udisks.nix
+++ b/modules/services/hardware/udisks.nix
@@ -33,6 +33,11 @@ with pkgs.lib;
 
     services.dbus.packages = [ pkgs.udisks ];
 
+    system.activationScripts.udisks =
+      ''
+        mkdir -m 0755 -p /var/lib/udisks
+      '';
+
   };
 
 }
-- 
GitLab


From d1ae2c2ac1ffa8e0abab2eb9de08ac9b60c590c1 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 22 Aug 2011 11:46:32 +0000
Subject: [PATCH 3112/5331] * Polkit: remove the wrapper since it's no longer
 needed (and didn't   really work as far as I can tell).

svn path=/nixos/trunk/; revision=28734
---
 modules/security/polkit.nix | 25 +++----------------------
 1 file changed, 3 insertions(+), 22 deletions(-)

diff --git a/modules/security/polkit.nix b/modules/security/polkit.nix
index a9d52bb5bd8..ac8d68a4d4f 100644
--- a/modules/security/polkit.nix
+++ b/modules/security/polkit.nix
@@ -6,25 +6,6 @@ let
 
   cfg = config.security.polkit;
 
-  pkWrapper = pkgs.stdenv.mkDerivation {
-    name = "polkit-wrapper";
-    helper = "libexec/polkit-1/polkit-agent-helper-1";
-    buildInputs = [ pkgs.xorg.lndir ];
-
-    builder = pkgs.writeScript "pkwrap-builder" ''
-      source $stdenv/setup
-
-      mkdir -pv $out
-      lndir ${pkgs.polkit} $out
-
-      # !!! I'm pretty sure the wrapper doesn't work because
-      # libpolkit-agent-1.so has a hard-coded reference to
-      # polkit-agent-helper-1.
-      rm $out/$helper
-      ln -sv ${config.security.wrapperDir}/polkit-agent-helper-1 $out/$helper
-      '';
-  };
-  
 in
 
 {
@@ -85,7 +66,7 @@ in
 
   config = mkIf cfg.enable {
 
-    environment.systemPackages = [ pkWrapper ];
+    environment.systemPackages = [ pkgs.polkit ];
 
     # The polkit daemon reads action files 
     environment.pathsToLink = [ "/share/polkit-1/actions" ];
@@ -111,7 +92,7 @@ in
         }
       ];
 
-    services.dbus.packages = [ pkWrapper ];
+    services.dbus.packages = [ pkgs.polkit ];
 
     security.pam.services = [ { name = "polkit-1"; } ];
     
@@ -122,7 +103,7 @@ in
         owner = "root";
         group = "root";
         setuid = true;
-        source = pkgs.polkit + "/" + pkWrapper.helper;
+        source = "${pkgs.polkit}/libexec/polkit-1/polkit-agent-helper-1";
       };
 
     system.activationScripts.polkit =
-- 
GitLab


From ecbfe0d9c06491bc9d63d9105371f9e3108c383f Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 22 Aug 2011 11:51:03 +0000
Subject: [PATCH 3113/5331] * Cause KDE's Polkit authentication agent to be
 started at login.   You now get a nice popup window asking for the
 appropriate password   if you try to do something that requires
 administrative privilege   (e.g. "pkexec ls" in a terminal, unmounting
 devices that don't   belong to you in Dolphin, or killing other people's
 processes in   ksysguard).

svn path=/nixos/trunk/; revision=28735
---
 modules/services/x11/desktop-managers/kde4.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/modules/services/x11/desktop-managers/kde4.nix b/modules/services/x11/desktop-managers/kde4.nix
index 976c74d71ab..ce3966fb28a 100644
--- a/modules/services/x11/desktop-managers/kde4.nix
+++ b/modules/services/x11/desktop-managers/kde4.nix
@@ -110,6 +110,9 @@ in
           pkgs.kde4.kde_wallpapers # contains kdm's default background
           pkgs.kde4.oxygen_icons
 
+          # Starts KDE's Polkit authentication agent.
+          pkgs.polkit_kde_agent
+
           # Phonon backends.
           pkgs.phonon_backend_gstreamer
           pkgs.gst_all.gstPluginsBase
-- 
GitLab


From 3b1c741f3fef52ba245591f42971d8abf656cb39 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 22 Aug 2011 22:52:13 +0000
Subject: [PATCH 3114/5331] * Xfce 4.8 doesn't need HAL anymore.

svn path=/nixos/trunk/; revision=28762
---
 modules/services/x11/desktop-managers/xfce.nix | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/modules/services/x11/desktop-managers/xfce.nix b/modules/services/x11/desktop-managers/xfce.nix
index a9a0cd27e1a..89d4b1fd4dd 100644
--- a/modules/services/x11/desktop-managers/xfce.nix
+++ b/modules/services/x11/desktop-managers/xfce.nix
@@ -7,6 +7,8 @@ let
   xcfg = config.services.xserver;
   cfg = xcfg.desktopManager.xfce;
 
+  isXfce48 = pkgs.xfce ? libxfce4ui;
+
 in
 
 {
@@ -69,12 +71,16 @@ in
         pkgs.gnome.gnomeicontheme
         pkgs.desktop_file_utils
       ]
+      ++ optionals isXfce48 [
+        pkgs.xfce.libxfce4ui
+        pkgs.xfce.garcon
+      ]
       ++ optional config.powerManagement.enable pkgs.xfce.xfce4_power_manager;
 
     environment.pathsToLink =
-      [ "/share/xfce4" "/share/themes" "/share/mime" ];
+      [ "/share/xfce4" "/share/themes" "/share/mime" "/share/desktop-directories" ];
       
-    services.hal.enable = true;
+    services.hal = mkIf (!isXfce48) { enable = true; };
     
   };
 
-- 
GitLab


From 1aa1c86afc5ac6e11162fb55f0113b7c58936c8a Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 22 Aug 2011 23:10:24 +0000
Subject: [PATCH 3115/5331] * Enable upower and udisks for Xfce 4.8.

svn path=/nixos/trunk/; revision=28764
---
 modules/services/x11/desktop-managers/kde4.nix | 4 ++--
 modules/services/x11/desktop-managers/xfce.nix | 3 +++
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/modules/services/x11/desktop-managers/kde4.nix b/modules/services/x11/desktop-managers/kde4.nix
index ce3966fb28a..6baa17be9a1 100644
--- a/modules/services/x11/desktop-managers/kde4.nix
+++ b/modules/services/x11/desktop-managers/kde4.nix
@@ -140,10 +140,10 @@ in
         target = "X11/xkb";
       };
 
-    # Enable required DBus services.
+    # Enable helpful DBus services.
     services.hal = mkIf (!isKDE47) { enable = true; };
     services.udisks = mkIf isKDE47 { enable = true; };
-    services.upower = mkIf isKDE47 { enable = true; };
+    services.upower = mkIf (isKDE47 && config.powerManagement.enable) { enable = true; };
 
   };
 
diff --git a/modules/services/x11/desktop-managers/xfce.nix b/modules/services/x11/desktop-managers/xfce.nix
index 89d4b1fd4dd..fa1e4044b14 100644
--- a/modules/services/x11/desktop-managers/xfce.nix
+++ b/modules/services/x11/desktop-managers/xfce.nix
@@ -80,7 +80,10 @@ in
     environment.pathsToLink =
       [ "/share/xfce4" "/share/themes" "/share/mime" "/share/desktop-directories" ];
       
+    # Enable helpful DBus services.
     services.hal = mkIf (!isXfce48) { enable = true; };
+    services.udisks = mkIf isXfce48 { enable = true; };
+    services.upower = mkIf (isXfce48 && config.powerManagement.enable) { enable = true; };
     
   };
 
-- 
GitLab


From e5917ea6fc26ecf52b5db6ccf2bb8bfc8c507854 Mon Sep 17 00:00:00 2001
From: "Yury G. Kudryashov" <urkud.urkud@gmail.com>
Date: Wed, 24 Aug 2011 21:24:39 +0000
Subject: [PATCH 3116/5331] Merge with udev-173

The only conflict was the addition of two different options at the same place.

svn path=/nixos/trunk/; revision=28801
---
 modules/services/hardware/udev.nix   | 52 ++++++++++++++++++++++------
 modules/services/hardware/udisks.nix |  1 +
 modules/services/hardware/upower.nix |  2 ++
 modules/services/system/dbus.nix     |  2 +-
 modules/system/boot/stage-1.nix      | 37 ++++++++++----------
 5 files changed, 63 insertions(+), 31 deletions(-)

diff --git a/modules/services/hardware/udev.nix b/modules/services/hardware/udev.nix
index 7b4f86b93cb..73ec53e04e7 100644
--- a/modules/services/hardware/udev.nix
+++ b/modules/services/hardware/udev.nix
@@ -34,9 +34,6 @@ let
       ensureDir $out
       shopt -s nullglob
 
-      # Use all the default udev rules.
-      cp -v ${udev}/libexec/rules.d/*.rules $out/
-
       # Set a reasonable $PATH for programs called by udev rules.
       echo 'ENV{PATH}="${udevPath}/bin:${udevPath}/sbin"' > $out/00-path.rules
 
@@ -48,19 +45,19 @@ let
       for i in ${toString cfg.packages}; do
         echo "Adding rules for package $i"
         for j in $i/*/udev/rules.d/*; do
-          ln -sv $j $out/$(basename $j)
+          echo "Copying $j to $out/$(basename $j)"
+          echo "# Copied from $j" > $out/$(basename $j)
+          cat $j >> $out/$(basename $j)
         done
       done
 
       # Fix some paths in the standard udev rules.  Hacky.
       for i in $out/*.rules; do
         substituteInPlace $i \
-          --replace /sbin/modprobe ${modprobe}/sbin/modprobe \
-          --replace /sbin/blkid ${pkgs.utillinux}/sbin/blkid \
-          --replace /sbin/mdadm ${pkgs.mdadm}/sbin/mdadm \
-          --replace '$env{DM_SBIN_PATH}/blkid' ${pkgs.utillinux}/sbin/blkid \
-          --replace 'ENV{DM_SBIN_PATH}="/sbin"' 'ENV{DM_SBIN_PATH}="${pkgs.lvm2}/sbin"' \
-          --replace /bin/mount ${pkgs.utillinux}/bin/mount
+          --replace \"/sbin/modprobe \"${modprobe}/sbin/modprobe \
+          --replace \"/sbin/mdadm \"${pkgs.mdadm}/sbin/mdadm \
+          --replace \"/sbin/blkid \"${pkgs.utillinux}/sbin/blkid \
+          --replace \"/bin/mount \"${pkgs.utillinux}/bin/mount
       done
 
       # If auto-configuration is disabled, then remove
@@ -68,6 +65,39 @@ let
       # automatically calling modprobe.
       ${if !config.boot.hardwareScan then "rm $out/80-drivers.rules" else ""}
 
+      echo -n "Checking that all programs called by relative paths in udev rules exist in ${udev}/lib/udev ... "
+      import_progs=$(grep 'IMPORT{program}="[^/$]' $out/* |
+        sed -e 's/.*IMPORT{program}="\([^ "]*\)[ "].*/\1/' | uniq)
+      run_progs=$(grep 'RUN+="[^/$]' $out/* |
+        sed -e 's/.*RUN+="\([^ "]*\)[ "].*/\1/' | uniq)
+      for i in $import_progs $run_progs; do
+        if [[ ! -x ${pkgs.udev}/lib/udev/$i ]]; then
+          echo "FAIL"
+          echo "$i is called in udev rules but not installed by udev"
+          exit 1
+        fi
+      done
+      echo "OK"
+
+      echo -n "Checking that all programs call by absolute paths in udev rules exist ... "
+      import_progs=$(grep 'IMPORT{program}="/' $out/* |
+        sed -e 's/.*IMPORT{program}="\([^ "]*\)[ "].*/\1/' | uniq)
+      run_progs=$(grep 'RUN+="/' $out/* |
+        sed -e 's/.*RUN+="\([^ "]*\)[ "].*/\1/' | uniq)
+      for i in $import_progs $run_progs; do
+        if [[ ! -x $i ]]; then
+          echo "FAIL"
+          echo "$i is called in udev rules but not installed by udev"
+          exit 1
+        fi
+      done
+      echo "OK"
+
+      echo "Consider fixing the following udev rules:"
+      for i in ${toString cfg.packages}; do
+        grep -l '\(RUN+\|IMPORT{program}\)="\(/usr\)\?/s\?bin' $i/*/udev/rules.d/* || true
+      done
+
       # Use the persistent device rules (naming for CD/DVD and
       # network devices) stored in 
       # /var/lib/udev/rules.d/70-persistent-{cd,net}.rules.  These are
@@ -178,7 +208,7 @@ in
 
     services.udev.extraRules = nixosRules;
     
-    services.udev.packages = [ extraUdevRules ];
+    services.udev.packages = [ pkgs.udev extraUdevRules ];
 
     services.udev.path = [ pkgs.coreutils pkgs.gnused pkgs.gnugrep pkgs.utillinux pkgs.udev ];
 
diff --git a/modules/services/hardware/udisks.nix b/modules/services/hardware/udisks.nix
index 8d526e22bad..21749da424e 100644
--- a/modules/services/hardware/udisks.nix
+++ b/modules/services/hardware/udisks.nix
@@ -38,6 +38,7 @@ with pkgs.lib;
         mkdir -m 0755 -p /var/lib/udisks
       '';
 
+    services.udev.packages = [ pkgs.udisks ];
   };
 
 }
diff --git a/modules/services/hardware/upower.nix b/modules/services/hardware/upower.nix
index c529e8b3cdb..8e7cf23900c 100644
--- a/modules/services/hardware/upower.nix
+++ b/modules/services/hardware/upower.nix
@@ -33,6 +33,8 @@ with pkgs.lib;
 
     services.dbus.packages = [ pkgs.upower ];
 
+    services.udev.packages = [ pkgs.upower ];
+
   };
 
 }
diff --git a/modules/services/system/dbus.nix b/modules/services/system/dbus.nix
index e083707751a..e33adbe4fea 100644
--- a/modules/services/system/dbus.nix
+++ b/modules/services/system/dbus.nix
@@ -17,7 +17,7 @@ let
     buildCommand = ''
       ensureDir $out
       
-      cp ${dbus}/etc/dbus-1/system.conf $out/system.conf
+      cp -v ${dbus}/etc/dbus-1/system.conf $out/system.conf
 
       # !!! Hm, these `sed' calls are rather error-prone...
 
diff --git a/modules/system/boot/stage-1.nix b/modules/system/boot/stage-1.nix
index e4f935d7253..c4e93461015 100644
--- a/modules/system/boot/stage-1.nix
+++ b/modules/system/boot/stage-1.nix
@@ -15,7 +15,7 @@ let
       default = "";
       example = "0:0";
       description = "
-        Device for manual resume attempt during boot. Looks like 
+        Device for manual resume attempt during boot. Looks like
         major:minor. ls -l /dev/SWAP_PARTION shows them.
       ";
     };
@@ -74,7 +74,7 @@ let
         ";
       };
     };
-  
+
   };
 
 
@@ -107,7 +107,7 @@ let
     ''
       ensureDir $out/bin
       ensureDir $out/lib
-      
+
       # Copy what we need from Glibc.
       cp -pv ${pkgs.glibc}/lib/ld*.so.? $out/lib
       cp -pv ${pkgs.glibc}/lib/libc.so.* $out/lib
@@ -133,7 +133,7 @@ let
       cp -v ${pkgs.coreutils}/bin/sleep $out/bin
       cp -v ${pkgs.coreutils}/bin/ln $out/bin
 
-      # Copy e2fsck and friends.      
+      # Copy e2fsck and friends.
       cp -v ${pkgs.e2fsprogs}/sbin/e2fsck $out/bin
       cp -v ${pkgs.e2fsprogs}/sbin/tune2fs $out/bin
       cp -v ${pkgs.reiserfsprogs}/sbin/reiserfsck $out/bin
@@ -154,9 +154,9 @@ let
 
       # Copy udev.
       cp -v ${pkgs.udev}/sbin/udevd ${pkgs.udev}/sbin/udevadm $out/bin
-      cp -v ${pkgs.udev}/libexec/*_id $out/bin
+      cp -v ${pkgs.udev}/lib/udev/*_id $out/bin
       cp -pdv ${pkgs.udev}/lib/libudev.so.* $out/lib
-      
+
       # Copy bash.
       cp -v ${pkgs.bash}/bin/bash $out/bin
       ln -sv bash $out/bin/sh
@@ -191,7 +191,7 @@ let
       exec $out/bin/modprobe.real "\$@"
       EOF
       chmod u+x $out/bin/modprobe
-      
+
       # Make sure that the patchelf'ed binaries still work.
       echo "testing patched programs..."
       $out/bin/bash --version | grep "bash, version"
@@ -209,7 +209,7 @@ let
       $out/bin/basename --version
       $out/bin/modprobe --version
     ''; # */
-  
+
 
   # The initrd only has to mount / or any FS marked as necessary for
   # booting (such as the FS containing /nix/store, or an FS needed for
@@ -225,12 +225,12 @@ let
       ensureDir $out
 
       echo 'ENV{LD_LIBRARY_PATH}="${extraUtils}/lib"' > $out/00-env.rules
-      
-      cp ${pkgs.udev}/libexec/rules.d/60-cdrom_id.rules $out/
-      cp ${pkgs.udev}/libexec/rules.d/60-persistent-storage.rules $out/
-      cp ${pkgs.udev}/libexec/rules.d/80-drivers.rules $out/
-      cp ${pkgs.lvm2}/lib/udev/rules.d/*.rules $out/
-      cp ${pkgs.mdadm}/lib/udev/rules.d/*.rules $out/
+
+      cp -v ${pkgs.udev}/lib/udev/rules.d/60-cdrom_id.rules $out/
+      cp -v ${pkgs.udev}/lib/udev/rules.d/60-persistent-storage.rules $out/
+      cp -v ${pkgs.udev}/lib/udev/rules.d/80-drivers.rules $out/
+      cp -v ${pkgs.lvm2}/lib/udev/rules.d/*.rules $out/
+      cp -v ${pkgs.mdadm}/lib/udev/rules.d/*.rules $out/
 
       for i in $out/*.rules; do
           substituteInPlace $i \
@@ -243,10 +243,9 @@ let
             --replace /sbin/blkid ${extraUtils}/bin/blkid \
             --replace /sbin/modprobe ${extraUtils}/bin/modprobe \
             --replace '$env{DM_SBIN_PATH}/blkid' ${extraUtils}/bin/blkid \
-            --replace 'ENV{DM_SBIN_PATH}="/sbin"' 'ENV{DM_SBIN_PATH}="${extraUtils}/bin"' \
+            --replace 'ENV{DM_SBIN_PATH}="${pkgs.lvm2}/sbin"' 'ENV{DM_SBIN_PATH}="${extraUtils}/bin"' \
             --replace /sbin/mdadm ${extraUtils}/bin/mdadm
       done
-
       # !!! Remove this after merging the x-updates branch:
 
       # Work around a bug in QEMU, which doesn't implement the "READ
@@ -264,13 +263,13 @@ let
     ''; # */
   };
 
-  
+
   # The udev configuration file for in the initrd.
   udevConf = pkgs.writeText "udev-initrd.conf" ''
     udev_rules="${udevRules}"
     #udev_log="debug"
   '';
-  
+
 
   # The init script of boot stage 1 (loading kernel modules for
   # mounting the root FS).
@@ -319,7 +318,7 @@ let
           }
         ];
   };
-  
+
 in {
 
   require = [options];
-- 
GitLab


From 25594961ad13ee0ad85a3aafc95ce9b1ed38e7d6 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Wed, 24 Aug 2011 23:37:40 +0000
Subject: [PATCH 3117/5331] modprobe.nix: Blacklist snd_pcsp by default

svn path=/nixos/trunk/; revision=28805
---
 modules/system/boot/modprobe.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/modules/system/boot/modprobe.nix b/modules/system/boot/modprobe.nix
index aa4d023a9f4..fe667ce59c5 100644
--- a/modules/system/boot/modprobe.nix
+++ b/modules/system/boot/modprobe.nix
@@ -83,6 +83,11 @@ with pkgs.lib;
         # of log output, so it should never be loaded automatically.
         "evbug"
 
+        # This module causes ALSA to occassionally select the wrong
+        # default sound device, and is little more than an annoyance
+        # on modern machines.
+        "snd_pcsp"
+
         # !!! Hm, Ubuntu blacklists all framebuffer devices because
         # they're "buggy" and cause suspend problems.  Maybe we should
         # too?
-- 
GitLab


From ea4630bf97ad139ccced271ab269a310ffd84301 Mon Sep 17 00:00:00 2001
From: "Yury G. Kudryashov" <urkud.urkud@gmail.com>
Date: Thu, 25 Aug 2011 08:06:09 +0000
Subject: [PATCH 3118/5331] Allow RUN+="socket:..." in udev rules

svn path=/nixos/trunk/; revision=28808
---
 modules/services/hardware/udev.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/services/hardware/udev.nix b/modules/services/hardware/udev.nix
index 73ec53e04e7..8715c0cb84e 100644
--- a/modules/services/hardware/udev.nix
+++ b/modules/services/hardware/udev.nix
@@ -71,7 +71,7 @@ let
       run_progs=$(grep 'RUN+="[^/$]' $out/* |
         sed -e 's/.*RUN+="\([^ "]*\)[ "].*/\1/' | uniq)
       for i in $import_progs $run_progs; do
-        if [[ ! -x ${pkgs.udev}/lib/udev/$i ]]; then
+        if [[ ! -x ${pkgs.udev}/lib/udev/$i && ! $i =~ socket:.* ]]; then
           echo "FAIL"
           echo "$i is called in udev rules but not installed by udev"
           exit 1
-- 
GitLab


From abfdab0d3e23f15c0a875cf6fb5bfbd2246722d4 Mon Sep 17 00:00:00 2001
From: Sander van der Burg <s.vanderburg@tudelft.nl>
Date: Fri, 26 Aug 2011 10:17:24 +0000
Subject: [PATCH 3119/5331] Added testcase for Tomcat, with HTTP proxy

svn path=/nixos/trunk/; revision=28824
---
 release.nix       |  1 +
 tests/default.nix |  1 +
 tests/tomcat.nix  | 31 +++++++++++++++++++++++++++++++
 3 files changed, 33 insertions(+)
 create mode 100644 tests/tomcat.nix

diff --git a/release.nix b/release.nix
index 6f2807652ca..d3c6308197f 100644
--- a/release.nix
+++ b/release.nix
@@ -181,6 +181,7 @@ let
         quake3 = t.quake3.report;
         remote_builds = t.remote_builds.test;
         #subversion = t.subversion.report;
+        tomcat = t.tomcat.test;
         trac = t.trac.test;
         xfce = t.xfce.test;
       };
diff --git a/tests/default.nix b/tests/default.nix
index 767732b53b4..e8c2e348b2b 100644
--- a/tests/default.nix
+++ b/tests/default.nix
@@ -25,6 +25,7 @@ with import ../lib/testing.nix { inherit nixpkgs system; };
   remote_builds = makeTest (import ./remote-builds.nix);
   simple = makeTest (import ./simple.nix);
   #subversion = makeTest (import ./subversion.nix);
+  tomcat = makeTest (import ./tomcat.nix);
   trac = makeTest (import ./trac.nix);
   xfce = makeTest (import ./xfce.nix);
 }
diff --git a/tests/tomcat.nix b/tests/tomcat.nix
new file mode 100644
index 00000000000..a6a60ba72fc
--- /dev/null
+++ b/tests/tomcat.nix
@@ -0,0 +1,31 @@
+{ pkgs, ... }:
+
+{
+  nodes = {
+    server = 
+      { pkgs, config, ... }:
+      
+      {
+        services.tomcat.enable = true;
+        services.httpd.enable = true;
+        services.httpd.adminAddr = "foo@bar.com";
+        services.httpd.extraSubservices = [
+          { serviceType = "tomcat-connector";
+            stateDir = "/var/run/httpd";
+            logDir = "/var/log/httpd";
+          }
+        ];
+      };
+      
+    client = { };
+  };
+  
+  testScript = ''
+    startAll;
+
+    $server->waitForJob("tomcat");
+    $server->sleep(30); # Dirty, but it takes a while before Tomcat handles to requests properly
+    $client->mustSucceed("curl --fail http://server/examples/servlets/servlet/HelloWorldExample");
+    $client->mustSucceed("curl --fail http://server/examples/jsp/jsp2/simpletag/hello.jsp");
+  '';
+}
-- 
GitLab


From 42a03ef0ebb0fe0a2b8f96ab355502a4719138b8 Mon Sep 17 00:00:00 2001
From: "Yury G. Kudryashov" <urkud.urkud@gmail.com>
Date: Fri, 26 Aug 2011 13:46:59 +0000
Subject: [PATCH 3120/5331] Sync with dbus changes in nixpkgs

svn path=/nixos/trunk/; revision=28832
---
 modules/services/system/dbus.nix | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/modules/services/system/dbus.nix b/modules/services/system/dbus.nix
index e33adbe4fea..2777d219063 100644
--- a/modules/services/system/dbus.nix
+++ b/modules/services/system/dbus.nix
@@ -8,8 +8,6 @@ let
 
   cfg = config.services.dbus;
 
-  inherit (pkgs) dbus;
-
   homeDir = "/var/run/dbus";
 
   configDir = pkgs.stdenv.mkDerivation {
@@ -17,7 +15,7 @@ let
     buildCommand = ''
       ensureDir $out
       
-      cp -v ${dbus}/etc/dbus-1/system.conf $out/system.conf
+      cp -v ${pkgs.dbus_daemon}/etc/dbus-1/system.conf $out/system.conf
 
       # !!! Hm, these `sed' calls are rather error-prone...
 
@@ -32,7 +30,7 @@ let
           -e 's|<standard_system_servicedirs/>|${systemServiceDirs}|' \
           -e 's|<includedir>system.d</includedir>|${systemIncludeDirs}|'
 
-      cp ${dbus}/etc/dbus-1/session.conf $out/session.conf
+      cp ${pkgs.dbus_daemon}/etc/dbus-1/session.conf $out/session.conf
       
       # Add the services and session.d directories to the session bus
       # search path.
@@ -97,7 +95,7 @@ in
 
   config = mkIf cfg.enable {
 
-    environment.systemPackages = [ dbus.daemon dbus.tools ];
+    environment.systemPackages = [ pkgs.dbus_daemon pkgs.dbus_tools ];
 
     environment.etc = singleton
       { source = configDir;
@@ -126,14 +124,14 @@ in
             chown messagebus ${homeDir}
 
             mkdir -m 0755 -p /var/lib/dbus
-            ${dbus.tools}/bin/dbus-uuidgen --ensure
+            ${pkgs.dbus_tools}/bin/dbus-uuidgen --ensure
  
             rm -f ${homeDir}/pid
           '';
 
         daemonType = "fork";
 
-        exec = "${dbus}/bin/dbus-daemon --system";
+        exec = "${pkgs.dbus_daemon}/bin/dbus-daemon --system";
 
         postStop =
           ''
@@ -148,7 +146,7 @@ in
 
     security.setuidOwners = singleton
       { program = "dbus-daemon-launch-helper";
-        source = "${dbus}/libexec/dbus-daemon-launch-helper";
+        source = "${pkgs.dbus_daemon}/libexec/dbus-daemon-launch-helper";
         owner = "root";
         group = "messagebus";
         setuid = true;
-- 
GitLab


From c174554ad74f6f1bb5ecf1d78acc00ef05c557d4 Mon Sep 17 00:00:00 2001
From: "Yury G. Kudryashov" <urkud.urkud@gmail.com>
Date: Fri, 26 Aug 2011 13:50:03 +0000
Subject: [PATCH 3121/5331] polkit_kde_agent is now kde4.polkit_kde_agent

svn path=/nixos/trunk/; revision=28834
---
 modules/services/x11/desktop-managers/kde4.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/services/x11/desktop-managers/kde4.nix b/modules/services/x11/desktop-managers/kde4.nix
index 6baa17be9a1..309def66f20 100644
--- a/modules/services/x11/desktop-managers/kde4.nix
+++ b/modules/services/x11/desktop-managers/kde4.nix
@@ -111,7 +111,7 @@ in
           pkgs.kde4.oxygen_icons
 
           # Starts KDE's Polkit authentication agent.
-          pkgs.polkit_kde_agent
+          pkgs.kde4.polkit_kde_agent
 
           # Phonon backends.
           pkgs.phonon_backend_gstreamer
-- 
GitLab


From 5ee15d498623d43677434b23521c33a55e994431 Mon Sep 17 00:00:00 2001
From: "Yury G. Kudryashov" <urkud.urkud@gmail.com>
Date: Fri, 26 Aug 2011 17:30:53 +0000
Subject: [PATCH 3122/5331] Fix hal evaluation

svn path=/nixos/trunk/; revision=28842
---
 modules/services/hardware/hal.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/services/hardware/hal.nix b/modules/services/hardware/hal.nix
index 598475d79e7..cadd1afbe22 100644
--- a/modules/services/hardware/hal.nix
+++ b/modules/services/hardware/hal.nix
@@ -81,7 +81,7 @@ in
             HALD_RUNNER_PATH = concatStringsSep ":"
               [ "${pkgs.coreutils}/bin"
                 "${pkgs.gnugrep}/bin"
-                "${pkgs.dbus.tools}/bin"
+                "${pkgs.dbus_tools}/bin"
                 "${pkgs.procps}/bin"
                 "${pkgs.procps}/sbin"
                 "${config.system.sbin.modprobe}/sbin"
-- 
GitLab


From 51006ffdc7553c0e314fddd8173eff0f3f9e3bab Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 29 Aug 2011 14:23:26 +0000
Subject: [PATCH 3123/5331] * Make some tests more robust.  In particular,
 tests should make sure   that the network-interfaces job is up before
 accessing the network.

svn path=/nixos/trunk/; revision=28877
---
 tests/firewall.nix | 1 +
 tests/login.nix    | 6 +++---
 tests/nat.nix      | 2 ++
 tests/tomcat.nix   | 5 +++--
 4 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/tests/firewall.nix b/tests/firewall.nix
index 82071e2d040..d2d2568f1cd 100644
--- a/tests/firewall.nix
+++ b/tests/firewall.nix
@@ -27,6 +27,7 @@
 
       $walled->waitForJob("firewall");
       $walled->waitForJob("httpd");
+      $attacker->waitForJob("network-interfaces");
 
       # Local connections should still work.
       $walled->succeed("curl -v http://localhost/ >&2");
diff --git a/tests/login.nix b/tests/login.nix
index 47649b47afc..3567b6bc246 100644
--- a/tests/login.nix
+++ b/tests/login.nix
@@ -35,11 +35,11 @@
       # Check whether ConsoleKit/udev gives and removes device
       # ownership as needed.
       subtest "device permissions", sub {
+          $machine->fail("getfacl /dev/snd/timer | grep -q alice");
           $machine->succeed("chvt 1");
-          $machine->sleep(1); # urgh
-          $machine->succeed("getfacl /dev/snd/timer | grep -q alice");
+          $machine->waitUntilSucceeds("getfacl /dev/snd/timer | grep -q alice");
           $machine->succeed("chvt 2");
-          $machine->sleep(1); # urgh
+          $machine->sleep(2); # urgh
           $machine->fail("getfacl /dev/snd/timer | grep -q alice");
       };
 
diff --git a/tests/nat.nix b/tests/nat.nix
index 80a395dc123..5466106a43d 100644
--- a/tests/nat.nix
+++ b/tests/nat.nix
@@ -41,10 +41,12 @@
 
       # The router should have access to the server.
       $server->waitForJob("httpd");
+      $router->waitForJob("network-interfaces");
       $router->succeed("curl --fail http://server/ >&2");
 
       # The client should be also able to connect via the NAT router.
       $router->waitForJob("nat");
+      $client->waitForJob("network-interfaces");
       $client->succeed("curl --fail http://server/ >&2");
       $client->succeed("ping -c 1 server >&2");
       
diff --git a/tests/tomcat.nix b/tests/tomcat.nix
index a6a60ba72fc..bf601e834e1 100644
--- a/tests/tomcat.nix
+++ b/tests/tomcat.nix
@@ -25,7 +25,8 @@
 
     $server->waitForJob("tomcat");
     $server->sleep(30); # Dirty, but it takes a while before Tomcat handles to requests properly
-    $client->mustSucceed("curl --fail http://server/examples/servlets/servlet/HelloWorldExample");
-    $client->mustSucceed("curl --fail http://server/examples/jsp/jsp2/simpletag/hello.jsp");
+    $client->waitForJob("network-interfaces");
+    $client->succeed("curl --fail http://server/examples/servlets/servlet/HelloWorldExample");
+    $client->succeed("curl --fail http://server/examples/jsp/jsp2/simpletag/hello.jsp");
   '';
 }
-- 
GitLab


From bd5ca5458408c1a8f4da30ec477227b22a651eeb Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 30 Aug 2011 18:25:54 +0000
Subject: [PATCH 3124/5331] * Add fsck.vfat etc. to the default install. 
 Useful for USB sticks   and stuff like that.

svn path=/nixos/trunk/; revision=28934
---
 modules/tasks/filesystems.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/tasks/filesystems.nix b/modules/tasks/filesystems.nix
index 053597a1a5d..271c0ba0c4e 100644
--- a/modules/tasks/filesystems.nix
+++ b/modules/tasks/filesystems.nix
@@ -5,7 +5,7 @@ with pkgs.lib;
 let
 
   # Packages that provide fsck backends.
-  fsPackages = [ pkgs.e2fsprogs pkgs.reiserfsprogs ];
+  fsPackages = [ pkgs.e2fsprogs pkgs.reiserfsprogs pkgs.dosfstools ];
 
 in
 
-- 
GitLab


From 8138feb630807e3182aaea97b0273fc4bce50c19 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Wed, 31 Aug 2011 21:20:48 +0000
Subject: [PATCH 3125/5331] The VM did not want to mount the CIFS without these
 two modules available in stage1.

svn path=/nixos/trunk/; revision=28947
---
 modules/virtualisation/qemu-vm.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/virtualisation/qemu-vm.nix b/modules/virtualisation/qemu-vm.nix
index 8881cc5304d..93212af2dfc 100644
--- a/modules/virtualisation/qemu-vm.nix
+++ b/modules/virtualisation/qemu-vm.nix
@@ -240,7 +240,7 @@ in
   # CIFS.  Also use paravirtualised network and block devices for
   # performance.
   boot.initrd.availableKernelModules =
-    [ "cifs" "nls_utf8" ]
+    [ "cifs" "nls_utf8" "hmac" "md4" ]
     ++ optional cfg.writableStore [ "aufs" ];
 
   boot.extraModulePackages =
-- 
GitLab


From 8b3fd3ed49d2ce36ccef076e5b2b9f820cda70ea Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 2 Sep 2011 13:19:45 +0000
Subject: [PATCH 3126/5331] =?UTF-8?q?*=20Use=20the=20CFQ=20I/O=20scheduler?=
 =?UTF-8?q?,=20rather=20than=20the=20=E2=80=98none=E2=80=99=20scheduler.?=
 =?UTF-8?q?=20=20This=20=20=20was=20already=20the=20case=20on=20Linux=202.?=
 =?UTF-8?q?6.32,=20but=20in=20newer=20kernels=20the=20CFQ=20=20=20schedule?=
 =?UTF-8?q?r=20is=20built=20as=20a=20module,=20so=20all=20block=20devices?=
 =?UTF-8?q?=20got=20the=20=E2=80=98none=E2=80=99=20=20=20scheduler=20inste?=
 =?UTF-8?q?ad.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

svn path=/nixos/trunk/; revision=28972
---
 modules/system/boot/kernel.nix | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/modules/system/boot/kernel.nix b/modules/system/boot/kernel.nix
index 1f7ea8674fa..1f2d688c13f 100644
--- a/modules/system/boot/kernel.nix
+++ b/modules/system/boot/kernel.nix
@@ -49,7 +49,7 @@ let kernel = config.boot.kernelPackages.kernel; in
       default = true;
       example = false;
       description = ''
-        Whether to activate VESA video mode on boot
+        Whether to activate VESA video mode on boot.
       '';
     };
 
@@ -91,8 +91,7 @@ let kernel = config.boot.kernelPackages.kernel; in
     };
     
     boot.initrd.kernelModules = mkOption {
-      default = [
-      ];
+      default = [];
       description = "List of modules that are always loaded by the initrd.";
     };
 
@@ -121,7 +120,10 @@ let kernel = config.boot.kernelPackages.kernel; in
     system.modulesTree = [ kernel ] ++ config.boot.extraModulePackages;
 
     boot.kernelParams =
-      [ "splash=verbose" ] ++ 
+      [ "splash=verbose"
+        # Force the Completely Fair Scheduler to be used by default.
+        "elevator=cfq"
+      ] ++ 
       optional config.boot.vesa "vga=0x317";
       
     boot.kernelModules = [ "loop" ];
@@ -162,6 +164,9 @@ let kernel = config.boot.kernelPackages.kernel; in
 
         # Unix domain sockets (needed by udev).
         "unix"
+
+        # Provide the CFQ scheduler in the initrd.
+        "cfq_iosched"
         
         # Misc. stuff.
         "pcips2" "serio" "atkbd" "xtkbd"
@@ -170,8 +175,9 @@ let kernel = config.boot.kernelPackages.kernel; in
     boot.initrd.kernelModules =
       [ # For LVM.
         "dm_mod"
-        # For usual AT keyboards
-        "i8042" 
+        
+        # For usual AT keyboards.
+        "i8042"        
       ];
 
     # The Linux kernel >= 2.6.27 provides firmware.
-- 
GitLab


From 0cbdfb2bbf27e6a524b1156b020124c4cce4c3e8 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 2 Sep 2011 13:20:05 +0000
Subject: [PATCH 3127/5331] * Use boot.initrd.availableKernelModules for the
 QEMU modules.

svn path=/nixos/trunk/; revision=28973
---
 modules/profiles/qemu-guest.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/modules/profiles/qemu-guest.nix b/modules/profiles/qemu-guest.nix
index 60a52ce6e12..6eff638e2a2 100644
--- a/modules/profiles/qemu-guest.nix
+++ b/modules/profiles/qemu-guest.nix
@@ -4,5 +4,6 @@
 { config, pkgs, ... }:
 
 {
-  boot.initrd.kernelModules = [ "virtio_net" "virtio_pci" "virtio_blk" "virtio_balloon" "virtio_console" ];
+  boot.initrd.availableKernelModules = [ "virtio_net" "virtio_pci" "virtio_blk" "virtio_balloon" "virtio_console" ];
+  boot.initrd.kernelModules = [ "virtio_balloon" ];
 }
-- 
GitLab


From def746fcdda7b243ed60e490030f6ee81ab5cfa0 Mon Sep 17 00:00:00 2001
From: Nicolas Pierron <nicolas.b.pierron@gmail.com>
Date: Mon, 5 Sep 2011 09:19:55 +0000
Subject: [PATCH 3128/5331] Add Intel firmwars (iwlwifi-6000g2{a,b}-ucode).

svn path=/nixos/trunk/; revision=29020
---
 modules/hardware/network/intel-6000g2a.nix | 5 +++++
 modules/hardware/network/intel-6000g2b.nix | 5 +++++
 modules/installer/scan/not-detected.nix    | 2 ++
 3 files changed, 12 insertions(+)
 create mode 100644 modules/hardware/network/intel-6000g2a.nix
 create mode 100644 modules/hardware/network/intel-6000g2b.nix

diff --git a/modules/hardware/network/intel-6000g2a.nix b/modules/hardware/network/intel-6000g2a.nix
new file mode 100644
index 00000000000..37886eac5ae
--- /dev/null
+++ b/modules/hardware/network/intel-6000g2a.nix
@@ -0,0 +1,5 @@
+{pkgs, config, ...}:
+
+{
+  hardware.firmware = [ pkgs.iwlwifi6000g2aucode ];
+}
diff --git a/modules/hardware/network/intel-6000g2b.nix b/modules/hardware/network/intel-6000g2b.nix
new file mode 100644
index 00000000000..f3fcaee7aa7
--- /dev/null
+++ b/modules/hardware/network/intel-6000g2b.nix
@@ -0,0 +1,5 @@
+{pkgs, config, ...}:
+
+{
+  hardware.firmware = [ pkgs.iwlwifi6000g2bucode ];
+}
diff --git a/modules/installer/scan/not-detected.nix b/modules/installer/scan/not-detected.nix
index e5a53bc8a0f..ddb296b0487 100644
--- a/modules/installer/scan/not-detected.nix
+++ b/modules/installer/scan/not-detected.nix
@@ -8,6 +8,8 @@ with pkgs.lib;
   imports =
     [ ../../hardware/network/intel-5000.nix
       ../../hardware/network/intel-6000.nix
+      ../../hardware/network/intel-6000g2a.nix
+      ../../hardware/network/intel-6000g2b.nix
     ];
 
   config = mkDefault {
-- 
GitLab


From 6669cf61f44d750677462d46ee1ac987b7cae0d6 Mon Sep 17 00:00:00 2001
From: Nicolas Pierron <nicolas.b.pierron@gmail.com>
Date: Mon, 5 Sep 2011 09:19:59 +0000
Subject: [PATCH 3129/5331] Add merge capabilities to nixpkgs.config option.

svn path=/nixos/trunk/; revision=29021
---
 modules/misc/nixpkgs.nix | 38 +++++++++++++++++++++++++++++++++++++-
 1 file changed, 37 insertions(+), 1 deletion(-)

diff --git a/modules/misc/nixpkgs.nix b/modules/misc/nixpkgs.nix
index 154c619bd36..88f5de1be5c 100644
--- a/modules/misc/nixpkgs.nix
+++ b/modules/misc/nixpkgs.nix
@@ -1,5 +1,32 @@
 { config, pkgs, ... }:
 
+with pkgs.lib;
+
+let
+  isConfig = x:
+    builtins.isAttrs x || builtins.isFunction x;
+
+  optCall = f: x:
+    if builtins.isFunction f
+    then f x
+    else f;
+
+  mergeConfig = lhs: rhs:
+    lhs // rhs //
+    optionalAttrs (lhs ? packageOverrides) {
+      packageOverrides = pkgs:
+        optCall lhs.packageOverrides pkgs //
+        optCall (attrByPath ["packageOverrides"] ({}) rhs) pkgs;
+    };
+
+  configType = mkOptionType {
+    name = "nixpkgs config";
+    check = traceValIfNot isConfig;
+    merge = fold mergeConfig {};
+  };
+
+in
+
 {
   options = {
 
@@ -8,8 +35,17 @@
       example = {
         firefox.enableGeckoMediaPlayer = true;
       };
+      type = configType;
       description = ''
-        The configuration of the Nix Packages collection.
+        The configuration of the Nix Packages collection.  This expression
+        defines default value of attributes and allow packages to be
+        overriden globally via the `packageOverrides'.
+
+        the `packageOverrides' configuration option must be a set of new or
+        overriden packages.  Any occurence of `pkgs' inside this attribute
+        set refers to the *original* (un-overriden) set of packages,
+        allowing packageOverrides attributes to refer to the original
+        attributes (e.g. "packageOverrides.foo = ... pkgs.foo ...").
       '';
     };
 
-- 
GitLab


From 5813e99fb35f2d84da06fa6b27082f74b4144d89 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 5 Sep 2011 09:46:14 +0000
Subject: [PATCH 3130/5331] * Fix description.

svn path=/nixos/trunk/; revision=29022
---
 modules/misc/nixpkgs.nix | 29 +++++++++++++++++------------
 1 file changed, 17 insertions(+), 12 deletions(-)

diff --git a/modules/misc/nixpkgs.nix b/modules/misc/nixpkgs.nix
index 88f5de1be5c..a3ceba9e727 100644
--- a/modules/misc/nixpkgs.nix
+++ b/modules/misc/nixpkgs.nix
@@ -32,20 +32,25 @@ in
 
     nixpkgs.config = pkgs.lib.mkOption {
       default = {};
-      example = {
-        firefox.enableGeckoMediaPlayer = true;
-      };
+      example =
+        ''
+          { firefox.enableGeckoMediaPlayer = true;
+            packageOverrides = pkgs: {
+              firefox60Pkgs = pkgs.firefox60Pkgs.override {
+                enableOfficialBranding = true;
+              };
+            }; 
+          }
+        '';
       type = configType;
       description = ''
-        The configuration of the Nix Packages collection.  This expression
-        defines default value of attributes and allow packages to be
-        overriden globally via the `packageOverrides'.
-
-        the `packageOverrides' configuration option must be a set of new or
-        overriden packages.  Any occurence of `pkgs' inside this attribute
-        set refers to the *original* (un-overriden) set of packages,
-        allowing packageOverrides attributes to refer to the original
-        attributes (e.g. "packageOverrides.foo = ... pkgs.foo ...").
+        The configuration of the Nix Packages collection.  (For
+        details, see the Nixpkgs documentation.)  It allows you to set
+        package configuration options, and to override packages
+        globally through the <varname>packageOverrides</varname>
+        option.  The latter is a function that takes as an argument
+        the <emphasis>original</emphasis> Nixpkgs, and must evaluate
+        to a set of new or overriden packages.
       '';
     };
 
-- 
GitLab


From 453675c5c113ac4ba91f28005b607671c0d66698 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 5 Sep 2011 10:14:42 +0000
Subject: [PATCH 3131/5331] * Allow literal examples to be included in the
 manual.

svn path=/nixos/trunk/; revision=29025
---
 doc/manual/options-to-docbook.xsl | 14 +++++++++++---
 modules/misc/nixpkgs.nix          |  6 +++---
 2 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/doc/manual/options-to-docbook.xsl b/doc/manual/options-to-docbook.xsl
index 828ca99ecd8..46e36b29289 100644
--- a/doc/manual/options-to-docbook.xsl
+++ b/doc/manual/options-to-docbook.xsl
@@ -52,12 +52,20 @@
                </para>
 
                <xsl:if test="attr[@name = 'example']">
+                 
                  <para>
                    <emphasis>Example:</emphasis>
                    <xsl:text> </xsl:text>
-                   <literal>
-                     <xsl:apply-templates select="attr[@name = 'example']" />
-                   </literal>
+                   <xsl:choose>
+                     <xsl:when test="attr[@name = 'example']/attrs[attr[@name = '_type' and string[@value = 'literalExample']]]">
+                       <programlisting><xsl:value-of select="attr[@name = 'example']/attrs/attr[@name = 'text']/string/@value" /></programlisting>
+                     </xsl:when>
+                     <xsl:otherwise>
+                       <literal>
+                         <xsl:apply-templates select="attr[@name = 'example']" />
+                       </literal>
+                     </xsl:otherwise>
+                   </xsl:choose>
                  </para>
                </xsl:if>
 
diff --git a/modules/misc/nixpkgs.nix b/modules/misc/nixpkgs.nix
index a3ceba9e727..78c52bca201 100644
--- a/modules/misc/nixpkgs.nix
+++ b/modules/misc/nixpkgs.nix
@@ -30,9 +30,9 @@ in
 {
   options = {
 
-    nixpkgs.config = pkgs.lib.mkOption {
+    nixpkgs.config = mkOption {
       default = {};
-      example =
+      example = literalExample
         ''
           { firefox.enableGeckoMediaPlayer = true;
             packageOverrides = pkgs: {
@@ -54,7 +54,7 @@ in
       '';
     };
 
-    nixpkgs.system = pkgs.lib.mkOption {
+    nixpkgs.system = mkOption {
       default = "";
       description = ''
         Specifies the Nix platform type for which NixOS should be built.
-- 
GitLab


From 4b8275d2c49580828719effe025ea49d7ea0a922 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 5 Sep 2011 14:58:26 +0000
Subject: [PATCH 3132/5331] =?UTF-8?q?*=20Force=20loading=20of=20the=20CFQ?=
 =?UTF-8?q?=20module,=20i.e.=20don't=20do=20it=20on=20demand=20=E2=80=94?=
 =?UTF-8?q?=20that=20=20=20seems=20to=20cause=20weird=20modprobe=20hangs.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

svn path=/nixos/trunk/; revision=29027
---
 modules/system/boot/kernel.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/modules/system/boot/kernel.nix b/modules/system/boot/kernel.nix
index 1f2d688c13f..87fb7bcbd5e 100644
--- a/modules/system/boot/kernel.nix
+++ b/modules/system/boot/kernel.nix
@@ -165,9 +165,6 @@ let kernel = config.boot.kernelPackages.kernel; in
         # Unix domain sockets (needed by udev).
         "unix"
 
-        # Provide the CFQ scheduler in the initrd.
-        "cfq_iosched"
-        
         # Misc. stuff.
         "pcips2" "serio" "atkbd" "xtkbd"
       ];
@@ -177,7 +174,10 @@ let kernel = config.boot.kernelPackages.kernel; in
         "dm_mod"
         
         # For usual AT keyboards.
-        "i8042"        
+        "i8042"
+
+        # Provide the CFQ scheduler in the initrd.
+        "cfq_iosched"
       ];
 
     # The Linux kernel >= 2.6.27 provides firmware.
-- 
GitLab


From 94014f4adc1a7d5e5da5e7d75824781f2c8a0897 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 5 Sep 2011 17:55:53 +0000
Subject: [PATCH 3133/5331] * Get the Virtuoso backend in Soprano/Nepomuk to
 work.  Soprano tries   to find virtodbc_r.so in QT_PLUGIN_PATH (among other
 locations), so   make sure that Virtuoso can be found there.

svn path=/nixos/trunk/; revision=29033
---
 modules/programs/bash/bashrc.sh                | 2 +-
 modules/services/x11/desktop-managers/kde4.nix | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/modules/programs/bash/bashrc.sh b/modules/programs/bash/bashrc.sh
index 940e3f7cd6b..8a6cc5bb21c 100644
--- a/modules/programs/bash/bashrc.sh
+++ b/modules/programs/bash/bashrc.sh
@@ -45,7 +45,7 @@ for i in $NIX_PROFILES; do # !!! reverse
     # KDE/Gnome stuff.
     export KDEDIRS=$i${KDEDIRS:+:}$KDEDIRS
     export STRIGI_PLUGIN_PATH=$i/lib/strigi/${STRIGI_PLUGIN_PATH:+:}$STRIGI_PLUGIN_PATH
-    export QT_PLUGIN_PATH=$i/lib/qt4/plugins:$i/lib/kde4/plugins${QT_PLUGIN_PATH:+:}$QT_PLUGIN_PATH
+    export QT_PLUGIN_PATH=$i/lib/qt4/plugins:$i/lib/kde4/plugins${QT_PLUGIN_PATH:+:}:$i/lib:$QT_PLUGIN_PATH
     export QTWEBKIT_PLUGIN_PATH=$i/lib/mozilla/plugins/${QTWEBKIT_PLUGIN_PATH:+:}$QTWEBKIT_PLUGIN_PATH
     export XDG_CONFIG_DIRS=$i/etc/xdg${XDG_CONFIG_DIRS:+:}$XDG_CONFIG_DIRS
     export XDG_DATA_DIRS=$i/share${XDG_DATA_DIRS:+:}$XDG_DATA_DIRS
diff --git a/modules/services/x11/desktop-managers/kde4.nix b/modules/services/x11/desktop-managers/kde4.nix
index 309def66f20..145a8a23a56 100644
--- a/modules/services/x11/desktop-managers/kde4.nix
+++ b/modules/services/x11/desktop-managers/kde4.nix
@@ -109,6 +109,7 @@ in
           pkgs.kde4.kdebase # contains kde-workspace etc.
           pkgs.kde4.kde_wallpapers # contains kdm's default background
           pkgs.kde4.oxygen_icons
+          pkgs.virtuoso # to enable Nepomuk to find Virtuoso
 
           # Starts KDE's Polkit authentication agent.
           pkgs.kde4.polkit_kde_agent
-- 
GitLab


From 8d8c250b8fd5d2c8f8bcc74d9d6fddb718f6c2e3 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 5 Sep 2011 20:37:06 +0000
Subject: [PATCH 3134/5331] * Enable gvfs in Xfce.

svn path=/nixos/trunk/; revision=29044
---
 modules/services/x11/desktop-managers/xfce.nix | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/modules/services/x11/desktop-managers/xfce.nix b/modules/services/x11/desktop-managers/xfce.nix
index fa1e4044b14..c7b368125b2 100644
--- a/modules/services/x11/desktop-managers/xfce.nix
+++ b/modules/services/x11/desktop-managers/xfce.nix
@@ -74,11 +74,18 @@ in
       ++ optionals isXfce48 [
         pkgs.xfce.libxfce4ui
         pkgs.xfce.garcon
+        pkgs.xfce.thunar_volman
+        pkgs.xfce.gvfs
       ]
       ++ optional config.powerManagement.enable pkgs.xfce.xfce4_power_manager;
 
     environment.pathsToLink =
       [ "/share/xfce4" "/share/themes" "/share/mime" "/share/desktop-directories" ];
+
+    environment.shellInit =
+      ''
+        export GIO_EXTRA_MODULES=${pkgs.xfce.gvfs}/lib/gio/modules
+      '';
       
     # Enable helpful DBus services.
     services.hal = mkIf (!isXfce48) { enable = true; };
-- 
GitLab


From 0de04bd4be2d26f7e5146eb75d3f86e6114b3e22 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 5 Sep 2011 20:50:15 +0000
Subject: [PATCH 3135/5331] * Xfce 4.6 fix.

svn path=/nixos/trunk/; revision=29046
---
 modules/services/x11/desktop-managers/xfce.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/services/x11/desktop-managers/xfce.nix b/modules/services/x11/desktop-managers/xfce.nix
index c7b368125b2..eccba4ec480 100644
--- a/modules/services/x11/desktop-managers/xfce.nix
+++ b/modules/services/x11/desktop-managers/xfce.nix
@@ -82,7 +82,7 @@ in
     environment.pathsToLink =
       [ "/share/xfce4" "/share/themes" "/share/mime" "/share/desktop-directories" ];
 
-    environment.shellInit =
+    environment.shellInit = optionalString isXfce48
       ''
         export GIO_EXTRA_MODULES=${pkgs.xfce.gvfs}/lib/gio/modules
       '';
-- 
GitLab


From 5de82a68022d67aef1df208b576c49941c598173 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 5 Sep 2011 23:33:29 +0000
Subject: [PATCH 3136/5331] svn path=/nixos/trunk/; revision=29053

---
 modules/services/misc/autofs.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/services/misc/autofs.nix b/modules/services/misc/autofs.nix
index d3d19241598..ea7a1437928 100644
--- a/modules/services/misc/autofs.nix
+++ b/modules/services/misc/autofs.nix
@@ -29,7 +29,7 @@ in
       };
 
       autoMaster = mkOption {
-        example = ''
+        example = literalExample ''
           autoMaster = let
             mapConf = pkgs.writeText "auto" '''
              kernel    -ro,soft,intr       ftp.kernel.org:/pub/linux
-- 
GitLab


From 4a65eb68307c039c1a5f37891c673387201d912d Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 6 Sep 2011 11:18:36 +0000
Subject: [PATCH 3137/5331] * Create /var/lib/upower, where upowerd keeps
 historical battery data.

svn path=/nixos/trunk/; revision=29057
---
 modules/services/hardware/upower.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/modules/services/hardware/upower.nix b/modules/services/hardware/upower.nix
index 8e7cf23900c..70f4860304e 100644
--- a/modules/services/hardware/upower.nix
+++ b/modules/services/hardware/upower.nix
@@ -35,6 +35,11 @@ with pkgs.lib;
 
     services.udev.packages = [ pkgs.upower ];
 
+    system.activationScripts.upower =
+      ''
+        mkdir -m 0755 -p /var/lib/upower
+      '';
+
   };
 
 }
-- 
GitLab


From ed1bc1e180025db9c6a3d434bc34a2b0341a2444 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 6 Sep 2011 12:32:07 +0000
Subject: [PATCH 3138/5331] * Handle the case where a symlink in /etc needs to
 change into a   directory.  This happened with /etc/polkit-1, which used to
 be a   symlink to /etc/static/polkit-1, which was itself a symlink but now  
 is a directory.  Not handling this correctly led to /etc/static   being
 clobbered with symlinks pointing to themselves.

svn path=/nixos/trunk/; revision=29061
---
 modules/system/etc/make-etc.sh  |  1 +
 modules/system/etc/setup-etc.pl | 45 ++++++++++++++++++---------------
 2 files changed, 25 insertions(+), 21 deletions(-)

diff --git a/modules/system/etc/make-etc.sh b/modules/system/etc/make-etc.sh
index 70cb57bc635..a5866d0a349 100644
--- a/modules/system/etc/make-etc.sh
+++ b/modules/system/etc/make-etc.sh
@@ -20,3 +20,4 @@ for ((i = 0; i < ${#targets_[@]}; i++)); do
         echo "${modes_[$i]}" > $out/etc/${targets_[$i]}.mode
     fi
 done
+
diff --git a/modules/system/etc/setup-etc.pl b/modules/system/etc/setup-etc.pl
index c6b932cf202..7cb6d2a6a45 100644
--- a/modules/system/etc/setup-etc.pl
+++ b/modules/system/etc/setup-etc.pl
@@ -22,6 +22,30 @@ sub atomicSymlink {
 atomicSymlink $etc, $static or die;
 
 
+# Remove dangling symlinks that point to /etc/static.  These are
+# configuration files that existed in a previous configuration but not
+# in the current one.  For efficiency, don't look under /etc/nixos
+# (where all the NixOS sources live).
+sub cleanup {
+    if ($File::Find::name eq "/etc/nixos") {
+        $File::Find::prune = 1;
+        return;
+    }
+    if (-l $_) {
+        my $target = readlink $_;
+        if (substr($target, 0, length $static) eq $static) {
+            my $x = "/etc/static/" . substr($File::Find::name, length "/etc/");
+            unless (-l $x) {
+                print STDERR "removing obsolete symlink ‘$File::Find::name’...\n";
+                unlink "$_";
+            }
+        }
+    }
+}
+
+find(\&cleanup, "/etc");
+
+
 # For every file in the etc tree, create a corresponding symlink in
 # /etc to /etc/static.  The indirection through /etc/static is to make
 # switching to a new configuration somewhat more atomic.
@@ -42,24 +66,3 @@ sub link {
 }
 
 find(\&link, $etc);
-
-
-# Remove dangling symlinks that point to /etc/static.  These are
-# configuration files that existed in a previous configuration but not
-# in the current one.  For efficiency, don't look under /etc/nixos
-# (where all the NixOS sources live).
-sub cleanup {
-    if ($File::Find::name eq "/etc/nixos") {
-        $File::Find::prune = 1;
-        return;
-    }
-    if (-l $_) {
-        my $target = readlink $_;
-        if (substr($target, 0, length $static) eq $static) {
-            my $x = "/etc/static/" . substr($File::Find::name, length "/etc/");
-            unlink "$_" unless -e "$x";
-        }
-    }
-}
-
-find(\&cleanup, "/etc");
-- 
GitLab


From 5925797672c04b7308cc9e2952e6925ba7e1316b Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 7 Sep 2011 17:25:16 +0000
Subject: [PATCH 3139/5331] * Make yet another test more reliable.

svn path=/nixos/trunk/; revision=29088
---
 tests/openssh.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tests/openssh.nix b/tests/openssh.nix
index 1c93f8a3b41..0e8bd3e2b9d 100644
--- a/tests/openssh.nix
+++ b/tests/openssh.nix
@@ -29,6 +29,7 @@
     $client->copyFileFromHost("key", "/root/.ssh/id_dsa");
     $client->mustSucceed("chmod 600 /root/.ssh/id_dsa");
     
+    $client->waitForJob("network-interfaces");
     $client->mustSucceed("ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no server 'echo hello world'");
   '';
 }
-- 
GitLab


From 6c08bf40a6f1916cb4ab1511befebb4bb258693e Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 7 Sep 2011 20:36:13 +0000
Subject: [PATCH 3140/5331] modules/system/boot/kernel.nix: stripped trailing
 whitespace

svn path=/nixos/trunk/; revision=29101
---
 modules/system/boot/kernel.nix | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/modules/system/boot/kernel.nix b/modules/system/boot/kernel.nix
index 87fb7bcbd5e..a5266bb0a82 100644
--- a/modules/system/boot/kernel.nix
+++ b/modules/system/boot/kernel.nix
@@ -9,7 +9,7 @@ let kernel = config.boot.kernelPackages.kernel; in
   ###### interface
 
   options = {
-  
+
     boot.kernelPackages = mkOption {
       default = pkgs.linuxPackages;
       # We don't want to evaluate all of linuxPackages for the manual
@@ -89,7 +89,7 @@ let kernel = config.boot.kernelPackages.kernel; in
         include it in <option>boot.initrd.kernelModules</option>.
       '';
     };
-    
+
     boot.initrd.kernelModules = mkOption {
       default = [];
       description = "List of modules that are always loaded by the initrd.";
@@ -116,16 +116,16 @@ let kernel = config.boot.kernelPackages.kernel; in
   config = {
 
     system.build = { inherit kernel; };
-    
+
     system.modulesTree = [ kernel ] ++ config.boot.extraModulePackages;
 
     boot.kernelParams =
       [ "splash=verbose"
         # Force the Completely Fair Scheduler to be used by default.
         "elevator=cfq"
-      ] ++ 
+      ] ++
       optional config.boot.vesa "vga=0x317";
-      
+
     boot.kernelModules = [ "loop" ];
 
     boot.initrd.availableKernelModules =
@@ -134,7 +134,7 @@ let kernel = config.boot.kernelPackages.kernel; in
         # detects them, but I'm keeping them for now for backwards
         # compatibility.
 
-        # Some SATA/PATA stuff.        
+        # Some SATA/PATA stuff.
         "ahci"
         "sata_nv"
         "sata_via"
@@ -168,11 +168,11 @@ let kernel = config.boot.kernelPackages.kernel; in
         # Misc. stuff.
         "pcips2" "serio" "atkbd" "xtkbd"
       ];
-      
+
     boot.initrd.kernelModules =
       [ # For LVM.
         "dm_mod"
-        
+
         # For usual AT keyboards.
         "i8042"
 
@@ -184,5 +184,5 @@ let kernel = config.boot.kernelPackages.kernel; in
     hardware.firmware = [ "${kernel}/lib/firmware" ];
 
   };
-  
+
 }
-- 
GitLab


From bcee582a74bd62369f77bf405dc0de9abc32858c Mon Sep 17 00:00:00 2001
From: "Yury G. Kudryashov" <urkud.urkud@gmail.com>
Date: Wed, 7 Sep 2011 23:07:05 +0000
Subject: [PATCH 3141/5331] Preserve <standard_session_service_dirs/> in
 dbus.conf

This way *session* dbus daemon loads services from XDG_DATA_DIRS

svn path=/nixos/trunk/; revision=29106
---
 modules/services/system/dbus.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/services/system/dbus.nix b/modules/services/system/dbus.nix
index 2777d219063..248b29a3dd5 100644
--- a/modules/services/system/dbus.nix
+++ b/modules/services/system/dbus.nix
@@ -35,7 +35,7 @@ let
       # Add the services and session.d directories to the session bus
       # search path.
       sed -i $out/session.conf \
-          -e 's|<standard_session_servicedirs />|${sessionServiceDirs}|' \
+          -e 's|<standard_session_servicedirs />|${sessionServiceDirs}&|' \
           -e 's|<includedir>session.d</includedir>|${sessionIncludeDirs}|'
     ''; # */
   };
-- 
GitLab


From 9a096c9ee745fafa076188dd89958dd52f976ae7 Mon Sep 17 00:00:00 2001
From: "Yury G. Kudryashov" <urkud.urkud@gmail.com>
Date: Wed, 7 Sep 2011 23:11:04 +0000
Subject: [PATCH 3142/5331] Partially revert r2903

The nepomuk&virtuoso problem is solved without polutting $QT_PLUGIN_PATH and/or
$LD_LIBRARY_PATH by patching soprano.

svn path=/nixos/trunk/; revision=29107
---
 modules/programs/bash/bashrc.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/programs/bash/bashrc.sh b/modules/programs/bash/bashrc.sh
index 8a6cc5bb21c..fc0d0efae62 100644
--- a/modules/programs/bash/bashrc.sh
+++ b/modules/programs/bash/bashrc.sh
@@ -45,7 +45,7 @@ for i in $NIX_PROFILES; do # !!! reverse
     # KDE/Gnome stuff.
     export KDEDIRS=$i${KDEDIRS:+:}$KDEDIRS
     export STRIGI_PLUGIN_PATH=$i/lib/strigi/${STRIGI_PLUGIN_PATH:+:}$STRIGI_PLUGIN_PATH
-    export QT_PLUGIN_PATH=$i/lib/qt4/plugins:$i/lib/kde4/plugins${QT_PLUGIN_PATH:+:}:$i/lib:$QT_PLUGIN_PATH
+    export QT_PLUGIN_PATH=$i/lib/qt4/plugins:$i/lib/kde4/plugins${QT_PLUGIN_PATH:+:}:$QT_PLUGIN_PATH
     export QTWEBKIT_PLUGIN_PATH=$i/lib/mozilla/plugins/${QTWEBKIT_PLUGIN_PATH:+:}$QTWEBKIT_PLUGIN_PATH
     export XDG_CONFIG_DIRS=$i/etc/xdg${XDG_CONFIG_DIRS:+:}$XDG_CONFIG_DIRS
     export XDG_DATA_DIRS=$i/share${XDG_DATA_DIRS:+:}$XDG_DATA_DIRS
-- 
GitLab


From c56a8456edf076d0ff4f82e21a997dd32fe8926a Mon Sep 17 00:00:00 2001
From: "Yury G. Kudryashov" <urkud.urkud@gmail.com>
Date: Sun, 11 Sep 2011 12:41:47 +0000
Subject: [PATCH 3143/5331] Allow full ~/.nixpkgs/config.nix syntax in
 nixpkgs.config

Namely, allow {pkgs}: { packageOverrides = p: ...; };

svn path=/nixos/trunk/; revision=29180
---
 modules/misc/nixpkgs.nix | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/modules/misc/nixpkgs.nix b/modules/misc/nixpkgs.nix
index 78c52bca201..73332bd96a8 100644
--- a/modules/misc/nixpkgs.nix
+++ b/modules/misc/nixpkgs.nix
@@ -11,7 +11,11 @@ let
     then f x
     else f;
 
-  mergeConfig = lhs: rhs:
+  mergeConfig = lhs_: rhs_:
+    let
+      lhs = optCall lhs_ { inherit pkgs; };
+      rhs = optCall rhs_ { inherit pkgs; };
+    in
     lhs // rhs //
     optionalAttrs (lhs ? packageOverrides) {
       packageOverrides = pkgs:
-- 
GitLab


From 7a858f2a89e67236f0dd3a8850bc23541759a1eb Mon Sep 17 00:00:00 2001
From: "Yury G. Kudryashov" <urkud.urkud@gmail.com>
Date: Sun, 11 Sep 2011 12:44:54 +0000
Subject: [PATCH 3144/5331] Adjust DM/kde4.nix to latest changes in kde-4.7

svn path=/nixos/trunk/; revision=29181
---
 modules/services/x11/desktop-managers/kde4.nix | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/modules/services/x11/desktop-managers/kde4.nix b/modules/services/x11/desktop-managers/kde4.nix
index 145a8a23a56..3be115094d5 100644
--- a/modules/services/x11/desktop-managers/kde4.nix
+++ b/modules/services/x11/desktop-managers/kde4.nix
@@ -106,7 +106,13 @@ in
       else
         # KDE >= 4.7
         [ pkgs.kde4.kdelibs
-          pkgs.kde4.kdebase # contains kde-workspace etc.
+
+          pkgs.kde4.kde_baseapps # Splitted kdebase
+          pkgs.kde4.kde_workspace
+          pkgs.kde4.kde_runtime
+          pkgs.kde4.konsole
+          pkgs.kde4.kate
+
           pkgs.kde4.kde_wallpapers # contains kdm's default background
           pkgs.kde4.oxygen_icons
           pkgs.virtuoso # to enable Nepomuk to find Virtuoso
-- 
GitLab


From 7dc59f0bb0edbe2693f1cdf36b548520e12503dc Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sun, 11 Sep 2011 15:55:43 +0000
Subject: [PATCH 3145/5331] * Zabbix: only enable PostgreSQL if it's on the
 same machine.

svn path=/nixos/trunk/; revision=29185
---
 modules/services/monitoring/zabbix-server.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/services/monitoring/zabbix-server.nix b/modules/services/monitoring/zabbix-server.nix
index 0dc3aaf75f5..9f875d455de 100644
--- a/modules/services/monitoring/zabbix-server.nix
+++ b/modules/services/monitoring/zabbix-server.nix
@@ -63,7 +63,7 @@ in
 
   config = mkIf cfg.enable {
 
-    services.postgresql.enable = true;
+    services.postgresql.enable = cfg.dbServer == "localhost";
 
     users.extraUsers = singleton
       { name = "zabbix";
-- 
GitLab


From 64340dc03cf3a65ca635c636c64f5fb5a6bd1086 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 12 Sep 2011 17:01:43 +0000
Subject: [PATCH 3146/5331] * Set OPENSSL_X509_CERT_FILE.

svn path=/nixos/trunk/; revision=29225
---
 modules/security/ca.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/modules/security/ca.nix b/modules/security/ca.nix
index 0ac4f565bd6..456f91b81e2 100644
--- a/modules/security/ca.nix
+++ b/modules/security/ca.nix
@@ -19,6 +19,9 @@ with pkgs.lib;
 
     environment.shellInit =
       ''
+        export OPENSSL_X509_CERT_FILE=/etc/ssl/certs/ca-bundle.crt
+
+        # !!! Remove the following as soon as OpenSSL 1.0.0e is the default.
         export CURL_CA_BUNDLE=/etc/ssl/certs/ca-bundle.crt
         export GIT_SSL_CAINFO=/etc/ssl/certs/ca-bundle.crt
       '';
-- 
GitLab


From c01c41e2dacef7d74267ab6da68ba056a4d3f026 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 12 Sep 2011 18:01:18 +0000
Subject: [PATCH 3147/5331] modules/system/boot/kernel.nix: disable
 "elevator=cfq" boot parameter for the time being

This setting causes the init ram disk to hang indefinitely on some systems.

svn path=/nixos/trunk/; revision=29228
---
 modules/system/boot/kernel.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/system/boot/kernel.nix b/modules/system/boot/kernel.nix
index a5266bb0a82..9a482f242a1 100644
--- a/modules/system/boot/kernel.nix
+++ b/modules/system/boot/kernel.nix
@@ -122,7 +122,7 @@ let kernel = config.boot.kernelPackages.kernel; in
     boot.kernelParams =
       [ "splash=verbose"
         # Force the Completely Fair Scheduler to be used by default.
-        "elevator=cfq"
+        #"elevator=cfq"
       ] ++
       optional config.boot.vesa "vga=0x317";
 
-- 
GitLab


From d3528a3c4e6e6b7b5661a375596c9fb8dba6ef35 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 13 Sep 2011 18:49:47 +0000
Subject: [PATCH 3148/5331] modules/system/boot/stage-1-init.sh: added
 "boot.runSize" option to determine the maximum size of the /run tmpfs

svn path=/nixos/trunk/; revision=29245
---
 modules/system/boot/stage-1-init.sh |  2 +-
 modules/system/boot/stage-1.nix     |  2 +-
 modules/system/boot/stage-2-init.sh |  2 +-
 modules/system/boot/stage-2.nix     | 10 +++++++++-
 4 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/modules/system/boot/stage-1-init.sh b/modules/system/boot/stage-1-init.sh
index b61e130a1bb..cd7bec22471 100644
--- a/modules/system/boot/stage-1-init.sh
+++ b/modules/system/boot/stage-1-init.sh
@@ -55,7 +55,7 @@ mkdir -p /sys
 mount -t sysfs none /sys
 mount -t tmpfs -o "mode=0755,size=@devSize@" none /dev
 mkdir -p /run
-mount -t tmpfs none /run
+mount -t tmpfs -o "mode=1777,size=@runSize@" none /run
 
 
 # Process the kernel command line.
diff --git a/modules/system/boot/stage-1.nix b/modules/system/boot/stage-1.nix
index c4e93461015..8936a1108d0 100644
--- a/modules/system/boot/stage-1.nix
+++ b/modules/system/boot/stage-1.nix
@@ -282,7 +282,7 @@ let
 
     inherit udevConf extraUtils;
 
-    inherit (config.boot) resumeDevice devSize;
+    inherit (config.boot) resumeDevice devSize runSize;
 
     inherit (config.boot.initrd) checkJournalingFS
       postDeviceCommands postMountCommands kernelModules;
diff --git a/modules/system/boot/stage-2-init.sh b/modules/system/boot/stage-2-init.sh
index 5f3c4170be2..85578d59fce 100644
--- a/modules/system/boot/stage-2-init.sh
+++ b/modules/system/boot/stage-2-init.sh
@@ -126,7 +126,7 @@ rm -rf /nix/var/nix/gcroots/tmp /nix/var/nix/temproots
 if ! mountpoint -q /run; then
     rm -rf /run
     mkdir -m 0755 -p /run
-    mount -t tmpfs -o "mode=755" none /run
+    mount -t tmpfs -o "mode=1777,size=@runSize@" none /run
 fi
 
 mkdir -m 0700 -p /run/lock
diff --git a/modules/system/boot/stage-2.nix b/modules/system/boot/stage-2.nix
index 42de07432c8..e06d41da14c 100644
--- a/modules/system/boot/stage-2.nix
+++ b/modules/system/boot/stage-2.nix
@@ -32,6 +32,14 @@ let
         '';
       };
 
+      runSize = pkgs.lib.mkOption {
+        default = "50%";
+        example = "256m";
+        description = ''
+          Size limit for the /run tmpfs. Look at mount(8), tmpfs size option,
+          for the accepted syntax.
+        '';
+      };
     };
 
   };
@@ -43,7 +51,7 @@ let
     src = ./stage-2-init.sh;
     isExecutable = true;
     inherit kernel;
-    inherit (config.boot) devShmSize;
+    inherit (config.boot) devShmSize runSize;
     ttyGid = config.ids.gids.tty;
     upstart = config.system.build.upstart;
     path =
-- 
GitLab


From a499049ce5bd990ca85f231e3149849673b961d6 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 13 Sep 2011 18:49:50 +0000
Subject: [PATCH 3149/5331] Strip trailing whitespace.

svn path=/nixos/trunk/; revision=29246
---
 modules/system/boot/stage-1-init.sh | 8 ++++----
 modules/system/boot/stage-2-init.sh | 6 +++---
 modules/system/boot/stage-2.nix     | 2 +-
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/modules/system/boot/stage-1-init.sh b/modules/system/boot/stage-1-init.sh
index cd7bec22471..b2d93a8fd08 100644
--- a/modules/system/boot/stage-1-init.sh
+++ b/modules/system/boot/stage-1-init.sh
@@ -8,7 +8,7 @@ export PATH=@extraUtils@/bin
 
 fail() {
     if [ -n "$panicOnFail" ]; then exit 1; fi
-    
+
     # If starting stage 2 failed, allow the user to repair the problem
     # in an interactive shell.
     cat <<EOF
@@ -24,7 +24,7 @@ of the following keys:
 EOF
 
     read reply
-    
+
     case $reply in
         f)
             exec @shell@;;
@@ -126,7 +126,7 @@ udevadm control --env=STARTUP=
 echo "starting device mapper and LVM..."
 lvm vgscan
 lvm vgchange -ay
-                                                                        
+
 if test -n "$debug1devices"; then fail; fi
 
 
@@ -176,7 +176,7 @@ checkFS() {
     then
         return 0
     fi
-    
+
     # Don't run `fsck' if the machine is on battery power.  !!! Is
     # this a good idea?
     if ! onACPower; then
diff --git a/modules/system/boot/stage-2-init.sh b/modules/system/boot/stage-2-init.sh
index 85578d59fce..649faaa8a8d 100644
--- a/modules/system/boot/stage-2-init.sh
+++ b/modules/system/boot/stage-2-init.sh
@@ -36,7 +36,7 @@ mount -n -o remount,rw none /
 if [ ! -e /proc/1 ]; then
     mkdir -m 0755 -p /proc
     mount -n -t proc none /proc
-    mkdir -m 0755 -p /sys 
+    mkdir -m 0755 -p /sys
     mount -t sysfs none /sys
     mkdir -m 0755 -p /dev
     mount -t tmpfs -o "mode=0755" none /dev
@@ -86,9 +86,9 @@ done
 mkdir -m 0777 /dev/shm
 mount -t tmpfs -o "rw,nosuid,nodev,size=@devShmSize@" tmpfs /dev/shm
 mkdir -m 0755 -p /dev/pts
-mount -t devpts -o mode=0600,gid=@ttyGid@ none /dev/pts 
+mount -t devpts -o mode=0600,gid=@ttyGid@ none /dev/pts
 [ -e /proc/bus/usb ] && mount -t usbfs none /proc/bus/usb # UML doesn't have USB by default
-mkdir -m 01777 -p /tmp 
+mkdir -m 01777 -p /tmp
 mkdir -m 0755 -p /var
 mkdir -m 0755 -p /nix/var
 mkdir -m 0700 -p /root
diff --git a/modules/system/boot/stage-2.nix b/modules/system/boot/stage-2.nix
index e06d41da14c..1fb8379f29a 100644
--- a/modules/system/boot/stage-2.nix
+++ b/modules/system/boot/stage-2.nix
@@ -66,7 +66,7 @@ let
         ${config.powerManagement.powerUpCommands}
       '';
   };
-  
+
 in
 
 {
-- 
GitLab


From 02bb4eb289d9ae4b9089b77939ae06d271bbd622 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 13 Sep 2011 20:42:21 +0000
Subject: [PATCH 3150/5331] modules/services/printing/cupsd.nix: MIME related
 config files have moved to share in cups 1.5

svn path=/nixos/trunk/; revision=29254
---
 modules/services/printing/cupsd.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/modules/services/printing/cupsd.nix b/modules/services/printing/cupsd.nix
index 1fb5ee6dd2d..c5f611b0e94 100644
--- a/modules/services/printing/cupsd.nix
+++ b/modules/services/printing/cupsd.nix
@@ -125,10 +125,10 @@ in
 
     environment.etc =
       [ # CUPS expects the following files in its ServerRoot.
-        { source = "${cups}/etc/cups/mime.convs";
+        { source = "${cups}/share/cups/mime/mime.convs";
           target = "cups/mime.convs";
         }
-        { source = "${cups}/etc/cups/mime.types";
+        { source = "${cups}/share/cups/mime/mime.types";
           target = "cups/mime.types";
         }
       ];
@@ -153,7 +153,7 @@ in
       };
 
     services.printing.drivers = [ pkgs.cups pkgs.cups_pdf_filter pkgs.ghostscript additionalBackends ];
-    
+
     services.printing.cupsdConf =
       ''
         LogLevel info
-- 
GitLab


From 1744733be8082e42908f3f8ebc046ac1dd70fcdc Mon Sep 17 00:00:00 2001
From: Russell O'Connor <roconnor@theorem.ca>
Date: Wed, 14 Sep 2011 17:58:57 +0000
Subject: [PATCH 3151/5331] Revering CUPS update.

svn path=/nixos/trunk/; revision=29283
---
 modules/services/printing/cupsd.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/modules/services/printing/cupsd.nix b/modules/services/printing/cupsd.nix
index c5f611b0e94..1fb5ee6dd2d 100644
--- a/modules/services/printing/cupsd.nix
+++ b/modules/services/printing/cupsd.nix
@@ -125,10 +125,10 @@ in
 
     environment.etc =
       [ # CUPS expects the following files in its ServerRoot.
-        { source = "${cups}/share/cups/mime/mime.convs";
+        { source = "${cups}/etc/cups/mime.convs";
           target = "cups/mime.convs";
         }
-        { source = "${cups}/share/cups/mime/mime.types";
+        { source = "${cups}/etc/cups/mime.types";
           target = "cups/mime.types";
         }
       ];
@@ -153,7 +153,7 @@ in
       };
 
     services.printing.drivers = [ pkgs.cups pkgs.cups_pdf_filter pkgs.ghostscript additionalBackends ];
-
+    
     services.printing.cupsdConf =
       ''
         LogLevel info
-- 
GitLab


From f5e8d35f8e76755febf97ca8f62b0700a8b6d20a Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 14 Sep 2011 18:20:13 +0000
Subject: [PATCH 3152/5331] modules/services/printing/cupsd.nix:
 /etc/cups/mime.{convs,types} are obsolete

Current versions of CUPS (1.4.7 or later, apparently) load these files
from ${cups}/share/mime, so we no longer need the symlinks in /etc.

svn path=/nixos/trunk/; revision=29284
---
 modules/services/printing/cupsd.nix | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/modules/services/printing/cupsd.nix b/modules/services/printing/cupsd.nix
index 1fb5ee6dd2d..632bdbae90d 100644
--- a/modules/services/printing/cupsd.nix
+++ b/modules/services/printing/cupsd.nix
@@ -123,16 +123,6 @@ in
     # gets loaded, and then cups cannot access the printers.
     boot.blacklistedKernelModules = [ "usblp" ];
 
-    environment.etc =
-      [ # CUPS expects the following files in its ServerRoot.
-        { source = "${cups}/etc/cups/mime.convs";
-          target = "cups/mime.convs";
-        }
-        { source = "${cups}/etc/cups/mime.types";
-          target = "cups/mime.types";
-        }
-      ];
-
     jobs.cupsd =
       { description = "CUPS printing daemon";
 
-- 
GitLab


From eb6e1310b8774f3aed4c5675d09708f0df6199d3 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 14 Sep 2011 18:20:50 +0000
Subject: [PATCH 3153/5331] strip trailing whitespace; no functional change

svn path=/nixos/trunk/; revision=29285
---
 default.nix                                   |   4 +-
 doc/config-examples/basic.nix                 |   2 +-
 .../closed-install-configuration.nix          |   6 +-
 doc/config-examples/svn-server.nix            |  10 +-
 doc/manual/default.nix                        |   6 +-
 lib/build-vms.nix                             |  14 +--
 lib/make-iso9660-image.nix                    |   4 +-
 lib/make-squashfs.nix                         |   6 +-
 lib/make-system-tarball.nix                   |   4 +-
 lib/testing.nix                               |  34 +++---
 maintainers/option-usages.nix                 |   2 +-
 modules/config/fonts.nix                      |  10 +-
 modules/config/krb5.nix                       |   2 +-
 modules/config/ldap.nix                       |   2 +-
 modules/config/networking.nix                 |   2 +-
 modules/config/power-management.nix           |  16 +--
 modules/config/pulseaudio.nix                 |  14 +--
 modules/config/shells.nix                     |   2 +-
 modules/config/swap.nix                       |   8 +-
 modules/config/system-path.nix                |   8 +-
 modules/config/unix-odbc-drivers.nix          |   6 +-
 modules/config/users-groups.nix               |  14 +--
 modules/hardware/network/intel-2100bg.nix     |   8 +-
 modules/hardware/network/intel-2200bg.nix     |   8 +-
 modules/hardware/network/intel-3945abg.nix    |   8 +-
 modules/hardware/network/rt73.nix             |   6 +-
 modules/hardware/network/rtl8192c.nix         |   6 +-
 modules/hardware/video/encoder/wis-go7007.nix |   2 +-
 .../installer/cd-dvd/installation-cd-base.nix |   6 +-
 modules/installer/cd-dvd/iso-image.nix        |  18 +--
 modules/installer/cd-dvd/live-dvd.nix         |  20 ++--
 .../cd-dvd/system-tarball-fuloong2f.nix       |   8 +-
 .../installer/cd-dvd/system-tarball-pc.nix    |  12 +-
 .../cd-dvd/system-tarball-sheevaplug.nix      |   6 +-
 modules/installer/cd-dvd/system-tarball.nix   |   2 +-
 modules/installer/grub/grub.nix               |  10 +-
 modules/installer/init-script/init-script.nix |   8 +-
 modules/installer/tools/nixos-checkout.nix    |   2 +-
 .../tools/nixos-deploy-network/deploy.nix     |  46 ++++----
 modules/misc/assertions.nix                   |   4 +-
 modules/misc/deployment.nix                   |  14 +--
 modules/misc/ids.nix                          |   4 +-
 modules/misc/locate.nix                       |   2 +-
 modules/misc/nixpkgs.nix                      |   2 +-
 modules/misc/passthru.nix                     |   6 +-
 modules/profiles/installation-device.nix      |   2 +-
 modules/profiles/rescue.nix                   |  10 +-
 modules/programs/bash/bash.nix                |   8 +-
 modules/programs/info.nix                     |   2 +-
 modules/programs/shadow.nix                   |  18 +--
 modules/security/ca.nix                       |   2 +-
 modules/security/consolekit.nix               |   2 +-
 modules/security/policykit.nix                |   6 +-
 modules/security/polkit.nix                   |   8 +-
 modules/security/rtkit.nix                    |   4 +-
 modules/security/setuid-wrappers.nix          |   6 +-
 modules/security/sudo.nix                     |   2 +-
 modules/services/amqp/rabbitmq.nix            |   6 +-
 modules/services/audio/alsa.nix               |  14 +--
 modules/services/audio/pulseaudio.nix         |  10 +-
 modules/services/backup/mysql-backup.nix      |  12 +-
 modules/services/backup/postgresql-backup.nix |  10 +-
 modules/services/backup/sitecopy-backup.nix   |  20 ++--
 .../services/databases/4store-endpoint.nix    |   6 +-
 modules/services/databases/4store.nix         |   6 +-
 modules/services/databases/mysql.nix          |  48 ++++----
 modules/services/databases/openldap.nix       |   6 +-
 modules/services/databases/postgresql.nix     |  30 ++---
 modules/services/databases/virtuoso.nix       |   6 +-
 modules/services/games/ghost-one.nix          |   6 +-
 modules/services/hardware/acpid.nix           |  24 ++--
 modules/services/hardware/bluetooth.nix       |  10 +-
 modules/services/hardware/hal.nix             |  16 +--
 modules/services/hardware/pcscd.nix           |  12 +-
 modules/services/hardware/udev.nix            |  24 ++--
 modules/services/hardware/udisks.nix          |  10 +-
 modules/services/hardware/upower.nix          |  10 +-
 modules/services/logging/klogd.nix            |   2 +-
 modules/services/mail/dovecot.nix             |  30 ++---
 modules/services/mail/freepops.nix            |   2 +-
 modules/services/mail/mail.nix                |   4 +-
 modules/services/mail/postfix.nix             |  92 ++++++++--------
 modules/services/misc/autofs.nix              |  10 +-
 modules/services/misc/disnix.nix              |  36 +++---
 modules/services/misc/felix.nix               |  32 +++---
 modules/services/misc/folding-at-home.nix     |   8 +-
 modules/services/misc/gpsd.nix                |  10 +-
 modules/services/misc/nix-daemon.nix          |  28 ++---
 modules/services/misc/nixos-manual.nix        |   8 +-
 modules/services/misc/rogue.nix               |  10 +-
 modules/services/misc/svnserve.nix            |  18 +--
 modules/services/misc/synergy.nix             |  18 +--
 modules/services/misc/virtualbox.nix          |  16 +--
 modules/services/monitoring/monit.nix         |  10 +-
 .../services/monitoring/nagios/default.nix    |  10 +-
 modules/services/monitoring/systemhealth.nix  |   2 +-
 modules/services/monitoring/ups.nix           |   4 +-
 modules/services/monitoring/zabbix-agent.nix  |  10 +-
 modules/services/monitoring/zabbix-server.nix |   8 +-
 .../network-filesystems/nfs-kernel.nix        |  26 ++---
 .../services/network-filesystems/samba.nix    |  12 +-
 modules/services/networking/amuled.nix        |   6 +-
 modules/services/networking/avahi-daemon.nix  |   8 +-
 modules/services/networking/bind.nix          |  22 ++--
 modules/services/networking/bitlbee.nix       |  12 +-
 modules/services/networking/ddclient.nix      |   8 +-
 modules/services/networking/dhclient.nix      |  20 ++--
 modules/services/networking/dnsmasq.nix       |  10 +-
 modules/services/networking/firewall.nix      |  24 ++--
 modules/services/networking/git-daemon.nix    |   6 +-
 modules/services/networking/gnunet.nix        |   4 +-
 modules/services/networking/gvpe.nix          |  24 ++--
 modules/services/networking/gw6c/default.nix  |  20 ++--
 modules/services/networking/ifplugd.nix       |   8 +-
 .../networking/ircd-hybrid/default.nix        |  12 +-
 modules/services/networking/nat.nix           |  10 +-
 modules/services/networking/ntpd.nix          |  10 +-
 modules/services/networking/openfire.nix      |  16 +--
 modules/services/networking/openvpn.nix       |  12 +-
 modules/services/networking/portmap.nix       |   8 +-
 modules/services/networking/privoxy.nix       |   8 +-
 modules/services/networking/quassel.nix       |   8 +-
 modules/services/networking/radvd.nix         |  12 +-
 modules/services/networking/rdnssd.nix        |   6 +-
 modules/services/networking/sabnzbd.nix       |   4 +-
 modules/services/networking/ssh/lshd.nix      |  10 +-
 modules/services/networking/tftpd.nix         |   2 +-
 modules/services/networking/vsftpd.nix        |  14 +--
 modules/services/networking/wakeonlan.nix     |   4 +-
 modules/services/networking/wicd.nix          |   8 +-
 modules/services/networking/xinetd.nix        |  18 +--
 modules/services/printing/cupsd.nix           |   2 +-
 modules/services/scheduling/atd.nix           |  10 +-
 modules/services/scheduling/cron.nix          |  10 +-
 modules/services/scheduling/fcron.nix         |  18 +--
 modules/services/security/tor.nix             |  42 +++----
 modules/services/security/torsocks.nix        |   4 +-
 modules/services/system/dbus.nix              |  16 +--
 modules/services/system/kerberos.nix          |  10 +-
 modules/services/system/nscd.nix              |   6 +-
 modules/services/system/uptimed.nix           |  12 +-
 modules/services/ttys/gpm.nix                 |  14 +--
 modules/services/ttys/mingetty.nix            |  16 +--
 .../web-servers/apache-httpd/default.nix      |  44 ++++----
 .../web-servers/apache-httpd/mediawiki.nix    |  24 ++--
 .../web-servers/apache-httpd/mercurial.nix    |  20 ++--
 .../apache-httpd/per-server-options.nix       |   4 +-
 .../apache-httpd/tomcat-connector.nix         |   8 +-
 .../web-servers/apache-httpd/trac.nix         |  22 ++--
 .../web-servers/apache-httpd/zabbix.nix       |   4 +-
 .../services/web-servers/jboss/default.nix    |  10 +-
 modules/services/web-servers/tomcat.nix       | 104 +++++++++---------
 .../services/x11/desktop-managers/default.nix |   6 +-
 .../services/x11/desktop-managers/kde4.nix    |   4 +-
 .../services/x11/desktop-managers/xfce.nix    |   8 +-
 .../services/x11/desktop-managers/xterm.nix   |   2 +-
 .../services/x11/display-managers/auto.nix    |   6 +-
 .../services/x11/display-managers/default.nix |  14 +--
 modules/services/x11/display-managers/kdm.nix |  22 ++--
 .../services/x11/display-managers/slim.nix    |   4 +-
 modules/services/x11/hardware/multitouch.nix  |   2 +-
 modules/services/x11/hardware/synaptics.nix   |   4 +-
 .../services/x11/window-managers/awesome.nix  |   4 +-
 .../services/x11/window-managers/compiz.nix   |  10 +-
 .../services/x11/window-managers/icewm.nix    |   4 +-
 modules/services/x11/window-managers/twm.nix  |   4 +-
 modules/services/x11/xfs.nix                  |  10 +-
 modules/services/x11/xserver.nix              |  26 ++---
 .../system/activation/activation-script.nix   |  28 ++---
 modules/system/activation/top-level.nix       |  22 ++--
 modules/system/boot/luksroot.nix              |   4 +-
 modules/system/boot/modprobe.nix              |  10 +-
 modules/system/upstart-events/shutdown.nix    |  14 +--
 modules/system/upstart/upstart.nix            |  34 +++---
 modules/tasks/filesystems.nix                 |  18 +--
 modules/tasks/kbd.nix                         |  14 +--
 modules/tasks/lvm.nix                         |   2 +-
 modules/tasks/network-interfaces.nix          |  24 ++--
 modules/tasks/swraid.nix                      |   4 +-
 modules/tasks/tty-backgrounds.nix             |  22 ++--
 modules/testing/test-instrumentation.nix      |  12 +-
 modules/virtualisation/amazon-image.nix       |  10 +-
 modules/virtualisation/libvirtd.nix           |  16 +--
 modules/virtualisation/nova-image.nix         |  10 +-
 modules/virtualisation/nova.nix               |  10 +-
 modules/virtualisation/qemu-vm.nix            |  46 ++++----
 modules/virtualisation/xen-dom0.nix           |  26 ++---
 modules/virtualisation/xen-domU.nix           |   2 +-
 release.nix                                   |  18 +--
 tests/bittorrent.nix                          |  12 +-
 tests/check-filesystems.nix                   |   6 +-
 tests/firefox.nix                             |   4 +-
 tests/firewall.nix                            |   4 +-
 tests/installer.nix                           |  42 +++----
 tests/ipv6.nix                                |  16 +--
 tests/kde4.nix                                |   6 +-
 tests/login.nix                               |   6 +-
 tests/mysql-replication.nix                   |  18 +--
 tests/mysql.nix                               |  10 +-
 tests/nat.nix                                 |  12 +-
 tests/nfs.nix                                 |  10 +-
 tests/openssh.nix                             |  22 ++--
 tests/proxy.nix                               |   2 +-
 tests/quake3.nix                              |   8 +-
 tests/remote-builds.nix                       |   2 +-
 tests/subversion.nix                          |  10 +-
 tests/tomcat.nix                              |   8 +-
 tests/trac.nix                                |  28 ++---
 tests/xfce.nix                                |  10 +-
 209 files changed, 1296 insertions(+), 1296 deletions(-)

diff --git a/default.nix b/default.nix
index 6b929537ee4..6c0934724c7 100644
--- a/default.nix
+++ b/default.nix
@@ -3,7 +3,7 @@
 }:
 
 let
-  
+
   eval = import ./lib/eval-config.nix {
     inherit system;
     modules = [ configuration ];
@@ -26,7 +26,7 @@ let
         { virtualisation.useBootLoader = true; }
       ];
   }).config;
-      
+
 in
 
 {
diff --git a/doc/config-examples/basic.nix b/doc/config-examples/basic.nix
index 976630d0607..da37cfb8c28 100644
--- a/doc/config-examples/basic.nix
+++ b/doc/config-examples/basic.nix
@@ -12,7 +12,7 @@
   swapDevices = [
     { device = "/dev/sdb1"; }
   ];
-  
+
   services = {
     openssh = {
       enable = true;
diff --git a/doc/config-examples/closed-install-configuration.nix b/doc/config-examples/closed-install-configuration.nix
index 807bf73d0e6..fed557ddd0d 100644
--- a/doc/config-examples/closed-install-configuration.nix
+++ b/doc/config-examples/closed-install-configuration.nix
@@ -18,15 +18,15 @@
   swapDevices = [
     { device = "/dev/sda2"; }
   ];
-  
+
   services = {
     sshd = {
       enable = true;
     };
   };
 
-  fonts = { 
-    enableFontConfig = false; 
+  fonts = {
+    enableFontConfig = false;
   };
 
 }
diff --git a/doc/config-examples/svn-server.nix b/doc/config-examples/svn-server.nix
index 7f2dafe16ad..68a3374987f 100644
--- a/doc/config-examples/svn-server.nix
+++ b/doc/config-examples/svn-server.nix
@@ -2,7 +2,7 @@
   boot = {
     grubDevice = "/dev/sda";
   };
-  
+
   fileSystems = [
     { mountPoint = "/";
       device = "/dev/sda1";
@@ -10,7 +10,7 @@
   ];
 
   services = {
-  
+
     sshd = {
       enable = true;
     };
@@ -28,9 +28,9 @@
         };
 
       };
-      
+
     };
-    
+
   };
-  
+
 }
diff --git a/doc/manual/default.nix b/doc/manual/default.nix
index 53b7ec2d783..c82a46b0537 100644
--- a/doc/manual/default.nix
+++ b/doc/manual/default.nix
@@ -3,7 +3,7 @@
 , revision ? "HEAD"
 }:
 
-let 
+let
 
   # To prevent infinite recursion, remove system.path from the
   # options.  Not sure why this happens.
@@ -59,7 +59,7 @@ in rec {
 
       ln -s ${pkgs.docbook5_xsl}/xml/xsl/docbook/images $dst/
       cp ${./style.css} $dst/style.css
-      
+
       ensureDir $out/nix-support
       echo "doc manual $dst manual.html" >> $out/nix-support/hydra-build-products
     '';
@@ -93,4 +93,4 @@ in rec {
     '';
   };
 
-}
\ No newline at end of file
+}
diff --git a/lib/build-vms.nix b/lib/build-vms.nix
index f151060344e..87ca2a711d1 100644
--- a/lib/build-vms.nix
+++ b/lib/build-vms.nix
@@ -9,7 +9,7 @@ rec {
 
   inherit pkgs;
 
-  
+
   # Build a virtual network from an attribute set `{ machine1 =
   # config1; ... machineN = configN; }', where `machineX' is the
   # hostname and `configX' is a NixOS system configuration.  Each
@@ -38,7 +38,7 @@ rec {
   assignIPAddresses = nodes:
 
     let
-    
+
       machines = lib.attrNames nodes;
 
       machinesNumbered = lib.zipTwoLists machines (lib.range 1 254);
@@ -47,7 +47,7 @@ rec {
         [ ( { config, pkgs, nodes, ... }:
             let
               interfacesNumbered = lib.zipTwoLists config.virtualisation.vlans (lib.range 1 255);
-              interfaces = 
+              interfaces =
                 lib.flip map interfacesNumbered ({ first, second }:
                   { name = "eth${toString second}";
                     ipAddress = "192.168.${toString first}.${toString m.second}";
@@ -58,12 +58,12 @@ rec {
             { key = "ip-address";
               config =
                 { networking.hostName = m.first;
-                
+
                   networking.interfaces = interfaces;
-                    
+
                   networking.primaryIPAddress =
                     lib.optionalString (interfaces != []) (lib.head interfaces).ipAddress;
-                  
+
                   # Put the IP addresses of all VMs in this machine's
                   # /etc/hosts file.  If a machine has multiple
                   # interfaces, use the IP address corresponding to
@@ -74,7 +74,7 @@ rec {
                       lib.optionalString (config.networking.primaryIPAddress != "")
                         ("${config.networking.primaryIPAddress} " +
                          "${config.networking.hostName}\n"));
-                  
+
                   virtualisation.qemu.options =
                     lib.flip map interfacesNumbered
                       ({ first, second }: qemuNICFlags second first m.second);
diff --git a/lib/make-iso9660-image.nix b/lib/make-iso9660-image.nix
index 51dce5eb402..9dfde3e4a7c 100644
--- a/lib/make-iso9660-image.nix
+++ b/lib/make-iso9660-image.nix
@@ -36,7 +36,7 @@ stdenv.mkDerivation {
   name = "iso9660-image";
   builder = ./make-iso9660-image.sh;
   buildInputs = [perl cdrkit];
-  
+
   inherit isoName bootable bootImage compressImage volumeID pathsFromGraph;
 
   # !!! should use XML.
@@ -46,7 +46,7 @@ stdenv.mkDerivation {
   # !!! should use XML.
   objects = map (x: x.object) storeContents;
   symlinks = map (x: x.symlink) storeContents;
-  
+
   # For obtaining the closure of `storeContents'.
   exportReferencesGraph =
     map (x: [("closure-" + baseNameOf x.object) x.object]) storeContents;
diff --git a/lib/make-squashfs.nix b/lib/make-squashfs.nix
index 1bd93b8ffaf..3b640334e17 100644
--- a/lib/make-squashfs.nix
+++ b/lib/make-squashfs.nix
@@ -7,9 +7,9 @@
 
 stdenv.mkDerivation {
   name = "squashfs.img";
-  
+
   buildInputs = [perl squashfsTools];
-  
+
   # For obtaining the closure of `storeContents'.
   exportReferencesGraph =
     map (x: [("closure-" + baseNameOf x) x]) storeContents;
@@ -18,7 +18,7 @@ stdenv.mkDerivation {
     ''
       # Add the closures of the top-level store objects.
       storePaths=$(perl ${pathsFromGraph} closure-*)
-      
+
       # Also include a manifest of the closures in a format suitable
       # for nix-store --load-db.
       printRegistration=1 perl ${pathsFromGraph} closure-* > nix-path-registration
diff --git a/lib/make-system-tarball.nix b/lib/make-system-tarball.nix
index 301294e1964..8fed9a34882 100644
--- a/lib/make-system-tarball.nix
+++ b/lib/make-system-tarball.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation {
   name = "tarball";
   builder = ./make-system-tarball.sh;
   buildInputs = [perl xz];
-  
+
   inherit fileName pathsFromGraph;
 
   # !!! should use XML.
@@ -31,7 +31,7 @@ stdenv.mkDerivation {
   # !!! should use XML.
   objects = map (x: x.object) storeContents;
   symlinks = map (x: x.symlink) storeContents;
-  
+
   # For obtaining the closure of `storeContents'.
   exportReferencesGraph =
     map (x: [("closure-" + baseNameOf x.object) x.object]) storeContents;
diff --git a/lib/testing.nix b/lib/testing.nix
index 94f5a4cb70e..9b49bad580f 100644
--- a/lib/testing.nix
+++ b/lib/testing.nix
@@ -14,13 +14,13 @@ rec {
     buildInputs = [ makeWrapper perl ];
 
     unpackPhase = "true";
-    
+
     installPhase =
       ''
         mkdir -p $out/bin
         cp ${./test-driver/test-driver.pl} $out/bin/nixos-test-driver
         chmod u+x $out/bin/nixos-test-driver
-        
+
         libDir=$out/lib/perl5/site_perl
         mkdir -p $libDir
         cp ${./test-driver/Machine.pm} $libDir/Machine.pm
@@ -38,9 +38,9 @@ rec {
   runTests = driver:
     stdenv.mkDerivation {
       name = "vm-test-run";
-      
+
       requiredSystemFeatures = [ "kvm" ];
-      
+
       buildInputs = [ pkgs.libxslt ];
 
       buildCommand =
@@ -49,7 +49,7 @@ rec {
 
           LOGFILE=$out/log.xml tests='eval $ENV{testScript}; die $@ if $@;' ${driver}/bin/nixos-test-driver || failed=1
 
-          # Generate a pretty-printed log.          
+          # Generate a pretty-printed log.
           xsltproc --output $out/log.html ${./test-driver/log2html.xsl} $out/log.xml
           ln -s ${./test-driver/logfile.css} $out/logfile.css
           ln -s ${./test-driver/treebits.js} $out/treebits.js
@@ -96,12 +96,12 @@ rec {
           done
 
           find $TMPDIR/gcov -name "*.gcda" -exec chmod 644 {} \;
-          
+
           echo "producing info..."
           ${pkgs.lcov}/bin/geninfo --ignore-errors source,gcov $TMPDIR/gcov --output-file $TMPDIR/app.info
           cat $TMPDIR/app.info >> $TMPDIR/full.info
       done
-            
+
       echo "making report..."
       mkdir -p $out/coverage
       ${pkgs.lcov}/bin/genhtml --show-details $TMPDIR/full.info -o $out/coverage
@@ -131,11 +131,11 @@ rec {
       if builtins.isFunction t.testScript
       then t.testScript { inherit nodes; }
       else t.testScript;
-      
+
     vlans = map (m: m.config.virtualisation.vlans) (lib.attrValues nodes);
 
     vms = map (m: m.config.system.build.vm) (lib.attrValues nodes);
-    
+
     # Generate onvenience wrappers for running the test driver
     # interactively with the specified network, and for starting the
     # VMs from the command line.
@@ -161,11 +161,11 @@ rec {
       ''; # "
 
     test = runTests driver;
-      
+
     report = makeReport test;
   };
 
-  
+
   runInMachine =
     { drv
     , machine
@@ -181,12 +181,12 @@ rec {
 
       buildrunner = writeText "vm-build" ''
         source $1
- 
+
         ${coreutils}/bin/mkdir -p $TMPDIR
         cd $TMPDIR
-        
+
         $origBuilder $origArgs
-         
+
         exit $?
       '';
 
@@ -211,10 +211,10 @@ rec {
         builder = "${bash}/bin/sh";
         args = ["-e" vmRunCommand];
         origArgs = attrs.args;
-        origBuilder = attrs.builder;   
+        origBuilder = attrs.builder;
       });
 
-      
+
   runInMachineWithX = { require ? [], ... } @ args:
     let
       client =
@@ -238,7 +238,7 @@ rec {
           '';
       } // args);
 
-          
+
   simpleTest = as: (makeTest ({ ... }: as)).test;
 
 }
diff --git a/maintainers/option-usages.nix b/maintainers/option-usages.nix
index 175ae9f0821..e0532e9e548 100644
--- a/maintainers/option-usages.nix
+++ b/maintainers/option-usages.nix
@@ -17,7 +17,7 @@
 # there dependencies to track problems and their sources.
 
 let
-  
+
   evalFun = {
     extraArgs ? {}
   }: import ../lib/eval-config.nix {
diff --git a/modules/config/fonts.nix b/modules/config/fonts.nix
index af5ebde2d47..3516ed75ab6 100644
--- a/modules/config/fonts.nix
+++ b/modules/config/fonts.nix
@@ -35,8 +35,8 @@ let
       enableFontDir = mkOption {
         default = false;
         description = "
-          Whether to create a directory with links to all fonts in share - 
-          so user can configure vncserver script one time (I mean per-user 
+          Whether to create a directory with links to all fonts in share -
+          so user can configure vncserver script one time (I mean per-user
           vncserver, so global service is not a good solution).
         ";
       };
@@ -122,7 +122,7 @@ let
     for i in \$list ; do
       fontDirs=\"\$fontDirs \$(dirname \$i)\";
     done;
-    mkdir -p \$out/share/X11-fonts/; 
+    mkdir -p \$out/share/X11-fonts/;
     find \$fontDirs -type f -o -type l | while read i; do
       j=\"\${i##*/}\"
       if ! test -e \"\$out/share/X11-fonts/\${j}\"; then
@@ -142,7 +142,7 @@ let
   x11Fonts = with localDefs; stdenv.mkDerivation rec {
     name = "X11-fonts";
     builder = writeScript (name + "-builder")
-      (textClosure localDefs 
+      (textClosure localDefs
         [installPhase doForceShare doPropagate]);
     meta = {
       description = "
@@ -169,7 +169,7 @@ in
     ];
 
   environment.shellInit =
-    '' 
+    ''
       export FONTCONFIG_FILE=/etc/fonts/fonts.conf
     '';
 
diff --git a/modules/config/krb5.nix b/modules/config/krb5.nix
index 7ff0b498562..56854603264 100644
--- a/modules/config/krb5.nix
+++ b/modules/config/krb5.nix
@@ -29,7 +29,7 @@ let
         description = "Kerberos Domain Controller";
       };
 
-      kerberosAdminServer = mkOption { 
+      kerberosAdminServer = mkOption {
         default = "kerberos.mit.edu";
         description = "Kerberos Admin Server";
       };
diff --git a/modules/config/ldap.nix b/modules/config/ldap.nix
index 3bf1aa9d74d..56f693f362e 100644
--- a/modules/config/ldap.nix
+++ b/modules/config/ldap.nix
@@ -69,7 +69,7 @@ mkIf config.users.ldap.enable {
           '';
         target = "ldap.conf";
       }
-      
+
     ];
   };
 
diff --git a/modules/config/networking.nix b/modules/config/networking.nix
index 65f22445b06..076b9801a54 100644
--- a/modules/config/networking.nix
+++ b/modules/config/networking.nix
@@ -13,7 +13,7 @@ let
         Additional entries to be appended to <filename>/etc/hosts</filename>.
       '';
     };
-    
+
   };
 
 in
diff --git a/modules/config/power-management.nix b/modules/config/power-management.nix
index 97b7f61c473..cb7047a2ba8 100644
--- a/modules/config/power-management.nix
+++ b/modules/config/power-management.nix
@@ -28,7 +28,7 @@ in
   ###### interface
 
   options = {
-  
+
     powerManagement = {
 
       enable = mkOption {
@@ -44,7 +44,7 @@ in
         default = "";
         description = "Commands executed after the system resumes from suspend-to-RAM.";
       };
-      
+
       powerUpCommands = mkOption {
         default = "";
         example = "${pkgs.hdparm}/sbin/hdparm -B 255 /dev/sda";
@@ -66,11 +66,11 @@ in
             it goes to suspend or hibernation.
           '';
       };
-      
+
     };
-    
+
   };
-  
+
 
   ###### implementation
 
@@ -86,11 +86,11 @@ in
         target = "pm/sleep.d/00sleep-hook";
       };
 
-    boot.kernelModules = 
-      [ "acpi_cpufreq" "cpufreq_performance" "cpufreq_powersave" "cpufreq_ondemand" 
+    boot.kernelModules =
+      [ "acpi_cpufreq" "cpufreq_performance" "cpufreq_powersave" "cpufreq_ondemand"
         "p4_clockmod"
       ];
-    
+
   };
 
 }
diff --git a/modules/config/pulseaudio.nix b/modules/config/pulseaudio.nix
index 943b300b9a7..71bf0081e4e 100644
--- a/modules/config/pulseaudio.nix
+++ b/modules/config/pulseaudio.nix
@@ -7,7 +7,7 @@ let cfg = config.hardware.pulseaudio; in
 {
 
   options = {
-  
+
     hardware.pulseaudio.enable = mkOption {
       default = false;
       description = ''
@@ -26,7 +26,7 @@ let cfg = config.hardware.pulseaudio; in
     };
 
   };
-  
+
 
   config = mkIf cfg.enable {
 
@@ -46,7 +46,7 @@ let cfg = config.hardware.pulseaudio; in
               ''}
             '';
         }
-        
+
       ] ++ optionals cfg.enable
       [ # Write an /etc/asound.conf that causes all ALSA applications to
         # be re-routed to the PulseAudio server through ALSA's Pulse
@@ -57,16 +57,16 @@ let cfg = config.hardware.pulseaudio; in
               pcm_type.pulse {
                 lib ${pkgs.alsaPlugins}/lib/alsa-lib/libasound_module_pcm_pulse.so
               }
-            
+
               pcm.!default {
                 type pulse
                 hint.description "Default Audio Device (via PulseAudio)"
               }
-              
+
               ctl_type.pulse {
                 lib ${pkgs.alsaPlugins}/lib/alsa-lib/libasound_module_ctl_pulse.so
               }
-            
+
               ctl.!default {
                 type pulse
               }
@@ -85,7 +85,7 @@ let cfg = config.hardware.pulseaudio; in
 
     # Allow PulseAudio to get realtime priority using rtkit.
     security.rtkit.enable = true;
-      
+
   };
 
 }
diff --git a/modules/config/shells.nix b/modules/config/shells.nix
index 53d445b0ead..6286223752a 100644
--- a/modules/config/shells.nix
+++ b/modules/config/shells.nix
@@ -18,6 +18,6 @@ with pkgs.lib;
           '';
       };
 
-  };  
+  };
 
 }
diff --git a/modules/config/swap.nix b/modules/config/swap.nix
index a3f241fc8c5..1e373382917 100644
--- a/modules/config/swap.nix
+++ b/modules/config/swap.nix
@@ -5,7 +5,7 @@ with pkgs.lib;
 {
 
   ###### interface
-  
+
   options = {
 
     swapDevices = mkOption {
@@ -30,7 +30,7 @@ with pkgs.lib;
       options = {config, options, ...}: {
 
         options = {
-        
+
           device = mkOption {
             example = "/dev/sda3";
             type = types.string;
@@ -64,9 +64,9 @@ with pkgs.lib;
             else
               mkNotdef;
         };
-        
+
       };
-      
+
     };
 
   };
diff --git a/modules/config/system-path.nix b/modules/config/system-path.nix
index 26685ae15f4..286f7993f77 100644
--- a/modules/config/system-path.nix
+++ b/modules/config/system-path.nix
@@ -8,7 +8,7 @@ with pkgs.lib;
 let
 
   cfg = config.environment;
-  
+
   requiredPackages =
     [ config.system.sbin.modprobe # must take precedence over module_init_tools
       config.system.sbin.mount # must take precedence over util-linux
@@ -91,7 +91,7 @@ let
         description = ''
           The packages you want in the boot environment.
         '';
-        
+
         apply = list: pkgs.buildEnv {
           name = "system-path";
           paths = list;
@@ -109,11 +109,11 @@ let
               fi
             '';
         };
-        
+
       };
 
     };
-      
+
   };
 
 
diff --git a/modules/config/unix-odbc-drivers.nix b/modules/config/unix-odbc-drivers.nix
index 7df87db8577..8950898e1dd 100644
--- a/modules/config/unix-odbc-drivers.nix
+++ b/modules/config/unix-odbc-drivers.nix
@@ -10,7 +10,7 @@ let
         default = [];
         example = "map (x : x.ini) (with pkgs.unixODBCDrivers; [ mysql psql psqlng ] )";
         description = ''
-          specifies unix odbc drivers to be registered at /etc/odbcinst.ini. 
+          specifies unix odbc drivers to be registered at /etc/odbcinst.ini.
           Maybe you also want to add pkgs.unixODBC to the system path to get a
           command line client t connnect to odbc databases.
         '';
@@ -30,10 +30,10 @@ mkIf (config.environment.unixODBCDrivers != []) {
   require = [
     options
   ];
-  
+
   environment = {
     etc = [
-      { source = 
+      { source =
           let inis = config.environment.unixODBCDrivers;
           in pkgs.writeText "odbcinst.ini" (pkgs.lib.concatStringsSep "\n" inis);
         target = "odbcinst.ini";
diff --git a/modules/config/users-groups.nix b/modules/config/users-groups.nix
index a0210630b0f..19ec0655ab1 100644
--- a/modules/config/users-groups.nix
+++ b/modules/config/users-groups.nix
@@ -6,7 +6,7 @@ let
 
   ids = config.ids;
 
-  
+
   # User accounts to be created/updated by NixOS.
   users =
     let
@@ -46,7 +46,7 @@ let
   # Groups to be created/updated by NixOS.
   groups =
     let
-      defaultGroups = 
+      defaultGroups =
         [ { name = "root";
             gid = ids.gids.root;
           }
@@ -108,10 +108,10 @@ let
   # having an empty password, and not having a password.
   serializedUser = u: "${u.name}\n${u.description}\n${toString u.uid}\n${u.group}\n${toString (concatStringsSep "," u.extraGroups)}\n${u.home}\n${u.shell}\n${toString u.createHome}\n${if u.password != null then "X" + u.password else ""}\n${toString u.isSystemUser}\n";
   serializedGroup = g: "${g.name}\n${toString g.gid}";
-  
+
   # keep this extra file so that cat can be used to pass special chars such as "`" which is used in the avahi daemon
   usersFile = pkgs.writeText "users" (concatStrings (map serializedUser users));
-  
+
 in
 
 {
@@ -119,7 +119,7 @@ in
   ###### interface
 
   options = {
-  
+
     users.extraUsers = mkOption {
       default = [];
       example =
@@ -152,7 +152,7 @@ in
     };
 
   };
-  
+
 
   ###### implementation
 
@@ -230,7 +230,7 @@ in
     system.activationScripts.groups = stringAfter [ "rootPasswd" "binsh" "etc" "var" ]
       ''
         echo "updating groups..."
-        
+
         while true; do
             read name || break
             read gid
diff --git a/modules/hardware/network/intel-2100bg.nix b/modules/hardware/network/intel-2100bg.nix
index aec4f9748dc..b2eea6c7b90 100644
--- a/modules/hardware/network/intel-2100bg.nix
+++ b/modules/hardware/network/intel-2100bg.nix
@@ -5,7 +5,7 @@
   ###### interface
 
   options = {
-  
+
     networking.enableIntel2100BGFirmware = pkgs.lib.mkOption {
       default = false;
       type = pkgs.lib.types.bool;
@@ -22,13 +22,13 @@
 
 
   ###### implementation
-  
+
   config = pkgs.lib.mkIf config.networking.enableIntel2100BGFirmware {
-  
+
     # Warning: setting this option requires acceptance of the firmware
     # license, see http://ipw2100.sourceforge.net/firmware.php?fid=2.
     hardware.firmware = [ pkgs.ipw2100fw ];
 
   };
-  
+
 }
diff --git a/modules/hardware/network/intel-2200bg.nix b/modules/hardware/network/intel-2200bg.nix
index dc67e1335fe..5804eabded5 100644
--- a/modules/hardware/network/intel-2200bg.nix
+++ b/modules/hardware/network/intel-2200bg.nix
@@ -5,7 +5,7 @@
   ###### interface
 
   options = {
-  
+
     networking.enableIntel2200BGFirmware = pkgs.lib.mkOption {
       default = false;
       type = pkgs.lib.types.bool;
@@ -22,13 +22,13 @@
 
 
   ###### implementation
-  
+
   config = pkgs.lib.mkIf config.networking.enableIntel2200BGFirmware {
-  
+
     # Warning: setting this option requires acceptance of the firmware
     # license, see http://ipw2200.sourceforge.net/firmware.php?fid=7.
     hardware.firmware = [ pkgs.ipw2200fw ];
 
   };
-  
+
 }
diff --git a/modules/hardware/network/intel-3945abg.nix b/modules/hardware/network/intel-3945abg.nix
index 9fe4be500f1..3500fc2ff68 100644
--- a/modules/hardware/network/intel-3945abg.nix
+++ b/modules/hardware/network/intel-3945abg.nix
@@ -5,7 +5,7 @@
   ###### interface
 
   options = {
-  
+
     networking.enableIntel3945ABGFirmware = pkgs.lib.mkOption {
       default = false;
       type = pkgs.lib.types.bool;
@@ -19,11 +19,11 @@
 
 
   ###### implementation
-  
+
   config = pkgs.lib.mkIf config.networking.enableIntel3945ABGFirmware {
-  
+
     hardware.firmware = [ pkgs.iwlwifi3945ucode ];
 
   };
-  
+
 }
diff --git a/modules/hardware/network/rt73.nix b/modules/hardware/network/rt73.nix
index f7fae009528..6e96f21104d 100644
--- a/modules/hardware/network/rt73.nix
+++ b/modules/hardware/network/rt73.nix
@@ -5,7 +5,7 @@
   ###### interface
 
   options = {
-  
+
     networking.enableRT73Firmware = pkgs.lib.mkOption {
       default = false;
       type = pkgs.lib.types.bool;
@@ -18,9 +18,9 @@
 
 
   ###### implementation
-  
+
   config = pkgs.lib.mkIf config.networking.enableRT73Firmware {
     hardware.firmware = [ pkgs.rt73fw ];
   };
-  
+
 }
diff --git a/modules/hardware/network/rtl8192c.nix b/modules/hardware/network/rtl8192c.nix
index f02948745bb..aeb573fb0ea 100644
--- a/modules/hardware/network/rtl8192c.nix
+++ b/modules/hardware/network/rtl8192c.nix
@@ -5,7 +5,7 @@
   ###### interface
 
   options = {
-  
+
     networking.enableRTL8192cFirmware = pkgs.lib.mkOption {
       default = false;
       type = pkgs.lib.types.bool;
@@ -18,9 +18,9 @@
 
 
   ###### implementation
-  
+
   config = pkgs.lib.mkIf config.networking.enableRTL8192cFirmware {
     hardware.firmware = [ pkgs.rtl8192cfw ];
   };
-  
+
 }
diff --git a/modules/hardware/video/encoder/wis-go7007.nix b/modules/hardware/video/encoder/wis-go7007.nix
index 3936b333af4..c0eb2b814b3 100644
--- a/modules/hardware/video/encoder/wis-go7007.nix
+++ b/modules/hardware/video/encoder/wis-go7007.nix
@@ -10,6 +10,6 @@ in
   environment.systemPackages = [wis_go7007];
 
   hardware.firmware = ["${wis_go7007}/firmware"];
-  
+
   services.udev.packages = [wis_go7007];
 }
diff --git a/modules/installer/cd-dvd/installation-cd-base.nix b/modules/installer/cd-dvd/installation-cd-base.nix
index a011861ea36..564916d099f 100644
--- a/modules/installer/cd-dvd/installation-cd-base.nix
+++ b/modules/installer/cd-dvd/installation-cd-base.nix
@@ -25,7 +25,7 @@ let
   nixpkgsTarball = makeTarball "nixpkgs.tar.bz2" (cleanSource pkgs.path);
 
   includeSources = true;
-  
+
 in
 
 {
@@ -40,9 +40,9 @@ in
 
   # ISO naming.
   isoImage.isoName = "${config.isoImage.isoBaseName}-${config.system.nixosVersion}-${pkgs.stdenv.system}.iso";
-    
+
   isoImage.volumeID = "NIXOS_INSTALL_CD_${config.system.nixosVersion}";
-  
+
   boot.postBootCommands =
     ''
       export PATH=${pkgs.gnutar}/bin:${pkgs.bzip2}/bin:$PATH
diff --git a/modules/installer/cd-dvd/iso-image.nix b/modules/installer/cd-dvd/iso-image.nix
index 6e1994cffc7..d565435ffd2 100644
--- a/modules/installer/cd-dvd/iso-image.nix
+++ b/modules/installer/cd-dvd/iso-image.nix
@@ -85,7 +85,7 @@ let
 
 
   # The configuration file for Grub.
-  grubCfg = 
+  grubCfg =
     ''
       set default=${builtins.toString config.boot.loader.grub.default}
       set timeout=${builtins.toString config.boot.loader.grub.timeout}
@@ -104,12 +104,12 @@ let
           set menu_color_normal=cyan/blue
           set menu_color_highlight=white/blue
         fi
-        
+
       fi
 
       ${config.boot.loader.grub.extraEntries}
     '';
-  
+
 in
 
 {
@@ -154,13 +154,13 @@ in
   # We need squashfs in the initrd to mount the compressed Nix store,
   # and aufs to make the root filesystem appear writable.
   boot.extraModulePackages =
-    optional 
-      (! ( config.boot.kernelPackages.kernel.features ? aufs || config.boot.kernelPackages.kernel.features ? aufs2_1 ) ) 
+    optional
+      (! ( config.boot.kernelPackages.kernel.features ? aufs || config.boot.kernelPackages.kernel.features ? aufs2_1 ) )
       config.boot.kernelPackages.aufs2
     ++ optional
       ( config.boot.kernelPackages.kernel.features ? aufs2_1 )
       config.boot.kernelPackages.aufs2_1;
-      
+
   boot.initrd.availableKernelModules = [ "aufs" "squashfs" "iso9660" ];
 
   boot.initrd.kernelModules = [ "loop" ];
@@ -184,7 +184,7 @@ in
   # Closures to be copied to the Nix store on the CD, namely the init
   # script and the top-level system configuration directory.
   isoImage.storeContents =
-    [ config.system.build.toplevel ] ++ 
+    [ config.system.build.toplevel ] ++
     optional config.isoImage.includeSystemBuildDependencies
       config.system.build.toplevel.drvPath;
 
@@ -237,13 +237,13 @@ in
         chainloader +1
       }
     '';
-    
+
   boot.loader.grub.timeout = 10;
 
   # Create the ISO image.
   system.build.isoImage = import ../../../lib/make-iso9660-image.nix {
     inherit (pkgs) stdenv perl cdrkit pathsFromGraph;
-    
+
     inherit (config.isoImage) isoName compressImage volumeID contents;
 
     bootable = true;
diff --git a/modules/installer/cd-dvd/live-dvd.nix b/modules/installer/cd-dvd/live-dvd.nix
index 4857900389c..c5a89a3173e 100644
--- a/modules/installer/cd-dvd/live-dvd.nix
+++ b/modules/installer/cd-dvd/live-dvd.nix
@@ -23,32 +23,32 @@
       pkgs.patch
       pkgs.which
       pkgs.diffutils
-      pkgs.file 
+      pkgs.file
       pkgs.irssi
       pkgs.mcabber
-      pkgs.mutt 
+      pkgs.mutt
       pkgs.emacs
       pkgs.vimHugeX
-      pkgs.bvi 
+      pkgs.bvi
       pkgs.ddrescue
-      pkgs.cdrkit 
+      pkgs.cdrkit
       pkgs.btrfsProgs
       pkgs.xfsprogs
       pkgs.jfsutils
       pkgs.jfsrec
-      pkgs.ntfs3g 
+      pkgs.ntfs3g
       pkgs.subversion16
       pkgs.monotone
       pkgs.git
       pkgs.darcs
       pkgs.mercurial
       pkgs.bazaar
-      pkgs.cvs 
+      pkgs.cvs
       pkgs.pciutils
       pkgs.hddtemp
       pkgs.sdparm
       pkgs.hdparm
-      pkgs.usbutils 
+      pkgs.usbutils
       pkgs.openssh
       pkgs.lftp
       pkgs.w3m
@@ -64,9 +64,9 @@
       pkgs.unzip
       pkgs.lzma
       pkgs.cabextract
-      pkgs.cpio 
+      pkgs.cpio
       pkgs.lsof
-      pkgs.ltrace 
+      pkgs.ltrace
       pkgs.perl
       pkgs.python
       pkgs.ruby
@@ -74,5 +74,5 @@
       pkgs.clisp
       pkgs.tcl
     ];
-  
+
 }
diff --git a/modules/installer/cd-dvd/system-tarball-fuloong2f.nix b/modules/installer/cd-dvd/system-tarball-fuloong2f.nix
index 7ece0716df6..a0b92369f65 100644
--- a/modules/installer/cd-dvd/system-tarball-fuloong2f.nix
+++ b/modules/installer/cd-dvd/system-tarball-fuloong2f.nix
@@ -24,7 +24,7 @@ let
         nixpkgs.config.platform = pkgs.platforms.fuloong2f_n32;
       }
     '';
-  
+
 
   pkgs2storeContents = l : map (x: { object = x; symlink = "none"; }) l;
 
@@ -51,7 +51,7 @@ let
       platform = pkgs.platforms.fuloong2f_n32;
     }
   '';
-  
+
 in
 
 {
@@ -104,7 +104,7 @@ in
       pkgs.zip
       pkgs.xz
       pkgs.dar # disk archiver
-      
+
       # Some editors.
       pkgs.nvi
       pkgs.bvi # binary editor
@@ -134,7 +134,7 @@ in
   # Some more help text.
   services.mingetty.helpLine =
     ''
-        
+
       Log in as "root" with an empty password.  ${
         if config.services.xserver.enable then
           "Type `start xserver' to start\nthe graphical user interface."
diff --git a/modules/installer/cd-dvd/system-tarball-pc.nix b/modules/installer/cd-dvd/system-tarball-pc.nix
index 9f81695452c..8b916b04fd9 100644
--- a/modules/installer/cd-dvd/system-tarball-pc.nix
+++ b/modules/installer/cd-dvd/system-tarball-pc.nix
@@ -40,21 +40,21 @@ let
     # Example configuration for booting PXE.
     allow booting;
     allow bootp;
-    
+
     # Adapt this to your network configuration.
     option domain-name "local";
     option subnet-mask 255.255.255.0;
     option broadcast-address 192.168.1.255;
     option domain-name-servers 192.168.1.1;
     option routers 192.168.1.1;
-    
+
     # PXE-specific configuration directives...
     # Some BIOS don't accept slashes for paths inside the tftp servers,
     # and will report Access Violation if they see slashes.
     filename "pxelinux.0";
     # For the TFTP and NFS root server. Set the IP of your server.
     next-server 192.168.1.34;
-    
+
     subnet 192.168.1.0 netmask 255.255.255.0 {
       range 192.168.1.50 192.168.1.55;
     }
@@ -86,7 +86,7 @@ let
 
     You can test qemu pxe boot without having a DHCP server adapted, but having nfsroot,
     like this:
-      qemu-system-x86_64 -tftp /home/pcroot/boot -net nic -net user,bootfile=pxelinux.0 -boot n 
+      qemu-system-x86_64 -tftp /home/pcroot/boot -net nic -net user,bootfile=pxelinux.0 -boot n
 
     I don't know how to use NFS through the qemu '-net user' though.
 
@@ -114,7 +114,7 @@ in
 {
   require = [
     ./system-tarball.nix
- 
+
    # Profiles of this basic installation.
     ../../profiles/base.nix
     ../../profiles/installation-device.nix
@@ -150,7 +150,7 @@ in
         target = "/boot/memtest";
       }
     ];
-     
+
   # Allow sshd to be started manually through "start sshd".  It should
   # not be started by default on the installation CD because the
   # default root password is empty.
diff --git a/modules/installer/cd-dvd/system-tarball-sheevaplug.nix b/modules/installer/cd-dvd/system-tarball-sheevaplug.nix
index f8b6b632ea7..c5f6de4c221 100644
--- a/modules/installer/cd-dvd/system-tarball-sheevaplug.nix
+++ b/modules/installer/cd-dvd/system-tarball-sheevaplug.nix
@@ -25,7 +25,7 @@ let
         #   services.openssh.enable = true;
       }
     '';
-  
+
 
   pkgs2storeContents = l : map (x: { object = x; symlink = "none"; }) l;
 
@@ -45,7 +45,7 @@ let
       init=${config.system.build.toplevel}/init ${toString config.boot.kernelParams}
   '';
 
-  
+
 in
 
 {
@@ -91,7 +91,7 @@ in
       pkgs.zip
       pkgs.xz
       pkgs.dar # disk archiver
-      
+
       # Some editors.
       pkgs.nvi
       pkgs.bvi # binary editor
diff --git a/modules/installer/cd-dvd/system-tarball.nix b/modules/installer/cd-dvd/system-tarball.nix
index a829b85b59f..daffb94bc53 100644
--- a/modules/installer/cd-dvd/system-tarball.nix
+++ b/modules/installer/cd-dvd/system-tarball.nix
@@ -68,7 +68,7 @@ in
   # Create the tarball
   system.build.tarball = import ../../../lib/make-system-tarball.nix {
     inherit (pkgs) stdenv perl xz pathsFromGraph;
-    
+
     inherit (config.tarball) contents storeContents;
   };
 
diff --git a/modules/installer/grub/grub.nix b/modules/installer/grub/grub.nix
index 50ae0ddb596..eaafec78653 100644
--- a/modules/installer/grub/grub.nix
+++ b/modules/installer/grub/grub.nix
@@ -16,7 +16,7 @@ let
       extraConfig extraEntries extraEntriesBeforeNixOS extraPerEntryConfig
       splashImage configurationLimit version default timeout;
   };
-  
+
 in
 
 {
@@ -146,7 +146,7 @@ in
       timeout = mkOption {
         default = 5;
         description = ''
-          Timeout (in seconds) until GRUB boots the default menu item.          
+          Timeout (in seconds) until GRUB boots the default menu item.
         '';
       };
 
@@ -160,12 +160,12 @@ in
     };
 
   };
-  
+
 
   ###### implementation
 
   config = mkIf config.boot.loader.grub.enable {
-  
+
     system.build.menuBuilder = grubMenuBuilder;
 
     # Common attribute for boot loaders so only one of them can be
@@ -178,5 +178,5 @@ in
     system.build.grub = grub;
 
   };
-  
+
 }
diff --git a/modules/installer/init-script/init-script.nix b/modules/installer/init-script/init-script.nix
index 9eeadca109f..edf7d23d2a7 100644
--- a/modules/installer/init-script/init-script.nix
+++ b/modules/installer/init-script/init-script.nix
@@ -10,7 +10,7 @@ let
     inherit (pkgs) bash;
     path = [pkgs.coreutils pkgs.gnused pkgs.gnugrep];
   };
-  
+
 in
 
 {
@@ -37,15 +37,15 @@ in
     };
 
   };
-  
+
 
   ###### implementation
 
   config = {
-  
+
     system.build.initScriptBuilder =
        if config.boot.loader.initScript.enable then initScriptBuilder else "";
 
   };
-  
+
 }
diff --git a/modules/installer/tools/nixos-checkout.nix b/modules/installer/tools/nixos-checkout.nix
index 2d7304ea68d..74a22bc84f5 100644
--- a/modules/installer/tools/nixos-checkout.nix
+++ b/modules/installer/tools/nixos-checkout.nix
@@ -32,7 +32,7 @@ let
         ${pkgs.subversion}/bin/svn co https://svn.nixos.org/repos/nix/nixpkgs/trunk nixpkgs
       '';
    };
-  
+
 in
 
 {
diff --git a/modules/installer/tools/nixos-deploy-network/deploy.nix b/modules/installer/tools/nixos-deploy-network/deploy.nix
index 5eda39269ca..7ece202a990 100644
--- a/modules/installer/tools/nixos-deploy-network/deploy.nix
+++ b/modules/installer/tools/nixos-deploy-network/deploy.nix
@@ -6,16 +6,16 @@
 
 let
   pkgs = import nixpkgs {};
-  
+
   inherit (builtins) attrNames getAttr listToAttrs;
   inherit (pkgs.lib) concatMapStrings zipAttrs;
-  
+
   networks = map (networkExpr: import networkExpr) networkExprs;
-  
+
   network = zipAttrs networks;
-  
+
   generateRollbackSucceededPhase = network: configs:
-    concatMapStrings (configurationName: 
+    concatMapStrings (configurationName:
       let
 	config = getAttr configurationName configs;
       in
@@ -24,15 +24,15 @@ let
 	then
 	    ssh $NIX_SSHOPTS ${getAttr targetProperty (config.deployment)} nix-env -p /nix/var/nix/profiles/system --rollback
 	    ssh $NIX_SSHOPTS ${getAttr targetProperty (config.deployment)} /nix/var/nix/profiles/system/bin/switch-to-configuration switch
-	    
+
 	    rollback=$((rollback + 1))
 	fi
       ''
-    ) (attrNames network)  
+    ) (attrNames network)
   ;
-  
+
   generateDistributionPhase = network: configs:
-    concatMapStrings (configurationName: 
+    concatMapStrings (configurationName:
       let
 	config = getAttr configurationName configs;
       in
@@ -42,28 +42,28 @@ let
       ''
     ) (attrNames network)
   ;
-  
+
   generateActivationPhase = network: configs:
-    concatMapStrings (configurationName: 
+    concatMapStrings (configurationName:
       let
 	config = getAttr configurationName configs;
       in
       ''
         echo "=== activating system configuration on ${getAttr targetProperty (config.deployment)} ==="
-	ssh $NIX_SSHOPTS ${getAttr targetProperty (config.deployment)} nix-env -p /nix/var/nix/profiles/system --set ${config.system.build.toplevel} || 
+	ssh $NIX_SSHOPTS ${getAttr targetProperty (config.deployment)} nix-env -p /nix/var/nix/profiles/system --set ${config.system.build.toplevel} ||
 	  (ssh $NIX_SSHOPTS ${getAttr targetProperty (config.deployment)} nix-env -p /nix/var/nix/profiles/system --rollback; rollbackSucceeded)
-	
+
         ssh $NIX_SSHOPTS ${getAttr targetProperty (config.deployment)} /nix/var/nix/profiles/system/bin/switch-to-configuration switch ||
 	  ( ssh $NIX_SSHOPTS ${getAttr targetProperty (config.deployment)} nix-env -p /nix/var/nix/profiles/system --rollback
 	    ssh $NIX_SSHOPTS ${getAttr targetProperty (config.deployment)} /nix/var/nix/profiles/system/bin/switch-to-configuration switch
 	    rollbackSucceeded
 	  )
-	
+
 	succeeded=$((succeeded + 1))
       ''
     ) (attrNames network)
   ;
-  
+
   evaluateMachines = network:
     listToAttrs (map (configurationName:
       let
@@ -93,27 +93,27 @@ pkgs.stdenv.mkDerivation {
   # This script has a zillion dependencies and is trivial to build, so
   # we don't want to build it remotely.
   preferLocalBuild = true;
-  
-  buildCommand = 
+
+  buildCommand =
   ''
     ensureDir $out/bin
     cat > $out/bin/deploy-systems << "EOF"
     #! ${pkgs.stdenv.shell} -e
-    
+
     rollbackSucceeded()
     {
         rollback=0
         ${generateRollbackSucceededPhase network configs}
     }
-    
+
     # Distribution phase
-    
+
     ${generateDistributionPhase network configs}
-    
+
     # Activation phase
-    
+
     succeeded=0
-    
+
     ${generateActivationPhase network configs}
     EOF
     chmod +x $out/bin/deploy-systems
diff --git a/modules/misc/assertions.nix b/modules/misc/assertions.nix
index c2a94311a28..2b06bfbbc03 100644
--- a/modules/misc/assertions.nix
+++ b/modules/misc/assertions.nix
@@ -7,7 +7,7 @@ let
   failed = map (x: x.message) (filter (x: !x.assertion) config.assertions);
 
 in
-  
+
 {
 
   options = {
@@ -33,5 +33,5 @@ in
       else throw "\nFailed assertions:\n${concatStringsSep "\n" (map (x: "- ${x}") failed)}";
 
   };
-  
+
 }
diff --git a/modules/misc/deployment.nix b/modules/misc/deployment.nix
index 93ae8c97e98..068a9feadce 100644
--- a/modules/misc/deployment.nix
+++ b/modules/misc/deployment.nix
@@ -4,7 +4,7 @@ with pkgs.lib;
 
 {
   options = {
-  
+
     deployment.targetEnv = mkOption {
       default = "none";
       example = "ec2";
@@ -37,7 +37,7 @@ with pkgs.lib;
     };
 
     # EC2/Nova/Eucalyptus-specific options.
-        
+
     deployment.ec2.type = mkOption {
       default = "ec2";
       example = "nova";
@@ -63,7 +63,7 @@ with pkgs.lib;
         machine.  This must be a NixOS image providing SSH access.
       '';
     };
-    
+
     deployment.ec2.instanceType = mkOption {
       default = "m1.small";
       example = "m1.large";
@@ -93,7 +93,7 @@ with pkgs.lib;
         SSH) to execute commands to start VMs or query their status.
       '';
     };
-    
+
     deployment.adhoc.createVMCommand = mkOption {
       default = "create-vm";
       description = ''
@@ -101,7 +101,7 @@ with pkgs.lib;
         print an identifier denoting the VM on standard output.
       '';
     };
-    
+
     deployment.adhoc.destroyVMCommand = mkOption {
       default = "destroy-vm";
       description = ''
@@ -109,7 +109,7 @@ with pkgs.lib;
         machine.
       '';
     };
-    
+
     deployment.adhoc.queryVMCommand = mkOption {
       default = "query-vm";
       description = ''
@@ -118,6 +118,6 @@ with pkgs.lib;
         the VM on standard output.
       '';
     };
-    
+
   };
 }
diff --git a/modules/misc/ids.nix b/modules/misc/ids.nix
index 4181cd53ef8..7415685f707 100644
--- a/modules/misc/ids.nix
+++ b/modules/misc/ids.nix
@@ -22,7 +22,7 @@ let
   };
 
 in
-  
+
 {
   require = options;
 
@@ -51,7 +51,7 @@ in
     uptimed = 29;
     ddclient = 30;
     davfs2 = 31;
-    privoxy = 32;    
+    privoxy = 32;
     osgi = 34;
     tor = 35;
     cups = 36;
diff --git a/modules/misc/locate.nix b/modules/misc/locate.nix
index 3e249007dc3..e24fa2d078c 100644
--- a/modules/misc/locate.nix
+++ b/modules/misc/locate.nix
@@ -35,7 +35,7 @@ in
 ###### implementation
 let
   locatedb = "/var/cache/locatedb";
-  
+
   updatedbCmd =
     "${config.services.locate.period}  root  " +
     "mkdir -m 0755 -p $(dirname ${locatedb}) && " +
diff --git a/modules/misc/nixpkgs.nix b/modules/misc/nixpkgs.nix
index 73332bd96a8..2530b5af3e5 100644
--- a/modules/misc/nixpkgs.nix
+++ b/modules/misc/nixpkgs.nix
@@ -43,7 +43,7 @@ in
               firefox60Pkgs = pkgs.firefox60Pkgs.override {
                 enableOfficialBranding = true;
               };
-            }; 
+            };
           }
         '';
       type = configType;
diff --git a/modules/misc/passthru.nix b/modules/misc/passthru.nix
index 5aacf507afb..9962352a40a 100644
--- a/modules/misc/passthru.nix
+++ b/modules/misc/passthru.nix
@@ -1,9 +1,9 @@
 # This module allows you to export something from configuration
-# Use case: export kernel source expression for ease of configuring 
+# Use case: export kernel source expression for ease of configuring
 
 {config, pkgs, ...}:
 
-let 
+let
 
 options = {
   passthru = pkgs.lib.mkOption {
@@ -14,7 +14,7 @@ options = {
   };
 };
 
-in 
+in
 
 {
   require = options;
diff --git a/modules/profiles/installation-device.nix b/modules/profiles/installation-device.nix
index 9573b933320..10f47840e06 100644
--- a/modules/profiles/installation-device.nix
+++ b/modules/profiles/installation-device.nix
@@ -144,7 +144,7 @@ in
     # Some more help text.
     services.mingetty.helpLine =
       ''
-          
+
         Log in as "root" with an empty password.  ${
           if config.services.xserver.enable then
             "Type `start xserver' to start\nthe graphical user interface."
diff --git a/modules/profiles/rescue.nix b/modules/profiles/rescue.nix
index b3b830e6618..8d9c41987de 100644
--- a/modules/profiles/rescue.nix
+++ b/modules/profiles/rescue.nix
@@ -8,19 +8,19 @@
 
   # Useful for rescue..
   environment.systemPackages = with pkgs; [
-    utillinuxCurses ddrescue 
+    utillinuxCurses ddrescue
     pciutils sdparm hdparm hddtemp usbutils
     btrfsProgs xfsprogs jfsutils jfsrec
-    iproute 
+    iproute
     fuse ntfs3g smbfsFuse sshfsFuse
-    manpages irssi elinks mcabber mutt openssh lftp 
+    manpages irssi elinks mcabber mutt openssh lftp
     openssl ncat socat
     gnupg1 gnupg
     patch which diffutils gcc binutils bc file
     screen
-    bvi joe nvi 
+    bvi joe nvi
     subversion16 monotone git darcs mercurial bazaar cvs
-    unrar unzip zip lzma cabextract cpio 
+    unrar unzip zip lzma cabextract cpio
     lsof
   ];
 
diff --git a/modules/programs/bash/bash.nix b/modules/programs/bash/bash.nix
index 8df97ceac5f..92c2a5b7755 100644
--- a/modules/programs/bash/bash.nix
+++ b/modules/programs/bash/bash.nix
@@ -20,8 +20,8 @@ let
 
   };
 
-in    
-   
+in
+
 {
   require = [options];
 
@@ -52,7 +52,7 @@ in
         target = "skel/.bashrc";
         mode = "0644";
       }
-      
+
       { # Configuration for readline in bash.
         source = ./inputrc;
         target = "inputrc";
@@ -68,5 +68,5 @@ in
       mkdir -m 0755 -p /bin
       ln -sfn ${config.system.build.binsh}/bin/sh /bin/sh
     '';
-  
+
 }
diff --git a/modules/programs/info.nix b/modules/programs/info.nix
index e3b8025f933..044c0995681 100644
--- a/modules/programs/info.nix
+++ b/modules/programs/info.nix
@@ -29,7 +29,7 @@ let
       INFOPATH=$dir:$INFOPATH ${pkgs.texinfo}/bin/info "$@"
     ''; # */
 
-in 
+in
 
 {
   environment.systemPackages = [infoWrapper];
diff --git a/modules/programs/shadow.nix b/modules/programs/shadow.nix
index 81286d9bb5c..8af94c48cce 100644
--- a/modules/programs/shadow.nix
+++ b/modules/programs/shadow.nix
@@ -31,7 +31,7 @@ in
 {
 
   ###### interface
-  
+
   options = {
 
     users.defaultUserShell = pkgs.lib.mkOption {
@@ -44,10 +44,10 @@ in
         actual shell in the Nix store.
       '';
     };
-  
+
   };
 
-  
+
   ###### implementation
 
   config = {
@@ -56,10 +56,10 @@ in
 
     environment.etc =
       [ { # /etc/login.defs: global configuration for pwdutils.  You
-          # cannot login without it! 
+          # cannot login without it!
           source = pkgs.writeText "login.defs" loginDefs;
           target = "login.defs";
-        } 
+        }
 
         { # /etc/default/useradd: configuration for useradd.
           source = pkgs.writeText "useradd"
@@ -84,14 +84,14 @@ in
         { name = "usermod"; rootOK = true; }
         { name = "userdel"; rootOK = true; }
         { name = "groupadd"; rootOK = true; }
-        { name = "groupmod"; rootOK = true; } 
+        { name = "groupmod"; rootOK = true; }
         { name = "groupmems"; rootOK = true; }
         { name = "groupdel"; rootOK = true; }
         { name = "login"; ownDevices = true; allowNullPassword = true; }
       ];
-      
+
     security.setuidPrograms = [ "passwd" "chfn" "su" ];
-    
+
   };
-  
+
 }
diff --git a/modules/security/ca.nix b/modules/security/ca.nix
index 456f91b81e2..ef33298f19e 100644
--- a/modules/security/ca.nix
+++ b/modules/security/ca.nix
@@ -25,7 +25,7 @@ with pkgs.lib;
         export CURL_CA_BUNDLE=/etc/ssl/certs/ca-bundle.crt
         export GIT_SSL_CAINFO=/etc/ssl/certs/ca-bundle.crt
       '';
-      
+
   };
 
 }
diff --git a/modules/security/consolekit.nix b/modules/security/consolekit.nix
index 6d3121903e3..28e1fec0601 100644
--- a/modules/security/consolekit.nix
+++ b/modules/security/consolekit.nix
@@ -13,7 +13,7 @@ let
     name = "var-run-console.ck";
     destination = "/etc/ConsoleKit/run-session.d/var-run-console.ck";
     executable = true;
-    
+
     text =
       ''
         #! ${pkgs.stdenv.shell} -e
diff --git a/modules/security/policykit.nix b/modules/security/policykit.nix
index 747ad24922e..0d56a519e81 100644
--- a/modules/security/policykit.nix
+++ b/modules/security/policykit.nix
@@ -20,7 +20,7 @@ in
 {
 
   options = {
-  
+
     security.policykit.enable = mkOption {
       default = false;
       description = "Enable PolicyKit (obsolete).";
@@ -60,7 +60,7 @@ in
           target = "PolicyKit/policy";
         }
       ];
-      
+
     system.activationScripts.policyKit = stringAfter [ "users" ]
       ''
         mkdir -m 0770 -p /var/run/PolicyKit
@@ -68,7 +68,7 @@ in
 
         mkdir -m 0770 -p /var/lib/PolicyKit
         chown root.polkituser /var/lib/PolicyKit
-        
+
         mkdir -p /var/lib/misc
         touch /var/lib/misc/PolicyKit.reload
         chmod 0664 /var/lib/misc/PolicyKit.reload
diff --git a/modules/security/polkit.nix b/modules/security/polkit.nix
index ac8d68a4d4f..fef52f1fed6 100644
--- a/modules/security/polkit.nix
+++ b/modules/security/polkit.nix
@@ -68,7 +68,7 @@ in
 
     environment.systemPackages = [ pkgs.polkit ];
 
-    # The polkit daemon reads action files 
+    # The polkit daemon reads action files
     environment.pathsToLink = [ "/share/polkit-1/actions" ];
 
     environment.etc =
@@ -86,7 +86,7 @@ in
             '';
           target = "polkit-1/localauthority.conf.d/10-nixos.conf";
         }
-        
+
         { source = pkgs.writeText "org.nixos.pkla" cfg.permissions;
           target = "polkit-1/localauthority/10-vendor.d/org.nixos.pkla";
         }
@@ -95,7 +95,7 @@ in
     services.dbus.packages = [ pkgs.polkit ];
 
     security.pam.services = [ { name = "polkit-1"; } ];
-    
+
     security.setuidPrograms = [ "pkexec" ];
 
     security.setuidOwners = singleton
@@ -115,7 +115,7 @@ in
         # configuration.
         ${pkgs.procps}/bin/pkill -INT -u root -x polkitd
       '';
-      
+
   };
 
 }
diff --git a/modules/security/rtkit.nix b/modules/security/rtkit.nix
index 060ff87f9ea..e47e7baa2b8 100644
--- a/modules/security/rtkit.nix
+++ b/modules/security/rtkit.nix
@@ -8,7 +8,7 @@ with pkgs.lib;
 {
 
   options = {
-  
+
     security.rtkit.enable = mkOption {
       default = false;
       description = ''
@@ -20,7 +20,7 @@ with pkgs.lib;
     };
 
   };
-  
+
 
   config = mkIf config.security.rtkit.enable {
 
diff --git a/modules/security/setuid-wrappers.nix b/modules/security/setuid-wrappers.nix
index 027032a7c27..ebd9e1ed537 100644
--- a/modules/security/setuid-wrappers.nix
+++ b/modules/security/setuid-wrappers.nix
@@ -102,7 +102,7 @@ in
                 # system profile.
                 source=/nix/var/nix/profiles/default/bin/${program}
             fi
-            
+
             cp ${setuidWrapper}/bin/setuid-wrapper ${wrapperDir}/${program}
             echo -n "$source" > ${wrapperDir}/${program}.real
             chmod 0000 ${wrapperDir}/${program} # to prevent races
@@ -110,7 +110,7 @@ in
             chmod "u${if setuid then "+" else "-"}s,g${if setgid then "+" else "-"}s,${permissions}" ${wrapperDir}/${program}
           '';
 
-      in stringAfter [ "users" ] 
+      in stringAfter [ "users" ]
         ''
           # Look in the system path and in the default profile for
           # programs to be wrapped.
@@ -123,5 +123,5 @@ in
         '';
 
   };
-  
+
 }
diff --git a/modules/security/sudo.nix b/modules/security/sudo.nix
index 845371050cc..694f868632d 100644
--- a/modules/security/sudo.nix
+++ b/modules/security/sudo.nix
@@ -5,7 +5,7 @@ with pkgs.lib;
 let
 
   cfg = config.security.sudo;
-  
+
   inherit (pkgs) sudo;
 
 in
diff --git a/modules/services/amqp/rabbitmq.nix b/modules/services/amqp/rabbitmq.nix
index 3322ab329e7..88d6dc588d6 100644
--- a/modules/services/amqp/rabbitmq.nix
+++ b/modules/services/amqp/rabbitmq.nix
@@ -14,9 +14,9 @@ in
 
 
   ###### interface
-  
+
   options = {
-  
+
     services.rabbitmq = {
 
       enable = mkOption {
@@ -74,7 +74,7 @@ in
         environment.HOME = "/var/lib/rabbitmq";
         environment.RABBITMQ_NODE_IP_ADDRESS = cfg.listenAddress;
 
-        exec = 
+        exec =
           ''
             ${run "${pkgs.rabbitmq_server}/sbin/rabbitmq-server"}
           '';
diff --git a/modules/services/audio/alsa.nix b/modules/services/audio/alsa.nix
index 9181a86b377..ea0e1ef29c0 100644
--- a/modules/services/audio/alsa.nix
+++ b/modules/services/audio/alsa.nix
@@ -14,9 +14,9 @@ in
 {
 
   ###### interface
-  
+
   options = {
-  
+
     sound = {
 
       enable = mkOption {
@@ -26,7 +26,7 @@ in
         '';
         merge = mergeEnableOption;
       };
-      
+
       enableOSSEmulation = mkOption {
         default = true;
 	description = ''
@@ -35,14 +35,14 @@ in
       };
 
     };
-    
+
   };
 
 
   ###### implementation
-  
+
   config = mkIf config.sound.enable {
-  
+
     environment.systemPackages = [alsaUtils];
 
     users.extraGroups = singleton
@@ -78,7 +78,7 @@ in
             ${alsaUtils}/sbin/alsactl -f ${soundState} store
           '';
       };
-      
+
   };
 
 }
diff --git a/modules/services/audio/pulseaudio.nix b/modules/services/audio/pulseaudio.nix
index f48cdd49c83..04df2a8e867 100644
--- a/modules/services/audio/pulseaudio.nix
+++ b/modules/services/audio/pulseaudio.nix
@@ -14,9 +14,9 @@ in
   ###### interface
 
   options = {
-  
+
     services.pulseaudio = {
-    
+
       enable = mkOption {
         default = false;
         description = ''
@@ -38,9 +38,9 @@ in
       };
 
     };
-    
+
   };
-  
+
 
   ###### implementation
 
@@ -83,5 +83,5 @@ in
       };
 
   };
-  
+
 }
diff --git a/modules/services/backup/mysql-backup.nix b/modules/services/backup/mysql-backup.nix
index 7c091fcfe26..e1591050f7e 100644
--- a/modules/services/backup/mysql-backup.nix
+++ b/modules/services/backup/mysql-backup.nix
@@ -10,13 +10,13 @@ let
   location = cfg.location ;
   mysqlBackupCron = db : ''
     ${cfg.period} ${cfg.user} ${mysql}/bin/mysqldump ${if cfg.singleTransaction then "--single-transaction" else ""} ${db} | ${gzip}/bin/gzip -c > ${location}/${db}.gz
-  ''; 
+  '';
 
 in
 
 {
   options = {
-  
+
     services.mysqlBackup = {
 
       enable = mkOption {
@@ -48,7 +48,7 @@ in
           List of database names to dump.
         '';
       };
- 
+
       location = mkOption {
         default = "/var/backup/mysql";
         description = ''
@@ -67,7 +67,7 @@ in
   };
 
   config = mkIf config.services.mysqlBackup.enable {
-  
+
     services.cron.systemCronJobs = map mysqlBackupCron config.services.mysqlBackup.databases;
 
     system.activationScripts.mysqlBackup = stringAfter [ "stdio" "defaultPath" "systemConfig" "users" ]
@@ -75,7 +75,7 @@ in
         mkdir -m 0700 -p ${config.services.mysqlBackup.location}
         chown ${config.services.mysqlBackup.user} ${config.services.mysqlBackup.location}
       '';
-    
+
   };
-  
+
 }
diff --git a/modules/services/backup/postgresql-backup.nix b/modules/services/backup/postgresql-backup.nix
index edbbbdac635..f444717d514 100644
--- a/modules/services/backup/postgresql-backup.nix
+++ b/modules/services/backup/postgresql-backup.nix
@@ -10,14 +10,14 @@ let
   postgresqlBackupCron = db:
     ''
       ${config.services.postgresqlBackup.period} root ${postgresql}/bin/pg_dump ${db} | ${gzip}/bin/gzip -c > ${location}/${db}.gz
-    ''; 
+    '';
 
 in
 
 {
 
   options = {
-  
+
     services.postgresqlBackup = {
 
       enable = mkOption {
@@ -39,10 +39,10 @@ in
       databases = mkOption {
         default = [];
         description = ''
-          List of database names to dump. 
+          List of database names to dump.
         '';
       };
- 
+
       location = mkOption {
         default = "/var/backup/postgresql";
         description = ''
@@ -62,5 +62,5 @@ in
         chown root ${config.services.postgresqlBackup.location}
       '';
   };
-  
+
 }
diff --git a/modules/services/backup/sitecopy-backup.nix b/modules/services/backup/sitecopy-backup.nix
index c540e8fcfa0..35ce55ef06c 100644
--- a/modules/services/backup/sitecopy-backup.nix
+++ b/modules/services/backup/sitecopy-backup.nix
@@ -9,13 +9,13 @@ let
 
   sitecopyCron = backup : ''
     ${if backup ? period then backup.period else config.services.sitecopy.period} root ${sitecopy}/bin/sitecopy --storepath=${stateDir} --rcfile=${stateDir}/${backup.name}.conf --update ${backup.name}
-  ''; 
+  '';
 in
 
 {
 
   options = {
-  
+
     services.sitecopy = {
 
       enable = mkOption {
@@ -36,8 +36,8 @@ in
 
       backups = mkOption {
         example = [
-          { name = "test"; 
-            local = "/tmp/backup"; 
+          { name = "test";
+            local = "/tmp/backup";
             remote = "/staff-groups/ewi/st/strategoxt/backup/test";
             server = "webdata.tudelft.nl";
             protocol = "webdav";
@@ -47,15 +47,15 @@ in
         ];
         default = [];
         description = ''
-           List of attributesets describing the backups. 
+           List of attributesets describing the backups.
 
-           Username/password are extracted from <filename>${stateDir}/sitecopy.secrets</filename> at activation 
+           Username/password are extracted from <filename>${stateDir}/sitecopy.secrets</filename> at activation
            time. The secrets file lines should have the following structure:
            <screen>
              server username password
            </screen>
         '';
-      }; 
+      };
 
     };
 
@@ -67,7 +67,7 @@ in
     services.cron.systemCronJobs = map sitecopyCron config.services.sitecopy.backups;
 
     system.activationScripts.sitecopyBackup = stringAfter [ "stdio" "users" ]
-      ''  
+      ''
         mkdir -m 0700 -p ${stateDir}
         chown root ${stateDir}
         touch ${stateDir}/sitecopy.secrets
@@ -96,9 +96,9 @@ in
             else
               echo " * Sitecopy '${b.name}' already initialized"
             fi
-          '' ) config.services.sitecopy.backups 
+          '' ) config.services.sitecopy.backups
         )}
       '';
   };
-  
+
 }
diff --git a/modules/services/databases/4store-endpoint.nix b/modules/services/databases/4store-endpoint.nix
index ac38a9b7d54..7b03b4d8f1d 100644
--- a/modules/services/databases/4store-endpoint.nix
+++ b/modules/services/databases/4store-endpoint.nix
@@ -10,9 +10,9 @@ with pkgs.lib;
   ###### interface
 
   options = {
-  
+
     services.fourStoreEndpoint = {
-    
+
       enable = mkOption {
         default = false;
         description = "Whether to enable 4Store SPARQL endpoint.";
@@ -68,5 +68,5 @@ with pkgs.lib;
     };
 
   });
-  
+
 }
diff --git a/modules/services/databases/4store.nix b/modules/services/databases/4store.nix
index 1bc615681b6..14990e92ea3 100644
--- a/modules/services/databases/4store.nix
+++ b/modules/services/databases/4store.nix
@@ -11,9 +11,9 @@ with pkgs.lib;
   ###### interface
 
   options = {
-  
+
     services.fourStore = {
-    
+
       enable = mkOption {
         default = false;
         description = "Whether to enable 4Store RDF database server.";
@@ -67,5 +67,5 @@ with pkgs.lib;
     };
 
   });
-  
+
 }
diff --git a/modules/services/databases/mysql.nix b/modules/services/databases/mysql.nix
index 60410b133b2..65bf77611e0 100644
--- a/modules/services/databases/mysql.nix
+++ b/modules/services/databases/mysql.nix
@@ -35,9 +35,9 @@ in
   ###### interface
 
   options = {
-  
+
     services.mysql = {
-    
+
       enable = mkOption {
         default = false;
         description = "
@@ -54,7 +54,7 @@ in
 
       port = mkOption {
         default = "3306";
-        description = "Port of MySQL"; 
+        description = "Port of MySQL";
       };
 
       user = mkOption {
@@ -75,8 +75,8 @@ in
       pidDir = mkOption {
         default = "/var/run/mysql";
         description = "Location of the file which stores the PID of the MySQL server";
-      };           
-      
+      };
+
       initialDatabases = mkOption {
         default = [];
         description = "List of database names and their initial schemas that should be used to create databases on the first startup of MySQL";
@@ -85,47 +85,47 @@ in
 	  { name = "bardatabase"; schema = ./bardatabase.sql; }
 	];
       };
-      
+
       initialScript = mkOption {
         default = null;
 	description = "A file containing SQL statements to be executed on the first startup. Can be used for granting certain permissions on the database";
       };
-      
+
       rootPassword = mkOption {
         default = null;
-	description = "Path to a file containing the root password, modified on the first startup. Not specifying a root password will leave the root password empty.";	
+	description = "Path to a file containing the root password, modified on the first startup. Not specifying a root password will leave the root password empty.";
       };
-      
+
       replication = {
         role = mkOption {
 	  default = "none";
 	  description = "Role of the MySQL server instance. Can be either: master, slave or none";
 	};
-	
+
         serverId = mkOption {
 	  default = 1;
 	  description = "Id of the MySQL server instance. This number must be unique for each instance";
 	};
-	
+
 	masterHost = mkOption {
 	  description = "Hostname of the MySQL master server";
 	};
-	
+
 	masterUser = mkOption {
 	  description = "Username of the MySQL replication user";
 	};
-	
+
 	masterPassword = mkOption {
 	  description = "Password of the MySQL replication user";
 	};
-	
+
 	masterPort = mkOption {
 	  default = 3306;
 	  description = "Port number on which the MySQL master server runs";
 	};
       };
     };
-    
+
   };
 
 
@@ -159,7 +159,7 @@ in
           '';
 
         exec = "${mysql}/libexec/mysqld --defaults-extra-file=${myCnf} ${mysqldOptions}";
-	
+
 	postStart =
 	  ''
             # Wait until the MySQL server is available for use
@@ -181,7 +181,7 @@ in
 	    then
 	        # Create initial databases
 
-                ${concatMapStrings (database: 
+                ${concatMapStrings (database:
                   ''
                     if ! test -e "${cfg.dataDir}/${database.name}"; then
                         echo "Creating initial database: ${database.name}"
@@ -196,17 +196,17 @@ in
 		          fi
 		        ) | ${mysql}/bin/mysql -u root -N
                     fi
-                  '') cfg.initialDatabases}            
-	
+                  '') cfg.initialDatabases}
+
 	        # Execute initial script
-		
+
 		${optionalString (cfg.initialScript != null)
 		  ''
 		    cat ${cfg.initialScript} | ${mysql}/bin/mysql -u root -N
 		  ''}
-		
+
 	        # Change root password
-		
+
 		${optionalString (cfg.rootPassword != null)
 		  ''
 		    ( echo "use mysql;"
@@ -214,11 +214,11 @@ in
 		      echo "flush privileges;"
 		    ) | ${mysql}/bin/mysql -u root -N
 		  ''}
-		  
+
 	      rm /tmp/mysql_init
 	    fi
 	  '';
-	  	  
+
         # !!! Need a postStart script to wait until mysqld is ready to
         # accept connections.
 
diff --git a/modules/services/databases/openldap.nix b/modules/services/databases/openldap.nix
index 4186fdc72ac..33a4a25e213 100644
--- a/modules/services/databases/openldap.nix
+++ b/modules/services/databases/openldap.nix
@@ -16,9 +16,9 @@ in
   ###### interface
 
   options = {
-  
+
     services.openldap = {
-    
+
       enable = mkOption {
         default = false;
         description = "
@@ -33,7 +33,7 @@ in
         ";
       };
     };
-    
+
   };
 
 
diff --git a/modules/services/databases/postgresql.nix b/modules/services/databases/postgresql.nix
index 8a18020309b..2f2188043aa 100644
--- a/modules/services/databases/postgresql.nix
+++ b/modules/services/databases/postgresql.nix
@@ -33,46 +33,46 @@ let
       ident_file = '${pkgs.writeText "pg_ident.conf" cfg.identMap}'
       log_destination = 'syslog'
       ${cfg.extraConfig}
-    '';  
+    '';
 
 in
 
 {
 
   ###### interface
-  
+
   options = {
-  
+
     services.postgresql = {
-    
+
       enable = mkOption {
         default = false;
         description = ''
           Whether to run PostgreSQL.
         '';
       };
-      
+
       port = mkOption {
         default = "5432";
         description = ''
           Port for PostgreSQL.
         '';
       };
-      
+
       logDir = mkOption {
         default = "/var/log/postgresql";
         description = ''
           Log directory for PostgreSQL.
         '';
       };
-      
+
       dataDir = mkOption {
         default = "/var/db/postgresql";
         description = ''
           Data directory for PostgreSQL.
         '';
       };
-      
+
       authentication = mkOption {
         default = ''
           # Generated file; do not edit!
@@ -85,22 +85,22 @@ in
           Defines how users authenticate themselves to the server.
         '';
       };
-      
+
       identMap = mkOption {
         default = "";
         description = ''
           Defines the mapping from system users to database users.
         '';
       };
-      
+
       authMethod = mkOption {
         default = " ident sameuser ";
         description = ''
-          How to authorize users. 
+          How to authorize users.
           Note: ident needs absolute trust to all allowed client hosts.
         '';
       };
-      
+
       enableTCPIP = mkOption {
         default = false;
         description = ''
@@ -122,7 +122,7 @@ in
         # So a nicer solution was patching postgresql to allow setting the
         # libdir explicitely.
       };
-      
+
       extraConfig = mkOption {
         default = "";
         description = "Additional text to be appended to <filename>postgresql.conf</filename>.";
@@ -133,7 +133,7 @@ in
 
 
   ###### implementation
-  
+
   config = mkIf config.services.postgresql.enable {
 
     users.extraUsers = singleton
@@ -196,5 +196,5 @@ in
       };
 
   };
-  
+
 }
diff --git a/modules/services/databases/virtuoso.nix b/modules/services/databases/virtuoso.nix
index b41bc0f7ad1..6a29fc13211 100644
--- a/modules/services/databases/virtuoso.nix
+++ b/modules/services/databases/virtuoso.nix
@@ -10,9 +10,9 @@ with pkgs.lib;
   ###### interface
 
   options = {
-  
+
     services.virtuoso = {
-    
+
       enable = mkOption {
         default = false;
         description = "Whether to enable Virtuoso Opensource database server.";
@@ -94,5 +94,5 @@ with pkgs.lib;
     '';
 
   };
-  
+
 }
diff --git a/modules/services/games/ghost-one.nix b/modules/services/games/ghost-one.nix
index 2d1195a043d..815118be1c6 100644
--- a/modules/services/games/ghost-one.nix
+++ b/modules/services/games/ghost-one.nix
@@ -10,7 +10,7 @@ in
 {
 
   ###### interface
-  
+
   options = {
     services.ghostOne = {
 
@@ -24,7 +24,7 @@ in
         check = lang: elem lang [ "English" "Spanish" "Russian" "Serbian" "Turkish" ];
         description = "The language of bot messages: English, Spanish, Russian, Serbian or Turkish.";
       };
-      
+
       war3path = mkOption {
         default = "";
         description = ''
@@ -102,4 +102,4 @@ in
 
   };
 
-}
\ No newline at end of file
+}
diff --git a/modules/services/hardware/acpid.nix b/modules/services/hardware/acpid.nix
index 4be882c1f1e..84680bd3532 100644
--- a/modules/services/hardware/acpid.nix
+++ b/modules/services/hardware/acpid.nix
@@ -19,22 +19,22 @@ let
         in pkgs.lib.concatMapStrings f events
       }
     '';
-  
+
   events = [powerEvent lidEvent acEvent];
-  
+
   # Called when the power button is pressed.
   powerEvent =
     { name = "power-button";
       event = "button/power.*";
-      action = 
+      action =
         ''
           #! ${pkgs.bash}/bin/sh
           ${config.services.acpid.powerEventCommands}
         '';
     };
-  
+
   # Called when the laptop lid is opened/closed.
-  lidEvent = 
+  lidEvent =
     { name = "lid";
       event = "button/lid.*";
       action =
@@ -43,12 +43,12 @@ let
           ${config.services.acpid.lidEventCommands}
         '';
     };
-  
+
   # Called when the AC power is connected or disconnected.
   acEvent =
     { name = "ac-power";
       event = "ac_adapter.*";
-      action = 
+      action =
         ''
           #! ${pkgs.bash}/bin/sh
           ${config.services.acpid.acEventCommands}
@@ -62,7 +62,7 @@ in
   ###### interface
 
   options = {
-  
+
     services.acpid = {
 
       enable = mkOption {
@@ -86,9 +86,9 @@ in
       };
 
     };
-    
+
   };
-  
+
 
   ###### implementation
 
@@ -101,7 +101,7 @@ in
 
         exec = "${pkgs.acpid}/sbin/acpid --foreground --confdir ${acpiConfDir}";
       };
-      
+
   };
-  
+
 }
diff --git a/modules/services/hardware/bluetooth.nix b/modules/services/hardware/bluetooth.nix
index f32e033081c..06ed9ef70a4 100644
--- a/modules/services/hardware/bluetooth.nix
+++ b/modules/services/hardware/bluetooth.nix
@@ -12,12 +12,12 @@ with pkgs.lib;
       default = false;
       description = "Whether to enable support for Bluetooth.";
     };
-  
+
   };
 
 
   ###### implementation
-  
+
   config = mkIf config.hardware.bluetooth.enable {
 
     environment.systemPackages = [ pkgs.bluez pkgs.openobex pkgs.obexftp ];
@@ -25,7 +25,7 @@ with pkgs.lib;
     services.udev.packages = [ pkgs.bluez ];
 
     services.dbus.packages = [ pkgs.bluez ];
-    
-  };  
-  
+
+  };
+
 }
diff --git a/modules/services/hardware/hal.nix b/modules/services/hardware/hal.nix
index cadd1afbe22..f9fb2dfecef 100644
--- a/modules/services/hardware/hal.nix
+++ b/modules/services/hardware/hal.nix
@@ -20,11 +20,11 @@ in
 {
 
   ###### interface
-  
+
   options = {
-  
+
     services.hal = {
-    
+
       enable = mkOption {
         default = false;
         description = ''
@@ -40,12 +40,12 @@ in
       };
 
     };
-    
+
   };
 
 
   ###### implementation
-  
+
   config = mkIf cfg.enable {
 
     environment.systemPackages = [ hal ];
@@ -67,7 +67,7 @@ in
 
     jobs.hal =
       { description = "HAL daemon";
-        
+
         startOn = "started dbus" + optionalString config.services.acpid.enable " and started acpid";
 
         environment =
@@ -95,7 +95,7 @@ in
           ''
             mkdir -m 0755 -p /var/cache/hald
             mkdir -m 0755 -p /var/run/hald
-            
+
             rm -f /var/cache/hald/fdi-cache
           '';
 
@@ -111,7 +111,7 @@ in
 
     services.dbus.enable = true;
     services.dbus.packages = [hal];
-    
+
   };
 
 }
diff --git a/modules/services/hardware/pcscd.nix b/modules/services/hardware/pcscd.nix
index 6f4e848ee69..9f389efc06d 100644
--- a/modules/services/hardware/pcscd.nix
+++ b/modules/services/hardware/pcscd.nix
@@ -7,18 +7,18 @@ with pkgs.lib;
   ###### interface
 
   options = {
-  
+
     services.pcscd = {
 
       enable = mkOption {
         default = false;
         description = "Whether to enable the PCSC-Lite daemon.";
       };
-      
+
     };
-    
+
   };
-  
+
 
   ###### implementation
 
@@ -40,7 +40,7 @@ with pkgs.lib;
 
         exec = "${pkgs.pcsclite}/sbin/pcscd";
       };
-      
+
   };
-  
+
 }
diff --git a/modules/services/hardware/udev.nix b/modules/services/hardware/udev.nix
index 8715c0cb84e..2af4a50e230 100644
--- a/modules/services/hardware/udev.nix
+++ b/modules/services/hardware/udev.nix
@@ -15,9 +15,9 @@ let
   };
 
   modprobe = config.system.sbin.modprobe;
-    
+
   nixosRules = ''
-  
+
     # Miscellaneous devices.
     KERNEL=="sonypi",               MODE="0666"
     KERNEL=="kvm",                  MODE="0666"
@@ -26,7 +26,7 @@ let
     KERNEL=="vboxadd",  NAME="vboxadd",  OWNER="root", GROUP="root", MODE="0660"
     KERNEL=="vboxuser", NAME="vboxuser", OWNER="root", GROUP="root", MODE="0666"
   '';
-  
+
   # Perform substitutions in all udev rules files.
   udevRules = stdenv.mkDerivation {
     name = "udev-rules";
@@ -40,7 +40,7 @@ let
       # Set the firmware search path so that the firmware.sh helper
       # called by 50-firmware.rules works properly.
       echo 'ENV{FIRMWARE_DIRS}="/root/test-firmware ${toString config.hardware.firmware}"' >> $out/00-path.rules
-      
+
       # Add the udev rules from other packages.
       for i in ${toString cfg.packages}; do
         echo "Adding rules for package $i"
@@ -99,7 +99,7 @@ let
       done
 
       # Use the persistent device rules (naming for CD/DVD and
-      # network devices) stored in 
+      # network devices) stored in
       # /var/lib/udev/rules.d/70-persistent-{cd,net}.rules.  These are
       # modified by the write_{cd,net}_rules helpers called from
       # 75-cd-aliases-generator.rules and
@@ -129,7 +129,7 @@ in
 {
 
   ###### interface
-  
+
   options = {
 
     boot.hardwareScan = mkOption {
@@ -143,7 +143,7 @@ in
         parameter to the kernel command line.
       '';
     };
-  
+
     services.udev = {
 
       packages = mkOption {
@@ -181,11 +181,11 @@ in
       };
 
     };
-    
+
     hardware.firmware = mkOption {
       default = [];
       example = [ "/root/my-firmware" ];
-      merge = mergeListOption; 
+      merge = mergeListOption;
       description = ''
         List of directories containing firmware files.  Such files
         will be loaded automatically if the kernel asks for them
@@ -198,16 +198,16 @@ in
         pathsToLink = [ "/" ];
       };
     };
-    
+
   };
-  
+
 
   ###### implementation
 
   config = {
 
     services.udev.extraRules = nixosRules;
-    
+
     services.udev.packages = [ pkgs.udev extraUdevRules ];
 
     services.udev.path = [ pkgs.coreutils pkgs.gnused pkgs.gnugrep pkgs.utillinux pkgs.udev ];
diff --git a/modules/services/hardware/udisks.nix b/modules/services/hardware/udisks.nix
index 21749da424e..1ba17c589d2 100644
--- a/modules/services/hardware/udisks.nix
+++ b/modules/services/hardware/udisks.nix
@@ -7,11 +7,11 @@ with pkgs.lib;
 {
 
   ###### interface
-  
+
   options = {
-  
+
     services.udisks = {
-    
+
       enable = mkOption {
         default = false;
         description = ''
@@ -21,12 +21,12 @@ with pkgs.lib;
       };
 
     };
-    
+
   };
 
 
   ###### implementation
-  
+
   config = mkIf config.services.udisks.enable {
 
     environment.systemPackages = [ pkgs.udisks ];
diff --git a/modules/services/hardware/upower.nix b/modules/services/hardware/upower.nix
index 70f4860304e..1fdaee202d3 100644
--- a/modules/services/hardware/upower.nix
+++ b/modules/services/hardware/upower.nix
@@ -7,11 +7,11 @@ with pkgs.lib;
 {
 
   ###### interface
-  
+
   options = {
-  
+
     services.upower = {
-    
+
       enable = mkOption {
         default = false;
         description = ''
@@ -21,12 +21,12 @@ with pkgs.lib;
       };
 
     };
-    
+
   };
 
 
   ###### implementation
-  
+
   config = mkIf config.services.upower.enable {
 
     environment.systemPackages = [ pkgs.upower ];
diff --git a/modules/services/logging/klogd.nix b/modules/services/logging/klogd.nix
index 2b8a6a64d99..2f4bd411e58 100644
--- a/modules/services/logging/klogd.nix
+++ b/modules/services/logging/klogd.nix
@@ -13,5 +13,5 @@
         "${pkgs.sysklogd}/sbin/klogd -c 1 -2 -n " +
         "-k $(dirname $(readlink -f /var/run/booted-system/kernel))/System.map";
     };
-    
+
 }
diff --git a/modules/services/mail/dovecot.nix b/modules/services/mail/dovecot.nix
index a41bd9eaad7..82584ea5de3 100644
--- a/modules/services/mail/dovecot.nix
+++ b/modules/services/mail/dovecot.nix
@@ -8,9 +8,9 @@ let
 
   cfg = config.services.dovecot;
 
-  dovecotConf = 
+  dovecotConf =
     ''
-      base_dir = /var/run/dovecot/ 
+      base_dir = /var/run/dovecot/
 
       protocols = imap imaps pop3 pop3s
     ''
@@ -33,12 +33,12 @@ let
       maildir_copy_with_hardlinks = yes
 
       auth default {
-        mechanisms = plain login 
+        mechanisms = plain login
         userdb passwd {
         }
         passdb pam {
         }
-        user = root 
+        user = root
       }
       auth_debug = yes
       auth_verbose = yes
@@ -47,7 +47,7 @@ let
 
       log_path = /var/log/dovecot.log
     '';
-  
+
   confFile = pkgs.writeText "dovecot.conf" dovecotConf;
 
 in
@@ -57,9 +57,9 @@ in
   ###### interface
 
   options = {
-  
+
     services.dovecot = {
-    
+
       enable = mkOption {
         default = false;
         description = "Whether to enable the Dovecot POP3/IMAP server.";
@@ -69,7 +69,7 @@ in
         default = "dovecot";
         description = "Dovecot user name.";
       };
-      
+
       group = mkOption {
         default = "dovecot";
         description = "Dovecot group name.";
@@ -79,22 +79,22 @@ in
         default = "";
         description = "Server certificate";
       };
-      
+
       sslCACert = mkOption {
         default = "";
         description = "CA certificate used by the server certificate.";
       };
-      
+
       sslServerKey = mkOption {
         default = "";
         description = "Server key.";
       };
 
     };
-    
+
   };
 
-  
+
   ###### implementation
 
   config = mkIf config.services.dovecot.enable {
@@ -120,13 +120,13 @@ in
 
         preStart =
           ''
-            ${pkgs.coreutils}/bin/mkdir -p /var/run/dovecot /var/run/dovecot/login 
+            ${pkgs.coreutils}/bin/mkdir -p /var/run/dovecot /var/run/dovecot/login
             ${pkgs.coreutils}/bin/chown -R ${cfg.user}.${cfg.group} /var/run/dovecot
           '';
 
         exec = "${pkgs.dovecot}/sbin/dovecot -F -c ${confFile}";
       };
-      
+
   };
-  
+
 }
diff --git a/modules/services/mail/freepops.nix b/modules/services/mail/freepops.nix
index 9f8b93d3e33..8f6e9382607 100644
--- a/modules/services/mail/freepops.nix
+++ b/modules/services/mail/freepops.nix
@@ -84,4 +84,4 @@ in
       '';
     };
   };
-}
\ No newline at end of file
+}
diff --git a/modules/services/mail/mail.nix b/modules/services/mail/mail.nix
index bdf6b28ffbc..bad0b22625d 100644
--- a/modules/services/mail/mail.nix
+++ b/modules/services/mail/mail.nix
@@ -7,9 +7,9 @@ with pkgs.lib;
   ###### interface
 
   options = {
-  
+
     services.mail = {
-    
+
       sendmailSetuidWrapper = mkOption {
         default = null;
         description = ''
diff --git a/modules/services/mail/postfix.nix b/modules/services/mail/postfix.nix
index 71f3a89f19c..13a02386886 100644
--- a/modules/services/mail/postfix.nix
+++ b/modules/services/mail/postfix.nix
@@ -11,7 +11,7 @@ let
   group = cfg.group;
   setgidGroup = cfg.setgidGroup;
 
-  mainCf = 
+  mainCf =
     ''
       queue_directory = /var/postfix/queue
       command_directory = ${pkgs.postfix}/sbin
@@ -30,7 +30,7 @@ let
         ''
       else if cfg.networksStyle != "" then
         ''
-          mynetworks_style = ${cfg.networksStyle} 
+          mynetworks_style = ${cfg.networksStyle}
         ''
       else
         # Postfix default is subnet, but let's play safe
@@ -54,12 +54,12 @@ let
     ''
     + ''
       local_recipient_maps =
-      
-      relayhost = ${if cfg.lookupMX || cfg.relayHost == "" then 
-          cfg.relayHost 
-        else 
+
+      relayhost = ${if cfg.lookupMX || cfg.relayHost == "" then
+          cfg.relayHost
+        else
           "[" + cfg.relayHost + "]"}
-          
+
       alias_maps = hash:/var/postfix/conf/aliases
 
       mail_spool_directory = /var/spool/mail/
@@ -78,13 +78,13 @@ let
       smtpd_tls_cert_file = ${cfg.sslCert}
       smtpd_tls_key_file = ${cfg.sslKey}
 
-      smtpd_use_tls = yes 
+      smtpd_use_tls = yes
 
       recipientDelimiter = ${cfg.recipientDelimiter}
     ''
     + cfg.extraConfig;
 
-  aliases = 
+  aliases =
     optionalString (cfg.postmasterAlias != "") ''
       postmaster: ${cfg.postmasterAlias}
     ''
@@ -96,7 +96,7 @@ let
 
   aliasesFile = pkgs.writeText "postfix-aliases" aliases;
   mainCfFile = pkgs.writeText "postfix-main.cf" mainCf;
- 
+
 in
 
 {
@@ -104,9 +104,9 @@ in
   ###### interface
 
   options = {
-  
+
     services.postfix = {
-    
+
       enable = mkOption {
         default = false;
         description = "Whether to run the Postfix mail server.";
@@ -116,44 +116,44 @@ in
         default = true;
         description = "Whether to set the system sendmail to postfix's.";
       };
-      
+
       user = mkOption {
         default = "postfix";
         description = "What to call the Postfix user (must be used only for postfix).";
       };
-      
+
       group = mkOption {
         default = "postfix";
         description = "What to call the Postfix group (must be used only for postfix).";
       };
-      
+
       setgidGroup = mkOption {
         default = "postdrop";
         description = "
-          How to call postfix setgid group (for postdrop). Should 
+          How to call postfix setgid group (for postdrop). Should
           be uniquely used group.
         ";
       };
-      
+
       networks = mkOption {
         default = null;
         example = ["192.168.0.1/24"];
         description = "
-          Net masks for trusted - allowed to relay mail to third parties - 
-          hosts. Leave empty to use mynetworks_style configuration or use 
+          Net masks for trusted - allowed to relay mail to third parties -
+          hosts. Leave empty to use mynetworks_style configuration or use
           default (localhost-only).
         ";
       };
-      
+
       networksStyle = mkOption {
         default = "";
         description = "
           Name of standard way of trusted network specification to use,
-          leave blank if you specify it explicitly or if you want to use 
+          leave blank if you specify it explicitly or if you want to use
           default (localhost-only).
         ";
       };
-      
+
       hostname = mkOption {
         default = "";
         description ="
@@ -161,65 +161,65 @@ in
           It should be FQDN.
         ";
       };
-      
+
       domain = mkOption {
         default = "";
         description ="
           Domain to use. Leave blank to use hostname minus first component.
         ";
       };
-      
+
       origin = mkOption {
         default = "";
         description ="
           Origin to use in outgoing e-mail. Leave blank to use hostname.
         ";
       };
-      
+
       destination = mkOption {
         default = null;
         example = ["localhost"];
         description = "
-          Full (!) list of domains we deliver locally. Leave blank for 
+          Full (!) list of domains we deliver locally. Leave blank for
           acceptable Postfix default.
         ";
       };
-      
+
       relayDomains = mkOption {
         default = null;
         example = ["localdomain"];
         description = "
-          List of domains we agree to relay to. Default is the same as 
+          List of domains we agree to relay to. Default is the same as
           destination.
         ";
       };
-      
+
       relayHost = mkOption {
         default = "";
         description = "
           Mail relay for outbound mail.
         ";
       };
-      
+
       lookupMX = mkOption {
         default = false;
         description = "
           Whether relay specified is just domain whose MX must be used.
         ";
       };
-      
+
       postmasterAlias = mkOption {
         default = "root";
         description = "Who should receive postmaster e-mail.";
       };
-      
+
       rootAlias = mkOption {
         default = "";
         description = "
           Who should receive root e-mail. Blank for no redirection.
         ";
       };
-      
+
       extraAliases = mkOption {
         default = "";
         description = "
@@ -238,12 +238,12 @@ in
         default = "";
         description = "SSL certificate to use.";
       };
-      
+
       sslCACert = mkOption {
         default = "";
         description = "SSL certificate of CA.";
       };
-      
+
       sslKey = mkOption {
         default = "";
         description = "SSL key to use.";
@@ -293,19 +293,19 @@ in
       };
 
     users.extraGroups =
-      [ { name = group; 
+      [ { name = group;
           gid = config.ids.gids.postfix;
         }
-        { name = setgidGroup; 
+        { name = setgidGroup;
           gid = config.ids.gids.postdrop;
         }
       ];
 
     jobs.postfix =
-      # I copy _lots_ of shipped configuration filed 
+      # I copy _lots_ of shipped configuration filed
       # that can be left as is. I am afraid the exact
-      # will list slightly change in next Postfix 
-      # release, so listing them all one-by-one in an 
+      # will list slightly change in next Postfix
+      # release, so listing them all one-by-one in an
       # accurate way is unlikely to be better.
       { description = "Postfix mail server";
 
@@ -330,20 +330,20 @@ in
             if ! [ -d /var/spool/postfix ]; then
               ${pkgs.coreutils}/bin/mkdir -p /var/spool/mail /var/postfix/conf /var/postfix/queue
             fi
-              
-            ${pkgs.coreutils}/bin/chown -R ${user}.${group} /var/postfix 
-            ${pkgs.coreutils}/bin/chown -R ${user}.${setgidGroup} /var/postfix/queue 
-            ${pkgs.coreutils}/bin/chmod -R ug+rwX /var/postfix/queue 
+
+            ${pkgs.coreutils}/bin/chown -R ${user}.${group} /var/postfix
+            ${pkgs.coreutils}/bin/chown -R ${user}.${setgidGroup} /var/postfix/queue
+            ${pkgs.coreutils}/bin/chmod -R ug+rwX /var/postfix/queue
             ${pkgs.coreutils}/bin/chown root.root /var/spool/mail
             ${pkgs.coreutils}/bin/chmod a+rwxt /var/spool/mail
-            
+
             ln -sf ${pkgs.postfix}/share/postfix/conf/* /var/postfix/conf
 
             ln -sf ${aliasesFile} /var/postfix/conf/aliases
             ln -sf ${mainCfFile} /var/postfix/conf/main.cf
 
             ${pkgs.postfix}/sbin/postalias -c /var/postfix/conf /var/postfix/conf/aliases
-            
+
             exec ${pkgs.postfix}/sbin/postfix -c /var/postfix/conf start
           ''; # */
 
diff --git a/modules/services/misc/autofs.nix b/modules/services/misc/autofs.nix
index ea7a1437928..37ba3bf309c 100644
--- a/modules/services/misc/autofs.nix
+++ b/modules/services/misc/autofs.nix
@@ -17,9 +17,9 @@ in
   ###### interface
 
   options = {
-  
+
     services.autofs = {
-    
+
       enable = mkOption {
         default = false;
         description = "
@@ -97,7 +97,7 @@ in
           pkgs.lib.concatMapStrings (module : "modprobe ${module} || true\n")
                                     (["autofs4"] ++ cfg.kernelModules);
 
-        preStop = 
+        preStop =
           ''
             set -e; while :; do pkill -TERM automount; sleep 1; done
           '';
@@ -125,7 +125,7 @@ in
             exec ${pkgs.autofs5}/sbin/automount ${if cfg.debug then "-d" else ""} -f -t ${builtins.toString cfg.timeout} "${autoMaster}" ${if cfg.debug then "-l7" else ""}
           '';
       };
-          
+
   };
-  
+
 }
diff --git a/modules/services/misc/disnix.nix b/modules/services/misc/disnix.nix
index d0ef5d34a64..1cb538f6a61 100644
--- a/modules/services/misc/disnix.nix
+++ b/modules/services/misc/disnix.nix
@@ -6,7 +6,7 @@ with pkgs.lib;
 let
 
   cfg = config.services.disnix;
-  
+
   disnix_activation_scripts = pkgs.disnix_activation_scripts.override (origArgs: {
     enableApacheWebApplication = config.services.httpd.enable;
     enableAxis2WebService = config.services.tomcat.axis2.enable;
@@ -21,47 +21,47 @@ in
 {
 
   ###### interface
-  
+
   options = {
-  
+
     services.disnix = {
-    
+
       enable = mkOption {
         default = false;
         description = "Whether to enable Disnix";
       };
-      
+
       useWebServiceInterface = mkOption {
         default = false;
 	description = "Whether to enable the DisnixWebService interface running on Apache Tomcat";
       };
-      
+
       publishInfrastructure = {
         enable = mkOption {
           default = false;
 	  description = "Whether to publish capabilities/properties of this machine in as attributes in the infrastructure option";
 	};
-	
+
 	enableAuthentication = mkOption {
 	  default = false;
 	  description = "Whether to publish authentication credentials through the infrastructure attribute (not recommended in combination with Avahi)";
 	};
-      };            
-      
+      };
+
       infrastructure = mkOption {
         default = {};
 	description = "List of name value pairs containing properties for the infrastructure model";
       };
-      
+
       publishAvahi = mkOption {
         default = false;
 	description = "Whether to publish capabilities/properties as a Disnix service through Avahi";
       };
 
     };
-    
+
   };
-  
+
 
   ###### implementation
 
@@ -84,7 +84,7 @@ in
       { name = "disnix";
         gid = config.ids.gids.disnix;
       };
-    
+
     services.disnix.infrastructure =
       optionalAttrs (cfg.publishInfrastructure.enable)
       ( { hostname = config.networking.hostName;
@@ -97,12 +97,12 @@ in
         // optionalAttrs (config.services.tomcat.enable) { tomcatPort = 8080; }
 	// optionalAttrs (config.services.svnserve.enable) { svnBaseDir = config.services.svnserve.svnBaseDir; }
 	// optionalAttrs (cfg.publishInfrastructure.enableAuthentication) (
-          optionalAttrs (config.services.mysql.enable) { mysqlUsername = "root"; mysqlPassword = builtins.readFile config.services.mysql.rootPassword; }) 
+          optionalAttrs (config.services.mysql.enable) { mysqlUsername = "root"; mysqlPassword = builtins.readFile config.services.mysql.rootPassword; })
 	)
     ;
-    
+
     services.disnix.publishInfrastructure.enable = cfg.publishAvahi;
-    
+
     jobs = {
       disnix =
         { description = "Disnix server";
@@ -124,9 +124,9 @@ in
     } // optionalAttrs cfg.publishAvahi {
       disnixAvahi =
         { description = "Disnix Avahi publisher";
-      
+
           startOn = "started avahi-daemon";
-	
+
 	  exec =
           ''
             ${pkgs.avahi}/bin/avahi-publish-service disnix-${config.networking.hostName} _disnix._tcp 22 \
diff --git a/modules/services/misc/felix.nix b/modules/services/misc/felix.nix
index f05abc38f08..2da50fc8595 100644
--- a/modules/services/misc/felix.nix
+++ b/modules/services/misc/felix.nix
@@ -12,16 +12,16 @@ in
 {
 
   ###### interface
-  
+
   options = {
-  
+
     services.felix = {
-    
+
       enable = mkOption {
         default = false;
         description = "Whether to enable the Apache Felix OSGi service";
       };
-      
+
       bundles = mkOption {
         default = [ pkgs.felix_remoteshell ];
         description = "List of bundles that should be activated on startup";
@@ -30,17 +30,17 @@ in
       user = mkOption {
         default = "osgi";
         description = "User account under which Apache Felix runs.";
-      };      
+      };
 
       group = mkOption {
         default = "osgi";
         description = "Group account under which Apache Felix runs.";
-      };      
-      
+      };
+
     };
-    
+
   };
-  
+
 
   ###### implementation
 
@@ -49,7 +49,7 @@ in
       { name = "osgi";
         gid = config.ids.gids.osgi;
       };
-      
+
     users.extraUsers = singleton
       { name = "osgi";
         uid = config.ids.uids.osgi;
@@ -60,16 +60,16 @@ in
     jobs.felix =
       { description = "Felix server";
 
-        preStart = 
+        preStart =
 	  ''
 	    # Initialise felix instance on first startup
 	    if [ ! -d /var/felix ]
 	    then
 	        # Symlink system files
-		
+
 	        mkdir -p /var/felix
 		chown ${cfg.user}:${cfg.group} /var/felix
-		
+
 		for i in ${pkgs.felix}/*
 		do
 		    if [ "$i" != "${pkgs.felix}/bundle" ]
@@ -77,11 +77,11 @@ in
 		        ln -sfn $i /var/felix/$(basename $i)
 		    fi
 		done
-		
+
 		# Symlink bundles
 		mkdir -p /var/felix/bundle
 		chown ${cfg.user}:${cfg.group} /var/felix/bundle
-		
+
 		for i in ${pkgs.felix}/bundle/* ${toString cfg.bundles}
 		do
 		    if [ -f $i ]
@@ -97,7 +97,7 @@ in
 		done
 	    fi
 	  '';
-	  
+
         script =
           ''
 	    cd /var/felix
diff --git a/modules/services/misc/folding-at-home.nix b/modules/services/misc/folding-at-home.nix
index 06223bc56e0..9f4c4645279 100644
--- a/modules/services/misc/folding-at-home.nix
+++ b/modules/services/misc/folding-at-home.nix
@@ -7,9 +7,9 @@ let
 in {
 
   ###### interface
-  
+
   options = {
-  
+
     services.foldingAtHome = {
 
       enable = mkOption {
@@ -29,7 +29,7 @@ in {
       config = mkOption {
         default = "";
         description = ''
-          Extra configuration. Contents will be added verbatim to the 
+          Extra configuration. Contents will be added verbatim to the
           configuration file.
         '';
       };
@@ -71,4 +71,4 @@ in {
 
   };
 
-}
\ No newline at end of file
+}
diff --git a/modules/services/misc/gpsd.nix b/modules/services/misc/gpsd.nix
index 0d12bbc29f3..bc1d1f4575a 100644
--- a/modules/services/misc/gpsd.nix
+++ b/modules/services/misc/gpsd.nix
@@ -7,7 +7,7 @@ let
   uid = config.ids.uids.gpsd;
   gid = config.ids.gids.gpsd;
   cfg = config.services.gpsd;
-  
+
 in
 
 {
@@ -15,7 +15,7 @@ in
   ###### interface
 
   options = {
-  
+
     services.gpsd = {
 
       enable = mkOption {
@@ -70,9 +70,9 @@ in
 
 
   ###### implementation
-  
+
   config = mkIf cfg.enable {
-  
+
     users.extraUsers = singleton
       { name = "gpsd";
         inherit uid;
@@ -100,5 +100,5 @@ in
       };
 
   };
-  
+
 }
diff --git a/modules/services/misc/nix-daemon.nix b/modules/services/misc/nix-daemon.nix
index 11a7aa19f23..221ad6e1f54 100644
--- a/modules/services/misc/nix-daemon.nix
+++ b/modules/services/misc/nix-daemon.nix
@@ -5,7 +5,7 @@ with pkgs.lib;
 let
 
   inherit (config.environment) nix;
-  
+
   makeNixBuildUser = nr:
     { name = "nixbld${toString nr}";
       description = "Nix build user ${toString nr}";
@@ -34,7 +34,7 @@ in
         This option specifies the Nix package instance to use throughout the system.
       ";
     };
-    
+
     nix = {
 
       maxJobs = mkOption {
@@ -76,10 +76,10 @@ in
           gc-keep-derivations = true
         ";
         description = "
-          This option allows to append lines to nix.conf. 
+          This option allows to append lines to nix.conf.
         ";
       };
-      
+
       distributedBuilds = mkOption {
         default = false;
         description = "
@@ -97,8 +97,8 @@ in
       manualNixMachines = mkOption {
         default = false;
         description = "
-          Whether to manually manage the list of buildmachines used in distributed 
-          builds in /etc/nix.machines. 
+          Whether to manually manage the list of buildmachines used in distributed
+          builds in /etc/nix.machines.
         ";
       };
 
@@ -113,7 +113,7 @@ in
       daemonIONiceLevel = mkOption {
         default = 7;
         description = "
-          Nix daemon process I/O priority. This priority propagates to build processes.        
+          Nix daemon process I/O priority. This priority propagates to build processes.
           0 is the default Unix process I/O priority, 7 is the lowest.
         ";
       };
@@ -155,11 +155,11 @@ in
           on the remote machine.
         ";
       };
-   
+
       proxy = mkOption {
         default = "";
         description = "
-          This option specifies the proxy to use for fetchurl. The real effect 
+          This option specifies the proxy to use for fetchurl. The real effect
           is just exporting http_proxy, https_proxy and ftp_proxy with that
           value.
         ";
@@ -208,13 +208,13 @@ in
               # in `build-chroot-dirs' - otherwise any builder that uses
               # /bin/sh won't work.
               binshDeps = pkgs.writeReferencesToFile config.system.build.binsh;
-  
+
               # Likewise, if chroots are turned on, we need Nix's own
               # closure in the chroot.  Otherwise nix-channel and nix-env
               # won't work because the dependencies of its builders (like
               # coreutils and Perl) aren't visible.  Sigh.
               nixDeps = pkgs.writeReferencesToFile config.environment.nix;
-            in 
+            in
               pkgs.runCommand "nix.conf" {extraOptions = config.nix.extraOptions; } ''
                 extraPaths=$(for i in $(cat ${binshDeps} ${nixDeps}); do if test -d $i; then echo $i; fi; done)
                 cat > $out <<END
@@ -236,7 +236,7 @@ in
           source = pkgs.writeText "nix.machines"
             (concatStrings (map (machine:
               "${machine.sshUser}@${machine.hostName} "
-              + (if machine ? system then machine.system else concatStringsSep "," machine.systems) 
+              + (if machine ? system then machine.system else concatStringsSep "," machine.systems)
               + " ${machine.sshKey} ${toString machine.maxJobs} "
               + (if machine ? speedFactor then toString machine.speedFactor else "1" )
               + "\n"
@@ -259,7 +259,7 @@ in
               ${nix}/bin/nix-worker --daemon > /dev/null 2>&1
           '';
 
-        extraConfig = 
+        extraConfig =
           ''
             limit nofile 4096 4096
           '';
@@ -269,7 +269,7 @@ in
       ''
         # Set up the environment variables for running Nix.
         ${config.nix.envVars}
-      
+
         # Set up secure multi-user builds: non-root users build through the
         # Nix daemon.
         if test "$USER" != root; then
diff --git a/modules/services/misc/nixos-manual.nix b/modules/services/misc/nixos-manual.nix
index f463a91998e..7853baf3afa 100644
--- a/modules/services/misc/nixos-manual.nix
+++ b/modules/services/misc/nixos-manual.nix
@@ -15,7 +15,7 @@ let
     inherit (cfg) revision;
     inherit pkgs options;
   };
-    
+
 in
 
 {
@@ -73,7 +73,7 @@ in
     boot.extraTTYs = mkIf cfg.showManual ["tty${cfg.ttyNumber}"];
 
     jobs = mkIf cfg.showManual
-      { nixosManual = 
+      { nixosManual =
         { name = "nixos-manual";
 
           description = "NixOS manual";
@@ -88,7 +88,7 @@ in
         };
       };
 
-    services.ttyBackgrounds.specificThemes = mkIf cfg.showManual 
+    services.ttyBackgrounds.specificThemes = mkIf cfg.showManual
       [ { tty = "tty${cfg.ttyNumber}";
           theme = pkgs.themes "green";
         }
@@ -96,7 +96,7 @@ in
 
     services.mingetty.helpLine = mkIf cfg.showManual
       "\nPress <Alt-F${toString cfg.ttyNumber}> for the NixOS manual.";
-      
+
   };
 
 }
diff --git a/modules/services/misc/rogue.nix b/modules/services/misc/rogue.nix
index 8760ce12510..c313de956fc 100644
--- a/modules/services/misc/rogue.nix
+++ b/modules/services/misc/rogue.nix
@@ -10,12 +10,12 @@ let
   cfg = config.services.rogue;
 
 in
-  
+
 {
   ###### interface
 
   options = {
-  
+
     services.rogue.enable = mkOption {
       default = false;
       description = ''
@@ -33,13 +33,13 @@ in
 
   };
 
-  
+
   ###### implementation
 
   config = mkIf cfg.enable {
 
     boot.extraTTYs = [ cfg.tty ];
-  
+
     jobs.rogue =
       { description = "Rogue dungeon crawling game";
 
@@ -56,5 +56,5 @@ in
       };
 
   };
-    
+
 }
diff --git a/modules/services/misc/svnserve.nix b/modules/services/misc/svnserve.nix
index c1acf5723d8..b0806d14738 100644
--- a/modules/services/misc/svnserve.nix
+++ b/modules/services/misc/svnserve.nix
@@ -6,30 +6,30 @@ with pkgs.lib;
 let
 
   cfg = config.services.svnserve;
-  
+
 in
 
 {
 
   ###### interface
-  
+
   options = {
-  
+
     services.svnserve = {
-    
+
       enable = mkOption {
         default = false;
         description = "Whether to enable svnserve to serve Subversion repositories through the SVN protocol.";
       };
-      
+
       svnBaseDir = mkOption {
         default = "/repos";
 	description = "Base directory from which Subversion repositories are accessed.";
       };
     };
-    
+
   };
-  
+
 
   ###### implementation
 
@@ -37,9 +37,9 @@ in
     jobs.svnserve = {
       startOn = "started network-interfaces";
       stopOn = "stopping network-interfaces";
-      
+
       preStart = "mkdir -p ${cfg.svnBaseDir}";
-      
+
       exec = "${pkgs.subversion}/bin/svnserve -r ${cfg.svnBaseDir} -d --foreground --pid-file=/var/run/svnserve.pid";
     };
   };
diff --git a/modules/services/misc/synergy.nix b/modules/services/misc/synergy.nix
index 5d21e281b75..667d0c6de97 100644
--- a/modules/services/misc/synergy.nix
+++ b/modules/services/misc/synergy.nix
@@ -13,7 +13,7 @@ in
   ###### interface
 
   options = {
-  
+
     services.synergy = {
 
       # !!! All these option descriptions needs to be cleaned up.
@@ -27,13 +27,13 @@ in
         };
         screenName = mkOption {
           default = "";
-          description = " 
+          description = "
             use screen-name instead the hostname to identify
             ourselfs to the server.
             ";
         };
         serverAddress = mkOption {
-          description = " 
+          description = "
             The server address is of the form: [hostname][:port].  The
             hostname must be the address or hostname of the server.  The
             port overrides the default port, 24800.
@@ -56,7 +56,7 @@ in
         };
         screenName = mkOption {
           default = "";
-          description = " 
+          description = "
             use screen-name instead the hostname to identify
             this screen in the configuration.
             ";
@@ -76,9 +76,9 @@ in
   config = {
 
     jobs =
-    
+
       optionalAttrs cfgC.enable
-        { synergyClient = 
+        { synergyClient =
           { name = "synergy-client";
 
             description = "Synergy client";
@@ -92,9 +92,9 @@ in
             '';
           };
         }
-        
+
       // optionalAttrs cfgS.enable
-        { synergyServer = 
+        { synergyServer =
           { name = "synergy-server";
 
             description = "Synergy server";
@@ -122,7 +122,7 @@ section: screens
   win:
 end
 section: aliases
-    laptop: 
+    laptop:
       192.168.5.5
     dm:
       192.168.5.78
diff --git a/modules/services/misc/virtualbox.nix b/modules/services/misc/virtualbox.nix
index 00b81b2f383..e1384323453 100644
--- a/modules/services/misc/virtualbox.nix
+++ b/modules/services/misc/virtualbox.nix
@@ -12,20 +12,20 @@ in
 {
 
   ###### interface
-  
+
   options = {
-  
+
     services.virtualbox = {
-    
+
       enable = mkOption {
         default = false;
         description = "Whether to enable the VirtualBox service and other guest additions.";
-      };        
+      };
 
     };
-    
+
   };
-  
+
 
   ###### implementation
 
@@ -34,10 +34,10 @@ in
     environment.systemPackages = [ ];
 
     boot.extraModulePackages = [ pkgs.linuxPackages.virtualboxGuestAdditions ];
-    
+
     jobs.virtualbox =
       { description = "VirtualBox service";
-      
+
         startOn = "started udev";
 
         exec = "${pkgs.linuxPackages.virtualboxGuestAdditions}/sbin/VBoxService";
diff --git a/modules/services/monitoring/monit.nix b/modules/services/monitoring/monit.nix
index 40ad8456d7c..2acc51c64a6 100644
--- a/modules/services/monitoring/monit.nix
+++ b/modules/services/monitoring/monit.nix
@@ -1,7 +1,7 @@
 # Monit system watcher
 # http://mmonit.org/monit/
 
-{config, pkgs, ...}: 
+{config, pkgs, ...}:
 
 let inherit (pkgs.lib) mkOption mkIf;
 in
@@ -25,9 +25,9 @@ in
       };
     };
   };
-  
+
   config = mkIf config.services.monit.enable {
-  
+
     environment.etc = [
       {
         source = pkgs.writeTextFile {
@@ -38,10 +38,10 @@ in
         mode = "0400";
       }
     ];
-    
+
     jobs.monit = {
       description = "Monit system watcher";
-      
+
       startOn = config.services.monit.startOn;
 
       exec = "${pkgs.monit}/bin/monit -I -c /etc/monit.conf";
diff --git a/modules/services/monitoring/nagios/default.nix b/modules/services/monitoring/nagios/default.nix
index 6b1b3163d26..6d2fe3f2ace 100644
--- a/modules/services/monitoring/nagios/default.nix
+++ b/modules/services/monitoring/nagios/default.nix
@@ -48,7 +48,7 @@ let
       illegal_macro_output_chars=`~$&|'"<>
       retain_state_information=1
     ''; # "
-    
+
   # Plain configuration for the Nagios web-interface with no
   # authentication.
   nagiosCGICfgFile = pkgs.writeText "nagios.cgi.conf"
@@ -83,12 +83,12 @@ let
     '';
 
 in
-  
+
 {
   ###### interface
 
   options = {
-  
+
     services.nagios = {
 
       enable = mkOption {
@@ -141,7 +141,7 @@ in
   ###### implementation
 
   config = mkIf cfg.enable {
-  
+
     users.extraUsers = singleton
       { name = nagiosUser;
         uid = config.ids.uids.nagios;
@@ -190,7 +190,7 @@ in
         elsePart = "";
       };
     };
-    
+
   };
 
 }
diff --git a/modules/services/monitoring/systemhealth.nix b/modules/services/monitoring/systemhealth.nix
index 85f297cfb71..61e6a38fc9a 100644
--- a/modules/services/monitoring/systemhealth.nix
+++ b/modules/services/monitoring/systemhealth.nix
@@ -118,7 +118,7 @@ in
       { function = f: {
           extraConfig = ''
             Alias ${cfg.urlPrefix} ${htmlDir}
-            
+
             <Directory ${htmlDir}>
                 Order allow,deny
                 Allow from all
diff --git a/modules/services/monitoring/ups.nix b/modules/services/monitoring/ups.nix
index b10788c96c4..2874bbf2087 100644
--- a/modules/services/monitoring/ups.nix
+++ b/modules/services/monitoring/ups.nix
@@ -119,7 +119,7 @@ in
         description = ''
           The MODE determines which part of the NUT is to be started, and
           which configuration files must be modified.
-          
+
           The values of MODE can be:
 
           - none: NUT is not configured, or use the Integrated Power
@@ -263,7 +263,7 @@ in
         description = "UPnP A/V Media Server user";
       }
     ];
-  
+
     users.extraGroups = [
       { name = "nut";
         gid = 84;
diff --git a/modules/services/monitoring/zabbix-agent.nix b/modules/services/monitoring/zabbix-agent.nix
index 8f598b8a7a1..4d6b267c1a8 100644
--- a/modules/services/monitoring/zabbix-agent.nix
+++ b/modules/services/monitoring/zabbix-agent.nix
@@ -18,7 +18,7 @@ let
       Server = ${cfg.server}
 
       LogFile = ${logDir}/zabbix_agentd
-  
+
       PidFile = ${pidFile}
 
       StartAgents = 1
@@ -27,13 +27,13 @@ let
     '';
 
 in
-  
+
 {
 
   ###### interface
 
   options = {
-  
+
     services.zabbixAgent = {
 
       enable = mkOption {
@@ -61,7 +61,7 @@ in
     };
 
   };
-  
+
 
   ###### implementation
 
@@ -103,7 +103,7 @@ in
             ${pkgs.zabbix.agent}/sbin/zabbix_agentd --config ${configFile} 100>${stateDir}/dummy2
             wait "$pid"
           '';
-        
+
         postStop =
           ''
             pid=$(cat ${pidFile} 2> /dev/null || true)
diff --git a/modules/services/monitoring/zabbix-server.nix b/modules/services/monitoring/zabbix-server.nix
index 9f875d455de..b5af5a2e7bb 100644
--- a/modules/services/monitoring/zabbix-server.nix
+++ b/modules/services/monitoring/zabbix-server.nix
@@ -18,7 +18,7 @@ let
   configFile = pkgs.writeText "zabbix_server.conf"
     ''
       LogFile = ${logDir}/zabbix_server
-  
+
       PidFile = ${pidFile}
 
       DBHost = ${cfg.dbServer}
@@ -33,13 +33,13 @@ let
     '';
 
 in
-  
+
 {
 
   ###### interface
 
   options = {
-  
+
     services.zabbixServer.enable = mkOption {
       default = false;
       description = ''
@@ -119,7 +119,7 @@ in
             while ${pkgs.procps}/bin/pkill -u zabbix zabbix_server; do true; done
           '';
       };
-      
+
   };
 
 }
diff --git a/modules/services/network-filesystems/nfs-kernel.nix b/modules/services/network-filesystems/nfs-kernel.nix
index bc828d5bbb8..c475f694499 100644
--- a/modules/services/network-filesystems/nfs-kernel.nix
+++ b/modules/services/network-filesystems/nfs-kernel.nix
@@ -17,7 +17,7 @@ in
   ###### interface
 
   options = {
-  
+
     services.nfsKernel = {
 
       client.enable = mkOption {
@@ -53,7 +53,7 @@ in
             <manvolnum>8</manvolnum></citerefentry>.
           '';
         };
-      
+
         nproc = mkOption {
           default = 8;
           description = ''
@@ -66,7 +66,7 @@ in
           description = "Whether to create the mount points in the exports file at startup time.";
         };
       };
-      
+
     };
 
   };
@@ -89,9 +89,9 @@ in
 
     jobs =
       optionalAttrs cfg.server.enable
-        { nfs_kernel_exports = 
+        { nfs_kernel_exports =
           { name = "nfs-kernel-exports";
-      
+
             description = "Kernel NFS server";
 
             startOn = "started network-interfaces";
@@ -100,7 +100,7 @@ in
               ''
                 export PATH=${pkgs.nfsUtils}/sbin:$PATH
                 mkdir -p /var/lib/nfs
-                
+
                 ${config.system.sbin.modprobe}/sbin/modprobe nfsd || true
 
                 ${pkgs.sysvtools}/bin/mountpoint -q /proc/fs/nfsd \
@@ -122,9 +122,9 @@ in
               '';
           };
         }
-    
+
       // optionalAttrs cfg.server.enable
-        { nfs_kernel_nfsd = 
+        { nfs_kernel_nfsd =
           { name = "nfs-kernel-nfsd";
 
             description = "Kernel NFS server";
@@ -132,7 +132,7 @@ in
             startOn = "started nfs-kernel-exports and started nfs-kernel-mountd and started nfs-kernel-statd and started portmap";
             stopOn = "stopping nfs-kernel-exports";
 
-            preStart = 
+            preStart =
               ''
                 # Create a state directory required by NFSv4.
                 mkdir -p /var/lib/nfs/v4recovery
@@ -162,7 +162,7 @@ in
         }
 
       // optionalAttrs (cfg.client.enable || cfg.server.enable)
-        { nfs_kernel_statd = 
+        { nfs_kernel_statd =
           { name = "nfs-kernel-statd";
 
             description = "Kernel NFS server - Network Status Monitor";
@@ -171,7 +171,7 @@ in
             stopOn = "never";
 
             preStart =
-              ''	
+              ''
                 mkdir -p /var/lib/nfs
                 mkdir -p /var/lib/nfs/sm
                 mkdir -p /var/lib/nfs/sm.bak
@@ -184,7 +184,7 @@ in
             postStart = "${pkgs.nfsUtils}/sbin/sm-notify -d";
           };
         };
-      
+
   };
-  
+
 }
diff --git a/modules/services/network-filesystems/samba.nix b/modules/services/network-filesystems/samba.nix
index 7ad597a9fa2..7461d12d78b 100644
--- a/modules/services/network-filesystems/samba.nix
+++ b/modules/services/network-filesystems/samba.nix
@@ -5,13 +5,13 @@ with pkgs.lib;
 let
 
   cfg = config.services.samba;
-  
+
   user = "smbguest";
   group = "smbguest";
 
   logDir = "/var/log/samba";
   privateDir = "/var/samba/private";
- 
+
   inherit (pkgs) samba;
 
   setupScript =
@@ -72,7 +72,7 @@ let
         TZ = config.time.timeZone;
         LOCALE_ARCHIVE = "/var/run/current-system/sw/lib/locale/locale-archive";
       };
-  
+
       daemonType = "fork";
 
       exec = "${samba}/sbin/${appName} ${args}";
@@ -87,7 +87,7 @@ in
   options = {
 
     # !!! clean up the descriptions.
-  
+
     services.samba = {
 
       enable = mkOption {
@@ -176,7 +176,7 @@ in
     };
 
   };
-  
+
 
   ###### implementation
 
@@ -218,5 +218,5 @@ in
     jobs.winbindd = daemonJob "winbindd" "-D";
 
   };
-  
+
 }
diff --git a/modules/services/networking/amuled.nix b/modules/services/networking/amuled.nix
index f499e72c0d2..658d16af006 100644
--- a/modules/services/networking/amuled.nix
+++ b/modules/services/networking/amuled.nix
@@ -12,7 +12,7 @@ in
   ###### interface
 
   options = {
-  
+
     services.amule = {
 
       enable = mkOption {
@@ -39,7 +39,7 @@ in
     };
 
   };
-  
+
 
   ###### implementation
 
@@ -67,5 +67,5 @@ in
       };
 
   };
-  
+
 }
diff --git a/modules/services/networking/avahi-daemon.nix b/modules/services/networking/avahi-daemon.nix
index 0ca9869db0b..81432d34864 100644
--- a/modules/services/networking/avahi-daemon.nix
+++ b/modules/services/networking/avahi-daemon.nix
@@ -30,7 +30,7 @@ in
   ###### interface
 
   options = {
-  
+
     services.avahi = {
 
       enable = mkOption {
@@ -83,11 +83,11 @@ in
           domain by transparently querying the Avahi daemon.
         '';
       };
-      
+
     };
-    
+
   };
-  
+
 
   ###### implementation
 
diff --git a/modules/services/networking/bind.nix b/modules/services/networking/bind.nix
index c93c2a9b00e..54eb5e08e9b 100644
--- a/modules/services/networking/bind.nix
+++ b/modules/services/networking/bind.nix
@@ -5,7 +5,7 @@ with pkgs.lib;
 let
 
   startingDependency = if config.services.gw6c.enable then "gw6c" else "network-interfaces";
-  
+
   cfg = config.services.bind;
 
   confFile = pkgs.writeText "named.conf"
@@ -26,7 +26,7 @@ let
 
       ${ concatMapStrings
           ({ name, file, master ? true, slaves ? [], masters ? [] }:
-            ''           
+            ''
               zone "${name}" {
                 type ${if master then "master" else "slave"};
                 file "${file}";
@@ -56,35 +56,35 @@ in
   ###### interface
 
   options = {
-  
+
     services.bind = {
-    
+
       enable = mkOption {
         default = false;
         description = "
           Whether to enable BIND domain name server.
         ";
       };
-      
+
       cacheNetworks = mkOption {
         default = ["127.0.0.0/24"];
         description = "
           What networks are allowed to use us as a resolver.
         ";
       };
-      
+
       blockedNetworks = mkOption {
         default = [];
         description = "
           What networks are just blocked.
         ";
       };
-      
+
       zones = mkOption {
         default = [];
         description = "
           List of zones we claim authority over.
-            master=false means slave server; slaves means addresses 
+            master=false means slave server; slaves means addresses
            who may request zone transfer.
         ";
         example = [{
@@ -95,11 +95,11 @@ in
           slaves = [];
         }];
       };
-      
+
     };
 
   };
-  
+
 
   ###### implementation
 
@@ -117,5 +117,5 @@ in
       };
 
   };
-  
+
 }
diff --git a/modules/services/networking/bitlbee.nix b/modules/services/networking/bitlbee.nix
index 573feda5462..8fd79cb00f3 100644
--- a/modules/services/networking/bitlbee.nix
+++ b/modules/services/networking/bitlbee.nix
@@ -5,9 +5,9 @@ with pkgs.lib;
 let
 
   bitlbeeUid = config.ids.uids.bitlbee;
-  
+
   inherit (config.services.bitlbee) portNumber interface;
-  
+
 in
 
 {
@@ -15,7 +15,7 @@ in
   ###### interface
 
   options = {
-  
+
     services.bitlbee = {
 
       enable = mkOption {
@@ -46,7 +46,7 @@ in
     };
 
   };
-  
+
 
   ###### implementation
 
@@ -58,7 +58,7 @@ in
         description = "BitlBee user";
         home = "/var/empty";
       };
-    
+
     users.extraGroups = singleton
       { name = "bitlbee";
         gid = config.ids.gids.bitlbee;
@@ -88,5 +88,5 @@ in
     environment.systemPackages = [ pkgs.bitlbee ];
 
   };
-  
+
 }
diff --git a/modules/services/networking/ddclient.nix b/modules/services/networking/ddclient.nix
index 575386c8579..a0523919ef4 100644
--- a/modules/services/networking/ddclient.nix
+++ b/modules/services/networking/ddclient.nix
@@ -33,9 +33,9 @@ in
 {
 
   ###### interface
-  
+
   options = {
-  
+
     services.ddclient = {
 
       enable = mkOption {
@@ -102,7 +102,7 @@ in
 
   config = mkIf config.services.ddclient.enable {
     environment.systemPackages = [ ddclient ];
-  
+
     users.extraUsers = singleton
       { name = ddclientUser;
         uid = config.ids.uids.ddclient;
@@ -128,5 +128,5 @@ in
       };
 
   };
-  
+
 }
diff --git a/modules/services/networking/dhclient.nix b/modules/services/networking/dhclient.nix
index 2acef81e1e5..0a353ae1eab 100644
--- a/modules/services/networking/dhclient.nix
+++ b/modules/services/networking/dhclient.nix
@@ -8,7 +8,7 @@ let
 
   # Don't start dhclient on explicitly configured interfaces or on
   # interfaces that are part of a bridge.
-  ignoredInterfaces = 
+  ignoredInterfaces =
     map (i: i.name) (lib.filter (i: i ? ipAddress && i.ipAddress != "" ) config.networking.interfaces)
     ++ concatLists (attrValues (mapAttrs (n: v: v.interfaces) config.networking.bridges));
 
@@ -29,7 +29,7 @@ let
           # anything ever again ("couldn't resolve ..., giving up on
           # it"), so we silently lose time synchronisation.
           ${config.system.build.upstart}/sbin/initctl stop ntpd
-          
+
           ${config.system.build.upstart}/sbin/initctl emit -n ip-up
       fi
 
@@ -37,7 +37,7 @@ let
           ${config.system.build.upstart}/sbin/initctl emit -n ip-down
       fi
     '';
-  
+
 in
 
 {
@@ -45,7 +45,7 @@ in
   ###### interface
 
   options = {
-  
+
     networking.useDHCP = mkOption {
       default = true;
       merge = mergeEnableOption;
@@ -55,15 +55,15 @@ in
         configured.
       ";
     };
-  
+
   };
 
 
   ###### implementation
-  
+
   config = mkIf config.networking.useDHCP {
 
-    jobs.dhclient = 
+    jobs.dhclient =
       { startOn = "started network-interfaces";
         stopOn = "stopping network-interfaces";
 
@@ -83,7 +83,7 @@ in
                 # (1), i.e. Ethernet.  Ignore peth* devices; on Xen,
                 # they're renamed physical Ethernet cards used for
                 # bridging.  Likewise for vif* and tap* (Xen) and
-                # virbr* and vnet* (libvirt). 
+                # virbr* and vnet* (libvirt).
                 if [ "$(cat /sys/class/net/$i/type)" = 1 ]; then
                     if ! for j in ${toString ignoredInterfaces}; do echo $j; done | grep -F -x -q "$i" &&
                        ! echo "$i" | grep -x -q "peth.*\|vif.*\|tap.*\|virbr.*\|vnet.*";
@@ -121,7 +121,7 @@ in
         initctl restart dhclient
       '';
 
-  };  
-  
+  };
+
 }
 
diff --git a/modules/services/networking/dnsmasq.nix b/modules/services/networking/dnsmasq.nix
index 6ff9e05f4d6..389d5c22e82 100644
--- a/modules/services/networking/dnsmasq.nix
+++ b/modules/services/networking/dnsmasq.nix
@@ -13,9 +13,9 @@ in
 {
 
   ###### interface
-  
+
   options = {
-  
+
     services.dnsmasq = {
 
       enable = mkOption {
@@ -41,7 +41,7 @@ in
   ###### implementation
 
   config = mkIf config.services.dnsmasq.enable {
-  
+
     jobs.dnsmasq =
       { description = "dnsmasq daemon";
 
@@ -51,7 +51,7 @@ in
 
         exec = "${dnsmasq}/bin/dnsmasq -R ${serversParam}";
       };
-    
+
   };
-  
+
 }
diff --git a/modules/services/networking/firewall.nix b/modules/services/networking/firewall.nix
index b4083d3c9e2..64cfcef124a 100644
--- a/modules/services/networking/firewall.nix
+++ b/modules/services/networking/firewall.nix
@@ -5,7 +5,7 @@
    uses several chains:
 
    - ‘nixos-fw-input’ is the main chain for input packet processing.
-   
+
    - ‘nixos-fw-log-refuse’ and ‘nixos-fw-refuse’ are called for
      refused packets.  (The former jumps to the latter after logging
      the packet.)  If you want additional logging, or want to accept
@@ -17,7 +17,7 @@
      can insert rules at the start of this chain.
 
 */
-  
+
 
 
 { config, pkgs, ... }:
@@ -44,7 +44,7 @@ in
   ###### interface
 
   options = {
-  
+
     networking.firewall.enable = mkOption {
       default = false;
       description =
@@ -55,7 +55,7 @@ in
           forwarding.
         '';
     };
-  
+
     networking.firewall.logRefusedConnections = mkOption {
       default = true;
       description =
@@ -63,7 +63,7 @@ in
           Whether to log rejected or dropped incoming connections.
         '';
     };
-  
+
     networking.firewall.logRefusedPackets = mkOption {
       default = false;
       description =
@@ -95,7 +95,7 @@ in
           port scanning somewhat easier.
         '';
     };
-  
+
     networking.firewall.allowedTCPPorts = mkOption {
       default = [];
       example = [ 22 80 ];
@@ -106,7 +106,7 @@ in
           accepted.
         '';
     };
-  
+
     networking.firewall.allowedUDPPorts = mkOption {
       default = [];
       example = [ 53 ];
@@ -116,7 +116,7 @@ in
           List of open UDP ports.
         '';
     };
-  
+
     networking.firewall.allowPing = mkOption {
       default = false;
       type = types.bool;
@@ -128,7 +128,7 @@ in
           less effective.
         '';
     };
-  
+
     networking.firewall.extraCommands = mkOption {
       default = "";
       example = "iptables -A INPUT -p icmp -j ACCEPT";
@@ -140,7 +140,7 @@ in
           to allow packets that would otherwise be refused.
         '';
     };
-  
+
   };
 
 
@@ -184,7 +184,7 @@ in
 
             # The "nixos-fw-refuse" chain rejects or drops packets.
             ip46tables -N nixos-fw-refuse
-            
+
             ${if cfg.rejectPackets then ''
               # Send a reset for existing TCP connections that we've
               # somehow forgotten about.  Send ICMP "port unreachable"
@@ -219,7 +219,7 @@ in
 
             # The "nixos-fw" chain does the actual work.
             ip46tables -N nixos-fw
-            
+
             # Accept all traffic on the loopback interface.
             ip46tables -A nixos-fw -i lo -j nixos-fw-accept
 
diff --git a/modules/services/networking/git-daemon.nix b/modules/services/networking/git-daemon.nix
index b3841d4f074..a7c7c206198 100644
--- a/modules/services/networking/git-daemon.nix
+++ b/modules/services/networking/git-daemon.nix
@@ -9,7 +9,7 @@ in
 {
 
   ###### interface
-  
+
   options = {
     services.gitDaemon = {
 
@@ -18,7 +18,7 @@ in
         description = ''
           Enable Git daemon, which allows public hosting  of git repositories
           without any access controls. This is mostly intended for read-only access.
-          
+
           You can allow write access by setting daemon.receivepack configuration
           item of the repository to true. This is solely meant for a closed LAN setting
           where everybody is friendly.
@@ -109,4 +109,4 @@ in
 
   };
 
-}
\ No newline at end of file
+}
diff --git a/modules/services/networking/gnunet.nix b/modules/services/networking/gnunet.nix
index a717ff47f02..a86c3999c2c 100644
--- a/modules/services/networking/gnunet.nix
+++ b/modules/services/networking/gnunet.nix
@@ -48,9 +48,9 @@ in
   ###### interface
 
   options = {
-  
+
     services.gnunet = {
-      
+
       enable = mkOption {
         default = false;
         description = ''
diff --git a/modules/services/networking/gvpe.nix b/modules/services/networking/gvpe.nix
index 102de2bca2d..594a2e80f34 100644
--- a/modules/services/networking/gvpe.nix
+++ b/modules/services/networking/gvpe.nix
@@ -1,32 +1,32 @@
 # GNU Virtual Private Ethernet
 
-{config, pkgs, ...}: 
+{config, pkgs, ...}:
 
-let 
+let
   inherit (pkgs.lib) mkOption mkIf;
 
   cfg = config.services.gvpe;
 
-  finalConfig = if cfg.configFile != null then 
+  finalConfig = if cfg.configFile != null then
     cfg.configFile
   else if cfg.configText != null then
     pkgs.writeTextFile {
       name = "gvpe.conf";
       text = cfg.configText;
     }
-  else 
+  else
     throw "You must either specify contents of the config file or the config file itself for GVPE";
 
-  ifupScript = if cfg.ipAddress == null || cfg.subnet == null then 
-     throw "Specify IP address and subnet (with mask) for GVPE" 
-   else if cfg.nodename == null then 
-     throw "You must set node name for GVPE" 
+  ifupScript = if cfg.ipAddress == null || cfg.subnet == null then
+     throw "Specify IP address and subnet (with mask) for GVPE"
+   else if cfg.nodename == null then
+     throw "You must set node name for GVPE"
    else
-   (pkgs.writeTextFile { 
+   (pkgs.writeTextFile {
     name = "gvpe-if-up";
     text = ''
       #! /bin/sh
-      
+
       export PATH=$PATH:${pkgs.iproute}/sbin
 
       ip link set $IFNAME up
@@ -80,7 +80,7 @@ in
           udp-port = 655
           mtu = 1480
           ifname = vpn0
-          
+
           node = alpha
           hostname = alpha.example.org
           connect = always
@@ -124,7 +124,7 @@ in
   config = mkIf cfg.enable {
     jobs.gvpe = {
       description = "GNU Virtual Private Ethernet node";
-      
+
       inherit startOn stopOn;
 
       preStart = ''
diff --git a/modules/services/networking/gw6c/default.nix b/modules/services/networking/gw6c/default.nix
index a566679d789..72f72d4c005 100644
--- a/modules/services/networking/gw6c/default.nix
+++ b/modules/services/networking/gw6c/default.nix
@@ -44,9 +44,9 @@ in
   ###### interface
 
   options = {
-  
+
     services.gw6c = {
-    
+
       enable = mkOption {
         default = false;
         description = "
@@ -57,7 +57,7 @@ in
       autorun = mkOption {
         default = true;
         description = "
-          Switch to false to create upstart-job and configuration, 
+          Switch to false to create upstart-job and configuration,
           but not run it automatically
         ";
       };
@@ -109,23 +109,23 @@ in
       };
 
     };
-    
+
     security.seccureKeys = {
 
       # !!! It's not clear to me (ED) what additional security this
       # provides.  Passwords shouldn't be in configuration.nix,
       # period.  You could just place the password in
       # /var/blah/password or whatever.
-    
+
       public = mkOption {
         default = /var/elliptic-keys/public;
         description = "
           Public key. Make it path argument, so it is copied into store and
-          hashed. 
+          hashed.
 
           The key is used to encrypt Gateway 6 configuration in store, as it
-          contains a password for external service. Unfortunately, 
-          derivation file should be protected by other means. For example, 
+          contains a password for external service. Unfortunately,
+          derivation file should be protected by other means. For example,
           nix-http-export.cgi will happily export any non-derivation path,
           but not a derivation.
         ";
@@ -141,7 +141,7 @@ in
     };
 
   };
-  
+
 
   ###### implementation
 
@@ -149,7 +149,7 @@ in
 
     jobs.gw6c =
       { description = "Gateway6 client";
-      
+
         startOn = if cfg.autorun then "started network-interfaces" else "";
         stopOn = "stopping network-interfaces";
 
diff --git a/modules/services/networking/ifplugd.nix b/modules/services/networking/ifplugd.nix
index 6ec71849ca3..e4e4fd9216a 100644
--- a/modules/services/networking/ifplugd.nix
+++ b/modules/services/networking/ifplugd.nix
@@ -20,14 +20,14 @@ let
       fi
     '';
 
-in 
+in
 
 {
 
   ###### interface
 
   options = {
-  
+
     networking.interfaceMonitor.enable = mkOption {
       default = false;
       description = "
@@ -46,7 +46,7 @@ in
         plugged in or unplugged.
       ";
     };
-    
+
   };
 
 
@@ -69,7 +69,7 @@ in
       };
 
     environment.systemPackages = [ifplugd];
-      
+
   };
 
 }
diff --git a/modules/services/networking/ircd-hybrid/default.nix b/modules/services/networking/ircd-hybrid/default.nix
index c4bf1878acf..d28e856eabf 100644
--- a/modules/services/networking/ircd-hybrid/default.nix
+++ b/modules/services/networking/ircd-hybrid/default.nix
@@ -5,7 +5,7 @@ with pkgs.lib;
 let
 
   cfg = config.services.ircdHybrid;
-  
+
   ircdService = pkgs.stdenv.mkDerivation rec {
     name = "ircd-hybrid-service";
     scripts = [ "=>/bin" ./control.in ];
@@ -17,7 +17,7 @@ let
     inherit (cfg) serverName sid description adminEmail
             extraPort;
 
-    cryptoSettings = 
+    cryptoSettings =
       (optionalString (cfg.rsaKey != null) "rsa_private_key_file = \"${cfg.rsaKey}\";\n") +
       (optionalString (cfg.certificate != null) "ssl_certificate_file = \"${cfg.certificate}\";\n");
 
@@ -35,7 +35,7 @@ in
   ###### interface
 
   options = {
-  
+
     services.ircdHybrid = {
 
       enable = mkOption {
@@ -70,7 +70,7 @@ in
         default = null;
         example = /root/certificates/irc.key;
         description = "
-          IRCD server RSA key. 
+          IRCD server RSA key.
         ";
       };
 
@@ -86,7 +86,7 @@ in
         default = "<bit-bucket@example.com>";
         example = "<name@domain.tld>";
         description = "
-          IRCD server administrator e-mail. 
+          IRCD server administrator e-mail.
         ";
       };
 
@@ -115,7 +115,7 @@ in
   config = mkIf config.services.ircdHybrid.enable {
 
     users.extraUsers = singleton
-      { name = "ircd"; 
+      { name = "ircd";
         description = "IRCD owner";
       };
 
diff --git a/modules/services/networking/nat.nix b/modules/services/networking/nat.nix
index 50b2590b3be..c51eeb54be7 100644
--- a/modules/services/networking/nat.nix
+++ b/modules/services/networking/nat.nix
@@ -15,7 +15,7 @@ in
   ###### interface
 
   options = {
-  
+
     networking.nat.enable = mkOption {
       default = false;
       description =
@@ -23,7 +23,7 @@ in
           Whether to enable Network Address Translation (NAT).
         '';
     };
-  
+
     networking.nat.internalIPs = mkOption {
       example = "192.168.1.0/24";
       description =
@@ -33,7 +33,7 @@ in
           interface will be rewritten.
         '';
     };
-  
+
     networking.nat.externalInterface = mkOption {
       example = "eth1";
       description =
@@ -41,7 +41,7 @@ in
           The name of the external network interface.
         '';
     };
-  
+
     networking.nat.externalIP = mkOption {
       default = "";
       example = "203.0.113.123";
@@ -53,7 +53,7 @@ in
           used.
         '';
     };
-  
+
   };
 
 
diff --git a/modules/services/networking/ntpd.nix b/modules/services/networking/ntpd.nix
index f0b96951eb1..6e3040a2ae1 100644
--- a/modules/services/networking/ntpd.nix
+++ b/modules/services/networking/ntpd.nix
@@ -30,9 +30,9 @@ in
 {
 
   ###### interface
-  
+
   options = {
-  
+
     services.ntp = {
 
       enable = mkOption {
@@ -62,7 +62,7 @@ in
   ###### implementation
 
   config = mkIf config.services.ntp.enable {
-  
+
     users.extraUsers = singleton
       { name = ntpUser;
         uid = config.ids.uids.ntp;
@@ -93,7 +93,7 @@ in
 
         exec = "${ntp}/bin/ntpd -g -n ${ntpFlags}";
       };
-    
+
   };
-  
+
 }
diff --git a/modules/services/networking/openfire.nix b/modules/services/networking/openfire.nix
index 02e6b4c9aaa..7ac53067f77 100644
--- a/modules/services/networking/openfire.nix
+++ b/modules/services/networking/openfire.nix
@@ -5,12 +5,12 @@ with pkgs.lib;
 let
 
   inherit (pkgs) jre openfire coreutils which gnugrep gawk gnused;
-    
+
   startDependency =
     if config.services.openfire.usePostgreSQL then "postgresql" else
     if config.services.gw6c.enable then "gw6c" else
     "network-interfaces";
-    
+
 in
 
 {
@@ -18,16 +18,16 @@ in
   ###### interface
 
   options = {
-  
+
     services.openfire = {
-    
+
       enable = mkOption {
         default = false;
         description = "
           Whether to enable OpenFire XMPP server.
         ";
       };
-      
+
       usePostgreSQL = mkOption {
         default = true;
         description = "
@@ -56,8 +56,8 @@ in
           ''
             export PATH=${jre}/bin:${openfire}/bin:${coreutils}/bin:${which}/bin:${gnugrep}/bin:${gawk}/bin:${gnused}/bin
             export HOME=/tmp
-            mkdir /var/log/openfire || true 
-            mkdir /etc/openfire || true 
+            mkdir /var/log/openfire || true
+            mkdir /etc/openfire || true
             for i in ${openfire}/conf.inst/*; do
                 if ! test -f /etc/openfire/$(basename $i); then
                     cp $i /etc/openfire/
@@ -68,5 +68,5 @@ in
       };
 
   });
-  
+
 }
diff --git a/modules/services/networking/openvpn.nix b/modules/services/networking/openvpn.nix
index 772a9509064..bec5d7b8107 100644
--- a/modules/services/networking/openvpn.nix
+++ b/modules/services/networking/openvpn.nix
@@ -75,15 +75,15 @@ let
   };
 
 in
-  
+
 {
 
   ###### interface
 
   options = {
-  
+
     services.openvpn = {
-    
+
       enable = mkOption {
         default = false;
         description = "Whether to enable OpenVPN.";
@@ -98,7 +98,7 @@ in
             mostSimple = {
               config = ''
                 # Most simple configuration: http://openvpn.net/index.php/documentation/miscellaneous/static-key-mini-howto.html.
-                # server : 
+                # server :
                 dev tun
                 ifconfig 10.8.0.1 10.8.0.2
                 secret static.key
@@ -132,7 +132,7 @@ in
           Each instance will result in a new job file.
 
           Additionally you can specify the up/ down scripts by setting
-          the up down properties. 
+          the up down properties.
           Config lines up=/nix/store/xxx-up-script down=...
           will be appended to your configuration file automatically
 
@@ -161,5 +161,5 @@ in
     environment.systemPackages = [ openvpn ];
 
   };
-  
+
 }
diff --git a/modules/services/networking/portmap.nix b/modules/services/networking/portmap.nix
index 9c0d559f867..0b03c6ccdb4 100644
--- a/modules/services/networking/portmap.nix
+++ b/modules/services/networking/portmap.nix
@@ -8,7 +8,7 @@ let
   gid = config.ids.gids.portmap;
 
   portmap = pkgs.portmap.override { daemonUID = uid; daemonGID = gid; };
-  
+
 in
 
 {
@@ -16,9 +16,9 @@ in
   ###### interface
 
   options = {
-  
+
     services.portmap = {
-    
+
       enable = mkOption {
         default = false;
         description = ''
@@ -45,7 +45,7 @@ in
     };
 
   };
-  
+
 
   ###### implementation
 
diff --git a/modules/services/networking/privoxy.nix b/modules/services/networking/privoxy.nix
index a63a32996eb..443328f67b0 100644
--- a/modules/services/networking/privoxy.nix
+++ b/modules/services/networking/privoxy.nix
@@ -28,9 +28,9 @@ in
 {
 
   ###### interface
-  
+
   options = {
-  
+
     services.privoxy = {
 
       enable = mkOption {
@@ -69,7 +69,7 @@ in
 
   config = mkIf config.services.privoxy.enable {
     environment.systemPackages = [ privoxy ];
-  
+
     users.extraUsers = singleton
       { name = privoxyUser;
         uid = config.ids.uids.privoxy;
@@ -95,5 +95,5 @@ in
       };
 
   };
-  
+
 }
diff --git a/modules/services/networking/quassel.nix b/modules/services/networking/quassel.nix
index 916694c6910..d5c38cfd048 100644
--- a/modules/services/networking/quassel.nix
+++ b/modules/services/networking/quassel.nix
@@ -13,7 +13,7 @@ in
   ###### interface
 
   options = {
-  
+
     services.quassel = {
 
       enable = mkOption {
@@ -56,7 +56,7 @@ in
     };
 
   };
-  
+
 
   ###### implementation
 
@@ -66,7 +66,7 @@ in
       { name = "quassel";
         description = "Quassel IRC client daemon";
       }];
-    
+
 
     jobs.quassel =
       { description = "Quassel IRC client daemon";
@@ -86,5 +86,5 @@ in
       };
 
   };
-  
+
 }
diff --git a/modules/services/networking/radvd.nix b/modules/services/networking/radvd.nix
index 4da60525e38..8d586ce6e46 100644
--- a/modules/services/networking/radvd.nix
+++ b/modules/services/networking/radvd.nix
@@ -17,7 +17,7 @@ in
   ###### interface
 
   options = {
-  
+
     services.radvd.enable = mkOption {
       default = false;
       description =
@@ -53,10 +53,10 @@ in
   config = mkIf cfg.enable {
 
     environment.systemPackages = [ pkgs.radvd ];
-    
+
     jobs.radvd =
       { description = "IPv6 Router Advertisement Daemon";
-      
+
         startOn = "started network-interfaces";
 
         preStart =
@@ -66,12 +66,12 @@ in
             # necessarily for all interfaces).
             echo 1 > /proc/sys/net/ipv6/conf/all/forwarding
           '';
-        
+
         exec = "${pkgs.radvd}/sbin/radvd -m syslog -s -C ${confFile}";
 
         daemonType = "fork";
       };
 
   };
-  
-}
\ No newline at end of file
+
+}
diff --git a/modules/services/networking/rdnssd.nix b/modules/services/networking/rdnssd.nix
index 11017b8e250..f797206ad5c 100644
--- a/modules/services/networking/rdnssd.nix
+++ b/modules/services/networking/rdnssd.nix
@@ -10,7 +10,7 @@ with pkgs.lib;
   ###### interface
 
   options = {
-  
+
     services.rdnssd.enable = mkOption {
       default = false;
       #default = config.networking.enableIPv6;
@@ -32,7 +32,7 @@ with pkgs.lib;
 
     jobs.rdnssd =
       { description = "RDNSS daemon";
-      
+
         # Start before the network interfaces are brought up so that
         # the daemon receives RDNSS advertisements from the kernel.
         startOn = "starting network-interfaces";
@@ -44,5 +44,5 @@ with pkgs.lib;
       };
 
   };
-  
+
 }
diff --git a/modules/services/networking/sabnzbd.nix b/modules/services/networking/sabnzbd.nix
index 06c528188b6..8816ac0d2f8 100644
--- a/modules/services/networking/sabnzbd.nix
+++ b/modules/services/networking/sabnzbd.nix
@@ -2,7 +2,7 @@
 
 with pkgs.lib;
 
-let 
+let
 
   cfg = config.services.sabnzbd;
   inherit (pkgs) sabnzbd;
@@ -25,7 +25,7 @@ in
       };
     };
   };
-  
+
 
   ###### implementation
 
diff --git a/modules/services/networking/ssh/lshd.nix b/modules/services/networking/ssh/lshd.nix
index 63943990f61..d32fabbde24 100644
--- a/modules/services/networking/ssh/lshd.nix
+++ b/modules/services/networking/ssh/lshd.nix
@@ -2,7 +2,7 @@
 
 with pkgs.lib;
 
-let 
+let
 
   inherit (pkgs) lsh;
 
@@ -15,7 +15,7 @@ in
   ###### interface
 
   options = {
-  
+
     services.lshd = {
 
       enable = mkOption {
@@ -106,7 +106,7 @@ in
           an executable implementing it.
         '';
       };
-      
+
     };
 
   };
@@ -169,7 +169,7 @@ in
                                                    subsystems)}
           '';
       };
-         
+
   };
-  
+
 }
diff --git a/modules/services/networking/tftpd.nix b/modules/services/networking/tftpd.nix
index 002fc991555..37935496c59 100644
--- a/modules/services/networking/tftpd.nix
+++ b/modules/services/networking/tftpd.nix
@@ -5,7 +5,7 @@ with pkgs.lib;
 {
 
   ###### interface
-  
+
   options = {
 
     services.tftpd.enable = mkOption {
diff --git a/modules/services/networking/vsftpd.nix b/modules/services/networking/vsftpd.nix
index 837f44c4213..1b2432401de 100644
--- a/modules/services/networking/vsftpd.nix
+++ b/modules/services/networking/vsftpd.nix
@@ -2,10 +2,10 @@
 
 with pkgs.lib;
 
-let 
+let
 
   cfg = config.services.vsftpd;
-  
+
   inherit (pkgs) vsftpd;
 
   yesNoOption = p : name :
@@ -18,9 +18,9 @@ in
   ###### interface
 
   options = {
-  
+
     services.vsftpd = {
-    
+
       enable = mkOption {
         default = false;
         description = "Whether to enable the vsftpd FTP server.";
@@ -72,9 +72,9 @@ in
       };
 
     };
-    
+
   };
-  
+
 
   ###### implementation
 
@@ -133,5 +133,5 @@ in
       };
 
   };
-  
+
 }
diff --git a/modules/services/networking/wakeonlan.nix b/modules/services/networking/wakeonlan.nix
index 936936d2948..1fc54986b16 100644
--- a/modules/services/networking/wakeonlan.nix
+++ b/modules/services/networking/wakeonlan.nix
@@ -14,7 +14,7 @@ let
     if method == "magicpacket" then "wol g"
     else if method == "password" then "wol s so ${passwordParameter password}"
     else throw "Wake-On-Lan method not supported";
-    
+
   line = { interface, method ? "magicpacket", password ? "" }: ''
     ${ethtool} -s ${interface} ${methodParameter {inherit method password;}}
   '';
@@ -26,7 +26,7 @@ in
 {
 
   ###### interface
-  
+
   options = {
 
     services.wakeonlan.interfaces = mkOption {
diff --git a/modules/services/networking/wicd.nix b/modules/services/networking/wicd.nix
index b26511bcb52..8e012273216 100644
--- a/modules/services/networking/wicd.nix
+++ b/modules/services/networking/wicd.nix
@@ -7,7 +7,7 @@ with pkgs.lib;
   ###### interface
 
   options = {
-  
+
     networking.wicd.enable = mkOption {
       default = false;
       description = ''
@@ -20,12 +20,12 @@ with pkgs.lib;
 
 
   ###### implementation
-  
+
   config = mkIf config.networking.wicd.enable {
 
     environment.systemPackages = [pkgs.wicd];
 
-    jobs.wicd = 
+    jobs.wicd =
       { startOn = "started network-interfaces";
         stopOn = "stopping network-interfaces";
 
@@ -35,7 +35,7 @@ with pkgs.lib;
 
     services.dbus.enable = true;
     services.dbus.packages = [pkgs.wicd];
-  
+
   };
 
 }
diff --git a/modules/services/networking/xinetd.nix b/modules/services/networking/xinetd.nix
index 5b74d7e420a..0bd6052c125 100644
--- a/modules/services/networking/xinetd.nix
+++ b/modules/services/networking/xinetd.nix
@@ -2,10 +2,10 @@
 
 with pkgs.lib;
 
-let 
+let
 
   cfg = config.services.xinetd;
-  
+
   inherit (pkgs) xinetd;
 
   configFile = pkgs.writeText "xinetd.conf"
@@ -16,7 +16,7 @@ let
         log_on_failure = HOST
         log_on_success = PID HOST DURATION EXIT
       }
-      
+
       ${concatMapStrings makeService cfg.services}
     '';
 
@@ -35,15 +35,15 @@ let
         ${optionalString (srv.serverArgs != "") "server_args = ${srv.serverArgs}"}
       }
     '';
-  
+
 in
-  
+
 {
 
   ###### interface
-  
+
   options = {
-  
+
     services.xinetd.enable = mkOption {
       default = false;
       description = ''
@@ -58,7 +58,7 @@ in
       '';
 
       type = types.list types.optionSet;
-      
+
       options = {
 
         name = mkOption {
@@ -120,7 +120,7 @@ in
     };
 
   };
-  
+
 
   ###### implementation
 
diff --git a/modules/services/printing/cupsd.nix b/modules/services/printing/cupsd.nix
index 632bdbae90d..81ab8a1531e 100644
--- a/modules/services/printing/cupsd.nix
+++ b/modules/services/printing/cupsd.nix
@@ -143,7 +143,7 @@ in
       };
 
     services.printing.drivers = [ pkgs.cups pkgs.cups_pdf_filter pkgs.ghostscript additionalBackends ];
-    
+
     services.printing.cupsdConf =
       ''
         LogLevel info
diff --git a/modules/services/scheduling/atd.nix b/modules/services/scheduling/atd.nix
index 8f6d1667bdb..8213f4b3667 100644
--- a/modules/services/scheduling/atd.nix
+++ b/modules/services/scheduling/atd.nix
@@ -5,7 +5,7 @@ with pkgs.lib;
 let
 
   cfg = config.services.atd;
-  
+
   inherit (pkgs) at;
 
 in
@@ -15,7 +15,7 @@ in
   ###### interface
 
   options = {
-  
+
     services.atd.enable = mkOption {
       default = true;
       description = ''
@@ -26,14 +26,14 @@ in
     services.atd.allowEveryone = mkOption {
       default = false;
       description = ''
-        Whether to make /var/spool/at{jobs,spool} writeable 
+        Whether to make /var/spool/at{jobs,spool} writeable
         by everyone (and sticky).  This is normally not needed since
         the `at' commands are setuid/setgid `atd'.
      '';
     };
-    
+
   };
-  
+
 
   ###### implementation
 
diff --git a/modules/services/scheduling/cron.nix b/modules/services/scheduling/cron.nix
index 555cde92876..9a81eb6e72c 100644
--- a/modules/services/scheduling/cron.nix
+++ b/modules/services/scheduling/cron.nix
@@ -22,7 +22,7 @@ let
     # should have sendmail in this path.
     sendmailPath = "/var/setuid-wrappers/sendmail";
   };
-  
+
 in
 
 {
@@ -30,7 +30,7 @@ in
   ###### interface
 
   options = {
-  
+
     services.cron = {
 
       enable = mkOption {
@@ -66,7 +66,7 @@ in
       };
 
     };
-    
+
   };
 
 
@@ -89,7 +89,7 @@ in
       { description = "Cron daemon";
 
         startOn = "startup";
- 
+
         # Needed to interpret times in the local timezone.
         environment = { TZ = config.time.timeZone; };
 
@@ -108,5 +108,5 @@ in
       };
 
   };
-  
+
 }
diff --git a/modules/services/scheduling/fcron.nix b/modules/services/scheduling/fcron.nix
index 4521b3c5760..bf70bb65727 100644
--- a/modules/services/scheduling/fcron.nix
+++ b/modules/services/scheduling/fcron.nix
@@ -5,7 +5,7 @@ with pkgs.lib;
 let
 
   cfg = config.services.fcron;
-  
+
   queuelen = if cfg.queuelen == "" then "" else "-q ${toString cfg.queuelen}";
 
   systemCronJobs =
@@ -28,38 +28,38 @@ in
 {
 
   ###### interface
-  
+
   options = {
-  
+
     services.fcron = {
-    
+
       enable = mkOption {
         default = false;
         description = "Whether to enable the `fcron' daemon.";
       };
-      
+
       allow = mkOption {
         default = [ "all" ];
         description = ''
           Users allowed to use fcrontab and fcrondyn (one name per line, "all" for everyone).
         '';
       };
-      
+
       deny = mkOption {
         default = [];
         description = "Users forbidden from using fcron.";
       };
-      
+
       maxSerialJobs = mkOption {
         default = 1;
         description = "Maximum number of serial jobs which can run simultaneously.";
       };
-      
+
       queuelen = mkOption {
         default = "";
         description = "Number of jobs the serial queue and the lavg queue can contain - empty to net set this number (-q)";
       };
-      
+
       systab = mkOption {
         default = "";
         description = ''The "system" crontab contents.'';
diff --git a/modules/services/security/tor.nix b/modules/services/security/tor.nix
index 6e1b2838ead..6582ba70253 100644
--- a/modules/services/security/tor.nix
+++ b/modules/services/security/tor.nix
@@ -22,15 +22,15 @@ in
 {
 
   ###### interface
-  
+
   options = {
-  
+
     services.tor = {
 
       config = mkOption {
         default = "";
         description = ''
-          Extra configuration. Contents will be added verbatim to the 
+          Extra configuration. Contents will be added verbatim to the
           configuration file.
         '';
       };
@@ -49,7 +49,7 @@ in
           default = "127.0.0.1:9050";
           example = "192.168.0.1:9100";
           description = ''
-            Bind to this address to listen for connections from Socks-speaking 
+            Bind to this address to listen for connections from Socks-speaking
             applications.
           '';
         };
@@ -70,9 +70,9 @@ in
             default = true;
             description = ''
               Whether to enable a special instance of privoxy dedicated to Tor.
-              To have anonymity, protocols need to be scrubbed of identifying 
+              To have anonymity, protocols need to be scrubbed of identifying
               information.
-              Most people using Tor want to anonymize their web traffic, so by 
+              Most people using Tor want to anonymize their web traffic, so by
               default we enable an special instance of privoxy specifically for
               Tor.
               However, if you are only going to use Tor only for other kinds of
@@ -84,9 +84,9 @@ in
             default = "127.0.0.1:8118";
             description = ''
               Address that Tor's instance of privoxy is listening to.
-              *This does not configure the standard NixOS instance of privoxy.*  
-              This is for Tor connections only! 
-              See services.privoxy.listenAddress to configure the standard NixOS 
+              *This does not configure the standard NixOS instance of privoxy.*
+              This is for Tor connections only!
+              See services.privoxy.listenAddress to configure the standard NixOS
               instace of privoxy.
             '';
           };
@@ -94,11 +94,11 @@ in
           config = mkOption {
             default = "";
             description = ''
-              Extra configuration for Tor's instance of privoxy. Contents will be 
+              Extra configuration for Tor's instance of privoxy. Contents will be
               added verbatim to the configuration file.
-              *This does not configure the standard NixOS instance of privoxy.* 
-              This is for Tor connections only! 
-              See services.privoxy.extraConfig to configure the standard NixOS 
+              *This does not configure the standard NixOS instance of privoxy.*
+              This is for Tor connections only!
+              See services.privoxy.extraConfig to configure the standard NixOS
               instace of privoxy.
             '';
           };
@@ -107,7 +107,7 @@ in
 
       };
 
-      relay = {      
+      relay = {
 
         enable = mkOption {
           default = false;
@@ -246,7 +246,7 @@ in
       torPrivoxy = { name = "tor-privoxy";
 
                      startOn = "starting tor";
-                     stopOn = "stopping tor"; 
+                     stopOn = "stopping tor";
 
                      preStart = ''
                        mkdir -m 0755 -p ${privoxyDir}
@@ -275,7 +275,7 @@ in
         ${if cfg.relay.isExit then opt "ExitPolicy" cfg.relay.exitPolicy else "ExitPolicy reject *:*"}
         ${if cfg.relay.isBridge then "BridgeRelay 1" else ""}
       '';
-    
+
       services.tor.client.privoxy.config = ''
         # Generally, this file goes in /etc/privoxy/config
         #
@@ -287,14 +287,14 @@ in
         actionsfile default.action   # Main actions file
         actionsfile user.action      # User customizations
         filterfile default.filter
-        
+
         # Don't log interesting things, only startup messages, warnings and errors
         logfile logfile
         #jarfile jarfile
         #debug   0    # show each GET/POST/CONNECT request
         debug   4096 # Startup banner and warnings
         debug   8192 # Errors - *we highly recommended enabling this*
-        
+
         user-manual ${privoxy}/doc/privoxy/user-manual
         listen-address  ${cfg.client.privoxy.listenAddress}
         toggle  1
@@ -302,10 +302,10 @@ in
         enable-edit-actions 0
         enable-remote-http-toggle 0
         buffer-limit 4096
-    
+
         # Extra config goes here
       '';
-     
+
   });
-  
+
 }
diff --git a/modules/services/security/torsocks.nix b/modules/services/security/torsocks.nix
index 5257327b384..e56bd012d04 100644
--- a/modules/services/security/torsocks.nix
+++ b/modules/services/security/torsocks.nix
@@ -19,9 +19,9 @@ in
 {
 
   ###### interface
-  
+
   options = {
-  
+
     services.tor.torsocks = {
 
       enable = mkOption {
diff --git a/modules/services/system/dbus.nix b/modules/services/system/dbus.nix
index 248b29a3dd5..4f6d577e936 100644
--- a/modules/services/system/dbus.nix
+++ b/modules/services/system/dbus.nix
@@ -14,13 +14,13 @@ let
     name = "dbus-conf";
     buildCommand = ''
       ensureDir $out
-      
+
       cp -v ${pkgs.dbus_daemon}/etc/dbus-1/system.conf $out/system.conf
 
       # !!! Hm, these `sed' calls are rather error-prone...
 
       # Tell the daemon where the setuid wrapper around
-      # dbus-daemon-launch-helper lives.      
+      # dbus-daemon-launch-helper lives.
       sed -i $out/system.conf \
           -e 's|<servicehelper>.*/libexec/dbus-daemon-launch-helper|<servicehelper>${config.security.wrapperDir}/dbus-daemon-launch-helper|'
 
@@ -31,7 +31,7 @@ let
           -e 's|<includedir>system.d</includedir>|${systemIncludeDirs}|'
 
       cp ${pkgs.dbus_daemon}/etc/dbus-1/session.conf $out/session.conf
-      
+
       # Add the services and session.d directories to the session bus
       # search path.
       sed -i $out/session.conf \
@@ -63,7 +63,7 @@ in
   ###### interface
 
   options = {
-  
+
     services.dbus = {
 
       enable = mkOption {
@@ -87,7 +87,7 @@ in
       };
 
     };
-    
+
   };
 
 
@@ -125,7 +125,7 @@ in
 
             mkdir -m 0755 -p /var/lib/dbus
             ${pkgs.dbus_tools}/bin/dbus-uuidgen --ensure
- 
+
             rm -f ${homeDir}/pid
           '';
 
@@ -160,7 +160,7 @@ in
       ];
 
     environment.pathsToLink = [ "/etc/dbus-1" "/share/dbus-1" ];
-    
+
   };
- 
+
 }
diff --git a/modules/services/system/kerberos.nix b/modules/services/system/kerberos.nix
index 4ca9a0169bf..2a47b904589 100644
--- a/modules/services/system/kerberos.nix
+++ b/modules/services/system/kerberos.nix
@@ -12,9 +12,9 @@ in
 {
 
   ###### interface
-  
+
   options = {
-  
+
     services.kerberos_server = {
 
       enable = mkOption {
@@ -32,9 +32,9 @@ in
   ###### implementation
 
   config = mkIf config.services.kerberos_server.enable {
-  
+
     environment.systemPackages = [ heimdal ];
-  
+
     services.xinetd.enable = true;
     services.xinetd.services = pkgs.lib.singleton
       { name = "kerberos-adm";
@@ -67,5 +67,5 @@ in
         exec = "${heimdal}/sbin/kpasswdd";
       };
   };
-  
+
 }
diff --git a/modules/services/system/nscd.nix b/modules/services/system/nscd.nix
index ede6c4213db..971b73706ae 100644
--- a/modules/services/system/nscd.nix
+++ b/modules/services/system/nscd.nix
@@ -7,7 +7,7 @@ let
   nssModulesPath = config.system.nssModules.path;
 
   inherit (pkgs.lib) singleton;
-  
+
 in
 
 {
@@ -32,7 +32,7 @@ in
   ###### implementation
 
   config = mkIf config.services.nscd.enable {
-  
+
     users.extraUsers = singleton
       { name = "nscd";
         uid = config.ids.uids.nscd;
@@ -45,7 +45,7 @@ in
         startOn = "startup";
 
         environment = { LD_LIBRARY_PATH = nssModulesPath; };
-        
+
         preStart =
           ''
             mkdir -m 0755 -p /var/run/nscd
diff --git a/modules/services/system/uptimed.nix b/modules/services/system/uptimed.nix
index fd4c1652bd3..51874cfc0e5 100644
--- a/modules/services/system/uptimed.nix
+++ b/modules/services/system/uptimed.nix
@@ -19,9 +19,9 @@ in
 {
 
   ###### interface
-  
+
   options = {
-  
+
     services.uptimed = {
 
       enable = mkOption {
@@ -39,9 +39,9 @@ in
   ###### implementation
 
   config = mkIf config.services.uptimed.enable {
-  
+
     environment.systemPackages = [ uptimed ];
-  
+
     users.extraUsers = singleton
       { name = uptimedUser;
         uid = config.ids.uids.uptimed;
@@ -69,7 +69,7 @@ in
 
         exec = "${uptimed}/sbin/uptimed ${uptimedFlags}";
       };
-    
+
   };
-  
+
 }
diff --git a/modules/services/ttys/gpm.nix b/modules/services/ttys/gpm.nix
index 256fe8d2380..6a425cf327f 100644
--- a/modules/services/ttys/gpm.nix
+++ b/modules/services/ttys/gpm.nix
@@ -7,15 +7,15 @@ let
   cfg = config.services.gpm;
 
 in
-  
+
 {
 
   ###### interface
 
   options = {
-  
+
     services.gpm = {
-    
+
       enable = mkOption {
         default = false;
         description = ''
@@ -23,16 +23,16 @@ in
           which enables mouse support in virtual consoles.
         '';
       };
-        
+
       protocol = mkOption {
         default = "ps/2";
         description = "Mouse protocol to use.";
       };
 
     };
-    
+
   };
-  
+
 
   ###### implementation
 
@@ -47,5 +47,5 @@ in
       };
 
   };
-  
+
 }
diff --git a/modules/services/ttys/mingetty.nix b/modules/services/ttys/mingetty.nix
index e924d38dd60..1de075588e7 100644
--- a/modules/services/ttys/mingetty.nix
+++ b/modules/services/ttys/mingetty.nix
@@ -7,7 +7,7 @@ with pkgs.lib;
   ###### interface
 
   options = {
-  
+
     services.mingetty = {
 
       ttys = mkOption {
@@ -47,7 +47,7 @@ with pkgs.lib;
       };
 
     };
-    
+
   };
 
 
@@ -55,25 +55,25 @@ with pkgs.lib;
 
   config = {
 
-    # Generate a separate job for each tty.  
+    # Generate a separate job for each tty.
     jobs = listToAttrs (map (tty: nameValuePair tty {
-    
+
       startOn = "started udev and filesystem";
 
       exec = "${pkgs.mingetty}/sbin/mingetty --loginprog=${pkgs.shadow}/bin/login --noclear ${tty}";
-      
+
     }) config.services.mingetty.ttys);
 
     environment.etc = singleton
       { # Friendly greeting on the virtual consoles.
         source = pkgs.writeText "issue" ''
-      
+
           ${config.services.mingetty.greetingLine}
           ${config.services.mingetty.helpLine}
-        
+
         '';
         target = "issue";
       };
   };
-  
+
 }
diff --git a/modules/services/web-servers/apache-httpd/default.nix b/modules/services/web-servers/apache-httpd/default.nix
index c6cbac5e611..a7e0472cd3f 100644
--- a/modules/services/web-servers/apache-httpd/default.nix
+++ b/modules/services/web-servers/apache-httpd/default.nix
@@ -5,7 +5,7 @@ with pkgs.lib;
 let
 
   mainCfg = config.services.httpd;
-  
+
   startingDependency = if config.services.gw6c.enable then "gw6c" else "network-interfaces";
 
   httpd = pkgs.apacheHttpd;
@@ -16,7 +16,7 @@ let
   extraForeignModules = filter builtins.isAttrs extraModules;
   extraApacheModules = filter (x: !(builtins.isAttrs x)) extraModules; # I'd prefer using builtins.isString here, but doesn't exist yet
 
-  
+
   makeServerInfo = cfg: {
     # Canonical name must not include a trailing slash.
     canonicalName =
@@ -40,7 +40,7 @@ let
   };
 
   vhosts = let
-    makeVirtualHost = cfgIn: 
+    makeVirtualHost = cfgIn:
       let
         # Fill in defaults for missing options.
         cfg = addDefaultOptionValues vhostOptions cfgIn;
@@ -49,11 +49,11 @@ let
 
 
   allHosts = [mainCfg] ++ vhosts;
-    
+
 
   callSubservices = serverInfo: defs:
     let f = svc:
-      let 
+      let
         svcFunction =
           if svc ? function then svc.function
           else import "${./.}/${if svc ? serviceType then svc.serviceType else svc.serviceName}.nix";
@@ -77,7 +77,7 @@ let
     in map f defs;
 
 
-  # !!! callSubservices is expensive   
+  # !!! callSubservices is expensive
   subservicesFor = cfg: callSubservices (makeServerInfo cfg) cfg.extraSubservices;
 
   mainSubservices = subservicesFor mainCfg;
@@ -91,10 +91,10 @@ let
 
 
   enableSSL = any (vhost: vhost.enableSSL) allHosts;
-  
+
 
   # Names of modules from ${httpd}/modules that we want to load.
-  apacheModules = 
+  apacheModules =
     [ # HTTP authentication mechanisms: basic and digest.
       "auth_basic" "auth_digest"
 
@@ -110,10 +110,10 @@ let
       "mime" "dav" "status" "autoindex" "asis" "info" "cgi" "dav_fs"
       "vhost_alias" "negotiation" "dir" "imagemap" "actions" "speling"
       "userdir" "alias" "rewrite" "proxy" "proxy_http"
-    ] 
+    ]
     ++ optional enableSSL "ssl"
     ++ extraApacheModules;
-    
+
 
   loggingConf = ''
     ErrorLog ${mainCfg.logDir}/error_log
@@ -208,7 +208,7 @@ let
       SSLCertificateFile ${cfg.sslServerCert}
       SSLCertificateKeyFile ${cfg.sslServerKey}
     '' else ""}
-    
+
     ${if cfg.enableSSL then ''
       SSLEngine on
     '' else if enableSSL then /* i.e., SSL is enabled for some host, but not this one */
@@ -230,10 +230,10 @@ let
     ${if isMainServer || cfg.documentRoot != null then documentRootConf else ""}
 
     ${if cfg.enableUserDir then ''
-    
+
       UserDir public_html
       UserDir disabled root
-      
+
       <Directory "/home/*/public_html">
           AllowOverride FileInfo AuthConfig Limit Indexes
           Options MultiViews Indexes SymLinksIfOwnerMatch IncludesNoExec
@@ -246,7 +246,7 @@ let
               Deny from all
           </LimitExcept>
       </Directory>
-      
+
     '' else ""}
 
     ${if cfg.globalRedirect != "" then ''
@@ -278,9 +278,9 @@ let
     ${cfg.extraConfig}
   '';
 
-  
+
   httpdConf = pkgs.writeText "httpd.conf" ''
-  
+
     ServerRoot ${httpd}
 
     PidFile ${mainCfg.stateDir}/httpd.pid
@@ -305,7 +305,7 @@ let
           concatMap (svc: svc.extraModulesPre) allSubservices
           ++ map (name: {inherit name; path = "${httpd}/modules/mod_${name}.so";}) apacheModules
           ++ optional enablePHP { name = "php5"; path = "${pkgs.php}/modules/libphp5.so"; }
-          ++ concatMap (svc: svc.extraModules) allSubservices 
+          ++ concatMap (svc: svc.extraModules) allSubservices
           ++ extraForeignModules;
       in concatMapStrings load allModules
     }
@@ -325,7 +325,7 @@ let
     Include ${httpd}/conf/extra/httpd-autoindex.conf
     Include ${httpd}/conf/extra/httpd-multilang-errordoc.conf
     Include ${httpd}/conf/extra/httpd-languages.conf
-    
+
     ${if enableSSL then sslConf else ""}
 
     # Fascist default - deny access to everything.
@@ -346,7 +346,7 @@ let
 
     # Generate directives for the main server.
     ${perServerConf true mainCfg}
-    
+
     # Always enable virtual hosts; it doesn't seem to hurt.
     ${let
         ports = map getPort allHosts;
@@ -387,9 +387,9 @@ in
   ###### interface
 
   options = {
-  
+
     services.httpd = {
-      
+
       enable = mkOption {
         default = false;
         description = "
@@ -609,5 +609,5 @@ in
       };
 
   };
-  
+
 }
diff --git a/modules/services/web-servers/apache-httpd/mediawiki.nix b/modules/services/web-servers/apache-httpd/mediawiki.nix
index c5c892825f4..d45d477b671 100644
--- a/modules/services/web-servers/apache-httpd/mediawiki.nix
+++ b/modules/services/web-servers/apache-httpd/mediawiki.nix
@@ -5,13 +5,13 @@ with pkgs.lib;
 let
 
   src_clean_skin = pkgs.fetchurl {
-    url = "http://lastlog.de/misc/clean-1.01.tar.gz"; 
-    sha256 = "5fb1736b64b33ca3429d035f1358cf8217da2d02019d8a80b14c7985367f659f"; 
+    url = "http://lastlog.de/misc/clean-1.01.tar.gz";
+    sha256 = "5fb1736b64b33ca3429d035f1358cf8217da2d02019d8a80b14c7985367f659f";
   };
 
   src_nixos_skin = pkgs.fetchurl {
-    url = "http://lastlog.de/misc/nixos-1.0.tar.gz"; 
-    sha256 = "413b0f451bde81ac2dd0bede17dd088f9abcd0f3cea1722279311ca648a855cf"; 
+    url = "http://lastlog.de/misc/nixos-1.0.tar.gz";
+    sha256 = "413b0f451bde81ac2dd0bede17dd088f9abcd0f3cea1722279311ca648a855cf";
   };
 
   mediawikiConfig = pkgs.writeText "LocalSettings.php"
@@ -83,7 +83,7 @@ let
   # Unpack Mediawiki and put the config file in its root directory.
   mediawikiRoot = pkgs.stdenv.mkDerivation rec {
     name= "mediawiki-1.15.5";
-    
+
     src = pkgs.fetchurl {
       url = "http://download.wikimedia.org/mediawiki/1.15/${name}.tar.gz";
       sha256 = "1d8afbdh3lsg54b69mnh6a47psb3lg978xpp277qs08yz15cjf7q";
@@ -116,7 +116,7 @@ let
           --add-flags ${mediawikiRoot}/maintenance/$i
       done
     '';
-  
+
 in
 
 {
@@ -132,7 +132,7 @@ in
             Options -Indexes
         </Directory>
       ''}
-      
+
       Alias ${config.urlPrefix} ${mediawikiRoot}
 
       <Directory ${mediawikiRoot}>
@@ -170,7 +170,7 @@ in
       default = "mediawiki";
       description = "Name of the database that holds the MediaWiki data.";
     };
-    
+
     dbServer = mkOption {
       default = ""; # use a Unix domain socket
       example = "10.0.2.2";
@@ -185,7 +185,7 @@ in
       default = "mediawiki";
       description = "The user name for accessing the database.";
     };
-    
+
     dbPassword = mkOption {
       default = "";
       example = "foobar";
@@ -194,7 +194,7 @@ in
         cleartext in the Nix store!
       '';
     };
-    
+
     emergencyContact = mkOption {
       default = serverInfo.serverConfig.adminAddr;
       example = "admin@example.com";
@@ -203,7 +203,7 @@ in
         admin address.
       '';
     };
-    
+
     passwordSender = mkOption {
       default = serverInfo.serverConfig.adminAddr;
       example = "password@example.com";
@@ -277,7 +277,7 @@ in
   extraPath = [ mediawikiScripts ];
 
   # !!! Need to specify that Apache has a dependency on PostgreSQL!
-  
+
   startupScript = pkgs.writeScript "mediawiki_startup.sh"
     # Initialise the database automagically if we're using a Postgres
     # server on localhost.
diff --git a/modules/services/web-servers/apache-httpd/mercurial.nix b/modules/services/web-servers/apache-httpd/mercurial.nix
index 45cb8197917..ad1c332a657 100644
--- a/modules/services/web-servers/apache-httpd/mercurial.nix
+++ b/modules/services/web-servers/apache-httpd/mercurial.nix
@@ -5,9 +5,9 @@ let
   inherit (pkgs.lib) mkOption;
 
   urlPrefix = config.urlPrefix;
-  
+
   cgi = pkgs.stdenv.mkDerivation {
-    name = "mercurial-cgi";  
+    name = "mercurial-cgi";
     buildCommand = ''
       ensureDir $out
       cp -v ${mercurial}/share/cgi-bin/hgweb.cgi $out
@@ -21,7 +21,7 @@ let
       " > $out/hgweb.config
     '';
   };
-      
+
 in {
 
   extraConfig = ''
@@ -45,18 +45,18 @@ in {
         PassEnv PYTHONPATH
     </Directory>
   '';
-  
+
   robotsEntries = ''
     User-agent: *
     Disallow: ${urlPrefix}
   '';
-  
+
   extraServerPath = [
-    (pkgs.python+"/bin")    
+    (pkgs.python+"/bin")
   ];
-  
+
   globalEnvVars = [ { name = "PYTHONPATH"; value = "${mercurial}/lib/${pkgs.python.libPrefix}/site-packages"; } ];
-  
+
   options = {
     urlPrefix = mkOption {
       default = "/hg";
@@ -65,7 +65,7 @@ in {
         Use the empty string to have it appear in the server root.
       ";
     };
-    
+
     dataDir = mkOption {
       example = "/data/mercurial";
       description = "
@@ -73,5 +73,5 @@ in {
       ";
     };
   };
-  
+
 }
diff --git a/modules/services/web-servers/apache-httpd/per-server-options.nix b/modules/services/web-servers/apache-httpd/per-server-options.nix
index 8a2ee0e849a..00b82550bbe 100644
--- a/modules/services/web-servers/apache-httpd/per-server-options.nix
+++ b/modules/services/web-servers/apache-httpd/per-server-options.nix
@@ -40,9 +40,9 @@
   # Note: sslServerCert and sslServerKey can be left empty, but this
   # only makes sense for virtual hosts (they will inherit from the
   # main server).
-  
+
   sslServerCert = mkOption {
-    default = ""; 
+    default = "";
     example = "/var/host.cert";
     description = "
       Path to server SSL certificate.
diff --git a/modules/services/web-servers/apache-httpd/tomcat-connector.nix b/modules/services/web-servers/apache-httpd/tomcat-connector.nix
index 00cca42c6e0..f815eeb290c 100644
--- a/modules/services/web-servers/apache-httpd/tomcat-connector.nix
+++ b/modules/services/web-servers/apache-httpd/tomcat-connector.nix
@@ -43,8 +43,8 @@ JkLogLevel info
 JkLogStampFormat "[%a %b %d %H:%M:%S %Y]"
 
 # JkOptions indicates to send SSK KEY SIZE
-# Note: Changed from +ForwardURICompat. 
-# See http://tomcat.apache.org/security-jk.html  
+# Note: Changed from +ForwardURICompat.
+# See http://tomcat.apache.org/security-jk.html
 JkOptions +ForwardKeySize +ForwardURICompatUnparsed -ForwardDirectories
 
 # JkRequestLogFormat
@@ -63,13 +63,13 @@ JkMount /__application__/* loadbalancer
 # This directive is present with 1.2.10 and
 # later versions of mod_jk, and is needed for
 # for load balancing to work properly
-# Note: Replaced JkShmFile logs/jk.shm due to SELinux issues. Refer to 
+# Note: Replaced JkShmFile logs/jk.shm due to SELinux issues. Refer to
 # https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=225452
 JkShmFile ${config.stateDir}/jk.shm
 
 # Static files in all Tomcat webapp context directories are served by apache
 JkAutoAlias /var/tomcat/webapps
-    
+
 # All requests go to worker by default
 JkMount /* loadbalancer
 # Serve some static files using httpd
diff --git a/modules/services/web-servers/apache-httpd/trac.nix b/modules/services/web-servers/apache-httpd/trac.nix
index 676aaa83178..5e31c1f2643 100644
--- a/modules/services/web-servers/apache-httpd/trac.nix
+++ b/modules/services/web-servers/apache-httpd/trac.nix
@@ -3,7 +3,7 @@
 with pkgs.lib;
 
 let
-  
+
   # Build a Subversion instance with Apache modules and Swig/Python bindings.
   subversion = pkgs.subversion.override (origArgs: {
     bdbSupport = true;
@@ -14,18 +14,18 @@ let
   });
 
   pythonLib = p: "${p}/";
-  
+
 in
 
 {
 
   options = {
-  
+
     projectsLocation = mkOption {
       description = "URL path in which Trac projects can be accessed";
       default = "/projects";
     };
-    
+
     projects = mkOption {
       description = "List of projects that should be provided by Trac. If they are not defined yet empty projects are created.";
       default = [];
@@ -37,7 +37,7 @@ in
           }
         ];
     };
-    
+
     user = mkOption {
       default = "wwwrun";
       description = "User account under which Trac runs.";
@@ -64,12 +64,12 @@ in
         description = "AuthName";
       };
     };
-    
+
   };
 
   extraModules = singleton
     { name = "python"; path = "${pkgs.mod_python}/modules/mod_python.so"; };
-  
+
   extraConfig = ''
     <Location ${config.projectsLocation}>
       SetHandler mod_python
@@ -89,7 +89,7 @@ in
     '' else ""}
     </LocationMatch>
   '';
-  
+
   globalEnvVars = singleton
     { name = "PYTHONPATH";
       value =
@@ -103,11 +103,11 @@ in
             subversion
           ];
     };
-  
+
   startupScript = pkgs.writeScript "activateTrac" ''
     mkdir -p /var/trac
     chown ${config.user}:${config.group} /var/trac
-    
+
     ${concatMapStrings (project:
       ''
         if [ ! -d /var/trac/${project.identifier} ]
@@ -117,5 +117,5 @@ in
         fi
       '' ) (config.projects)}
   '';
-  
+
 }
diff --git a/modules/services/web-servers/apache-httpd/zabbix.nix b/modules/services/web-servers/apache-httpd/zabbix.nix
index 3c2a30322f4..66b6c0ea9b0 100644
--- a/modules/services/web-servers/apache-httpd/zabbix.nix
+++ b/modules/services/web-servers/apache-httpd/zabbix.nix
@@ -29,10 +29,10 @@ in
       max_execution_time = 300
       mbstring.func_overload = 2
     '';
-  
+
   extraConfig = ''
     Alias ${config.urlPrefix}/ ${zabbixPHP}/
-    
+
     <Directory ${zabbixPHP}>
       DirectoryIndex index.php
       Order deny,allow
diff --git a/modules/services/web-servers/jboss/default.nix b/modules/services/web-servers/jboss/default.nix
index a1bdce50eee..e1bcede6563 100644
--- a/modules/services/web-servers/jboss/default.nix
+++ b/modules/services/web-servers/jboss/default.nix
@@ -5,7 +5,7 @@ with pkgs.lib;
 let
 
   cfg = config.services.jboss;
-  
+
   jbossService = pkgs.stdenv.mkDerivation {
     name = "jboss-server";
     builder = ./builder.sh;
@@ -20,9 +20,9 @@ in
   ###### interface
 
   options = {
-  
+
     services.jboss = {
-    
+
       enable = mkOption {
         default = false;
         description = "Whether to enable jboss";
@@ -62,7 +62,7 @@ in
         default = false;
         description = "Whether to use to connector to the Apache HTTP server";
       };
-      
+
     };
 
   };
@@ -79,5 +79,5 @@ in
       };
 
   };
-  
+
 }
diff --git a/modules/services/web-servers/tomcat.nix b/modules/services/web-servers/tomcat.nix
index 83b95655011..078877b15bc 100644
--- a/modules/services/web-servers/tomcat.nix
+++ b/modules/services/web-servers/tomcat.nix
@@ -5,7 +5,7 @@ with pkgs.lib;
 let
 
   cfg = config.services.tomcat;
-  
+
 in
 
 {
@@ -13,9 +13,9 @@ in
   ###### interface
 
   options = {
-  
+
     services.tomcat = {
-    
+
       enable = mkOption {
         default = false;
         description = "Whether to enable Apache Tomcat";
@@ -31,16 +31,16 @@ in
 	example = [ "users" ];
 	description = "Defines extra groups to which the tomcat user belongs.";
       };
-      
+
       user = mkOption {
         default = "tomcat";
         description = "User account under which Apache Tomcat runs.";
-      };      
+      };
 
       group = mkOption {
         default = "tomcat";
         description = "Group account under which Apache Tomcat runs.";
-      };      
+      };
 
       javaOpts = mkOption {
         default = "";
@@ -73,12 +73,12 @@ in
       };
 
       logPerVirtualHost = mkOption {
-        default = false; 
+        default = false;
         description = "Whether to enable logging per virtual host.";
-      }; 
+      };
 
       axis2 = {
-      
+
         enable = mkOption {
           default = false;
           description = "Whether to enable an Apache Axis2 container";
@@ -88,9 +88,9 @@ in
           default = [];
           description = "List containing AAR files or directories with AAR files which are web services to be deployed on Axis2";
         };
-        
+
       };
-      
+
     };
 
   };
@@ -104,7 +104,7 @@ in
       { name = "tomcat";
         gid = config.ids.gids.tomcat;
       };
-      
+
     users.extraUsers = singleton
       { name = "tomcat";
         uid = config.ids.uids.tomcat;
@@ -112,7 +112,7 @@ in
         home = "/homeless-shelter";
 	extraGroups = cfg.extraGroups;
       };
-            
+
     jobs.tomcat =
       { description = "Apache Tomcat server";
 
@@ -122,62 +122,62 @@ in
         environment = { TZ = config.time.timeZone; };
 
         preStart =
-          ''        
+          ''
 	    # Create the base directory
 	    mkdir -p ${cfg.baseDir}
-	    
+
 	    # Create a symlink to the bin directory of the tomcat component
 	    ln -sfn ${pkgs.tomcat6}/bin ${cfg.baseDir}/bin
-	    
+
 	    # Create a conf/ directory
 	    mkdir -p ${cfg.baseDir}/conf
 	    chown ${cfg.user}:${cfg.group} ${cfg.baseDir}/conf
-	    
+
 	    # Symlink the config files in the conf/ directory (except for catalina.properties and server.xml)
 	    for i in $(ls ${pkgs.tomcat6}/conf | grep -v catalina.properties | grep -v server.xml)
 	    do
 	        ln -sfn ${pkgs.tomcat6}/conf/$i ${cfg.baseDir}/conf/`basename $i`
 	    done
-	    
+
             # Create subdirectory for virtual hosts
             mkdir -p ${cfg.baseDir}/virtualhosts
- 
-	    # Create a modified catalina.properties file 
+
+	    # Create a modified catalina.properties file
 	    # Change all references from CATALINA_HOME to CATALINA_BASE and add support for shared libraries
 	    sed -e 's|''${catalina.home}|''${catalina.base}|g' \
                 -e 's|shared.loader=|shared.loader=''${catalina.base}/shared/lib/*.jar|' \
 		${pkgs.tomcat6}/conf/catalina.properties > ${cfg.baseDir}/conf/catalina.properties
-	    
+
 	    # Create a modified server.xml which also includes all virtual hosts
 	    sed -e "/<Engine name=\"Catalina\" defaultHost=\"localhost\">/a\  ${
                          toString (map (virtualHost: ''<Host name=\"${virtualHost.name}\" appBase=\"virtualhosts/${virtualHost.name}/webapps\" unpackWARs=\"true\" autoDeploy=\"true\" xmlValidation=\"false\" xmlNamespaceAware=\"false\" >${if cfg.logPerVirtualHost then ''<Valve className=\"org.apache.catalina.valves.AccessLogValve\" directory=\"logs/${virtualHost.name}\"  prefix=\"${virtualHost.name}_access_log.\" pattern=\"combined\" resolveHosts=\"false\"/>'' else ""}</Host>'') cfg.virtualHosts)}" \
 	        ${pkgs.tomcat6}/conf/server.xml > ${cfg.baseDir}/conf/server.xml
-	    
+
 	    # Create a logs/ directory
 	    mkdir -p ${cfg.baseDir}/logs
 	    chown ${cfg.user}:${cfg.group} ${cfg.baseDir}/logs
-            ${if cfg.logPerVirtualHost then 
+            ${if cfg.logPerVirtualHost then
                toString (map (h: ''
                                     mkdir -p ${cfg.baseDir}/logs/${h.name}
                                     chown ${cfg.user}:${cfg.group} ${cfg.baseDir}/logs/${h.name}
                                  '') cfg.virtualHosts) else ''''}
-	    
+
 	    # Create a temp/ directory
 	    mkdir -p ${cfg.baseDir}/temp
 	    chown ${cfg.user}:${cfg.group} ${cfg.baseDir}/temp
 
-	    # Create a lib/ directory	    
+	    # Create a lib/ directory
 	    mkdir -p ${cfg.baseDir}/lib
 	    chown ${cfg.user}:${cfg.group} ${cfg.baseDir}/lib
-	    	    
+
 	    # Create a shared/lib directory
 	    mkdir -p ${cfg.baseDir}/shared/lib
 	    chown ${cfg.user}:${cfg.group} ${cfg.baseDir}/shared/lib
-	    
+
 	    # Create a webapps/ directory
 	    mkdir -p ${cfg.baseDir}/webapps
 	    chown ${cfg.user}:${cfg.group} ${cfg.baseDir}/webapps
-	    
+
 	    # Symlink all the given common libs files or paths into the lib/ directory
 	    for i in ${pkgs.tomcat6} ${toString cfg.commonLibs}
 	    do
@@ -189,13 +189,13 @@ in
 		then
 		    # If the given web application is a directory, then iterate over the files
 		    # in the special purpose directories and symlink them into the tomcat tree
-		    
+
 		    for j in $i/lib/*
 		    do
 			ln -sfn $j ${cfg.baseDir}/lib/`basename $j`
 		    done
 		fi
-	    done	    	     
+	    done
 
 	    # Symlink all the given shared libs files or paths into the shared/lib/ directory
 	    for i in ${toString cfg.sharedLibs}
@@ -208,14 +208,14 @@ in
 		then
 		    # If the given web application is a directory, then iterate over the files
 		    # in the special purpose directories and symlink them into the tomcat tree
-		    
+
 		    for j in $i/shared/lib/*
 		    do
 			ln -sfn $j ${cfg.baseDir}/shared/lib/`basename $j`
 		    done
 		fi
-	    done 
-	    
+	    done
+
 	    # Symlink all the given web applications files or paths into the webapps/ directory
 	    for i in ${toString cfg.webapps}
 	    do
@@ -227,12 +227,12 @@ in
 		then
 		    # If the given web application is a directory, then iterate over the files
 		    # in the special purpose directories and symlink them into the tomcat tree
-		    
+
 		    for j in $i/webapps/*
 		    do
 		        ln -sfn $j ${cfg.baseDir}/webapps/`basename $j`
 		    done
-		    
+
 		    # Also symlink the configuration files if they are included
 		    if [ -d $i/conf/Catalina ]
 		    then
@@ -243,15 +243,15 @@ in
 			done
 		    fi
 		fi
-	    done	    	    
-	    
+	    done
+
 	    ${toString (map (virtualHost: ''
 	      # Create webapps directory for the virtual host
 	      mkdir -p ${cfg.baseDir}/virtualhosts/${virtualHost.name}/webapps
-	      
+
 	      # Modify ownership
 	      chown ${cfg.user}:${cfg.group} ${cfg.baseDir}/virtualhosts/${virtualHost.name}/webapps
-	      
+
 	      # Symlink all the given web applications files or paths into the webapps/ directory
 	      # of this virtual host
 	      for i in "${if virtualHost ? webapps then toString virtualHost.webapps else ""}"
@@ -264,12 +264,12 @@ in
 		  then
 		      # If the given web application is a directory, then iterate over the files
 		      # in the special purpose directories and symlink them into the tomcat tree
-		    
+
 		      for j in $i/webapps/*
 		      do
 		          ln -sfn $j ${cfg.baseDir}/virtualhosts/${virtualHost.name}/webapps/`basename $j`
 		      done
-		      
+
 		      # Also symlink the configuration files if they are included
 		      if [ -d $i/conf/Catalina ]
 		      then
@@ -279,27 +279,27 @@ in
 			      ln -sfn $j ${cfg.baseDir}/conf/Catalina/${virtualHost.name}/`basename $j`
 			  done
 		      fi
-                  fi	                  
+                  fi
 	      done
-	      
+
 	      ''
 	    ) cfg.virtualHosts) }
-	    
+
 	    # Create a work/ directory
 	    mkdir -p ${cfg.baseDir}/work
 	    chown ${cfg.user}:${cfg.group} ${cfg.baseDir}/work
-	    
+
 	    ${if cfg.axis2.enable then
 		''
 		# Copy the Axis2 web application
 		cp -av ${pkgs.axis2}/webapps/axis2 ${cfg.baseDir}/webapps
-		
+
 		# Turn off addressing, which causes many errors
 		sed -i -e 's%<module ref="addressing"/>%<!-- <module ref="addressing"/> -->%' ${cfg.baseDir}/webapps/axis2/WEB-INF/conf/axis2.xml
-		
+
 		# Modify permissions on the Axis2 application
 		chown -R ${cfg.user}:${cfg.group} ${cfg.baseDir}/webapps/axis2
-				
+
 		# Symlink all the given web service files or paths into the webapps/axis2/WEB-INF/services directory
 		for i in ${toString cfg.axis2.services}
 		do
@@ -311,12 +311,12 @@ in
 		    then
 			# If the given web application is a directory, then iterate over the files
 		        # in the special purpose directories and symlink them into the tomcat tree
-			
+
 			for j in $i/webapps/axis2/WEB-INF/services/*
 			do
 			    ln -sfn $j ${cfg.baseDir}/webapps/axis2/WEB-INF/services/`basename $j`
 			done
-			
+
 			# Also symlink the configuration files if they are included
 		        if [ -d $i/conf/Catalina ]
 		        then
@@ -326,13 +326,13 @@ in
 			    done
 		        fi
 		    fi
-		done    
+		done
 		''
 	    else ""}
 
             ${pkgs.su}/bin/su -s ${pkgs.bash}/bin/sh ${cfg.user} -c 'CATALINA_BASE=${cfg.baseDir} JAVA_HOME=${pkgs.jdk} JAVA_OPTS="${cfg.javaOpts}" CATALINA_OPTS="${cfg.catalinaOpts}" ${pkgs.tomcat6}/bin/startup.sh'
           '';
-	
+
         postStop =
           ''
             echo "Stopping tomcat..."
diff --git a/modules/services/x11/desktop-managers/default.nix b/modules/services/x11/desktop-managers/default.nix
index d1343c1c0ec..79d65b19699 100644
--- a/modules/services/x11/desktop-managers/default.nix
+++ b/modules/services/x11/desktop-managers/default.nix
@@ -10,7 +10,7 @@ let
   # Whether desktop manager `d' is capable of setting a background.
   # If it isn't, the `feh' program is used as a fallback.
   needBGCond = d: ! (d ? bgSupport && d.bgSupport);
-  
+
 in
 
 {
@@ -20,7 +20,7 @@ in
   imports = [ ./none.nix ./xterm.nix ./xfce.nix ./gnome.nix ./kde4.nix ];
 
   options = {
-  
+
     services.xserver.desktopManager = {
 
       session = mkOption {
@@ -64,7 +64,7 @@ in
       };
 
     };
-    
+
   };
 
   config = {
diff --git a/modules/services/x11/desktop-managers/kde4.nix b/modules/services/x11/desktop-managers/kde4.nix
index 3be115094d5..cce5ef54df1 100644
--- a/modules/services/x11/desktop-managers/kde4.nix
+++ b/modules/services/x11/desktop-managers/kde4.nix
@@ -30,7 +30,7 @@ in
 
   };
 
-  
+
   config = mkIf (xcfg.enable && cfg.enable) {
 
     # If KDE 4 is enabled, make it the default desktop manager (unless
@@ -86,7 +86,7 @@ in
       (if !isKDE47 then
         # KDE <= 4.6
         [ # temporary workarounds
-          pkgs.shared_desktop_ontologies 
+          pkgs.shared_desktop_ontologies
           pkgs.strigi
 
           pkgs.kde4.kdelibs
diff --git a/modules/services/x11/desktop-managers/xfce.nix b/modules/services/x11/desktop-managers/xfce.nix
index eccba4ec480..25d3f4d11e1 100644
--- a/modules/services/x11/desktop-managers/xfce.nix
+++ b/modules/services/x11/desktop-managers/xfce.nix
@@ -22,7 +22,7 @@ in
 
   };
 
-  
+
   config = mkIf (xcfg.enable && cfg.enable) {
 
     services.xserver.desktopManager.session = singleton
@@ -32,7 +32,7 @@ in
           ''
             # Set GTK_PATH so that GTK+ can find the Xfce theme engine.
             export GTK_PATH=${pkgs.xfce.gtk_xfce_engine}/lib/gtk-2.0
-            
+
             # Set GTK_DATA_PREFIX so that GTK+ can find the Xfce themes.
             export GTK_DATA_PREFIX=${config.system.path}
 
@@ -86,12 +86,12 @@ in
       ''
         export GIO_EXTRA_MODULES=${pkgs.xfce.gvfs}/lib/gio/modules
       '';
-      
+
     # Enable helpful DBus services.
     services.hal = mkIf (!isXfce48) { enable = true; };
     services.udisks = mkIf isXfce48 { enable = true; };
     services.upower = mkIf (isXfce48 && config.powerManagement.enable) { enable = true; };
-    
+
   };
 
 }
diff --git a/modules/services/x11/desktop-managers/xterm.nix b/modules/services/x11/desktop-managers/xterm.nix
index 8524c0c6544..7aa70269dc4 100644
--- a/modules/services/x11/desktop-managers/xterm.nix
+++ b/modules/services/x11/desktop-managers/xterm.nix
@@ -14,7 +14,7 @@ let
     };
 
   };
-  
+
 in
 
 mkIf cfg.enable {
diff --git a/modules/services/x11/display-managers/auto.nix b/modules/services/x11/display-managers/auto.nix
index e2b1ee42e83..cccc6e62a15 100644
--- a/modules/services/x11/display-managers/auto.nix
+++ b/modules/services/x11/display-managers/auto.nix
@@ -14,9 +14,9 @@ in
   ###### interface
 
   options = {
-  
+
     services.xserver.displayManager.auto = {
-    
+
       enable = mkOption {
         default = false;
         description = ''
@@ -42,7 +42,7 @@ in
   config = mkIf cfg.enable {
 
     services.xserver.displayManager.slim.enable = false;
-  
+
     services.xserver.displayManager.job =
       { execCmd =
           ''
diff --git a/modules/services/x11/display-managers/default.nix b/modules/services/x11/display-managers/default.nix
index 7e21f27ff69..2261d417d04 100644
--- a/modules/services/x11/display-managers/default.nix
+++ b/modules/services/x11/display-managers/default.nix
@@ -207,24 +207,24 @@ in
         description = "This option defines how to start the display manager.";
 
         options = {
-  
+
           preStart = mkOption {
             default = "";
             example = "rm -f /var/log/my-display-manager.log";
             description = "Script executed before the display manager is started.";
           };
-         
+
           execCmd = mkOption {
             example = "${pkgs.slim}/bin/slim";
             description = "Command to start the display manager.";
           };
-         
+
           environment = mkOption {
             default = {};
             example = { SLIM_CFGFILE = /etc/slim.conf; };
             description = "Additional environment variables needed by the display manager.";
           };
-         
+
           logsXsession = mkOption {
             default = false;
             description = ''
@@ -233,13 +233,13 @@ in
               <filename>~/.xsession-errors</filename>.
             '';
           };
-         
+
         };
-        
+
       };
 
     };
-    
+
   };
 
 }
diff --git a/modules/services/x11/display-managers/kdm.nix b/modules/services/x11/display-managers/kdm.nix
index f82e83d7e49..cfcf62e487e 100644
--- a/modules/services/x11/display-managers/kdm.nix
+++ b/modules/services/x11/display-managers/kdm.nix
@@ -36,11 +36,11 @@ let
       [X-*-Greeter]
       HiddenUsers=root,nixbld1,nixbld2,nixbld3,nixbld4,nixbld5,nixbld6,nixbld7,nixbld8,nixbld9,nixbld10
       PluginsLogin=${kdebase_workspace}/lib/kde4/kgreet_classic.so
-      
+
       ${optionalString (cfg.enableXDMCP)
       ''
         [Xdmcp]
-        Enable=true    
+        Enable=true
       ''}
     '';
 
@@ -59,11 +59,11 @@ in
 {
 
   ###### interface
-  
+
   options = {
 
     services.xserver.displayManager.kdm = {
-    
+
       enable = mkOption {
         default = false;
         description = ''
@@ -85,18 +85,18 @@ in
           configuration file of KDM.
         '';
       };
-      
+
     };
 
   };
-  
-  
+
+
   ###### implementation
-  
+
   config = mkIf cfg.enable {
 
     services.xserver.displayManager.slim.enable = false;
-  
+
     services.xserver.displayManager.job =
       { execCmd =
           ''
@@ -109,7 +109,7 @@ in
       };
 
     security.pam.services = [ { name = "kde"; } ];
-      
+
     users.extraUsers = singleton
       { name = "kdm";
         uid = config.ids.uids.kdm;
@@ -117,5 +117,5 @@ in
       };
 
   };
-  
+
 }
diff --git a/modules/services/x11/display-managers/slim.nix b/modules/services/x11/display-managers/slim.nix
index 0e48cae7423..6e34bc2eb51 100644
--- a/modules/services/x11/display-managers/slim.nix
+++ b/modules/services/x11/display-managers/slim.nix
@@ -41,9 +41,9 @@ in
   ###### interface
 
   options = {
-  
+
     services.xserver.displayManager.slim = {
-    
+
       enable = mkOption {
         default = true;
         description = ''
diff --git a/modules/services/x11/hardware/multitouch.nix b/modules/services/x11/hardware/multitouch.nix
index d360902f2ab..ae0ae2e5a3a 100644
--- a/modules/services/x11/hardware/multitouch.nix
+++ b/modules/services/x11/hardware/multitouch.nix
@@ -28,7 +28,7 @@ with pkgs.lib;
         Section "InputClass"
           MatchIsTouchpad "true"
           Identifier "Multitouch Touchpad"
-          Driver "multitouch" 
+          Driver "multitouch"
         EndSection
       '';
 
diff --git a/modules/services/x11/hardware/synaptics.nix b/modules/services/x11/hardware/synaptics.nix
index 2cb85aaeb52..554180049be 100644
--- a/modules/services/x11/hardware/synaptics.nix
+++ b/modules/services/x11/hardware/synaptics.nix
@@ -9,7 +9,7 @@ let cfg = config.services.xserver.synaptics; in
   options = {
 
     services.xserver.synaptics = {
-      
+
       enable = mkOption {
         default = false;
         example = true;
@@ -19,7 +19,7 @@ let cfg = config.services.xserver.synaptics; in
       dev = mkOption {
         default = null;
 	example = "/dev/input/event0";
-        description = 
+        description =
           ''
             Path for touchpad device.  Set to null to apply to any
             auto-detected touchpad.
diff --git a/modules/services/x11/window-managers/awesome.nix b/modules/services/x11/window-managers/awesome.nix
index 0746bd34b9d..880ebf1eca6 100644
--- a/modules/services/x11/window-managers/awesome.nix
+++ b/modules/services/x11/window-managers/awesome.nix
@@ -13,7 +13,7 @@ in
   ###### interface
 
   options = {
-  
+
     services.xserver.windowManager.awesome.enable = mkOption {
       default = false;
       description = "Enable the Awesome window manager.";
@@ -36,7 +36,7 @@ in
       };
 
     environment.x11Packages = [ pkgs.awesome ];
-    
+
   };
 
 }
diff --git a/modules/services/x11/window-managers/compiz.nix b/modules/services/x11/window-managers/compiz.nix
index fd439a3cddc..209401f2646 100644
--- a/modules/services/x11/window-managers/compiz.nix
+++ b/modules/services/x11/window-managers/compiz.nix
@@ -8,13 +8,13 @@ let
   xorg = config.services.xserver.package;
 
 in
-  
+
 {
 
   options = {
 
     services.xserver.windowManager.compiz = {
-    
+
       enable = mkOption {
         default = false;
         description = "Enable the Compiz window manager.";
@@ -25,14 +25,14 @@ in
         example = "--indirect-rendering";
         description = "Pass the <option>--indirect-rendering</option> flag to Compiz.";
       };
-      
+
     };
 
   };
-  
+
 
   config = mkIf cfg.enable {
-  
+
     services.xserver.windowManager.session = singleton
       { name = "compiz";
         start =
diff --git a/modules/services/x11/window-managers/icewm.nix b/modules/services/x11/window-managers/icewm.nix
index 1aec252dea5..9da4a415fad 100644
--- a/modules/services/x11/window-managers/icewm.nix
+++ b/modules/services/x11/window-managers/icewm.nix
@@ -13,7 +13,7 @@ in
   ###### interface
 
   options = {
-  
+
     services.xserver.windowManager.icewm.enable = mkOption {
       default = false;
       description = "Enable the IceWM window manager.";
@@ -36,7 +36,7 @@ in
       };
 
     environment.x11Packages = [ pkgs.icewm ];
-    
+
   };
 
 }
diff --git a/modules/services/x11/window-managers/twm.nix b/modules/services/x11/window-managers/twm.nix
index 3c4780386ce..c1a99b97566 100644
--- a/modules/services/x11/window-managers/twm.nix
+++ b/modules/services/x11/window-managers/twm.nix
@@ -13,7 +13,7 @@ in
   ###### interface
 
   options = {
-  
+
     services.xserver.windowManager.twm.enable = mkOption {
       default = false;
       description = "Enable the twm window manager.";
@@ -36,7 +36,7 @@ in
       };
 
     environment.x11Packages = [ pkgs.xorg.twm ];
-    
+
   };
 
 }
diff --git a/modules/services/x11/xfs.nix b/modules/services/x11/xfs.nix
index 424e386b78b..edaafacc27e 100644
--- a/modules/services/x11/xfs.nix
+++ b/modules/services/x11/xfs.nix
@@ -5,12 +5,12 @@ with pkgs.lib;
 let
 
   configFile = ./xfs.conf;
-  
+
   startingDependency =
     if config.services.gw6c.enable && config.services.gw6c.autorun
     then "gw6c"
     else "network-interfaces";
-  
+
 in
 
 {
@@ -18,7 +18,7 @@ in
   ###### interface
 
   options = {
-  
+
     services.xfs = {
 
       enable = mkOption {
@@ -40,12 +40,12 @@ in
 
     jobs.xfs =
       { description = "X Font Server";
-      
+
         startOn = "started ${startingDependency}";
 
         exec = "${pkgs.xorg.xfs}/bin/xfs -config ${configFile}";
       };
 
   });
-  
+
 }
diff --git a/modules/services/x11/xserver.nix b/modules/services/x11/xserver.nix
index 15240d65cee..f1e8044fc6b 100644
--- a/modules/services/x11/xserver.nix
+++ b/modules/services/x11/xserver.nix
@@ -71,7 +71,7 @@ let
             done
           fi
         done
-                
+
         for i in $(find ${toString cfg.modules} -type d); do
           if test $(echo $i/*.so* | wc -w) -ne 0; then
             echo "  ModulePath \"$i\"" >> $out
@@ -79,7 +79,7 @@ let
         done
 
         echo 'EndSection' >> $out
-        
+
         echo "$config" >> $out
       ''; # */
   };
@@ -96,9 +96,9 @@ in
 
 
   ###### interface
-  
+
   options = {
-  
+
     services.xserver = {
 
       enable = mkOption {
@@ -311,7 +311,7 @@ in
           Virtual screen size for Xrandr.
         '';
       };
-      
+
     };
 
     environment.x11Packages = mkOption {
@@ -322,7 +322,7 @@ in
         activated (<option>services.xserver.enable</option>).
       '';
     };
-    
+
   };
 
 
@@ -337,7 +337,7 @@ in
   {
 
     boot.extraModulePackages =
-      optional (elem "nvidia" driverNames) kernelPackages.nvidia_x11 ++ 
+      optional (elem "nvidia" driverNames) kernelPackages.nvidia_x11 ++
       optional (elem "nvidiaLegacy96" driverNames) kernelPackages.nvidia_x11_legacy96 ++
       optional (elem "nvidiaLegacy173" driverNames) kernelPackages.nvidia_x11_legacy173 ++
       optional (elem "virtualbox" driverNames) kernelPackages.virtualboxGuestAdditions ++
@@ -352,7 +352,7 @@ in
           target = "X11/xkb";
         }
       ];
-    
+
     environment.x11Packages =
       [ xorg.xorgserver
         xorg.xrandr
@@ -370,7 +370,7 @@ in
       ++ optional (elem "nvidiaLegacy173" driverNames) kernelPackages.nvidia_x11_legacy173
       ++ optional (elem "virtualbox" driverNames) xorg.xrefresh
       ++ optional (elem "ati_unfree" driverNames) kernelPackages.ati_drivers_x11;
-      
+
     environment.systemPackages = config.environment.x11Packages;
 
     environment.pathsToLink =
@@ -378,7 +378,7 @@ in
 
     jobs.xserver =
       { startOn = if cfg.autorun then "filesystem and stopped udevtrigger" else "";
- 
+
         environment =
           { FONTCONFIG_FILE = "/etc/fonts/fonts.conf"; # !!! cleanup
             XKB_BINDIR = "${xorg.xkbcomp}/bin"; # Needed for the Xkb extension.
@@ -440,7 +440,7 @@ in
       [ xorg.xorgserver
         xorg.xf86inputevdev
       ];
-    
+
     services.xserver.config =
       ''
         Section "ServerFlags"
@@ -478,7 +478,7 @@ in
         # For each supported driver, add a "Device" and "Screen"
         # section.
         ${flip concatMapStrings drivers (driver: ''
-        
+
           Section "Device"
             Identifier "Device-${driver.name}[0]"
             Driver "${driver.driverName}"
@@ -521,7 +521,7 @@ in
                   '';
               in concatMapStrings f [8 16 24]
             )}
-          
+
           EndSection
         '')}
       '';
diff --git a/modules/system/activation/activation-script.nix b/modules/system/activation/activation-script.nix
index b2246a1447d..72566507ecc 100644
--- a/modules/system/activation/activation-script.nix
+++ b/modules/system/activation/activation-script.nix
@@ -18,18 +18,18 @@ let
       pkgs.shadow
       pkgs.nettools # needed for hostname
     ];
-    
+
 in
 
 {
 
   ###### interface
-  
+
   options = {
-  
+
     system.activationScripts = mkOption {
       default = {};
-      
+
       example = {
         stdio = {
           text = ''
@@ -42,21 +42,21 @@ in
           deps = [];
         };
       };
-      
+
       description = ''
         Activate the new configuration (i.e., update /etc, make accounts,
         and so on).
       '';
-      
+
       merge = mergeTypedOption "script" builtins.isAttrs (fold mergeAttrs {});
-      
+
       apply = set: {
         script =
           ''
             #! ${pkgs.stdenv.shell}
 
             systemConfig=@out@
-            
+
             export PATH=/empty
             for i in ${toString path}; do
                 PATH=$PATH:$i/bin:$i/sbin;
@@ -79,12 +79,12 @@ in
             ln -sfn /var/run/current-system /nix/var/nix/gcroots/current-system
           '';
       };
-      
+
     };
-    
+
   };
 
-  
+
   ###### implementation
 
   config = {
@@ -128,7 +128,7 @@ in
       ''
         mkdir -p /media
       '';
-    
+
     system.activationScripts.cgroups =
       ''
         if ! ${pkgs.sysvtools}/bin/mountpoint -q /dev/cgroup; then
@@ -136,7 +136,7 @@ in
             ${pkgs.utillinux}/bin/mount -t cgroup -o freezer,cpuacct,cpu,cpuset none /dev/cgroup
         fi
       '';
-    
+
   };
-  
+
 }
diff --git a/modules/system/activation/top-level.nix b/modules/system/activation/top-level.nix
index 92615c78f32..b98242c3f33 100644
--- a/modules/system/activation/top-level.nix
+++ b/modules/system/activation/top-level.nix
@@ -3,7 +3,7 @@
 let
 
   options = {
-  
+
     system.build = pkgs.lib.mkOption {
       default = {};
       description = ''
@@ -58,14 +58,14 @@ let
         This code will be added to the builder creating the system store path.
       '';
     };
-    
+
   };
 
-    
-  # This attribute is responsible for creating boot entries for 
+
+  # This attribute is responsible for creating boot entries for
   # child configuration. They are only (directly) accessible
   # when the parent configuration is boot default. For example,
-  # you can provide an easy way to boot the same configuration 
+  # you can provide an easy way to boot the same configuration
   # as you use, but with another kernel
   # !!! fix this
   cloner = inheritParent: list: with pkgs.lib;
@@ -99,12 +99,12 @@ let
 
       ln -s ${kernelPath} $out/kernel
       ln -s ${config.system.modulesTree} $out/kernel-modules
-      if [ -n "$grub" ]; then 
+      if [ -n "$grub" ]; then
         ln -s $grub $out/grub
       fi
-      
+
       ln -s ${config.system.build.initialRamdisk}/initrd $out/initrd
-      
+
       echo "$activationScript" > $out/activate
       substituteInPlace $out/activate --subst-var out
       chmod u+x $out/activate
@@ -112,7 +112,7 @@ let
 
       cp ${config.system.build.bootStage2} $out/init
       substituteInPlace $out/init --subst-var-by systemConfig $out
-      
+
       ln -s ${config.system.build.etc}/etc $out/etc
       ln -s ${config.system.path} $out/sw
       ln -s ${config.system.build.upstart} $out/upstart
@@ -136,7 +136,7 @@ let
       ${config.system.extraSystemBuilderCmds}
     '';
 
-  
+
   # Putting it all together.  This builds a store path containing
   # symlinks to the various parts of the built configuration (the
   # kernel, the Upstart services, the init scripts, etc.) as well as a
@@ -167,7 +167,7 @@ let
       if config.boot.loader.grub.enable
       then config.system.build.grub
       else null;
-    grubVersion = 
+    grubVersion =
       if config.boot.loader.grub.enable
       then (builtins.parseDrvName config.system.build.grub.name).version
       else "";
diff --git a/modules/system/boot/luksroot.nix b/modules/system/boot/luksroot.nix
index a01395647a3..c28f46ef75b 100644
--- a/modules/system/boot/luksroot.nix
+++ b/modules/system/boot/luksroot.nix
@@ -15,7 +15,7 @@ in
       description = '';
         The device that should be decrypted using LUKS before trying to mount the
         root partition. This works for both LVM-over-LUKS and LUKS-over-LVM setups.
-         
+
         Make sure that initrd has the crypto modules needed for decryption.
 
         The decrypted device name is /dev/mapper/luksroot.
@@ -42,4 +42,4 @@ in
 
   };
 
-}
\ No newline at end of file
+}
diff --git a/modules/system/boot/modprobe.nix b/modules/system/boot/modprobe.nix
index fe667ce59c5..5be5546163a 100644
--- a/modules/system/boot/modprobe.nix
+++ b/modules/system/boot/modprobe.nix
@@ -19,14 +19,14 @@ with pkgs.lib;
           ''
             #! ${pkgs.stdenv.shell}
             export MODULE_DIR=${config.system.modulesTree}/lib/modules
-            
+
             # Fall back to the kernel modules used at boot time if the
             # modules in the current configuration don't match the
             # running kernel.
             if [ ! -d "$MODULE_DIR/$(${pkgs.coreutils}/bin/uname -r)" ]; then
                 MODULE_DIR=/var/run/booted-system/kernel-modules/lib/modules
             fi
-            
+
             exec ${pkgs.module_init_tools}/sbin/modprobe "$@"
           '';
       };
@@ -44,7 +44,7 @@ with pkgs.lib;
         automatically by the hardware probing code.
       '';
     };
-  
+
     boot.extraModprobeConfig = mkOption {
       default = "";
       example =
@@ -59,7 +59,7 @@ with pkgs.lib;
         <manvolnum>5</manvolnum></citerefentry> for details.
       '';
     };
-  
+
   };
 
 
@@ -101,7 +101,7 @@ with pkgs.lib;
         # module.
         echo ${config.system.sbin.modprobe}/sbin/modprobe > /proc/sys/kernel/modprobe
       '';
-      
+
   };
 
 }
diff --git a/modules/system/upstart-events/shutdown.nix b/modules/system/upstart-events/shutdown.nix
index cc89a97e88d..cf06ba10d08 100644
--- a/modules/system/upstart-events/shutdown.nix
+++ b/modules/system/upstart-events/shutdown.nix
@@ -20,7 +20,7 @@ with pkgs.lib;
           set +e # continue in case of errors
 
           ${pkgs.kbd}/bin/chvt 1
-      
+
           exec < /dev/console > /dev/console 2>&1
           echo ""
           if test "$MODE" = maintenance; then
@@ -31,7 +31,7 @@ with pkgs.lib;
           echo ""
 
           ${config.powerManagement.powerDownCommands}
-      
+
           export PATH=${pkgs.utillinux}/bin:${pkgs.utillinux}/sbin:$PATH
 
 
@@ -44,10 +44,10 @@ with pkgs.lib;
           # event, as these are necessary to complete the shutdown.
           omittedPids=$(initctl list | sed -e 's/.*process \([0-9]\+\)/-o \1/;t;d')
           #echo "saved PIDs: $omittedPids"
-          
+
           echo "sending the TERM signal to all processes..."
           ${pkgs.sysvtools}/bin/killall5 -15 $job $omittedPids
-      
+
           sleep 1 # wait briefly
 
           echo "sending the KILL signal to all processes..."
@@ -95,7 +95,7 @@ with pkgs.lib;
                   # mount points are typically tmpfs/aufs mounts from
                   # the initrd.
                   if [ "$mp" = /proc -o "$mp" = /sys -o "$mp" = /dev -o "$device" = "rootfs" -o "$mp" = /run -o "$mp" = /var/run -o "$mp" = /var/lock -o ! -e "$mp" ]; then continue; fi
-              
+
                   echo "unmounting $mp..."
 
                   # We need to remount,ro before attempting any
@@ -132,8 +132,8 @@ with pkgs.lib;
 
           # Final sync.
           sync
-      
-      
+
+
           # Either reboot or power-off the system.
           if test "$MODE" = reboot; then
               echo "rebooting..."
diff --git a/modules/system/upstart/upstart.nix b/modules/system/upstart/upstart.nix
index 368405badc7..09e81983e81 100644
--- a/modules/system/upstart/upstart.nix
+++ b/modules/system/upstart/upstart.nix
@@ -16,7 +16,7 @@ let
       upstart
     ];
 
-    
+
   # From a job description, generate an Upstart job file.
   makeJob = job:
 
@@ -29,7 +29,7 @@ let
         let log = "/var/log/upstart/${job.name}"; in
         ''
           # Upstart job `${job.name}'.  This is a generated file.  Do not edit.
-        
+
           description "${job.description}"
 
           ${if isList job.startOn then
@@ -38,20 +38,20 @@ let
               "start on ${job.startOn}"
             else ""
           }
-          
+
           ${optionalString (job.stopOn != "") "stop on ${job.stopOn}"}
 
           env PATH=${makeSearchPath "bin" (job.path ++ upstartPath)}:${makeSearchPath "sbin" (job.path ++ upstartPath)}
 
           ${concatMapStrings (n: "env ${n}=\"${getAttr n env}\"\n") (attrNames env)}
-          
+
           ${optionalString (job.preStart != "") ''
             pre-start script
               exec >> ${log} 2>&1
               ${job.preStart}
             end script
           ''}
-          
+
           ${if job.script != "" && job.exec != "" then
               abort "Job ${job.name} has both a `script' and `exec' attribute."
             else if job.script != "" then
@@ -77,7 +77,7 @@ let
               ${job.postStart}
             end script
           ''}
-          
+
           ${optionalString job.task "task"}
           ${optionalString (!job.task && job.respawn) "respawn"}
 
@@ -116,7 +116,7 @@ let
           echo "$jobText" > $out
         '';
 
-        
+
   jobOptions = {
 
     name = mkOption {
@@ -149,7 +149,7 @@ let
 
     startOn = mkOption {
       # !!! Re-enable this once we're on Upstart >= 0.6.
-      #type = types.string; 
+      #type = types.string;
       default = "";
       description = ''
         The Upstart event that triggers this job to be started.
@@ -278,16 +278,16 @@ let
       default = [ ];
       description = ''
         Packages added to the job's <envar>PATH</envar> environment variable.
-        Both the <filename>bin</filename> and <filename>sbin</filename> 
+        Both the <filename>bin</filename> and <filename>sbin</filename>
         subdirectories of each package are added.
       '';
     };
 
   };
 
-  
+
   upstartJob = {name, config, ...}: {
-  
+
     options = {
       jobDrv = mkOption {
         default = makeJob config;
@@ -305,15 +305,15 @@ let
         replaceChars ["<" ">" "*"] ["_" "_" "_name_"] name
       );
     };
-    
+
   };
 
 in
-  
+
 {
 
   ###### interface
-  
+
   options = {
 
     jobs = mkOption {
@@ -325,7 +325,7 @@ in
       type = types.loaOf types.optionSet;
       options = [ jobOptions upstartJob ];
     };
-  
+
     tests.upstartJobs = mkOption {
       internal = true;
       default = {};
@@ -335,7 +335,7 @@ in
         tests.upstartJobs.xserver</command>).
       '';
     };
-    
+
     system.upstartEnvironment = mkOption {
       type = types.attrs;
       default = {};
@@ -349,7 +349,7 @@ in
 
 
   ###### implementation
-  
+
   config = {
 
     system.build.upstart = upstart;
diff --git a/modules/tasks/filesystems.nix b/modules/tasks/filesystems.nix
index 271c0ba0c4e..3ee26bbfc77 100644
--- a/modules/tasks/filesystems.nix
+++ b/modules/tasks/filesystems.nix
@@ -29,7 +29,7 @@ in
           label = "bigdisk";
         }
       ];
-      
+
       description = "
         The file systems to be mounted.  It must include an entry for
         the root directory (<literal>mountPoint = \"/\"</literal>).  Each
@@ -46,10 +46,10 @@ in
         systems that support it, such as ext2/ext3 (see <command>mke2fs
         -L</command>).
 
-        <literal>autocreate</literal> forces <literal>mountPoint</literal> to be created with 
+        <literal>autocreate</literal> forces <literal>mountPoint</literal> to be created with
         <command>mkdir -p</command> .
       ";
-      
+
       type = types.nullOr (types.loaOf types.optionSet);
       apply = x: attrValues x;
 
@@ -114,7 +114,7 @@ in
         };
       };
     };
-  
+
     system.sbin.mount = mkOption {
       internal = true;
       default = pkgs.utillinuxng;
@@ -122,7 +122,7 @@ in
         Package containing mount and umount.
       ";
     };
-    
+
   };
 
 
@@ -134,7 +134,7 @@ in
     environment.systemPackages =
       [ pkgs.ntfs3g pkgs.cifs_utils pkgs.nfsUtils pkgs.mountall ]
       ++ fsPackages;
-    
+
     environment.etc = singleton
       { source = pkgs.writeText "fstab"
           ''
@@ -170,7 +170,7 @@ in
           + optionalString config.services.nfsKernel.client.enable " and started nfs-kernel-statd";
 
         task = true;
-        
+
         script =
           ''
             exec > /dev/console 2>&1
@@ -218,7 +218,7 @@ in
         script =
           ''
             [ -n "$MOUNTPOINT" ] || exit 0
-            
+
             exec < /dev/console > /dev/console 2>&1
 
             cat <<EOF
@@ -237,7 +237,7 @@ in
 
             - Remove the failed filesystem from the system configuration in
               /etc/nixos/configuration.nix and run \`nixos-rebuild switch'.
-            
+
             EOF
 
             ${pkgs.shadow}/bin/login root || false
diff --git a/modules/tasks/kbd.nix b/modules/tasks/kbd.nix
index 0d746f648f0..62c4b92ed09 100644
--- a/modules/tasks/kbd.nix
+++ b/modules/tasks/kbd.nix
@@ -35,7 +35,7 @@ in
         <option>boot.extraTTYs</option> to <literal>["tty7"]</literal>.
       '';
     };
-    
+
     # dummy option so that requiredTTYs can be passed
     requiredTTYs = mkOption {
       default = [];
@@ -44,18 +44,18 @@ in
         FIXME: find a good description.
       ";
     };
-  
+
   };
 
 
   ###### implementation
 
-  config = {  
-  
+  config = {
+
     inherit requiredTTYs; # pass it to ./modules/tasks/tty-backgrounds.nix
 
     environment.systemPackages = [pkgs.kbd];
-  
+
     jobs.kbd =
       { description = "Keyboard / console initialisation";
 
@@ -82,7 +82,7 @@ in
             for tty in ${toString ttys}; do
 
               # Tell the console output driver that the bytes arriving are
-              # UTF-8 encoded multibyte sequences. 
+              # UTF-8 encoded multibyte sequences.
               echo -n -e '\033%G' > $tty
 
             done
@@ -98,7 +98,7 @@ in
             for tty in ${toString ttys}; do
 
               # Tell the console output driver that the bytes arriving are
-              # UTF-8 encoded multibyte sequences. 
+              # UTF-8 encoded multibyte sequences.
               echo -n -e '\033%@' > $tty
 
             done
diff --git a/modules/tasks/lvm.nix b/modules/tasks/lvm.nix
index 875bf97ff25..f5a40c7f8ec 100644
--- a/modules/tasks/lvm.nix
+++ b/modules/tasks/lvm.nix
@@ -30,5 +30,5 @@
     services.udev.packages = [ pkgs.lvm2 ];
 
   };
-  
+
 }
diff --git a/modules/tasks/network-interfaces.nix b/modules/tasks/network-interfaces.nix
index fab61b79c98..f3603127b26 100644
--- a/modules/tasks/network-interfaces.nix
+++ b/modules/tasks/network-interfaces.nix
@@ -6,7 +6,7 @@ let
 
   cfg = config.networking;
 
-in 
+in
 
 {
 
@@ -120,7 +120,7 @@ in
         };
 
       };
-      
+
     };
 
     networking.ifaces = mkOption {
@@ -132,7 +132,7 @@ in
         as an attribute set keyed on the interface name.
       '';
     };
-    
+
     networking.bridges = mkOption {
       default = { };
       example =
@@ -160,7 +160,7 @@ in
         };
 
       };
-      
+
     };
 
   };
@@ -179,13 +179,13 @@ in
         pkgs.nettools
         pkgs.wirelesstools
         pkgs.rfkill
-      ] 
+      ]
       ++ optional (cfg.bridges != {}) pkgs.bridge_utils
       ++ optional cfg.enableIPv6 pkgs.ndisc6;
 
     security.setuidPrograms = [ "ping" "ping6" ];
-    
-    jobs.networkInterfaces = 
+
+    jobs.networkInterfaces =
       { name = "network-interfaces";
 
         startOn = "stopped udevtrigger";
@@ -195,7 +195,7 @@ in
         preStart =
           ''
             set +e # continue in case of errors
-          
+
             ${flip concatMapStrings cfg.interfaces (i:
               optionalString (i.macAddress != "")
                 ''
@@ -213,7 +213,7 @@ in
             ${concatStrings (attrValues (flip mapAttrs cfg.bridges (n: v: ''
                 echo "Creating bridge ${n}..."
                 ${pkgs.bridge_utils}/sbin/brctl addbr "${n}"
-                
+
                 ${flip concatMapStrings v.interfaces (i: ''
                   ${pkgs.bridge_utils}/sbin/brctl addif "${n}" "${i}"
                   ip addr flush dev "${i}"
@@ -226,11 +226,11 @@ in
                 ${optionalString cfg.enableIPv6 ''
                   echo 5 > /proc/sys/net/ipv6/conf/${n}/router_solicitations
                 ''}
-                
+
                 # !!! Should delete (brctl delif) any interfaces that
                 # no longer belong to the bridge.
             '')))}
-            
+
             # Configure the manually specified interfaces.
             ${flip concatMapStrings cfg.interfaces (i:
               optionalString (i.ipAddress != "")
@@ -276,5 +276,5 @@ in
       '';
 
   };
-  
+
 }
diff --git a/modules/tasks/swraid.nix b/modules/tasks/swraid.nix
index 21fe809f058..3b4aa9875f2 100644
--- a/modules/tasks/swraid.nix
+++ b/modules/tasks/swraid.nix
@@ -3,9 +3,9 @@
 {
 
   environment.systemPackages = [ pkgs.mdadm ];
-  
+
   services.udev.packages = [ pkgs.mdadm ];
 
   boot.initrd.availableKernelModules = [ "md_mod" "raid0" "raid1" "raid456" ];
-  
+
 }
diff --git a/modules/tasks/tty-backgrounds.nix b/modules/tasks/tty-backgrounds.nix
index 265c7a57bf2..aca01b428a5 100644
--- a/modules/tasks/tty-backgrounds.nix
+++ b/modules/tasks/tty-backgrounds.nix
@@ -5,16 +5,16 @@ with pkgs.lib;
 let
 
   inherit (pkgs) stdenv;
-  
+
   kernelPackages = config.boot.kernelPackages;
   splashutils = kernelPackages.splashutils;
   requiredTTYs = config.requiredTTYs;
-  
+
   backgrounds =
     let
-    
+
       specificThemes = config.services.ttyBackgrounds.specificThemes;
-        
+
       overridenTTYs = map (x: x.tty) specificThemes;
 
       # Use the default theme for all the mingetty ttys and for the
@@ -23,7 +23,7 @@ let
       defaultTTYs =
         filter (x: !(elem x overridenTTYs)) requiredTTYs;
 
-    in      
+    in
       (map (tty: { inherit tty; }) defaultTTYs) ++ specificThemes;
 
   themesUnpacked = stdenv.mkDerivation {
@@ -44,9 +44,9 @@ in
 {
 
   ###### interface
-  
+
   options = {
-  
+
     services.ttyBackgrounds = {
 
       enable = mkOption {
@@ -74,9 +74,9 @@ in
           This option overrides the theme for specific virtual consoles.
         '';
       };
-      
+
     };
-    
+
   };
 
 
@@ -142,7 +142,7 @@ in
             done
           '';
       };
-    
+
   });
-  
+
 }
diff --git a/modules/testing/test-instrumentation.nix b/modules/testing/test-instrumentation.nix
index 873c8a9d6d0..26ea31802fe 100644
--- a/modules/testing/test-instrumentation.nix
+++ b/modules/testing/test-instrumentation.nix
@@ -18,7 +18,7 @@ let
     '';
 
 in
-    
+
 {
 
   config =
@@ -30,7 +30,7 @@ in
     jobs.backdoor =
       { startOn = "startup";
         stopOn = "never";
-        
+
         script =
           ''
             export USER=root
@@ -56,7 +56,7 @@ in
         # timeouts in the VM should also be delayed).
         echo acpi_pm > /sys/devices/system/clocksource/clocksource0/current_clocksource
       '';
-    
+
     boot.postBootCommands =
       ''
         # Panic on out-of-memory conditions rather than letting the
@@ -77,7 +77,7 @@ in
     boot.kernelModules = [ "gcov-proc" ];
 
     # Panic if an error occurs in stage 1 (rather than waiting for
-    # user intervention). 
+    # user intervention).
     boot.kernelParams =
       [ "console=tty1" "console=ttyS0" "panic=1" "stage1panic=1" ];
 
@@ -90,7 +90,7 @@ in
     # Disable "-- MARK --" messages.  These prevent hanging tests from
     # being killed after 1 hour of silence.
     services.syslogd.extraParams = [ "-m 0" ];
-    
+
     # Don't run klogd.  Kernel messages appear on the serial console anyway.
     jobs.klogd.startOn = mkOverride 50 "";
 
@@ -99,7 +99,7 @@ in
     networking.nameservers = mkOverride 150 [ ];
 
     system.upstartEnvironment.GCOV_PREFIX = "/tmp/xchg/coverage-data";
-      
+
   };
 
 }
diff --git a/modules/virtualisation/amazon-image.nix b/modules/virtualisation/amazon-image.nix
index 109746b0f94..c7b3184b17e 100644
--- a/modules/virtualisation/amazon-image.nix
+++ b/modules/virtualisation/amazon-image.nix
@@ -15,7 +15,7 @@ with pkgs.lib;
               ${pkgs.vmTools.kvm}/bin/qemu-img create -f raw $diskImage "4G"
             '';
           buildInputs = [ pkgs.utillinux pkgs.perl ];
-          exportReferencesGraph = 
+          exportReferencesGraph =
             [ "closure" config.system.build.toplevel ];
         }
         ''
@@ -27,7 +27,7 @@ with pkgs.lib;
 
           # The initrd expects these directories to exist.
           mkdir /mnt/dev /mnt/proc /mnt/sys
-          
+
           mount -o bind /proc /mnt/proc
 
           # Copy all paths in the closure to the filesystem.
@@ -83,9 +83,9 @@ with pkgs.lib;
   boot.loader.grub.timeout = 0;
   boot.loader.grub.extraPerEntryConfig = "root (hd0)";
 
-  # Put /tmp and /var on /ephemeral0, which has a lot more space.  
-  # Unfortunately we can't do this with the `fileSystems' option 
-  # because it has no support for creating the source of a bind 
+  # Put /tmp and /var on /ephemeral0, which has a lot more space.
+  # Unfortunately we can't do this with the `fileSystems' option
+  # because it has no support for creating the source of a bind
   # mount.  Also, "move" /nix to /ephemeral0 by layering an AUFS
   # on top of it so we have a lot more space for Nix operations.
   boot.initrd.postMountCommands =
diff --git a/modules/virtualisation/libvirtd.nix b/modules/virtualisation/libvirtd.nix
index b8cc0cddd6d..91168aa7df5 100644
--- a/modules/virtualisation/libvirtd.nix
+++ b/modules/virtualisation/libvirtd.nix
@@ -4,9 +4,9 @@
 
 with pkgs.lib;
 
-let 
+let
 
-  cfg = config.virtualisation.libvirtd; 
+  cfg = config.virtualisation.libvirtd;
 
 in
 
@@ -15,7 +15,7 @@ in
 
   options = {
 
-    virtualisation.libvirtd.enable = 
+    virtualisation.libvirtd.enable =
       mkOption {
         default = false;
         description =
@@ -27,7 +27,7 @@ in
           '';
       };
 
-    virtualisation.libvirtd.enableKVM = 
+    virtualisation.libvirtd.enableKVM =
       mkOption {
         default = true;
         description =
@@ -43,7 +43,7 @@ in
 
   config = mkIf cfg.enable {
 
-    environment.systemPackages = 
+    environment.systemPackages =
       [ pkgs.libvirt ]
        ++ optional cfg.enableKVM pkgs.qemu_kvm;
 
@@ -59,7 +59,7 @@ in
             pkgs.ebtables
           ] ++ optional cfg.enableKVM pkgs.qemu_kvm;
 
-        preStart = 
+        preStart =
           ''
             mkdir -p /var/log/libvirt/qemu -m 755
             rm -f /var/run/libvirtd.pid
@@ -100,7 +100,7 @@ in
     # !!! Split this into save and restore tasks.
     jobs.libvirt_guests =
       { name = "libvirt-guests";
-      
+
         description = "Job to save/restore libvirtd VMs";
 
         startOn = "started libvirtd";
@@ -111,7 +111,7 @@ in
 
         path = [ pkgs.gettext pkgs.libvirt pkgs.gawk ];
 
-        preStart = 
+        preStart =
           ''
             mkdir -p /var/lock/subsys -m 755
             ${pkgs.libvirt}/etc/rc.d/init.d/libvirt-guests start || true
diff --git a/modules/virtualisation/nova-image.nix b/modules/virtualisation/nova-image.nix
index 2a904cdd88c..96b637b3019 100644
--- a/modules/virtualisation/nova-image.nix
+++ b/modules/virtualisation/nova-image.nix
@@ -15,7 +15,7 @@ with pkgs.lib;
               ${pkgs.vmTools.kvm}/bin/qemu-img create -f raw $diskImage "4G"
             '';
           buildInputs = [ pkgs.utillinux pkgs.perl ];
-          exportReferencesGraph = 
+          exportReferencesGraph =
             [ "closure" config.system.build.toplevel ];
         }
         ''
@@ -24,7 +24,7 @@ with pkgs.lib;
           ${pkgs.parted}/sbin/parted /dev/vda -- mkpart primary ext2 1M -1s
           . /sys/class/block/vda1/uevent
           mknod /dev/vda1 b $MAJOR $MINOR
-        
+
           # Create an empty filesystem and mount it.
           ${pkgs.e2fsprogs}/sbin/mkfs.ext3 -L nixos /dev/vda1
           ${pkgs.e2fsprogs}/sbin/tune2fs -c 0 -i 0 /dev/vda1
@@ -83,9 +83,9 @@ with pkgs.lib;
   boot.loader.grub.device = "/dev/vda";
   boot.loader.grub.timeout = 0;
 
-  # Put /tmp and /var on /ephemeral0, which has a lot more space.  
-  # Unfortunately we can't do this with the `fileSystems' option 
-  # because it has no support for creating the source of a bind 
+  # Put /tmp and /var on /ephemeral0, which has a lot more space.
+  # Unfortunately we can't do this with the `fileSystems' option
+  # because it has no support for creating the source of a bind
   # mount.  Also, "move" /nix to /ephemeral0 by layering an AUFS
   # on top of it so we have a lot more space for Nix operations.
   /*
diff --git a/modules/virtualisation/nova.nix b/modules/virtualisation/nova.nix
index fa26b7d54ea..fcaf1c0073b 100644
--- a/modules/virtualisation/nova.nix
+++ b/modules/virtualisation/nova.nix
@@ -25,7 +25,7 @@ in
 
   options = {
 
-    virtualisation.nova.enableSingleNode = 
+    virtualisation.nova.enableSingleNode =
       mkOption {
         default = false;
         description =
@@ -41,7 +41,7 @@ in
           '';
       };
 
-    virtualisation.nova.extraConfig = 
+    virtualisation.nova.extraConfig =
       mkOption {
         default = false;
         description =
@@ -84,10 +84,10 @@ in
         # nova-api) to work.
         mkdir -m 700 -p /var/lib/nova/CA /var/lib/nova/CA/private
 
-        # Initialise the SQLite database.        
+        # Initialise the SQLite database.
         ${nova}/bin/nova-manage db sync
       '';
-      
+
     # `nova-api' receives and executes external client requests from
     # tools such as euca2ools.  It listens on port 8773 (XML) and 8774
     # (JSON).
@@ -103,7 +103,7 @@ in
         path = [ pkgs.openssl pkgs.openssh pkgs.bash ];
 
         respawn = false;
-        
+
         exec = "${nova}/bin/nova-api --flagfile=${novaConf} --api_paste_config=${nova}/etc/nova/api-paste.ini";
       };
 
diff --git a/modules/virtualisation/qemu-vm.nix b/modules/virtualisation/qemu-vm.nix
index 93212af2dfc..95502821e35 100644
--- a/modules/virtualisation/qemu-vm.nix
+++ b/modules/virtualisation/qemu-vm.nix
@@ -13,14 +13,14 @@ with pkgs.lib;
 
 let
 
-  vmName = 
-    if config.networking.hostName == "" 
-    then "noname" 
+  vmName =
+    if config.networking.hostName == ""
+    then "noname"
     else config.networking.hostName;
 
   options = {
-  
-    virtualisation.memorySize = 
+
+    virtualisation.memorySize =
       mkOption {
         default = 384;
         description =
@@ -28,8 +28,8 @@ let
             Memory size (M) of virtual machine.
           '';
       };
-      
-    virtualisation.diskSize = 
+
+    virtualisation.diskSize =
       mkOption {
         default = 512;
         description =
@@ -37,7 +37,7 @@ let
             Disk size (M) of virtual machine.
           '';
       };
-      
+
     virtualisation.diskImage =
       mkOption {
         default = "./${vmName}.qcow2";
@@ -48,7 +48,7 @@ let
             exist.
           '';
       };
-      
+
     virtualisation.graphics =
       mkOption {
         default = true;
@@ -72,7 +72,7 @@ let
           '';
       };
 
-    virtualisation.vlans = 
+    virtualisation.vlans =
       mkOption {
         default = [ 1 ];
         example = [ 1 2 ];
@@ -89,7 +89,7 @@ let
           '';
       };
 
-    virtualisation.writableStore = 
+    virtualisation.writableStore =
       mkOption {
         default = false;
         description =
@@ -127,7 +127,7 @@ let
             altogether.
           '';
       };
-            
+
   };
 
   cfg = config.virtualisation;
@@ -140,7 +140,7 @@ let
   startVM =
     ''
       #! ${pkgs.stdenv.shell}
-      
+
       NIX_DISK_IMAGE=$(readlink -f ''${NIX_DISK_IMAGE:-${config.virtualisation.diskImage}})
 
       if ! test -e "$NIX_DISK_IMAGE"; then
@@ -178,7 +178,7 @@ let
           $QEMU_OPTS
     '';
 
-    
+
   regInfo = pkgs.runCommand "reginfo"
     { exportReferencesGraph =
         map (x: [("closure-" + baseNameOf x) x]) config.virtualisation.pathsInNixDB;
@@ -221,21 +221,21 @@ let
           echo '(hd0) /dev/vda' > /boot/grub/device.map
 
           # Install GRUB and generate the GRUB boot menu.
-          touch /etc/NIXOS 
+          touch /etc/NIXOS
           mkdir -p /nix/var/nix/profiles
           ${config.system.build.toplevel}/bin/switch-to-configuration boot
 
           umount /boot
         ''
     );
-    
+
 in
 
 {
   require = [ options ../profiles/qemu-guest.nix ];
 
   boot.loader.grub.device = mkOverride 50 "/dev/vda";
-  
+
   # All the modules the initrd needs to mount the host filesystem via
   # CIFS.  Also use paravirtualised network and block devices for
   # performance.
@@ -255,7 +255,7 @@ in
       cp ${pkgs.iproute}/sbin/ip $out/bin
       cp ${pkgs.glibc}/lib/libresolv.so.* $out/lib
     '';
-      
+
   boot.initrd.postDeviceCommands =
     ''
       # Set up networking.  Needed for CIFS mounting.
@@ -274,7 +274,7 @@ in
     ''
       # Fix the permissions on /tmp.
       chmod 1777 $targetRoot/tmp
-      
+
       mkdir -p $targetRoot/boot
       mount -o remount,ro $targetRoot/nix/store
       ${optionalString cfg.writableStore ''
@@ -283,7 +283,7 @@ in
         mount -t aufs -o dirs=/mnt-store-tmpfs=rw:$targetRoot/nix/store=rr none $targetRoot/nix/store
       ''}
     '';
-    
+
   # After booting, register the closure of the paths in
   # `virtualisation.pathsInNixDB' in the Nix database in the VM.  This
   # allows Nix operations to work in the VM.  The path to the
@@ -299,11 +299,11 @@ in
         fi
       )
     '';
-      
+
   virtualisation.pathsInNixDB = [ config.system.build.toplevel ];
 
   virtualisation.qemu.options = [ "-vga std" "-usbdevice tablet" ];
-  
+
   # Mount the host filesystem via CIFS, and bind-mount the Nix store
   # of the host into our own filesystem.  We use mkOverride to allow
   # this module to be applied to "normal" NixOS system configuration,
@@ -351,7 +351,7 @@ in
 
   # Don't run ntpd in the guest.  It should get the correct time from KVM.
   services.ntp.enable = false;
-    
+
   system.build.vm = pkgs.runCommand "nixos-vm" {}
     ''
       ensureDir $out/bin
diff --git a/modules/virtualisation/xen-dom0.nix b/modules/virtualisation/xen-dom0.nix
index cb71f4137ab..8c2f6c738c1 100644
--- a/modules/virtualisation/xen-dom0.nix
+++ b/modules/virtualisation/xen-dom0.nix
@@ -4,9 +4,9 @@
 
 with pkgs.lib;
 
-let 
+let
 
-  cfg = config.virtualisation.xen; 
+  cfg = config.virtualisation.xen;
 
   xen = pkgs.xen;
 
@@ -24,7 +24,7 @@ in
 
   options = {
 
-    virtualisation.xen.enable = 
+    virtualisation.xen.enable =
       mkOption {
         default = false;
         description =
@@ -38,7 +38,7 @@ in
           '';
       };
 
-    virtualisation.xen.bootParams = 
+    virtualisation.xen.bootParams =
       mkOption {
         default = "";
         description =
@@ -47,7 +47,7 @@ in
           '';
       };
 
-    virtualisation.xen.domain0MemorySize = 
+    virtualisation.xen.domain0MemorySize =
       mkOption {
         default = 0;
         example = 512;
@@ -70,8 +70,8 @@ in
     # Domain 0 requires a pvops-enabled kernel.
     boot.kernelPackages = pkgs.linuxPackages_2_6_32_xen;
 
-    boot.kernelModules = 
-      [ "xen_evtchn" "xen_gntdev" "xen_blkback" "xen_netback" "xen_pciback" 
+    boot.kernelModules =
+      [ "xen_evtchn" "xen_gntdev" "xen_blkback" "xen_netback" "xen_pciback"
         "blktap" "tun"
       ];
 
@@ -87,7 +87,7 @@ in
         options loop max_loop=64
       '';
 
-    virtualisation.xen.bootParams = 
+    virtualisation.xen.bootParams =
       [ "loglvl=all" "guest_loglvl=all" ] ++
       optional (cfg.domain0MemorySize != 0) "dom0_mem=${toString cfg.domain0MemorySize}M";
 
@@ -111,19 +111,19 @@ in
 
         startOn = "stopped udevtrigger";
 
-        path = 
-          [ pkgs.bridge_utils pkgs.gawk pkgs.iproute pkgs.nettools 
+        path =
+          [ pkgs.bridge_utils pkgs.gawk pkgs.iproute pkgs.nettools
             pkgs.utillinux pkgs.bash xen pkgs.pciutils pkgs.procps
           ];
 
         environment.XENCONSOLED_TRACE = "hv";
 
-        preStart = 
+        preStart =
           ''
             mkdir -p /var/log/xen/console -m 0700
 
             ${xen}/sbin/xend start
-  
+
             # Wait until Xend is running.
             for ((i = 0; i < 60; i++)); do echo "waiting for xend..."; ${xen}/sbin/xend status && break; done
 
@@ -144,7 +144,7 @@ in
 
         environment.XENDOM_CONFIG = "${xen}/etc/sysconfig/xendomains";
 
-        preStart = 
+        preStart =
           ''
             mkdir -p /var/lock/subsys -m 755
             ${xen}/etc/init.d/xendomains start
diff --git a/modules/virtualisation/xen-domU.nix b/modules/virtualisation/xen-domU.nix
index a83e5dc612e..29ab8f8b3af 100644
--- a/modules/virtualisation/xen-domU.nix
+++ b/modules/virtualisation/xen-domU.nix
@@ -18,7 +18,7 @@
   services.syslogd.tty = "hvc0";
 
   # Start a mingetty on the Xen console (so that you can login using
-  # "xm console" in Dom0). 
+  # "xm console" in Dom0).
   services.mingetty.ttys = [ "hvc0" "tty1" "tty2" ];
 
   # Don't run ntpd, since we should get the correct time from Dom0.
diff --git a/release.nix b/release.nix
index d3c6308197f..1ba256e5d3b 100644
--- a/release.nix
+++ b/release.nix
@@ -25,7 +25,7 @@ let
         inherit system nixpkgs;
         modules = [ module versionModule ];
       }).config;
-      
+
       iso = config.system.build.isoImage;
 
     in
@@ -85,11 +85,11 @@ let
 
       releaseTools.makeSourceTarball {
         name = "nixos-tarball";
-        
+
         version = builtins.readFile ./VERSION;
-        
+
         src = nixosSrc;
-        
+
         inherit officialRelease;
 
         distPhase = ''
@@ -115,7 +115,7 @@ let
             inherit nixpkgs;
             modules = [ { fileSystems = []; } ];
           }).options;
-        revision = 
+        revision =
           if nixosSrc.rev == 1234 then "HEAD" else toString nixosSrc.rev;
       }).manual;
 
@@ -130,7 +130,7 @@ let
       type = "graphical";
     };
 
-    
+
     # Provide a tarball that can be unpacked into an SD card, and easily
     # boot that system from uboot (like for the sheevaplug).
     # The pc variant helps preparing the expression for the system tarball
@@ -152,9 +152,9 @@ let
       } { system = "armv5tel-linux"; };
 
 
-    tests = 
+    tests =
       let
-        t = import ./tests { 
+        t = import ./tests {
           inherit nixpkgs;
           system = "i686-linux";
         };
@@ -187,6 +187,6 @@ let
       };
 
   };
-  
+
 
 in jobs
diff --git a/tests/bittorrent.nix b/tests/bittorrent.nix
index dce8e3b3725..8951e5bad1b 100644
--- a/tests/bittorrent.nix
+++ b/tests/bittorrent.nix
@@ -19,13 +19,13 @@ let
       listening_ip=${nodes.router.config.networking.ifaces.eth2.ipAddress}/24
       allow 1024-65535 192.168.2.0/24 1024-65535
     '';
-  
+
 in
 
 {
 
   nodes =
-    { tracker = 
+    { tracker =
         { config, pkgs, ... }:
         { environment.systemPackages = [ pkgs.transmission pkgs.bittorrent ];
 
@@ -35,7 +35,7 @@ in
           services.httpd.documentRoot = "/tmp";
         };
 
-      router = 
+      router =
         { config, pkgs, ... }:
         { environment.systemPackages = [ pkgs.miniupnpd ];
           virtualisation.vlans = [ 1 2 ];
@@ -44,7 +44,7 @@ in
           networking.nat.externalInterface = "eth1";
         };
 
-      client1 = 
+      client1 =
         { config, pkgs, nodes, ... }:
         { environment.systemPackages = [ pkgs.transmission ];
           virtualisation.vlans = [ 2 ];
@@ -52,7 +52,7 @@ in
             nodes.router.config.networking.ifaces.eth2.ipAddress;
         };
 
-      client2 = 
+      client2 =
         { config, pkgs, ... }:
         { environment.systemPackages = [ pkgs.transmission ];
         };
@@ -103,5 +103,5 @@ in
       $client2->waitForFile("/tmp/test.tar.bz2");
       $client2->succeed("cmp /tmp/test.tar.bz2 ${file}");
     '';
-  
+
 }
diff --git a/tests/check-filesystems.nix b/tests/check-filesystems.nix
index 882f5cd3153..ba2bf352ec8 100644
--- a/tests/check-filesystems.nix
+++ b/tests/check-filesystems.nix
@@ -44,9 +44,9 @@ rec {
             autocreate = true;
             device = "share:/repos2";
           };
-        in pkgs.lib.mkOverrideTemplate 50 {} [ 
+        in pkgs.lib.mkOverrideTemplate 50 {} [
           repos1
-          repos1 # check remount 
+          repos1 # check remount
           repos2 # check after remount
         ];
 
@@ -56,7 +56,7 @@ rec {
       };
     };
   };
-    
+
   vms = buildVirtualNetwork { inherit nodes; };
 
   test = runTests vms
diff --git a/tests/firefox.nix b/tests/firefox.nix
index 7e1e192c808..adb936dc1ae 100644
--- a/tests/firefox.nix
+++ b/tests/firefox.nix
@@ -2,7 +2,7 @@
 
 {
 
-  machine = 
+  machine =
     { config, pkgs, ... }:
 
     { require = [ ./common/x11.nix ];
@@ -17,5 +17,5 @@
       $machine->sleep(40); # wait until Firefox has finished loading the page
       $machine->screenshot("screen");
     '';
-  
+
 }
diff --git a/tests/firewall.nix b/tests/firewall.nix
index d2d2568f1cd..b38cd988b76 100644
--- a/tests/firewall.nix
+++ b/tests/firewall.nix
@@ -5,7 +5,7 @@
 {
 
   nodes =
-    { walled = 
+    { walled =
         { config, pkgs, nodes, ... }:
         { networking.firewall.enable = true;
           networking.firewall.logRefusedPackets = true;
@@ -13,7 +13,7 @@
           services.httpd.adminAddr = "foo@example.org";
         };
 
-      attacker = 
+      attacker =
         { config, pkgs, ... }:
         { services.httpd.enable = true;
           services.httpd.adminAddr = "foo@example.org";
diff --git a/tests/installer.nix b/tests/installer.nix
index bc88c7c68a4..900457dfabd 100644
--- a/tests/installer.nix
+++ b/tests/installer.nix
@@ -13,9 +13,9 @@ let
       modules =
         [ ../modules/installer/cd-dvd/installation-cd-graphical.nix
           ../modules/testing/test-instrumentation.nix
-          { key = "serial"; 
+          { key = "serial";
             boot.loader.grub.timeout = mkOverrideTemplate 0 {} 0;
-            
+
             # The test cannot access the network, so any sources we
             # need must be included in the ISO.
             isoImage.storeContents =
@@ -27,7 +27,7 @@ let
         ];
     }).config.system.build.isoImage;
 
-    
+
   # The configuration to install.
   config = { fileSystems, testChannel }: pkgs.writeText "configuration.nix"
     ''
@@ -42,7 +42,7 @@ let
         boot.loader.grub.device = "/dev/vda";
         boot.loader.grub.extraConfig = "serial; terminal_output.serial";
         boot.initrd.kernelModules = [ "ext3" "virtio_console" ];
-      
+
         fileSystems = [ ${fileSystems} ];
         swapDevices = [ { label = "swap"; } ];
 
@@ -56,7 +56,7 @@ let
         device = "/dev/disk/by-label/nixos";
       }
     '';
-    
+
   bootFS =
     ''
       { mountPoint = "/boot";
@@ -64,10 +64,10 @@ let
       }
     '';
 
-    
+
   # Configuration of a web server that simulates the Nixpkgs channel
   # distribution server.
-  webserver = 
+  webserver =
     { config, pkgs, ... }:
 
     { services.httpd.enable = true;
@@ -82,7 +82,7 @@ let
     };
 
   channelContents = [ pkgs.hello.src pkgs.rlwrap ];
-  
+
 
   # The test script boots the CD, installs NixOS on an empty hard
   # disk, and then reboot from the hard disk.  It's parameterized with
@@ -93,7 +93,7 @@ let
     ''
       createDisk("harddisk", 4 * 1024);
 
-      my $machine = createMachine({ hda => "harddisk", cdrom => glob("${iso}/iso/*.iso"), 
+      my $machine = createMachine({ hda => "harddisk", cdrom => glob("${iso}/iso/*.iso"),
         qemuFlags => '${if testChannel then qemuNICFlags 1 1 2 else ""}'});
       $machine->start;
 
@@ -108,7 +108,7 @@ let
             "http://nixos.org/releases/nixpkgs/channels/nixpkgs-unstable " .
             "file:///tmp/channel/MANIFEST ${toString channelContents} >&2");
       ''}
-      
+
       # Make sure that we get a login prompt etc.
       $machine->mustSucceed("echo hello");
       $machine->waitForJob("tty1");
@@ -150,14 +150,14 @@ let
 
       # Perform the installation.
       $machine->mustSucceed("nixos-install >&2");
-      
+
       $machine->mustSucceed("cat /mnt/boot/grub/grub.cfg >&2");
-      
+
       $machine->shutdown;
 
       # Now see if we can boot the installation.
       my $machine = createMachine({ hda => "harddisk" });
-      
+
       # Did /boot get mounted, if appropriate?
       # !!! There is currently no good way to wait for the
       # `filesystems' task to finish.
@@ -166,7 +166,7 @@ let
       # Did the swap device get activated?
       # !!! Idem.
       $machine->waitUntilSucceeds("cat /proc/swaps | grep -q /dev");
-      
+
       $machine->mustSucceed("nix-env -i coreutils >&2");
       $machine->mustSucceed("type -tP ls | tee /dev/stderr") =~ /.nix-profile/
           or die "nix-env failed";
@@ -174,7 +174,7 @@ let
       $machine->mustSucceed("nixos-rebuild switch >&2");
 
       $machine->mustSucceed("cat /boot/grub/grub.cfg >&2");
-      
+
       $machine->shutdown;
 
       # And just to be sure, check that the machine still boots after
@@ -184,7 +184,7 @@ let
       $machine->shutdown;
     '';
 
-    
+
   makeTest = { createPartitions, fileSystems, testChannel ? false }:
     { inherit iso;
       nodes = if testChannel then { inherit webserver; } else { };
@@ -192,7 +192,7 @@ let
         inherit createPartitions fileSystems testChannel;
       };
     };
-    
+
 
 in {
 
@@ -202,7 +202,7 @@ in {
   # The (almost) simplest partitioning scheme: a swap partition and
   # one big filesystem partition.
   simple = makeTest
-    { createPartitions = 
+    { createPartitions =
         ''
           $machine->mustSucceed(
               "parted /dev/vda mklabel msdos",
@@ -218,7 +218,7 @@ in {
       fileSystems = rootFS;
       testChannel = true;
     };
-      
+
   # Same as the previous, but now with a separate /boot partition.
   separateBoot = makeTest
     { createPartitions =
@@ -240,7 +240,7 @@ in {
         '';
       fileSystems = rootFS + bootFS;
     };
-  
+
   # Create two physical LVM partitions combined into one volume group
   # that contains the logical swap and root partitions.
   lvm = makeTest
@@ -296,7 +296,7 @@ in {
     };
 
   # Rebuild the CD configuration with a little modification.
-  rebuildCD = 
+  rebuildCD =
     { inherit iso;
       nodes = { };
       testScript =
diff --git a/tests/ipv6.nix b/tests/ipv6.nix
index 76958ab445d..4a308416aef 100644
--- a/tests/ipv6.nix
+++ b/tests/ipv6.nix
@@ -7,14 +7,14 @@
 
   nodes =
     { client = { config, pkgs, ... }: { };
-    
+
       server =
         { config, pkgs, ... }:
         { services.httpd.enable = true;
           services.httpd.adminAddr = "foo@example.org";
         };
 
-      router = 
+      router =
         { config, pkgs, ... }:
         { services.radvd.enable = true;
           services.radvd.config =
@@ -32,9 +32,9 @@
     ''
       # Start the router first so that it respond to router solicitations.
       $router->waitForJob("radvd");
-    
+
       startAll;
-    
+
       $client->waitForJob("network-interfaces");
       $server->waitForJob("network-interfaces");
 
@@ -48,12 +48,12 @@
           $machine->log("$scope address on $iface is $ip");
           return $ip;
       }
-      
+
       subtest "loopback address", sub {
-          $client->succeed("ping6 -c 1 ::1 >&2");  
-          $client->fail("ping6 -c 1 ::2 >&2");  
+          $client->succeed("ping6 -c 1 ::1 >&2");
+          $client->fail("ping6 -c 1 ::2 >&2");
       };
-    
+
       subtest "local link addressing", sub {
           my $clientIp = waitForAddress $client, "eth1", "link";
           my $serverIp = waitForAddress $server, "eth1", "link";
diff --git a/tests/kde4.nix b/tests/kde4.nix
index ff75758429d..afdf1754942 100644
--- a/tests/kde4.nix
+++ b/tests/kde4.nix
@@ -2,7 +2,7 @@
 
 {
 
-  machine = 
+  machine =
     { config, pkgs, ... }:
 
     { require = [ ./common/user-account.nix ];
@@ -40,8 +40,8 @@
       $machine->waitForWindow(qr/Valgrind.*Konqueror/);
 
       $machine->sleep(5);
-      
+
       $machine->screenshot("screen");
     '';
-  
+
 }
diff --git a/tests/login.nix b/tests/login.nix
index 3567b6bc246..90987782f8c 100644
--- a/tests/login.nix
+++ b/tests/login.nix
@@ -23,7 +23,7 @@
           $machine->sendChars("touch done\n");
           $machine->waitForFile("/home/alice/done");
       };
-      
+
       # Check whether switching VTs works.
       subtest "virtual console switching", sub {
           $machine->sendKeys("alt-f10");
@@ -50,12 +50,12 @@
           $machine->waitUntilFails("pgrep -u alice bash");
           $machine->screenshot("mingetty");
       };
-      
+
       # Check whether ctrl-alt-delete works.
       subtest "ctrl-alt-delete", sub {
           $machine->sendKeys("ctrl-alt-delete");
           $machine->waitForShutdown;
       };
     '';
-  
+
 }
diff --git a/tests/mysql-replication.nix b/tests/mysql-replication.nix
index db72e45f685..5ac7f0a5097 100644
--- a/tests/mysql-replication.nix
+++ b/tests/mysql-replication.nix
@@ -6,9 +6,9 @@ let
 in
 {
   nodes = {
-    master = 
+    master =
       { pkgs, config, ... }:
-      
+
       {
         services.mysql.enable = true;
 	services.mysql.replication.role = "master";
@@ -19,22 +19,22 @@ in
           grant replication slave on *.* to '${replicateUser}'@'%';
         '';
       };
-    
+
     slave1 =
       { pkgs, config, nodes, ... }:
-      
+
       {
         services.mysql.enable = true;
 	services.mysql.replication.role = "slave";
 	services.mysql.replication.serverId = 2;
 	services.mysql.replication.masterHost = nodes.master.config.networking.hostName;
 	services.mysql.replication.masterUser = replicateUser;
-	services.mysql.replication.masterPassword = replicatePassword;	
+	services.mysql.replication.masterPassword = replicatePassword;
       };
-      
+
     slave2 =
       { pkgs, config, nodes, ... }:
-      
+
       {
         services.mysql.enable = true;
 	services.mysql.replication.role = "slave";
@@ -44,10 +44,10 @@ in
 	services.mysql.replication.masterPassword = replicatePassword;
       };
   };
-  
+
   testScript = ''
     startAll;
-    
+
     $master->waitForJob("mysql");
     $master->waitForJob("mysql");
     $slave2->waitForJob("mysql");
diff --git a/tests/mysql.nix b/tests/mysql.nix
index cb8f1247909..65785c8fdb5 100644
--- a/tests/mysql.nix
+++ b/tests/mysql.nix
@@ -2,19 +2,19 @@
 
 {
   nodes = {
-    master = 
+    master =
       { pkgs, config, ... }:
-      
+
       {
         services.mysql.enable = true;
 	services.mysql.replication.role = "master";
 	services.mysql.initialDatabases = [ { name = "testdb"; schema = ./testdb.sql; } ];
-      };    
+      };
   };
-  
+
   testScript = ''
     startAll;
-    
+
     $master->waitForJob("mysql");
     $master->sleep(10); # Hopefully this is long enough!!
     $master->mustSucceed("echo 'use testdb; select * from tests' | mysql -u root -N | grep 4");
diff --git a/tests/nat.nix b/tests/nat.nix
index 5466106a43d..5adbf3ce57d 100644
--- a/tests/nat.nix
+++ b/tests/nat.nix
@@ -9,14 +9,14 @@
 {
 
   nodes =
-    { client = 
+    { client =
         { config, pkgs, nodes, ... }:
         { virtualisation.vlans = [ 1 ];
           networking.defaultGateway =
             nodes.router.config.networking.ifaces.eth2.ipAddress;
         };
 
-      router = 
+      router =
         { config, pkgs, ... }:
         { virtualisation.vlans = [ 2 1 ];
           networking.nat.enable = true;
@@ -24,7 +24,7 @@
           networking.nat.externalInterface = "eth1";
         };
 
-      server = 
+      server =
         { config, pkgs, ... }:
         { virtualisation.vlans = [ 2 ];
           services.httpd.enable = true;
@@ -49,19 +49,19 @@
       $client->waitForJob("network-interfaces");
       $client->succeed("curl --fail http://server/ >&2");
       $client->succeed("ping -c 1 server >&2");
-      
+
       # Test whether passive FTP works.
       $server->waitForJob("vsftpd");
       $server->succeed("echo Hello World > /home/ftp/foo.txt");
       $client->succeed("curl -v ftp://server/foo.txt >&2");
-      
+
       # Test whether active FTP works.
       $client->succeed("curl -v -P - ftp://server/foo.txt >&2");
 
       # Test ICMP.
       $client->succeed("ping -c 1 router >&2");
       $router->succeed("ping -c 1 client >&2");
-      
+
       # If we turn off NAT, the client shouldn't be able to reach the server.
       $router->succeed("stop nat");
       $client->fail("curl --fail --connect-timeout 5 http://server/ >&2");
diff --git a/tests/nfs.nix b/tests/nfs.nix
index c8ead3d8930..e4576e451b8 100644
--- a/tests/nfs.nix
+++ b/tests/nfs.nix
@@ -2,14 +2,14 @@
 
 let
 
-  client = 
+  client =
     { config, pkgs, ... }:
-    { fileSystems = pkgs.lib.mkOverride 50 
+    { fileSystems = pkgs.lib.mkOverride 50
         [ { mountPoint = "/data";
             device = "server:/data";
             fsType = "nfs";
             options = "bootwait";
-          } 
+          }
         ];
     };
 
@@ -21,7 +21,7 @@ in
     { client1 = client;
       client2 = client;
 
-      server = 
+      server =
         { config, pkgs, ... }:
         { services.nfsKernel.server.enable = true;
           services.nfsKernel.server.exports =
@@ -52,7 +52,7 @@ in
       # seconds because the NFS server waits that long after booting
       # before accepting new locks.
       $client2->succeed("time flock -n -s /data/lock true");
-      
+
       # Test locking: client 1 acquires an exclusive lock, so client 2
       # should then fail to acquire a shared lock.
       $client1->succeed("flock -x /data/lock -c 'touch locked; sleep 100000' &");
diff --git a/tests/openssh.nix b/tests/openssh.nix
index 0e8bd3e2b9d..5818c9d6ceb 100644
--- a/tests/openssh.nix
+++ b/tests/openssh.nix
@@ -2,33 +2,33 @@
 
 {
   nodes = {
-  
-    server = 
+
+    server =
       { config, pkgs, ... }:
-      
+
       {
         services.openssh.enable = true;
       };
-      
-    client = 
+
+    client =
       { config, pkgs, ... }: { };
-      
+
   };
-  
+
   testScript = ''
     startAll;
-    
+
     my $key=`${pkgs.openssh}/bin/ssh-keygen -t dsa -f key -N ""`;
 
     $server->waitForJob("sshd");
-    
+
     $server->mustSucceed("mkdir -m 700 /root/.ssh");
     $server->copyFileFromHost("key.pub", "/root/.ssh/authorized_keys");
-    
+
     $client->mustSucceed("mkdir -m 700 /root/.ssh");
     $client->copyFileFromHost("key", "/root/.ssh/id_dsa");
     $client->mustSucceed("chmod 600 /root/.ssh/id_dsa");
-    
+
     $client->waitForJob("network-interfaces");
     $client->mustSucceed("ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no server 'echo hello world'");
   '';
diff --git a/tests/proxy.nix b/tests/proxy.nix
index 685d5a36f5d..323b548de74 100644
--- a/tests/proxy.nix
+++ b/tests/proxy.nix
@@ -2,7 +2,7 @@
 
 let
 
-  backend = 
+  backend =
     { config, pkgs, ... }:
 
     {
diff --git a/tests/quake3.nix b/tests/quake3.nix
index c21a1506b65..fbd0adab2fa 100644
--- a/tests/quake3.nix
+++ b/tests/quake3.nix
@@ -11,10 +11,10 @@ let
     };
 
 in
-      
+
 rec {
 
-  client = 
+  client =
     { config, pkgs, ... }:
 
     { require = [ ./common/x11.nix ];
@@ -52,7 +52,7 @@ rec {
 
       $client1->execute("quake3 '+set r_fullscreen 0' '+set name Foo' '+connect server' &");
       $client2->execute("quake3 '+set r_fullscreen 0' '+set name Bar' '+connect server' &");
- 
+
       $server->waitUntilSucceeds("grep -q 'Foo.*entered the game' /tmp/log");
       $server->waitUntilSucceeds("grep -q 'Bar.*entered the game' /tmp/log");
 
@@ -76,5 +76,5 @@ rec {
       $client2->shutdown();
       $server->succeed("stop quake3-server");
     '';
-  
+
 }
diff --git a/tests/remote-builds.nix b/tests/remote-builds.nix
index f55520b3501..80ba9c71e73 100644
--- a/tests/remote-builds.nix
+++ b/tests/remote-builds.nix
@@ -5,7 +5,7 @@
 let
 
   # The configuration of the build slaves.
-  slave = 
+  slave =
     { config, pkgs, ... }:
     { services.openssh.enable = true;
       virtualisation.writableStore = true;
diff --git a/tests/subversion.nix b/tests/subversion.nix
index 4a1ed62978e..fb8bba93806 100644
--- a/tests/subversion.nix
+++ b/tests/subversion.nix
@@ -30,7 +30,7 @@ let
       };
 
 in
-      
+
 {
 
   nodes =
@@ -73,11 +73,11 @@ in
       # Create a new user through the web interface.
       $client->mustSucceed("curl --fail -F username=alice -F fullname='Alice Lastname' -F address=alice\@example.org -F password=foobar -F password_again=foobar http://webserver/repoman/adduser");
 
-      # Let Alice create a new repository.      
+      # Let Alice create a new repository.
       $client->mustSucceed("curl --fail -u alice:foobar --form repo=xyzzy --form description=Xyzzy http://webserver/repoman/create");
 
       $client->mustSucceed("curl --fail http://webserver/") =~ /alice/ or die;
-      
+
       # Let Alice do a checkout.
       my $svnFlags = "--non-interactive --username alice --password foobar";
       $client->mustSucceed("svn co $svnFlags http://webserver/repos/xyzzy wc");
@@ -98,10 +98,10 @@ in
       # !!! Repoman should really return a 403 here.
       $client->succeed("curl --fail -u bob:fnord -F description=Xyzzy -F readers=alice,bob -F writers=alice -F watchers= -F tardirs= http://webserver/repoman/update/xyzzy")
           =~ /not authorised/ or die;
-      
+
       # Give Bob access.
       $client->mustSucceed("curl --fail -u alice:foobar -F description=Xyzzy -F readers=alice,bob -F writers=alice -F watchers= -F tardirs= http://webserver/repoman/update/xyzzy");
-      
+
       # So now his checkout should succeed.
       $client->mustSucceed("svn co $svnFlagsBob http://webserver/repos/xyzzy wc2");
 
diff --git a/tests/tomcat.nix b/tests/tomcat.nix
index bf601e834e1..0726a782250 100644
--- a/tests/tomcat.nix
+++ b/tests/tomcat.nix
@@ -2,9 +2,9 @@
 
 {
   nodes = {
-    server = 
+    server =
       { pkgs, config, ... }:
-      
+
       {
         services.tomcat.enable = true;
         services.httpd.enable = true;
@@ -16,10 +16,10 @@
           }
         ];
       };
-      
+
     client = { };
   };
-  
+
   testScript = ''
     startAll;
 
diff --git a/tests/trac.nix b/tests/trac.nix
index 9f3ea90261f..e13c0f15752 100644
--- a/tests/trac.nix
+++ b/tests/trac.nix
@@ -2,7 +2,7 @@
 
 {
   nodes = {
-    storage = 
+    storage =
       {pkgs, config, ...}:
       {
         services.portmap.enable = true;
@@ -28,16 +28,16 @@
         '';
       };
 
-    webserver = 
+    webserver =
       {config, pkgs, ...}:
       {
-        fileSystems = pkgs.lib.mkOverride 50  
+        fileSystems = pkgs.lib.mkOverride 50
           [ { mountPoint = "/repos";
               device = "storage:/repos";
 	      fsType = "nfs";
-	      options = "bootwait"; } 
+	      options = "bootwait"; }
           ];
-      
+
         services.portmap.enable = true;
         services.nfsKernel.client.enable = true;
         services.httpd.enable = true;
@@ -45,34 +45,34 @@
         services.httpd.extraSubservices = [ { serviceType = "trac"; } ];
         environment.systemPackages = [ pkgs.pythonPackages.trac pkgs.subversion ];
       };
-      
-    client = 
+
+    client =
       {config, pkgs, ...}:
       {
         require = [ ./common/x11.nix ];
         services.xserver.desktopManager.kde4.enable = true;
       };
   };
-    
+
   testScript =
     ''
       startAll;
-      
+
       $postgresql->waitForJob("postgresql");
       $postgresql->mustSucceed("createdb trac");
-      
+
       $webserver->mustSucceed("mkdir -p /repos/trac");
       $webserver->mustSucceed("svnadmin create /repos/trac");
-      
-      $webserver->waitForFile("/var/trac");      
+
+      $webserver->waitForFile("/var/trac");
       $webserver->mustSucceed("mkdir -p /var/trac/projects/test");
       $webserver->mustSucceed("PYTHONPATH=${pkgs.pythonPackages.psycopg2}/lib/${pkgs.python.libPrefix}/site-packages trac-admin /var/trac/projects/test initenv Test postgres://root\@postgresql/trac svn /repos/trac");
-      
+
       $client->waitForX;
       $client->execute("konqueror http://webserver/projects/test &");
       $client->waitForWindow(qr/Test.*Konqueror/);
       $client->sleep(30); # loading takes a long time
-      
+
       $client->screenshot("screen");
     '';
 }
diff --git a/tests/xfce.nix b/tests/xfce.nix
index b9114baf370..0975cd88883 100644
--- a/tests/xfce.nix
+++ b/tests/xfce.nix
@@ -2,7 +2,7 @@
 
 {
 
-  machine = 
+  machine =
     { config, pkgs, ... }:
 
     { require = [ ./common/user-account.nix ];
@@ -11,22 +11,22 @@
 
       services.xserver.displayManager.auto.enable = true;
       services.xserver.displayManager.auto.user = "alice";
-      
+
       services.xserver.desktopManager.xfce.enable = true;
     };
 
   testScript =
     ''
-      $machine->waitForWindow(qr/Tips/);      
+      $machine->waitForWindow(qr/Tips/);
       $machine->sleep(10);
 
       # Check that logging in has given the user ownership of devices.
       $machine->succeed("getfacl /dev/snd/timer | grep -q alice");
-      
+
       $machine->succeed("su - alice -c 'DISPLAY=:0.0 Terminal &'");
       $machine->waitForWindow(qr/Terminal/);
       $machine->sleep(10);
       $machine->screenshot("screen");
     '';
-  
+
 }
-- 
GitLab


From d1cf78c75689f6185ea807682de94b997c4b26e2 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 14 Sep 2011 18:30:07 +0000
Subject: [PATCH 3154/5331] modules/services/monitoring/smartd.nix: provide the
 implicitly set flag '-a' explicitly

svn path=/nixos/trunk/; revision=29286
---
 modules/services/monitoring/smartd.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/services/monitoring/smartd.nix b/modules/services/monitoring/smartd.nix
index fc3626a3048..154c630e18c 100644
--- a/modules/services/monitoring/smartd.nix
+++ b/modules/services/monitoring/smartd.nix
@@ -24,7 +24,7 @@ let
 
   smartdConf = pkgs.writeText "smartd.conf" (concatMapStrings (device:
     ''
-      ${device} -m root -M exec ${smartdMail}
+      ${device} -a -m root -M exec ${smartdMail}
     ''
     ) cfg.devices);
 
-- 
GitLab


From 8abea71eaa2367edca69ca2414efc3e0c94d3b61 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 14 Sep 2011 18:30:10 +0000
Subject: [PATCH 3155/5331] modules/services/monitoring/smartd.nix: run the
 daemon with --no-fork to make life easier for upstart

svn path=/nixos/trunk/; revision=29287
---
 modules/services/monitoring/smartd.nix | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/modules/services/monitoring/smartd.nix b/modules/services/monitoring/smartd.nix
index 154c630e18c..5a94caefd3b 100644
--- a/modules/services/monitoring/smartd.nix
+++ b/modules/services/monitoring/smartd.nix
@@ -70,16 +70,14 @@ in
 
   config = mkIf cfg.enable {
 
-    jobs.smartd =
-      { description = "S.M.A.R.T. Daemon";
+    jobs.smartd = {
+        description = "S.M.A.R.T. Daemon";
 
         environment.TZ = config.time.timeZone;
 
         startOn = "started syslogd";
 
-        daemonType = "daemon";
-
-        exec = "${pkgs.smartmontools}/sbin/smartd --pidfile=/var/run/smartd.pid ${smartdFlags}";
+        exec = "${pkgs.smartmontools}/sbin/smartd --no-fork --pidfile=/var/run/smartd.pid ${smartdFlags}";
       };
 
   };
-- 
GitLab


From 61072f89959e5d276b90d2fe36a2142ade83fbe0 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 15 Sep 2011 15:13:46 +0000
Subject: [PATCH 3156/5331] * Add a module for a Flash policy server.

svn path=/nixos/trunk/; revision=29296
---
 modules/module-list.nix                      |  1 +
 modules/services/networking/flashpolicyd.nix | 84 ++++++++++++++++++++
 2 files changed, 85 insertions(+)
 create mode 100644 modules/services/networking/flashpolicyd.nix

diff --git a/modules/module-list.nix b/modules/module-list.nix
index f4d593b52fa..860922b5672 100644
--- a/modules/module-list.nix
+++ b/modules/module-list.nix
@@ -108,6 +108,7 @@
   ./services/networking/dnsmasq.nix
   ./services/networking/ejabberd.nix
   ./services/networking/firewall.nix
+  ./services/networking/flashpolicyd.nix
   ./services/networking/git-daemon.nix
   ./services/networking/gnunet.nix
   ./services/networking/gvpe.nix
diff --git a/modules/services/networking/flashpolicyd.nix b/modules/services/networking/flashpolicyd.nix
new file mode 100644
index 00000000000..f5bc550ab5f
--- /dev/null
+++ b/modules/services/networking/flashpolicyd.nix
@@ -0,0 +1,84 @@
+{ config, pkgs, ... }:
+
+with pkgs.lib;
+
+let
+
+  cfg = config.services.flashpolicyd;
+
+  flashpolicyd = pkgs.stdenv.mkDerivation {
+    name = "flashpolicyd-0.6";
+
+    src = pkgs.fetchurl {
+      name = "flashpolicyd_v0.6.zip";
+      url = "http://www.adobe.com/content/dotcom/en/devnet/flashplayer/articles/socket_policy_files/_jcr_content/articlePrerequistes/multiplefiles/node_1277808777771/file.res/flashpolicyd_v0.6%5B1%5D.zip";
+      sha256 = "16zk237233npwfq1m4ksy4g5lzy1z9fp95w7pz0cdlpmv0fv9sm3";
+    };
+
+    buildInputs = [ pkgs.unzip pkgs.perl ];
+
+    installPhase = "mkdir $out; cp -pr * $out/; chmod +x $out/*/*.pl";
+  };
+
+  flashpolicydWrapper = pkgs.writeScriptBin "flashpolicyd"
+    ''
+      #! ${pkgs.stdenv.shell}
+      exec ${flashpolicyd}/Perl_xinetd/in.flashpolicyd.pl \
+        --file=${pkgs.writeText "flashpolixy.xml" cfg.policy} \
+        2> /dev/null
+    '';
+
+in
+
+{
+
+  ###### interface
+
+  options = {
+  
+    services.flashpolicyd = {
+    
+      enable = mkOption {
+        default = false;
+        description =
+          ''
+            Whether to enable the Flash Policy server.  This is
+            necessary if you want Flash applications to make
+            connections to your server.
+          '';
+      };
+      
+      policy = mkOption {
+        default =
+          ''
+            <?xml version="1.0"?>
+            <!DOCTYPE cross-domain-policy SYSTEM "/xml/dtds/cross-domain-policy.dtd">
+            <cross-domain-policy> 
+              <site-control permitted-cross-domain-policies="master-only"/>
+              <allow-access-from domain="*" to-ports="*" />
+            </cross-domain-policy>
+          '';
+        description = "The policy to be served.  The default is to allow connections from any domain to any port.";
+      };
+
+    };
+
+  };
+
+
+  ###### implementation
+
+  config = mkIf cfg.enable {
+
+    services.xinetd.enable = true;
+
+    services.xinetd.services = singleton
+      { name = "flashpolicy";
+        port = 843;
+        unlisted = true;
+        server = "${flashpolicydWrapper}/bin/flashpolicyd";
+      };
+
+  };
+
+}
-- 
GitLab


From 4fff0d2291e68aa472f2e0904e2b2584e6d5885c Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 15 Sep 2011 15:33:34 +0000
Subject: [PATCH 3157/5331] * Log sitecopy runs.

svn path=/nixos/trunk/; revision=29299
---
 modules/services/backup/sitecopy-backup.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/services/backup/sitecopy-backup.nix b/modules/services/backup/sitecopy-backup.nix
index 35ce55ef06c..5c7f7ffae5b 100644
--- a/modules/services/backup/sitecopy-backup.nix
+++ b/modules/services/backup/sitecopy-backup.nix
@@ -8,7 +8,7 @@ let
   stateDir = "/var/spool/sitecopy";
 
   sitecopyCron = backup : ''
-    ${if backup ? period then backup.period else config.services.sitecopy.period} root ${sitecopy}/bin/sitecopy --storepath=${stateDir} --rcfile=${stateDir}/${backup.name}.conf --update ${backup.name}
+    ${if backup ? period then backup.period else config.services.sitecopy.period} root ${sitecopy}/bin/sitecopy --storepath=${stateDir} --rcfile=${stateDir}/${backup.name}.conf --update ${backup.name} >> /var/log/sitecopy.log 2>&1
   '';
 in
 
-- 
GitLab


From 8e13361521ab36bebe14bc3b9ccaf041d05e24ae Mon Sep 17 00:00:00 2001
From: Alexander Tsamutali <astsmtl@yandex.ru>
Date: Sat, 17 Sep 2011 13:09:38 +0000
Subject: [PATCH 3158/5331] modules/profiles/base.nix: Added gptfdisk.

svn path=/nixos/trunk/; revision=29320
---
 modules/profiles/base.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/modules/profiles/base.nix b/modules/profiles/base.nix
index d279f383735..5327728de39 100644
--- a/modules/profiles/base.nix
+++ b/modules/profiles/base.nix
@@ -55,6 +55,7 @@
     pkgs.testdisk # useful for repairing boot problems
     pkgs.mssys # for writing Microsoft boot sectors / MBRs
     pkgs.parted
+    pkgs.gptfdisk
     pkgs.ddrescue
     pkgs.ccrypt
     pkgs.cryptsetup # needed for dm-crypt volumes
-- 
GitLab


From 91a6dc6168494ca12c79e01c56090f97547adb60 Mon Sep 17 00:00:00 2001
From: Marco Maggesi <maggesi@math.unifi.it>
Date: Mon, 19 Sep 2011 13:20:09 +0000
Subject: [PATCH 3159/5331] Make VirtualBox Guest Additions use the configured
 kernel.

svn path=/nixos/trunk/; revision=29346
---
 modules/services/misc/virtualbox.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/modules/services/misc/virtualbox.nix b/modules/services/misc/virtualbox.nix
index e1384323453..573666cebb1 100644
--- a/modules/services/misc/virtualbox.nix
+++ b/modules/services/misc/virtualbox.nix
@@ -6,6 +6,7 @@ with pkgs.lib;
 let
 
   cfg = config.services.virtualbox;
+  kernel = config.boot.kernelPackages;
 
 in
 
@@ -33,14 +34,14 @@ in
 
     environment.systemPackages = [ ];
 
-    boot.extraModulePackages = [ pkgs.linuxPackages.virtualboxGuestAdditions ];
+    boot.extraModulePackages = [ kernel.virtualboxGuestAdditions ];
 
     jobs.virtualbox =
       { description = "VirtualBox service";
 
         startOn = "started udev";
 
-        exec = "${pkgs.linuxPackages.virtualboxGuestAdditions}/sbin/VBoxService";
+        exec = "${kernel.virtualboxGuestAdditions}/sbin/VBoxService";
       };
 
   };
-- 
GitLab


From df1c3dda689c18813f4f465b1346ba0989b68f82 Mon Sep 17 00:00:00 2001
From: David Guibert <david.guibert@gmail.com>
Date: Tue, 20 Sep 2011 07:14:24 +0000
Subject: [PATCH 3160/5331] autofs: add sshfs to PATH

svn path=/nixos/trunk/; revision=29392
---
 modules/services/misc/autofs.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/services/misc/autofs.nix b/modules/services/misc/autofs.nix
index 37ba3bf309c..eb3105e3a09 100644
--- a/modules/services/misc/autofs.nix
+++ b/modules/services/misc/autofs.nix
@@ -90,7 +90,7 @@ in
         stopOn = "stopping network-interfaces";
 
         environment =
-          { PATH = "${pkgs.nfsUtils}/sbin:${config.system.sbin.modprobe}/sbin";
+          { PATH = "${pkgs.nfsUtils}/sbin:${config.system.sbin.modprobe}/sbin:${pkgs.sshfsFuse}/sbin:${pkgs.sshfsFuse}/bin:$PATH";
           };
 
         preStart =
-- 
GitLab


From 7d982fd1bd009f18189c267fc1d429e9c6bcc2fd Mon Sep 17 00:00:00 2001
From: David Guibert <david.guibert@gmail.com>
Date: Tue, 20 Sep 2011 07:14:27 +0000
Subject: [PATCH 3161/5331] cups: fix smb backend

svn path=/nixos/trunk/; revision=29393
---
 modules/services/printing/cupsd.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/services/printing/cupsd.nix b/modules/services/printing/cupsd.nix
index 81ab8a1531e..2d611ad7278 100644
--- a/modules/services/printing/cupsd.nix
+++ b/modules/services/printing/cupsd.nix
@@ -17,7 +17,7 @@ let
     builder = pkgs.writeScript "additional-backends-builder.sh" ''
       PATH=${pkgs.coreutils}/bin
       mkdir -pv $out
-      if [ ! -e ${pkgs.samba}/lib/cups/backend/smb ]; then
+      if [ ! -e ${pkgs.cups}/lib/cups/backend/smb ]; then
         mkdir -pv $out/lib/cups/backend
         ln -sv ${pkgs.samba}/bin/smbspool $out/lib/cups/backend/smb
       fi
-- 
GitLab


From 229b99321f45694f6e778681715cc98ec466810f Mon Sep 17 00:00:00 2001
From: Marco Maggesi <maggesi@math.unifi.it>
Date: Wed, 21 Sep 2011 13:13:36 +0000
Subject: [PATCH 3162/5331] Make blcr module use the configured kernel

svn path=/nixos/trunk/; revision=29413
---
 modules/programs/blcr.nix | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/modules/programs/blcr.nix b/modules/programs/blcr.nix
index b6407ee603b..c80f46d642e 100644
--- a/modules/programs/blcr.nix
+++ b/modules/programs/blcr.nix
@@ -2,15 +2,14 @@
 
 let
   inherit (pkgs.lib) mkOption mkIf;
-
   cfg = config.environment.blcr;
-
-  blcrPkg = config.boot.kernelPackages.blcr;
+  kernelPkgs = config.boot.kernelPackages;
+  blcrPkg = kernelPkgs.blcr;
 
   insmod = "${pkgs.module_init_tools}/sbin/insmod";
   rmmod  = "${pkgs.module_init_tools}/sbin/rmmod";
 
-  modulesDir      = "${blcrPkg}/lib/modules/${pkgs.linux.version}";
+  modulesDir      = "${blcrPkg}/lib/modules/${kernelPkgs.kernel.version}";
   blcr_imports_ko = "${modulesDir}/blcr_imports.ko";
   blcr_ko         = "${modulesDir}/blcr.ko";
 in
-- 
GitLab


From 3fa2bbd02938d187bbe081a78da1daf417a01c1e Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 22 Sep 2011 08:26:58 +0000
Subject: [PATCH 3163/5331] * Properly shut down udevd in stage 1.  Otherwise
 there is a slight   possibility that a udevd process survives, preventing
 udevd from   starting in stage 2:

  machine# udevd[1421]: bind failed: Address already in use
  machine# udevd[1421]: error binding udev control socket

svn path=/nixos/trunk/; revision=29434
---
 modules/system/boot/stage-1-init.sh | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/modules/system/boot/stage-1-init.sh b/modules/system/boot/stage-1-init.sh
index b2d93a8fd08..a1fcfc164b6 100644
--- a/modules/system/boot/stage-1-init.sh
+++ b/modules/system/boot/stage-1-init.sh
@@ -293,7 +293,11 @@ done
 
 
 # Stop udevd.
-kill -- -1
+udevadm control --exit
+
+# Kill any remaining processes, just to be sure we're not taking any
+# with us into stage 2.
+kill -9 -- -1
 
 
 if test -n "$debug1mounts"; then fail; fi
-- 
GitLab


From c04d1477de5dc46f487bb532fb611c499e47f4b9 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 22 Sep 2011 08:27:29 +0000
Subject: [PATCH 3164/5331] svn path=/nixos/trunk/; revision=29435

---
 tests/xfce.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/xfce.nix b/tests/xfce.nix
index 0975cd88883..ce9f0c6b7f1 100644
--- a/tests/xfce.nix
+++ b/tests/xfce.nix
@@ -17,7 +17,7 @@
 
   testScript =
     ''
-      $machine->waitForWindow(qr/Tips/);
+      $machine->waitForWindow(qr/xfce4-panel/);
       $machine->sleep(10);
 
       # Check that logging in has given the user ownership of devices.
-- 
GitLab


From 432d71f3edf1ae78dcb5281de5f0d1e4927a3ca0 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 23 Sep 2011 14:21:36 +0000
Subject: [PATCH 3165/5331] modules/programs/bash: major clean-up and
 re-factoring of /etc/profile and /etc/bashrc

 * Moved bash-specific code from /etc/profile to /etc/bashrc.

 * Moved general Bourne shell code from /etc/bashrc to /etc/profile.

 * Added "include guards" to both files to ensure that they aren't sourced
   multiple times (which would result in lots of redundancy in $PATH, etc.).

 * Both files include each other to make sure that the correct system
   environment is always defined.

 * When the current user has installed the 'bash-completion' package in her
   $HOME/.nix-profile, programmable completion is automatically enabled in
   interactive shells.

 * The /etc/skel/.bashrc we installed has been dropped because it is redundant.

svn path=/nixos/trunk/; revision=29451
---
 modules/programs/bash/bash.nix       |  24 ++----
 modules/programs/bash/bashrc-user.sh |   6 --
 modules/programs/bash/bashrc.sh      | 114 ++++++++-------------------
 modules/programs/bash/profile.sh     |  74 ++++++++++++++---
 4 files changed, 103 insertions(+), 115 deletions(-)
 delete mode 100644 modules/programs/bash/bashrc-user.sh

diff --git a/modules/programs/bash/bash.nix b/modules/programs/bash/bash.nix
index 92c2a5b7755..dc36ab7d97f 100644
--- a/modules/programs/bash/bash.nix
+++ b/modules/programs/bash/bash.nix
@@ -26,31 +26,21 @@ in
   require = [options];
 
   environment.etc =
-    [ { # /etc/bashrc: script executed when the shell starts as a
-        # non-login shell.  /etc/profile also sources this file, so
-        # most global configuration (such as environment variables)
-        # should go into this script.
+    [ { # Script executed when the shell starts as a login shell.
         source = pkgs.substituteAll {
-          src = ./bashrc.sh;
-
-          bash = pkgs.bash;
+          src = ./profile.sh;
           wrapperDir = config.security.wrapperDir;
           modulesTree = config.system.modulesTree;
           shellInit = config.environment.shellInit;
         };
-        target = "bashrc";
-      }
-
-      { # Script executed when the shell starts as a login shell.
-        source = ./profile.sh;
         target = "profile";
       }
 
-      { # Template for ~/.bashrc: script executed when the shell
-        # starts as a non-login shell.
-        source = ./bashrc-user.sh;
-        target = "skel/.bashrc";
-        mode = "0644";
+      { # /etc/bashrc: executed every time a bash starts. Sources
+        # /etc/profile to ensure that the system environment is
+        # configured properly.
+         source = ./bashrc.sh;
+         target = "bashrc";
       }
 
       { # Configuration for readline in bash.
diff --git a/modules/programs/bash/bashrc-user.sh b/modules/programs/bash/bashrc-user.sh
deleted file mode 100644
index ef536c132c9..00000000000
--- a/modules/programs/bash/bashrc-user.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/sh
-
-if [ -f /etc/bashrc ]
-then
-    source /etc/bashrc
-fi
diff --git a/modules/programs/bash/bashrc.sh b/modules/programs/bash/bashrc.sh
index fc0d0efae62..ef01fb8049a 100644
--- a/modules/programs/bash/bashrc.sh
+++ b/modules/programs/bash/bashrc.sh
@@ -1,92 +1,40 @@
-if [ -n "$NOSYSBASHRC" ]; then
+# /etc/bashrc: DO NOT EDIT -- this file has been generated automatically.
+
+if [ \( -n "${SYSTEM_ETC_BASHRC_HAS_BEEN_SOURCED:-}" \) -o \( -n "${NOSYSBASHRC:-}" \) ]; then
     return
+else
+    SYSTEM_ETC_BASHRC_HAS_BEEN_SOURCED="1"
 fi
 
-# In interactive shells, check the window size after every command.
+. /etc/profile
+
+# If we are an interactive shell ...
 if [ -n "$PS1" ]; then
+    # Check the window size after every command.
     shopt -s checkwinsize
-fi
-
-# Initialise a bunch of environment variables.
-export LD_LIBRARY_PATH=/var/run/opengl-driver/lib:/var/run/opengl-driver-32/lib # !!! only set if needed
-export MODULE_DIR=@modulesTree@/lib/modules
-export NIXPKGS_CONFIG=/nix/etc/config.nix
-export NIXPKGS_ALL=/etc/nixos/nixpkgs
-export NIX_PATH=nixpkgs=/etc/nixos/nixpkgs:nixos=/etc/nixos/nixos:nixos-config=/etc/nixos/configuration.nix:services=/etc/nixos/services
-export PAGER="less -R"
-export EDITOR=nano
-export LOCATE_PATH=/var/cache/locatedb
-
-
-# Include the various profiles in the appropriate environment variables.
-NIX_USER_PROFILE_DIR=/nix/var/nix/profiles/per-user/$USER
-
-NIX_PROFILES="/var/run/current-system/sw /nix/var/nix/profiles/default $HOME/.nix-profile"
-
-unset PATH INFOPATH PKG_CONFIG_PATH PERL5LIB ALSA_PLUGIN_DIRS GST_PLUGIN_PATH KDEDIRS
-unset QT_PLUGIN_PATH QTWEBKIT_PLUGIN_PATH STRIGI_PLUGIN_PATH XDG_CONFIG_DIRS XDG_DATA_DIRS
-
-for i in $NIX_PROFILES; do # !!! reverse
-    # We have to care not leaving an empty PATH element, because that means '.' to Linux
-    export PATH=$i/bin:$i/sbin:$i/lib/kde4/libexec${PATH:+:}$PATH
-    export INFOPATH=$i/info:$i/share/info${INFOPATH:+:}$INFOPATH
-    export PKG_CONFIG_PATH="$i/lib/pkgconfig${PKG_CONFIG_PATH:+:}$PKG_CONFIG_PATH"
-
-    # "lib/site_perl" is for backwards compatibility with packages
-    # from Nixpkgs <= 0.12.
-    export PERL5LIB="$i/lib/perl5/site_perl:$i/lib/site_perl${PERL5LIB:+:}$PERL5LIB"
-
-    # ALSA plugins
-    export ALSA_PLUGIN_DIRS="$i/lib/alsa-lib${ALSA_PLUGIN_DIRS:+:}$ALSA_PLUGIN_DIRS"
-
-    # GStreamer.
-    export GST_PLUGIN_PATH="$i/lib/gstreamer-0.10${GST_PLUGIN_PATH:+:}$GST_PLUGIN_PATH"
-
-    # KDE/Gnome stuff.
-    export KDEDIRS=$i${KDEDIRS:+:}$KDEDIRS
-    export STRIGI_PLUGIN_PATH=$i/lib/strigi/${STRIGI_PLUGIN_PATH:+:}$STRIGI_PLUGIN_PATH
-    export QT_PLUGIN_PATH=$i/lib/qt4/plugins:$i/lib/kde4/plugins${QT_PLUGIN_PATH:+:}:$QT_PLUGIN_PATH
-    export QTWEBKIT_PLUGIN_PATH=$i/lib/mozilla/plugins/${QTWEBKIT_PLUGIN_PATH:+:}$QTWEBKIT_PLUGIN_PATH
-    export XDG_CONFIG_DIRS=$i/etc/xdg${XDG_CONFIG_DIRS:+:}$XDG_CONFIG_DIRS
-    export XDG_DATA_DIRS=$i/share${XDG_DATA_DIRS:+:}$XDG_DATA_DIRS
-done
 
-@shellInit@
-
-
-# Search directory for Aspell dictionaries.
-export ASPELL_CONF="dict-dir $HOME/.nix-profile/lib/aspell"
-
-
-# ~/bin and the setuid wrappers override other bin directories.
-export PATH=$HOME/bin:@wrapperDir@:$PATH
-
-
-# Provide a nice prompt.
-PROMPT_COLOR="1;31m"
-let $UID && PROMPT_COLOR="1;32m"
-PS1="\n\[\033[$PROMPT_COLOR\][\u@\h:\w]\\$\[\033[0m\] "
-if test "$TERM" = "xterm"; then
-    PS1="\[\033]2;\h:\u:\w\007\]$PS1"
-fi
-
-
-# Some aliases.
-alias ls="ls --color=tty"
-alias ll="ls -l"
-alias l="ls -alh"
-alias which="type -P"
-
-# The "non-interactive" Bash build does not support programmable
-# completion so check whether it's available.
-if false; then
-#if shopt -q progcomp 2> /dev/null; then
-    # Completion.
-    if [ -z "$BASH_COMPLETION_DIR" -a -d "@bash@/etc/bash_completion.d" ]; then
-	BASH_COMPLETION_DIR="@bash@/etc/bash_completion.d"
+    # Provide a nice prompt.
+    PROMPT_COLOR="1;31m"
+    let $UID && PROMPT_COLOR="1;32m"
+    PS1="\n\[\033[$PROMPT_COLOR\][\u@\h:\w]\\$\[\033[0m\] "
+    if test "$TERM" = "xterm"; then
+        PS1="\[\033]2;\h:\u:\w\007\]$PS1"
     fi
-    if [ -z "$BASH_COMPLETION" -a -f "@bash@/etc/bash_completion" ]; then
-	BASH_COMPLETION="@bash@/etc/bash_completion"
-	source "$BASH_COMPLETION"
+
+    # Check whether we're running a version of Bash that has support for
+    # programmable completion. If we do, and if the current user has
+    # installed the package 'bash-completion' in her $HOME/.nix-profile,
+    # then completion is enabled automatically.
+    if [ -f "$HOME/.nix-profile/etc/bash_completion" ]; then
+        if [ -d "$HOME/.nix-profile/etc/bash_completion.d" ]; then
+            if shopt -q progcomp &>/dev/null; then
+                BASH_COMPLETION_DIR="$HOME/.nix-profile/etc/bash_completion.d"
+                BASH_COMPLETION="$HOME/.nix-profile/etc/bash_completion"
+                . "$BASH_COMPLETION"
+            fi
+        fi
     fi
+
+    # Some aliases.
+    alias which="type -P"
 fi
diff --git a/modules/programs/bash/profile.sh b/modules/programs/bash/profile.sh
index c053f861400..36c2d520ec0 100644
--- a/modules/programs/bash/profile.sh
+++ b/modules/programs/bash/profile.sh
@@ -1,10 +1,58 @@
-# This file is executed by all login shells.  Don't ask what a login
-# shell is, nobody knows.  Most global environment variables should go
-# in /etc/bashrc, which is by default included by non-login shells,
-# but which we include here as well.
+# /etc/profile: DO NOT EDIT -- this file has been generated automatically.
 
-source /etc/bashrc
+if [ -n "${SYSTEM_ETC_PROFILE_HAS_BEEN_SOURCED:-}" ]; then
+    return
+else
+    SYSTEM_ETC_PROFILE_HAS_BEEN_SOURCED="1"
+fi
+
+# Initialise a bunch of environment variables.
+export LD_LIBRARY_PATH=/var/run/opengl-driver/lib:/var/run/opengl-driver-32/lib # !!! only set if needed
+export MODULE_DIR=@modulesTree@/lib/modules
+export NIXPKGS_CONFIG=/nix/etc/config.nix
+export NIXPKGS_ALL=/etc/nixos/nixpkgs
+export NIX_PATH=nixpkgs=/etc/nixos/nixpkgs:nixos=/etc/nixos/nixos:nixos-config=/etc/nixos/configuration.nix:services=/etc/nixos/services
+export PAGER="less -R"
+export EDITOR=nano
+export LOCATE_PATH=/var/cache/locatedb
+
+# Include the various profiles in the appropriate environment variables.
+NIX_USER_PROFILE_DIR=/nix/var/nix/profiles/per-user/$USER
+NIX_PROFILES="/var/run/current-system/sw /nix/var/nix/profiles/default $HOME/.nix-profile"
+
+unset PATH INFOPATH PKG_CONFIG_PATH PERL5LIB ALSA_PLUGIN_DIRS GST_PLUGIN_PATH KDEDIRS
+unset QT_PLUGIN_PATH QTWEBKIT_PLUGIN_PATH STRIGI_PLUGIN_PATH XDG_CONFIG_DIRS XDG_DATA_DIRS
+
+for i in $NIX_PROFILES; do # !!! reverse
+    # We have to care not leaving an empty PATH element, because that means '.' to Linux
+    export PATH=$i/bin:$i/sbin:$i/lib/kde4/libexec${PATH:+:}$PATH
+    export INFOPATH=$i/info:$i/share/info${INFOPATH:+:}$INFOPATH
+    export PKG_CONFIG_PATH="$i/lib/pkgconfig${PKG_CONFIG_PATH:+:}$PKG_CONFIG_PATH"
+
+    # "lib/site_perl" is for backwards compatibility with packages
+    # from Nixpkgs <= 0.12.
+    export PERL5LIB="$i/lib/perl5/site_perl:$i/lib/site_perl${PERL5LIB:+:}$PERL5LIB"
+
+    # ALSA plugins
+    export ALSA_PLUGIN_DIRS="$i/lib/alsa-lib${ALSA_PLUGIN_DIRS:+:}$ALSA_PLUGIN_DIRS"
+
+    # GStreamer.
+    export GST_PLUGIN_PATH="$i/lib/gstreamer-0.10${GST_PLUGIN_PATH:+:}$GST_PLUGIN_PATH"
 
+    # KDE/Gnome stuff.
+    export KDEDIRS=$i${KDEDIRS:+:}$KDEDIRS
+    export STRIGI_PLUGIN_PATH=$i/lib/strigi/${STRIGI_PLUGIN_PATH:+:}$STRIGI_PLUGIN_PATH
+    export QT_PLUGIN_PATH=$i/lib/qt4/plugins:$i/lib/kde4/plugins${QT_PLUGIN_PATH:+:}:$QT_PLUGIN_PATH
+    export QTWEBKIT_PLUGIN_PATH=$i/lib/mozilla/plugins/${QTWEBKIT_PLUGIN_PATH:+:}$QTWEBKIT_PLUGIN_PATH
+    export XDG_CONFIG_DIRS=$i/etc/xdg${XDG_CONFIG_DIRS:+:}$XDG_CONFIG_DIRS
+    export XDG_DATA_DIRS=$i/share${XDG_DATA_DIRS:+:}$XDG_DATA_DIRS
+done
+
+# Search directory for Aspell dictionaries.
+export ASPELL_CONF="dict-dir $HOME/.nix-profile/lib/aspell"
+
+# ~/bin and the setuid wrappers override other bin directories.
+export PATH=$HOME/bin:@wrapperDir@:$PATH
 
 # Set up the per-user profile.
 mkdir -m 0755 -p $NIX_USER_PROFILE_DIR
@@ -13,7 +61,7 @@ if test "$(stat --printf '%u' $NIX_USER_PROFILE_DIR)" != "$(id -u)"; then
 fi
 
 if ! test -L $HOME/.nix-profile; then
-    echo "creating $HOME/.nix-profile" >&2 
+    echo "creating $HOME/.nix-profile" >&2
     if test "$USER" != root; then
         ln -s $NIX_USER_PROFILE_DIR/profile $HOME/.nix-profile
     else
@@ -22,7 +70,6 @@ if ! test -L $HOME/.nix-profile; then
     fi
 fi
 
-
 # Create the per-user garbage collector roots directory.
 NIX_USER_GCROOTS_DIR=/nix/var/nix/gcroots/per-user/$USER
 mkdir -m 0755 -p $NIX_USER_GCROOTS_DIR
@@ -30,7 +77,6 @@ if test "$(stat --printf '%u' $NIX_USER_GCROOTS_DIR)" != "$(id -u)"; then
     echo "WARNING: bad ownership on $NIX_USER_GCROOTS_DIR" >&2
 fi
 
-
 # Set up a default Nix expression from which to install stuff.
 if test ! -e $HOME/.nix-defexpr -o -L $HOME/.nix-defexpr; then
     echo "creating $HOME/.nix-defexpr" >&2
@@ -42,8 +88,18 @@ if test ! -e $HOME/.nix-defexpr -o -L $HOME/.nix-defexpr; then
     fi
 fi
 
+@shellInit@
+
+# Some aliases.
+alias ls="ls --color=tty"
+alias ll="ls -l"
+alias l="ls -alh"
 
 # Read system-wide modifications.
 if test -f /etc/profile.local; then
-    source /etc/profile.local
+    . /etc/profile.local
+fi
+
+if [ -n "${BASH_VERSION:-}" ]; then
+    . /etc/bashrc
 fi
-- 
GitLab


From 84a37365c27c3027ab70b143a26aa3730b31c375 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 23 Sep 2011 14:41:22 +0000
Subject: [PATCH 3166/5331] modules/services/printing/cupsd.nix: ensure that
 /etc/cups exists before the daemon is run

CUPS is really unhappy when /etc/cups doesn't exist, and without that
directory it's going to mess up file permissions of /nix/store, the web
front-end won't work, and probably all kinds of other stuff is broken
that I didn't notice yet. :-(

svn path=/nixos/trunk/; revision=29452
---
 modules/services/printing/cupsd.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/modules/services/printing/cupsd.nix b/modules/services/printing/cupsd.nix
index 2d611ad7278..e33e2245dbc 100644
--- a/modules/services/printing/cupsd.nix
+++ b/modules/services/printing/cupsd.nix
@@ -133,6 +133,7 @@ in
 
         preStart =
           ''
+            mkdir -m 0755 -p /etc/cups
             mkdir -m 0755 -p ${logDir}
             mkdir -m 0700 -p /var/cache/cups
             mkdir -m 0700 -p /var/spool/cups
-- 
GitLab


From 32d6a441a590c59df7350fcd7ca2d0390e163420 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 26 Sep 2011 09:41:40 +0000
Subject: [PATCH 3167/5331] modules/tasks/network-interfaces.nix: create
 network bridges with "forward delay" set to zero

This change obsoletes the need to increase the IPv6 "router_solicitations" parameter.

svn path=/nixos/trunk/; revision=29493
---
 modules/tasks/network-interfaces.nix | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/modules/tasks/network-interfaces.nix b/modules/tasks/network-interfaces.nix
index f3603127b26..27ca840ecdb 100644
--- a/modules/tasks/network-interfaces.nix
+++ b/modules/tasks/network-interfaces.nix
@@ -214,19 +214,14 @@ in
                 echo "Creating bridge ${n}..."
                 ${pkgs.bridge_utils}/sbin/brctl addbr "${n}"
 
+                # Set bridge's hello time to 0 to avoid startup delays.
+                ${pkgs.bridge_utils}/sbin/brctl setfd "${n}" 0
+
                 ${flip concatMapStrings v.interfaces (i: ''
                   ${pkgs.bridge_utils}/sbin/brctl addif "${n}" "${i}"
                   ip addr flush dev "${i}"
                 '')}
 
-                # For some reason enslaving an interface to a bridge
-                # causes traffic to be blocked for a few seconds, long
-                # enough for IPv6 router solicitations to get lost.
-                # So increase the number of attemts.
-                ${optionalString cfg.enableIPv6 ''
-                  echo 5 > /proc/sys/net/ipv6/conf/${n}/router_solicitations
-                ''}
-
                 # !!! Should delete (brctl delif) any interfaces that
                 # no longer belong to the bridge.
             '')))}
-- 
GitLab


From 3a201ef6a78cfcd6a98a1c136543fd38711dbbbe Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Wed, 28 Sep 2011 22:43:53 +0000
Subject: [PATCH 3168/5331] Enable building ISOs for aufs3 kernels

svn path=/nixos/trunk/; revision=29538
---
 modules/installer/cd-dvd/iso-image.nix | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/modules/installer/cd-dvd/iso-image.nix b/modules/installer/cd-dvd/iso-image.nix
index d565435ffd2..daeebde76cf 100644
--- a/modules/installer/cd-dvd/iso-image.nix
+++ b/modules/installer/cd-dvd/iso-image.nix
@@ -154,12 +154,15 @@ in
   # We need squashfs in the initrd to mount the compressed Nix store,
   # and aufs to make the root filesystem appear writable.
   boot.extraModulePackages =
-    optional
-      (! ( config.boot.kernelPackages.kernel.features ? aufs || config.boot.kernelPackages.kernel.features ? aufs2_1 ) )
+    let features = config.boot.kernelPackages.kernel.features; in
+
+    pkgs.stdenv.lib.singleton (if features ? aufs2 && features.aufs2 then
       config.boot.kernelPackages.aufs2
-    ++ optional
-      ( config.boot.kernelPackages.kernel.features ? aufs2_1 )
-      config.boot.kernelPackages.aufs2_1;
+    else if features ? aufs2_1 && features.aufs2_1 then
+      config.boot.kernelPackages.aufs2_1
+    else if features ? aufs3 && features.aufs3 then
+      config.boot.kernelPackages.aufs3
+    else abort "This kernel doesn't have aufs enabled");
 
   boot.initrd.availableKernelModules = [ "aufs" "squashfs" "iso9660" ];
 
-- 
GitLab


From 47a19416961e0367b929714fcb5251e4d13a1bd0 Mon Sep 17 00:00:00 2001
From: Nicolas Pierron <nicolas.b.pierron@gmail.com>
Date: Sun, 2 Oct 2011 13:24:10 +0000
Subject: [PATCH 3169/5331] LDAP non-anonymous bind.

Patch by Rickard Nilsson.

svn path=/nixos/trunk/; revision=29563
---
 modules/config/ldap.nix | 41 ++++++++++++++++++++++++++++++++++++++---
 1 file changed, 38 insertions(+), 3 deletions(-)

diff --git a/modules/config/ldap.nix b/modules/config/ldap.nix
index 56f693f362e..4c2924b5975 100644
--- a/modules/config/ldap.nix
+++ b/modules/config/ldap.nix
@@ -2,7 +2,7 @@
 
 ###### interface
 let
-  inherit (pkgs.lib) mkOption mkIf;
+  inherit (pkgs.lib) mkOption mkIf optionalString stringAfter;
 
   options = {
     users = {
@@ -39,6 +39,27 @@ let
           ";
         };
 
+        bind = {
+          distinguishedName = mkOption {
+            default = "";
+            example = "cn=admin,dc=example,dc=com";
+            type = with pkgs.lib.types; string;
+            description = "
+              The distinguished name to bind to the LDAP server with. If this
+              is not specified, an anonymous bind will be done.
+            ";
+          };
+
+          password = mkOption {
+            default = "/etc/ldap/bind.password";
+            type = with pkgs.lib.types; string;
+            description = "
+              The path to a file containing the credentials to use when binding
+              to the LDAP server (if not binding anonymously).
+            ";
+          };
+        };
+
       };
     };
   };
@@ -62,10 +83,14 @@ mkIf config.users.ldap.enable {
             uri ${config.users.ldap.server}
             base ${config.users.ldap.base}
 
-            ${if config.users.ldap.useTLS then ''
+            ${optionalString config.users.ldap.useTLS ''
               ssl start_tls
               tls_checkpeer no
-            '' else ""}
+            ''}
+
+            ${optionalString (config.users.ldap.bind.distinguishedName != "") ''
+              binddn ${config.users.ldap.bind.distinguishedName}
+            ''}
           '';
         target = "ldap.conf";
       }
@@ -73,4 +98,14 @@ mkIf config.users.ldap.enable {
     ];
   };
 
+  system.activationScripts.ldap = stringAfter [ "etc" ] (
+    optionalString (config.users.ldap.bind.distinguishedName != "") ''
+      if test -f "${config.users.ldap.bind.password}" ; then
+        echo "bindpw $(cat ${config.users.ldap.bind.password})" | cat /etc/ldap.conf - > /etc/ldap.conf.bindpw
+        mv -fT /etc/ldap.conf.bindpw /etc/ldap.conf
+        chmod 600 /etc/ldap.conf
+      fi
+    ''
+  );
+
 }
-- 
GitLab


From 18d52f8f4b24d5436d474bdda74d64b8a31d2c99 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 4 Oct 2011 08:45:15 +0000
Subject: [PATCH 3170/5331] modules/installer/scan/not-detected.nix: don't
 depend on pkgs.rt73fw

The rt73 firmware has disappeared from the upstream server, and we don't
have a new URL yet.

svn path=/nixos/trunk/; revision=29620
---
 modules/installer/scan/not-detected.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/modules/installer/scan/not-detected.nix b/modules/installer/scan/not-detected.nix
index ddb296b0487..1a5beae9890 100644
--- a/modules/installer/scan/not-detected.nix
+++ b/modules/installer/scan/not-detected.nix
@@ -13,7 +13,8 @@ with pkgs.lib;
     ];
 
   config = mkDefault {
-    # Wireless card firmware
-    networking.enableRT73Firmware = true;
+    # That wireless card firmware not enabled because the corresponding
+    # build expression 'rt73fw' is broken.
+    networking.enableRT73Firmware = false;
   };
 }
-- 
GitLab


From 0f816374c7063bc5e568ea4442ce3b87b7aa9c02 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 5 Oct 2011 12:24:53 +0000
Subject: [PATCH 3171/5331] * Use shm and posixsem for the SSL session cache.

svn path=/nixos/trunk/; revision=29658
---
 modules/services/web-servers/apache-httpd/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/services/web-servers/apache-httpd/default.nix b/modules/services/web-servers/apache-httpd/default.nix
index a7e0472cd3f..4894276e1d3 100644
--- a/modules/services/web-servers/apache-httpd/default.nix
+++ b/modules/services/web-servers/apache-httpd/default.nix
@@ -143,9 +143,9 @@ let
 
 
   sslConf = ''
-    SSLSessionCache dbm:${mainCfg.stateDir}/ssl_scache
+    SSLSessionCache shm:${mainCfg.stateDir}/ssl_scache(512000)
 
-    SSLMutex file:${mainCfg.stateDir}/ssl_mutex
+    SSLMutex posixsem
 
     SSLRandomSeed startup builtin
     SSLRandomSeed connect builtin
-- 
GitLab


From 00ce9aaf1ad3ffd4f90af6135de8b9444f30a21c Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 6 Oct 2011 11:29:44 +0000
Subject: [PATCH 3172/5331] * svn.nixos.org -> nixos.org.

svn path=/nixos/trunk/; revision=29690
---
 doc/manual/development.xml                 | 6 +++---
 doc/manual/installation.xml                | 6 +++---
 doc/manual/options-to-docbook.xsl          | 2 +-
 modules/installer/tools/nixos-checkout.nix | 4 ++--
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/doc/manual/development.xml b/doc/manual/development.xml
index 30d9be2b62c..8318c0bd04a 100644
--- a/doc/manual/development.xml
+++ b/doc/manual/development.xml
@@ -410,7 +410,7 @@ $ qemu-system-x86_64 -kernel ./kernel/bzImage -initrd ./initrd/initrd -hda /dev/
     crashes).  It will first build or download all the dependencies of
     the test (e.g., all packages needed to run a NixOS VM). The test
     is defined in <link
-    xlink:href="https://svn.nixos.org/repos/nix/nixos/trunk/tests/nfs.nix">
+    xlink:href="https://nixos.org/repos/nix/nixos/trunk/tests/nfs.nix">
     <filename>tests/nfs.nix</filename></link>.  If the test succeeds,
     <command>nix-build</command> will place a symlink
     <filename>./result</filename> in the current directory pointing at
@@ -483,7 +483,7 @@ $ qemu-system-x86_64 -kernel ./kernel/bzImage -initrd ./initrd/initrd -hda /dev/
   <para>
     The actual Nix programming interface to VM testing is in NixOS,
     under <link
-    xlink:href="https://svn.nixos.org/repos/nix/nixos/trunk/lib/testing.nix">
+    xlink:href="https://nixos.org/repos/nix/nixos/trunk/lib/testing.nix">
     <filename>lib/testing.nix</filename></link>.  This file defines a
     function which takes an attribute set containing a
     <literal>nixpkgs</literal> attribute (the path to a Nixpkgs
@@ -496,7 +496,7 @@ $ qemu-system-x86_64 -kernel ./kernel/bzImage -initrd ./initrd/initrd -hda /dev/
   <para>
     The <literal>makeTest</literal> function takes a function similar to
     that found in <link
-    xlink:href="https://svn.nixos.org/repos/nix/nixos/trunk/tests/nfs.nix">
+    xlink:href="https://nixos.org/repos/nix/nixos/trunk/tests/nfs.nix">
     <filename>tests/nfs.nix</filename></link> (discussed above).  It
     returns an attribute set containing (among others):
 
diff --git a/doc/manual/installation.xml b/doc/manual/installation.xml
index 6ae5906c860..b47731ffec9 100644
--- a/doc/manual/installation.xml
+++ b/doc/manual/installation.xml
@@ -35,11 +35,11 @@ $ nix-channel --update</screen>
   </para></listitem>
 
   <listitem><para>Check out NixOS from <link
-  xlink:href="https://svn.nixos.org/repos/nix/nixos/trunk"/> as
+  xlink:href="https://nixos.org/repos/nix/nixos/trunk"/> as
   <literal>nixos</literal>.</para></listitem>
 
   <listitem><para>Check out Nixpkgs from
-  <link xlink:href="https://svn.nixos.org/repos/nix/nixpkgs/trunk"/> as
+  <link xlink:href="https://nixos.org/repos/nix/nixpkgs/trunk"/> as
   <literal>nixpkgs</literal>.</para></listitem>
 
   <listitem><para>Build the ISO image:
@@ -175,7 +175,7 @@ $ nixos-option --install</screen>
     <para>Examples are available in
     <filename>/etc/nixos/nixos/doc/config-examples</filename> and some
     actual NixOS configuration can be found at <link
-    xlink:href="https://svn.nixos.org/repos/nix/configurations/trunk/"/>.</para>
+    xlink:href="https://nixos.org/repos/nix/configurations/trunk/"/>.</para>
 
   </listitem>
 
diff --git a/doc/manual/options-to-docbook.xsl b/doc/manual/options-to-docbook.xsl
index 46e36b29289..660ba6208b3 100644
--- a/doc/manual/options-to-docbook.xsl
+++ b/doc/manual/options-to-docbook.xsl
@@ -156,7 +156,7 @@
           or to the local filesystem. -->
           <xsl:choose>
             <xsl:when test="$revision != 'local' and contains(@value, '/modules/')">
-              <xsl:attribute name="xlink:href">https://svn.nixos.org/viewvc/nix/nixos/trunk/modules/<xsl:value-of select="substring-after(@value, '/modules/')"/>?revision=<xsl:value-of select="$revision"/></xsl:attribute>
+              <xsl:attribute name="xlink:href">https://nixos.org/viewvc/nix/nixos/trunk/modules/<xsl:value-of select="substring-after(@value, '/modules/')"/>?revision=<xsl:value-of select="$revision"/></xsl:attribute>
             </xsl:when>
             <xsl:otherwise>
               <xsl:attribute name="xlink:href">file://<xsl:value-of select="@value"/></xsl:attribute>
diff --git a/modules/installer/tools/nixos-checkout.nix b/modules/installer/tools/nixos-checkout.nix
index 74a22bc84f5..f90d24b0864 100644
--- a/modules/installer/tools/nixos-checkout.nix
+++ b/modules/installer/tools/nixos-checkout.nix
@@ -28,8 +28,8 @@ let
         fi
 
         # Check out the NixOS and Nixpkgs sources.
-        ${pkgs.subversion}/bin/svn co https://svn.nixos.org/repos/nix/nixos/trunk nixos
-        ${pkgs.subversion}/bin/svn co https://svn.nixos.org/repos/nix/nixpkgs/trunk nixpkgs
+        ${pkgs.subversion}/bin/svn co https://nixos.org/repos/nix/nixos/trunk nixos
+        ${pkgs.subversion}/bin/svn co https://nixos.org/repos/nix/nixpkgs/trunk nixpkgs
       '';
    };
 
-- 
GitLab


From 298186fd067ab4937b3646eae5262569dd4f445d Mon Sep 17 00:00:00 2001
From: Joachim Schiele <js@lastlog.de>
Date: Sun, 9 Oct 2011 22:34:32 +0000
Subject: [PATCH 3173/5331] added cntlm as a system service with its own user
 'cntlm'

svn path=/nixos/trunk/; revision=29737
---
 modules/module-list.nix               |   1 +
 modules/services/networking/cntlm.nix | 113 ++++++++++++++++++++++++++
 2 files changed, 114 insertions(+)
 create mode 100644 modules/services/networking/cntlm.nix

diff --git a/modules/module-list.nix b/modules/module-list.nix
index 860922b5672..e6c72baf4e1 100644
--- a/modules/module-list.nix
+++ b/modules/module-list.nix
@@ -127,6 +127,7 @@
   ./services/networking/sabnzbd.nix
   ./services/networking/ssh/lshd.nix
   ./services/networking/ssh/sshd.nix
+  ./services/networking/cntlm.nix
   ./services/networking/tftpd.nix
   ./services/networking/vsftpd.nix
   ./services/networking/wakeonlan.nix
diff --git a/modules/services/networking/cntlm.nix b/modules/services/networking/cntlm.nix
new file mode 100644
index 00000000000..a79f7c21d7c
--- /dev/null
+++ b/modules/services/networking/cntlm.nix
@@ -0,0 +1,113 @@
+{ config, pkgs, ... }:
+
+with pkgs.lib;
+
+let
+
+  cfg = config.services.cntlm;
+  uid = config.ids.uids.cntlm;
+
+in
+
+{
+
+  options = {
+
+    services.cntlm= {
+
+      enable = mkOption {
+        default = false;
+        description = ''
+          Whether to enable the cntlm, which start a local proxy.
+        '';
+      };
+
+      username = mkOption {
+        description = ''
+          Proxy account name, without the possibility to include domain name ('at' sign is interpreted literally).
+        '';
+      };
+
+      domain = mkOption {
+        description = ''Proxy account domain/workgroup name.'';
+      };
+
+      password = mkOption {
+        default = "/etc/cntlm.password";
+        type = with pkgs.lib.types; string;
+        description = ''Proxy account password. Note: use chmod 0600 on /etc/cntlm.password for security.'';
+      };
+
+      netbios_hostname = mkOption {
+        default = config.networking.hostName;
+        description = ''
+          The hostname of your workstation.
+        '';
+      };
+
+      proxy = mkOption {
+        description = ''
+          A list of NTLM/NTLMv2 authenticating HTTP proxies.
+
+          Parent proxy, which requires authentication. The same as proxy on the command-line, can be used more than  once  to  specify  unlimited
+          number  of  proxies.  Should  one proxy fail, cntlm automatically moves on to the next one. The connect request fails only if the whole
+          list of proxies is scanned and (for each request) and found to be invalid. Command-line takes precedence over the configuration file.
+        '';
+      };
+
+      port = mkOption {
+        default = [3128];
+        description = "Specifies on which ports the cntlm daemon listens.";
+      };
+
+     extraConfig = mkOption {
+        default = "";
+        description = "Verbatim contents of <filename>cntlm.conf</filename>.";
+     };
+
+    };
+
+  };
+
+
+  ###### implementation
+
+  config = mkIf config.services.cntlm.enable {
+    users.extraUsers = singleton { 
+        name = "cntlm";
+        description = "cntlm system-wide daemon";
+        home = "/var/empty";
+    };
+
+    jobs.cntlm = {
+        description = "cntlm is an NTLM / NTLM Session Response / NTLMv2 authenticating HTTP proxy.";
+        startOn = "started network-interfaces";
+        environment = {
+        };
+
+    preStart = '' '';
+
+    daemonType = "fork";
+
+    exec =
+      ''
+        ${pkgs.cntlm}/bin/cntlm -U cntlm \
+        -c ${pkgs.writeText "cntlm_config" cfg.extraConfig}
+      '';
+    };
+
+    services.cntlm.extraConfig =
+      ''
+        # Cntlm Authentication Proxy Configuration
+        Username        ${cfg.username}
+        Domain          ${cfg.domain}
+        Password        ${cfg.password}
+        Workstation     ${cfg.netbios_hostname}
+        ${concatMapStrings (entry: "Proxy ${entry}\n") cfg.proxy}
+    
+        ${concatMapStrings (port: ''
+          Listen ${toString port}
+        '') cfg.port}
+      '';
+  };
+}
-- 
GitLab


From ce7b064a11a74ad4dfe0d827e6090525607494f6 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 11 Oct 2011 13:07:13 +0000
Subject: [PATCH 3174/5331] * Remove the remote building test.

svn path=/nixos/trunk/; revision=29756
---
 release.nix             |  1 -
 tests/default.nix       |  1 -
 tests/remote-builds.nix | 91 -----------------------------------------
 3 files changed, 93 deletions(-)
 delete mode 100644 tests/remote-builds.nix

diff --git a/release.nix b/release.nix
index 1ba256e5d3b..0a414fd9ccb 100644
--- a/release.nix
+++ b/release.nix
@@ -179,7 +179,6 @@ let
         openssh = t.openssh.test;
         proxy = t.proxy.test;
         quake3 = t.quake3.report;
-        remote_builds = t.remote_builds.test;
         #subversion = t.subversion.report;
         tomcat = t.tomcat.test;
         trac = t.trac.test;
diff --git a/tests/default.nix b/tests/default.nix
index e8c2e348b2b..fc7bdb79f76 100644
--- a/tests/default.nix
+++ b/tests/default.nix
@@ -22,7 +22,6 @@ with import ../lib/testing.nix { inherit nixpkgs system; };
   portmap = makeTest (import ./portmap.nix);
   proxy = makeTest (import ./proxy.nix);
   quake3 = makeTest (import ./quake3.nix);
-  remote_builds = makeTest (import ./remote-builds.nix);
   simple = makeTest (import ./simple.nix);
   #subversion = makeTest (import ./subversion.nix);
   tomcat = makeTest (import ./tomcat.nix);
diff --git a/tests/remote-builds.nix b/tests/remote-builds.nix
deleted file mode 100644
index 80ba9c71e73..00000000000
--- a/tests/remote-builds.nix
+++ /dev/null
@@ -1,91 +0,0 @@
-# Test Nix's remote build feature.
-
-{ pkgs, ... }:
-
-let
-
-  # The configuration of the build slaves.
-  slave =
-    { config, pkgs, ... }:
-    { services.openssh.enable = true;
-      virtualisation.writableStore = true;
-    };
-
-  # Trivial Nix expression to build remotely.
-  expr = config: nr: pkgs.writeText "expr.nix"
-    ''
-      let utils = builtins.storePath ${config.system.build.extraUtils}; in
-      derivation {
-        name = "hello-${toString nr}";
-        system = "i686-linux";
-        PATH = "''${utils}/bin";
-        builder = "''${utils}/bin/sh";
-        args = [ "-c" "echo Hello; mkdir $out; cat /proc/sys/kernel/hostname > $out/host; sleep 3" ];
-      }
-    '';
-
-in
-
-{
-
-  nodes =
-    { slave1 = slave;
-      slave2 = slave;
-
-      client =
-        { config, pkgs, ... }:
-        { nix.maxJobs = 0; # force remote building
-          nix.distributedBuilds = true;
-          nix.buildMachines =
-            [ { hostName = "slave1";
-                sshUser = "root";
-                sshKey = "/root/.ssh/id_dsa";
-                system = "i686-linux";
-                maxJobs = 1;
-              }
-              { hostName = "slave2";
-                sshUser = "root";
-                sshKey = "/root/.ssh/id_dsa";
-                system = "i686-linux";
-                maxJobs = 1;
-              }
-            ];
-          virtualisation.writableStore = true;
-          virtualisation.pathsInNixDB = [ config.system.build.extraUtils ];
-        };
-    };
-
-  testScript = { nodes }:
-    ''
-      startAll;
-
-      # Create an SSH key on the client.
-      my $key = `${pkgs.openssh}/bin/ssh-keygen -t dsa -f key -N ""`;
-      $client->succeed("mkdir -m 700 /root/.ssh");
-      $client->copyFileFromHost("key", "/root/.ssh/id_dsa");
-      $client->succeed("chmod 600 /root/.ssh/id_dsa");
-
-      # Install the SSH key on the slaves.
-      foreach my $slave ($slave1, $slave2) {
-          $slave->succeed("mkdir -m 700 /root/.ssh");
-          $slave->copyFileFromHost("key.pub", "/root/.ssh/authorized_keys");
-          $slave->waitForJob("sshd");
-          $client->succeed("ssh -o StrictHostKeyChecking=no " . $slave->name() . " 'echo hello world'");
-      }
-
-      # Perform a build and check that it was performed on the slave.
-      my $out = $client->succeed("nix-build ${expr nodes.client.config 1}");
-      $slave1->succeed("test -e $out");
-
-      # And a parallel build.
-      my ($out1, $out2) = split /\s/,
-          $client->succeed("nix-store -r \$(nix-instantiate ${expr nodes.client.config 2} ${expr nodes.client.config 3})");
-      $slave1->succeed("test -e $out1 -o -e $out2");
-      $slave2->succeed("test -e $out1 -o -e $out2");
-
-      # Test whether the build hook automatically skips unavailable slaves.
-      $slave1->block;
-      $client->succeed("nix-build ${expr nodes.client.config 4}");
-    '';
-
-}
-- 
GitLab


From 0ecda32942235f638cffceecf645b9446d069580 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 12 Oct 2011 12:21:54 +0000
Subject: [PATCH 3175/5331] * Fix the installer.simple test.

svn path=/nixos/trunk/; revision=29780
---
 tests/installer.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/installer.nix b/tests/installer.nix
index 900457dfabd..921de563ab3 100644
--- a/tests/installer.nix
+++ b/tests/installer.nix
@@ -94,7 +94,7 @@ let
       createDisk("harddisk", 4 * 1024);
 
       my $machine = createMachine({ hda => "harddisk", cdrom => glob("${iso}/iso/*.iso"),
-        qemuFlags => '${if testChannel then qemuNICFlags 1 1 2 else ""}'});
+        qemuFlags => '${optionalString testChannel (toString (qemuNICFlags 1 1 2))}'});
       $machine->start;
 
       ${optionalString testChannel ''
-- 
GitLab


From 5164ca570faf0ea4ddab8b6f9f9e4bfc8428c82d Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 13 Oct 2011 14:08:00 +0000
Subject: [PATCH 3176/5331] * Test whether restarting Upstart jobs works
 properly if there are   dependent jobs with multiple dependencies (such as
 "started portmap   and started nfs-kernel-exports").  This currently
 *doesn't* work   (and frequently breaks the NFS server in the build farm :-)
 ).

svn path=/nixos/trunk/; revision=29826
---
 tests/nfs.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/tests/nfs.nix b/tests/nfs.nix
index e4576e451b8..e8da5ce6770 100644
--- a/tests/nfs.nix
+++ b/tests/nfs.nix
@@ -48,6 +48,12 @@ in
       $client2->succeed("echo bla > /data/bar");
       $server->succeed("test -e /data/bar");
 
+      # Test whether restarting the ‘nfs-kernel-exports’ job works
+      # correctly.  In Upstart 0.6.7 this fails because the jobs that
+      # depend on ‘nfs-kernel-exports’ are stopped but not restarted.
+      $server->succeed("restart nfs-kernel-exports");
+      $client2->succeed("echo bla >> /data/bar");
+
       # Test whether we can get a lock.  !!! This step takes about 90
       # seconds because the NFS server waits that long after booting
       # before accepting new locks.
-- 
GitLab


From 38bc39c299da94ffccccfc77baa8d4580795466e Mon Sep 17 00:00:00 2001
From: Nicolas Pierron <nicolas.b.pierron@gmail.com>
Date: Sat, 15 Oct 2011 21:01:30 +0000
Subject: [PATCH 3177/5331] Add support for NFS root file system.

Patch by Rickard Nilsson.

svn path=/nixos/trunk/; revision=29855
---
 modules/system/boot/stage-1-init.sh | 6 ++++--
 modules/system/boot/stage-1.nix     | 5 +++++
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/modules/system/boot/stage-1-init.sh b/modules/system/boot/stage-1-init.sh
index a1fcfc164b6..68cbc36de86 100644
--- a/modules/system/boot/stage-1-init.sh
+++ b/modules/system/boot/stage-1-init.sh
@@ -221,8 +221,10 @@ mountFS() {
     # For CIFS mounts, retry a few times before giving up.
     local n=0
     while true; do
-        if mount -t "$fsType" -o "$options" "$device" /mnt-root$mountPoint; then
-            break
+        if [ "$fsType" = "nfs" ]; then
+          nfsmount "$device" "/mnt-root$mountPoint" && break
+        else
+          mount -t "$fsType" -o "$options" "$device" "/mnt-root$mountPoint" && break
         fi
         if [ "$fsType" != cifs -o "$n" -ge 10 ]; then fail; break; fi
         echo "retrying..."
diff --git a/modules/system/boot/stage-1.nix b/modules/system/boot/stage-1.nix
index 8936a1108d0..08cf948fea4 100644
--- a/modules/system/boot/stage-1.nix
+++ b/modules/system/boot/stage-1.nix
@@ -169,6 +169,11 @@ let
         cp ${kernelPackages.splashutils}/${kernelPackages.splashutils.helperName} $out/bin/splash_helper
       ''}
 
+      # Copy nfsmount if there is any NFS mounts required for boot.
+      ${optionalString (filter (fs: fs.fsType == "nfs" && (fs.mountPoint == "/" || fs.neededForBoot)) fileSystems != []) ''
+        cp -v ${pkgs.klibc}/lib/klibc/bin.static/nfsmount $out/bin
+      ''}
+
       ${config.boot.initrd.extraUtilsCommands}
 
       # Run patchelf to make the programs refer to the copied libraries.
-- 
GitLab


From 62dede71210df1667602acc74543a1829b1ac78f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Tue, 18 Oct 2011 21:44:06 +0000
Subject: [PATCH 3178/5331] The system health url moved.

svn path=/nixos/trunk/; revision=29881
---
 modules/services/monitoring/systemhealth.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/services/monitoring/systemhealth.nix b/modules/services/monitoring/systemhealth.nix
index 61e6a38fc9a..521218044ba 100644
--- a/modules/services/monitoring/systemhealth.nix
+++ b/modules/services/monitoring/systemhealth.nix
@@ -8,7 +8,7 @@ let
   systemhealth = with pkgs; stdenv.mkDerivation {
     name = "systemhealth-1.0";
     src = fetchurl {
-      url = "http://www.brianlane.com/software/systemhealth/src/systemhealth-1.0.tar.bz2";
+      url = "http://www.brianlane.com/static/downloads/systemhealth/systemhealth-1.0.tar.bz2";
       sha256 = "1q69lz7hmpbdpbz36zb06nzfkj651413n9icx0njmyr3xzq1j9qy";
     };
     buildInputs = [ python ];
-- 
GitLab


From b5baad31d2932407a4b95550553c0539d4991557 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Tue, 18 Oct 2011 21:44:35 +0000
Subject: [PATCH 3179/5331] The virtual consoles were launching a bash not
 aware of locales.

svn path=/nixos/trunk/; revision=29882
---
 modules/services/ttys/mingetty.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/modules/services/ttys/mingetty.nix b/modules/services/ttys/mingetty.nix
index 1de075588e7..3b7ae240d54 100644
--- a/modules/services/ttys/mingetty.nix
+++ b/modules/services/ttys/mingetty.nix
@@ -62,6 +62,10 @@ with pkgs.lib;
 
       exec = "${pkgs.mingetty}/sbin/mingetty --loginprog=${pkgs.shadow}/bin/login --noclear ${tty}";
 
+      environment = {
+        LOCALE_ARCHIVE = "/var/run/current-system/sw/lib/locale/locale-archive";
+      };
+
     }) config.services.mingetty.ttys);
 
     environment.etc = singleton
-- 
GitLab


From 9076456b1551ee5fd7434a0330ff07317369df26 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 21 Oct 2011 16:22:38 +0000
Subject: [PATCH 3180/5331] * Don't restart udevtrigger from the switch script.
  It's triggered by   udev.

svn path=/nixos/trunk/; revision=29962
---
 modules/system/activation/switch-to-configuration.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/system/activation/switch-to-configuration.sh b/modules/system/activation/switch-to-configuration.sh
index 185a7f75b0b..2586d492d9e 100644
--- a/modules/system/activation/switch-to-configuration.sh
+++ b/modules/system/activation/switch-to-configuration.sh
@@ -114,7 +114,7 @@ EOF
 	# Xen domains unless we have to.
         # TODO: Jobs should be able to declare that they should not be
 	# auto-restarted.
-        if echo "$job" | grep -q "^shutdown$\|^control-alt-delete$\|^xserver$\|^dbus$\|^disnix$\|^emergency-shell$\|^xendomains$"; then continue; fi
+        if echo "$job" | grep -q "^shutdown$\|^control-alt-delete$\|^xserver$\|^dbus$\|^disnix$\|^emergency-shell$\|^xendomains$\|^udevtrigger$"; then continue; fi
 
         if ! test -e "$oldJobs/$job.conf"; then
             echo "starting $job..."
-- 
GitLab


From 5a03989036ac206fd7e77784cb76face69a86733 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 21 Oct 2011 23:39:05 +0000
Subject: [PATCH 3181/5331] * Fix Amazon image generation (there is no
 $ORIG_TMPDIR in   runInLinuxVM anymore; use /tmp/xchg instead).

svn path=/nixos/trunk/; revision=29970
---
 modules/virtualisation/amazon-image.nix | 8 +++++---
 modules/virtualisation/nova-image.nix   | 5 +++--
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/modules/virtualisation/amazon-image.nix b/modules/virtualisation/amazon-image.nix
index c7b3184b17e..66474158c68 100644
--- a/modules/virtualisation/amazon-image.nix
+++ b/modules/virtualisation/amazon-image.nix
@@ -13,6 +13,7 @@ with pkgs.lib;
               mkdir $out
               diskImage=$out/nixos.img
               ${pkgs.vmTools.kvm}/bin/qemu-img create -f raw $diskImage "4G"
+              mv closure xchg/
             '';
           buildInputs = [ pkgs.utillinux pkgs.perl ];
           exportReferencesGraph =
@@ -31,13 +32,14 @@ with pkgs.lib;
           mount -o bind /proc /mnt/proc
 
           # Copy all paths in the closure to the filesystem.
-          storePaths=$(perl ${pkgs.pathsFromGraph} $ORIG_TMPDIR/closure)
+          storePaths=$(perl ${pkgs.pathsFromGraph} /tmp/xchg/closure)
 
           mkdir -p /mnt/nix/store
-          cp -prvd $storePaths /mnt/nix/store/
+          echo "copying everything (will take a while)..."
+          cp -prd $storePaths /mnt/nix/store/
 
           # Register the paths in the Nix database.
-          printRegistration=1 perl ${pkgs.pathsFromGraph} $ORIG_TMPDIR/closure | \
+          printRegistration=1 perl ${pkgs.pathsFromGraph} /tmp/xchg/closure | \
               chroot /mnt ${config.environment.nix}/bin/nix-store --load-db
 
           # Create the system profile to allow nixos-rebuild to work.
diff --git a/modules/virtualisation/nova-image.nix b/modules/virtualisation/nova-image.nix
index 96b637b3019..1e891c35dc0 100644
--- a/modules/virtualisation/nova-image.nix
+++ b/modules/virtualisation/nova-image.nix
@@ -13,6 +13,7 @@ with pkgs.lib;
               mkdir $out
               diskImage=$out/image
               ${pkgs.vmTools.kvm}/bin/qemu-img create -f raw $diskImage "4G"
+              mv closure xchg/
             '';
           buildInputs = [ pkgs.utillinux pkgs.perl ];
           exportReferencesGraph =
@@ -38,13 +39,13 @@ with pkgs.lib;
           mount --bind /sys /mnt/sys
 
           # Copy all paths in the closure to the filesystem.
-          storePaths=$(perl ${pkgs.pathsFromGraph} $ORIG_TMPDIR/closure)
+          storePaths=$(perl ${pkgs.pathsFromGraph} /tmp/xchg/closure)
 
           mkdir -p /mnt/nix/store
           ${pkgs.rsync}/bin/rsync -av $storePaths /mnt/nix/store/
 
           # Register the paths in the Nix database.
-          printRegistration=1 perl ${pkgs.pathsFromGraph} $ORIG_TMPDIR/closure | \
+          printRegistration=1 perl ${pkgs.pathsFromGraph} /tmp/xchg/closure | \
               chroot /mnt ${config.environment.nix}/bin/nix-store --load-db
 
           # Create the system profile to allow nixos-rebuild to work.
-- 
GitLab


From 504f4943a0d768af53dabf0f0a0c4d45ef08ea0b Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 24 Oct 2011 19:27:58 +0000
Subject: [PATCH 3182/5331] * Add a securityGroup attribute for EC2 deployment.

svn path=/nixos/trunk/; revision=30001
---
 modules/misc/deployment.nix | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/modules/misc/deployment.nix b/modules/misc/deployment.nix
index 068a9feadce..fa78de49d39 100644
--- a/modules/misc/deployment.nix
+++ b/modules/misc/deployment.nix
@@ -83,6 +83,14 @@ with pkgs.lib;
       '';
     };
 
+    deployment.ec2.securityGroup = mkOption {
+      default = "";
+      example = "my-group";
+      description = ''
+        Security group for the instance.
+      '';
+    };
+
     # Ad hoc cloud options.
 
     deployment.adhoc.controller = mkOption {
-- 
GitLab


From 0a1fee9ec8b0829e9545683dbc7a429a394f7c47 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 24 Oct 2011 23:41:33 +0000
Subject: [PATCH 3183/5331] * Add a module for the Broadcom firmware.  Also,
 add it to the   installation CD (though the kernel on the CD is not recent  
 enough yet to actually support the device).  (This is kind of   an abuse of
 "not-detected.nix".)

svn path=/nixos/trunk/; revision=30003
---
 modules/hardware/network/broadcom-43xx.nix | 5 +++++
 modules/installer/scan/not-detected.nix    | 1 +
 2 files changed, 6 insertions(+)
 create mode 100644 modules/hardware/network/broadcom-43xx.nix

diff --git a/modules/hardware/network/broadcom-43xx.nix b/modules/hardware/network/broadcom-43xx.nix
new file mode 100644
index 00000000000..f902babc4f6
--- /dev/null
+++ b/modules/hardware/network/broadcom-43xx.nix
@@ -0,0 +1,5 @@
+{ config, pkgs, ... }:
+
+{
+  hardware.firmware = [ pkgs.bcm43xx ];
+}
diff --git a/modules/installer/scan/not-detected.nix b/modules/installer/scan/not-detected.nix
index 1a5beae9890..c378fe03691 100644
--- a/modules/installer/scan/not-detected.nix
+++ b/modules/installer/scan/not-detected.nix
@@ -10,6 +10,7 @@ with pkgs.lib;
       ../../hardware/network/intel-6000.nix
       ../../hardware/network/intel-6000g2a.nix
       ../../hardware/network/intel-6000g2b.nix
+      ../../hardware/network/broadcom-43xx.nix
     ];
 
   config = mkDefault {
-- 
GitLab


From 49adbed5109f3458c7cbe0beb71adf68e85421ea Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 25 Oct 2011 00:27:07 +0000
Subject: [PATCH 3184/5331] * Add a module that provides all the Radeon
 firmwares.

svn path=/nixos/trunk/; revision=30004
---
 modules/hardware/video/radeon.nix | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 modules/hardware/video/radeon.nix

diff --git a/modules/hardware/video/radeon.nix b/modules/hardware/video/radeon.nix
new file mode 100644
index 00000000000..8836cff8a84
--- /dev/null
+++ b/modules/hardware/video/radeon.nix
@@ -0,0 +1,5 @@
+{ config, pkgs, ... }:
+
+{
+  hardware.firmware = [ pkgs.radeonR600 pkgs.radeonR700 pkgs.radeonJuniper ];
+}
-- 
GitLab


From a82bfec343c0521147b67fb92766574fa0ef0c4c Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 25 Oct 2011 01:59:39 +0000
Subject: [PATCH 3185/5331] =?UTF-8?q?*=20Add=20an=20option=20=E2=80=98depl?=
 =?UTF-8?q?oyment.ec2.zone=E2=80=99.=20=20For=20EC2=20deployments,=20this?=
 =?UTF-8?q?=20=20=20automatically=20sets=20=E2=80=98deployment.ec2.control?=
 =?UTF-8?q?ler=E2=80=99=20and=20=20=20=E2=80=98deployment.ec2.ami=E2=80=99?=
 =?UTF-8?q?=20to=20sensible=20values.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

svn path=/nixos/trunk/; revision=30005
---
 modules/misc/deployment.nix | 44 +++++++++++++++++++++++++++++++++++--
 modules/misc/nixpkgs.nix    |  2 +-
 2 files changed, 43 insertions(+), 3 deletions(-)

diff --git a/modules/misc/deployment.nix b/modules/misc/deployment.nix
index fa78de49d39..373a1a0fbd8 100644
--- a/modules/misc/deployment.nix
+++ b/modules/misc/deployment.nix
@@ -2,6 +2,8 @@
 
 with pkgs.lib;
 
+let cfg = config.deployment; in
+
 {
   options = {
 
@@ -49,15 +51,31 @@ with pkgs.lib;
     };
 
     deployment.ec2.controller = mkOption {
-      example = https://ec2.eu-west-1.amazonaws.com:443/;
+      example = https://ec2.eu-west-1.amazonaws.com/;
+      type = types.uniq types.string;
       description = ''
         URI of an Amazon EC2-compatible cloud controller web service,
-        used to create and manage virtual machines.
+        used to create and manage virtual machines.  If you're using
+        EC2, it's more convenient to set
+        <option>deployment.ec2.zone</option>.
+      '';
+    };
+
+    deployment.ec2.zone = mkOption {
+      default = "";
+      example = "us-east-1";
+      type = types.uniq types.string;
+      description = ''
+        Amazon EC2 zone in which the instance is to be deployed.  This
+        option only applies when using EC2.  It implicitly sets
+        <option>deployment.ec2.controller</option> and
+        <option>deployment.ec2.ami</option>.
       '';
     };
 
     deployment.ec2.ami = mkOption {
       example = "ami-ecb49e98";
+      type = types.uniq types.string;
       description = ''
         EC2 identifier of the AMI disk image used in the virtual
         machine.  This must be a NixOS image providing SSH access.
@@ -67,6 +85,7 @@ with pkgs.lib;
     deployment.ec2.instanceType = mkOption {
       default = "m1.small";
       example = "m1.large";
+      type = types.uniq types.string;
       description = ''
         EC2 instance type.  See <link
         xlink:href='http://aws.amazon.com/ec2/instance-types/'/> for a
@@ -128,4 +147,25 @@ with pkgs.lib;
     };
 
   };
+
+
+  config = {
+  
+    deployment.ec2 = mkIf (cfg.ec2.zone != "") {
+    
+      controller = mkDefault "https://ec2.${cfg.ec2.zone}.amazonaws.com/";
+      
+      ami = mkDefault (
+        if cfg.ec2.zone == "eu-west-1" && config.nixpkgs.system == "i686-linux" then "ami-c9f2d8bd" else
+        if cfg.ec2.zone == "eu-west-1" && config.nixpkgs.system == "x86_64-linux" then "ami-ecb49e98" else
+        if cfg.ec2.zone == "us-east-1" && config.nixpkgs.system == "x86_64-linux" then "ami-d93bf4b0" else
+        # !!! Doesn't work, not lazy enough.
+        # throw "I don't know an AMI for zone ‘${cfg.ec2.zone}’ and platform type ‘${config.nixpkgs.system}’"
+        "");
+        
+      
+    };
+        
+  };
+  
 }
diff --git a/modules/misc/nixpkgs.nix b/modules/misc/nixpkgs.nix
index 2530b5af3e5..3154c3dd1e7 100644
--- a/modules/misc/nixpkgs.nix
+++ b/modules/misc/nixpkgs.nix
@@ -59,7 +59,7 @@ in
     };
 
     nixpkgs.system = mkOption {
-      default = "";
+      default = pkgs.stdenv.system;
       description = ''
         Specifies the Nix platform type for which NixOS should be built.
         If unset, it defaults to the platform type of your host system
-- 
GitLab


From e4a6ea063280a5b40cdd1f218e07f4df5f16471e Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 25 Oct 2011 04:01:34 +0000
Subject: [PATCH 3186/5331] * Add some options that are useful in Charon
 network specifications.

svn path=/nixos/trunk/; revision=30006
---
 modules/misc/deployment.nix | 23 ++++++++++++++++++++++-
 1 file changed, 22 insertions(+), 1 deletion(-)

diff --git a/modules/misc/deployment.nix b/modules/misc/deployment.nix
index 373a1a0fbd8..b9be81ebf57 100644
--- a/modules/misc/deployment.nix
+++ b/modules/misc/deployment.nix
@@ -146,6 +146,28 @@ let cfg = config.deployment; in
       '';
     };
 
+    # Computed options useful for referring to other machines in
+    # network specifications.
+
+    networking.privateIPv4 = mkOption {
+      example = "10.1.2.3";
+      type = types.uniq types.string;
+      description = ''
+        IPv4 address of this machine within in the logical network.
+        This address can be used by other machines in the logical
+        network to reach this machine.  However, it need not be
+        visible to the outside (i.e., publicly routable).
+      '';
+    };
+
+    networking.publicIPv4 = mkOption {
+      example = "198.51.100.123";
+      type = types.uniq types.string;
+      description = ''
+        Publicly routable IPv4 address of this machine.
+      '';
+    };
+
   };
 
 
@@ -163,7 +185,6 @@ let cfg = config.deployment; in
         # throw "I don't know an AMI for zone ‘${cfg.ec2.zone}’ and platform type ‘${config.nixpkgs.system}’"
         "");
         
-      
     };
         
   };
-- 
GitLab


From a9cfde0df1c4cc1e04775e02a236d0e1406ba3f8 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 25 Oct 2011 15:27:29 +0000
Subject: [PATCH 3187/5331] * securityGroup -> securityGroups.

svn path=/nixos/trunk/; revision=30014
---
 modules/misc/deployment.nix | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/modules/misc/deployment.nix b/modules/misc/deployment.nix
index b9be81ebf57..9f3ca08c7d1 100644
--- a/modules/misc/deployment.nix
+++ b/modules/misc/deployment.nix
@@ -95,6 +95,7 @@ let cfg = config.deployment; in
 
     deployment.ec2.keyPair = mkOption {
       example = "my-keypair";
+      type = types.uniq types.string;
       description = ''
         Name of the SSH key pair to be used to communicate securely
         with the instance.  Key pairs can be created using the
@@ -102,11 +103,13 @@ let cfg = config.deployment; in
       '';
     };
 
-    deployment.ec2.securityGroup = mkOption {
-      default = "";
-      example = "my-group";
+    deployment.ec2.securityGroups = mkOption {
+      default = [ "default" ];
+      example = [ "my-group" "my-other-group" ];
+      type = types.list types.string;
       description = ''
-        Security group for the instance.
+        Security groups for the instance.  These determine the
+        firewall rules applied to the instance.
       '';
     };
 
-- 
GitLab


From 8137be6f27edd03771b6487dc86a79678519d792 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 25 Oct 2011 17:14:22 +0000
Subject: [PATCH 3188/5331] * Updated eu-west-1 64-bit image.

svn path=/nixos/trunk/; revision=30017
---
 modules/misc/deployment.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/misc/deployment.nix b/modules/misc/deployment.nix
index 9f3ca08c7d1..0f972ff07c9 100644
--- a/modules/misc/deployment.nix
+++ b/modules/misc/deployment.nix
@@ -182,7 +182,7 @@ let cfg = config.deployment; in
       
       ami = mkDefault (
         if cfg.ec2.zone == "eu-west-1" && config.nixpkgs.system == "i686-linux" then "ami-c9f2d8bd" else
-        if cfg.ec2.zone == "eu-west-1" && config.nixpkgs.system == "x86_64-linux" then "ami-ecb49e98" else
+        if cfg.ec2.zone == "eu-west-1" && config.nixpkgs.system == "x86_64-linux" then "ami-c34c71b7" else
         if cfg.ec2.zone == "us-east-1" && config.nixpkgs.system == "x86_64-linux" then "ami-d93bf4b0" else
         # !!! Doesn't work, not lazy enough.
         # throw "I don't know an AMI for zone ‘${cfg.ec2.zone}’ and platform type ‘${config.nixpkgs.system}’"
-- 
GitLab


From 0fce64bb3747cf113735f40e00d107a21e16f444 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 26 Oct 2011 18:08:58 +0000
Subject: [PATCH 3189/5331] * Specify more option types.

svn path=/nixos/trunk/; revision=30045
---
 modules/misc/deployment.nix | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/modules/misc/deployment.nix b/modules/misc/deployment.nix
index 0f972ff07c9..de8f72836fd 100644
--- a/modules/misc/deployment.nix
+++ b/modules/misc/deployment.nix
@@ -10,6 +10,7 @@ let cfg = config.deployment; in
     deployment.targetEnv = mkOption {
       default = "none";
       example = "ec2";
+      type = types.uniq types.string;
       description = ''
         This option specifies the type of the environment in which the
         machine is to be deployed by
@@ -31,6 +32,7 @@ let cfg = config.deployment; in
 
     deployment.targetHost = mkOption {
       default = config.networking.hostName;
+      type = types.uniq types.string;
       description = ''
         This option specifies a hostname or IP address which can be
         used by <command>nixos-deploy-network</command> to execute
@@ -43,6 +45,7 @@ let cfg = config.deployment; in
     deployment.ec2.type = mkOption {
       default = "ec2";
       example = "nova";
+      type = types.uniq types.string;
       description = ''
         Specifies the type of cloud.  This affects the machine
         configuration.  Current values are <literal>"ec2"</literal>
@@ -117,6 +120,7 @@ let cfg = config.deployment; in
 
     deployment.adhoc.controller = mkOption {
       example = "cloud.example.org";
+      type = types.uniq types.string;
       description = ''
         Hostname or IP addres of the machine to which
         <command>nixos-deploy-network</command> should connect (via
@@ -126,6 +130,7 @@ let cfg = config.deployment; in
 
     deployment.adhoc.createVMCommand = mkOption {
       default = "create-vm";
+      type = types.uniq types.string;
       description = ''
         Remote command to create a NixOS virtual machine.  It should
         print an identifier denoting the VM on standard output.
@@ -134,6 +139,7 @@ let cfg = config.deployment; in
 
     deployment.adhoc.destroyVMCommand = mkOption {
       default = "destroy-vm";
+      type = types.uniq types.string;
       description = ''
         Remote command to destroy a previously created NixOS virtual
         machine.
@@ -142,6 +148,7 @@ let cfg = config.deployment; in
 
     deployment.adhoc.queryVMCommand = mkOption {
       default = "query-vm";
+      type = types.uniq types.string;
       description = ''
         Remote command to query information about a previously created
         NixOS virtual machine.  It should print the IPv6 address of
-- 
GitLab


From 021409b21f6ea61b2fe44051f22dcb6d7537f3ea Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 26 Oct 2011 19:37:47 +0000
Subject: [PATCH 3190/5331] * Declaring fileSystems as "loa" (list or attribute
 set) is bad because it can   cause the filesystems to be reordered.  During
 stage 1, the ordering of   filesystems is sensitive.  (In stage 2, mountall
 ensures that filesystems   are mounted in the right order.)

svn path=/nixos/trunk/; revision=30046
---
 modules/tasks/filesystems.nix | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/modules/tasks/filesystems.nix b/modules/tasks/filesystems.nix
index 3ee26bbfc77..22deacd1928 100644
--- a/modules/tasks/filesystems.nix
+++ b/modules/tasks/filesystems.nix
@@ -50,8 +50,7 @@ in
         <command>mkdir -p</command> .
       ";
 
-      type = types.nullOr (types.loaOf types.optionSet);
-      apply = x: attrValues x;
+      type = types.nullOr (types.list types.optionSet);
 
       options = {
 
-- 
GitLab


From 6e809242e95539e99068637a04fac256dc3460fc Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 26 Oct 2011 21:47:03 +0000
Subject: [PATCH 3191/5331] * Ensure that the "kde" PAM module exists whn KDE
 is enabled.   Previously, this was only enabled in the KDM module, so if you
 were   using a different display manager than KDM, stuff like getting out  
 of the screensaver didn't work correctly.

svn path=/nixos/trunk/; revision=30049
---
 modules/services/x11/desktop-managers/kde4.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/modules/services/x11/desktop-managers/kde4.nix b/modules/services/x11/desktop-managers/kde4.nix
index cce5ef54df1..1bea3592c26 100644
--- a/modules/services/x11/desktop-managers/kde4.nix
+++ b/modules/services/x11/desktop-managers/kde4.nix
@@ -152,6 +152,8 @@ in
     services.udisks = mkIf isKDE47 { enable = true; };
     services.upower = mkIf (isKDE47 && config.powerManagement.enable) { enable = true; };
 
+    security.pam.services = [ { name = "kde"; } ];
+
   };
 
 }
-- 
GitLab


From 564f7358f1ddd561bc4c6ac350bd0c184fc3824a Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 26 Oct 2011 23:44:13 +0000
Subject: [PATCH 3192/5331] * Fix EC2 terminology: zone -> region. 
 (Availability zones are   something else.)

svn path=/nixos/trunk/; revision=30050
---
 modules/misc/deployment.nix | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/modules/misc/deployment.nix b/modules/misc/deployment.nix
index de8f72836fd..81988e96468 100644
--- a/modules/misc/deployment.nix
+++ b/modules/misc/deployment.nix
@@ -60,17 +60,17 @@ let cfg = config.deployment; in
         URI of an Amazon EC2-compatible cloud controller web service,
         used to create and manage virtual machines.  If you're using
         EC2, it's more convenient to set
-        <option>deployment.ec2.zone</option>.
+        <option>deployment.ec2.region</option>.
       '';
     };
 
-    deployment.ec2.zone = mkOption {
+    deployment.ec2.region = mkOption {
       default = "";
       example = "us-east-1";
       type = types.uniq types.string;
       description = ''
-        Amazon EC2 zone in which the instance is to be deployed.  This
-        option only applies when using EC2.  It implicitly sets
+        Amazon EC2 region in which the instance is to be deployed.
+        This option only applies when using EC2.  It implicitly sets
         <option>deployment.ec2.controller</option> and
         <option>deployment.ec2.ami</option>.
       '';
@@ -183,16 +183,16 @@ let cfg = config.deployment; in
 
   config = {
   
-    deployment.ec2 = mkIf (cfg.ec2.zone != "") {
+    deployment.ec2 = mkIf (cfg.ec2.region != "") {
     
-      controller = mkDefault "https://ec2.${cfg.ec2.zone}.amazonaws.com/";
+      controller = mkDefault "https://ec2.${cfg.ec2.region}.amazonaws.com/";
       
       ami = mkDefault (
-        if cfg.ec2.zone == "eu-west-1" && config.nixpkgs.system == "i686-linux" then "ami-c9f2d8bd" else
-        if cfg.ec2.zone == "eu-west-1" && config.nixpkgs.system == "x86_64-linux" then "ami-c34c71b7" else
-        if cfg.ec2.zone == "us-east-1" && config.nixpkgs.system == "x86_64-linux" then "ami-d93bf4b0" else
+        if cfg.ec2.region == "eu-west-1" && config.nixpkgs.system == "i686-linux" then "ami-c9f2d8bd" else
+        if cfg.ec2.region == "eu-west-1" && config.nixpkgs.system == "x86_64-linux" then "ami-c34c71b7" else
+        if cfg.ec2.region == "us-east-1" && config.nixpkgs.system == "x86_64-linux" then "ami-d93bf4b0" else
         # !!! Doesn't work, not lazy enough.
-        # throw "I don't know an AMI for zone ‘${cfg.ec2.zone}’ and platform type ‘${config.nixpkgs.system}’"
+        # throw "I don't know an AMI for region ‘${cfg.ec2.region}’ and platform type ‘${config.nixpkgs.system}’"
         "");
         
     };
-- 
GitLab


From c7f568dc064dc4cd49499ca3d3d2d79ffa1060e9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Thu, 27 Oct 2011 15:43:13 +0000
Subject: [PATCH 3193/5331] Fixing the xserver.enableTCP for kdm.

svn path=/nixos/trunk/; revision=30056
---
 modules/services/x11/display-managers/kdm.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/modules/services/x11/display-managers/kdm.nix b/modules/services/x11/display-managers/kdm.nix
index cfcf62e487e..a819cadd270 100644
--- a/modules/services/x11/display-managers/kdm.nix
+++ b/modules/services/x11/display-managers/kdm.nix
@@ -50,7 +50,10 @@ let
     buildCommand =
       ''
         echo "$config" > $out
-        cat ${kdebase_workspace}/share/config/kdm/kdmrc >> $out
+
+        # The default kdmrc would add "-nolisten tcp", and we already
+        # have that managed by nixos. Hence the grep.
+        cat ${kdebase_workspace}/share/config/kdm/kdmrc | grep -v nolisten >> $out
       '';
   };
 
-- 
GitLab


From 926091c265c60e8a2fea614108e2bab76e60cfec Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 27 Oct 2011 17:34:16 +0000
Subject: [PATCH 3194/5331] * Make the permissions on /run less liberal.

svn path=/nixos/trunk/; revision=30065
---
 modules/system/boot/stage-1-init.sh | 2 +-
 modules/system/boot/stage-2-init.sh | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/system/boot/stage-1-init.sh b/modules/system/boot/stage-1-init.sh
index 68cbc36de86..68e0f7feec1 100644
--- a/modules/system/boot/stage-1-init.sh
+++ b/modules/system/boot/stage-1-init.sh
@@ -55,7 +55,7 @@ mkdir -p /sys
 mount -t sysfs none /sys
 mount -t tmpfs -o "mode=0755,size=@devSize@" none /dev
 mkdir -p /run
-mount -t tmpfs -o "mode=1777,size=@runSize@" none /run
+mount -t tmpfs -o "mode=0755,size=@runSize@" none /run
 
 
 # Process the kernel command line.
diff --git a/modules/system/boot/stage-2-init.sh b/modules/system/boot/stage-2-init.sh
index 649faaa8a8d..28d721e6b65 100644
--- a/modules/system/boot/stage-2-init.sh
+++ b/modules/system/boot/stage-2-init.sh
@@ -126,7 +126,7 @@ rm -rf /nix/var/nix/gcroots/tmp /nix/var/nix/temproots
 if ! mountpoint -q /run; then
     rm -rf /run
     mkdir -m 0755 -p /run
-    mount -t tmpfs -o "mode=1777,size=@runSize@" none /run
+    mount -t tmpfs -o "mode=0755,size=@runSize@" none /run
 fi
 
 mkdir -m 0700 -p /run/lock
-- 
GitLab


From 3397bc6e09336be6c3ac7c55e78050e9cc82dc5a Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 27 Oct 2011 17:46:25 +0000
Subject: [PATCH 3195/5331] * Recent kernels need some more modules in the
 initrd to be able to do   CIFS mounts.

svn path=/nixos/trunk/; revision=30067
---
 modules/virtualisation/qemu-vm.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/virtualisation/qemu-vm.nix b/modules/virtualisation/qemu-vm.nix
index 95502821e35..7738ce1f2e7 100644
--- a/modules/virtualisation/qemu-vm.nix
+++ b/modules/virtualisation/qemu-vm.nix
@@ -240,7 +240,7 @@ in
   # CIFS.  Also use paravirtualised network and block devices for
   # performance.
   boot.initrd.availableKernelModules =
-    [ "cifs" "nls_utf8" "hmac" "md4" ]
+    [ "cifs" "nls_utf8" "hmac" "md4" "ecb" "des_generic" ]
     ++ optional cfg.writableStore [ "aufs" ];
 
   boot.extraModulePackages =
-- 
GitLab


From 1fe1481adf229c7727ae0a6457bf9528808a92df Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Thu, 27 Oct 2011 18:06:54 +0000
Subject: [PATCH 3196/5331] Fixing systemhealth for kernels 3.x

svn path=/nixos/trunk/; revision=30068
---
 modules/services/monitoring/systemhealth.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/modules/services/monitoring/systemhealth.nix b/modules/services/monitoring/systemhealth.nix
index 521218044ba..cb46ba89bc9 100644
--- a/modules/services/monitoring/systemhealth.nix
+++ b/modules/services/monitoring/systemhealth.nix
@@ -14,6 +14,8 @@ let
     buildInputs = [ python ];
     installPhase = ''
       ensureDir $out/bin
+      # Make it work for kernels 3.x, not so different than 2.6
+      sed -i 's/2\.6/4.0/' system_health.py
       cp system_health.py $out/bin
     '';
   };
-- 
GitLab


From ce822289c31c245aa79c30cae92b044b5072caf4 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 27 Oct 2011 19:36:03 +0000
Subject: [PATCH 3197/5331] * Create /etc/localtime as a symlink to the right
 zoneinfo file.   However, this won't do anything until we merge the stdenv
 branch.

svn path=/nixos/trunk/; revision=30071
---
 modules/config/timezone.nix | 28 +++++++++++++++++-----------
 1 file changed, 17 insertions(+), 11 deletions(-)

diff --git a/modules/config/timezone.nix b/modules/config/timezone.nix
index b08712464a1..59b4a917ebc 100644
--- a/modules/config/timezone.nix
+++ b/modules/config/timezone.nix
@@ -1,10 +1,11 @@
-{pkgs, config, ...}:
+{ config, pkgs, ... }:
 
-let
+with pkgs.lib;
 
+{
   options = {
 
-    time.timeZone = pkgs.lib.mkOption {
+    time.timeZone = mkOption {
       default = "CET";
       example = "America/New_York";
       description = "The time zone used when displaying times and dates.";
@@ -12,14 +13,19 @@ let
 
   };
 
-in
+  config = {
 
-{
-  require = [options];
+    environment.shellInit =
+      ''
+        export TZ=${config.time.timeZone}
+        export TZDIR=${pkgs.glibc}/share/zoneinfo
+      '';
 
-  environment.shellInit =
-    ''
-      export TZ=${config.time.timeZone}
-      export TZDIR=${pkgs.glibc}/share/zoneinfo
-    '';
+    environment.etc = singleton
+      { source = "${pkgs.glibc}/share/zoneinfo/${config.time.timeZone}";
+        target = "localtime";
+      };
+      
+  };
+  
 }
-- 
GitLab


From 69a31a37e4e38c4626dbeb3887398a923acc601e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Thu, 27 Oct 2011 19:43:20 +0000
Subject: [PATCH 3198/5331] Adding a module for dovecot2. I've not tried it
 much.

svn path=/nixos/trunk/; revision=30072
---
 modules/misc/ids.nix               |   3 +
 modules/module-list.nix            |   1 +
 modules/services/mail/dovecot2.nix | 139 +++++++++++++++++++++++++++++
 3 files changed, 143 insertions(+)
 create mode 100644 modules/services/mail/dovecot2.nix

diff --git a/modules/misc/ids.nix b/modules/misc/ids.nix
index 7415685f707..6f97ebab743 100644
--- a/modules/misc/ids.nix
+++ b/modules/misc/ids.nix
@@ -64,6 +64,8 @@ in
     fourStoreEndpoint = 43;
     virtuoso = 44;
     rtkit = 45;
+    dovecot2 = 46;
+    dovenull2 = 47;
 
     # When adding a uid, make sure it doesn't match an existing gid.
 
@@ -110,6 +112,7 @@ in
     fourStore = 42;
     fourStoreEndpoint = 43;
     virtuoso = 44;
+    dovecot2 = 45;
 
     # When adding a gid, make sure it doesn't match an existing uid.
 
diff --git a/modules/module-list.nix b/modules/module-list.nix
index e6c72baf4e1..f6ee9313793 100644
--- a/modules/module-list.nix
+++ b/modules/module-list.nix
@@ -73,6 +73,7 @@
   ./services/logging/logrotate.nix
   ./services/logging/syslogd.nix
   ./services/mail/dovecot.nix
+  ./services/mail/dovecot2.nix
   ./services/mail/freepops.nix
   ./services/mail/mail.nix
   ./services/mail/postfix.nix
diff --git a/modules/services/mail/dovecot2.nix b/modules/services/mail/dovecot2.nix
new file mode 100644
index 00000000000..984c348dad8
--- /dev/null
+++ b/modules/services/mail/dovecot2.nix
@@ -0,0 +1,139 @@
+{ config, pkgs, ... }:
+
+with pkgs.lib;
+
+let
+
+  startingDependency = if config.services.gw6c.enable then "gw6c" else "network-interfaces";
+
+  cfg = config.services.dovecot2;
+
+  dovecotConf =
+    ''
+      base_dir = /var/run/dovecot2/
+
+      protocols = imap pop3
+    ''
+    + (if cfg.sslServerCert!="" then
+    ''
+      ssl_cert_file = ${cfg.sslServerCert}
+      ssl_key_file = ${cfg.sslServerKey}
+      ssl_ca_file = ${cfg.sslCACert}
+    '' else ''
+      ssl = no
+      disable_plaintext_auth = no
+    '')
+
+    + ''
+      default_internal_user = ${cfg.user}
+
+      mail_location = maildir:/var/spool/mail/%u
+
+      maildir_copy_with_hardlinks = yes
+
+      auth_mechanisms = plain login
+      service auth {
+        user = root
+      }
+      userdb {
+        driver=passwd
+      }
+      passdb {
+        driver=pam
+      }
+      auth_debug = yes
+      auth_verbose = yes
+
+      pop3_uidl_format = %08Xv%08Xu
+
+      log_path = /var/log/dovecot2.log
+    '';
+
+  confFile = pkgs.writeText "dovecot.conf" dovecotConf;
+
+in
+
+{
+
+  ###### interface
+
+  options = {
+
+    services.dovecot2 = {
+
+      enable = mkOption {
+        default = false;
+        description = "Whether to enable the Dovecot 2.x POP3/IMAP server.";
+      };
+
+      user = mkOption {
+        default = "dovecot2";
+        description = "Dovecot user name.";
+      };
+
+      group = mkOption {
+        default = "dovecot2";
+        description = "Dovecot group name.";
+      };
+
+      sslServerCert = mkOption {
+        default = "";
+        description = "Server certificate";
+      };
+
+      sslCACert = mkOption {
+        default = "";
+        description = "CA certificate used by the server certificate.";
+      };
+
+      sslServerKey = mkOption {
+        default = "";
+        description = "Server key.";
+      };
+
+    };
+
+  };
+
+
+  ###### implementation
+
+  config = mkIf config.services.dovecot2.enable {
+
+    security.pam.services = [ { name = "dovecot2"; } ];
+
+    users.extraUsers = [
+      { name = cfg.user;
+        uid = config.ids.uids.dovecot2;
+        description = "Dovecot user";
+        group = cfg.group;
+      }
+      { name = "dovenull";
+        uid = config.ids.uids.dovenull2;
+        description = "Dovecot user for untrusted logins";
+        group = cfg.group;
+      }
+    ];
+
+    users.extraGroups = singleton
+      { name = cfg.group;
+        gid = config.ids.gids.dovecot2;
+      };
+
+    jobs.dovecot2 =
+      { description = "Dovecot IMAP/POP3 server";
+
+        startOn = "started ${startingDependency}";
+
+        preStart =
+          ''
+            ${pkgs.coreutils}/bin/mkdir -p /var/run/dovecot2 /var/run/dovecot2/login
+            ${pkgs.coreutils}/bin/chown -R ${cfg.user}.${cfg.group} /var/run/dovecot2
+          '';
+
+        exec = "${pkgs.dovecot_2_0}/sbin/dovecot -F -c ${confFile}";
+      };
+
+  };
+
+}
-- 
GitLab


From 035ccb8faf9e0ad5210395585cb28e300fa8d2fb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Thu, 27 Oct 2011 22:04:08 +0000
Subject: [PATCH 3199/5331] Making dovecot2 authentication work (wrong pam
 module)

svn path=/nixos/trunk/; revision=30076
---
 modules/services/mail/dovecot2.nix | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/modules/services/mail/dovecot2.nix b/modules/services/mail/dovecot2.nix
index 984c348dad8..71e246392f9 100644
--- a/modules/services/mail/dovecot2.nix
+++ b/modules/services/mail/dovecot2.nix
@@ -36,13 +36,15 @@ let
         user = root
       }
       userdb {
-        driver=passwd
+        driver = passwd
       }
       passdb {
-        driver=pam
+        driver = pam
+        args = dovecot2
       }
-      auth_debug = yes
-      auth_verbose = yes
+      #auth_debug = yes
+      #auth_verbose = yes
+      #debug_log_path = /tmp/dovecot2debug.log
 
       pop3_uidl_format = %08Xv%08Xu
 
@@ -134,6 +136,8 @@ in
         exec = "${pkgs.dovecot_2_0}/sbin/dovecot -F -c ${confFile}";
       };
 
+    environment.systemPackages = [ pkgs.dovecot_2_0 ];
+
   };
 
 }
-- 
GitLab


From 9d496c77ac43d0b0447b04c8b6930f385fc6cb7d Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Sat, 29 Oct 2011 18:20:02 +0000
Subject: [PATCH 3200/5331] nixpkgs: Always set nixpkgs.config.{state,store}Dir

This will allow NixOS modules to always refer to config.nixpkgs.config.nix to find the store or state
directory

svn path=/nixos/trunk/; revision=30103
---
 modules/misc/nixpkgs.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/modules/misc/nixpkgs.nix b/modules/misc/nixpkgs.nix
index 3154c3dd1e7..281ebefa853 100644
--- a/modules/misc/nixpkgs.nix
+++ b/modules/misc/nixpkgs.nix
@@ -70,4 +70,6 @@ in
     };
 
   };
+
+  config.nixpkgs.config.nix = { storeDir = /nix/store; stateDir = /nix/var; };
 }
-- 
GitLab


From 09cf6ce70c0a1afab457928b3625f1f557f8c341 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Sat, 29 Oct 2011 21:03:57 +0000
Subject: [PATCH 3201/5331] find modules | fgrep .nix | fgrep -v .svn | fgrep
 -v nixpkgs.nix | xargs sed -i -e
 's|/nix/var|${config.nixpkgs.config.nix.stateDir}|g' -e
 's|/nix/store|${config.nixpkgs.config.nix.storeDir}|g'

Don't assume /nix/store or /nix/var in NixOS modules, this is configurable

svn path=/nixos/trunk/; revision=30104
---
 modules/config/fonts.nix                      |  4 +--
 modules/config/system-path.nix                |  2 +-
 modules/installer/cd-dvd/iso-image.nix        | 14 ++++----
 modules/installer/cd-dvd/system-tarball.nix   |  2 +-
 .../generations-dir/generations-dir.nix       |  2 +-
 .../tools/nixos-deploy-network/deploy.nix     | 14 ++++----
 modules/security/setuid-wrappers.nix          |  2 +-
 modules/services/misc/nix-daemon.nix          | 34 +++++++++----------
 modules/services/monitoring/ups.nix           |  2 +-
 modules/services/networking/openvpn.nix       |  2 +-
 modules/services/networking/ssh/lshd.nix      |  2 +-
 modules/services/system/dbus.nix              |  2 +-
 .../web-servers/apache-httpd/default.nix      |  2 +-
 .../services/web-servers/jboss/default.nix    |  4 +--
 .../system/activation/activation-script.nix   |  2 +-
 modules/system/boot/stage-1.nix               |  2 +-
 modules/system/etc/etc.nix                    |  2 +-
 modules/system/upstart-events/shutdown.nix    |  2 +-
 modules/virtualisation/amazon-image.nix       |  6 ++--
 modules/virtualisation/nova-image.nix         |  6 ++--
 modules/virtualisation/qemu-vm.nix            |  8 ++---
 21 files changed, 58 insertions(+), 58 deletions(-)

diff --git a/modules/config/fonts.nix b/modules/config/fonts.nix
index 3516ed75ab6..653400c7e48 100644
--- a/modules/config/fonts.nix
+++ b/modules/config/fonts.nix
@@ -50,8 +50,8 @@ let
           "~/.nix-profile/lib/X11/fonts"
           "~/.nix-profile/share/fonts"
           # - the default profile
-          "/nix/var/nix/profiles/default/lib/X11/fonts"
-          "/nix/var/nix/profiles/default/share/fonts"
+          "${config.nixpkgs.config.nix.stateDir}/nix/profiles/default/lib/X11/fonts"
+          "${config.nixpkgs.config.nix.stateDir}/nix/profiles/default/share/fonts"
         ];
         description = "
           List of primary font paths.
diff --git a/modules/config/system-path.nix b/modules/config/system-path.nix
index 286f7993f77..afdc65858a1 100644
--- a/modules/config/system-path.nix
+++ b/modules/config/system-path.nix
@@ -69,7 +69,7 @@ let
           automatically updated every time you rebuild the system
           configuration.  (The latter is the main difference with
           installing them in the default profile,
-          <filename>/nix/var/nix/profiles/default</filename>.
+          <filename>${config.nixpkgs.config.nix.stateDir}/nix/profiles/default</filename>.
         '';
       };
 
diff --git a/modules/installer/cd-dvd/iso-image.nix b/modules/installer/cd-dvd/iso-image.nix
index daeebde76cf..004cff6eb45 100644
--- a/modules/installer/cd-dvd/iso-image.nix
+++ b/modules/installer/cd-dvd/iso-image.nix
@@ -143,7 +143,7 @@ in
     [ { mountPoint = "/";
         device = "/dev/root";
       }
-      { mountPoint = "/nix/store";
+      { mountPoint = "${config.nixpkgs.config.nix.storeDir}";
         fsType = "squashfs";
         device = "/nix-store.squashfs";
         options = "loop";
@@ -169,7 +169,7 @@ in
   boot.initrd.kernelModules = [ "loop" ];
 
   # In stage 1, mount a tmpfs on top of / (the ISO image) and
-  # /nix/store (the squashfs image) to make this a live CD.
+  # ${config.nixpkgs.config.nix.storeDir} (the squashfs image) to make this a live CD.
   boot.initrd.postMountCommands =
     ''
       mkdir /mnt-root-tmpfs
@@ -180,8 +180,8 @@ in
 
       mkdir /mnt-store-tmpfs
       mount -t tmpfs -o "mode=755" none /mnt-store-tmpfs
-      mkdir -p $targetRoot/nix/store
-      mount -t aufs -o dirs=/mnt-store-tmpfs=rw:/mnt-root/nix/store=ro none /mnt-root-union/nix/store
+      mkdir -p $targetRoot${config.nixpkgs.config.nix.storeDir}
+      mount -t aufs -o dirs=/mnt-store-tmpfs=rw:/mnt-root${config.nixpkgs.config.nix.storeDir}=ro none /mnt-root-union${config.nixpkgs.config.nix.storeDir}
     '';
 
   # Closures to be copied to the Nix store on the CD, namely the init
@@ -223,7 +223,7 @@ in
       }
       { # Quick hack: need a mount point for the store.
         source = pkgs.runCommand "empty" {} "ensureDir $out";
-        target = "/nix/store";
+        target = "${config.nixpkgs.config.nix.storeDir}";
       }
     ];
 
@@ -257,11 +257,11 @@ in
     ''
       # After booting, register the contents of the Nix store on the
       # CD in the Nix database in the tmpfs.
-      ${config.environment.nix}/bin/nix-store --load-db < /nix/store/nix-path-registration
+      ${config.environment.nix}/bin/nix-store --load-db < ${config.nixpkgs.config.nix.storeDir}/nix-path-registration
 
       # nixos-rebuild also requires a "system" profile and an
       # /etc/NIXOS tag.
       touch /etc/NIXOS
-      ${config.environment.nix}/bin/nix-env -p /nix/var/nix/profiles/system --set /var/run/current-system
+      ${config.environment.nix}/bin/nix-env -p ${config.nixpkgs.config.nix.stateDir}/nix/profiles/system --set /var/run/current-system
     '';
 }
diff --git a/modules/installer/cd-dvd/system-tarball.nix b/modules/installer/cd-dvd/system-tarball.nix
index daffb94bc53..f6753494d6e 100644
--- a/modules/installer/cd-dvd/system-tarball.nix
+++ b/modules/installer/cd-dvd/system-tarball.nix
@@ -87,6 +87,6 @@ in
       # nixos-rebuild also requires a "system" profile and an
       # /etc/NIXOS tag.
       touch /etc/NIXOS
-      ${config.environment.nix}/bin/nix-env -p /nix/var/nix/profiles/system --set /var/run/current-system
+      ${config.environment.nix}/bin/nix-env -p ${config.nixpkgs.config.nix.stateDir}/nix/profiles/system --set /var/run/current-system
     '';
 }
diff --git a/modules/installer/generations-dir/generations-dir.nix b/modules/installer/generations-dir/generations-dir.nix
index db9fa32c55a..87d1fccedbc 100644
--- a/modules/installer/generations-dir/generations-dir.nix
+++ b/modules/installer/generations-dir/generations-dir.nix
@@ -31,7 +31,7 @@ let
             default = false;
             description = "
               Whether copy the necessary boot files into /boot, so
-              /nix/store is not needed by the boot loadear.
+              ${config.nixpkgs.config.nix.storeDir} is not needed by the boot loadear.
             ";
           };
         };
diff --git a/modules/installer/tools/nixos-deploy-network/deploy.nix b/modules/installer/tools/nixos-deploy-network/deploy.nix
index 7ece202a990..e94060101f5 100644
--- a/modules/installer/tools/nixos-deploy-network/deploy.nix
+++ b/modules/installer/tools/nixos-deploy-network/deploy.nix
@@ -22,8 +22,8 @@ let
       ''
         if [ "$rollback" != "$succeeded" ]
 	then
-	    ssh $NIX_SSHOPTS ${getAttr targetProperty (config.deployment)} nix-env -p /nix/var/nix/profiles/system --rollback
-	    ssh $NIX_SSHOPTS ${getAttr targetProperty (config.deployment)} /nix/var/nix/profiles/system/bin/switch-to-configuration switch
+	    ssh $NIX_SSHOPTS ${getAttr targetProperty (config.deployment)} nix-env -p ${config.nixpkgs.config.nix.stateDir}/nix/profiles/system --rollback
+	    ssh $NIX_SSHOPTS ${getAttr targetProperty (config.deployment)} ${config.nixpkgs.config.nix.stateDir}/nix/profiles/system/bin/switch-to-configuration switch
 
 	    rollback=$((rollback + 1))
 	fi
@@ -50,12 +50,12 @@ let
       in
       ''
         echo "=== activating system configuration on ${getAttr targetProperty (config.deployment)} ==="
-	ssh $NIX_SSHOPTS ${getAttr targetProperty (config.deployment)} nix-env -p /nix/var/nix/profiles/system --set ${config.system.build.toplevel} ||
-	  (ssh $NIX_SSHOPTS ${getAttr targetProperty (config.deployment)} nix-env -p /nix/var/nix/profiles/system --rollback; rollbackSucceeded)
+	ssh $NIX_SSHOPTS ${getAttr targetProperty (config.deployment)} nix-env -p ${config.nixpkgs.config.nix.stateDir}/nix/profiles/system --set ${config.system.build.toplevel} ||
+	  (ssh $NIX_SSHOPTS ${getAttr targetProperty (config.deployment)} nix-env -p ${config.nixpkgs.config.nix.stateDir}/nix/profiles/system --rollback; rollbackSucceeded)
 
-        ssh $NIX_SSHOPTS ${getAttr targetProperty (config.deployment)} /nix/var/nix/profiles/system/bin/switch-to-configuration switch ||
-	  ( ssh $NIX_SSHOPTS ${getAttr targetProperty (config.deployment)} nix-env -p /nix/var/nix/profiles/system --rollback
-	    ssh $NIX_SSHOPTS ${getAttr targetProperty (config.deployment)} /nix/var/nix/profiles/system/bin/switch-to-configuration switch
+        ssh $NIX_SSHOPTS ${getAttr targetProperty (config.deployment)} ${config.nixpkgs.config.nix.stateDir}/nix/profiles/system/bin/switch-to-configuration switch ||
+	  ( ssh $NIX_SSHOPTS ${getAttr targetProperty (config.deployment)} nix-env -p ${config.nixpkgs.config.nix.stateDir}/nix/profiles/system --rollback
+	    ssh $NIX_SSHOPTS ${getAttr targetProperty (config.deployment)} ${config.nixpkgs.config.nix.stateDir}/nix/profiles/system/bin/switch-to-configuration switch
 	    rollbackSucceeded
 	  )
 
diff --git a/modules/security/setuid-wrappers.nix b/modules/security/setuid-wrappers.nix
index ebd9e1ed537..812179d4efc 100644
--- a/modules/security/setuid-wrappers.nix
+++ b/modules/security/setuid-wrappers.nix
@@ -100,7 +100,7 @@ in
             if test -z "$source"; then
                 # If we can't find the program, fall back to the
                 # system profile.
-                source=/nix/var/nix/profiles/default/bin/${program}
+                source=${config.nixpkgs.config.nix.stateDir}/nix/profiles/default/bin/${program}
             fi
 
             cp ${setuidWrapper}/bin/setuid-wrapper ${wrapperDir}/${program}
diff --git a/modules/services/misc/nix-daemon.nix b/modules/services/misc/nix-daemon.nix
index 221ad6e1f54..4539680cbe0 100644
--- a/modules/services/misc/nix-daemon.nix
+++ b/modules/services/misc/nix-daemon.nix
@@ -308,26 +308,26 @@ in
         # Set up Nix.
         mkdir -p /nix/etc/nix
         ln -sfn /etc/nix.conf /nix/etc/nix/nix.conf
-        chown root.nixbld /nix/store
-        chmod 1775 /nix/store
+        chown root.nixbld ${config.nixpkgs.config.nix.storeDir}
+        chmod 1775 ${config.nixpkgs.config.nix.storeDir}
 
         # Nix initialisation.
         mkdir -m 0755 -p \
-          /nix/var/nix/gcroots \
-          /nix/var/nix/temproots \
-          /nix/var/nix/manifests \
-          /nix/var/nix/userpool \
-          /nix/var/nix/profiles \
-          /nix/var/nix/db \
-          /nix/var/log/nix/drvs \
-          /nix/var/nix/channel-cache \
-          /nix/var/nix/chroots
-        mkdir -m 1777 -p /nix/var/nix/gcroots/per-user
-        mkdir -m 1777 -p /nix/var/nix/profiles/per-user
-        mkdir -m 1777 -p /nix/var/nix/gcroots/tmp
-
-        ln -sf /nix/var/nix/profiles /nix/var/nix/gcroots/
-        ln -sf /nix/var/nix/manifests /nix/var/nix/gcroots/
+          ${config.nixpkgs.config.nix.stateDir}/nix/gcroots \
+          ${config.nixpkgs.config.nix.stateDir}/nix/temproots \
+          ${config.nixpkgs.config.nix.stateDir}/nix/manifests \
+          ${config.nixpkgs.config.nix.stateDir}/nix/userpool \
+          ${config.nixpkgs.config.nix.stateDir}/nix/profiles \
+          ${config.nixpkgs.config.nix.stateDir}/nix/db \
+          ${config.nixpkgs.config.nix.stateDir}/log/nix/drvs \
+          ${config.nixpkgs.config.nix.stateDir}/nix/channel-cache \
+          ${config.nixpkgs.config.nix.stateDir}/nix/chroots
+        mkdir -m 1777 -p ${config.nixpkgs.config.nix.stateDir}/nix/gcroots/per-user
+        mkdir -m 1777 -p ${config.nixpkgs.config.nix.stateDir}/nix/profiles/per-user
+        mkdir -m 1777 -p ${config.nixpkgs.config.nix.stateDir}/nix/gcroots/tmp
+
+        ln -sf ${config.nixpkgs.config.nix.stateDir}/nix/profiles ${config.nixpkgs.config.nix.stateDir}/nix/gcroots/
+        ln -sf ${config.nixpkgs.config.nix.stateDir}/nix/manifests ${config.nixpkgs.config.nix.stateDir}/nix/gcroots/
       '';
 
   };
diff --git a/modules/services/monitoring/ups.nix b/modules/services/monitoring/ups.nix
index 2874bbf2087..10531a28865 100644
--- a/modules/services/monitoring/ups.nix
+++ b/modules/services/monitoring/ups.nix
@@ -13,7 +13,7 @@ let
   {
     options = {
       # This can be infered from the UPS model by looking at
-      # /nix/store/nut/share/driver.list
+      # ${config.nixpkgs.config.nix.storeDir}/nut/share/driver.list
       driver = mkOption {
         type = types.uniq types.string;
         description = ''
diff --git a/modules/services/networking/openvpn.nix b/modules/services/networking/openvpn.nix
index bec5d7b8107..580328d0de7 100644
--- a/modules/services/networking/openvpn.nix
+++ b/modules/services/networking/openvpn.nix
@@ -133,7 +133,7 @@ in
 
           Additionally you can specify the up/ down scripts by setting
           the up down properties.
-          Config lines up=/nix/store/xxx-up-script down=...
+          Config lines up=${config.nixpkgs.config.nix.storeDir}/xxx-up-script down=...
           will be appended to your configuration file automatically
 
           If you define at least one of up/down "script-security 2" will be
diff --git a/modules/services/networking/ssh/lshd.nix b/modules/services/networking/ssh/lshd.nix
index d32fabbde24..b4f64e4b7cc 100644
--- a/modules/services/networking/ssh/lshd.nix
+++ b/modules/services/networking/ssh/lshd.nix
@@ -78,7 +78,7 @@ in
           If non-null, override the default login shell with the
           specified value.
         '';
-        example = "/nix/store/xyz-bash-10.0/bin/bash10";
+        example = "${config.nixpkgs.config.nix.storeDir}/xyz-bash-10.0/bin/bash10";
       };
 
       srpKeyExchange = mkOption {
diff --git a/modules/services/system/dbus.nix b/modules/services/system/dbus.nix
index 4f6d577e936..2499ffc58e3 100644
--- a/modules/services/system/dbus.nix
+++ b/modules/services/system/dbus.nix
@@ -155,7 +155,7 @@ in
       };
 
     services.dbus.packages =
-      [ "/nix/var/nix/profiles/default"
+      [ "${config.nixpkgs.config.nix.stateDir}/nix/profiles/default"
         config.system.path
       ];
 
diff --git a/modules/services/web-servers/apache-httpd/default.nix b/modules/services/web-servers/apache-httpd/default.nix
index 4894276e1d3..b2a1379527a 100644
--- a/modules/services/web-servers/apache-httpd/default.nix
+++ b/modules/services/web-servers/apache-httpd/default.nix
@@ -339,7 +339,7 @@ let
     # But do allow access to files in the store so that we don't have
     # to generate <Directory> clauses for every generated file that we
     # want to serve.
-    <Directory /nix/store>
+    <Directory ${config.nixpkgs.config.nix.storeDir}>
         Order allow,deny
         Allow from all
     </Directory>
diff --git a/modules/services/web-servers/jboss/default.nix b/modules/services/web-servers/jboss/default.nix
index e1bcede6563..85010bdbe78 100644
--- a/modules/services/web-servers/jboss/default.nix
+++ b/modules/services/web-servers/jboss/default.nix
@@ -45,11 +45,11 @@ in
 
       deployDir = mkOption {
         description = "Location of the deployment files";
-        default = "/nix/var/nix/profiles/default/server/default/deploy/";
+        default = "${config.nixpkgs.config.nix.stateDir}/nix/profiles/default/server/default/deploy/";
       };
 
       libUrl = mkOption {
-        default = "file:///nix/var/nix/profiles/default/server/default/lib";
+        default = "file://${config.nixpkgs.config.nix.stateDir}/nix/profiles/default/server/default/lib";
         description = "Location where the shared library JARs are stored";
       };
 
diff --git a/modules/system/activation/activation-script.nix b/modules/system/activation/activation-script.nix
index 72566507ecc..26706d6a20e 100644
--- a/modules/system/activation/activation-script.nix
+++ b/modules/system/activation/activation-script.nix
@@ -76,7 +76,7 @@ in
             ln -sfn "$(readlink -f "$systemConfig")" /var/run/current-system
 
             # Prevent the current configuration from being garbage-collected.
-            ln -sfn /var/run/current-system /nix/var/nix/gcroots/current-system
+            ln -sfn /var/run/current-system ${config.nixpkgs.config.nix.stateDir}/nix/gcroots/current-system
           '';
       };
 
diff --git a/modules/system/boot/stage-1.nix b/modules/system/boot/stage-1.nix
index 08cf948fea4..7f35b861352 100644
--- a/modules/system/boot/stage-1.nix
+++ b/modules/system/boot/stage-1.nix
@@ -217,7 +217,7 @@ let
 
 
   # The initrd only has to mount / or any FS marked as necessary for
-  # booting (such as the FS containing /nix/store, or an FS needed for
+  # booting (such as the FS containing ${config.nixpkgs.config.nix.storeDir}, or an FS needed for
   # mounting /, like / on a loopback).
   fileSystems = filter
     (fs: fs.mountPoint == "/" || fs.neededForBoot)
diff --git a/modules/system/etc/etc.nix b/modules/system/etc/etc.nix
index c84d96829f3..f76c70c2f9f 100644
--- a/modules/system/etc/etc.nix
+++ b/modules/system/etc/etc.nix
@@ -10,7 +10,7 @@ let
     environment.etc = mkOption {
       default = [];
       example = [
-        { source = "/nix/store/.../etc/dir/file.conf.example";
+        { source = "${config.nixpkgs.config.nix.storeDir}/.../etc/dir/file.conf.example";
           target = "dir/file.conf";
           mode = "0440";
         }
diff --git a/modules/system/upstart-events/shutdown.nix b/modules/system/upstart-events/shutdown.nix
index cf06ba10d08..10587af35b3 100644
--- a/modules/system/upstart-events/shutdown.nix
+++ b/modules/system/upstart-events/shutdown.nix
@@ -112,7 +112,7 @@ with pkgs.lib;
                   # (For instance, when applied to a bind-mount it
                   # unmounts the target of the bind-mount.)  !!! But
                   # we should use `-f' for NFS.
-                  if [ "$mp" != / -a "$mp" != /nix -a "$mp" != /nix/store ]; then
+                  if [ "$mp" != / -a "$mp" != /nix -a "$mp" != ${config.nixpkgs.config.nix.storeDir} ]; then
                       if umount -n "$mp"; then success=1; tryAgain=1; fi
                   fi
 
diff --git a/modules/virtualisation/amazon-image.nix b/modules/virtualisation/amazon-image.nix
index 66474158c68..481c0c58b7e 100644
--- a/modules/virtualisation/amazon-image.nix
+++ b/modules/virtualisation/amazon-image.nix
@@ -34,9 +34,9 @@ with pkgs.lib;
           # Copy all paths in the closure to the filesystem.
           storePaths=$(perl ${pkgs.pathsFromGraph} /tmp/xchg/closure)
 
-          mkdir -p /mnt/nix/store
+          mkdir -p /mnt${config.nixpkgs.config.nix.storeDir}
           echo "copying everything (will take a while)..."
-          cp -prd $storePaths /mnt/nix/store/
+          cp -prd $storePaths /mnt${config.nixpkgs.config.nix.storeDir}/
 
           # Register the paths in the Nix database.
           printRegistration=1 perl ${pkgs.pathsFromGraph} /tmp/xchg/closure | \
@@ -44,7 +44,7 @@ with pkgs.lib;
 
           # Create the system profile to allow nixos-rebuild to work.
           chroot /mnt ${config.environment.nix}/bin/nix-env \
-              -p /nix/var/nix/profiles/system --set ${config.system.build.toplevel}
+              -p ${config.nixpkgs.config.nix.stateDir}/nix/profiles/system --set ${config.system.build.toplevel}
 
           # `nixos-rebuild' requires an /etc/NIXOS.
           mkdir -p /mnt/etc
diff --git a/modules/virtualisation/nova-image.nix b/modules/virtualisation/nova-image.nix
index 1e891c35dc0..1b92f8d653d 100644
--- a/modules/virtualisation/nova-image.nix
+++ b/modules/virtualisation/nova-image.nix
@@ -41,8 +41,8 @@ with pkgs.lib;
           # Copy all paths in the closure to the filesystem.
           storePaths=$(perl ${pkgs.pathsFromGraph} /tmp/xchg/closure)
 
-          mkdir -p /mnt/nix/store
-          ${pkgs.rsync}/bin/rsync -av $storePaths /mnt/nix/store/
+          mkdir -p /mnt${config.nixpkgs.config.nix.storeDir}
+          ${pkgs.rsync}/bin/rsync -av $storePaths /mnt${config.nixpkgs.config.nix.storeDir}/
 
           # Register the paths in the Nix database.
           printRegistration=1 perl ${pkgs.pathsFromGraph} /tmp/xchg/closure | \
@@ -50,7 +50,7 @@ with pkgs.lib;
 
           # Create the system profile to allow nixos-rebuild to work.
           chroot /mnt ${config.environment.nix}/bin/nix-env \
-              -p /nix/var/nix/profiles/system --set ${config.system.build.toplevel}
+              -p ${config.nixpkgs.config.nix.stateDir}/nix/profiles/system --set ${config.system.build.toplevel}
 
           # `nixos-rebuild' requires an /etc/NIXOS.
           mkdir -p /mnt/etc
diff --git a/modules/virtualisation/qemu-vm.nix b/modules/virtualisation/qemu-vm.nix
index 7738ce1f2e7..1340841369d 100644
--- a/modules/virtualisation/qemu-vm.nix
+++ b/modules/virtualisation/qemu-vm.nix
@@ -222,7 +222,7 @@ let
 
           # Install GRUB and generate the GRUB boot menu.
           touch /etc/NIXOS
-          mkdir -p /nix/var/nix/profiles
+          mkdir -p ${config.nixpkgs.config.nix.stateDir}/nix/profiles
           ${config.system.build.toplevel}/bin/switch-to-configuration boot
 
           umount /boot
@@ -276,11 +276,11 @@ in
       chmod 1777 $targetRoot/tmp
 
       mkdir -p $targetRoot/boot
-      mount -o remount,ro $targetRoot/nix/store
+      mount -o remount,ro $targetRoot${config.nixpkgs.config.nix.storeDir}
       ${optionalString cfg.writableStore ''
         mkdir /mnt-store-tmpfs
         mount -t tmpfs -o "mode=755" none /mnt-store-tmpfs
-        mount -t aufs -o dirs=/mnt-store-tmpfs=rw:$targetRoot/nix/store=rr none $targetRoot/nix/store
+        mount -t aufs -o dirs=/mnt-store-tmpfs=rw:$targetRoot${config.nixpkgs.config.nix.storeDir}=rr none $targetRoot${config.nixpkgs.config.nix.storeDir}
       ''}
     '';
 
@@ -314,7 +314,7 @@ in
     [ { mountPoint = "/";
         device = "/dev/vda";
       }
-      { mountPoint = "/nix/store";
+      { mountPoint = "${config.nixpkgs.config.nix.storeDir}";
         device = "//10.0.2.4/store";
         fsType = "cifs";
         options = "guest,sec=none,noperm,noacl";
-- 
GitLab


From a16d43a8ac449cf8063fcb0b4c013a93ae61126b Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Sat, 29 Oct 2011 22:00:25 +0000
Subject: [PATCH 3202/5331] Make the stateDir and storeDir available for
 substitution into the tools

svn path=/nixos/trunk/; revision=30105
---
 modules/installer/tools/tools.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/modules/installer/tools/tools.nix b/modules/installer/tools/tools.nix
index 069e45127ef..ddbe71a321c 100644
--- a/modules/installer/tools/tools.nix
+++ b/modules/installer/tools/tools.nix
@@ -10,6 +10,7 @@ let
   makeProg = args: pkgs.substituteAll (args // {
     dir = "bin";
     isExecutable = true;
+    inherit (config.nixpkgs.config.nix) storeDir stateDir;
   });
 
   nixosBuildVMS = makeProg {
-- 
GitLab


From fe045dc949e101101110e4477182ec14a2673fe0 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Sat, 29 Oct 2011 22:14:27 +0000
Subject: [PATCH 3203/5331] sed -i -e 's|/nix/var|@stateDir@|g' -e
 's|/nix/store|@storeDir@|g' modules/installer/tools/*.sh

Use configurable storeDir and stateDir in the installer tools

svn path=/nixos/trunk/; revision=30106
---
 modules/installer/tools/nixos-install.sh | 24 ++++++++++++------------
 modules/installer/tools/nixos-rebuild.sh | 16 ++++++++--------
 2 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/modules/installer/tools/nixos-install.sh b/modules/installer/tools/nixos-install.sh
index 5b7746b6162..e55955db7c4 100644
--- a/modules/installer/tools/nixos-install.sh
+++ b/modules/installer/tools/nixos-install.sh
@@ -6,7 +6,7 @@
 # - register validity
 # - with a chroot to the target device:
 #   * do a nix-pull
-#   * nix-env -p /nix/var/nix/profiles/system -i <nix-expr for the configuration>
+#   * nix-env -p @stateDir@/nix/profiles/system -i <nix-expr for the configuration>
 #   * run the activation script of the configuration (also installs Grub)
 
 set -e
@@ -92,16 +92,16 @@ mkdir -m 0755 -p $mountPoint/var
 # Create the necessary Nix directories on the target device, if they
 # don't already exist.
 mkdir -m 0755 -p \
-    $mountPoint/nix/var/nix/gcroots \
-    $mountPoint/nix/var/nix/temproots \
-    $mountPoint/nix/var/nix/manifests \
-    $mountPoint/nix/var/nix/userpool \
-    $mountPoint/nix/var/nix/profiles \
-    $mountPoint/nix/var/nix/db \
-    $mountPoint/nix/var/log/nix/drvs
+    $mountPoint@stateDir@/nix/gcroots \
+    $mountPoint@stateDir@/nix/temproots \
+    $mountPoint@stateDir@/nix/manifests \
+    $mountPoint@stateDir@/nix/userpool \
+    $mountPoint@stateDir@/nix/profiles \
+    $mountPoint@stateDir@/nix/db \
+    $mountPoint@stateDir@/log/nix/drvs
 
 mkdir -m 1777 -p \
-    $mountPoint/nix/store \
+    $mountPoint@storeDir@ \
 
 
 # Get the store paths to copy from the references graph.
@@ -112,7 +112,7 @@ storePaths=$(@perl@/bin/perl @pathsFromGraph@ @nixClosure@)
 echo "copying Nix to $mountPoint...."
 for i in $storePaths; do
     echo "  $i"
-    rsync -a $i $mountPoint/nix/store/
+    rsync -a $i $mountPoint@storeDir@/
 done
 
 
@@ -154,7 +154,7 @@ fi
 # it into the system configuration profile.
 echo "building the system configuration..."
 NIXPKGS=/mnt/etc/nixos/nixpkgs chroot $mountPoint @nix@/bin/nix-env \
-    -p /nix/var/nix/profiles/system \
+    -p @stateDir@/nix/profiles/system \
     -f "/mnt$NIXOS" \
     --set -A system
 
@@ -196,4 +196,4 @@ touch $mountPoint/etc/NIXOS
 # configuration.
 echo "finalising the installation..."
 NIXOS_INSTALL_GRUB=1 chroot $mountPoint \
-    /nix/var/nix/profiles/system/bin/switch-to-configuration boot
+    @stateDir@/nix/profiles/system/bin/switch-to-configuration boot
diff --git a/modules/installer/tools/nixos-rebuild.sh b/modules/installer/tools/nixos-rebuild.sh
index 90df386faa9..4da87c5f9b1 100644
--- a/modules/installer/tools/nixos-rebuild.sh
+++ b/modules/installer/tools/nixos-rebuild.sh
@@ -133,9 +133,9 @@ if test -n "$pullManifest"; then
     manifests=$(nix-instantiate --eval-only --xml --strict $NIXOS -A manifests \
         | grep '<string'  | sed 's^.*"\(.*\)".*^\1^g')
 
-    mkdir -p /nix/var/nix/channel-cache
+    mkdir -p @stateDir@/nix/channel-cache
     for i in $manifests; do
-        NIX_DOWNLOAD_CACHE=/nix/var/nix/channel-cache nix-pull $i || true
+        NIX_DOWNLOAD_CACHE=@stateDir@/nix/channel-cache nix-pull $i || true
     done
 fi
 
@@ -162,8 +162,8 @@ fi
 if test -z "$rollback"; then
     echo "building the system configuration..." >&2
     if test "$action" = switch -o "$action" = boot; then
-        nix-env -p /nix/var/nix/profiles/system -f $NIXOS --set -A system $extraBuildFlags
-        pathToConfig=/nix/var/nix/profiles/system
+        nix-env -p @stateDir@/nix/profiles/system -f $NIXOS --set -A system $extraBuildFlags
+        pathToConfig=@stateDir@/nix/profiles/system
     elif test "$action" = test -o "$action" = build -o "$action" = dry-run; then
         nix-build $NIXOS -A system -K -k $extraBuildFlags > /dev/null
         pathToConfig=./result
@@ -178,14 +178,14 @@ if test -z "$rollback"; then
     fi
 else # test -n "$rollback"
     if test "$action" = switch -o "$action" = boot; then
-        nix-env --rollback -p /nix/var/nix/profiles/system
-        pathToConfig=/nix/var/nix/profiles/system
+        nix-env --rollback -p @stateDir@/nix/profiles/system
+        pathToConfig=@stateDir@/nix/profiles/system
     elif test "$action" = test -o "$action" = build; then
         systemNumber=$(
-            nix-env -p /nix/var/nix/profiles/system --list-generations |
+            nix-env -p @stateDir@/nix/profiles/system --list-generations |
             sed -n '/current/ {g; p;}; s/ *\([0-9]*\).*/\1/; h'
         )
-        ln -sT /nix/var/nix/profiles/system-${systemNumber}-link ./result
+        ln -sT @stateDir@/nix/profiles/system-${systemNumber}-link ./result
         pathToConfig=./result
     else
         showSyntax
-- 
GitLab


From 20b364f4de48a8ea975eab1f93583e0c8ae0ae5c Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 30 Oct 2011 15:19:58 +0000
Subject: [PATCH 3204/5331] Reverting revisions 30103-30106: "always set
 nixpkgs.config.{state,store}Dir", etc.

After the change from revision 30103, nixos-rebuild suddenly consumed
freaky amounts of memory. I had to abort the process after it had
allocated well in excess of 30GB(!) of RAM. I'm not sure what is causing
this behavior, but undoing that assignment fixes the problem. The other
two commits needed to be revoked, too, because they depend on 30103.

svn path=/nixos/trunk/; revision=30127
---
 modules/config/fonts.nix                      |  4 +--
 modules/config/system-path.nix                |  2 +-
 modules/installer/cd-dvd/iso-image.nix        | 14 ++++----
 modules/installer/cd-dvd/system-tarball.nix   |  2 +-
 .../generations-dir/generations-dir.nix       |  2 +-
 .../tools/nixos-deploy-network/deploy.nix     | 14 ++++----
 modules/installer/tools/nixos-install.sh      | 24 ++++++-------
 modules/installer/tools/nixos-rebuild.sh      | 16 ++++-----
 modules/installer/tools/tools.nix             |  1 -
 modules/misc/nixpkgs.nix                      |  2 --
 modules/security/setuid-wrappers.nix          |  2 +-
 modules/services/misc/nix-daemon.nix          | 34 +++++++++----------
 modules/services/monitoring/ups.nix           |  2 +-
 modules/services/networking/openvpn.nix       |  2 +-
 modules/services/networking/ssh/lshd.nix      |  2 +-
 modules/services/system/dbus.nix              |  2 +-
 .../web-servers/apache-httpd/default.nix      |  2 +-
 .../services/web-servers/jboss/default.nix    |  4 +--
 .../system/activation/activation-script.nix   |  2 +-
 modules/system/boot/stage-1.nix               |  2 +-
 modules/system/etc/etc.nix                    |  2 +-
 modules/system/upstart-events/shutdown.nix    |  2 +-
 modules/virtualisation/amazon-image.nix       |  6 ++--
 modules/virtualisation/nova-image.nix         |  6 ++--
 modules/virtualisation/qemu-vm.nix            |  8 ++---
 25 files changed, 78 insertions(+), 81 deletions(-)

diff --git a/modules/config/fonts.nix b/modules/config/fonts.nix
index 653400c7e48..3516ed75ab6 100644
--- a/modules/config/fonts.nix
+++ b/modules/config/fonts.nix
@@ -50,8 +50,8 @@ let
           "~/.nix-profile/lib/X11/fonts"
           "~/.nix-profile/share/fonts"
           # - the default profile
-          "${config.nixpkgs.config.nix.stateDir}/nix/profiles/default/lib/X11/fonts"
-          "${config.nixpkgs.config.nix.stateDir}/nix/profiles/default/share/fonts"
+          "/nix/var/nix/profiles/default/lib/X11/fonts"
+          "/nix/var/nix/profiles/default/share/fonts"
         ];
         description = "
           List of primary font paths.
diff --git a/modules/config/system-path.nix b/modules/config/system-path.nix
index afdc65858a1..286f7993f77 100644
--- a/modules/config/system-path.nix
+++ b/modules/config/system-path.nix
@@ -69,7 +69,7 @@ let
           automatically updated every time you rebuild the system
           configuration.  (The latter is the main difference with
           installing them in the default profile,
-          <filename>${config.nixpkgs.config.nix.stateDir}/nix/profiles/default</filename>.
+          <filename>/nix/var/nix/profiles/default</filename>.
         '';
       };
 
diff --git a/modules/installer/cd-dvd/iso-image.nix b/modules/installer/cd-dvd/iso-image.nix
index 004cff6eb45..daeebde76cf 100644
--- a/modules/installer/cd-dvd/iso-image.nix
+++ b/modules/installer/cd-dvd/iso-image.nix
@@ -143,7 +143,7 @@ in
     [ { mountPoint = "/";
         device = "/dev/root";
       }
-      { mountPoint = "${config.nixpkgs.config.nix.storeDir}";
+      { mountPoint = "/nix/store";
         fsType = "squashfs";
         device = "/nix-store.squashfs";
         options = "loop";
@@ -169,7 +169,7 @@ in
   boot.initrd.kernelModules = [ "loop" ];
 
   # In stage 1, mount a tmpfs on top of / (the ISO image) and
-  # ${config.nixpkgs.config.nix.storeDir} (the squashfs image) to make this a live CD.
+  # /nix/store (the squashfs image) to make this a live CD.
   boot.initrd.postMountCommands =
     ''
       mkdir /mnt-root-tmpfs
@@ -180,8 +180,8 @@ in
 
       mkdir /mnt-store-tmpfs
       mount -t tmpfs -o "mode=755" none /mnt-store-tmpfs
-      mkdir -p $targetRoot${config.nixpkgs.config.nix.storeDir}
-      mount -t aufs -o dirs=/mnt-store-tmpfs=rw:/mnt-root${config.nixpkgs.config.nix.storeDir}=ro none /mnt-root-union${config.nixpkgs.config.nix.storeDir}
+      mkdir -p $targetRoot/nix/store
+      mount -t aufs -o dirs=/mnt-store-tmpfs=rw:/mnt-root/nix/store=ro none /mnt-root-union/nix/store
     '';
 
   # Closures to be copied to the Nix store on the CD, namely the init
@@ -223,7 +223,7 @@ in
       }
       { # Quick hack: need a mount point for the store.
         source = pkgs.runCommand "empty" {} "ensureDir $out";
-        target = "${config.nixpkgs.config.nix.storeDir}";
+        target = "/nix/store";
       }
     ];
 
@@ -257,11 +257,11 @@ in
     ''
       # After booting, register the contents of the Nix store on the
       # CD in the Nix database in the tmpfs.
-      ${config.environment.nix}/bin/nix-store --load-db < ${config.nixpkgs.config.nix.storeDir}/nix-path-registration
+      ${config.environment.nix}/bin/nix-store --load-db < /nix/store/nix-path-registration
 
       # nixos-rebuild also requires a "system" profile and an
       # /etc/NIXOS tag.
       touch /etc/NIXOS
-      ${config.environment.nix}/bin/nix-env -p ${config.nixpkgs.config.nix.stateDir}/nix/profiles/system --set /var/run/current-system
+      ${config.environment.nix}/bin/nix-env -p /nix/var/nix/profiles/system --set /var/run/current-system
     '';
 }
diff --git a/modules/installer/cd-dvd/system-tarball.nix b/modules/installer/cd-dvd/system-tarball.nix
index f6753494d6e..daffb94bc53 100644
--- a/modules/installer/cd-dvd/system-tarball.nix
+++ b/modules/installer/cd-dvd/system-tarball.nix
@@ -87,6 +87,6 @@ in
       # nixos-rebuild also requires a "system" profile and an
       # /etc/NIXOS tag.
       touch /etc/NIXOS
-      ${config.environment.nix}/bin/nix-env -p ${config.nixpkgs.config.nix.stateDir}/nix/profiles/system --set /var/run/current-system
+      ${config.environment.nix}/bin/nix-env -p /nix/var/nix/profiles/system --set /var/run/current-system
     '';
 }
diff --git a/modules/installer/generations-dir/generations-dir.nix b/modules/installer/generations-dir/generations-dir.nix
index 87d1fccedbc..db9fa32c55a 100644
--- a/modules/installer/generations-dir/generations-dir.nix
+++ b/modules/installer/generations-dir/generations-dir.nix
@@ -31,7 +31,7 @@ let
             default = false;
             description = "
               Whether copy the necessary boot files into /boot, so
-              ${config.nixpkgs.config.nix.storeDir} is not needed by the boot loadear.
+              /nix/store is not needed by the boot loadear.
             ";
           };
         };
diff --git a/modules/installer/tools/nixos-deploy-network/deploy.nix b/modules/installer/tools/nixos-deploy-network/deploy.nix
index e94060101f5..7ece202a990 100644
--- a/modules/installer/tools/nixos-deploy-network/deploy.nix
+++ b/modules/installer/tools/nixos-deploy-network/deploy.nix
@@ -22,8 +22,8 @@ let
       ''
         if [ "$rollback" != "$succeeded" ]
 	then
-	    ssh $NIX_SSHOPTS ${getAttr targetProperty (config.deployment)} nix-env -p ${config.nixpkgs.config.nix.stateDir}/nix/profiles/system --rollback
-	    ssh $NIX_SSHOPTS ${getAttr targetProperty (config.deployment)} ${config.nixpkgs.config.nix.stateDir}/nix/profiles/system/bin/switch-to-configuration switch
+	    ssh $NIX_SSHOPTS ${getAttr targetProperty (config.deployment)} nix-env -p /nix/var/nix/profiles/system --rollback
+	    ssh $NIX_SSHOPTS ${getAttr targetProperty (config.deployment)} /nix/var/nix/profiles/system/bin/switch-to-configuration switch
 
 	    rollback=$((rollback + 1))
 	fi
@@ -50,12 +50,12 @@ let
       in
       ''
         echo "=== activating system configuration on ${getAttr targetProperty (config.deployment)} ==="
-	ssh $NIX_SSHOPTS ${getAttr targetProperty (config.deployment)} nix-env -p ${config.nixpkgs.config.nix.stateDir}/nix/profiles/system --set ${config.system.build.toplevel} ||
-	  (ssh $NIX_SSHOPTS ${getAttr targetProperty (config.deployment)} nix-env -p ${config.nixpkgs.config.nix.stateDir}/nix/profiles/system --rollback; rollbackSucceeded)
+	ssh $NIX_SSHOPTS ${getAttr targetProperty (config.deployment)} nix-env -p /nix/var/nix/profiles/system --set ${config.system.build.toplevel} ||
+	  (ssh $NIX_SSHOPTS ${getAttr targetProperty (config.deployment)} nix-env -p /nix/var/nix/profiles/system --rollback; rollbackSucceeded)
 
-        ssh $NIX_SSHOPTS ${getAttr targetProperty (config.deployment)} ${config.nixpkgs.config.nix.stateDir}/nix/profiles/system/bin/switch-to-configuration switch ||
-	  ( ssh $NIX_SSHOPTS ${getAttr targetProperty (config.deployment)} nix-env -p ${config.nixpkgs.config.nix.stateDir}/nix/profiles/system --rollback
-	    ssh $NIX_SSHOPTS ${getAttr targetProperty (config.deployment)} ${config.nixpkgs.config.nix.stateDir}/nix/profiles/system/bin/switch-to-configuration switch
+        ssh $NIX_SSHOPTS ${getAttr targetProperty (config.deployment)} /nix/var/nix/profiles/system/bin/switch-to-configuration switch ||
+	  ( ssh $NIX_SSHOPTS ${getAttr targetProperty (config.deployment)} nix-env -p /nix/var/nix/profiles/system --rollback
+	    ssh $NIX_SSHOPTS ${getAttr targetProperty (config.deployment)} /nix/var/nix/profiles/system/bin/switch-to-configuration switch
 	    rollbackSucceeded
 	  )
 
diff --git a/modules/installer/tools/nixos-install.sh b/modules/installer/tools/nixos-install.sh
index e55955db7c4..5b7746b6162 100644
--- a/modules/installer/tools/nixos-install.sh
+++ b/modules/installer/tools/nixos-install.sh
@@ -6,7 +6,7 @@
 # - register validity
 # - with a chroot to the target device:
 #   * do a nix-pull
-#   * nix-env -p @stateDir@/nix/profiles/system -i <nix-expr for the configuration>
+#   * nix-env -p /nix/var/nix/profiles/system -i <nix-expr for the configuration>
 #   * run the activation script of the configuration (also installs Grub)
 
 set -e
@@ -92,16 +92,16 @@ mkdir -m 0755 -p $mountPoint/var
 # Create the necessary Nix directories on the target device, if they
 # don't already exist.
 mkdir -m 0755 -p \
-    $mountPoint@stateDir@/nix/gcroots \
-    $mountPoint@stateDir@/nix/temproots \
-    $mountPoint@stateDir@/nix/manifests \
-    $mountPoint@stateDir@/nix/userpool \
-    $mountPoint@stateDir@/nix/profiles \
-    $mountPoint@stateDir@/nix/db \
-    $mountPoint@stateDir@/log/nix/drvs
+    $mountPoint/nix/var/nix/gcroots \
+    $mountPoint/nix/var/nix/temproots \
+    $mountPoint/nix/var/nix/manifests \
+    $mountPoint/nix/var/nix/userpool \
+    $mountPoint/nix/var/nix/profiles \
+    $mountPoint/nix/var/nix/db \
+    $mountPoint/nix/var/log/nix/drvs
 
 mkdir -m 1777 -p \
-    $mountPoint@storeDir@ \
+    $mountPoint/nix/store \
 
 
 # Get the store paths to copy from the references graph.
@@ -112,7 +112,7 @@ storePaths=$(@perl@/bin/perl @pathsFromGraph@ @nixClosure@)
 echo "copying Nix to $mountPoint...."
 for i in $storePaths; do
     echo "  $i"
-    rsync -a $i $mountPoint@storeDir@/
+    rsync -a $i $mountPoint/nix/store/
 done
 
 
@@ -154,7 +154,7 @@ fi
 # it into the system configuration profile.
 echo "building the system configuration..."
 NIXPKGS=/mnt/etc/nixos/nixpkgs chroot $mountPoint @nix@/bin/nix-env \
-    -p @stateDir@/nix/profiles/system \
+    -p /nix/var/nix/profiles/system \
     -f "/mnt$NIXOS" \
     --set -A system
 
@@ -196,4 +196,4 @@ touch $mountPoint/etc/NIXOS
 # configuration.
 echo "finalising the installation..."
 NIXOS_INSTALL_GRUB=1 chroot $mountPoint \
-    @stateDir@/nix/profiles/system/bin/switch-to-configuration boot
+    /nix/var/nix/profiles/system/bin/switch-to-configuration boot
diff --git a/modules/installer/tools/nixos-rebuild.sh b/modules/installer/tools/nixos-rebuild.sh
index 4da87c5f9b1..90df386faa9 100644
--- a/modules/installer/tools/nixos-rebuild.sh
+++ b/modules/installer/tools/nixos-rebuild.sh
@@ -133,9 +133,9 @@ if test -n "$pullManifest"; then
     manifests=$(nix-instantiate --eval-only --xml --strict $NIXOS -A manifests \
         | grep '<string'  | sed 's^.*"\(.*\)".*^\1^g')
 
-    mkdir -p @stateDir@/nix/channel-cache
+    mkdir -p /nix/var/nix/channel-cache
     for i in $manifests; do
-        NIX_DOWNLOAD_CACHE=@stateDir@/nix/channel-cache nix-pull $i || true
+        NIX_DOWNLOAD_CACHE=/nix/var/nix/channel-cache nix-pull $i || true
     done
 fi
 
@@ -162,8 +162,8 @@ fi
 if test -z "$rollback"; then
     echo "building the system configuration..." >&2
     if test "$action" = switch -o "$action" = boot; then
-        nix-env -p @stateDir@/nix/profiles/system -f $NIXOS --set -A system $extraBuildFlags
-        pathToConfig=@stateDir@/nix/profiles/system
+        nix-env -p /nix/var/nix/profiles/system -f $NIXOS --set -A system $extraBuildFlags
+        pathToConfig=/nix/var/nix/profiles/system
     elif test "$action" = test -o "$action" = build -o "$action" = dry-run; then
         nix-build $NIXOS -A system -K -k $extraBuildFlags > /dev/null
         pathToConfig=./result
@@ -178,14 +178,14 @@ if test -z "$rollback"; then
     fi
 else # test -n "$rollback"
     if test "$action" = switch -o "$action" = boot; then
-        nix-env --rollback -p @stateDir@/nix/profiles/system
-        pathToConfig=@stateDir@/nix/profiles/system
+        nix-env --rollback -p /nix/var/nix/profiles/system
+        pathToConfig=/nix/var/nix/profiles/system
     elif test "$action" = test -o "$action" = build; then
         systemNumber=$(
-            nix-env -p @stateDir@/nix/profiles/system --list-generations |
+            nix-env -p /nix/var/nix/profiles/system --list-generations |
             sed -n '/current/ {g; p;}; s/ *\([0-9]*\).*/\1/; h'
         )
-        ln -sT @stateDir@/nix/profiles/system-${systemNumber}-link ./result
+        ln -sT /nix/var/nix/profiles/system-${systemNumber}-link ./result
         pathToConfig=./result
     else
         showSyntax
diff --git a/modules/installer/tools/tools.nix b/modules/installer/tools/tools.nix
index ddbe71a321c..069e45127ef 100644
--- a/modules/installer/tools/tools.nix
+++ b/modules/installer/tools/tools.nix
@@ -10,7 +10,6 @@ let
   makeProg = args: pkgs.substituteAll (args // {
     dir = "bin";
     isExecutable = true;
-    inherit (config.nixpkgs.config.nix) storeDir stateDir;
   });
 
   nixosBuildVMS = makeProg {
diff --git a/modules/misc/nixpkgs.nix b/modules/misc/nixpkgs.nix
index 281ebefa853..3154c3dd1e7 100644
--- a/modules/misc/nixpkgs.nix
+++ b/modules/misc/nixpkgs.nix
@@ -70,6 +70,4 @@ in
     };
 
   };
-
-  config.nixpkgs.config.nix = { storeDir = /nix/store; stateDir = /nix/var; };
 }
diff --git a/modules/security/setuid-wrappers.nix b/modules/security/setuid-wrappers.nix
index 812179d4efc..ebd9e1ed537 100644
--- a/modules/security/setuid-wrappers.nix
+++ b/modules/security/setuid-wrappers.nix
@@ -100,7 +100,7 @@ in
             if test -z "$source"; then
                 # If we can't find the program, fall back to the
                 # system profile.
-                source=${config.nixpkgs.config.nix.stateDir}/nix/profiles/default/bin/${program}
+                source=/nix/var/nix/profiles/default/bin/${program}
             fi
 
             cp ${setuidWrapper}/bin/setuid-wrapper ${wrapperDir}/${program}
diff --git a/modules/services/misc/nix-daemon.nix b/modules/services/misc/nix-daemon.nix
index 4539680cbe0..221ad6e1f54 100644
--- a/modules/services/misc/nix-daemon.nix
+++ b/modules/services/misc/nix-daemon.nix
@@ -308,26 +308,26 @@ in
         # Set up Nix.
         mkdir -p /nix/etc/nix
         ln -sfn /etc/nix.conf /nix/etc/nix/nix.conf
-        chown root.nixbld ${config.nixpkgs.config.nix.storeDir}
-        chmod 1775 ${config.nixpkgs.config.nix.storeDir}
+        chown root.nixbld /nix/store
+        chmod 1775 /nix/store
 
         # Nix initialisation.
         mkdir -m 0755 -p \
-          ${config.nixpkgs.config.nix.stateDir}/nix/gcroots \
-          ${config.nixpkgs.config.nix.stateDir}/nix/temproots \
-          ${config.nixpkgs.config.nix.stateDir}/nix/manifests \
-          ${config.nixpkgs.config.nix.stateDir}/nix/userpool \
-          ${config.nixpkgs.config.nix.stateDir}/nix/profiles \
-          ${config.nixpkgs.config.nix.stateDir}/nix/db \
-          ${config.nixpkgs.config.nix.stateDir}/log/nix/drvs \
-          ${config.nixpkgs.config.nix.stateDir}/nix/channel-cache \
-          ${config.nixpkgs.config.nix.stateDir}/nix/chroots
-        mkdir -m 1777 -p ${config.nixpkgs.config.nix.stateDir}/nix/gcroots/per-user
-        mkdir -m 1777 -p ${config.nixpkgs.config.nix.stateDir}/nix/profiles/per-user
-        mkdir -m 1777 -p ${config.nixpkgs.config.nix.stateDir}/nix/gcroots/tmp
-
-        ln -sf ${config.nixpkgs.config.nix.stateDir}/nix/profiles ${config.nixpkgs.config.nix.stateDir}/nix/gcroots/
-        ln -sf ${config.nixpkgs.config.nix.stateDir}/nix/manifests ${config.nixpkgs.config.nix.stateDir}/nix/gcroots/
+          /nix/var/nix/gcroots \
+          /nix/var/nix/temproots \
+          /nix/var/nix/manifests \
+          /nix/var/nix/userpool \
+          /nix/var/nix/profiles \
+          /nix/var/nix/db \
+          /nix/var/log/nix/drvs \
+          /nix/var/nix/channel-cache \
+          /nix/var/nix/chroots
+        mkdir -m 1777 -p /nix/var/nix/gcroots/per-user
+        mkdir -m 1777 -p /nix/var/nix/profiles/per-user
+        mkdir -m 1777 -p /nix/var/nix/gcroots/tmp
+
+        ln -sf /nix/var/nix/profiles /nix/var/nix/gcroots/
+        ln -sf /nix/var/nix/manifests /nix/var/nix/gcroots/
       '';
 
   };
diff --git a/modules/services/monitoring/ups.nix b/modules/services/monitoring/ups.nix
index 10531a28865..2874bbf2087 100644
--- a/modules/services/monitoring/ups.nix
+++ b/modules/services/monitoring/ups.nix
@@ -13,7 +13,7 @@ let
   {
     options = {
       # This can be infered from the UPS model by looking at
-      # ${config.nixpkgs.config.nix.storeDir}/nut/share/driver.list
+      # /nix/store/nut/share/driver.list
       driver = mkOption {
         type = types.uniq types.string;
         description = ''
diff --git a/modules/services/networking/openvpn.nix b/modules/services/networking/openvpn.nix
index 580328d0de7..bec5d7b8107 100644
--- a/modules/services/networking/openvpn.nix
+++ b/modules/services/networking/openvpn.nix
@@ -133,7 +133,7 @@ in
 
           Additionally you can specify the up/ down scripts by setting
           the up down properties.
-          Config lines up=${config.nixpkgs.config.nix.storeDir}/xxx-up-script down=...
+          Config lines up=/nix/store/xxx-up-script down=...
           will be appended to your configuration file automatically
 
           If you define at least one of up/down "script-security 2" will be
diff --git a/modules/services/networking/ssh/lshd.nix b/modules/services/networking/ssh/lshd.nix
index b4f64e4b7cc..d32fabbde24 100644
--- a/modules/services/networking/ssh/lshd.nix
+++ b/modules/services/networking/ssh/lshd.nix
@@ -78,7 +78,7 @@ in
           If non-null, override the default login shell with the
           specified value.
         '';
-        example = "${config.nixpkgs.config.nix.storeDir}/xyz-bash-10.0/bin/bash10";
+        example = "/nix/store/xyz-bash-10.0/bin/bash10";
       };
 
       srpKeyExchange = mkOption {
diff --git a/modules/services/system/dbus.nix b/modules/services/system/dbus.nix
index 2499ffc58e3..4f6d577e936 100644
--- a/modules/services/system/dbus.nix
+++ b/modules/services/system/dbus.nix
@@ -155,7 +155,7 @@ in
       };
 
     services.dbus.packages =
-      [ "${config.nixpkgs.config.nix.stateDir}/nix/profiles/default"
+      [ "/nix/var/nix/profiles/default"
         config.system.path
       ];
 
diff --git a/modules/services/web-servers/apache-httpd/default.nix b/modules/services/web-servers/apache-httpd/default.nix
index b2a1379527a..4894276e1d3 100644
--- a/modules/services/web-servers/apache-httpd/default.nix
+++ b/modules/services/web-servers/apache-httpd/default.nix
@@ -339,7 +339,7 @@ let
     # But do allow access to files in the store so that we don't have
     # to generate <Directory> clauses for every generated file that we
     # want to serve.
-    <Directory ${config.nixpkgs.config.nix.storeDir}>
+    <Directory /nix/store>
         Order allow,deny
         Allow from all
     </Directory>
diff --git a/modules/services/web-servers/jboss/default.nix b/modules/services/web-servers/jboss/default.nix
index 85010bdbe78..e1bcede6563 100644
--- a/modules/services/web-servers/jboss/default.nix
+++ b/modules/services/web-servers/jboss/default.nix
@@ -45,11 +45,11 @@ in
 
       deployDir = mkOption {
         description = "Location of the deployment files";
-        default = "${config.nixpkgs.config.nix.stateDir}/nix/profiles/default/server/default/deploy/";
+        default = "/nix/var/nix/profiles/default/server/default/deploy/";
       };
 
       libUrl = mkOption {
-        default = "file://${config.nixpkgs.config.nix.stateDir}/nix/profiles/default/server/default/lib";
+        default = "file:///nix/var/nix/profiles/default/server/default/lib";
         description = "Location where the shared library JARs are stored";
       };
 
diff --git a/modules/system/activation/activation-script.nix b/modules/system/activation/activation-script.nix
index 26706d6a20e..72566507ecc 100644
--- a/modules/system/activation/activation-script.nix
+++ b/modules/system/activation/activation-script.nix
@@ -76,7 +76,7 @@ in
             ln -sfn "$(readlink -f "$systemConfig")" /var/run/current-system
 
             # Prevent the current configuration from being garbage-collected.
-            ln -sfn /var/run/current-system ${config.nixpkgs.config.nix.stateDir}/nix/gcroots/current-system
+            ln -sfn /var/run/current-system /nix/var/nix/gcroots/current-system
           '';
       };
 
diff --git a/modules/system/boot/stage-1.nix b/modules/system/boot/stage-1.nix
index 7f35b861352..08cf948fea4 100644
--- a/modules/system/boot/stage-1.nix
+++ b/modules/system/boot/stage-1.nix
@@ -217,7 +217,7 @@ let
 
 
   # The initrd only has to mount / or any FS marked as necessary for
-  # booting (such as the FS containing ${config.nixpkgs.config.nix.storeDir}, or an FS needed for
+  # booting (such as the FS containing /nix/store, or an FS needed for
   # mounting /, like / on a loopback).
   fileSystems = filter
     (fs: fs.mountPoint == "/" || fs.neededForBoot)
diff --git a/modules/system/etc/etc.nix b/modules/system/etc/etc.nix
index f76c70c2f9f..c84d96829f3 100644
--- a/modules/system/etc/etc.nix
+++ b/modules/system/etc/etc.nix
@@ -10,7 +10,7 @@ let
     environment.etc = mkOption {
       default = [];
       example = [
-        { source = "${config.nixpkgs.config.nix.storeDir}/.../etc/dir/file.conf.example";
+        { source = "/nix/store/.../etc/dir/file.conf.example";
           target = "dir/file.conf";
           mode = "0440";
         }
diff --git a/modules/system/upstart-events/shutdown.nix b/modules/system/upstart-events/shutdown.nix
index 10587af35b3..cf06ba10d08 100644
--- a/modules/system/upstart-events/shutdown.nix
+++ b/modules/system/upstart-events/shutdown.nix
@@ -112,7 +112,7 @@ with pkgs.lib;
                   # (For instance, when applied to a bind-mount it
                   # unmounts the target of the bind-mount.)  !!! But
                   # we should use `-f' for NFS.
-                  if [ "$mp" != / -a "$mp" != /nix -a "$mp" != ${config.nixpkgs.config.nix.storeDir} ]; then
+                  if [ "$mp" != / -a "$mp" != /nix -a "$mp" != /nix/store ]; then
                       if umount -n "$mp"; then success=1; tryAgain=1; fi
                   fi
 
diff --git a/modules/virtualisation/amazon-image.nix b/modules/virtualisation/amazon-image.nix
index 481c0c58b7e..66474158c68 100644
--- a/modules/virtualisation/amazon-image.nix
+++ b/modules/virtualisation/amazon-image.nix
@@ -34,9 +34,9 @@ with pkgs.lib;
           # Copy all paths in the closure to the filesystem.
           storePaths=$(perl ${pkgs.pathsFromGraph} /tmp/xchg/closure)
 
-          mkdir -p /mnt${config.nixpkgs.config.nix.storeDir}
+          mkdir -p /mnt/nix/store
           echo "copying everything (will take a while)..."
-          cp -prd $storePaths /mnt${config.nixpkgs.config.nix.storeDir}/
+          cp -prd $storePaths /mnt/nix/store/
 
           # Register the paths in the Nix database.
           printRegistration=1 perl ${pkgs.pathsFromGraph} /tmp/xchg/closure | \
@@ -44,7 +44,7 @@ with pkgs.lib;
 
           # Create the system profile to allow nixos-rebuild to work.
           chroot /mnt ${config.environment.nix}/bin/nix-env \
-              -p ${config.nixpkgs.config.nix.stateDir}/nix/profiles/system --set ${config.system.build.toplevel}
+              -p /nix/var/nix/profiles/system --set ${config.system.build.toplevel}
 
           # `nixos-rebuild' requires an /etc/NIXOS.
           mkdir -p /mnt/etc
diff --git a/modules/virtualisation/nova-image.nix b/modules/virtualisation/nova-image.nix
index 1b92f8d653d..1e891c35dc0 100644
--- a/modules/virtualisation/nova-image.nix
+++ b/modules/virtualisation/nova-image.nix
@@ -41,8 +41,8 @@ with pkgs.lib;
           # Copy all paths in the closure to the filesystem.
           storePaths=$(perl ${pkgs.pathsFromGraph} /tmp/xchg/closure)
 
-          mkdir -p /mnt${config.nixpkgs.config.nix.storeDir}
-          ${pkgs.rsync}/bin/rsync -av $storePaths /mnt${config.nixpkgs.config.nix.storeDir}/
+          mkdir -p /mnt/nix/store
+          ${pkgs.rsync}/bin/rsync -av $storePaths /mnt/nix/store/
 
           # Register the paths in the Nix database.
           printRegistration=1 perl ${pkgs.pathsFromGraph} /tmp/xchg/closure | \
@@ -50,7 +50,7 @@ with pkgs.lib;
 
           # Create the system profile to allow nixos-rebuild to work.
           chroot /mnt ${config.environment.nix}/bin/nix-env \
-              -p ${config.nixpkgs.config.nix.stateDir}/nix/profiles/system --set ${config.system.build.toplevel}
+              -p /nix/var/nix/profiles/system --set ${config.system.build.toplevel}
 
           # `nixos-rebuild' requires an /etc/NIXOS.
           mkdir -p /mnt/etc
diff --git a/modules/virtualisation/qemu-vm.nix b/modules/virtualisation/qemu-vm.nix
index 1340841369d..7738ce1f2e7 100644
--- a/modules/virtualisation/qemu-vm.nix
+++ b/modules/virtualisation/qemu-vm.nix
@@ -222,7 +222,7 @@ let
 
           # Install GRUB and generate the GRUB boot menu.
           touch /etc/NIXOS
-          mkdir -p ${config.nixpkgs.config.nix.stateDir}/nix/profiles
+          mkdir -p /nix/var/nix/profiles
           ${config.system.build.toplevel}/bin/switch-to-configuration boot
 
           umount /boot
@@ -276,11 +276,11 @@ in
       chmod 1777 $targetRoot/tmp
 
       mkdir -p $targetRoot/boot
-      mount -o remount,ro $targetRoot${config.nixpkgs.config.nix.storeDir}
+      mount -o remount,ro $targetRoot/nix/store
       ${optionalString cfg.writableStore ''
         mkdir /mnt-store-tmpfs
         mount -t tmpfs -o "mode=755" none /mnt-store-tmpfs
-        mount -t aufs -o dirs=/mnt-store-tmpfs=rw:$targetRoot${config.nixpkgs.config.nix.storeDir}=rr none $targetRoot${config.nixpkgs.config.nix.storeDir}
+        mount -t aufs -o dirs=/mnt-store-tmpfs=rw:$targetRoot/nix/store=rr none $targetRoot/nix/store
       ''}
     '';
 
@@ -314,7 +314,7 @@ in
     [ { mountPoint = "/";
         device = "/dev/vda";
       }
-      { mountPoint = "${config.nixpkgs.config.nix.storeDir}";
+      { mountPoint = "/nix/store";
         device = "//10.0.2.4/store";
         fsType = "cifs";
         options = "guest,sec=none,noperm,noacl";
-- 
GitLab


From 262e883554db5c63e1f75df04ec5a88b725880cc Mon Sep 17 00:00:00 2001
From: Nicolas Pierron <nicolas.b.pierron@gmail.com>
Date: Sun, 30 Oct 2011 18:46:31 +0000
Subject: [PATCH 3205/5331] Add more options for LDAP module. (timeLimit,
 bind.timeLimit, bind.policy)

Patch by Rickard Nilsson.

svn path=/nixos/trunk/; revision=30138
---
 modules/config/ldap.nix | 42 +++++++++++++++++++++++++++++++++++++++++
 1 file changed, 42 insertions(+)

diff --git a/modules/config/ldap.nix b/modules/config/ldap.nix
index 4c2924b5975..3821482361f 100644
--- a/modules/config/ldap.nix
+++ b/modules/config/ldap.nix
@@ -39,6 +39,16 @@ let
           ";
         };
 
+        timeLimit = mkOption {
+          default = 0;
+          type = with pkgs.lib.types; int;
+          description = "
+            Specifies the time limit (in seconds) to use when performing
+            searches. A value of zero (0), which is the default, is to
+            wait indefinitely for searches to be completed.
+          ";
+        };
+
         bind = {
           distinguishedName = mkOption {
             default = "";
@@ -58,6 +68,35 @@ let
               to the LDAP server (if not binding anonymously).
             ";
           };
+
+          timeLimit = mkOption {
+            default = 30;
+            type = with pkgs.lib.types; int;
+            description = "
+              Specifies the time limit (in seconds) to use when connecting
+              to the directory server. This is distinct from the time limit
+              specified in <literal>users.ldap.timeLimit</literal> and affects
+              the initial server connection only.
+            ";
+          };
+
+          policy = mkOption {
+            default = "hard_open";
+            type = with pkgs.lib.types; string;
+            description = "
+              Specifies the policy to use for reconnecting to an unavailable
+              LDAP server. The default is <literal>hard_open</literal>, which
+              reconnects if opening the connection to the directory server
+              failed. By contrast, <literal>hard_init</literal> reconnects if
+              initializing the connection failed. Initializing may not
+              actually contact the directory server, and it is possible that
+              a malformed configuration file will trigger reconnection. If
+              <literal>soft</literal> is specified, then
+              <literal>nss_ldap</literal> will return immediately on server
+              failure. All hard reconnect policies block with exponential
+              backoff before retrying.
+            ";
+          };
         };
 
       };
@@ -82,6 +121,9 @@ mkIf config.users.ldap.enable {
           ''
             uri ${config.users.ldap.server}
             base ${config.users.ldap.base}
+            timelimit ${toString config.users.ldap.timeLimit}
+            bind_timelimit ${toString config.users.ldap.bind.timeLimit}
+            bind_policy ${config.users.ldap.bind.policy}
 
             ${optionalString config.users.ldap.useTLS ''
               ssl start_tls
-- 
GitLab


From 0d2ef63b84f1b5377e925cc7ec4eb23292c203b9 Mon Sep 17 00:00:00 2001
From: Evgeny Egorochkin <phreedom.stdin@gmail.com>
Date: Mon, 31 Oct 2011 12:48:59 +0000
Subject: [PATCH 3206/5331] Quassel: fix package name

svn path=/nixos/trunk/; revision=30142
---
 modules/services/networking/quassel.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/services/networking/quassel.nix b/modules/services/networking/quassel.nix
index d5c38cfd048..e8af4926f5c 100644
--- a/modules/services/networking/quassel.nix
+++ b/modules/services/networking/quassel.nix
@@ -3,7 +3,7 @@
 with pkgs.lib;
 
 let
-  quassel = pkgs.quasselDaemon;
+  quassel = pkgs.kde4.quasselDaemon;
   cfg = config.services.quassel;
   user = if cfg.user != null then cfg.user else "quassel";
 in
-- 
GitLab


From cf03194d591ed878a4bc78eaa821bb089adad7c0 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 31 Oct 2011 21:04:39 +0000
Subject: [PATCH 3207/5331] * Disable Nepomuk/Strigi by default because they
 cause problems   (e.g. segfaults whn loggin in to the NixOS graphical ISO)
 and don't   really work very well (e.g. fail to find files).  They can be  
 re-enabled in the KDE System Settings.

svn path=/nixos/trunk/; revision=30155
---
 .../services/x11/desktop-managers/kde4.nix    | 22 ++++++++++++++++++-
 1 file changed, 21 insertions(+), 1 deletion(-)

diff --git a/modules/services/x11/desktop-managers/kde4.nix b/modules/services/x11/desktop-managers/kde4.nix
index 1bea3592c26..9ea5469d31f 100644
--- a/modules/services/x11/desktop-managers/kde4.nix
+++ b/modules/services/x11/desktop-managers/kde4.nix
@@ -10,6 +10,24 @@ let
 
   isKDE47 = pkgs.kde4 ? kde_wallpapers;
 
+  # Disable Nepomuk and Strigi by default.  As of KDE 4.7, they don't
+  # really work very well (e.g. searching files often fails to find
+  # files), segfault sometimes and consume significant resources.
+  # They can be re-enabled in the KDE System Settings under "Desktop
+  # Search".
+  nepomukConfig = pkgs.writeTextFile
+    { name = "nepomuk-config";
+      destination = "/share/config/nepomukserverrc";
+      text = 
+        ''
+          [Basic Settings]
+          Start Nepomuk=false
+
+          [Service-nepomukstrigiservice]
+          autostart=false
+        '';
+    };
+
 in
 
 {
@@ -138,7 +156,9 @@ in
           pkgs.shared_desktop_ontologies # used by nepomuk
           pkgs.strigi # used by nepomuk
         ]
-      ) ++ config.environment.kdePackages;
+      )
+      ++ [ nepmukConfig ]
+      ++ config.environment.kdePackages;
 
     environment.pathsToLink = [ "/share" ];
 
-- 
GitLab


From b024940384090772f6793ccd68dadca24a1342a9 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 31 Oct 2011 21:08:22 +0000
Subject: [PATCH 3208/5331] * Enable upower on the graphical ISO.

svn path=/nixos/trunk/; revision=30156
---
 modules/installer/cd-dvd/installation-cd-graphical.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/modules/installer/cd-dvd/installation-cd-graphical.nix b/modules/installer/cd-dvd/installation-cd-graphical.nix
index 629167f8aca..aa49c8e9848 100644
--- a/modules/installer/cd-dvd/installation-cd-graphical.nix
+++ b/modules/installer/cd-dvd/installation-cd-graphical.nix
@@ -11,4 +11,8 @@
 
   # Provide wicd for easy wireless configuration.
   networking.wicd.enable = true;
+
+  # KDE complains if power management is disabled (to be precise, if
+  # there is no power management backend such as upower).
+  powerManagement.enable = true;
 }
-- 
GitLab


From 07694cab46d96aed4b20300f142ac91de64bf55d Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 1 Nov 2011 02:53:37 +0000
Subject: [PATCH 3209/5331] * Doh.  Never rename a variable *after* testing.

svn path=/nixos/trunk/; revision=30160
---
 modules/services/x11/desktop-managers/kde4.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/services/x11/desktop-managers/kde4.nix b/modules/services/x11/desktop-managers/kde4.nix
index 9ea5469d31f..39aef7c6d56 100644
--- a/modules/services/x11/desktop-managers/kde4.nix
+++ b/modules/services/x11/desktop-managers/kde4.nix
@@ -157,7 +157,7 @@ in
           pkgs.strigi # used by nepomuk
         ]
       )
-      ++ [ nepmukConfig ]
+      ++ [ nepomukConfig ]
       ++ config.environment.kdePackages;
 
     environment.pathsToLink = [ "/share" ];
-- 
GitLab


From 71e6f6ecdcdcf5bff6e5365f9209b2dfe8929997 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 1 Nov 2011 13:44:48 +0000
Subject: [PATCH 3210/5331] * Start httpd after postgresql since the mediawiki
 subservice depends   on it.

svn path=/nixos/trunk/; revision=30161
---
 modules/services/web-servers/apache-httpd/default.nix | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/modules/services/web-servers/apache-httpd/default.nix b/modules/services/web-servers/apache-httpd/default.nix
index 4894276e1d3..39f087e4ccf 100644
--- a/modules/services/web-servers/apache-httpd/default.nix
+++ b/modules/services/web-servers/apache-httpd/default.nix
@@ -555,7 +555,12 @@ in
 
         description = "Apache HTTPD";
 
-        startOn = "started ${startingDependency} and filesystem";
+        startOn = "started ${startingDependency} and filesystem"
+          # Hacky.  Some subservices depend on Postgres
+          # (e.g. Mediawiki), but they don't have a way to declare
+          # that dependency.  So just start httpd after postgresql if
+          # the latter is enabled.
+          + optionalString config.services.postgresql.enable " and started postgresql";
 
         environment =
           { PATH = concatStringsSep ":" (
-- 
GitLab


From 3fd482677e82c043fdea987770b55226f1fd3a3a Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 1 Nov 2011 15:39:30 +0000
Subject: [PATCH 3211/5331] * modprobe wants /etc/modprobe.d now.

svn path=/nixos/trunk/; revision=30164
---
 modules/system/boot/modprobe.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/system/boot/modprobe.nix b/modules/system/boot/modprobe.nix
index 5be5546163a..ef3ed3bed94 100644
--- a/modules/system/boot/modprobe.nix
+++ b/modules/system/boot/modprobe.nix
@@ -75,7 +75,7 @@ with pkgs.lib;
             '')}
             ${config.boot.extraModprobeConfig}
           '';
-        target = "modprobe.conf";
+        target = "modprobe.d/nixos.conf";
       };
 
     boot.blacklistedKernelModules =
-- 
GitLab


From e0573105b7e3f03cf29c748970673ef52c7915bd Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 2 Nov 2011 16:10:30 +0000
Subject: [PATCH 3212/5331] * Disable stuff like ALSA and the splash screen in
 headless setups   (like EC2 instances).

svn path=/nixos/trunk/; revision=30192
---
 modules/profiles/headless.nix           | 10 ++++++++++
 modules/virtualisation/amazon-image.nix |  5 +----
 modules/virtualisation/nova-image.nix   |  2 +-
 3 files changed, 12 insertions(+), 5 deletions(-)
 create mode 100644 modules/profiles/headless.nix

diff --git a/modules/profiles/headless.nix b/modules/profiles/headless.nix
new file mode 100644
index 00000000000..08519d58e8a
--- /dev/null
+++ b/modules/profiles/headless.nix
@@ -0,0 +1,10 @@
+# Common configuration for headless machines (e.g., Amazon EC2
+# instances).
+
+{
+  sound.enable = false;
+  boot.vesa = false;
+  boot.initrd.enableSplashScreen = false;
+  services.ttyBackgrounds.enable = false;
+  services.mingetty.ttys = [ ];
+}
diff --git a/modules/virtualisation/amazon-image.nix b/modules/virtualisation/amazon-image.nix
index 66474158c68..9f1d475df2d 100644
--- a/modules/virtualisation/amazon-image.nix
+++ b/modules/virtualisation/amazon-image.nix
@@ -3,7 +3,7 @@
 with pkgs.lib;
 
 {
-  require = [ ./ec2-data.nix ];
+  require = [ ../profiles/headless.nix ./ec2-data.nix ];
 
   system.build.amazonImage =
     pkgs.vmTools.runInLinuxVM (
@@ -104,9 +104,6 @@ with pkgs.lib;
       mount -t aufs -o dirs=$targetRoot/ephemeral0/nix=rw:$targetRoot/nix=rr none $targetRoot/nix
     '';
 
-  # There are no virtual consoles.
-  services.mingetty.ttys = [ ];
-
   # Allow root logins only using the SSH key that the user specified
   # at instance creation time.
   services.openssh.enable = true;
diff --git a/modules/virtualisation/nova-image.nix b/modules/virtualisation/nova-image.nix
index 1e891c35dc0..87489c39d35 100644
--- a/modules/virtualisation/nova-image.nix
+++ b/modules/virtualisation/nova-image.nix
@@ -3,7 +3,7 @@
 with pkgs.lib;
 
 {
-  require = [ ../profiles/qemu-guest.nix ./ec2-data.nix ];
+  require = [ ../profiles/qemu-guest.nix ../profiles/headless.nix ./ec2-data.nix ];
 
   system.build.novaImage =
     pkgs.vmTools.runInLinuxVM (
-- 
GitLab


From 5cb67ef83295f8b145b8d8b518a9ace89d50dbfb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Wed, 2 Nov 2011 20:59:12 +0000
Subject: [PATCH 3213/5331] Adding a module for unbound.

svn path=/nixos/trunk/; revision=30197
---
 modules/misc/ids.nix                    |   1 +
 modules/module-list.nix                 |   1 +
 modules/services/networking/unbound.nix | 110 ++++++++++++++++++++++++
 3 files changed, 112 insertions(+)
 create mode 100644 modules/services/networking/unbound.nix

diff --git a/modules/misc/ids.nix b/modules/misc/ids.nix
index 6f97ebab743..5200d117bc1 100644
--- a/modules/misc/ids.nix
+++ b/modules/misc/ids.nix
@@ -66,6 +66,7 @@ in
     rtkit = 45;
     dovecot2 = 46;
     dovenull2 = 47;
+    unbound = 48;
 
     # When adding a uid, make sure it doesn't match an existing gid.
 
diff --git a/modules/module-list.nix b/modules/module-list.nix
index f6ee9313793..13e56dc8f68 100644
--- a/modules/module-list.nix
+++ b/modules/module-list.nix
@@ -126,6 +126,7 @@
   ./services/networking/radvd.nix
   ./services/networking/rdnssd.nix
   ./services/networking/sabnzbd.nix
+  ./services/networking/unbound.nix
   ./services/networking/ssh/lshd.nix
   ./services/networking/ssh/sshd.nix
   ./services/networking/cntlm.nix
diff --git a/modules/services/networking/unbound.nix b/modules/services/networking/unbound.nix
new file mode 100644
index 00000000000..6211acfcc84
--- /dev/null
+++ b/modules/services/networking/unbound.nix
@@ -0,0 +1,110 @@
+{ config, pkgs, ... }:
+
+with pkgs.lib;
+
+let
+
+  cfg = config.services.unbound;
+
+  username = "unbound";
+
+  stateDir = "/var/lib/unbound";
+
+  access = concatMapStrings (x: "  access-control: ${x} allow\n") cfg.allowedAccess;
+
+  interfaces = concatMapStrings (x: "  interface: ${x}\n") cfg.interfaces;
+
+  forward = optionalString (length cfg.forwardAddresses != 0)
+    "forward-zone:\n  name: .\n" +
+    concatMapStrings (x: "  forward-addr: ${x}\n") cfg.forwardAddresses;
+
+  confFile = pkgs.writeText "unbound.conf"
+    ''
+      server:
+        directory: "${stateDir}"
+        username: ${username}
+        # make sure unbound can access entropy from inside the chroot.
+        # e.g. on linux the use these commands (on BSD, devfs(8) is used):
+        #      mount --bind -n /dev/random /etc/unbound/dev/random
+        # and  mount --bind -n /dev/log /etc/unbound/dev/log
+        chroot: "${stateDir}"
+        # logfile: "${stateDir}/unbound.log"  #uncomment to use logfile.
+        pidfile: "${stateDir}/unbound.pid"
+        verbosity: 1      # uncomment and increase to get more logging.
+        # listen on all interfaces, answer queries from the local subnet.
+        ${interfaces}
+        ${access}
+        ${forward}
+    '';
+
+in
+
+{
+
+  ###### interface
+
+  options = {
+
+    services.unbound = {
+
+      enable = mkOption {
+        default = true;
+        description = "
+          Whether to enable the Unbound domain name server.
+        ";
+      };
+
+      allowedAccess = mkOption {
+        default = ["127.0.0.0/24"];
+        description = "
+          What networks are allowed to use us as a resolver.
+        ";
+      };
+
+      interfaces = mkOption {
+        default = [ "127.0.0.0" "::1" ];
+        description = "
+          What addresses the server should listen to
+        ";
+      };
+
+      forwardAddresses = mkOption {
+        default = [ ];
+        description = "
+          What servers to forward the queries to.
+        ";
+      };
+
+    };
+
+  };
+
+
+  ###### implementation
+
+  config = mkIf config.services.unbound.enable {
+    environment.systemPackages = [ pkgs.unbound ];
+
+    users.extraUsers = singleton
+      { name = username;
+        uid = config.ids.uids.unbound;
+        description = "unbound daemon user";
+        home = "/tmp";
+      };
+
+    jobs.unbound =
+      { description = "Unbound name server job";
+
+        preStart =
+          ''
+            ${pkgs.coreutils}/bin/mkdir -p ${stateDir}
+          '';
+
+        daemonType = "fork";
+
+        exec = "${pkgs.unbound}/sbin/unbound -c ${confFile}";
+      };
+
+  };
+
+}
-- 
GitLab


From 9489c5a02be3bc1bd82088bedb22170dd65f2b07 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Wed, 2 Nov 2011 21:04:32 +0000
Subject: [PATCH 3214/5331] Setting default of unbound.enable to disabled. Few
 may want it enabled.

svn path=/nixos/trunk/; revision=30198
---
 modules/services/networking/unbound.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/services/networking/unbound.nix b/modules/services/networking/unbound.nix
index 6211acfcc84..27493e4dc5b 100644
--- a/modules/services/networking/unbound.nix
+++ b/modules/services/networking/unbound.nix
@@ -48,7 +48,7 @@ in
     services.unbound = {
 
       enable = mkOption {
-        default = true;
+        default = false;
         description = "
           Whether to enable the Unbound domain name server.
         ";
-- 
GitLab


From fe566d84aef1540947b97a50dda24acd0676632b Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 3 Nov 2011 00:46:29 +0000
Subject: [PATCH 3215/5331] * Remove references to the "safemode" boot option,
 which doesn't do   anything.

svn path=/nixos/trunk/; revision=30199
---
 modules/services/hardware/udev.nix  | 4 +---
 modules/system/boot/stage-2-init.sh | 3 ---
 2 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/modules/services/hardware/udev.nix b/modules/services/hardware/udev.nix
index 2af4a50e230..98443f9758a 100644
--- a/modules/services/hardware/udev.nix
+++ b/modules/services/hardware/udev.nix
@@ -138,9 +138,7 @@ in
         Whether to try to load kernel modules for all detected hardware.
         Usually this does a good job of providing you with the modules
         you need, but sometimes it can crash the system or cause other
-        nasty effects.  If the hardware scan is turned on, it can be
-        disabled at boot time by adding the <literal>safemode</literal>
-        parameter to the kernel command line.
+        nasty effects.
       '';
     };
 
diff --git a/modules/system/boot/stage-2-init.sh b/modules/system/boot/stage-2-init.sh
index 28d721e6b65..10165049046 100644
--- a/modules/system/boot/stage-2-init.sh
+++ b/modules/system/boot/stage-2-init.sh
@@ -71,9 +71,6 @@ for o in $(cat /proc/cmdline); do
             # !!! argh, can't pass a startup event to Upstart yet.
             exec @shell@
             ;;
-        safemode)
-            safeMode=1
-            ;;
         resume=*)
             set -- $(IFS==; echo $o)
             resumeDevice=$2
-- 
GitLab


From ba1a7188c11a16b9be658f9ff5adf9c3c4c0fbb0 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 3 Nov 2011 01:29:40 +0000
Subject: [PATCH 3216/5331] * Don't get the hostname from EC2 if one has been
 set explicitly.

svn path=/nixos/trunk/; revision=30200
---
 modules/virtualisation/ec2-data.nix | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/modules/virtualisation/ec2-data.nix b/modules/virtualisation/ec2-data.nix
index 7a8c957af09..f55e6b69650 100644
--- a/modules/virtualisation/ec2-data.nix
+++ b/modules/virtualisation/ec2-data.nix
@@ -4,6 +4,8 @@
 
 { config, pkgs, ... }:
 
+with pkgs.lib;
+
 {
 
   jobs.fetchEC2Data =
@@ -16,7 +18,9 @@
       script =
         ''
           echo "setting host name..."
-          ${pkgs.nettools}/bin/hostname $(${pkgs.curl}/bin/curl http://169.254.169.254/1.0/meta-data/hostname)
+          ${optionalString (config.networking.hostName == "") ''
+            ${pkgs.nettools}/bin/hostname $(${pkgs.curl}/bin/curl http://169.254.169.254/1.0/meta-data/hostname)
+          ''}
 
           # Don't download the SSH key if it has already been injected
           # into the image (a Nova feature).
-- 
GitLab


From 0309f02fc5310dbc28fb6e66197cb5e1c18158ad Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 3 Nov 2011 02:14:40 +0000
Subject: [PATCH 3217/5331] * Add period.

svn path=/nixos/trunk/; revision=30201
---
 modules/services/networking/unbound.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/services/networking/unbound.nix b/modules/services/networking/unbound.nix
index 27493e4dc5b..3c35c0c1dd5 100644
--- a/modules/services/networking/unbound.nix
+++ b/modules/services/networking/unbound.nix
@@ -64,7 +64,7 @@ in
       interfaces = mkOption {
         default = [ "127.0.0.0" "::1" ];
         description = "
-          What addresses the server should listen to
+          What addresses the server should listen to.
         ";
       };
 
-- 
GitLab


From aac71e8f95b47d0a8a34d63be283b708f57cda7c Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 3 Nov 2011 02:14:57 +0000
Subject: [PATCH 3218/5331] * Add a module for DRBD.

svn path=/nixos/trunk/; revision=30202
---
 modules/module-list.nix                       |  1 +
 modules/services/network-filesystems/drbd.nix | 77 +++++++++++++++++++
 .../activation/switch-to-configuration.sh     |  2 +-
 3 files changed, 79 insertions(+), 1 deletion(-)
 create mode 100644 modules/services/network-filesystems/drbd.nix

diff --git a/modules/module-list.nix b/modules/module-list.nix
index 13e56dc8f68..6ba0c447aed 100644
--- a/modules/module-list.nix
+++ b/modules/module-list.nix
@@ -96,6 +96,7 @@
   ./services/monitoring/systemhealth.nix
   ./services/monitoring/zabbix-agent.nix
   ./services/monitoring/zabbix-server.nix
+  ./services/network-filesystems/drbd.nix
   ./services/network-filesystems/nfs-kernel.nix
   ./services/network-filesystems/openafs-client/default.nix
   ./services/network-filesystems/samba.nix
diff --git a/modules/services/network-filesystems/drbd.nix b/modules/services/network-filesystems/drbd.nix
new file mode 100644
index 00000000000..1c70d44f6ba
--- /dev/null
+++ b/modules/services/network-filesystems/drbd.nix
@@ -0,0 +1,77 @@
+# Support for DRBD, the Distributed Replicated Block Device.
+
+{ config, pkgs, ... }:
+
+with pkgs.lib;
+
+let cfg = config.services.drbd; in
+
+{
+
+  ###### interface
+
+  options = {
+
+    services.drbd.enable = mkOption {
+      default = false;
+      type = types.bool;
+      description = ''
+        Whether to enable support for DRBD, the Distributed Replicated
+        Block Device.
+      '';
+    };
+
+    services.drbd.config = mkOption {
+      default = "";
+      type = types.string;
+      description = ''
+        Contents of the <filename>drbd.conf</filename> configuration file.
+      '';
+    };
+
+  };
+
+  
+  ###### implementation
+
+  config = mkIf cfg.enable {
+  
+    environment.systemPackages = [ pkgs.drbd ];
+    
+    services.udev.packages = [ pkgs.drbd ];
+
+    boot.kernelModules = [ "drbd" ];
+
+    boot.extraModprobeConfig =
+      ''
+        options drbd usermode_helper=/var/run/current-system/sw/sbin/drbdadm
+      '';
+
+    environment.etc = singleton
+      { source = pkgs.writeText "drbd.conf" cfg.config;
+        target = "drbd.conf";
+      };
+
+    jobs.drbd_up =
+      { name = "drbd-up";
+        startOn = "stopped udevtrigger or ip-up";
+        task = true;
+        script =
+          ''
+            ${pkgs.drbd}/sbin/drbdadm up all
+          '';
+      };
+    
+    jobs.drbd_down =
+      { name = "drbd-down";
+        startOn = "starting shutdown";
+        task = true;
+        script =
+          ''
+            ${pkgs.drbd}/sbin/drbdadm down all
+          '';
+      };
+    
+  };
+  
+}
diff --git a/modules/system/activation/switch-to-configuration.sh b/modules/system/activation/switch-to-configuration.sh
index 2586d492d9e..3be1b210d6a 100644
--- a/modules/system/activation/switch-to-configuration.sh
+++ b/modules/system/activation/switch-to-configuration.sh
@@ -114,7 +114,7 @@ EOF
 	# Xen domains unless we have to.
         # TODO: Jobs should be able to declare that they should not be
 	# auto-restarted.
-        if echo "$job" | grep -q "^shutdown$\|^control-alt-delete$\|^xserver$\|^dbus$\|^disnix$\|^emergency-shell$\|^xendomains$\|^udevtrigger$"; then continue; fi
+        if echo "$job" | grep -q "^shutdown$\|^control-alt-delete$\|^xserver$\|^dbus$\|^disnix$\|^emergency-shell$\|^xendomains$\|^udevtrigger$\|^drbd-down$"; then continue; fi
 
         if ! test -e "$oldJobs/$job.conf"; then
             echo "starting $job..."
-- 
GitLab


From a4d2682238cd2e2d70d06640e9fa80f44c13c16d Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 3 Nov 2011 02:15:33 +0000
Subject: [PATCH 3219/5331] * Remove loopback devices during shutdown, since
 they may prevent   filesystems from being unmounted.

svn path=/nixos/trunk/; revision=30203
---
 modules/system/upstart-events/shutdown.nix | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/modules/system/upstart-events/shutdown.nix b/modules/system/upstart-events/shutdown.nix
index cf06ba10d08..32966f03cdb 100644
--- a/modules/system/upstart-events/shutdown.nix
+++ b/modules/system/upstart-events/shutdown.nix
@@ -88,6 +88,13 @@ with pkgs.lib;
               tryAgain=
               failed= # list of mount points that couldn't be unmounted/remounted
 
+              # Get rid of loopback devices.
+              loDevices=$(losetup -a | sed 's#^\(/dev/loop[0-9]\+\).*#\1#')
+              if [ -n "$loDevices" ]; then
+                  echo "removing loopback devices $loDevices..."
+                  losetup -d $loDevices
+              fi
+
               cp /proc/mounts /dev/.mounts # don't read /proc/mounts while it's changing
               exec 4< /dev/.mounts
               while read -u 4 device mp fstype options rest; do
-- 
GitLab


From efc64042e081c755e46c8b07d74be6b8e4d17e5f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Thu, 3 Nov 2011 18:49:54 +0000
Subject: [PATCH 3220/5331] Adding extraConfig to unbound

svn path=/nixos/trunk/; revision=30211
---
 modules/services/networking/unbound.nix | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/modules/services/networking/unbound.nix b/modules/services/networking/unbound.nix
index 3c35c0c1dd5..fb75b4ed069 100644
--- a/modules/services/networking/unbound.nix
+++ b/modules/services/networking/unbound.nix
@@ -32,9 +32,10 @@ let
         pidfile: "${stateDir}/unbound.pid"
         verbosity: 1      # uncomment and increase to get more logging.
         # listen on all interfaces, answer queries from the local subnet.
-        ${interfaces}
-        ${access}
-        ${forward}
+      ${interfaces}
+      ${access}
+      ${forward}
+      ${cfg.extraConfig}
     '';
 
 in
@@ -75,6 +76,13 @@ in
         ";
       };
 
+      extraConfig = mkOption {
+        default = "";
+        description = "
+          Extra unbound config
+        ";
+      };
+
     };
 
   };
-- 
GitLab


From d77fc84d2f12ff598a58cb679626e89a3a77f132 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 3 Nov 2011 19:04:54 +0000
Subject: [PATCH 3221/5331] * For consistency, use /etc/nix/nix.conf instead of
 /nix/etc/nix/nix.conf.   There is really no reason to have a configuration
 file outside of /etc,   and it's consistent with what the Fedora/Debian
 packages for Nix use.

svn path=/nixos/trunk/; revision=30212
---
 modules/services/misc/nix-daemon.nix  | 6 ++----
 modules/services/scheduling/cron.nix  | 2 +-
 modules/services/scheduling/fcron.nix | 2 +-
 3 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/modules/services/misc/nix-daemon.nix b/modules/services/misc/nix-daemon.nix
index 221ad6e1f54..1f95e63b64a 100644
--- a/modules/services/misc/nix-daemon.nix
+++ b/modules/services/misc/nix-daemon.nix
@@ -226,7 +226,7 @@ in
                 $extraOptions
                 END
               '';
-          target = "nix.conf"; # will be symlinked from /nix/etc/nix/nix.conf in activate-configuration.sh.
+          target = "nix/nix.conf";
         }
       ]
 
@@ -281,7 +281,7 @@ in
 
     nix.envVars =
       ''
-        export NIX_CONF_DIR=/nix/etc/nix
+        export NIX_CONF_DIR=/etc/nix
 
         # Enable the copy-from-other-stores substituter, which allows builds
         # to be sped up by copying build results from remote Nix stores.  To
@@ -306,8 +306,6 @@ in
     system.activationScripts.nix = stringAfter [ "etc" "users" ]
       ''
         # Set up Nix.
-        mkdir -p /nix/etc/nix
-        ln -sfn /etc/nix.conf /nix/etc/nix/nix.conf
         chown root.nixbld /nix/store
         chmod 1775 /nix/store
 
diff --git a/modules/services/scheduling/cron.nix b/modules/services/scheduling/cron.nix
index 9a81eb6e72c..86ac32b94dc 100644
--- a/modules/services/scheduling/cron.nix
+++ b/modules/services/scheduling/cron.nix
@@ -12,7 +12,7 @@ let
       SHELL=${pkgs.bash}/bin/bash
       PATH=${config.system.path}/bin:${config.system.path}/sbin
       MAILTO="${config.services.cron.mailto}"
-      NIX_CONF_DIR=/nix/etc/nix
+      NIX_CONF_DIR=/etc/nix
       ${pkgs.lib.concatStrings (map (job: job + "\n") config.services.cron.systemCronJobs)}
     '';
 
diff --git a/modules/services/scheduling/fcron.nix b/modules/services/scheduling/fcron.nix
index bf70bb65727..1dbaefdd719 100644
--- a/modules/services/scheduling/fcron.nix
+++ b/modules/services/scheduling/fcron.nix
@@ -13,7 +13,7 @@ let
       SHELL=${pkgs.bash}/bin/bash
       PATH=${config.system.path}/bin:${config.system.path}/sbin
       MAILTO="${config.services.cron.mailto}"
-      NIX_CONF_DIR=/nix/etc/nix
+      NIX_CONF_DIR=/etc/nix
       ${pkgs.lib.concatStrings (map (job: job + "\n") config.services.cron.systemCronJobs)}
     '';
 
-- 
GitLab


From 2825a3a6ae86fb0f0d8bb3dea42f58f0825a7d80 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Thu, 3 Nov 2011 19:13:52 +0000
Subject: [PATCH 3222/5331] Allowing 'named' to have a config file apart, as it
 can have passwords.

svn path=/nixos/trunk/; revision=30213
---
 modules/services/networking/bind.nix | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/modules/services/networking/bind.nix b/modules/services/networking/bind.nix
index 54eb5e08e9b..4f69ff4c84a 100644
--- a/modules/services/networking/bind.nix
+++ b/modules/services/networking/bind.nix
@@ -96,6 +96,14 @@ in
         }];
       };
 
+      configFile = mkOption {
+        default = confFile;
+        description = "
+          Overridable config file to use for named. By default, that
+          generated by nixos.
+        ";
+      };
+
     };
 
   };
@@ -113,7 +121,7 @@ in
             ${pkgs.coreutils}/bin/mkdir -p /var/run/named
           '';
 
-        exec = "${pkgs.bind}/sbin/named -c ${confFile} -f";
+        exec = "${pkgs.bind}/sbin/named -c ${cfg.configFile} -f";
       };
 
   };
-- 
GitLab


From c5955e5474e7cd20d3383f1fad9288ad9d3d3f1c Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 3 Nov 2011 20:11:11 +0000
Subject: [PATCH 3223/5331] * In EC2 instances, a kernel panic should cause a
 reboot, and a   problem in stage 1 should cause a panic.  (Actually, the
 latter   should probably kill the instance since we can't repair it  
 anyway...)

svn path=/nixos/trunk/; revision=30215
---
 modules/profiles/headless.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/modules/profiles/headless.nix b/modules/profiles/headless.nix
index 08519d58e8a..d607d6700c6 100644
--- a/modules/profiles/headless.nix
+++ b/modules/profiles/headless.nix
@@ -7,4 +7,7 @@
   boot.initrd.enableSplashScreen = false;
   services.ttyBackgrounds.enable = false;
   services.mingetty.ttys = [ ];
+
+  # Since we can't manually respond to a panic, just reboot.
+  boot.kernelParams = [ "panic=1" "stage1panic=1" ];
 }
-- 
GitLab


From 1f9bb7706a806cbf4651a27d79680e8470ce67f4 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 4 Nov 2011 01:31:18 +0000
Subject: [PATCH 3224/5331] * Script for building, uploading and registering
 NixOS AMIs in all EC2   regions (not finished yet).

svn path=/nixos/trunk/; revision=30218
---
 maintainers/scripts/create-amis.sh | 37 ++++++++++++++++++++++++++++++
 1 file changed, 37 insertions(+)
 create mode 100755 maintainers/scripts/create-amis.sh

diff --git a/maintainers/scripts/create-amis.sh b/maintainers/scripts/create-amis.sh
new file mode 100755
index 00000000000..2ea5c64d587
--- /dev/null
+++ b/maintainers/scripts/create-amis.sh
@@ -0,0 +1,37 @@
+#! /bin/sh -e
+
+revision=$(svnversion "$NIXOS")
+echo "NixOS revision is $revision"
+
+buildAndUploadFor() {
+    system="$1"
+    arch="$2"
+
+    NIXOS_CONFIG=$NIXOS/modules/virtualisation/amazon-config.nix nix-build "$NIXOS" \
+        -A config.system.build.amazonImage --argstr system "$system" -o ec2-ami
+
+    ec2-bundle-image -i ./ec2-ami/nixos.img --user "$AWS_ACCOUNT" --arch "$arch" \
+        -c "$EC2_CERT" -k "$EC2_PRIVATE_KEY"
+
+    name="$(echo nixos-$arch-r$revision | tr '[A-Z]' '[a-z]')"
+    bucket="$name-eu"
+    ec2-upload-bundle -b "$bucket" -m /tmp/nixos.img.manifest.xml \
+        -a "$AWS_ACCESS_KEY_ID" -s "$AWS_SECRET_ACCESS_KEY" --location EU
+
+    region="eu-west-1"
+
+    kernel=$(ec2-describe-images -o amazon --filter "manifest-location=*pv-grub-hd0_1.02-$arch*" --region "$region" | cut -f 2)
+    echo "using PV-GRUB kernel $kernel"
+
+    ami=$(ec2-register "$bucket/nixos.img.manifest.xml" -n "$bucket" -d "NixOS $system r$revision" \
+        --region "$region" --kernel "$kernel" | cut -f 1)
+
+    echo "AMI ID is $ami"
+
+    echo "$system" "$region" "$ami" >> amis
+
+    ec2-modify-image-attribute "$ami" -l -a all
+}
+
+buildAndUploadFor i686-linux i386
+#buildAndUploadFor x86_64-linux x86_64
-- 
GitLab


From 7198c278976bcbb7f7597150645a77d7d38965ad Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 4 Nov 2011 02:30:59 +0000
Subject: [PATCH 3225/5331] * Bug fix.

svn path=/nixos/trunk/; revision=30219
---
 maintainers/scripts/create-amis.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/maintainers/scripts/create-amis.sh b/maintainers/scripts/create-amis.sh
index 2ea5c64d587..8f8c198957e 100755
--- a/maintainers/scripts/create-amis.sh
+++ b/maintainers/scripts/create-amis.sh
@@ -24,7 +24,7 @@ buildAndUploadFor() {
     echo "using PV-GRUB kernel $kernel"
 
     ami=$(ec2-register "$bucket/nixos.img.manifest.xml" -n "$bucket" -d "NixOS $system r$revision" \
-        --region "$region" --kernel "$kernel" | cut -f 1)
+        --region "$region" --kernel "$kernel" | cut -f 2)
 
     echo "AMI ID is $ami"
 
-- 
GitLab


From 1ac56c233e4b21637df6a1cb80b8703d47049165 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 4 Nov 2011 03:50:17 +0000
Subject: [PATCH 3226/5331] * Handle x86_64.

svn path=/nixos/trunk/; revision=30220
---
 maintainers/scripts/create-amis.sh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/maintainers/scripts/create-amis.sh b/maintainers/scripts/create-amis.sh
index 8f8c198957e..985eea727f1 100755
--- a/maintainers/scripts/create-amis.sh
+++ b/maintainers/scripts/create-amis.sh
@@ -13,7 +13,7 @@ buildAndUploadFor() {
     ec2-bundle-image -i ./ec2-ami/nixos.img --user "$AWS_ACCOUNT" --arch "$arch" \
         -c "$EC2_CERT" -k "$EC2_PRIVATE_KEY"
 
-    name="$(echo nixos-$arch-r$revision | tr '[A-Z]' '[a-z]')"
+    name="$(echo nixos-$arch-r$revision | tr '[A-Z]_' '[a-z]-')"
     bucket="$name-eu"
     ec2-upload-bundle -b "$bucket" -m /tmp/nixos.img.manifest.xml \
         -a "$AWS_ACCESS_KEY_ID" -s "$AWS_SECRET_ACCESS_KEY" --location EU
@@ -33,5 +33,5 @@ buildAndUploadFor() {
     ec2-modify-image-attribute "$ami" -l -a all
 }
 
-buildAndUploadFor i686-linux i386
-#buildAndUploadFor x86_64-linux x86_64
+#buildAndUploadFor i686-linux i386
+buildAndUploadFor x86_64-linux x86_64
-- 
GitLab


From 6f8e30313f3432f78e6a0b48bf3639bd54be4126 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 4 Nov 2011 17:40:00 +0000
Subject: [PATCH 3227/5331] * The "audio" group should always exist, even if
 the ALSA module is   disabled, because udev rules refer to it.

svn path=/nixos/trunk/; revision=30229
---
 modules/config/users-groups.nix | 3 +++
 modules/services/audio/alsa.nix | 9 +--------
 2 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/modules/config/users-groups.nix b/modules/config/users-groups.nix
index 19ec0655ab1..0e02822fb77 100644
--- a/modules/config/users-groups.nix
+++ b/modules/config/users-groups.nix
@@ -77,6 +77,9 @@ let
           { name = "tape";
             gid = ids.gids.tape;
           }
+          { name = "audio";
+            gid = ids.gids.audio;
+          }
           { name = "video";
             gid = ids.gids.video;
           }
diff --git a/modules/services/audio/alsa.nix b/modules/services/audio/alsa.nix
index ea0e1ef29c0..7f313c36cb9 100644
--- a/modules/services/audio/alsa.nix
+++ b/modules/services/audio/alsa.nix
@@ -43,14 +43,7 @@ in
 
   config = mkIf config.sound.enable {
 
-    environment.systemPackages = [alsaUtils];
-
-    users.extraGroups = singleton
-      { # Alsalib seems to require the existence of this group, even
-        # if it's not used (e.g., doesn't own any devices).
-        name = "audio";
-        gid = config.ids.gids.audio;
-      };
+    environment.systemPackages = [ alsaUtils ];
 
     jobs.alsa =
       { startOn = "stopped udevtrigger";
-- 
GitLab


From 4abfacb46842cfadcab4563a830ee1f25a4be813 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 4 Nov 2011 18:49:59 +0000
Subject: [PATCH 3228/5331] * In the initrd, automatically mount all available
 ephemeral disks.   This depends on the EC2 instance type, so we have to probe
 for them.

svn path=/nixos/trunk/; revision=30234
---
 modules/virtualisation/amazon-image.nix | 67 +++++++++++++++++--------
 1 file changed, 46 insertions(+), 21 deletions(-)

diff --git a/modules/virtualisation/amazon-image.nix b/modules/virtualisation/amazon-image.nix
index 9f1d475df2d..94722bb7911 100644
--- a/modules/virtualisation/amazon-image.nix
+++ b/modules/virtualisation/amazon-image.nix
@@ -66,15 +66,8 @@ with pkgs.lib;
     [ { mountPoint = "/";
         device = "/dev/disk/by-label/nixos";
       }
-      { mountPoint = "/ephemeral0";
-        device = "/dev/xvdc";
-        neededForBoot = true;
-      }
     ];
 
-  swapDevices =
-    [ { device = "/dev/xvdb"; } ];
-
   boot.initrd.kernelModules = [ "xen-blkfront" "aufs" ];
   boot.kernelModules = [ "xen-netfront" ];
 
@@ -85,23 +78,55 @@ with pkgs.lib;
   boot.loader.grub.timeout = 0;
   boot.loader.grub.extraPerEntryConfig = "root (hd0)";
 
-  # Put /tmp and /var on /ephemeral0, which has a lot more space.
-  # Unfortunately we can't do this with the `fileSystems' option
-  # because it has no support for creating the source of a bind
-  # mount.  Also, "move" /nix to /ephemeral0 by layering an AUFS
-  # on top of it so we have a lot more space for Nix operations.
+  # Mount all formatted ephemeral disks and activate all swap devices.
+  # We cannot do this with the ‘fileSystems’ and ‘swapDevices’ options
+  # because the set of devices is dependent on the instance type
+  # (e.g. "m1.large" has one ephemeral filesystem and one swap device,
+  # while "m1.large" has two ephemeral filesystems and no swap
+  # devices).  Also, put /tmp and /var on /disk0, since it has a lot
+  # more space than the root device.  Similarly, "move" /nix to /disk0
+  # by layering an AUFS on top of it so we have a lot more space for
+  # Nix operations.
   boot.initrd.postMountCommands =
     ''
-      mkdir -m 1777 -p $targetRoot/ephemeral0/tmp
-      mkdir -m 1777 -p $targetRoot/tmp
-      mount --bind $targetRoot/ephemeral0/tmp $targetRoot/tmp
-
-      mkdir -m 755 -p $targetRoot/ephemeral0/var
-      mkdir -m 755 -p $targetRoot/var
-      mount --bind $targetRoot/ephemeral0/var $targetRoot/var
+      diskNr=0
+      diskForAufs=
+      for device in /dev/xvd*; do
+          if [ "$device" = /dev/xvda1 ]; then continue; fi
+          fsType=$(blkid -o value -s TYPE "$device" || true)
+          if [ "$fsType" = swap ]; then
+              echo "activating swap device $device..."
+              swapon "$device" || true
+          elif [ "$fsType" = ext3 ]; then
+              mp="/disk$diskNr"
+              diskNr=$((diskNr + 1))
+              echo "mounting $device om $mp..."
+              if mountFS "$device" "$mp" "" ext3; then
+                  if [ -z "$diskForAufs" ]; then diskForAufs="$mp"; fi
+              fi
+          else
+              echo "skipping unknown device type $device"
+          fi
+      done
+
+      if [ -n "$diskForAufs" ]; then
+          mkdir -m 755 -p $targetRoot/$diskForAufs/root
+
+          mkdir -m 1777 -p $targetRoot/$diskForAufs/root/tmp $targetRoot/tmp
+          mount --bind $targetRoot/$diskForAufs/root/tmp $targetRoot/tmp
+
+          mkdir -m 755 -p $targetRoot/$diskForAufs/root/var $targetRoot/var
+          mount --bind $targetRoot/$diskForAufs/root/var $targetRoot/var
+
+          mkdir -m 755 -p $targetRoot/$diskForAufs/root/nix
+          mount -t aufs -o dirs=$targetRoot/$diskForAufs/root/nix=rw:$targetRoot/nix=rr none $targetRoot/nix
+      fi
+    '';
 
-      mkdir -m 755 -p $targetRoot/ephemeral0/nix
-      mount -t aufs -o dirs=$targetRoot/ephemeral0/nix=rw:$targetRoot/nix=rr none $targetRoot/nix
+  boot.initrd.extraUtilsCommands =
+    ''
+      # We need swapon in the initrd.
+      cp ${pkgs.utillinux}/sbin/swapon $out/bin
     '';
 
   # Allow root logins only using the SSH key that the user specified
-- 
GitLab


From 8a0a0efb48adeebd516a3b3cdf407bd9ddcfe10f Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 4 Nov 2011 20:06:59 +0000
Subject: [PATCH 3229/5331] * Force getting the hostname from EC2.

svn path=/nixos/trunk/; revision=30235
---
 modules/virtualisation/amazon-image.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/modules/virtualisation/amazon-image.nix b/modules/virtualisation/amazon-image.nix
index 94722bb7911..7608f457465 100644
--- a/modules/virtualisation/amazon-image.nix
+++ b/modules/virtualisation/amazon-image.nix
@@ -133,4 +133,7 @@ with pkgs.lib;
   # at instance creation time.
   services.openssh.enable = true;
   services.openssh.permitRootLogin = "without-password";
+
+  # Force getting the hostname from EC2.
+  networking.hostName = mkDefault "";
 }
-- 
GitLab


From 3d5f3aa2b4b4f4fbd71c8887d3a24239ed2062ff Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 4 Nov 2011 20:33:24 +0000
Subject: [PATCH 3230/5331] * Print the host key after sshd has started to
 prevent a potential race.

svn path=/nixos/trunk/; revision=30236
---
 modules/virtualisation/ec2-data.nix | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/modules/virtualisation/ec2-data.nix b/modules/virtualisation/ec2-data.nix
index f55e6b69650..b0072f4f890 100644
--- a/modules/virtualisation/ec2-data.nix
+++ b/modules/virtualisation/ec2-data.nix
@@ -39,7 +39,15 @@ with pkgs.lib;
                   rm -f /root/key.pub
               fi
           fi
+        '';
+    };
 
+  jobs.printHostKey =
+    { name = "print-host-key";
+      task = true;
+      startOn = "started sshd";
+      script =
+        ''
           # Print the host public key on the console so that the user
           # can obtain it securely by parsing the output of
           # ec2-get-console-output.
@@ -49,5 +57,4 @@ with pkgs.lib;
         '';
     };
 
-
 }
-- 
GitLab


From 5e5328cb2e2ed7a9b6e9062dcdfe8fe87c5c8925 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sat, 5 Nov 2011 01:44:56 +0000
Subject: [PATCH 3231/5331] * Get the SSH host key from the user data if
 available.  This allows   the user to create an instance with a known host
 key, and thus   permit a secure connection.

svn path=/nixos/trunk/; revision=30242
---
 modules/virtualisation/ec2-data.nix | 26 ++++++++++++++++++++++----
 1 file changed, 22 insertions(+), 4 deletions(-)

diff --git a/modules/virtualisation/ec2-data.nix b/modules/virtualisation/ec2-data.nix
index b0072f4f890..42e3cb67566 100644
--- a/modules/virtualisation/ec2-data.nix
+++ b/modules/virtualisation/ec2-data.nix
@@ -15,11 +15,15 @@ with pkgs.lib;
 
       task = true;
 
+      path = [ pkgs.curl ];
+
       script =
         ''
+          curl="curl --retry 3 --retry-delay 0 --fail"
+        
           echo "setting host name..."
           ${optionalString (config.networking.hostName == "") ''
-            ${pkgs.nettools}/bin/hostname $(${pkgs.curl}/bin/curl http://169.254.169.254/1.0/meta-data/hostname)
+            ${pkgs.nettools}/bin/hostname $($curl http://169.254.169.254/1.0/meta-data/hostname)
           ''}
 
           # Don't download the SSH key if it has already been injected
@@ -27,9 +31,7 @@ with pkgs.lib;
           if ! [ -e /root/.ssh/authorized_keys ]; then
               echo "obtaining SSH key..."
               mkdir -p /root/.ssh
-              ${pkgs.curl}/bin/curl --retry 3 --retry-delay 0 --fail \
-                -o /root/key.pub \
-                http://169.254.169.254/1.0/meta-data/public-keys/0/openssh-key
+              $curl -o /root/key.pub http://169.254.169.254/1.0/meta-data/public-keys/0/openssh-key
               if [ $? -eq 0 -a -e /root/key.pub ]; then
                   if ! grep -q -f /root/key.pub /root/.ssh/authorized_keys; then
                       cat /root/key.pub >> /root/.ssh/authorized_keys
@@ -39,6 +41,18 @@ with pkgs.lib;
                   rm -f /root/key.pub
               fi
           fi
+
+          # Extract the intended SSH host key for this machine from
+          # the supplied user data, if available.  Otherwise sshd will
+          # generate one normally.
+          $curl http://169.254.169.254/2011-01-01/user-data > /root/user-data || true
+          key="$(sed 's/|/\n/g; s/SSH_HOST_DSA_KEY://; t; d' /root/user-data)"
+          key_pub="$(sed 's/SSH_HOST_DSA_KEY_PUB://; t; d' /root/user-data)"
+          if [ -n "$key" -a -n "$key_pub" -a ! -e /etc/ssh/ssh_host_dsa_key ]; then
+              mkdir -m 0755 -p /etc/ssh
+              (umask 077; echo "$key" > /etc/ssh/ssh_host_dsa_key)
+              echo "$key_pub" > /etc/ssh/ssh_host_dsa_key.pub
+          fi
         '';
     };
 
@@ -57,4 +71,8 @@ with pkgs.lib;
         '';
     };
 
+  # Only start sshd after we've obtained the host key (if given in the
+  # user data), otherwise the sshd job will generate one itself.
+  jobs.sshd.startOn = mkOverride 90 "stopped fetch-ec2-data";
+
 }
-- 
GitLab


From 848485a043938048089e5514583583c18352dde1 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 8 Nov 2011 14:29:35 +0000
Subject: [PATCH 3232/5331] * Remove installation-cd-rescue as it's not used,
 and the other CDs   should also contain all appropriate rescue tools.

svn path=/nixos/trunk/; revision=30320
---
 modules/installer/cd-dvd/installation-cd-rescue.nix | 11 -----------
 1 file changed, 11 deletions(-)
 delete mode 100644 modules/installer/cd-dvd/installation-cd-rescue.nix

diff --git a/modules/installer/cd-dvd/installation-cd-rescue.nix b/modules/installer/cd-dvd/installation-cd-rescue.nix
deleted file mode 100644
index 43b9c9e2b7c..00000000000
--- a/modules/installer/cd-dvd/installation-cd-rescue.nix
+++ /dev/null
@@ -1,11 +0,0 @@
-# This module defines a small NixOS installation CD.  It does not
-# contain any graphical stuff.
-
-{config, pkgs, ...}:
-
-{
-  require = [
-    ./installation-cd-base.nix
-    ../../profiles/rescue.nix
-  ];
-}
-- 
GitLab


From 3e30d87c265bfdb9558905e014225e2ebd56909e Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 8 Nov 2011 15:12:11 +0000
Subject: [PATCH 3233/5331] * aufs2 -> aufs.

svn path=/nixos/trunk/; revision=30323
---
 modules/installer/cd-dvd/iso-image.nix  | 13 ++++---------
 modules/virtualisation/amazon-image.nix |  2 +-
 modules/virtualisation/nova-image.nix   |  2 +-
 modules/virtualisation/qemu-vm.nix      |  2 +-
 4 files changed, 7 insertions(+), 12 deletions(-)

diff --git a/modules/installer/cd-dvd/iso-image.nix b/modules/installer/cd-dvd/iso-image.nix
index daeebde76cf..0a2f76c919c 100644
--- a/modules/installer/cd-dvd/iso-image.nix
+++ b/modules/installer/cd-dvd/iso-image.nix
@@ -154,15 +154,10 @@ in
   # We need squashfs in the initrd to mount the compressed Nix store,
   # and aufs to make the root filesystem appear writable.
   boot.extraModulePackages =
-    let features = config.boot.kernelPackages.kernel.features; in
-
-    pkgs.stdenv.lib.singleton (if features ? aufs2 && features.aufs2 then
-      config.boot.kernelPackages.aufs2
-    else if features ? aufs2_1 && features.aufs2_1 then
-      config.boot.kernelPackages.aufs2_1
-    else if features ? aufs3 && features.aufs3 then
-      config.boot.kernelPackages.aufs3
-    else abort "This kernel doesn't have aufs enabled");
+    if config.boot.kernelPackages.aufs == null then
+      abort "This kernel doesn't have aufs enabled"
+    else
+      [ config.boot.kernelPackages.aufs ];
 
   boot.initrd.availableKernelModules = [ "aufs" "squashfs" "iso9660" ];
 
diff --git a/modules/virtualisation/amazon-image.nix b/modules/virtualisation/amazon-image.nix
index 7608f457465..c1c31358d8c 100644
--- a/modules/virtualisation/amazon-image.nix
+++ b/modules/virtualisation/amazon-image.nix
@@ -71,7 +71,7 @@ with pkgs.lib;
   boot.initrd.kernelModules = [ "xen-blkfront" "aufs" ];
   boot.kernelModules = [ "xen-netfront" ];
 
-  boot.extraModulePackages = [ config.boot.kernelPackages.aufs2 ];
+  boot.extraModulePackages = [ config.boot.kernelPackages.aufs ];
 
   # Generate a GRUB menu.  Amazon's pv-grub uses this to boot our kernel/initrd.
   boot.loader.grub.device = "nodev";
diff --git a/modules/virtualisation/nova-image.nix b/modules/virtualisation/nova-image.nix
index 87489c39d35..ea4dbcc4dd4 100644
--- a/modules/virtualisation/nova-image.nix
+++ b/modules/virtualisation/nova-image.nix
@@ -78,7 +78,7 @@ with pkgs.lib;
 
   boot.initrd.kernelModules = [ "aufs" ];
 
-  boot.extraModulePackages = [ config.boot.kernelPackages.aufs2 ];
+  boot.extraModulePackages = [ config.boot.kernelPackages.aufs ];
 
   boot.loader.grub.version = 2;
   boot.loader.grub.device = "/dev/vda";
diff --git a/modules/virtualisation/qemu-vm.nix b/modules/virtualisation/qemu-vm.nix
index 7738ce1f2e7..9f6801e89cc 100644
--- a/modules/virtualisation/qemu-vm.nix
+++ b/modules/virtualisation/qemu-vm.nix
@@ -244,7 +244,7 @@ in
     ++ optional cfg.writableStore [ "aufs" ];
 
   boot.extraModulePackages =
-    optional cfg.writableStore config.boot.kernelPackages.aufs2;
+    optional cfg.writableStore config.boot.kernelPackages.aufs;
 
   boot.initrd.extraUtilsCommands =
     ''
-- 
GitLab


From a76fe106e74df5f567b56b92411437a76549e83e Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 8 Nov 2011 15:39:13 +0000
Subject: [PATCH 3234/5331] * nixos-hardware-scan: don't emit an include of an
 "install profile".   That's confusing and wrong: nixos-hardware-scan should
 just enable   support for the detected hardware, not enable lots of software
 (let   alone KDE).

svn path=/nixos/trunk/; revision=30325
---
 modules/installer/tools/nixos-hardware-scan.pl | 1 -
 modules/installer/tools/tools.nix              | 9 ---------
 2 files changed, 10 deletions(-)

diff --git a/modules/installer/tools/nixos-hardware-scan.pl b/modules/installer/tools/nixos-hardware-scan.pl
index 5187068e069..31b07a57280 100644
--- a/modules/installer/tools/nixos-hardware-scan.pl
+++ b/modules/installer/tools/nixos-hardware-scan.pl
@@ -230,7 +230,6 @@ print <<EOF ;
 
 {
   require = [
-    "\${modulesPath}/profiles/@profile@.nix"
     "\${modulesPath}/installer/scan/not-detected.nix"
   ];
 
diff --git a/modules/installer/tools/tools.nix b/modules/installer/tools/tools.nix
index 069e45127ef..4520b7bb1eb 100644
--- a/modules/installer/tools/tools.nix
+++ b/modules/installer/tools/tools.nix
@@ -49,7 +49,6 @@ let
     name = "nixos-hardware-scan";
     src = ./nixos-hardware-scan.pl;
     inherit (pkgs) perl;
-    profile = cfg.installProfile;
   };
 
   nixosOption = makeProg {
@@ -103,14 +102,6 @@ in
       '';
     };
 
-    installer.installProfile = pkgs.lib.mkOption {
-      default = "base";
-      example = "graphical";
-      description = ''
-        Name of the profile used when generating the hardware-scan.
-      '';
-    };
-
     installer.enableGraphicalTools = pkgs.lib.mkOption {
       default = false;
       type = with pkgs.lib.types; bool;
-- 
GitLab


From 7f7eb341c856d223fd6b98ce16e9623c40236065 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Tue, 8 Nov 2011 15:51:39 +0000
Subject: [PATCH 3235/5331] Update the comment in the nixos-option generated
 configuration.nix in light of r30325

svn path=/nixos/trunk/; revision=30326
---
 modules/installer/tools/nixos-option.sh | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/modules/installer/tools/nixos-option.sh b/modules/installer/tools/nixos-option.sh
index 4b76f824c4c..d5326328033 100644
--- a/modules/installer/tools/nixos-option.sh
+++ b/modules/installer/tools/nixos-option.sh
@@ -208,8 +208,7 @@ if $generate; then
 {
   require = [
     # Include the configuration for part of your system which have been
-    # detected automatically.  In addition, it includes the same
-    # configuration as the installation device that you used.
+    # detected automatically.
     ./hardware-configuration.nix
   ];
 
-- 
GitLab


From ba7f635f8b6a69c19e4c1c73a96921eadb9e54f4 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 8 Nov 2011 15:58:59 +0000
Subject: [PATCH 3236/5331] * Move the hardware bits of base.nix into a
 separate module,   all-hardware.nix.  This allows base.nix (which should
 probably be   renamed to something more descriptive) to be reused without
 getting   the hardware configuration of the installation CD.

svn path=/nixos/trunk/; revision=30327
---
 .../installer/cd-dvd/installation-cd-base.nix |  1 +
 .../installer/cd-dvd/system-tarball-pc.nix    | 13 ++--
 modules/profiles/all-hardware.nix             | 72 +++++++++++++++++++
 modules/profiles/base.nix                     | 48 +------------
 modules/profiles/installation-device.nix      |  5 +-
 5 files changed, 83 insertions(+), 56 deletions(-)
 create mode 100644 modules/profiles/all-hardware.nix

diff --git a/modules/installer/cd-dvd/installation-cd-base.nix b/modules/installer/cd-dvd/installation-cd-base.nix
index 564916d099f..96d1faaad0f 100644
--- a/modules/installer/cd-dvd/installation-cd-base.nix
+++ b/modules/installer/cd-dvd/installation-cd-base.nix
@@ -34,6 +34,7 @@ in
       ./iso-image.nix
 
       # Profiles of this basic installation CD.
+      ../../profiles/all-hardware.nix
       ../../profiles/base.nix
       ../../profiles/installation-device.nix
     ];
diff --git a/modules/installer/cd-dvd/system-tarball-pc.nix b/modules/installer/cd-dvd/system-tarball-pc.nix
index 8b916b04fd9..6665122bec6 100644
--- a/modules/installer/cd-dvd/system-tarball-pc.nix
+++ b/modules/installer/cd-dvd/system-tarball-pc.nix
@@ -112,13 +112,14 @@ let
 in
 
 {
-  require = [
-    ./system-tarball.nix
+  require =
+    [ ./system-tarball.nix
 
-   # Profiles of this basic installation.
-    ../../profiles/base.nix
-    ../../profiles/installation-device.nix
-  ];
+      # Profiles of this basic installation.
+      ../../profiles/all-hardware.nix
+      ../../profiles/base.nix
+      ../../profiles/installation-device.nix
+    ];
 
   # To speed up further installation of packages, include the complete stdenv
   # in the Nix store of the tarball.
diff --git a/modules/profiles/all-hardware.nix b/modules/profiles/all-hardware.nix
new file mode 100644
index 00000000000..02819cd0fd0
--- /dev/null
+++ b/modules/profiles/all-hardware.nix
@@ -0,0 +1,72 @@
+# This module enables all hardware supported by NixOS: i.e., all
+# firmware is included, and all devices from which one may boot are
+# enabled in the initrd.  Its primary use is in the NixOS installation
+# CDs.
+
+{ config, pkgs, ... }:
+
+{
+
+  # The initrd has to contain any module that might be necessary for
+  # mounting the CD/DVD.
+  boot.initrd.availableKernelModules =
+    [ # SATA/PATA support.
+      "ahci"
+
+      "ata_piix"
+
+      "sata_inic162x" "sata_nv" "sata_promise" "sata_qstor"
+      "sata_sil" "sata_sil24" "sata_sis" "sata_svw" "sata_sx4"
+      "sata_uli" "sata_via" "sata_vsc"
+
+      "pata_ali" "pata_amd" "pata_artop" "pata_atiixp"
+      "pata_cs5520" "pata_cs5530" "pata_cs5535" "pata_efar"
+      "pata_hpt366" "pata_hpt37x" "pata_hpt3x2n" "pata_hpt3x3"
+      "pata_it8213" "pata_it821x" "pata_jmicron" "pata_marvell"
+      "pata_mpiix" "pata_netcell" "pata_ns87410" "pata_oldpiix"
+      "pata_pcmcia" "pata_pdc2027x" "pata_qdi" "pata_rz1000"
+      "pata_sc1200" "pata_serverworks" "pata_sil680" "pata_sis"
+      "pata_sl82c105" "pata_triflex" "pata_via"
+      "pata_winbond"
+
+      # SCSI support (incomplete).
+      "3w-9xxx" "3w-xxxx" "aic79xx" "aic7xxx" "arcmsr"
+
+      # USB support, especially for booting from USB CD-ROM
+      # drives.
+      "usb_storage"
+
+      # Firewire support.  Not tested.
+      "ohci1394" "sbp2"
+
+      # Virtio (QEMU, KVM etc.) support.
+      "virtio_net" "virtio_pci" "virtio_blk" "virtio_balloon" "virtio_console"
+
+      # Add vfat to enable people to copy the contents of the CD to a
+      # bootable USB stick.
+      "vfat" "nls_cp437" "nls_iso8859-1"
+    ];
+
+  boot.initrd.kernelModules =
+    [ # Wait for SCSI devices to appear.
+      "scsi_wait_scan"
+    ];
+
+  # Include lots of firmware.
+  require =
+    [ ../hardware/network/intel-4965agn.nix
+      ../hardware/network/intel-5000.nix
+      ../hardware/network/intel-6000.nix
+      ../hardware/network/intel-6000g2a.nix
+      ../hardware/network/intel-6000g2b.nix
+      ../hardware/network/broadcom-43xx.nix
+      ../hardware/network/zydas-zd1211.nix
+      ../hardware/video/radeon.nix
+    ];
+
+  networking.enableIntel2100BGFirmware = true;
+  networking.enableIntel2200BGFirmware = true;
+  networking.enableIntel3945ABGFirmware = true;
+  networking.enableRTL8192cFirmware = true;
+  
+}
diff --git a/modules/profiles/base.nix b/modules/profiles/base.nix
index 5327728de39..534751f5ec7 100644
--- a/modules/profiles/base.nix
+++ b/modules/profiles/base.nix
@@ -1,52 +1,6 @@
-{config, pkgs, ...}:
+{ config, pkgs, ... }:
 
 {
-
-  # The initrd has to contain any module that might be necessary for
-  # mounting the CD/DVD.
-  boot.initrd.availableKernelModules =
-    [ # SATA/PATA support.
-      "ahci"
-
-      "ata_piix"
-
-      "sata_inic162x" "sata_nv" "sata_promise" "sata_qstor"
-      "sata_sil" "sata_sil24" "sata_sis" "sata_svw" "sata_sx4"
-      "sata_uli" "sata_via" "sata_vsc"
-
-      "pata_ali" "pata_amd" "pata_artop" "pata_atiixp"
-      "pata_cs5520" "pata_cs5530" "pata_cs5535" "pata_efar"
-      "pata_hpt366" "pata_hpt37x" "pata_hpt3x2n" "pata_hpt3x3"
-      "pata_it8213" "pata_it821x" "pata_jmicron" "pata_marvell"
-      "pata_mpiix" "pata_netcell" "pata_ns87410" "pata_oldpiix"
-      "pata_pcmcia" "pata_pdc2027x" "pata_qdi" "pata_rz1000"
-      "pata_sc1200" "pata_serverworks" "pata_sil680" "pata_sis"
-      "pata_sl82c105" "pata_triflex" "pata_via"
-      "pata_winbond"
-
-      # SCSI support (incomplete).
-      "3w-9xxx" "3w-xxxx" "aic79xx" "aic7xxx" "arcmsr"
-
-      # USB support, especially for booting from USB CD-ROM
-      # drives.
-      "usb_storage"
-
-      # Firewire support.  Not tested.
-      "ohci1394" "sbp2"
-
-      # Virtio (QEMU, KVM etc.) support.
-      "virtio_net" "virtio_pci" "virtio_blk" "virtio_balloon" "virtio_console"
-
-      # Add vfat to enable people to copy the contents of the CD to a
-      # bootable USB stick.
-      "vfat" "nls_cp437" "nls_iso8859-1"
-    ];
-
-  boot.initrd.kernelModules =
-    [ # Wait for SCSI devices to appear.
-      "scsi_wait_scan"
-    ];
-
   # Include some utilities that are useful for installing or repairing
   # the system.
   environment.systemPackages = [
diff --git a/modules/profiles/installation-device.nix b/modules/profiles/installation-device.nix
index 10f47840e06..016eeff43e3 100644
--- a/modules/profiles/installation-device.nix
+++ b/modules/profiles/installation-device.nix
@@ -1,5 +1,5 @@
-# Provide a basic cponfiguration for installation devices like CDs.
-{config, pkgs, modules, ...}:
+# Provide a basic configuration for installation devices like CDs.
+{ config, pkgs, modules, ... }:
 
 with pkgs.lib;
 
@@ -152,7 +152,6 @@ in
         }
       '';
 
-
     # Allow sshd to be started manually through "start sshd".  It should
     # not be started by default on the installation CD because the
     # default root password is empty.
-- 
GitLab


From 1cfbae6ed409af86d03a1e3160dbcee6aa37476f Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 8 Nov 2011 15:59:46 +0000
Subject: [PATCH 3237/5331] * Remove empty.nix since it's no longer used.

svn path=/nixos/trunk/; revision=30328
---
 modules/profiles/empty.nix | 8 --------
 1 file changed, 8 deletions(-)
 delete mode 100644 modules/profiles/empty.nix

diff --git a/modules/profiles/empty.nix b/modules/profiles/empty.nix
deleted file mode 100644
index bb40a31470d..00000000000
--- a/modules/profiles/empty.nix
+++ /dev/null
@@ -1,8 +0,0 @@
-# Empty profiles, used to avoid the case where no profiles are selected for
-# nixos-hardware-scan.
-
-{
-  imports = [];
-  options = {};
-  config = {};
-}
-- 
GitLab


From 295dafed8ac05b6e81203d91cd7628d555ae567c Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 8 Nov 2011 16:17:37 +0000
Subject: [PATCH 3238/5331] * Refactoring: graphical.nix no longer includes
 base.nix so that it   just does what it says (enable a "graphical"
 configuration). * Enable KDM in the graphical CD.  The "auto" display manager
 doesn't   properly handle shutdowns etc.

svn path=/nixos/trunk/; revision=30331
---
 modules/installer/cd-dvd/installation-cd-graphical.nix |  3 +++
 modules/profiles/base.nix                              |  3 +++
 modules/profiles/graphical.nix                         | 10 +++-------
 modules/profiles/installation-device.nix               |  4 ----
 4 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/modules/installer/cd-dvd/installation-cd-graphical.nix b/modules/installer/cd-dvd/installation-cd-graphical.nix
index aa49c8e9848..6b40c34968a 100644
--- a/modules/installer/cd-dvd/installation-cd-graphical.nix
+++ b/modules/installer/cd-dvd/installation-cd-graphical.nix
@@ -15,4 +15,7 @@
   # KDE complains if power management is disabled (to be precise, if
   # there is no power management backend such as upower).
   powerManagement.enable = true;
+
+  # Don't start the X server by default.
+  services.xserver.autorun = mkForce false;
 }
diff --git a/modules/profiles/base.nix b/modules/profiles/base.nix
index 534751f5ec7..fda3bf76c2c 100644
--- a/modules/profiles/base.nix
+++ b/modules/profiles/base.nix
@@ -1,3 +1,6 @@
+# This module defines the software packages included in the "minimal"
+# installation CD.  It might be useful elsewhere.
+
 { config, pkgs, ... }:
 
 {
diff --git a/modules/profiles/graphical.nix b/modules/profiles/graphical.nix
index 1c279a73ac9..a7a241903ad 100644
--- a/modules/profiles/graphical.nix
+++ b/modules/profiles/graphical.nix
@@ -1,16 +1,12 @@
 # This module defines a NixOS configuration that contains X11 and
-# KDE 4.
+# KDE 4.  It's used by the graphical installation CD.
+
 { config, pkgs, ... }:
 
 {
-  require = [ ./base.nix ];
-
   services.xserver = {
     enable = true;
-    autorun = true;
-    defaultDepth = 24;
-    displayManager.auto.enable = true;
-    desktopManager.default = "kde4";
+    displayManager.kdm.enable = true;
     desktopManager.kde4.enable = true;
   };
 }
diff --git a/modules/profiles/installation-device.nix b/modules/profiles/installation-device.nix
index 016eeff43e3..287b39ad766 100644
--- a/modules/profiles/installation-device.nix
+++ b/modules/profiles/installation-device.nix
@@ -137,10 +137,6 @@ in
        ''}
       '';
 
-    # Force the xserver autorun to false.
-    services.xserver.autorun = mkForce false;
-    services.xserver.defaultDepth = mkForce 16;
-
     # Some more help text.
     services.mingetty.helpLine =
       ''
-- 
GitLab


From f281207ea26af8775f4655b2ca714857316e930d Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 8 Nov 2011 16:21:57 +0000
Subject: [PATCH 3239/5331] * Disable the RTL 8192c firmware because it doesn't
 build.

svn path=/nixos/trunk/; revision=30332
---
 modules/profiles/all-hardware.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/profiles/all-hardware.nix b/modules/profiles/all-hardware.nix
index 02819cd0fd0..8b894fa4df0 100644
--- a/modules/profiles/all-hardware.nix
+++ b/modules/profiles/all-hardware.nix
@@ -67,6 +67,6 @@
   networking.enableIntel2100BGFirmware = true;
   networking.enableIntel2200BGFirmware = true;
   networking.enableIntel3945ABGFirmware = true;
-  networking.enableRTL8192cFirmware = true;
+  #networking.enableRTL8192cFirmware = true; # doesn't build
   
 }
-- 
GitLab


From b69dd8759c0035ff889c2563c4afc6729e552874 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 8 Nov 2011 16:29:40 +0000
Subject: [PATCH 3240/5331] * minimal.nix: don't include base.nix.  Also note
 it's not currently used.

svn path=/nixos/trunk/; revision=30333
---
 modules/installer/cd-dvd/installation-cd-base.nix | 1 +
 modules/profiles/minimal.nix                      | 4 +---
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/modules/installer/cd-dvd/installation-cd-base.nix b/modules/installer/cd-dvd/installation-cd-base.nix
index 96d1faaad0f..7dae6ac2cf5 100644
--- a/modules/installer/cd-dvd/installation-cd-base.nix
+++ b/modules/installer/cd-dvd/installation-cd-base.nix
@@ -36,6 +36,7 @@ in
       # Profiles of this basic installation CD.
       ../../profiles/all-hardware.nix
       ../../profiles/base.nix
+      # ../../profiles/minimal.nix # should include this, but then the graphical CD will also get it.
       ../../profiles/installation-device.nix
     ];
 
diff --git a/modules/profiles/minimal.nix b/modules/profiles/minimal.nix
index acc56d94edc..7288b447f5d 100644
--- a/modules/profiles/minimal.nix
+++ b/modules/profiles/minimal.nix
@@ -1,11 +1,9 @@
 # This module defines a small NixOS configuration.  It does not
 # contain any graphical stuff.
 
-{config, pkgs, ...}:
+{ config, pkgs, ... }:
 
 {
-  require = [ ./base.nix ];
-
   # Don't include X libraries.
   services.openssh.forwardX11 = false;
   services.dbus.enable = false; # depends on libX11
-- 
GitLab


From 51a5b775a61ca4b31990708da1146466e1c889b5 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 8 Nov 2011 16:32:24 +0000
Subject: [PATCH 3241/5331] * HAL is obsolete and disabling D-Bus is a bad
 idea.

svn path=/nixos/trunk/; revision=30334
---
 modules/profiles/minimal.nix | 2 --
 1 file changed, 2 deletions(-)

diff --git a/modules/profiles/minimal.nix b/modules/profiles/minimal.nix
index 7288b447f5d..38c83a03393 100644
--- a/modules/profiles/minimal.nix
+++ b/modules/profiles/minimal.nix
@@ -6,8 +6,6 @@
 {
   # Don't include X libraries.
   services.openssh.forwardX11 = false;
-  services.dbus.enable = false; # depends on libX11
-  services.hal.enable = false; # depends on dbus
   fonts.enableFontConfig = false;
   fonts.enableCoreFonts = false;
 }
-- 
GitLab


From dd28c62879cc4903ac4da18ad32a850b878f62a2 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 8 Nov 2011 16:39:13 +0000
Subject: [PATCH 3242/5331] * My grep skills are lacking.

svn path=/nixos/trunk/; revision=30335
---
 modules/installer/cd-dvd/installation-cd-base.nix    |  1 -
 modules/installer/cd-dvd/installation-cd-minimal.nix | 10 +++++-----
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/modules/installer/cd-dvd/installation-cd-base.nix b/modules/installer/cd-dvd/installation-cd-base.nix
index 7dae6ac2cf5..96d1faaad0f 100644
--- a/modules/installer/cd-dvd/installation-cd-base.nix
+++ b/modules/installer/cd-dvd/installation-cd-base.nix
@@ -36,7 +36,6 @@ in
       # Profiles of this basic installation CD.
       ../../profiles/all-hardware.nix
       ../../profiles/base.nix
-      # ../../profiles/minimal.nix # should include this, but then the graphical CD will also get it.
       ../../profiles/installation-device.nix
     ];
 
diff --git a/modules/installer/cd-dvd/installation-cd-minimal.nix b/modules/installer/cd-dvd/installation-cd-minimal.nix
index c166e3f4ad0..f568f2462a0 100644
--- a/modules/installer/cd-dvd/installation-cd-minimal.nix
+++ b/modules/installer/cd-dvd/installation-cd-minimal.nix
@@ -1,11 +1,11 @@
 # This module defines a small NixOS installation CD.  It does not
 # contain any graphical stuff.
 
-{config, pkgs, ...}:
+{ config, pkgs, ... }:
 
 {
-  require = [
-    ./installation-cd-base.nix
-    ../../profiles/minimal.nix
-  ];
+  require =
+    [ ./installation-cd-base.nix
+      ../../profiles/minimal.nix
+    ];
 }
-- 
GitLab


From e348fbf7a43d228e4ef5db7c72591dca95095140 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 8 Nov 2011 18:50:42 +0000
Subject: [PATCH 3243/5331] * Allow logging in with an empty password in KDE. 
 This is consistent   with SLiM and local console logins.

svn path=/nixos/trunk/; revision=30339
---
 modules/services/x11/desktop-managers/kde4.nix | 2 +-
 modules/services/x11/display-managers/kdm.nix  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/services/x11/desktop-managers/kde4.nix b/modules/services/x11/desktop-managers/kde4.nix
index 39aef7c6d56..e2adba6832a 100644
--- a/modules/services/x11/desktop-managers/kde4.nix
+++ b/modules/services/x11/desktop-managers/kde4.nix
@@ -172,7 +172,7 @@ in
     services.udisks = mkIf isKDE47 { enable = true; };
     services.upower = mkIf (isKDE47 && config.powerManagement.enable) { enable = true; };
 
-    security.pam.services = [ { name = "kde"; } ];
+    security.pam.services = [ { name = "kde"; allowNullPassword = true; } ];
 
   };
 
diff --git a/modules/services/x11/display-managers/kdm.nix b/modules/services/x11/display-managers/kdm.nix
index a819cadd270..fe7802100b2 100644
--- a/modules/services/x11/display-managers/kdm.nix
+++ b/modules/services/x11/display-managers/kdm.nix
@@ -111,7 +111,7 @@ in
         logsXsession = true;
       };
 
-    security.pam.services = [ { name = "kde"; } ];
+    security.pam.services = [ { name = "kde"; allowNullPassword = true; } ];
 
     users.extraUsers = singleton
       { name = "kdm";
-- 
GitLab


From 7d68a36851675cc04b3922c6e7ba67574974a618 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 8 Nov 2011 19:02:28 +0000
Subject: [PATCH 3244/5331] * Remove rescue.nix (obsolete).

svn path=/nixos/trunk/; revision=30340
---
 modules/profiles/base.nix   |  1 +
 modules/profiles/rescue.nix | 52 -------------------------------------
 2 files changed, 1 insertion(+), 52 deletions(-)
 delete mode 100644 modules/profiles/rescue.nix

diff --git a/modules/profiles/base.nix b/modules/profiles/base.nix
index fda3bf76c2c..d67e7ca6734 100644
--- a/modules/profiles/base.nix
+++ b/modules/profiles/base.nix
@@ -43,6 +43,7 @@
     pkgs.zip
     pkgs.xz
     pkgs.dar # disk archiver
+    pkgs.cabextract
 
     # Some editors.
     pkgs.vim
diff --git a/modules/profiles/rescue.nix b/modules/profiles/rescue.nix
deleted file mode 100644
index 8d9c41987de..00000000000
--- a/modules/profiles/rescue.nix
+++ /dev/null
@@ -1,52 +0,0 @@
-# This module defines a small NixOS configuration.  It does not contain any
-# graphical stuff but contains many tools useful for the rescue.
-
-{config, pkgs, ...}:
-
-{
-  require = [ ./minimal.nix ];
-
-  # Useful for rescue..
-  environment.systemPackages = with pkgs; [
-    utillinuxCurses ddrescue
-    pciutils sdparm hdparm hddtemp usbutils
-    btrfsProgs xfsprogs jfsutils jfsrec
-    iproute
-    fuse ntfs3g smbfsFuse sshfsFuse
-    manpages irssi elinks mcabber mutt openssh lftp
-    openssl ncat socat
-    gnupg1 gnupg
-    patch which diffutils gcc binutils bc file
-    screen
-    bvi joe nvi
-    subversion16 monotone git darcs mercurial bazaar cvs
-    unrar unzip zip lzma cabextract cpio
-    lsof
-  ];
-
-  boot.kernelPackages = pkgs.linuxPackages_2_6_32;
-
-  boot.initrd.kernelModules = [
-    "evdev" "i8042" "pcips2" "serio" "sd_mod" "libata" "unix" "usbhid"
-    "uhci_hcd" "atkbd" "xtkbd" "fbdev" "iso9660" "udf" "loop"
-  ];
-
-  boot.kernelModules = [
-    "fbcon"
-    "radeonfb"
-    "intelfb"
-    "sisfb"
-    "nvidiafb"
-    "cirrusfb"
-  ];
-
-  boot.kernelParams = [
-    "selinux=0"
-    "acpi=on"
-    "apm=off"
-    "console=tty1"
-    "splash=verbose"
-  ];
-
-  services.ttyBackgrounds.enable = false;
-}
-- 
GitLab


From 06843a45ef37cd0600aa0e9f186626b98721240e Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 8 Nov 2011 19:02:51 +0000
Subject: [PATCH 3245/5331] * Fix auto-login.

svn path=/nixos/trunk/; revision=30341
---
 .../installer/cd-dvd/installation-cd-graphical.nix   | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/modules/installer/cd-dvd/installation-cd-graphical.nix b/modules/installer/cd-dvd/installation-cd-graphical.nix
index 6b40c34968a..fe32481fb7b 100644
--- a/modules/installer/cd-dvd/installation-cd-graphical.nix
+++ b/modules/installer/cd-dvd/installation-cd-graphical.nix
@@ -3,6 +3,8 @@
 
 { config, pkgs, ... }:
 
+with pkgs.lib;
+
 {
   require = [
     ./installation-cd-base.nix
@@ -18,4 +20,14 @@
 
   # Don't start the X server by default.
   services.xserver.autorun = mkForce false;
+
+  # Auto-login as root.
+  services.xserver.displayManager.kdm.extraConfig =
+    ''
+      [X-*-Core]
+      AllowRootLogin=true
+      AutoLoginEnable=true
+      AutoLoginUser=root
+      AutoLoginPass=""
+    '';
 }
-- 
GitLab


From 0446f652a291e6fd8924b9ba32974680d2bb18b7 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 8 Nov 2011 19:18:34 +0000
Subject: [PATCH 3246/5331] * Include glxinfo/glxgears in the graphical
 profile.  It's very small.

svn path=/nixos/trunk/; revision=30342
---
 modules/profiles/graphical.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/modules/profiles/graphical.nix b/modules/profiles/graphical.nix
index a7a241903ad..75ac5e41f83 100644
--- a/modules/profiles/graphical.nix
+++ b/modules/profiles/graphical.nix
@@ -9,4 +9,6 @@
     displayManager.kdm.enable = true;
     desktopManager.kde4.enable = true;
   };
+
+  environment.systemPackages = [ pkgs.glxinfo ];
 }
-- 
GitLab


From fdc51c2c97568582eb278023e55afcc28d0b10d3 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 8 Nov 2011 19:43:15 +0000
Subject: [PATCH 3247/5331] * Disable all fbcondecor-related stuff if boot.vesa
 is disabled.

svn path=/nixos/trunk/; revision=30343
---
 modules/system/boot/kernel.nix    |  6 +-----
 modules/system/boot/stage-1.nix   |  2 +-
 modules/tasks/tty-backgrounds.nix | 12 ++++++------
 3 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/modules/system/boot/kernel.nix b/modules/system/boot/kernel.nix
index 9a482f242a1..acae7054ddf 100644
--- a/modules/system/boot/kernel.nix
+++ b/modules/system/boot/kernel.nix
@@ -120,11 +120,7 @@ let kernel = config.boot.kernelPackages.kernel; in
     system.modulesTree = [ kernel ] ++ config.boot.extraModulePackages;
 
     boot.kernelParams =
-      [ "splash=verbose"
-        # Force the Completely Fair Scheduler to be used by default.
-        #"elevator=cfq"
-      ] ++
-      optional config.boot.vesa "vga=0x317";
+      optionals config.boot.vesa [ "splash=verbose" "vga=0x317" ];
 
     boot.kernelModules = [ "loop" ];
 
diff --git a/modules/system/boot/stage-1.nix b/modules/system/boot/stage-1.nix
index 08cf948fea4..af3642ac009 100644
--- a/modules/system/boot/stage-1.nix
+++ b/modules/system/boot/stage-1.nix
@@ -91,7 +91,7 @@ let
 
 
   enableSplashScreen =
-    config.boot.initrd.enableSplashScreen && kernelPackages.splashutils != null;
+    config.boot.vesa && config.boot.initrd.enableSplashScreen && kernelPackages.splashutils != null;
 
 
   # Some additional utilities needed in stage 1, like mount, lvm, fsck
diff --git a/modules/tasks/tty-backgrounds.nix b/modules/tasks/tty-backgrounds.nix
index aca01b428a5..26904c78ae9 100644
--- a/modules/tasks/tty-backgrounds.nix
+++ b/modules/tasks/tty-backgrounds.nix
@@ -50,7 +50,7 @@ in
     services.ttyBackgrounds = {
 
       enable = mkOption {
-        default = splashutils != null;
+        default = true;
         description = ''
           Whether to enable graphical backgrounds for the virtual consoles.
         '';
@@ -82,11 +82,11 @@ in
 
   ###### implementation
 
-  config = mkIf config.services.ttyBackgrounds.enable (
-  mkAssert (splashutils != null) "
-    The kernelPackages does not provide splashutils, as required by ttyBackgrounds.
-    Either provide kernelPackages with splashutils, or disable ttyBackgrounds.
-  " {
+  config = mkIf (config.boot.vesa && config.services.ttyBackgrounds.enable && splashutils != null) (
+    mkAssert (splashutils != null) ''
+      The kernelPackages does not provide splashutils, as required by ttyBackgrounds.
+      Either provide kernelPackages with splashutils, or disable ttyBackgrounds.
+    '' {
 
     services.ttyBackgrounds.specificThemes = singleton
       { tty = config.services.syslogd.tty;
-- 
GitLab


From 6b6cee46c7b52d933a21306bbb22a31de6456dcd Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 8 Nov 2011 19:51:39 +0000
Subject: [PATCH 3248/5331] * By popular demand, provide an ISO with a more
 recent kernel.

svn path=/nixos/trunk/; revision=30344
---
 modules/installer/cd-dvd/installation-cd-new-kernel.nix | 8 ++++++++
 release.nix                                             | 7 +++++++
 2 files changed, 15 insertions(+)
 create mode 100644 modules/installer/cd-dvd/installation-cd-new-kernel.nix

diff --git a/modules/installer/cd-dvd/installation-cd-new-kernel.nix b/modules/installer/cd-dvd/installation-cd-new-kernel.nix
new file mode 100644
index 00000000000..1340b9787ca
--- /dev/null
+++ b/modules/installer/cd-dvd/installation-cd-new-kernel.nix
@@ -0,0 +1,8 @@
+{ config, pkgs, ... }:
+
+{
+  require = [ ./installation-cd-graphical.nix ];
+
+  boot.kernelPackages = pkgs.linuxPackages_3_0;
+  boot.vesa = false;
+}
diff --git a/release.nix b/release.nix
index 0a414fd9ccb..44d87e154cd 100644
--- a/release.nix
+++ b/release.nix
@@ -130,6 +130,13 @@ let
       type = "graphical";
     };
 
+    # A variant with a more recent (but possibly less stable) kernel
+    # that might support more hardware.
+    iso_new_kernel = makeIso {
+      module = ./modules/installer/cd-dvd/installation-cd-new-kernel.nix;
+      type = "new-kernel";
+    };
+
 
     # Provide a tarball that can be unpacked into an SD card, and easily
     # boot that system from uboot (like for the sheevaplug).
-- 
GitLab


From 25d7ed12834c0a2d3d3a1cb77c7a0042955186bd Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 8 Nov 2011 20:49:21 +0000
Subject: [PATCH 3249/5331] * Upload and register the image to/in eu-west-1,
 us-east-1 and   us-west-1.

svn path=/nixos/trunk/; revision=30345
---
 maintainers/scripts/create-amis.sh | 29 +++++++++++++++++------------
 1 file changed, 17 insertions(+), 12 deletions(-)

diff --git a/maintainers/scripts/create-amis.sh b/maintainers/scripts/create-amis.sh
index 985eea727f1..8ed242001d3 100755
--- a/maintainers/scripts/create-amis.sh
+++ b/maintainers/scripts/create-amis.sh
@@ -7,30 +7,35 @@ buildAndUploadFor() {
     system="$1"
     arch="$2"
 
+    echo "building $system image..."
     NIXOS_CONFIG=$NIXOS/modules/virtualisation/amazon-config.nix nix-build "$NIXOS" \
         -A config.system.build.amazonImage --argstr system "$system" -o ec2-ami
 
     ec2-bundle-image -i ./ec2-ami/nixos.img --user "$AWS_ACCOUNT" --arch "$arch" \
         -c "$EC2_CERT" -k "$EC2_PRIVATE_KEY"
 
-    name="$(echo nixos-$arch-r$revision | tr '[A-Z]_' '[a-z]-')"
-    bucket="$name-eu"
-    ec2-upload-bundle -b "$bucket" -m /tmp/nixos.img.manifest.xml \
-        -a "$AWS_ACCESS_KEY_ID" -s "$AWS_SECRET_ACCESS_KEY" --location EU
+    for region in eu-west-1 us-east-1 us-west-1; do
+        echo "uploading $system image for $region..."
 
-    region="eu-west-1"
+        name="$(echo nixos-$arch-r$revision | tr '[A-Z]_' '[a-z]-')"
 
-    kernel=$(ec2-describe-images -o amazon --filter "manifest-location=*pv-grub-hd0_1.02-$arch*" --region "$region" | cut -f 2)
-    echo "using PV-GRUB kernel $kernel"
+        bucket="$name-$region"
 
-    ami=$(ec2-register "$bucket/nixos.img.manifest.xml" -n "$bucket" -d "NixOS $system r$revision" \
-        --region "$region" --kernel "$kernel" | cut -f 2)
+        ec2-upload-bundle -b "$bucket" -m /tmp/nixos.img.manifest.xml \
+            -a "$AWS_ACCESS_KEY_ID" -s "$AWS_SECRET_ACCESS_KEY" --location "$region"
 
-    echo "AMI ID is $ami"
+        kernel=$(ec2-describe-images -o amazon --filter "manifest-location=*pv-grub-hd0_1.02-$arch*" --region "$region" | cut -f 2)
+        echo "using PV-GRUB kernel $kernel"
 
-    echo "$system" "$region" "$ami" >> amis
+        ami=$(ec2-register "$bucket/nixos.img.manifest.xml" -n "$name" -d "NixOS $system r$revision" \
+            --region "$region" --kernel "$kernel" | cut -f 2)
 
-    ec2-modify-image-attribute "$ami" -l -a all
+        echo "AMI ID is $ami"
+
+        echo "$system" "$region" "$ami" >> amis
+
+        ec2-modify-image-attribute --region "$region" "$ami" -l -a all
+    done
 }
 
 #buildAndUploadFor i686-linux i386
-- 
GitLab


From 6ec21aa3ca76c131c3f2ea5df0f352595a5c13ef Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 8 Nov 2011 20:56:33 +0000
Subject: [PATCH 3250/5331] * Urgh.  Stupid S3 location names.

svn path=/nixos/trunk/; revision=30346
---
 maintainers/scripts/create-amis.sh | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/maintainers/scripts/create-amis.sh b/maintainers/scripts/create-amis.sh
index 8ed242001d3..6d67c01327b 100755
--- a/maintainers/scripts/create-amis.sh
+++ b/maintainers/scripts/create-amis.sh
@@ -21,8 +21,13 @@ buildAndUploadFor() {
 
         bucket="$name-$region"
 
+        if [ "$region" = eu-west-1 ]; then s3location=EU;
+        elif [ "$region" = us-east-1 ]; then s3location=US;
+        else s3location="$region"
+        fi
+
         ec2-upload-bundle -b "$bucket" -m /tmp/nixos.img.manifest.xml \
-            -a "$AWS_ACCESS_KEY_ID" -s "$AWS_SECRET_ACCESS_KEY" --location "$region"
+            -a "$AWS_ACCESS_KEY_ID" -s "$AWS_SECRET_ACCESS_KEY" --location "$s3location"
 
         kernel=$(ec2-describe-images -o amazon --filter "manifest-location=*pv-grub-hd0_1.02-$arch*" --region "$region" | cut -f 2)
         echo "using PV-GRUB kernel $kernel"
-- 
GitLab


From 0302e2cc574e3cc104199fba137a928ce11eeca2 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 8 Nov 2011 21:28:42 +0000
Subject: [PATCH 3251/5331] * Update AMIs.

svn path=/nixos/trunk/; revision=30348
---
 modules/misc/deployment.nix | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/modules/misc/deployment.nix b/modules/misc/deployment.nix
index 81988e96468..146baec16dd 100644
--- a/modules/misc/deployment.nix
+++ b/modules/misc/deployment.nix
@@ -186,11 +186,13 @@ let cfg = config.deployment; in
     deployment.ec2 = mkIf (cfg.ec2.region != "") {
     
       controller = mkDefault "https://ec2.${cfg.ec2.region}.amazonaws.com/";
-      
+
+      # The list below is generated by running the "create-amis.sh" script, then doing:
+      # $ while read system region ami; do echo "        if cfg.ec2.region == \"$region\" && config.nixpkgs.system == \"$system\" then \"$ami\" else"; done < amis
       ami = mkDefault (
-        if cfg.ec2.region == "eu-west-1" && config.nixpkgs.system == "i686-linux" then "ami-c9f2d8bd" else
-        if cfg.ec2.region == "eu-west-1" && config.nixpkgs.system == "x86_64-linux" then "ami-c34c71b7" else
-        if cfg.ec2.region == "us-east-1" && config.nixpkgs.system == "x86_64-linux" then "ami-d93bf4b0" else
+        if cfg.ec2.region == "eu-west-1" && config.nixpkgs.system == "x86_64-linux" then "ami-65dae711" else
+        if cfg.ec2.region == "us-east-1" && config.nixpkgs.system == "x86_64-linux" then "ami-95bb72fc" else
+        if cfg.ec2.region == "us-west-1" && config.nixpkgs.system == "x86_64-linux" then "ami-0b0c534e" else
         # !!! Doesn't work, not lazy enough.
         # throw "I don't know an AMI for region ‘${cfg.ec2.region}’ and platform type ‘${config.nixpkgs.system}’"
         "");
-- 
GitLab


From 578f83eef41d7b5a1a25cb7c167541099c81ecc3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Wed, 9 Nov 2011 20:48:12 +0000
Subject: [PATCH 3252/5331] Adding a module for the prayer webmail.

svn path=/nixos/trunk/; revision=30361
---
 modules/misc/ids.nix                   |   2 +
 modules/module-list.nix                |   1 +
 modules/services/networking/prayer.nix | 104 +++++++++++++++++++++++++
 3 files changed, 107 insertions(+)
 create mode 100644 modules/services/networking/prayer.nix

diff --git a/modules/misc/ids.nix b/modules/misc/ids.nix
index 5200d117bc1..8a4175a7bd1 100644
--- a/modules/misc/ids.nix
+++ b/modules/misc/ids.nix
@@ -67,6 +67,7 @@ in
     dovecot2 = 46;
     dovenull2 = 47;
     unbound = 48;
+    prayer = 49;
 
     # When adding a uid, make sure it doesn't match an existing gid.
 
@@ -114,6 +115,7 @@ in
     fourStoreEndpoint = 43;
     virtuoso = 44;
     dovecot2 = 45;
+    prayer = 46;
 
     # When adding a gid, make sure it doesn't match an existing uid.
 
diff --git a/modules/module-list.nix b/modules/module-list.nix
index 6ba0c447aed..44491dd116d 100644
--- a/modules/module-list.nix
+++ b/modules/module-list.nix
@@ -122,6 +122,7 @@
   ./services/networking/openfire.nix
   ./services/networking/openvpn.nix
   ./services/networking/portmap.nix
+  ./services/networking/prayer.nix
   ./services/networking/privoxy.nix
   ./services/networking/quassel.nix
   ./services/networking/radvd.nix
diff --git a/modules/services/networking/prayer.nix b/modules/services/networking/prayer.nix
new file mode 100644
index 00000000000..10130c24049
--- /dev/null
+++ b/modules/services/networking/prayer.nix
@@ -0,0 +1,104 @@
+{ config, pkgs, ... }:
+
+with pkgs.lib;
+
+let
+
+  inherit (pkgs) prayer;
+
+  stateDir = "/var/lib/prayer";
+
+  prayerUser = "prayer";
+  prayerGroup = "prayer";
+
+  prayerExtraCfg = pkgs.writeText "extraprayer.cf" ''
+    prefix = "${prayer}"
+    var_prefix = "${stateDir}"
+    prayer_user = "${prayerUser}"
+    prayer_group = "${prayerGroup}"
+    sendmail_path = "/var/setuid-wrappers/sendmail"
+
+    ${config.services.prayer.extraConfig}
+  '';
+
+  prayerCfg = pkgs.runCommand "prayer.cf" { } ''
+    cat ${prayer}/etc/prayer.cf ${prayerExtraCfg} > $out
+  '';
+
+in
+
+{
+
+  ###### interface
+
+  options = {
+
+    services.prayer = {
+
+      enable = mkOption {
+        default = false;
+        description = ''
+          Whether to run the machine as a HTTP proxy server.
+        '';
+      };
+
+      listenAddress = mkOption {
+        default = "127.0.0.1:8118";
+        description = ''
+          Address the proxy server is listening to.
+        '';
+      };
+
+      logDir = mkOption {
+        default = "/var/log/prayer" ;
+        description = ''
+          Location for prayer log files.
+        '';
+      };
+
+      extraConfig = mkOption {
+        default = "" ;
+        description = ''
+          Extra configuration. Contents will be added verbatim to the configuration file.
+        '';
+      };
+    };
+
+  };
+
+
+  ###### implementation
+
+  config = mkIf config.services.prayer.enable {
+    environment.systemPackages = [ prayer ];
+
+    users.extraUsers = singleton
+      { name = prayerUser;
+        uid = config.ids.uids.prayer;
+        description = "prayer daemon user";
+        home = stateDir;
+      };
+
+    users.extraGroups = singleton
+      { name = prayerGroup;
+        gid = config.ids.gids.prayer;
+      };
+
+    jobs.prayer =
+      { name = "prayer";
+
+        startOn = "startup";
+
+        preStart =
+          ''
+            mkdir -m 0755 -p ${stateDir}
+            chown ${prayerUser}.${prayerGroup} ${stateDir}
+          '';
+
+        daemonType = "daemon";
+
+        exec = "${prayer}/sbin/prayer --config-file=${prayerCfg}";
+      };
+  };
+
+}
-- 
GitLab


From de5eedb6125b8d98932fc63e86b1b21216358d26 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Wed, 9 Nov 2011 21:02:01 +0000
Subject: [PATCH 3253/5331] Adding the hostname.domain and localhost.domain to
 hosts, if possible.

Postfix likes this.


svn path=/nixos/trunk/; revision=30362
---
 modules/config/networking.nix | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/modules/config/networking.nix b/modules/config/networking.nix
index 076b9801a54..8343912d830 100644
--- a/modules/config/networking.nix
+++ b/modules/config/networking.nix
@@ -2,7 +2,9 @@
 
 {config, pkgs, ...}:
 
+with pkgs.lib;
 let
+  cfg = config.networking;
 
   options = {
 
@@ -16,6 +18,13 @@ let
 
   };
 
+  localhostWithDomain = optionalString (cfg.domain != "")
+    "localhost.${cfg.domain}";
+
+  hostnameWithDomain = optionalString
+    (cfg.domain != "" && cfg.hostName != "")
+    "${cfg.hostName}.${cfg.domain}";
+
 in
 
 {
@@ -40,11 +49,10 @@ in
       { # /etc/hosts: Hostname-to-IP mappings.
         source = pkgs.writeText "hosts"
           ''
-            ${config.networking.extraHosts}
-            ${if config.networking.hostName != ""
-              then "127.0.0.1 ${config.networking.hostName}"
-              else ""}
-            127.0.0.1 localhost
+            ${cfg.extraHosts}
+            ${optionalString (cfg.hostName != "")
+              "127.0.0.1 ${cfg.hostName} ${hostnameWithDomain}"}
+            127.0.0.1 localhost ${localhostWithDomain}
           '';
         target = "hosts";
       }
-- 
GitLab


From d9356e9a35aa9d2f055170878c3ab07c6488b620 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Wed, 9 Nov 2011 21:08:50 +0000
Subject: [PATCH 3254/5331] Fixing documentation about the prayer module, and
 adding a port setting, defaulting to something other than 80 at least.

svn path=/nixos/trunk/; revision=30363
---
 modules/services/networking/prayer.nix | 21 +++++++++------------
 1 file changed, 9 insertions(+), 12 deletions(-)

diff --git a/modules/services/networking/prayer.nix b/modules/services/networking/prayer.nix
index 10130c24049..adfce5a5030 100644
--- a/modules/services/networking/prayer.nix
+++ b/modules/services/networking/prayer.nix
@@ -6,6 +6,8 @@ let
 
   inherit (pkgs) prayer;
 
+  cfg = config.services.prayer;
+
   stateDir = "/var/lib/prayer";
 
   prayerUser = "prayer";
@@ -18,7 +20,9 @@ let
     prayer_group = "${prayerGroup}"
     sendmail_path = "/var/setuid-wrappers/sendmail"
 
-    ${config.services.prayer.extraConfig}
+    use_http_port ${cfg.port}
+
+    ${cfg.extraConfig}
   '';
 
   prayerCfg = pkgs.runCommand "prayer.cf" { } ''
@@ -38,21 +42,14 @@ in
       enable = mkOption {
         default = false;
         description = ''
-          Whether to run the machine as a HTTP proxy server.
-        '';
-      };
-
-      listenAddress = mkOption {
-        default = "127.0.0.1:8118";
-        description = ''
-          Address the proxy server is listening to.
+          Whether to run the prayer webmail http server.
         '';
       };
 
-      logDir = mkOption {
-        default = "/var/log/prayer" ;
+      port = mkOption {
+        default = "2080";
         description = ''
-          Location for prayer log files.
+          Port the prayer http server is listening to.
         '';
       };
 
-- 
GitLab


From 698a02ee432b9ffa7b7dd2e30f227cc582152761 Mon Sep 17 00:00:00 2001
From: Evgeny Egorochkin <phreedom.stdin@gmail.com>
Date: Thu, 10 Nov 2011 16:37:31 +0000
Subject: [PATCH 3255/5331] PulseAudio: fix config file paths

svn path=/nixos/trunk/; revision=30370
---
 modules/config/pulseaudio.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/config/pulseaudio.nix b/modules/config/pulseaudio.nix
index 71bf0081e4e..4c88cdffb41 100644
--- a/modules/config/pulseaudio.nix
+++ b/modules/config/pulseaudio.nix
@@ -74,11 +74,11 @@ let cfg = config.hardware.pulseaudio; in
         }
 
         { target = "pulse/default.pa";
-          source = "${cfg.package}/etc/pulse/default.pa";
+          source = "${cfg.package}/etc/default.pa";
         }
 
         { target = "pulse/system.pa";
-          source = "${cfg.package}/etc/pulse/system.pa";
+          source = "${cfg.package}/etc/system.pa";
         }
 
       ]);
-- 
GitLab


From c1d7c0d6bd1bda6c254e0770aa6cc8271df479a2 Mon Sep 17 00:00:00 2001
From: Evgeny Egorochkin <phreedom.stdin@gmail.com>
Date: Thu, 10 Nov 2011 16:39:04 +0000
Subject: [PATCH 3256/5331] Remove swap cipher option because it isn't
 implemented and is misleading new users

svn path=/nixos/trunk/; revision=30371
---
 modules/config/swap.nix | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/modules/config/swap.nix b/modules/config/swap.nix
index 1e373382917..550cd4755af 100644
--- a/modules/config/swap.nix
+++ b/modules/config/swap.nix
@@ -45,16 +45,6 @@ with pkgs.lib;
             '';
           };
 
-          cipher = mkOption {
-            default = false;
-            example = true;
-            type = types.bool;
-            description = ''
-              Encrypt the swap device to protect swapped data.  This option
-              does not work with labels.
-            '';
-          };
-
         };
 
         config = {
-- 
GitLab


From 21d808ee6cb54c7f097e68fe95039108ea4c8410 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 10 Nov 2011 20:52:23 +0000
Subject: [PATCH 3257/5331] * Add a module that enables a x11vnc-based terminal
 server, allowing   users to login via VNC.  Xvfb servers are started as
 required to   allow multiple concurrent users.

svn path=/nixos/trunk/; revision=30374
---
 modules/services/x11/terminal-server.nix | 66 ++++++++++++++++++++++++
 1 file changed, 66 insertions(+)
 create mode 100644 modules/services/x11/terminal-server.nix

diff --git a/modules/services/x11/terminal-server.nix b/modules/services/x11/terminal-server.nix
new file mode 100644
index 00000000000..951807bec5a
--- /dev/null
+++ b/modules/services/x11/terminal-server.nix
@@ -0,0 +1,66 @@
+# This module implements a terminal service based on ‘x11vnc’.  It
+# listens on port 5900 for VNC connections.  It then presents a login
+# screen to the user.  If the user successfully authenticates, x11vnc
+# checks to see if a X server is already running for that user.  If
+# not, a X server (Xvfb) is started for that user.  The Xvfb instances
+# persist across VNC sessions.
+
+{ config, pkgs, ... }:
+
+with pkgs.lib;
+
+let
+
+  # Wrap Xvfb to set some flags/variables.
+  xvfbWrapper = pkgs.writeScriptBin "Xvfb"
+    ''
+      #! ${pkgs.stdenv.shell}
+      export XKB_BINDIR=${pkgs.xorg.xkbcomp}/bin
+      export XORG_DRI_DRIVER_PATH=${pkgs.mesa}/lib/dri
+      exec ${pkgs.xorg.xorgserver}/bin/Xvfb "$@" -xkbdir "${pkgs.xkeyboard_config}/etc/X11/xkb"
+    '';
+
+  # ‘xinetd’ is insanely braindamaged in that it sends stderr to
+  # stdout.  Thus requires just about any xinetd program to be
+  # wrapped to redirect its stderr.  Sigh.
+  x11vncWrapper = pkgs.writeScriptBin "x11vnc-wrapper"
+    ''
+      #! ${pkgs.stdenv.shell}
+      export PATH=${makeSearchPath "bin" [ xvfbWrapper pkgs.gawk pkgs.which pkgs.openssl pkgs.xorg.xdpyinfo pkgs.xorg.xauth pkgs.nettools pkgs.shadow pkgs.procps pkgs.utillinux pkgs.bash ]}:$PATH
+      export FD_GEOM=1024x786x24
+      exec ${pkgs.x11vnc}/bin/x11vnc -inetd -display WAIT:1024x786:cmd=FINDCREATEDISPLAY-Xvfb.xdmcp -unixpw -ssl SAVE 2> /var/log/x11vnc.log
+    '';
+
+in 
+
+{
+
+  config = {
+  
+    services.xserver.enable = true;
+
+    # Enable KDM.  Any display manager will do as long as it supports XDMCP.
+    services.xserver.displayManager.kdm.enable = true;
+    services.xserver.displayManager.kdm.enableXDMCP = true;
+    services.xserver.displayManager.kdm.extraConfig =
+      ''
+        [General]
+        # We're headless, so don't bother starting an X server.
+        StaticServers=
+
+        [Xdmcp]
+        Xaccess=${pkgs.writeText "Xaccess" "localhost"}
+      '';
+
+    services.xinetd.enable = true;
+    services.xinetd.services = singleton
+      { name = "x11vnc";
+        port = 5900;
+        unlisted = true;
+        user = "root";
+        server = "${x11vncWrapper}/bin/x11vnc-wrapper";
+      };
+
+  };
+
+}
-- 
GitLab


From da542dc1aead733bdab82a08f73a7f3e5bde6c8d Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 10 Nov 2011 23:06:24 +0000
Subject: [PATCH 3258/5331] * Added a module for oidentd.

svn path=/nixos/trunk/; revision=30381
---
 modules/module-list.nix                 | 13 ++++----
 modules/services/networking/oidentd.nix | 41 +++++++++++++++++++++++++
 2 files changed, 48 insertions(+), 6 deletions(-)
 create mode 100644 modules/services/networking/oidentd.nix

diff --git a/modules/module-list.nix b/modules/module-list.nix
index 44491dd116d..96127dee79a 100644
--- a/modules/module-list.nix
+++ b/modules/module-list.nix
@@ -65,10 +65,10 @@
   ./services/hardware/acpid.nix
   ./services/hardware/bluetooth.nix
   ./services/hardware/hal.nix
-  ./services/hardware/udisks.nix
-  ./services/hardware/upower.nix
   ./services/hardware/pcscd.nix
   ./services/hardware/udev.nix
+  ./services/hardware/udisks.nix
+  ./services/hardware/upower.nix
   ./services/logging/klogd.nix
   ./services/logging/logrotate.nix
   ./services/logging/syslogd.nix
@@ -91,9 +91,9 @@
   ./services/misc/virtualbox.nix
   ./services/monitoring/monit.nix
   ./services/monitoring/nagios/default.nix
-  ./services/monitoring/ups.nix
   ./services/monitoring/smartd.nix
   ./services/monitoring/systemhealth.nix
+  ./services/monitoring/ups.nix
   ./services/monitoring/zabbix-agent.nix
   ./services/monitoring/zabbix-server.nix
   ./services/network-filesystems/drbd.nix
@@ -104,6 +104,7 @@
   ./services/networking/avahi-daemon.nix
   ./services/networking/bind.nix
   ./services/networking/bitlbee.nix
+  ./services/networking/cntlm.nix
   ./services/networking/ddclient.nix
   ./services/networking/dhclient.nix
   ./services/networking/dhcpd.nix
@@ -119,6 +120,7 @@
   ./services/networking/ircd-hybrid/default.nix
   ./services/networking/nat.nix
   ./services/networking/ntpd.nix
+  ./services/networking/oidentd.nix
   ./services/networking/openfire.nix
   ./services/networking/openvpn.nix
   ./services/networking/portmap.nix
@@ -128,11 +130,10 @@
   ./services/networking/radvd.nix
   ./services/networking/rdnssd.nix
   ./services/networking/sabnzbd.nix
-  ./services/networking/unbound.nix
   ./services/networking/ssh/lshd.nix
   ./services/networking/ssh/sshd.nix
-  ./services/networking/cntlm.nix
   ./services/networking/tftpd.nix
+  ./services/networking/unbound.nix
   ./services/networking/vsftpd.nix
   ./services/networking/wakeonlan.nix
   ./services/networking/wicd.nix
@@ -158,8 +159,8 @@
   ./services/x11/display-managers/default.nix
   ./services/x11/display-managers/kdm.nix
   ./services/x11/display-managers/slim.nix
-  ./services/x11/hardware/synaptics.nix
   ./services/x11/hardware/multitouch.nix
+  ./services/x11/hardware/synaptics.nix
   ./services/x11/hardware/wacom.nix
   ./services/x11/window-managers/awesome.nix
   ./services/x11/window-managers/compiz.nix
diff --git a/modules/services/networking/oidentd.nix b/modules/services/networking/oidentd.nix
new file mode 100644
index 00000000000..d730e99af89
--- /dev/null
+++ b/modules/services/networking/oidentd.nix
@@ -0,0 +1,41 @@
+{ config, pkgs, ... }:
+
+with pkgs.lib;
+
+{
+
+  ###### interface
+
+  options = {
+
+    services.oidentd.enable = mkOption {
+      default = false;
+      type = types.bool;
+      description = ''
+        Whether to enable ‘oidentd’, an implementation of the Ident
+        protocol (RFC 1413).  It allows remote systems to identify the
+        name of the user associated with a TCP connection.
+      '';
+    };
+
+  };
+
+  
+  ###### implementation
+
+  config = mkIf config.services.oidentd.enable {
+
+    jobs.oidentd =
+      { startOn = "started network-interfaces";
+        daemonType = "fork";
+        exec = "${pkgs.oidentd}/sbin/oidentd -u oidentd -g nogroup";
+      };
+
+    users.extraUsers = singleton
+      { name = "oidentd";
+        description = "Ident Protocol daemon user";
+      };
+
+  };
+
+}
-- 
GitLab


From 48adcd5510981a13f9e2ccdcfa5d8daaccc6a586 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 11 Nov 2011 03:11:32 +0000
Subject: [PATCH 3259/5331] * Remove xdpyinfo from the $PATH.

svn path=/nixos/trunk/; revision=30388
---
 modules/services/x11/terminal-server.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/services/x11/terminal-server.nix b/modules/services/x11/terminal-server.nix
index 951807bec5a..ab05639aeca 100644
--- a/modules/services/x11/terminal-server.nix
+++ b/modules/services/x11/terminal-server.nix
@@ -26,7 +26,7 @@ let
   x11vncWrapper = pkgs.writeScriptBin "x11vnc-wrapper"
     ''
       #! ${pkgs.stdenv.shell}
-      export PATH=${makeSearchPath "bin" [ xvfbWrapper pkgs.gawk pkgs.which pkgs.openssl pkgs.xorg.xdpyinfo pkgs.xorg.xauth pkgs.nettools pkgs.shadow pkgs.procps pkgs.utillinux pkgs.bash ]}:$PATH
+      export PATH=${makeSearchPath "bin" [ xvfbWrapper pkgs.gawk pkgs.which pkgs.openssl pkgs.xorg.xauth pkgs.nettools pkgs.shadow pkgs.procps pkgs.utillinux pkgs.bash ]}:$PATH
       export FD_GEOM=1024x786x24
       exec ${pkgs.x11vnc}/bin/x11vnc -inetd -display WAIT:1024x786:cmd=FINDCREATEDISPLAY-Xvfb.xdmcp -unixpw -ssl SAVE 2> /var/log/x11vnc.log
     '';
-- 
GitLab


From d89f4b6c7672465277f4bf239b6a09eb7f05b0c6 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 11 Nov 2011 15:02:30 +0000
Subject: [PATCH 3260/5331] * Revert r30370, it's no longer needed.

svn path=/nixos/trunk/; revision=30389
---
 modules/config/pulseaudio.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/config/pulseaudio.nix b/modules/config/pulseaudio.nix
index 4c88cdffb41..71bf0081e4e 100644
--- a/modules/config/pulseaudio.nix
+++ b/modules/config/pulseaudio.nix
@@ -74,11 +74,11 @@ let cfg = config.hardware.pulseaudio; in
         }
 
         { target = "pulse/default.pa";
-          source = "${cfg.package}/etc/default.pa";
+          source = "${cfg.package}/etc/pulse/default.pa";
         }
 
         { target = "pulse/system.pa";
-          source = "${cfg.package}/etc/system.pa";
+          source = "${cfg.package}/etc/pulse/system.pa";
         }
 
       ]);
-- 
GitLab


From 9de905ee613d4b9c7fd8ee118939464b4d66f362 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 20 Nov 2011 10:38:26 +0000
Subject: [PATCH 3261/5331] modules/programs/wvdial.nix: added support for
 configuring wvdial

For example, I use the following settings to configure T-Mobile Internet
access on my laptop, which is connected to the cell phone by USB:

 | environment.wvdial.dialerDefaults = ''
 |   Init1 = AT+CGDCONT=1,"IP","internet.t-mobile"
 |   Modem Type = USB Modem
 |   Phone = *99#
 |   ISDN = 0
 |   Username = tm
 |   Password = tm
 |   Modem = /dev/ttyACM0
 |   Baud = 460800
 | '';

svn path=/nixos/trunk/; revision=30489
---
 modules/module-list.nix     |  1 +
 modules/programs/wvdial.nix | 73 +++++++++++++++++++++++++++++++++++++
 2 files changed, 74 insertions(+)
 create mode 100644 modules/programs/wvdial.nix

diff --git a/modules/module-list.nix b/modules/module-list.nix
index 96127dee79a..17a65a00402 100644
--- a/modules/module-list.nix
+++ b/modules/module-list.nix
@@ -38,6 +38,7 @@
   ./programs/shadow.nix
   ./programs/ssh.nix
   ./programs/ssmtp.nix
+  ./programs/wvdial.nix
   ./rename.nix
   ./security/ca.nix
   ./security/consolekit.nix
diff --git a/modules/programs/wvdial.nix b/modules/programs/wvdial.nix
new file mode 100644
index 00000000000..6d24efef531
--- /dev/null
+++ b/modules/programs/wvdial.nix
@@ -0,0 +1,73 @@
+# Global configuration for wvdial.
+
+{ config, pkgs, ... }:
+
+with pkgs.lib;
+
+let
+
+  configFile = ''
+    [Dialer Defaults]
+    PPPD PATH = ${pkgs.ppp}/sbin/pppd
+    ${config.environment.wvdial.dialerDefaults}
+  '';
+
+  cfg = config.environment.wvdial;
+
+in
+{
+  ###### interface
+
+  options = {
+
+    environment.wvdial = {
+
+      dialerDefaults = mkOption {
+        default = "";
+        type = types.string;
+        example = ''Init1 = AT+CGDCONT=1,"IP","internet.t-mobile"'';
+        description = ''
+          Contents of the "Dialer Defaults" section of
+          <filename>/etc/wvdial.conf</filename>.
+        '';
+      };
+
+      pppDefaults = mkOption {
+        default = ''
+          noipdefault
+          usepeerdns
+          defaultroute
+          persist
+          noauth
+        '';
+        type = types.string;
+        description = "Default ppp settings for wvdial.";
+      };
+
+    };
+
+  };
+
+  ###### implementation
+
+  config = mkIf (cfg.dialerDefaults != "") {
+
+    environment = {
+
+      etc =
+      [
+        { source = pkgs.writeText "wvdial.conf" configFile;
+          target = "wvdial.conf";
+        }
+        { source = pkgs.writeText "wvdial" cfg.pppDefaults;
+          target = "ppp/peers/wvdial";
+        }
+      ];
+
+      systemPackages = [ pkgs.wvdial ];
+
+    };
+
+  };
+
+}
-- 
GitLab


From 1d5d7036d0119fa348039e7b2b745c8f4b7e0f4a Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 24 Nov 2011 18:28:45 +0000
Subject: [PATCH 3262/5331] * Add a module for managing cgroups.

svn path=/nixos/trunk/; revision=30551
---
 modules/module-list.nix                       |   1 +
 modules/services/system/cgroups.nix           | 140 ++++++++++++++++++
 .../system/activation/activation-script.nix   |   8 -
 3 files changed, 141 insertions(+), 8 deletions(-)
 create mode 100644 modules/services/system/cgroups.nix

diff --git a/modules/module-list.nix b/modules/module-list.nix
index 17a65a00402..7230998370c 100644
--- a/modules/module-list.nix
+++ b/modules/module-list.nix
@@ -146,6 +146,7 @@
   ./services/scheduling/fcron.nix
   ./services/security/tor.nix
   ./services/security/torsocks.nix
+  ./services/system/cgroups.nix
   ./services/system/dbus.nix
   ./services/system/kerberos.nix
   ./services/system/nscd.nix
diff --git a/modules/services/system/cgroups.nix b/modules/services/system/cgroups.nix
new file mode 100644
index 00000000000..08482643c3f
--- /dev/null
+++ b/modules/services/system/cgroups.nix
@@ -0,0 +1,140 @@
+{ config, pkgs, ... }:
+
+with pkgs.lib;
+
+let
+
+  cfg = config.services.cgroups;
+
+  cgconfigConf = pkgs.writeText "cgconfig.conf" cfg.groups;
+
+  cgrulesConf = pkgs.writeText "cgrules.conf" cfg.rules;
+
+in
+
+{
+
+  ###### interface
+
+  options = {
+
+    services.cgroups.enable = mkOption {
+      type = types.bool;
+      default = false;
+      description = ''
+        Whether to enable support for control groups, a Linux kernel
+        feature for resource management.  It allows you to assign
+        processes to groups that share certain resource limits (e.g.,
+        CPU or memory).  The <command>cgrulesengd</command> daemon
+        automatically assigns processes to the right cgroup depending
+        on the rules defined in
+        <option>services.cgroups.rules</option>.
+      '';
+    };
+
+    services.cgroups.groups = mkOption {
+      type = types.string;
+      default =
+        ''
+          mount {
+            cpu = /dev/cgroup/cpu;
+          }
+        '';
+      example =
+        ''
+          mount {
+            cpu = /dev/cgroup/cpu;
+            cpuacct = /dev/cgroup/cpuacct;
+          }
+
+          # Create a "www" cgroup with a lower share of the CPU (the
+          # default is 1024).
+          group www {
+            cpu {
+              cpu.shares = "500";
+            }
+          }
+        '';
+      description = ''
+        The contents of the <filename>cgconfig.conf</filename>
+        configuration file, which defines the cgroups.
+      '';
+    };
+
+    services.cgroups.rules = mkOption {
+      type = types.string;
+      default = "";
+      example =
+        ''
+          # All processes executed by the "wwwrun" uid should be
+          # assigned to the "www" CPU cgroup.
+          wwwrun cpu www
+        '';
+      description = ''
+        The contents of the <filename>cgrules.conf</filename>
+        configuration file, which determines to which cgroups
+        processes should be assigned by the
+        <command>cgrulesengd</command> daemon.
+      '';
+    };
+
+  };
+
+  
+  ###### implementation
+
+  config = mkIf cfg.enable {
+
+    environment.systemPackages = [ pkgs.libcgroup ];
+
+    environment.etc =
+      [ { source = cgconfigConf;
+          target = "cgconfig.conf";
+        }
+        { source = cgrulesConf;
+          target = "cgrules.conf";
+        }
+      ];
+
+    jobs.cgroups =
+      { startOn = "startup";
+
+        description = "Control groups daemon";
+
+        path = [ pkgs.libcgroup pkgs.procps ];
+      
+        preStart =
+          ''
+            # The daemon requires the userspace<->kernelspace netlink
+            # connector.
+            ${config.system.sbin.modprobe}/sbin/modprobe cn || true
+          
+            cgclear || true
+
+            # Mount the cgroup hierarchies.  Note: we refer to the
+            # store path of cgconfig.conf here to ensure that the job
+            # gets reloaded if the configuration changes.
+            cgconfigparser -l ${cgconfigConf}
+
+            # Move existing processes to the right cgroup.
+            cgclassify --cancel-sticky $(ps --no-headers -eL o tid) || true
+
+            # Force a restart if the rules change:
+            # ${cgrulesConf}
+          '';
+
+        # Run the daemon that moves new processes to the right cgroup.
+        exec = "cgrulesengd";
+
+        daemonType = "fork";
+
+        postStop =
+          ''
+            cgclear
+          '';
+      };
+      
+
+  };
+
+}
diff --git a/modules/system/activation/activation-script.nix b/modules/system/activation/activation-script.nix
index 72566507ecc..d7074810c27 100644
--- a/modules/system/activation/activation-script.nix
+++ b/modules/system/activation/activation-script.nix
@@ -129,14 +129,6 @@ in
         mkdir -p /media
       '';
 
-    system.activationScripts.cgroups =
-      ''
-        if ! ${pkgs.sysvtools}/bin/mountpoint -q /dev/cgroup; then
-            mkdir -p /dev/cgroup
-            ${pkgs.utillinux}/bin/mount -t cgroup -o freezer,cpuacct,cpu,cpuset none /dev/cgroup
-        fi
-      '';
-
   };
 
 }
-- 
GitLab


From 8eba736da9e6d7ff389554c3f6e0ca5ac089e3ee Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 25 Nov 2011 16:32:54 +0000
Subject: [PATCH 3263/5331] =?UTF-8?q?*=20Use=20the=20=E2=80=98path?=
 =?UTF-8?q?=E2=80=99=20attribute=20in=20Upstart=20jobs=20in=20more=20place?=
 =?UTF-8?q?s.=20=20It's=20a=20bit=20=20=20more=20readable=20(also=20in=20"?=
 =?UTF-8?q?ps"=20output).?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

svn path=/nixos/trunk/; revision=30565
---
 modules/services/hardware/acpid.nix           |  6 +++++-
 modules/services/hardware/udev.nix            | 14 ++++++++-----
 modules/services/logging/klogd.nix            |  4 +++-
 modules/services/logging/syslogd.nix          |  4 +++-
 modules/services/misc/nix-daemon.nix          |  8 +++++---
 modules/services/networking/dhclient.nix      |  4 +++-
 modules/services/networking/ntpd.nix          |  6 ++++--
 .../services/networking/wpa_supplicant.nix    |  5 +++--
 modules/services/networking/xinetd.nix        |  4 +++-
 modules/services/printing/cupsd.nix           |  5 +++--
 modules/services/scheduling/atd.nix           |  4 +++-
 modules/services/scheduling/cron.nix          |  4 +++-
 modules/services/system/dbus.nix              |  6 ++++--
 modules/services/system/nscd.nix              |  4 +++-
 modules/services/ttys/mingetty.nix            |  8 ++++----
 .../web-servers/apache-httpd/default.nix      | 20 +++++++++----------
 .../web-servers/apache-httpd/mercurial.nix    |  4 +---
 .../web-servers/apache-httpd/zabbix.nix       |  2 +-
 18 files changed, 70 insertions(+), 42 deletions(-)

diff --git a/modules/services/hardware/acpid.nix b/modules/services/hardware/acpid.nix
index 84680bd3532..303db3816b5 100644
--- a/modules/services/hardware/acpid.nix
+++ b/modules/services/hardware/acpid.nix
@@ -99,7 +99,11 @@ in
 
         startOn = "stopped udevtrigger and started syslogd";
 
-        exec = "${pkgs.acpid}/sbin/acpid --foreground --confdir ${acpiConfDir}";
+        path = [ pkgs.acpid ];
+
+        daemonType = "fork";
+
+        exec = "acpid --confdir ${acpiConfDir}";
       };
 
   };
diff --git a/modules/services/hardware/udev.nix b/modules/services/hardware/udev.nix
index 98443f9758a..143f8ebbad8 100644
--- a/modules/services/hardware/udev.nix
+++ b/modules/services/hardware/udev.nix
@@ -215,6 +215,8 @@ in
 
         environment = { UDEV_CONFIG_FILE = conf; };
 
+        path = [ udev ];
+
         preStart =
           ''
             echo "" > /proc/sys/kernel/hotplug || true
@@ -234,7 +236,7 @@ in
 
         daemonType = "fork";
 
-        exec = "${udev}/sbin/udevd --daemon";
+        exec = "udevd --daemon";
       };
 
     jobs.udevtrigger =
@@ -242,6 +244,8 @@ in
 
         task = true;
 
+        path = [ udev ];
+
         script =
           ''
             # Let udev create device nodes for all modules that have already
@@ -249,10 +253,10 @@ in
             # the kernel).  The `STARTUP' variable is needed to force
             # the LVM rules to create device nodes.  See
             # http://www.mail-archive.com/fedora-devel-list@redhat.com/msg10261.html
-            ${udev}/sbin/udevadm control --env=STARTUP=1
-            ${udev}/sbin/udevadm trigger --action=add
-            ${udev}/sbin/udevadm settle # wait for udev to finish
-            ${udev}/sbin/udevadm control --env=STARTUP=
+            udevadm control --env=STARTUP=1
+            udevadm trigger --action=add
+            udevadm settle # wait for udev to finish
+            udevadm control --env=STARTUP=
 
             initctl emit -n new-devices
           '';
diff --git a/modules/services/logging/klogd.nix b/modules/services/logging/klogd.nix
index 2f4bd411e58..af21f9cc959 100644
--- a/modules/services/logging/klogd.nix
+++ b/modules/services/logging/klogd.nix
@@ -9,8 +9,10 @@
 
       startOn = "started syslogd";
 
+      path = [ pkgs.sysklogd ];
+
       exec =
-        "${pkgs.sysklogd}/sbin/klogd -c 1 -2 -n " +
+        "klogd -c 1 -2 -n " +
         "-k $(dirname $(readlink -f /var/run/booted-system/kernel))/System.map";
     };
 
diff --git a/modules/services/logging/syslogd.nix b/modules/services/logging/syslogd.nix
index bb088c250f6..715cfc0f9e6 100644
--- a/modules/services/logging/syslogd.nix
+++ b/modules/services/logging/syslogd.nix
@@ -102,7 +102,9 @@ in
 
         daemonType = "fork";
 
-        exec = "${pkgs.sysklogd}/sbin/syslogd ${toString cfg.extraParams} -f ${syslogConf}";
+        path = [ pkgs.sysklogd ];
+
+        exec = "syslogd ${toString cfg.extraParams} -f ${syslogConf}";
       };
 
   };
diff --git a/modules/services/misc/nix-daemon.nix b/modules/services/misc/nix-daemon.nix
index 1f95e63b64a..c8eaf15ff77 100644
--- a/modules/services/misc/nix-daemon.nix
+++ b/modules/services/misc/nix-daemon.nix
@@ -249,14 +249,16 @@ in
 
         startOn = "startup";
 
+        path = [ nix pkgs.openssl pkgs.utillinux ]
+          ++ optionals config.nix.distributedBuilds [ pkgs.openssh pkgs.gzip ];
+
         script =
           ''
-            export PATH=${if config.nix.distributedBuilds then "${pkgs.openssh}/bin:${pkgs.gzip}/bin:" else ""}${pkgs.openssl}/bin:${nix}/bin:$PATH
             ${config.nix.envVars}
             exec \
               nice -n ${builtins.toString config.nix.daemonNiceLevel} \
-              ${pkgs.utillinux}/bin/ionice -n ${builtins.toString config.nix.daemonIONiceLevel} \
-              ${nix}/bin/nix-worker --daemon > /dev/null 2>&1
+              ionice -n ${builtins.toString config.nix.daemonIONiceLevel} \
+              nix-worker --daemon > /dev/null 2>&1
           '';
 
         extraConfig =
diff --git a/modules/services/networking/dhclient.nix b/modules/services/networking/dhclient.nix
index 0a353ae1eab..38454d421b1 100644
--- a/modules/services/networking/dhclient.nix
+++ b/modules/services/networking/dhclient.nix
@@ -67,6 +67,8 @@ in
       { startOn = "started network-interfaces";
         stopOn = "stopping network-interfaces";
 
+        path = [ dhcp ];
+
         preStart =
           ''
             # dhclient barfs if /proc/net/if_inet6 doesn't exist.
@@ -101,7 +103,7 @@ in
 
             mkdir -m 755 -p ${stateDir}
 
-            exec ${dhcp}/sbin/dhclient -d $interfaces -e "PATH=$PATH" -lf ${stateDir}/dhclient.leases -sf ${dhcp}/sbin/dhclient-script
+            exec dhclient -d $interfaces -e "PATH=$PATH" -lf ${stateDir}/dhclient.leases -sf ${dhcp}/sbin/dhclient-script
           '';
       };
 
diff --git a/modules/services/networking/ntpd.nix b/modules/services/networking/ntpd.nix
index 6e3040a2ae1..b8624cd6cdf 100644
--- a/modules/services/networking/ntpd.nix
+++ b/modules/services/networking/ntpd.nix
@@ -75,6 +75,8 @@ in
 
         startOn = "ip-up";
 
+        path = [ ntp ];
+
         preStart =
           ''
             mkdir -m 0755 -p ${stateDir}
@@ -88,10 +90,10 @@ in
             # because Upstart cannot kill jobs stuck in the start
             # phase.  Thus a hanging ntpd job can block system
             # shutdown.
-            # ${ntp}/bin/ntpd -q -g ${ntpFlags}
+            # ntpd -q -g ${ntpFlags}
           '';
 
-        exec = "${ntp}/bin/ntpd -g -n ${ntpFlags}";
+        exec = "ntpd -g -n ${ntpFlags}";
       };
 
   };
diff --git a/modules/services/networking/wpa_supplicant.nix b/modules/services/networking/wpa_supplicant.nix
index a349a721b12..547280931c9 100644
--- a/modules/services/networking/wpa_supplicant.nix
+++ b/modules/services/networking/wpa_supplicant.nix
@@ -48,6 +48,8 @@ in
       { startOn = "started network-interfaces";
         stopOn = "stopping network-interfaces";
 
+        path = [ pkgs.wpa_supplicant ];
+
         preStart =
           ''
             touch -a ${configFile}
@@ -55,8 +57,7 @@ in
           '';
 
         exec =
-          "${pkgs.wpa_supplicant}/sbin/wpa_supplicant " +
-          "-s -C /var/run/wpa_supplicant " +
+          "wpa_supplicant -s -C /var/run/wpa_supplicant " +
           "-c ${configFile} -i${config.networking.WLANInterface}";
       };
   
diff --git a/modules/services/networking/xinetd.nix b/modules/services/networking/xinetd.nix
index 0bd6052c125..aabb7cf9f8a 100644
--- a/modules/services/networking/xinetd.nix
+++ b/modules/services/networking/xinetd.nix
@@ -132,7 +132,9 @@ in
         startOn = "started network-interfaces";
         stopOn = "stopping network-interfaces";
 
-        exec = "${xinetd}/sbin/xinetd -syslog daemon -dontfork -stayalive -f ${configFile}";
+        path = [ xinetd ];
+
+        exec = "xinetd -syslog daemon -dontfork -stayalive -f ${configFile}";
       };
 
   };
diff --git a/modules/services/printing/cupsd.nix b/modules/services/printing/cupsd.nix
index e33e2245dbc..8ba4a41e0de 100644
--- a/modules/services/printing/cupsd.nix
+++ b/modules/services/printing/cupsd.nix
@@ -129,7 +129,8 @@ in
         startOn = "started network-interfaces";
         stopOn = "stopping network-interfaces";
 
-        path = [ config.system.path ];
+        # !!! Why is config.system.path in here?
+        path = [ cups config.system.path ];
 
         preStart =
           ''
@@ -140,7 +141,7 @@ in
             mkdir -m 0755 -p ${cfg.tempDir}
           '';
 
-        exec = "${cups}/sbin/cupsd -c ${pkgs.writeText "cupsd.conf" cfg.cupsdConf} -F";
+        exec = "cupsd -c ${pkgs.writeText "cupsd.conf" cfg.cupsdConf} -F";
       };
 
     services.printing.drivers = [ pkgs.cups pkgs.cups_pdf_filter pkgs.ghostscript additionalBackends ];
diff --git a/modules/services/scheduling/atd.nix b/modules/services/scheduling/atd.nix
index 8213f4b3667..6e6eaec1db9 100644
--- a/modules/services/scheduling/atd.nix
+++ b/modules/services/scheduling/atd.nix
@@ -68,6 +68,8 @@ in
 
         startOn = "stopped udevtrigger";
 
+        path = [ at ];
+
         preStart =
           ''
             # Snippets taken and adapted from the original `install' rule of
@@ -99,7 +101,7 @@ in
             fi
           '';
 
-        exec = "${at}/sbin/atd";
+        exec = "atd";
 
         daemonType = "fork";
       };
diff --git a/modules/services/scheduling/cron.nix b/modules/services/scheduling/cron.nix
index 86ac32b94dc..350d65b476a 100644
--- a/modules/services/scheduling/cron.nix
+++ b/modules/services/scheduling/cron.nix
@@ -93,6 +93,8 @@ in
         # Needed to interpret times in the local timezone.
         environment = { TZ = config.time.timeZone; };
 
+        path = [ cronNixosPkg ];
+
         preStart =
           ''
             mkdir -m 710 -p /var/cron
@@ -104,7 +106,7 @@ in
             fi
           '';
 
-        exec = "${cronNixosPkg}/sbin/cron -n";
+        exec = "cron -n";
       };
 
   };
diff --git a/modules/services/system/dbus.nix b/modules/services/system/dbus.nix
index 4f6d577e936..2808b0241c2 100644
--- a/modules/services/system/dbus.nix
+++ b/modules/services/system/dbus.nix
@@ -118,20 +118,22 @@ in
     jobs.dbus =
       { startOn = "started udev and started syslogd";
 
+        path = [ pkgs.dbus_daemon pkgs.dbus_tools ];
+
         preStart =
           ''
             mkdir -m 0755 -p ${homeDir}
             chown messagebus ${homeDir}
 
             mkdir -m 0755 -p /var/lib/dbus
-            ${pkgs.dbus_tools}/bin/dbus-uuidgen --ensure
+            dbus-uuidgen --ensure
 
             rm -f ${homeDir}/pid
           '';
 
         daemonType = "fork";
 
-        exec = "${pkgs.dbus_daemon}/bin/dbus-daemon --system";
+        exec = "dbus-daemon --system";
 
         postStop =
           ''
diff --git a/modules/services/system/nscd.nix b/modules/services/system/nscd.nix
index 971b73706ae..22d6e38a74b 100644
--- a/modules/services/system/nscd.nix
+++ b/modules/services/system/nscd.nix
@@ -52,7 +52,9 @@ in
             mkdir -m 0755 -p /var/db/nscd
           '';
 
-        exec = "${pkgs.glibc}/sbin/nscd -f ${./nscd.conf} -d 2> /dev/null";
+        path = [ pkgs.glibc ];
+
+        exec = "nscd -f ${./nscd.conf} -d 2> /dev/null";
       };
 
   };
diff --git a/modules/services/ttys/mingetty.nix b/modules/services/ttys/mingetty.nix
index 3b7ae240d54..5a86dada1f2 100644
--- a/modules/services/ttys/mingetty.nix
+++ b/modules/services/ttys/mingetty.nix
@@ -60,11 +60,11 @@ with pkgs.lib;
 
       startOn = "started udev and filesystem";
 
-      exec = "${pkgs.mingetty}/sbin/mingetty --loginprog=${pkgs.shadow}/bin/login --noclear ${tty}";
+      path = [ pkgs.mingetty ];
 
-      environment = {
-        LOCALE_ARCHIVE = "/var/run/current-system/sw/lib/locale/locale-archive";
-      };
+      exec = "mingetty --loginprog=${pkgs.shadow}/bin/login --noclear ${tty}";
+
+      environment.LOCALE_ARCHIVE = "/var/run/current-system/sw/lib/locale/locale-archive";
 
     }) config.services.mingetty.ttys);
 
diff --git a/modules/services/web-servers/apache-httpd/default.nix b/modules/services/web-servers/apache-httpd/default.nix
index 39f087e4ccf..f37ed56608d 100644
--- a/modules/services/web-servers/apache-httpd/default.nix
+++ b/modules/services/web-servers/apache-httpd/default.nix
@@ -562,16 +562,16 @@ in
           # the latter is enabled.
           + optionalString config.services.postgresql.enable " and started postgresql";
 
-        environment =
-          { PATH = concatStringsSep ":" (
-              [ "${pkgs.coreutils}/bin" "${pkgs.gnugrep}/bin" ]
-              ++ # Needed for PHP's mail() function.  !!! Probably the
-                 # ssmtp module should export the path to sendmail in
-                 # some way.
-                 optional config.networking.defaultMailServer.directDelivery "${pkgs.ssmtp}/sbin"
-              ++ (concatMap (svc: svc.extraServerPath) allSubservices) );
+        path =
+          [ httpd pkgs.coreutils pkgs.gnugrep ]
+          ++ # Needed for PHP's mail() function.  !!! Probably the
+             # ssmtp module should export the path to sendmail in
+             # some way.
+             optional config.networking.defaultMailServer.directDelivery pkgs.ssmtp
+          ++ concatMap (svc: svc.extraServerPath) allSubservices;
 
-            PHPRC = if enablePHP then phpIni else "";
+        environment =
+          { PHPRC = if enablePHP then phpIni else "";
 
             TZ = config.time.timeZone;
 
@@ -605,7 +605,7 @@ in
 
         daemonType = "fork";
 
-        exec = "${httpd}/bin/httpd -f ${httpdConf}";
+        exec = "httpd -f ${httpdConf}";
 
         preStop =
           ''
diff --git a/modules/services/web-servers/apache-httpd/mercurial.nix b/modules/services/web-servers/apache-httpd/mercurial.nix
index ad1c332a657..755b595c783 100644
--- a/modules/services/web-servers/apache-httpd/mercurial.nix
+++ b/modules/services/web-servers/apache-httpd/mercurial.nix
@@ -51,9 +51,7 @@ in {
     Disallow: ${urlPrefix}
   '';
 
-  extraServerPath = [
-    (pkgs.python+"/bin")
-  ];
+  extraServerPath = [ pkgs.python ];
 
   globalEnvVars = [ { name = "PYTHONPATH"; value = "${mercurial}/lib/${pkgs.python.libPrefix}/site-packages"; } ];
 
diff --git a/modules/services/web-servers/apache-httpd/zabbix.nix b/modules/services/web-servers/apache-httpd/zabbix.nix
index 66b6c0ea9b0..385e9ab5644 100644
--- a/modules/services/web-servers/apache-httpd/zabbix.nix
+++ b/modules/services/web-servers/apache-httpd/zabbix.nix
@@ -46,7 +46,7 @@ in
   '';
 
   # The frontend needs "ps" to find out whether zabbix_server is running.
-  extraServerPath = ["${pkgs.procps}/bin"];
+  extraServerPath = [ pkgs.procps ];
 
   options = {
 
-- 
GitLab


From ef932017fc9fae65fb4ddc0fb752c6a8b20c5096 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 25 Nov 2011 17:09:37 +0000
Subject: [PATCH 3264/5331] smartd: run the mail notification script with
 ${pkgs.stdenv.shell} rather than /bin/sh

svn path=/nixos/trunk/; revision=30568
---
 modules/services/monitoring/smartd.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/services/monitoring/smartd.nix b/modules/services/monitoring/smartd.nix
index 5a94caefd3b..a4c24c794d6 100644
--- a/modules/services/monitoring/smartd.nix
+++ b/modules/services/monitoring/smartd.nix
@@ -7,7 +7,7 @@ let
   cfg = config.services.smartd;
 
   smartdMail = pkgs.writeScript "smartdmail.sh" ''
-    #! /bin/sh
+    #! ${pkgs.stdenv.shell}
     TMPNAM=/tmp/smartd-message.$$.tmp
     if test -n "$SMARTD_ADDRESS"; then
       echo  >"$TMPNAM" "From: smartd <root>"
-- 
GitLab


From 0cd9ff9fcc927cb7a746003fbe4c831bfdca10f1 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 25 Nov 2011 17:09:44 +0000
Subject: [PATCH 3265/5331] smartd: run smartd daemon using the given search
 path to improve readability of ps output

svn path=/nixos/trunk/; revision=30569
---
 modules/services/monitoring/smartd.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/modules/services/monitoring/smartd.nix b/modules/services/monitoring/smartd.nix
index a4c24c794d6..2427f29020e 100644
--- a/modules/services/monitoring/smartd.nix
+++ b/modules/services/monitoring/smartd.nix
@@ -77,7 +77,9 @@ in
 
         startOn = "started syslogd";
 
-        exec = "${pkgs.smartmontools}/sbin/smartd --no-fork --pidfile=/var/run/smartd.pid ${smartdFlags}";
+        path = [ pkgs.smartmontools ];
+
+        exec = "smartd --no-fork --pidfile=/var/run/smartd.pid ${smartdFlags}";
       };
 
   };
-- 
GitLab


From e4ba69aecf8fc89fd43f5a2184bfa191dec037b7 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 25 Nov 2011 17:41:47 +0000
Subject: [PATCH 3266/5331] wvdial: don't make wvdial a system package; only
 root can run it

svn path=/nixos/trunk/; revision=30570
---
 modules/programs/wvdial.nix | 2 --
 1 file changed, 2 deletions(-)

diff --git a/modules/programs/wvdial.nix b/modules/programs/wvdial.nix
index 6d24efef531..da3f7dce98a 100644
--- a/modules/programs/wvdial.nix
+++ b/modules/programs/wvdial.nix
@@ -64,8 +64,6 @@ in
         }
       ];
 
-      systemPackages = [ pkgs.wvdial ];
-
     };
 
   };
-- 
GitLab


From e264d1ab793f81d5590b83f5e56fc0fa0008e7a0 Mon Sep 17 00:00:00 2001
From: Nicolas Pierron <nicolas.b.pierron@gmail.com>
Date: Tue, 29 Nov 2011 06:08:55 +0000
Subject: [PATCH 3267/5331] Convert users.extraUsers to an option set and add
 support for openssh authorized_keys file generation.

svn path=/nixos/trunk/; revision=30611
---
 modules/config/users-groups.nix          | 173 ++++++++++++++++-------
 modules/services/networking/ssh/sshd.nix |  98 +++++++++++++
 2 files changed, 220 insertions(+), 51 deletions(-)

diff --git a/modules/config/users-groups.nix b/modules/config/users-groups.nix
index 0e02822fb77..37e431330ce 100644
--- a/modules/config/users-groups.nix
+++ b/modules/config/users-groups.nix
@@ -5,43 +5,83 @@ with pkgs.lib;
 let
 
   ids = config.ids;
+  users = config.users;
+
+  userOpts = {name, config, ...}:
+
+  {
+    options = {
+      name = mkOption {
+        type = with types; uniq string;
+        description = "The name of the user account. If undefined, the name of the attribute set will be used.";
+      };
+      description = mkOption {
+        type = with types; uniq string;
+        default = "";
+        description = "A short description of the user account.";
+      };
+      uid = mkOption {
+        type = with types; uniq (nullOr int);
+        default = null;
+        description = "The account UID. If undefined, NixOS will select a UID.";
+      };
+      group = mkOption {
+        type = with types; uniq string;
+        default = "nogroup";
+        description = "The user's primary group.";
+      };
+      extraGroups = mkOption {
+        type = types.listOf types.string;
+        default = [];
+        description = "The user's auxiliary groups.";
+      };
+      home = mkOption {
+        type = with types; uniq string;
+        default = "/var/empty";
+        description = "The user's home directory.";
+      };
+      shell = mkOption {
+        type = with types; uniq string;
+        default = "/noshell";
+        description = "The path to the user's shell.";
+      };
+      createHome = mkOption {
+        type = types.bool;
+        default = false;
+        description = "If true, the home directory will be created automatically.";
+      };
+      useDefaultShell = mkOption {
+        type = types.bool;
+        default = false;
+        description = "If true, the user's shell will be set to <literal>users.defaultUserShell</literal>.";
+      };
+      password = mkOption {
+        type = with types; uniq (nullOr string);
+        default = null;
+        description = "The user's password. If undefined, no password is set for the user.  Warning: do not set confidential information here because this data would be readable by all.  This option should only be used for public account such as guest.";
+      };
+      isSystemUser = mkOption {
+        type = types.bool;
+        default = true;
+        description = "Indicates if the user is a system user or not.";
+      };
+      createUser = mkOption {
+        type = types.bool;
+        default = true;
+        description = "
+          Indicates if the user should be created automatically as a local user.
+          Set this to false if the user for instance is an LDAP user. NixOS will
+          then not modify any of the basic properties for the user account.
+        ";
+      };
+    };
 
-
-  # User accounts to be created/updated by NixOS.
-  users =
-    let
-      defaultUsers =
-        [ { name = "root";
-            uid = ids.uids.root;
-            description = "System administrator";
-            home = "/root";
-            shell = config.users.defaultUserShell;
-            group = "root";
-          }
-          { name = "nobody";
-            uid = ids.uids.nobody;
-            description = "Unprivileged account (don't use!)";
-          }
-        ];
-
-      # !!! Use NixOS module system to add default attributes.
-      addAttrs =
-        { name
-        , description
-        , uid ? ""
-        , group ? "nogroup"
-        , extraGroups ? []
-        , home ? "/var/empty"
-        , shell ? (if useDefaultShell then config.users.defaultUserShell else "/noshell")
-        , createHome ? false
-        , useDefaultShell ? false
-        , password ? null
-        , isSystemUser ? true
-        }:
-        { inherit name description uid group extraGroups home shell createHome password isSystemUser; };
-
-    in map addAttrs (defaultUsers ++ config.users.extraUsers);
-
+    config = {
+      name = mkDefault name;
+      uid = mkDefault (attrByPath [name] null ids.uids);
+      shell = mkIf config.useDefaultShell (mkDefault users.defaultUserShell);
+    };
+  };
 
   # Groups to be created/updated by NixOS.
   groups =
@@ -109,11 +149,14 @@ let
 
   # Note: the 'X' in front of the password is to distinguish between
   # having an empty password, and not having a password.
-  serializedUser = u: "${u.name}\n${u.description}\n${toString u.uid}\n${u.group}\n${toString (concatStringsSep "," u.extraGroups)}\n${u.home}\n${u.shell}\n${toString u.createHome}\n${if u.password != null then "X" + u.password else ""}\n${toString u.isSystemUser}\n";
+  serializedUser = userName: let u = getAttr userName config.users.extraUsers; in "${u.name}\n${u.description}\n${if u.uid != null then toString u.uid else ""}\n${u.group}\n${toString (concatStringsSep "," u.extraGroups)}\n${u.home}\n${u.shell}\n${toString u.createHome}\n${if u.password != null then "X" + u.password else ""}\n${toString u.isSystemUser}\n${if u.createUser then "yes" else "no"}\n";
+
   serializedGroup = g: "${g.name}\n${toString g.gid}";
 
   # keep this extra file so that cat can be used to pass special chars such as "`" which is used in the avahi daemon
-  usersFile = pkgs.writeText "users" (concatStrings (map serializedUser users));
+  usersFile = pkgs.writeText "users" (
+    concatMapStrings serializedUser (attrNames config.users.extraUsers)
+  );
 
 in
 
@@ -124,22 +167,24 @@ in
   options = {
 
     users.extraUsers = mkOption {
-      default = [];
-      example =
-        [ { name = "alice";
-            uid = 1234;
-            description = "Alice";
-            home = "/home/alice";
-            createHome = true;
-            group = "users";
-            extraGroups = ["wheel"];
-            shell = "/bin/sh";
-            password = "foobar";
-          }
-        ];
+      default = {};
+      type = types.loaOf types.optionSet;
+      example = {
+        alice = {
+          uid = 1234;
+          description = "Alice";
+          home = "/home/alice";
+          createHome = true;
+          group = "users";
+          extraGroups = ["wheel"];
+          shell = "/bin/sh";
+          password = "foobar";
+        };
+      };
       description = ''
         Additional user accounts to be created automatically by the system.
       '';
+      options = [ userOpts ];
     };
 
     users.extraGroups = mkOption {
@@ -154,6 +199,15 @@ in
       '';
     };
 
+    user = mkOption {
+      default = {};
+      description = ''
+        This option defines settings for individual users on the system.
+      '';
+      type = types.loaOf types.optionSet;
+      options = [ ];
+    };
+
   };
 
 
@@ -161,6 +215,18 @@ in
 
   config = {
 
+    users.extraUsers = {
+      root = {
+        description = "System administrator";
+        home = "/root";
+        shell = config.users.defaultUserShell;
+        group = "root";
+      };
+      nobody = {
+        description = "Unprivileged account (don't use!)";
+      };
+    };
+
     system.activationScripts.rootPasswd = stringAfter [ "etc" ]
       ''
         # If there is no password file yet, create a root account with an
@@ -192,6 +258,11 @@ in
             read createHome
             read password
             read isSystemUser
+            read createUser
+
+            if ! test "$createUser" = "yes"; then
+                continue
+            fi
 
             if ! curEnt=$(getent passwd "$name"); then
                 useradd ''${isSystemUser:+--system} \
diff --git a/modules/services/networking/ssh/sshd.nix b/modules/services/networking/ssh/sshd.nix
index be1dac08022..a779580eaee 100644
--- a/modules/services/networking/ssh/sshd.nix
+++ b/modules/services/networking/ssh/sshd.nix
@@ -14,6 +14,98 @@ let
     v == "forced-commands-only" ||
     v == "no";
 
+  userOptions = {
+    openssh.authorizedKeys = {
+
+      preserveExistingKeys = mkOption {
+        type = types.bool;
+        default = true;
+        description = ''
+          If this option is enabled, the keys specified in
+          <literal>keys</literal> and/or <literal>keyFiles</literal> will be
+          placed in a special section of the user's authorized_keys file
+          and any existing keys will be preserved. That section will be
+          regenerated each time NixOS is activated. However, if
+          <literal>preserveExisting</literal> isn't enabled, the complete file
+          will be generated, and any user modifications will be wiped out.
+        '';
+      };
+
+      keys = mkOption {
+        type = types.listOf types.string;
+        default = [];
+        description = ''
+          A list of verbatim OpenSSH public keys that should be inserted into the
+          user's authorized_keys file. You can combine the <literal>keys</literal> and
+          <literal>keyFiles</literal> options.
+        '';
+      };
+
+      keyFiles = mkOption {
+        type = types.listOf types.string;
+        default = [];
+        description = ''
+          A list of files each containing one OpenSSH public keys that should be
+          inserted into the user's authorized_keys file. You can combine
+          the <literal>keyFiles</literal> and
+          <literal>keys</literal> options.
+        '';
+      };
+
+    };
+  };
+
+  mkAuthkeyScript =
+    let
+      marker1 = "### NixOS will regenerate this line and every line below it.";
+      marker2 = "### NixOS will regenerate this file. Do not edit!";
+      users = map (userName: getAttr userName config.users.extraUsers) (attrNames config.users.extraUsers);
+      usersWithKeys = flip filter users (u:
+        length u.openssh.authorizedKeys.keys != 0 || length u.openssh.authorizedKeys.keyFiles != 0
+      );
+      userLoop = flip concatMapStrings usersWithKeys (u:
+        let
+          authKeys = concatStringsSep "," u.openssh.authorizedKeys.keys;
+          authKeyFiles = concatStringsSep "," u.openssh.authorizedKeys.keyFiles;
+          preserveExisting = if u.openssh.authorizedKeys.preserveExistingKeys then "true" else "false";
+        in ''
+          mkAuthKeysFile "${u.name}" "${authKeys}" "${authKeyFiles}" "${preserveExisting}"
+        ''
+      );
+    in ''
+      mkAuthKeysFile() {
+        local userName="$1"
+        local authKeys="$2"
+        local authKeyFiles="$3"
+        local preserveExisting="$4"
+        IFS=","
+
+        for f in $authKeyFiles; do
+          if [ -f "$f" ]; then
+            authKeys="$(${pkgs.coreutils}/bin/cat "$f"),$authKeys"
+          fi
+        done
+
+        if [ -n "$authKeys" ]; then
+          eval authfile=~$userName/.ssh/authorized_keys
+          ${pkgs.coreutils}/bin/mkdir -p "$(dirname $authfile)"
+          ${pkgs.coreutils}/bin/touch "$authfile"
+          if [ "$preserveExisting" == "false" ]; then
+            rm -f "$authfile"
+            authKeys="${marker2},$authKeys"
+          else
+            ${pkgs.gnused}/bin/sed -i '/^### NixOS.*$/,$d' "$authfile"
+            authKeys="${marker1},$authKeys"
+          fi
+          for key in $authKeys; do ${pkgs.coreutils}/bin/echo "$key" >> "$authfile"; done
+        fi
+
+        unset IFS
+      }
+      ${userLoop}
+    '';
+
+
 in
 
 {
@@ -102,6 +194,10 @@ in
 
     };
 
+    users.extraUsers = mkOption {
+      options = [ userOptions ];
+    };
+
   };
 
 
@@ -135,6 +231,8 @@ in
 
         preStart =
           ''
+            ${mkAuthkeyScript}
+
             mkdir -m 0755 -p /etc/ssh
 
             if ! test -f /etc/ssh/ssh_host_dsa_key; then
-- 
GitLab


From 508fea8dac268df08928c5e69b54eaeba50696b1 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 29 Nov 2011 14:19:55 +0000
Subject: [PATCH 3268/5331] * Remove the cfq_iosched module.

svn path=/nixos/trunk/; revision=30618
---
 modules/system/boot/kernel.nix | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/modules/system/boot/kernel.nix b/modules/system/boot/kernel.nix
index acae7054ddf..c5e304a21f6 100644
--- a/modules/system/boot/kernel.nix
+++ b/modules/system/boot/kernel.nix
@@ -171,9 +171,6 @@ let kernel = config.boot.kernelPackages.kernel; in
 
         # For usual AT keyboards.
         "i8042"
-
-        # Provide the CFQ scheduler in the initrd.
-        "cfq_iosched"
       ];
 
     # The Linux kernel >= 2.6.27 provides firmware.
-- 
GitLab


From 868c60c92b190aead5563fa319fc0cbd9f20ce51 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Mon, 5 Dec 2011 01:51:05 +0000
Subject: [PATCH 3269/5331] Add mpd module

There is room for improvement here. The options in conffile could be broken out into individual options and an extraConfig option added. But I think this looks right.
Patch by mornfall, slightly modified by me

svn path=/nixos/trunk/; revision=30731
---
 modules/misc/ids.nix           |  2 +
 modules/module-list.nix        |  1 +
 modules/services/audio/mpd.nix | 99 ++++++++++++++++++++++++++++++++++
 3 files changed, 102 insertions(+)
 create mode 100644 modules/services/audio/mpd.nix

diff --git a/modules/misc/ids.nix b/modules/misc/ids.nix
index 8a4175a7bd1..a0ac4dab5b1 100644
--- a/modules/misc/ids.nix
+++ b/modules/misc/ids.nix
@@ -68,6 +68,7 @@ in
     dovenull2 = 47;
     unbound = 48;
     prayer = 49;
+    mpd = 50;
 
     # When adding a uid, make sure it doesn't match an existing gid.
 
@@ -116,6 +117,7 @@ in
     virtuoso = 44;
     dovecot2 = 45;
     prayer = 46;
+    mpd = 47;
 
     # When adding a gid, make sure it doesn't match an existing uid.
 
diff --git a/modules/module-list.nix b/modules/module-list.nix
index 7230998370c..ea800648eab 100644
--- a/modules/module-list.nix
+++ b/modules/module-list.nix
@@ -53,6 +53,7 @@
   ./services/audio/alsa.nix
   ./services/audio/fuppes.nix
   ./services/audio/pulseaudio.nix
+  ./services/audio/mpd.nix
   ./services/backup/mysql-backup.nix
   ./services/backup/postgresql-backup.nix
   ./services/backup/sitecopy-backup.nix
diff --git a/modules/services/audio/mpd.nix b/modules/services/audio/mpd.nix
new file mode 100644
index 00000000000..4a7ae355e4c
--- /dev/null
+++ b/modules/services/audio/mpd.nix
@@ -0,0 +1,99 @@
+{ config, pkgs, ... }:
+
+with pkgs.lib;
+
+let
+
+  uid = config.ids.uids.mpd;
+  gid = config.ids.gids.mpd;
+
+in
+
+{
+
+  ###### interface
+
+  options = {
+
+    services.mpd = {
+
+      enable = mkOption {
+        default = false;
+        description = ''
+          Whether to enable the MPD music player daemon (server).
+        '';
+      };
+
+      conffile = mkOption {
+        default = ''
+          music_directory     "${config.services.mpd.dataDir}/music"
+          playlist_directory  "${config.services.mpd.dataDir}/playlists"
+          db_file             "${config.services.mpd.dataDir}/tag_cache"
+          state_file          "${config.services.mpd.dataDir}/state"
+          sticker_file        "${config.services.mpd.dataDir}/sticker.sql"
+          log_file            "/var/log/mpd.log"
+          pid_file            "/var/run/mpd/mpd.pid"
+          bind_to_address     "localhost"
+          user                "mpd"
+        '';
+        description = ''The contents of the MPD configuration file mpd.conf'';
+      };
+
+      dataDir = mkOption {
+        default = "/var/lib/mpd/";
+        example = "debug";
+        description = ''
+          The root directory of the MPD data tree. Contains a tag cache,
+	  playlists and a music/ subdirectory that should contain (or
+          symlink to) your music collection.
+        '';
+      };
+
+    };
+
+  };
+
+
+  ###### implementation
+
+  config = mkIf config.services.mpd.enable {
+
+    environment.systemPackages = [ pkgs.mpd ];
+
+    users.extraUsers = singleton
+      { name = "mpd";
+        group = "mpd";
+        extraGroups = [ "audio" ];
+        description = "MPD system-wide daemon";
+        home = "${config.services.mpd.dataDir}";
+      };
+
+    users.extraGroups = singleton
+      { name = "mpd";
+        inherit gid;
+      };
+
+    jobs.mpd =
+      { description = "MPD system-wide server";
+
+        startOn = "startup";
+
+        preStart =
+          ''
+            mkdir -p /var/run/mpd && chown mpd /var/run/mpd
+            test -d ${config.services.mpd.dataDir} || \
+            ( mkdir -p --mode 755 ${config.services.mpd.dataDir}/music \
+                                  ${config.services.mpd.dataDir}/playlists && \
+              chown -R mpd:mpd ${config.services.mpd.dataDir} )
+          '';
+
+        daemonType = "fork";
+        exec =
+          ''
+            ${pkgs.mpd}/bin/mpd ${pkgs.writeText "mpd.conf" config.services.mpd.conffile}
+          '';
+      };
+
+  };
+
+}
-- 
GitLab


From 72d740197653ac1d21846d6a4f03dd22237fb968 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Mon, 5 Dec 2011 16:53:58 +0000
Subject: [PATCH 3270/5331] udev: Ignore commented lines when populating
 run_progs.

Patch by mornfall

svn path=/nixos/trunk/; revision=30763
---
 modules/services/hardware/udev.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/services/hardware/udev.nix b/modules/services/hardware/udev.nix
index 143f8ebbad8..55f830c5365 100644
--- a/modules/services/hardware/udev.nix
+++ b/modules/services/hardware/udev.nix
@@ -68,7 +68,7 @@ let
       echo -n "Checking that all programs called by relative paths in udev rules exist in ${udev}/lib/udev ... "
       import_progs=$(grep 'IMPORT{program}="[^/$]' $out/* |
         sed -e 's/.*IMPORT{program}="\([^ "]*\)[ "].*/\1/' | uniq)
-      run_progs=$(grep 'RUN+="[^/$]' $out/* |
+      run_progs=$(grep -v '^[[:space:]]*#' $out/* | grep 'RUN+="[^/$]' |
         sed -e 's/.*RUN+="\([^ "]*\)[ "].*/\1/' | uniq)
       for i in $import_progs $run_progs; do
         if [[ ! -x ${pkgs.udev}/lib/udev/$i && ! $i =~ socket:.* ]]; then
@@ -82,7 +82,7 @@ let
       echo -n "Checking that all programs call by absolute paths in udev rules exist ... "
       import_progs=$(grep 'IMPORT{program}="/' $out/* |
         sed -e 's/.*IMPORT{program}="\([^ "]*\)[ "].*/\1/' | uniq)
-      run_progs=$(grep 'RUN+="/' $out/* |
+      run_progs=$(grep -v '^[[:space:]]*#' $out/* | grep 'RUN+="/' |
         sed -e 's/.*RUN+="\([^ "]*\)[ "].*/\1/' | uniq)
       for i in $import_progs $run_progs; do
         if [[ ! -x $i ]]; then
-- 
GitLab


From e87764e32789bca3e2be323d993731ffa0bf3f17 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Mon, 5 Dec 2011 17:32:45 +0000
Subject: [PATCH 3271/5331] Apply mornfall's SANE patches

Fix sane-backends to generate udev rules, add a snapshot of sane-backends's unstable repo, and add a SANE nixos module

svn path=/nixos/trunk/; revision=30764
---
 modules/module-list.nix            |  1 +
 modules/services/hardware/sane.nix | 34 ++++++++++++++++++++++++++++++
 2 files changed, 35 insertions(+)
 create mode 100644 modules/services/hardware/sane.nix

diff --git a/modules/module-list.nix b/modules/module-list.nix
index ea800648eab..a44e1c6e422 100644
--- a/modules/module-list.nix
+++ b/modules/module-list.nix
@@ -68,6 +68,7 @@
   ./services/hardware/bluetooth.nix
   ./services/hardware/hal.nix
   ./services/hardware/pcscd.nix
+  ./services/hardware/sane.nix
   ./services/hardware/udev.nix
   ./services/hardware/udisks.nix
   ./services/hardware/upower.nix
diff --git a/modules/services/hardware/sane.nix b/modules/services/hardware/sane.nix
new file mode 100644
index 00000000000..e9f32a2662c
--- /dev/null
+++ b/modules/services/hardware/sane.nix
@@ -0,0 +1,34 @@
+{ config, pkgs, ... }:
+
+with pkgs.lib;
+
+{
+
+  ###### interface
+
+  options = {
+
+    hardware.sane.enable = mkOption {
+      default = false;
+      description = "Enable support for SANE scanners.";
+    };
+
+    hardware.sane.snapshot = mkOption {
+      default = false;
+      description = "Use a development snapshot of SANE scanner drivers.";
+    };
+
+  };
+
+
+  ###### implementation
+
+    config = let pkg = if config.hardware.sane.snapshot
+                          then pkgs.saneBackendsSnapshot
+                          else pkgs.saneBackends;
+      in mkIf config.hardware.sane.enable {
+           environment.systemPackages = [ pkg ];
+           services.udev.packages = [ pkg ];
+      };
+
+}
-- 
GitLab


From 6e95485a2889f76369f8d4c8014052bc39439fcc Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 8 Dec 2011 12:25:33 +0000
Subject: [PATCH 3272/5331] * Set boot.vesa to false if we don't have a
 fbcondecor-enabled kernel.

svn path=/nixos/trunk/; revision=30802
---
 modules/system/boot/kernel.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/system/boot/kernel.nix b/modules/system/boot/kernel.nix
index c5e304a21f6..c8ed496d8ae 100644
--- a/modules/system/boot/kernel.nix
+++ b/modules/system/boot/kernel.nix
@@ -46,7 +46,7 @@ let kernel = config.boot.kernelPackages.kernel; in
     };
 
     boot.vesa = mkOption {
-      default = true;
+      default = config.boot.kernelPackages.splashutils != null;
       example = false;
       description = ''
         Whether to activate VESA video mode on boot.
-- 
GitLab


From 52e6088c88df193028e198d85c5c7563365c68d2 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 12 Dec 2011 19:02:37 +0000
Subject: [PATCH 3273/5331] * utillinuxng -> utillinux.

svn path=/nixos/trunk/; revision=30858
---
 modules/tasks/filesystems.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/tasks/filesystems.nix b/modules/tasks/filesystems.nix
index 22deacd1928..f568b60baf8 100644
--- a/modules/tasks/filesystems.nix
+++ b/modules/tasks/filesystems.nix
@@ -116,7 +116,7 @@ in
 
     system.sbin.mount = mkOption {
       internal = true;
-      default = pkgs.utillinuxng;
+      default = pkgs.utillinux;
       description = "
         Package containing mount and umount.
       ";
-- 
GitLab


From ae82e7b048e8ef1f402e0e9cfbaf3b1d04bf8052 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 16 Dec 2011 23:44:37 +0000
Subject: [PATCH 3274/5331] Added cpuFreqGovernor option to configure a CPU
 frequency governor.

svn path=/nixos/trunk/; revision=30949
---
 modules/module-list.nix    |  1 +
 modules/tasks/cpu-freq.nix | 39 ++++++++++++++++++++++++++++++++++++++
 2 files changed, 40 insertions(+)
 create mode 100644 modules/tasks/cpu-freq.nix

diff --git a/modules/module-list.nix b/modules/module-list.nix
index a44e1c6e422..80f52be37f3 100644
--- a/modules/module-list.nix
+++ b/modules/module-list.nix
@@ -190,6 +190,7 @@
   ./system/upstart-events/runlevel.nix
   ./system/upstart-events/shutdown.nix
   ./system/upstart/upstart.nix
+  ./tasks/cpu-freq.nix
   ./tasks/filesystems.nix
   ./tasks/kbd.nix
   ./tasks/lvm.nix
diff --git a/modules/tasks/cpu-freq.nix b/modules/tasks/cpu-freq.nix
new file mode 100644
index 00000000000..6498b45a635
--- /dev/null
+++ b/modules/tasks/cpu-freq.nix
@@ -0,0 +1,39 @@
+{ config, pkgs, ... }:
+
+with pkgs.lib;
+
+{
+  ###### interface
+
+  options = {
+    cpuFreqGovernor = mkOption {
+      default = "";
+      example = "ondemand";
+      description = ''
+        Configure the governor used to regulate the frequence of the
+        available CPUs. By default, the kernel configures the governor
+        "userspace".
+      '';
+    };
+  };
+
+
+  ###### implementation
+
+  config = mkIf (config.cpuFreqGovernor != "") ({
+    jobs.cpuFreq =
+      { description = "Initialize CPU frequency governor";
+
+        startOn = "started udev";
+
+        task = true;
+
+        script = ''
+          for i in $(seq 0 $(($(nproc) - 1))); do
+            ${pkgs.cpufrequtils}/bin/cpufreq-set -g ${config.cpuFreqGovernor} -c $i
+          done
+        '';
+      };
+  });
+
+}
-- 
GitLab


From a87a1bca04c76fcb92b8bd13697b3c036a239534 Mon Sep 17 00:00:00 2001
From: "Yury G. Kudryashov" <urkud.urkud@gmail.com>
Date: Mon, 19 Dec 2011 23:16:32 +0000
Subject: [PATCH 3275/5331] wpa_supplicant: add D-Bus interface

svn path=/nixos/trunk/; revision=30972
---
 modules/services/networking/wpa_supplicant.nix | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/modules/services/networking/wpa_supplicant.nix b/modules/services/networking/wpa_supplicant.nix
index 547280931c9..7e29747dcc2 100644
--- a/modules/services/networking/wpa_supplicant.nix
+++ b/modules/services/networking/wpa_supplicant.nix
@@ -44,6 +44,8 @@ in
 
     environment.systemPackages =  [ pkgs.wpa_supplicant ];
 
+    services.dbus.packages = [ pkgs.wpa_supplicant ];
+
     jobs.wpa_supplicant = 
       { startOn = "started network-interfaces";
         stopOn = "stopping network-interfaces";
@@ -57,8 +59,8 @@ in
           '';
 
         exec =
-          "wpa_supplicant -s -C /var/run/wpa_supplicant " +
-          "-c ${configFile} -i${config.networking.WLANInterface}";
+          "wpa_supplicant -s -u -c ${configFile} "
+          + (optionalString (config.networking.WLANInterface != null) "-i ${config.networking.WLANInterface}");
       };
   
   };
-- 
GitLab


From d06c45ec862492a87118ea3f480de7f4f36ce660 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Tue, 20 Dec 2011 12:35:12 +0000
Subject: [PATCH 3276/5331] Let hostname --fqdn find proper hostname

svn path=/nixos/trunk/; revision=30976
---
 modules/config/networking.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/config/networking.nix b/modules/config/networking.nix
index 8343912d830..4349b52347a 100644
--- a/modules/config/networking.nix
+++ b/modules/config/networking.nix
@@ -51,7 +51,7 @@ in
           ''
             ${cfg.extraHosts}
             ${optionalString (cfg.hostName != "")
-              "127.0.0.1 ${cfg.hostName} ${hostnameWithDomain}"}
+              "127.0.0.1 ${hostnameWithDomain} ${cfg.hostName}"}
             127.0.0.1 localhost ${localhostWithDomain}
           '';
         target = "hosts";
-- 
GitLab


From 2ff7b1284a555f2f812e3dced3c5c36c155a7a1e Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 20 Dec 2011 13:36:11 +0000
Subject: [PATCH 3277/5331] * Handle the util-linux-ng -> util-linux rename  
 (http://hydra.nixos.org/build/1646277/nixlog/1).

svn path=/nixos/trunk/; revision=30984
---
 modules/system/boot/stage-1.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/system/boot/stage-1.nix b/modules/system/boot/stage-1.nix
index af3642ac009..b5c71456067 100644
--- a/modules/system/boot/stage-1.nix
+++ b/modules/system/boot/stage-1.nix
@@ -206,7 +206,7 @@ let
       $out/bin/e2fsck -V 2>&1 | grep "e2fsck "
       $out/bin/tune2fs 2> /dev/null | grep "tune2fs "
       $out/bin/udevadm --version
-      $out/bin/blkid -v 2>&1 | tee -a $out/log | grep "blkid from util-linux-ng"
+      $out/bin/blkid -v 2>&1 | tee -a $out/log | grep "blkid from util-linux"
       $out/bin/dmsetup --version 2>&1 | tee -a $out/log | grep "version:"
       LVM_SYSTEM_DIR=$out $out/bin/lvm version 2>&1 | tee -a $out/log | grep "LVM"
       $out/bin/reiserfsck -V
-- 
GitLab


From cf36b3db809da129e2046d4948082d1ed0ac09ec Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 20 Dec 2011 22:44:58 +0000
Subject: [PATCH 3278/5331] =?UTF-8?q?*=20If=20power=20management=20is=20en?=
 =?UTF-8?q?abled,=20set=20the=20governor=20to=20=E2=80=98ondemand=E2=80=99?=
 =?UTF-8?q?=20by=20=20=20default.=20=20See?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

    http://www.codon.org.uk/~mjg59/power/good_practices.html

  for the reasoning.  (Basically, the ‘performance’ and ‘powersave’
  governors don't actually provide extra performance or power savings
  in most cases.)

  It used to be that desktop environments like KDE were able to set
  the governor through HAL (e.g. KDE could be configured to switch to
  the powersave governor when the user unplugs his laptop).  However,
  this is no longer the case with upower — it is now expected that
  everybody uses the ondemand governor.  See

    http://old.nabble.com/-PATCH--powerdevil-remove-cpufreq.patch-td27815354.html

* Rename ‘cpuFreqGovernor’ to ‘powerManagement.cpuFreqGovernor’.

* Include cpufreq-utils in the system path if a governor is set, since
  we depend on it anyway.

svn path=/nixos/trunk/; revision=30991
---
 modules/config/power-management.nix |  2 ++
 modules/tasks/cpu-freq.nix          | 16 +++++++++++-----
 2 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/modules/config/power-management.nix b/modules/config/power-management.nix
index cb7047a2ba8..10aa821964a 100644
--- a/modules/config/power-management.nix
+++ b/modules/config/power-management.nix
@@ -91,6 +91,8 @@ in
         "p4_clockmod"
       ];
 
+    powerManagement.cpuFreqGovernor = "ondemand";
+
   };
 
 }
diff --git a/modules/tasks/cpu-freq.nix b/modules/tasks/cpu-freq.nix
index 6498b45a635..b7d9756db1b 100644
--- a/modules/tasks/cpu-freq.nix
+++ b/modules/tasks/cpu-freq.nix
@@ -6,7 +6,8 @@ with pkgs.lib;
   ###### interface
 
   options = {
-    cpuFreqGovernor = mkOption {
+  
+    powerManagement.cpuFreqGovernor = mkOption {
       default = "";
       example = "ondemand";
       description = ''
@@ -15,13 +16,17 @@ with pkgs.lib;
         "userspace".
       '';
     };
+    
   };
 
 
   ###### implementation
 
-  config = mkIf (config.cpuFreqGovernor != "") ({
-    jobs.cpuFreq =
+  config = mkIf (config.powerManagement.cpuFreqGovernor != "") {
+
+    environment.systemPackages = [ pkgs.cpufrequtils ];
+
+    jobs.cpufreq =
       { description = "Initialize CPU frequency governor";
 
         startOn = "started udev";
@@ -30,10 +35,11 @@ with pkgs.lib;
 
         script = ''
           for i in $(seq 0 $(($(nproc) - 1))); do
-            ${pkgs.cpufrequtils}/bin/cpufreq-set -g ${config.cpuFreqGovernor} -c $i
+            ${pkgs.cpufrequtils}/bin/cpufreq-set -g ${config.powerManagement.cpuFreqGovernor} -c $i
           done
         '';
       };
-  });
+      
+  };
 
 }
-- 
GitLab


From 2c77b292a64bcd5930f830caed3eecc3484aa170 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Mon, 26 Dec 2011 16:06:20 +0000
Subject: [PATCH 3279/5331] I reworked the nfs upstart jobs, so they work
 better on the events of interest of nixos.

Related to http://yellowgrass.org/issue/NixOS/109 .


svn path=/nixos/trunk/; revision=31103
---
 .../network-filesystems/nfs-kernel.nix        | 78 ++++++++++++-------
 1 file changed, 52 insertions(+), 26 deletions(-)

diff --git a/modules/services/network-filesystems/nfs-kernel.nix b/modules/services/network-filesystems/nfs-kernel.nix
index c475f694499..e86525a1f73 100644
--- a/modules/services/network-filesystems/nfs-kernel.nix
+++ b/modules/services/network-filesystems/nfs-kernel.nix
@@ -10,6 +10,31 @@ let
 
   exports = pkgs.writeText "exports" cfg.server.exports;
 
+/*
+  Description at http://nfs.sourceforge.net/nfs-howto/ar01s03.html :
+
+  "If your distribution does not include them in the startup scripts, then then
+  you should add them, configured to start in the following order:
+
+  rpc.portmap
+  rpc.mountd, rpc.nfsd
+  rpc.statd, rpc.lockd (if necessary), and
+  rpc.rquotad"
+
+  I tried to mimic that with upstart, playing with stopping/stopped/started/starting
+  events.
+
+  I consider two scenarios:
+    - Starting at boot. Then, portmap will emit a started event.
+    - "restart nfs-kernel-exports". Then, portmap will not emit anything. Due
+      to the comment in postStart, this will happen on nixos-rebuild if
+      the exportfs file changed.
+
+  From these scenarios, I came up with the startOn and stopOn at the time of commiting
+  this comment.
+*/
+
+
 in
 
 {
@@ -94,28 +119,10 @@ in
 
             description = "Kernel NFS server";
 
-            startOn = "started network-interfaces";
+            startOn = "started network-interfaces and started portmap";
 
-            preStart =
+            postStart =
               ''
-                export PATH=${pkgs.nfsUtils}/sbin:$PATH
-                mkdir -p /var/lib/nfs
-
-                ${config.system.sbin.modprobe}/sbin/modprobe nfsd || true
-
-                ${pkgs.sysvtools}/bin/mountpoint -q /proc/fs/nfsd \
-                || ${config.system.sbin.mount}/bin/mount -t nfsd none /proc/fs/nfsd
-
-                ${optionalString cfg.server.createMountPoints
-                  ''
-                    # create export directories:
-                    # skip comments, take first col which may either be a quoted
-                    # "foo bar" or just foo (-> man export)
-                    sed '/^#.*/d;s/^"\([^"]*\)".*/\1/;t;s/[ ].*//' ${exports} \
-                    | xargs -d '\n' mkdir -p
-                  ''
-                }
-
                 # exports file is ${exports}
                 # keep this comment so that this job is restarted whenever exports changes!
                 exportfs -ra
@@ -129,14 +136,33 @@ in
 
             description = "Kernel NFS server";
 
-            startOn = "started nfs-kernel-exports and started nfs-kernel-mountd and started nfs-kernel-statd and started portmap";
-            stopOn = "stopping nfs-kernel-exports";
+            startOn = "starting nfs-kernel-exports or started portmap";
+            stopOn = "stopped nfs-kernel-statd or stopping portmap";
 
             preStart =
               ''
+                export PATH=${pkgs.nfsUtils}/sbin:$PATH
+                mkdir -p /var/lib/nfs
+
                 # Create a state directory required by NFSv4.
                 mkdir -p /var/lib/nfs/v4recovery
 
+                # rpc.nfsd needs the kernel support
+                ${config.system.sbin.modprobe}/sbin/modprobe nfsd || true
+
+                ${pkgs.sysvtools}/bin/mountpoint -q /proc/fs/nfsd \
+                || ${config.system.sbin.mount}/bin/mount -t nfsd none /proc/fs/nfsd
+
+                ${optionalString cfg.server.createMountPoints
+                  ''
+                    # create export directories:
+                    # skip comments, take first col which may either be a quoted
+                    # "foo bar" or just foo (-> man export)
+                    sed '/^#.*/d;s/^"\([^"]*\)".*/\1/;t;s/[ ].*//' ${exports} \
+                    | xargs -d '\n' mkdir -p
+                  ''
+                }
+
                 ${pkgs.nfsUtils}/sbin/rpc.nfsd \
                   ${if cfg.server.hostName != null then "-H ${cfg.server.hostName}" else ""} \
                   ${builtins.toString cfg.server.nproc}
@@ -152,8 +178,8 @@ in
 
             description = "Kernel NFS server - mount daemon";
 
-            startOn = "started portmap and started nfs-kernel-exports";
-            stopOn = "stopped nfs-kernel-nfsd";
+            startOn = "starting nfs-kernel-exports or started portmap";
+            stopOn = "stopped nfs-kernel-statd";
 
             daemonType = "fork";
 
@@ -167,8 +193,8 @@ in
 
             description = "Kernel NFS server - Network Status Monitor";
 
-            startOn = "started portmap";
-            stopOn = "never";
+            startOn = "started nfs-kernel-mountd and started nfs-kernel-nfsd";
+            stopOn = "stopping nfs-kernel-exports or stopping portmap";
 
             preStart =
               ''
-- 
GitLab


From 0de75cde39e36872bda85e66a4ea8a86993e4108 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Mon, 26 Dec 2011 16:40:13 +0000
Subject: [PATCH 3280/5331] Asking for an interactive shell in case of error
 umounting filesystems. I've not tested it; sometimes I hit the trouble, but
 not always.

svn path=/nixos/trunk/; revision=31104
---
 modules/system/upstart-events/shutdown.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/modules/system/upstart-events/shutdown.nix b/modules/system/upstart-events/shutdown.nix
index 32966f03cdb..78d848df663 100644
--- a/modules/system/upstart-events/shutdown.nix
+++ b/modules/system/upstart-events/shutdown.nix
@@ -133,6 +133,11 @@ with pkgs.lib;
           if [ -n "$failed" ]; then
               echo "warning: the following filesystems could not be unmounted:"
               for mp in $failed; do echo "  $mp"; done
+              echo Enter 'i' to launch a shell, or wait 10 seconds to continue.
+              read -t 10 A
+              if [ "$A" == "i" ]; then
+                bash -i < /dev/console &> /dev/console
+              fi
               sleep 5
           fi
 
-- 
GitLab


From 8bc381c4cde7e4fc1a75461c37ddc75322a51a03 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Tue, 27 Dec 2011 16:33:10 +0000
Subject: [PATCH 3281/5331] Fixing the boot sequence in case of only having
 nfsKernel.client.enable = true, and not server.

svn path=/nixos/trunk/; revision=31109
---
 modules/services/network-filesystems/nfs-kernel.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/modules/services/network-filesystems/nfs-kernel.nix b/modules/services/network-filesystems/nfs-kernel.nix
index e86525a1f73..3e247271561 100644
--- a/modules/services/network-filesystems/nfs-kernel.nix
+++ b/modules/services/network-filesystems/nfs-kernel.nix
@@ -193,7 +193,10 @@ in
 
             description = "Kernel NFS server - Network Status Monitor";
 
-            startOn = "started nfs-kernel-mountd and started nfs-kernel-nfsd";
+            startOn = if (cfg.server.enable) then
+		    "started nfs-kernel-mountd and started nfs-kernel-nfsd"
+		else
+		    "started portmap";
             stopOn = "stopping nfs-kernel-exports or stopping portmap";
 
             preStart =
-- 
GitLab


From ef1755f3c0d4b82338ab71515692d91e8afc7fc5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Tue, 27 Dec 2011 18:08:05 +0000
Subject: [PATCH 3282/5331] I had a bug in my nfs server... just after boot,
 all clients were receiving "Permission denied" until I run "restart
 nfs-kernel-exports". "exportfs -ra" did not help.

I tracked that down to some race condition between loading the module nfsd and
starting the daemons. Therefore, I decided to add nfsd to the boot.kernelModules instead
of using modprove with it.

Now it works for my server. No more Permission denied after reboot.


svn path=/nixos/trunk/; revision=31113
---
 modules/services/network-filesystems/nfs-kernel.nix | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/modules/services/network-filesystems/nfs-kernel.nix b/modules/services/network-filesystems/nfs-kernel.nix
index 3e247271561..0cc9d07cad2 100644
--- a/modules/services/network-filesystems/nfs-kernel.nix
+++ b/modules/services/network-filesystems/nfs-kernel.nix
@@ -112,6 +112,14 @@ in
         target = "exports";
       });
 
+    /* We have to load this quite before running the daemons. Using
+       "modprobe nfsd" when loading the daemons causes a race condition where
+       nfsd can return 'authentication failed'/'Permission denied'.
+
+      I've not tried with nfsd alone. So I add what I tried, with nfs_acl too.
+    */
+    boot.kernelModules = mkIf cfg.server.enable [ "nfsd" "nfs_acl" ];
+
     jobs =
       optionalAttrs cfg.server.enable
         { nfs_kernel_exports =
@@ -119,7 +127,7 @@ in
 
             description = "Kernel NFS server";
 
-            startOn = "started network-interfaces and started portmap";
+            startOn = "started network-interfaces and started portmap and filesystem";
 
             postStart =
               ''
@@ -147,9 +155,6 @@ in
                 # Create a state directory required by NFSv4.
                 mkdir -p /var/lib/nfs/v4recovery
 
-                # rpc.nfsd needs the kernel support
-                ${config.system.sbin.modprobe}/sbin/modprobe nfsd || true
-
                 ${pkgs.sysvtools}/bin/mountpoint -q /proc/fs/nfsd \
                 || ${config.system.sbin.mount}/bin/mount -t nfsd none /proc/fs/nfsd
 
-- 
GitLab


From 99cca93398bce8d5aeead5f6de750526c651adcf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Wed, 28 Dec 2011 08:44:24 +0000
Subject: [PATCH 3283/5331] Fixing the race condition on loading nfsd. It was
 not a modprobe thing like I said on 31113, but again, upstart order.

I restore the usual modprobe procedure.


svn path=/nixos/trunk/; revision=31119
---
 modules/services/network-filesystems/nfs-kernel.nix | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/modules/services/network-filesystems/nfs-kernel.nix b/modules/services/network-filesystems/nfs-kernel.nix
index 0cc9d07cad2..2c65b3f76cd 100644
--- a/modules/services/network-filesystems/nfs-kernel.nix
+++ b/modules/services/network-filesystems/nfs-kernel.nix
@@ -118,7 +118,7 @@ in
 
       I've not tried with nfsd alone. So I add what I tried, with nfs_acl too.
     */
-    boot.kernelModules = mkIf cfg.server.enable [ "nfsd" "nfs_acl" ];
+    # boot.kernelModules = mkIf cfg.server.enable [ "nfsd" "nfs_acl" ];
 
     jobs =
       optionalAttrs cfg.server.enable
@@ -155,6 +155,9 @@ in
                 # Create a state directory required by NFSv4.
                 mkdir -p /var/lib/nfs/v4recovery
 
+                # rpc.nfsd needs the kernel support
+                ${config.system.sbin.modprobe}/sbin/modprobe nfsd || true
+
                 ${pkgs.sysvtools}/bin/mountpoint -q /proc/fs/nfsd \
                 || ${config.system.sbin.mount}/bin/mount -t nfsd none /proc/fs/nfsd
 
@@ -183,7 +186,7 @@ in
 
             description = "Kernel NFS server - mount daemon";
 
-            startOn = "starting nfs-kernel-exports or started portmap";
+            startOn = "started nfs-kernel-nfsd";
             stopOn = "stopped nfs-kernel-statd";
 
             daemonType = "fork";
@@ -199,9 +202,9 @@ in
             description = "Kernel NFS server - Network Status Monitor";
 
             startOn = if (cfg.server.enable) then
-		    "started nfs-kernel-mountd and started nfs-kernel-nfsd"
-		else
-		    "started portmap";
+              "started nfs-kernel-mountd and started nfs-kernel-nfsd"
+              else
+                "started portmap";
             stopOn = "stopping nfs-kernel-exports or stopping portmap";
 
             preStart =
-- 
GitLab


From 5cf6543e6ee71d071478bcb9ddbef06a1c391df6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Wed, 28 Dec 2011 09:05:52 +0000
Subject: [PATCH 3284/5331] Removing unused lines of the nfs-kernel script, and
 fixing some indentation.

svn path=/nixos/trunk/; revision=31120
---
 modules/services/network-filesystems/nfs-kernel.nix | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

diff --git a/modules/services/network-filesystems/nfs-kernel.nix b/modules/services/network-filesystems/nfs-kernel.nix
index 2c65b3f76cd..8ed22edf01e 100644
--- a/modules/services/network-filesystems/nfs-kernel.nix
+++ b/modules/services/network-filesystems/nfs-kernel.nix
@@ -112,14 +112,6 @@ in
         target = "exports";
       });
 
-    /* We have to load this quite before running the daemons. Using
-       "modprobe nfsd" when loading the daemons causes a race condition where
-       nfsd can return 'authentication failed'/'Permission denied'.
-
-      I've not tried with nfsd alone. So I add what I tried, with nfs_acl too.
-    */
-    # boot.kernelModules = mkIf cfg.server.enable [ "nfsd" "nfs_acl" ];
-
     jobs =
       optionalAttrs cfg.server.enable
         { nfs_kernel_exports =
@@ -202,7 +194,7 @@ in
             description = "Kernel NFS server - Network Status Monitor";
 
             startOn = if (cfg.server.enable) then
-              "started nfs-kernel-mountd and started nfs-kernel-nfsd"
+                "started nfs-kernel-mountd and started nfs-kernel-nfsd"
               else
                 "started portmap";
             stopOn = "stopping nfs-kernel-exports or stopping portmap";
-- 
GitLab


From d98ecd1d9e92fbb331242d0bc19fc2d8798a23f4 Mon Sep 17 00:00:00 2001
From: Florian Friesdorf <flo@chaoflow.net>
Date: Wed, 28 Dec 2011 21:46:35 +0000
Subject: [PATCH 3285/5331] enable testing of extraUtilsCommands after patchelf

svn path=/nixos/trunk/; revision=31127
---
 modules/system/boot/stage-1.nix | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/modules/system/boot/stage-1.nix b/modules/system/boot/stage-1.nix
index b5c71456067..185ca1cb516 100644
--- a/modules/system/boot/stage-1.nix
+++ b/modules/system/boot/stage-1.nix
@@ -65,6 +65,18 @@ let
       '';
     };
 
+    boot.initrd.extraUtilsCommandsTest = mkOption {
+      internal = true;
+      default = "";
+      merge = mergeStringOption;
+      description = ''
+        Shell commands to be executed in the builder of the
+        extra-utils derivation after patchelf has done its
+        job.  This can be used to test additional utilities
+        copied in extraUtilsCommands.
+      '';
+    };
+
     fileSystems = mkOption {
       options.neededForBoot = mkOption {
         default = false;
@@ -213,6 +225,8 @@ let
       $out/bin/mdadm --version
       $out/bin/basename --version
       $out/bin/modprobe --version
+
+      ${config.boot.initrd.extraUtilsCommandsTest}
     ''; # */
 
 
-- 
GitLab


From dd8e725d7d48d0a0c824925692033013db67e733 Mon Sep 17 00:00:00 2001
From: Florian Friesdorf <flo@chaoflow.net>
Date: Wed, 28 Dec 2011 21:46:40 +0000
Subject: [PATCH 3286/5331] copy only cryptsetup deps to stage-1 and test
 cryptsetup

popt-0.16 and cryptsetup-1.4.1 both generated pkgconfig (in contrast
to older versions). The pkgconfig files (popt.pc and cryptsetup.pc)
contain references into the store that are not removed by patchelf and
stage-1 fails with errors like: "output is not allowed to refer to
path `/nix/store/qccjhn063cfv171rcaxvxh0yk96zf7l2-cryptsetup-1.4.1'".

Now, only the cryptsetup binaries and its dependencies are copied,
determined by ldd. In addition the cryptsetup binary and lvm are
tested after patchelf has adjusted the library paths.

Thanks to Peter Simons and Eelco Dolstra for giving the rights hints.

svn path=/nixos/trunk/; revision=31128
---
 modules/system/boot/luksroot.nix | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/modules/system/boot/luksroot.nix b/modules/system/boot/luksroot.nix
index c28f46ef75b..a7608014d00 100644
--- a/modules/system/boot/luksroot.nix
+++ b/modules/system/boot/luksroot.nix
@@ -28,10 +28,20 @@ in
 
   config = mkIf (luksRoot != "") {
 
+    # copy the cryptsetup binary and it's dependencies
     boot.initrd.extraUtilsCommands = ''
-      cp -r ${pkgs.cryptsetup}/lib/* $out/lib/
-      cp -r ${pkgs.popt}/lib/* $out/lib
-      cp ${pkgs.cryptsetup}/sbin/* $out/bin
+      cp -pdv ${pkgs.cryptsetup}/sbin/cryptsetup $out/bin
+      # XXX: do we have a function that does this?
+      for lib in $(ldd $out/bin/cryptsetup |grep '=>' |grep /nix/store/ |cut -d' ' -f3); do
+        cp -pdvn $lib $out/lib
+        cp -pvn $(readlink -f $lib) $out/lib
+      done
+    '';
+
+    boot.initrd.extraUtilsCommandsTest = ''
+      $out/bin/cryptsetup --version
+      $out/bin/lvm vgscan --version
+      $out/bin/lvm vgchange --version
     '';
 
     boot.initrd.postDeviceCommands = ''
-- 
GitLab


From 0a9f3a36eceee02ca94b2c557f1ccad6dae62c92 Mon Sep 17 00:00:00 2001
From: Florian Friesdorf <flo@chaoflow.net>
Date: Wed, 28 Dec 2011 21:46:42 +0000
Subject: [PATCH 3287/5331] luksroot waits for usb drive

svn path=/nixos/trunk/; revision=31129
---
 modules/system/boot/luksroot.nix | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/modules/system/boot/luksroot.nix b/modules/system/boot/luksroot.nix
index a7608014d00..0c0e0dc008b 100644
--- a/modules/system/boot/luksroot.nix
+++ b/modules/system/boot/luksroot.nix
@@ -45,6 +45,19 @@ in
     '';
 
     boot.initrd.postDeviceCommands = ''
+      # Wait for luksRoot to appear, e.g. if on a usb drive.
+      # XXX: copied and adapted from stage-1-init.sh - should be
+      # available as a function.
+      if ! test -e ${luksRoot}; then
+          echo -n "waiting for device ${luksRoot} to appear..."
+          for ((try = 0; try < 10; try++)); do
+              sleep 1
+              if test -e ${luksRoot}; then break; fi
+              echo -n "."
+          done
+          echo "ok"
+      fi
+      # open luksRoot and scan for logical volumes
       cryptsetup luksOpen ${luksRoot} luksroot
       lvm vgscan
       lvm vgchange -ay
-- 
GitLab


From 90756a787c4be987a61c314144a36bc02ffa1d02 Mon Sep 17 00:00:00 2001
From: Florian Friesdorf <flo@chaoflow.net>
Date: Wed, 28 Dec 2011 21:46:45 +0000
Subject: [PATCH 3288/5331] add preLVMCommands hook

svn path=/nixos/trunk/; revision=31130
---
 modules/system/boot/stage-1-init.sh |  5 +++++
 modules/system/boot/stage-1.nix     | 10 +++++++++-
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/modules/system/boot/stage-1-init.sh b/modules/system/boot/stage-1-init.sh
index 68e0f7feec1..d47ce1caffd 100644
--- a/modules/system/boot/stage-1-init.sh
+++ b/modules/system/boot/stage-1-init.sh
@@ -123,6 +123,11 @@ udevadm trigger --action=add
 udevadm settle
 udevadm control --env=STARTUP=
 
+
+# XXX: Use case usb->lvm will still fail, usb->luks->lvm is covered
+@preLVMCommands@
+
+
 echo "starting device mapper and LVM..."
 lvm vgscan
 lvm vgchange -ay
diff --git a/modules/system/boot/stage-1.nix b/modules/system/boot/stage-1.nix
index 185ca1cb516..e178f2c04c9 100644
--- a/modules/system/boot/stage-1.nix
+++ b/modules/system/boot/stage-1.nix
@@ -35,6 +35,14 @@ let
       '';
     };
 
+    boot.initrd.preLVMCommands = mkOption {
+      default = "";
+      merge = mergeStringOption;
+      description = ''
+        Shell commands to be executed immediately before lvm discovery.
+      '';
+    };
+
     boot.initrd.postDeviceCommands = mkOption {
       default = "";
       merge = mergeStringOption;
@@ -304,7 +312,7 @@ let
     inherit (config.boot) resumeDevice devSize runSize;
 
     inherit (config.boot.initrd) checkJournalingFS
-      postDeviceCommands postMountCommands kernelModules;
+      preLVMCommands postDeviceCommands postMountCommands kernelModules;
 
     # !!! copy&pasted from upstart-jobs/filesystems.nix.
     mountPoints =
-- 
GitLab


From c15aa7aea3fa9dccbe79f18e1c362831e5f71f7d Mon Sep 17 00:00:00 2001
From: Florian Friesdorf <flo@chaoflow.net>
Date: Wed, 28 Dec 2011 21:46:48 +0000
Subject: [PATCH 3289/5331] luksroot uses preLVMCommands instead of
 postDeviceCommands

svn path=/nixos/trunk/; revision=31131
---
 modules/system/boot/luksroot.nix | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/modules/system/boot/luksroot.nix b/modules/system/boot/luksroot.nix
index 0c0e0dc008b..3781e6b13b9 100644
--- a/modules/system/boot/luksroot.nix
+++ b/modules/system/boot/luksroot.nix
@@ -40,11 +40,9 @@ in
 
     boot.initrd.extraUtilsCommandsTest = ''
       $out/bin/cryptsetup --version
-      $out/bin/lvm vgscan --version
-      $out/bin/lvm vgchange --version
     '';
 
-    boot.initrd.postDeviceCommands = ''
+    boot.initrd.preLVMCommands = ''
       # Wait for luksRoot to appear, e.g. if on a usb drive.
       # XXX: copied and adapted from stage-1-init.sh - should be
       # available as a function.
@@ -59,8 +57,6 @@ in
       fi
       # open luksRoot and scan for logical volumes
       cryptsetup luksOpen ${luksRoot} luksroot
-      lvm vgscan
-      lvm vgchange -ay
     '';
 
   };
-- 
GitLab


From c7fd05a650c160169952382827d1aff0ced1265c Mon Sep 17 00:00:00 2001
From: Florian Friesdorf <flo@chaoflow.net>
Date: Wed, 28 Dec 2011 21:46:50 +0000
Subject: [PATCH 3290/5331] test we have cryptsetup-1.4.1 in initrd

svn path=/nixos/trunk/; revision=31132
---
 modules/system/boot/luksroot.nix | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/modules/system/boot/luksroot.nix b/modules/system/boot/luksroot.nix
index 3781e6b13b9..f89de818f27 100644
--- a/modules/system/boot/luksroot.nix
+++ b/modules/system/boot/luksroot.nix
@@ -38,8 +38,19 @@ in
       done
     '';
 
+    # test whether cryptsetup finds all dependencies and is at least
+    # version 1.4.1
     boot.initrd.extraUtilsCommandsTest = ''
-      $out/bin/cryptsetup --version
+      cryptsetup_version=$($out/bin/cryptsetup --version |cut -d' ' -f2)
+      if test $(echo $version |cut -d'.' -f1) -lt 1; then
+        if test $(echo $version |cut -d'.' -f2) -lt 4; then
+          if test $(echo $version |cut -d'.' -f3) -lt 2; then
+            echo "Somehow the version of cryptsetup is too old: $cryptsetup_version instead of 1.4.1"
+            exit 1
+          fi
+        fi
+      fi
+      unset cryptsetup_version
     '';
 
     boot.initrd.preLVMCommands = ''
-- 
GitLab


From 829bd9a72746b974a9043c7616b63c237a9b05a7 Mon Sep 17 00:00:00 2001
From: Florian Friesdorf <flo@chaoflow.net>
Date: Wed, 28 Dec 2011 22:21:31 +0000
Subject: [PATCH 3291/5331] added an "error" to luksroot that should be caught

svn path=/nixos/trunk/; revision=31135
---
 modules/system/boot/luksroot.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/modules/system/boot/luksroot.nix b/modules/system/boot/luksroot.nix
index f89de818f27..48ddb65f249 100644
--- a/modules/system/boot/luksroot.nix
+++ b/modules/system/boot/luksroot.nix
@@ -36,6 +36,7 @@ in
         cp -pdvn $lib $out/lib
         cp -pvn $(readlink -f $lib) $out/lib
       done
+      ERROR_THAT_IS_NOT_CAUGHT_WHY_IS_OUR_QUEST_TO_FIND_OUT
     '';
 
     # test whether cryptsetup finds all dependencies and is at least
-- 
GitLab


From 0544a008dbb27aca42f04842363ea6fa92f56701 Mon Sep 17 00:00:00 2001
From: Florian Friesdorf <flo@chaoflow.net>
Date: Wed, 28 Dec 2011 22:36:26 +0000
Subject: [PATCH 3292/5331] Revert "added an "error" to luksroot that should be
 caught"

This reverts commit c7967af35a13f68a8785c142582b639dc8c8e92c.

svn path=/nixos/trunk/; revision=31136
---
 modules/system/boot/luksroot.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/modules/system/boot/luksroot.nix b/modules/system/boot/luksroot.nix
index 48ddb65f249..f89de818f27 100644
--- a/modules/system/boot/luksroot.nix
+++ b/modules/system/boot/luksroot.nix
@@ -36,7 +36,6 @@ in
         cp -pdvn $lib $out/lib
         cp -pvn $(readlink -f $lib) $out/lib
       done
-      ERROR_THAT_IS_NOT_CAUGHT_WHY_IS_OUR_QUEST_TO_FIND_OUT
     '';
 
     # test whether cryptsetup finds all dependencies and is at least
-- 
GitLab


From 3ebc7727f7115c0777d4c17ccb13a34fa8ff0228 Mon Sep 17 00:00:00 2001
From: Florian Friesdorf <flo@chaoflow.net>
Date: Wed, 28 Dec 2011 22:37:38 +0000
Subject: [PATCH 3293/5331] Revert "test we have cryptsetup-1.4.1 in initrd"

This reverts commit 025f8c40b40fad50086e8761eee61098d8fb2651.

The check was intened for building the initrd of the installer.

svn path=/nixos/trunk/; revision=31137
---
 modules/system/boot/luksroot.nix | 13 +------------
 1 file changed, 1 insertion(+), 12 deletions(-)

diff --git a/modules/system/boot/luksroot.nix b/modules/system/boot/luksroot.nix
index f89de818f27..3781e6b13b9 100644
--- a/modules/system/boot/luksroot.nix
+++ b/modules/system/boot/luksroot.nix
@@ -38,19 +38,8 @@ in
       done
     '';
 
-    # test whether cryptsetup finds all dependencies and is at least
-    # version 1.4.1
     boot.initrd.extraUtilsCommandsTest = ''
-      cryptsetup_version=$($out/bin/cryptsetup --version |cut -d' ' -f2)
-      if test $(echo $version |cut -d'.' -f1) -lt 1; then
-        if test $(echo $version |cut -d'.' -f2) -lt 4; then
-          if test $(echo $version |cut -d'.' -f3) -lt 2; then
-            echo "Somehow the version of cryptsetup is too old: $cryptsetup_version instead of 1.4.1"
-            exit 1
-          fi
-        fi
-      fi
-      unset cryptsetup_version
+      $out/bin/cryptsetup --version
     '';
 
     boot.initrd.preLVMCommands = ''
-- 
GitLab


From eb755d46923b0f7a3ac184a6e4790114a9974af3 Mon Sep 17 00:00:00 2001
From: Florian Friesdorf <flo@chaoflow.net>
Date: Thu, 29 Dec 2011 00:51:35 +0000
Subject: [PATCH 3294/5331] switched all mergeOptionString to
 pkgs.lib.types.string

pierron recommended the use of types.string over mergeOptionString, as
it is superior but might break things.

For my system the change evaluated to the exactly same.

svn path=/nixos/trunk/; revision=31138
---
 modules/programs/bash/bash.nix       |  2 +-
 modules/services/hardware/udev.nix   |  2 +-
 modules/services/misc/nix-daemon.nix |  2 +-
 modules/system/boot/stage-1.nix      | 10 +++++-----
 modules/system/boot/stage-2.nix      |  2 +-
 5 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/modules/programs/bash/bash.nix b/modules/programs/bash/bash.nix
index dc36ab7d97f..31a14663aa0 100644
--- a/modules/programs/bash/bash.nix
+++ b/modules/programs/bash/bash.nix
@@ -15,7 +15,7 @@ let
         description = "
           Script used to initialized user shell environments.
         ";
-        merge = mergeStringOption;
+        type = with pkgs.lib.types; string;
       };
 
   };
diff --git a/modules/services/hardware/udev.nix b/modules/services/hardware/udev.nix
index 55f830c5365..6caac8f8ca2 100644
--- a/modules/services/hardware/udev.nix
+++ b/modules/services/hardware/udev.nix
@@ -170,7 +170,7 @@ in
         example = ''
           KERNEL=="eth*", ATTR{address}=="00:1D:60:B9:6D:4F", NAME="my_fast_network_card"
         '';
-        merge = mergeStringOption;
+        type = with pkgs.lib.types; string;
         description = ''
           Additional <command>udev</command> rules. They'll be written
           into file <filename>10-local.rules</filename>. Thus they are
diff --git a/modules/services/misc/nix-daemon.nix b/modules/services/misc/nix-daemon.nix
index c8eaf15ff77..d2584c2dc3e 100644
--- a/modules/services/misc/nix-daemon.nix
+++ b/modules/services/misc/nix-daemon.nix
@@ -171,7 +171,7 @@ in
       envVars = mkOption {
         internal = true;
         default = "";
-        merge = mergeStringOption;
+        type = with pkgs.lib.types; string;
         description = "
           Environment variables used by Nix.
         ";
diff --git a/modules/system/boot/stage-1.nix b/modules/system/boot/stage-1.nix
index e178f2c04c9..bc27c9f80ff 100644
--- a/modules/system/boot/stage-1.nix
+++ b/modules/system/boot/stage-1.nix
@@ -37,7 +37,7 @@ let
 
     boot.initrd.preLVMCommands = mkOption {
       default = "";
-      merge = mergeStringOption;
+      type = with types; string;
       description = ''
         Shell commands to be executed immediately before lvm discovery.
       '';
@@ -45,7 +45,7 @@ let
 
     boot.initrd.postDeviceCommands = mkOption {
       default = "";
-      merge = mergeStringOption;
+      type = with types; string;
       description = ''
         Shell commands to be executed immediately after stage 1 of the
         boot has loaded kernel modules and created device nodes in
@@ -55,7 +55,7 @@ let
 
     boot.initrd.postMountCommands = mkOption {
       default = "";
-      merge = mergeStringOption;
+      type = with types; string;
       description = ''
         Shell commands to be executed immediately after the stage 1
         filesystems have been mounted.
@@ -65,7 +65,7 @@ let
     boot.initrd.extraUtilsCommands = mkOption {
       internal = true;
       default = "";
-      merge = mergeStringOption;
+      type = with types; string;
       description = ''
         Shell commands to be executed in the builder of the
         extra-utils derivation.  This can be used to provide
@@ -76,7 +76,7 @@ let
     boot.initrd.extraUtilsCommandsTest = mkOption {
       internal = true;
       default = "";
-      merge = mergeStringOption;
+      type = with types; string;
       description = ''
         Shell commands to be executed in the builder of the
         extra-utils derivation after patchelf has done its
diff --git a/modules/system/boot/stage-2.nix b/modules/system/boot/stage-2.nix
index 1fb8379f29a..c45dc348b66 100644
--- a/modules/system/boot/stage-2.nix
+++ b/modules/system/boot/stage-2.nix
@@ -8,7 +8,7 @@ let
       postBootCommands = pkgs.lib.mkOption {
         default = "";
         example = "rm -f /var/log/messages";
-        merge = pkgs.lib.mergeStringOption;
+        type = with pkgs.lib.types; string;
         description = ''
           Shell commands to be executed just before Upstart is started.
         '';
-- 
GitLab


From 338bc7b9f82bad71bd841ed32e4eec5b34c965a8 Mon Sep 17 00:00:00 2001
From: Nicolas Pierron <nicolas.b.pierron@gmail.com>
Date: Thu, 29 Dec 2011 06:33:34 +0000
Subject: [PATCH 3295/5331] Fix nixos-option without argument.

svn path=/nixos/trunk/; revision=31139
---
 modules/installer/tools/nixos-option.sh | 46 +++++++++++++++++--------
 1 file changed, 32 insertions(+), 14 deletions(-)

diff --git a/modules/installer/tools/nixos-option.sh b/modules/installer/tools/nixos-option.sh
index d5326328033..2ad2caa252f 100644
--- a/modules/installer/tools/nixos-option.sh
+++ b/modules/installer/tools/nixos-option.sh
@@ -166,6 +166,29 @@ findSources(){
     evalNix --strict
 }
 
+# Given a result from nix-instantiate, recover the list of attributes it
+# contains.
+attrNames() {
+  local attributeset=$1
+  # sed is used to replace un-printable subset by 0s, and to remove most of
+  # the inner-attribute set, which reduce the likelyhood to encounter badly
+  # pre-processed input.
+  echo "builtins.attrNames $attributeset" | \
+    sed 's,<[A-Z]*>,0,g; :inner; s/{[^\{\}]*};/0;/g; t inner;' | \
+    evalNix --strict
+}
+
+# map a simple list which contains strings or paths.
+nixMap() {
+  local fun="$1"
+  local list="$2"
+  local elem
+  for elem in $list; do
+    test $elem = '[' -o $elem = ']' && continue;
+    $fun $elem
+  done
+}
+
 if $install; then
   if test -e "$mountPoint$NIXOS"; then
     export NIXOS="$mountPoint$NIXOS"
@@ -362,17 +385,13 @@ if test "$(evalOpt "_type" 2> /dev/null)" = '"option"'; then
   if $defs; then
     $desc || $value && echo;
 
+    printPath () { echo "  $1"; }
+
     echo "Declared by:"
-    for f in $(findSources "declarations"); do
-      test $f = '[' -o $f = ']' && continue;
-      echo "  $f"
-    done
+    nixMap printPath "$(findSources "declarations")"
     echo ""
     echo "Defined by:"
-    for f in $(findSources "definitions"); do
-      test $f = '[' -o $f = ']' && continue;
-      echo "  $f"
-    done
+    nixMap printPath "$(findSources "definitions")"
     echo ""
   fi
 
@@ -380,13 +399,12 @@ else
   # echo 1>&2 "Warning: This value is not an option."
 
   result=$(evalCfg)
-  if names=$(echo "builtins.attrNames $result" | sed 's,<[A-Z]*>,0,g' | nix-instantiate - --eval-only --strict 2> /dev/null); then
-    echo 1>&2 "This attribute set contains:" 
-    for attr in $names; do
-      test $attr = '[' -o $attr = ']' && continue;
-      eval echo $attr # escape extra double-quotes in the attribute name.
-    done
+  if names=$(attrNames "$result" 2> /dev/null); then
+    echo 1>&2 "This attribute set contains:"
+    escapeQuotes () { eval echo "$1"; }
+    nixMap escapeQuotes "$names"
   else
+    echo 1>&2 "An error occured while looking for attribute names."
     echo $result
   fi
 fi
-- 
GitLab


From 8ed89125b55b40c57136321a1ce0004581e4de56 Mon Sep 17 00:00:00 2001
From: Florian Friesdorf <flo@chaoflow.net>
Date: Thu, 29 Dec 2011 19:37:54 +0000
Subject: [PATCH 3296/5331] linewrap pathsToLink

svn path=/nixos/trunk/; revision=31143
---
 modules/config/system-path.nix | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/modules/config/system-path.nix b/modules/config/system-path.nix
index 286f7993f77..e42f491afcf 100644
--- a/modules/config/system-path.nix
+++ b/modules/config/system-path.nix
@@ -120,8 +120,18 @@ let
 in
 
 {
-  require = [options];
+  require = [ options ];
 
   environment.systemPackages = requiredPackages;
-  environment.pathsToLink = ["/bin" "/sbin" "/lib" "/share/man" "/share/info" "/share/emacs" "/man" "/info" "/etc/xdg"];
+  environment.pathsToLink = [
+    "/bin"
+    "/etc/xdg"
+    "/info"
+    "/lib"
+    "/man"
+    "/sbin"
+    "/share/emacs"
+    "/share/info"
+    "/share/man"
+  ];
 }
-- 
GitLab


From 05a49f663ec5e0e95c2388cfc4d94eb07ff8bed0 Mon Sep 17 00:00:00 2001
From: Florian Friesdorf <flo@chaoflow.net>
Date: Thu, 29 Dec 2011 19:38:00 +0000
Subject: [PATCH 3297/5331] include /share/terminfo into default pathsToLink

svn path=/nixos/trunk/; revision=31144
---
 modules/config/system-path.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/modules/config/system-path.nix b/modules/config/system-path.nix
index e42f491afcf..b8fcf960209 100644
--- a/modules/config/system-path.nix
+++ b/modules/config/system-path.nix
@@ -132,6 +132,7 @@ in
     "/sbin"
     "/share/emacs"
     "/share/info"
+    "/share/terminfo"
     "/share/man"
   ];
 }
-- 
GitLab


From b2eb54ae5a16207c0360c397ea0cc14fc9f1931d Mon Sep 17 00:00:00 2001
From: Florian Friesdorf <flo@chaoflow.net>
Date: Thu, 29 Dec 2011 19:38:03 +0000
Subject: [PATCH 3298/5331] set TERMINFO_DIRS according to NIX_PROFILES

this finally makes rxvt-unicode work without manually linking it's terminfo

svn path=/nixos/trunk/; revision=31145
---
 modules/programs/bash/profile.sh | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/modules/programs/bash/profile.sh b/modules/programs/bash/profile.sh
index 36c2d520ec0..26d3930b843 100644
--- a/modules/programs/bash/profile.sh
+++ b/modules/programs/bash/profile.sh
@@ -29,6 +29,10 @@ for i in $NIX_PROFILES; do # !!! reverse
     export INFOPATH=$i/info:$i/share/info${INFOPATH:+:}$INFOPATH
     export PKG_CONFIG_PATH="$i/lib/pkgconfig${PKG_CONFIG_PATH:+:}$PKG_CONFIG_PATH"
 
+    # terminfo and reset TERM with new TERMINFO available
+    export TERMINFO_DIRS=$i/share/terminfo${TERMINFO_DIRS:+:}$TERMINFO_DIRS
+    export TERM=$TERM
+
     # "lib/site_perl" is for backwards compatibility with packages
     # from Nixpkgs <= 0.12.
     export PERL5LIB="$i/lib/perl5/site_perl:$i/lib/site_perl${PERL5LIB:+:}$PERL5LIB"
-- 
GitLab


From e91c6ea1ce01842b20b5e5fd9cc61c0fe3248312 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 30 Dec 2011 16:57:39 +0000
Subject: [PATCH 3299/5331] modules/system/upstart-events/shutdown.nix: refer
 to bash binary with full path

Upstart won't find a "bash" binary in $PATH when those commands are run, so we
refer to it using an absolute path.

svn path=/nixos/trunk/; revision=31157
---
 modules/system/upstart-events/shutdown.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/system/upstart-events/shutdown.nix b/modules/system/upstart-events/shutdown.nix
index 78d848df663..8aa794378ed 100644
--- a/modules/system/upstart-events/shutdown.nix
+++ b/modules/system/upstart-events/shutdown.nix
@@ -136,7 +136,7 @@ with pkgs.lib;
               echo Enter 'i' to launch a shell, or wait 10 seconds to continue.
               read -t 10 A
               if [ "$A" == "i" ]; then
-                bash -i < /dev/console &> /dev/console
+                ${pkgs.bashInteractive}/bin/bash -i < /dev/console &> /dev/console
               fi
               sleep 5
           fi
-- 
GitLab


From da90f06ff86f352fb10e6ecd74e2608e028d0205 Mon Sep 17 00:00:00 2001
From: Florian Friesdorf <flo@chaoflow.net>
Date: Fri, 30 Dec 2011 23:26:06 +0000
Subject: [PATCH 3300/5331] 4965agn was wrongly detected as a 3945abg

svn path=/nixos/trunk/; revision=31164
---
 modules/installer/scan/not-detected.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/modules/installer/scan/not-detected.nix b/modules/installer/scan/not-detected.nix
index c378fe03691..36382a4cf1d 100644
--- a/modules/installer/scan/not-detected.nix
+++ b/modules/installer/scan/not-detected.nix
@@ -6,7 +6,9 @@ with pkgs.lib;
 
 {
   imports =
-    [ ../../hardware/network/intel-5000.nix
+    [
+      ../../hardware/network/intel-4965agn.nix
+      ../../hardware/network/intel-5000.nix
       ../../hardware/network/intel-6000.nix
       ../../hardware/network/intel-6000g2a.nix
       ../../hardware/network/intel-6000g2b.nix
-- 
GitLab


From 5b7e7bb42966d0b780861f772074604802d22f4a Mon Sep 17 00:00:00 2001
From: Florian Friesdorf <flo@chaoflow.net>
Date: Fri, 30 Dec 2011 23:26:11 +0000
Subject: [PATCH 3301/5331] services.xserver.xkbVariant

svn path=/nixos/trunk/; revision=31165
---
 modules/services/x11/xserver.nix | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/modules/services/x11/xserver.nix b/modules/services/x11/xserver.nix
index f1e8044fc6b..cbd0741c844 100644
--- a/modules/services/x11/xserver.nix
+++ b/modules/services/x11/xserver.nix
@@ -228,6 +228,14 @@ in
         '';
       };
 
+      xkbVariant = mkOption {
+        default = "";
+        example = "colemak";
+        description = ''
+          X keyboard variant.
+        '';
+      };
+
       config = mkOption {
         description = ''
           The contents of the configuration file of the X server
@@ -463,6 +471,7 @@ in
           Option "XkbModel" "${cfg.xkbModel}"
           Option "XkbLayout" "${cfg.layout}"
           Option "XkbOptions" "${cfg.xkbOptions}"
+          Option "XkbVariant" "${cfg.xkbVariant}"
         EndSection
 
         Section "ServerLayout"
-- 
GitLab


From 76986a24f98f5ea303159cc9611a8a72eed376e4 Mon Sep 17 00:00:00 2001
From: Florian Friesdorf <flo@chaoflow.net>
Date: Sat, 31 Dec 2011 00:24:48 +0000
Subject: [PATCH 3302/5331] enable noX11 on kernel cmdline to suppress start of
 X

xserver is started on start_xserver event, which is emitted by
check_for_xserver_start if there is no "noX11" on the kernel cmdline.

Thanks to viric for the general idea.

svn path=/nixos/trunk/; revision=31166
---
 modules/services/x11/xserver.nix | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/modules/services/x11/xserver.nix b/modules/services/x11/xserver.nix
index cbd0741c844..d07ca53e145 100644
--- a/modules/services/x11/xserver.nix
+++ b/modules/services/x11/xserver.nix
@@ -384,9 +384,15 @@ in
     environment.pathsToLink =
       [ "/etc/xdg" "/share/xdg" "/share/applications" "/share/icons" "/share/pixmaps" ];
 
-    jobs.xserver =
+    jobs.check_for_xserver_start =
       { startOn = if cfg.autorun then "filesystem and stopped udevtrigger" else "";
+        stopOn = "";
+        task = true;
+        script = "grep -qv noX11 /proc/cmdline && initctl emit start_xserver || true";
+      };
 
+    jobs.xserver =
+      { startOn = "start_xserver";
         environment =
           { FONTCONFIG_FILE = "/etc/fonts/fonts.conf"; # !!! cleanup
             XKB_BINDIR = "${xorg.xkbcomp}/bin"; # Needed for the Xkb extension.
-- 
GitLab


From 97ce0b138603614e5d383fc7ebadaef5bf4158fb Mon Sep 17 00:00:00 2001
From: Florian Friesdorf <flo@chaoflow.net>
Date: Sat, 31 Dec 2011 02:05:51 +0000
Subject: [PATCH 3303/5331] MOZ_PLUGIN_PATH based on NIX_PROFILES

svn path=/nixos/trunk/; revision=31167
---
 modules/programs/bash/profile.sh | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/modules/programs/bash/profile.sh b/modules/programs/bash/profile.sh
index 26d3930b843..d9c0929b918 100644
--- a/modules/programs/bash/profile.sh
+++ b/modules/programs/bash/profile.sh
@@ -50,6 +50,9 @@ for i in $NIX_PROFILES; do # !!! reverse
     export QTWEBKIT_PLUGIN_PATH=$i/lib/mozilla/plugins/${QTWEBKIT_PLUGIN_PATH:+:}$QTWEBKIT_PLUGIN_PATH
     export XDG_CONFIG_DIRS=$i/etc/xdg${XDG_CONFIG_DIRS:+:}$XDG_CONFIG_DIRS
     export XDG_DATA_DIRS=$i/share${XDG_DATA_DIRS:+:}$XDG_DATA_DIRS
+
+    # mozilla plugins
+    export MOZ_PLUGIN_PATH=$i/lib/mozilla/plugins${PATH:+:}$PATH
 done
 
 # Search directory for Aspell dictionaries.
-- 
GitLab


From 221c63735683271f9b54a829e39347a2b355644e Mon Sep 17 00:00:00 2001
From: Florian Friesdorf <flo@chaoflow.net>
Date: Sat, 31 Dec 2011 02:57:45 +0000
Subject: [PATCH 3304/5331] fix MOZ_PLUGIN_PATH

svn path=/nixos/trunk/; revision=31168
---
 modules/programs/bash/profile.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/programs/bash/profile.sh b/modules/programs/bash/profile.sh
index d9c0929b918..675a003233d 100644
--- a/modules/programs/bash/profile.sh
+++ b/modules/programs/bash/profile.sh
@@ -52,7 +52,7 @@ for i in $NIX_PROFILES; do # !!! reverse
     export XDG_DATA_DIRS=$i/share${XDG_DATA_DIRS:+:}$XDG_DATA_DIRS
 
     # mozilla plugins
-    export MOZ_PLUGIN_PATH=$i/lib/mozilla/plugins${PATH:+:}$PATH
+    export MOZ_PLUGIN_PATH=$i/lib/mozilla/plugins${MOZ_PLUGIN_PATH:+:}$MOZ_PLUGIN_PATH
 done
 
 # Search directory for Aspell dictionaries.
-- 
GitLab


From b0fefb876f21b7ccb57b2df85bb5166b46483529 Mon Sep 17 00:00:00 2001
From: Florian Friesdorf <flo@chaoflow.net>
Date: Sat, 31 Dec 2011 04:14:31 +0000
Subject: [PATCH 3305/5331] unset MOZ_PLUGIN_PATH and TERMINFO_DIRS before
 setting them

svn path=/nixos/trunk/; revision=31174
---
 modules/programs/bash/profile.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/modules/programs/bash/profile.sh b/modules/programs/bash/profile.sh
index 675a003233d..07be87ffd7d 100644
--- a/modules/programs/bash/profile.sh
+++ b/modules/programs/bash/profile.sh
@@ -22,6 +22,7 @@ NIX_PROFILES="/var/run/current-system/sw /nix/var/nix/profiles/default $HOME/.ni
 
 unset PATH INFOPATH PKG_CONFIG_PATH PERL5LIB ALSA_PLUGIN_DIRS GST_PLUGIN_PATH KDEDIRS
 unset QT_PLUGIN_PATH QTWEBKIT_PLUGIN_PATH STRIGI_PLUGIN_PATH XDG_CONFIG_DIRS XDG_DATA_DIRS
+unset MOZ_PLUGIN_PATH TERMINFO_DIRS
 
 for i in $NIX_PROFILES; do # !!! reverse
     # We have to care not leaving an empty PATH element, because that means '.' to Linux
-- 
GitLab


From a38ca160ec18d7b3be9681edcfbc6010a1e47ad1 Mon Sep 17 00:00:00 2001
From: Florian Friesdorf <flo@chaoflow.net>
Date: Sat, 31 Dec 2011 04:14:36 +0000
Subject: [PATCH 3306/5331] EMACSLOADPATH in /etc/profile

svn path=/nixos/trunk/; revision=31175
---
 modules/programs/bash/profile.sh | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/modules/programs/bash/profile.sh b/modules/programs/bash/profile.sh
index 07be87ffd7d..89effcc6059 100644
--- a/modules/programs/bash/profile.sh
+++ b/modules/programs/bash/profile.sh
@@ -41,6 +41,9 @@ for i in $NIX_PROFILES; do # !!! reverse
     # ALSA plugins
     export ALSA_PLUGIN_DIRS="$i/lib/alsa-lib${ALSA_PLUGIN_DIRS:+:}$ALSA_PLUGIN_DIRS"
 
+    # emacs load path
+    export EMACSLOADPATH=$i/share/emacs/site-lisp${EMACSLOADPATH:+:}$EMACSLOADPATH
+
     # GStreamer.
     export GST_PLUGIN_PATH="$i/lib/gstreamer-0.10${GST_PLUGIN_PATH:+:}$GST_PLUGIN_PATH"
 
-- 
GitLab


From ea121d0ff98599f24af8851c9a95bcaef4476be1 Mon Sep 17 00:00:00 2001
From: Florian Friesdorf <flo@chaoflow.net>
Date: Sat, 31 Dec 2011 06:24:12 +0000
Subject: [PATCH 3307/5331] Revert "EMACSLOADPATH in /etc/profile"

svn path=/nixos/trunk/; revision=31187
---
 modules/programs/bash/profile.sh | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/modules/programs/bash/profile.sh b/modules/programs/bash/profile.sh
index 89effcc6059..07be87ffd7d 100644
--- a/modules/programs/bash/profile.sh
+++ b/modules/programs/bash/profile.sh
@@ -41,9 +41,6 @@ for i in $NIX_PROFILES; do # !!! reverse
     # ALSA plugins
     export ALSA_PLUGIN_DIRS="$i/lib/alsa-lib${ALSA_PLUGIN_DIRS:+:}$ALSA_PLUGIN_DIRS"
 
-    # emacs load path
-    export EMACSLOADPATH=$i/share/emacs/site-lisp${EMACSLOADPATH:+:}$EMACSLOADPATH
-
     # GStreamer.
     export GST_PLUGIN_PATH="$i/lib/gstreamer-0.10${GST_PLUGIN_PATH:+:}$GST_PLUGIN_PATH"
 
-- 
GitLab


From 8eca4db54aed5b0969a2f0c56e2736cb3c8a078a Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 31 Dec 2011 12:56:45 +0000
Subject: [PATCH 3308/5331] /etc/profile: do not add ~/bin to $PATH in
 system-wide init file

Users who want a user-specific bin directory to override system paths should
configure that in their user-specific ~/.bashrc, not in the system-wide init
file. The global file shouldn't add directories from user homes to $PATH
without knowing whether those actually exist or whether the users even want
them in $PATH. On my system, for example, there is no ~/bin, so I don't want my
$PATH to look for one. Removing an erroneous entry from $PATH is cumbersome,
but adding one is easy, so it feels better to err on the side of caution.

svn path=/nixos/trunk/; revision=31188
---
 modules/programs/bash/profile.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/programs/bash/profile.sh b/modules/programs/bash/profile.sh
index 07be87ffd7d..91f6007c0fe 100644
--- a/modules/programs/bash/profile.sh
+++ b/modules/programs/bash/profile.sh
@@ -59,8 +59,8 @@ done
 # Search directory for Aspell dictionaries.
 export ASPELL_CONF="dict-dir $HOME/.nix-profile/lib/aspell"
 
-# ~/bin and the setuid wrappers override other bin directories.
-export PATH=$HOME/bin:@wrapperDir@:$PATH
+# The setuid wrappers override other bin directories.
+export PATH=@wrapperDir@:$PATH
 
 # Set up the per-user profile.
 mkdir -m 0755 -p $NIX_USER_PROFILE_DIR
-- 
GitLab


From 007d56b69f0c81ebac326285c4e5d511191304d8 Mon Sep 17 00:00:00 2001
From: Florian Friesdorf <flo@chaoflow.net>
Date: Tue, 3 Jan 2012 14:12:41 +0000
Subject: [PATCH 3309/5331] intel-5150.nix: add Intel 5150 wireless firmware
 support

Author:    Sergey Mironov <ierton@gmail.com>

svn path=/nixos/trunk/; revision=31231
---
 modules/hardware/network/intel-5150.nix | 5 +++++
 modules/installer/scan/not-detected.nix | 1 +
 2 files changed, 6 insertions(+)
 create mode 100644 modules/hardware/network/intel-5150.nix

diff --git a/modules/hardware/network/intel-5150.nix b/modules/hardware/network/intel-5150.nix
new file mode 100644
index 00000000000..e32b72d5fa4
--- /dev/null
+++ b/modules/hardware/network/intel-5150.nix
@@ -0,0 +1,5 @@
+{pkgs, config, ...}:
+
+{
+  hardware.firmware = [ pkgs.iwlwifi5150ucode ];
+}
diff --git a/modules/installer/scan/not-detected.nix b/modules/installer/scan/not-detected.nix
index 36382a4cf1d..34e71479322 100644
--- a/modules/installer/scan/not-detected.nix
+++ b/modules/installer/scan/not-detected.nix
@@ -9,6 +9,7 @@ with pkgs.lib;
     [
       ../../hardware/network/intel-4965agn.nix
       ../../hardware/network/intel-5000.nix
+      ../../hardware/network/intel-5150.nix
       ../../hardware/network/intel-6000.nix
       ../../hardware/network/intel-6000g2a.nix
       ../../hardware/network/intel-6000g2b.nix
-- 
GitLab


From b4765401af3a09d412e0435a7c97dc07c2f70b02 Mon Sep 17 00:00:00 2001
From: Florian Friesdorf <flo@chaoflow.net>
Date: Tue, 3 Jan 2012 14:36:05 +0000
Subject: [PATCH 3310/5331] add ~/bin to PATH if it exists

svn path=/nixos/trunk/; revision=31235
---
 modules/programs/bash/profile.sh | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/modules/programs/bash/profile.sh b/modules/programs/bash/profile.sh
index 91f6007c0fe..7fc17d92841 100644
--- a/modules/programs/bash/profile.sh
+++ b/modules/programs/bash/profile.sh
@@ -62,6 +62,11 @@ export ASPELL_CONF="dict-dir $HOME/.nix-profile/lib/aspell"
 # The setuid wrappers override other bin directories.
 export PATH=@wrapperDir@:$PATH
 
+# ~/bin if it exists overrides other bin directories.
+if test -d $HOME/bin; then
+    export PATH=$HOME/bin:$PATH
+fi
+
 # Set up the per-user profile.
 mkdir -m 0755 -p $NIX_USER_PROFILE_DIR
 if test "$(stat --printf '%u' $NIX_USER_PROFILE_DIR)" != "$(id -u)"; then
-- 
GitLab


From 7b7976ac016827cc8671a1e356b671fac3c3c5e4 Mon Sep 17 00:00:00 2001
From: Florian Friesdorf <flo@chaoflow.net>
Date: Tue, 3 Jan 2012 17:11:19 +0000
Subject: [PATCH 3311/5331] export NIX_PROFILES and NIX_USER_PROFILE_DIR

svn path=/nixos/trunk/; revision=31242
---
 modules/programs/bash/profile.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/programs/bash/profile.sh b/modules/programs/bash/profile.sh
index 7fc17d92841..bc6e88c5561 100644
--- a/modules/programs/bash/profile.sh
+++ b/modules/programs/bash/profile.sh
@@ -17,8 +17,8 @@ export EDITOR=nano
 export LOCATE_PATH=/var/cache/locatedb
 
 # Include the various profiles in the appropriate environment variables.
-NIX_USER_PROFILE_DIR=/nix/var/nix/profiles/per-user/$USER
-NIX_PROFILES="/var/run/current-system/sw /nix/var/nix/profiles/default $HOME/.nix-profile"
+export NIX_USER_PROFILE_DIR=/nix/var/nix/profiles/per-user/$USER
+export NIX_PROFILES="/var/run/current-system/sw /nix/var/nix/profiles/default $HOME/.nix-profile"
 
 unset PATH INFOPATH PKG_CONFIG_PATH PERL5LIB ALSA_PLUGIN_DIRS GST_PLUGIN_PATH KDEDIRS
 unset QT_PLUGIN_PATH QTWEBKIT_PLUGIN_PATH STRIGI_PLUGIN_PATH XDG_CONFIG_DIRS XDG_DATA_DIRS
-- 
GitLab


From 68e9f2e09bf19e7e1527d72b06935d06b08c2eeb Mon Sep 17 00:00:00 2001
From: Florian Friesdorf <flo@chaoflow.net>
Date: Tue, 3 Jan 2012 17:11:21 +0000
Subject: [PATCH 3312/5331] Revert "add ~/bin to PATH if it exists"

This reverts commit 73bda7c4575b5664d54340db95fec2fa759b6f28.

svn path=/nixos/trunk/; revision=31243
---
 modules/programs/bash/profile.sh | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/modules/programs/bash/profile.sh b/modules/programs/bash/profile.sh
index bc6e88c5561..cfbce081de2 100644
--- a/modules/programs/bash/profile.sh
+++ b/modules/programs/bash/profile.sh
@@ -62,11 +62,6 @@ export ASPELL_CONF="dict-dir $HOME/.nix-profile/lib/aspell"
 # The setuid wrappers override other bin directories.
 export PATH=@wrapperDir@:$PATH
 
-# ~/bin if it exists overrides other bin directories.
-if test -d $HOME/bin; then
-    export PATH=$HOME/bin:$PATH
-fi
-
 # Set up the per-user profile.
 mkdir -m 0755 -p $NIX_USER_PROFILE_DIR
 if test "$(stat --printf '%u' $NIX_USER_PROFILE_DIR)" != "$(id -u)"; then
-- 
GitLab


From 66f82c043edbecf5def2a065968857e1f5d0de2e Mon Sep 17 00:00:00 2001
From: Florian Friesdorf <flo@chaoflow.net>
Date: Tue, 3 Jan 2012 17:29:20 +0000
Subject: [PATCH 3313/5331] Revert "Revert "add ~/bin to PATH if it exists""

sorry m(

svn path=/nixos/trunk/; revision=31246
---
 modules/programs/bash/profile.sh | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/modules/programs/bash/profile.sh b/modules/programs/bash/profile.sh
index cfbce081de2..bc6e88c5561 100644
--- a/modules/programs/bash/profile.sh
+++ b/modules/programs/bash/profile.sh
@@ -62,6 +62,11 @@ export ASPELL_CONF="dict-dir $HOME/.nix-profile/lib/aspell"
 # The setuid wrappers override other bin directories.
 export PATH=@wrapperDir@:$PATH
 
+# ~/bin if it exists overrides other bin directories.
+if test -d $HOME/bin; then
+    export PATH=$HOME/bin:$PATH
+fi
+
 # Set up the per-user profile.
 mkdir -m 0755 -p $NIX_USER_PROFILE_DIR
 if test "$(stat --printf '%u' $NIX_USER_PROFILE_DIR)" != "$(id -u)"; then
-- 
GitLab


From 6385d51f7e97c53278c31f715acc021828d7497d Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 9 Jan 2012 16:03:43 +0000
Subject: [PATCH 3314/5331] modules/services/printing/cupsd.nix: fixed path to
 DataDir

svn path=/nixos/trunk/; revision=31457
---
 modules/services/printing/cupsd.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/services/printing/cupsd.nix b/modules/services/printing/cupsd.nix
index 8ba4a41e0de..7004f7d6c83 100644
--- a/modules/services/printing/cupsd.nix
+++ b/modules/services/printing/cupsd.nix
@@ -161,7 +161,7 @@ in
         ServerRoot /etc/cups
 
         ServerBin ${bindir}/lib/cups
-        DataDir ${bindir}/share/cups
+        DataDir ${pkgs.cups}/share/cups
 
         AccessLog ${logDir}/access_log
         ErrorLog ${logDir}/error_log
-- 
GitLab


From cab4a28361272afec39333f7c53768c6d87642e7 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 10 Jan 2012 18:40:02 +0000
Subject: [PATCH 3315/5331] synaptics: add 'additionalOptions' option

svn path=/nixos/trunk/; revision=31469
---
 modules/services/x11/hardware/synaptics.nix | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/modules/services/x11/hardware/synaptics.nix b/modules/services/x11/hardware/synaptics.nix
index 554180049be..8602736b543 100644
--- a/modules/services/x11/hardware/synaptics.nix
+++ b/modules/services/x11/hardware/synaptics.nix
@@ -18,7 +18,7 @@ let cfg = config.services.xserver.synaptics; in
 
       dev = mkOption {
         default = null;
-	example = "/dev/input/event0";
+        example = "/dev/input/event0";
         description =
           ''
             Path for touchpad device.  Set to null to apply to any
@@ -46,6 +46,17 @@ let cfg = config.services.xserver.synaptics; in
         description = "Whether to enable vertical edge drag-scrolling.";
       };
 
+      additionalOptions = mkOption {
+        default = "";
+        example = ''
+          Option "RTCornerButton" "2"
+          Option "RBCornerButton" "3"
+		'';
+        description = ''
+          Additional options for synaptics touchpad driver.
+        '';
+      };
+
     };
 
   };
@@ -74,6 +85,7 @@ let cfg = config.services.xserver.synaptics; in
           Option "VertTwoFingerScroll" "${if cfg.twoFingerScroll then "1" else "0"}"
           Option "HorizTwoFingerScroll" "${if cfg.twoFingerScroll then "1" else "0"}"
           Option "VertEdgeScroll" "${if cfg.vertEdgeScroll then "1" else "0"}"
+          ${cfg.additionalOptions}
         EndSection
       '';
 
-- 
GitLab


From 70850268e04fac68038c3ecc3c85a0118b1c2205 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 11 Jan 2012 20:48:40 +0000
Subject: [PATCH 3316/5331] Revert "modules/services/printing/cupsd.nix: fixed
 path to DataDir"

This reverts commit 2a1ce489154c8543bc146a7d99e1a397eb920e1f.

svn path=/nixos/trunk/; revision=31484
---
 modules/services/printing/cupsd.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/services/printing/cupsd.nix b/modules/services/printing/cupsd.nix
index 7004f7d6c83..8ba4a41e0de 100644
--- a/modules/services/printing/cupsd.nix
+++ b/modules/services/printing/cupsd.nix
@@ -161,7 +161,7 @@ in
         ServerRoot /etc/cups
 
         ServerBin ${bindir}/lib/cups
-        DataDir ${pkgs.cups}/share/cups
+        DataDir ${bindir}/share/cups
 
         AccessLog ${logDir}/access_log
         ErrorLog ${logDir}/error_log
-- 
GitLab


From 98f5e3b3b24ee645683a4b41d82d4a98b1684c2c Mon Sep 17 00:00:00 2001
From: "Yury G. Kudryashov" <urkud.urkud@gmail.com>
Date: Wed, 11 Jan 2012 22:58:32 +0000
Subject: [PATCH 3317/5331] Drop kde4.5-specific code

svn path=/nixos/trunk/; revision=31486
---
 .../services/x11/desktop-managers/kde4.nix    | 34 ++-----------------
 1 file changed, 2 insertions(+), 32 deletions(-)

diff --git a/modules/services/x11/desktop-managers/kde4.nix b/modules/services/x11/desktop-managers/kde4.nix
index e2adba6832a..d5deccb5b93 100644
--- a/modules/services/x11/desktop-managers/kde4.nix
+++ b/modules/services/x11/desktop-managers/kde4.nix
@@ -8,8 +8,6 @@ let
   cfg = xcfg.desktopManager.kde4;
   xorg = pkgs.xorg;
 
-  isKDE47 = pkgs.kde4 ? kde_wallpapers;
-
   # Disable Nepomuk and Strigi by default.  As of KDE 4.7, they don't
   # really work very well (e.g. searching files often fails to find
   # files), segfault sometimes and consume significant resources.
@@ -83,10 +81,6 @@ in
                 sed -e '/nix\\store\|nix\/store/ d' -i $HOME/.config/Trolltech.conf
             fi
 
-            ${optionalString (!isKDE47) ''
-              export DBUS_FATAL_WARNINGS=0
-            ''}
-
             # Start KDE.
             exec ${pkgs.kde4.kdebase_workspace}/bin/startkde
           '';
@@ -101,28 +95,6 @@ in
       };
 
     environment.systemPackages =
-      (if !isKDE47 then
-        # KDE <= 4.6
-        [ # temporary workarounds
-          pkgs.shared_desktop_ontologies
-          pkgs.strigi
-
-          pkgs.kde4.kdelibs
-          pkgs.kde4.kdebase
-          pkgs.kde4.kdebase_runtime
-          pkgs.kde4.kdebase_workspace
-          pkgs.kde4.oxygen_icons
-          pkgs.kde4.qt4 # needed for qdbus
-          pkgs.shared_mime_info
-          pkgs.gst_all.gstreamer
-          pkgs.gst_all.gstPluginsBase
-          pkgs.gst_all.gstPluginsGood
-          pkgs.gst_all.gstFfmpeg # for mp3 playback
-          xorg.xmessage # so that startkde can show error messages
-          xorg.xset # used by startkde, non-essential
-        ] ++ optional (pkgs ? phonon_backend_gstreamer) pkgs.phonon_backend_gstreamer
-      else
-        # KDE >= 4.7
         [ pkgs.kde4.kdelibs
 
           pkgs.kde4.kde_baseapps # Splitted kdebase
@@ -156,7 +128,6 @@ in
           pkgs.shared_desktop_ontologies # used by nepomuk
           pkgs.strigi # used by nepomuk
         ]
-      )
       ++ [ nepomukConfig ]
       ++ config.environment.kdePackages;
 
@@ -168,9 +139,8 @@ in
       };
 
     # Enable helpful DBus services.
-    services.hal = mkIf (!isKDE47) { enable = true; };
-    services.udisks = mkIf isKDE47 { enable = true; };
-    services.upower = mkIf (isKDE47 && config.powerManagement.enable) { enable = true; };
+    services.udisks.enable = true;
+    services.upower = mkIf config.powerManagement.enable { enable = true; };
 
     security.pam.services = [ { name = "kde"; allowNullPassword = true; } ];
 
-- 
GitLab


From 036e585b42f71450fed9dee7b22e3a47b6d42a1f Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 11 Jan 2012 23:17:36 +0000
Subject: [PATCH 3318/5331] modules/services/printing/cupsd.nix: tell cups to
 use 'gstoraster' instead of 'pstoraster'

The CUPS filter has been renamed in GNU Ghostscript 9.x. Fortunately,
Ghostscript ships with a MIME conversions file that informs CUPS about this,
so linking that file into /etc/cups works fine. I'm not sure whether it's a
particularly elegant solution, though.

svn path=/nixos/trunk/; revision=31489
---
 modules/services/printing/cupsd.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/modules/services/printing/cupsd.nix b/modules/services/printing/cupsd.nix
index 8ba4a41e0de..6f0f88c8205 100644
--- a/modules/services/printing/cupsd.nix
+++ b/modules/services/printing/cupsd.nix
@@ -135,6 +135,7 @@ in
         preStart =
           ''
             mkdir -m 0755 -p /etc/cups
+            ln -f -v -s "${pkgs.ghostscript}/etc/cups/"* /etc/cups/
             mkdir -m 0755 -p ${logDir}
             mkdir -m 0700 -p /var/cache/cups
             mkdir -m 0700 -p /var/spool/cups
-- 
GitLab


From f169f60575bec7c61626af180cae364d321b4bec Mon Sep 17 00:00:00 2001
From: Florian Friesdorf <flo@chaoflow.net>
Date: Thu, 12 Jan 2012 07:54:09 +0000
Subject: [PATCH 3319/5331] powerManagement.enable sets
 link_power_management_policy to min_power

svn path=/nixos/trunk/; revision=31490
---
 modules/config/power-management.nix          |  2 +-
 modules/module-list.nix                      |  1 +
 modules/tasks/scsi-link-power-management.nix | 44 ++++++++++++++++++++
 3 files changed, 46 insertions(+), 1 deletion(-)
 create mode 100644 modules/tasks/scsi-link-power-management.nix

diff --git a/modules/config/power-management.nix b/modules/config/power-management.nix
index 10aa821964a..7497877981c 100644
--- a/modules/config/power-management.nix
+++ b/modules/config/power-management.nix
@@ -92,7 +92,7 @@ in
       ];
 
     powerManagement.cpuFreqGovernor = "ondemand";
-
+    powerManagement.scsiLinkPolicy = "min_power";
   };
 
 }
diff --git a/modules/module-list.nix b/modules/module-list.nix
index 80f52be37f3..6c8159d1c42 100644
--- a/modules/module-list.nix
+++ b/modules/module-list.nix
@@ -195,6 +195,7 @@
   ./tasks/kbd.nix
   ./tasks/lvm.nix
   ./tasks/network-interfaces.nix
+  ./tasks/scsi-link-power-management.nix
   ./tasks/swraid.nix
   ./tasks/tty-backgrounds.nix
   ./virtualisation/libvirtd.nix
diff --git a/modules/tasks/scsi-link-power-management.nix b/modules/tasks/scsi-link-power-management.nix
new file mode 100644
index 00000000000..5ad04281509
--- /dev/null
+++ b/modules/tasks/scsi-link-power-management.nix
@@ -0,0 +1,44 @@
+{ config, pkgs, ... }:
+
+with pkgs.lib;
+
+{
+  ###### interface
+
+  options = {
+  
+    powerManagement.scsiLinkPolicy = mkOption {
+      default = "";
+      example = "min_power";
+      description = ''
+        Configure the scsi link power management policy. By default,
+        the kernel configures "max_performance".
+      '';
+    };
+    
+  };
+
+
+  ###### implementation
+
+  config = mkIf (config.powerManagement.scsiLinkPolicy != "") {
+
+    environment.systemPackages = [ pkgs.cpufrequtils ];
+
+    jobs.cpufreq =
+      { description = "Set SCSI link power management policy";
+
+        startOn = "started udev";
+
+        task = true;
+
+        script = ''
+          for x in /sys/class/scsi_host/host*/link_power_management_policy; do
+            echo ${config.powerManagement.scsiLinkPolicy} > $x
+          done
+        '';
+      };
+      
+  };
+
+}
-- 
GitLab


From 0862ca9fa787d0e6d6f0a6a5adba78087c626aa5 Mon Sep 17 00:00:00 2001
From: Florian Friesdorf <flo@chaoflow.net>
Date: Thu, 12 Jan 2012 07:54:14 +0000
Subject: [PATCH 3320/5331] sudoers: LOCALE_ARCHIVE, TERMINFO_DIRS for root and
 %wheel

svn path=/nixos/trunk/; revision=31491
---
 modules/security/sudo.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/modules/security/sudo.nix b/modules/security/sudo.nix
index 694f868632d..92677f2a8db 100644
--- a/modules/security/sudo.nix
+++ b/modules/security/sudo.nix
@@ -32,6 +32,10 @@ in
         ''
           # Don't edit this file. Set nixos option security.sudo.configFile instead
 
+          # env vars to keep for root and %wheel also if not explicitly set
+          Defaults:root,%wheel env_keep+=LOCALE_ARCHIVE
+          Defaults:root,%wheel env_keep+=TERMINFO_DIRS
+
           # "root" is allowed to do anything.
           root        ALL=(ALL) SETENV: ALL
 
-- 
GitLab


From 3ef0f14925f16a173ca29bb8f1bc80e997f7c972 Mon Sep 17 00:00:00 2001
From: Arie Middelkoop <amiddelk@gmail.com>
Date: Thu, 12 Jan 2012 17:17:01 +0000
Subject: [PATCH 3321/5331] Added an option to enable the firmware from
 'firmware-linux-nonfree' and 'firmware-linux-free'.

svn path=/nixos/trunk/; revision=31502
---
 modules/hardware/firmware-free.nix    | 26 ++++++++++++++++++++++++++
 modules/hardware/firmware-nonfree.nix | 26 ++++++++++++++++++++++++++
 modules/module-list.nix               |  2 ++
 3 files changed, 54 insertions(+)
 create mode 100644 modules/hardware/firmware-free.nix
 create mode 100644 modules/hardware/firmware-nonfree.nix

diff --git a/modules/hardware/firmware-free.nix b/modules/hardware/firmware-free.nix
new file mode 100644
index 00000000000..ea21a5ae38d
--- /dev/null
+++ b/modules/hardware/firmware-free.nix
@@ -0,0 +1,26 @@
+{pkgs, config, ...}:
+
+{
+
+  ###### interface
+
+  options = {
+
+    hardware.enableFirmwareLinuxFree = pkgs.lib.mkOption {
+      default = false;
+      type = pkgs.lib.types.bool;
+      description = ''
+        Turn on this option if you want the set of firmware of the linux-firmware-free package.
+      '';
+    };
+
+  };
+
+
+  ###### implementation
+
+  config = pkgs.lib.mkIf config.hardware.enableFirmwareLinuxFree {
+    hardware.firmware = [ pkgs.firmwareLinuxFree ];
+  };
+
+}
diff --git a/modules/hardware/firmware-nonfree.nix b/modules/hardware/firmware-nonfree.nix
new file mode 100644
index 00000000000..14cfaf0405b
--- /dev/null
+++ b/modules/hardware/firmware-nonfree.nix
@@ -0,0 +1,26 @@
+{pkgs, config, ...}:
+
+{
+
+  ###### interface
+
+  options = {
+
+    hardware.enableFirmwareLinuxNonfree = pkgs.lib.mkOption {
+      default = false;
+      type = pkgs.lib.types.bool;
+      description = ''
+        Turn on this option if you want the set of firmware of the non-free package.
+      '';
+    };
+
+  };
+
+
+  ###### implementation
+
+  config = pkgs.lib.mkIf config.hardware.enableFirmwareLinuxNonfree {
+    hardware.firmware = [ pkgs.firmwareLinuxNonfree ];
+  };
+
+}
diff --git a/modules/module-list.nix b/modules/module-list.nix
index 6c8159d1c42..6781e1b7a9e 100644
--- a/modules/module-list.nix
+++ b/modules/module-list.nix
@@ -20,6 +20,8 @@
   ./hardware/network/rt73.nix
   ./hardware/network/rtl8192c.nix
   ./hardware/pcmcia.nix
+  ./hardware/firmware-nonfree.nix
+  ./hardware/firmware-free.nix
   ./installer/generations-dir/generations-dir.nix
   ./installer/grub/grub.nix
   ./installer/init-script/init-script.nix
-- 
GitLab


From 7be82b3f5974c63017c3244cd75d0de7be3486e0 Mon Sep 17 00:00:00 2001
From: Florian Friesdorf <flo@chaoflow.net>
Date: Fri, 13 Jan 2012 08:46:32 +0000
Subject: [PATCH 3322/5331] fix scsi-link-power-management.nix which broke
 cpufreq

svn path=/nixos/trunk/; revision=31507
---
 modules/tasks/scsi-link-power-management.nix | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/modules/tasks/scsi-link-power-management.nix b/modules/tasks/scsi-link-power-management.nix
index 5ad04281509..4d7a4e740dd 100644
--- a/modules/tasks/scsi-link-power-management.nix
+++ b/modules/tasks/scsi-link-power-management.nix
@@ -23,9 +23,7 @@ with pkgs.lib;
 
   config = mkIf (config.powerManagement.scsiLinkPolicy != "") {
 
-    environment.systemPackages = [ pkgs.cpufrequtils ];
-
-    jobs.cpufreq =
+    jobs.scsilinkpmpolicy =
       { description = "Set SCSI link power management policy";
 
         startOn = "started udev";
-- 
GitLab


From cc41bce79d60f6f3695ac280b77f3d58d6c87a9a Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 13 Jan 2012 13:26:52 +0000
Subject: [PATCH 3323/5331] * Prevent merging of some options.  P.S. maybe
 string options   should be "uniq" by default.

svn path=/nixos/trunk/; revision=31520
---
 modules/config/power-management.nix          | 5 +++--
 modules/tasks/cpu-freq.nix                   | 1 +
 modules/tasks/scsi-link-power-management.nix | 1 +
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/modules/config/power-management.nix b/modules/config/power-management.nix
index 7497877981c..b474b3eedcd 100644
--- a/modules/config/power-management.nix
+++ b/modules/config/power-management.nix
@@ -91,8 +91,9 @@ in
         "p4_clockmod"
       ];
 
-    powerManagement.cpuFreqGovernor = "ondemand";
-    powerManagement.scsiLinkPolicy = "min_power";
+    powerManagement.cpuFreqGovernor = mkDefault "ondemand";
+    powerManagement.scsiLinkPolicy = mkDefault "min_power";
+    
   };
 
 }
diff --git a/modules/tasks/cpu-freq.nix b/modules/tasks/cpu-freq.nix
index b7d9756db1b..0e0fd502a01 100644
--- a/modules/tasks/cpu-freq.nix
+++ b/modules/tasks/cpu-freq.nix
@@ -10,6 +10,7 @@ with pkgs.lib;
     powerManagement.cpuFreqGovernor = mkOption {
       default = "";
       example = "ondemand";
+      type = types.uniq types.string;
       description = ''
         Configure the governor used to regulate the frequence of the
         available CPUs. By default, the kernel configures the governor
diff --git a/modules/tasks/scsi-link-power-management.nix b/modules/tasks/scsi-link-power-management.nix
index 4d7a4e740dd..13b9eca53cb 100644
--- a/modules/tasks/scsi-link-power-management.nix
+++ b/modules/tasks/scsi-link-power-management.nix
@@ -10,6 +10,7 @@ with pkgs.lib;
     powerManagement.scsiLinkPolicy = mkOption {
       default = "";
       example = "min_power";
+      type = types.uniq types.string;
       description = ''
         Configure the scsi link power management policy. By default,
         the kernel configures "max_performance".
-- 
GitLab


From bf1bf4957ccfa75220fe58466c8c0f811d8a74fa Mon Sep 17 00:00:00 2001
From: Arie Middelkoop <amiddelk@gmail.com>
Date: Fri, 13 Jan 2012 22:23:18 +0000
Subject: [PATCH 3324/5331] Additional options for synaptics

How can you ever work with a touchpad while having finger taps on...

svn path=/nixos/trunk/; revision=31523
---
 modules/services/x11/hardware/synaptics.nix | 19 ++++++++++++++++---
 1 file changed, 16 insertions(+), 3 deletions(-)

diff --git a/modules/services/x11/hardware/synaptics.nix b/modules/services/x11/hardware/synaptics.nix
index 8602736b543..e8c839dc994 100644
--- a/modules/services/x11/hardware/synaptics.nix
+++ b/modules/services/x11/hardware/synaptics.nix
@@ -46,6 +46,18 @@ let cfg = config.services.xserver.synaptics; in
         description = "Whether to enable vertical edge drag-scrolling.";
       };
 
+      tapButtons = mkOption {
+        default = true;
+        example = "false";
+        description = "Whether to enable tap buttons.";
+      };
+
+      palmDetect = mkOption {
+        default = "";
+        example = "true";
+        description = "Whether to enable palm detection (hardware support required)";
+      };
+
       additionalOptions = mkOption {
         default = "";
         example = ''
@@ -79,12 +91,13 @@ let cfg = config.services.xserver.synaptics; in
           Option "MinSpeed" "${cfg.minSpeed}"
           Option "MaxSpeed" "${cfg.maxSpeed}"
           Option "AccelFactor" "0.0010"
-          Option "TapButton1" "1"
-          Option "TapButton2" "2"
-          Option "TapButton3" "3"
+          Option "TapButton1" "${if cfg.tapButtons then "1" else "0"}"
+          Option "TapButton2" "${if cfg.tapButtons then "2" else "0"}"
+          Option "TapButton3" "${if cfg.tapButtons then "3" else "0"}"
           Option "VertTwoFingerScroll" "${if cfg.twoFingerScroll then "1" else "0"}"
           Option "HorizTwoFingerScroll" "${if cfg.twoFingerScroll then "1" else "0"}"
           Option "VertEdgeScroll" "${if cfg.vertEdgeScroll then "1" else "0"}"
+          ${if cfg.palmDetect then ''Option "PalmDetect" "1"'' else ""}
           ${cfg.additionalOptions}
         EndSection
       '';
-- 
GitLab


From 50d7a38c8248a6fa6df95520a2645634b4c34fb9 Mon Sep 17 00:00:00 2001
From: Arie Middelkoop <amiddelk@gmail.com>
Date: Fri, 13 Jan 2012 22:25:16 +0000
Subject: [PATCH 3325/5331] Added the "conservative" governer to the loaded
 cpufreq governors when you enable powermanagement.

svn path=/nixos/trunk/; revision=31524
---
 modules/config/power-management.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/config/power-management.nix b/modules/config/power-management.nix
index b474b3eedcd..ad54a5fa748 100644
--- a/modules/config/power-management.nix
+++ b/modules/config/power-management.nix
@@ -88,7 +88,7 @@ in
 
     boot.kernelModules =
       [ "acpi_cpufreq" "cpufreq_performance" "cpufreq_powersave" "cpufreq_ondemand"
-        "p4_clockmod"
+        "p4_clockmod" "cpufreq_conservative"
       ];
 
     powerManagement.cpuFreqGovernor = mkDefault "ondemand";
-- 
GitLab


From 4d26262878fc03336a85f2e1523efc345baa3c5f Mon Sep 17 00:00:00 2001
From: Arie Middelkoop <amiddelk@gmail.com>
Date: Sat, 14 Jan 2012 09:30:24 +0000
Subject: [PATCH 3326/5331] Some renaming as was mentioned on the mailinglist.

Also, removed the firmware-free option because that firmware is already in the kernel package and thus causing collisions otherwise.

svn path=/nixos/trunk/; revision=31527
---
 ...{firmware-nonfree.nix => all-firmware.nix} |  6 ++---
 modules/hardware/firmware-free.nix            | 26 -------------------
 modules/module-list.nix                       |  3 +--
 3 files changed, 4 insertions(+), 31 deletions(-)
 rename modules/hardware/{firmware-nonfree.nix => all-firmware.nix} (53%)
 delete mode 100644 modules/hardware/firmware-free.nix

diff --git a/modules/hardware/firmware-nonfree.nix b/modules/hardware/all-firmware.nix
similarity index 53%
rename from modules/hardware/firmware-nonfree.nix
rename to modules/hardware/all-firmware.nix
index 14cfaf0405b..9ef7b1523fc 100644
--- a/modules/hardware/firmware-nonfree.nix
+++ b/modules/hardware/all-firmware.nix
@@ -6,11 +6,11 @@
 
   options = {
 
-    hardware.enableFirmwareLinuxNonfree = pkgs.lib.mkOption {
+    hardware.enableAllFirmware = pkgs.lib.mkOption {
       default = false;
       type = pkgs.lib.types.bool;
       description = ''
-        Turn on this option if you want the set of firmware of the non-free package.
+        Turn on this option if you want to enable all the firmware shipped with Debian/Ubuntu.
       '';
     };
 
@@ -19,7 +19,7 @@
 
   ###### implementation
 
-  config = pkgs.lib.mkIf config.hardware.enableFirmwareLinuxNonfree {
+  config = pkgs.lib.mkIf config.hardware.enableAllFirmware {
     hardware.firmware = [ pkgs.firmwareLinuxNonfree ];
   };
 
diff --git a/modules/hardware/firmware-free.nix b/modules/hardware/firmware-free.nix
deleted file mode 100644
index ea21a5ae38d..00000000000
--- a/modules/hardware/firmware-free.nix
+++ /dev/null
@@ -1,26 +0,0 @@
-{pkgs, config, ...}:
-
-{
-
-  ###### interface
-
-  options = {
-
-    hardware.enableFirmwareLinuxFree = pkgs.lib.mkOption {
-      default = false;
-      type = pkgs.lib.types.bool;
-      description = ''
-        Turn on this option if you want the set of firmware of the linux-firmware-free package.
-      '';
-    };
-
-  };
-
-
-  ###### implementation
-
-  config = pkgs.lib.mkIf config.hardware.enableFirmwareLinuxFree {
-    hardware.firmware = [ pkgs.firmwareLinuxFree ];
-  };
-
-}
diff --git a/modules/module-list.nix b/modules/module-list.nix
index 6781e1b7a9e..398a902b638 100644
--- a/modules/module-list.nix
+++ b/modules/module-list.nix
@@ -20,8 +20,7 @@
   ./hardware/network/rt73.nix
   ./hardware/network/rtl8192c.nix
   ./hardware/pcmcia.nix
-  ./hardware/firmware-nonfree.nix
-  ./hardware/firmware-free.nix
+  ./hardware/all-firmware.nix
   ./installer/generations-dir/generations-dir.nix
   ./installer/grub/grub.nix
   ./installer/init-script/init-script.nix
-- 
GitLab


From 2f49427e4f90b9a96da768c302f36b498b290a4d Mon Sep 17 00:00:00 2001
From: Arie Middelkoop <amiddelk@gmail.com>
Date: Sat, 14 Jan 2012 09:40:08 +0000
Subject: [PATCH 3327/5331] Fixed the default value for the palmDetect
 synaptics option (empty string -> false).

svn path=/nixos/trunk/; revision=31529
---
 modules/services/x11/hardware/synaptics.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/services/x11/hardware/synaptics.nix b/modules/services/x11/hardware/synaptics.nix
index e8c839dc994..a2087f24e45 100644
--- a/modules/services/x11/hardware/synaptics.nix
+++ b/modules/services/x11/hardware/synaptics.nix
@@ -53,7 +53,7 @@ let cfg = config.services.xserver.synaptics; in
       };
 
       palmDetect = mkOption {
-        default = "";
+        default = false;
         example = "true";
         description = "Whether to enable palm detection (hardware support required)";
       };
-- 
GitLab


From 609a02906e76be797b7cb4562aa7a14c7a483f65 Mon Sep 17 00:00:00 2001
From: Arie Middelkoop <amiddelk@gmail.com>
Date: Sat, 14 Jan 2012 12:24:41 +0000
Subject: [PATCH 3328/5331] Another type error fix ("The example shouldn't be a
 string either").

svn path=/nixos/trunk/; revision=31538
---
 modules/services/x11/hardware/synaptics.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/services/x11/hardware/synaptics.nix b/modules/services/x11/hardware/synaptics.nix
index a2087f24e45..4c5161c1b30 100644
--- a/modules/services/x11/hardware/synaptics.nix
+++ b/modules/services/x11/hardware/synaptics.nix
@@ -48,13 +48,13 @@ let cfg = config.services.xserver.synaptics; in
 
       tapButtons = mkOption {
         default = true;
-        example = "false";
+        example = false;
         description = "Whether to enable tap buttons.";
       };
 
       palmDetect = mkOption {
         default = false;
-        example = "true";
+        example = true;
         description = "Whether to enable palm detection (hardware support required)";
       };
 
-- 
GitLab


From 5d12152b1326214fb029418e43e8f04a632c6f9e Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 17 Jan 2012 18:15:20 +0000
Subject: [PATCH 3329/5331] * Enable xfce4-appfinder.

svn path=/nixos/trunk/; revision=31612
---
 modules/services/x11/desktop-managers/xfce.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/modules/services/x11/desktop-managers/xfce.nix b/modules/services/x11/desktop-managers/xfce.nix
index 25d3f4d11e1..e12d3bbd2af 100644
--- a/modules/services/x11/desktop-managers/xfce.nix
+++ b/modules/services/x11/desktop-managers/xfce.nix
@@ -76,6 +76,7 @@ in
         pkgs.xfce.garcon
         pkgs.xfce.thunar_volman
         pkgs.xfce.gvfs
+        pkgs.xfce.xfce4_appfinder
       ]
       ++ optional config.powerManagement.enable pkgs.xfce.xfce4_power_manager;
 
-- 
GitLab


From d4b6aa355368907da0dce82a74c1bb91b0d05442 Mon Sep 17 00:00:00 2001
From: Sander van der Burg <s.vanderburg@tudelft.nl>
Date: Wed, 18 Jan 2012 15:01:44 +0000
Subject: [PATCH 3330/5331] The MySQL upstart job does not monitor the mysqld
 process anymore. Instead it is shut down by mysqladmin tool in the postStop
 phase. Under high load, upstart may send a KILL signal to the mysql daemon,
 which may cause data corruption.

svn path=/nixos/trunk/; revision=31621
---
 modules/services/databases/mysql.nix | 130 +++++++++++++--------------
 1 file changed, 64 insertions(+), 66 deletions(-)

diff --git a/modules/services/databases/mysql.nix b/modules/services/databases/mysql.nix
index 65bf77611e0..b4060d0cfa3 100644
--- a/modules/services/databases/mysql.nix
+++ b/modules/services/databases/mysql.nix
@@ -80,49 +80,49 @@ in
       initialDatabases = mkOption {
         default = [];
         description = "List of database names and their initial schemas that should be used to create databases on the first startup of MySQL";
-	example = [
-	  { name = "foodatabase"; schema = ./foodatabase.sql; }
-	  { name = "bardatabase"; schema = ./bardatabase.sql; }
-	];
+        example = [
+          { name = "foodatabase"; schema = ./foodatabase.sql; }
+          { name = "bardatabase"; schema = ./bardatabase.sql; }
+        ];
       };
 
       initialScript = mkOption {
         default = null;
-	description = "A file containing SQL statements to be executed on the first startup. Can be used for granting certain permissions on the database";
+        description = "A file containing SQL statements to be executed on the first startup. Can be used for granting certain permissions on the database";
       };
 
       rootPassword = mkOption {
         default = null;
-	description = "Path to a file containing the root password, modified on the first startup. Not specifying a root password will leave the root password empty.";
+        description = "Path to a file containing the root password, modified on the first startup. Not specifying a root password will leave the root password empty.";
       };
 
       replication = {
         role = mkOption {
-	  default = "none";
-	  description = "Role of the MySQL server instance. Can be either: master, slave or none";
-	};
+          default = "none";
+          description = "Role of the MySQL server instance. Can be either: master, slave or none";
+        };
 
         serverId = mkOption {
-	  default = 1;
-	  description = "Id of the MySQL server instance. This number must be unique for each instance";
-	};
-
-	masterHost = mkOption {
-	  description = "Hostname of the MySQL master server";
-	};
-
-	masterUser = mkOption {
-	  description = "Username of the MySQL replication user";
-	};
-
-	masterPassword = mkOption {
-	  description = "Password of the MySQL replication user";
-	};
-
-	masterPort = mkOption {
-	  default = 3306;
-	  description = "Port number on which the MySQL master server runs";
-	};
+          default = 1;
+          description = "Id of the MySQL server instance. This number must be unique for each instance";
+        };
+
+        masterHost = mkOption {
+          description = "Hostname of the MySQL master server";
+        };
+
+        masterUser = mkOption {
+          description = "Username of the MySQL replication user";
+        };
+
+        masterPassword = mkOption {
+          description = "Password of the MySQL replication user";
+        };
+
+        masterPort = mkOption {
+          default = 3306;
+          description = "Port number on which the MySQL master server runs";
+        };
       };
     };
 
@@ -151,17 +151,14 @@ in
                 mkdir -m 0700 -p ${cfg.dataDir}
                 chown -R ${cfg.user} ${cfg.dataDir}
                 ${mysql}/bin/mysql_install_db ${mysqldOptions}
-		touch /tmp/mysql_init
+                touch /tmp/mysql_init
             fi
 
             mkdir -m 0700 -p ${cfg.pidDir}
             chown -R ${cfg.user} ${cfg.pidDir}
-          '';
-
-        exec = "${mysql}/libexec/mysqld --defaults-extra-file=${myCnf} ${mysqldOptions}";
+            
+            ${mysql}/libexec/mysqld --defaults-extra-file=${myCnf} ${mysqldOptions} &
 
-	postStart =
-	  ''
             # Wait until the MySQL server is available for use
             count=0
             while [ ! -e /tmp/mysql.sock ]
@@ -169,7 +166,7 @@ in
                 if [ $count -eq 30 ]
                 then
                     echo "Tried 30 times, giving up..."
-	            exit 1
+                    exit 1
                 fi
 
                 echo "MySQL daemon not yet started. Waiting for 1 second..."
@@ -177,48 +174,49 @@ in
                 sleep 1
             done
 
-	    if [ -f /tmp/mysql_init ]
-	    then
-	        # Create initial databases
-
+            if [ -f /tmp/mysql_init ]
+            then
                 ${concatMapStrings (database:
                   ''
+                    # Create initial databases
                     if ! test -e "${cfg.dataDir}/${database.name}"; then
                         echo "Creating initial database: ${database.name}"
                         ( echo "create database ${database.name};"
                           echo "use ${database.name};"
-		          if [ -f "${database.schema}" ]
-		          then
+                          
+                          if [ -f "${database.schema}" ]
+                          then
                               cat ${database.schema}
-		          elif [ -d "${database.schema}" ]
-		          then
-		              cat ${database.schema}/mysql-databases/*.sql
-		          fi
-		        ) | ${mysql}/bin/mysql -u root -N
+                          elif [ -d "${database.schema}" ]
+                          then
+                              cat ${database.schema}/mysql-databases/*.sql
+                          fi
+                        ) | ${mysql}/bin/mysql -u root -N
                     fi
                   '') cfg.initialDatabases}
 
-	        # Execute initial script
-
-		${optionalString (cfg.initialScript != null)
-		  ''
-		    cat ${cfg.initialScript} | ${mysql}/bin/mysql -u root -N
-		  ''}
-
-	        # Change root password
-
-		${optionalString (cfg.rootPassword != null)
-		  ''
-		    ( echo "use mysql;"
-		      echo "update user set Password=password('$(cat ${cfg.rootPassword})') where User='root';"
-		      echo "flush privileges;"
-		    ) | ${mysql}/bin/mysql -u root -N
-		  ''}
+                ${optionalString (cfg.initialScript != null)
+                  ''
+                    # Execute initial script
+                    cat ${cfg.initialScript} | ${mysql}/bin/mysql -u root -N
+                  ''}
 
-	      rm /tmp/mysql_init
-	    fi
-	  '';
+                ${optionalString (cfg.rootPassword != null)
+                  ''
+                    # Change root password
+                    
+                    ( echo "use mysql;"
+                      echo "update user set Password=password('$(cat ${cfg.rootPassword})') where User='root';"
+                      echo "flush privileges;"
+                    ) | ${mysql}/bin/mysql -u root -N
+                  ''}
+
+              rm /tmp/mysql_init
+            fi
+          '';
 
+        postStop = "${mysql}/bin/mysqladmin --user=root --password=\"$(cat ${cfg.rootPassword})\" shutdown";
+        
         # !!! Need a postStart script to wait until mysqld is ready to
         # accept connections.
 
-- 
GitLab


From 1e59a18f90219e23983f7c01385dc33ce8e96653 Mon Sep 17 00:00:00 2001
From: Sander van der Burg <s.vanderburg@tudelft.nl>
Date: Wed, 18 Jan 2012 15:21:11 +0000
Subject: [PATCH 3331/5331] Only use mysqladmin authentication if we have
 supplied a root password

svn path=/nixos/trunk/; revision=31632
---
 modules/services/databases/mysql.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/services/databases/mysql.nix b/modules/services/databases/mysql.nix
index b4060d0cfa3..2c35c13255e 100644
--- a/modules/services/databases/mysql.nix
+++ b/modules/services/databases/mysql.nix
@@ -215,7 +215,7 @@ in
             fi
           '';
 
-        postStop = "${mysql}/bin/mysqladmin --user=root --password=\"$(cat ${cfg.rootPassword})\" shutdown";
+        postStop = "${mysql}/bin/mysqladmin ${optionalString (cfg.rootPassword != null) "--user=root --password=\"$(cat ${cfg.rootPassword})\""} shutdown";
         
         # !!! Need a postStart script to wait until mysqld is ready to
         # accept connections.
-- 
GitLab


From 5144e946943862348b0900739b1a16c0689cd2d4 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 18 Jan 2012 20:34:04 +0000
Subject: [PATCH 3332/5331] gw6c: fixed faulty path reference

svn path=/nixos/trunk/; revision=31657
---
 modules/services/networking/gw6c/control.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/services/networking/gw6c/control.in b/modules/services/networking/gw6c/control.in
index 0b533232708..24b868eb5c8 100644
--- a/modules/services/networking/gw6c/control.in
+++ b/modules/services/networking/gw6c/control.in
@@ -23,7 +23,7 @@ ln -s /dev/net/tun /dev/tun || true;
 if test "$1" = "start"; then
 	trap 'stop ; exit ' 15
 
-	if test -n "@pingBefore@"; then while ! @iputils@/bin/ping @gw6server@ -c1 -w1 ; do sleep 1; done; fi
+	if test -n "@pingBefore@"; then while ! @iputils@/sbin/ping @gw6server@ -c1 -w1 ; do sleep 1; done; fi
     cd /tmp/.gw6c
         @coreutils@/bin/yes |       \
     env - HOME=/tmp/.gw6c $extraEnv \
-- 
GitLab


From ec445fbee7f10401c2868f05f981bbd2bf7f2024 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 18 Jan 2012 20:34:07 +0000
Subject: [PATCH 3333/5331] mongodb nixos module

svn path=/nixos/trunk/; revision=31658
---
 modules/module-list.nix                |   1 +
 modules/services/databases/mongodb.nix | 119 +++++++++++++++++++++++++
 2 files changed, 120 insertions(+)
 create mode 100644 modules/services/databases/mongodb.nix

diff --git a/modules/module-list.nix b/modules/module-list.nix
index 398a902b638..553a34218b5 100644
--- a/modules/module-list.nix
+++ b/modules/module-list.nix
@@ -60,6 +60,7 @@
   ./services/backup/sitecopy-backup.nix
   ./services/databases/4store-endpoint.nix
   ./services/databases/4store.nix
+  ./services/databases/mongodb.nix
   ./services/databases/mysql.nix
   ./services/databases/openldap.nix
   ./services/databases/postgresql.nix
diff --git a/modules/services/databases/mongodb.nix b/modules/services/databases/mongodb.nix
new file mode 100644
index 00000000000..cf8caabfc8a
--- /dev/null
+++ b/modules/services/databases/mongodb.nix
@@ -0,0 +1,119 @@
+{ config, pkgs, ... }:
+
+with pkgs.lib;
+
+let
+
+  b2s = x: if x then "true" else "false";
+
+  cfg = config.services.mongodb;
+
+  mongodb = cfg.package;
+
+  mongoCnf = pkgs.writeText "mongodb.conf"
+  ''
+    bind_ip = ${cfg.bind_ip}
+    ${optionalString cfg.quiet "quiet = true"}
+    dbpath = ${cfg.dbpath}
+    logpath = ${cfg.logpath}
+    logappend = ${b2s cfg.logappend}
+  '';
+
+in
+
+{
+
+  ###### interface
+
+  options = {
+
+    services.mongodb = {
+
+      enable = mkOption {
+        default = false;
+        description = "
+          Whether to enable the MongoDB server.
+        ";
+      };
+
+      package = mkOption {
+        default = pkgs.mongodb.override { useV8 = cfg.useV8; };
+        description = "
+          Which MongoDB derivation to use.
+        ";
+      };
+
+      user = mkOption {
+        default = "mongodb";
+        description = "User account under which MongoDB runs";
+      };
+
+      bind_ip = mkOption {
+        default = "127.0.0.1";
+        description = "IP to bind to";
+      };
+
+      quiet = mkOption {
+        default = false;
+        description = "quieter output";
+      };
+
+      dbpath = mkOption {
+        default = "/var/db/mongodb";
+        description = "Location where MongoDB stores its files";
+      };
+
+      logpath = mkOption {
+        default = "/var/log/mongodb/mongod.log";
+        description = "Location where MongoDB stores its logfile";
+      };
+
+      logappend = mkOption {
+        default = true;
+        description = "Append logfile instead over overwriting";
+      };
+
+      useV8 = mkOption {
+        default = false;
+        description = "Use V8 instead of spidermonkey for js execution";
+      };
+    };
+
+  };
+
+
+  ###### implementation
+
+  config = mkIf config.services.mongodb.enable {
+
+    users.extraUsers = singleton
+      { name = cfg.user;
+        shell = "/bin/sh";
+        description = "MongoDB server user";
+      };
+
+    environment.systemPackages = [mongodb];
+
+    jobs.mongodb =
+      { description = "MongoDB server";
+
+        startOn = "filesystem";
+        daemonType = "daemon";
+
+        preStart =
+          ''
+            if ! test -e ${cfg.dbpath}; then
+                install -d -m0700 -o ${cfg.user} ${cfg.dbpath}
+                install -d -m0755 -o ${cfg.user} `dirname ${cfg.logpath}`
+            fi
+          '';
+
+        exec = "${pkgs.shadow}/bin/su ${cfg.user} -c \"${mongodb}/bin/mongod --config ${mongoCnf} --fork\"";
+        preStop = "${pkgs.shadow}/bin/su ${cfg.user} -c \"${mongodb}/bin/mongod --config ${mongoCnf} --shutdown\" &";
+
+        extraConfig = "kill timeout 10";
+      };
+
+  };
+
+}
-- 
GitLab


From 9a09051f4b6238c1b0cc4d1009b680d316605cb8 Mon Sep 17 00:00:00 2001
From: Sander van der Burg <s.vanderburg@tudelft.nl>
Date: Fri, 20 Jan 2012 10:43:18 +0000
Subject: [PATCH 3334/5331] Added MySQL 5.5 NixOS service

svn path=/nixos/trunk/; revision=31732
---
 modules/module-list.nix                |   1 +
 modules/services/databases/mysql55.nix | 231 +++++++++++++++++++++++++
 2 files changed, 232 insertions(+)
 create mode 100644 modules/services/databases/mysql55.nix

diff --git a/modules/module-list.nix b/modules/module-list.nix
index 553a34218b5..182bc6688f7 100644
--- a/modules/module-list.nix
+++ b/modules/module-list.nix
@@ -62,6 +62,7 @@
   ./services/databases/4store.nix
   ./services/databases/mongodb.nix
   ./services/databases/mysql.nix
+  ./services/databases/mysql55.nix
   ./services/databases/openldap.nix
   ./services/databases/postgresql.nix
   ./services/databases/virtuoso.nix
diff --git a/modules/services/databases/mysql55.nix b/modules/services/databases/mysql55.nix
new file mode 100644
index 00000000000..a37f1d38831
--- /dev/null
+++ b/modules/services/databases/mysql55.nix
@@ -0,0 +1,231 @@
+{ config, pkgs, ... }:
+
+with pkgs.lib;
+
+let
+
+  cfg = config.services.mysql55;
+
+  mysql = cfg.package;
+
+  pidFile = "${cfg.pidDir}/mysqld.pid";
+
+  mysqldOptions =
+    "--user=${cfg.user} --datadir=${cfg.dataDir} " +
+    "--log-error=${cfg.logError} --pid-file=${pidFile}";
+
+  myCnf = pkgs.writeText "my.cnf"
+  ''
+    [mysqld]
+    ${optionalString (cfg.replication.role == "master" || cfg.replication.role == "slave") "log-bin=mysql-bin"}
+    ${optionalString (cfg.replication.role == "master" || cfg.replication.role == "slave") "server-id = ${toString cfg.replication.serverId}"}
+  '';
+
+in
+
+{
+
+  ###### interface
+
+  options = {
+
+    services.mysql55 = {
+
+      enable = mkOption {
+        default = false;
+        description = "
+          Whether to enable the MySQL server.
+        ";
+      };
+
+      package = mkOption {
+        default = pkgs.mysql55;
+        description = "
+          Which MySQL derivation to use.
+        ";
+      };
+
+      port = mkOption {
+        default = "3306";
+        description = "Port of MySQL";
+      };
+
+      user = mkOption {
+        default = "mysql";
+        description = "User account under which MySQL runs";
+      };
+
+      dataDir = mkOption {
+        default = "/var/mysql"; # !!! should be /var/db/mysql
+        description = "Location where MySQL stores its table files";
+      };
+
+      logError = mkOption {
+        default = "/var/log/mysql_err.log";
+        description = "Location of the MySQL error logfile";
+      };
+
+      pidDir = mkOption {
+        default = "/var/run/mysql";
+        description = "Location of the file which stores the PID of the MySQL server";
+      };
+
+      initialDatabases = mkOption {
+        default = [];
+        description = "List of database names and their initial schemas that should be used to create databases on the first startup of MySQL";
+        example = [
+          { name = "foodatabase"; schema = ./foodatabase.sql; }
+          { name = "bardatabase"; schema = ./bardatabase.sql; }
+        ];
+      };
+
+      initialScript = mkOption {
+        default = null;
+        description = "A file containing SQL statements to be executed on the first startup. Can be used for granting certain permissions on the database";
+      };
+
+      rootPassword = mkOption {
+        default = null;
+        description = "Path to a file containing the root password, modified on the first startup. Not specifying a root password will leave the root password empty.";
+      };
+
+      replication = {
+        role = mkOption {
+          default = "none";
+          description = "Role of the MySQL server instance. Can be either: master, slave or none";
+        };
+
+        serverId = mkOption {
+          default = 1;
+          description = "Id of the MySQL server instance. This number must be unique for each instance";
+        };
+
+        masterHost = mkOption {
+          description = "Hostname of the MySQL master server";
+        };
+
+        masterUser = mkOption {
+          description = "Username of the MySQL replication user";
+        };
+
+        masterPassword = mkOption {
+          description = "Password of the MySQL replication user";
+        };
+
+        masterPort = mkOption {
+          default = 3306;
+          description = "Port number on which the MySQL master server runs";
+        };
+      };
+    };
+
+  };
+
+
+  ###### implementation
+
+  config = mkIf config.services.mysql55.enable {
+
+    users.extraUsers = singleton
+      { name = "mysql";
+        description = "MySQL server user";
+      };
+
+    environment.systemPackages = [mysql];
+
+    jobs.mysql =
+      { description = "MySQL server";
+
+        startOn = "filesystem";
+
+        preStart =
+          ''
+            if ! test -e ${cfg.dataDir}/mysql; then
+                mkdir -m 0700 -p ${cfg.dataDir}
+                chown -R ${cfg.user} ${cfg.dataDir}
+                ${mysql}/bin/mysql_install_db ${mysqldOptions}
+                touch /tmp/mysql_init
+            fi
+
+            mkdir -m 0700 -p ${cfg.pidDir}
+            chown -R ${cfg.user} ${cfg.pidDir}
+            
+            ${mysql}/bin/mysqld --defaults-extra-file=${myCnf} ${mysqldOptions} &
+
+            # Wait until the MySQL server is available for use
+            count=0
+            while [ ! -e /tmp/mysql.sock ]
+            do
+                if [ $count -eq 30 ]
+                then
+                    echo "Tried 30 times, giving up..."
+                    exit 1
+                fi
+
+                echo "MySQL daemon not yet started. Waiting for 1 second..."
+                count=$((count++))
+                sleep 1
+            done
+
+            if [ -f /tmp/mysql_init ]
+            then
+                ${concatMapStrings (database:
+                  ''
+                    # Create initial databases
+                    if ! test -e "${cfg.dataDir}/${database.name}"; then
+                        echo "Creating initial database: ${database.name}"
+                        ( echo "create database ${database.name};"
+                          echo "use ${database.name};"
+                          
+                          if [ -f "${database.schema}" ]
+                          then
+                              cat ${database.schema}
+                          elif [ -d "${database.schema}" ]
+                          then
+                              cat ${database.schema}/mysql-databases/*.sql
+                          fi
+                        ) | ${mysql}/bin/mysql -u root -N
+                    fi
+                  '') cfg.initialDatabases}
+                
+                ${optionalString (cfg.replication.role == "slave")
+                  ''
+                    # Set up the replication master
+                    
+                    ( echo "stop slave;"
+                      echo "change master to master_host='${cfg.replication.masterHost}', master_user='${cfg.replication.masterUser}', master_password='${cfg.replication.masterPassword}';"
+                      echo "start slave;"
+                    ) | ${mysql}/bin/mysql -u root -N
+                  ''}
+
+                ${optionalString (cfg.initialScript != null)
+                  ''
+                    # Execute initial script
+                    cat ${cfg.initialScript} | ${mysql}/bin/mysql -u root -N
+                  ''}
+
+                ${optionalString (cfg.rootPassword != null)
+                  ''
+                    # Change root password
+                    
+                    ( echo "use mysql;"
+                      echo "update user set Password=password('$(cat ${cfg.rootPassword})') where User='root';"
+                      echo "flush privileges;"
+                    ) | ${mysql}/bin/mysql -u root -N
+                  ''}
+
+              rm /tmp/mysql_init
+            fi
+          '';
+
+        postStop = "${mysql}/bin/mysqladmin ${optionalString (cfg.rootPassword != null) "--user=root --password=\"$(cat ${cfg.rootPassword})\""} shutdown";
+        
+        # !!! Need a postStart script to wait until mysqld is ready to
+        # accept connections.
+
+        extraConfig = "kill timeout 60";
+      };
+
+  };
+
+}
-- 
GitLab


From aca8225e3b3e5a9d4ca2dc4a66ef6b4ce723d214 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sat, 21 Jan 2012 19:13:43 +0000
Subject: [PATCH 3335/5331] * Invalidate the nscd hosts cache when an "ip-up"
 event occurs.  This   event is emitted by dhclient and by the
 network-interfaces job in   case of statically configured interfaces. 
 Invalidating the cache is   necessary to get rid of negative queries.

svn path=/nixos/trunk/; revision=31779
---
 modules/services/networking/dhclient.nix |  2 --
 modules/services/system/nscd.nix         | 10 ++++++++++
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/modules/services/networking/dhclient.nix b/modules/services/networking/dhclient.nix
index 38454d421b1..5d82854fef5 100644
--- a/modules/services/networking/dhclient.nix
+++ b/modules/services/networking/dhclient.nix
@@ -20,8 +20,6 @@ let
       #echo "$exit_status" >> /tmp/dhcp-exit
 
       if test "$reason" = BOUND -o "$reason" = REBOOT; then
-          ${pkgs.glibc}/sbin/nscd --invalidate hosts
-
           # Restart ntpd.  (The "ip-up" event below will trigger the
           # restart.)  We need to restart it to make sure that it will
           # actually do something: if ntpd cannot resolve the server
diff --git a/modules/services/system/nscd.nix b/modules/services/system/nscd.nix
index 22d6e38a74b..3f6ef510f5c 100644
--- a/modules/services/system/nscd.nix
+++ b/modules/services/system/nscd.nix
@@ -57,5 +57,15 @@ in
         exec = "nscd -f ${./nscd.conf} -d 2> /dev/null";
       };
 
+    # Flush nscd's ‘hosts’ database when the network comes up to get
+    # rid of any negative entries.
+    jobs.invalidate_nscd =
+      { name = "invalidate-nscd";
+        description = "Invalidate NSCD cache";
+        startOn = "ip-up";
+        task = true;
+        exec = "${pkgs.glibc}/sbin/nscd --invalidate hosts";
+      };
+
   };
 }
-- 
GitLab


From fa344f60d9e51f134adca1e62aeff78d40592885 Mon Sep 17 00:00:00 2001
From: Florian Friesdorf <flo@chaoflow.net>
Date: Mon, 23 Jan 2012 17:14:24 +0000
Subject: [PATCH 3336/5331] pathsToLink: emacs org mode contrib folder

svn path=/nixos/trunk/; revision=31795
---
 modules/config/system-path.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/modules/config/system-path.nix b/modules/config/system-path.nix
index b8fcf960209..007b935d777 100644
--- a/modules/config/system-path.nix
+++ b/modules/config/system-path.nix
@@ -131,6 +131,7 @@ in
     "/man"
     "/sbin"
     "/share/emacs"
+    "/share/org"
     "/share/info"
     "/share/terminfo"
     "/share/man"
-- 
GitLab


From b11a33717fc98fffa1f4cf401d036cf8a3a98f45 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 26 Jan 2012 13:32:02 +0000
Subject: [PATCH 3337/5331] * zabbix-server: don't require PostgreSQL to be
 started   if we're using a remote server.

svn path=/nixos/trunk/; revision=31852
---
 modules/services/monitoring/zabbix-server.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/services/monitoring/zabbix-server.nix b/modules/services/monitoring/zabbix-server.nix
index b5af5a2e7bb..f59558e86dd 100644
--- a/modules/services/monitoring/zabbix-server.nix
+++ b/modules/services/monitoring/zabbix-server.nix
@@ -76,8 +76,8 @@ in
 
         description = "Zabbix server daemon";
 
-        startOn = "started postgresql";
-        stopOn = "stopping postgresql";
+        startOn = if cfg.dbServer == "localhost" then "started postgresql" else "filesystem";
+        stopOn = if cfg.dbServer == "localhost" then "stopping postgresql" else "starting shutdown";
 
         preStart =
           ''
-- 
GitLab


From 5363c8b8ae8f42961a388bda97531b68ccb6cb51 Mon Sep 17 00:00:00 2001
From: Sander van der Burg <s.vanderburg@tudelft.nl>
Date: Mon, 6 Feb 2012 13:03:56 +0000
Subject: [PATCH 3338/5331] Remove ugly pkgs.tomcat6 references

svn path=/nixos/trunk/; revision=32049
---
 modules/services/web-servers/tomcat.nix | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/modules/services/web-servers/tomcat.nix b/modules/services/web-servers/tomcat.nix
index 078877b15bc..f5f55229702 100644
--- a/modules/services/web-servers/tomcat.nix
+++ b/modules/services/web-servers/tomcat.nix
@@ -5,7 +5,7 @@ with pkgs.lib;
 let
 
   cfg = config.services.tomcat;
-
+  tomcat = pkgs.tomcat6;
 in
 
 {
@@ -63,7 +63,7 @@ in
       };
 
       webapps = mkOption {
-        default = [ pkgs.tomcat6 ];
+        default = [ tomcat ];
         description = "List containing WAR files or directories with WAR files which are web applications to be deployed on Tomcat";
       };
 
@@ -127,16 +127,16 @@ in
 	    mkdir -p ${cfg.baseDir}
 
 	    # Create a symlink to the bin directory of the tomcat component
-	    ln -sfn ${pkgs.tomcat6}/bin ${cfg.baseDir}/bin
+	    ln -sfn ${tomcat}/bin ${cfg.baseDir}/bin
 
 	    # Create a conf/ directory
 	    mkdir -p ${cfg.baseDir}/conf
 	    chown ${cfg.user}:${cfg.group} ${cfg.baseDir}/conf
 
 	    # Symlink the config files in the conf/ directory (except for catalina.properties and server.xml)
-	    for i in $(ls ${pkgs.tomcat6}/conf | grep -v catalina.properties | grep -v server.xml)
+	    for i in $(ls ${tomcat}/conf | grep -v catalina.properties | grep -v server.xml)
 	    do
-	        ln -sfn ${pkgs.tomcat6}/conf/$i ${cfg.baseDir}/conf/`basename $i`
+	        ln -sfn ${tomcat}/conf/$i ${cfg.baseDir}/conf/`basename $i`
 	    done
 
             # Create subdirectory for virtual hosts
@@ -146,12 +146,12 @@ in
 	    # Change all references from CATALINA_HOME to CATALINA_BASE and add support for shared libraries
 	    sed -e 's|''${catalina.home}|''${catalina.base}|g' \
                 -e 's|shared.loader=|shared.loader=''${catalina.base}/shared/lib/*.jar|' \
-		${pkgs.tomcat6}/conf/catalina.properties > ${cfg.baseDir}/conf/catalina.properties
+		${tomcat}/conf/catalina.properties > ${cfg.baseDir}/conf/catalina.properties
 
 	    # Create a modified server.xml which also includes all virtual hosts
 	    sed -e "/<Engine name=\"Catalina\" defaultHost=\"localhost\">/a\  ${
                          toString (map (virtualHost: ''<Host name=\"${virtualHost.name}\" appBase=\"virtualhosts/${virtualHost.name}/webapps\" unpackWARs=\"true\" autoDeploy=\"true\" xmlValidation=\"false\" xmlNamespaceAware=\"false\" >${if cfg.logPerVirtualHost then ''<Valve className=\"org.apache.catalina.valves.AccessLogValve\" directory=\"logs/${virtualHost.name}\"  prefix=\"${virtualHost.name}_access_log.\" pattern=\"combined\" resolveHosts=\"false\"/>'' else ""}</Host>'') cfg.virtualHosts)}" \
-	        ${pkgs.tomcat6}/conf/server.xml > ${cfg.baseDir}/conf/server.xml
+	        ${tomcat}/conf/server.xml > ${cfg.baseDir}/conf/server.xml
 
 	    # Create a logs/ directory
 	    mkdir -p ${cfg.baseDir}/logs
@@ -179,7 +179,7 @@ in
 	    chown ${cfg.user}:${cfg.group} ${cfg.baseDir}/webapps
 
 	    # Symlink all the given common libs files or paths into the lib/ directory
-	    for i in ${pkgs.tomcat6} ${toString cfg.commonLibs}
+	    for i in ${tomcat} ${toString cfg.commonLibs}
 	    do
 		if [ -f $i ]
 		then
@@ -330,13 +330,13 @@ in
 		''
 	    else ""}
 
-            ${pkgs.su}/bin/su -s ${pkgs.bash}/bin/sh ${cfg.user} -c 'CATALINA_BASE=${cfg.baseDir} JAVA_HOME=${pkgs.jdk} JAVA_OPTS="${cfg.javaOpts}" CATALINA_OPTS="${cfg.catalinaOpts}" ${pkgs.tomcat6}/bin/startup.sh'
+            ${pkgs.su}/bin/su -s ${pkgs.bash}/bin/sh ${cfg.user} -c 'CATALINA_BASE=${cfg.baseDir} JAVA_HOME=${pkgs.jdk} JAVA_OPTS="${cfg.javaOpts}" CATALINA_OPTS="${cfg.catalinaOpts}" ${tomcat}/bin/startup.sh'
           '';
 
         postStop =
           ''
             echo "Stopping tomcat..."
-            CATALINA_BASE=${cfg.baseDir} JAVA_HOME=${pkgs.jdk} ${pkgs.su}/bin/su -s ${pkgs.bash}/bin/sh ${cfg.user} -c ${pkgs.tomcat6}/bin/shutdown.sh
+            CATALINA_BASE=${cfg.baseDir} JAVA_HOME=${pkgs.jdk} ${pkgs.su}/bin/su -s ${pkgs.bash}/bin/sh ${cfg.user} -c ${tomcat}/bin/shutdown.sh
           '';
 
       };
-- 
GitLab


From 82ca072c234104174e2dfbee7b924c44e222dad3 Mon Sep 17 00:00:00 2001
From: Sander van der Burg <s.vanderburg@tudelft.nl>
Date: Mon, 6 Feb 2012 13:11:48 +0000
Subject: [PATCH 3339/5331] Added extraWorkersProperties parameter, so that
 custom tweaks can be added

svn path=/nixos/trunk/; revision=32050
---
 .../services/web-servers/apache-httpd/tomcat-connector.nix    | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/modules/services/web-servers/apache-httpd/tomcat-connector.nix b/modules/services/web-servers/apache-httpd/tomcat-connector.nix
index f815eeb290c..f12ae842b58 100644
--- a/modules/services/web-servers/apache-httpd/tomcat-connector.nix
+++ b/modules/services/web-servers/apache-httpd/tomcat-connector.nix
@@ -1,6 +1,8 @@
 { config, pkgs, serverInfo, ... }:
 
 let
+  extraWorkersProperties = pkgs.lib.optionalString (config ? extraWorkersProperties) config.extraWorkersProperties;
+  
   workersProperties = pkgs.writeText "workers.properties" ''
 # Define list of workers that will be used
 # for mapping requests
@@ -22,6 +24,8 @@ worker.loadbalancer.balance_workers=node1
 
 # Status worker for managing load balancer
 worker.status.type=status
+
+${extraWorkersProperties}
   '';
 in
 {
-- 
GitLab


From 4249f803adc71a7800ccc9722200df08d2da0414 Mon Sep 17 00:00:00 2001
From: Sander van der Burg <s.vanderburg@tudelft.nl>
Date: Mon, 6 Feb 2012 14:04:15 +0000
Subject: [PATCH 3340/5331] Removed some tabs

svn path=/nixos/trunk/; revision=32051
---
 modules/services/web-servers/tomcat.nix | 382 ++++++++++++------------
 1 file changed, 191 insertions(+), 191 deletions(-)

diff --git a/modules/services/web-servers/tomcat.nix b/modules/services/web-servers/tomcat.nix
index f5f55229702..b836b8c5f7d 100644
--- a/modules/services/web-servers/tomcat.nix
+++ b/modules/services/web-servers/tomcat.nix
@@ -28,8 +28,8 @@ in
 
       extraGroups = mkOption {
         default = [];
-	example = [ "users" ];
-	description = "Defines extra groups to which the tomcat user belongs.";
+        example = [ "users" ];
+        description = "Defines extra groups to which the tomcat user belongs.";
       };
 
       user = mkOption {
@@ -110,7 +110,7 @@ in
         uid = config.ids.uids.tomcat;
         description = "Tomcat user";
         home = "/homeless-shelter";
-	extraGroups = cfg.extraGroups;
+        extraGroups = cfg.extraGroups;
       };
 
     jobs.tomcat =
@@ -123,212 +123,212 @@ in
 
         preStart =
           ''
-	    # Create the base directory
-	    mkdir -p ${cfg.baseDir}
+            # Create the base directory
+            mkdir -p ${cfg.baseDir}
 
-	    # Create a symlink to the bin directory of the tomcat component
-	    ln -sfn ${tomcat}/bin ${cfg.baseDir}/bin
+            # Create a symlink to the bin directory of the tomcat component
+            ln -sfn ${tomcat}/bin ${cfg.baseDir}/bin
 
-	    # Create a conf/ directory
-	    mkdir -p ${cfg.baseDir}/conf
-	    chown ${cfg.user}:${cfg.group} ${cfg.baseDir}/conf
+            # Create a conf/ directory
+            mkdir -p ${cfg.baseDir}/conf
+            chown ${cfg.user}:${cfg.group} ${cfg.baseDir}/conf
 
-	    # Symlink the config files in the conf/ directory (except for catalina.properties and server.xml)
-	    for i in $(ls ${tomcat}/conf | grep -v catalina.properties | grep -v server.xml)
-	    do
-	        ln -sfn ${tomcat}/conf/$i ${cfg.baseDir}/conf/`basename $i`
-	    done
+            # Symlink the config files in the conf/ directory (except for catalina.properties and server.xml)
+            for i in $(ls ${tomcat}/conf | grep -v catalina.properties | grep -v server.xml)
+            do
+                ln -sfn ${tomcat}/conf/$i ${cfg.baseDir}/conf/`basename $i`
+            done
 
             # Create subdirectory for virtual hosts
             mkdir -p ${cfg.baseDir}/virtualhosts
 
-	    # Create a modified catalina.properties file
-	    # Change all references from CATALINA_HOME to CATALINA_BASE and add support for shared libraries
-	    sed -e 's|''${catalina.home}|''${catalina.base}|g' \
+            # Create a modified catalina.properties file
+            # Change all references from CATALINA_HOME to CATALINA_BASE and add support for shared libraries
+            sed -e 's|''${catalina.home}|''${catalina.base}|g' \
                 -e 's|shared.loader=|shared.loader=''${catalina.base}/shared/lib/*.jar|' \
-		${tomcat}/conf/catalina.properties > ${cfg.baseDir}/conf/catalina.properties
+                ${tomcat}/conf/catalina.properties > ${cfg.baseDir}/conf/catalina.properties
 
-	    # Create a modified server.xml which also includes all virtual hosts
-	    sed -e "/<Engine name=\"Catalina\" defaultHost=\"localhost\">/a\  ${
+            # Create a modified server.xml which also includes all virtual hosts
+            sed -e "/<Engine name=\"Catalina\" defaultHost=\"localhost\">/a\  ${
                          toString (map (virtualHost: ''<Host name=\"${virtualHost.name}\" appBase=\"virtualhosts/${virtualHost.name}/webapps\" unpackWARs=\"true\" autoDeploy=\"true\" xmlValidation=\"false\" xmlNamespaceAware=\"false\" >${if cfg.logPerVirtualHost then ''<Valve className=\"org.apache.catalina.valves.AccessLogValve\" directory=\"logs/${virtualHost.name}\"  prefix=\"${virtualHost.name}_access_log.\" pattern=\"combined\" resolveHosts=\"false\"/>'' else ""}</Host>'') cfg.virtualHosts)}" \
-	        ${tomcat}/conf/server.xml > ${cfg.baseDir}/conf/server.xml
+                ${tomcat}/conf/server.xml > ${cfg.baseDir}/conf/server.xml
 
-	    # Create a logs/ directory
-	    mkdir -p ${cfg.baseDir}/logs
-	    chown ${cfg.user}:${cfg.group} ${cfg.baseDir}/logs
+            # Create a logs/ directory
+            mkdir -p ${cfg.baseDir}/logs
+            chown ${cfg.user}:${cfg.group} ${cfg.baseDir}/logs
             ${if cfg.logPerVirtualHost then
                toString (map (h: ''
                                     mkdir -p ${cfg.baseDir}/logs/${h.name}
                                     chown ${cfg.user}:${cfg.group} ${cfg.baseDir}/logs/${h.name}
                                  '') cfg.virtualHosts) else ''''}
 
-	    # Create a temp/ directory
-	    mkdir -p ${cfg.baseDir}/temp
-	    chown ${cfg.user}:${cfg.group} ${cfg.baseDir}/temp
-
-	    # Create a lib/ directory
-	    mkdir -p ${cfg.baseDir}/lib
-	    chown ${cfg.user}:${cfg.group} ${cfg.baseDir}/lib
-
-	    # Create a shared/lib directory
-	    mkdir -p ${cfg.baseDir}/shared/lib
-	    chown ${cfg.user}:${cfg.group} ${cfg.baseDir}/shared/lib
-
-	    # Create a webapps/ directory
-	    mkdir -p ${cfg.baseDir}/webapps
-	    chown ${cfg.user}:${cfg.group} ${cfg.baseDir}/webapps
-
-	    # Symlink all the given common libs files or paths into the lib/ directory
-	    for i in ${tomcat} ${toString cfg.commonLibs}
-	    do
-		if [ -f $i ]
-		then
-		    # If the given web application is a file, symlink it into the common/lib/ directory
-		    ln -sfn $i ${cfg.baseDir}/lib/`basename $i`
-		elif [ -d $i ]
-		then
-		    # If the given web application is a directory, then iterate over the files
-		    # in the special purpose directories and symlink them into the tomcat tree
-
-		    for j in $i/lib/*
-		    do
-			ln -sfn $j ${cfg.baseDir}/lib/`basename $j`
-		    done
-		fi
-	    done
-
-	    # Symlink all the given shared libs files or paths into the shared/lib/ directory
-	    for i in ${toString cfg.sharedLibs}
-	    do
-		if [ -f $i ]
-		then
-		    # If the given web application is a file, symlink it into the common/lib/ directory
-		    ln -sfn $i ${cfg.baseDir}/shared/lib/`basename $i`
-		elif [ -d $i ]
-		then
-		    # If the given web application is a directory, then iterate over the files
-		    # in the special purpose directories and symlink them into the tomcat tree
-
-		    for j in $i/shared/lib/*
-		    do
-			ln -sfn $j ${cfg.baseDir}/shared/lib/`basename $j`
-		    done
-		fi
-	    done
-
-	    # Symlink all the given web applications files or paths into the webapps/ directory
-	    for i in ${toString cfg.webapps}
-	    do
-		if [ -f $i ]
-		then
-		    # If the given web application is a file, symlink it into the webapps/ directory
-		    ln -sfn $i ${cfg.baseDir}/webapps/`basename $i`
-		elif [ -d $i ]
-		then
-		    # If the given web application is a directory, then iterate over the files
-		    # in the special purpose directories and symlink them into the tomcat tree
-
-		    for j in $i/webapps/*
-		    do
-		        ln -sfn $j ${cfg.baseDir}/webapps/`basename $j`
-		    done
-
-		    # Also symlink the configuration files if they are included
-		    if [ -d $i/conf/Catalina ]
-		    then
-			for j in $i/conf/Catalina/*
-			do
-			    mkdir -p ${cfg.baseDir}/conf/Catalina/localhost
-			    ln -sfn $j ${cfg.baseDir}/conf/Catalina/localhost/`basename $j`
-			done
-		    fi
-		fi
-	    done
-
-	    ${toString (map (virtualHost: ''
-	      # Create webapps directory for the virtual host
-	      mkdir -p ${cfg.baseDir}/virtualhosts/${virtualHost.name}/webapps
-
-	      # Modify ownership
-	      chown ${cfg.user}:${cfg.group} ${cfg.baseDir}/virtualhosts/${virtualHost.name}/webapps
-
-	      # Symlink all the given web applications files or paths into the webapps/ directory
-	      # of this virtual host
-	      for i in "${if virtualHost ? webapps then toString virtualHost.webapps else ""}"
-	      do
-		  if [ -f $i ]
-		  then
-		      # If the given web application is a file, symlink it into the webapps/ directory
-		      ln -sfn $i ${cfg.baseDir}/virtualhosts/${virtualHost.name}/webapps/`basename $i`
-		  elif [ -d $i ]
-		  then
-		      # If the given web application is a directory, then iterate over the files
-		      # in the special purpose directories and symlink them into the tomcat tree
-
-		      for j in $i/webapps/*
-		      do
-		          ln -sfn $j ${cfg.baseDir}/virtualhosts/${virtualHost.name}/webapps/`basename $j`
-		      done
-
-		      # Also symlink the configuration files if they are included
-		      if [ -d $i/conf/Catalina ]
-		      then
-			  for j in $i/conf/Catalina/*
-			  do
-			      mkdir -p ${cfg.baseDir}/conf/Catalina/${virtualHost.name}
-			      ln -sfn $j ${cfg.baseDir}/conf/Catalina/${virtualHost.name}/`basename $j`
-			  done
-		      fi
+            # Create a temp/ directory
+            mkdir -p ${cfg.baseDir}/temp
+            chown ${cfg.user}:${cfg.group} ${cfg.baseDir}/temp
+
+            # Create a lib/ directory
+            mkdir -p ${cfg.baseDir}/lib
+            chown ${cfg.user}:${cfg.group} ${cfg.baseDir}/lib
+
+            # Create a shared/lib directory
+            mkdir -p ${cfg.baseDir}/shared/lib
+            chown ${cfg.user}:${cfg.group} ${cfg.baseDir}/shared/lib
+
+            # Create a webapps/ directory
+            mkdir -p ${cfg.baseDir}/webapps
+            chown ${cfg.user}:${cfg.group} ${cfg.baseDir}/webapps
+
+            # Symlink all the given common libs files or paths into the lib/ directory
+            for i in ${tomcat} ${toString cfg.commonLibs}
+            do
+                if [ -f $i ]
+                then
+                    # If the given web application is a file, symlink it into the common/lib/ directory
+                    ln -sfn $i ${cfg.baseDir}/lib/`basename $i`
+                elif [ -d $i ]
+                then
+                    # If the given web application is a directory, then iterate over the files
+                    # in the special purpose directories and symlink them into the tomcat tree
+
+                    for j in $i/lib/*
+                    do
+                        ln -sfn $j ${cfg.baseDir}/lib/`basename $j`
+                    done
+                fi
+            done
+
+            # Symlink all the given shared libs files or paths into the shared/lib/ directory
+            for i in ${toString cfg.sharedLibs}
+            do
+                if [ -f $i ]
+                then
+                    # If the given web application is a file, symlink it into the common/lib/ directory
+                    ln -sfn $i ${cfg.baseDir}/shared/lib/`basename $i`
+                elif [ -d $i ]
+                then
+                    # If the given web application is a directory, then iterate over the files
+                    # in the special purpose directories and symlink them into the tomcat tree
+
+                    for j in $i/shared/lib/*
+                    do
+                        ln -sfn $j ${cfg.baseDir}/shared/lib/`basename $j`
+                    done
+                fi
+            done
+
+            # Symlink all the given web applications files or paths into the webapps/ directory
+            for i in ${toString cfg.webapps}
+            do
+                if [ -f $i ]
+                then
+                    # If the given web application is a file, symlink it into the webapps/ directory
+                    ln -sfn $i ${cfg.baseDir}/webapps/`basename $i`
+                elif [ -d $i ]
+                then
+                    # If the given web application is a directory, then iterate over the files
+                    # in the special purpose directories and symlink them into the tomcat tree
+
+                    for j in $i/webapps/*
+                    do
+                        ln -sfn $j ${cfg.baseDir}/webapps/`basename $j`
+                    done
+
+                    # Also symlink the configuration files if they are included
+                    if [ -d $i/conf/Catalina ]
+                    then
+                        for j in $i/conf/Catalina/*
+                        do
+                            mkdir -p ${cfg.baseDir}/conf/Catalina/localhost
+                            ln -sfn $j ${cfg.baseDir}/conf/Catalina/localhost/`basename $j`
+                        done
+                    fi
+                fi
+            done
+
+            ${toString (map (virtualHost: ''
+              # Create webapps directory for the virtual host
+              mkdir -p ${cfg.baseDir}/virtualhosts/${virtualHost.name}/webapps
+
+              # Modify ownership
+              chown ${cfg.user}:${cfg.group} ${cfg.baseDir}/virtualhosts/${virtualHost.name}/webapps
+
+              # Symlink all the given web applications files or paths into the webapps/ directory
+              # of this virtual host
+              for i in "${if virtualHost ? webapps then toString virtualHost.webapps else ""}"
+              do
+                  if [ -f $i ]
+                  then
+                      # If the given web application is a file, symlink it into the webapps/ directory
+                      ln -sfn $i ${cfg.baseDir}/virtualhosts/${virtualHost.name}/webapps/`basename $i`
+                  elif [ -d $i ]
+                  then
+                      # If the given web application is a directory, then iterate over the files
+                      # in the special purpose directories and symlink them into the tomcat tree
+
+                      for j in $i/webapps/*
+                      do
+                          ln -sfn $j ${cfg.baseDir}/virtualhosts/${virtualHost.name}/webapps/`basename $j`
+                      done
+
+                      # Also symlink the configuration files if they are included
+                      if [ -d $i/conf/Catalina ]
+                      then
+                          for j in $i/conf/Catalina/*
+                          do
+                              mkdir -p ${cfg.baseDir}/conf/Catalina/${virtualHost.name}
+                              ln -sfn $j ${cfg.baseDir}/conf/Catalina/${virtualHost.name}/`basename $j`
+                          done
+                      fi
                   fi
-	      done
-
-	      ''
-	    ) cfg.virtualHosts) }
-
-	    # Create a work/ directory
-	    mkdir -p ${cfg.baseDir}/work
-	    chown ${cfg.user}:${cfg.group} ${cfg.baseDir}/work
-
-	    ${if cfg.axis2.enable then
-		''
-		# Copy the Axis2 web application
-		cp -av ${pkgs.axis2}/webapps/axis2 ${cfg.baseDir}/webapps
-
-		# Turn off addressing, which causes many errors
-		sed -i -e 's%<module ref="addressing"/>%<!-- <module ref="addressing"/> -->%' ${cfg.baseDir}/webapps/axis2/WEB-INF/conf/axis2.xml
-
-		# Modify permissions on the Axis2 application
-		chown -R ${cfg.user}:${cfg.group} ${cfg.baseDir}/webapps/axis2
-
-		# Symlink all the given web service files or paths into the webapps/axis2/WEB-INF/services directory
-		for i in ${toString cfg.axis2.services}
-		do
-		    if [ -f $i ]
-		    then
-			# If the given web service is a file, symlink it into the webapps/axis2/WEB-INF/services
-			ln -sfn $i ${cfg.baseDir}/webapps/axis2/WEB-INF/services/`basename $i`
-		    elif [ -d $i ]
-		    then
-			# If the given web application is a directory, then iterate over the files
-		        # in the special purpose directories and symlink them into the tomcat tree
-
-			for j in $i/webapps/axis2/WEB-INF/services/*
-			do
-			    ln -sfn $j ${cfg.baseDir}/webapps/axis2/WEB-INF/services/`basename $j`
-			done
-
-			# Also symlink the configuration files if they are included
-		        if [ -d $i/conf/Catalina ]
-		        then
-			    for j in $i/conf/Catalina/*
-			    do
-			        ln -sfn $j ${cfg.baseDir}/conf/Catalina/localhost/`basename $j`
-			    done
-		        fi
-		    fi
-		done
-		''
-	    else ""}
+              done
+
+              ''
+            ) cfg.virtualHosts) }
+
+            # Create a work/ directory
+            mkdir -p ${cfg.baseDir}/work
+            chown ${cfg.user}:${cfg.group} ${cfg.baseDir}/work
+
+            ${if cfg.axis2.enable then
+                ''
+                # Copy the Axis2 web application
+                cp -av ${pkgs.axis2}/webapps/axis2 ${cfg.baseDir}/webapps
+
+                # Turn off addressing, which causes many errors
+                sed -i -e 's%<module ref="addressing"/>%<!-- <module ref="addressing"/> -->%' ${cfg.baseDir}/webapps/axis2/WEB-INF/conf/axis2.xml
+
+                # Modify permissions on the Axis2 application
+                chown -R ${cfg.user}:${cfg.group} ${cfg.baseDir}/webapps/axis2
+
+                # Symlink all the given web service files or paths into the webapps/axis2/WEB-INF/services directory
+                for i in ${toString cfg.axis2.services}
+                do
+                    if [ -f $i ]
+                    then
+                        # If the given web service is a file, symlink it into the webapps/axis2/WEB-INF/services
+                        ln -sfn $i ${cfg.baseDir}/webapps/axis2/WEB-INF/services/`basename $i`
+                    elif [ -d $i ]
+                    then
+                        # If the given web application is a directory, then iterate over the files
+                        # in the special purpose directories and symlink them into the tomcat tree
+
+                        for j in $i/webapps/axis2/WEB-INF/services/*
+                        do
+                            ln -sfn $j ${cfg.baseDir}/webapps/axis2/WEB-INF/services/`basename $j`
+                        done
+
+                        # Also symlink the configuration files if they are included
+                        if [ -d $i/conf/Catalina ]
+                        then
+                            for j in $i/conf/Catalina/*
+                            do
+                                ln -sfn $j ${cfg.baseDir}/conf/Catalina/localhost/`basename $j`
+                            done
+                        fi
+                    fi
+                done
+                ''
+            else ""}
 
             ${pkgs.su}/bin/su -s ${pkgs.bash}/bin/sh ${cfg.user} -c 'CATALINA_BASE=${cfg.baseDir} JAVA_HOME=${pkgs.jdk} JAVA_OPTS="${cfg.javaOpts}" CATALINA_OPTS="${cfg.catalinaOpts}" ${tomcat}/bin/startup.sh'
           '';
-- 
GitLab


From 4f7985a1bdcec064df08bcb7558512e8eb54a8ee Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 6 Feb 2012 19:14:33 +0000
Subject: [PATCH 3341/5331] mongodb: workaround for shutdown issues

svn path=/nixos/trunk/; revision=32083
---
 modules/services/databases/mongodb.nix | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/modules/services/databases/mongodb.nix b/modules/services/databases/mongodb.nix
index cf8caabfc8a..1c46424c14b 100644
--- a/modules/services/databases/mongodb.nix
+++ b/modules/services/databases/mongodb.nix
@@ -96,9 +96,10 @@ in
 
     jobs.mongodb =
       { description = "MongoDB server";
+        daemonType = "none";
+        respawn = false; # seems to interfere with normal stopping
 
         startOn = "filesystem";
-        daemonType = "daemon";
 
         preStart =
           ''
@@ -108,8 +109,8 @@ in
             fi
           '';
 
-        exec = "${pkgs.shadow}/bin/su ${cfg.user} -c \"${mongodb}/bin/mongod --config ${mongoCnf} --fork\"";
-        preStop = "${pkgs.shadow}/bin/su ${cfg.user} -c \"${mongodb}/bin/mongod --config ${mongoCnf} --shutdown\" &";
+        exec = "${pkgs.shadow}/bin/su ${cfg.user} -c \"${mongodb}/bin/mongod --config ${mongoCnf}\"";
+        preStop = "${pkgs.shadow}/bin/su ${cfg.user} -c \"${mongodb}/bin/mongod --config ${mongoCnf} --shutdown\"";
 
         extraConfig = "kill timeout 10";
       };
-- 
GitLab


From 49a3e57d4378f6a0e94b62a3b1e6b14d3853d124 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 6 Feb 2012 19:14:37 +0000
Subject: [PATCH 3342/5331] frandom: very fast kernel random number generator

svn path=/nixos/trunk/; revision=32084
---
 modules/module-list.nix               |  1 +
 modules/services/security/frandom.nix | 31 +++++++++++++++++++++++++++
 2 files changed, 32 insertions(+)
 create mode 100644 modules/services/security/frandom.nix

diff --git a/modules/module-list.nix b/modules/module-list.nix
index 182bc6688f7..2a4829f4186 100644
--- a/modules/module-list.nix
+++ b/modules/module-list.nix
@@ -149,6 +149,7 @@
   ./services/scheduling/atd.nix
   ./services/scheduling/cron.nix
   ./services/scheduling/fcron.nix
+  ./services/security/frandom.nix
   ./services/security/tor.nix
   ./services/security/torsocks.nix
   ./services/system/cgroups.nix
diff --git a/modules/services/security/frandom.nix b/modules/services/security/frandom.nix
new file mode 100644
index 00000000000..9aae7b33a43
--- /dev/null
+++ b/modules/services/security/frandom.nix
@@ -0,0 +1,31 @@
+{pkgs, config, ...}:
+
+let kernel = config.boot.kernelPackages;
+in
+
+{
+
+  ###### interface
+
+  options = {
+
+    services.frandom.enable = pkgs.lib.mkOption {
+      default = false;
+      type = pkgs.lib.types.bool;
+      description = ''
+        enable the /dev/frandom device (a very fast random number generator)
+      '';
+    };
+
+  };
+
+
+  ###### implementation
+
+  config = pkgs.lib.mkIf config.services.frandom.enable {
+    boot.kernelModules = [ "frandom" ];
+    boot.extraModulePackages = [ kernel.frandom ];
+    services.udev.packages = [ kernel.frandom ];
+  };
+
+}
-- 
GitLab


From 89d5aa4dd290c91897583283e0257ad3d1f0a464 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 6 Feb 2012 19:14:42 +0000
Subject: [PATCH 3343/5331] nixos support for nvidia optimus

currently, only support for fully disabling nvidia is provided, which
is helpful for saving power/heat.

In the future, this should be extended so we can choose:

- nvidia only  (choose between nouveau/nvidia driver)
- IGP only
- Hybrid (choose between nouveau/nvidia driver, use the "bumblebee" package/daemon)

svn path=/nixos/trunk/; revision=32085
---
 modules/module-list.nix                      |  1 +
 modules/services/hardware/nvidia-optimus.nix | 40 ++++++++++++++++++++
 2 files changed, 41 insertions(+)
 create mode 100644 modules/services/hardware/nvidia-optimus.nix

diff --git a/modules/module-list.nix b/modules/module-list.nix
index 2a4829f4186..15af4017886 100644
--- a/modules/module-list.nix
+++ b/modules/module-list.nix
@@ -70,6 +70,7 @@
   ./services/hardware/acpid.nix
   ./services/hardware/bluetooth.nix
   ./services/hardware/hal.nix
+  ./services/hardware/nvidia-optimus.nix
   ./services/hardware/pcscd.nix
   ./services/hardware/sane.nix
   ./services/hardware/udev.nix
diff --git a/modules/services/hardware/nvidia-optimus.nix b/modules/services/hardware/nvidia-optimus.nix
new file mode 100644
index 00000000000..0ba4b2327e1
--- /dev/null
+++ b/modules/services/hardware/nvidia-optimus.nix
@@ -0,0 +1,40 @@
+{pkgs, config, ...}:
+
+let kernel = config.boot.kernelPackages;
+in
+
+{
+
+  ###### interface
+
+  options = {
+
+    hardware.nvidiaOptimus.disable = pkgs.lib.mkOption {
+      default = false;
+      type = pkgs.lib.types.bool;
+      description = ''
+        completely disable the nvidia gfx chip (saves power / heat) and just use IGP
+      '';
+    };
+
+  };
+
+
+  ###### implementation
+
+  config = pkgs.lib.mkIf config.hardware.nvidiaOptimus.disable {
+    boot.blacklistedKernelModules = ["nouveau" "nvidia" "nvidiafb"];
+    boot.kernelModules = [ "bbswitch" ];
+    boot.extraModulePackages = [ kernel.bbswitch ];
+
+    jobs.bbswitch = {
+      name = "bbswitch";
+      description = "turn off nvidia card";
+      startOn = "stopped udevtrigger";
+      exec = "discrete_vga_poweroff";
+      path = [kernel.bbswitch];
+      task = true;
+    };
+  };
+
+}
-- 
GitLab


From 3a9dfceb07e9a79137f8a3748bc4b7c9a5ad23c5 Mon Sep 17 00:00:00 2001
From: Sander van der Burg <s.vanderburg@tudelft.nl>
Date: Mon, 6 Feb 2012 22:49:41 +0000
Subject: [PATCH 3344/5331] Implemented a very very dirty hack, which makes it
 possible to statically determine which activation types are supported,
 instead of determining this by the avahi service

svn path=/nixos/trunk/; revision=32089
---
 modules/services/misc/disnix.nix | 72 +++++++++++++++++++-------------
 1 file changed, 42 insertions(+), 30 deletions(-)

diff --git a/modules/services/misc/disnix.nix b/modules/services/misc/disnix.nix
index 1cb538f6a61..10c507808f5 100644
--- a/modules/services/misc/disnix.nix
+++ b/modules/services/misc/disnix.nix
@@ -33,29 +33,29 @@ in
 
       useWebServiceInterface = mkOption {
         default = false;
-	description = "Whether to enable the DisnixWebService interface running on Apache Tomcat";
+        description = "Whether to enable the DisnixWebService interface running on Apache Tomcat";
       };
 
       publishInfrastructure = {
         enable = mkOption {
           default = false;
-	  description = "Whether to publish capabilities/properties of this machine in as attributes in the infrastructure option";
-	};
+          description = "Whether to publish capabilities/properties of this machine in as attributes in the infrastructure option";
+        };
 
-	enableAuthentication = mkOption {
-	  default = false;
-	  description = "Whether to publish authentication credentials through the infrastructure attribute (not recommended in combination with Avahi)";
-	};
+        enableAuthentication = mkOption {
+          default = false;
+          description = "Whether to publish authentication credentials through the infrastructure attribute (not recommended in combination with Avahi)";
+        };
       };
 
       infrastructure = mkOption {
         default = {};
-	description = "List of name value pairs containing properties for the infrastructure model";
+        description = "List of name value pairs containing properties for the infrastructure model";
       };
 
       publishAvahi = mkOption {
         default = false;
-	description = "Whether to publish capabilities/properties as a Disnix service through Avahi";
+        description = "Whether to publish capabilities/properties as a Disnix service through Avahi";
       };
 
     };
@@ -77,7 +77,7 @@ in
     services.tomcat.extraGroups = [ "disnix" ];
     services.tomcat.javaOpts = "${optionalString cfg.useWebServiceInterface "-Djava.library.path=${pkgs.libmatthew_java}/lib/jni"} ";
     services.tomcat.sharedLibs = optional cfg.useWebServiceInterface "${pkgs.DisnixWebService}/share/java/DisnixConnection.jar"
-				 ++ optional cfg.useWebServiceInterface "${pkgs.dbus_java}/share/java/dbus.jar";
+                                 ++ optional cfg.useWebServiceInterface "${pkgs.dbus_java}/share/java/dbus.jar";
     services.tomcat.webapps = optional cfg.useWebServiceInterface pkgs.DisnixWebService;
 
     users.extraGroups = singleton
@@ -89,16 +89,29 @@ in
       optionalAttrs (cfg.publishInfrastructure.enable)
       ( { hostname = config.networking.hostName;
           targetHost = config.deployment.targetHost;
-	  system = if config.nixpkgs.system == "" then builtins.currentSystem else config.nixpkgs.system;
+          system = if config.nixpkgs.system == "" then builtins.currentSystem else config.nixpkgs.system;
+          
+          supportedTypes = (import "${pkgs.stdenv.mkDerivation {
+            name = "supportedtypes";
+            buildCommand = ''
+              ( echo -n "[ "
+                cd ${disnix_activation_scripts}/libexec/disnix/activation-scripts
+                for i in *
+                do
+                    echo -n "\"$i\" "
+                done
+                echo -n " ]") > $out
+            '';
+          }}");
         }
         // optionalAttrs (cfg.useWebServiceInterface) { targetEPR = "http://${config.deployment.targetHost}:8080/DisnixWebService/services/DisnixWebService"; }
         // optionalAttrs (config.services.httpd.enable) { documentRoot = config.services.httpd.documentRoot; }
         // optionalAttrs (config.services.mysql.enable) { mysqlPort = config.services.mysql.port; }
         // optionalAttrs (config.services.tomcat.enable) { tomcatPort = 8080; }
-	// optionalAttrs (config.services.svnserve.enable) { svnBaseDir = config.services.svnserve.svnBaseDir; }
-	// optionalAttrs (cfg.publishInfrastructure.enableAuthentication) (
+        // optionalAttrs (config.services.svnserve.enable) { svnBaseDir = config.services.svnserve.svnBaseDir; }
+        // optionalAttrs (cfg.publishInfrastructure.enableAuthentication) (
           optionalAttrs (config.services.mysql.enable) { mysqlUsername = "root"; mysqlPassword = builtins.readFile config.services.mysql.rootPassword; })
-	)
+        )
     ;
 
     services.disnix.publishInfrastructure.enable = cfg.publishAvahi;
@@ -108,14 +121,14 @@ in
         { description = "Disnix server";
 
           startOn = "started dbus"
-	  + optionalString config.services.httpd.enable " and started httpd"
-	  + optionalString config.services.mysql.enable " and started mysql"
-	  + optionalString config.services.tomcat.enable " and started tomcat"
-	  + optionalString config.services.svnserve.enable " and started svnserve";
+          + optionalString config.services.httpd.enable " and started httpd"
+          + optionalString config.services.mysql.enable " and started mysql"
+          + optionalString config.services.tomcat.enable " and started tomcat"
+          + optionalString config.services.svnserve.enable " and started svnserve";
 
           script =
           ''
-	    export PATH=/var/run/current-system/sw/bin:/var/run/current-system/sw/sbin
+            export PATH=/var/run/current-system/sw/bin:/var/run/current-system/sw/sbin
             export HOME=/root
 
             ${pkgs.disnix}/bin/disnix-service --activation-modules-dir=${disnix_activation_scripts}/libexec/disnix/activation-scripts
@@ -127,21 +140,20 @@ in
 
           startOn = "started avahi-daemon";
 
-	  exec =
+          exec =
           ''
             ${pkgs.avahi}/bin/avahi-publish-service disnix-${config.networking.hostName} _disnix._tcp 22 \
-	      "mem=$(grep 'MemTotal:' /proc/meminfo | sed -e 's/kB//' -e 's/MemTotal://' -e 's/ //g')" \
-              "supportedTypes=[$(for i in ${disnix_activation_scripts}/libexec/disnix/activation-scripts/*; do echo -n " \"$(basename $i)\""; done) ]" \
-	      ${concatMapStrings (infrastructureAttrName:
-	        let infrastructureAttrValue = getAttr infrastructureAttrName (cfg.infrastructure);
-		in
-		if builtins.isInt infrastructureAttrValue then
-		''${infrastructureAttrName}=${toString infrastructureAttrValue} \
-		''
-		else
+              "mem=$(grep 'MemTotal:' /proc/meminfo | sed -e 's/kB//' -e 's/MemTotal://' -e 's/ //g')" \
+              ${concatMapStrings (infrastructureAttrName:
+                let infrastructureAttrValue = getAttr infrastructureAttrName (cfg.infrastructure);
+                in
+                if builtins.isInt infrastructureAttrValue then
+                ''${infrastructureAttrName}=${toString infrastructureAttrValue} \
+                ''
+                else
                 ''${infrastructureAttrName}=\"${infrastructureAttrValue}\" \
                 ''
-		) (attrNames (cfg.infrastructure))}
+                ) (attrNames (cfg.infrastructure))}
           '';
         };
     };
-- 
GitLab


From cc1daf97c7e0d42ea56724495243b344461d1b54 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Sat, 11 Feb 2012 21:11:05 +0000
Subject: [PATCH 3345/5331] Adding extra options for resolv.conf

svn path=/nixos/trunk/; revision=32228
---
 modules/tasks/network-interfaces.nix | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/modules/tasks/network-interfaces.nix b/modules/tasks/network-interfaces.nix
index 27ca840ecdb..aa13e19a1bd 100644
--- a/modules/tasks/network-interfaces.nix
+++ b/modules/tasks/network-interfaces.nix
@@ -45,6 +45,15 @@ in
       '';
     };
 
+    networking.extraResolvConf = mkOption {
+      default = "";
+      example = "options timeout:1 attempts:6";
+      description = ''
+        Extra text to add to resolv.conf, additional to the
+        domain name and the nameservers.
+      '';
+    };
+
     networking.domain = mkOption {
       default = "";
       example = "home";
-- 
GitLab


From 97e01312913f384356193b3cec04145df37b5dc5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Sat, 11 Feb 2012 21:13:10 +0000
Subject: [PATCH 3346/5331] Adding support for 3c59x NICs to the
 system-tarball-pc.

svn path=/nixos/trunk/; revision=32229
---
 modules/installer/cd-dvd/system-tarball-pc.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/modules/installer/cd-dvd/system-tarball-pc.nix b/modules/installer/cd-dvd/system-tarball-pc.nix
index 6665122bec6..fae482c11d0 100644
--- a/modules/installer/cd-dvd/system-tarball-pc.nix
+++ b/modules/installer/cd-dvd/system-tarball-pc.nix
@@ -172,6 +172,7 @@ in
           ATL1 y
           ATL1E y
           ATL1C y
+          VORTEX y
 
           # Enable nfs root boot
           IP_PNP y
-- 
GitLab


From 5c6165ef9f922b24401a3ee1b691d00e64f1d335 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Wed, 15 Feb 2012 16:46:25 +0000
Subject: [PATCH 3347/5331] Reverting 32228. That was an incomplete change I
 had in the working directory.

svn path=/nixos/trunk/; revision=32308
---
 modules/tasks/network-interfaces.nix | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/modules/tasks/network-interfaces.nix b/modules/tasks/network-interfaces.nix
index aa13e19a1bd..27ca840ecdb 100644
--- a/modules/tasks/network-interfaces.nix
+++ b/modules/tasks/network-interfaces.nix
@@ -45,15 +45,6 @@ in
       '';
     };
 
-    networking.extraResolvConf = mkOption {
-      default = "";
-      example = "options timeout:1 attempts:6";
-      description = ''
-        Extra text to add to resolv.conf, additional to the
-        domain name and the nameservers.
-      '';
-    };
-
     networking.domain = mkOption {
       default = "";
       example = "home";
-- 
GitLab


From 1707d1130f0129eee2fbf24a88520359dba18c73 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sun, 19 Feb 2012 22:53:25 +0000
Subject: [PATCH 3348/5331] * Move the dhclient/wpa_supplicant restart actions
 out of the ifplugd   module.

svn path=/nixos/trunk/; revision=32409
---
 modules/services/networking/dhclient.nix      | 12 ++++---
 modules/services/networking/ifplugd.nix       | 33 +++++++++++++------
 .../services/networking/wpa_supplicant.nix    |  5 +++
 3 files changed, 36 insertions(+), 14 deletions(-)

diff --git a/modules/services/networking/dhclient.nix b/modules/services/networking/dhclient.nix
index 5d82854fef5..fe118fb320e 100644
--- a/modules/services/networking/dhclient.nix
+++ b/modules/services/networking/dhclient.nix
@@ -116,12 +116,16 @@ in
 
     powerManagement.resumeCommands =
       ''
-        export PATH=${config.system.build.upstart}/sbin:$PATH
-        initctl restart wpa_supplicant
-        initctl restart dhclient
+        ${config.system.build.upstart}/sbin/restart dhclient
+      '';
+
+    networking.interfaceMonitor.commands =
+      ''
+        if [ "$status" = up ]; then
+          ${config.system.build.upstart}/sbin/restart dhclient
+        fi
       '';
 
   };
 
 }
-
diff --git a/modules/services/networking/ifplugd.nix b/modules/services/networking/ifplugd.nix
index e4e4fd9216a..3e2bf9d6997 100644
--- a/modules/services/networking/ifplugd.nix
+++ b/modules/services/networking/ifplugd.nix
@@ -6,6 +6,8 @@ let
 
   inherit (pkgs) ifplugd;
 
+  cfg = config.networking.interfaceMonitor;
+
   # The ifplugd action script, which is called whenever the link
   # status changes (i.e., a cable is plugged in or unplugged).  We do
   # nothing when a cable is unplugged.  When a cable is plugged in, we
@@ -14,10 +16,9 @@ let
   plugScript = pkgs.writeScript "ifplugd.action"
     ''
       #! ${pkgs.stdenv.shell}
-      if test "$2" = up; then
-        initctl stop dhclient
-        initctl start dhclient
-      fi
+      iface="$1"
+      status="$2"
+      ${cfg.commands}
     '';
 
 in
@@ -30,21 +31,33 @@ in
 
     networking.interfaceMonitor.enable = mkOption {
       default = false;
-      description = "
+      description = ''
         If <literal>true</literal>, monitor Ethernet interfaces for
         cables being plugged in or unplugged.  When this occurs, the
         <command>dhclient</command> service is restarted to
         automatically obtain a new IP address.  This is useful for
         roaming users (laptops).
-      ";
+      '';
     };
 
     networking.interfaceMonitor.beep = mkOption {
       default = false;
-      description = "
+      description = ''
         If <literal>true</literal>, beep when an Ethernet cable is
         plugged in or unplugged.
-      ";
+      '';
+    };
+
+    networking.interfaceMonitor.commands = mkOption {
+      default = false;
+      description = ''
+        Shell commands to be executed when the link status of an
+        interface changes.  On invocation, the shell variable
+        <varname>iface</varname> contains the name of the interface,
+        while the variable <varname>status</varname> contains either
+        <literal>up</literal> or <literal>down</literal> to indicate
+        the new status.
+      '';
     };
 
   };
@@ -52,7 +65,7 @@ in
 
   ###### implementation
 
-  config = mkIf config.networking.interfaceMonitor.enable {
+  config = mkIf cfg.enable {
 
     jobs.ifplugd =
       { description = "Network interface connectivity monitor";
@@ -68,7 +81,7 @@ in
           '';
       };
 
-    environment.systemPackages = [ifplugd];
+    environment.systemPackages = [ ifplugd ];
 
   };
 
diff --git a/modules/services/networking/wpa_supplicant.nix b/modules/services/networking/wpa_supplicant.nix
index 7e29747dcc2..bf4cd6ae29a 100644
--- a/modules/services/networking/wpa_supplicant.nix
+++ b/modules/services/networking/wpa_supplicant.nix
@@ -63,6 +63,11 @@ in
           + (optionalString (config.networking.WLANInterface != null) "-i ${config.networking.WLANInterface}");
       };
   
+    powerManagement.resumeCommands =
+      ''
+        ${config.system.build.upstart}/sbin/restart wpa_supplicant
+      '';
+
   };
 
 }
-- 
GitLab


From a218a602d417c135b9265f253ea7d26bfa0367bc Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 20 Feb 2012 00:00:50 +0000
Subject: [PATCH 3349/5331] * Use openresolv to set the static nameserver
 configuration.  Next   step is to get the DHCP client, OpenVPN etc. to use
 openresolv as   well.

svn path=/nixos/trunk/; revision=32411
---
 modules/system/boot/stage-2-init.sh  |  1 +
 modules/tasks/network-interfaces.nix | 21 +++++++++++----------
 2 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/modules/system/boot/stage-2-init.sh b/modules/system/boot/stage-2-init.sh
index 10165049046..452e3c99477 100644
--- a/modules/system/boot/stage-2-init.sh
+++ b/modules/system/boot/stage-2-init.sh
@@ -96,6 +96,7 @@ mkdir -m 0755 -p /etc/nixos
 
 # Miscellaneous boot time cleanup.
 rm -rf /var/run /var/lock /var/log/upstart
+rm -f /etc/resolv.conf
 
 #echo -n "cleaning \`/tmp'..."
 #rm -rf --one-file-system /tmp/*
diff --git a/modules/tasks/network-interfaces.nix b/modules/tasks/network-interfaces.nix
index 27ca840ecdb..e13fbff0ce6 100644
--- a/modules/tasks/network-interfaces.nix
+++ b/modules/tasks/network-interfaces.nix
@@ -179,6 +179,7 @@ in
         pkgs.nettools
         pkgs.wirelesstools
         pkgs.rfkill
+        pkgs.openresolv
       ]
       ++ optional (cfg.bridges != {}) pkgs.bridge_utils
       ++ optional cfg.enableIPv6 pkgs.ndisc6;
@@ -196,6 +197,7 @@ in
           ''
             set +e # continue in case of errors
 
+            # Set MAC addresses of interfaces, if desired.
             ${flip concatMapStrings cfg.interfaces (i:
               optionalString (i.macAddress != "")
                 ''
@@ -236,16 +238,15 @@ in
                 '')
             }
 
-            # Set the nameservers.
-            if test -n "${toString cfg.nameservers}"; then
-                rm -f /etc/resolv.conf
-                if test -n "${cfg.domain}"; then
-                    echo "domain ${cfg.domain}" >> /etc/resolv.conf
-                fi
-                for i in ${toString cfg.nameservers}; do
-                    echo "nameserver $i" >> /etc/resolv.conf
-                done
-            fi
+            # Set the static DNS configuration, if given.
+            cat | ${pkgs.openresolv}/sbin/resolvconf -a static <<EOF
+            ${optionalString (cfg.nameservers != [] && cfg.domain != "") ''
+              domain ${cfg.domain}
+            ''}
+            ${flip concatMapStrings cfg.nameservers (ns: ''
+              nameserver ${ns}
+            '')}
+            EOF
 
             # Set the default gateway.
             ${optionalString (cfg.defaultGateway != "") ''
-- 
GitLab


From ae27eafe4c08028d5c89cea528fd587a184f10dd Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 20 Feb 2012 01:17:53 +0000
Subject: [PATCH 3350/5331] * Added a module for dhcpcd, a DHCP client (not
 enabled by default   yet).  It's smaller than dhclient and has more features 
  (e.g. automatically detects link status changes, supports   openresolv, does
 IPv4LL, and supports IPv6 Router Advertisements).

svn path=/nixos/trunk/; revision=32413
---
 modules/services/networking/dhcpcd.nix | 92 ++++++++++++++++++++++++++
 1 file changed, 92 insertions(+)
 create mode 100644 modules/services/networking/dhcpcd.nix

diff --git a/modules/services/networking/dhcpcd.nix b/modules/services/networking/dhcpcd.nix
new file mode 100644
index 00000000000..ce0c08dda3a
--- /dev/null
+++ b/modules/services/networking/dhcpcd.nix
@@ -0,0 +1,92 @@
+{ config, pkgs, ... }:
+
+with pkgs.lib;
+
+let
+
+  inherit (pkgs) dhcpcd;
+
+  # Don't start dhclient on explicitly configured interfaces or on
+  # interfaces that are part of a bridge.
+  ignoredInterfaces =
+    map (i: i.name) (filter (i: i ? ipAddress && i.ipAddress != "" ) config.networking.interfaces)
+    ++ concatLists (attrValues (mapAttrs (n: v: v.interfaces) config.networking.bridges));
+
+in
+
+{
+
+  ###### interface
+
+  options = {
+
+    networking.useDHCP = mkOption {
+      default = true;
+      merge = mergeEnableOption;
+      description = "
+        Whether to use DHCP to obtain an IP adress and other
+        configuration for all network interfaces that are not manually
+        configured.
+      ";
+    };
+
+  };
+
+
+  ###### implementation
+
+  config = mkIf config.networking.useDHCP {
+
+    jobs.dhcpcd =
+      { startOn = "started network-interfaces";
+        stopOn = "stopping network-interfaces";
+
+        path = [ dhcpcd pkgs.nettools pkgs.openresolv ];
+
+        script =
+          ''
+            # Determine the interface on which to start dhcpcd.
+            interfaces=
+
+            for i in $(cd /sys/class/net && ls -d *); do
+                # Only run dhcpcd on interfaces of type ARPHRD_ETHER
+                # (1), i.e. Ethernet.  Ignore peth* devices; on Xen,
+                # they're renamed physical Ethernet cards used for
+                # bridging.  Likewise for vif* and tap* (Xen) and
+                # virbr* and vnet* (libvirt).
+                if [ "$(cat /sys/class/net/$i/type)" = 1 ]; then
+                    if ! for j in ${toString ignoredInterfaces}; do echo $j; done | grep -F -x -q "$i" &&
+                       ! echo "$i" | grep -x -q "peth.*\|vif.*\|tap.*\|virbr.*\|vnet.*";
+		    then
+                        echo "Running dhcpcd on $i"
+                        interfaces="$interfaces $i"
+                    fi
+                fi
+            done
+
+            if [ -z "$interfaces" ]; then
+                echo 'No interfaces on which to start dhcpcd!'
+                exit 1
+            fi
+
+            exec dhcpcd --nobackground --persistent $interfaces
+          '';
+      };
+
+    environment.systemPackages = [ dhcpcd ];
+
+    powerManagement.resumeCommands =
+      ''
+        ${config.system.build.upstart}/sbin/restart dhcpcd
+      '';
+
+    networking.interfaceMonitor.commands =
+      ''
+        if [ "$status" = up ]; then
+          ${config.system.build.upstart}/sbin/restart dhcpcd
+        fi
+      '';
+
+  };
+
+}
-- 
GitLab


From 1770b5a400b57846996d129323000d923a6faca5 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 20 Feb 2012 13:13:29 +0000
Subject: [PATCH 3351/5331] * dhcpcd: use a configuration file.  Use the
 "denyinterfaces" option   to simplify the start script.  Drop the ifplugd
 hook because dhcpcd   monitors interface link status itself.

svn path=/nixos/trunk/; revision=32424
---
 modules/services/networking/dhcpcd.nix | 61 +++++++++++---------------
 1 file changed, 26 insertions(+), 35 deletions(-)

diff --git a/modules/services/networking/dhcpcd.nix b/modules/services/networking/dhcpcd.nix
index ce0c08dda3a..465802e6b48 100644
--- a/modules/services/networking/dhcpcd.nix
+++ b/modules/services/networking/dhcpcd.nix
@@ -12,6 +12,29 @@ let
     map (i: i.name) (filter (i: i ? ipAddress && i.ipAddress != "" ) config.networking.interfaces)
     ++ concatLists (attrValues (mapAttrs (n: v: v.interfaces) config.networking.bridges));
 
+  # Config file adapted from the one that ships with dhcpcd.
+  dhcpcdConf = pkgs.writeText "dhcpcd.conf"
+    ''
+      # Inform the DHCP server of our hostname for DDNS.
+      hostname
+
+      # A list of options to request from the DHCP server.
+      option domain_name_servers, domain_name, domain_search, host_name
+      option classless_static_routes, ntp_servers, interface_mtu
+
+      # A ServerID is required by RFC2131.
+      require dhcp_server_identifier
+
+      # A hook script is provided to lookup the hostname if not set by
+      # the DHCP server, but it should not be run by default.
+      nohook lookup-hostname
+
+      # Ignore peth* devices; on Xen, they're renamed physical
+      # Ethernet cards used for bridging.  Likewise for vif* and tap*
+      # (Xen) and virbr* and vnet* (libvirt).
+      denyinterfaces ${toString ignoredInterfaces} peth* vif* tap* virbr* vnet*
+    '';
+
 in
 
 {
@@ -43,34 +66,9 @@ in
 
         path = [ dhcpcd pkgs.nettools pkgs.openresolv ];
 
-        script =
-          ''
-            # Determine the interface on which to start dhcpcd.
-            interfaces=
-
-            for i in $(cd /sys/class/net && ls -d *); do
-                # Only run dhcpcd on interfaces of type ARPHRD_ETHER
-                # (1), i.e. Ethernet.  Ignore peth* devices; on Xen,
-                # they're renamed physical Ethernet cards used for
-                # bridging.  Likewise for vif* and tap* (Xen) and
-                # virbr* and vnet* (libvirt).
-                if [ "$(cat /sys/class/net/$i/type)" = 1 ]; then
-                    if ! for j in ${toString ignoredInterfaces}; do echo $j; done | grep -F -x -q "$i" &&
-                       ! echo "$i" | grep -x -q "peth.*\|vif.*\|tap.*\|virbr.*\|vnet.*";
-		    then
-                        echo "Running dhcpcd on $i"
-                        interfaces="$interfaces $i"
-                    fi
-                fi
-            done
-
-            if [ -z "$interfaces" ]; then
-                echo 'No interfaces on which to start dhcpcd!'
-                exit 1
-            fi
-
-            exec dhcpcd --nobackground --persistent $interfaces
-          '';
+        exec = "dhcpcd --config ${dhcpcdConf} --background --persistent";
+
+        daemonType = "daemon";
       };
 
     environment.systemPackages = [ dhcpcd ];
@@ -80,13 +78,6 @@ in
         ${config.system.build.upstart}/sbin/restart dhcpcd
       '';
 
-    networking.interfaceMonitor.commands =
-      ''
-        if [ "$status" = up ]; then
-          ${config.system.build.upstart}/sbin/restart dhcpcd
-        fi
-      '';
-
   };
 
 }
-- 
GitLab


From 7278e370722fec09a281985c2c1392ee3ea7b007 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 20 Feb 2012 13:40:47 +0000
Subject: [PATCH 3352/5331] * Don't set DBHost if the database is on localhost,
 otherwise Zabbix   will use TCP/IP instead of a Unix domain socket. *
 Simplify Zabbix's start condition.  Zabbix now retries if the   database is
 down instead of bailing out.

svn path=/nixos/trunk/; revision=32426
---
 modules/services/monitoring/zabbix-server.nix | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/modules/services/monitoring/zabbix-server.nix b/modules/services/monitoring/zabbix-server.nix
index f59558e86dd..046c601cb4f 100644
--- a/modules/services/monitoring/zabbix-server.nix
+++ b/modules/services/monitoring/zabbix-server.nix
@@ -21,7 +21,9 @@ let
 
       PidFile = ${pidFile}
 
-      DBHost = ${cfg.dbServer}
+      ${optionalString (cfg.dbServer != "localhost") ''
+        DBHost = ${cfg.dbServer}
+      ''}
 
       DBName = zabbix
 
@@ -76,8 +78,7 @@ in
 
         description = "Zabbix server daemon";
 
-        startOn = if cfg.dbServer == "localhost" then "started postgresql" else "filesystem";
-        stopOn = if cfg.dbServer == "localhost" then "stopping postgresql" else "starting shutdown";
+        startOn = "filesystem";
 
         preStart =
           ''
@@ -94,6 +95,8 @@ in
             fi
           '';
 
+        path = [ pkgs.nettools ];
+
         # Zabbix doesn't have an option not to daemonize, and doesn't
         # daemonize in a way that allows Upstart to track it.  So to
         # make sure that we notice when it goes down, we start Zabbix
@@ -102,7 +105,6 @@ in
         # just monitor `cat'.
         script =
           ''
-            export PATH=${pkgs.nettools}/bin:$PATH
             rm -f ${stateDir}/dummy
             mkfifo ${stateDir}/dummy
             cat ${stateDir}/dummy &
-- 
GitLab


From a46fd58b3d021d648d23e17d6c925030dc288982 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 20 Feb 2012 14:29:21 +0000
Subject: [PATCH 3353/5331] * Use the networking.useDHCP out of the dhclient
 module.

svn path=/nixos/trunk/; revision=32428
---
 modules/services/networking/dhclient.nix | 17 -----------------
 modules/services/networking/dhcpcd.nix   | 17 -----------------
 modules/tasks/network-interfaces.nix     | 10 ++++++++++
 3 files changed, 10 insertions(+), 34 deletions(-)

diff --git a/modules/services/networking/dhclient.nix b/modules/services/networking/dhclient.nix
index fe118fb320e..2bc0b333a6f 100644
--- a/modules/services/networking/dhclient.nix
+++ b/modules/services/networking/dhclient.nix
@@ -40,23 +40,6 @@ in
 
 {
 
-  ###### interface
-
-  options = {
-
-    networking.useDHCP = mkOption {
-      default = true;
-      merge = mergeEnableOption;
-      description = "
-        Whether to use DHCP to obtain an IP adress and other
-        configuration for all network interfaces that are not manually
-        configured.
-      ";
-    };
-
-  };
-
-
   ###### implementation
 
   config = mkIf config.networking.useDHCP {
diff --git a/modules/services/networking/dhcpcd.nix b/modules/services/networking/dhcpcd.nix
index 465802e6b48..f80aac9bdc4 100644
--- a/modules/services/networking/dhcpcd.nix
+++ b/modules/services/networking/dhcpcd.nix
@@ -39,23 +39,6 @@ in
 
 {
 
-  ###### interface
-
-  options = {
-
-    networking.useDHCP = mkOption {
-      default = true;
-      merge = mergeEnableOption;
-      description = "
-        Whether to use DHCP to obtain an IP adress and other
-        configuration for all network interfaces that are not manually
-        configured.
-      ";
-    };
-
-  };
-
-
   ###### implementation
 
   config = mkIf config.networking.useDHCP {
diff --git a/modules/tasks/network-interfaces.nix b/modules/tasks/network-interfaces.nix
index e13fbff0ce6..b9c5d897295 100644
--- a/modules/tasks/network-interfaces.nix
+++ b/modules/tasks/network-interfaces.nix
@@ -163,6 +163,16 @@ in
 
     };
 
+    networking.useDHCP = mkOption {
+      default = true;
+      merge = mergeEnableOption;
+      description = ''
+        Whether to use DHCP to obtain an IP adress and other
+        configuration for all network interfaces that are not manually
+        configured.
+      '';
+    };
+
   };
 
 
-- 
GitLab


From 4e9c8d0b9d12679959ff2d27b8342c76e833d878 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 20 Feb 2012 15:19:46 +0000
Subject: [PATCH 3354/5331] * dhcpcd: restart ntpd and emit ip-up/ip-down
 events.  Also attach the   interface name to the events, as suggested by
 Mathijs Kwik.

svn path=/nixos/trunk/; revision=32430
---
 modules/services/networking/dhcpcd.nix | 33 +++++++++++++++++++++++---
 1 file changed, 30 insertions(+), 3 deletions(-)

diff --git a/modules/services/networking/dhcpcd.nix b/modules/services/networking/dhcpcd.nix
index f80aac9bdc4..cdecbb8b10f 100644
--- a/modules/services/networking/dhcpcd.nix
+++ b/modules/services/networking/dhcpcd.nix
@@ -35,6 +35,29 @@ let
       denyinterfaces ${toString ignoredInterfaces} peth* vif* tap* virbr* vnet*
     '';
 
+  # Hook for emitting ip-up/ip-down events.
+  exitHook = pkgs.writeText "dhcpcd.exit-hook"
+    ''
+      #exec >> /var/log/dhcpcd 2>&1
+      #set -x
+    
+      if [ "$reason" = BOUND -o "$reason" = REBOOT ]; then
+          # Restart ntpd.  (The "ip-up" event below will trigger the
+          # restart.)  We need to restart it to make sure that it will
+          # actually do something: if ntpd cannot resolve the server
+          # hostnames in its config file, then it will never do
+          # anything ever again ("couldn't resolve ..., giving up on
+          # it"), so we silently lose time synchronisation.
+          ${config.system.build.upstart}/sbin/initctl stop ntpd
+
+          ${config.system.build.upstart}/sbin/initctl emit -n ip-up IFACE=$interface
+      fi
+
+      if [ "$reason" = EXPIRE -o "$reason" = RELEASE ]; then
+          ${config.system.build.upstart}/sbin/initctl emit -n ip-down IFACE=$interface
+      fi
+    '';
+
 in
 
 {
@@ -49,13 +72,17 @@ in
 
         path = [ dhcpcd pkgs.nettools pkgs.openresolv ];
 
-        exec = "dhcpcd --config ${dhcpcdConf} --background --persistent";
-
-        daemonType = "daemon";
+        exec = "dhcpcd --config ${dhcpcdConf} --nobackground --persistent";
       };
 
     environment.systemPackages = [ dhcpcd ];
 
+    environment.etc =
+      [ { source = exitHook;
+          target = "dhcpcd.exit-hook";
+        }
+      ];
+
     powerManagement.resumeCommands =
       ''
         ${config.system.build.upstart}/sbin/restart dhcpcd
-- 
GitLab


From 35734279ae4508a68fe2811a3505089edeff5af1 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 20 Feb 2012 16:53:44 +0000
Subject: [PATCH 3355/5331] * Fix incorrect default value.

svn path=/nixos/trunk/; revision=32431
---
 modules/services/networking/ifplugd.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/services/networking/ifplugd.nix b/modules/services/networking/ifplugd.nix
index 3e2bf9d6997..df50e9807a9 100644
--- a/modules/services/networking/ifplugd.nix
+++ b/modules/services/networking/ifplugd.nix
@@ -49,7 +49,7 @@ in
     };
 
     networking.interfaceMonitor.commands = mkOption {
-      default = false;
+      default = "";
       description = ''
         Shell commands to be executed when the link status of an
         interface changes.  On invocation, the shell variable
-- 
GitLab


From 84bff53ca7604bd1775d99b24cfe61227daf1021 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 20 Feb 2012 19:23:15 +0000
Subject: [PATCH 3356/5331] =?UTF-8?q?*=20Set=20the=20default=20value=20for?=
 =?UTF-8?q?=20the=20=E2=80=98path=E2=80=99=20job=20attribute=20using=20the?=
 =?UTF-8?q?=20NixOS=20=20=20module=20system=20so=20that=20it=20can=20be=20?=
 =?UTF-8?q?overriden.=20=20Also=20use=20an=20=E2=80=98apply=E2=80=99=20to?=
 =?UTF-8?q?=20=20=20compute=20the=20actual=20$PATH.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

svn path=/nixos/trunk/; revision=32440
---
 modules/system/upstart/upstart.nix | 26 +++++++++++++++-----------
 1 file changed, 15 insertions(+), 11 deletions(-)

diff --git a/modules/system/upstart/upstart.nix b/modules/system/upstart/upstart.nix
index 09e81983e81..d3edf2a459a 100644
--- a/modules/system/upstart/upstart.nix
+++ b/modules/system/upstart/upstart.nix
@@ -7,16 +7,6 @@ let
   upstart = pkgs.upstart;
 
 
-  # Path for Upstart jobs.  Should be quite minimal.
-  upstartPath =
-    [ pkgs.coreutils
-      pkgs.findutils
-      pkgs.gnugrep
-      pkgs.gnused
-      upstart
-    ];
-
-
   # From a job description, generate an Upstart job file.
   makeJob = job:
 
@@ -41,7 +31,7 @@ let
 
           ${optionalString (job.stopOn != "") "stop on ${job.stopOn}"}
 
-          env PATH=${makeSearchPath "bin" (job.path ++ upstartPath)}:${makeSearchPath "sbin" (job.path ++ upstartPath)}
+          env PATH=${job.path}
 
           ${concatMapStrings (n: "env ${n}=\"${getAttr n env}\"\n") (attrNames env)}
 
@@ -276,6 +266,7 @@ let
 
     path = mkOption {
       default = [ ];
+      apply = ps: "${makeSearchPath "bin" ps}:${makeSearchPath "sbin" ps}";
       description = ''
         Packages added to the job's <envar>PATH</envar> environment variable.
         Both the <filename>bin</filename> and <filename>sbin</filename>
@@ -289,6 +280,7 @@ let
   upstartJob = {name, config, ...}: {
 
     options = {
+    
       jobDrv = mkOption {
         default = makeJob config;
         type = types.uniq types.package;
@@ -297,13 +289,25 @@ let
           value is generated from other options.
         '';
       };
+      
     };
 
     config = {
+    
       # The default name is the name extracted from the attribute path.
       name = mkDefaultValue (
         replaceChars ["<" ">" "*"] ["_" "_" "_name_"] name
       );
+      
+      # Default path for Upstart jobs.  Should be quite minimal.
+      path =
+        [ pkgs.coreutils
+          pkgs.findutils
+          pkgs.gnugrep
+          pkgs.gnused
+          upstart
+        ];
+      
     };
 
   };
-- 
GitLab


From b2910df04e4ec3e707ad08074bd128dedf9b2c23 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 20 Feb 2012 20:10:07 +0000
Subject: [PATCH 3357/5331] =?UTF-8?q?*=20Various=20cleanups=20in=20the=20O?=
 =?UTF-8?q?penVPN=20module.=20=20The=20option=20=20=20=E2=80=98services.op?=
 =?UTF-8?q?envpn.enable=E2=80=99=20is=20now=20obsolete;=20specifying=20ins?=
 =?UTF-8?q?tances=20in=20=20=20=E2=80=98services.openvpn.servers=E2=80=99?=
 =?UTF-8?q?=20is=20enough.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

svn path=/nixos/trunk/; revision=32441
---
 modules/services/networking/dhcpcd.nix  |   2 +-
 modules/services/networking/openvpn.nix | 209 ++++++++++++------------
 2 files changed, 106 insertions(+), 105 deletions(-)

diff --git a/modules/services/networking/dhcpcd.nix b/modules/services/networking/dhcpcd.nix
index cdecbb8b10f..b94fe04be43 100644
--- a/modules/services/networking/dhcpcd.nix
+++ b/modules/services/networking/dhcpcd.nix
@@ -32,7 +32,7 @@ let
       # Ignore peth* devices; on Xen, they're renamed physical
       # Ethernet cards used for bridging.  Likewise for vif* and tap*
       # (Xen) and virbr* and vnet* (libvirt).
-      denyinterfaces ${toString ignoredInterfaces} peth* vif* tap* virbr* vnet*
+      denyinterfaces ${toString ignoredInterfaces} peth* vif* tap* tun* virbr* vnet*
     '';
 
   # Hook for emitting ip-up/ip-down events.
diff --git a/modules/services/networking/openvpn.nix b/modules/services/networking/openvpn.nix
index bec5d7b8107..bbd61180e02 100644
--- a/modules/services/networking/openvpn.nix
+++ b/modules/services/networking/openvpn.nix
@@ -8,72 +8,56 @@ let
 
   inherit (pkgs) openvpn;
 
-  PATH = "${pkgs.iptables}/sbin:${pkgs.coreutils}/bin:${pkgs.iproute}/sbin:${pkgs.nettools}/sbin";
-
-  makeOpenVPNJob = cfg : name:
+  makeOpenVPNJob = cfg: name:
     let
+
+      path = (getAttr "openvpn-${name}" config.jobs).path;
+    
       upScript = ''
-        #!/bin/sh
-        exec &> /var/log/openvpn-${name}-up
-        PATH=${PATH}
+        #! /bin/sh
+        exec > /var/log/openvpn-${name}-up 2>&1
+        export PATH=${path}
+
+        # For convenience in client scripts, extract the remote domain
+        # name and name server.
+        for var in ''${!foreign_option_*}; do
+          x=(''${!var})
+          if [ "''${x[0]}" = dhcp-option ]; then
+            if [ "''${x[1]}" = DOMAIN ]; then domain="''${x[2]}"
+            elif [ "''${x[1]}" = DNS ]; then nameserver="''${x[2]}"
+            fi
+          fi
+        done
+        
         ${cfg.up}
       '';
+      
       downScript = ''
-        #!/bin/sh
-        exec &> /var/log/openvpn-${name}-down
-        PATH=${PATH}
+        #! /bin/sh
+        exec > /var/log/openvpn-${name}-down 2>&1
+        export PATH=${path}
         ${cfg.down}
       '';
+      
       configFile = pkgs.writeText "openvpn-config-${name}"
         ''
-          ${if cfg.up != "" || cfg.down != "" then "script-security 2" else ""}
+          ${optionalString (cfg.up != "" || cfg.down != "") "script-security 2"}
           ${cfg.config}
-          ${if cfg.up != "" then "up ${pkgs.writeScript "openvpn-${name}-up" upScript}" else "" }
-          ${if cfg.down != "" then "down ${pkgs.writeScript "openvpn-${name}-down" downScript}" else "" }
+          ${optionalString (cfg.up != "") "up ${pkgs.writeScript "openvpn-${name}-up" upScript}"}
+          ${optionalString (cfg.down != "") "down ${pkgs.writeScript "openvpn-${name}-down" downScript}"}
         '';
+        
     in {
-      description = "OpenVPN-${name}";
+      description = "OpenVPN instance ‘${name}’";
 
       startOn = "started network-interfaces";
       stopOn = "stopping network-interfaces";
 
-      environment = { PATH = "${pkgs.coreutils}/bin"; };
-
-      script =
-        ''
-          exec &> /var/log/openvpn-${name}
-          ${config.system.sbin.modprobe} tun || true
-          ${openvpn}/sbin/openvpn --config ${configFile}
-        '';
-    };
-
-  openvpnInstanceOptions = {
+      path = [ pkgs.iptables pkgs.iproute pkgs.nettools ];
 
-    config = mkOption {
-      type = types.string;
-      description = ''
-        config of this openvpn instance
-      '';
-    };
-    up = mkOption {
-      default = "";
-      type = types.string;
-      description = ''
-        script which is run when server instance starts up succesfully.
-        Use it to setup firewall and routing
-      '';
-    };
-    down = mkOption {
-      default = "";
-      type = types.string;
-      description = ''
-        script which is run when server instance shuts down
-        Usually this reverts what up has done
-      '';
+      exec = "${openvpn}/sbin/openvpn --config ${configFile}";
     };
 
-  };
-
 in
 
 {
@@ -82,69 +66,84 @@ in
 
   options = {
 
-    services.openvpn = {
+    /* !!! Obsolete. */
+    services.openvpn.enable = mkOption {
+      default = true;
+      description = "Whether to enable OpenVPN.";
+    };
 
-      enable = mkOption {
-        default = false;
-        description = "Whether to enable OpenVPN.";
+    services.openvpn.servers = mkOption {
+      default = {};
+
+      example = {
+      
+        server = {
+          config = ''
+            # Simplest server configuration: http://openvpn.net/index.php/documentation/miscellaneous/static-key-mini-howto.html.
+            # server :
+            dev tun
+            ifconfig 10.8.0.1 10.8.0.2
+            secret /root/static.key
+          '';
+          up = "ip route add ...";
+          down = "ip route del ...";
+        };
+        
+        client = {
+          config = ''
+            client
+            remote vpn.example.org
+            dev tun
+            proto tcp-client
+            port 8080
+            ca /root/.vpn/ca.crt
+            cert /root/.vpn/alice.crt
+            key /root/.vpn/alice.key
+          '';
+          up = "echo nameserver $nameserver | ${pkgs.openresolv}/sbin/resolvconf -m 0 -a $dev";
+          down = "${pkgs.openresolv}/sbin/resolvconf -d $dev";
+        };
+        
       };
 
+      description = ''
+        Each attribute of this option defines an Upstart job to run an
+        OpenVPN instance.  These can be OpenVPN servers or clients.
+        The name of each Upstart job is
+        <literal>openvpn-</literal><replaceable>name</replaceable>,
+        where <replaceable>name</replaceable> is the corresponding
+        attribute name.
+      '';
 
-      servers = mkOption {
-
-        default = {};
-
-        example = {
-            mostSimple = {
-              config = ''
-                # Most simple configuration: http://openvpn.net/index.php/documentation/miscellaneous/static-key-mini-howto.html.
-                # server :
-                dev tun
-                ifconfig 10.8.0.1 10.8.0.2
-                secret static.key
-              '';
-              up = "ip route add ..!";
-              down = "ip route add ..!";
-            };
-            clientMostSimple = {
-              config = ''
-                #client:
-                #remote myremote.mydomain
-                #dev tun
-                #ifconfig 10.8.0.2 10.8.0.1
-                #secret static.key
-              '';
-            };
-            serverScalable = {
-              config = ''
-                multiple clienst
-                see example file found in http://openvpn.net/index.php/documentation/howto.html
-              '';
-            };
+      type = types.attrsOf types.optionSet;
+      
+      options =  {
+
+        config = mkOption {
+          type = types.string;
+            description = ''
+            Configuration of this OpenVPN instance.  See
+            <citerefentry><refentrytitle>openvpn</refentrytitle><manvolnum>8</manvolnum></citerefentry>
+            for details.
+          '';
         };
 
-        # !!! clean up this description please
-        description = ''
-          You can define multiple openvpn instances.
-
-          The id of an instance is given by the attribute name.
-
-          Each instance will result in a new job file.
-
-          Additionally you can specify the up/ down scripts by setting
-          the up down properties.
-          Config lines up=/nix/store/xxx-up-script down=...
-          will be appended to your configuration file automatically
-
-          If you define at least one of up/down "script-security 2" will be
-          prepended to your config otherwise you scripts aren't run by openvpn
+        up = mkOption {
+          default = "";
+          type = types.string;
+          description = ''
+            Shell commands executed when the instance is starting.
+          '';
+        };
 
-          Don't forget to check that the all package sizes can be sent. For
-          examlpe if scp hangs you should set --fragment XXX --mssfix YYY.
-        '';
+        down = mkOption {
+          default = "";
+          type = types.string;
+          description = ''
+            Shell commands executed when the instance is shutting down.
+          '';
+        };
 
-        type = types.attrsOf types.optionSet;
-        options = [ openvpnInstanceOptions ];
       };
 
     };
@@ -154,12 +153,14 @@ in
 
   ###### implementation
 
-  config = mkIf cfg.enable {
+  config = mkIf (cfg.servers != {}) {
 
     jobs = listToAttrs (mapAttrsFlatten (name: value: nameValuePair "openvpn-${name}" (makeOpenVPNJob value name)) cfg.servers);
 
     environment.systemPackages = [ openvpn ];
-
+    
+    boot.kernelModules = [ "tun" ];
+    
   };
 
 }
-- 
GitLab


From 57af9d74e2e3092e538743b1b0d913bba545bfdc Mon Sep 17 00:00:00 2001
From: Arie Middelkoop <amiddelk@gmail.com>
Date: Tue, 21 Feb 2012 10:02:58 +0000
Subject: [PATCH 3358/5331] Applied the patch of James Cook.

svn path=/nixos/trunk/; revision=32445
---
 modules/services/hardware/udev.nix | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/modules/services/hardware/udev.nix b/modules/services/hardware/udev.nix
index 6caac8f8ca2..9a38c501411 100644
--- a/modules/services/hardware/udev.nix
+++ b/modules/services/hardware/udev.nix
@@ -188,12 +188,20 @@ in
         List of directories containing firmware files.  Such files
         will be loaded automatically if the kernel asks for them
         (i.e., when it has detected specific hardware that requires
-        firmware to function).
+        firmware to function).  If more than one path contains a
+        firmware file with the same name, the first path in the list
+        takes precedence.  Note that you must rebuild your system if
+        you add files to any of these directories.  For quick testing,
+        put firmware files in /root/test-firmware and add that
+        directory to the list.
+        Note that you can also add firmware packages to this
+        list as these are directories in the nix store.
       '';
       apply = list: pkgs.buildEnv {
         name = "firmware";
         paths = list;
         pathsToLink = [ "/" ];
+        ignoreCollisions = true;
       };
     };
 
-- 
GitLab


From 87c102ce2e7339ca6e0182502810040888afef09 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 22 Feb 2012 20:28:44 +0000
Subject: [PATCH 3359/5331] intel microcode update module

svn path=/nixos/trunk/; revision=32477
---
 modules/hardware/cpu/intel-microcode.nix | 34 ++++++++++++++++++++++++
 modules/module-list.nix                  |  1 +
 2 files changed, 35 insertions(+)
 create mode 100644 modules/hardware/cpu/intel-microcode.nix

diff --git a/modules/hardware/cpu/intel-microcode.nix b/modules/hardware/cpu/intel-microcode.nix
new file mode 100644
index 00000000000..894676194a5
--- /dev/null
+++ b/modules/hardware/cpu/intel-microcode.nix
@@ -0,0 +1,34 @@
+{pkgs, config, ...}:
+
+{
+
+  ###### interface
+
+  options = {
+
+    hardware.cpu.intel.updateMicrocode = pkgs.lib.mkOption {
+      default = false;
+      type = pkgs.lib.types.bool;
+      description = ''
+        Update the CPU microcode for intel processors.
+      '';
+    };
+
+  };
+
+
+  ###### implementation
+
+  config = pkgs.lib.mkIf config.hardware.cpu.intel.updateMicrocode {
+    hardware.firmware = [pkgs.microcodeIntel];
+    jobs.microcode = {
+      name = "microcode";
+      description = "load microcode";
+      startOn = "started udev";
+      exec = "modprobe microcode";
+      path = [config.system.sbin.modprobe];
+      task = true;
+    };
+  };
+
+}
diff --git a/modules/module-list.nix b/modules/module-list.nix
index 15af4017886..eaa924e76c2 100644
--- a/modules/module-list.nix
+++ b/modules/module-list.nix
@@ -14,6 +14,7 @@
   ./config/timezone.nix
   ./config/unix-odbc-drivers.nix
   ./config/users-groups.nix
+  ./hardware/cpu/intel-microcode.nix
   ./hardware/network/intel-2100bg.nix
   ./hardware/network/intel-2200bg.nix
   ./hardware/network/intel-3945abg.nix
-- 
GitLab


From fca4803a741762baa318378b4644e1e31feea766 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 22 Feb 2012 20:28:51 +0000
Subject: [PATCH 3360/5331] gw6c: no built-in log rotation, we use logrotate
 for that

svn path=/nixos/trunk/; revision=32478
---
 modules/services/networking/gw6c/gw6c.conf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/services/networking/gw6c/gw6c.conf b/modules/services/networking/gw6c/gw6c.conf
index 943b9170c7d..e6c4362d27c 100644
--- a/modules/services/networking/gw6c/gw6c.conf
+++ b/modules/services/networking/gw6c/gw6c.conf
@@ -312,7 +312,7 @@ log_filename=/var/log/gw6c.log
 #
 #   log_rotation=<yes|no>
 #
-log_rotation=yes
+log_rotation=no
 
 #
 # Log File Rotation Size:
-- 
GitLab


From 90adc800c57a880a8308419d489eb8d935e5b292 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 22 Feb 2012 20:28:54 +0000
Subject: [PATCH 3361/5331] sshd: choose host key type

svn path=/nixos/trunk/; revision=32479
---
 modules/services/networking/ssh/sshd.nix | 26 +++++++++++++++++++++---
 1 file changed, 23 insertions(+), 3 deletions(-)

diff --git a/modules/services/networking/ssh/sshd.nix b/modules/services/networking/ssh/sshd.nix
index a779580eaee..9e18133595b 100644
--- a/modules/services/networking/ssh/sshd.nix
+++ b/modules/services/networking/ssh/sshd.nix
@@ -14,6 +14,21 @@ let
     v == "forced-commands-only" ||
     v == "no";
 
+  hostKeyTypeNames = {
+    dsa1024  = "dsa";
+    rsa1024  = "rsa";
+    ecdsa521 = "ecdsa";
+  };
+
+  hostKeyTypeBits = {
+    dsa1024  = 1024;
+    rsa1024  = 1024;
+    ecdsa521 = 521;
+  };
+
+  hktn = attrByPath [cfg.hostKeyType] (throw "unknown host key type `${cfg.hostKeyType}'") hostKeyTypeNames;
+  hktb = attrByPath [cfg.hostKeyType] (throw "unknown host key type `${cfg.hostKeyType}'") hostKeyTypeBits;
+
   userOptions = {
     openssh.authorizedKeys = {
 
@@ -187,6 +202,11 @@ in
         '';
       };
 
+      hostKeyType = mkOption {
+        default = "dsa1024";
+        description = "Type of host key to generate (dsa1024/rsa1024/ecdsa521)";
+      };
+
       extraConfig = mkOption {
         default = "";
         description = "Verbatim contents of <filename>sshd_config</filename>.";
@@ -235,8 +255,8 @@ in
 
             mkdir -m 0755 -p /etc/ssh
 
-            if ! test -f /etc/ssh/ssh_host_dsa_key; then
-                ${pkgs.openssh}/bin/ssh-keygen -t dsa -b 1024 -f /etc/ssh/ssh_host_dsa_key -N ""
+            if ! test -f /etc/ssh/ssh_host_${hktn}_key; then
+                ${pkgs.openssh}/bin/ssh-keygen -t ${hktn} -b ${toString hktb} -f /etc/ssh/ssh_host_${hktn}_key -N ""
             fi
           '';
 
@@ -244,7 +264,7 @@ in
 
         exec =
           ''
-            ${pkgs.openssh}/sbin/sshd -h /etc/ssh/ssh_host_dsa_key \
+            ${pkgs.openssh}/sbin/sshd -h /etc/ssh/ssh_host_${hktn}_key \
               -f ${pkgs.writeText "sshd_config" cfg.extraConfig}
           '';
       };
-- 
GitLab


From bd9b32620ca69e4a7f1085bd1d8fcf266e9f1376 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 22 Feb 2012 20:28:57 +0000
Subject: [PATCH 3362/5331] split release.nix into helpers and the jobs
 themselves

this allows for external use of the helpers, for example to build custom cds without editing release.nix

svn path=/nixos/trunk/; revision=32480
---
 lib/release-helpers.nix | 72 +++++++++++++++++++++++++++++++
 release.nix             | 96 +++++------------------------------------
 2 files changed, 82 insertions(+), 86 deletions(-)
 create mode 100644 lib/release-helpers.nix

diff --git a/lib/release-helpers.nix b/lib/release-helpers.nix
new file mode 100644
index 00000000000..3eacef90f2c
--- /dev/null
+++ b/lib/release-helpers.nix
@@ -0,0 +1,72 @@
+{ nixpkgs ? ../../nixpkgs }:
+
+{
+  makeIso =
+    { module, type, description ? type, maintainers ? ["eelco"] }:
+    { nixosSrc ? {outPath = ./.; rev = 1234;}
+    , officialRelease ? false
+    , system ? "i686-linux"
+    }:
+
+    with import nixpkgs {inherit system;};
+
+    let
+
+      version = builtins.readFile ../VERSION + (if officialRelease then "" else "pre${toString nixosSrc.rev}");
+
+      versionModule =
+        { system.nixosVersion = version;
+          isoImage.isoBaseName = "nixos-${type}";
+        };
+
+      config = (import ./eval-config.nix {
+        inherit system nixpkgs;
+        modules = [ module versionModule ];
+      }).config;
+
+      iso = config.system.build.isoImage;
+
+    in
+      # Declare the ISO as a build product so that it shows up in Hydra.
+      runCommand "nixos-iso-${version}"
+        { meta = {
+            description = "NixOS installation CD (${description}) - ISO image for ${system}";
+            maintainers = map (x: lib.getAttr x lib.maintainers) maintainers;
+          };
+          inherit iso;
+          passthru = { inherit config; };
+        }
+        ''
+          ensureDir $out/nix-support
+          echo "file iso" $iso/iso/*.iso* >> $out/nix-support/hydra-build-products
+        ''; # */
+
+
+  makeSystemTarball =
+    { module, maintainers ? ["viric"]}:
+    { nixosSrc ? {outPath = ./.; rev = 1234;}
+    , officialRelease ? false
+    , system ? "i686-linux"
+    }:
+
+    with import nixpkgs {inherit system;};
+    let
+      version = builtins.readFile ../VERSION + (if officialRelease then "" else "pre${toString nixosSrc.rev}");
+
+      versionModule = { system.nixosVersion = version; };
+
+      config = (import ./eval-config.nix {
+        inherit system nixpkgs;
+        modules = [ module versionModule ];
+      }).config;
+
+      tarball = config.system.build.tarball;
+    in
+      tarball //
+        { meta = {
+            description = "NixOS system tarball for ${system} - ${stdenv.platform.name}";
+            maintainers = map (x: lib.getAttr x lib.maintainers) maintainers;
+          };
+          inherit config;
+        };
+}
diff --git a/release.nix b/release.nix
index 44d87e154cd..2d29e6fc686 100644
--- a/release.nix
+++ b/release.nix
@@ -1,81 +1,9 @@
 { nixpkgs ? ../nixpkgs }:
 
-let
-
-
-  makeIso =
-    { module, type, description ? type, maintainers ? ["eelco"] }:
-    { nixosSrc ? {outPath = ./.; rev = 1234;}
-    , officialRelease ? false
-    , system ? "i686-linux"
-    }:
-
-    with import nixpkgs {inherit system;};
-
-    let
-
-      version = builtins.readFile ./VERSION + (if officialRelease then "" else "pre${toString nixosSrc.rev}");
-
-      versionModule =
-        { system.nixosVersion = version;
-          isoImage.isoBaseName = "nixos-${type}";
-        };
-
-      config = (import lib/eval-config.nix {
-        inherit system nixpkgs;
-        modules = [ module versionModule ];
-      }).config;
-
-      iso = config.system.build.isoImage;
-
-    in
-      # Declare the ISO as a build product so that it shows up in Hydra.
-      runCommand "nixos-iso-${version}"
-        { meta = {
-            description = "NixOS installation CD (${description}) - ISO image for ${system}";
-            maintainers = map (x: lib.getAttr x lib.maintainers) maintainers;
-          };
-          inherit iso;
-          passthru = { inherit config; };
-        }
-        ''
-          ensureDir $out/nix-support
-          echo "file iso" $iso/iso/*.iso* >> $out/nix-support/hydra-build-products
-        ''; # */
-
-
-  makeSystemTarball =
-    { module, maintainers ? ["viric"]}:
-    { nixosSrc ? {outPath = ./.; rev = 1234;}
-    , officialRelease ? false
-    , system ? "i686-linux"
-    }:
-
-    with import nixpkgs {inherit system;};
-    let
-      version = builtins.readFile ./VERSION + (if officialRelease then "" else "pre${toString nixosSrc.rev}");
-
-      versionModule = { system.nixosVersion = version; };
-
-      config = (import lib/eval-config.nix {
-        inherit system nixpkgs;
-        modules = [ module versionModule ];
-      }).config;
-
-      tarball = config.system.build.tarball;
-    in
-      tarball //
-        { meta = {
-            description = "NixOS system tarball for ${system} - ${stdenv.platform.name}";
-            maintainers = map (x: lib.getAttr x lib.maintainers) maintainers;
-          };
-          inherit config;
-        };
-
-
-  jobs = rec {
-
+let helpers = import ./lib/release-helpers.nix { inherit nixpkgs; };
 
+in
+rec {
     tarball =
       { nixosSrc ? {outPath = ./.; rev = 1234;}
       , officialRelease ? false
@@ -120,41 +48,40 @@ let
       }).manual;
 
 
-    iso_minimal = makeIso {
+    iso_minimal = helpers.makeIso {
       module = ./modules/installer/cd-dvd/installation-cd-minimal.nix;
       type = "minimal";
     };
 
-    iso_graphical = makeIso {
+    iso_graphical = helpers.makeIso {
       module = ./modules/installer/cd-dvd/installation-cd-graphical.nix;
       type = "graphical";
     };
 
     # A variant with a more recent (but possibly less stable) kernel
     # that might support more hardware.
-    iso_new_kernel = makeIso {
+    iso_new_kernel = helpers.makeIso {
       module = ./modules/installer/cd-dvd/installation-cd-new-kernel.nix;
       type = "new-kernel";
     };
 
-
     # Provide a tarball that can be unpacked into an SD card, and easily
     # boot that system from uboot (like for the sheevaplug).
     # The pc variant helps preparing the expression for the system tarball
     # in a machine faster than the sheevpalug
-    system_tarball_pc = makeSystemTarball {
+    system_tarball_pc = helpers.makeSystenTarball {
       module = ./modules/installer/cd-dvd/system-tarball-pc.nix;
     };
 
     system_tarball_fuloong2f =
       assert builtins.currentSystem == "mips64-linux";
-      makeSystemTarball {
+      helpers.makeSystenTarball {
         module = ./modules/installer/cd-dvd/system-tarball-fuloong2f.nix;
       } { system = "mips64-linux"; };
 
     system_tarball_sheevaplug =
       assert builtins.currentSystem == "armv5tel-linux";
-      makeSystemTarball {
+      helpers.makeSystenTarball {
         module = ./modules/installer/cd-dvd/system-tarball-sheevaplug.nix;
       } { system = "armv5tel-linux"; };
 
@@ -192,7 +119,4 @@ let
         xfce = t.xfce.test;
       };
 
-  };
-
-
-in jobs
+}
-- 
GitLab


From f0dfd7d06a8bf8889cb28d8c59d848e7544129a2 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 22 Feb 2012 20:29:00 +0000
Subject: [PATCH 3363/5331] made kde4's phonon backends configurable

svn path=/nixos/trunk/; revision=32481
---
 .../services/x11/desktop-managers/kde4.nix    | 44 +++++++++++++------
 1 file changed, 30 insertions(+), 14 deletions(-)

diff --git a/modules/services/x11/desktop-managers/kde4.nix b/modules/services/x11/desktop-managers/kde4.nix
index d5deccb5b93..2f7f62ce416 100644
--- a/modules/services/x11/desktop-managers/kde4.nix
+++ b/modules/services/x11/desktop-managers/kde4.nix
@@ -26,15 +26,40 @@ let
         '';
     };
 
+  phononBackends = {
+    gstreamer = [
+      pkgs.phonon_backend_gstreamer
+      pkgs.gst_all.gstPluginsBase
+      pkgs.gst_all.gstPluginsGood
+      pkgs.gst_all.gstPluginsUgly
+      pkgs.gst_all.gstPluginsBad
+      pkgs.gst_all.gstFfmpeg # for mp3 playback
+      pkgs.gst_all.gstreamer # needed?
+    ];
+
+    vlc = [pkgs.phonon_backend_vlc];
+  };
+
+  phononBackendPackages = flip concatMap cfg.phononBackends
+    (name: attrByPath [name] (throw "unknown phonon backend `${name}'") phononBackends);
 in
 
 {
   options = {
 
-    services.xserver.desktopManager.kde4.enable = mkOption {
-      default = false;
-      example = true;
-      description = "Enable the KDE 4 desktop environment.";
+    services.xserver.desktopManager.kde4 = {
+      enable = mkOption {
+        default = false;
+        example = true;
+        description = "Enable the KDE 4 desktop environment.";
+      };
+
+      phononBackends = mkOption {
+        type = types.list types.string;
+        default = ["gstreamer"];
+        example = ["gstreamer" "vlc"];
+        description = "Which phonon multimedia backend kde should use";
+      };
     };
 
     environment.kdePackages = mkOption {
@@ -110,15 +135,6 @@ in
           # Starts KDE's Polkit authentication agent.
           pkgs.kde4.polkit_kde_agent
 
-          # Phonon backends.
-          pkgs.phonon_backend_gstreamer
-          pkgs.gst_all.gstPluginsBase
-          pkgs.gst_all.gstPluginsGood
-          pkgs.gst_all.gstPluginsUgly
-          pkgs.gst_all.gstPluginsBad
-          pkgs.gst_all.gstFfmpeg # for mp3 playback
-          pkgs.gst_all.gstreamer # needed?
-
           # Miscellaneous runtime dependencies.
           pkgs.kde4.qt4 # needed for qdbus
           pkgs.shared_mime_info
@@ -128,7 +144,7 @@ in
           pkgs.shared_desktop_ontologies # used by nepomuk
           pkgs.strigi # used by nepomuk
         ]
-      ++ [ nepomukConfig ]
+      ++ [ nepomukConfig ] ++ phononBackendPackages
       ++ config.environment.kdePackages;
 
     environment.pathsToLink = [ "/share" ];
-- 
GitLab


From d16fdad9fd154cf7a4f1f73f1deee1f651cf9d7c Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 23 Feb 2012 12:00:05 +0000
Subject: [PATCH 3364/5331] Revert "split release.nix into helpers and the jobs
 themselves".

Change r32480 was made due to a misunderstanding.

svn path=/nixos/trunk/; revision=32512
---
 lib/release-helpers.nix | 72 -------------------------------
 release.nix             | 96 ++++++++++++++++++++++++++++++++++++-----
 2 files changed, 86 insertions(+), 82 deletions(-)
 delete mode 100644 lib/release-helpers.nix

diff --git a/lib/release-helpers.nix b/lib/release-helpers.nix
deleted file mode 100644
index 3eacef90f2c..00000000000
--- a/lib/release-helpers.nix
+++ /dev/null
@@ -1,72 +0,0 @@
-{ nixpkgs ? ../../nixpkgs }:
-
-{
-  makeIso =
-    { module, type, description ? type, maintainers ? ["eelco"] }:
-    { nixosSrc ? {outPath = ./.; rev = 1234;}
-    , officialRelease ? false
-    , system ? "i686-linux"
-    }:
-
-    with import nixpkgs {inherit system;};
-
-    let
-
-      version = builtins.readFile ../VERSION + (if officialRelease then "" else "pre${toString nixosSrc.rev}");
-
-      versionModule =
-        { system.nixosVersion = version;
-          isoImage.isoBaseName = "nixos-${type}";
-        };
-
-      config = (import ./eval-config.nix {
-        inherit system nixpkgs;
-        modules = [ module versionModule ];
-      }).config;
-
-      iso = config.system.build.isoImage;
-
-    in
-      # Declare the ISO as a build product so that it shows up in Hydra.
-      runCommand "nixos-iso-${version}"
-        { meta = {
-            description = "NixOS installation CD (${description}) - ISO image for ${system}";
-            maintainers = map (x: lib.getAttr x lib.maintainers) maintainers;
-          };
-          inherit iso;
-          passthru = { inherit config; };
-        }
-        ''
-          ensureDir $out/nix-support
-          echo "file iso" $iso/iso/*.iso* >> $out/nix-support/hydra-build-products
-        ''; # */
-
-
-  makeSystemTarball =
-    { module, maintainers ? ["viric"]}:
-    { nixosSrc ? {outPath = ./.; rev = 1234;}
-    , officialRelease ? false
-    , system ? "i686-linux"
-    }:
-
-    with import nixpkgs {inherit system;};
-    let
-      version = builtins.readFile ../VERSION + (if officialRelease then "" else "pre${toString nixosSrc.rev}");
-
-      versionModule = { system.nixosVersion = version; };
-
-      config = (import ./eval-config.nix {
-        inherit system nixpkgs;
-        modules = [ module versionModule ];
-      }).config;
-
-      tarball = config.system.build.tarball;
-    in
-      tarball //
-        { meta = {
-            description = "NixOS system tarball for ${system} - ${stdenv.platform.name}";
-            maintainers = map (x: lib.getAttr x lib.maintainers) maintainers;
-          };
-          inherit config;
-        };
-}
diff --git a/release.nix b/release.nix
index 2d29e6fc686..44d87e154cd 100644
--- a/release.nix
+++ b/release.nix
@@ -1,9 +1,81 @@
 { nixpkgs ? ../nixpkgs }:
 
-let helpers = import ./lib/release-helpers.nix { inherit nixpkgs; };
+let
+
+
+  makeIso =
+    { module, type, description ? type, maintainers ? ["eelco"] }:
+    { nixosSrc ? {outPath = ./.; rev = 1234;}
+    , officialRelease ? false
+    , system ? "i686-linux"
+    }:
+
+    with import nixpkgs {inherit system;};
+
+    let
+
+      version = builtins.readFile ./VERSION + (if officialRelease then "" else "pre${toString nixosSrc.rev}");
+
+      versionModule =
+        { system.nixosVersion = version;
+          isoImage.isoBaseName = "nixos-${type}";
+        };
+
+      config = (import lib/eval-config.nix {
+        inherit system nixpkgs;
+        modules = [ module versionModule ];
+      }).config;
+
+      iso = config.system.build.isoImage;
+
+    in
+      # Declare the ISO as a build product so that it shows up in Hydra.
+      runCommand "nixos-iso-${version}"
+        { meta = {
+            description = "NixOS installation CD (${description}) - ISO image for ${system}";
+            maintainers = map (x: lib.getAttr x lib.maintainers) maintainers;
+          };
+          inherit iso;
+          passthru = { inherit config; };
+        }
+        ''
+          ensureDir $out/nix-support
+          echo "file iso" $iso/iso/*.iso* >> $out/nix-support/hydra-build-products
+        ''; # */
+
+
+  makeSystemTarball =
+    { module, maintainers ? ["viric"]}:
+    { nixosSrc ? {outPath = ./.; rev = 1234;}
+    , officialRelease ? false
+    , system ? "i686-linux"
+    }:
+
+    with import nixpkgs {inherit system;};
+    let
+      version = builtins.readFile ./VERSION + (if officialRelease then "" else "pre${toString nixosSrc.rev}");
+
+      versionModule = { system.nixosVersion = version; };
+
+      config = (import lib/eval-config.nix {
+        inherit system nixpkgs;
+        modules = [ module versionModule ];
+      }).config;
+
+      tarball = config.system.build.tarball;
+    in
+      tarball //
+        { meta = {
+            description = "NixOS system tarball for ${system} - ${stdenv.platform.name}";
+            maintainers = map (x: lib.getAttr x lib.maintainers) maintainers;
+          };
+          inherit config;
+        };
+
+
+  jobs = rec {
+
 
-in
-rec {
     tarball =
       { nixosSrc ? {outPath = ./.; rev = 1234;}
       , officialRelease ? false
@@ -48,40 +120,41 @@ rec {
       }).manual;
 
 
-    iso_minimal = helpers.makeIso {
+    iso_minimal = makeIso {
       module = ./modules/installer/cd-dvd/installation-cd-minimal.nix;
       type = "minimal";
     };
 
-    iso_graphical = helpers.makeIso {
+    iso_graphical = makeIso {
       module = ./modules/installer/cd-dvd/installation-cd-graphical.nix;
       type = "graphical";
     };
 
     # A variant with a more recent (but possibly less stable) kernel
     # that might support more hardware.
-    iso_new_kernel = helpers.makeIso {
+    iso_new_kernel = makeIso {
       module = ./modules/installer/cd-dvd/installation-cd-new-kernel.nix;
       type = "new-kernel";
     };
 
+
     # Provide a tarball that can be unpacked into an SD card, and easily
     # boot that system from uboot (like for the sheevaplug).
     # The pc variant helps preparing the expression for the system tarball
     # in a machine faster than the sheevpalug
-    system_tarball_pc = helpers.makeSystenTarball {
+    system_tarball_pc = makeSystemTarball {
       module = ./modules/installer/cd-dvd/system-tarball-pc.nix;
     };
 
     system_tarball_fuloong2f =
       assert builtins.currentSystem == "mips64-linux";
-      helpers.makeSystenTarball {
+      makeSystemTarball {
         module = ./modules/installer/cd-dvd/system-tarball-fuloong2f.nix;
       } { system = "mips64-linux"; };
 
     system_tarball_sheevaplug =
       assert builtins.currentSystem == "armv5tel-linux";
-      helpers.makeSystenTarball {
+      makeSystemTarball {
         module = ./modules/installer/cd-dvd/system-tarball-sheevaplug.nix;
       } { system = "armv5tel-linux"; };
 
@@ -119,4 +192,7 @@ rec {
         xfce = t.xfce.test;
       };
 
-}
+  };
+
+
+in jobs
-- 
GitLab


From 8f8472d444a1dadc18e86e395ad48d6e72f0e148 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 23 Feb 2012 21:25:22 +0000
Subject: [PATCH 3365/5331] * Fix bad default.

svn path=/nixos/trunk/; revision=32525
---
 modules/virtualisation/nova.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/virtualisation/nova.nix b/modules/virtualisation/nova.nix
index fcaf1c0073b..05c68e2bbff 100644
--- a/modules/virtualisation/nova.nix
+++ b/modules/virtualisation/nova.nix
@@ -43,7 +43,7 @@ in
 
     virtualisation.nova.extraConfig =
       mkOption {
-        default = false;
+        default = "";
         description =
           ''
             Additional text appended to <filename>nova.conf</filename>,
-- 
GitLab


From acea54b3c6e9193ce51aa43c5d4ad4f232a62047 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sat, 25 Feb 2012 17:31:39 +0000
Subject: [PATCH 3366/5331] * In the users...keyFiles option, the "string" type
 doesn't work very   well because elements could be paths, e.g.

    users.extraUsers.root.openssh.authorizedKeys.keyFiles =
      [ ./id_key.pub ];

  So disable the type check for now.

svn path=/nixos/trunk/; revision=32558
---
 modules/services/networking/ssh/sshd.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/services/networking/ssh/sshd.nix b/modules/services/networking/ssh/sshd.nix
index 9e18133595b..0188293a08c 100644
--- a/modules/services/networking/ssh/sshd.nix
+++ b/modules/services/networking/ssh/sshd.nix
@@ -57,7 +57,7 @@ let
       };
 
       keyFiles = mkOption {
-        type = types.listOf types.string;
+        #type = types.listOf types.string;
         default = [];
         description = ''
           A list of files each containing one OpenSSH public keys that should be
-- 
GitLab


From d9d6fb58e4f324a442866acd4a7445866ae9fbf1 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sat, 25 Feb 2012 20:10:53 +0000
Subject: [PATCH 3367/5331] * Prevent the VirtualBox guest additions from being
 restarted   constantly by Upstart.  Also move the module to a better
 location.

svn path=/nixos/trunk/; revision=32565
---
 .../virtualbox.nix => virtualisation/virtualbox-guest.nix} | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)
 rename modules/{services/misc/virtualbox.nix => virtualisation/virtualbox-guest.nix} (84%)

diff --git a/modules/services/misc/virtualbox.nix b/modules/virtualisation/virtualbox-guest.nix
similarity index 84%
rename from modules/services/misc/virtualbox.nix
rename to modules/virtualisation/virtualbox-guest.nix
index 573666cebb1..eecae8dc7b5 100644
--- a/modules/services/misc/virtualbox.nix
+++ b/modules/virtualisation/virtualbox-guest.nix
@@ -1,4 +1,5 @@
-# VirtualBox server
+# Module for VirtualBox guests.
+
 { config, pkgs, ... }:
 
 with pkgs.lib;
@@ -32,7 +33,7 @@ in
 
   config = mkIf cfg.enable {
 
-    environment.systemPackages = [ ];
+    environment.systemPackages = [ kernel.virtualboxGuestAdditions ];
 
     boot.extraModulePackages = [ kernel.virtualboxGuestAdditions ];
 
@@ -41,7 +42,7 @@ in
 
         startOn = "started udev";
 
-        exec = "${kernel.virtualboxGuestAdditions}/sbin/VBoxService";
+        exec = "${kernel.virtualboxGuestAdditions}/sbin/VBoxService --foreground";
       };
 
   };
-- 
GitLab


From aa77ba0c19af0725bd9024e8afc2ff2eab7dcd0e Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sat, 25 Feb 2012 20:11:04 +0000
Subject: [PATCH 3368/5331] * Forgot this.

svn path=/nixos/trunk/; revision=32566
---
 modules/module-list.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/module-list.nix b/modules/module-list.nix
index eaa924e76c2..17bc561da80 100644
--- a/modules/module-list.nix
+++ b/modules/module-list.nix
@@ -96,7 +96,6 @@
   ./services/misc/rogue.nix
   ./services/misc/svnserve.nix
   ./services/misc/synergy.nix
-  ./services/misc/virtualbox.nix
   ./services/monitoring/monit.nix
   ./services/monitoring/nagios/default.nix
   ./services/monitoring/smartd.nix
@@ -206,5 +205,6 @@
   ./tasks/tty-backgrounds.nix
   ./virtualisation/libvirtd.nix
   ./virtualisation/nova.nix
+  ./virtualisation/virtualbox-guest.nix
   ./virtualisation/xen-dom0.nix
 ]
-- 
GitLab


From 933ce8e9c8c781860b2207eaa755720e1ac926bd Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sat, 25 Feb 2012 21:36:00 +0000
Subject: [PATCH 3369/5331] * Module for building a VirtualBox disk image
 (.vdi).  TODO: merge   this with the Amazon and Nova image builders.

svn path=/nixos/trunk/; revision=32570
---
 modules/virtualisation/virtualbox-image.nix | 84 +++++++++++++++++++++
 1 file changed, 84 insertions(+)
 create mode 100644 modules/virtualisation/virtualbox-image.nix

diff --git a/modules/virtualisation/virtualbox-image.nix b/modules/virtualisation/virtualbox-image.nix
new file mode 100644
index 00000000000..7079b43708d
--- /dev/null
+++ b/modules/virtualisation/virtualbox-image.nix
@@ -0,0 +1,84 @@
+{ config, pkgs, ... }:
+
+with pkgs.lib;
+
+{
+  system.build.virtualBoxImage =
+    pkgs.vmTools.runInLinuxVM (
+      pkgs.runCommand "virtualbox-image"
+        { preVM =
+            ''
+              mkdir $out
+              diskImage=$out/image
+              ${pkgs.vmTools.kvm}/bin/qemu-img create -f raw $diskImage "4G"
+              mv closure xchg/
+            '';
+          postVM =
+            ''
+              ${pkgs.vmTools.kvm}/bin/qemu-img convert -f raw -O vdi $diskImage $out/disk.vdi
+              rm $diskImage
+            '';
+          buildInputs = [ pkgs.utillinux pkgs.perl ];
+          exportReferencesGraph =
+            [ "closure" config.system.build.toplevel ];
+        }
+        ''
+          # Create a single / partition.
+          ${pkgs.parted}/sbin/parted /dev/vda mklabel msdos
+          ${pkgs.parted}/sbin/parted /dev/vda -- mkpart primary ext2 1M -1s
+          . /sys/class/block/vda1/uevent
+          mknod /dev/vda1 b $MAJOR $MINOR
+
+          # Create an empty filesystem and mount it.
+          ${pkgs.e2fsprogs}/sbin/mkfs.ext3 -L nixos /dev/vda1
+          ${pkgs.e2fsprogs}/sbin/tune2fs -c 0 -i 0 /dev/vda1
+          mkdir /mnt
+          mount /dev/vda1 /mnt
+
+          # The initrd expects these directories to exist.
+          mkdir /mnt/dev /mnt/proc /mnt/sys
+          mount --bind /proc /mnt/proc
+          mount --bind /dev /mnt/dev
+          mount --bind /sys /mnt/sys
+
+          # Copy all paths in the closure to the filesystem.
+          storePaths=$(perl ${pkgs.pathsFromGraph} /tmp/xchg/closure)
+
+          mkdir -p /mnt/nix/store
+          ${pkgs.rsync}/bin/rsync -av $storePaths /mnt/nix/store/
+
+          # Register the paths in the Nix database.
+          printRegistration=1 perl ${pkgs.pathsFromGraph} /tmp/xchg/closure | \
+              chroot /mnt ${config.environment.nix}/bin/nix-store --load-db
+
+          # Create the system profile to allow nixos-rebuild to work.
+          chroot /mnt ${config.environment.nix}/bin/nix-env \
+              -p /nix/var/nix/profiles/system --set ${config.system.build.toplevel}
+
+          # `nixos-rebuild' requires an /etc/NIXOS.
+          mkdir -p /mnt/etc
+          touch /mnt/etc/NIXOS
+
+          # Install a configuration.nix.
+          mkdir -p /mnt/etc/nixos
+          cp ${./nova-config.nix} /mnt/etc/nixos/configuration.nix
+
+          # Generate the GRUB menu.
+          chroot /mnt ${config.system.build.toplevel}/bin/switch-to-configuration boot
+
+          umount /mnt/proc /mnt/dev /mnt/sys
+          umount /mnt
+        ''
+    );
+
+  fileSystems =
+    [ { mountPoint = "/";
+        device = "/dev/disk/by-label/nixos";
+      }
+    ];
+
+  boot.loader.grub.version = 2;
+  boot.loader.grub.device = "/dev/vda";
+
+  services.virtualbox.enable = true;
+}
-- 
GitLab


From f55cf99c7c8826c306eb87161f88b5b839057d95 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sun, 26 Feb 2012 00:12:04 +0000
Subject: [PATCH 3370/5331] * Typo.

svn path=/nixos/trunk/; revision=32571
---
 modules/virtualisation/amazon-image.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/virtualisation/amazon-image.nix b/modules/virtualisation/amazon-image.nix
index c1c31358d8c..a86cb1c64fd 100644
--- a/modules/virtualisation/amazon-image.nix
+++ b/modules/virtualisation/amazon-image.nix
@@ -100,7 +100,7 @@ with pkgs.lib;
           elif [ "$fsType" = ext3 ]; then
               mp="/disk$diskNr"
               diskNr=$((diskNr + 1))
-              echo "mounting $device om $mp..."
+              echo "mounting $device on $mp..."
               if mountFS "$device" "$mp" "" ext3; then
                   if [ -z "$diskForAufs" ]; then diskForAufs="$mp"; fi
               fi
-- 
GitLab


From 4f8d076ae770257c1daddad6280aa55baa3614b3 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 28 Feb 2012 10:30:12 +0000
Subject: [PATCH 3371/5331] * Allow the start/stop condition of OpenVPN jobs to
 be overriden   easily.

svn path=/nixos/trunk/; revision=32673
---
 modules/services/networking/openvpn.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/services/networking/openvpn.nix b/modules/services/networking/openvpn.nix
index bbd61180e02..c057bda5033 100644
--- a/modules/services/networking/openvpn.nix
+++ b/modules/services/networking/openvpn.nix
@@ -50,8 +50,8 @@ let
     in {
       description = "OpenVPN instance ‘${name}’";
 
-      startOn = "started network-interfaces";
-      stopOn = "stopping network-interfaces";
+      startOn = mkDefault "started network-interfaces";
+      stopOn = mkDefault "stopping network-interfaces";
 
       path = [ pkgs.iptables pkgs.iproute pkgs.nettools ];
 
-- 
GitLab


From b5dc3d520e0d4dec441c85355b25e2356d9d2ab9 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 28 Feb 2012 17:43:43 +0000
Subject: [PATCH 3372/5331] optionally run "btrfs device scan" during mountall.

As reported by Bryce L Nordgren.

Multi-disk btrfs filesystems need to get assembled first before they become mountable.
Enable this by explicitly assigning fsType = "btrfs" in the filesystems list in configuration.nix

svn path=/nixos/trunk/; revision=32682
---
 modules/tasks/filesystems.nix | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/modules/tasks/filesystems.nix b/modules/tasks/filesystems.nix
index f568b60baf8..614d4415062 100644
--- a/modules/tasks/filesystems.nix
+++ b/modules/tasks/filesystems.nix
@@ -3,9 +3,12 @@
 with pkgs.lib;
 
 let
+  needsBtrfsProgs = any (fs: fs.fsType == "btrfs") config.fileSystems;
 
   # Packages that provide fsck backends.
-  fsPackages = [ pkgs.e2fsprogs pkgs.reiserfsprogs pkgs.dosfstools ];
+  fsPackages = [ pkgs.e2fsprogs pkgs.reiserfsprogs pkgs.dosfstools ]
+             ++ optional needsBtrfsProgs pkgs.btrfsProgs;
+
 
 in
 
@@ -175,6 +178,7 @@ in
             exec > /dev/console 2>&1
             echo "mounting filesystems..."
             export PATH=${config.system.sbin.mount}/bin:${makeSearchPath "sbin" ([pkgs.utillinux] ++ fsPackages)}:$PATH
+            ${optionalString needsBtrfsProgs "${pkgs.btrfsProgs}/bin/btrfs device scan"}
             ${pkgs.mountall}/sbin/mountall
           '';
       };
-- 
GitLab


From e872efaa8d31875aa05332b6538707798bf6a5fa Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 28 Feb 2012 17:43:54 +0000
Subject: [PATCH 3373/5331] fixed mongodb upstart task

svn path=/nixos/trunk/; revision=32683
---
 modules/services/databases/mongodb.nix | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/modules/services/databases/mongodb.nix b/modules/services/databases/mongodb.nix
index 1c46424c14b..caa6ebc5acf 100644
--- a/modules/services/databases/mongodb.nix
+++ b/modules/services/databases/mongodb.nix
@@ -96,8 +96,7 @@ in
 
     jobs.mongodb =
       { description = "MongoDB server";
-        daemonType = "none";
-        respawn = false; # seems to interfere with normal stopping
+        daemonType = "fork";
 
         startOn = "filesystem";
 
@@ -110,7 +109,6 @@ in
           '';
 
         exec = "${pkgs.shadow}/bin/su ${cfg.user} -c \"${mongodb}/bin/mongod --config ${mongoCnf}\"";
-        preStop = "${pkgs.shadow}/bin/su ${cfg.user} -c \"${mongodb}/bin/mongod --config ${mongoCnf} --shutdown\"";
 
         extraConfig = "kill timeout 10";
       };
-- 
GitLab


From 8c88506e05a71755de74040552e5420f89b76e8c Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 29 Feb 2012 21:25:12 +0000
Subject: [PATCH 3374/5331] modules/config/networking.nix: list extraHosts
 *after* the local hostname

This change allows using extraHosts to specify additional aliases for 127.0.0.1
without overriding the local hostname in the process.

svn path=/nixos/trunk/; revision=32711
---
 modules/config/networking.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/config/networking.nix b/modules/config/networking.nix
index 4349b52347a..562d5144531 100644
--- a/modules/config/networking.nix
+++ b/modules/config/networking.nix
@@ -49,10 +49,10 @@ in
       { # /etc/hosts: Hostname-to-IP mappings.
         source = pkgs.writeText "hosts"
           ''
-            ${cfg.extraHosts}
             ${optionalString (cfg.hostName != "")
               "127.0.0.1 ${hostnameWithDomain} ${cfg.hostName}"}
             127.0.0.1 localhost ${localhostWithDomain}
+            ${cfg.extraHosts}
           '';
         target = "hosts";
       }
-- 
GitLab


From 742198c6ea841ea93cd09a9e5a1c5fa9ecff6a53 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 1 Mar 2012 13:49:47 +0000
Subject: [PATCH 3375/5331] * dhcpcd: Ignore vboxnet*.

svn path=/nixos/trunk/; revision=32716
---
 modules/services/networking/dhcpcd.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/services/networking/dhcpcd.nix b/modules/services/networking/dhcpcd.nix
index b94fe04be43..01c65c06865 100644
--- a/modules/services/networking/dhcpcd.nix
+++ b/modules/services/networking/dhcpcd.nix
@@ -32,7 +32,7 @@ let
       # Ignore peth* devices; on Xen, they're renamed physical
       # Ethernet cards used for bridging.  Likewise for vif* and tap*
       # (Xen) and virbr* and vnet* (libvirt).
-      denyinterfaces ${toString ignoredInterfaces} peth* vif* tap* tun* virbr* vnet*
+      denyinterfaces ${toString ignoredInterfaces} peth* vif* tap* tun* virbr* vnet* vboxnet*
     '';
 
   # Hook for emitting ip-up/ip-down events.
-- 
GitLab


From e8539b6f608ae24a7dd537b6261c5f69f41ed877 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 1 Mar 2012 14:46:47 +0000
Subject: [PATCH 3376/5331] * Generate a resolvconf.conf file for openresolv.

svn path=/nixos/trunk/; revision=32718
---
 modules/config/networking.nix | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/modules/config/networking.nix b/modules/config/networking.nix
index 562d5144531..18e0b834c98 100644
--- a/modules/config/networking.nix
+++ b/modules/config/networking.nix
@@ -56,5 +56,20 @@ in
           '';
         target = "hosts";
       }
+
+      { # /etc/resolvconf.conf: Configuration for openresolv.
+        source = pkgs.writeText "resolvconf.conf"
+          ''
+            # This is the default, but we must set it here to prevent
+            # a collision with an apparently unrelated environment
+            # variable with the same name exported by dhcpcd.
+            interface_order='lo lo[0-9]*'
+
+            # Invalidate the nscd cache whenever resolv.conf is
+            # regenerated.
+            libc_restart='${pkgs.upstart}/sbin/start invalidate-nscd'
+          '';
+        target = "resolvconf.conf";
+      }
     ];
 }
-- 
GitLab


From 58c6231a2089d8190509a762ca5e12c831c22c56 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 1 Mar 2012 20:10:08 +0000
Subject: [PATCH 3377/5331] * Added a module for enabling VirtualBox.

svn path=/nixos/trunk/; revision=32722
---
 modules/programs/virtualbox.nix | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)
 create mode 100644 modules/programs/virtualbox.nix

diff --git a/modules/programs/virtualbox.nix b/modules/programs/virtualbox.nix
new file mode 100644
index 00000000000..6d9f269b889
--- /dev/null
+++ b/modules/programs/virtualbox.nix
@@ -0,0 +1,19 @@
+{ config, pkgs, ... }:
+
+with pkgs.lib;
+
+{
+  boot.kernelModules = [ "vboxdrv" "vboxnetadp" "vboxnetflt" ];
+  boot.extraModulePackages = [ pkgs.linuxPackages.virtualbox ];
+  environment.systemPackages = [ pkgs.linuxPackages.virtualbox ];
+
+  # ‘VBoxNetAdpCtl’ needs to be setuid root to allow users to create
+  # host-only networks (https://www.virtualbox.org/ticket/4014).
+  security.setuidOwners = singleton
+    { program = "VBoxNetAdpCtl";
+      source = "${pkgs.linuxPackages.virtualbox}/virtualbox/VBoxNetAdpCtl";
+      owner = "root";
+      group = "root";
+      setuid = true;
+    };
+}
-- 
GitLab


From a6f410f1448404928f46e2bd8d1b8b42460494bb Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 1 Mar 2012 20:10:46 +0000
Subject: [PATCH 3378/5331] * Obsolete security.extraSetuidPrograms.

svn path=/nixos/trunk/; revision=32723
---
 modules/rename.nix                   |  2 ++
 modules/security/setuid-wrappers.nix | 24 +++++++++---------------
 2 files changed, 11 insertions(+), 15 deletions(-)

diff --git a/modules/rename.nix b/modules/rename.nix
index 9f1d00dd648..b92e4e06da5 100644
--- a/modules/rename.nix
+++ b/modules/rename.nix
@@ -67,6 +67,8 @@ in zipModules ([]
 # ++ rename alias "services.xserver.slim.theme" "services.xserver.displayManager.slim.theme"
 ++ rename obsolete "environment.extraPackages" "environment.systemPackages"
 
+++ rename obsolete "security.extraSetuidPrograms" "security.setuidPrograms"
+
 # Old Grub-related options.
 ++ rename obsolete "boot.copyKernels" "boot.loader.grub.copyKernels"
 ++ rename obsolete "boot.extraGrubEntries" "boot.loader.grub.extraEntries"
diff --git a/modules/security/setuid-wrappers.nix b/modules/security/setuid-wrappers.nix
index ebd9e1ed537..a81376517eb 100644
--- a/modules/security/setuid-wrappers.nix
+++ b/modules/security/setuid-wrappers.nix
@@ -27,17 +27,11 @@ in
     security.setuidPrograms = mkOption {
       default = [];
       description = ''
-        Only the programs from system path listed here will be made
-        setuid root (through a wrapper program).
-      '';
-    };
-
-    security.extraSetuidPrograms = mkOption {
-      default = [];
-      example = ["fusermount"];
-      description = ''
-        This option lists additional programs that must be made setuid
-        root. Obsolete, use setuidPrograms instead.
+        The Nix store cannot contain setuid/setgid programs directly.
+        For this reason, NixOS can automatically generate wrapper
+        programs that have the necessary privileges.  This option
+        lists the names of programs in the system environment for
+        which setuid root wrappers should be created.
       '';
     };
 
@@ -62,8 +56,9 @@ in
       default = "/var/setuid-wrappers";
       description = ''
         This option defines the path to the setuid wrappers.  It
-        should generally not be overriden. Some packages in nixpkgs rely on
-        wrapperDir == /var/setuid-wrappers
+        should generally not be overriden. Some packages in Nixpkgs
+        expect that <option>wrapperDir</option> is
+        <filename>/var/setuid-wrappers</filename>.
       '';
     };
 
@@ -81,8 +76,7 @@ in
       let
         setuidPrograms =
           (map (x: { program = x; owner = "root"; group = "root"; setuid = true; })
-            (config.security.setuidPrograms ++
-             config.security.extraSetuidPrograms))
+            config.security.setuidPrograms)
           ++ config.security.setuidOwners;
 
         makeSetuidWrapper =
-- 
GitLab


From d4f3443d33f1a5ed5d07ac8f915ae92cda3192b2 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 2 Mar 2012 12:36:07 +0000
Subject: [PATCH 3379/5331] * Remove obsolete script.

svn path=/nixos/trunk/; revision=32738
---
 maintainers/scripts/gen-module-list.sh | 68 --------------------------
 1 file changed, 68 deletions(-)
 delete mode 100755 maintainers/scripts/gen-module-list.sh

diff --git a/maintainers/scripts/gen-module-list.sh b/maintainers/scripts/gen-module-list.sh
deleted file mode 100755
index e964f11edd1..00000000000
--- a/maintainers/scripts/gen-module-list.sh
+++ /dev/null
@@ -1,68 +0,0 @@
-#!/bin/sh
-
-prog=$0
-
-usage(){
-  echo 1>&2 "
-$prog module-dir
-
-This script generates the \`module-list.nix' index file inside the
-module directory.
-"
-  exit 1
-}
-
-: ${NIXPKGS=/etc/nixos/nixpkgs}
-
-is_module(){
-  local file=$1
-  echo "
-    let
-      appIfFun = f: x: if builtins.isFunction f then f x else f;
-    in
-      builtins.isAttrs (
-        appIfFun (import $file) {
-          pkgs = (import $NIXPKGS) {};
-          config = {};
-          dummy = 42;
-        }
-      )
-  " | nix-instantiate - --eval-only
-}
-
-find_mask(){
-  local maskfile="$1"
-  if test -r "${maskfile}"; then
-    cat "${maskfile}"
-    echo
-    echo "./module-list.nix"
-  else
-    echo "./module-list.nix"
-  fi | \
-  sed -ne 's/[ 	]*#.*//; /^[ 	]*$/ d; s/\(.*\)/-wholename '"'\1'"' -or /p' | tr -d '\n'
-}
-
-generate_index(){
-  local path="$1"
-  cd "$path"
-  echo -n "$path: " 1>&2
-  { echo "[ # This file has been generated by $(basename $prog)";
-    for file in : $(eval find ./ $(find_mask ./module-list.mask) -type f -name "'*.nix'" -print | sort); do
-       [ "$file" = ':' ] && continue;
-       echo -n . 1>&2
-       if test "$(is_module "$file" 2> /dev/null)" = "Bool(True)"; then
-         echo "  $file"
-       else
-         echo "##### $file"
-         is_module "$file" 2>&1 | sed "s/^/# /; s,$(pwd),.,"
-       fi
-    done
-    echo ']';
-  } > ./module-list.nix
-  echo 1>&2
-  cd - > /dev/null
-}
-
-[ $# -eq 1 ] || usage;
-
-generate_index "$1"
-- 
GitLab


From 29d84af677a4909777aaac85b5799534590f95f1 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 2 Mar 2012 12:38:22 +0000
Subject: [PATCH 3380/5331] * Remove the use of the NIXPKGS and NIXOS
 environment variables.   Instead use $NIX_PATH.  NIXOS_CONFIG is still
 supported.

svn path=/nixos/trunk/; revision=32739
---
 default.nix                                   |  2 +-
 doc/manual/man-nixos-build-vms.xml            | 23 ----------------
 doc/manual/man-nixos-deploy-network.xml       | 23 ----------------
 doc/manual/man-nixos-option.xml               | 16 ------------
 doc/manual/man-nixos-rebuild.xml              | 16 ------------
 lib/build-vms.nix                             |  6 ++---
 lib/eval-config.nix                           |  9 +++----
 lib/testing.nix                               |  6 ++---
 maintainers/option-usages.nix                 |  2 +-
 .../tools/nixos-build-vms/build-vms.nix       |  5 ++--
 .../tools/nixos-build-vms/nixos-build-vms.sh  |  4 +--
 modules/installer/tools/nixos-install.sh      | 23 ++++------------
 modules/installer/tools/nixos-option.sh       | 15 ++---------
 modules/installer/tools/nixos-rebuild.sh      | 26 +++++++------------
 modules/programs/bash/profile.sh              |  1 -
 tests/default.nix                             |  6 ++---
 16 files changed, 34 insertions(+), 149 deletions(-)

diff --git a/default.nix b/default.nix
index 6c0934724c7..fda19c3a149 100644
--- a/default.nix
+++ b/default.nix
@@ -1,4 +1,4 @@
-{ configuration ? import ./lib/from-env.nix "NIXOS_CONFIG" /etc/nixos/configuration.nix
+{ configuration ? import ./lib/from-env.nix "NIXOS_CONFIG" <nixos-config>
 , system ? builtins.currentSystem
 }:
 
diff --git a/doc/manual/man-nixos-build-vms.xml b/doc/manual/man-nixos-build-vms.xml
index 328d8d4f2ed..f37677629d0 100644
--- a/doc/manual/man-nixos-build-vms.xml
+++ b/doc/manual/man-nixos-build-vms.xml
@@ -107,27 +107,4 @@ for the same architecture as the host system.
 </refsection>
 
 
-<refsection><title>Environment variables</title>
-
-<variablelist>
-
-  <varlistentry>
-    <term><envar>NIXOS</envar></term>
-    <listitem>
-      <para>Path to the NixOS source tree.  Defaults to
-      <filename>/etc/nixos/nixos</filename>.</para>
-    </listitem>
-  </varlistentry>
-
-  <varlistentry>
-    <term><envar>NIXPKGS_ALL</envar></term>
-    <listitem>
-      <para>Path to the Nixpkgs source tree.  Defaults to
-      <filename>/etc/nixos/nixpkgs</filename>.</para>
-    </listitem>
-  </varlistentry>
-</variablelist>
-
-</refsection>
-
 </refentry>
diff --git a/doc/manual/man-nixos-deploy-network.xml b/doc/manual/man-nixos-deploy-network.xml
index 2a1f78f6ff8..9667fef180e 100644
--- a/doc/manual/man-nixos-deploy-network.xml
+++ b/doc/manual/man-nixos-deploy-network.xml
@@ -109,27 +109,4 @@ for the same architecture as the host system.
 </refsection>
 
 
-<refsection><title>Environment variables</title>
-
-<variablelist>
-
-  <varlistentry>
-    <term><envar>NIXOS</envar></term>
-    <listitem>
-      <para>Path to the NixOS source tree.  Defaults to
-      <filename>/etc/nixos/nixos</filename>.</para>
-    </listitem>
-  </varlistentry>
-
-  <varlistentry>
-    <term><envar>NIXPKGS_ALL</envar></term>
-    <listitem>
-      <para>Path to the Nixpkgs source tree.  Defaults to
-      <filename>/etc/nixos/nixpkgs</filename>.</para>
-    </listitem>
-  </varlistentry>
-</variablelist>
-
-</refsection>
-
 </refentry>
diff --git a/doc/manual/man-nixos-option.xml b/doc/manual/man-nixos-option.xml
index b88daa51db6..f7a8ce403dc 100644
--- a/doc/manual/man-nixos-option.xml
+++ b/doc/manual/man-nixos-option.xml
@@ -111,22 +111,6 @@ by <command>nixos-hardware-scan</command>.</para>
     </listitem>
   </varlistentry>
 
-  <varlistentry>
-    <term><envar>NIXOS</envar></term>
-    <listitem>
-      <para>Path to the NixOS source tree.  Defaults to
-      <filename>/etc/nixos/nixos</filename>.</para>
-    </listitem>
-  </varlistentry>
-
-  <varlistentry>
-    <term><envar>NIXPKGS</envar></term>
-    <listitem>
-      <para>Path to the Nixpkgs source tree.  Defaults to
-      <filename>/etc/nixos/nixpkgs</filename>.</para>
-    </listitem>
-  </varlistentry>
-
   <varlistentry>
     <term><envar>NIXOS_CONFIG</envar></term>
     <listitem>
diff --git a/doc/manual/man-nixos-rebuild.xml b/doc/manual/man-nixos-rebuild.xml
index 2e07246cf8d..0b55540126c 100644
--- a/doc/manual/man-nixos-rebuild.xml
+++ b/doc/manual/man-nixos-rebuild.xml
@@ -271,22 +271,6 @@ the Nix manual for details.</para>
 
 <variablelist>
 
-  <varlistentry>
-    <term><envar>NIXOS</envar></term>
-    <listitem>
-      <para>Path to the NixOS source tree.  Defaults to
-      <filename>/etc/nixos/nixos</filename>.</para>
-    </listitem>
-  </varlistentry>
-
-  <varlistentry>
-    <term><envar>NIXPKGS</envar></term>
-    <listitem>
-      <para>Path to the Nixpkgs source tree.  Defaults to
-      <filename>/etc/nixos/nixpkgs</filename>.</para>
-    </listitem>
-  </varlistentry>
-
   <varlistentry>
     <term><envar>NIXOS_CONFIG</envar></term>
     <listitem>
diff --git a/lib/build-vms.nix b/lib/build-vms.nix
index 87ca2a711d1..e8e5885137d 100644
--- a/lib/build-vms.nix
+++ b/lib/build-vms.nix
@@ -1,6 +1,6 @@
-{ nixpkgs, system }:
+{ system }:
 
-let pkgs = import nixpkgs { config = {}; inherit system; }; in
+let pkgs = import <nixpkgs> { config = {}; inherit system; }; in
 
 with pkgs;
 with import ../lib/qemu-flags.nix;
@@ -22,7 +22,7 @@ rec {
     nodes: configurations:
 
     import ./eval-config.nix {
-      inherit nixpkgs system;
+      inherit system;
       modules = configurations ++
         [ ../modules/virtualisation/qemu-vm.nix
           ../modules/testing/test-instrumentation.nix # !!! should only get added for automated test runs
diff --git a/lib/eval-config.nix b/lib/eval-config.nix
index c646d52c802..ffc0db1c7ea 100644
--- a/lib/eval-config.nix
+++ b/lib/eval-config.nix
@@ -3,7 +3,6 @@
 # values.
 
 { system ? builtins.currentSystem
-, nixpkgs ? import ./from-env.nix "NIXPKGS" /etc/nixos/nixpkgs
 , pkgs ? null
 , baseModules ? import ../modules/module-list.nix
 , extraArgs ? {}
@@ -31,7 +30,7 @@ rec {
   extraArgs = extraArgs_ // {
     inherit pkgs modules baseModules;
     modulesPath = ../modules;
-    pkgs_i686 = import nixpkgs { system = "i686-linux"; };
+    pkgs_i686 = import <nixpkgs> { system = "i686-linux"; };
   };
 
   # Import Nixpkgs, allowing the NixOS option nixpkgs.config to
@@ -47,15 +46,15 @@ rec {
   pkgs =
     if pkgs_ != null
     then pkgs_
-    else import nixpkgs (
+    else import <nixpkgs> (
       let
         system = if nixpkgsOptions.system != "" then nixpkgsOptions.system else system_;
         nixpkgsOptions = (import ./eval-config.nix {
-          inherit system nixpkgs extraArgs modules;
+          inherit system extraArgs modules;
           # For efficiency, leave out most NixOS modules; they don't
           # define nixpkgs.config, so it's pointless to evaluate them.
           baseModules = [ ../modules/misc/nixpkgs.nix ];
-          pkgs = import nixpkgs { system = system_; config = {}; };
+          pkgs = import <nixpkgs> { system = system_; config = {}; };
         }).optionDefinitions.nixpkgs;
       in
       {
diff --git a/lib/testing.nix b/lib/testing.nix
index 9b49bad580f..c8e3d7bbc97 100644
--- a/lib/testing.nix
+++ b/lib/testing.nix
@@ -1,6 +1,6 @@
-{ nixpkgs, system }:
+{ system }:
 
-with import ./build-vms.nix { inherit nixpkgs system; };
+with import ./build-vms.nix { inherit system; };
 with pkgs;
 
 rec {
@@ -118,7 +118,7 @@ rec {
   makeTests = testsFun: lib.mapAttrs (name: complete) (call testsFun);
 
   apply = makeTest; # compatibility
-  call = f: f { inherit pkgs nixpkgs system; };
+  call = f: f { inherit pkgs system; };
 
   complete = t: t // rec {
     nodes = buildVirtualNetwork (
diff --git a/maintainers/option-usages.nix b/maintainers/option-usages.nix
index e0532e9e548..7413b9e18ce 100644
--- a/maintainers/option-usages.nix
+++ b/maintainers/option-usages.nix
@@ -1,4 +1,4 @@
-{ configuration ? import ../lib/from-env.nix "NIXOS_CONFIG" /etc/nixos/configuration.nix
+{ configuration ? import ../lib/from-env.nix "NIXOS_CONFIG" <nixos-config>
 
 # []: display all options
 # [<option names>]: display the selected options
diff --git a/modules/installer/tools/nixos-build-vms/build-vms.nix b/modules/installer/tools/nixos-build-vms/build-vms.nix
index 9ed574a4e24..5e77b701ff5 100644
--- a/modules/installer/tools/nixos-build-vms/build-vms.nix
+++ b/modules/installer/tools/nixos-build-vms/build-vms.nix
@@ -1,10 +1,9 @@
-{ nixpkgs
-, system ? builtins.currentSystem
+{ system ? builtins.currentSystem
 , networkExpr
 }:
 
 let nodes = import networkExpr; in
 
-with import ../../../../lib/testing.nix { inherit nixpkgs system; };
+with import ../../../../lib/testing.nix { inherit system; };
 
 (complete { inherit nodes; testScript = ""; }).driver
diff --git a/modules/installer/tools/nixos-build-vms/nixos-build-vms.sh b/modules/installer/tools/nixos-build-vms/nixos-build-vms.sh
index 8fa9ea925fb..acdc7ebc5c2 100644
--- a/modules/installer/tools/nixos-build-vms/nixos-build-vms.sh
+++ b/modules/installer/tools/nixos-build-vms/nixos-build-vms.sh
@@ -58,5 +58,5 @@ fi
 
 # Build a network of VMs
 
-nix-build ${NIXOS:-/etc/nixos/nixos}/modules/installer/tools/nixos-build-vms/build-vms.nix \
-    --argstr networkExpr $networkExpr --argstr nixpkgs "${NIXPKGS_ALL:-/etc/nixos/nixpkgs}" $noOutLinkArg $showTraceArg
+nix-build '<nixos>/modules/installer/tools/nixos-build-vms/build-vms.nix' \
+    --argstr networkExpr $networkExpr  $noOutLinkArg $showTraceArg
diff --git a/modules/installer/tools/nixos-install.sh b/modules/installer/tools/nixos-install.sh
index 5b7746b6162..e1b4ac4da1f 100644
--- a/modules/installer/tools/nixos-install.sh
+++ b/modules/installer/tools/nixos-install.sh
@@ -15,10 +15,6 @@ if test -z "$mountPoint"; then
     mountPoint=/mnt
 fi
 
-if test -z "$NIXOS"; then
-    NIXOS=/etc/nixos/nixos
-fi
-
 # NIXOS_CONFIG is interpreted relative to $mountPoint.
 if test -z "$NIXOS_CONFIG"; then
     NIXOS_CONFIG=/etc/nixos/configuration.nix
@@ -34,20 +30,12 @@ if ! grep -F -q " $mountPoint " /proc/mounts; then
     exit 1
 fi
     
-if ! test -e "$NIXOS"; then
-    echo "NixOS source directory $NIXOS doesn't exist"
-    exit 1
-fi
-    
 if ! test -e "$mountPoint/$NIXOS_CONFIG"; then
     echo "configuration file $mountPoint/$NIXOS_CONFIG doesn't exist"
     exit 1
 fi
     
 
-NIXOS=$(readlink -f "$NIXOS")
-
-
 # Enable networking in the chroot.
 mkdir -m 0755 -p $mountPoint/etc
 touch /etc/resolv.conf 
@@ -153,10 +141,9 @@ fi
 # Build the specified Nix expression in the target store and install
 # it into the system configuration profile.
 echo "building the system configuration..."
-NIXPKGS=/mnt/etc/nixos/nixpkgs chroot $mountPoint @nix@/bin/nix-env \
-    -p /nix/var/nix/profiles/system \
-    -f "/mnt$NIXOS" \
-    --set -A system
+NIX_PATH=nixpkgs=/mnt/etc/nixos/nixpkgs:nixos=/mnt/etc/nixos/nixos \
+    chroot $mountPoint @nix@/bin/nix-env \
+    -p /nix/var/nix/profiles/system -f '<nixos>' --set -A system
 
 
 # Make a backup of the old NixOS/Nixpkgs sources.
@@ -176,8 +163,8 @@ fi
 
 
 # Copy the NixOS/Nixpkgs sources to the target.
-cp -prd $NIXOS $targetNixos
-if test -e /etc/nixos/nixpkgs; then
+cp -prd /etc/nixos/nixos $targetNixos
+if [ -e /etc/nixos/nixpkgs ]; then
     cp -prd /etc/nixos/nixpkgs $targetNixpkgs
 fi
 
diff --git a/modules/installer/tools/nixos-option.sh b/modules/installer/tools/nixos-option.sh
index 2ad2caa252f..e5c681f1a4a 100644
--- a/modules/installer/tools/nixos-option.sh
+++ b/modules/installer/tools/nixos-option.sh
@@ -4,10 +4,7 @@
 # file to be overridden.
 
 : ${mountPoint=/mnt}
-: ${NIXOS=/etc/nixos/nixos}
 : ${NIXOS_CONFIG=/etc/nixos/configuration.nix}
-: ${NIXPKGS=/etc/nixos/nixpkgs}
-export NIXOS
 
 usage () {
   echo 1>&2 "
@@ -38,9 +35,7 @@ Options:
 Environment variables affecting $0:
 
   \$mountPoint          Path to the target file system.
-  \$NIXOS               Path where the NixOS repository is located.
   \$NIXOS_CONFIG        Path to your configuration file.
-  \$NIXPKGS             Path to Nix packages.
 
 "
 
@@ -190,12 +185,6 @@ nixMap() {
 }
 
 if $install; then
-  if test -e "$mountPoint$NIXOS"; then
-    export NIXOS="$mountPoint$NIXOS"
-  fi
-  if test -e "$mountPoint$NIXPKGS"; then
-    export NIXPKGS="$mountPoint$NIXPKGS"
-  fi
   export NIXOS_CONFIG="$mountPoint$NIXOS_CONFIG"
 fi
 
@@ -319,8 +308,8 @@ if $xml; then
   evalNix --xml --no-location <<EOF
 let
   reach = attrs: attrs${option:+.$option};
-  nixos = import $NIXOS {};
-  nixpkgs = import $NIXPKGS {};
+  nixos = <nixos>;
+  nixpkgs = <nixpkgs>;
   sources = builtins.map (f: f.source);
   opt = reach nixos.eval.options;
   cfg = reach nixos.config;
diff --git a/modules/installer/tools/nixos-rebuild.sh b/modules/installer/tools/nixos-rebuild.sh
index 90df386faa9..caa3618131c 100644
--- a/modules/installer/tools/nixos-rebuild.sh
+++ b/modules/installer/tools/nixos-rebuild.sh
@@ -1,12 +1,5 @@
 #! @shell@ -e
 
-# Allow the location of NixOS sources and the system configuration
-# file to be overridden.
-NIXOS=${NIXOS:-/etc/nixos/nixos}
-NIXPKGS=${NIXPKGS:-/etc/nixos/nixpkgs}
-NIXOS_CONFIG=${NIXOS_CONFIG:-/etc/nixos/configuration.nix}
-export NIXPKGS # must be exported so that a non default location is passed to nixos/default.nix
-
 showSyntax() {
     # !!! more or less cut&paste from
     # system/switch-to-configuration.sh (which we call, of course).
@@ -45,8 +38,7 @@ Various nix-build options are also accepted, in particular:
  
 Environment variables affecting nixos-rebuild:
 
-  \$NIXOS                 path to the NixOS source tree
-  \$NIXPKGS               path to the Nixpkgs source tree
+  \$NIX_PATH              Nix expression search path 
   \$NIXOS_CONFIG          path to the NixOS system configuration specification
 EOF
     exit 1
@@ -130,7 +122,7 @@ fi
 # Pull the manifests defined in the configuration (the "manifests"
 # attribute).  Wonderfully hacky.
 if test -n "$pullManifest"; then
-    manifests=$(nix-instantiate --eval-only --xml --strict $NIXOS -A manifests \
+    manifests=$(nix-instantiate --eval-only --xml --strict '<nixos>' -A manifests \
         | grep '<string'  | sed 's^.*"\(.*\)".*^\1^g')
 
     mkdir -p /nix/var/nix/channel-cache
@@ -147,9 +139,9 @@ if [ "$action" = pull ]; then exit 0; fi
 # more conservative.
 if test -n "$buildNix"; then
     echo "building Nix..." >&2
-    if ! nix-build $NIXOS -A config.environment.nix -o $tmpDir/nix $extraBuildFlags > /dev/null; then
-        if ! nix-build $NIXOS -A nixFallback -o $tmpDir/nix $extraBuildFlags > /dev/null; then
-            nix-build $NIXPKGS -A nixUnstable -o $tmpDir/nix $extraBuildFlags > /dev/null
+    if ! nix-build '<nixos>' -A config.environment.nix -o $tmpDir/nix $extraBuildFlags > /dev/null; then
+        if ! nix-build '<nixos>' -A nixFallback -o $tmpDir/nix $extraBuildFlags > /dev/null; then
+            nix-build '<nixpkgs>' -A nixUnstable -o $tmpDir/nix $extraBuildFlags > /dev/null
         fi
     fi
     PATH=$tmpDir/nix/bin:$PATH
@@ -162,16 +154,16 @@ fi
 if test -z "$rollback"; then
     echo "building the system configuration..." >&2
     if test "$action" = switch -o "$action" = boot; then
-        nix-env -p /nix/var/nix/profiles/system -f $NIXOS --set -A system $extraBuildFlags
+        nix-env -p /nix/var/nix/profiles/system -f '<nixos>' --set -A system $extraBuildFlags
         pathToConfig=/nix/var/nix/profiles/system
     elif test "$action" = test -o "$action" = build -o "$action" = dry-run; then
-        nix-build $NIXOS -A system -K -k $extraBuildFlags > /dev/null
+        nix-build '<nixos>' -A system -K -k $extraBuildFlags > /dev/null
         pathToConfig=./result
     elif [ "$action" = build-vm ]; then
-        nix-build $NIXOS -A vm -K -k $extraBuildFlags > /dev/null
+        nix-build '<nixos>' -A vm -K -k $extraBuildFlags > /dev/null
         pathToConfig=./result
     elif [ "$action" = build-vm-with-bootloader ]; then
-        nix-build $NIXOS -A vmWithBootLoader -K -k $extraBuildFlags > /dev/null
+        nix-build '<nixos>' -A vmWithBootLoader -K -k $extraBuildFlags > /dev/null
         pathToConfig=./result
     else
         showSyntax
diff --git a/modules/programs/bash/profile.sh b/modules/programs/bash/profile.sh
index bc6e88c5561..a5edddb1083 100644
--- a/modules/programs/bash/profile.sh
+++ b/modules/programs/bash/profile.sh
@@ -10,7 +10,6 @@ fi
 export LD_LIBRARY_PATH=/var/run/opengl-driver/lib:/var/run/opengl-driver-32/lib # !!! only set if needed
 export MODULE_DIR=@modulesTree@/lib/modules
 export NIXPKGS_CONFIG=/nix/etc/config.nix
-export NIXPKGS_ALL=/etc/nixos/nixpkgs
 export NIX_PATH=nixpkgs=/etc/nixos/nixpkgs:nixos=/etc/nixos/nixos:nixos-config=/etc/nixos/configuration.nix:services=/etc/nixos/services
 export PAGER="less -R"
 export EDITOR=nano
diff --git a/tests/default.nix b/tests/default.nix
index fc7bdb79f76..4ee61225219 100644
--- a/tests/default.nix
+++ b/tests/default.nix
@@ -1,8 +1,6 @@
-{ nixpkgs ? ../../nixpkgs
-, system ? builtins.currentSystem
-}:
+{ system ? builtins.currentSystem }:
 
-with import ../lib/testing.nix { inherit nixpkgs system; };
+with import ../lib/testing.nix { inherit system; };
 
 {
   avahi = makeTest (import ./avahi.nix);
-- 
GitLab


From f61ad9783356ecf0ba424afdc6fdeee280bc4e38 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 2 Mar 2012 13:17:05 +0000
Subject: [PATCH 3381/5331] * Run the stage 2 debug shell at a more useful
 point (just before   starting Upstart).  This also causes $PATH to be set to
 something   more sensible.

svn path=/nixos/trunk/; revision=32740
---
 modules/system/boot/stage-2-init.sh | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/modules/system/boot/stage-2-init.sh b/modules/system/boot/stage-2-init.sh
index 452e3c99477..ac6193b9962 100644
--- a/modules/system/boot/stage-2-init.sh
+++ b/modules/system/boot/stage-2-init.sh
@@ -57,6 +57,7 @@ cat /proc/mounts > /etc/mtab
 
 
 # Process the kernel command line.
+debug2=
 for o in $(cat /proc/cmdline); do
     case $o in
         debugtrace)
@@ -64,8 +65,7 @@ for o in $(cat /proc/cmdline); do
             set -x
             ;;
         debug2)
-            echo "Debug shell called from @out@"
-            exec @shell@
+            debug2=1
             ;;
         S|s|single)
             # !!! argh, can't pass a startup event to Upstart yet.
@@ -166,7 +166,10 @@ export MODULE_DIR=@kernel@/lib/modules/
 
 
 # For debugging Upstart.
-#@shell@ --login < /dev/console > /dev/console 2>&1 &
+if [ -n "$debug2" ]; then
+    echo "Debug shell called from @out@"
+    @shell@
+fi
 
 
 # Start Upstart's init.
-- 
GitLab


From 65824d40e17bb37e36723f661d6522c524e9748f Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 2 Mar 2012 13:31:12 +0000
Subject: [PATCH 3382/5331] * nixos-rebuild: pass on the -I option to
 nix-build.

svn path=/nixos/trunk/; revision=32741
---
 modules/installer/tools/nixos-rebuild.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/installer/tools/nixos-rebuild.sh b/modules/installer/tools/nixos-rebuild.sh
index caa3618131c..c2210b62939 100644
--- a/modules/installer/tools/nixos-rebuild.sh
+++ b/modules/installer/tools/nixos-rebuild.sh
@@ -76,7 +76,7 @@ while test "$#" -gt 0; do
       --show-trace|--no-build-hook|--keep-failed|-K|--keep-going|-k|--verbose|-v|--fallback)
         extraBuildFlags="$extraBuildFlags $i"
       ;;
-      --max-jobs|-j|--cores)
+      --max-jobs|-j|--cores|-I)
         j="$1"; shift 1
         extraBuildFlags="$extraBuildFlags $i $j"
       ;;
-- 
GitLab


From 5d5fc5f6753f115832a14d2c2bf451ffaeb3378e Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 2 Mar 2012 14:01:57 +0000
Subject: [PATCH 3383/5331] =?UTF-8?q?*=20Add=20an=20option=20=E2=80=98depl?=
 =?UTF-8?q?oyment.virtualbox.baseImage=E2=80=99=20to=20specify=20the=20=20?=
 =?UTF-8?q?=20VirtualBox/Charon=20base=20image.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

svn path=/nixos/trunk/; revision=32743
---
 modules/misc/deployment.nix | 30 ++++++++++++++++++++++++++++++
 1 file changed, 30 insertions(+)

diff --git a/modules/misc/deployment.nix b/modules/misc/deployment.nix
index 146baec16dd..836ff1f5733 100644
--- a/modules/misc/deployment.nix
+++ b/modules/misc/deployment.nix
@@ -156,6 +156,17 @@ let cfg = config.deployment; in
       '';
     };
 
+    # VirtualBox options.
+
+    deployment.virtualbox.baseImage = mkOption {
+      example = "/home/alice/base-disk.vdi";
+      description = ''
+        Path to the initial disk image used to bootstrap the
+        VirtualBox instance.  The instance boots from a clone of this
+        image.
+      '';
+    };
+
     # Computed options useful for referring to other machines in
     # network specifications.
 
@@ -198,6 +209,25 @@ let cfg = config.deployment; in
         "");
         
     };
+
+    deployment.virtualbox = {
+
+      baseImage = mkDefault (
+        let
+          unpack = name: sha256: pkgs.runCommand "virtualbox-charon-${name}.vdi" {}
+            ''
+              xz < ${pkgs.fetchurl {
+                url = "http://nixos.org/releases/nixos/virtualbox-charon-images/virtualbox-charon-${name}.vdi.xz";
+                inherit sha256;
+              }} > $out
+            '';
+        in if config.nixpkgs.system == "x86_64-linux" then
+          unpack "r32740-x86_64" "0vwjcf85y4qyd5hxh8gb2nnkhbpdz2j284w5d7x94rvczfpa49hz"
+        else if config.nixpkgs.system == "i686-linux" then /foo/disk.vdi else
+          throw "Unsupported VirtualBox system type!"
+      );
+    
+    };
         
   };
   
-- 
GitLab


From ee0769cc42bd56a7e3ab5752d9a1d1f0539aa99c Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 2 Mar 2012 16:37:28 +0000
Subject: [PATCH 3384/5331] * If debug2 is passed on the kernel command line,
 run Upstart with   the --verbose flag to see what it's doing.

svn path=/nixos/trunk/; revision=32747
---
 modules/system/boot/stage-2-init.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/system/boot/stage-2-init.sh b/modules/system/boot/stage-2-init.sh
index ac6193b9962..7a619f1f97f 100644
--- a/modules/system/boot/stage-2-init.sh
+++ b/modules/system/boot/stage-2-init.sh
@@ -174,4 +174,4 @@ fi
 
 # Start Upstart's init.
 echo "starting Upstart..."
-PATH=/var/run/current-system/upstart/sbin exec init
+PATH=/var/run/current-system/upstart/sbin exec init ${debug2:+--verbose}
-- 
GitLab


From 57cd3760161f0cf10f84a6c5463839cdbb1a8f36 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 2 Mar 2012 17:06:33 +0000
Subject: [PATCH 3385/5331] * Decompress properly.

svn path=/nixos/trunk/; revision=32748
---
 modules/misc/deployment.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/misc/deployment.nix b/modules/misc/deployment.nix
index 836ff1f5733..574046ac7af 100644
--- a/modules/misc/deployment.nix
+++ b/modules/misc/deployment.nix
@@ -216,7 +216,7 @@ let cfg = config.deployment; in
         let
           unpack = name: sha256: pkgs.runCommand "virtualbox-charon-${name}.vdi" {}
             ''
-              xz < ${pkgs.fetchurl {
+              xz -d < ${pkgs.fetchurl {
                 url = "http://nixos.org/releases/nixos/virtualbox-charon-images/virtualbox-charon-${name}.vdi.xz";
                 inherit sha256;
               }} > $out
-- 
GitLab


From 1b65b427c36678aa4f9e3931ffa2be50b8526810 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Sat, 3 Mar 2012 09:55:08 +0000
Subject: [PATCH 3386/5331] Setting gnutarWithMan in the system path, instead
 of gnutar. Thus 'man tar' would work by default.

svn path=/nixos/trunk/; revision=32750
---
 modules/config/system-path.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/config/system-path.nix b/modules/config/system-path.nix
index 007b935d777..59183d1f1a2 100644
--- a/modules/config/system-path.nix
+++ b/modules/config/system-path.nix
@@ -29,7 +29,7 @@ let
       pkgs.gnugrep
       pkgs.gnupatch
       pkgs.gnused
-      pkgs.gnutar
+      pkgs.gnutarWithMan
       pkgs.gzip
       pkgs.less
       pkgs.libcap
-- 
GitLab


From 79d4b11aeb78b5007b3a06425ff3fb8889cd8a96 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Sat, 3 Mar 2012 16:07:18 +0000
Subject: [PATCH 3387/5331] Making the luks thing of initrd a bit more
 flexible. I used it to get a ciphered swap, where I could hibernate ciphered.

svn path=/nixos/trunk/; revision=32754
---
 modules/system/boot/luksroot.nix | 65 ++++++++++++++++++--------------
 1 file changed, 37 insertions(+), 28 deletions(-)

diff --git a/modules/system/boot/luksroot.nix b/modules/system/boot/luksroot.nix
index 3781e6b13b9..098641b6cb6 100644
--- a/modules/system/boot/luksroot.nix
+++ b/modules/system/boot/luksroot.nix
@@ -3,30 +3,56 @@
 with pkgs.lib;
 
 let
-  luksRoot = config.boot.initrd.luksRoot;
+  luks = config.boot.initrd.luks;
+
+  openCommand = { name, device }: ''
+    # Wait for luksRoot to appear, e.g. if on a usb drive.
+    # XXX: copied and adapted from stage-1-init.sh - should be
+    # available as a function.
+    if ! test -e ${device}; then
+        echo -n "waiting 10 seconds for device ${device} to appear..."
+        for ((try = 0; try < 10; try++)); do
+            sleep 1
+            if test -e ${device}; then break; fi
+            echo -n "OK"
+        done
+        echo "ok"
+    fi
+
+    # open luksRoot and scan for logical volumes
+    cryptsetup luksOpen ${device} ${name}
+  '';
+
 in
 {
 
   options = {
+    boot.initrd.luks.enable = mkOption {
+      default = false;
+      description = '';
+        Have luks in the initrd.
+      '';
+    };
 
-    boot.initrd.luksRoot = mkOption {
-      default = "";
-      example = "/dev/sda3";
+    boot.initrd.luks.devices = mkOption {
+      default = [ ];
+      example = [ { name = "luksroot"; device = "/dev/sda3"; } ];
       description = '';
-        The device that should be decrypted using LUKS before trying to mount the
+        The list of devices that should be decrypted using LUKS before trying to mount the
         root partition. This works for both LVM-over-LUKS and LUKS-over-LVM setups.
 
-        Make sure that initrd has the crypto modules needed for decryption.
+        The devices are decrypted to the device mapper names defined.
 
-        The decrypted device name is /dev/mapper/luksroot.
+        Make sure that initrd has the crypto modules needed for decryption.
       '';
     };
-
   };
 
+  config = mkIf luks.enable {
 
-
-  config = mkIf (luksRoot != "") {
+    # Some modules that may be needed for mounting anything ciphered
+    boot.initrd.kernelModules = [ "aes_generic" "aes_x86_64" "dm_mod" "dm_crypt"
+      "sha256_generic" "cbc" "cryptd" ];
 
     # copy the cryptsetup binary and it's dependencies
     boot.initrd.extraUtilsCommands = ''
@@ -42,23 +68,6 @@ in
       $out/bin/cryptsetup --version
     '';
 
-    boot.initrd.preLVMCommands = ''
-      # Wait for luksRoot to appear, e.g. if on a usb drive.
-      # XXX: copied and adapted from stage-1-init.sh - should be
-      # available as a function.
-      if ! test -e ${luksRoot}; then
-          echo -n "waiting for device ${luksRoot} to appear..."
-          for ((try = 0; try < 10; try++)); do
-              sleep 1
-              if test -e ${luksRoot}; then break; fi
-              echo -n "."
-          done
-          echo "ok"
-      fi
-      # open luksRoot and scan for logical volumes
-      cryptsetup luksOpen ${luksRoot} luksroot
-    '';
-
+    boot.initrd.preLVMCommands = concatMapStrings openCommand luks.devices;
   };
-
 }
-- 
GitLab


From dc8ca0ea4acadf2596b64e63480e208779cc954c Mon Sep 17 00:00:00 2001
From: Mathijs Kwik <mathijs@bluescreen303.nl>
Date: Sun, 4 Mar 2012 12:58:06 +0000
Subject: [PATCH 3388/5331] upstart: options for setuid and setgid as jobs
 running as different users cannot create their logfile, I moved that to an
 activationScript

svn path=/nixos/trunk/; revision=32762
---
 modules/system/upstart/upstart.nix | 38 ++++++++++++++++++++++++++++++
 1 file changed, 38 insertions(+)

diff --git a/modules/system/upstart/upstart.nix b/modules/system/upstart/upstart.nix
index d3edf2a459a..b4827e7f0cd 100644
--- a/modules/system/upstart/upstart.nix
+++ b/modules/system/upstart/upstart.nix
@@ -6,6 +6,11 @@ let
 
   upstart = pkgs.upstart;
 
+  userExists = u:
+    (u == "") || any (uu: uu.name == u) (attrValues config.users.extraUsers);
+
+  groupExists = g:
+    (g == "") || any (gg: gg.name == g) (attrValues config.users.extraGroups);
 
   # From a job description, generate an Upstart job file.
   makeJob = job:
@@ -95,6 +100,14 @@ let
              throw "invalid daemon type `${job.daemonType}'"
           )}
 
+          ${optionalString (job.setuid != "") ''
+            setuid ${job.setuid}
+          ''}
+
+          ${optionalString (job.setgid != "") ''
+            setuid ${job.setgid}
+          ''}
+
           ${job.extraConfig}
         '';
 
@@ -255,6 +268,24 @@ let
       '';
     };
 
+    setuid = mkOption {
+      type = types.string;
+      check = userExists;
+      default = "";
+      description = ''
+        Run the daemon as a different user.
+      '';
+    };
+
+    setgid = mkOption {
+      type = types.string;
+      check = groupExists;
+      default = "";
+      description = ''
+        Run the daemon as a different group.
+      '';
+    };
+
     extraConfig = mkOption {
       type = types.string;
       default = "";
@@ -368,6 +399,13 @@ in
     # do status queries.
     services.dbus.packages = [ upstart ];
 
+    system.activationScripts.chownJobLogs = stringAfter ["var"] 
+    (concatMapStrings (job: ''
+      touch /var/log/upstart/${job.name}
+      ${optionalString (job.setuid != "") "chown ${job.setuid} /var/log/upstart/${job.name}"}
+      ${optionalString (job.setgid != "") "chown :${job.setgid} /var/log/upstart/${job.name}"}
+    '') (attrValues config.jobs));
+
   };
 
 }
-- 
GitLab


From 6240825e27436d77c2a5f66f651c4720f4ade268 Mon Sep 17 00:00:00 2001
From: Mathijs Kwik <mathijs@bluescreen303.nl>
Date: Sun, 4 Mar 2012 12:58:09 +0000
Subject: [PATCH 3389/5331] mongodb: use the new upstart setuid option

svn path=/nixos/trunk/; revision=32763
---
 modules/services/databases/mongodb.nix | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/modules/services/databases/mongodb.nix b/modules/services/databases/mongodb.nix
index caa6ebc5acf..28d2a4f849c 100644
--- a/modules/services/databases/mongodb.nix
+++ b/modules/services/databases/mongodb.nix
@@ -96,7 +96,7 @@ in
 
     jobs.mongodb =
       { description = "MongoDB server";
-        daemonType = "fork";
+        daemonType = "daemon";
 
         startOn = "filesystem";
 
@@ -108,7 +108,9 @@ in
             fi
           '';
 
-        exec = "${pkgs.shadow}/bin/su ${cfg.user} -c \"${mongodb}/bin/mongod --config ${mongoCnf}\"";
+        path = [mongodb];
+        exec = "mongod --config ${mongoCnf} --fork";
+        setuid = cfg.user;
 
         extraConfig = "kill timeout 10";
       };
-- 
GitLab


From 77240b46f1ba95abee2903195c0465a030b35a50 Mon Sep 17 00:00:00 2001
From: Mathijs Kwik <mathijs@bluescreen303.nl>
Date: Sun, 4 Mar 2012 12:58:11 +0000
Subject: [PATCH 3390/5331] all-interfaces event

many services depend on other services that bring up network interfaces.
Examples are ipv6 tunneling clients or VPNs.

As there are multiple choices for these network-interface-providing services,
it's not nice to hardcore these deps in every service.
This change sets up a generic config option for this purpose.

providers (gw6c/gogoclient/openvpn) can plug into this to signal they bring up
an important interface.

Daemons that need these interfaces, can then depend on the 'all-interfaces' event,
instead of the individual services.

By default, the event fires when network-interfaces completes.

svn path=/nixos/trunk/; revision=32764
---
 modules/tasks/network-interfaces.nix | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/modules/tasks/network-interfaces.nix b/modules/tasks/network-interfaces.nix
index b9c5d897295..ef8e486ebcf 100644
--- a/modules/tasks/network-interfaces.nix
+++ b/modules/tasks/network-interfaces.nix
@@ -173,6 +173,16 @@ in
       '';
     };
 
+    networking.interfaceJobs = mkOption {
+      default = [config.jobs.networkInterfaces];
+      type = types.list types.attrs;
+      merge = mergeListOption;
+      description = ''
+        List of jobs that bring up additional interfaces.
+        For example vpn / ipv6 / ppp tasks.
+        This gets used by certain services as dependency for their upstart job.
+      '';
+    };
   };
 
 
@@ -273,6 +283,19 @@ in
           '';
       };
 
+    jobs.allInterfaces = {
+      name = "all-interfaces";
+      description = "all required interfaces are up";
+      startOn = concatStringsSep " and " (map (job: "started ${job.name}") cfg.interfaceJobs);
+      stopOn  = concatStringsSep " and " (map (job: "stopping ${job.name}") cfg.interfaceJobs);
+      task = true;
+      exec = "true";
+    };
+
+
+    networking.interfaceJobs = [config.jobs.networkInterfaces];
+    
+
     # Set the host name in the activation script.  Don't clear it if
     # it's not configured in the NixOS configuration, since it may
     # have been set by dhclient in the meantime.
-- 
GitLab


From ce83d3580e8c7646c8ec5334d5347864b934ed70 Mon Sep 17 00:00:00 2001
From: Mathijs Kwik <mathijs@bluescreen303.nl>
Date: Sun, 4 Mar 2012 12:58:14 +0000
Subject: [PATCH 3391/5331] gw6c: provide support for all-interfaces

svn path=/nixos/trunk/; revision=32765
---
 modules/services/networking/gw6c/default.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/modules/services/networking/gw6c/default.nix b/modules/services/networking/gw6c/default.nix
index 72f72d4c005..93b6924971e 100644
--- a/modules/services/networking/gw6c/default.nix
+++ b/modules/services/networking/gw6c/default.nix
@@ -156,6 +156,11 @@ in
         exec = "${gw6cService}/bin/control start";
       };
 
+    networking = {
+      enableIPv6 = true;
+      interfaceJobs = optional cfg.autorun config.jobs.gw6c;
+    };
+
   };
 
 }
-- 
GitLab


From 86bf5566fe7841b3422428e476460524cbe3fdf5 Mon Sep 17 00:00:00 2001
From: Mathijs Kwik <mathijs@bluescreen303.nl>
Date: Sun, 4 Mar 2012 12:58:18 +0000
Subject: [PATCH 3392/5331] many daemons: depend on all-interfaces instead of
 gw6c

svn path=/nixos/trunk/; revision=32766
---
 modules/services/mail/dovecot.nix                     | 4 +---
 modules/services/mail/dovecot2.nix                    | 4 +---
 modules/services/mail/postfix.nix                     | 8 ++------
 modules/services/networking/bind.nix                  | 2 --
 modules/services/networking/ircd-hybrid/control.in    | 2 +-
 modules/services/networking/ircd-hybrid/default.nix   | 8 +++-----
 modules/services/networking/openfire.nix              | 8 +++-----
 modules/services/web-servers/apache-httpd/default.nix | 4 +---
 modules/services/x11/xfs.nix                          | 7 +------
 9 files changed, 13 insertions(+), 34 deletions(-)

diff --git a/modules/services/mail/dovecot.nix b/modules/services/mail/dovecot.nix
index 82584ea5de3..1679966a698 100644
--- a/modules/services/mail/dovecot.nix
+++ b/modules/services/mail/dovecot.nix
@@ -4,8 +4,6 @@ with pkgs.lib;
 
 let
 
-  startingDependency = if config.services.gw6c.enable then "gw6c" else "network-interfaces";
-
   cfg = config.services.dovecot;
 
   dovecotConf =
@@ -116,7 +114,7 @@ in
     jobs.dovecot =
       { description = "Dovecot IMAP/POP3 server";
 
-        startOn = "started ${startingDependency}";
+        startOn = "started all-interfaces";
 
         preStart =
           ''
diff --git a/modules/services/mail/dovecot2.nix b/modules/services/mail/dovecot2.nix
index 71e246392f9..9c91fde2f20 100644
--- a/modules/services/mail/dovecot2.nix
+++ b/modules/services/mail/dovecot2.nix
@@ -4,8 +4,6 @@ with pkgs.lib;
 
 let
 
-  startingDependency = if config.services.gw6c.enable then "gw6c" else "network-interfaces";
-
   cfg = config.services.dovecot2;
 
   dovecotConf =
@@ -125,7 +123,7 @@ in
     jobs.dovecot2 =
       { description = "Dovecot IMAP/POP3 server";
 
-        startOn = "started ${startingDependency}";
+        startOn = "started all-interfaces";
 
         preStart =
           ''
diff --git a/modules/services/mail/postfix.nix b/modules/services/mail/postfix.nix
index 13a02386886..4b13ad7f6b3 100644
--- a/modules/services/mail/postfix.nix
+++ b/modules/services/mail/postfix.nix
@@ -4,8 +4,6 @@ with pkgs.lib;
 
 let
 
-  startingDependency = if config.services.gw6c.enable then "gw6c" else "network-interfaces";
-
   cfg = config.services.postfix;
   user = cfg.user;
   group = cfg.group;
@@ -21,9 +19,7 @@ let
       default_privs = nobody
 
     ''
-    + optionalString (config.services.gw6c.enable || config.networking.enableIPv6) (''
-      inet_protocols = all
-    '')
+    + optionalString config.networking.enableIPv6 "inet_protocols = all"
     + (if cfg.networks != null then
         ''
           mynetworks = ${concatStringsSep ", " cfg.networks}
@@ -309,7 +305,7 @@ in
       # accurate way is unlikely to be better.
       { description = "Postfix mail server";
 
-        startOn = "started ${startingDependency}";
+        startOn = "started all-interfaces";
 
         daemonType = "none";
 
diff --git a/modules/services/networking/bind.nix b/modules/services/networking/bind.nix
index 4f69ff4c84a..e6b0d6a7241 100644
--- a/modules/services/networking/bind.nix
+++ b/modules/services/networking/bind.nix
@@ -4,8 +4,6 @@ with pkgs.lib;
 
 let
 
-  startingDependency = if config.services.gw6c.enable then "gw6c" else "network-interfaces";
-
   cfg = config.services.bind;
 
   confFile = pkgs.writeText "named.conf"
diff --git a/modules/services/networking/ircd-hybrid/control.in b/modules/services/networking/ircd-hybrid/control.in
index f165b2523ca..312dfaada32 100644
--- a/modules/services/networking/ircd-hybrid/control.in
+++ b/modules/services/networking/ircd-hybrid/control.in
@@ -5,7 +5,7 @@ export PATH=@coreutils@/bin
 
 if test "$1" = "start"; then
 	if ! @procps@/bin/pgrep ircd; then
-	if @gw6cEnabled@; then 
+	if @ipv6Enabled@; then 
 		while ! @iproute@/sbin/ip addr | 
 			@gnugrep@/bin/grep inet6 | 
 			@gnugrep@/bin/grep global; do
diff --git a/modules/services/networking/ircd-hybrid/default.nix b/modules/services/networking/ircd-hybrid/default.nix
index d28e856eabf..d60c10ca940 100644
--- a/modules/services/networking/ircd-hybrid/default.nix
+++ b/modules/services/networking/ircd-hybrid/default.nix
@@ -12,7 +12,7 @@ let
     substFiles = [ "=>/conf" ./ircd.conf ];
     inherit (pkgs) ircdHybrid coreutils su iproute gnugrep procps;
 
-    gw6cEnabled = if config.services.gw6c.enable && config.services.gw6c.autorun then "true" else "false";
+    ipv6Enabled = if config.networking.enableIPv6 then "true" else "false";
 
     inherit (cfg) serverName sid description adminEmail
             extraPort;
@@ -26,8 +26,6 @@ let
     builder = ./builder.sh;
   };
 
-  startingDependency = if config.services.gw6c.enable then "gw6c" else "network-interfaces";
-
 in
 
 {
@@ -127,8 +125,8 @@ in
 
         description = "IRCD Hybrid server";
 
-        startOn = "started ${startingDependency}";
-        stopOn = "stopping ${startingDependency}";
+        startOn = "started all-interfaces";
+        stopOn = "stopping all-interfaces";
 
         exec = "${ircdService}/bin/control start";
       };
diff --git a/modules/services/networking/openfire.nix b/modules/services/networking/openfire.nix
index 7ac53067f77..c0b6a671994 100644
--- a/modules/services/networking/openfire.nix
+++ b/modules/services/networking/openfire.nix
@@ -6,10 +6,8 @@ let
 
   inherit (pkgs) jre openfire coreutils which gnugrep gawk gnused;
 
-  startDependency =
-    if config.services.openfire.usePostgreSQL then "postgresql" else
-    if config.services.gw6c.enable then "gw6c" else
-    "network-interfaces";
+  extraStartDependency =
+    if config.services.openfire.usePostgreSQL then "and started postgresql" else "";
 
 in
 
@@ -50,7 +48,7 @@ in
     jobs.openfire =
       { description = "OpenFire XMPP server";
 
-        startOn = "started ${startDependency}";
+        startOn = "started all-interfaces ${extraStartDependency}";
 
         script =
           ''
diff --git a/modules/services/web-servers/apache-httpd/default.nix b/modules/services/web-servers/apache-httpd/default.nix
index f37ed56608d..16bcd6f20f6 100644
--- a/modules/services/web-servers/apache-httpd/default.nix
+++ b/modules/services/web-servers/apache-httpd/default.nix
@@ -6,8 +6,6 @@ let
 
   mainCfg = config.services.httpd;
 
-  startingDependency = if config.services.gw6c.enable then "gw6c" else "network-interfaces";
-
   httpd = pkgs.apacheHttpd;
 
   getPort = cfg: if cfg.port != 0 then cfg.port else if cfg.enableSSL then 443 else 80;
@@ -555,7 +553,7 @@ in
 
         description = "Apache HTTPD";
 
-        startOn = "started ${startingDependency} and filesystem"
+        startOn = "started all-interfaces and filesystem"
           # Hacky.  Some subservices depend on Postgres
           # (e.g. Mediawiki), but they don't have a way to declare
           # that dependency.  So just start httpd after postgresql if
diff --git a/modules/services/x11/xfs.nix b/modules/services/x11/xfs.nix
index edaafacc27e..37cb004a955 100644
--- a/modules/services/x11/xfs.nix
+++ b/modules/services/x11/xfs.nix
@@ -6,11 +6,6 @@ let
 
   configFile = ./xfs.conf;
 
-  startingDependency =
-    if config.services.gw6c.enable && config.services.gw6c.autorun
-    then "gw6c"
-    else "network-interfaces";
-
 in
 
 {
@@ -41,7 +36,7 @@ in
     jobs.xfs =
       { description = "X Font Server";
 
-        startOn = "started ${startingDependency}";
+        startOn = "started all-interfaces";
 
         exec = "${pkgs.xorg.xfs}/bin/xfs -config ${configFile}";
       };
-- 
GitLab


From 3c957bd921e792988cd9029b6037fc57a0ddcdd7 Mon Sep 17 00:00:00 2001
From: Mathijs Kwik <mathijs@bluescreen303.nl>
Date: Sun, 4 Mar 2012 12:58:22 +0000
Subject: [PATCH 3393/5331] gogoclient: ipv6 tunnel module

meant to replace the obsolete gw6c module
builds fine on stdenv-updates branch

svn path=/nixos/trunk/; revision=32767
---
 modules/module-list.nix                    |  1 +
 modules/services/networking/gogoclient.nix | 88 ++++++++++++++++++++++
 2 files changed, 89 insertions(+)
 create mode 100644 modules/services/networking/gogoclient.nix

diff --git a/modules/module-list.nix b/modules/module-list.nix
index 17bc561da80..7d42571d0fa 100644
--- a/modules/module-list.nix
+++ b/modules/module-list.nix
@@ -121,6 +121,7 @@
   ./services/networking/flashpolicyd.nix
   ./services/networking/git-daemon.nix
   ./services/networking/gnunet.nix
+  ./services/networking/gogoclient.nix
   ./services/networking/gvpe.nix
   ./services/networking/gw6c/default.nix
   ./services/networking/ifplugd.nix
diff --git a/modules/services/networking/gogoclient.nix b/modules/services/networking/gogoclient.nix
new file mode 100644
index 00000000000..19d3f5dd755
--- /dev/null
+++ b/modules/services/networking/gogoclient.nix
@@ -0,0 +1,88 @@
+{pkgs, config, ...}:
+
+with pkgs.lib;
+
+let cfg = config.services.gogoclient;
+in
+
+{
+
+  ###### interface
+
+  options = {
+    services.gogoclient = {
+      enable = mkOption {
+        default = false;
+        type =  types.bool;
+        description = ''
+          Enable the gogoclient ipv6 tunnel.
+        '';
+      };
+      autorun = mkOption {
+        default = true;
+        description = "
+          Switch to false to create upstart-job and configuration,
+          but not run it automatically
+        ";
+      };
+
+      username = mkOption {
+        default = "";
+        description = "
+          Your Gateway6 login name, if any.
+        ";
+      };
+
+      password = mkOption {
+        default = "";
+        type = types.string;
+        description = "
+          Path to a file (as a string), containing your gogonet password, if any.
+        ";
+      };
+
+      server = mkOption {
+        default = "anonymous.freenet6.net";
+        example = "broker.freenet6.net";
+        description = "
+          Used Gateway6 server.
+        ";
+      };
+    };
+  };
+
+  ###### implementation
+
+  config = mkIf cfg.enable {
+    boot.kernelModules = [ "tun" ];
+
+    # environment.systemPackages = [pkgs.gogoclient];
+
+    networking = {
+      enableIPv6 = true;
+      interfaceJobs = optional cfg.autorun config.jobs.gogoclient;
+    };
+
+    jobs.gogoclient = {
+      name = "gogoclient";
+      description = "ipv6 tunnel";
+      startOn = if cfg.autorun then "started network-interfaces" else "";
+      stopOn = "stopping network-interfaces";
+      script = "cd /var/lib/gogoc; exec gogoc -y -f /etc/gogoc.conf";
+      path = [pkgs.gogoclient];
+    };
+
+    system.activationScripts.gogoClientConf = ''
+      mkdir -p /var/lib/gogoc
+      chmod 700 /var/lib/gogoc
+      install -m400 ${pkgs.gogoclient}/share/${pkgs.gogoclient.name}/gogoc.conf.sample /etc/gogoc.conf.default
+      ${pkgs.gnused}/bin/sed -i -e "s|^userid=|&${cfg.username}|" /etc/gogoc.conf.default
+      ${pkgs.gnused}/bin/sed -i -e "s|^passwd=|&${if cfg.password == "" then "" else "$(cat ${cfg.password})"}|" /etc/gogoc.conf.default
+      ${pkgs.gnused}/bin/sed -i -e "s|^server=.*|server=${cfg.server}|" /etc/gogoc.conf.default
+      ${pkgs.gnused}/bin/sed -i -e "s|^auth_method=.*|auth_method=${if cfg.password == "" then "anonymous" else "any"}|" /etc/gogoc.conf.default
+      ${pkgs.gnused}/bin/sed -i -e "s|^#log_file=|log_file=1|" /etc/gogoc.conf.default
+      mv /etc/gogoc.conf.default /etc/gogoc.conf
+    '';
+  };
+
+}
-- 
GitLab


From 545f922e71ea0cb1069650d32611c5f2f8961a16 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sun, 4 Mar 2012 15:10:14 +0000
Subject: [PATCH 3394/5331] * Connect Upstart to the system bus so that
 non-root users can run   initctl.

svn path=/nixos/trunk/; revision=32768
---
 modules/services/system/dbus.nix | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/modules/services/system/dbus.nix b/modules/services/system/dbus.nix
index 2808b0241c2..7232d12ecb9 100644
--- a/modules/services/system/dbus.nix
+++ b/modules/services/system/dbus.nix
@@ -135,6 +135,13 @@ in
 
         exec = "dbus-daemon --system";
 
+        postStart =
+          ''
+            # Signal Upstart to connect to the system bus.  This
+            # allows ‘initctl’ to work for non-root users.
+            kill -USR1 1
+          '';
+
         postStop =
           ''
             # !!! Hack: doesn't belong here.
-- 
GitLab


From 0d39390ad4c6a40594a5516575094834a2d5a291 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sun, 4 Mar 2012 15:34:44 +0000
Subject: [PATCH 3395/5331] * ntpd: cleanup.

svn path=/nixos/trunk/; revision=32769
---
 modules/services/networking/ntpd.nix | 13 ++-----------
 1 file changed, 2 insertions(+), 11 deletions(-)

diff --git a/modules/services/networking/ntpd.nix b/modules/services/networking/ntpd.nix
index b8624cd6cdf..d44aedc6e15 100644
--- a/modules/services/networking/ntpd.nix
+++ b/modules/services/networking/ntpd.nix
@@ -15,7 +15,6 @@ let
   modprobe = config.system.sbin.modprobe;
 
   configFile = pkgs.writeText "ntp.conf" ''
-    driftfile ${stateDir}/ntp.drift
     # Keep the drift file in ${stateDir}/ntp.drift.  However, since we
     # chroot to ${stateDir}, we have to specify it as /ntp.drift.
     driftfile /ntp.drift
@@ -70,6 +69,8 @@ in
         home = stateDir;
       };
 
+    boot.kernelModules = [ "capability" ];
+
     jobs.ntpd =
       { description = "NTP daemon";
 
@@ -81,16 +82,6 @@ in
           ''
             mkdir -m 0755 -p ${stateDir}
             chown ${ntpUser} ${stateDir}
-
-            # Needed to run ntpd as an unprivileged user.
-            ${modprobe}/sbin/modprobe --quiet capability || true
-
-            # !!! This can hang indefinitely if the network is down or
-            # the servers are unreachable.  This is particularly bad
-            # because Upstart cannot kill jobs stuck in the start
-            # phase.  Thus a hanging ntpd job can block system
-            # shutdown.
-            # ntpd -q -g ${ntpFlags}
           '';
 
         exec = "ntpd -g -n ${ntpFlags}";
-- 
GitLab


From 6c792b3d9e8224ca36d84d367735631d08929b23 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sun, 4 Mar 2012 15:47:44 +0000
Subject: [PATCH 3396/5331] * A more pragmatic solution to the missing tar
 manpage problem.

svn path=/nixos/trunk/; revision=32770
---
 modules/config/system-path.nix         | 11 +++++++++--
 modules/module-list.nix                |  2 +-
 modules/services/networking/dhcpcd.nix |  5 ++++-
 3 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/modules/config/system-path.nix b/modules/config/system-path.nix
index 59183d1f1a2..d989ddf4b91 100644
--- a/modules/config/system-path.nix
+++ b/modules/config/system-path.nix
@@ -1,7 +1,7 @@
 # This module defines the packages that appear in
 # /var/run/current-system/sw.
 
-{pkgs, config, ...}:
+{ config, pkgs, ... }:
 
 with pkgs.lib;
 
@@ -9,6 +9,12 @@ let
 
   cfg = config.environment;
 
+  extraManpages = pkgs.runCommand "extra-manpages" { buildInputs = [ pkgs.help2man ]; }
+    ''
+      mkdir -p $out/share/man/man1
+      help2man ${pkgs.gnutar}/bin/tar > $out/share/man/man1/tar.1
+    '';
+
   requiredPackages =
     [ config.system.sbin.modprobe # must take precedence over module_init_tools
       config.system.sbin.mount # must take precedence over util-linux
@@ -29,7 +35,7 @@ let
       pkgs.gnugrep
       pkgs.gnupatch
       pkgs.gnused
-      pkgs.gnutarWithMan
+      pkgs.gnutar
       pkgs.gzip
       pkgs.less
       pkgs.libcap
@@ -52,6 +58,7 @@ let
       pkgs.udev
       pkgs.usbutils
       pkgs.utillinux
+      extraManpages      
     ];
 
 
diff --git a/modules/module-list.nix b/modules/module-list.nix
index 7d42571d0fa..2a4e88439a9 100644
--- a/modules/module-list.nix
+++ b/modules/module-list.nix
@@ -113,7 +113,7 @@
   ./services/networking/bitlbee.nix
   ./services/networking/cntlm.nix
   ./services/networking/ddclient.nix
-  ./services/networking/dhclient.nix
+  ./services/networking/dhcpcd.nix
   ./services/networking/dhcpd.nix
   ./services/networking/dnsmasq.nix
   ./services/networking/ejabberd.nix
diff --git a/modules/services/networking/dhcpcd.nix b/modules/services/networking/dhcpcd.nix
index 01c65c06865..d1a291c4da9 100644
--- a/modules/services/networking/dhcpcd.nix
+++ b/modules/services/networking/dhcpcd.nix
@@ -33,6 +33,9 @@ let
       # Ethernet cards used for bridging.  Likewise for vif* and tap*
       # (Xen) and virbr* and vnet* (libvirt).
       denyinterfaces ${toString ignoredInterfaces} peth* vif* tap* tun* virbr* vnet* vboxnet*
+
+      # Disable listening for IPv6 Router Advertisements for now.
+      noipv6rs
     '';
 
   # Hook for emitting ip-up/ip-down events.
@@ -72,7 +75,7 @@ in
 
         path = [ dhcpcd pkgs.nettools pkgs.openresolv ];
 
-        exec = "dhcpcd --config ${dhcpcdConf} --nobackground --persistent";
+        exec = "dhcpcd --config ${dhcpcdConf} --nobackground";
       };
 
     environment.systemPackages = [ dhcpcd ];
-- 
GitLab


From 2ac5df3a93748e083b615e79376765b7ab18ad1e Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sun, 4 Mar 2012 15:48:58 +0000
Subject: [PATCH 3397/5331] * Undo unintended commit.

svn path=/nixos/trunk/; revision=32771
---
 modules/module-list.nix                | 2 +-
 modules/services/networking/dhcpcd.nix | 5 +----
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/modules/module-list.nix b/modules/module-list.nix
index 2a4e88439a9..7d42571d0fa 100644
--- a/modules/module-list.nix
+++ b/modules/module-list.nix
@@ -113,7 +113,7 @@
   ./services/networking/bitlbee.nix
   ./services/networking/cntlm.nix
   ./services/networking/ddclient.nix
-  ./services/networking/dhcpcd.nix
+  ./services/networking/dhclient.nix
   ./services/networking/dhcpd.nix
   ./services/networking/dnsmasq.nix
   ./services/networking/ejabberd.nix
diff --git a/modules/services/networking/dhcpcd.nix b/modules/services/networking/dhcpcd.nix
index d1a291c4da9..01c65c06865 100644
--- a/modules/services/networking/dhcpcd.nix
+++ b/modules/services/networking/dhcpcd.nix
@@ -33,9 +33,6 @@ let
       # Ethernet cards used for bridging.  Likewise for vif* and tap*
       # (Xen) and virbr* and vnet* (libvirt).
       denyinterfaces ${toString ignoredInterfaces} peth* vif* tap* tun* virbr* vnet* vboxnet*
-
-      # Disable listening for IPv6 Router Advertisements for now.
-      noipv6rs
     '';
 
   # Hook for emitting ip-up/ip-down events.
@@ -75,7 +72,7 @@ in
 
         path = [ dhcpcd pkgs.nettools pkgs.openresolv ];
 
-        exec = "dhcpcd --config ${dhcpcdConf} --nobackground";
+        exec = "dhcpcd --config ${dhcpcdConf} --nobackground --persistent";
       };
 
     environment.systemPackages = [ dhcpcd ];
-- 
GitLab


From e11e9b4ef033a804aeea153b8f94949634e8e412 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sun, 4 Mar 2012 16:10:19 +0000
Subject: [PATCH 3398/5331] * Provide info's manpage.

svn path=/nixos/trunk/; revision=32774
---
 modules/programs/info.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/programs/info.nix b/modules/programs/info.nix
index 044c0995681..30c25cf3420 100644
--- a/modules/programs/info.nix
+++ b/modules/programs/info.nix
@@ -32,5 +32,5 @@ let
 in
 
 {
-  environment.systemPackages = [infoWrapper];
+  environment.systemPackages = [ infoWrapper pkgs.texinfo ];
 }
-- 
GitLab


From 8935db253cfd7a3719a0addf89420042180f4a57 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sun, 4 Mar 2012 16:17:56 +0000
Subject: [PATCH 3399/5331] * Upstart jobs: don't emit a description if there
 is none.

svn path=/nixos/trunk/; revision=32775
---
 modules/system/upstart/upstart.nix | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/modules/system/upstart/upstart.nix b/modules/system/upstart/upstart.nix
index b4827e7f0cd..dd846c2d534 100644
--- a/modules/system/upstart/upstart.nix
+++ b/modules/system/upstart/upstart.nix
@@ -25,7 +25,9 @@ let
         ''
           # Upstart job `${job.name}'.  This is a generated file.  Do not edit.
 
-          description "${job.description}"
+          ${optionalString (job.description != "") ''
+            description "${job.description}"
+          ''}
 
           ${if isList job.startOn then
               "start on ${concatStringsSep " or " job.startOn}"
@@ -144,7 +146,7 @@ let
 
     description = mkOption {
       type = types.string;
-      default = "(no description given)";
+      default = "";
       description = ''
         A short description of this job.
       '';
-- 
GitLab


From 356ff794001f422412a1c464940273abcf85a406 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sun, 4 Mar 2012 17:21:14 +0000
Subject: [PATCH 3400/5331] * wpa_supplicant: automatically figure out the
 wireless interface(s)   on which to run wpa_supplicant, unless they're set
 explicitly.

svn path=/nixos/trunk/; revision=32777
---
 modules/rename.nix                            |  1 +
 .../services/networking/wpa_supplicant.nix    | 36 +++++++++++++++----
 2 files changed, 30 insertions(+), 7 deletions(-)

diff --git a/modules/rename.nix b/modules/rename.nix
index b92e4e06da5..7f6fd6383a0 100644
--- a/modules/rename.nix
+++ b/modules/rename.nix
@@ -68,6 +68,7 @@ in zipModules ([]
 ++ rename obsolete "environment.extraPackages" "environment.systemPackages"
 
 ++ rename obsolete "security.extraSetuidPrograms" "security.setuidPrograms"
+++ rename obsolete "networking.enableWLAN" "networking.wireless.enable"
 
 # Old Grub-related options.
 ++ rename obsolete "boot.copyKernels" "boot.loader.grub.copyKernels"
diff --git a/modules/services/networking/wpa_supplicant.nix b/modules/services/networking/wpa_supplicant.nix
index bf4cd6ae29a..795a766b836 100644
--- a/modules/services/networking/wpa_supplicant.nix
+++ b/modules/services/networking/wpa_supplicant.nix
@@ -6,6 +6,10 @@ let
 
   configFile = "/etc/wpa_supplicant.conf";
 
+  ifaces =
+    config.networking.wireless.interfaces ++
+    optional (config.networking.WLANInterface != "") config.networking.WLANInterface;
+
 in
 
 {
@@ -14,7 +18,7 @@ in
 
   options = {
   
-    networking.enableWLAN = mkOption {
+    networking.wireless.enable = mkOption {
       default = false;
       description = ''
         Whether to start <command>wpa_supplicant</command> to scan for
@@ -29,9 +33,16 @@ in
     };
 
     networking.WLANInterface = mkOption {
-      default = "wlan0";
+      default = "";
+      description = "Obsolete. Use <option>networking.wireless.interfaces</option> instead.";
+    };
+
+    networking.wireless.interfaces = mkOption {
+      default = [];
+      example = [ "wlan0" "wlan1" ];
       description = ''
-        The interface wpa_supplicant will use, if enableWLAN is set.
+        The interfaces <command>wpa_supplicant</command> will use.  If empty, it will
+        automatically use all wireless interfaces.
       '';
     };
 
@@ -40,7 +51,7 @@ in
 
   ###### implementation
   
-  config = mkIf config.networking.enableWLAN {
+  config = mkIf config.networking.wireless.enable {
 
     environment.systemPackages =  [ pkgs.wpa_supplicant ];
 
@@ -58,9 +69,20 @@ in
             chmod 600 ${configFile}
           '';
 
-        exec =
-          "wpa_supplicant -s -u -c ${configFile} "
-          + (optionalString (config.networking.WLANInterface != null) "-i ${config.networking.WLANInterface}");
+        script =
+          ''
+            ${if ifaces == [] then ''
+              for i in $(cd /sys/class/net && echo *); do
+                if [ -e /sys/class/net/$i/wireless ]; then
+                  ifaces="$ifaces''${ifaces:+ -N} -i$i"
+                fi
+              done
+            '' else ''
+              ifaces="${concatStringsSep " -N " (map (i: "-i${i}") ifaces)}"
+            ''}
+            echo "|$ifaces|"
+            exec wpa_supplicant -s -u -c ${configFile} $ifaces
+          '';
       };
   
     powerManagement.resumeCommands =
-- 
GitLab


From 835170fe191b5106c0a728f2ee0df8d2041396bd Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sun, 4 Mar 2012 17:21:33 +0000
Subject: [PATCH 3401/5331] * Remove debug statement.

svn path=/nixos/trunk/; revision=32778
---
 modules/services/networking/wpa_supplicant.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/modules/services/networking/wpa_supplicant.nix b/modules/services/networking/wpa_supplicant.nix
index 795a766b836..d2b57fb97d5 100644
--- a/modules/services/networking/wpa_supplicant.nix
+++ b/modules/services/networking/wpa_supplicant.nix
@@ -80,7 +80,6 @@ in
             '' else ''
               ifaces="${concatStringsSep " -N " (map (i: "-i${i}") ifaces)}"
             ''}
-            echo "|$ifaces|"
             exec wpa_supplicant -s -u -c ${configFile} $ifaces
           '';
       };
-- 
GitLab


From 29b6b8769faedd19e5a23c7c4e9312958be58d05 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sun, 4 Mar 2012 17:49:00 +0000
Subject: [PATCH 3402/5331] * On second thought, let's not enable user support
 in Upstart.  The   first user job I put in ~/.init caused Upstart to crash
 with an   assertion failure, taking down the system.  Given that Upstart has
 a   non-trivial attack surface with this feature, it seems best to   disable
 it.

svn path=/nixos/trunk/; revision=32779
---
 modules/services/system/dbus.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/modules/services/system/dbus.nix b/modules/services/system/dbus.nix
index 7232d12ecb9..a9d7a3d8420 100644
--- a/modules/services/system/dbus.nix
+++ b/modules/services/system/dbus.nix
@@ -135,12 +135,14 @@ in
 
         exec = "dbus-daemon --system";
 
+        /*
         postStart =
           ''
             # Signal Upstart to connect to the system bus.  This
             # allows ‘initctl’ to work for non-root users.
             kill -USR1 1
           '';
+        */
 
         postStop =
           ''
-- 
GitLab


From 8bfe513e7505e4c7b97bfc53c7d40600637eb721 Mon Sep 17 00:00:00 2001
From: Mathijs Kwik <mathijs@bluescreen303.nl>
Date: Sun, 4 Mar 2012 18:44:42 +0000
Subject: [PATCH 3403/5331] renamed "all-interfaces" to "networking"

svn path=/nixos/trunk/; revision=32780
---
 modules/services/mail/dovecot.nix                     | 2 +-
 modules/services/mail/dovecot2.nix                    | 2 +-
 modules/services/mail/postfix.nix                     | 2 +-
 modules/services/networking/ircd-hybrid/default.nix   | 4 ++--
 modules/services/networking/openfire.nix              | 2 +-
 modules/services/web-servers/apache-httpd/default.nix | 2 +-
 modules/services/x11/xfs.nix                          | 2 +-
 modules/tasks/network-interfaces.nix                  | 4 ++--
 8 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/modules/services/mail/dovecot.nix b/modules/services/mail/dovecot.nix
index 1679966a698..4c6ee85ac31 100644
--- a/modules/services/mail/dovecot.nix
+++ b/modules/services/mail/dovecot.nix
@@ -114,7 +114,7 @@ in
     jobs.dovecot =
       { description = "Dovecot IMAP/POP3 server";
 
-        startOn = "started all-interfaces";
+        startOn = "started networking";
 
         preStart =
           ''
diff --git a/modules/services/mail/dovecot2.nix b/modules/services/mail/dovecot2.nix
index 9c91fde2f20..15a0ecce325 100644
--- a/modules/services/mail/dovecot2.nix
+++ b/modules/services/mail/dovecot2.nix
@@ -123,7 +123,7 @@ in
     jobs.dovecot2 =
       { description = "Dovecot IMAP/POP3 server";
 
-        startOn = "started all-interfaces";
+        startOn = "started networking";
 
         preStart =
           ''
diff --git a/modules/services/mail/postfix.nix b/modules/services/mail/postfix.nix
index 4b13ad7f6b3..1eff4a39e1e 100644
--- a/modules/services/mail/postfix.nix
+++ b/modules/services/mail/postfix.nix
@@ -305,7 +305,7 @@ in
       # accurate way is unlikely to be better.
       { description = "Postfix mail server";
 
-        startOn = "started all-interfaces";
+        startOn = "started networking";
 
         daemonType = "none";
 
diff --git a/modules/services/networking/ircd-hybrid/default.nix b/modules/services/networking/ircd-hybrid/default.nix
index d60c10ca940..99fe02db5db 100644
--- a/modules/services/networking/ircd-hybrid/default.nix
+++ b/modules/services/networking/ircd-hybrid/default.nix
@@ -125,8 +125,8 @@ in
 
         description = "IRCD Hybrid server";
 
-        startOn = "started all-interfaces";
-        stopOn = "stopping all-interfaces";
+        startOn = "started networking";
+        stopOn = "stopping networking";
 
         exec = "${ircdService}/bin/control start";
       };
diff --git a/modules/services/networking/openfire.nix b/modules/services/networking/openfire.nix
index c0b6a671994..d5c18c0675c 100644
--- a/modules/services/networking/openfire.nix
+++ b/modules/services/networking/openfire.nix
@@ -48,7 +48,7 @@ in
     jobs.openfire =
       { description = "OpenFire XMPP server";
 
-        startOn = "started all-interfaces ${extraStartDependency}";
+        startOn = "started networking ${extraStartDependency}";
 
         script =
           ''
diff --git a/modules/services/web-servers/apache-httpd/default.nix b/modules/services/web-servers/apache-httpd/default.nix
index 16bcd6f20f6..935a5e1be1a 100644
--- a/modules/services/web-servers/apache-httpd/default.nix
+++ b/modules/services/web-servers/apache-httpd/default.nix
@@ -553,7 +553,7 @@ in
 
         description = "Apache HTTPD";
 
-        startOn = "started all-interfaces and filesystem"
+        startOn = "started networking and filesystem"
           # Hacky.  Some subservices depend on Postgres
           # (e.g. Mediawiki), but they don't have a way to declare
           # that dependency.  So just start httpd after postgresql if
diff --git a/modules/services/x11/xfs.nix b/modules/services/x11/xfs.nix
index 37cb004a955..f4a40dbb08f 100644
--- a/modules/services/x11/xfs.nix
+++ b/modules/services/x11/xfs.nix
@@ -36,7 +36,7 @@ in
     jobs.xfs =
       { description = "X Font Server";
 
-        startOn = "started all-interfaces";
+        startOn = "started networking";
 
         exec = "${pkgs.xorg.xfs}/bin/xfs -config ${configFile}";
       };
diff --git a/modules/tasks/network-interfaces.nix b/modules/tasks/network-interfaces.nix
index ef8e486ebcf..fc8ebcddca4 100644
--- a/modules/tasks/network-interfaces.nix
+++ b/modules/tasks/network-interfaces.nix
@@ -283,8 +283,8 @@ in
           '';
       };
 
-    jobs.allInterfaces = {
-      name = "all-interfaces";
+    jobs.networking = {
+      name = "networking";
       description = "all required interfaces are up";
       startOn = concatStringsSep " and " (map (job: "started ${job.name}") cfg.interfaceJobs);
       stopOn  = concatStringsSep " and " (map (job: "stopping ${job.name}") cfg.interfaceJobs);
-- 
GitLab


From 7d964498b8ec87c9fafaddbee1dd3508a334493f Mon Sep 17 00:00:00 2001
From: Mathijs Kwik <mathijs@bluescreen303.nl>
Date: Sun, 4 Mar 2012 18:44:47 +0000
Subject: [PATCH 3404/5331] changed the way networking-providers plug
 themselves before "networking"

svn path=/nixos/trunk/; revision=32781
---
 modules/services/networking/gogoclient.nix   |  7 ++-----
 modules/services/networking/gw6c/default.nix |  7 ++-----
 modules/tasks/network-interfaces.nix         | 19 ++-----------------
 3 files changed, 6 insertions(+), 27 deletions(-)

diff --git a/modules/services/networking/gogoclient.nix b/modules/services/networking/gogoclient.nix
index 19d3f5dd755..12fbef1f3ba 100644
--- a/modules/services/networking/gogoclient.nix
+++ b/modules/services/networking/gogoclient.nix
@@ -58,15 +58,12 @@ in
 
     # environment.systemPackages = [pkgs.gogoclient];
 
-    networking = {
-      enableIPv6 = true;
-      interfaceJobs = optional cfg.autorun config.jobs.gogoclient;
-    };
+    networking.enableIPv6 = true;
 
     jobs.gogoclient = {
       name = "gogoclient";
       description = "ipv6 tunnel";
-      startOn = if cfg.autorun then "started network-interfaces" else "";
+      startOn = optionalString cfg.autorun "starting networking";
       stopOn = "stopping network-interfaces";
       script = "cd /var/lib/gogoc; exec gogoc -y -f /etc/gogoc.conf";
       path = [pkgs.gogoclient];
diff --git a/modules/services/networking/gw6c/default.nix b/modules/services/networking/gw6c/default.nix
index 93b6924971e..8471a0c756a 100644
--- a/modules/services/networking/gw6c/default.nix
+++ b/modules/services/networking/gw6c/default.nix
@@ -150,16 +150,13 @@ in
     jobs.gw6c =
       { description = "Gateway6 client";
 
-        startOn = if cfg.autorun then "started network-interfaces" else "";
+        startOn = optionalString cfg.autorun "starting networking";
         stopOn = "stopping network-interfaces";
 
         exec = "${gw6cService}/bin/control start";
       };
 
-    networking = {
-      enableIPv6 = true;
-      interfaceJobs = optional cfg.autorun config.jobs.gw6c;
-    };
+    networking.enableIPv6 = true;
 
   };
 
diff --git a/modules/tasks/network-interfaces.nix b/modules/tasks/network-interfaces.nix
index fc8ebcddca4..866c34b86fe 100644
--- a/modules/tasks/network-interfaces.nix
+++ b/modules/tasks/network-interfaces.nix
@@ -172,17 +172,6 @@ in
         configured.
       '';
     };
-
-    networking.interfaceJobs = mkOption {
-      default = [config.jobs.networkInterfaces];
-      type = types.list types.attrs;
-      merge = mergeListOption;
-      description = ''
-        List of jobs that bring up additional interfaces.
-        For example vpn / ipv6 / ppp tasks.
-        This gets used by certain services as dependency for their upstart job.
-      '';
-    };
   };
 
 
@@ -286,16 +275,12 @@ in
     jobs.networking = {
       name = "networking";
       description = "all required interfaces are up";
-      startOn = concatStringsSep " and " (map (job: "started ${job.name}") cfg.interfaceJobs);
-      stopOn  = concatStringsSep " and " (map (job: "stopping ${job.name}") cfg.interfaceJobs);
+      startOn = "started network-interfaces";
+      stopOn  = "stopping network-interfaces";
       task = true;
       exec = "true";
     };
 
-
-    networking.interfaceJobs = [config.jobs.networkInterfaces];
-    
-
     # Set the host name in the activation script.  Don't clear it if
     # it's not configured in the NixOS configuration, since it may
     # have been set by dhclient in the meantime.
-- 
GitLab


From 0d4eb37e16dc44f2df7b048de1a48fab33a7d97f Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sun, 4 Mar 2012 20:57:34 +0000
Subject: [PATCH 3405/5331] * Fix the NixOS jobset.

svn path=/nixos/trunk/; revision=32783
---
 .../installer/cd-dvd/installation-cd-base.nix    |  2 +-
 release.nix                                      | 16 ++++++----------
 2 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/modules/installer/cd-dvd/installation-cd-base.nix b/modules/installer/cd-dvd/installation-cd-base.nix
index 96d1faaad0f..ac38934d401 100644
--- a/modules/installer/cd-dvd/installation-cd-base.nix
+++ b/modules/installer/cd-dvd/installation-cd-base.nix
@@ -22,7 +22,7 @@ let
   nixosTarball = makeTarball "nixos.tar.bz2" (cleanSource ../../..);
 
   # Put Nixpkgs in a tarball.
-  nixpkgsTarball = makeTarball "nixpkgs.tar.bz2" (cleanSource pkgs.path);
+  nixpkgsTarball = makeTarball "nixpkgs.tar.bz2" (cleanSource <nixpkgs>);
 
   includeSources = true;
 
diff --git a/release.nix b/release.nix
index 44d87e154cd..21eba4e27a2 100644
--- a/release.nix
+++ b/release.nix
@@ -1,5 +1,3 @@
-{ nixpkgs ? ../nixpkgs }:
-
 let
 
 
@@ -10,7 +8,7 @@ let
     , system ? "i686-linux"
     }:
 
-    with import nixpkgs {inherit system;};
+    with <nixpkgs> {inherit system;};
 
     let
 
@@ -22,7 +20,7 @@ let
         };
 
       config = (import lib/eval-config.nix {
-        inherit system nixpkgs;
+        inherit system;
         modules = [ module versionModule ];
       }).config;
 
@@ -51,14 +49,14 @@ let
     , system ? "i686-linux"
     }:
 
-    with import nixpkgs {inherit system;};
+    with import <nixpkgs> {inherit system;};
     let
       version = builtins.readFile ./VERSION + (if officialRelease then "" else "pre${toString nixosSrc.rev}");
 
       versionModule = { system.nixosVersion = version; };
 
       config = (import lib/eval-config.nix {
-        inherit system nixpkgs;
+        inherit system;
         modules = [ module versionModule ];
       }).config;
 
@@ -81,7 +79,7 @@ let
       , officialRelease ? false
       }:
 
-      with import nixpkgs {};
+      with import <nixpkgs> {};
 
       releaseTools.makeSourceTarball {
         name = "nixos-tarball";
@@ -109,10 +107,9 @@ let
       }:
 
       (import "${nixosSrc}/doc/manual" {
-        pkgs = import nixpkgs {};
+        pkgs = import <nixpkgs> {};
         options =
           (import lib/eval-config.nix {
-            inherit nixpkgs;
             modules = [ { fileSystems = []; } ];
           }).options;
         revision =
@@ -162,7 +159,6 @@ let
     tests =
       let
         t = import ./tests {
-          inherit nixpkgs;
           system = "i686-linux";
         };
       in {
-- 
GitLab


From 1adaabef58076b645b9393aa20819c2d897795b3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Sun, 4 Mar 2012 21:00:35 +0000
Subject: [PATCH 3406/5331] Adding an option to luksroot, so it allows to
 define whether to launch cryptsetup after or before LVM. To allow dmcrypt
 over lvm and lvm over dmcrypt.

svn path=/nixos/trunk/; revision=32784
---
 modules/system/boot/luksroot.nix | 43 +++++++++++++++++++++++++++++---
 1 file changed, 39 insertions(+), 4 deletions(-)

diff --git a/modules/system/boot/luksroot.nix b/modules/system/boot/luksroot.nix
index 098641b6cb6..398b6a6a660 100644
--- a/modules/system/boot/luksroot.nix
+++ b/modules/system/boot/luksroot.nix
@@ -5,7 +5,7 @@ with pkgs.lib;
 let
   luks = config.boot.initrd.luks;
 
-  openCommand = { name, device }: ''
+  openCommand = { name, device, ... }: ''
     # Wait for luksRoot to appear, e.g. if on a usb drive.
     # XXX: copied and adapted from stage-1-init.sh - should be
     # available as a function.
@@ -14,7 +14,7 @@ let
         for ((try = 0; try < 10; try++)); do
             sleep 1
             if test -e ${device}; then break; fi
-            echo -n "OK"
+            echo -n .
         done
         echo "ok"
     fi
@@ -23,6 +23,10 @@ let
     cryptsetup luksOpen ${device} ${name}
   '';
 
+  isPreLVM = f: f.preLVM;
+  preLVM = filter isPreLVM luks.devices;
+  postLVM = filter (f: !(isPreLVM f)) luks.devices;
+
 in
 {
 
@@ -36,7 +40,7 @@ in
 
     boot.initrd.luks.devices = mkOption {
       default = [ ];
-      example = [ { name = "luksroot"; device = "/dev/sda3"; } ];
+      example = [ { name = "luksroot"; device = "/dev/sda3"; preLVM = true; } ];
       description = '';
         The list of devices that should be decrypted using LUKS before trying to mount the
         root partition. This works for both LVM-over-LUKS and LUKS-over-LVM setups.
@@ -45,6 +49,36 @@ in
 
         Make sure that initrd has the crypto modules needed for decryption.
       '';
+
+      type = types.list types.optionSet;
+
+      options = {
+
+        name = mkOption {
+          example = "luksroot";
+          type = types.string;
+          description = ''
+            Name of the interface.
+          '';
+        };
+
+        device = mkOption {
+          example = "/dev/sda2";
+          type = types.string;
+          description = ''
+            IP address of the interface.  Leave empty to configure the
+            interface using DHCP.
+          '';
+        };
+
+        preLVM = mkOption {
+          default = true;
+          type = types.bool;
+          description = ''
+            Whether the luksOpen will be attempted before LVM scan or after it.
+          '';
+        };
+      };
     };
   };
 
@@ -68,6 +102,7 @@ in
       $out/bin/cryptsetup --version
     '';
 
-    boot.initrd.preLVMCommands = concatMapStrings openCommand luks.devices;
+    boot.initrd.preLVMCommands = concatMapStrings openCommand preLVM;
+    boot.initrd.postDeviceCommands = concatMapStrings openCommand postLVM;
   };
 }
-- 
GitLab


From 0b8e992d3d4f38afaf7407a5a8cb166e88f5cb21 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Sun, 4 Mar 2012 21:01:20 +0000
Subject: [PATCH 3407/5331] Setting the kernel 3.2 for the new-kernel nixos
 iso.

svn path=/nixos/trunk/; revision=32785
---
 modules/installer/cd-dvd/installation-cd-new-kernel.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/installer/cd-dvd/installation-cd-new-kernel.nix b/modules/installer/cd-dvd/installation-cd-new-kernel.nix
index 1340b9787ca..c7ea5ddfb01 100644
--- a/modules/installer/cd-dvd/installation-cd-new-kernel.nix
+++ b/modules/installer/cd-dvd/installation-cd-new-kernel.nix
@@ -3,6 +3,6 @@
 {
   require = [ ./installation-cd-graphical.nix ];
 
-  boot.kernelPackages = pkgs.linuxPackages_3_0;
+  boot.kernelPackages = pkgs.linuxPackages_3_2;
   boot.vesa = false;
 }
-- 
GitLab


From 4b153f989b22958997da851ad579d3a87d3f0f02 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sun, 4 Mar 2012 21:08:21 +0000
Subject: [PATCH 3408/5331] * And another one.

svn path=/nixos/trunk/; revision=32786
---
 tests/installer.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/installer.nix b/tests/installer.nix
index 921de563ab3..06071bb0da2 100644
--- a/tests/installer.nix
+++ b/tests/installer.nix
@@ -1,4 +1,4 @@
-{ pkgs, nixpkgs, system, ... }:
+{ pkgs, system, ... }:
 
 with pkgs.lib;
 with import ../lib/qemu-flags.nix;
@@ -9,7 +9,7 @@ let
   # instrumentation.
   iso =
     (import ../lib/eval-config.nix {
-      inherit nixpkgs system;
+      inherit system;
       modules =
         [ ../modules/installer/cd-dvd/installation-cd-graphical.nix
           ../modules/testing/test-instrumentation.nix
-- 
GitLab


From a7bd194d14f7be2f0481ec2d67d16fc47b20449b Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sun, 4 Mar 2012 21:13:52 +0000
Subject: [PATCH 3409/5331] * Urgh.

svn path=/nixos/trunk/; revision=32787
---
 release.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/release.nix b/release.nix
index 21eba4e27a2..0058d6ce1dd 100644
--- a/release.nix
+++ b/release.nix
@@ -8,7 +8,7 @@ let
     , system ? "i686-linux"
     }:
 
-    with <nixpkgs> {inherit system;};
+    with import <nixpkgs> {inherit system;};
 
     let
 
-- 
GitLab


From 974a74ad4902a6069e2e4ddb3d33e5c28e8fb9d2 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sun, 4 Mar 2012 21:15:34 +0000
Subject: [PATCH 3410/5331] * enableWLAN -> wireless.enable.

svn path=/nixos/trunk/; revision=32788
---
 modules/installer/tools/nixos-option.sh  | 3 +--
 modules/profiles/installation-device.nix | 2 +-
 modules/virtualisation/qemu-vm.nix       | 2 +-
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/modules/installer/tools/nixos-option.sh b/modules/installer/tools/nixos-option.sh
index e5c681f1a4a..bafce7d5690 100644
--- a/modules/installer/tools/nixos-option.sh
+++ b/modules/installer/tools/nixos-option.sh
@@ -242,8 +242,7 @@ if $generate; then
 
   networking = {
     # hostName = "nixos"; # Define your hostname.
-    interfaceMonitor.enable = true; # Watch for plugged cable.
-    enableWLAN = true;  # Enables Wireless.
+    wireless.enable = true;  # Enables Wireless.
   };
 
   # Add file system entries for each partition that you want to see mounted
diff --git a/modules/profiles/installation-device.nix b/modules/profiles/installation-device.nix
index 287b39ad766..40daa10c8ce 100644
--- a/modules/profiles/installation-device.nix
+++ b/modules/profiles/installation-device.nix
@@ -155,7 +155,7 @@ in
     jobs.sshd.startOn = pkgs.lib.mkOverride 50 "";
 
     # Enable wpa_supplicant, but don't start it by default.
-    networking.enableWLAN = true;
+    networking.wireless.enable = true;
     jobs.wpa_supplicant.startOn = pkgs.lib.mkOverride 50 "";
   };
 }
diff --git a/modules/virtualisation/qemu-vm.nix b/modules/virtualisation/qemu-vm.nix
index 9f6801e89cc..91ff1d594ba 100644
--- a/modules/virtualisation/qemu-vm.nix
+++ b/modules/virtualisation/qemu-vm.nix
@@ -382,5 +382,5 @@ in
   services.mingetty.ttys = ttys ++ optional (!cfg.graphics) "ttyS0";
 
   # Wireless won't work in the VM.
-  networking.enableWLAN = mkOverride 50 false;
+  networking.wireless.enable = mkOverride 50 false;
 }
-- 
GitLab


From a2417fd92f94042d52a811eac2c8e8fb7cf50598 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 6 Mar 2012 10:57:52 +0000
Subject: [PATCH 3411/5331] * Another workaround for the bug in substitute.

svn path=/nixos/trunk/; revision=32814
---
 modules/installer/tools/nixos-hardware-scan.pl | 1 +
 1 file changed, 1 insertion(+)

diff --git a/modules/installer/tools/nixos-hardware-scan.pl b/modules/installer/tools/nixos-hardware-scan.pl
index 31b07a57280..f123303e748 100644
--- a/modules/installer/tools/nixos-hardware-scan.pl
+++ b/modules/installer/tools/nixos-hardware-scan.pl
@@ -240,3 +240,4 @@ print <<EOF ;
   nix.maxJobs = $cpus;
 $attrs}
 EOF
+# workaround for a bug in substituteAll
-- 
GitLab


From 4869175158668c0e95a486a7716a36b6489d6425 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 7 Mar 2012 21:17:46 +0000
Subject: [PATCH 3412/5331] * Fix the installer.  The nixos-config element in
 $NIX_PATH was not   set (and neither was $NIXOS_CONFIG).  
 (http://hydra.nixos.org/build/2230309).

svn path=/nixos/trunk/; revision=32857
---
 modules/installer/tools/nixos-install.sh | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/modules/installer/tools/nixos-install.sh b/modules/installer/tools/nixos-install.sh
index e1b4ac4da1f..00cd4e2228a 100644
--- a/modules/installer/tools/nixos-install.sh
+++ b/modules/installer/tools/nixos-install.sh
@@ -15,9 +15,8 @@ if test -z "$mountPoint"; then
     mountPoint=/mnt
 fi
 
-# NIXOS_CONFIG is interpreted relative to $mountPoint.
 if test -z "$NIXOS_CONFIG"; then
-    NIXOS_CONFIG=/etc/nixos/configuration.nix
+    NIXOS_CONFIG=/mnt/etc/nixos/configuration.nix
 fi
 
 if ! test -e "$mountPoint"; then
@@ -30,8 +29,8 @@ if ! grep -F -q " $mountPoint " /proc/mounts; then
     exit 1
 fi
     
-if ! test -e "$mountPoint/$NIXOS_CONFIG"; then
-    echo "configuration file $mountPoint/$NIXOS_CONFIG doesn't exist"
+if ! test -e "$NIXOS_CONFIG"; then
+    echo "configuration file $NIXOS_CONFIG doesn't exist"
     exit 1
 fi
     
@@ -91,6 +90,8 @@ mkdir -m 0755 -p \
 mkdir -m 1777 -p \
     $mountPoint/nix/store \
 
+echo /mnt$NIXOS_CONFIG
+
 
 # Get the store paths to copy from the references graph.
 storePaths=$(@perl@/bin/perl @pathsFromGraph@ @nixClosure@)
@@ -141,9 +142,9 @@ fi
 # Build the specified Nix expression in the target store and install
 # it into the system configuration profile.
 echo "building the system configuration..."
-NIX_PATH=nixpkgs=/mnt/etc/nixos/nixpkgs:nixos=/mnt/etc/nixos/nixos \
+NIX_PATH=nixpkgs=/mnt/etc/nixos/nixpkgs:nixos=/mnt/etc/nixos/nixos:nixos-config="/mnt$NIXOS_CONFIG" NIXOS_CONFIG= \
     chroot $mountPoint @nix@/bin/nix-env \
-    -p /nix/var/nix/profiles/system -f '<nixos>' --set -A system
+    -p /nix/var/nix/profiles/system -f '<nixos>' --set -A system --show-trace
 
 
 # Make a backup of the old NixOS/Nixpkgs sources.
-- 
GitLab


From e97817b5770def5c24ac2ab56d7068e351f196ad Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 8 Mar 2012 16:08:03 +0000
Subject: [PATCH 3413/5331] * Atomically replace the /bin/sh symlink; otherwise
 there is a time   window in which /bin/sh is missing.  This can cause
 concurrently   running programs to fail (e.g. Hydra jobs =>  
 http://hydra.nixos.org/build/2267831).  You'd think the odds of this   are
 very low, but they're not.

svn path=/nixos/trunk/; revision=32901
---
 modules/programs/bash/bash.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/modules/programs/bash/bash.nix b/modules/programs/bash/bash.nix
index 31a14663aa0..626ed722536 100644
--- a/modules/programs/bash/bash.nix
+++ b/modules/programs/bash/bash.nix
@@ -56,7 +56,8 @@ in
       # Create the required /bin/sh symlink; otherwise lots of things
       # (notably the system() function) won't work.
       mkdir -m 0755 -p /bin
-      ln -sfn ${config.system.build.binsh}/bin/sh /bin/sh
+      ln -sfn ${config.system.build.binsh}/bin/sh /bin/.sh.tmp
+      mv /bin/.sh.tmp /bin/sh # atomically replace /bin/sh
     '';
 
 }
-- 
GitLab


From 98dde1378290ea87389c1caa5285b398fc5e396f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Thu, 8 Mar 2012 20:49:26 +0000
Subject: [PATCH 3414/5331] If enabling luks on initrd, also adding cryptsetup
 to system packages. I think it's useful.

svn path=/nixos/trunk/; revision=32910
---
 modules/system/boot/luksroot.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/modules/system/boot/luksroot.nix b/modules/system/boot/luksroot.nix
index 398b6a6a660..9af2c0080a3 100644
--- a/modules/system/boot/luksroot.nix
+++ b/modules/system/boot/luksroot.nix
@@ -104,5 +104,7 @@ in
 
     boot.initrd.preLVMCommands = concatMapStrings openCommand preLVM;
     boot.initrd.postDeviceCommands = concatMapStrings openCommand postLVM;
+
+    environment.systemPackages = [ pkgs.cryptsetup ];
   };
 }
-- 
GitLab


From 9d1b72a6c74140099235f408f559256fc95cc386 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Thu, 8 Mar 2012 21:07:25 +0000
Subject: [PATCH 3415/5331] Making nixos fileSystems aware of fsType "reiserfs"
 and "btrfs", regarding modules, tools, intrd pieces, ...

That's only useful if the user specifies fsType, though.


svn path=/nixos/trunk/; revision=32912
---
 modules/tasks/filesystems.nix | 33 +++++++++++++++++++++++++++++----
 1 file changed, 29 insertions(+), 4 deletions(-)

diff --git a/modules/tasks/filesystems.nix b/modules/tasks/filesystems.nix
index 614d4415062..59e1137852a 100644
--- a/modules/tasks/filesystems.nix
+++ b/modules/tasks/filesystems.nix
@@ -3,12 +3,33 @@
 with pkgs.lib;
 
 let
-  needsBtrfsProgs = any (fs: fs.fsType == "btrfs") config.fileSystems;
+  usingSome = fsname: any (fs: fs.fsType == fsname) config.fileSystems;
+  usingSomeStage1 =  fsname: any (fs: fs.fsType == fsname &&
+    (fs.mountPoint == "/" || fs.neededForBoot)) config.fileSystems;
+
+  usingBtrfs = usingSome "btrfs";
+  usingBtrfsStage1 = usingSomeStage1 "btrfs";
+
+  usingReiserfs = usingSome "reiserfs";
+  usingReiserfsStage1 = usingSomeStage1 "reiserfs";
 
   # Packages that provide fsck backends.
-  fsPackages = [ pkgs.e2fsprogs pkgs.reiserfsprogs pkgs.dosfstools ]
-             ++ optional needsBtrfsProgs pkgs.btrfsProgs;
+  fsPackages = [ pkgs.e2fsprogs pkgs.dosfstools ]
+    ++ optional usingReiserfs pkgs.btrfsProgs
+    ++ optional usingBtrfs pkgs.btrfsProgs;
+
+  fsKernelModules = optional usingBtrfsStage1 [ "btrfs" "crc32c" ]
+    ++ optional usingReiserfsStage1 [ "reiserfs" ];
 
+  fsExtraUtilsCommands = optionalString usingBtrfsStage1 ''
+      cp -v ${pkgs.btrfsProgs}/bin/btrfsck $out/bin
+      cp -v ${pkgs.btrfsProgs}/bin/btrfs $out/bin
+      ln -sv btrfsck $out/bin/fsck.btrfs
+    '';
+
+  fsPostDeviceCommands = optionalString usingBtrfsStage1 ''
+    btrfs device scan
+  '';
 
 in
 
@@ -162,6 +183,10 @@ in
         target = "fstab";
       };
 
+    boot.initrd.extraUtilsCommands = fsExtraUtilsCommands;
+    boot.initrd.postDeviceCommands = fsPostDeviceCommands;
+    boot.initrd.kernelModules = fsKernelModules;
+
     jobs.mountall =
       { startOn = "started udev"
           # !!! The `started nfs-kernel-statd' condition shouldn't be
@@ -178,7 +203,7 @@ in
             exec > /dev/console 2>&1
             echo "mounting filesystems..."
             export PATH=${config.system.sbin.mount}/bin:${makeSearchPath "sbin" ([pkgs.utillinux] ++ fsPackages)}:$PATH
-            ${optionalString needsBtrfsProgs "${pkgs.btrfsProgs}/bin/btrfs device scan"}
+            ${optionalString usingBtrfs "${pkgs.btrfsProgs}/bin/btrfs device scan"}
             ${pkgs.mountall}/sbin/mountall
           '';
       };
-- 
GitLab


From 13ac0a309b0b9626268e37eedc30769ad053491b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Thu, 8 Mar 2012 21:37:30 +0000
Subject: [PATCH 3416/5331] Allow a way to install grub to multiple devices
 (for /boot on soft raid arrays).

svn path=/nixos/trunk/; revision=32913
---
 modules/installer/grub/grub.nix                    | 14 ++++++++++++++
 .../system/activation/switch-to-configuration.sh   |  4 +++-
 modules/system/activation/top-level.nix            |  5 ++++-
 3 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/modules/installer/grub/grub.nix b/modules/installer/grub/grub.nix
index eaafec78653..1f9571fd7a5 100644
--- a/modules/installer/grub/grub.nix
+++ b/modules/installer/grub/grub.nix
@@ -54,6 +54,20 @@ in
           value <literal>nodev</literal> means that a GRUB boot menu
           will be generated, but GRUB itself will not actually be
           installed.
+
+          To install grub into multiple devices look at
+          <literal>devices</literal>.
+        '';
+      };
+
+      devices = mkOption {
+        default = [];
+        example = [ "/dev/hda" ];
+        type = with pkgs.lib.types; listOf string;
+        description = ''
+          The devices on which the boot loader, GRUB, will be
+          installed. Can be used instead of <literal>device</literal> to
+          install grub into multiple devices (as softraid arrays holding /boot).
         '';
       };
 
diff --git a/modules/system/activation/switch-to-configuration.sh b/modules/system/activation/switch-to-configuration.sh
index 3be1b210d6a..75e004d7738 100644
--- a/modules/system/activation/switch-to-configuration.sh
+++ b/modules/system/activation/switch-to-configuration.sh
@@ -38,7 +38,9 @@ if [ "$action" = "switch" -o "$action" = "boot" ]; then
 
               if [ "$NIXOS_INSTALL_GRUB" = 1 -o "$oldGrubVersion" != "$newGrubVersion" ]; then
                   echo "installing the GRUB bootloader..."
-                  @grub@/sbin/grub-install "$(readlink -f "@grubDevice@")" --no-floppy
+                  for a in @grubDevices@; do
+                    @grub@/sbin/grub-install "$(readlink -f "$a")" --no-floppy
+                  done
                   echo "$newGrubVersion" > /boot/grub/version
               fi
           fi
diff --git a/modules/system/activation/top-level.nix b/modules/system/activation/top-level.nix
index b98242c3f33..a0a3b2c9b2f 100644
--- a/modules/system/activation/top-level.nix
+++ b/modules/system/activation/top-level.nix
@@ -171,7 +171,10 @@ let
       if config.boot.loader.grub.enable
       then (builtins.parseDrvName config.system.build.grub.name).version
       else "";
-    grubDevice = config.boot.loader.grub.device;
+    grubDevices = let
+        wrapQuotes = s: "\"" + s + "\"";
+      in map wrapQuotes ([ config.boot.loader.grub.device ] ++
+        config.boot.loader.grub.devices);
     configurationName = config.boot.loader.grub.configurationName;
   };
 
-- 
GitLab


From 8708578181a12a2cec7a8d9961af905be7ba35bc Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 9 Mar 2012 10:24:31 +0000
Subject: [PATCH 3417/5331] services/printing/cupsd.nix: move the
 gstoraster.convs file from /etc/cups into the compiled backends directory in
 the store

svn path=/nixos/trunk/; revision=32951
---
 modules/services/printing/cupsd.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/modules/services/printing/cupsd.nix b/modules/services/printing/cupsd.nix
index 6f0f88c8205..848537b9f0d 100644
--- a/modules/services/printing/cupsd.nix
+++ b/modules/services/printing/cupsd.nix
@@ -32,6 +32,10 @@ let
       # hard-coded $PATH.
       mkdir -p $out/lib/cups/filter
       ln -s ${pkgs.coreutils}/bin/date ${pkgs.coreutils}/bin/cat ${pkgs.gnused}/bin/sed $out/lib/cups/filter/
+
+      # Import filter configuration from Ghostscript.
+      mkdir -p $out/share/cups/mime/
+      ln -v -s "${pkgs.ghostscript}/etc/cups/"* $out/share/cups/mime/
     '';
   };
 
@@ -135,7 +139,6 @@ in
         preStart =
           ''
             mkdir -m 0755 -p /etc/cups
-            ln -f -v -s "${pkgs.ghostscript}/etc/cups/"* /etc/cups/
             mkdir -m 0755 -p ${logDir}
             mkdir -m 0700 -p /var/cache/cups
             mkdir -m 0700 -p /var/spool/cups
-- 
GitLab


From 03ebb883d18fb438de0bc27f4a209383adfa3419 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 9 Mar 2012 14:37:58 +0000
Subject: [PATCH 3418/5331] * Modularize filesystem support.  Filesystems such
 as btrfs and   reiserfs now have separate modules that are conditional on  
 boot.supportedFilesystems and boot.initrd.supportedFilesystems.   By default,
 these include the filesystems specified in the fsType   attribute in
 fileSystems.  Ext2/3/4 support is currently   unconditional.

  Also unbreak the installer test (http://hydra.nixos.org/build/2272302).

svn path=/nixos/trunk/; revision=32954
---
 modules/config/system-path.nix                |  1 -
 modules/module-list.nix                       |  5 +
 modules/profiles/base.nix                     |  5 +-
 modules/services/misc/autofs.nix              |  4 +-
 .../network-filesystems/nfs-kernel.nix        |  2 +-
 modules/system/boot/kernel.nix                |  3 -
 modules/system/boot/stage-1.nix               | 19 ----
 modules/tasks/filesystems.nix                 | 98 +++++++------------
 modules/tasks/filesystems/btrfs.nix           | 38 +++++++
 modules/tasks/filesystems/ext.nix             | 22 +++++
 modules/tasks/filesystems/nfs.nix             | 25 +++++
 modules/tasks/filesystems/reiserfs.nix        | 25 +++++
 12 files changed, 159 insertions(+), 88 deletions(-)
 create mode 100644 modules/tasks/filesystems/btrfs.nix
 create mode 100644 modules/tasks/filesystems/ext.nix
 create mode 100644 modules/tasks/filesystems/nfs.nix
 create mode 100644 modules/tasks/filesystems/reiserfs.nix

diff --git a/modules/config/system-path.nix b/modules/config/system-path.nix
index d989ddf4b91..ce27eb35dd9 100644
--- a/modules/config/system-path.nix
+++ b/modules/config/system-path.nix
@@ -17,7 +17,6 @@ let
 
   requiredPackages =
     [ config.system.sbin.modprobe # must take precedence over module_init_tools
-      config.system.sbin.mount # must take precedence over util-linux
       config.system.build.upstart
       config.environment.nix
       pkgs.acl
diff --git a/modules/module-list.nix b/modules/module-list.nix
index 7d42571d0fa..5a1459f5226 100644
--- a/modules/module-list.nix
+++ b/modules/module-list.nix
@@ -114,6 +114,7 @@
   ./services/networking/cntlm.nix
   ./services/networking/ddclient.nix
   ./services/networking/dhclient.nix
+  #./services/networking/dhcpcd.nix
   ./services/networking/dhcpd.nix
   ./services/networking/dnsmasq.nix
   ./services/networking/ejabberd.nix
@@ -198,6 +199,10 @@
   ./system/upstart/upstart.nix
   ./tasks/cpu-freq.nix
   ./tasks/filesystems.nix
+  ./tasks/filesystems/btrfs.nix
+  ./tasks/filesystems/ext.nix
+  ./tasks/filesystems/nfs.nix
+  ./tasks/filesystems/reiserfs.nix
   ./tasks/kbd.nix
   ./tasks/lvm.nix
   ./tasks/network-interfaces.nix
diff --git a/modules/profiles/base.nix b/modules/profiles/base.nix
index d67e7ca6734..d6412e09a5f 100644
--- a/modules/profiles/base.nix
+++ b/modules/profiles/base.nix
@@ -31,7 +31,6 @@
 
     # Tools to create / manipulate filesystems.
     pkgs.ntfsprogs # for resizing NTFS partitions
-    pkgs.btrfsProgs
     pkgs.dosfstools
     pkgs.xfsprogs
     pkgs.jfsutils
@@ -50,4 +49,8 @@
     pkgs.bvi # binary editor
     pkgs.joe
   ];
+
+  # Include support for various filesystems.
+  boot.supportedFilesystems = [ "btrfs" "reiserfs" ];
+
 }
diff --git a/modules/services/misc/autofs.nix b/modules/services/misc/autofs.nix
index eb3105e3a09..e55c213ed21 100644
--- a/modules/services/misc/autofs.nix
+++ b/modules/services/misc/autofs.nix
@@ -6,8 +6,6 @@ let
 
   cfg = config.services.autofs;
 
-  mount = config.system.sbin.mount;
-
   autoMaster = pkgs.writeText "auto.master" cfg.autoMaster;
 
 in
@@ -114,7 +112,7 @@ in
           unescapeSpaces(){ sed 's/\\040/ /g'; }
           sed -n 's@^\s*\(\([^\\ ]\|\\ \)*\)\s.*@\1@p' ${autoMaster} | sed 's/[\\]//' | while read mountPoint; do
             sed -n "s@[^ ]\+\s\+\($(echo "$mountPoint"| escapeSpaces)[^ ]*\).*@\1@p" /proc/mounts | sort -r | unescapeSpaces| while read smountP; do
-              ${mount}/bin/umount -l "$smountP" || true
+              ${pkgs.utillinux}/bin/umount -l "$smountP" || true
             done
           done
           '';
diff --git a/modules/services/network-filesystems/nfs-kernel.nix b/modules/services/network-filesystems/nfs-kernel.nix
index 8ed22edf01e..1ebc268ecf8 100644
--- a/modules/services/network-filesystems/nfs-kernel.nix
+++ b/modules/services/network-filesystems/nfs-kernel.nix
@@ -151,7 +151,7 @@ in
                 ${config.system.sbin.modprobe}/sbin/modprobe nfsd || true
 
                 ${pkgs.sysvtools}/bin/mountpoint -q /proc/fs/nfsd \
-                || ${config.system.sbin.mount}/bin/mount -t nfsd none /proc/fs/nfsd
+                || ${pkgs.utillinux}/bin/mount -t nfsd none /proc/fs/nfsd
 
                 ${optionalString cfg.server.createMountPoints
                   ''
diff --git a/modules/system/boot/kernel.nix b/modules/system/boot/kernel.nix
index c8ed496d8ae..ea5a300fbce 100644
--- a/modules/system/boot/kernel.nix
+++ b/modules/system/boot/kernel.nix
@@ -148,9 +148,6 @@ let kernel = config.boot.kernelPackages.kernel; in
         "ide_disk"
         "ide_generic"
 
-        # Filesystems.
-        "ext2" "ext3" "ext4"
-
         # Support USB keyboards, in case the boot fails and we only have
         # a USB keyboard.
         "uhci_hcd"
diff --git a/modules/system/boot/stage-1.nix b/modules/system/boot/stage-1.nix
index bc27c9f80ff..5a74ea84f38 100644
--- a/modules/system/boot/stage-1.nix
+++ b/modules/system/boot/stage-1.nix
@@ -153,17 +153,6 @@ let
       cp -v ${pkgs.coreutils}/bin/sleep $out/bin
       cp -v ${pkgs.coreutils}/bin/ln $out/bin
 
-      # Copy e2fsck and friends.
-      cp -v ${pkgs.e2fsprogs}/sbin/e2fsck $out/bin
-      cp -v ${pkgs.e2fsprogs}/sbin/tune2fs $out/bin
-      cp -v ${pkgs.reiserfsprogs}/sbin/reiserfsck $out/bin
-      ln -sv e2fsck $out/bin/fsck.ext2
-      ln -sv e2fsck $out/bin/fsck.ext3
-      ln -sv e2fsck $out/bin/fsck.ext4
-      ln -sv reiserfsck $out/bin/fsck.reiserfs
-
-      cp -pdv ${pkgs.e2fsprogs}/lib/lib*.so.* $out/lib
-
       # Copy dmsetup and lvm.
       cp -v ${pkgs.lvm2}/sbin/dmsetup $out/bin/dmsetup
       cp -v ${pkgs.lvm2}/sbin/lvm $out/bin/lvm
@@ -189,11 +178,6 @@ let
         cp ${kernelPackages.splashutils}/${kernelPackages.splashutils.helperName} $out/bin/splash_helper
       ''}
 
-      # Copy nfsmount if there is any NFS mounts required for boot.
-      ${optionalString (filter (fs: fs.fsType == "nfs" && (fs.mountPoint == "/" || fs.neededForBoot)) fileSystems != []) ''
-        cp -v ${pkgs.klibc}/lib/klibc/bin.static/nfsmount $out/bin
-      ''}
-
       ${config.boot.initrd.extraUtilsCommands}
 
       # Run patchelf to make the programs refer to the copied libraries.
@@ -223,13 +207,10 @@ let
       export LD_LIBRARY_PATH=$out/lib
       $out/bin/mount --version | grep "mount from"
       $out/bin/umount --version | grep "umount "
-      $out/bin/e2fsck -V 2>&1 | grep "e2fsck "
-      $out/bin/tune2fs 2> /dev/null | grep "tune2fs "
       $out/bin/udevadm --version
       $out/bin/blkid -v 2>&1 | tee -a $out/log | grep "blkid from util-linux"
       $out/bin/dmsetup --version 2>&1 | tee -a $out/log | grep "version:"
       LVM_SYSTEM_DIR=$out $out/bin/lvm version 2>&1 | tee -a $out/log | grep "LVM"
-      $out/bin/reiserfsck -V
       $out/bin/mdadm --version
       $out/bin/basename --version
       $out/bin/modprobe --version
diff --git a/modules/tasks/filesystems.nix b/modules/tasks/filesystems.nix
index 59e1137852a..75cec61fd6c 100644
--- a/modules/tasks/filesystems.nix
+++ b/modules/tasks/filesystems.nix
@@ -2,37 +2,6 @@
 
 with pkgs.lib;
 
-let
-  usingSome = fsname: any (fs: fs.fsType == fsname) config.fileSystems;
-  usingSomeStage1 =  fsname: any (fs: fs.fsType == fsname &&
-    (fs.mountPoint == "/" || fs.neededForBoot)) config.fileSystems;
-
-  usingBtrfs = usingSome "btrfs";
-  usingBtrfsStage1 = usingSomeStage1 "btrfs";
-
-  usingReiserfs = usingSome "reiserfs";
-  usingReiserfsStage1 = usingSomeStage1 "reiserfs";
-
-  # Packages that provide fsck backends.
-  fsPackages = [ pkgs.e2fsprogs pkgs.dosfstools ]
-    ++ optional usingReiserfs pkgs.btrfsProgs
-    ++ optional usingBtrfs pkgs.btrfsProgs;
-
-  fsKernelModules = optional usingBtrfsStage1 [ "btrfs" "crc32c" ]
-    ++ optional usingReiserfsStage1 [ "reiserfs" ];
-
-  fsExtraUtilsCommands = optionalString usingBtrfsStage1 ''
-      cp -v ${pkgs.btrfsProgs}/bin/btrfsck $out/bin
-      cp -v ${pkgs.btrfsProgs}/bin/btrfs $out/bin
-      ln -sv btrfsck $out/bin/fsck.btrfs
-    '';
-
-  fsPostDeviceCommands = optionalString usingBtrfsStage1 ''
-    btrfs device scan
-  '';
-
-in
-
 {
 
   ###### interface
@@ -54,7 +23,7 @@ in
         }
       ];
 
-      description = "
+      description = ''
         The file systems to be mounted.  It must include an entry for
         the root directory (<literal>mountPoint = \"/\"</literal>).  Each
         entry in the list is an attribute set with the following fields:
@@ -72,7 +41,7 @@ in
 
         <literal>autocreate</literal> forces <literal>mountPoint</literal> to be created with
         <command>mkdir -p</command> .
-      ";
+      '';
 
       type = types.nullOr (types.list types.optionSet);
 
@@ -81,36 +50,28 @@ in
         mountPoint = mkOption {
           example = "/mnt/usb";
           type = types.uniq types.string;
-          description = "
-            Location of the mounted the file system.
-          ";
+          description = "Location of the mounted the file system.";
         };
 
         device = mkOption {
           default = null;
           example = "/dev/sda";
           type = types.uniq (types.nullOr types.string);
-          description = "
-            Location of the device.
-          ";
+          description = "Location of the device.";
         };
 
         label = mkOption {
           default = null;
           example = "root-partition";
           type = types.uniq (types.nullOr types.string);
-          description = "
-            Label of the device (if any).
-          ";
+          description = "Label of the device (if any).";
         };
 
         fsType = mkOption {
           default = "auto";
           example = "ext3";
           type = types.uniq types.string;
-          description = "
-            Type of the file system.
-          ";
+          description = "Type of the file system.";
         };
 
         options = mkOption {
@@ -124,10 +85,10 @@ in
         autocreate = mkOption {
           default = false;
           type = types.bool;
-          description = "
+          description = ''
             Automatically create the mount point defined in
             <option>fileSystems.*.mountPoint</option>.
-          ";
+          '';
         };
 
         noCheck = mkOption {
@@ -138,12 +99,24 @@ in
       };
     };
 
-    system.sbin.mount = mkOption {
+    system.fsPackages = mkOption {
       internal = true;
-      default = pkgs.utillinux;
-      description = "
-        Package containing mount and umount.
-      ";
+      default = [ ];
+      description = "Packages supplying file system mounters and checkers.";
+    };
+
+    boot.supportedFilesystems = mkOption {
+      default = [ ];
+      example = [ "btrfs" ];
+      type = types.list types.string;
+      description = "Names of supported filesystem types.";
+    };
+
+    boot.initrd.supportedFilesystems = mkOption {
+      default = [ ];
+      example = [ "btrfs" ];
+      type = types.list types.string;
+      description = "Names of supported filesystem types in the initial ramdisk.";
     };
 
   };
@@ -153,10 +126,19 @@ in
 
   config = {
 
+    boot.supportedFilesystems =
+      map (fs: fs.fsType) config.fileSystems;
+
+    boot.initrd.supportedFilesystems =
+      map (fs: fs.fsType)
+        (filter (fs: fs.mountPoint == "/" || fs.neededForBoot) config.fileSystems);
+
     # Add the mount helpers to the system path so that `mount' can find them.
+    system.fsPackages = [ pkgs.dosfstools ];
+    
     environment.systemPackages =
-      [ pkgs.ntfs3g pkgs.cifs_utils pkgs.nfsUtils pkgs.mountall ]
-      ++ fsPackages;
+      [ pkgs.ntfs3g pkgs.cifs_utils pkgs.mountall ]
+      ++ config.system.fsPackages;
 
     environment.etc = singleton
       { source = pkgs.writeText "fstab"
@@ -183,10 +165,6 @@ in
         target = "fstab";
       };
 
-    boot.initrd.extraUtilsCommands = fsExtraUtilsCommands;
-    boot.initrd.postDeviceCommands = fsPostDeviceCommands;
-    boot.initrd.kernelModules = fsKernelModules;
-
     jobs.mountall =
       { startOn = "started udev"
           # !!! The `started nfs-kernel-statd' condition shouldn't be
@@ -198,12 +176,12 @@ in
 
         task = true;
 
+        path = [ pkgs.utillinux ] ++ config.system.fsPackages;
+
         script =
           ''
             exec > /dev/console 2>&1
             echo "mounting filesystems..."
-            export PATH=${config.system.sbin.mount}/bin:${makeSearchPath "sbin" ([pkgs.utillinux] ++ fsPackages)}:$PATH
-            ${optionalString usingBtrfs "${pkgs.btrfsProgs}/bin/btrfs device scan"}
             ${pkgs.mountall}/sbin/mountall
           '';
       };
diff --git a/modules/tasks/filesystems/btrfs.nix b/modules/tasks/filesystems/btrfs.nix
new file mode 100644
index 00000000000..c526b9677cf
--- /dev/null
+++ b/modules/tasks/filesystems/btrfs.nix
@@ -0,0 +1,38 @@
+{ config, pkgs, ... }:
+
+with pkgs.lib;
+
+let
+
+  inInitrd = any (fs: fs == "btrfs") config.boot.initrd.supportedFilesystems;
+
+in
+
+{
+  config = mkIf (any (fs: fs == "btrfs") config.boot.supportedFilesystems) {
+
+    system.fsPackages = [ pkgs.btrfsProgs ];
+
+    boot.initrd.kernelModules = mkIf inInitrd [ "btrfs" "crc32c" ];
+
+    boot.initrd.extraUtilsCommands = mkIf inInitrd
+      ''
+        cp -v ${pkgs.btrfsProgs}/bin/btrfsck $out/bin
+        cp -v ${pkgs.btrfsProgs}/bin/btrfs $out/bin
+        ln -sv btrfsck $out/bin/fsck.btrfs
+      '';
+
+    boot.initrd.postDeviceCommands = mkIf inInitrd
+      ''
+        btrfs device scan
+      '';
+
+    # !!! This is broken.  There should be a udev rule to do this when
+    # new devices are discovered.
+    jobs.udev.postStart =
+      ''
+        ${pkgs.btrfsProgs}/bin/btrfs device scan
+      '';
+
+  };
+}
diff --git a/modules/tasks/filesystems/ext.nix b/modules/tasks/filesystems/ext.nix
new file mode 100644
index 00000000000..93cdef4c664
--- /dev/null
+++ b/modules/tasks/filesystems/ext.nix
@@ -0,0 +1,22 @@
+{ config, pkgs, ... }:
+
+{
+  config = {
+
+    system.fsPackages = [ pkgs.e2fsprogs ];
+
+    boot.initrd.kernelModules = [ "ext2" "ext3" "ext4" ];
+
+    boot.initrd.extraUtilsCommands =
+      ''
+        # Copy e2fsck and friends.
+        cp -v ${pkgs.e2fsprogs}/sbin/e2fsck $out/bin
+        cp -v ${pkgs.e2fsprogs}/sbin/tune2fs $out/bin
+        ln -sv e2fsck $out/bin/fsck.ext2
+        ln -sv e2fsck $out/bin/fsck.ext3
+        ln -sv e2fsck $out/bin/fsck.ext4
+        cp -pdv ${pkgs.e2fsprogs}/lib/lib*.so.* $out/lib
+      '';
+
+  };
+}
diff --git a/modules/tasks/filesystems/nfs.nix b/modules/tasks/filesystems/nfs.nix
new file mode 100644
index 00000000000..546b6368721
--- /dev/null
+++ b/modules/tasks/filesystems/nfs.nix
@@ -0,0 +1,25 @@
+{ config, pkgs, ... }:
+
+with pkgs.lib;
+
+let
+
+  inInitrd = any (fs: fs == "nfs") config.boot.initrd.supportedFilesystems;
+
+in
+
+{
+  config = {
+
+    system.fsPackages = [ pkgs.nfsUtils ];
+
+    boot.initrd.kernelModules = mkIf inInitrd [ "nfs" ];
+
+    boot.initrd.extraUtilsCommands = mkIf inInitrd
+      ''
+        # !!! Uh, why don't we just install mount.nfs?
+        cp -v ${pkgs.klibc}/lib/klibc/bin.static/nfsmount $out/bin
+      '';
+
+  };
+}
diff --git a/modules/tasks/filesystems/reiserfs.nix b/modules/tasks/filesystems/reiserfs.nix
new file mode 100644
index 00000000000..f8c6a700004
--- /dev/null
+++ b/modules/tasks/filesystems/reiserfs.nix
@@ -0,0 +1,25 @@
+{ config, pkgs, ... }:
+
+with pkgs.lib;
+
+let
+
+  inInitrd = any (fs: fs == "reiserfs") config.boot.initrd.supportedFilesystems;
+
+in
+
+{
+  config = mkIf (any (fs: fs == "reiserfs") config.boot.supportedFilesystems) {
+
+    system.fsPackages = [ pkgs.reiserfsprogs ];
+
+    boot.initrd.kernelModules = mkIf inInitrd [ "reiserfs" ];
+
+    boot.initrd.extraUtilsCommands = mkIf inInitrd
+      ''
+        cp -v ${pkgs.reiserfsprogs}/sbin/reiserfsck $out/bin
+        ln -sv reiserfsck $out/bin/fsck.reiserfs
+      '';
+
+  };
+}
-- 
GitLab


From 9d89ca0c03a669a81f4e98aa6fbf2606cea15ff7 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 9 Mar 2012 16:17:37 +0000
Subject: [PATCH 3419/5331] * Modularise vfat support.  Also add fsck.vfat to
 the initrd.  This   prevents errors when booting from VFAT (e.g. an ISO image
 converted   using unetbootin).

svn path=/nixos/trunk/; revision=32956
---
 modules/installer/cd-dvd/iso-image.nix |  5 +++++
 modules/module-list.nix                |  1 +
 modules/profiles/all-hardware.nix      |  4 ----
 modules/profiles/base.nix              |  2 +-
 modules/tasks/filesystems/vfat.nix     | 25 +++++++++++++++++++++++++
 5 files changed, 32 insertions(+), 5 deletions(-)
 create mode 100644 modules/tasks/filesystems/vfat.nix

diff --git a/modules/installer/cd-dvd/iso-image.nix b/modules/installer/cd-dvd/iso-image.nix
index 0a2f76c919c..7cc08315d01 100644
--- a/modules/installer/cd-dvd/iso-image.nix
+++ b/modules/installer/cd-dvd/iso-image.nix
@@ -259,4 +259,9 @@ in
       touch /etc/NIXOS
       ${config.environment.nix}/bin/nix-env -p /nix/var/nix/profiles/system --set /var/run/current-system
     '';
+
+  # Add vfat support to the initrd to enable people to copy the
+  # contents of the CD to a bootable USB stick.
+  boot.initrd.supportedFilesystems = [ "vfat" ];
+    
 }
diff --git a/modules/module-list.nix b/modules/module-list.nix
index 5a1459f5226..b69295a89da 100644
--- a/modules/module-list.nix
+++ b/modules/module-list.nix
@@ -203,6 +203,7 @@
   ./tasks/filesystems/ext.nix
   ./tasks/filesystems/nfs.nix
   ./tasks/filesystems/reiserfs.nix
+  ./tasks/filesystems/vfat.nix
   ./tasks/kbd.nix
   ./tasks/lvm.nix
   ./tasks/network-interfaces.nix
diff --git a/modules/profiles/all-hardware.nix b/modules/profiles/all-hardware.nix
index 8b894fa4df0..041948aa462 100644
--- a/modules/profiles/all-hardware.nix
+++ b/modules/profiles/all-hardware.nix
@@ -41,10 +41,6 @@
 
       # Virtio (QEMU, KVM etc.) support.
       "virtio_net" "virtio_pci" "virtio_blk" "virtio_balloon" "virtio_console"
-
-      # Add vfat to enable people to copy the contents of the CD to a
-      # bootable USB stick.
-      "vfat" "nls_cp437" "nls_iso8859-1"
     ];
 
   boot.initrd.kernelModules =
diff --git a/modules/profiles/base.nix b/modules/profiles/base.nix
index d6412e09a5f..75a58f8568a 100644
--- a/modules/profiles/base.nix
+++ b/modules/profiles/base.nix
@@ -51,6 +51,6 @@
   ];
 
   # Include support for various filesystems.
-  boot.supportedFilesystems = [ "btrfs" "reiserfs" ];
+  boot.supportedFilesystems = [ "btrfs" "reiserfs" "vfat" ];
 
 }
diff --git a/modules/tasks/filesystems/vfat.nix b/modules/tasks/filesystems/vfat.nix
new file mode 100644
index 00000000000..5ca72f142b7
--- /dev/null
+++ b/modules/tasks/filesystems/vfat.nix
@@ -0,0 +1,25 @@
+{ config, pkgs, ... }:
+
+with pkgs.lib;
+
+let
+
+  inInitrd = any (fs: fs == "vfat") config.boot.initrd.supportedFilesystems;
+
+in
+
+{
+  config = mkIf (any (fs: fs == "vfat") config.boot.supportedFilesystems) {
+
+    system.fsPackages = [ pkgs.dosfstools ];
+
+    boot.initrd.kernelModules = mkIf inInitrd [ "vfat" "nls_cp437" "nls_iso8859-1" ];
+
+    boot.initrd.extraUtilsCommands = mkIf inInitrd
+      ''
+        cp -v ${pkgs.dosfstools}/sbin/dosfsck $out/bin
+        ln -sv dosfsck $out/bin/fsck.vfat
+      '';
+
+  };
+}
-- 
GitLab


From de6968c1630f22590b104718fa49baf83b044df5 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sat, 10 Mar 2012 14:34:40 +0000
Subject: [PATCH 3420/5331] * Virtualbox: use the right set of kernel packages.

svn path=/nixos/trunk/; revision=32971
---
 modules/programs/virtualbox.nix | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/modules/programs/virtualbox.nix b/modules/programs/virtualbox.nix
index 6d9f269b889..05209cb38e5 100644
--- a/modules/programs/virtualbox.nix
+++ b/modules/programs/virtualbox.nix
@@ -2,16 +2,18 @@
 
 with pkgs.lib;
 
+let virtualbox = config.boot.kernelPackages.virtualbox; in
+
 {
   boot.kernelModules = [ "vboxdrv" "vboxnetadp" "vboxnetflt" ];
-  boot.extraModulePackages = [ pkgs.linuxPackages.virtualbox ];
-  environment.systemPackages = [ pkgs.linuxPackages.virtualbox ];
+  boot.extraModulePackages = [ virtualbox ];
+  environment.systemPackages = [ virtualbox ];
 
   # ‘VBoxNetAdpCtl’ needs to be setuid root to allow users to create
   # host-only networks (https://www.virtualbox.org/ticket/4014).
   security.setuidOwners = singleton
     { program = "VBoxNetAdpCtl";
-      source = "${pkgs.linuxPackages.virtualbox}/virtualbox/VBoxNetAdpCtl";
+      source = "${virtualbox}/virtualbox/VBoxNetAdpCtl";
       owner = "root";
       group = "root";
       setuid = true;
-- 
GitLab


From 45fab492fc0794a81bf8e81408734a504beff3d1 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sat, 10 Mar 2012 14:35:31 +0000
Subject: [PATCH 3421/5331] * nixos-hardware-scan: "acpi-cpufreq" is
 automatically loaded, so we   don't need to detect it. * nixos-hardware-scan:
 don't use modulesPath.

svn path=/nixos/trunk/; revision=32972
---
 modules/installer/tools/nixos-hardware-scan.pl | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/modules/installer/tools/nixos-hardware-scan.pl b/modules/installer/tools/nixos-hardware-scan.pl
index f123303e748..b81eeaa90e4 100644
--- a/modules/installer/tools/nixos-hardware-scan.pl
+++ b/modules/installer/tools/nixos-hardware-scan.pl
@@ -45,10 +45,6 @@ sub hasCPUFeature {
 my $cpus = scalar (grep {/^processor\s*:/} (split '\n', $cpuinfo));
 
 
-# CPU frequency scaling.  Not sure about this test.
-push @kernelModules, "acpi-cpufreq" if hasCPUFeature "acpi";
-
-
 # Virtualization support?
 push @kernelModules, "kvm-intel" if hasCPUFeature "vmx";
 push @kernelModules, "kvm-amd" if hasCPUFeature "svm";
@@ -226,11 +222,11 @@ my $attrs = multiLineList("  ", removeDups @attrs);
 print <<EOF ;
 # This is a generated file.  Do not modify!
 # Make changes to /etc/nixos/configuration.nix instead.
-{ config, pkgs, modulesPath, ... }:
+{ config, pkgs, ... }:
 
 {
   require = [
-    "\${modulesPath}/installer/scan/not-detected.nix"
+    <nixos/modules/installer/scan/not-detected.nix>
   ];
 
   boot.initrd.kernelModules = [$initrdKernelModules ];
-- 
GitLab


From 5115e6a1d0279ee7367b90f6562f0b1d5eba4bbb Mon Sep 17 00:00:00 2001
From: Florian Friesdorf <flo@chaoflow.net>
Date: Sat, 10 Mar 2012 16:11:40 +0000
Subject: [PATCH 3422/5331] keep NIX_PATH in sudo env

fixes:
file `nixpkgs' was not found in the Nix search path (add it using $NIX_PATH or -I)

svn path=/nixos/trunk/; revision=32973
---
 modules/security/sudo.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/modules/security/sudo.nix b/modules/security/sudo.nix
index 92677f2a8db..3f01633d67a 100644
--- a/modules/security/sudo.nix
+++ b/modules/security/sudo.nix
@@ -34,6 +34,7 @@ in
 
           # env vars to keep for root and %wheel also if not explicitly set
           Defaults:root,%wheel env_keep+=LOCALE_ARCHIVE
+          Defaults:root,%wheel env_keep+=NIX_PATH
           Defaults:root,%wheel env_keep+=TERMINFO_DIRS
 
           # "root" is allowed to do anything.
-- 
GitLab


From 769cbaf56aa94ef79bef96316fbebb31a314a2ec Mon Sep 17 00:00:00 2001
From: Florian Friesdorf <flo@chaoflow.net>
Date: Sun, 11 Mar 2012 11:12:02 +0000
Subject: [PATCH 3423/5331] fix postfix config, missing linebreak

svn path=/nixos/trunk/; revision=32980
---
 modules/services/mail/postfix.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/modules/services/mail/postfix.nix b/modules/services/mail/postfix.nix
index 1eff4a39e1e..f98c9e6b0a7 100644
--- a/modules/services/mail/postfix.nix
+++ b/modules/services/mail/postfix.nix
@@ -19,7 +19,9 @@ let
       default_privs = nobody
 
     ''
-    + optionalString config.networking.enableIPv6 "inet_protocols = all"
+    + optionalString config.networking.enableIPv6 ''
+      inet_protocols = all
+    ''
     + (if cfg.networks != null then
         ''
           mynetworks = ${concatStringsSep ", " cfg.networks}
-- 
GitLab


From f68c95d1fe31b6b893b2d6d64e1a3202cb4254e5 Mon Sep 17 00:00:00 2001
From: Mathijs Kwik <mathijs@bluescreen303.nl>
Date: Sun, 11 Mar 2012 14:36:39 +0000
Subject: [PATCH 3424/5331] completely removed gw6c. use gogoclient

svn path=/nixos/trunk/; revision=32990
---
 modules/module-list.nix                      |   1 -
 modules/services/networking/gw6c/control.in  |  44 ---
 modules/services/networking/gw6c/default.nix | 163 ---------
 modules/services/networking/gw6c/gw6c.conf   | 338 -------------------
 4 files changed, 546 deletions(-)
 delete mode 100644 modules/services/networking/gw6c/control.in
 delete mode 100644 modules/services/networking/gw6c/default.nix
 delete mode 100644 modules/services/networking/gw6c/gw6c.conf

diff --git a/modules/module-list.nix b/modules/module-list.nix
index b69295a89da..6a73cac8cb5 100644
--- a/modules/module-list.nix
+++ b/modules/module-list.nix
@@ -124,7 +124,6 @@
   ./services/networking/gnunet.nix
   ./services/networking/gogoclient.nix
   ./services/networking/gvpe.nix
-  ./services/networking/gw6c/default.nix
   ./services/networking/ifplugd.nix
   ./services/networking/ircd-hybrid/default.nix
   ./services/networking/nat.nix
diff --git a/modules/services/networking/gw6c/control.in b/modules/services/networking/gw6c/control.in
deleted file mode 100644
index 24b868eb5c8..00000000000
--- a/modules/services/networking/gw6c/control.in
+++ /dev/null
@@ -1,44 +0,0 @@
-#! @shell@ -e
-
-# !!! use a proper Upstart job.
-
-# Make sure that the environment is deterministic.
-export PATH=@coreutils@/bin
-export PATH=@coreutils@/bin:@gnugrep@/bin:@gnused@/bin:@iputils@/bin:@iputils@/sbin:@procps@/bin:@seccure@/bin
-export BASEDIR=$(dirname $(dirname $0))
-
-	mkdir /tmp/.gw6c || true
-	touch /tmp/.gw6c/gw6c.conf
-	chmod 0700 /tmp/.gw6c
-	chmod 0700 /tmp/.gw6c/gw6c.conf
-	seccure-decrypt -F @privkey@ -i $BASEDIR/conf/gw6c.conf > /tmp/.gw6c/gw6c.conf
-
-stop ()
-{
-	pkill gw6c
-}
-
-ln -s /dev/net/tun /dev/tun || true;
-
-if test "$1" = "start"; then
-	trap 'stop ; exit ' 15
-
-	if test -n "@pingBefore@"; then while ! @iputils@/sbin/ping @gw6server@ -c1 -w1 ; do sleep 1; done; fi
-    cd /tmp/.gw6c
-        @coreutils@/bin/yes |       \
-    env - HOME=/tmp/.gw6c $extraEnv \
-	@gw6c@/bin/gw6c -f /tmp/.gw6c/gw6c.conf 2>&1 >/var/log/gw6c.out
-    while @procps@/bin/pgrep gw6c; do 
-	sleep @everPing@; 
-	@iputils@/sbin/traceroute6 $( @coreutils@/bin/cat /var/log/gw6c.log  |
-		 @gnugrep@/bin/grep peer |
-		 @gnused@/bin/sed -e 's/.*with //; s/ .*//' |
-		 @coreutils@/bin/head -1) &
-    done;
-	pkill gw6c; 
-	exit
-fi
-
-if test "$1" = "stop"; then
-	env - HOME=/homeless-shelter @procps@/bin/pkill gw6c;
-fi;
diff --git a/modules/services/networking/gw6c/default.nix b/modules/services/networking/gw6c/default.nix
deleted file mode 100644
index 8471a0c756a..00000000000
--- a/modules/services/networking/gw6c/default.nix
+++ /dev/null
@@ -1,163 +0,0 @@
-{ config, pkgs, ... }:
-
-with pkgs.lib;
-
-let
-
-  cfg = config.services.gw6c;
-
-  gw6cService = pkgs.stdenv.mkDerivation {
-    name = "gw6c-service";
-    inherit (pkgs) gw6c coreutils procps upstart iputils gnused gnugrep seccure;
-
-    inherit (cfg) username password keepAlive everPing;
-
-    gw6server = cfg.server;
-    authMethod = if cfg.username == "" then "anonymous" else "any";
-    gw6dir = pkgs.gw6c;
-
-    pingBefore = if cfg.waitPingableBroker then "true" else "";
-
-    pubkey = config.security.seccureKeys.public;
-    privkey = config.security.seccureKeys.private;
-
-    buildCommand =
-      ''
-        mkdir -p $out/bin $out/conf
-
-        mkdir conf
-        chmod 0700 conf
-        touch conf/raw
-        chmod 0700 conf/raw
-
-        substituteAll ${./gw6c.conf} conf/raw
-        $seccure/bin/seccure-encrypt "$(cat $pubkey)" -i conf/raw -o $out/conf/gw6c.conf
-        substituteAll ${./control.in} $out/bin/control
-        chmod a+x $out/bin/control
-      '';
-  };
-
-in
-
-{
-
-  ###### interface
-
-  options = {
-
-    services.gw6c = {
-
-      enable = mkOption {
-        default = false;
-        description = "
-          Whether to enable Gateway6 client (IPv6 tunnel).
-        ";
-      };
-
-      autorun = mkOption {
-        default = true;
-        description = "
-          Switch to false to create upstart-job and configuration,
-          but not run it automatically
-        ";
-      };
-
-      username = mkOption {
-        default = "";
-        description = "
-          Your Gateway6 login name, if any.
-        ";
-      };
-
-      password = mkOption {
-        default = "";
-        description = "
-          Your Gateway6 password, if any.
-        ";
-      };
-
-      server = mkOption {
-        default = "anon.freenet6.net";
-        example = "broker.freenet6.net";
-        description = "
-          Used Gateway6 server.
-        ";
-      };
-
-      keepAlive = mkOption {
-        default = "30";
-        example = "2";
-        description = "
-          Gateway6 keep-alive period.
-        ";
-      };
-
-      everPing = mkOption {
-        default = "1000000";
-        example = "2";
-        description = "
-          Gateway6 manual ping period.
-        ";
-      };
-
-      waitPingableBroker = mkOption {
-        default = true;
-        example = false;
-        description = "
-          Whether to wait until tunnel broker returns ICMP echo.
-        ";
-      };
-
-    };
-
-    security.seccureKeys = {
-
-      # !!! It's not clear to me (ED) what additional security this
-      # provides.  Passwords shouldn't be in configuration.nix,
-      # period.  You could just place the password in
-      # /var/blah/password or whatever.
-
-      public = mkOption {
-        default = /var/elliptic-keys/public;
-        description = "
-          Public key. Make it path argument, so it is copied into store and
-          hashed.
-
-          The key is used to encrypt Gateway 6 configuration in store, as it
-          contains a password for external service. Unfortunately,
-          derivation file should be protected by other means. For example,
-          nix-http-export.cgi will happily export any non-derivation path,
-          but not a derivation.
-        ";
-      };
-
-      private = mkOption {
-        default = "/var/elliptic-keys/private";
-        description = "
-          Private key. Make it string argument, so it is not copied into store.
-        ";
-      };
-
-    };
-
-  };
-
-
-  ###### implementation
-
-  config = mkIf cfg.enable {
-
-    jobs.gw6c =
-      { description = "Gateway6 client";
-
-        startOn = optionalString cfg.autorun "starting networking";
-        stopOn = "stopping network-interfaces";
-
-        exec = "${gw6cService}/bin/control start";
-      };
-
-    networking.enableIPv6 = true;
-
-  };
-
-}
diff --git a/modules/services/networking/gw6c/gw6c.conf b/modules/services/networking/gw6c/gw6c.conf
deleted file mode 100644
index e6c4362d27c..00000000000
--- a/modules/services/networking/gw6c/gw6c.conf
+++ /dev/null
@@ -1,338 +0,0 @@
-#-----------------------------------------------------------------------------
-# $Id: gw6c.conf.in,v 1.5 2007/05/09 13:41:32 cnepveu Exp $
-#-----------------------------------------------------------------------------
-
-##########################      READ ME!      ################################
-#
-# Welcome to the Gateway6 Client configuration file.
-# In order to use the client, you need to modify the 'userid', 'passwd' and 
-# 'server' parameters below depending on which of these situations applies:
-# 
-# 1. If you created a Freenet6 account, enter your userid and password below. 
-#    Change the server name to "broker.freenet6.net" and auth_method to 'any'.
-# 2. If you would like to use Freenet6 without creating an account, 
-#    do not make any modifications and close this file. 
-# 3. If this software was provided by your ISP, enter the userid, password and 
-#    server name provided by your ISP below. 
-#
-
-
-########################## BASIC CONFIGURATION ################################
-
-#
-# User Identification and Password:
-#   Specify your user name and password as provided by your ISP or Freenet6.
-#   If you plan to connect anonymously, leave these values empty.
-#   NOTE: Change auth_method option if you are using a username/password.
-#
-#   userid=<your_userid>
-#   passwd=<your_password>
-#
-userid=@username@ 
-passwd=@password@ 
-
-
-#
-# Gateway6 Server:
-#   Specify a Gateway6 server name or IP address (provided by your ISP or 
-#   Freenet6). An optional port number can be added; the default port number 
-#   is 3653.
-#  
-#   Examples:
-#     server=hostname # FQDN
-#     server=A.B.C.D  # IPv4 address
-#     server=[X:X::X:X] # IPv6 address
-#     server=hostname:port_number  
-#     server=A.B.C.D:port_number
-#     server=[X:X::X:X]:port_number
-#
-#   Freenet6 account holders should enter broker.freenet6.net, otherwise use
-#   anon.freenet6.net. Your ISP may provide you with a different server name. 
-#
-#server=anon.freenet6.net
-#server=broker.freenet6.net
-#server=broker.aarnet.net.au
-server=@gw6server@
-
-#
-# Authentication Method:
-#
-#  auth_method=<{anonymous}|{any|passdss-3des-1|digest-md5|plain}>
-#
-#   anonymous:      Sends no username or password
-#
-#   any:            The most secure method will be used. 
-#   passdss-3des-1: The password is sent encrypted.
-#   digest-md5:     The password is sent encrypted.
-#   plain:          Both username and password are sent as plain text.
-#
-# Recommended values:
-#   - any:          If you are authenticating a username / password.
-#   - anonymous:    If you are connecting anonymously.
-#
-#auth_method=anonymous
-#auth_method=any
-auth_method=@authMethod@
-
-
-########################## ROUTING CONFIGURATION ##############################
-# Use these parameters when you wish the client to act as a router and provide 
-# IPv6 connectivity to IPv6-capable devices on your network.
-
-#
-# Local Host Type:
-#   Change this value to 'router' to enable IPv6 advertisements.
-#
-#   host_type=<host|router>
-#
-host_type=host
-
-#
-# Prefix Length:
-#   Length of the requested prefix. Valid values range between 0 and 64 when 
-#   using V6*V4 tunnel modes, and between 0 and 32 when using V4V6 tunnel mode.
-#
-#   prefixlen=<integer>
-#
-prefixlen=64
-
-#
-# Advertisement Interface Prefix:
-#   Name of the interface that will be configured to send router advertisements. 
-#   This is an interface index on Windows (ex: 4) and a name on Linux
-#   and BSD (ex: eth1 or fxp1). 
-#
-#   if_prefix=<interface name>
-#
-if_prefix=
-
-#
-# DNS Server: 
-#   A DNS server list to which the reverse prefix will be delegated. Servers
-#   are separated by the colon(:) delimiter.
-#
-#   Example: dns_server=ns1.domain:ns2.domain:ns3.domain
-#
-dns_server=
-
-
-######################### ADVANCED CONFIGURATION ##############################
-
-#
-# Gateway6 Client Installation Directory:
-#   Directory where the Gateway6 Client will be installed. This value has been 
-#   set during installation.
-#
-gw6_dir=@gw6dir@
-
-#
-# Auto-Retry Connect and Delay:
-#   The time lapse, in seconds, between each reconnection in the case of a 
-#   timeout.
-#
-#   auto_retry_connect=<yes|no>
-#   retry_delay=<integer>
-#
-#   Recommended values: "yes" and 30
-#
-auto_retry_connect=yes
-retry_delay=5
-
-#
-# Keepalive Feature and Message Interval:
-#   Indicates if and how often the client will send data to keep the tunnel 
-#   active.
-#
-#   keepalive=<yes|no>
-#   keepalive_interval=<integer>
-#
-#   Recommended values: "yes" and 30
-#
-keepalive=yes
-keepalive_interval=@keepAlive@
-
-#
-# Tunnel Encapsulation Mode:
-#   v6v4:    IPv6-in-IPv4 tunnel.
-#   v6udpv4: IPv6-in-UDP-in-IPv4 tunnel (for clients behind a NAT).
-#   v6anyv4: Lets the broker choose the best mode for IPv6 tunnel.
-#   v4v6:    IPv4-in-IPv6 tunnel.
-#
-#   Recommended value: v6anyv4
-#
-tunnel_mode=v6anyv4
-
-#
-# Tunnel Interface Name:
-#   The interface name assigned to the tunnel. This value is O/S dependent.
-#
-#   if_tunnel_v6v4 is the tunnel interface name for v6v4 encapsulation mode
-#   if_tunnel_v6udpv4 is the tunnel interface name for v6udpv4 encapsulate mode
-#   if_tunnel_v4v6 is the tunnel interface name for v4v6 encapsulation mode
-#
-#   Default values are set during installation.
-#
-if_tunnel_v6v4=sit1
-if_tunnel_v6udpv4=tun
-if_tunnel_v4v6=sit0
-
-#
-# Local IP Address of the Client:
-#   Allows you to set a specific address as the local tunnel endpoint.
-#
-#   client_v4=<auto|A.B.C.D (valid ipv4 address)>
-#   client_v6=<auto|X:X::X:X (valid ipv6 address)>
-#     auto: The Gateway6 Client will find the local IP address endpoint.
-#
-#   Recommended value: auto
-#
-client_v4=auto
-client_v6=auto
-
-#
-# Script Name:
-#   File name of the script to run to install the tunnel interface. The 
-#   scripts are located in the template directory under the client 
-#   installation directory. 
-#
-#   template=<checktunnel|freebsd|netbsd|openbsd|linux|windows|darwin|cisco|solaris>
-#
-#   Default value is set during installation.
-# 
-template=linux
-
-#
-# Proxy client: 
-#   Indicates that this client will request a tunnel for another endpoint, 
-#   such as a Cisco router. 
-#
-#   proxy_client=<yes|no>
-#
-#   NOTE: NAT traversal is not possible in proxy mode. 
-#
-proxy_client=no
-
-
-############################ BROKER REDIRECTION ###############################
-
-#
-# Broker List File Name:
-#   The 'broker_list' directive specifies the filename where the broker
-#   list received during broker redirection will be saved. 
-#
-#   broker_list=<file_name>
-#  
-broker_list=/tmp/tsp-broker-list.txt
-
-#
-# Last Server Used File Name:
-#   The 'last_server' directive specifies the filename where the address of
-#   the last broker to which a connection was successfully established will 
-#   be saved.
-#
-#   last_server=<file_name>
-#
-last_server=/tmp/tsp-last-server.txt
-
-#
-# Always Use Last Known Working Server:
-#   The value of the 'always_use_same_server' directive determines whether the 
-#   client should always try to connect to the broker found in the 
-#   'last_server' directive filename. 
-#
-#   always_use_same_server=<yes|no>
-#
-always_use_same_server=no
-
-
-#################################### LOGGING ##################################
-
-#
-# Log Verbosity Configuration:
-#   The format is 'log_<destination>=level', where possible values for 
-#   'destination' are:
-#
-#   - console  (logging to the console [AKA stdout])
-#   - stderr   (logging to standard error)
-#   - file     (logging to a file)
-#   - syslog   (logging to syslog [Unix only])
-#
-#   and 'level' is a digit between 0 and 3. A 'level' value of 0 disables 
-#   logging to the destination, while values 1 to 3 request increasing levels 
-#   of log verbosity and detail. If 'level' is not specified, a value of 1 is 
-#   assumed.
-#
-#   Example:
-#     log_file=3   (Maximal logging to a file)
-#     log_stderr=0 (Logging to standard error disabled)
-#     log_console= (Minimal logging to the console) 
-#
-#   - Default configuration on Windows platforms:
-#
-#     log_console=0
-#     log_stderr=0
-#     log_file=1
-#
-#   - Default configuration on Unix platforms:
-#
-#     log_console=0
-#     log_stderr=1
-#     log_file=0
-#     log_syslog=0
-#
-#log_console=
-#log_stderr=
-#log_file=
-#log_syslog=
-log_file=3
-
-#
-# Log File Name:
-#   When logging to file is requested using the 'log_file' directive, the name
-#   and path of the file to use may be specified using this directive.
-#
-#   log_filename=<file_name>
-#
-log_filename=/var/log/gw6c.log
-
-#
-# Log File Rotation:
-#   When logging to file is requested using the 'log_file' directive, log file 
-#   rotation may be enabled. When enabled, the contents of the log file will 
-#   be moved to a backup file just before it reaches the maximum log file size 
-#   specified via this directive.
-#
-#   The name of the backup file is the name of the original log file with 
-#   '.<timestamp>' inserted before the file extension. If the file does not 
-#   have an extension, '.<timestamp>' is appended to the name of the original
-#   log file. The timestamp specifies when the rotation occurred.
-#
-#   After the contents of the log file have been moved to the backup file, the 
-#   original file is cleared, and logging resumes at the beginning of the file. 
-#
-#   log_rotation=<yes|no>
-#
-log_rotation=no
-
-#
-# Log File Rotation Size:
-#   The 'log_rotation_size' directive specifies the maximum size a log file may 
-#   reach before rotation occurs, if enabled. The value is expressed in 
-#   kilobytes.
-#
-#   log_rotation_size=<16|32|128|1024>
-#
-log_rotation_size=32
-
-#
-# Syslog Logging Facility [Unix Only]:
-#   When logging to syslog is requested using the 'log_syslog' directive, the 
-#   facility to use may be specified using this directive.
-#
-#   syslog_facility=<USER|LOCAL[0-7]>
-#
-syslog_facility=USER
-
-
-# end of gw6c.conf
-#------------------------------------------------------------------------------
-- 
GitLab


From 29ca7f2c80408b0b1a9c031d6a9cecf26f1d7013 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Sun, 11 Mar 2012 16:39:49 +0000
Subject: [PATCH 3425/5331] Adding VIA_RHINE to the system tarball pc. I need
 to boot one with PXE and nfsroot with via rhine.

svn path=/nixos/trunk/; revision=32994
---
 modules/installer/cd-dvd/system-tarball-pc.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/modules/installer/cd-dvd/system-tarball-pc.nix b/modules/installer/cd-dvd/system-tarball-pc.nix
index fae482c11d0..3da07c39336 100644
--- a/modules/installer/cd-dvd/system-tarball-pc.nix
+++ b/modules/installer/cd-dvd/system-tarball-pc.nix
@@ -173,6 +173,7 @@ in
           ATL1E y
           ATL1C y
           VORTEX y
+          VIA_RHINE y
 
           # Enable nfs root boot
           IP_PNP y
-- 
GitLab


From 6a0958cc06508395f1b8f4a88226165d15648651 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Sun, 11 Mar 2012 21:50:35 +0000
Subject: [PATCH 3426/5331] Making stage2 get a full interactive bash for the
 stage2 init, so there the shell has readline, jobs, etc.

svn path=/nixos/trunk/; revision=32999
---
 modules/system/boot/stage-2.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/modules/system/boot/stage-2.nix b/modules/system/boot/stage-2.nix
index c45dc348b66..db867ab8a28 100644
--- a/modules/system/boot/stage-2.nix
+++ b/modules/system/boot/stage-2.nix
@@ -49,6 +49,7 @@ let
 
   bootStage2 = pkgs.substituteAll {
     src = ./stage-2-init.sh;
+    shell = "${pkgs.bashInteractive}/bin/bash";
     isExecutable = true;
     inherit kernel;
     inherit (config.boot) devShmSize runSize;
-- 
GitLab


From bbebba68f7a5fab3865f8dcadb82a7b7128a3c11 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Sun, 11 Mar 2012 21:56:47 +0000
Subject: [PATCH 3427/5331] A more friendly stage1, with interactive bash,
 busybox plenty of tools, etc.

I set it as default because users can benefit of this without having to prepare
their nixos first, and I don't think it will break any nixos for the initrd
size increase.

It can be disabled with 'boot.initrd.withExtraTools = false'.


svn path=/nixos/trunk/; revision=33000
---
 modules/module-list.nix                    |  1 +
 modules/system/boot/stage-1-extratools.nix | 56 ++++++++++++++++++++++
 modules/system/boot/stage-1-init.sh        | 20 +++++++-
 modules/system/boot/stage-1.nix            |  2 +-
 modules/system/boot/stage-2-init.sh        |  3 ++
 5 files changed, 79 insertions(+), 3 deletions(-)
 create mode 100644 modules/system/boot/stage-1-extratools.nix

diff --git a/modules/module-list.nix b/modules/module-list.nix
index 6a73cac8cb5..668841d3da2 100644
--- a/modules/module-list.nix
+++ b/modules/module-list.nix
@@ -190,6 +190,7 @@
   ./system/boot/luksroot.nix
   ./system/boot/modprobe.nix
   ./system/boot/stage-1.nix
+  ./system/boot/stage-1-extratools.nix
   ./system/boot/stage-2.nix
   ./system/etc/etc.nix
   ./system/upstart-events/control-alt-delete.nix
diff --git a/modules/system/boot/stage-1-extratools.nix b/modules/system/boot/stage-1-extratools.nix
new file mode 100644
index 00000000000..c4224bc3035
--- /dev/null
+++ b/modules/system/boot/stage-1-extratools.nix
@@ -0,0 +1,56 @@
+{ config, pkgs, ...}:
+
+with pkgs.lib;
+
+let
+  staticBusybox = pkgs.busybox.override {
+    enableStatic = true;
+  };
+in
+{
+
+  ###### interface
+
+  options = {
+    boot.initrd.withExtraTools = mkOption {
+      default = true;
+      type = with types; bool;
+      description = ''
+        Have busybox utils in initrd, and an interactive bash.
+      '';
+    };
+  };
+
+  config = {
+    boot.initrd.extraUtilsCommands = mkIf config.boot.initrd.withExtraTools ''
+
+      set -x
+      cp -pv ${pkgs.ncurses}/lib/libncurses*.so.* $out/lib
+      cp -pv ${pkgs.readline}/lib/libreadline.so.* $out/lib
+      cp -pv ${pkgs.readline}/lib/libhistory.so.* $out/lib
+      rm $out/bin/bash
+      cp -pv ${pkgs.bashInteractive}/bin/bash $out/bin
+
+      cp -pv ${staticBusybox}/bin/busybox $out/bin
+      shopt -s nullglob
+      for d in bin sbin; do
+        pushd ${staticBusybox}/$d
+        # busybox has these, but we'll put them later
+        GLOBIGNORE=.:..:mke2fs:ip:modprobe
+        for a in *; do
+          if [ ! -e $out/bin/$a ]; then
+            ln -sf busybox $out/bin/$a
+          fi
+        done
+        popd
+      done
+      shopt -u nullglob
+      unset GLOBIGNORE
+    '';
+
+    boot.initrd.extraUtilsCommandsTest = mkIf config.boot.initrd.withExtraTools ''
+      $out/bin/busybox
+    '';
+  };
+
+}
diff --git a/modules/system/boot/stage-1-init.sh b/modules/system/boot/stage-1-init.sh
index d47ce1caffd..e1341d50bcf 100644
--- a/modules/system/boot/stage-1-init.sh
+++ b/modules/system/boot/stage-1-init.sh
@@ -25,12 +25,23 @@ EOF
 
     read reply
 
+    # Get the console from the kernel cmdline
+    console=tty1
+    for o in $(cat /proc/cmdline); do
+      case $o in
+        console=*)
+          set -- $(IFS==; echo $o)
+          console=$2
+          ;;
+      esac
+    done
+
     case $reply in
         f)
-            exec @shell@;;
+            exec setsid @shell@ < /dev/$console >/dev/$console 2>/dev/$console ;;
         i)
             echo "Starting interactive shell..."
-            @shell@ || fail
+            setsid @shell@ < /dev/$console >/dev/$console 2>/dev/$console || fail
             ;;
         *)
             echo "Continuing...";;
@@ -57,6 +68,11 @@ mount -t tmpfs -o "mode=0755,size=@devSize@" none /dev
 mkdir -p /run
 mount -t tmpfs -o "mode=0755,size=@runSize@" none /run
 
+# Some console devices, for the interactivity
+mknod /dev/console c 5 1
+mknod /dev/tty1 c 4 1
+mknod /dev/ttyS0 c 4 64
+mknod /dev/ttyS1 c 4 65
 
 # Process the kernel command line.
 export stage2Init=/init
diff --git a/modules/system/boot/stage-1.nix b/modules/system/boot/stage-1.nix
index 5a74ea84f38..1932599193e 100644
--- a/modules/system/boot/stage-1.nix
+++ b/modules/system/boot/stage-1.nix
@@ -139,7 +139,7 @@ let
       # Copy some utillinux stuff.
       cp -v ${pkgs.utillinux}/bin/mount ${pkgs.utillinux}/bin/umount \
          ${pkgs.utillinux}/sbin/fsck ${pkgs.utillinux}/sbin/switch_root \
-         ${pkgs.utillinux}/sbin/blkid $out/bin
+         ${pkgs.utillinux}/sbin/blkid ${pkgs.utillinux}/bin/setsid $out/bin
       cp -pdv ${pkgs.utillinux}/lib/libblkid*.so.* $out/lib
       cp -pdv ${pkgs.utillinux}/lib/libuuid*.so.* $out/lib
 
diff --git a/modules/system/boot/stage-2-init.sh b/modules/system/boot/stage-2-init.sh
index 7a619f1f97f..947ba4b7f35 100644
--- a/modules/system/boot/stage-2-init.sh
+++ b/modules/system/boot/stage-2-init.sh
@@ -46,6 +46,9 @@ if [ ! -e /proc/1 ]; then
     mknod -m 0666 /dev/null c 1 3
     mknod -m 0644 /dev/urandom c 1 9 # needed for passwd
     mknod -m 0644 /dev/console c 5 1
+    mknod -m 0644 /dev/tty1 c 4 1
+    mknod -m 0644 /dev/ttyS0 c 4 64
+    mknod -m 0644 /dev/ttyS1 c 4 65
 fi
 
 
-- 
GitLab


From 331b1f46d392235de980a8a9d1815d62209c3dd6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Sun, 11 Mar 2012 22:01:46 +0000
Subject: [PATCH 3428/5331] Making the stage2 'debug2' spawn a shell with job
 control, like in stage1, running it in a virtual terminal and not in the
 console. This brings wonderful things like ^C.

svn path=/nixos/trunk/; revision=33001
---
 modules/system/boot/stage-2-init.sh | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/modules/system/boot/stage-2-init.sh b/modules/system/boot/stage-2-init.sh
index 947ba4b7f35..589cd2c7927 100644
--- a/modules/system/boot/stage-2-init.sh
+++ b/modules/system/boot/stage-2-init.sh
@@ -170,8 +170,19 @@ export MODULE_DIR=@kernel@/lib/modules/
 
 # For debugging Upstart.
 if [ -n "$debug2" ]; then
+    # Get the console from the kernel cmdline
+    console=tty1
+    for o in $(cat /proc/cmdline); do
+      case $o in
+        console=*)
+          set -- $(IFS==; echo $o)
+          console=$2
+          ;;
+      esac
+    done
+
     echo "Debug shell called from @out@"
-    @shell@
+    setsid @shell@ < /dev/$console >/dev/$console 2>/dev/console
 fi
 
 
-- 
GitLab


From d2e2bb4bc4cbea8a34b15e66c0207cb731a4893a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Sun, 11 Mar 2012 22:07:37 +0000
Subject: [PATCH 3429/5331] Typo

svn path=/nixos/trunk/; revision=33002
---
 modules/system/boot/stage-2-init.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/system/boot/stage-2-init.sh b/modules/system/boot/stage-2-init.sh
index 589cd2c7927..fdc8a0161ea 100644
--- a/modules/system/boot/stage-2-init.sh
+++ b/modules/system/boot/stage-2-init.sh
@@ -182,7 +182,7 @@ if [ -n "$debug2" ]; then
     done
 
     echo "Debug shell called from @out@"
-    setsid @shell@ < /dev/$console >/dev/$console 2>/dev/console
+    setsid @shell@ < /dev/$console >/dev/$console 2>/dev/$console
 fi
 
 
-- 
GitLab


From 2fc537277b8f92c7c07a8ae49f406fe992876998 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Sun, 11 Mar 2012 22:26:01 +0000
Subject: [PATCH 3430/5331] Removing a 'set -x' in the stage1 extra tools.

svn path=/nixos/trunk/; revision=33003
---
 modules/system/boot/stage-1-extratools.nix | 2 --
 1 file changed, 2 deletions(-)

diff --git a/modules/system/boot/stage-1-extratools.nix b/modules/system/boot/stage-1-extratools.nix
index c4224bc3035..4b83d17bd38 100644
--- a/modules/system/boot/stage-1-extratools.nix
+++ b/modules/system/boot/stage-1-extratools.nix
@@ -23,8 +23,6 @@ in
 
   config = {
     boot.initrd.extraUtilsCommands = mkIf config.boot.initrd.withExtraTools ''
-
-      set -x
       cp -pv ${pkgs.ncurses}/lib/libncurses*.so.* $out/lib
       cp -pv ${pkgs.readline}/lib/libreadline.so.* $out/lib
       cp -pv ${pkgs.readline}/lib/libhistory.so.* $out/lib
-- 
GitLab


From 1a48572b751ebcfd8cc09928f2019ac52fe56aee Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Sun, 11 Mar 2012 22:28:31 +0000
Subject: [PATCH 3431/5331] Disabling the initrd extra tools by default, until
 further review.

svn path=/nixos/trunk/; revision=33004
---
 modules/system/boot/stage-1-extratools.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/system/boot/stage-1-extratools.nix b/modules/system/boot/stage-1-extratools.nix
index 4b83d17bd38..7cd68e6385a 100644
--- a/modules/system/boot/stage-1-extratools.nix
+++ b/modules/system/boot/stage-1-extratools.nix
@@ -13,7 +13,7 @@ in
 
   options = {
     boot.initrd.withExtraTools = mkOption {
-      default = true;
+      default = false;
       type = with types; bool;
       description = ''
         Have busybox utils in initrd, and an interactive bash.
-- 
GitLab


From ee163c2c8012cdc5cdd8efce06a380e38e3018d7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Sun, 11 Mar 2012 22:43:37 +0000
Subject: [PATCH 3432/5331] Making the stage2 interpreter bash non-interactive,
 while keeping the interactive shell with bash interactive. Suggested by
 Eelco.

svn path=/nixos/trunk/; revision=33005
---
 modules/system/boot/stage-2-init.sh | 2 +-
 modules/system/boot/stage-2.nix     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/system/boot/stage-2-init.sh b/modules/system/boot/stage-2-init.sh
index fdc8a0161ea..5bee0380003 100644
--- a/modules/system/boot/stage-2-init.sh
+++ b/modules/system/boot/stage-2-init.sh
@@ -182,7 +182,7 @@ if [ -n "$debug2" ]; then
     done
 
     echo "Debug shell called from @out@"
-    setsid @shell@ < /dev/$console >/dev/$console 2>/dev/$console
+    setsid @shellDebug@ < /dev/$console >/dev/$console 2>/dev/$console
 fi
 
 
diff --git a/modules/system/boot/stage-2.nix b/modules/system/boot/stage-2.nix
index db867ab8a28..35b1aead1b0 100644
--- a/modules/system/boot/stage-2.nix
+++ b/modules/system/boot/stage-2.nix
@@ -49,7 +49,7 @@ let
 
   bootStage2 = pkgs.substituteAll {
     src = ./stage-2-init.sh;
-    shell = "${pkgs.bashInteractive}/bin/bash";
+    shellDebug = "${pkgs.bashInteractive}/bin/bash";
     isExecutable = true;
     inherit kernel;
     inherit (config.boot) devShmSize runSize;
-- 
GitLab


From 3c0fdaf877c804e6a620e9893773d7d1de52900f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Sun, 11 Mar 2012 23:04:29 +0000
Subject: [PATCH 3433/5331] Adding /dev/tty to the stage1, so 'more' and 'less'
 now page well.

svn path=/nixos/trunk/; revision=33006
---
 modules/system/boot/stage-1-init.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/modules/system/boot/stage-1-init.sh b/modules/system/boot/stage-1-init.sh
index e1341d50bcf..299a9f8a08f 100644
--- a/modules/system/boot/stage-1-init.sh
+++ b/modules/system/boot/stage-1-init.sh
@@ -70,6 +70,7 @@ mount -t tmpfs -o "mode=0755,size=@runSize@" none /run
 
 # Some console devices, for the interactivity
 mknod /dev/console c 5 1
+mknod /dev/tty c 5 0
 mknod /dev/tty1 c 4 1
 mknod /dev/ttyS0 c 4 64
 mknod /dev/ttyS1 c 4 65
-- 
GitLab


From 9e980235bd4e62bb028297105691a783450ceaff Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Mon, 12 Mar 2012 09:42:24 +0000
Subject: [PATCH 3434/5331] Properly filter a possible lack of "grub.device",
 in case of using only "grub.devices".

svn path=/nixos/trunk/; revision=33009
---
 modules/system/activation/top-level.nix | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/modules/system/activation/top-level.nix b/modules/system/activation/top-level.nix
index a0a3b2c9b2f..265f06a5a9d 100644
--- a/modules/system/activation/top-level.nix
+++ b/modules/system/activation/top-level.nix
@@ -171,10 +171,12 @@ let
       if config.boot.loader.grub.enable
       then (builtins.parseDrvName config.system.build.grub.name).version
       else "";
-    grubDevices = let
+    grubDevices = with pkgs.lib; let
         wrapQuotes = s: "\"" + s + "\"";
-      in map wrapQuotes ([ config.boot.loader.grub.device ] ++
-        config.boot.loader.grub.devices);
+        allDevices = [ config.boot.loader.grub.device ] ++
+          config.boot.loader.grub.devices;
+        definedDevices = filter (s: s != "") allDevices;
+      in map wrapQuotes definedDevices;
     configurationName = config.boot.loader.grub.configurationName;
   };
 
-- 
GitLab


From 7281a851b3594c70872ebeb9391d1ed800e8a5a7 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 12 Mar 2012 10:41:39 +0000
Subject: [PATCH 3435/5331] * Create a /usr/bin/env symlink.  This allows
 scripts from other   distributions with shebang lines such as

    #! /usr/bin/env python

  to work correctly.

svn path=/nixos/trunk/; revision=33011
---
 modules/system/activation/activation-script.nix | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/modules/system/activation/activation-script.nix b/modules/system/activation/activation-script.nix
index d7074810c27..9f10e84f5e9 100644
--- a/modules/system/activation/activation-script.nix
+++ b/modules/system/activation/activation-script.nix
@@ -126,7 +126,14 @@ in
 
     system.activationScripts.media =
       ''
-        mkdir -p /media
+        mkdir -m 0755 -p /media
+      '';
+
+    system.activationScripts.usrbinenv =
+      ''
+        mkdir -m 0755 -p /usr/bin
+        ln -sfn ${pkgs.coreutils}/bin/env /usr/bin/.env.tmp
+        mv /usr/bin/.env.tmp /usr/bin/env # atomically replace /usr/bin/env
       '';
 
   };
-- 
GitLab


From 5fad4652610a9f27d2283434cfdbd21098e5c0fd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Mon, 12 Mar 2012 13:10:13 +0000
Subject: [PATCH 3436/5331] BitlBee: Add `job.name'; cleanup white space.

svn path=/nixos/trunk/; revision=33012
---
 modules/services/networking/bitlbee.nix | 75 +++++++++++++------------
 1 file changed, 38 insertions(+), 37 deletions(-)

diff --git a/modules/services/networking/bitlbee.nix b/modules/services/networking/bitlbee.nix
index 8fd79cb00f3..ffc1dcbad4b 100644
--- a/modules/services/networking/bitlbee.nix
+++ b/modules/services/networking/bitlbee.nix
@@ -19,28 +19,28 @@ in
     services.bitlbee = {
 
       enable = mkOption {
-        default = false;
-        description = ''
-          Whether to run the BitlBee IRC to other chat network gateway.
-          Running it allows you to access the MSN, Jabber, Yahoo! and ICQ chat
-          networks via an IRC client.
-        '';
+	default = false;
+	description = ''
+	  Whether to run the BitlBee IRC to other chat network gateway.
+	  Running it allows you to access the MSN, Jabber, Yahoo! and ICQ chat
+	  networks via an IRC client.
+	'';
       };
 
       interface = mkOption {
-        default = "127.0.0.1";
-        description = ''
-          The interface the BitlBee deamon will be listening to.  If `127.0.0.1',
-          only clients on the local host can connect to it; if `0.0.0.0', clients
-          can access it from any network interface.
-        '';
+	default = "127.0.0.1";
+	description = ''
+	  The interface the BitlBee deamon will be listening to.  If `127.0.0.1',
+	  only clients on the local host can connect to it; if `0.0.0.0', clients
+	  can access it from any network interface.
+	'';
       };
 
       portNumber = mkOption {
-        default = 6667;
-        description = ''
-          Number of the port BitlBee will be listening to.
-        '';
+	default = 6667;
+	description = ''
+	  Number of the port BitlBee will be listening to.
+	'';
       };
 
     };
@@ -54,35 +54,36 @@ in
 
     users.extraUsers = singleton
       { name = "bitlbee";
-        uid = bitlbeeUid;
-        description = "BitlBee user";
-        home = "/var/empty";
+	uid = bitlbeeUid;
+	description = "BitlBee user";
+	home = "/var/empty";
       };
 
     users.extraGroups = singleton
       { name = "bitlbee";
-        gid = config.ids.gids.bitlbee;
+	gid = config.ids.gids.bitlbee;
       };
 
     jobs.bitlbee =
       { description = "BitlBee IRC to other chat networks gateway";
-
-        startOn = "ip-up";
-
-        preStart =
-          ''
-            if ! test -d /var/lib/bitlbee
-            then
-                mkdir -p /var/lib/bitlbee
-                chown bitlbee:bitlbee /var/lib/bitlbee
-            fi
-          '';
-
-        exec =
-          ''
-            ${pkgs.bitlbee}/sbin/bitlbee -F -p ${toString portNumber} \
-              -i ${interface} -u bitlbee
-          '';
+	name = "bitlbee";
+
+	startOn = "ip-up";
+
+	preStart =
+	  ''
+	    if ! test -d /var/lib/bitlbee
+	    then
+		mkdir -p /var/lib/bitlbee
+		chown bitlbee:bitlbee /var/lib/bitlbee
+	    fi
+	  '';
+
+	exec =
+	  ''
+	    ${pkgs.bitlbee}/sbin/bitlbee -F -p ${toString portNumber} \
+	      -i ${interface} -u bitlbee
+	  '';
       };
 
     environment.systemPackages = [ pkgs.bitlbee ];
-- 
GitLab


From 7f72dead3b932d7f3379f71faca3b2e8c2c5dbba Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 12 Mar 2012 14:33:06 +0000
Subject: [PATCH 3437/5331] * Fix the waitOnMounts option.  For some reason we
 lost its   implementation.

svn path=/nixos/trunk/; revision=33017
---
 modules/services/ttys/mingetty.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/modules/services/ttys/mingetty.nix b/modules/services/ttys/mingetty.nix
index 5a86dada1f2..d6fffea299e 100644
--- a/modules/services/ttys/mingetty.nix
+++ b/modules/services/ttys/mingetty.nix
@@ -58,7 +58,10 @@ with pkgs.lib;
     # Generate a separate job for each tty.
     jobs = listToAttrs (map (tty: nameValuePair tty {
 
-      startOn = "started udev and filesystem";
+      startOn =
+        if config.services.mingetty.waitOnMounts
+        then "stopped udevtrigger and filesystem"
+        else "stopped udevtrigger"; # !!! should start as soon as the tty device is created
 
       path = [ pkgs.mingetty ];
 
-- 
GitLab


From f2870ea7b5ffca2df16503efdfcbe6f7887fa67d Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 12 Mar 2012 14:42:52 +0000
Subject: [PATCH 3438/5331] * tty1 needs to be treated specially because of the
 emergency-shell   job.

svn path=/nixos/trunk/; revision=33018
---
 modules/services/ttys/mingetty.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/modules/services/ttys/mingetty.nix b/modules/services/ttys/mingetty.nix
index d6fffea299e..550d94c4cea 100644
--- a/modules/services/ttys/mingetty.nix
+++ b/modules/services/ttys/mingetty.nix
@@ -59,7 +59,9 @@ with pkgs.lib;
     jobs = listToAttrs (map (tty: nameValuePair tty {
 
       startOn =
-        if config.services.mingetty.waitOnMounts
+        # On tty1 we should always wait for mountall, since it may
+        # start an emergency-shell job.
+        if config.services.mingetty.waitOnMounts || tty == "tty1"
         then "stopped udevtrigger and filesystem"
         else "stopped udevtrigger"; # !!! should start as soon as the tty device is created
 
-- 
GitLab


From b4d16ef07e34923b8e3d959ca2b0403d827b2f65 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 13 Mar 2012 09:36:41 +0000
Subject: [PATCH 3439/5331] * Fix nixos-option.

svn path=/nixos/trunk/; revision=33031
---
 modules/installer/tools/nixos-option.sh | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/modules/installer/tools/nixos-option.sh b/modules/installer/tools/nixos-option.sh
index bafce7d5690..bf6144877bd 100644
--- a/modules/installer/tools/nixos-option.sh
+++ b/modules/installer/tools/nixos-option.sh
@@ -5,6 +5,7 @@
 
 : ${mountPoint=/mnt}
 : ${NIXOS_CONFIG=/etc/nixos/configuration.nix}
+export NIXOS_CONFIG
 
 usage () {
   echo 1>&2 "
@@ -143,7 +144,7 @@ evalAttr(){
   local prefix=$1
   local suffix=$2
   local strict=$3
-  echo "(import $NIXOS {}).$prefix${option:+.$option}${suffix:+.$suffix}" |
+  echo "(import <nixos> {}).$prefix${option:+.$option}${suffix:+.$suffix}" |
     evalNix ${strict:+--strict}
 }
 
@@ -157,7 +158,7 @@ evalCfg(){
 
 findSources(){
   local suffix=$1
-  echo "builtins.map (f: f.source) (import $NIXOS {}).eval.options${option:+.$option}.$suffix" |
+  echo "builtins.map (f: f.source) (import <nixos> {}).eval.options${option:+.$option}.$suffix" |
     evalNix --strict
 }
 
@@ -185,7 +186,7 @@ nixMap() {
 }
 
 if $install; then
-  export NIXOS_CONFIG="$mountPoint$NIXOS_CONFIG"
+  NIXOS_CONFIG="$mountPoint$NIXOS_CONFIG"
 fi
 
 if $generate; then
@@ -307,8 +308,8 @@ if $xml; then
   evalNix --xml --no-location <<EOF
 let
   reach = attrs: attrs${option:+.$option};
-  nixos = <nixos>;
-  nixpkgs = <nixpkgs>;
+  nixos = import <nixos> {};
+  nixpkgs = import <nixpkgs> {};
   sources = builtins.map (f: f.source);
   opt = reach nixos.eval.options;
   cfg = reach nixos.config;
-- 
GitLab


From b6d43e1acad12a573d08d9c35ecc51ff327f415b Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 13 Mar 2012 13:17:43 +0000
Subject: [PATCH 3440/5331] * Fix Amazon image generation (broken by r32913).

svn path=/nixos/trunk/; revision=33032
---
 .../activation/switch-to-configuration.sh     | 27 +++++++++----------
 1 file changed, 13 insertions(+), 14 deletions(-)

diff --git a/modules/system/activation/switch-to-configuration.sh b/modules/system/activation/switch-to-configuration.sh
index 75e004d7738..d24bf484824 100644
--- a/modules/system/activation/switch-to-configuration.sh
+++ b/modules/system/activation/switch-to-configuration.sh
@@ -26,23 +26,22 @@ if [ "$action" = "switch" -o "$action" = "boot" ]; then
     
     if [ "@bootLoader@" = "grub" ]; then
         
-      if [ -n "@grubDevice@" ]; then
+      if [ -n "@grubDevices@" ]; then
           mkdir -m 0700 -p /boot/grub
           @menuBuilder@ @out@
 
-          if [ "@grubDevice@" != nodev ]; then
-              
-              # If the GRUB version has changed, then force a reinstall.
-              oldGrubVersion="$(cat /boot/grub/version 2>/dev/null || true)"
-              newGrubVersion="@grubVersion@"
-
-              if [ "$NIXOS_INSTALL_GRUB" = 1 -o "$oldGrubVersion" != "$newGrubVersion" ]; then
-                  echo "installing the GRUB bootloader..."
-                  for a in @grubDevices@; do
-                    @grub@/sbin/grub-install "$(readlink -f "$a")" --no-floppy
-                  done
-                  echo "$newGrubVersion" > /boot/grub/version
-              fi
+          # If the GRUB version has changed, then force a reinstall.
+          oldGrubVersion="$(cat /boot/grub/version 2>/dev/null || true)"
+          newGrubVersion="@grubVersion@"
+
+          if [ "$NIXOS_INSTALL_GRUB" = 1 -o "$oldGrubVersion" != "$newGrubVersion" ]; then
+              for dev in @grubDevices@; do
+                  if [ "$dev" != nodev ]; then
+                      echo "installing the GRUB bootloader on $dev..."
+                      @grub@/sbin/grub-install "$(readlink -f "$dev")" --no-floppy
+                  fi
+              done
+              echo "$newGrubVersion" > /boot/grub/version
           fi
           
       else
-- 
GitLab


From dd6eb81797c987c5438a04dac7ce0c5b5dea3b7b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Tue, 13 Mar 2012 13:26:21 +0000
Subject: [PATCH 3441/5331] Adding /etc/mdadm.conf, with the contents supplied
 at boot.initrd.mdadmConf.

This allows setting a fixed device name per array, thus ensuring that at boot,
the arrays will always be mounted with the same names. I think this allows
solving the problem of grub getting confused about softraid device names
(prefix and root), if the devices always get the same naming at initrd.


svn path=/nixos/trunk/; revision=33033
---
 modules/system/boot/stage-1.nix | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/modules/system/boot/stage-1.nix b/modules/system/boot/stage-1.nix
index 1932599193e..9ad86312290 100644
--- a/modules/system/boot/stage-1.nix
+++ b/modules/system/boot/stage-1.nix
@@ -35,6 +35,14 @@ let
       '';
     };
 
+    boot.initrd.mdadmConf = mkOption {
+      default = "";
+      type = with types; string;
+      description = ''
+        Contents of /etc/mdadm.conf at initrd.
+      '';
+    };
+
     boot.initrd.preLVMCommands = mkOption {
       default = "";
       type = with types; string;
@@ -313,6 +321,9 @@ let
       [ { object = bootStage1;
           symlink = "/init";
         }
+        { object = pkgs.writeText "mdadm.conf" config.boot.initrd.mdadmConf;
+          symlink = "/etc/mdadm.conf";
+        }
       ] ++ optionals enableSplashScreen
         [ { object = extraUtils;
             suffix = "/bin/splash_helper";
-- 
GitLab


From db0e7787cea9809ea72930411ca6e2155a6aa5a7 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 13 Mar 2012 15:03:41 +0000
Subject: [PATCH 3442/5331] * Add a 32-bit AMI that finally seems to boot
 reliably.

svn path=/nixos/trunk/; revision=33034
---
 modules/misc/deployment.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/modules/misc/deployment.nix b/modules/misc/deployment.nix
index 574046ac7af..87100f09822 100644
--- a/modules/misc/deployment.nix
+++ b/modules/misc/deployment.nix
@@ -202,6 +202,7 @@ let cfg = config.deployment; in
       # $ while read system region ami; do echo "        if cfg.ec2.region == \"$region\" && config.nixpkgs.system == \"$system\" then \"$ami\" else"; done < amis
       ami = mkDefault (
         if cfg.ec2.region == "eu-west-1" && config.nixpkgs.system == "x86_64-linux" then "ami-65dae711" else
+        if cfg.ec2.region == "eu-west-1" && config.nixpkgs.system == "i686-linux"   then "ami-dd90a9a9" else
         if cfg.ec2.region == "us-east-1" && config.nixpkgs.system == "x86_64-linux" then "ami-95bb72fc" else
         if cfg.ec2.region == "us-west-1" && config.nixpkgs.system == "x86_64-linux" then "ami-0b0c534e" else
         # !!! Doesn't work, not lazy enough.
-- 
GitLab


From 001fcad421b659befcf0e36e4f3a4d834d2c4dbd Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Tue, 13 Mar 2012 19:27:59 +0000
Subject: [PATCH 3443/5331] First shot at EFI booting.

Note: This feature is INCOMPLETE. Moreover, when runEfibootmgr is true it will
MODIFY NVRAM and, on Apple systems, possibly brick your firmware. PLEASE be
careful while further testing is performed

svn path=/nixos/trunk/; revision=33047
---
 .../efi-boot-stub/efi-boot-stub-builder.sh    | 118 ++++++++++++++++++
 .../installer/efi-boot-stub/efi-boot-stub.nix |  98 +++++++++++++++
 modules/module-list.nix                       |   1 +
 .../activation/switch-to-configuration.sh     |   2 +
 4 files changed, 219 insertions(+)
 create mode 100644 modules/installer/efi-boot-stub/efi-boot-stub-builder.sh
 create mode 100644 modules/installer/efi-boot-stub/efi-boot-stub.nix

diff --git a/modules/installer/efi-boot-stub/efi-boot-stub-builder.sh b/modules/installer/efi-boot-stub/efi-boot-stub-builder.sh
new file mode 100644
index 00000000000..d37b56c7ffe
--- /dev/null
+++ b/modules/installer/efi-boot-stub/efi-boot-stub-builder.sh
@@ -0,0 +1,118 @@
+#! @bash@/bin/sh -e
+
+shopt -s nullglob
+
+export PATH=/empty
+for i in @path@; do PATH=$PATH:$i/bin:$i/sbin; done
+
+default=$1
+if test -z "$1"; then
+    echo "Syntax: efi-boot-stub-builder.sh <DEFAULT-CONFIG>"
+    exit 1
+fi
+
+echo "updating the efi system partition..."
+
+# Convert a path to a file in the Nix store such as
+# /nix/store/<hash>-<name>/file to <hash>-<name>-<file>.
+# Also, efi executables need the .efi extension
+cleanName() {
+    local path="$1"
+    echo "$path" | sed 's|^/nix/store/||' | sed 's|/|-|g' | sed 's|@kernelFile@$|@kernelFile@.efi|'
+}
+
+# Copy a file from the Nix store to the EFI system partition
+declare -A filesCopied
+
+copyToKernelsDir() {
+    local src="$1"
+    local dst="@efiSysMountPoint@/efi/nixos/$(cleanName $src)"
+    # Don't copy the file if $dst already exists.  This means that we
+    # have to create $dst atomically to prevent partially copied
+    # kernels or initrd if this script is ever interrupted.
+    if ! test -e $dst; then
+        local dstTmp=$dst.tmp.$$
+        cp $src $dstTmp
+        mv $dstTmp $dst
+    fi
+    filesCopied[$dst]=1
+    result=$dst
+}
+
+# Copy its kernel, initrd, and startup script to the efi system partition
+# Add the efibootmgr entry if requested
+addEntry() {
+    local path="$1"
+    local generation="$2"
+
+    if ! test -e $path/kernel -a -e $path/initrd; then
+        return
+    fi
+
+    local kernel=$(readlink -f $path/kernel)
+    local initrd=$(readlink -f $path/initrd)
+    copyToKernelsDir $kernel; kernel=$result
+    copyToKernelsDir $initrd; initrd=$result
+
+    local startup="@efiSysMountPoint@/efi/nixos/$(cleanName $(readlink -f $path))-startup.nsh"
+    if ! test -e $startup; then
+        local dstTmp=$startup.tmp.$$
+	echo "$(echo $kernel | sed 's|@efiSysMountPoint@||' | sed 's|/|\\|g') systemConfig=$(readlink -f $path) init=$(readlink -f $path/init) initrd=$(echo $initrd | sed 's|@efiSysMountPoint@||' | sed 's|/|\\|g') $(cat $path/kernel-params)" > $dstTmp
+        mv $dstTmp $startup
+    fi
+    filesCopied[$startup]=1
+
+    if test -n "@runEfibootmgr@"; then
+      set +e
+      efibootmgr -c -d "@efiDisk@" -g -l $(echo $kernel | sed 's|@efiSysMountPoint@||' | sed 's|/|\\|g') -L "NixOS $generation Generation" -p "@efiPartition@" \
+        -u systemConfig=$(readlink -f $path) init=$(readlink -f $path/init) initrd=$(echo $initrd | sed 's|@efiSysMountPoint@||' | sed 's|/|\\|g') $(cat $path/kernel-params)
+      set -e
+    fi
+
+    if test $(readlink -f "$path") = "$default"; then
+      if test -n "@runEfibootmgr@"; then
+        set +e
+        defaultbootnum=$(efibootmgr | grep "NixOS $generation Generation" | sed 's/Boot//' | sed 's/\*.*//')
+	set -e
+      fi
+      if test -n "@installStartupNsh@"; then
+        sed 's|.*@kernelFile@.efi|@kernelFile@.efi|' < $startup > "@efiSysMountPoint@/startup.nsh"
+        cp $kernel "@efiSysMountPoint@/@kernelFile@.efi"
+      fi
+    fi
+}
+
+mkdir -p "@efiSysMountPoint@/efi/nixos/"
+
+# Remove all old boot manager entries
+if test -n "@runEfibootmgr@"; then
+  set +e
+  modprobe efivars
+  for bootnum in $(efibootmgr | grep "NixOS" | grep "Generation" | sed 's/Boot//' | sed 's/\*.*//'); do
+    efibootmgr -B -b "$bootnum"
+    set -e
+  done
+fi
+
+# Add all generations of the system profile to the system partition, in reverse
+# (most recent to least recent) order.
+for generation in $(
+    (cd /nix/var/nix/profiles && ls -d system-*-link) \
+    | sed 's/system-\([0-9]\+\)-link/\1/' \
+    | sort -n -r); do
+    link=/nix/var/nix/profiles/system-$generation-link
+    addEntry $link $generation
+done
+
+if test -n "@runEfibootmgr@"; then
+  set +e
+  efibootmgr -o $defaultbootnum
+  set -e
+fi
+
+# Remove obsolete files from the EFI system partition
+for fn in "@efiSysMountPoint@/efi/nixos/"*; do
+    if ! test "${filesCopied[$fn]}" = 1; then
+        rm -vf -- "$fn"
+    fi
+done
diff --git a/modules/installer/efi-boot-stub/efi-boot-stub.nix b/modules/installer/efi-boot-stub/efi-boot-stub.nix
new file mode 100644
index 00000000000..eeabd55c729
--- /dev/null
+++ b/modules/installer/efi-boot-stub/efi-boot-stub.nix
@@ -0,0 +1,98 @@
+{pkgs, config, ...}:
+
+###### interface
+let
+  inherit (pkgs.lib) mkOption mkIf;
+
+  options = {
+    boot = {
+      loader = {
+        efiBootStub = {
+
+          enable = mkOption {
+            default = false;
+            description = ''
+              Whether to use the linux kernel as an EFI bootloader.
+              When enabled, the kernel, initrd, and an EFI shell script
+              to boot the system are copied to the EFI system partition.
+            '';
+          };
+
+          efiDisk = mkOption {
+            default = "/dev/sda";
+            description = ''
+              The disk that contains the EFI system partition. Only used by
+              efibootmgr
+            '';
+          };
+
+          efiPartition = mkOption {
+            default = "1";
+            description = ''
+              The partition number of the EFI system partition. Only used by
+              efibootmgr
+            '';
+          };
+
+          efiSysMountPoint = mkOption {
+            default = "/boot";
+            description = ''
+              Where the EFI System Partition is mounted.
+            '';
+          };
+
+          runEfibootmgr = mkOption {
+            default = false;
+            description = ''
+              Whether to run efibootmgr to add the configuration to the boot options list.
+              WARNING! efibootmgr has been rumored to brick Apple firmware! Use 'bless' on
+              Apple efi systems.
+            '';
+          };
+
+          installStartupNsh = mkOption {
+            default = false;
+            description = ''
+              Whether to install a startup.nsh in the root of the EFI system partition.
+              For now, it will just boot the latest version when run, the eventual goal
+              is to have a basic menu-type interface.
+            '';
+          };
+
+        };
+      };
+    };
+  };
+
+in
+
+###### implementation
+let
+  efiBootStubBuilder = pkgs.substituteAll {
+    src = ./efi-boot-stub-builder.sh;
+    isExecutable = true;
+    inherit (pkgs) bash;
+    path = [pkgs.coreutils pkgs.gnused pkgs.gnugrep] ++ (pkgs.stdenv.lib.optionals config.boot.loader.efiBootStub.runEfibootmgr [pkgs.efibootmgr pkgs.module_init_tools]);
+    inherit (config.boot.loader.efiBootStub) efiSysMountPoint runEfibootmgr installStartupNsh efiDisk efiPartition;
+    kernelFile = platform.kernelTarget;
+  };
+
+  # Temporary check, for nixos to cope both with nixpkgs stdenv-updates and trunk
+  platform = pkgs.stdenv.platform;
+in
+{
+  require = [
+    options
+
+    # config.system.build
+    # ../system/system-options.nix
+  ];
+
+  system = mkIf config.boot.loader.efiBootStub.enable {
+    build = {
+      menuBuilder = efiBootStubBuilder;
+    };
+    boot.loader.id = "efiBootStub";
+    boot.loader.kernelFile = platform.kernelTarget;
+  };
+}
diff --git a/modules/module-list.nix b/modules/module-list.nix
index 668841d3da2..fa234f55290 100644
--- a/modules/module-list.nix
+++ b/modules/module-list.nix
@@ -22,6 +22,7 @@
   ./hardware/network/rtl8192c.nix
   ./hardware/pcmcia.nix
   ./hardware/all-firmware.nix
+  ./installer/efi-boot-stub/efi-boot-stub.nix
   ./installer/generations-dir/generations-dir.nix
   ./installer/grub/grub.nix
   ./installer/init-script/init-script.nix
diff --git a/modules/system/activation/switch-to-configuration.sh b/modules/system/activation/switch-to-configuration.sh
index d24bf484824..c09fa89083b 100644
--- a/modules/system/activation/switch-to-configuration.sh
+++ b/modules/system/activation/switch-to-configuration.sh
@@ -50,6 +50,8 @@ if [ "$action" = "switch" -o "$action" = "boot" ]; then
       
     elif [ "@bootLoader@" = "generationsDir" ]; then
         @menuBuilder@ @out@
+    elif [ "@bootLoader@" = "efiBootStub" ]; then
+        @menuBuilder@ @out@
     else
         echo "Warning: don't know how to make this configuration bootable; please enable a boot loader." 1>&2
     fi
-- 
GitLab


From 34c2f2cf586b2b0a4c7239eca36a7e9dc6ac2141 Mon Sep 17 00:00:00 2001
From: "Yury G. Kudryashov" <urkud.urkud@gmail.com>
Date: Thu, 15 Mar 2012 07:19:12 +0000
Subject: [PATCH 3444/5331] gtkLibs.gtk moved to gtk

svn path=/nixos/trunk/; revision=33096
---
 modules/services/x11/desktop-managers/xfce.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/services/x11/desktop-managers/xfce.nix b/modules/services/x11/desktop-managers/xfce.nix
index e12d3bbd2af..753bac47627 100644
--- a/modules/services/x11/desktop-managers/xfce.nix
+++ b/modules/services/x11/desktop-managers/xfce.nix
@@ -46,7 +46,7 @@ in
 
     environment.systemPackages =
       [
-        pkgs.gtkLibs.gtk # To get GTK+'s themes.
+        pkgs.gtk # To get GTK+'s themes.
         pkgs.hicolor_icon_theme
         pkgs.shared_mime_info
         pkgs.which # Needed by the xfce's xinitrc script.
-- 
GitLab


From 339d5b2b48a5f6b5a05c5b1ba55226db49862715 Mon Sep 17 00:00:00 2001
From: "Yury G. Kudryashov" <urkud.urkud@gmail.com>
Date: Thu, 15 Mar 2012 07:19:17 +0000
Subject: [PATCH 3445/5331] Add NetworkManager module

It works but it doesn't respect ignoredInterfaces etc.
Probably I forgotten to create some directories (all of them exist on my
laptop). Feel free to fix this module.

svn path=/nixos/trunk/; revision=33097
---
 modules/module-list.nix                       |  1 +
 .../services/networking/networkmanager.nix    | 80 +++++++++++++++++++
 2 files changed, 81 insertions(+)
 create mode 100644 modules/services/networking/networkmanager.nix

diff --git a/modules/module-list.nix b/modules/module-list.nix
index fa234f55290..50f1bea7539 100644
--- a/modules/module-list.nix
+++ b/modules/module-list.nix
@@ -128,6 +128,7 @@
   ./services/networking/ifplugd.nix
   ./services/networking/ircd-hybrid/default.nix
   ./services/networking/nat.nix
+  ./services/networking/networkmanager.nix
   ./services/networking/ntpd.nix
   ./services/networking/oidentd.nix
   ./services/networking/openfire.nix
diff --git a/modules/services/networking/networkmanager.nix b/modules/services/networking/networkmanager.nix
new file mode 100644
index 00000000000..d933df4b562
--- /dev/null
+++ b/modules/services/networking/networkmanager.nix
@@ -0,0 +1,80 @@
+{ config, pkgs, ... }:
+
+with pkgs.lib;
+
+let
+
+  stateDir = "/var/lib/NetworkManager";
+
+in
+
+{
+
+  ###### interface
+
+  options = {
+
+    networking.networkmanager.enable = mkOption {
+      default = false;
+      merge = mergeEnableOption;
+      description = ''
+        Whether to use NetworkManager to obtain an IP adress and other
+        configuration for all network interfaces that are not manually
+        configured.
+      '';
+    };
+
+    networking.networkmanager.packages = mkOption {
+      default = [ pkgs.networkmanager ];
+      description =
+        ''
+          Packages providing NetworkManager plugins.
+        '';
+    };
+  };
+
+
+  ###### implementation
+
+  config = mkIf config.networking.networkmanager.enable {
+
+    jobs.networkmanager =
+      { startOn = "started network-interfaces";
+        stopOn = "stopping network-interfaces";
+
+        script =
+          ''
+            mkdir -m 755 -p /etc/NetworkManager
+            mkdir -m 700 -p /etc/NetworkManager/system-connections
+            mkdir -m 755 -p ${stateDir}
+
+            if [[ ! -f /etc/NetworkManager/NetworkManager.conf ]]; then
+            cat <<-EOF > /etc/NetworkManager/NetworkManager.conf
+            [main]
+            plugins=keyfile
+            EOF
+            fi
+
+            exec ${pkgs.networkmanager}/sbin/NetworkManager --no-daemon
+          '';
+      };
+
+    environment.systemPackages = config.networking.networkmanager.packages;
+    services.dbus.packages = config.networking.networkmanager.packages;
+    networking.useDHCP = false;
+
+    environment.etc = [
+      {
+        source = pkgs.writeScript "01nixos-ip-up"
+          ''
+          #!/bin/sh
+          if test "$2" = "up"; then
+            ${pkgs.upstart}/sbin/initctl emit ip-up
+          fi
+          '';
+        target = "NetworkManager/dispatcher.d/01nixos-ip-up";
+      }
+    ];
+  };
+}
+
-- 
GitLab


From 1186167be2bd35d9a177842f7cee59cd0974f87e Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 15 Mar 2012 10:26:08 +0000
Subject: [PATCH 3446/5331] * Fix xserver restart with cfg.driSupport32Bit. 
 Contributed by Kirill   Elagin.

svn path=/nixos/trunk/; revision=33099
---
 modules/services/x11/xserver.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/modules/services/x11/xserver.nix b/modules/services/x11/xserver.nix
index d07ca53e145..c918d813e29 100644
--- a/modules/services/x11/xserver.nix
+++ b/modules/services/x11/xserver.nix
@@ -414,6 +414,7 @@ in
         preStart =
           ''
             rm -f /var/run/opengl-driver
+            rm -f /var/run/opengl-driver-32
             ${# !!! The OpenGL driver depends on what's detected at runtime.
               if elem "nvidia" driverNames then
                 ''
-- 
GitLab


From 9bb113252514da54031018a6df183ec3e820c6a1 Mon Sep 17 00:00:00 2001
From: "Yury G. Kudryashov" <urkud.urkud@gmail.com>
Date: Thu, 15 Mar 2012 13:51:17 +0000
Subject: [PATCH 3447/5331] NM: add IFACE to ip-up

svn path=/nixos/trunk/; revision=33107
---
 modules/services/networking/networkmanager.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/services/networking/networkmanager.nix b/modules/services/networking/networkmanager.nix
index d933df4b562..c33bbad83b3 100644
--- a/modules/services/networking/networkmanager.nix
+++ b/modules/services/networking/networkmanager.nix
@@ -69,7 +69,7 @@ in
           ''
           #!/bin/sh
           if test "$2" = "up"; then
-            ${pkgs.upstart}/sbin/initctl emit ip-up
+            ${pkgs.upstart}/sbin/initctl emit ip-up "IFACE=$1"
           fi
           '';
         target = "NetworkManager/dispatcher.d/01nixos-ip-up";
-- 
GitLab


From 6b2dfbda0017238e0ee907cee3b148649280cdbe Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 15 Mar 2012 13:54:23 +0000
Subject: [PATCH 3448/5331] * Make the mountall job depend on /etc/fstab so
 that it gets restarted   when fstab changes.

svn path=/nixos/trunk/; revision=33108
---
 modules/tasks/filesystems.nix | 50 ++++++++++++++++++++---------------
 1 file changed, 29 insertions(+), 21 deletions(-)

diff --git a/modules/tasks/filesystems.nix b/modules/tasks/filesystems.nix
index 75cec61fd6c..0be837dd464 100644
--- a/modules/tasks/filesystems.nix
+++ b/modules/tasks/filesystems.nix
@@ -2,6 +2,32 @@
 
 with pkgs.lib;
 
+let
+
+  fstab = pkgs.writeText "fstab"
+    ''
+      # This is a generated file.  Do not edit!
+
+      # Filesystems.
+      ${flip concatMapStrings config.fileSystems (fs:
+          (if fs.device != null then fs.device else "/dev/disk/by-label/${fs.label}")
+          + " " + fs.mountPoint
+          + " " + fs.fsType
+          + " " + fs.options
+          + " 0"
+          + " " + (if fs.fsType == "none" || fs.noCheck then "0" else
+                   if fs.mountPoint == "/" then "1" else "2")
+          + "\n"
+      )}
+
+      # Swap devices.
+      ${flip concatMapStrings config.swapDevices (sw:
+           "${sw.device} none swap\n"
+      )}
+    '';
+
+in
+    
 {
 
   ###### interface
@@ -141,27 +167,7 @@ with pkgs.lib;
       ++ config.system.fsPackages;
 
     environment.etc = singleton
-      { source = pkgs.writeText "fstab"
-          ''
-            # This is a generated file.  Do not edit!
-
-            # Filesystems.
-            ${flip concatMapStrings config.fileSystems (fs:
-                (if fs.device != null then fs.device else "/dev/disk/by-label/${fs.label}")
-                + " " + fs.mountPoint
-                + " " + fs.fsType
-                + " " + fs.options
-                + " 0"
-                + " " + (if fs.fsType == "none" || fs.noCheck then "0" else
-                         if fs.mountPoint == "/" then "1" else "2")
-                + "\n"
-            )}
-
-            # Swap devices.
-            ${flip concatMapStrings config.swapDevices (sw:
-                 "${sw.device} none swap\n"
-            )}
-          '';
+      { source = fstab;
         target = "fstab";
       };
 
@@ -180,6 +186,8 @@ with pkgs.lib;
 
         script =
           ''
+            # Ensure that this job is restarted when fstab changed:
+            # ${fstab}
             exec > /dev/console 2>&1
             echo "mounting filesystems..."
             ${pkgs.mountall}/sbin/mountall
-- 
GitLab


From 3ddbe0f9fb297c039f3e7e62a22eb424f81460d7 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 15 Mar 2012 14:21:17 +0000
Subject: [PATCH 3449/5331] * Drop references to activation scriptlets that no
 longer exist.

svn path=/nixos/trunk/; revision=33110
---
 modules/services/backup/mysql-backup.nix      | 2 +-
 modules/services/backup/postgresql-backup.nix | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/services/backup/mysql-backup.nix b/modules/services/backup/mysql-backup.nix
index e1591050f7e..3ff9978fbb9 100644
--- a/modules/services/backup/mysql-backup.nix
+++ b/modules/services/backup/mysql-backup.nix
@@ -70,7 +70,7 @@ in
 
     services.cron.systemCronJobs = map mysqlBackupCron config.services.mysqlBackup.databases;
 
-    system.activationScripts.mysqlBackup = stringAfter [ "stdio" "defaultPath" "systemConfig" "users" ]
+    system.activationScripts.mysqlBackup = stringAfter [ "stdio" "users" ]
       ''
         mkdir -m 0700 -p ${config.services.mysqlBackup.location}
         chown ${config.services.mysqlBackup.user} ${config.services.mysqlBackup.location}
diff --git a/modules/services/backup/postgresql-backup.nix b/modules/services/backup/postgresql-backup.nix
index f444717d514..e68ad794a96 100644
--- a/modules/services/backup/postgresql-backup.nix
+++ b/modules/services/backup/postgresql-backup.nix
@@ -56,7 +56,7 @@ in
   config = mkIf config.services.postgresqlBackup.enable {
     services.cron.systemCronJobs = map postgresqlBackupCron config.services.postgresqlBackup.databases;
 
-    system.activationScripts.postgresqlBackup = stringAfter [ "stdio" "defaultPath" "systemConfig" "users" ]
+    system.activationScripts.postgresqlBackup = stringAfter [ "stdio" "users" ]
       ''
         mkdir -m 0700 -p ${config.services.postgresqlBackup.location}
         chown root ${config.services.postgresqlBackup.location}
-- 
GitLab


From 4adc99f9a5af68c4405d90cb39393fa4ec4d26c3 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 16 Mar 2012 01:03:09 +0000
Subject: [PATCH 3450/5331] * Enable the VirtualBox X11 display and mouse
 drivers.

svn path=/nixos/trunk/; revision=33130
---
 modules/virtualisation/virtualbox-guest.nix | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/modules/virtualisation/virtualbox-guest.nix b/modules/virtualisation/virtualbox-guest.nix
index eecae8dc7b5..9f215e81656 100644
--- a/modules/virtualisation/virtualbox-guest.nix
+++ b/modules/virtualisation/virtualbox-guest.nix
@@ -45,6 +45,21 @@ in
         exec = "${kernel.virtualboxGuestAdditions}/sbin/VBoxService --foreground";
       };
 
+    services.xserver.videoDrivers = mkOverride 50 [ "virtualbox" ];
+
+    services.xserver.config =
+      ''
+        Section "InputDevice"
+          Identifier "VBoxMouse"
+          Driver "vboxmouse"
+        EndSection
+      '';
+
+    services.xserver.serverLayoutSection =
+      ''
+        InputDevice "VBoxMouse"
+      '';
+    
   };
 
 }
-- 
GitLab


From 53bd25c7facbd176881b5aa884afb4b5c9914e06 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 16 Mar 2012 01:29:51 +0000
Subject: [PATCH 3451/5331] * Automatically start VBoxClient-all when the X
 session starts.  This   allows seamless windows, resizing of the desktop, cut
 and paster,   etc.

svn path=/nixos/trunk/; revision=33131
---
 modules/services/x11/display-managers/default.nix | 12 ++++++++++++
 modules/virtualisation/virtualbox-guest.nix       |  5 +++++
 2 files changed, 17 insertions(+)

diff --git a/modules/services/x11/display-managers/default.nix b/modules/services/x11/display-managers/default.nix
index 2261d417d04..cdfd271ee65 100644
--- a/modules/services/x11/display-managers/default.nix
+++ b/modules/services/x11/display-managers/default.nix
@@ -80,6 +80,8 @@ let
 
       source /etc/profile
 
+      ${cfg.displayManager.sessionCommands}
+
       # Allow the user to setup a custom session type.
       if test -x ~/.xsession; then
           exec ~/.xsession
@@ -164,6 +166,16 @@ in
         apply = toString;
       };
 
+      sessionCommands = mkOption {
+        default = "";
+        example =
+          ''
+            xmessage "Hello World!" &
+          '';
+        type = types.string;
+        description = "Shell commands executed just before the window or desktop manager is started.";
+      };
+
       session = mkOption {
         default = [];
         example = [
diff --git a/modules/virtualisation/virtualbox-guest.nix b/modules/virtualisation/virtualbox-guest.nix
index 9f215e81656..04fca1eb4e9 100644
--- a/modules/virtualisation/virtualbox-guest.nix
+++ b/modules/virtualisation/virtualbox-guest.nix
@@ -60,6 +60,11 @@ in
         InputDevice "VBoxMouse"
       '';
     
+    services.xserver.displayManager.sessionCommands =
+      ''
+        PATH=${makeSearchPath "bin" [ pkgs.gnugrep pkgs.which pkgs.xorg.xorgserver ]}:$PATH \
+          ${kernel.virtualboxGuestAdditions}/bin/VBoxClient-all
+      '';
   };
 
 }
-- 
GitLab


From f4903be57e3b8f9438d29dd1d6438d808eebbea3 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 16 Mar 2012 01:57:23 +0000
Subject: [PATCH 3452/5331] * nixos-hardware-scan: detect if we're in a
 VirtualBox guest and   enable the guest additions in that case.

svn path=/nixos/trunk/; revision=33133
---
 modules/installer/tools/nixos-hardware-scan.pl | 15 ++++++++++++---
 modules/installer/tools/tools.nix              |  2 +-
 2 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/modules/installer/tools/nixos-hardware-scan.pl b/modules/installer/tools/nixos-hardware-scan.pl
index b81eeaa90e4..5b90607f4b0 100644
--- a/modules/installer/tools/nixos-hardware-scan.pl
+++ b/modules/installer/tools/nixos-hardware-scan.pl
@@ -8,6 +8,7 @@ my @attrs = ();
 my @kernelModules = ();
 my @initrdKernelModules = ();
 my @modulePackages = ();
+my @requires = ("<nixos/modules/installer/scan/not-detected.nix>");
 
 
 sub debug {
@@ -182,6 +183,14 @@ if ($videoDriver) {
 }
 
 
+# Check if we're a VirtualBox guest.  If so, enable the guest
+# additions.
+my $dmi = `@dmidecode@/sbin/dmidecode`;
+if ($dmi =~ /Manufacturer: innotek/) {
+    push @attrs, "services.virtualbox.enable = true;"
+}
+
+
 # Generate the configuration file.
 
 sub removeDups {
@@ -218,6 +227,8 @@ my $initrdKernelModules = toNixExpr(removeDups @initrdKernelModules);
 my $kernelModules = toNixExpr(removeDups @kernelModules);
 my $modulePackages = toNixExpr(removeDups @modulePackages);
 my $attrs = multiLineList("  ", removeDups @attrs);
+my $requires = multiLineList("    ", removeDups @requires);
+
 
 print <<EOF ;
 # This is a generated file.  Do not modify!
@@ -225,9 +236,7 @@ print <<EOF ;
 { config, pkgs, ... }:
 
 {
-  require = [
-    <nixos/modules/installer/scan/not-detected.nix>
-  ];
+  require = [$requires  ];
 
   boot.initrd.kernelModules = [$initrdKernelModules ];
   boot.kernelModules = [$kernelModules ];
diff --git a/modules/installer/tools/tools.nix b/modules/installer/tools/tools.nix
index 4520b7bb1eb..740bfcbbb0c 100644
--- a/modules/installer/tools/tools.nix
+++ b/modules/installer/tools/tools.nix
@@ -48,7 +48,7 @@ let
   nixosHardwareScan = makeProg {
     name = "nixos-hardware-scan";
     src = ./nixos-hardware-scan.pl;
-    inherit (pkgs) perl;
+    inherit (pkgs) perl dmidecode;
   };
 
   nixosOption = makeProg {
-- 
GitLab


From 4caf3560be6269f16c1d7a532c65b9b461c9b5fd Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Fri, 16 Mar 2012 02:34:07 +0000
Subject: [PATCH 3453/5331] efiBootStub: Add the installRemovableMediaImage
 option

svn path=/nixos/trunk/; revision=33135
---
 .../efi-boot-stub/efi-boot-stub-builder.sh    |  8 ++++++
 .../installer/efi-boot-stub/efi-boot-stub.nix | 28 ++++++++++++++++---
 2 files changed, 32 insertions(+), 4 deletions(-)

diff --git a/modules/installer/efi-boot-stub/efi-boot-stub-builder.sh b/modules/installer/efi-boot-stub/efi-boot-stub-builder.sh
index d37b56c7ffe..2e778210dc5 100644
--- a/modules/installer/efi-boot-stub/efi-boot-stub-builder.sh
+++ b/modules/installer/efi-boot-stub/efi-boot-stub-builder.sh
@@ -75,6 +75,14 @@ addEntry() {
         defaultbootnum=$(efibootmgr | grep "NixOS $generation Generation" | sed 's/Boot//' | sed 's/\*.*//')
 	set -e
       fi
+
+      if test -n "@installRemovableMediaImage@"; then
+        mkdir -pv "@efiSysMountPoint@"/efi/boot
+        cp "@removableMediaImage@" \
+          "@efiSysMountPoint@"/efi/boot/boot"@targetArch@".efi
+	iconv -f utf-8 -t UCS-2 < $startup > "@efiSysMountPoint@"/efi/nixos/boot-params
+        filesCopied["@efiSysMountPoint@"/efi/nixos/boot-params]=1
+      fi
       if test -n "@installStartupNsh@"; then
         sed 's|.*@kernelFile@.efi|@kernelFile@.efi|' < $startup > "@efiSysMountPoint@/startup.nsh"
         cp $kernel "@efiSysMountPoint@/@kernelFile@.efi"
diff --git a/modules/installer/efi-boot-stub/efi-boot-stub.nix b/modules/installer/efi-boot-stub/efi-boot-stub.nix
index eeabd55c729..c83ba8937b6 100644
--- a/modules/installer/efi-boot-stub/efi-boot-stub.nix
+++ b/modules/installer/efi-boot-stub/efi-boot-stub.nix
@@ -59,6 +59,18 @@ let
             '';
           };
 
+          installRemovableMediaImage = mkOption {
+            default = false;
+            description = ''
+              Whether to build/install a BOOT{machine type short-name}.EFI file
+              in \EFI\BOOT. This _should_ only be needed for removable devices
+              (CDs, usb sticks, etc.), but it may be an option for broken
+              systems where efibootmgr doesn't work. It reads the UCS-2
+              encoded \EFI\NIXOS\BOOT-PARAMS to find out which kernel to boot
+              with which parameters.
+            '';
+          };
+
         };
       };
     };
@@ -68,14 +80,22 @@ in
 
 ###### implementation
 let
-  efiBootStubBuilder = pkgs.substituteAll {
+  efiBootStubBuilder = pkgs.substituteAll ({
     src = ./efi-boot-stub-builder.sh;
     isExecutable = true;
     inherit (pkgs) bash;
-    path = [pkgs.coreutils pkgs.gnused pkgs.gnugrep] ++ (pkgs.stdenv.lib.optionals config.boot.loader.efiBootStub.runEfibootmgr [pkgs.efibootmgr pkgs.module_init_tools]);
-    inherit (config.boot.loader.efiBootStub) efiSysMountPoint runEfibootmgr installStartupNsh efiDisk efiPartition;
+    path = [pkgs.coreutils pkgs.gnused pkgs.gnugrep pkgs.glibc] ++ (pkgs.stdenv.lib.optionals config.boot.loader.efiBootStub.runEfibootmgr [pkgs.efibootmgr pkgs.module_init_tools]);
+    inherit (config.boot.loader.efiBootStub) efiSysMountPoint runEfibootmgr installStartupNsh efiDisk efiPartition installRemovableMediaImage;
     kernelFile = platform.kernelTarget;
-  };
+  } // pkgs.stdenv.lib.optionalAttrs config.boot.loader.efiBootStub.installRemovableMediaImage {
+    removableMediaImage = "${pkgs.NixosBootPkg}/X64/NixosBoot.efi";
+    targetArch = if pkgs.stdenv.isi686 then
+      "IA32"
+    else if pkgs.stdenv.isx86_64 then
+      "x64"
+    else
+      throw "Unsupported architecture";
+  });
 
   # Temporary check, for nixos to cope both with nixpkgs stdenv-updates and trunk
   platform = pkgs.stdenv.platform;
-- 
GitLab


From 1bccbc30cd526deac4eaf10e0f0a7e7389eda009 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Fri, 16 Mar 2012 02:55:17 +0000
Subject: [PATCH 3454/5331] efiBootStub: Assert that the kernel has the
 efiBootStub feature

svn path=/nixos/trunk/; revision=33138
---
 modules/installer/efi-boot-stub/efi-boot-stub.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/modules/installer/efi-boot-stub/efi-boot-stub.nix b/modules/installer/efi-boot-stub/efi-boot-stub.nix
index c83ba8937b6..55c4055ca1e 100644
--- a/modules/installer/efi-boot-stub/efi-boot-stub.nix
+++ b/modules/installer/efi-boot-stub/efi-boot-stub.nix
@@ -108,7 +108,9 @@ in
     # ../system/system-options.nix
   ];
 
-  system = mkIf config.boot.loader.efiBootStub.enable {
+  system = mkIf (config.boot.loader.efiBootStub.enable && (assert
+    (config.boot.kernelPackages.kernel.features ? efiBootStub &&
+    config.boot.kernelPackages.kernel.features.efiBootStub); true)) {
     build = {
       menuBuilder = efiBootStubBuilder;
     };
-- 
GitLab


From b89a65e54cf1742f37db6d24f7c8a7dd1e930be7 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Fri, 16 Mar 2012 03:20:12 +0000
Subject: [PATCH 3455/5331] Allow multiple definitions of
 boot.loader.kernelFile as long as they are all the same

svn path=/nixos/trunk/; revision=33139
---
 modules/system/activation/top-level.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/modules/system/activation/top-level.nix b/modules/system/activation/top-level.nix
index 265f06a5a9d..aa79fb3698d 100644
--- a/modules/system/activation/top-level.nix
+++ b/modules/system/activation/top-level.nix
@@ -38,6 +38,9 @@ let
       description = ''
         Name of the kernel file to be passed to the bootloader.
       '';
+      merge = kernelFiles:
+        builtins.head (map (f: assert f == builtins.head kernelFiles; f)
+          kernelFiles);
     };
 
     system.copySystemConfiguration = pkgs.lib.mkOption {
-- 
GitLab


From 8efda48496d1be5d47518f7903b5ada110738beb Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Fri, 16 Mar 2012 05:37:24 +0000
Subject: [PATCH 3456/5331] Enable building an efi-bootable ISO

svn path=/nixos/trunk/; revision=33140
---
 lib/make-iso9660-image.nix                    |  9 ++++-
 lib/make-iso9660-image.sh                     |  3 ++
 .../cd-dvd/installation-cd-new-kernel.nix     | 16 ++++++++-
 modules/installer/cd-dvd/iso-image.nix        | 36 +++++++++++++++++--
 .../installer/efi-boot-stub/efi-boot-stub.nix |  2 +-
 5 files changed, 61 insertions(+), 5 deletions(-)

diff --git a/lib/make-iso9660-image.nix b/lib/make-iso9660-image.nix
index 9dfde3e4a7c..5ad546e9534 100644
--- a/lib/make-iso9660-image.nix
+++ b/lib/make-iso9660-image.nix
@@ -19,9 +19,15 @@
 , # Whether this should be an El-Torito bootable CD.
   bootable ? false
 
+, # Whether this should be an efi-bootable El-Torito CD.
+  efiBootable ? false
+
 , # The path (in the ISO file system) of the boot image.
   bootImage ? ""
 
+, # The path (in the ISO file system) of the efi boot image.
+  efiBootImage ? ""
+
 , # Whether to compress the resulting ISO image with bzip2.
   compressImage ? false
 
@@ -31,13 +37,14 @@
 }:
 
 assert bootable -> bootImage != "";
+assert efiBootable -> efiBootImage != "";
 
 stdenv.mkDerivation {
   name = "iso9660-image";
   builder = ./make-iso9660-image.sh;
   buildInputs = [perl cdrkit];
 
-  inherit isoName bootable bootImage compressImage volumeID pathsFromGraph;
+  inherit isoName bootable bootImage compressImage volumeID pathsFromGraph efiBootImage efiBootable;
 
   # !!! should use XML.
   sources = map (x: x.source) contents;
diff --git a/lib/make-iso9660-image.sh b/lib/make-iso9660-image.sh
index c6996e8db9a..89b681ed2cd 100644
--- a/lib/make-iso9660-image.sh
+++ b/lib/make-iso9660-image.sh
@@ -34,6 +34,9 @@ if test -n "$bootable"; then
     bootFlags="-b $bootImage -c .boot.cat -no-emul-boot -boot-load-size 4 -boot-info-table"
 fi
 
+if test -n "$efiBootable"; then
+    bootFlags="$bootFlags -eltorito-alt-boot -e $efiBootImage -no-emul-boot"
+fi
 
 touch pathlist
 
diff --git a/modules/installer/cd-dvd/installation-cd-new-kernel.nix b/modules/installer/cd-dvd/installation-cd-new-kernel.nix
index c7ea5ddfb01..1d7af6401ef 100644
--- a/modules/installer/cd-dvd/installation-cd-new-kernel.nix
+++ b/modules/installer/cd-dvd/installation-cd-new-kernel.nix
@@ -3,6 +3,20 @@
 {
   require = [ ./installation-cd-graphical.nix ];
 
-  boot.kernelPackages = pkgs.linuxPackages_3_2;
+  boot.kernelPackages = pkgs.linuxPackages_3_3;
   boot.vesa = false;
+
+  # What follows should probably move into base once the base kernel has the
+  # efi boot stub
+
+  # Get a console as soon as the initrd loads fbcon on EFI boot
+  boot.initrd.kernelModules = [ "fbcon" ];
+
+  # Enable reading EFI variables via sysfs
+  boot.kernelModules = [ "efivars" ];
+
+  # efi-related tools
+  environment.systemPackages = [ pkgs.efibootmgr ];
+
+  isoImage.makeEfiBootable = true;
 }
diff --git a/modules/installer/cd-dvd/iso-image.nix b/modules/installer/cd-dvd/iso-image.nix
index 7cc08315d01..82acac9a3e5 100644
--- a/modules/installer/cd-dvd/iso-image.nix
+++ b/modules/installer/cd-dvd/iso-image.nix
@@ -73,6 +73,14 @@ let
       '';
     };
 
+    isoImage.makeEfiBootable = mkOption {
+      default = false;
+      description = ''
+        Whether the ISO image should be an efi-bootable volume
+      '';
+    };
+
+
   };
 
 
@@ -110,6 +118,20 @@ let
       ${config.boot.loader.grub.extraEntries}
     '';
 
+
+  # The boot params for the efi boot stub
+  bootParams = pkgs.runCommand "boot-params_eltorito" {}
+    ''
+      echo "\\boot\\bzImage initrd=\\boot\\initrd init=${config.system.build.toplevel}/init ${toString config.boot.kernelParams}" | iconv -f utf-8 -t UCS-2 > $out
+    '';
+
+  targetArch = if pkgs.stdenv.isi686 then
+    "IA32"
+  else if pkgs.stdenv.isx86_64 then
+    "x64"
+  else
+    throw "Unsupported architecture";
+
 in
 
 {
@@ -220,6 +242,13 @@ in
         source = pkgs.runCommand "empty" {} "ensureDir $out";
         target = "/nix/store";
       }
+    ] ++ pkgs.stdenv.lib.optionals config.isoImage.makeEfiBootable [
+      { source = bootParams;
+        target = "/efi/nixos/boot-params";
+      }
+      { source = "${pkgs.NixosBootPkg}/*/NixosBoot.efi";
+        target = "/efi/boot/boot${targetArch}.efi";
+      }
     ];
 
   # The Grub menu.
@@ -239,14 +268,17 @@ in
   boot.loader.grub.timeout = 10;
 
   # Create the ISO image.
-  system.build.isoImage = import ../../../lib/make-iso9660-image.nix {
+  system.build.isoImage = import ../../../lib/make-iso9660-image.nix ({
     inherit (pkgs) stdenv perl cdrkit pathsFromGraph;
 
     inherit (config.isoImage) isoName compressImage volumeID contents;
 
     bootable = true;
     bootImage = "/boot/grub/grub_eltorito";
-  };
+  } // pkgs.stdenv.lib.optionalAttrs config.isoImage.makeEfiBootable {
+    efiBootable = true;
+    efiBootImage = "efi/boot/boot${targetArch}.efi";
+  });
 
   boot.postBootCommands =
     ''
diff --git a/modules/installer/efi-boot-stub/efi-boot-stub.nix b/modules/installer/efi-boot-stub/efi-boot-stub.nix
index 55c4055ca1e..7b28faa9ab2 100644
--- a/modules/installer/efi-boot-stub/efi-boot-stub.nix
+++ b/modules/installer/efi-boot-stub/efi-boot-stub.nix
@@ -88,7 +88,7 @@ let
     inherit (config.boot.loader.efiBootStub) efiSysMountPoint runEfibootmgr installStartupNsh efiDisk efiPartition installRemovableMediaImage;
     kernelFile = platform.kernelTarget;
   } // pkgs.stdenv.lib.optionalAttrs config.boot.loader.efiBootStub.installRemovableMediaImage {
-    removableMediaImage = "${pkgs.NixosBootPkg}/X64/NixosBoot.efi";
+    removableMediaImage = "${pkgs.NixosBootPkg}/*/NixosBoot.efi";
     targetArch = if pkgs.stdenv.isi686 then
       "IA32"
     else if pkgs.stdenv.isx86_64 then
-- 
GitLab


From 95bec1c0019e7317572296a8a2842335f94a45b2 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Fri, 16 Mar 2012 06:08:55 +0000
Subject: [PATCH 3457/5331] efiBootStub: Properly handle the
 removableMediaImage path on different architectures

svn path=/nixos/trunk/; revision=33141
---
 modules/installer/efi-boot-stub/efi-boot-stub.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/modules/installer/efi-boot-stub/efi-boot-stub.nix b/modules/installer/efi-boot-stub/efi-boot-stub.nix
index 7b28faa9ab2..7f4d8cba775 100644
--- a/modules/installer/efi-boot-stub/efi-boot-stub.nix
+++ b/modules/installer/efi-boot-stub/efi-boot-stub.nix
@@ -87,12 +87,12 @@ let
     path = [pkgs.coreutils pkgs.gnused pkgs.gnugrep pkgs.glibc] ++ (pkgs.stdenv.lib.optionals config.boot.loader.efiBootStub.runEfibootmgr [pkgs.efibootmgr pkgs.module_init_tools]);
     inherit (config.boot.loader.efiBootStub) efiSysMountPoint runEfibootmgr installStartupNsh efiDisk efiPartition installRemovableMediaImage;
     kernelFile = platform.kernelTarget;
-  } // pkgs.stdenv.lib.optionalAttrs config.boot.loader.efiBootStub.installRemovableMediaImage {
-    removableMediaImage = "${pkgs.NixosBootPkg}/*/NixosBoot.efi";
+  } // pkgs.stdenv.lib.optionalAttrs config.boot.loader.efiBootStub.installRemovableMediaImage rec {
+    removableMediaImage = "${pkgs.NixosBootPkg}/${targetArch}/NixosBoot.efi";
     targetArch = if pkgs.stdenv.isi686 then
       "IA32"
     else if pkgs.stdenv.isx86_64 then
-      "x64"
+      "X64"
     else
       throw "Unsupported architecture";
   });
-- 
GitLab


From a315eefca145ee5aace6b3ee9a5bf381c5f535d4 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Fri, 16 Mar 2012 11:22:05 +0000
Subject: [PATCH 3458/5331] Restore old installation-cd-new-kernel.nix and
 create a new installation-cd-efi.nix

svn path=/nixos/trunk/; revision=33146
---
 .../installer/cd-dvd/installation-cd-efi.nix  | 22 +++++++++++++++++++
 .../cd-dvd/installation-cd-new-kernel.nix     | 16 +-------------
 2 files changed, 23 insertions(+), 15 deletions(-)
 create mode 100644 modules/installer/cd-dvd/installation-cd-efi.nix

diff --git a/modules/installer/cd-dvd/installation-cd-efi.nix b/modules/installer/cd-dvd/installation-cd-efi.nix
new file mode 100644
index 00000000000..1d7af6401ef
--- /dev/null
+++ b/modules/installer/cd-dvd/installation-cd-efi.nix
@@ -0,0 +1,22 @@
+{ config, pkgs, ... }:
+
+{
+  require = [ ./installation-cd-graphical.nix ];
+
+  boot.kernelPackages = pkgs.linuxPackages_3_3;
+  boot.vesa = false;
+
+  # What follows should probably move into base once the base kernel has the
+  # efi boot stub
+
+  # Get a console as soon as the initrd loads fbcon on EFI boot
+  boot.initrd.kernelModules = [ "fbcon" ];
+
+  # Enable reading EFI variables via sysfs
+  boot.kernelModules = [ "efivars" ];
+
+  # efi-related tools
+  environment.systemPackages = [ pkgs.efibootmgr ];
+
+  isoImage.makeEfiBootable = true;
+}
diff --git a/modules/installer/cd-dvd/installation-cd-new-kernel.nix b/modules/installer/cd-dvd/installation-cd-new-kernel.nix
index 1d7af6401ef..c7ea5ddfb01 100644
--- a/modules/installer/cd-dvd/installation-cd-new-kernel.nix
+++ b/modules/installer/cd-dvd/installation-cd-new-kernel.nix
@@ -3,20 +3,6 @@
 {
   require = [ ./installation-cd-graphical.nix ];
 
-  boot.kernelPackages = pkgs.linuxPackages_3_3;
+  boot.kernelPackages = pkgs.linuxPackages_3_2;
   boot.vesa = false;
-
-  # What follows should probably move into base once the base kernel has the
-  # efi boot stub
-
-  # Get a console as soon as the initrd loads fbcon on EFI boot
-  boot.initrd.kernelModules = [ "fbcon" ];
-
-  # Enable reading EFI variables via sysfs
-  boot.kernelModules = [ "efivars" ];
-
-  # efi-related tools
-  environment.systemPackages = [ pkgs.efibootmgr ];
-
-  isoImage.makeEfiBootable = true;
 }
-- 
GitLab


From 358b699c2038025917a28f2e22075ebb00886a0f Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Fri, 16 Mar 2012 11:25:09 +0000
Subject: [PATCH 3459/5331] installation-cd-efi: Only build a minimal cd

svn path=/nixos/trunk/; revision=33147
---
 modules/installer/cd-dvd/installation-cd-efi.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/installer/cd-dvd/installation-cd-efi.nix b/modules/installer/cd-dvd/installation-cd-efi.nix
index 1d7af6401ef..bc3e5908916 100644
--- a/modules/installer/cd-dvd/installation-cd-efi.nix
+++ b/modules/installer/cd-dvd/installation-cd-efi.nix
@@ -1,7 +1,7 @@
 { config, pkgs, ... }:
 
 {
-  require = [ ./installation-cd-graphical.nix ];
+  require = [ ./installation-cd-minimal.nix ];
 
   boot.kernelPackages = pkgs.linuxPackages_3_3;
   boot.vesa = false;
-- 
GitLab


From c61d91994109f53f62cb8d3f4de6bfd2b1cfa15e Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Fri, 16 Mar 2012 11:31:33 +0000
Subject: [PATCH 3460/5331] Typographical conventions

svn path=/nixos/trunk/; revision=33148
---
 modules/installer/cd-dvd/iso-image.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/installer/cd-dvd/iso-image.nix b/modules/installer/cd-dvd/iso-image.nix
index 82acac9a3e5..0c0fe988021 100644
--- a/modules/installer/cd-dvd/iso-image.nix
+++ b/modules/installer/cd-dvd/iso-image.nix
@@ -76,7 +76,7 @@ let
     isoImage.makeEfiBootable = mkOption {
       default = false;
       description = ''
-        Whether the ISO image should be an efi-bootable volume
+        Whether the ISO image should be an efi-bootable volume.
       '';
     };
 
-- 
GitLab


From d9e28e909c330f7ed0d809369b29d6177bdf7d2d Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Fri, 16 Mar 2012 11:53:50 +0000
Subject: [PATCH 3461/5331] Move NixosBootPkg into NixOS

svn path=/nixos/trunk/; revision=33149
---
 modules/installer/cd-dvd/iso-image.nix        |  4 ++-
 .../installer/efi-boot-stub/efi-boot-stub.nix |  4 ++-
 .../efi-boot-stub/nixos-boot-pkg.nix          | 29 +++++++++++++++++++
 3 files changed, 35 insertions(+), 2 deletions(-)
 create mode 100644 modules/installer/efi-boot-stub/nixos-boot-pkg.nix

diff --git a/modules/installer/cd-dvd/iso-image.nix b/modules/installer/cd-dvd/iso-image.nix
index 0c0fe988021..a0acead6feb 100644
--- a/modules/installer/cd-dvd/iso-image.nix
+++ b/modules/installer/cd-dvd/iso-image.nix
@@ -246,7 +246,9 @@ in
       { source = bootParams;
         target = "/efi/nixos/boot-params";
       }
-      { source = "${pkgs.NixosBootPkg}/*/NixosBoot.efi";
+      { source = ''${import ../efi-boot-stub/nixos-boot-pkg.nix {
+                     inherit (pkgs) edk2 stdenv fetchhg; 
+                   }}/*/NixosBoot.efi'';
         target = "/efi/boot/boot${targetArch}.efi";
       }
     ];
diff --git a/modules/installer/efi-boot-stub/efi-boot-stub.nix b/modules/installer/efi-boot-stub/efi-boot-stub.nix
index 7f4d8cba775..c8236b6fdd8 100644
--- a/modules/installer/efi-boot-stub/efi-boot-stub.nix
+++ b/modules/installer/efi-boot-stub/efi-boot-stub.nix
@@ -88,7 +88,9 @@ let
     inherit (config.boot.loader.efiBootStub) efiSysMountPoint runEfibootmgr installStartupNsh efiDisk efiPartition installRemovableMediaImage;
     kernelFile = platform.kernelTarget;
   } // pkgs.stdenv.lib.optionalAttrs config.boot.loader.efiBootStub.installRemovableMediaImage rec {
-    removableMediaImage = "${pkgs.NixosBootPkg}/${targetArch}/NixosBoot.efi";
+    removableMediaImage = ''${import ./nixos-boot-pkg.nix {
+                              inherit (pkgs) edk2 stdenv fetchhg;
+                            }}/${targetArch}/NixosBoot.efi'';
     targetArch = if pkgs.stdenv.isi686 then
       "IA32"
     else if pkgs.stdenv.isx86_64 then
diff --git a/modules/installer/efi-boot-stub/nixos-boot-pkg.nix b/modules/installer/efi-boot-stub/nixos-boot-pkg.nix
new file mode 100644
index 00000000000..5bce1789a02
--- /dev/null
+++ b/modules/installer/efi-boot-stub/nixos-boot-pkg.nix
@@ -0,0 +1,29 @@
+{ stdenv, edk2, fetchhg }:
+
+let
+
+  src = fetchhg {
+    url = https://bitbucket.org/shlevy/nixosbootpkg;
+    tag = "1ff4c2891c8c1eb03677a6f8b04b8d05807ec198";
+    sha256 = "06zwy0g9a7g2sny7phvn2z76pb3wnw4vm9vsrjjaj7f7nzcsn13k";
+  };
+
+in
+
+stdenv.mkDerivation (edk2.setup "NixosBootPkg/NixosBootPkg.dsc" {
+  name = "NixosBootPkg-2012-03-15";
+
+  unpackPhase = ''
+    ln -sv ${src} NixosBootPkg
+    ln -sv ${edk2.src}/MdePkg .
+  '';
+
+  meta = {
+    description =
+      "Simple EFI app to load the kernel with NixOS-specific arguments";
+    homepage = http://www.shealevy.com;
+    license = "MIT";
+    maintainers = [ stdenv.lib.maintainers.shlevy ];
+    platforms = ["x86_64-linux" "i686-linux"];
+  };
+})
-- 
GitLab


From 8ad872ca03a3927587769bf11c3944c40d47004e Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Fri, 16 Mar 2012 12:01:08 +0000
Subject: [PATCH 3462/5331] Revert r33139

I didn't end up needing it and there's a better way to do what I wanted if I
did.

svn path=/nixos/trunk/; revision=33150
---
 modules/system/activation/top-level.nix | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/modules/system/activation/top-level.nix b/modules/system/activation/top-level.nix
index aa79fb3698d..265f06a5a9d 100644
--- a/modules/system/activation/top-level.nix
+++ b/modules/system/activation/top-level.nix
@@ -38,9 +38,6 @@ let
       description = ''
         Name of the kernel file to be passed to the bootloader.
       '';
-      merge = kernelFiles:
-        builtins.head (map (f: assert f == builtins.head kernelFiles; f)
-          kernelFiles);
     };
 
     system.copySystemConfiguration = pkgs.lib.mkOption {
-- 
GitLab


From fa73514260dc954c6850e5b67e0c186530107dca Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Fri, 16 Mar 2012 12:24:29 +0000
Subject: [PATCH 3463/5331] Build the efi-bootable cd on hydra

svn path=/nixos/trunk/; revision=33152
---
 release.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/release.nix b/release.nix
index 0058d6ce1dd..eb5f9bfbe0d 100644
--- a/release.nix
+++ b/release.nix
@@ -134,6 +134,12 @@ let
       type = "new-kernel";
     };
 
+    # A variant with experimental efi booting support. Currently requires
+    # an RC kernel. Eventually this should probably be merged into cd-minimal
+    iso_efi = makeIso {
+      module = ./modules/installer/cd-dvd/installation-cd-efi.nix;
+      type = "efi";
+    };
 
     # Provide a tarball that can be unpacked into an SD card, and easily
     # boot that system from uboot (like for the sheevaplug).
-- 
GitLab


From d2b3c2cda418eac3ec1e40767a25c222fed42f6f Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 16 Mar 2012 13:00:27 +0000
Subject: [PATCH 3464/5331] * Start fixing the NFS mess.  It was completely
 broken because the   exportfs job didn't work at all (so /var/lib/nfs/etab
 didn't get   initialised).

svn path=/nixos/trunk/; revision=33153
---
 modules/services/network-filesystems/nfs-kernel.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/services/network-filesystems/nfs-kernel.nix b/modules/services/network-filesystems/nfs-kernel.nix
index 1ebc268ecf8..2b48fa04f23 100644
--- a/modules/services/network-filesystems/nfs-kernel.nix
+++ b/modules/services/network-filesystems/nfs-kernel.nix
@@ -125,7 +125,7 @@ in
               ''
                 # exports file is ${exports}
                 # keep this comment so that this job is restarted whenever exports changes!
-                exportfs -ra
+                ${pkgs.nfsUtils}/sbin/exportfs -ra
               '';
           };
         }
@@ -193,7 +193,7 @@ in
 
             description = "Kernel NFS server - Network Status Monitor";
 
-            startOn = if (cfg.server.enable) then
+            startOn = if cfg.server.enable then
                 "started nfs-kernel-mountd and started nfs-kernel-nfsd"
               else
                 "started portmap";
-- 
GitLab


From 0c1ec805fcea7396eefc18793007336e21092fc0 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 16 Mar 2012 13:40:02 +0000
Subject: [PATCH 3465/5331] * In fact get rid of the whole nfs-kernel-exports
 job.

svn path=/nixos/trunk/; revision=33156
---
 .../network-filesystems/nfs-kernel.nix        | 25 +++++--------------
 1 file changed, 6 insertions(+), 19 deletions(-)

diff --git a/modules/services/network-filesystems/nfs-kernel.nix b/modules/services/network-filesystems/nfs-kernel.nix
index 2b48fa04f23..f6ba9cf392e 100644
--- a/modules/services/network-filesystems/nfs-kernel.nix
+++ b/modules/services/network-filesystems/nfs-kernel.nix
@@ -114,29 +114,12 @@ in
 
     jobs =
       optionalAttrs cfg.server.enable
-        { nfs_kernel_exports =
-          { name = "nfs-kernel-exports";
-
-            description = "Kernel NFS server";
-
-            startOn = "started network-interfaces and started portmap and filesystem";
-
-            postStart =
-              ''
-                # exports file is ${exports}
-                # keep this comment so that this job is restarted whenever exports changes!
-                ${pkgs.nfsUtils}/sbin/exportfs -ra
-              '';
-          };
-        }
-
-      // optionalAttrs cfg.server.enable
         { nfs_kernel_nfsd =
           { name = "nfs-kernel-nfsd";
 
             description = "Kernel NFS server";
 
-            startOn = "starting nfs-kernel-exports or started portmap";
+            startOn = "started portmap";
             stopOn = "stopped nfs-kernel-statd or stopping portmap";
 
             preStart =
@@ -147,6 +130,10 @@ in
                 # Create a state directory required by NFSv4.
                 mkdir -p /var/lib/nfs/v4recovery
 
+                # exports file is ${exports}
+                # keep this comment so that this job is restarted whenever exports changes!
+                ${pkgs.nfsUtils}/sbin/exportfs -ra
+                
                 # rpc.nfsd needs the kernel support
                 ${config.system.sbin.modprobe}/sbin/modprobe nfsd || true
 
@@ -197,7 +184,7 @@ in
                 "started nfs-kernel-mountd and started nfs-kernel-nfsd"
               else
                 "started portmap";
-            stopOn = "stopping nfs-kernel-exports or stopping portmap";
+            stopOn = "stopping nfs-kernel-nfsd or stopping portmap";
 
             preStart =
               ''
-- 
GitLab


From 4716ccf1b1545cc60e63fd27b1c8d87be1bad915 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Fri, 16 Mar 2012 13:40:03 +0000
Subject: [PATCH 3466/5331] nixosBootStub: Hide noisy efibootmgr output

svn path=/nixos/trunk/; revision=33157
---
 modules/installer/efi-boot-stub/efi-boot-stub-builder.sh | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/modules/installer/efi-boot-stub/efi-boot-stub-builder.sh b/modules/installer/efi-boot-stub/efi-boot-stub-builder.sh
index 2e778210dc5..d736fb417a6 100644
--- a/modules/installer/efi-boot-stub/efi-boot-stub-builder.sh
+++ b/modules/installer/efi-boot-stub/efi-boot-stub-builder.sh
@@ -65,7 +65,7 @@ addEntry() {
     if test -n "@runEfibootmgr@"; then
       set +e
       efibootmgr -c -d "@efiDisk@" -g -l $(echo $kernel | sed 's|@efiSysMountPoint@||' | sed 's|/|\\|g') -L "NixOS $generation Generation" -p "@efiPartition@" \
-        -u systemConfig=$(readlink -f $path) init=$(readlink -f $path/init) initrd=$(echo $initrd | sed 's|@efiSysMountPoint@||' | sed 's|/|\\|g') $(cat $path/kernel-params)
+        -u systemConfig=$(readlink -f $path) init=$(readlink -f $path/init) initrd=$(echo $initrd | sed 's|@efiSysMountPoint@||' | sed 's|/|\\|g') $(cat $path/kernel-params) > /dev/null 2>&1
       set -e
     fi
 
@@ -97,9 +97,9 @@ if test -n "@runEfibootmgr@"; then
   set +e
   modprobe efivars
   for bootnum in $(efibootmgr | grep "NixOS" | grep "Generation" | sed 's/Boot//' | sed 's/\*.*//'); do
-    efibootmgr -B -b "$bootnum"
-    set -e
+    efibootmgr -B -b "$bootnum" > /dev/null 2>&1
   done
+  set -e
 fi
 
 # Add all generations of the system profile to the system partition, in reverse
@@ -114,7 +114,7 @@ done
 
 if test -n "@runEfibootmgr@"; then
   set +e
-  efibootmgr -o $defaultbootnum
+  efibootmgr -o $defaultbootnum > /dev/null 2>&1
   set -e
 fi
 
-- 
GitLab


From c5ca681c06e9e0c093cb7771325c6d66ef31e248 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 16 Mar 2012 13:56:51 +0000
Subject: [PATCH 3467/5331] * Drop the unnecessary "nfs-kernel-" prefix from
 the job names.

svn path=/nixos/trunk/; revision=33159
---
 .../network-filesystems/nfs-kernel.nix        | 42 ++++++-------------
 1 file changed, 12 insertions(+), 30 deletions(-)

diff --git a/modules/services/network-filesystems/nfs-kernel.nix b/modules/services/network-filesystems/nfs-kernel.nix
index f6ba9cf392e..1b4fa927123 100644
--- a/modules/services/network-filesystems/nfs-kernel.nix
+++ b/modules/services/network-filesystems/nfs-kernel.nix
@@ -20,18 +20,6 @@ let
   rpc.mountd, rpc.nfsd
   rpc.statd, rpc.lockd (if necessary), and
   rpc.rquotad"
-
-  I tried to mimic that with upstart, playing with stopping/stopped/started/starting
-  events.
-
-  I consider two scenarios:
-    - Starting at boot. Then, portmap will emit a started event.
-    - "restart nfs-kernel-exports". Then, portmap will not emit anything. Due
-      to the comment in postStart, this will happen on nixos-rebuild if
-      the exportfs file changed.
-
-  From these scenarios, I came up with the startOn and stopOn at the time of commiting
-  this comment.
 */
 
 
@@ -102,7 +90,7 @@ in
   config =
   mkAssert
     (cfg.client.enable || cfg.server.enable -> config.services.portmap.enable) "
-    Please enable portmap (services.portmap.enable) to use nfs-kernel.
+    Please enable portmap (services.portmap.enable) to use nfsd.
   " {
 
     services.portmap.enable = mkAlways (cfg.client.enable || cfg.server.enable);
@@ -114,13 +102,11 @@ in
 
     jobs =
       optionalAttrs cfg.server.enable
-        { nfs_kernel_nfsd =
-          { name = "nfs-kernel-nfsd";
-
-            description = "Kernel NFS server";
+        { nfsd =
+          { description = "Kernel NFS server";
 
             startOn = "started portmap";
-            stopOn = "stopped nfs-kernel-statd or stopping portmap";
+            stopOn = "stopped statd or stopping portmap";
 
             preStart =
               ''
@@ -160,13 +146,11 @@ in
         }
 
       // optionalAttrs cfg.server.enable
-        { nfs_kernel_mountd =
-          { name = "nfs-kernel-mountd";
-
-            description = "Kernel NFS server - mount daemon";
+        { mountd =
+          { description = "Kernel NFS server - mount daemon";
 
-            startOn = "started nfs-kernel-nfsd";
-            stopOn = "stopped nfs-kernel-statd";
+            startOn = "started nfsd";
+            stopOn = "stopped statd";
 
             daemonType = "fork";
 
@@ -175,16 +159,14 @@ in
         }
 
       // optionalAttrs (cfg.client.enable || cfg.server.enable)
-        { nfs_kernel_statd =
-          { name = "nfs-kernel-statd";
-
-            description = "Kernel NFS server - Network Status Monitor";
+        { statd =
+          { description = "Kernel NFS server - Network Status Monitor";
 
             startOn = if cfg.server.enable then
-                "started nfs-kernel-mountd and started nfs-kernel-nfsd"
+                "started mountd and started nfsd"
               else
                 "started portmap";
-            stopOn = "stopping nfs-kernel-nfsd or stopping portmap";
+            stopOn = "stopping nfsd or stopping portmap";
 
             preStart =
               ''
-- 
GitLab


From 097c656361f597f36be798b8b2d50c34446dea5a Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Fri, 16 Mar 2012 16:45:40 +0000
Subject: [PATCH 3468/5331] iso-image: Make efi-bootable cds actually bootable.

The image passed to genisofs needs to be a FAT image with the right filesystem
layout, not an EFI executable image

svn path=/nixos/trunk/; revision=33162
---
 modules/installer/cd-dvd/iso-image.nix | 32 +++++++++++++++++---------
 1 file changed, 21 insertions(+), 11 deletions(-)

diff --git a/modules/installer/cd-dvd/iso-image.nix b/modules/installer/cd-dvd/iso-image.nix
index a0acead6feb..9e39eb48f3d 100644
--- a/modules/installer/cd-dvd/iso-image.nix
+++ b/modules/installer/cd-dvd/iso-image.nix
@@ -119,10 +119,25 @@ let
     '';
 
 
-  # The boot params for the efi boot stub
-  bootParams = pkgs.runCommand "boot-params_eltorito" {}
+  # The efi boot image
+  efiImg = pkgs.runCommand "efi-image_eltorito" {}
     ''
-      echo "\\boot\\bzImage initrd=\\boot\\initrd init=${config.system.build.toplevel}/init ${toString config.boot.kernelParams}" | iconv -f utf-8 -t UCS-2 > $out
+      #Let's hope 8M is enough
+      dd bs=2048 count=4096 if=/dev/zero of="$out"
+      ${pkgs.dosfstools}/sbin/mkfs.vfat "$out"
+      ${pkgs.mtools}/bin/mmd -i "$out" efi
+      ${pkgs.mtools}/bin/mmd -i "$out" efi/boot
+      ${pkgs.mtools}/bin/mmd -i "$out" efi/nixos
+      ${pkgs.mtools}/bin/mcopy -v -i "$out" \
+        ${config.boot.kernelPackages.kernel + "/bzImage"} ::efi/nixos/bzImage
+      ${pkgs.mtools}/bin/mcopy -v -i "$out" \
+        ${config.system.build.initialRamdisk + "/initrd"} ::efi/nixos/initrd
+      echo "\\efi\\nixos\\bzImage initrd=\\efi\\nixos\\initrd init=${config.system.build.toplevel}/init ${toString config.boot.kernelParams}" | iconv -f utf-8 -t UCS-2 > boot-params
+      ${pkgs.mtools}/bin/mcopy -v -i "$out" boot-params ::efi/nixos/boot-params
+      ${pkgs.mtools}/bin/mcopy -v -i "$out" \
+        ${import ../efi-boot-stub/nixos-boot-pkg.nix {
+          inherit (pkgs) edk2 stdenv fetchhg; 
+         }}/*/NixosBoot.efi ::efi/boot/boot${targetArch}.efi
     '';
 
   targetArch = if pkgs.stdenv.isi686 then
@@ -243,13 +258,8 @@ in
         target = "/nix/store";
       }
     ] ++ pkgs.stdenv.lib.optionals config.isoImage.makeEfiBootable [
-      { source = bootParams;
-        target = "/efi/nixos/boot-params";
-      }
-      { source = ''${import ../efi-boot-stub/nixos-boot-pkg.nix {
-                     inherit (pkgs) edk2 stdenv fetchhg; 
-                   }}/*/NixosBoot.efi'';
-        target = "/efi/boot/boot${targetArch}.efi";
+      { source = efiImg;
+        target = "/boot/efi.img";
       }
     ];
 
@@ -279,7 +289,7 @@ in
     bootImage = "/boot/grub/grub_eltorito";
   } // pkgs.stdenv.lib.optionalAttrs config.isoImage.makeEfiBootable {
     efiBootable = true;
-    efiBootImage = "efi/boot/boot${targetArch}.efi";
+    efiBootImage = "boot/efi.img";
   });
 
   boot.postBootCommands =
-- 
GitLab


From 5a36c25e9f03d839ab281996d75ed39ede67cb53 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 16 Mar 2012 17:43:18 +0000
Subject: [PATCH 3469/5331] * nfsd and statd do not need to be stopped when
 portmap stops.

svn path=/nixos/trunk/; revision=33167
---
 .../services/network-filesystems/nfs-kernel.nix | 17 ++---------------
 modules/services/networking/portmap.nix         |  2 ++
 2 files changed, 4 insertions(+), 15 deletions(-)

diff --git a/modules/services/network-filesystems/nfs-kernel.nix b/modules/services/network-filesystems/nfs-kernel.nix
index 1b4fa927123..ba6b901b961 100644
--- a/modules/services/network-filesystems/nfs-kernel.nix
+++ b/modules/services/network-filesystems/nfs-kernel.nix
@@ -10,19 +10,6 @@ let
 
   exports = pkgs.writeText "exports" cfg.server.exports;
 
-/*
-  Description at http://nfs.sourceforge.net/nfs-howto/ar01s03.html :
-
-  "If your distribution does not include them in the startup scripts, then then
-  you should add them, configured to start in the following order:
-
-  rpc.portmap
-  rpc.mountd, rpc.nfsd
-  rpc.statd, rpc.lockd (if necessary), and
-  rpc.rquotad"
-*/
-
-
 in
 
 {
@@ -106,7 +93,7 @@ in
           { description = "Kernel NFS server";
 
             startOn = "started portmap";
-            stopOn = "stopped statd or stopping portmap";
+            stopOn = "stopped statd";
 
             preStart =
               ''
@@ -166,7 +153,7 @@ in
                 "started mountd and started nfsd"
               else
                 "started portmap";
-            stopOn = "stopping nfsd or stopping portmap";
+            stopOn = "stopping nfsd";
 
             preStart =
               ''
diff --git a/modules/services/networking/portmap.nix b/modules/services/networking/portmap.nix
index 0b03c6ccdb4..142e057c7de 100644
--- a/modules/services/networking/portmap.nix
+++ b/modules/services/networking/portmap.nix
@@ -51,6 +51,8 @@ in
 
   config = mkIf config.services.portmap.enable {
 
+    environment.systemPackages = [ portmap ];
+
     users.extraUsers = singleton
       { name = "portmap";
         inherit uid;
-- 
GitLab


From 823471a1001e29beac388283e4206d25d480d2ac Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 16 Mar 2012 19:49:47 +0000
Subject: [PATCH 3470/5331] * portmap: add a postStart action that ensures that
 portmap is   actually listening.  Otherwise we have a race condition during
 boot   where statd's start can be delayed, causing NFSv3 mounting to fail.

svn path=/nixos/trunk/; revision=33171
---
 modules/services/networking/portmap.nix | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/modules/services/networking/portmap.nix b/modules/services/networking/portmap.nix
index 142e057c7de..3d887b7729d 100644
--- a/modules/services/networking/portmap.nix
+++ b/modules/services/networking/portmap.nix
@@ -73,13 +73,22 @@ in
 
         daemonType = "fork";
 
+        path = [ portmap pkgs.netcat ];
+
         exec =
           ''
-            ${portmap}/sbin/portmap \
+            portmap \
               ${optionalString (config.services.portmap.chroot != "")
                 "-t '${config.services.portmap.chroot}'"} \
               ${if config.services.portmap.verbose then "-v" else ""}
           '';
+
+        postStart =
+          ''
+            # Portmap forks into the background before it starts
+            # listening, so wait until its ready.
+            while ! nc -z localhost 111; do sleep 1; done
+          '';
       };
 
   };
-- 
GitLab


From a395e46192e540186a779b58fee8c1e7c1461924 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 16 Mar 2012 20:10:14 +0000
Subject: [PATCH 3471/5331] * Fix the NFS Upstart dependencies.  Mountd is now
 started before   nfsd, as suggested by the nfs-utils README.

  Also, rather than relying on Upstart events (which have all sorts of
  problems, especially if you have jobs that have multiple
  dependencies), we know just let jobs start their on prerequisites.
  That is, nfsd starts mountd in its preStart script; mountd starts
  statd; statd starts portmap.  Likewise, mountall starts statd to
  ensure that it can mount NFS filesystems.  This means that doing
  something like "start nfsd" from the command line will Do The Right
  Thing and start the dependencies of nfsd.

svn path=/nixos/trunk/; revision=33172
---
 lib/test-driver/Machine.pm                    |  2 +
 .../network-filesystems/nfs-kernel.nix        | 91 ++++++++++---------
 modules/services/networking/portmap.nix       |  2 +-
 tests/nfs.nix                                 | 24 ++---
 4 files changed, 60 insertions(+), 59 deletions(-)

diff --git a/lib/test-driver/Machine.pm b/lib/test-driver/Machine.pm
index 734dba49dd4..249a6e8b2ab 100644
--- a/lib/test-driver/Machine.pm
+++ b/lib/test-driver/Machine.pm
@@ -413,6 +413,8 @@ sub shutdown {
 sub crash {
     my ($self) = @_;
     return unless $self->{booted};
+    
+    $self->log("forced crash");
 
     $self->sendMonitorCommand("quit");
 
diff --git a/modules/services/network-filesystems/nfs-kernel.nix b/modules/services/network-filesystems/nfs-kernel.nix
index ba6b901b961..ccf147e2f4f 100644
--- a/modules/services/network-filesystems/nfs-kernel.nix
+++ b/modules/services/network-filesystems/nfs-kernel.nix
@@ -74,44 +74,64 @@ in
 
   ###### implementation
 
-  config =
-  mkAssert
-    (cfg.client.enable || cfg.server.enable -> config.services.portmap.enable) "
-    Please enable portmap (services.portmap.enable) to use nfsd.
-  " {
+  config = {
 
-    services.portmap.enable = mkAlways (cfg.client.enable || cfg.server.enable);
+    services.portmap.enable = cfg.client.enable || cfg.server.enable;
+
+    environment.systemPackages = mkIf cfg.server.enable [ pkgs.nfsUtils ];
 
     environment.etc = mkIf cfg.server.enable (singleton
       { source = exports;
         target = "exports";
       });
 
+    boot.kernelModules = mkIf cfg.server.enable [ "nfsd" ];
+
     jobs =
       optionalAttrs cfg.server.enable
         { nfsd =
           { description = "Kernel NFS server";
 
-            startOn = "started portmap";
-            stopOn = "stopped statd";
+            startOn = "started networking";
+
+            path = [ pkgs.nfsUtils ];
 
             preStart =
               ''
-                export PATH=${pkgs.nfsUtils}/sbin:$PATH
-                mkdir -p /var/lib/nfs
-
+                start portmap || true
+                start mountd || true
+              
                 # Create a state directory required by NFSv4.
                 mkdir -p /var/lib/nfs/v4recovery
 
-                # exports file is ${exports}
-                # keep this comment so that this job is restarted whenever exports changes!
-                ${pkgs.nfsUtils}/sbin/exportfs -ra
-                
-                # rpc.nfsd needs the kernel support
-                ${config.system.sbin.modprobe}/sbin/modprobe nfsd || true
+                rpc.nfsd \
+                  ${if cfg.server.hostName != null then "-H ${cfg.server.hostName}" else ""} \
+                  ${builtins.toString cfg.server.nproc}
+              '';
+
+            postStop = "rpc.nfsd 0";
+
+            postStart =
+              ''
+                start statd || true
+              '';
+          };
+        }
+
+      // optionalAttrs cfg.server.enable
+        { mountd =
+          { description = "Kernel NFS server - mount daemon";
 
-                ${pkgs.sysvtools}/bin/mountpoint -q /proc/fs/nfsd \
-                || ${pkgs.utillinux}/bin/mount -t nfsd none /proc/fs/nfsd
+            path = [ pkgs.nfsUtils pkgs.sysvtools pkgs.utillinux ];
+
+            preStart =
+              ''
+                start portmap || true
+                
+                mkdir -p /var/lib/nfs
+                touch /var/lib/nfs/rmtab
+                
+                mountpoint -q /proc/fs/nfsd || mount -t nfsd none /proc/fs/nfsd
 
                 ${optionalString cfg.server.createMountPoints
                   ''
@@ -123,25 +143,14 @@ in
                   ''
                 }
 
-                ${pkgs.nfsUtils}/sbin/rpc.nfsd \
-                  ${if cfg.server.hostName != null then "-H ${cfg.server.hostName}" else ""} \
-                  ${builtins.toString cfg.server.nproc}
+                # exports file is ${exports}
+                # keep this comment so that this job is restarted whenever exports changes!
+                exportfs -ra
               '';
 
-            postStop = "${pkgs.nfsUtils}/sbin/rpc.nfsd 0";
-          };
-        }
-
-      // optionalAttrs cfg.server.enable
-        { mountd =
-          { description = "Kernel NFS server - mount daemon";
-
-            startOn = "started nfsd";
-            stopOn = "stopped statd";
-
             daemonType = "fork";
 
-            exec = "${pkgs.nfsUtils}/sbin/rpc.mountd -f /etc/exports";
+            exec = "rpc.mountd -f /etc/exports";
           };
         }
 
@@ -149,24 +158,22 @@ in
         { statd =
           { description = "Kernel NFS server - Network Status Monitor";
 
-            startOn = if cfg.server.enable then
-                "started mountd and started nfsd"
-              else
-                "started portmap";
-            stopOn = "stopping nfsd";
+            path = [ pkgs.nfsUtils pkgs.sysvtools pkgs.utillinux ];
+
+            stopOn = "never"; # needed during shutdown
 
             preStart =
               ''
+                start portmap || true
                 mkdir -p /var/lib/nfs
                 mkdir -p /var/lib/nfs/sm
                 mkdir -p /var/lib/nfs/sm.bak
+                sm-notify -d
               '';
 
             daemonType = "fork";
 
-            exec = "${pkgs.nfsUtils}/sbin/rpc.statd --no-notify";
-
-            postStart = "${pkgs.nfsUtils}/sbin/sm-notify -d";
+            exec = "rpc.statd --no-notify";
           };
         };
 
diff --git a/modules/services/networking/portmap.nix b/modules/services/networking/portmap.nix
index 3d887b7729d..a6d799ec377 100644
--- a/modules/services/networking/portmap.nix
+++ b/modules/services/networking/portmap.nix
@@ -71,7 +71,7 @@ in
         startOn = "started network-interfaces";
         stopOn = "never";
 
-        daemonType = "fork";
+        daemonType = "fork"; # needed during shutdown
 
         path = [ portmap pkgs.netcat ];
 
diff --git a/tests/nfs.nix b/tests/nfs.nix
index e8da5ce6770..413578ec8ff 100644
--- a/tests/nfs.nix
+++ b/tests/nfs.nix
@@ -8,7 +8,7 @@ let
         [ { mountPoint = "/data";
             device = "server:/data";
             fsType = "nfs";
-            options = "bootwait";
+            options = "bootwait,vers=3";
           }
         ];
     };
@@ -34,11 +34,9 @@ in
 
   testScript =
     ''
-      startAll;
+      $server->waitForJob("nfsd");
 
-      $server->waitForJob("nfs-kernel-nfsd");
-      $server->waitForJob("nfs-kernel-mountd");
-      $server->waitForJob("nfs-kernel-statd");
+      startAll;
 
       $client1->waitForJob("tty1"); # depends on filesystems
       $client1->succeed("echo bla > /data/foo");
@@ -48,15 +46,11 @@ in
       $client2->succeed("echo bla > /data/bar");
       $server->succeed("test -e /data/bar");
 
-      # Test whether restarting the ‘nfs-kernel-exports’ job works
-      # correctly.  In Upstart 0.6.7 this fails because the jobs that
-      # depend on ‘nfs-kernel-exports’ are stopped but not restarted.
-      $server->succeed("restart nfs-kernel-exports");
-      $client2->succeed("echo bla >> /data/bar");
+      # Test whether restarting ‘nfsd’ works correctly.
+      $server->succeed("stop nfsd; start nfsd");
+      $client2->succeed("echo bla >> /data/bar"); # will take 90 seconds due to the NFS grace period
 
-      # Test whether we can get a lock.  !!! This step takes about 90
-      # seconds because the NFS server waits that long after booting
-      # before accepting new locks.
+      # Test whether we can get a lock.
       $client2->succeed("time flock -n -s /data/lock true");
 
       # Test locking: client 1 acquires an exclusive lock, so client 2
@@ -78,9 +72,7 @@ in
       $client1->succeed("touch /data/xyzzy");
       $client1->fail("time flock -n -s /data/lock true");
 
-      # Test whether unmounting during shutdown happens quickly.  This
-      # requires portmap and statd to keep running during the
-      # shutdown.
+      # Test whether unmounting during shutdown happens quickly.
       my $t1 = time;
       $client1->shutdown;
       my $duration = time - $t1;
-- 
GitLab


From e963fe2b2c9357c1f70b5afbc97db0340ef54df7 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 16 Mar 2012 20:23:45 +0000
Subject: [PATCH 3472/5331] * Forgot to commit.

svn path=/nixos/trunk/; revision=33173
---
 modules/tasks/filesystems.nix | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/modules/tasks/filesystems.nix b/modules/tasks/filesystems.nix
index 0be837dd464..39ccaeee209 100644
--- a/modules/tasks/filesystems.nix
+++ b/modules/tasks/filesystems.nix
@@ -172,25 +172,24 @@ in
       };
 
     jobs.mountall =
-      { startOn = "started udev"
-          # !!! The `started nfs-kernel-statd' condition shouldn't be
-          # here.  The `nfs-kernel-statd' job should have a `starting
-          # mountall' condition.  However, that doesn't work if
-          # `mountall' is restarted due to an apparent bug in Upstart:
-          # `mountall' hangs forever in the `start/starting' state.
-          + optionalString config.services.nfsKernel.client.enable " and started nfs-kernel-statd";
+      { startOn = "started udev";
 
         task = true;
 
-        path = [ pkgs.utillinux ] ++ config.system.fsPackages;
+        path = [ pkgs.utillinux pkgs.mountall ] ++ config.system.fsPackages;
 
         script =
           ''
             # Ensure that this job is restarted when fstab changed:
             # ${fstab}
+            
+            ${optionalString config.services.nfsKernel.client.enable ''
+              start statd || true
+            ''}
+            
             exec > /dev/console 2>&1
             echo "mounting filesystems..."
-            ${pkgs.mountall}/sbin/mountall
+            exec mountall
           '';
       };
 
-- 
GitLab


From 67a90c6d6fe820d836f0910afb93420f78a7de5b Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 16 Mar 2012 20:41:49 +0000
Subject: [PATCH 3473/5331] * Renamed services.nfsKernel to services.nfs. 
 Unfortunately   rename.nix doesn't allow renaming sets of options... *
 Renamed nfs-kernel.nix to nfsd.nix * Move NFS client stuff from nfsd.nix to
 filesystems/nfs.nix.

svn path=/nixos/trunk/; revision=33174
---
 modules/module-list.nix                       |   2 +-
 .../network-filesystems/nfs-kernel.nix        | 182 ------------------
 modules/services/network-filesystems/nfsd.nix | 147 ++++++++++++++
 modules/tasks/filesystems.nix                 |  16 +-
 modules/tasks/filesystems/nfs.nix             |  42 +++-
 tests/check-filesystems.nix                   |  14 +-
 tests/nfs.nix                                 |   6 +-
 tests/trac.nix                                |  12 +-
 8 files changed, 208 insertions(+), 213 deletions(-)
 delete mode 100644 modules/services/network-filesystems/nfs-kernel.nix
 create mode 100644 modules/services/network-filesystems/nfsd.nix

diff --git a/modules/module-list.nix b/modules/module-list.nix
index 50f1bea7539..b2d94cff50d 100644
--- a/modules/module-list.nix
+++ b/modules/module-list.nix
@@ -105,7 +105,7 @@
   ./services/monitoring/zabbix-agent.nix
   ./services/monitoring/zabbix-server.nix
   ./services/network-filesystems/drbd.nix
-  ./services/network-filesystems/nfs-kernel.nix
+  ./services/network-filesystems/nfsd.nix
   ./services/network-filesystems/openafs-client/default.nix
   ./services/network-filesystems/samba.nix
   ./services/networking/amuled.nix
diff --git a/modules/services/network-filesystems/nfs-kernel.nix b/modules/services/network-filesystems/nfs-kernel.nix
deleted file mode 100644
index ccf147e2f4f..00000000000
--- a/modules/services/network-filesystems/nfs-kernel.nix
+++ /dev/null
@@ -1,182 +0,0 @@
-{ config, pkgs, ... }:
-
-with pkgs.lib;
-
-let
-
-  inherit (pkgs) writeText openssh;
-
-  cfg = config.services.nfsKernel;
-
-  exports = pkgs.writeText "exports" cfg.server.exports;
-
-in
-
-{
-
-  ###### interface
-
-  options = {
-
-    services.nfsKernel = {
-
-      client.enable = mkOption {
-        default = any (fs: fs.fsType == "nfs" || fs.fsType == "nfs4") config.fileSystems;
-        description = ''
-          Whether to enable the kernel's NFS client daemons.
-        '';
-      };
-
-      server = {
-        enable = mkOption {
-          default = false;
-          description = ''
-            Whether to enable the kernel's NFS server.
-          '';
-        };
-
-        exports = mkOption {
-          default = "";
-          description = ''
-            Contents of the /etc/exports file.  See
-            <citerefentry><refentrytitle>exports</refentrytitle>
-            <manvolnum>5</manvolnum></citerefentry> for the format.
-          '';
-        };
-
-        hostName = mkOption {
-          default = null;
-          description = ''
-            Hostname or address on which NFS requests will be accepted.
-            Default is all.  See the <option>-H</option> option in
-            <citerefentry><refentrytitle>nfsd</refentrytitle>
-            <manvolnum>8</manvolnum></citerefentry>.
-          '';
-        };
-
-        nproc = mkOption {
-          default = 8;
-          description = ''
-            Number of NFS server threads.  Defaults to the recommended value of 8.
-          '';
-        };
-
-        createMountPoints = mkOption {
-          default = false;
-          description = "Whether to create the mount points in the exports file at startup time.";
-        };
-      };
-
-    };
-
-  };
-
-
-  ###### implementation
-
-  config = {
-
-    services.portmap.enable = cfg.client.enable || cfg.server.enable;
-
-    environment.systemPackages = mkIf cfg.server.enable [ pkgs.nfsUtils ];
-
-    environment.etc = mkIf cfg.server.enable (singleton
-      { source = exports;
-        target = "exports";
-      });
-
-    boot.kernelModules = mkIf cfg.server.enable [ "nfsd" ];
-
-    jobs =
-      optionalAttrs cfg.server.enable
-        { nfsd =
-          { description = "Kernel NFS server";
-
-            startOn = "started networking";
-
-            path = [ pkgs.nfsUtils ];
-
-            preStart =
-              ''
-                start portmap || true
-                start mountd || true
-              
-                # Create a state directory required by NFSv4.
-                mkdir -p /var/lib/nfs/v4recovery
-
-                rpc.nfsd \
-                  ${if cfg.server.hostName != null then "-H ${cfg.server.hostName}" else ""} \
-                  ${builtins.toString cfg.server.nproc}
-              '';
-
-            postStop = "rpc.nfsd 0";
-
-            postStart =
-              ''
-                start statd || true
-              '';
-          };
-        }
-
-      // optionalAttrs cfg.server.enable
-        { mountd =
-          { description = "Kernel NFS server - mount daemon";
-
-            path = [ pkgs.nfsUtils pkgs.sysvtools pkgs.utillinux ];
-
-            preStart =
-              ''
-                start portmap || true
-                
-                mkdir -p /var/lib/nfs
-                touch /var/lib/nfs/rmtab
-                
-                mountpoint -q /proc/fs/nfsd || mount -t nfsd none /proc/fs/nfsd
-
-                ${optionalString cfg.server.createMountPoints
-                  ''
-                    # create export directories:
-                    # skip comments, take first col which may either be a quoted
-                    # "foo bar" or just foo (-> man export)
-                    sed '/^#.*/d;s/^"\([^"]*\)".*/\1/;t;s/[ ].*//' ${exports} \
-                    | xargs -d '\n' mkdir -p
-                  ''
-                }
-
-                # exports file is ${exports}
-                # keep this comment so that this job is restarted whenever exports changes!
-                exportfs -ra
-              '';
-
-            daemonType = "fork";
-
-            exec = "rpc.mountd -f /etc/exports";
-          };
-        }
-
-      // optionalAttrs (cfg.client.enable || cfg.server.enable)
-        { statd =
-          { description = "Kernel NFS server - Network Status Monitor";
-
-            path = [ pkgs.nfsUtils pkgs.sysvtools pkgs.utillinux ];
-
-            stopOn = "never"; # needed during shutdown
-
-            preStart =
-              ''
-                start portmap || true
-                mkdir -p /var/lib/nfs
-                mkdir -p /var/lib/nfs/sm
-                mkdir -p /var/lib/nfs/sm.bak
-                sm-notify -d
-              '';
-
-            daemonType = "fork";
-
-            exec = "rpc.statd --no-notify";
-          };
-        };
-
-  };
-
-}
diff --git a/modules/services/network-filesystems/nfsd.nix b/modules/services/network-filesystems/nfsd.nix
new file mode 100644
index 00000000000..f5366bcbc00
--- /dev/null
+++ b/modules/services/network-filesystems/nfsd.nix
@@ -0,0 +1,147 @@
+{ config, pkgs, ... }:
+
+with pkgs.lib;
+
+let
+
+  cfg = config.services.nfs.server;
+
+  exports = pkgs.writeText "exports" cfg.exports;
+
+in
+
+{
+
+  ###### interface
+
+  options = {
+
+    services.nfs = {
+
+      server = {
+        enable = mkOption {
+          default = false;
+          description = ''
+            Whether to enable the kernel's NFS server.
+          '';
+        };
+
+        exports = mkOption {
+          default = "";
+          description = ''
+            Contents of the /etc/exports file.  See
+            <citerefentry><refentrytitle>exports</refentrytitle>
+            <manvolnum>5</manvolnum></citerefentry> for the format.
+          '';
+        };
+
+        hostName = mkOption {
+          default = null;
+          description = ''
+            Hostname or address on which NFS requests will be accepted.
+            Default is all.  See the <option>-H</option> option in
+            <citerefentry><refentrytitle>nfsd</refentrytitle>
+            <manvolnum>8</manvolnum></citerefentry>.
+          '';
+        };
+
+        nproc = mkOption {
+          default = 8;
+          description = ''
+            Number of NFS server threads.  Defaults to the recommended value of 8.
+          '';
+        };
+
+        createMountPoints = mkOption {
+          default = false;
+          description = "Whether to create the mount points in the exports file at startup time.";
+        };
+      };
+
+    };
+
+  };
+
+
+  ###### implementation
+
+  config = mkIf cfg.enable {
+
+    services.portmap.enable = true;
+
+    services.nfs.client.enable = true; # needed for statd
+
+    environment.systemPackages = [ pkgs.nfsUtils ];
+
+    environment.etc = singleton
+      { source = exports;
+        target = "exports";
+      };
+
+    boot.kernelModules = [ "nfsd" ];
+
+    jobs.nfsd =
+      { description = "Kernel NFS server";
+
+        startOn = "started networking";
+
+        path = [ pkgs.nfsUtils ];
+
+        preStart =
+          ''
+            start portmap || true
+            start mountd || true
+
+            # Create a state directory required by NFSv4.
+            mkdir -p /var/lib/nfs/v4recovery
+
+            rpc.nfsd \
+              ${if cfg.hostName != null then "-H ${cfg.hostName}" else ""} \
+              ${builtins.toString cfg.nproc}
+          '';
+
+        postStop = "rpc.nfsd 0";
+
+        postStart =
+          ''
+            start statd || true
+          '';
+      };
+
+    jobs.mountd =
+      { description = "Kernel NFS server - mount daemon";
+
+        path = [ pkgs.nfsUtils pkgs.sysvtools pkgs.utillinux ];
+
+        preStart =
+          ''
+            start portmap || true
+
+            mkdir -p /var/lib/nfs
+            touch /var/lib/nfs/rmtab
+
+            mountpoint -q /proc/fs/nfsd || mount -t nfsd none /proc/fs/nfsd
+
+            ${optionalString cfg.createMountPoints
+              ''
+                # create export directories:
+                # skip comments, take first col which may either be a quoted
+                # "foo bar" or just foo (-> man export)
+                sed '/^#.*/d;s/^"\([^"]*\)".*/\1/;t;s/[ ].*//' ${exports} \
+                | xargs -d '\n' mkdir -p
+              ''
+            }
+
+            # exports file is ${exports}
+            # keep this comment so that this job is restarted whenever exports changes!
+            exportfs -ra
+          '';
+
+        daemonType = "fork";
+
+        exec = "rpc.mountd -f /etc/exports";
+      };
+
+  };
+
+}
diff --git a/modules/tasks/filesystems.nix b/modules/tasks/filesystems.nix
index 39ccaeee209..529c25e1774 100644
--- a/modules/tasks/filesystems.nix
+++ b/modules/tasks/filesystems.nix
@@ -183,7 +183,7 @@ in
             # Ensure that this job is restarted when fstab changed:
             # ${fstab}
             
-            ${optionalString config.services.nfsKernel.client.enable ''
+            ${optionalString config.services.nfs.client.enable ''
               start statd || true
             ''}
             
@@ -196,9 +196,8 @@ in
     # The `mount-failed' event is emitted synchronously, but we don't
     # want `mountall' to wait for the emergency shell.  So use this
     # intermediate job to make the event asynchronous.
-    jobs.mount_failed =
-      { name = "mount-failed";
-        task = true;
+    jobs."mount-failed" =
+      { task = true;
         startOn = "mount-failed";
         script =
           ''
@@ -210,9 +209,8 @@ in
 
     # On an `ip-up' event, notify mountall so that it retries mounting
     # remote filesystems.
-    jobs.mountall_ip_up =
+    jobs."mountall-ip-up" =
       {
-        name = "mountall-ip-up";
         task = true;
         startOn = "ip-up";
         script =
@@ -221,10 +219,8 @@ in
           '';
       };
 
-    jobs.emergency_shell =
-      { name = "emergency-shell";
-
-        task = true;
+    jobs."emergency-shell" =
+      { task = true;
 
         extraConfig = "console owner";
 
diff --git a/modules/tasks/filesystems/nfs.nix b/modules/tasks/filesystems/nfs.nix
index 546b6368721..c41eb02f398 100644
--- a/modules/tasks/filesystems/nfs.nix
+++ b/modules/tasks/filesystems/nfs.nix
@@ -9,8 +9,27 @@ let
 in
 
 {
-  config = {
 
+  ###### interface
+
+  options = {
+
+    services.nfs.client.enable = mkOption {
+      default = any (fs: fs.fsType == "nfs" || fs.fsType == "nfs4") config.fileSystems;
+      description = ''
+        Whether to enable support for mounting NFS filesystems.
+      '';
+    };
+
+  };
+
+
+  ###### implementation
+
+  config = mkIf config.services.nfs.client.enable {
+
+    services.portmap.enable = true;
+    
     system.fsPackages = [ pkgs.nfsUtils ];
 
     boot.initrd.kernelModules = mkIf inInitrd [ "nfs" ];
@@ -21,5 +40,26 @@ in
         cp -v ${pkgs.klibc}/lib/klibc/bin.static/nfsmount $out/bin
       '';
 
+    jobs.statd =
+      { description = "Kernel NFS server - Network Status Monitor";
+
+        path = [ pkgs.nfsUtils pkgs.sysvtools pkgs.utillinux ];
+
+        stopOn = "never"; # needed during shutdown
+
+        preStart =
+          ''
+            start portmap || true
+            mkdir -p /var/lib/nfs
+            mkdir -p /var/lib/nfs/sm
+            mkdir -p /var/lib/nfs/sm.bak
+            sm-notify -d
+          '';
+
+        daemonType = "fork";
+
+        exec = "rpc.statd --no-notify";
+      };
+
   };
 }
diff --git a/tests/check-filesystems.nix b/tests/check-filesystems.nix
index ba2bf352ec8..ed4b365b901 100644
--- a/tests/check-filesystems.nix
+++ b/tests/check-filesystems.nix
@@ -8,14 +8,12 @@ with import ../lib/build-vms.nix { inherit nixos nixpkgs system; };
 rec {
   nodes = {
     share = {pkgs, config, ...}: {
-      services.portmap.enable = true;
-      services.nfsKernel.client.enable = true;
-      services.nfsKernel.server.enable = true;
-      services.nfsKernel.server.exports = ''
+      services.nfs.server.enable = true;
+      services.nfs.server.exports = ''
         /repos1 192.168.1.0/255.255.255.0(rw,no_root_squash)
         /repos2 192.168.1.0/255.255.255.0(rw,no_root_squash)
       '';
-      services.nfsKernel.server.createMountPoints = true;
+      services.nfs.server.createMountPoints = true;
 
       jobs.checkable = {
         startOn = [
@@ -27,22 +25,20 @@ rec {
     };
 
     fsCheck = {pkgs, config, ...}: {
-      # enable nfs import
-      services.portmap.enable = true;
-      services.nfsKernel.client.enable = true;
-
       fileSystems =
         let
           repos1 = {
             mountPoint = "/repos1";
             autocreate = true;
             device = "share:/repos1";
+            fsType = "nfs";
           };
 
           repos2 = {
             mountPoint = "/repos2";
             autocreate = true;
             device = "share:/repos2";
+            fsType = "nfs";
           };
         in pkgs.lib.mkOverrideTemplate 50 {} [
           repos1
diff --git a/tests/nfs.nix b/tests/nfs.nix
index 413578ec8ff..7c1ff5e9212 100644
--- a/tests/nfs.nix
+++ b/tests/nfs.nix
@@ -23,12 +23,12 @@ in
 
       server =
         { config, pkgs, ... }:
-        { services.nfsKernel.server.enable = true;
-          services.nfsKernel.server.exports =
+        { services.nfs.server.enable = true;
+          services.nfs.server.exports =
             ''
               /data 192.168.1.0/255.255.255.0(rw,no_root_squash)
             '';
-          services.nfsKernel.server.createMountPoints = true;
+          services.nfs.server.createMountPoints = true;
         };
     };
 
diff --git a/tests/trac.nix b/tests/trac.nix
index e13c0f15752..254996c2440 100644
--- a/tests/trac.nix
+++ b/tests/trac.nix
@@ -5,12 +5,11 @@
     storage =
       {pkgs, config, ...}:
       {
-        services.portmap.enable = true;
-        services.nfsKernel.server.enable = true;
-        services.nfsKernel.server.exports = ''
+        services.nfs.server.enable = true;
+        services.nfs.server.exports = ''
           /repos 192.168.1.0/255.255.255.0(rw,no_root_squash)
         '';
-        services.nfsKernel.server.createMountPoints = true;
+        services.nfs.server.createMountPoints = true;
       };
 
     postgresql =
@@ -35,11 +34,10 @@
           [ { mountPoint = "/repos";
               device = "storage:/repos";
 	      fsType = "nfs";
-	      options = "bootwait"; }
+	      options = "bootwait";
+            }
           ];
 
-        services.portmap.enable = true;
-        services.nfsKernel.client.enable = true;
         services.httpd.enable = true;
         services.httpd.adminAddr = "root@localhost";
         services.httpd.extraSubservices = [ { serviceType = "trac"; } ];
-- 
GitLab


From 646d67465c264ef490372a512c79f0bf29b27394 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 16 Mar 2012 21:24:51 +0000
Subject: [PATCH 3474/5331] * Upstart stupidly doesn't kill post-start scripts
 if we do "stop   JOB", but it does kill the job's main process.  So if the
 post-start   script if waiting for the job's main process to reach some
 state, it   may hang forever.  Thus, the post-start script should monitor  
 whether its job has been requested to stop and exit in that case.

svn path=/nixos/trunk/; revision=33176
---
 modules/services/networking/portmap.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/modules/services/networking/portmap.nix b/modules/services/networking/portmap.nix
index a6d799ec377..cde4bb6a955 100644
--- a/modules/services/networking/portmap.nix
+++ b/modules/services/networking/portmap.nix
@@ -87,7 +87,10 @@ in
           ''
             # Portmap forks into the background before it starts
             # listening, so wait until its ready.
-            while ! nc -z localhost 111; do sleep 1; done
+            while ! nc -z localhost 111; do
+                if [[ "$(status)" =~ stop/ ]]; then exit; fi
+                sleep 1
+            done
           '';
       };
 
-- 
GitLab


From 573877c1ac82c9a58181c7f8b777b86f599153e5 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sat, 17 Mar 2012 17:26:17 +0000
Subject: [PATCH 3475/5331] * Use boot.kernelModules everywhere instead of
 explicit calls to   modprobe. * Move the implementation of boot.kernelModules
 from the udev job to   the activation script.  This prevents races with the
 udev job. * Drop references to the "capability" kernel module, which no
 longer   exists.

svn path=/nixos/trunk/; revision=33208
---
 modules/config/power-management.nix      |  2 +-
 modules/hardware/cpu/intel-microcode.nix | 23 +++++++++--------------
 modules/services/audio/alsa.nix          | 11 ++---------
 modules/services/hardware/udev.nix       | 11 +----------
 modules/services/misc/autofs.nix         | 15 +++------------
 modules/services/networking/ddclient.nix |  9 ++-------
 modules/services/networking/dhclient.nix |  9 +++------
 modules/services/networking/ntpd.nix     |  8 +-------
 modules/services/networking/portmap.nix  |  2 +-
 modules/services/networking/privoxy.nix  |  8 ++------
 modules/services/printing/cupsd.nix      |  2 --
 modules/services/security/tor.nix        |  6 +-----
 modules/services/system/cgroups.nix      |  8 ++++----
 modules/services/system/uptimed.nix      |  9 +--------
 modules/system/boot/modprobe.nix         |  5 +++++
 15 files changed, 36 insertions(+), 92 deletions(-)

diff --git a/modules/config/power-management.nix b/modules/config/power-management.nix
index ad54a5fa748..c8e1a62749b 100644
--- a/modules/config/power-management.nix
+++ b/modules/config/power-management.nix
@@ -88,7 +88,7 @@ in
 
     boot.kernelModules =
       [ "acpi_cpufreq" "cpufreq_performance" "cpufreq_powersave" "cpufreq_ondemand"
-        "p4_clockmod" "cpufreq_conservative"
+        "cpufreq_conservative"
       ];
 
     powerManagement.cpuFreqGovernor = mkDefault "ondemand";
diff --git a/modules/hardware/cpu/intel-microcode.nix b/modules/hardware/cpu/intel-microcode.nix
index 894676194a5..b8e97b4ca4a 100644
--- a/modules/hardware/cpu/intel-microcode.nix
+++ b/modules/hardware/cpu/intel-microcode.nix
@@ -1,4 +1,6 @@
-{pkgs, config, ...}:
+{ config, pkgs, ... }:
+
+with pkgs.lib;
 
 {
 
@@ -6,11 +8,11 @@
 
   options = {
 
-    hardware.cpu.intel.updateMicrocode = pkgs.lib.mkOption {
+    hardware.cpu.intel.updateMicrocode = mkOption {
       default = false;
-      type = pkgs.lib.types.bool;
+      type = types.bool;
       description = ''
-        Update the CPU microcode for intel processors.
+        Update the CPU microcode for Intel processors.
       '';
     };
 
@@ -19,16 +21,9 @@
 
   ###### implementation
 
-  config = pkgs.lib.mkIf config.hardware.cpu.intel.updateMicrocode {
-    hardware.firmware = [pkgs.microcodeIntel];
-    jobs.microcode = {
-      name = "microcode";
-      description = "load microcode";
-      startOn = "started udev";
-      exec = "modprobe microcode";
-      path = [config.system.sbin.modprobe];
-      task = true;
-    };
+  config = mkIf config.hardware.cpu.intel.updateMicrocode {
+    hardware.firmware = [ pkgs.microcodeIntel ];
+    boot.kernelModules = [ "microcode" ];
   };
 
 }
diff --git a/modules/services/audio/alsa.nix b/modules/services/audio/alsa.nix
index 7f313c36cb9..7d4cc100fd2 100644
--- a/modules/services/audio/alsa.nix
+++ b/modules/services/audio/alsa.nix
@@ -45,6 +45,8 @@ in
 
     environment.systemPackages = [ alsaUtils ];
 
+    boot.kernelModules = optional config.sound.enableOSSEmulation "snd_pcm_oss";
+
     jobs.alsa =
       { startOn = "stopped udevtrigger";
 
@@ -52,15 +54,6 @@ in
           ''
             mkdir -m 0755 -p $(dirname ${soundState})
 
-            # Load some additional modules.
-	    ${optionalString config.sound.enableOSSEmulation
-	      ''
-                for mod in snd_pcm_oss; do
-                  ${config.system.sbin.modprobe}/sbin/modprobe $mod || true
-                done
-	      ''
-	    }
-
             # Restore the sound state.
             ${alsaUtils}/sbin/alsactl -f ${soundState} restore || true
           '';
diff --git a/modules/services/hardware/udev.nix b/modules/services/hardware/udev.nix
index 9a38c501411..c4c348c7c25 100644
--- a/modules/services/hardware/udev.nix
+++ b/modules/services/hardware/udev.nix
@@ -14,8 +14,6 @@ let
     destination = "/etc/udev/rules.d/10-local.rules";
   };
 
-  modprobe = config.system.sbin.modprobe;
-
   nixosRules = ''
 
     # Miscellaneous devices.
@@ -54,7 +52,7 @@ let
       # Fix some paths in the standard udev rules.  Hacky.
       for i in $out/*.rules; do
         substituteInPlace $i \
-          --replace \"/sbin/modprobe \"${modprobe}/sbin/modprobe \
+          --replace \"/sbin/modprobe \"${config.system.sbin.modprobe}/sbin/modprobe \
           --replace \"/sbin/mdadm \"${pkgs.mdadm}/sbin/mdadm \
           --replace \"/sbin/blkid \"${pkgs.utillinux}/sbin/blkid \
           --replace \"/bin/mount \"${pkgs.utillinux}/bin/mount
@@ -232,13 +230,6 @@ in
             mkdir -p /var/lib/udev/rules.d
             touch /var/lib/udev/rules.d/70-persistent-cd.rules /var/lib/udev/rules.d/70-persistent-net.rules
 
-            # Do the loading of additional stage 2 kernel modules.
-            # Maybe this isn't the best place...
-            for i in ${toString config.boot.kernelModules}; do
-                echo "Loading kernel module $i..."
-                ${modprobe}/sbin/modprobe $i || true
-            done
-
             mkdir -p /dev/.udev # !!! bug in udev?
           '';
 
diff --git a/modules/services/misc/autofs.nix b/modules/services/misc/autofs.nix
index e55c213ed21..50491c556e8 100644
--- a/modules/services/misc/autofs.nix
+++ b/modules/services/misc/autofs.nix
@@ -50,11 +50,6 @@ in
         ";
       };
 
-      kernelModules = mkOption {
-        default = ["fuse"];
-        description="kernel modules to load";
-      };
-
       timeout = mkOption {
         default = 600;
         description = "Set the global minimum timeout, in seconds, until directories are unmounted";
@@ -81,19 +76,15 @@ in
         source = pkgs.writeText "auto.master" cfg.autoMaster;
       };
 
+    boot.kernelModules = [ "autofs4" ];
+
     jobs.autofs =
       { description = "Filesystem automounter";
 
         startOn = "started network-interfaces";
         stopOn = "stopping network-interfaces";
 
-        environment =
-          { PATH = "${pkgs.nfsUtils}/sbin:${config.system.sbin.modprobe}/sbin:${pkgs.sshfsFuse}/sbin:${pkgs.sshfsFuse}/bin:$PATH";
-          };
-
-        preStart =
-          pkgs.lib.concatMapStrings (module : "modprobe ${module} || true\n")
-                                    (["autofs4"] ++ cfg.kernelModules);
+        path = [ pkgs.nfsUtils pkgs.sshfsFuse ];
 
         preStop =
           ''
diff --git a/modules/services/networking/ddclient.nix b/modules/services/networking/ddclient.nix
index a0523919ef4..62709a040a1 100644
--- a/modules/services/networking/ddclient.nix
+++ b/modules/services/networking/ddclient.nix
@@ -10,8 +10,6 @@ let
 
   ddclientUser = "ddclient";
 
-  modprobe = config.system.sbin.modprobe;
-
   ddclientFlags = "-foreground -file ${ddclientCfg}";
 
   ddclientCfg = pkgs.writeText "ddclient.conf" ''
@@ -89,8 +87,7 @@ in
 
       web = mkOption {
         default = "web, web=checkip.dyndns.com/, web-skip='IP Address'" ;
-        description = ''
-        '';
+        description = "";
       };
 
     };
@@ -101,6 +98,7 @@ in
   ###### implementation
 
   config = mkIf config.services.ddclient.enable {
+  
     environment.systemPackages = [ ddclient ];
 
     users.extraUsers = singleton
@@ -119,9 +117,6 @@ in
           ''
             mkdir -m 0755 -p ${stateDir}
             chown ${ddclientUser} ${stateDir}
-
-            # Needed to run ddclient as an unprivileged user.
-            ${modprobe}/sbin/modprobe capability || true
           '';
 
         exec = "${ddclient}/bin/ddclient ${ddclientFlags}";
diff --git a/modules/services/networking/dhclient.nix b/modules/services/networking/dhclient.nix
index 2bc0b333a6f..1e343443899 100644
--- a/modules/services/networking/dhclient.nix
+++ b/modules/services/networking/dhclient.nix
@@ -44,18 +44,15 @@ in
 
   config = mkIf config.networking.useDHCP {
 
+    # dhclient barfs if /proc/net/if_inet6 doesn't exist.
+    boot.kernelModules = [ "ipv6" ];
+
     jobs.dhclient =
       { startOn = "started network-interfaces";
         stopOn = "stopping network-interfaces";
 
         path = [ dhcp ];
 
-        preStart =
-          ''
-            # dhclient barfs if /proc/net/if_inet6 doesn't exist.
-            ${config.system.sbin.modprobe}/sbin/modprobe ipv6 || true
-          '';
-
         script =
           ''
             # Determine the interface on which to start dhclient.
diff --git a/modules/services/networking/ntpd.nix b/modules/services/networking/ntpd.nix
index d44aedc6e15..7d1db8df066 100644
--- a/modules/services/networking/ntpd.nix
+++ b/modules/services/networking/ntpd.nix
@@ -10,16 +10,12 @@ let
 
   ntpUser = "ntp";
 
-  servers = config.services.ntp.servers;
-
-  modprobe = config.system.sbin.modprobe;
-
   configFile = pkgs.writeText "ntp.conf" ''
     # Keep the drift file in ${stateDir}/ntp.drift.  However, since we
     # chroot to ${stateDir}, we have to specify it as /ntp.drift.
     driftfile /ntp.drift
 
-    ${toString (map (server: "server " + server + " iburst\n") servers)}
+    ${toString (map (server: "server " + server + " iburst\n") config.services.ntp.servers)}
   '';
 
   ntpFlags = "-c ${configFile} -u ${ntpUser}:nogroup -i ${stateDir}";
@@ -69,8 +65,6 @@ in
         home = stateDir;
       };
 
-    boot.kernelModules = [ "capability" ];
-
     jobs.ntpd =
       { description = "NTP daemon";
 
diff --git a/modules/services/networking/portmap.nix b/modules/services/networking/portmap.nix
index cde4bb6a955..82712a86692 100644
--- a/modules/services/networking/portmap.nix
+++ b/modules/services/networking/portmap.nix
@@ -68,7 +68,7 @@ in
     jobs.portmap =
       { description = "ONC RPC portmap";
 
-        startOn = "started network-interfaces";
+        startOn = "startup";
         stopOn = "never";
 
         daemonType = "fork"; # needed during shutdown
diff --git a/modules/services/networking/privoxy.nix b/modules/services/networking/privoxy.nix
index 443328f67b0..89c40c53157 100644
--- a/modules/services/networking/privoxy.nix
+++ b/modules/services/networking/privoxy.nix
@@ -10,8 +10,6 @@ let
 
   privoxyUser = "privoxy";
 
-  modprobe = config.system.sbin.modprobe;
-
   privoxyFlags = "--no-daemon --user ${privoxyUser} ${privoxyCfg}";
 
   privoxyCfg = pkgs.writeText "privoxy.conf" ''
@@ -68,12 +66,13 @@ in
   ###### implementation
 
   config = mkIf config.services.privoxy.enable {
+  
     environment.systemPackages = [ privoxy ];
 
     users.extraUsers = singleton
       { name = privoxyUser;
         uid = config.ids.uids.privoxy;
-        description = "privoxy daemon user";
+        description = "Privoxy daemon user";
         home = stateDir;
       };
 
@@ -86,9 +85,6 @@ in
           ''
             mkdir -m 0755 -p ${stateDir}
             chown ${privoxyUser} ${stateDir}
-
-            # Needed to run privoxy as an unprivileged user.
-            ${modprobe}/sbin/modprobe capability || true
           '';
 
         exec = "${privoxy}/sbin/privoxy ${privoxyFlags}";
diff --git a/modules/services/printing/cupsd.nix b/modules/services/printing/cupsd.nix
index 848537b9f0d..50556a352ba 100644
--- a/modules/services/printing/cupsd.nix
+++ b/modules/services/printing/cupsd.nix
@@ -8,8 +8,6 @@ let
 
   logDir = "/var/log/cups";
 
-  modprobe = config.system.sbin.modprobe;
-
   cfg = config.services.printing;
 
   additionalBackends = pkgs.stdenv.mkDerivation {
diff --git a/modules/services/security/tor.nix b/modules/services/security/tor.nix
index 6582ba70253..6df4590b85b 100644
--- a/modules/services/security/tor.nix
+++ b/modules/services/security/tor.nix
@@ -9,14 +9,13 @@ let
   stateDir = "/var/lib/tor";
   privoxyDir = stateDir+"/privoxy";
 
-  modprobe = config.system.sbin.modprobe;
-
   cfg = config.services.tor;
 
   torUser = "tor";
 
   opt = name: value: if value != "" then "${name} ${value}" else "";
   optint = name: value: if value != 0 then "${name} ${toString value}" else "";
+
 in
 
 {
@@ -251,9 +250,6 @@ in
                      preStart = ''
                        mkdir -m 0755 -p ${privoxyDir}
                        chown ${torUser} ${privoxyDir}
-
-                       # Needed to run privoxy as an unprivileged user?
-                       ${modprobe}/sbin/modprobe capability || true
                      '';
                      exec = "${privoxy}/sbin/privoxy --no-daemon --user ${torUser} ${pkgs.writeText "torPrivoxy.conf" cfg.client.privoxy.config}";
     }; };
diff --git a/modules/services/system/cgroups.nix b/modules/services/system/cgroups.nix
index 08482643c3f..199d12268ce 100644
--- a/modules/services/system/cgroups.nix
+++ b/modules/services/system/cgroups.nix
@@ -96,6 +96,10 @@ in
         }
       ];
 
+    # The daemon requires the userspace<->kernelspace netlink
+    # connector.
+    boot.kernelModules = [ "cn" ];
+    
     jobs.cgroups =
       { startOn = "startup";
 
@@ -105,10 +109,6 @@ in
       
         preStart =
           ''
-            # The daemon requires the userspace<->kernelspace netlink
-            # connector.
-            ${config.system.sbin.modprobe}/sbin/modprobe cn || true
-          
             cgclear || true
 
             # Mount the cgroup hierarchies.  Note: we refer to the
diff --git a/modules/services/system/uptimed.nix b/modules/services/system/uptimed.nix
index 51874cfc0e5..61eecd5c9ba 100644
--- a/modules/services/system/uptimed.nix
+++ b/modules/services/system/uptimed.nix
@@ -10,10 +10,6 @@ let
 
   uptimedUser = "uptimed";
 
-  modprobe = config.system.sbin.modprobe;
-
-  uptimedFlags = "";
-
 in
 
 {
@@ -59,15 +55,12 @@ in
             mkdir -m 0755 -p ${stateDir}
             chown ${uptimedUser} ${stateDir}
 
-            # Needed to run uptimed as an unprivileged user.
-            ${modprobe}/sbin/modprobe capability || true
-
             if ! test -f ${stateDir}/bootid ; then
               ${uptimed}/sbin/uptimed -b
             fi
           '';
 
-        exec = "${uptimed}/sbin/uptimed ${uptimedFlags}";
+        exec = "${uptimed}/sbin/uptimed";
       };
 
   };
diff --git a/modules/system/boot/modprobe.nix b/modules/system/boot/modprobe.nix
index ef3ed3bed94..4dd866a4395 100644
--- a/modules/system/boot/modprobe.nix
+++ b/modules/system/boot/modprobe.nix
@@ -100,6 +100,11 @@ with pkgs.lib;
         # We need this when the kernel (or some module) auto-loads a
         # module.
         echo ${config.system.sbin.modprobe}/sbin/modprobe > /proc/sys/kernel/modprobe
+
+        # Do the loading of additional stage 2 kernel modules.
+        for i in ${toString config.boot.kernelModules}; do
+            ${config.system.sbin.modprobe}/sbin/modprobe $i || true
+        done
       '';
 
   };
-- 
GitLab


From dd693fdc5eed8809e1a24477a561f67ae6716b5f Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sat, 17 Mar 2012 17:31:08 +0000
Subject: [PATCH 3476/5331] * Revert unintended commit.

svn path=/nixos/trunk/; revision=33209
---
 modules/services/networking/portmap.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/services/networking/portmap.nix b/modules/services/networking/portmap.nix
index 82712a86692..cde4bb6a955 100644
--- a/modules/services/networking/portmap.nix
+++ b/modules/services/networking/portmap.nix
@@ -68,7 +68,7 @@ in
     jobs.portmap =
       { description = "ONC RPC portmap";
 
-        startOn = "startup";
+        startOn = "started network-interfaces";
         stopOn = "never";
 
         daemonType = "fork"; # needed during shutdown
-- 
GitLab


From 53847ef6650ff9982a1cf736a633121582854c9e Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sat, 17 Mar 2012 18:00:20 +0000
Subject: [PATCH 3477/5331] * Don't use the non-existent "never" condition in
 stopOn.

svn path=/nixos/trunk/; revision=33212
---
 modules/services/networking/portmap.nix  | 2 +-
 modules/tasks/filesystems/nfs.nix        | 2 +-
 modules/testing/test-instrumentation.nix | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/modules/services/networking/portmap.nix b/modules/services/networking/portmap.nix
index cde4bb6a955..e0164b162f5 100644
--- a/modules/services/networking/portmap.nix
+++ b/modules/services/networking/portmap.nix
@@ -69,7 +69,7 @@ in
       { description = "ONC RPC portmap";
 
         startOn = "started network-interfaces";
-        stopOn = "never";
+        stopOn = "";
 
         daemonType = "fork"; # needed during shutdown
 
diff --git a/modules/tasks/filesystems/nfs.nix b/modules/tasks/filesystems/nfs.nix
index c41eb02f398..2a57ce6ba9f 100644
--- a/modules/tasks/filesystems/nfs.nix
+++ b/modules/tasks/filesystems/nfs.nix
@@ -45,7 +45,7 @@ in
 
         path = [ pkgs.nfsUtils pkgs.sysvtools pkgs.utillinux ];
 
-        stopOn = "never"; # needed during shutdown
+        stopOn = ""; # needed during shutdown
 
         preStart =
           ''
diff --git a/modules/testing/test-instrumentation.nix b/modules/testing/test-instrumentation.nix
index 26ea31802fe..122ba84254c 100644
--- a/modules/testing/test-instrumentation.nix
+++ b/modules/testing/test-instrumentation.nix
@@ -29,7 +29,7 @@ in
 
     jobs.backdoor =
       { startOn = "startup";
-        stopOn = "never";
+        stopOn = "";
 
         script =
           ''
-- 
GitLab


From 07df536c42fb718b42839253a954533eb80fe203 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sat, 17 Mar 2012 18:01:42 +0000
Subject: [PATCH 3478/5331] * Fix comment.

svn path=/nixos/trunk/; revision=33213
---
 modules/services/networking/portmap.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/services/networking/portmap.nix b/modules/services/networking/portmap.nix
index e0164b162f5..4dc2277a902 100644
--- a/modules/services/networking/portmap.nix
+++ b/modules/services/networking/portmap.nix
@@ -69,9 +69,9 @@ in
       { description = "ONC RPC portmap";
 
         startOn = "started network-interfaces";
-        stopOn = "";
+        stopOn = ""; # needed during shutdown
 
-        daemonType = "fork"; # needed during shutdown
+        daemonType = "fork";
 
         path = [ portmap pkgs.netcat ];
 
-- 
GitLab


From ee6c9bb998e439c3e9abcfef8cf42e6ef87b28a6 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sat, 17 Mar 2012 19:12:33 +0000
Subject: [PATCH 3479/5331] * Provide two utility functions in Upstart jobs:
 "ensure JOBNAME"   starts the given job and waits until it's running;
 "stop_check"   checks that the current job hasn't been asked to stop.

svn path=/nixos/trunk/; revision=33214
---
 modules/services/network-filesystems/nfsd.nix |  8 ++--
 modules/services/networking/portmap.nix       |  2 +-
 modules/system/upstart/upstart.nix            | 45 +++++++++++++++++++
 modules/tasks/filesystems.nix                 |  2 +-
 modules/tasks/filesystems/nfs.nix             |  2 +-
 5 files changed, 52 insertions(+), 7 deletions(-)

diff --git a/modules/services/network-filesystems/nfsd.nix b/modules/services/network-filesystems/nfsd.nix
index f5366bcbc00..fe939d34d3f 100644
--- a/modules/services/network-filesystems/nfsd.nix
+++ b/modules/services/network-filesystems/nfsd.nix
@@ -89,8 +89,8 @@ in
 
         preStart =
           ''
-            start portmap || true
-            start mountd || true
+            ensure portmap
+            ensure mountd
 
             # Create a state directory required by NFSv4.
             mkdir -p /var/lib/nfs/v4recovery
@@ -104,7 +104,7 @@ in
 
         postStart =
           ''
-            start statd || true
+            ensure statd
           '';
       };
 
@@ -115,7 +115,7 @@ in
 
         preStart =
           ''
-            start portmap || true
+            ensure portmap
 
             mkdir -p /var/lib/nfs
             touch /var/lib/nfs/rmtab
diff --git a/modules/services/networking/portmap.nix b/modules/services/networking/portmap.nix
index 4dc2277a902..474491a4c4b 100644
--- a/modules/services/networking/portmap.nix
+++ b/modules/services/networking/portmap.nix
@@ -88,7 +88,7 @@ in
             # Portmap forks into the background before it starts
             # listening, so wait until its ready.
             while ! nc -z localhost 111; do
-                if [[ "$(status)" =~ stop/ ]]; then exit; fi
+                stop_check                
                 sleep 1
             done
           '';
diff --git a/modules/system/upstart/upstart.nix b/modules/system/upstart/upstart.nix
index dd846c2d534..a9ed1d02000 100644
--- a/modules/system/upstart/upstart.nix
+++ b/modules/system/upstart/upstart.nix
@@ -45,6 +45,7 @@ let
           ${optionalString (job.preStart != "") ''
             pre-start script
               exec >> ${log} 2>&1
+              source ${jobHelpers}
               ${job.preStart}
             end script
           ''}
@@ -55,6 +56,7 @@ let
               ''
                 script
                   exec >> ${log} 2>&1
+                  source ${jobHelpers}
                   ${job.script}
                 end script
               ''
@@ -71,6 +73,7 @@ let
           ${optionalString (job.postStart != "") ''
             post-start script
               exec >> ${log} 2>&1
+              source ${jobHelpers}
               ${job.postStart}
             end script
           ''}
@@ -83,6 +86,7 @@ let
             optionalString (job.preStop != "") (assert hasMain; ''
             pre-stop script
               exec >> ${log} 2>&1
+              source ${jobHelpers}
               ${job.preStop}
             end script
           '')}
@@ -90,6 +94,7 @@ let
           ${optionalString (job.postStop != "") ''
             post-stop script
               exec >> ${log} 2>&1
+              source ${jobHelpers}
               ${job.postStop}
             end script
           ''}
@@ -122,6 +127,46 @@ let
         '';
 
 
+  # Shell functions for use in Upstart jobs.
+  jobHelpers = pkgs.writeText "job-helpers.sh"
+    ''
+      # Ensure that an Upstart service is running.
+      ensure() {
+          local job="$1"
+          local status="$(status "$job")"
+
+          # If it's already running, we're happy.
+          [[ "$status" =~ start/running ]] && return 0
+
+          # If its current goal is to stop, start it.
+          [[ "$status" =~ stop/ ]] && { status="$(start "$job")" || true; }
+
+          # The "start" command is synchronous *if* the job is
+          # not already starting.  So if somebody else started
+          # the job in parallel, the "start" above may return
+          # while the job is still starting.  So wait until it
+          # is up or has failed.
+          while true; do
+              [[ "$status" =~ stop/ ]] && { echo "job $job failed to start"; return 1; }
+              [[ "$status" =~ start/running ]] && return 0
+              echo "waiting for job $job to start..."
+              sleep 1
+              status="$(status "$job")"
+          done
+      }
+
+      # Check whether the current job has been stopped.  Used in
+      # post-start jobs to determine if they should continue.
+      stop_check() {
+          if [[ "$(status)" =~ stop/ ]]; then
+              echo "job asked to stop!"
+              return 1
+          fi
+          return 0
+      }
+    '';
+        
+
   jobOptions = {
 
     name = mkOption {
diff --git a/modules/tasks/filesystems.nix b/modules/tasks/filesystems.nix
index 529c25e1774..12219b463ca 100644
--- a/modules/tasks/filesystems.nix
+++ b/modules/tasks/filesystems.nix
@@ -184,7 +184,7 @@ in
             # ${fstab}
             
             ${optionalString config.services.nfs.client.enable ''
-              start statd || true
+              ensure statd || true
             ''}
             
             exec > /dev/console 2>&1
diff --git a/modules/tasks/filesystems/nfs.nix b/modules/tasks/filesystems/nfs.nix
index 2a57ce6ba9f..2426a52ee51 100644
--- a/modules/tasks/filesystems/nfs.nix
+++ b/modules/tasks/filesystems/nfs.nix
@@ -49,7 +49,7 @@ in
 
         preStart =
           ''
-            start portmap || true
+            ensure portmap
             mkdir -p /var/lib/nfs
             mkdir -p /var/lib/nfs/sm
             mkdir -p /var/lib/nfs/sm.bak
-- 
GitLab


From ed436179e1e87f985630aafbc6a59a83e611fd28 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sat, 17 Mar 2012 19:22:22 +0000
Subject: [PATCH 3480/5331] * Improve some job names.

svn path=/nixos/trunk/; revision=33215
---
 modules/services/x11/xserver.nix             | 7 +++----
 modules/tasks/scsi-link-power-management.nix | 2 +-
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/modules/services/x11/xserver.nix b/modules/services/x11/xserver.nix
index c918d813e29..da29faabcfd 100644
--- a/modules/services/x11/xserver.nix
+++ b/modules/services/x11/xserver.nix
@@ -384,16 +384,15 @@ in
     environment.pathsToLink =
       [ "/etc/xdg" "/share/xdg" "/share/applications" "/share/icons" "/share/pixmaps" ];
 
-    jobs.check_for_xserver_start =
+    jobs."xserver-start-check" =
       { startOn = if cfg.autorun then "filesystem and stopped udevtrigger" else "";
         stopOn = "";
         task = true;
-        script = "grep -qv noX11 /proc/cmdline && initctl emit start_xserver || true";
+        script = "grep -qv noX11 /proc/cmdline && start xserver || true";
       };
 
     jobs.xserver =
-      { startOn = "start_xserver";
-        environment =
+      { environment =
           { FONTCONFIG_FILE = "/etc/fonts/fonts.conf"; # !!! cleanup
             XKB_BINDIR = "${xorg.xkbcomp}/bin"; # Needed for the Xkb extension.
             TZ = config.time.timeZone;
diff --git a/modules/tasks/scsi-link-power-management.nix b/modules/tasks/scsi-link-power-management.nix
index 13b9eca53cb..263acb8f321 100644
--- a/modules/tasks/scsi-link-power-management.nix
+++ b/modules/tasks/scsi-link-power-management.nix
@@ -24,7 +24,7 @@ with pkgs.lib;
 
   config = mkIf (config.powerManagement.scsiLinkPolicy != "") {
 
-    jobs.scsilinkpmpolicy =
+    jobs."scsi-link-pm" =
       { description = "Set SCSI link power management policy";
 
         startOn = "started udev";
-- 
GitLab


From 876c655e61536c4e68703d990c0aa3809764680c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Sat, 17 Mar 2012 22:21:37 +0000
Subject: [PATCH 3481/5331] Adding a module to get crash dumps using kexec.

svn path=/nixos/trunk/; revision=33219
---
 modules/misc/crashdump.nix | 64 ++++++++++++++++++++++++++++++++++++++
 modules/module-list.nix    |  1 +
 2 files changed, 65 insertions(+)
 create mode 100644 modules/misc/crashdump.nix

diff --git a/modules/misc/crashdump.nix b/modules/misc/crashdump.nix
new file mode 100644
index 00000000000..790e75a4019
--- /dev/null
+++ b/modules/misc/crashdump.nix
@@ -0,0 +1,64 @@
+{pkgs, config, ...}:
+
+with pkgs.lib;
+
+let
+  crashdump = config.boot.crashDump;
+in
+###### interface
+{
+  options = {
+    boot = {
+      crashDump = {
+        enable = mkOption {
+          default = false;
+          example = true;
+          description = ''
+            If enabled, NixOS will set up a kernel that will
+            boot on crash, and leave the user to a stage1 debug1devices
+            interactive shell to be able to save the crashed kernel dump.
+            It also activates the NMI watchdog.
+          '';
+        };
+        kernelPackages = mkOption {
+          default = pkgs.linuxPackages;
+          # We don't want to evaluate all of linuxPackages for the manual
+          # - some of it might not even evaluate correctly.
+          defaultText = "pkgs.linuxPackages";
+          example = "pkgs.linuxPackages_2_6_25";
+          description = ''
+            This will override the boot.kernelPackages, and will add some
+            kernel configuration parameters for the crash dump to work.
+          '';
+        };
+      };
+    };
+  };
+
+###### implementation
+
+  config = mkIf crashdump.enable {
+    boot = {
+      postBootCommands = ''
+        ${pkgs.kexectools}/sbin/kexec -p /var/run/current-system/kernel \
+        --initrd=/var/run/current-system/initrd \
+        --append="init=$(readlink -f /var/run/current-system/init) system=$(readlink -f /var/run/current-system) debug1devices irqpoll maxcpus=1 reset_devices" --reset-vga --console-vga
+      '';
+      kernelParams = [
+       "crashkernel=64M"
+       "nmi_watchdog=1"
+      ];
+      kernelPackages = mkOverride 200 (crashdump.kernelPackages // {
+        kernel = crashdump.kernelPackages.kernel.override 
+          (attrs: {
+            extraConfig = (optionalString (attrs ? extraConfig) attrs.extraConfig) +
+              ''
+                CRASH_DUMP y
+                DEBUG_INFO y
+                PROC_VMCORE y
+              '';
+          });
+      });
+    };
+  };
+}
diff --git a/modules/module-list.nix b/modules/module-list.nix
index b2d94cff50d..5eadfe0185c 100644
--- a/modules/module-list.nix
+++ b/modules/module-list.nix
@@ -30,6 +30,7 @@
   ./installer/tools/tools.nix
   ./misc/assertions.nix
   ./misc/check-config.nix
+  ./misc/crashdump.nix
   ./misc/deployment.nix
   ./misc/ids.nix
   ./misc/locate.nix
-- 
GitLab


From 5a98d6d51444e9213d8780c59a4e48e806c72641 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sun, 18 Mar 2012 01:44:20 +0000
Subject: [PATCH 3482/5331] * mountall: Don't start the emergency shell if the
 X server is   running.  The user won't see it, and the "console owner" stanza
   breaks VT switching and causes the X server to go to 100% CPU time.

svn path=/nixos/trunk/; revision=33221
---
 modules/tasks/filesystems.nix | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/modules/tasks/filesystems.nix b/modules/tasks/filesystems.nix
index 12219b463ca..b60dd8c27c4 100644
--- a/modules/tasks/filesystems.nix
+++ b/modules/tasks/filesystems.nix
@@ -201,7 +201,15 @@ in
         startOn = "mount-failed";
         script =
           ''
-            [ -n "$MOUNTPOINT" ] || exit 0
+            # Don't start the emergency shell if the X server is
+            # running.  The user won't see it, and the "console owner"
+            # stanza breaks VT switching and causes the X server to go
+            # to 100% CPU time.
+            status="$(status xserver || true)"
+            [[ "$status" =~ start/ ]] && exit 0
+
+            stop tty1 || true
+            
             start --no-wait emergency-shell \
               DEVICE="$DEVICE" MOUNTPOINT="$MOUNTPOINT"
           '';
@@ -226,8 +234,6 @@ in
 
         script =
           ''
-            [ -n "$MOUNTPOINT" ] || exit 0
-
             exec < /dev/console > /dev/console 2>&1
 
             cat <<EOF
-- 
GitLab


From 3495a773f947105b88f375b525e3045b518443f9 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sun, 18 Mar 2012 01:53:35 +0000
Subject: [PATCH 3483/5331] * Improved Upstart job handling in
 switch-to-configuration.  It no   longer compares the current configuration
 to the previous   configuration, but instead compares the current Upstart
 state to the   intended state.  Thus, if the switch script is interrupted,
 running   nixos-rebuild again will resume starting/stopping Upstart jobs
 where   the previous run left off.

  We determine if an Upstart job has changed by having the pre-start
  script of each Upstart job put a symlink to its .conf file in
  /var/run/upstart-jobs.  So if this symlink differs from the target
  of /etc/init/<job>.conf, then the job has changed.  This also
  prevents multiple restarts of dependent jobs.  E.g., if job B has
  "start on started A" and "stop on stopping A", then restarting A
  will cause B to be restarted, so B shouldn't B restarted a second
  time.

  We only start jobs that are not running if 1) they're tasks that
  have been previously run (like mountall); or 2) they're jobs that
  have a "start on" condition.  This seems a reasonable heuristic.

svn path=/nixos/trunk/; revision=33222
---
 .../system/activation/activation-script.nix   |   5 +
 .../activation/switch-to-configuration.sh     | 140 ++++++++++--------
 modules/system/upstart/upstart.nix            |  11 +-
 3 files changed, 91 insertions(+), 65 deletions(-)

diff --git a/modules/system/activation/activation-script.nix b/modules/system/activation/activation-script.nix
index 9f10e84f5e9..924d6f680fc 100644
--- a/modules/system/activation/activation-script.nix
+++ b/modules/system/activation/activation-script.nix
@@ -109,6 +109,11 @@ in
         mkdir -m 0755 -p /var/run/nix/current-load # for distributed builds
         mkdir -m 0700 -p /var/run/nix/remote-stores
 
+        # Directory holding symlinks to currently running Upstart
+        # jobs.  Used to determine which jobs need to be restarted
+        # when switching to a new configuration.
+        mkdir -m 0700 -p /var/run/upstart-jobs
+        
         mkdir -m 0755 -p /var/log
         mkdir -m 0755 -p /var/log/upstart
 
diff --git a/modules/system/activation/switch-to-configuration.sh b/modules/system/activation/switch-to-configuration.sh
index c09fa89083b..07b24d23727 100644
--- a/modules/system/activation/switch-to-configuration.sh
+++ b/modules/system/activation/switch-to-configuration.sh
@@ -62,75 +62,95 @@ if [ "$action" = "switch" -o "$action" = "boot" ]; then
 fi
 
 # Activate the new configuration.
-if [ "$action" = "switch" -o "$action" = "test" ]; then
+if [ "$action" != switch -a "$action" != test ]; then exit 0; fi
 
-    oldVersion=$(cat /var/run/current-system/upstart-interface-version 2> /dev/null || echo 0)
-    newVersion=$(cat @out@/upstart-interface-version 2> /dev/null || echo 0)
+oldVersion=$(cat /var/run/current-system/upstart-interface-version 2> /dev/null || echo 0)
+newVersion=$(cat @out@/upstart-interface-version 2> /dev/null || echo 0)
 
-    if test "$oldVersion" -ne "$newVersion"; then
+if test "$oldVersion" -ne "$newVersion"; then
         cat <<EOF
 Warning: the new NixOS configuration has an Upstart version that is
 incompatible with the current version.  The new configuration won't
 take effect until you reboot the system.
 EOF
         exit 1
-    fi
+fi
 
-    oldJobs=$(readlink -f /etc/static/init)
-    newJobs=$(readlink -f @out@/etc/init)
+newJobs=$(readlink -f @out@/etc/init)
 
-    stopJob() {
-        local job=$1
+# Stop all currently running jobs that are not in the new Upstart
+# configuration.  (Here "running" means all jobs that are not in the
+# stop/waiting state.)
+for job in $(initctl list | sed -e '/ stop\/waiting/ d; /^[^a-z]/ d; s/^\([^ ]\+\).*/\1/' | sort); do
+    if ! [ -e "$newJobs/$job.conf" ] ; then
+        echo "stopping obsolete job ‘$job’..."
         initctl stop "$job" || true
-    }
-
-    # Stop all services that are not in the new Upstart
-    # configuration.
-    for job in $(cd $oldJobs && ls *.conf); do
-        job=$(basename $job .conf)
-        if ! test -e "$newJobs/$job.conf"; then
-            echo "stopping $job..."
-            stopJob $job
-        fi
-    done
-
-    # Activate the new configuration (i.e., update /etc, make
-    # accounts, and so on).
-    echo "activating the configuration..."
-    @out@/activate @out@
-
-    # Make Upstart reload its jobs.
-    initctl reload-configuration
-
-    # Start all new services and restart all changed services.
-    for job in $(cd $newJobs && ls *.conf); do
-
-        job=$(basename $job .conf)
-        
-        # Hack: skip the shutdown and control-alt-delete jobs.
-        # Another hack: don't restart the X server (that would kill all the clients).
-        # And don't restart dbus, since that causes ConsoleKit to
-        # forget about current sessions.
-        # Idem for the emergeny-shell, because its `console owner'
-        # line screws up the X server.
-        # Idem for xendomains because we don't want to save/restore
-	# Xen domains unless we have to.
-        # TODO: Jobs should be able to declare that they should not be
-	# auto-restarted.
-        if echo "$job" | grep -q "^shutdown$\|^control-alt-delete$\|^xserver$\|^dbus$\|^disnix$\|^emergency-shell$\|^xendomains$\|^udevtrigger$\|^drbd-down$"; then continue; fi
-
-        if ! test -e "$oldJobs/$job.conf"; then
-            echo "starting $job..."
-            initctl start "$job" || true
-        elif test "$(readlink "$oldJobs/$job.conf")" != "$(readlink "$newJobs/$job.conf")"; then
-            echo "restarting $job..."
-            stopJob $job
-            initctl start "$job" || true
-        fi
-    done
-
-    # Signal dbus to reload its configuration.
-    dbusPid=$(initctl status dbus 2> /dev/null | sed -e 's/.*process \([0-9]\+\)/\1/;t;d')
-    [ -n "$dbusPid" ] && kill -HUP "$dbusPid"
+    fi
+done
+
+# Activate the new configuration (i.e., update /etc, make accounts,
+# and so on).
+echo "activating the configuration..."
+@out@/activate @out@
+
+# Make Upstart reload its jobs.
+initctl reload-configuration
+
+# Allow Upstart jobs to react intelligently to a config change.
+initctl emit config-changed
+
+# Restart all running jobs that have changed.  (Here "running" means
+# all jobs that don't have a "stop" goal.)  We use the symlinks in
+# /var/run/upstart-jobs (created by each job's pre-start script) to
+# determine if a job has changed.
+for job in $(cd $newJobs && ls *.conf); do
+    job=$(basename $job .conf)
+    status=$(status "$job")
+    if ! [[ "$status" =~ start/ ]]; then continue; fi
+    if [ "$(readlink -f "$newJobs/$job.conf")" = "$(readlink -f "/var/run/upstart-jobs/$job")" ]; then continue; fi
+    # Hack: don't restart the X server (that would kill all the clients).
+    # And don't restart dbus, since that causes ConsoleKit to
+    # forget about current sessions.
+    # Idem for xendomains because we don't want to save/restore
+    # Xen domains unless we have to.
+    # TODO: Jobs should be able to declare that they should not be
+    # auto-restarted.
+    if echo "$job" | grep -q "^xserver$\|^dbus$\|^disnix$\|^xendomains$\|^udevtrigger$"; then
+        echo "not restarting changed service ‘$job’"
+        continue
+    fi
+    echo "restarting changed service ‘$job’..."
+    # Note: can't use "restart" here, since that only restarts the
+    # job's main process.
+    stop "$job" || true
+    start "$job" || true
+done
+
+# Start all jobs that are not running but should be.  The "should be"
+# criterion is tricky: the intended semantics is that we end up with
+# the same jobs as after a reboot.  If it's a task, restart it if it
+# differs from the previous instance of the same task; if it wasn't
+# previously run, don't run it.  If it's a service, only start it if
+# it has a "start on" condition.
+for job in $(cd $newJobs && ls *.conf); do
+    job=$(basename $job .conf)
+    status=$(status "$job")
+    if ! [[ "$status" =~ stop/ ]]; then continue; fi
+
+    if grep -q '^task$' "$newJobs/$job.conf"; then
+        if [ ! -e "/var/run/upstart-jobs/$job" -o \
+            "$(readlink -f "$newJobs/$job.conf")" = "$(readlink -f "/var/run/upstart-jobs/$job")" ];
+        then continue; fi
+        echo "starting task ‘$job’..."
+        start "$job" || true
+    else
+        if ! grep -q "^start on" "$newJobs/$job.conf"; then continue; fi
+        echo "starting service ‘$job’..."
+        start "$job" || true
+    fi
     
-fi
+done
+
+# Signal dbus to reload its configuration.
+dbusPid=$(initctl status dbus 2> /dev/null | sed -e 's/.*process \([0-9]\+\)/\1/;t;d')
+[ -n "$dbusPid" ] && kill -HUP "$dbusPid"
diff --git a/modules/system/upstart/upstart.nix b/modules/system/upstart/upstart.nix
index a9ed1d02000..c7203d5672b 100644
--- a/modules/system/upstart/upstart.nix
+++ b/modules/system/upstart/upstart.nix
@@ -42,13 +42,14 @@ let
 
           ${concatMapStrings (n: "env ${n}=\"${getAttr n env}\"\n") (attrNames env)}
 
-          ${optionalString (job.preStart != "") ''
-            pre-start script
-              exec >> ${log} 2>&1
+          pre-start script
+            exec >> ${log} 2>&1
+            ln -sfn "$(readlink -f "/etc/init/${job.name}.conf")" /var/run/upstart-jobs/${job.name}
+            ${optionalString (job.preStart != "") ''
               source ${jobHelpers}
               ${job.preStart}
-            end script
-          ''}
+            ''}
+          end script
 
           ${if job.script != "" && job.exec != "" then
               abort "Job ${job.name} has both a `script' and `exec' attribute."
-- 
GitLab


From 86d8d62d16edb4c66072eda6fc31fcaba02cacd2 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sun, 18 Mar 2012 02:10:39 +0000
Subject: [PATCH 3484/5331] * Allow Upstart jobs to declare that they shouldn't
 be restarted by   switch-to-configuration.  E.g. the X server shouldn't be
 restarted   because that kills all the X clients.

svn path=/nixos/trunk/; revision=33223
---
 modules/services/misc/disnix.nix                     |  2 ++
 modules/services/system/dbus.nix                     |  4 +++-
 modules/services/x11/xserver.nix                     |  4 +++-
 modules/system/activation/switch-to-configuration.sh |  9 +--------
 modules/system/upstart/upstart.nix                   | 11 +++++++++++
 modules/virtualisation/xen-dom0.nix                  |  2 ++
 6 files changed, 22 insertions(+), 10 deletions(-)

diff --git a/modules/services/misc/disnix.nix b/modules/services/misc/disnix.nix
index 10c507808f5..c03a6036132 100644
--- a/modules/services/misc/disnix.nix
+++ b/modules/services/misc/disnix.nix
@@ -126,6 +126,8 @@ in
           + optionalString config.services.tomcat.enable " and started tomcat"
           + optionalString config.services.svnserve.enable " and started svnserve";
 
+          restartIfChanged = false;
+        
           script =
           ''
             export PATH=/var/run/current-system/sw/bin:/var/run/current-system/sw/sbin
diff --git a/modules/services/system/dbus.nix b/modules/services/system/dbus.nix
index a9d7a3d8420..b01cd7bc2ff 100644
--- a/modules/services/system/dbus.nix
+++ b/modules/services/system/dbus.nix
@@ -117,7 +117,9 @@ in
 
     jobs.dbus =
       { startOn = "started udev and started syslogd";
-
+      
+        restartIfChanged = false;
+        
         path = [ pkgs.dbus_daemon pkgs.dbus_tools ];
 
         preStart =
diff --git a/modules/services/x11/xserver.nix b/modules/services/x11/xserver.nix
index da29faabcfd..3664264cbc3 100644
--- a/modules/services/x11/xserver.nix
+++ b/modules/services/x11/xserver.nix
@@ -392,7 +392,9 @@ in
       };
 
     jobs.xserver =
-      { environment =
+      { restartIfChanged = false;
+
+        environment =
           { FONTCONFIG_FILE = "/etc/fonts/fonts.conf"; # !!! cleanup
             XKB_BINDIR = "${xorg.xkbcomp}/bin"; # Needed for the Xkb extension.
             TZ = config.time.timeZone;
diff --git a/modules/system/activation/switch-to-configuration.sh b/modules/system/activation/switch-to-configuration.sh
index 07b24d23727..abd06c1e9b3 100644
--- a/modules/system/activation/switch-to-configuration.sh
+++ b/modules/system/activation/switch-to-configuration.sh
@@ -108,14 +108,7 @@ for job in $(cd $newJobs && ls *.conf); do
     status=$(status "$job")
     if ! [[ "$status" =~ start/ ]]; then continue; fi
     if [ "$(readlink -f "$newJobs/$job.conf")" = "$(readlink -f "/var/run/upstart-jobs/$job")" ]; then continue; fi
-    # Hack: don't restart the X server (that would kill all the clients).
-    # And don't restart dbus, since that causes ConsoleKit to
-    # forget about current sessions.
-    # Idem for xendomains because we don't want to save/restore
-    # Xen domains unless we have to.
-    # TODO: Jobs should be able to declare that they should not be
-    # auto-restarted.
-    if echo "$job" | grep -q "^xserver$\|^dbus$\|^disnix$\|^xendomains$\|^udevtrigger$"; then
+    if ! grep -q "^# RESTART-IF-CHANGED" "$newJobs/$job.conf"; then
         echo "not restarting changed service ‘$job’"
         continue
     fi
diff --git a/modules/system/upstart/upstart.nix b/modules/system/upstart/upstart.nix
index c7203d5672b..d73a19653a7 100644
--- a/modules/system/upstart/upstart.nix
+++ b/modules/system/upstart/upstart.nix
@@ -82,6 +82,8 @@ let
           ${optionalString job.task "task"}
           ${optionalString (!job.task && job.respawn) "respawn"}
 
+          ${optionalString job.restartIfChanged "# RESTART-IF-CHANGED"}
+
           ${ # preStop is run only if there is exec or script.
              # (upstart 0.6.5, job.c:562)
             optionalString (job.preStop != "") (assert hasMain; ''
@@ -283,6 +285,15 @@ let
       '';
     };
 
+    restartIfChanged = mkOption {
+      type = types.bool;
+      default = true;
+      description = ''
+        Whether the job should be restarted if it has changed after a
+        NixOS configuration switch.
+      '';
+    };
+
     task = mkOption {
       type = types.bool;
       default = false;
diff --git a/modules/virtualisation/xen-dom0.nix b/modules/virtualisation/xen-dom0.nix
index 8c2f6c738c1..77bf5ea8b7e 100644
--- a/modules/virtualisation/xen-dom0.nix
+++ b/modules/virtualisation/xen-dom0.nix
@@ -140,6 +140,8 @@ in
 
         stopOn = "starting shutdown and stopping xend";
 
+        restartIfChanged = false;
+        
         path = [ pkgs.xen ];
 
         environment.XENDOM_CONFIG = "${xen}/etc/sysconfig/xendomains";
-- 
GitLab


From 83f5d26a85618e0abb740481a0f8346e43dfd3a7 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sun, 18 Mar 2012 02:36:21 +0000
Subject: [PATCH 3485/5331] * Ignore the "No soundcards found" error.

svn path=/nixos/trunk/; revision=33224
---
 modules/services/audio/alsa.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/services/audio/alsa.nix b/modules/services/audio/alsa.nix
index 7d4cc100fd2..d16a6794832 100644
--- a/modules/services/audio/alsa.nix
+++ b/modules/services/audio/alsa.nix
@@ -55,13 +55,13 @@ in
             mkdir -m 0755 -p $(dirname ${soundState})
 
             # Restore the sound state.
-            ${alsaUtils}/sbin/alsactl -f ${soundState} restore || true
+            ${alsaUtils}/sbin/alsactl --ignore -f ${soundState} restore
           '';
 
         postStop =
           ''
             # Save the sound state.
-            ${alsaUtils}/sbin/alsactl -f ${soundState} store
+            ${alsaUtils}/sbin/alsactl --ignore -f ${soundState} store
           '';
       };
 
-- 
GitLab


From 21393eed1e79e7a969af12984c33cb6525b05b5e Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sun, 18 Mar 2012 02:36:44 +0000
Subject: [PATCH 3486/5331] * Use the --quiet flag.

svn path=/nixos/trunk/; revision=33225
---
 modules/system/activation/switch-to-configuration.sh | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/modules/system/activation/switch-to-configuration.sh b/modules/system/activation/switch-to-configuration.sh
index abd06c1e9b3..eda1eb288fc 100644
--- a/modules/system/activation/switch-to-configuration.sh
+++ b/modules/system/activation/switch-to-configuration.sh
@@ -84,7 +84,7 @@ newJobs=$(readlink -f @out@/etc/init)
 for job in $(initctl list | sed -e '/ stop\/waiting/ d; /^[^a-z]/ d; s/^\([^ ]\+\).*/\1/' | sort); do
     if ! [ -e "$newJobs/$job.conf" ] ; then
         echo "stopping obsolete job ‘$job’..."
-        initctl stop "$job" || true
+        stop --quiet "$job" || true
     fi
 done
 
@@ -115,8 +115,8 @@ for job in $(cd $newJobs && ls *.conf); do
     echo "restarting changed service ‘$job’..."
     # Note: can't use "restart" here, since that only restarts the
     # job's main process.
-    stop "$job" || true
-    start "$job" || true
+    stop --quiet "$job" || true
+    start --quiet "$job" || true
 done
 
 # Start all jobs that are not running but should be.  The "should be"
@@ -135,11 +135,11 @@ for job in $(cd $newJobs && ls *.conf); do
             "$(readlink -f "$newJobs/$job.conf")" = "$(readlink -f "/var/run/upstart-jobs/$job")" ];
         then continue; fi
         echo "starting task ‘$job’..."
-        start "$job" || true
+        start --quiet "$job" || true
     else
         if ! grep -q "^start on" "$newJobs/$job.conf"; then continue; fi
         echo "starting service ‘$job’..."
-        start "$job" || true
+        start --quiet "$job" || true
     fi
     
 done
-- 
GitLab


From c5a8d53d95d92743298ef1ffb9482c449981a2e1 Mon Sep 17 00:00:00 2001
From: Mathijs Kwik <mathijs@bluescreen303.nl>
Date: Sun, 18 Mar 2012 08:10:32 +0000
Subject: [PATCH 3487/5331] fixed intel microcode loading during boot

svn path=/nixos/trunk/; revision=33226
---
 modules/hardware/cpu/intel-microcode.nix | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/modules/hardware/cpu/intel-microcode.nix b/modules/hardware/cpu/intel-microcode.nix
index b8e97b4ca4a..fa7a6edc737 100644
--- a/modules/hardware/cpu/intel-microcode.nix
+++ b/modules/hardware/cpu/intel-microcode.nix
@@ -23,7 +23,17 @@ with pkgs.lib;
 
   config = mkIf config.hardware.cpu.intel.updateMicrocode {
     hardware.firmware = [ pkgs.microcodeIntel ];
-    boot.kernelModules = [ "microcode" ];
+
+    # This cannot be done using boot.kernelModules
+    # discussion at http://lists.science.uu.nl/pipermail/nix-dev/2012-February/007959.html
+    jobs.microcode = {
+      name = "microcode";
+      description = "load microcode";
+      startOn = "started udev";
+      exec = "modprobe microcode";
+      path = [config.system.sbin.modprobe];
+      task = true;
+    };
   };
 
 }
-- 
GitLab


From b78ac9e1087c261dc3d4d8796c331245e3067175 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Sun, 18 Mar 2012 10:02:58 +0000
Subject: [PATCH 3488/5331] Fixing the mkOverride for the kernelPackages in
 crashdump (I misunderstood mkOverride in the prev commit).

Adding an option on kernelParams for the postcrash kernel.


svn path=/nixos/trunk/; revision=33230
---
 modules/misc/crashdump.nix | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/modules/misc/crashdump.nix b/modules/misc/crashdump.nix
index 790e75a4019..fff459c9ab4 100644
--- a/modules/misc/crashdump.nix
+++ b/modules/misc/crashdump.nix
@@ -4,6 +4,8 @@ with pkgs.lib;
 
 let
   crashdump = config.boot.crashDump;
+
+  kernelParams = concatStringsSep " " crashdump.kernelParams;
 in
 ###### interface
 {
@@ -31,6 +33,12 @@ in
             kernel configuration parameters for the crash dump to work.
           '';
         };
+        kernelParams = mkOption {
+          default = [ "debug1devices" ];
+          description = ''
+            Parameters that will be passed to the kernel kexec-ed on crash.
+          '';
+        };
       };
     };
   };
@@ -42,13 +50,13 @@ in
       postBootCommands = ''
         ${pkgs.kexectools}/sbin/kexec -p /var/run/current-system/kernel \
         --initrd=/var/run/current-system/initrd \
-        --append="init=$(readlink -f /var/run/current-system/init) system=$(readlink -f /var/run/current-system) debug1devices irqpoll maxcpus=1 reset_devices" --reset-vga --console-vga
+        --append="init=$(readlink -f /var/run/current-system/init) system=$(readlink -f /var/run/current-system) irqpoll maxcpus=1 reset_devices ${kernelParams}" --reset-vga --console-vga
       '';
       kernelParams = [
        "crashkernel=64M"
        "nmi_watchdog=1"
       ];
-      kernelPackages = mkOverride 200 (crashdump.kernelPackages // {
+      kernelPackages = mkOverride 50 (crashdump.kernelPackages // {
         kernel = crashdump.kernelPackages.kernel.override 
           (attrs: {
             extraConfig = (optionalString (attrs ? extraConfig) attrs.extraConfig) +
-- 
GitLab


From 2cc8d0363e9b45bc33cf130cffccc51ecef88f1e Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sun, 18 Mar 2012 14:03:42 +0000
Subject: [PATCH 3489/5331] * Move the implementation of boot.kernelModules to
 udev's postStart.   It needs udevd to be running because the modules may
 require   firmware.  Thanks to Mathijs and Arie for pointing this out.

svn path=/nixos/trunk/; revision=33234
---
 modules/hardware/cpu/intel-microcode.nix | 12 +-----------
 modules/services/hardware/udev.nix       | 11 +++++++++++
 modules/system/boot/modprobe.nix         |  5 -----
 3 files changed, 12 insertions(+), 16 deletions(-)

diff --git a/modules/hardware/cpu/intel-microcode.nix b/modules/hardware/cpu/intel-microcode.nix
index fa7a6edc737..b8e97b4ca4a 100644
--- a/modules/hardware/cpu/intel-microcode.nix
+++ b/modules/hardware/cpu/intel-microcode.nix
@@ -23,17 +23,7 @@ with pkgs.lib;
 
   config = mkIf config.hardware.cpu.intel.updateMicrocode {
     hardware.firmware = [ pkgs.microcodeIntel ];
-
-    # This cannot be done using boot.kernelModules
-    # discussion at http://lists.science.uu.nl/pipermail/nix-dev/2012-February/007959.html
-    jobs.microcode = {
-      name = "microcode";
-      description = "load microcode";
-      startOn = "started udev";
-      exec = "modprobe microcode";
-      path = [config.system.sbin.modprobe];
-      task = true;
-    };
+    boot.kernelModules = [ "microcode" ];
   };
 
 }
diff --git a/modules/services/hardware/udev.nix b/modules/services/hardware/udev.nix
index c4c348c7c25..0802d4f7dbc 100644
--- a/modules/services/hardware/udev.nix
+++ b/modules/services/hardware/udev.nix
@@ -236,6 +236,17 @@ in
         daemonType = "fork";
 
         exec = "udevd --daemon";
+
+        postStart =
+          ''
+            # Do the loading of additional stage 2 kernel modules.
+            # This needs to be done while udevd is running, because
+            # the modules may call upon udev's firmware loading rule.
+            for i in ${toString config.boot.kernelModules}; do
+                echo "loading kernel module ‘$i’..."
+                ${config.system.sbin.modprobe}/sbin/modprobe $i || true
+            done
+          '';
       };
 
     jobs.udevtrigger =
diff --git a/modules/system/boot/modprobe.nix b/modules/system/boot/modprobe.nix
index 4dd866a4395..ef3ed3bed94 100644
--- a/modules/system/boot/modprobe.nix
+++ b/modules/system/boot/modprobe.nix
@@ -100,11 +100,6 @@ with pkgs.lib;
         # We need this when the kernel (or some module) auto-loads a
         # module.
         echo ${config.system.sbin.modprobe}/sbin/modprobe > /proc/sys/kernel/modprobe
-
-        # Do the loading of additional stage 2 kernel modules.
-        for i in ${toString config.boot.kernelModules}; do
-            ${config.system.sbin.modprobe}/sbin/modprobe $i || true
-        done
       '';
 
   };
-- 
GitLab


From b82c253b247152b0a722c403ff5a37bf68a455d1 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Sun, 18 Mar 2012 17:14:52 +0000
Subject: [PATCH 3490/5331] Add a kernel patch for the efi boot stub to read a
 config file when booted without arguments, and base removable media booting
 off of that patch

The patch is currently being discussed on LKML and hopefully will be included
in mainline in some form in the future. Note that booting from the livecd has
to do a lot of work before anything is output to the console, so if the drive
is still busy don't assume the boot has hanged

svn path=/nixos/trunk/; revision=33235
---
 modules/installer/cd-dvd/iso-image.nix        | 10 ++-----
 .../efi-boot-stub/efi-boot-stub-builder.sh    |  6 ++--
 .../installer/efi-boot-stub/efi-boot-stub.nix |  8 ++---
 .../efi-boot-stub/nixos-boot-pkg.nix          | 29 -------------------
 4 files changed, 7 insertions(+), 46 deletions(-)
 delete mode 100644 modules/installer/efi-boot-stub/nixos-boot-pkg.nix

diff --git a/modules/installer/cd-dvd/iso-image.nix b/modules/installer/cd-dvd/iso-image.nix
index 9e39eb48f3d..d775c855ad6 100644
--- a/modules/installer/cd-dvd/iso-image.nix
+++ b/modules/installer/cd-dvd/iso-image.nix
@@ -129,15 +129,11 @@ let
       ${pkgs.mtools}/bin/mmd -i "$out" efi/boot
       ${pkgs.mtools}/bin/mmd -i "$out" efi/nixos
       ${pkgs.mtools}/bin/mcopy -v -i "$out" \
-        ${config.boot.kernelPackages.kernel + "/bzImage"} ::efi/nixos/bzImage
+        ${config.boot.kernelPackages.kernel + "/bzImage"} ::efi/boot/boot${targetArch}.efi
       ${pkgs.mtools}/bin/mcopy -v -i "$out" \
         ${config.system.build.initialRamdisk + "/initrd"} ::efi/nixos/initrd
-      echo "\\efi\\nixos\\bzImage initrd=\\efi\\nixos\\initrd init=${config.system.build.toplevel}/init ${toString config.boot.kernelParams}" | iconv -f utf-8 -t UCS-2 > boot-params
-      ${pkgs.mtools}/bin/mcopy -v -i "$out" boot-params ::efi/nixos/boot-params
-      ${pkgs.mtools}/bin/mcopy -v -i "$out" \
-        ${import ../efi-boot-stub/nixos-boot-pkg.nix {
-          inherit (pkgs) edk2 stdenv fetchhg; 
-         }}/*/NixosBoot.efi ::efi/boot/boot${targetArch}.efi
+      echo "initrd=\\efi\\nixos\\initrd init=${config.system.build.toplevel}/init ${toString config.boot.kernelParams}" > boot-params
+      ${pkgs.mtools}/bin/mcopy -v -i "$out" boot-params ::efi/boot/linux.conf
     '';
 
   targetArch = if pkgs.stdenv.isi686 then
diff --git a/modules/installer/efi-boot-stub/efi-boot-stub-builder.sh b/modules/installer/efi-boot-stub/efi-boot-stub-builder.sh
index d736fb417a6..9df4cb1fe59 100644
--- a/modules/installer/efi-boot-stub/efi-boot-stub-builder.sh
+++ b/modules/installer/efi-boot-stub/efi-boot-stub-builder.sh
@@ -78,10 +78,8 @@ addEntry() {
 
       if test -n "@installRemovableMediaImage@"; then
         mkdir -pv "@efiSysMountPoint@"/efi/boot
-        cp "@removableMediaImage@" \
-          "@efiSysMountPoint@"/efi/boot/boot"@targetArch@".efi
-	iconv -f utf-8 -t UCS-2 < $startup > "@efiSysMountPoint@"/efi/nixos/boot-params
-        filesCopied["@efiSysMountPoint@"/efi/nixos/boot-params]=1
+        cp $kernel "@efiSysMountPoint@"/efi/boot/boot"@targetArch@".efi
+	sed 's|.*@kernelFile@.efi ||' $startup > "@efiSysMountPoint@"/efi/boot/linux.conf
       fi
       if test -n "@installStartupNsh@"; then
         sed 's|.*@kernelFile@.efi|@kernelFile@.efi|' < $startup > "@efiSysMountPoint@/startup.nsh"
diff --git a/modules/installer/efi-boot-stub/efi-boot-stub.nix b/modules/installer/efi-boot-stub/efi-boot-stub.nix
index c8236b6fdd8..72b7fa28ac3 100644
--- a/modules/installer/efi-boot-stub/efi-boot-stub.nix
+++ b/modules/installer/efi-boot-stub/efi-boot-stub.nix
@@ -80,24 +80,20 @@ in
 
 ###### implementation
 let
-  efiBootStubBuilder = pkgs.substituteAll ({
+  efiBootStubBuilder = pkgs.substituteAll {
     src = ./efi-boot-stub-builder.sh;
     isExecutable = true;
     inherit (pkgs) bash;
     path = [pkgs.coreutils pkgs.gnused pkgs.gnugrep pkgs.glibc] ++ (pkgs.stdenv.lib.optionals config.boot.loader.efiBootStub.runEfibootmgr [pkgs.efibootmgr pkgs.module_init_tools]);
     inherit (config.boot.loader.efiBootStub) efiSysMountPoint runEfibootmgr installStartupNsh efiDisk efiPartition installRemovableMediaImage;
     kernelFile = platform.kernelTarget;
-  } // pkgs.stdenv.lib.optionalAttrs config.boot.loader.efiBootStub.installRemovableMediaImage rec {
-    removableMediaImage = ''${import ./nixos-boot-pkg.nix {
-                              inherit (pkgs) edk2 stdenv fetchhg;
-                            }}/${targetArch}/NixosBoot.efi'';
     targetArch = if pkgs.stdenv.isi686 then
       "IA32"
     else if pkgs.stdenv.isx86_64 then
       "X64"
     else
       throw "Unsupported architecture";
-  });
+  };
 
   # Temporary check, for nixos to cope both with nixpkgs stdenv-updates and trunk
   platform = pkgs.stdenv.platform;
diff --git a/modules/installer/efi-boot-stub/nixos-boot-pkg.nix b/modules/installer/efi-boot-stub/nixos-boot-pkg.nix
deleted file mode 100644
index 5bce1789a02..00000000000
--- a/modules/installer/efi-boot-stub/nixos-boot-pkg.nix
+++ /dev/null
@@ -1,29 +0,0 @@
-{ stdenv, edk2, fetchhg }:
-
-let
-
-  src = fetchhg {
-    url = https://bitbucket.org/shlevy/nixosbootpkg;
-    tag = "1ff4c2891c8c1eb03677a6f8b04b8d05807ec198";
-    sha256 = "06zwy0g9a7g2sny7phvn2z76pb3wnw4vm9vsrjjaj7f7nzcsn13k";
-  };
-
-in
-
-stdenv.mkDerivation (edk2.setup "NixosBootPkg/NixosBootPkg.dsc" {
-  name = "NixosBootPkg-2012-03-15";
-
-  unpackPhase = ''
-    ln -sv ${src} NixosBootPkg
-    ln -sv ${edk2.src}/MdePkg .
-  '';
-
-  meta = {
-    description =
-      "Simple EFI app to load the kernel with NixOS-specific arguments";
-    homepage = http://www.shealevy.com;
-    license = "MIT";
-    maintainers = [ stdenv.lib.maintainers.shlevy ];
-    platforms = ["x86_64-linux" "i686-linux"];
-  };
-})
-- 
GitLab


From 362d1389d3ccfae7742a1fcbfcef197abaaf6965 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sun, 18 Mar 2012 17:48:19 +0000
Subject: [PATCH 3491/5331] * mountall: make the "console output" Upstart
 stanza do its work.  We   were redirecting output to /var/log/upstart/<job>,
 so it didn't work   properly. * mountall-ip-up: send the USR1 signal to the
 mountall process by   looking up its PID, rather than doing "pkill -USR1
 mountall".  This   prevents a very subtle race condition where USR1 is
 delivered to a   child process of mountall (such as fsck), if pkill sees the
 child   just before its execve().  There is actually still a race condition  
 because mountall installs its USR1 handler *after* daemonising, so  
 mountall-ip-up could accidentally kill mountall.  Should report this   to
 upstream.

svn path=/nixos/trunk/; revision=33236
---
 modules/system/upstart/upstart.nix | 40 +++++++++++++++++++++++++-----
 modules/tasks/filesystems.nix      | 27 ++++++++++++++------
 2 files changed, 53 insertions(+), 14 deletions(-)

diff --git a/modules/system/upstart/upstart.nix b/modules/system/upstart/upstart.nix
index d73a19653a7..38625d26173 100644
--- a/modules/system/upstart/upstart.nix
+++ b/modules/system/upstart/upstart.nix
@@ -42,8 +42,12 @@ let
 
           ${concatMapStrings (n: "env ${n}=\"${getAttr n env}\"\n") (attrNames env)}
 
+          ${optionalString (job.console != "") "console ${job.console}"}
+
           pre-start script
-            exec >> ${log} 2>&1
+            ${optionalString (job.console == "") ''
+              exec >> ${log} 2>&1
+            ''}
             ln -sfn "$(readlink -f "/etc/init/${job.name}.conf")" /var/run/upstart-jobs/${job.name}
             ${optionalString (job.preStart != "") ''
               source ${jobHelpers}
@@ -56,24 +60,32 @@ let
             else if job.script != "" then
               ''
                 script
-                  exec >> ${log} 2>&1
+                  ${optionalString (job.console == "") ''
+                    exec >> ${log} 2>&1
+                  ''}
                   source ${jobHelpers}
                   ${job.script}
                 end script
               ''
-            else if job.exec != "" then
+            else if job.exec != "" && job.console == "" then
               ''
                 script
                   exec >> ${log} 2>&1
                   exec ${job.exec}
                 end script
               ''
+            else if job.exec != "" then
+              ''
+                exec ${job.exec}
+              ''
             else ""
           }
 
           ${optionalString (job.postStart != "") ''
             post-start script
-              exec >> ${log} 2>&1
+              ${optionalString (job.console == "") ''
+                exec >> ${log} 2>&1
+              ''}
               source ${jobHelpers}
               ${job.postStart}
             end script
@@ -88,7 +100,9 @@ let
              # (upstart 0.6.5, job.c:562)
             optionalString (job.preStop != "") (assert hasMain; ''
             pre-stop script
-              exec >> ${log} 2>&1
+              ${optionalString (job.console == "") ''
+                exec >> ${log} 2>&1
+              ''}
               source ${jobHelpers}
               ${job.preStop}
             end script
@@ -96,7 +110,9 @@ let
 
           ${optionalString (job.postStop != "") ''
             post-stop script
-              exec >> ${log} 2>&1
+              ${optionalString (job.console == "") ''
+                exec >> ${log} 2>&1
+              ''}
               source ${jobHelpers}
               ${job.postStop}
             end script
@@ -364,6 +380,18 @@ let
       '';
     };
 
+    console = mkOption {
+      default = "";
+      example = "console";
+      description = ''
+        If set to <literal>output</literal>, job output is written to
+        the console.  If it's <literal>owner</literal>, additionally
+        the job becomes owner of the console.  It it's empty (the
+        default), output is written to
+        <filename>/var/log/upstart/<replaceable>jobname</replaceable></filename>
+      '';  
+    };
+
   };
 
 
diff --git a/modules/tasks/filesystems.nix b/modules/tasks/filesystems.nix
index b60dd8c27c4..7808bac1274 100644
--- a/modules/tasks/filesystems.nix
+++ b/modules/tasks/filesystems.nix
@@ -178,7 +178,9 @@ in
 
         path = [ pkgs.utillinux pkgs.mountall ] ++ config.system.fsPackages;
 
-        script =
+        console = "output";
+
+        preStart =
           ''
             # Ensure that this job is restarted when fstab changed:
             # ${fstab}
@@ -186,11 +188,13 @@ in
             ${optionalString config.services.nfs.client.enable ''
               ensure statd || true
             ''}
-            
-            exec > /dev/console 2>&1
+
             echo "mounting filesystems..."
-            exec mountall
           '';
+
+        daemonType = "daemon";
+          
+        exec = "mountall --daemon";
       };
 
     # The `mount-failed' event is emitted synchronously, but we don't
@@ -223,19 +227,26 @@ in
         startOn = "ip-up";
         script =
           ''
-            ${pkgs.procps}/bin/pkill -USR1 -u root mountall || true
+            # Send USR1 to the mountall process.  Can't use "pkill
+            # mountall" here because that has a race condition: we may
+            # accidentally send USR1 to children of mountall (such as
+            # fsck) just before they do execve().
+            status="$(status mountall)"
+            if [[ "$status" =~ "start/running, process "([0-9]+) ]]; then
+                pid=''${BASH_REMATCH[1]}
+                echo "sending USR1 to $pid..."
+                kill -USR1 "$pid"
+            fi
           '';
       };
 
     jobs."emergency-shell" =
       { task = true;
 
-        extraConfig = "console owner";
+        console = "owner";
 
         script =
           ''
-            exec < /dev/console > /dev/console 2>&1
-
             cat <<EOF
 
             <<< Emergency shell >>>
-- 
GitLab


From 4acc48fc2d9a6f3343a89cd7223bbc6875ac2702 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sun, 18 Mar 2012 18:04:49 +0000
Subject: [PATCH 3492/5331] * Mark tasks such as mount-failed as not to be
 restarted.

svn path=/nixos/trunk/; revision=33237
---
 modules/system/activation/switch-to-configuration.sh | 3 ++-
 modules/tasks/filesystems.nix                        | 4 ++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/modules/system/activation/switch-to-configuration.sh b/modules/system/activation/switch-to-configuration.sh
index eda1eb288fc..af2de599d07 100644
--- a/modules/system/activation/switch-to-configuration.sh
+++ b/modules/system/activation/switch-to-configuration.sh
@@ -121,7 +121,7 @@ done
 
 # Start all jobs that are not running but should be.  The "should be"
 # criterion is tricky: the intended semantics is that we end up with
-# the same jobs as after a reboot.  If it's a task, restart it if it
+# the same jobs as after a reboot.  If it's a task, start it if it
 # differs from the previous instance of the same task; if it wasn't
 # previously run, don't run it.  If it's a service, only start it if
 # it has a "start on" condition.
@@ -134,6 +134,7 @@ for job in $(cd $newJobs && ls *.conf); do
         if [ ! -e "/var/run/upstart-jobs/$job" -o \
             "$(readlink -f "$newJobs/$job.conf")" = "$(readlink -f "/var/run/upstart-jobs/$job")" ];
         then continue; fi
+        if ! grep -q "^# RESTART-IF-CHANGED" "$newJobs/$job.conf"; then continue; fi
         echo "starting task ‘$job’..."
         start --quiet "$job" || true
     else
diff --git a/modules/tasks/filesystems.nix b/modules/tasks/filesystems.nix
index 7808bac1274..383035bba83 100644
--- a/modules/tasks/filesystems.nix
+++ b/modules/tasks/filesystems.nix
@@ -203,6 +203,7 @@ in
     jobs."mount-failed" =
       { task = true;
         startOn = "mount-failed";
+        restartIfChanged = false;
         script =
           ''
             # Don't start the emergency shell if the X server is
@@ -225,6 +226,7 @@ in
       {
         task = true;
         startOn = "ip-up";
+        restartIfChanged = false;
         script =
           ''
             # Send USR1 to the mountall process.  Can't use "pkill
@@ -243,6 +245,8 @@ in
     jobs."emergency-shell" =
       { task = true;
 
+        restartIfChanged = false;
+
         console = "owner";
 
         script =
-- 
GitLab


From 9ba5f09e4465419f4402514923321bdf0ccae52d Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sun, 18 Mar 2012 18:09:17 +0000
Subject: [PATCH 3493/5331] * More tasks that shouldn't be restarted (though
 they're harmless).

svn path=/nixos/trunk/; revision=33238
---
 modules/system/upstart-events/runlevel.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/modules/system/upstart-events/runlevel.nix b/modules/system/upstart-events/runlevel.nix
index 10d108d9f40..016217ea3a6 100644
--- a/modules/system/upstart-events/runlevel.nix
+++ b/modules/system/upstart-events/runlevel.nix
@@ -10,6 +10,7 @@ with pkgs.lib;
     { name = "boot";
       startOn = "startup";
       task = true;
+      restartIfChanged = false;
       script = "telinit 2";
     };
 
@@ -20,11 +21,14 @@ with pkgs.lib;
 
       task = true;
 
+      restartIfChanged = false;
+      
       script =
         ''
           case "$RUNLEVEL" in
               0) initctl start shutdown --no-wait MODE=poweroff;;
               1) initctl start shutdown --no-wait MODE=maintenance;;
+              2) true;;
               6) initctl start shutdown --no-wait MODE=reboot;;
               *) echo "Unsupported runlevel: $RUNLEVEL";;
           esac
-- 
GitLab


From 8ca2aff772d181d89583618f8a71ab430e67b6fe Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sun, 18 Mar 2012 18:53:50 +0000
Subject: [PATCH 3494/5331] * Get rid of some grep hackery on the Upstart jobs.

svn path=/nixos/trunk/; revision=33240
---
 .../activation/switch-to-configuration.sh     | 23 ++++----
 modules/system/activation/top-level.nix       | 58 +++++++++++--------
 modules/system/upstart/upstart.nix            |  2 -
 3 files changed, 47 insertions(+), 36 deletions(-)

diff --git a/modules/system/activation/switch-to-configuration.sh b/modules/system/activation/switch-to-configuration.sh
index af2de599d07..371b6835368 100644
--- a/modules/system/activation/switch-to-configuration.sh
+++ b/modules/system/activation/switch-to-configuration.sh
@@ -76,13 +76,13 @@ EOF
         exit 1
 fi
 
-newJobs=$(readlink -f @out@/etc/init)
+jobsDir=$(readlink -f @out@/etc/init)
 
 # Stop all currently running jobs that are not in the new Upstart
 # configuration.  (Here "running" means all jobs that are not in the
 # stop/waiting state.)
 for job in $(initctl list | sed -e '/ stop\/waiting/ d; /^[^a-z]/ d; s/^\([^ ]\+\).*/\1/' | sort); do
-    if ! [ -e "$newJobs/$job.conf" ] ; then
+    if ! [ -e "$jobsDir/$job.conf" ] ; then
         echo "stopping obsolete job ‘$job’..."
         stop --quiet "$job" || true
     fi
@@ -99,16 +99,19 @@ initctl reload-configuration
 # Allow Upstart jobs to react intelligently to a config change.
 initctl emit config-changed
 
+declare -A tasks=(@tasks@)
+declare -A noRestartIfChanged=(@noRestartIfChanged@)
+
 # Restart all running jobs that have changed.  (Here "running" means
 # all jobs that don't have a "stop" goal.)  We use the symlinks in
 # /var/run/upstart-jobs (created by each job's pre-start script) to
 # determine if a job has changed.
-for job in $(cd $newJobs && ls *.conf); do
+for job in $(cd $jobsDir && ls *.conf); do
     job=$(basename $job .conf)
     status=$(status "$job")
     if ! [[ "$status" =~ start/ ]]; then continue; fi
-    if [ "$(readlink -f "$newJobs/$job.conf")" = "$(readlink -f "/var/run/upstart-jobs/$job")" ]; then continue; fi
-    if ! grep -q "^# RESTART-IF-CHANGED" "$newJobs/$job.conf"; then
+    if [ "$(readlink -f "$jobsDir/$job.conf")" = "$(readlink -f "/var/run/upstart-jobs/$job")" ]; then continue; fi
+    if [ -n "${noRestartIfChanged[$job]}" ]; then
         echo "not restarting changed service ‘$job’"
         continue
     fi
@@ -125,20 +128,20 @@ done
 # differs from the previous instance of the same task; if it wasn't
 # previously run, don't run it.  If it's a service, only start it if
 # it has a "start on" condition.
-for job in $(cd $newJobs && ls *.conf); do
+for job in $(cd $jobsDir && ls *.conf); do
     job=$(basename $job .conf)
     status=$(status "$job")
     if ! [[ "$status" =~ stop/ ]]; then continue; fi
 
-    if grep -q '^task$' "$newJobs/$job.conf"; then
+    if [ -n "${tasks[$job]}" ]; then
         if [ ! -e "/var/run/upstart-jobs/$job" -o \
-            "$(readlink -f "$newJobs/$job.conf")" = "$(readlink -f "/var/run/upstart-jobs/$job")" ];
+            "$(readlink -f "$jobsDir/$job.conf")" = "$(readlink -f "/var/run/upstart-jobs/$job")" ];
         then continue; fi
-        if ! grep -q "^# RESTART-IF-CHANGED" "$newJobs/$job.conf"; then continue; fi
+        if [ -n "${noRestartIfChanged[$job]}" ]; then continue; fi
         echo "starting task ‘$job’..."
         start --quiet "$job" || true
     else
-        if ! grep -q "^start on" "$newJobs/$job.conf"; then continue; fi
+        if ! grep -q "^start on" "$jobsDir/$job.conf"; then continue; fi
         echo "starting service ‘$job’..."
         start --quiet "$job" || true
     fi
diff --git a/modules/system/activation/top-level.nix b/modules/system/activation/top-level.nix
index 265f06a5a9d..df07bc1095a 100644
--- a/modules/system/activation/top-level.nix
+++ b/modules/system/activation/top-level.nix
@@ -1,24 +1,26 @@
-{pkgs, config, modules, baseModules, ...}:
+{ config, pkgs, modules, baseModules, ... }:
+
+with pkgs.lib;
 
 let
 
   options = {
 
-    system.build = pkgs.lib.mkOption {
+    system.build = mkOption {
       default = {};
       description = ''
         Attribute set of derivations used to setup the system.
       '';
     };
 
-    nesting.children = pkgs.lib.mkOption {
+    nesting.children = mkOption {
       default = [];
       description = ''
         Additional configurations to build.
       '';
     };
 
-    nesting.clone = pkgs.lib.mkOption {
+    nesting.clone = mkOption {
       default = [];
       description = ''
         Additional configurations to build based on the current
@@ -26,21 +28,21 @@ let
       '';
     };
 
-    system.boot.loader.id = pkgs.lib.mkOption {
+    system.boot.loader.id = mkOption {
       default = "";
       description = ''
         Id string of the used bootloader.
       '';
     };
 
-    system.boot.loader.kernelFile = pkgs.lib.mkOption {
+    system.boot.loader.kernelFile = mkOption {
       default = "";
       description = ''
         Name of the kernel file to be passed to the bootloader.
       '';
     };
 
-    system.copySystemConfiguration = pkgs.lib.mkOption {
+    system.copySystemConfiguration = mkOption {
       default = false;
       description = ''
         If enabled, copies the NixOS configuration file
@@ -50,10 +52,10 @@ let
       '';
     };
 
-    system.extraSystemBuilderCmds = pkgs.lib.mkOption {
+    system.extraSystemBuilderCmds = mkOption {
       default = "";
       internal = true;
-      merge = pkgs.lib.concatStringsSep "\n";
+      merge = concatStringsSep "\n";
       description = ''
         This code will be added to the builder creating the system store path.
       '';
@@ -89,7 +91,7 @@ let
       kernelPath = "${config.boot.kernelPackages.kernel}/" +
         "${config.system.boot.loader.kernelFile}";
     in ''
-      ensureDir $out
+      mkdir $out
 
       if [ ! -f ${kernelPath} ]; then
         echo "The bootloader cannot find the proper kernel image."
@@ -123,13 +125,13 @@ let
       echo "${toString config.system.build.upstart.interfaceVersion}" > $out/upstart-interface-version
 
       mkdir $out/fine-tune
-      childCount=0;
+      childCount=0
       for i in $children; do
-        childCount=$(( childCount + 1 ));
-        ln -s $i $out/fine-tune/child-$childCount;
+        childCount=$(( childCount + 1 ))
+        ln -s $i $out/fine-tune/child-$childCount
       done
 
-      ensureDir $out/bin
+      mkdir $out/bin
       substituteAll ${./switch-to-configuration.sh} $out/bin/switch-to-configuration
       chmod +x $out/bin/switch-to-configuration
 
@@ -151,15 +153,23 @@ let
     menuBuilder = config.system.build.menuBuilder;
     initScriptBuilder = config.system.build.initScriptBuilder;
     activationScript = config.system.activationScripts.script;
+
+    # Pass the names of all Upstart tasks to the activation script.
+    tasks = attrValues (mapAttrs (n: v: if v.task then ["[${v.name}]=1"] else []) config.jobs);
+    
+    # Pass the names of all Upstart jobs that shouldn't be restarted
+    # to the activation script.
+    noRestartIfChanged = attrValues (mapAttrs (n: v: if v.restartIfChanged then [] else ["[${v.name}]=1"]) config.jobs);
+    
     # Most of these are needed by grub-install.
-    path = [
-      pkgs.coreutils
-      pkgs.gnused
-      pkgs.gnugrep
-      pkgs.findutils
-      pkgs.diffutils
-      config.system.build.upstart # for initctl
-    ];
+    path =
+      [ pkgs.coreutils
+        pkgs.gnused
+        pkgs.gnugrep
+        pkgs.findutils
+        pkgs.diffutils
+        config.system.build.upstart # for initctl
+      ];
 
     # Boot loaders
     bootLoader = config.system.boot.loader.id;
@@ -185,9 +195,9 @@ in {
   require = [options];
 
   system.extraSystemBuilderCmds =
-    pkgs.lib.optionalString
+    optionalString
       config.system.copySystemConfiguration
-      "cp ${pkgs.lib.maybeEnv "NIXOS_CONFIG" "/etc/nixos/configuration.nix"} $out";
+      "cp ${maybeEnv "NIXOS_CONFIG" "/etc/nixos/configuration.nix"} $out";
 
   system.build.toplevel = system;
 }
diff --git a/modules/system/upstart/upstart.nix b/modules/system/upstart/upstart.nix
index 38625d26173..175c64bb88f 100644
--- a/modules/system/upstart/upstart.nix
+++ b/modules/system/upstart/upstart.nix
@@ -94,8 +94,6 @@ let
           ${optionalString job.task "task"}
           ${optionalString (!job.task && job.respawn) "respawn"}
 
-          ${optionalString job.restartIfChanged "# RESTART-IF-CHANGED"}
-
           ${ # preStop is run only if there is exec or script.
              # (upstart 0.6.5, job.c:562)
             optionalString (job.preStop != "") (assert hasMain; ''
-- 
GitLab


From 53580d514a9fc64b3a641a2b74e34dd7dffce3cd Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Sun, 18 Mar 2012 18:55:47 +0000
Subject: [PATCH 3495/5331] You cant modprobe efivars from within the chroot,
 so modprobe efivars when booting an efi-compatible install CD

svn path=/nixos/trunk/; revision=33241
---
 modules/installer/cd-dvd/iso-image.nix                   | 2 ++
 modules/installer/efi-boot-stub/efi-boot-stub-builder.sh | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/modules/installer/cd-dvd/iso-image.nix b/modules/installer/cd-dvd/iso-image.nix
index d775c855ad6..76b4803ccec 100644
--- a/modules/installer/cd-dvd/iso-image.nix
+++ b/modules/installer/cd-dvd/iso-image.nix
@@ -196,6 +196,8 @@ in
 
   boot.initrd.kernelModules = [ "loop" ];
 
+  boot.kernelModules = pkgs.stdenv.lib.optional config.isoImage.makeEfiBootable "efivars":
+
   # In stage 1, mount a tmpfs on top of / (the ISO image) and
   # /nix/store (the squashfs image) to make this a live CD.
   boot.initrd.postMountCommands =
diff --git a/modules/installer/efi-boot-stub/efi-boot-stub-builder.sh b/modules/installer/efi-boot-stub/efi-boot-stub-builder.sh
index 9df4cb1fe59..26b2f48fd26 100644
--- a/modules/installer/efi-boot-stub/efi-boot-stub-builder.sh
+++ b/modules/installer/efi-boot-stub/efi-boot-stub-builder.sh
@@ -93,7 +93,7 @@ mkdir -p "@efiSysMountPoint@/efi/nixos/"
 # Remove all old boot manager entries
 if test -n "@runEfibootmgr@"; then
   set +e
-  modprobe efivars
+  modprobe efivars > /dev/null 2>&1
   for bootnum in $(efibootmgr | grep "NixOS" | grep "Generation" | sed 's/Boot//' | sed 's/\*.*//'); do
     efibootmgr -B -b "$bootnum" > /dev/null 2>&1
   done
-- 
GitLab


From b1fd71038ef53cc3faed23055968baf0b36884bd Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sun, 18 Mar 2012 19:05:44 +0000
Subject: [PATCH 3496/5331] * Slight speedup.  It's amazing how quickly shell
 scripts become   slow: calling basename in a loop somewhere has a noticable
 impact on   performance.  We really shouldn't use bash scripts.

svn path=/nixos/trunk/; revision=33242
---
 modules/system/activation/switch-to-configuration.sh | 6 ++----
 modules/system/activation/top-level.nix              | 2 ++
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/modules/system/activation/switch-to-configuration.sh b/modules/system/activation/switch-to-configuration.sh
index 371b6835368..8b8ea718666 100644
--- a/modules/system/activation/switch-to-configuration.sh
+++ b/modules/system/activation/switch-to-configuration.sh
@@ -106,8 +106,7 @@ declare -A noRestartIfChanged=(@noRestartIfChanged@)
 # all jobs that don't have a "stop" goal.)  We use the symlinks in
 # /var/run/upstart-jobs (created by each job's pre-start script) to
 # determine if a job has changed.
-for job in $(cd $jobsDir && ls *.conf); do
-    job=$(basename $job .conf)
+for job in @jobs@; do
     status=$(status "$job")
     if ! [[ "$status" =~ start/ ]]; then continue; fi
     if [ "$(readlink -f "$jobsDir/$job.conf")" = "$(readlink -f "/var/run/upstart-jobs/$job")" ]; then continue; fi
@@ -128,8 +127,7 @@ done
 # differs from the previous instance of the same task; if it wasn't
 # previously run, don't run it.  If it's a service, only start it if
 # it has a "start on" condition.
-for job in $(cd $jobsDir && ls *.conf); do
-    job=$(basename $job .conf)
+for job in @jobs@; do
     status=$(status "$job")
     if ! [[ "$status" =~ stop/ ]]; then continue; fi
 
diff --git a/modules/system/activation/top-level.nix b/modules/system/activation/top-level.nix
index df07bc1095a..f1bc4eea597 100644
--- a/modules/system/activation/top-level.nix
+++ b/modules/system/activation/top-level.nix
@@ -154,6 +154,8 @@ let
     initScriptBuilder = config.system.build.initScriptBuilder;
     activationScript = config.system.activationScripts.script;
 
+    jobs = map (j: j.name) (attrValues config.jobs);
+
     # Pass the names of all Upstart tasks to the activation script.
     tasks = attrValues (mapAttrs (n: v: if v.task then ["[${v.name}]=1"] else []) config.jobs);
     
-- 
GitLab


From bcbe2dce4c7d11f1e96edb85d498c56ffdc391f2 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 19 Mar 2012 02:35:17 +0000
Subject: [PATCH 3497/5331] * Don't source /etc/profile in interactive
 non-login shells, unless it   wasn't sourced in a parent shell (as determined
 by the environment   variable __ETC_PROFILE_DONE).  This prevents overriden
 values of   environment variables such as $PATH from being clobbered in  
 subshells. * Move all aliases to /etc/bashrc (since those are for interactive
   use).

svn path=/nixos/trunk/; revision=33246
---
 modules/programs/bash/bashrc.sh  | 68 ++++++++++++++++++--------------
 modules/programs/bash/profile.sh | 28 ++++++-------
 2 files changed, 51 insertions(+), 45 deletions(-)

diff --git a/modules/programs/bash/bashrc.sh b/modules/programs/bash/bashrc.sh
index ef01fb8049a..79583a73174 100644
--- a/modules/programs/bash/bashrc.sh
+++ b/modules/programs/bash/bashrc.sh
@@ -1,40 +1,48 @@
 # /etc/bashrc: DO NOT EDIT -- this file has been generated automatically.
 
-if [ \( -n "${SYSTEM_ETC_BASHRC_HAS_BEEN_SOURCED:-}" \) -o \( -n "${NOSYSBASHRC:-}" \) ]; then
-    return
-else
-    SYSTEM_ETC_BASHRC_HAS_BEEN_SOURCED="1"
+# This file is read for interactive non-login shells.
+
+# Only execute this file once per shell.
+if [ -n "$__ETC_BASHRC_SOURCED" -o -n "$NOSYSBASHRC" ]; then return; fi
+__ETC_BASHRC_SOURCED=1
+
+# If the profile was not loaded in a parent process, source it.  But
+# otherwise don't do it because we don't want to clobber overriden
+# values of $PATH, etc.
+if [ -z "$__ETC_PROFILE_DONE" ]; then
+    . /etc/profile
 fi
 
-. /etc/profile
+# We are not always an interactive shell.
+if [ -z "$PS1" ]; then return; fi
 
-# If we are an interactive shell ...
-if [ -n "$PS1" ]; then
-    # Check the window size after every command.
-    shopt -s checkwinsize
+# Check the window size after every command.
+shopt -s checkwinsize
 
-    # Provide a nice prompt.
-    PROMPT_COLOR="1;31m"
-    let $UID && PROMPT_COLOR="1;32m"
-    PS1="\n\[\033[$PROMPT_COLOR\][\u@\h:\w]\\$\[\033[0m\] "
-    if test "$TERM" = "xterm"; then
-        PS1="\[\033]2;\h:\u:\w\007\]$PS1"
-    fi
+# Provide a nice prompt.
+PROMPT_COLOR="1;31m"
+let $UID && PROMPT_COLOR="1;32m"
+PS1="\n\[\033[$PROMPT_COLOR\][\u@\h:\w]\\$\[\033[0m\] "
+if test "$TERM" = "xterm"; then
+    PS1="\[\033]2;\h:\u:\w\007\]$PS1"
+fi
 
-    # Check whether we're running a version of Bash that has support for
-    # programmable completion. If we do, and if the current user has
-    # installed the package 'bash-completion' in her $HOME/.nix-profile,
-    # then completion is enabled automatically.
-    if [ -f "$HOME/.nix-profile/etc/bash_completion" ]; then
-        if [ -d "$HOME/.nix-profile/etc/bash_completion.d" ]; then
-            if shopt -q progcomp &>/dev/null; then
-                BASH_COMPLETION_DIR="$HOME/.nix-profile/etc/bash_completion.d"
-                BASH_COMPLETION="$HOME/.nix-profile/etc/bash_completion"
-                . "$BASH_COMPLETION"
-            fi
+# Check whether we're running a version of Bash that has support for
+# programmable completion. If we do, and if the current user has
+# installed the package 'bash-completion' in her $HOME/.nix-profile,
+# then completion is enabled automatically.
+if [ -f "$HOME/.nix-profile/etc/bash_completion" ]; then
+    if [ -d "$HOME/.nix-profile/etc/bash_completion.d" ]; then
+        if shopt -q progcomp &>/dev/null; then
+            BASH_COMPLETION_DIR="$HOME/.nix-profile/etc/bash_completion.d"
+            BASH_COMPLETION="$HOME/.nix-profile/etc/bash_completion"
+            . "$BASH_COMPLETION"
         fi
     fi
-
-    # Some aliases.
-    alias which="type -P"
 fi
+
+# Some aliases.
+alias ls="ls --color=tty"
+alias ll="ls -l"
+alias l="ls -alh"
+alias which="type -P"
diff --git a/modules/programs/bash/profile.sh b/modules/programs/bash/profile.sh
index a5edddb1083..dbda74309a2 100644
--- a/modules/programs/bash/profile.sh
+++ b/modules/programs/bash/profile.sh
@@ -1,10 +1,15 @@
 # /etc/profile: DO NOT EDIT -- this file has been generated automatically.
 
-if [ -n "${SYSTEM_ETC_PROFILE_HAS_BEEN_SOURCED:-}" ]; then
-    return
-else
-    SYSTEM_ETC_PROFILE_HAS_BEEN_SOURCED="1"
-fi
+# This file is read for (interactive) login shells.  Any
+# initialisation specific to interactive shells should be put in
+# /etc/bashrc, which is sourced from here.
+
+# Only execute this file once per shell.
+if [ -n "$__ETC_PROFILE_SOURCED" ]; then return; fi
+__ETC_PROFILE_SOURCED=1
+
+# Prevent this file from being sourced by interactive non-login child shells.
+export __ETC_PROFILE_DONE=1
 
 # Initialise a bunch of environment variables.
 export LD_LIBRARY_PATH=/var/run/opengl-driver/lib:/var/run/opengl-driver-32/lib # !!! only set if needed
@@ -33,9 +38,7 @@ for i in $NIX_PROFILES; do # !!! reverse
     export TERMINFO_DIRS=$i/share/terminfo${TERMINFO_DIRS:+:}$TERMINFO_DIRS
     export TERM=$TERM
 
-    # "lib/site_perl" is for backwards compatibility with packages
-    # from Nixpkgs <= 0.12.
-    export PERL5LIB="$i/lib/perl5/site_perl:$i/lib/site_perl${PERL5LIB:+:}$PERL5LIB"
+    export PERL5LIB="$i/lib/perl5/site_perl${PERL5LIB:+:}$PERL5LIB"
 
     # ALSA plugins
     export ALSA_PLUGIN_DIRS="$i/lib/alsa-lib${ALSA_PLUGIN_DIRS:+:}$ALSA_PLUGIN_DIRS"
@@ -51,7 +54,7 @@ for i in $NIX_PROFILES; do # !!! reverse
     export XDG_CONFIG_DIRS=$i/etc/xdg${XDG_CONFIG_DIRS:+:}$XDG_CONFIG_DIRS
     export XDG_DATA_DIRS=$i/share${XDG_DATA_DIRS:+:}$XDG_DATA_DIRS
 
-    # mozilla plugins
+    # Mozilla plugins.
     export MOZ_PLUGIN_PATH=$i/lib/mozilla/plugins${MOZ_PLUGIN_PATH:+:}$MOZ_PLUGIN_PATH
 done
 
@@ -62,7 +65,7 @@ export ASPELL_CONF="dict-dir $HOME/.nix-profile/lib/aspell"
 export PATH=@wrapperDir@:$PATH
 
 # ~/bin if it exists overrides other bin directories.
-if test -d $HOME/bin; then
+if [ -d $HOME/bin ]; then
     export PATH=$HOME/bin:$PATH
 fi
 
@@ -102,11 +105,6 @@ fi
 
 @shellInit@
 
-# Some aliases.
-alias ls="ls --color=tty"
-alias ll="ls -l"
-alias l="ls -alh"
-
 # Read system-wide modifications.
 if test -f /etc/profile.local; then
     . /etc/profile.local
-- 
GitLab


From dde8453a09bc847f660d45a0eec303fbd10402da Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 19 Mar 2012 02:53:58 +0000
Subject: [PATCH 3498/5331] * Initialise $LOCALE_ARCHIVE earlier in
 /etc/profile to prevent the   warning

    -bash: warning: setlocale: LC_TIME: cannot change locale (en_GB.UTF8): No such file or directory

  when $LC_TIME is set in environment.shellInit.

svn path=/nixos/trunk/; revision=33248
---
 modules/config/i18n.nix          | 1 -
 modules/programs/bash/profile.sh | 1 +
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/config/i18n.nix b/modules/config/i18n.nix
index 744eaee6667..c53325ed4e6 100644
--- a/modules/config/i18n.nix
+++ b/modules/config/i18n.nix
@@ -68,6 +68,5 @@ in
   environment.shellInit =
     ''
       export LANG=${config.i18n.defaultLocale}
-      export LOCALE_ARCHIVE=/var/run/current-system/sw/lib/locale/locale-archive
     '';
 }
diff --git a/modules/programs/bash/profile.sh b/modules/programs/bash/profile.sh
index dbda74309a2..152b83107a1 100644
--- a/modules/programs/bash/profile.sh
+++ b/modules/programs/bash/profile.sh
@@ -12,6 +12,7 @@ __ETC_PROFILE_SOURCED=1
 export __ETC_PROFILE_DONE=1
 
 # Initialise a bunch of environment variables.
+export LOCALE_ARCHIVE=/var/run/current-system/sw/lib/locale/locale-archive
 export LD_LIBRARY_PATH=/var/run/opengl-driver/lib:/var/run/opengl-driver-32/lib # !!! only set if needed
 export MODULE_DIR=@modulesTree@/lib/modules
 export NIXPKGS_CONFIG=/nix/etc/config.nix
-- 
GitLab


From ebc6d7f43523da8e196237723f23bc8af338d300 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 19 Mar 2012 15:10:39 +0000
Subject: [PATCH 3499/5331] * Attempt to fix the random "udevadm settle -
 timeout of 120 seconds   reached, the event queue contains:
 /sys/devices/virtual/tty/hvc1" VM   failures.

svn path=/nixos/trunk/; revision=33259
---
 modules/profiles/qemu-guest.nix          | 4 ++--
 modules/services/hardware/udev.nix       | 2 +-
 modules/system/boot/stage-1-init.sh      | 2 +-
 modules/testing/test-instrumentation.nix | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/modules/profiles/qemu-guest.nix b/modules/profiles/qemu-guest.nix
index 6eff638e2a2..548cc58732e 100644
--- a/modules/profiles/qemu-guest.nix
+++ b/modules/profiles/qemu-guest.nix
@@ -4,6 +4,6 @@
 { config, pkgs, ... }:
 
 {
-  boot.initrd.availableKernelModules = [ "virtio_net" "virtio_pci" "virtio_blk" "virtio_balloon" "virtio_console" ];
-  boot.initrd.kernelModules = [ "virtio_balloon" ];
+  boot.initrd.availableKernelModules = [ "virtio_net" "virtio_pci" "virtio_blk" ];
+  boot.kernelModules = [ "virtio_balloon" "virtio_console" ];
 }
diff --git a/modules/services/hardware/udev.nix b/modules/services/hardware/udev.nix
index 0802d4f7dbc..70e6f72acd6 100644
--- a/modules/services/hardware/udev.nix
+++ b/modules/services/hardware/udev.nix
@@ -265,7 +265,7 @@ in
             # http://www.mail-archive.com/fedora-devel-list@redhat.com/msg10261.html
             udevadm control --env=STARTUP=1
             udevadm trigger --action=add
-            udevadm settle # wait for udev to finish
+            udevadm settle || true # wait for udev to finish
             udevadm control --env=STARTUP=
 
             initctl emit -n new-devices
diff --git a/modules/system/boot/stage-1-init.sh b/modules/system/boot/stage-1-init.sh
index 299a9f8a08f..86c35f21fab 100644
--- a/modules/system/boot/stage-1-init.sh
+++ b/modules/system/boot/stage-1-init.sh
@@ -137,7 +137,7 @@ mkdir -p /dev/.mdadm
 udevd --daemon
 udevadm control --env=STARTUP=1
 udevadm trigger --action=add
-udevadm settle
+udevadm settle || true
 udevadm control --env=STARTUP=
 
 
diff --git a/modules/testing/test-instrumentation.nix b/modules/testing/test-instrumentation.nix
index 122ba84254c..5e40cf215b7 100644
--- a/modules/testing/test-instrumentation.nix
+++ b/modules/testing/test-instrumentation.nix
@@ -28,7 +28,7 @@ in
   " {
 
     jobs.backdoor =
-      { startOn = "startup";
+      { startOn = "started udev";
         stopOn = "";
 
         script =
-- 
GitLab


From f12950b8e02f32aeed9d2ff1ac8faed4b5b8aad2 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 19 Mar 2012 16:49:13 +0000
Subject: [PATCH 3500/5331] * Improve the Postgres Upstart job: don't use
 pg_ctl, let Upstart   monitor the postgres process directly (so that it can
 be restarted   if necessary), let Upstart send SIGTERM to postgres to shut it
 down   gracefully.  Also drop the Mediawiki references.

svn path=/nixos/trunk/; revision=33262
---
 modules/services/databases/postgresql.nix | 53 +++++++++++------------
 1 file changed, 25 insertions(+), 28 deletions(-)

diff --git a/modules/services/databases/postgresql.nix b/modules/services/databases/postgresql.nix
index 2f2188043aa..cd37c2c2622 100644
--- a/modules/services/databases/postgresql.nix
+++ b/modules/services/databases/postgresql.nix
@@ -22,7 +22,7 @@ let
 
   postgresql = postgresqlAndPlugins pkgs.postgresql;
 
-  run = "${pkgs.su}/bin/su -s ${pkgs.stdenv.shell} postgres";
+  run = "su -s ${pkgs.stdenv.shell} postgres";
 
   flags = optional cfg.enableTCPIP "-i";
 
@@ -74,13 +74,7 @@ in
       };
 
       authentication = mkOption {
-        default = ''
-          # Generated file; do not edit!
-          local all mediawiki        ident mediawiki-users
-          local all all              ident sameuser
-          host  all all 127.0.0.1/32 md5
-          host  all all ::1/128      md5
-        '';
+        default = "";
         description = ''
           Defines how users authenticate themselves to the server.
         '';
@@ -136,6 +130,14 @@ in
 
   config = mkIf config.services.postgresql.enable {
 
+    services.postgresql.authentication =
+      ''
+        # Generated file; do not edit!
+        local all all              ident sameuser
+        host  all all 127.0.0.1/32 md5
+        host  all all ::1/128      md5
+      '';
+        
     users.extraUsers = singleton
       { name = "postgres";
         description = "PostgreSQL server user";
@@ -146,13 +148,6 @@ in
 
     environment.systemPackages = [postgresql];
 
-    # !!! This should be be in the mediawiki module, obviously.
-    services.postgresql.identMap =
-      ''
-        mediawiki-users root   mediawiki
-        mediawiki-users wwwrun mediawiki
-      '';
-
     jobs.postgresql =
       { description = "PostgreSQL server";
 
@@ -163,35 +158,37 @@ in
             PGDATA = cfg.dataDir;
           };
 
+        path = [ pkgs.su postgresql ];
+
         preStart =
           ''
             # Initialise the database.
             if ! test -e ${cfg.dataDir}; then
                 mkdir -m 0700 -p ${cfg.dataDir}
                 chown -R postgres ${cfg.dataDir}
-                ${run} -c '${postgresql}/bin/initdb -U root'
+                ${run} -c 'initdb -U root'
                 rm -f ${cfg.dataDir}/*.conf
             fi
 
             ln -sfn ${configFile} ${cfg.dataDir}/postgresql.conf
+          ''; # */
 
-            # We'd like to use the `-w' flag here to wait until the
-            # database is up, but it requires a `postgres' user to
-            # exist.  And we can't call `createuser' before the
-            # database is running.
-            ${run} -c '${postgresql}/bin/pg_ctl start -o "${toString flags}"'
+        exec = "${run} -c 'postgres ${toString flags}'";
 
-            # So wait until the server is up.  `pg_ctl status' doesn't
-            # work (apparently, it just checks whether the server is
-            # running), so try to connect with psql.
-            while ! ${postgresql}/bin/psql postgres -c ""; do
+        # Wait for PostgreSQL to be ready to accept connections.
+        postStart =
+          ''
+            while ! psql postgres -c ""; do
+                stop_check
                 sleep 1
             done
-          ''; # */
+          '';
 
-        postStop =
+        extraConfig =
           ''
-            ${run} -c '${postgresql}/bin/pg_ctl stop -m fast'
+            # Give Postgres a decent amount of time to clean up after
+            # receiving Upstart's SIGTERM.
+            kill timeout 60
           '';
       };
 
-- 
GitLab


From 842239f5afa0bc3c9f5984b50f33f0f1f9b88980 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Mon, 19 Mar 2012 17:23:24 +0000
Subject: [PATCH 3501/5331] all-hardware.nix: Apple users may want to be able
 to type something at a debug2 prompt

svn path=/nixos/trunk/; revision=33263
---
 modules/profiles/all-hardware.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/modules/profiles/all-hardware.nix b/modules/profiles/all-hardware.nix
index 041948aa462..359324dd13c 100644
--- a/modules/profiles/all-hardware.nix
+++ b/modules/profiles/all-hardware.nix
@@ -41,6 +41,9 @@
 
       # Virtio (QEMU, KVM etc.) support.
       "virtio_net" "virtio_pci" "virtio_blk" "virtio_balloon" "virtio_console"
+
+      # Keyboards
+      "hid_apple"
     ];
 
   boot.initrd.kernelModules =
-- 
GitLab


From fac0fef5d84b8d325825a25e79ca8e6afd87b381 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Mon, 19 Mar 2012 17:25:50 +0000
Subject: [PATCH 3502/5331] Whoops

svn path=/nixos/trunk/; revision=33264
---
 modules/installer/cd-dvd/iso-image.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/installer/cd-dvd/iso-image.nix b/modules/installer/cd-dvd/iso-image.nix
index 76b4803ccec..7e02b6ac2cc 100644
--- a/modules/installer/cd-dvd/iso-image.nix
+++ b/modules/installer/cd-dvd/iso-image.nix
@@ -196,7 +196,7 @@ in
 
   boot.initrd.kernelModules = [ "loop" ];
 
-  boot.kernelModules = pkgs.stdenv.lib.optional config.isoImage.makeEfiBootable "efivars":
+  boot.kernelModules = pkgs.stdenv.lib.optional config.isoImage.makeEfiBootable "efivars";
 
   # In stage 1, mount a tmpfs on top of / (the ISO image) and
   # /nix/store (the squashfs image) to make this a live CD.
-- 
GitLab


From 31c93522d50fe5e7257c7d80ed643639f6a06add Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 19 Mar 2012 18:06:18 +0000
Subject: [PATCH 3503/5331] * Support PostgreSQL versions >= 8.4, which have a
 slightly different   pg_hba.conf format.

svn path=/nixos/trunk/; revision=33268
---
 modules/services/databases/postgresql.nix | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/modules/services/databases/postgresql.nix b/modules/services/databases/postgresql.nix
index cd37c2c2622..8ef272404e0 100644
--- a/modules/services/databases/postgresql.nix
+++ b/modules/services/databases/postgresql.nix
@@ -10,7 +10,7 @@ let
   postgresqlAndPlugins = pg:
     if cfg.extraPlugins == [] then pg
     else pkgs.buildEnv {
-      name = "postgresql-and-plugins";
+      name = "postgresql-and-plugins-${(builtins.parseDrvName pg.name).version}";
       paths = [ pg ] ++ cfg.extraPlugins;
       postBuild =
         ''
@@ -35,6 +35,8 @@ let
       ${cfg.extraConfig}
     '';
 
+  pre84 = versionOlder (builtins.parseDrvName postgresql.name).version "8.4";
+  
 in
 
 {
@@ -133,7 +135,7 @@ in
     services.postgresql.authentication =
       ''
         # Generated file; do not edit!
-        local all all              ident sameuser
+        local all all              ident ${optionalString pre84 "sameuser"}
         host  all all 127.0.0.1/32 md5
         host  all all ::1/128      md5
       '';
-- 
GitLab


From fcc2e985a23bae1b59d231173639f4c9f20c20e2 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 19 Mar 2012 18:07:05 +0000
Subject: [PATCH 3504/5331] * Handle jobs that fail while a post-start script
 is waiting for them.

svn path=/nixos/trunk/; revision=33269
---
 .../system/activation/switch-to-configuration.sh  | 15 +++++++++++++--
 modules/system/upstart/upstart.nix                |  8 +++++++-
 2 files changed, 20 insertions(+), 3 deletions(-)

diff --git a/modules/system/activation/switch-to-configuration.sh b/modules/system/activation/switch-to-configuration.sh
index 8b8ea718666..781972882fd 100644
--- a/modules/system/activation/switch-to-configuration.sh
+++ b/modules/system/activation/switch-to-configuration.sh
@@ -102,6 +102,17 @@ initctl emit config-changed
 declare -A tasks=(@tasks@)
 declare -A noRestartIfChanged=(@noRestartIfChanged@)
 
+start_() {
+    local job="$1"
+    if start --quiet "$job"; then
+        # Handle services that cancel themselves.
+        if ! [ -n "${tasks[$job]}" ]; then
+            local status=$(status "$job")
+            [[ "$status" =~ start/running ]] || echo "job ‘$job’ failed to start!"
+        fi
+    fi
+}
+
 # Restart all running jobs that have changed.  (Here "running" means
 # all jobs that don't have a "stop" goal.)  We use the symlinks in
 # /var/run/upstart-jobs (created by each job's pre-start script) to
@@ -118,7 +129,7 @@ for job in @jobs@; do
     # Note: can't use "restart" here, since that only restarts the
     # job's main process.
     stop --quiet "$job" || true
-    start --quiet "$job" || true
+    start_ "$job" || true
 done
 
 # Start all jobs that are not running but should be.  The "should be"
@@ -141,7 +152,7 @@ for job in @jobs@; do
     else
         if ! grep -q "^start on" "$jobsDir/$job.conf"; then continue; fi
         echo "starting service ‘$job’..."
-        start --quiet "$job" || true
+        start_ "$job" || true
     fi
     
 done
diff --git a/modules/system/upstart/upstart.nix b/modules/system/upstart/upstart.nix
index 175c64bb88f..fa2e4fc22b7 100644
--- a/modules/system/upstart/upstart.nix
+++ b/modules/system/upstart/upstart.nix
@@ -175,10 +175,16 @@ let
       # Check whether the current job has been stopped.  Used in
       # post-start jobs to determine if they should continue.
       stop_check() {
-          if [[ "$(status)" =~ stop/ ]]; then
+          local status="$(status)"
+          if [[ "$status" =~ stop/ ]]; then
               echo "job asked to stop!"
               return 1
           fi
+          if [[ "$status" =~ respawn/ ]]; then
+              echo "job respawning unexpectedly!"
+              stop
+              return 1
+          fi
           return 0
       }
     '';
-- 
GitLab


From f546837cdf396f4bb19a48380446341aa7e63b85 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 19 Mar 2012 18:07:28 +0000
Subject: [PATCH 3505/5331] * Don't use replaceChars.  It's slow.

svn path=/nixos/trunk/; revision=33270
---
 modules/system/upstart/upstart.nix | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/modules/system/upstart/upstart.nix b/modules/system/upstart/upstart.nix
index fa2e4fc22b7..d624fd31745 100644
--- a/modules/system/upstart/upstart.nix
+++ b/modules/system/upstart/upstart.nix
@@ -417,9 +417,7 @@ let
     config = {
     
       # The default name is the name extracted from the attribute path.
-      name = mkDefaultValue (
-        replaceChars ["<" ">" "*"] ["_" "_" "_name_"] name
-      );
+      name = mkDefaultValue name;
       
       # Default path for Upstart jobs.  Should be quite minimal.
       path =
-- 
GitLab


From 81655b72471b329234db05082d3321ad04543d46 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Mon, 19 Mar 2012 19:01:52 +0000
Subject: [PATCH 3506/5331] Have a more featured initrd and crashDump for the
 pc system tarball.

svn path=/nixos/trunk/; revision=33274
---
 modules/installer/cd-dvd/system-tarball-pc.nix | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/modules/installer/cd-dvd/system-tarball-pc.nix b/modules/installer/cd-dvd/system-tarball-pc.nix
index 3da07c39336..04dec697a1b 100644
--- a/modules/installer/cd-dvd/system-tarball-pc.nix
+++ b/modules/installer/cd-dvd/system-tarball-pc.nix
@@ -158,10 +158,19 @@ in
   services.openssh.enable = true;
   jobs.openssh.startOn = pkgs.lib.mkOverrideTemplate 50 {} "";
 
-  boot.kernelPackages = pkgs.linuxPackages_2_6_39;
+  # To have a nicer initrd, even though the initrd can't mount an nfsroot now
+  boot.initrd.withExtraTools = true;
+
+  # To be able to use the systemTarball to catch troubles.
+  boot.crashDump = {
+    enable = true;
+    # Why not a recent kernel?
+    kernelPackages = pkgs.linuxPackages_3_2;
+  };
+
   nixpkgs.config = {
     packageOverrides = p: rec {
-      linux_2_6_39 = p.linux_2_6_39.override {
+      linux_3_2 = p.linux_3_2.override {
         extraConfig = ''
           # Enable drivers in kernel for most NICs.
           E1000 y
-- 
GitLab


From 533448ae3710ddc2c19d7c7ea6dc06ccbd80cfd4 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 19 Mar 2012 19:10:27 +0000
Subject: [PATCH 3507/5331] * udev: don't set the STARTUP flag anymore, since
 LVM no longer uses   it. * Don't call "vgscan" anymore; VG scans are supposed
 to be automatic.

svn path=/nixos/trunk/; revision=33275
---
 modules/services/hardware/udev.nix  | 8 ++------
 modules/system/boot/stage-1-init.sh | 3 ---
 modules/tasks/lvm.nix               | 4 ----
 3 files changed, 2 insertions(+), 13 deletions(-)

diff --git a/modules/services/hardware/udev.nix b/modules/services/hardware/udev.nix
index 70e6f72acd6..c4cd394108f 100644
--- a/modules/services/hardware/udev.nix
+++ b/modules/services/hardware/udev.nix
@@ -1,4 +1,4 @@
-{pkgs, config, ...}:
+{ config, pkgs, ... }:
 
 with pkgs.lib;
 
@@ -260,13 +260,9 @@ in
           ''
             # Let udev create device nodes for all modules that have already
             # been loaded into the kernel (or for which support is built into
-            # the kernel).  The `STARTUP' variable is needed to force
-            # the LVM rules to create device nodes.  See
-            # http://www.mail-archive.com/fedora-devel-list@redhat.com/msg10261.html
-            udevadm control --env=STARTUP=1
+            # the kernel).
             udevadm trigger --action=add
             udevadm settle || true # wait for udev to finish
-            udevadm control --env=STARTUP=
 
             initctl emit -n new-devices
           '';
diff --git a/modules/system/boot/stage-1-init.sh b/modules/system/boot/stage-1-init.sh
index 86c35f21fab..f3ad3313648 100644
--- a/modules/system/boot/stage-1-init.sh
+++ b/modules/system/boot/stage-1-init.sh
@@ -135,10 +135,8 @@ export UDEV_CONFIG_FILE=@udevConf@
 mkdir -p /dev/.udev # !!! bug in udev?
 mkdir -p /dev/.mdadm
 udevd --daemon
-udevadm control --env=STARTUP=1
 udevadm trigger --action=add
 udevadm settle || true
-udevadm control --env=STARTUP=
 
 
 # XXX: Use case usb->lvm will still fail, usb->luks->lvm is covered
@@ -146,7 +144,6 @@ udevadm control --env=STARTUP=
 
 
 echo "starting device mapper and LVM..."
-lvm vgscan
 lvm vgchange -ay
 
 if test -n "$debug1devices"; then fail; fi
diff --git a/modules/tasks/lvm.nix b/modules/tasks/lvm.nix
index f5a40c7f8ec..635146ac889 100644
--- a/modules/tasks/lvm.nix
+++ b/modules/tasks/lvm.nix
@@ -11,10 +11,6 @@
 
         script =
           ''
-            # Scan for block devices that might contain LVM physical volumes
-            # and volume groups.
-            ${pkgs.lvm2}/sbin/vgscan
-
             # Make all logical volumes on all volume groups available, i.e.,
             # make them appear in /dev.
             ${pkgs.lvm2}/sbin/vgchange --available y
-- 
GitLab


From a51a83bd8c38aa279fad454dfab059703c83bcb2 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 19 Mar 2012 19:34:06 +0000
Subject: [PATCH 3508/5331] * Drop obsolete line.

svn path=/nixos/trunk/; revision=33276
---
 modules/system/boot/stage-1.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/modules/system/boot/stage-1.nix b/modules/system/boot/stage-1.nix
index 9ad86312290..440255f6f6c 100644
--- a/modules/system/boot/stage-1.nix
+++ b/modules/system/boot/stage-1.nix
@@ -258,7 +258,6 @@ let
             --replace cdrom_id ${extraUtils}/bin/cdrom_id \
             --replace /sbin/blkid ${extraUtils}/bin/blkid \
             --replace /sbin/modprobe ${extraUtils}/bin/modprobe \
-            --replace '$env{DM_SBIN_PATH}/blkid' ${extraUtils}/bin/blkid \
             --replace 'ENV{DM_SBIN_PATH}="${pkgs.lvm2}/sbin"' 'ENV{DM_SBIN_PATH}="${extraUtils}/bin"' \
             --replace /sbin/mdadm ${extraUtils}/bin/mdadm
       done
-- 
GitLab


From 6093b54b73fc25c070b5a641593fcb835f02f252 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 19 Mar 2012 19:43:31 +0000
Subject: [PATCH 3509/5331] * Zabbix: use the path attribute.

svn path=/nixos/trunk/; revision=33278
---
 modules/services/monitoring/zabbix-agent.nix  | 4 +++-
 modules/services/monitoring/zabbix-server.nix | 4 ++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/modules/services/monitoring/zabbix-agent.nix b/modules/services/monitoring/zabbix-agent.nix
index 4d6b267c1a8..ce8e1843d4c 100644
--- a/modules/services/monitoring/zabbix-agent.nix
+++ b/modules/services/monitoring/zabbix-agent.nix
@@ -81,6 +81,8 @@ in
         startOn = "ip-up";
         stopOn = "stopping network-interfaces";
 
+        path = [ pkgs.zabbix.agent ];
+
         preStart =
           ''
             mkdir -m 0755 -p ${stateDir} ${logDir}
@@ -100,7 +102,7 @@ in
             mkfifo ${stateDir}/dummy2
             cat ${stateDir}/dummy2 &
             pid=$!
-            ${pkgs.zabbix.agent}/sbin/zabbix_agentd --config ${configFile} 100>${stateDir}/dummy2
+            zabbix_agentd --config ${configFile} 100>${stateDir}/dummy2
             wait "$pid"
           '';
 
diff --git a/modules/services/monitoring/zabbix-server.nix b/modules/services/monitoring/zabbix-server.nix
index 046c601cb4f..57fc69b3270 100644
--- a/modules/services/monitoring/zabbix-server.nix
+++ b/modules/services/monitoring/zabbix-server.nix
@@ -95,7 +95,7 @@ in
             fi
           '';
 
-        path = [ pkgs.nettools ];
+        path = [ pkgs.nettools pkgs.zabbix.server ];
 
         # Zabbix doesn't have an option not to daemonize, and doesn't
         # daemonize in a way that allows Upstart to track it.  So to
@@ -109,7 +109,7 @@ in
             mkfifo ${stateDir}/dummy
             cat ${stateDir}/dummy &
             pid=$!
-            ${pkgs.zabbix.server}/sbin/zabbix_server --config ${configFile} 100>${stateDir}/dummy
+            zabbix_server --config ${configFile} 100>${stateDir}/dummy
             wait "$pid"
           '';
 
-- 
GitLab


From 14dd95b692417b3086ca54bf1366d9937ab5ef82 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Mon, 19 Mar 2012 23:57:26 +0000
Subject: [PATCH 3510/5331] xserver.nix: Automatically support xorg's own video
 drivers

svn path=/nixos/trunk/; revision=33281
---
 modules/services/x11/xserver.nix | 11 +----------
 1 file changed, 1 insertion(+), 10 deletions(-)

diff --git a/modules/services/x11/xserver.nix b/modules/services/x11/xserver.nix
index 3664264cbc3..b19e5332b14 100644
--- a/modules/services/x11/xserver.nix
+++ b/modules/services/x11/xserver.nix
@@ -13,21 +13,12 @@ let
 
   # Map video driver names to driver packages.
   knownVideoDrivers = {
-    ati          = { modules = [ xorg.xf86videoati ]; };
     ati_unfree   = { modules = [ kernelPackages.ati_drivers_x11 ]; driverName = "fglrx"; };
-    cirrus       = { modules = [ xorg.xf86videocirrus ]; };
-    i810         = { modules = [ xorg.xf86videoi810 ]; };
-    intel        = { modules = [ xorg.xf86videointel ]; };
-    nv           = { modules = [ xorg.xf86videonv ]; };
     nvidia       = { modules = [ kernelPackages.nvidia_x11 ]; };
     nvidiaLegacy96 = { modules = [ kernelPackages.nvidia_x11_legacy96 ]; driverName = "nvidia"; };
     nvidiaLegacy173 = { modules = [ kernelPackages.nvidia_x11_legacy173 ]; driverName = "nvidia"; };
-    openchrome   = { modules = [ xorg.xf86videoopenchrome ]; };
-    sis          = { modules = [ xorg.xf86videosis ]; };
     unichrome    = { modules = [ pkgs.xorgVideoUnichrome ]; };
-    vesa         = { modules = [ xorg.xf86videovesa ]; };
     virtualbox   = { modules = [ kernelPackages.virtualboxGuestAdditions ]; driverName = "vboxvideo"; };
-    vmware       = { modules = [ xorg.xf86videovmware ]; };
   };
 
   driverNames =
@@ -35,7 +26,7 @@ let
 
   drivers = flip map driverNames
     (name: { inherit name; driverName = name; } //
-      attrByPath [name] (throw "unknown video driver `${name}'") knownVideoDrivers);
+      attrByPath [name] (if (hasAttr ("xf86video" + name) xorg) then { modules = [(getAttr ("xf86video" + name) xorg) ]; } else throw "unknown video driver `${name}'") knownVideoDrivers);
 
 
   fontsForXServer =
-- 
GitLab


From 724b5abe42ef3b99c81043988a6ad6b421bcac4b Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Tue, 20 Mar 2012 01:48:09 +0000
Subject: [PATCH 3511/5331] xf86-input-multitouch seems to be abandoned, update
 it with the mtrack fork

svn path=/nixos/trunk/; revision=33283
---
 modules/services/x11/hardware/multitouch.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/modules/services/x11/hardware/multitouch.nix b/modules/services/x11/hardware/multitouch.nix
index ae0ae2e5a3a..054d726f05f 100644
--- a/modules/services/x11/hardware/multitouch.nix
+++ b/modules/services/x11/hardware/multitouch.nix
@@ -26,9 +26,9 @@ with pkgs.lib;
       ''
         # Automatically enable the multitouch driver
         Section "InputClass"
-          MatchIsTouchpad "true"
-          Identifier "Multitouch Touchpad"
-          Driver "multitouch"
+          MatchIsTouchpad "on"
+          Identifier "Touchpads"
+          Driver "mtrack"
         EndSection
       '';
 
-- 
GitLab


From 6435207dd1a75ec91250326eda66b41aa165e2ed Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Tue, 20 Mar 2012 01:56:39 +0000
Subject: [PATCH 3512/5331] Whoops, actually use the mtrack fork

svn path=/nixos/trunk/; revision=33285
---
 modules/services/x11/hardware/multitouch.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/services/x11/hardware/multitouch.nix b/modules/services/x11/hardware/multitouch.nix
index 054d726f05f..3aa2760f3f0 100644
--- a/modules/services/x11/hardware/multitouch.nix
+++ b/modules/services/x11/hardware/multitouch.nix
@@ -20,7 +20,7 @@ with pkgs.lib;
 
   config = mkIf config.services.xserver.multitouch.enable {
 
-    services.xserver.modules = [ pkgs.xf86_input_multitouch ];
+    services.xserver.modules = [ pkgs.xf86_input_mtrack ];
 
     services.xserver.config =
       ''
-- 
GitLab


From 0d67d95f32d7c39dd31f5823f589bc9c4bf3887f Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Tue, 20 Mar 2012 04:41:13 +0000
Subject: [PATCH 3513/5331] Add a module for the pommed tool for Apple laptop
 keyboards.

svn path=/nixos/trunk/; revision=33286
---
 modules/module-list.nix              |  1 +
 modules/services/hardware/pommed.nix | 47 ++++++++++++++++++++++++++++
 2 files changed, 48 insertions(+)
 create mode 100644 modules/services/hardware/pommed.nix

diff --git a/modules/module-list.nix b/modules/module-list.nix
index 5eadfe0185c..97c7b9fef1f 100644
--- a/modules/module-list.nix
+++ b/modules/module-list.nix
@@ -75,6 +75,7 @@
   ./services/hardware/hal.nix
   ./services/hardware/nvidia-optimus.nix
   ./services/hardware/pcscd.nix
+  ./services/hardware/pommed.nix
   ./services/hardware/sane.nix
   ./services/hardware/udev.nix
   ./services/hardware/udisks.nix
diff --git a/modules/services/hardware/pommed.nix b/modules/services/hardware/pommed.nix
new file mode 100644
index 00000000000..84f2925c4ae
--- /dev/null
+++ b/modules/services/hardware/pommed.nix
@@ -0,0 +1,47 @@
+{ config, pkgs, ... }:
+
+with pkgs.lib;
+
+{
+
+  options.services.hardware.pommed = {
+    enable = mkOption {
+      default = false;
+       description = ''
+        Whether to use the pommed tool to handle Apple laptop keyboard hotkeys.
+      '';
+    };
+
+    configFile = mkOption {
+      default = builtins.toPath "${pkgs.pommed}/etc/pommed.conf";
+      description = ''
+        The contents of the pommed.conf file.
+      '';
+    };
+  };
+
+  config = mkIf config.services.hardware.pommed.enable {
+    environment.systemPackages = [ pkgs.polkit ];
+
+    environment.etc = [
+      { source = config.services.hardware.pommed.configFile;
+        target = "pommed.conf";
+      }
+    ];
+
+    services.dbus.packages = [ pkgs.pommed ];
+
+    jobs.pommed = { name = "pommed";
+
+      description = "Pommed hotkey management";
+
+      startOn = "started dbus";
+
+      postStop = "rm -f /var/run/pommed.pid";
+
+      exec = "${pkgs.pommed}/bin/pommed";
+
+      daemonType = "fork";
+    };
+  };
+}
-- 
GitLab


From d9e28560d13d500b9e962a7cc32ea863c2c6b269 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 20 Mar 2012 10:17:08 +0000
Subject: [PATCH 3514/5331] * Emit "expect daemon" for the mountall task. 
 Otherwise it may get a   USR1 signal before it has forked into the background
 (because it   will be in the start/running state immediately).

svn path=/nixos/trunk/; revision=33288
---
 modules/system/upstart/upstart.nix | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/modules/system/upstart/upstart.nix b/modules/system/upstart/upstart.nix
index d624fd31745..5a5f6016b57 100644
--- a/modules/system/upstart/upstart.nix
+++ b/modules/system/upstart/upstart.nix
@@ -116,13 +116,11 @@ let
             end script
           ''}
 
-          ${optionalString (!job.task) (
-             if job.daemonType == "fork" then "expect fork" else
-             if job.daemonType == "daemon" then "expect daemon" else
-             if job.daemonType == "stop" then "expect stop" else
-             if job.daemonType == "none" then "" else
-             throw "invalid daemon type `${job.daemonType}'"
-          )}
+          ${if job.daemonType == "fork" then "expect fork" else
+            if job.daemonType == "daemon" then "expect daemon" else
+            if job.daemonType == "stop" then "expect stop" else
+            if job.daemonType == "none" then "" else
+            throw "invalid daemon type `${job.daemonType}'"}
 
           ${optionalString (job.setuid != "") ''
             setuid ${job.setuid}
-- 
GitLab


From 11066067f7ca554aaf1de8264243bc162340681c Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Tue, 20 Mar 2012 16:29:22 +0000
Subject: [PATCH 3515/5331] Add nouveau xorg video driver

svn path=/nixos/trunk/; revision=33300
---
 modules/services/x11/xserver.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/modules/services/x11/xserver.nix b/modules/services/x11/xserver.nix
index b19e5332b14..2b8f6cf7d29 100644
--- a/modules/services/x11/xserver.nix
+++ b/modules/services/x11/xserver.nix
@@ -14,6 +14,7 @@ let
   # Map video driver names to driver packages.
   knownVideoDrivers = {
     ati_unfree   = { modules = [ kernelPackages.ati_drivers_x11 ]; driverName = "fglrx"; };
+    nouveau       = { modules = [ pkgs.xf86_video_nouveau ]; };
     nvidia       = { modules = [ kernelPackages.nvidia_x11 ]; };
     nvidiaLegacy96 = { modules = [ kernelPackages.nvidia_x11_legacy96 ]; driverName = "nvidia"; };
     nvidiaLegacy173 = { modules = [ kernelPackages.nvidia_x11_legacy173 ]; driverName = "nvidia"; };
-- 
GitLab


From 010578d8a4805a3461787cf38bde05ae60018382 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 20 Mar 2012 16:30:43 +0000
Subject: [PATCH 3516/5331] * Restrict VirtualBox to users in the vboxusers
 group.

  The VirtualBox build in Nixpkgs is insecure because it uses the
  "--disable-hardened" flag, which disables some checks in the
  VirtualBox kernel module.  Since getting rid of that flag looks like
  too much work, it's better to ensure that only explicitly permitted
  users have access to VirtualBox.

* Drop the 666 permission on "sonypi" because it's not clear why that
  device should be world-writable.

svn path=/nixos/trunk/; revision=33301
---
 modules/programs/virtualbox.nix    | 16 +++++++---------
 modules/services/hardware/udev.nix |  4 ----
 2 files changed, 7 insertions(+), 13 deletions(-)

diff --git a/modules/programs/virtualbox.nix b/modules/programs/virtualbox.nix
index 05209cb38e5..34b2c156632 100644
--- a/modules/programs/virtualbox.nix
+++ b/modules/programs/virtualbox.nix
@@ -9,13 +9,11 @@ let virtualbox = config.boot.kernelPackages.virtualbox; in
   boot.extraModulePackages = [ virtualbox ];
   environment.systemPackages = [ virtualbox ];
 
-  # ‘VBoxNetAdpCtl’ needs to be setuid root to allow users to create
-  # host-only networks (https://www.virtualbox.org/ticket/4014).
-  security.setuidOwners = singleton
-    { program = "VBoxNetAdpCtl";
-      source = "${virtualbox}/virtualbox/VBoxNetAdpCtl";
-      owner = "root";
-      group = "root";
-      setuid = true;
-    };
+  users.extraGroups = singleton { name = "vboxusers"; };
+  
+  services.udev.extraRules =
+    ''
+      KERNEL=="vboxdrv",    OWNER="root", GROUP="vboxusers", MODE="0660"
+      KERNEL=="vboxnetctl", OWNER="root", GROUP="root",      MODE="0600"
+    '';
 }
diff --git a/modules/services/hardware/udev.nix b/modules/services/hardware/udev.nix
index c4cd394108f..2a75212725a 100644
--- a/modules/services/hardware/udev.nix
+++ b/modules/services/hardware/udev.nix
@@ -17,12 +17,8 @@ let
   nixosRules = ''
 
     # Miscellaneous devices.
-    KERNEL=="sonypi",               MODE="0666"
     KERNEL=="kvm",                  MODE="0666"
     KERNEL=="kqemu",                MODE="0666"
-    KERNEL=="vboxdrv",  NAME="vboxdrv",  OWNER="root", GROUP="root", MODE="0666"
-    KERNEL=="vboxadd",  NAME="vboxadd",  OWNER="root", GROUP="root", MODE="0660"
-    KERNEL=="vboxuser", NAME="vboxuser", OWNER="root", GROUP="root", MODE="0666"
   '';
 
   # Perform substitutions in all udev rules files.
-- 
GitLab


From 70eb64c0250df734df1bff861e0bd7229b31f69f Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Tue, 20 Mar 2012 18:28:32 +0000
Subject: [PATCH 3517/5331] Pommed: find the 'eject' command in
 /var/setuid-wrappers:/home/shlevy/.nix-profile/bin:/home/shlevy/.nix-profile/sbin:/home/shlevy/.nix-profile/lib/kde4/libexec:/nix/var/nix/profiles/default/bin:/nix/var/nix/profiles/default/sbin:/nix/var/nix/profiles/default/lib/kde4/libexec:/var/run/current-system/sw/bin:/var/run/current-system/sw/sbin:/var/run/current-system/sw/lib/kde4/libexec

svn path=/nixos/trunk/; revision=33302
---
 modules/services/hardware/pommed.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/modules/services/hardware/pommed.nix b/modules/services/hardware/pommed.nix
index 84f2925c4ae..63c783f5c6d 100644
--- a/modules/services/hardware/pommed.nix
+++ b/modules/services/hardware/pommed.nix
@@ -42,6 +42,8 @@ with pkgs.lib;
       exec = "${pkgs.pommed}/bin/pommed";
 
       daemonType = "fork";
+
+      path = [ pkgs.eject ];
     };
   };
 }
-- 
GitLab


From 9d72a2a606743fb0fd5ead60621c39af2a3b953d Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 20 Mar 2012 21:38:38 +0000
Subject: [PATCH 3518/5331] * Wait for RAID resync to complete before
 rebooting.  Booting off an   unsynced volume tends to fail. 
 (http://hydra.nixos.org/build/2310338)

svn path=/nixos/trunk/; revision=33307
---
 tests/installer.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/tests/installer.nix b/tests/installer.nix
index 06071bb0da2..a0c3102c042 100644
--- a/tests/installer.nix
+++ b/tests/installer.nix
@@ -282,7 +282,9 @@ in {
               "ls -l /dev/vda* >&2",
               "cat /proc/partitions >&2",
               "mdadm --create --force /dev/md0 --metadata 1.2 --level=raid1 --raid-devices=2 /dev/vda5 /dev/vda6",
+              "mdadm -W /dev/md0", # wait for sync to finish; booting off an unsynced device tends to fail
               "mdadm --create --force /dev/md1 --metadata 1.2 --level=raid1 --raid-devices=2 /dev/vda7 /dev/vda8",
+              "mdadm -W /dev/md1",
               "mkswap -f /dev/md1 -L swap",
               "swapon -L swap",
               "mkfs.ext3 -L nixos /dev/md0",
-- 
GitLab


From e86427f0374bf0ce18a5529bd1bdbb4d50ca3556 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 20 Mar 2012 21:43:13 +0000
Subject: [PATCH 3519/5331] * Remove an obsolete line.

svn path=/nixos/trunk/; revision=33308
---
 modules/system/boot/stage-2-init.sh | 4 ----
 modules/system/boot/stage-2.nix     | 1 -
 2 files changed, 5 deletions(-)

diff --git a/modules/system/boot/stage-2-init.sh b/modules/system/boot/stage-2-init.sh
index 5bee0380003..ccfa1d0784c 100644
--- a/modules/system/boot/stage-2-init.sh
+++ b/modules/system/boot/stage-2-init.sh
@@ -160,10 +160,6 @@ ln -sfn "$systemConfig" /var/run/booted-system
 ln -sfn /var/run/booted-system /nix/var/nix/gcroots/booted-system
 
 
-# Ensure that the module tools can find the kernel modules.
-export MODULE_DIR=@kernel@/lib/modules/
-
-
 # Run any user-specified commands.
 @shell@ @postBootCommands@
 
diff --git a/modules/system/boot/stage-2.nix b/modules/system/boot/stage-2.nix
index 35b1aead1b0..906f5e69188 100644
--- a/modules/system/boot/stage-2.nix
+++ b/modules/system/boot/stage-2.nix
@@ -51,7 +51,6 @@ let
     src = ./stage-2-init.sh;
     shellDebug = "${pkgs.bashInteractive}/bin/bash";
     isExecutable = true;
-    inherit kernel;
     inherit (config.boot) devShmSize runSize;
     ttyGid = config.ids.gids.tty;
     upstart = config.system.build.upstart;
-- 
GitLab


From a22bdbaeda0ed8e3a321c162c9a8243a8fcafe8c Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 20 Mar 2012 21:45:24 +0000
Subject: [PATCH 3520/5331] * I hate asynchronous commands.

svn path=/nixos/trunk/; revision=33310
---
 tests/installer.nix | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/tests/installer.nix b/tests/installer.nix
index a0c3102c042..2a6bca34e7d 100644
--- a/tests/installer.nix
+++ b/tests/installer.nix
@@ -282,9 +282,8 @@ in {
               "ls -l /dev/vda* >&2",
               "cat /proc/partitions >&2",
               "mdadm --create --force /dev/md0 --metadata 1.2 --level=raid1 --raid-devices=2 /dev/vda5 /dev/vda6",
-              "mdadm -W /dev/md0", # wait for sync to finish; booting off an unsynced device tends to fail
               "mdadm --create --force /dev/md1 --metadata 1.2 --level=raid1 --raid-devices=2 /dev/vda7 /dev/vda8",
-              "mdadm -W /dev/md1",
+              "udevadm settle",
               "mkswap -f /dev/md1 -L swap",
               "swapon -L swap",
               "mkfs.ext3 -L nixos /dev/md0",
@@ -292,6 +291,9 @@ in {
               "mkfs.ext3 -L boot /dev/vda1",
               "mkdir /mnt/boot",
               "mount LABEL=boot /mnt/boot",
+              "udevadm settle",
+              "mdadm -W /dev/md0", # wait for sync to finish; booting off an unsynced device tends to fail
+              "mdadm -W /dev/md1",
           );
         '';
       fileSystems = rootFS + bootFS;
-- 
GitLab


From 6af26254ad5601a8a25717b53dea4ff21ada61bc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Tue, 20 Mar 2012 22:00:32 +0000
Subject: [PATCH 3521/5331] Adding xfs support at supportedFilesystems

svn path=/nixos/trunk/; revision=33311
---
 modules/module-list.nix           |  1 +
 modules/tasks/filesystems/xfs.nix | 29 +++++++++++++++++++++++++++++
 2 files changed, 30 insertions(+)
 create mode 100644 modules/tasks/filesystems/xfs.nix

diff --git a/modules/module-list.nix b/modules/module-list.nix
index 97c7b9fef1f..549e4acdc0f 100644
--- a/modules/module-list.nix
+++ b/modules/module-list.nix
@@ -208,6 +208,7 @@
   ./tasks/filesystems/nfs.nix
   ./tasks/filesystems/reiserfs.nix
   ./tasks/filesystems/vfat.nix
+  ./tasks/filesystems/xfs.nix
   ./tasks/kbd.nix
   ./tasks/lvm.nix
   ./tasks/network-interfaces.nix
diff --git a/modules/tasks/filesystems/xfs.nix b/modules/tasks/filesystems/xfs.nix
new file mode 100644
index 00000000000..fbc0fe5ccb1
--- /dev/null
+++ b/modules/tasks/filesystems/xfs.nix
@@ -0,0 +1,29 @@
+{ config, pkgs, ... }:
+
+with pkgs.lib;
+
+let
+
+  inInitrd = any (fs: fs == "xfs") config.boot.initrd.supportedFilesystems;
+
+in
+
+{
+  config = mkIf (any (fs: fs == "xfs") config.boot.supportedFilesystems) {
+
+    system.fsPackages = [ pkgs.xfsprogs ];
+
+    boot.initrd.kernelModules = mkIf inInitrd [ "xfs" ];
+
+    boot.initrd.extraUtilsCommands = mkIf inInitrd
+      ''
+        cp -v ${pkgs.xfsprogs}/sbin/fsck.xfs $out/bin
+      '';
+
+    # Trick just to set 'sh' after the extraUtils nuke-refs.
+    boot.initrd.extraUtilsCommandsTest = mkIf inInitrd
+      ''
+        sed -i -e 's,^#!.*,#!'$out/bin/sh, $out/bin/fsck.xfs
+      '';
+  };
+}
-- 
GitLab


From 6f03065dcee8ddab1b815796a159ed5621d0f9d0 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 20 Mar 2012 22:02:27 +0000
Subject: [PATCH 3522/5331] * Move the setting of $MODULE_DIR to modprobe.nix.
 * Add a slash to the end of $MODULE_DIR, as expected by depmod.  (Not   that
 running depmod from the command line is all that useful, since   you can't
 use it to update the tree in the Nix store.  But at least   commands like
 "depmod -n" work now.)  Reported by Kirill Elagin on   IRC.

svn path=/nixos/trunk/; revision=33312
---
 modules/programs/bash/bash.nix   | 1 -
 modules/programs/bash/profile.sh | 1 -
 modules/system/boot/modprobe.nix | 9 +++++++--
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/modules/programs/bash/bash.nix b/modules/programs/bash/bash.nix
index 626ed722536..51654b164a0 100644
--- a/modules/programs/bash/bash.nix
+++ b/modules/programs/bash/bash.nix
@@ -30,7 +30,6 @@ in
         source = pkgs.substituteAll {
           src = ./profile.sh;
           wrapperDir = config.security.wrapperDir;
-          modulesTree = config.system.modulesTree;
           shellInit = config.environment.shellInit;
         };
         target = "profile";
diff --git a/modules/programs/bash/profile.sh b/modules/programs/bash/profile.sh
index 152b83107a1..c0f8702117e 100644
--- a/modules/programs/bash/profile.sh
+++ b/modules/programs/bash/profile.sh
@@ -14,7 +14,6 @@ export __ETC_PROFILE_DONE=1
 # Initialise a bunch of environment variables.
 export LOCALE_ARCHIVE=/var/run/current-system/sw/lib/locale/locale-archive
 export LD_LIBRARY_PATH=/var/run/opengl-driver/lib:/var/run/opengl-driver-32/lib # !!! only set if needed
-export MODULE_DIR=@modulesTree@/lib/modules
 export NIXPKGS_CONFIG=/nix/etc/config.nix
 export NIX_PATH=nixpkgs=/etc/nixos/nixpkgs:nixos=/etc/nixos/nixos:nixos-config=/etc/nixos/configuration.nix:services=/etc/nixos/services
 export PAGER="less -R"
diff --git a/modules/system/boot/modprobe.nix b/modules/system/boot/modprobe.nix
index ef3ed3bed94..f210ecec26d 100644
--- a/modules/system/boot/modprobe.nix
+++ b/modules/system/boot/modprobe.nix
@@ -18,13 +18,13 @@ with pkgs.lib;
         text =
           ''
             #! ${pkgs.stdenv.shell}
-            export MODULE_DIR=${config.system.modulesTree}/lib/modules
+            export MODULE_DIR=${config.system.modulesTree}/lib/modules/
 
             # Fall back to the kernel modules used at boot time if the
             # modules in the current configuration don't match the
             # running kernel.
             if [ ! -d "$MODULE_DIR/$(${pkgs.coreutils}/bin/uname -r)" ]; then
-                MODULE_DIR=/var/run/booted-system/kernel-modules/lib/modules
+                MODULE_DIR=/var/run/booted-system/kernel-modules/lib/modules/
             fi
 
             exec ${pkgs.module_init_tools}/sbin/modprobe "$@"
@@ -102,6 +102,11 @@ with pkgs.lib;
         echo ${config.system.sbin.modprobe}/sbin/modprobe > /proc/sys/kernel/modprobe
       '';
 
+    environment.shellInit =
+      ''
+        export MODULE_DIR=${config.system.modulesTree}/lib/modules/
+      '';    
+
   };
 
 }
-- 
GitLab


From 7a9a33e90d5fe64c3ec68fcc316ea5d67742555e Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Wed, 21 Mar 2012 02:05:52 +0000
Subject: [PATCH 3523/5331] efi-boot-stub: Give startup.sh files more
 descriptive names

svn path=/nixos/trunk/; revision=33321
---
 modules/installer/efi-boot-stub/efi-boot-stub-builder.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/installer/efi-boot-stub/efi-boot-stub-builder.sh b/modules/installer/efi-boot-stub/efi-boot-stub-builder.sh
index 26b2f48fd26..145b406922b 100644
--- a/modules/installer/efi-boot-stub/efi-boot-stub-builder.sh
+++ b/modules/installer/efi-boot-stub/efi-boot-stub-builder.sh
@@ -54,7 +54,7 @@ addEntry() {
     copyToKernelsDir $kernel; kernel=$result
     copyToKernelsDir $initrd; initrd=$result
 
-    local startup="@efiSysMountPoint@/efi/nixos/$(cleanName $(readlink -f $path))-startup.nsh"
+    local startup="@efiSysMountPoint@/efi/nixos/generation-$generation-startup.nsh"
     if ! test -e $startup; then
         local dstTmp=$startup.tmp.$$
 	echo "$(echo $kernel | sed 's|@efiSysMountPoint@||' | sed 's|/|\\|g') systemConfig=$(readlink -f $path) init=$(readlink -f $path/init) initrd=$(echo $initrd | sed 's|@efiSysMountPoint@||' | sed 's|/|\\|g') $(cat $path/kernel-params)" > $dstTmp
-- 
GitLab


From 20edb255bdb855b490182eab8a64f2f137e4b108 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Wed, 21 Mar 2012 11:58:06 +0000
Subject: [PATCH 3524/5331] Adding idmapd, for NFSv4.

Patch by Rickard Nilsson.

This may fix rpc.statd start.


svn path=/nixos/trunk/; revision=33330
---
 modules/services/network-filesystems/nfsd.nix |  3 +-
 modules/tasks/filesystems.nix                 |  1 +
 modules/tasks/filesystems/nfs.nix             | 52 +++++++++++++++++--
 3 files changed, 52 insertions(+), 4 deletions(-)

diff --git a/modules/services/network-filesystems/nfsd.nix b/modules/services/network-filesystems/nfsd.nix
index fe939d34d3f..d1c280cf000 100644
--- a/modules/services/network-filesystems/nfsd.nix
+++ b/modules/services/network-filesystems/nfsd.nix
@@ -69,7 +69,7 @@ in
 
     services.portmap.enable = true;
 
-    services.nfs.client.enable = true; # needed for statd
+    services.nfs.client.enable = true; # needed for statd and idmapd
 
     environment.systemPackages = [ pkgs.nfsUtils ];
 
@@ -105,6 +105,7 @@ in
         postStart =
           ''
             ensure statd
+            ensure idmapd
           '';
       };
 
diff --git a/modules/tasks/filesystems.nix b/modules/tasks/filesystems.nix
index 383035bba83..57a020a4a25 100644
--- a/modules/tasks/filesystems.nix
+++ b/modules/tasks/filesystems.nix
@@ -187,6 +187,7 @@ in
             
             ${optionalString config.services.nfs.client.enable ''
               ensure statd || true
+              ensure idmapd || true
             ''}
 
             echo "mounting filesystems..."
diff --git a/modules/tasks/filesystems/nfs.nix b/modules/tasks/filesystems/nfs.nix
index 2426a52ee51..ceb21c873ca 100644
--- a/modules/tasks/filesystems/nfs.nix
+++ b/modules/tasks/filesystems/nfs.nix
@@ -6,6 +6,27 @@ let
 
   inInitrd = any (fs: fs == "nfs") config.boot.initrd.supportedFilesystems;
 
+  nfsStateDir = "/var/lib/nfs";
+
+  rpcMountpoint = "${nfsStateDir}/rpc_pipefs";
+
+  idmapdConfFile = {
+    target = "idmapd.conf";
+    source = pkgs.writeText "idmapd.conf" ''
+      [General]
+      Pipefs-Directory = ${rpcMountpoint}
+      ${optionalString (config.networking.domain != "")
+        "Domain = ${config.networking.domain}"}
+
+      [Mapping]
+      Nobody-User = nobody
+      Nobody-Group = nogroup
+
+      [Translation]
+      Method = nsswitch
+    '';
+  };
+
 in
 
 {
@@ -40,6 +61,8 @@ in
         cp -v ${pkgs.klibc}/lib/klibc/bin.static/nfsmount $out/bin
       '';
 
+    environment.etc = singleton idmapdConfFile;
+
     jobs.statd =
       { description = "Kernel NFS server - Network Status Monitor";
 
@@ -50,9 +73,8 @@ in
         preStart =
           ''
             ensure portmap
-            mkdir -p /var/lib/nfs
-            mkdir -p /var/lib/nfs/sm
-            mkdir -p /var/lib/nfs/sm.bak
+            mkdir -p ${nfsStateDir}/sm
+            mkdir -p ${nfsStateDir}/sm.bak
             sm-notify -d
           '';
 
@@ -61,5 +83,29 @@ in
         exec = "rpc.statd --no-notify";
       };
 
+    jobs.idmapd =
+      { description = "Kernel NFS server - ID Map Daemon";
+
+        path = [ pkgs.nfsUtils pkgs.sysvtools pkgs.utillinux ];
+
+        stopOn = "starting shutdown";
+
+        preStart =
+          ''
+            ensure portmap
+            mkdir -p ${rpcMountpoint}
+            mount -t rpc_pipefs rpc_pipefs ${rpcMountpoint}
+          '';
+
+        postStop =
+          ''
+            umount ${rpcMountpoint}
+          '';
+
+        daemonType = "fork";
+
+        exec = "rpc.idmapd";
+      };
+
   };
 }
-- 
GitLab


From 8884d445b7f77e713ea413839641eb21248871ae Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 21 Mar 2012 12:28:14 +0000
Subject: [PATCH 3525/5331] * VirtualBox: create a vboxnet0 interface by
 default.

svn path=/nixos/trunk/; revision=33331
---
 modules/programs/virtualbox.nix | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/modules/programs/virtualbox.nix b/modules/programs/virtualbox.nix
index 34b2c156632..60f58c922b9 100644
--- a/modules/programs/virtualbox.nix
+++ b/modules/programs/virtualbox.nix
@@ -16,4 +16,20 @@ let virtualbox = config.boot.kernelPackages.virtualbox; in
       KERNEL=="vboxdrv",    OWNER="root", GROUP="vboxusers", MODE="0660"
       KERNEL=="vboxnetctl", OWNER="root", GROUP="root",      MODE="0600"
     '';
+
+  # Since we lack the right setuid binaries, set up a host-only network by default.
+  
+  jobs."create-vboxnet0" =
+    { task = true;
+      path = [ virtualbox ];
+      startOn = "starting network-interfaces";
+      script =
+        ''
+          if ! [ -e /sys/class/net/vboxnet0 ]; then
+            VBoxManage hostonlyif create
+          fi
+        '';
+    };
+
+  networking.interfaces = [ { name = "vboxnet0"; ipAddress = "192.168.56.1"; } ];
 }
-- 
GitLab


From d12339b28295327452ad7c4e0ca9ddd7836e7cfd Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 21 Mar 2012 12:38:11 +0000
Subject: [PATCH 3526/5331] * Doh.

svn path=/nixos/trunk/; revision=33332
---
 modules/programs/virtualbox.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/programs/virtualbox.nix b/modules/programs/virtualbox.nix
index 60f58c922b9..cb293563dfd 100644
--- a/modules/programs/virtualbox.nix
+++ b/modules/programs/virtualbox.nix
@@ -31,5 +31,5 @@ let virtualbox = config.boot.kernelPackages.virtualbox; in
         '';
     };
 
-  networking.interfaces = [ { name = "vboxnet0"; ipAddress = "192.168.56.1"; } ];
+  networking.interfaces = [ { name = "vboxnet0"; ipAddress = "192.168.56.1"; subnetMask = "255.255.255.0"; } ];
 }
-- 
GitLab


From a4a355f76403d6e04392738c710623afbc663266 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 21 Mar 2012 17:49:54 +0000
Subject: [PATCH 3527/5331] * Make dhcpcd the default DHCP client.

svn path=/nixos/trunk/; revision=33339
---
 modules/module-list.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/module-list.nix b/modules/module-list.nix
index 549e4acdc0f..1bd91093402 100644
--- a/modules/module-list.nix
+++ b/modules/module-list.nix
@@ -116,8 +116,8 @@
   ./services/networking/bitlbee.nix
   ./services/networking/cntlm.nix
   ./services/networking/ddclient.nix
-  ./services/networking/dhclient.nix
-  #./services/networking/dhcpcd.nix
+  #./services/networking/dhclient.nix
+  ./services/networking/dhcpcd.nix
   ./services/networking/dhcpd.nix
   ./services/networking/dnsmasq.nix
   ./services/networking/ejabberd.nix
-- 
GitLab


From 5ddae4a83afacd2fabc69f965cdaa7bd04c3f1c5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Wed, 21 Mar 2012 20:37:37 +0000
Subject: [PATCH 3528/5331] Changing portmap by rpcbind on nfs services.

That could make rpc.statd work.

Patch by Rickard Nilsson.

I'm not sure we need that netconfig file in etc.


svn path=/nixos/trunk/; revision=33342
---
 modules/module-list.nix                       |  1 +
 modules/services/network-filesystems/nfsd.nix |  6 +-
 modules/services/networking/rpcbind.nix       | 80 +++++++++++++++++++
 modules/tasks/filesystems/nfs.nix             |  6 +-
 4 files changed, 87 insertions(+), 6 deletions(-)
 create mode 100644 modules/services/networking/rpcbind.nix

diff --git a/modules/module-list.nix b/modules/module-list.nix
index 1bd91093402..27be032f3b7 100644
--- a/modules/module-list.nix
+++ b/modules/module-list.nix
@@ -141,6 +141,7 @@
   ./services/networking/quassel.nix
   ./services/networking/radvd.nix
   ./services/networking/rdnssd.nix
+  ./services/networking/rpcbind.nix
   ./services/networking/sabnzbd.nix
   ./services/networking/ssh/lshd.nix
   ./services/networking/ssh/sshd.nix
diff --git a/modules/services/network-filesystems/nfsd.nix b/modules/services/network-filesystems/nfsd.nix
index d1c280cf000..dba2db22621 100644
--- a/modules/services/network-filesystems/nfsd.nix
+++ b/modules/services/network-filesystems/nfsd.nix
@@ -67,7 +67,7 @@ in
 
   config = mkIf cfg.enable {
 
-    services.portmap.enable = true;
+    services.rpcbind.enable = true;
 
     services.nfs.client.enable = true; # needed for statd and idmapd
 
@@ -89,7 +89,7 @@ in
 
         preStart =
           ''
-            ensure portmap
+            ensure rpcbind
             ensure mountd
 
             # Create a state directory required by NFSv4.
@@ -116,7 +116,7 @@ in
 
         preStart =
           ''
-            ensure portmap
+            ensure rpcbind
 
             mkdir -p /var/lib/nfs
             touch /var/lib/nfs/rmtab
diff --git a/modules/services/networking/rpcbind.nix b/modules/services/networking/rpcbind.nix
new file mode 100644
index 00000000000..5437d221c1e
--- /dev/null
+++ b/modules/services/networking/rpcbind.nix
@@ -0,0 +1,80 @@
+{ config, pkgs, ... }:
+
+with pkgs.lib;
+
+let
+
+  netconfigFile = {
+    target = "netconfig";
+    source = pkgs.writeText "netconfig" ''
+      #
+      # The network configuration file. This file is currently only used in
+      # conjunction with the TI-RPC code in the libtirpc library.
+      #
+      # Entries consist of:
+      #
+      #       <network_id> <semantics> <flags> <protofamily> <protoname> \
+      #               <device> <nametoaddr_libs>
+      #
+      # The <device> and <nametoaddr_libs> fields are always empty in this
+      # implementation.
+      #
+      udp        tpi_clts      v     inet     udp     -       -
+      tcp        tpi_cots_ord  v     inet     tcp     -       -
+      udp6       tpi_clts      v     inet6    udp     -       -
+      tcp6       tpi_cots_ord  v     inet6    tcp     -       -
+      rawip      tpi_raw       -     inet      -      -       -
+      local      tpi_cots_ord  -     loopback  -      -       -
+      unix       tpi_cots_ord  -     loopback  -      -       -
+    '';
+  };
+
+
+in
+
+{
+
+  ###### interface
+
+  options = {
+
+    services.rpcbind = {
+
+      enable = mkOption {
+        default = false;
+        description = ''
+          Whether to enable `rpcbind', an ONC RPC directory service
+          notably used by NFS and NIS, and which can be queried
+          using the rpcinfo(1) command. `rpcbind` is a replacement for
+          `portmap`.
+        '';
+      };
+
+    };
+
+  };
+
+
+  ###### implementation
+
+  config = mkIf config.services.rpcbind.enable {
+
+    environment.etc = [netconfigFile];
+
+    jobs.rpcbind =
+      { description = "ONC RPC rpcbind";
+
+        startOn = "started network-interfaces";
+        stopOn = "";
+
+        daemonType = "fork";
+
+        exec =
+          ''
+            ${pkgs.rpcbind}/bin/rpcbind
+          '';
+      };
+
+  };
+
+}
diff --git a/modules/tasks/filesystems/nfs.nix b/modules/tasks/filesystems/nfs.nix
index ceb21c873ca..e54cb814f50 100644
--- a/modules/tasks/filesystems/nfs.nix
+++ b/modules/tasks/filesystems/nfs.nix
@@ -49,7 +49,7 @@ in
 
   config = mkIf config.services.nfs.client.enable {
 
-    services.portmap.enable = true;
+    services.rpcbind.enable = true;
     
     system.fsPackages = [ pkgs.nfsUtils ];
 
@@ -72,7 +72,7 @@ in
 
         preStart =
           ''
-            ensure portmap
+            ensure rpcbind
             mkdir -p ${nfsStateDir}/sm
             mkdir -p ${nfsStateDir}/sm.bak
             sm-notify -d
@@ -92,7 +92,7 @@ in
 
         preStart =
           ''
-            ensure portmap
+            ensure rpcbind
             mkdir -p ${rpcMountpoint}
             mount -t rpc_pipefs rpc_pipefs ${rpcMountpoint}
           '';
-- 
GitLab


From 89a21f7a7dc4aec142a8645c60a8eccc7b33da70 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 22 Mar 2012 10:11:15 +0000
Subject: [PATCH 3529/5331] * GIDs are supposed to match UIDs.

svn path=/nixos/trunk/; revision=33346
---
 modules/misc/ids.nix                   | 6 +++---
 modules/services/networking/prayer.nix | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/modules/misc/ids.nix b/modules/misc/ids.nix
index a0ac4dab5b1..1f5d0d3b5a5 100644
--- a/modules/misc/ids.nix
+++ b/modules/misc/ids.nix
@@ -115,9 +115,9 @@ in
     fourStore = 42;
     fourStoreEndpoint = 43;
     virtuoso = 44;
-    dovecot2 = 45;
-    prayer = 46;
-    mpd = 47;
+    dovecot2 = 46;
+    prayer = 49;
+    mpd = 50;
 
     # When adding a gid, make sure it doesn't match an existing uid.
 
diff --git a/modules/services/networking/prayer.nix b/modules/services/networking/prayer.nix
index adfce5a5030..0424a252087 100644
--- a/modules/services/networking/prayer.nix
+++ b/modules/services/networking/prayer.nix
@@ -72,7 +72,7 @@ in
     users.extraUsers = singleton
       { name = prayerUser;
         uid = config.ids.uids.prayer;
-        description = "prayer daemon user";
+        description = "Prayer daemon user";
         home = stateDir;
       };
 
-- 
GitLab


From 293e3a784ddbabc4c45e39b9017f362c46ec397b Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 22 Mar 2012 10:17:10 +0000
Subject: [PATCH 3530/5331] =?UTF-8?q?*=20Ensure=20a=20consitent=20umask=20?=
 =?UTF-8?q?in=20the=20activation=20script=20(reported=20by=20=20=20Llu?=
 =?UTF-8?q?=C3=ADs).?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

svn path=/nixos/trunk/; revision=33347
---
 modules/system/activation/activation-script.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/modules/system/activation/activation-script.nix b/modules/system/activation/activation-script.nix
index 924d6f680fc..f4baebd2b2b 100644
--- a/modules/system/activation/activation-script.nix
+++ b/modules/system/activation/activation-script.nix
@@ -59,9 +59,12 @@ in
 
             export PATH=/empty
             for i in ${toString path}; do
-                PATH=$PATH:$i/bin:$i/sbin;
+                PATH=$PATH:$i/bin:$i/sbin
             done
 
+            # Ensure a consistent umask.
+            umask 0022
+
             ${
               let
                 set' = mapAttrs (n: v: if builtins.isString v then noDepEntry v else v) set;
-- 
GitLab


From 2a135eb4d41e6046578e4520a52a92991b733e7c Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 22 Mar 2012 12:24:23 +0000
Subject: [PATCH 3531/5331] =?UTF-8?q?*=20Remove=20the=20=E2=80=98services.?=
 =?UTF-8?q?nfs.client.enable=E2=80=99=20flag;=20use=20=20=20=E2=80=98boot.?=
 =?UTF-8?q?supportedFilesystems=20=3D=20[=20"nfs"=20]=E2=80=99=20if=20need?=
 =?UTF-8?q?ed.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

svn path=/nixos/trunk/; revision=33356
---
 modules/services/network-filesystems/nfsd.nix |  2 +-
 modules/tasks/filesystems.nix                 |  6 -----
 modules/tasks/filesystems/nfs.nix             | 23 +++++++------------
 3 files changed, 9 insertions(+), 22 deletions(-)

diff --git a/modules/services/network-filesystems/nfsd.nix b/modules/services/network-filesystems/nfsd.nix
index dba2db22621..b4dc014d68e 100644
--- a/modules/services/network-filesystems/nfsd.nix
+++ b/modules/services/network-filesystems/nfsd.nix
@@ -69,7 +69,7 @@ in
 
     services.rpcbind.enable = true;
 
-    services.nfs.client.enable = true; # needed for statd and idmapd
+    boot.supportedFilesystems = [ "nfs" ]; # needed for statd and idmapd
 
     environment.systemPackages = [ pkgs.nfsUtils ];
 
diff --git a/modules/tasks/filesystems.nix b/modules/tasks/filesystems.nix
index 57a020a4a25..739d63bf479 100644
--- a/modules/tasks/filesystems.nix
+++ b/modules/tasks/filesystems.nix
@@ -184,12 +184,6 @@ in
           ''
             # Ensure that this job is restarted when fstab changed:
             # ${fstab}
-            
-            ${optionalString config.services.nfs.client.enable ''
-              ensure statd || true
-              ensure idmapd || true
-            ''}
-
             echo "mounting filesystems..."
           '';
 
diff --git a/modules/tasks/filesystems/nfs.nix b/modules/tasks/filesystems/nfs.nix
index e54cb814f50..740a3b6e447 100644
--- a/modules/tasks/filesystems/nfs.nix
+++ b/modules/tasks/filesystems/nfs.nix
@@ -31,23 +31,9 @@ in
 
 {
 
-  ###### interface
-
-  options = {
-
-    services.nfs.client.enable = mkOption {
-      default = any (fs: fs.fsType == "nfs" || fs.fsType == "nfs4") config.fileSystems;
-      description = ''
-        Whether to enable support for mounting NFS filesystems.
-      '';
-    };
-
-  };
-
-
   ###### implementation
 
-  config = mkIf config.services.nfs.client.enable {
+  config = mkIf (any (fs: fs == "nfs" || fs == "nfs4") config.boot.supportedFilesystems) {
 
     services.rpcbind.enable = true;
     
@@ -63,6 +49,13 @@ in
 
     environment.etc = singleton idmapdConfFile;
 
+    # Ensure that statd and idmapd are started before mountall.
+    jobs.mountall.preStart =
+      ''
+        ensure statd || true
+        ensure idmapd || true
+      '';
+
     jobs.statd =
       { description = "Kernel NFS server - Network Status Monitor";
 
-- 
GitLab


From a525074f4327aa5a6ed99936804d5ca82b4a840c Mon Sep 17 00:00:00 2001
From: Rob Vermaas <rob.vermaas@gmail.com>
Date: Thu, 22 Mar 2012 12:58:45 +0000
Subject: [PATCH 3532/5331] increase size of virtualbox image

svn path=/nixos/trunk/; revision=33357
---
 modules/virtualisation/virtualbox-image.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/virtualisation/virtualbox-image.nix b/modules/virtualisation/virtualbox-image.nix
index 7079b43708d..c3fbf344bfb 100644
--- a/modules/virtualisation/virtualbox-image.nix
+++ b/modules/virtualisation/virtualbox-image.nix
@@ -10,7 +10,7 @@ with pkgs.lib;
             ''
               mkdir $out
               diskImage=$out/image
-              ${pkgs.vmTools.kvm}/bin/qemu-img create -f raw $diskImage "4G"
+              ${pkgs.vmTools.kvm}/bin/qemu-img create -f raw $diskImage "10G"
               mv closure xchg/
             '';
           postVM =
-- 
GitLab


From 4ae7819c3943b65132db292544afba998105bd2c Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 22 Mar 2012 13:01:06 +0000
Subject: [PATCH 3533/5331] * The idmapd job requires the sunrpc kernel module
 to be loaded.   (http://hydra.nixos.org/build/2315397)

svn path=/nixos/trunk/; revision=33358
---
 modules/tasks/filesystems/nfs.nix | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/modules/tasks/filesystems/nfs.nix b/modules/tasks/filesystems/nfs.nix
index 740a3b6e447..d916811050e 100644
--- a/modules/tasks/filesystems/nfs.nix
+++ b/modules/tasks/filesystems/nfs.nix
@@ -39,6 +39,8 @@ in
     
     system.fsPackages = [ pkgs.nfsUtils ];
 
+    boot.kernelModules = [ "sunrpc" ];
+
     boot.initrd.kernelModules = mkIf inInitrd [ "nfs" ];
 
     boot.initrd.extraUtilsCommands = mkIf inInitrd
@@ -77,11 +79,11 @@ in
       };
 
     jobs.idmapd =
-      { description = "Kernel NFS server - ID Map Daemon";
+      { description = "NFS ID mapping daemon";
 
         path = [ pkgs.nfsUtils pkgs.sysvtools pkgs.utillinux ];
 
-        stopOn = "starting shutdown";
+        startOn = "started udev";
 
         preStart =
           ''
-- 
GitLab


From b46e9110120ba44642c5c06b7070a4aaa96a5205 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 22 Mar 2012 13:02:42 +0000
Subject: [PATCH 3534/5331] * Fix some references to dhclient.

svn path=/nixos/trunk/; revision=33359
---
 modules/virtualisation/xen-dom0.nix | 8 ++++----
 tests/installer.nix                 | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/modules/virtualisation/xen-dom0.nix b/modules/virtualisation/xen-dom0.nix
index 77bf5ea8b7e..8e2c066223e 100644
--- a/modules/virtualisation/xen-dom0.nix
+++ b/modules/virtualisation/xen-dom0.nix
@@ -155,10 +155,10 @@ in
         postStop = "${xen}/etc/init.d/xendomains stop";
       };
 
-    # To prevent a race between dhclient and xend's bridge setup
-    # script (which renames eth* to peth* and recreates eth* as a
-    # virtual device), start dhclient after xend.
-    jobs.dhclient.startOn = mkOverride 50 "started xend";
+    # To prevent a race between dhcpcd and xend's bridge setup script
+    # (which renames eth* to peth* and recreates eth* as a virtual
+    # device), start dhcpcd after xend.
+    jobs.dhcpcd.startOn = mkOverride 50 "started xend";
 
     environment.etc =
       [ { source = xendConfig;
diff --git a/tests/installer.nix b/tests/installer.nix
index 2a6bca34e7d..10930952a42 100644
--- a/tests/installer.nix
+++ b/tests/installer.nix
@@ -114,7 +114,7 @@ let
       $machine->waitForJob("tty1");
       $machine->waitForJob("rogue");
       $machine->waitForJob("nixos-manual");
-      $machine->waitForJob("dhclient");
+      $machine->waitForJob("dhcpcd");
 
       ${optionalString testChannel ''
         # Allow the machine to talk to the fake nixos.org.
-- 
GitLab


From 7c75b046eade9932aecaa4ee33c5437205b3c563 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 23 Mar 2012 11:52:06 +0000
Subject: [PATCH 3535/5331] * Fix the permissions on /dev/vboxuser in
 VirtualBox guests.

svn path=/nixos/trunk/; revision=33372
---
 modules/services/hardware/udev.nix          | 1 -
 modules/virtualisation/virtualbox-guest.nix | 8 ++++++++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/modules/services/hardware/udev.nix b/modules/services/hardware/udev.nix
index 2a75212725a..0b63d7543ea 100644
--- a/modules/services/hardware/udev.nix
+++ b/modules/services/hardware/udev.nix
@@ -15,7 +15,6 @@ let
   };
 
   nixosRules = ''
-
     # Miscellaneous devices.
     KERNEL=="kvm",                  MODE="0666"
     KERNEL=="kqemu",                MODE="0666"
diff --git a/modules/virtualisation/virtualbox-guest.nix b/modules/virtualisation/virtualbox-guest.nix
index 04fca1eb4e9..abfd6371557 100644
--- a/modules/virtualisation/virtualbox-guest.nix
+++ b/modules/virtualisation/virtualbox-guest.nix
@@ -65,6 +65,14 @@ in
         PATH=${makeSearchPath "bin" [ pkgs.gnugrep pkgs.which pkgs.xorg.xorgserver ]}:$PATH \
           ${kernel.virtualboxGuestAdditions}/bin/VBoxClient-all
       '';
+
+    services.udev.extraRules =
+      ''
+        # /dev/vboxuser is necessary for VBoxClient to work.  Maybe we
+        # should restrict this to logged-in users.
+        KERNEL=="vboxuser",  OWNER="root", GROUP="root", MODE="0666"
+      '';
+      
   };
 
 }
-- 
GitLab


From 1949a8598739573d8b9b165dcd7b9051b3f05492 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 23 Mar 2012 12:29:11 +0000
Subject: [PATCH 3536/5331] * Do a sync before switching to a new
 configuration.

svn path=/nixos/trunk/; revision=33381
---
 modules/installer/tools/nixos-rebuild.sh | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/modules/installer/tools/nixos-rebuild.sh b/modules/installer/tools/nixos-rebuild.sh
index c2210b62939..6fc9014027d 100644
--- a/modules/installer/tools/nixos-rebuild.sh
+++ b/modules/installer/tools/nixos-rebuild.sh
@@ -188,6 +188,9 @@ fi
 # If we're not just building, then make the new configuration the boot
 # default and/or activate it now.
 if test "$action" = switch -o "$action" = boot -o "$action" = test; then
+    # Just in case the new configuration hangs the system, do a sync now.
+    sync
+    
     $pathToConfig/bin/switch-to-configuration "$action"
 fi
 
-- 
GitLab


From 43b5ced96c230a92cdeddbddd364e1c053dd5268 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 23 Mar 2012 13:37:22 +0000
Subject: [PATCH 3537/5331] * Ignore SIGHUP and write errors on stderr to
 ensure that   switch-to-configuration runs to completion (e.g. if the tty
 we're on   got killed).

svn path=/nixos/trunk/; revision=33382
---
 .../system/activation/switch-to-configuration.sh | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/modules/system/activation/switch-to-configuration.sh b/modules/system/activation/switch-to-configuration.sh
index 781972882fd..a7d25a6c80c 100644
--- a/modules/system/activation/switch-to-configuration.sh
+++ b/modules/system/activation/switch-to-configuration.sh
@@ -76,6 +76,10 @@ EOF
         exit 1
 fi
 
+# Ignore SIGHUP so that we're not killed if we're running on (say)
+# virtual console 1 and we restart the "tty1" job.
+trap "" SIGHUP
+
 jobsDir=$(readlink -f @out@/etc/init)
 
 # Stop all currently running jobs that are not in the new Upstart
@@ -113,6 +117,10 @@ start_() {
     fi
 }
 
+log() {
+    echo "$@" >&2 || true
+}
+
 # Restart all running jobs that have changed.  (Here "running" means
 # all jobs that don't have a "stop" goal.)  We use the symlinks in
 # /var/run/upstart-jobs (created by each job's pre-start script) to
@@ -122,10 +130,10 @@ for job in @jobs@; do
     if ! [[ "$status" =~ start/ ]]; then continue; fi
     if [ "$(readlink -f "$jobsDir/$job.conf")" = "$(readlink -f "/var/run/upstart-jobs/$job")" ]; then continue; fi
     if [ -n "${noRestartIfChanged[$job]}" ]; then
-        echo "not restarting changed service ‘$job’"
+        log "not restarting changed service ‘$job’"
         continue
     fi
-    echo "restarting changed service ‘$job’..."
+    log "restarting changed service ‘$job’..."
     # Note: can't use "restart" here, since that only restarts the
     # job's main process.
     stop --quiet "$job" || true
@@ -147,11 +155,11 @@ for job in @jobs@; do
             "$(readlink -f "$jobsDir/$job.conf")" = "$(readlink -f "/var/run/upstart-jobs/$job")" ];
         then continue; fi
         if [ -n "${noRestartIfChanged[$job]}" ]; then continue; fi
-        echo "starting task ‘$job’..."
+        log "starting task ‘$job’..."
         start --quiet "$job" || true
     else
         if ! grep -q "^start on" "$jobsDir/$job.conf"; then continue; fi
-        echo "starting service ‘$job’..."
+        log "starting service ‘$job’..."
         start_ "$job" || true
     fi
     
-- 
GitLab


From 3d87c27c6d25c85bd3bf0bb8a78ff865e6cbb3e9 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 23 Mar 2012 14:23:19 +0000
Subject: [PATCH 3538/5331] svn path=/nixos/trunk/; revision=33383

---
 modules/misc/deployment.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/misc/deployment.nix b/modules/misc/deployment.nix
index 87100f09822..87e77559629 100644
--- a/modules/misc/deployment.nix
+++ b/modules/misc/deployment.nix
@@ -223,7 +223,7 @@ let cfg = config.deployment; in
               }} > $out
             '';
         in if config.nixpkgs.system == "x86_64-linux" then
-          unpack "r32740-x86_64" "0vwjcf85y4qyd5hxh8gb2nnkhbpdz2j284w5d7x94rvczfpa49hz"
+          unpack "r33382-x86_64" "16irymms7vs4l3cllbpfl572269dwmlc7zficzf0r05bx7l0jsax"
         else if config.nixpkgs.system == "i686-linux" then /foo/disk.vdi else
           throw "Unsupported VirtualBox system type!"
       );
-- 
GitLab


From e32640afaba799a208d4e1e6fe26fa6b916db853 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 23 Mar 2012 18:09:40 +0000
Subject: [PATCH 3539/5331] * Don't build 32-bit AMIs anymore, since 64-bit
 AMIs are now supported   on all instance types. * Bump the pv-grub AKI.

svn path=/nixos/trunk/; revision=33385
---
 maintainers/scripts/create-amis.sh | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/maintainers/scripts/create-amis.sh b/maintainers/scripts/create-amis.sh
index 6d67c01327b..ac92c69f5bb 100755
--- a/maintainers/scripts/create-amis.sh
+++ b/maintainers/scripts/create-amis.sh
@@ -29,7 +29,7 @@ buildAndUploadFor() {
         ec2-upload-bundle -b "$bucket" -m /tmp/nixos.img.manifest.xml \
             -a "$AWS_ACCESS_KEY_ID" -s "$AWS_SECRET_ACCESS_KEY" --location "$s3location"
 
-        kernel=$(ec2-describe-images -o amazon --filter "manifest-location=*pv-grub-hd0_1.02-$arch*" --region "$region" | cut -f 2)
+        kernel=$(ec2-describe-images -o amazon --filter "manifest-location=*pv-grub-hd0_1.03-$arch*" --region "$region" | cut -f 2)
         echo "using PV-GRUB kernel $kernel"
 
         ami=$(ec2-register "$bucket/nixos.img.manifest.xml" -n "$name" -d "NixOS $system r$revision" \
@@ -43,5 +43,4 @@ buildAndUploadFor() {
     done
 }
 
-#buildAndUploadFor i686-linux i386
 buildAndUploadFor x86_64-linux x86_64
-- 
GitLab


From 326891443cea78cfc413b7081032d2106e2f4e05 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 23 Mar 2012 21:00:32 +0000
Subject: [PATCH 3540/5331] * dhcpcd: Don't use the "persistent" option.  With
 it, dhcpcd won't   delete routes and addresses when it quits.  This causes
 those routes   and addresses to stick around forever, since dhcpcd won't
 delete   them when it runs next (even if it acquires a new lease on the same 
  interface).  This is bad; in particular the stale (default) routes   can
 break networking.

  The downside to removing "persistent" is that you should never ever
  do "stop dhcpcd" on a remote machine configured by dhcpcd.

svn path=/nixos/trunk/; revision=33388
---
 modules/services/networking/dhcpcd.nix | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/modules/services/networking/dhcpcd.nix b/modules/services/networking/dhcpcd.nix
index 01c65c06865..12a2cc113dc 100644
--- a/modules/services/networking/dhcpcd.nix
+++ b/modules/services/networking/dhcpcd.nix
@@ -68,11 +68,10 @@ in
 
     jobs.dhcpcd =
       { startOn = "started network-interfaces";
-        stopOn = "stopping network-interfaces";
 
         path = [ dhcpcd pkgs.nettools pkgs.openresolv ];
 
-        exec = "dhcpcd --config ${dhcpcdConf} --nobackground --persistent";
+        exec = "dhcpcd --config ${dhcpcdConf} --nobackground";
       };
 
     environment.systemPackages = [ dhcpcd ];
@@ -85,7 +84,9 @@ in
 
     powerManagement.resumeCommands =
       ''
-        ${config.system.build.upstart}/sbin/restart dhcpcd
+        # Tell dhcpcd to rebind its interfaces if it's running.
+        status="$(${config.system.build.upstart}/sbin/status dhcpcd)"
+        [[ "$status" =~ start/running ]] && ${dhcpcd}/sbin/dhcpcd --rebind
       '';
 
   };
-- 
GitLab


From 70e1958bb61fd114d7f9579b2f6feae089f4d87e Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 23 Mar 2012 21:22:58 +0000
Subject: [PATCH 3541/5331] * New 64-bit AMIs.

svn path=/nixos/trunk/; revision=33390
---
 modules/misc/deployment.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/modules/misc/deployment.nix b/modules/misc/deployment.nix
index 87e77559629..85f9c27324c 100644
--- a/modules/misc/deployment.nix
+++ b/modules/misc/deployment.nix
@@ -201,10 +201,10 @@ let cfg = config.deployment; in
       # The list below is generated by running the "create-amis.sh" script, then doing:
       # $ while read system region ami; do echo "        if cfg.ec2.region == \"$region\" && config.nixpkgs.system == \"$system\" then \"$ami\" else"; done < amis
       ami = mkDefault (
-        if cfg.ec2.region == "eu-west-1" && config.nixpkgs.system == "x86_64-linux" then "ami-65dae711" else
+        if cfg.ec2.region == "eu-west-1" && config.nixpkgs.system == "x86_64-linux" then "ami-732c1407" else
+        if cfg.ec2.region == "us-east-1" && config.nixpkgs.system == "x86_64-linux" then "ami-d9409fb0" else
+        if cfg.ec2.region == "us-west-1" && config.nixpkgs.system == "x86_64-linux" then "ami-4996ce0c" else
         if cfg.ec2.region == "eu-west-1" && config.nixpkgs.system == "i686-linux"   then "ami-dd90a9a9" else
-        if cfg.ec2.region == "us-east-1" && config.nixpkgs.system == "x86_64-linux" then "ami-95bb72fc" else
-        if cfg.ec2.region == "us-west-1" && config.nixpkgs.system == "x86_64-linux" then "ami-0b0c534e" else
         # !!! Doesn't work, not lazy enough.
         # throw "I don't know an AMI for region ‘${cfg.ec2.region}’ and platform type ‘${config.nixpkgs.system}’"
         "");
-- 
GitLab


From 9fb07d40365e96b84beab0871d382b723e9c5533 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Sun, 25 Mar 2012 12:36:43 +0000
Subject: [PATCH 3542/5331] Making a reference single-quoted for grubDevices,
 as after substitution, there will be doublequoted elements.

Suggested by Kirelagin.


svn path=/nixos/trunk/; revision=33403
---
 modules/system/activation/switch-to-configuration.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/system/activation/switch-to-configuration.sh b/modules/system/activation/switch-to-configuration.sh
index a7d25a6c80c..b80945d115d 100644
--- a/modules/system/activation/switch-to-configuration.sh
+++ b/modules/system/activation/switch-to-configuration.sh
@@ -26,7 +26,7 @@ if [ "$action" = "switch" -o "$action" = "boot" ]; then
     
     if [ "@bootLoader@" = "grub" ]; then
         
-      if [ -n "@grubDevices@" ]; then
+      if [ -n '@grubDevices@' ]; then
           mkdir -m 0700 -p /boot/grub
           @menuBuilder@ @out@
 
-- 
GitLab


From f31fefdfd91d2bff36075319b36d28645b52111b Mon Sep 17 00:00:00 2001
From: Mathijs Kwik <mathijs@bluescreen303.nl>
Date: Sun, 25 Mar 2012 15:42:05 +0000
Subject: [PATCH 3543/5331] splitted ssh/sshd X11 forwarding logic. Backward
 compatible change.

You can now set the forwardX11 config option for the ssh client and server separately.

For server, the option means "allow clients to request X11 forwarding".
For client, the option means "request X11 forwarding by default on all connections".

I don't think it made sense to couple them. I might not even run the server on some machines.
Also, I ssh to a lot of machines, and rarely want X11 forwarding. The times I want it,
I use the -X/-Y option, or set it in my ~/.ssh/config.

I also decoupled the 'XAuthLocation' logic from forwardX11.
For my case where ssh client doesn't want forwarding by default, it still wants to set the path for the cases I do need it.

As this flag is the one that pulls in X11 dependencies, I changed the minimal profile and the no-x-libs config to check that instead now.

svn path=/nixos/trunk/; revision=33407
---
 modules/config/no-x-libs.nix             |  6 +--
 modules/profiles/minimal.nix             |  2 +-
 modules/programs/ssh.nix                 | 64 +++++++++++++++++++-----
 modules/services/networking/ssh/sshd.nix | 12 +++--
 4 files changed, 63 insertions(+), 21 deletions(-)

diff --git a/modules/config/no-x-libs.nix b/modules/config/no-x-libs.nix
index f4b255eefe9..93635aa667f 100644
--- a/modules/config/no-x-libs.nix
+++ b/modules/config/no-x-libs.nix
@@ -7,16 +7,14 @@
       example = true;
       description = ''
         Switch off the options in the default configuration that require X libraries.
-        Currently this includes: openssh.forwardX11, dbus, hal, fonts.enableCoreFonts,
+        Currently this includes: ssh X11 forwarding, dbus, hal, fonts.enableCoreFonts,
         fonts.enableFontConfig
       '';
     };
   };
   config = pkgs.lib.mkIf config.environment.noXlibs {
+    programs.ssh.setXAuthLocation = false;
     services = {
-      openssh = {
-        forwardX11 = false;
-      };
       dbus.enable = false;
       hal.enable = false;
     };
diff --git a/modules/profiles/minimal.nix b/modules/profiles/minimal.nix
index 38c83a03393..821b9f93465 100644
--- a/modules/profiles/minimal.nix
+++ b/modules/profiles/minimal.nix
@@ -5,7 +5,7 @@
 
 {
   # Don't include X libraries.
-  services.openssh.forwardX11 = false;
+  programs.ssh.setXAuthLocation = false;
   fonts.enableFontConfig = false;
   fonts.enableCoreFonts = false;
 }
diff --git a/modules/programs/ssh.nix b/modules/programs/ssh.nix
index ce07c4f3b32..47ce581821d 100644
--- a/modules/programs/ssh.nix
+++ b/modules/programs/ssh.nix
@@ -2,19 +2,57 @@
 
 {config, pkgs, ...}:
 
+with pkgs.lib;
+
+let cfg  = config.programs.ssh;
+    cfgd = config.services.openssh;
+
+in
 {
-  environment.etc =
-    [ { # SSH configuration.  Slight duplication of the sshd_config
-        # generation in the sshd service.
-        source = pkgs.writeText "ssh_config" ''
-          ${if config.services.openssh.forwardX11 then ''
-            ForwardX11 yes
-            XAuthLocation ${pkgs.xorg.xauth}/bin/xauth
-          '' else ''
-            ForwardX11 no
-          ''}
+  ###### interface
+
+  options = {
+
+    programs.ssh = {
+
+      forwardX11 = mkOption {
+        default = cfgd.forwardX11;
+        description = ''
+          Whether to request X11 forwarding on outgoing connections by default.
+          This is useful for running graphical programs on the remote machine and have them display to your local X11 server.
+          Historically, this value has depended on the value used by the local sshd daemon, but there really isn't a relation between the two.
         '';
-        target = "ssh/ssh_config";
-      }
-    ];
+      };
+
+      setXAuthLocation = mkOption {
+        default = true;
+        description = ''
+          Whether to set the path to xauth for X11-forwarded connections.
+          Pulls in X11 dependency.
+        '';
+      };
+    };
+  };
+
+  assertions = [{ assertion = if cfg.forwardX11 then cfg.setXAuthLocation else true; 
+                  msg = "cannot enable X11 forwarding without setting xauth location";}];
+
+  config = {
+    environment.etc =
+      [ { # SSH configuration.  Slight duplication of the sshd_config
+          # generation in the sshd service.
+          source = pkgs.writeText "ssh_config" ''
+            ${optionalString cfg.setXAuthLocation ''
+              XAuthLocation ${pkgs.xorg.xauth}/bin/xauth
+            ''}
+            ${if cfg.forwardX11 then ''
+              ForwardX11 yes
+            '' else ''
+              ForwardX11 no
+            ''}
+          '';
+          target = "ssh/ssh_config";
+        }
+      ];
+  };
 }
diff --git a/modules/services/networking/ssh/sshd.nix b/modules/services/networking/ssh/sshd.nix
index 0188293a08c..715aaa3f882 100644
--- a/modules/services/networking/ssh/sshd.nix
+++ b/modules/services/networking/ssh/sshd.nix
@@ -4,7 +4,8 @@ with pkgs.lib;
 
 let
 
-  cfg = config.services.openssh;
+  cfg  = config.services.openssh;
+  cfgc = config.programs.ssh;
 
   nssModulesPath = config.system.nssModules.path;
 
@@ -140,7 +141,7 @@ in
       };
 
       forwardX11 = mkOption {
-        default = true;
+        default = cfgc.setXAuthLocation;
         description = ''
           Whether to allow X11 connections to be forwarded.
         '';
@@ -281,9 +282,12 @@ in
           Port ${toString port}
         '') cfg.ports}
 
+        ${optionalString cfgc.setXAuthLocation ''
+            XAuthLocation ${pkgs.xorg.xauth}/bin/xauth
+        ''}
+
         ${if cfg.forwardX11 then ''
           X11Forwarding yes
-          XAuthLocation ${pkgs.xlibs.xauth}/bin/xauth
         '' else ''
           X11Forwarding no
         ''}
@@ -297,6 +301,8 @@ in
         PasswordAuthentication ${if cfg.passwordAuthentication then "yes" else "no"}
       '';
 
+    assertions = [{ assertion = if cfg.forwardX11 then cfgc.setXAuthLocation else true; 
+                    msg = "cannot enable X11 forwarding without setting xauth location";}];
   };
 
 }
-- 
GitLab


From e9d641014dc0a3e66247fca56d409aaa9dba8137 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Mon, 26 Mar 2012 21:01:46 +0000
Subject: [PATCH 3544/5331] Not everyone runs nscd. Fixing a boot problem for
 those who don't.

svn path=/nixos/trunk/; revision=33434
---
 modules/config/networking.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/modules/config/networking.nix b/modules/config/networking.nix
index 18e0b834c98..591c758b299 100644
--- a/modules/config/networking.nix
+++ b/modules/config/networking.nix
@@ -64,7 +64,8 @@ in
             # a collision with an apparently unrelated environment
             # variable with the same name exported by dhcpcd.
             interface_order='lo lo[0-9]*'
-
+          '' + optionalString config.services.nscd.enable
+          ''
             # Invalidate the nscd cache whenever resolv.conf is
             # regenerated.
             libc_restart='${pkgs.upstart}/sbin/start invalidate-nscd'
-- 
GitLab


From da6046ef6b1fb6f2f0f8b9756962d5b705460dd8 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 26 Mar 2012 22:14:47 +0000
Subject: [PATCH 3545/5331] * Fix the generation of resolvconf.conf.

svn path=/nixos/trunk/; revision=33435
---
 modules/config/networking.nix | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/modules/config/networking.nix b/modules/config/networking.nix
index 591c758b299..5065fc22f2c 100644
--- a/modules/config/networking.nix
+++ b/modules/config/networking.nix
@@ -58,18 +58,17 @@ in
       }
 
       { # /etc/resolvconf.conf: Configuration for openresolv.
-        source = pkgs.writeText "resolvconf.conf"
+        source = pkgs.writeText "resolvconf.conf" (
           ''
             # This is the default, but we must set it here to prevent
             # a collision with an apparently unrelated environment
             # variable with the same name exported by dhcpcd.
             interface_order='lo lo[0-9]*'
-          '' + optionalString config.services.nscd.enable
-          ''
+          '' + optionalString config.services.nscd.enable ''
             # Invalidate the nscd cache whenever resolv.conf is
             # regenerated.
             libc_restart='${pkgs.upstart}/sbin/start invalidate-nscd'
-          '';
+          '' );
         target = "resolvconf.conf";
       }
     ];
-- 
GitLab


From 64241a3e90153cfb2a8eda0023d1b06c05afc6a2 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 27 Mar 2012 14:35:45 +0000
Subject: [PATCH 3546/5331] * Flush nscd when switching to a new configuration.

svn path=/nixos/trunk/; revision=33441
---
 modules/services/system/nscd.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/modules/services/system/nscd.nix b/modules/services/system/nscd.nix
index 3f6ef510f5c..6f35cd30f58 100644
--- a/modules/services/system/nscd.nix
+++ b/modules/services/system/nscd.nix
@@ -57,12 +57,12 @@ in
         exec = "nscd -f ${./nscd.conf} -d 2> /dev/null";
       };
 
-    # Flush nscd's ‘hosts’ database when the network comes up to get
-    # rid of any negative entries.
+    # Flush nscd's ‘hosts’ database when the network comes up or the
+    # system configuration changes to get rid of any negative entries.
     jobs.invalidate_nscd =
       { name = "invalidate-nscd";
         description = "Invalidate NSCD cache";
-        startOn = "ip-up";
+        startOn = "ip-up or config-changed";
         task = true;
         exec = "${pkgs.glibc}/sbin/nscd --invalidate hosts";
       };
-- 
GitLab


From 040042b8a516e453aef5156fa99176e4bae7004f Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 27 Mar 2012 14:51:08 +0000
Subject: [PATCH 3547/5331] * Blackhole the address 169.254.169.254 after we've
 obtained the user   data to prevent non-root processes from getting the
 private host   key.

svn path=/nixos/trunk/; revision=33442
---
 modules/virtualisation/ec2-data.nix | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/modules/virtualisation/ec2-data.nix b/modules/virtualisation/ec2-data.nix
index 42e3cb67566..65f40826225 100644
--- a/modules/virtualisation/ec2-data.nix
+++ b/modules/virtualisation/ec2-data.nix
@@ -15,10 +15,12 @@ with pkgs.lib;
 
       task = true;
 
-      path = [ pkgs.curl ];
+      path = [ pkgs.curl pkgs.iproute ];
 
       script =
         ''
+          ip route del blackhole 169.254.169.254/32 || true
+          
           curl="curl --retry 3 --retry-delay 0 --fail"
         
           echo "setting host name..."
@@ -53,6 +55,10 @@ with pkgs.lib;
               (umask 077; echo "$key" > /etc/ssh/ssh_host_dsa_key)
               echo "$key_pub" > /etc/ssh/ssh_host_dsa_key.pub
           fi
+
+          # Since the user data is sensitive, prevent it from being
+          # accessed from now on.
+          ip route add blackhole 169.254.169.254/32
         '';
     };
 
-- 
GitLab


From f4d26eb446280ffa31e97f0d6e377bad0b326f39 Mon Sep 17 00:00:00 2001
From: Joachim Schiele <js@lastlog.de>
Date: Wed, 28 Mar 2012 10:34:40 +0000
Subject: [PATCH 3548/5331] added example for GRUB 2

svn path=/nixos/trunk/; revision=33448
---
 modules/installer/grub/grub.nix | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/modules/installer/grub/grub.nix b/modules/installer/grub/grub.nix
index 1f9571fd7a5..b7e17c80904 100644
--- a/modules/installer/grub/grub.nix
+++ b/modules/installer/grub/grub.nix
@@ -106,8 +106,17 @@ in
       extraEntries = mkOption {
         default = "";
         example = ''
+          # GRUB 1 example (not GRUB 2 compatible)
           title Windows
             chainloader (hd0,1)+1
+
+          # GRUB 2 example
+          menuentry "Windows7" {
+            title Windows7
+            insmod ntfs
+            set root='(hd1,1)'
+            chainloader +1
+          }
         '';
         description = ''
           Any additional entries you want added to the GRUB boot menu.
-- 
GitLab


From 1d3c7e2a2d56d43ec15e3f30cbb5dd168578b891 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 28 Mar 2012 13:02:55 +0000
Subject: [PATCH 3549/5331] =?UTF-8?q?*=20Added=20a=20=E2=80=98deployment.e?=
 =?UTF-8?q?c2.tags=E2=80=99=20option.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

svn path=/nixos/trunk/; revision=33449
---
 modules/misc/deployment.nix | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/modules/misc/deployment.nix b/modules/misc/deployment.nix
index 85f9c27324c..ba9b3c43675 100644
--- a/modules/misc/deployment.nix
+++ b/modules/misc/deployment.nix
@@ -116,6 +116,17 @@ let cfg = config.deployment; in
       '';
     };
 
+    deployment.ec2.tags = mkOption {
+      default = { };
+      example = { foo = "bar"; xyzzy = "bla"; };
+      type = types.attrsOf types.string;
+      description = ''
+        EC2 tags assigned to the instance.  Each tag name can be at
+        most 128 characters, and each tag value can be at most 256
+        characters.  There can be at most 10 tags.
+      '';
+    };
+
     # Ad hoc cloud options.
 
     deployment.adhoc.controller = mkOption {
-- 
GitLab


From f4883572d8ac4b3ae6f333cf9b2604e8b56a9369 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Wed, 28 Mar 2012 19:58:44 +0000
Subject: [PATCH 3550/5331] Making the init interactive shells handle well
 console kernel parameters with extra parameters, like console=ttyS0,115200.

svn path=/nixos/trunk/; revision=33458
---
 modules/system/boot/stage-1-init.sh | 4 +++-
 modules/system/boot/stage-2-init.sh | 4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/modules/system/boot/stage-1-init.sh b/modules/system/boot/stage-1-init.sh
index f3ad3313648..8456e3dae15 100644
--- a/modules/system/boot/stage-1-init.sh
+++ b/modules/system/boot/stage-1-init.sh
@@ -31,7 +31,9 @@ EOF
       case $o in
         console=*)
           set -- $(IFS==; echo $o)
-          console=$2
+          params=$2
+          set -- $(IFS=,; echo $params)
+          console=$1
           ;;
       esac
     done
diff --git a/modules/system/boot/stage-2-init.sh b/modules/system/boot/stage-2-init.sh
index ccfa1d0784c..798c4afdc38 100644
--- a/modules/system/boot/stage-2-init.sh
+++ b/modules/system/boot/stage-2-init.sh
@@ -172,7 +172,9 @@ if [ -n "$debug2" ]; then
       case $o in
         console=*)
           set -- $(IFS==; echo $o)
-          console=$2
+          params=$2
+          set -- $(IFS=,; echo $params)
+          console=$1
           ;;
       esac
     done
-- 
GitLab


From bc6ca7944f5c8186760d68d957f1da2e763f7a16 Mon Sep 17 00:00:00 2001
From: Joachim Schiele <js@lastlog.de>
Date: Sat, 31 Mar 2012 11:39:30 +0000
Subject: [PATCH 3551/5331] fixed a upstart issue where upsd was never started

svn path=/nixos/trunk/; revision=33494
---
 modules/services/monitoring/ups.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/services/monitoring/ups.nix b/modules/services/monitoring/ups.nix
index 2874bbf2087..eedd69ac191 100644
--- a/modules/services/monitoring/ups.nix
+++ b/modules/services/monitoring/ups.nix
@@ -191,7 +191,7 @@ in
 
     jobs.upsd = {
       description = "Uninterruptible Power Supplies (Daemon)";
-      startOn = "started network-interfaces and upsmon";
+      startOn = "started network-interfaces and started upsmon";
       daemonType = "fork";
       # TODO: replace 'root' by another username.
       exec = ''${pkgs.nut}/sbin/upsd -u root'';
-- 
GitLab


From de5b43700403fe3fb6c9c66300a2b5b06af1005c Mon Sep 17 00:00:00 2001
From: Mathijs Kwik <mathijs@bluescreen303.nl>
Date: Sun, 1 Apr 2012 10:54:06 +0000
Subject: [PATCH 3552/5331] assertions '.msg' doesn't exist => .message

svn path=/nixos/trunk/; revision=33508
---
 modules/misc/assertions.nix              | 2 +-
 modules/programs/ssh.nix                 | 2 +-
 modules/services/networking/ssh/sshd.nix | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/modules/misc/assertions.nix b/modules/misc/assertions.nix
index 2b06bfbbc03..9cd58550adc 100644
--- a/modules/misc/assertions.nix
+++ b/modules/misc/assertions.nix
@@ -14,7 +14,7 @@ in
 
     assertions = mkOption {
       default = [];
-      example = [ { assertion = false; msg = "you can't enable this for that reason"; } ];
+      example = [ { assertion = false; message = "you can't enable this for that reason"; } ];
       merge = pkgs.lib.mergeListOption;
       description = ''
         This option allows modules to express conditions that must
diff --git a/modules/programs/ssh.nix b/modules/programs/ssh.nix
index 47ce581821d..5c4b8c3a9a1 100644
--- a/modules/programs/ssh.nix
+++ b/modules/programs/ssh.nix
@@ -35,7 +35,7 @@ in
   };
 
   assertions = [{ assertion = if cfg.forwardX11 then cfg.setXAuthLocation else true; 
-                  msg = "cannot enable X11 forwarding without setting xauth location";}];
+                  message = "cannot enable X11 forwarding without setting xauth location";}];
 
   config = {
     environment.etc =
diff --git a/modules/services/networking/ssh/sshd.nix b/modules/services/networking/ssh/sshd.nix
index 715aaa3f882..f7d2f5c9c87 100644
--- a/modules/services/networking/ssh/sshd.nix
+++ b/modules/services/networking/ssh/sshd.nix
@@ -302,7 +302,7 @@ in
       '';
 
     assertions = [{ assertion = if cfg.forwardX11 then cfgc.setXAuthLocation else true; 
-                    msg = "cannot enable X11 forwarding without setting xauth location";}];
+                    message = "cannot enable X11 forwarding without setting xauth location";}];
   };
 
 }
-- 
GitLab


From 7f84957ff2c1b023c3b1c3e22ade6881c495b120 Mon Sep 17 00:00:00 2001
From: Mathijs Kwik <mathijs@bluescreen303.nl>
Date: Sun, 1 Apr 2012 10:54:08 +0000
Subject: [PATCH 3553/5331] mongodb: allow running as a replicaset member

also useful for point-in time backups using mongodump --oplog

svn path=/nixos/trunk/; revision=33509
---
 modules/services/databases/mongodb.nix | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/modules/services/databases/mongodb.nix b/modules/services/databases/mongodb.nix
index 28d2a4f849c..c676d3e96e4 100644
--- a/modules/services/databases/mongodb.nix
+++ b/modules/services/databases/mongodb.nix
@@ -17,6 +17,7 @@ let
     dbpath = ${cfg.dbpath}
     logpath = ${cfg.logpath}
     logappend = ${b2s cfg.logappend}
+    ${optionalString (cfg.replSetName != "") "replSet = ${cfg.replSetName}"}
   '';
 
 in
@@ -77,6 +78,14 @@ in
         default = false;
         description = "Use V8 instead of spidermonkey for js execution";
       };
+
+      replSetName = mkOption {
+        default = "";
+        description = ''
+          If this instance is part of a replica set, set its name here.
+          Otherwise, leave empty to run as single node.
+        '';
+      };
     };
 
   };
-- 
GitLab


From 7ba690add6ca095f20c3f11ec25a2664a4b7219e Mon Sep 17 00:00:00 2001
From: Mathijs Kwik <mathijs@bluescreen303.nl>
Date: Sun, 1 Apr 2012 10:54:10 +0000
Subject: [PATCH 3554/5331] optionally allow normal users to control
 wpa_supplicant through wpa_gui or wpa_cli.

Comes with a default wpa_supplicant.conf, which gets updated through
aforementioned utilities.

svn path=/nixos/trunk/; revision=33510
---
 .../services/networking/wpa_supplicant.nix    | 98 +++++++++++++------
 1 file changed, 68 insertions(+), 30 deletions(-)

diff --git a/modules/services/networking/wpa_supplicant.nix b/modules/services/networking/wpa_supplicant.nix
index d2b57fb97d5..338a801f701 100644
--- a/modules/services/networking/wpa_supplicant.nix
+++ b/modules/services/networking/wpa_supplicant.nix
@@ -4,10 +4,11 @@ with pkgs.lib;
 
 let
 
+  cfg = config.networking.wireless;
   configFile = "/etc/wpa_supplicant.conf";
 
   ifaces =
-    config.networking.wireless.interfaces ++
+    cfg.interfaces ++
     optional (config.networking.WLANInterface != "") config.networking.WLANInterface;
 
 in
@@ -18,40 +19,69 @@ in
 
   options = {
   
-    networking.wireless.enable = mkOption {
-      default = false;
-      description = ''
-        Whether to start <command>wpa_supplicant</command> to scan for
-        and associate with wireless networks.  Note: NixOS currently
-        does not generate <command>wpa_supplicant</command>'s
-        configuration file, <filename>${configFile}</filename>.  You
-        should edit this file yourself to define wireless networks,
-        WPA keys and so on (see
-        <citerefentry><refentrytitle>wpa_supplicant.conf</refentrytitle>
-        <manvolnum>5</manvolnum></citerefentry>).
-      '';
-    };
-
     networking.WLANInterface = mkOption {
       default = "";
       description = "Obsolete. Use <option>networking.wireless.interfaces</option> instead.";
     };
 
-    networking.wireless.interfaces = mkOption {
-      default = [];
-      example = [ "wlan0" "wlan1" ];
-      description = ''
-        The interfaces <command>wpa_supplicant</command> will use.  If empty, it will
-        automatically use all wireless interfaces.
-      '';
-    };
+    networking.wireless = {
+      enable = mkOption {
+        default = false;
+        description = ''
+          Whether to start <command>wpa_supplicant</command> to scan for
+          and associate with wireless networks.  Note: NixOS currently
+          does not generate <command>wpa_supplicant</command>'s
+          configuration file, <filename>${configFile}</filename>.  You
+          should edit this file yourself to define wireless networks,
+          WPA keys and so on (see
+          <citerefentry><refentrytitle>wpa_supplicant.conf</refentrytitle>
+          <manvolnum>5</manvolnum></citerefentry>).
+        '';
+      };
+
+      interfaces = mkOption {
+        default = [];
+        example = [ "wlan0" "wlan1" ];
+        description = ''
+          The interfaces <command>wpa_supplicant</command> will use.  If empty, it will
+          automatically use all wireless interfaces.
+        '';
+      };
+
+      driver = mkOption {
+        default = "";
+        example = "nl80211";
+        description = "force a specific wpa_supplicant driver";
+      };
 
+      userControlled = {
+        enable = mkOption {
+          default = false;
+          description = ''
+            Allow normal users to control wpa_supplicant through wpa_gui or wpa_cli.
+            This is useful for laptop users that switch networks a lot.
+
+            When you want to use this, make sure ${configFile} doesn't exist.
+            It will be created for you.
+
+            Currently it is also necesarry to explicitly specify networking.wireless.interfaces
+          '';
+        };
+
+        group = mkOption {
+          default = "wheel";
+          example = "network";
+          type = types.string;
+          description = "members of this group can control wpa_supplicant";
+        };
+      };
+    };
   };
 
 
   ###### implementation
   
-  config = mkIf config.networking.wireless.enable {
+  config = mkIf cfg.enable {
 
     environment.systemPackages =  [ pkgs.wpa_supplicant ];
 
@@ -63,11 +93,15 @@ in
 
         path = [ pkgs.wpa_supplicant ];
 
-        preStart =
-          ''
-            touch -a ${configFile}
-            chmod 600 ${configFile}
-          '';
+        preStart = ''
+          touch -a ${configFile}
+          chmod 600 ${configFile}
+        '' + optionalString cfg.userControlled.enable ''
+          if [ ! -s ${configFile} ]; then
+            echo "ctrl_interface=DIR=/var/run/wpa_supplicant GROUP=${cfg.userControlled.group}" >> ${configFile}
+            echo "update_config=1" >> ${configFile}
+          fi
+        '';
 
         script =
           ''
@@ -80,7 +114,7 @@ in
             '' else ''
               ifaces="${concatStringsSep " -N " (map (i: "-i${i}") ifaces)}"
             ''}
-            exec wpa_supplicant -s -u -c ${configFile} $ifaces
+            exec wpa_supplicant -s -u ${optionalString (cfg.driver != "") "-D${cfg.driver}"} -c ${configFile} $ifaces
           '';
       };
   
@@ -89,6 +123,10 @@ in
         ${config.system.build.upstart}/sbin/restart wpa_supplicant
       '';
 
+    assertions = [{ assertion = !cfg.userControlled.enable || cfg.interfaces != []; 
+                    message = "user controlled wpa_supplicant needs explicit networking.wireless.interfaces";}];
+
+
   };
 
 }
-- 
GitLab


From 7d4fd69b5f678ac67f1324c5b298011487e6112f Mon Sep 17 00:00:00 2001
From: Mathijs Kwik <mathijs@bluescreen303.nl>
Date: Sun, 1 Apr 2012 10:54:13 +0000
Subject: [PATCH 3555/5331] dhcpcd: wifi disconnect should also generate
 ip-down

svn path=/nixos/trunk/; revision=33511
---
 modules/services/networking/dhcpcd.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/services/networking/dhcpcd.nix b/modules/services/networking/dhcpcd.nix
index 12a2cc113dc..9e0e571a005 100644
--- a/modules/services/networking/dhcpcd.nix
+++ b/modules/services/networking/dhcpcd.nix
@@ -53,8 +53,8 @@ let
           ${config.system.build.upstart}/sbin/initctl emit -n ip-up IFACE=$interface
       fi
 
-      if [ "$reason" = EXPIRE -o "$reason" = RELEASE ]; then
           ${config.system.build.upstart}/sbin/initctl emit -n ip-down IFACE=$interface
+      if [ "$reason" = EXPIRE -o "$reason" = RELEASE -o "$reason" = NOCARRIER] ; then
       fi
     '';
 
-- 
GitLab


From e216ce07dfeffc2ce330a93a3533ae2e0cc52853 Mon Sep 17 00:00:00 2001
From: Mathijs Kwik <mathijs@bluescreen303.nl>
Date: Sun, 1 Apr 2012 10:54:15 +0000
Subject: [PATCH 3556/5331] dhcpcd: ip-up and ip-down emit more info (like wifi
 access point)

useful to only start certain services (like vpn) on certain networks

svn path=/nixos/trunk/; revision=33512
---
 modules/services/networking/dhcpcd.nix | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/modules/services/networking/dhcpcd.nix b/modules/services/networking/dhcpcd.nix
index 9e0e571a005..408e49e7945 100644
--- a/modules/services/networking/dhcpcd.nix
+++ b/modules/services/networking/dhcpcd.nix
@@ -40,7 +40,13 @@ let
     ''
       #exec >> /var/log/dhcpcd 2>&1
       #set -x
-    
+
+      params="IFACE=$interface REASON=$reason"
+
+      # only works when interface is wireless and wpa_supplicant has a control socket
+      # but we allow it to fail silently
+      wifiparams=$(/var/run/current-system/sw/sbin/wpa_cli -i$interface status 2>/dev/null | grep ssid | sed 's|^b|B|;s|ssid|SSID|' | xargs)
+
       if [ "$reason" = BOUND -o "$reason" = REBOOT ]; then
           # Restart ntpd.  (The "ip-up" event below will trigger the
           # restart.)  We need to restart it to make sure that it will
@@ -50,11 +56,11 @@ let
           # it"), so we silently lose time synchronisation.
           ${config.system.build.upstart}/sbin/initctl stop ntpd
 
-          ${config.system.build.upstart}/sbin/initctl emit -n ip-up IFACE=$interface
+          ${config.system.build.upstart}/sbin/initctl emit -n ip-up "$params $wifiparams"
       fi
 
-          ${config.system.build.upstart}/sbin/initctl emit -n ip-down IFACE=$interface
       if [ "$reason" = EXPIRE -o "$reason" = RELEASE -o "$reason" = NOCARRIER] ; then
+          ${config.system.build.upstart}/sbin/initctl emit -n ip-down "$params $wifiparams"
       fi
     '';
 
-- 
GitLab


From a1e86494d0126f131b77179ba1d84785de1de3bc Mon Sep 17 00:00:00 2001
From: Mathijs Kwik <mathijs@bluescreen303.nl>
Date: Sun, 1 Apr 2012 10:54:17 +0000
Subject: [PATCH 3557/5331] made challenge-response authentication method
 configurable for openssh

challenge-response is an authentication method that does not need the
plain text password to be emitted over the (encrypted) connection.
This is nice if you don't fully trust the server.

It is enabled (upstream) by default.

To the end user, it still looks like normal password authentication,
but instead of sending it, it is used to hash some challenge.

This means that if you don't want passwords to be used ever at all,
and just stick to public key authentication, you probably want to
disable this option too.

svn path=/nixos/trunk/; revision=33513
---
 modules/services/networking/ssh/sshd.nix | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/modules/services/networking/ssh/sshd.nix b/modules/services/networking/ssh/sshd.nix
index f7d2f5c9c87..cdb18f9e94e 100644
--- a/modules/services/networking/ssh/sshd.nix
+++ b/modules/services/networking/ssh/sshd.nix
@@ -203,6 +203,13 @@ in
         '';
       };
 
+      challengeResponseAuthentication = mkOption {
+        default = true;
+        description = ''
+          Specifies whether challenge/response authentication is allowed.
+        '';
+      };
+
       hostKeyType = mkOption {
         default = "dsa1024";
         description = "Type of host key to generate (dsa1024/rsa1024/ecdsa521)";
@@ -299,6 +306,7 @@ in
         PermitRootLogin ${cfg.permitRootLogin}
         GatewayPorts ${cfg.gatewayPorts}
         PasswordAuthentication ${if cfg.passwordAuthentication then "yes" else "no"}
+        ChallengeResponseAuthentication ${if cfg.challengeResponseAuthentication then "yes" else "no"}
       '';
 
     assertions = [{ assertion = if cfg.forwardX11 then cfgc.setXAuthLocation else true; 
-- 
GitLab


From 9a139524941aaff3823eb588c9882f8e33043d8e Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sun, 1 Apr 2012 20:51:10 +0000
Subject: [PATCH 3558/5331] * Quick hack to do a 64-bit installer test.

svn path=/nixos/trunk/; revision=33529
---
 release.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/release.nix b/release.nix
index eb5f9bfbe0d..1ff36c1fdee 100644
--- a/release.nix
+++ b/release.nix
@@ -164,9 +164,8 @@ let
 
     tests =
       let
-        t = import ./tests {
-          system = "i686-linux";
-        };
+        t = import ./tests { system = "i686-linux"; };
+        t_64 = import ./tests { system = "x86_64-linux"; };
       in {
         avahi = t.avahi.test;
         bittorrent = t.bittorrent.test;
@@ -175,6 +174,7 @@ let
         installer.lvm = t.installer.lvm.test;
         installer.separateBoot = t.installer.separateBoot.test;
         installer.simple = t.installer.simple.test;
+        installer.simple_64 = t_64.installer.simple.test;
         installer.swraid = t.installer.swraid.test;
         installer.rebuildCD = t.installer.rebuildCD.test;
         ipv6 = t.ipv6.test;
-- 
GitLab


From 9a6f2231b2b3eab3537bc08374e113f8bdcaba85 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Mon, 2 Apr 2012 17:19:21 +0000
Subject: [PATCH 3559/5331] Adding a module for memtest86+, so if enabled, will
 appear in the grub menu.

To enable it:
boot.loader.grub.memtest86 = true;


svn path=/nixos/trunk/; revision=33539
---
 modules/installer/grub/grub-menu-builder.sh |  1 +
 modules/installer/grub/grub.nix             | 10 ++++++-
 modules/installer/grub/memtest.nix          | 33 +++++++++++++++++++++
 modules/module-list.nix                     |  1 +
 4 files changed, 44 insertions(+), 1 deletion(-)
 create mode 100644 modules/installer/grub/memtest.nix

diff --git a/modules/installer/grub/grub-menu-builder.sh b/modules/installer/grub/grub-menu-builder.sh
index dfe19a9ffe6..bdf42dd4d79 100644
--- a/modules/installer/grub/grub-menu-builder.sh
+++ b/modules/installer/grub/grub-menu-builder.sh
@@ -240,6 +240,7 @@ if test -n "$copyKernels"; then
     mkdir -p /boot/kernels
 fi
 
+@extraPrepareConfig@
 
 # Additional entries specified verbatim by the configuration.
 extraEntries=`cat <<EOF
diff --git a/modules/installer/grub/grub.nix b/modules/installer/grub/grub.nix
index b7e17c80904..2d7393b7f87 100644
--- a/modules/installer/grub/grub.nix
+++ b/modules/installer/grub/grub.nix
@@ -12,7 +12,7 @@ let
     inherit grub;
     inherit (pkgs) bash;
     path = [pkgs.coreutils pkgs.gnused pkgs.gnugrep];
-    inherit (config.boot.loader.grub) copyKernels
+    inherit (config.boot.loader.grub) copyKernels extraPrepareConfig
       extraConfig extraEntries extraEntriesBeforeNixOS extraPerEntryConfig
       splashImage configurationLimit version default timeout;
   };
@@ -85,6 +85,14 @@ in
         '';
       };
 
+      extraPrepareConfig = mkOption {
+        default = "";
+        description = ''
+          Additional bash commands to be run at the script that
+          prepares the grub menu entries.
+        '';
+      };
+
       extraConfig = mkOption {
         default = "";
         example = "serial; terminal_output.serial";
diff --git a/modules/installer/grub/memtest.nix b/modules/installer/grub/memtest.nix
new file mode 100644
index 00000000000..65a5e30d1a5
--- /dev/null
+++ b/modules/installer/grub/memtest.nix
@@ -0,0 +1,33 @@
+# This module adds Memtest86 to the Grub boot menu on the CD.  !!! It
+# would be nice if this also worked for normal configurations.
+
+{config, pkgs, ...}:
+
+with pkgs.lib;
+let
+  isEnabled = config.boot.loader.grub.memtest86;
+in
+{
+  options = {
+    boot.loader.grub.memtest86 = mkOption {
+      default = false;
+      type = types.bool;
+      description = ''
+        Add a menu entry in grub for memtest86+
+      '';
+    };
+  };
+
+  config.boot.loader.grub = mkIf isEnabled {
+    extraEntries = 
+      ''
+        menuentry "Memtest86+" {
+          linux16 $bootRoot/memtest.bin
+        }
+      '';
+    extraPrepareConfig =
+      ''
+        cp ${pkgs.memtest86}/memtest.bin /boot/memtest.bin;
+      '';
+  };
+}
diff --git a/modules/module-list.nix b/modules/module-list.nix
index 27be032f3b7..fdee87506ad 100644
--- a/modules/module-list.nix
+++ b/modules/module-list.nix
@@ -25,6 +25,7 @@
   ./installer/efi-boot-stub/efi-boot-stub.nix
   ./installer/generations-dir/generations-dir.nix
   ./installer/grub/grub.nix
+  ./installer/grub/memtest.nix
   ./installer/init-script/init-script.nix
   ./installer/tools/nixos-checkout.nix
   ./installer/tools/tools.nix
-- 
GitLab


From fbd4f6565224cd7435b49c21c5bab7352a652414 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Mon, 2 Apr 2012 17:31:08 +0000
Subject: [PATCH 3560/5331] Fixing the comment on the new grub/memtest.nix
 module.

svn path=/nixos/trunk/; revision=33540
---
 modules/installer/grub/memtest.nix | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/modules/installer/grub/memtest.nix b/modules/installer/grub/memtest.nix
index 65a5e30d1a5..c772161f1b3 100644
--- a/modules/installer/grub/memtest.nix
+++ b/modules/installer/grub/memtest.nix
@@ -1,5 +1,4 @@
-# This module adds Memtest86 to the Grub boot menu on the CD.  !!! It
-# would be nice if this also worked for normal configurations.
+# This module allows getting memtest86+ in grub menus.
 
 {config, pkgs, ...}:
 
-- 
GitLab


From 56d9e60bb7e02a3a200881254ab9cb7529bb1b4d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Mon, 2 Apr 2012 18:28:42 +0000
Subject: [PATCH 3561/5331] Making bind start on started network-interfaces. It
 wasn't starting ever.

svn path=/nixos/trunk/; revision=33542
---
 modules/services/networking/bind.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/modules/services/networking/bind.nix b/modules/services/networking/bind.nix
index e6b0d6a7241..19619f0383f 100644
--- a/modules/services/networking/bind.nix
+++ b/modules/services/networking/bind.nix
@@ -114,6 +114,8 @@ in
     jobs.bind =
       { description = "BIND name server job";
 
+        startOn = "started network-interfaces";
+
         preStart =
           ''
             ${pkgs.coreutils}/bin/mkdir -p /var/run/named
-- 
GitLab


From 9a91181be9727fc01e225b6adddebbe61b4d815e Mon Sep 17 00:00:00 2001
From: Mathijs Kwik <mathijs@bluescreen303.nl>
Date: Thu, 5 Apr 2012 08:20:43 +0000
Subject: [PATCH 3562/5331] damn you shell syntax! :)

svn path=/nixos/trunk/; revision=33603
---
 modules/services/networking/dhcpcd.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/modules/services/networking/dhcpcd.nix b/modules/services/networking/dhcpcd.nix
index 408e49e7945..9c2ff5575be 100644
--- a/modules/services/networking/dhcpcd.nix
+++ b/modules/services/networking/dhcpcd.nix
@@ -56,11 +56,11 @@ let
           # it"), so we silently lose time synchronisation.
           ${config.system.build.upstart}/sbin/initctl stop ntpd
 
-          ${config.system.build.upstart}/sbin/initctl emit -n ip-up "$params $wifiparams"
+          ${config.system.build.upstart}/sbin/initctl emit -n ip-up $params $wifiparams
       fi
 
-      if [ "$reason" = EXPIRE -o "$reason" = RELEASE -o "$reason" = NOCARRIER] ; then
-          ${config.system.build.upstart}/sbin/initctl emit -n ip-down "$params $wifiparams"
+      if [ "$reason" = EXPIRE -o "$reason" = RELEASE -o "$reason" = NOCARRIER ] ; then
+          ${config.system.build.upstart}/sbin/initctl emit -n ip-down $params $wifiparams
       fi
     '';
 
-- 
GitLab


From e44b87dd3114875c537b8b94e3a5cda893bac8df Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 5 Apr 2012 12:27:21 +0000
Subject: [PATCH 3563/5331] * Pass --no-sessions to Upstart to make sure users
 cannot start   Upstart jobs (even when Upstart has attached to D-Bus).

svn path=/nixos/trunk/; revision=33617
---
 modules/system/boot/stage-2-init.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/system/boot/stage-2-init.sh b/modules/system/boot/stage-2-init.sh
index 798c4afdc38..bd48f463dcd 100644
--- a/modules/system/boot/stage-2-init.sh
+++ b/modules/system/boot/stage-2-init.sh
@@ -186,4 +186,4 @@ fi
 
 # Start Upstart's init.
 echo "starting Upstart..."
-PATH=/var/run/current-system/upstart/sbin exec init ${debug2:+--verbose}
+PATH=/var/run/current-system/upstart/sbin exec init --no-sessions ${debug2:+--verbose}
-- 
GitLab


From 011e38939057484d23102dd278716e954b0e422a Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 5 Apr 2012 13:00:30 +0000
Subject: [PATCH 3564/5331] * Move the nixosSrc argument to top level.

svn path=/nixos/trunk/; revision=33619
---
 release.nix | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

diff --git a/release.nix b/release.nix
index 1ff36c1fdee..35078be6ccb 100644
--- a/release.nix
+++ b/release.nix
@@ -1,10 +1,11 @@
+{ nixosSrc ? {outPath = ./.; rev = 1234;} }:
+
 let
 
 
   makeIso =
     { module, type, description ? type, maintainers ? ["eelco"] }:
-    { nixosSrc ? {outPath = ./.; rev = 1234;}
-    , officialRelease ? false
+    { officialRelease ? false
     , system ? "i686-linux"
     }:
 
@@ -44,8 +45,7 @@ let
 
   makeSystemTarball =
     { module, maintainers ? ["viric"]}:
-    { nixosSrc ? {outPath = ./.; rev = 1234;}
-    , officialRelease ? false
+    { officialRelease ? false
     , system ? "i686-linux"
     }:
 
@@ -75,9 +75,7 @@ let
 
 
     tarball =
-      { nixosSrc ? {outPath = ./.; rev = 1234;}
-      , officialRelease ? false
-      }:
+      { officialRelease ? false }:
 
       with import <nixpkgs> {};
 
@@ -102,9 +100,7 @@ let
 
 
     manual =
-      { nixosSrc ? {outPath = ./.; rev = 1234;}
-      , officialRelease ? false
-      }:
+      { officialRelease ? false }:
 
       (import "${nixosSrc}/doc/manual" {
         pkgs = import <nixpkgs> {};
-- 
GitLab


From 852e5136380838bc47c1d6da9afa8f3a3a4a5cf9 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 6 Apr 2012 12:23:12 +0000
Subject: [PATCH 3565/5331] * Handle booting from /dev/xvda.

svn path=/nixos/trunk/; revision=33645
---
 modules/system/boot/stage-1-init.sh     | 1 +
 modules/virtualisation/amazon-image.nix | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/modules/system/boot/stage-1-init.sh b/modules/system/boot/stage-1-init.sh
index 8456e3dae15..4d6b9a9cbc1 100644
--- a/modules/system/boot/stage-1-init.sh
+++ b/modules/system/boot/stage-1-init.sh
@@ -255,6 +255,7 @@ mountFS() {
 
 
 # Try to find and mount the root device.
+sleep 3
 mkdir /mnt-root
 
 mountPoints=(@mountPoints@)
diff --git a/modules/virtualisation/amazon-image.nix b/modules/virtualisation/amazon-image.nix
index a86cb1c64fd..329bf44e5a9 100644
--- a/modules/virtualisation/amazon-image.nix
+++ b/modules/virtualisation/amazon-image.nix
@@ -92,7 +92,7 @@ with pkgs.lib;
       diskNr=0
       diskForAufs=
       for device in /dev/xvd*; do
-          if [ "$device" = /dev/xvda1 ]; then continue; fi
+          if [ "$device" = /dev/xvda -o "$device" = /dev/xvda1 ]; then continue; fi
           fsType=$(blkid -o value -s TYPE "$device" || true)
           if [ "$fsType" = swap ]; then
               echo "activating swap device $device..."
-- 
GitLab


From 1e8e83408b49dce1d17ab0d1cc210c7b74478bb8 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 6 Apr 2012 12:23:44 +0000
Subject: [PATCH 3566/5331] * Revert unintended commit.

svn path=/nixos/trunk/; revision=33646
---
 modules/system/boot/stage-1-init.sh | 1 -
 1 file changed, 1 deletion(-)

diff --git a/modules/system/boot/stage-1-init.sh b/modules/system/boot/stage-1-init.sh
index 4d6b9a9cbc1..8456e3dae15 100644
--- a/modules/system/boot/stage-1-init.sh
+++ b/modules/system/boot/stage-1-init.sh
@@ -255,7 +255,6 @@ mountFS() {
 
 
 # Try to find and mount the root device.
-sleep 3
 mkdir /mnt-root
 
 mountPoints=(@mountPoints@)
-- 
GitLab


From 4f4c5299798f8cdd145900a86a2166a6742e4275 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 6 Apr 2012 14:20:43 +0000
Subject: [PATCH 3567/5331] Stage 1 improvements: * Load scsi_wait_scan after
 all other kernel modules to ensure that   all SCSI device nodes have been
 created. * Increase the timeout for the appearance of the root device to 20  
 seconds. * Do a "udevadm settle" just after the root device has appeared to  
 make sure that udev isn't accessing the device anymore (hopefully).   On EC2
 (Xen), I've seen fsck on the root fail randomly with "device   in use"
 errors.

svn path=/nixos/trunk/; revision=33650
---
 modules/installer/cd-dvd/system-tarball-fuloong2f.nix  | 5 -----
 modules/installer/cd-dvd/system-tarball-sheevaplug.nix | 5 -----
 modules/profiles/all-hardware.nix                      | 5 -----
 modules/system/boot/kernel.nix                         | 3 +++
 modules/system/boot/stage-1-init.sh                    | 8 +++++++-
 5 files changed, 10 insertions(+), 16 deletions(-)

diff --git a/modules/installer/cd-dvd/system-tarball-fuloong2f.nix b/modules/installer/cd-dvd/system-tarball-fuloong2f.nix
index a0b92369f65..618f5ea9627 100644
--- a/modules/installer/cd-dvd/system-tarball-fuloong2f.nix
+++ b/modules/installer/cd-dvd/system-tarball-fuloong2f.nix
@@ -119,11 +119,6 @@ in
   boot.kernelPackages = pkgs.linuxPackages_2_6_35;
   boot.kernelParams = [ "console=tty" ];
 
-  boot.initrd.kernelModules =
-    [ # Wait for SCSI devices to appear.
-      "scsi_wait_scan"
-    ];
-
   boot.postBootCommands =
     ''
       mkdir -p /mnt
diff --git a/modules/installer/cd-dvd/system-tarball-sheevaplug.nix b/modules/installer/cd-dvd/system-tarball-sheevaplug.nix
index c5f6de4c221..e49bcf3a66a 100644
--- a/modules/installer/cd-dvd/system-tarball-sheevaplug.nix
+++ b/modules/installer/cd-dvd/system-tarball-sheevaplug.nix
@@ -106,11 +106,6 @@ in
     [ "mvsdio" "mmc_block" "reiserfs" "ext3" "ums-cypress" "rtc_mv"
       "ext4" ];
 
-  boot.initrd.kernelModules =
-    [
-      "scsi_wait_scan"
-    ];
-
   boot.postBootCommands =
     ''
       mkdir -p /mnt
diff --git a/modules/profiles/all-hardware.nix b/modules/profiles/all-hardware.nix
index 359324dd13c..b5e25fffb42 100644
--- a/modules/profiles/all-hardware.nix
+++ b/modules/profiles/all-hardware.nix
@@ -46,11 +46,6 @@
       "hid_apple"
     ];
 
-  boot.initrd.kernelModules =
-    [ # Wait for SCSI devices to appear.
-      "scsi_wait_scan"
-    ];
-
   # Include lots of firmware.
   require =
     [ ../hardware/network/intel-4965agn.nix
diff --git a/modules/system/boot/kernel.nix b/modules/system/boot/kernel.nix
index ea5a300fbce..a7e37b0909f 100644
--- a/modules/system/boot/kernel.nix
+++ b/modules/system/boot/kernel.nix
@@ -160,6 +160,9 @@ let kernel = config.boot.kernelPackages.kernel; in
 
         # Misc. stuff.
         "pcips2" "serio" "atkbd" "xtkbd"
+
+        # To wait for SCSI devices to appear.
+        "scsi_wait_scan"
       ];
 
     boot.initrd.kernelModules =
diff --git a/modules/system/boot/stage-1-init.sh b/modules/system/boot/stage-1-init.sh
index 8456e3dae15..7c98b35eba2 100644
--- a/modules/system/boot/stage-1-init.sh
+++ b/modules/system/boot/stage-1-init.sh
@@ -139,6 +139,8 @@ mkdir -p /dev/.mdadm
 udevd --daemon
 udevadm trigger --action=add
 udevadm settle || true
+modprobe scsi_wait_scan || true
+udevadm settle || true
 
 
 # XXX: Use case usb->lvm will still fail, usb->luks->lvm is covered
@@ -298,7 +300,7 @@ for ((n = 0; n < ${#mountPoints[*]}; n++)); do
     # that we don't properly recognise.
     if test -z "$pseudoDevice" -a ! -e $device; then
         echo -n "waiting for device $device to appear..."
-        for ((try = 0; try < 10; try++)); do
+        for ((try = 0; try < 20; try++)); do
             sleep 1
             if test -e $device; then break; fi
             echo -n "."
@@ -306,6 +308,10 @@ for ((n = 0; n < ${#mountPoints[*]}; n++)); do
         echo
     fi
 
+    # Wait once more for the udev queue to empty, just in case it's
+    # doing something with $device right now.
+    udevadm settle || true
+
     echo "mounting $device on $mountPoint..."
 
     mountFS "$device" "$mountPoint" "$options" "$fsType"
-- 
GitLab


From ec3dca188c8d8d6d6d789dc02cb66455131f7b32 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 6 Apr 2012 19:21:50 +0000
Subject: [PATCH 3568/5331] Dropped the unused/unknown/obsolete module i8042
 from 'boot.initrd.kernelModules'.

svn path=/nixos/trunk/; revision=33654
---
 modules/system/boot/kernel.nix | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/modules/system/boot/kernel.nix b/modules/system/boot/kernel.nix
index a7e37b0909f..1b247a65890 100644
--- a/modules/system/boot/kernel.nix
+++ b/modules/system/boot/kernel.nix
@@ -168,9 +168,6 @@ let kernel = config.boot.kernelPackages.kernel; in
     boot.initrd.kernelModules =
       [ # For LVM.
         "dm_mod"
-
-        # For usual AT keyboards.
-        "i8042"
       ];
 
     # The Linux kernel >= 2.6.27 provides firmware.
-- 
GitLab


From 6e7859814cb3f0bf963235eb570545ead4acff3d Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sat, 7 Apr 2012 13:17:03 +0000
Subject: [PATCH 3569/5331] * Move misc/deployment.nix to Charon, since these
 options don't really   make sense outside of a Charon deployment.

svn path=/nixos/trunk/; revision=33661
---
 modules/misc/deployment.nix | 246 ------------------------------------
 modules/module-list.nix     |   1 -
 2 files changed, 247 deletions(-)
 delete mode 100644 modules/misc/deployment.nix

diff --git a/modules/misc/deployment.nix b/modules/misc/deployment.nix
deleted file mode 100644
index ba9b3c43675..00000000000
--- a/modules/misc/deployment.nix
+++ /dev/null
@@ -1,246 +0,0 @@
-{ config, pkgs, ... }:
-
-with pkgs.lib;
-
-let cfg = config.deployment; in
-
-{
-  options = {
-
-    deployment.targetEnv = mkOption {
-      default = "none";
-      example = "ec2";
-      type = types.uniq types.string;
-      description = ''
-        This option specifies the type of the environment in which the
-        machine is to be deployed by
-        <command>nixos-deploy-network</command>.  Currently, it can
-        have the following values. <literal>"none"</literal> means
-        deploying to a pre-existing physical or virtual NixOS machine,
-        reachable via SSH under the hostname or IP address specified
-        in <option>deployment.targetHost</option>.
-        <literal>"ec2"</literal> means that a virtual machine should be
-        instantiated in an Amazon EC2-compatible cloud environment
-        (see <option>deployment.ec2.*</option>).
-        <literal>"adhoc-cloud"</literal> means that a virtual machine
-        should be instantiated by executing certain commands via SSH
-        on a cloud controller machine (see
-        <option>deployment.adhoc.*</option>).  This is primarily
-        useful for debugging <command>nixos-deploy-network</command>.
-      '';
-    };
-
-    deployment.targetHost = mkOption {
-      default = config.networking.hostName;
-      type = types.uniq types.string;
-      description = ''
-        This option specifies a hostname or IP address which can be
-        used by <command>nixos-deploy-network</command> to execute
-        remote deployment operations.
-      '';
-    };
-
-    # EC2/Nova/Eucalyptus-specific options.
-
-    deployment.ec2.type = mkOption {
-      default = "ec2";
-      example = "nova";
-      type = types.uniq types.string;
-      description = ''
-        Specifies the type of cloud.  This affects the machine
-        configuration.  Current values are <literal>"ec2"</literal>
-        and <literal>"nova"</literal>.
-      '';
-    };
-
-    deployment.ec2.controller = mkOption {
-      example = https://ec2.eu-west-1.amazonaws.com/;
-      type = types.uniq types.string;
-      description = ''
-        URI of an Amazon EC2-compatible cloud controller web service,
-        used to create and manage virtual machines.  If you're using
-        EC2, it's more convenient to set
-        <option>deployment.ec2.region</option>.
-      '';
-    };
-
-    deployment.ec2.region = mkOption {
-      default = "";
-      example = "us-east-1";
-      type = types.uniq types.string;
-      description = ''
-        Amazon EC2 region in which the instance is to be deployed.
-        This option only applies when using EC2.  It implicitly sets
-        <option>deployment.ec2.controller</option> and
-        <option>deployment.ec2.ami</option>.
-      '';
-    };
-
-    deployment.ec2.ami = mkOption {
-      example = "ami-ecb49e98";
-      type = types.uniq types.string;
-      description = ''
-        EC2 identifier of the AMI disk image used in the virtual
-        machine.  This must be a NixOS image providing SSH access.
-      '';
-    };
-
-    deployment.ec2.instanceType = mkOption {
-      default = "m1.small";
-      example = "m1.large";
-      type = types.uniq types.string;
-      description = ''
-        EC2 instance type.  See <link
-        xlink:href='http://aws.amazon.com/ec2/instance-types/'/> for a
-        list of valid Amazon EC2 instance types.
-      '';
-    };
-
-    deployment.ec2.keyPair = mkOption {
-      example = "my-keypair";
-      type = types.uniq types.string;
-      description = ''
-        Name of the SSH key pair to be used to communicate securely
-        with the instance.  Key pairs can be created using the
-        <command>ec2-add-keypair</command> command.
-      '';
-    };
-
-    deployment.ec2.securityGroups = mkOption {
-      default = [ "default" ];
-      example = [ "my-group" "my-other-group" ];
-      type = types.list types.string;
-      description = ''
-        Security groups for the instance.  These determine the
-        firewall rules applied to the instance.
-      '';
-    };
-
-    deployment.ec2.tags = mkOption {
-      default = { };
-      example = { foo = "bar"; xyzzy = "bla"; };
-      type = types.attrsOf types.string;
-      description = ''
-        EC2 tags assigned to the instance.  Each tag name can be at
-        most 128 characters, and each tag value can be at most 256
-        characters.  There can be at most 10 tags.
-      '';
-    };
-
-    # Ad hoc cloud options.
-
-    deployment.adhoc.controller = mkOption {
-      example = "cloud.example.org";
-      type = types.uniq types.string;
-      description = ''
-        Hostname or IP addres of the machine to which
-        <command>nixos-deploy-network</command> should connect (via
-        SSH) to execute commands to start VMs or query their status.
-      '';
-    };
-
-    deployment.adhoc.createVMCommand = mkOption {
-      default = "create-vm";
-      type = types.uniq types.string;
-      description = ''
-        Remote command to create a NixOS virtual machine.  It should
-        print an identifier denoting the VM on standard output.
-      '';
-    };
-
-    deployment.adhoc.destroyVMCommand = mkOption {
-      default = "destroy-vm";
-      type = types.uniq types.string;
-      description = ''
-        Remote command to destroy a previously created NixOS virtual
-        machine.
-      '';
-    };
-
-    deployment.adhoc.queryVMCommand = mkOption {
-      default = "query-vm";
-      type = types.uniq types.string;
-      description = ''
-        Remote command to query information about a previously created
-        NixOS virtual machine.  It should print the IPv6 address of
-        the VM on standard output.
-      '';
-    };
-
-    # VirtualBox options.
-
-    deployment.virtualbox.baseImage = mkOption {
-      example = "/home/alice/base-disk.vdi";
-      description = ''
-        Path to the initial disk image used to bootstrap the
-        VirtualBox instance.  The instance boots from a clone of this
-        image.
-      '';
-    };
-
-    # Computed options useful for referring to other machines in
-    # network specifications.
-
-    networking.privateIPv4 = mkOption {
-      example = "10.1.2.3";
-      type = types.uniq types.string;
-      description = ''
-        IPv4 address of this machine within in the logical network.
-        This address can be used by other machines in the logical
-        network to reach this machine.  However, it need not be
-        visible to the outside (i.e., publicly routable).
-      '';
-    };
-
-    networking.publicIPv4 = mkOption {
-      example = "198.51.100.123";
-      type = types.uniq types.string;
-      description = ''
-        Publicly routable IPv4 address of this machine.
-      '';
-    };
-
-  };
-
-
-  config = {
-  
-    deployment.ec2 = mkIf (cfg.ec2.region != "") {
-    
-      controller = mkDefault "https://ec2.${cfg.ec2.region}.amazonaws.com/";
-
-      # The list below is generated by running the "create-amis.sh" script, then doing:
-      # $ while read system region ami; do echo "        if cfg.ec2.region == \"$region\" && config.nixpkgs.system == \"$system\" then \"$ami\" else"; done < amis
-      ami = mkDefault (
-        if cfg.ec2.region == "eu-west-1" && config.nixpkgs.system == "x86_64-linux" then "ami-732c1407" else
-        if cfg.ec2.region == "us-east-1" && config.nixpkgs.system == "x86_64-linux" then "ami-d9409fb0" else
-        if cfg.ec2.region == "us-west-1" && config.nixpkgs.system == "x86_64-linux" then "ami-4996ce0c" else
-        if cfg.ec2.region == "eu-west-1" && config.nixpkgs.system == "i686-linux"   then "ami-dd90a9a9" else
-        # !!! Doesn't work, not lazy enough.
-        # throw "I don't know an AMI for region ‘${cfg.ec2.region}’ and platform type ‘${config.nixpkgs.system}’"
-        "");
-        
-    };
-
-    deployment.virtualbox = {
-
-      baseImage = mkDefault (
-        let
-          unpack = name: sha256: pkgs.runCommand "virtualbox-charon-${name}.vdi" {}
-            ''
-              xz -d < ${pkgs.fetchurl {
-                url = "http://nixos.org/releases/nixos/virtualbox-charon-images/virtualbox-charon-${name}.vdi.xz";
-                inherit sha256;
-              }} > $out
-            '';
-        in if config.nixpkgs.system == "x86_64-linux" then
-          unpack "r33382-x86_64" "16irymms7vs4l3cllbpfl572269dwmlc7zficzf0r05bx7l0jsax"
-        else if config.nixpkgs.system == "i686-linux" then /foo/disk.vdi else
-          throw "Unsupported VirtualBox system type!"
-      );
-    
-    };
-        
-  };
-  
-}
diff --git a/modules/module-list.nix b/modules/module-list.nix
index fdee87506ad..684d1ad516e 100644
--- a/modules/module-list.nix
+++ b/modules/module-list.nix
@@ -32,7 +32,6 @@
   ./misc/assertions.nix
   ./misc/check-config.nix
   ./misc/crashdump.nix
-  ./misc/deployment.nix
   ./misc/ids.nix
   ./misc/locate.nix
   ./misc/nixpkgs.nix
-- 
GitLab


From 301c4d96b11e5f76ec1fb44cb9ab6993cd200b52 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sat, 7 Apr 2012 13:26:35 +0000
Subject: [PATCH 3570/5331] * Remove nixos-deploy-network.  It has been
 superceded by Charon.

svn path=/nixos/trunk/; revision=33662
---
 doc/manual/man-nixos-deploy-network.xml       | 112 ----------------
 doc/manual/man-pages.xml                      |   2 +-
 .../tools/nixos-deploy-network/deploy.nix     | 121 ------------------
 .../nixos-deploy-network.sh                   |  70 ----------
 modules/installer/tools/tools.nix             |   5 -
 5 files changed, 1 insertion(+), 309 deletions(-)
 delete mode 100644 doc/manual/man-nixos-deploy-network.xml
 delete mode 100644 modules/installer/tools/nixos-deploy-network/deploy.nix
 delete mode 100644 modules/installer/tools/nixos-deploy-network/nixos-deploy-network.sh

diff --git a/doc/manual/man-nixos-deploy-network.xml b/doc/manual/man-nixos-deploy-network.xml
deleted file mode 100644
index 9667fef180e..00000000000
--- a/doc/manual/man-nixos-deploy-network.xml
+++ /dev/null
@@ -1,112 +0,0 @@
-<refentry xmlns="http://docbook.org/ns/docbook"
-          xmlns:xlink="http://www.w3.org/1999/xlink"
-          xmlns:xi="http://www.w3.org/2001/XInclude">
-  
-<refmeta>
-  <refentrytitle><command>nixos-deploy-network</command></refentrytitle>
-  <manvolnum>8</manvolnum>
-  <refmiscinfo class="source">NixOS</refmiscinfo>
-  <!-- <refmiscinfo class="version"><xi:include href="version.txt" parse="text"/></refmiscinfo> -->
-</refmeta>
-
-<refnamediv>
-  <refname><command>nixos-deploy-network</command></refname>
-  <refpurpose>deploy a network of NixOS configurations into a network of machines</refpurpose>
-</refnamediv>
-
-<refsynopsisdiv>
-  <cmdsynopsis>
-    <command>nixos-deploy-network</command>
-    <arg><option>--show-trace</option></arg>
-    <arg><option>--no-out-link</option></arg>
-    <arg><option>--help</option></arg>
-    <arg choice="plain"><replaceable>network.nix</replaceable></arg>
-  </cmdsynopsis>
-</refsynopsisdiv>
-
-<refsection><title>Description</title>
-
-<para>This command automatically deploys a network of NixOS
-configurations into a network of machines.
-First, it tries to build all the system derivations defined
-in the network expression. Then it efficiently transfers
-the closures to the machines in the network. Finally, the configurations
-are activated. In case of a failure, a rollback is performed,
-which brings all the updated configurations back into the previous
-state.</para>
-
-<para>A network Nix expression has the following structure:
-
-<screen>
-{
-  test1 = {pkgs, config, ...}:
-    {
-      services.openssh.enable = true;
-      nixpkgs.system = "i686-linux";
-      deployment.targetHost = "test1.example.net";
-      
-      # Other NixOS options
-    };
-    
-  test2 = {pkgs, config, ...}:
-    {
-      services.openssh.enable = true;
-      services.httpd.enable = true;
-      environment.systemPackages = [ pkgs.lynx ];
-      nixpkgs.system = "x86_64-linux";
-      deployment.targetHost = "test2.example.net";
-      
-      # Other NixOS options
-    };
-}
-</screen>
-
-Each attribute in the expression represents a machine in the network
-(e.g. <varname>test1</varname> and <varname>test2</varname>)
-referring to a function defining a NixOS configuration.
-In each NixOS configuration, two attributes have a special meaning.
-The <varname>deployment.targetHost</varname> specifies the address
-(domain name or IP address)
-of the system which is used by <command>ssh</command> to perform
-remote deployment operations. The <varname>nixpkgs.system</varname>
-attribute can be used to specify an architecture for the target machine,
-such as <varname>i686-linux</varname> which builds a 32-bit NixOS
-configuration. Omitting this property will build the configuration
-for the same architecture as the host system.
-</para>
-
-</refsection>
-
-<refsection><title>Options</title>
-
-<para>This command accepts the following options:</para>
-
-<variablelist>
-
-  <varlistentry>
-    <term><option>--show-trace</option></term>
-    <listitem>
-      <para>Shows a trace of the output.</para>
-    </listitem>
-  </varlistentry>
-
-  <varlistentry>
-    <term><option>--no-out-link</option></term>
-    <listitem>
-      <para>Do not create a 'result' symlink.</para>
-    </listitem>
-  </varlistentry>
-
-  <varlistentry>
-    <term><option>-h</option>, <option>--help</option></term>
-    <listitem>
-      <para>Shows the usage of this command to the user.</para>
-    </listitem>
-  </varlistentry>
-
-</variablelist>
-
-</refsection>
-
-
-</refentry>
diff --git a/doc/manual/man-pages.xml b/doc/manual/man-pages.xml
index ffe0100c5ed..7840e1b897b 100644
--- a/doc/manual/man-pages.xml
+++ b/doc/manual/man-pages.xml
@@ -26,6 +26,6 @@
   <xi:include href="man-configuration.xml" />
   <xi:include href="man-nixos-rebuild.xml" />
   <xi:include href="man-nixos-option.xml" />
-  <xi:include href="man-nixos-deploy-network.xml" />
   <xi:include href="man-nixos-build-vms.xml" />
+  
 </reference>
diff --git a/modules/installer/tools/nixos-deploy-network/deploy.nix b/modules/installer/tools/nixos-deploy-network/deploy.nix
deleted file mode 100644
index 7ece202a990..00000000000
--- a/modules/installer/tools/nixos-deploy-network/deploy.nix
+++ /dev/null
@@ -1,121 +0,0 @@
-{ nixos ? /etc/nixos/nixos
-, nixpkgs ? /etc/nixos/nixpkgs
-, networkExprs
-, targetProperty ? "targetHost"
-}:
-
-let
-  pkgs = import nixpkgs {};
-
-  inherit (builtins) attrNames getAttr listToAttrs;
-  inherit (pkgs.lib) concatMapStrings zipAttrs;
-
-  networks = map (networkExpr: import networkExpr) networkExprs;
-
-  network = zipAttrs networks;
-
-  generateRollbackSucceededPhase = network: configs:
-    concatMapStrings (configurationName:
-      let
-	config = getAttr configurationName configs;
-      in
-      ''
-        if [ "$rollback" != "$succeeded" ]
-	then
-	    ssh $NIX_SSHOPTS ${getAttr targetProperty (config.deployment)} nix-env -p /nix/var/nix/profiles/system --rollback
-	    ssh $NIX_SSHOPTS ${getAttr targetProperty (config.deployment)} /nix/var/nix/profiles/system/bin/switch-to-configuration switch
-
-	    rollback=$((rollback + 1))
-	fi
-      ''
-    ) (attrNames network)
-  ;
-
-  generateDistributionPhase = network: configs:
-    concatMapStrings (configurationName:
-      let
-	config = getAttr configurationName configs;
-      in
-      ''
-        echo "=== copy system closure to ${getAttr targetProperty (config.deployment)} ==="
-        nix-copy-closure --to ${getAttr targetProperty (config.deployment)} ${config.system.build.toplevel}
-      ''
-    ) (attrNames network)
-  ;
-
-  generateActivationPhase = network: configs:
-    concatMapStrings (configurationName:
-      let
-	config = getAttr configurationName configs;
-      in
-      ''
-        echo "=== activating system configuration on ${getAttr targetProperty (config.deployment)} ==="
-	ssh $NIX_SSHOPTS ${getAttr targetProperty (config.deployment)} nix-env -p /nix/var/nix/profiles/system --set ${config.system.build.toplevel} ||
-	  (ssh $NIX_SSHOPTS ${getAttr targetProperty (config.deployment)} nix-env -p /nix/var/nix/profiles/system --rollback; rollbackSucceeded)
-
-        ssh $NIX_SSHOPTS ${getAttr targetProperty (config.deployment)} /nix/var/nix/profiles/system/bin/switch-to-configuration switch ||
-	  ( ssh $NIX_SSHOPTS ${getAttr targetProperty (config.deployment)} nix-env -p /nix/var/nix/profiles/system --rollback
-	    ssh $NIX_SSHOPTS ${getAttr targetProperty (config.deployment)} /nix/var/nix/profiles/system/bin/switch-to-configuration switch
-	    rollbackSucceeded
-	  )
-
-	succeeded=$((succeeded + 1))
-      ''
-    ) (attrNames network)
-  ;
-
-  evaluateMachines = network:
-    listToAttrs (map (configurationName:
-      let
-        modules = getAttr configurationName network;
-      in
-      { name = configurationName;
-        value = (import "${nixos}/lib/eval-config.nix" {
-          inherit nixpkgs;
-          modules =
-	    modules ++
-            [ # Provide a default hostname and deployment target equal
-              # to the attribute name of the machine in the model.
-              { key = "set-default-hostname";
-                networking.hostName = pkgs.lib.mkOverride 900 configurationName;
-                deployment.targetHost = pkgs.lib.mkOverride 900 configurationName;
-              }
-            ];
-          extraArgs = { nodes = evaluateMachines network; };
-        }).config; }
-    ) (attrNames (network)));
-
-  configs = evaluateMachines network;
-in
-pkgs.stdenv.mkDerivation {
-  name = "deploy-script";
-
-  # This script has a zillion dependencies and is trivial to build, so
-  # we don't want to build it remotely.
-  preferLocalBuild = true;
-
-  buildCommand =
-  ''
-    ensureDir $out/bin
-    cat > $out/bin/deploy-systems << "EOF"
-    #! ${pkgs.stdenv.shell} -e
-
-    rollbackSucceeded()
-    {
-        rollback=0
-        ${generateRollbackSucceededPhase network configs}
-    }
-
-    # Distribution phase
-
-    ${generateDistributionPhase network configs}
-
-    # Activation phase
-
-    succeeded=0
-
-    ${generateActivationPhase network configs}
-    EOF
-    chmod +x $out/bin/deploy-systems
-  '';
-}
diff --git a/modules/installer/tools/nixos-deploy-network/nixos-deploy-network.sh b/modules/installer/tools/nixos-deploy-network/nixos-deploy-network.sh
deleted file mode 100644
index 28580e2f49d..00000000000
--- a/modules/installer/tools/nixos-deploy-network/nixos-deploy-network.sh
+++ /dev/null
@@ -1,70 +0,0 @@
-#! @shell@ -e
-
-# Shows the usage of this command to the user
-
-showUsage()
-{
-    echo "Usage: $0 network_expr [network_expr2 ...]"
-    echo "Options:"
-    echo
-    echo "--show-trace  Shows an output trace"
-    echo "--no-out-link Do not create a 'result' symlink"
-    echo "-h,--help     Shows the usage of this command"
-}
-
-# Parse valid argument options
-
-PARAMS=`getopt -n $0 -o h -l show-trace,no-out-link,help -- "$@"`
-
-if [ $? != 0 ]
-then
-    showUsage
-    exit 1
-fi
-
-eval set -- "$PARAMS"
-
-# Evaluate valid options
-
-while [ "$1" != "--" ]
-do
-    case "$1" in
-	--show-trace)
-	    showTraceArg="--show-trace"
-	    ;;
-	--no-out-link)
-	    noOutLinkArg="--no-out-link"
-	    ;;
-	-h|--help)
-	    showUsage
-	    exit 0
-	    ;;
-    esac
-    
-    shift
-done
-
-shift
-
-# Validate the given options
-
-if [ -z "$NIXOS" ]
-then
-    NIXOS=/etc/nixos/nixos
-fi
-
-if [ "$@" = "" ]
-then
-    echo "ERROR: At least one network Nix expression must be specified!" >&2
-    exit 1
-else
-    for i in $@
-    do
-	networkExprs="$networkExprs \"$(readlink -f $i)\""
-    done    
-fi
-
-# Deploy the network
-
-vms=`nix-build $NIXOS/modules/installer/tools/nixos-deploy-network/deploy.nix --arg networkExprs "[ $networkExprs ]" --argstr nixos $NIXOS $showTraceArg $noOutLinkArg`
-$vms/bin/deploy-systems
diff --git a/modules/installer/tools/tools.nix b/modules/installer/tools/tools.nix
index 740bfcbbb0c..b0276bba881 100644
--- a/modules/installer/tools/tools.nix
+++ b/modules/installer/tools/tools.nix
@@ -17,11 +17,6 @@ let
     src = ./nixos-build-vms/nixos-build-vms.sh;
   };
 
-  nixosDeployNetwork = makeProg {
-    name = "nixos-deploy-network";
-    src = ./nixos-deploy-network/nixos-deploy-network.sh;
-  };
-
   nixosInstall = makeProg {
     name = "nixos-install";
     src = ./nixos-install.sh;
-- 
GitLab


From 6b34bd856438481e6c3352a361600af2b4c04224 Mon Sep 17 00:00:00 2001
From: Rob Vermaas <rob.vermaas@gmail.com>
Date: Sat, 7 Apr 2012 15:18:39 +0000
Subject: [PATCH 3571/5331] remove remaining reference to nixos-deploy-nwtork

svn path=/nixos/trunk/; revision=33663
---
 modules/installer/tools/tools.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/modules/installer/tools/tools.nix b/modules/installer/tools/tools.nix
index b0276bba881..930be55a0de 100644
--- a/modules/installer/tools/tools.nix
+++ b/modules/installer/tools/tools.nix
@@ -111,7 +111,6 @@ in
   config = {
     environment.systemPackages =
       [ nixosBuildVMS
-        nixosDeployNetwork
         nixosInstall
         nixosRebuild
         nixosHardwareScan
-- 
GitLab


From defe1d36cb0854b6d071943d8cb067562bd1d6b1 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 9 Apr 2012 12:49:03 +0000
Subject: [PATCH 3572/5331] * Generate a NixOS channel.

svn path=/nixos/trunk/; revision=33684
---
 release.nix | 43 ++++++++++++++++++++++++++++++++++++++++---
 1 file changed, 40 insertions(+), 3 deletions(-)

diff --git a/release.nix b/release.nix
index 35078be6ccb..c47e34e16b7 100644
--- a/release.nix
+++ b/release.nix
@@ -1,4 +1,6 @@
-{ nixosSrc ? {outPath = ./.; rev = 1234;} }:
+{ nixosSrc ? {outPath = ./.; rev = 1234;}
+, nixpkgs ? {outPath = <nixpkgs>; rev = 5678;}
+}:
 
 let
 
@@ -99,6 +101,42 @@ let
       };
 
 
+    channel =
+      { officialRelease ? false }:
+
+      with import <nixpkgs> {};
+
+      releaseTools.makeSourceTarball {
+        name = "nixos-channel";
+
+        version = builtins.readFile ./VERSION;
+
+        src = nixosSrc;
+
+        inherit officialRelease;
+
+        buildInputs = [ nixUnstable ];
+
+        expr =
+          ''
+            { system ? builtins.currentSystem }:
+            { pkgs = (import nixpkgs/default.nix { inherit system; }) // { recurseForDerivations = true; }; }
+          '';
+
+        distPhase = ''
+          releaseName=nixos-$VERSION$VERSION_SUFFIX-${toString nixpkgs.rev}
+          ensureDir "$out/tarballs"
+          mkdir ../$releaseName
+          cp -prd . ../$releaseName/nixos
+          cp -prd ${nixpkgs} ../$releaseName/nixpkgs
+          echo "$expr" > ../$releaseName/default.nix
+          NIX_STATE_DIR=$TMPDIR nix-env -f ../$releaseName/default.nix -qaP --meta --xml \* > /dev/null
+          cd ..
+          tar cfj $out/tarballs/$releaseName.tar.bz2 $releaseName
+        ''; # */
+      };
+
+
     manual =
       { officialRelease ? false }:
 
@@ -108,8 +146,7 @@ let
           (import lib/eval-config.nix {
             modules = [ { fileSystems = []; } ];
           }).options;
-        revision =
-          if nixosSrc.rev == 1234 then "HEAD" else toString nixosSrc.rev;
+        revision = toString nixosSrc.rev;
       }).manual;
 
 
-- 
GitLab


From 80866302b449f5ebee096023b7c695d17a68c178 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 9 Apr 2012 12:52:15 +0000
Subject: [PATCH 3573/5331] * Disable two jobs that don't evaluate.

svn path=/nixos/trunk/; revision=33685
---
 release.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/release.nix b/release.nix
index c47e34e16b7..d336a1bdf8d 100644
--- a/release.nix
+++ b/release.nix
@@ -182,6 +182,7 @@ let
       module = ./modules/installer/cd-dvd/system-tarball-pc.nix;
     };
 
+    /*
     system_tarball_fuloong2f =
       assert builtins.currentSystem == "mips64-linux";
       makeSystemTarball {
@@ -193,6 +194,7 @@ let
       makeSystemTarball {
         module = ./modules/installer/cd-dvd/system-tarball-sheevaplug.nix;
       } { system = "armv5tel-linux"; };
+    */
 
 
     tests =
-- 
GitLab


From d3c1261665739086f4e6dcac24618bc68fab3e2d Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 9 Apr 2012 13:04:58 +0000
Subject: [PATCH 3574/5331] * Add a combined NixOS/Nixpkgs jobset.  This is to
 get a NixOS channel   containing Nixpkgs binaries.

svn path=/nixos/trunk/; revision=33686
---
 release-combined.nix | 4 ++++
 1 file changed, 4 insertions(+)
 create mode 100644 release-combined.nix

diff --git a/release-combined.nix b/release-combined.nix
new file mode 100644
index 00000000000..068d637314b
--- /dev/null
+++ b/release-combined.nix
@@ -0,0 +1,4 @@
+{
+  nixos = import ./release.nix;
+  nixpkgs = import <nixpkgs/pkgs/top-level/release-small.nix>;
+}
\ No newline at end of file
-- 
GitLab


From 0b8b6616b6f234ad2762b432104b0f10d12a9954 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Mon, 9 Apr 2012 20:08:14 +0000
Subject: [PATCH 3575/5331] Making the memtest name come from the
 pkgs.memtest86, as the nixos user can override choosing between two memtests.

svn path=/nixos/trunk/; revision=33690
---
 modules/installer/grub/memtest.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/installer/grub/memtest.nix b/modules/installer/grub/memtest.nix
index c772161f1b3..f89f5834284 100644
--- a/modules/installer/grub/memtest.nix
+++ b/modules/installer/grub/memtest.nix
@@ -20,7 +20,7 @@ in
   config.boot.loader.grub = mkIf isEnabled {
     extraEntries = 
       ''
-        menuentry "Memtest86+" {
+        menuentry "${pkgs.memtest86.name}" {
           linux16 $bootRoot/memtest.bin
         }
       '';
-- 
GitLab


From 6e281e46b770c153f1f928494d90af17898bcc06 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Mon, 9 Apr 2012 20:30:14 +0000
Subject: [PATCH 3576/5331] I update the name of the memtest entry in grub of
 the iso images, because it can be overriden choosing another memtest86.

As an effect of a change in nixpgks, the isos will include
memtest86 4.0a instead of memtest86+ 4.20, only because the
former is released later, and I deduce it should work better.


svn path=/nixos/trunk/; revision=33691
---
 modules/installer/cd-dvd/memtest.nix | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/modules/installer/cd-dvd/memtest.nix b/modules/installer/cd-dvd/memtest.nix
index 2ec35dcc8fb..6494c696611 100644
--- a/modules/installer/cd-dvd/memtest.nix
+++ b/modules/installer/cd-dvd/memtest.nix
@@ -7,18 +7,20 @@ let
 
   memtestPath = "/boot/memtest.bin";
 
+  memtest86 = pkgs.memtest86;
+
 in
 
 {
   boot.loader.grub.extraEntries =
     ''
-      menuentry "Memtest86+" {
+      menuentry "${memtest86.name}" {
         linux16 ${memtestPath}
       }
     '';
 
   isoImage.contents =
-    [ { source = pkgs.memtest86 + "/memtest.bin";
+    [ { source = memtest86 + "/memtest.bin";
         target = memtestPath;
       }
     ];
-- 
GitLab


From 9017ccf9fea31a2a1d57560792ee86181daf39bf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Mon, 9 Apr 2012 20:36:26 +0000
Subject: [PATCH 3577/5331] Removing the special memtest.nix module for the
 isos, and using the same as the usual nixos. I think this trivial change
 works; I checked the grub.cfg output generated in the iso_minimal.

svn path=/nixos/trunk/; revision=33692
---
 .../installer/cd-dvd/installation-cd-base.nix |  5 ++--
 modules/installer/cd-dvd/memtest.nix          | 27 -------------------
 2 files changed, 3 insertions(+), 29 deletions(-)
 delete mode 100644 modules/installer/cd-dvd/memtest.nix

diff --git a/modules/installer/cd-dvd/installation-cd-base.nix b/modules/installer/cd-dvd/installation-cd-base.nix
index ac38934d401..47e8a101354 100644
--- a/modules/installer/cd-dvd/installation-cd-base.nix
+++ b/modules/installer/cd-dvd/installation-cd-base.nix
@@ -30,8 +30,7 @@ in
 
 {
   require =
-    [ ./memtest.nix
-      ./iso-image.nix
+    [ ./iso-image.nix
 
       # Profiles of this basic installation CD.
       ../../profiles/all-hardware.nix
@@ -67,6 +66,8 @@ in
      echo 1 > /proc/sys/vm/overcommit_memory
     '';
 
+  boot.loader.grub.memtest86 = true;
+
   # To speed up installation a little bit, include the complete stdenv
   # in the Nix store on the CD.
   isoImage.storeContents = [ pkgs.stdenv pkgs.klibc pkgs.klibcShrunk ];
diff --git a/modules/installer/cd-dvd/memtest.nix b/modules/installer/cd-dvd/memtest.nix
deleted file mode 100644
index 6494c696611..00000000000
--- a/modules/installer/cd-dvd/memtest.nix
+++ /dev/null
@@ -1,27 +0,0 @@
-# This module adds Memtest86 to the Grub boot menu on the CD.  !!! It
-# would be nice if this also worked for normal configurations.
-
-{config, pkgs, ...}:
-
-let
-
-  memtestPath = "/boot/memtest.bin";
-
-  memtest86 = pkgs.memtest86;
-
-in
-
-{
-  boot.loader.grub.extraEntries =
-    ''
-      menuentry "${memtest86.name}" {
-        linux16 ${memtestPath}
-      }
-    '';
-
-  isoImage.contents =
-    [ { source = memtest86 + "/memtest.bin";
-        target = memtestPath;
-      }
-    ];
-}
-- 
GitLab


From 849d136aa63f84cf197f9996b8df5d0a61cadff6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Mon, 9 Apr 2012 20:37:54 +0000
Subject: [PATCH 3578/5331] Making also the system-tarball-pc show the memtest
 entry as the pkgs.memtest86.name.

svn path=/nixos/trunk/; revision=33693
---
 modules/installer/cd-dvd/system-tarball-pc.nix | 2 +-
 modules/installer/grub/memtest.nix             | 7 ++++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/modules/installer/cd-dvd/system-tarball-pc.nix b/modules/installer/cd-dvd/system-tarball-pc.nix
index 04dec697a1b..c1a73856887 100644
--- a/modules/installer/cd-dvd/system-tarball-pc.nix
+++ b/modules/installer/cd-dvd/system-tarball-pc.nix
@@ -32,7 +32,7 @@ let
       append initrd=initrd ip=dhcp nfsroot=/home/pcroot systemConfig=${config.system.build.toplevel} init=${config.system.build.toplevel}/init
 
     label memtest
-      MENU LABEL ^Memtest86+
+      MENU LABEL ^${pkgs.memtest86.name}
       KERNEL memtest
   '';
 
diff --git a/modules/installer/grub/memtest.nix b/modules/installer/grub/memtest.nix
index f89f5834284..cdb5d10e1f0 100644
--- a/modules/installer/grub/memtest.nix
+++ b/modules/installer/grub/memtest.nix
@@ -1,10 +1,11 @@
-# This module allows getting memtest86+ in grub menus.
+# This module allows getting memtest86 in grub menus.
 
 {config, pkgs, ...}:
 
 with pkgs.lib;
 let
   isEnabled = config.boot.loader.grub.memtest86;
+  memtest86 = pkgs.memtest86;
 in
 {
   options = {
@@ -20,13 +21,13 @@ in
   config.boot.loader.grub = mkIf isEnabled {
     extraEntries = 
       ''
-        menuentry "${pkgs.memtest86.name}" {
+        menuentry "${memtest86.name}" {
           linux16 $bootRoot/memtest.bin
         }
       '';
     extraPrepareConfig =
       ''
-        cp ${pkgs.memtest86}/memtest.bin /boot/memtest.bin;
+        cp ${memtest86}/memtest.bin /boot/memtest.bin;
       '';
   };
 }
-- 
GitLab


From 83679c99b1dc1800228a9eb6474d0bd39b298c2b Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 10 Apr 2012 11:11:05 +0000
Subject: [PATCH 3579/5331] * Don't put /var and /nix on ephemeral storage if
 we're booting   from EBS.

svn path=/nixos/trunk/; revision=33716
---
 modules/virtualisation/amazon-image.nix | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/modules/virtualisation/amazon-image.nix b/modules/virtualisation/amazon-image.nix
index 329bf44e5a9..d2aaeec5bd6 100644
--- a/modules/virtualisation/amazon-image.nix
+++ b/modules/virtualisation/amazon-image.nix
@@ -115,11 +115,13 @@ with pkgs.lib;
           mkdir -m 1777 -p $targetRoot/$diskForAufs/root/tmp $targetRoot/tmp
           mount --bind $targetRoot/$diskForAufs/root/tmp $targetRoot/tmp
 
-          mkdir -m 755 -p $targetRoot/$diskForAufs/root/var $targetRoot/var
-          mount --bind $targetRoot/$diskForAufs/root/var $targetRoot/var
+          if [ ! -e $targetRoot/.ebs ]; then
+              mkdir -m 755 -p $targetRoot/$diskForAufs/root/var $targetRoot/var
+              mount --bind $targetRoot/$diskForAufs/root/var $targetRoot/var
 
-          mkdir -m 755 -p $targetRoot/$diskForAufs/root/nix
-          mount -t aufs -o dirs=$targetRoot/$diskForAufs/root/nix=rw:$targetRoot/nix=rr none $targetRoot/nix
+              mkdir -m 755 -p $targetRoot/$diskForAufs/root/nix
+              mount -t aufs -o dirs=$targetRoot/$diskForAufs/root/nix=rw:$targetRoot/nix=rr none $targetRoot/nix
+          fi
       fi
     '';
 
-- 
GitLab


From a7af5588b69fe877bdaa346d044b6ccfb1860c23 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 10 Apr 2012 12:07:30 +0000
Subject: [PATCH 3580/5331] * Drop ugly reference to
 var/run/current-system/sw/sbin/wpa_cli, and   make it conditional.

svn path=/nixos/trunk/; revision=33717
---
 modules/services/networking/dhcpcd.nix         | 8 +++++---
 modules/services/networking/wpa_supplicant.nix | 1 -
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/modules/services/networking/dhcpcd.nix b/modules/services/networking/dhcpcd.nix
index 9c2ff5575be..b22bbb3f051 100644
--- a/modules/services/networking/dhcpcd.nix
+++ b/modules/services/networking/dhcpcd.nix
@@ -45,7 +45,9 @@ let
 
       # only works when interface is wireless and wpa_supplicant has a control socket
       # but we allow it to fail silently
-      wifiparams=$(/var/run/current-system/sw/sbin/wpa_cli -i$interface status 2>/dev/null | grep ssid | sed 's|^b|B|;s|ssid|SSID|' | xargs)
+      ${optionalString config.networking.wireless.enable ''
+        params+=" $(${pkgs.wpa_supplicant}/sbin/wpa_cli -i$interface status 2>/dev/null | grep ssid | sed 's|^b|B|;s|ssid|SSID|' | xargs)"
+      ''}
 
       if [ "$reason" = BOUND -o "$reason" = REBOOT ]; then
           # Restart ntpd.  (The "ip-up" event below will trigger the
@@ -56,11 +58,11 @@ let
           # it"), so we silently lose time synchronisation.
           ${config.system.build.upstart}/sbin/initctl stop ntpd
 
-          ${config.system.build.upstart}/sbin/initctl emit -n ip-up $params $wifiparams
+          ${config.system.build.upstart}/sbin/initctl emit -n ip-up $params
       fi
 
       if [ "$reason" = EXPIRE -o "$reason" = RELEASE -o "$reason" = NOCARRIER ] ; then
-          ${config.system.build.upstart}/sbin/initctl emit -n ip-down $params $wifiparams
+          ${config.system.build.upstart}/sbin/initctl emit -n ip-down $params
       fi
     '';
 
diff --git a/modules/services/networking/wpa_supplicant.nix b/modules/services/networking/wpa_supplicant.nix
index 338a801f701..fe4fecaf0ba 100644
--- a/modules/services/networking/wpa_supplicant.nix
+++ b/modules/services/networking/wpa_supplicant.nix
@@ -126,7 +126,6 @@ in
     assertions = [{ assertion = !cfg.userControlled.enable || cfg.interfaces != []; 
                     message = "user controlled wpa_supplicant needs explicit networking.wireless.interfaces";}];
 
-
   };
 
 }
-- 
GitLab


From 12011168328be038720246e20b0eb3be76846ad7 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 10 Apr 2012 12:50:20 +0000
Subject: [PATCH 3581/5331] * Temporarily add "-cpu kvm64" to work around the
 GMP abort() bug that   has been fixed in the stdenv branch.

  http://hydra.nixos.org/build/2380676

svn path=/nixos/trunk/; revision=33718
---
 tests/installer.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/installer.nix b/tests/installer.nix
index 10930952a42..4cd546fbe26 100644
--- a/tests/installer.nix
+++ b/tests/installer.nix
@@ -94,7 +94,7 @@ let
       createDisk("harddisk", 4 * 1024);
 
       my $machine = createMachine({ hda => "harddisk", cdrom => glob("${iso}/iso/*.iso"),
-        qemuFlags => '${optionalString testChannel (toString (qemuNICFlags 1 1 2))}'});
+        qemuFlags => '${optionalString testChannel (toString (qemuNICFlags 1 1 2))} ${optionalString (pkgs.stdenv.system == "x86_64-linux") "-cpu kvm64"}'});
       $machine->start;
 
       ${optionalString testChannel ''
-- 
GitLab


From 5409e76353c4023d33111687282146c0676216f2 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 10 Apr 2012 13:09:56 +0000
Subject: [PATCH 3582/5331] * Disable wicd in the installation CD for now,
 because it causes   dhcpcd to segfault randomly or give corrupt output.  See
 e.g.

    http://hydra.nixos.org/build/2380666/nixlog/1/raw

  The problem seems to be that wicd sends a "-k" command to dhcpcd to
  release the interface, which doesn't work well with a dhcpcd that
  handles all interfaces in one process.

svn path=/nixos/trunk/; revision=33720
---
 modules/installer/cd-dvd/installation-cd-graphical.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/installer/cd-dvd/installation-cd-graphical.nix b/modules/installer/cd-dvd/installation-cd-graphical.nix
index fe32481fb7b..2d3ef844f27 100644
--- a/modules/installer/cd-dvd/installation-cd-graphical.nix
+++ b/modules/installer/cd-dvd/installation-cd-graphical.nix
@@ -12,7 +12,7 @@ with pkgs.lib;
   ];
 
   # Provide wicd for easy wireless configuration.
-  networking.wicd.enable = true;
+  #networking.wicd.enable = true;
 
   # KDE complains if power management is disabled (to be precise, if
   # there is no power management backend such as upower).
-- 
GitLab


From b2025c46878d39ea988c9c2a5138a563a587aef8 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 10 Apr 2012 13:25:55 +0000
Subject: [PATCH 3583/5331] * Use "umount -l" to clean up.

svn path=/nixos/trunk/; revision=33721
---
 modules/installer/tools/nixos-install.sh | 26 +++++++-----------------
 1 file changed, 7 insertions(+), 19 deletions(-)

diff --git a/modules/installer/tools/nixos-install.sh b/modules/installer/tools/nixos-install.sh
index 00cd4e2228a..428fdbb9c86 100644
--- a/modules/installer/tools/nixos-install.sh
+++ b/modules/installer/tools/nixos-install.sh
@@ -46,28 +46,16 @@ cat /etc/nsswitch.conf > $mountPoint/etc/nsswitch.conf
 
 # Mount some stuff in the target root directory.
 mkdir -m 0755 -p $mountPoint/dev $mountPoint/proc $mountPoint/sys $mountPoint/mnt
-mount --bind /dev $mountPoint/dev
-mount --bind /proc $mountPoint/proc
-mount --bind /sys $mountPoint/sys
+mount --rbind /dev $mountPoint/dev
+mount --rbind /proc $mountPoint/proc
+mount --rbind /sys $mountPoint/sys
 mount --rbind / $mountPoint/mnt
 
-# Note: probably umount -l is enough. It umounts recursive mount points having been mounted by --rbind!
-# Probably umountUnder can be removed ?
-umountUnder() {
-    local dir="$1"
-    for i in $(grep -F " $dir" /proc/mounts \
-        | @perl@/bin/perl -e 'while (<>) { /^\S+\s+(\S+)\s+/; print "$1\n"; }' \
-        | sort -r);
-    do
-	umount $i || true
-    done
-}
-
 cleanup() {
-    umountUnder $mountPoint/mnt
-    umountUnder $mountPoint/dev
-    umountUnder $mountPoint/proc
-    umountUnder $mountPoint/sys
+    umount -l $mountPoint/mnt
+    umount -l $mountPoint/dev
+    umount -l $mountPoint/proc
+    umount -l $mountPoint/sys
 }
 
 trap "cleanup" EXIT
-- 
GitLab


From 5c06c66b6831d767b2fefa2fe48e32c864f60b59 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 10 Apr 2012 13:28:17 +0000
Subject: [PATCH 3584/5331] * Clear more locale-related variables in the
 installer.

svn path=/nixos/trunk/; revision=33722
---
 modules/installer/tools/nixos-install.sh | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/modules/installer/tools/nixos-install.sh b/modules/installer/tools/nixos-install.sh
index 428fdbb9c86..21afeafce1f 100644
--- a/modules/installer/tools/nixos-install.sh
+++ b/modules/installer/tools/nixos-install.sh
@@ -95,6 +95,8 @@ done
 
 # We don't have locale-archive in the chroot, so clear $LANG.
 export LANG=
+export LC_ALL=
+export LC_TIME=
 
 
 # Register the paths in the Nix closure as valid.  This is necessary
-- 
GitLab


From f9e8e735bbbfc48ba469410ec39b55eeb4378a20 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 10 Apr 2012 13:28:48 +0000
Subject: [PATCH 3585/5331] * Remove debug line.

svn path=/nixos/trunk/; revision=33723
---
 modules/installer/tools/nixos-install.sh | 2 --
 1 file changed, 2 deletions(-)

diff --git a/modules/installer/tools/nixos-install.sh b/modules/installer/tools/nixos-install.sh
index 21afeafce1f..0d24dd6a8e1 100644
--- a/modules/installer/tools/nixos-install.sh
+++ b/modules/installer/tools/nixos-install.sh
@@ -78,8 +78,6 @@ mkdir -m 0755 -p \
 mkdir -m 1777 -p \
     $mountPoint/nix/store \
 
-echo /mnt$NIXOS_CONFIG
-
 
 # Get the store paths to copy from the references graph.
 storePaths=$(@perl@/bin/perl @pathsFromGraph@ @nixClosure@)
-- 
GitLab


From d2a6be078eb1109338a8dec2d55a9e8d4fba37d7 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 10 Apr 2012 14:12:49 +0000
Subject: [PATCH 3586/5331] * Typo.

svn path=/nixos/trunk/; revision=33724
---
 doc/manual/installation.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/manual/installation.xml b/doc/manual/installation.xml
index b47731ffec9..d9354b88ec0 100644
--- a/doc/manual/installation.xml
+++ b/doc/manual/installation.xml
@@ -70,7 +70,7 @@ $ nix-build ./nixos/release.nix -A iso_minimal.iso</screen>
   <listitem><para>Boot from the CD.</para></listitem>
 
   <listitem><para>The CD contains a basic NixOS installation.  (It
-  also contain Memtest86+, useful if you want to test new hardware.)
+  also contains Memtest86+, useful if you want to test new hardware.)
   When it’s finished booting, it should have detected most of your
   hardware and brought up networking (check
   <command>ifconfig</command>).  Networking is necessary for the
-- 
GitLab


From f37b453b1987aba2468cc692bd22cbae3995219b Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 10 Apr 2012 14:39:12 +0000
Subject: [PATCH 3587/5331] * nixos-install: Ensure that builds are done by the
 nixbld users   rather than root.  Also copy all manifests into the chroot so
 that   any nix-pull done outside the chroot is "inherited".

svn path=/nixos/trunk/; revision=33725
---
 modules/installer/tools/nixos-install.sh | 58 ++++++++++++++++--------
 1 file changed, 40 insertions(+), 18 deletions(-)

diff --git a/modules/installer/tools/nixos-install.sh b/modules/installer/tools/nixos-install.sh
index 0d24dd6a8e1..d539b8bb014 100644
--- a/modules/installer/tools/nixos-install.sh
+++ b/modules/installer/tools/nixos-install.sh
@@ -10,6 +10,7 @@
 #   * run the activation script of the configuration (also installs Grub)
 
 set -e
+shopt -s nullglob
 
 if test -z "$mountPoint"; then
     mountPoint=/mnt
@@ -35,27 +36,30 @@ if ! test -e "$NIXOS_CONFIG"; then
 fi
     
 
-# Enable networking in the chroot.
-mkdir -m 0755 -p $mountPoint/etc
-touch /etc/resolv.conf 
-cp -f /etc/resolv.conf $mountPoint/etc/
-rm -f $mountPoint/etc/hosts
-cat /etc/hosts > $mountPoint/etc/hosts
-rm -f $mountPoint/etc/nsswitch.conf
-cat /etc/nsswitch.conf > $mountPoint/etc/nsswitch.conf
-
-# Mount some stuff in the target root directory.
-mkdir -m 0755 -p $mountPoint/dev $mountPoint/proc $mountPoint/sys $mountPoint/mnt
+# Do a nix-pull to speed up building.
+if test -n "@nixpkgsURL@" -a ${NIXOS_PULL:-1} != 0; then
+    @nix@/bin/nix-pull @nixpkgsURL@/MANIFEST || true
+fi
+
+
+# Mount some stuff in the target root directory.  We bind-mount /etc
+# into the chroot because we need networking and the nixbld user
+# accounts in /etc/passwd.  But we do need the target's /etc/nixos.
+mkdir -m 0755 -p $mountPoint/dev $mountPoint/proc $mountPoint/sys $mountPoint/mnt $mountPoint/etc
 mount --rbind /dev $mountPoint/dev
 mount --rbind /proc $mountPoint/proc
 mount --rbind /sys $mountPoint/sys
 mount --rbind / $mountPoint/mnt
+mount --bind /etc $mountPoint/etc
+mount --bind $mountPoint/mnt/$mountPoint/etc/nixos $mountPoint/etc/nixos
 
 cleanup() {
+    set +e
     umount -l $mountPoint/mnt
     umount -l $mountPoint/dev
     umount -l $mountPoint/proc
     umount -l $mountPoint/sys
+    mountpoint -q $mountPoint/etc && umount -l $mountPoint/etc
 }
 
 trap "cleanup" EXIT
@@ -75,8 +79,15 @@ mkdir -m 0755 -p \
     $mountPoint/nix/var/nix/db \
     $mountPoint/nix/var/log/nix/drvs
 
-mkdir -m 1777 -p \
-    $mountPoint/nix/store \
+mkdir -m 1775 -p $mountPoint/nix/store
+chown root.nixbld $mountPoint/nix/store
+
+
+# Make manifests available in the chroot.
+rm -f $mountPoint/nix/var/nix/manifests/*
+for i in /nix/var/nix/manifests/*.nixmanifest; do
+    cp "$(readlink -f "$i")" $mountPoint/nix/var/nix/manifests
+done
 
 
 # Get the store paths to copy from the references graph.
@@ -97,6 +108,12 @@ export LC_ALL=
 export LC_TIME=
 
 
+# Create a temporary Nix config file that causes the nixbld users to
+# be used.
+echo "build-users-group = nixbld" > /mnt/tmp/nix.conf
+export NIX_CONF_DIR=/tmp
+
+
 # Register the paths in the Nix closure as valid.  This is necessary
 # to prevent them from being deleted the first time we install
 # something.  (I.e., Nix will see that, e.g., the glibc path is not
@@ -117,11 +134,6 @@ ln -sf @shell@ $mountPoint/bin/sh
 export NIX_OTHER_STORES=/mnt/nix:$NIX_OTHER_STORES
 
 
-# Do a nix-pull to speed up building.
-if test -n "@nixpkgsURL@" -a ${NIXOS_PULL:-1} != 0; then
-    chroot $mountPoint @nix@/bin/nix-pull @nixpkgsURL@/MANIFEST || true
-fi
-
 if test -n "$NIXOS_PREPARE_CHROOT_ONLY"; then
     echo "User requested only to prepare chroot. Exiting."
     exit 0;
@@ -135,6 +147,16 @@ NIX_PATH=nixpkgs=/mnt/etc/nixos/nixpkgs:nixos=/mnt/etc/nixos/nixos:nixos-config=
     -p /nix/var/nix/profiles/system -f '<nixos>' --set -A system --show-trace
 
 
+# Get rid of the manifests.
+rm -f $mountPoint/nix/var/nix/manifests/*
+
+
+# We're done building/downloading, so we don't need the /etc bind
+# mount anymore.  In fact, below we want to modify the target's /etc.
+umount $mountPoint/etc/nixos
+umount $mountPoint/etc
+
+
 # Make a backup of the old NixOS/Nixpkgs sources.
 echo "copying NixOS/Nixpkgs sources to /etc/nixos...."
 
-- 
GitLab


From f9ac67c67feecf48f1bf3717b31d1b5e1014e3d1 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 10 Apr 2012 15:36:50 +0000
Subject: [PATCH 3588/5331] * Copying manifests is slightly tricky because  
 download-using-manifests expects that the files in   /nix/var/nix/manifests
 are symlinks into the store.

svn path=/nixos/trunk/; revision=33727
---
 modules/installer/tools/nixos-install.sh | 24 +++++++++++++-----------
 tests/installer.nix                      |  2 +-
 2 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/modules/installer/tools/nixos-install.sh b/modules/installer/tools/nixos-install.sh
index d539b8bb014..475b84ade03 100644
--- a/modules/installer/tools/nixos-install.sh
+++ b/modules/installer/tools/nixos-install.sh
@@ -83,13 +83,6 @@ mkdir -m 1775 -p $mountPoint/nix/store
 chown root.nixbld $mountPoint/nix/store
 
 
-# Make manifests available in the chroot.
-rm -f $mountPoint/nix/var/nix/manifests/*
-for i in /nix/var/nix/manifests/*.nixmanifest; do
-    cp "$(readlink -f "$i")" $mountPoint/nix/var/nix/manifests
-done
-
-
 # Get the store paths to copy from the references graph.
 storePaths=$(@perl@/bin/perl @pathsFromGraph@ @nixClosure@)
 
@@ -129,15 +122,24 @@ mkdir -m 0755 -p $mountPoint/bin
 ln -sf @shell@ $mountPoint/bin/sh
 
 
+if test -n "$NIXOS_PREPARE_CHROOT_ONLY"; then
+    echo "User requested only to prepare chroot. Exiting."
+    exit 0;
+fi
+
+
 # Make the build below copy paths from the CD if possible.  Note that
 # /mnt in the chroot is the root of the CD.
 export NIX_OTHER_STORES=/mnt/nix:$NIX_OTHER_STORES
 
 
-if test -n "$NIXOS_PREPARE_CHROOT_ONLY"; then
-    echo "User requested only to prepare chroot. Exiting."
-    exit 0;
-fi
+# Make manifests available in the chroot.
+rm -f $mountPoint/nix/var/nix/manifests/*
+for i in /nix/var/nix/manifests/*.nixmanifest; do
+    chroot $mountPoint @nix@/bin/nix-store -r "$(readlink -f "$i")" > /dev/null
+    cp -pd "$i" $mountPoint/nix/var/nix/manifests/
+done
+
 
 # Build the specified Nix expression in the target store and install
 # it into the system configuration profile.
diff --git a/tests/installer.nix b/tests/installer.nix
index 4cd546fbe26..992348f5dec 100644
--- a/tests/installer.nix
+++ b/tests/installer.nix
@@ -122,7 +122,7 @@ let
             "rm /etc/hosts",
             "echo 192.168.1.1 nixos.org > /etc/hosts",
             "ifconfig eth1 up 192.168.1.2",
-            "nix-pull http://nixos.org/releases/nixpkgs/channels/nixpkgs-unstable/MANIFEST",
+            "nixos-rebuild pull",
         );
 
         # Test nix-env.
-- 
GitLab


From 871b4bd43aca4ccf0b6f3ee9fa704a2a1cde1b70 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 10 Apr 2012 20:28:06 +0000
Subject: [PATCH 3589/5331] * Consistently include the Nixpkgs revision in the
 NixOS version   string.

svn path=/nixos/trunk/; revision=33729
---
 release.nix | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/release.nix b/release.nix
index d336a1bdf8d..286e314ac1e 100644
--- a/release.nix
+++ b/release.nix
@@ -4,18 +4,20 @@
 
 let
 
+  versionSuffix = "pre${toString nixosSrc.rev}-${toString nixpkgs.rev}";
+
 
   makeIso =
     { module, type, description ? type, maintainers ? ["eelco"] }:
     { officialRelease ? false
-    , system ? "i686-linux"
+    , system ? builtins.currentSystem
     }:
 
     with import <nixpkgs> {inherit system;};
 
     let
 
-      version = builtins.readFile ./VERSION + (if officialRelease then "" else "pre${toString nixosSrc.rev}");
+      version = builtins.readFile ./VERSION + (lib.optionalString (!officialRelease) versionSuffix);
 
       versionModule =
         { system.nixosVersion = version;
@@ -48,12 +50,12 @@ let
   makeSystemTarball =
     { module, maintainers ? ["viric"]}:
     { officialRelease ? false
-    , system ? "i686-linux"
+    , system ? builtins.currentSystem
     }:
 
     with import <nixpkgs> {inherit system;};
     let
-      version = builtins.readFile ./VERSION + (if officialRelease then "" else "pre${toString nixosSrc.rev}");
+      version = builtins.readFile ./VERSION + (lib.optionalString (!officialRelease) versionSuffix);
 
       versionModule = { system.nixosVersion = version; };
 
@@ -113,7 +115,7 @@ let
 
         src = nixosSrc;
 
-        inherit officialRelease;
+        inherit officialRelease versionSuffix;
 
         buildInputs = [ nixUnstable ];
 
@@ -124,7 +126,7 @@ let
           '';
 
         distPhase = ''
-          releaseName=nixos-$VERSION$VERSION_SUFFIX-${toString nixpkgs.rev}
+          releaseName=nixos-$VERSION$VERSION_SUFFIX
           ensureDir "$out/tarballs"
           mkdir ../$releaseName
           cp -prd . ../$releaseName/nixos
-- 
GitLab


From 096b7723c8c6d913cb42fb0acfa082ab1d34b8a3 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 10 Apr 2012 20:56:38 +0000
Subject: [PATCH 3590/5331] * Add a command "nixos-version" that prints the
 version of the   currently activated NixOS.  This is "0.1pre-svn" when built
 from a   SVN tree, but contains the actual revision when installed from the  
 NixOS channel or from the ISO.

svn path=/nixos/trunk/; revision=33730
---
 VERSION => .version                            |  0
 .../cd-dvd/system-tarball-fuloong2f.nix        | 10 ----------
 .../cd-dvd/system-tarball-sheevaplug.nix       | 10 ----------
 modules/installer/tools/tools.nix              |  7 +++++++
 modules/misc/version.nix                       | 18 ++++++++++++++++++
 modules/module-list.nix                        |  1 +
 modules/profiles/installation-device.nix       |  9 ++-------
 release.nix                                    | 12 ++++++++----
 8 files changed, 36 insertions(+), 31 deletions(-)
 rename VERSION => .version (100%)
 create mode 100644 modules/misc/version.nix

diff --git a/VERSION b/.version
similarity index 100%
rename from VERSION
rename to .version
diff --git a/modules/installer/cd-dvd/system-tarball-fuloong2f.nix b/modules/installer/cd-dvd/system-tarball-fuloong2f.nix
index 618f5ea9627..5a23a394f7f 100644
--- a/modules/installer/cd-dvd/system-tarball-fuloong2f.nix
+++ b/modules/installer/cd-dvd/system-tarball-fuloong2f.nix
@@ -28,16 +28,6 @@ let
 
   pkgs2storeContents = l : map (x: { object = x; symlink = "none"; }) l;
 
-  options = {
-
-    system.nixosVersion = mkOption {
-      default = "${builtins.readFile ../../../VERSION}";
-      description = ''
-        NixOS version number.
-      '';
-    };
-  };
-
   # A clue for the kernel loading
   kernelParams = pkgs.writeText "kernel-params.txt" ''
     Kernel Parameters:
diff --git a/modules/installer/cd-dvd/system-tarball-sheevaplug.nix b/modules/installer/cd-dvd/system-tarball-sheevaplug.nix
index e49bcf3a66a..9052badfe0e 100644
--- a/modules/installer/cd-dvd/system-tarball-sheevaplug.nix
+++ b/modules/installer/cd-dvd/system-tarball-sheevaplug.nix
@@ -29,16 +29,6 @@ let
 
   pkgs2storeContents = l : map (x: { object = x; symlink = "none"; }) l;
 
-  options = {
-
-    system.nixosVersion = mkOption {
-      default = "${builtins.readFile ../../../VERSION}";
-      description = ''
-        NixOS version number.
-      '';
-    };
-  };
-
   # A clue for the kernel loading
   kernelParams = pkgs.writeText "kernel-params.txt" ''
     Kernel Parameters:
diff --git a/modules/installer/tools/tools.nix b/modules/installer/tools/tools.nix
index 930be55a0de..ad9ea2d61dc 100644
--- a/modules/installer/tools/tools.nix
+++ b/modules/installer/tools/tools.nix
@@ -51,6 +51,12 @@ let
     src = ./nixos-option.sh;
   };
 
+  nixosVersion = makeProg {
+    name = "nixos-version";
+    src = ./nixos-version.sh;
+    inherit (config.system) nixosVersion;
+  };
+
   nixosGui = pkgs.xulrunnerWrapper {
     launcher = "nixos-gui";
     application = pkgs.stdenv.mkDerivation {
@@ -116,6 +122,7 @@ in
         nixosHardwareScan
         nixosGenSeccureKeys
         nixosOption
+        nixosVersion
       ] ++ pkgs.lib.optional cfg.enableGraphicalTools nixosGui;
 
     system.build = {
diff --git a/modules/misc/version.nix b/modules/misc/version.nix
new file mode 100644
index 00000000000..32e2e1b1dc0
--- /dev/null
+++ b/modules/misc/version.nix
@@ -0,0 +1,18 @@
+{ config, pkgs, ... }:
+
+with pkgs.lib;
+
+{
+
+  options = {
+  
+    system.nixosVersion = mkOption {
+      default =
+        builtins.readFile ../../.version
+        + (if builtins.pathExists ../../.version-suffix then builtins.readFile ../../.version-suffix else "pre-svn");
+      description = "NixOS version.";
+    };
+    
+  };
+
+}
diff --git a/modules/module-list.nix b/modules/module-list.nix
index 684d1ad516e..48171f62150 100644
--- a/modules/module-list.nix
+++ b/modules/module-list.nix
@@ -36,6 +36,7 @@
   ./misc/locate.nix
   ./misc/nixpkgs.nix
   ./misc/passthru.nix
+  ./misc/version.nix
   ./programs/bash/bash.nix
   ./programs/blcr.nix
   ./programs/info.nix
diff --git a/modules/profiles/installation-device.nix b/modules/profiles/installation-device.nix
index 40daa10c8ce..d56cec64a0c 100644
--- a/modules/profiles/installation-device.nix
+++ b/modules/profiles/installation-device.nix
@@ -67,13 +67,7 @@ in
   ];
 
   options = {
-    system.nixosVersion = mkOption {
-      default = "${builtins.readFile ../../VERSION}";
-      description = ''
-        NixOS version number.
-      '';
-    };
-
+  
     installer.cloneConfig = mkOption {
       default = true;
       description = ''
@@ -101,6 +95,7 @@ in
         in live CDs.
       '';
     };
+    
   };
 
   config = {
diff --git a/release.nix b/release.nix
index 286e314ac1e..9ec5f9c8761 100644
--- a/release.nix
+++ b/release.nix
@@ -17,7 +17,7 @@ let
 
     let
 
-      version = builtins.readFile ./VERSION + (lib.optionalString (!officialRelease) versionSuffix);
+      version = builtins.readFile ./.version + (lib.optionalString (!officialRelease) versionSuffix);
 
       versionModule =
         { system.nixosVersion = version;
@@ -55,7 +55,7 @@ let
 
     with import <nixpkgs> {inherit system;};
     let
-      version = builtins.readFile ./VERSION + (lib.optionalString (!officialRelease) versionSuffix);
+      version = builtins.readFile ./.version + (lib.optionalString (!officialRelease) versionSuffix);
 
       versionModule = { system.nixosVersion = version; };
 
@@ -86,18 +86,20 @@ let
       releaseTools.makeSourceTarball {
         name = "nixos-tarball";
 
-        version = builtins.readFile ./VERSION;
+        version = builtins.readFile ./.version;
 
         src = nixosSrc;
 
         inherit officialRelease;
 
         distPhase = ''
+          echo -n $VERSION_SUFFIX > .version-suffix
           releaseName=nixos-$VERSION$VERSION_SUFFIX
           ensureDir "$out/tarballs"
           mkdir ../$releaseName
           cp -prd . ../$releaseName
           cd ..
+          chmod -R u+w $releaseName
           tar cfvj $out/tarballs/$releaseName.tar.bz2 $releaseName
         ''; # */
       };
@@ -111,7 +113,7 @@ let
       releaseTools.makeSourceTarball {
         name = "nixos-channel";
 
-        version = builtins.readFile ./VERSION;
+        version = builtins.readFile ./.version;
 
         src = nixosSrc;
 
@@ -126,6 +128,7 @@ let
           '';
 
         distPhase = ''
+          echo -n $VERSION_SUFFIX > .version-suffix
           releaseName=nixos-$VERSION$VERSION_SUFFIX
           ensureDir "$out/tarballs"
           mkdir ../$releaseName
@@ -134,6 +137,7 @@ let
           echo "$expr" > ../$releaseName/default.nix
           NIX_STATE_DIR=$TMPDIR nix-env -f ../$releaseName/default.nix -qaP --meta --xml \* > /dev/null
           cd ..
+          chmod -R u+w $releaseName
           tar cfj $out/tarballs/$releaseName.tar.bz2 $releaseName
         ''; # */
       };
-- 
GitLab


From 907df082dc612f84d50acd98b7103edf6f2bbb70 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 10 Apr 2012 21:08:10 +0000
Subject: [PATCH 3591/5331] * Including the Nixpkgs revision made the ISO
 volume label slightly   too long.  So make it shorter.

svn path=/nixos/trunk/; revision=33731
---
 modules/installer/cd-dvd/installation-cd-base.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/installer/cd-dvd/installation-cd-base.nix b/modules/installer/cd-dvd/installation-cd-base.nix
index 47e8a101354..a3e83e3074f 100644
--- a/modules/installer/cd-dvd/installation-cd-base.nix
+++ b/modules/installer/cd-dvd/installation-cd-base.nix
@@ -41,7 +41,7 @@ in
   # ISO naming.
   isoImage.isoName = "${config.isoImage.isoBaseName}-${config.system.nixosVersion}-${pkgs.stdenv.system}.iso";
 
-  isoImage.volumeID = "NIXOS_INSTALL_CD_${config.system.nixosVersion}";
+  isoImage.volumeID = "NIXOS_CD_${config.system.nixosVersion}";
 
   boot.postBootCommands =
     ''
-- 
GitLab


From dccd99b5643acd26d61c907452ff772af181715b Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 10 Apr 2012 21:11:11 +0000
Subject: [PATCH 3592/5331] * Disable "nixos-gen-seccure-keys": it's not clear
 what it's for, it's   not documented, and it doesn't seem to be used
 anywhere.

svn path=/nixos/trunk/; revision=33732
---
 modules/config/system-path.nix    | 1 -
 modules/installer/tools/tools.nix | 4 +++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/modules/config/system-path.nix b/modules/config/system-path.nix
index ce27eb35dd9..9eab8dde473 100644
--- a/modules/config/system-path.nix
+++ b/modules/config/system-path.nix
@@ -49,7 +49,6 @@ let
       pkgs.perl
       pkgs.procps
       pkgs.rsync
-      pkgs.seccure
       pkgs.strace
       pkgs.sysklogd
       pkgs.sysvtools
diff --git a/modules/installer/tools/tools.nix b/modules/installer/tools/tools.nix
index ad9ea2d61dc..d2f54b27c73 100644
--- a/modules/installer/tools/tools.nix
+++ b/modules/installer/tools/tools.nix
@@ -35,10 +35,12 @@ let
     src = ./nixos-rebuild.sh;
   };
 
+  /*
   nixosGenSeccureKeys = makeProg {
     name = "nixos-gen-seccure-keys";
     src = ./nixos-gen-seccure-keys.sh;
   };
+  */
 
   nixosHardwareScan = makeProg {
     name = "nixos-hardware-scan";
@@ -120,7 +122,7 @@ in
         nixosInstall
         nixosRebuild
         nixosHardwareScan
-        nixosGenSeccureKeys
+        #nixosGenSeccureKeys
         nixosOption
         nixosVersion
       ] ++ pkgs.lib.optional cfg.enableGraphicalTools nixosGui;
-- 
GitLab


From c02240082aa2030fc78b6d8167129fe1ee8bcba3 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 10 Apr 2012 21:17:43 +0000
Subject: [PATCH 3593/5331] * Add missing file.

svn path=/nixos/trunk/; revision=33733
---
 modules/installer/tools/nixos-version.sh | 2 ++
 1 file changed, 2 insertions(+)
 create mode 100644 modules/installer/tools/nixos-version.sh

diff --git a/modules/installer/tools/nixos-version.sh b/modules/installer/tools/nixos-version.sh
new file mode 100644
index 00000000000..20f9a7da018
--- /dev/null
+++ b/modules/installer/tools/nixos-version.sh
@@ -0,0 +1,2 @@
+#! @shell@
+echo @nixosVersion@
-- 
GitLab


From 2ca7e8a43efa154444cd3922ac34d6a10fe6359e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Tue, 10 Apr 2012 21:18:48 +0000
Subject: [PATCH 3594/5331] Reverting 33692, because memtest in the iso was
 failing.

I set the grub entry for memtest to read "Memtest86", as suggested by Eelco.

I run:
svn merge -c -33692 ^/nixos/trunk
And edited the change a bit.


svn path=/nixos/trunk/; revision=33734
---
 .../installer/cd-dvd/installation-cd-base.nix |  5 ++--
 modules/installer/cd-dvd/memtest.nix          | 24 +++++++++++++++++++
 2 files changed, 26 insertions(+), 3 deletions(-)
 create mode 100644 modules/installer/cd-dvd/memtest.nix

diff --git a/modules/installer/cd-dvd/installation-cd-base.nix b/modules/installer/cd-dvd/installation-cd-base.nix
index a3e83e3074f..f595a6307f0 100644
--- a/modules/installer/cd-dvd/installation-cd-base.nix
+++ b/modules/installer/cd-dvd/installation-cd-base.nix
@@ -30,7 +30,8 @@ in
 
 {
   require =
-    [ ./iso-image.nix
+    [ ./memtest.nix
+      ./iso-image.nix
 
       # Profiles of this basic installation CD.
       ../../profiles/all-hardware.nix
@@ -66,8 +67,6 @@ in
      echo 1 > /proc/sys/vm/overcommit_memory
     '';
 
-  boot.loader.grub.memtest86 = true;
-
   # To speed up installation a little bit, include the complete stdenv
   # in the Nix store on the CD.
   isoImage.storeContents = [ pkgs.stdenv pkgs.klibc pkgs.klibcShrunk ];
diff --git a/modules/installer/cd-dvd/memtest.nix b/modules/installer/cd-dvd/memtest.nix
new file mode 100644
index 00000000000..52b3d8af7c1
--- /dev/null
+++ b/modules/installer/cd-dvd/memtest.nix
@@ -0,0 +1,24 @@
+# This module adds Memtest86 to the Grub boot menu on the CD.
+
+{config, pkgs, ...}:
+
+let
+
+  memtestPath = "/boot/memtest.bin";
+
+in
+
+{
+  boot.loader.grub.extraEntries =
+    ''
+      menuentry "Memtest86" {
+        linux16 ${memtestPath}
+      }
+    '';
+
+  isoImage.contents =
+    [ { source = pkgs.memtest86 + "/memtest.bin";
+        target = memtestPath;
+      }
+    ];
+}
-- 
GitLab


From 049d2dfca74eb461fbe56498ac89b5f4a7fc3c7e Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 10 Apr 2012 21:19:41 +0000
Subject: [PATCH 3595/5331] * Slight cleanup.

svn path=/nixos/trunk/; revision=33735
---
 release.nix | 19 ++++++-------------
 1 file changed, 6 insertions(+), 13 deletions(-)

diff --git a/release.nix b/release.nix
index 9ec5f9c8761..361f24264d8 100644
--- a/release.nix
+++ b/release.nix
@@ -4,6 +4,7 @@
 
 let
 
+  version = builtins.readFile ./.version;
   versionSuffix = "pre${toString nixosSrc.rev}-${toString nixpkgs.rev}";
 
 
@@ -17,10 +18,8 @@ let
 
     let
 
-      version = builtins.readFile ./.version + (lib.optionalString (!officialRelease) versionSuffix);
-
       versionModule =
-        { system.nixosVersion = version;
+        { system.nixosVersion = version + (lib.optionalString (!officialRelease) versionSuffix);
           isoImage.isoBaseName = "nixos-${type}";
         };
 
@@ -33,7 +32,7 @@ let
 
     in
       # Declare the ISO as a build product so that it shows up in Hydra.
-      runCommand "nixos-iso-${version}"
+      runCommand "nixos-iso-${config.system.nixosVersion}"
         { meta = {
             description = "NixOS installation CD (${description}) - ISO image for ${system}";
             maintainers = map (x: lib.getAttr x lib.maintainers) maintainers;
@@ -55,9 +54,7 @@ let
 
     with import <nixpkgs> {inherit system;};
     let
-      version = builtins.readFile ./.version + (lib.optionalString (!officialRelease) versionSuffix);
-
-      versionModule = { system.nixosVersion = version; };
+      versionModule = { system.nixosVersion = version + (lib.optionalString (!officialRelease) versionSuffix); };
 
       config = (import lib/eval-config.nix {
         inherit system;
@@ -86,11 +83,9 @@ let
       releaseTools.makeSourceTarball {
         name = "nixos-tarball";
 
-        version = builtins.readFile ./.version;
-
         src = nixosSrc;
 
-        inherit officialRelease;
+        inherit officialRelease version;
 
         distPhase = ''
           echo -n $VERSION_SUFFIX > .version-suffix
@@ -113,11 +108,9 @@ let
       releaseTools.makeSourceTarball {
         name = "nixos-channel";
 
-        version = builtins.readFile ./.version;
-
         src = nixosSrc;
 
-        inherit officialRelease versionSuffix;
+        inherit officialRelease version versionSuffix;
 
         buildInputs = [ nixUnstable ];
 
-- 
GitLab


From 322a0ff7cde238c1302ecec0f35edc3b486daa63 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 10 Apr 2012 21:42:47 +0000
Subject: [PATCH 3596/5331] * Set the version properly in the source tree in
 the ISO.

svn path=/nixos/trunk/; revision=33736
---
 modules/installer/cd-dvd/installation-cd-base.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/modules/installer/cd-dvd/installation-cd-base.nix b/modules/installer/cd-dvd/installation-cd-base.nix
index f595a6307f0..8601975254b 100644
--- a/modules/installer/cd-dvd/installation-cd-base.nix
+++ b/modules/installer/cd-dvd/installation-cd-base.nix
@@ -57,6 +57,8 @@ in
         mkdir -p /etc/nixos/nixpkgs
         tar xjf ${nixpkgsTarball}/nixpkgs.tar.bz2 -C /etc/nixos/nixpkgs
         chown -R root.root /etc/nixos
+        echo -n ${config.system.nixosVersion} > /etc/nixos/nixos/.version
+        echo -n "" > /etc/nixos/nixos/.version-suffix
      ''}
 
      # Make the installer more likely to succeed in low memory
-- 
GitLab


From fb0a54b803ecd7fcd599c4dc9abde9d925c0f8d9 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 10 Apr 2012 22:17:37 +0000
Subject: [PATCH 3597/5331] * In nixos-install, do a nix-pull from  
 http://nixos.org/releases/nixos/nixos-<version> to ensure we're   getting the
 right binaries.

svn path=/nixos/trunk/; revision=33738
---
 modules/installer/cd-dvd/installation-cd-base.nix |  2 ++
 modules/installer/tools/nixos-install.sh          |  4 ++--
 modules/installer/tools/tools.nix                 | 10 +++++-----
 modules/profiles/installation-device.nix          |  4 ----
 4 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/modules/installer/cd-dvd/installation-cd-base.nix b/modules/installer/cd-dvd/installation-cd-base.nix
index 8601975254b..9111ac37385 100644
--- a/modules/installer/cd-dvd/installation-cd-base.nix
+++ b/modules/installer/cd-dvd/installation-cd-base.nix
@@ -44,6 +44,8 @@ in
 
   isoImage.volumeID = "NIXOS_CD_${config.system.nixosVersion}";
 
+  installer.nixosURL = "http://nixos.org/releases/nixos/nixos-${config.system.nixosVersion}";
+
   boot.postBootCommands =
     ''
       export PATH=${pkgs.gnutar}/bin:${pkgs.bzip2}/bin:$PATH
diff --git a/modules/installer/tools/nixos-install.sh b/modules/installer/tools/nixos-install.sh
index 475b84ade03..ebe3413de2f 100644
--- a/modules/installer/tools/nixos-install.sh
+++ b/modules/installer/tools/nixos-install.sh
@@ -37,8 +37,8 @@ fi
     
 
 # Do a nix-pull to speed up building.
-if test -n "@nixpkgsURL@" -a ${NIXOS_PULL:-1} != 0; then
-    @nix@/bin/nix-pull @nixpkgsURL@/MANIFEST || true
+if test -n "@nixosURL@" -a ${NIXOS_PULL:-1} != 0; then
+    @nix@/bin/nix-pull @nixosURL@/MANIFEST || true
 fi
 
 
diff --git a/modules/installer/tools/tools.nix b/modules/installer/tools/tools.nix
index d2f54b27c73..9eecb9d803a 100644
--- a/modules/installer/tools/tools.nix
+++ b/modules/installer/tools/tools.nix
@@ -23,10 +23,10 @@ let
 
     inherit (pkgs) perl pathsFromGraph;
     nix = config.environment.nix;
-    nixpkgsURL = cfg.nixpkgsURL;
+    nixosURL = cfg.nixosURL;
 
     nixClosure = pkgs.runCommand "closure"
-      {exportReferencesGraph = ["refs" config.environment.nix];}
+      { exportReferencesGraph = ["refs" config.environment.nix]; }
       "cp refs $out";
   };
 
@@ -84,9 +84,9 @@ in
 {
   options = {
 
-    installer.nixpkgsURL = pkgs.lib.mkOption {
-      default = "";
-      example = http://nixos.org/releases/nix/nixpkgs-0.11pre7577;
+    installer.nixosURL = pkgs.lib.mkOption {
+      default = http://nixos.org/releases/nixos/channels/nixos-unstable;
+      example = http://nixos.org/releases/nixos/nixos-0.1pre1234;
       description = ''
         URL of the Nixpkgs distribution to use when building the
         installation CD.
diff --git a/modules/profiles/installation-device.nix b/modules/profiles/installation-device.nix
index d56cec64a0c..60bd20d3970 100644
--- a/modules/profiles/installation-device.nix
+++ b/modules/profiles/installation-device.nix
@@ -115,10 +115,6 @@ in
     # the full glibcLocales package.
     i18n.supportedLocales = ["en_US.UTF-8/UTF-8" "en_US/ISO-8859-1"];
 
-    # nixos-install will do a pull from this channel to speed up the
-    # installation.
-    installer.nixpkgsURL = http://nixos.org/releases/nixpkgs/channels/nixpkgs-unstable;
-
     boot.postBootCommands =
       ''
         # Provide a mount point for nixos-install.
-- 
GitLab


From 918edf861247b7712979374fc15c594eb78f889c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Tue, 10 Apr 2012 22:20:20 +0000
Subject: [PATCH 3598/5331] I think this makes the memtest module work on
 grub1. But I can't test it because grub-install fails for me for grub1.

I tested it works for grub2.


svn path=/nixos/trunk/; revision=33739
---
 modules/installer/grub/memtest.nix | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/modules/installer/grub/memtest.nix b/modules/installer/grub/memtest.nix
index cdb5d10e1f0..08eb8a1f41c 100644
--- a/modules/installer/grub/memtest.nix
+++ b/modules/installer/grub/memtest.nix
@@ -19,11 +19,16 @@ in
   };
 
   config.boot.loader.grub = mkIf isEnabled {
-    extraEntries = 
+    extraEntries = if config.boot.loader.grub.version == 2 then
       ''
         menuentry "${memtest86.name}" {
           linux16 $bootRoot/memtest.bin
         }
+      ''
+      else
+      ''
+        menuentry "${memtest86.name}"
+          linux16 $bootRoot/memtest.bin
       '';
     extraPrepareConfig =
       ''
-- 
GitLab


From e567309d85ebb55892e72c6229d8500d5f9845e7 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 11 Apr 2012 09:17:32 +0000
Subject: [PATCH 3599/5331] * Include all of Nixpkgs.

svn path=/nixos/trunk/; revision=33744
---
 release-combined.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/release-combined.nix b/release-combined.nix
index 068d637314b..c7eaeac5d17 100644
--- a/release-combined.nix
+++ b/release-combined.nix
@@ -1,4 +1,4 @@
 {
   nixos = import ./release.nix;
-  nixpkgs = import <nixpkgs/pkgs/top-level/release-small.nix>;
-}
\ No newline at end of file
+  nixpkgs = import <nixpkgs/pkgs/top-level/release.nix>;
+}
-- 
GitLab


From 375511eb33400409eca7819edee331ce20046ae4 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 11 Apr 2012 09:42:53 +0000
Subject: [PATCH 3600/5331] * Add a installer test that uses GRUB 1 (it
 currently fails).

svn path=/nixos/trunk/; revision=33745
---
 tests/installer.nix | 35 +++++++++++++++++++++++++++++------
 1 file changed, 29 insertions(+), 6 deletions(-)

diff --git a/tests/installer.nix b/tests/installer.nix
index 992348f5dec..aa4fe922cbd 100644
--- a/tests/installer.nix
+++ b/tests/installer.nix
@@ -22,6 +22,7 @@ let
               [ pkgs.glibcLocales
                 pkgs.sudo
                 pkgs.docbook5
+                pkgs.grub
               ];
           }
         ];
@@ -29,7 +30,7 @@ let
 
 
   # The configuration to install.
-  config = { fileSystems, testChannel }: pkgs.writeText "configuration.nix"
+  config = { fileSystems, testChannel, grubVersion }: pkgs.writeText "configuration.nix"
     ''
       { config, pkgs, modulesPath, ... }:
 
@@ -38,7 +39,10 @@ let
             "''${modulesPath}/testing/test-instrumentation.nix"
           ];
 
-        boot.loader.grub.version = 2;
+        boot.loader.grub.version = ${toString grubVersion};
+        ${optionalString (grubVersion == 1) ''
+          boot.loader.grub.splashImage = null;
+        ''}
         boot.loader.grub.device = "/dev/vda";
         boot.loader.grub.extraConfig = "serial; terminal_output.serial";
         boot.initrd.kernelModules = [ "ext3" "virtio_console" ];
@@ -89,7 +93,7 @@ let
   # a test script fragment `createPartitions', which must create
   # partitions and filesystems, and a configuration.nix fragment
   # `fileSystems'.
-  testScriptFun = { createPartitions, fileSystems, testChannel }:
+  testScriptFun = { createPartitions, fileSystems, testChannel, grubVersion }:
     ''
       createDisk("harddisk", 4 * 1024);
 
@@ -145,7 +149,7 @@ let
       print STDERR "Result of the hardware scan:\n$cfg\n";
 
       $machine->copyFileFromHost(
-          "${ config { inherit fileSystems testChannel; } }",
+          "${ config { inherit fileSystems testChannel grubVersion; } }",
           "/mnt/etc/nixos/configuration.nix");
 
       # Perform the installation.
@@ -185,11 +189,11 @@ let
     '';
 
 
-  makeTest = { createPartitions, fileSystems, testChannel ? false }:
+  makeTest = { createPartitions, fileSystems, testChannel ? false, grubVersion ? 2 }:
     { inherit iso;
       nodes = if testChannel then { inherit webserver; } else { };
       testScript = testScriptFun {
-        inherit createPartitions fileSystems testChannel;
+        inherit createPartitions fileSystems testChannel grubVersion;
       };
     };
 
@@ -299,6 +303,25 @@ in {
       fileSystems = rootFS + bootFS;
     };
 
+  # Test a basic install using GRUB 1.
+  grub1 = makeTest
+    { createPartitions =
+        ''
+          $machine->mustSucceed(
+              "parted /dev/vda mklabel msdos",
+              "parted /dev/vda -- mkpart primary linux-swap 1M 1024M",
+              "parted /dev/vda -- mkpart primary ext2 1024M -1s",
+              "udevadm settle",
+              "mkswap /dev/vda1 -L swap",
+              "swapon -L swap",
+              "mkfs.ext3 -L nixos /dev/vda2",
+              "mount LABEL=nixos /mnt",
+          );
+        '';
+      fileSystems = rootFS;
+      grubVersion = 1;
+    };
+
   # Rebuild the CD configuration with a little modification.
   rebuildCD =
     { inherit iso;
-- 
GitLab


From 1d0c23bffb6979f76bec910b767052429bdc804b Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 11 Apr 2012 10:05:29 +0000
Subject: [PATCH 3601/5331] * Use a raw disk for the installer test.  This
 speeds it up by almost   two minutes on my laptop.  Note that due to sparse
 allocation, raw   disks don't actually take up more space than qcow2 disks
 (and   they're temporary anyway).

svn path=/nixos/trunk/; revision=33746
---
 lib/test-driver/test-driver.pl | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/test-driver/test-driver.pl b/lib/test-driver/test-driver.pl
index e4df8721936..0fdcf97af67 100644
--- a/lib/test-driver/test-driver.pl
+++ b/lib/test-driver/test-driver.pl
@@ -143,11 +143,11 @@ sub runTests {
 }
 
 
-# Create an empty qcow2 virtual disk with the given name and size (in
+# Create an empty raw virtual disk with the given name and size (in
 # MiB).
 sub createDisk {
     my ($name, $size) = @_;
-    system("qemu-img create -f qcow2 $name ${size}M") == 0
+    system("qemu-img create -f raw $name ${size}M") == 0
         or die "cannot create image of size $size";
 }
 
-- 
GitLab


From a34e20e29224377ad6a12ee0336d9c1509cf16ca Mon Sep 17 00:00:00 2001
From: Sander van der Burg <s.vanderburg@tudelft.nl>
Date: Wed, 11 Apr 2012 13:46:49 +0000
Subject: [PATCH 3602/5331] deployment attribute does not exists anymore, will
 fix this later

svn path=/nixos/trunk/; revision=33747
---
 modules/services/misc/disnix.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/services/misc/disnix.nix b/modules/services/misc/disnix.nix
index c03a6036132..645e92c39df 100644
--- a/modules/services/misc/disnix.nix
+++ b/modules/services/misc/disnix.nix
@@ -88,7 +88,7 @@ in
     services.disnix.infrastructure =
       optionalAttrs (cfg.publishInfrastructure.enable)
       ( { hostname = config.networking.hostName;
-          targetHost = config.deployment.targetHost;
+          #targetHost = config.deployment.targetHost;
           system = if config.nixpkgs.system == "" then builtins.currentSystem else config.nixpkgs.system;
           
           supportedTypes = (import "${pkgs.stdenv.mkDerivation {
@@ -104,7 +104,7 @@ in
             '';
           }}");
         }
-        // optionalAttrs (cfg.useWebServiceInterface) { targetEPR = "http://${config.deployment.targetHost}:8080/DisnixWebService/services/DisnixWebService"; }
+        #// optionalAttrs (cfg.useWebServiceInterface) { targetEPR = "http://${config.deployment.targetHost}:8080/DisnixWebService/services/DisnixWebService"; }
         // optionalAttrs (config.services.httpd.enable) { documentRoot = config.services.httpd.documentRoot; }
         // optionalAttrs (config.services.mysql.enable) { mysqlPort = config.services.mysql.port; }
         // optionalAttrs (config.services.tomcat.enable) { tomcatPort = 8080; }
-- 
GitLab


From f2fd48e131025395a9a20e35496a76a2dc1d27b6 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 11 Apr 2012 21:21:00 +0000
Subject: [PATCH 3603/5331] * Fix the "autocreate" option.

svn path=/nixos/trunk/; revision=33750
---
 modules/tasks/filesystems.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/modules/tasks/filesystems.nix b/modules/tasks/filesystems.nix
index 739d63bf479..557c5873d94 100644
--- a/modules/tasks/filesystems.nix
+++ b/modules/tasks/filesystems.nix
@@ -185,6 +185,12 @@ in
             # Ensure that this job is restarted when fstab changed:
             # ${fstab}
             echo "mounting filesystems..."
+
+            # Create missing mount points.  Note that this won't work
+            # if the mount point is under another mount point.
+            ${flip concatMapStrings config.fileSystems (fs: optionalString fs.autocreate ''
+              mkdir -p -m 0755 '${fs.mountPoint}'
+            '')}
           '';
 
         daemonType = "daemon";
-- 
GitLab


From 185e9b69ed9183c95a11239b4f38c03068860eb3 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 12 Apr 2012 16:48:01 +0000
Subject: [PATCH 3604/5331] * Assume that the ephemeral devices are called
 /dev/xvda-e.  So   in Charon deployments, non-ephemeral devices should be >=
 /dev/xvdf.

svn path=/nixos/trunk/; revision=33764
---
 modules/virtualisation/amazon-image.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/virtualisation/amazon-image.nix b/modules/virtualisation/amazon-image.nix
index d2aaeec5bd6..65bf43c1478 100644
--- a/modules/virtualisation/amazon-image.nix
+++ b/modules/virtualisation/amazon-image.nix
@@ -91,7 +91,7 @@ with pkgs.lib;
     ''
       diskNr=0
       diskForAufs=
-      for device in /dev/xvd*; do
+      for device in /dev/xvd[abcde]*; do
           if [ "$device" = /dev/xvda -o "$device" = /dev/xvda1 ]; then continue; fi
           fsType=$(blkid -o value -s TYPE "$device" || true)
           if [ "$fsType" = swap ]; then
-- 
GitLab


From d82a7d328d0a0f633dc43c54de2eb35d3c8a8fc7 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 12 Apr 2012 17:15:55 +0000
Subject: [PATCH 3605/5331] * Script for creating NixOS EBS-based AMIs.

svn path=/nixos/trunk/; revision=33765
---
 maintainers/scripts/ec2/create-ebs-amis.py    | 54 +++++++++++++++++++
 .../{create-amis.sh => ec2/create-s3-amis.sh} |  0
 maintainers/scripts/ec2/ebs-creator.nix       | 13 +++++
 3 files changed, 67 insertions(+)
 create mode 100755 maintainers/scripts/ec2/create-ebs-amis.py
 rename maintainers/scripts/{create-amis.sh => ec2/create-s3-amis.sh} (100%)
 create mode 100644 maintainers/scripts/ec2/ebs-creator.nix

diff --git a/maintainers/scripts/ec2/create-ebs-amis.py b/maintainers/scripts/ec2/create-ebs-amis.py
new file mode 100755
index 00000000000..3bcd47c7f5e
--- /dev/null
+++ b/maintainers/scripts/ec2/create-ebs-amis.py
@@ -0,0 +1,54 @@
+#! /usr/bin/env python
+
+import sys
+from charon import deployment
+from boto.ec2.blockdevicemapping import BlockDeviceMapping, BlockDeviceType
+import charon.util
+
+depl = deployment.Deployment("./ebs-creator.json", create=True, nix_exprs=["./ebs-creator.nix"])
+depl.deploy()
+
+m = depl.machines['machine']
+
+# Do the installation.
+m.run_command("if mountpoint -q /mnt; then umount /mnt; fi")
+m.run_command("mkfs.ext4 -L nixos /dev/xvdg")
+m.run_command("mkdir -p /mnt")
+m.run_command("mount /dev/xvdg /mnt")
+m.run_command("touch /mnt/.ebs")
+m.run_command("mkdir -p /mnt/etc/nixos")
+m.run_command("cp /etc/nixos/configuration.nix /mnt/etc/nixos/") # FIXME
+m.run_command("nixos-checkout") # FIXME
+m.run_command("nixos-install")
+m.run_command("umount /mnt")
+
+# Create a snapshot.
+m.connect()
+volume = m._conn.get_all_volumes([], filters={'attachment.instance-id': m._instance_id, 'attachment.device': "/dev/sdg"})[0]
+snapshot = volume.create_snapshot(description="NixOS EBS root disk")
+#snapshot = m._conn.get_all_snapshots(["snap-f1c9679a"])[0]
+print >> sys.stderr, "created snapshot {0}".format(snapshot.id)
+
+# Wait for the snapshot to finish.
+def check():
+    status = snapshot.update()
+    print >> sys.stderr, "snapshot status is {0}".format(status)
+    return status == '100%'
+charon.util.check_wait(check, max_tries=120)
+
+# Register the image.
+aki = m._conn.get_all_images(filters={'manifest-location': '*pv-grub-hd0_1.03-x86_64*'})[0]
+print >> sys.stderr, "using kernel image %s - %s" %(aki.id, aki.location)
+
+block_map = BlockDeviceMapping()
+block_map['/dev/sda'] = BlockDeviceType(snapshot_id=snapshot.id, delete_on_termination=True)
+block_map['/dev/sdb'] = BlockDeviceType(ephemeral_name="ephemeral0")
+block_map['/dev/sdc'] = BlockDeviceType(ephemeral_name="ephemeral1")
+block_map['/dev/sdd'] = BlockDeviceType(ephemeral_name="ephemeral2")
+block_map['/dev/sde1'] = BlockDeviceType(ephemeral_name="ephemeral3")
+
+ami_id = m._conn.register_image(
+    name="nixos-x86-64-ebs-test-9", description="NixOS (x86_64) EBS test", architecture="x86_64",
+    root_device_name="/dev/sda", kernel_id=aki.id, block_device_map=block_map)
+
+print >> sys.stderr, "registered AMI {0}".format(ami_id)
diff --git a/maintainers/scripts/create-amis.sh b/maintainers/scripts/ec2/create-s3-amis.sh
similarity index 100%
rename from maintainers/scripts/create-amis.sh
rename to maintainers/scripts/ec2/create-s3-amis.sh
diff --git a/maintainers/scripts/ec2/ebs-creator.nix b/maintainers/scripts/ec2/ebs-creator.nix
new file mode 100644
index 00000000000..bfda4aa4156
--- /dev/null
+++ b/maintainers/scripts/ec2/ebs-creator.nix
@@ -0,0 +1,13 @@
+{
+  network.description = "NixOS EBS creator";
+  
+  machine =
+    { config, pkgs, ... }:
+    { deployment.targetEnv = "ec2";
+      deployment.ec2.region = "eu-west-1";
+      deployment.ec2.instanceType = "m1.small";
+      deployment.ec2.keyPair = "eelco";
+      deployment.ec2.securityGroups = [ "eelco-test" ];
+      deployment.ec2.blockDeviceMapping."/dev/xvdg".size = 20;
+    };
+}
-- 
GitLab


From 2821289aeb809f50ac536577a88b3c8bda43a927 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 12 Apr 2012 18:01:19 +0000
Subject: [PATCH 3606/5331] * Ugly hack: force udev to exit to prevent random
 "Device or resource   busy while trying to open /dev/xvda" errors from fsck.

svn path=/nixos/trunk/; revision=33766
---
 modules/system/boot/stage-1-init.sh     | 2 +-
 modules/virtualisation/amazon-image.nix | 8 ++++++++
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/modules/system/boot/stage-1-init.sh b/modules/system/boot/stage-1-init.sh
index 7c98b35eba2..278c68fce99 100644
--- a/modules/system/boot/stage-1-init.sh
+++ b/modules/system/boot/stage-1-init.sh
@@ -322,7 +322,7 @@ done
 
 
 # Stop udevd.
-udevadm control --exit
+udevadm control --exit || true
 
 # Kill any remaining processes, just to be sure we're not taking any
 # with us into stage 2.
diff --git a/modules/virtualisation/amazon-image.nix b/modules/virtualisation/amazon-image.nix
index 65bf43c1478..55b1f5c0bd2 100644
--- a/modules/virtualisation/amazon-image.nix
+++ b/modules/virtualisation/amazon-image.nix
@@ -78,6 +78,14 @@ with pkgs.lib;
   boot.loader.grub.timeout = 0;
   boot.loader.grub.extraPerEntryConfig = "root (hd0)";
 
+  boot.initrd.postDeviceCommands =
+    ''
+      # Force udev to exit to prevent random "Device or resource busy
+      # while trying to open /dev/xvda" errors from fsck.
+      udevadm control --exit || true
+      kill -9 -- -1
+    '';
+    
   # Mount all formatted ephemeral disks and activate all swap devices.
   # We cannot do this with the ‘fileSystems’ and ‘swapDevices’ options
   # because the set of devices is dependent on the instance type
-- 
GitLab


From bcc24c1b864b124df920fefec1ba7b87f17f8870 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 13 Apr 2012 11:26:22 +0000
Subject: [PATCH 3607/5331] * Finish the EBS creation script.  It now takes a
 --region option to   specify the EC2 region in which the AMI is to be
 created.  It also   starts an instance booted from the newly created AMI to
 test it.

svn path=/nixos/trunk/; revision=33771
---
 maintainers/scripts/ec2/create-ebs-amis.py | 75 +++++++++++++++++++---
 maintainers/scripts/ec2/ebs-creator.nix    |  1 -
 2 files changed, 67 insertions(+), 9 deletions(-)

diff --git a/maintainers/scripts/ec2/create-ebs-amis.py b/maintainers/scripts/ec2/create-ebs-amis.py
index 3bcd47c7f5e..ee70e69f17a 100755
--- a/maintainers/scripts/ec2/create-ebs-amis.py
+++ b/maintainers/scripts/ec2/create-ebs-amis.py
@@ -4,8 +4,21 @@ import sys
 from charon import deployment
 from boto.ec2.blockdevicemapping import BlockDeviceMapping, BlockDeviceType
 import charon.util
+import time
+import argparse
 
-depl = deployment.Deployment("./ebs-creator.json", create=True, nix_exprs=["./ebs-creator.nix"])
+parser = argparse.ArgumentParser(description='Create an EBS-backed NixOS AMI')
+parser.add_argument('--region', dest='region', required=True, help='EC2 region')
+parser.add_argument('--keep', dest='keep', action='store_true', help='keep Charon machine after use')
+args = parser.parse_args()
+
+# Start a NixOS machine in the given region.
+f = open("ebs-creator-zone.nix", "w")
+f.write('{{ machine.deployment.ec2.region = "{0}"; }}'.format(args.region))
+f.close()
+
+depl = deployment.Deployment("./ebs-creator.json", create=True, nix_exprs=["./ebs-creator.nix", "./ebs-creator-zone.nix"])
+if not args.keep: depl.destroy_vms()
 depl.deploy()
 
 m = depl.machines['machine']
@@ -17,16 +30,22 @@ m.run_command("mkdir -p /mnt")
 m.run_command("mount /dev/xvdg /mnt")
 m.run_command("touch /mnt/.ebs")
 m.run_command("mkdir -p /mnt/etc/nixos")
-m.run_command("cp /etc/nixos/configuration.nix /mnt/etc/nixos/") # FIXME
 m.run_command("nixos-checkout") # FIXME
+m.run_command("cp -f /etc/nixos/nixos/modules/virtualisation/amazon-config.nix /mnt/etc/nixos/configuration.nix")
+m.run_command("echo -n pre$(svnversion -c /etc/nixos/nixos | sed 's/.*://')-$(svnversion -c /etc/nixos/nixpkgs | sed 's/.*://') > /etc/nixos/nixos/.version-suffix")
+version = m.run_command("nixos-option system.nixosVersion", capture_stdout=True).replace('"', '').rstrip()
+print >> sys.stderr, "NixOS version is {0}".format(version)
 m.run_command("nixos-install")
+m.run_command("rm -rf /mnt/etc/nixos/nixos/.svn /mnt/etc/nixos/nixpkgs/.svn")
 m.run_command("umount /mnt")
 
+ami_name = "nixos-{0}-x86_64-ebs".format(version)
+description = "NixOS {0} (x86_64; EBS root)".format(version)
+
 # Create a snapshot.
 m.connect()
 volume = m._conn.get_all_volumes([], filters={'attachment.instance-id': m._instance_id, 'attachment.device': "/dev/sdg"})[0]
-snapshot = volume.create_snapshot(description="NixOS EBS root disk")
-#snapshot = m._conn.get_all_snapshots(["snap-f1c9679a"])[0]
+snapshot = volume.create_snapshot(description=description)
 print >> sys.stderr, "created snapshot {0}".format(snapshot.id)
 
 # Wait for the snapshot to finish.
@@ -36,19 +55,59 @@ def check():
     return status == '100%'
 charon.util.check_wait(check, max_tries=120)
 
+m._conn.create_tags([snapshot.id], {'Name': ami_name})
+
+if not args.keep: depl.destroy_vms()
+
 # Register the image.
 aki = m._conn.get_all_images(filters={'manifest-location': '*pv-grub-hd0_1.03-x86_64*'})[0]
-print >> sys.stderr, "using kernel image %s - %s" %(aki.id, aki.location)
+print >> sys.stderr, "using kernel image {0} - {1}".format(aki.id, aki.location)
 
 block_map = BlockDeviceMapping()
 block_map['/dev/sda'] = BlockDeviceType(snapshot_id=snapshot.id, delete_on_termination=True)
 block_map['/dev/sdb'] = BlockDeviceType(ephemeral_name="ephemeral0")
 block_map['/dev/sdc'] = BlockDeviceType(ephemeral_name="ephemeral1")
 block_map['/dev/sdd'] = BlockDeviceType(ephemeral_name="ephemeral2")
-block_map['/dev/sde1'] = BlockDeviceType(ephemeral_name="ephemeral3")
+block_map['/dev/sde'] = BlockDeviceType(ephemeral_name="ephemeral3")
 
 ami_id = m._conn.register_image(
-    name="nixos-x86-64-ebs-test-9", description="NixOS (x86_64) EBS test", architecture="x86_64",
-    root_device_name="/dev/sda", kernel_id=aki.id, block_device_map=block_map)
+    name=ami_name,
+    description=description,
+    architecture="x86_64",
+    root_device_name="/dev/sda",
+    kernel_id=aki.id,
+    block_device_map=block_map)
 
 print >> sys.stderr, "registered AMI {0}".format(ami_id)
+
+time.sleep(5)
+print >> sys.stderr, "making image public..."
+image = m._conn.get_all_images(image_ids=[ami_id])[0]
+image.set_launch_permissions(user_ids=[], group_names=["all"])
+
+m._conn.create_tags([ami_id], {'Name': ami_name})
+
+# Do a test deployment to make sure that the AMI works.
+f = open("ebs-test.nix", "w")
+f.write(
+    '''
+    {{ network.description = "NixOS EBS test";
+       machine.deployment.targetEnv = "ec2";
+       machine.deployment.ec2.region = "{0}";
+       machine.deployment.ec2.instanceType = "m1.small";
+       machine.deployment.ec2.keyPair = "eelco";
+       machine.deployment.ec2.securityGroups = [ "eelco-test" ];
+       machine.deployment.ec2.ami = "{1}";
+    }}
+    '''.format(args.region, ami_id))
+f.close()
+
+test_depl = deployment.Deployment("./ebs-test.json", create=True, nix_exprs=["./ebs-test.nix"])
+test_depl.deploy(create_only=True)
+test_depl.machines['machine'].run_command("nixos-version")
+if not args.keep: test_depl.destroy_vms()
+
+# Log the AMI ID.
+f = open("{0}.ebs.ami-id".format(args.region), "w")
+f.write("{0}".format(ami_id))
+f.close()
diff --git a/maintainers/scripts/ec2/ebs-creator.nix b/maintainers/scripts/ec2/ebs-creator.nix
index bfda4aa4156..f6a60b9d983 100644
--- a/maintainers/scripts/ec2/ebs-creator.nix
+++ b/maintainers/scripts/ec2/ebs-creator.nix
@@ -4,7 +4,6 @@
   machine =
     { config, pkgs, ... }:
     { deployment.targetEnv = "ec2";
-      deployment.ec2.region = "eu-west-1";
       deployment.ec2.instanceType = "m1.small";
       deployment.ec2.keyPair = "eelco";
       deployment.ec2.securityGroups = [ "eelco-test" ];
-- 
GitLab


From 3bbaa3b60cb71456bba31b89d74acffb4152aec2 Mon Sep 17 00:00:00 2001
From: Mathijs Kwik <mathijs@bluescreen303.nl>
Date: Fri, 13 Apr 2012 14:52:25 +0000
Subject: [PATCH 3608/5331] slim display manager: enabled auto_login setting

useful for demo/kiosk mode

svn path=/nixos/trunk/; revision=33774
---
 modules/services/x11/display-managers/slim.nix | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/modules/services/x11/display-managers/slim.nix b/modules/services/x11/display-managers/slim.nix
index 6e34bc2eb51..97c5f1d1b2b 100644
--- a/modules/services/x11/display-managers/slim.nix
+++ b/modules/services/x11/display-managers/slim.nix
@@ -16,8 +16,9 @@ let
       login_cmd exec ${pkgs.stdenv.shell} ${dmcfg.session.script} "%session"
       halt_cmd ${config.system.build.upstart}/sbin/shutdown -h now
       reboot_cmd ${config.system.build.upstart}/sbin/shutdown -r now
-      ${if cfg.defaultUser != "" then "default_user " + cfg.defaultUser else ""}
-      ${if cfg.hideCursor then "hidecursor true" else ""}
+      ${optionalString (cfg.defaultUser != "") ("default_user " + cfg.defaultUser)}
+      ${optionalString cfg.hideCursor "hidecursor true"}
+      ${optionalString cfg.autoLogin "auto_login yes"}
     '';
 
   # Unpack the SLiM theme, or use the default.
@@ -83,6 +84,14 @@ in
         '';
       };
 
+      autoLogin = mkOption {
+        default = false;
+        example = true;
+        description = ''
+          Automatically log in as the default user.
+        '';
+      };
+
     };
 
   };
-- 
GitLab


From 91b91cc847a97c7fce814d0c2583215620eecb2b Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sat, 14 Apr 2012 14:15:17 +0000
Subject: [PATCH 3609/5331] * Set the channel name to "nixos".

svn path=/nixos/trunk/; revision=33783
---
 release.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/release.nix b/release.nix
index 361f24264d8..5d20e182e0e 100644
--- a/release.nix
+++ b/release.nix
@@ -128,6 +128,7 @@ let
           cp -prd . ../$releaseName/nixos
           cp -prd ${nixpkgs} ../$releaseName/nixpkgs
           echo "$expr" > ../$releaseName/default.nix
+          echo nixos > ../$releaseName/channel-name
           NIX_STATE_DIR=$TMPDIR nix-env -f ../$releaseName/default.nix -qaP --meta --xml \* > /dev/null
           cd ..
           chmod -R u+w $releaseName
-- 
GitLab


From e3879fe365e539004942870b0757169cf757600f Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sat, 14 Apr 2012 17:09:59 +0000
Subject: [PATCH 3610/5331] * Store the NixOS version in the top-level
 derivation. * Change the name of the top-level derivation from "system" to  
 "nixos-<version>". * Show the NixOS version in the GRUB boot menu instead of
 the kernel   version.

svn path=/nixos/trunk/; revision=33785
---
 modules/installer/grub/grub-menu-builder.sh |  5 +++--
 modules/system/activation/top-level.nix     | 10 ++++++----
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/modules/installer/grub/grub-menu-builder.sh b/modules/installer/grub/grub-menu-builder.sh
index bdf42dd4d79..c6e30782822 100644
--- a/modules/installer/grub/grub-menu-builder.sh
+++ b/modules/installer/grub/grub-menu-builder.sh
@@ -274,9 +274,10 @@ for generation in $(
     | sed 's/system-\([0-9]\+\)-link/\1/' \
     | sort -n -r); do
     link=/nix/var/nix/profiles/system-$generation-link
-    date=$(stat --printf="%y\n" $link | sed 's/\..*//')
+    date=$(stat --printf="%y\n" $link | sed 's/\..*//' | sed 's/ .*//')
     kernelVersion=$(cd $(dirname $(readlink -f $link/kernel))/lib/modules && echo *)
-    addEntry "NixOS - Configuration $generation ($date - $kernelVersion)" $link "$generation ($date)"
+    nixosVersion=$(if [ -e $link/nixos-version ]; then cat $link/nixos-version; fi)
+    addEntry "NixOS - Configuration $generation ($date - ${nixosVersion:-$kernelVersion})" $link "$generation ($date)"
 done
 
 
diff --git a/modules/system/activation/top-level.nix b/modules/system/activation/top-level.nix
index f1bc4eea597..6ebc1fd68e1 100644
--- a/modules/system/activation/top-level.nix
+++ b/modules/system/activation/top-level.nix
@@ -120,9 +120,10 @@ let
       ln -s ${config.system.build.upstart} $out/upstart
       ln -s ${config.hardware.firmware} $out/firmware
 
-      echo "$kernelParams" > $out/kernel-params
-      echo "$configurationName" > $out/configuration-name
-      echo "${toString config.system.build.upstart.interfaceVersion}" > $out/upstart-interface-version
+      echo -n "$kernelParams" > $out/kernel-params
+      echo -n "$configurationName" > $out/configuration-name
+      echo -n "${toString config.system.build.upstart.interfaceVersion}" > $out/upstart-interface-version
+      echo -n "$nixosVersion" > $out/nixos-version
 
       mkdir $out/fine-tune
       childCount=0
@@ -145,7 +146,7 @@ let
   # script `switch-to-configuration' that activates the configuration
   # and makes it bootable.
   system = pkgs.stdenv.mkDerivation {
-    name = "system";
+    name = "nixos-${config.system.nixosVersion}";
     buildCommand = systemBuilder;
     inherit children;
     kernelParams =
@@ -153,6 +154,7 @@ let
     menuBuilder = config.system.build.menuBuilder;
     initScriptBuilder = config.system.build.initScriptBuilder;
     activationScript = config.system.activationScripts.script;
+    nixosVersion = config.system.nixosVersion;
 
     jobs = map (j: j.name) (attrValues config.jobs);
 
-- 
GitLab


From a193fe4f1d0ddcb6b87ebc575ad9240f1be5c29f Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 18 Apr 2012 10:34:39 +0000
Subject: [PATCH 3611/5331] * Add root's NixOS channel to $NIX_PATH.  Will
 remove   /etc/nixos/{nixos,nixpkgs,services} eventually.

svn path=/nixos/trunk/; revision=33822
---
 modules/programs/bash/profile.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/programs/bash/profile.sh b/modules/programs/bash/profile.sh
index c0f8702117e..de02214eb11 100644
--- a/modules/programs/bash/profile.sh
+++ b/modules/programs/bash/profile.sh
@@ -15,7 +15,7 @@ export __ETC_PROFILE_DONE=1
 export LOCALE_ARCHIVE=/var/run/current-system/sw/lib/locale/locale-archive
 export LD_LIBRARY_PATH=/var/run/opengl-driver/lib:/var/run/opengl-driver-32/lib # !!! only set if needed
 export NIXPKGS_CONFIG=/nix/etc/config.nix
-export NIX_PATH=nixpkgs=/etc/nixos/nixpkgs:nixos=/etc/nixos/nixos:nixos-config=/etc/nixos/configuration.nix:services=/etc/nixos/services
+export NIX_PATH=/nix/var/nix/profiles/per-user/root/channels/nixos:nixpkgs=/etc/nixos/nixpkgs:nixos=/etc/nixos/nixos:nixos-config=/etc/nixos/configuration.nix:services=/etc/nixos/services
 export PAGER="less -R"
 export EDITOR=nano
 export LOCATE_PATH=/var/cache/locatedb
-- 
GitLab


From 7ba58811465a590014244f3142c5cd91fdb9af19 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 18 Apr 2012 10:58:33 +0000
Subject: [PATCH 3612/5331] * Don't install the "nixpkgs_sys" symlink in
 ~/.nix-defexpr anymore.   Note that for attribute-based nix-env
 installations, the NixOS   channel contains Nixpkgs as its "pkgs" attribute,
 so

    $ nix-env -iA nixos.pkgs.foo

  will work instead of the old

    $ nix-env -iA nixpkgs_sys.foo

* Fix the path to root's channels installed in ~/.nix-defexpr.

svn path=/nixos/trunk/; revision=33823
---
 modules/programs/bash/profile.sh | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/modules/programs/bash/profile.sh b/modules/programs/bash/profile.sh
index de02214eb11..0b6f47d76dd 100644
--- a/modules/programs/bash/profile.sh
+++ b/modules/programs/bash/profile.sh
@@ -93,13 +93,12 @@ if test "$(stat --printf '%u' $NIX_USER_GCROOTS_DIR)" != "$(id -u)"; then
 fi
 
 # Set up a default Nix expression from which to install stuff.
-if test ! -e $HOME/.nix-defexpr -o -L $HOME/.nix-defexpr; then
+if [ ! -e $HOME/.nix-defexpr -o -L $HOME/.nix-defexpr ]; then
     echo "creating $HOME/.nix-defexpr" >&2
     rm -f $HOME/.nix-defexpr
     mkdir $HOME/.nix-defexpr
-    ln -s /etc/nixos/nixpkgs $HOME/.nix-defexpr/nixpkgs_sys
-    if test "$USER" != root; then
-        ln -s /nix/var/nix/gcroots/per-user/root/channels $HOME/.nix-defexpr/channels_root
+    if [ "$USER" != root ]; then
+        ln -s /nix/var/nix/profiles/per-user/root/channels $HOME/.nix-defexpr/channels_root
     fi
 fi
 
-- 
GitLab


From 6abf3c8a971de1db003fcbf85baaafe7878609e9 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 18 Apr 2012 10:59:57 +0000
Subject: [PATCH 3613/5331] * Change $NIXPKGS_CONFIG to a better location
 (/etc/nix instead of   /nix/etc).  Not sure the default profile should be
 setting this at   all though.

svn path=/nixos/trunk/; revision=33824
---
 modules/programs/bash/profile.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/programs/bash/profile.sh b/modules/programs/bash/profile.sh
index 0b6f47d76dd..664cb8cf444 100644
--- a/modules/programs/bash/profile.sh
+++ b/modules/programs/bash/profile.sh
@@ -14,7 +14,7 @@ export __ETC_PROFILE_DONE=1
 # Initialise a bunch of environment variables.
 export LOCALE_ARCHIVE=/var/run/current-system/sw/lib/locale/locale-archive
 export LD_LIBRARY_PATH=/var/run/opengl-driver/lib:/var/run/opengl-driver-32/lib # !!! only set if needed
-export NIXPKGS_CONFIG=/nix/etc/config.nix
+export NIXPKGS_CONFIG=/etc/nix/nixpkgs-config.nix
 export NIX_PATH=/nix/var/nix/profiles/per-user/root/channels/nixos:nixpkgs=/etc/nixos/nixpkgs:nixos=/etc/nixos/nixos:nixos-config=/etc/nixos/configuration.nix:services=/etc/nixos/services
 export PAGER="less -R"
 export EDITOR=nano
-- 
GitLab


From 395d73db70a9120e3260e2c95b7ffccb8da7b3fc Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 18 Apr 2012 11:46:16 +0000
Subject: [PATCH 3614/5331] * nixos-rebuild: don't do a pull of the manifest by
 default anymore.   It's not necessary when using the NixOS channel. 
 "nixos-rebuild   pull" now pulls from the NixOS channel.

svn path=/nixos/trunk/; revision=33825
---
 modules/installer/tools/nixos-rebuild.sh | 16 +++++++---------
 modules/installer/tools/tools.nix        |  4 ++--
 2 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/modules/installer/tools/nixos-rebuild.sh b/modules/installer/tools/nixos-rebuild.sh
index 6fc9014027d..a6426d5c75b 100644
--- a/modules/installer/tools/nixos-rebuild.sh
+++ b/modules/installer/tools/nixos-rebuild.sh
@@ -18,19 +18,19 @@ The operation is one of the following:
   build-vm-with-bootloader:
             like build-vm, but include a boot loader in the VM
   dry-run:  just show what store paths would be built/downloaded
-  pull:     just pull the Nixpkgs channel manifest and exit
+  pull:     just pull the NixOS channel manifest and exit
 
 Options:
 
   --install-grub         (re-)install the Grub bootloader
-  --no-pull              don't do a nix-pull to get the latest Nixpkgs
+  --pull                 do do a nix-pull to get the latest NixOS
                          channel manifest
   --no-build-nix         don't build the latest Nix from Nixpkgs before
                          building NixOS
   --rollback             restore the previous NixOS configuration (only
                          with switch, boot, test, build)
 
-  --fast                 same as --no-pull --no-build-nix --show-trace
+  --fast                 same as --no-build-nix --show-trace
 
 Various nix-build options are also accepted, in particular:
 
@@ -48,7 +48,7 @@ EOF
 # Parse the command line.
 extraBuildFlags=
 action=
-pullManifest=1
+pullManifest=
 buildNix=1
 rollback=
 
@@ -64,8 +64,8 @@ while test "$#" -gt 0; do
       --install-grub)
         export NIXOS_INSTALL_GRUB=1
       ;;
-      --no-pull)
-        pullManifest=
+      --pull)
+        pullManifest=1
       ;;
       --no-build-nix)
         buildNix=
@@ -82,7 +82,6 @@ while test "$#" -gt 0; do
       ;;
       --fast)
         buildNix=
-        pullManifest=
         extraBuildFlags="$extraBuildFlags --show-trace"
       ;;
       *)
@@ -99,7 +98,6 @@ if test "$action" = dry-run; then
 fi
 
 if test -n "$rollback"; then
-    pullManifest=
     buildNix=
 fi
 
@@ -121,7 +119,7 @@ fi
 
 # Pull the manifests defined in the configuration (the "manifests"
 # attribute).  Wonderfully hacky.
-if test -n "$pullManifest"; then
+if [ -n "$pullManifest" -o "$action" = pull ]; then
     manifests=$(nix-instantiate --eval-only --xml --strict '<nixos>' -A manifests \
         | grep '<string'  | sed 's^.*"\(.*\)".*^\1^g')
 
diff --git a/modules/installer/tools/tools.nix b/modules/installer/tools/tools.nix
index 9eecb9d803a..d7b8766143a 100644
--- a/modules/installer/tools/tools.nix
+++ b/modules/installer/tools/tools.nix
@@ -94,10 +94,10 @@ in
     };
 
     installer.manifests = pkgs.lib.mkOption {
-      default = [http://nixos.org/releases/nixpkgs/channels/nixpkgs-unstable/MANIFEST];
+      default = [ http://nixos.org/releases/nixos/channels/nixos-unstable/MANIFEST ];
       example =
         [ http://nixos.org/releases/nixpkgs/channels/nixpkgs-unstable/MANIFEST
-          http://nixos.org/releases/nixpkgs/channels/nixpkgs-stable/MANIFEST
+          http://nixos.org/releases/nixos/channels/nixos-stable/MANIFEST
         ];
       description = ''
         URLs of manifests to be downloaded when you run
-- 
GitLab


From b4afefcc40048aa454520cc29c04f348e20bfc5a Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 18 Apr 2012 12:32:17 +0000
Subject: [PATCH 3615/5331] * Typo.

svn path=/nixos/trunk/; revision=33826
---
 modules/installer/tools/nixos-rebuild.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/installer/tools/nixos-rebuild.sh b/modules/installer/tools/nixos-rebuild.sh
index a6426d5c75b..42e1a33a444 100644
--- a/modules/installer/tools/nixos-rebuild.sh
+++ b/modules/installer/tools/nixos-rebuild.sh
@@ -23,8 +23,8 @@ The operation is one of the following:
 Options:
 
   --install-grub         (re-)install the Grub bootloader
-  --pull                 do do a nix-pull to get the latest NixOS
-                         channel manifest
+  --pull                 do a nix-pull to get the latest NixOS channel
+                         manifest
   --no-build-nix         don't build the latest Nix from Nixpkgs before
                          building NixOS
   --rollback             restore the previous NixOS configuration (only
-- 
GitLab


From be31aebdcf74afcd849382c7b20743bd2c17d565 Mon Sep 17 00:00:00 2001
From: Rob Vermaas <rob.vermaas@gmail.com>
Date: Wed, 18 Apr 2012 12:36:20 +0000
Subject: [PATCH 3616/5331] * Added option for EC2 keypair. * Added workaround
 for evaluation * Add support for cluster instances ami generation, only works
 in us-east-1   for now.

    e.g. ./create-ebs-ami.py --region us-east --hvm --key rob

  Cluster instances need to have a 8GB EBS backed image with 1 partition
  and with grub installed. Also HVM images can (currently) only be generated
  using the CreateImage API call, which requires a running or stopped
  instance.



svn path=/nixos/trunk/; revision=33827
---
 maintainers/scripts/ec2/create-ebs-amis.py | 138 +++++++++++++++------
 maintainers/scripts/ec2/ebs-creator.nix    |   3 +-
 2 files changed, 101 insertions(+), 40 deletions(-)

diff --git a/maintainers/scripts/ec2/create-ebs-amis.py b/maintainers/scripts/ec2/create-ebs-amis.py
index ee70e69f17a..8bc293823f4 100755
--- a/maintainers/scripts/ec2/create-ebs-amis.py
+++ b/maintainers/scripts/ec2/create-ebs-amis.py
@@ -9,25 +9,46 @@ import argparse
 
 parser = argparse.ArgumentParser(description='Create an EBS-backed NixOS AMI')
 parser.add_argument('--region', dest='region', required=True, help='EC2 region')
-parser.add_argument('--keep', dest='keep', action='store_true', help='keep Charon machine after use')
+parser.add_argument('--key', dest='key_name', default="eelco", help='EC2 keypair')
+parser.add_argument('--keep', dest='keep', action='store_true', help='Keep Charon machine after use')
+parser.add_argument('--hvm', dest='hvm', action='store_true', help='Create HVM image')
 args = parser.parse_args()
 
+instance_type = "cc1.4xlarge" if args.hvm else "m1.small"
+key_name = args.key_name
+ebs_size = 8 if args.hvm else 20
+
 # Start a NixOS machine in the given region.
-f = open("ebs-creator-zone.nix", "w")
-f.write('{{ machine.deployment.ec2.region = "{0}"; }}'.format(args.region))
+f = open("ebs-creator-config.nix", "w")
+f.write('''{{ 
+  machine = 
+    {{ pkgs, ... }}:
+    {{
+      deployment.ec2.region = "{0}"; 
+      deployment.ec2.keyPair = pkgs.lib.mkOverride 10 "{1}";
+      deployment.ec2.blockDeviceMapping."/dev/xvdg".size = pkgs.lib.mkOverride 10 {2};
+    }};
+}}
+'''.format(args.region, key_name, ebs_size))
 f.close()
 
-depl = deployment.Deployment("./ebs-creator.json", create=True, nix_exprs=["./ebs-creator.nix", "./ebs-creator-zone.nix"])
+depl = deployment.Deployment("./ebs-creator.json", create=True, nix_exprs=["./ebs-creator.nix", "./ebs-creator-config.nix"])
 if not args.keep: depl.destroy_vms()
 depl.deploy()
 
 m = depl.machines['machine']
 
 # Do the installation.
+device="/dev/xvdg"
+if args.hvm:
+    m.run_command('parted -s /dev/xvdg -- mklabel msdos')
+    m.run_command('parted -s /dev/xvdg -- mkpart primary ext2 1M -1s')
+    device="/dev/xvdg1"
+
 m.run_command("if mountpoint -q /mnt; then umount /mnt; fi")
-m.run_command("mkfs.ext4 -L nixos /dev/xvdg")
+m.run_command("mkfs.ext4 -L nixos {0}".format(device))
 m.run_command("mkdir -p /mnt")
-m.run_command("mount /dev/xvdg /mnt")
+m.run_command("mount {0} /mnt".format(device))
 m.run_command("touch /mnt/.ebs")
 m.run_command("mkdir -p /mnt/etc/nixos")
 m.run_command("nixos-checkout") # FIXME
@@ -37,46 +58,84 @@ version = m.run_command("nixos-option system.nixosVersion", capture_stdout=True)
 print >> sys.stderr, "NixOS version is {0}".format(version)
 m.run_command("nixos-install")
 m.run_command("rm -rf /mnt/etc/nixos/nixos/.svn /mnt/etc/nixos/nixpkgs/.svn")
+if args.hvm:
+    m.run_command('cp /nix/store/*-grub-0.97*/lib/grub/i386-pc/* /mnt/boot/grub')
+    m.run_command('sed -i "s|hd0|hd0,0|" /mnt/boot/grub/menu.lst')
+    m.run_command('echo "(hd1) /dev/xvdg" > device.map')
+    m.run_command('echo -e "root (hd1,0)\nsetup (hd1)" | grub --device-map=device.map --batch')
+
+
 m.run_command("umount /mnt")
 
-ami_name = "nixos-{0}-x86_64-ebs".format(version)
-description = "NixOS {0} (x86_64; EBS root)".format(version)
 
-# Create a snapshot.
-m.connect()
-volume = m._conn.get_all_volumes([], filters={'attachment.instance-id': m._instance_id, 'attachment.device': "/dev/sdg"})[0]
-snapshot = volume.create_snapshot(description=description)
-print >> sys.stderr, "created snapshot {0}".format(snapshot.id)
+if args.hvm:
+    ami_name = "nixos-{0}-x86_64-ebs-hvm".format(version)
+    description = "NixOS {0} (x86_64; EBS root; hvm)".format(version)
+else:
+    ami_name = "nixos-{0}-x86_64-ebs".format(version)
+    description = "NixOS {0} (x86_64; EBS root)".format(version)
+    
 
 # Wait for the snapshot to finish.
 def check():
     status = snapshot.update()
     print >> sys.stderr, "snapshot status is {0}".format(status)
     return status == '100%'
-charon.util.check_wait(check, max_tries=120)
 
-m._conn.create_tags([snapshot.id], {'Name': ami_name})
-
-if not args.keep: depl.destroy_vms()
-
-# Register the image.
-aki = m._conn.get_all_images(filters={'manifest-location': '*pv-grub-hd0_1.03-x86_64*'})[0]
-print >> sys.stderr, "using kernel image {0} - {1}".format(aki.id, aki.location)
-
-block_map = BlockDeviceMapping()
-block_map['/dev/sda'] = BlockDeviceType(snapshot_id=snapshot.id, delete_on_termination=True)
-block_map['/dev/sdb'] = BlockDeviceType(ephemeral_name="ephemeral0")
-block_map['/dev/sdc'] = BlockDeviceType(ephemeral_name="ephemeral1")
-block_map['/dev/sdd'] = BlockDeviceType(ephemeral_name="ephemeral2")
-block_map['/dev/sde'] = BlockDeviceType(ephemeral_name="ephemeral3")
-
-ami_id = m._conn.register_image(
-    name=ami_name,
-    description=description,
-    architecture="x86_64",
-    root_device_name="/dev/sda",
-    kernel_id=aki.id,
-    block_device_map=block_map)
+m.connect()
+volume = m._conn.get_all_volumes([], filters={'attachment.instance-id': m._instance_id, 'attachment.device': "/dev/sdg"})[0]
+if args.hvm:
+    instance = m._conn.run_instances( image_id="ami-6a9e4503"
+                                    , instance_type=instance_type
+                                    , key_name=key_name
+                                    , placement=m._zone
+                                    , security_groups=["eelco-test"]).instances[0]
+    charon.util.check_wait(lambda: instance.update() == 'running', max_tries=120)
+    instance.stop()
+    charon.util.check_wait(lambda: instance.update() == 'stopped', max_tries=120)
+    old_root_volume = m._conn.get_all_volumes([], filters={'attachment.instance-id': instance.id, 'attachment.device': "/dev/sda1"})[0]
+    old_root_volume.detach()
+    volume.detach()
+    charon.util.check_wait(lambda: volume.update() == 'available', max_tries=120)
+    charon.util.check_wait(lambda: old_root_volume.update() == 'available', max_tries=120)
+    volume.attach(instance.id, '/dev/sda1')
+    charon.util.check_wait(lambda: volume.update() == 'in-use', max_tries=120)
+
+    ami_id = m._conn.create_image(instance.id, ami_name, description)
+    time.sleep(5)
+    image = m._conn.get_all_images([ami_id])[0]
+    charon.util.check_wait(lambda: image.update() == 'available', max_tries=120)
+    instance.terminate()
+
+else:
+    # Create a snapshot.
+    snapshot = volume.create_snapshot(description=description)
+    print >> sys.stderr, "created snapshot {0}".format(snapshot.id)
+
+    charon.util.check_wait(check, max_tries=120)
+
+    m._conn.create_tags([snapshot.id], {'Name': ami_name})
+
+    if not args.keep: depl.destroy_vms()
+
+     # Register the image.
+    aki = m._conn.get_all_images(filters={'manifest-location': '*pv-grub-hd0_1.03-x86_64*'})[0]
+    print >> sys.stderr, "using kernel image {0} - {1}".format(aki.id, aki.location)
+
+    block_map = BlockDeviceMapping()
+    block_map['/dev/sda'] = BlockDeviceType(snapshot_id=snapshot.id, delete_on_termination=True)
+    block_map['/dev/sdb'] = BlockDeviceType(ephemeral_name="ephemeral0")
+    block_map['/dev/sdc'] = BlockDeviceType(ephemeral_name="ephemeral1")
+    block_map['/dev/sdd'] = BlockDeviceType(ephemeral_name="ephemeral2")
+    block_map['/dev/sde'] = BlockDeviceType(ephemeral_name="ephemeral3")
+
+    ami_id = m._conn.register_image(
+        name=ami_name,
+        description=description,
+        architecture="x86_64",
+        root_device_name="/dev/sda",
+        kernel_id=aki.id,
+        block_device_map=block_map)
 
 print >> sys.stderr, "registered AMI {0}".format(ami_id)
 
@@ -94,12 +153,13 @@ f.write(
     {{ network.description = "NixOS EBS test";
        machine.deployment.targetEnv = "ec2";
        machine.deployment.ec2.region = "{0}";
-       machine.deployment.ec2.instanceType = "m1.small";
-       machine.deployment.ec2.keyPair = "eelco";
+       machine.deployment.ec2.instanceType = "{2}";
+       machine.deployment.ec2.keyPair = "{3}";
        machine.deployment.ec2.securityGroups = [ "eelco-test" ];
        machine.deployment.ec2.ami = "{1}";
+       machine.fileSystems = [];
     }}
-    '''.format(args.region, ami_id))
+    '''.format(args.region, ami_id, instance_type, key_name))
 f.close()
 
 test_depl = deployment.Deployment("./ebs-test.json", create=True, nix_exprs=["./ebs-test.nix"])
diff --git a/maintainers/scripts/ec2/ebs-creator.nix b/maintainers/scripts/ec2/ebs-creator.nix
index f6a60b9d983..1bf78c41f12 100644
--- a/maintainers/scripts/ec2/ebs-creator.nix
+++ b/maintainers/scripts/ec2/ebs-creator.nix
@@ -7,6 +7,7 @@
       deployment.ec2.instanceType = "m1.small";
       deployment.ec2.keyPair = "eelco";
       deployment.ec2.securityGroups = [ "eelco-test" ];
-      deployment.ec2.blockDeviceMapping."/dev/xvdg".size = 20;
+      environment.systemPackages = [ pkgs.parted ];
+      fileSystems = [];
     };
 }
-- 
GitLab


From 9261d520ffeedaaf1ad6ad5321aa82276e799990 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 18 Apr 2012 14:14:58 +0000
Subject: [PATCH 3617/5331] * Fix the installer test.

svn path=/nixos/trunk/; revision=33828
---
 tests/installer.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/installer.nix b/tests/installer.nix
index aa4fe922cbd..8d7e1a93794 100644
--- a/tests/installer.nix
+++ b/tests/installer.nix
@@ -341,7 +341,7 @@ in {
           print STDERR "New CD config:\n$cfg\n";
 
           # Apply the new CD configuration.
-          $machine->mustSucceed("nixos-rebuild test --no-pull");
+          $machine->mustSucceed("nixos-rebuild test");
 
           # Connect to it-self.
           #$machine->waitForJob("sshd");
-- 
GitLab


From 6f646750cf9335777ca72cf6d698c20c07c02aa6 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 18 Apr 2012 14:17:09 +0000
Subject: [PATCH 3618/5331] * Enable the GRUB 1 installer test.

svn path=/nixos/trunk/; revision=33829
---
 release.nix | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/release.nix b/release.nix
index 5d20e182e0e..6405983f8a7 100644
--- a/release.nix
+++ b/release.nix
@@ -206,18 +206,19 @@ let
         bittorrent = t.bittorrent.test;
         firefox = t.firefox.test;
         firewall = t.firewall.test;
+        installer.grub1 = t.installer.grub1.test;
         installer.lvm = t.installer.lvm.test;
+        installer.rebuildCD = t.installer.rebuildCD.test;
         installer.separateBoot = t.installer.separateBoot.test;
         installer.simple = t.installer.simple.test;
         installer.simple_64 = t_64.installer.simple.test;
         installer.swraid = t.installer.swraid.test;
-        installer.rebuildCD = t.installer.rebuildCD.test;
         ipv6 = t.ipv6.test;
         kde4 = t.kde4.test;
         login = t.login.test;
         mpich = t.mpich.test;
-	mysql = t.mysql.test;
-	mysql_replication = t.mysql_replication.test;
+        mysql = t.mysql.test;
+        mysql_replication = t.mysql_replication.test;
         nat = t.nat.test;
         nfs = t.nfs.test;
         openssh = t.openssh.test;
-- 
GitLab


From cb74284b75948e6a47d7940ac50c49d89fa6537c Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 18 Apr 2012 14:28:30 +0000
Subject: [PATCH 3619/5331] * Handle the case where there is no GRUB 1 splash
 image.

svn path=/nixos/trunk/; revision=33830
---
 modules/installer/grub/grub-menu-builder.sh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/modules/installer/grub/grub-menu-builder.sh b/modules/installer/grub/grub-menu-builder.sh
index c6e30782822..59c35c91179 100644
--- a/modules/installer/grub/grub-menu-builder.sh
+++ b/modules/installer/grub/grub-menu-builder.sh
@@ -45,13 +45,13 @@ fi
 prologue() {
     case "$grubVersion" in
 	1)
-            cp -f "@splashImage@" /boot/background.xpm.gz
 	    cat > "$1" << GRUBEND
 # Automatically generated.  DO NOT EDIT THIS FILE!
 default @default@
 timeout @timeout@
 GRUBEND
-	    if test -n "@splashImage@"; then
+	    if [ -n "@splashImage@" ]; then
+                cp -f "@splashImage@" /boot/background.xpm.gz
                 echo "splashimage $bootRoot/background.xpm.gz" >> "$1"
             fi
 	    ;;
@@ -147,7 +147,7 @@ copyToKernelsDir() {
     # kernels or initrd if this script is ever interrupted.
     if ! test -e $dst; then
         local dstTmp=$dst.tmp.$$
-        cp $src $dstTmp
+        cp "$src" "$dstTmp"
         mv $dstTmp $dst
     fi
     filesCopied[$dst]=1
-- 
GitLab


From f8e36664a69a998c2a5b71840a068783cbc3b8fd Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 18 Apr 2012 15:01:42 +0000
Subject: [PATCH 3620/5331] =?UTF-8?q?*=20Subtle:=20since=20nix-env=20proce?=
 =?UTF-8?q?sses=20flags=20in=20order,=20any=20=E2=80=98-I=E2=80=99=20flag?=
 =?UTF-8?q?=20should=20=20=20come=20before=20=E2=80=98-f=20<nixos>?=
 =?UTF-8?q?=E2=80=99.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

svn path=/nixos/trunk/; revision=33831
---
 modules/installer/tools/nixos-rebuild.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/installer/tools/nixos-rebuild.sh b/modules/installer/tools/nixos-rebuild.sh
index 42e1a33a444..b62da16c7b7 100644
--- a/modules/installer/tools/nixos-rebuild.sh
+++ b/modules/installer/tools/nixos-rebuild.sh
@@ -152,7 +152,7 @@ fi
 if test -z "$rollback"; then
     echo "building the system configuration..." >&2
     if test "$action" = switch -o "$action" = boot; then
-        nix-env -p /nix/var/nix/profiles/system -f '<nixos>' --set -A system $extraBuildFlags
+        nix-env $extraBuildFlags -p /nix/var/nix/profiles/system -f '<nixos>' --set -A system
         pathToConfig=/nix/var/nix/profiles/system
     elif test "$action" = test -o "$action" = build -o "$action" = dry-run; then
         nix-build '<nixos>' -A system -K -k $extraBuildFlags > /dev/null
-- 
GitLab


From 6ef5e0e5b36878a51db07b896c1adad562aeb3e5 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 18 Apr 2012 16:08:25 +0000
Subject: [PATCH 3621/5331] * Fix the GRUB 1 installer test.  Note that GRUB 1
 doesn't   automatically detect /dev/vd* devices, so users have to fix  
 /boot/grub/device.map manually.

svn path=/nixos/trunk/; revision=33832
---
 tests/installer.nix | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/tests/installer.nix b/tests/installer.nix
index 8d7e1a93794..e70a412e35a 100644
--- a/tests/installer.nix
+++ b/tests/installer.nix
@@ -152,11 +152,15 @@ let
           "${ config { inherit fileSystems testChannel grubVersion; } }",
           "/mnt/etc/nixos/configuration.nix");
 
+      # Hack to get GRUB 1 to install on virtio.  GRUB 1 has a patch
+      # from Gentoo to support virtio, but it's incomplete: it doesn't
+      # detect /dev/vd* automatically.  And we don't care enough about
+      # GRUB 1 to fix it.
+      $machine->mustSucceed("mkdir -p /mnt/boot/grub; echo '(hd0) /dev/vda' > /mnt/boot/grub/device.map");
+      
       # Perform the installation.
       $machine->mustSucceed("nixos-install >&2");
 
-      $machine->mustSucceed("cat /mnt/boot/grub/grub.cfg >&2");
-
       $machine->shutdown;
 
       # Now see if we can boot the installation.
@@ -165,20 +169,18 @@ let
       # Did /boot get mounted, if appropriate?
       # !!! There is currently no good way to wait for the
       # `filesystems' task to finish.
-      $machine->waitForFile("/boot/grub/grub.cfg");
+      $machine->waitForFile("/boot/grub");
 
       # Did the swap device get activated?
       # !!! Idem.
       $machine->waitUntilSucceeds("cat /proc/swaps | grep -q /dev");
 
-      $machine->mustSucceed("nix-env -i coreutils >&2");
+      $machine->mustSucceed("nix-env -f /etc/nixos/nixpkgs -i coreutils >&2");
       $machine->mustSucceed("type -tP ls | tee /dev/stderr") =~ /.nix-profile/
           or die "nix-env failed";
 
       $machine->mustSucceed("nixos-rebuild switch >&2");
 
-      $machine->mustSucceed("cat /boot/grub/grub.cfg >&2");
-
       $machine->shutdown;
 
       # And just to be sure, check that the machine still boots after
-- 
GitLab


From 298e0e182907b1e5a82f11a4decb4d1b22de698e Mon Sep 17 00:00:00 2001
From: Arie Middelkoop <amiddelk@gmail.com>
Date: Thu, 19 Apr 2012 08:28:54 +0000
Subject: [PATCH 3622/5331] Some additional xinetd settings.

svn path=/nixos/trunk/; revision=33836
---
 modules/services/networking/xinetd.nix | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/modules/services/networking/xinetd.nix b/modules/services/networking/xinetd.nix
index aabb7cf9f8a..3727e85816c 100644
--- a/modules/services/networking/xinetd.nix
+++ b/modules/services/networking/xinetd.nix
@@ -15,6 +15,7 @@ let
         log_type       = SYSLOG daemon info
         log_on_failure = HOST
         log_on_success = PID HOST DURATION EXIT
+        ${cfg.extraDefaults}
       }
 
       ${concatMapStrings makeService cfg.services}
@@ -33,6 +34,7 @@ let
         user        = ${srv.user}
         server      = ${srv.server}
         ${optionalString (srv.serverArgs != "") "server_args = ${srv.serverArgs}"}
+        ${srv.extraConfig}
       }
     '';
 
@@ -51,6 +53,14 @@ in
       '';
     };
 
+    services.xinetd.extraDefaults = mkOption {
+      default = "";
+      type = types.string;
+      description = ''
+        Additional configuration lines added to the default section of xinetd's configuration.
+      '';
+    };
+
     services.xinetd.services = mkOption {
       default = [];
       description = ''
@@ -115,6 +125,12 @@ in
           '';
         };
 
+        extraConfig = mkOption {
+          type = types.string;
+          default = "";
+          description = "Extra configuration-lines added to the section of the service.";
+        };
+
       };
 
     };
-- 
GitLab


From 0cb5673400be4d93abc598e28976bf698fd8d261 Mon Sep 17 00:00:00 2001
From: Arie Middelkoop <amiddelk@gmail.com>
Date: Thu, 19 Apr 2012 08:29:22 +0000
Subject: [PATCH 3623/5331] Some additional synaptics settings.

svn path=/nixos/trunk/; revision=33837
---
 modules/services/x11/hardware/synaptics.nix | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/modules/services/x11/hardware/synaptics.nix b/modules/services/x11/hardware/synaptics.nix
index 4c5161c1b30..752df410934 100644
--- a/modules/services/x11/hardware/synaptics.nix
+++ b/modules/services/x11/hardware/synaptics.nix
@@ -58,6 +58,12 @@ let cfg = config.services.xserver.synaptics; in
         description = "Whether to enable palm detection (hardware support required)";
       };
 
+      horizontalScroll = mkOption {
+        default = true;
+        example = false;
+        description = "Whether to enable horizontal scrolling (on touchpad)";
+      };
+
       additionalOptions = mkOption {
         default = "";
         example = ''
@@ -94,10 +100,12 @@ let cfg = config.services.xserver.synaptics; in
           Option "TapButton1" "${if cfg.tapButtons then "1" else "0"}"
           Option "TapButton2" "${if cfg.tapButtons then "2" else "0"}"
           Option "TapButton3" "${if cfg.tapButtons then "3" else "0"}"
+          ${if cfg.tapButtons then "" else ''Option "MaxTapTime" "0"''}
           Option "VertTwoFingerScroll" "${if cfg.twoFingerScroll then "1" else "0"}"
           Option "HorizTwoFingerScroll" "${if cfg.twoFingerScroll then "1" else "0"}"
           Option "VertEdgeScroll" "${if cfg.vertEdgeScroll then "1" else "0"}"
           ${if cfg.palmDetect then ''Option "PalmDetect" "1"'' else ""}
+          ${if cfg.horizontalScroll then "" else ''Option "HorizScrollDelta" "0"''}
           ${cfg.additionalOptions}
         EndSection
       '';
-- 
GitLab


From 43f43fd1851b72f5e035b9c33f9376e8903020d1 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 19 Apr 2012 15:12:55 +0000
Subject: [PATCH 3624/5331] * Only stop libvirt-guests automatically on system
 shutdown.   Saving/restoring VMs is disruptive.

svn path=/nixos/trunk/; revision=33844
---
 modules/virtualisation/libvirtd.nix | 24 ++++++++++++++++++------
 1 file changed, 18 insertions(+), 6 deletions(-)

diff --git a/modules/virtualisation/libvirtd.nix b/modules/virtualisation/libvirtd.nix
index 91168aa7df5..66bbb757c70 100644
--- a/modules/virtualisation/libvirtd.nix
+++ b/modules/virtualisation/libvirtd.nix
@@ -53,6 +53,7 @@ in
       { description = "Libvirtd virtual machine management daemon";
 
         startOn = "stopped udevtrigger";
+        stopOn = "";
 
         path =
           [ pkgs.bridge_utils pkgs.dmidecode pkgs.dnsmasq
@@ -98,16 +99,15 @@ in
       };
 
     # !!! Split this into save and restore tasks.
-    jobs.libvirt_guests =
-      { name = "libvirt-guests";
-
-        description = "Job to save/restore libvirtd VMs";
+    jobs."libvirt-guests" =
+      { description = "Job to save/restore libvirtd VMs";
 
         startOn = "started libvirtd";
 
         # We want to suspend VMs only on shutdown, but Upstart is broken.
-        #stopOn = "starting shutdown and stopping libvirtd";
-        stopOn = "stopping libvirtd";
+        stopOn = "";
+
+        restartIfChanged = false;
 
         path = [ pkgs.gettext pkgs.libvirt pkgs.gawk ];
 
@@ -122,6 +122,18 @@ in
         respawn = false;
       };
 
+    jobs."stop-libvirt" =
+      { description = "Helper task to stop libvirtd and libvirt-guests on shutdown";
+        task = true;
+        restartIfChanged = false;
+        startOn = "starting shutdown";
+        script =
+          ''
+            stop libvirt-guests || true
+            stop libvirtd || true
+          '';
+      };
+
   };
 
 }
-- 
GitLab


From fa50d105d7a16961f000846e3fa4e80021519639 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 19 Apr 2012 18:56:35 +0000
Subject: [PATCH 3625/5331] * Pass -cpu kvm64 in NixOS VMs (and add a simple
 regression test for   GMP).

svn path=/nixos/trunk/; revision=33849
---
 lib/test-driver/Machine.pm         |  2 +-
 modules/virtualisation/qemu-vm.nix |  3 ++-
 release.nix                        |  1 +
 tests/default.nix                  |  1 +
 tests/misc.nix                     | 21 +++++++++++++++++++++
 5 files changed, 26 insertions(+), 2 deletions(-)
 create mode 100644 tests/misc.nix

diff --git a/lib/test-driver/Machine.pm b/lib/test-driver/Machine.pm
index 249a6e8b2ab..dee1e4f33cb 100644
--- a/lib/test-driver/Machine.pm
+++ b/lib/test-driver/Machine.pm
@@ -27,7 +27,7 @@ sub new {
     if (!$startCommand) {
         # !!! merge with qemu-vm.nix.
         $startCommand =
-            "qemu-system-x86_64 -m 384 " .
+            "qemu-kvm -m 384 " .
             "-net nic,model=virtio \$QEMU_OPTS ";
         $startCommand .= "-drive file=" . Cwd::abs_path($args->{hda}) . ",if=virtio,boot=on,werror=report "
             if defined $args->{hda};
diff --git a/modules/virtualisation/qemu-vm.nix b/modules/virtualisation/qemu-vm.nix
index 91ff1d594ba..9596822cd8f 100644
--- a/modules/virtualisation/qemu-vm.nix
+++ b/modules/virtualisation/qemu-vm.nix
@@ -158,9 +158,10 @@ let
       ${pkgs.vmTools.startSamba}
 
       # Start QEMU.
-      exec ${pkgs.qemu_kvm}/bin/qemu-system-x86_64 \
+      exec ${pkgs.qemu_kvm}/bin/qemu-kvm \
           -name ${vmName} \
           -m ${toString config.virtualisation.memorySize} \
+          ${optionalString (pkgs.stdenv.system == "x86_64-linux") "-cpu kvm64"} \
           -net nic,vlan=0,model=virtio \
           -chardev socket,id=samba,path=./samba \
           -net user,vlan=0,guestfwd=tcp:10.0.2.4:445-chardev:samba''${QEMU_NET_OPTS:+,$QEMU_NET_OPTS} \
diff --git a/release.nix b/release.nix
index 6405983f8a7..2ee090f86ae 100644
--- a/release.nix
+++ b/release.nix
@@ -216,6 +216,7 @@ let
         ipv6 = t.ipv6.test;
         kde4 = t.kde4.test;
         login = t.login.test;
+        misc = t.misc.test;
         mpich = t.mpich.test;
         mysql = t.mysql.test;
         mysql_replication = t.mysql_replication.test;
diff --git a/tests/default.nix b/tests/default.nix
index 4ee61225219..4edcbd2f325 100644
--- a/tests/default.nix
+++ b/tests/default.nix
@@ -11,6 +11,7 @@ with import ../lib/testing.nix { inherit system; };
   ipv6 = makeTest (import ./ipv6.nix);
   kde4 = makeTest (import ./kde4.nix);
   login = makeTest (import ./login.nix);
+  misc = makeTest (import ./misc.nix);
   mpich = makeTest (import ./mpich.nix);
   mysql = makeTest (import ./mysql.nix);
   mysql_replication = makeTest (import ./mysql-replication.nix);
diff --git a/tests/misc.nix b/tests/misc.nix
new file mode 100644
index 00000000000..6d7d9ac758b
--- /dev/null
+++ b/tests/misc.nix
@@ -0,0 +1,21 @@
+# Miscellaneous small tests that don't warrant their own VM run.
+
+{ pkgs, ... }:
+
+{
+
+  machine = { config, pkgs, ... }: { };
+
+  testScript =
+    ''
+      subtest "nixos-version", sub {
+          $machine->succeed("[ `nixos-version | wc -w` = 1 ]");
+      };
+
+      # Regression test for GMP aborts on QEMU.
+      subtest "gmp", sub {
+          $machine->succeed("expr 1 + 2");
+      };
+    '';
+
+}
-- 
GitLab


From d8a6cddbd0f627e891c0bab9c30c24968f544b55 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 20 Apr 2012 09:44:27 +0000
Subject: [PATCH 3626/5331] * Fix the installer test
 (http://hydra.nixos.org/build/2430122).

svn path=/nixos/trunk/; revision=33852
---
 tests/installer.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/tests/installer.nix b/tests/installer.nix
index e70a412e35a..73cf6312f59 100644
--- a/tests/installer.nix
+++ b/tests/installer.nix
@@ -77,7 +77,7 @@ let
     { services.httpd.enable = true;
       services.httpd.adminAddr = "foo@example.org";
       services.httpd.servedDirs = singleton
-        { urlPath = "/releases/nixpkgs/channels/nixpkgs-unstable";
+        { urlPath = "/releases/nixos/channels/nixos-unstable";
           dir = "/tmp/channel";
         };
 
@@ -109,7 +109,7 @@ let
         $webserver->mustSucceed("mkdir /tmp/channel");
         $webserver->mustSucceed(
             "nix-push file:///tmp/channel " .
-            "http://nixos.org/releases/nixpkgs/channels/nixpkgs-unstable " .
+            "http://nixos.org/releases/nixos/channels/nixos-unstable " .
             "file:///tmp/channel/MANIFEST ${toString channelContents} >&2");
       ''}
 
@@ -131,7 +131,7 @@ let
 
         # Test nix-env.
         $machine->mustFail("hello");
-        $machine->mustSucceed("nix-env -i hello");
+        $machine->mustSucceed("nix-env -f /etc/nixos/nixpkgs -i hello");
         $machine->mustSucceed("hello") =~ /Hello, world/
             or die "bad `hello' output";
       ''}
-- 
GitLab


From 235ea24ec4a64477cb572d49263cc834ea70b6ab Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 20 Apr 2012 12:22:08 +0000
Subject: [PATCH 3627/5331] * Remove unused option "user".  Not clear what it
 was supposed to do.

svn path=/nixos/trunk/; revision=33857
---
 modules/config/users-groups.nix | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/modules/config/users-groups.nix b/modules/config/users-groups.nix
index 37e431330ce..ea71562e313 100644
--- a/modules/config/users-groups.nix
+++ b/modules/config/users-groups.nix
@@ -199,15 +199,6 @@ in
       '';
     };
 
-    user = mkOption {
-      default = {};
-      description = ''
-        This option defines settings for individual users on the system.
-      '';
-      type = types.loaOf types.optionSet;
-      options = [ ];
-    };
-
   };
 
 
-- 
GitLab


From d58732961540ccbf7f78753a60888814c07f530b Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 20 Apr 2012 12:55:09 +0000
Subject: [PATCH 3628/5331] * Turn users.extraGroups into an attribute set
 (using types.loaOf).   Also the gid is looked up in ids.gids if not
 specified.

svn path=/nixos/trunk/; revision=33860
---
 modules/config/users-groups.nix | 138 +++++++++++++++-----------------
 tests/misc.nix                  |   7 ++
 2 files changed, 73 insertions(+), 72 deletions(-)

diff --git a/modules/config/users-groups.nix b/modules/config/users-groups.nix
index ea71562e313..6c54222537a 100644
--- a/modules/config/users-groups.nix
+++ b/modules/config/users-groups.nix
@@ -7,64 +7,75 @@ let
   ids = config.ids;
   users = config.users;
 
-  userOpts = {name, config, ...}:
-
-  {
+  userOpts = { name, config, ... }: {
+  
     options = {
+    
       name = mkOption {
         type = with types; uniq string;
         description = "The name of the user account. If undefined, the name of the attribute set will be used.";
       };
+      
       description = mkOption {
         type = with types; uniq string;
         default = "";
         description = "A short description of the user account.";
       };
+      
       uid = mkOption {
         type = with types; uniq (nullOr int);
         default = null;
-        description = "The account UID. If undefined, NixOS will select a UID.";
+        description = "The account UID. If undefined, NixOS will select a free UID.";
       };
+      
       group = mkOption {
         type = with types; uniq string;
         default = "nogroup";
         description = "The user's primary group.";
       };
+      
       extraGroups = mkOption {
         type = types.listOf types.string;
         default = [];
         description = "The user's auxiliary groups.";
       };
+      
       home = mkOption {
         type = with types; uniq string;
         default = "/var/empty";
         description = "The user's home directory.";
       };
+      
       shell = mkOption {
         type = with types; uniq string;
         default = "/noshell";
         description = "The path to the user's shell.";
       };
+      
       createHome = mkOption {
         type = types.bool;
         default = false;
         description = "If true, the home directory will be created automatically.";
       };
+      
       useDefaultShell = mkOption {
         type = types.bool;
         default = false;
         description = "If true, the user's shell will be set to <literal>users.defaultUserShell</literal>.";
       };
+      
       password = mkOption {
         type = with types; uniq (nullOr string);
         default = null;
         description = "The user's password. If undefined, no password is set for the user.  Warning: do not set confidential information here because this data would be readable by all.  This option should only be used for public account such as guest.";
       };
+      
       isSystemUser = mkOption {
         type = types.bool;
         default = true;
         description = "Indicates if the user is a system user or not.";
       };
+      
       createUser = mkOption {
         type = types.bool;
         default = true;
@@ -74,6 +85,7 @@ let
           then not modify any of the basic properties for the user account.
         ";
       };
+      
     };
 
     config = {
@@ -81,71 +93,32 @@ let
       uid = mkDefault (attrByPath [name] null ids.uids);
       shell = mkIf config.useDefaultShell (mkDefault users.defaultUserShell);
     };
+    
   };
 
-  # Groups to be created/updated by NixOS.
-  groups =
-    let
-      defaultGroups =
-        [ { name = "root";
-            gid = ids.gids.root;
-          }
-          { name = "wheel";
-            gid = ids.gids.wheel;
-          }
-          { name = "disk";
-            gid = ids.gids.disk;
-          }
-          { name = "kmem";
-            gid = ids.gids.kmem;
-          }
-          { name = "tty";
-            gid = ids.gids.tty;
-          }
-          { name = "floppy";
-            gid = ids.gids.floppy;
-          }
-          { name = "uucp";
-            gid = ids.gids.uucp;
-          }
-          { name = "lp";
-            gid = ids.gids.lp;
-          }
-          { name = "cdrom";
-            gid = ids.gids.cdrom;
-          }
-          { name = "tape";
-            gid = ids.gids.tape;
-          }
-          { name = "audio";
-            gid = ids.gids.audio;
-          }
-          { name = "video";
-            gid = ids.gids.video;
-          }
-          { name = "dialout";
-            gid = ids.gids.dialout;
-          }
-          { name = "nogroup";
-            gid = ids.gids.nogroup;
-          }
-          { name = "users";
-            gid = ids.gids.users;
-          }
-          { name = "nixbld";
-            gid = ids.gids.nixbld;
-          }
-          { name = "utmp";
-            gid = ids.gids.utmp;
-          }
-        ];
-
-      addAttrs =
-        { name, gid ? "" }:
-        { inherit name gid; };
-
-    in map addAttrs (defaultGroups ++ config.users.extraGroups);
+  groupOpts = { name, config, ... }: {
+  
+    options = {
+    
+      name = mkOption {
+        type = with types; uniq string;
+        description = "The name of the group. If undefined, the name of the attribute set will be used.";
+      };
+      
+      gid = mkOption {
+        type = with types; uniq (nullOr int);
+        default = null;
+        description = "The GID of the group. If undefined, NixOS will select a free GID.";
+      };
+      
+    };
 
+    config = {
+      name = mkDefault name;
+      gid = mkDefault (attrByPath [name] null ids.gids);
+    };
+    
+  };
 
   # Note: the 'X' in front of the password is to distinguish between
   # having an empty password, and not having a password.
@@ -188,15 +161,16 @@ in
     };
 
     users.extraGroups = mkOption {
-      default = [];
+      default = {};
       example =
-        [ { name = "students";
-            gid = 1001;
-          }
-        ];
+        { students.gid = 1001;
+          hackers = { };
+        };
+      type = types.loaOf types.optionSet;
       description = ''
         Additional groups to be created automatically by the system.
       '';
+      options = [ groupOpts ];
     };
 
   };
@@ -218,6 +192,26 @@ in
       };
     };
 
+    users.extraGroups = {
+      root = { };
+      wheel = { };
+      disk = { };
+      kmem = { };
+      tty = { };
+      floppy = { };
+      uucp = { };
+      lp = { };
+      cdrom = { };
+      tape = { };
+      audio = { };
+      video = { };
+      dialout = { };
+      nogroup = { };
+      users = { };
+      nixbld = { };
+      utmp = { };
+    };
+
     system.activationScripts.rootPasswd = stringAfter [ "etc" ]
       ''
         # If there is no password file yet, create a root account with an
@@ -313,7 +307,7 @@ in
                 fi
             fi
         done <<EndOfGroupList
-        ${concatStringsSep "\n" (map serializedGroup groups)}
+        ${concatStringsSep "\n" (map serializedGroup (attrValues config.users.extraGroups))}
         EndOfGroupList
       '';
 
diff --git a/tests/misc.nix b/tests/misc.nix
index 6d7d9ac758b..512d087168d 100644
--- a/tests/misc.nix
+++ b/tests/misc.nix
@@ -12,6 +12,13 @@
           $machine->succeed("[ `nixos-version | wc -w` = 1 ]");
       };
 
+      # Sanity check for uid/gid assignment.
+      subtest "users-groups", sub {
+          $machine->succeed("[ `id -u messagebus` = 4 ]");
+          $machine->succeed("[ `id -g messagebus` = 4 ]");
+          $machine->succeed("[ `getent group users` = 'users:x:100:' ]");
+      };
+
       # Regression test for GMP aborts on QEMU.
       subtest "gmp", sub {
           $machine->succeed("expr 1 + 2");
-- 
GitLab


From d96f330fcfd00d9b521c087aebac4cb6e8c30955 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sun, 22 Apr 2012 16:28:08 +0000
Subject: [PATCH 3629/5331] * Slight simplification.

svn path=/nixos/trunk/; revision=33877
---
 modules/config/users-groups.nix | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/modules/config/users-groups.nix b/modules/config/users-groups.nix
index 6c54222537a..deaa346acff 100644
--- a/modules/config/users-groups.nix
+++ b/modules/config/users-groups.nix
@@ -124,8 +124,6 @@ let
   # having an empty password, and not having a password.
   serializedUser = userName: let u = getAttr userName config.users.extraUsers; in "${u.name}\n${u.description}\n${if u.uid != null then toString u.uid else ""}\n${u.group}\n${toString (concatStringsSep "," u.extraGroups)}\n${u.home}\n${u.shell}\n${toString u.createHome}\n${if u.password != null then "X" + u.password else ""}\n${toString u.isSystemUser}\n${if u.createUser then "yes" else "no"}\n";
 
-  serializedGroup = g: "${g.name}\n${toString g.gid}";
-
   # keep this extra file so that cat can be used to pass special chars such as "`" which is used in the avahi daemon
   usersFile = pkgs.writeText "users" (
     concatMapStrings serializedUser (attrNames config.users.extraUsers)
@@ -290,9 +288,9 @@ in
       ''
         echo "updating groups..."
 
-        while true; do
-            read name || break
-            read gid
+        createGroup() {
+            name="$1"
+            gid="$2"
 
             if ! curEnt=$(getent group "$name"); then
                 groupadd --system \
@@ -306,9 +304,11 @@ in
                     groupmod --gid $gid "$name"
                 fi
             fi
-        done <<EndOfGroupList
-        ${concatStringsSep "\n" (map serializedGroup (attrValues config.users.extraGroups))}
-        EndOfGroupList
+        }
+
+        ${flip concatMapStrings (attrValues config.users.extraGroups) (g: ''
+          createGroup '${g.name}' '${toString g.gid}'
+        '')}
       '';
 
   };
-- 
GitLab


From f1a99bd914804eff4aab3521c0ecf9540cda6738 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sun, 22 Apr 2012 22:43:57 +0000
Subject: [PATCH 3630/5331] * Subscribe the root user to the NixOS channel by
 default.

svn path=/nixos/trunk/; revision=33883
---
 modules/programs/bash/profile.sh | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/modules/programs/bash/profile.sh b/modules/programs/bash/profile.sh
index 664cb8cf444..3da860388b1 100644
--- a/modules/programs/bash/profile.sh
+++ b/modules/programs/bash/profile.sh
@@ -85,6 +85,11 @@ if ! test -L $HOME/.nix-profile; then
     fi
 fi
 
+# Subscribe the root user to the NixOS channel by default.
+if [ "$USER" = root -a ! -e $HOME/.nix-channels ]; then
+    echo "http://nixos.org/releases/nixos/channels/nixos-unstable nixos" > $HOME/.nix-channels
+fi
+
 # Create the per-user garbage collector roots directory.
 NIX_USER_GCROOTS_DIR=/nix/var/nix/gcroots/per-user/$USER
 mkdir -m 0755 -p $NIX_USER_GCROOTS_DIR
-- 
GitLab


From 9195b1125f37d9ab57383f94f20231e675356a5b Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sun, 22 Apr 2012 23:35:34 +0000
Subject: [PATCH 3631/5331] * Include the version number in the mingetty
 greeting line.

svn path=/nixos/trunk/; revision=33884
---
 modules/services/ttys/mingetty.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/services/ttys/mingetty.nix b/modules/services/ttys/mingetty.nix
index 550d94c4cea..91a00908385 100644
--- a/modules/services/ttys/mingetty.nix
+++ b/modules/services/ttys/mingetty.nix
@@ -31,7 +31,7 @@ with pkgs.lib;
       };
 
       greetingLine = mkOption {
-        default = ''<<< Welcome to NixOS (\m) - \s \r (\l) >>>'';
+        default = ''<<< Welcome to NixOS ${config.system.nixosVersion} (\m) - \s \r (\l) >>>'';
         description = ''
           Welcome line printed by mingetty.
         '';
-- 
GitLab


From 72990dae376fe5fc4fe8083239c1f713b2dd08a8 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 23 Apr 2012 00:30:48 +0000
Subject: [PATCH 3632/5331] * Add some missing GRUB modules.

svn path=/nixos/trunk/; revision=33886
---
 modules/installer/cd-dvd/iso-image.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/installer/cd-dvd/iso-image.nix b/modules/installer/cd-dvd/iso-image.nix
index 7e02b6ac2cc..08b0cdbbd74 100644
--- a/modules/installer/cd-dvd/iso-image.nix
+++ b/modules/installer/cd-dvd/iso-image.nix
@@ -87,7 +87,7 @@ let
   # The Grub image.
   grubImage = pkgs.runCommand "grub_eltorito" {}
     ''
-      ${pkgs.grub2}/bin/grub-mkimage -O i386-pc -o tmp biosdisk iso9660 help linux linux16 chain gfxterm vbe png jpeg
+      ${pkgs.grub2}/bin/grub-mkimage -O i386-pc -o tmp biosdisk iso9660 help linux linux16 chain vbe png jpeg echo test normal
       cat ${pkgs.grub2}/lib/grub/*/cdboot.img tmp > $out
     ''; # */
 
-- 
GitLab


From 6c1bb54483b3110d611a46ba0617c84100a2e3a0 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 23 Apr 2012 00:41:37 +0000
Subject: [PATCH 3633/5331] * In the installation CD, make the NixOS/Nixpkgs
 available as if they   were obtained from the NixOS channel.  "nixos-install"
 copies this   to the installed system as well. * In the installation CD, set
 GC_INITIAL_HEAP_SIZE to a low value for   the benefit of memory-constrained
 environments.

svn path=/nixos/trunk/; revision=33887
---
 lib/channel-expr.nix                          |  6 +++
 .../installer/cd-dvd/installation-cd-base.nix | 37 +++++++----------
 modules/installer/tools/nixos-install.sh      | 41 +++++++------------
 modules/profiles/installation-device.nix      | 28 +++++--------
 modules/services/misc/nix-daemon.nix          |  5 +--
 release.nix                                   |  7 +---
 tests/installer.nix                           |  4 +-
 7 files changed, 50 insertions(+), 78 deletions(-)
 create mode 100644 lib/channel-expr.nix

diff --git a/lib/channel-expr.nix b/lib/channel-expr.nix
new file mode 100644
index 00000000000..453bdd506b8
--- /dev/null
+++ b/lib/channel-expr.nix
@@ -0,0 +1,6 @@
+{ system ? builtins.currentSystem }:
+
+{ pkgs =
+    (import nixpkgs/default.nix { inherit system; })
+    // { recurseForDerivations = true; };
+}
diff --git a/modules/installer/cd-dvd/installation-cd-base.nix b/modules/installer/cd-dvd/installation-cd-base.nix
index 9111ac37385..5f351a65ec6 100644
--- a/modules/installer/cd-dvd/installation-cd-base.nix
+++ b/modules/installer/cd-dvd/installation-cd-base.nix
@@ -8,22 +8,20 @@ with pkgs.lib;
 let
 
   # 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.  !!! Once
-  # we use squashfs, maybe we won't need this anymore.
-  makeTarball = tarName: input: pkgs.runCommand "tarball" {inherit tarName;}
+  # CD.  These are installed into the "nixos" channel of the root
+  # user, as expected by nixos-rebuild/nixos-install.
+  channelSources = pkgs.runCommand "nixos-${config.system.nixosVersion}"
+    { expr = builtins.readFile ../../../lib/channel-expr.nix; }
     ''
-      ensureDir $out
-      (cd ${input} && tar cvfj $out/${tarName} . \
-        --exclude '*~' --exclude 'result')
+      mkdir -p $out/nixos
+      cp -prd ${cleanSource ../../..} $out/nixos/nixos
+      cp -prd ${cleanSource <nixpkgs>} $out/nixos/nixpkgs
+      chmod -R u+w $out/nixos/nixos
+      echo -n ${config.system.nixosVersion} > $out/nixos/nixos/.version
+      echo -n "" > $out/nixos/nixos/.version-suffix
+      echo "$expr" > $out/nixos/default.nix
     '';
 
-  # Put the current directory in a tarball.
-  nixosTarball = makeTarball "nixos.tar.bz2" (cleanSource ../../..);
-
-  # Put Nixpkgs in a tarball.
-  nixpkgsTarball = makeTarball "nixpkgs.tar.bz2" (cleanSource <nixpkgs>);
-
   includeSources = true;
 
 in
@@ -48,19 +46,14 @@ in
 
   boot.postBootCommands =
     ''
-      export PATH=${pkgs.gnutar}/bin:${pkgs.bzip2}/bin:$PATH
-
       # Provide the NixOS/Nixpkgs sources in /etc/nixos.  This is required
       # for nixos-install.
       ${optionalString includeSources ''
         echo "unpacking the NixOS/Nixpkgs sources..."
-        mkdir -p /etc/nixos/nixos
-        tar xjf ${nixosTarball}/nixos.tar.bz2 -C /etc/nixos/nixos
-        mkdir -p /etc/nixos/nixpkgs
-        tar xjf ${nixpkgsTarball}/nixpkgs.tar.bz2 -C /etc/nixos/nixpkgs
-        chown -R root.root /etc/nixos
-        echo -n ${config.system.nixosVersion} > /etc/nixos/nixos/.version
-        echo -n "" > /etc/nixos/nixos/.version-suffix
+        mkdir -p /nix/var/nix/profiles/per-user/root
+        ${config.environment.nix}/bin/nix-env -p /nix/var/nix/profiles/per-user/root/channels -i ${channelSources} --quiet
+        mkdir -m 0700 -p /root/.nix-defexpr
+        ln -s /nix/var/nix/profiles/per-user/root/channels /root/.nix-defexpr/channels
      ''}
 
      # Make the installer more likely to succeed in low memory
diff --git a/modules/installer/tools/nixos-install.sh b/modules/installer/tools/nixos-install.sh
index ebe3413de2f..8cdef4f78a3 100644
--- a/modules/installer/tools/nixos-install.sh
+++ b/modules/installer/tools/nixos-install.sh
@@ -103,7 +103,7 @@ export LC_TIME=
 
 # Create a temporary Nix config file that causes the nixbld users to
 # be used.
-echo "build-users-group = nixbld" > /mnt/tmp/nix.conf
+echo "build-users-group = nixbld" > $mountPoint/tmp/nix.conf
 export NIX_CONF_DIR=/tmp
 
 
@@ -141,45 +141,32 @@ for i in /nix/var/nix/manifests/*.nixmanifest; do
 done
 
 
+# Get the absolute path to the NixOS/Nixpkgs sources.
+srcs=$(nix-env -p /nix/var/nix/profiles/per-user/root/channels -q nixos --no-name --out-path)
+
+
 # Build the specified Nix expression in the target store and install
 # it into the system configuration profile.
 echo "building the system configuration..."
-NIX_PATH=nixpkgs=/mnt/etc/nixos/nixpkgs:nixos=/mnt/etc/nixos/nixos:nixos-config="/mnt$NIXOS_CONFIG" NIXOS_CONFIG= \
+NIX_PATH="/mnt$srcs/nixos:nixos-config=/mnt$NIXOS_CONFIG" NIXOS_CONFIG= \
     chroot $mountPoint @nix@/bin/nix-env \
     -p /nix/var/nix/profiles/system -f '<nixos>' --set -A system --show-trace
 
 
-# Get rid of the manifests.
-rm -f $mountPoint/nix/var/nix/manifests/*
-
-
 # We're done building/downloading, so we don't need the /etc bind
 # mount anymore.  In fact, below we want to modify the target's /etc.
 umount $mountPoint/etc/nixos
 umount $mountPoint/etc
 
 
-# Make a backup of the old NixOS/Nixpkgs sources.
-echo "copying NixOS/Nixpkgs sources to /etc/nixos...."
-
-backupTimestamp=$(date "+%Y%m%d%H%M%S")
-
-targetNixos=$mountPoint/etc/nixos/nixos
-if test -e $targetNixos; then
-    mv $targetNixos $targetNixos.backup-$backupTimestamp
-fi
-
-targetNixpkgs=$mountPoint/etc/nixos/nixpkgs
-if test -e $targetNixpkgs; then
-    mv $targetNixpkgs $targetNixpkgs.backup-$backupTimestamp
-fi
-
-
-# Copy the NixOS/Nixpkgs sources to the target.
-cp -prd /etc/nixos/nixos $targetNixos
-if [ -e /etc/nixos/nixpkgs ]; then
-    cp -prd /etc/nixos/nixpkgs $targetNixpkgs
-fi
+# Copy the NixOS/Nixpkgs sources to the target as the initial contents
+# of the NixOS channel.
+echo "copying NixOS/Nixpkgs sources..."
+mkdir -p $mountPoint/nix/var/nix/profiles/per-user/root
+chroot $mountPoint @nix@/bin/nix-env \
+    -p /nix/var/nix/profiles/per-user/root/channels -i "$srcs" --quiet
+mkdir -m 0700 -p $mountPoint/root/.nix-defexpr
+ln -s /nix/var/nix/profiles/per-user/root/channels $mountPoint/root/.nix-defexpr/channels
 
 
 # Grub needs an mtab.
diff --git a/modules/profiles/installation-device.nix b/modules/profiles/installation-device.nix
index 60bd20d3970..83416f49d88 100644
--- a/modules/profiles/installation-device.nix
+++ b/modules/profiles/installation-device.nix
@@ -29,7 +29,7 @@ let
   relocatedModuleFiles =
     let
       relocateNixOS = path:
-        "/etc/nixos/nixos" + removePrefix nixosPath (toString path);
+        "<nixos" + removePrefix nixosPath (toString path) + ">";
       relocateOthers = null;
     in
       { nixos = map relocateNixOS partitionedModuleFiles.nixos;
@@ -44,16 +44,12 @@ let
   # evaluated.  So we'll just hope for the best.
   configClone = pkgs.writeText "configuration.nix"
     ''
-      {config, pkgs, ...}:
+      { config, pkgs, ... }:
 
       {
         require = [
           ${toString config.installer.cloneConfigIncludes}
         ];
-
-        # Add your own options below and run "nixos-rebuild switch".
-        # E.g.,
-        #   services.openssh.enable = true;
       }
     '';
 in
@@ -84,18 +80,6 @@ in
       '';
     };
 
-    # Ignored. Kept for Backward compatibiliy.
-    # you can retrieve the profiles which have been used by looking at the
-    # list of modules use to configure the installation device.
-    installer.configModule = mkOption {
-      example = "./nixos/modules/installer/cd-dvd/installation-cd.nix";
-      description = ''
-        Filename of the configuration module that builds the CD
-        configuration.  Must be specified to support reconfiguration
-        in live CDs.
-      '';
-    };
-    
   };
 
   config = {
@@ -148,5 +132,13 @@ in
     # Enable wpa_supplicant, but don't start it by default.
     networking.wireless.enable = true;
     jobs.wpa_supplicant.startOn = pkgs.lib.mkOverride 50 "";
+
+    # Tell the Nix evaluator to garbage collect more aggressively.
+    # This is desirable in memory-constrained environments that don't
+    # (yet) have swap set up.
+    environment.shellInit =
+      ''
+        export GC_INITIAL_HEAP_SIZE=100000
+      '';
   };
 }
diff --git a/modules/services/misc/nix-daemon.nix b/modules/services/misc/nix-daemon.nix
index d2584c2dc3e..be699d693fd 100644
--- a/modules/services/misc/nix-daemon.nix
+++ b/modules/services/misc/nix-daemon.nix
@@ -28,11 +28,10 @@ in
 
     environment.nix = mkOption {
       default = pkgs.nixUnstable;
-      example = pkgs.nixCustomFun /root/nix.tar.gz;
       merge = mergeOneOption;
-      description = "
+      description = ''
         This option specifies the Nix package instance to use throughout the system.
-      ";
+      '';
     };
 
     nix = {
diff --git a/release.nix b/release.nix
index 2ee090f86ae..11276fa695a 100644
--- a/release.nix
+++ b/release.nix
@@ -114,11 +114,7 @@ let
 
         buildInputs = [ nixUnstable ];
 
-        expr =
-          ''
-            { system ? builtins.currentSystem }:
-            { pkgs = (import nixpkgs/default.nix { inherit system; }) // { recurseForDerivations = true; }; }
-          '';
+        expr = builtins.readFile lib/channel-expr.nix;
 
         distPhase = ''
           echo -n $VERSION_SUFFIX > .version-suffix
@@ -128,7 +124,6 @@ let
           cp -prd . ../$releaseName/nixos
           cp -prd ${nixpkgs} ../$releaseName/nixpkgs
           echo "$expr" > ../$releaseName/default.nix
-          echo nixos > ../$releaseName/channel-name
           NIX_STATE_DIR=$TMPDIR nix-env -f ../$releaseName/default.nix -qaP --meta --xml \* > /dev/null
           cd ..
           chmod -R u+w $releaseName
diff --git a/tests/installer.nix b/tests/installer.nix
index 73cf6312f59..b64a24c1e3f 100644
--- a/tests/installer.nix
+++ b/tests/installer.nix
@@ -131,7 +131,7 @@ let
 
         # Test nix-env.
         $machine->mustFail("hello");
-        $machine->mustSucceed("nix-env -f /etc/nixos/nixpkgs -i hello");
+        $machine->mustSucceed("nix-env -i hello");
         $machine->mustSucceed("hello") =~ /Hello, world/
             or die "bad `hello' output";
       ''}
@@ -175,7 +175,7 @@ let
       # !!! Idem.
       $machine->waitUntilSucceeds("cat /proc/swaps | grep -q /dev");
 
-      $machine->mustSucceed("nix-env -f /etc/nixos/nixpkgs -i coreutils >&2");
+      $machine->mustSucceed("nix-env -i coreutils >&2");
       $machine->mustSucceed("type -tP ls | tee /dev/stderr") =~ /.nix-profile/
           or die "nix-env failed";
 
-- 
GitLab


From ac4a059f8a2342c26ab077ea9ca0e6309f3d1b3d Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 23 Apr 2012 15:47:03 +0000
Subject: [PATCH 3634/5331] =?UTF-8?q?*=20Put=20old=20NixOS=20configuration?=
 =?UTF-8?q?s=20in=20a=20GRUB=20submenu.=20=20Contributed=20by=20=20=20Andr?=
 =?UTF-8?q?eas=20K=C3=A4llberg.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

svn path=/nixos/trunk/; revision=33891
---
 modules/installer/grub/grub-menu-builder.sh | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/modules/installer/grub/grub-menu-builder.sh b/modules/installer/grub/grub-menu-builder.sh
index 59c35c91179..f0e9fdb288c 100644
--- a/modules/installer/grub/grub-menu-builder.sh
+++ b/modules/installer/grub/grub-menu-builder.sh
@@ -269,6 +269,12 @@ for link in $((ls -d $defaultConfig/fine-tune/* ) | sort -n); do
     addEntry "NixOS - variation" $link ""
 done
 
+if [ "$grubVersion" = 2 ]; then
+    cat >> $tmp <<EOF
+submenu "NixOS - Old configurations" {
+EOF
+fi
+
 for generation in $(
     (cd /nix/var/nix/profiles && for i in system-*-link; do echo $i; done) \
     | sed 's/system-\([0-9]\+\)-link/\1/' \
@@ -280,6 +286,12 @@ for generation in $(
     addEntry "NixOS - Configuration $generation ($date - ${nixosVersion:-$kernelVersion})" $link "$generation ($date)"
 done
 
+if [ "$grubVersion" = 2 ]; then
+    cat >> $tmp <<EOF
+}
+EOF
+fi
+
 
 # Atomically update the GRUB configuration file.
 mv $tmp $target
-- 
GitLab


From a98ad26feacb5986cfb90faddee35f09dbd80f55 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Tue, 24 Apr 2012 12:54:42 +0000
Subject: [PATCH 3635/5331] GNU: Comment `fdisk' out.

svn path=/nixos/trunk/; revision=33907
---
 modules/config/gnu.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/modules/config/gnu.nix b/modules/config/gnu.nix
index 760f90ff2ea..5c84d90932a 100644
--- a/modules/config/gnu.nix
+++ b/modules/config/gnu.nix
@@ -19,7 +19,9 @@ with pkgs.lib;
     environment.systemPackages = with pkgs;
       # TODO: Adjust `requiredPackages' from `system-path.nix'.
       # TODO: Add Inetutils once it has the new `ifconfig'.
-      [ parted fdisk
+      [ parted
+        #fdisk  # XXX: GNU fdisk currently fails to build and it's redundant
+                # with the `parted' command.
         nano zile
         texinfo # for the stand-alone Info reader
       ]
-- 
GitLab


From d4c202b3115ab7d9f58bd4ef1d965b17e47630cb Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 24 Apr 2012 15:14:26 +0000
Subject: [PATCH 3636/5331] * Remove redundant section on building the
 installation CD.

svn path=/nixos/trunk/; revision=33909
---
 doc/manual/development.xml  |  4 ++-
 doc/manual/installation.xml | 55 -------------------------------------
 2 files changed, 3 insertions(+), 56 deletions(-)

diff --git a/doc/manual/development.xml b/doc/manual/development.xml
index 8318c0bd04a..621e9fd4ffe 100644
--- a/doc/manual/development.xml
+++ b/doc/manual/development.xml
@@ -335,11 +335,13 @@ $ mount -o loop -t iso9660 ./result/iso/cd.iso /mnt/iso</screen>
 
 </section>
 
+
+<!--===============================================================-->
+
 <section>
 
 <title>Testing the installer</title>
 
-
 <para>Building, burning, and booting from an installation CD is rather
 tedious, so here is a quick way to see if the installer works
 properly:
diff --git a/doc/manual/installation.xml b/doc/manual/installation.xml
index d9354b88ec0..e5921492069 100644
--- a/doc/manual/installation.xml
+++ b/doc/manual/installation.xml
@@ -4,61 +4,6 @@
 <title>Installation</title>
 
 
-<!--===============================================================-->
-
-<section>
-
-<title>Building the installation CD</title>
-
-<para>Instead of building an installation CD, you could just download
-one from <link xlink:href="http://nixos.org/nixos/"/>.  If you want
-(or need) to build it yourself:
-
-<orderedlist>
-
-  <listitem><para>Make sure that you have a <emphasis>very</emphasis>
-  recent pre-release version of Nix installed (<link
-  xlink:href="http://nixos.org/releases/nix/nix-unstable/"/>).
-  The NixOS Nix expressions frequently use bleeding-edge features.  If
-  you get any kind of expression evaluation error, try to upgrade your
-  Nix.</para></listitem>
-
-  <listitem><para>Optional but strongly recommended (and currently
-  <emphasis>required</emphasis> for building the
-  <literal>x86_64</literal> ISO): subscribe/pull from the Nixpkgs
-  channel to speed up building, i.e.,
-
-<screen>
-$ nix-channel --add http://nixos.org/releases/nixpkgs/channels/nixpkgs-unstable
-$ nix-channel --update</screen>
-
-  </para></listitem>
-
-  <listitem><para>Check out NixOS from <link
-  xlink:href="https://nixos.org/repos/nix/nixos/trunk"/> as
-  <literal>nixos</literal>.</para></listitem>
-
-  <listitem><para>Check out Nixpkgs from
-  <link xlink:href="https://nixos.org/repos/nix/nixpkgs/trunk"/> as
-  <literal>nixpkgs</literal>.</para></listitem>
-
-  <listitem><para>Build the ISO image:
-
-<screen>
-$ nix-build ./nixos/release.nix -A iso_minimal.iso</screen>
-
-  If everything goes well, you’ll end up with an ISO image in
-  <filename>./result/iso/nixos-<replaceable>version</replaceable>-<replaceable>platform</replaceable>.iso</filename>
-  that you can burn onto a CD or attach to a virtual CD-ROM drive in
-  your favourite virtual machine software.</para></listitem>
-
-</orderedlist>
-
-</para>
-
-</section>
-
-
 <!--===============================================================-->
 
 <section>
-- 
GitLab


From e3470145e080646774f022e12ce69c96c9757fc8 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 24 Apr 2012 15:19:24 +0000
Subject: [PATCH 3637/5331] * Fix some links.

svn path=/nixos/trunk/; revision=33910
---
 doc/manual/manual.xml | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/doc/manual/manual.xml b/doc/manual/manual.xml
index b12b6175c61..ff08a577ca0 100644
--- a/doc/manual/manual.xml
+++ b/doc/manual/manual.xml
@@ -42,8 +42,11 @@
     NixOS is very much a work in progress, you are likely to encounter
     problems here and there.  Extensive familiarity with Linux is
     recommended.  If you encounter problems, please report them on the
-    <literal>nix-dev@cs.uu.nl</literal> mailing list or on <link
-    xlink:href="irc://irc.freenode.net/#nixos" />.</para>
+    <literal
+    xlink:href="http://lists.science.uu.nl/mailman/listinfo/nix-dev">nix-dev@lists.science.uu.nl</literal>
+    mailing list or on <link
+    xlink:href="irc://irc.freenode.net/#nixos">the
+    <literal>#nixos</literal> channel on Freenode.</link>.</para>
     
   </preface>
   
-- 
GitLab


From 43215ff80f7a3eae51f351842021ca9fcd4cc8a3 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 25 Apr 2012 14:14:20 +0000
Subject: [PATCH 3638/5331] =?UTF-8?q?*=20In=20the=20implementation=20of=20?=
 =?UTF-8?q?the=20=E2=80=98authorizedKeys=E2=80=99,=20don't=20delete=20all?=
 =?UTF-8?q?=20=20=20lines=20below=20a=20certain=20marker.=20=20This=20is?=
 =?UTF-8?q?=20undesirable=20because=20commands=20=20=20like=20"ssh-copy-id?=
 =?UTF-8?q?"=20add=20keys=20to=20the=20end=20of=20the=20file.=20=20Instead?=
 =?UTF-8?q?=20mark=20=20=20all=20automatically=20added=20lines=20individua?=
 =?UTF-8?q?lly.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

svn path=/nixos/trunk/; revision=33918
---
 modules/services/networking/ssh/sshd.nix | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/modules/services/networking/ssh/sshd.nix b/modules/services/networking/ssh/sshd.nix
index cdb18f9e94e..a47170fb8a7 100644
--- a/modules/services/networking/ssh/sshd.nix
+++ b/modules/services/networking/ssh/sshd.nix
@@ -73,7 +73,7 @@ let
 
   mkAuthkeyScript =
     let
-      marker1 = "### NixOS will regenerate this line and every line below it.";
+      marker1 = "### NixOS auto-added key. Do not edit!";
       marker2 = "### NixOS will regenerate this file. Do not edit!";
       users = map (userName: getAttr userName config.users.extraUsers) (attrNames config.users.extraUsers);
       usersWithKeys = flip filter users (u:
@@ -98,7 +98,7 @@ let
 
         for f in $authKeyFiles; do
           if [ -f "$f" ]; then
-            authKeys="$(${pkgs.coreutils}/bin/cat "$f"),$authKeys"
+            authKeys="$(${pkgs.coreutils}/bin/cat "$f") ${marker1},$authKeys"
           fi
         done
 
@@ -110,8 +110,7 @@ let
             rm -f "$authfile"
             authKeys="${marker2},$authKeys"
           else
-            ${pkgs.gnused}/bin/sed -i '/^### NixOS.*$/,$d' "$authfile"
-            authKeys="${marker1},$authKeys"
+            ${pkgs.gnused}/bin/sed -i '/${marker1}/ d' "$authfile"
           fi
           for key in $authKeys; do ${pkgs.coreutils}/bin/echo "$key" >> "$authfile"; done
         fi
-- 
GitLab


From e6fd0fa893816778e2cc3953dda4bbbc972fd243 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 25 Apr 2012 15:44:47 +0000
Subject: [PATCH 3639/5331] * Cleanup.

svn path=/nixos/trunk/; revision=33921
---
 modules/services/networking/ssh/sshd.nix | 41 +++++++++++++-----------
 1 file changed, 22 insertions(+), 19 deletions(-)

diff --git a/modules/services/networking/ssh/sshd.nix b/modules/services/networking/ssh/sshd.nix
index a47170fb8a7..7c0645c0999 100644
--- a/modules/services/networking/ssh/sshd.nix
+++ b/modules/services/networking/ssh/sshd.nix
@@ -82,7 +82,7 @@ let
       userLoop = flip concatMapStrings usersWithKeys (u:
         let
           authKeys = concatStringsSep "," u.openssh.authorizedKeys.keys;
-          authKeyFiles = concatStringsSep "," u.openssh.authorizedKeys.keyFiles;
+          authKeyFiles = concatStringsSep " " u.openssh.authorizedKeys.keyFiles;
           preserveExisting = if u.openssh.authorizedKeys.preserveExistingKeys then "true" else "false";
         in ''
           mkAuthKeysFile "${u.name}" "${authKeys}" "${authKeyFiles}" "${preserveExisting}"
@@ -94,29 +94,30 @@ let
         local authKeys="$2"
         local authKeyFiles="$3"
         local preserveExisting="$4"
-        IFS=","
 
+        eval authfile=~$userName/.ssh/authorized_keys
+        mkdir -p "$(dirname $authfile)"
+        touch "$authfile"
+        if [ "$preserveExisting" == false ]; then
+          rm -f "$authfile"
+          echo "${marker2}" > "$authfile"
+        else
+          sed -i '/${marker1}/ d' "$authfile"
+        fi
+        IFS=,
+        for f in $authKeys; do
+          echo "$f ${marker1}" >> "$authfile"
+        done
+        unset IFS
         for f in $authKeyFiles; do
           if [ -f "$f" ]; then
-            authKeys="$(${pkgs.coreutils}/bin/cat "$f") ${marker1},$authKeys"
+            echo "$(cat "$f") ${marker1}" >> "$authfile"
           fi
         done
-
-        if [ -n "$authKeys" ]; then
-          eval authfile=~$userName/.ssh/authorized_keys
-          ${pkgs.coreutils}/bin/mkdir -p "$(dirname $authfile)"
-          ${pkgs.coreutils}/bin/touch "$authfile"
-          if [ "$preserveExisting" == "false" ]; then
-            rm -f "$authfile"
-            authKeys="${marker2},$authKeys"
-          else
-            ${pkgs.gnused}/bin/sed -i '/${marker1}/ d' "$authfile"
-          fi
-          for key in $authKeys; do ${pkgs.coreutils}/bin/echo "$key" >> "$authfile"; done
-        fi
-
-        unset IFS
       }
+
+      exec >> /tmp/log 2>&1
+      set -x
       ${userLoop}
     '';
 
@@ -256,6 +257,8 @@ in
           LOCALE_ARCHIVE = "/var/run/current-system/sw/lib/locale/locale-archive";
         };
 
+        path = [ pkgs.openssh pkgs.gnused ];
+
         preStart =
           ''
             ${mkAuthkeyScript}
@@ -263,7 +266,7 @@ in
             mkdir -m 0755 -p /etc/ssh
 
             if ! test -f /etc/ssh/ssh_host_${hktn}_key; then
-                ${pkgs.openssh}/bin/ssh-keygen -t ${hktn} -b ${toString hktb} -f /etc/ssh/ssh_host_${hktn}_key -N ""
+                ssh-keygen -t ${hktn} -b ${toString hktb} -f /etc/ssh/ssh_host_${hktn}_key -N ""
             fi
           '';
 
-- 
GitLab


From ee2fcb645bf30ec8bef5c4e49f460070befeae03 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 26 Apr 2012 08:13:21 +0000
Subject: [PATCH 3640/5331] modules/services/networking/ssh/sshd.nix: don't
 write debug output to /tmp/log

svn path=/nixos/trunk/; revision=33925
---
 modules/services/networking/ssh/sshd.nix | 2 --
 1 file changed, 2 deletions(-)

diff --git a/modules/services/networking/ssh/sshd.nix b/modules/services/networking/ssh/sshd.nix
index 7c0645c0999..cf02ab4fbba 100644
--- a/modules/services/networking/ssh/sshd.nix
+++ b/modules/services/networking/ssh/sshd.nix
@@ -116,8 +116,6 @@ let
         done
       }
 
-      exec >> /tmp/log 2>&1
-      set -x
       ${userLoop}
     '';
 
-- 
GitLab


From 86ba0c52b33da32c0870673bab7e285b31688968 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 26 Apr 2012 08:13:24 +0000
Subject: [PATCH 3641/5331] modules/services/networking/ssh/sshd.nix: stripped
 trailing whitespace

svn path=/nixos/trunk/; revision=33926
---
 modules/services/networking/ssh/sshd.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/services/networking/ssh/sshd.nix b/modules/services/networking/ssh/sshd.nix
index cf02ab4fbba..ce7ecd3af8c 100644
--- a/modules/services/networking/ssh/sshd.nix
+++ b/modules/services/networking/ssh/sshd.nix
@@ -309,7 +309,7 @@ in
         ChallengeResponseAuthentication ${if cfg.challengeResponseAuthentication then "yes" else "no"}
       '';
 
-    assertions = [{ assertion = if cfg.forwardX11 then cfgc.setXAuthLocation else true; 
+    assertions = [{ assertion = if cfg.forwardX11 then cfgc.setXAuthLocation else true;
                     message = "cannot enable X11 forwarding without setting xauth location";}];
   };
 
-- 
GitLab


From 8c93993e1bd65d4e661582e82a4848a5edf6b1ce Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 26 Apr 2012 12:21:45 +0000
Subject: [PATCH 3642/5331] modules/system/boot/luksroot.nix: fixed the
 descriptions of the options defined in this module

svn path=/nixos/trunk/; revision=33927
---
 modules/system/boot/luksroot.nix | 13 +++----------
 1 file changed, 3 insertions(+), 10 deletions(-)

diff --git a/modules/system/boot/luksroot.nix b/modules/system/boot/luksroot.nix
index 9af2c0080a3..9a2ef786063 100644
--- a/modules/system/boot/luksroot.nix
+++ b/modules/system/boot/luksroot.nix
@@ -57,26 +57,19 @@ in
         name = mkOption {
           example = "luksroot";
           type = types.string;
-          description = ''
-            Name of the interface.
-          '';
+          description = "Named to be used for the generated device in /dev/mapper.";
         };
 
         device = mkOption {
           example = "/dev/sda2";
           type = types.string;
-          description = ''
-            IP address of the interface.  Leave empty to configure the
-            interface using DHCP.
-          '';
+          description = "Path of the underlying block device."
         };
 
         preLVM = mkOption {
           default = true;
           type = types.bool;
-          description = ''
-            Whether the luksOpen will be attempted before LVM scan or after it.
-          '';
+          description = "Whether the luksOpen will be attempted before LVM scan or after it.";
         };
       };
     };
-- 
GitLab


From 8b841505ff16054f87be6f760d3ce7f1efb9e27b Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 26 Apr 2012 12:31:33 +0000
Subject: [PATCH 3643/5331] modules/services/networking/{dhclient,dhcpcd}.nix:
 ignore virtual veth* devices created by LXC/cgroups

svn path=/nixos/trunk/; revision=33928
---
 modules/services/networking/dhclient.nix | 4 ++--
 modules/services/networking/dhcpcd.nix   | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/modules/services/networking/dhclient.nix b/modules/services/networking/dhclient.nix
index 1e343443899..dc663e33289 100644
--- a/modules/services/networking/dhclient.nix
+++ b/modules/services/networking/dhclient.nix
@@ -63,10 +63,10 @@ in
                 # (1), i.e. Ethernet.  Ignore peth* devices; on Xen,
                 # they're renamed physical Ethernet cards used for
                 # bridging.  Likewise for vif* and tap* (Xen) and
-                # virbr* and vnet* (libvirt).
+                # virbr* and vnet* (libvirt) and veth* (cgroup).
                 if [ "$(cat /sys/class/net/$i/type)" = 1 ]; then
                     if ! for j in ${toString ignoredInterfaces}; do echo $j; done | grep -F -x -q "$i" &&
-                       ! echo "$i" | grep -x -q "peth.*\|vif.*\|tap.*\|virbr.*\|vnet.*";
+                       ! echo "$i" | grep -x -q "peth.*\|vif.*\|tap.*\|virbr.*\|vnet.*\|veth.*";
 		    then
                         echo "Running dhclient on $i"
                         interfaces="$interfaces $i"
diff --git a/modules/services/networking/dhcpcd.nix b/modules/services/networking/dhcpcd.nix
index b22bbb3f051..ddc18374e5c 100644
--- a/modules/services/networking/dhcpcd.nix
+++ b/modules/services/networking/dhcpcd.nix
@@ -31,8 +31,8 @@ let
 
       # Ignore peth* devices; on Xen, they're renamed physical
       # Ethernet cards used for bridging.  Likewise for vif* and tap*
-      # (Xen) and virbr* and vnet* (libvirt).
-      denyinterfaces ${toString ignoredInterfaces} peth* vif* tap* tun* virbr* vnet* vboxnet*
+      # (Xen) and virbr* and vnet* (libvirt) and veth* (cgroups).
+      denyinterfaces ${toString ignoredInterfaces} peth* vif* tap* tun* virbr* vnet* vboxnet* veth*
     '';
 
   # Hook for emitting ip-up/ip-down events.
-- 
GitLab


From 4d07f159a100f586d649eebb1f10d9a708b2ba10 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 26 Apr 2012 13:16:58 +0000
Subject: [PATCH 3644/5331] * Create /nix/var/nix/profiles/per-user with the
 right permissions.   Fixes NixOS/149.

svn path=/nixos/trunk/; revision=33929
---
 modules/installer/tools/nixos-install.sh | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/modules/installer/tools/nixos-install.sh b/modules/installer/tools/nixos-install.sh
index 8cdef4f78a3..836e5562ba5 100644
--- a/modules/installer/tools/nixos-install.sh
+++ b/modules/installer/tools/nixos-install.sh
@@ -162,7 +162,9 @@ umount $mountPoint/etc
 # Copy the NixOS/Nixpkgs sources to the target as the initial contents
 # of the NixOS channel.
 echo "copying NixOS/Nixpkgs sources..."
-mkdir -p $mountPoint/nix/var/nix/profiles/per-user/root
+mkdir -m 0755 -p $mountPoint/nix/var/nix/profiles
+mkdir -m 1777 -p $mountPoint/nix/var/nix/profiles/per-user
+mkdir -m 0755 -p $mountPoint/nix/var/nix/profiles/per-user/root
 chroot $mountPoint @nix@/bin/nix-env \
     -p /nix/var/nix/profiles/per-user/root/channels -i "$srcs" --quiet
 mkdir -m 0700 -p $mountPoint/root/.nix-defexpr
-- 
GitLab


From 836fa3b6aef7ed94c750f68c58cadf1955c7522b Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 26 Apr 2012 14:53:58 +0000
Subject: [PATCH 3645/5331] * Fix missing semicolon.

svn path=/nixos/trunk/; revision=33933
---
 modules/system/boot/luksroot.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/system/boot/luksroot.nix b/modules/system/boot/luksroot.nix
index 9a2ef786063..7f9898770a9 100644
--- a/modules/system/boot/luksroot.nix
+++ b/modules/system/boot/luksroot.nix
@@ -63,7 +63,7 @@ in
         device = mkOption {
           example = "/dev/sda2";
           type = types.string;
-          description = "Path of the underlying block device."
+          description = "Path of the underlying block device.";
         };
 
         preLVM = mkOption {
-- 
GitLab


From 03f2847054901c93edd2a1c6613625e8efca3d17 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 26 Apr 2012 15:19:23 +0000
Subject: [PATCH 3646/5331] * Set preferLocalBuild on a few trivial top-level
 derivations.  These   tend to cause a lot of unnecessary I/O to the build
 machines.

svn path=/nixos/trunk/; revision=33936
---
 modules/system/activation/top-level.nix | 1 +
 modules/system/upstart/upstart.nix      | 2 +-
 modules/virtualisation/qemu-vm.nix      | 3 ++-
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/modules/system/activation/top-level.nix b/modules/system/activation/top-level.nix
index 6ebc1fd68e1..9557c12aca7 100644
--- a/modules/system/activation/top-level.nix
+++ b/modules/system/activation/top-level.nix
@@ -147,6 +147,7 @@ let
   # and makes it bootable.
   system = pkgs.stdenv.mkDerivation {
     name = "nixos-${config.system.nixosVersion}";
+    preferLocalBuild = true;
     buildCommand = systemBuilder;
     inherit children;
     kernelParams =
diff --git a/modules/system/upstart/upstart.nix b/modules/system/upstart/upstart.nix
index 5a5f6016b57..1bfde9fc60e 100644
--- a/modules/system/upstart/upstart.nix
+++ b/modules/system/upstart/upstart.nix
@@ -135,7 +135,7 @@ let
 
     in
       pkgs.runCommand ("upstart-" + job.name + ".conf")
-        { inherit (job) buildHook; inherit jobText; }
+        { inherit (job) buildHook; inherit jobText; preferLocalBuild = true; }
         ''
           eval "$buildHook"
           echo "$jobText" > $out
diff --git a/modules/virtualisation/qemu-vm.nix b/modules/virtualisation/qemu-vm.nix
index 9596822cd8f..add88753f00 100644
--- a/modules/virtualisation/qemu-vm.nix
+++ b/modules/virtualisation/qemu-vm.nix
@@ -184,6 +184,7 @@ let
     { exportReferencesGraph =
         map (x: [("closure-" + baseNameOf x) x]) config.virtualisation.pathsInNixDB;
       buildInputs = [ pkgs.perl ];
+      preferLocalBuild = true;
     }
     ''
       printRegistration=1 perl ${pkgs.pathsFromGraph} closure-* > $out
@@ -353,7 +354,7 @@ in
   # Don't run ntpd in the guest.  It should get the correct time from KVM.
   services.ntp.enable = false;
 
-  system.build.vm = pkgs.runCommand "nixos-vm" {}
+  system.build.vm = pkgs.runCommand "nixos-vm" { preferLocalBuild = true; }
     ''
       ensureDir $out/bin
       ln -s ${config.system.build.toplevel} $out/system
-- 
GitLab


From 387f1d60328fed3398a91ce314e526cf411f81fb Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 27 Apr 2012 08:47:51 +0000
Subject: [PATCH 3647/5331] * Forgot to commit.

svn path=/nixos/trunk/; revision=33938
---
 lib/testing.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lib/testing.nix b/lib/testing.nix
index c8e3d7bbc97..704ee4025a5 100644
--- a/lib/testing.nix
+++ b/lib/testing.nix
@@ -142,6 +142,7 @@ rec {
     driver = runCommand "nixos-test-driver"
       { buildInputs = [ makeWrapper];
         inherit testScript;
+        preferLocalBuild = true;
       }
       ''
         mkdir -p $out/bin
-- 
GitLab


From be189991e0fc973cca908fa44955a6374504da84 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 30 Apr 2012 17:46:11 +0000
Subject: [PATCH 3648/5331] * Revert r33928: veth* can also be a bridged
 interface requiring dhcp.   See e.g.
 https://nixos.org/repos/nix/configurations/trunk/tud/stan.nix

  So we need a better solution for this...

svn path=/nixos/trunk/; revision=33957
---
 doc/manual/installation.xml              | 96 ++++++++++++++----------
 modules/services/networking/dhclient.nix |  4 +-
 modules/services/networking/dhcpcd.nix   |  4 +-
 3 files changed, 60 insertions(+), 44 deletions(-)

diff --git a/doc/manual/installation.xml b/doc/manual/installation.xml
index e5921492069..10912a26a03 100644
--- a/doc/manual/installation.xml
+++ b/doc/manual/installation.xml
@@ -4,6 +4,23 @@
 <title>Installation</title>
 
 
+<!--===============================================================-->
+
+<section>
+
+<title>Obtaining NixOS</title>
+
+<para>NixOS ISO images can be downloaded from the <link
+xlink:href="http://nixos.org/nixos/download.html">NixOS
+homepage</link>.  These can be burned onto a CD.  It is also possible
+to copy them onto a USB stick and install NixOS from there.  For
+details, see the <link
+xlink:href="https://nixos.org/wiki/Installing_NixOS_from_a_USB_stick">NixOS
+Wiki</link>.</para>
+
+</section>
+
+
 <!--===============================================================-->
 
 <section>
@@ -21,8 +38,8 @@
   <command>ifconfig</command>).  Networking is necessary for the
   installer, since it will download lots of stuff (such as source
   tarballs or Nixpkgs channel binaries).  It’s best if you have a DHCP
-  server on your network.  Otherwise configure
-  manually.</para></listitem>
+  server on your network.  Otherwise configure networking manually
+  using <command>ifconfig</command>.</para></listitem>
 
   <listitem><para>The NixOS manual is available on virtual console 8
   (press Alt+F8 to access).</para></listitem>
@@ -30,6 +47,9 @@
   <listitem><para>Login as <literal>root</literal>, empty
   password.</para></listitem>
 
+  <listitem><para>If you downloaded the graphical ISO image, you can
+  run <command>start xserver</command> to start KDE.</para></listitem>
+
   <listitem><para>The NixOS installer doesn’t do any partitioning or
   formatting yet, so you need to that yourself.  Use the following
   commands:
@@ -39,12 +59,9 @@
     <listitem><para>For partitioning:
     <command>fdisk</command>.</para></listitem>
     
-    <listitem><para>For initialising Ext2/Ext3 partitions:
-    <command>mke2fs</command>.  Ext3 is recommended; use the
-    <option>-j</option> to create a journalled file system.  For
-    faster access to the Nix store, you may also want to use the
-    <option>-O dir_index</option>.  It is also recommended that you
-    assign a unique symbolic label to the file system using the option
+    <listitem><para>For initialising Ext4 partitions:
+    <command>mkfs.ext4</command>.  It is recommended that you assign a
+    unique symbolic label to the file system using the option
     <option>-L <replaceable>label</replaceable></option>.  This will
     make the file system configuration independent from device
     changes.</para></listitem>
@@ -62,43 +79,42 @@ $ vgcreate MyVolGroup /dev/sda1 /dev/sdb1
 $ lvcreate --size 2G --name bigdisk MyVolGroup 
 $ lvcreate --size 1G --name smalldisk MyVolGroup</screen>
 
-    Possibly you’ll need to do <userinput>initctl start
-    lvm</userinput> after this (TODO: check whether this is
-    needed).</para></listitem>
+    </para></listitem>
 
-    <listitem><para>For creating software RAID devices:
+    <listitem><para>For creating software RAID devices, use
     <command>mdadm</command>.</para></listitem>
 
   </itemizedlist>
 
   </para></listitem>
     
-  <listitem><para>Mount the target file system on
-  <filename>/mnt</filename> on which NixOS would be installed.</para>
-  </listitem>
+  <listitem><para>Mount the target file system on which NixOS should
+  be installed on <filename>/mnt</filename>.</para></listitem>
 
   <listitem>
 
-    <para>Generate a template configuration for the target system:</para>
-
-    <para>The command <command>nixos-option</command> can
-    generate an initial configuration file for you, i.e.,
+    <para>You now need to create a file
+    <filename>/mnt/etc/nixos/configuration.nix</filename> that
+    specifies the intended configuration of the system.  This is
+    because NixOS has a <emphasis>declarative</emphasis> configuration
+    model: you create or edit a description of the configuration that
+    you want to be built and activated, and then NixOS takes care of
+    realising that configuration.  The command
+    <command>nixos-option</command> can generate an initial
+    configuration file for you:
 
 <screen>
 $ nixos-option --install</screen>
 
-    It tries to figure out the modules necessary for mounting the root
-    device, as well as various other hardware characteristics.
-    However, it doesn’t try to figure out the 
+    It tries to figure out the kernel modules necessary for mounting
+    the root device, as well as various other hardware
+    characteristics.  However, it doesn’t try to figure out the
     <option>fileSystems</option> option yet.</para>
 
-    <para>Edit <filename>/mnt/etc/nixos/configuration.nix</filename> to
-    configure your system.  The installation is declarative; you need to
-    write a description of the configuration that you want to be built and
-    activated.  The configuration is specified in a Nix expression and must
-    be stored <emphasis>on the target file system</emphasis>.  The text
-    editors <command>nano</command> and <command>vim</command> are
-    available.</para>
+    <para>You should edit
+    <filename>/mnt/etc/nixos/configuration.nix</filename> to suit your
+    needs.  The text editors <command>nano</command> and
+    <command>vim</command> are available.</para>
 
     <para>You need to specify a root file system in
     <option>fileSystems</option> and the target device for the Grub boot
@@ -110,12 +126,12 @@ $ nixos-option --install</screen>
     <option>boot.initrd.kernelModules</option> all kernel modules that
     are necessary for mounting the root file system, otherwise the
     installed system will not be able to boot.  (If this happens, boot
-    from CD again, mount the target file system on
+    from the CD again, mount the target file system on
     <filename>/mnt</filename>, fix
     <filename>/mnt/etc/nixos/configuration.nix</filename> and rerun
-    <filename>nixos-install</filename>.)
-    <command>nixos-hardware-scan</command> should figure out the
-    required modules in most cases.</para></note>
+    <filename>nixos-install</filename>.)  In most cases,
+    <command>nixos-option --install</command> will figure out the
+    required modules.</para></note>
 
     <para>Examples are available in
     <filename>/etc/nixos/nixos/doc/config-examples</filename> and some
@@ -123,13 +139,14 @@ $ nixos-option --install</screen>
     xlink:href="https://nixos.org/repos/nix/configurations/trunk/"/>.</para>
 
   </listitem>
-
+  
   <listitem><para>If your machine has a limited amount of memory, you
   may want to activate swap devices now (<command>swapon
   <replaceable>device</replaceable></command>).  The installer (or
   rather, the build actions that it may spawn) may need quite a bit of
   RAM, depending on your configuration.</para></listitem>
 
+  <!--
   <listitem><para>Optionally, you can run
 
 <screen>
@@ -137,6 +154,7 @@ $ nixos-checkout</screen>
 
   to make the installer use the latest NixOS/Nixpkgs sources from the
   Subversion repository, rather than the sources on CD.</para></listitem>
+  -->
 
   <listitem><para>Do the installation:
 
@@ -145,7 +163,7 @@ $ nixos-install</screen>
 
     Cross fingers.</para></listitem>
 
-    <listitem><para>If everything went well:
+  <listitem><para>If everything went well:
 
 <screen>
 $ reboot</screen>
@@ -159,7 +177,7 @@ $ reboot</screen>
     configurations</emphasis> (initially just one).  Every time you
     change the NixOS configuration (see <xref
     linkend="sec-changing-config" />), a new item appears in the menu.
-    This allows you to go back easily to another configuration if
+    This allows you to easily roll back to another configuration if
     something goes wrong.</para>
 
     <para>You should log in and change the <literal>root</literal>
@@ -192,10 +210,8 @@ $ nix-env -i w3m</screen>
 
 <para><xref linkend="ex-install-sequence" /> shows a typical sequence
 of commands for installing NixOS on an empty hard drive (here
-<filename>/dev/sda).  <xref linkend="ex-config" /> shows a
-corresponding configuration Nix expression.</filename>
-
-</para>
+<filename>/dev/sda</filename>).  <xref linkend="ex-config" /> shows a
+corresponding configuration Nix expression.</para>
 
 <example xml:id='ex-install-sequence'><title>Commands for installing NixOS on <filename>/dev/sda</filename></title>
 <screen>
diff --git a/modules/services/networking/dhclient.nix b/modules/services/networking/dhclient.nix
index dc663e33289..1e343443899 100644
--- a/modules/services/networking/dhclient.nix
+++ b/modules/services/networking/dhclient.nix
@@ -63,10 +63,10 @@ in
                 # (1), i.e. Ethernet.  Ignore peth* devices; on Xen,
                 # they're renamed physical Ethernet cards used for
                 # bridging.  Likewise for vif* and tap* (Xen) and
-                # virbr* and vnet* (libvirt) and veth* (cgroup).
+                # virbr* and vnet* (libvirt).
                 if [ "$(cat /sys/class/net/$i/type)" = 1 ]; then
                     if ! for j in ${toString ignoredInterfaces}; do echo $j; done | grep -F -x -q "$i" &&
-                       ! echo "$i" | grep -x -q "peth.*\|vif.*\|tap.*\|virbr.*\|vnet.*\|veth.*";
+                       ! echo "$i" | grep -x -q "peth.*\|vif.*\|tap.*\|virbr.*\|vnet.*";
 		    then
                         echo "Running dhclient on $i"
                         interfaces="$interfaces $i"
diff --git a/modules/services/networking/dhcpcd.nix b/modules/services/networking/dhcpcd.nix
index ddc18374e5c..b22bbb3f051 100644
--- a/modules/services/networking/dhcpcd.nix
+++ b/modules/services/networking/dhcpcd.nix
@@ -31,8 +31,8 @@ let
 
       # Ignore peth* devices; on Xen, they're renamed physical
       # Ethernet cards used for bridging.  Likewise for vif* and tap*
-      # (Xen) and virbr* and vnet* (libvirt) and veth* (cgroups).
-      denyinterfaces ${toString ignoredInterfaces} peth* vif* tap* tun* virbr* vnet* vboxnet* veth*
+      # (Xen) and virbr* and vnet* (libvirt).
+      denyinterfaces ${toString ignoredInterfaces} peth* vif* tap* tun* virbr* vnet* vboxnet*
     '';
 
   # Hook for emitting ip-up/ip-down events.
-- 
GitLab


From d3ce00bdc3443def638a9a522b676b779bfbc6b1 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 30 Apr 2012 17:47:32 +0000
Subject: [PATCH 3649/5331] * Revert unintended commit.

svn path=/nixos/trunk/; revision=33958
---
 doc/manual/installation.xml | 96 ++++++++++++++++---------------------
 1 file changed, 40 insertions(+), 56 deletions(-)

diff --git a/doc/manual/installation.xml b/doc/manual/installation.xml
index 10912a26a03..e5921492069 100644
--- a/doc/manual/installation.xml
+++ b/doc/manual/installation.xml
@@ -4,23 +4,6 @@
 <title>Installation</title>
 
 
-<!--===============================================================-->
-
-<section>
-
-<title>Obtaining NixOS</title>
-
-<para>NixOS ISO images can be downloaded from the <link
-xlink:href="http://nixos.org/nixos/download.html">NixOS
-homepage</link>.  These can be burned onto a CD.  It is also possible
-to copy them onto a USB stick and install NixOS from there.  For
-details, see the <link
-xlink:href="https://nixos.org/wiki/Installing_NixOS_from_a_USB_stick">NixOS
-Wiki</link>.</para>
-
-</section>
-
-
 <!--===============================================================-->
 
 <section>
@@ -38,8 +21,8 @@ Wiki</link>.</para>
   <command>ifconfig</command>).  Networking is necessary for the
   installer, since it will download lots of stuff (such as source
   tarballs or Nixpkgs channel binaries).  It’s best if you have a DHCP
-  server on your network.  Otherwise configure networking manually
-  using <command>ifconfig</command>.</para></listitem>
+  server on your network.  Otherwise configure
+  manually.</para></listitem>
 
   <listitem><para>The NixOS manual is available on virtual console 8
   (press Alt+F8 to access).</para></listitem>
@@ -47,9 +30,6 @@ Wiki</link>.</para>
   <listitem><para>Login as <literal>root</literal>, empty
   password.</para></listitem>
 
-  <listitem><para>If you downloaded the graphical ISO image, you can
-  run <command>start xserver</command> to start KDE.</para></listitem>
-
   <listitem><para>The NixOS installer doesn’t do any partitioning or
   formatting yet, so you need to that yourself.  Use the following
   commands:
@@ -59,9 +39,12 @@ Wiki</link>.</para>
     <listitem><para>For partitioning:
     <command>fdisk</command>.</para></listitem>
     
-    <listitem><para>For initialising Ext4 partitions:
-    <command>mkfs.ext4</command>.  It is recommended that you assign a
-    unique symbolic label to the file system using the option
+    <listitem><para>For initialising Ext2/Ext3 partitions:
+    <command>mke2fs</command>.  Ext3 is recommended; use the
+    <option>-j</option> to create a journalled file system.  For
+    faster access to the Nix store, you may also want to use the
+    <option>-O dir_index</option>.  It is also recommended that you
+    assign a unique symbolic label to the file system using the option
     <option>-L <replaceable>label</replaceable></option>.  This will
     make the file system configuration independent from device
     changes.</para></listitem>
@@ -79,42 +62,43 @@ $ vgcreate MyVolGroup /dev/sda1 /dev/sdb1
 $ lvcreate --size 2G --name bigdisk MyVolGroup 
 $ lvcreate --size 1G --name smalldisk MyVolGroup</screen>
 
-    </para></listitem>
+    Possibly you’ll need to do <userinput>initctl start
+    lvm</userinput> after this (TODO: check whether this is
+    needed).</para></listitem>
 
-    <listitem><para>For creating software RAID devices, use
+    <listitem><para>For creating software RAID devices:
     <command>mdadm</command>.</para></listitem>
 
   </itemizedlist>
 
   </para></listitem>
     
-  <listitem><para>Mount the target file system on which NixOS should
-  be installed on <filename>/mnt</filename>.</para></listitem>
+  <listitem><para>Mount the target file system on
+  <filename>/mnt</filename> on which NixOS would be installed.</para>
+  </listitem>
 
   <listitem>
 
-    <para>You now need to create a file
-    <filename>/mnt/etc/nixos/configuration.nix</filename> that
-    specifies the intended configuration of the system.  This is
-    because NixOS has a <emphasis>declarative</emphasis> configuration
-    model: you create or edit a description of the configuration that
-    you want to be built and activated, and then NixOS takes care of
-    realising that configuration.  The command
-    <command>nixos-option</command> can generate an initial
-    configuration file for you:
+    <para>Generate a template configuration for the target system:</para>
+
+    <para>The command <command>nixos-option</command> can
+    generate an initial configuration file for you, i.e.,
 
 <screen>
 $ nixos-option --install</screen>
 
-    It tries to figure out the kernel modules necessary for mounting
-    the root device, as well as various other hardware
-    characteristics.  However, it doesn’t try to figure out the
+    It tries to figure out the modules necessary for mounting the root
+    device, as well as various other hardware characteristics.
+    However, it doesn’t try to figure out the 
     <option>fileSystems</option> option yet.</para>
 
-    <para>You should edit
-    <filename>/mnt/etc/nixos/configuration.nix</filename> to suit your
-    needs.  The text editors <command>nano</command> and
-    <command>vim</command> are available.</para>
+    <para>Edit <filename>/mnt/etc/nixos/configuration.nix</filename> to
+    configure your system.  The installation is declarative; you need to
+    write a description of the configuration that you want to be built and
+    activated.  The configuration is specified in a Nix expression and must
+    be stored <emphasis>on the target file system</emphasis>.  The text
+    editors <command>nano</command> and <command>vim</command> are
+    available.</para>
 
     <para>You need to specify a root file system in
     <option>fileSystems</option> and the target device for the Grub boot
@@ -126,12 +110,12 @@ $ nixos-option --install</screen>
     <option>boot.initrd.kernelModules</option> all kernel modules that
     are necessary for mounting the root file system, otherwise the
     installed system will not be able to boot.  (If this happens, boot
-    from the CD again, mount the target file system on
+    from CD again, mount the target file system on
     <filename>/mnt</filename>, fix
     <filename>/mnt/etc/nixos/configuration.nix</filename> and rerun
-    <filename>nixos-install</filename>.)  In most cases,
-    <command>nixos-option --install</command> will figure out the
-    required modules.</para></note>
+    <filename>nixos-install</filename>.)
+    <command>nixos-hardware-scan</command> should figure out the
+    required modules in most cases.</para></note>
 
     <para>Examples are available in
     <filename>/etc/nixos/nixos/doc/config-examples</filename> and some
@@ -139,14 +123,13 @@ $ nixos-option --install</screen>
     xlink:href="https://nixos.org/repos/nix/configurations/trunk/"/>.</para>
 
   </listitem>
-  
+
   <listitem><para>If your machine has a limited amount of memory, you
   may want to activate swap devices now (<command>swapon
   <replaceable>device</replaceable></command>).  The installer (or
   rather, the build actions that it may spawn) may need quite a bit of
   RAM, depending on your configuration.</para></listitem>
 
-  <!--
   <listitem><para>Optionally, you can run
 
 <screen>
@@ -154,7 +137,6 @@ $ nixos-checkout</screen>
 
   to make the installer use the latest NixOS/Nixpkgs sources from the
   Subversion repository, rather than the sources on CD.</para></listitem>
-  -->
 
   <listitem><para>Do the installation:
 
@@ -163,7 +145,7 @@ $ nixos-install</screen>
 
     Cross fingers.</para></listitem>
 
-  <listitem><para>If everything went well:
+    <listitem><para>If everything went well:
 
 <screen>
 $ reboot</screen>
@@ -177,7 +159,7 @@ $ reboot</screen>
     configurations</emphasis> (initially just one).  Every time you
     change the NixOS configuration (see <xref
     linkend="sec-changing-config" />), a new item appears in the menu.
-    This allows you to easily roll back to another configuration if
+    This allows you to go back easily to another configuration if
     something goes wrong.</para>
 
     <para>You should log in and change the <literal>root</literal>
@@ -210,8 +192,10 @@ $ nix-env -i w3m</screen>
 
 <para><xref linkend="ex-install-sequence" /> shows a typical sequence
 of commands for installing NixOS on an empty hard drive (here
-<filename>/dev/sda</filename>).  <xref linkend="ex-config" /> shows a
-corresponding configuration Nix expression.</para>
+<filename>/dev/sda).  <xref linkend="ex-config" /> shows a
+corresponding configuration Nix expression.</filename>
+
+</para>
 
 <example xml:id='ex-install-sequence'><title>Commands for installing NixOS on <filename>/dev/sda</filename></title>
 <screen>
-- 
GitLab


From b603babd0f323ebc596f6101fa1fee584d411af9 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 30 Apr 2012 18:15:32 +0000
Subject: [PATCH 3650/5331] * Use PostgreSQL's fast shutdown mode.  In the
 default   smart shutdown mode, Postgres waits until all   active connections
 have closed, which can take an   unbounded amount of time.

svn path=/nixos/trunk/; revision=33959
---
 modules/services/databases/postgresql.nix | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/modules/services/databases/postgresql.nix b/modules/services/databases/postgresql.nix
index 8ef272404e0..1633b9d0fdd 100644
--- a/modules/services/databases/postgresql.nix
+++ b/modules/services/databases/postgresql.nix
@@ -188,8 +188,12 @@ in
 
         extraConfig =
           ''
+            # Shut down Postgres using SIGINT ("Fast Shutdown mode").  See 
+            # http://www.postgresql.org/docs/current/static/server-shutdown.html
+            kill signal INT
+
             # Give Postgres a decent amount of time to clean up after
-            # receiving Upstart's SIGTERM.
+            # receiving Upstart's SIGINT.
             kill timeout 60
           '';
       };
-- 
GitLab


From 4b650026bfca9a9377d22307adf13209c51dd7ff Mon Sep 17 00:00:00 2001
From: Sander van der Burg <s.vanderburg@tudelft.nl>
Date: Thu, 3 May 2012 12:31:01 +0000
Subject: [PATCH 3651/5331] The <> syntax has to be applied properly, in order
 to find build-vms.nix

svn path=/nixos/trunk/; revision=33981
---
 modules/installer/tools/nixos-build-vms/nixos-build-vms.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/installer/tools/nixos-build-vms/nixos-build-vms.sh b/modules/installer/tools/nixos-build-vms/nixos-build-vms.sh
index acdc7ebc5c2..d24a1ccb70d 100644
--- a/modules/installer/tools/nixos-build-vms/nixos-build-vms.sh
+++ b/modules/installer/tools/nixos-build-vms/nixos-build-vms.sh
@@ -58,5 +58,5 @@ fi
 
 # Build a network of VMs
 
-nix-build '<nixos>/modules/installer/tools/nixos-build-vms/build-vms.nix' \
+nix-build '<nixos/modules/installer/tools/nixos-build-vms/build-vms.nix>' \
     --argstr networkExpr $networkExpr  $noOutLinkArg $showTraceArg
-- 
GitLab


From 3aae8bfa61ac413e27165f8e08abd42b30c80ae1 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Fri, 4 May 2012 22:16:35 +0000
Subject: [PATCH 3652/5331] Switch to using efi shell + startup.nsh as the
 removable media efi boot option.

svn path=/nixos/trunk/; revision=33984
---
 modules/installer/cd-dvd/iso-image.nix        | 19 +++++++++++--
 .../efi-boot-stub/efi-boot-stub-builder.sh    | 10 +++----
 .../installer/efi-boot-stub/efi-boot-stub.nix | 28 ++++++++++++++-----
 3 files changed, 42 insertions(+), 15 deletions(-)

diff --git a/modules/installer/cd-dvd/iso-image.nix b/modules/installer/cd-dvd/iso-image.nix
index 08b0cdbbd74..060dd2d2d32 100644
--- a/modules/installer/cd-dvd/iso-image.nix
+++ b/modules/installer/cd-dvd/iso-image.nix
@@ -119,6 +119,17 @@ let
     '';
 
 
+  efiShell = if pkgs.stdenv.isi686 then
+    pkgs.fetchurl {
+      url = "https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2/EdkShellBinPkg/FullShell/Ia32/Shell_Full.efi";
+      sha256 = "0ymm3mbbwx9f6cq0bp2nr7ikyagxgsg4sjs5q1s4xbnms27slwjq";
+    }
+  else
+    pkgs.fetchurl {
+      url = "https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2/EdkShellBinPkg/FullShell/X64/Shell_Full.efi";
+      sha256 = "1xchy8a05mgqzr82mmahdni0jbxsz6xf6vm2bg1bch9i6l72qgmh";
+    };
+
   # The efi boot image
   efiImg = pkgs.runCommand "efi-image_eltorito" {}
     ''
@@ -129,11 +140,13 @@ let
       ${pkgs.mtools}/bin/mmd -i "$out" efi/boot
       ${pkgs.mtools}/bin/mmd -i "$out" efi/nixos
       ${pkgs.mtools}/bin/mcopy -v -i "$out" \
-        ${config.boot.kernelPackages.kernel + "/bzImage"} ::efi/boot/boot${targetArch}.efi
+        ${efiShell} ::efi/boot/boot${targetArch}.efi
+      ${pkgs.mtools}/bin/mcopy -v -i "$out" \
+        ${config.boot.kernelPackages.kernel + "/bzImage"} ::bzImage.efi
       ${pkgs.mtools}/bin/mcopy -v -i "$out" \
         ${config.system.build.initialRamdisk + "/initrd"} ::efi/nixos/initrd
-      echo "initrd=\\efi\\nixos\\initrd init=${config.system.build.toplevel}/init ${toString config.boot.kernelParams}" > boot-params
-      ${pkgs.mtools}/bin/mcopy -v -i "$out" boot-params ::efi/boot/linux.conf
+      echo "bzImage.efi initrd=\\efi\\nixos\\initrd init=${config.system.build.toplevel}/init ${toString config.boot.kernelParams}" > boot-params
+      ${pkgs.mtools}/bin/mcopy -v -i "$out" boot-params ::startup.nsh
     '';
 
   targetArch = if pkgs.stdenv.isi686 then
diff --git a/modules/installer/efi-boot-stub/efi-boot-stub-builder.sh b/modules/installer/efi-boot-stub/efi-boot-stub-builder.sh
index 145b406922b..3c55363a44d 100644
--- a/modules/installer/efi-boot-stub/efi-boot-stub-builder.sh
+++ b/modules/installer/efi-boot-stub/efi-boot-stub-builder.sh
@@ -76,11 +76,6 @@ addEntry() {
 	set -e
       fi
 
-      if test -n "@installRemovableMediaImage@"; then
-        mkdir -pv "@efiSysMountPoint@"/efi/boot
-        cp $kernel "@efiSysMountPoint@"/efi/boot/boot"@targetArch@".efi
-	sed 's|.*@kernelFile@.efi ||' $startup > "@efiSysMountPoint@"/efi/boot/linux.conf
-      fi
       if test -n "@installStartupNsh@"; then
         sed 's|.*@kernelFile@.efi|@kernelFile@.efi|' < $startup > "@efiSysMountPoint@/startup.nsh"
         cp $kernel "@efiSysMountPoint@/@kernelFile@.efi"
@@ -116,6 +111,11 @@ if test -n "@runEfibootmgr@"; then
   set -e
 fi
 
+if test -n "@efiShell@"; then
+  mkdir -pv "@efiSysMountPoint@"/efi/boot
+  cp "@efiShell@" "@efiSysMountPoint@"/efi/boot/boot"@targetArch@".efi
+fi
+
 # Remove obsolete files from the EFI system partition
 for fn in "@efiSysMountPoint@/efi/nixos/"*; do
     if ! test "${filesCopied[$fn]}" = 1; then
diff --git a/modules/installer/efi-boot-stub/efi-boot-stub.nix b/modules/installer/efi-boot-stub/efi-boot-stub.nix
index 72b7fa28ac3..def1e10dd52 100644
--- a/modules/installer/efi-boot-stub/efi-boot-stub.nix
+++ b/modules/installer/efi-boot-stub/efi-boot-stub.nix
@@ -59,15 +59,14 @@ let
             '';
           };
 
-          installRemovableMediaImage = mkOption {
+          installShell = mkOption {
             default = false;
             description = ''
-              Whether to build/install a BOOT{machine type short-name}.EFI file
-              in \EFI\BOOT. This _should_ only be needed for removable devices
+              Whether to install an EFI shell in \EFI\BOOT.
+              This _should_ only be needed for removable devices
               (CDs, usb sticks, etc.), but it may be an option for broken
-              systems where efibootmgr doesn't work. It reads the UCS-2
-              encoded \EFI\NIXOS\BOOT-PARAMS to find out which kernel to boot
-              with which parameters.
+              systems where efibootmgr doesn't work. Particularly useful in
+              conjunction with installStartupNsh
             '';
           };
 
@@ -85,7 +84,22 @@ let
     isExecutable = true;
     inherit (pkgs) bash;
     path = [pkgs.coreutils pkgs.gnused pkgs.gnugrep pkgs.glibc] ++ (pkgs.stdenv.lib.optionals config.boot.loader.efiBootStub.runEfibootmgr [pkgs.efibootmgr pkgs.module_init_tools]);
-    inherit (config.boot.loader.efiBootStub) efiSysMountPoint runEfibootmgr installStartupNsh efiDisk efiPartition installRemovableMediaImage;
+    inherit (config.boot.loader.efiBootStub) efiSysMountPoint runEfibootmgr installStartupNsh efiDisk efiPartition;
+
+    efiShell = if config.boot.loader.efiBootStub.installShell then
+      if pkgs.stdenv.isi686 then
+        pkgs.fetchurl {
+          url = "https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2/EdkShellBinPkg/FullShell/Ia32/Shell_Full.efi";
+          sha256 = "0ymm3mbbwx9f6cq0bp2nr7ikyagxgsg4sjs5q1s4xbnms27slwjq";
+        }
+      else
+        pkgs.fetchurl {
+          url = "https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2/EdkShellBinPkg/FullShell/X64/Shell_Full.efi";
+          sha256 = "1xchy8a05mgqzr82mmahdni0jbxsz6xf6vm2bg1bch9i6l72qgmh";
+        }
+    else
+      null;
+
     kernelFile = platform.kernelTarget;
     targetArch = if pkgs.stdenv.isi686 then
       "IA32"
-- 
GitLab


From c716747cce830c014111aa27d311c7514e97872c Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Sat, 5 May 2012 14:23:51 +0000
Subject: [PATCH 3653/5331] Need a slighty bigger boot image to contain the efi
 shell

svn path=/nixos/trunk/; revision=33986
---
 modules/installer/cd-dvd/iso-image.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/installer/cd-dvd/iso-image.nix b/modules/installer/cd-dvd/iso-image.nix
index 060dd2d2d32..cf76151c2ae 100644
--- a/modules/installer/cd-dvd/iso-image.nix
+++ b/modules/installer/cd-dvd/iso-image.nix
@@ -133,8 +133,8 @@ let
   # The efi boot image
   efiImg = pkgs.runCommand "efi-image_eltorito" {}
     ''
-      #Let's hope 8M is enough
-      dd bs=2048 count=4096 if=/dev/zero of="$out"
+      #Let's hope 10M is enough
+      dd bs=2048 count=5120 if=/dev/zero of="$out"
       ${pkgs.dosfstools}/sbin/mkfs.vfat "$out"
       ${pkgs.mtools}/bin/mmd -i "$out" efi
       ${pkgs.mtools}/bin/mmd -i "$out" efi/boot
-- 
GitLab


From 1a0c9ce2014bff1a7d6e8ca769e455d1a3c0721e Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Sat, 5 May 2012 15:43:28 +0000
Subject: [PATCH 3654/5331] The efibootmgr bricking problem was fixed in 2.6.39

svn path=/nixos/trunk/; revision=33990
---
 modules/installer/efi-boot-stub/efi-boot-stub.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/installer/efi-boot-stub/efi-boot-stub.nix b/modules/installer/efi-boot-stub/efi-boot-stub.nix
index def1e10dd52..c12078e2a91 100644
--- a/modules/installer/efi-boot-stub/efi-boot-stub.nix
+++ b/modules/installer/efi-boot-stub/efi-boot-stub.nix
@@ -45,8 +45,8 @@ let
             default = false;
             description = ''
               Whether to run efibootmgr to add the configuration to the boot options list.
-              WARNING! efibootmgr has been rumored to brick Apple firmware! Use 'bless' on
-              Apple efi systems.
+              WARNING! efibootmgr has been rumored to brick Apple firmware on
+              old kernels! Don't use it on kernels older than 2.6.39!
             '';
           };
 
-- 
GitLab


From 7a697337040c7460bb876b444f1bebb33204c0f1 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 8 May 2012 11:46:01 +0000
Subject: [PATCH 3655/5331] Added 'networking.dhcpcd.denyInterfaces' to extend
 the list of network interfaces black-listed for dhcpcd via configuration.nix.
 I use this option to disable DHCP for "veth*" interfaces, which are created
 by LXC for use inside of virtual machines.

svn path=/nixos/trunk/; revision=34018
---
 modules/services/networking/dhcpcd.nix | 20 +++++++++++++++++++-
 1 file changed, 19 insertions(+), 1 deletion(-)

diff --git a/modules/services/networking/dhcpcd.nix b/modules/services/networking/dhcpcd.nix
index b22bbb3f051..122faf98136 100644
--- a/modules/services/networking/dhcpcd.nix
+++ b/modules/services/networking/dhcpcd.nix
@@ -10,7 +10,8 @@ let
   # interfaces that are part of a bridge.
   ignoredInterfaces =
     map (i: i.name) (filter (i: i ? ipAddress && i.ipAddress != "" ) config.networking.interfaces)
-    ++ concatLists (attrValues (mapAttrs (n: v: v.interfaces) config.networking.bridges));
+    ++ concatLists (attrValues (mapAttrs (n: v: v.interfaces) config.networking.bridges))
+    ++ config.networking.dhcpcd.denyInterfaces;
 
   # Config file adapted from the one that ships with dhcpcd.
   dhcpcdConf = pkgs.writeText "dhcpcd.conf"
@@ -70,6 +71,23 @@ in
 
 {
 
+  ###### interface
+
+  options = {
+
+    networking.dhcpcd.denyInterfaces = mkOption {
+      default = [];
+      description = ''
+         Disable the DHCP client for any interface which's name matches
+         any of the shell glob patterns in this list. The purpose of
+         this option is blacklist virtual interfaces such as those
+         created by Xen, libvirt, LXC, etc.
+      '';
+    };
+
+  };
+
+
   ###### implementation
 
   config = mkIf config.networking.useDHCP {
-- 
GitLab


From e4200d7e617eaef8d77672daa8a813ddbea89a95 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 9 May 2012 21:35:47 +0000
Subject: [PATCH 3656/5331] * Some more trivial builders with lots of
 dependencies that should be   built locally.

svn path=/nixos/trunk/; revision=34034
---
 modules/services/system/dbus.nix | 1 +
 modules/system/etc/etc.nix       | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/modules/services/system/dbus.nix b/modules/services/system/dbus.nix
index b01cd7bc2ff..f7fbb23d0a7 100644
--- a/modules/services/system/dbus.nix
+++ b/modules/services/system/dbus.nix
@@ -12,6 +12,7 @@ let
 
   configDir = pkgs.stdenv.mkDerivation {
     name = "dbus-conf";
+    preferLocalBuild = true;
     buildCommand = ''
       ensureDir $out
 
diff --git a/modules/system/etc/etc.nix b/modules/system/etc/etc.nix
index c84d96829f3..ec6e4e72012 100644
--- a/modules/system/etc/etc.nix
+++ b/modules/system/etc/etc.nix
@@ -30,6 +30,8 @@ let
 
     builder = ./make-etc.sh;
 
+    preferLocalBuild = true;
+
     /* !!! Use toXML. */
     sources = map (x: x.source) config.environment.etc;
     targets = map (x: x.target) config.environment.etc;
-- 
GitLab


From 2df81f42a51810d21e1d9771a1f85303f67228ee Mon Sep 17 00:00:00 2001
From: Rickard Nilsson <rickard.nilsson@telia.com>
Date: Wed, 9 May 2012 22:06:17 +0000
Subject: [PATCH 3657/5331] Moved idmapd configuration file to Nix store.

svn path=/nixos/trunk/; revision=34037
---
 modules/tasks/filesystems/nfs.nix | 31 ++++++++++++++-----------------
 1 file changed, 14 insertions(+), 17 deletions(-)

diff --git a/modules/tasks/filesystems/nfs.nix b/modules/tasks/filesystems/nfs.nix
index d916811050e..0f48249b365 100644
--- a/modules/tasks/filesystems/nfs.nix
+++ b/modules/tasks/filesystems/nfs.nix
@@ -10,22 +10,19 @@ let
 
   rpcMountpoint = "${nfsStateDir}/rpc_pipefs";
 
-  idmapdConfFile = {
-    target = "idmapd.conf";
-    source = pkgs.writeText "idmapd.conf" ''
-      [General]
-      Pipefs-Directory = ${rpcMountpoint}
-      ${optionalString (config.networking.domain != "")
-        "Domain = ${config.networking.domain}"}
-
-      [Mapping]
-      Nobody-User = nobody
-      Nobody-Group = nogroup
-
-      [Translation]
-      Method = nsswitch
-    '';
-  };
+  idmapdConfFile = pkgs.writeText "idmapd.conf" ''
+    [General]
+    Pipefs-Directory = ${rpcMountpoint}
+    ${optionalString (config.networking.domain != "")
+      "Domain = ${config.networking.domain}"}
+
+    [Mapping]
+    Nobody-User = nobody
+    Nobody-Group = nogroup
+
+    [Translation]
+    Method = nsswitch
+  '';
 
 in
 
@@ -99,7 +96,7 @@ in
 
         daemonType = "fork";
 
-        exec = "rpc.idmapd";
+        exec = "rpc.idmapd -v -c ${idmapdConfFile}";
       };
 
   };
-- 
GitLab


From 658ea20e7f18ebd77df7ccadd1507109bb39291b Mon Sep 17 00:00:00 2001
From: Rickard Nilsson <rickard.nilsson@telia.com>
Date: Wed, 9 May 2012 22:11:07 +0000
Subject: [PATCH 3658/5331] Added option for specifying system-wide known hosts
 file for OpenSSH.

svn path=/nixos/trunk/; revision=34038
---
 modules/services/networking/ssh/sshd.nix | 52 +++++++++++++++++++++++-
 1 file changed, 50 insertions(+), 2 deletions(-)

diff --git a/modules/services/networking/ssh/sshd.nix b/modules/services/networking/ssh/sshd.nix
index ce7ecd3af8c..b8b0fc1bccf 100644
--- a/modules/services/networking/ssh/sshd.nix
+++ b/modules/services/networking/ssh/sshd.nix
@@ -30,6 +30,14 @@ let
   hktn = attrByPath [cfg.hostKeyType] (throw "unknown host key type `${cfg.hostKeyType}'") hostKeyTypeNames;
   hktb = attrByPath [cfg.hostKeyType] (throw "unknown host key type `${cfg.hostKeyType}'") hostKeyTypeBits;
 
+  knownHosts = map (h: getAttr h cfg.knownHosts) (attrNames cfg.knownHosts);
+
+  knownHostsFile = pkgs.writeText "ssh_known_hosts" (
+    flip concatMapStrings knownHosts (h:
+      "${concatStringsSep "," h.hostNames} ${builtins.readFile h.publicKeyFile}"
+    )
+  );
+
   userOptions = {
     openssh.authorizedKeys = {
 
@@ -218,6 +226,42 @@ in
         description = "Verbatim contents of <filename>sshd_config</filename>.";
       };
 
+      knownHosts = mkOption {
+        default = {};
+        type = types.loaOf types.optionSet;
+        description = ''
+          The set of system-wide known SSH hosts.
+        '';
+        example = [
+          { 
+            hostNames = [ "myhost" "myhost.mydomain.com" "10.10.1.4" ];
+            publicKeyFile = ./pubkeys/myhost_ssh_host_dsa_key.pub;
+          }
+          { 
+            hostNames = [ "myhost2" ];
+            publicKeyFile = ./pubkeys/myhost2_ssh_host_dsa_key.pub;
+          }
+        ];
+        options = {
+          hostNames = mkOption {
+            type = types.listOf types.string;
+            default = [];
+            description = ''
+              A list of host names and/or IP numbers used for accessing
+              the host's ssh service.
+            '';
+          };
+          publicKeyFile = mkOption {
+            description = ''
+              The path to the public key file for the host. The public
+              key file is read at build time and saved in the Nix store.
+              You can fetch a public key file from a running SSH server
+              with the <literal>ssh-keyscan</literal> command.
+            '';
+          };
+        };
+      };
+
     };
 
     users.extraUsers = mkOption {
@@ -238,10 +282,14 @@ in
         home = "/var/empty";
       };
 
-    environment.etc = singleton
+    environment.etc = [
       { source = "${pkgs.openssh}/etc/ssh/moduli";
         target = "ssh/moduli";
-      };
+      }
+      { source = knownHostsFile;
+        target = "ssh/ssh_known_hosts";
+      }
+    ];
 
     jobs.sshd = {
 
-- 
GitLab


From 35f9502a27b4366917d7f91ef2904e8d45aa8c84 Mon Sep 17 00:00:00 2001
From: Rickard Nilsson <rickard.nilsson@telia.com>
Date: Wed, 9 May 2012 22:13:53 +0000
Subject: [PATCH 3659/5331] Added option for specifying the path to the private
 key file sshd should use.

svn path=/nixos/trunk/; revision=34039
---
 modules/services/networking/ssh/sshd.nix | 22 ++++++++++++++++++----
 1 file changed, 18 insertions(+), 4 deletions(-)

diff --git a/modules/services/networking/ssh/sshd.nix b/modules/services/networking/ssh/sshd.nix
index b8b0fc1bccf..53efc08cfb8 100644
--- a/modules/services/networking/ssh/sshd.nix
+++ b/modules/services/networking/ssh/sshd.nix
@@ -218,7 +218,21 @@ in
 
       hostKeyType = mkOption {
         default = "dsa1024";
-        description = "Type of host key to generate (dsa1024/rsa1024/ecdsa521)";
+        description = ''
+          Type of host key to generate (dsa1024/rsa1024/ecdsa521), if
+          the file specified by <literal>hostKeyPath</literal> does not
+          exist when the service starts.
+        '';
+      };
+
+      hostKeyPath = mkOption {
+        default = "/etc/ssh/ssh_host_${hktn}_key";
+        description = ''
+          Path to the server's private key. If there is no key file
+          on this path, it will be generated when the service is
+          started for the first time. Otherwise, the ssh daemon will
+          use the specified key directly in-place.
+        '';
       };
 
       extraConfig = mkOption {
@@ -311,8 +325,8 @@ in
 
             mkdir -m 0755 -p /etc/ssh
 
-            if ! test -f /etc/ssh/ssh_host_${hktn}_key; then
-                ssh-keygen -t ${hktn} -b ${toString hktb} -f /etc/ssh/ssh_host_${hktn}_key -N ""
+            if ! test -f ${cfg.hostKeyPath}; then
+                ssh-keygen -t ${hktn} -b ${toString hktb} -f ${cfg.hostKeyPath} -N ""
             fi
           '';
 
@@ -320,7 +334,7 @@ in
 
         exec =
           ''
-            ${pkgs.openssh}/sbin/sshd -h /etc/ssh/ssh_host_${hktn}_key \
+            ${pkgs.openssh}/sbin/sshd -h ${cfg.hostKeyPath} \
               -f ${pkgs.writeText "sshd_config" cfg.extraConfig}
           '';
       };
-- 
GitLab


From c4aa833e5654e869f8fe78046e3f601406a2aad2 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 11 May 2012 23:06:35 +0000
Subject: [PATCH 3660/5331] * Use optionSet to check environment.etc.

svn path=/nixos/trunk/; revision=34064
---
 modules/system/etc/etc.nix | 22 ++++++++++++++++++++--
 1 file changed, 20 insertions(+), 2 deletions(-)

diff --git a/modules/system/etc/etc.nix b/modules/system/etc/etc.nix
index ec6e4e72012..7553a569beb 100644
--- a/modules/system/etc/etc.nix
+++ b/modules/system/etc/etc.nix
@@ -16,8 +16,26 @@ let
         }
       ];
       description = ''
-        List of files that have to be linked in /etc.
+        List of files that have to be linked in <filename>/etc</filename>.
       '';
+      type = types.listOf types.optionSet;
+      options = {
+        source = mkOption {
+          description = "Source file.";
+        };
+        target = mkOption {
+          description = "Name of symlink (relative to <filename>/etc</filename>).";
+        };
+        mode = mkOption {
+          default = "symlink";
+          example = "0600";
+          description = ''
+            If set to something else than <literal>symlink</literal>,
+            the file is copied instead of symlinked, with the given
+            file mode.
+          '';
+        };
+      };
     };
   };
 in
@@ -35,7 +53,7 @@ let
     /* !!! Use toXML. */
     sources = map (x: x.source) config.environment.etc;
     targets = map (x: x.target) config.environment.etc;
-    modes = map (x: if x ? mode then x.mode else "symlink") config.environment.etc;
+    modes = map (x: x.mode) config.environment.etc;
   };
 
 in
-- 
GitLab


From 5167f5abefd4b8931f5dc1601d54f3aa3474fbe9 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 11 May 2012 23:08:37 +0000
Subject: [PATCH 3661/5331] * Remove a bad definition of environment.etc.

svn path=/nixos/trunk/; revision=34065
---
 modules/tasks/filesystems/nfs.nix | 2 --
 1 file changed, 2 deletions(-)

diff --git a/modules/tasks/filesystems/nfs.nix b/modules/tasks/filesystems/nfs.nix
index 0f48249b365..0ed76a9db77 100644
--- a/modules/tasks/filesystems/nfs.nix
+++ b/modules/tasks/filesystems/nfs.nix
@@ -46,8 +46,6 @@ in
         cp -v ${pkgs.klibc}/lib/klibc/bin.static/nfsmount $out/bin
       '';
 
-    environment.etc = singleton idmapdConfFile;
-
     # Ensure that statd and idmapd are started before mountall.
     jobs.mountall.preStart =
       ''
-- 
GitLab


From ce3941d6e6d7c5f4f683d3ef25070cd1c803a79b Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 11 May 2012 23:14:05 +0000
Subject: [PATCH 3662/5331] * Move logFormat to the per-vhost options.

svn path=/nixos/trunk/; revision=34066
---
 modules/services/web-servers/apache-httpd/default.nix  | 10 +---------
 .../web-servers/apache-httpd/per-server-options.nix    |  8 ++++++++
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/modules/services/web-servers/apache-httpd/default.nix b/modules/services/web-servers/apache-httpd/default.nix
index 935a5e1be1a..ce3311a5f59 100644
--- a/modules/services/web-servers/apache-httpd/default.nix
+++ b/modules/services/web-servers/apache-httpd/default.nix
@@ -220,7 +220,7 @@ let
 
     ${if !isMainServer && mainCfg.logPerVirtualHost then ''
       ErrorLog ${mainCfg.logDir}/error_log-${cfg.hostName}
-      CustomLog ${mainCfg.logDir}/access_log-${cfg.hostName} ${mainCfg.logFormat}
+      CustomLog ${mainCfg.logDir}/access_log-${cfg.hostName} ${cfg.logFormat}
     '' else ""}
 
     ${robotsConf}
@@ -447,14 +447,6 @@ in
         ";
       };
 
-      logFormat = mkOption {
-        default = "common";
-        example = "combined";
-        description = "
-          Log format for Apache's log files. Possible values are: combined, common, referer, agent.
-        ";
-      };
-
       stateDir = mkOption {
         default = "/var/run/httpd";
         description = "
diff --git a/modules/services/web-servers/apache-httpd/per-server-options.nix b/modules/services/web-servers/apache-httpd/per-server-options.nix
index 00b82550bbe..a5227bae2d4 100644
--- a/modules/services/web-servers/apache-httpd/per-server-options.nix
+++ b/modules/services/web-servers/apache-httpd/per-server-options.nix
@@ -135,4 +135,12 @@
     ";
   };
 
+  logFormat = mkOption {
+    default = "common";
+    example = "combined";
+    description = "
+      Log format for Apache's log files. Possible values are: combined, common, referer, agent.
+    ";
+  };
+
 }
-- 
GitLab


From 71d867daf6a83b227368c360525665277bcba209 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 11 May 2012 23:42:18 +0000
Subject: [PATCH 3663/5331] * Sync CSS.

svn path=/nixos/trunk/; revision=34067
---
 doc/manual/style.css | 118 ++++++++++++++++++-------------------------
 1 file changed, 49 insertions(+), 69 deletions(-)

diff --git a/doc/manual/style.css b/doc/manual/style.css
index 5756d60eba3..e2204c159e2 100644
--- a/doc/manual/style.css
+++ b/doc/manual/style.css
@@ -8,15 +8,14 @@
 
 body
 {
-    font-family: sans-serif;
+    font-family: "Nimbus Sans L", sans-serif;
     background: white;
     margin: 2em 1em 2em 1em;
 }
 
-h1,h2,h3
+h1, h2, h3, h4
 {
     color: #005aa0;
-    text-align: left;
 }
 
 h1 /* title */
@@ -46,6 +45,11 @@ h3 /* subsections */
     font-size: 125%;
 }
 
+div.simplesect h2
+{
+    font-size: 110%;
+}
+
 div.appendix h3
 {
     font-size: 150%;
@@ -70,11 +74,13 @@ div.refsection h3
 
 div.example
 {
-    border: 1px solid #6185a0;
+    border: 1px solid #b0b0b0;
     padding: 6px 6px;
     margin-left: 1.5em;
     margin-right: 1.5em;
     background: #f4f4f8;
+    border-radius: 0.4em;
+    box-shadow: 0.4em 0.4em 0.5em #e0e0e0;
 }
 
 div.example p.title
@@ -82,6 +88,11 @@ div.example p.title
     margin-top: 0em;
 }
 
+div.example pre
+{
+    box-shadow: none;
+}
+
 
 /***************************************************************************
                             Screen dumps:
@@ -89,14 +100,15 @@ div.example p.title
 
 pre.screen, pre.programlisting
 {
-    border: 1px solid #6185a0;
+    border: 1px solid #b0b0b0;
     padding: 3px 3px;
     margin-left: 1.5em;
     margin-right: 1.5em;
     color: #600000;
     background: #f4f4f8;
     font-family: monospace;
-    /* font-size: 90%; */
+    border-radius: 0.4em;
+    box-shadow: 0.4em 0.4em 0.5em #e0e0e0;
 }
 
 div.example pre.programlisting
@@ -113,13 +125,15 @@ div.example pre.programlisting
 
 .note, .warning
 {
-    border: 1px solid #6185a0;
+    border: 1px solid #b0b0b0;
     padding: 3px 3px;
     margin-left: 1.5em;
     margin-right: 1.5em;
     margin-bottom: 1em;
     padding: 0.3em 0.3em 0.3em 0.3em;
     background: #fffff5;
+    border-radius: 0.4em;
+    box-shadow: 0.4em 0.4em 0.5em #e0e0e0;
 }
 
 div.note, div.warning
@@ -131,7 +145,6 @@ div.note h3, div.warning h3
 {
     color: red;
     font-size: 100%;
-//    margin: 0 0 0 0;
     padding-right: 0.5em;
     display: inline;
 }
@@ -162,20 +175,26 @@ div.navfooter *
                         Links colors and highlighting: 
  ***************************************************************************/
 
+a { text-decoration: none; }
+a:hover { text-decoration: underline; }
 a:link { color: #0048b3; }
 a:visited { color: #002a6a; }
-a:hover { background: #ffffcd; }
 
 
 /***************************************************************************
                               Table of contents:
  ***************************************************************************/
 
-.toc
+div.toc
 {
     font-size: 90%;
 }
 
+div.toc dl
+{
+    margin-top: 0em;
+    margin-bottom: 0em;
+}
 
 
 /***************************************************************************
@@ -208,81 +227,42 @@ div.glosslist dt
     font-style: italic;
 }
 
-.default
-{
-    font-style: italic;
-}
-
-.availability
-{
-    font-style: italic;
-}
-
 .varname
 {
     color: #400000;
 }
 
-
-div.informaltable table
-{
-  border: 1px solid #6185a0;
-  width: 100%;
-}
-
-div.informaltable td
+span.command strong
 {
-  border: 0;
-  padding: 5px;
-}
-
-div.informaltable td.default
-{
-  text-align: right;
+    font-weight: normal;
+    color: #400000;
 }
 
-div.informaltable th
+div.calloutlist table
 {
-  text-align: left;
-  color: #005aa0;
-  border: 0;
-  padding: 5px;
-  background: #fffff5;
-  font-weight: normal;
-  font-style: italic;
+    box-shadow: none;
 }
 
-td.varname, td.tagname, td.paramname
+table
 {
-  font-weight: bold;
-  vertical-align: top;
+    border-collapse: collapse;
+    box-shadow: 0.4em 0.4em 0.5em #e0e0e0;
 }
 
-div.epigraph
+table.simplelist
 {
+    text-align: left;
+    color: #005aa0;
+    border: 0;
+    padding: 5px;
+    background: #fffff5;
+    font-weight: normal;
     font-style: italic;
-    text-align: right;
-}
-
-table.productionset table.productionset
-{
-    font-family: monospace;
-}
-
-strong.command
-{
-//    font-family: monospace;
-//    font-style: italic;
-//    font-weight: normal;
-    color: #400000;
-}
-
-div.calloutlist td
-{
-    padding-bottom: 1em;
+    box-shadow: none;
+    margin-bottom: 1em;
 }
 
-table
+div.affiliation
 {
-    margin-bottom: 1em;
-}
+    font-style: italic;
+}
\ No newline at end of file
-- 
GitLab


From 67d5f2b444b469977c2ff2eb07977e9ebe1c1e84 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 14 May 2012 01:33:11 +0000
Subject: [PATCH 3664/5331] * Require fileSystems to be set.

svn path=/nixos/trunk/; revision=34080
---
 modules/system/boot/stage-1.nix | 2 +-
 modules/tasks/filesystems.nix   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/system/boot/stage-1.nix b/modules/system/boot/stage-1.nix
index 440255f6f6c..75f83a27db9 100644
--- a/modules/system/boot/stage-1.nix
+++ b/modules/system/boot/stage-1.nix
@@ -304,7 +304,7 @@ let
 
     # !!! copy&pasted from upstart-jobs/filesystems.nix.
     mountPoints =
-      if fileSystems == null
+      if fileSystems == []
       then abort "You must specify the fileSystems option!"
       else map (fs: fs.mountPoint) fileSystems;
     devices = map (fs: if fs.device != null then fs.device else "/dev/disk/by-label/${fs.label}") fileSystems;
diff --git a/modules/tasks/filesystems.nix b/modules/tasks/filesystems.nix
index 557c5873d94..efa07d35ddc 100644
--- a/modules/tasks/filesystems.nix
+++ b/modules/tasks/filesystems.nix
@@ -69,7 +69,7 @@ in
         <command>mkdir -p</command> .
       '';
 
-      type = types.nullOr (types.list types.optionSet);
+      type = types.list types.optionSet;
 
       options = {
 
-- 
GitLab


From 3dd0718939802835b24095844099f2984c5bcf7e Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 14 May 2012 01:53:47 +0000
Subject: [PATCH 3665/5331] * Give an error at evaluation time if
 boot.loader.grub.device or   boot.loader.grub.devices are not set, rather
 than complaining about   it when it's too late.

svn path=/nixos/trunk/; revision=34081
---
 modules/installer/grub/grub.nix               | 30 ++++++++-------
 .../activation/switch-to-configuration.sh     | 37 ++++++++-----------
 modules/system/activation/top-level.nix       |  8 ++--
 3 files changed, 35 insertions(+), 40 deletions(-)

diff --git a/modules/installer/grub/grub.nix b/modules/installer/grub/grub.nix
index 2d7393b7f87..97e5f12d048 100644
--- a/modules/installer/grub/grub.nix
+++ b/modules/installer/grub/grub.nix
@@ -4,7 +4,9 @@ with pkgs.lib;
 
 let
 
-  grub = if config.boot.loader.grub.version == 1 then pkgs.grub else pkgs.grub2;
+  cfg = config.boot.loader.grub;
+
+  grub = if cfg.version == 1 then pkgs.grub else pkgs.grub2;
 
   grubMenuBuilder = pkgs.substituteAll {
     src = ./grub-menu-builder.sh;
@@ -48,15 +50,11 @@ in
         example = "/dev/hda";
         type = with pkgs.lib.types; uniq string;
         description = ''
-          The device on which the boot loader, GRUB, will be
-          installed.  If empty, GRUB won't be installed and it's your
-          responsibility to make the system bootable.  The special
-          value <literal>nodev</literal> means that a GRUB boot menu
-          will be generated, but GRUB itself will not actually be
-          installed.
-
-          To install grub into multiple devices look at
-          <literal>devices</literal>.
+          The device on which the GRUB boot loader will be installed.
+          The special value <literal>nodev</literal> means that a GRUB
+          boot menu will be generated, but GRUB itself will not
+          actually be installed.  To install GRUB on multiple devices,
+          use <literal>boot.loader.grub.devices</literal>.
         '';
       };
 
@@ -67,7 +65,7 @@ in
         description = ''
           The devices on which the boot loader, GRUB, will be
           installed. Can be used instead of <literal>device</literal> to
-          install grub into multiple devices (as softraid arrays holding /boot).
+          install grub into multiple devices (e.g., if as softraid arrays holding /boot).
         '';
       };
 
@@ -197,7 +195,13 @@ in
 
   config = mkIf config.boot.loader.grub.enable {
 
-    system.build.menuBuilder = grubMenuBuilder;
+    boot.loader.grub.devices = optional (cfg.device != "") cfg.device;
+
+    system.build = mkAssert (cfg.devices != [])
+      "You must set the ‘boot.loader.grub.device’ option to make the system bootable."
+      { menuBuilder = grubMenuBuilder;
+        inherit grub;
+      };
 
     # Common attribute for boot loaders so only one of them can be
     # set at once.
@@ -206,8 +210,6 @@ in
 
     environment.systemPackages = mkIf config.boot.loader.grub.enable [ grub ];
 
-    system.build.grub = grub;
-
   };
 
 }
diff --git a/modules/system/activation/switch-to-configuration.sh b/modules/system/activation/switch-to-configuration.sh
index b80945d115d..da1471cf550 100644
--- a/modules/system/activation/switch-to-configuration.sh
+++ b/modules/system/activation/switch-to-configuration.sh
@@ -26,28 +26,23 @@ if [ "$action" = "switch" -o "$action" = "boot" ]; then
     
     if [ "@bootLoader@" = "grub" ]; then
         
-      if [ -n '@grubDevices@' ]; then
-          mkdir -m 0700 -p /boot/grub
-          @menuBuilder@ @out@
-
-          # If the GRUB version has changed, then force a reinstall.
-          oldGrubVersion="$(cat /boot/grub/version 2>/dev/null || true)"
-          newGrubVersion="@grubVersion@"
-
-          if [ "$NIXOS_INSTALL_GRUB" = 1 -o "$oldGrubVersion" != "$newGrubVersion" ]; then
-              for dev in @grubDevices@; do
-                  if [ "$dev" != nodev ]; then
-                      echo "installing the GRUB bootloader on $dev..."
-                      @grub@/sbin/grub-install "$(readlink -f "$dev")" --no-floppy
-                  fi
-              done
-              echo "$newGrubVersion" > /boot/grub/version
-          fi
+        mkdir -m 0700 -p /boot/grub
+        @menuBuilder@ @out@
+
+        # If the GRUB version has changed, then force a reinstall.
+        oldGrubVersion="$(cat /boot/grub/version 2>/dev/null || true)"
+        newGrubVersion="@grubVersion@"
+
+        if [ "$NIXOS_INSTALL_GRUB" = 1 -o "$oldGrubVersion" != "$newGrubVersion" ]; then
+            for dev in @grubDevices@; do
+                if [ "$dev" != nodev ]; then
+                    echo "installing the GRUB bootloader on $dev..."
+                    @grub@/sbin/grub-install "$(readlink -f "$dev")" --no-floppy
+                fi
+            done
+            echo "$newGrubVersion" > /boot/grub/version
+        fi
           
-      else
-          echo "Warning: don't know how to make this configuration bootable; please set \`boot.loader.grub.device'." 1>&2
-      fi
-      
     elif [ "@bootLoader@" = "generationsDir" ]; then
         @menuBuilder@ @out@
     elif [ "@bootLoader@" = "efiBootStub" ]; then
diff --git a/modules/system/activation/top-level.nix b/modules/system/activation/top-level.nix
index 9557c12aca7..dedfb9a9bd8 100644
--- a/modules/system/activation/top-level.nix
+++ b/modules/system/activation/top-level.nix
@@ -186,12 +186,10 @@ let
       if config.boot.loader.grub.enable
       then (builtins.parseDrvName config.system.build.grub.name).version
       else "";
-    grubDevices = with pkgs.lib; let
+    grubDevices =
+      let
         wrapQuotes = s: "\"" + s + "\"";
-        allDevices = [ config.boot.loader.grub.device ] ++
-          config.boot.loader.grub.devices;
-        definedDevices = filter (s: s != "") allDevices;
-      in map wrapQuotes definedDevices;
+      in map wrapQuotes config.boot.loader.grub.devices;
     configurationName = config.boot.loader.grub.configurationName;
   };
 
-- 
GitLab


From 8d568e5a712d44580152f773e6516437524730c7 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 14 May 2012 01:56:42 +0000
Subject: [PATCH 3666/5331] * nixos-option: clean up the English and the
 generated file.

svn path=/nixos/trunk/; revision=34082
---
 modules/installer/tools/nixos-option.sh | 149 +++++++++++-------------
 1 file changed, 66 insertions(+), 83 deletions(-)

diff --git a/modules/installer/tools/nixos-option.sh b/modules/installer/tools/nixos-option.sh
index bf6144877bd..656f2a87403 100644
--- a/modules/installer/tools/nixos-option.sh
+++ b/modules/installer/tools/nixos-option.sh
@@ -9,20 +9,17 @@ export NIXOS_CONFIG
 
 usage () {
   echo 1>&2 "
-Usage: $0 [--install] [-v] [-d] [-l] [--xml] OPTION_NAME
-       $0 [--install]
+Usage: $0 [-v] [-d] [-l] [--xml] OPTION_NAME
+       $0 --install
 
-This program is used to explore NixOS options by looking at their values or
-by looking at their description.  It is helpful for understanding how your
-configuration is working.
+This program allows you to inspect the current value of NixOS
+configuration options.  It can also generate a basic NixOS
+configuration file.
 
 Options:
 
-  -i | --install        Use the configuration on
-                        ${mountPoint:+$mountPoint/}$NIXOS_CONFIG instead of
-                        the current system configuration.  Generate a
-                        template configuration if no option name is
-                        specified.
+  -i | --install        Write a template NixOS configuration file to
+                        ${mountPoint:+$mountPoint/}$NIXOS_CONFIG.
   -v | --value          Display the current value, based on your
                         configuration.
   -d | --description    Display the default value, the example and the
@@ -197,7 +194,7 @@ if $generate; then
   if test -e "$hardware_config"; then
     echo "A hardware configuration file exists, generation skipped."
   else
-    echo "Scan your hardware to generate a hardware configuration file."
+    echo "Generating a hardware configuration file in $hardware_config..."
     nixos-hardware-scan > "$hardware_config"
   fi
 
@@ -206,71 +203,58 @@ if $generate; then
     exit 1
   fi
 
-  echo "Generate a template configuration that you should edit."
+  echo "Generating a basic configuration file in $NIXOS_CONFIG..."
 
   # Generate a template configuration file where the user has to
   # fill the gaps.
-  echo > "$NIXOS_CONFIG" \
-'# Edit this configuration file which defines what would be installed on the
-# system.  To Help while choosing option value, you can watch at the manual
-# page of configuration.nix or at the last chapter of the manual available
-# on the virtual console 8 (Alt+F8).
+  cat <<EOF > "$NIXOS_CONFIG" \
+# Edit this configuration file to define what should be installed on
+# the system.  Help is available in the configuration.nix(5) man page
+# or the NixOS manual available on virtual console 8 (Alt+F8).
 
-{config, pkgs, ...}:
+{ config, pkgs, ... }:
 
 {
-  require = [
-    # Include the configuration for part of your system which have been
-    # detected automatically.
-    ./hardware-configuration.nix
-  ];
-
-  boot.initrd.kernelModules = [
-    # Specify all kernel modules that are necessary for mounting the root
-    # file system.
-    #
-    # "ext4" "ata_piix"
-  ];
-
-  boot.loader.grub = {
-    # Use grub 2 as boot loader.
-    enable = true;
-    version = 2;
-
-    # Define on which hard drive you want to install Grub.
-    # device = "/dev/sda";
-  };
-
-  networking = {
-    # hostName = "nixos"; # Define your hostname.
-    wireless.enable = true;  # Enables Wireless.
-  };
-
-  # Add file system entries for each partition that you want to see mounted
-  # at boot time.  You can add filesystems which are not mounted at boot by
-  # adding the noauto option.
-  fileSystems = [
-    # Mount the root file system
-    #
-    # { mountPoint = "/";
-    #   device = "/dev/sda2";
-    # }
-
-    # Copy & Paste & Uncomment & Modify to add any other file system.
-    #
-    # { mountPoint = "/data"; # where you want to mount the device
-    #   device = "/dev/sdb"; # the device or the label of the device
-    #   # label = "data";
-    #   fsType = "ext3";      # the type of the partition.
-    #   options = "data=journal";
-    # }
-  ];
-
-  swapDevices = [
-    # List swap partitions that are mounted at boot time.
-    #
-    # { device = "/dev/sda1"; }
-  ];
+  require =
+    [ # Include the results of the hardware scan.
+      ./hardware-configuration.nix
+    ];
+
+  boot.initrd.kernelModules =
+    [ # Specify all kernel modules that are necessary for mounting the root
+      # filesystem.
+      # "xfs" "ata_piix"
+    ];
+    
+  # Use the GRUB 2 boot loader.
+  boot.loader.grub.enable = true;
+  boot.loader.grub.version = 2;
+
+  # Define on which hard drive you want to install Grub.
+  # boot.loader.grub.device = "/dev/sda";
+
+  # networking.hostName = "nixos"; # Define your hostname.
+  # networking.wireless.enable = true;  # Enables Wireless.
+
+  # Add filesystem entries for each partition that you want to see
+  # mounted at boot time.  This should include at least the root
+  # filesystem.
+  fileSystems =
+    [ # { mountPoint = "/";
+      #   device = "/dev/disk/by-label/nixos";
+      # }
+
+      # { mountPoint = "/data"; # where you want to mount the device
+      #   device = "/dev/sdb";  # the device
+      #   fsType = "ext3";      # the type of the partition
+      #   options = "data=journal";
+      # }
+    ];
+
+  # List swap partitions activated at boot time.
+  swapDevices =
+    [ # { device = "/dev/disk/by-label/swap"; }
+    ];
 
   # Select internationalisation properties.
   # i18n = {
@@ -281,29 +265,28 @@ if $generate; then
 
   # List services that you want to enable:
 
-  # Add an OpenSSH daemon.
+  # Enable the OpenSSH daemon.
   # services.openssh.enable = true;
 
-  # Add CUPS to print documents.
+  # Enable CUPS to print documents.
   # services.printing.enable = true;
 
-  # Add XServer (default if you have used a graphical iso)
-  # services.xserver = {
-  #   enable = true;
-  #   layout = "us";
-  #   xkbOptions = "eurosign:e";
-  # };
+  # Enable the X11 windowing system.
+  # services.xserver.enable = true;
+  # services.xserver.layout = "us";
+  # services.xserver.xkbOptions = "eurosign:e";
 
-  # Add the NixOS Manual on virtual console 8
-  services.nixosManual.showManual = true;
+  # Enable the KDE Desktop Environment.
+  # services.xserver.displayManager.kdm.enable = true;
+  # services.xserver.desktopManager.kde4.enable = true;
 }
-'
+EOF
 
   exit 0
 fi;
 
-# This dupplicate the work made below, but it is useful for processing the
-# output of nixos-option with other tools such as nixos-gui.
+# This duplicates the work made below, but it is useful for processing
+# the output of nixos-option with other tools such as nixos-gui.
 if $xml; then
   evalNix --xml --no-location <<EOF
 let
-- 
GitLab


From b57e12dfee817c8237196a9f53380fa8fabc6ddd Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 14 May 2012 02:02:45 +0000
Subject: [PATCH 3667/5331] * Update the installation instructions.

svn path=/nixos/trunk/; revision=34083
---
 doc/manual/installation.xml | 101 +++++++++++++++++++++---------------
 1 file changed, 58 insertions(+), 43 deletions(-)

diff --git a/doc/manual/installation.xml b/doc/manual/installation.xml
index e5921492069..fda5c1491f4 100644
--- a/doc/manual/installation.xml
+++ b/doc/manual/installation.xml
@@ -4,6 +4,23 @@
 <title>Installation</title>
 
 
+<!--===============================================================-->
+
+<section>
+
+<title>Obtaining NixOS</title>
+
+<para>NixOS ISO images can be downloaded from the <link
+xlink:href="http://nixos.org/nixos/download.html">NixOS
+homepage</link>.  These can be burned onto a CD.  It is also possible
+to copy them onto a USB stick and install NixOS from there.  For
+details, see the <link
+xlink:href="https://nixos.org/wiki/Installing_NixOS_from_a_USB_stick">NixOS
+Wiki</link>.</para>
+
+</section>
+
+
 <!--===============================================================-->
 
 <section>
@@ -21,8 +38,8 @@
   <command>ifconfig</command>).  Networking is necessary for the
   installer, since it will download lots of stuff (such as source
   tarballs or Nixpkgs channel binaries).  It’s best if you have a DHCP
-  server on your network.  Otherwise configure
-  manually.</para></listitem>
+  server on your network.  Otherwise configure networking manually
+  using <command>ifconfig</command>.</para></listitem>
 
   <listitem><para>The NixOS manual is available on virtual console 8
   (press Alt+F8 to access).</para></listitem>
@@ -30,6 +47,9 @@
   <listitem><para>Login as <literal>root</literal>, empty
   password.</para></listitem>
 
+  <listitem><para>If you downloaded the graphical ISO image, you can
+  run <command>start xserver</command> to start KDE.</para></listitem>
+
   <listitem><para>The NixOS installer doesn’t do any partitioning or
   formatting yet, so you need to that yourself.  Use the following
   commands:
@@ -39,12 +59,9 @@
     <listitem><para>For partitioning:
     <command>fdisk</command>.</para></listitem>
     
-    <listitem><para>For initialising Ext2/Ext3 partitions:
-    <command>mke2fs</command>.  Ext3 is recommended; use the
-    <option>-j</option> to create a journalled file system.  For
-    faster access to the Nix store, you may also want to use the
-    <option>-O dir_index</option>.  It is also recommended that you
-    assign a unique symbolic label to the file system using the option
+    <listitem><para>For initialising Ext4 partitions:
+    <command>mkfs.ext4</command>.  It is recommended that you assign a
+    unique symbolic label to the file system using the option
     <option>-L <replaceable>label</replaceable></option>.  This will
     make the file system configuration independent from device
     changes.</para></listitem>
@@ -62,43 +79,42 @@ $ vgcreate MyVolGroup /dev/sda1 /dev/sdb1
 $ lvcreate --size 2G --name bigdisk MyVolGroup 
 $ lvcreate --size 1G --name smalldisk MyVolGroup</screen>
 
-    Possibly you’ll need to do <userinput>initctl start
-    lvm</userinput> after this (TODO: check whether this is
-    needed).</para></listitem>
+    </para></listitem>
 
-    <listitem><para>For creating software RAID devices:
+    <listitem><para>For creating software RAID devices, use
     <command>mdadm</command>.</para></listitem>
 
   </itemizedlist>
 
   </para></listitem>
     
-  <listitem><para>Mount the target file system on
-  <filename>/mnt</filename> on which NixOS would be installed.</para>
-  </listitem>
+  <listitem><para>Mount the target file system on which NixOS should
+  be installed on <filename>/mnt</filename>.</para></listitem>
 
   <listitem>
 
-    <para>Generate a template configuration for the target system:</para>
-
-    <para>The command <command>nixos-option</command> can
-    generate an initial configuration file for you, i.e.,
+    <para>You now need to create a file
+    <filename>/mnt/etc/nixos/configuration.nix</filename> that
+    specifies the intended configuration of the system.  This is
+    because NixOS has a <emphasis>declarative</emphasis> configuration
+    model: you create or edit a description of the configuration that
+    you want to be built and activated, and then NixOS takes care of
+    realising that configuration.  The command
+    <command>nixos-option</command> can generate an initial
+    configuration file for you:
 
 <screen>
 $ nixos-option --install</screen>
 
-    It tries to figure out the modules necessary for mounting the root
-    device, as well as various other hardware characteristics.
-    However, it doesn’t try to figure out the 
+    It tries to figure out the kernel modules necessary for mounting
+    the root device, as well as various other hardware
+    characteristics.  However, it doesn’t try to figure out the
     <option>fileSystems</option> option yet.</para>
 
-    <para>Edit <filename>/mnt/etc/nixos/configuration.nix</filename> to
-    configure your system.  The installation is declarative; you need to
-    write a description of the configuration that you want to be built and
-    activated.  The configuration is specified in a Nix expression and must
-    be stored <emphasis>on the target file system</emphasis>.  The text
-    editors <command>nano</command> and <command>vim</command> are
-    available.</para>
+    <para>You should edit
+    <filename>/mnt/etc/nixos/configuration.nix</filename> to suit your
+    needs.  The text editors <command>nano</command> and
+    <command>vim</command> are available.</para>
 
     <para>You need to specify a root file system in
     <option>fileSystems</option> and the target device for the Grub boot
@@ -110,26 +126,26 @@ $ nixos-option --install</screen>
     <option>boot.initrd.kernelModules</option> all kernel modules that
     are necessary for mounting the root file system, otherwise the
     installed system will not be able to boot.  (If this happens, boot
-    from CD again, mount the target file system on
+    from the CD again, mount the target file system on
     <filename>/mnt</filename>, fix
     <filename>/mnt/etc/nixos/configuration.nix</filename> and rerun
-    <filename>nixos-install</filename>.)
-    <command>nixos-hardware-scan</command> should figure out the
-    required modules in most cases.</para></note>
+    <filename>nixos-install</filename>.)  In most cases,
+    <command>nixos-option --install</command> will figure out the
+    required modules.</para></note>
 
-    <para>Examples are available in
-    <filename>/etc/nixos/nixos/doc/config-examples</filename> and some
-    actual NixOS configuration can be found at <link
+    <para>Examples of real-world NixOS configuration files can be
+    found at <link
     xlink:href="https://nixos.org/repos/nix/configurations/trunk/"/>.</para>
 
   </listitem>
-
+  
   <listitem><para>If your machine has a limited amount of memory, you
   may want to activate swap devices now (<command>swapon
   <replaceable>device</replaceable></command>).  The installer (or
   rather, the build actions that it may spawn) may need quite a bit of
   RAM, depending on your configuration.</para></listitem>
 
+  <!--
   <listitem><para>Optionally, you can run
 
 <screen>
@@ -137,6 +153,7 @@ $ nixos-checkout</screen>
 
   to make the installer use the latest NixOS/Nixpkgs sources from the
   Subversion repository, rather than the sources on CD.</para></listitem>
+  -->
 
   <listitem><para>Do the installation:
 
@@ -145,7 +162,7 @@ $ nixos-install</screen>
 
     Cross fingers.</para></listitem>
 
-    <listitem><para>If everything went well:
+  <listitem><para>If everything went well:
 
 <screen>
 $ reboot</screen>
@@ -159,7 +176,7 @@ $ reboot</screen>
     configurations</emphasis> (initially just one).  Every time you
     change the NixOS configuration (see <xref
     linkend="sec-changing-config" />), a new item appears in the menu.
-    This allows you to go back easily to another configuration if
+    This allows you to easily roll back to another configuration if
     something goes wrong.</para>
 
     <para>You should log in and change the <literal>root</literal>
@@ -192,10 +209,8 @@ $ nix-env -i w3m</screen>
 
 <para><xref linkend="ex-install-sequence" /> shows a typical sequence
 of commands for installing NixOS on an empty hard drive (here
-<filename>/dev/sda).  <xref linkend="ex-config" /> shows a
-corresponding configuration Nix expression.</filename>
-
-</para>
+<filename>/dev/sda</filename>).  <xref linkend="ex-config" /> shows a
+corresponding configuration Nix expression.</para>
 
 <example xml:id='ex-install-sequence'><title>Commands for installing NixOS on <filename>/dev/sda</filename></title>
 <screen>
-- 
GitLab


From ae8d4a2f7cc54cb7a8208cf0fdc460b55ffcddde Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 14 May 2012 03:59:38 +0000
Subject: [PATCH 3668/5331] * Describe the NixOS channel.

svn path=/nixos/trunk/; revision=34084
---
 doc/manual/development.xml  | 99 ++++++++++++++++++++++++-------------
 doc/manual/installation.xml | 71 +++++++++++++++-----------
 doc/manual/manual.xml       |  4 +-
 3 files changed, 108 insertions(+), 66 deletions(-)

diff --git a/doc/manual/development.xml b/doc/manual/development.xml
index 621e9fd4ffe..918bbe08a1a 100644
--- a/doc/manual/development.xml
+++ b/doc/manual/development.xml
@@ -7,6 +7,39 @@
 NixOS.</para>
 
 
+<!--===============================================================-->
+
+<section>
+
+<title>Hacking on NixOS</title>
+
+<para>By default, NixOS’s <command>nixos-rebuild</command> command
+uses the NixOS and Nixpkgs sources provided by the
+<literal>nixos-unstable</literal> channel (kept in
+<filename>/nix/var/nix/profiles/per-user/root/channels/nixos</filename>).
+To modify NixOS, however, you should check out the latest sources from
+Subversion.  This is done using the following command:
+
+<screen>
+$ nixos-checkout
+</screen>
+
+This will check out the latest NixOS sources to
+<filename>/etc/nixos/nixos</filename> and the Nixpkgs sources to
+<filename>/etc/nixos/nixpkgs</filename>.  If you want to rebuild your
+system using your (modified) sources, you need to tell
+<command>nixos-rebuild</command> about them using the
+<option>-I</option> flag:
+
+<screen>
+$ nixos-rebuild -I /etc/nixos
+</screen>
+
+</para>
+
+</section>
+
+
 <!--===============================================================-->
 
 <section>
@@ -49,12 +82,12 @@ NixOS.</para>
 
 <example xml:id='module-syntax'><title>Usual module content</title>
 <programlisting>
-{config, pkgs, ...}: <co xml:id='module-syntax-1' />
+{ config, pkgs, ... }: <co xml:id='module-syntax-1' />
 
 {
-  imports = [
-    <co xml:id='module-syntax-2' />
-  ];
+  imports =
+    [ <co xml:id='module-syntax-2' />
+    ];
 
   options = {
     <co xml:id='module-syntax-3' />
@@ -180,7 +213,7 @@ NixOS.</para>
 
 <example xml:id='locate-example'><title>Locate Module Example</title>
 <programlisting>
-{config, pkgs, ...}:
+{ config, pkgs, ... }:
 
 with pkgs.lib;
 
@@ -200,9 +233,7 @@ let
 in
 
 {
-  imports = [
-    /etc/nixos/nixos/modules/services/scheduling/cron.nix
-  ];
+  imports = [ /etc/nixos/nixos/modules/services/scheduling/cron.nix ];
 
   options = {
     services.locate = {
@@ -402,9 +433,9 @@ $ qemu-system-x86_64 -kernel ./kernel/bzImage -initrd ./initrd/initrd -hda /dev/
     Nix package manager is installed.</para></footnote> from the NixOS
     source tree as follows:
 
-    <screen>
-      $ nix-build tests/ -A nfs.test
-    </screen>
+<screen>
+$ nix-build tests/ -A nfs.test
+</screen>
 
     This performs an automated test of the NFS client and server
     functionality in the Linux kernel, including file locking
@@ -422,19 +453,19 @@ $ qemu-system-x86_64 -kernel ./kernel/bzImage -initrd ./initrd/initrd -hda /dev/
     <filename>log.html</filename>, which can be viewed using a web
     browser like this:
 
-    <screen>
-      $ icecat result/log.html
-    </screen>
+<screen>
+$ icecat result/log.html
+</screen>
   </para>
 
   <para>
     It is also possible to run the test environment interactively,
     allowing you to experiment with the VMs.  For example:
 
-    <screen>
-      $ nix-build tests/ -A nfs.driver
-      $ ./result/bin/nixos-run-vms
-    </screen>
+<screen>
+$ nix-build tests/ -A nfs.driver
+$ ./result/bin/nixos-run-vms
+</screen>
 
     The script <command>nixos-run-vms</command> starts the three
     virtual machines defined in the NFS test using QEMU/KVM.  The root
@@ -447,26 +478,26 @@ $ qemu-system-x86_64 -kernel ./kernel/bzImage -initrd ./initrd/initrd -hda /dev/
     Finally, the test itself can be run interactively.  This is
     particularly useful when developing or debugging a test:
 
-    <screen>
-      $ nix-build tests/ -A nfs.driver
-      $ ./result/bin/nixos-test-driver
-      starting VDE switch for network 1
-      &gt;
-    </screen>
+<screen>
+$ nix-build tests/ -A nfs.driver
+$ ./result/bin/nixos-test-driver
+starting VDE switch for network 1
+&gt;
+</screen>
 
     Perl statements can now be typed in to start or manipulate the
     VMs:
 
-    <screen>
-      &gt; startAll;
-      (the VMs start booting)
-      &gt; $server-&gt;waitForJob("nfs-kernel-nfsd");
-      &gt; $client1-&gt;succeed("flock -x /data/lock -c 'sleep 100000' &amp;");
-      &gt; $client2-&gt;fail("flock -n -s /data/lock true");
-      &gt; $client1-&gt;shutdown;
-      (this releases client1's lock)
-      &gt; $client2-&gt;succeed("flock -n -s /data/lock true");
-    </screen>
+<screen>
+&gt; startAll;
+(the VMs start booting)
+&gt; $server-&gt;waitForJob("nfs-kernel-nfsd");
+&gt; $client1-&gt;succeed("flock -x /data/lock -c 'sleep 100000' &amp;");
+&gt; $client2-&gt;fail("flock -n -s /data/lock true");
+&gt; $client1-&gt;shutdown;
+(this releases client1's lock)
+&gt; $client2-&gt;succeed("flock -n -s /data/lock true");
+</screen>
 
     The function <command>testScript</command> executes the entire
     test script and drops you back into the test driver command line
diff --git a/doc/manual/installation.xml b/doc/manual/installation.xml
index fda5c1491f4..0a69ce0ecba 100644
--- a/doc/manual/installation.xml
+++ b/doc/manual/installation.xml
@@ -228,19 +228,16 @@ $ reboot</screen>
 <example xml:id='ex-config'><title>NixOS configuration</title>
 <screen>
 {
-  boot.initrd.kernelModules = [ "ata_piix" ];
-  boot.loader.grub.enable = true;
   boot.loader.grub.device = "/dev/sda";
 
-  fileSystems = [
-    { mountPoint = "/";
-      label = "nixos";
-    }
-  ];
+  fileSystems =
+    [ { mountPoint = "/";
+        device = "/dev/disk/by-label/nixos";
+      }
+    ];
 
-  swapDevices = [
-    { label = "swap"; }
-  ];
+  swapDevices =
+    [ { device = "/dev/disk/by-label/swap"; } ];
   
   services.sshd.enable = true;
 }</screen>
@@ -258,15 +255,13 @@ $ reboot</screen>
 
 <para>The file <filename>/etc/nixos/configuration.nix</filename>
 contains the current configuration of your machine.  Whenever you’ve
-changed something to that file, or to the NixOS/Nixpkgs sources in
-<filename>/etc/nixos/nixos</filename> and
-<filename>/etc/nixos/nixpkgs</filename>, respectively, you should do
+changed something to that file, you should do
 
 <screen>
 $ nixos-rebuild switch</screen>
 
 to build the new configuration, make it the default configuration for
-booting, and try to effect the configuration in the running system
+booting, and try to realise the configuration in the running system
 (e.g., by restarting system services).</para>
 
 <para>You can also do 
@@ -296,6 +291,20 @@ $ nixos-rebuild build</screen>
 to build the configuration but nothing more.  This is useful to see
 whether everything compiles cleanly.</para>
 
+<para>If you have a machine that supports hardware virtualisation, you
+can also test the new configuration in a sandbox by building and
+running a <emphasis>virtual machine</emphasis> that contains the
+desired configuration.  Just do
+
+<screen>
+$ nixos-rebuild build-vm
+$ ./result/bin/run-*-vm
+</screen>
+
+The VM does not have use any data from your host system, so your
+existing user accounts and home directories will not be
+available.</para>
+
 </section>
 
 
@@ -304,28 +313,32 @@ whether everything compiles cleanly.</para>
 
 <section>
 
-<title>Keeping NixOS up to date</title>
+<title>Upgrading NixOS</title>
 
-<para>The currently best way to keep your NixOS installation up to
-date is to track the NixOS Subversion repository.  The program
-<command>nixos-checkout</command> does that for you.  It will
-check if the NixOS/NixPkgs sources are present and if they are under a
-version control system (VCS) before updating them to the latest version.  If your
-sources are not under a VCS, then you can rename them before
-running <command>nixos-checkout</command> which will checkout the sources.</para>
+<para>The best way to keep your NixOS installation up to date is to
+use the <literal>nixos-unstable</literal> channel.  (A channel is a
+Nix mechanism for distributing Nix expressions and associated
+binaries.)  The NixOS channel is updated automatically from NixOS’s
+Subversion repository after running certain tests and building most
+packages.</para>
 
-<para>To build the latest and greatest, do
+<para>NixOS automatically subscribes you to the NixOS channel.  If for
+some reason this is not the case, just do
 
 <screen>
-$ nixos-checkout
-$ nixos-rebuild switch</screen>
+$ nix-channel --add http://nixos.org/releases/nixos/channels/nixos-unstable
+</screen>
 
-(Or instead of <literal>switch</literal>, use any of the alternatives
-shown in <xref linkend="sec-changing-config"/>.)</para>
-
-</section>
+You can then upgrade NixOS to the latest version in the channel by
+running
 
+<screen>
+$ nix-channel --update
+</screen>
 
+and running the <command>nixos-rebuild</command> command as described
+in <xref linkend="sec-changing-config"/>.</para>
 
+</section>
 
 </chapter>
diff --git a/doc/manual/manual.xml b/doc/manual/manual.xml
index ff08a577ca0..b7852e9f1b1 100644
--- a/doc/manual/manual.xml
+++ b/doc/manual/manual.xml
@@ -21,9 +21,7 @@
     </author>
 
     <copyright>
-      <year>2007</year>
-      <year>2008</year>
-      <year>2009</year>
+      <year>2007-2012</year>
       <holder>Eelco Dolstra</holder>
     </copyright>
     
-- 
GitLab


From 846cb8123407710cc93754093ed2f4dd2c3516d8 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 14 May 2012 04:01:47 +0000
Subject: [PATCH 3669/5331] * Comment out the "Configuration in home directory"
 chapter.   Everything described in that chapter is a bug (e.g. needing to  
 manually create symlinks) that properly belongs in the issue tracker   or
 wiki, not in the manual.

svn path=/nixos/trunk/; revision=34085
---
 doc/manual/manual.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/manual/manual.xml b/doc/manual/manual.xml
index b7852e9f1b1..b7e4c6315f9 100644
--- a/doc/manual/manual.xml
+++ b/doc/manual/manual.xml
@@ -50,7 +50,7 @@
   
 
   <xi:include href="installation.xml" />
-  <xi:include href="userconfiguration.xml" />
+  <!-- <xi:include href="userconfiguration.xml" /> -->
   <xi:include href="troubleshooting.xml" />
   <xi:include href="development.xml" />
   <chapter xml:id="ch-options">
-- 
GitLab


From 29b05fb62a7594266a3bf20a46b22f46d3044c7c Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 14 May 2012 04:12:43 +0000
Subject: [PATCH 3670/5331] * nixos-checkout: add an argument to specify the
 directory where the   sources should be stored.  E.g. "nixos-checkout
 /home/eelco/srcs"   will check out to /home/eelco/srcs/{nixos,nixpkgs}. 
 Probably the   /etc/nixos default should be removed eventually because /etc
 is a   pretty weird place to keep large source trees.

svn path=/nixos/trunk/; revision=34086
---
 doc/manual/development.xml                 | 13 +++++++------
 modules/installer/tools/nixos-checkout.nix |  7 ++++++-
 2 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/doc/manual/development.xml b/doc/manual/development.xml
index 918bbe08a1a..017a0f007fa 100644
--- a/doc/manual/development.xml
+++ b/doc/manual/development.xml
@@ -21,18 +21,19 @@ To modify NixOS, however, you should check out the latest sources from
 Subversion.  This is done using the following command:
 
 <screen>
-$ nixos-checkout
+$ nixos-checkout <replaceable>/my/sources</replaceable>
 </screen>
 
 This will check out the latest NixOS sources to
-<filename>/etc/nixos/nixos</filename> and the Nixpkgs sources to
-<filename>/etc/nixos/nixpkgs</filename>.  If you want to rebuild your
-system using your (modified) sources, you need to tell
-<command>nixos-rebuild</command> about them using the
+<filename><replaceable>/my/sources</replaceable>/nixos</filename> and
+the Nixpkgs sources to
+<filename><replaceable>/my/sources</replaceable>/nixpkgs</filename>.
+If you want to rebuild your system using your (modified) sources, you
+need to tell <command>nixos-rebuild</command> about them using the
 <option>-I</option> flag:
 
 <screen>
-$ nixos-rebuild -I /etc/nixos
+$ nixos-rebuild switch -I <replaceable>/my/sources</replaceable>
 </screen>
 
 </para>
diff --git a/modules/installer/tools/nixos-checkout.nix b/modules/installer/tools/nixos-checkout.nix
index f90d24b0864..d591c01df19 100644
--- a/modules/installer/tools/nixos-checkout.nix
+++ b/modules/installer/tools/nixos-checkout.nix
@@ -14,7 +14,12 @@ let
     isExecutable = true;
     src = pkgs.writeScript "nixos-checkout"
       ''
-        cd /etc/nixos
+        #! ${pkgs.stdenv.shell} -e
+        
+        prefix="$1"
+        if [ -z "$prefix" ]; then prefix=/etc/nixos; fi
+        mkdir -p "$prefix"
+        cd "$prefix"
 
         # Move any old nixos or nixpkgs directories out of the way.
         backupTimestamp=$(date "+%Y%m%d%H%M%S")
-- 
GitLab


From 3b314fa40b334a950704a16d53bd55a91f5c0f2a Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 14 May 2012 23:43:38 +0000
Subject: [PATCH 3671/5331] * Include cryptsetup in EC2 AMIs.

svn path=/nixos/trunk/; revision=34096
---
 modules/virtualisation/amazon-image.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/modules/virtualisation/amazon-image.nix b/modules/virtualisation/amazon-image.nix
index 55b1f5c0bd2..1891f816671 100644
--- a/modules/virtualisation/amazon-image.nix
+++ b/modules/virtualisation/amazon-image.nix
@@ -146,4 +146,7 @@ with pkgs.lib;
 
   # Force getting the hostname from EC2.
   networking.hostName = mkDefault "";
+
+  # Always include cryptsetup so that Charon can use it.
+  environment.systemPackages = [ pkgs.cryptsetup ];
 }
-- 
GitLab


From ea3cfc9287c0c4c891d41593f4179e30a09e3770 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 15 May 2012 02:49:47 +0000
Subject: [PATCH 3672/5331] * Add xdg-open to the default X11 configuration so
 that programs like   Chrome can open downloaded files.

svn path=/nixos/trunk/; revision=34097
---
 modules/services/x11/xserver.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/modules/services/x11/xserver.nix b/modules/services/x11/xserver.nix
index 2b8f6cf7d29..2ae42f5b41b 100644
--- a/modules/services/x11/xserver.nix
+++ b/modules/services/x11/xserver.nix
@@ -364,6 +364,7 @@ in
         xorg.xsetroot
         xorg.xprop
         pkgs.xterm
+        pkgs.xdg_utils
       ]
       ++ optional (elem "nvidia" driverNames) kernelPackages.nvidia_x11
       ++ optional (elem "nvidiaLegacy96" driverNames) kernelPackages.nvidia_x11_legacy96
-- 
GitLab


From 560262dae0df4a87b5d0182a9b487826a7ff978b Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 15 May 2012 13:50:36 +0000
Subject: [PATCH 3673/5331] * Fix "error: the group `nixbld' specified in
 `build-users-group' does   not exist" during nixos-install.

svn path=/nixos/trunk/; revision=34103
---
 modules/installer/tools/nixos-install.sh | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/modules/installer/tools/nixos-install.sh b/modules/installer/tools/nixos-install.sh
index 836e5562ba5..5937883b86b 100644
--- a/modules/installer/tools/nixos-install.sh
+++ b/modules/installer/tools/nixos-install.sh
@@ -153,12 +153,6 @@ NIX_PATH="/mnt$srcs/nixos:nixos-config=/mnt$NIXOS_CONFIG" NIXOS_CONFIG= \
     -p /nix/var/nix/profiles/system -f '<nixos>' --set -A system --show-trace
 
 
-# We're done building/downloading, so we don't need the /etc bind
-# mount anymore.  In fact, below we want to modify the target's /etc.
-umount $mountPoint/etc/nixos
-umount $mountPoint/etc
-
-
 # Copy the NixOS/Nixpkgs sources to the target as the initial contents
 # of the NixOS channel.
 echo "copying NixOS/Nixpkgs sources..."
@@ -171,6 +165,12 @@ mkdir -m 0700 -p $mountPoint/root/.nix-defexpr
 ln -s /nix/var/nix/profiles/per-user/root/channels $mountPoint/root/.nix-defexpr/channels
 
 
+# We're done building/downloading, so we don't need the /etc bind
+# mount anymore.  In fact, below we want to modify the target's /etc.
+umount $mountPoint/etc/nixos
+umount $mountPoint/etc
+
+
 # Grub needs an mtab.
 ln -sfn /proc/mounts $mountPoint/etc/mtab
 
-- 
GitLab


From dbf5e3229ef5957a08f38c5881895f504966b66c Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 15 May 2012 16:12:22 +0000
Subject: [PATCH 3674/5331] * Remove Nix's dependencies from the chroot.  Nix
 1.0 doesn't need   this anymore.

svn path=/nixos/trunk/; revision=34113
---
 modules/services/misc/nix-daemon.nix | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

diff --git a/modules/services/misc/nix-daemon.nix b/modules/services/misc/nix-daemon.nix
index be699d693fd..7c4da0c9405 100644
--- a/modules/services/misc/nix-daemon.nix
+++ b/modules/services/misc/nix-daemon.nix
@@ -170,7 +170,7 @@ in
       envVars = mkOption {
         internal = true;
         default = "";
-        type = with pkgs.lib.types; string;
+        type = types.string;
         description = "
           Environment variables used by Nix.
         ";
@@ -207,15 +207,9 @@ in
               # in `build-chroot-dirs' - otherwise any builder that uses
               # /bin/sh won't work.
               binshDeps = pkgs.writeReferencesToFile config.system.build.binsh;
-
-              # Likewise, if chroots are turned on, we need Nix's own
-              # closure in the chroot.  Otherwise nix-channel and nix-env
-              # won't work because the dependencies of its builders (like
-              # coreutils and Perl) aren't visible.  Sigh.
-              nixDeps = pkgs.writeReferencesToFile config.environment.nix;
             in
               pkgs.runCommand "nix.conf" {extraOptions = config.nix.extraOptions; } ''
-                extraPaths=$(for i in $(cat ${binshDeps} ${nixDeps}); do if test -d $i; then echo $i; fi; done)
+                extraPaths=$(for i in $(cat ${binshDeps}); do if test -d $i; then echo $i; fi; done)
                 cat > $out <<END
                 # WARNING: this file is generated.
                 build-users-group = nixbld
@@ -302,7 +296,7 @@ in
         export ftp_proxy=${config.nix.proxy}
       '';
 
-    users.extraUsers = map makeNixBuildUser (pkgs.lib.range 1 config.nix.nrBuildUsers);
+    users.extraUsers = map makeNixBuildUser (range 1 config.nix.nrBuildUsers);
 
     system.activationScripts.nix = stringAfter [ "etc" "users" ]
       ''
-- 
GitLab


From 28cc602751afad5679ca259656b0ba4a2bff906f Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 15 May 2012 20:42:13 +0000
Subject: [PATCH 3675/5331] * EBS creator: use the NixOS channel.

svn path=/nixos/trunk/; revision=34119
---
 maintainers/scripts/ec2/create-ebs-amis.py | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/maintainers/scripts/ec2/create-ebs-amis.py b/maintainers/scripts/ec2/create-ebs-amis.py
index 8bc293823f4..0afa6d564e3 100755
--- a/maintainers/scripts/ec2/create-ebs-amis.py
+++ b/maintainers/scripts/ec2/create-ebs-amis.py
@@ -51,13 +51,13 @@ m.run_command("mkdir -p /mnt")
 m.run_command("mount {0} /mnt".format(device))
 m.run_command("touch /mnt/.ebs")
 m.run_command("mkdir -p /mnt/etc/nixos")
-m.run_command("nixos-checkout") # FIXME
-m.run_command("cp -f /etc/nixos/nixos/modules/virtualisation/amazon-config.nix /mnt/etc/nixos/configuration.nix")
-m.run_command("echo -n pre$(svnversion -c /etc/nixos/nixos | sed 's/.*://')-$(svnversion -c /etc/nixos/nixpkgs | sed 's/.*://') > /etc/nixos/nixos/.version-suffix")
-version = m.run_command("nixos-option system.nixosVersion", capture_stdout=True).replace('"', '').rstrip()
+m.run_command("nix-channel --add http://nixos.org/releases/nixos/channels/nixos-unstable")
+m.run_command("nix-channel --update")
+m.run_command("nixos-rebuild switch")
+version = m.run_command("nixos-version", capture_stdout=True).replace('"', '').rstrip()
 print >> sys.stderr, "NixOS version is {0}".format(version)
+m.run_command("cp -f $(nix-instantiate --find-file nixos/modules/virtualisation/amazon-config.nix) /mnt/etc/nixos/configuration.nix")
 m.run_command("nixos-install")
-m.run_command("rm -rf /mnt/etc/nixos/nixos/.svn /mnt/etc/nixos/nixpkgs/.svn")
 if args.hvm:
     m.run_command('cp /nix/store/*-grub-0.97*/lib/grub/i386-pc/* /mnt/boot/grub')
     m.run_command('sed -i "s|hd0|hd0,0|" /mnt/boot/grub/menu.lst')
-- 
GitLab


From 07fcf5baee001ad0cc07155b0791c1bc68114ef5 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 15 May 2012 20:45:01 +0000
Subject: [PATCH 3676/5331] * Make the boot.initrd.luks.enable option obsolete.
  It's enough to   see that boot.initrd.luks.devices is non-empty.

svn path=/nixos/trunk/; revision=34120
---
 modules/system/boot/luksroot.nix | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/modules/system/boot/luksroot.nix b/modules/system/boot/luksroot.nix
index 7f9898770a9..ff11d284ef8 100644
--- a/modules/system/boot/luksroot.nix
+++ b/modules/system/boot/luksroot.nix
@@ -33,15 +33,13 @@ in
   options = {
     boot.initrd.luks.enable = mkOption {
       default = false;
-      description = '';
-        Have luks in the initrd.
-      '';
+      description = "Obsolete.";
     };
 
     boot.initrd.luks.devices = mkOption {
       default = [ ];
       example = [ { name = "luksroot"; device = "/dev/sda3"; preLVM = true; } ];
-      description = '';
+      description = ''
         The list of devices that should be decrypted using LUKS before trying to mount the
         root partition. This works for both LVM-over-LUKS and LUKS-over-LVM setups.
 
@@ -75,7 +73,7 @@ in
     };
   };
 
-  config = mkIf luks.enable {
+  config = mkIf (luks.devices != []) {
 
     # Some modules that may be needed for mounting anything ciphered
     boot.initrd.kernelModules = [ "aes_generic" "aes_x86_64" "dm_mod" "dm_crypt"
-- 
GitLab


From 6a6eec0f532149e16deabbfa3bb3f14ebf7f5557 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 16 May 2012 00:03:44 +0000
Subject: [PATCH 3677/5331] =?UTF-8?q?*=20Add=20a=20filesystem=20option=20?=
 =?UTF-8?q?=E2=80=98autoFormat=E2=80=99=20to=20automatically=20do=20a=20fo?=
 =?UTF-8?q?rmat=20if=20=20=20the=20device=20has=20no=20filesystem=20yet.?=
 =?UTF-8?q?=20=20Useful=20in=20Charon=20deployments.=20=20=20The=20check?=
 =?UTF-8?q?=20for=20an=20uninitialised=20filesystem=20is=20kind=20of=20sha?=
 =?UTF-8?q?ky=20now.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

svn path=/nixos/trunk/; revision=34133
---
 modules/tasks/filesystems.nix | 24 +++++++++++++++++++++++-
 1 file changed, 23 insertions(+), 1 deletion(-)

diff --git a/modules/tasks/filesystems.nix b/modules/tasks/filesystems.nix
index efa07d35ddc..19bfb7c4deb 100644
--- a/modules/tasks/filesystems.nix
+++ b/modules/tasks/filesystems.nix
@@ -15,7 +15,7 @@ let
           + " " + fs.fsType
           + " " + fs.options
           + " 0"
-          + " " + (if fs.fsType == "none" || fs.noCheck then "0" else
+          + " " + (if fs.fsType == "none" || fs.fsType == "btrfs" || fs.noCheck then "0" else
                    if fs.mountPoint == "/" then "1" else "2")
           + "\n"
       )}
@@ -117,6 +117,17 @@ in
           '';
         };
 
+        autoFormat = mkOption {
+          default = false;
+          type = types.bool;
+          description = ''
+            If the device does not currently contain a filesystem (as
+            determined by <command>blkid</command>, then automatically
+            format it with the filesystem type specified in
+            <option>fsType</option>.  Use with caution.
+          '';
+        };
+
         noCheck = mkOption {
           default = false;
           type = types.bool;
@@ -186,6 +197,17 @@ in
             # ${fstab}
             echo "mounting filesystems..."
 
+            # Format devices.
+            ${flip concatMapStrings config.fileSystems (fs: optionalString fs.autoFormat ''
+              if [ -e "${fs.device}" ]; then
+                type=$(blkid -p -s TYPE -o value "${fs.device}" || true)
+                if [ -z "$type" ]; then
+                  echo "creating ${fs.fsType} filesystem on ${fs.device}..."
+                  mkfs.${fs.fsType} "${fs.device}"
+                fi
+              fi
+            '')}
+
             # Create missing mount points.  Note that this won't work
             # if the mount point is under another mount point.
             ${flip concatMapStrings config.fileSystems (fs: optionalString fs.autocreate ''
-- 
GitLab


From a9a507eeded5538a2617ea2315dfdabf0e45a6f6 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 16 May 2012 15:08:44 +0000
Subject: [PATCH 3678/5331] * On headless systems, disable the emergency shell
 and redirect   mountall output to the standard Upstart job log file  
 (/var/log/upstart/mountall).

svn path=/nixos/trunk/; revision=34138
---
 modules/profiles/headless.nix | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/modules/profiles/headless.nix b/modules/profiles/headless.nix
index d607d6700c6..204980e9211 100644
--- a/modules/profiles/headless.nix
+++ b/modules/profiles/headless.nix
@@ -1,6 +1,10 @@
 # Common configuration for headless machines (e.g., Amazon EC2
 # instances).
 
+{ config, pkgs, ... }:
+
+with pkgs.lib;
+
 {
   sound.enable = false;
   boot.vesa = false;
@@ -10,4 +14,15 @@
 
   # Since we can't manually respond to a panic, just reboot.
   boot.kernelParams = [ "panic=1" "stage1panic=1" ];
+
+  # Since we don't have an (interactive) console, disable the
+  # emergency shell (started if mountall fails).
+  jobs."mount-failed".script = mkOverride 50
+    ''
+      ${pkgs.utillinux}/bin/logger -p user.emerg -t mountall "filesystem ‘$DEVICE’ could not be mounted on ‘$MOUNTPOINT’"
+    '';
+
+  # Likewise, redirect mountall output from the console to the default
+  # Upstart job log file.
+  jobs."mountall".console = mkOverride 50 "";
 }
-- 
GitLab


From 3ce8859551d2d6fd17aafa296336db1a0a4dface Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 17 May 2012 02:51:24 +0000
Subject: [PATCH 3679/5331] * Basic module for fail2ban.  Not configurable yet.
  It currently   blocks IP addresses if they make too many failed login
 attempts.

svn path=/nixos/trunk/; revision=34149
---
 modules/services/security/fail2ban.nix | 88 ++++++++++++++++++++++++++
 modules/tasks/network-interfaces.nix   |  2 +-
 2 files changed, 89 insertions(+), 1 deletion(-)
 create mode 100644 modules/services/security/fail2ban.nix

diff --git a/modules/services/security/fail2ban.nix b/modules/services/security/fail2ban.nix
new file mode 100644
index 00000000000..12f7b020eaa
--- /dev/null
+++ b/modules/services/security/fail2ban.nix
@@ -0,0 +1,88 @@
+{ config, pkgs, ... }:
+
+with pkgs.lib;
+
+let
+
+  fail2banConf = pkgs.writeText "fail2ban.conf"
+    ''
+      [Definition]
+      loglevel  = 3
+      logtarget = SYSLOG
+      socket    = /var/run/fail2ban/fail2ban.sock
+    '';
+
+  jailConf = pkgs.writeText "jail.conf"
+    ''
+      [DEFAULT]
+      bantime  = 120
+      findtime = 120
+      maxretry = 3
+      backend  = auto
+    
+      [ssh-iptables]
+      enabled  = true
+      filter   = sshd
+      action   = iptables[name=SSH, port=ssh, protocol=tcp]
+      logpath  = /var/log/warn
+      maxretry = 5
+    '';
+
+in
+    
+{
+
+  ###### interface
+
+  options = {
+
+  };
+
+  
+  ###### implementation
+
+  config = {
+
+    environment.systemPackages = [ pkgs.fail2ban ];
+
+    environment.etc =
+      [ { source = fail2banConf;
+          target = "fail2ban/fail2ban.conf";
+        }
+        { source = jailConf;
+          target = "fail2ban/jail.conf";
+        }
+        { source = "${pkgs.fail2ban}/etc/fail2ban/action.d";
+          target = "fail2ban/action.d";
+        }
+        { source = "${pkgs.fail2ban}/etc/fail2ban/filter.d";
+          target = "fail2ban/filter.d";
+        }
+      ];
+
+    jobs.fail2ban =
+      { description = "Fail2ban intrusion prevention system";
+      
+        startOn = "started networking";
+        
+        path = [ pkgs.fail2ban pkgs.iptables ];
+        
+        preStart =
+          ''
+            # ${fail2banConf} ${jailConf}
+            mkdir -p /var/run/fail2ban -m 0755
+          '';
+          
+        exec = "fail2ban-server -f";
+
+        postStart =
+          ''
+            fail2ban-client reload
+          '';
+        
+        respawn = false;
+      };
+  
+  };
+
+}
diff --git a/modules/tasks/network-interfaces.nix b/modules/tasks/network-interfaces.nix
index 866c34b86fe..c12f9b28ca9 100644
--- a/modules/tasks/network-interfaces.nix
+++ b/modules/tasks/network-interfaces.nix
@@ -274,7 +274,7 @@ in
 
     jobs.networking = {
       name = "networking";
-      description = "all required interfaces are up";
+      description = "All required interfaces are up";
       startOn = "started network-interfaces";
       stopOn  = "stopping network-interfaces";
       task = true;
-- 
GitLab


From 88b3c4b82e2649ac17e6172eb3bb27c77499f82a Mon Sep 17 00:00:00 2001
From: Mathijs Kwik <mathijs@bluescreen303.nl>
Date: Thu, 17 May 2012 10:17:32 +0000
Subject: [PATCH 3680/5331] Provided a workaround for grub's missing-devices
 check, so nested child configurations can still build.

svn path=/nixos/trunk/; revision=34153
---
 modules/installer/grub/grub.nix        | 10 +++++++++-
 modules/system/activation/no-clone.nix |  3 ++-
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/modules/installer/grub/grub.nix b/modules/installer/grub/grub.nix
index 97e5f12d048..73841b3778b 100644
--- a/modules/installer/grub/grub.nix
+++ b/modules/installer/grub/grub.nix
@@ -136,6 +136,14 @@ in
         '';
       };
 
+      ignoreDevicesCheck = mkOption {
+        default = false;
+        description = ''
+          (internal use) Don't throw an error when devices aren't given
+          useful for building nested child configurations
+        '';
+      };
+
       splashImage = mkOption {
         default =
           if config.boot.loader.grub.version == 1
@@ -197,7 +205,7 @@ in
 
     boot.loader.grub.devices = optional (cfg.device != "") cfg.device;
 
-    system.build = mkAssert (cfg.devices != [])
+    system.build = mkAssert (cfg.devices != [] || cfg.ignoreDevicesCheck)
       "You must set the ‘boot.loader.grub.device’ option to make the system bootable."
       { menuBuilder = grubMenuBuilder;
         inherit grub;
diff --git a/modules/system/activation/no-clone.nix b/modules/system/activation/no-clone.nix
index 74df217a01a..c78086466d1 100644
--- a/modules/system/activation/no-clone.nix
+++ b/modules/system/activation/no-clone.nix
@@ -6,8 +6,9 @@ with pkgs.lib;
 
 {
   boot.loader.grub.device = mkOverrideTemplate 0 {} "";
-  # undefined the obsolete name of the previous option.
+  # undefine the obsolete name of the previous option.
   boot.grubDevice = mkOverrideTemplate 0 {} pkgs.lib.mkNotdef;
+  boot.loader.grub.ignoreDevicesCheck = mkOverrideTemplate 0 {} true;
   nesting.children = mkOverrideTemplate 0 {} [];
   nesting.clone = mkOverrideTemplate 0 {} [];
 }
-- 
GitLab


From c10b41ad99473d7a4d233e3d8525bd42e71a7f2e Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 17 May 2012 18:19:48 +0000
Subject: [PATCH 3681/5331] * Make the fail2ban module configurable.

svn path=/nixos/trunk/; revision=34157
---
 modules/services/security/fail2ban.nix | 108 +++++++++++++++++++------
 1 file changed, 83 insertions(+), 25 deletions(-)

diff --git a/modules/services/security/fail2ban.nix b/modules/services/security/fail2ban.nix
index 12f7b020eaa..48756fbeebc 100644
--- a/modules/services/security/fail2ban.nix
+++ b/modules/services/security/fail2ban.nix
@@ -4,38 +4,76 @@ with pkgs.lib;
 
 let
 
-  fail2banConf = pkgs.writeText "fail2ban.conf"
-    ''
-      [Definition]
-      loglevel  = 3
-      logtarget = SYSLOG
-      socket    = /var/run/fail2ban/fail2ban.sock
-    '';
+  cfg = config.services.fail2ban;
+
+  fail2banConf = pkgs.writeText "fail2ban.conf" cfg.daemonConfig;
 
   jailConf = pkgs.writeText "jail.conf"
-    ''
-      [DEFAULT]
-      bantime  = 120
-      findtime = 120
-      maxretry = 3
-      backend  = auto
-    
-      [ssh-iptables]
-      enabled  = true
-      filter   = sshd
-      action   = iptables[name=SSH, port=ssh, protocol=tcp]
-      logpath  = /var/log/warn
-      maxretry = 5
-    '';
+    (concatStringsSep "\n" (attrValues (flip mapAttrs cfg.jails (name: def:
+      optionalString (def != "") 
+        ''
+          [${name}]
+          ${def}
+        ''))));
 
 in
-    
+
 {
 
   ###### interface
 
   options = {
 
+    services.fail2ban = {
+
+      daemonConfig = mkOption {
+        default =
+          ''
+            [Definition]
+            loglevel  = 3
+            logtarget = SYSLOG
+            socket    = /var/run/fail2ban/fail2ban.sock
+          '';
+        type = types.string;
+        description =
+          ''
+            The contents of Fail2ban's main configuration file.  It's
+            generally not necessary to change it.
+          '';
+      };
+
+      jails = mkOption {
+        default = { };
+        example =
+          { "apache-nohome-iptables" =
+              ''
+                # Block an IP address if it accesses a non-existent
+                # home directory more than 5 times in 10 minutes,
+                # since that indicates that it's scanning.
+                filter   = apache-nohome
+                action   = iptables-multiport[name=HTTP, port="http,https"]
+                logpath  = /var/log/httpd/error_log*
+                findtime = 600
+                bantime  = 600
+                maxretry = 5
+              '';
+          };
+        type = types.attrsOf types.string;
+        description =
+          ''
+            The configuration of each Fail2ban “jail”.  A jail
+            consists of an action (such as blocking a port using
+            <command>iptables</command>) that is triggered when a
+            filter applied to a log file triggers more than a certain
+            number of times in a certain time period.  Actions are
+            defined in <filename>/etc/fail2ban/action.d</filename>,
+            while filters are defined in
+            <filename>/etc/fail2ban/filter.d</filename>.
+          '';
+      };
+      
+    };
+
   };
 
   
@@ -69,6 +107,8 @@ in
         
         preStart =
           ''
+            # FIXME: this won't detect changes to
+            # /etc/fail2ban/{filter.d,action.d}.
             # ${fail2banConf} ${jailConf}
             mkdir -p /var/run/fail2ban -m 0755
           '';
@@ -79,10 +119,28 @@ in
           ''
             fail2ban-client reload
           '';
-        
-        respawn = false;
       };
-  
+
+    # Add some reasonable default jails.  The special "DEFAULT" jail
+    # sets default values for all other jails.
+    services.fail2ban.jails.DEFAULT =
+      ''
+        ignoreip = 127.0.0.1/8
+        bantime  = 600
+        findtime = 600
+        maxretry = 3
+        backend  = auto
+      '';
+
+    # Block SSH if there are too many failing connection attempts.
+    services.fail2ban.jails."ssh-iptables" =
+      ''
+        filter   = sshd
+        action   = iptables[name=SSH, port=ssh, protocol=tcp]
+        logpath  = /var/log/warn
+        maxretry = 5
+      '';
+    
   };
 
 }
-- 
GitLab


From 91acb81b11fe5264b36057643cf01691498a0e0a Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 17 May 2012 18:43:45 +0000
Subject: [PATCH 3682/5331] * Support globbing in the source attribute of
 environment.etc entries.

svn path=/nixos/trunk/; revision=34158
---
 modules/services/security/fail2ban.nix |  4 +--
 modules/system/etc/make-etc.sh         | 41 +++++++++++++++++++-------
 2 files changed, 32 insertions(+), 13 deletions(-)

diff --git a/modules/services/security/fail2ban.nix b/modules/services/security/fail2ban.nix
index 48756fbeebc..3c3519a9db7 100644
--- a/modules/services/security/fail2ban.nix
+++ b/modules/services/security/fail2ban.nix
@@ -90,10 +90,10 @@ in
         { source = jailConf;
           target = "fail2ban/jail.conf";
         }
-        { source = "${pkgs.fail2ban}/etc/fail2ban/action.d";
+        { source = "${pkgs.fail2ban}/etc/fail2ban/action.d/*.conf";
           target = "fail2ban/action.d";
         }
-        { source = "${pkgs.fail2ban}/etc/fail2ban/filter.d";
+        { source = "${pkgs.fail2ban}/etc/fail2ban/filter.d/*.conf";
           target = "fail2ban/filter.d";
         }
       ];
diff --git a/modules/system/etc/make-etc.sh b/modules/system/etc/make-etc.sh
index a5866d0a349..6075bdb2673 100644
--- a/modules/system/etc/make-etc.sh
+++ b/modules/system/etc/make-etc.sh
@@ -1,23 +1,42 @@
 source $stdenv/setup
 
-ensureDir $out/etc
+mkdir -p $out/etc
 
+set -f
 sources_=($sources)
 targets_=($targets)
 modes_=($modes)
+set +f
+
 for ((i = 0; i < ${#targets_[@]}; i++)); do
-    ensureDir $out/etc/$(dirname ${targets_[$i]})
-    if ! test -e $out/etc/${targets_[$i]}; then
-        ln -s ${sources_[$i]} $out/etc/${targets_[$i]};
+    source="${sources_[$i]}"
+    target="${targets_[$i]}"
+
+    if [[ "$source" =~ '*' ]]; then
+
+        # If the source name contains '*', perform globbing.
+        mkdir -p $out/etc/$target
+        for fn in $source; do
+            ln -s "$fn" $out/etc/$target/
+        done
+
     else
-        echo "Duplicate entry ${targets_[$i]} -> ${sources_[$i]}"
-        if test "$(readlink $out/etc/${targets_[$i]})" != "${sources_[$i]}"; then
-            echo "Mismatched duplicate entry $(readlink $out/etc/${targets_[$i]}) <-> ${sources_[$i]}"
-            exit 1
+        
+        mkdir -p $out/etc/$(dirname $target)
+        if ! [ -e $out/etc/$target ]; then
+            ln -s $source $out/etc/$target
+        else
+            echo "Duplicate entry $target -> $source"
+            if test "$(readlink $out/etc/$target)" != "$source"; then
+                echo "Mismatched duplicate entry $(readlink $out/etc/$target) <-> $source"
+                exit 1
+            fi
+        fi
+        
+        if test "${modes_[$i]}" != symlink; then
+            echo "${modes_[$i]}" > $out/etc/$target.mode
         fi
-    fi;
-    if test "${modes_[$i]}" != symlink; then
-        echo "${modes_[$i]}" > $out/etc/${targets_[$i]}.mode
+        
     fi
 done
 
-- 
GitLab


From e9e6885d3b7ede0aef94082f7cf9122cab54edf0 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 17 May 2012 19:33:12 +0000
Subject: [PATCH 3683/5331] * Lower the limits on /run and /dev.

svn path=/nixos/trunk/; revision=34159
---
 modules/system/boot/stage-2.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/system/boot/stage-2.nix b/modules/system/boot/stage-2.nix
index 906f5e69188..c92c29d6aef 100644
--- a/modules/system/boot/stage-2.nix
+++ b/modules/system/boot/stage-2.nix
@@ -15,7 +15,7 @@ let
       };
 
       devSize = pkgs.lib.mkOption {
-        default = "50%";
+        default = "5%";
         example = "32m";
         description = ''
           Size limit for the /dev tmpfs. Look at mount(8), tmpfs size option,
@@ -33,7 +33,7 @@ let
       };
 
       runSize = pkgs.lib.mkOption {
-        default = "50%";
+        default = "25%";
         example = "256m";
         description = ''
           Size limit for the /run tmpfs. Look at mount(8), tmpfs size option,
-- 
GitLab


From f889ebc4881b45d5238028f5469377b4c9416984 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 17 May 2012 19:33:55 +0000
Subject: [PATCH 3684/5331] * Allow runtime changes to boot.devShmSize and
 friends.

svn path=/nixos/trunk/; revision=34160
---
 modules/system/activation/activation-script.nix | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/modules/system/activation/activation-script.nix b/modules/system/activation/activation-script.nix
index f4baebd2b2b..083e3767ed8 100644
--- a/modules/system/activation/activation-script.nix
+++ b/modules/system/activation/activation-script.nix
@@ -144,6 +144,13 @@ in
         mv /usr/bin/.env.tmp /usr/bin/env # atomically replace /usr/bin/env
       '';
 
+    system.activationScripts.tmpfs =
+      ''
+        ${pkgs.utillinux}/bin/mount -o "remount,size=${config.boot.devSize}" /dev
+        ${pkgs.utillinux}/bin/mount -o "remount,size=${config.boot.devShmSize}" /dev/shm
+        ${pkgs.utillinux}/bin/mount -o "remount,size=${config.boot.runSize}" /run
+      '';
+
   };
 
 }
-- 
GitLab


From 801cd7402cf043e2c665e3fe6767aad5eb919ed2 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 17 May 2012 19:43:32 +0000
Subject: [PATCH 3685/5331] =?UTF-8?q?*=20Don't=20use=20=E2=80=98chown=20us?=
 =?UTF-8?q?er.group=E2=80=99=20since=20that=20syntax=20is=20not=20official?=
 =?UTF-8?q?ly=20=20=20supported=20(you're=20supposed=20to=20say=20?=
 =?UTF-8?q?=E2=80=98chown=20user:group=E2=80=99).?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

svn path=/nixos/trunk/; revision=34161
---
 modules/installer/tools/nixos-install.sh     | 2 +-
 modules/security/policykit.nix               | 6 +++---
 modules/services/mail/dovecot.nix            | 2 +-
 modules/services/mail/dovecot2.nix           | 2 +-
 modules/services/mail/postfix.nix            | 6 +++---
 modules/services/misc/nix-daemon.nix         | 2 +-
 modules/services/monitoring/systemhealth.nix | 4 ++--
 7 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/modules/installer/tools/nixos-install.sh b/modules/installer/tools/nixos-install.sh
index 5937883b86b..13b62b5dc7f 100644
--- a/modules/installer/tools/nixos-install.sh
+++ b/modules/installer/tools/nixos-install.sh
@@ -80,7 +80,7 @@ mkdir -m 0755 -p \
     $mountPoint/nix/var/log/nix/drvs
 
 mkdir -m 1775 -p $mountPoint/nix/store
-chown root.nixbld $mountPoint/nix/store
+chown root:nixbld $mountPoint/nix/store
 
 
 # Get the store paths to copy from the references graph.
diff --git a/modules/security/policykit.nix b/modules/security/policykit.nix
index 0d56a519e81..5aa02950f74 100644
--- a/modules/security/policykit.nix
+++ b/modules/security/policykit.nix
@@ -64,15 +64,15 @@ in
     system.activationScripts.policyKit = stringAfter [ "users" ]
       ''
         mkdir -m 0770 -p /var/run/PolicyKit
-        chown root.polkituser /var/run/PolicyKit
+        chown root:polkituser /var/run/PolicyKit
 
         mkdir -m 0770 -p /var/lib/PolicyKit
-        chown root.polkituser /var/lib/PolicyKit
+        chown root:polkituser /var/lib/PolicyKit
 
         mkdir -p /var/lib/misc
         touch /var/lib/misc/PolicyKit.reload
         chmod 0664 /var/lib/misc/PolicyKit.reload
-        chown polkituser.polkituser /var/lib/misc/PolicyKit.reload
+        chown polkituser:polkituser /var/lib/misc/PolicyKit.reload
       '';
 
   };
diff --git a/modules/services/mail/dovecot.nix b/modules/services/mail/dovecot.nix
index 4c6ee85ac31..ff41c8f4302 100644
--- a/modules/services/mail/dovecot.nix
+++ b/modules/services/mail/dovecot.nix
@@ -119,7 +119,7 @@ in
         preStart =
           ''
             ${pkgs.coreutils}/bin/mkdir -p /var/run/dovecot /var/run/dovecot/login
-            ${pkgs.coreutils}/bin/chown -R ${cfg.user}.${cfg.group} /var/run/dovecot
+            ${pkgs.coreutils}/bin/chown -R ${cfg.user}:${cfg.group} /var/run/dovecot
           '';
 
         exec = "${pkgs.dovecot}/sbin/dovecot -F -c ${confFile}";
diff --git a/modules/services/mail/dovecot2.nix b/modules/services/mail/dovecot2.nix
index 15a0ecce325..c7ae59afa20 100644
--- a/modules/services/mail/dovecot2.nix
+++ b/modules/services/mail/dovecot2.nix
@@ -128,7 +128,7 @@ in
         preStart =
           ''
             ${pkgs.coreutils}/bin/mkdir -p /var/run/dovecot2 /var/run/dovecot2/login
-            ${pkgs.coreutils}/bin/chown -R ${cfg.user}.${cfg.group} /var/run/dovecot2
+            ${pkgs.coreutils}/bin/chown -R ${cfg.user}:${cfg.group} /var/run/dovecot2
           '';
 
         exec = "${pkgs.dovecot_2_0}/sbin/dovecot -F -c ${confFile}";
diff --git a/modules/services/mail/postfix.nix b/modules/services/mail/postfix.nix
index f98c9e6b0a7..d4314236a9b 100644
--- a/modules/services/mail/postfix.nix
+++ b/modules/services/mail/postfix.nix
@@ -329,10 +329,10 @@ in
               ${pkgs.coreutils}/bin/mkdir -p /var/spool/mail /var/postfix/conf /var/postfix/queue
             fi
 
-            ${pkgs.coreutils}/bin/chown -R ${user}.${group} /var/postfix
-            ${pkgs.coreutils}/bin/chown -R ${user}.${setgidGroup} /var/postfix/queue
+            ${pkgs.coreutils}/bin/chown -R ${user}:${group} /var/postfix
+            ${pkgs.coreutils}/bin/chown -R ${user}:${setgidGroup} /var/postfix/queue
             ${pkgs.coreutils}/bin/chmod -R ug+rwX /var/postfix/queue
-            ${pkgs.coreutils}/bin/chown root.root /var/spool/mail
+            ${pkgs.coreutils}/bin/chown root:root /var/spool/mail
             ${pkgs.coreutils}/bin/chmod a+rwxt /var/spool/mail
 
             ln -sf ${pkgs.postfix}/share/postfix/conf/* /var/postfix/conf
diff --git a/modules/services/misc/nix-daemon.nix b/modules/services/misc/nix-daemon.nix
index 7c4da0c9405..31b81a13e36 100644
--- a/modules/services/misc/nix-daemon.nix
+++ b/modules/services/misc/nix-daemon.nix
@@ -301,7 +301,7 @@ in
     system.activationScripts.nix = stringAfter [ "etc" "users" ]
       ''
         # Set up Nix.
-        chown root.nixbld /nix/store
+        chown root:nixbld /nix/store
         chmod 1775 /nix/store
 
         # Nix initialisation.
diff --git a/modules/services/monitoring/systemhealth.nix b/modules/services/monitoring/systemhealth.nix
index cb46ba89bc9..71389be5b2f 100644
--- a/modules/services/monitoring/systemhealth.nix
+++ b/modules/services/monitoring/systemhealth.nix
@@ -80,7 +80,7 @@ in
     system.activationScripts.systemhealth = stringAfter [ "var" ]
       ''
         mkdir -p ${rrdDir} ${htmlDir}
-        chown wwwrun.wwwrun ${rrdDir} ${htmlDir}
+        chown wwwrun:wwwrun ${rrdDir} ${htmlDir}
 
         cat >${configFile} << EOF
         [paths]
@@ -110,7 +110,7 @@ in
 
         EOF
 
-        chown wwwrun.wwwrun ${configFile}
+        chown wwwrun:wwwrun ${configFile}
 
         ${pkgs.su}/bin/su -s "/bin/sh" -c "${command} --check" wwwrun
         ${pkgs.su}/bin/su -s "/bin/sh" -c "${command} --html" wwwrun
-- 
GitLab


From 2577a17468eac7194dccb11a7e0348f5786f25e3 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 17 May 2012 21:10:42 +0000
Subject: [PATCH 3686/5331] * Add /etc/os-release to be Lennart Poettering
 compliant.   See http://0pointer.de/blog/projects/os-release.html

svn path=/nixos/trunk/; revision=34162
---
 modules/misc/version.nix | 22 +++++++++++++++++++++-
 1 file changed, 21 insertions(+), 1 deletion(-)

diff --git a/modules/misc/version.nix b/modules/misc/version.nix
index 32e2e1b1dc0..95030fbd03d 100644
--- a/modules/misc/version.nix
+++ b/modules/misc/version.nix
@@ -12,7 +12,27 @@ with pkgs.lib;
         + (if builtins.pathExists ../../.version-suffix then builtins.readFile ../../.version-suffix else "pre-svn");
       description = "NixOS version.";
     };
-    
+
+  };
+
+  config = {
+
+    # Generate /etc/os-release.  See
+    # http://0pointer.de/public/systemd-man/os-release.html for the
+    # format.
+    environment.etc = singleton
+      { source = pkgs.writeText "os-release"
+          ''
+            NAME=NixOS
+            ID=nixos
+            VERSION="${config.system.nixosVersion}"
+            VERSION_ID="${config.system.nixosVersion}"
+            PRETTY_NAME="NixOS ${config.system.nixosVersion}"
+            HOME_URL="http://nixos.org/"
+          '';
+        target = "os-release";
+      };
+  
   };
 
 }
-- 
GitLab


From 7fca5408f333d1f752353064a7409150bf14f23f Mon Sep 17 00:00:00 2001
From: Mathijs Kwik <mathijs@bluescreen303.nl>
Date: Fri, 18 May 2012 06:17:05 +0000
Subject: [PATCH 3687/5331] Revert "Provided a workaround for grub's
 missing-devices check, so nested child configurations can still build."

This reverts commit a89e8831e3d95bcf3ddc19ee34b938db7e8aa572.

svn path=/nixos/trunk/; revision=34163
---
 modules/installer/grub/grub.nix        | 10 +---------
 modules/system/activation/no-clone.nix |  3 +--
 2 files changed, 2 insertions(+), 11 deletions(-)

diff --git a/modules/installer/grub/grub.nix b/modules/installer/grub/grub.nix
index 73841b3778b..97e5f12d048 100644
--- a/modules/installer/grub/grub.nix
+++ b/modules/installer/grub/grub.nix
@@ -136,14 +136,6 @@ in
         '';
       };
 
-      ignoreDevicesCheck = mkOption {
-        default = false;
-        description = ''
-          (internal use) Don't throw an error when devices aren't given
-          useful for building nested child configurations
-        '';
-      };
-
       splashImage = mkOption {
         default =
           if config.boot.loader.grub.version == 1
@@ -205,7 +197,7 @@ in
 
     boot.loader.grub.devices = optional (cfg.device != "") cfg.device;
 
-    system.build = mkAssert (cfg.devices != [] || cfg.ignoreDevicesCheck)
+    system.build = mkAssert (cfg.devices != [])
       "You must set the ‘boot.loader.grub.device’ option to make the system bootable."
       { menuBuilder = grubMenuBuilder;
         inherit grub;
diff --git a/modules/system/activation/no-clone.nix b/modules/system/activation/no-clone.nix
index c78086466d1..74df217a01a 100644
--- a/modules/system/activation/no-clone.nix
+++ b/modules/system/activation/no-clone.nix
@@ -6,9 +6,8 @@ with pkgs.lib;
 
 {
   boot.loader.grub.device = mkOverrideTemplate 0 {} "";
-  # undefine the obsolete name of the previous option.
+  # undefined the obsolete name of the previous option.
   boot.grubDevice = mkOverrideTemplate 0 {} pkgs.lib.mkNotdef;
-  boot.loader.grub.ignoreDevicesCheck = mkOverrideTemplate 0 {} true;
   nesting.children = mkOverrideTemplate 0 {} [];
   nesting.clone = mkOverrideTemplate 0 {} [];
 }
-- 
GitLab


From be69799f3589edc19d669cfe16e66b27752ccc9d Mon Sep 17 00:00:00 2001
From: Mathijs Kwik <mathijs@bluescreen303.nl>
Date: Fri, 18 May 2012 06:17:08 +0000
Subject: [PATCH 3688/5331] better workaround for building nested child
 configurations

svn path=/nixos/trunk/; revision=34164
---
 modules/system/activation/no-clone.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/system/activation/no-clone.nix b/modules/system/activation/no-clone.nix
index 74df217a01a..d28183d2dc4 100644
--- a/modules/system/activation/no-clone.nix
+++ b/modules/system/activation/no-clone.nix
@@ -5,7 +5,7 @@
 with pkgs.lib;
 
 {
-  boot.loader.grub.device = mkOverrideTemplate 0 {} "";
+  boot.loader.grub.device = mkOverrideTemplate 0 {} "nodev";
   # undefined the obsolete name of the previous option.
   boot.grubDevice = mkOverrideTemplate 0 {} pkgs.lib.mkNotdef;
   nesting.children = mkOverrideTemplate 0 {} [];
-- 
GitLab


From 53af6f56683fcc675919b997cabf8d69b9f20818 Mon Sep 17 00:00:00 2001
From: Rob Vermaas <rob.vermaas@gmail.com>
Date: Mon, 21 May 2012 21:26:45 +0000
Subject: [PATCH 3689/5331] Execute mount-all task on config-changed event to
 make sure it is performed before other upstart jobs are started on activating
 the new configuration.

svn path=/nixos/trunk/; revision=34201
---
 modules/tasks/filesystems.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/tasks/filesystems.nix b/modules/tasks/filesystems.nix
index 19bfb7c4deb..5848e21688c 100644
--- a/modules/tasks/filesystems.nix
+++ b/modules/tasks/filesystems.nix
@@ -183,7 +183,7 @@ in
       };
 
     jobs.mountall =
-      { startOn = "started udev";
+      { startOn = "started udev or config-changed";
 
         task = true;
 
-- 
GitLab


From be4e8234282cf57c5b1a596e98097ec787287116 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 21 May 2012 23:18:20 +0000
Subject: [PATCH 3690/5331] * Delete empty directories.

svn path=/nixos/trunk/; revision=34204
-- 
GitLab


From 9dadfc354132074e71bb99fdcc561dc1549c70e7 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 23 May 2012 15:40:31 +0000
Subject: [PATCH 3691/5331] * Mark QEMU VMs as NixOS machines.

svn path=/nixos/trunk/; revision=34217
---
 modules/virtualisation/qemu-vm.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/modules/virtualisation/qemu-vm.nix b/modules/virtualisation/qemu-vm.nix
index add88753f00..098c2944c1b 100644
--- a/modules/virtualisation/qemu-vm.nix
+++ b/modules/virtualisation/qemu-vm.nix
@@ -274,6 +274,10 @@ in
 
   boot.initrd.postMountCommands =
     ''
+      # Mark this as a NixOS machinex.
+      mkdir -p $targetRoot/etc
+      echo -n > $targetRoot/etc/NIXOS
+    
       # Fix the permissions on /tmp.
       chmod 1777 $targetRoot/tmp
 
-- 
GitLab


From a6892051efbc951b5278c3ca5ef022e506ff89ab Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 23 May 2012 15:52:29 +0000
Subject: [PATCH 3692/5331] * Allow building with boot.loader.grub.enable set
 to "false".

svn path=/nixos/trunk/; revision=34218
---
 modules/installer/grub/grub.nix         | 1 -
 modules/system/activation/top-level.nix | 4 ++--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/modules/installer/grub/grub.nix b/modules/installer/grub/grub.nix
index 97e5f12d048..94522c3c059 100644
--- a/modules/installer/grub/grub.nix
+++ b/modules/installer/grub/grub.nix
@@ -206,7 +206,6 @@ in
     # Common attribute for boot loaders so only one of them can be
     # set at once.
     system.boot.loader.id = "grub";
-    system.boot.loader.kernelFile = pkgs.stdenv.platform.kernelTarget;
 
     environment.systemPackages = mkIf config.boot.loader.grub.enable [ grub ];
 
diff --git a/modules/system/activation/top-level.nix b/modules/system/activation/top-level.nix
index dedfb9a9bd8..3edc92d502c 100644
--- a/modules/system/activation/top-level.nix
+++ b/modules/system/activation/top-level.nix
@@ -36,7 +36,7 @@ let
     };
 
     system.boot.loader.kernelFile = mkOption {
-      default = "";
+      default = pkgs.stdenv.platform.kernelTarget;
       description = ''
         Name of the kernel file to be passed to the bootloader.
       '';
@@ -152,7 +152,7 @@ let
     inherit children;
     kernelParams =
       config.boot.kernelParams ++ config.boot.extraKernelParams;
-    menuBuilder = config.system.build.menuBuilder;
+    menuBuilder = config.system.build.menuBuilder or "true";
     initScriptBuilder = config.system.build.initScriptBuilder;
     activationScript = config.system.activationScripts.script;
     nixosVersion = config.system.nixosVersion;
-- 
GitLab


From b11770373a7f75e9c83814f2023e9edc0090c4f7 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 24 May 2012 23:37:06 +0000
Subject: [PATCH 3693/5331] * Work properly if /root/.nix-defexpr/channels
 already exists.

svn path=/nixos/trunk/; revision=34233
---
 modules/installer/tools/nixos-install.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/installer/tools/nixos-install.sh b/modules/installer/tools/nixos-install.sh
index 13b62b5dc7f..e64d4d5061d 100644
--- a/modules/installer/tools/nixos-install.sh
+++ b/modules/installer/tools/nixos-install.sh
@@ -162,7 +162,7 @@ mkdir -m 0755 -p $mountPoint/nix/var/nix/profiles/per-user/root
 chroot $mountPoint @nix@/bin/nix-env \
     -p /nix/var/nix/profiles/per-user/root/channels -i "$srcs" --quiet
 mkdir -m 0700 -p $mountPoint/root/.nix-defexpr
-ln -s /nix/var/nix/profiles/per-user/root/channels $mountPoint/root/.nix-defexpr/channels
+ln -sfn /nix/var/nix/profiles/per-user/root/channels $mountPoint/root/.nix-defexpr/channels
 
 
 # We're done building/downloading, so we don't need the /etc bind
-- 
GitLab


From 6ba2899c182f22b35479cbc2853cff70a01cde76 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 24 May 2012 23:39:03 +0000
Subject: [PATCH 3694/5331] * Run nixos-install twice to test idempotency.

svn path=/nixos/trunk/; revision=34234
---
 tests/installer.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/tests/installer.nix b/tests/installer.nix
index b64a24c1e3f..2b3232ca353 100644
--- a/tests/installer.nix
+++ b/tests/installer.nix
@@ -161,6 +161,9 @@ let
       # Perform the installation.
       $machine->mustSucceed("nixos-install >&2");
 
+      # Do it again to make sure it's idempotent.
+      $machine->mustSucceed("nixos-install >&2");
+
       $machine->shutdown;
 
       # Now see if we can boot the installation.
-- 
GitLab


From a3e04ba0aa8c8cd759e902cee14de2080a1345ce Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 25 May 2012 02:30:52 +0000
Subject: [PATCH 3695/5331] * Fix problems with repeated installations due to
 the immutable bit   (http://hydra.nixos.org/build/2645533).

svn path=/nixos/trunk/; revision=34235
---
 modules/installer/tools/nixos-install.sh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/modules/installer/tools/nixos-install.sh b/modules/installer/tools/nixos-install.sh
index e64d4d5061d..1b0bfc97f08 100644
--- a/modules/installer/tools/nixos-install.sh
+++ b/modules/installer/tools/nixos-install.sh
@@ -91,6 +91,7 @@ storePaths=$(@perl@/bin/perl @pathsFromGraph@ @nixClosure@)
 echo "copying Nix to $mountPoint...."
 for i in $storePaths; do
     echo "  $i"
+    chattr -R -i $mountPoint/nix/store/$i 2> /dev/null || true # clear immutable bit
     rsync -a $i $mountPoint/nix/store/
 done
 
@@ -124,7 +125,7 @@ ln -sf @shell@ $mountPoint/bin/sh
 
 if test -n "$NIXOS_PREPARE_CHROOT_ONLY"; then
     echo "User requested only to prepare chroot. Exiting."
-    exit 0;
+    exit 0
 fi
 
 
-- 
GitLab


From 4157166f8a4d9471663b9ced3fbb83601e05cc00 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Fri, 25 May 2012 07:52:12 +0000
Subject: [PATCH 3696/5331] Making the sheevaplug system tarball evaluate fine
 again. It had some pieces not up to date: fileSystems definition, kernel
 version, ...

svn path=/nixos/trunk/; revision=34237
---
 .../cd-dvd/system-tarball-sheevaplug.nix        | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/modules/installer/cd-dvd/system-tarball-sheevaplug.nix b/modules/installer/cd-dvd/system-tarball-sheevaplug.nix
index 9052badfe0e..381223a078b 100644
--- a/modules/installer/cd-dvd/system-tarball-sheevaplug.nix
+++ b/modules/installer/cd-dvd/system-tarball-sheevaplug.nix
@@ -40,7 +40,7 @@ in
 
 {
   require =
-    [ options
+    [
       ./system-tarball.nix
       ../../hardware/network/rt73.nix
     ];
@@ -120,7 +120,17 @@ in
       # "console=ttyS0,115200n8"  # serial console
     ];
 
-  boot.kernelPackages = pkgs.linuxPackages_2_6_35;
+  boot.kernelPackages = pkgs.linuxPackages_3_4;
+
+  boot.supportedFilesystems = [ "reiserfs" ];
+
+  /* fake entry, just to have a happy stage-1. Users
+     may boot without having stage-1 though */
+  fileSystems = [
+    { mountPoint = "/";
+      device = "/dev/something";
+      }
+  ];
 
   services.mingetty = {
     ttys = [ "ttyS0" ];
@@ -166,6 +176,9 @@ in
   services.ttyBackgrounds.enable = false;
   jobs.openssh.startOn = pkgs.lib.mkOverrideTemplate 50 {} "";
 
+  # Needed for nixos to evaluate
+  system.build.menuBuilder = "true";
+
   nixpkgs.config = {
     platform = pkgs.platforms.sheevaplug;
   };
-- 
GitLab


From 22fc2bdb243de1ead277d2c2d66ad53e12e4a72d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Fri, 25 May 2012 08:09:25 +0000
Subject: [PATCH 3697/5331] Fixing the evaluation of the system-tarball-pc.

It complained that grub device wasn't defined, and I guess it wanted some
fileSystems too. I copied those details from the sheevaplug expression, that I
made evaluate some minutes ago.


svn path=/nixos/trunk/; revision=34238
---
 modules/installer/cd-dvd/system-tarball-pc.nix | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/modules/installer/cd-dvd/system-tarball-pc.nix b/modules/installer/cd-dvd/system-tarball-pc.nix
index c1a73856887..035b6dd6c0a 100644
--- a/modules/installer/cd-dvd/system-tarball-pc.nix
+++ b/modules/installer/cd-dvd/system-tarball-pc.nix
@@ -1,5 +1,5 @@
 # This module contains the basic configuration for building a NixOS
-# installation CD.
+# tarball, that can directly boot, maybe using PXE or unpacking on a fs.
 
 { config, pkgs, ... }:
 
@@ -164,10 +164,20 @@ in
   # To be able to use the systemTarball to catch troubles.
   boot.crashDump = {
     enable = true;
-    # Why not a recent kernel?
-    kernelPackages = pkgs.linuxPackages_3_2;
+    kernelPackages = pkgs.linuxPackages_3_4;
   };
 
+  # No grub for the tarball.
+  boot.loader.grub.enable = false;
+
+  /* fake entry, just to have a happy stage-1. Users
+     may boot without having stage-1 though */
+  fileSystems = [
+    { mountPoint = "/";
+      device = "/dev/something";
+      }
+  ];
+
   nixpkgs.config = {
     packageOverrides = p: rec {
       linux_3_2 = p.linux_3_2.override {
-- 
GitLab


From d0786fd3e74a9b222076680941b5187ccfd41853 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 25 May 2012 13:32:30 +0000
Subject: [PATCH 3698/5331] * Cache nix-pull calls in nixos-install.

svn path=/nixos/trunk/; revision=34241
---
 modules/installer/tools/nixos-install.sh | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/modules/installer/tools/nixos-install.sh b/modules/installer/tools/nixos-install.sh
index 1b0bfc97f08..258f125db5d 100644
--- a/modules/installer/tools/nixos-install.sh
+++ b/modules/installer/tools/nixos-install.sh
@@ -38,7 +38,9 @@ fi
 
 # Do a nix-pull to speed up building.
 if test -n "@nixosURL@" -a ${NIXOS_PULL:-1} != 0; then
-    @nix@/bin/nix-pull @nixosURL@/MANIFEST || true
+    mkdir -p /nix/var/nix/channel-cache -m 0755
+    NIX_DOWNLOAD_CACHE=/nix/var/nix/channel-cache \
+        @nix@/bin/nix-pull @nixosURL@/MANIFEST || true
 fi
 
 
-- 
GitLab


From f81eb12d41e535cf5176ee6cd00b16de33a714d1 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 25 May 2012 14:06:46 +0000
Subject: [PATCH 3699/5331] * Now hopefully a proper fix for the problem in  
 http://hydra.nixos.org/build/2645533 (which I can't reproduce btw -   so much
 for reproducibility...).

svn path=/nixos/trunk/; revision=34243
---
 modules/installer/tools/nixos-install.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/installer/tools/nixos-install.sh b/modules/installer/tools/nixos-install.sh
index 258f125db5d..4e89770cce5 100644
--- a/modules/installer/tools/nixos-install.sh
+++ b/modules/installer/tools/nixos-install.sh
@@ -93,7 +93,7 @@ storePaths=$(@perl@/bin/perl @pathsFromGraph@ @nixClosure@)
 echo "copying Nix to $mountPoint...."
 for i in $storePaths; do
     echo "  $i"
-    chattr -R -i $mountPoint/nix/store/$i 2> /dev/null || true # clear immutable bit
+    chattr -R -i $mountPoint/$i 2> /dev/null || true # clear immutable bit
     rsync -a $i $mountPoint/nix/store/
 done
 
-- 
GitLab


From 9b014c471a86e995a4b29fb77127bfe23c30c2c7 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 25 May 2012 15:51:33 +0000
Subject: [PATCH 3700/5331] * CUPS: fix printing on a Ricoh Aficio MP C4500 PXL
 printer (and   probably lots of others).  The $PATH used to invoke the filter
   didn't contain Ghostscript and Perl, so it silently fails.  (A nice  
 property of CUPS is that it will just silently discard the job when   that
 happens, so you need to set LogLevel to "debug" to see this.)   Fortunately,
 CUPS now has a "SetEnv" option to set $PATH explicitly.

  Also, remove config.system.path from the PATH of CUPS' Upstart job.
  It seems to serve no purpose.

svn path=/nixos/trunk/; revision=34244
---
 modules/services/printing/cupsd.nix | 28 +++++++++++-----------------
 1 file changed, 11 insertions(+), 17 deletions(-)

diff --git a/modules/services/printing/cupsd.nix b/modules/services/printing/cupsd.nix
index 50556a352ba..6d31c0050aa 100644
--- a/modules/services/printing/cupsd.nix
+++ b/modules/services/printing/cupsd.nix
@@ -10,32 +10,24 @@ let
 
   cfg = config.services.printing;
 
-  additionalBackends = pkgs.stdenv.mkDerivation {
-    name = "additional-cups-backends";
-    builder = pkgs.writeScript "additional-backends-builder.sh" ''
-      PATH=${pkgs.coreutils}/bin
-      mkdir -pv $out
+  additionalBackends = pkgs.runCommand "additional-cups-backends" { }
+    ''
+      mkdir -p $out
       if [ ! -e ${pkgs.cups}/lib/cups/backend/smb ]; then
-        mkdir -pv $out/lib/cups/backend
+        mkdir -p $out/lib/cups/backend
         ln -sv ${pkgs.samba}/bin/smbspool $out/lib/cups/backend/smb
       fi
 
       # Provide support for printing via HTTPS.
       if [ ! -e ${pkgs.cups}/lib/cups/backend/https ]; then
-        mkdir -pv $out/lib/cups/backend
+        mkdir -p $out/lib/cups/backend
         ln -sv ${pkgs.cups}/lib/cups/backend/ipp $out/lib/cups/backend/https
       fi
 
-      # Awful hack to get programs needed by some PPDs in CUPS'
-      # hard-coded $PATH.
-      mkdir -p $out/lib/cups/filter
-      ln -s ${pkgs.coreutils}/bin/date ${pkgs.coreutils}/bin/cat ${pkgs.gnused}/bin/sed $out/lib/cups/filter/
-
       # Import filter configuration from Ghostscript.
       mkdir -p $out/share/cups/mime/
       ln -v -s "${pkgs.ghostscript}/etc/cups/"* $out/share/cups/mime/
     '';
-  };
 
   # Here we can enable additional backends, filters, etc. that are not
   # part of CUPS itself, e.g. the SMB backend is part of Samba.  Since
@@ -45,7 +37,7 @@ let
   bindir = pkgs.buildEnv {
     name = "cups-progs";
     paths = cfg.drivers;
-    pathsToLink = [ "/lib/cups" "/share/cups" ];
+    pathsToLink = [ "/lib/cups" "/share/cups" "/bin" ];
     postBuild = cfg.bindirCmds;
   };
 
@@ -131,8 +123,7 @@ in
         startOn = "started network-interfaces";
         stopOn = "stopping network-interfaces";
 
-        # !!! Why is config.system.path in here?
-        path = [ cups config.system.path ];
+        path = [ cups ];
 
         preStart =
           ''
@@ -146,7 +137,8 @@ in
         exec = "cupsd -c ${pkgs.writeText "cupsd.conf" cfg.cupsdConf} -F";
       };
 
-    services.printing.drivers = [ pkgs.cups pkgs.cups_pdf_filter pkgs.ghostscript additionalBackends ];
+    services.printing.drivers =
+      [ pkgs.cups pkgs.cups_pdf_filter pkgs.ghostscript additionalBackends pkgs.perl pkgs.coreutils pkgs.gnused ];
 
     services.printing.cupsdConf =
       ''
@@ -165,6 +157,8 @@ in
         ServerBin ${bindir}/lib/cups
         DataDir ${bindir}/share/cups
 
+        SetEnv PATH ${bindir}/lib/cups/filter:${bindir}/bin:${bindir}/sbin
+
         AccessLog ${logDir}/access_log
         ErrorLog ${logDir}/error_log
         PageLog ${logDir}/page_log
-- 
GitLab


From 39e7b44d37fffbc359e2ed3a020a1b4e1c7e10db Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 4 Jun 2012 14:23:34 +0000
Subject: [PATCH 3701/5331] * Use the Git shortrev in NixOS version strings.

svn path=/nixos/trunk/; revision=34344
---
 release.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/release.nix b/release.nix
index 11276fa695a..4ccbd2ef754 100644
--- a/release.nix
+++ b/release.nix
@@ -1,11 +1,11 @@
-{ nixosSrc ? {outPath = ./.; rev = 1234;}
-, nixpkgs ? {outPath = <nixpkgs>; rev = 5678;}
+{ nixosSrc ? {outPath = ./.; revCount = 1234; shortRev = "abcdef"; }
+, nixpkgs ? {outPath = <nixpkgs>; revCount = 5678; shortRev = "fedcba"; }
 }:
 
 let
 
   version = builtins.readFile ./.version;
-  versionSuffix = "pre${toString nixosSrc.rev}-${toString nixpkgs.rev}";
+  versionSuffix = "pre${toString nixosSrc.revCount}_${nixosSrc.shortRev}-${nixpkgs.shortRev}";
 
 
   makeIso =
@@ -85,7 +85,7 @@ let
 
         src = nixosSrc;
 
-        inherit officialRelease version;
+        inherit officialRelease version versionSuffix;
 
         distPhase = ''
           echo -n $VERSION_SUFFIX > .version-suffix
-- 
GitLab


From ca57a8e6385445557099212415c7e8e7aa2d5182 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 4 Jun 2012 14:35:48 +0000
Subject: [PATCH 3702/5331] * Add type.

svn path=/nixos/trunk/; revision=34345
---
 modules/services/misc/nixos-manual.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/modules/services/misc/nixos-manual.nix b/modules/services/misc/nixos-manual.nix
index 7853baf3afa..84c39101bb6 100644
--- a/modules/services/misc/nixos-manual.nix
+++ b/modules/services/misc/nixos-manual.nix
@@ -24,6 +24,7 @@ in
 
     services.nixosManual.enable = mkOption {
       default = true;
+      type = types.bool;
       description = ''
         Whether to build the NixOS manual pages.
       '';
-- 
GitLab


From c4c68f97d152dfec600d13d8375dca3ac822efaf Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 4 Jun 2012 15:02:37 +0000
Subject: [PATCH 3703/5331] * The volume ID is too long again.  Shorten it to
 make it fit (just   barely) inside the 32 character limit.

  http://hydra.nixos.org/build/2660387

svn path=/nixos/trunk/; revision=34346
---
 modules/installer/cd-dvd/installation-cd-base.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/installer/cd-dvd/installation-cd-base.nix b/modules/installer/cd-dvd/installation-cd-base.nix
index 5f351a65ec6..ae227dbcb80 100644
--- a/modules/installer/cd-dvd/installation-cd-base.nix
+++ b/modules/installer/cd-dvd/installation-cd-base.nix
@@ -40,7 +40,7 @@ in
   # ISO naming.
   isoImage.isoName = "${config.isoImage.isoBaseName}-${config.system.nixosVersion}-${pkgs.stdenv.system}.iso";
 
-  isoImage.volumeID = "NIXOS_CD_${config.system.nixosVersion}";
+  isoImage.volumeID = "NIXOS_${config.system.nixosVersion}";
 
   installer.nixosURL = "http://nixos.org/releases/nixos/nixos-${config.system.nixosVersion}";
 
-- 
GitLab


From a0cc18111766494882db511f6d073b5ac1b12d69 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 4 Jun 2012 15:39:07 +0000
Subject: [PATCH 3704/5331] * nixos-checkout: get the NixOS/Nixpkgs sources
 from GitHub.

svn path=/nixos/trunk/; revision=34347
---
 modules/installer/tools/nixos-checkout.nix | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/modules/installer/tools/nixos-checkout.nix b/modules/installer/tools/nixos-checkout.nix
index d591c01df19..a36906ff4a2 100644
--- a/modules/installer/tools/nixos-checkout.nix
+++ b/modules/installer/tools/nixos-checkout.nix
@@ -1,6 +1,6 @@
 # This module generates the nixos-checkout script, which replaces the
 # NixOS and Nixpkgs source trees in /etc/nixos/{nixos,nixpkgs} with
-# Subversion checkouts.
+# Git checkouts.
 
 {config, pkgs, ...}:
 
@@ -21,6 +21,11 @@ let
         mkdir -p "$prefix"
         cd "$prefix"
 
+        if [ -z "$(type -P git)" ]; then
+            echo "installing Git..."
+            nix-env -iA nixos.pkgs.git || nix-env -i git
+        fi
+
         # Move any old nixos or nixpkgs directories out of the way.
         backupTimestamp=$(date "+%Y%m%d%H%M%S")
 
@@ -33,18 +38,13 @@ let
         fi
 
         # Check out the NixOS and Nixpkgs sources.
-        ${pkgs.subversion}/bin/svn co https://nixos.org/repos/nix/nixos/trunk nixos
-        ${pkgs.subversion}/bin/svn co https://nixos.org/repos/nix/nixpkgs/trunk nixpkgs
+        git clone git://github.com/NixOS/nixos.git nixos
+        git clone git://github.com/NixOS/nixpkgs.git nixpkgs
       '';
    };
 
 in
 
 {
-  environment.systemPackages =
-    [ nixosCheckout
-      # Since the checkout script depends on Subversion, we may as
-      # well put it in $PATH.
-      pkgs.subversion
-    ];
+  environment.systemPackages = [ nixosCheckout ];
 }
-- 
GitLab


From f2a33809c1eeb50b8dc3cc7161a662f560ac2788 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 4 Jun 2012 15:57:32 +0000
Subject: [PATCH 3705/5331] * Check for .git instead of .svn.

svn path=/nixos/trunk/; revision=34350
---
 modules/installer/tools/nixos-checkout.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/installer/tools/nixos-checkout.nix b/modules/installer/tools/nixos-checkout.nix
index a36906ff4a2..7cf395145d2 100644
--- a/modules/installer/tools/nixos-checkout.nix
+++ b/modules/installer/tools/nixos-checkout.nix
@@ -29,11 +29,11 @@ let
         # Move any old nixos or nixpkgs directories out of the way.
         backupTimestamp=$(date "+%Y%m%d%H%M%S")
 
-        if test -e nixos -a ! -e nixos/.svn; then
+        if [ -e nixos -a ! -e nixos/.git ]; then
             mv nixos nixos-$backupTimestamp
         fi
 
-        if test -e nixpkgs -a ! -e nixpkgs/.svn; then
+        if [ -e nixpkgs -a ! -e nixpkgs/.git ]; then
             mv nixpkgs nixpkgs-$backupTimestamp
         fi
 
-- 
GitLab


From f21aa7d22cc8128f6c60632e3108bacf69351dac Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 1 Jun 2012 20:15:07 -0400
Subject: [PATCH 3706/5331] First attempt at using systemd

Basic booting works.  Systemd starts agetty instances on tty1 and
tty2.  Shutdown and journald also work.
---
 modules/config/system-path.nix          |   1 -
 modules/module-list.nix                 |   1 +
 modules/system/activation/top-level.nix |   6 +-
 modules/system/boot/stage-2-init.sh     |  14 ++-
 modules/system/boot/systemd.nix         | 158 ++++++++++++++++++++++++
 5 files changed, 172 insertions(+), 8 deletions(-)
 create mode 100644 modules/system/boot/systemd.nix

diff --git a/modules/config/system-path.nix b/modules/config/system-path.nix
index 9eab8dde473..2a25cd411a1 100644
--- a/modules/config/system-path.nix
+++ b/modules/config/system-path.nix
@@ -17,7 +17,6 @@ let
 
   requiredPackages =
     [ config.system.sbin.modprobe # must take precedence over module_init_tools
-      config.system.build.upstart
       config.environment.nix
       pkgs.acl
       pkgs.attr
diff --git a/modules/module-list.nix b/modules/module-list.nix
index 48171f62150..870d316006f 100644
--- a/modules/module-list.nix
+++ b/modules/module-list.nix
@@ -198,6 +198,7 @@
   ./system/boot/stage-1.nix
   ./system/boot/stage-1-extratools.nix
   ./system/boot/stage-2.nix
+  ./system/boot/systemd.nix
   ./system/etc/etc.nix
   ./system/upstart-events/control-alt-delete.nix
   ./system/upstart-events/runlevel.nix
diff --git a/modules/system/activation/top-level.nix b/modules/system/activation/top-level.nix
index 3edc92d502c..ef32d991d9d 100644
--- a/modules/system/activation/top-level.nix
+++ b/modules/system/activation/top-level.nix
@@ -117,12 +117,12 @@ let
 
       ln -s ${config.system.build.etc}/etc $out/etc
       ln -s ${config.system.path} $out/sw
-      ln -s ${config.system.build.upstart} $out/upstart
+      ln -s ${pkgs.systemd} $out/systemd
       ln -s ${config.hardware.firmware} $out/firmware
 
       echo -n "$kernelParams" > $out/kernel-params
       echo -n "$configurationName" > $out/configuration-name
-      echo -n "${toString config.system.build.upstart.interfaceVersion}" > $out/upstart-interface-version
+      #echo -n "${toString config.system.build.upstart.interfaceVersion}" > $out/upstart-interface-version
       echo -n "$nixosVersion" > $out/nixos-version
 
       mkdir $out/fine-tune
@@ -173,7 +173,7 @@ let
         pkgs.gnugrep
         pkgs.findutils
         pkgs.diffutils
-        config.system.build.upstart # for initctl
+        pkgs.systemd
       ];
 
     # Boot loaders
diff --git a/modules/system/boot/stage-2-init.sh b/modules/system/boot/stage-2-init.sh
index bd48f463dcd..33d0a6ad3e8 100644
--- a/modules/system/boot/stage-2-init.sh
+++ b/modules/system/boot/stage-2-init.sh
@@ -56,7 +56,7 @@ fi
 mkdir -m 0755 -p /etc
 test -e /etc/fstab || touch /etc/fstab # to shut up mount
 rm -f /etc/mtab* # not that we care about stale locks
-cat /proc/mounts > /etc/mtab
+ln -s /proc/mounts /etc/mtab
 
 
 # Process the kernel command line.
@@ -184,6 +184,12 @@ if [ -n "$debug2" ]; then
 fi
 
 
-# Start Upstart's init.
-echo "starting Upstart..."
-PATH=/var/run/current-system/upstart/sbin exec init --no-sessions ${debug2:+--verbose}
+# FIXME: auto-loading of kernel modules in systemd doesn't work yet
+# because it uses libkmod.
+"$(cat /proc/sys/kernel/modprobe)" autofs4
+"$(cat /proc/sys/kernel/modprobe)" ipv6
+
+
+# Start systemd.
+echo "starting systemd..."
+PATH=/var/run/current-system/systemd/lib/systemd exec systemd --log-level debug --log-target=console --crash-shell
diff --git a/modules/system/boot/systemd.nix b/modules/system/boot/systemd.nix
new file mode 100644
index 00000000000..3b51ebf43fc
--- /dev/null
+++ b/modules/system/boot/systemd.nix
@@ -0,0 +1,158 @@
+{ config, pkgs, ... }:
+
+with pkgs.lib;
+
+let
+
+  systemd = pkgs.systemd;
+
+  makeUnit = name: text:
+    pkgs.writeTextFile { name = "unit"; inherit text; destination = "/${name}"; };
+
+  defaultTarget = makeUnit "default.target"
+    ''
+      [Unit]
+      Description=Default System
+      Requires=getty.target
+      After=getty.target
+      Conflicts=rescue.target
+      AllowIsolate=yes
+    '';
+
+  gettyTarget = makeUnit "getty.target"
+    ''
+      [Unit]
+      Description=Login Prompts
+      Requires=getty@tty1.service getty@tty2.service
+      After=getty@tty1.service getty@tty2.service
+    '';
+
+  gettyService = makeUnit "getty@.service"
+    ''
+      [Unit]
+      Description=Getty on %I
+      #BindTo=dev-%i.device
+      #After=dev-%i.device systemd-user-sessions.service plymouth-quit-wait.service
+      Before=getty.target
+
+      [Service]
+      Environment=TERM=linux
+      ExecStart=-${pkgs.utillinux}/sbin/agetty --noclear --login-program ${pkgs.shadow}/bin/login %I 38400
+      Restart=always
+      RestartSec=0
+      UtmpIdentifier=%I
+      TTYPath=/dev/%I
+      TTYReset=yes
+      TTYVHangup=yes
+      TTYVTDisallocate=yes
+      KillMode=process
+      IgnoreSIGPIPE=no
+
+      # Unset locale for the console getty since the console has problems
+      # displaying some internationalized messages.
+      Environment=LANG= LANGUAGE= LC_CTYPE= LC_NUMERIC= LC_TIME= LC_COLLATE= LC_MONETARY= LC_MESSAGES= LC_PAPER= LC_NAME= LC_ADDRESS= LC_TELEPHONE= LC_MEASUREMENT= LC_IDENTIFICATION=
+
+      # Some login implementations ignore SIGTERM, so we send SIGHUP
+      # instead, to ensure that login terminates cleanly.
+      KillSignal=SIGHUP
+    '';
+
+  rescueTarget = makeUnit "rescue.target"
+    ''
+      [Unit]
+      Description=Rescue Mode
+      Requires=rescue.service
+      After=rescue.service
+      AllowIsolate=yes
+    '';
+
+  rescueService = makeUnit "rescue.service"
+    ''
+      [Unit]
+      Description=Rescue Shell
+      DefaultDependencies=no
+      #After=basic.target
+      #Before=shutdown.target
+
+      [Service]
+      Environment=HOME=/root
+      WorkingDirectory=/root
+      ExecStartPre=-${pkgs.coreutils}/bin/echo 'Welcome to rescue mode. Use "systemctl default" or ^D to enter default mode.'
+      #ExecStart=-/sbin/sulogin
+      ExecStart=-${pkgs.bashInteractive}/bin/bash --login
+      ExecStopPost=-${systemd}/bin/systemctl --fail --no-block default
+      StandardInput=tty-force
+      StandardOutput=inherit
+      StandardError=inherit
+      KillMode=process
+
+      # Bash ignores SIGTERM, so we send SIGHUP instead, to ensure that bash
+      # terminates cleanly.
+      KillSignal=SIGHUP
+    '';
+
+  upstreamUnits =
+    [ "systemd-journald.socket"
+      "systemd-journald.service"
+      "basic.target"
+      "sysinit.target"
+      "sysinit.target.wants"
+      "sockets.target"
+      "sockets.target.wants"
+
+      # Filesystems.
+      "local-fs.target"
+      "local-fs.target.wants"
+      "local-fs-pre.target"
+      "remote-fs.target"
+      "remote-fs-pre.target"
+      "swap.target"
+      "media.mount"
+      "dev-mqueue.mount"
+
+      # Reboot stuff.
+      "reboot.target"
+      "reboot.service"
+      "poweroff.target"
+      "poweroff.service"
+      "halt.target"
+      "halt.service"
+      "ctrl-alt-del.target"
+      "shutdown.target"
+      "umount.target"
+      "final.target"
+    ];
+
+  systemUnits = pkgs.runCommand "system-units" { }
+    ''
+      mkdir -p $out/system
+      for i in ${toString upstreamUnits}; do
+        fn=${systemd}/example/systemd/system/$i
+        echo $fn
+        [ -e $fn ]
+        ln -s $fn $out/system
+      done
+      for i in ${toString [ defaultTarget gettyTarget gettyService rescueTarget rescueService ]}; do
+        cp $i/* $out/system
+      done
+    ''; # */
+    
+in
+
+{
+
+  ###### implementation
+
+  config = {
+
+    environment.systemPackages = [ systemd ];
+  
+    environment.etc =
+      [ { source = systemUnits;
+          target = "systemd";
+        }
+      ];
+    
+  };
+
+}
-- 
GitLab


From b78ce79f895ff32f8781e47c34e016fe0f29b808 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Mon, 4 Jun 2012 21:19:12 +0200
Subject: [PATCH 3707/5331] Add xserver integration of i3 WM.

This allows to set i3 as the default window manager in the system configuration.
---
 .../services/x11/window-managers/default.nix  |  1 +
 modules/services/x11/window-managers/i3.nix   | 30 +++++++++++++++++++
 2 files changed, 31 insertions(+)
 create mode 100644 modules/services/x11/window-managers/i3.nix

diff --git a/modules/services/x11/window-managers/default.nix b/modules/services/x11/window-managers/default.nix
index 801517fdd98..8adfca3cca9 100644
--- a/modules/services/x11/window-managers/default.nix
+++ b/modules/services/x11/window-managers/default.nix
@@ -14,6 +14,7 @@ in
     ./twm.nix
     ./wmii.nix
     ./xmonad.nix
+    ./i3.nix
   ];
 
   options = {
diff --git a/modules/services/x11/window-managers/i3.nix b/modules/services/x11/window-managers/i3.nix
new file mode 100644
index 00000000000..7699d064eef
--- /dev/null
+++ b/modules/services/x11/window-managers/i3.nix
@@ -0,0 +1,30 @@
+{pkgs, config, ...}:
+
+let
+  inherit (pkgs.lib) mkOption mkIf;
+  cfg = config.services.xserver.windowManager.i3;
+in
+
+{
+  options = {
+    services.xserver.windowManager.i3 = {
+      enable = mkOption {
+        default = false;
+        example = true;
+        description = "Enable the i3 tiling window manager.";
+      };
+    };
+  };
+
+  config = {
+    services.xserver.windowManager = {
+      session = mkIf cfg.enable [{
+        name = "i3";
+        start = "
+          ${pkgs.i3}/bin/i3 &
+          waitPID=$!
+        ";
+      }];
+    };
+  };
+}
-- 
GitLab


From 593eb83343ebce6fd26fb3c628571fb5d3870730 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 6 Jun 2012 15:23:20 +0000
Subject: [PATCH 3708/5331] * Typo.

svn path=/nixos/trunk/; revision=34369
---
 modules/programs/shadow.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/programs/shadow.nix b/modules/programs/shadow.nix
index 8af94c48cce..3a348818a97 100644
--- a/modules/programs/shadow.nix
+++ b/modules/programs/shadow.nix
@@ -37,7 +37,7 @@ in
     users.defaultUserShell = pkgs.lib.mkOption {
       default = "/var/run/current-system/sw/bin/bash";
       description = ''
-        This option defined the default shell assigned to user
+        This option defines the default shell assigned to user
         accounts.  This must not be a store path, since the path is
         used outside the store (in particular in /etc/passwd).
         Rather, it should be the path of a symlink that points to the
-- 
GitLab


From 6aa4120f3abd71d98d61891e43ffc6553202807e Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 6 Jun 2012 23:14:57 +0000
Subject: [PATCH 3709/5331] * Shorten the greeting line to make it fit on a
 80-character terminal   again by removing the kernel version.

svn path=/nixos/trunk/; revision=34376
---
 modules/services/ttys/mingetty.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/services/ttys/mingetty.nix b/modules/services/ttys/mingetty.nix
index 91a00908385..85db3f8966e 100644
--- a/modules/services/ttys/mingetty.nix
+++ b/modules/services/ttys/mingetty.nix
@@ -31,7 +31,7 @@ with pkgs.lib;
       };
 
       greetingLine = mkOption {
-        default = ''<<< Welcome to NixOS ${config.system.nixosVersion} (\m) - \s \r (\l) >>>'';
+        default = ''<<< Welcome to NixOS ${config.system.nixosVersion} (\m) - \l >>>'';
         description = ''
           Welcome line printed by mingetty.
         '';
-- 
GitLab


From 87e06b97a338bbf16fbebe742dbdfdfe103cc9b3 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 8 Jun 2012 14:29:31 +0000
Subject: [PATCH 3710/5331] * Don't include the hostname in option default
 values.  Default values   are included in the manual, so this causes a
 different manual to be   built for each machine. * Clean up indentation of
 cntlm module.

svn path=/nixos/trunk/; revision=34387
---
 modules/services/networking/avahi-daemon.nix |  4 +-
 modules/services/networking/cntlm.nix        | 40 ++++++++++----------
 2 files changed, 24 insertions(+), 20 deletions(-)

diff --git a/modules/services/networking/avahi-daemon.nix b/modules/services/networking/avahi-daemon.nix
index 81432d34864..791109dcda2 100644
--- a/modules/services/networking/avahi-daemon.nix
+++ b/modules/services/networking/avahi-daemon.nix
@@ -44,7 +44,7 @@ in
       };
 
       hostName = mkOption {
-        default = config.networking.hostName;
+        type = types.uniq types.string;
         description = ''Host name advertised on the LAN.'';
       };
 
@@ -93,6 +93,8 @@ in
 
   config = mkIf cfg.enable {
 
+    services.avahi.hostName = mkDefault config.networking.hostName;
+
     users.extraUsers = singleton
       { name = "avahi";
         uid = config.ids.uids.avahi;
diff --git a/modules/services/networking/cntlm.nix b/modules/services/networking/cntlm.nix
index a79f7c21d7c..bfe7209b991 100644
--- a/modules/services/networking/cntlm.nix
+++ b/modules/services/networking/cntlm.nix
@@ -13,7 +13,7 @@ in
 
   options = {
 
-    services.cntlm= {
+    services.cntlm = {
 
       enable = mkOption {
         default = false;
@@ -39,9 +39,9 @@ in
       };
 
       netbios_hostname = mkOption {
-        default = config.networking.hostName;
+        type = types.uniq types.string;
         description = ''
-          The hostname of your workstation.
+          The hostname of your machine.
         '';
       };
 
@@ -73,28 +73,28 @@ in
   ###### implementation
 
   config = mkIf config.services.cntlm.enable {
+
+    services.cntlm.netbios_hostname = mkDefault config.networking.hostName;
+  
     users.extraUsers = singleton { 
-        name = "cntlm";
-        description = "cntlm system-wide daemon";
-        home = "/var/empty";
+      name = "cntlm";
+      description = "cntlm system-wide daemon";
+      home = "/var/empty";
     };
 
-    jobs.cntlm = {
-        description = "cntlm is an NTLM / NTLM Session Response / NTLMv2 authenticating HTTP proxy.";
+    jobs.cntlm =
+      { description = "CNTLM is an NTLM / NTLM Session Response / NTLMv2 authenticating HTTP proxy";
+      
         startOn = "started network-interfaces";
-        environment = {
-        };
-
-    preStart = '' '';
 
-    daemonType = "fork";
+        daemonType = "fork";
 
-    exec =
-      ''
-        ${pkgs.cntlm}/bin/cntlm -U cntlm \
-        -c ${pkgs.writeText "cntlm_config" cfg.extraConfig}
-      '';
-    };
+        exec =
+          ''
+            ${pkgs.cntlm}/bin/cntlm -U cntlm \
+            -c ${pkgs.writeText "cntlm_config" cfg.extraConfig}
+          '';
+      };
 
     services.cntlm.extraConfig =
       ''
@@ -109,5 +109,7 @@ in
           Listen ${toString port}
         '') cfg.port}
       '';
+      
   };
+  
 }
-- 
GitLab


From 825a84c8f61102dc7662310d6ba9dd8f213f05b8 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 8 Jun 2012 20:59:26 +0000
Subject: [PATCH 3711/5331] * Fix generated module links in the manual to point
 to GitHub. * Use <nixos/...> instead of /etc/nixos/...

svn path=/nixos/trunk/; revision=34391
---
 doc/manual/options-to-docbook.xsl | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/doc/manual/options-to-docbook.xsl b/doc/manual/options-to-docbook.xsl
index 660ba6208b3..ce942d57430 100644
--- a/doc/manual/options-to-docbook.xsl
+++ b/doc/manual/options-to-docbook.xsl
@@ -156,7 +156,7 @@
           or to the local filesystem. -->
           <xsl:choose>
             <xsl:when test="$revision != 'local' and contains(@value, '/modules/')">
-              <xsl:attribute name="xlink:href">https://nixos.org/viewvc/nix/nixos/trunk/modules/<xsl:value-of select="substring-after(@value, '/modules/')"/>?revision=<xsl:value-of select="$revision"/></xsl:attribute>
+              <xsl:attribute name="xlink:href">https://github.com/NixOS/nixos/blob/<xsl:value-of select="$revision"/>/modules/<xsl:value-of select="substring-after(@value, '/modules/')"/></xsl:attribute>
             </xsl:when>
             <xsl:otherwise>
               <xsl:attribute name="xlink:href">file://<xsl:value-of select="@value"/></xsl:attribute>
@@ -166,8 +166,8 @@
           /nix/store/<hash> prefix by the default location of nixos
           sources. -->
           <xsl:choose>
-            <xsl:when test="starts-with(@value, '/nix/store/')">
-              /etc/nixos/nixos/modules/<xsl:value-of select="substring-after(@value, '/modules/')"/>
+            <xsl:when test="contains(@value, '/modules/')">
+              &lt;nixos/modules/<xsl:value-of select="substring-after(@value, '/modules/')"/>&gt;
             </xsl:when>
             <xsl:otherwise>
               <xsl:value-of select="@value" />
-- 
GitLab


From ef15fa63c8de95a34fbdccff451c95c048d6c0c5 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 8 Jun 2012 21:10:11 +0000
Subject: [PATCH 3712/5331] * Ad-hockery to support the Charon manual.

svn path=/nixos/trunk/; revision=34392
---
 doc/manual/options-to-docbook.xsl | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/doc/manual/options-to-docbook.xsl b/doc/manual/options-to-docbook.xsl
index ce942d57430..0584081fef1 100644
--- a/doc/manual/options-to-docbook.xsl
+++ b/doc/manual/options-to-docbook.xsl
@@ -158,6 +158,9 @@
             <xsl:when test="$revision != 'local' and contains(@value, '/modules/')">
               <xsl:attribute name="xlink:href">https://github.com/NixOS/nixos/blob/<xsl:value-of select="$revision"/>/modules/<xsl:value-of select="substring-after(@value, '/modules/')"/></xsl:attribute>
             </xsl:when>
+            <xsl:when test="$revision != 'local' and contains(@value, 'charon') and contains(@value, '/nix/')">
+              <xsl:attribute name="xlink:href">https://github.com/NixOS/charon/blob/<xsl:value-of select="$revision"/>/nix/<xsl:value-of select="substring-after(@value, '/nix/')"/></xsl:attribute>
+            </xsl:when>
             <xsl:otherwise>
               <xsl:attribute name="xlink:href">file://<xsl:value-of select="@value"/></xsl:attribute>
             </xsl:otherwise>
@@ -169,6 +172,9 @@
             <xsl:when test="contains(@value, '/modules/')">
               &lt;nixos/modules/<xsl:value-of select="substring-after(@value, '/modules/')"/>&gt;
             </xsl:when>
+            <xsl:when test="contains(@value, 'charon') and contains(@value, '/nix/')">
+              &lt;charon/<xsl:value-of select="substring-after(@value, '/nix/')"/>&gt;
+            </xsl:when>
             <xsl:otherwise>
               <xsl:value-of select="@value" />
             </xsl:otherwise>
-- 
GitLab


From c539224a846516d6ab7628ccb6bd4b7afe67a22f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Sun, 10 Jun 2012 14:36:16 +0000
Subject: [PATCH 3713/5331] Postfix was started before all filesystems were
 mounted. I add 'filesystem' to startOn.

svn path=/nixos/trunk/; revision=34416
---
 modules/services/mail/postfix.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/services/mail/postfix.nix b/modules/services/mail/postfix.nix
index d4314236a9b..842427f6d05 100644
--- a/modules/services/mail/postfix.nix
+++ b/modules/services/mail/postfix.nix
@@ -307,7 +307,7 @@ in
       # accurate way is unlikely to be better.
       { description = "Postfix mail server";
 
-        startOn = "started networking";
+        startOn = "started networking and filesystem";
 
         daemonType = "none";
 
-- 
GitLab


From 31f30722d6ccad96eee50f485db2d1f13888677a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Sun, 10 Jun 2012 14:45:30 +0000
Subject: [PATCH 3714/5331] Small comment fix on the system-tarball-sheevaplug.

svn path=/nixos/trunk/; revision=34418
---
 modules/installer/cd-dvd/system-tarball-sheevaplug.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/modules/installer/cd-dvd/system-tarball-sheevaplug.nix b/modules/installer/cd-dvd/system-tarball-sheevaplug.nix
index 381223a078b..24e7a006314 100644
--- a/modules/installer/cd-dvd/system-tarball-sheevaplug.nix
+++ b/modules/installer/cd-dvd/system-tarball-sheevaplug.nix
@@ -1,5 +1,5 @@
 # This module contains the basic configuration for building a NixOS
-# installation CD.
+# tarball for the sheevaplug.
 
 { config, pkgs, ... }:
 
@@ -87,6 +87,7 @@ in
       pkgs.bvi # binary editor
       pkgs.joe
     ];
+*/
 
   boot.loader.grub.enable = false;
   boot.loader.generationsDir.enable = false;
-- 
GitLab


From 78333e5d845cfb71a5fdb329c39e06ba12b85f78 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Sun, 10 Jun 2012 14:50:44 +0000
Subject: [PATCH 3715/5331] Add a 'named' option to run only for ipv4.

I remember the 'named' log was giving annoying messages on systems not ipv6
capable (I can't recall if lacking the kernel ipv6 code or unconfigured ipv6
addresses).


svn path=/nixos/trunk/; revision=34419
---
 modules/services/networking/bind.nix | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/modules/services/networking/bind.nix b/modules/services/networking/bind.nix
index 19619f0383f..1e04b354939 100644
--- a/modules/services/networking/bind.nix
+++ b/modules/services/networking/bind.nix
@@ -78,6 +78,13 @@ in
         ";
       };
 
+      ipv4Only = mkOption {
+        default = false;
+        description = "
+          Only use ipv4, even if the host supports ipv6
+        ";
+      };
+
       zones = mkOption {
         default = [];
         description = "
@@ -121,7 +128,7 @@ in
             ${pkgs.coreutils}/bin/mkdir -p /var/run/named
           '';
 
-        exec = "${pkgs.bind}/sbin/named -c ${cfg.configFile} -f";
+        exec = "${pkgs.bind}/sbin/named ${optionalString cfg.ipv4Only "-4"} -c ${cfg.configFile} -f";
       };
 
   };
-- 
GitLab


From 9b833aafb974b26bde7636a3f827fcade8b4e7ec Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Sun, 10 Jun 2012 14:51:43 +0000
Subject: [PATCH 3716/5331] Fix prayer so it does not start a server at port
 80.

svn path=/nixos/trunk/; revision=34420
---
 modules/services/networking/prayer.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/modules/services/networking/prayer.nix b/modules/services/networking/prayer.nix
index 0424a252087..fb541bf101a 100644
--- a/modules/services/networking/prayer.nix
+++ b/modules/services/networking/prayer.nix
@@ -26,7 +26,9 @@ let
   '';
 
   prayerCfg = pkgs.runCommand "prayer.cf" { } ''
-    cat ${prayer}/etc/prayer.cf ${prayerExtraCfg} > $out
+    # We have to remove the http_port 80, or it will start a server there
+    cat ${prayer}/etc/prayer.cf | grep -v http_port > $out
+    cat ${prayerExtraCfg} >> $out
   '';
 
 in
-- 
GitLab


From 6824f1e0822a8b2e4af949dac49a0ea8580998e8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Sun, 10 Jun 2012 15:07:25 +0000
Subject: [PATCH 3717/5331] Making the dovecot2 mail location a nixos option.

svn path=/nixos/trunk/; revision=34421
---
 modules/services/mail/dovecot2.nix | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/modules/services/mail/dovecot2.nix b/modules/services/mail/dovecot2.nix
index c7ae59afa20..c5f5da41d31 100644
--- a/modules/services/mail/dovecot2.nix
+++ b/modules/services/mail/dovecot2.nix
@@ -25,7 +25,7 @@ let
     + ''
       default_internal_user = ${cfg.user}
 
-      mail_location = maildir:/var/spool/mail/%u
+      mail_location = ${cfg.mailLocation}
 
       maildir_copy_with_hardlinks = yes
 
@@ -76,6 +76,14 @@ in
         description = "Dovecot group name.";
       };
 
+      mailLocation = mkOption {
+        default = "maildir:/var/spool/mail/%u"; /* Same as inbox, as postfix */
+        example = "maildir:~/mail:INBOX=/var/spool/mail/%u";
+        description = ''
+          Location that dovecot will use for mail folders. Dovecot mail_location option.
+        '';
+      };
+
       sslServerCert = mkOption {
         default = "";
         description = "Server certificate";
-- 
GitLab


From 3d2ed1906764abf42f544444d628907233513830 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Sun, 10 Jun 2012 15:14:16 +0000
Subject: [PATCH 3718/5331] Making fcron use the daemonType=fork, instead of
 foreground. This way logrotate does not have to handle it appart.

svn path=/nixos/trunk/; revision=34422
---
 modules/services/scheduling/fcron.nix | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/modules/services/scheduling/fcron.nix b/modules/services/scheduling/fcron.nix
index 1dbaefdd719..6d274bf5973 100644
--- a/modules/services/scheduling/fcron.nix
+++ b/modules/services/scheduling/fcron.nix
@@ -101,7 +101,7 @@ in
     jobs.fcron =
       { description = "fcron daemon";
 
-        startOn = "startup";
+        startOn = "startup and filesystem";
 
         environment =
           { PATH = "/var/run/current-system/sw/bin";
@@ -114,7 +114,9 @@ in
             ${pkgs.fcron}/bin/fcrontab -u systab ${pkgs.writeText "systab" cfg.systab}
           '';
 
-        exec = "${pkgs.fcron}/sbin/fcron -f -m ${toString cfg.maxSerialJobs} ${queuelen}";
+        daemonType = "fork";
+
+        exec = "${pkgs.fcron}/sbin/fcron -m ${toString cfg.maxSerialJobs} ${queuelen}";
       };
 
   };
-- 
GitLab


From 9125d3af50ba58b903f31e67d1d24c04c32a7f2e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Sun, 10 Jun 2012 22:37:20 +0000
Subject: [PATCH 3719/5331] Adding creation of /dev/ptmx in stage-2, in case
 stage-1 did not run.

Upstart requires /dev/ptmx since its 1.4, and will lock up in case of it missing.

I was hitting this in the fuloong, where I don't use the nixos initrd.


svn path=/nixos/trunk/; revision=34429
---
 modules/system/boot/stage-2-init.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/modules/system/boot/stage-2-init.sh b/modules/system/boot/stage-2-init.sh
index bd48f463dcd..f02149ced75 100644
--- a/modules/system/boot/stage-2-init.sh
+++ b/modules/system/boot/stage-2-init.sh
@@ -46,6 +46,7 @@ if [ ! -e /proc/1 ]; then
     mknod -m 0666 /dev/null c 1 3
     mknod -m 0644 /dev/urandom c 1 9 # needed for passwd
     mknod -m 0644 /dev/console c 5 1
+    mknod -m 0644 /dev/ptmx c 5 2 # required by upstart
     mknod -m 0644 /dev/tty1 c 4 1
     mknod -m 0644 /dev/ttyS0 c 4 64
     mknod -m 0644 /dev/ttyS1 c 4 65
-- 
GitLab


From fbf53168f3dc640d63a67f8f7d46d86439979193 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 11 Jun 2012 07:05:11 +0000
Subject: [PATCH 3720/5331] Add new option config.boot.cleanTmpDir.

This option is to control if the user wants to have its /tmp directory cleaned
up during system boot.

svn path=/nixos/trunk/; revision=34432
---
 modules/system/boot/stage-2.nix | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/modules/system/boot/stage-2.nix b/modules/system/boot/stage-2.nix
index c92c29d6aef..d1a4e81ce2c 100644
--- a/modules/system/boot/stage-2.nix
+++ b/modules/system/boot/stage-2.nix
@@ -40,6 +40,14 @@ let
           for the accepted syntax.
         '';
       };
+
+      cleanTmpDir = pkgs.lib.mkOption {
+        default = false;
+        example = true;
+        description = ''
+          Delete all files in /tmp/ during boot.
+        '';
+      };
     };
 
   };
@@ -51,7 +59,7 @@ let
     src = ./stage-2-init.sh;
     shellDebug = "${pkgs.bashInteractive}/bin/bash";
     isExecutable = true;
-    inherit (config.boot) devShmSize runSize;
+    inherit (config.boot) devShmSize runSize cleanTmpDir;
     ttyGid = config.ids.gids.tty;
     upstart = config.system.build.upstart;
     path =
-- 
GitLab


From 4931188684547230342024c512dca2e82dd84509 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 11 Jun 2012 07:05:13 +0000
Subject: [PATCH 3721/5331] Integrate cleanTmpDir in stage-2-init.sh.

We're using find in order to remove dotfiles, too.

svn path=/nixos/trunk/; revision=34433
---
 modules/system/boot/stage-2-init.sh | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/modules/system/boot/stage-2-init.sh b/modules/system/boot/stage-2-init.sh
index f02149ced75..cc0f8befae8 100644
--- a/modules/system/boot/stage-2-init.sh
+++ b/modules/system/boot/stage-2-init.sh
@@ -102,16 +102,18 @@ mkdir -m 0755 -p /etc/nixos
 rm -rf /var/run /var/lock /var/log/upstart
 rm -f /etc/resolv.conf
 
-#echo -n "cleaning \`/tmp'..."
-#rm -rf --one-file-system /tmp/*
-#echo " done"
-
+if test -n "@cleanTmpDir@"; then
+    echo -n "cleaning \`/tmp'..."
+    find /tmp -maxdepth 1 -mindepth 1 -print0 | xargs -0r rm -rf --one-file-system
+    echo " done"
+else
+    # Get rid of ICE locks...
+    rm -rf /tmp/.ICE-unix
+fi
 
-# Get rid of ICE locks and ensure that it's owned by root.
-rm -rf /tmp/.ICE-unix
+# ... and ensure that it's owned by root.
 mkdir -m 1777 /tmp/.ICE-unix
 
-
 # This is a good time to clean up /nix/var/nix/chroots.  Doing an `rm
 # -rf' on it isn't safe in general because it can contain bind mounts
 # to /nix/store and other places.  But after rebooting these are all
-- 
GitLab


From 25155a02e608fc8a12b75ce82dce147cb7bb8280 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 11 Jun 2012 07:05:15 +0000
Subject: [PATCH 3722/5331] Add findutils dependency for /tmp cleaning.

This dependency is only added if the setting is activated.

svn path=/nixos/trunk/; revision=34434
---
 modules/system/boot/stage-2.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/system/boot/stage-2.nix b/modules/system/boot/stage-2.nix
index d1a4e81ce2c..02c061dacde 100644
--- a/modules/system/boot/stage-2.nix
+++ b/modules/system/boot/stage-2.nix
@@ -67,7 +67,7 @@ let
         pkgs.utillinux
         pkgs.udev
         pkgs.sysvtools
-      ];
+      ] ++ pkgs.lib.optional config.boot.cleanTmpDir pkgs.findutils;
     postBootCommands = pkgs.writeText "local-cmds"
       ''
         ${config.boot.postBootCommands}
-- 
GitLab


From 4c54fcaf4567304696c4a26792dc8c1bc62b26ab Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 11 Jun 2012 07:10:25 +0000
Subject: [PATCH 3723/5331] pam security for i3lock

svn path=/nixos/trunk/; revision=34435
---
 modules/security/pam.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/modules/security/pam.nix b/modules/security/pam.nix
index 4e50c661460..edc1c7daac2 100644
--- a/modules/security/pam.nix
+++ b/modules/security/pam.nix
@@ -220,6 +220,7 @@ in
         { name = "samba"; }
         { name = "sshd"; }
         { name = "xlock"; }
+        { name = "i3lock"; }
       ];
 
   };
-- 
GitLab


From 5c3593be46618127403d0c6af0a8969f268cd381 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 11 Jun 2012 07:12:39 +0000
Subject: [PATCH 3724/5331] Add PAM configuration for vlock.

svn path=/nixos/trunk/; revision=34436
---
 modules/security/pam.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/modules/security/pam.nix b/modules/security/pam.nix
index edc1c7daac2..e59d132e0bc 100644
--- a/modules/security/pam.nix
+++ b/modules/security/pam.nix
@@ -220,6 +220,7 @@ in
         { name = "samba"; }
         { name = "sshd"; }
         { name = "xlock"; }
+        { name = "vlock"; }
         { name = "i3lock"; }
       ];
 
-- 
GitLab


From 51b5da4023cbb5978933ae6024d416c9735010dd Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 11 Jun 2012 07:12:41 +0000
Subject: [PATCH 3725/5331] modules/security/pam.nix: sort
 security.pam.services alphabetically

svn path=/nixos/trunk/; revision=34437
---
 modules/security/pam.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/security/pam.nix b/modules/security/pam.nix
index e59d132e0bc..f5cb453ef08 100644
--- a/modules/security/pam.nix
+++ b/modules/security/pam.nix
@@ -216,12 +216,12 @@ in
       [ { name = "cups"; }
         { name = "ejabberd"; }
         { name = "ftp"; }
+        { name = "i3lock"; }
         { name = "lshd"; }
         { name = "samba"; }
         { name = "sshd"; }
-        { name = "xlock"; }
         { name = "vlock"; }
-        { name = "i3lock"; }
+        { name = "xlock"; }
       ];
 
   };
-- 
GitLab


From a257bf78cb452c483f7aaff50e010e0bb4e9b5f6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Mon, 11 Jun 2012 17:31:03 +0000
Subject: [PATCH 3726/5331] Making the virtualbox-guest module be evaluated
 only in i686 and x86_64. On mips, an assertion in the nixpkgs virtualbox was
 failing.

svn path=/nixos/trunk/; revision=34464
---
 modules/virtualisation/virtualbox-guest.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/modules/virtualisation/virtualbox-guest.nix b/modules/virtualisation/virtualbox-guest.nix
index abfd6371557..d0935d9a052 100644
--- a/modules/virtualisation/virtualbox-guest.nix
+++ b/modules/virtualisation/virtualbox-guest.nix
@@ -11,6 +11,7 @@ let
 
 in
 
+if (pkgs.stdenv.isi686 || pkgs.stdenv.isx86_64) then
 {
 
   ###### interface
@@ -76,3 +77,4 @@ in
   };
 
 }
+else {}
-- 
GitLab


From a3118792a52779024e38100799a2de5c263a740a Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 11 Jun 2012 22:37:55 +0000
Subject: [PATCH 3727/5331] * Make the ACPI Shutdown command in VirtualBox to
 do the right thing.

svn path=/nixos/trunk/; revision=34473
---
 modules/virtualisation/virtualbox-guest.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/modules/virtualisation/virtualbox-guest.nix b/modules/virtualisation/virtualbox-guest.nix
index d0935d9a052..8e09d79e3a4 100644
--- a/modules/virtualisation/virtualbox-guest.nix
+++ b/modules/virtualisation/virtualbox-guest.nix
@@ -73,7 +73,10 @@ if (pkgs.stdenv.isi686 || pkgs.stdenv.isx86_64) then
         # should restrict this to logged-in users.
         KERNEL=="vboxuser",  OWNER="root", GROUP="root", MODE="0666"
       '';
-      
+
+    # Make the ACPI Shutdown command to do the right thing.    
+    services.acpid.enable = true;
+    services.acpid.powerEventCommands = "poweroff";
   };
 
 }
-- 
GitLab


From 03653d43eb29a840cc7a4c7da6ee3914bb8125c3 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 11 Jun 2012 22:41:07 +0000
Subject: [PATCH 3728/5331] * Add support for sudo authentication using the SSH
 agent.  This   allows password-less servers.

svn path=/nixos/trunk/; revision=34474
---
 modules/security/pam.nix  | 32 ++++++++++++++++++++++++--------
 modules/security/sudo.nix | 13 +++++++------
 2 files changed, 31 insertions(+), 14 deletions(-)

diff --git a/modules/security/pam.nix b/modules/security/pam.nix
index f5cb453ef08..963aef55999 100644
--- a/modules/security/pam.nix
+++ b/modules/security/pam.nix
@@ -7,7 +7,7 @@ with pkgs.lib;
 
 let
 
-  inherit (pkgs) pam_usb pam_ldap pam_krb5 pam_ccreds;
+  inherit (pkgs) pam_ldap pam_krb5 pam_ccreds;
 
   otherService = pkgs.writeText "other.pam"
     ''
@@ -37,6 +37,10 @@ let
     , # If set, user listed in /etc/pamusb.conf are able to log in with
       # the associated usb key.
       usbAuth ? config.security.pam.usb.enable
+    , # If set, the calling user's SSH agent is used to authenticate
+      # against the keys in the calling user's ~/.ssh/authorized_keys.
+      # This is useful for "sudo" on password-less remote systems.
+      sshAgentAuth ? false
     , # If set, use ConsoleKit's PAM connector module to claim
       # ownership of audio devices etc.
       ownDevices ? false
@@ -70,16 +74,17 @@ let
           # Authentication management.
           ${optionalString rootOK
               "auth sufficient pam_rootok.so"}
+          ${optionalString sshAgentAuth
+              "auth sufficient ${pkgs.pam_ssh_agent_auth}/libexec/pam_ssh_agent_auth.so file=~/.ssh/authorized_keys"}
           ${optionalString usbAuth
-              "auth sufficient ${pam_usb}/lib/security/pam_usb.so"}
-          auth sufficient pam_unix.so ${
-            optionalString allowNullPassword "nullok"} likeauth
+              "auth sufficient ${pkgs.pam_usb}/lib/security/pam_usb.so"}
+          auth sufficient pam_unix.so ${optionalString allowNullPassword "nullok"} likeauth
           ${optionalString config.users.ldap.enable
               "auth sufficient ${pam_ldap}/lib/security/pam_ldap.so use_first_pass"}
-          ${optionalString config.krb5.enable
-''auth [default=ignore success=1 service_err=reset] ${pam_krb5}/lib/security/pam_krb5.so use_first_pass
-auth [default=die success=done] ${pam_ccreds}/lib/security/pam_ccreds.so action=validate use_first_pass
-auth sufficient ${pam_ccreds}/lib/security/pam_ccreds.so action=store use_first_pass
+          ${optionalString config.krb5.enable ''
+            auth [default=ignore success=1 service_err=reset] ${pam_krb5}/lib/security/pam_krb5.so use_first_pass
+            auth [default=die success=done] ${pam_ccreds}/lib/security/pam_ccreds.so action=validate use_first_pass
+            auth sufficient ${pam_ccreds}/lib/security/pam_ccreds.so action=store use_first_pass
           ''}
           auth required   pam_deny.so
 
@@ -184,6 +189,17 @@ in
         '';
     };
 
+    security.pam.enableSSHAgentAuth = mkOption {
+      default = false;
+      description =
+        ''
+          Enable sudo logins if the user's SSH agent provides a key
+          present in <filename>~/.ssh/authorized_keys</filename>.
+          This allows machines to exclusively use SSH keys instead of
+          passwords.
+        '';
+    };
+
   };
 
 
diff --git a/modules/security/sudo.nix b/modules/security/sudo.nix
index 3f01633d67a..76c325d8d8f 100644
--- a/modules/security/sudo.nix
+++ b/modules/security/sudo.nix
@@ -30,13 +30,16 @@ in
       # configuration will fail to build.
       default =
         ''
-          # Don't edit this file. Set nixos option security.sudo.configFile instead
+          # Don't edit this file. Set the NixOS option ‘security.sudo.configFile’ instead.
 
-          # env vars to keep for root and %wheel also if not explicitly set
+          # Environment variables to keep for root and %wheel.
           Defaults:root,%wheel env_keep+=LOCALE_ARCHIVE
           Defaults:root,%wheel env_keep+=NIX_PATH
           Defaults:root,%wheel env_keep+=TERMINFO_DIRS
 
+          # Keep SSH_AUTH_SOCK so that pam_ssh_agent_auth.so can do its magic.
+          Defaults env_keep+=SSH_AUTH_SOCK
+
           # "root" is allowed to do anything.
           root        ALL=(ALL) SETENV: ALL
 
@@ -60,15 +63,13 @@ in
 
     environment.systemPackages = [ sudo ];
 
-    security.pam.services = [ { name = "sudo"; } ];
+    security.pam.services = [ { name = "sudo"; sshAgentAuth = true; } ];
 
     environment.etc = singleton
-      { source = pkgs.runCommand "sudoers"
-          { src = pkgs.writeText "sudoers-in" cfg.configFile; }
+      { source = pkgs.writeText "sudoers-in" cfg.configFile;
           # Make sure that the sudoers file is syntactically valid.
           # (currently disabled - NIXOS-66)
           #"${pkgs.sudo}/sbin/visudo -f $src -c && cp $src $out";
-          "cp $src $out";
         target = "sudoers";
         mode = "0440";
       };
-- 
GitLab


From 15d44498f9ec7b6481dcc0608a1ef89265c654c2 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 12 Jun 2012 13:41:51 +0000
Subject: [PATCH 3729/5331] =?UTF-8?q?*=20Add=20a=20=E2=80=98size=E2=80=99?=
 =?UTF-8?q?=20option=20to=20=E2=80=98swapDevices=E2=80=99=20to=20create=20?=
 =?UTF-8?q?swapfiles=20on=20the=20fly.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

svn path=/nixos/trunk/; revision=34478
---
 modules/config/swap.nix       | 13 +++++++++++--
 modules/tasks/filesystems.nix | 13 ++++++++++++-
 2 files changed, 23 insertions(+), 3 deletions(-)

diff --git a/modules/config/swap.nix b/modules/config/swap.nix
index 550cd4755af..f0a6ceeda81 100644
--- a/modules/config/swap.nix
+++ b/modules/config/swap.nix
@@ -33,13 +33,22 @@ with pkgs.lib;
 
           device = mkOption {
             example = "/dev/sda3";
-            type = types.string;
+            type = types.uniq types.string;
             description = "Path of the device.";
           };
 
           label = mkOption {
             example = "swap";
-            type = types.string;
+            type = types.uniq types.string;
+            description = ''
+              Label of the device.  Can be used instead of <varname>device</varname>.
+            '';
+          };
+
+          size = mkOption {
+            default = null;
+            example = "swap";
+            type = types.nullOr types.int;
             description = ''
               Label of the device.  Can be used instead of <varname>device</varname>.
             '';
diff --git a/modules/tasks/filesystems.nix b/modules/tasks/filesystems.nix
index 5848e21688c..9495cac6785 100644
--- a/modules/tasks/filesystems.nix
+++ b/modules/tasks/filesystems.nix
@@ -22,7 +22,7 @@ let
 
       # Swap devices.
       ${flip concatMapStrings config.swapDevices (sw:
-           "${sw.device} none swap\n"
+          "${sw.device} none swap\n"
       )}
     '';
 
@@ -213,6 +213,17 @@ in
             ${flip concatMapStrings config.fileSystems (fs: optionalString fs.autocreate ''
               mkdir -p -m 0755 '${fs.mountPoint}'
             '')}
+
+            # Create missing swapfiles.
+            # FIXME: support changing the size of existing swapfiles.
+            ${flip concatMapStrings config.swapDevices (sw: optionalString (sw.size != null) ''
+              if [ ! -e "${sw.device}" -a -e "$(dirname "${sw.device}")" ]; then
+                # FIXME: use ‘fallocate’ on filesystems that support it.
+                dd if=/dev/zero of="${sw.device}" bs=1M count=${toString sw.size}
+                mkswap ${sw.device}
+              fi
+            '')}
+            
           '';
 
         daemonType = "daemon";
-- 
GitLab


From 97b81d7e6eba687643bfdf377569559960e0158d Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 12 Jun 2012 14:05:11 +0000
Subject: [PATCH 3730/5331] * Test swapfile creation.

svn path=/nixos/trunk/; revision=34479
---
 tests/misc.nix | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/tests/misc.nix b/tests/misc.nix
index 512d087168d..8501d6a0979 100644
--- a/tests/misc.nix
+++ b/tests/misc.nix
@@ -4,7 +4,11 @@
 
 {
 
-  machine = { config, pkgs, ... }: { };
+  machine =
+    { config, pkgs, ... }:
+    { swapDevices = pkgs.lib.mkOverride 0
+        [ { device = "/root/swapfile"; size = 128; } ];
+    };
 
   testScript =
     ''
@@ -23,6 +27,12 @@
       subtest "gmp", sub {
           $machine->succeed("expr 1 + 2");
       };
+
+      # Test that the swap file got created.
+      subtest "swapfile", sub {
+          $machine->waitUntilSucceeds("cat /proc/swaps | grep /root/swapfile");
+          $machine->succeed("ls -l /root/swapfile | grep 134217728");
+      };
     '';
 
 }
-- 
GitLab


From 63517eca1b829fad5b6b42a8a43cf9e508c86eb7 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 12 Jun 2012 20:21:15 +0000
Subject: [PATCH 3731/5331] * Actually use the security.pam.enableSSHAgentAuth
 option.

  http://hydra.nixos.org/build/2698800

svn path=/nixos/trunk/; revision=34483
---
 modules/security/pam.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/security/pam.nix b/modules/security/pam.nix
index 963aef55999..4fab7febc71 100644
--- a/modules/security/pam.nix
+++ b/modules/security/pam.nix
@@ -74,7 +74,7 @@ let
           # Authentication management.
           ${optionalString rootOK
               "auth sufficient pam_rootok.so"}
-          ${optionalString sshAgentAuth
+          ${optionalString (config.security.pam.enableSSHAgentAuth && sshAgentAuth)
               "auth sufficient ${pkgs.pam_ssh_agent_auth}/libexec/pam_ssh_agent_auth.so file=~/.ssh/authorized_keys"}
           ${optionalString usbAuth
               "auth sufficient ${pkgs.pam_usb}/lib/security/pam_usb.so"}
-- 
GitLab


From fd9604b319b66df9a47d639ecac0e5631ac3358a Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 13 Jun 2012 03:28:03 +0000
Subject: [PATCH 3732/5331] * Oops, fix an incomplete commit.

svn path=/nixos/trunk/; revision=34488
---
 modules/config/swap.nix | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/modules/config/swap.nix b/modules/config/swap.nix
index f0a6ceeda81..163de568d0f 100644
--- a/modules/config/swap.nix
+++ b/modules/config/swap.nix
@@ -47,10 +47,13 @@ with pkgs.lib;
 
           size = mkOption {
             default = null;
-            example = "swap";
+            example = 2048;
             type = types.nullOr types.int;
             description = ''
-              Label of the device.  Can be used instead of <varname>device</varname>.
+              If this option is set, ‘device’ is interpreted as the
+              path of a swapfile that will be created automatically
+              with the indicated size (in megabytes) if it doesn't
+              exist.
             '';
           };
 
-- 
GitLab


From c9be63b83e6b669181adb34c5527e7fe9a393149 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 14 Jun 2012 21:33:59 +0000
Subject: [PATCH 3733/5331] =?UTF-8?q?*=20Use=20=E2=80=98nologin=E2=80=99?=
 =?UTF-8?q?=20as=20the=20default=20shell=20for=20user=20accounts=20that=20?=
 =?UTF-8?q?are=20not=20=20=20allowed=20to=20log=20in.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

svn path=/nixos/trunk/; revision=34514
---
 modules/config/users-groups.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/config/users-groups.nix b/modules/config/users-groups.nix
index deaa346acff..beb21734652 100644
--- a/modules/config/users-groups.nix
+++ b/modules/config/users-groups.nix
@@ -48,7 +48,7 @@ let
       
       shell = mkOption {
         type = with types; uniq string;
-        default = "/noshell";
+        default = "/var/run/current-system/sw/sbin/nologin";
         description = "The path to the user's shell.";
       };
       
-- 
GitLab


From a46894b960c47348eef2a682ea5e0597d8c7b2c5 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 14 Jun 2012 18:44:56 -0400
Subject: [PATCH 3734/5331] Get lots more systemd stuff working
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Enabled a bunch of units that ship with systemd.  Also added an option
‘boot.systemd.units’ that can be used to define additional units
(e.g. ‘sshd.service’).
---
 modules/services/networking/ssh/sshd.nix |  35 ++-
 modules/services/system/dbus.nix         |  26 +++
 modules/system/boot/stage-2-init.sh      |   5 +-
 modules/system/boot/stage-2.nix          |   1 -
 modules/system/boot/systemd.nix          | 261 +++++++++++++++--------
 modules/system/upstart/upstart.nix       |   2 +
 6 files changed, 234 insertions(+), 96 deletions(-)

diff --git a/modules/services/networking/ssh/sshd.nix b/modules/services/networking/ssh/sshd.nix
index 53efc08cfb8..e4ca7f39a56 100644
--- a/modules/services/networking/ssh/sshd.nix
+++ b/modules/services/networking/ssh/sshd.nix
@@ -127,6 +127,18 @@ let
       ${userLoop}
     '';
 
+  preStart = pkgs.writeScript "openssh-pre-start"
+    ''
+      #! ${pkgs.stdenv.shell}
+
+      ${mkAuthkeyScript}
+
+      mkdir -m 0755 -p /etc/ssh
+
+      if ! test -f ${cfg.hostKeyPath}; then
+          ssh-keygen -t ${hktn} -b ${toString hktb} -f ${cfg.hostKeyPath} -N ""
+      fi
+    '';
 
 in
 
@@ -305,9 +317,26 @@ in
       }
     ];
 
-    jobs.sshd = {
+    boot.systemd.units."sshd.service" =
+      ''
+        [Unit]
+        Description=SSH daemon
+
+        [Service]
+        Environment=PATH=${pkgs.coreutils}/bin:${pkgs.openssh}/bin
+        ExecStartPre=${preStart}
+        ExecStart=\
+          ${pkgs.openssh}/sbin/sshd -h ${cfg.hostKeyPath} \
+            -f ${pkgs.writeText "sshd_config" cfg.extraConfig}
+        Restart=always
+        RestartSec=5
+        Type=forking
+        KillMode=process
+        PIDFile=/run/sshd.pid
+      '';
 
-        description = "OpenSSH server";
+    jobs.sshd =
+      { description = "OpenSSH server";
 
         startOn = "started network-interfaces";
 
@@ -343,6 +372,8 @@ in
 
     services.openssh.extraConfig =
       ''
+        PidFile /run/sshd.pid
+      
         Protocol 2
 
         UsePAM ${if cfg.usePAM then "yes" else "no"}
diff --git a/modules/services/system/dbus.nix b/modules/services/system/dbus.nix
index f7fbb23d0a7..8659c784483 100644
--- a/modules/services/system/dbus.nix
+++ b/modules/services/system/dbus.nix
@@ -116,6 +116,32 @@ in
         gid = config.ids.gids.messagebus;
       };
 
+    # FIXME: these are copied verbatim from the dbus source tree.  We
+    # should install and use the originals.
+    boot.systemd.units."dbus.socket" =
+      ''
+        [Unit]
+        Description=D-Bus System Message Bus Socket
+
+        [Socket]
+        ListenStream=/var/run/dbus/system_bus_socket
+      '';
+      
+    boot.systemd.units."dbus.service" =
+      ''
+        [Unit]
+        Description=D-Bus System Message Bus
+        Requires=dbus.socket
+        After=syslog.target
+
+        [Service]
+        ExecStartPre=${pkgs.dbus_tools}/bin/dbus-uuidgen --ensure
+        ExecStartPre=-${pkgs.coreutils}/bin/rm -f /var/run/dbus/pid
+        ExecStart=${pkgs.dbus_daemon}/bin/dbus-daemon --system --address=systemd: --nofork --systemd-activation
+        ExecReload=${pkgs.dbus_tools}/dbus-send --print-reply --system --type=method_call --dest=org.freedesktop.DBus / org.freedesktop.DBus.ReloadConfig
+        OOMScoreAdjust=-900
+      '';
+
     jobs.dbus =
       { startOn = "started udev and started syslogd";
       
diff --git a/modules/system/boot/stage-2-init.sh b/modules/system/boot/stage-2-init.sh
index 9e0ed028d5d..42dd21b6204 100644
--- a/modules/system/boot/stage-2-init.sh
+++ b/modules/system/boot/stage-2-init.sh
@@ -90,12 +90,13 @@ mkdir -m 0755 -p /dev/pts
 mount -t devpts -o mode=0600,gid=@ttyGid@ none /dev/pts
 [ -e /proc/bus/usb ] && mount -t usbfs none /proc/bus/usb # UML doesn't have USB by default
 mkdir -m 01777 -p /tmp
-mkdir -m 0755 -p /var
+mkdir -m 0755 -p /var /var/log
 mkdir -m 0755 -p /nix/var
 mkdir -m 0700 -p /root
 mkdir -m 0755 -p /bin # for the /bin/sh symlink
 mkdir -m 0755 -p /home
 mkdir -m 0755 -p /etc/nixos
+mkdir -m 0700 -p /var/log/journal
 
 
 # Miscellaneous boot time cleanup.
@@ -195,4 +196,4 @@ fi
 
 # Start systemd.
 echo "starting systemd..."
-PATH=/var/run/current-system/systemd/lib/systemd exec systemd --log-level debug --log-target=console --crash-shell
+PATH=/var/run/current-system/systemd/lib/systemd exec systemd --log-target journal --log-level debug --crash-shell
diff --git a/modules/system/boot/stage-2.nix b/modules/system/boot/stage-2.nix
index 02c061dacde..a5e96cc0f1c 100644
--- a/modules/system/boot/stage-2.nix
+++ b/modules/system/boot/stage-2.nix
@@ -61,7 +61,6 @@ let
     isExecutable = true;
     inherit (config.boot) devShmSize runSize cleanTmpDir;
     ttyGid = config.ids.gids.tty;
-    upstart = config.system.build.upstart;
     path =
       [ pkgs.coreutils
         pkgs.utillinux
diff --git a/modules/system/boot/systemd.nix b/modules/system/boot/systemd.nix
index 3b51ebf43fc..4555b59d278 100644
--- a/modules/system/boot/systemd.nix
+++ b/modules/system/boot/systemd.nix
@@ -9,106 +9,71 @@ let
   makeUnit = name: text:
     pkgs.writeTextFile { name = "unit"; inherit text; destination = "/${name}"; };
 
-  defaultTarget = makeUnit "default.target"
-    ''
-      [Unit]
-      Description=Default System
-      Requires=getty.target
-      After=getty.target
-      Conflicts=rescue.target
-      AllowIsolate=yes
-    '';
-
-  gettyTarget = makeUnit "getty.target"
-    ''
-      [Unit]
-      Description=Login Prompts
-      Requires=getty@tty1.service getty@tty2.service
-      After=getty@tty1.service getty@tty2.service
-    '';
-
-  gettyService = makeUnit "getty@.service"
-    ''
-      [Unit]
-      Description=Getty on %I
-      #BindTo=dev-%i.device
-      #After=dev-%i.device systemd-user-sessions.service plymouth-quit-wait.service
-      Before=getty.target
-
-      [Service]
-      Environment=TERM=linux
-      ExecStart=-${pkgs.utillinux}/sbin/agetty --noclear --login-program ${pkgs.shadow}/bin/login %I 38400
-      Restart=always
-      RestartSec=0
-      UtmpIdentifier=%I
-      TTYPath=/dev/%I
-      TTYReset=yes
-      TTYVHangup=yes
-      TTYVTDisallocate=yes
-      KillMode=process
-      IgnoreSIGPIPE=no
-
-      # Unset locale for the console getty since the console has problems
-      # displaying some internationalized messages.
-      Environment=LANG= LANGUAGE= LC_CTYPE= LC_NUMERIC= LC_TIME= LC_COLLATE= LC_MONETARY= LC_MESSAGES= LC_PAPER= LC_NAME= LC_ADDRESS= LC_TELEPHONE= LC_MEASUREMENT= LC_IDENTIFICATION=
-
-      # Some login implementations ignore SIGTERM, so we send SIGHUP
-      # instead, to ensure that login terminates cleanly.
-      KillSignal=SIGHUP
-    '';
-
-  rescueTarget = makeUnit "rescue.target"
-    ''
-      [Unit]
-      Description=Rescue Mode
-      Requires=rescue.service
-      After=rescue.service
-      AllowIsolate=yes
-    '';
-
-  rescueService = makeUnit "rescue.service"
-    ''
-      [Unit]
-      Description=Rescue Shell
-      DefaultDependencies=no
-      #After=basic.target
-      #Before=shutdown.target
-
-      [Service]
-      Environment=HOME=/root
-      WorkingDirectory=/root
-      ExecStartPre=-${pkgs.coreutils}/bin/echo 'Welcome to rescue mode. Use "systemctl default" or ^D to enter default mode.'
-      #ExecStart=-/sbin/sulogin
-      ExecStart=-${pkgs.bashInteractive}/bin/bash --login
-      ExecStopPost=-${systemd}/bin/systemctl --fail --no-block default
-      StandardInput=tty-force
-      StandardOutput=inherit
-      StandardError=inherit
-      KillMode=process
-
-      # Bash ignores SIGTERM, so we send SIGHUP instead, to ensure that bash
-      # terminates cleanly.
-      KillSignal=SIGHUP
-    '';
-
   upstreamUnits =
-    [ "systemd-journald.socket"
-      "systemd-journald.service"
+    [ # Targets.
       "basic.target"
       "sysinit.target"
-      "sysinit.target.wants"
       "sockets.target"
-      "sockets.target.wants"
+      "graphical.target"
+      "multi-user.target"
+      "getty.target"
+      "rescue.target"
+      "network.target"
+      "nss-lookup.target"
+      "nss-user-lookup.target"
+      "syslog.target"
+      "time-sync.target"
+
+      # Login stuff.
+      "systemd-logind.service"
+      "autovt@.service"
+      "systemd-vconsole-setup.service"
+      "systemd-user-sessions.service"
+
+      # Journal.
+      "systemd-journald.socket"
+      "systemd-journald.service"
 
+      # SysV init compatibility.
+      "systemd-initctl.socket"
+      "systemd-initctl.service"
+      "runlevel0.target"
+      "runlevel1.target"
+      "runlevel2.target"
+      "runlevel3.target"
+      "runlevel4.target"
+      "runlevel5.target"
+      "runlevel6.target"
+
+      # Random seed.
+      "systemd-random-seed-load.service"
+      "systemd-random-seed-save.service"
+
+      # Utmp maintenance.
+      "systemd-update-utmp-runlevel.service"
+      "systemd-update-utmp-shutdown.service"
+      
       # Filesystems.
+      "fsck@.service"
+      "fsck-root.service"
+      "systemd-remount-fs.service"
       "local-fs.target"
-      "local-fs.target.wants"
       "local-fs-pre.target"
       "remote-fs.target"
       "remote-fs-pre.target"
       "swap.target"
-      "media.mount"
+      "dev-hugepages.mount"
       "dev-mqueue.mount"
+      "sys-fs-fuse-connections.mount"
+      "sys-kernel-config.mount"
+      "sys-kernel-debug.mount"
+
+      # Hibernate / suspend.
+      "hibernate.target"
+      "hibernate.service"
+      "suspend.target"
+      "suspend.service"
+      "sleep.target"
 
       # Reboot stuff.
       "reboot.target"
@@ -121,18 +86,46 @@ let
       "shutdown.target"
       "umount.target"
       "final.target"
+
+      # Misc.
+      "syslog.socket"
     ];
 
+  upstreamWants =
+    [ "basic.target.wants"
+      "sysinit.target.wants"
+      "sockets.target.wants"
+      "local-fs.target.wants"
+      "multi-user.target.wants"
+      "shutdown.target.wants"
+    ];
+
+  nixosUnits = mapAttrsToList makeUnit config.boot.systemd.units;
+    
   systemUnits = pkgs.runCommand "system-units" { }
     ''
       mkdir -p $out/system
       for i in ${toString upstreamUnits}; do
         fn=${systemd}/example/systemd/system/$i
-        echo $fn
         [ -e $fn ]
-        ln -s $fn $out/system
+        if [ -L $fn ]; then
+          cp -pd $fn $out/system/
+        else
+          ln -s $fn $out/system
+        fi
       done
-      for i in ${toString [ defaultTarget gettyTarget gettyService rescueTarget rescueService ]}; do
+      for i in ${toString upstreamWants}; do
+        fn=${systemd}/example/systemd/system/$i
+        [ -e $fn ]
+        x=$out/system/$(basename $fn)
+        mkdir $x
+        for i in $fn/*; do
+          y=$x/$(basename $i)
+          cp -pd $i $y
+          if ! [ -e $y ]; then rm -v $y; fi
+        done
+      done
+      for i in ${toString nixosUnits}; do
         cp $i/* $out/system
       done
     ''; # */
@@ -141,6 +134,18 @@ in
 
 {
 
+  ###### interface
+
+  options = {
+
+    boot.systemd.units = mkOption {
+      default = {} ;
+      description = "Systemd units.";
+    };
+
+  };
+
+  
   ###### implementation
 
   config = {
@@ -152,7 +157,81 @@ in
           target = "systemd";
         }
       ];
+
+    boot.systemd.units."default.target" =
+      ''
+        [Unit]
+        Description=Default System
+        Requires=multi-user.target
+        After=multi-user.target
+        Conflicts=rescue.target
+        AllowIsolate=yes
+        Wants=sshd.service autovt@tty1.service # FIXME
+      '';
     
+    boot.systemd.units."getty@.service" =
+      ''
+        [Unit]
+        Description=Getty on %I
+        Documentation=man:agetty(8)
+        After=systemd-user-sessions.service plymouth-quit-wait.service
+
+        # If additional gettys are spawned during boot then we should make
+        # sure that this is synchronized before getty.target, even though
+        # getty.target didn't actually pull it in.
+        Before=getty.target
+        IgnoreOnIsolate=yes
+
+        [Service]
+        Environment=TERM=linux
+        ExecStart=-${pkgs.utillinux}/sbin/agetty --noclear --login-program ${pkgs.shadow}/bin/login %I 38400
+        Type=idle
+        Restart=always
+        RestartSec=0
+        UtmpIdentifier=%I
+        TTYPath=/dev/%I
+        TTYReset=yes
+        TTYVHangup=yes
+        TTYVTDisallocate=yes
+        KillMode=process
+        IgnoreSIGPIPE=no
+
+        # Unset locale for the console getty since the console has problems
+        # displaying some internationalized messages.
+        Environment=LANG= LANGUAGE= LC_CTYPE= LC_NUMERIC= LC_TIME= LC_COLLATE= LC_MONETARY= LC_MESSAGES= LC_PAPER= LC_NAME= LC_ADDRESS= LC_TELEPHONE= LC_MEASUREMENT= LC_IDENTIFICATION=
+
+        # Some login implementations ignore SIGTERM, so we send SIGHUP
+        # instead, to ensure that login terminates cleanly.
+        KillSignal=SIGHUP
+      '';
+
+    boot.systemd.units."rescue.service" =
+      ''
+        [Unit]
+        Description=Rescue Shell
+        DefaultDependencies=no
+        Conflicts=shutdown.target
+        After=sysinit.target
+        Before=shutdown.target
+
+        [Service]
+        Environment=HOME=/root
+        WorkingDirectory=/root
+        ExecStartPre=-${pkgs.coreutils}/bin/echo 'Welcome to rescue mode. Use "systemctl default" or ^D to enter default mode.'
+        #ExecStart=-/sbin/sulogin
+        ExecStart=-${pkgs.bashInteractive}/bin/bash --login
+        ExecStopPost=-${systemd}/bin/systemctl --fail --no-block default
+        Type=idle
+        StandardInput=tty-force
+        StandardOutput=inherit
+        StandardError=inherit
+        KillMode=process
+
+        # Bash ignores SIGTERM, so we send SIGHUP instead, to ensure that bash
+        # terminates cleanly.
+        KillSignal=SIGHUP
+      '';
+
   };
 
 }
diff --git a/modules/system/upstart/upstart.nix b/modules/system/upstart/upstart.nix
index 1bfde9fc60e..284f1aafd37 100644
--- a/modules/system/upstart/upstart.nix
+++ b/modules/system/upstart/upstart.nix
@@ -476,6 +476,7 @@ in
 
     system.build.upstart = upstart;
 
+    /*
     environment.etc =
       flip map (attrValues config.jobs) (job:
         { source = job.jobDrv;
@@ -492,6 +493,7 @@ in
       ${optionalString (job.setuid != "") "chown ${job.setuid} /var/log/upstart/${job.name}"}
       ${optionalString (job.setgid != "") "chown :${job.setgid} /var/log/upstart/${job.name}"}
     '') (attrValues config.jobs));
+    */
 
   };
 
-- 
GitLab


From 164d6e6ab24669d5d6335fad72e9ec95aa4ccce5 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 15 Jun 2012 13:09:22 -0400
Subject: [PATCH 3735/5331] Use udev from systemd

---
 modules/services/hardware/udev.nix | 95 +++++-------------------------
 modules/system/boot/systemd.nix    | 10 ++++
 2 files changed, 24 insertions(+), 81 deletions(-)

diff --git a/modules/services/hardware/udev.nix b/modules/services/hardware/udev.nix
index 0b63d7543ea..81a9b570127 100644
--- a/modules/services/hardware/udev.nix
+++ b/modules/services/hardware/udev.nix
@@ -4,7 +4,9 @@ with pkgs.lib;
 
 let
 
-  inherit (pkgs) stdenv writeText udev procps;
+  inherit (pkgs) stdenv writeText procps;
+
+  udev = config.system.build.systemd;
 
   cfg = config.services.udev;
 
@@ -18,26 +20,23 @@ let
     # Miscellaneous devices.
     KERNEL=="kvm",                  MODE="0666"
     KERNEL=="kqemu",                MODE="0666"
+    KERNEL=="null",                 MODE="0777"
   '';
 
   # Perform substitutions in all udev rules files.
   udevRules = stdenv.mkDerivation {
     name = "udev-rules";
     buildCommand = ''
-      ensureDir $out
+      mkdir -p $out
       shopt -s nullglob
 
       # Set a reasonable $PATH for programs called by udev rules.
       echo 'ENV{PATH}="${udevPath}/bin:${udevPath}/sbin"' > $out/00-path.rules
 
-      # Set the firmware search path so that the firmware.sh helper
-      # called by 50-firmware.rules works properly.
-      echo 'ENV{FIRMWARE_DIRS}="/root/test-firmware ${toString config.hardware.firmware}"' >> $out/00-path.rules
-
       # Add the udev rules from other packages.
       for i in ${toString cfg.packages}; do
         echo "Adding rules for package $i"
-        for j in $i/*/udev/rules.d/*; do
+        for j in $i/{etc,lib}/udev/rules.d/*; do
           echo "Copying $j to $out/$(basename $j)"
           echo "# Copied from $j" > $out/$(basename $j)
           cat $j >> $out/$(basename $j)
@@ -53,11 +52,6 @@ let
           --replace \"/bin/mount \"${pkgs.utillinux}/bin/mount
       done
 
-      # If auto-configuration is disabled, then remove
-      # udev's 80-drivers.rules file, which contains rules for
-      # automatically calling modprobe.
-      ${if !config.boot.hardwareScan then "rm $out/80-drivers.rules" else ""}
-
       echo -n "Checking that all programs called by relative paths in udev rules exist in ${udev}/lib/udev ... "
       import_progs=$(grep 'IMPORT{program}="[^/$]' $out/* |
         sed -e 's/.*IMPORT{program}="\([^ "]*\)[ "].*/\1/' | uniq)
@@ -72,7 +66,7 @@ let
       done
       echo "OK"
 
-      echo -n "Checking that all programs call by absolute paths in udev rules exist ... "
+      echo -n "Checking that all programs called by absolute paths in udev rules exist ... "
       import_progs=$(grep 'IMPORT{program}="/' $out/* |
         sed -e 's/.*IMPORT{program}="\([^ "]*\)[ "].*/\1/' | uniq)
       run_progs=$(grep -v '^[[:space:]]*#' $out/* | grep 'RUN+="/' |
@@ -90,24 +84,9 @@ let
       for i in ${toString cfg.packages}; do
         grep -l '\(RUN+\|IMPORT{program}\)="\(/usr\)\?/s\?bin' $i/*/udev/rules.d/* || true
       done
-
-      # Use the persistent device rules (naming for CD/DVD and
-      # network devices) stored in
-      # /var/lib/udev/rules.d/70-persistent-{cd,net}.rules.  These are
-      # modified by the write_{cd,net}_rules helpers called from
-      # 75-cd-aliases-generator.rules and
-      # 75-persistent-net-generator.rules.
-      ln -sv /var/lib/udev/rules.d/70-persistent-cd.rules $out/
-      ln -sv /var/lib/udev/rules.d/70-persistent-net.rules $out/
     ''; # */
   };
 
-  # The udev configuration file.
-  conf = writeText "udev.conf" ''
-    udev_rules="${udevRules}"
-    #udev_log="debug"
-  '';
-
   # Udev has a 512-character limit for ENV{PATH}, so create a symlink
   # tree to work around this.
   udevPath = pkgs.buildEnv {
@@ -207,61 +186,15 @@ in
 
     services.udev.extraRules = nixosRules;
 
-    services.udev.packages = [ pkgs.udev extraUdevRules ];
-
-    services.udev.path = [ pkgs.coreutils pkgs.gnused pkgs.gnugrep pkgs.utillinux pkgs.udev ];
-
-    jobs.udev =
-      { startOn = "startup";
-
-        environment = { UDEV_CONFIG_FILE = conf; };
-
-        path = [ udev ];
-
-        preStart =
-          ''
-            echo "" > /proc/sys/kernel/hotplug || true
+    services.udev.packages = [ extraUdevRules ];
 
-            mkdir -p /var/lib/udev/rules.d
-            touch /var/lib/udev/rules.d/70-persistent-cd.rules /var/lib/udev/rules.d/70-persistent-net.rules
+    services.udev.path = [ pkgs.coreutils pkgs.gnused pkgs.gnugrep pkgs.utillinux udev ];
 
-            mkdir -p /dev/.udev # !!! bug in udev?
-          '';
-
-        daemonType = "fork";
-
-        exec = "udevd --daemon";
-
-        postStart =
-          ''
-            # Do the loading of additional stage 2 kernel modules.
-            # This needs to be done while udevd is running, because
-            # the modules may call upon udev's firmware loading rule.
-            for i in ${toString config.boot.kernelModules}; do
-                echo "loading kernel module ‘$i’..."
-                ${config.system.sbin.modprobe}/sbin/modprobe $i || true
-            done
-          '';
-      };
-
-    jobs.udevtrigger =
-      { startOn = "started udev";
-
-        task = true;
-
-        path = [ udev ];
-
-        script =
-          ''
-            # Let udev create device nodes for all modules that have already
-            # been loaded into the kernel (or for which support is built into
-            # the kernel).
-            udevadm trigger --action=add
-            udevadm settle || true # wait for udev to finish
-
-            initctl emit -n new-devices
-          '';
-      };
+    environment.etc =
+      [ { source = udevRules;
+          target = "udev/rules.d";
+        }
+      ];
 
   };
 
diff --git a/modules/system/boot/systemd.nix b/modules/system/boot/systemd.nix
index 4555b59d278..57bc47bd6d6 100644
--- a/modules/system/boot/systemd.nix
+++ b/modules/system/boot/systemd.nix
@@ -24,11 +24,19 @@ let
       "syslog.target"
       "time-sync.target"
 
+      # Udev.
+      "systemd-udev-control.socket"
+      "systemd-udev-kernel.socket"
+      "systemd-udev.service"
+      "systemd-udev-settle.service"
+      "systemd-udev-trigger.service"
+
       # Login stuff.
       "systemd-logind.service"
       "autovt@.service"
       "systemd-vconsole-setup.service"
       "systemd-user-sessions.service"
+      "dbus-org.freedesktop.login1.service"
 
       # Journal.
       "systemd-journald.socket"
@@ -150,6 +158,8 @@ in
 
   config = {
 
+    system.build.systemd = systemd;
+
     environment.systemPackages = [ systemd ];
   
     environment.etc =
-- 
GitLab


From ab86759eb3f0596f2f6940d0a5904bb04785911c Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 15 Jun 2012 14:18:26 -0400
Subject: [PATCH 3736/5331] Use kmod instead of module-init-tools

---
 modules/config/system-path.nix      |  4 +---
 modules/system/boot/modprobe.nix    | 11 ++++++-----
 modules/system/boot/stage-2-init.sh | 10 +++-------
 3 files changed, 10 insertions(+), 15 deletions(-)

diff --git a/modules/config/system-path.nix b/modules/config/system-path.nix
index 2a25cd411a1..d5939db95ac 100644
--- a/modules/config/system-path.nix
+++ b/modules/config/system-path.nix
@@ -16,8 +16,7 @@ let
     '';
 
   requiredPackages =
-    [ config.system.sbin.modprobe # must take precedence over module_init_tools
-      config.environment.nix
+    [ config.environment.nix
       pkgs.acl
       pkgs.attr
       pkgs.bashInteractive # bash with ncurses support
@@ -38,7 +37,6 @@ let
       pkgs.less
       pkgs.libcap
       pkgs.man
-      pkgs.module_init_tools
       pkgs.nano
       pkgs.ncurses
       pkgs.netcat
diff --git a/modules/system/boot/modprobe.nix b/modules/system/boot/modprobe.nix
index f210ecec26d..1b34e78ab78 100644
--- a/modules/system/boot/modprobe.nix
+++ b/modules/system/boot/modprobe.nix
@@ -9,7 +9,6 @@ with pkgs.lib;
   options = {
 
     system.sbin.modprobe = mkOption {
-      # should be moved in module-init-tools
       internal = true;
       default = pkgs.writeTextFile {
         name = "modprobe";
@@ -18,8 +17,8 @@ with pkgs.lib;
         text =
           ''
             #! ${pkgs.stdenv.shell}
-            export MODULE_DIR=${config.system.modulesTree}/lib/modules/
-
+            export MODULE_DIR=/var/run/current-system/kernel-modules/lib/modules
+            
             # Fall back to the kernel modules used at boot time if the
             # modules in the current configuration don't match the
             # running kernel.
@@ -27,7 +26,7 @@ with pkgs.lib;
                 MODULE_DIR=/var/run/booted-system/kernel-modules/lib/modules/
             fi
 
-            exec ${pkgs.module_init_tools}/sbin/modprobe "$@"
+            exec ${pkgs.kmod}/sbin/modprobe "$@"
           '';
       };
       description = ''
@@ -78,6 +77,8 @@ with pkgs.lib;
         target = "modprobe.d/nixos.conf";
       };
 
+    environment.systemPackages = [ config.system.sbin.modprobe pkgs.kmod ];
+
     boot.blacklistedKernelModules =
       [ # This module is for debugging and generates gigantic amounts
         # of log output, so it should never be loaded automatically.
@@ -104,7 +105,7 @@ with pkgs.lib;
 
     environment.shellInit =
       ''
-        export MODULE_DIR=${config.system.modulesTree}/lib/modules/
+        export MODULE_DIR=/var/run/current-system/kernel-modules/lib/modules
       '';    
 
   };
diff --git a/modules/system/boot/stage-2-init.sh b/modules/system/boot/stage-2-init.sh
index 42dd21b6204..384c9e301cb 100644
--- a/modules/system/boot/stage-2-init.sh
+++ b/modules/system/boot/stage-2-init.sh
@@ -188,12 +188,8 @@ if [ -n "$debug2" ]; then
 fi
 
 
-# FIXME: auto-loading of kernel modules in systemd doesn't work yet
-# because it uses libkmod.
-"$(cat /proc/sys/kernel/modprobe)" autofs4
-"$(cat /proc/sys/kernel/modprobe)" ipv6
-
-
 # Start systemd.
 echo "starting systemd..."
-PATH=/var/run/current-system/systemd/lib/systemd exec systemd --log-target journal --log-level debug --crash-shell
+PATH=/var/run/current-system/systemd/lib/systemd \
+    MODULE_DIR=/var/run/current-system/kernel-modules/lib/modules \
+    exec systemd --log-target journal --log-level debug --crash-shell
-- 
GitLab


From 66f4d108437e62659e77fe11583ae53a23c54b74 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 15 Jun 2012 14:51:48 -0400
Subject: [PATCH 3737/5331] Use pam_systemd.so to set up device ownership

This removes the need for ConsoleKit, so it's gone.
---
 modules/module-list.nix         |  1 -
 modules/security/consolekit.nix | 60 ---------------------------------
 modules/security/pam.nix        |  4 +--
 modules/system/boot/systemd.nix |  1 +
 4 files changed, 3 insertions(+), 63 deletions(-)
 delete mode 100644 modules/security/consolekit.nix

diff --git a/modules/module-list.nix b/modules/module-list.nix
index 870d316006f..0b324e7fffd 100644
--- a/modules/module-list.nix
+++ b/modules/module-list.nix
@@ -46,7 +46,6 @@
   ./programs/wvdial.nix
   ./rename.nix
   ./security/ca.nix
-  ./security/consolekit.nix
   ./security/pam.nix
   ./security/pam_usb.nix
   ./security/policykit.nix
diff --git a/modules/security/consolekit.nix b/modules/security/consolekit.nix
deleted file mode 100644
index 28e1fec0601..00000000000
--- a/modules/security/consolekit.nix
+++ /dev/null
@@ -1,60 +0,0 @@
-{ config, pkgs, ... }:
-
-with pkgs.lib;
-
-let
-
-  # `pam_console' maintains the set of locally logged in users in
-  # /var/run/console.  This is obsolete, but D-Bus still uses it for
-  # its `at_console' feature.  So maintain it using a ConsoleKit
-  # session script.  Borrowed from
-  # http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/sys-auth/consolekit/files/pam-foreground-compat.ck
-  updateVarRunConsole = pkgs.writeTextFile {
-    name = "var-run-console.ck";
-    destination = "/etc/ConsoleKit/run-session.d/var-run-console.ck";
-    executable = true;
-
-    text =
-      ''
-        #! ${pkgs.stdenv.shell} -e
-        PATH=${pkgs.coreutils}/bin:${pkgs.gnused}/bin:${pkgs.glibc}/bin
-        TAGDIR=/var/run/console
-
-        [ -n "$CK_SESSION_USER_UID" ] || exit 1
-
-        TAGFILE="$TAGDIR/`getent passwd $CK_SESSION_USER_UID | cut -f 1 -d:`"
-
-        if [ "$1" = "session_added" ]; then
-            mkdir -p "$TAGDIR"
-            echo "$CK_SESSION_ID" >> "$TAGFILE"
-        fi
-
-        if [ "$1" = "session_removed" ] && [ -e "$TAGFILE" ]; then
-            sed -i "\%^$CK_SESSION_ID\$%d" "$TAGFILE"
-            [ -s "$TAGFILE" ] || rm -f "$TAGFILE"
-        fi
-      '';
-  };
-
-in
-
-{
-
-  config = {
-
-    environment.systemPackages = [ pkgs.consolekit ];
-
-    services.dbus.packages = [ pkgs.consolekit ];
-
-    environment.etc = singleton
-      { source = (pkgs.buildEnv {
-          name = "consolekit-config";
-          pathsToLink = [ "/etc/ConsoleKit" ];
-          paths = [ pkgs.consolekit pkgs.udev updateVarRunConsole ];
-        }) + "/etc/ConsoleKit";
-        target = "ConsoleKit";
-      };
-
-  };
-
-}
diff --git a/modules/security/pam.nix b/modules/security/pam.nix
index 4fab7febc71..09803598db9 100644
--- a/modules/security/pam.nix
+++ b/modules/security/pam.nix
@@ -41,7 +41,7 @@ let
       # against the keys in the calling user's ~/.ssh/authorized_keys.
       # This is useful for "sudo" on password-less remote systems.
       sshAgentAuth ? false
-    , # If set, use ConsoleKit's PAM connector module to claim
+    , # If set, use systemd's PAM connector module to claim
       # ownership of audio devices etc.
       ownDevices ? false
     , # Whether to forward XAuth keys between users.  Mostly useful
@@ -104,7 +104,7 @@ let
           ${optionalString config.krb5.enable
               "session optional ${pam_krb5}/lib/security/pam_krb5.so"}
           ${optionalString ownDevices
-              "session optional ${pkgs.consolekit}/lib/security/pam_ck_connector.so"}
+              "session optional ${pkgs.systemd}/lib/security/pam_systemd.so"}
           ${optionalString forwardXAuth
               "session optional pam_xauth.so xauthpath=${pkgs.xorg.xauth}/bin/xauth systemuser=99"}
           ${optionalString (limits != [])
diff --git a/modules/system/boot/systemd.nix b/modules/system/boot/systemd.nix
index 57bc47bd6d6..0d4256990e7 100644
--- a/modules/system/boot/systemd.nix
+++ b/modules/system/boot/systemd.nix
@@ -37,6 +37,7 @@ let
       "systemd-vconsole-setup.service"
       "systemd-user-sessions.service"
       "dbus-org.freedesktop.login1.service"
+      "user@.service"
 
       # Journal.
       "systemd-journald.socket"
-- 
GitLab


From 4a95f8996b11ca9876e24a37d4b521925a1c33bf Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sat, 16 Jun 2012 00:19:43 -0400
Subject: [PATCH 3738/5331] =?UTF-8?q?To=20ease=20migration=20to=20systemd,?=
 =?UTF-8?q?=20generate=20units=20from=20the=20=E2=80=98jobs=E2=80=99=20opt?=
 =?UTF-8?q?ion?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Also get rid of the ‘buildHook’ job option because it wasn't very useful.
---
 modules/config/networking.nix                 |   2 +-
 modules/module-list.nix                       |   3 -
 .../services/monitoring/nagios/default.nix    |   7 +-
 modules/services/networking/ssh/sshd.nix      |   1 -
 modules/services/system/nscd.nix              |   5 +-
 modules/services/ttys/mingetty.nix            |   2 +
 .../web-servers/apache-httpd/default.nix      |  13 +-
 modules/system/boot/stage-2-init.sh           |   2 +-
 modules/system/boot/systemd.nix               |   8 +-
 .../upstart-events/control-alt-delete.nix     |  26 ---
 modules/system/upstart-events/runlevel.nix    |  38 -----
 modules/system/upstart/upstart.nix            | 161 ++++++++++--------
 modules/tasks/filesystems.nix                 |   4 +-
 modules/tasks/kbd.nix                         |   5 +-
 modules/tasks/network-interfaces.nix          |   3 +-
 15 files changed, 108 insertions(+), 172 deletions(-)
 delete mode 100644 modules/system/upstart-events/control-alt-delete.nix
 delete mode 100644 modules/system/upstart-events/runlevel.nix

diff --git a/modules/config/networking.nix b/modules/config/networking.nix
index 5065fc22f2c..757bb9e85e0 100644
--- a/modules/config/networking.nix
+++ b/modules/config/networking.nix
@@ -67,7 +67,7 @@ in
           '' + optionalString config.services.nscd.enable ''
             # Invalidate the nscd cache whenever resolv.conf is
             # regenerated.
-            libc_restart='${pkgs.upstart}/sbin/start invalidate-nscd'
+            libc_restart='${pkgs.systemd}/bin/systemctl start invalidate-nscd.service'
           '' );
         target = "resolvconf.conf";
       }
diff --git a/modules/module-list.nix b/modules/module-list.nix
index 0b324e7fffd..04fa9c58ec6 100644
--- a/modules/module-list.nix
+++ b/modules/module-list.nix
@@ -199,9 +199,6 @@
   ./system/boot/stage-2.nix
   ./system/boot/systemd.nix
   ./system/etc/etc.nix
-  ./system/upstart-events/control-alt-delete.nix
-  ./system/upstart-events/runlevel.nix
-  ./system/upstart-events/shutdown.nix
   ./system/upstart/upstart.nix
   ./tasks/cpu-freq.nix
   ./tasks/filesystems.nix
diff --git a/modules/services/monitoring/nagios/default.nix b/modules/services/monitoring/nagios/default.nix
index 6d2fe3f2ace..3c32a3c25ec 100644
--- a/modules/services/monitoring/nagios/default.nix
+++ b/modules/services/monitoring/nagios/default.nix
@@ -159,12 +159,7 @@ in
     environment.systemPackages = [ pkgs.nagios ];
 
     jobs.nagios =
-      { # Run `nagios -v' to check the validity of the configuration file so
-        # that a nixos-rebuild fails *before* we kill the running Nagios
-        # daemon.
-        buildHook = "${pkgs.nagios}/bin/nagios -v ${nagiosCfgFile}";
-
-        description = "Nagios monitoring daemon";
+      { description = "Nagios monitoring daemon";
 
         startOn = "started network-interfaces";
         stopOn = "stopping network-interfaces";
diff --git a/modules/services/networking/ssh/sshd.nix b/modules/services/networking/ssh/sshd.nix
index e4ca7f39a56..9710082f420 100644
--- a/modules/services/networking/ssh/sshd.nix
+++ b/modules/services/networking/ssh/sshd.nix
@@ -329,7 +329,6 @@ in
           ${pkgs.openssh}/sbin/sshd -h ${cfg.hostKeyPath} \
             -f ${pkgs.writeText "sshd_config" cfg.extraConfig}
         Restart=always
-        RestartSec=5
         Type=forking
         KillMode=process
         PIDFile=/run/sshd.pid
diff --git a/modules/services/system/nscd.nix b/modules/services/system/nscd.nix
index 6f35cd30f58..b2596dbb413 100644
--- a/modules/services/system/nscd.nix
+++ b/modules/services/system/nscd.nix
@@ -20,15 +20,14 @@ in
 
       enable = mkOption {
         default = true;
-        description = "
-          Whether to enable the Name Service Cache Daemon.
-        ";
+        description = "Whether to enable the Name Service Cache Daemon.";
       };
 
     };
 
   };
 
+  
   ###### implementation
 
   config = mkIf config.services.nscd.enable {
diff --git a/modules/services/ttys/mingetty.nix b/modules/services/ttys/mingetty.nix
index 85db3f8966e..8304ca180cb 100644
--- a/modules/services/ttys/mingetty.nix
+++ b/modules/services/ttys/mingetty.nix
@@ -56,6 +56,7 @@ with pkgs.lib;
   config = {
 
     # Generate a separate job for each tty.
+    /*
     jobs = listToAttrs (map (tty: nameValuePair tty {
 
       startOn =
@@ -72,6 +73,7 @@ with pkgs.lib;
       environment.LOCALE_ARCHIVE = "/var/run/current-system/sw/lib/locale/locale-archive";
 
     }) config.services.mingetty.ttys);
+    */
 
     environment.etc = singleton
       { # Friendly greeting on the virtual consoles.
diff --git a/modules/services/web-servers/apache-httpd/default.nix b/modules/services/web-servers/apache-httpd/default.nix
index ce3311a5f59..259847d0726 100644
--- a/modules/services/web-servers/apache-httpd/default.nix
+++ b/modules/services/web-servers/apache-httpd/default.nix
@@ -532,18 +532,7 @@ in
       '';
 
     jobs.httpd =
-      { # Statically verify the syntactic correctness of the generated
-        # httpd.conf.  !!! this is impure!  It doesn't just check for
-        # syntax, but also whether the Apache user/group exist,
-        # whether SSL keys exist, etc.
-        buildHook =
-          ''
-            echo
-            echo '=== Checking the generated Apache configuration file ==='
-            ${httpd}/bin/httpd -f ${httpdConf} -t || true
-          '';
-
-        description = "Apache HTTPD";
+      { description = "Apache HTTPD";
 
         startOn = "started networking and filesystem"
           # Hacky.  Some subservices depend on Postgres
diff --git a/modules/system/boot/stage-2-init.sh b/modules/system/boot/stage-2-init.sh
index 384c9e301cb..8238fc1537e 100644
--- a/modules/system/boot/stage-2-init.sh
+++ b/modules/system/boot/stage-2-init.sh
@@ -192,4 +192,4 @@ fi
 echo "starting systemd..."
 PATH=/var/run/current-system/systemd/lib/systemd \
     MODULE_DIR=/var/run/current-system/kernel-modules/lib/modules \
-    exec systemd --log-target journal --log-level debug --crash-shell
+    exec systemd --log-target journal # --log-level debug --crash-shell
diff --git a/modules/system/boot/systemd.nix b/modules/system/boot/systemd.nix
index 0d4256990e7..c5a646208cb 100644
--- a/modules/system/boot/systemd.nix
+++ b/modules/system/boot/systemd.nix
@@ -111,7 +111,7 @@ let
 
   nixosUnits = mapAttrsToList makeUnit config.boot.systemd.units;
     
-  systemUnits = pkgs.runCommand "system-units" { }
+  units = pkgs.runCommand "units" { preferLocalBuild = true; }
     ''
       mkdir -p $out/system
       for i in ${toString upstreamUnits}; do
@@ -161,10 +161,12 @@ in
 
     system.build.systemd = systemd;
 
+    system.build.units = units;
+
     environment.systemPackages = [ systemd ];
   
     environment.etc =
-      [ { source = systemUnits;
+      [ { source = units;
           target = "systemd";
         }
       ];
@@ -177,7 +179,7 @@ in
         After=multi-user.target
         Conflicts=rescue.target
         AllowIsolate=yes
-        Wants=sshd.service autovt@tty1.service # FIXME
+        Wants=sshd.service
       '';
     
     boot.systemd.units."getty@.service" =
diff --git a/modules/system/upstart-events/control-alt-delete.nix b/modules/system/upstart-events/control-alt-delete.nix
deleted file mode 100644
index f0f146160e5..00000000000
--- a/modules/system/upstart-events/control-alt-delete.nix
+++ /dev/null
@@ -1,26 +0,0 @@
-{ config, pkgs, ... }:
-
-###### implementation
-
-{
-  jobs.control_alt_delete =
-    { name = "control-alt-delete";
-
-      startOn = "control-alt-delete";
-
-      task = true;
-
-      script =
-        ''
-          shutdown -r now 'Ctrl-Alt-Delete pressed'
-        '';
-    };
-
-  system.activationScripts.poweroff =
-    ''
-      # Allow the kernel to find the poweroff command.  This is used
-      # (for instance) by Xen's "xm shutdown" command to signal a
-      # guest to shut down cleanly.
-      echo ${config.system.build.upstart}/sbin/poweroff > /proc/sys/kernel/poweroff_cmd
-    '';
-}
diff --git a/modules/system/upstart-events/runlevel.nix b/modules/system/upstart-events/runlevel.nix
deleted file mode 100644
index 016217ea3a6..00000000000
--- a/modules/system/upstart-events/runlevel.nix
+++ /dev/null
@@ -1,38 +0,0 @@
-{ config, pkgs, ... }:
-
-with pkgs.lib;
-
-{
-
-  # After booting, go to runlevel 2.  (NixOS doesn't really use
-  # runlevels, but this keeps wtmp happy.)
-  jobs.boot =
-    { name = "boot";
-      startOn = "startup";
-      task = true;
-      restartIfChanged = false;
-      script = "telinit 2";
-    };
-
-  jobs.runlevel =
-    { name = "runlevel";
-
-      startOn = "runlevel [0123456S]";
-
-      task = true;
-
-      restartIfChanged = false;
-      
-      script =
-        ''
-          case "$RUNLEVEL" in
-              0) initctl start shutdown --no-wait MODE=poweroff;;
-              1) initctl start shutdown --no-wait MODE=maintenance;;
-              2) true;;
-              6) initctl start shutdown --no-wait MODE=reboot;;
-              *) echo "Unsupported runlevel: $RUNLEVEL";;
-          esac
-        '';
-    };
-
-}
diff --git a/modules/system/upstart/upstart.nix b/modules/system/upstart/upstart.nix
index 284f1aafd37..b09fdc7d676 100644
--- a/modules/system/upstart/upstart.nix
+++ b/modules/system/upstart/upstart.nix
@@ -12,19 +12,90 @@ let
   groupExists = g:
     (g == "") || any (gg: gg.name == g) (attrValues config.users.extraGroups);
 
-  # From a job description, generate an Upstart job file.
-  makeJob = job:
+  # From a job description, generate an systemd unit file.
+  makeUnit = job:
 
     let
       hasMain = job.script != "" || job.exec != "";
 
       env = config.system.upstartEnvironment // job.environment;
 
-      jobText =
-        let log = "/var/log/upstart/${job.name}"; in
+      preStartScript = pkgs.writeScript "${job.name}-pre-start.sh"
         ''
-          # Upstart job `${job.name}'.  This is a generated file.  Do not edit.
+          #! ${pkgs.stdenv.shell} -e
+          ${job.preStart}
+        '';
+
+      startScript = pkgs.writeScript "${job.name}-start.sh"
+        ''
+          #! ${pkgs.stdenv.shell} -e
+          ${if job.script != "" then job.script else ''
+            exec ${job.exec}
+          ''}
+        '';
+
+      postStartScript = pkgs.writeScript "${job.name}-post-start.sh"
+        ''
+          #! ${pkgs.stdenv.shell} -e
+          ${job.postStart}
+        '';
+
+      preStopScript = pkgs.writeScript "${job.name}-pre-stop.sh"
+        ''
+          #! ${pkgs.stdenv.shell} -e
+          ${job.preStop}
+        '';
+
+      postStopScript = pkgs.writeScript "${job.name}-post-stop.sh"
+        ''
+          #! ${pkgs.stdenv.shell} -e
+          ${job.postStop}
+        '';
+
+      text =
+        ''
+          [Unit]
+          Description=${job.description}
+
+          [Service]
+          Environment=PATH=${job.path}
+          ${concatMapStrings (n: "Environment=${n}=\"${getAttr n env}\"\n") (attrNames env)}
 
+          ${optionalString (job.preStart != "" && (job.script != "" || job.exec != "")) ''
+            ExecStartPre=${preStartScript}
+          ''}
+
+          ${optionalString (job.preStart != "" && job.script == "" && job.exec == "") ''
+            ExecStart=${preStartScript}
+          ''}
+
+          ${optionalString (job.script != "" || job.exec != "") ''
+            ExecStart=${startScript}
+          ''}
+          
+          ${optionalString (job.postStart != "") ''
+            ExecStartPost=${postStartScript}
+          ''}
+
+          ${optionalString (job.preStop != "") ''
+            ExecStop=${preStopScript}
+          ''}
+          
+          ${optionalString (job.postStop != "") ''
+            ExecStopPost=${postStopScript}
+          ''}
+
+          ${if job.script == "" && job.exec == "" then "Type=oneshot\nRemainAfterExit=true" else
+            if job.daemonType == "fork" then "Type=forking\nGuessMainPID=true" else
+            if job.daemonType == "none" then "" else
+            throw "invalid daemon type `${job.daemonType}'"}
+
+          ${optionalString (!job.task && job.respawn) "Restart=always"}
+        '';
+
+      /*
+      text =
+        ''
           ${optionalString (job.description != "") ''
             description "${job.description}"
           ''}
@@ -45,9 +116,6 @@ let
           ${optionalString (job.console != "") "console ${job.console}"}
 
           pre-start script
-            ${optionalString (job.console == "") ''
-              exec >> ${log} 2>&1
-            ''}
             ln -sfn "$(readlink -f "/etc/init/${job.name}.conf")" /var/run/upstart-jobs/${job.name}
             ${optionalString (job.preStart != "") ''
               source ${jobHelpers}
@@ -60,9 +128,6 @@ let
             else if job.script != "" then
               ''
                 script
-                  ${optionalString (job.console == "") ''
-                    exec >> ${log} 2>&1
-                  ''}
                   source ${jobHelpers}
                   ${job.script}
                 end script
@@ -70,7 +135,6 @@ let
             else if job.exec != "" && job.console == "" then
               ''
                 script
-                  exec >> ${log} 2>&1
                   exec ${job.exec}
                 end script
               ''
@@ -83,9 +147,6 @@ let
 
           ${optionalString (job.postStart != "") ''
             post-start script
-              ${optionalString (job.console == "") ''
-                exec >> ${log} 2>&1
-              ''}
               source ${jobHelpers}
               ${job.postStart}
             end script
@@ -98,9 +159,6 @@ let
              # (upstart 0.6.5, job.c:562)
             optionalString (job.preStop != "") (assert hasMain; ''
             pre-stop script
-              ${optionalString (job.console == "") ''
-                exec >> ${log} 2>&1
-              ''}
               source ${jobHelpers}
               ${job.preStop}
             end script
@@ -108,9 +166,6 @@ let
 
           ${optionalString (job.postStop != "") ''
             post-stop script
-              ${optionalString (job.console == "") ''
-                exec >> ${log} 2>&1
-              ''}
               source ${jobHelpers}
               ${job.postStop}
             end script
@@ -132,14 +187,9 @@ let
 
           ${job.extraConfig}
         '';
+      */
 
-    in
-      pkgs.runCommand ("upstart-" + job.name + ".conf")
-        { inherit (job) buildHook; inherit jobText; preferLocalBuild = true; }
-        ''
-          eval "$buildHook"
-          echo "$jobText" > $out
-        '';
+    in text;
 
 
   # Shell functions for use in Upstart jobs.
@@ -199,17 +249,6 @@ let
       '';
     };
 
-    buildHook = mkOption {
-      type = types.string;
-      default = "true";
-      description = ''
-        Command run while building the Upstart job.  Can be used
-        to perform simple regression tests (e.g., the Apache
-        Upstart job uses it to check the syntax of the generated
-        <filename>httpd.conf</filename>.
-      '';
-    };
-
     description = mkOption {
       type = types.string;
       default = "";
@@ -401,13 +440,10 @@ let
 
     options = {
     
-      jobDrv = mkOption {
-        default = makeJob config;
-        type = types.uniq types.package;
-        description = ''
-          Derivation that builds the Upstart job file.  The default
-          value is generated from other options.
-        '';
+      unitText = mkOption {
+        default = makeUnit config;
+        type = types.uniq types.string;
+        description = "Generated text of the systemd unit corresponding to this job.";
       };
       
     };
@@ -448,16 +484,6 @@ in
       options = [ jobOptions upstartJob ];
     };
 
-    tests.upstartJobs = mkOption {
-      internal = true;
-      default = {};
-      description = ''
-        Make it easier to build individual Upstart jobs. (e.g.,
-        <command>nix-build /etc/nixos/nixos -A
-        tests.upstartJobs.xserver</command>).
-      '';
-    };
-
     system.upstartEnvironment = mkOption {
       type = types.attrs;
       default = {};
@@ -476,25 +502,10 @@ in
 
     system.build.upstart = upstart;
 
-    /*
-    environment.etc =
-      flip map (attrValues config.jobs) (job:
-        { source = job.jobDrv;
-          target = "init/${job.name}.conf";
-        } );
-
-    # Upstart can listen on the system bus, allowing normal users to
-    # do status queries.
-    services.dbus.packages = [ upstart ];
-
-    system.activationScripts.chownJobLogs = stringAfter ["var"] 
-    (concatMapStrings (job: ''
-      touch /var/log/upstart/${job.name}
-      ${optionalString (job.setuid != "") "chown ${job.setuid} /var/log/upstart/${job.name}"}
-      ${optionalString (job.setgid != "") "chown :${job.setgid} /var/log/upstart/${job.name}"}
-    '') (attrValues config.jobs));
-    */
-
+    boot.systemd.units =
+      flip mapAttrs' config.jobs (name: job:
+        nameValuePair "${job.name}.service" job.unitText);
+        
   };
 
 }
diff --git a/modules/tasks/filesystems.nix b/modules/tasks/filesystems.nix
index 9495cac6785..8eaf77330a3 100644
--- a/modules/tasks/filesystems.nix
+++ b/modules/tasks/filesystems.nix
@@ -174,7 +174,7 @@ in
     system.fsPackages = [ pkgs.dosfstools ];
     
     environment.systemPackages =
-      [ pkgs.ntfs3g pkgs.cifs_utils pkgs.mountall ]
+      [ pkgs.ntfs3g pkgs.cifs_utils ]
       ++ config.system.fsPackages;
 
     environment.etc = singleton
@@ -182,6 +182,7 @@ in
         target = "fstab";
       };
 
+    /*
     jobs.mountall =
       { startOn = "started udev or config-changed";
 
@@ -309,6 +310,7 @@ in
             initctl start --no-wait mountall
           '';
       };
+    */
 
   };
 
diff --git a/modules/tasks/kbd.nix b/modules/tasks/kbd.nix
index 62c4b92ed09..b563d33dc5b 100644
--- a/modules/tasks/kbd.nix
+++ b/modules/tasks/kbd.nix
@@ -54,8 +54,10 @@ in
 
     inherit requiredTTYs; # pass it to ./modules/tasks/tty-backgrounds.nix
 
-    environment.systemPackages = [pkgs.kbd];
+    environment.systemPackages = [ pkgs.kbd ];
 
+    /* FIXME - remove; this is handled by systemd now.
+    
     jobs.kbd =
       { description = "Keyboard / console initialisation";
 
@@ -120,6 +122,7 @@ in
           ${pkgs.kbd}/bin/loadkeys '${consoleKeyMap}'
         '';
       };
+    */
 
   };
 
diff --git a/modules/tasks/network-interfaces.nix b/modules/tasks/network-interfaces.nix
index c12f9b28ca9..611de13148a 100644
--- a/modules/tasks/network-interfaces.nix
+++ b/modules/tasks/network-interfaces.nix
@@ -267,7 +267,8 @@ in
 
             ${optionalString (cfg.interfaces != [] || cfg.localCommands != "") ''
               # Emit the ip-up event (e.g. to start ntpd).
-              initctl emit -n ip-up
+              #FIXME
+              #initctl emit -n ip-up
             ''}
           '';
       };
-- 
GitLab


From bd5b06bf862cbf3b643fdd726f470187a553d732 Mon Sep 17 00:00:00 2001
From: Mathijs Kwik <mathijs@bluescreen303.nl>
Date: Sat, 16 Jun 2012 11:13:48 +0000
Subject: [PATCH 3739/5331] synaptics driver: accelleration factor config
 option

svn path=/nixos/trunk/; revision=34523
---
 modules/services/x11/hardware/synaptics.nix | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/modules/services/x11/hardware/synaptics.nix b/modules/services/x11/hardware/synaptics.nix
index 752df410934..e0806499106 100644
--- a/modules/services/x11/hardware/synaptics.nix
+++ b/modules/services/x11/hardware/synaptics.nix
@@ -26,6 +26,11 @@ let cfg = config.services.xserver.synaptics; in
           '';
       };
 
+      accelFactor = mkOption {
+        default = "0.001";
+        description = "Cursor acceleration (how fast speed increases from minSpeed to maxSpeed).";
+      };
+
       minSpeed = mkOption {
         default = "0.6";
         description = "Cursor speed factor for precision finger motion.";
@@ -96,7 +101,7 @@ let cfg = config.services.xserver.synaptics; in
           Option "MaxTapMove" "220"
           Option "MinSpeed" "${cfg.minSpeed}"
           Option "MaxSpeed" "${cfg.maxSpeed}"
-          Option "AccelFactor" "0.0010"
+          Option "AccelFactor" "${cfg.accelFactor}"
           Option "TapButton1" "${if cfg.tapButtons then "1" else "0"}"
           Option "TapButton2" "${if cfg.tapButtons then "2" else "0"}"
           Option "TapButton3" "${if cfg.tapButtons then "3" else "0"}"
-- 
GitLab


From 42ee3b4209264d44cad5514bd96f6aa730287438 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sun, 17 Jun 2012 23:31:21 -0400
Subject: [PATCH 3740/5331] =?UTF-8?q?Add=20a=20=E2=80=98wantedBy=E2=80=99?=
 =?UTF-8?q?=20attribute=20to=20unit=20definitions?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This attribute allows a unit to make itself a dependency of another unit.

Also, add an option to set the default target unit.
---
 modules/services/networking/ssh/sshd.nix | 39 +++--------------
 modules/services/system/dbus.nix         | 15 ++-----
 modules/system/boot/systemd.nix          | 55 ++++++++++++++++--------
 modules/system/upstart/upstart.nix       | 17 +++++---
 modules/tasks/lvm.nix                    |  2 -
 5 files changed, 57 insertions(+), 71 deletions(-)

diff --git a/modules/services/networking/ssh/sshd.nix b/modules/services/networking/ssh/sshd.nix
index 9710082f420..5a924361761 100644
--- a/modules/services/networking/ssh/sshd.nix
+++ b/modules/services/networking/ssh/sshd.nix
@@ -317,13 +317,15 @@ in
       }
     ];
 
-    boot.systemd.units."sshd.service" =
+    boot.systemd.units."sshd.service".text =
       ''
         [Unit]
         Description=SSH daemon
 
         [Service]
         Environment=PATH=${pkgs.coreutils}/bin:${pkgs.openssh}/bin
+        Environment=LD_LIBRARY_PATH=${nssModulesPath}
+        Environment=LOCALE_ARCHIVE=/var/run/current-system/sw/lib/locale/locale-archive
         ExecStartPre=${preStart}
         ExecStart=\
           ${pkgs.openssh}/sbin/sshd -h ${cfg.hostKeyPath} \
@@ -334,39 +336,8 @@ in
         PIDFile=/run/sshd.pid
       '';
 
-    jobs.sshd =
-      { description = "OpenSSH server";
-
-        startOn = "started network-interfaces";
-
-        environment = {
-          LD_LIBRARY_PATH = nssModulesPath;
-          # Duplicated from bashrc. OpenSSH needs a patch for this.
-          LOCALE_ARCHIVE = "/var/run/current-system/sw/lib/locale/locale-archive";
-        };
-
-        path = [ pkgs.openssh pkgs.gnused ];
-
-        preStart =
-          ''
-            ${mkAuthkeyScript}
-
-            mkdir -m 0755 -p /etc/ssh
-
-            if ! test -f ${cfg.hostKeyPath}; then
-                ssh-keygen -t ${hktn} -b ${toString hktb} -f ${cfg.hostKeyPath} -N ""
-            fi
-          '';
-
-        daemonType = "fork";
-
-        exec =
-          ''
-            ${pkgs.openssh}/sbin/sshd -h ${cfg.hostKeyPath} \
-              -f ${pkgs.writeText "sshd_config" cfg.extraConfig}
-          '';
-      };
-
+    boot.systemd.units."sshd.service".wantedBy = [ "multi-user.target" ];
+    
     networking.firewall.allowedTCPPorts = cfg.ports;
 
     services.openssh.extraConfig =
diff --git a/modules/services/system/dbus.nix b/modules/services/system/dbus.nix
index 8659c784483..bd5c290d582 100644
--- a/modules/services/system/dbus.nix
+++ b/modules/services/system/dbus.nix
@@ -118,7 +118,7 @@ in
 
     # FIXME: these are copied verbatim from the dbus source tree.  We
     # should install and use the originals.
-    boot.systemd.units."dbus.socket" =
+    boot.systemd.units."dbus.socket".text =
       ''
         [Unit]
         Description=D-Bus System Message Bus Socket
@@ -127,7 +127,7 @@ in
         ListenStream=/var/run/dbus/system_bus_socket
       '';
       
-    boot.systemd.units."dbus.service" =
+    boot.systemd.units."dbus.service".text =
       ''
         [Unit]
         Description=D-Bus System Message Bus
@@ -142,6 +142,7 @@ in
         OOMScoreAdjust=-900
       '';
 
+    /*
     jobs.dbus =
       { startOn = "started udev and started syslogd";
       
@@ -164,15 +165,6 @@ in
 
         exec = "dbus-daemon --system";
 
-        /*
-        postStart =
-          ''
-            # Signal Upstart to connect to the system bus.  This
-            # allows ‘initctl’ to work for non-root users.
-            kill -USR1 1
-          '';
-        */
-
         postStop =
           ''
             # !!! Hack: doesn't belong here.
@@ -183,6 +175,7 @@ in
             fi
           '';
       };
+    */    
 
     security.setuidOwners = singleton
       { program = "dbus-daemon-launch-helper";
diff --git a/modules/system/boot/systemd.nix b/modules/system/boot/systemd.nix
index c5a646208cb..d75572b2789 100644
--- a/modules/system/boot/systemd.nix
+++ b/modules/system/boot/systemd.nix
@@ -4,10 +4,12 @@ with pkgs.lib;
 
 let
 
+  cfg = config.boot.systemd;
+
   systemd = pkgs.systemd;
 
-  makeUnit = name: text:
-    pkgs.writeTextFile { name = "unit"; inherit text; destination = "/${name}"; };
+  makeUnit = name: unit:
+    pkgs.writeTextFile { name = "unit"; inherit (unit) text; destination = "/${name}"; };
 
   upstreamUnits =
     [ # Targets.
@@ -109,7 +111,7 @@ let
       "shutdown.target.wants"
     ];
 
-  nixosUnits = mapAttrsToList makeUnit config.boot.systemd.units;
+  nixosUnits = mapAttrsToList makeUnit cfg.units;
     
   units = pkgs.runCommand "units" { preferLocalBuild = true; }
     ''
@@ -123,6 +125,7 @@ let
           ln -s $fn $out/system
         fi
       done
+      
       for i in ${toString upstreamWants}; do
         fn=${systemd}/example/systemd/system/$i
         [ -e $fn ]
@@ -134,9 +137,18 @@ let
           if ! [ -e $y ]; then rm -v $y; fi
         done
       done
+      
       for i in ${toString nixosUnits}; do
         cp $i/* $out/system
       done
+
+      ${concatStrings (mapAttrsToList (name: unit:
+          concatMapStrings (name2: ''
+            mkdir -p $out/system/${name2}.wants
+            ln -sfn ../${name} $out/system/${name2}.wants/
+          '') unit.wantedBy) cfg.units)}
+
+      ln -s ${cfg.defaultUnit} $out/system/default.target
     ''; # */
     
 in
@@ -148,10 +160,28 @@ in
   options = {
 
     boot.systemd.units = mkOption {
-      default = {} ;
-      description = "Systemd units.";
+      default = {};
+      type = types.attrsOf types.optionSet;
+      options = {
+        text = mkOption {
+          types = types.uniq types.string;
+          description = "Text of this systemd unit.";
+        };
+        wantedBy = mkOption {
+          default = [];
+          types = types.listOf types.string;
+          description = "Units that want (i.e. depend on) this unit.";
+        };
+      };
+      description = "Definition of systemd units.";
     };
 
+    boot.systemd.defaultUnit = mkOption {
+      default = "multi-user.target";
+      type = types.uniq types.string;
+      description = "Default unit started when the system boots.";
+    };
+    
   };
 
   
@@ -171,18 +201,7 @@ in
         }
       ];
 
-    boot.systemd.units."default.target" =
-      ''
-        [Unit]
-        Description=Default System
-        Requires=multi-user.target
-        After=multi-user.target
-        Conflicts=rescue.target
-        AllowIsolate=yes
-        Wants=sshd.service
-      '';
-    
-    boot.systemd.units."getty@.service" =
+    boot.systemd.units."getty@.service".text =
       ''
         [Unit]
         Description=Getty on %I
@@ -218,7 +237,7 @@ in
         KillSignal=SIGHUP
       '';
 
-    boot.systemd.units."rescue.service" =
+    boot.systemd.units."rescue.service".text =
       ''
         [Unit]
         Description=Rescue Shell
diff --git a/modules/system/upstart/upstart.nix b/modules/system/upstart/upstart.nix
index b09fdc7d676..2e57ac358da 100644
--- a/modules/system/upstart/upstart.nix
+++ b/modules/system/upstart/upstart.nix
@@ -51,6 +51,7 @@ let
           #! ${pkgs.stdenv.shell} -e
           ${job.postStop}
         '';
+    in {
 
       text =
         ''
@@ -93,6 +94,13 @@ let
           ${optionalString (!job.task && job.respawn) "Restart=always"}
         '';
 
+      wantedBy =
+        if job.startOn == "" then [ ]
+        else if job.startOn == "startup" then [ "basic.target" ]
+        else [ "multi-user.target" ];
+
+    };
+
       /*
       text =
         ''
@@ -189,8 +197,6 @@ let
         '';
       */
 
-    in text;
-
 
   # Shell functions for use in Upstart jobs.
   jobHelpers = pkgs.writeText "job-helpers.sh"
@@ -440,10 +446,9 @@ let
 
     options = {
     
-      unitText = mkOption {
+      unit = mkOption {
         default = makeUnit config;
-        type = types.uniq types.string;
-        description = "Generated text of the systemd unit corresponding to this job.";
+        description = "Generated definition of the systemd unit corresponding to this job.";
       };
       
     };
@@ -504,7 +509,7 @@ in
 
     boot.systemd.units =
       flip mapAttrs' config.jobs (name: job:
-        nameValuePair "${job.name}.service" job.unitText);
+        nameValuePair "${job.name}.service" job.unit);
         
   };
 
diff --git a/modules/tasks/lvm.nix b/modules/tasks/lvm.nix
index 635146ac889..7773a2c79e3 100644
--- a/modules/tasks/lvm.nix
+++ b/modules/tasks/lvm.nix
@@ -14,8 +14,6 @@
             # Make all logical volumes on all volume groups available, i.e.,
             # make them appear in /dev.
             ${pkgs.lvm2}/sbin/vgchange --available y
-
-            initctl emit -n new-devices
           '';
 
         task = true;
-- 
GitLab


From 673bf12b1d4132d815e95c98ad27946ad7486bd3 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 18 Jun 2012 00:22:18 -0400
Subject: [PATCH 3741/5331] Improve the dependencies of units generated by the
 Upstart emulation

---
 modules/system/upstart/upstart.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/modules/system/upstart/upstart.nix b/modules/system/upstart/upstart.nix
index 2e57ac358da..0f7eb65bf2f 100644
--- a/modules/system/upstart/upstart.nix
+++ b/modules/system/upstart/upstart.nix
@@ -57,6 +57,9 @@ let
         ''
           [Unit]
           Description=${job.description}
+          ${if job.startOn == "stopped udevtrigger" then "After=systemd-udev-settle.service" else
+            if job.startOn == "started udev" then "After=systemd-udev.service"
+            else ""}
 
           [Service]
           Environment=PATH=${job.path}
@@ -94,10 +97,7 @@ let
           ${optionalString (!job.task && job.respawn) "Restart=always"}
         '';
 
-      wantedBy =
-        if job.startOn == "" then [ ]
-        else if job.startOn == "startup" then [ "basic.target" ]
-        else [ "multi-user.target" ];
+      wantedBy = if job.startOn == "" then [ ] else [ "multi-user.target" ];
 
     };
 
-- 
GitLab


From 352510c2081d48895ebc8d3d1658acc79b43ae9b Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 18 Jun 2012 15:28:31 -0400
Subject: [PATCH 3742/5331] =?UTF-8?q?Add=20an=20option=20=E2=80=98boot.sys?=
 =?UTF-8?q?temd.services=E2=80=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This option makes it more convenient to define services because it
automates stuff like setting $PATH, having a pre-start script, and so on.
---
 modules/services/networking/ssh/sshd.nix |  78 ++++---
 modules/system/boot/systemd.nix          | 274 +++++++++++++++++------
 2 files changed, 257 insertions(+), 95 deletions(-)

diff --git a/modules/services/networking/ssh/sshd.nix b/modules/services/networking/ssh/sshd.nix
index 5a924361761..3bf4bf642fa 100644
--- a/modules/services/networking/ssh/sshd.nix
+++ b/modules/services/networking/ssh/sshd.nix
@@ -39,6 +39,7 @@ let
   );
 
   userOptions = {
+  
     openssh.authorizedKeys = {
 
       preserveExistingKeys = mkOption {
@@ -77,6 +78,7 @@ let
       };
 
     };
+    
   };
 
   mkAuthkeyScript =
@@ -127,19 +129,6 @@ let
       ${userLoop}
     '';
 
-  preStart = pkgs.writeScript "openssh-pre-start"
-    ''
-      #! ${pkgs.stdenv.shell}
-
-      ${mkAuthkeyScript}
-
-      mkdir -m 0755 -p /etc/ssh
-
-      if ! test -f ${cfg.hostKeyPath}; then
-          ssh-keygen -t ${hktn} -b ${toString hktb} -f ${cfg.hostKeyPath} -N ""
-      fi
-    '';
-
 in
 
 {
@@ -317,27 +306,52 @@ in
       }
     ];
 
-    boot.systemd.units."sshd.service".text =
-      ''
-        [Unit]
-        Description=SSH daemon
-
-        [Service]
-        Environment=PATH=${pkgs.coreutils}/bin:${pkgs.openssh}/bin
-        Environment=LD_LIBRARY_PATH=${nssModulesPath}
-        Environment=LOCALE_ARCHIVE=/var/run/current-system/sw/lib/locale/locale-archive
-        ExecStartPre=${preStart}
-        ExecStart=\
-          ${pkgs.openssh}/sbin/sshd -h ${cfg.hostKeyPath} \
-            -f ${pkgs.writeText "sshd_config" cfg.extraConfig}
-        Restart=always
-        Type=forking
-        KillMode=process
-        PIDFile=/run/sshd.pid
-      '';
+    boot.systemd.services."set-ssh-keys.service" =
+      { description = "Update authorized SSH keys";
+
+        wantedBy = [ "multi-user.target" ];
+
+        script = mkAuthkeyScript;
 
-    boot.systemd.units."sshd.service".wantedBy = [ "multi-user.target" ];
+        serviceConfig =
+          ''
+            Type=oneshot
+            RemainAfterExit=true
+          '';
+      };
     
+    boot.systemd.services."sshd.service" =
+      { description = "SSH daemon";
+
+        wantedBy = [ "multi-user.target" ];
+        after = [ "set-ssh-keys.service" ];
+
+        path = [ pkgs.openssh ];
+        
+        environment.LD_LIBRARY_PATH = nssModulesPath;
+        environment.LOCALE_ARCHIVE = "/var/run/current-system/sw/lib/locale/locale-archive";
+
+        preStart =
+          ''
+            mkdir -m 0755 -p /etc/ssh
+
+            if ! test -f ${cfg.hostKeyPath}; then
+                ssh-keygen -t ${hktn} -b ${toString hktb} -f ${cfg.hostKeyPath} -N ""
+            fi
+          '';
+
+        serviceConfig =
+          ''
+            ExecStart=\
+              ${pkgs.openssh}/sbin/sshd -h ${cfg.hostKeyPath} \
+                -f ${pkgs.writeText "sshd_config" cfg.extraConfig}
+            Restart=always
+            Type=forking
+            KillMode=process
+            PIDFile=/run/sshd.pid
+          '';
+      };
+
     networking.firewall.allowedTCPPorts = cfg.ports;
 
     services.openssh.extraConfig =
diff --git a/modules/system/boot/systemd.nix b/modules/system/boot/systemd.nix
index d75572b2789..906558bd695 100644
--- a/modules/system/boot/systemd.nix
+++ b/modules/system/boot/systemd.nix
@@ -4,6 +4,102 @@ with pkgs.lib;
 
 let
 
+  servicesOptions = {
+
+    description = mkOption {
+      default = "";
+      types = types.uniq types.string;
+      description = "Description of this unit used in systemd messages and progress indicators.";
+    };
+
+    after = mkOption {
+      default = [];
+      types = types.listOf types.string;
+      description = ''
+        If the specified units are started at the same time as
+        this unit, delay this unit until they have started.
+      '';
+    };
+
+    before = mkOption {
+      default = [];
+      types = types.listOf types.string;
+      description = ''
+        If the specified units are started at the same time as
+        this unit, delay them until this unit has started.
+      '';
+    };
+
+    wantedBy = mkOption {
+      default = [];
+      types = types.listOf types.string;
+      description = "Units that want (i.e. depend on) this unit.";
+    };
+
+    environment = mkOption {
+      default = {};
+      type = types.attrs;
+      example = { PATH = "/foo/bar/bin"; LANG = "nl_NL.UTF-8"; };
+      description = "Environment variables passed to the services's processes.";
+    };
+
+    path = mkOption {
+      default = [];
+      apply = ps: "${makeSearchPath "bin" ps}:${makeSearchPath "sbin" ps}";
+      description = ''
+        Packages added to the service's <envar>PATH</envar>
+        environment variable.  Both the <filename>bin</filename>
+        and <filename>sbin</filename> subdirectories of each
+        package are added.
+      '';
+    };
+
+    serviceConfig = mkOption {
+      default = "";
+      type = types.string;
+      description = ''
+        Contents of the <literal>[Service]</literal> section of the unit.
+        See <citerefentry><refentrytitle>systemd.unit</refentrytitle>
+        <manvolnum>5</manvolnum></citerefentry> for details.
+      '';
+    };
+
+    script = mkOption {
+      type = types.uniq types.string;
+      default = "";
+      description = "Shell commands executed as the service's main process.";
+    };
+
+    preStart = mkOption {
+      type = types.string;
+      default = "";
+      description = ''
+        Shell commands executed before the service's main process
+        is started.
+      '';
+    };
+
+  };
+
+
+  servicesConfig = { name, config, ... }: {
+
+    config = {
+
+      # Default path for systemd services.  Should be quite minimal.
+      path = 
+        [ pkgs.coreutils
+          pkgs.findutils
+          pkgs.gnugrep
+          pkgs.gnused
+          systemd
+        ];
+
+    };
+
+  };
+  
+
   cfg = config.boot.systemd;
 
   systemd = pkgs.systemd;
@@ -111,6 +207,103 @@ let
       "shutdown.target.wants"
     ];
 
+  rescueService =
+    ''
+      [Unit]
+      Description=Rescue Shell
+      DefaultDependencies=no
+      Conflicts=shutdown.target
+      After=sysinit.target
+      Before=shutdown.target
+
+      [Service]
+      Environment=HOME=/root
+      WorkingDirectory=/root
+      ExecStartPre=-${pkgs.coreutils}/bin/echo 'Welcome to rescue mode. Use "systemctl default" or ^D to enter default mode.'
+      #ExecStart=-/sbin/sulogin
+      ExecStart=-${pkgs.bashInteractive}/bin/bash --login
+      ExecStopPost=-${systemd}/bin/systemctl --fail --no-block default
+      Type=idle
+      StandardInput=tty-force
+      StandardOutput=inherit
+      StandardError=inherit
+      KillMode=process
+
+      # Bash ignores SIGTERM, so we send SIGHUP instead, to ensure that bash
+      # terminates cleanly.
+      KillSignal=SIGHUP
+    '';
+
+  gettyService =
+    ''
+      [Unit]
+      Description=Getty on %I
+      Documentation=man:agetty(8)
+      After=systemd-user-sessions.service plymouth-quit-wait.service
+
+      # If additional gettys are spawned during boot then we should make
+      # sure that this is synchronized before getty.target, even though
+      # getty.target didn't actually pull it in.
+      Before=getty.target
+      IgnoreOnIsolate=yes
+
+      [Service]
+      Environment=TERM=linux
+      ExecStart=-${pkgs.utillinux}/sbin/agetty --noclear --login-program ${pkgs.shadow}/bin/login %I 38400
+      Type=idle
+      Restart=always
+      RestartSec=0
+      UtmpIdentifier=%I
+      TTYPath=/dev/%I
+      TTYReset=yes
+      TTYVHangup=yes
+      TTYVTDisallocate=yes
+      KillMode=process
+      IgnoreSIGPIPE=no
+
+      # Unset locale for the console getty since the console has problems
+      # displaying some internationalized messages.
+      Environment=LANG= LANGUAGE= LC_CTYPE= LC_NUMERIC= LC_TIME= LC_COLLATE= LC_MONETARY= LC_MESSAGES= LC_PAPER= LC_NAME= LC_ADDRESS= LC_TELEPHONE= LC_MEASUREMENT= LC_IDENTIFICATION=
+
+      # Some login implementations ignore SIGTERM, so we send SIGHUP
+      # instead, to ensure that login terminates cleanly.
+      KillSignal=SIGHUP
+    '';
+
+  serviceToUnit = name: def:
+    { inherit (def) wantedBy;
+
+      text =
+        ''
+          [Unit]
+          ${optionalString (def.description != "") ''
+            Description=${def.description}
+          ''}
+          Before=${concatStringsSep " " def.before}
+          After=${concatStringsSep " " def.after}
+
+          [Service]
+          Environment=PATH=${def.path}
+          ${concatMapStrings (n: "Environment=${n}=\"${getAttr n def.environment}\"\n") (attrNames def.environment)}
+          
+          ${optionalString (def.preStart != "") ''
+            ExecStartPre=${pkgs.writeScript "${name}-prestart.sh" ''
+              #! ${pkgs.stdenv.shell} -e
+              ${def.preStart}
+            ''}
+          ''}
+
+          ${optionalString (def.script != "") ''
+            ExecStart=${pkgs.writeScript "${name}.sh" ''
+              #! ${pkgs.stdenv.shell} -e
+              ${def.script}
+            ''}
+          ''}
+
+          ${def.serviceConfig}
+        '';
+    };
+
   nixosUnits = mapAttrsToList makeUnit cfg.units;
     
   units = pkgs.runCommand "units" { preferLocalBuild = true; }
@@ -160,20 +353,32 @@ in
   options = {
 
     boot.systemd.units = mkOption {
+      description = "Definition of systemd units.";
       default = {};
       type = types.attrsOf types.optionSet;
+      
       options = {
+      
         text = mkOption {
           types = types.uniq types.string;
           description = "Text of this systemd unit.";
         };
+        
         wantedBy = mkOption {
           default = [];
           types = types.listOf types.string;
           description = "Units that want (i.e. depend on) this unit.";
         };
+        
       };
-      description = "Definition of systemd units.";
+      
+    };
+
+    boot.systemd.services = mkOption {
+      description = "Definition of systemd services.";
+      default = {};
+      type = types.attrsOf types.optionSet;
+      options = [ servicesOptions servicesConfig ];
     };
 
     boot.systemd.defaultUnit = mkOption {
@@ -201,68 +406,11 @@ in
         }
       ];
 
-    boot.systemd.units."getty@.service".text =
-      ''
-        [Unit]
-        Description=Getty on %I
-        Documentation=man:agetty(8)
-        After=systemd-user-sessions.service plymouth-quit-wait.service
-
-        # If additional gettys are spawned during boot then we should make
-        # sure that this is synchronized before getty.target, even though
-        # getty.target didn't actually pull it in.
-        Before=getty.target
-        IgnoreOnIsolate=yes
-
-        [Service]
-        Environment=TERM=linux
-        ExecStart=-${pkgs.utillinux}/sbin/agetty --noclear --login-program ${pkgs.shadow}/bin/login %I 38400
-        Type=idle
-        Restart=always
-        RestartSec=0
-        UtmpIdentifier=%I
-        TTYPath=/dev/%I
-        TTYReset=yes
-        TTYVHangup=yes
-        TTYVTDisallocate=yes
-        KillMode=process
-        IgnoreSIGPIPE=no
-
-        # Unset locale for the console getty since the console has problems
-        # displaying some internationalized messages.
-        Environment=LANG= LANGUAGE= LC_CTYPE= LC_NUMERIC= LC_TIME= LC_COLLATE= LC_MONETARY= LC_MESSAGES= LC_PAPER= LC_NAME= LC_ADDRESS= LC_TELEPHONE= LC_MEASUREMENT= LC_IDENTIFICATION=
-
-        # Some login implementations ignore SIGTERM, so we send SIGHUP
-        # instead, to ensure that login terminates cleanly.
-        KillSignal=SIGHUP
-      '';
-
-    boot.systemd.units."rescue.service".text =
-      ''
-        [Unit]
-        Description=Rescue Shell
-        DefaultDependencies=no
-        Conflicts=shutdown.target
-        After=sysinit.target
-        Before=shutdown.target
-
-        [Service]
-        Environment=HOME=/root
-        WorkingDirectory=/root
-        ExecStartPre=-${pkgs.coreutils}/bin/echo 'Welcome to rescue mode. Use "systemctl default" or ^D to enter default mode.'
-        #ExecStart=-/sbin/sulogin
-        ExecStart=-${pkgs.bashInteractive}/bin/bash --login
-        ExecStopPost=-${systemd}/bin/systemctl --fail --no-block default
-        Type=idle
-        StandardInput=tty-force
-        StandardOutput=inherit
-        StandardError=inherit
-        KillMode=process
-
-        # Bash ignores SIGTERM, so we send SIGHUP instead, to ensure that bash
-        # terminates cleanly.
-        KillSignal=SIGHUP
-      '';
+    boot.systemd.units =
+      { "rescue.service".text = rescueService;
+        "getty@.service".text = gettyService;
+      }
+      // mapAttrs serviceToUnit cfg.services;
 
   };
 
-- 
GitLab


From 4c21857ee1173d303b6c1f2964d46b677adc0ee5 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 18 Jun 2012 17:42:26 -0400
Subject: [PATCH 3743/5331] =?UTF-8?q?Upstart=20=E2=80=98boot.systemd.servi?=
 =?UTF-8?q?ces=E2=80=99=20for=20the=20Upstart=20compatibility=20layer?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 modules/system/upstart/upstart.nix | 169 ++---------------------------
 1 file changed, 11 insertions(+), 158 deletions(-)

diff --git a/modules/system/upstart/upstart.nix b/modules/system/upstart/upstart.nix
index 0f7eb65bf2f..de60f693e83 100644
--- a/modules/system/upstart/upstart.nix
+++ b/modules/system/upstart/upstart.nix
@@ -53,18 +53,17 @@ let
         '';
     in {
 
-      text =
-        ''
-          [Unit]
-          Description=${job.description}
-          ${if job.startOn == "stopped udevtrigger" then "After=systemd-udev-settle.service" else
-            if job.startOn == "started udev" then "After=systemd-udev.service"
-            else ""}
+      inherit (job) description path environment;
+
+      after =
+        if job.startOn == "stopped udevtrigger" then [ "systemd-udev-settle.service" ] else
+        if job.startOn == "started udev" then [ "systemd-udev.service" ] else
+        [];
 
-          [Service]
-          Environment=PATH=${job.path}
-          ${concatMapStrings (n: "Environment=${n}=\"${getAttr n env}\"\n") (attrNames env)}
+      wantedBy = if job.startOn == "" then [ ] else [ "multi-user.target" ];
 
+      serviceConfig =
+        ''
           ${optionalString (job.preStart != "" && (job.script != "" || job.exec != "")) ''
             ExecStartPre=${preStartScript}
           ''}
@@ -96,153 +95,8 @@ let
 
           ${optionalString (!job.task && job.respawn) "Restart=always"}
         '';
-
-      wantedBy = if job.startOn == "" then [ ] else [ "multi-user.target" ];
-
     };
 
-      /*
-      text =
-        ''
-          ${optionalString (job.description != "") ''
-            description "${job.description}"
-          ''}
-
-          ${if isList job.startOn then
-              "start on ${concatStringsSep " or " job.startOn}"
-            else if job.startOn != "" then
-              "start on ${job.startOn}"
-            else ""
-          }
-
-          ${optionalString (job.stopOn != "") "stop on ${job.stopOn}"}
-
-          env PATH=${job.path}
-
-          ${concatMapStrings (n: "env ${n}=\"${getAttr n env}\"\n") (attrNames env)}
-
-          ${optionalString (job.console != "") "console ${job.console}"}
-
-          pre-start script
-            ln -sfn "$(readlink -f "/etc/init/${job.name}.conf")" /var/run/upstart-jobs/${job.name}
-            ${optionalString (job.preStart != "") ''
-              source ${jobHelpers}
-              ${job.preStart}
-            ''}
-          end script
-
-          ${if job.script != "" && job.exec != "" then
-              abort "Job ${job.name} has both a `script' and `exec' attribute."
-            else if job.script != "" then
-              ''
-                script
-                  source ${jobHelpers}
-                  ${job.script}
-                end script
-              ''
-            else if job.exec != "" && job.console == "" then
-              ''
-                script
-                  exec ${job.exec}
-                end script
-              ''
-            else if job.exec != "" then
-              ''
-                exec ${job.exec}
-              ''
-            else ""
-          }
-
-          ${optionalString (job.postStart != "") ''
-            post-start script
-              source ${jobHelpers}
-              ${job.postStart}
-            end script
-          ''}
-
-          ${optionalString job.task "task"}
-          ${optionalString (!job.task && job.respawn) "respawn"}
-
-          ${ # preStop is run only if there is exec or script.
-             # (upstart 0.6.5, job.c:562)
-            optionalString (job.preStop != "") (assert hasMain; ''
-            pre-stop script
-              source ${jobHelpers}
-              ${job.preStop}
-            end script
-          '')}
-
-          ${optionalString (job.postStop != "") ''
-            post-stop script
-              source ${jobHelpers}
-              ${job.postStop}
-            end script
-          ''}
-
-          ${if job.daemonType == "fork" then "expect fork" else
-            if job.daemonType == "daemon" then "expect daemon" else
-            if job.daemonType == "stop" then "expect stop" else
-            if job.daemonType == "none" then "" else
-            throw "invalid daemon type `${job.daemonType}'"}
-
-          ${optionalString (job.setuid != "") ''
-            setuid ${job.setuid}
-          ''}
-
-          ${optionalString (job.setgid != "") ''
-            setuid ${job.setgid}
-          ''}
-
-          ${job.extraConfig}
-        '';
-      */
-
-
-  # Shell functions for use in Upstart jobs.
-  jobHelpers = pkgs.writeText "job-helpers.sh"
-    ''
-      # Ensure that an Upstart service is running.
-      ensure() {
-          local job="$1"
-          local status="$(status "$job")"
-
-          # If it's already running, we're happy.
-          [[ "$status" =~ start/running ]] && return 0
-
-          # If its current goal is to stop, start it.
-          [[ "$status" =~ stop/ ]] && { status="$(start "$job")" || true; }
-
-          # The "start" command is synchronous *if* the job is
-          # not already starting.  So if somebody else started
-          # the job in parallel, the "start" above may return
-          # while the job is still starting.  So wait until it
-          # is up or has failed.
-          while true; do
-              [[ "$status" =~ stop/ ]] && { echo "job $job failed to start"; return 1; }
-              [[ "$status" =~ start/running ]] && return 0
-              echo "waiting for job $job to start..."
-              sleep 1
-              status="$(status "$job")"
-          done
-      }
-
-      # Check whether the current job has been stopped.  Used in
-      # post-start jobs to determine if they should continue.
-      stop_check() {
-          local status="$(status)"
-          if [[ "$status" =~ stop/ ]]; then
-              echo "job asked to stop!"
-              return 1
-          fi
-          if [[ "$status" =~ respawn/ ]]; then
-              echo "job respawning unexpectedly!"
-              stop
-              return 1
-          fi
-          return 0
-      }
-    '';
-        
 
   jobOptions = {
 
@@ -418,8 +272,7 @@ let
     };
 
     path = mkOption {
-      default = [ ];
-      apply = ps: "${makeSearchPath "bin" ps}:${makeSearchPath "sbin" ps}";
+      default = [];
       description = ''
         Packages added to the job's <envar>PATH</envar> environment variable.
         Both the <filename>bin</filename> and <filename>sbin</filename>
@@ -507,7 +360,7 @@ in
 
     system.build.upstart = upstart;
 
-    boot.systemd.units =
+    boot.systemd.services =
       flip mapAttrs' config.jobs (name: job:
         nameValuePair "${job.name}.service" job.unit);
         
-- 
GitLab


From 9f5051b76c128987975c1aad3d2f9756fe0ccd03 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 18 Jun 2012 17:55:27 -0400
Subject: [PATCH 3744/5331] Rename mingetty module to agetty

---
 modules/module-list.nix                       |  2 +-
 .../ttys/{mingetty.nix => agetty.nix}         | 55 ++++++++++++-------
 modules/system/boot/systemd.nix               | 40 +-------------
 3 files changed, 37 insertions(+), 60 deletions(-)
 rename modules/services/ttys/{mingetty.nix => agetty.nix} (57%)

diff --git a/modules/module-list.nix b/modules/module-list.nix
index 04fa9c58ec6..2aa34cb205f 100644
--- a/modules/module-list.nix
+++ b/modules/module-list.nix
@@ -165,7 +165,7 @@
   ./services/system/nscd.nix
   ./services/system/uptimed.nix
   ./services/ttys/gpm.nix
-  ./services/ttys/mingetty.nix
+  ./services/ttys/agetty.nix
   ./services/web-servers/apache-httpd/default.nix
   ./services/web-servers/jboss/default.nix
   ./services/web-servers/tomcat.nix
diff --git a/modules/services/ttys/mingetty.nix b/modules/services/ttys/agetty.nix
similarity index 57%
rename from modules/services/ttys/mingetty.nix
rename to modules/services/ttys/agetty.nix
index 8304ca180cb..f70cbe74d67 100644
--- a/modules/services/ttys/mingetty.nix
+++ b/modules/services/ttys/agetty.nix
@@ -10,6 +10,7 @@ with pkgs.lib;
 
     services.mingetty = {
 
+      # FIXME
       ttys = mkOption {
         default =
           if pkgs.stdenv.isArm
@@ -40,7 +41,7 @@ with pkgs.lib;
       helpLine = mkOption {
         default = "";
         description = ''
-          Help line printed by mingetty below the welcome line.
+           Help line printed by mingetty below the welcome line.
           Used by the installation CD to give some hints on
           how to proceed.
         '';
@@ -56,25 +57,39 @@ with pkgs.lib;
   config = {
 
     # Generate a separate job for each tty.
-    /*
-    jobs = listToAttrs (map (tty: nameValuePair tty {
-
-      startOn =
-        # On tty1 we should always wait for mountall, since it may
-        # start an emergency-shell job.
-        if config.services.mingetty.waitOnMounts || tty == "tty1"
-        then "stopped udevtrigger and filesystem"
-        else "stopped udevtrigger"; # !!! should start as soon as the tty device is created
-
-      path = [ pkgs.mingetty ];
-
-      exec = "mingetty --loginprog=${pkgs.shadow}/bin/login --noclear ${tty}";
-
-      environment.LOCALE_ARCHIVE = "/var/run/current-system/sw/lib/locale/locale-archive";
-
-    }) config.services.mingetty.ttys);
-    */
-
+    boot.systemd.units."getty@.service".text =
+      ''
+        [Unit]
+        Description=Getty on %I
+        Documentation=man:agetty(8)
+        After=systemd-user-sessions.service plymouth-quit-wait.service
+
+        # If additional gettys are spawned during boot then we should make
+        # sure that this is synchronized before getty.target, even though
+        # getty.target didn't actually pull it in.
+        Before=getty.target
+        IgnoreOnIsolate=yes
+
+        [Service]
+        Environment=TERM=linux
+        Environment=LOCALE_ARCHIVE=/var/run/current-system/sw/lib/locale/locale-archive
+        ExecStart=@${pkgs.utillinux}/sbin/agetty agetty --noclear --login-program ${pkgs.shadow}/bin/login %I 38400
+        Type=idle
+        Restart=always
+        RestartSec=0
+        UtmpIdentifier=%I
+        TTYPath=/dev/%I
+        TTYReset=yes
+        TTYVHangup=yes
+        TTYVTDisallocate=yes
+        KillMode=process
+        IgnoreSIGPIPE=no
+
+        # Some login implementations ignore SIGTERM, so we send SIGHUP
+        # instead, to ensure that login terminates cleanly.
+        KillSignal=SIGHUP
+      '';
+    
     environment.etc = singleton
       { # Friendly greeting on the virtual consoles.
         source = pkgs.writeText "issue" ''
diff --git a/modules/system/boot/systemd.nix b/modules/system/boot/systemd.nix
index 906558bd695..f41e471cb1b 100644
--- a/modules/system/boot/systemd.nix
+++ b/modules/system/boot/systemd.nix
@@ -234,42 +234,6 @@ let
       KillSignal=SIGHUP
     '';
 
-  gettyService =
-    ''
-      [Unit]
-      Description=Getty on %I
-      Documentation=man:agetty(8)
-      After=systemd-user-sessions.service plymouth-quit-wait.service
-
-      # If additional gettys are spawned during boot then we should make
-      # sure that this is synchronized before getty.target, even though
-      # getty.target didn't actually pull it in.
-      Before=getty.target
-      IgnoreOnIsolate=yes
-
-      [Service]
-      Environment=TERM=linux
-      ExecStart=-${pkgs.utillinux}/sbin/agetty --noclear --login-program ${pkgs.shadow}/bin/login %I 38400
-      Type=idle
-      Restart=always
-      RestartSec=0
-      UtmpIdentifier=%I
-      TTYPath=/dev/%I
-      TTYReset=yes
-      TTYVHangup=yes
-      TTYVTDisallocate=yes
-      KillMode=process
-      IgnoreSIGPIPE=no
-
-      # Unset locale for the console getty since the console has problems
-      # displaying some internationalized messages.
-      Environment=LANG= LANGUAGE= LC_CTYPE= LC_NUMERIC= LC_TIME= LC_COLLATE= LC_MONETARY= LC_MESSAGES= LC_PAPER= LC_NAME= LC_ADDRESS= LC_TELEPHONE= LC_MEASUREMENT= LC_IDENTIFICATION=
-
-      # Some login implementations ignore SIGTERM, so we send SIGHUP
-      # instead, to ensure that login terminates cleanly.
-      KillSignal=SIGHUP
-    '';
-
   serviceToUnit = name: def:
     { inherit (def) wantedBy;
 
@@ -407,9 +371,7 @@ in
       ];
 
     boot.systemd.units =
-      { "rescue.service".text = rescueService;
-        "getty@.service".text = gettyService;
-      }
+      { "rescue.service".text = rescueService; }
       // mapAttrs serviceToUnit cfg.services;
 
   };
-- 
GitLab


From ca2bd17f54be0a1ba63b9723e0732bc8b0548af9 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 18 Jun 2012 17:58:31 -0400
Subject: [PATCH 3745/5331] Whitespace

---
 modules/services/ttys/agetty.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/modules/services/ttys/agetty.nix b/modules/services/ttys/agetty.nix
index f70cbe74d67..43ee81481bf 100644
--- a/modules/services/ttys/agetty.nix
+++ b/modules/services/ttys/agetty.nix
@@ -41,7 +41,7 @@ with pkgs.lib;
       helpLine = mkOption {
         default = "";
         description = ''
-           Help line printed by mingetty below the welcome line.
+          Help line printed by mingetty below the welcome line.
           Used by the installation CD to give some hints on
           how to proceed.
         '';
@@ -100,6 +100,7 @@ with pkgs.lib;
         '';
         target = "issue";
       };
+
   };
 
 }
-- 
GitLab


From c3fb248bcb3d04b898341c214c348000060a41f1 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 18 Jun 2012 18:15:34 -0400
Subject: [PATCH 3746/5331] Get rid of the Upstart shutdown job

The only thing that Upstart's shutdown job did that systemd doesn't do
natively is update the hardware clock.  So added a service for that.
---
 modules/module-list.nix                    |   3 +-
 modules/system/boot/shutdown.nix           |  25 ++++
 modules/system/upstart-events/shutdown.nix | 162 ---------------------
 3 files changed, 27 insertions(+), 163 deletions(-)
 create mode 100644 modules/system/boot/shutdown.nix
 delete mode 100644 modules/system/upstart-events/shutdown.nix

diff --git a/modules/module-list.nix b/modules/module-list.nix
index 2aa34cb205f..c7820690929 100644
--- a/modules/module-list.nix
+++ b/modules/module-list.nix
@@ -194,8 +194,9 @@
   ./system/boot/kernel.nix
   ./system/boot/luksroot.nix
   ./system/boot/modprobe.nix
-  ./system/boot/stage-1.nix
+  ./system/boot/shutdown.nix
   ./system/boot/stage-1-extratools.nix
+  ./system/boot/stage-1.nix
   ./system/boot/stage-2.nix
   ./system/boot/systemd.nix
   ./system/etc/etc.nix
diff --git a/modules/system/boot/shutdown.nix b/modules/system/boot/shutdown.nix
new file mode 100644
index 00000000000..3af8e3e4b29
--- /dev/null
+++ b/modules/system/boot/shutdown.nix
@@ -0,0 +1,25 @@
+{ config, pkgs, ... }:
+
+with pkgs.lib;
+
+{
+
+  # This unit saves the value of the system clock to the hardware
+  # clock on shutdown.
+  boot.systemd.units."save-hwclock.service" =
+    { wantedBy = [ "shutdown.target" ];
+
+      text =
+        ''
+          [Unit]
+          Description=Save Hardware Clock
+          DefaultDependencies=no
+          Before=shutdown.target
+
+          [Service]
+          Type=oneshot
+          ExecStart=${pkgs.utillinux}/sbin/hwclock --systohc --utc
+        '';
+    };
+  
+}
diff --git a/modules/system/upstart-events/shutdown.nix b/modules/system/upstart-events/shutdown.nix
deleted file mode 100644
index 8aa794378ed..00000000000
--- a/modules/system/upstart-events/shutdown.nix
+++ /dev/null
@@ -1,162 +0,0 @@
-{ config, pkgs, ... }:
-
-with pkgs.lib;
-
-{
-
-  jobs.shutdown =
-    { name = "shutdown";
-
-      task = true;
-
-      stopOn = ""; # must override the default ("starting shutdown")
-
-      environment = { MODE = "poweroff"; };
-
-      extraConfig = "console owner";
-
-      script =
-        ''
-          set +e # continue in case of errors
-
-          ${pkgs.kbd}/bin/chvt 1
-
-          exec < /dev/console > /dev/console 2>&1
-          echo ""
-          if test "$MODE" = maintenance; then
-              echo "<<< Entering maintenance mode >>>"
-          else
-              echo "<<< System shutdown >>>"
-          fi
-          echo ""
-
-          ${config.powerManagement.powerDownCommands}
-
-          export PATH=${pkgs.utillinux}/bin:${pkgs.utillinux}/sbin:$PATH
-
-
-          # Do an initial sync just in case.
-          sync
-
-
-          # Kill all remaining processes except init, this one and any
-          # Upstart jobs that don't stop on the "starting shutdown"
-          # event, as these are necessary to complete the shutdown.
-          omittedPids=$(initctl list | sed -e 's/.*process \([0-9]\+\)/-o \1/;t;d')
-          #echo "saved PIDs: $omittedPids"
-
-          echo "sending the TERM signal to all processes..."
-          ${pkgs.sysvtools}/bin/killall5 -15 $job $omittedPids
-
-          sleep 1 # wait briefly
-
-          echo "sending the KILL signal to all processes..."
-          ${pkgs.sysvtools}/bin/killall5 -9 $job $omittedPids
-
-
-          # If maintenance mode is requested, start a root shell, and
-          # afterwards emit the "startup" event to bring everything
-          # back up.
-          if test "$MODE" = maintenance; then
-              echo ""
-              echo "<<< Maintenance shell >>>"
-              echo ""
-              ${pkgs.shadow}/bin/login root
-              initctl emit -n startup
-              exit 0
-          fi
-
-
-          # Write a shutdown record to wtmp while /var/log is still writable.
-          reboot --wtmp-only
-
-
-          # Set the hardware clock to the system time.
-          echo "setting the hardware clock..."
-          hwclock --systohc --utc
-
-
-          # Stop all swap devices.
-          swapoff -a
-
-
-          # Unmount file systems.  We repeat this until no more file systems
-          # can be unmounted.  This is to handle loopback devices, file
-          # systems mounted on other file systems and so on.
-          tryAgain=1
-          while test -n "$tryAgain"; do
-              tryAgain=
-              failed= # list of mount points that couldn't be unmounted/remounted
-
-              # Get rid of loopback devices.
-              loDevices=$(losetup -a | sed 's#^\(/dev/loop[0-9]\+\).*#\1#')
-              if [ -n "$loDevices" ]; then
-                  echo "removing loopback devices $loDevices..."
-                  losetup -d $loDevices
-              fi
-
-              cp /proc/mounts /dev/.mounts # don't read /proc/mounts while it's changing
-              exec 4< /dev/.mounts
-              while read -u 4 device mp fstype options rest; do
-                  # Skip various special filesystems.  Non-existent
-                  # mount points are typically tmpfs/aufs mounts from
-                  # the initrd.
-                  if [ "$mp" = /proc -o "$mp" = /sys -o "$mp" = /dev -o "$device" = "rootfs" -o "$mp" = /run -o "$mp" = /var/run -o "$mp" = /var/lock -o ! -e "$mp" ]; then continue; fi
-
-                  echo "unmounting $mp..."
-
-                  # We need to remount,ro before attempting any
-                  # umount, or bind mounts may get confused, with
-                  # the fs not being properly flushed at the end.
-
-                  # `-i' is to workaround a bug in mount.cifs (it
-                  # doesn't recognise the `remount' option, and
-                  # instead mounts the FS again).
-                  success=
-                  if mount -t "$fstype" -n -i -o remount,ro "device" "$mp"; then success=1; fi
-
-                  # Note: don't use `umount -f'; it's very buggy.
-                  # (For instance, when applied to a bind-mount it
-                  # unmounts the target of the bind-mount.)  !!! But
-                  # we should use `-f' for NFS.
-                  if [ "$mp" != / -a "$mp" != /nix -a "$mp" != /nix/store ]; then
-                      if umount -n "$mp"; then success=1; tryAgain=1; fi
-                  fi
-
-                  if [ -z "$success" ]; then failed="$failed $mp"; fi
-              done
-          done
-
-
-          # Warn about filesystems that could not be unmounted or
-          # remounted read-only.
-          if [ -n "$failed" ]; then
-              echo "warning: the following filesystems could not be unmounted:"
-              for mp in $failed; do echo "  $mp"; done
-              echo Enter 'i' to launch a shell, or wait 10 seconds to continue.
-              read -t 10 A
-              if [ "$A" == "i" ]; then
-                ${pkgs.bashInteractive}/bin/bash -i < /dev/console &> /dev/console
-              fi
-              sleep 5
-          fi
-
-
-          # Final sync.
-          sync
-
-
-          # Either reboot or power-off the system.
-          if test "$MODE" = reboot; then
-              echo "rebooting..."
-              sleep 1
-              exec reboot -f
-          else
-              echo "powering off..."
-              sleep 1
-              exec halt -f -p
-          fi
-        '';
-    };
-
-}
-- 
GitLab


From 13c690b7213ef6385648d126df9aaf487d9774ae Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 18 Jun 2012 18:16:38 -0400
Subject: [PATCH 3747/5331] Add a .gitignore

---
 .gitignore | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 .gitignore

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 00000000000..b25c15b81fa
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+*~
-- 
GitLab


From c73d642db24bf6fe91d6c23333461f478a9b2d46 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 18 Jun 2012 23:30:26 -0400
Subject: [PATCH 3748/5331] Don't put quotes around environment values

---
 modules/system/boot/systemd.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/system/boot/systemd.nix b/modules/system/boot/systemd.nix
index f41e471cb1b..652f9763024 100644
--- a/modules/system/boot/systemd.nix
+++ b/modules/system/boot/systemd.nix
@@ -248,7 +248,7 @@ let
 
           [Service]
           Environment=PATH=${def.path}
-          ${concatMapStrings (n: "Environment=${n}=\"${getAttr n def.environment}\"\n") (attrNames def.environment)}
+          ${concatMapStrings (n: "Environment=${n}=${getAttr n def.environment}\n") (attrNames def.environment)}
           
           ${optionalString (def.preStart != "") ''
             ExecStartPre=${pkgs.writeScript "${name}-prestart.sh" ''
-- 
GitLab


From 88f94d76bcce27b42c748e6f2a7691d0659e5513 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 18 Jun 2012 23:31:07 -0400
Subject: [PATCH 3749/5331] Use socket-based activation of the Nix daemon

---
 modules/services/misc/nix-daemon.nix | 112 ++++++++++++++-------------
 1 file changed, 60 insertions(+), 52 deletions(-)

diff --git a/modules/services/misc/nix-daemon.nix b/modules/services/misc/nix-daemon.nix
index 31b81a13e36..ea13def39d6 100644
--- a/modules/services/misc/nix-daemon.nix
+++ b/modules/services/misc/nix-daemon.nix
@@ -4,6 +4,8 @@ with pkgs.lib;
 
 let
 
+  cfg = config.nix;
+
   inherit (config.environment) nix;
 
   makeNixBuildUser = nr:
@@ -74,9 +76,7 @@ in
           gc-keep-outputs = true
           gc-keep-derivations = true
         ";
-        description = "
-          This option allows to append lines to nix.conf.
-        ";
+        description = "Additional text appended to <filename>nix.conf<filename>.";
       };
 
       distributedBuilds = mkOption {
@@ -169,11 +169,9 @@ in
       # actually a shell script.
       envVars = mkOption {
         internal = true;
-        default = "";
-        type = types.string;
-        description = "
-          Environment variables used by Nix.
-        ";
+        default = {};
+        type = types.attrs;
+        description = "Environment variables used by Nix.";
       };
 
       nrBuildUsers = mkOption {
@@ -208,14 +206,14 @@ in
               # /bin/sh won't work.
               binshDeps = pkgs.writeReferencesToFile config.system.build.binsh;
             in
-              pkgs.runCommand "nix.conf" {extraOptions = config.nix.extraOptions; } ''
+              pkgs.runCommand "nix.conf" {extraOptions = cfg.extraOptions; } ''
                 extraPaths=$(for i in $(cat ${binshDeps}); do if test -d $i; then echo $i; fi; done)
                 cat > $out <<END
                 # WARNING: this file is generated.
                 build-users-group = nixbld
-                build-max-jobs = ${toString (config.nix.maxJobs)}
-                build-use-chroot = ${if config.nix.useChroot then "true" else "false"}
-                build-chroot-dirs = ${toString config.nix.chrootDirs} $(echo $extraPaths)
+                build-max-jobs = ${toString (cfg.maxJobs)}
+                build-use-chroot = ${if cfg.useChroot then "true" else "false"}
+                build-chroot-dirs = ${toString cfg.chrootDirs} $(echo $extraPaths)
                 $extraOptions
                 END
               '';
@@ -223,7 +221,7 @@ in
         }
       ]
 
-      ++ optional (config.nix.distributedBuilds && !config.nix.manualNixMachines)
+      ++ optional (cfg.distributedBuilds && !cfg.manualNixMachines)
         { # List of machines for distributed Nix builds in the format expected
           # by build-remote.pl.
           source = pkgs.writeText "nix.machines"
@@ -233,37 +231,69 @@ in
               + " ${machine.sshKey} ${toString machine.maxJobs} "
               + (if machine ? speedFactor then toString machine.speedFactor else "1" )
               + "\n"
-            ) config.nix.buildMachines));
+            ) cfg.buildMachines));
           target = "nix.machines";
         };
 
-    jobs.nixDaemon =
-      { name = "nix-daemon";
+    boot.systemd.units."nix-daemon.socket" =
+      { wantedBy = [ "sockets.target" ];
+        text =
+          ''
+            [Unit]
+            Description=Nix Daemon Socket
+            Before=multi-user.target
 
-        startOn = "startup";
+            [Socket]
+            ListenStream=/nix/var/nix/daemon-socket/socket
+          '';
+      };
+     
+    boot.systemd.services."nix-daemon.service" =
+      { description = "Nix Daemon";
 
         path = [ nix pkgs.openssl pkgs.utillinux ]
-          ++ optionals config.nix.distributedBuilds [ pkgs.openssh pkgs.gzip ];
+          ++ optionals cfg.distributedBuilds [ pkgs.openssh pkgs.gzip ];
 
-        script =
-          ''
-            ${config.nix.envVars}
-            exec \
-              nice -n ${builtins.toString config.nix.daemonNiceLevel} \
-              ionice -n ${builtins.toString config.nix.daemonIONiceLevel} \
-              nix-worker --daemon > /dev/null 2>&1
-          '';
+        environment = cfg.envVars;
 
-        extraConfig =
+        serviceConfig =
           ''
-            limit nofile 4096 4096
+            ExecStart=${nix}/bin/nix-worker --daemon
+            KillMode=process
+            PIDFile=/run/sshd.pid
+            Nice=${toString cfg.daemonNiceLevel}
+            IOSchedulingPriority=${toString cfg.daemonIONiceLevel}
+            LimitNOFILE=4096
           '';
       };
+     
+    nix.envVars =
+      { NIX_CONF_DIR = "/etc/nix";
+
+        # Enable the copy-from-other-stores substituter, which allows builds
+        # to be sped up by copying build results from remote Nix stores.  To
+        # do this, mount the remote file system on a subdirectory of
+        # /var/run/nix/remote-stores.
+        NIX_OTHER_STORES = "/var/run/nix/remote-stores/*/nix";
+      }
+
+      // optionalAttrs cfg.distributedBuilds {
+        NIX_BUILD_HOOK = "${config.environment.nix}/libexec/nix/build-remote.pl";
+        NIX_REMOTE_SYSTEMS = "/etc/nix.machines";
+        NIX_CURRENT_LOAD = "/var/run/nix/current-load";
+      }
+
+      # !!! These should not be defined here, but in some general proxy configuration module!
+      // optionalAttrs (cfg.proxy != "") {
+        http_proxy = cfg.proxy;
+        https_proxy = cfg.proxy;
+        ftp_proxy = cfg.proxy;
+      };
 
     environment.shellInit =
       ''
         # Set up the environment variables for running Nix.
-        ${config.nix.envVars}
+        ${concatMapStrings (n: "export ${n}=\"${getAttr n cfg.envVars}\"\n") (attrNames cfg.envVars)}
 
         # Set up secure multi-user builds: non-root users build through the
         # Nix daemon.
@@ -274,29 +304,7 @@ in
         fi
       '';
 
-    nix.envVars =
-      ''
-        export NIX_CONF_DIR=/etc/nix
-
-        # Enable the copy-from-other-stores substituter, which allows builds
-        # to be sped up by copying build results from remote Nix stores.  To
-        # do this, mount the remote file system on a subdirectory of
-        # /var/run/nix/remote-stores.
-        export NIX_OTHER_STORES=/var/run/nix/remote-stores/*/nix
-      '' # */
-      + optionalString config.nix.distributedBuilds ''
-        export NIX_BUILD_HOOK=${config.environment.nix}/libexec/nix/build-remote.pl
-        export NIX_REMOTE_SYSTEMS=/etc/nix.machines
-        export NIX_CURRENT_LOAD=/var/run/nix/current-load
-      ''
-      # !!! These should not be defined here, but in some general proxy configuration module!
-      + optionalString (config.nix.proxy != "") ''
-        export http_proxy=${config.nix.proxy}
-        export https_proxy=${config.nix.proxy}
-        export ftp_proxy=${config.nix.proxy}
-      '';
-
-    users.extraUsers = map makeNixBuildUser (range 1 config.nix.nrBuildUsers);
+    users.extraUsers = map makeNixBuildUser (range 1 cfg.nrBuildUsers);
 
     system.activationScripts.nix = stringAfter [ "etc" "users" ]
       ''
-- 
GitLab


From f213c4ca29b132ce19659af888788e102c7e4171 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 19 Jun 2012 09:28:04 -0400
Subject: [PATCH 3750/5331] Don't run syslogd and klogd

The systemd journal removes the need for running syslogd and klogd, so
don't start them.
---
 modules/config/system-path.nix       | 1 -
 modules/module-list.nix              | 2 +-
 modules/services/logging/syslogd.nix | 2 +-
 3 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/modules/config/system-path.nix b/modules/config/system-path.nix
index d5939db95ac..89524c3f231 100644
--- a/modules/config/system-path.nix
+++ b/modules/config/system-path.nix
@@ -47,7 +47,6 @@ let
       pkgs.procps
       pkgs.rsync
       pkgs.strace
-      pkgs.sysklogd
       pkgs.sysvtools
       pkgs.time
       pkgs.udev
diff --git a/modules/module-list.nix b/modules/module-list.nix
index c7820690929..6f65e71be9b 100644
--- a/modules/module-list.nix
+++ b/modules/module-list.nix
@@ -80,7 +80,7 @@
   ./services/hardware/udev.nix
   ./services/hardware/udisks.nix
   ./services/hardware/upower.nix
-  ./services/logging/klogd.nix
+  #./services/logging/klogd.nix
   ./services/logging/logrotate.nix
   ./services/logging/syslogd.nix
   ./services/mail/dovecot.nix
diff --git a/modules/services/logging/syslogd.nix b/modules/services/logging/syslogd.nix
index 715cfc0f9e6..bfe7352122c 100644
--- a/modules/services/logging/syslogd.nix
+++ b/modules/services/logging/syslogd.nix
@@ -96,7 +96,7 @@ in
     jobs.syslogd =
       { description = "Syslog daemon";
 
-        startOn = "started udev";
+        #startOn = "started udev";
 
         environment = { TZ = config.time.timeZone; };
 
-- 
GitLab


From 2b305d7f294090e31da8e039ffbf90f03c41e526 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 19 Jun 2012 14:50:23 -0400
Subject: [PATCH 3751/5331] Remove accidentally committed line

---
 modules/services/hardware/udev.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/modules/services/hardware/udev.nix b/modules/services/hardware/udev.nix
index 81a9b570127..fe1b7323358 100644
--- a/modules/services/hardware/udev.nix
+++ b/modules/services/hardware/udev.nix
@@ -20,7 +20,6 @@ let
     # Miscellaneous devices.
     KERNEL=="kvm",                  MODE="0666"
     KERNEL=="kqemu",                MODE="0666"
-    KERNEL=="null",                 MODE="0777"
   '';
 
   # Perform substitutions in all udev rules files.
-- 
GitLab


From dab6bbe3a691cafac994e1782d9141ddd1861f1b Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 19 Jun 2012 14:51:04 -0400
Subject: [PATCH 3752/5331] Set the default unit to "graphical.target" if X11
 is enabled

---
 modules/services/x11/xserver.nix | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/modules/services/x11/xserver.nix b/modules/services/x11/xserver.nix
index 2ae42f5b41b..61af0459a6b 100644
--- a/modules/services/x11/xserver.nix
+++ b/modules/services/x11/xserver.nix
@@ -377,15 +377,13 @@ in
     environment.pathsToLink =
       [ "/etc/xdg" "/share/xdg" "/share/applications" "/share/icons" "/share/pixmaps" ];
 
-    jobs."xserver-start-check" =
-      { startOn = if cfg.autorun then "filesystem and stopped udevtrigger" else "";
-        stopOn = "";
-        task = true;
-        script = "grep -qv noX11 /proc/cmdline && start xserver || true";
-      };
+    boot.systemd.defaultUnit = mkIf cfg.autorun "graphical.target";
+
+    boot.systemd.services."xserver.service" =
+      { wantedBy = [ "graphical.target" ];
+        after = [ "systemd-udev-settle.service" ];
 
-    jobs.xserver =
-      { restartIfChanged = false;
+        #restartIfChanged = false;
 
         environment =
           { FONTCONFIG_FILE = "/etc/fonts/fonts.conf"; # !!! cleanup
-- 
GitLab


From cd7872b7587fe0d61480dce79ca8f9c68f3dcf38 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 19 Jun 2012 15:14:54 -0400
Subject: [PATCH 3753/5331] Drop dependency on the old udev

---
 modules/config/system-path.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/modules/config/system-path.nix b/modules/config/system-path.nix
index 89524c3f231..7651f4760ca 100644
--- a/modules/config/system-path.nix
+++ b/modules/config/system-path.nix
@@ -49,7 +49,6 @@ let
       pkgs.strace
       pkgs.sysvtools
       pkgs.time
-      pkgs.udev
       pkgs.usbutils
       pkgs.utillinux
       extraManpages      
-- 
GitLab


From cacd608c37dd0253eb6ef5cda2190e47e9e0717b Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 19 Jun 2012 15:15:40 -0400
Subject: [PATCH 3754/5331] Mount devtmpfs in the initrd

It seems that udev now requires devtmpfs, so enable it.
---
 modules/system/boot/stage-1-init.sh | 13 +------------
 modules/system/boot/stage-1.nix     |  1 -
 modules/system/boot/stage-2-init.sh |  2 +-
 3 files changed, 2 insertions(+), 14 deletions(-)

diff --git a/modules/system/boot/stage-1-init.sh b/modules/system/boot/stage-1-init.sh
index 278c68fce99..aeb6a518906 100644
--- a/modules/system/boot/stage-1-init.sh
+++ b/modules/system/boot/stage-1-init.sh
@@ -66,17 +66,10 @@ mkdir -p /proc
 mount -t proc none /proc
 mkdir -p /sys
 mount -t sysfs none /sys
-mount -t tmpfs -o "mode=0755,size=@devSize@" none /dev
+mount -t devtmpfs -o "size=@devSize@" none /dev
 mkdir -p /run
 mount -t tmpfs -o "mode=0755,size=@runSize@" none /run
 
-# Some console devices, for the interactivity
-mknod /dev/console c 5 1
-mknod /dev/tty c 5 0
-mknod /dev/tty1 c 4 1
-mknod /dev/ttyS0 c 4 64
-mknod /dev/ttyS1 c 4 65
-
 # Process the kernel command line.
 export stage2Init=/init
 for o in $(cat /proc/cmdline); do
@@ -127,10 +120,6 @@ for i in @kernelModules@; do
 done
 
 
-# Create /dev/null.
-mknod /dev/null c 1 3
-
-
 # Create device nodes in /dev.
 echo "running udev..."
 export UDEV_CONFIG_FILE=@udevConf@
diff --git a/modules/system/boot/stage-1.nix b/modules/system/boot/stage-1.nix
index 75f83a27db9..355f88cf385 100644
--- a/modules/system/boot/stage-1.nix
+++ b/modules/system/boot/stage-1.nix
@@ -154,7 +154,6 @@ let
       # Copy some coreutils.
       cp -v ${pkgs.coreutils}/bin/basename $out/bin
       cp -v ${pkgs.coreutils}/bin/mkdir $out/bin
-      cp -v ${pkgs.coreutils}/bin/mknod $out/bin
       cp -v ${pkgs.coreutils}/bin/chmod $out/bin
       cp -v ${pkgs.coreutils}/bin/cat $out/bin
       cp -v ${pkgs.coreutils}/bin/chroot $out/bin
diff --git a/modules/system/boot/stage-2-init.sh b/modules/system/boot/stage-2-init.sh
index 8238fc1537e..a4b966081d6 100644
--- a/modules/system/boot/stage-2-init.sh
+++ b/modules/system/boot/stage-2-init.sh
@@ -39,7 +39,7 @@ if [ ! -e /proc/1 ]; then
     mkdir -m 0755 -p /sys
     mount -t sysfs none /sys
     mkdir -m 0755 -p /dev
-    mount -t tmpfs -o "mode=0755" none /dev
+    mount -t devtmpfs none /dev
 
     # Create the minimal device nodes needed for the activation scripts
     # and Upstart.
-- 
GitLab


From d692a0807aa0afc216a76c4da02ae979d3dbcf8f Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 19 Jun 2012 15:25:56 -0400
Subject: [PATCH 3755/5331] Don't mount /dev/pts since systemd does that for us

---
 modules/system/boot/stage-2-init.sh | 13 -------------
 1 file changed, 13 deletions(-)

diff --git a/modules/system/boot/stage-2-init.sh b/modules/system/boot/stage-2-init.sh
index a4b966081d6..bb9b5c28163 100644
--- a/modules/system/boot/stage-2-init.sh
+++ b/modules/system/boot/stage-2-init.sh
@@ -36,20 +36,8 @@ mount -n -o remount,rw none /
 if [ ! -e /proc/1 ]; then
     mkdir -m 0755 -p /proc
     mount -n -t proc none /proc
-    mkdir -m 0755 -p /sys
-    mount -t sysfs none /sys
     mkdir -m 0755 -p /dev
     mount -t devtmpfs none /dev
-
-    # Create the minimal device nodes needed for the activation scripts
-    # and Upstart.
-    mknod -m 0666 /dev/null c 1 3
-    mknod -m 0644 /dev/urandom c 1 9 # needed for passwd
-    mknod -m 0644 /dev/console c 5 1
-    mknod -m 0644 /dev/ptmx c 5 2 # required by upstart
-    mknod -m 0644 /dev/tty1 c 4 1
-    mknod -m 0644 /dev/ttyS0 c 4 64
-    mknod -m 0644 /dev/ttyS1 c 4 65
 fi
 
 
@@ -87,7 +75,6 @@ done
 mkdir -m 0777 /dev/shm
 mount -t tmpfs -o "rw,nosuid,nodev,size=@devShmSize@" tmpfs /dev/shm
 mkdir -m 0755 -p /dev/pts
-mount -t devpts -o mode=0600,gid=@ttyGid@ none /dev/pts
 [ -e /proc/bus/usb ] && mount -t usbfs none /proc/bus/usb # UML doesn't have USB by default
 mkdir -m 01777 -p /tmp
 mkdir -m 0755 -p /var /var/log
-- 
GitLab


From 2526afb1c7711123a183482f4e2f11637adcb1a9 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 19 Jun 2012 16:22:26 -0400
Subject: [PATCH 3756/5331] Don't use ConsoleKit

---
 modules/services/x11/display-managers/default.nix | 6 ------
 modules/services/x11/display-managers/kdm.nix     | 2 +-
 modules/services/x11/display-managers/slim.nix    | 2 +-
 3 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/modules/services/x11/display-managers/default.nix b/modules/services/x11/display-managers/default.nix
index cdfd271ee65..528b3a6f727 100644
--- a/modules/services/x11/display-managers/default.nix
+++ b/modules/services/x11/display-managers/default.nix
@@ -53,12 +53,6 @@ let
         fi
       ''}
 
-      # Start a ConsoleKit session so that we get ownership of various
-      # devices.
-      if test -z "$XDG_SESSION_COOKIE"; then
-          exec ${pkgs.consolekit}/bin/ck-launch-session "$0" "$sessionType"
-      fi
-
       # Handle being called by kdm.
       if test "''${1:0:1}" = /; then eval exec "$1"; fi
 
diff --git a/modules/services/x11/display-managers/kdm.nix b/modules/services/x11/display-managers/kdm.nix
index fe7802100b2..47d9299fb79 100644
--- a/modules/services/x11/display-managers/kdm.nix
+++ b/modules/services/x11/display-managers/kdm.nix
@@ -111,7 +111,7 @@ in
         logsXsession = true;
       };
 
-    security.pam.services = [ { name = "kde"; allowNullPassword = true; } ];
+    security.pam.services = [ { name = "kde"; allowNullPassword = true; ownDevices = true; } ];
 
     users.extraUsers = singleton
       { name = "kdm";
diff --git a/modules/services/x11/display-managers/slim.nix b/modules/services/x11/display-managers/slim.nix
index 97c5f1d1b2b..fc4df80d810 100644
--- a/modules/services/x11/display-managers/slim.nix
+++ b/modules/services/x11/display-managers/slim.nix
@@ -115,7 +115,7 @@ in
 
     # Allow null passwords so that the user can login as root on the
     # installation CD.
-    security.pam.services = [ { name = "slim"; allowNullPassword = true; } ];
+    security.pam.services = [ { name = "slim"; allowNullPassword = true; ownDevices = true; } ];
 
   };
 
-- 
GitLab


From 2fa1ba85c6f4b96a56d8ed0c1ca361ee59dc6d2b Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 19 Jun 2012 17:02:54 -0400
Subject: [PATCH 3757/5331] Enable the systemd password agents

---
 modules/system/boot/systemd.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/modules/system/boot/systemd.nix b/modules/system/boot/systemd.nix
index 652f9763024..7fafc94a4bb 100644
--- a/modules/system/boot/systemd.nix
+++ b/modules/system/boot/systemd.nix
@@ -194,6 +194,12 @@ let
       "umount.target"
       "final.target"
 
+      # Password entry.
+      "systemd-ask-password-console.path"
+      "systemd-ask-password-console.service"
+      "systemd-ask-password-wall.path"
+      "systemd-ask-password-wall.service"
+
       # Misc.
       "syslog.socket"
     ];
-- 
GitLab


From 337423af8e63f6d89cfd5818a27e48163239d6bd Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 19 Jun 2012 17:36:02 -0400
Subject: [PATCH 3758/5331] Backdoor: depend on /dev/hvc0

Systemd is the shit: units can declare a dependency on the appearance
of device nodes.  Yay!
---
 modules/system/boot/systemd.nix          | 21 ++++++++++++++++++++-
 modules/testing/test-instrumentation.nix | 15 +++++----------
 2 files changed, 25 insertions(+), 11 deletions(-)

diff --git a/modules/system/boot/systemd.nix b/modules/system/boot/systemd.nix
index 7fafc94a4bb..6976a204e7f 100644
--- a/modules/system/boot/systemd.nix
+++ b/modules/system/boot/systemd.nix
@@ -12,6 +12,23 @@ let
       description = "Description of this unit used in systemd messages and progress indicators.";
     };
 
+    requires = mkOption {
+      default = [];
+      types = types.listOf types.string;
+      description = ''
+        Start the specified units when this unit is started, and stop
+        this unit when the specified units are stopped or fail.
+      '';
+    };
+
+    wants = mkOption {
+      default = [];
+      types = types.listOf types.string;
+      description = ''
+        Start the specified units when this unit is started.
+      '';
+    };
+
     after = mkOption {
       default = [];
       types = types.listOf types.string;
@@ -33,7 +50,7 @@ let
     wantedBy = mkOption {
       default = [];
       types = types.listOf types.string;
-      description = "Units that want (i.e. depend on) this unit.";
+      description = "Start this unit when the specified units are started.";
     };
 
     environment = mkOption {
@@ -249,6 +266,8 @@ let
           ${optionalString (def.description != "") ''
             Description=${def.description}
           ''}
+          Requires=${concatStringsSep " " def.requires}
+          Wants=${concatStringsSep " " def.wants}
           Before=${concatStringsSep " " def.before}
           After=${concatStringsSep " " def.after}
 
diff --git a/modules/testing/test-instrumentation.nix b/modules/testing/test-instrumentation.nix
index 5e40cf215b7..468a3030ca6 100644
--- a/modules/testing/test-instrumentation.nix
+++ b/modules/testing/test-instrumentation.nix
@@ -21,15 +21,12 @@ in
 
 {
 
-  config =
-  # Require a patch to the kernel to increase the 15s CIFS timeout.
-  mkAssert (config.boot.kernelPackages.kernel.features ? cifsTimeout) "
-    VM tests require that the kernel has the CIFS timeout patch.
-  " {
+  config = {
 
-    jobs.backdoor =
-      { startOn = "started udev";
-        stopOn = "";
+    boot.systemd.services."backdoor.service" =
+      { wantedBy = [ "multi-user.target" ];
+        requires = [ "dev-hvc0.device" ];
+        after = [ "dev-hvc0.device" ];
 
         script =
           ''
@@ -43,8 +40,6 @@ in
             stty -F /dev/hvc0 raw -echo # prevent nl -> cr/nl conversion
             ${pkgs.socat}/bin/socat stdio exec:${rootShell}
           '';
-
-        respawn = false;
       };
 
     boot.initrd.postDeviceCommands =
-- 
GitLab


From df124ebc891b74dc9036bfe6188b012bf3e796d8 Mon Sep 17 00:00:00 2001
From: Rob Vermaas <rob.vermaas@gmail.com>
Date: Thu, 21 Jun 2012 12:47:44 +0200
Subject: [PATCH 3759/5331] * Make sure time.timeZone can only be defined once.

---
 modules/config/timezone.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/modules/config/timezone.nix b/modules/config/timezone.nix
index 59b4a917ebc..5dcf38c462d 100644
--- a/modules/config/timezone.nix
+++ b/modules/config/timezone.nix
@@ -7,6 +7,7 @@ with pkgs.lib;
 
     time.timeZone = mkOption {
       default = "CET";
+      type = with types; uniq string;
       example = "America/New_York";
       description = "The time zone used when displaying times and dates.";
     };
-- 
GitLab


From 70089950d242eda44c1df9420b19344cb73bc9c9 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 22 Jun 2012 10:28:06 -0400
Subject: [PATCH 3760/5331] nixos-version: "pre-svn" -> "pre-git"

---
 modules/misc/version.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/misc/version.nix b/modules/misc/version.nix
index 95030fbd03d..319cdcb5f98 100644
--- a/modules/misc/version.nix
+++ b/modules/misc/version.nix
@@ -9,7 +9,7 @@ with pkgs.lib;
     system.nixosVersion = mkOption {
       default =
         builtins.readFile ../../.version
-        + (if builtins.pathExists ../../.version-suffix then builtins.readFile ../../.version-suffix else "pre-svn");
+        + (if builtins.pathExists ../../.version-suffix then builtins.readFile ../../.version-suffix else "pre-git");
       description = "NixOS version.";
     };
 
-- 
GitLab


From 9692495df063703ffeafe53d75e8c3ca107bc68e Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 21 May 2012 15:26:07 -0400
Subject: [PATCH 3761/5331] Use BusyBox in the initrd

Using BusyBox instead of Bash plus a bunch of other tools gives us a
much more feature-full, yet smaller initrd.  In particular, BusyBox
contains networking commands such as ip and a DHCP client, useful for
NFS boots.  It's also much more convenient for rescue situations
because the shell has builtin readline support and there are many more
tools (including vi).
---
 modules/module-list.nix                    |  1 -
 modules/system/boot/stage-1-extratools.nix | 54 ------------------
 modules/system/boot/stage-1-init.sh        | 29 +++++-----
 modules/system/boot/stage-1.nix            | 64 +++++++---------------
 modules/virtualisation/qemu-vm.nix         |  4 --
 5 files changed, 34 insertions(+), 118 deletions(-)
 delete mode 100644 modules/system/boot/stage-1-extratools.nix

diff --git a/modules/module-list.nix b/modules/module-list.nix
index 48171f62150..ee326205973 100644
--- a/modules/module-list.nix
+++ b/modules/module-list.nix
@@ -196,7 +196,6 @@
   ./system/boot/luksroot.nix
   ./system/boot/modprobe.nix
   ./system/boot/stage-1.nix
-  ./system/boot/stage-1-extratools.nix
   ./system/boot/stage-2.nix
   ./system/etc/etc.nix
   ./system/upstart-events/control-alt-delete.nix
diff --git a/modules/system/boot/stage-1-extratools.nix b/modules/system/boot/stage-1-extratools.nix
deleted file mode 100644
index 7cd68e6385a..00000000000
--- a/modules/system/boot/stage-1-extratools.nix
+++ /dev/null
@@ -1,54 +0,0 @@
-{ config, pkgs, ...}:
-
-with pkgs.lib;
-
-let
-  staticBusybox = pkgs.busybox.override {
-    enableStatic = true;
-  };
-in
-{
-
-  ###### interface
-
-  options = {
-    boot.initrd.withExtraTools = mkOption {
-      default = false;
-      type = with types; bool;
-      description = ''
-        Have busybox utils in initrd, and an interactive bash.
-      '';
-    };
-  };
-
-  config = {
-    boot.initrd.extraUtilsCommands = mkIf config.boot.initrd.withExtraTools ''
-      cp -pv ${pkgs.ncurses}/lib/libncurses*.so.* $out/lib
-      cp -pv ${pkgs.readline}/lib/libreadline.so.* $out/lib
-      cp -pv ${pkgs.readline}/lib/libhistory.so.* $out/lib
-      rm $out/bin/bash
-      cp -pv ${pkgs.bashInteractive}/bin/bash $out/bin
-
-      cp -pv ${staticBusybox}/bin/busybox $out/bin
-      shopt -s nullglob
-      for d in bin sbin; do
-        pushd ${staticBusybox}/$d
-        # busybox has these, but we'll put them later
-        GLOBIGNORE=.:..:mke2fs:ip:modprobe
-        for a in *; do
-          if [ ! -e $out/bin/$a ]; then
-            ln -sf busybox $out/bin/$a
-          fi
-        done
-        popd
-      done
-      shopt -u nullglob
-      unset GLOBIGNORE
-    '';
-
-    boot.initrd.extraUtilsCommandsTest = mkIf config.boot.initrd.withExtraTools ''
-      $out/bin/busybox
-    '';
-  };
-
-}
diff --git a/modules/system/boot/stage-1-init.sh b/modules/system/boot/stage-1-init.sh
index 278c68fce99..83300b0d2b8 100644
--- a/modules/system/boot/stage-1-init.sh
+++ b/modules/system/boot/stage-1-init.sh
@@ -3,7 +3,7 @@
 targetRoot=/mnt-root
 
 export LD_LIBRARY_PATH=@extraUtils@/lib
-export PATH=@extraUtils@/bin
+export PATH=@extraUtils@/bin:@extraUtils@/sbin
 
 
 fail() {
@@ -50,7 +50,7 @@ EOF
     esac
 }
 
-trap 'fail' ERR
+trap 'fail' 0
 
 
 # Print a greeting.
@@ -60,8 +60,9 @@ echo
 
 
 # Mount special file systems.
-mkdir -p /etc # to shut up mount
-echo -n > /etc/fstab # idem
+mkdir -p /etc
+touch /etc/fstab # to shut up mount
+touch /etc/mtab # to shut up mke2fs
 mkdir -p /proc
 mount -t proc none /proc
 mkdir -p /sys
@@ -120,6 +121,8 @@ done
 
 
 # Load the required kernel modules.
+mkdir -p /lib
+ln -s @modulesClosure@/lib/modules /lib/modules
 echo @extraUtils@/bin/modprobe > /proc/sys/kernel/modprobe
 for i in @kernelModules@; do
     echo "loading module $(basename $i)..."
@@ -259,16 +262,12 @@ mountFS() {
 # Try to find and mount the root device.
 mkdir /mnt-root
 
-mountPoints=(@mountPoints@)
-devices=(@devices@)
-fsTypes=(@fsTypes@)
-optionss=(@optionss@)
+exec 3< @fsInfo@
 
-for ((n = 0; n < ${#mountPoints[*]}; n++)); do
-    mountPoint=${mountPoints[$n]}
-    device=${devices[$n]}
-    fsType=${fsTypes[$n]}
-    options=${optionss[$n]}
+while read -u 3 mountPoint; do
+    read -u 3 device
+    read -u 3 fsType
+    read -u 3 options
 
     # !!! Really quick hack to support bind mounts, i.e., where the
     # "device" should be taken relative to /mnt-root, not /.  Assume
@@ -300,7 +299,7 @@ for ((n = 0; n < ${#mountPoints[*]}; n++)); do
     # that we don't properly recognise.
     if test -z "$pseudoDevice" -a ! -e $device; then
         echo -n "waiting for device $device to appear..."
-        for ((try = 0; try < 20; try++)); do
+        for try in $(seq 1 20); do
             sleep 1
             if test -e $device; then break; fi
             echo -n "."
@@ -326,7 +325,7 @@ udevadm control --exit || true
 
 # Kill any remaining processes, just to be sure we're not taking any
 # with us into stage 2.
-kill -9 -- -1
+pkill -9 -v 1
 
 
 if test -n "$debug1mounts"; then fail; fi
diff --git a/modules/system/boot/stage-1.nix b/modules/system/boot/stage-1.nix
index 75f83a27db9..02a75ae21c4 100644
--- a/modules/system/boot/stage-1.nix
+++ b/modules/system/boot/stage-1.nix
@@ -129,7 +129,7 @@ let
   # work.
   extraUtils = pkgs.runCommand "extra-utils"
     { buildInputs = [pkgs.nukeReferences];
-      allowedReferences = [ "out" modulesClosure ]; # prevent accidents like glibc being included in the initrd
+      allowedReferences = [ "out" ]; # prevent accidents like glibc being included in the initrd
       doublePatchelf = (pkgs.stdenv.system == "armv5tel-linux");
     }
     ''
@@ -139,28 +139,21 @@ let
       # Copy what we need from Glibc.
       cp -pv ${pkgs.glibc}/lib/ld*.so.? $out/lib
       cp -pv ${pkgs.glibc}/lib/libc.so.* $out/lib
+      cp -pv ${pkgs.glibc}/lib/libm.so.* $out/lib
       cp -pv ${pkgs.glibc}/lib/libpthread.so.* $out/lib
       cp -pv ${pkgs.glibc}/lib/librt.so.* $out/lib
       cp -pv ${pkgs.glibc}/lib/libdl.so.* $out/lib
       cp -pv ${pkgs.gcc.gcc}/lib*/libgcc_s.so.* $out/lib
 
+      # Copy BusyBox.
+      cp -rvd ${pkgs.busybox}/{bin,sbin} $out/
+      chmod -R u+w $out
+
       # Copy some utillinux stuff.
-      cp -v ${pkgs.utillinux}/bin/mount ${pkgs.utillinux}/bin/umount \
-         ${pkgs.utillinux}/sbin/fsck ${pkgs.utillinux}/sbin/switch_root \
-         ${pkgs.utillinux}/sbin/blkid ${pkgs.utillinux}/bin/setsid $out/bin
+      cp -v ${pkgs.utillinux}/sbin/blkid $out/bin
       cp -pdv ${pkgs.utillinux}/lib/libblkid*.so.* $out/lib
       cp -pdv ${pkgs.utillinux}/lib/libuuid*.so.* $out/lib
-
-      # Copy some coreutils.
-      cp -v ${pkgs.coreutils}/bin/basename $out/bin
-      cp -v ${pkgs.coreutils}/bin/mkdir $out/bin
-      cp -v ${pkgs.coreutils}/bin/mknod $out/bin
-      cp -v ${pkgs.coreutils}/bin/chmod $out/bin
-      cp -v ${pkgs.coreutils}/bin/cat $out/bin
-      cp -v ${pkgs.coreutils}/bin/chroot $out/bin
-      cp -v ${pkgs.coreutils}/bin/sleep $out/bin
-      cp -v ${pkgs.coreutils}/bin/ln $out/bin
-
+      
       # Copy dmsetup and lvm.
       cp -v ${pkgs.lvm2}/sbin/dmsetup $out/bin/dmsetup
       cp -v ${pkgs.lvm2}/sbin/lvm $out/bin/lvm
@@ -174,12 +167,8 @@ let
       cp -v ${pkgs.udev}/lib/udev/*_id $out/bin
       cp -pdv ${pkgs.udev}/lib/libudev.so.* $out/lib
 
-      # Copy bash.
-      cp -v ${pkgs.bash}/bin/bash $out/bin
-      ln -sv bash $out/bin/sh
-
       # Copy modprobe.
-      cp -v ${pkgs.module_init_tools}/sbin/modprobe $out/bin/modprobe.real
+      cp -v ${pkgs.module_init_tools}/sbin/modprobe $out/bin/modprobe
 
       # Maybe copy splashutils.
       ${optionalString enableSplashScreen ''
@@ -188,6 +177,10 @@ let
 
       ${config.boot.initrd.extraUtilsCommands}
 
+      # Strip binaries further than normal.
+      chmod -R u+w $out
+      stripDirs "lib bin" "-s"
+
       # Run patchelf to make the programs refer to the copied libraries.
       for i in $out/bin/* $out/lib/*; do if ! test -L $i; then nuke-refs $i; fi; done
 
@@ -201,27 +194,15 @@ let
           fi
       done
 
-      # Make the modprobe wrapper that sets $MODULE_DIR.
-      cat > $out/bin/modprobe <<EOF
-      #! $out/bin/bash
-      export MODULE_DIR=${modulesClosure}/lib/modules
-      exec $out/bin/modprobe.real "\$@"
-      EOF
-      chmod u+x $out/bin/modprobe
-
       # Make sure that the patchelf'ed binaries still work.
       echo "testing patched programs..."
-      $out/bin/bash --version | grep "bash, version"
+      $out/bin/ash -c 'echo hello world' | grep "hello world"
       export LD_LIBRARY_PATH=$out/lib
-      $out/bin/mount --version | grep "mount from"
-      $out/bin/umount --version | grep "umount "
+      $out/bin/mount --help 2>&1 | grep "BusyBox"
       $out/bin/udevadm --version
-      $out/bin/blkid -v 2>&1 | tee -a $out/log | grep "blkid from util-linux"
       $out/bin/dmsetup --version 2>&1 | tee -a $out/log | grep "version:"
       LVM_SYSTEM_DIR=$out $out/bin/lvm version 2>&1 | tee -a $out/log | grep "LVM"
       $out/bin/mdadm --version
-      $out/bin/basename --version
-      $out/bin/modprobe --version
 
       ${config.boot.initrd.extraUtilsCommandsTest}
     ''; # */
@@ -291,25 +272,20 @@ let
   bootStage1 = pkgs.substituteAll {
     src = ./stage-1-init.sh;
 
-    shell = "${extraUtils}/bin/bash";
+    shell = "${extraUtils}/bin/ash";
 
     isExecutable = true;
 
-    inherit udevConf extraUtils;
+    inherit udevConf extraUtils modulesClosure;
 
     inherit (config.boot) resumeDevice devSize runSize;
 
     inherit (config.boot.initrd) checkJournalingFS
       preLVMCommands postDeviceCommands postMountCommands kernelModules;
 
-    # !!! copy&pasted from upstart-jobs/filesystems.nix.
-    mountPoints =
-      if fileSystems == []
-      then abort "You must specify the fileSystems option!"
-      else map (fs: fs.mountPoint) fileSystems;
-    devices = map (fs: if fs.device != null then fs.device else "/dev/disk/by-label/${fs.label}") fileSystems;
-    fsTypes = map (fs: fs.fsType) fileSystems;
-    optionss = map (fs: fs.options) fileSystems;
+    fsInfo =
+      let f = fs: [ fs.mountPoint (if fs.device != null then fs.device else "/dev/disk/by-label/${fs.label}") fs.fsType fs.options ];
+      in pkgs.writeText "initrd-fsinfo" (concatStringsSep "\n" (concatMap f fileSystems));
   };
 
 
diff --git a/modules/virtualisation/qemu-vm.nix b/modules/virtualisation/qemu-vm.nix
index 098c2944c1b..dd8b457d43c 100644
--- a/modules/virtualisation/qemu-vm.nix
+++ b/modules/virtualisation/qemu-vm.nix
@@ -252,10 +252,6 @@ in
     ''
       # We need mke2fs in the initrd.
       cp ${pkgs.e2fsprogs}/sbin/mke2fs $out/bin
-
-      # And `ip' (which needs libresolv.so).
-      cp ${pkgs.iproute}/sbin/ip $out/bin
-      cp ${pkgs.glibc}/lib/libresolv.so.* $out/lib
     '';
 
   boot.initrd.postDeviceCommands =
-- 
GitLab


From 7b549222273c0b2cfab21fe86ce7bd53d175dff0 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 22 Jun 2012 11:39:27 -0400
Subject: [PATCH 3762/5331] Don't include klibc in the installation CD

---
 modules/installer/cd-dvd/installation-cd-base.nix | 2 +-
 modules/installer/cd-dvd/system-tarball-pc.nix    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/installer/cd-dvd/installation-cd-base.nix b/modules/installer/cd-dvd/installation-cd-base.nix
index ae227dbcb80..aff46fbac34 100644
--- a/modules/installer/cd-dvd/installation-cd-base.nix
+++ b/modules/installer/cd-dvd/installation-cd-base.nix
@@ -66,5 +66,5 @@ in
 
   # To speed up installation a little bit, include the complete stdenv
   # in the Nix store on the CD.
-  isoImage.storeContents = [ pkgs.stdenv pkgs.klibc pkgs.klibcShrunk ];
+  isoImage.storeContents = [ pkgs.stdenv ];
 }
diff --git a/modules/installer/cd-dvd/system-tarball-pc.nix b/modules/installer/cd-dvd/system-tarball-pc.nix
index 035b6dd6c0a..ddad520c446 100644
--- a/modules/installer/cd-dvd/system-tarball-pc.nix
+++ b/modules/installer/cd-dvd/system-tarball-pc.nix
@@ -123,7 +123,7 @@ in
 
   # To speed up further installation of packages, include the complete stdenv
   # in the Nix store of the tarball.
-  tarball.storeContents = pkgs2storeContents [ pkgs.stdenv pkgs.klibc pkgs.klibcShrunk ];
+  tarball.storeContents = pkgs2storeContents [ pkgs.stdenv ];
 
   tarball.contents =
     [ { source = config.boot.kernelPackages.kernel + "/" + config.system.boot.loader.kernelFile;
-- 
GitLab


From 598adfee3ee9c5fa4409c9cd8f571f71a4f0c112 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 22 Jun 2012 11:55:23 -0400
Subject: [PATCH 3763/5331] Fix booting from the CD-ROM

So it turns out that BusyBox doesn't auto-load modules for filesystems
that have type "auto", e.g. it doesn't figure out that it should load
the "iso9660" module should be loaded when mounting the CD-ROM.  We
don't want to give the root FS on the CD type "iso9660", because that
breaks booting from a USB stick created by unetbootin.  So make sure
the "iso9660" module is loaded.
---
 modules/installer/cd-dvd/iso-image.nix | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/modules/installer/cd-dvd/iso-image.nix b/modules/installer/cd-dvd/iso-image.nix
index cf76151c2ae..7b050f8dd6a 100644
--- a/modules/installer/cd-dvd/iso-image.nix
+++ b/modules/installer/cd-dvd/iso-image.nix
@@ -205,9 +205,7 @@ in
     else
       [ config.boot.kernelPackages.aufs ];
 
-  boot.initrd.availableKernelModules = [ "aufs" "squashfs" "iso9660" ];
-
-  boot.initrd.kernelModules = [ "loop" ];
+  boot.initrd.kernelModules = [ "aufs" "squashfs" "iso9660" "loop" ];
 
   boot.kernelModules = pkgs.stdenv.lib.optional config.isoImage.makeEfiBootable "efivars";
 
-- 
GitLab


From 980ba4d5a527d0e011ad9410d3873dd28292a8c6 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 22 Jun 2012 13:51:42 -0400
Subject: [PATCH 3764/5331] stage-1: mount /proc, /sys, /dev in the target root

The switch_root in BusyBox doesn't do this (while the one in
util-linux does).  So we have to do this ourselves.
---
 modules/system/boot/stage-1-init.sh | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/modules/system/boot/stage-1-init.sh b/modules/system/boot/stage-1-init.sh
index 83300b0d2b8..33eaee826aa 100644
--- a/modules/system/boot/stage-1-init.sh
+++ b/modules/system/boot/stage-1-init.sh
@@ -336,8 +336,7 @@ echo /sbin/modprobe > /proc/sys/kernel/modprobe
 
 
 # Start stage 2.  `switch_root' deletes all files in the ramfs on the
-# current root.  It also moves the /proc, /sys and /dev mounts over to
-# the new root.  Note that $stage2Init might be an absolute symlink,
+# current root.  Note that $stage2Init might be an absolute symlink,
 # in which case "-e" won't work because we're not in the chroot yet.
 if ! test -e "$targetRoot/$stage2Init" -o -L "$targetRoot/$stage2Init"; then
     echo "stage 2 init script ($targetRoot/$stage2Init) not found"
@@ -346,7 +345,9 @@ fi
 
 mkdir -m 0755 -p $targetRoot/proc $targetRoot/sys $targetRoot/dev $targetRoot/run
 
-# `switch_root' doesn't move /run yet, so we have to do it ourselves.
+mount --bind /proc $targetRoot/proc
+mount --bind /sys $targetRoot/sys
+mount --bind /dev $targetRoot/dev
 mount --bind /run $targetRoot/run
 
 exec switch_root "$targetRoot" "$stage2Init"
-- 
GitLab


From 1da7cea2230cfef072a67cc34250818a86d1c0be Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 22 Jun 2012 14:16:55 -0400
Subject: [PATCH 3765/5331] Add Busybox to the installation CD

This is mostly to get the automated tests to succeed.
---
 modules/installer/cd-dvd/installation-cd-base.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/installer/cd-dvd/installation-cd-base.nix b/modules/installer/cd-dvd/installation-cd-base.nix
index aff46fbac34..375941d2447 100644
--- a/modules/installer/cd-dvd/installation-cd-base.nix
+++ b/modules/installer/cd-dvd/installation-cd-base.nix
@@ -66,5 +66,5 @@ in
 
   # To speed up installation a little bit, include the complete stdenv
   # in the Nix store on the CD.
-  isoImage.storeContents = [ pkgs.stdenv ];
+  isoImage.storeContents = [ pkgs.stdenv pkgs.busybox ];
 }
-- 
GitLab


From 82019c01bb638b0ce243f14ed74a62c8e5312140 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 22 Jun 2012 14:31:07 -0400
Subject: [PATCH 3766/5331] Test driver: exit when all VMs have exited rather
 than sleeping forever

---
 lib/test-driver/test-driver.pl | 8 ++++++++
 lib/testing.nix                | 2 +-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/lib/test-driver/test-driver.pl b/lib/test-driver/test-driver.pl
index 0fdcf97af67..43f74cf404b 100644
--- a/lib/test-driver/test-driver.pl
+++ b/lib/test-driver/test-driver.pl
@@ -68,6 +68,14 @@ sub startAll {
 }
 
 
+# Wait until all VMs have terminated.
+sub joinAll {
+    $log->nest("waiting for all VMs to finish", sub {
+        $_->waitForShutdown foreach values %vms;
+    });
+}
+
+
 # In interactive tests, this allows the non-interactive test script to
 # be executed conveniently.
 sub testScript {
diff --git a/lib/testing.nix b/lib/testing.nix
index 704ee4025a5..6a39df8c865 100644
--- a/lib/testing.nix
+++ b/lib/testing.nix
@@ -157,7 +157,7 @@ rec {
         ln -s ${testDriver}/bin/nixos-test-driver $out/bin/nixos-run-vms
         wrapProgram $out/bin/nixos-run-vms \
           --add-flags "$vms" \
-          --set tests '"startAll; sleep 1e9;"' \
+          --set tests '"startAll; joinAll;"' \
           --set VLANS '"${toString vlans}"'
       ''; # "
 
-- 
GitLab


From 6bd32f0a27df5e9d7c349cc0955c5bec03a77e1a Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 22 Jun 2012 15:37:22 -0400
Subject: [PATCH 3767/5331] Drop the socat wrapper

---
 modules/testing/test-instrumentation.nix | 17 ++---------------
 1 file changed, 2 insertions(+), 15 deletions(-)

diff --git a/modules/testing/test-instrumentation.nix b/modules/testing/test-instrumentation.nix
index 5e40cf215b7..830f1744fa0 100644
--- a/modules/testing/test-instrumentation.nix
+++ b/modules/testing/test-instrumentation.nix
@@ -5,20 +5,6 @@
 
 with pkgs.lib;
 
-let
-
-  # Urgh, `socat' sets the SIGCHLD to ignore.  This wreaks havoc with
-  # some programs.
-  rootShell = pkgs.writeScript "shell.pl"
-    ''
-      #! ${pkgs.perl}/bin/perl
-      $SIG{CHLD} = 'DEFAULT';
-      print "\n";
-      exec "/bin/sh";
-    '';
-
-in
-
 {
 
   config =
@@ -41,7 +27,8 @@ in
             exec < /dev/hvc0 > /dev/hvc0 2> /dev/ttyS0
             echo "connecting to host..." >&2
             stty -F /dev/hvc0 raw -echo # prevent nl -> cr/nl conversion
-            ${pkgs.socat}/bin/socat stdio exec:${rootShell}
+            echo
+            PS1= /bin/sh
           '';
 
         respawn = false;
-- 
GitLab


From 7613ae950ac35b9fb21e679c383a9ffff1cb73b0 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sun, 24 Jun 2012 19:02:34 -0400
Subject: [PATCH 3768/5331] Fix booting on EC2

The kill command in ash doesn't know the "--" syntax, but doesn't need
it either.
---
 modules/virtualisation/amazon-image.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/virtualisation/amazon-image.nix b/modules/virtualisation/amazon-image.nix
index 1891f816671..203c9a724ce 100644
--- a/modules/virtualisation/amazon-image.nix
+++ b/modules/virtualisation/amazon-image.nix
@@ -83,7 +83,7 @@ with pkgs.lib;
       # Force udev to exit to prevent random "Device or resource busy
       # while trying to open /dev/xvda" errors from fsck.
       udevadm control --exit || true
-      kill -9 -- -1
+      kill -9 -1
     '';
     
   # Mount all formatted ephemeral disks and activate all swap devices.
-- 
GitLab


From a85555cd2731338c1046d3f6d65fe283ae054502 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 25 Jun 2012 16:08:19 -0400
Subject: [PATCH 3769/5331] Remove the obsolete --no-pull option from the
 nixos-rebuild man page

---
 doc/manual/man-nixos-rebuild.xml | 33 ++++++++------------------------
 1 file changed, 8 insertions(+), 25 deletions(-)

diff --git a/doc/manual/man-nixos-rebuild.xml b/doc/manual/man-nixos-rebuild.xml
index 0b55540126c..625e8ac7a0c 100644
--- a/doc/manual/man-nixos-rebuild.xml
+++ b/doc/manual/man-nixos-rebuild.xml
@@ -173,12 +173,11 @@ $ ./result/bin/run-*-vm
   <varlistentry>
     <term><option>pull</option></term>
     <listitem>
-      <para>This operation merely fetches the latest manifest in the
-      Nixpkgs channel to speed up subsequent
-      <command>nix-env</command> operations.  This is useful if you
-      are not using <command>nix-channel</command> but still want to
-      use pre-built binary packages.  It doesn’t reconfigure the
-      system at all.</para>
+      <para>This operation fetches the latest manifest in the Nixpkgs
+      channel to speed up subsequent <command>nix-env</command>
+      operations.  This is useful if you are not using
+      <command>nix-channel</command> but still want to use pre-built
+      binary packages.  It doesn’t reconfigure the system</para>
     </listitem>
   </varlistentry>
 
@@ -206,21 +205,6 @@ $ ./result/bin/run-*-vm
     </listitem>
   </varlistentry>
 
-  <varlistentry>
-    <term><option>--no-pull</option></term>
-    <listitem>
-      <para>Normally, <command>nixos-rebuild</command> calls
-      <command>nix-pull</command> to obtain the set of available
-      pre-built binaries in the Nixpkgs channel.  This option causes
-      the call to <command>nix-pull</command> to be skipped.  Note
-      that the result of previous invocations of
-      <command>nix-pull</command> may still be available in
-      <filename>/nix/var/nix/manifests</filename>, so to disable the
-      use of pre-built binaries, you should clear that directory in
-      addition to using <option>--no-pull</option>.</para>
-    </listitem>
-  </varlistentry>
-
   <varlistentry>
     <term><option>--no-build-nix</option></term>
     <listitem>
@@ -236,10 +220,9 @@ $ ./result/bin/run-*-vm
   <varlistentry>
     <term><option>--fast</option></term>
     <listitem>
-      <para>Equivalent to <option>--no-pull</option>
-      <option>--no-build-nix</option> <option>--show-trace</option>.
-      This option is useful if you call
-      <command>nixos-rebuild</command> frequently (e.g. if you’re
+      <para>Equivalent to <option>--no-build-nix</option>
+      <option>--show-trace</option>.  This option is useful if you
+      call <command>nixos-rebuild</command> frequently (e.g. if you’re
       hacking on a NixOS module).</para>
     </listitem>
   </varlistentry>
-- 
GitLab


From cc357c7e64c9568d62eed74a9f1de952aa2d8ec8 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 25 Jun 2012 16:17:34 -0400
Subject: [PATCH 3770/5331] =?UTF-8?q?nixos-rebuild:=20Add=20a=20convenienc?=
 =?UTF-8?q?e=20option=20=E2=80=98--upgrade=E2=80=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This is equivalent to running ‘nix-channel --update nixos’ before
running ‘nixos-rebuild’.
---
 doc/manual/man-nixos-rebuild.xml         |  9 ++++++
 modules/installer/tools/nixos-rebuild.sh | 35 ++++++++++++++++--------
 2 files changed, 32 insertions(+), 12 deletions(-)

diff --git a/doc/manual/man-nixos-rebuild.xml b/doc/manual/man-nixos-rebuild.xml
index 625e8ac7a0c..383334d82e1 100644
--- a/doc/manual/man-nixos-rebuild.xml
+++ b/doc/manual/man-nixos-rebuild.xml
@@ -28,6 +28,7 @@
       <arg choice='plain'><option>pull</option></arg>
     </group>
     <sbr />
+    <arg><option>--upgrade</option></arg>
     <arg><option>--install-grub</option></arg>
     <arg><option>--no-pull</option></arg>
     <arg><option>--no-build-nix</option></arg>
@@ -195,6 +196,14 @@ $ ./result/bin/run-*-vm
 
 <variablelist>
 
+  <varlistentry>
+    <term><option>--upgrade</option></term>
+    <listitem>
+      <para>Fetch the latest version of NixOS from the NixOS
+      channel.</para>
+    </listitem>
+  </varlistentry>
+
   <varlistentry>
     <term><option>--install-grub</option></term>
     <listitem>
diff --git a/modules/installer/tools/nixos-rebuild.sh b/modules/installer/tools/nixos-rebuild.sh
index b62da16c7b7..29927f8a126 100644
--- a/modules/installer/tools/nixos-rebuild.sh
+++ b/modules/installer/tools/nixos-rebuild.sh
@@ -22,6 +22,7 @@ The operation is one of the following:
 
 Options:
 
+  --upgrade              fetch the latest version of NixOS before rebuilding
   --install-grub         (re-)install the Grub bootloader
   --pull                 do a nix-pull to get the latest NixOS channel
                          manifest
@@ -51,43 +52,47 @@ action=
 pullManifest=
 buildNix=1
 rollback=
+upgrade=
 
 while test "$#" -gt 0; do
     i="$1"; shift 1
     case "$i" in
       --help)
         showSyntax
-      ;;
+        ;;
       switch|boot|test|build|dry-run|build-vm|build-vm-with-bootloader|pull)
         action="$i"
-      ;;
+        ;;
       --install-grub)
         export NIXOS_INSTALL_GRUB=1
-      ;;
+        ;;
       --pull)
         pullManifest=1
-      ;;
+        ;;
       --no-build-nix)
         buildNix=
-      ;;
+        ;;
       --rollback)
         rollback=1
-      ;;
+        ;;
+      --upgrade)
+        upgrade=1
+        ;;
       --show-trace|--no-build-hook|--keep-failed|-K|--keep-going|-k|--verbose|-v|--fallback)
         extraBuildFlags="$extraBuildFlags $i"
-      ;;
+        ;;
       --max-jobs|-j|--cores|-I)
         j="$1"; shift 1
         extraBuildFlags="$extraBuildFlags $i $j"
-      ;;
+        ;;
       --fast)
         buildNix=
         extraBuildFlags="$extraBuildFlags --show-trace"
-      ;;
+        ;;
       *)
         echo "$0: unknown option \`$i'"
         exit 1
-      ;;
+        ;;
     esac
 done
 
@@ -129,13 +134,19 @@ if [ -n "$pullManifest" -o "$action" = pull ]; then
     done
 fi
 
-if [ "$action" = pull ]; then exit 0; fi 
+if [ "$action" = pull ]; then exit 0; fi
+
+
+# If ‘--upgrade’ is given, run ‘nix-channel --update nixos’.
+if [ -n "$upgrade" ]; then
+    nix-channel --update nixos
+fi
 
 
 # First build Nix, since NixOS may require a newer version than the
 # current one.  Of course, the same goes for Nixpkgs, but Nixpkgs is
 # more conservative.
-if test -n "$buildNix"; then
+if [ -n "$buildNix" ]; then
     echo "building Nix..." >&2
     if ! nix-build '<nixos>' -A config.environment.nix -o $tmpDir/nix $extraBuildFlags > /dev/null; then
         if ! nix-build '<nixos>' -A nixFallback -o $tmpDir/nix $extraBuildFlags > /dev/null; then
-- 
GitLab


From e64bdda52b29e78ac893571c651209cd9f45f0de Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 27 Jun 2012 09:35:53 -0400
Subject: [PATCH 3771/5331] Don't use weird 777 permissions on unmounted
 /dev/shm

---
 modules/system/boot/stage-2-init.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/system/boot/stage-2-init.sh b/modules/system/boot/stage-2-init.sh
index cc0f8befae8..c252b221dfb 100644
--- a/modules/system/boot/stage-2-init.sh
+++ b/modules/system/boot/stage-2-init.sh
@@ -84,7 +84,7 @@ done
 
 
 # More special file systems, initialise required directories.
-mkdir -m 0777 /dev/shm
+mkdir -m 0755 /dev/shm
 mount -t tmpfs -o "rw,nosuid,nodev,size=@devShmSize@" tmpfs /dev/shm
 mkdir -m 0755 -p /dev/pts
 mount -t devpts -o mode=0600,gid=@ttyGid@ none /dev/pts
-- 
GitLab


From 061a9988405e280757c4eea3730647ada90edb36 Mon Sep 17 00:00:00 2001
From: Mathijs Kwik <mathijs@bluescreen303.nl>
Date: Sun, 24 Jun 2012 10:06:28 +0200
Subject: [PATCH 3772/5331] luks root: c-style for-loop -> seq

The ash shell no longer supports this bash-specific syntax.
This left systems that use luksroot unable to boot.
---
 modules/system/boot/luksroot.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/system/boot/luksroot.nix b/modules/system/boot/luksroot.nix
index ff11d284ef8..edbf11214da 100644
--- a/modules/system/boot/luksroot.nix
+++ b/modules/system/boot/luksroot.nix
@@ -11,7 +11,7 @@ let
     # available as a function.
     if ! test -e ${device}; then
         echo -n "waiting 10 seconds for device ${device} to appear..."
-        for ((try = 0; try < 10; try++)); do
+        for try in $(seq 0 9); do
             sleep 1
             if test -e ${device}; then break; fi
             echo -n .
-- 
GitLab


From bb5d2d53fea606a05a417c1c95b8feb4a073a57b Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Wed, 27 Jun 2012 09:43:54 -0400
Subject: [PATCH 3773/5331] try isn't used, so use the more compatct seq 10

---
 modules/system/boot/luksroot.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/system/boot/luksroot.nix b/modules/system/boot/luksroot.nix
index edbf11214da..0e28a882da5 100644
--- a/modules/system/boot/luksroot.nix
+++ b/modules/system/boot/luksroot.nix
@@ -11,7 +11,7 @@ let
     # available as a function.
     if ! test -e ${device}; then
         echo -n "waiting 10 seconds for device ${device} to appear..."
-        for try in $(seq 0 9); do
+        for try in $(seq 10); do
             sleep 1
             if test -e ${device}; then break; fi
             echo -n .
-- 
GitLab


From dbe2325603420a89aa030994138bb54167fab81d Mon Sep 17 00:00:00 2001
From: David Guibert <david.guibert@gmail.com>
Date: Wed, 27 Jun 2012 20:41:07 +0200
Subject: [PATCH 3774/5331] fix the grep pattern finding programs called by
 absolute paths in udev rules.

---
 modules/services/hardware/udev.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/services/hardware/udev.nix b/modules/services/hardware/udev.nix
index 0b63d7543ea..3bbf24bb379 100644
--- a/modules/services/hardware/udev.nix
+++ b/modules/services/hardware/udev.nix
@@ -73,7 +73,7 @@ let
       echo "OK"
 
       echo -n "Checking that all programs call by absolute paths in udev rules exist ... "
-      import_progs=$(grep 'IMPORT{program}="/' $out/* |
+      import_progs=$(grep 'IMPORT{program}="\/' $out/* |
         sed -e 's/.*IMPORT{program}="\([^ "]*\)[ "].*/\1/' | uniq)
       run_progs=$(grep -v '^[[:space:]]*#' $out/* | grep 'RUN+="/' |
         sed -e 's/.*RUN+="\([^ "]*\)[ "].*/\1/' | uniq)
-- 
GitLab


From 5b7c019e2a5b320589d9d7401ac072e5a0a1dffd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= <viric@viric.name>
Date: Wed, 27 Jun 2012 21:36:46 +0200
Subject: [PATCH 3775/5331] nixos-rebuild: make 'pull' fail in case it did not
 pull anything.

---
 modules/installer/tools/nixos-rebuild.sh | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/modules/installer/tools/nixos-rebuild.sh b/modules/installer/tools/nixos-rebuild.sh
index 29927f8a126..98b46cb7cdb 100644
--- a/modules/installer/tools/nixos-rebuild.sh
+++ b/modules/installer/tools/nixos-rebuild.sh
@@ -125,9 +125,13 @@ fi
 # Pull the manifests defined in the configuration (the "manifests"
 # attribute).  Wonderfully hacky.
 if [ -n "$pullManifest" -o "$action" = pull ]; then
+    set -o pipefail
     manifests=$(nix-instantiate --eval-only --xml --strict '<nixos>' -A manifests \
         | grep '<string'  | sed 's^.*"\(.*\)".*^\1^g')
 
+    set -o nopipefail
+    [ "$action" = pull -a $? -ne 0 ] && exit 1
+
     mkdir -p /nix/var/nix/channel-cache
     for i in $manifests; do
         NIX_DOWNLOAD_CACHE=/nix/var/nix/channel-cache nix-pull $i || true
-- 
GitLab


From de87b07bb366ec2f76e59a7f18a2c25bc456bb4a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= <viric@viric.name>
Date: Wed, 27 Jun 2012 21:56:29 +0200
Subject: [PATCH 3776/5331] nixos-rebuild: fail if any case of pull fails.

---
 modules/installer/tools/nixos-rebuild.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/installer/tools/nixos-rebuild.sh b/modules/installer/tools/nixos-rebuild.sh
index 98b46cb7cdb..22aa847e192 100644
--- a/modules/installer/tools/nixos-rebuild.sh
+++ b/modules/installer/tools/nixos-rebuild.sh
@@ -130,7 +130,7 @@ if [ -n "$pullManifest" -o "$action" = pull ]; then
         | grep '<string'  | sed 's^.*"\(.*\)".*^\1^g')
 
     set -o nopipefail
-    [ "$action" = pull -a $? -ne 0 ] && exit 1
+    if [ $? -ne 0 ]; then exit 1; fi
 
     mkdir -p /nix/var/nix/channel-cache
     for i in $manifests; do
-- 
GitLab


From 34e8f68056102f3ca7e4b75c940aa6164aceda9c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= <viric@viric.name>
Date: Wed, 27 Jun 2012 22:26:27 +0200
Subject: [PATCH 3777/5331] system-tarball-pc: not use boot.initrd.extraTools
 anymore

Eelco removed the option recently, making the default initrd have the full
busybox.

I saw this evaluation error in the hydra nixos trunk page.
---
 modules/installer/cd-dvd/system-tarball-pc.nix | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/modules/installer/cd-dvd/system-tarball-pc.nix b/modules/installer/cd-dvd/system-tarball-pc.nix
index ddad520c446..2bc6ce78d94 100644
--- a/modules/installer/cd-dvd/system-tarball-pc.nix
+++ b/modules/installer/cd-dvd/system-tarball-pc.nix
@@ -158,9 +158,6 @@ in
   services.openssh.enable = true;
   jobs.openssh.startOn = pkgs.lib.mkOverrideTemplate 50 {} "";
 
-  # To have a nicer initrd, even though the initrd can't mount an nfsroot now
-  boot.initrd.withExtraTools = true;
-
   # To be able to use the systemTarball to catch troubles.
   boot.crashDump = {
     enable = true;
-- 
GitLab


From 76c74cd7c718da9d3cc6e1d76fb78a86c363406c Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 28 Jun 2012 10:55:44 -0400
Subject: [PATCH 3778/5331] initrd: Detect filesystem type before doing
 fsck/mount

BusyBox doesn't handle the "auto" filesystem type very well: fsck will
just ignore such filesystems, and mount will only work properly if the
required kernel module is already loaded.  Therefore, use blkid to
determine the filesystem type.

Also generate an /etc/fstab in the initrd rootfs on the fly.  This is
useful if you're dropped into an emergency shell since it allows you
to say "fsck /dev/sda1" or "mount /dev/sda" and have the right thing
happen.
---
 modules/installer/cd-dvd/iso-image.nix |  4 ++-
 modules/system/boot/stage-1-init.sh    | 38 ++++++++++++++++++--------
 2 files changed, 30 insertions(+), 12 deletions(-)

diff --git a/modules/installer/cd-dvd/iso-image.nix b/modules/installer/cd-dvd/iso-image.nix
index 7b050f8dd6a..cf76151c2ae 100644
--- a/modules/installer/cd-dvd/iso-image.nix
+++ b/modules/installer/cd-dvd/iso-image.nix
@@ -205,7 +205,9 @@ in
     else
       [ config.boot.kernelPackages.aufs ];
 
-  boot.initrd.kernelModules = [ "aufs" "squashfs" "iso9660" "loop" ];
+  boot.initrd.availableKernelModules = [ "aufs" "squashfs" "iso9660" ];
+
+  boot.initrd.kernelModules = [ "loop" ];
 
   boot.kernelModules = pkgs.stdenv.lib.optional config.isoImage.makeEfiBootable "efivars";
 
diff --git a/modules/system/boot/stage-1-init.sh b/modules/system/boot/stage-1-init.sh
index 33eaee826aa..cc12ccaa738 100644
--- a/modules/system/boot/stage-1-init.sh
+++ b/modules/system/boot/stage-1-init.sh
@@ -184,21 +184,28 @@ onACPower() {
 
 # Check the specified file system, if appropriate.
 checkFS() {
+    local device="$1"
+    local fsType="$2"
+    
     # Only check block devices.
-    if ! test -b "$device"; then return 0; fi
-
-    FSTYPE=$(blkid -o value -s TYPE "$device" || true)
+    if [ ! -b "$device" ]; then return 0; fi
 
     # Don't check ROM filesystems.
-    if test "$FSTYPE" = iso9660 -o "$FSTYPE" = udf; then return 0; fi
+    if [ "$fsType" = iso9660 -o "$fsType" = udf ]; then return 0; fi
+
+    # If we couldn't figure out the FS type, then skip fsck.
+    if [ "$fsType" = auto ]; then
+        echo 'cannot check filesystem with type "auto"!'
+        return 0
+    fi
 
     # Optionally, skip fsck on journaling filesystems.  This option is
     # a hack - it's mostly because e2fsck on ext3 takes much longer to
     # recover the journal than the ext3 implementation in the kernel
     # does (minutes versus seconds).
     if test -z "@checkJournalingFS@" -a \
-        \( "$FSTYPE" = ext3 -o "$FSTYPE" = ext4 -o "$FSTYPE" = reiserfs \
-        -o "$FSTYPE" = xfs -o "$FSTYPE" = jfs \)
+        \( "$fsType" = ext3 -o "$fsType" = ext4 -o "$fsType" = reiserfs \
+        -o "$fsType" = xfs -o "$fsType" = jfs \)
     then
         return 0
     fi
@@ -210,7 +217,9 @@ checkFS() {
         return 0
     fi
 
-    FSTAB_FILE="/etc/mtab" fsck -V -C -a "$device"
+    echo "checking $device..."
+
+    fsck -V -a "$device"
     fsckResult=$?
 
     if test $(($fsckResult | 2)) = $fsckResult; then
@@ -240,7 +249,16 @@ mountFS() {
     local options="$3"
     local fsType="$4"
 
-    checkFS "$device"
+    if [ "$fsType" = auto ]; then
+        fsType=$(blkid -o value -s TYPE "$device")
+        if [ -z "$fsType" ]; then fsType=auto; fi
+    fi
+
+    echo "$device /mnt-root$mountPoint $fsType $options" >> /etc/fstab
+
+    checkFS "$device" "$fsType"
+
+    echo "mounting $device on $mountPoint..."
 
     mkdir -p "/mnt-root$mountPoint" || true
 
@@ -250,7 +268,7 @@ mountFS() {
         if [ "$fsType" = "nfs" ]; then
           nfsmount "$device" "/mnt-root$mountPoint" && break
         else
-          mount -t "$fsType" -o "$options" "$device" "/mnt-root$mountPoint" && break
+          mount "/mnt-root$mountPoint" && break
         fi
         if [ "$fsType" != cifs -o "$n" -ge 10 ]; then fail; break; fi
         echo "retrying..."
@@ -311,8 +329,6 @@ while read -u 3 mountPoint; do
     # doing something with $device right now.
     udevadm settle || true
 
-    echo "mounting $device on $mountPoint..."
-
     mountFS "$device" "$mountPoint" "$options" "$fsType"
 done
 
-- 
GitLab


From 61b8ee90291845621238f14f9ef1d6f13cbdc067 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 29 Jun 2012 11:52:58 +0200
Subject: [PATCH 3779/5331] modules/services/networking/wpa_supplicant.nix:
 document that interface auto-detection doesn't work on Linux 3.4.x

---
 modules/services/networking/wpa_supplicant.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/modules/services/networking/wpa_supplicant.nix b/modules/services/networking/wpa_supplicant.nix
index fe4fecaf0ba..32d4e49557d 100644
--- a/modules/services/networking/wpa_supplicant.nix
+++ b/modules/services/networking/wpa_supplicant.nix
@@ -44,7 +44,9 @@ in
         example = [ "wlan0" "wlan1" ];
         description = ''
           The interfaces <command>wpa_supplicant</command> will use.  If empty, it will
-          automatically use all wireless interfaces.
+          automatically use all wireless interfaces. (Note that auto-detection is currently
+	  broken on Linux 3.4.x kernels. See http://github.com/NixOS/nixos/issues/10 for
+	  further details.)
         '';
       };
 
-- 
GitLab


From f22dbd5e050d53a8ca9db1e9f7ef8a911bdb2040 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 29 Jun 2012 11:53:08 +0200
Subject: [PATCH 3780/5331] modules/services/networking/wpa_supplicant.nix:
 strip trailing whitespace

---
 modules/services/networking/wpa_supplicant.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/modules/services/networking/wpa_supplicant.nix b/modules/services/networking/wpa_supplicant.nix
index 32d4e49557d..5dc203fd177 100644
--- a/modules/services/networking/wpa_supplicant.nix
+++ b/modules/services/networking/wpa_supplicant.nix
@@ -18,7 +18,7 @@ in
   ###### interface
 
   options = {
-  
+
     networking.WLANInterface = mkOption {
       default = "";
       description = "Obsolete. Use <option>networking.wireless.interfaces</option> instead.";
@@ -82,14 +82,14 @@ in
 
 
   ###### implementation
-  
+
   config = mkIf cfg.enable {
 
     environment.systemPackages =  [ pkgs.wpa_supplicant ];
 
     services.dbus.packages = [ pkgs.wpa_supplicant ];
 
-    jobs.wpa_supplicant = 
+    jobs.wpa_supplicant =
       { startOn = "started network-interfaces";
         stopOn = "stopping network-interfaces";
 
@@ -119,13 +119,13 @@ in
             exec wpa_supplicant -s -u ${optionalString (cfg.driver != "") "-D${cfg.driver}"} -c ${configFile} $ifaces
           '';
       };
-  
+
     powerManagement.resumeCommands =
       ''
         ${config.system.build.upstart}/sbin/restart wpa_supplicant
       '';
 
-    assertions = [{ assertion = !cfg.userControlled.enable || cfg.interfaces != []; 
+    assertions = [{ assertion = !cfg.userControlled.enable || cfg.interfaces != [];
                     message = "user controlled wpa_supplicant needs explicit networking.wireless.interfaces";}];
 
   };
-- 
GitLab


From 56373744b4d87dce28feb2c05ea2532631b4c44a Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 2 Jul 2012 15:01:02 +0200
Subject: [PATCH 3781/5331] modules/config/networking.nix: recognize whether a
 local DNS resolver is available

resolvconf prefers a locally running BIND resolver over the forwarders; we just
have to tell it whether we have one or not. We use 'config.services.bind.enable'
to make that decision, assuming that people are not going to configure a local
BIND that won't respond to queries on 127.0.0.1. If we run into such a (weird)
case, then we'll need to introduce another variable for that purpose which can
be set independently from 'config.services.bind.enable'.
---
 modules/config/networking.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/modules/config/networking.nix b/modules/config/networking.nix
index 5065fc22f2c..2b4be69cc51 100644
--- a/modules/config/networking.nix
+++ b/modules/config/networking.nix
@@ -68,6 +68,9 @@ in
             # Invalidate the nscd cache whenever resolv.conf is
             # regenerated.
             libc_restart='${pkgs.upstart}/sbin/start invalidate-nscd'
+          '' + optionalString config.services.bind.enable ''
+            # This hosts runs a full-blown DNS resolver.
+            name_servers='127.0.0.1'
           '' );
         target = "resolvconf.conf";
       }
-- 
GitLab


From 348691645d24df7687da675d33f17d5ce8267916 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 2 Jul 2012 10:57:36 -0400
Subject: [PATCH 3782/5331] Remove broken "nopipefail" option

http://hydra.nixos.org/build/2751337
---
 modules/installer/tools/nixos-rebuild.sh | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/modules/installer/tools/nixos-rebuild.sh b/modules/installer/tools/nixos-rebuild.sh
index 22aa847e192..72661cf4773 100644
--- a/modules/installer/tools/nixos-rebuild.sh
+++ b/modules/installer/tools/nixos-rebuild.sh
@@ -128,8 +128,7 @@ if [ -n "$pullManifest" -o "$action" = pull ]; then
     set -o pipefail
     manifests=$(nix-instantiate --eval-only --xml --strict '<nixos>' -A manifests \
         | grep '<string'  | sed 's^.*"\(.*\)".*^\1^g')
-
-    set -o nopipefail
+    set +o pipefail
     if [ $? -ne 0 ]; then exit 1; fi
 
     mkdir -p /nix/var/nix/channel-cache
-- 
GitLab


From a630b1f6f6fe54aaffc3013893211c33c707a985 Mon Sep 17 00:00:00 2001
From: Mathijs Kwik <mathijs@bluescreen303.nl>
Date: Mon, 2 Jul 2012 08:11:55 +0200
Subject: [PATCH 3783/5331] EFI shell got updated upstream, reflecting new hash

---
 modules/installer/cd-dvd/iso-image.nix            | 4 ++--
 modules/installer/efi-boot-stub/efi-boot-stub.nix | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/modules/installer/cd-dvd/iso-image.nix b/modules/installer/cd-dvd/iso-image.nix
index cf76151c2ae..99628b33bab 100644
--- a/modules/installer/cd-dvd/iso-image.nix
+++ b/modules/installer/cd-dvd/iso-image.nix
@@ -122,12 +122,12 @@ let
   efiShell = if pkgs.stdenv.isi686 then
     pkgs.fetchurl {
       url = "https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2/EdkShellBinPkg/FullShell/Ia32/Shell_Full.efi";
-      sha256 = "0ymm3mbbwx9f6cq0bp2nr7ikyagxgsg4sjs5q1s4xbnms27slwjq";
+      sha256 = "1gv6kyaspczdp7x8qnx5x76ilriaygkfs99ay7ihhdi6riclkhfl";
     }
   else
     pkgs.fetchurl {
       url = "https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2/EdkShellBinPkg/FullShell/X64/Shell_Full.efi";
-      sha256 = "1xchy8a05mgqzr82mmahdni0jbxsz6xf6vm2bg1bch9i6l72qgmh";
+      sha256 = "1g18z84rlavxr5gsrh2g942rfr6znv9fs3fqww5m7dhmnysgyv8p";
     };
 
   # The efi boot image
diff --git a/modules/installer/efi-boot-stub/efi-boot-stub.nix b/modules/installer/efi-boot-stub/efi-boot-stub.nix
index c12078e2a91..1ca3cb0001e 100644
--- a/modules/installer/efi-boot-stub/efi-boot-stub.nix
+++ b/modules/installer/efi-boot-stub/efi-boot-stub.nix
@@ -90,12 +90,12 @@ let
       if pkgs.stdenv.isi686 then
         pkgs.fetchurl {
           url = "https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2/EdkShellBinPkg/FullShell/Ia32/Shell_Full.efi";
-          sha256 = "0ymm3mbbwx9f6cq0bp2nr7ikyagxgsg4sjs5q1s4xbnms27slwjq";
+          sha256 = "1gv6kyaspczdp7x8qnx5x76ilriaygkfs99ay7ihhdi6riclkhfl";
         }
       else
         pkgs.fetchurl {
           url = "https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2/EdkShellBinPkg/FullShell/X64/Shell_Full.efi";
-          sha256 = "1xchy8a05mgqzr82mmahdni0jbxsz6xf6vm2bg1bch9i6l72qgmh";
+          sha256 = "1g18z84rlavxr5gsrh2g942rfr6znv9fs3fqww5m7dhmnysgyv8p";
         }
     else
       null;
-- 
GitLab


From 46dce21bffdca9167fed9731f8cde75ee4531ac4 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 5 Jul 2012 21:02:54 +0200
Subject: [PATCH 3784/5331] MediaWiki: Generalise the skins support
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The new option ‘skins’ allows specifying a list of directories
providing skins to be added to the MediaWiki installation.  The
‘defaultSkin’ option just sets the default.
---
 .../web-servers/apache-httpd/mediawiki.nix    | 35 +++++++++----------
 1 file changed, 17 insertions(+), 18 deletions(-)

diff --git a/modules/services/web-servers/apache-httpd/mediawiki.nix b/modules/services/web-servers/apache-httpd/mediawiki.nix
index d45d477b671..9f321b173d3 100644
--- a/modules/services/web-servers/apache-httpd/mediawiki.nix
+++ b/modules/services/web-servers/apache-httpd/mediawiki.nix
@@ -4,16 +4,6 @@ with pkgs.lib;
 
 let
 
-  src_clean_skin = pkgs.fetchurl {
-    url = "http://lastlog.de/misc/clean-1.01.tar.gz";
-    sha256 = "5fb1736b64b33ca3429d035f1358cf8217da2d02019d8a80b14c7985367f659f";
-  };
-
-  src_nixos_skin = pkgs.fetchurl {
-    url = "http://lastlog.de/misc/nixos-1.0.tar.gz";
-    sha256 = "413b0f451bde81ac2dd0bede17dd088f9abcd0f3cea1722279311ca648a855cf";
-  };
-
   mediawikiConfig = pkgs.writeText "LocalSettings.php"
     ''
       <?php
@@ -89,15 +79,14 @@ let
       sha256 = "1d8afbdh3lsg54b69mnh6a47psb3lg978xpp277qs08yz15cjf7q";
     };
 
-    skinTarball = if config.defaultSkin == "clean" then src_clean_skin
-             else if config.defaultSkin == "nixos" then src_nixos_skin
-             else "";
+    skins = config.skins;
 
-    buildPhase = "
-      if [ '${skinTarball}' ]; then
-         tar xfz ${skinTarball} -C skins/;
-      fi
-    ";
+    buildPhase =
+      ''
+        for skin in $skins; do
+          cp -prvd $skin/* skins/
+        done
+      ''; # */
 
     installPhase =
       ''
@@ -259,6 +248,16 @@ in
       description = "Set this value to change the default skin used by MediaWiki.";
     };
 
+    skins = mkOption {
+      default = [];
+      type = types.listOf types.path;
+      description =
+        ''
+          List of paths whose content is copied to the ‘skins’
+          subdirectory of the MediaWiki installation.
+        '';
+    };
+
     extraConfig = mkOption {
       default = "";
       example =
-- 
GitLab


From a07eb262a0895bb1b95d538bef32c2dade6d5252 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 6 Jul 2012 13:47:42 -0400
Subject: [PATCH 3785/5331] Apache: don't fork into the background due to
 Upstart weirdness

If Apache crashes during startup, Upstart for some reason shows the
job in the "start/running" state.  As a workaround, don't fork.
---
 modules/services/web-servers/apache-httpd/default.nix | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/modules/services/web-servers/apache-httpd/default.nix b/modules/services/web-servers/apache-httpd/default.nix
index ce3311a5f59..c47df868b88 100644
--- a/modules/services/web-servers/apache-httpd/default.nix
+++ b/modules/services/web-servers/apache-httpd/default.nix
@@ -593,9 +593,7 @@ in
             done
           '';
 
-        daemonType = "fork";
-
-        exec = "httpd -f ${httpdConf}";
+        exec = "httpd -f ${httpdConf} -DNO_DETACH";
 
         preStop =
           ''
-- 
GitLab


From 18031e41bbcee75f05e0200b2a04c8ab4a098888 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 6 Jul 2012 14:23:55 -0400
Subject: [PATCH 3786/5331] Apache: Add an option to set the MPM

Supported values are "prefork" (default), "worker" and "event"
(experimental in Apache 2.2 but not 2.4).
---
 .../web-servers/apache-httpd/default.nix      | 27 +++++++++++++++++--
 1 file changed, 25 insertions(+), 2 deletions(-)

diff --git a/modules/services/web-servers/apache-httpd/default.nix b/modules/services/web-servers/apache-httpd/default.nix
index c47df868b88..828b2bc4c1f 100644
--- a/modules/services/web-servers/apache-httpd/default.nix
+++ b/modules/services/web-servers/apache-httpd/default.nix
@@ -6,7 +6,7 @@ let
 
   mainCfg = config.services.httpd;
 
-  httpd = pkgs.apacheHttpd;
+  httpd = pkgs.apacheHttpd.override { mpm = mainCfg.multiProcessingModule; };
 
   getPort = cfg: if cfg.port != 0 then cfg.port else if cfg.enableSSL then 443 else 80;
 
@@ -105,10 +105,11 @@ let
       # Other modules.
       "ext_filter" "include" "log_config" "env" "mime_magic"
       "cern_meta" "expires" "headers" "usertrack" /* "unique_id" */ "setenvif"
-      "mime" "dav" "status" "autoindex" "asis" "info" "cgi" "dav_fs"
+      "mime" "dav" "status" "autoindex" "asis" "info" "dav_fs"
       "vhost_alias" "negotiation" "dir" "imagemap" "actions" "speling"
       "userdir" "alias" "rewrite" "proxy" "proxy_http"
     ]
+    ++ (if mainCfg.multiProcessingModule == "prefork" then [ "cgi" ] else [ "cgid" ])
     ++ optional enableSSL "ssl"
     ++ extraApacheModules;
 
@@ -283,6 +284,11 @@ let
 
     PidFile ${mainCfg.stateDir}/httpd.pid
 
+    ${optionalString (mainCfg.multiProcessingModule != "prefork") ''
+      # mod_cgid requires this.
+      ScriptSock ${mainCfg.stateDir}/cgisock
+    ''}
+
     <IfModule prefork.c>
         MaxClients           ${toString mainCfg.maxClients}
         MaxRequestsPerChild  ${toString mainCfg.maxRequestsPerChild}
@@ -484,6 +490,23 @@ in
           "Options appended to the PHP configuration file <filename>php.ini</filename>.";
       };
 
+      multiProcessingModule = mkOption {
+        default = "prefork";
+        example = "worker";
+        type = types.uniq types.string;
+        description =
+          ''
+            Multi-processing module to be used by Apache.  Available
+            modules are <literal>prefork</literal> (the default;
+            handles each request in a separate child process),
+            <literal>worker</literal> (hybrid approach that starts a
+            number of child processes each running a number of
+            threads) and <literal>event</literal> (a recent variant of
+            <literal>worker</literal> that handles persistent
+            connections more efficiently).
+          '';
+      };
+
       maxClients = mkOption {
         default = 150;
         example = 8;
-- 
GitLab


From d0c9a3ce3211a53f61bb22092784ea066b3aa308 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 6 Jul 2012 23:28:46 +0200
Subject: [PATCH 3787/5331] Apache: build PHP against the right httpd

If httpd is built with a threaded MPM, then PHP needs to be built with
thread support as well.
---
 modules/services/web-servers/apache-httpd/default.nix | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/modules/services/web-servers/apache-httpd/default.nix b/modules/services/web-servers/apache-httpd/default.nix
index 828b2bc4c1f..04418d97b10 100644
--- a/modules/services/web-servers/apache-httpd/default.nix
+++ b/modules/services/web-servers/apache-httpd/default.nix
@@ -8,6 +8,8 @@ let
 
   httpd = pkgs.apacheHttpd.override { mpm = mainCfg.multiProcessingModule; };
 
+  php = pkgs.php.override { apacheHttpd = httpd; };
+
   getPort = cfg: if cfg.port != 0 then cfg.port else if cfg.enableSSL then 443 else 80;
 
   extraModules = attrByPath ["extraModules"] [] mainCfg;
@@ -308,7 +310,7 @@ let
         allModules =
           concatMap (svc: svc.extraModulesPre) allSubservices
           ++ map (name: {inherit name; path = "${httpd}/modules/mod_${name}.so";}) apacheModules
-          ++ optional enablePHP { name = "php5"; path = "${pkgs.php}/modules/libphp5.so"; }
+          ++ optional enablePHP { name = "php5"; path = "${php}/modules/libphp5.so"; }
           ++ concatMap (svc: svc.extraModules) allSubservices
           ++ extraForeignModules;
       in concatMapStrings load allModules
@@ -379,7 +381,7 @@ let
         ([ mainCfg.phpOptions ] ++ (map (svc: svc.phpOptions) allSubservices));
     }
     ''
-      cat ${pkgs.php}/etc/php-recommended.ini > $out
+      cat ${php}/etc/php-recommended.ini > $out
       echo "$options" >> $out
     '';
 
@@ -410,7 +412,7 @@ in
 
       extraModules = mkOption {
         default = [];
-        example = [ "proxy_connect" { name = "php5"; path = "${pkgs.php}/modules/libphp5.so"; } ];
+        example = [ "proxy_connect" { name = "php5"; path = "${php}/modules/libphp5.so"; } ];
         description = ''
           Specifies additional Apache modules.  These can be specified
           as a string in the case of modules distributed with Apache,
-- 
GitLab


From fbf9ecf78a68785a682d05bf2a4851b6427ce11a Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 9 Jul 2012 16:27:39 +0200
Subject: [PATCH 3788/5331] Apache: make /var/run/httpd readable to wwwrun, as
 required by mod_cgid

---
 modules/services/web-servers/apache-httpd/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/modules/services/web-servers/apache-httpd/default.nix b/modules/services/web-servers/apache-httpd/default.nix
index 04418d97b10..ba02c6ead43 100644
--- a/modules/services/web-servers/apache-httpd/default.nix
+++ b/modules/services/web-servers/apache-httpd/default.nix
@@ -594,7 +594,8 @@ in
 
         preStart =
           ''
-            mkdir -m 0700 -p ${mainCfg.stateDir}
+            mkdir -m 0750 -p ${mainCfg.stateDir}
+            chown root.wwwrun ${mainCfg.stateDir}
             mkdir -m 0700 -p ${mainCfg.logDir}
 
             ${optionalString (mainCfg.documentRoot != null)
-- 
GitLab


From b7398794ed7805002e57bb37d59bdcb777d623c9 Mon Sep 17 00:00:00 2001
From: Rok Garbas <rok@garbas.si>
Date: Tue, 10 Jul 2012 16:07:53 +0200
Subject: [PATCH 3789/5331] i3 window manager was not installed when enabled

---
 modules/services/x11/window-managers/i3.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/modules/services/x11/window-managers/i3.nix b/modules/services/x11/window-managers/i3.nix
index 7699d064eef..705a2762ea6 100644
--- a/modules/services/x11/window-managers/i3.nix
+++ b/modules/services/x11/window-managers/i3.nix
@@ -26,5 +26,6 @@ in
         ";
       }];
     };
+    environment.x11Packages = [ pkgs.i3 ];
   };
 }
-- 
GitLab


From 3039caf5ad3657ffd8bc84929ffc9eca44d18292 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Wed, 11 Jul 2012 11:22:16 -0400
Subject: [PATCH 3790/5331] Add logstash module.

Since the logstash config file seemed very similar to a nixexpr, I decided
to map directly from nixexprs to logstash configs. I didn't realize until
too far in that this solution was probably way over-engineered, but it
works.
---
 modules/module-list.nix               |   1 +
 modules/services/logging/logstash.nix | 152 ++++++++++++++++++++++++++
 2 files changed, 153 insertions(+)
 create mode 100644 modules/services/logging/logstash.nix

diff --git a/modules/module-list.nix b/modules/module-list.nix
index ee326205973..0a6507cd5e6 100644
--- a/modules/module-list.nix
+++ b/modules/module-list.nix
@@ -83,6 +83,7 @@
   ./services/hardware/upower.nix
   ./services/logging/klogd.nix
   ./services/logging/logrotate.nix
+  ./services/logging/logstash.nix
   ./services/logging/syslogd.nix
   ./services/mail/dovecot.nix
   ./services/mail/dovecot2.nix
diff --git a/modules/services/logging/logstash.nix b/modules/services/logging/logstash.nix
new file mode 100644
index 00000000000..f8b0d353cad
--- /dev/null
+++ b/modules/services/logging/logstash.nix
@@ -0,0 +1,152 @@
+{ config, pkgs, ... }:
+
+with pkgs.lib;
+
+let
+
+  cfg = config.services.logstash;
+
+  listToConfig = list: "[ " + (concatStringsSep ", " (map exprToConfig list)) + " ]";
+
+  hashToConfig = attrs:
+    let
+      attrNameToConfigList = name:
+        [ (exprToConfig name)  (exprToConfig (getAttr name attrs)) ];
+    in
+      "[ " +
+      (concatStringsSep ", " (map attrNameToConfigList (attrNames attrs))) +
+      " ]";
+
+  valueToConfig = name: value: 
+    if (isAttrs value) && ((!(value ? __type)) || value.__type == "repeated")
+      then ''
+        ${name} {
+          ${exprToConfig value}
+        }
+      ''
+      else "${name} => ${exprToConfig value}";
+
+  repeatedAttrsToConfig = names: values:
+      concatStringsSep "\n" (zipListsWith valueToConfig names values);
+
+  attrsToConfig = attrs:
+    let
+      attrToConfig = name: valueToConfig name (getAttr name attrs);
+    in
+      concatStringsSep "\n" (map attrToConfig (attrNames attrs));
+
+  exprToConfig = expr:
+    let
+      isCustomType = expr: (isAttrs expr) && (expr ? __type);
+
+      isFloat = expr: (isCustomType expr) && (expr.__type == "float");
+
+      isHash = expr: (isCustomType expr) && (expr.__type == "hash");
+
+      isRepeatedAttrs = expr: (isCustomType expr) && (expr.__type == "repeated");
+    in
+      if builtins.isBool expr then (if expr then "true" else "false") else
+      if builtins.isString expr then ''"${expr}"'' else
+      if builtins.isInt expr then toString expr else
+      if isFloat expr then expr.value else
+      if isList expr then listToConfig expr else
+      if isHash expr then hashToConfig expr.value else
+      if isRepeatedAttrs expr then repeatedAttrsToConfig expr.names expr.values
+      else attrsToConfig expr;
+
+  mergeConfigs = configs:
+    let
+      op = attrs: newAttrs:
+        let
+          isRepeated = newAttrs ? __type && newAttrs.__type == "repeated";
+        in {
+            names = attrs.names ++
+              (if isRepeated then newAttrs.names else attrNames newAttrs);
+
+            values = attrs.values ++
+              (if isRepeated then newAttrs.values else attrValues newAttrs);
+          };
+    in (foldl op { names = []; values = []; } configs) //
+      { __type = "repeated"; };
+
+in
+
+{
+  ###### interface
+
+  options = {
+    services.logstash = {
+      enable = mkOption {
+        default = false;
+        description = ''
+          Enable logstash.
+        '';
+      };
+
+      inputConfig = mkOption {
+        default = {};
+        description = ''
+          An attr set representing a logstash configuration's input section.
+          logstash configs are name-value pairs, where values can be bools,
+          strings, numbers, arrays, hashes, or other name-value pairs,
+          and names are strings that can be repeated. name-value pairs with no
+          repeats are represented by attr sets. name-value pairs with repeats
+          are represented by an attrset with attr "__type" = "repeated" and
+          attrs "names" and "values" as matching lists pairing name and value.
+          bools, strings, ints, and arrays are mapped directly. Floats are
+          represented as an attrset with attr "__type" = "float" and attr value
+          set to the string representation of the float. Hashes are represented
+          with attr "__type" = "hash" and attr value set to an attr set
+          corresponding to the hash.
+        '';
+        merge = mergeConfigs;
+      };
+
+      filterConfig = mkOption {
+        default = {};
+        description = ''
+          An attr set representing a logstash configuration's filter section.
+          See inputConfig description for details.
+        '';
+        merge = mergeConfigs;
+      };
+
+      outputConfig = mkOption {
+        default = {};
+        description = ''
+          An attr set representing a logstash configuration's output section.
+          See inputConfig description for details.
+        '';
+        merge = mergeConfigs;
+      };
+    };
+  };
+
+
+  ###### implementation
+
+  config = mkIf cfg.enable {
+    # Always log to stdout
+    services.logstash.outputConfig = { stdout = {}; };
+
+    jobs.logstash = with pkgs; {
+      description = "Logstash daemon";
+
+      path = [ jre ];
+
+      exec = "java -jar ${logstash} agent -f ${writeText "logstash.conf" ''
+        input {
+          ${exprToConfig cfg.inputConfig}
+        }
+
+        filter {
+          ${exprToConfig cfg.filterConfig}
+        }
+
+        output {
+          ${exprToConfig cfg.outputConfig}
+        }
+      ''}";
+    };
+  };
+}
-- 
GitLab


From 315087def17d0aba7d4cca976ef2e5bf80f098cb Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Wed, 11 Jul 2012 11:59:00 -0400
Subject: [PATCH 3791/5331] logstash: use {name=; value='} attrsets for
 repeated name-value pairs instead of parallel lists

---
 modules/services/logging/logstash.nix | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/modules/services/logging/logstash.nix b/modules/services/logging/logstash.nix
index f8b0d353cad..2130ddcd2b9 100644
--- a/modules/services/logging/logstash.nix
+++ b/modules/services/logging/logstash.nix
@@ -17,7 +17,7 @@ let
       (concatStringsSep ", " (map attrNameToConfigList (attrNames attrs))) +
       " ]";
 
-  valueToConfig = name: value: 
+  valueToConfig = nvpair: let name = nvpair.name; value = nvpair.value; in
     if (isAttrs value) && ((!(value ? __type)) || value.__type == "repeated")
       then ''
         ${name} {
@@ -26,12 +26,15 @@ let
       ''
       else "${name} => ${exprToConfig value}";
 
-  repeatedAttrsToConfig = names: values:
-      concatStringsSep "\n" (zipListsWith valueToConfig names values);
+  repeatedAttrsToConfig = values:
+      concatStringsSep "\n" (map valueToConfig values);
 
   attrsToConfig = attrs:
     let
-      attrToConfig = name: valueToConfig name (getAttr name attrs);
+      attrToConfig = name: valueToConfig {
+        inherit name;
+        value = (getAttr name attrs);
+      };
     in
       concatStringsSep "\n" (map attrToConfig (attrNames attrs));
 
@@ -51,7 +54,7 @@ let
       if isFloat expr then expr.value else
       if isList expr then listToConfig expr else
       if isHash expr then hashToConfig expr.value else
-      if isRepeatedAttrs expr then repeatedAttrsToConfig expr.names expr.values
+      if isRepeatedAttrs expr then repeatedAttrsToConfig expr.values
       else attrsToConfig expr;
 
   mergeConfigs = configs:
@@ -60,14 +63,11 @@ let
         let
           isRepeated = newAttrs ? __type && newAttrs.__type == "repeated";
         in {
-            names = attrs.names ++
-              (if isRepeated then newAttrs.names else attrNames newAttrs);
-
-            values = attrs.values ++
-              (if isRepeated then newAttrs.values else attrValues newAttrs);
+            values = attrs.values ++ (if isRepeated then newAttrs.values else
+              map (name: { inherit name; value = getAttr name newAttrs; })
+              (attrNames newAttrs));
           };
-    in (foldl op { names = []; values = []; } configs) //
-      { __type = "repeated"; };
+    in (foldl op { values = []; } configs) // { __type = "repeated"; };
 
 in
 
@@ -92,7 +92,7 @@ in
           and names are strings that can be repeated. name-value pairs with no
           repeats are represented by attr sets. name-value pairs with repeats
           are represented by an attrset with attr "__type" = "repeated" and
-          attrs "names" and "values" as matching lists pairing name and value.
+          attr "values" as a list of {name; value;} attrsets.
           bools, strings, ints, and arrays are mapped directly. Floats are
           represented as an attrset with attr "__type" = "float" and attr value
           set to the string representation of the float. Hashes are represented
-- 
GitLab


From 5412b1089ffa88788c15358020921033f12d0a0c Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Wed, 11 Jul 2012 13:45:36 -0400
Subject: [PATCH 3792/5331] logstash: Start process in /tmp

See https://logstash.jira.com/browse/LOGSTASH-107
---
 modules/services/logging/logstash.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/services/logging/logstash.nix b/modules/services/logging/logstash.nix
index 2130ddcd2b9..9387a731db9 100644
--- a/modules/services/logging/logstash.nix
+++ b/modules/services/logging/logstash.nix
@@ -134,7 +134,7 @@ in
 
       path = [ jre ];
 
-      exec = "java -jar ${logstash} agent -f ${writeText "logstash.conf" ''
+      script = "cd /tmp && exec java -jar ${logstash} agent -f ${writeText "logstash.conf" ''
         input {
           ${exprToConfig cfg.inputConfig}
         }
-- 
GitLab


From 008493f94ca7d4639e2e3305adb51ca765f54c7a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Carles=20Pag=C3=A8s?= <page@cubata.homelinux.net>
Date: Mon, 2 Jul 2012 21:34:27 +0200
Subject: [PATCH 3793/5331] Add option to keep hardware clock in local time.

---
 modules/config/timezone.nix                | 18 ++++++++++++------
 modules/system/upstart-events/shutdown.nix |  2 +-
 2 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/modules/config/timezone.nix b/modules/config/timezone.nix
index 5dcf38c462d..bb03074a4ae 100644
--- a/modules/config/timezone.nix
+++ b/modules/config/timezone.nix
@@ -5,13 +5,19 @@ with pkgs.lib;
 {
   options = {
 
-    time.timeZone = mkOption {
-      default = "CET";
-      type = with types; uniq string;
-      example = "America/New_York";
-      description = "The time zone used when displaying times and dates.";
-    };
+    time = {
+      timeZone = mkOption {
+        default = "CET";
+        type = with types; uniq string;
+        example = "America/New_York";
+        description = "The time zone used when displaying times and dates.";
+      };
 
+      clockLocal = mkOption {
+        default = false;
+        description = "Keep the Hardware Clock in local time instead of UTC";
+      };
+    };
   };
 
   config = {
diff --git a/modules/system/upstart-events/shutdown.nix b/modules/system/upstart-events/shutdown.nix
index 8aa794378ed..bfe8d073a82 100644
--- a/modules/system/upstart-events/shutdown.nix
+++ b/modules/system/upstart-events/shutdown.nix
@@ -73,7 +73,7 @@ with pkgs.lib;
 
           # Set the hardware clock to the system time.
           echo "setting the hardware clock..."
-          hwclock --systohc --utc
+          hwclock --systohc ${if config.time.clockLocal then "--localtime" else "--utc"}
 
 
           # Stop all swap devices.
-- 
GitLab


From 7de6a7e8b04fd9c889a19acedaf92c3e58e652f0 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 11 Jul 2012 15:33:34 -0400
Subject: [PATCH 3794/5331] Rename time.clockLocal ->
 time.hardwareClockInLocalTime.

---
 modules/config/timezone.nix                | 6 ++++--
 modules/system/upstart-events/shutdown.nix | 2 +-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/modules/config/timezone.nix b/modules/config/timezone.nix
index bb03074a4ae..38c698bc21c 100644
--- a/modules/config/timezone.nix
+++ b/modules/config/timezone.nix
@@ -6,6 +6,7 @@ with pkgs.lib;
   options = {
 
     time = {
+    
       timeZone = mkOption {
         default = "CET";
         type = with types; uniq string;
@@ -13,10 +14,11 @@ with pkgs.lib;
         description = "The time zone used when displaying times and dates.";
       };
 
-      clockLocal = mkOption {
+      hardwareClockInLocalTime = mkOption {
         default = false;
-        description = "Keep the Hardware Clock in local time instead of UTC";
+        description = "If set, keep the hardware clock in local time instead of UTC.";
       };
+      
     };
   };
 
diff --git a/modules/system/upstart-events/shutdown.nix b/modules/system/upstart-events/shutdown.nix
index bfe8d073a82..59fbcc0d878 100644
--- a/modules/system/upstart-events/shutdown.nix
+++ b/modules/system/upstart-events/shutdown.nix
@@ -73,7 +73,7 @@ with pkgs.lib;
 
           # Set the hardware clock to the system time.
           echo "setting the hardware clock..."
-          hwclock --systohc ${if config.time.clockLocal then "--localtime" else "--utc"}
+          hwclock --systohc ${if config.time.hardwareClockInLocalTime then "--localtime" else "--utc"}
 
 
           # Stop all swap devices.
-- 
GitLab


From 0c12e293689128a84e4234502380f83bddf9699a Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 12 Jul 2012 11:33:10 +0200
Subject: [PATCH 3795/5331] Don't add the i3 window manager to the system if it
 isn't enabled in configuration.nix.

---
 modules/services/x11/window-managers/i3.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/services/x11/window-managers/i3.nix b/modules/services/x11/window-managers/i3.nix
index 705a2762ea6..d688c064c5a 100644
--- a/modules/services/x11/window-managers/i3.nix
+++ b/modules/services/x11/window-managers/i3.nix
@@ -16,9 +16,9 @@ in
     };
   };
 
-  config = {
+  config = mkIf cfg.enable {
     services.xserver.windowManager = {
-      session = mkIf cfg.enable [{
+      session = [{
         name = "i3";
         start = "
           ${pkgs.i3}/bin/i3 &
-- 
GitLab


From 8712e1dafc8127f912ce06836bd1deb7dab6730d Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Thu, 12 Jul 2012 13:46:04 -0400
Subject: [PATCH 3796/5331] Add lib module for modules to provide helper
 functions

---
 modules/misc/lib.nix    | 15 +++++++++++++++
 modules/module-list.nix |  1 +
 2 files changed, 16 insertions(+)
 create mode 100644 modules/misc/lib.nix

diff --git a/modules/misc/lib.nix b/modules/misc/lib.nix
new file mode 100644
index 00000000000..18fc68a6988
--- /dev/null
+++ b/modules/misc/lib.nix
@@ -0,0 +1,15 @@
+{ config, pkgs, ... }:
+
+{
+  options = {
+    lib = pkgs.lib.mkOption {
+      default = {};
+
+      type = pkgs.lib.types.attrsOf pkgs.lib.types.attrs;
+
+      description = ''
+        This option allows modules to define helper functions, constants, etc.
+      '';
+    };
+  };
+}
diff --git a/modules/module-list.nix b/modules/module-list.nix
index 0a6507cd5e6..dfc91a765be 100644
--- a/modules/module-list.nix
+++ b/modules/module-list.nix
@@ -34,6 +34,7 @@
   ./misc/crashdump.nix
   ./misc/ids.nix
   ./misc/locate.nix
+  ./misc/lib.nix
   ./misc/nixpkgs.nix
   ./misc/passthru.nix
   ./misc/version.nix
-- 
GitLab


From a2b59f595f085ecaf578108bffb4e11c9a94fe20 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Thu, 12 Jul 2012 14:15:43 -0400
Subject: [PATCH 3797/5331] logstash: Export
 config.lib.logstash.mk{Float,Hash,NameValuePairs}.

This allows hiding the implementation details for how to represent logstash
config types that don't directly map to nix expressions, particularly floats,
hashes, and name-value pair sets with repeated names. Instead of setting
__type and value directly, the user now uses these convenience functions to
generate their logstash config.
---
 modules/services/logging/logstash.nix | 29 +++++++++++++++++----------
 1 file changed, 18 insertions(+), 11 deletions(-)

diff --git a/modules/services/logging/logstash.nix b/modules/services/logging/logstash.nix
index 9387a731db9..32e2f17d189 100644
--- a/modules/services/logging/logstash.nix
+++ b/modules/services/logging/logstash.nix
@@ -86,18 +86,17 @@ in
       inputConfig = mkOption {
         default = {};
         description = ''
-          An attr set representing a logstash configuration's input section.
+          A nixexpr representing a logstash configuration's input section.
           logstash configs are name-value pairs, where values can be bools,
           strings, numbers, arrays, hashes, or other name-value pairs,
           and names are strings that can be repeated. name-value pairs with no
-          repeats are represented by attr sets. name-value pairs with repeats
-          are represented by an attrset with attr "__type" = "repeated" and
-          attr "values" as a list of {name; value;} attrsets.
-          bools, strings, ints, and arrays are mapped directly. Floats are
-          represented as an attrset with attr "__type" = "float" and attr value
-          set to the string representation of the float. Hashes are represented
-          with attr "__type" = "hash" and attr value set to an attr set
-          corresponding to the hash.
+          repeats are represented by attr sets. bools, strings, ints, and
+          arrays are mapped directly. name-value pairs with repeats can be
+          generated by the config.lib.logstash.mkNameValuePairs function, which
+          takes a list of attrsets and combines them while preserving attribute
+          name duplicates if they occur. Similarly, there are the mkFloat and
+          mkHash functions, which take a string representation of a float and an
+          attrset, respectively.
         '';
         merge = mergeConfigs;
       };
@@ -125,7 +124,15 @@ in
 
   ###### implementation
 
-  config = mkIf cfg.enable {
+  config = mkMerge [ {
+    lib.logstash = {
+      mkFloat = stringRep: { __type = "float"; value = stringRep; };
+
+      mkHash = attrs: { __type = "hash"; value = attrs; };
+
+      mkNameValuePairs = mergeConfigs;
+    };
+  } ( mkIf cfg.enable {
     # Always log to stdout
     services.logstash.outputConfig = { stdout = {}; };
 
@@ -148,5 +155,5 @@ in
         }
       ''}";
     };
-  };
+  })];
 }
-- 
GitLab


From 8544ba285d8323f10914bbff12d97325a4a70068 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Thu, 12 Jul 2012 14:35:06 -0400
Subject: [PATCH 3798/5331] logstash: Fix sloppy description fields

---
 modules/services/logging/logstash.nix | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/modules/services/logging/logstash.nix b/modules/services/logging/logstash.nix
index 32e2f17d189..bb3b83dd230 100644
--- a/modules/services/logging/logstash.nix
+++ b/modules/services/logging/logstash.nix
@@ -86,12 +86,13 @@ in
       inputConfig = mkOption {
         default = {};
         description = ''
-          A nixexpr representing a logstash configuration's input section.
-          logstash configs are name-value pairs, where values can be bools,
+          An attribute set (or an expression generated by mkNameValuePairs)
+          representing a logstash configuration's input section.
+          Logstash configs are name-value pairs, where values can be bools,
           strings, numbers, arrays, hashes, or other name-value pairs,
-          and names are strings that can be repeated. name-value pairs with no
-          repeats are represented by attr sets. bools, strings, ints, and
-          arrays are mapped directly. name-value pairs with repeats can be
+          and names are strings that can be repeated. Name-value pairs with no
+          repeats are represented by attr sets. Bools, strings, ints, and
+          arrays are mapped directly. Name-value pairs with repeats can be
           generated by the config.lib.logstash.mkNameValuePairs function, which
           takes a list of attrsets and combines them while preserving attribute
           name duplicates if they occur. Similarly, there are the mkFloat and
@@ -104,7 +105,8 @@ in
       filterConfig = mkOption {
         default = {};
         description = ''
-          An attr set representing a logstash configuration's filter section.
+          An attribute set (or an expression generated by mkNameValuePairs)
+          representing a logstash configuration's filter section.
           See inputConfig description for details.
         '';
         merge = mergeConfigs;
@@ -113,7 +115,8 @@ in
       outputConfig = mkOption {
         default = {};
         description = ''
-          An attr set representing a logstash configuration's output section.
+          An attribute set (or an expression generated by mkNameValuePairs)
+          representing a logstash configuration's output section.
           See inputConfig description for details.
         '';
         merge = mergeConfigs;
-- 
GitLab


From 7fca8ceaf8fbb1fdb3e4dd08d40a8192281c3695 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 13 Jul 2012 10:41:48 -0400
Subject: [PATCH 3799/5331] /etc/login.defs: set the mode of new home
 directories to 700

---
 modules/programs/shadow.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/modules/programs/shadow.nix b/modules/programs/shadow.nix
index 3a348818a97..869f4f85fb4 100644
--- a/modules/programs/shadow.nix
+++ b/modules/programs/shadow.nix
@@ -21,6 +21,9 @@ let
       TTYGROUP     tty
       TTYPERM      0620
 
+      # Ensure privacy for newly created home directories.
+      UMASK        077
+
       # Uncomment this to allow non-root users to change their account
       #information.  This should be made configurable.
       #CHFN_RESTRICT frwh
-- 
GitLab


From 7e77dae45866813c9a1c061e6bc7c506d25df6ca Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 13 Jul 2012 11:48:47 -0400
Subject: [PATCH 3800/5331] sshd.nix: Create ~/.ssh/authorized_keys with the
 right ownership

---
 modules/services/networking/ssh/sshd.nix | 25 ++++++++++++++++--------
 1 file changed, 17 insertions(+), 8 deletions(-)

diff --git a/modules/services/networking/ssh/sshd.nix b/modules/services/networking/ssh/sshd.nix
index 53efc08cfb8..7f1cc24793e 100644
--- a/modules/services/networking/ssh/sshd.nix
+++ b/modules/services/networking/ssh/sshd.nix
@@ -103,25 +103,34 @@ let
         local authKeyFiles="$3"
         local preserveExisting="$4"
 
-        eval authfile=~$userName/.ssh/authorized_keys
-        mkdir -p "$(dirname $authfile)"
-        touch "$authfile"
+        eval homeDir=~$userName
+        if ! [ -d "$homeDir" ]; then
+          echo "User $userName does not exist"
+          return
+        fi
+        if ! [ -d "$homeDir/.ssh" ]; then
+          mkdir -v -m 700 "$homeDir/.ssh"
+          chown "$userName":users "$homeDir/.ssh"
+        fi
+        local authKeysFile="$homeDir/.ssh/authorized_keys"
+        touch "$authKeysFile"
         if [ "$preserveExisting" == false ]; then
-          rm -f "$authfile"
-          echo "${marker2}" > "$authfile"
+          rm -f "$authKeysFile"
+          echo "${marker2}" > "$authKeysFile"
         else
-          sed -i '/${marker1}/ d' "$authfile"
+          sed -i '/${marker1}/ d' "$authKeysFile"
         fi
         IFS=,
         for f in $authKeys; do
-          echo "$f ${marker1}" >> "$authfile"
+          echo "$f ${marker1}" >> "$authKeysFile"
         done
         unset IFS
         for f in $authKeyFiles; do
           if [ -f "$f" ]; then
-            echo "$(cat "$f") ${marker1}" >> "$authfile"
+            echo "$(cat "$f") ${marker1}" >> "$authKeysFile"
           fi
         done
+        chown "$userName" "$authKeysFile"
       }
 
       ${userLoop}
-- 
GitLab


From 57d74e6f4fa13cf1402536efa39250ea9e99a883 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 13 Jul 2012 17:59:03 -0400
Subject: [PATCH 3801/5331] openssh.authorizedKeys.keyFiles: allow multiple
 keys

Ugly hack to get around the error "a string that refers to a store
path cannot be appended to a path".  The underlying problem is that
you cannot do

  "${./file1} ${./file2}"

but you can do

  " ${./file1} ${./file2}"

Obviously we should allow the first case as well.
---
 modules/services/networking/ssh/sshd.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/services/networking/ssh/sshd.nix b/modules/services/networking/ssh/sshd.nix
index 7f1cc24793e..6791a6b3ea8 100644
--- a/modules/services/networking/ssh/sshd.nix
+++ b/modules/services/networking/ssh/sshd.nix
@@ -90,7 +90,7 @@ let
       userLoop = flip concatMapStrings usersWithKeys (u:
         let
           authKeys = concatStringsSep "," u.openssh.authorizedKeys.keys;
-          authKeyFiles = concatStringsSep " " u.openssh.authorizedKeys.keyFiles;
+          authKeyFiles = concatStrings (map (x: " ${x}") u.openssh.authorizedKeys.keyFiles);
           preserveExisting = if u.openssh.authorizedKeys.preserveExistingKeys then "true" else "false";
         in ''
           mkAuthKeysFile "${u.name}" "${authKeys}" "${authKeyFiles}" "${preserveExisting}"
-- 
GitLab


From e3337c7f05c198a4fddac1084a752b2413d64cbd Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Fri, 13 Jul 2012 23:54:41 -0400
Subject: [PATCH 3802/5331] Add module for b43 firmware

---
 modules/hardware/network/b43.nix | 30 ++++++++++++++++++++++++++++++
 modules/module-list.nix          |  1 +
 2 files changed, 31 insertions(+)
 create mode 100644 modules/hardware/network/b43.nix

diff --git a/modules/hardware/network/b43.nix b/modules/hardware/network/b43.nix
new file mode 100644
index 00000000000..077e0a1e11e
--- /dev/null
+++ b/modules/hardware/network/b43.nix
@@ -0,0 +1,30 @@
+{pkgs, config, ...}:
+
+let kernelVersion = config.boot.kernelPackages.kernel.version; in
+
+{
+
+  ###### interface
+
+  options = {
+
+    networking.enableB43Firmware = pkgs.lib.mkOption {
+      default = false;
+      type = pkgs.lib.types.bool;
+      description = ''
+        Turn on this option if you want firmware for the NICs supported by the b43 module.
+      '';
+    };
+
+  };
+
+
+  ###### implementation
+
+  config = pkgs.lib.mkIf config.networking.enableB43Firmware {
+    hardware.firmware = if builtins.lessThan (builtins.compareVersions kernelVersion "3.2") 0 then
+      throw "b43 firmware for kernels older than 3.2 not packaged yet!" else
+      [ pkgs.b43Firmware_5_1_138 ];
+  };
+
+}
diff --git a/modules/module-list.nix b/modules/module-list.nix
index dfc91a765be..1e5ec300df5 100644
--- a/modules/module-list.nix
+++ b/modules/module-list.nix
@@ -15,6 +15,7 @@
   ./config/unix-odbc-drivers.nix
   ./config/users-groups.nix
   ./hardware/cpu/intel-microcode.nix
+  ./hardware/network/b43.nix
   ./hardware/network/intel-2100bg.nix
   ./hardware/network/intel-2200bg.nix
   ./hardware/network/intel-3945abg.nix
-- 
GitLab


From c909ea920855c21beba3b9fca4b59432ca1ecc01 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Sat, 14 Jul 2012 18:02:46 -0400
Subject: [PATCH 3803/5331] multitouch: Add option to invert scroll

---
 modules/services/x11/hardware/multitouch.nix | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/modules/services/x11/hardware/multitouch.nix b/modules/services/x11/hardware/multitouch.nix
index 3aa2760f3f0..35e30ccf76b 100644
--- a/modules/services/x11/hardware/multitouch.nix
+++ b/modules/services/x11/hardware/multitouch.nix
@@ -14,6 +14,13 @@ with pkgs.lib;
         description = "Whether to enable multitouch touchpad support.";
       };
 
+      invertScroll = mkOption {
+        default = false;
+        example = true;
+        type = types.bool;
+        description = "Whether to invert scrolling direction à la OSX Lion";
+      };
+
     };
 
   };
@@ -29,6 +36,10 @@ with pkgs.lib;
           MatchIsTouchpad "on"
           Identifier "Touchpads"
           Driver "mtrack"
+          ${optionalString config.services.xserver.multitouch.invertScroll ''
+            Option "ScrollUpButton" "5"
+            Option "ScrollDownButton" "4"
+          ''}
         EndSection
       '';
 
-- 
GitLab


From 3d2b83c110c581aff72978e45b237e3aea28ef51 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Sat, 14 Jul 2012 21:40:49 -0400
Subject: [PATCH 3804/5331] multitouch: Add an option to ignore palm touches

---
 modules/services/x11/hardware/multitouch.nix | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/modules/services/x11/hardware/multitouch.nix b/modules/services/x11/hardware/multitouch.nix
index 35e30ccf76b..ea51a4fc55b 100644
--- a/modules/services/x11/hardware/multitouch.nix
+++ b/modules/services/x11/hardware/multitouch.nix
@@ -2,6 +2,8 @@
 
 with pkgs.lib;
 
+let cfg = config.services.xserver.multitouch; in
+
 {
 
   options = {
@@ -21,11 +23,18 @@ with pkgs.lib;
         description = "Whether to invert scrolling direction à la OSX Lion";
       };
 
+      ignorePalm = mkOption {
+        default = false;
+        example = true;
+        type = types.bool;
+        description = "Whether to ignore touches detected as being the palm (i.e when typing)";
+      };
+
     };
 
   };
 
-  config = mkIf config.services.xserver.multitouch.enable {
+  config = mkIf cfg.enable {
 
     services.xserver.modules = [ pkgs.xf86_input_mtrack ];
 
@@ -36,7 +45,8 @@ with pkgs.lib;
           MatchIsTouchpad "on"
           Identifier "Touchpads"
           Driver "mtrack"
-          ${optionalString config.services.xserver.multitouch.invertScroll ''
+          Option "IgnorePalm" "${if cfg.ignorePalm then "true" else "false"}"
+          ${optionalString cfg.invertScroll ''
             Option "ScrollUpButton" "5"
             Option "ScrollDownButton" "4"
           ''}
-- 
GitLab


From cdd8ecf9c7546944bd327790dd532b29b6521b55 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Mon, 16 Jul 2012 08:03:47 -0400
Subject: [PATCH 3805/5331] multitouch: Invert left-right scrolling when
 invertScroll is enabled

---
 modules/services/x11/hardware/multitouch.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/modules/services/x11/hardware/multitouch.nix b/modules/services/x11/hardware/multitouch.nix
index ea51a4fc55b..115d0e41a65 100644
--- a/modules/services/x11/hardware/multitouch.nix
+++ b/modules/services/x11/hardware/multitouch.nix
@@ -49,6 +49,8 @@ let cfg = config.services.xserver.multitouch; in
           ${optionalString cfg.invertScroll ''
             Option "ScrollUpButton" "5"
             Option "ScrollDownButton" "4"
+            Option "ScrollLeftButton" "7"
+            Option "ScrollLeftButton" "6"
           ''}
         EndSection
       '';
-- 
GitLab


From 8c24de13e4828cfd1c66ae0f3ae0d3c3a39c07fa Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Mon, 16 Jul 2012 08:11:44 -0400
Subject: [PATCH 3806/5331] D'oh

---
 modules/services/x11/hardware/multitouch.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/services/x11/hardware/multitouch.nix b/modules/services/x11/hardware/multitouch.nix
index 115d0e41a65..4f9048bfd91 100644
--- a/modules/services/x11/hardware/multitouch.nix
+++ b/modules/services/x11/hardware/multitouch.nix
@@ -50,7 +50,7 @@ let cfg = config.services.xserver.multitouch; in
             Option "ScrollUpButton" "5"
             Option "ScrollDownButton" "4"
             Option "ScrollLeftButton" "7"
-            Option "ScrollLeftButton" "6"
+            Option "ScrollRightButton" "6"
           ''}
         EndSection
       '';
-- 
GitLab


From 73532c38559b7bad2f6ff31bdef0d283ec75b543 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 16 Jul 2012 11:27:59 -0400
Subject: [PATCH 3807/5331] Global replace /var/run/current-system ->
 /run/current-system

---
 modules/config/shells.nix                            | 1 +
 modules/config/system-path.nix                       | 6 +++---
 modules/config/users-groups.nix                      | 2 +-
 modules/installer/cd-dvd/iso-image.nix               | 2 +-
 modules/installer/cd-dvd/system-tarball.nix          | 4 ++--
 modules/misc/crashdump.nix                           | 6 +++---
 modules/programs/bash/profile.sh                     | 6 +++---
 modules/programs/shadow.nix                          | 2 +-
 modules/services/misc/disnix.nix                     | 2 +-
 modules/services/monitoring/systemhealth.nix         | 4 ++--
 modules/services/network-filesystems/drbd.nix        | 2 +-
 modules/services/network-filesystems/samba.nix       | 2 +-
 modules/services/networking/ssh/sshd.nix             | 2 +-
 modules/services/scheduling/fcron.nix                | 4 ++--
 modules/services/ttys/mingetty.nix                   | 2 +-
 modules/services/x11/display-managers/kdm.nix        | 2 +-
 modules/services/x11/xfs.conf                        | 2 +-
 modules/system/activation/activation-script.nix      | 6 +++---
 modules/system/activation/switch-to-configuration.sh | 2 +-
 modules/system/boot/stage-2-init.sh                  | 2 +-
 modules/tasks/kbd.nix                                | 2 +-
 21 files changed, 32 insertions(+), 31 deletions(-)

diff --git a/modules/config/shells.nix b/modules/config/shells.nix
index 6286223752a..b0a946a8e6e 100644
--- a/modules/config/shells.nix
+++ b/modules/config/shells.nix
@@ -13,6 +13,7 @@ with pkgs.lib;
       { target = "shells";
         source = pkgs.writeText "shells"
           ''
+            /run/current-system/sw/bin/bash
             /var/run/current-system/sw/bin/bash
             /bin/sh
           '';
diff --git a/modules/config/system-path.nix b/modules/config/system-path.nix
index 9eab8dde473..38e5f076bcf 100644
--- a/modules/config/system-path.nix
+++ b/modules/config/system-path.nix
@@ -1,5 +1,5 @@
 # This module defines the packages that appear in
-# /var/run/current-system/sw.
+# /run/current-system/sw.
 
 { config, pkgs, ... }:
 
@@ -69,7 +69,7 @@ let
         example = "[ pkgs.icecat3 pkgs.thunderbird ]";
         description = ''
           The set of packages that appear in
-          /var/run/current-system/sw.  These packages are
+          /run/current-system/sw.  These packages are
           automatically available to all users, and are
           automatically updated every time you rebuild the system
           configuration.  (The latter is the main difference with
@@ -84,7 +84,7 @@ let
         default = [];
         example = ["/"];
         description = "
-          Lists directories to be symlinked in `/var/run/current-system/sw'.
+          Lists directories to be symlinked in `/run/current-system/sw'.
         ";
       };
     };
diff --git a/modules/config/users-groups.nix b/modules/config/users-groups.nix
index beb21734652..598d68eb91d 100644
--- a/modules/config/users-groups.nix
+++ b/modules/config/users-groups.nix
@@ -48,7 +48,7 @@ let
       
       shell = mkOption {
         type = with types; uniq string;
-        default = "/var/run/current-system/sw/sbin/nologin";
+        default = "/run/current-system/sw/sbin/nologin";
         description = "The path to the user's shell.";
       };
       
diff --git a/modules/installer/cd-dvd/iso-image.nix b/modules/installer/cd-dvd/iso-image.nix
index 99628b33bab..c1094daa49f 100644
--- a/modules/installer/cd-dvd/iso-image.nix
+++ b/modules/installer/cd-dvd/iso-image.nix
@@ -312,7 +312,7 @@ in
       # nixos-rebuild also requires a "system" profile and an
       # /etc/NIXOS tag.
       touch /etc/NIXOS
-      ${config.environment.nix}/bin/nix-env -p /nix/var/nix/profiles/system --set /var/run/current-system
+      ${config.environment.nix}/bin/nix-env -p /nix/var/nix/profiles/system --set /run/current-system
     '';
 
   # Add vfat support to the initrd to enable people to copy the
diff --git a/modules/installer/cd-dvd/system-tarball.nix b/modules/installer/cd-dvd/system-tarball.nix
index daffb94bc53..e0cbfd6e713 100644
--- a/modules/installer/cd-dvd/system-tarball.nix
+++ b/modules/installer/cd-dvd/system-tarball.nix
@@ -50,7 +50,7 @@ in
   # script and the top-level system configuration directory.
   tarball.storeContents =
     [ { object = config.system.build.toplevel;
-        symlink = "/var/run/current-system";
+        symlink = "/run/current-system";
       }
     ];
 
@@ -87,6 +87,6 @@ in
       # nixos-rebuild also requires a "system" profile and an
       # /etc/NIXOS tag.
       touch /etc/NIXOS
-      ${config.environment.nix}/bin/nix-env -p /nix/var/nix/profiles/system --set /var/run/current-system
+      ${config.environment.nix}/bin/nix-env -p /nix/var/nix/profiles/system --set /run/current-system
     '';
 }
diff --git a/modules/misc/crashdump.nix b/modules/misc/crashdump.nix
index fff459c9ab4..973abfd9327 100644
--- a/modules/misc/crashdump.nix
+++ b/modules/misc/crashdump.nix
@@ -48,9 +48,9 @@ in
   config = mkIf crashdump.enable {
     boot = {
       postBootCommands = ''
-        ${pkgs.kexectools}/sbin/kexec -p /var/run/current-system/kernel \
-        --initrd=/var/run/current-system/initrd \
-        --append="init=$(readlink -f /var/run/current-system/init) system=$(readlink -f /var/run/current-system) irqpoll maxcpus=1 reset_devices ${kernelParams}" --reset-vga --console-vga
+        ${pkgs.kexectools}/sbin/kexec -p /run/current-system/kernel \
+        --initrd=/run/current-system/initrd \
+        --append="init=$(readlink -f /run/current-system/init) system=$(readlink -f /run/current-system) irqpoll maxcpus=1 reset_devices ${kernelParams}" --reset-vga --console-vga
       '';
       kernelParams = [
        "crashkernel=64M"
diff --git a/modules/programs/bash/profile.sh b/modules/programs/bash/profile.sh
index 3da860388b1..1eef2a9e84a 100644
--- a/modules/programs/bash/profile.sh
+++ b/modules/programs/bash/profile.sh
@@ -12,8 +12,8 @@ __ETC_PROFILE_SOURCED=1
 export __ETC_PROFILE_DONE=1
 
 # Initialise a bunch of environment variables.
-export LOCALE_ARCHIVE=/var/run/current-system/sw/lib/locale/locale-archive
-export LD_LIBRARY_PATH=/var/run/opengl-driver/lib:/var/run/opengl-driver-32/lib # !!! only set if needed
+export LOCALE_ARCHIVE=/run/current-system/sw/lib/locale/locale-archive
+export LD_LIBRARY_PATH=/run/opengl-driver/lib:/run/opengl-driver-32/lib # !!! only set if needed
 export NIXPKGS_CONFIG=/etc/nix/nixpkgs-config.nix
 export NIX_PATH=/nix/var/nix/profiles/per-user/root/channels/nixos:nixpkgs=/etc/nixos/nixpkgs:nixos=/etc/nixos/nixos:nixos-config=/etc/nixos/configuration.nix:services=/etc/nixos/services
 export PAGER="less -R"
@@ -22,7 +22,7 @@ export LOCATE_PATH=/var/cache/locatedb
 
 # Include the various profiles in the appropriate environment variables.
 export NIX_USER_PROFILE_DIR=/nix/var/nix/profiles/per-user/$USER
-export NIX_PROFILES="/var/run/current-system/sw /nix/var/nix/profiles/default $HOME/.nix-profile"
+export NIX_PROFILES="/run/current-system/sw /nix/var/nix/profiles/default $HOME/.nix-profile"
 
 unset PATH INFOPATH PKG_CONFIG_PATH PERL5LIB ALSA_PLUGIN_DIRS GST_PLUGIN_PATH KDEDIRS
 unset QT_PLUGIN_PATH QTWEBKIT_PLUGIN_PATH STRIGI_PLUGIN_PATH XDG_CONFIG_DIRS XDG_DATA_DIRS
diff --git a/modules/programs/shadow.nix b/modules/programs/shadow.nix
index 869f4f85fb4..137064bba85 100644
--- a/modules/programs/shadow.nix
+++ b/modules/programs/shadow.nix
@@ -38,7 +38,7 @@ in
   options = {
 
     users.defaultUserShell = pkgs.lib.mkOption {
-      default = "/var/run/current-system/sw/bin/bash";
+      default = "/run/current-system/sw/bin/bash";
       description = ''
         This option defines the default shell assigned to user
         accounts.  This must not be a store path, since the path is
diff --git a/modules/services/misc/disnix.nix b/modules/services/misc/disnix.nix
index 645e92c39df..8d04c81ad68 100644
--- a/modules/services/misc/disnix.nix
+++ b/modules/services/misc/disnix.nix
@@ -130,7 +130,7 @@ in
         
           script =
           ''
-            export PATH=/var/run/current-system/sw/bin:/var/run/current-system/sw/sbin
+            export PATH=/run/current-system/sw/bin:/run/current-system/sw/sbin
             export HOME=/root
 
             ${pkgs.disnix}/bin/disnix-service --activation-modules-dir=${disnix_activation_scripts}/libexec/disnix/activation-scripts
diff --git a/modules/services/monitoring/systemhealth.nix b/modules/services/monitoring/systemhealth.nix
index 71389be5b2f..0a3e666ad4e 100644
--- a/modules/services/monitoring/systemhealth.nix
+++ b/modules/services/monitoring/systemhealth.nix
@@ -86,8 +86,8 @@ in
         [paths]
         rrdtool = ${pkgs.rrdtool}/bin/rrdtool
         loadavg_rrd = loadavg
-        ps = /var/run/current-system/sw/bin/ps
-        df = /var/run/current-system/sw/bin/df
+        ps = /run/current-system/sw/bin/ps
+        df = /run/current-system/sw/bin/df
         meminfo_rrd = meminfo
         uptime_rrd = uptime
         rrd_path = ${rrdDir}
diff --git a/modules/services/network-filesystems/drbd.nix b/modules/services/network-filesystems/drbd.nix
index 1c70d44f6ba..1a00ccab0a6 100644
--- a/modules/services/network-filesystems/drbd.nix
+++ b/modules/services/network-filesystems/drbd.nix
@@ -44,7 +44,7 @@ let cfg = config.services.drbd; in
 
     boot.extraModprobeConfig =
       ''
-        options drbd usermode_helper=/var/run/current-system/sw/sbin/drbdadm
+        options drbd usermode_helper=/run/current-system/sw/sbin/drbdadm
       '';
 
     environment.etc = singleton
diff --git a/modules/services/network-filesystems/samba.nix b/modules/services/network-filesystems/samba.nix
index 7461d12d78b..2cf4e8c11ff 100644
--- a/modules/services/network-filesystems/samba.nix
+++ b/modules/services/network-filesystems/samba.nix
@@ -70,7 +70,7 @@ let
       environment = {
         LD_LIBRARY_PATH = nssModulesPath;
         TZ = config.time.timeZone;
-        LOCALE_ARCHIVE = "/var/run/current-system/sw/lib/locale/locale-archive";
+        LOCALE_ARCHIVE = "/run/current-system/sw/lib/locale/locale-archive";
       };
 
       daemonType = "fork";
diff --git a/modules/services/networking/ssh/sshd.nix b/modules/services/networking/ssh/sshd.nix
index 6791a6b3ea8..ea60e591c14 100644
--- a/modules/services/networking/ssh/sshd.nix
+++ b/modules/services/networking/ssh/sshd.nix
@@ -323,7 +323,7 @@ in
         environment = {
           LD_LIBRARY_PATH = nssModulesPath;
           # Duplicated from bashrc. OpenSSH needs a patch for this.
-          LOCALE_ARCHIVE = "/var/run/current-system/sw/lib/locale/locale-archive";
+          LOCALE_ARCHIVE = "/run/current-system/sw/lib/locale/locale-archive";
         };
 
         path = [ pkgs.openssh pkgs.gnused ];
diff --git a/modules/services/scheduling/fcron.nix b/modules/services/scheduling/fcron.nix
index 6d274bf5973..812af1edfc0 100644
--- a/modules/services/scheduling/fcron.nix
+++ b/modules/services/scheduling/fcron.nix
@@ -87,7 +87,7 @@ in
             fcrondeny   =       /etc/fcron.deny
             shell       =       /bin/sh
             sendmail    =       /var/setuid-wrappers/sendmail
-            editor      =       /var/run/current-system/sw/bin/vi
+            editor      =       /run/current-system/sw/bin/vi
           '';
           target = "fcron.conf";
           mode = "0600"; # max allowed is 644
@@ -104,7 +104,7 @@ in
         startOn = "startup and filesystem";
 
         environment =
-          { PATH = "/var/run/current-system/sw/bin";
+          { PATH = "/run/current-system/sw/bin";
           };
 
         preStart =
diff --git a/modules/services/ttys/mingetty.nix b/modules/services/ttys/mingetty.nix
index 85db3f8966e..e5dbc07aeb0 100644
--- a/modules/services/ttys/mingetty.nix
+++ b/modules/services/ttys/mingetty.nix
@@ -69,7 +69,7 @@ with pkgs.lib;
 
       exec = "mingetty --loginprog=${pkgs.shadow}/bin/login --noclear ${tty}";
 
-      environment.LOCALE_ARCHIVE = "/var/run/current-system/sw/lib/locale/locale-archive";
+      environment.LOCALE_ARCHIVE = "/run/current-system/sw/lib/locale/locale-archive";
 
     }) config.services.mingetty.ttys);
 
diff --git a/modules/services/x11/display-managers/kdm.nix b/modules/services/x11/display-managers/kdm.nix
index fe7802100b2..838a4ed9033 100644
--- a/modules/services/x11/display-managers/kdm.nix
+++ b/modules/services/x11/display-managers/kdm.nix
@@ -106,7 +106,7 @@ in
             mkdir -m 0755 -p /var/lib/kdm
             chown kdm /var/lib/kdm
             ${(optionalString (config.system.boot.loader.id == "grub") "PATH=${config.system.build.grub}/sbin:$PATH ") +
-              "KDEDIRS=/var/run/current-system/sw exec ${kdebase_workspace}/bin/kdm -config ${kdmrc} -nodaemon"}
+              "KDEDIRS=/run/current-system/sw exec ${kdebase_workspace}/bin/kdm -config ${kdmrc} -nodaemon"}
           '';
         logsXsession = true;
       };
diff --git a/modules/services/x11/xfs.conf b/modules/services/x11/xfs.conf
index 5352d74faa0..13dcf803db2 100644
--- a/modules/services/x11/xfs.conf
+++ b/modules/services/x11/xfs.conf
@@ -12,4 +12,4 @@ default-resolutions = 75,75,100,100
 cache-hi-mark = 2048
 cache-low-mark = 1433
 cache-balance = 70
-catalogue = /var/run/current-system/sw/share/X11-fonts/
+catalogue = /run/current-system/sw/share/X11-fonts/
diff --git a/modules/system/activation/activation-script.nix b/modules/system/activation/activation-script.nix
index 083e3767ed8..41c3ced1bc2 100644
--- a/modules/system/activation/activation-script.nix
+++ b/modules/system/activation/activation-script.nix
@@ -74,12 +74,12 @@ in
 
             # Make this configuration the current configuration.
             # The readlink is there to ensure that when $systemConfig = /system
-            # (which is a symlink to the store), /var/run/current-system is still
+            # (which is a symlink to the store), /run/current-system is still
             # used as a garbage collection root.
-            ln -sfn "$(readlink -f "$systemConfig")" /var/run/current-system
+            ln -sfn "$(readlink -f "$systemConfig")" /run/current-system
 
             # Prevent the current configuration from being garbage-collected.
-            ln -sfn /var/run/current-system /nix/var/nix/gcroots/current-system
+            ln -sfn /run/current-system /nix/var/nix/gcroots/current-system
           '';
       };
 
diff --git a/modules/system/activation/switch-to-configuration.sh b/modules/system/activation/switch-to-configuration.sh
index da1471cf550..62af63ec39f 100644
--- a/modules/system/activation/switch-to-configuration.sh
+++ b/modules/system/activation/switch-to-configuration.sh
@@ -59,7 +59,7 @@ fi
 # Activate the new configuration.
 if [ "$action" != switch -a "$action" != test ]; then exit 0; fi
 
-oldVersion=$(cat /var/run/current-system/upstart-interface-version 2> /dev/null || echo 0)
+oldVersion=$(cat /run/current-system/upstart-interface-version 2> /dev/null || echo 0)
 newVersion=$(cat @out@/upstart-interface-version 2> /dev/null || echo 0)
 
 if test "$oldVersion" -ne "$newVersion"; then
diff --git a/modules/system/boot/stage-2-init.sh b/modules/system/boot/stage-2-init.sh
index c252b221dfb..51f7bbe8f72 100644
--- a/modules/system/boot/stage-2-init.sh
+++ b/modules/system/boot/stage-2-init.sh
@@ -189,4 +189,4 @@ fi
 
 # Start Upstart's init.
 echo "starting Upstart..."
-PATH=/var/run/current-system/upstart/sbin exec init --no-sessions ${debug2:+--verbose}
+PATH=/run/current-system/upstart/sbin exec init --no-sessions ${debug2:+--verbose}
diff --git a/modules/tasks/kbd.nix b/modules/tasks/kbd.nix
index 62c4b92ed09..d9e820ef9e7 100644
--- a/modules/tasks/kbd.nix
+++ b/modules/tasks/kbd.nix
@@ -65,7 +65,7 @@ in
 
         script = ''
           export LANG=${defaultLocale}
-          export LOCALE_ARCHIVE=/var/run/current-system/sw/lib/locale/locale-archive
+          export LOCALE_ARCHIVE=/run/current-system/sw/lib/locale/locale-archive
           export PATH=${pkgs.gzip}/bin:$PATH # Needed by setfont
 
           set +e # continue in case of errors
-- 
GitLab


From 98459eb6753ccbe9babc61fb9d88c8e329dbf238 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 16 Jul 2012 11:30:37 -0400
Subject: [PATCH 3808/5331] Global replace /var/run/booted-system ->
 /run/booted-system

---
 modules/services/logging/klogd.nix  | 2 +-
 modules/system/boot/modprobe.nix    | 2 +-
 modules/system/boot/stage-2-init.sh | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/modules/services/logging/klogd.nix b/modules/services/logging/klogd.nix
index af21f9cc959..907d83c7a6a 100644
--- a/modules/services/logging/klogd.nix
+++ b/modules/services/logging/klogd.nix
@@ -13,7 +13,7 @@
 
       exec =
         "klogd -c 1 -2 -n " +
-        "-k $(dirname $(readlink -f /var/run/booted-system/kernel))/System.map";
+        "-k $(dirname $(readlink -f /run/booted-system/kernel))/System.map";
     };
 
 }
diff --git a/modules/system/boot/modprobe.nix b/modules/system/boot/modprobe.nix
index f210ecec26d..41252e2ba0c 100644
--- a/modules/system/boot/modprobe.nix
+++ b/modules/system/boot/modprobe.nix
@@ -24,7 +24,7 @@ with pkgs.lib;
             # modules in the current configuration don't match the
             # running kernel.
             if [ ! -d "$MODULE_DIR/$(${pkgs.coreutils}/bin/uname -r)" ]; then
-                MODULE_DIR=/var/run/booted-system/kernel-modules/lib/modules/
+                MODULE_DIR=/run/booted-system/kernel-modules/lib/modules/
             fi
 
             exec ${pkgs.module_init_tools}/sbin/modprobe "$@"
diff --git a/modules/system/boot/stage-2-init.sh b/modules/system/boot/stage-2-init.sh
index 51f7bbe8f72..0a42083144d 100644
--- a/modules/system/boot/stage-2-init.sh
+++ b/modules/system/boot/stage-2-init.sh
@@ -155,12 +155,12 @@ $systemConfig/activate
 
 
 # Record the boot configuration.
-ln -sfn "$systemConfig" /var/run/booted-system
+ln -sfn "$systemConfig" /run/booted-system
 
 # Prevent the booted system form being garbage-collected If it weren't
 # a gcroot, if we were running a different kernel, switched system,
 # and garbage collected all, we could not load kernel modules anymore.
-ln -sfn /var/run/booted-system /nix/var/nix/gcroots/booted-system
+ln -sfn /run/booted-system /nix/var/nix/gcroots/booted-system
 
 
 # Run any user-specified commands.
-- 
GitLab


From 1d5748942771c6d39df0030e36819b47002d460a Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 16 Jul 2012 11:32:26 -0400
Subject: [PATCH 3809/5331] Global replace /var/run/opengl-driver ->
 /run/opengl-driver

---
 modules/services/x11/xserver.nix | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/modules/services/x11/xserver.nix b/modules/services/x11/xserver.nix
index 2ae42f5b41b..97424308c27 100644
--- a/modules/services/x11/xserver.nix
+++ b/modules/services/x11/xserver.nix
@@ -407,21 +407,21 @@ in
 
         preStart =
           ''
-            rm -f /var/run/opengl-driver
-            rm -f /var/run/opengl-driver-32
+            rm -f /run/opengl-driver
+            rm -f /run/opengl-driver-32
             ${# !!! The OpenGL driver depends on what's detected at runtime.
               if elem "nvidia" driverNames then
                 ''
-                  ln -sf ${kernelPackages.nvidia_x11} /var/run/opengl-driver
+                  ln -sf ${kernelPackages.nvidia_x11} /run/opengl-driver
                   ${optionalString (pkgs.stdenv.system == "x86_64-linux" && cfg.driSupport32Bit)
-                    "ln -sf ${pkgs_i686.linuxPackages.nvidia_x11.override { libsOnly = true; kernel = null; } } /var/run/opengl-driver-32"}
+                    "ln -sf ${pkgs_i686.linuxPackages.nvidia_x11.override { libsOnly = true; kernel = null; } } /run/opengl-driver-32"}
                 ''
               else if elem "nvidiaLegacy96" driverNames then
-                "ln -sf ${kernelPackages.nvidia_x11_legacy96} /var/run/opengl-driver"
+                "ln -sf ${kernelPackages.nvidia_x11_legacy96} /run/opengl-driver"
               else if elem "nvidiaLegacy173" driverNames then
-                "ln -sf ${kernelPackages.nvidia_x11_legacy173} /var/run/opengl-driver"
+                "ln -sf ${kernelPackages.nvidia_x11_legacy173} /run/opengl-driver"
               else if cfg.driSupport then
-                "ln -sf ${pkgs.mesa} /var/run/opengl-driver"
+                "ln -sf ${pkgs.mesa} /run/opengl-driver"
               else ""
             }
 
-- 
GitLab


From 94daecd90b237625955528c1f20cb4cd4b7dd692 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 16 Jul 2012 17:32:26 -0400
Subject: [PATCH 3810/5331] save-hwclock.service: support
 time.hardwareClockInLocalTime

---
 modules/system/boot/shutdown.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/system/boot/shutdown.nix b/modules/system/boot/shutdown.nix
index 3af8e3e4b29..1335429b669 100644
--- a/modules/system/boot/shutdown.nix
+++ b/modules/system/boot/shutdown.nix
@@ -18,7 +18,7 @@ with pkgs.lib;
 
           [Service]
           Type=oneshot
-          ExecStart=${pkgs.utillinux}/sbin/hwclock --systohc --utc
+          ExecStart=${pkgs.utillinux}/sbin/hwclock --systohc ${if config.time.hardwareClockInLocalTime then "--localtime" else "--utc"}
         '';
     };
   
-- 
GitLab


From 917e53a2d255885835814e7ff30708facca4ca88 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 16 Jul 2012 17:47:11 -0400
Subject: [PATCH 3811/5331] Update units names for systemd-186

---
 modules/system/boot/systemd.nix | 24 +++++++++++-------------
 1 file changed, 11 insertions(+), 13 deletions(-)

diff --git a/modules/system/boot/systemd.nix b/modules/system/boot/systemd.nix
index 6976a204e7f..d7684c7ecb2 100644
--- a/modules/system/boot/systemd.nix
+++ b/modules/system/boot/systemd.nix
@@ -140,9 +140,9 @@ let
       "time-sync.target"
 
       # Udev.
-      "systemd-udev-control.socket"
-      "systemd-udev-kernel.socket"
-      "systemd-udev.service"
+      "systemd-udevd-control.socket"
+      "systemd-udevd-kernel.socket"
+      "systemd-udevd.service"
       "systemd-udev-settle.service"
       "systemd-udev-trigger.service"
 
@@ -157,6 +157,7 @@ let
       # Journal.
       "systemd-journald.socket"
       "systemd-journald.service"
+      "syslog.socket"
 
       # SysV init compatibility.
       "systemd-initctl.socket"
@@ -178,8 +179,8 @@ let
       "systemd-update-utmp-shutdown.service"
       
       # Filesystems.
-      "fsck@.service"
-      "fsck-root.service"
+      "systemd-fsck@.service"
+      "systemd-fsck-root.service"
       "systemd-remount-fs.service"
       "local-fs.target"
       "local-fs-pre.target"
@@ -194,18 +195,18 @@ let
 
       # Hibernate / suspend.
       "hibernate.target"
-      "hibernate.service"
+      "systemd-hibernate.service"
       "suspend.target"
-      "suspend.service"
+      "systemd-suspend.service"
       "sleep.target"
 
       # Reboot stuff.
       "reboot.target"
-      "reboot.service"
+      "systemd-reboot.service"
       "poweroff.target"
-      "poweroff.service"
+      "systemd-poweroff.service"
       "halt.target"
-      "halt.service"
+      "systemd-halt.service"
       "ctrl-alt-del.target"
       "shutdown.target"
       "umount.target"
@@ -216,9 +217,6 @@ let
       "systemd-ask-password-console.service"
       "systemd-ask-password-wall.path"
       "systemd-ask-password-wall.service"
-
-      # Misc.
-      "syslog.socket"
     ];
 
   upstreamWants =
-- 
GitLab


From 4553a27a926c0eef241e0f081ccbb97e2310beeb Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 17 Jul 2012 12:59:36 +0200
Subject: [PATCH 3812/5331] modules/security/pam.nix: add xscreensaver to the
 list of services

---
 modules/security/pam.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/modules/security/pam.nix b/modules/security/pam.nix
index 4fab7febc71..dc18ffd7d02 100644
--- a/modules/security/pam.nix
+++ b/modules/security/pam.nix
@@ -238,6 +238,7 @@ in
         { name = "sshd"; }
         { name = "vlock"; }
         { name = "xlock"; }
+        { name = "xscreensaver"; }
       ];
 
   };
-- 
GitLab


From f43033a3f764261781b065283150700ac2943fc3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= <viric@viric.name>
Date: Wed, 18 Jul 2012 21:50:18 +0200
Subject: [PATCH 3813/5331] crashdump: it required some kernel options for the
 nmi_watchdog to work.

Now it says at boot, for every core:
NMI watchdog: enabled, takes one hw-pmu counter.
---
 modules/misc/crashdump.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/modules/misc/crashdump.nix b/modules/misc/crashdump.nix
index 973abfd9327..98b2140a23d 100644
--- a/modules/misc/crashdump.nix
+++ b/modules/misc/crashdump.nix
@@ -54,7 +54,7 @@ in
       '';
       kernelParams = [
        "crashkernel=64M"
-       "nmi_watchdog=1"
+       "nmi_watchdog=panic"
       ];
       kernelPackages = mkOverride 50 (crashdump.kernelPackages // {
         kernel = crashdump.kernelPackages.kernel.override 
@@ -64,6 +64,8 @@ in
                 CRASH_DUMP y
                 DEBUG_INFO y
                 PROC_VMCORE y
+                LOCKUP_DETECTOR y
+                HARDLOCKUP_DETECTOR y
               '';
           });
       });
-- 
GitLab


From 63742a942e5cbf1d254f89506b382a0524237a3a Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 18 Jul 2012 17:08:27 -0400
Subject: [PATCH 3814/5331] Don't create /var/log/upstart/<jobname> unless
 necessary

---
 modules/system/upstart/upstart.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/modules/system/upstart/upstart.nix b/modules/system/upstart/upstart.nix
index 1bfde9fc60e..961b3ad3cba 100644
--- a/modules/system/upstart/upstart.nix
+++ b/modules/system/upstart/upstart.nix
@@ -487,11 +487,11 @@ in
     services.dbus.packages = [ upstart ];
 
     system.activationScripts.chownJobLogs = stringAfter ["var"] 
-    (concatMapStrings (job: ''
-      touch /var/log/upstart/${job.name}
-      ${optionalString (job.setuid != "") "chown ${job.setuid} /var/log/upstart/${job.name}"}
-      ${optionalString (job.setgid != "") "chown :${job.setgid} /var/log/upstart/${job.name}"}
-    '') (attrValues config.jobs));
+      (concatMapStrings (job: optionalString (job.setuid != "" || job.setgid != "") ''
+        touch /var/log/upstart/${job.name}
+        ${optionalString (job.setuid != "") "chown ${job.setuid} /var/log/upstart/${job.name}"}
+        ${optionalString (job.setgid != "") "chown :${job.setgid} /var/log/upstart/${job.name}"}
+      '') (attrValues config.jobs));
 
   };
 
-- 
GitLab


From 425ec4cb00d09a0803d9cc8cdbc554661c704a8a Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 19 Jul 2012 12:48:30 -0400
Subject: [PATCH 3815/5331] syslogd: Make it work with systemd

Also made syslogd optional (and disabled by default).
---
 modules/services/logging/syslogd.nix | 32 ++++++++++++++++++++--------
 1 file changed, 23 insertions(+), 9 deletions(-)

diff --git a/modules/services/logging/syslogd.nix b/modules/services/logging/syslogd.nix
index bfe7352122c..2136aaa5586 100644
--- a/modules/services/logging/syslogd.nix
+++ b/modules/services/logging/syslogd.nix
@@ -36,6 +36,15 @@ in
 
     services.syslogd = {
 
+      enable = mkOption {
+        type = types.bool;
+        default = false;
+        description = ''
+          Whether to enable syslogd.  Note that systemd also logs
+          syslog messages, so you normally don't need to run syslogd.
+        '';
+      };
+
       tty = mkOption {
         type = types.uniq types.string;
         default = "tty10";
@@ -89,22 +98,27 @@ in
 
   ###### implementation
 
-  config = {
+  config = mkIf cfg.enable {
+
+    environment.systemPackages = [ pkgs.sysklogd ];
 
     services.syslogd.extraParams = optional cfg.enableNetworkInput "-r";
 
-    jobs.syslogd =
+    boot.systemd.services."syslog.service" =
       { description = "Syslog daemon";
+      
+        requires = [ "syslog.socket" ];
 
-        #startOn = "started udev";
-
-        environment = { TZ = config.time.timeZone; };
-
-        daemonType = "fork";
+        wantedBy = [ "multi-user.target" "syslog.target" ];
 
-        path = [ pkgs.sysklogd ];
+        environment.TZ = config.time.timeZone;
 
-        exec = "syslogd ${toString cfg.extraParams} -f ${syslogConf}";
+        serviceConfig =
+          ''
+            ExecStart=${pkgs.sysklogd}/sbin/syslogd ${toString cfg.extraParams} -f ${syslogConf} -n
+            # Prevent syslogd output looping back through journald.
+            StandardOutput=null
+          '';
       };
 
   };
-- 
GitLab


From 6419172bc2c3b07c6769479a7cfc07806143e32b Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 19 Jul 2012 17:32:50 -0400
Subject: [PATCH 3816/5331] journald: enable logging to the console

---
 modules/system/boot/systemd.nix          | 43 +++++++++++++++++++-----
 modules/testing/test-instrumentation.nix | 11 ++----
 2 files changed, 36 insertions(+), 18 deletions(-)

diff --git a/modules/system/boot/systemd.nix b/modules/system/boot/systemd.nix
index d7684c7ecb2..2b32c94262e 100644
--- a/modules/system/boot/systemd.nix
+++ b/modules/system/boot/systemd.nix
@@ -295,21 +295,21 @@ let
     
   units = pkgs.runCommand "units" { preferLocalBuild = true; }
     ''
-      mkdir -p $out/system
+      mkdir -p $out
       for i in ${toString upstreamUnits}; do
         fn=${systemd}/example/systemd/system/$i
         [ -e $fn ]
         if [ -L $fn ]; then
-          cp -pd $fn $out/system/
+          cp -pd $fn $out/
         else
-          ln -s $fn $out/system
+          ln -s $fn $out/
         fi
       done
       
       for i in ${toString upstreamWants}; do
         fn=${systemd}/example/systemd/system/$i
         [ -e $fn ]
-        x=$out/system/$(basename $fn)
+        x=$out/$(basename $fn)
         mkdir $x
         for i in $fn/*; do
           y=$x/$(basename $i)
@@ -319,16 +319,16 @@ let
       done
       
       for i in ${toString nixosUnits}; do
-        cp $i/* $out/system
+        cp $i/* $out/
       done
 
       ${concatStrings (mapAttrsToList (name: unit:
           concatMapStrings (name2: ''
-            mkdir -p $out/system/${name2}.wants
-            ln -sfn ../${name} $out/system/${name2}.wants/
+            mkdir -p $out/${name2}.wants
+            ln -sfn ../${name} $out/${name2}.wants/
           '') unit.wantedBy) cfg.units)}
 
-      ln -s ${cfg.defaultUnit} $out/system/default.target
+      ln -s ${cfg.defaultUnit} $out/default.target
     ''; # */
     
 in
@@ -373,6 +373,18 @@ in
       type = types.uniq types.string;
       description = "Default unit started when the system boots.";
     };
+
+    services.journald.logKernelMessages = mkOption {
+      default = true;
+      type = types.bool;
+      description = "Whether to log kernel messages.";
+    };
+    
+    services.journald.console = mkOption {
+      default = "";
+      type = types.uniq types.string;
+      description = "If non-empty, write log messages to the specified TTY device.  Defaults to /dev/console.";
+    };
     
   };
 
@@ -389,7 +401,20 @@ in
   
     environment.etc =
       [ { source = units;
-          target = "systemd";
+          target = "systemd/system";
+        }
+        { source = pkgs.writeText "journald.conf"
+            ''
+              [Journal]
+              ${optionalString (config.services.journald.console != "") ''
+                ForwardToConsole=yes
+                TTYPath=${config.services.journald.console}
+              ''}
+              ${optionalString config.services.journald.logKernelMessages ''
+                ImportKernel=yes
+              ''}
+            '';
+          target = "systemd/journald.conf";
         }
       ];
 
diff --git a/modules/testing/test-instrumentation.nix b/modules/testing/test-instrumentation.nix
index ce9c1cea743..c81f6eaac65 100644
--- a/modules/testing/test-instrumentation.nix
+++ b/modules/testing/test-instrumentation.nix
@@ -66,15 +66,8 @@ with pkgs.lib;
     # `xwininfo' is used by the test driver to query open windows.
     environment.systemPackages = [ pkgs.xorg.xwininfo ];
 
-    # Send all of /var/log/messages to the serial port.
-    services.syslogd.extraConfig = "*.* /dev/ttyS0";
-
-    # Disable "-- MARK --" messages.  These prevent hanging tests from
-    # being killed after 1 hour of silence.
-    services.syslogd.extraParams = [ "-m 0" ];
-
-    # Don't run klogd.  Kernel messages appear on the serial console anyway.
-    jobs.klogd.startOn = mkOverride 50 "";
+    # Log everything to the serial console.
+    services.journald.console = "/dev/console";
 
     # Prevent tests from accessing the Internet.
     networking.defaultGateway = mkOverride 150 "";
-- 
GitLab


From ae62436697d75dff839bbfb12bba2d6b1a8136a1 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 19 Jul 2012 17:33:22 -0400
Subject: [PATCH 3817/5331] Random changes

---
 modules/services/logging/syslogd.nix     | 1 +
 modules/services/networking/ssh/sshd.nix | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/modules/services/logging/syslogd.nix b/modules/services/logging/syslogd.nix
index 2136aaa5586..a3aff9a30d3 100644
--- a/modules/services/logging/syslogd.nix
+++ b/modules/services/logging/syslogd.nix
@@ -104,6 +104,7 @@ in
 
     services.syslogd.extraParams = optional cfg.enableNetworkInput "-r";
 
+    # FIXME: restarting syslog seems to break journal logging.
     boot.systemd.services."syslog.service" =
       { description = "Syslog daemon";
       
diff --git a/modules/services/networking/ssh/sshd.nix b/modules/services/networking/ssh/sshd.nix
index d89978a852c..0ef1f09f4d6 100644
--- a/modules/services/networking/ssh/sshd.nix
+++ b/modules/services/networking/ssh/sshd.nix
@@ -330,7 +330,7 @@ in
       };
     
     boot.systemd.services."sshd.service" =
-      { description = "SSH daemon";
+      { description = "SSH Daemon";
 
         wantedBy = [ "multi-user.target" ];
         after = [ "set-ssh-keys.service" ];
-- 
GitLab


From 02e37ba6b006414e528b53020fee99507e0e4c51 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 19 Jul 2012 17:41:42 -0400
Subject: [PATCH 3818/5331] Shorten filenames of start scripts to make log
 messages more readable

---
 modules/system/boot/systemd.nix    |  6 ++++--
 modules/system/upstart/upstart.nix | 12 +++++++-----
 2 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/modules/system/boot/systemd.nix b/modules/system/boot/systemd.nix
index 2b32c94262e..b4104980618 100644
--- a/modules/system/boot/systemd.nix
+++ b/modules/system/boot/systemd.nix
@@ -255,6 +255,8 @@ let
       KillSignal=SIGHUP
     '';
 
+  makeJobScript = name: content: "${pkgs.writeScriptBin name content}/bin/${name}";
+
   serviceToUnit = name: def:
     { inherit (def) wantedBy;
 
@@ -274,14 +276,14 @@ let
           ${concatMapStrings (n: "Environment=${n}=${getAttr n def.environment}\n") (attrNames def.environment)}
           
           ${optionalString (def.preStart != "") ''
-            ExecStartPre=${pkgs.writeScript "${name}-prestart.sh" ''
+            ExecStartPre=${makeJobScript "${name}-prestart.sh" ''
               #! ${pkgs.stdenv.shell} -e
               ${def.preStart}
             ''}
           ''}
 
           ${optionalString (def.script != "") ''
-            ExecStart=${pkgs.writeScript "${name}.sh" ''
+            ExecStart=${makeJobScript "${name}.sh" ''
               #! ${pkgs.stdenv.shell} -e
               ${def.script}
             ''}
diff --git a/modules/system/upstart/upstart.nix b/modules/system/upstart/upstart.nix
index de60f693e83..cbefad21414 100644
--- a/modules/system/upstart/upstart.nix
+++ b/modules/system/upstart/upstart.nix
@@ -12,6 +12,8 @@ let
   groupExists = g:
     (g == "") || any (gg: gg.name == g) (attrValues config.users.extraGroups);
 
+  makeJobScript = name: content: "${pkgs.writeScriptBin name content}/bin/${name}";
+
   # From a job description, generate an systemd unit file.
   makeUnit = job:
 
@@ -20,13 +22,13 @@ let
 
       env = config.system.upstartEnvironment // job.environment;
 
-      preStartScript = pkgs.writeScript "${job.name}-pre-start.sh"
+      preStartScript = makeJobScript "${job.name}-pre-start.sh"
         ''
           #! ${pkgs.stdenv.shell} -e
           ${job.preStart}
         '';
 
-      startScript = pkgs.writeScript "${job.name}-start.sh"
+      startScript = makeJobScript "${job.name}-start.sh"
         ''
           #! ${pkgs.stdenv.shell} -e
           ${if job.script != "" then job.script else ''
@@ -34,19 +36,19 @@ let
           ''}
         '';
 
-      postStartScript = pkgs.writeScript "${job.name}-post-start.sh"
+      postStartScript = makeJobScript "${job.name}-post-start.sh"
         ''
           #! ${pkgs.stdenv.shell} -e
           ${job.postStart}
         '';
 
-      preStopScript = pkgs.writeScript "${job.name}-pre-stop.sh"
+      preStopScript = makeJobScript "${job.name}-pre-stop.sh"
         ''
           #! ${pkgs.stdenv.shell} -e
           ${job.preStop}
         '';
 
-      postStopScript = pkgs.writeScript "${job.name}-post-stop.sh"
+      postStopScript = makeJobScript "${job.name}-post-stop.sh"
         ''
           #! ${pkgs.stdenv.shell} -e
           ${job.postStop}
-- 
GitLab


From 41cb04f793d4f54ab131934cfac8ca857d61c352 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 20 Jul 2012 11:36:09 -0400
Subject: [PATCH 3819/5331] Implement serial-getty@.service

---
 modules/services/ttys/agetty.nix | 39 ++++++++++++++++++++++++++++++++
 1 file changed, 39 insertions(+)

diff --git a/modules/services/ttys/agetty.nix b/modules/services/ttys/agetty.nix
index 42d276c9666..a0e53eeaef4 100644
--- a/modules/services/ttys/agetty.nix
+++ b/modules/services/ttys/agetty.nix
@@ -21,6 +21,7 @@ with pkgs.lib;
         '';
       };
 
+      # FIXME: not implemented with systemd
       waitOnMounts = mkOption {
         default = false;
         description = ''
@@ -56,6 +57,9 @@ with pkgs.lib;
 
   config = {
 
+    # FIXME: these are mostly copy/pasted from the systemd sources,
+    # which some small modifications, which is annoying.
+
     # Generate a separate job for each tty.
     boot.systemd.units."getty@.service".text =
       ''
@@ -70,6 +74,8 @@ with pkgs.lib;
         Before=getty.target
         IgnoreOnIsolate=yes
 
+        ConditionPathExists=/dev/tty0
+
         [Service]
         Environment=TERM=linux
         Environment=LOCALE_ARCHIVE=/run/current-system/sw/lib/locale/locale-archive
@@ -90,6 +96,39 @@ with pkgs.lib;
         KillSignal=SIGHUP
       '';
     
+    boot.systemd.units."serial-getty@.service".text =
+      ''
+        [Unit]
+        Description=Serial Getty on %I
+        Documentation=man:agetty(8) man:systemd-getty-generator(8)
+        BindsTo=dev-%i.device
+        After=dev-%i.device systemd-user-sessions.service plymouth-quit-wait.service
+
+        # If additional gettys are spawned during boot then we should make
+        # sure that this is synchronized before getty.target, even though
+        # getty.target didn't actually pull it in.
+        Before=getty.target
+        IgnoreOnIsolate=yes
+
+        [Service]
+        Environment=TERM=linux
+        Environment=LOCALE_ARCHIVE=/run/current-system/sw/lib/locale/locale-archive
+        ExecStart=@${pkgs.utillinux}/sbin/agetty agetty --login-program ${pkgs.shadow}/bin/login %I 115200,38400,9600
+        Type=idle
+        Restart=always
+        RestartSec=0
+        UtmpIdentifier=%I
+        TTYPath=/dev/%I
+        TTYReset=yes
+        TTYVHangup=yes
+        KillMode=process
+        IgnoreSIGPIPE=no
+
+        # Some login implementations ignore SIGTERM, so we send SIGHUP
+        # instead, to ensure that login terminates cleanly.
+        KillSignal=SIGHUP
+      '';
+
     environment.etc = singleton
       { # Friendly greeting on the virtual consoles.
         source = pkgs.writeText "issue" ''
-- 
GitLab


From 1375e7951d73280e08bda26bef0ad9c85d059fe2 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 20 Jul 2012 12:02:42 -0400
Subject: [PATCH 3820/5331] Enable systemd-journal-flush.service (added by
 systemd 187)

---
 modules/system/boot/systemd.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/modules/system/boot/systemd.nix b/modules/system/boot/systemd.nix
index b4104980618..40ff14dda7a 100644
--- a/modules/system/boot/systemd.nix
+++ b/modules/system/boot/systemd.nix
@@ -157,6 +157,7 @@ let
       # Journal.
       "systemd-journald.socket"
       "systemd-journald.service"
+      "systemd-journal-flush.service"
       "syslog.socket"
 
       # SysV init compatibility.
-- 
GitLab


From 1cde1bdbe68a989cf8776fb81b3f6ad311a93bd6 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 20 Jul 2012 12:03:15 -0400
Subject: [PATCH 3821/5331] nixos-run-vms: If there is only one VM, attach
 stdio to its serial console

This is useful for interactive testing (quicker than logging in via
SSH and more convenient than logging in via a virtual console).
---
 lib/test-driver/Machine.pm     | 11 +++++++----
 lib/test-driver/test-driver.pl |  2 +-
 lib/testing.nix                |  3 ++-
 3 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/lib/test-driver/Machine.pm b/lib/test-driver/Machine.pm
index dee1e4f33cb..f0d5fbc19ea 100644
--- a/lib/test-driver/Machine.pm
+++ b/lib/test-driver/Machine.pm
@@ -50,6 +50,7 @@ sub new {
         stateDir => "$tmpDir/vm-state-$name",
         monitor => undef,
         log => $args->{log},
+        redirectSerial => $args->{redirectSerial} // 1,
     };
 
     mkdir $self->{stateDir}, 0700;
@@ -117,10 +118,12 @@ sub start {
         close $serialP;
         close $monitorS;
         close $shellS;
-        open NUL, "</dev/null" or die;
-        dup2(fileno(NUL), fileno(STDIN));
-        dup2(fileno($serialC), fileno(STDOUT));
-        dup2(fileno($serialC), fileno(STDERR));
+        if ($self->{redirectSerial}) {
+            open NUL, "</dev/null" or die;
+            dup2(fileno(NUL), fileno(STDIN));
+            dup2(fileno($serialC), fileno(STDOUT));
+            dup2(fileno($serialC), fileno(STDERR));
+        }
         $ENV{TMPDIR} = $self->{stateDir};
         $ENV{USE_TMPDIR} = 1;
         $ENV{QEMU_OPTS} =
diff --git a/lib/test-driver/test-driver.pl b/lib/test-driver/test-driver.pl
index 43f74cf404b..fc4b7ea0555 100644
--- a/lib/test-driver/test-driver.pl
+++ b/lib/test-driver/test-driver.pl
@@ -50,7 +50,7 @@ my $context = "";
 
 sub createMachine {
     my ($args) = @_;
-    my $vm = Machine->new({%{$args}, log => $log});
+    my $vm = Machine->new({%{$args}, log => $log, redirectSerial => ($ENV{USE_SERIAL} // "0") ne "1"});
     $vms{$vm->name} = $vm;
     return $vm;
 }
diff --git a/lib/testing.nix b/lib/testing.nix
index 6a39df8c865..212c478a728 100644
--- a/lib/testing.nix
+++ b/lib/testing.nix
@@ -158,7 +158,8 @@ rec {
         wrapProgram $out/bin/nixos-run-vms \
           --add-flags "$vms" \
           --set tests '"startAll; joinAll;"' \
-          --set VLANS '"${toString vlans}"'
+          --set VLANS '"${toString vlans}"' \
+          ${lib.optionalString (builtins.length vms == 1) "--set USE_SERIAL 1"}
       ''; # "
 
     test = runTests driver;
-- 
GitLab


From 1602f8e1625d22531b9d414ec1709c2e715776dd Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 20 Jul 2012 14:58:15 -0400
Subject: [PATCH 3822/5331] Typo

---
 modules/services/misc/nix-daemon.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/services/misc/nix-daemon.nix b/modules/services/misc/nix-daemon.nix
index ea13def39d6..35c1ace93d3 100644
--- a/modules/services/misc/nix-daemon.nix
+++ b/modules/services/misc/nix-daemon.nix
@@ -76,7 +76,7 @@ in
           gc-keep-outputs = true
           gc-keep-derivations = true
         ";
-        description = "Additional text appended to <filename>nix.conf<filename>.";
+        description = "Additional text appended to <filename>nix.conf</filename>.";
       };
 
       distributedBuilds = mkOption {
-- 
GitLab


From 5fabcf63a36b9d5032ad04a1daf86edb2c0ff3be Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 20 Jul 2012 15:40:50 -0400
Subject: [PATCH 3823/5331] Get delayed shutdowns to work

---
 modules/system/boot/systemd.nix | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/modules/system/boot/systemd.nix b/modules/system/boot/systemd.nix
index 40ff14dda7a..5f7f62b7866 100644
--- a/modules/system/boot/systemd.nix
+++ b/modules/system/boot/systemd.nix
@@ -196,10 +196,12 @@ let
 
       # Hibernate / suspend.
       "hibernate.target"
-      "systemd-hibernate.service"
       "suspend.target"
-      "systemd-suspend.service"
       "sleep.target"
+      "systemd-hibernate.service"
+      "systemd-suspend.service"
+      "systemd-shutdownd.socket"
+      "systemd-shutdownd.service"
 
       # Reboot stuff.
       "reboot.target"
-- 
GitLab


From 0b865edb16f834684726903c35e946685c5eafdf Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 20 Jul 2012 16:23:52 -0400
Subject: [PATCH 3824/5331] switch-to-configuration: require a reboot going
 from Upstart to systemd

---
 .../system/activation/switch-to-configuration.sh   | 14 +++++++-------
 modules/system/activation/top-level.nix            |  2 +-
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/modules/system/activation/switch-to-configuration.sh b/modules/system/activation/switch-to-configuration.sh
index 62af63ec39f..0256100f4ec 100644
--- a/modules/system/activation/switch-to-configuration.sh
+++ b/modules/system/activation/switch-to-configuration.sh
@@ -59,16 +59,16 @@ fi
 # Activate the new configuration.
 if [ "$action" != switch -a "$action" != test ]; then exit 0; fi
 
-oldVersion=$(cat /run/current-system/upstart-interface-version 2> /dev/null || echo 0)
-newVersion=$(cat @out@/upstart-interface-version 2> /dev/null || echo 0)
+oldVersion="$(cat /run/current-system/init-interface-version 2> /dev/null || echo "")"
+newVersion="$(cat @out@/init-interface-version)"
 
-if test "$oldVersion" -ne "$newVersion"; then
+if [ "$oldVersion" != "$newVersion" ]; then
         cat <<EOF
-Warning: the new NixOS configuration has an Upstart version that is
-incompatible with the current version.  The new configuration won't
-take effect until you reboot the system.
+Warning: the new NixOS configuration has an ‘init’ that is
+incompatible with the current configuration.  The new configuration
+won't take effect until you reboot the system.
 EOF
-        exit 1
+        exit 100 # denotes "reboot required" to Charon
 fi
 
 # Ignore SIGHUP so that we're not killed if we're running on (say)
diff --git a/modules/system/activation/top-level.nix b/modules/system/activation/top-level.nix
index ef32d991d9d..e6c201ea2ba 100644
--- a/modules/system/activation/top-level.nix
+++ b/modules/system/activation/top-level.nix
@@ -122,7 +122,7 @@ let
 
       echo -n "$kernelParams" > $out/kernel-params
       echo -n "$configurationName" > $out/configuration-name
-      #echo -n "${toString config.system.build.upstart.interfaceVersion}" > $out/upstart-interface-version
+      echo -n "systemd ${toString config.system.build.systemd.interfaceVersion}" > $out/init-interface-version
       echo -n "$nixosVersion" > $out/nixos-version
 
       mkdir $out/fine-tune
-- 
GitLab


From 77510eaa9917eef42fe73bf3a0c802c0e71bbfe8 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 20 Jul 2012 17:38:36 -0400
Subject: [PATCH 3825/5331] dbus.nix: Fix path to dbus-send

---
 modules/services/system/dbus.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/services/system/dbus.nix b/modules/services/system/dbus.nix
index bd5c290d582..a6544368ea0 100644
--- a/modules/services/system/dbus.nix
+++ b/modules/services/system/dbus.nix
@@ -138,7 +138,7 @@ in
         ExecStartPre=${pkgs.dbus_tools}/bin/dbus-uuidgen --ensure
         ExecStartPre=-${pkgs.coreutils}/bin/rm -f /var/run/dbus/pid
         ExecStart=${pkgs.dbus_daemon}/bin/dbus-daemon --system --address=systemd: --nofork --systemd-activation
-        ExecReload=${pkgs.dbus_tools}/dbus-send --print-reply --system --type=method_call --dest=org.freedesktop.DBus / org.freedesktop.DBus.ReloadConfig
+        ExecReload=${pkgs.dbus_tools}/bin/dbus-send --print-reply --system --type=method_call --dest=org.freedesktop.DBus / org.freedesktop.DBus.ReloadConfig
         OOMScoreAdjust=-900
       '';
 
-- 
GitLab


From ee075bdf6b43d7a4bf6f3be2f207556523bbf7d8 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 20 Jul 2012 17:39:05 -0400
Subject: [PATCH 3826/5331] agetty.nix: Add remark

---
 modules/services/ttys/agetty.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/services/ttys/agetty.nix b/modules/services/ttys/agetty.nix
index a0e53eeaef4..1916c13333d 100644
--- a/modules/services/ttys/agetty.nix
+++ b/modules/services/ttys/agetty.nix
@@ -87,7 +87,7 @@ with pkgs.lib;
         TTYPath=/dev/%I
         TTYReset=yes
         TTYVHangup=yes
-        TTYVTDisallocate=yes
+        TTYVTDisallocate=yes # set to no to prevent clearing the screen
         KillMode=process
         IgnoreSIGPIPE=no
 
-- 
GitLab


From 7a98c884f8aff2f9e5b32e87fe02c759edd49472 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 20 Jul 2012 18:24:55 -0400
Subject: [PATCH 3827/5331] dhcpcd.nix: Go into the background and restart ntpd

---
 modules/services/networking/dhcpcd.nix | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/modules/services/networking/dhcpcd.nix b/modules/services/networking/dhcpcd.nix
index 122faf98136..c1cc22f905c 100644
--- a/modules/services/networking/dhcpcd.nix
+++ b/modules/services/networking/dhcpcd.nix
@@ -51,20 +51,19 @@ let
       ''}
 
       if [ "$reason" = BOUND -o "$reason" = REBOOT ]; then
-          # Restart ntpd.  (The "ip-up" event below will trigger the
-          # restart.)  We need to restart it to make sure that it will
-          # actually do something: if ntpd cannot resolve the server
-          # hostnames in its config file, then it will never do
+          # Restart ntpd.  We need to restart it to make sure that it
+          # will actually do something: if ntpd cannot resolve the
+          # server hostnames in its config file, then it will never do
           # anything ever again ("couldn't resolve ..., giving up on
           # it"), so we silently lose time synchronisation.
-          ${config.system.build.upstart}/sbin/initctl stop ntpd
+          ${config.system.build.systemd}/bin/systemctl restart ntpd.service
 
-          ${config.system.build.upstart}/sbin/initctl emit -n ip-up $params
+          #${config.system.build.upstart}/sbin/initctl emit -n ip-up $params
       fi
 
-      if [ "$reason" = EXPIRE -o "$reason" = RELEASE -o "$reason" = NOCARRIER ] ; then
-          ${config.system.build.upstart}/sbin/initctl emit -n ip-down $params
-      fi
+      #if [ "$reason" = EXPIRE -o "$reason" = RELEASE -o "$reason" = NOCARRIER ] ; then
+      #    ${config.system.build.upstart}/sbin/initctl emit -n ip-down $params
+      #fi
     '';
 
 in
@@ -97,7 +96,9 @@ in
 
         path = [ dhcpcd pkgs.nettools pkgs.openresolv ];
 
-        exec = "dhcpcd --config ${dhcpcdConf} --nobackground";
+        daemonType = "fork";
+
+        exec = "dhcpcd --config ${dhcpcdConf}";
       };
 
     environment.systemPackages = [ dhcpcd ];
-- 
GitLab


From fd2cef50cdd55686f5ae467b3eac1729a1d34034 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 20 Jul 2012 18:25:23 -0400
Subject: [PATCH 3828/5331] Don't pull in Upstart

---
 modules/system/upstart/upstart.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/system/upstart/upstart.nix b/modules/system/upstart/upstart.nix
index cbefad21414..6f76f5d7b1d 100644
--- a/modules/system/upstart/upstart.nix
+++ b/modules/system/upstart/upstart.nix
@@ -360,7 +360,7 @@ in
 
   config = {
 
-    system.build.upstart = upstart;
+    system.build.upstart = "/no-upstart";
 
     boot.systemd.services =
       flip mapAttrs' config.jobs (name: job:
-- 
GitLab


From 0edf138fc7884db6be1fab45dd6496c4f239d0c0 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 20 Jul 2012 18:25:36 -0400
Subject: [PATCH 3829/5331] switch-to-configuration: Initial systemd support

It reloads the configuration, but doesn't (re)start jobs yet.
---
 .../activation/switch-to-configuration.sh     | 84 +------------------
 1 file changed, 4 insertions(+), 80 deletions(-)

diff --git a/modules/system/activation/switch-to-configuration.sh b/modules/system/activation/switch-to-configuration.sh
index 0256100f4ec..cc2f2e9282a 100644
--- a/modules/system/activation/switch-to-configuration.sh
+++ b/modules/system/activation/switch-to-configuration.sh
@@ -75,91 +75,15 @@ fi
 # virtual console 1 and we restart the "tty1" job.
 trap "" SIGHUP
 
-jobsDir=$(readlink -f @out@/etc/init)
-
-# Stop all currently running jobs that are not in the new Upstart
-# configuration.  (Here "running" means all jobs that are not in the
-# stop/waiting state.)
-for job in $(initctl list | sed -e '/ stop\/waiting/ d; /^[^a-z]/ d; s/^\([^ ]\+\).*/\1/' | sort); do
-    if ! [ -e "$jobsDir/$job.conf" ] ; then
-        echo "stopping obsolete job ‘$job’..."
-        stop --quiet "$job" || true
-    fi
-done
-
 # Activate the new configuration (i.e., update /etc, make accounts,
 # and so on).
 echo "activating the configuration..."
 @out@/activate @out@
 
-# Make Upstart reload its jobs.
-initctl reload-configuration
-
-# Allow Upstart jobs to react intelligently to a config change.
-initctl emit config-changed
+# FIXME: Re-exec systemd if necessary.
 
-declare -A tasks=(@tasks@)
-declare -A noRestartIfChanged=(@noRestartIfChanged@)
-
-start_() {
-    local job="$1"
-    if start --quiet "$job"; then
-        # Handle services that cancel themselves.
-        if ! [ -n "${tasks[$job]}" ]; then
-            local status=$(status "$job")
-            [[ "$status" =~ start/running ]] || echo "job ‘$job’ failed to start!"
-        fi
-    fi
-}
-
-log() {
-    echo "$@" >&2 || true
-}
-
-# Restart all running jobs that have changed.  (Here "running" means
-# all jobs that don't have a "stop" goal.)  We use the symlinks in
-# /var/run/upstart-jobs (created by each job's pre-start script) to
-# determine if a job has changed.
-for job in @jobs@; do
-    status=$(status "$job")
-    if ! [[ "$status" =~ start/ ]]; then continue; fi
-    if [ "$(readlink -f "$jobsDir/$job.conf")" = "$(readlink -f "/var/run/upstart-jobs/$job")" ]; then continue; fi
-    if [ -n "${noRestartIfChanged[$job]}" ]; then
-        log "not restarting changed service ‘$job’"
-        continue
-    fi
-    log "restarting changed service ‘$job’..."
-    # Note: can't use "restart" here, since that only restarts the
-    # job's main process.
-    stop --quiet "$job" || true
-    start_ "$job" || true
-done
-
-# Start all jobs that are not running but should be.  The "should be"
-# criterion is tricky: the intended semantics is that we end up with
-# the same jobs as after a reboot.  If it's a task, start it if it
-# differs from the previous instance of the same task; if it wasn't
-# previously run, don't run it.  If it's a service, only start it if
-# it has a "start on" condition.
-for job in @jobs@; do
-    status=$(status "$job")
-    if ! [[ "$status" =~ stop/ ]]; then continue; fi
-
-    if [ -n "${tasks[$job]}" ]; then
-        if [ ! -e "/var/run/upstart-jobs/$job" -o \
-            "$(readlink -f "$jobsDir/$job.conf")" = "$(readlink -f "/var/run/upstart-jobs/$job")" ];
-        then continue; fi
-        if [ -n "${noRestartIfChanged[$job]}" ]; then continue; fi
-        log "starting task ‘$job’..."
-        start --quiet "$job" || true
-    else
-        if ! grep -q "^start on" "$jobsDir/$job.conf"; then continue; fi
-        log "starting service ‘$job’..."
-        start_ "$job" || true
-    fi
-    
-done
+# Make systemd reload its jobs.
+systemctl daemon-reload
 
 # Signal dbus to reload its configuration.
-dbusPid=$(initctl status dbus 2> /dev/null | sed -e 's/.*process \([0-9]\+\)/\1/;t;d')
-[ -n "$dbusPid" ] && kill -HUP "$dbusPid"
+systemctl reload dbus.service || true
-- 
GitLab


From 71ca633431590457e4380fb0a53e9a8f30cad9cd Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 20 Jul 2012 18:32:24 -0400
Subject: [PATCH 3830/5331] Start agetty on tty1
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

‘logind’ automatically starts agetty on all virtual consoles except
tty1.  We have to do that ourselves.
---
 modules/system/boot/systemd.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/modules/system/boot/systemd.nix b/modules/system/boot/systemd.nix
index 5f7f62b7866..db690901014 100644
--- a/modules/system/boot/systemd.nix
+++ b/modules/system/boot/systemd.nix
@@ -334,6 +334,8 @@ let
           '') unit.wantedBy) cfg.units)}
 
       ln -s ${cfg.defaultUnit} $out/default.target
+
+      ln -s ../getty@tty1.service $out/multi-user.target.wants/
     ''; # */
     
 in
-- 
GitLab


From b609ff4fcf48b2124d94bf1052c303a36c8cabf1 Mon Sep 17 00:00:00 2001
From: Mathijs Kwik <mathijs@bluescreen303.nl>
Date: Sat, 21 Jul 2012 17:35:50 +0200
Subject: [PATCH 3831/5331] allow out-of-tree nixos modules

The environment variable "NIXOS_EXTRA_MODULES" is now checked to
contain a path to a file similar to modules/module-list.nix.

This gives the ability to include nixos modules that are not in the
nixos source tree.

This can be useful for modules that are still experimental, or which
aren't useful for other nixos users. Of course, this was already
possible to do this using a forked nixos tree, but with this
functionality, you can just rely on the nixos channel, easing things a
lot.
---
 default.nix               | 9 ++++++---
 modules/security/sudo.nix | 1 +
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/default.nix b/default.nix
index fda19c3a149..ca69f07ef31 100644
--- a/default.nix
+++ b/default.nix
@@ -1,12 +1,15 @@
 { configuration ? import ./lib/from-env.nix "NIXOS_CONFIG" <nixos-config>
+, extraModulesPath ? builtins.getEnv "NIXOS_EXTRA_MODULES" 
 , system ? builtins.currentSystem
 }:
 
 let
 
+  extraModules = if extraModulesPath == "" then [] else import extraModulesPath;
+
   eval = import ./lib/eval-config.nix {
     inherit system;
-    modules = [ configuration ];
+    modules = [ configuration ] ++ extraModules;
   };
 
   inherit (eval) config pkgs;
@@ -14,7 +17,7 @@ let
   # This is for `nixos-rebuild build-vm'.
   vmConfig = (import ./lib/eval-config.nix {
     inherit system;
-    modules = [ configuration ./modules/virtualisation/qemu-vm.nix ];
+    modules = [ configuration ./modules/virtualisation/qemu-vm.nix ] ++ extraModules;
   }).config;
 
   # This is for `nixos-rebuild build-vm-with-bootloader'.
@@ -24,7 +27,7 @@ let
       [ configuration
         ./modules/virtualisation/qemu-vm.nix
         { virtualisation.useBootLoader = true; }
-      ];
+      ] ++ extraModules;
   }).config;
 
 in
diff --git a/modules/security/sudo.nix b/modules/security/sudo.nix
index 76c325d8d8f..aac592619c5 100644
--- a/modules/security/sudo.nix
+++ b/modules/security/sudo.nix
@@ -35,6 +35,7 @@ in
           # Environment variables to keep for root and %wheel.
           Defaults:root,%wheel env_keep+=LOCALE_ARCHIVE
           Defaults:root,%wheel env_keep+=NIX_PATH
+          Defaults:root,%wheel env_keep+=NIXOS_EXTRA_MODULES
           Defaults:root,%wheel env_keep+=TERMINFO_DIRS
 
           # Keep SSH_AUTH_SOCK so that pam_ssh_agent_auth.so can do its magic.
-- 
GitLab


From 26bf696350fb1dc61be11c2fb8980b8ff3e1de68 Mon Sep 17 00:00:00 2001
From: Mathijs Kwik <mathijs@bluescreen303.nl>
Date: Sat, 21 Jul 2012 18:30:58 +0200
Subject: [PATCH 3832/5331] Revert "allow out-of-tree nixos modules"

This reverts commit b609ff4fcf48b2124d94bf1052c303a36c8cabf1.

It turns out this can just be done using "require".
---
 default.nix               | 9 +++------
 modules/security/sudo.nix | 1 -
 2 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/default.nix b/default.nix
index ca69f07ef31..fda19c3a149 100644
--- a/default.nix
+++ b/default.nix
@@ -1,15 +1,12 @@
 { configuration ? import ./lib/from-env.nix "NIXOS_CONFIG" <nixos-config>
-, extraModulesPath ? builtins.getEnv "NIXOS_EXTRA_MODULES" 
 , system ? builtins.currentSystem
 }:
 
 let
 
-  extraModules = if extraModulesPath == "" then [] else import extraModulesPath;
-
   eval = import ./lib/eval-config.nix {
     inherit system;
-    modules = [ configuration ] ++ extraModules;
+    modules = [ configuration ];
   };
 
   inherit (eval) config pkgs;
@@ -17,7 +14,7 @@ let
   # This is for `nixos-rebuild build-vm'.
   vmConfig = (import ./lib/eval-config.nix {
     inherit system;
-    modules = [ configuration ./modules/virtualisation/qemu-vm.nix ] ++ extraModules;
+    modules = [ configuration ./modules/virtualisation/qemu-vm.nix ];
   }).config;
 
   # This is for `nixos-rebuild build-vm-with-bootloader'.
@@ -27,7 +24,7 @@ let
       [ configuration
         ./modules/virtualisation/qemu-vm.nix
         { virtualisation.useBootLoader = true; }
-      ] ++ extraModules;
+      ];
   }).config;
 
 in
diff --git a/modules/security/sudo.nix b/modules/security/sudo.nix
index aac592619c5..76c325d8d8f 100644
--- a/modules/security/sudo.nix
+++ b/modules/security/sudo.nix
@@ -35,7 +35,6 @@ in
           # Environment variables to keep for root and %wheel.
           Defaults:root,%wheel env_keep+=LOCALE_ARCHIVE
           Defaults:root,%wheel env_keep+=NIX_PATH
-          Defaults:root,%wheel env_keep+=NIXOS_EXTRA_MODULES
           Defaults:root,%wheel env_keep+=TERMINFO_DIRS
 
           # Keep SSH_AUTH_SOCK so that pam_ssh_agent_auth.so can do its magic.
-- 
GitLab


From 3221159f5f24763a2a07cedca658a4ca050b6db5 Mon Sep 17 00:00:00 2001
From: Marc Weber <marco-oweber@gmx.de>
Date: Sat, 21 Jul 2012 19:25:02 +0200
Subject: [PATCH 3833/5331] fix init-script-builder

---
 modules/installer/init-script/init-script-builder.sh | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/modules/installer/init-script/init-script-builder.sh b/modules/installer/init-script/init-script-builder.sh
index 24128ae9abc..f091dc8b6c8 100644
--- a/modules/installer/init-script/init-script-builder.sh
+++ b/modules/installer/init-script/init-script-builder.sh
@@ -1,4 +1,3 @@
-
 #! @bash@/bin/sh -e
 
 shopt -s nullglob
@@ -44,7 +43,7 @@ addEntry() {
 
     configurationCounter=$((configurationCounter + 1))
 
-    local stage2=$(readlink $path/init)
+    local stage2=$path/init
 
     content="$(
       echo "#!/bin/sh"
-- 
GitLab


From 8bde72d99c7f067e975adaac2409721ac153fb11 Mon Sep 17 00:00:00 2001
From: Your Name <phreedom.stdin@gmail.com>
Date: Tue, 17 Jul 2012 02:44:03 +0300
Subject: [PATCH 3834/5331] Mount securityfs needed for AppArmor and some TPM
 drivers. Should be harmless.

---
 modules/system/boot/stage-1-init.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/modules/system/boot/stage-1-init.sh b/modules/system/boot/stage-1-init.sh
index cc12ccaa738..175b58a3719 100644
--- a/modules/system/boot/stage-1-init.sh
+++ b/modules/system/boot/stage-1-init.sh
@@ -70,6 +70,7 @@ mount -t sysfs none /sys
 mount -t tmpfs -o "mode=0755,size=@devSize@" none /dev
 mkdir -p /run
 mount -t tmpfs -o "mode=0755,size=@runSize@" none /run
+mount -t securityfs none /sys/kernel/security
 
 # Some console devices, for the interactivity
 mknod /dev/console c 5 1
-- 
GitLab


From 4549bad2f455df7f63a62a04031311a6e4f58097 Mon Sep 17 00:00:00 2001
From: Your Name <phreedom.stdin@gmail.com>
Date: Tue, 17 Jul 2012 02:47:41 +0300
Subject: [PATCH 3835/5331] AppArmor: packaged

---
 modules/module-list.nix       |  1 +
 modules/security/apparmor.nix | 52 +++++++++++++++++++++++++++++++++++
 2 files changed, 53 insertions(+)
 create mode 100644 modules/security/apparmor.nix

diff --git a/modules/module-list.nix b/modules/module-list.nix
index 1e5ec300df5..0b139c95141 100644
--- a/modules/module-list.nix
+++ b/modules/module-list.nix
@@ -47,6 +47,7 @@
   ./programs/ssmtp.nix
   ./programs/wvdial.nix
   ./rename.nix
+  ./security/apparmor.nix
   ./security/ca.nix
   ./security/consolekit.nix
   ./security/pam.nix
diff --git a/modules/security/apparmor.nix b/modules/security/apparmor.nix
new file mode 100644
index 00000000000..2e273bf5343
--- /dev/null
+++ b/modules/security/apparmor.nix
@@ -0,0 +1,52 @@
+{pkgs, config, ...}:
+let
+  cfg = config.security.apparmor;
+in
+with pkgs.lib;
+{
+
+  ###### interface
+
+  options = {
+
+    security.apparmor = {
+
+      enable = mkOption {
+        default = false;
+        description = ''
+          Enable AppArmor application security system
+        '';
+      };
+
+      profiles = mkOption {
+        default = [];
+	merge = mergeListOption;
+        description = ''
+	  List of file names of AppArmor profiles.
+	'';
+      };
+
+    };
+  };
+
+
+  ###### implementation
+
+  config = mkIf (cfg.enable) {
+
+    jobs.apparmor =
+      { startOn = "startup";
+
+	path = [ pkgs.apparmor ];
+
+        preStart = concatMapStrings (profile: ''
+          apparmor_parser -Kv -I ${pkgs.apparmor}/etc/apparmor.d/ "${profile}"
+        '') cfg.profiles;
+
+	postStop = ''
+	'';
+      };
+
+  };
+
+}
-- 
GitLab


From 7ddea025e4da8c63a241cfcb464547cbf4dc85a3 Mon Sep 17 00:00:00 2001
From: Marc Weber <marco-oweber@gmx.de>
Date: Mon, 23 Jul 2012 03:28:21 +0200
Subject: [PATCH 3836/5331] dont hardcode apache group name when setting
 permissions for state dir

---
 modules/services/web-servers/apache-httpd/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/services/web-servers/apache-httpd/default.nix b/modules/services/web-servers/apache-httpd/default.nix
index ba02c6ead43..2eadde36e16 100644
--- a/modules/services/web-servers/apache-httpd/default.nix
+++ b/modules/services/web-servers/apache-httpd/default.nix
@@ -595,7 +595,7 @@ in
         preStart =
           ''
             mkdir -m 0750 -p ${mainCfg.stateDir}
-            chown root.wwwrun ${mainCfg.stateDir}
+            chown root.${mainCfg.group} ${mainCfg.stateDir}
             mkdir -m 0700 -p ${mainCfg.logDir}
 
             ${optionalString (mainCfg.documentRoot != null)
-- 
GitLab


From 4f109c8a3d2dcb67a95404c7c5c0a563277e237b Mon Sep 17 00:00:00 2001
From: Phreedom <phreedom.stdin@gmail.com>
Date: Mon, 23 Jul 2012 17:18:19 +0300
Subject: [PATCH 3837/5331] ClamAV: package virus fingerprint database updater.

---
 modules/misc/ids.nix                 |  2 +
 modules/module-list.nix              |  1 +
 modules/services/security/clamav.nix | 80 ++++++++++++++++++++++++++++
 3 files changed, 83 insertions(+)
 create mode 100644 modules/services/security/clamav.nix

diff --git a/modules/misc/ids.nix b/modules/misc/ids.nix
index 1f5d0d3b5a5..57ff1af2ff6 100644
--- a/modules/misc/ids.nix
+++ b/modules/misc/ids.nix
@@ -69,6 +69,7 @@ in
     unbound = 48;
     prayer = 49;
     mpd = 50;
+    clamav = 51;
 
     # When adding a uid, make sure it doesn't match an existing gid.
 
@@ -118,6 +119,7 @@ in
     dovecot2 = 46;
     prayer = 49;
     mpd = 50;
+    clamav = 51;
 
     # When adding a gid, make sure it doesn't match an existing uid.
 
diff --git a/modules/module-list.nix b/modules/module-list.nix
index 0b139c95141..a67f8c2f133 100644
--- a/modules/module-list.nix
+++ b/modules/module-list.nix
@@ -161,6 +161,7 @@
   ./services/scheduling/atd.nix
   ./services/scheduling/cron.nix
   ./services/scheduling/fcron.nix
+  ./services/security/clamav.nix
   ./services/security/frandom.nix
   ./services/security/tor.nix
   ./services/security/torsocks.nix
diff --git a/modules/services/security/clamav.nix b/modules/services/security/clamav.nix
new file mode 100644
index 00000000000..5ccb4927fcb
--- /dev/null
+++ b/modules/services/security/clamav.nix
@@ -0,0 +1,80 @@
+{ config, pkgs, ... }:
+with pkgs.lib;
+let
+  clamavUser = "clamav";
+  stateDir = "/var/lib/clamav";
+  clamavGroup = clamavUser;
+  cfg = config.services.clamav;
+in
+{
+  ###### interface
+
+  options = {
+
+    services.clamav = {
+      updater = {
+	enable = mkOption {
+	  default = false;
+	  description = ''
+	    Whether to enable automatic ClamAV virus definitions database updates.
+	  '';
+	};
+
+	frequency = mkOption {
+	  default = 12;
+	  description = ''
+	    Number of database checks per day.
+	  '';
+	};
+
+	config = mkOption {
+	  default = "";
+	  description = ''
+	    Extra configuration for freshclam. Contents will be added verbatim to the
+	    configuration file.
+	  '';
+	};
+      };
+    };
+  };
+
+  ###### implementation
+
+  config = mkIf cfg.updater.enable {
+    environment.systemPackages = [ pkgs.clamav ];
+    users.extraUsers = singleton
+      { name = clamavUser;
+        uid = config.ids.uids.clamav;
+        description = "ClamAV daemon user";
+        home = stateDir;
+      };
+
+    users.extraGroups = singleton
+      { name = clamavGroup;
+        gid = config.ids.gids.clamav;
+      };
+
+    services.clamav.updater.config = ''
+      DatabaseDirectory ${stateDir}
+      Foreground yes
+      Checks ${toString cfg.updater.frequency}
+      DatabaseMirror database.clamav.net
+    '';
+
+    jobs = {
+      clamav_updater = {
+	name = "clamav-updater";
+          startOn = "started network-interfaces";
+          stopOn = "stopping network-interfaces";
+
+          preStart = ''
+            mkdir -m 0755 -p ${stateDir}
+            chown ${clamavUser}:${clamavGroup} ${stateDir}
+          '';
+          exec = "${pkgs.clamav}/bin/freshclam --config-file=${pkgs.writeText "freshclam.conf" cfg.updater.config}";
+      }; 
+    };
+
+  };
+
+}
\ No newline at end of file
-- 
GitLab


From 5a0cf5e7b66693cc939dab1d15278a4682f5a216 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 23 Jul 2012 14:01:10 -0400
Subject: [PATCH 3838/5331] Use ext4 for VirtualBox images

---
 modules/virtualisation/virtualbox-image.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/virtualisation/virtualbox-image.nix b/modules/virtualisation/virtualbox-image.nix
index c3fbf344bfb..9c488b6b039 100644
--- a/modules/virtualisation/virtualbox-image.nix
+++ b/modules/virtualisation/virtualbox-image.nix
@@ -30,7 +30,7 @@ with pkgs.lib;
           mknod /dev/vda1 b $MAJOR $MINOR
 
           # Create an empty filesystem and mount it.
-          ${pkgs.e2fsprogs}/sbin/mkfs.ext3 -L nixos /dev/vda1
+          ${pkgs.e2fsprogs}/sbin/mkfs.ext4 -L nixos /dev/vda1
           ${pkgs.e2fsprogs}/sbin/tune2fs -c 0 -i 0 /dev/vda1
           mkdir /mnt
           mount /dev/vda1 /mnt
-- 
GitLab


From 47e67f5e9caf22bd9f33047d90e73fdc686acef3 Mon Sep 17 00:00:00 2001
From: Marc Weber <marco-oweber@gmx.de>
Date: Mon, 23 Jul 2012 03:19:02 +0200
Subject: [PATCH 3839/5331] renaming all occurrences of
 /var/run/{booted,current}-system

in particular those found in docs
still keeping old path in modules/config/shells.nix for unkown reason (?)
---
 doc/manual/man-nixos-rebuild.xml |  2 +-
 doc/manual/userconfiguration.xml | 16 ++++++++--------
 gui/chrome/content/nixos.js      |  4 ++--
 lib/test-driver/test-driver.pl   |  2 +-
 4 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/doc/manual/man-nixos-rebuild.xml b/doc/manual/man-nixos-rebuild.xml
index 383334d82e1..ddf4e40be0c 100644
--- a/doc/manual/man-nixos-rebuild.xml
+++ b/doc/manual/man-nixos-rebuild.xml
@@ -281,7 +281,7 @@ the Nix manual for details.</para>
 <variablelist>
 
   <varlistentry>
-    <term><filename>/var/run/current-system</filename></term>
+    <term><filename>/run/current-system</filename></term>
     <listitem>
       <para>A symlink to the currently active system configuration in
       the Nix store.</para>
diff --git a/doc/manual/userconfiguration.xml b/doc/manual/userconfiguration.xml
index 2cad256c742..7c6540caf3a 100644
--- a/doc/manual/userconfiguration.xml
+++ b/doc/manual/userconfiguration.xml
@@ -13,20 +13,20 @@
 	them found both by Compiz and by Compiz Configuration Settings (also in Compiz Fusion
 	distribution). By default they look in Compiz installation path and in home directory.
 	You do not need to track /nix/store manually - everything is already in 
-	/var/run/current-system/sw/share.
+	/run/current-system/sw/share.
 
 	<orderedlist>
 	<listitem><para><filename>$HOME/.compiz/plugins</filename> 
 	should contain plugins you want to load. All the installed 
 	plugins are available in 
-	<filename>/var/run/current-system/sw/share/compiz-plugins/compiz/</filename>,
+	<filename>/run/current-system/sw/share/compiz-plugins/compiz/</filename>,
 	so you can use symlinks to this directory.
 	</para></listitem>
 
 	<listitem><para><filename>$HOME/.compiz/metadata</filename> 
 	should contain metadata (definition of configuration options) for plugins 
 	you want to load. All the installed metadata is available in 
-	<filename>/var/run/current-system/sw/share/compiz/</filename>,
+	<filename>/run/current-system/sw/share/compiz/</filename>,
 	so you can use symlinks to this directory.
 	</para></listitem>
 
@@ -35,16 +35,16 @@
 	should be found, but if you run <literal>Compiz</literal> with 
 	<literal>GConf</literal> configuration (default for <literal>X server</literal> job
 	for now), you have to link 
-	<filename>/var/run/current-system/sw/share/compizconfig/backends/</filename>
+	<filename>/run/current-system/sw/share/compizconfig/backends/</filename>
 	into <filename>$HOME/.compizconfig/backends</filename> directory.
 	</para></listitem>
 
 	</orderedlist>
 
         To summarize the above, these are the commands you have to execute
-        <command>ln -s /var/run/current-system/sw/share/compiz/ $HOME/.compiz/metadata</command>
-        <command>ln -s /var/run/current-system/sw/share/compiz-plugins/compiz/ $HOME/.compiz/plugins</command>
-        <command>ln -s /var/run/current-system/sw/share/compizconfig/backends/ $HOME/.compizconfig/backends</command>
+        <command>ln -s /run/current-system/sw/share/compiz/ $HOME/.compiz/metadata</command>
+        <command>ln -s /run/current-system/sw/share/compiz-plugins/compiz/ $HOME/.compiz/plugins</command>
+        <command>ln -s /run/current-system/sw/share/compizconfig/backends/ $HOME/.compizconfig/backends</command>
 
 	Now you can launch <literal>ccsm</literal> and configure everything. You should select
 	GConf as a backend in the preferences menu of <literal>ccsm</literal>
@@ -57,7 +57,7 @@
 	To have pidgin-latex plugin working after installation, you need the following:
 	<orderedlist>
 	<listitem><para>
-	Symlink <filename>/var/run/current-system/sw/share/pidgin-latex/pidgin-latex.so</filename>
+	Symlink <filename>/run/current-system/sw/share/pidgin-latex/pidgin-latex.so</filename>
 	to <filename>$HOME/.purple/plugins/pidgin-latex.so</filename>
 	</para></listitem>
 	<listitem><para>
diff --git a/gui/chrome/content/nixos.js b/gui/chrome/content/nixos.js
index 7b45b6c006a..63a3c16a573 100644
--- a/gui/chrome/content/nixos.js
+++ b/gui/chrome/content/nixos.js
@@ -21,8 +21,8 @@ NixOS.prototype = {
   nixos: "/etc/nixos/nixos",
   nixpkgs: "/etc/nixos/nixpkgs",
   config: "/etc/nixos/configuration.nix",
-  instantiateBin: "/var/run/current-system/sw/bin/nix-instantiate",
-  optionBin: "/var/run/current-system/sw/bin/nixos-option",
+  instantiateBin: "/run/current-system/sw/bin/nix-instantiate",
+  optionBin: "/run/current-system/sw/bin/nixos-option",
   tmpFile: "nixos-gui",
   option: null
 };
diff --git a/lib/test-driver/test-driver.pl b/lib/test-driver/test-driver.pl
index 43f74cf404b..6c95f5ba517 100644
--- a/lib/test-driver/test-driver.pl
+++ b/lib/test-driver/test-driver.pl
@@ -135,7 +135,7 @@ sub runTests {
             # Figure out where to put the *.gcda files so that the
             # report generator can find the corresponding kernel
             # sources.
-            my $kernelDir = $vm->mustSucceed("echo \$(dirname \$(readlink -f /var/run/current-system/kernel))/.build/linux-*");
+            my $kernelDir = $vm->mustSucceed("echo \$(dirname \$(readlink -f /run/current-system/kernel))/.build/linux-*");
             chomp $kernelDir;
             my $coverageDir = "/tmp/xchg/coverage-data/$kernelDir";
 
-- 
GitLab


From 52c97adaba852a612d801332ce84c503680ff497 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@virt.cryp.to>
Date: Mon, 23 Jul 2012 21:48:21 +0200
Subject: [PATCH 3840/5331] modules/services/web-servers/apache-httpd: make
 this module more configurable

 - The new option 'apacheHttpd' determines the version of the Apache
   HTTP Server that's being used by this module. The default version
   is Apache 2.2.x, as before.

 - The new option 'configFile' allows users specify their own custom
   config file for the web server instead of being limited to the one
   that this module generates.
---
 .../web-servers/apache-httpd/default.nix      | 27 ++++++++++++++++---
 1 file changed, 24 insertions(+), 3 deletions(-)

diff --git a/modules/services/web-servers/apache-httpd/default.nix b/modules/services/web-servers/apache-httpd/default.nix
index 2eadde36e16..41cf31e4473 100644
--- a/modules/services/web-servers/apache-httpd/default.nix
+++ b/modules/services/web-servers/apache-httpd/default.nix
@@ -6,7 +6,9 @@ let
 
   mainCfg = config.services.httpd;
 
-  httpd = pkgs.apacheHttpd.override { mpm = mainCfg.multiProcessingModule; };
+  httpd = mainCfg.apacheHttpd;
+
+  httpdConf = mainCfg.configFile;
 
   php = pkgs.php.override { apacheHttpd = httpd; };
 
@@ -280,7 +282,7 @@ let
   '';
 
 
-  httpdConf = pkgs.writeText "httpd.conf" ''
+  confFile = pkgs.writeText "httpd.conf" ''
 
     ServerRoot ${httpd}
 
@@ -403,10 +405,29 @@ in
         ";
       };
 
+      apacheHttpd = mkOption {
+        default = pkgs.apacheHttpd.override { mpm = mainCfg.multiProcessingModule; };
+	example = "pkgs.apacheHttpd_2_4";
+        description = "
+          Overridable attribute of the Apache HTTP Server package to use.
+        ";
+      };
+
+      configFile = mkOption {
+        default = confFile;
+	example = ''pkgs.writeText "httpd.conf" "# my custom config file ...";'';
+        description = "
+          Overridable config file to use for Apache. By default, use the
+          file automatically generated by nixos.
+        ";
+      };
+
       extraConfig = mkOption {
         default = "";
         description = "
-          These configuration lines will be passed verbatim to the apache config
+          These configuration lines will be appended to the Apache config
+          file. Note that this mechanism may not work when <option>configFile</option>
+          is overridden.
         ";
       };
 
-- 
GitLab


From b3627f6c69795170b96b60cf6b17de5b779de785 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 23 Jul 2012 22:00:35 +0200
Subject: [PATCH 3841/5331] modules/services/web-servers/apache-httpd: add
 apache user to the apache group

---
 modules/services/web-servers/apache-httpd/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/modules/services/web-servers/apache-httpd/default.nix b/modules/services/web-servers/apache-httpd/default.nix
index 41cf31e4473..7cdbf49763a 100644
--- a/modules/services/web-servers/apache-httpd/default.nix
+++ b/modules/services/web-servers/apache-httpd/default.nix
@@ -559,6 +559,7 @@ in
 
     users.extraUsers = singleton
       { name = mainCfg.user;
+        group = mainCfg.group;
         description = "Apache httpd user";
       };
 
-- 
GitLab


From e8e19bbb1faa8cf5201244bc0a1ade0bb111faa3 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 24 Jul 2012 01:01:48 +0200
Subject: [PATCH 3842/5331] modules/services/web-servers/apache-httpd: rename
 'apacheHttpd' option to 'package'

---
 modules/services/web-servers/apache-httpd/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/services/web-servers/apache-httpd/default.nix b/modules/services/web-servers/apache-httpd/default.nix
index 7cdbf49763a..cbd245df432 100644
--- a/modules/services/web-servers/apache-httpd/default.nix
+++ b/modules/services/web-servers/apache-httpd/default.nix
@@ -6,7 +6,7 @@ let
 
   mainCfg = config.services.httpd;
 
-  httpd = mainCfg.apacheHttpd;
+  httpd = mainCfg.package;
 
   httpdConf = mainCfg.configFile;
 
@@ -405,7 +405,7 @@ in
         ";
       };
 
-      apacheHttpd = mkOption {
+      package = mkOption {
         default = pkgs.apacheHttpd.override { mpm = mainCfg.multiProcessingModule; };
 	example = "pkgs.apacheHttpd_2_4";
         description = "
-- 
GitLab


From cb063afcbf371383e3d95e329afedd4eb0543898 Mon Sep 17 00:00:00 2001
From: Phreedom <phreedom.stdin@gmail.com>
Date: Tue, 24 Jul 2012 10:51:17 +0300
Subject: [PATCH 3843/5331] F-Prot virus signaure database updater: package

---
 modules/misc/ids.nix                |  2 +
 modules/module-list.nix             |  1 +
 modules/services/security/fprot.nix | 88 +++++++++++++++++++++++++++++
 3 files changed, 91 insertions(+)
 create mode 100644 modules/services/security/fprot.nix

diff --git a/modules/misc/ids.nix b/modules/misc/ids.nix
index 57ff1af2ff6..d1621c0c74e 100644
--- a/modules/misc/ids.nix
+++ b/modules/misc/ids.nix
@@ -70,6 +70,7 @@ in
     prayer = 49;
     mpd = 50;
     clamav = 51;
+    fprot = 52;
 
     # When adding a uid, make sure it doesn't match an existing gid.
 
@@ -120,6 +121,7 @@ in
     prayer = 49;
     mpd = 50;
     clamav = 51;
+    fprot = 52;
 
     # When adding a gid, make sure it doesn't match an existing uid.
 
diff --git a/modules/module-list.nix b/modules/module-list.nix
index a67f8c2f133..2e6f77afa1f 100644
--- a/modules/module-list.nix
+++ b/modules/module-list.nix
@@ -162,6 +162,7 @@
   ./services/scheduling/cron.nix
   ./services/scheduling/fcron.nix
   ./services/security/clamav.nix
+  ./services/security/fprot.nix
   ./services/security/frandom.nix
   ./services/security/tor.nix
   ./services/security/torsocks.nix
diff --git a/modules/services/security/fprot.nix b/modules/services/security/fprot.nix
new file mode 100644
index 00000000000..9f1fc4ed6d8
--- /dev/null
+++ b/modules/services/security/fprot.nix
@@ -0,0 +1,88 @@
+{ config, pkgs, ... }:
+with pkgs.lib;
+let
+  fprotUser = "fprot";
+  stateDir = "/var/lib/fprot";
+  fprotGroup = fprotUser;
+  cfg = config.services.fprot;
+in {
+  options = {
+
+    services.fprot = {
+      updater = {
+	enable = mkOption {
+	  default = false;
+	  description = ''
+	    Whether to enable automatic F-Prot virus definitions database updates.
+	  '';
+	};
+
+	productData = mkOption {
+	  default = "${pkgs.fprot}/opt/f-prot/product.data";
+	  description = ''
+	    product.data file. Defaults to the one supplied with installation package.
+	  '';
+	};
+
+	frequency = mkOption {
+	  default = 30;
+	  description = ''
+	    Update virus definitions every X minutes.
+	  '';
+	};
+
+	licenseKeyfile = mkOption {
+	  default = "${pkgs.fprot}/opt/f-prot/license.key";
+	  description = ''
+	    License keyfile. Defaults to the one supplied with installation package.
+	  '';
+	};
+
+      };
+    };
+  };
+
+  ###### implementation
+
+  config = mkIf cfg.updater.enable {
+    environment.systemPackages = [ pkgs.fprot ];
+    environment.etc = singleton {
+      source = "${pkgs.fprot}/opt/f-prot/f-prot.conf";
+      target = "f-prot.conf";
+    };
+
+    users.extraUsers = singleton
+      { name = fprotUser;
+        uid = config.ids.uids.fprot;
+        description = "F-Prot daemon user";
+        home = stateDir;
+      };
+
+    users.extraGroups = singleton
+      { name = fprotGroup;
+        gid = config.ids.gids.fprot;
+      };
+
+    services.cron.systemCronJobs = [ "*/${toString cfg.updater.frequency} * * * * root start fprot-updater" ];
+
+    jobs = {
+      fprot_updater = {
+	name = "fprot-updater";
+	  task = true;
+
+	  # have to copy fpupdate executable because it insists on storing the virus database in the same dir
+          preStart = ''
+            mkdir -m 0755 -p ${stateDir}
+            chown ${fprotUser}:${fprotGroup} ${stateDir}
+	    cp ${pkgs.fprot}/opt/f-prot/fpupdate ${stateDir}
+	    ln -sf ${cfg.updater.productData} ${stateDir}/product.data
+          '';
+	  #setuid = fprotUser;
+	  #setgid = fprotGroup;
+          exec = "/var/lib/fprot/fpupdate --keyfile ${cfg.updater.licenseKeyfile}";
+      }; 
+    };
+
+ };
+
+}
\ No newline at end of file
-- 
GitLab


From e4ed2120fd90b138d67f5f5306a7deb020557307 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 24 Jul 2012 13:53:17 -0400
Subject: [PATCH 3844/5331] Create /etc/locale.conf and /etc/vconsole.conf

Systemd's systemd-vconsole-setup.service reads locale and console
font/keymap settings from these files.  In particular, it sets the
virtual console to UTF-8 mode depending on the LANG setting.

This removed the need for the kbd job.
---
 modules/config/i18n.nix | 26 +++++++++-----
 modules/tasks/kbd.nix   | 78 ++++++-----------------------------------
 2 files changed, 29 insertions(+), 75 deletions(-)

diff --git a/modules/config/i18n.nix b/modules/config/i18n.nix
index c53325ed4e6..dd435d481b7 100644
--- a/modules/config/i18n.nix
+++ b/modules/config/i18n.nix
@@ -1,8 +1,10 @@
-{pkgs, config, ...}:
+{ config, pkgs, ... }:
+
+with pkgs.lib;
 
 ###### interface
+
 let
-  inherit (pkgs.lib) mkOption mkIf;
 
   options = {
     i18n = {
@@ -45,16 +47,15 @@ let
           The keyboard mapping table for the virtual consoles.
         ";
       };
+      
     };
+    
   };
-in
-
+  
 ###### implementation
 
-let
-
   glibcLocales = pkgs.glibcLocales.override {
-    allLocales = pkgs.lib.any (x: x == "all") config.i18n.supportedLocales;
+    allLocales = any (x: x == "all") config.i18n.supportedLocales;
     locales = config.i18n.supportedLocales;
   };
 
@@ -63,10 +64,19 @@ in
 {
   require = options;
 
-  environment.systemPackages = [glibcLocales];
+  environment.systemPackages = [ glibcLocales ];
 
   environment.shellInit =
     ''
       export LANG=${config.i18n.defaultLocale}
     '';
+
+  # ‘/etc/locale.conf’ is used by systemd.
+  environment.etc = singleton
+    { target = "locale.conf";
+      source = pkgs.writeText "locale.conf"
+        ''
+          LANG=${config.i18n.defaultLocale}
+        '';
+    };
 }
diff --git a/modules/tasks/kbd.nix b/modules/tasks/kbd.nix
index dd4b9f382c0..aa708fb6019 100644
--- a/modules/tasks/kbd.nix
+++ b/modules/tasks/kbd.nix
@@ -10,7 +10,6 @@ let
     ++ config.boot.extraTTYs
     ++ [ config.services.syslogd.tty ];
   ttys = map (dev: "/dev/${dev}") requiredTTYs;
-  defaultLocale = config.i18n.defaultLocale;
   consoleFont = config.i18n.consoleFont;
   consoleKeyMap = config.i18n.consoleKeyMap;
 
@@ -23,6 +22,7 @@ in
 
     # most options are defined in i18n.nix
 
+    # FIXME: still needed?
     boot.extraTTYs = mkOption {
       default = [];
       example = ["tty8" "tty9"];
@@ -56,73 +56,17 @@ in
 
     environment.systemPackages = [ pkgs.kbd ];
 
-    /* FIXME - remove; this is handled by systemd now.
-    
-    jobs.kbd =
-      { description = "Keyboard / console initialisation";
-
-        startOn = "started udev";
-
-        task = true;
-
-        script = ''
-          export LANG=${defaultLocale}
-          export LOCALE_ARCHIVE=/run/current-system/sw/lib/locale/locale-archive
-          export PATH=${pkgs.gzip}/bin:$PATH # Needed by setfont
-
-          set +e # continue in case of errors
-
-
-          # Enable or disable UTF-8 mode.  This is based on
-          # unicode_{start,stop}.
-          echo 'Enabling or disabling Unicode mode...'
-
-          charMap=$(${pkgs.glibc}/bin/locale charmap)
-
-          if test "$charMap" = UTF-8; then
-
-            for tty in ${toString ttys}; do
-
-              # Tell the console output driver that the bytes arriving are
-              # UTF-8 encoded multibyte sequences.
-              echo -n -e '\033%G' > $tty
-
-            done
-
-            # Set the keyboard driver in UTF-8 mode.
-            # !!! Commented out because it running this while the X
-            # server is running kicks the X server out of raw mode.
-            # UTF-8 mode is the default nowadays anyway.
-            # ${pkgs.kbd}/bin/kbd_mode -u
-
-          else
-
-            for tty in ${toString ttys}; do
-
-              # Tell the console output driver that the bytes arriving are
-              # UTF-8 encoded multibyte sequences.
-              echo -n -e '\033%@' > $tty
-
-            done
-
-            # Set the keyboard driver in ASCII (or any 8-bit character
-            # set) mode.
-            ${pkgs.kbd}/bin/kbd_mode -a
-
-          fi
-
-
-          # Set the console font.
-          for tty in ${toString ttys}; do
-            ${pkgs.kbd}/bin/setfont -C $tty ${consoleFont}
-          done
-
-
-          # Set the keymap.
-          ${pkgs.kbd}/bin/loadkeys '${consoleKeyMap}'
-        '';
+    # Let systemd-vconsole-setup.service do the work of setting up the
+    # virtual consoles.  FIXME: trigger a restart of
+    # systemd-vconsole-setup.service if /etc/vconsole.conf changes.
+    environment.etc = singleton
+      { target = "vconsole.conf";
+        source = pkgs.writeText "vconsole.conf"
+          ''
+            KEYMAP=${consoleKeyMap}
+            FONT=${consoleFont}
+          '';
       };
-    */
 
   };
 
-- 
GitLab


From b3b6b8ad609b541749e12ef280d1d94a516e9a1b Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 24 Jul 2012 19:07:03 -0400
Subject: [PATCH 3845/5331] virtualbox-image.nix: VirtualBox disks are
 /dev/sda, not /dev/vda

---
 modules/virtualisation/virtualbox-image.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/virtualisation/virtualbox-image.nix b/modules/virtualisation/virtualbox-image.nix
index 9c488b6b039..f049c5eb348 100644
--- a/modules/virtualisation/virtualbox-image.nix
+++ b/modules/virtualisation/virtualbox-image.nix
@@ -78,7 +78,7 @@ with pkgs.lib;
     ];
 
   boot.loader.grub.version = 2;
-  boot.loader.grub.device = "/dev/vda";
+  boot.loader.grub.device = "/dev/sda";
 
   services.virtualbox.enable = true;
 }
-- 
GitLab


From f07f221f0ee46e64bb8a51e04dec6bade8645cfa Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 24 Jul 2012 19:16:27 -0400
Subject: [PATCH 3846/5331] Replace grub-menu-builder with a much faster
 version

The old GRUB menu builder script is quite slow, typically taking
several seconds.  This is a real annoyance since it's run every time
you switch to a new configuration.  Therefore this patch replaces the
Bash script with a much faster Perl script.  In a VirtualBox test, the
execution time went from 2.7s to 0.1s.  The Perl version is also more
correct because it uses XML to get the GRUB configuration (through
builtins.toXML), so there are no shell escaping issues.

The new script currently lacks support for subconfigurations defined
through "nesting.children".
---
 modules/installer/grub/grub-menu-builder.pl   | 217 +++++++++++++
 modules/installer/grub/grub-menu-builder.sh   | 305 ------------------
 modules/installer/grub/grub.nix               |  22 +-
 .../activation/switch-to-configuration.sh     |   3 +-
 4 files changed, 229 insertions(+), 318 deletions(-)
 create mode 100644 modules/installer/grub/grub-menu-builder.pl
 delete mode 100644 modules/installer/grub/grub-menu-builder.sh

diff --git a/modules/installer/grub/grub-menu-builder.pl b/modules/installer/grub/grub-menu-builder.pl
new file mode 100644
index 00000000000..7f0dc15836b
--- /dev/null
+++ b/modules/installer/grub/grub-menu-builder.pl
@@ -0,0 +1,217 @@
+use strict;
+use warnings;
+use XML::LibXML;
+use File::Basename;
+use File::Path;
+use File::stat;
+use File::Copy;
+use IO::File;
+use POSIX;
+use Cwd;
+
+my $defaultConfig = $ARGV[1] or die;
+
+my $dom = XML::LibXML->load_xml(location => $ARGV[0]);
+
+sub get { my ($name) = @_; return $dom->findvalue("/expr/attrs/attr[\@name = '$name']/*/\@value"); }
+
+my $grub = get("grub");
+my $grubVersion = int(get("version"));
+my $extraConfig = get("extraConfig");
+my $extraPerEntryConfig = get("extraPerEntryConfig");
+my $extraEntries = get("extraEntries");
+my $extraEntriesBeforeNixOS = get("extraEntriesBeforeNixOS") eq "true";
+my $splashImage = get("splashImage");
+my $configurationLimit = int(get("configurationLimit"));
+my $copyKernels = get("copyKernels") eq "true";
+my $timeout = int(get("timeout"));
+my $defaultEntry = int(get("default"));
+
+die "unsupported GRUB version\n" if $grubVersion != 1 && $grubVersion != 2;
+
+mkpath("/boot/grub", 0, 0700);
+
+
+# Discover whether /boot is on the same filesystem as / and
+# /nix/store.  If not, then all kernels and initrds must be copied to
+# /boot, and all paths in the GRUB config file must be relative to the
+# root of the /boot filesystem.  `$bootRoot' is the path to be
+# prepended to paths under /boot.
+my $bootRoot = "/boot";
+if (stat("/")->dev != stat("/boot")->dev) {
+    $bootRoot = "";
+    $copyKernels = 1;
+} elsif (stat("/boot")->dev != stat("/nix/store")->dev) {
+    $copyKernels = 1;
+}
+
+
+# Generate the header.
+my $conf .= "# Automatically generated.  DO NOT EDIT THIS FILE!\n";
+
+if ($grubVersion == 1) {
+    $conf .= "
+        default $defaultEntry
+        timeout $timeout
+    ";
+    if ($splashImage) {
+        copy $splashImage, "/boot/background.xpm.gz" or die "cannot copy $splashImage to /boot\n";
+        $conf .= "splashimage $bootRoot/background.xpm.gz\n";
+    }
+}
+
+else {
+    copy "$grub/share/grub/unicode.pf2", "/boot/grub/unicode.pf2" or die "cannot copy unicode.pf2 to /boot/grub: $!\n";
+    
+    $conf .= "
+        if [ -s \$prefix/grubenv ]; then
+          load_env
+        fi
+
+        # ‘grub-reboot’ sets a one-time saved entry, which we process here and
+        # then delete.
+        if [ \"\${saved_entry}\" ]; then
+          # The next line *has* to look exactly like this, otherwise KDM's
+          # reboot feature won't work properly with GRUB 2.
+          set default=\"\${saved_entry}\"
+          set saved_entry=
+          set prev_saved_entry=
+          save_env saved_entry
+          save_env prev_saved_entry
+          set timeout=1
+        else
+          set default=$defaultEntry
+          set timeout=$timeout
+        fi
+
+        if loadfont $bootRoot/grub/unicode.pf2; then
+          set gfxmode=640x480
+          insmod gfxterm
+          insmod vbe
+          terminal_output gfxterm
+        fi
+    ";
+
+    if ($splashImage) {
+	# FIXME: GRUB 1.97 doesn't resize the background image if it
+        # doesn't match the video resolution.
+        copy $splashImage, "/boot/background.png" or die "cannot copy $splashImage to /boot\n";
+        $conf .= "
+            insmod png
+            if background_image $bootRoot/background.png; then
+              set color_normal=white/black
+              set color_highlight=black/white
+            else
+              set menu_color_normal=cyan/blue
+              set menu_color_highlight=white/blue
+            fi
+        ";
+    }
+}
+
+$conf .= "$extraConfig\n";
+
+
+# Generate the menu entries.
+my $curEntry = 0;
+$conf .= "\n";
+
+my %copied;
+mkpath("/boot/kernels", 0, 0755) if $copyKernels;
+
+sub copyToKernelsDir {
+    my ($path) = @_;
+    return $path unless $copyKernels;
+    $path =~ /\/nix\/store\/(.*)/ or die;
+    my $name = $1; $name =~ s/\//-/g;
+    my $dst = "/boot/kernels/$name";
+    # Don't copy the file if $dst already exists.  This means that we
+    # have to create $dst atomically to prevent partially copied
+    # kernels or initrd if this script is ever interrupted.
+    if (! -e $dst) {
+        my $tmp = "$dst.tmp";
+        copy $path, $tmp or die "cannot copy $path to $tmp\n";
+        rename $tmp, $dst or die "cannot rename $tmp to $dst\n";
+    }
+    $copied{$dst} = 1;
+    return "$bootRoot/kernels/$name";
+}
+
+sub addEntry {
+    my ($name, $path) = @_;
+    return if $curEntry++ > $configurationLimit;
+    return unless -e "$path/kernel" && -e "$path/initrd";
+
+    my $kernel = copyToKernelsDir(Cwd::abs_path("$path/kernel"));
+    my $initrd = copyToKernelsDir(Cwd::abs_path("$path/initrd"));
+    my $xen = -e "$path/xen.gz" ? copyToKernelsDir(Cwd::abs_path("$path/xen")) : undef;
+
+    # FIXME: $confName
+
+    my $kernelParams =
+        "systemConfig=" . Cwd::abs_path($path) . " " .
+        "init=" . Cwd::abs_path("$path/init") . " " .
+        join " ", IO::File->new("$path/kernel-params")->getlines;
+    my $xenParams = $xen && -e "$path/xen-params" ? join " ", IO::File->new("$path/xen-params")->getlines : "";
+
+    if ($grubVersion == 1) {
+        $conf .= "title $name\n";
+        $conf .= "  $extraPerEntryConfig\n" if $extraPerEntryConfig;
+        $conf .= "  kernel $xen $xenParams\n" if $xen;
+        $conf .= "  " . ($xen ? "module" : "kernel") . " $kernel $kernelParams\n";
+        $conf .= "  " . ($xen ? "module" : "initrd") . " $initrd\n\n";
+    } else {
+        $conf .= "menuentry \"$name\" {\n";
+        $conf .= "  $extraPerEntryConfig\n" if $extraPerEntryConfig;
+        $conf .= "  multiboot $xen $xenParams\n" if $xen;
+        $conf .= "  " . ($xen ? "module" : "linux") . " $kernel $kernelParams\n";
+        $conf .= "  " . ($xen ? "module" : "initrd") . " $initrd\n";
+        $conf .= "}\n\n";
+    }
+}
+
+
+# Add default entries.
+$conf .= "$extraEntries\n" if $extraEntriesBeforeNixOS;
+
+addEntry("NixOS - Default", $defaultConfig);
+
+$conf .= "$extraEntries\n" unless $extraEntriesBeforeNixOS;
+
+
+# Add entries for all previous generations of the system profile.
+$conf .= "submenu \"NixOS - Old configurations\" {\n" if $grubVersion == 2;
+
+sub nrFromGen { my ($x) = @_; $x =~ /system-(.*)-link/; return $1; }
+    
+my @links = sort
+    { nrFromGen($b) <=> nrFromGen($a) }
+    (glob "/nix/var/nix/profiles/system-*-link");
+    
+foreach my $link (@links) {
+    my $date = strftime("%F", localtime(lstat($link)->mtime));
+    my $version =
+        -e "$link/nixos-version"
+        ? IO::File->new("$link/nixos-version")->getline
+        : basename((glob(dirname(Cwd::abs_path("$link/kernel")) . "/lib/modules/*"))[0]);
+    addEntry("NixOS - Configuration " . nrFromGen($link) . " ($date - $version)", $link);
+}
+
+$conf .= "}\n" if $grubVersion == 2;
+
+
+# Atomically update the GRUB config.
+my $confFile = $grubVersion == 1 ? "/boot/grub/menu.lst" : "/boot/grub/grub.cfg";
+my $tmpFile = $confFile . ".tmp";
+open CONF, ">$tmpFile" or die "cannot open $tmpFile for writing\n";
+print CONF $conf or die;
+close CONF;
+rename $tmpFile, $confFile or die "cannot rename $tmpFile to $confFile\n";
+
+
+# Remove obsolete files from /boot/kernels.
+foreach my $fn (glob "/boot/kernels/*") {
+    next if defined $copied{$fn};
+    print STDERR "removing obsolete file $fn\n";
+    unlink $fn;
+}
diff --git a/modules/installer/grub/grub-menu-builder.sh b/modules/installer/grub/grub-menu-builder.sh
deleted file mode 100644
index f0e9fdb288c..00000000000
--- a/modules/installer/grub/grub-menu-builder.sh
+++ /dev/null
@@ -1,305 +0,0 @@
-#! @bash@/bin/sh -e
-
-shopt -s nullglob
-
-export PATH=/empty
-for i in @path@; do PATH=$PATH:$i/bin; done
-
-if test $# -ne 1; then
-    echo "Usage: grub-menu-builder.sh DEFAULT-CONFIG"
-    exit 1
-fi
-
-grubVersion="@version@"
-defaultConfig="$1"
-
-case "$grubVersion" in
-    1|2)
-	echo "updating GRUB $grubVersion menu..."
-	;;
-    *)
-	echo "Unsupported GRUB version \`$grubVersion'" >&2
-	echo "Supported versions are \`1' (GRUB Legacy) and \`2' (GRUB 1.9x)." >&2
-	exit 1
-	;;
-esac
-
-
-# Discover whether /boot is on the same filesystem as / and
-# /nix/store.  If not, then all kernels and initrds must be copied to
-# /boot, and all paths in the GRUB config file must be relative to the
-# root of the /boot filesystem.  `$bootRoot' is the path to be
-# prepended to paths under /boot.
-if [ "$(stat -c '%D' /.)" != "$(stat -c '%D' /boot/.)" ]; then
-    bootRoot=
-    copyKernels=1
-elif [ "$(stat -c '%D' /boot/.)" != "$(stat -c '%D' /nix/store/.)" ]; then
-    bootRoot=/boot
-    copyKernels=1
-else
-    bootRoot=/boot
-    copyKernels="@copyKernels@" # user can override in the NixOS config
-fi
-
-
-prologue() {
-    case "$grubVersion" in
-	1)
-	    cat > "$1" << GRUBEND
-# Automatically generated.  DO NOT EDIT THIS FILE!
-default @default@
-timeout @timeout@
-GRUBEND
-	    if [ -n "@splashImage@" ]; then
-                cp -f "@splashImage@" /boot/background.xpm.gz
-                echo "splashimage $bootRoot/background.xpm.gz" >> "$1"
-            fi
-	    ;;
-	2)
-            cp -f @grub@/share/grub/unicode.pf2 /boot/grub/unicode.pf2
-	    cat > "$1" <<EOF
-# Automatically generated.  DO NOT EDIT THIS FILE!
-
-if [ -s \$prefix/grubenv ]; then
-  load_env
-fi
-
-# ‘grub-reboot’ sets a one-time saved entry, which we process here and
-# then delete.
-if [ "\${saved_entry}" ]; then
-  # The next line *has* to look exactly like this, otherwise KDM's
-  # reboot feature won't work properly with GRUB 2.
-  set default="\${saved_entry}"
-  set saved_entry=
-  set prev_saved_entry=
-  save_env saved_entry
-  save_env prev_saved_entry
-  set timeout=1
-else
-  set default=@default@
-  set timeout=@timeout@
-fi
-
-if loadfont $bootRoot/grub/unicode.pf2; then
-  set gfxmode=640x480
-  insmod gfxterm
-  insmod vbe
-  terminal_output gfxterm
-fi
-EOF
-	    if test -n "@splashImage@"; then
-                cp -f "@splashImage@" /boot/background.png
-		# FIXME: GRUB 1.97 doesn't resize the background image
-		# if it doesn't match the video resolution.
-		cat >> "$1" <<EOF
-insmod png
-if background_image $bootRoot/background.png; then
-  set color_normal=white/black
-  set color_highlight=black/white
-else
-  set menu_color_normal=cyan/blue
-  set menu_color_highlight=white/blue
-fi
-EOF
-	    fi
-	    ;;
-    esac
-}
-
-case "$grubVersion" in
-    1) target="/boot/grub/menu.lst";;
-    2) target="/boot/grub/grub.cfg";;
-esac
-
-tmp="$target.tmp"
-
-prologue "$tmp"
-
-
-configurationCounter=0
-configurationLimit="@configurationLimit@"
-numAlienEntries=`cat <<EOF | egrep '^[[:space:]]*title' | wc -l
-@extraEntries@
-EOF`
-
-if test $((configurationLimit+numAlienEntries)) -gt 190; then
-    configurationLimit=$((190-numAlienEntries));
-fi
-
-
-# Convert a path to a file in the Nix store such as
-# /nix/store/<hash>-<name>/file to <hash>-<name>-<file>.
-cleanName() {
-    local path="$1"
-    echo "$path" | sed 's|^/nix/store/||' | sed 's|/|-|g'
-}
-
-
-# Copy a file from the Nix store to /boot/kernels.
-declare -A filesCopied
-
-copyToKernelsDir() {
-    local src="$1"
-    local p="kernels/$(cleanName $src)"
-    local dst="/boot/$p"
-    # Don't copy the file if $dst already exists.  This means that we
-    # have to create $dst atomically to prevent partially copied
-    # kernels or initrd if this script is ever interrupted.
-    if ! test -e $dst; then
-        local dstTmp=$dst.tmp.$$
-        cp "$src" "$dstTmp"
-        mv $dstTmp $dst
-    fi
-    filesCopied[$dst]=1
-    result="$bootRoot/$p"
-}
-
-
-# Add an entry for a configuration to the Grub menu, and if
-# appropriate, copy its kernel and initrd to /boot/kernels.
-addEntry() {
-    local name="$1"
-    local path="$2"
-    local shortSuffix="$3"
-
-    configurationCounter=$((configurationCounter + 1))
-    if test $configurationCounter -gt @configurationLimit@; then
-	return
-    fi
-
-    if ! test -e $path/kernel -a -e $path/initrd; then
-        return
-    fi
-
-    local kernel=$(readlink -f $path/kernel)
-    local initrd=$(readlink -f $path/initrd)
-    local xen=$([ -f $path/xen.gz ] && readlink -f $path/xen.gz)
-
-    if test "$path" = "$defaultConfig"; then
-	cp "$kernel" /boot/nixos-kernel
-	cp "$initrd" /boot/nixos-initrd
-	cp "$(readlink -f "$path/init")" /boot/nixos-init
-	case "$grubVersion" in
-	    1)
-		cat > /boot/nixos-grub-config <<EOF
-title Emergency boot
-  kernel $bootRoot/nixos-kernel systemConfig=$(readlink -f "$path") init=/boot/nixos-init $(cat "$path/kernel-params")
-  initrd $bootRoot/nixos-initrd
-EOF
-		;;
-	    2)
-		cat > /boot/nixos-grub-config <<EOF
-menuentry "Emergency boot" {
-  linux  $bootRoot/nixos-kernel systemConfig=$(readlink -f "$path") init=/boot/nixos-init $(cat "$path/kernel-params")
-  initrd $bootRoot/nixos-initrd
-}
-EOF
-		;;
-	esac
-    fi
-
-    if test -n "$copyKernels"; then
-        copyToKernelsDir $kernel; kernel=$result
-        copyToKernelsDir $initrd; initrd=$result
-        if [ -n "$xen" ]; then copyToKernelsDir $xen; xen=$result; fi
-    fi
-
-    local confName=$(cat $path/configuration-name 2>/dev/null || true)
-    if test -n "$confName"; then
-	name="$confName $3"
-    fi
-
-    local kernelParams="systemConfig=$(readlink -f $path) init=$(readlink -f $path/init) $(cat $path/kernel-params)"
-    local xenParams="$([ -n "$xen" ] && cat $path/xen-params)"
-
-    case "$grubVersion" in
-	1)
-	    cat >> "$tmp" << GRUBEND
-title $name
-  @extraPerEntryConfig@
-  ${xen:+kernel $xen $xenParams}
-  $(if [ -z "$xen" ]; then echo kernel; else echo module; fi) $kernel $kernelParams
-  $(if [ -z "$xen" ]; then echo initrd; else echo module; fi) $initrd
-GRUBEND
-	    ;;
-	2)
-	    cat >> "$tmp" << GRUBEND
-menuentry "$name" {
-  @extraPerEntryConfig@
-  ${xen:+multiboot $xen $xenParams}
-  $(if [ -z "$xen" ]; then echo linux; else echo module; fi) $kernel $kernelParams
-  $(if [ -z "$xen" ]; then echo initrd; else echo module; fi) $initrd
-}
-GRUBEND
-	    ;;
-    esac
-}
-
-
-if test -n "$copyKernels"; then
-    mkdir -p /boot/kernels
-fi
-
-@extraPrepareConfig@
-
-# Additional entries specified verbatim by the configuration.
-extraEntries=`cat <<EOF
-@extraEntries@
-EOF`
-
-
-cat >> $tmp <<EOF
-@extraConfig@
-EOF
-
-if test -n "@extraEntriesBeforeNixOS@"; then 
-    echo "$extraEntries" >> $tmp
-fi
-
-addEntry "NixOS - Default" $defaultConfig ""
-
-if test -z "@extraEntriesBeforeNixOS@"; then 
-    echo "$extraEntries" >> $tmp
-fi
-
-# Add all generations of the system profile to the menu, in reverse
-# (most recent to least recent) order.
-for link in $((ls -d $defaultConfig/fine-tune/* ) | sort -n); do
-    date=$(stat --printf="%y\n" $link | sed 's/\..*//')
-    addEntry "NixOS - variation" $link ""
-done
-
-if [ "$grubVersion" = 2 ]; then
-    cat >> $tmp <<EOF
-submenu "NixOS - Old configurations" {
-EOF
-fi
-
-for generation in $(
-    (cd /nix/var/nix/profiles && for i in system-*-link; do echo $i; done) \
-    | sed 's/system-\([0-9]\+\)-link/\1/' \
-    | sort -n -r); do
-    link=/nix/var/nix/profiles/system-$generation-link
-    date=$(stat --printf="%y\n" $link | sed 's/\..*//' | sed 's/ .*//')
-    kernelVersion=$(cd $(dirname $(readlink -f $link/kernel))/lib/modules && echo *)
-    nixosVersion=$(if [ -e $link/nixos-version ]; then cat $link/nixos-version; fi)
-    addEntry "NixOS - Configuration $generation ($date - ${nixosVersion:-$kernelVersion})" $link "$generation ($date)"
-done
-
-if [ "$grubVersion" = 2 ]; then
-    cat >> $tmp <<EOF
-}
-EOF
-fi
-
-
-# Atomically update the GRUB configuration file.
-mv $tmp $target
-
-
-# Remove obsolete files from /boot/kernels.
-for fn in /boot/kernels/*; do
-    if ! test "${filesCopied[$fn]}" = 1; then
-        rm -vf -- "$fn"
-    fi
-done
diff --git a/modules/installer/grub/grub.nix b/modules/installer/grub/grub.nix
index 94522c3c059..c4bb3bd16cb 100644
--- a/modules/installer/grub/grub.nix
+++ b/modules/installer/grub/grub.nix
@@ -8,16 +8,14 @@ let
 
   grub = if cfg.version == 1 then pkgs.grub else pkgs.grub2;
 
-  grubMenuBuilder = pkgs.substituteAll {
-    src = ./grub-menu-builder.sh;
-    isExecutable = true;
-    inherit grub;
-    inherit (pkgs) bash;
-    path = [pkgs.coreutils pkgs.gnused pkgs.gnugrep];
-    inherit (config.boot.loader.grub) copyKernels extraPrepareConfig
-      extraConfig extraEntries extraEntriesBeforeNixOS extraPerEntryConfig
-      splashImage configurationLimit version default timeout;
-  };
+  grubConfig = pkgs.writeText "grub-config.xml" (builtins.toXML
+    { splashImage = "" + config.boot.loader.grub.splashImage;
+      grub = "" + grub;
+      inherit (config.boot.loader.grub)
+        version extraConfig extraPerEntryConfig extraEntries
+        extraEntriesBeforeNixOS configurationLimit copyKernels timeout
+        default;
+    });
 
 in
 
@@ -199,7 +197,9 @@ in
 
     system.build = mkAssert (cfg.devices != [])
       "You must set the ‘boot.loader.grub.device’ option to make the system bootable."
-      { menuBuilder = grubMenuBuilder;
+      { menuBuilder =
+          "PERL5LIB=${makePerlPath [ pkgs.perlPackages.XMLLibXML pkgs.perlPackages.XMLSAX ]} " +
+          "${pkgs.perl}/bin/perl ${./grub-menu-builder.pl} ${grubConfig}";
         inherit grub;
       };
 
diff --git a/modules/system/activation/switch-to-configuration.sh b/modules/system/activation/switch-to-configuration.sh
index 62af63ec39f..244bd9e72a5 100644
--- a/modules/system/activation/switch-to-configuration.sh
+++ b/modules/system/activation/switch-to-configuration.sh
@@ -23,10 +23,9 @@ fi
 
 # Install or update the bootloader.
 if [ "$action" = "switch" -o "$action" = "boot" ]; then
-    
+
     if [ "@bootLoader@" = "grub" ]; then
         
-        mkdir -m 0700 -p /boot/grub
         @menuBuilder@ @out@
 
         # If the GRUB version has changed, then force a reinstall.
-- 
GitLab


From f0c82f4543fe6d40de7fb264e5f92a7e0eb88754 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 24 Jul 2012 19:22:19 -0400
Subject: [PATCH 3847/5331] =?UTF-8?q?Pass=20the=20=E2=80=98--recheck?=
 =?UTF-8?q?=E2=80=99=20flag=20to=20grub-install?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 modules/system/activation/switch-to-configuration.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/system/activation/switch-to-configuration.sh b/modules/system/activation/switch-to-configuration.sh
index 244bd9e72a5..5958df1ed48 100644
--- a/modules/system/activation/switch-to-configuration.sh
+++ b/modules/system/activation/switch-to-configuration.sh
@@ -36,7 +36,7 @@ if [ "$action" = "switch" -o "$action" = "boot" ]; then
             for dev in @grubDevices@; do
                 if [ "$dev" != nodev ]; then
                     echo "installing the GRUB bootloader on $dev..."
-                    @grub@/sbin/grub-install "$(readlink -f "$dev")" --no-floppy
+                    @grub@/sbin/grub-install --recheck "$(readlink -f "$dev")" --no-floppy
                 fi
             done
             echo "$newGrubVersion" > /boot/grub/version
-- 
GitLab


From fb15b1894e832c8a1820e36791ac92c404bc29bc Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 24 Jul 2012 19:27:16 -0400
Subject: [PATCH 3848/5331] Add missing progress message

---
 modules/installer/grub/grub-menu-builder.pl | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/modules/installer/grub/grub-menu-builder.pl b/modules/installer/grub/grub-menu-builder.pl
index 7f0dc15836b..27c923a279a 100644
--- a/modules/installer/grub/grub-menu-builder.pl
+++ b/modules/installer/grub/grub-menu-builder.pl
@@ -29,6 +29,8 @@ my $defaultEntry = int(get("default"));
 
 die "unsupported GRUB version\n" if $grubVersion != 1 && $grubVersion != 2;
 
+print STDERR "updating GRUB $grubVersion menu...\n";
+
 mkpath("/boot/grub", 0, 0700);
 
 
-- 
GitLab


From a0721ad2b3167f7f02b7af61709c646d6b16ee47 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 24 Jul 2012 22:04:28 -0400
Subject: [PATCH 3849/5331] stage-1-init: Use mount --move to move /sys etc. to
 the target root

This fixes warnings about /sys/kernel/security during shutdown and
cleans up /proc/mounts.
---
 modules/system/boot/stage-1-init.sh | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/modules/system/boot/stage-1-init.sh b/modules/system/boot/stage-1-init.sh
index 175b58a3719..112d3798aec 100644
--- a/modules/system/boot/stage-1-init.sh
+++ b/modules/system/boot/stage-1-init.sh
@@ -362,10 +362,10 @@ fi
 
 mkdir -m 0755 -p $targetRoot/proc $targetRoot/sys $targetRoot/dev $targetRoot/run
 
-mount --bind /proc $targetRoot/proc
-mount --bind /sys $targetRoot/sys
-mount --bind /dev $targetRoot/dev
-mount --bind /run $targetRoot/run
+mount --move /proc $targetRoot/proc
+mount --move /sys $targetRoot/sys
+mount --move /dev $targetRoot/dev
+mount --move /run $targetRoot/run
 
 exec switch_root "$targetRoot" "$stage2Init"
 
-- 
GitLab


From be4c4d79cf7799dcf5d8efd029433379477f77e4 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 24 Jul 2012 22:37:16 -0400
Subject: [PATCH 3850/5331] grub-menu-builder: GRUB now installs unicode.pf2
 automatically

---
 modules/installer/grub/grub-menu-builder.pl | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/modules/installer/grub/grub-menu-builder.pl b/modules/installer/grub/grub-menu-builder.pl
index 27c923a279a..6ac55f3b7af 100644
--- a/modules/installer/grub/grub-menu-builder.pl
+++ b/modules/installer/grub/grub-menu-builder.pl
@@ -63,8 +63,6 @@ if ($grubVersion == 1) {
 }
 
 else {
-    copy "$grub/share/grub/unicode.pf2", "/boot/grub/unicode.pf2" or die "cannot copy unicode.pf2 to /boot/grub: $!\n";
-    
     $conf .= "
         if [ -s \$prefix/grubenv ]; then
           load_env
@@ -86,7 +84,7 @@ else {
           set timeout=$timeout
         fi
 
-        if loadfont $bootRoot/grub/unicode.pf2; then
+        if loadfont $bootRoot/grub/fonts/unicode.pf2; then
           set gfxmode=640x480
           insmod gfxterm
           insmod vbe
-- 
GitLab


From 1b743526bdb3e1bd231a378597f12133ea8fb320 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 25 Jul 2012 09:27:51 -0400
Subject: [PATCH 3851/5331] grub.nix: Handle null values

http://hydra.nixos.org/build/2894714
---
 modules/installer/grub/grub.nix | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/modules/installer/grub/grub.nix b/modules/installer/grub/grub.nix
index c4bb3bd16cb..3a76e08f26a 100644
--- a/modules/installer/grub/grub.nix
+++ b/modules/installer/grub/grub.nix
@@ -8,9 +8,11 @@ let
 
   grub = if cfg.version == 1 then pkgs.grub else pkgs.grub2;
 
+  f = x: if x == null then "" else "" + x;
+
   grubConfig = pkgs.writeText "grub-config.xml" (builtins.toXML
-    { splashImage = "" + config.boot.loader.grub.splashImage;
-      grub = "" + grub;
+    { splashImage = f config.boot.loader.grub.splashImage;
+      grub = f grub;
       inherit (config.boot.loader.grub)
         version extraConfig extraPerEntryConfig extraEntries
         extraEntriesBeforeNixOS configurationLimit copyKernels timeout
-- 
GitLab


From b15e1fbb08eb94534ccc1aa8717816a042b260b8 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 25 Jul 2012 10:47:32 -0400
Subject: [PATCH 3852/5331] Boot loader refactoring
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- Renamed system.build.menuBuilder to system.build.installBootLoader.

- ‘install-grub.pl’ (formerly grub-menu-builder.pl) now generates the
  GRUB menu *and* installs GRUB (if necessary).

- ‘switch-to-configuration.sh’ has no boot loader specific knowledge
  anymore.  It just calls installBootLoader.
---
 modules/installer/cd-dvd/iso-image.nix        |  1 -
 .../cd-dvd/system-tarball-fuloong2f.nix       |  3 --
 .../cd-dvd/system-tarball-sheevaplug.nix      |  3 --
 .../installer/efi-boot-stub/efi-boot-stub.nix |  4 +-
 .../generations-dir/generations-dir.nix       |  4 +-
 modules/installer/grub/grub.nix               |  7 ++--
 .../{grub-menu-builder.pl => install-grub.pl} | 39 +++++++++++++++----
 .../activation/switch-to-configuration.sh     | 28 +------------
 modules/system/activation/top-level.nix       | 21 ++--------
 9 files changed, 43 insertions(+), 67 deletions(-)
 rename modules/installer/grub/{grub-menu-builder.pl => install-grub.pl} (84%)

diff --git a/modules/installer/cd-dvd/iso-image.nix b/modules/installer/cd-dvd/iso-image.nix
index c1094daa49f..4f87f29f2e9 100644
--- a/modules/installer/cd-dvd/iso-image.nix
+++ b/modules/installer/cd-dvd/iso-image.nix
@@ -168,7 +168,6 @@ in
   boot.loader.grub.enable = false;
 
   # !!! Hack - attributes expected by other modules.
-  system.build.menuBuilder = "true";
   system.boot.loader.kernelFile = "bzImage";
   environment.systemPackages = [ pkgs.grub2 ];
 
diff --git a/modules/installer/cd-dvd/system-tarball-fuloong2f.nix b/modules/installer/cd-dvd/system-tarball-fuloong2f.nix
index 5a23a394f7f..5b6e0036639 100644
--- a/modules/installer/cd-dvd/system-tarball-fuloong2f.nix
+++ b/modules/installer/cd-dvd/system-tarball-fuloong2f.nix
@@ -170,9 +170,6 @@ in
   boot.loader.generationsDir.enable = false;
   system.boot.loader.kernelFile = "vmlinux";
 
-  # Needed for nixos to evaluate
-  system.build.menuBuilder = "true";
-
   nixpkgs.config = {
     platform = pkgs.platforms.fuloong2f_n32;
   };
diff --git a/modules/installer/cd-dvd/system-tarball-sheevaplug.nix b/modules/installer/cd-dvd/system-tarball-sheevaplug.nix
index 24e7a006314..f53079ecd9b 100644
--- a/modules/installer/cd-dvd/system-tarball-sheevaplug.nix
+++ b/modules/installer/cd-dvd/system-tarball-sheevaplug.nix
@@ -177,9 +177,6 @@ in
   services.ttyBackgrounds.enable = false;
   jobs.openssh.startOn = pkgs.lib.mkOverrideTemplate 50 {} "";
 
-  # Needed for nixos to evaluate
-  system.build.menuBuilder = "true";
-
   nixpkgs.config = {
     platform = pkgs.platforms.sheevaplug;
   };
diff --git a/modules/installer/efi-boot-stub/efi-boot-stub.nix b/modules/installer/efi-boot-stub/efi-boot-stub.nix
index 1ca3cb0001e..a4e0ebd9845 100644
--- a/modules/installer/efi-boot-stub/efi-boot-stub.nix
+++ b/modules/installer/efi-boot-stub/efi-boot-stub.nix
@@ -123,9 +123,7 @@ in
   system = mkIf (config.boot.loader.efiBootStub.enable && (assert
     (config.boot.kernelPackages.kernel.features ? efiBootStub &&
     config.boot.kernelPackages.kernel.features.efiBootStub); true)) {
-    build = {
-      menuBuilder = efiBootStubBuilder;
-    };
+    build.installBootLoader = efiBootStubBuilder;
     boot.loader.id = "efiBootStub";
     boot.loader.kernelFile = platform.kernelTarget;
   };
diff --git a/modules/installer/generations-dir/generations-dir.nix b/modules/installer/generations-dir/generations-dir.nix
index db9fa32c55a..b67cf7e56e7 100644
--- a/modules/installer/generations-dir/generations-dir.nix
+++ b/modules/installer/generations-dir/generations-dir.nix
@@ -63,9 +63,7 @@ in
   ];
 
   system = mkIf config.boot.loader.generationsDir.enable {
-    build = {
-      menuBuilder = generationsDirBuilder;
-    };
+    build.installBootLoader = generationsDirBuilder;
     boot.loader.id = "generationsDir";
     boot.loader.kernelFile = platform.kernelTarget;
   };
diff --git a/modules/installer/grub/grub.nix b/modules/installer/grub/grub.nix
index 3a76e08f26a..0a9b374cc60 100644
--- a/modules/installer/grub/grub.nix
+++ b/modules/installer/grub/grub.nix
@@ -13,10 +13,11 @@ let
   grubConfig = pkgs.writeText "grub-config.xml" (builtins.toXML
     { splashImage = f config.boot.loader.grub.splashImage;
       grub = f grub;
+      fullVersion = (builtins.parseDrvName config.system.build.grub.name).version;
       inherit (config.boot.loader.grub)
         version extraConfig extraPerEntryConfig extraEntries
         extraEntriesBeforeNixOS configurationLimit copyKernels timeout
-        default;
+        default devices;
     });
 
 in
@@ -199,9 +200,9 @@ in
 
     system.build = mkAssert (cfg.devices != [])
       "You must set the ‘boot.loader.grub.device’ option to make the system bootable."
-      { menuBuilder =
+      { installBootLoader =
           "PERL5LIB=${makePerlPath [ pkgs.perlPackages.XMLLibXML pkgs.perlPackages.XMLSAX ]} " +
-          "${pkgs.perl}/bin/perl ${./grub-menu-builder.pl} ${grubConfig}";
+          "${pkgs.perl}/bin/perl ${./install-grub.pl} ${grubConfig}";
         inherit grub;
       };
 
diff --git a/modules/installer/grub/grub-menu-builder.pl b/modules/installer/grub/install-grub.pl
similarity index 84%
rename from modules/installer/grub/grub-menu-builder.pl
rename to modules/installer/grub/install-grub.pl
index 6ac55f3b7af..76fa71c827f 100644
--- a/modules/installer/grub/grub-menu-builder.pl
+++ b/modules/installer/grub/install-grub.pl
@@ -5,7 +5,6 @@ use File::Basename;
 use File::Path;
 use File::stat;
 use File::Copy;
-use IO::File;
 use POSIX;
 use Cwd;
 
@@ -15,6 +14,19 @@ my $dom = XML::LibXML->load_xml(location => $ARGV[0]);
 
 sub get { my ($name) = @_; return $dom->findvalue("/expr/attrs/attr[\@name = '$name']/*/\@value"); }
 
+sub readFile {
+    my ($fn) = @_; local $/ = undef;
+    open FILE, "<$fn" or return undef; my $s = <FILE>; close FILE;
+    local $/ = "\n"; chomp $s; return $s;
+}
+
+sub writeFile {
+    my ($fn, $s) = @_;
+    open FILE, ">$fn" or die "cannot create $fn: $!\n";
+    print FILE $s or die;
+    close FILE or die;
+}
+
 my $grub = get("grub");
 my $grubVersion = int(get("version"));
 my $extraConfig = get("extraConfig");
@@ -151,8 +163,8 @@ sub addEntry {
     my $kernelParams =
         "systemConfig=" . Cwd::abs_path($path) . " " .
         "init=" . Cwd::abs_path("$path/init") . " " .
-        join " ", IO::File->new("$path/kernel-params")->getlines;
-    my $xenParams = $xen && -e "$path/xen-params" ? join " ", IO::File->new("$path/xen-params")->getlines : "";
+        readFile("$path/kernel-params");
+    my $xenParams = $xen && -e "$path/xen-params" ? readFile("$path/xen-params") : "";
 
     if ($grubVersion == 1) {
         $conf .= "title $name\n";
@@ -192,7 +204,7 @@ foreach my $link (@links) {
     my $date = strftime("%F", localtime(lstat($link)->mtime));
     my $version =
         -e "$link/nixos-version"
-        ? IO::File->new("$link/nixos-version")->getline
+        ? readFile("$link/nixos-version")
         : basename((glob(dirname(Cwd::abs_path("$link/kernel")) . "/lib/modules/*"))[0]);
     addEntry("NixOS - Configuration " . nrFromGen($link) . " ($date - $version)", $link);
 }
@@ -203,9 +215,7 @@ $conf .= "}\n" if $grubVersion == 2;
 # Atomically update the GRUB config.
 my $confFile = $grubVersion == 1 ? "/boot/grub/menu.lst" : "/boot/grub/grub.cfg";
 my $tmpFile = $confFile . ".tmp";
-open CONF, ">$tmpFile" or die "cannot open $tmpFile for writing\n";
-print CONF $conf or die;
-close CONF;
+writeFile($tmpFile, $conf);
 rename $tmpFile, $confFile or die "cannot rename $tmpFile to $confFile\n";
 
 
@@ -215,3 +225,18 @@ foreach my $fn (glob "/boot/kernels/*") {
     print STDERR "removing obsolete file $fn\n";
     unlink $fn;
 }
+
+
+# Install GRUB if the version changed from the last time we installed
+# it.  FIXME: shouldn't we reinstall if ‘devices’ changed?
+my $prevVersion = readFile("/boot/grub/version") // "";
+if (($ENV{'NIXOS_INSTALL_GRUB'} // "") eq "1" || get("fullVersion") ne $prevVersion) {
+    foreach my $dev ($dom->findnodes('/expr/attrs/attr[@name = "devices"]/list/string/@value')) {
+        $dev = $dev->findvalue(".") or die;
+        next if $dev eq "nodev";
+        print STDERR "installing the GRUB $grubVersion boot loader on $dev...\n";
+        system("$grub/sbin/grub-install", "--recheck", Cwd::abs_path($dev)) == 0
+            or die "$0: installation of GRUB on $dev failed\n";
+    }
+    writeFile("/boot/grub/version", get("fullVersion"));
+}
diff --git a/modules/system/activation/switch-to-configuration.sh b/modules/system/activation/switch-to-configuration.sh
index 5958df1ed48..fea0b05ef34 100644
--- a/modules/system/activation/switch-to-configuration.sh
+++ b/modules/system/activation/switch-to-configuration.sh
@@ -23,32 +23,8 @@ fi
 
 # Install or update the bootloader.
 if [ "$action" = "switch" -o "$action" = "boot" ]; then
-
-    if [ "@bootLoader@" = "grub" ]; then
-        
-        @menuBuilder@ @out@
-
-        # If the GRUB version has changed, then force a reinstall.
-        oldGrubVersion="$(cat /boot/grub/version 2>/dev/null || true)"
-        newGrubVersion="@grubVersion@"
-
-        if [ "$NIXOS_INSTALL_GRUB" = 1 -o "$oldGrubVersion" != "$newGrubVersion" ]; then
-            for dev in @grubDevices@; do
-                if [ "$dev" != nodev ]; then
-                    echo "installing the GRUB bootloader on $dev..."
-                    @grub@/sbin/grub-install --recheck "$(readlink -f "$dev")" --no-floppy
-                fi
-            done
-            echo "$newGrubVersion" > /boot/grub/version
-        fi
-          
-    elif [ "@bootLoader@" = "generationsDir" ]; then
-        @menuBuilder@ @out@
-    elif [ "@bootLoader@" = "efiBootStub" ]; then
-        @menuBuilder@ @out@
-    else
-        echo "Warning: don't know how to make this configuration bootable; please enable a boot loader." 1>&2
-    fi
+    
+    @installBootLoader@ @out@
 
     if [ -n "@initScriptBuilder@" ]; then
         @initScriptBuilder@ @out@
diff --git a/modules/system/activation/top-level.nix b/modules/system/activation/top-level.nix
index 3edc92d502c..0e1a9a3d2ad 100644
--- a/modules/system/activation/top-level.nix
+++ b/modules/system/activation/top-level.nix
@@ -101,9 +101,6 @@ let
 
       ln -s ${kernelPath} $out/kernel
       ln -s ${config.system.modulesTree} $out/kernel-modules
-      if [ -n "$grub" ]; then
-        ln -s $grub $out/grub
-      fi
 
       ln -s ${config.system.build.initialRamdisk}/initrd $out/initrd
 
@@ -152,7 +149,9 @@ let
     inherit children;
     kernelParams =
       config.boot.kernelParams ++ config.boot.extraKernelParams;
-    menuBuilder = config.system.build.menuBuilder or "true";
+    installBootLoader =
+      config.system.build.installBootLoader
+      or "echo 'Warning: don't know how to make this configuration bootable; please enable a boot loader.' 1>&2; true";
     initScriptBuilder = config.system.build.initScriptBuilder;
     activationScript = config.system.activationScripts.script;
     nixosVersion = config.system.nixosVersion;
@@ -176,20 +175,6 @@ let
         config.system.build.upstart # for initctl
       ];
 
-    # Boot loaders
-    bootLoader = config.system.boot.loader.id;
-    grub =
-      if config.boot.loader.grub.enable
-      then config.system.build.grub
-      else null;
-    grubVersion =
-      if config.boot.loader.grub.enable
-      then (builtins.parseDrvName config.system.build.grub.name).version
-      else "";
-    grubDevices =
-      let
-        wrapQuotes = s: "\"" + s + "\"";
-      in map wrapQuotes config.boot.loader.grub.devices;
     configurationName = config.boot.loader.grub.configurationName;
   };
 
-- 
GitLab


From 8b91a5f2ff2f5489ff5e06ffd071341ae1452781 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 25 Jul 2012 10:59:03 -0400
Subject: [PATCH 3853/5331] Move boot loader modules to
 modules/system/boot/loader

---
 modules/module-list.nix                           |  14 +++++++-------
 .../efi-boot-stub/efi-boot-stub-builder.sh        |   0
 .../boot/loader}/efi-boot-stub/efi-boot-stub.nix  |   0
 .../generations-dir/generations-dir-builder.sh    |   0
 .../loader}/generations-dir/generations-dir.nix   |   2 +-
 .../boot/loader}/grub/grub.nix                    |   0
 .../boot/loader}/grub/install-grub.pl             |   0
 .../boot/loader}/grub/memtest.nix                 |   0
 .../loader}/grub/winkler-gnu-blue-640x480.png     | Bin
 .../boot/loader}/grub/winkler-gnu-blue.README     |   0
 10 files changed, 8 insertions(+), 8 deletions(-)
 rename modules/{installer => system/boot/loader}/efi-boot-stub/efi-boot-stub-builder.sh (100%)
 rename modules/{installer => system/boot/loader}/efi-boot-stub/efi-boot-stub.nix (100%)
 rename modules/{installer => system/boot/loader}/generations-dir/generations-dir-builder.sh (100%)
 rename modules/{installer => system/boot/loader}/generations-dir/generations-dir.nix (95%)
 rename modules/{installer => system/boot/loader}/grub/grub.nix (100%)
 rename modules/{installer => system/boot/loader}/grub/install-grub.pl (100%)
 rename modules/{installer => system/boot/loader}/grub/memtest.nix (100%)
 rename modules/{installer => system/boot/loader}/grub/winkler-gnu-blue-640x480.png (100%)
 rename modules/{installer => system/boot/loader}/grub/winkler-gnu-blue.README (100%)

diff --git a/modules/module-list.nix b/modules/module-list.nix
index 2e6f77afa1f..f5296ccf942 100644
--- a/modules/module-list.nix
+++ b/modules/module-list.nix
@@ -14,6 +14,7 @@
   ./config/timezone.nix
   ./config/unix-odbc-drivers.nix
   ./config/users-groups.nix
+  ./hardware/all-firmware.nix
   ./hardware/cpu/intel-microcode.nix
   ./hardware/network/b43.nix
   ./hardware/network/intel-2100bg.nix
@@ -22,11 +23,6 @@
   ./hardware/network/rt73.nix
   ./hardware/network/rtl8192c.nix
   ./hardware/pcmcia.nix
-  ./hardware/all-firmware.nix
-  ./installer/efi-boot-stub/efi-boot-stub.nix
-  ./installer/generations-dir/generations-dir.nix
-  ./installer/grub/grub.nix
-  ./installer/grub/memtest.nix
   ./installer/init-script/init-script.nix
   ./installer/tools/nixos-checkout.nix
   ./installer/tools/tools.nix
@@ -34,8 +30,8 @@
   ./misc/check-config.nix
   ./misc/crashdump.nix
   ./misc/ids.nix
-  ./misc/locate.nix
   ./misc/lib.nix
+  ./misc/locate.nix
   ./misc/nixpkgs.nix
   ./misc/passthru.nix
   ./misc/version.nix
@@ -60,8 +56,8 @@
   ./services/amqp/rabbitmq.nix
   ./services/audio/alsa.nix
   ./services/audio/fuppes.nix
-  ./services/audio/pulseaudio.nix
   ./services/audio/mpd.nix
+  ./services/audio/pulseaudio.nix
   ./services/backup/mysql-backup.nix
   ./services/backup/postgresql-backup.nix
   ./services/backup/sitecopy-backup.nix
@@ -199,6 +195,10 @@
   ./system/activation/activation-script.nix
   ./system/activation/top-level.nix
   ./system/boot/kernel.nix
+  ./system/boot/loader/efi-boot-stub/efi-boot-stub.nix
+  ./system/boot/loader/generations-dir/generations-dir.nix
+  ./system/boot/loader/grub/grub.nix
+  ./system/boot/loader/grub/memtest.nix
   ./system/boot/luksroot.nix
   ./system/boot/modprobe.nix
   ./system/boot/stage-1.nix
diff --git a/modules/installer/efi-boot-stub/efi-boot-stub-builder.sh b/modules/system/boot/loader/efi-boot-stub/efi-boot-stub-builder.sh
similarity index 100%
rename from modules/installer/efi-boot-stub/efi-boot-stub-builder.sh
rename to modules/system/boot/loader/efi-boot-stub/efi-boot-stub-builder.sh
diff --git a/modules/installer/efi-boot-stub/efi-boot-stub.nix b/modules/system/boot/loader/efi-boot-stub/efi-boot-stub.nix
similarity index 100%
rename from modules/installer/efi-boot-stub/efi-boot-stub.nix
rename to modules/system/boot/loader/efi-boot-stub/efi-boot-stub.nix
diff --git a/modules/installer/generations-dir/generations-dir-builder.sh b/modules/system/boot/loader/generations-dir/generations-dir-builder.sh
similarity index 100%
rename from modules/installer/generations-dir/generations-dir-builder.sh
rename to modules/system/boot/loader/generations-dir/generations-dir-builder.sh
diff --git a/modules/installer/generations-dir/generations-dir.nix b/modules/system/boot/loader/generations-dir/generations-dir.nix
similarity index 95%
rename from modules/installer/generations-dir/generations-dir.nix
rename to modules/system/boot/loader/generations-dir/generations-dir.nix
index b67cf7e56e7..8184b9c0a98 100644
--- a/modules/installer/generations-dir/generations-dir.nix
+++ b/modules/system/boot/loader/generations-dir/generations-dir.nix
@@ -19,7 +19,7 @@ let
               point to the current generation's kernel image, initial RAM
               disk, and other bootstrap files.
 
-              This optional is not necessary with bootloads such as GNU GRUB
+              This optional is not necessary with boot loaders such as GNU GRUB
               for which the menu is updated to point to the latest bootstrap
               files.  However, it is needed for U-Boot on platforms where the
               boot command line is stored in flash memory rather than in a
diff --git a/modules/installer/grub/grub.nix b/modules/system/boot/loader/grub/grub.nix
similarity index 100%
rename from modules/installer/grub/grub.nix
rename to modules/system/boot/loader/grub/grub.nix
diff --git a/modules/installer/grub/install-grub.pl b/modules/system/boot/loader/grub/install-grub.pl
similarity index 100%
rename from modules/installer/grub/install-grub.pl
rename to modules/system/boot/loader/grub/install-grub.pl
diff --git a/modules/installer/grub/memtest.nix b/modules/system/boot/loader/grub/memtest.nix
similarity index 100%
rename from modules/installer/grub/memtest.nix
rename to modules/system/boot/loader/grub/memtest.nix
diff --git a/modules/installer/grub/winkler-gnu-blue-640x480.png b/modules/system/boot/loader/grub/winkler-gnu-blue-640x480.png
similarity index 100%
rename from modules/installer/grub/winkler-gnu-blue-640x480.png
rename to modules/system/boot/loader/grub/winkler-gnu-blue-640x480.png
diff --git a/modules/installer/grub/winkler-gnu-blue.README b/modules/system/boot/loader/grub/winkler-gnu-blue.README
similarity index 100%
rename from modules/installer/grub/winkler-gnu-blue.README
rename to modules/system/boot/loader/grub/winkler-gnu-blue.README
-- 
GitLab


From b52117c34d582075beed6c70368aeec4864b5d03 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 25 Jul 2012 11:30:16 -0400
Subject: [PATCH 3854/5331] Treat init-script as a boot loader

---
 modules/module-list.nix                                      | 2 +-
 modules/system/activation/switch-to-configuration.sh         | 5 -----
 modules/system/activation/top-level.nix                      | 1 -
 .../boot/loader}/init-script/init-script-builder.sh          | 2 +-
 .../boot/loader}/init-script/init-script.nix                 | 5 ++---
 5 files changed, 4 insertions(+), 11 deletions(-)
 rename modules/{installer => system/boot/loader}/init-script/init-script-builder.sh (97%)
 rename modules/{installer => system/boot/loader}/init-script/init-script.nix (87%)

diff --git a/modules/module-list.nix b/modules/module-list.nix
index f5296ccf942..e2c9516ac46 100644
--- a/modules/module-list.nix
+++ b/modules/module-list.nix
@@ -23,7 +23,6 @@
   ./hardware/network/rt73.nix
   ./hardware/network/rtl8192c.nix
   ./hardware/pcmcia.nix
-  ./installer/init-script/init-script.nix
   ./installer/tools/nixos-checkout.nix
   ./installer/tools/tools.nix
   ./misc/assertions.nix
@@ -199,6 +198,7 @@
   ./system/boot/loader/generations-dir/generations-dir.nix
   ./system/boot/loader/grub/grub.nix
   ./system/boot/loader/grub/memtest.nix
+  ./system/boot/loader/init-script/init-script.nix
   ./system/boot/luksroot.nix
   ./system/boot/modprobe.nix
   ./system/boot/stage-1.nix
diff --git a/modules/system/activation/switch-to-configuration.sh b/modules/system/activation/switch-to-configuration.sh
index fea0b05ef34..285b095aa3e 100644
--- a/modules/system/activation/switch-to-configuration.sh
+++ b/modules/system/activation/switch-to-configuration.sh
@@ -23,12 +23,7 @@ fi
 
 # Install or update the bootloader.
 if [ "$action" = "switch" -o "$action" = "boot" ]; then
-    
     @installBootLoader@ @out@
-
-    if [ -n "@initScriptBuilder@" ]; then
-        @initScriptBuilder@ @out@
-    fi
 fi
 
 # Activate the new configuration.
diff --git a/modules/system/activation/top-level.nix b/modules/system/activation/top-level.nix
index 0e1a9a3d2ad..1eea759d8c9 100644
--- a/modules/system/activation/top-level.nix
+++ b/modules/system/activation/top-level.nix
@@ -152,7 +152,6 @@ let
     installBootLoader =
       config.system.build.installBootLoader
       or "echo 'Warning: don't know how to make this configuration bootable; please enable a boot loader.' 1>&2; true";
-    initScriptBuilder = config.system.build.initScriptBuilder;
     activationScript = config.system.activationScripts.script;
     nixosVersion = config.system.nixosVersion;
 
diff --git a/modules/installer/init-script/init-script-builder.sh b/modules/system/boot/loader/init-script/init-script-builder.sh
similarity index 97%
rename from modules/installer/init-script/init-script-builder.sh
rename to modules/system/boot/loader/init-script/init-script-builder.sh
index f091dc8b6c8..502b3b63af2 100644
--- a/modules/installer/init-script/init-script-builder.sh
+++ b/modules/system/boot/loader/init-script/init-script-builder.sh
@@ -6,7 +6,7 @@ export PATH=/empty
 for i in @path@; do PATH=$PATH:$i/bin; done
 
 if test $# -ne 1; then
-    echo "Usage: grub-menu-builder.sh DEFAULT-CONFIG"
+    echo "Usage: init-script-builder.sh DEFAULT-CONFIG"
     exit 1
 fi
 
diff --git a/modules/installer/init-script/init-script.nix b/modules/system/boot/loader/init-script/init-script.nix
similarity index 87%
rename from modules/installer/init-script/init-script.nix
rename to modules/system/boot/loader/init-script/init-script.nix
index edf7d23d2a7..ef5e97eb2c9 100644
--- a/modules/installer/init-script/init-script.nix
+++ b/modules/system/boot/loader/init-script/init-script.nix
@@ -41,10 +41,9 @@ in
 
   ###### implementation
 
-  config = {
+  config = mkIf config.boot.loader.initScript.enable {
 
-    system.build.initScriptBuilder =
-       if config.boot.loader.initScript.enable then initScriptBuilder else "";
+    system.build.installBootLoader = initScriptBuilder;
 
   };
 
-- 
GitLab


From 8cae5e57827ed1bfd69e2f7c24ea4d62a5eba185 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 25 Jul 2012 11:39:41 -0400
Subject: [PATCH 3855/5331] Remove jfsrec from the minimal CD because it pulls
 in Boost

---
 modules/profiles/base.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/profiles/base.nix b/modules/profiles/base.nix
index 75a58f8568a..2240311c885 100644
--- a/modules/profiles/base.nix
+++ b/modules/profiles/base.nix
@@ -34,7 +34,7 @@
     pkgs.dosfstools
     pkgs.xfsprogs
     pkgs.jfsutils
-    pkgs.jfsrec
+    #pkgs.jfsrec # disabled because of Boost dependency
 
     # Some compression/archiver tools.
     pkgs.unrar
-- 
GitLab


From db7a11b13213d5e3f70c2af285cd7e4914558c4a Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 25 Jul 2012 11:54:24 -0400
Subject: [PATCH 3856/5331] Manual: prevent a runtime dependency on DocBook XSL

---
 doc/manual/default.nix | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/doc/manual/default.nix b/doc/manual/default.nix
index c82a46b0537..d3f554c099e 100644
--- a/doc/manual/default.nix
+++ b/doc/manual/default.nix
@@ -57,12 +57,14 @@ in rec {
         ${pkgs.docbook5_xsl}/xml/xsl/docbook/xhtml/docbook.xsl \
         ./manual.xml
 
-      ln -s ${pkgs.docbook5_xsl}/xml/xsl/docbook/images $dst/
+      mkdir -p $dst/images/callouts
+      cp ${pkgs.docbook5_xsl}/xml/xsl/docbook/images/callouts/*.gif $dst/images/callouts/
+      
       cp ${./style.css} $dst/style.css
 
       ensureDir $out/nix-support
       echo "doc manual $dst manual.html" >> $out/nix-support/hydra-build-products
-    '';
+    ''; # */
   };
 
   # Generate the NixOS manpages.
-- 
GitLab


From 557f39aa0f9d8b5b10ef6b58c1f040b90807a7c2 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 25 Jul 2012 16:37:29 -0400
Subject: [PATCH 3857/5331] install-grub.pl: Apply the configuration limit only
 to old generations

---
 modules/system/boot/loader/grub/install-grub.pl | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/modules/system/boot/loader/grub/install-grub.pl b/modules/system/boot/loader/grub/install-grub.pl
index 76fa71c827f..99bf171c778 100644
--- a/modules/system/boot/loader/grub/install-grub.pl
+++ b/modules/system/boot/loader/grub/install-grub.pl
@@ -125,7 +125,6 @@ $conf .= "$extraConfig\n";
 
 
 # Generate the menu entries.
-my $curEntry = 0;
 $conf .= "\n";
 
 my %copied;
@@ -151,7 +150,6 @@ sub copyToKernelsDir {
 
 sub addEntry {
     my ($name, $path) = @_;
-    return if $curEntry++ > $configurationLimit;
     return unless -e "$path/kernel" && -e "$path/initrd";
 
     my $kernel = copyToKernelsDir(Cwd::abs_path("$path/kernel"));
@@ -199,8 +197,10 @@ sub nrFromGen { my ($x) = @_; $x =~ /system-(.*)-link/; return $1; }
 my @links = sort
     { nrFromGen($b) <=> nrFromGen($a) }
     (glob "/nix/var/nix/profiles/system-*-link");
-    
+
+my $curEntry = 0;
 foreach my $link (@links) {
+    last if $curEntry++ >= $configurationLimit;
     my $date = strftime("%F", localtime(lstat($link)->mtime));
     my $version =
         -e "$link/nixos-version"
-- 
GitLab


From 16da4a14f1b2e9ab7f546afd29b17d0808dc004d Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 25 Jul 2012 16:38:05 -0400
Subject: [PATCH 3858/5331] amazon-image.nix: Don't put any old configurations
 in the GRUB menu

---
 modules/virtualisation/amazon-image.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/modules/virtualisation/amazon-image.nix b/modules/virtualisation/amazon-image.nix
index 203c9a724ce..9ada2b176fe 100644
--- a/modules/virtualisation/amazon-image.nix
+++ b/modules/virtualisation/amazon-image.nix
@@ -139,6 +139,10 @@ with pkgs.lib;
       cp ${pkgs.utillinux}/sbin/swapon $out/bin
     '';
 
+  # Don't put old configurations in the GRUB menu.  The user has no
+  # way to select them anyway.
+  boot.loader.grub.configurationLimit = 0;
+
   # Allow root logins only using the SSH key that the user specified
   # at instance creation time.
   services.openssh.enable = true;
-- 
GitLab


From 29ef89ac0387e7bee81866a042b74e0c5e9dc209 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 25 Jul 2012 18:38:20 -0400
Subject: [PATCH 3859/5331] Fix the tests

http://hydra.nixos.org/build/2903932
---
 tests/installer.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tests/installer.nix b/tests/installer.nix
index 2b3232ca353..88ad79ae0ee 100644
--- a/tests/installer.nix
+++ b/tests/installer.nix
@@ -22,6 +22,7 @@ let
               [ pkgs.glibcLocales
                 pkgs.sudo
                 pkgs.docbook5
+                pkgs.docbook5_xsl
                 pkgs.grub
               ];
           }
-- 
GitLab


From 92515b288c60f1e6839ec0fc196deb395d167654 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 26 Jul 2012 09:42:05 -0400
Subject: [PATCH 3860/5331] Fix the installer tests

http://hydra.nixos.org/build/2904451
---
 tests/installer.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tests/installer.nix b/tests/installer.nix
index 88ad79ae0ee..2e8f3f62b07 100644
--- a/tests/installer.nix
+++ b/tests/installer.nix
@@ -24,6 +24,7 @@ let
                 pkgs.docbook5
                 pkgs.docbook5_xsl
                 pkgs.grub
+                pkgs.perlPackages.XMLLibXML
               ];
           }
         ];
-- 
GitLab


From 7c1c4c757c5381321928958bda418758ed88061f Mon Sep 17 00:00:00 2001
From: Florian Friesdorf <flo@chaoflow.net>
Date: Thu, 26 Jul 2012 16:49:55 +0200
Subject: [PATCH 3861/5331] add setuid wrapper for newgrp

---
 modules/programs/shadow.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/programs/shadow.nix b/modules/programs/shadow.nix
index 137064bba85..a3f837c7367 100644
--- a/modules/programs/shadow.nix
+++ b/modules/programs/shadow.nix
@@ -93,7 +93,7 @@ in
         { name = "login"; ownDevices = true; allowNullPassword = true; }
       ];
 
-    security.setuidPrograms = [ "passwd" "chfn" "su" ];
+    security.setuidPrograms = [ "passwd" "chfn" "su" "newgrp" ];
 
   };
 
-- 
GitLab


From 1a2b3cc5e4209fdf15ab1abf17ace8c08b48ddf8 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 26 Jul 2012 15:09:01 -0400
Subject: [PATCH 3862/5331] Fix the tests.installer.grub1 test

GRUB 1 doesn't understand /dev/vda, so use a SCSI rather than virtio disk.
---
 lib/test-driver/Machine.pm |  4 +++-
 tests/installer.nix        | 36 +++++++++++++++++-------------------
 2 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/lib/test-driver/Machine.pm b/lib/test-driver/Machine.pm
index dee1e4f33cb..947291b52c4 100644
--- a/lib/test-driver/Machine.pm
+++ b/lib/test-driver/Machine.pm
@@ -29,8 +29,10 @@ sub new {
         $startCommand =
             "qemu-kvm -m 384 " .
             "-net nic,model=virtio \$QEMU_OPTS ";
-        $startCommand .= "-drive file=" . Cwd::abs_path($args->{hda}) . ",if=virtio,boot=on,werror=report "
+        my $iface = $args->{hdaInterface} or "virtio";
+        $startCommand .= "-drive file=" . Cwd::abs_path($args->{hda}) . ",if=$iface,boot=on,werror=report "
             if defined $args->{hda};
+        
         $startCommand .= "-cdrom $args->{cdrom} "
             if defined $args->{cdrom};
         $startCommand .= $args->{qemuFlags} || "";
diff --git a/tests/installer.nix b/tests/installer.nix
index 2e8f3f62b07..c6b84c1d955 100644
--- a/tests/installer.nix
+++ b/tests/installer.nix
@@ -32,7 +32,7 @@ let
 
 
   # The configuration to install.
-  config = { fileSystems, testChannel, grubVersion }: pkgs.writeText "configuration.nix"
+  config = { fileSystems, testChannel, grubVersion, grubDevice }: pkgs.writeText "configuration.nix"
     ''
       { config, pkgs, modulesPath, ... }:
 
@@ -45,7 +45,7 @@ let
         ${optionalString (grubVersion == 1) ''
           boot.loader.grub.splashImage = null;
         ''}
-        boot.loader.grub.device = "/dev/vda";
+        boot.loader.grub.device = "${grubDevice}";
         boot.loader.grub.extraConfig = "serial; terminal_output.serial";
         boot.initrd.kernelModules = [ "ext3" "virtio_console" ];
 
@@ -95,11 +95,14 @@ let
   # a test script fragment `createPartitions', which must create
   # partitions and filesystems, and a configuration.nix fragment
   # `fileSystems'.
-  testScriptFun = { createPartitions, fileSystems, testChannel, grubVersion }:
+  testScriptFun = { createPartitions, fileSystems, testChannel, grubVersion, grubDevice }:
+    let iface = if grubVersion == 1 then "scsi" else "virtio"; in
     ''
       createDisk("harddisk", 4 * 1024);
 
-      my $machine = createMachine({ hda => "harddisk", cdrom => glob("${iso}/iso/*.iso"),
+      my $machine = createMachine({ hda => "harddisk",
+        hdaInterface => "${iface}",
+        cdrom => glob("${iso}/iso/*.iso"),
         qemuFlags => '${optionalString testChannel (toString (qemuNICFlags 1 1 2))} ${optionalString (pkgs.stdenv.system == "x86_64-linux") "-cpu kvm64"}'});
       $machine->start;
 
@@ -151,15 +154,9 @@ let
       print STDERR "Result of the hardware scan:\n$cfg\n";
 
       $machine->copyFileFromHost(
-          "${ config { inherit fileSystems testChannel grubVersion; } }",
+          "${ config { inherit fileSystems testChannel grubVersion grubDevice; } }",
           "/mnt/etc/nixos/configuration.nix");
 
-      # Hack to get GRUB 1 to install on virtio.  GRUB 1 has a patch
-      # from Gentoo to support virtio, but it's incomplete: it doesn't
-      # detect /dev/vd* automatically.  And we don't care enough about
-      # GRUB 1 to fix it.
-      $machine->mustSucceed("mkdir -p /mnt/boot/grub; echo '(hd0) /dev/vda' > /mnt/boot/grub/device.map");
-      
       # Perform the installation.
       $machine->mustSucceed("nixos-install >&2");
 
@@ -169,7 +166,7 @@ let
       $machine->shutdown;
 
       # Now see if we can boot the installation.
-      my $machine = createMachine({ hda => "harddisk" });
+      my $machine = createMachine({ hda => "harddisk", hdaInterface => "${iface}" });
 
       # Did /boot get mounted, if appropriate?
       # !!! There is currently no good way to wait for the
@@ -196,11 +193,11 @@ let
     '';
 
 
-  makeTest = { createPartitions, fileSystems, testChannel ? false, grubVersion ? 2 }:
+  makeTest = { createPartitions, fileSystems, testChannel ? false, grubVersion ? 2, grubDevice ? "/dev/vda" }:
     { inherit iso;
       nodes = if testChannel then { inherit webserver; } else { };
       testScript = testScriptFun {
-        inherit createPartitions fileSystems testChannel grubVersion;
+        inherit createPartitions fileSystems testChannel grubVersion grubDevice;
       };
     };
 
@@ -315,18 +312,19 @@ in {
     { createPartitions =
         ''
           $machine->mustSucceed(
-              "parted /dev/vda mklabel msdos",
-              "parted /dev/vda -- mkpart primary linux-swap 1M 1024M",
-              "parted /dev/vda -- mkpart primary ext2 1024M -1s",
+              "parted /dev/sda mklabel msdos",
+              "parted /dev/sda -- mkpart primary linux-swap 1M 1024M",
+              "parted /dev/sda -- mkpart primary ext2 1024M -1s",
               "udevadm settle",
-              "mkswap /dev/vda1 -L swap",
+              "mkswap /dev/sda1 -L swap",
               "swapon -L swap",
-              "mkfs.ext3 -L nixos /dev/vda2",
+              "mkfs.ext3 -L nixos /dev/sda2",
               "mount LABEL=nixos /mnt",
           );
         '';
       fileSystems = rootFS;
       grubVersion = 1;
+      grubDevice = "/dev/sda";
     };
 
   # Rebuild the CD configuration with a little modification.
-- 
GitLab


From 87ae76866537cb1a09e202a439c0fb4eb3d93fb9 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 26 Jul 2012 15:52:05 -0400
Subject: [PATCH 3863/5331] Fix the LVM installer test

GRUB 2 doesn't want to boot off a LVM disk:

machine# installing the GRUB 2 boot loader on /dev/vda...
machine# Path `/boot/grub' is not readable by GRUB on boot. Installation is impossible. Aborting.
machine# /nix/store/7yc535h1lim1a5gkhjb3fr6c8193dv8w-install-grub.pl: installation of GRUB on /dev/vda failed

In theory GRUB 2 supports booting from LVM, but we probably need to
generate the right grub.conf (see
https://wiki.archlinux.org/index.php/GRUB2#LVM).

http://hydra.nixos.org/build/2904680
---
 lib/test-driver/Machine.pm |  3 +--
 tests/installer.nix        | 20 ++++++++++++--------
 2 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/lib/test-driver/Machine.pm b/lib/test-driver/Machine.pm
index 947291b52c4..9018dc589e4 100644
--- a/lib/test-driver/Machine.pm
+++ b/lib/test-driver/Machine.pm
@@ -29,10 +29,9 @@ sub new {
         $startCommand =
             "qemu-kvm -m 384 " .
             "-net nic,model=virtio \$QEMU_OPTS ";
-        my $iface = $args->{hdaInterface} or "virtio";
+        my $iface = $args->{hdaInterface} || "virtio";
         $startCommand .= "-drive file=" . Cwd::abs_path($args->{hda}) . ",if=$iface,boot=on,werror=report "
             if defined $args->{hda};
-        
         $startCommand .= "-cdrom $args->{cdrom} "
             if defined $args->{cdrom};
         $startCommand .= $args->{qemuFlags} || "";
diff --git a/tests/installer.nix b/tests/installer.nix
index c6b84c1d955..b16206547a4 100644
--- a/tests/installer.nix
+++ b/tests/installer.nix
@@ -47,7 +47,7 @@ let
         ''}
         boot.loader.grub.device = "${grubDevice}";
         boot.loader.grub.extraConfig = "serial; terminal_output.serial";
-        boot.initrd.kernelModules = [ "ext3" "virtio_console" ];
+        boot.initrd.kernelModules = [ "ext3" "ext4" "xfs" "virtio_console" ];
 
         fileSystems = [ ${fileSystems} ];
         swapDevices = [ { label = "swap"; } ];
@@ -187,7 +187,7 @@ let
 
       # And just to be sure, check that the machine still boots after
       # "nixos-rebuild switch".
-      my $machine = createMachine({ hda => "harddisk" });
+      my $machine = createMachine({ hda => "harddisk", hdaInterface => "${iface}" });
       $machine->waitForJob("network-interfaces");
       $machine->shutdown;
     '';
@@ -250,28 +250,32 @@ in {
     };
 
   # Create two physical LVM partitions combined into one volume group
-  # that contains the logical swap and root partitions.
+  # that contains the logical swap and root partitions.  Uses a 
   lvm = makeTest
     { createPartitions =
         ''
           $machine->mustSucceed(
               "parted /dev/vda mklabel msdos",
-              "parted /dev/vda -- mkpart primary 1M 2048M", # first PV
+              "parted /dev/vda -- mkpart primary ext2 1M 30MB", # /boot
+              "parted /dev/vda -- mkpart primary 31M 2048M", # first PV
               "parted /dev/vda -- set 1 lvm on",
               "parted /dev/vda -- mkpart primary 2048M -1s", # second PV
               "parted /dev/vda -- set 2 lvm on",
               "udevadm settle",
-              "pvcreate /dev/vda1 /dev/vda2",
-              "vgcreate MyVolGroup /dev/vda1 /dev/vda2",
+              "pvcreate /dev/vda2 /dev/vda3",
+              "vgcreate MyVolGroup /dev/vda2 /dev/vda3",
               "lvcreate --size 1G --name swap MyVolGroup",
               "lvcreate --size 2G --name nixos MyVolGroup",
               "mkswap -f /dev/MyVolGroup/swap -L swap",
               "swapon -L swap",
-              "mkfs.ext3 -L nixos /dev/MyVolGroup/nixos",
+              "mkfs.xfs -L nixos /dev/MyVolGroup/nixos",
               "mount LABEL=nixos /mnt",
+              "mkfs.ext4 -L boot /dev/vda1",
+              "mkdir /mnt/boot",
+              "mount LABEL=boot /mnt/boot",
           );
         '';
-      fileSystems = rootFS;
+      fileSystems = rootFS + bootFS;
     };
 
   swraid = makeTest
-- 
GitLab


From e988324534044d6309acc5f936ab85b900cb1dd0 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 27 Jul 2012 00:07:25 +0200
Subject: [PATCH 3864/5331] Use a dedicated user ('named') for BIND instead of
 running the daemon as super user.

---
 modules/misc/ids.nix                 |  1 +
 modules/services/networking/bind.nix | 11 ++++++++++-
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/modules/misc/ids.nix b/modules/misc/ids.nix
index d1621c0c74e..13ebf954f32 100644
--- a/modules/misc/ids.nix
+++ b/modules/misc/ids.nix
@@ -71,6 +71,7 @@ in
     mpd = 50;
     clamav = 51;
     fprot = 52;
+    bind = 53;
 
     # When adding a uid, make sure it doesn't match an existing gid.
 
diff --git a/modules/services/networking/bind.nix b/modules/services/networking/bind.nix
index 1e04b354939..a5e4c9d1d02 100644
--- a/modules/services/networking/bind.nix
+++ b/modules/services/networking/bind.nix
@@ -6,6 +6,8 @@ let
 
   cfg = config.services.bind;
 
+  bindUser = "named";
+
   confFile = pkgs.writeText "named.conf"
     ''
       acl cachenetworks { ${concatMapStrings (entry: " ${entry}; ") cfg.cacheNetworks} };
@@ -118,6 +120,12 @@ in
 
   config = mkIf config.services.bind.enable {
 
+    users.extraUsers = singleton
+      { name = bindUser;
+        uid = config.ids.uids.bind;
+        description = "BIND daemon user";
+      };
+
     jobs.bind =
       { description = "BIND name server job";
 
@@ -126,9 +134,10 @@ in
         preStart =
           ''
             ${pkgs.coreutils}/bin/mkdir -p /var/run/named
+            chown ${bindUser} /var/run/named
           '';
 
-        exec = "${pkgs.bind}/sbin/named ${optionalString cfg.ipv4Only "-4"} -c ${cfg.configFile} -f";
+        exec = "${pkgs.bind}/sbin/named -u ${bindUser} ${optionalString cfg.ipv4Only "-4"} -c ${cfg.configFile} -f";
       };
 
   };
-- 
GitLab


From 14a8532ee0f569d101d14acdb4f1f4ea750b8ba2 Mon Sep 17 00:00:00 2001
From: Florian Friesdorf <flo@chaoflow.net>
Date: Sun, 15 Jul 2012 06:25:08 +0200
Subject: [PATCH 3865/5331] add NIX_CONF_DIR to sudo env_keep variables
 (suggested by Eelco Dolstra)

this enables nix-collect-garbage under sudo to respect nix.conf, e.g.:

    gc-keep-outputs = true
    gc-keep-derivations = true
---
 modules/security/sudo.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/modules/security/sudo.nix b/modules/security/sudo.nix
index 76c325d8d8f..e3e463e155f 100644
--- a/modules/security/sudo.nix
+++ b/modules/security/sudo.nix
@@ -34,6 +34,7 @@ in
 
           # Environment variables to keep for root and %wheel.
           Defaults:root,%wheel env_keep+=LOCALE_ARCHIVE
+          Defaults:root,%wheel env_keep+=NIX_CONF_DIR
           Defaults:root,%wheel env_keep+=NIX_PATH
           Defaults:root,%wheel env_keep+=TERMINFO_DIRS
 
-- 
GitLab


From e27ee81304b83e20ad14266a76410e68eea22d30 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Fri, 27 Jul 2012 13:29:14 -0400
Subject: [PATCH 3866/5331] create-ebs-amis.py: Load the deployment state file.

charon now requires either using a Deployment in a with statement or manually loading the state file
---
 maintainers/scripts/ec2/create-ebs-amis.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/maintainers/scripts/ec2/create-ebs-amis.py b/maintainers/scripts/ec2/create-ebs-amis.py
index 0afa6d564e3..939bd30942d 100755
--- a/maintainers/scripts/ec2/create-ebs-amis.py
+++ b/maintainers/scripts/ec2/create-ebs-amis.py
@@ -33,6 +33,7 @@ f.write('''{{
 f.close()
 
 depl = deployment.Deployment("./ebs-creator.json", create=True, nix_exprs=["./ebs-creator.nix", "./ebs-creator-config.nix"])
+depl.load_state()
 if not args.keep: depl.destroy_vms()
 depl.deploy()
 
@@ -163,6 +164,7 @@ f.write(
 f.close()
 
 test_depl = deployment.Deployment("./ebs-test.json", create=True, nix_exprs=["./ebs-test.nix"])
+test_depl.load_state()
 test_depl.deploy(create_only=True)
 test_depl.machines['machine'].run_command("nixos-version")
 if not args.keep: test_depl.destroy_vms()
-- 
GitLab


From a559a2a60688e82b3f7c851546c97c6a2c9c2c39 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 30 Jul 2012 17:19:14 +0200
Subject: [PATCH 3867/5331] mediawiki.nix: Use the right PHP build

---
 modules/services/web-servers/apache-httpd/default.nix   | 2 +-
 modules/services/web-servers/apache-httpd/mediawiki.nix | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/modules/services/web-servers/apache-httpd/default.nix b/modules/services/web-servers/apache-httpd/default.nix
index cbd245df432..a101b077e47 100644
--- a/modules/services/web-servers/apache-httpd/default.nix
+++ b/modules/services/web-servers/apache-httpd/default.nix
@@ -74,7 +74,7 @@ let
           phpOptions = "";
           options = {};
         };
-        res = defaults // svcFunction { inherit config pkgs serverInfo; };
+        res = defaults // svcFunction { inherit config pkgs serverInfo php; };
       in res;
     in map f defs;
 
diff --git a/modules/services/web-servers/apache-httpd/mediawiki.nix b/modules/services/web-servers/apache-httpd/mediawiki.nix
index 9f321b173d3..2941c6d0d5a 100644
--- a/modules/services/web-servers/apache-httpd/mediawiki.nix
+++ b/modules/services/web-servers/apache-httpd/mediawiki.nix
@@ -1,4 +1,4 @@
-{ config, pkgs, serverInfo, ... }:
+{ config, pkgs, serverInfo, php, ... }:
 
 with pkgs.lib;
 
@@ -101,7 +101,7 @@ let
     ''
       ensureDir $out/bin
       for i in changePassword.php createAndPromote.php userOptions.php edit.php nukePage.php; do
-        makeWrapper ${pkgs.php}/bin/php $out/bin/mediawiki-${config.id}-$(basename $i .php) \
+        makeWrapper ${php}/bin/php $out/bin/mediawiki-${config.id}-$(basename $i .php) \
           --add-flags ${mediawikiRoot}/maintenance/$i
       done
     '';
-- 
GitLab


From 174d6a07e04bb3697e3389003484ee13945d208a Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 30 Jul 2012 13:49:10 -0400
Subject: [PATCH 3868/5331] Fix whitespace

---
 modules/system/boot/loader/grub/install-grub.pl | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/system/boot/loader/grub/install-grub.pl b/modules/system/boot/loader/grub/install-grub.pl
index 99bf171c778..54f91b0f598 100644
--- a/modules/system/boot/loader/grub/install-grub.pl
+++ b/modules/system/boot/loader/grub/install-grub.pl
@@ -105,7 +105,7 @@ else {
     ";
 
     if ($splashImage) {
-	# FIXME: GRUB 1.97 doesn't resize the background image if it
+        # FIXME: GRUB 1.97 doesn't resize the background image if it
         # doesn't match the video resolution.
         copy $splashImage, "/boot/background.png" or die "cannot copy $splashImage to /boot\n";
         $conf .= "
@@ -193,7 +193,7 @@ $conf .= "$extraEntries\n" unless $extraEntriesBeforeNixOS;
 $conf .= "submenu \"NixOS - Old configurations\" {\n" if $grubVersion == 2;
 
 sub nrFromGen { my ($x) = @_; $x =~ /system-(.*)-link/; return $1; }
-    
+
 my @links = sort
     { nrFromGen($b) <=> nrFromGen($a) }
     (glob "/nix/var/nix/profiles/system-*-link");
-- 
GitLab


From 2678ff37264b7951e7b7309d5ad892061bcd019a Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 30 Jul 2012 13:49:18 -0400
Subject: [PATCH 3869/5331] Use /sys/fs/cgroup instead of /dev/cgroup

---
 modules/services/system/cgroups.nix | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/modules/services/system/cgroups.nix b/modules/services/system/cgroups.nix
index 199d12268ce..5d5777909e9 100644
--- a/modules/services/system/cgroups.nix
+++ b/modules/services/system/cgroups.nix
@@ -37,14 +37,14 @@ in
       default =
         ''
           mount {
-            cpu = /dev/cgroup/cpu;
+            cpu = /sys/fs/cgroup/cpu;
           }
         '';
       example =
         ''
           mount {
-            cpu = /dev/cgroup/cpu;
-            cpuacct = /dev/cgroup/cpuacct;
+            cpu = /sys/fs/cgroup/cpu;
+            cpuacct = /sys/fs/cgroup/cpuacct;
           }
 
           # Create a "www" cgroup with a lower share of the CPU (the
@@ -105,10 +105,16 @@ in
 
         description = "Control groups daemon";
 
-        path = [ pkgs.libcgroup pkgs.procps ];
+        path = [ pkgs.libcgroup pkgs.procps pkgs.utillinux ];
       
         preStart =
           ''
+            if [ -d /sys/fs/cgroup ]; then
+              if ! mountpoint -q /sys/fs/cgroup; then
+                mount -t tmpfs -o mode=755 /dev/cgroup /sys/fs/cgroup
+              fi
+            fi
+          
             cgclear || true
 
             # Mount the cgroup hierarchies.  Note: we refer to the
-- 
GitLab


From 6576d81ff1b06ca2f5d37350f2f5893a6377547c Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 30 Jul 2012 15:19:30 -0400
Subject: [PATCH 3870/5331] Fix "please: command not found" in
 switch-to-configuration

---
 modules/system/activation/top-level.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/modules/system/activation/top-level.nix b/modules/system/activation/top-level.nix
index 1eea759d8c9..35b6d0bff0c 100644
--- a/modules/system/activation/top-level.nix
+++ b/modules/system/activation/top-level.nix
@@ -151,7 +151,7 @@ let
       config.boot.kernelParams ++ config.boot.extraKernelParams;
     installBootLoader =
       config.system.build.installBootLoader
-      or "echo 'Warning: don't know how to make this configuration bootable; please enable a boot loader.' 1>&2; true";
+      or "echo \"Warning: don't know how to make this configuration bootable; please enable a boot loader.\" 1>&2; true";
     activationScript = config.system.activationScripts.script;
     nixosVersion = config.system.nixosVersion;
 
@@ -159,11 +159,11 @@ let
 
     # Pass the names of all Upstart tasks to the activation script.
     tasks = attrValues (mapAttrs (n: v: if v.task then ["[${v.name}]=1"] else []) config.jobs);
-    
+
     # Pass the names of all Upstart jobs that shouldn't be restarted
     # to the activation script.
     noRestartIfChanged = attrValues (mapAttrs (n: v: if v.restartIfChanged then [] else ["[${v.name}]=1"]) config.jobs);
-    
+
     # Most of these are needed by grub-install.
     path =
       [ pkgs.coreutils
-- 
GitLab


From 52fd5ea6ca72ccd2a5b784ca2c392b4b9bf48fe5 Mon Sep 17 00:00:00 2001
From: Mathijs Kwik <mathijs@bluescreen303.nl>
Date: Tue, 31 Jul 2012 20:00:58 +0200
Subject: [PATCH 3871/5331] gogoclient: setup config and dirs on service start,
 not on system activation

---
 modules/services/networking/gogoclient.nix | 18 ++++++------------
 1 file changed, 6 insertions(+), 12 deletions(-)

diff --git a/modules/services/networking/gogoclient.nix b/modules/services/networking/gogoclient.nix
index 12fbef1f3ba..593f2436a39 100644
--- a/modules/services/networking/gogoclient.nix
+++ b/modules/services/networking/gogoclient.nix
@@ -65,21 +65,15 @@ in
       description = "ipv6 tunnel";
       startOn = optionalString cfg.autorun "starting networking";
       stopOn = "stopping network-interfaces";
-      script = "cd /var/lib/gogoc; exec gogoc -y -f /etc/gogoc.conf";
+      preStart = ''
+        mkdir -p /var/lib/gogoc
+        chmod 700 /var/lib/gogoc
+        cat ${pkgs.gogoclient}/share/${pkgs.gogoclient.name}/gogoc.conf.sample | ${pkgs.gnused}/bin/sed -e "s|^userid=|&${cfg.username}|;s|^passwd=|&${if cfg.password == "" then "" else "$(cat ${cfg.password})"}|;s|^server=.*|server=${cfg.server}|;s|^auth_method=.*|auth_method=${if cfg.password == "" then "anonymous" else "any"}|;s|^#log_file=|log_file=1|" > /var/lib/gogoc/gogoc.conf
+      '';
+      script = "cd /var/lib/gogoc; exec gogoc -y -f ./gogoc.conf";
       path = [pkgs.gogoclient];
     };
 
-    system.activationScripts.gogoClientConf = ''
-      mkdir -p /var/lib/gogoc
-      chmod 700 /var/lib/gogoc
-      install -m400 ${pkgs.gogoclient}/share/${pkgs.gogoclient.name}/gogoc.conf.sample /etc/gogoc.conf.default
-      ${pkgs.gnused}/bin/sed -i -e "s|^userid=|&${cfg.username}|" /etc/gogoc.conf.default
-      ${pkgs.gnused}/bin/sed -i -e "s|^passwd=|&${if cfg.password == "" then "" else "$(cat ${cfg.password})"}|" /etc/gogoc.conf.default
-      ${pkgs.gnused}/bin/sed -i -e "s|^server=.*|server=${cfg.server}|" /etc/gogoc.conf.default
-      ${pkgs.gnused}/bin/sed -i -e "s|^auth_method=.*|auth_method=${if cfg.password == "" then "anonymous" else "any"}|" /etc/gogoc.conf.default
-      ${pkgs.gnused}/bin/sed -i -e "s|^#log_file=|log_file=1|" /etc/gogoc.conf.default
-      mv /etc/gogoc.conf.default /etc/gogoc.conf
-    '';
   };
 
 }
-- 
GitLab


From c8d04ab34c0a3bd3538d1763108110f2c195d1a1 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 1 Aug 2012 15:40:58 -0400
Subject: [PATCH 3872/5331] tests/installer.nix: Re-enable booting from LVM

---
 tests/installer.nix | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

diff --git a/tests/installer.nix b/tests/installer.nix
index b16206547a4..65542ae862e 100644
--- a/tests/installer.nix
+++ b/tests/installer.nix
@@ -250,32 +250,28 @@ in {
     };
 
   # Create two physical LVM partitions combined into one volume group
-  # that contains the logical swap and root partitions.  Uses a 
+  # that contains the logical swap and root partitions.
   lvm = makeTest
     { createPartitions =
         ''
           $machine->mustSucceed(
               "parted /dev/vda mklabel msdos",
-              "parted /dev/vda -- mkpart primary ext2 1M 30MB", # /boot
-              "parted /dev/vda -- mkpart primary 31M 2048M", # first PV
+              "parted /dev/vda -- mkpart primary 1M 2048M", # first PV
               "parted /dev/vda -- set 1 lvm on",
               "parted /dev/vda -- mkpart primary 2048M -1s", # second PV
               "parted /dev/vda -- set 2 lvm on",
               "udevadm settle",
-              "pvcreate /dev/vda2 /dev/vda3",
-              "vgcreate MyVolGroup /dev/vda2 /dev/vda3",
+              "pvcreate /dev/vda1 /dev/vda2",
+              "vgcreate MyVolGroup /dev/vda1 /dev/vda2",
               "lvcreate --size 1G --name swap MyVolGroup",
               "lvcreate --size 2G --name nixos MyVolGroup",
               "mkswap -f /dev/MyVolGroup/swap -L swap",
               "swapon -L swap",
               "mkfs.xfs -L nixos /dev/MyVolGroup/nixos",
               "mount LABEL=nixos /mnt",
-              "mkfs.ext4 -L boot /dev/vda1",
-              "mkdir /mnt/boot",
-              "mount LABEL=boot /mnt/boot",
           );
         '';
-      fileSystems = rootFS + bootFS;
+      fileSystems = rootFS;
     };
 
   swraid = makeTest
-- 
GitLab


From 5f57110e1f977bf0a2e11b4f0ee92244de53d331 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 1 Aug 2012 21:47:17 +0200
Subject: [PATCH 3873/5331] install-grub.pl: Fix Xen support

---
 modules/system/boot/loader/grub/install-grub.pl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/system/boot/loader/grub/install-grub.pl b/modules/system/boot/loader/grub/install-grub.pl
index 54f91b0f598..5e9f3b4efda 100644
--- a/modules/system/boot/loader/grub/install-grub.pl
+++ b/modules/system/boot/loader/grub/install-grub.pl
@@ -154,7 +154,7 @@ sub addEntry {
 
     my $kernel = copyToKernelsDir(Cwd::abs_path("$path/kernel"));
     my $initrd = copyToKernelsDir(Cwd::abs_path("$path/initrd"));
-    my $xen = -e "$path/xen.gz" ? copyToKernelsDir(Cwd::abs_path("$path/xen")) : undef;
+    my $xen = -e "$path/xen.gz" ? copyToKernelsDir(Cwd::abs_path("$path/xen.gz")) : undef;
 
     # FIXME: $confName
 
-- 
GitLab


From 2a983acaffd9382302ebc3a36a2649f9b2f53a6c Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Wed, 1 Aug 2012 21:50:43 -0400
Subject: [PATCH 3874/5331] Enable specifying which kernel config options are
 needed for a given module

---
 modules/system/boot/kernel.nix | 61 +++++++++++++++++++++++++++++++++-
 1 file changed, 60 insertions(+), 1 deletion(-)

diff --git a/modules/system/boot/kernel.nix b/modules/system/boot/kernel.nix
index 1b247a65890..5bb47969835 100644
--- a/modules/system/boot/kernel.nix
+++ b/modules/system/boot/kernel.nix
@@ -108,6 +108,24 @@ let kernel = config.boot.kernelPackages.kernel; in
       apply = pkgs.aggregateModules;
     };
 
+    system.requiredKernelConfig = mkOption {
+      default = [];
+      example = literalExample ''
+        with config.lib.kernelConfig; [
+          (isYes "MODULES")
+          (isEnabled "FB_CON_DECOR")
+          (isEnabled "BLK_DEV_INITRD")
+        ]
+      '';
+      internal = true;
+      type = types.listOf types.attrs;
+      description = ''
+        This option allows modules to specify the kernel config options that
+        must be set (or unset) for the module to work. Please use the
+        lib.kernelConfig functions to build list elements.
+      '';
+    };
+
   };
 
 
@@ -173,6 +191,47 @@ let kernel = config.boot.kernelPackages.kernel; in
     # The Linux kernel >= 2.6.27 provides firmware.
     hardware.firmware = [ "${kernel}/lib/firmware" ];
 
-  };
+    lib.kernelConfig = {
+      isYes = option: {
+        assertion = config: config.isYes option;
+        message = "CONFIG_${option} is not yes!";
+      };
+
+      isNo = option: {
+        assertion = config: config.isNo option;
+        message = "CONFIG_${option} is not no!";
+      };
+
+      isModule = option: {
+        assertion = config: config.isModule option;
+        message = "CONFIG_${option} is not built as a module!";
+      };
+
+      ### Usually you will just want to use these two
+      # True if yes or module
+      isEnabled = option: {
+        assertion = config: config.isEnabled option;
+        message = "CONFIG_${option} is not enabled!";
+      };
+
+      # True if no or omitted
+      isDisabled = option: {
+        assertion = config: config.isDisabled option;
+        message = "CONFIG_${option} is not disabled!";
+      };
+    };
 
+    # The config options that all modules can depend upon
+    system.requiredKernelConfig = with config.lib.kernelConfig; [
+      (isYes "MODULES")
+      (isYes "BLK_DEV_INITRD")
+    ];
+
+    # nixpkgs kernels are assumed to have all required features
+    assertions = if config.boot.kernelPackages.kernel ? features then [] else
+      let cfg = config.boot.kernelPackages.kernel.config; in map (attrs:
+        { assertion = attrs.assertion cfg; inherit (attrs) message; }
+      ) config.system.requiredKernelConfig;
+
+  };
 }
-- 
GitLab


From 9e300052bd830d48f6016d5f90441030fd556f1c Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Wed, 1 Aug 2012 22:32:16 -0400
Subject: [PATCH 3875/5331] Add test to check that a machine with a minimal
 kernel but all of the requiredKernelConfig options set boots and shuts down

---
 modules/system/boot/kernel.nix |  5 +++++
 release.nix                    |  1 +
 tests/default.nix              |  1 +
 tests/minimal-kernel.nix       | 34 ++++++++++++++++++++++++++++++++++
 4 files changed, 41 insertions(+)
 create mode 100644 tests/minimal-kernel.nix

diff --git a/modules/system/boot/kernel.nix b/modules/system/boot/kernel.nix
index 5bb47969835..326cf64d6b8 100644
--- a/modules/system/boot/kernel.nix
+++ b/modules/system/boot/kernel.nix
@@ -195,16 +195,19 @@ let kernel = config.boot.kernelPackages.kernel; in
       isYes = option: {
         assertion = config: config.isYes option;
         message = "CONFIG_${option} is not yes!";
+        configLine = "CONFIG_${option}=y";
       };
 
       isNo = option: {
         assertion = config: config.isNo option;
         message = "CONFIG_${option} is not no!";
+        configLine = "CONFIG_${option}=n";
       };
 
       isModule = option: {
         assertion = config: config.isModule option;
         message = "CONFIG_${option} is not built as a module!";
+        configLine = "CONFIG_${option}=m";
       };
 
       ### Usually you will just want to use these two
@@ -212,12 +215,14 @@ let kernel = config.boot.kernelPackages.kernel; in
       isEnabled = option: {
         assertion = config: config.isEnabled option;
         message = "CONFIG_${option} is not enabled!";
+        configLine = "CONFIG_${option}=y";
       };
 
       # True if no or omitted
       isDisabled = option: {
         assertion = config: config.isDisabled option;
         message = "CONFIG_${option} is not disabled!";
+        configLine = "CONFIG_${option}=n";
       };
     };
 
diff --git a/release.nix b/release.nix
index 4ccbd2ef754..9f76ee4a254 100644
--- a/release.nix
+++ b/release.nix
@@ -212,6 +212,7 @@ let
         kde4 = t.kde4.test;
         login = t.login.test;
         misc = t.misc.test;
+        minimal_kernel = t.minimal_kernel.test;
         mpich = t.mpich.test;
         mysql = t.mysql.test;
         mysql_replication = t.mysql_replication.test;
diff --git a/tests/default.nix b/tests/default.nix
index 4edcbd2f325..2433826a9d1 100644
--- a/tests/default.nix
+++ b/tests/default.nix
@@ -11,6 +11,7 @@ with import ../lib/testing.nix { inherit system; };
   ipv6 = makeTest (import ./ipv6.nix);
   kde4 = makeTest (import ./kde4.nix);
   login = makeTest (import ./login.nix);
+  minimal_kernel = makeTest (import ./minimal-kernel.nix);
   misc = makeTest (import ./misc.nix);
   mpich = makeTest (import ./mpich.nix);
   mysql = makeTest (import ./mysql.nix);
diff --git a/tests/minimal-kernel.nix b/tests/minimal-kernel.nix
new file mode 100644
index 00000000000..04fe17c261b
--- /dev/null
+++ b/tests/minimal-kernel.nix
@@ -0,0 +1,34 @@
+{ pkgs, ... }:
+
+
+{
+  machine = { config, pkgs, ... }:
+    let
+      configfile = builtins.storePath (builtins.toFile "config" (pkgs.lib.concatStringsSep "\n"
+          (map (builtins.getAttr "configLine") config.system.requiredKernelConfig)));
+
+      kernel = pkgs.lib.overrideDerivation (pkgs.linuxManualConfig {
+        inherit (pkgs.linux) src version;
+        inherit configfile;
+        allowImportFromDerivation = true;
+      }) (attrs: {
+         configurePhase = ''
+           runHook preConfigure
+           mkdir ../build
+           make $makeFlags "''${makeFlagsArray[@]}" mrproper
+           make $makeFlags "''${makeFlagsArray[@]}" KCONFIG_ALLCONFIG=${configfile} allnoconfig
+           runHook postConfigure
+         '';
+       });
+
+       kernelPackages = pkgs.linuxPackagesFor kernel kernelPackages;
+    in {
+      boot.kernelPackages = kernelPackages;
+    };
+
+  testScript =
+    ''
+      startAll;
+      $machine->shutdown;
+    '';
+}
-- 
GitLab


From 3d20a308afb1cde850f63feab990d7d5b4f8e296 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Wed, 1 Aug 2012 23:36:48 -0400
Subject: [PATCH 3876/5331] tests/minimal-kernel: Add CIFS timeout patch

---
 modules/testing/test-instrumentation.nix | 9 ++++++++-
 tests/minimal-kernel.nix                 | 9 ++++++---
 2 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/modules/testing/test-instrumentation.nix b/modules/testing/test-instrumentation.nix
index 830f1744fa0..b18e4263c2d 100644
--- a/modules/testing/test-instrumentation.nix
+++ b/modules/testing/test-instrumentation.nix
@@ -5,11 +5,18 @@
 
 with pkgs.lib;
 
+let
+  kernel = config.boot.kernelPackages.kernel;
+
+  hasCIFSTimeout = if kernel ? features then kernel.features ? cifsTimeout
+    else (filter (p: p.name == "cifs-timeout") kernel.kernelPatches) != [];
+in
+
 {
 
   config =
   # Require a patch to the kernel to increase the 15s CIFS timeout.
-  mkAssert (config.boot.kernelPackages.kernel.features ? cifsTimeout) "
+  mkAssert hasCIFSTimeout "
     VM tests require that the kernel has the CIFS timeout patch.
   " {
 
diff --git a/tests/minimal-kernel.nix b/tests/minimal-kernel.nix
index 04fe17c261b..e27b39d1764 100644
--- a/tests/minimal-kernel.nix
+++ b/tests/minimal-kernel.nix
@@ -7,11 +7,14 @@
       configfile = builtins.storePath (builtins.toFile "config" (pkgs.lib.concatStringsSep "\n"
           (map (builtins.getAttr "configLine") config.system.requiredKernelConfig)));
 
-      kernel = pkgs.lib.overrideDerivation (pkgs.linuxManualConfig {
+      origKernel = pkgs.linuxManualConfig {
         inherit (pkgs.linux) src version;
         inherit configfile;
         allowImportFromDerivation = true;
-      }) (attrs: {
+        kernelPatches = [ pkgs.kernelPatches.cifs_timeout_2_6_38 ];
+      };
+
+      kernel = origKernel //(derivation (origKernel.drvAttrs // {
          configurePhase = ''
            runHook preConfigure
            mkdir ../build
@@ -19,7 +22,7 @@
            make $makeFlags "''${makeFlagsArray[@]}" KCONFIG_ALLCONFIG=${configfile} allnoconfig
            runHook postConfigure
          '';
-       });
+       }));
 
        kernelPackages = pkgs.linuxPackagesFor kernel kernelPackages;
     in {
-- 
GitLab


From feb010a366c857c7320c37d7152759419b88ca8b Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Thu, 2 Aug 2012 00:47:36 -0400
Subject: [PATCH 3877/5331] NixOS kernels should support ELF executables

---
 modules/system/boot/kernel.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/modules/system/boot/kernel.nix b/modules/system/boot/kernel.nix
index 326cf64d6b8..ab996196079 100644
--- a/modules/system/boot/kernel.nix
+++ b/modules/system/boot/kernel.nix
@@ -230,6 +230,7 @@ let kernel = config.boot.kernelPackages.kernel; in
     system.requiredKernelConfig = with config.lib.kernelConfig; [
       (isYes "MODULES")
       (isYes "BLK_DEV_INITRD")
+      (isYes "BINFMT_ELF")
     ];
 
     # nixpkgs kernels are assumed to have all required features
-- 
GitLab


From ecdbc94e051ec081d30c5580a7934bddce22d03c Mon Sep 17 00:00:00 2001
From: Rickard Nilsson <rickynils@gmail.com>
Date: Tue, 17 Jul 2012 13:10:00 +0200
Subject: [PATCH 3878/5331] LUKS root: Add option allowDiscards (for SSD disks)

---
 modules/system/boot/luksroot.nix | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/modules/system/boot/luksroot.nix b/modules/system/boot/luksroot.nix
index 0e28a882da5..38dfece44be 100644
--- a/modules/system/boot/luksroot.nix
+++ b/modules/system/boot/luksroot.nix
@@ -5,7 +5,7 @@ with pkgs.lib;
 let
   luks = config.boot.initrd.luks;
 
-  openCommand = { name, device, ... }: ''
+  openCommand = { name, device, allowDiscards, ... }: ''
     # Wait for luksRoot to appear, e.g. if on a usb drive.
     # XXX: copied and adapted from stage-1-init.sh - should be
     # available as a function.
@@ -20,7 +20,7 @@ let
     fi
 
     # open luksRoot and scan for logical volumes
-    cryptsetup luksOpen ${device} ${name}
+    cryptsetup luksOpen ${device} ${name} ${optionalString allowDiscards "--allow-discards"}
   '';
 
   isPreLVM = f: f.preLVM;
@@ -69,6 +69,17 @@ in
           type = types.bool;
           description = "Whether the luksOpen will be attempted before LVM scan or after it.";
         };
+
+        allowDiscards = mkOption {
+          default = false;
+          type = types.bool;
+          description = ''
+            Whether to allow TRIM requests to the underlying device. This option
+            has security implications, please read the LUKS documentation before
+            activating in.
+          '';
+        };
+
       };
     };
   };
-- 
GitLab


From 0958b224ac20dff543eeb04a1ca6fa4983209ec8 Mon Sep 17 00:00:00 2001
From: Rickard Nilsson <rickynils@gmail.com>
Date: Thu, 3 May 2012 00:37:14 +0200
Subject: [PATCH 3879/5331] LUKS root: Add option for using a key file instead
 of a passphrase.

---
 modules/system/boot/luksroot.nix | 41 ++++++++++++++++++++++++++++++--
 1 file changed, 39 insertions(+), 2 deletions(-)

diff --git a/modules/system/boot/luksroot.nix b/modules/system/boot/luksroot.nix
index 38dfece44be..db25e9390ab 100644
--- a/modules/system/boot/luksroot.nix
+++ b/modules/system/boot/luksroot.nix
@@ -5,7 +5,7 @@ with pkgs.lib;
 let
   luks = config.boot.initrd.luks;
 
-  openCommand = { name, device, allowDiscards, ... }: ''
+  openCommand = { name, device, keyFile, keyFileSize, allowDiscards, ... }: ''
     # Wait for luksRoot to appear, e.g. if on a usb drive.
     # XXX: copied and adapted from stage-1-init.sh - should be
     # available as a function.
@@ -19,8 +19,21 @@ let
         echo "ok"
     fi
 
+    ${optionalString (keyFile != "") ''
+    if ! test -e ${keyFile}; then
+        echo -n "waiting 10 seconds for key file ${keyFile} to appear..."
+        for try in $(seq 10); do
+            sleep 1
+            if test -e ${keyFile}; then break; fi
+            echo -n .
+        done
+        echo "ok"
+    fi
+    ''}
+
     # open luksRoot and scan for logical volumes
-    cryptsetup luksOpen ${device} ${name} ${optionalString allowDiscards "--allow-discards"}
+    cryptsetup luksOpen ${device} ${name} ${optionalString allowDiscards "--allow-discards"} \
+      ${optionalString (keyFile != null) "--key-file=${keyFile} ${optionalString (keyFileSize != null) "--keyfile-size=${toString keyFileSize}"}"}
   '';
 
   isPreLVM = f: f.preLVM;
@@ -64,6 +77,30 @@ in
           description = "Path of the underlying block device.";
         };
 
+        keyFile = mkOption {
+          default = null;
+          example = "/dev/sdb1";
+          type = types.nullOr types.string;
+          description = ''
+            The name of the file (can be a raw device or a partition) that
+            should be used as the decryption key for the encrypted device. If
+            not specified, you will be prompted for a passphrase instead.
+          '';
+        };
+
+        keyFileSize = mkOption {
+          default = null;
+          example = 4096;
+          type = types.nullOr types.int;
+          description = ''
+            The size of the key file. Use this if only the beginning of the
+            key file should be used as a key (often the case if a raw device
+            or partition is used as key file). If not specified, the whole
+            <literal>keyFile</literal> will be used decryption, instead of just
+            the first <literal>keyFileSize</literal> bytes.
+          '';
+        };
+
         preLVM = mkOption {
           default = true;
           type = types.bool;
-- 
GitLab


From a6039e1be2ca794497d073afe4d666454845b2b8 Mon Sep 17 00:00:00 2001
From: Rickard Nilsson <rickynils@gmail.com>
Date: Thu, 2 Aug 2012 11:39:31 +0200
Subject: [PATCH 3880/5331] LUKS root: Fix key file check

Check for null instead of empty string
---
 modules/system/boot/luksroot.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/system/boot/luksroot.nix b/modules/system/boot/luksroot.nix
index db25e9390ab..27c9c85eab3 100644
--- a/modules/system/boot/luksroot.nix
+++ b/modules/system/boot/luksroot.nix
@@ -19,7 +19,7 @@ let
         echo "ok"
     fi
 
-    ${optionalString (keyFile != "") ''
+    ${optionalString (keyFile != null) ''
     if ! test -e ${keyFile}; then
         echo -n "waiting 10 seconds for key file ${keyFile} to appear..."
         for try in $(seq 10); do
-- 
GitLab


From 1fcef0a0e0c44f0b01256964f08964986953cbf4 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 2 Aug 2012 13:31:57 -0400
Subject: [PATCH 3881/5331] Don't use nixUnstable

---
 modules/services/misc/nix-daemon.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/services/misc/nix-daemon.nix b/modules/services/misc/nix-daemon.nix
index 31b81a13e36..a955fdd8d35 100644
--- a/modules/services/misc/nix-daemon.nix
+++ b/modules/services/misc/nix-daemon.nix
@@ -27,7 +27,7 @@ in
   options = {
 
     environment.nix = mkOption {
-      default = pkgs.nixUnstable;
+      default = pkgs.nix;
       merge = mergeOneOption;
       description = ''
         This option specifies the Nix package instance to use throughout the system.
-- 
GitLab


From 0fc68a3d1d2a03da543209f922e75d2fa0a55e28 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 2 Aug 2012 15:11:29 -0400
Subject: [PATCH 3882/5331] Rewrite switch-to-configuration in Perl

This will make it more efficient to do systemd dependency graph
processing (if necessary).
---
 .../activation/switch-to-configuration.pl     | 57 ++++++++++++++++++
 .../activation/switch-to-configuration.sh     | 59 -------------------
 modules/system/activation/top-level.nix       | 20 +++----
 3 files changed, 65 insertions(+), 71 deletions(-)
 create mode 100644 modules/system/activation/switch-to-configuration.pl
 delete mode 100644 modules/system/activation/switch-to-configuration.sh

diff --git a/modules/system/activation/switch-to-configuration.pl b/modules/system/activation/switch-to-configuration.pl
new file mode 100644
index 00000000000..199c23d8ab0
--- /dev/null
+++ b/modules/system/activation/switch-to-configuration.pl
@@ -0,0 +1,57 @@
+#! @perl@
+
+use strict;
+use warnings;
+use File::Slurp;
+
+my $action = shift @ARGV;
+
+if (!defined $action || ($action ne "switch" && $action ne "boot" && $action ne "test")) {
+    print STDERR <<EOF;
+Usage: $0 [switch|boot|test]
+
+switch: make the configuration the boot default and activate now
+boot:   make the configuration the boot default
+test:   activate the configuration, but don\'t make it the boot default
+EOF
+    exit 1;
+}
+
+die "This is not a NixOS installation (/etc/NIXOS is missing)!\n" unless -f "/etc/NIXOS";
+
+# Install or update the bootloader.
+#system("@installBootLoader@ @out@") == 0 or exit 1 if $action eq "switch" || $action eq "boot";
+exit 0 if $action eq "boot";
+
+# Check if we can activate the new configuration.
+my $oldVersion = read_file("/run/current-system/init-interface-version", err_mode => 'quiet') // "";
+my $newVersion = read_file("@out@/init-interface-version");
+
+if ($newVersion ne $oldVersion) {
+    print STDERR <<EOF;
+Warning: the new NixOS configuration has an ‘init’ that is
+incompatible with the current configuration.  The new configuration
+won\'t take effect until you reboot the system.
+EOF
+    exit 100;
+}
+
+# Ignore SIGHUP so that we're not killed if we're running on (say)
+# virtual console 1 and we restart the "tty1" unit.
+$SIG{PIPE} = "IGNORE";
+
+# Activate the new configuration (i.e., update /etc, make accounts,
+# and so on).
+my $res = 0;
+print STDERR "activating the configuration...\n";
+system("@out@/activate", "@out@") == 0 or $res = 2;
+
+# FIXME: Re-exec systemd if necessary.
+
+# Make systemd reload its units.
+system("@systemd@/bin/systemctl", "daemon-reload") == 0 or $res = 3;
+
+# Signal dbus to reload its configuration.
+system("@systemd@/bin/systemctl", "reload", "dbus.service");
+
+exit $res;
diff --git a/modules/system/activation/switch-to-configuration.sh b/modules/system/activation/switch-to-configuration.sh
deleted file mode 100644
index f52a310ea35..00000000000
--- a/modules/system/activation/switch-to-configuration.sh
+++ /dev/null
@@ -1,59 +0,0 @@
-#! @shell@
-
-set -e
-export PATH=/empty
-for i in @path@; do PATH=$PATH:$i/bin:$i/sbin; done
-action="$1"
-
-if ! test -e /etc/NIXOS; then
-    echo "This is not a NixOS installation (/etc/NIXOS) is missing!"
-    exit 1
-fi
-
-if test -z "$action"; then
-    cat <<EOF
-Usage: $0 [switch|boot|test]
-
-switch: make the configuration the boot default and activate now
-boot:   make the configuration the boot default
-test:   activate the configuration, but don't make it the boot default
-EOF
-    exit 1
-fi
-
-# Install or update the bootloader.
-if [ "$action" = "switch" -o "$action" = "boot" ]; then
-    @installBootLoader@ @out@
-fi
-
-# Activate the new configuration.
-if [ "$action" != switch -a "$action" != test ]; then exit 0; fi
-
-oldVersion="$(cat /run/current-system/init-interface-version 2> /dev/null || echo "")"
-newVersion="$(cat @out@/init-interface-version)"
-
-if [ "$oldVersion" != "$newVersion" ]; then
-        cat <<EOF
-Warning: the new NixOS configuration has an ‘init’ that is
-incompatible with the current configuration.  The new configuration
-won't take effect until you reboot the system.
-EOF
-        exit 100 # denotes "reboot required" to Charon
-fi
-
-# Ignore SIGHUP so that we're not killed if we're running on (say)
-# virtual console 1 and we restart the "tty1" job.
-trap "" SIGHUP
-
-# Activate the new configuration (i.e., update /etc, make accounts,
-# and so on).
-echo "activating the configuration..."
-@out@/activate @out@
-
-# FIXME: Re-exec systemd if necessary.
-
-# Make systemd reload its jobs.
-systemctl daemon-reload
-
-# Signal dbus to reload its configuration.
-systemctl reload dbus.service || true
diff --git a/modules/system/activation/top-level.nix b/modules/system/activation/top-level.nix
index 923b91ad269..d092fa1d086 100644
--- a/modules/system/activation/top-level.nix
+++ b/modules/system/activation/top-level.nix
@@ -114,7 +114,7 @@ let
 
       ln -s ${config.system.build.etc}/etc $out/etc
       ln -s ${config.system.path} $out/sw
-      ln -s ${pkgs.systemd} $out/systemd
+      ln -s "$systemd" $out/systemd
       ln -s ${config.hardware.firmware} $out/firmware
 
       echo -n "$kernelParams" > $out/kernel-params
@@ -130,7 +130,7 @@ let
       done
 
       mkdir $out/bin
-      substituteAll ${./switch-to-configuration.sh} $out/bin/switch-to-configuration
+      substituteAll ${./switch-to-configuration.pl} $out/bin/switch-to-configuration
       chmod +x $out/bin/switch-to-configuration
 
       ${config.system.extraSystemBuilderCmds}
@@ -146,6 +146,9 @@ let
     name = "nixos-${config.system.nixosVersion}";
     preferLocalBuild = true;
     buildCommand = systemBuilder;
+
+    inherit (pkgs) systemd;
+
     inherit children;
     kernelParams =
       config.boot.kernelParams ++ config.boot.extraKernelParams;
@@ -164,17 +167,10 @@ let
     # to the activation script.
     noRestartIfChanged = attrValues (mapAttrs (n: v: if v.restartIfChanged then [] else ["[${v.name}]=1"]) config.jobs);
 
-    # Most of these are needed by grub-install.
-    path =
-      [ pkgs.coreutils
-        pkgs.gnused
-        pkgs.gnugrep
-        pkgs.findutils
-        pkgs.diffutils
-        pkgs.systemd
-      ];
-
     configurationName = config.boot.loader.grub.configurationName;
+
+    # Needed by switch-to-configuration.
+    perl = "${pkgs.perl}/bin/perl -I${pkgs.perlPackages.FileSlurp}/lib/perl5/site_perl";
   };
 
 
-- 
GitLab


From 4d2deff7afcb1e023b118bded2ba4e07a763bec2 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 2 Aug 2012 17:26:23 -0400
Subject: [PATCH 3883/5331] Stop obsolete units, restart changed units, start
 new units

---
 .../activation/switch-to-configuration.pl     | 42 +++++++++++++++++++
 modules/system/boot/systemd.nix               |  2 +-
 2 files changed, 43 insertions(+), 1 deletion(-)

diff --git a/modules/system/activation/switch-to-configuration.pl b/modules/system/activation/switch-to-configuration.pl
index 199c23d8ab0..b9ba9b14e63 100644
--- a/modules/system/activation/switch-to-configuration.pl
+++ b/modules/system/activation/switch-to-configuration.pl
@@ -2,7 +2,9 @@
 
 use strict;
 use warnings;
+use File::Basename;
 use File::Slurp;
+use Cwd 'abs_path';
 
 my $action = shift @ARGV;
 
@@ -40,6 +42,41 @@ EOF
 # virtual console 1 and we restart the "tty1" unit.
 $SIG{PIPE} = "IGNORE";
 
+sub getActiveUnits {
+    # FIXME: use D-Bus or whatever to query this, since parsing the
+    # output of list-units is likely to break.
+    my $lines = `@systemd@/bin/systemctl list-units --full`;
+    my $res = {};
+    foreach my $line (split '\n', $lines) {
+        chomp $line;
+        last if $line eq "";
+        $line =~ /^(\S+)\s+(\S+)\s+(\S+)\s+(\S+)\s/ or next;
+        next if $1 eq "UNIT";
+        $res->{$1} = { load => $2, state => $3, substate => $4 };
+    }
+    return $res;
+}
+
+# Stop all services that no longer exist or have changed in the new
+# configuration.
+# FIXME: handle template units (e.g. getty@.service).
+my $active = getActiveUnits;
+foreach my $unitFile (glob "/etc/systemd/system/*") {
+    next unless -f "$unitFile";
+    my $unit = basename $unitFile;
+    my $state = $active->{$unit};
+    if (defined $state && ($state->{state} eq "active" || $state->{state} eq "activating")) {
+        my $newUnitFile = "@out@/etc/systemd/system/$unit";
+        if (! -e $newUnitFile) {
+            print STDERR "stopping obsolete unit ‘$unit’...\n";
+            system("@systemd@/bin/systemctl", "stop", $unit); # FIXME: ignore errors?
+        } elsif (abs_path($unitFile) ne abs_path($newUnitFile)) {
+            print STDERR "stopping changed unit ‘$unit’...\n";
+            system("@systemd@/bin/systemctl", "stop", $unit); # FIXME: ignore errors?
+        }
+    }
+}
+
 # Activate the new configuration (i.e., update /etc, make accounts,
 # and so on).
 my $res = 0;
@@ -51,6 +88,11 @@ system("@out@/activate", "@out@") == 0 or $res = 2;
 # Make systemd reload its units.
 system("@systemd@/bin/systemctl", "daemon-reload") == 0 or $res = 3;
 
+# Start all units required by the default target.  This should start
+# all changed units we stopped above as well as any new dependencies.
+print STDERR "starting default target...\n";
+system("@systemd@/bin/systemctl", "start", "default.target") == 0 or $res = 3;
+
 # Signal dbus to reload its configuration.
 system("@systemd@/bin/systemctl", "reload", "dbus.service");
 
diff --git a/modules/system/boot/systemd.nix b/modules/system/boot/systemd.nix
index db690901014..848831a94a2 100644
--- a/modules/system/boot/systemd.nix
+++ b/modules/system/boot/systemd.nix
@@ -324,7 +324,7 @@ let
       done
       
       for i in ${toString nixosUnits}; do
-        cp $i/* $out/
+        ln -s $i/* $out/
       done
 
       ${concatStrings (mapAttrsToList (name: unit:
-- 
GitLab


From 1b249eaf0568e9d14915d76690afb43442612cc2 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 3 Aug 2012 15:11:28 +0200
Subject: [PATCH 3884/5331] Initial version of a SpamAssassin service.

The configuration is expected to be managed by the user in /etc/spamassassin.
---
 modules/module-list.nix                |  1 +
 modules/services/mail/spamassassin.nix | 45 ++++++++++++++++++++++++++
 2 files changed, 46 insertions(+)
 create mode 100644 modules/services/mail/spamassassin.nix

diff --git a/modules/module-list.nix b/modules/module-list.nix
index e2c9516ac46..bc3948182c3 100644
--- a/modules/module-list.nix
+++ b/modules/module-list.nix
@@ -88,6 +88,7 @@
   ./services/mail/freepops.nix
   ./services/mail/mail.nix
   ./services/mail/postfix.nix
+  ./services/mail/spamassassin.nix
   ./services/misc/autofs.nix
   ./services/misc/disnix.nix
   ./services/misc/felix.nix
diff --git a/modules/services/mail/spamassassin.nix b/modules/services/mail/spamassassin.nix
new file mode 100644
index 00000000000..e91c709cba2
--- /dev/null
+++ b/modules/services/mail/spamassassin.nix
@@ -0,0 +1,45 @@
+{ config, pkgs, ... }:
+
+with pkgs.lib;
+
+let
+
+  cfg = config.services.spamassassin;
+
+in
+
+{
+
+  ###### interface
+
+  options = {
+
+    services.spamassassin = {
+
+      enable = mkOption {
+        default = false;
+        description = "Whether to run the SpamAssassin daemon.";
+      };
+
+    };
+
+  };
+
+
+  ###### implementation
+
+  config = mkIf cfg.enable {
+
+    # This makes comfortable for users to run 'spamassassin'.
+    environment.systemPackages = [ pkgs.spamassassin ];
+
+    jobs.spamd = {
+      description = "Spam Assassin Server";
+      startOn = "started networking and filesystem";
+      environment.TZ = config.time.timeZone;
+      exec = "spamd -C /etc/spamassassin/init.pre --siteconfigpath=/etc/spamassassin --debug --pidfile=/var/run/spamd.pid";
+    };
+
+  };
+
+}
-- 
GitLab


From 29f721ba541588c514cac63f8ba5b675341cb14a Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 3 Aug 2012 09:34:27 -0400
Subject: [PATCH 3885/5331] Only create the Apache user/group if it's "wwwrun"

---
 modules/services/web-servers/apache-httpd/default.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/modules/services/web-servers/apache-httpd/default.nix b/modules/services/web-servers/apache-httpd/default.nix
index a101b077e47..90c0adee2a7 100644
--- a/modules/services/web-servers/apache-httpd/default.nix
+++ b/modules/services/web-servers/apache-httpd/default.nix
@@ -557,14 +557,14 @@ in
 
   config = mkIf config.services.httpd.enable {
 
-    users.extraUsers = singleton
-      { name = mainCfg.user;
-        group = mainCfg.group;
+    users.extraUsers = optionalAttrs (mainCfg.user == "wwwrun") singleton
+      { name = "wwwrun";
+        group = "wwwrun";
         description = "Apache httpd user";
       };
 
-    users.extraGroups = singleton
-      { name = mainCfg.group;
+    users.extraGroups = optionalAttrs (mainCfg.group == "wwwrun") singleton
+      { name = "wwwrun";
       };
 
     environment.systemPackages = [httpd] ++ concatMap (svc: svc.extraPath) allSubservices;
-- 
GitLab


From 0ef085d58a8307bfe6ba5a108a063a9e41a2549d Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 27 Jul 2012 00:38:19 +0200
Subject: [PATCH 3886/5331] Add services.httpd.fixUidAndGid option to assign
 reliable numeric UID and GID for the Apache user.

The option is disabled by default so that previously existing installations
aren't affected.

If you'd like to migrate to the fixed numeric id for Apache, set "fixUidAndGid
= true", edit the file "/etc/groups" and replace the old GID value with 54.
(NixOS can't do that for you because it refuses to change a GID that identifies
the primary group of a user.) Then run

  find / -xdev -uid $oldUID -exec chown 54 {} +
  find / -xdev -gid $oldGID -exec chgrp 54 {} +

to update ownership of all files that are supposed to be owned by Apache.
---
 modules/misc/ids.nix                          |  4 ++++
 .../web-servers/apache-httpd/default.nix      | 24 ++++++++++++++-----
 2 files changed, 22 insertions(+), 6 deletions(-)

diff --git a/modules/misc/ids.nix b/modules/misc/ids.nix
index 13ebf954f32..eb78b32f542 100644
--- a/modules/misc/ids.nix
+++ b/modules/misc/ids.nix
@@ -72,6 +72,7 @@ in
     clamav = 51;
     fprot = 52;
     bind = 53;
+    wwwrun = 54;
 
     # When adding a uid, make sure it doesn't match an existing gid.
 
@@ -123,6 +124,9 @@ in
     mpd = 50;
     clamav = 51;
     fprot = 52;
+    # Group id 53 is still free! I didn't use it, because I wanted the
+    # the same numeric value for the 'wwwrun' user and group.
+    wwwrun = 54;
 
     # When adding a gid, make sure it doesn't match an existing uid.
 
diff --git a/modules/services/web-servers/apache-httpd/default.nix b/modules/services/web-servers/apache-httpd/default.nix
index 90c0adee2a7..248c013bf38 100644
--- a/modules/services/web-servers/apache-httpd/default.nix
+++ b/modules/services/web-servers/apache-httpd/default.nix
@@ -407,7 +407,7 @@ in
 
       package = mkOption {
         default = pkgs.apacheHttpd.override { mpm = mainCfg.multiProcessingModule; };
-	example = "pkgs.apacheHttpd_2_4";
+        example = "pkgs.apacheHttpd_2_4";
         description = "
           Overridable attribute of the Apache HTTP Server package to use.
         ";
@@ -415,7 +415,7 @@ in
 
       configFile = mkOption {
         default = confFile;
-	example = ''pkgs.writeText "httpd.conf" "# my custom config file ...";'';
+        example = ''pkgs.writeText "httpd.conf" "# my custom config file ...";'';
         description = "
           Overridable config file to use for Apache. By default, use the
           file automatically generated by nixos.
@@ -469,6 +469,18 @@ in
         ";
       };
 
+      fixUidAndGid = mkOption {
+        default = false;
+        description = "
+          Use a fixed numeric ID (54) for the <varname>wwwrun</varname> user
+          and group. This setting is disabled by default for the sake of
+          backwards compatibility: we don't want to break pre-existing
+          installations that alrady have a user/group for Apache with different
+          values for that ID. If you're installing a fresh server, however,
+          choosing the fixed numeric values for those IDs is safe.
+        ";
+      };
+
       logDir = mkOption {
         default = "/var/log/httpd";
         description = "
@@ -558,14 +570,14 @@ in
   config = mkIf config.services.httpd.enable {
 
     users.extraUsers = optionalAttrs (mainCfg.user == "wwwrun") singleton
-      { name = "wwwrun";
+      ({ name = "wwwrun";
         group = "wwwrun";
         description = "Apache httpd user";
-      };
+      } // (if mainCfg.fixUidAndGid then { uid = config.ids.uids.wwwrun; } else {}));
 
     users.extraGroups = optionalAttrs (mainCfg.group == "wwwrun") singleton
-      { name = "wwwrun";
-      };
+      ({ name = "wwwrun";
+      } // (if mainCfg.fixUidAndGid then { gid = config.ids.gids.wwwrun; } else {}));
 
     environment.systemPackages = [httpd] ++ concatMap (svc: svc.extraPath) allSubservices;
 
-- 
GitLab


From 56ce5614f9c17b84e21783ab3cf69774e954967c Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 3 Aug 2012 10:40:01 -0400
Subject: [PATCH 3887/5331] switch-to-configuration: Print all failed services

---
 .../activation/switch-to-configuration.pl     | 20 ++++++++++++++++++-
 1 file changed, 19 insertions(+), 1 deletion(-)

diff --git a/modules/system/activation/switch-to-configuration.pl b/modules/system/activation/switch-to-configuration.pl
index b9ba9b14e63..4ff4cf1420f 100644
--- a/modules/system/activation/switch-to-configuration.pl
+++ b/modules/system/activation/switch-to-configuration.pl
@@ -57,6 +57,9 @@ sub getActiveUnits {
     return $res;
 }
 
+# Forget about previously failed services.
+system("@systemd@/bin/systemctl", "reset-failed");
+
 # Stop all services that no longer exist or have changed in the new
 # configuration.
 # FIXME: handle template units (e.g. getty@.service).
@@ -91,9 +94,24 @@ system("@systemd@/bin/systemctl", "daemon-reload") == 0 or $res = 3;
 # Start all units required by the default target.  This should start
 # all changed units we stopped above as well as any new dependencies.
 print STDERR "starting default target...\n";
-system("@systemd@/bin/systemctl", "start", "default.target") == 0 or $res = 3;
+system("@systemd@/bin/systemctl", "start", "default.target") == 0 or $res = 4;
 
 # Signal dbus to reload its configuration.
 system("@systemd@/bin/systemctl", "reload", "dbus.service");
 
+# Check all the failed services.
+$active = getActiveUnits;
+my @failed;
+while (my ($unit, $state) = each %{$active}) {
+    push @failed, $unit if $state->{state} eq "failed";
+}
+if (scalar @failed > 0) {
+    print STDERR "warning: the following units failed: ", join(", ", @failed), "\n";
+    foreach my $unit (@failed) {
+        print STDERR "\n";
+        system("@systemd@/bin/systemctl status '$unit' >&2");
+    }
+    $res = 4;
+}
+
 exit $res;
-- 
GitLab


From 0a0c28f8129e81a23163adadb9ca6f65061ab736 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 3 Aug 2012 10:52:53 -0400
Subject: [PATCH 3888/5331] Revert "Add services.httpd.fixUidAndGid option to
 assign reliable numeric UID and GID for the Apache user."

This reverts commit 0ef085d58a8307bfe6ba5a108a063a9e41a2549d.
---
 modules/misc/ids.nix                          |  4 ----
 .../web-servers/apache-httpd/default.nix      | 24 +++++--------------
 2 files changed, 6 insertions(+), 22 deletions(-)

diff --git a/modules/misc/ids.nix b/modules/misc/ids.nix
index eb78b32f542..13ebf954f32 100644
--- a/modules/misc/ids.nix
+++ b/modules/misc/ids.nix
@@ -72,7 +72,6 @@ in
     clamav = 51;
     fprot = 52;
     bind = 53;
-    wwwrun = 54;
 
     # When adding a uid, make sure it doesn't match an existing gid.
 
@@ -124,9 +123,6 @@ in
     mpd = 50;
     clamav = 51;
     fprot = 52;
-    # Group id 53 is still free! I didn't use it, because I wanted the
-    # the same numeric value for the 'wwwrun' user and group.
-    wwwrun = 54;
 
     # When adding a gid, make sure it doesn't match an existing uid.
 
diff --git a/modules/services/web-servers/apache-httpd/default.nix b/modules/services/web-servers/apache-httpd/default.nix
index 248c013bf38..90c0adee2a7 100644
--- a/modules/services/web-servers/apache-httpd/default.nix
+++ b/modules/services/web-servers/apache-httpd/default.nix
@@ -407,7 +407,7 @@ in
 
       package = mkOption {
         default = pkgs.apacheHttpd.override { mpm = mainCfg.multiProcessingModule; };
-        example = "pkgs.apacheHttpd_2_4";
+	example = "pkgs.apacheHttpd_2_4";
         description = "
           Overridable attribute of the Apache HTTP Server package to use.
         ";
@@ -415,7 +415,7 @@ in
 
       configFile = mkOption {
         default = confFile;
-        example = ''pkgs.writeText "httpd.conf" "# my custom config file ...";'';
+	example = ''pkgs.writeText "httpd.conf" "# my custom config file ...";'';
         description = "
           Overridable config file to use for Apache. By default, use the
           file automatically generated by nixos.
@@ -469,18 +469,6 @@ in
         ";
       };
 
-      fixUidAndGid = mkOption {
-        default = false;
-        description = "
-          Use a fixed numeric ID (54) for the <varname>wwwrun</varname> user
-          and group. This setting is disabled by default for the sake of
-          backwards compatibility: we don't want to break pre-existing
-          installations that alrady have a user/group for Apache with different
-          values for that ID. If you're installing a fresh server, however,
-          choosing the fixed numeric values for those IDs is safe.
-        ";
-      };
-
       logDir = mkOption {
         default = "/var/log/httpd";
         description = "
@@ -570,14 +558,14 @@ in
   config = mkIf config.services.httpd.enable {
 
     users.extraUsers = optionalAttrs (mainCfg.user == "wwwrun") singleton
-      ({ name = "wwwrun";
+      { name = "wwwrun";
         group = "wwwrun";
         description = "Apache httpd user";
-      } // (if mainCfg.fixUidAndGid then { uid = config.ids.uids.wwwrun; } else {}));
+      };
 
     users.extraGroups = optionalAttrs (mainCfg.group == "wwwrun") singleton
-      ({ name = "wwwrun";
-      } // (if mainCfg.fixUidAndGid then { gid = config.ids.gids.wwwrun; } else {}));
+      { name = "wwwrun";
+      };
 
     environment.systemPackages = [httpd] ++ concatMap (svc: svc.extraPath) allSubservices;
 
-- 
GitLab


From 23cb924fbfa4bebd4843cbe61b5c4fe3592c590c Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 3 Aug 2012 11:03:56 -0400
Subject: [PATCH 3889/5331] Don't try to change the uid/gid of existing users

Unless we search the entire filesystem to do a chown *and* restart
existing processes owned by that user, there is no sensible way that
we can change uids/gids.  So don't try.
---
 modules/config/users-groups.nix | 11 -----------
 1 file changed, 11 deletions(-)

diff --git a/modules/config/users-groups.nix b/modules/config/users-groups.nix
index 598d68eb91d..76b6c2854a9 100644
--- a/modules/config/users-groups.nix
+++ b/modules/config/users-groups.nix
@@ -265,15 +265,11 @@ in
                 oldIFS="$IFS"; IFS=:; set -- $curEnt; IFS="$oldIFS"
                 prevUid=$3
                 prevHome=$6
-                # Don't change the UID if it's the same, otherwise usermod
-                # will complain.
-                if test "$prevUid" = "$uid"; then unset uid; fi
                 # Don't change the home directory if it's the same to prevent
                 # unnecessary warnings about logged in users.
                 if test "$prevHome" = "$home"; then unset home; fi
                 usermod \
                     --comment "$description" \
-                    ''${uid:+--uid $uid} \
                     --gid "$group" \
                     --groups "$extraGroups" \
                     ''${home:+--home "$home"} \
@@ -296,13 +292,6 @@ in
                 groupadd --system \
                     ''${gid:+--gid $gid} \
                     "$name"
-            else
-                #echo "updating group $name..."
-                oldIFS="$IFS"; IFS=:; set -- $curEnt; IFS="$oldIFS"
-                prevGid=$3
-                if test -n "$gid" -a "$prevGid" != "$gid"; then
-                    groupmod --gid $gid "$name"
-                fi
             fi
         }
 
-- 
GitLab


From d5d8acfacd008bdc2a722101da0e65622c1af73a Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 3 Aug 2012 11:05:25 -0400
Subject: [PATCH 3890/5331] Assign uid/gid 54 to wwwrun

---
 modules/misc/ids.nix                                  | 2 ++
 modules/services/web-servers/apache-httpd/default.nix | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/modules/misc/ids.nix b/modules/misc/ids.nix
index 13ebf954f32..bd38b5f9a42 100644
--- a/modules/misc/ids.nix
+++ b/modules/misc/ids.nix
@@ -72,6 +72,7 @@ in
     clamav = 51;
     fprot = 52;
     bind = 53;
+    wwwrun = 54;
 
     # When adding a uid, make sure it doesn't match an existing gid.
 
@@ -123,6 +124,7 @@ in
     mpd = 50;
     clamav = 51;
     fprot = 52;
+    wwwrun = 54;
 
     # When adding a gid, make sure it doesn't match an existing uid.
 
diff --git a/modules/services/web-servers/apache-httpd/default.nix b/modules/services/web-servers/apache-httpd/default.nix
index 90c0adee2a7..9ceb66a85a0 100644
--- a/modules/services/web-servers/apache-httpd/default.nix
+++ b/modules/services/web-servers/apache-httpd/default.nix
@@ -561,10 +561,12 @@ in
       { name = "wwwrun";
         group = "wwwrun";
         description = "Apache httpd user";
+        uid = config.ids.uids.wwwrun;
       };
 
     users.extraGroups = optionalAttrs (mainCfg.group == "wwwrun") singleton
       { name = "wwwrun";
+        gid = config.ids.gids.wwwrun;
       };
 
     environment.systemPackages = [httpd] ++ concatMap (svc: svc.extraPath) allSubservices;
-- 
GitLab


From b6bd0a4f84696ece1da1e437430f0ab6df0df726 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 3 Aug 2012 11:53:14 -0400
Subject: [PATCH 3891/5331] switch-to-configuration: Restart services that were
 manually started

---
 .../activation/switch-to-configuration.pl     | 19 ++++++++++++++++++-
 1 file changed, 18 insertions(+), 1 deletion(-)

diff --git a/modules/system/activation/switch-to-configuration.pl b/modules/system/activation/switch-to-configuration.pl
index 4ff4cf1420f..fd515341d13 100644
--- a/modules/system/activation/switch-to-configuration.pl
+++ b/modules/system/activation/switch-to-configuration.pl
@@ -6,6 +6,8 @@ use File::Basename;
 use File::Slurp;
 use Cwd 'abs_path';
 
+my $restartListFile = "/run/systemd/restart-list";
+
 my $action = shift @ARGV;
 
 if (!defined $action || ($action ne "switch" && $action ne "boot" && $action ne "test")) {
@@ -75,6 +77,10 @@ foreach my $unitFile (glob "/etc/systemd/system/*") {
             system("@systemd@/bin/systemctl", "stop", $unit); # FIXME: ignore errors?
         } elsif (abs_path($unitFile) ne abs_path($newUnitFile)) {
             print STDERR "stopping changed unit ‘$unit’...\n";
+            # Record that this unit needs to be started below.  We
+            # write this to a file to ensure that the service gets
+            # restarted if we're interrupted.
+            write_file($restartListFile, { append => 1 }, "$unit\n");
             system("@systemd@/bin/systemctl", "stop", $unit); # FIXME: ignore errors?
         }
     }
@@ -92,10 +98,21 @@ system("@out@/activate", "@out@") == 0 or $res = 2;
 system("@systemd@/bin/systemctl", "daemon-reload") == 0 or $res = 3;
 
 # Start all units required by the default target.  This should start
-# all changed units we stopped above as well as any new dependencies.
+# most changed units we stopped above as well as any new dependencies.
 print STDERR "starting default target...\n";
 system("@systemd@/bin/systemctl", "start", "default.target") == 0 or $res = 4;
 
+# Start changed units we stopped above.  This is necessary because
+# some may not be dependencies of the default target (i.e., they were
+# manually started).
+my @stopped = split '\n', read_file($restartListFile, err_mode => 'quiet') // "";
+if (scalar @stopped > 0) {
+    print STDERR "restarting unit(s) ", join(" ", @stopped), "...\n";
+    my %unique = map { $_, 1 } @stopped;
+    system("@systemd@/bin/systemctl", "start", keys(%unique)) == 0 or $res = 4;
+    unlink($restartListFile);
+}
+
 # Signal dbus to reload its configuration.
 system("@systemd@/bin/systemctl", "reload", "dbus.service");
 
-- 
GitLab


From d13a3c741a151cae307be52a26ed9f17f2c000b4 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 3 Aug 2012 18:07:06 +0200
Subject: [PATCH 3892/5331] spamassassin: call daemon with complete path

---
 modules/services/mail/spamassassin.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/services/mail/spamassassin.nix b/modules/services/mail/spamassassin.nix
index e91c709cba2..69d3c390bc9 100644
--- a/modules/services/mail/spamassassin.nix
+++ b/modules/services/mail/spamassassin.nix
@@ -30,14 +30,14 @@ in
 
   config = mkIf cfg.enable {
 
-    # This makes comfortable for users to run 'spamassassin'.
+    # Allow users to run 'spamc'.
     environment.systemPackages = [ pkgs.spamassassin ];
 
     jobs.spamd = {
       description = "Spam Assassin Server";
       startOn = "started networking and filesystem";
       environment.TZ = config.time.timeZone;
-      exec = "spamd -C /etc/spamassassin/init.pre --siteconfigpath=/etc/spamassassin --debug --pidfile=/var/run/spamd.pid";
+      exec = "${pkgs.spamassassin}/bin/spamd -C /etc/spamassassin/init.pre --siteconfigpath=/etc/spamassassin --debug --pidfile=/var/run/spamd.pid";
     };
 
   };
-- 
GitLab


From bd3c9febc9672e6f6ff8705b6437e1d8fca1bebb Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 3 Aug 2012 13:29:56 -0400
Subject: [PATCH 3893/5331] switch-to-configuration: Stop units in one call to
 systemctl

---
 .../activation/switch-to-configuration.pl     | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/modules/system/activation/switch-to-configuration.pl b/modules/system/activation/switch-to-configuration.pl
index fd515341d13..e017098a411 100644
--- a/modules/system/activation/switch-to-configuration.pl
+++ b/modules/system/activation/switch-to-configuration.pl
@@ -65,27 +65,30 @@ system("@systemd@/bin/systemctl", "reset-failed");
 # Stop all services that no longer exist or have changed in the new
 # configuration.
 # FIXME: handle template units (e.g. getty@.service).
+my @unitsToStop;
 my $active = getActiveUnits;
-foreach my $unitFile (glob "/etc/systemd/system/*") {
-    next unless -f "$unitFile";
-    my $unit = basename $unitFile;
+while (my ($unit, $state) = each %{$active}) {
     my $state = $active->{$unit};
-    if (defined $state && ($state->{state} eq "active" || $state->{state} eq "activating")) {
+    my $curUnitFile = "/etc/systemd/system/$unit";
+    if (-e $curUnitFile && ($state->{state} eq "active" || $state->{state} eq "activating")) {
         my $newUnitFile = "@out@/etc/systemd/system/$unit";
         if (! -e $newUnitFile) {
             print STDERR "stopping obsolete unit ‘$unit’...\n";
-            system("@systemd@/bin/systemctl", "stop", $unit); # FIXME: ignore errors?
-        } elsif (abs_path($unitFile) ne abs_path($newUnitFile)) {
+            push @unitsToStop, $unit;
+        } elsif (abs_path($curUnitFile) ne abs_path($newUnitFile)) {
             print STDERR "stopping changed unit ‘$unit’...\n";
             # Record that this unit needs to be started below.  We
             # write this to a file to ensure that the service gets
             # restarted if we're interrupted.
             write_file($restartListFile, { append => 1 }, "$unit\n");
-            system("@systemd@/bin/systemctl", "stop", $unit); # FIXME: ignore errors?
+            push @unitsToStop, $unit;
         }
     }
 }
 
+system("@systemd@/bin/systemctl", "stop", @unitsToStop)
+    if scalar @unitsToStop > 0; # FIXME: ignore errors?
+
 # Activate the new configuration (i.e., update /etc, make accounts,
 # and so on).
 my $res = 0;
@@ -107,7 +110,7 @@ system("@systemd@/bin/systemctl", "start", "default.target") == 0 or $res = 4;
 # manually started).
 my @stopped = split '\n', read_file($restartListFile, err_mode => 'quiet') // "";
 if (scalar @stopped > 0) {
-    print STDERR "restarting unit(s) ", join(" ", @stopped), "...\n";
+    print STDERR "restarting the following units: ", join(" ", @stopped), "\n";
     my %unique = map { $_, 1 } @stopped;
     system("@systemd@/bin/systemctl", "start", keys(%unique)) == 0 or $res = 4;
     unlink($restartListFile);
-- 
GitLab


From aa6fd9f8a25fbea1f73869ddcc02fd0aea1f4e91 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 3 Aug 2012 13:47:59 -0400
Subject: [PATCH 3894/5331] switch-to-configuration: Handle unit template
 instances

---
 .../activation/switch-to-configuration.pl      | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/modules/system/activation/switch-to-configuration.pl b/modules/system/activation/switch-to-configuration.pl
index e017098a411..4f6a2a14cd1 100644
--- a/modules/system/activation/switch-to-configuration.pl
+++ b/modules/system/activation/switch-to-configuration.pl
@@ -64,19 +64,19 @@ system("@systemd@/bin/systemctl", "reset-failed");
 
 # Stop all services that no longer exist or have changed in the new
 # configuration.
-# FIXME: handle template units (e.g. getty@.service).
 my @unitsToStop;
 my $active = getActiveUnits;
 while (my ($unit, $state) = each %{$active}) {
     my $state = $active->{$unit};
-    my $curUnitFile = "/etc/systemd/system/$unit";
+    my $baseUnit = $unit;
+    # Recognise template instances.
+    $baseUnit = "$1\@.$2" if $unit =~ /^(.*)@[^\.]*\.(.*)$/;
+    my $curUnitFile = "/etc/systemd/system/$baseUnit";
     if (-e $curUnitFile && ($state->{state} eq "active" || $state->{state} eq "activating")) {
-        my $newUnitFile = "@out@/etc/systemd/system/$unit";
+        my $newUnitFile = "@out@/etc/systemd/system/$baseUnit";
         if (! -e $newUnitFile) {
-            print STDERR "stopping obsolete unit ‘$unit’...\n";
             push @unitsToStop, $unit;
         } elsif (abs_path($curUnitFile) ne abs_path($newUnitFile)) {
-            print STDERR "stopping changed unit ‘$unit’...\n";
             # Record that this unit needs to be started below.  We
             # write this to a file to ensure that the service gets
             # restarted if we're interrupted.
@@ -86,6 +86,7 @@ while (my ($unit, $state) = each %{$active}) {
     }
 }
 
+print STDERR "stopping the following units: ", join(", ", sort(@unitsToStop)), "\n";
 system("@systemd@/bin/systemctl", "stop", @unitsToStop)
     if scalar @unitsToStop > 0; # FIXME: ignore errors?
 
@@ -110,9 +111,10 @@ system("@systemd@/bin/systemctl", "start", "default.target") == 0 or $res = 4;
 # manually started).
 my @stopped = split '\n', read_file($restartListFile, err_mode => 'quiet') // "";
 if (scalar @stopped > 0) {
-    print STDERR "restarting the following units: ", join(" ", @stopped), "\n";
     my %unique = map { $_, 1 } @stopped;
-    system("@systemd@/bin/systemctl", "start", keys(%unique)) == 0 or $res = 4;
+    my @unique = sort(keys(%unique));
+    print STDERR "restarting the following units: ", join(", ", @unique), "\n";
+    system("@systemd@/bin/systemctl", "start", @unique) == 0 or $res = 4;
     unlink($restartListFile);
 }
 
@@ -126,7 +128,7 @@ while (my ($unit, $state) = each %{$active}) {
     push @failed, $unit if $state->{state} eq "failed";
 }
 if (scalar @failed > 0) {
-    print STDERR "warning: the following units failed: ", join(", ", @failed), "\n";
+    print STDERR "warning: the following units failed: ", join(", ", sort(@failed)), "\n";
     foreach my $unit (@failed) {
         print STDERR "\n";
         system("@systemd@/bin/systemctl status '$unit' >&2");
-- 
GitLab


From 0d6b96a525c34607745d19debe829ee12f8ca2bb Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 3 Aug 2012 14:07:43 -0400
Subject: [PATCH 3895/5331] switch-to-configuration: Fix the call to install
 the boot loader

---
 modules/system/activation/switch-to-configuration.pl | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/modules/system/activation/switch-to-configuration.pl b/modules/system/activation/switch-to-configuration.pl
index 4f6a2a14cd1..098c08f9720 100644
--- a/modules/system/activation/switch-to-configuration.pl
+++ b/modules/system/activation/switch-to-configuration.pl
@@ -24,8 +24,10 @@ EOF
 die "This is not a NixOS installation (/etc/NIXOS is missing)!\n" unless -f "/etc/NIXOS";
 
 # Install or update the bootloader.
-#system("@installBootLoader@ @out@") == 0 or exit 1 if $action eq "switch" || $action eq "boot";
-exit 0 if $action eq "boot";
+if ($action eq "switch" || $action eq "boot") {
+    system("@installBootLoader@ @out@") == 0 or exit 1;
+    exit 0 if $action eq "boot";
+}
 
 # Check if we can activate the new configuration.
 my $oldVersion = read_file("/run/current-system/init-interface-version", err_mode => 'quiet') // "";
-- 
GitLab


From 320682a558098a419aad7c9f435f2e8c64f0a97c Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 3 Aug 2012 14:39:59 -0400
Subject: [PATCH 3896/5331] switch-to-configuration: Don't ellipsize log output

---
 modules/system/activation/switch-to-configuration.pl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/system/activation/switch-to-configuration.pl b/modules/system/activation/switch-to-configuration.pl
index 098c08f9720..c7a82da7a7b 100644
--- a/modules/system/activation/switch-to-configuration.pl
+++ b/modules/system/activation/switch-to-configuration.pl
@@ -133,7 +133,7 @@ if (scalar @failed > 0) {
     print STDERR "warning: the following units failed: ", join(", ", sort(@failed)), "\n";
     foreach my $unit (@failed) {
         print STDERR "\n";
-        system("@systemd@/bin/systemctl status '$unit' >&2");
+        system("COLUMNS=1000 @systemd@/bin/systemctl status --no-pager '$unit' >&2");
     }
     $res = 4;
 }
-- 
GitLab


From 2a91bb52825f5bae71ebb8cdded65a0da099a1fa Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 3 Aug 2012 17:13:34 -0400
Subject: [PATCH 3897/5331] switch-to-configuration: Print new units

---
 .../activation/switch-to-configuration.pl     | 31 +++++++++++--------
 1 file changed, 18 insertions(+), 13 deletions(-)

diff --git a/modules/system/activation/switch-to-configuration.pl b/modules/system/activation/switch-to-configuration.pl
index c7a82da7a7b..6cedf7f2646 100644
--- a/modules/system/activation/switch-to-configuration.pl
+++ b/modules/system/activation/switch-to-configuration.pl
@@ -67,18 +67,17 @@ system("@systemd@/bin/systemctl", "reset-failed");
 # Stop all services that no longer exist or have changed in the new
 # configuration.
 my @unitsToStop;
-my $active = getActiveUnits;
-while (my ($unit, $state) = each %{$active}) {
-    my $state = $active->{$unit};
+my $activePrev = getActiveUnits;
+while (my ($unit, $state) = each %{$activePrev}) {
     my $baseUnit = $unit;
     # Recognise template instances.
     $baseUnit = "$1\@.$2" if $unit =~ /^(.*)@[^\.]*\.(.*)$/;
-    my $curUnitFile = "/etc/systemd/system/$baseUnit";
-    if (-e $curUnitFile && ($state->{state} eq "active" || $state->{state} eq "activating")) {
+    my $prevUnitFile = "/etc/systemd/system/$baseUnit";
+    if (-e $prevUnitFile && ($state->{state} eq "active" || $state->{state} eq "activating")) {
         my $newUnitFile = "@out@/etc/systemd/system/$baseUnit";
         if (! -e $newUnitFile) {
             push @unitsToStop, $unit;
-        } elsif (abs_path($curUnitFile) ne abs_path($newUnitFile)) {
+        } elsif (abs_path($prevUnitFile) ne abs_path($newUnitFile)) {
             # Record that this unit needs to be started below.  We
             # write this to a file to ensure that the service gets
             # restarted if we're interrupted.
@@ -88,9 +87,10 @@ while (my ($unit, $state) = each %{$active}) {
     }
 }
 
-print STDERR "stopping the following units: ", join(", ", sort(@unitsToStop)), "\n";
-system("@systemd@/bin/systemctl", "stop", @unitsToStop)
-    if scalar @unitsToStop > 0; # FIXME: ignore errors?
+if (scalar @unitsToStop > 0) {
+    print STDERR "stopping the following units: ", join(", ", sort(@unitsToStop)), "\n";
+    system("@systemd@/bin/systemctl", "stop", @unitsToStop); # FIXME: ignore errors?
+}
 
 # Activate the new configuration (i.e., update /etc, make accounts,
 # and so on).
@@ -123,12 +123,17 @@ if (scalar @stopped > 0) {
 # Signal dbus to reload its configuration.
 system("@systemd@/bin/systemctl", "reload", "dbus.service");
 
-# Check all the failed services.
-$active = getActiveUnits;
-my @failed;
-while (my ($unit, $state) = each %{$active}) {
+# Print failed and new units.
+my (@failed, @new);
+my $activeNew = getActiveUnits;
+while (my ($unit, $state) = each %{$activeNew}) {
     push @failed, $unit if $state->{state} eq "failed";
+    push @new, $unit if $state->{state} ne "failed" && !defined $activePrev->{$unit};
 }
+
+print STDERR "the following new units were started: ", join(", ", sort(@new)), "\n"
+    if scalar @new > 0;
+
 if (scalar @failed > 0) {
     print STDERR "warning: the following units failed: ", join(", ", sort(@failed)), "\n";
     foreach my $unit (@failed) {
-- 
GitLab


From 1b615f460bc40cf2697d7e972bad3091cf87ceaf Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Sat, 4 Aug 2012 09:45:26 -0400
Subject: [PATCH 3898/5331] Allow overriding all NixOS tests to run with the
 minimal kernel possible for that test's config(s) (based on
 requiredKernelConfig)

---
 lib/build-vms.nix                  |  4 ++--
 lib/testing.nix                    |  4 ++--
 modules/testing/minimal-kernel.nix | 28 ++++++++++++++++++++++
 release.nix                        |  6 ++---
 tests/default.nix                  |  5 ++--
 tests/minimal-kernel.nix           | 37 ------------------------------
 6 files changed, 37 insertions(+), 47 deletions(-)
 create mode 100644 modules/testing/minimal-kernel.nix
 delete mode 100644 tests/minimal-kernel.nix

diff --git a/lib/build-vms.nix b/lib/build-vms.nix
index e8e5885137d..aacd0e99cb1 100644
--- a/lib/build-vms.nix
+++ b/lib/build-vms.nix
@@ -1,4 +1,4 @@
-{ system }:
+{ system, minimal ? false }:
 
 let pkgs = import <nixpkgs> { config = {}; inherit system; }; in
 
@@ -27,7 +27,7 @@ rec {
         [ ../modules/virtualisation/qemu-vm.nix
           ../modules/testing/test-instrumentation.nix # !!! should only get added for automated test runs
           { key = "no-manual"; services.nixosManual.enable = false; }
-        ];
+        ] ++ lib.optional minimal ../modules/testing/minimal-kernel.nix;
       extraArgs = { inherit nodes; };
     };
 
diff --git a/lib/testing.nix b/lib/testing.nix
index 6a39df8c865..a27f4344c6a 100644
--- a/lib/testing.nix
+++ b/lib/testing.nix
@@ -1,6 +1,6 @@
-{ system }:
+{ system, minimal ? false }:
 
-with import ./build-vms.nix { inherit system; };
+with import ./build-vms.nix { inherit system minimal; };
 with pkgs;
 
 rec {
diff --git a/modules/testing/minimal-kernel.nix b/modules/testing/minimal-kernel.nix
new file mode 100644
index 00000000000..0ad20bbf75a
--- /dev/null
+++ b/modules/testing/minimal-kernel.nix
@@ -0,0 +1,28 @@
+{ config, pkgs, ... }:
+
+let
+  configfile = builtins.storePath (builtins.toFile "config" (pkgs.lib.concatStringsSep "\n"
+    (map (builtins.getAttr "configLine") config.system.requiredKernelConfig))
+  );
+
+  origKernel = pkgs.linuxManualConfig {
+    inherit (pkgs.linux) src version;
+    inherit configfile;
+    allowImportFromDerivation = true;
+    kernelPatches = [ pkgs.kernelPatches.cifs_timeout_2_6_38 ];
+  };
+
+  kernel = origKernel // (derivation (origKernel.drvAttrs // {
+    configurePhase = ''
+      runHook preConfigure
+      mkdir ../build
+      make $makeFlags "''${makeFlagsArray[@]}" mrproper
+      make $makeFlags "''${makeFlagsArray[@]}" KCONFIG_ALLCONFIG=${configfile} allnoconfig
+      runHook postConfigure
+    '';
+  }));
+
+   kernelPackages = pkgs.linuxPackagesFor kernel kernelPackages;
+in {
+  boot.kernelPackages = kernelPackages;
+}
diff --git a/release.nix b/release.nix
index 9f76ee4a254..10cea94881f 100644
--- a/release.nix
+++ b/release.nix
@@ -1,5 +1,6 @@
 { nixosSrc ? {outPath = ./.; revCount = 1234; shortRev = "abcdef"; }
 , nixpkgs ? {outPath = <nixpkgs>; revCount = 5678; shortRev = "fedcba"; }
+, minimal ? false
 }:
 
 let
@@ -194,8 +195,8 @@ let
 
     tests =
       let
-        t = import ./tests { system = "i686-linux"; };
-        t_64 = import ./tests { system = "x86_64-linux"; };
+        t = import ./tests { system = "i686-linux"; inherit minimal; };
+        t_64 = import ./tests { system = "x86_64-linux"; inherit minimal; };
       in {
         avahi = t.avahi.test;
         bittorrent = t.bittorrent.test;
@@ -212,7 +213,6 @@ let
         kde4 = t.kde4.test;
         login = t.login.test;
         misc = t.misc.test;
-        minimal_kernel = t.minimal_kernel.test;
         mpich = t.mpich.test;
         mysql = t.mysql.test;
         mysql_replication = t.mysql_replication.test;
diff --git a/tests/default.nix b/tests/default.nix
index 2433826a9d1..0d2c3102a64 100644
--- a/tests/default.nix
+++ b/tests/default.nix
@@ -1,6 +1,6 @@
-{ system ? builtins.currentSystem }:
+{ system ? builtins.currentSystem, minimal ? false }:
 
-with import ../lib/testing.nix { inherit system; };
+with import ../lib/testing.nix { inherit system minimal; };
 
 {
   avahi = makeTest (import ./avahi.nix);
@@ -11,7 +11,6 @@ with import ../lib/testing.nix { inherit system; };
   ipv6 = makeTest (import ./ipv6.nix);
   kde4 = makeTest (import ./kde4.nix);
   login = makeTest (import ./login.nix);
-  minimal_kernel = makeTest (import ./minimal-kernel.nix);
   misc = makeTest (import ./misc.nix);
   mpich = makeTest (import ./mpich.nix);
   mysql = makeTest (import ./mysql.nix);
diff --git a/tests/minimal-kernel.nix b/tests/minimal-kernel.nix
deleted file mode 100644
index e27b39d1764..00000000000
--- a/tests/minimal-kernel.nix
+++ /dev/null
@@ -1,37 +0,0 @@
-{ pkgs, ... }:
-
-
-{
-  machine = { config, pkgs, ... }:
-    let
-      configfile = builtins.storePath (builtins.toFile "config" (pkgs.lib.concatStringsSep "\n"
-          (map (builtins.getAttr "configLine") config.system.requiredKernelConfig)));
-
-      origKernel = pkgs.linuxManualConfig {
-        inherit (pkgs.linux) src version;
-        inherit configfile;
-        allowImportFromDerivation = true;
-        kernelPatches = [ pkgs.kernelPatches.cifs_timeout_2_6_38 ];
-      };
-
-      kernel = origKernel //(derivation (origKernel.drvAttrs // {
-         configurePhase = ''
-           runHook preConfigure
-           mkdir ../build
-           make $makeFlags "''${makeFlagsArray[@]}" mrproper
-           make $makeFlags "''${makeFlagsArray[@]}" KCONFIG_ALLCONFIG=${configfile} allnoconfig
-           runHook postConfigure
-         '';
-       }));
-
-       kernelPackages = pkgs.linuxPackagesFor kernel kernelPackages;
-    in {
-      boot.kernelPackages = kernelPackages;
-    };
-
-  testScript =
-    ''
-      startAll;
-      $machine->shutdown;
-    '';
-}
-- 
GitLab


From e66bcbd58a1a4691023c0d3c466d3ad4bd28255f Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Mon, 6 Aug 2012 08:13:06 -0400
Subject: [PATCH 3899/5331] The kernel needs SERIAL_8250_CONSOLE when using a
 real serial port as a console

---
 modules/testing/test-instrumentation.nix | 4 ++++
 modules/virtualisation/qemu-vm.nix       | 5 +++++
 2 files changed, 9 insertions(+)

diff --git a/modules/testing/test-instrumentation.nix b/modules/testing/test-instrumentation.nix
index b18e4263c2d..6a7f559c379 100644
--- a/modules/testing/test-instrumentation.nix
+++ b/modules/testing/test-instrumentation.nix
@@ -94,6 +94,10 @@ in
 
     system.upstartEnvironment.GCOV_PREFIX = "/tmp/xchg/coverage-data";
 
+    system.requiredKernelConfig = with config.lib.kernelConfig; [
+      (isYes "SERIAL_8250_CONSOLE")
+      (isYes "SERIAL_8250")
+    ];
   };
 
 }
diff --git a/modules/virtualisation/qemu-vm.nix b/modules/virtualisation/qemu-vm.nix
index dd8b457d43c..0e9804751be 100644
--- a/modules/virtualisation/qemu-vm.nix
+++ b/modules/virtualisation/qemu-vm.nix
@@ -385,4 +385,9 @@ in
 
   # Wireless won't work in the VM.
   networking.wireless.enable = mkOverride 50 false;
+
+  system.requiredKernelConfig = optional (!cfg.graphics) (with config.lib.kernelConfig; [
+    (isYes "SERIAL_8250_CONSOLE")
+    (isYes "SERIAL_8250")
+  ]);
 }
-- 
GitLab


From f74ffe355057b5dce8abdcee7e7e517e44260f1f Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 6 Aug 2012 10:58:27 -0400
Subject: [PATCH 3900/5331] Remove obsolete Upstart shutdown job

---
 modules/system/upstart-events/shutdown.nix | 162 ---------------------
 1 file changed, 162 deletions(-)
 delete mode 100644 modules/system/upstart-events/shutdown.nix

diff --git a/modules/system/upstart-events/shutdown.nix b/modules/system/upstart-events/shutdown.nix
deleted file mode 100644
index 59fbcc0d878..00000000000
--- a/modules/system/upstart-events/shutdown.nix
+++ /dev/null
@@ -1,162 +0,0 @@
-{ config, pkgs, ... }:
-
-with pkgs.lib;
-
-{
-
-  jobs.shutdown =
-    { name = "shutdown";
-
-      task = true;
-
-      stopOn = ""; # must override the default ("starting shutdown")
-
-      environment = { MODE = "poweroff"; };
-
-      extraConfig = "console owner";
-
-      script =
-        ''
-          set +e # continue in case of errors
-
-          ${pkgs.kbd}/bin/chvt 1
-
-          exec < /dev/console > /dev/console 2>&1
-          echo ""
-          if test "$MODE" = maintenance; then
-              echo "<<< Entering maintenance mode >>>"
-          else
-              echo "<<< System shutdown >>>"
-          fi
-          echo ""
-
-          ${config.powerManagement.powerDownCommands}
-
-          export PATH=${pkgs.utillinux}/bin:${pkgs.utillinux}/sbin:$PATH
-
-
-          # Do an initial sync just in case.
-          sync
-
-
-          # Kill all remaining processes except init, this one and any
-          # Upstart jobs that don't stop on the "starting shutdown"
-          # event, as these are necessary to complete the shutdown.
-          omittedPids=$(initctl list | sed -e 's/.*process \([0-9]\+\)/-o \1/;t;d')
-          #echo "saved PIDs: $omittedPids"
-
-          echo "sending the TERM signal to all processes..."
-          ${pkgs.sysvtools}/bin/killall5 -15 $job $omittedPids
-
-          sleep 1 # wait briefly
-
-          echo "sending the KILL signal to all processes..."
-          ${pkgs.sysvtools}/bin/killall5 -9 $job $omittedPids
-
-
-          # If maintenance mode is requested, start a root shell, and
-          # afterwards emit the "startup" event to bring everything
-          # back up.
-          if test "$MODE" = maintenance; then
-              echo ""
-              echo "<<< Maintenance shell >>>"
-              echo ""
-              ${pkgs.shadow}/bin/login root
-              initctl emit -n startup
-              exit 0
-          fi
-
-
-          # Write a shutdown record to wtmp while /var/log is still writable.
-          reboot --wtmp-only
-
-
-          # Set the hardware clock to the system time.
-          echo "setting the hardware clock..."
-          hwclock --systohc ${if config.time.hardwareClockInLocalTime then "--localtime" else "--utc"}
-
-
-          # Stop all swap devices.
-          swapoff -a
-
-
-          # Unmount file systems.  We repeat this until no more file systems
-          # can be unmounted.  This is to handle loopback devices, file
-          # systems mounted on other file systems and so on.
-          tryAgain=1
-          while test -n "$tryAgain"; do
-              tryAgain=
-              failed= # list of mount points that couldn't be unmounted/remounted
-
-              # Get rid of loopback devices.
-              loDevices=$(losetup -a | sed 's#^\(/dev/loop[0-9]\+\).*#\1#')
-              if [ -n "$loDevices" ]; then
-                  echo "removing loopback devices $loDevices..."
-                  losetup -d $loDevices
-              fi
-
-              cp /proc/mounts /dev/.mounts # don't read /proc/mounts while it's changing
-              exec 4< /dev/.mounts
-              while read -u 4 device mp fstype options rest; do
-                  # Skip various special filesystems.  Non-existent
-                  # mount points are typically tmpfs/aufs mounts from
-                  # the initrd.
-                  if [ "$mp" = /proc -o "$mp" = /sys -o "$mp" = /dev -o "$device" = "rootfs" -o "$mp" = /run -o "$mp" = /var/run -o "$mp" = /var/lock -o ! -e "$mp" ]; then continue; fi
-
-                  echo "unmounting $mp..."
-
-                  # We need to remount,ro before attempting any
-                  # umount, or bind mounts may get confused, with
-                  # the fs not being properly flushed at the end.
-
-                  # `-i' is to workaround a bug in mount.cifs (it
-                  # doesn't recognise the `remount' option, and
-                  # instead mounts the FS again).
-                  success=
-                  if mount -t "$fstype" -n -i -o remount,ro "device" "$mp"; then success=1; fi
-
-                  # Note: don't use `umount -f'; it's very buggy.
-                  # (For instance, when applied to a bind-mount it
-                  # unmounts the target of the bind-mount.)  !!! But
-                  # we should use `-f' for NFS.
-                  if [ "$mp" != / -a "$mp" != /nix -a "$mp" != /nix/store ]; then
-                      if umount -n "$mp"; then success=1; tryAgain=1; fi
-                  fi
-
-                  if [ -z "$success" ]; then failed="$failed $mp"; fi
-              done
-          done
-
-
-          # Warn about filesystems that could not be unmounted or
-          # remounted read-only.
-          if [ -n "$failed" ]; then
-              echo "warning: the following filesystems could not be unmounted:"
-              for mp in $failed; do echo "  $mp"; done
-              echo Enter 'i' to launch a shell, or wait 10 seconds to continue.
-              read -t 10 A
-              if [ "$A" == "i" ]; then
-                ${pkgs.bashInteractive}/bin/bash -i < /dev/console &> /dev/console
-              fi
-              sleep 5
-          fi
-
-
-          # Final sync.
-          sync
-
-
-          # Either reboot or power-off the system.
-          if test "$MODE" = reboot; then
-              echo "rebooting..."
-              sleep 1
-              exec reboot -f
-          else
-              echo "powering off..."
-              sleep 1
-              exec halt -f -p
-          fi
-        '';
-    };
-
-}
-- 
GitLab


From 9f9ae7c7e9aa440db85c924a636d3827dcdb2a0e Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 6 Aug 2012 11:45:59 -0400
Subject: [PATCH 3901/5331] Share option definitions between the systemd and
 Upstart compatibility modules

---
 modules/services/databases/postgresql.nix    |  15 +-
 modules/system/boot/systemd-unit-options.nix | 101 ++++++++++++
 modules/system/boot/systemd.nix              | 154 +++----------------
 modules/system/upstart/upstart.nix           |  88 ++---------
 4 files changed, 145 insertions(+), 213 deletions(-)
 create mode 100644 modules/system/boot/systemd-unit-options.nix

diff --git a/modules/services/databases/postgresql.nix b/modules/services/databases/postgresql.nix
index 1633b9d0fdd..139a716ae75 100644
--- a/modules/services/databases/postgresql.nix
+++ b/modules/services/databases/postgresql.nix
@@ -36,7 +36,7 @@ let
     '';
 
   pre84 = versionOlder (builtins.parseDrvName postgresql.name).version "8.4";
-  
+
 in
 
 {
@@ -139,7 +139,7 @@ in
         host  all all 127.0.0.1/32 md5
         host  all all ::1/128      md5
       '';
-        
+
     users.extraUsers = singleton
       { name = "postgres";
         description = "PostgreSQL server user";
@@ -181,20 +181,19 @@ in
         postStart =
           ''
             while ! psql postgres -c ""; do
-                stop_check
                 sleep 1
             done
           '';
 
-        extraConfig =
+        serviceConfig =
           ''
-            # Shut down Postgres using SIGINT ("Fast Shutdown mode").  See 
+            # Shut down Postgres using SIGINT ("Fast Shutdown mode").  See
             # http://www.postgresql.org/docs/current/static/server-shutdown.html
-            kill signal INT
+            KillSignal=SIGINT
 
             # Give Postgres a decent amount of time to clean up after
-            # receiving Upstart's SIGINT.
-            kill timeout 60
+            # receiving systemd's SIGINT.
+            TimeoutSec=60
           '';
       };
 
diff --git a/modules/system/boot/systemd-unit-options.nix b/modules/system/boot/systemd-unit-options.nix
new file mode 100644
index 00000000000..34b37f4d0ba
--- /dev/null
+++ b/modules/system/boot/systemd-unit-options.nix
@@ -0,0 +1,101 @@
+{ config, pkgs }:
+
+with pkgs.lib;
+
+{
+
+  serviceOptions = {
+
+    description = mkOption {
+      default = "";
+      types = types.uniq types.string;
+      description = "Description of this unit used in systemd messages and progress indicators.";
+    };
+
+    requires = mkOption {
+      default = [];
+      types = types.listOf types.string;
+      description = ''
+        Start the specified units when this unit is started, and stop
+        this unit when the specified units are stopped or fail.
+      '';
+    };
+
+    wants = mkOption {
+      default = [];
+      types = types.listOf types.string;
+      description = ''
+        Start the specified units when this unit is started.
+      '';
+    };
+
+    after = mkOption {
+      default = [];
+      types = types.listOf types.string;
+      description = ''
+        If the specified units are started at the same time as
+        this unit, delay this unit until they have started.
+      '';
+    };
+
+    before = mkOption {
+      default = [];
+      types = types.listOf types.string;
+      description = ''
+        If the specified units are started at the same time as
+        this unit, delay them until this unit has started.
+      '';
+    };
+
+    wantedBy = mkOption {
+      default = [];
+      types = types.listOf types.string;
+      description = "Units that want (i.e. depend on) this unit.";
+    };
+
+    environment = mkOption {
+      default = {};
+      type = types.attrs;
+      example = { PATH = "/foo/bar/bin"; LANG = "nl_NL.UTF-8"; };
+      description = "Environment variables passed to the services's processes.";
+    };
+
+    path = mkOption {
+      default = [];
+      apply = ps: "${makeSearchPath "bin" ps}:${makeSearchPath "sbin" ps}";
+      description = ''
+        Packages added to the service's <envar>PATH</envar>
+        environment variable.  Both the <filename>bin</filename>
+        and <filename>sbin</filename> subdirectories of each
+        package are added.
+      '';
+    };
+
+    serviceConfig = mkOption {
+      default = "";
+      type = types.string;
+      description = ''
+        Contents of the <literal>[Service]</literal> section of the unit.
+        See <citerefentry><refentrytitle>systemd.unit</refentrytitle>
+        <manvolnum>5</manvolnum></citerefentry> for details.
+      '';
+    };
+
+    script = mkOption {
+      type = types.uniq types.string;
+      default = "";
+      description = "Shell commands executed as the service's main process.";
+    };
+
+    preStart = mkOption {
+      type = types.string;
+      default = "";
+      description = ''
+        Shell commands executed before the service's main process
+        is started.
+      '';
+    };
+
+  };
+
+}
\ No newline at end of file
diff --git a/modules/system/boot/systemd.nix b/modules/system/boot/systemd.nix
index 848831a94a2..10c98116710 100644
--- a/modules/system/boot/systemd.nix
+++ b/modules/system/boot/systemd.nix
@@ -1,122 +1,10 @@
 { config, pkgs, ... }:
 
 with pkgs.lib;
+with import ./systemd-unit-options.nix { inherit config pkgs; };
 
 let
 
-  servicesOptions = {
-
-    description = mkOption {
-      default = "";
-      types = types.uniq types.string;
-      description = "Description of this unit used in systemd messages and progress indicators.";
-    };
-
-    requires = mkOption {
-      default = [];
-      types = types.listOf types.string;
-      description = ''
-        Start the specified units when this unit is started, and stop
-        this unit when the specified units are stopped or fail.
-      '';
-    };
-
-    wants = mkOption {
-      default = [];
-      types = types.listOf types.string;
-      description = ''
-        Start the specified units when this unit is started.
-      '';
-    };
-
-    after = mkOption {
-      default = [];
-      types = types.listOf types.string;
-      description = ''
-        If the specified units are started at the same time as
-        this unit, delay this unit until they have started.
-      '';
-    };
-
-    before = mkOption {
-      default = [];
-      types = types.listOf types.string;
-      description = ''
-        If the specified units are started at the same time as
-        this unit, delay them until this unit has started.
-      '';
-    };
-
-    wantedBy = mkOption {
-      default = [];
-      types = types.listOf types.string;
-      description = "Start this unit when the specified units are started.";
-    };
-
-    environment = mkOption {
-      default = {};
-      type = types.attrs;
-      example = { PATH = "/foo/bar/bin"; LANG = "nl_NL.UTF-8"; };
-      description = "Environment variables passed to the services's processes.";
-    };
-
-    path = mkOption {
-      default = [];
-      apply = ps: "${makeSearchPath "bin" ps}:${makeSearchPath "sbin" ps}";
-      description = ''
-        Packages added to the service's <envar>PATH</envar>
-        environment variable.  Both the <filename>bin</filename>
-        and <filename>sbin</filename> subdirectories of each
-        package are added.
-      '';
-    };
-
-    serviceConfig = mkOption {
-      default = "";
-      type = types.string;
-      description = ''
-        Contents of the <literal>[Service]</literal> section of the unit.
-        See <citerefentry><refentrytitle>systemd.unit</refentrytitle>
-        <manvolnum>5</manvolnum></citerefentry> for details.
-      '';
-    };
-
-    script = mkOption {
-      type = types.uniq types.string;
-      default = "";
-      description = "Shell commands executed as the service's main process.";
-    };
-
-    preStart = mkOption {
-      type = types.string;
-      default = "";
-      description = ''
-        Shell commands executed before the service's main process
-        is started.
-      '';
-    };
-
-  };
-
-
-  servicesConfig = { name, config, ... }: {
-
-    config = {
-
-      # Default path for systemd services.  Should be quite minimal.
-      path = 
-        [ pkgs.coreutils
-          pkgs.findutils
-          pkgs.gnugrep
-          pkgs.gnused
-          systemd
-        ];
-
-    };
-
-  };
-  
-
   cfg = config.boot.systemd;
 
   systemd = pkgs.systemd;
@@ -178,7 +66,7 @@ let
       # Utmp maintenance.
       "systemd-update-utmp-runlevel.service"
       "systemd-update-utmp-shutdown.service"
-      
+
       # Filesystems.
       "systemd-fsck@.service"
       "systemd-fsck-root.service"
@@ -260,6 +148,19 @@ let
 
   makeJobScript = name: content: "${pkgs.writeScriptBin name content}/bin/${name}";
 
+  serviceConfig = { name, config, ... }: {
+    config = {
+      # Default path for systemd services.  Should be quite minimal.
+      path =
+        [ pkgs.coreutils
+          pkgs.findutils
+          pkgs.gnugrep
+          pkgs.gnused
+          systemd
+        ];
+    };
+  };
+
   serviceToUnit = name: def:
     { inherit (def) wantedBy;
 
@@ -277,7 +178,7 @@ let
           [Service]
           Environment=PATH=${def.path}
           ${concatMapStrings (n: "Environment=${n}=${getAttr n def.environment}\n") (attrNames def.environment)}
-          
+
           ${optionalString (def.preStart != "") ''
             ExecStartPre=${makeJobScript "${name}-prestart.sh" ''
               #! ${pkgs.stdenv.shell} -e
@@ -297,7 +198,7 @@ let
     };
 
   nixosUnits = mapAttrsToList makeUnit cfg.units;
-    
+
   units = pkgs.runCommand "units" { preferLocalBuild = true; }
     ''
       mkdir -p $out
@@ -310,7 +211,7 @@ let
           ln -s $fn $out/
         fi
       done
-      
+
       for i in ${toString upstreamWants}; do
         fn=${systemd}/example/systemd/system/$i
         [ -e $fn ]
@@ -322,7 +223,7 @@ let
           if ! [ -e $y ]; then rm -v $y; fi
         done
       done
-      
+
       for i in ${toString nixosUnits}; do
         ln -s $i/* $out/
       done
@@ -337,7 +238,7 @@ let
 
       ln -s ../getty@tty1.service $out/multi-user.target.wants/
     ''; # */
-    
+
 in
 
 {
@@ -350,29 +251,24 @@ in
       description = "Definition of systemd units.";
       default = {};
       type = types.attrsOf types.optionSet;
-      
       options = {
-      
         text = mkOption {
           types = types.uniq types.string;
           description = "Text of this systemd unit.";
         };
-        
         wantedBy = mkOption {
           default = [];
           types = types.listOf types.string;
           description = "Units that want (i.e. depend on) this unit.";
         };
-        
       };
-      
     };
 
     boot.systemd.services = mkOption {
       description = "Definition of systemd services.";
       default = {};
       type = types.attrsOf types.optionSet;
-      options = [ servicesOptions servicesConfig ];
+      options = [ serviceOptions serviceConfig ];
     };
 
     boot.systemd.defaultUnit = mkOption {
@@ -386,16 +282,16 @@ in
       type = types.bool;
       description = "Whether to log kernel messages.";
     };
-    
+
     services.journald.console = mkOption {
       default = "";
       type = types.uniq types.string;
       description = "If non-empty, write log messages to the specified TTY device.  Defaults to /dev/console.";
     };
-    
+
   };
 
-  
+
   ###### implementation
 
   config = {
@@ -405,7 +301,7 @@ in
     system.build.units = units;
 
     environment.systemPackages = [ systemd ];
-  
+
     environment.etc =
       [ { source = units;
           target = "systemd/system";
diff --git a/modules/system/upstart/upstart.nix b/modules/system/upstart/upstart.nix
index 6f76f5d7b1d..6375289293f 100644
--- a/modules/system/upstart/upstart.nix
+++ b/modules/system/upstart/upstart.nix
@@ -1,11 +1,10 @@
 { config, pkgs, ... }:
 
 with pkgs.lib;
+with import ../boot/systemd-unit-options.nix { inherit config pkgs; };
 
 let
 
-  upstart = pkgs.upstart;
-
   userExists = u:
     (u == "") || any (uu: uu.name == u) (attrValues config.users.extraUsers);
 
@@ -66,6 +65,8 @@ let
 
       serviceConfig =
         ''
+          ${job.serviceConfig}
+
           ${optionalString (job.preStart != "" && (job.script != "" || job.exec != "")) ''
             ExecStartPre=${preStartScript}
           ''}
@@ -77,7 +78,7 @@ let
           ${optionalString (job.script != "" || job.exec != "") ''
             ExecStart=${startScript}
           ''}
-          
+
           ${optionalString (job.postStart != "") ''
             ExecStartPost=${postStartScript}
           ''}
@@ -85,7 +86,7 @@ let
           ${optionalString (job.preStop != "") ''
             ExecStop=${preStopScript}
           ''}
-          
+
           ${optionalString (job.postStop != "") ''
             ExecStopPost=${postStopScript}
           ''}
@@ -100,7 +101,7 @@ let
     };
 
 
-  jobOptions = {
+  jobOptions = serviceOptions // {
 
     name = mkOption {
       # !!! The type should ensure that this could be a filename.
@@ -111,14 +112,6 @@ let
       '';
     };
 
-    description = mkOption {
-      type = types.string;
-      default = "";
-      description = ''
-        A short description of this job.
-      '';
-    };
-
     startOn = mkOption {
       # !!! Re-enable this once we're on Upstart >= 0.6.
       #type = types.string;
@@ -137,15 +130,6 @@ let
       '';
     };
 
-    preStart = mkOption {
-      type = types.string;
-      default = "";
-      description = ''
-        Shell commands executed before the job is started
-        (i.e. before the job's main process is started).
-      '';
-    };
-
     postStart = mkOption {
       type = types.string;
       default = "";
@@ -186,15 +170,6 @@ let
       '';
     };
 
-    script = mkOption {
-      type = types.string;
-      default = "";
-      description = ''
-        Shell commands executed as the job's main process.  Can be
-        specified instead of the <varname>exec</varname> attribute.
-      '';
-    };
-
     respawn = mkOption {
       type = types.bool;
       default = true;
@@ -223,15 +198,6 @@ let
       '';
     };
 
-    environment = mkOption {
-      type = types.attrs;
-      default = {};
-      example = { PATH = "/foo/bar/bin"; LANG = "nl_NL.UTF-8"; };
-      description = ''
-        Environment variables passed to the job's processes.
-      '';
-    };
-
     daemonType = mkOption {
       type = types.string;
       default = "none";
@@ -264,15 +230,6 @@ let
       '';
     };
 
-    extraConfig = mkOption {
-      type = types.string;
-      default = "";
-      example = "limit nofile 4096 4096";
-      description = ''
-        Additional Upstart stanzas not otherwise supported.
-      '';
-    };
-
     path = mkOption {
       default = [];
       description = ''
@@ -282,46 +239,25 @@ let
       '';
     };
 
-    console = mkOption {
-      default = "";
-      example = "console";
-      description = ''
-        If set to <literal>output</literal>, job output is written to
-        the console.  If it's <literal>owner</literal>, additionally
-        the job becomes owner of the console.  It it's empty (the
-        default), output is written to
-        <filename>/var/log/upstart/<replaceable>jobname</replaceable></filename>
-      '';  
-    };
-
   };
 
 
-  upstartJob = {name, config, ...}: {
+  upstartJob = { name, config, ... }: {
 
     options = {
-    
+
       unit = mkOption {
         default = makeUnit config;
         description = "Generated definition of the systemd unit corresponding to this job.";
       };
-      
+
     };
 
     config = {
-    
+
       # The default name is the name extracted from the attribute path.
       name = mkDefaultValue name;
-      
-      # Default path for Upstart jobs.  Should be quite minimal.
-      path =
-        [ pkgs.coreutils
-          pkgs.findutils
-          pkgs.gnugrep
-          pkgs.gnused
-          upstart
-        ];
-      
+
     };
 
   };
@@ -365,7 +301,7 @@ in
     boot.systemd.services =
       flip mapAttrs' config.jobs (name: job:
         nameValuePair "${job.name}.service" job.unit);
-        
+
   };
 
 }
-- 
GitLab


From b11c5d59911f9549a56839576379e5b2902b4f99 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 6 Aug 2012 12:26:52 -0400
Subject: [PATCH 3902/5331] nscd: Ensure that invalidate-nscd starts after nscd

---
 modules/services/system/nscd.nix   | 12 +++++++++---
 modules/services/ttys/agetty.nix   | 23 +++++++++++++++--------
 modules/system/upstart/upstart.nix | 11 ++++++-----
 3 files changed, 30 insertions(+), 16 deletions(-)

diff --git a/modules/services/system/nscd.nix b/modules/services/system/nscd.nix
index b2596dbb413..80fa1394aca 100644
--- a/modules/services/system/nscd.nix
+++ b/modules/services/system/nscd.nix
@@ -27,7 +27,7 @@ in
 
   };
 
-  
+
   ###### implementation
 
   config = mkIf config.services.nscd.enable {
@@ -47,13 +47,18 @@ in
 
         preStart =
           ''
-            mkdir -m 0755 -p /var/run/nscd
+            mkdir -m 0755 -p /run/nscd
+            rm -f /run/nscd/nscd.pid
             mkdir -m 0755 -p /var/db/nscd
           '';
 
         path = [ pkgs.glibc ];
 
-        exec = "nscd -f ${./nscd.conf} -d 2> /dev/null";
+        exec = "nscd -f ${./nscd.conf}";
+
+        daemonType = "fork";
+
+        serviceConfig = "PIDFile=/run/nscd/nscd.pid";
       };
 
     # Flush nscd's ‘hosts’ database when the network comes up or the
@@ -62,6 +67,7 @@ in
       { name = "invalidate-nscd";
         description = "Invalidate NSCD cache";
         startOn = "ip-up or config-changed";
+        after = [ "nscd.service" ];
         task = true;
         exec = "${pkgs.glibc}/sbin/nscd --invalidate hosts";
       };
diff --git a/modules/services/ttys/agetty.nix b/modules/services/ttys/agetty.nix
index 1916c13333d..92915f9132b 100644
--- a/modules/services/ttys/agetty.nix
+++ b/modules/services/ttys/agetty.nix
@@ -2,6 +2,18 @@
 
 with pkgs.lib;
 
+let
+
+  issueFile = pkgs.writeText "issue" ''
+
+    ${config.services.mingetty.greetingLine}
+    xyzzy6
+    ${config.services.mingetty.helpLine}
+
+  '';
+
+in
+
 {
 
   ###### interface
@@ -79,7 +91,7 @@ with pkgs.lib;
         [Service]
         Environment=TERM=linux
         Environment=LOCALE_ARCHIVE=/run/current-system/sw/lib/locale/locale-archive
-        ExecStart=@${pkgs.utillinux}/sbin/agetty agetty --noclear --login-program ${pkgs.shadow}/bin/login %I 38400
+        ExecStart=@${pkgs.utillinux}/sbin/agetty agetty --noclear -f ${issueFile} --login-program ${pkgs.shadow}/bin/login %I 38400
         Type=idle
         Restart=always
         RestartSec=0
@@ -95,7 +107,7 @@ with pkgs.lib;
         # instead, to ensure that login terminates cleanly.
         KillSignal=SIGHUP
       '';
-    
+
     boot.systemd.units."serial-getty@.service".text =
       ''
         [Unit]
@@ -131,12 +143,7 @@ with pkgs.lib;
 
     environment.etc = singleton
       { # Friendly greeting on the virtual consoles.
-        source = pkgs.writeText "issue" ''
-
-          ${config.services.mingetty.greetingLine}
-          ${config.services.mingetty.helpLine}
-
-        '';
+        source = issueFile;
         target = "issue";
       };
 
diff --git a/modules/system/upstart/upstart.nix b/modules/system/upstart/upstart.nix
index 6375289293f..92a7add88eb 100644
--- a/modules/system/upstart/upstart.nix
+++ b/modules/system/upstart/upstart.nix
@@ -54,14 +54,15 @@ let
         '';
     in {
 
-      inherit (job) description path environment;
+      inherit (job) description requires wants before environment path;
 
       after =
-        if job.startOn == "stopped udevtrigger" then [ "systemd-udev-settle.service" ] else
-        if job.startOn == "started udev" then [ "systemd-udev.service" ] else
-        [];
+        (if job.startOn == "stopped udevtrigger" then [ "systemd-udev-settle.service" ] else
+         if job.startOn == "started udev" then [ "systemd-udev.service" ] else
+         []) ++ job.after;
 
-      wantedBy = if job.startOn == "" then [ ] else [ "multi-user.target" ];
+      wantedBy =
+        (if job.startOn == "" then [ ] else [ "multi-user.target" ]) ++ job.wantedBy;
 
       serviceConfig =
         ''
-- 
GitLab


From 27f496c1cebe65e2ab53d8f555d791303ac2dab7 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 6 Aug 2012 14:59:58 -0400
Subject: [PATCH 3903/5331] Make the VirtualBox guest services depend on
 /dev/vboxguest

Systemd #ftw
---
 modules/virtualisation/virtualbox-guest.nix | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/modules/virtualisation/virtualbox-guest.nix b/modules/virtualisation/virtualbox-guest.nix
index 8e09d79e3a4..e864c125176 100644
--- a/modules/virtualisation/virtualbox-guest.nix
+++ b/modules/virtualisation/virtualbox-guest.nix
@@ -41,7 +41,9 @@ if (pkgs.stdenv.isi686 || pkgs.stdenv.isx86_64) then
     jobs.virtualbox =
       { description = "VirtualBox service";
 
-        startOn = "started udev";
+        wantedBy = [ "multi-user.target" ];
+        requires = [ "dev-vboxguest.device" ];
+        after = [ "dev-vboxguest.device" ];
 
         exec = "${kernel.virtualboxGuestAdditions}/sbin/VBoxService --foreground";
       };
@@ -60,7 +62,7 @@ if (pkgs.stdenv.isi686 || pkgs.stdenv.isx86_64) then
       ''
         InputDevice "VBoxMouse"
       '';
-    
+
     services.xserver.displayManager.sessionCommands =
       ''
         PATH=${makeSearchPath "bin" [ pkgs.gnugrep pkgs.which pkgs.xorg.xorgserver ]}:$PATH \
@@ -72,9 +74,12 @@ if (pkgs.stdenv.isi686 || pkgs.stdenv.isx86_64) then
         # /dev/vboxuser is necessary for VBoxClient to work.  Maybe we
         # should restrict this to logged-in users.
         KERNEL=="vboxuser",  OWNER="root", GROUP="root", MODE="0666"
+
+        # Allow systemd dependencies on vboxguest.
+        KERNEL=="vboxguest", TAG+="systemd"
       '';
 
-    # Make the ACPI Shutdown command to do the right thing.    
+    # Make the ACPI Shutdown command to do the right thing.
     services.acpid.enable = true;
     services.acpid.powerEventCommands = "poweroff";
   };
-- 
GitLab


From d33fd9a1f8f449b9adbb433c7709383697feba9a Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 6 Aug 2012 15:48:46 -0400
Subject: [PATCH 3904/5331] switch-to-configuration: Assume that services that
 are auto-restarting are going to fail

---
 modules/system/activation/switch-to-configuration.pl | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/system/activation/switch-to-configuration.pl b/modules/system/activation/switch-to-configuration.pl
index 6cedf7f2646..96b256bc24d 100644
--- a/modules/system/activation/switch-to-configuration.pl
+++ b/modules/system/activation/switch-to-configuration.pl
@@ -124,10 +124,10 @@ if (scalar @stopped > 0) {
 system("@systemd@/bin/systemctl", "reload", "dbus.service");
 
 # Print failed and new units.
-my (@failed, @new);
+my (@failed, @new, @restarting);
 my $activeNew = getActiveUnits;
 while (my ($unit, $state) = each %{$activeNew}) {
-    push @failed, $unit if $state->{state} eq "failed";
+    push @failed, $unit if $state->{state} eq "failed" || $state->{substate} eq "auto-restart";
     push @new, $unit if $state->{state} ne "failed" && !defined $activePrev->{$unit};
 }
 
-- 
GitLab


From 23947c26a8f902b946ba3cd3c3d176512e75df9c Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 6 Aug 2012 15:53:04 -0400
Subject: [PATCH 3905/5331] Revert accidental commit

---
 modules/services/ttys/agetty.nix | 23 ++++++++---------------
 1 file changed, 8 insertions(+), 15 deletions(-)

diff --git a/modules/services/ttys/agetty.nix b/modules/services/ttys/agetty.nix
index 92915f9132b..1916c13333d 100644
--- a/modules/services/ttys/agetty.nix
+++ b/modules/services/ttys/agetty.nix
@@ -2,18 +2,6 @@
 
 with pkgs.lib;
 
-let
-
-  issueFile = pkgs.writeText "issue" ''
-
-    ${config.services.mingetty.greetingLine}
-    xyzzy6
-    ${config.services.mingetty.helpLine}
-
-  '';
-
-in
-
 {
 
   ###### interface
@@ -91,7 +79,7 @@ in
         [Service]
         Environment=TERM=linux
         Environment=LOCALE_ARCHIVE=/run/current-system/sw/lib/locale/locale-archive
-        ExecStart=@${pkgs.utillinux}/sbin/agetty agetty --noclear -f ${issueFile} --login-program ${pkgs.shadow}/bin/login %I 38400
+        ExecStart=@${pkgs.utillinux}/sbin/agetty agetty --noclear --login-program ${pkgs.shadow}/bin/login %I 38400
         Type=idle
         Restart=always
         RestartSec=0
@@ -107,7 +95,7 @@ in
         # instead, to ensure that login terminates cleanly.
         KillSignal=SIGHUP
       '';
-
+    
     boot.systemd.units."serial-getty@.service".text =
       ''
         [Unit]
@@ -143,7 +131,12 @@ in
 
     environment.etc = singleton
       { # Friendly greeting on the virtual consoles.
-        source = issueFile;
+        source = pkgs.writeText "issue" ''
+
+          ${config.services.mingetty.greetingLine}
+          ${config.services.mingetty.helpLine}
+
+        '';
         target = "issue";
       };
 
-- 
GitLab


From e33dfa936f9c16545fe85f1b837ed402651b75df Mon Sep 17 00:00:00 2001
From: Rickard Nilsson <rickynils@gmail.com>
Date: Mon, 6 Aug 2012 20:05:35 +0200
Subject: [PATCH 3906/5331] Use busybox mount instead of klibc nfsmount for nfs
 mounts in initrd.

---
 modules/system/boot/stage-1-init.sh | 6 +-----
 modules/tasks/filesystems/nfs.nix   | 6 ------
 2 files changed, 1 insertion(+), 11 deletions(-)

diff --git a/modules/system/boot/stage-1-init.sh b/modules/system/boot/stage-1-init.sh
index 112d3798aec..824c19f0df5 100644
--- a/modules/system/boot/stage-1-init.sh
+++ b/modules/system/boot/stage-1-init.sh
@@ -266,11 +266,7 @@ mountFS() {
     # For CIFS mounts, retry a few times before giving up.
     local n=0
     while true; do
-        if [ "$fsType" = "nfs" ]; then
-          nfsmount "$device" "/mnt-root$mountPoint" && break
-        else
-          mount "/mnt-root$mountPoint" && break
-        fi
+        mount "/mnt-root$mountPoint" && break
         if [ "$fsType" != cifs -o "$n" -ge 10 ]; then fail; break; fi
         echo "retrying..."
         n=$((n + 1))
diff --git a/modules/tasks/filesystems/nfs.nix b/modules/tasks/filesystems/nfs.nix
index 0ed76a9db77..491d2de8f24 100644
--- a/modules/tasks/filesystems/nfs.nix
+++ b/modules/tasks/filesystems/nfs.nix
@@ -40,12 +40,6 @@ in
 
     boot.initrd.kernelModules = mkIf inInitrd [ "nfs" ];
 
-    boot.initrd.extraUtilsCommands = mkIf inInitrd
-      ''
-        # !!! Uh, why don't we just install mount.nfs?
-        cp -v ${pkgs.klibc}/lib/klibc/bin.static/nfsmount $out/bin
-      '';
-
     # Ensure that statd and idmapd are started before mountall.
     jobs.mountall.preStart =
       ''
-- 
GitLab


From 52b6e1031594012c0d69f8304cc9d828ec78be22 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 6 Aug 2012 16:52:08 -0400
Subject: [PATCH 3907/5331] Use systemd-modules-load.service to load required
 kernel modules

---
 modules/system/boot/kernel.nix  | 12 ++++++++++++
 modules/system/boot/systemd.nix |  3 +++
 2 files changed, 15 insertions(+)

diff --git a/modules/system/boot/kernel.nix b/modules/system/boot/kernel.nix
index 1b247a65890..f3ede5c0d49 100644
--- a/modules/system/boot/kernel.nix
+++ b/modules/system/boot/kernel.nix
@@ -173,6 +173,18 @@ let kernel = config.boot.kernelPackages.kernel; in
     # The Linux kernel >= 2.6.27 provides firmware.
     hardware.firmware = [ "${kernel}/lib/firmware" ];
 
+    # Create /etc/modules-load.d/nixos.conf, which is read by
+    # systemd-modules-load.service to load required kernel modules.
+    # FIXME: ensure that systemd-modules-load.service is restarted if
+    # this file changes.
+    environment.etc = singleton
+      { target = "modules-load.d/nixos.conf";
+        source = pkgs.writeText "nixos.conf"
+          ''
+            ${concatStringsSep "\n" config.boot.kernelModules}
+          '';
+      };
+
   };
 
 }
diff --git a/modules/system/boot/systemd.nix b/modules/system/boot/systemd.nix
index 10c98116710..2a586090dd1 100644
--- a/modules/system/boot/systemd.nix
+++ b/modules/system/boot/systemd.nix
@@ -67,6 +67,9 @@ let
       "systemd-update-utmp-runlevel.service"
       "systemd-update-utmp-shutdown.service"
 
+      # Kernel module loading.
+      "systemd-modules-load.service" 
+
       # Filesystems.
       "systemd-fsck@.service"
       "systemd-fsck-root.service"
-- 
GitLab


From 64d0069be30f0a8358a1dc178cd15d0d9892ee35 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Mon, 6 Aug 2012 17:02:35 -0400
Subject: [PATCH 3908/5331] udev requires unix sockets and inotify

---
 modules/services/hardware/udev.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/modules/services/hardware/udev.nix b/modules/services/hardware/udev.nix
index 3bbf24bb379..174d31c6c00 100644
--- a/modules/services/hardware/udev.nix
+++ b/modules/services/hardware/udev.nix
@@ -263,6 +263,11 @@ in
           '';
       };
 
+    system.requiredKernelConfig = with config.lib.kernelConfig; [
+      (isEnabled "UNIX")
+      (isYes "INOTIFY_USER")
+      (isYes "NET")
+    ];
   };
 
 }
-- 
GitLab


From 11e5207a2d20d4eb557bc60339e193283141d0d9 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Mon, 6 Aug 2012 17:10:54 -0400
Subject: [PATCH 3909/5331] qemu requires VIRTIO_BLK (and dependencies) for
 virtio drives

---
 modules/virtualisation/qemu-vm.nix | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/modules/virtualisation/qemu-vm.nix b/modules/virtualisation/qemu-vm.nix
index 0e9804751be..e0561d479cf 100644
--- a/modules/virtualisation/qemu-vm.nix
+++ b/modules/virtualisation/qemu-vm.nix
@@ -386,8 +386,14 @@ in
   # Wireless won't work in the VM.
   networking.wireless.enable = mkOverride 50 false;
 
-  system.requiredKernelConfig = optional (!cfg.graphics) (with config.lib.kernelConfig; [
+  system.requiredKernelConfig = with config.lib.kernelConfig; [
+    (isEnabled "VIRTIO_BLK")
+    (isEnabled "VIRTIO_PCI")
+    (isYes "BLK_DEV")
+    (isYes "PCI")
+    (isYes "EXPERIMENTAL")
+  ] ++ optional (!cfg.graphics) [
     (isYes "SERIAL_8250_CONSOLE")
     (isYes "SERIAL_8250")
-  ]);
+  ];
 }
-- 
GitLab


From 0ea2643c630640a274c1bd720e8f3138d74717db Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Tue, 7 Aug 2012 06:57:01 -0400
Subject: [PATCH 3910/5331] The initrd mounts some tmpfses

---
 modules/system/boot/stage-1.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/modules/system/boot/stage-1.nix b/modules/system/boot/stage-1.nix
index 02a75ae21c4..aa86f14066d 100644
--- a/modules/system/boot/stage-1.nix
+++ b/modules/system/boot/stage-1.nix
@@ -321,4 +321,7 @@ in {
   system.build.initialRamdisk = initialRamdisk;
   system.build.extraUtils = extraUtils;
 
+  system.requiredKernelConfig = with config.lib.kernelConfig; [
+    (isYes "TMPFS")
+  ];
 }
-- 
GitLab


From 805d37db481431ec2a1a007a4c82dcca554f1092 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Tue, 7 Aug 2012 07:02:08 -0400
Subject: [PATCH 3911/5331] qemu-vm creates an ext3 filesystem

---
 modules/virtualisation/qemu-vm.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/modules/virtualisation/qemu-vm.nix b/modules/virtualisation/qemu-vm.nix
index e0561d479cf..3d71a5356c6 100644
--- a/modules/virtualisation/qemu-vm.nix
+++ b/modules/virtualisation/qemu-vm.nix
@@ -389,6 +389,7 @@ in
   system.requiredKernelConfig = with config.lib.kernelConfig; [
     (isEnabled "VIRTIO_BLK")
     (isEnabled "VIRTIO_PCI")
+    (isEnabled "EXT3_FS")
     (isYes "BLK_DEV")
     (isYes "PCI")
     (isYes "EXPERIMENTAL")
-- 
GitLab


From 66ff6a382a9b992d41a13f5112ce80e35b409f4a Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 7 Aug 2012 10:05:33 -0400
Subject: [PATCH 3912/5331] stage-1-init: Close temporary file descriptor

Otherwise this fd will be inherited all the way into the Upstart jobs.
---
 modules/system/boot/stage-1-init.sh | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/modules/system/boot/stage-1-init.sh b/modules/system/boot/stage-1-init.sh
index 824c19f0df5..593b9397e66 100644
--- a/modules/system/boot/stage-1-init.sh
+++ b/modules/system/boot/stage-1-init.sh
@@ -329,6 +329,8 @@ while read -u 3 mountPoint; do
     mountFS "$device" "$mountPoint" "$options" "$fsType"
 done
 
+exec 3>&-
+
 
 @postMountCommands@
 
-- 
GitLab


From 13d8856a4f431be07b9e6335583ab1e82276f9b7 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Tue, 7 Aug 2012 16:25:11 -0400
Subject: [PATCH 3913/5331] qemu requires VIRTIO_NET (and dependencies) for
 virtio networking

---
 modules/virtualisation/qemu-vm.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/modules/virtualisation/qemu-vm.nix b/modules/virtualisation/qemu-vm.nix
index 3d71a5356c6..d04b3976341 100644
--- a/modules/virtualisation/qemu-vm.nix
+++ b/modules/virtualisation/qemu-vm.nix
@@ -389,10 +389,13 @@ in
   system.requiredKernelConfig = with config.lib.kernelConfig; [
     (isEnabled "VIRTIO_BLK")
     (isEnabled "VIRTIO_PCI")
+    (isEnabled "VIRTIO_NET")
     (isEnabled "EXT3_FS")
     (isYes "BLK_DEV")
     (isYes "PCI")
     (isYes "EXPERIMENTAL")
+    (isYes "NETDEVICES")
+    (isYes "NET_CORE")
   ] ++ optional (!cfg.graphics) [
     (isYes "SERIAL_8250_CONSOLE")
     (isYes "SERIAL_8250")
-- 
GitLab


From 9d8ddd90f9e98b82b56655705b35aecf6181ee14 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Tue, 7 Aug 2012 16:44:15 -0400
Subject: [PATCH 3914/5331] qemu mounts /nix/store via CIFS

---
 modules/virtualisation/qemu-vm.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/modules/virtualisation/qemu-vm.nix b/modules/virtualisation/qemu-vm.nix
index d04b3976341..17f19537115 100644
--- a/modules/virtualisation/qemu-vm.nix
+++ b/modules/virtualisation/qemu-vm.nix
@@ -391,11 +391,14 @@ in
     (isEnabled "VIRTIO_PCI")
     (isEnabled "VIRTIO_NET")
     (isEnabled "EXT3_FS")
+    (isEnabled "CIFS")
     (isYes "BLK_DEV")
     (isYes "PCI")
     (isYes "EXPERIMENTAL")
     (isYes "NETDEVICES")
     (isYes "NET_CORE")
+    (isYes "INET")
+    (isYes "NETWORK_FILESYSTEMS")
   ] ++ optional (!cfg.graphics) [
     (isYes "SERIAL_8250_CONSOLE")
     (isYes "SERIAL_8250")
-- 
GitLab


From d28876ea70ff939b4555deca5dad6e532d420825 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Tue, 7 Aug 2012 17:04:00 -0400
Subject: [PATCH 3915/5331] qemu tests use the virtio console to run commands

---
 modules/testing/test-instrumentation.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/modules/testing/test-instrumentation.nix b/modules/testing/test-instrumentation.nix
index 6a7f559c379..9d36538ea08 100644
--- a/modules/testing/test-instrumentation.nix
+++ b/modules/testing/test-instrumentation.nix
@@ -97,6 +97,7 @@ in
     system.requiredKernelConfig = with config.lib.kernelConfig; [
       (isYes "SERIAL_8250_CONSOLE")
       (isYes "SERIAL_8250")
+      (isEnabled "VIRTIO_CONSOLE")
     ];
   };
 
-- 
GitLab


From d9c03b64479cc04d3f78b3c43b6ddecd52c17add Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Tue, 7 Aug 2012 17:34:10 -0400
Subject: [PATCH 3916/5331] The kernel needs swap support if swapDevices are
 enabled

---
 modules/config/swap.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/modules/config/swap.nix b/modules/config/swap.nix
index 163de568d0f..5b20f657e12 100644
--- a/modules/config/swap.nix
+++ b/modules/config/swap.nix
@@ -73,4 +73,10 @@ with pkgs.lib;
 
   };
 
+  config = mkIf ((length config.swapDevices) != 0) {
+    system.requiredKernelConfig = with config.lib.kernelConfig; [
+      (isYes "SWAP")
+    ];
+  };
+
 }
-- 
GitLab


From c39f493ebb4b619e2b6d2cfd4e12c531861213c8 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Tue, 7 Aug 2012 18:09:08 -0400
Subject: [PATCH 3917/5331] Minor reorganization

---
 modules/system/boot/kernel.nix  | 2 +-
 modules/system/boot/stage-1.nix | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/modules/system/boot/kernel.nix b/modules/system/boot/kernel.nix
index ab996196079..62b68c560d1 100644
--- a/modules/system/boot/kernel.nix
+++ b/modules/system/boot/kernel.nix
@@ -228,8 +228,8 @@ let kernel = config.boot.kernelPackages.kernel; in
 
     # The config options that all modules can depend upon
     system.requiredKernelConfig = with config.lib.kernelConfig; [
+      # !!! Should this really be needed?
       (isYes "MODULES")
-      (isYes "BLK_DEV_INITRD")
       (isYes "BINFMT_ELF")
     ];
 
diff --git a/modules/system/boot/stage-1.nix b/modules/system/boot/stage-1.nix
index aa86f14066d..01ecd839f55 100644
--- a/modules/system/boot/stage-1.nix
+++ b/modules/system/boot/stage-1.nix
@@ -323,5 +323,6 @@ in {
 
   system.requiredKernelConfig = with config.lib.kernelConfig; [
     (isYes "TMPFS")
+    (isYes "BLK_DEV_INITRD")
   ];
 }
-- 
GitLab


From da787e307140b4f4144f592d16e3a2dfbfd40cf1 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Wed, 8 Aug 2012 23:02:46 -0400
Subject: [PATCH 3918/5331] efi-boot-stub: List required kernel config

---
 .../system/boot/loader/efi-boot-stub/efi-boot-stub.nix   | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/modules/system/boot/loader/efi-boot-stub/efi-boot-stub.nix b/modules/system/boot/loader/efi-boot-stub/efi-boot-stub.nix
index a4e0ebd9845..099cdefe142 100644
--- a/modules/system/boot/loader/efi-boot-stub/efi-boot-stub.nix
+++ b/modules/system/boot/loader/efi-boot-stub/efi-boot-stub.nix
@@ -113,6 +113,7 @@ let
   platform = pkgs.stdenv.platform;
 in
 {
+  assertions = [ { assertion = ! config.boot.kernelPackages.kernel ? features || config.boot.kernelPackages.kernel.features ? efiBootStub; message = "This kernel does not support the EFI boot stub"; } ];
   require = [
     options
 
@@ -120,11 +121,13 @@ in
     # ../system/system-options.nix
   ];
 
-  system = mkIf (config.boot.loader.efiBootStub.enable && (assert
-    (config.boot.kernelPackages.kernel.features ? efiBootStub &&
-    config.boot.kernelPackages.kernel.features.efiBootStub); true)) {
+  system = {
     build.installBootLoader = efiBootStubBuilder;
     boot.loader.id = "efiBootStub";
     boot.loader.kernelFile = platform.kernelTarget;
+    requiredKernelConfig = with config.lib.kernelConfig; [
+      (isYes "EFI_STUB")
+    ];
   };
+
 }
-- 
GitLab


From 5ae63851756bade63377f8de9dc6dd3bf3f90d1d Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 8 Aug 2012 14:20:41 -0400
Subject: [PATCH 3919/5331] qemu-vm.nix: Use ext4 instead of ext3

---
 modules/virtualisation/qemu-vm.nix | 40 +++++++++++++++---------------
 1 file changed, 20 insertions(+), 20 deletions(-)

diff --git a/modules/virtualisation/qemu-vm.nix b/modules/virtualisation/qemu-vm.nix
index 17f19537115..1de8d5b82ed 100644
--- a/modules/virtualisation/qemu-vm.nix
+++ b/modules/virtualisation/qemu-vm.nix
@@ -211,7 +211,7 @@ let
           . /sys/class/block/vda1/uevent
           mknod /dev/vda1 b $MAJOR $MINOR
           . /sys/class/block/vda/uevent
-          ${pkgs.e2fsprogs}/sbin/mkfs.ext3 -L boot /dev/vda1
+          ${pkgs.e2fsprogs}/sbin/mkfs.ext4 -L boot /dev/vda1
           ${pkgs.e2fsprogs}/sbin/tune2fs -c 0 -i 0 /dev/vda1
 
           # Mount /boot.
@@ -264,7 +264,7 @@ in
       # initialise.
       FSTYPE=$(blkid -o value -s TYPE /dev/vda || true)
       if test -z "$FSTYPE"; then
-          mke2fs -t ext3 /dev/vda
+          mke2fs -t ext4 /dev/vda
       fi
     '';
 
@@ -331,7 +331,7 @@ in
     ] ++ optional cfg.useBootLoader
       { mountPoint = "/boot";
         device = "/dev/disk/by-label/boot";
-        fsType = "ext3";
+        fsType = "ext4";
         options = "ro";
         noCheck = true; # fsck fails on a r/o filesystem
       });
@@ -386,21 +386,21 @@ in
   # Wireless won't work in the VM.
   networking.wireless.enable = mkOverride 50 false;
 
-  system.requiredKernelConfig = with config.lib.kernelConfig; [
-    (isEnabled "VIRTIO_BLK")
-    (isEnabled "VIRTIO_PCI")
-    (isEnabled "VIRTIO_NET")
-    (isEnabled "EXT3_FS")
-    (isEnabled "CIFS")
-    (isYes "BLK_DEV")
-    (isYes "PCI")
-    (isYes "EXPERIMENTAL")
-    (isYes "NETDEVICES")
-    (isYes "NET_CORE")
-    (isYes "INET")
-    (isYes "NETWORK_FILESYSTEMS")
-  ] ++ optional (!cfg.graphics) [
-    (isYes "SERIAL_8250_CONSOLE")
-    (isYes "SERIAL_8250")
-  ];
+  system.requiredKernelConfig = with config.lib.kernelConfig;
+    [ (isEnabled "VIRTIO_BLK")
+      (isEnabled "VIRTIO_PCI")
+      (isEnabled "VIRTIO_NET")
+      (isEnabled "EXT4_FS")
+      (isEnabled "CIFS")
+      (isYes "BLK_DEV")
+      (isYes "PCI")
+      (isYes "EXPERIMENTAL")
+      (isYes "NETDEVICES")
+      (isYes "NET_CORE")
+      (isYes "INET")
+      (isYes "NETWORK_FILESYSTEMS")
+    ] ++ optional (!cfg.graphics) [
+      (isYes "SERIAL_8250_CONSOLE")
+      (isYes "SERIAL_8250")
+    ];
 }
-- 
GitLab


From 6b2a14d69842cb3aed970fecb13375e18bce6e92 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 9 Aug 2012 10:04:25 -0400
Subject: [PATCH 3920/5331] Fix NixOS evaluation

---
 modules/system/boot/loader/efi-boot-stub/efi-boot-stub.nix | 3 ++-
 release.nix                                                | 6 +++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/modules/system/boot/loader/efi-boot-stub/efi-boot-stub.nix b/modules/system/boot/loader/efi-boot-stub/efi-boot-stub.nix
index 099cdefe142..59d9957ef5f 100644
--- a/modules/system/boot/loader/efi-boot-stub/efi-boot-stub.nix
+++ b/modules/system/boot/loader/efi-boot-stub/efi-boot-stub.nix
@@ -113,7 +113,8 @@ let
   platform = pkgs.stdenv.platform;
 in
 {
-  assertions = [ { assertion = ! config.boot.kernelPackages.kernel ? features || config.boot.kernelPackages.kernel.features ? efiBootStub; message = "This kernel does not support the EFI boot stub"; } ];
+  #assertions = [ { assertion = ! config.boot.kernelPackages.kernel ? features || config.boot.kernelPackages.kernel.features ? efiBootStub; message = "This kernel does not support the EFI boot stub"; } ];
+  
   require = [
     options
 
diff --git a/release.nix b/release.nix
index 10cea94881f..b32ce233ec0 100644
--- a/release.nix
+++ b/release.nix
@@ -1,6 +1,6 @@
 { nixosSrc ? {outPath = ./.; revCount = 1234; shortRev = "abcdef"; }
 , nixpkgs ? {outPath = <nixpkgs>; revCount = 5678; shortRev = "fedcba"; }
-, minimal ? false
+#, minimal ? false
 }:
 
 let
@@ -195,8 +195,8 @@ let
 
     tests =
       let
-        t = import ./tests { system = "i686-linux"; inherit minimal; };
-        t_64 = import ./tests { system = "x86_64-linux"; inherit minimal; };
+        t = import ./tests { system = "i686-linux"; };
+        t_64 = import ./tests { system = "x86_64-linux"; };
       in {
         avahi = t.avahi.test;
         bittorrent = t.bittorrent.test;
-- 
GitLab


From 20d4dee4263246b7f056cb6a4202f18f60c6ba34 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Thu, 9 Aug 2012 10:37:43 -0400
Subject: [PATCH 3921/5331] The efi boot stub code should only be run if it is
 enabled

---
 .../loader/efi-boot-stub/efi-boot-stub.nix    | 100 ++++++++----------
 1 file changed, 45 insertions(+), 55 deletions(-)

diff --git a/modules/system/boot/loader/efi-boot-stub/efi-boot-stub.nix b/modules/system/boot/loader/efi-boot-stub/efi-boot-stub.nix
index 59d9957ef5f..2b35aadc623 100644
--- a/modules/system/boot/loader/efi-boot-stub/efi-boot-stub.nix
+++ b/modules/system/boot/loader/efi-boot-stub/efi-boot-stub.nix
@@ -1,9 +1,42 @@
 {pkgs, config, ...}:
 
-###### interface
+with pkgs.lib;
+
 let
-  inherit (pkgs.lib) mkOption mkIf;
+  efiBootStubBuilder = pkgs.substituteAll {
+    src = ./efi-boot-stub-builder.sh;
+    isExecutable = true;
+    inherit (pkgs) bash;
+    path = [pkgs.coreutils pkgs.gnused pkgs.gnugrep pkgs.glibc] ++ (pkgs.stdenv.lib.optionals config.boot.loader.efiBootStub.runEfibootmgr [pkgs.efibootmgr pkgs.module_init_tools]);
+    inherit (config.boot.loader.efiBootStub) efiSysMountPoint runEfibootmgr installStartupNsh efiDisk efiPartition;
 
+    efiShell = if config.boot.loader.efiBootStub.installShell then
+      if pkgs.stdenv.isi686 then
+        pkgs.fetchurl {
+          url = "https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2/EdkShellBinPkg/FullShell/Ia32/Shell_Full.efi";
+          sha256 = "1gv6kyaspczdp7x8qnx5x76ilriaygkfs99ay7ihhdi6riclkhfl";
+        }
+      else
+        pkgs.fetchurl {
+          url = "https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2/EdkShellBinPkg/FullShell/X64/Shell_Full.efi";
+          sha256 = "1g18z84rlavxr5gsrh2g942rfr6znv9fs3fqww5m7dhmnysgyv8p";
+        }
+    else
+      null;
+
+    kernelFile = platform.kernelTarget;
+    targetArch = if pkgs.stdenv.isi686 then
+      "IA32"
+    else if pkgs.stdenv.isx86_64 then
+      "X64"
+    else
+      throw "Unsupported architecture";
+  };
+
+  # Temporary check, for nixos to cope both with nixpkgs stdenv-updates and trunk
+  platform = pkgs.stdenv.platform;
+in
+{
   options = {
     boot = {
       loader = {
@@ -75,60 +108,17 @@ let
     };
   };
 
-in
-
-###### implementation
-let
-  efiBootStubBuilder = pkgs.substituteAll {
-    src = ./efi-boot-stub-builder.sh;
-    isExecutable = true;
-    inherit (pkgs) bash;
-    path = [pkgs.coreutils pkgs.gnused pkgs.gnugrep pkgs.glibc] ++ (pkgs.stdenv.lib.optionals config.boot.loader.efiBootStub.runEfibootmgr [pkgs.efibootmgr pkgs.module_init_tools]);
-    inherit (config.boot.loader.efiBootStub) efiSysMountPoint runEfibootmgr installStartupNsh efiDisk efiPartition;
-
-    efiShell = if config.boot.loader.efiBootStub.installShell then
-      if pkgs.stdenv.isi686 then
-        pkgs.fetchurl {
-          url = "https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2/EdkShellBinPkg/FullShell/Ia32/Shell_Full.efi";
-          sha256 = "1gv6kyaspczdp7x8qnx5x76ilriaygkfs99ay7ihhdi6riclkhfl";
-        }
-      else
-        pkgs.fetchurl {
-          url = "https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2/EdkShellBinPkg/FullShell/X64/Shell_Full.efi";
-          sha256 = "1g18z84rlavxr5gsrh2g942rfr6znv9fs3fqww5m7dhmnysgyv8p";
-        }
-    else
-      null;
-
-    kernelFile = platform.kernelTarget;
-    targetArch = if pkgs.stdenv.isi686 then
-      "IA32"
-    else if pkgs.stdenv.isx86_64 then
-      "X64"
-    else
-      throw "Unsupported architecture";
-  };
-
-  # Temporary check, for nixos to cope both with nixpkgs stdenv-updates and trunk
-  platform = pkgs.stdenv.platform;
-in
-{
-  #assertions = [ { assertion = ! config.boot.kernelPackages.kernel ? features || config.boot.kernelPackages.kernel.features ? efiBootStub; message = "This kernel does not support the EFI boot stub"; } ];
+  config = mkIf config.boot.loader.efiBootStub.enable {
+    assertions = [ { assertion = ! config.boot.kernelPackages.kernel ? features || config.boot.kernelPackages.kernel.features ? efiBootStub; message = "This kernel does not support the EFI boot stub"; } ];
   
-  require = [
-    options
-
-    # config.system.build
-    # ../system/system-options.nix
-  ];
-
-  system = {
-    build.installBootLoader = efiBootStubBuilder;
-    boot.loader.id = "efiBootStub";
-    boot.loader.kernelFile = platform.kernelTarget;
-    requiredKernelConfig = with config.lib.kernelConfig; [
-      (isYes "EFI_STUB")
-    ];
+    system = {
+      build.installBootLoader = efiBootStubBuilder;
+      boot.loader.id = "efiBootStub";
+      boot.loader.kernelFile = platform.kernelTarget;
+      requiredKernelConfig = with config.lib.kernelConfig; [
+        (isYes "EFI_STUB")
+      ];
+    };
   };
 
 }
-- 
GitLab


From f31ab09b859887f8ca7e8ff441b77ae81601b5dc Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 9 Aug 2012 11:00:35 -0400
Subject: [PATCH 3922/5331] Set uniq type on boot.loader.kernelFile

---
 modules/system/activation/top-level.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/modules/system/activation/top-level.nix b/modules/system/activation/top-level.nix
index 35b6d0bff0c..118a5c6266e 100644
--- a/modules/system/activation/top-level.nix
+++ b/modules/system/activation/top-level.nix
@@ -37,6 +37,7 @@ let
 
     system.boot.loader.kernelFile = mkOption {
       default = pkgs.stdenv.platform.kernelTarget;
+      type = types.uniq types.string;
       description = ''
         Name of the kernel file to be passed to the bootloader.
       '';
-- 
GitLab


From ce7ead7bd79e04045fe454f6a1a95e4e34c38935 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 10 Aug 2012 10:56:55 -0400
Subject: [PATCH 3923/5331] switch-to-configuration: Handle changes to
 fileSystems

We now automatically remount filesystems with changed options, mount
new filesystems, and unmount obsolete filesystems.
---
 .../activation/switch-to-configuration.pl     | 110 ++++++++++++++----
 1 file changed, 88 insertions(+), 22 deletions(-)

diff --git a/modules/system/activation/switch-to-configuration.pl b/modules/system/activation/switch-to-configuration.pl
index 96b256bc24d..0b900e3fc16 100644
--- a/modules/system/activation/switch-to-configuration.pl
+++ b/modules/system/activation/switch-to-configuration.pl
@@ -7,6 +7,7 @@ use File::Slurp;
 use Cwd 'abs_path';
 
 my $restartListFile = "/run/systemd/restart-list";
+my $reloadListFile = "/run/systemd/reload-list";
 
 my $action = shift @ARGV;
 
@@ -61,6 +62,19 @@ sub getActiveUnits {
     return $res;
 }
 
+sub parseFstab {
+    my ($filename) = @_;
+    my %res;
+    foreach my $line (read_file($filename, err_mode => 'quiet')) {
+        chomp $line;
+        $line =~ s/#.*//;
+        next if $line =~ /^\s*$/;
+        my @xs = split / /, $line;
+        $res{$xs[1]} = { device => $xs[0], fsType => $xs[2], options => $xs[3] };
+    }
+    return %res;
+}
+
 # Forget about previously failed services.
 system("@systemd@/bin/systemctl", "reset-failed");
 
@@ -73,23 +87,64 @@ while (my ($unit, $state) = each %{$activePrev}) {
     # Recognise template instances.
     $baseUnit = "$1\@.$2" if $unit =~ /^(.*)@[^\.]*\.(.*)$/;
     my $prevUnitFile = "/etc/systemd/system/$baseUnit";
+    my $newUnitFile = "@out@/etc/systemd/system/$baseUnit";
     if (-e $prevUnitFile && ($state->{state} eq "active" || $state->{state} eq "activating")) {
-        my $newUnitFile = "@out@/etc/systemd/system/$baseUnit";
         if (! -e $newUnitFile) {
             push @unitsToStop, $unit;
         } elsif (abs_path($prevUnitFile) ne abs_path($newUnitFile)) {
-            # Record that this unit needs to be started below.  We
-            # write this to a file to ensure that the service gets
-            # restarted if we're interrupted.
-            write_file($restartListFile, { append => 1 }, "$unit\n");
-            push @unitsToStop, $unit;
+            if ($unit =~ /\.target$/) {
+                write_file($restartListFile, { append => 1 }, "$unit\n");
+            } elsif ($unit =~ /\.mount$/) {
+                # Reload the changed mount unit to force a remount.
+                write_file($reloadListFile, { append => 1 }, "$unit\n");
+            } else {
+                # Record that this unit needs to be started below.  We
+                # write this to a file to ensure that the service gets
+                # restarted if we're interrupted.
+                write_file($restartListFile, { append => 1 }, "$unit\n");
+                push @unitsToStop, $unit;
+            }
         }
     }
 }
 
+sub pathToUnitName {
+    my ($path) = @_;
+    die unless substr($path, 0, 1) eq "/";
+    return "-" if $path eq "/";
+    $path = substr($path, 1);
+    $path =~ s/\//-/g;
+    # FIXME: handle - and unprintable characters.
+    return $path;
+}
+
+# Compare the previous and new fstab to figure out which filesystems
+# need a remount or need to be unmounted.  New filesystems are mounted
+# automatically by starting local-fs.target.  FIXME: might be nicer if
+# we generated units for all mounts; then we could unify this with the
+# unit checking code above.
+my %prevFstab = parseFstab "/etc/fstab";
+my %newFstab = parseFstab "@out@/etc/fstab";
+foreach my $mountPoint (keys %prevFstab) {
+    my $prev = $prevFstab{$mountPoint};
+    my $new = $newFstab{$mountPoint};
+    my $unit = pathToUnitName($mountPoint). ".mount";
+    if (!defined $new) {
+        # Entry disappeared, so unmount it.
+        push @unitsToStop, $unit;
+    } elsif ($prev->{fsType} ne $new->{fsType} || $prev->{device} ne $new->{device}) {
+        # Filesystem type or device changed, so unmount and mount it.
+        write_file($restartListFile, { append => 1 }, "$unit\n");
+        push @unitsToStop, $unit;
+    } elsif ($prev->{options} ne $new->{options}) {
+        # Mount options changes, so remount it.
+        write_file($reloadListFile, { append => 1 }, "$unit\n");
+    }
+}
+
 if (scalar @unitsToStop > 0) {
     print STDERR "stopping the following units: ", join(", ", sort(@unitsToStop)), "\n";
-    system("@systemd@/bin/systemctl", "stop", @unitsToStop); # FIXME: ignore errors?
+    system("@systemd@/bin/systemctl", "stop", "--", @unitsToStop); # FIXME: ignore errors?
 }
 
 # Activate the new configuration (i.e., update /etc, make accounts,
@@ -103,21 +158,32 @@ system("@out@/activate", "@out@") == 0 or $res = 2;
 # Make systemd reload its units.
 system("@systemd@/bin/systemctl", "daemon-reload") == 0 or $res = 3;
 
-# Start all units required by the default target.  This should start
-# most changed units we stopped above as well as any new dependencies.
-print STDERR "starting default target...\n";
-system("@systemd@/bin/systemctl", "start", "default.target") == 0 or $res = 4;
-
-# Start changed units we stopped above.  This is necessary because
-# some may not be dependencies of the default target (i.e., they were
-# manually started).
-my @stopped = split '\n', read_file($restartListFile, err_mode => 'quiet') // "";
-if (scalar @stopped > 0) {
-    my %unique = map { $_, 1 } @stopped;
-    my @unique = sort(keys(%unique));
-    print STDERR "restarting the following units: ", join(", ", @unique), "\n";
-    system("@systemd@/bin/systemctl", "start", @unique) == 0 or $res = 4;
-    unlink($restartListFile);
+sub unique {
+    my %unique = map { $_, 1 } @_;
+    return sort(keys(%unique));
+}
+
+# Start the following units:
+# - The default target.  This should start most changed units we
+#   stopped above as well as any new dependencies.
+# - local-fs.target.  This mounts any missing local filesystems.
+# - Changed units we stopped above.  This is necessary because some
+#   may not be dependencies of the default target (i.e., they were
+#   manually started).
+my @start = unique(
+    "default.target", "local-fs.target",
+    split('\n', read_file($restartListFile, err_mode => 'quiet') // ""));
+print STDERR "starting the following units: ", join(", ", @start), "\n";
+system("@systemd@/bin/systemctl", "start", "--", @start) == 0 or $res = 4;
+unlink($restartListFile);
+
+# Reload units that need it.  This includes remounting changed mount
+# units.
+my @reload = unique(split '\n', read_file($reloadListFile, err_mode => 'quiet') // "");
+if (scalar @reload > 0) {
+    print STDERR "reloading the following units: ", join(", ", @reload), "\n";
+    system("@systemd@/bin/systemctl", "reload", "--", @reload) == 0 or $res = 4;
+    unlink($reloadListFile);
 }
 
 # Signal dbus to reload its configuration.
-- 
GitLab


From 746b572ee64b432d99e0de38fb247710125e570d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= <viric@viric.name>
Date: Fri, 10 Aug 2012 20:46:36 +0200
Subject: [PATCH 3924/5331] stage2init: fix respecting 'noatime' mount options
 for /

We had a "mount -o remount,rw none /" that was setting back 'relatime',
although we had set 'noatime' at initrd mount. Removing the word 'none' fixed
it.

Specifying a device (in this case 'none'), makes mount to forget previous
device options. According to manpage, it says not to read fstab or mtab. But the
effect is that of setting 'relatime', if it was mounted 'noatime.
---
 modules/system/boot/stage-2-init.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/system/boot/stage-2-init.sh b/modules/system/boot/stage-2-init.sh
index 0a42083144d..f0e04aed179 100644
--- a/modules/system/boot/stage-2-init.sh
+++ b/modules/system/boot/stage-2-init.sh
@@ -28,7 +28,7 @@ setPath "@path@"
 # However, in some environments (such as Amazon EC2), stage 2 is
 # executed directly, and the root is read-only.  So make it writable
 # here.
-mount -n -o remount,rw none /
+mount -n -o remount,rw /
 
 
 # Likewise, stage 1 mounts /proc, /dev and /sys, so if we don't have a
-- 
GitLab


From a3c75462c19978780f0ea9287763e5ffc9e510fd Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 10 Aug 2012 15:15:59 -0400
Subject: [PATCH 3925/5331] switch-to-configuration: Handle switching all
 systemd units

---
 modules/system/activation/switch-to-configuration.pl | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/modules/system/activation/switch-to-configuration.pl b/modules/system/activation/switch-to-configuration.pl
index 0b900e3fc16..06a6a5bc888 100644
--- a/modules/system/activation/switch-to-configuration.pl
+++ b/modules/system/activation/switch-to-configuration.pl
@@ -92,11 +92,15 @@ while (my ($unit, $state) = each %{$activePrev}) {
         if (! -e $newUnitFile) {
             push @unitsToStop, $unit;
         } elsif (abs_path($prevUnitFile) ne abs_path($newUnitFile)) {
-            if ($unit =~ /\.target$/) {
+            if ($unit eq "sysinit.target" || $unit eq "basic.target" || $unit eq "multi-user.target" || $unit eq "graphical.target") {
+                # Do nothing.  These cannot be restarted directly.
+            } elsif ($unit =~ /\.target$/) {
                 write_file($restartListFile, { append => 1 }, "$unit\n");
             } elsif ($unit =~ /\.mount$/) {
                 # Reload the changed mount unit to force a remount.
                 write_file($reloadListFile, { append => 1 }, "$unit\n");
+            } elsif ($unit =~ /\.socket$/ || $unit =~ /\.path$/) {
+                # FIXME: do something?
             } else {
                 # Record that this unit needs to be started below.  We
                 # write this to a file to ensure that the service gets
@@ -170,6 +174,9 @@ sub unique {
 # - Changed units we stopped above.  This is necessary because some
 #   may not be dependencies of the default target (i.e., they were
 #   manually started).
+# FIXME: detect units that are symlinks to other units.  We shouldn't
+# start both at the same time because we'll get a "Failed to add path
+# to set" error from systemd.
 my @start = unique(
     "default.target", "local-fs.target",
     split('\n', read_file($restartListFile, err_mode => 'quiet') // ""));
-- 
GitLab


From be5486813b248dfe0a864d9db695130338408dff Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 10 Aug 2012 15:25:04 -0400
Subject: [PATCH 3926/5331] Add an "adm" group

Journald will chown all journal files to the adm group so that users
in that group can run "journalctl".
---
 modules/config/users-groups.nix | 1 +
 modules/misc/ids.nix            | 1 +
 2 files changed, 2 insertions(+)

diff --git a/modules/config/users-groups.nix b/modules/config/users-groups.nix
index 598d68eb91d..b5b69265455 100644
--- a/modules/config/users-groups.nix
+++ b/modules/config/users-groups.nix
@@ -208,6 +208,7 @@ in
       users = { };
       nixbld = { };
       utmp = { };
+      adm = { }; # expected by journald
     };
 
     system.activationScripts.rootPasswd = stringAfter [ "etc" ]
diff --git a/modules/misc/ids.nix b/modules/misc/ids.nix
index 13ebf954f32..cc514fb79c8 100644
--- a/modules/misc/ids.nix
+++ b/modules/misc/ids.nix
@@ -123,6 +123,7 @@ in
     mpd = 50;
     clamav = 51;
     fprot = 52;
+    adm = 55;
 
     # When adding a gid, make sure it doesn't match an existing uid.
 
-- 
GitLab


From a4a90685eaa601e896a1aaf1eb7c2fcf746f5b03 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 10 Aug 2012 15:52:47 -0400
Subject: [PATCH 3927/5331] switch-to-configuration: Handle swap devices

---
 .../activation/switch-to-configuration.pl     | 24 ++++++++++++-------
 modules/system/activation/top-level.nix       |  2 +-
 2 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/modules/system/activation/switch-to-configuration.pl b/modules/system/activation/switch-to-configuration.pl
index 06a6a5bc888..df4c440b97a 100644
--- a/modules/system/activation/switch-to-configuration.pl
+++ b/modules/system/activation/switch-to-configuration.pl
@@ -70,7 +70,7 @@ sub parseFstab {
         $line =~ s/#.*//;
         next if $line =~ /^\s*$/;
         my @xs = split / /, $line;
-        $res{$xs[1]} = { device => $xs[0], fsType => $xs[2], options => $xs[3] };
+        $res{$xs[1]} = { device => $xs[0], fsType => $xs[2], options => $xs[3] // "" };
     }
     return %res;
 }
@@ -124,18 +124,26 @@ sub pathToUnitName {
 
 # Compare the previous and new fstab to figure out which filesystems
 # need a remount or need to be unmounted.  New filesystems are mounted
-# automatically by starting local-fs.target.  FIXME: might be nicer if
-# we generated units for all mounts; then we could unify this with the
-# unit checking code above.
+# automatically by starting local-fs.target.  Also handles swap
+# devices.  FIXME: might be nicer if we generated units for all
+# mounts; then we could unify this with the unit checking code above.
 my %prevFstab = parseFstab "/etc/fstab";
 my %newFstab = parseFstab "@out@/etc/fstab";
 foreach my $mountPoint (keys %prevFstab) {
     my $prev = $prevFstab{$mountPoint};
     my $new = $newFstab{$mountPoint};
-    my $unit = pathToUnitName($mountPoint). ".mount";
+    my $unit = pathToUnitName($mountPoint). ".mount" if $prev->{fsType} ne "swap";
     if (!defined $new) {
-        # Entry disappeared, so unmount it.
-        push @unitsToStop, $unit;
+        if ($prev->{fsType} eq "swap") {
+            # Swap entry disappeared, so turn it off.  Can't use
+            # "systemctl stop" here because systemd has lots of alias
+            # units that prevent a stop from actually calling
+            # "swapoff".
+            system("@utillinux@/sbin/swapoff", $prev->{device});
+        } else {
+            # Filesystem entry disappeared, so unmount it.
+            push @unitsToStop, $unit;
+        }
     } elsif ($prev->{fsType} ne $new->{fsType} || $prev->{device} ne $new->{device}) {
         # Filesystem type or device changed, so unmount and mount it.
         write_file($restartListFile, { append => 1 }, "$unit\n");
@@ -178,7 +186,7 @@ sub unique {
 # start both at the same time because we'll get a "Failed to add path
 # to set" error from systemd.
 my @start = unique(
-    "default.target", "local-fs.target",
+    "default.target", "local-fs.target", "swap.target",
     split('\n', read_file($restartListFile, err_mode => 'quiet') // ""));
 print STDERR "starting the following units: ", join(", ", @start), "\n";
 system("@systemd@/bin/systemctl", "start", "--", @start) == 0 or $res = 4;
diff --git a/modules/system/activation/top-level.nix b/modules/system/activation/top-level.nix
index d092fa1d086..0cc9bf04978 100644
--- a/modules/system/activation/top-level.nix
+++ b/modules/system/activation/top-level.nix
@@ -147,7 +147,7 @@ let
     preferLocalBuild = true;
     buildCommand = systemBuilder;
 
-    inherit (pkgs) systemd;
+    inherit (pkgs) systemd utillinux;
 
     inherit children;
     kernelParams =
-- 
GitLab


From e00967a54a9f82ee042aff5c374b4eecc4e8274d Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 10 Aug 2012 18:41:20 -0400
Subject: [PATCH 3928/5331] stage-2-init: Drop udev from the $PATH

---
 modules/system/boot/stage-2.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/modules/system/boot/stage-2.nix b/modules/system/boot/stage-2.nix
index a5e96cc0f1c..e187219cbd8 100644
--- a/modules/system/boot/stage-2.nix
+++ b/modules/system/boot/stage-2.nix
@@ -64,7 +64,6 @@ let
     path =
       [ pkgs.coreutils
         pkgs.utillinux
-        pkgs.udev
         pkgs.sysvtools
       ] ++ pkgs.lib.optional config.boot.cleanTmpDir pkgs.findutils;
     postBootCommands = pkgs.writeText "local-cmds"
-- 
GitLab


From 39030211af56d9186821eef7daaa18db486bc028 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 10 Aug 2012 18:56:12 -0400
Subject: [PATCH 3929/5331] Add a unitConfig option to set the [Unit] section
 of units

---
 modules/system/boot/systemd-unit-options.nix | 12 +++++++++++-
 modules/system/boot/systemd.nix              | 10 ++++++----
 2 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/modules/system/boot/systemd-unit-options.nix b/modules/system/boot/systemd-unit-options.nix
index 34b37f4d0ba..ec769ad69f9 100644
--- a/modules/system/boot/systemd-unit-options.nix
+++ b/modules/system/boot/systemd-unit-options.nix
@@ -71,12 +71,22 @@ with pkgs.lib;
       '';
     };
 
+    unitConfig = mkOption {
+      default = "";
+      type = types.string;
+      description = ''
+        Contents of the <literal>[Unit]</literal> section of the unit.
+        See <citerefentry><refentrytitle>systemd.unit</refentrytitle>
+        <manvolnum>5</manvolnum></citerefentry> for details.
+      '';
+    };
+
     serviceConfig = mkOption {
       default = "";
       type = types.string;
       description = ''
         Contents of the <literal>[Service]</literal> section of the unit.
-        See <citerefentry><refentrytitle>systemd.unit</refentrytitle>
+        See <citerefentry><refentrytitle>systemd.service</refentrytitle>
         <manvolnum>5</manvolnum></citerefentry> for details.
       '';
     };
diff --git a/modules/system/boot/systemd.nix b/modules/system/boot/systemd.nix
index 2a586090dd1..5f7ea7d3c9b 100644
--- a/modules/system/boot/systemd.nix
+++ b/modules/system/boot/systemd.nix
@@ -26,6 +26,7 @@ let
       "nss-user-lookup.target"
       "syslog.target"
       "time-sync.target"
+      #"cryptsetup.target"
 
       # Udev.
       "systemd-udevd-control.socket"
@@ -68,7 +69,7 @@ let
       "systemd-update-utmp-shutdown.service"
 
       # Kernel module loading.
-      "systemd-modules-load.service" 
+      "systemd-modules-load.service"
 
       # Filesystems.
       "systemd-fsck@.service"
@@ -177,6 +178,7 @@ let
           Wants=${concatStringsSep " " def.wants}
           Before=${concatStringsSep " " def.before}
           After=${concatStringsSep " " def.after}
+          ${def.unitConfig}
 
           [Service]
           Environment=PATH=${def.path}
@@ -207,7 +209,7 @@ let
       mkdir -p $out
       for i in ${toString upstreamUnits}; do
         fn=${systemd}/example/systemd/system/$i
-        [ -e $fn ]
+        if ! [ -e $fn ]; then echo "missing $fn"; false; fi
         if [ -L $fn ]; then
           cp -pd $fn $out/
         else
@@ -217,7 +219,7 @@ let
 
       for i in ${toString upstreamWants}; do
         fn=${systemd}/example/systemd/system/$i
-        [ -e $fn ]
+        if ! [ -e $fn ]; then echo "missing $fn"; false; fi
         x=$out/$(basename $fn)
         mkdir $x
         for i in $fn/*; do
@@ -239,7 +241,7 @@ let
 
       ln -s ${cfg.defaultUnit} $out/default.target
 
-      ln -s ../getty@tty1.service $out/multi-user.target.wants/
+      #ln -s ../getty@tty1.service $out/multi-user.target.wants/
     ''; # */
 
 in
-- 
GitLab


From 9e753f3a46eee13a8ef6eec7a2418379c9831b29 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= <viric@viric.name>
Date: Sat, 11 Aug 2012 14:52:45 +0200
Subject: [PATCH 3930/5331] Removing rt73 module, adding ralink module.

The rt73 fw were a subset of ralink, and the nixpkgs url
for rt73 didn't work either. Ralink should make any rt73 card work.
---
 modules/hardware/network/{rt73.nix => ralink.nix} | 6 +++---
 modules/module-list.nix                           | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)
 rename modules/hardware/network/{rt73.nix => ralink.nix} (61%)

diff --git a/modules/hardware/network/rt73.nix b/modules/hardware/network/ralink.nix
similarity index 61%
rename from modules/hardware/network/rt73.nix
rename to modules/hardware/network/ralink.nix
index 6e96f21104d..5924a23fe3c 100644
--- a/modules/hardware/network/rt73.nix
+++ b/modules/hardware/network/ralink.nix
@@ -6,7 +6,7 @@
 
   options = {
 
-    networking.enableRT73Firmware = pkgs.lib.mkOption {
+    networking.enableRalinkFirmware = pkgs.lib.mkOption {
       default = false;
       type = pkgs.lib.types.bool;
       description = ''
@@ -19,8 +19,8 @@
 
   ###### implementation
 
-  config = pkgs.lib.mkIf config.networking.enableRT73Firmware {
-    hardware.firmware = [ pkgs.rt73fw ];
+  config = pkgs.lib.mkIf config.networking.enableRalinkFirmware {
+    hardware.firmware = [ pkgs.ralink_fw ];
   };
 
 }
diff --git a/modules/module-list.nix b/modules/module-list.nix
index bc3948182c3..697cc60e35e 100644
--- a/modules/module-list.nix
+++ b/modules/module-list.nix
@@ -20,7 +20,7 @@
   ./hardware/network/intel-2100bg.nix
   ./hardware/network/intel-2200bg.nix
   ./hardware/network/intel-3945abg.nix
-  ./hardware/network/rt73.nix
+  ./hardware/network/ralink.nix
   ./hardware/network/rtl8192c.nix
   ./hardware/pcmcia.nix
   ./installer/tools/nixos-checkout.nix
-- 
GitLab


From 50350a15f1a46c6efa30b93e41b0b8681815bfb4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= <viric@viric.name>
Date: Sat, 11 Aug 2012 14:54:43 +0200
Subject: [PATCH 3931/5331] Adding a rename line for rt73 -> ralink.

---
 modules/rename.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/modules/rename.nix b/modules/rename.nix
index 7f6fd6383a0..43566bab22f 100644
--- a/modules/rename.nix
+++ b/modules/rename.nix
@@ -69,6 +69,7 @@ in zipModules ([]
 
 ++ rename obsolete "security.extraSetuidPrograms" "security.setuidPrograms"
 ++ rename obsolete "networking.enableWLAN" "networking.wireless.enable"
+++ rename obsolete "networking.enableRT73Firmware" "networking.enableRalinkFirmware"
 
 # Old Grub-related options.
 ++ rename obsolete "boot.copyKernels" "boot.loader.grub.copyKernels"
-- 
GitLab


From 15a1efe023b7ffe90ccc79efba2133bdc2bdb275 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Sat, 11 Aug 2012 12:34:35 -0400
Subject: [PATCH 3932/5331] find modules/ -name \*.nix -print0 | xargs -0 sed
 -i 's/RT73Firmware/RalinkFirmware/g'

---
 modules/installer/cd-dvd/system-tarball-fuloong2f.nix  | 2 +-
 modules/installer/cd-dvd/system-tarball-sheevaplug.nix | 2 +-
 modules/installer/scan/not-detected.nix                | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/modules/installer/cd-dvd/system-tarball-fuloong2f.nix b/modules/installer/cd-dvd/system-tarball-fuloong2f.nix
index 5b6e0036639..e988647cf13 100644
--- a/modules/installer/cd-dvd/system-tarball-fuloong2f.nix
+++ b/modules/installer/cd-dvd/system-tarball-fuloong2f.nix
@@ -128,7 +128,7 @@ in
     '';
 
   # Include the firmware for various wireless cards.
-  networking.enableRT73Firmware = true;
+  networking.enableRalinkFirmware = true;
   networking.enableIntel2200BGFirmware = true;
 
   # To speed up further installation of packages, include the complete stdenv
diff --git a/modules/installer/cd-dvd/system-tarball-sheevaplug.nix b/modules/installer/cd-dvd/system-tarball-sheevaplug.nix
index f53079ecd9b..52df5a56ee7 100644
--- a/modules/installer/cd-dvd/system-tarball-sheevaplug.nix
+++ b/modules/installer/cd-dvd/system-tarball-sheevaplug.nix
@@ -152,7 +152,7 @@ in
   services.nixosManual.enable = false;
 
   # Include the firmware for various wireless cards.
-  networking.enableRT73Firmware = true;
+  networking.enableRalinkFirmware = true;
   networking.enableIntel2200BGFirmware = true;
 
   # To speed up further installation of packages, include the complete stdenv
diff --git a/modules/installer/scan/not-detected.nix b/modules/installer/scan/not-detected.nix
index 34e71479322..f79a3f09e05 100644
--- a/modules/installer/scan/not-detected.nix
+++ b/modules/installer/scan/not-detected.nix
@@ -19,6 +19,6 @@ with pkgs.lib;
   config = mkDefault {
     # That wireless card firmware not enabled because the corresponding
     # build expression 'rt73fw' is broken.
-    networking.enableRT73Firmware = false;
+    networking.enableRalinkFirmware = false;
   };
 }
-- 
GitLab


From eb0b2651b87b76db4a73dfe54e07658c9b726232 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Sun, 12 Aug 2012 09:12:54 +0200
Subject: [PATCH 3933/5331] stage-1: Add option to load keymap during bootup.

As non-QWERTY keyboards don't feel so warm and cozy if they hug QWERTY LUKS
password prompts, it was on honor for me to serve King Dvorak XV to fight the
glorious keyboard war against... what?! Yes, I'm awake!

We're fighting with loadkeys to spit out busybox binary keymaps against loadkmap
(loadkeys does have a special target -b for that).

And yep, I'm somewhat abusing preLVMCommands, if someone got issues with that,
feel free to introduce a new substitute in stage-i-init.sh.

Sent from my iPhone
---
 modules/system/boot/stage-1.nix | 24 +++++++++++++++++++++++-
 1 file changed, 23 insertions(+), 1 deletion(-)

diff --git a/modules/system/boot/stage-1.nix b/modules/system/boot/stage-1.nix
index 01ecd839f55..b08ff733a43 100644
--- a/modules/system/boot/stage-1.nix
+++ b/modules/system/boot/stage-1.nix
@@ -27,6 +27,15 @@ let
       ";
     };
 
+    boot.initrd.loadConsoleKeyMap = mkOption {
+      default = false;
+      type = with types; bool;
+      description = ''
+        Load i18n.consoleKeyMap at boot time. This is especially useful if you
+        bring together a non-QWERTY keyboard with a LUKS password prompt.
+      '';
+    };
+
     boot.initrd.checkJournalingFS = mkOption {
       default = true;
       type = types.bool;
@@ -267,6 +276,14 @@ let
   '';
 
 
+  # the binary keymap for busybox to load at boot
+  busyboxKeymap = pkgs.runCommand "boottime-keymap"
+    { preferLocalBuild = true; }
+    ''
+      ${pkgs.kbd}/bin/loadkeys -qb "${config.i18n.consoleKeyMap}" > $out
+    '';
+
+
   # The init script of boot stage 1 (loading kernel modules for
   # mounting the root FS).
   bootStage1 = pkgs.substituteAll {
@@ -281,7 +298,12 @@ let
     inherit (config.boot) resumeDevice devSize runSize;
 
     inherit (config.boot.initrd) checkJournalingFS
-      preLVMCommands postDeviceCommands postMountCommands kernelModules;
+      postDeviceCommands postMountCommands kernelModules;
+
+    preLVMCommands = (optionalString config.boot.initrd.loadConsoleKeyMap ''
+        # load boot-time keymap before any LVM/LUKS initialization
+        ${extraUtils}/bin/busybox loadkmap < "${busyboxKeymap}"
+      '') + config.boot.initrd.preLVMCommands;
 
     fsInfo =
       let f = fs: [ fs.mountPoint (if fs.device != null then fs.device else "/dev/disk/by-label/${fs.label}") fs.fsType fs.options ];
-- 
GitLab


From d809a9e6b2e7cc249fe6134065ba8d119a69c73c Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Sun, 12 Aug 2012 07:15:56 +0200
Subject: [PATCH 3934/5331] mingetty: Option to not restart on service change.

This especially annoyed me whenver I was doing nixos-rebuild switch and getting
logged out on all consoles. With this there now is services.mingetty.dontRestart
for heavy VT users to deactivate this behaviour.
---
 modules/services/ttys/mingetty.nix | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/modules/services/ttys/mingetty.nix b/modules/services/ttys/mingetty.nix
index e5dbc07aeb0..23cdf861d16 100644
--- a/modules/services/ttys/mingetty.nix
+++ b/modules/services/ttys/mingetty.nix
@@ -46,6 +46,14 @@ with pkgs.lib;
         '';
       };
 
+      dontRestart = mkOption {
+        default = false;
+        description = ''
+          Don't restart mingetty processes as this will result in active
+          sessions to be logged out, for example on activation of the system's
+          configuration.
+        '';
+      };
     };
 
   };
@@ -69,6 +77,8 @@ with pkgs.lib;
 
       exec = "mingetty --loginprog=${pkgs.shadow}/bin/login --noclear ${tty}";
 
+      restartIfChanged = !config.services.mingetty.dontRestart;
+
       environment.LOCALE_ARCHIVE = "/run/current-system/sw/lib/locale/locale-archive";
 
     }) config.services.mingetty.ttys);
-- 
GitLab


From c9e05f1ed8130a2eda2a7838eebc792e9318cd44 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Sun, 12 Aug 2012 16:54:31 +0200
Subject: [PATCH 3935/5331] stage-1: Load boot-time keymap by default.

This also removes the configuration option, as suggested by @edolstra.
---
 modules/system/boot/stage-1-init.sh |  4 ++++
 modules/system/boot/stage-1.nix     | 18 ++----------------
 2 files changed, 6 insertions(+), 16 deletions(-)

diff --git a/modules/system/boot/stage-1-init.sh b/modules/system/boot/stage-1-init.sh
index 593b9397e66..53d528fcd56 100644
--- a/modules/system/boot/stage-1-init.sh
+++ b/modules/system/boot/stage-1-init.sh
@@ -147,6 +147,10 @@ modprobe scsi_wait_scan || true
 udevadm settle || true
 
 
+# Load boot-time keymap before any LVM/LUKS initialization
+@extraUtils@/bin/busybox loadkmap < "@busyboxKeymap@"
+
+
 # XXX: Use case usb->lvm will still fail, usb->luks->lvm is covered
 @preLVMCommands@
 
diff --git a/modules/system/boot/stage-1.nix b/modules/system/boot/stage-1.nix
index b08ff733a43..df4e4e14035 100644
--- a/modules/system/boot/stage-1.nix
+++ b/modules/system/boot/stage-1.nix
@@ -27,15 +27,6 @@ let
       ";
     };
 
-    boot.initrd.loadConsoleKeyMap = mkOption {
-      default = false;
-      type = with types; bool;
-      description = ''
-        Load i18n.consoleKeyMap at boot time. This is especially useful if you
-        bring together a non-QWERTY keyboard with a LUKS password prompt.
-      '';
-    };
-
     boot.initrd.checkJournalingFS = mkOption {
       default = true;
       type = types.bool;
@@ -293,17 +284,12 @@ let
 
     isExecutable = true;
 
-    inherit udevConf extraUtils modulesClosure;
+    inherit udevConf busyboxKeymap extraUtils modulesClosure;
 
     inherit (config.boot) resumeDevice devSize runSize;
 
     inherit (config.boot.initrd) checkJournalingFS
-      postDeviceCommands postMountCommands kernelModules;
-
-    preLVMCommands = (optionalString config.boot.initrd.loadConsoleKeyMap ''
-        # load boot-time keymap before any LVM/LUKS initialization
-        ${extraUtils}/bin/busybox loadkmap < "${busyboxKeymap}"
-      '') + config.boot.initrd.preLVMCommands;
+      preLVMCommands postDeviceCommands postMountCommands kernelModules;
 
     fsInfo =
       let f = fs: [ fs.mountPoint (if fs.device != null then fs.device else "/dev/disk/by-label/${fs.label}") fs.fsType fs.options ];
-- 
GitLab


From 85997a669248e57d9d556725973723f60c5dffbb Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Sun, 12 Aug 2012 11:44:00 -0400
Subject: [PATCH 3936/5331] mingetty: Don't make restartIfChanged optional

---
 modules/services/ttys/mingetty.nix | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

diff --git a/modules/services/ttys/mingetty.nix b/modules/services/ttys/mingetty.nix
index 23cdf861d16..ecc4fd4630e 100644
--- a/modules/services/ttys/mingetty.nix
+++ b/modules/services/ttys/mingetty.nix
@@ -46,14 +46,6 @@ with pkgs.lib;
         '';
       };
 
-      dontRestart = mkOption {
-        default = false;
-        description = ''
-          Don't restart mingetty processes as this will result in active
-          sessions to be logged out, for example on activation of the system's
-          configuration.
-        '';
-      };
     };
 
   };
@@ -77,7 +69,7 @@ with pkgs.lib;
 
       exec = "mingetty --loginprog=${pkgs.shadow}/bin/login --noclear ${tty}";
 
-      restartIfChanged = !config.services.mingetty.dontRestart;
+      restartIfChanged = false;
 
       environment.LOCALE_ARCHIVE = "/run/current-system/sw/lib/locale/locale-archive";
 
-- 
GitLab


From a025e848e0c60b327745c2a59712aeece3153632 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 13 Aug 2012 14:37:32 +0200
Subject: [PATCH 3937/5331] modules/security/sudo.nix: added
 'wheelNeedsPassword' option (default: true)

Change this setting to 'false' to allow users in the 'wheel' group to execute
commands as super user without entering a password.
---
 modules/security/sudo.nix | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/modules/security/sudo.nix b/modules/security/sudo.nix
index e3e463e155f..211ff8a9609 100644
--- a/modules/security/sudo.nix
+++ b/modules/security/sudo.nix
@@ -25,6 +25,15 @@ in
         '';
     };
 
+    security.sudo.wheelNeedsPassword = mkOption {
+      default = true;
+      description =
+        ''
+          Whether users of the <code>wheel</code> group can execute
+          commands as super user without entering a password.
+	'';
+      };
+
     security.sudo.configFile = mkOption {
       # Note: if syntax errors are detected in this file, the NixOS
       # configuration will fail to build.
@@ -45,7 +54,7 @@ in
           root        ALL=(ALL) SETENV: ALL
 
           # Users in the "wheel" group can do anything.
-          %wheel      ALL=(ALL) SETENV: ALL
+          %wheel      ALL=(ALL) ${if cfg.wheelNeedsPassword then "" else "NOPASSWD: ALL, "}SETENV: ALL
         '';
       description =
         ''
-- 
GitLab


From 88bfdca8e02ed93079f8159dcc63ab61372b56dc Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 14 Aug 2012 15:31:15 -0400
Subject: [PATCH 3938/5331] stage-1: Use systemd-udevd instead of the old udevd

---
 modules/system/boot/stage-1-init.sh |  6 ++---
 modules/system/boot/stage-1.nix     | 35 ++++++++++++-----------------
 2 files changed, 17 insertions(+), 24 deletions(-)

diff --git a/modules/system/boot/stage-1-init.sh b/modules/system/boot/stage-1-init.sh
index 95e925bbe12..fc97100b135 100644
--- a/modules/system/boot/stage-1-init.sh
+++ b/modules/system/boot/stage-1-init.sh
@@ -126,10 +126,10 @@ done
 
 # Create device nodes in /dev.
 echo "running udev..."
-export UDEV_CONFIG_FILE=@udevConf@
-mkdir -p /dev/.udev # !!! bug in udev?
+mkdir -p /etc/udev
+ln -sfn @udevRules@ /etc/udev/rules.d
 mkdir -p /dev/.mdadm
-udevd --daemon
+systemd-udevd --daemon
 udevadm trigger --action=add
 udevadm settle || true
 modprobe scsi_wait_scan || true
diff --git a/modules/system/boot/stage-1.nix b/modules/system/boot/stage-1.nix
index 02a75ae21c4..d2a96a764c7 100644
--- a/modules/system/boot/stage-1.nix
+++ b/modules/system/boot/stage-1.nix
@@ -9,6 +9,8 @@ with pkgs.lib;
 
 let
 
+  udev = config.system.build.systemd;
+
   options = {
 
     boot.resumeDevice = mkOption {
@@ -153,7 +155,7 @@ let
       cp -v ${pkgs.utillinux}/sbin/blkid $out/bin
       cp -pdv ${pkgs.utillinux}/lib/libblkid*.so.* $out/lib
       cp -pdv ${pkgs.utillinux}/lib/libuuid*.so.* $out/lib
-      
+
       # Copy dmsetup and lvm.
       cp -v ${pkgs.lvm2}/sbin/dmsetup $out/bin/dmsetup
       cp -v ${pkgs.lvm2}/sbin/lvm $out/bin/lvm
@@ -163,9 +165,12 @@ let
       cp -v ${pkgs.mdadm}/sbin/mdadm $out/bin/mdadm
 
       # Copy udev.
-      cp -v ${pkgs.udev}/sbin/udevd ${pkgs.udev}/sbin/udevadm $out/bin
-      cp -v ${pkgs.udev}/lib/udev/*_id $out/bin
-      cp -pdv ${pkgs.udev}/lib/libudev.so.* $out/lib
+      cp -v ${udev}/lib/systemd/systemd-udevd ${udev}/bin/udevadm $out/bin
+      cp -v ${udev}/lib/udev/*_id $out/bin
+      cp -pdv ${udev}/lib/libudev.so.* $out/lib
+      cp -v ${pkgs.kmod}/lib/libkmod.so.* $out/lib
+      cp -v ${pkgs.acl}/lib/libacl.so.* $out/lib
+      cp -v ${pkgs.attr}/lib/libattr.so.* $out/lib
 
       # Copy modprobe.
       cp -v ${pkgs.module_init_tools}/sbin/modprobe $out/bin/modprobe
@@ -223,26 +228,21 @@ let
 
       echo 'ENV{LD_LIBRARY_PATH}="${extraUtils}/lib"' > $out/00-env.rules
 
-      cp -v ${pkgs.udev}/lib/udev/rules.d/60-cdrom_id.rules $out/
-      cp -v ${pkgs.udev}/lib/udev/rules.d/60-persistent-storage.rules $out/
-      cp -v ${pkgs.udev}/lib/udev/rules.d/80-drivers.rules $out/
+      cp -v ${udev}/lib/udev/rules.d/60-cdrom_id.rules $out/
+      cp -v ${udev}/lib/udev/rules.d/60-persistent-storage.rules $out/
+      cp -v ${udev}/lib/udev/rules.d/80-drivers.rules $out/
       cp -v ${pkgs.lvm2}/lib/udev/rules.d/*.rules $out/
       cp -v ${pkgs.mdadm}/lib/udev/rules.d/*.rules $out/
 
       for i in $out/*.rules; do
           substituteInPlace $i \
             --replace ata_id ${extraUtils}/bin/ata_id \
-            --replace usb_id ${extraUtils}/bin/usb_id \
             --replace scsi_id ${extraUtils}/bin/scsi_id \
-            --replace path_id ${extraUtils}/bin/path_id \
-            --replace vol_id ${extraUtils}/bin/vol_id \
             --replace cdrom_id ${extraUtils}/bin/cdrom_id \
             --replace /sbin/blkid ${extraUtils}/bin/blkid \
-            --replace /sbin/modprobe ${extraUtils}/bin/modprobe \
-            --replace 'ENV{DM_SBIN_PATH}="${pkgs.lvm2}/sbin"' 'ENV{DM_SBIN_PATH}="${extraUtils}/bin"' \
+            --replace ${pkgs.lvm2}/sbin ${extraUtils}/bin \
             --replace /sbin/mdadm ${extraUtils}/bin/mdadm
       done
-      # !!! Remove this after merging the x-updates branch:
 
       # Work around a bug in QEMU, which doesn't implement the "READ
       # DISC INFORMATION" SCSI command:
@@ -260,13 +260,6 @@ let
   };
 
 
-  # The udev configuration file for in the initrd.
-  udevConf = pkgs.writeText "udev-initrd.conf" ''
-    udev_rules="${udevRules}"
-    #udev_log="debug"
-  '';
-
-
   # The init script of boot stage 1 (loading kernel modules for
   # mounting the root FS).
   bootStage1 = pkgs.substituteAll {
@@ -276,7 +269,7 @@ let
 
     isExecutable = true;
 
-    inherit udevConf extraUtils modulesClosure;
+    inherit udevRules extraUtils modulesClosure;
 
     inherit (config.boot) resumeDevice devSize runSize;
 
-- 
GitLab


From 4475294f575865fe7fefb8a8d5c3a94f6141550b Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 14 Aug 2012 16:45:50 -0400
Subject: [PATCH 3939/5331] Fix a hang during shutdown

Subtle: dhcpcd.service would call resolvconf during shutdown, which in
turn would start invalidate-nscd.service, causing the shutdown to be
cancelled.  Instead, give nscd.service a proper reload action, and do
"systemctl reload --no-block nscd.service".  The --no-block is
necessary to prevent that command from waiting until a timeout occurs
(bug in systemd?).
---
 modules/config/networking.nix          |  2 +-
 modules/services/networking/dhcpcd.nix |  3 ++-
 modules/services/system/nscd.nix       | 17 +++++------------
 modules/system/boot/shutdown.nix       |  2 +-
 modules/system/boot/stage-2-init.sh    |  2 +-
 5 files changed, 10 insertions(+), 16 deletions(-)

diff --git a/modules/config/networking.nix b/modules/config/networking.nix
index a91ce9c59e2..5896e9ec9fd 100644
--- a/modules/config/networking.nix
+++ b/modules/config/networking.nix
@@ -67,7 +67,7 @@ in
           '' + optionalString config.services.nscd.enable ''
             # Invalidate the nscd cache whenever resolv.conf is
             # regenerated.
-            libc_restart='${pkgs.systemd}/bin/systemctl start invalidate-nscd.service'
+            libc_restart='${pkgs.systemd}/bin/systemctl reload --no-block nscd.service'
           '' + optionalString config.services.bind.enable ''
             # This hosts runs a full-blown DNS resolver.
             name_servers='127.0.0.1'
diff --git a/modules/services/networking/dhcpcd.nix b/modules/services/networking/dhcpcd.nix
index c1cc22f905c..77d4ac6253c 100644
--- a/modules/services/networking/dhcpcd.nix
+++ b/modules/services/networking/dhcpcd.nix
@@ -92,7 +92,8 @@ in
   config = mkIf config.networking.useDHCP {
 
     jobs.dhcpcd =
-      { startOn = "started network-interfaces";
+      { wantedBy = [ "multi-user.target" ];
+        after = [ "network-interfaces.service" ];
 
         path = [ dhcpcd pkgs.nettools pkgs.openresolv ];
 
diff --git a/modules/services/system/nscd.nix b/modules/services/system/nscd.nix
index 80fa1394aca..d92e4e608b5 100644
--- a/modules/services/system/nscd.nix
+++ b/modules/services/system/nscd.nix
@@ -58,18 +58,11 @@ in
 
         daemonType = "fork";
 
-        serviceConfig = "PIDFile=/run/nscd/nscd.pid";
-      };
-
-    # Flush nscd's ‘hosts’ database when the network comes up or the
-    # system configuration changes to get rid of any negative entries.
-    jobs.invalidate_nscd =
-      { name = "invalidate-nscd";
-        description = "Invalidate NSCD cache";
-        startOn = "ip-up or config-changed";
-        after = [ "nscd.service" ];
-        task = true;
-        exec = "${pkgs.glibc}/sbin/nscd --invalidate hosts";
+        serviceConfig =
+          ''
+            PIDFile=/run/nscd/nscd.pid
+            ExecReload=${pkgs.glibc}/sbin/nscd --invalidate hosts
+          '';
       };
 
   };
diff --git a/modules/system/boot/shutdown.nix b/modules/system/boot/shutdown.nix
index 1335429b669..3fb9545b33f 100644
--- a/modules/system/boot/shutdown.nix
+++ b/modules/system/boot/shutdown.nix
@@ -21,5 +21,5 @@ with pkgs.lib;
           ExecStart=${pkgs.utillinux}/sbin/hwclock --systohc ${if config.time.hardwareClockInLocalTime then "--localtime" else "--utc"}
         '';
     };
-  
+
 }
diff --git a/modules/system/boot/stage-2-init.sh b/modules/system/boot/stage-2-init.sh
index e8b01788900..80aff11b34b 100644
--- a/modules/system/boot/stage-2-init.sh
+++ b/modules/system/boot/stage-2-init.sh
@@ -179,4 +179,4 @@ fi
 echo "starting systemd..."
 PATH=/run/current-system/systemd/lib/systemd \
     MODULE_DIR=/run/current-system/kernel-modules/lib/modules \
-    exec systemd --log-target journal # --log-level debug --crash-shell
+    exec systemd --log-target=journal # --log-level=debug --log-target=console --crash-shell
-- 
GitLab


From 7a7d04af8aa5041eb6c28a4573342b5fbdb7497f Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 14 Aug 2012 17:09:44 -0400
Subject: [PATCH 3940/5331] systemd: Use the kernel modules from
 /run/booted-system

This prevents failures in systemd-modules-load.service like "Failed to
lookup alias 'ipv6': Function not implemented".
---
 modules/system/boot/modprobe.nix    | 8 ++++----
 modules/system/boot/stage-2-init.sh | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/modules/system/boot/modprobe.nix b/modules/system/boot/modprobe.nix
index 03d9222af21..141be71b920 100644
--- a/modules/system/boot/modprobe.nix
+++ b/modules/system/boot/modprobe.nix
@@ -17,8 +17,8 @@ with pkgs.lib;
         text =
           ''
             #! ${pkgs.stdenv.shell}
-            export MODULE_DIR=/var/run/current-system/kernel-modules/lib/modules
-            
+            export MODULE_DIR=/run/current-system/kernel-modules/lib/modules
+
             # Fall back to the kernel modules used at boot time if the
             # modules in the current configuration don't match the
             # running kernel.
@@ -105,8 +105,8 @@ with pkgs.lib;
 
     environment.shellInit =
       ''
-        export MODULE_DIR=/var/run/current-system/kernel-modules/lib/modules
-      '';    
+        export MODULE_DIR=/run/current-system/kernel-modules/lib/modules
+      '';
 
   };
 
diff --git a/modules/system/boot/stage-2-init.sh b/modules/system/boot/stage-2-init.sh
index 80aff11b34b..fd60fa5e59e 100644
--- a/modules/system/boot/stage-2-init.sh
+++ b/modules/system/boot/stage-2-init.sh
@@ -178,5 +178,5 @@ fi
 # Start systemd.
 echo "starting systemd..."
 PATH=/run/current-system/systemd/lib/systemd \
-    MODULE_DIR=/run/current-system/kernel-modules/lib/modules \
+    MODULE_DIR=/run/booted-system/kernel-modules/lib/modules \
     exec systemd --log-target=journal # --log-level=debug --log-target=console --crash-shell
-- 
GitLab


From 9dce4bd9c558722d9ff226de22485546ab27e16d Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 14 Aug 2012 17:22:04 -0400
Subject: [PATCH 3941/5331] Provide start/stop/status aliases as a convenience
 for Upstart users

---
 modules/programs/bash/bashrc.sh | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/modules/programs/bash/bashrc.sh b/modules/programs/bash/bashrc.sh
index 79583a73174..94680bce890 100644
--- a/modules/programs/bash/bashrc.sh
+++ b/modules/programs/bash/bashrc.sh
@@ -46,3 +46,6 @@ alias ls="ls --color=tty"
 alias ll="ls -l"
 alias l="ls -alh"
 alias which="type -P"
+alias start="systemctl start"
+alias stop="systemctl stop"
+alias status="systemctl status"
-- 
GitLab


From a44a7271a8dd4d1fb92c9ea94b276ae266762463 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 14 Aug 2012 17:30:11 -0400
Subject: [PATCH 3942/5331] Warn about Upstart modules with an unknown startOn
 condition

---
 modules/system/upstart/upstart.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/modules/system/upstart/upstart.nix b/modules/system/upstart/upstart.nix
index 92a7add88eb..c31314f1091 100644
--- a/modules/system/upstart/upstart.nix
+++ b/modules/system/upstart/upstart.nix
@@ -59,7 +59,9 @@ let
       after =
         (if job.startOn == "stopped udevtrigger" then [ "systemd-udev-settle.service" ] else
          if job.startOn == "started udev" then [ "systemd-udev.service" ] else
-         []) ++ job.after;
+         if job.startOn == "" || job.startOn == "startup" then [ ] else
+         builtins.trace "Warning: job ‘${job.name}’ has unknown startOn value ‘${job.startOn}’." []
+        ) ++ job.after;
 
       wantedBy =
         (if job.startOn == "" then [ ] else [ "multi-user.target" ]) ++ job.wantedBy;
-- 
GitLab


From 11c3219c1c6895e12c682342c2dd7c6abb9b2e99 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 14 Aug 2012 18:12:16 -0400
Subject: [PATCH 3943/5331] =?UTF-8?q?Remove=20the=20=E2=80=98networking?=
 =?UTF-8?q?=E2=80=99=20job?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Systemd has ‘network.target’ for this purpose.
---
 modules/tasks/network-interfaces.nix | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/modules/tasks/network-interfaces.nix b/modules/tasks/network-interfaces.nix
index 611de13148a..5ff1a83bc81 100644
--- a/modules/tasks/network-interfaces.nix
+++ b/modules/tasks/network-interfaces.nix
@@ -273,15 +273,6 @@ in
           '';
       };
 
-    jobs.networking = {
-      name = "networking";
-      description = "All required interfaces are up";
-      startOn = "started network-interfaces";
-      stopOn  = "stopping network-interfaces";
-      task = true;
-      exec = "true";
-    };
-
     # Set the host name in the activation script.  Don't clear it if
     # it's not configured in the NixOS configuration, since it may
     # have been set by dhclient in the meantime.
-- 
GitLab


From 55b27365663d6761ea5ece113f5c2c26f299b529 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 14 Aug 2012 18:14:16 -0400
Subject: [PATCH 3944/5331] =?UTF-8?q?Add=20a=20target=20=E2=80=98fs.target?=
 =?UTF-8?q?=E2=80=99=20that=20waits=20for=20all=20filesystems?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 modules/system/boot/systemd.nix | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/modules/system/boot/systemd.nix b/modules/system/boot/systemd.nix
index 5f7ea7d3c9b..6cd8b80f22a 100644
--- a/modules/system/boot/systemd.nix
+++ b/modules/system/boot/systemd.nix
@@ -150,6 +150,13 @@ let
       KillSignal=SIGHUP
     '';
 
+  fsTarget =
+    ''
+      [Unit]
+      Description=All File Systems
+      Wants=local-fs.target remote-fs.target
+    '';
+
   makeJobScript = name: content: "${pkgs.writeScriptBin name content}/bin/${name}";
 
   serviceConfig = { name, config, ... }: {
@@ -328,6 +335,7 @@ in
 
     boot.systemd.units =
       { "rescue.service".text = rescueService; }
+      // { "fs.target" = { text = fsTarget; wantedBy = [ "multi-user.target" ]; }; }
       // mapAttrs serviceToUnit cfg.services;
 
   };
-- 
GitLab


From a133eb5991f9f3bf226366ca30ca65e480d467b2 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 14 Aug 2012 18:14:48 -0400
Subject: [PATCH 3945/5331] Add some missing targets

Also make multi-user.target pull in remote-fs.target to mount remote
filesystems.
---
 modules/system/boot/systemd.nix | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/modules/system/boot/systemd.nix b/modules/system/boot/systemd.nix
index 6cd8b80f22a..51b65812b34 100644
--- a/modules/system/boot/systemd.nix
+++ b/modules/system/boot/systemd.nix
@@ -27,6 +27,7 @@ let
       "syslog.target"
       "time-sync.target"
       #"cryptsetup.target"
+      "sigpwr.target"
 
       # Udev.
       "systemd-udevd-control.socket"
@@ -35,6 +36,12 @@ let
       "systemd-udev-settle.service"
       "systemd-udev-trigger.service"
 
+      # Hardware (started by udev when a relevant device is plugged in).
+      "sound.target"
+      "bluetooth.target"
+      "printer.target"
+      "smartcard.target"
+
       # Login stuff.
       "systemd-logind.service"
       "autovt@.service"
@@ -106,6 +113,7 @@ let
       "shutdown.target"
       "umount.target"
       "final.target"
+      "kexec.target"
 
       # Password entry.
       "systemd-ask-password-console.path"
@@ -249,6 +257,7 @@ let
       ln -s ${cfg.defaultUnit} $out/default.target
 
       #ln -s ../getty@tty1.service $out/multi-user.target.wants/
+      ln -s ../remote-fs.target $out/multi-user.target.wants/
     ''; # */
 
 in
-- 
GitLab


From c2b2a3369a000c59e6dba6e29b526eeb2d10ec97 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 14 Aug 2012 18:15:37 -0400
Subject: [PATCH 3946/5331] Fix dependencies of Apache and PostgreSQL

---
 modules/services/databases/postgresql.nix             | 3 ++-
 modules/services/web-servers/apache-httpd/default.nix | 8 ++------
 2 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/modules/services/databases/postgresql.nix b/modules/services/databases/postgresql.nix
index 139a716ae75..69051c29521 100644
--- a/modules/services/databases/postgresql.nix
+++ b/modules/services/databases/postgresql.nix
@@ -153,7 +153,8 @@ in
     jobs.postgresql =
       { description = "PostgreSQL server";
 
-        startOn = "started network-interfaces and filesystem";
+        wantedBy = [ "multi-user.target" ];
+        after = [ "network.target" "fs.target" ];
 
         environment =
           { TZ = config.time.timeZone;
diff --git a/modules/services/web-servers/apache-httpd/default.nix b/modules/services/web-servers/apache-httpd/default.nix
index 2f90c515643..7c13fd32752 100644
--- a/modules/services/web-servers/apache-httpd/default.nix
+++ b/modules/services/web-servers/apache-httpd/default.nix
@@ -581,12 +581,8 @@ in
     jobs.httpd =
       { description = "Apache HTTPD";
 
-        startOn = "started networking and filesystem"
-          # Hacky.  Some subservices depend on Postgres
-          # (e.g. Mediawiki), but they don't have a way to declare
-          # that dependency.  So just start httpd after postgresql if
-          # the latter is enabled.
-          + optionalString config.services.postgresql.enable " and started postgresql";
+        wantedBy = [ "multi-user.target" ];
+        after = [ "network.target" "fs.target" "postgresql.service" ];
 
         path =
           [ httpd pkgs.coreutils pkgs.gnugrep ]
-- 
GitLab


From 981347429a22c86bdade29409b7204fb2dd20a46 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 15 Aug 2012 15:36:54 -0400
Subject: [PATCH 3947/5331] Add support for PartOf dependencies

---
 modules/system/boot/systemd-unit-options.nix | 9 +++++++++
 modules/system/boot/systemd.nix              | 3 ++-
 modules/system/upstart/upstart.nix           | 9 ++++++---
 3 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/modules/system/boot/systemd-unit-options.nix b/modules/system/boot/systemd-unit-options.nix
index ec769ad69f9..9aa9b2b4f3b 100644
--- a/modules/system/boot/systemd-unit-options.nix
+++ b/modules/system/boot/systemd-unit-options.nix
@@ -47,6 +47,15 @@ with pkgs.lib;
       '';
     };
 
+    partOf = mkOption {
+      default = [];
+      types = types.listOf types.string;
+      description = ''
+        If the specified units are stopped or restarted, then this
+        unit is stopped or restarted as well.
+      '';
+    };
+
     wantedBy = mkOption {
       default = [];
       types = types.listOf types.string;
diff --git a/modules/system/boot/systemd.nix b/modules/system/boot/systemd.nix
index 51b65812b34..06019fa2a08 100644
--- a/modules/system/boot/systemd.nix
+++ b/modules/system/boot/systemd.nix
@@ -191,8 +191,9 @@ let
           ''}
           Requires=${concatStringsSep " " def.requires}
           Wants=${concatStringsSep " " def.wants}
-          Before=${concatStringsSep " " def.before}
           After=${concatStringsSep " " def.after}
+          Before=${concatStringsSep " " def.before}
+          PartOf=${concatStringsSep " " def.partOf}
           ${def.unitConfig}
 
           [Service]
diff --git a/modules/system/upstart/upstart.nix b/modules/system/upstart/upstart.nix
index c31314f1091..577efe17065 100644
--- a/modules/system/upstart/upstart.nix
+++ b/modules/system/upstart/upstart.nix
@@ -54,17 +54,20 @@ let
         '';
     in {
 
-      inherit (job) description requires wants before environment path;
+      inherit (job) description requires wants before partOf environment path;
 
       after =
         (if job.startOn == "stopped udevtrigger" then [ "systemd-udev-settle.service" ] else
          if job.startOn == "started udev" then [ "systemd-udev.service" ] else
-         if job.startOn == "" || job.startOn == "startup" then [ ] else
+         if job.startOn == "ip-up" then [] else
+         if job.startOn == "" || job.startOn == "startup" then [] else
          builtins.trace "Warning: job ‘${job.name}’ has unknown startOn value ‘${job.startOn}’." []
         ) ++ job.after;
 
       wantedBy =
-        (if job.startOn == "" then [ ] else [ "multi-user.target" ]) ++ job.wantedBy;
+        (if job.startOn == "" then [] else
+         if job.startOn == "ip-up" then [ "ip-up.target" ] else
+         [ "multi-user.target" ]) ++ job.wantedBy;
 
       serviceConfig =
         ''
-- 
GitLab


From d18c2afc6fa6076274aa8334f8b58e1f4e1cdc8a Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 15 Aug 2012 15:38:52 -0400
Subject: [PATCH 3948/5331] Add an ip-up target for services that require IP
 connectivity

---
 modules/config/networking.nix          |  6 ++++++
 modules/services/networking/dhcpcd.nix |  8 +++++---
 modules/services/networking/ntpd.nix   |  3 ++-
 modules/system/boot/systemd.nix        |  1 +
 modules/tasks/network-interfaces.nix   | 13 +++++++------
 5 files changed, 21 insertions(+), 10 deletions(-)

diff --git a/modules/config/networking.nix b/modules/config/networking.nix
index 5896e9ec9fd..921972093ce 100644
--- a/modules/config/networking.nix
+++ b/modules/config/networking.nix
@@ -75,4 +75,10 @@ in
         target = "resolvconf.conf";
       }
     ];
+
+  boot.systemd.units."ip-up.target".text =
+    ''
+      [Unit]
+      Description=Services Requiring IP Connectivity
+    '';
 }
diff --git a/modules/services/networking/dhcpcd.nix b/modules/services/networking/dhcpcd.nix
index 77d4ac6253c..2767af7200e 100644
--- a/modules/services/networking/dhcpcd.nix
+++ b/modules/services/networking/dhcpcd.nix
@@ -56,9 +56,9 @@ let
           # server hostnames in its config file, then it will never do
           # anything ever again ("couldn't resolve ..., giving up on
           # it"), so we silently lose time synchronisation.
-          ${config.system.build.systemd}/bin/systemctl restart ntpd.service
+          ${config.system.build.systemd}/bin/systemctl try-restart ntpd.service
 
-          #${config.system.build.upstart}/sbin/initctl emit -n ip-up $params
+          ${config.system.build.systemd}/bin/systemctl start ip-up.target
       fi
 
       #if [ "$reason" = EXPIRE -o "$reason" = RELEASE -o "$reason" = NOCARRIER ] ; then
@@ -92,7 +92,9 @@ in
   config = mkIf config.networking.useDHCP {
 
     jobs.dhcpcd =
-      { wantedBy = [ "multi-user.target" ];
+      { description = "DHCP Client";
+
+        wantedBy = [ "multi-user.target" ];
         after = [ "network-interfaces.service" ];
 
         path = [ dhcpcd pkgs.nettools pkgs.openresolv ];
diff --git a/modules/services/networking/ntpd.nix b/modules/services/networking/ntpd.nix
index 7d1db8df066..e9b27268aa1 100644
--- a/modules/services/networking/ntpd.nix
+++ b/modules/services/networking/ntpd.nix
@@ -68,7 +68,8 @@ in
     jobs.ntpd =
       { description = "NTP daemon";
 
-        startOn = "ip-up";
+        wantedBy = [ "ip-up.target" ];
+        partOf = [ "ip-up.target" ];
 
         path = [ ntp ];
 
diff --git a/modules/system/boot/systemd.nix b/modules/system/boot/systemd.nix
index 06019fa2a08..992981f0a36 100644
--- a/modules/system/boot/systemd.nix
+++ b/modules/system/boot/systemd.nix
@@ -259,6 +259,7 @@ let
 
       #ln -s ../getty@tty1.service $out/multi-user.target.wants/
       ln -s ../remote-fs.target $out/multi-user.target.wants/
+      ln -s ../network.target $out/multi-user.target.wants/
     ''; # */
 
 in
diff --git a/modules/tasks/network-interfaces.nix b/modules/tasks/network-interfaces.nix
index 5ff1a83bc81..5302fa82bd4 100644
--- a/modules/tasks/network-interfaces.nix
+++ b/modules/tasks/network-interfaces.nix
@@ -195,10 +195,12 @@ in
 
     security.setuidPrograms = [ "ping" "ping6" ];
 
-    jobs.networkInterfaces =
-      { name = "network-interfaces";
+    jobs."network-interfaces" =
+      { description = "Static Network Interfaces";
 
-        startOn = "stopped udevtrigger";
+        after = [ "systemd-udev-settle.service" ];
+        before = [ "network.target" ];
+        wantedBy = [ "network.target" ];
 
         path = [ pkgs.iproute ];
 
@@ -266,9 +268,8 @@ in
             ${pkgs.stdenv.shell} ${pkgs.writeText "local-net-cmds" cfg.localCommands}
 
             ${optionalString (cfg.interfaces != [] || cfg.localCommands != "") ''
-              # Emit the ip-up event (e.g. to start ntpd).
-              #FIXME
-              #initctl emit -n ip-up
+              # Start the ip-up target (e.g. to start ntpd).
+              ${config.system.build.systemd}/bin/systemctl start ip-up.target
             ''}
           '';
       };
-- 
GitLab


From 0e3f03106f1f3ae039d978c4c307537b293b6fb3 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 15 Aug 2012 17:01:19 -0400
Subject: [PATCH 3949/5331] postgresql.nix: Add an option for overriding the
 PostgreSQL package

---
 modules/services/databases/postgresql.nix | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/modules/services/databases/postgresql.nix b/modules/services/databases/postgresql.nix
index 1633b9d0fdd..398fdbd8611 100644
--- a/modules/services/databases/postgresql.nix
+++ b/modules/services/databases/postgresql.nix
@@ -20,7 +20,7 @@ let
         '';
     };
 
-  postgresql = postgresqlAndPlugins pkgs.postgresql;
+  postgresql = postgresqlAndPlugins cfg.package;
 
   run = "su -s ${pkgs.stdenv.shell} postgres";
 
@@ -54,6 +54,13 @@ in
         '';
       };
 
+      package = mkOption {
+        default = pkgs.postgresql;
+        description = ''
+          PostgreSQL package to use.
+        '';
+      };
+
       port = mkOption {
         default = "5432";
         description = ''
-- 
GitLab


From a025e7e7e287c2539d883bd40a769ae29f9087ff Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 16 Aug 2012 10:47:33 -0400
Subject: [PATCH 3950/5331] Provide a common share between VMs to allow easy
 communication

Every VM now mounts a common SMB share on /tmp/shared.
---
 lib/test-driver/Machine.pm         | 10 +++++++++-
 modules/virtualisation/qemu-vm.nix | 14 ++++++++++++++
 2 files changed, 23 insertions(+), 1 deletion(-)

diff --git a/lib/test-driver/Machine.pm b/lib/test-driver/Machine.pm
index 9018dc589e4..3e6a1c8d158 100644
--- a/lib/test-driver/Machine.pm
+++ b/lib/test-driver/Machine.pm
@@ -8,10 +8,13 @@ use POSIX qw(dup2);
 use FileHandle;
 use Cwd;
 use File::Basename;
+use File::Path qw(make_path);
 
 
 my $showGraphics = defined $ENV{'DISPLAY'};
 
+my $sharedDir;
+
 
 sub new {
     my ($class, $args) = @_;
@@ -40,7 +43,11 @@ sub new {
     }
 
     my $tmpDir = $ENV{'TMPDIR'} || "/tmp";
-    
+    unless (defined $sharedDir) {
+        $sharedDir = $tmpDir . "/xchg-shared";
+        make_path($sharedDir, { mode => 0700, owner => $< });
+    }
+
     my $self = {
         startCommand => $startCommand,
         name => $name,
@@ -123,6 +130,7 @@ sub start {
         dup2(fileno($serialC), fileno(STDOUT));
         dup2(fileno($serialC), fileno(STDERR));
         $ENV{TMPDIR} = $self->{stateDir};
+        $ENV{SHARED_DIR} = $sharedDir;
         $ENV{USE_TMPDIR} = 1;
         $ENV{QEMU_OPTS} =
             "-no-reboot -monitor unix:./monitor -chardev socket,id=shell,path=./shell " .
diff --git a/modules/virtualisation/qemu-vm.nix b/modules/virtualisation/qemu-vm.nix
index 1de8d5b82ed..f71e0ba5112 100644
--- a/modules/virtualisation/qemu-vm.nix
+++ b/modules/virtualisation/qemu-vm.nix
@@ -155,6 +155,14 @@ let
       cd $TMPDIR
       mkdir -p $TMPDIR/xchg
 
+      EXTRA_SAMBA_CONF="
+        [shared]
+          force user = $WHO
+          path = ''${SHARED_DIR:-$TMPDIR/xchg}
+          read only = no
+          guest ok = yes
+      "
+
       ${pkgs.vmTools.startSamba}
 
       # Start QEMU.
@@ -328,6 +336,12 @@ in
         options = "guest,sec=none,noperm,noacl";
         neededForBoot = true;
       }
+      { mountPoint = "/tmp/shared";
+        device = "//10.0.2.4/shared";
+        fsType = "cifs";
+        options = "guest,sec=none,noperm,noacl";
+        neededForBoot = true;
+      }
     ] ++ optional cfg.useBootLoader
       { mountPoint = "/boot";
         device = "/dev/disk/by-label/boot";
-- 
GitLab


From 7e99541afed8951cd27a61c30c419c3b36a60ccf Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 16 Aug 2012 15:37:13 -0400
Subject: [PATCH 3951/5331] Fix initrd for the latest lvm2

---
 modules/system/boot/stage-1.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/modules/system/boot/stage-1.nix b/modules/system/boot/stage-1.nix
index 01ecd839f55..265adf163fc 100644
--- a/modules/system/boot/stage-1.nix
+++ b/modules/system/boot/stage-1.nix
@@ -230,6 +230,7 @@ let
       cp -v ${pkgs.mdadm}/lib/udev/rules.d/*.rules $out/
 
       for i in $out/*.rules; do
+      
           substituteInPlace $i \
             --replace ata_id ${extraUtils}/bin/ata_id \
             --replace usb_id ${extraUtils}/bin/usb_id \
@@ -237,9 +238,10 @@ let
             --replace path_id ${extraUtils}/bin/path_id \
             --replace vol_id ${extraUtils}/bin/vol_id \
             --replace cdrom_id ${extraUtils}/bin/cdrom_id \
+            --replace ${pkgs.utillinux}/sbin/blkid ${extraUtils}/bin/blkid \
             --replace /sbin/blkid ${extraUtils}/bin/blkid \
             --replace /sbin/modprobe ${extraUtils}/bin/modprobe \
-            --replace 'ENV{DM_SBIN_PATH}="${pkgs.lvm2}/sbin"' 'ENV{DM_SBIN_PATH}="${extraUtils}/bin"' \
+            --replace ${pkgs.lvm2}/sbin ${extraUtils}/bin \
             --replace /sbin/mdadm ${extraUtils}/bin/mdadm
       done
       # !!! Remove this after merging the x-updates branch:
-- 
GitLab


From 36f5c97b49281fd1977e301db31dfabd1a0b6914 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 16 Aug 2012 16:34:49 -0400
Subject: [PATCH 3952/5331] Use systemd-udevd instead of udevd

---
 modules/misc/nixpkgs.nix | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/modules/misc/nixpkgs.nix b/modules/misc/nixpkgs.nix
index 3154c3dd1e7..504f30a1a8f 100644
--- a/modules/misc/nixpkgs.nix
+++ b/modules/misc/nixpkgs.nix
@@ -70,4 +70,14 @@ in
     };
 
   };
+
+  config = {
+
+    # FIXME
+    nixpkgs.config.packageOverrides = pkgs: {
+      #udev = pkgs.systemd;
+      lvm2 = pkgs.lvm2.override { udev = pkgs.systemd; };
+    };
+
+  };
 }
-- 
GitLab


From 8e8bad96d4ba613aec38f6143ab9e71a056128b0 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 17 Aug 2012 11:00:14 -0400
Subject: [PATCH 3953/5331] alsa.nix: Add job description

---
 modules/services/audio/alsa.nix | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/modules/services/audio/alsa.nix b/modules/services/audio/alsa.nix
index d16a6794832..8212b3f9fd0 100644
--- a/modules/services/audio/alsa.nix
+++ b/modules/services/audio/alsa.nix
@@ -29,9 +29,9 @@ in
 
       enableOSSEmulation = mkOption {
         default = true;
-	description = ''
-	  Whether to enable ALSA OSS emulation (with certain cards sound mixing may not work!).
-	'';
+        description = ''
+          Whether to enable ALSA OSS emulation (with certain cards sound mixing may not work!).
+        '';
       };
 
     };
@@ -48,7 +48,9 @@ in
     boot.kernelModules = optional config.sound.enableOSSEmulation "snd_pcm_oss";
 
     jobs.alsa =
-      { startOn = "stopped udevtrigger";
+      { description = "ALSA Volume Settings";
+
+        startOn = "stopped udevtrigger";
 
         preStart =
           ''
-- 
GitLab


From 2ce5abaedf40abc537cc1e96c8292341264a643b Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 17 Aug 2012 11:00:33 -0400
Subject: [PATCH 3954/5331] acpid.nix: Fix dependencies

---
 modules/services/hardware/acpid.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/modules/services/hardware/acpid.nix b/modules/services/hardware/acpid.nix
index 303db3816b5..2002df6a303 100644
--- a/modules/services/hardware/acpid.nix
+++ b/modules/services/hardware/acpid.nix
@@ -95,9 +95,10 @@ in
   config = mkIf config.services.acpid.enable {
 
     jobs.acpid =
-      { description = "ACPI daemon";
+      { description = "ACPI Daemon";
 
-        startOn = "stopped udevtrigger and started syslogd";
+        wantedBy = [ "multi-user.target" ];
+        after = [ "systemd-udev-settle.service" ];
 
         path = [ pkgs.acpid ];
 
-- 
GitLab


From f903a3dcc80c4bad08dab1474b76c461c7f668a1 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 17 Aug 2012 11:01:07 -0400
Subject: [PATCH 3955/5331] dhcpcd.nix: Add a reload action for rebinding
 interfaces

---
 modules/services/networking/dhcpcd.nix | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/modules/services/networking/dhcpcd.nix b/modules/services/networking/dhcpcd.nix
index 2767af7200e..54fdf7b81cf 100644
--- a/modules/services/networking/dhcpcd.nix
+++ b/modules/services/networking/dhcpcd.nix
@@ -62,7 +62,7 @@ let
       fi
 
       #if [ "$reason" = EXPIRE -o "$reason" = RELEASE -o "$reason" = NOCARRIER ] ; then
-      #    ${config.system.build.upstart}/sbin/initctl emit -n ip-down $params
+      #    ${config.system.build.systemd}/bin/systemctl start ip-down.target
       #fi
     '';
 
@@ -102,6 +102,11 @@ in
         daemonType = "fork";
 
         exec = "dhcpcd --config ${dhcpcdConf}";
+
+        serviceConfig =
+          ''
+            ExecReload=${dhcpcd}/sbin/dhcpcd --rebind
+          '';
       };
 
     environment.systemPackages = [ dhcpcd ];
@@ -115,8 +120,7 @@ in
     powerManagement.resumeCommands =
       ''
         # Tell dhcpcd to rebind its interfaces if it's running.
-        status="$(${config.system.build.upstart}/sbin/status dhcpcd)"
-        [[ "$status" =~ start/running ]] && ${dhcpcd}/sbin/dhcpcd --rebind
+        ${config.system.build.systemctl}/bin/systemctl reload dhcpcd.service
       '';
 
   };
-- 
GitLab


From 7d958dcdd109f7b9bf1fd0eb335ac2ab3b116fb0 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 17 Aug 2012 11:02:12 -0400
Subject: [PATCH 3956/5331] Drop Upstart references

---
 modules/services/networking/wpa_supplicant.nix | 6 +++---
 modules/services/x11/display-managers/kdm.nix  | 4 ++--
 modules/services/x11/display-managers/slim.nix | 4 ++--
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/modules/services/networking/wpa_supplicant.nix b/modules/services/networking/wpa_supplicant.nix
index 5dc203fd177..c6b7df38fcf 100644
--- a/modules/services/networking/wpa_supplicant.nix
+++ b/modules/services/networking/wpa_supplicant.nix
@@ -45,8 +45,8 @@ in
         description = ''
           The interfaces <command>wpa_supplicant</command> will use.  If empty, it will
           automatically use all wireless interfaces. (Note that auto-detection is currently
-	  broken on Linux 3.4.x kernels. See http://github.com/NixOS/nixos/issues/10 for
-	  further details.)
+          broken on Linux 3.4.x kernels. See http://github.com/NixOS/nixos/issues/10 for
+          further details.)
         '';
       };
 
@@ -122,7 +122,7 @@ in
 
     powerManagement.resumeCommands =
       ''
-        ${config.system.build.upstart}/sbin/restart wpa_supplicant
+        ${config.system.build.systemd}/bin/systemctl try-restart wpa_supplicant
       '';
 
     assertions = [{ assertion = !cfg.userControlled.enable || cfg.interfaces != [];
diff --git a/modules/services/x11/display-managers/kdm.nix b/modules/services/x11/display-managers/kdm.nix
index ec4d033a597..1699ad6343d 100644
--- a/modules/services/x11/display-managers/kdm.nix
+++ b/modules/services/x11/display-managers/kdm.nix
@@ -12,8 +12,8 @@ let
   defaultConfig =
     ''
       [Shutdown]
-      HaltCmd=${config.system.build.upstart}/sbin/halt
-      RebootCmd=${config.system.build.upstart}/sbin/reboot
+      HaltCmd=${config.system.build.systemd}/sbin/halt
+      RebootCmd=${config.system.build.systemd}/sbin/reboot
       ${optionalString (config.system.boot.loader.id == "grub") ''
         BootManager=${if config.boot.loader.grub.version == 2 then "Grub2" else "Grub"}
       ''}
diff --git a/modules/services/x11/display-managers/slim.nix b/modules/services/x11/display-managers/slim.nix
index fc4df80d810..fbd899b9a95 100644
--- a/modules/services/x11/display-managers/slim.nix
+++ b/modules/services/x11/display-managers/slim.nix
@@ -14,8 +14,8 @@ let
       xserver_arguments ${dmcfg.xserverArgs}
       sessions ${pkgs.lib.concatStringsSep "," (dmcfg.session.names ++ ["custom"])}
       login_cmd exec ${pkgs.stdenv.shell} ${dmcfg.session.script} "%session"
-      halt_cmd ${config.system.build.upstart}/sbin/shutdown -h now
-      reboot_cmd ${config.system.build.upstart}/sbin/shutdown -r now
+      halt_cmd ${config.system.build.systemd}/sbin/shutdown -h now
+      reboot_cmd ${config.system.build.systemd}/sbin/shutdown -r now
       ${optionalString (cfg.defaultUser != "") ("default_user " + cfg.defaultUser)}
       ${optionalString cfg.hideCursor "hidecursor true"}
       ${optionalString cfg.autoLogin "auto_login yes"}
-- 
GitLab


From a44e57519627df094657f73c9e475aead2761919 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 17 Aug 2012 13:14:42 -0400
Subject: [PATCH 3957/5331] =?UTF-8?q?switch-to-configuration:=20Respect=20?=
 =?UTF-8?q?the=20=E2=80=98restartIfChanged=E2=80=99=20attribute?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 modules/services/x11/xserver.nix              |  2 +-
 .../activation/switch-to-configuration.pl     | 31 +++++++++++++++----
 modules/system/boot/systemd-unit-options.nix  |  9 ++++++
 modules/system/boot/systemd.nix               |  1 +
 modules/system/upstart/upstart.nix            | 13 +-------
 5 files changed, 37 insertions(+), 19 deletions(-)

diff --git a/modules/services/x11/xserver.nix b/modules/services/x11/xserver.nix
index 5d795e5d57d..5b9cb74169e 100644
--- a/modules/services/x11/xserver.nix
+++ b/modules/services/x11/xserver.nix
@@ -383,7 +383,7 @@ in
       { wantedBy = [ "graphical.target" ];
         after = [ "systemd-udev-settle.service" ];
 
-        #restartIfChanged = false;
+        restartIfChanged = false;
 
         environment =
           { FONTCONFIG_FILE = "/etc/fonts/fonts.conf"; # !!! cleanup
diff --git a/modules/system/activation/switch-to-configuration.pl b/modules/system/activation/switch-to-configuration.pl
index df4c440b97a..a4ca287b420 100644
--- a/modules/system/activation/switch-to-configuration.pl
+++ b/modules/system/activation/switch-to-configuration.pl
@@ -75,12 +75,23 @@ sub parseFstab {
     return %res;
 }
 
+sub parseUnit {
+    my ($filename) = @_;
+    my $info = {};
+    foreach my $line (read_file($filename)) {
+        # FIXME: not quite correct.
+        $line =~ /^([^=]+)=(.*)$/ or next;
+        $info->{$1} = $2;
+    }
+    return $info;
+}
+
 # Forget about previously failed services.
 system("@systemd@/bin/systemctl", "reset-failed");
 
 # Stop all services that no longer exist or have changed in the new
 # configuration.
-my @unitsToStop;
+my (@unitsToStop, @unitsToSkip);
 my $activePrev = getActiveUnits;
 while (my ($unit, $state) = each %{$activePrev}) {
     my $baseUnit = $unit;
@@ -102,11 +113,16 @@ while (my ($unit, $state) = each %{$activePrev}) {
             } elsif ($unit =~ /\.socket$/ || $unit =~ /\.path$/) {
                 # FIXME: do something?
             } else {
-                # Record that this unit needs to be started below.  We
-                # write this to a file to ensure that the service gets
-                # restarted if we're interrupted.
-                write_file($restartListFile, { append => 1 }, "$unit\n");
-                push @unitsToStop, $unit;
+                my $unitInfo = parseUnit($newUnitFile);
+                if ($unitInfo->{'X-RestartIfChanged'} eq "false") {
+                    push @unitsToSkip, $unit;
+                } else {
+                    # Record that this unit needs to be started below.  We
+                    # write this to a file to ensure that the service gets
+                    # restarted if we're interrupted.
+                    write_file($restartListFile, { append => 1 }, "$unit\n");
+                    push @unitsToStop, $unit;
+                }
             }
         }
     }
@@ -159,6 +175,9 @@ if (scalar @unitsToStop > 0) {
     system("@systemd@/bin/systemctl", "stop", "--", @unitsToStop); # FIXME: ignore errors?
 }
 
+print STDERR "NOT restarting the following units: ", join(", ", sort(@unitsToSkip)), "\n"
+    if scalar @unitsToSkip > 0;
+
 # Activate the new configuration (i.e., update /etc, make accounts,
 # and so on).
 my $res = 0;
diff --git a/modules/system/boot/systemd-unit-options.nix b/modules/system/boot/systemd-unit-options.nix
index 9aa9b2b4f3b..f56ee4fc0d3 100644
--- a/modules/system/boot/systemd-unit-options.nix
+++ b/modules/system/boot/systemd-unit-options.nix
@@ -115,6 +115,15 @@ with pkgs.lib;
       '';
     };
 
+    restartIfChanged = mkOption {
+      type = types.bool;
+      default = true;
+      description = ''
+        Whether the service should be restarted during a NixOS
+        configuration switch if its definition has changed.
+      '';
+    };
+
   };
 
 }
\ No newline at end of file
diff --git a/modules/system/boot/systemd.nix b/modules/system/boot/systemd.nix
index 992981f0a36..def5a8bc580 100644
--- a/modules/system/boot/systemd.nix
+++ b/modules/system/boot/systemd.nix
@@ -199,6 +199,7 @@ let
           [Service]
           Environment=PATH=${def.path}
           ${concatMapStrings (n: "Environment=${n}=${getAttr n def.environment}\n") (attrNames def.environment)}
+          ${optionalString (!def.restartIfChanged) "X-RestartIfChanged=false"}
 
           ${optionalString (def.preStart != "") ''
             ExecStartPre=${makeJobScript "${name}-prestart.sh" ''
diff --git a/modules/system/upstart/upstart.nix b/modules/system/upstart/upstart.nix
index 577efe17065..7a498b85439 100644
--- a/modules/system/upstart/upstart.nix
+++ b/modules/system/upstart/upstart.nix
@@ -54,7 +54,7 @@ let
         '';
     in {
 
-      inherit (job) description requires wants before partOf environment path;
+      inherit (job) description requires wants before partOf environment path restartIfChanged;
 
       after =
         (if job.startOn == "stopped udevtrigger" then [ "systemd-udev-settle.service" ] else
@@ -185,15 +185,6 @@ let
       '';
     };
 
-    restartIfChanged = mkOption {
-      type = types.bool;
-      default = true;
-      description = ''
-        Whether the job should be restarted if it has changed after a
-        NixOS configuration switch.
-      '';
-    };
-
     task = mkOption {
       type = types.bool;
       default = false;
@@ -302,8 +293,6 @@ in
 
   config = {
 
-    system.build.upstart = "/no-upstart";
-
     boot.systemd.services =
       flip mapAttrs' config.jobs (name: job:
         nameValuePair "${job.name}.service" job.unit);
-- 
GitLab


From b91aa1599ca6ef40d6deef7ffd736254197c4bea Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 17 Aug 2012 13:32:23 -0400
Subject: [PATCH 3958/5331] sshd.nix: Disable password logins for root by
 default

---
 modules/services/networking/ssh/sshd.nix | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/modules/services/networking/ssh/sshd.nix b/modules/services/networking/ssh/sshd.nix
index 0ef1f09f4d6..76e35250a60 100644
--- a/modules/services/networking/ssh/sshd.nix
+++ b/modules/services/networking/ssh/sshd.nix
@@ -173,14 +173,13 @@ in
       };
 
       permitRootLogin = mkOption {
-        default = "yes";
+        default = "without-password";
         check = permitRootLoginCheck;
         description = ''
           Whether the root user can login using ssh. Valid values are
           <literal>yes</literal>, <literal>without-password</literal>,
           <literal>forced-commands-only</literal> or
           <literal>no</literal>.
-          If without-password doesn't work try <literal>yes</literal>.
         '';
       };
 
-- 
GitLab


From 676157f1e7e822e35a576eba87cc126cf8ae84bd Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 17 Aug 2012 13:42:52 -0400
Subject: [PATCH 3959/5331] slim.nix: Remove the hideCursor option because it
 doesn't work

---
 modules/services/x11/display-managers/slim.nix | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/modules/services/x11/display-managers/slim.nix b/modules/services/x11/display-managers/slim.nix
index fbd899b9a95..68d8c11f830 100644
--- a/modules/services/x11/display-managers/slim.nix
+++ b/modules/services/x11/display-managers/slim.nix
@@ -17,7 +17,6 @@ let
       halt_cmd ${config.system.build.systemd}/sbin/shutdown -h now
       reboot_cmd ${config.system.build.systemd}/sbin/shutdown -r now
       ${optionalString (cfg.defaultUser != "") ("default_user " + cfg.defaultUser)}
-      ${optionalString cfg.hideCursor "hidecursor true"}
       ${optionalString cfg.autoLogin "auto_login yes"}
     '';
 
@@ -76,14 +75,6 @@ in
         '';
       };
 
-      hideCursor = mkOption {
-        default = false;
-        example = true;
-        description = ''
-          Hide the mouse cursor on the login screen.
-        '';
-      };
-
       autoLogin = mkOption {
         default = false;
         example = true;
-- 
GitLab


From 490ce3a230f96a941e81983cdbc168c613034eae Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 17 Aug 2012 13:48:22 -0400
Subject: [PATCH 3960/5331] PAM: Rename ownDevices to startSession

Logind sessions are more generally useful than for device ownership.
For instances, ssh logins can be put in their own session (and thus
their own cgroup).
---
 modules/programs/shadow.nix                   |  2 +-
 modules/security/pam.nix                      | 26 +++++++++----------
 modules/services/networking/ssh/sshd.nix      | 16 +++++++-----
 modules/services/x11/display-managers/kdm.nix |  2 +-
 .../services/x11/display-managers/slim.nix    |  2 +-
 5 files changed, 25 insertions(+), 23 deletions(-)

diff --git a/modules/programs/shadow.nix b/modules/programs/shadow.nix
index a3f837c7367..4b9be460548 100644
--- a/modules/programs/shadow.nix
+++ b/modules/programs/shadow.nix
@@ -90,7 +90,7 @@ in
         { name = "groupmod"; rootOK = true; }
         { name = "groupmems"; rootOK = true; }
         { name = "groupdel"; rootOK = true; }
-        { name = "login"; ownDevices = true; allowNullPassword = true; }
+        { name = "login"; startSession = true; allowNullPassword = true; }
       ];
 
     security.setuidPrograms = [ "passwd" "chfn" "su" "newgrp" ];
diff --git a/modules/security/pam.nix b/modules/security/pam.nix
index 9e8bc02ddf4..049df0f9958 100644
--- a/modules/security/pam.nix
+++ b/modules/security/pam.nix
@@ -41,9 +41,10 @@ let
       # against the keys in the calling user's ~/.ssh/authorized_keys.
       # This is useful for "sudo" on password-less remote systems.
       sshAgentAuth ? false
-    , # If set, use systemd's PAM connector module to claim
-      # ownership of audio devices etc.
-      ownDevices ? false
+    , # If set, the service will register a new session with systemd's
+      # login manager.  If the service is running locally, this will
+      # give the user ownership of audio devices etc.
+      startSession ? false
     , # Whether to forward XAuth keys between users.  Mostly useful
       # for "su".
       forwardXAuth ? false
@@ -103,7 +104,7 @@ let
               "session optional ${pam_ldap}/lib/security/pam_ldap.so"}
           ${optionalString config.krb5.enable
               "session optional ${pam_krb5}/lib/security/pam_krb5.so"}
-          ${optionalString ownDevices
+          ${optionalString startSession
               "session optional ${pkgs.systemd}/lib/security/pam_systemd.so"}
           ${optionalString forwardXAuth
               "session optional pam_xauth.so xauthpath=${pkgs.xorg.xauth}/bin/xauth systemuser=99"}
@@ -150,7 +151,7 @@ in
       default = [];
       example = [
         { name = "chsh"; rootOK = true; }
-        { name = "login"; ownDevices = true; allowNullPassword = true;
+        { name = "login"; startSession = true; allowNullPassword = true;
           limits = [
             { domain = "ftp";
               type   = "hard";
@@ -171,13 +172,13 @@ in
           the name of the service.  The attribute
           <varname>rootOK</varname> specifies whether the root user is
           allowed to use this service without authentication.  The
-          attribute <varname>ownDevices</varname> specifies whether
-          ConsoleKit's PAM connector module should be used to give the
-          user ownership of devices such as audio and CD-ROM drives.
-          The attribute <varname>forwardXAuth</varname> specifies
-          whether X authentication keys should be passed from the
-          calling user to the target user (e.g. for
-          <command>su</command>).
+          attribute <varname>startSession</varname> specifies whether
+          systemd's PAM connector module should be used to start a new
+          session; for local sessions, this will give the user
+          ownership of devices such as audio and CD-ROM drives.  The
+          attribute <varname>forwardXAuth</varname> specifies whether
+          X authentication keys should be passed from the calling user
+          to the target user (e.g. for <command>su</command>).
 
           The attribute <varname>limits</varname> defines resource limits
           that should apply to users or groups for the service.  Each item in
@@ -235,7 +236,6 @@ in
         { name = "i3lock"; }
         { name = "lshd"; }
         { name = "samba"; }
-        { name = "sshd"; }
         { name = "vlock"; }
         { name = "xlock"; }
         { name = "xscreensaver"; }
diff --git a/modules/services/networking/ssh/sshd.nix b/modules/services/networking/ssh/sshd.nix
index 76e35250a60..6ad79ca72a8 100644
--- a/modules/services/networking/ssh/sshd.nix
+++ b/modules/services/networking/ssh/sshd.nix
@@ -39,7 +39,7 @@ let
   );
 
   userOptions = {
-  
+
     openssh.authorizedKeys = {
 
       preserveExistingKeys = mkOption {
@@ -78,7 +78,7 @@ let
       };
 
     };
-    
+
   };
 
   mkAuthkeyScript =
@@ -256,11 +256,11 @@ in
           The set of system-wide known SSH hosts.
         '';
         example = [
-          { 
+          {
             hostNames = [ "myhost" "myhost.mydomain.com" "10.10.1.4" ];
             publicKeyFile = ./pubkeys/myhost_ssh_host_dsa_key.pub;
           }
-          { 
+          {
             hostNames = [ "myhost2" ];
             publicKeyFile = ./pubkeys/myhost2_ssh_host_dsa_key.pub;
           }
@@ -327,7 +327,7 @@ in
             RemainAfterExit=true
           '';
       };
-    
+
     boot.systemd.services."sshd.service" =
       { description = "SSH Daemon";
 
@@ -335,7 +335,7 @@ in
         after = [ "set-ssh-keys.service" ];
 
         path = [ pkgs.openssh ];
-        
+
         environment.LD_LIBRARY_PATH = nssModulesPath;
         environment.LOCALE_ARCHIVE = "/run/current-system/sw/lib/locale/locale-archive";
 
@@ -362,10 +362,12 @@ in
 
     networking.firewall.allowedTCPPorts = cfg.ports;
 
+    security.pam.services = optional cfg.usePAM { name = "sshd"; startSession = true; };
+
     services.openssh.extraConfig =
       ''
         PidFile /run/sshd.pid
-      
+
         Protocol 2
 
         UsePAM ${if cfg.usePAM then "yes" else "no"}
diff --git a/modules/services/x11/display-managers/kdm.nix b/modules/services/x11/display-managers/kdm.nix
index 1699ad6343d..1699f6c65a7 100644
--- a/modules/services/x11/display-managers/kdm.nix
+++ b/modules/services/x11/display-managers/kdm.nix
@@ -111,7 +111,7 @@ in
         logsXsession = true;
       };
 
-    security.pam.services = [ { name = "kde"; allowNullPassword = true; ownDevices = true; } ];
+    security.pam.services = [ { name = "kde"; allowNullPassword = true; startSession = true; } ];
 
     users.extraUsers = singleton
       { name = "kdm";
diff --git a/modules/services/x11/display-managers/slim.nix b/modules/services/x11/display-managers/slim.nix
index 68d8c11f830..bc9aef101c7 100644
--- a/modules/services/x11/display-managers/slim.nix
+++ b/modules/services/x11/display-managers/slim.nix
@@ -106,7 +106,7 @@ in
 
     # Allow null passwords so that the user can login as root on the
     # installation CD.
-    security.pam.services = [ { name = "slim"; allowNullPassword = true; ownDevices = true; } ];
+    security.pam.services = [ { name = "slim"; allowNullPassword = true; startSession = true; } ];
 
   };
 
-- 
GitLab


From c60d6caee8b95bd10353ccc20c602c33e27be7f7 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 17 Aug 2012 14:43:41 -0400
Subject: [PATCH 3961/5331] Rename xserver.service to display-manager.service

The latter is what graphical.target expects.
---
 modules/services/x11/xserver.nix | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/modules/services/x11/xserver.nix b/modules/services/x11/xserver.nix
index 5b9cb74169e..fddffbcf0a6 100644
--- a/modules/services/x11/xserver.nix
+++ b/modules/services/x11/xserver.nix
@@ -379,9 +379,8 @@ in
 
     boot.systemd.defaultUnit = mkIf cfg.autorun "graphical.target";
 
-    boot.systemd.services."xserver.service" =
-      { wantedBy = [ "graphical.target" ];
-        after = [ "systemd-udev-settle.service" ];
+    boot.systemd.services."display-manager.service" =
+      { after = [ "systemd-udev-settle.service" ];
 
         restartIfChanged = false;
 
-- 
GitLab


From 1e5a2bca287f9837d5723b741ca986a211db2f39 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 17 Aug 2012 14:45:43 -0400
Subject: [PATCH 3962/5331] Remove HAL

It's obsolete and we no longer use it.
---
 modules/config/no-x-libs.nix                  |   3 +-
 modules/module-list.nix                       |   1 -
 modules/services/hardware/hal.nix             | 117 ------------------
 .../services/x11/desktop-managers/xfce.nix    |   1 -
 4 files changed, 1 insertion(+), 121 deletions(-)
 delete mode 100644 modules/services/hardware/hal.nix

diff --git a/modules/config/no-x-libs.nix b/modules/config/no-x-libs.nix
index 93635aa667f..f270a3fa431 100644
--- a/modules/config/no-x-libs.nix
+++ b/modules/config/no-x-libs.nix
@@ -7,7 +7,7 @@
       example = true;
       description = ''
         Switch off the options in the default configuration that require X libraries.
-        Currently this includes: ssh X11 forwarding, dbus, hal, fonts.enableCoreFonts,
+        Currently this includes: ssh X11 forwarding, dbus, fonts.enableCoreFonts,
         fonts.enableFontConfig
       '';
     };
@@ -16,7 +16,6 @@
     programs.ssh.setXAuthLocation = false;
     services = {
       dbus.enable = false;
-      hal.enable = false;
     };
     fonts = {
       enableCoreFonts = false;
diff --git a/modules/module-list.nix b/modules/module-list.nix
index a5eb506fcdd..9f3fa0d6fc5 100644
--- a/modules/module-list.nix
+++ b/modules/module-list.nix
@@ -70,7 +70,6 @@
   ./services/games/ghost-one.nix
   ./services/hardware/acpid.nix
   ./services/hardware/bluetooth.nix
-  ./services/hardware/hal.nix
   ./services/hardware/nvidia-optimus.nix
   ./services/hardware/pcscd.nix
   ./services/hardware/pommed.nix
diff --git a/modules/services/hardware/hal.nix b/modules/services/hardware/hal.nix
deleted file mode 100644
index f9fb2dfecef..00000000000
--- a/modules/services/hardware/hal.nix
+++ /dev/null
@@ -1,117 +0,0 @@
-# HAL daemon.
-{ config, pkgs, ... }:
-
-with pkgs.lib;
-
-let
-
-  cfg = config.services.hal;
-
-  inherit (pkgs) hal;
-
-  fdi = pkgs.buildEnv {
-    name = "hal-fdi";
-    pathsToLink = [ "/share/hal/fdi" ];
-    paths = cfg.packages;
-  };
-
-in
-
-{
-
-  ###### interface
-
-  options = {
-
-    services.hal = {
-
-      enable = mkOption {
-        default = false;
-        description = ''
-          Whether to start the HAL daemon.
-        '';
-      };
-
-      packages = mkOption {
-        default = [];
-        description = ''
-          Packages containing additional HAL configuration data.
-        '';
-      };
-
-    };
-
-  };
-
-
-  ###### implementation
-
-  config = mkIf cfg.enable {
-
-    environment.systemPackages = [ hal ];
-
-    services.hal.packages = [ hal pkgs.hal_info ];
-
-    security.policykit.enable = true;
-
-    users.extraUsers = singleton
-      { name = "haldaemon";
-        uid = config.ids.uids.haldaemon;
-        description = "HAL daemon user";
-      };
-
-    users.extraGroups = singleton
-      { name = "haldaemon";
-        gid = config.ids.gids.haldaemon;
-      };
-
-    jobs.hal =
-      { description = "HAL daemon";
-
-        startOn = "started dbus" + optionalString config.services.acpid.enable " and started acpid";
-
-        environment =
-          { # !!! HACK? These environment variables manipulated inside
-            # 'src'/hald/mmap_cache.c are used for testing the daemon.
-            HAL_FDI_SOURCE_PREPROBE = "${fdi}/share/hal/fdi/preprobe";
-            HAL_FDI_SOURCE_INFORMATION = "${fdi}/share/hal/fdi/information";
-            HAL_FDI_SOURCE_POLICY = "${fdi}/share/hal/fdi/policy";
-
-            # Stuff needed by the shell scripts run by HAL (in particular pm-utils).
-            HALD_RUNNER_PATH = concatStringsSep ":"
-              [ "${pkgs.coreutils}/bin"
-                "${pkgs.gnugrep}/bin"
-                "${pkgs.dbus_tools}/bin"
-                "${pkgs.procps}/bin"
-                "${pkgs.procps}/sbin"
-                "${config.system.sbin.modprobe}/sbin"
-                "${pkgs.module_init_tools}/bin"
-                "${pkgs.module_init_tools}/sbin"
-                "${pkgs.kbd}/bin"
-              ];
-          };
-
-        preStart =
-          ''
-            mkdir -m 0755 -p /var/cache/hald
-            mkdir -m 0755 -p /var/run/hald
-
-            rm -f /var/cache/hald/fdi-cache
-          '';
-
-        daemonType = "fork";
-
-        # The `PATH=' works around a bug in HAL: it concatenates
-        # its libexec directory to $PATH, but using a 512-byte
-        # buffer.  So if $PATH is too long it fails.
-        script = "PATH= exec ${hal}/sbin/hald --use-syslog";
-      };
-
-    services.udev.packages = [hal];
-
-    services.dbus.enable = true;
-    services.dbus.packages = [hal];
-
-  };
-
-}
diff --git a/modules/services/x11/desktop-managers/xfce.nix b/modules/services/x11/desktop-managers/xfce.nix
index 753bac47627..3fead2e96cb 100644
--- a/modules/services/x11/desktop-managers/xfce.nix
+++ b/modules/services/x11/desktop-managers/xfce.nix
@@ -89,7 +89,6 @@ in
       '';
 
     # Enable helpful DBus services.
-    services.hal = mkIf (!isXfce48) { enable = true; };
     services.udisks = mkIf isXfce48 { enable = true; };
     services.upower = mkIf (isXfce48 && config.powerManagement.enable) { enable = true; };
 
-- 
GitLab


From 6547ecb72f67a1f59d339a3faf91bb403f87cfc2 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 17 Aug 2012 14:47:37 -0400
Subject: [PATCH 3963/5331] Remove policykit.nix (old PolicyKit module)

Only the HAL module needed it.
---
 modules/module-list.nix        |  1 -
 modules/security/policykit.nix | 80 ----------------------------------
 2 files changed, 81 deletions(-)
 delete mode 100644 modules/security/policykit.nix

diff --git a/modules/module-list.nix b/modules/module-list.nix
index 9f3fa0d6fc5..14cf4f7012c 100644
--- a/modules/module-list.nix
+++ b/modules/module-list.nix
@@ -46,7 +46,6 @@
   ./security/ca.nix
   ./security/pam.nix
   ./security/pam_usb.nix
-  ./security/policykit.nix
   ./security/polkit.nix
   ./security/rtkit.nix
   ./security/setuid-wrappers.nix
diff --git a/modules/security/policykit.nix b/modules/security/policykit.nix
deleted file mode 100644
index 5aa02950f74..00000000000
--- a/modules/security/policykit.nix
+++ /dev/null
@@ -1,80 +0,0 @@
-{ config, pkgs, ... }:
-
-with pkgs.lib;
-
-let
-
-  conf = pkgs.writeText "PolicyKit.conf"
-    ''
-      <?xml version="1.0" encoding="UTF-8"?>
-
-      <!DOCTYPE pkconfig PUBLIC "-//freedesktop//DTD PolicyKit Configuration 1.0//EN"
-        "http://hal.freedesktop.org/releases/PolicyKit/1.0/config.dtd">
-
-      <config version="0.1">
-      </config>
-    '';
-
-in
-
-{
-
-  options = {
-
-    security.policykit.enable = mkOption {
-      default = false;
-      description = "Enable PolicyKit (obsolete).";
-    };
-
-  };
-
-
-  config = mkIf config.security.policykit.enable {
-
-    environment.systemPackages = [ pkgs.policykit ];
-
-    services.dbus.packages = [ pkgs.policykit ];
-
-    security.pam.services = [ { name = "polkit"; } ];
-
-    users.extraUsers = singleton
-      { name = "polkituser";
-        uid = config.ids.uids.polkituser;
-        description = "PolicyKit user";
-      };
-
-    users.extraGroups = singleton
-      { name = "polkituser";
-        gid = config.ids.gids.polkituser;
-      };
-
-    environment.etc =
-      [ { source = conf;
-          target = "PolicyKit/PolicyKit.conf";
-        }
-        { source = (pkgs.buildEnv {
-            name = "PolicyKit-policies";
-            pathsToLink = [ "/share/PolicyKit/policy" ];
-            paths = [ pkgs.policykit pkgs.consolekit pkgs.hal ];
-          }) + "/share/PolicyKit/policy";
-          target = "PolicyKit/policy";
-        }
-      ];
-
-    system.activationScripts.policyKit = stringAfter [ "users" ]
-      ''
-        mkdir -m 0770 -p /var/run/PolicyKit
-        chown root:polkituser /var/run/PolicyKit
-
-        mkdir -m 0770 -p /var/lib/PolicyKit
-        chown root:polkituser /var/lib/PolicyKit
-
-        mkdir -p /var/lib/misc
-        touch /var/lib/misc/PolicyKit.reload
-        chmod 0664 /var/lib/misc/PolicyKit.reload
-        chown polkituser:polkituser /var/lib/misc/PolicyKit.reload
-      '';
-
-  };
-
-}
-- 
GitLab


From 5dc8bc5f2a426ba653eaf14f9d76d4bfe5d0b806 Mon Sep 17 00:00:00 2001
From: Petr Rockai <me@mornfall.net>
Date: Sat, 18 Aug 2012 14:25:09 +0200
Subject: [PATCH 3964/5331] Do not assume that /dev/console can always be
 written.

---
 modules/system/upstart/upstart.nix | 20 +++++---------------
 1 file changed, 5 insertions(+), 15 deletions(-)

diff --git a/modules/system/upstart/upstart.nix b/modules/system/upstart/upstart.nix
index 961b3ad3cba..c5bdd5c66c4 100644
--- a/modules/system/upstart/upstart.nix
+++ b/modules/system/upstart/upstart.nix
@@ -45,9 +45,7 @@ let
           ${optionalString (job.console != "") "console ${job.console}"}
 
           pre-start script
-            ${optionalString (job.console == "") ''
-              exec >> ${log} 2>&1
-            ''}
+            ${optionalString (job.console != "") "echo || "} exec >> ${log} 2>&1
             ln -sfn "$(readlink -f "/etc/init/${job.name}.conf")" /var/run/upstart-jobs/${job.name}
             ${optionalString (job.preStart != "") ''
               source ${jobHelpers}
@@ -60,9 +58,7 @@ let
             else if job.script != "" then
               ''
                 script
-                  ${optionalString (job.console == "") ''
-                    exec >> ${log} 2>&1
-                  ''}
+                  ${optionalString (job.console != "") "echo || "} exec >> ${log} 2>&1
                   source ${jobHelpers}
                   ${job.script}
                 end script
@@ -83,9 +79,7 @@ let
 
           ${optionalString (job.postStart != "") ''
             post-start script
-              ${optionalString (job.console == "") ''
-                exec >> ${log} 2>&1
-              ''}
+              ${optionalString (job.console != "") "echo || "} exec >> ${log} 2>&1
               source ${jobHelpers}
               ${job.postStart}
             end script
@@ -98,9 +92,7 @@ let
              # (upstart 0.6.5, job.c:562)
             optionalString (job.preStop != "") (assert hasMain; ''
             pre-stop script
-              ${optionalString (job.console == "") ''
-                exec >> ${log} 2>&1
-              ''}
+              ${optionalString (job.console != "") "echo || "} exec >> ${log} 2>&1
               source ${jobHelpers}
               ${job.preStop}
             end script
@@ -108,9 +100,7 @@ let
 
           ${optionalString (job.postStop != "") ''
             post-stop script
-              ${optionalString (job.console == "") ''
-                exec >> ${log} 2>&1
-              ''}
+              ${optionalString (job.console != "") "echo || "} exec >> ${log} 2>&1
               source ${jobHelpers}
               ${job.postStop}
             end script
-- 
GitLab


From 16713db4e294689c55c44615754b08576640f6c4 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 20 Aug 2012 16:37:14 +0200
Subject: [PATCH 3965/5331] modules/programs/bash/bashrc.sh: adapt bash
 completion for version 2.0 of the package

---
 modules/programs/bash/bashrc.sh | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/modules/programs/bash/bashrc.sh b/modules/programs/bash/bashrc.sh
index 79583a73174..74550656151 100644
--- a/modules/programs/bash/bashrc.sh
+++ b/modules/programs/bash/bashrc.sh
@@ -31,13 +31,9 @@ fi
 # programmable completion. If we do, and if the current user has
 # installed the package 'bash-completion' in her $HOME/.nix-profile,
 # then completion is enabled automatically.
-if [ -f "$HOME/.nix-profile/etc/bash_completion" ]; then
-    if [ -d "$HOME/.nix-profile/etc/bash_completion.d" ]; then
-        if shopt -q progcomp &>/dev/null; then
-            BASH_COMPLETION_DIR="$HOME/.nix-profile/etc/bash_completion.d"
-            BASH_COMPLETION="$HOME/.nix-profile/etc/bash_completion"
-            . "$BASH_COMPLETION"
-        fi
+if [ -f "$HOME/.nix-profile/etc/profile.d/bash_completion.sh" ]; then
+    if shopt -q progcomp &>/dev/null; then
+        . "$HOME/.nix-profile/etc/profile.d/bash_completion.sh"
     fi
 fi
 
-- 
GitLab


From ebb1781dfc7f961bd5f17b3c827fea085bacc097 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 20 Aug 2012 11:10:19 -0400
Subject: [PATCH 3966/5331] Fix KDE/kdm

---
 modules/services/x11/desktop-managers/kde4.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/services/x11/desktop-managers/kde4.nix b/modules/services/x11/desktop-managers/kde4.nix
index 2f7f62ce416..f4bf0d3f2c6 100644
--- a/modules/services/x11/desktop-managers/kde4.nix
+++ b/modules/services/x11/desktop-managers/kde4.nix
@@ -158,7 +158,7 @@ in
     services.udisks.enable = true;
     services.upower = mkIf config.powerManagement.enable { enable = true; };
 
-    security.pam.services = [ { name = "kde"; allowNullPassword = true; } ];
+    security.pam.services = [ { name = "kde"; allowNullPassword = true; startSession = true; } ];
 
   };
 
-- 
GitLab


From cdc3604a7da4e0ca11a737d986a9ad55e649e117 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 20 Aug 2012 11:11:10 -0400
Subject: [PATCH 3967/5331] kdm: Do a poweroff, not a halt

---
 modules/services/x11/display-managers/kdm.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/services/x11/display-managers/kdm.nix b/modules/services/x11/display-managers/kdm.nix
index 1699f6c65a7..08ae667211d 100644
--- a/modules/services/x11/display-managers/kdm.nix
+++ b/modules/services/x11/display-managers/kdm.nix
@@ -12,8 +12,8 @@ let
   defaultConfig =
     ''
       [Shutdown]
-      HaltCmd=${config.system.build.systemd}/sbin/halt
-      RebootCmd=${config.system.build.systemd}/sbin/reboot
+      HaltCmd=${config.system.build.systemd}/sbin/shutdown -h now
+      RebootCmd=${config.system.build.systemd}/sbin/shutdown -r now
       ${optionalString (config.system.boot.loader.id == "grub") ''
         BootManager=${if config.boot.loader.grub.version == 2 then "Grub2" else "Grub"}
       ''}
-- 
GitLab


From 5408f1ebcd09fa01cddbad02375dd89da8b05bc0 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 20 Aug 2012 11:11:25 -0400
Subject: [PATCH 3968/5331] Build slim without consolekit

---
 modules/misc/nixpkgs.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/modules/misc/nixpkgs.nix b/modules/misc/nixpkgs.nix
index 504f30a1a8f..069bf8ecd9c 100644
--- a/modules/misc/nixpkgs.nix
+++ b/modules/misc/nixpkgs.nix
@@ -76,6 +76,7 @@ in
     # FIXME
     nixpkgs.config.packageOverrides = pkgs: {
       #udev = pkgs.systemd;
+      slim = pkgs.slim.override { consolekit = null; };
       lvm2 = pkgs.lvm2.override { udev = pkgs.systemd; };
     };
 
-- 
GitLab


From 39ec043aea88715c195ba1a2d8a91343f3806cd2 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 20 Aug 2012 11:21:03 -0400
Subject: [PATCH 3969/5331] Typo

---
 modules/services/networking/dhcpcd.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/services/networking/dhcpcd.nix b/modules/services/networking/dhcpcd.nix
index 54fdf7b81cf..6eea947f604 100644
--- a/modules/services/networking/dhcpcd.nix
+++ b/modules/services/networking/dhcpcd.nix
@@ -120,7 +120,7 @@ in
     powerManagement.resumeCommands =
       ''
         # Tell dhcpcd to rebind its interfaces if it's running.
-        ${config.system.build.systemctl}/bin/systemctl reload dhcpcd.service
+        ${config.system.build.systemd}/bin/systemctl reload dhcpcd.service
       '';
 
   };
-- 
GitLab


From 36e05e8dd25810824403f68cef92e3dfe2202cec Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 20 Aug 2012 11:21:11 -0400
Subject: [PATCH 3970/5331] Add some more backward compatibility hacks

---
 modules/system/upstart/upstart.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/modules/system/upstart/upstart.nix b/modules/system/upstart/upstart.nix
index 7a498b85439..c00bc03c66f 100644
--- a/modules/system/upstart/upstart.nix
+++ b/modules/system/upstart/upstart.nix
@@ -59,6 +59,8 @@ let
       after =
         (if job.startOn == "stopped udevtrigger" then [ "systemd-udev-settle.service" ] else
          if job.startOn == "started udev" then [ "systemd-udev.service" ] else
+         if job.startOn == "started network-interfaces" then [ "network-interfaces.service" ] else
+         if job.startOn == "started networking" then [ "network.target" ] else
          if job.startOn == "ip-up" then [] else
          if job.startOn == "" || job.startOn == "startup" then [] else
          builtins.trace "Warning: job ‘${job.name}’ has unknown startOn value ‘${job.startOn}’." []
-- 
GitLab


From 3f4ffffed799730ec7e240575b0e4534a79e17b2 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 20 Aug 2012 11:32:50 -0400
Subject: [PATCH 3971/5331] Fix a Perl warning

---
 modules/system/activation/switch-to-configuration.pl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/system/activation/switch-to-configuration.pl b/modules/system/activation/switch-to-configuration.pl
index a4ca287b420..23fd0d77796 100644
--- a/modules/system/activation/switch-to-configuration.pl
+++ b/modules/system/activation/switch-to-configuration.pl
@@ -114,7 +114,7 @@ while (my ($unit, $state) = each %{$activePrev}) {
                 # FIXME: do something?
             } else {
                 my $unitInfo = parseUnit($newUnitFile);
-                if ($unitInfo->{'X-RestartIfChanged'} eq "false") {
+                if (($unitInfo->{'X-RestartIfChanged'} // "true") eq "false") {
                     push @unitsToSkip, $unit;
                 } else {
                     # Record that this unit needs to be started below.  We
-- 
GitLab


From f3def8194e183c01ce6fc7bbef2688e212a7b128 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 20 Aug 2012 16:19:03 -0400
Subject: [PATCH 3972/5331] switch-to-configuration: Restart all active targets

---
 .../activation/switch-to-configuration.pl     | 38 +++++++++++--------
 1 file changed, 22 insertions(+), 16 deletions(-)

diff --git a/modules/system/activation/switch-to-configuration.pl b/modules/system/activation/switch-to-configuration.pl
index 23fd0d77796..c70a6159fe3 100644
--- a/modules/system/activation/switch-to-configuration.pl
+++ b/modules/system/activation/switch-to-configuration.pl
@@ -86,6 +86,11 @@ sub parseUnit {
     return $info;
 }
 
+sub boolIsTrue {
+    my ($s) = @_;
+    return $s eq "yes" || $s eq "true";
+}
+
 # Forget about previously failed services.
 system("@systemd@/bin/systemctl", "reset-failed");
 
@@ -102,11 +107,18 @@ while (my ($unit, $state) = each %{$activePrev}) {
     if (-e $prevUnitFile && ($state->{state} eq "active" || $state->{state} eq "activating")) {
         if (! -e $newUnitFile) {
             push @unitsToStop, $unit;
+        } elsif ($unit =~ /\.target$/) {
+            # Cause all active target units to be restarted below.
+            # This should start most changed units we stop here as
+            # well as any new dependencies (including new mounts and
+            # swap devices).
+            my $unitInfo = parseUnit($newUnitFile);
+            unless (boolIsTrue($unitInfo->{'RefuseManualStart'} // "false")) {
+                write_file($restartListFile, { append => 1 }, "$unit\n");
+            }
         } elsif (abs_path($prevUnitFile) ne abs_path($newUnitFile)) {
             if ($unit eq "sysinit.target" || $unit eq "basic.target" || $unit eq "multi-user.target" || $unit eq "graphical.target") {
                 # Do nothing.  These cannot be restarted directly.
-            } elsif ($unit =~ /\.target$/) {
-                write_file($restartListFile, { append => 1 }, "$unit\n");
             } elsif ($unit =~ /\.mount$/) {
                 # Reload the changed mount unit to force a remount.
                 write_file($reloadListFile, { append => 1 }, "$unit\n");
@@ -114,7 +126,7 @@ while (my ($unit, $state) = each %{$activePrev}) {
                 # FIXME: do something?
             } else {
                 my $unitInfo = parseUnit($newUnitFile);
-                if (($unitInfo->{'X-RestartIfChanged'} // "true") eq "false") {
+                if (!boolIsTrue($unitInfo->{'X-RestartIfChanged'} // "true")) {
                     push @unitsToSkip, $unit;
                 } else {
                     # Record that this unit needs to be started below.  We
@@ -194,19 +206,13 @@ sub unique {
     return sort(keys(%unique));
 }
 
-# Start the following units:
-# - The default target.  This should start most changed units we
-#   stopped above as well as any new dependencies.
-# - local-fs.target.  This mounts any missing local filesystems.
-# - Changed units we stopped above.  This is necessary because some
-#   may not be dependencies of the default target (i.e., they were
-#   manually started).
-# FIXME: detect units that are symlinks to other units.  We shouldn't
-# start both at the same time because we'll get a "Failed to add path
-# to set" error from systemd.
-my @start = unique(
-    "default.target", "local-fs.target", "swap.target",
-    split('\n', read_file($restartListFile, err_mode => 'quiet') // ""));
+# Start all active targets, as well as changed units we stopped above.
+# The latter is necessary because some may not be dependencies of the
+# targets (i.e., they were manually started).  FIXME: detect units
+# that are symlinks to other units.  We shouldn't start both at the
+# same time because we'll get a "Failed to add path to set" error from
+# systemd.
+my @start = unique("default.target", split('\n', read_file($restartListFile, err_mode => 'quiet') // ""));
 print STDERR "starting the following units: ", join(", ", @start), "\n";
 system("@systemd@/bin/systemctl", "start", "--", @start) == 0 or $res = 4;
 unlink($restartListFile);
-- 
GitLab


From e02b57df9b54380e94a18df7276b1ff3cbe42f06 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 20 Aug 2012 16:19:57 -0400
Subject: [PATCH 3973/5331] Fix the dependencies of the vboxnet0 service

---
 modules/programs/virtualbox.nix | 23 +++++++++++++++--------
 1 file changed, 15 insertions(+), 8 deletions(-)

diff --git a/modules/programs/virtualbox.nix b/modules/programs/virtualbox.nix
index cb293563dfd..27e4ac400da 100644
--- a/modules/programs/virtualbox.nix
+++ b/modules/programs/virtualbox.nix
@@ -10,25 +10,32 @@ let virtualbox = config.boot.kernelPackages.virtualbox; in
   environment.systemPackages = [ virtualbox ];
 
   users.extraGroups = singleton { name = "vboxusers"; };
-  
+
   services.udev.extraRules =
     ''
-      KERNEL=="vboxdrv",    OWNER="root", GROUP="vboxusers", MODE="0660"
-      KERNEL=="vboxnetctl", OWNER="root", GROUP="root",      MODE="0600"
+      KERNEL=="vboxdrv",    OWNER="root", GROUP="vboxusers", MODE="0660", TAG+="systemd"
+      KERNEL=="vboxnetctl", OWNER="root", GROUP="root",      MODE="0600", TAG+="systemd"
     '';
 
   # Since we lack the right setuid binaries, set up a host-only network by default.
-  
-  jobs."create-vboxnet0" =
-    { task = true;
+
+  jobs."vboxnet0" =
+    { description = "VirtualBox vboxnet0 Interface";
+      requires = [ "dev-vboxnetctl.device" ];
+      after = [ "dev-vboxnetctl.device" ];
+      before = [ "network-interfaces.service" ];
+      wantedBy = [ "multi-user.target" ];
       path = [ virtualbox ];
-      startOn = "starting network-interfaces";
-      script =
+      preStart =
         ''
           if ! [ -e /sys/class/net/vboxnet0 ]; then
             VBoxManage hostonlyif create
           fi
         '';
+      postStop =
+        ''
+          VBoxManage hostonlyif remove vboxnet0
+        '';
     };
 
   networking.interfaces = [ { name = "vboxnet0"; ipAddress = "192.168.56.1"; subnetMask = "255.255.255.0"; } ];
-- 
GitLab


From 223f04b3caecf2e52a9ad98abefb2a6f44cd811e Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 21 Aug 2012 11:28:47 -0400
Subject: [PATCH 3974/5331] =?UTF-8?q?Add=20option=20=E2=80=98boot.systemd.?=
 =?UTF-8?q?packages=E2=80=99=20to=20use=20units=20from=20the=20specified?=
 =?UTF-8?q?=20packages?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 modules/system/boot/systemd.nix | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/modules/system/boot/systemd.nix b/modules/system/boot/systemd.nix
index def5a8bc580..2045e702fe9 100644
--- a/modules/system/boot/systemd.nix
+++ b/modules/system/boot/systemd.nix
@@ -250,6 +250,10 @@ let
         ln -s $i/* $out/
       done
 
+      for i in ${toString cfg.packages}; do
+        ln -s $i/etc/systemd/system/* $out/
+      done
+
       ${concatStrings (mapAttrsToList (name: unit:
           concatMapStrings (name2: ''
             mkdir -p $out/${name2}.wants
@@ -288,11 +292,17 @@ in
       };
     };
 
+    boot.systemd.packages = mkOption {
+      default = [];
+      type = types.listOf types.package;
+      description = "Packages providing systemd units.";
+    };
+
     boot.systemd.services = mkOption {
-      description = "Definition of systemd services.";
       default = {};
       type = types.attrsOf types.optionSet;
       options = [ serviceOptions serviceConfig ];
+      description = "Definition of systemd services.";
     };
 
     boot.systemd.defaultUnit = mkOption {
-- 
GitLab


From c2da812bd0148d9a2055e93fa74911e05caf7f83 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 21 Aug 2012 11:29:59 -0400
Subject: [PATCH 3975/5331] Enable upower's systemd unit

---
 modules/misc/nixpkgs.nix             | 2 ++
 modules/services/hardware/upower.nix | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/modules/misc/nixpkgs.nix b/modules/misc/nixpkgs.nix
index 069bf8ecd9c..c8ca959d91a 100644
--- a/modules/misc/nixpkgs.nix
+++ b/modules/misc/nixpkgs.nix
@@ -78,6 +78,8 @@ in
       #udev = pkgs.systemd;
       slim = pkgs.slim.override { consolekit = null; };
       lvm2 = pkgs.lvm2.override { udev = pkgs.systemd; };
+      upower = pkgs.upower.override { useSystemd = true; };
+      polkit = pkgs.polkit.override { useSystemd = true; };
     };
 
   };
diff --git a/modules/services/hardware/upower.nix b/modules/services/hardware/upower.nix
index 1fdaee202d3..d025276ea8e 100644
--- a/modules/services/hardware/upower.nix
+++ b/modules/services/hardware/upower.nix
@@ -35,6 +35,8 @@ with pkgs.lib;
 
     services.udev.packages = [ pkgs.upower ];
 
+    boot.systemd.packages = [ pkgs.upower ];
+
     system.activationScripts.upower =
       ''
         mkdir -m 0755 -p /var/lib/upower
-- 
GitLab


From 0280aa2dc4c6a3cf9ddd84e93242611d4945320c Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 23 Aug 2012 10:23:41 -0400
Subject: [PATCH 3976/5331] Remove the lvm job

There is a generator in lvm2 that takes care of this.
---
 modules/tasks/lvm.nix | 13 -------------
 1 file changed, 13 deletions(-)

diff --git a/modules/tasks/lvm.nix b/modules/tasks/lvm.nix
index 7773a2c79e3..0e0272388c7 100644
--- a/modules/tasks/lvm.nix
+++ b/modules/tasks/lvm.nix
@@ -6,19 +6,6 @@
 
   config = {
 
-    jobs.lvm =
-      { startOn = "started udev or new-devices";
-
-        script =
-          ''
-            # Make all logical volumes on all volume groups available, i.e.,
-            # make them appear in /dev.
-            ${pkgs.lvm2}/sbin/vgchange --available y
-          '';
-
-        task = true;
-      };
-
     environment.systemPackages = [ pkgs.lvm2 ];
 
     services.udev.packages = [ pkgs.lvm2 ];
-- 
GitLab


From cce6e48edf97d919b472fd8fb3c29b1e885e3361 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 23 Aug 2012 10:25:15 -0400
Subject: [PATCH 3977/5331] Don't use consolekit anywhere

---
 modules/misc/nixpkgs.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/modules/misc/nixpkgs.nix b/modules/misc/nixpkgs.nix
index c8ca959d91a..021986bc895 100644
--- a/modules/misc/nixpkgs.nix
+++ b/modules/misc/nixpkgs.nix
@@ -80,6 +80,7 @@ in
       lvm2 = pkgs.lvm2.override { udev = pkgs.systemd; };
       upower = pkgs.upower.override { useSystemd = true; };
       polkit = pkgs.polkit.override { useSystemd = true; };
+      consolekit = null;
     };
 
   };
-- 
GitLab


From b02c488fde15f05008e03dc935184e0ed353656e Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 23 Aug 2012 10:25:27 -0400
Subject: [PATCH 3978/5331] Automatically append ".service" to the name of
 service units

---
 modules/services/logging/syslogd.nix        | 2 +-
 modules/services/misc/nix-daemon.nix        | 2 +-
 modules/services/networking/ssh/sshd.nix    | 4 ++--
 modules/services/x11/xserver.nix            | 2 +-
 modules/system/boot/systemd.nix             | 2 +-
 modules/system/upstart/upstart.nix          | 2 +-
 modules/testing/test-instrumentation.nix    | 2 +-
 modules/virtualisation/virtualbox-guest.nix | 2 +-
 8 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/modules/services/logging/syslogd.nix b/modules/services/logging/syslogd.nix
index a3aff9a30d3..2b7e4a8e44c 100644
--- a/modules/services/logging/syslogd.nix
+++ b/modules/services/logging/syslogd.nix
@@ -105,7 +105,7 @@ in
     services.syslogd.extraParams = optional cfg.enableNetworkInput "-r";
 
     # FIXME: restarting syslog seems to break journal logging.
-    boot.systemd.services."syslog.service" =
+    boot.systemd.services.syslog =
       { description = "Syslog daemon";
       
         requires = [ "syslog.socket" ];
diff --git a/modules/services/misc/nix-daemon.nix b/modules/services/misc/nix-daemon.nix
index 79323287258..cf2d0f52d86 100644
--- a/modules/services/misc/nix-daemon.nix
+++ b/modules/services/misc/nix-daemon.nix
@@ -248,7 +248,7 @@ in
           '';
       };
      
-    boot.systemd.services."nix-daemon.service" =
+    boot.systemd.services."nix-daemon" =
       { description = "Nix Daemon";
 
         path = [ nix pkgs.openssl pkgs.utillinux ]
diff --git a/modules/services/networking/ssh/sshd.nix b/modules/services/networking/ssh/sshd.nix
index 6ad79ca72a8..242129c355e 100644
--- a/modules/services/networking/ssh/sshd.nix
+++ b/modules/services/networking/ssh/sshd.nix
@@ -314,7 +314,7 @@ in
       }
     ];
 
-    boot.systemd.services."set-ssh-keys.service" =
+    boot.systemd.services."set-ssh-keys" =
       { description = "Update authorized SSH keys";
 
         wantedBy = [ "multi-user.target" ];
@@ -328,7 +328,7 @@ in
           '';
       };
 
-    boot.systemd.services."sshd.service" =
+    boot.systemd.services.sshd =
       { description = "SSH Daemon";
 
         wantedBy = [ "multi-user.target" ];
diff --git a/modules/services/x11/xserver.nix b/modules/services/x11/xserver.nix
index fddffbcf0a6..992911ca3c4 100644
--- a/modules/services/x11/xserver.nix
+++ b/modules/services/x11/xserver.nix
@@ -379,7 +379,7 @@ in
 
     boot.systemd.defaultUnit = mkIf cfg.autorun "graphical.target";
 
-    boot.systemd.services."display-manager.service" =
+    boot.systemd.services."display-manager" =
       { after = [ "systemd-udev-settle.service" ];
 
         restartIfChanged = false;
diff --git a/modules/system/boot/systemd.nix b/modules/system/boot/systemd.nix
index 2045e702fe9..918c0571ab4 100644
--- a/modules/system/boot/systemd.nix
+++ b/modules/system/boot/systemd.nix
@@ -358,7 +358,7 @@ in
     boot.systemd.units =
       { "rescue.service".text = rescueService; }
       // { "fs.target" = { text = fsTarget; wantedBy = [ "multi-user.target" ]; }; }
-      // mapAttrs serviceToUnit cfg.services;
+      // mapAttrs' (n: v: nameValuePair "${n}.service" (serviceToUnit n v)) cfg.services;
 
   };
 
diff --git a/modules/system/upstart/upstart.nix b/modules/system/upstart/upstart.nix
index c00bc03c66f..fbbbf72e027 100644
--- a/modules/system/upstart/upstart.nix
+++ b/modules/system/upstart/upstart.nix
@@ -297,7 +297,7 @@ in
 
     boot.systemd.services =
       flip mapAttrs' config.jobs (name: job:
-        nameValuePair "${job.name}.service" job.unit);
+        nameValuePair job.name job.unit);
 
   };
 
diff --git a/modules/testing/test-instrumentation.nix b/modules/testing/test-instrumentation.nix
index facfe29a4b0..efce3153c88 100644
--- a/modules/testing/test-instrumentation.nix
+++ b/modules/testing/test-instrumentation.nix
@@ -11,7 +11,7 @@ let kernel = config.boot.kernelPackages.kernel; in
 
   config = {
 
-    boot.systemd.services."backdoor.service" =
+    boot.systemd.services.backdoor =
       { wantedBy = [ "multi-user.target" ];
         requires = [ "dev-hvc0.device" ];
         after = [ "dev-hvc0.device" ];
diff --git a/modules/virtualisation/virtualbox-guest.nix b/modules/virtualisation/virtualbox-guest.nix
index e864c125176..03234fbb82f 100644
--- a/modules/virtualisation/virtualbox-guest.nix
+++ b/modules/virtualisation/virtualbox-guest.nix
@@ -39,7 +39,7 @@ if (pkgs.stdenv.isi686 || pkgs.stdenv.isx86_64) then
     boot.extraModulePackages = [ kernel.virtualboxGuestAdditions ];
 
     jobs.virtualbox =
-      { description = "VirtualBox service";
+      { description = "VirtualBox Guest Services";
 
         wantedBy = [ "multi-user.target" ];
         requires = [ "dev-vboxguest.device" ];
-- 
GitLab


From 9e5bbee2b108e37a861212b33a8d299a55cd82bd Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 23 Aug 2012 11:08:42 -0400
Subject: [PATCH 3979/5331] Make cpufreq a service instead of a task

Otherwise it will be restarted by switch-to-configuration even when it
hasn't changed.
---
 modules/tasks/cpu-freq.nix | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/modules/tasks/cpu-freq.nix b/modules/tasks/cpu-freq.nix
index 0e0fd502a01..cb64f8ca2a3 100644
--- a/modules/tasks/cpu-freq.nix
+++ b/modules/tasks/cpu-freq.nix
@@ -32,15 +32,12 @@ with pkgs.lib;
 
         startOn = "started udev";
 
-        task = true;
-
-        script = ''
+        preStart = ''
           for i in $(seq 0 $(($(nproc) - 1))); do
             ${pkgs.cpufrequtils}/bin/cpufreq-set -g ${config.powerManagement.cpuFreqGovernor} -c $i
           done
         '';
       };
-      
   };
 
 }
-- 
GitLab


From af550048e83c4b3b24e400c53fca06613f393880 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 23 Aug 2012 11:09:44 -0400
Subject: [PATCH 3980/5331] switch-to-configuration: Don't restart the
 suspend/hibernate targets

Restarting them has the side effect of suspending/hibernating the
system again.
---
 modules/system/activation/switch-to-configuration.pl | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/modules/system/activation/switch-to-configuration.pl b/modules/system/activation/switch-to-configuration.pl
index c70a6159fe3..1d2da3cbf8e 100644
--- a/modules/system/activation/switch-to-configuration.pl
+++ b/modules/system/activation/switch-to-configuration.pl
@@ -111,10 +111,14 @@ while (my ($unit, $state) = each %{$activePrev}) {
             # Cause all active target units to be restarted below.
             # This should start most changed units we stop here as
             # well as any new dependencies (including new mounts and
-            # swap devices).
-            my $unitInfo = parseUnit($newUnitFile);
-            unless (boolIsTrue($unitInfo->{'RefuseManualStart'} // "false")) {
-                write_file($restartListFile, { append => 1 }, "$unit\n");
+            # swap devices).  FIXME: the suspend target is sometimes
+            # active after the system has resumed, which probably
+            # should not be the case.  Just ignore it.
+            if ($unit ne "suspend.target" && $unit ne "hibernate.target") {
+                my $unitInfo = parseUnit($newUnitFile);
+                unless (boolIsTrue($unitInfo->{'RefuseManualStart'} // "false")) {
+                    write_file($restartListFile, { append => 1 }, "$unit\n");
+                }
             }
         } elsif (abs_path($prevUnitFile) ne abs_path($newUnitFile)) {
             if ($unit eq "sysinit.target" || $unit eq "basic.target" || $unit eq "multi-user.target" || $unit eq "graphical.target") {
-- 
GitLab


From dfb6e891b95f0b2d6f446b112c532a95fb629d65 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 23 Aug 2012 11:11:14 -0400
Subject: [PATCH 3981/5331] switch-to-configuration: Don't restart
 systemd-user-sessions.service

Restarting it causes all user sessions to be killed.
---
 modules/system/activation/switch-to-configuration.pl | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/modules/system/activation/switch-to-configuration.pl b/modules/system/activation/switch-to-configuration.pl
index 1d2da3cbf8e..eb5a7a690f0 100644
--- a/modules/system/activation/switch-to-configuration.pl
+++ b/modules/system/activation/switch-to-configuration.pl
@@ -130,7 +130,9 @@ while (my ($unit, $state) = each %{$activePrev}) {
                 # FIXME: do something?
             } else {
                 my $unitInfo = parseUnit($newUnitFile);
-                if (!boolIsTrue($unitInfo->{'X-RestartIfChanged'} // "true")) {
+                if (!boolIsTrue($unitInfo->{'X-RestartIfChanged'} // "true")
+                    || $unit eq "systemd-user-sessions.service")
+                {
                     push @unitsToSkip, $unit;
                 } else {
                     # Record that this unit needs to be started below.  We
-- 
GitLab


From 4c65a5d95cc1641a8b19e6496da8578e8c91a693 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 23 Aug 2012 11:13:33 -0400
Subject: [PATCH 3982/5331] Don't restart agetty

---
 modules/services/ttys/agetty.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/modules/services/ttys/agetty.nix b/modules/services/ttys/agetty.nix
index 1916c13333d..f79962c1365 100644
--- a/modules/services/ttys/agetty.nix
+++ b/modules/services/ttys/agetty.nix
@@ -94,6 +94,8 @@ with pkgs.lib;
         # Some login implementations ignore SIGTERM, so we send SIGHUP
         # instead, to ensure that login terminates cleanly.
         KillSignal=SIGHUP
+
+        X-RestartIfChanged=false
       '';
     
     boot.systemd.units."serial-getty@.service".text =
@@ -127,6 +129,8 @@ with pkgs.lib;
         # Some login implementations ignore SIGTERM, so we send SIGHUP
         # instead, to ensure that login terminates cleanly.
         KillSignal=SIGHUP
+        
+        X-RestartIfChanged=false
       '';
 
     environment.etc = singleton
-- 
GitLab


From e194d41b9cb8e8e7e780f05302b973166a8efd1a Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 23 Aug 2012 12:12:25 -0400
Subject: [PATCH 3983/5331] cpufreq: Don't complain if a CPU doesn't support
 the desired governor

---
 modules/tasks/cpu-freq.nix | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/modules/tasks/cpu-freq.nix b/modules/tasks/cpu-freq.nix
index cb64f8ca2a3..59e74fa6660 100644
--- a/modules/tasks/cpu-freq.nix
+++ b/modules/tasks/cpu-freq.nix
@@ -6,7 +6,7 @@ with pkgs.lib;
   ###### interface
 
   options = {
-  
+
     powerManagement.cpuFreqGovernor = mkOption {
       default = "";
       example = "ondemand";
@@ -17,7 +17,7 @@ with pkgs.lib;
         "userspace".
       '';
     };
-    
+
   };
 
 
@@ -30,11 +30,19 @@ with pkgs.lib;
     jobs.cpufreq =
       { description = "Initialize CPU frequency governor";
 
-        startOn = "started udev";
+        after = [ "systemd-modules-load.service" ];
+        wantedBy = [ "multi-user.target" ];
+
+        path = [ pkgs.cpufrequtils ];
 
         preStart = ''
           for i in $(seq 0 $(($(nproc) - 1))); do
-            ${pkgs.cpufrequtils}/bin/cpufreq-set -g ${config.powerManagement.cpuFreqGovernor} -c $i
+            for gov in $(cpufreq-info -c $i -g); do
+              if [ "$gov" = ${config.powerManagement.cpuFreqGovernor} ]; then
+                echo "<6>setting governor on CPU $i to ‘$gov’"
+                cpufreq-set -c $i -g $gov
+              fi
+            done
           done
         '';
       };
-- 
GitLab


From 8adc1ee92e71239a230e269c36010fff814299d8 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 23 Aug 2012 12:12:58 -0400
Subject: [PATCH 3984/5331] switch-to-configuration: Stop sockets corresponding
 to services

If a service has a corresponding socket unit, then stop the socket
before stopping the service.  This prevents it from being restarted
behind our backs.  Also, don't restart the service; it will be
restarted on demand via the socket.
---
 .../activation/switch-to-configuration.pl     | 56 ++++++++++++++-----
 1 file changed, 42 insertions(+), 14 deletions(-)

diff --git a/modules/system/activation/switch-to-configuration.pl b/modules/system/activation/switch-to-configuration.pl
index eb5a7a690f0..ff083156ca2 100644
--- a/modules/system/activation/switch-to-configuration.pl
+++ b/modules/system/activation/switch-to-configuration.pl
@@ -91,23 +91,27 @@ sub boolIsTrue {
     return $s eq "yes" || $s eq "true";
 }
 
-# Forget about previously failed services.
-system("@systemd@/bin/systemctl", "reset-failed");
-
 # Stop all services that no longer exist or have changed in the new
 # configuration.
 my (@unitsToStop, @unitsToSkip);
 my $activePrev = getActiveUnits;
 while (my ($unit, $state) = each %{$activePrev}) {
     my $baseUnit = $unit;
+
     # Recognise template instances.
     $baseUnit = "$1\@.$2" if $unit =~ /^(.*)@[^\.]*\.(.*)$/;
     my $prevUnitFile = "/etc/systemd/system/$baseUnit";
     my $newUnitFile = "@out@/etc/systemd/system/$baseUnit";
+
+    my $baseName = $baseUnit;
+    $baseName =~ s/\.[a-z]*$//;
+
     if (-e $prevUnitFile && ($state->{state} eq "active" || $state->{state} eq "activating")) {
         if (! -e $newUnitFile) {
             push @unitsToStop, $unit;
-        } elsif ($unit =~ /\.target$/) {
+        }
+
+        elsif ($unit =~ /\.target$/) {
             # Cause all active target units to be restarted below.
             # This should start most changed units we stop here as
             # well as any new dependencies (including new mounts and
@@ -120,7 +124,9 @@ while (my ($unit, $state) = each %{$activePrev}) {
                     write_file($restartListFile, { append => 1 }, "$unit\n");
                 }
             }
-        } elsif (abs_path($prevUnitFile) ne abs_path($newUnitFile)) {
+        }
+
+        elsif (abs_path($prevUnitFile) ne abs_path($newUnitFile)) {
             if ($unit eq "sysinit.target" || $unit eq "basic.target" || $unit eq "multi-user.target" || $unit eq "graphical.target") {
                 # Do nothing.  These cannot be restarted directly.
             } elsif ($unit =~ /\.mount$/) {
@@ -131,14 +137,26 @@ while (my ($unit, $state) = each %{$activePrev}) {
             } else {
                 my $unitInfo = parseUnit($newUnitFile);
                 if (!boolIsTrue($unitInfo->{'X-RestartIfChanged'} // "true")
-                    || $unit eq "systemd-user-sessions.service")
+                    || $unit eq "systemd-user-sessions.service"
+                    || $unit eq "systemd-journald.service")
                 {
                     push @unitsToSkip, $unit;
                 } else {
+                    # If this unit has a corresponding socket unit,
+                    # then stop the socket unit as well, and restart
+                    # the socket instead of the service.
+                    if ($unit =~ /\.service$/ && defined $activePrev->{"$baseName.socket"}) {
+                        push @unitsToStop, "$baseName.socket";
+                        write_file($restartListFile, { append => 1 }, "$baseName.socket\n");
+                    }
+
                     # Record that this unit needs to be started below.  We
                     # write this to a file to ensure that the service gets
                     # restarted if we're interrupted.
-                    write_file($restartListFile, { append => 1 }, "$unit\n");
+                    else {
+                        write_file($restartListFile, { append => 1 }, "$unit\n");
+                    }
+
                     push @unitsToStop, $unit;
                 }
             }
@@ -156,6 +174,17 @@ sub pathToUnitName {
     return $path;
 }
 
+sub unique {
+    my %seen;
+    my @res;
+    foreach my $name (@_) {
+        next if $seen{$name};
+        $seen{$name} = 1;
+        push @res, $name;
+    }
+    return @res;
+}
+
 # Compare the previous and new fstab to figure out which filesystems
 # need a remount or need to be unmounted.  New filesystems are mounted
 # automatically by starting local-fs.target.  Also handles swap
@@ -189,6 +218,7 @@ foreach my $mountPoint (keys %prevFstab) {
 }
 
 if (scalar @unitsToStop > 0) {
+    @unitsToStop = unique(@unitsToStop);
     print STDERR "stopping the following units: ", join(", ", sort(@unitsToStop)), "\n";
     system("@systemd@/bin/systemctl", "stop", "--", @unitsToStop); # FIXME: ignore errors?
 }
@@ -204,14 +234,12 @@ system("@out@/activate", "@out@") == 0 or $res = 2;
 
 # FIXME: Re-exec systemd if necessary.
 
+# Forget about previously failed services.
+system("@systemd@/bin/systemctl", "reset-failed");
+
 # Make systemd reload its units.
 system("@systemd@/bin/systemctl", "daemon-reload") == 0 or $res = 3;
 
-sub unique {
-    my %unique = map { $_, 1 } @_;
-    return sort(keys(%unique));
-}
-
 # Start all active targets, as well as changed units we stopped above.
 # The latter is necessary because some may not be dependencies of the
 # targets (i.e., they were manually started).  FIXME: detect units
@@ -219,7 +247,7 @@ sub unique {
 # same time because we'll get a "Failed to add path to set" error from
 # systemd.
 my @start = unique("default.target", split('\n', read_file($restartListFile, err_mode => 'quiet') // ""));
-print STDERR "starting the following units: ", join(", ", @start), "\n";
+print STDERR "starting the following units: ", join(", ", sort(@start)), "\n";
 system("@systemd@/bin/systemctl", "start", "--", @start) == 0 or $res = 4;
 unlink($restartListFile);
 
@@ -227,7 +255,7 @@ unlink($restartListFile);
 # units.
 my @reload = unique(split '\n', read_file($reloadListFile, err_mode => 'quiet') // "");
 if (scalar @reload > 0) {
-    print STDERR "reloading the following units: ", join(", ", @reload), "\n";
+    print STDERR "reloading the following units: ", join(", ", sort(@reload)), "\n";
     system("@systemd@/bin/systemctl", "reload", "--", @reload) == 0 or $res = 4;
     unlink($reloadListFile);
 }
-- 
GitLab


From 05262ad35d9fb7db15ca097f8c931f6c5b3999fe Mon Sep 17 00:00:00 2001
From: Mathijs Kwik <mathijs@bluescreen303.nl>
Date: Fri, 24 Aug 2012 00:27:07 +0200
Subject: [PATCH 3985/5331] postfix: allow specifying 'virtual' mappings

mainly useful for having a few local addresses (me@host.domain.com) while the majority of
addresses are on the domain (you@domain.com)
---
 modules/services/mail/postfix.nix | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/modules/services/mail/postfix.nix b/modules/services/mail/postfix.nix
index 842427f6d05..3784ae3d39f 100644
--- a/modules/services/mail/postfix.nix
+++ b/modules/services/mail/postfix.nix
@@ -80,6 +80,9 @@ let
 
       recipientDelimiter = ${cfg.recipientDelimiter}
     ''
+    + optionalString (cfg.virtual != "") ''
+      virtual_alias_maps = hash:/etc/postfix/virtual
+    ''
     + cfg.extraConfig;
 
   aliases =
@@ -93,6 +96,7 @@ let
   ;
 
   aliasesFile = pkgs.writeText "postfix-aliases" aliases;
+  virtualFile = pkgs.writeText "postfix-virtual" cfg.virtual;
   mainCfFile = pkgs.writeText "postfix-main.cf" mainCf;
 
 in
@@ -255,6 +259,13 @@ in
         ";
       };
 
+      virtual = mkOption {
+        default = "";
+        description = "
+          Entries for the virtual alias map.
+        ";
+      };
+
     };
 
   };
@@ -338,9 +349,11 @@ in
             ln -sf ${pkgs.postfix}/share/postfix/conf/* /var/postfix/conf
 
             ln -sf ${aliasesFile} /var/postfix/conf/aliases
+            ln -sf ${virtualFile} /var/postfix/conf/virtual
             ln -sf ${mainCfFile} /var/postfix/conf/main.cf
 
             ${pkgs.postfix}/sbin/postalias -c /var/postfix/conf /var/postfix/conf/aliases
+            ${pkgs.postfix}/sbin/postmap -c /var/postfix/conf /var/postfix/conf/virtual
 
             exec ${pkgs.postfix}/sbin/postfix -c /var/postfix/conf start
           ''; # */
-- 
GitLab


From aba9f76105de058a6d0f9b5a11eb6a03a581b296 Mon Sep 17 00:00:00 2001
From: Mathijs Kwik <mathijs@bluescreen303.nl>
Date: Sun, 26 Aug 2012 10:17:22 +0200
Subject: [PATCH 3986/5331] change permission of /run/lock to allow non-root
 access to subdirectories

---
 modules/system/boot/stage-2-init.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/system/boot/stage-2-init.sh b/modules/system/boot/stage-2-init.sh
index f0e04aed179..256792460d0 100644
--- a/modules/system/boot/stage-2-init.sh
+++ b/modules/system/boot/stage-2-init.sh
@@ -133,7 +133,7 @@ if ! mountpoint -q /run; then
     mount -t tmpfs -o "mode=0755,size=@runSize@" none /run
 fi
 
-mkdir -m 0700 -p /run/lock
+mkdir -m 0755 -p /run/lock
 
 
 # For backwards compatibility, symlink /var/run to /run, and /var/lock
-- 
GitLab


From 2769f594f3c073715ecf8d6fc5bfb68a3e1f2888 Mon Sep 17 00:00:00 2001
From: Mathijs Kwik <mathijs@bluescreen303.nl>
Date: Sat, 25 Aug 2012 11:11:37 +0200
Subject: [PATCH 3987/5331] add logcheck module

---
 modules/module-list.nix               |   1 +
 modules/services/logging/logcheck.nix | 138 ++++++++++++++++++++++++++
 2 files changed, 139 insertions(+)
 create mode 100644 modules/services/logging/logcheck.nix

diff --git a/modules/module-list.nix b/modules/module-list.nix
index 697cc60e35e..08927d747ff 100644
--- a/modules/module-list.nix
+++ b/modules/module-list.nix
@@ -80,6 +80,7 @@
   ./services/hardware/udisks.nix
   ./services/hardware/upower.nix
   ./services/logging/klogd.nix
+  ./services/logging/logcheck.nix
   ./services/logging/logrotate.nix
   ./services/logging/logstash.nix
   ./services/logging/syslogd.nix
diff --git a/modules/services/logging/logcheck.nix b/modules/services/logging/logcheck.nix
new file mode 100644
index 00000000000..30a9bf870e9
--- /dev/null
+++ b/modules/services/logging/logcheck.nix
@@ -0,0 +1,138 @@
+{config, pkgs, ...}:
+
+with pkgs.lib;
+
+let
+  cfg = config.services.logcheck;
+
+  rulesDir = pkgs.runCommand "logcheck-rules-dir"
+    {} (
+    ''
+      mkdir $out
+      cp -prd ${pkgs.logcheck}/etc/logcheck/* $out/
+      rm $out/logcheck.*
+    '' + optionalString (! builtins.isNull cfg.extraRulesDir) ''
+      cp -prd ${cfg.extraRulesDir}/* $out/
+    '' );
+
+  configFile = pkgs.writeText "logcheck.conf" cfg.config;
+
+  logFiles = pkgs.writeText "logcheck.logfiles" cfg.files;
+
+  flags = "-r ${rulesDir} -c ${configFile} -L ${logFiles} -${levelFlag} -m ${cfg.mailTo}";
+
+  levelFlag = getAttrFromPath [cfg.level]
+    { "paranoid"    = "p";
+      "server"      = "s";
+      "workstation" = "w";
+    };
+
+  cronJob = ''
+    @reboot   logcheck env PATH=/var/setuid-wrappers:$PATH nice -n10 ${pkgs.logcheck}/sbin/logcheck -R ${flags}
+    2 ${cfg.timeOfDay} * * * logcheck env PATH=/var/setuid-wrappers:$PATH nice -n10 ${pkgs.logcheck}/sbin/logcheck ${flags}
+  '';
+
+in
+{
+  options = {
+    services.logcheck = {
+      enable = mkOption {
+        default = false;
+        type = types.bool;
+        description = ''
+          Enable the logcheck cron job.
+        '';
+      };
+
+      user = mkOption {
+        default = "logcheck";
+        type = types.uniq types.string;
+        description = ''
+          Username for the logcheck user.
+        '';
+      };
+
+      timeOfDay = mkOption {
+        default = "*";
+        example = "6";
+        type = types.uniq types.string;
+        description = ''
+          Time of day to run logcheck. A logcheck will be scheduled at xx:02 each day.
+          Leave default (*) to run every hour. Of course when nothing special was logged,
+          logcheck will be silent.
+        '';
+      };
+
+      mailTo = mkOption {
+        default = "root";
+        example = "you@domain.com";
+        type = types.uniq types.string;
+        description = ''
+          Email address to send reports to.
+        '';
+      };
+
+      level = mkOption {
+        default = "server";
+        type = types.uniq types.string;
+        description = ''
+          Set the logcheck level. Either "workstation", "server", or "paranoid".
+        '';
+      };
+
+      config = mkOption {
+        default = "FQDN=1";
+        type = types.string;
+        description = ''
+          Config options that you would like in logcheck.conf.
+        '';
+      };
+
+      files = mkOption {
+        default = [ "/var/log/messages" ];
+        type = types.listOf types.path;
+        example = [ "/var/log/messages" "/var/log/mail" ];
+        description = ''
+          Which log files to check.
+        '';
+      };
+
+      extraRulesDir = mkOption {
+        default = null;
+        example = "/etc/logcheck";
+        type = types.nullOr types.path;
+        description = ''
+          Directory with extra rules.
+          Will be merged with bundled rules, so it's possible to override certain behaviour.
+        '';
+      };
+
+      extraGroups = mkOption {
+        default = [];
+        type = types.listOf types.string;
+        example = [ "postdrop" "mongodb" ];
+        description = ''
+          Extra groups for the logcheck user, for example to be able to use sendmail,
+          or to access certain log files.
+        '';
+      };
+
+    };
+  };
+
+  config = mkIf cfg.enable {
+    users.extraUsers = singleton
+      { name = cfg.user;
+        shell = "/bin/sh";
+        description = "Logcheck user account";
+        extraGroups = cfg.extraGroups;
+      };
+
+    system.activationScripts.logcheck = ''
+      mkdir -m 700 -p /var/{lib,lock}/logcheck
+      chown ${cfg.user} /var/{lib,lock}/logcheck
+    '';
+
+    services.cron.systemCronJobs = [ cronJob ];
+  };
+}
-- 
GitLab


From 51e58dafca6303a3e98c728b157753d8567bac76 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 28 Aug 2012 16:27:28 +0200
Subject: [PATCH 3988/5331] spamassassin: use a dedicated user for running
 spamd

---
 modules/misc/ids.nix                   | 1 +
 modules/services/mail/spamassassin.nix | 8 +++++++-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/modules/misc/ids.nix b/modules/misc/ids.nix
index bd38b5f9a42..ea28162686e 100644
--- a/modules/misc/ids.nix
+++ b/modules/misc/ids.nix
@@ -73,6 +73,7 @@ in
     fprot = 52;
     bind = 53;
     wwwrun = 54;
+    spamd = 55;
 
     # When adding a uid, make sure it doesn't match an existing gid.
 
diff --git a/modules/services/mail/spamassassin.nix b/modules/services/mail/spamassassin.nix
index 69d3c390bc9..9b387eb940f 100644
--- a/modules/services/mail/spamassassin.nix
+++ b/modules/services/mail/spamassassin.nix
@@ -33,11 +33,17 @@ in
     # Allow users to run 'spamc'.
     environment.systemPackages = [ pkgs.spamassassin ];
 
+    users.extraUsers = singleton
+      { name = "spamd";
+        description = "Spam Assassin Daemon";
+        uid = config.ids.uids.spamd;
+      };
+
     jobs.spamd = {
       description = "Spam Assassin Server";
       startOn = "started networking and filesystem";
       environment.TZ = config.time.timeZone;
-      exec = "${pkgs.spamassassin}/bin/spamd -C /etc/spamassassin/init.pre --siteconfigpath=/etc/spamassassin --debug --pidfile=/var/run/spamd.pid";
+      exec = "${pkgs.spamassassin}/bin/spamd -C /etc/spamassassin/init.pre --siteconfigpath=/etc/spamassassin --username=spamd --pidfile=/var/run/spamd.pid";
     };
 
   };
-- 
GitLab


From d106a8a29646da45617cfc8c20882d14824015a8 Mon Sep 17 00:00:00 2001
From: Mathijs Kwik <mathijs@bluescreen303.nl>
Date: Tue, 28 Aug 2012 00:34:13 +0200
Subject: [PATCH 3989/5331] logcheck: make sure directories are writable during
 merge phase

---
 modules/services/logging/logcheck.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/modules/services/logging/logcheck.nix b/modules/services/logging/logcheck.nix
index 30a9bf870e9..40d736255ec 100644
--- a/modules/services/logging/logcheck.nix
+++ b/modules/services/logging/logcheck.nix
@@ -11,6 +11,7 @@ let
       mkdir $out
       cp -prd ${pkgs.logcheck}/etc/logcheck/* $out/
       rm $out/logcheck.*
+      chmod u+w $out/*
     '' + optionalString (! builtins.isNull cfg.extraRulesDir) ''
       cp -prd ${cfg.extraRulesDir}/* $out/
     '' );
-- 
GitLab


From 0dd46d133544b5fa850540faa5d663cc75aeaf3d Mon Sep 17 00:00:00 2001
From: Mathijs Kwik <mathijs@bluescreen303.nl>
Date: Wed, 29 Aug 2012 22:15:04 +0200
Subject: [PATCH 3990/5331] networking: add options for configuring virtual
 devices (tun/tap)

These are mainly useful for network tunnels (vpn/ipv6) and creating
bridges for virtual machines
---
 modules/tasks/network-interfaces.nix | 33 +++++++++++++++++++++++++++-
 1 file changed, 32 insertions(+), 1 deletion(-)

diff --git a/modules/tasks/network-interfaces.nix b/modules/tasks/network-interfaces.nix
index c12f9b28ca9..e534bf8cc56 100644
--- a/modules/tasks/network-interfaces.nix
+++ b/modules/tasks/network-interfaces.nix
@@ -5,6 +5,7 @@ with pkgs.lib;
 let
 
   cfg = config.networking;
+  hasVirtuals = any (i: i.virtual) cfg.interfaces;
 
 in
 
@@ -119,6 +120,26 @@ in
           '';
         };
 
+        virtual = mkOption {
+          default = false;
+          type = types.bool;
+          description = ''
+            Whether this interface is virtual and should be created by tunctl.
+            This is mainly useful for creating bridges between a host a virtual
+            network such as VPN or a virtual machine.
+
+            Defaults to tap device, unless interface contains "tun" in its name.
+          '';
+        };
+
+        virtualOwner = mkOption {
+          default = "root";
+          type = types.uniq types.string;
+          description = ''
+            In case of a virtual device, the user who owns it.
+          '';
+        };
+
       };
 
     };
@@ -179,7 +200,7 @@ in
 
   config = {
 
-    boot.kernelModules = optional cfg.enableIPv6 "ipv6";
+    boot.kernelModules = optional cfg.enableIPv6 "ipv6" ++ optional hasVirtuals "tun";
 
     environment.systemPackages =
       [ pkgs.host
@@ -191,6 +212,7 @@ in
         pkgs.openresolv
       ]
       ++ optional (cfg.bridges != {}) pkgs.bridge_utils
+      ++ optional hasVirtuals pkgs.tunctl
       ++ optional cfg.enableIPv6 pkgs.ndisc6;
 
     security.setuidPrograms = [ "ping" "ping6" ];
@@ -206,6 +228,15 @@ in
           ''
             set +e # continue in case of errors
 
+            # Create virtual network interfaces
+            ${flip concatMapStrings cfg.interfaces (i:
+              optionalString i.virtual
+                ''
+                  echo "Creating virtual network interface ${i.name}..."
+                  ${pkgs.tunctl}/bin/tunctl -t "${i.name}" -u "${i.virtualOwner}"
+                '')
+            }
+
             # Set MAC addresses of interfaces, if desired.
             ${flip concatMapStrings cfg.interfaces (i:
               optionalString (i.macAddress != "")
-- 
GitLab


From a502ce1128d13aa9dbdaf10b0199c7428c12666a Mon Sep 17 00:00:00 2001
From: Mathijs Kwik <mathijs@bluescreen303.nl>
Date: Wed, 29 Aug 2012 22:17:40 +0200
Subject: [PATCH 3991/5331] networking: add proxy_arp / proxy_ndp options.

proxy_arp (and proxy_ndp for ipv6) can be turned on on a few
interfaces (at least 2).
This is mainly useful for creating pseudo-bridges between a real
interface and a virtual network such as VPN or a virtual machine for
interfaces that don't support real bridging (most wlan interfaces).
As ARP proxying acts slightly above the link-layer, below-ip traffic
isn't bridged, so things like DHCP won't work. The advantage above
using NAT lies in the fact that no IP addresses are shared, so all
hosts are reachable/routeable.
---
 modules/tasks/network-interfaces.nix | 31 ++++++++++++++++++++++++++++
 1 file changed, 31 insertions(+)

diff --git a/modules/tasks/network-interfaces.nix b/modules/tasks/network-interfaces.nix
index e534bf8cc56..4389d6421c5 100644
--- a/modules/tasks/network-interfaces.nix
+++ b/modules/tasks/network-interfaces.nix
@@ -140,6 +140,24 @@ in
           '';
         };
 
+        proxyARP = mkOption {
+          default = false;
+          type = types.bool;
+          description = ''
+            Turn on proxy_arp for this device (and proxy_ndp for ipv6).
+            This is mainly useful for creating pseudo-bridges between a real
+            interface and a virtual network such as VPN or a virtual machine for
+            interfaces that don't support real bridging (most wlan interfaces).
+            As ARP proxying acts slightly above the link-layer, below-ip traffic
+            isn't bridged, so things like DHCP won't work. The advantage above
+            using NAT lies in the fact that no IP addresses are shared, so all
+            hosts are reachable/routeable.
+
+            WARNING: turns on ip-routing, so if you have multiple interfaces, you
+            should think of the consequence and setup firewall rules to limit this.
+          '';
+        };
+
       };
 
     };
@@ -275,6 +293,14 @@ in
                   echo "Configuring interface ${i.name}..."
                   ip addr add "${i.ipAddress}""${optionalString (i.subnetMask != "") ("/" + i.subnetMask)}" \
                     dev "${i.name}"
+                '' +
+              optionalString i.proxyARP
+                ''
+                  echo 1 > /proc/sys/net/ipv4/conf/${i.name}/proxy_arp
+                '' +
+              optionalString (i.proxyARP && cfg.enableIPv6)
+                ''
+                  echo 1 > /proc/sys/net/ipv6/conf/${i.name}/proxy_ndp
                 '')
             }
 
@@ -293,6 +319,11 @@ in
                 ip route add default via "${cfg.defaultGateway}"
             ''}
 
+            # turn on forwarding if any interface has enabled proxy_arp
+            ${optionalString (any (i: i.proxyARP) cfg.interfaces) ''
+              echo 1 > /proc/sys/net/ipv4/ip_forward
+            ''}
+
             # Run any user-specified commands.
             ${pkgs.stdenv.shell} ${pkgs.writeText "local-net-cmds" cfg.localCommands}
 
-- 
GitLab


From bce1cdd59cbc3e7572c3b7f09e9d17d96de23df4 Mon Sep 17 00:00:00 2001
From: Mathijs Kwik <mathijs@bluescreen303.nl>
Date: Thu, 30 Aug 2012 18:31:45 +0200
Subject: [PATCH 3992/5331] fix kernel 3.4+ early cifs mounting (qemu-vm
 target)

kernel 3.4+ needs cifs-utils to mount CIFS filesystems.
the kernel itself (and busybox's cifs mount code) are no longer able
to do this in some/most cases and will error out saying:
"CIFS VFS: connecting to DFS root not implemented yet"

Nixos' qemu-vm target is hurt by this, as it wants to mount /nix/store
via cifs very early in the boot process.

This commit makes sure the initrd for affected kernels is built with
cifs-utils if needed.
---
 modules/system/boot/stage-1.nix | 21 ++++++++++++++++++++-
 1 file changed, 20 insertions(+), 1 deletion(-)

diff --git a/modules/system/boot/stage-1.nix b/modules/system/boot/stage-1.nix
index 265adf163fc..d7925c0f7d3 100644
--- a/modules/system/boot/stage-1.nix
+++ b/modules/system/boot/stage-1.nix
@@ -121,6 +121,20 @@ let
   enableSplashScreen =
     config.boot.vesa && config.boot.initrd.enableSplashScreen && kernelPackages.splashutils != null;
 
+  needsCifsUtils = kernelPackages.kernel ? features
+                && kernelPackages.kernel.features ? needsCifsUtils
+                && kernelPackages.kernel.features.needsCifsUtils
+                && any (fs: fs.fsType == "cifs") fileSystems;
+
+  busybox = if needsCifsUtils
+            then pkgs.busybox.override {
+                   extraConfig = ''
+                     CONFIG_FEATURE_MOUNT_CIFS n
+                     CONFIG_FEATURE_MOUNT_HELPERS y
+                   '';
+                 }
+            else pkgs.busybox;
+
 
   # Some additional utilities needed in stage 1, like mount, lvm, fsck
   # etc.  We don't want to bring in all of those packages, so we just
@@ -146,7 +160,7 @@ let
       cp -pv ${pkgs.gcc.gcc}/lib*/libgcc_s.so.* $out/lib
 
       # Copy BusyBox.
-      cp -rvd ${pkgs.busybox}/{bin,sbin} $out/
+      cp -rvd ${busybox}/{bin,sbin} $out/
       chmod -R u+w $out
 
       # Copy some utillinux stuff.
@@ -175,6 +189,11 @@ let
         cp ${kernelPackages.splashutils}/${kernelPackages.splashutils.helperName} $out/bin/splash_helper
       ''}
 
+      # Maybe copy cifs utils
+      ${optionalString needsCifsUtils ''
+        cp -v ${pkgs.cifs_utils}/sbin/mount.cifs $out/bin
+      ''}
+
       ${config.boot.initrd.extraUtilsCommands}
 
       # Strip binaries further than normal.
-- 
GitLab


From e0e0e57c2624944ab534aba84becef9ae3b5f6ad Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 30 Aug 2012 21:11:36 -0400
Subject: [PATCH 3993/5331] Fix the OpenVPN jobs

---
 modules/services/networking/openvpn.nix | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/modules/services/networking/openvpn.nix b/modules/services/networking/openvpn.nix
index c057bda5033..12808e2ee27 100644
--- a/modules/services/networking/openvpn.nix
+++ b/modules/services/networking/openvpn.nix
@@ -11,8 +11,8 @@ let
   makeOpenVPNJob = cfg: name:
     let
 
-      path = (getAttr "openvpn-${name}" config.jobs).path;
-    
+      path = (getAttr "openvpn-${name}" config.boot.systemd.services).path;
+
       upScript = ''
         #! /bin/sh
         exec > /var/log/openvpn-${name}-up 2>&1
@@ -28,17 +28,17 @@ let
             fi
           fi
         done
-        
+
         ${cfg.up}
       '';
-      
+
       downScript = ''
         #! /bin/sh
         exec > /var/log/openvpn-${name}-down 2>&1
         export PATH=${path}
         ${cfg.down}
       '';
-      
+
       configFile = pkgs.writeText "openvpn-config-${name}"
         ''
           ${optionalString (cfg.up != "" || cfg.down != "") "script-security 2"}
@@ -46,7 +46,7 @@ let
           ${optionalString (cfg.up != "") "up ${pkgs.writeScript "openvpn-${name}-up" upScript}"}
           ${optionalString (cfg.down != "") "down ${pkgs.writeScript "openvpn-${name}-down" downScript}"}
         '';
-        
+
     in {
       description = "OpenVPN instance ‘${name}’";
 
@@ -76,7 +76,7 @@ in
       default = {};
 
       example = {
-      
+
         server = {
           config = ''
             # Simplest server configuration: http://openvpn.net/index.php/documentation/miscellaneous/static-key-mini-howto.html.
@@ -88,7 +88,7 @@ in
           up = "ip route add ...";
           down = "ip route del ...";
         };
-        
+
         client = {
           config = ''
             client
@@ -103,7 +103,7 @@ in
           up = "echo nameserver $nameserver | ${pkgs.openresolv}/sbin/resolvconf -m 0 -a $dev";
           down = "${pkgs.openresolv}/sbin/resolvconf -d $dev";
         };
-        
+
       };
 
       description = ''
@@ -116,7 +116,7 @@ in
       '';
 
       type = types.attrsOf types.optionSet;
-      
+
       options =  {
 
         config = mkOption {
@@ -158,9 +158,9 @@ in
     jobs = listToAttrs (mapAttrsFlatten (name: value: nameValuePair "openvpn-${name}" (makeOpenVPNJob value name)) cfg.servers);
 
     environment.systemPackages = [ openvpn ];
-    
+
     boot.kernelModules = [ "tun" ];
-    
+
   };
 
 }
-- 
GitLab


From 4be367ec47fac9397bc329f5d404a6f7748bee67 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Mon, 3 Sep 2012 10:35:45 -0400
Subject: [PATCH 3994/5331] Damn NixOS lack of laziness...

---
 modules/hardware/network/b43.nix | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/modules/hardware/network/b43.nix b/modules/hardware/network/b43.nix
index 077e0a1e11e..caf40f68058 100644
--- a/modules/hardware/network/b43.nix
+++ b/modules/hardware/network/b43.nix
@@ -22,9 +22,11 @@ let kernelVersion = config.boot.kernelPackages.kernel.version; in
   ###### implementation
 
   config = pkgs.lib.mkIf config.networking.enableB43Firmware {
-    hardware.firmware = if builtins.lessThan (builtins.compareVersions kernelVersion "3.2") 0 then
-      throw "b43 firmware for kernels older than 3.2 not packaged yet!" else
-      [ pkgs.b43Firmware_5_1_138 ];
+    assertions = [ {
+      assertion = builtins.lessThan (builtins.compareVersions kernelVersion "3.2") 0;
+      message = "b43 firmware for kernels older than 3.2 not packaged yet!";
+    } ];
+    hardware.firmware = [ pkgs.b43Firmware_5_1_138 ];
   };
 
 }
-- 
GitLab


From f701e8d420c1a0114239bab3b9196a2c98f6f813 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Mon, 3 Sep 2012 12:11:07 -0400
Subject: [PATCH 3995/5331] d'oh

---
 modules/hardware/network/b43.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/hardware/network/b43.nix b/modules/hardware/network/b43.nix
index caf40f68058..8f45bd4d3f1 100644
--- a/modules/hardware/network/b43.nix
+++ b/modules/hardware/network/b43.nix
@@ -23,7 +23,7 @@ let kernelVersion = config.boot.kernelPackages.kernel.version; in
 
   config = pkgs.lib.mkIf config.networking.enableB43Firmware {
     assertions = [ {
-      assertion = builtins.lessThan (builtins.compareVersions kernelVersion "3.2") 0;
+      assertion = builtins.lessThan 0 (builtins.compareVersions kernelVersion "3.2");
       message = "b43 firmware for kernels older than 3.2 not packaged yet!";
     } ];
     hardware.firmware = [ pkgs.b43Firmware_5_1_138 ];
-- 
GitLab


From 27880ed729d4b38a8076f74c0f511b42e7ea1138 Mon Sep 17 00:00:00 2001
From: Rob Vermaas <rob.vermaas@gmail.com>
Date: Thu, 6 Sep 2012 12:31:15 +0200
Subject: [PATCH 3996/5331] Change logstash job startOn attribute to include
 networking

---
 modules/services/logging/logstash.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/modules/services/logging/logstash.nix b/modules/services/logging/logstash.nix
index bb3b83dd230..f4c226ac349 100644
--- a/modules/services/logging/logstash.nix
+++ b/modules/services/logging/logstash.nix
@@ -141,6 +141,7 @@ in
 
     jobs.logstash = with pkgs; {
       description = "Logstash daemon";
+      startOn = "started networking and filesystem";
 
       path = [ jre ];
 
-- 
GitLab


From f7530dc5ee6b4a0118ff7456511fc2aa4693695c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Fri, 7 Sep 2012 10:58:53 +0200
Subject: [PATCH 3997/5331] avahi: Never set `host-name' to the empty string in
 `avahi-daemon.conf'.

---
 modules/services/networking/avahi-daemon.nix | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/modules/services/networking/avahi-daemon.nix b/modules/services/networking/avahi-daemon.nix
index 791109dcda2..3603d677837 100644
--- a/modules/services/networking/avahi-daemon.nix
+++ b/modules/services/networking/avahi-daemon.nix
@@ -11,7 +11,13 @@ let
 
   avahiDaemonConf = with cfg; pkgs.writeText "avahi-daemon.conf" ''
     [server]
-    host-name=${hostName}
+    ${# Users can set `networking.hostName' to the empty string, when getting
+      # a host name from DHCP.  In that case, let Avahi take whatever the
+      # current host name is; setting `host-name' to the empty string in
+      # `avahi-daemon.conf' would be invalid.
+      if hostName != ""
+      then "host-name=${hostName}"
+      else ""}
     browse-domains=${concatStringsSep ", " browseDomains}
     use-ipv4=${if ipv4 then "yes" else "no"}
     use-ipv6=${if ipv6 then "yes" else "no"}
-- 
GitLab


From b53842df3e8fbbc97293bb58d23d8b87dae890fb Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 11 Sep 2012 10:55:56 -0400
Subject: [PATCH 3998/5331] Don't set the passno field for tmpfs and other FSs
 that have no device

If passno is set, then systemd will instantiate a systemd-fsck unit,
which in turn will instantiate a <device>.device unit
(e.g. "none.device").  Since no such device exists, mounting will
fail.  So don't set passno.
---
 modules/tasks/filesystems.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/tasks/filesystems.nix b/modules/tasks/filesystems.nix
index 8eaf77330a3..ab58c0757b6 100644
--- a/modules/tasks/filesystems.nix
+++ b/modules/tasks/filesystems.nix
@@ -15,7 +15,7 @@ let
           + " " + fs.fsType
           + " " + fs.options
           + " 0"
-          + " " + (if fs.fsType == "none" || fs.fsType == "btrfs" || fs.noCheck then "0" else
+          + " " + (if fs.fsType == "none" || fs.device == "none" || fs.fsType == "btrfs" || fs.fsType == "tmpfs" || fs.noCheck then "0" else
                    if fs.mountPoint == "/" then "1" else "2")
           + "\n"
       )}
-- 
GitLab


From ad65e807bd2870f64b3eb7137f1140a827732897 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 11 Sep 2012 18:44:37 +0200
Subject: [PATCH 3999/5331] Add new 'hardware.cpu.amd.updateMicrocode' option.

---
 modules/hardware/cpu/amd-microcode.nix | 29 ++++++++++++++++++++++++++
 modules/module-list.nix                |  1 +
 2 files changed, 30 insertions(+)
 create mode 100644 modules/hardware/cpu/amd-microcode.nix

diff --git a/modules/hardware/cpu/amd-microcode.nix b/modules/hardware/cpu/amd-microcode.nix
new file mode 100644
index 00000000000..2b224e04f2d
--- /dev/null
+++ b/modules/hardware/cpu/amd-microcode.nix
@@ -0,0 +1,29 @@
+{ config, pkgs, ... }:
+
+with pkgs.lib;
+
+{
+
+  ###### interface
+
+  options = {
+
+    hardware.cpu.amd.updateMicrocode = mkOption {
+      default = false;
+      type = types.bool;
+      description = ''
+        Update the CPU microcode for Amd processors.
+      '';
+    };
+
+  };
+
+
+  ###### implementation
+
+  config = mkIf config.hardware.cpu.amd.updateMicrocode {
+    hardware.firmware = [ pkgs.amdUcode ];
+    boot.kernelModules = [ "microcode" ];
+  };
+
+}
diff --git a/modules/module-list.nix b/modules/module-list.nix
index 08927d747ff..1d40a4145ae 100644
--- a/modules/module-list.nix
+++ b/modules/module-list.nix
@@ -16,6 +16,7 @@
   ./config/users-groups.nix
   ./hardware/all-firmware.nix
   ./hardware/cpu/intel-microcode.nix
+  ./hardware/cpu/amd-microcode.nix
   ./hardware/network/b43.nix
   ./hardware/network/intel-2100bg.nix
   ./hardware/network/intel-2200bg.nix
-- 
GitLab


From 75583c7984ec2f45c3275f5fb753782f324244d1 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 14 Sep 2012 13:23:19 -0400
Subject: [PATCH 4000/5331] nixos-rebuild: Support --option

---
 modules/installer/tools/nixos-rebuild.sh | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/modules/installer/tools/nixos-rebuild.sh b/modules/installer/tools/nixos-rebuild.sh
index 72661cf4773..e21a34f996c 100644
--- a/modules/installer/tools/nixos-rebuild.sh
+++ b/modules/installer/tools/nixos-rebuild.sh
@@ -36,10 +36,10 @@ Options:
 Various nix-build options are also accepted, in particular:
 
   --show-trace           show a detailed stack trace for evaluation errors
- 
+
 Environment variables affecting nixos-rebuild:
 
-  \$NIX_PATH              Nix expression search path 
+  \$NIX_PATH              Nix expression search path
   \$NIXOS_CONFIG          path to the NixOS system configuration specification
 EOF
     exit 1
@@ -85,6 +85,11 @@ while test "$#" -gt 0; do
         j="$1"; shift 1
         extraBuildFlags="$extraBuildFlags $i $j"
         ;;
+      --option)
+        j="$1"; shift 1
+        k="$1"; shift 1
+        extraBuildFlags="$extraBuildFlags $i $j $k"
+        ;;
       --fast)
         buildNix=
         extraBuildFlags="$extraBuildFlags --show-trace"
@@ -202,7 +207,7 @@ fi
 if test "$action" = switch -o "$action" = boot -o "$action" = test; then
     # Just in case the new configuration hangs the system, do a sync now.
     sync
-    
+
     $pathToConfig/bin/switch-to-configuration "$action"
 fi
 
-- 
GitLab


From d12dd340b61b331653c3e166059121a51f906152 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 18 Sep 2012 17:20:46 -0400
Subject: [PATCH 4001/5331] firewall.nix: Respect networking.enableIPv6 = false

Reported-by: Pablo Costa <modulistic@gmail.com>
---
 modules/services/networking/firewall.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/modules/services/networking/firewall.nix b/modules/services/networking/firewall.nix
index 64cfcef124a..a72ba796773 100644
--- a/modules/services/networking/firewall.nix
+++ b/modules/services/networking/firewall.nix
@@ -33,7 +33,9 @@ let
       # Helper command to manipulate both the IPv4 and IPv6 tables.
       ip46tables() {
         iptables "$@"
-        ip6tables "$@"
+        ${optionalString config.networking.enableIPv6 ''
+          ip6tables "$@"
+        ''}
       }
     '';
 
-- 
GitLab


From 83c6b1cf3a4c68c2c15a346bdc17ddb4ebc3f16a Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 18 Sep 2012 18:12:39 -0400
Subject: [PATCH 4002/5331] Set $LOCALE_ARCHIVE in systemd services

Systemd sets locale variables like $LANG when running services, so
$LOCALE_ARCHIVE should also be set to prevent warnings like "perl:
warning: Setting locale failed.".
---
 modules/system/boot/stage-2-init.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/modules/system/boot/stage-2-init.sh b/modules/system/boot/stage-2-init.sh
index 79d332690b9..f1eb73a8f88 100644
--- a/modules/system/boot/stage-2-init.sh
+++ b/modules/system/boot/stage-2-init.sh
@@ -179,4 +179,5 @@ fi
 echo "starting systemd..."
 PATH=/run/current-system/systemd/lib/systemd \
     MODULE_DIR=/run/booted-system/kernel-modules/lib/modules \
+    LOCALE_ARCHIVE=/run/current-system/sw/lib/locale/locale-archive \
     exec systemd --log-target=journal # --log-level=debug --log-target=console --crash-shell
-- 
GitLab


From 0de3a0cff3853b4eda76f608d8ada9bd5ac6d379 Mon Sep 17 00:00:00 2001
From: Rickard Nilsson <rickynils@gmail.com>
Date: Fri, 14 Sep 2012 00:39:11 +0200
Subject: [PATCH 4003/5331] nscd-invalidate: Invalidate passwd and group
 databases also

I had some problems with LDAP user lookups not working properly
at boot. I found that invalidating passwd and group on the
ip-up event (when nscd-invalidate starts) helped a bit.
---
 modules/services/system/nscd.nix | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/modules/services/system/nscd.nix b/modules/services/system/nscd.nix
index 6f35cd30f58..ca5ac428a9d 100644
--- a/modules/services/system/nscd.nix
+++ b/modules/services/system/nscd.nix
@@ -64,7 +64,12 @@ in
         description = "Invalidate NSCD cache";
         startOn = "ip-up or config-changed";
         task = true;
-        exec = "${pkgs.glibc}/sbin/nscd --invalidate hosts";
+        path = [ pkgs.glibc ];
+        exec = ''
+          nscd --invalidate=passwd
+          nscd --invalidate=group
+          nscd --invalidate=hosts
+        '';
       };
 
   };
-- 
GitLab


From 1e666c10fa45bacfaa137e3810801e61c7266c3f Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 20 Sep 2012 16:54:46 -0400
Subject: [PATCH 4004/5331] Get rid of the last use of mkThenElse

---
 modules/services/monitoring/nagios/default.nix | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/modules/services/monitoring/nagios/default.nix b/modules/services/monitoring/nagios/default.nix
index 6d2fe3f2ace..ddb0da21327 100644
--- a/modules/services/monitoring/nagios/default.nix
+++ b/modules/services/monitoring/nagios/default.nix
@@ -184,12 +184,7 @@ in
           '';
       };
 
-    services.httpd = mkIf cfg.enableWebInterface {
-      extraConfig = mkThenElse {
-        thenPart = extraHttpdConfig;
-        elsePart = "";
-      };
-    };
+    services.httpd.extraConfig = optionalString cfg.enableWebInterface extraHttpdConfig;
 
   };
 
-- 
GitLab


From d4af6edd5e49cf69cb2eae06699b4edd74b0657c Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 20 Sep 2012 17:51:44 -0400
Subject: [PATCH 4005/5331] firewall.nix: Allow specifying trusted network
 interfaces

Trusted network interfaces (such as "lo") will accept any incoming
traffic.
---
 modules/services/networking/firewall.nix | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/modules/services/networking/firewall.nix b/modules/services/networking/firewall.nix
index a72ba796773..e6ae725f85f 100644
--- a/modules/services/networking/firewall.nix
+++ b/modules/services/networking/firewall.nix
@@ -98,6 +98,15 @@ in
         '';
     };
 
+    networking.firewall.trustedInterfaces = mkOption {
+      type = types.list types.string;
+      description =
+        ''
+          Traffic coming in from these interfaces will be accepted
+          unconditionally.
+        '';
+    };
+
     networking.firewall.allowedTCPPorts = mkOption {
       default = [];
       example = [ 22 80 ];
@@ -155,6 +164,8 @@ in
   # holds).
   config = mkIf cfg.enable {
 
+    networking.firewall.trustedInterfaces = [ "lo" ];
+
     environment.systemPackages = [ pkgs.iptables ];
 
     boot.kernelModules = [ "nf_conntrack_ftp" ];
@@ -222,8 +233,10 @@ in
             # The "nixos-fw" chain does the actual work.
             ip46tables -N nixos-fw
 
-            # Accept all traffic on the loopback interface.
-            ip46tables -A nixos-fw -i lo -j nixos-fw-accept
+            # Accept all traffic on the trusted interfaces.
+            ${flip concatMapStrings cfg.trustedInterfaces (iface: ''
+              ip46tables -A nixos-fw -i ${iface} -j nixos-fw-accept
+            '')}
 
             # Accept packets from established or related connections.
             ip46tables -A nixos-fw -m conntrack --ctstate ESTABLISHED,RELATED -j nixos-fw-accept
-- 
GitLab


From 1da16a5ea112182ffc2d83ee6c42c1b70f96226d Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 21 Sep 2012 12:25:35 +0200
Subject: [PATCH 4006/5331] modules/services/mail/dovecot2.nix: log via syslog
 instead of writing a separate file

---
 modules/services/mail/dovecot2.nix | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/modules/services/mail/dovecot2.nix b/modules/services/mail/dovecot2.nix
index c5f5da41d31..14355f51e3d 100644
--- a/modules/services/mail/dovecot2.nix
+++ b/modules/services/mail/dovecot2.nix
@@ -40,13 +40,8 @@ let
         driver = pam
         args = dovecot2
       }
-      #auth_debug = yes
-      #auth_verbose = yes
-      #debug_log_path = /tmp/dovecot2debug.log
 
       pop3_uidl_format = %08Xv%08Xu
-
-      log_path = /var/log/dovecot2.log
     '';
 
   confFile = pkgs.writeText "dovecot.conf" dovecotConf;
-- 
GitLab


From 155495deb2ada2eda99fa4bf809830a0b506e51d Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 21 Sep 2012 12:26:53 +0200
Subject: [PATCH 4007/5331] modules/services/mail/dovecot2.nix: accept plain
 text authentication only over secure channels when TLS is available

Connects from 'localhost' are always considered secure.
---
 modules/services/mail/dovecot2.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/modules/services/mail/dovecot2.nix b/modules/services/mail/dovecot2.nix
index 14355f51e3d..2054b80d0b1 100644
--- a/modules/services/mail/dovecot2.nix
+++ b/modules/services/mail/dovecot2.nix
@@ -17,6 +17,7 @@ let
       ssl_cert_file = ${cfg.sslServerCert}
       ssl_key_file = ${cfg.sslServerKey}
       ssl_ca_file = ${cfg.sslCACert}
+      disable_plaintext_auth = yes
     '' else ''
       ssl = no
       disable_plaintext_auth = no
-- 
GitLab


From 0573c7fcae7cc06da38895ea3d7b2ca7526720f3 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 21 Sep 2012 12:28:49 +0200
Subject: [PATCH 4008/5331] modules/services/mail/dovecot2.nix: update syntax
 for SSL config options

---
 modules/services/mail/dovecot2.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/modules/services/mail/dovecot2.nix b/modules/services/mail/dovecot2.nix
index 2054b80d0b1..c1f21ba457f 100644
--- a/modules/services/mail/dovecot2.nix
+++ b/modules/services/mail/dovecot2.nix
@@ -14,9 +14,9 @@ let
     ''
     + (if cfg.sslServerCert!="" then
     ''
-      ssl_cert_file = ${cfg.sslServerCert}
-      ssl_key_file = ${cfg.sslServerKey}
-      ssl_ca_file = ${cfg.sslCACert}
+      ssl_cert = <${cfg.sslServerCert}
+      ssl_key = <${cfg.sslServerKey}
+      ssl_ca = <${cfg.sslCACert}
       disable_plaintext_auth = yes
     '' else ''
       ssl = no
-- 
GitLab


From 4476b875fc0d4b1a59b1f4ab7194fd15ae620921 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 21 Sep 2012 16:04:46 +0200
Subject: [PATCH 4009/5331] Add services.dovecot2.extraConfig option to
 configure arbitrary settings for which NixOS has no direct support.

---
 modules/services/mail/dovecot2.nix | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/modules/services/mail/dovecot2.nix b/modules/services/mail/dovecot2.nix
index c1f21ba457f..fc97e0d3ad0 100644
--- a/modules/services/mail/dovecot2.nix
+++ b/modules/services/mail/dovecot2.nix
@@ -43,7 +43,7 @@ let
       }
 
       pop3_uidl_format = %08Xv%08Xu
-    '';
+    '' + cfg.extraConfig;
 
   confFile = pkgs.writeText "dovecot.conf" dovecotConf;
 
@@ -72,6 +72,12 @@ in
         description = "Dovecot group name.";
       };
 
+      extraConfig = mkOption {
+        default = "";
+        example = "mail_debug = yes";
+        description = "Additional entries to put verbatim into Dovecot's config file.";
+      };
+
       mailLocation = mkOption {
         default = "maildir:/var/spool/mail/%u"; /* Same as inbox, as postfix */
         example = "maildir:~/mail:INBOX=/var/spool/mail/%u";
-- 
GitLab


From 600d43ba9326cee88cd2b3fedcb62cee4dd06a51 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 21 Sep 2012 11:03:07 -0400
Subject: [PATCH 4010/5331] Drop xfce-4.6 compatibility

---
 modules/services/x11/desktop-managers/xfce.nix | 14 ++++----------
 1 file changed, 4 insertions(+), 10 deletions(-)

diff --git a/modules/services/x11/desktop-managers/xfce.nix b/modules/services/x11/desktop-managers/xfce.nix
index 753bac47627..d06eb23b8e9 100644
--- a/modules/services/x11/desktop-managers/xfce.nix
+++ b/modules/services/x11/desktop-managers/xfce.nix
@@ -7,8 +7,6 @@ let
   xcfg = config.services.xserver;
   cfg = xcfg.desktopManager.xfce;
 
-  isXfce48 = pkgs.xfce ? libxfce4ui;
-
 in
 
 {
@@ -45,8 +43,7 @@ in
       };
 
     environment.systemPackages =
-      [
-        pkgs.gtk # To get GTK+'s themes.
+      [ pkgs.gtk # To get GTK+'s themes.
         pkgs.hicolor_icon_theme
         pkgs.shared_mime_info
         pkgs.which # Needed by the xfce's xinitrc script.
@@ -70,8 +67,6 @@ in
         # "utilities-terminal" and "accessories-text-editor".
         pkgs.gnome.gnomeicontheme
         pkgs.desktop_file_utils
-      ]
-      ++ optionals isXfce48 [
         pkgs.xfce.libxfce4ui
         pkgs.xfce.garcon
         pkgs.xfce.thunar_volman
@@ -83,15 +78,14 @@ in
     environment.pathsToLink =
       [ "/share/xfce4" "/share/themes" "/share/mime" "/share/desktop-directories" ];
 
-    environment.shellInit = optionalString isXfce48
+    environment.shellInit =
       ''
         export GIO_EXTRA_MODULES=${pkgs.xfce.gvfs}/lib/gio/modules
       '';
 
     # Enable helpful DBus services.
-    services.hal = mkIf (!isXfce48) { enable = true; };
-    services.udisks = mkIf isXfce48 { enable = true; };
-    services.upower = mkIf (isXfce48 && config.powerManagement.enable) { enable = true; };
+    services.udisks.enable = true;
+    services.upower.enable = config.powerManagement.enable;
 
   };
 
-- 
GitLab


From 4fa9b4b2579566bd17b63c19be3700ba95746a95 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 21 Sep 2012 14:58:28 -0400
Subject: [PATCH 4011/5331] Restart systemd if necessary

---
 modules/system/activation/switch-to-configuration.pl | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/modules/system/activation/switch-to-configuration.pl b/modules/system/activation/switch-to-configuration.pl
index ff083156ca2..6542b48c54e 100644
--- a/modules/system/activation/switch-to-configuration.pl
+++ b/modules/system/activation/switch-to-configuration.pl
@@ -232,7 +232,11 @@ my $res = 0;
 print STDERR "activating the configuration...\n";
 system("@out@/activate", "@out@") == 0 or $res = 2;
 
-# FIXME: Re-exec systemd if necessary.
+# Restart systemd if necessary.
+if (abs_path("/proc/1/exe") ne abs_path("@systemd@/lib/systemd/systemd")) {
+    print STDERR "restarting systemd...\n";
+    system("@systemd@/bin/systemctl", "daemon-reexec") == 0 or $res = 2;
+}
 
 # Forget about previously failed services.
 system("@systemd@/bin/systemctl", "reset-failed");
-- 
GitLab


From 1ad655bdcf49ac078119ba866e0f6d5977e0320c Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 21 Sep 2012 22:56:13 -0400
Subject: [PATCH 4012/5331] Don't join the cpuset controller with cpu/cpuacct

This works around the problem described here:

http://lists.freedesktop.org/archives/systemd-devel/2012-September/006648.html
---
 modules/system/boot/systemd.nix | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/modules/system/boot/systemd.nix b/modules/system/boot/systemd.nix
index 918c0571ab4..d8b5ee45c7e 100644
--- a/modules/system/boot/systemd.nix
+++ b/modules/system/boot/systemd.nix
@@ -340,6 +340,13 @@ in
       [ { source = units;
           target = "systemd/system";
         }
+        { source = pkgs.writeText "systemd.conf"
+            ''
+              [Manager]
+              JoinControllers=cpu,cpuacct net_cls,netprio
+            '';
+          target = "systemd/system.conf";
+        }
         { source = pkgs.writeText "journald.conf"
             ''
               [Journal]
-- 
GitLab


From b8f09be5e0ad79e552e3715565851cb5b34579e9 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 22 Sep 2012 12:51:58 +0200
Subject: [PATCH 4013/5331] Remove service for dovecot version 1.x.

---
 modules/module-list.nix           |   1 -
 modules/services/mail/dovecot.nix | 130 ------------------------------
 2 files changed, 131 deletions(-)
 delete mode 100644 modules/services/mail/dovecot.nix

diff --git a/modules/module-list.nix b/modules/module-list.nix
index 1d40a4145ae..656adcf04b7 100644
--- a/modules/module-list.nix
+++ b/modules/module-list.nix
@@ -85,7 +85,6 @@
   ./services/logging/logrotate.nix
   ./services/logging/logstash.nix
   ./services/logging/syslogd.nix
-  ./services/mail/dovecot.nix
   ./services/mail/dovecot2.nix
   ./services/mail/freepops.nix
   ./services/mail/mail.nix
diff --git a/modules/services/mail/dovecot.nix b/modules/services/mail/dovecot.nix
deleted file mode 100644
index ff41c8f4302..00000000000
--- a/modules/services/mail/dovecot.nix
+++ /dev/null
@@ -1,130 +0,0 @@
-{ config, pkgs, ... }:
-
-with pkgs.lib;
-
-let
-
-  cfg = config.services.dovecot;
-
-  dovecotConf =
-    ''
-      base_dir = /var/run/dovecot/
-
-      protocols = imap imaps pop3 pop3s
-    ''
-    + (if cfg.sslServerCert!="" then
-    ''
-      ssl_cert_file = ${cfg.sslServerCert}
-      ssl_key_file = ${cfg.sslServerKey}
-      ssl_ca_file = ${cfg.sslCACert}
-    '' else ''
-      ssl_disable = yes
-      disable_plaintext_auth = no
-    '')
-
-    + ''
-      login_user = ${cfg.user}
-      login_chroot = no
-
-      mail_location = maildir:/var/spool/mail/%u
-
-      maildir_copy_with_hardlinks = yes
-
-      auth default {
-        mechanisms = plain login
-        userdb passwd {
-        }
-        passdb pam {
-        }
-        user = root
-      }
-      auth_debug = yes
-      auth_verbose = yes
-
-      pop3_uidl_format = %08Xv%08Xu
-
-      log_path = /var/log/dovecot.log
-    '';
-
-  confFile = pkgs.writeText "dovecot.conf" dovecotConf;
-
-in
-
-{
-
-  ###### interface
-
-  options = {
-
-    services.dovecot = {
-
-      enable = mkOption {
-        default = false;
-        description = "Whether to enable the Dovecot POP3/IMAP server.";
-      };
-
-      user = mkOption {
-        default = "dovecot";
-        description = "Dovecot user name.";
-      };
-
-      group = mkOption {
-        default = "dovecot";
-        description = "Dovecot group name.";
-      };
-
-      sslServerCert = mkOption {
-        default = "";
-        description = "Server certificate";
-      };
-
-      sslCACert = mkOption {
-        default = "";
-        description = "CA certificate used by the server certificate.";
-      };
-
-      sslServerKey = mkOption {
-        default = "";
-        description = "Server key.";
-      };
-
-    };
-
-  };
-
-
-  ###### implementation
-
-  config = mkIf config.services.dovecot.enable {
-
-    security.pam.services = [ { name = "dovecot"; } ];
-
-    users.extraUsers = singleton
-      { name = cfg.user;
-        uid = config.ids.uids.dovecot;
-        description = "Dovecot user";
-        group = cfg.group;
-      };
-
-    users.extraGroups = singleton
-      { name = cfg.group;
-        gid = config.ids.gids.dovecot;
-      };
-
-    jobs.dovecot =
-      { description = "Dovecot IMAP/POP3 server";
-
-        startOn = "started networking";
-
-        preStart =
-          ''
-            ${pkgs.coreutils}/bin/mkdir -p /var/run/dovecot /var/run/dovecot/login
-            ${pkgs.coreutils}/bin/chown -R ${cfg.user}:${cfg.group} /var/run/dovecot
-          '';
-
-        exec = "${pkgs.dovecot}/sbin/dovecot -F -c ${confFile}";
-      };
-
-  };
-
-}
-- 
GitLab


From 00e19c91e59d2c3244f6f3bd6d048941e7ddafab Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 23 Sep 2012 12:21:34 +0200
Subject: [PATCH 4014/5331] postfix: add option 'extraMasterConf' to extend the
 default master.cf file

---
 modules/services/mail/postfix.nix | 53 +++++++++++++++++++++++++++++--
 1 file changed, 50 insertions(+), 3 deletions(-)

diff --git a/modules/services/mail/postfix.nix b/modules/services/mail/postfix.nix
index 3784ae3d39f..ea887ea8e19 100644
--- a/modules/services/mail/postfix.nix
+++ b/modules/services/mail/postfix.nix
@@ -85,6 +85,45 @@ let
     ''
     + cfg.extraConfig;
 
+  masterCf = ''
+    # ==========================================================================
+    # service type  private unpriv  chroot  wakeup  maxproc command + args
+    #               (yes)   (yes)   (yes)   (never) (100)
+    # ==========================================================================
+    smtp      inet  n       -       n       -       -       smtpd
+    #submission inet n       -       n       -       -       smtpd
+    #  -o smtpd_tls_security_level=encrypt
+    #  -o smtpd_sasl_auth_enable=yes
+    #  -o smtpd_client_restrictions=permit_sasl_authenticated,reject
+    #  -o milter_macro_daemon_name=ORIGINATING
+    pickup    fifo  n       -       n       60      1       pickup
+    cleanup   unix  n       -       n       -       0       cleanup
+    qmgr      fifo  n       -       n       300     1       qmgr
+    tlsmgr    unix  -       -       n       1000?   1       tlsmgr
+    rewrite   unix  -       -       n       -       -       trivial-rewrite
+    bounce    unix  -       -       n       -       0       bounce
+    defer     unix  -       -       n       -       0       bounce
+    trace     unix  -       -       n       -       0       bounce
+    verify    unix  -       -       n       -       1       verify
+    flush     unix  n       -       n       1000?   0       flush
+    proxymap  unix  -       -       n       -       -       proxymap
+    proxywrite unix -       -       n       -       1       proxymap
+    smtp      unix  -       -       n       -       -       smtp
+    relay     unix  -       -       n       -       -       smtp
+    	      -o smtp_fallback_relay=
+    #       -o smtp_helo_timeout=5 -o smtp_connect_timeout=5
+    showq     unix  n       -       n       -       -       showq
+    error     unix  -       -       n       -       -       error
+    retry     unix  -       -       n       -       -       error
+    discard   unix  -       -       n       -       -       discard
+    local     unix  -       n       n       -       -       local
+    virtual   unix  -       n       n       -       -       virtual
+    lmtp      unix  -       -       n       -       -       lmtp
+    anvil     unix  -       -       n       -       1       anvil
+    scache    unix  -       -       n       -       1       scache
+    ${cfg.extraMasterConf}
+  '';
+
   aliases =
     optionalString (cfg.postmasterAlias != "") ''
       postmaster: ${cfg.postmasterAlias}
@@ -98,6 +137,7 @@ let
   aliasesFile = pkgs.writeText "postfix-aliases" aliases;
   virtualFile = pkgs.writeText "postfix-virtual" cfg.virtual;
   mainCfFile = pkgs.writeText "postfix-main.cf" mainCf;
+  masterCfFile = pkgs.writeText "postfix-master.cf" masterCf;
 
 in
 
@@ -232,7 +272,7 @@ in
       extraConfig = mkOption {
         default = "";
         description = "
-          Extra configuration, will be added verbatim to the configuration file.
+          Extra lines to be added verbatim to the main.cf configuration file.
         ";
       };
 
@@ -266,6 +306,12 @@ in
         ";
       };
 
+      extraMasterConf = mkOption {
+        default = "";
+        example = "submission inet n - n - - smtpd";
+        description = "Extra lines to append to the generated master.cf file.";
+      };
+
     };
 
   };
@@ -346,17 +392,18 @@ in
             ${pkgs.coreutils}/bin/chown root:root /var/spool/mail
             ${pkgs.coreutils}/bin/chmod a+rwxt /var/spool/mail
 
-            ln -sf ${pkgs.postfix}/share/postfix/conf/* /var/postfix/conf
+            ln -sf "${pkgs.postfix}/share/postfix/conf/"* /var/postfix/conf
 
             ln -sf ${aliasesFile} /var/postfix/conf/aliases
             ln -sf ${virtualFile} /var/postfix/conf/virtual
             ln -sf ${mainCfFile} /var/postfix/conf/main.cf
+            ln -sf ${masterCfFile} /var/postfix/conf/master.cf
 
             ${pkgs.postfix}/sbin/postalias -c /var/postfix/conf /var/postfix/conf/aliases
             ${pkgs.postfix}/sbin/postmap -c /var/postfix/conf /var/postfix/conf/virtual
 
             exec ${pkgs.postfix}/sbin/postfix -c /var/postfix/conf start
-          ''; # */
+          '';
 
         preStop = ''
             exec ${pkgs.postfix}/sbin/postfix -c /var/postfix/conf stop
-- 
GitLab


From 97c74bf05017524115e4127aa8fb27e776ed5d4a Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 23 Sep 2012 22:26:49 +0200
Subject: [PATCH 4015/5331] alsa.nix: initialize the sound card before
 restoring previously stored settings

The sound card in my ThinkPad won't work unless "init" is run explicitly.
---
 modules/services/audio/alsa.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/modules/services/audio/alsa.nix b/modules/services/audio/alsa.nix
index d16a6794832..4d622428976 100644
--- a/modules/services/audio/alsa.nix
+++ b/modules/services/audio/alsa.nix
@@ -54,8 +54,9 @@ in
           ''
             mkdir -m 0755 -p $(dirname ${soundState})
 
-            # Restore the sound state.
-            ${alsaUtils}/sbin/alsactl --ignore -f ${soundState} restore
+            # Try to restore the sound state.
+            ${alsaUtils}/sbin/alsactl --ignore init || true
+            ${alsaUtils}/sbin/alsactl --ignore -f ${soundState} restore || true
           '';
 
         postStop =
-- 
GitLab


From 5ee79c57228cda29883dd61fd75dc4e5c05ea7b6 Mon Sep 17 00:00:00 2001
From: Lluis Batlle <viriketo@gmail.com>
Date: Mon, 24 Sep 2012 00:14:43 +0200
Subject: [PATCH 4016/5331] Adding a parameter 'ttyEmergency'

It specifies what mingetty will be stopped, if a bad filesystem
triggers an emergency shell.

That should be ttyS0 on headless systems, and in that case,
nixos should stop the ttyS0 mingetty from getting in.
---
 modules/tasks/filesystems.nix | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/modules/tasks/filesystems.nix b/modules/tasks/filesystems.nix
index 9495cac6785..5d6e4a4a369 100644
--- a/modules/tasks/filesystems.nix
+++ b/modules/tasks/filesystems.nix
@@ -156,6 +156,16 @@ in
       description = "Names of supported filesystem types in the initial ramdisk.";
     };
 
+    boot.ttyEmergency = mkOption {
+      default =
+        if pkgs.stdenv.isArm
+          then "ttyS0" # presumably an embedded platform such as a plug
+        else "tty1";
+      description = ''
+        The tty that will be stopped in case an emergency shell is spawned
+        at boot.
+        '';
+    };
   };
 
 
@@ -247,7 +257,7 @@ in
             status="$(status xserver || true)"
             [[ "$status" =~ start/ ]] && exit 0
 
-            stop tty1 || true
+            stop ${config.boot.ttyEmergency} || true
             
             start --no-wait emergency-shell \
               DEVICE="$DEVICE" MOUNTPOINT="$MOUNTPOINT"
-- 
GitLab


From bf116c78760ce2124e96920cb5ea5bcae7a4cac1 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Mon, 24 Sep 2012 17:15:26 -0400
Subject: [PATCH 4017/5331] busyboxKeymap: Support unicode keymaps

---
 modules/system/boot/stage-1.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/modules/system/boot/stage-1.nix b/modules/system/boot/stage-1.nix
index feb4b583839..6f82f3285b9 100644
--- a/modules/system/boot/stage-1.nix
+++ b/modules/system/boot/stage-1.nix
@@ -292,7 +292,8 @@ let
   busyboxKeymap = pkgs.runCommand "boottime-keymap"
     { preferLocalBuild = true; }
     ''
-      ${pkgs.kbd}/bin/loadkeys -qb "${config.i18n.consoleKeyMap}" > $out
+      ${pkgs.kbd}/bin/loadkeys -qb "${config.i18n.consoleKeyMap}" > $out ||
+        ${pkgs.kbd}/bin/loadkeys -qbu "${config.i18n.consoleKeyMap}" > $out
     '';
 
 
-- 
GitLab


From a7700202f2cf5973680fd86be71a435cb388ddee Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 25 Sep 2012 11:23:03 +0200
Subject: [PATCH 4018/5331] Rename dovecot2 module to dovecot.

We no longer support more than one version.
---
 modules/module-list.nix                             | 2 +-
 modules/services/mail/{dovecot2.nix => dovecot.nix} | 0
 2 files changed, 1 insertion(+), 1 deletion(-)
 rename modules/services/mail/{dovecot2.nix => dovecot.nix} (100%)

diff --git a/modules/module-list.nix b/modules/module-list.nix
index 656adcf04b7..e480ee9767e 100644
--- a/modules/module-list.nix
+++ b/modules/module-list.nix
@@ -85,7 +85,7 @@
   ./services/logging/logrotate.nix
   ./services/logging/logstash.nix
   ./services/logging/syslogd.nix
-  ./services/mail/dovecot2.nix
+  ./services/mail/dovecot.nix
   ./services/mail/freepops.nix
   ./services/mail/mail.nix
   ./services/mail/postfix.nix
diff --git a/modules/services/mail/dovecot2.nix b/modules/services/mail/dovecot.nix
similarity index 100%
rename from modules/services/mail/dovecot2.nix
rename to modules/services/mail/dovecot.nix
-- 
GitLab


From 2d6d678bb93ce4dae4289cfbdfb1cc02e7e22ba1 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 25 Sep 2012 11:24:35 +0200
Subject: [PATCH 4019/5331] dovecot.nix: correct bogus reference to dovecot in
 Nixpkgs

---
 modules/services/mail/dovecot.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/services/mail/dovecot.nix b/modules/services/mail/dovecot.nix
index fc97e0d3ad0..9a9acf69c51 100644
--- a/modules/services/mail/dovecot.nix
+++ b/modules/services/mail/dovecot.nix
@@ -141,10 +141,10 @@ in
             ${pkgs.coreutils}/bin/chown -R ${cfg.user}:${cfg.group} /var/run/dovecot2
           '';
 
-        exec = "${pkgs.dovecot_2_0}/sbin/dovecot -F -c ${confFile}";
+        exec = "${pkgs.dovecot}/sbin/dovecot -F -c ${confFile}";
       };
 
-    environment.systemPackages = [ pkgs.dovecot_2_0 ];
+    environment.systemPackages = [ pkgs.dovecot ];
 
   };
 
-- 
GitLab


From fcebb3f3cde263879d4ea99470ec637e84d4da82 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 25 Sep 2012 15:22:55 -0400
Subject: [PATCH 4020/5331] Clean up the nscd job

---
 modules/services/system/nscd.nix | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/modules/services/system/nscd.nix b/modules/services/system/nscd.nix
index d92e4e608b5..620424b94a0 100644
--- a/modules/services/system/nscd.nix
+++ b/modules/services/system/nscd.nix
@@ -38,10 +38,10 @@ in
         description = "Name service cache daemon user";
       };
 
-    jobs.nscd =
+    boot.systemd.services.nscd =
       { description = "Name Service Cache Daemon";
 
-        startOn = "startup";
+        wantedBy = [ "multi-user.target" ];
 
         environment = { LD_LIBRARY_PATH = nssModulesPath; };
 
@@ -52,15 +52,12 @@ in
             mkdir -m 0755 -p /var/db/nscd
           '';
 
-        path = [ pkgs.glibc ];
-
-        exec = "nscd -f ${./nscd.conf}";
-
-        daemonType = "fork";
-
         serviceConfig =
           ''
+            ExecStart=@${pkgs.glibc}/sbin/nscd nscd -f ${./nscd.conf}
+            Type=forking
             PIDFile=/run/nscd/nscd.pid
+            Restart=always
             ExecReload=${pkgs.glibc}/sbin/nscd --invalidate hosts
           '';
       };
-- 
GitLab


From a139fa14b1764862f5b47eebb0a355da2c0300a1 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 25 Sep 2012 16:33:21 -0400
Subject: [PATCH 4021/5331] Optionally make the Nix store read-only to enforce
 immutability

This will be the default once Nix 1.2 is released.
---
 modules/services/misc/nix-daemon.nix | 11 +++++++++++
 modules/system/boot/stage-2-init.sh  | 11 +++++++++++
 modules/system/boot/stage-2.nix      |  1 +
 3 files changed, 23 insertions(+)

diff --git a/modules/services/misc/nix-daemon.nix b/modules/services/misc/nix-daemon.nix
index cf2d0f52d86..7e52686f32f 100644
--- a/modules/services/misc/nix-daemon.nix
+++ b/modules/services/misc/nix-daemon.nix
@@ -183,6 +183,17 @@ in
           you should increase this value.
         '';
       };
+
+      readOnlyStore = mkOption {
+        default = false;
+        description = ''
+          If set, NixOS will enforce the immutability of the Nix store
+          by making <filename>/nix/store</filename> a read-only bind
+          mount.  Nix will automatically make the store writable when
+          needed.
+        '';
+      };
+
     };
   };
 
diff --git a/modules/system/boot/stage-2-init.sh b/modules/system/boot/stage-2-init.sh
index f1eb73a8f88..3aab7a59504 100644
--- a/modules/system/boot/stage-2-init.sh
+++ b/modules/system/boot/stage-2-init.sh
@@ -41,6 +41,17 @@ if [ ! -e /proc/1 ]; then
 fi
 
 
+# Make /nix/store a read-only bind mount to enforce immutability of
+# the Nix store.
+if [ -n "@readOnlyStore@" ]; then
+    if ! mountpoint /nix/store; then
+        mkdir -p /nix/rw-store
+        mount --bind /nix/store /nix/store
+        mount -o remount,ro,bind /nix/store
+    fi
+fi
+
+
 # Provide a /etc/mtab.
 mkdir -m 0755 -p /etc
 test -e /etc/fstab || touch /etc/fstab # to shut up mount
diff --git a/modules/system/boot/stage-2.nix b/modules/system/boot/stage-2.nix
index e187219cbd8..3569cfa8113 100644
--- a/modules/system/boot/stage-2.nix
+++ b/modules/system/boot/stage-2.nix
@@ -60,6 +60,7 @@ let
     shellDebug = "${pkgs.bashInteractive}/bin/bash";
     isExecutable = true;
     inherit (config.boot) devShmSize runSize cleanTmpDir;
+    inherit (config.nix) readOnlyStore;
     ttyGid = config.ids.gids.tty;
     path =
       [ pkgs.coreutils
-- 
GitLab


From 5ef71c6d221412a16c8bcf5e35c09db241372d8c Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 23 Sep 2012 00:07:59 +0200
Subject: [PATCH 4022/5331] smartd: convert service to systemd

---
 modules/services/monitoring/smartd.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/modules/services/monitoring/smartd.nix b/modules/services/monitoring/smartd.nix
index 2427f29020e..242faa010f2 100644
--- a/modules/services/monitoring/smartd.nix
+++ b/modules/services/monitoring/smartd.nix
@@ -75,7 +75,8 @@ in
 
         environment.TZ = config.time.timeZone;
 
-        startOn = "started syslogd";
+        wantedBy = [ "multi-user.target" ];
+        partOf = [ "multi-user.target" ];
 
         path = [ pkgs.smartmontools ];
 
-- 
GitLab


From af7c192f2a542f18f4f488fc52104dc8a3297e2d Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 23 Sep 2012 00:51:50 +0200
Subject: [PATCH 4023/5331] postfix: convert service to systemd

---
 modules/services/mail/postfix.nix | 23 +++++++----------------
 1 file changed, 7 insertions(+), 16 deletions(-)

diff --git a/modules/services/mail/postfix.nix b/modules/services/mail/postfix.nix
index 3784ae3d39f..d4505818e0c 100644
--- a/modules/services/mail/postfix.nix
+++ b/modules/services/mail/postfix.nix
@@ -318,22 +318,13 @@ in
       # accurate way is unlikely to be better.
       { description = "Postfix mail server";
 
-        startOn = "started networking and filesystem";
+        wantedBy = [ "multi-user.target" ];
+        after = [ "network.target" ];
 
-        daemonType = "none";
-
-        respawn = true;
+        daemonType = "fork";
 
         environment.TZ = config.time.timeZone;
 
-        script = ''
-          while ${pkgs.procps}/bin/ps `${pkgs.coreutils}/bin/cat /var/postfix/queue/pid/master.pid` |
-            grep -q postfix
-          do
-            ${pkgs.coreutils}/bin/sleep 1m
-          done
-        '';
-
         preStart =
           ''
             if ! [ -d /var/spool/postfix ]; then
@@ -346,7 +337,7 @@ in
             ${pkgs.coreutils}/bin/chown root:root /var/spool/mail
             ${pkgs.coreutils}/bin/chmod a+rwxt /var/spool/mail
 
-            ln -sf ${pkgs.postfix}/share/postfix/conf/* /var/postfix/conf
+            ln -sf "${pkgs.postfix}/share/postfix/conf/"* /var/postfix/conf
 
             ln -sf ${aliasesFile} /var/postfix/conf/aliases
             ln -sf ${virtualFile} /var/postfix/conf/virtual
@@ -355,11 +346,11 @@ in
             ${pkgs.postfix}/sbin/postalias -c /var/postfix/conf /var/postfix/conf/aliases
             ${pkgs.postfix}/sbin/postmap -c /var/postfix/conf /var/postfix/conf/virtual
 
-            exec ${pkgs.postfix}/sbin/postfix -c /var/postfix/conf start
-          ''; # */
+            ${pkgs.postfix}/sbin/postfix -c /var/postfix/conf start
+          '';
 
         preStop = ''
-            exec ${pkgs.postfix}/sbin/postfix -c /var/postfix/conf stop
+            ${pkgs.postfix}/sbin/postfix -c /var/postfix/conf stop
         '';
 
       };
-- 
GitLab


From 65c1c6525b7d2a57a7204410f7b155c11afee628 Mon Sep 17 00:00:00 2001
From: Rickard Nilsson <rickynils@gmail.com>
Date: Wed, 19 Sep 2012 14:13:34 +0200
Subject: [PATCH 4024/5331] network-manager: Big overhaul

  * Add group 'networkmanager' and implement polkit configuration
    that allows users in this group to make persistent, system-wide
    changes to NetworkManager settings.

  * Add support for ModemManager. 3G modems should work out of the
    box now (it does for me...). This introduces a dependency on
    pkgs.modemmanager.

  * Write NetworkManger config file to Nix store, and let the
    daemon use it from there.
---
 modules/misc/ids.nix                          |   1 +
 .../services/networking/networkmanager.nix    | 126 +++++++++++-------
 2 files changed, 82 insertions(+), 45 deletions(-)

diff --git a/modules/misc/ids.nix b/modules/misc/ids.nix
index ea28162686e..ca5d2051af2 100644
--- a/modules/misc/ids.nix
+++ b/modules/misc/ids.nix
@@ -126,6 +126,7 @@ in
     clamav = 51;
     fprot = 52;
     wwwrun = 54;
+    networkmanager = 56;
 
     # When adding a gid, make sure it doesn't match an existing uid.
 
diff --git a/modules/services/networking/networkmanager.nix b/modules/services/networking/networkmanager.nix
index c33bbad83b3..591f34ceee7 100644
--- a/modules/services/networking/networkmanager.nix
+++ b/modules/services/networking/networkmanager.nix
@@ -3,12 +3,47 @@
 with pkgs.lib;
 
 let
-
-  stateDir = "/var/lib/NetworkManager";
-
-in
-
-{
+  cfg = config.networking.networkmanager;
+
+  stateDirs = "/var/lib/NetworkManager /var/lib/dhclient";
+
+  configFile = pkgs.writeText "NetworkManager.conf" ''
+    [main]
+    plugins=keyfile
+
+    [keyfile]
+    ${optionalString (config.networking.hostName != "") ''
+      hostname=${config.networking.hostName}
+    ''}
+
+    [logging]
+    level=WARN
+  '';
+
+  polkitConf = ''
+    [network-manager]
+    Identity=unix-group:networkmanager
+    Action=org.freedesktop.NetworkManager.*
+    ResultAny=yes
+    ResultInactive=no
+    ResultActive=yes
+
+    [modem-manager]
+    Identity=unix-group:networkmanager
+    Action=org.freedesktop.ModemManager.*
+    ResultAny=yes
+    ResultInactive=no
+    ResultActive=yes
+  '';
+
+  ipUpScript = pkgs.writeScript "01nixos-ip-up" ''
+    #!/bin/sh
+    if test "$2" = "up"; then
+      ${pkgs.upstart}/sbin/initctl emit ip-up "IFACE=$1"
+    fi
+  '';
+
+in {
 
   ###### interface
 
@@ -20,61 +55,62 @@ in
       description = ''
         Whether to use NetworkManager to obtain an IP adress and other
         configuration for all network interfaces that are not manually
-        configured.
+        configured. If enabled, a group <literal>networkmanager</literal>
+        will be created. Add all users that should have permission
+        to change network settings to this group.
       '';
     };
 
     networking.networkmanager.packages = mkOption {
-      default = [ pkgs.networkmanager ];
-      description =
-        ''
-          Packages providing NetworkManager plugins.
-        '';
+      default = [ ];
+      description = ''
+        Extra packages that provide NetworkManager plugins.
+      '';
+      merge = mergeListOption;
+      apply = list: [ pkgs.networkmanager pkgs.modemmanager ] ++ list;
     };
   };
 
 
   ###### implementation
 
-  config = mkIf config.networking.networkmanager.enable {
+  config = mkIf cfg.enable {
+
+    environment.etc = singleton {
+      source = ipUpScript;
+      target = "NetworkManager/dispatcher.d/01nixos-ip-up";
+    };
+
+    environment.systemPackages = cfg.packages;
 
-    jobs.networkmanager =
-      { startOn = "started network-interfaces";
-        stopOn = "stopping network-interfaces";
+    users.extraGroups = singleton {
+      name = "networkmanager";
+      gid = config.ids.gids.networkmanager;
+    };
+
+    jobs.networkmanager = {
+      startOn = "started network-interfaces";
+      stopOn = "stopping network-interfaces";
 
-        script =
-          ''
-            mkdir -m 755 -p /etc/NetworkManager
-            mkdir -m 700 -p /etc/NetworkManager/system-connections
-            mkdir -m 755 -p ${stateDir}
+      path = [ pkgs.networkmanager ];
 
-            if [[ ! -f /etc/NetworkManager/NetworkManager.conf ]]; then
-            cat <<-EOF > /etc/NetworkManager/NetworkManager.conf
-            [main]
-            plugins=keyfile
-            EOF
-            fi
+      preStart = ''
+        mkdir -m 755 -p /etc/NetworkManager
+        mkdir -m 700 -p /etc/NetworkManager/system-connections
+        mkdir -m 755 -p ${stateDirs}
+      '';
 
-            exec ${pkgs.networkmanager}/sbin/NetworkManager --no-daemon
-          '';
-      };
+       exec = "NetworkManager --config=${configFile} --no-daemon";
+    };
 
-    environment.systemPackages = config.networking.networkmanager.packages;
-    services.dbus.packages = config.networking.networkmanager.packages;
     networking.useDHCP = false;
 
-    environment.etc = [
-      {
-        source = pkgs.writeScript "01nixos-ip-up"
-          ''
-          #!/bin/sh
-          if test "$2" = "up"; then
-            ${pkgs.upstart}/sbin/initctl emit ip-up "IFACE=$1"
-          fi
-          '';
-        target = "NetworkManager/dispatcher.d/01nixos-ip-up";
-      }
-    ];
+    networking.wireless.enable = true;
+
+    security.polkit.permissions = polkitConf;
+
+    services.dbus.packages = cfg.packages;
+
+    services.udev.packages = cfg.packages;
   };
 }
-
-- 
GitLab


From 9d83b8897bf616dd6f83b8627e5d2edd2e58f777 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 27 Sep 2012 16:50:00 +0200
Subject: [PATCH 4025/5331] spamassassin: drop obsolete command line options

---
 modules/services/mail/spamassassin.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/services/mail/spamassassin.nix b/modules/services/mail/spamassassin.nix
index 9b387eb940f..ecbb5dc3105 100644
--- a/modules/services/mail/spamassassin.nix
+++ b/modules/services/mail/spamassassin.nix
@@ -43,7 +43,7 @@ in
       description = "Spam Assassin Server";
       startOn = "started networking and filesystem";
       environment.TZ = config.time.timeZone;
-      exec = "${pkgs.spamassassin}/bin/spamd -C /etc/spamassassin/init.pre --siteconfigpath=/etc/spamassassin --username=spamd --pidfile=/var/run/spamd.pid";
+      exec = "${pkgs.spamassassin}/bin/spamd -D --username=spamd --pidfile=/var/run/spamd.pid";
     };
 
   };
-- 
GitLab


From bcb80387265e9a3865c0dc346631690c8c4da606 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 27 Sep 2012 17:12:25 +0200
Subject: [PATCH 4026/5331] spamassassin: add option for running the spamd
 daemon in debug mode

---
 modules/services/mail/spamassassin.nix | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/modules/services/mail/spamassassin.nix b/modules/services/mail/spamassassin.nix
index ecbb5dc3105..9e378ab0f20 100644
--- a/modules/services/mail/spamassassin.nix
+++ b/modules/services/mail/spamassassin.nix
@@ -21,6 +21,11 @@ in
         description = "Whether to run the SpamAssassin daemon.";
       };
 
+      debug = mkOption {
+        default = false;
+        description = "Whether to run the SpamAssassin daemon in debug mode.";
+      };
+
     };
 
   };
@@ -43,7 +48,7 @@ in
       description = "Spam Assassin Server";
       startOn = "started networking and filesystem";
       environment.TZ = config.time.timeZone;
-      exec = "${pkgs.spamassassin}/bin/spamd -D --username=spamd --pidfile=/var/run/spamd.pid";
+      exec = "${pkgs.spamassassin}/bin/spamd ${optionalString cfg.debug "-D"} --username=spamd --pidfile=/var/run/spamd.pid";
     };
 
   };
-- 
GitLab


From 6f052ee62e2e7d3e905a6443369409df9fa8147b Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 28 Sep 2012 00:06:52 +0200
Subject: [PATCH 4027/5331] spamassassin: use virtual user home directories
 under /var/lib/spamassassin to avoid permission problems

When spamd isn't running as 'root', it cannot access the usual ~/.spamassassin
path where user-specific files normally reside. Instead, we use the path
/var/lib/spamassassin-<user> to store those home directories.
---
 modules/misc/ids.nix                   |  1 +
 modules/services/mail/spamassassin.nix | 18 ++++++++++++------
 2 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/modules/misc/ids.nix b/modules/misc/ids.nix
index ca5d2051af2..dbecaf802a1 100644
--- a/modules/misc/ids.nix
+++ b/modules/misc/ids.nix
@@ -126,6 +126,7 @@ in
     clamav = 51;
     fprot = 52;
     wwwrun = 54;
+    spamd = 55;
     networkmanager = 56;
 
     # When adding a gid, make sure it doesn't match an existing uid.
diff --git a/modules/services/mail/spamassassin.nix b/modules/services/mail/spamassassin.nix
index 9e378ab0f20..d4dbe8ddbd0 100644
--- a/modules/services/mail/spamassassin.nix
+++ b/modules/services/mail/spamassassin.nix
@@ -38,17 +38,23 @@ in
     # Allow users to run 'spamc'.
     environment.systemPackages = [ pkgs.spamassassin ];
 
-    users.extraUsers = singleton
-      { name = "spamd";
-        description = "Spam Assassin Daemon";
-        uid = config.ids.uids.spamd;
-      };
+    users.extraUsers = singleton {
+    name = "spamd";
+      description = "Spam Assassin Daemon";
+      uid = config.ids.uids.spamd;
+      group = "spamd";
+    };
+
+    users.extraGroups = singleton {
+      name = "spamd";
+      gid = config.ids.gids.spamd;
+    };
 
     jobs.spamd = {
       description = "Spam Assassin Server";
       startOn = "started networking and filesystem";
       environment.TZ = config.time.timeZone;
-      exec = "${pkgs.spamassassin}/bin/spamd ${optionalString cfg.debug "-D"} --username=spamd --pidfile=/var/run/spamd.pid";
+      exec = "${pkgs.spamassassin}/bin/spamd ${optionalString cfg.debug "-D"} --username=spamd --groupname=spamd --nouser-config --virtual-config-dir=/var/lib/spamassassin/user-%u --allow-tell --pidfile=/var/run/spamd.pid";
     };
 
   };
-- 
GitLab


From 3e6bb7d1de4fb0e4024161f501dbd7521ff791b4 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 28 Sep 2012 10:59:58 -0400
Subject: [PATCH 4028/5331] Move setting ownership of /nix/store to
 stage-2-init

This is necessary because the store might be bind-mounted read-only.
---
 modules/services/misc/nix-daemon.nix | 11 ++++-------
 modules/system/boot/stage-2-init.sh  |  2 ++
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/modules/services/misc/nix-daemon.nix b/modules/services/misc/nix-daemon.nix
index 7e52686f32f..ba970b95bc0 100644
--- a/modules/services/misc/nix-daemon.nix
+++ b/modules/services/misc/nix-daemon.nix
@@ -319,10 +319,6 @@ in
 
     system.activationScripts.nix = stringAfter [ "etc" "users" ]
       ''
-        # Set up Nix.
-        chown root:nixbld /nix/store
-        chmod 1775 /nix/store
-
         # Nix initialisation.
         mkdir -m 0755 -p \
           /nix/var/nix/gcroots \
@@ -334,9 +330,10 @@ in
           /nix/var/log/nix/drvs \
           /nix/var/nix/channel-cache \
           /nix/var/nix/chroots
-        mkdir -m 1777 -p /nix/var/nix/gcroots/per-user
-        mkdir -m 1777 -p /nix/var/nix/profiles/per-user
-        mkdir -m 1777 -p /nix/var/nix/gcroots/tmp
+        mkdir -m 1777 -p \
+          /nix/var/nix/gcroots/per-user \
+          /nix/var/nix/profiles/per-user \
+          /nix/var/nix/gcroots/tmp
 
         ln -sf /nix/var/nix/profiles /nix/var/nix/gcroots/
         ln -sf /nix/var/nix/manifests /nix/var/nix/gcroots/
diff --git a/modules/system/boot/stage-2-init.sh b/modules/system/boot/stage-2-init.sh
index 3aab7a59504..55e61ffb69a 100644
--- a/modules/system/boot/stage-2-init.sh
+++ b/modules/system/boot/stage-2-init.sh
@@ -43,6 +43,8 @@ fi
 
 # Make /nix/store a read-only bind mount to enforce immutability of
 # the Nix store.
+chown root:nixbld /nix/store
+chmod 1775 /nix/store
 if [ -n "@readOnlyStore@" ]; then
     if ! mountpoint /nix/store; then
         mkdir -p /nix/rw-store
-- 
GitLab


From 1084a8e0de805229d216c928efbc457cae57eea2 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 28 Sep 2012 11:14:33 -0400
Subject: [PATCH 4029/5331] Add "adm" group from the systemd branch to prevent
 constant collisions

---
 modules/misc/ids.nix | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/modules/misc/ids.nix b/modules/misc/ids.nix
index dbecaf802a1..f26501105b1 100644
--- a/modules/misc/ids.nix
+++ b/modules/misc/ids.nix
@@ -73,7 +73,7 @@ in
     fprot = 52;
     bind = 53;
     wwwrun = 54;
-    spamd = 55;
+    spamd = 56;
 
     # When adding a uid, make sure it doesn't match an existing gid.
 
@@ -126,8 +126,9 @@ in
     clamav = 51;
     fprot = 52;
     wwwrun = 54;
-    spamd = 55;
-    networkmanager = 56;
+    adm = 55;
+    spamd = 56;
+    networkmanager = 57;
 
     # When adding a gid, make sure it doesn't match an existing uid.
 
-- 
GitLab


From fabe06337ed54e72aaa2bdd5a0b40e8bda61e46b Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 23 Sep 2012 22:26:49 +0200
Subject: [PATCH 4030/5331] alsa.nix: initialize the sound card before
 restoring previously stored settings

The sound card in my ThinkPad won't work unless "init" is run explicitly.
---
 modules/services/audio/alsa.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/modules/services/audio/alsa.nix b/modules/services/audio/alsa.nix
index 8212b3f9fd0..fa63bc74cfc 100644
--- a/modules/services/audio/alsa.nix
+++ b/modules/services/audio/alsa.nix
@@ -56,8 +56,9 @@ in
           ''
             mkdir -m 0755 -p $(dirname ${soundState})
 
-            # Restore the sound state.
-            ${alsaUtils}/sbin/alsactl --ignore -f ${soundState} restore
+            # Try to restore the sound state.
+            ${alsaUtils}/sbin/alsactl --ignore init || true
+            ${alsaUtils}/sbin/alsactl --ignore -f ${soundState} restore || true
           '';
 
         postStop =
-- 
GitLab


From 03f13a49392b90cdc54d8ff057cef76bf0379913 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 26 Sep 2012 21:00:55 +0200
Subject: [PATCH 4031/5331] Tell sshd not to detach into the background.

This makes it easier for systemd to track it and avoids race conditions such as
this one:

  systemd[1]: PID file /run/sshd.pid not readable (yet?) after start.
  systemd[1]: Failed to start SSH Daemon.
  systemd[1]: Unit sshd.service entered failed state.
  systemd[1]: sshd.service holdoff time over, scheduling restart.
  systemd[1]: Stopping SSH Daemon...
  systemd[1]: Starting SSH Daemon...
  sshd[2315]: Server listening on 0.0.0.0 port 22.
  sshd[2315]: Server listening on :: port 22.
  sshd[2335]: error: Bind to port 22 on 0.0.0.0 failed: Address already in use.
  sshd[2335]: error: Bind to port 22 on :: failed: Address already in use.
  sshd[2335]: fatal: Cannot bind any address.
  systemd[1]: Started SSH Daemon.
---
 modules/services/networking/ssh/sshd.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/services/networking/ssh/sshd.nix b/modules/services/networking/ssh/sshd.nix
index 242129c355e..373b482f85c 100644
--- a/modules/services/networking/ssh/sshd.nix
+++ b/modules/services/networking/ssh/sshd.nix
@@ -351,10 +351,10 @@ in
         serviceConfig =
           ''
             ExecStart=\
-              ${pkgs.openssh}/sbin/sshd -h ${cfg.hostKeyPath} \
+              ${pkgs.openssh}/sbin/sshd -D -h ${cfg.hostKeyPath} \
                 -f ${pkgs.writeText "sshd_config" cfg.extraConfig}
             Restart=always
-            Type=forking
+            Type=simple
             KillMode=process
             PIDFile=/run/sshd.pid
           '';
-- 
GitLab


From 1b47614c4628471fbee4a12c0266a324d1792f5d Mon Sep 17 00:00:00 2001
From: Mathijs Kwik <mathijs@bluescreen303.nl>
Date: Sat, 29 Sep 2012 08:05:21 +0200
Subject: [PATCH 4032/5331] invalidate-nscd: use script instead of exec for
 multiple commands

otherwise, only the first one line executes
---
 modules/services/system/nscd.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/services/system/nscd.nix b/modules/services/system/nscd.nix
index ca5ac428a9d..457be266424 100644
--- a/modules/services/system/nscd.nix
+++ b/modules/services/system/nscd.nix
@@ -65,7 +65,7 @@ in
         startOn = "ip-up or config-changed";
         task = true;
         path = [ pkgs.glibc ];
-        exec = ''
+        script = ''
           nscd --invalidate=passwd
           nscd --invalidate=group
           nscd --invalidate=hosts
-- 
GitLab


From 4b78161e3e68468e858c2618917426a623ef5936 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 30 Sep 2012 00:53:50 +0200
Subject: [PATCH 4033/5331] dovecot: add options to selectively enable/disable
 the IMAP and/or POP3 listener

---
 modules/services/mail/dovecot.nix | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/modules/services/mail/dovecot.nix b/modules/services/mail/dovecot.nix
index 9a9acf69c51..b4662936b3c 100644
--- a/modules/services/mail/dovecot.nix
+++ b/modules/services/mail/dovecot.nix
@@ -10,7 +10,7 @@ let
     ''
       base_dir = /var/run/dovecot2/
 
-      protocols = imap pop3
+      protocols = ${optionalString cfg.enableImap "imap"} ${optionalString cfg.enablePop3 "pop3"}
     ''
     + (if cfg.sslServerCert!="" then
     ''
@@ -62,6 +62,16 @@ in
         description = "Whether to enable the Dovecot 2.x POP3/IMAP server.";
       };
 
+      enablePop3 = mkOption {
+        default = true;
+        description = "Start the POP3 listener (when Dovecot is enabled).";
+      };
+
+      enableImap = mkOption {
+        default = true;
+        description = "Start the IMAP listener (when Dovecot is enabled).";
+      };
+
       user = mkOption {
         default = "dovecot2";
         description = "Dovecot user name.";
@@ -146,6 +156,9 @@ in
 
     environment.systemPackages = [ pkgs.dovecot ];
 
+    assertions = [{ assertion = cfg.enablePop3 || cfg.enableImap;
+                    message = "dovecot needs at least one of the IMAP or POP3 listeners enabled";}];
+
   };
 
 }
-- 
GitLab


From 353522ef79ee628f46b2044085a98f59f05ee248 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 1 Oct 2012 14:33:01 -0400
Subject: [PATCH 4034/5331] Remove JoinControllers line because upstream
 reverted joining cpuset

---
 modules/system/boot/systemd.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/modules/system/boot/systemd.nix b/modules/system/boot/systemd.nix
index d8b5ee45c7e..4cb0e1cdf1d 100644
--- a/modules/system/boot/systemd.nix
+++ b/modules/system/boot/systemd.nix
@@ -343,7 +343,6 @@ in
         { source = pkgs.writeText "systemd.conf"
             ''
               [Manager]
-              JoinControllers=cpu,cpuacct net_cls,netprio
             '';
           target = "systemd/system.conf";
         }
-- 
GitLab


From 440b793a5b8fcd5250229ce9821e50a6f1065063 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 1 Oct 2012 14:34:39 -0400
Subject: [PATCH 4035/5331] =?UTF-8?q?Remove=20=E2=80=98autocreate=E2=80=99?=
 =?UTF-8?q?=20FS=20option?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Systemd creates missing mountpoints unconditionally.
---
 modules/tasks/filesystems.nix | 18 ------------------
 1 file changed, 18 deletions(-)

diff --git a/modules/tasks/filesystems.nix b/modules/tasks/filesystems.nix
index e81ebd66004..14abe22a2da 100644
--- a/modules/tasks/filesystems.nix
+++ b/modules/tasks/filesystems.nix
@@ -64,9 +64,6 @@ in
         specify a volume label (<literal>label</literal>) for file
         systems that support it, such as ext2/ext3 (see <command>mke2fs
         -L</command>).
-
-        <literal>autocreate</literal> forces <literal>mountPoint</literal> to be created with
-        <command>mkdir -p</command> .
       '';
 
       type = types.list types.optionSet;
@@ -108,15 +105,6 @@ in
           description = "Options used to mount the file system.";
         };
 
-        autocreate = mkOption {
-          default = false;
-          type = types.bool;
-          description = ''
-            Automatically create the mount point defined in
-            <option>fileSystems.*.mountPoint</option>.
-          '';
-        };
-
         autoFormat = mkOption {
           default = false;
           type = types.bool;
@@ -219,12 +207,6 @@ in
               fi
             '')}
 
-            # Create missing mount points.  Note that this won't work
-            # if the mount point is under another mount point.
-            ${flip concatMapStrings config.fileSystems (fs: optionalString fs.autocreate ''
-              mkdir -p -m 0755 '${fs.mountPoint}'
-            '')}
-
             # Create missing swapfiles.
             # FIXME: support changing the size of existing swapfiles.
             ${flip concatMapStrings config.swapDevices (sw: optionalString (sw.size != null) ''
-- 
GitLab


From 891be375b565d05830ae03f9c5f898858f462991 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 1 Oct 2012 16:27:42 -0400
Subject: [PATCH 4036/5331] Make unitConfig/serviceConfig attribute sets

So instead of:

  boot.systemd.services."foo".serviceConfig =
    ''
      StartLimitInterval=10
      CPUShare=500
    '';

you can say:

  boot.systemd.services."foo".serviceConfig.StartLimitInterval = 10;
  boot.systemd.services."foo".serviceConfig.CPUShare = 500;

This way all unit options are available and users can set/override
options in configuration.nix.
---
 modules/services/databases/postgresql.nix    |  9 ++--
 modules/services/logging/syslogd.nix         | 11 ++--
 modules/services/misc/nix-daemon.nix         | 18 +++----
 modules/services/networking/dhcpcd.nix       | 14 +++---
 modules/services/networking/ssh/sshd.nix     | 24 ++++-----
 modules/services/system/nscd.nix             | 19 +++----
 modules/system/boot/systemd-unit-options.nix | 23 ++++++---
 modules/system/boot/systemd.nix              | 34 +++++++++----
 modules/system/upstart/upstart.nix           | 53 +++++++-------------
 9 files changed, 100 insertions(+), 105 deletions(-)

diff --git a/modules/services/databases/postgresql.nix b/modules/services/databases/postgresql.nix
index 18e72381cdc..a52d241e96c 100644
--- a/modules/services/databases/postgresql.nix
+++ b/modules/services/databases/postgresql.nix
@@ -194,15 +194,14 @@ in
           '';
 
         serviceConfig =
-          ''
-            # Shut down Postgres using SIGINT ("Fast Shutdown mode").  See
+          { # Shut down Postgres using SIGINT ("Fast Shutdown mode").  See
             # http://www.postgresql.org/docs/current/static/server-shutdown.html
-            KillSignal=SIGINT
+            KillSignal = "SIGINT";
 
             # Give Postgres a decent amount of time to clean up after
             # receiving systemd's SIGINT.
-            TimeoutSec=60
-          '';
+            TimeoutSec = 60;
+          };
       };
 
   };
diff --git a/modules/services/logging/syslogd.nix b/modules/services/logging/syslogd.nix
index 2b7e4a8e44c..8c815ddf25f 100644
--- a/modules/services/logging/syslogd.nix
+++ b/modules/services/logging/syslogd.nix
@@ -106,8 +106,8 @@ in
 
     # FIXME: restarting syslog seems to break journal logging.
     boot.systemd.services.syslog =
-      { description = "Syslog daemon";
-      
+      { description = "Syslog Daemon";
+
         requires = [ "syslog.socket" ];
 
         wantedBy = [ "multi-user.target" "syslog.target" ];
@@ -115,11 +115,10 @@ in
         environment.TZ = config.time.timeZone;
 
         serviceConfig =
-          ''
-            ExecStart=${pkgs.sysklogd}/sbin/syslogd ${toString cfg.extraParams} -f ${syslogConf} -n
+          { ExecStart = "${pkgs.sysklogd}/sbin/syslogd ${toString cfg.extraParams} -f ${syslogConf} -n";
             # Prevent syslogd output looping back through journald.
-            StandardOutput=null
-          '';
+            StandardOutput = "null";
+          };
       };
 
   };
diff --git a/modules/services/misc/nix-daemon.nix b/modules/services/misc/nix-daemon.nix
index ba970b95bc0..718566ee5b9 100644
--- a/modules/services/misc/nix-daemon.nix
+++ b/modules/services/misc/nix-daemon.nix
@@ -258,7 +258,7 @@ in
             ListenStream=/nix/var/nix/daemon-socket/socket
           '';
       };
-     
+
     boot.systemd.services."nix-daemon" =
       { description = "Nix Daemon";
 
@@ -268,16 +268,14 @@ in
         environment = cfg.envVars;
 
         serviceConfig =
-          ''
-            ExecStart=${nix}/bin/nix-worker --daemon
-            KillMode=process
-            PIDFile=/run/sshd.pid
-            Nice=${toString cfg.daemonNiceLevel}
-            IOSchedulingPriority=${toString cfg.daemonIONiceLevel}
-            LimitNOFILE=4096
-          '';
+          { ExecStart = "${nix}/bin/nix-worker --daemon";
+            KillMode = "process";
+            Nice = cfg.daemonNiceLevel;
+            IOSchedulingPriority = cfg.daemonIONiceLevel;
+            LimitNOFILE = 4096;
+          };
       };
-     
+
     nix.envVars =
       { NIX_CONF_DIR = "/etc/nix";
 
diff --git a/modules/services/networking/dhcpcd.nix b/modules/services/networking/dhcpcd.nix
index 6eea947f604..cfbc7ba3679 100644
--- a/modules/services/networking/dhcpcd.nix
+++ b/modules/services/networking/dhcpcd.nix
@@ -91,7 +91,7 @@ in
 
   config = mkIf config.networking.useDHCP {
 
-    jobs.dhcpcd =
+    boot.systemd.services.dhcpcd =
       { description = "DHCP Client";
 
         wantedBy = [ "multi-user.target" ];
@@ -99,14 +99,12 @@ in
 
         path = [ dhcpcd pkgs.nettools pkgs.openresolv ];
 
-        daemonType = "fork";
-
-        exec = "dhcpcd --config ${dhcpcdConf}";
-
         serviceConfig =
-          ''
-            ExecReload=${dhcpcd}/sbin/dhcpcd --rebind
-          '';
+          { Type = "forking";
+            PIDFile = "/run/dhcpcd.pid";
+            ExecStart = "@${dhcpcd}/sbin/dhcpcd dhcpcd --config ${dhcpcdConf}";
+            ExecReload = "${dhcpcd}/sbin/dhcpcd --rebind";
+          };
       };
 
     environment.systemPackages = [ dhcpcd ];
diff --git a/modules/services/networking/ssh/sshd.nix b/modules/services/networking/ssh/sshd.nix
index 373b482f85c..83b7b5372ec 100644
--- a/modules/services/networking/ssh/sshd.nix
+++ b/modules/services/networking/ssh/sshd.nix
@@ -321,11 +321,8 @@ in
 
         script = mkAuthkeyScript;
 
-        serviceConfig =
-          ''
-            Type=oneshot
-            RemainAfterExit=true
-          '';
+        serviceConfig.Type = "oneshot";
+        serviceConfig.RemainAfterExit = true;
       };
 
     boot.systemd.services.sshd =
@@ -349,15 +346,14 @@ in
           '';
 
         serviceConfig =
-          ''
-            ExecStart=\
-              ${pkgs.openssh}/sbin/sshd -D -h ${cfg.hostKeyPath} \
-                -f ${pkgs.writeText "sshd_config" cfg.extraConfig}
-            Restart=always
-            Type=simple
-            KillMode=process
-            PIDFile=/run/sshd.pid
-          '';
+          { ExecStart =
+              "${pkgs.openssh}/sbin/sshd -D -h ${cfg.hostKeyPath} " +
+              "-f ${pkgs.writeText "sshd_config" cfg.extraConfig}";
+            Restart = "always";
+            Type = "simple";
+            KillMode = "process";
+            PIDFile = "/run/sshd.pid";
+          };
       };
 
     networking.firewall.allowedTCPPorts = cfg.ports;
diff --git a/modules/services/system/nscd.nix b/modules/services/system/nscd.nix
index 54e661896d9..eecb845d547 100644
--- a/modules/services/system/nscd.nix
+++ b/modules/services/system/nscd.nix
@@ -53,15 +53,16 @@ in
           '';
 
         serviceConfig =
-          ''
-            ExecStart=@${pkgs.glibc}/sbin/nscd nscd -f ${./nscd.conf}
-            Type=forking
-            PIDFile=/run/nscd/nscd.pid
-            Restart=always
-            ExecReload=${pkgs.glibc}/sbin/nscd --invalidate passwd
-            ExecReload=${pkgs.glibc}/sbin/nscd --invalidate group
-            ExecReload=${pkgs.glibc}/sbin/nscd --invalidate hosts
-          '';
+          { ExecStart = "@${pkgs.glibc}/sbin/nscd nscd -f ${./nscd.conf}";
+            Type = "forking";
+            PIDFile = "/run/nscd/nscd.pid";
+            Restart = "always";
+            ExecReload =
+              [ "${pkgs.glibc}/sbin/nscd --invalidate passwd"
+                "${pkgs.glibc}/sbin/nscd --invalidate group"
+                "${pkgs.glibc}/sbin/nscd --invalidate hosts"
+              ];
+          };
       };
 
   };
diff --git a/modules/system/boot/systemd-unit-options.nix b/modules/system/boot/systemd-unit-options.nix
index f56ee4fc0d3..c5fa23b36bb 100644
--- a/modules/system/boot/systemd-unit-options.nix
+++ b/modules/system/boot/systemd-unit-options.nix
@@ -81,21 +81,28 @@ with pkgs.lib;
     };
 
     unitConfig = mkOption {
-      default = "";
-      type = types.string;
+      default = {};
+      example = { RequiresMountsFor = "/data"; };
+      type = types.attrs;
       description = ''
-        Contents of the <literal>[Unit]</literal> section of the unit.
-        See <citerefentry><refentrytitle>systemd.unit</refentrytitle>
+        Each attribute in this set specifies an option in the
+        <literal>[Unit]</literal> section of the unit.  See
+        <citerefentry><refentrytitle>systemd.unit</refentrytitle>
         <manvolnum>5</manvolnum></citerefentry> for details.
       '';
     };
 
     serviceConfig = mkOption {
-      default = "";
-      type = types.string;
+      default = {};
+      example =
+        { StartLimitInterval = 10;
+          RestartSec = 5;
+        };
+      type = types.attrs;
       description = ''
-        Contents of the <literal>[Service]</literal> section of the unit.
-        See <citerefentry><refentrytitle>systemd.service</refentrytitle>
+        Each attribute in this set specifies an option in the
+        <literal>[Service]</literal> section of the unit.  See
+        <citerefentry><refentrytitle>systemd.service</refentrytitle>
         <manvolnum>5</manvolnum></citerefentry> for details.
       '';
     };
diff --git a/modules/system/boot/systemd.nix b/modules/system/boot/systemd.nix
index 4cb0e1cdf1d..a7a7729bb8b 100644
--- a/modules/system/boot/systemd.nix
+++ b/modules/system/boot/systemd.nix
@@ -177,24 +177,38 @@ let
           pkgs.gnused
           systemd
         ];
+      unitConfig =
+        { Requires = concatStringsSep " " config.requires;
+          Wants = concatStringsSep " " config.wants;
+          After = concatStringsSep " " config.after;
+          Before = concatStringsSep " " config.before;
+          PartOf = concatStringsSep " " config.partOf;
+        } // optionalAttrs (config.description != "")
+          { Description = config.description;
+          };
     };
   };
 
+  toOption = x:
+    if x == true then "true"
+    else if x == false then "false"
+    else toString x;
+
+  attrsToSection = as:
+    concatStrings (concatLists (mapAttrsToList (name: value:
+      map (x: ''
+          ${name}=${toOption x}
+        '')
+        (if isList value then value else [value]))
+        as));
+
   serviceToUnit = name: def:
     { inherit (def) wantedBy;
 
       text =
         ''
           [Unit]
-          ${optionalString (def.description != "") ''
-            Description=${def.description}
-          ''}
-          Requires=${concatStringsSep " " def.requires}
-          Wants=${concatStringsSep " " def.wants}
-          After=${concatStringsSep " " def.after}
-          Before=${concatStringsSep " " def.before}
-          PartOf=${concatStringsSep " " def.partOf}
-          ${def.unitConfig}
+          ${attrsToSection def.unitConfig}
 
           [Service]
           Environment=PATH=${def.path}
@@ -215,7 +229,7 @@ let
             ''}
           ''}
 
-          ${def.serviceConfig}
+          ${attrsToSection def.serviceConfig}
         '';
     };
 
diff --git a/modules/system/upstart/upstart.nix b/modules/system/upstart/upstart.nix
index fbbbf72e027..a32bca8ddd7 100644
--- a/modules/system/upstart/upstart.nix
+++ b/modules/system/upstart/upstart.nix
@@ -54,7 +54,7 @@ let
         '';
     in {
 
-      inherit (job) description requires wants before partOf environment path restartIfChanged;
+      inherit (job) description requires wants before partOf environment path restartIfChanged unitConfig;
 
       after =
         (if job.startOn == "stopped udevtrigger" then [ "systemd-udev-settle.service" ] else
@@ -72,40 +72,23 @@ let
          [ "multi-user.target" ]) ++ job.wantedBy;
 
       serviceConfig =
-        ''
-          ${job.serviceConfig}
-
-          ${optionalString (job.preStart != "" && (job.script != "" || job.exec != "")) ''
-            ExecStartPre=${preStartScript}
-          ''}
-
-          ${optionalString (job.preStart != "" && job.script == "" && job.exec == "") ''
-            ExecStart=${preStartScript}
-          ''}
-
-          ${optionalString (job.script != "" || job.exec != "") ''
-            ExecStart=${startScript}
-          ''}
-
-          ${optionalString (job.postStart != "") ''
-            ExecStartPost=${postStartScript}
-          ''}
-
-          ${optionalString (job.preStop != "") ''
-            ExecStop=${preStopScript}
-          ''}
-
-          ${optionalString (job.postStop != "") ''
-            ExecStopPost=${postStopScript}
-          ''}
-
-          ${if job.script == "" && job.exec == "" then "Type=oneshot\nRemainAfterExit=true" else
-            if job.daemonType == "fork" then "Type=forking\nGuessMainPID=true" else
-            if job.daemonType == "none" then "" else
-            throw "invalid daemon type `${job.daemonType}'"}
-
-          ${optionalString (!job.task && job.respawn) "Restart=always"}
-        '';
+        job.serviceConfig
+        // optionalAttrs (job.preStart != "" && (job.script != "" || job.exec != ""))
+          { ExecStartPre = preStartScript; }
+        // optionalAttrs (job.script != "" || job.exec != "")
+          { ExecStart = startScript; }
+        // optionalAttrs (job.postStart != "")
+          { ExecStartPost = postStartScript; }
+        // optionalAttrs (job.preStop != "")
+          { ExecStop = preStopScript; }
+        // optionalAttrs (job.postStop != "")
+          { ExecStopPost = postStopScript; }
+        // (if job.script == "" && job.exec == "" then { Type = "oneshot"; RemainAfterExit = true; } else
+            if job.daemonType == "fork" then { Type = "forking"; GuessMainPID = true; } else
+            if job.daemonType == "none" then { } else
+            throw "invalid daemon type `${job.daemonType}'")
+        // optionalAttrs (!job.task && job.respawn)
+          { Restart = "always"; };
     };
 
 
-- 
GitLab


From 13d747c11a6935272a2ebdb861daefbdfde47d15 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 1 Oct 2012 16:45:49 -0400
Subject: [PATCH 4037/5331] Support postStart scripts in service units

---
 modules/system/boot/systemd-unit-options.nix | 9 +++++++++
 modules/system/boot/systemd.nix              | 7 +++++++
 2 files changed, 16 insertions(+)

diff --git a/modules/system/boot/systemd-unit-options.nix b/modules/system/boot/systemd-unit-options.nix
index c5fa23b36bb..95506712cac 100644
--- a/modules/system/boot/systemd-unit-options.nix
+++ b/modules/system/boot/systemd-unit-options.nix
@@ -122,6 +122,15 @@ with pkgs.lib;
       '';
     };
 
+    postStart = mkOption {
+      type = types.string;
+      default = "";
+      description = ''
+        Shell commands executed after the service's main process
+        is started.
+      '';
+    };
+
     restartIfChanged = mkOption {
       type = types.bool;
       default = true;
diff --git a/modules/system/boot/systemd.nix b/modules/system/boot/systemd.nix
index a7a7729bb8b..bb2ea087c21 100644
--- a/modules/system/boot/systemd.nix
+++ b/modules/system/boot/systemd.nix
@@ -229,6 +229,13 @@ let
             ''}
           ''}
 
+          ${optionalString (def.postStart != "") ''
+            ExecStartPost=${makeJobScript "${name}-poststart.sh" ''
+              #! ${pkgs.stdenv.shell} -e
+              ${def.postStart}
+            ''}
+          ''}
+
           ${attrsToSection def.serviceConfig}
         '';
     };
-- 
GitLab


From 5cf702e1c130483caa13e3bb34df0a715679fd14 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 1 Oct 2012 16:47:54 -0400
Subject: [PATCH 4038/5331] postgresql.nix: Use User/Group instead of su

---
 modules/services/databases/postgresql.nix | 31 ++++++++++++-----------
 1 file changed, 16 insertions(+), 15 deletions(-)

diff --git a/modules/services/databases/postgresql.nix b/modules/services/databases/postgresql.nix
index a52d241e96c..caf9a586eb1 100644
--- a/modules/services/databases/postgresql.nix
+++ b/modules/services/databases/postgresql.nix
@@ -22,8 +22,6 @@ let
 
   postgresql = postgresqlAndPlugins cfg.package;
 
-  run = "su -s ${pkgs.stdenv.shell} postgres";
-
   flags = optional cfg.enableTCPIP "-i";
 
   # The main PostgreSQL configuration file.
@@ -157,7 +155,7 @@ in
 
     environment.systemPackages = [postgresql];
 
-    jobs.postgresql =
+    boot.systemd.services.postgresql =
       { description = "PostgreSQL server";
 
         wantedBy = [ "multi-user.target" ];
@@ -176,25 +174,20 @@ in
             if ! test -e ${cfg.dataDir}; then
                 mkdir -m 0700 -p ${cfg.dataDir}
                 chown -R postgres ${cfg.dataDir}
-                ${run} -c 'initdb -U root'
+                su -s ${pkgs.stdenv.shell} postgres -c 'initdb -U root'
                 rm -f ${cfg.dataDir}/*.conf
             fi
 
             ln -sfn ${configFile} ${cfg.dataDir}/postgresql.conf
           ''; # */
 
-        exec = "${run} -c 'postgres ${toString flags}'";
-
-        # Wait for PostgreSQL to be ready to accept connections.
-        postStart =
-          ''
-            while ! psql postgres -c ""; do
-                sleep 1
-            done
-          '';
-
         serviceConfig =
-          { # Shut down Postgres using SIGINT ("Fast Shutdown mode").  See
+          { ExecStart = "@${postgresql}/bin/postgres postgres ${toString flags}";
+            User = "postgres";
+            Group = "postgres";
+            PermissionsStartOnly = true;
+
+            # Shut down Postgres using SIGINT ("Fast Shutdown mode").  See
             # http://www.postgresql.org/docs/current/static/server-shutdown.html
             KillSignal = "SIGINT";
 
@@ -202,6 +195,14 @@ in
             # receiving systemd's SIGINT.
             TimeoutSec = 60;
           };
+
+        # Wait for PostgreSQL to be ready to accept connections.
+        postStart =
+          ''
+            while ! psql postgres -c ""; do
+                sleep 1
+            done
+          '';
       };
 
   };
-- 
GitLab


From 2326c6da2bd80e6d66846dd814ebb6449469e0c6 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 1 Oct 2012 16:53:13 -0400
Subject: [PATCH 4039/5331] postgresql.nix: Depend on the filesystem containing
 the database

---
 modules/services/databases/postgresql.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/modules/services/databases/postgresql.nix b/modules/services/databases/postgresql.nix
index caf9a586eb1..66bb722782a 100644
--- a/modules/services/databases/postgresql.nix
+++ b/modules/services/databases/postgresql.nix
@@ -203,6 +203,8 @@ in
                 sleep 1
             done
           '';
+
+        unitConfig.RequiresMountsFor = "${cfg.dataDir}";
       };
 
   };
-- 
GitLab


From 990ec8cc4e0ca8c609b6097eafd3aef31f9c7fb8 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 1 Oct 2012 17:32:03 -0400
Subject: [PATCH 4040/5331] Decrease PostgreSQL start check interval

---
 modules/services/databases/postgresql.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/services/databases/postgresql.nix b/modules/services/databases/postgresql.nix
index 66bb722782a..c34ae9037f2 100644
--- a/modules/services/databases/postgresql.nix
+++ b/modules/services/databases/postgresql.nix
@@ -156,7 +156,7 @@ in
     environment.systemPackages = [postgresql];
 
     boot.systemd.services.postgresql =
-      { description = "PostgreSQL server";
+      { description = "PostgreSQL";
 
         wantedBy = [ "multi-user.target" ];
         after = [ "network.target" "fs.target" ];
@@ -200,7 +200,7 @@ in
         postStart =
           ''
             while ! psql postgres -c ""; do
-                sleep 1
+                sleep 0.1
             done
           '';
 
-- 
GitLab


From ca13a913d9f128616b79df971d76e5dd12132a53 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 1 Oct 2012 18:20:22 -0400
Subject: [PATCH 4041/5331] Oops, lost some code

---
 modules/system/upstart/upstart.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/modules/system/upstart/upstart.nix b/modules/system/upstart/upstart.nix
index a32bca8ddd7..57a532837f3 100644
--- a/modules/system/upstart/upstart.nix
+++ b/modules/system/upstart/upstart.nix
@@ -75,6 +75,8 @@ let
         job.serviceConfig
         // optionalAttrs (job.preStart != "" && (job.script != "" || job.exec != ""))
           { ExecStartPre = preStartScript; }
+        // optionalAttrs (job.preStart != "" && job.script == "" && job.exec == "")
+          { ExecStart = preStartScript; }
         // optionalAttrs (job.script != "" || job.exec != "")
           { ExecStart = startScript; }
         // optionalAttrs (job.postStart != "")
-- 
GitLab


From 2cf5e3cb6640ae634c5d7060d0ff6fa3b647ce70 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 1 Oct 2012 18:58:11 -0400
Subject: [PATCH 4042/5331] =?UTF-8?q?Add=20options=20=E2=80=98boot.systemd?=
 =?UTF-8?q?.targets=E2=80=99=20and=20=E2=80=98boot.systemd.sockets?=
 =?UTF-8?q?=E2=80=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 modules/services/misc/nix-daemon.nix         | 16 ++----
 modules/system/boot/systemd-unit-options.nix | 32 +++++++-----
 modules/system/boot/systemd.nix              | 54 ++++++++++++++++++--
 3 files changed, 74 insertions(+), 28 deletions(-)

diff --git a/modules/services/misc/nix-daemon.nix b/modules/services/misc/nix-daemon.nix
index 718566ee5b9..eeb26ee5e15 100644
--- a/modules/services/misc/nix-daemon.nix
+++ b/modules/services/misc/nix-daemon.nix
@@ -246,17 +246,11 @@ in
           target = "nix.machines";
         };
 
-    boot.systemd.units."nix-daemon.socket" =
-      { wantedBy = [ "sockets.target" ];
-        text =
-          ''
-            [Unit]
-            Description=Nix Daemon Socket
-            Before=multi-user.target
-
-            [Socket]
-            ListenStream=/nix/var/nix/daemon-socket/socket
-          '';
+    boot.systemd.sockets."nix-daemon" =
+      { description = "Nix Daemon Socket";
+        wantedBy = [ "sockets.target" ];
+        before = [ "multi-user.target" ];
+        socketConfig.ListenStream = "/nix/var/nix/daemon-socket/socket";
       };
 
     boot.systemd.services."nix-daemon" =
diff --git a/modules/system/boot/systemd-unit-options.nix b/modules/system/boot/systemd-unit-options.nix
index 95506712cac..276197d24d8 100644
--- a/modules/system/boot/systemd-unit-options.nix
+++ b/modules/system/boot/systemd-unit-options.nix
@@ -2,9 +2,9 @@
 
 with pkgs.lib;
 
-{
+rec {
 
-  serviceOptions = {
+  unitOptions = {
 
     description = mkOption {
       default = "";
@@ -62,6 +62,22 @@ with pkgs.lib;
       description = "Units that want (i.e. depend on) this unit.";
     };
 
+    unitConfig = mkOption {
+      default = {};
+      example = { RequiresMountsFor = "/data"; };
+      type = types.attrs;
+      description = ''
+        Each attribute in this set specifies an option in the
+        <literal>[Unit]</literal> section of the unit.  See
+        <citerefentry><refentrytitle>systemd.unit</refentrytitle>
+        <manvolnum>5</manvolnum></citerefentry> for details.
+      '';
+    };
+
+  };
+
+  serviceOptions = unitOptions // {
+
     environment = mkOption {
       default = {};
       type = types.attrs;
@@ -80,18 +96,6 @@ with pkgs.lib;
       '';
     };
 
-    unitConfig = mkOption {
-      default = {};
-      example = { RequiresMountsFor = "/data"; };
-      type = types.attrs;
-      description = ''
-        Each attribute in this set specifies an option in the
-        <literal>[Unit]</literal> section of the unit.  See
-        <citerefentry><refentrytitle>systemd.unit</refentrytitle>
-        <manvolnum>5</manvolnum></citerefentry> for details.
-      '';
-    };
-
     serviceConfig = mkOption {
       default = {};
       example =
diff --git a/modules/system/boot/systemd.nix b/modules/system/boot/systemd.nix
index bb2ea087c21..23751e2104a 100644
--- a/modules/system/boot/systemd.nix
+++ b/modules/system/boot/systemd.nix
@@ -202,9 +202,17 @@ let
         (if isList value then value else [value]))
         as));
 
-  serviceToUnit = name: def:
+  targetToUnit = name: def:
     { inherit (def) wantedBy;
+      text =
+        ''
+          [Unit]
+          ${attrsToSection def.unitConfig}
+        '';
+    };
 
+  serviceToUnit = name: def:
+    { inherit (def) wantedBy;
       text =
         ''
           [Unit]
@@ -240,6 +248,18 @@ let
         '';
     };
 
+  socketToUnit = name: def:
+    { inherit (def) wantedBy;
+      text =
+        ''
+          [Unit]
+          ${attrsToSection def.unitConfig}
+
+          [Socket]
+          ${attrsToSection def.socketConfig}
+        '';
+    };
+
   nixosUnits = mapAttrsToList makeUnit cfg.units;
 
   units = pkgs.runCommand "units" { preferLocalBuild = true; }
@@ -319,11 +339,37 @@ in
       description = "Packages providing systemd units.";
     };
 
+    boot.systemd.targets = mkOption {
+      default = {};
+      type = types.attrsOf types.optionSet;
+      options = unitOptions;
+      description = "Definition of systemd target units.";
+    };
+
     boot.systemd.services = mkOption {
       default = {};
       type = types.attrsOf types.optionSet;
       options = [ serviceOptions serviceConfig ];
-      description = "Definition of systemd services.";
+      description = "Definition of systemd service units.";
+    };
+
+    boot.systemd.sockets = mkOption {
+      default = {};
+      type = types.attrsOf types.optionSet;
+      options = unitOptions // {
+        socketConfig = mkOption {
+          default = {};
+          example = { ListenStream = "/run/my-socket"; };
+          type = types.attrs;
+          description = ''
+            Each attribute in this set specifies an option in the
+            <literal>[Socket]</literal> section of the unit.  See
+            <citerefentry><refentrytitle>systemd.socket</refentrytitle>
+            <manvolnum>5</manvolnum></citerefentry> for details.
+          '';
+        };
+      };
+      description = "Definition of systemd socket units.";
     };
 
     boot.systemd.defaultUnit = mkOption {
@@ -385,7 +431,9 @@ in
     boot.systemd.units =
       { "rescue.service".text = rescueService; }
       // { "fs.target" = { text = fsTarget; wantedBy = [ "multi-user.target" ]; }; }
-      // mapAttrs' (n: v: nameValuePair "${n}.service" (serviceToUnit n v)) cfg.services;
+      // mapAttrs' (n: v: nameValuePair "${n}.target" (targetToUnit n v)) cfg.targets
+      // mapAttrs' (n: v: nameValuePair "${n}.service" (serviceToUnit n v)) cfg.services
+      // mapAttrs' (n: v: nameValuePair "${n}.socket" (socketToUnit n v)) cfg.sockets;
 
   };
 
-- 
GitLab


From 793297861726a6c7e589d3ad5d2ab063baaec987 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 2 Oct 2012 10:26:55 -0400
Subject: [PATCH 4043/5331] Fix Upstart compatibility jobs that depend on
 "stopped udevtrigger"

It's not enough to say "after udev-settle.service" since
udev-settle.service is not wanted/required anywhere - we need to say
"wants udev-settle.service" as well.

This should fix problems with ALSA and X11 initialisation that people
have been seeing.
---
 modules/system/upstart/upstart.nix | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/modules/system/upstart/upstart.nix b/modules/system/upstart/upstart.nix
index 57a532837f3..4fbf683c440 100644
--- a/modules/system/upstart/upstart.nix
+++ b/modules/system/upstart/upstart.nix
@@ -54,7 +54,7 @@ let
         '';
     in {
 
-      inherit (job) description requires wants before partOf environment path restartIfChanged unitConfig;
+      inherit (job) description wants before partOf environment path restartIfChanged unitConfig;
 
       after =
         (if job.startOn == "stopped udevtrigger" then [ "systemd-udev-settle.service" ] else
@@ -66,6 +66,10 @@ let
          builtins.trace "Warning: job ‘${job.name}’ has unknown startOn value ‘${job.startOn}’." []
         ) ++ job.after;
 
+      requires = 
+        (if job.startOn == "stopped udevtrigger" then [ "systemd-udev-settle.service" ] else []
+        ) ++ job.requires;
+
       wantedBy =
         (if job.startOn == "" then [] else
          if job.startOn == "ip-up" then [ "ip-up.target" ] else
-- 
GitLab


From 2044ae785db87ac7adbd1b0b749f106210213c37 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 2 Oct 2012 10:32:29 -0400
Subject: [PATCH 4044/5331] Use "wants" instead of "requires"

---
 modules/system/upstart/upstart.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/modules/system/upstart/upstart.nix b/modules/system/upstart/upstart.nix
index 4fbf683c440..d6362a0e4ca 100644
--- a/modules/system/upstart/upstart.nix
+++ b/modules/system/upstart/upstart.nix
@@ -54,7 +54,7 @@ let
         '';
     in {
 
-      inherit (job) description wants before partOf environment path restartIfChanged unitConfig;
+      inherit (job) description requires before partOf environment path restartIfChanged unitConfig;
 
       after =
         (if job.startOn == "stopped udevtrigger" then [ "systemd-udev-settle.service" ] else
@@ -66,9 +66,9 @@ let
          builtins.trace "Warning: job ‘${job.name}’ has unknown startOn value ‘${job.startOn}’." []
         ) ++ job.after;
 
-      requires = 
+      wants = 
         (if job.startOn == "stopped udevtrigger" then [ "systemd-udev-settle.service" ] else []
-        ) ++ job.requires;
+        ) ++ job.wants;
 
       wantedBy =
         (if job.startOn == "" then [] else
-- 
GitLab


From 666620cdd50a1af57aa9b40faea2bcd828b3281c Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 2 Oct 2012 10:32:56 -0400
Subject: [PATCH 4045/5331] =?UTF-8?q?Use=20=E2=80=98mountpoint=20-q?=
 =?UTF-8?q?=E2=80=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 modules/system/boot/stage-2-init.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/system/boot/stage-2-init.sh b/modules/system/boot/stage-2-init.sh
index 55e61ffb69a..f54404ddcce 100644
--- a/modules/system/boot/stage-2-init.sh
+++ b/modules/system/boot/stage-2-init.sh
@@ -46,7 +46,7 @@ fi
 chown root:nixbld /nix/store
 chmod 1775 /nix/store
 if [ -n "@readOnlyStore@" ]; then
-    if ! mountpoint /nix/store; then
+    if ! mountpoint -q /nix/store; then
         mkdir -p /nix/rw-store
         mount --bind /nix/store /nix/store
         mount -o remount,ro,bind /nix/store
-- 
GitLab


From 02624758b192c33de951b208a7b159dd6c2856e4 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 2 Oct 2012 11:09:54 -0400
Subject: [PATCH 4046/5331] Use udev to restore ALSA volume settings

Alsa-utils provides a udev rule to restore volume settings, so use
that instead of restoring them from a systemd service.  The
"alsa-store" service saves the settings on shutdown.
---
 modules/services/audio/alsa.nix | 30 ++++++++++--------------------
 1 file changed, 10 insertions(+), 20 deletions(-)

diff --git a/modules/services/audio/alsa.nix b/modules/services/audio/alsa.nix
index fa63bc74cfc..ff08f21a485 100644
--- a/modules/services/audio/alsa.nix
+++ b/modules/services/audio/alsa.nix
@@ -45,29 +45,19 @@ in
 
     environment.systemPackages = [ alsaUtils ];
 
-    boot.kernelModules = optional config.sound.enableOSSEmulation "snd_pcm_oss";
-
-    jobs.alsa =
-      { description = "ALSA Volume Settings";
-
-        startOn = "stopped udevtrigger";
+    # ALSA provides a udev rule for restoring volume settings.
+    services.udev.packages = [ alsaUtils ];
 
-        preStart =
-          ''
-            mkdir -m 0755 -p $(dirname ${soundState})
-
-            # Try to restore the sound state.
-            ${alsaUtils}/sbin/alsactl --ignore init || true
-            ${alsaUtils}/sbin/alsactl --ignore -f ${soundState} restore || true
-          '';
+    boot.kernelModules = optional config.sound.enableOSSEmulation "snd_pcm_oss";
 
-        postStop =
-          ''
-            # Save the sound state.
-            ${alsaUtils}/sbin/alsactl --ignore -f ${soundState} store
-          '';
+    boot.systemd.services."alsa-store" =
+      { description = "Store Sound Card State";
+        wantedBy = [ "shutdown.target" ];
+        before = [ "shutdown.target" ];
+        unitConfig.DefaultDependencies = "no";
+        serviceConfig.Type = "oneshot";
+        serviceConfig.ExecStart = "${alsaUtils}/sbin/alsactl store --ignore";
       };
-
   };
 
 }
-- 
GitLab


From 13a5ebad32b269e11feb2e039fad26f63b2d2679 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 4 Oct 2012 12:34:44 -0400
Subject: [PATCH 4047/5331] Update some tests for systemd

---
 lib/test-driver/Machine.pm | 42 +++++++++++++++++++++++++++-----------
 tests/login.nix            | 32 ++++++++++++++---------------
 tests/misc.nix             |  2 +-
 tests/openssh.nix          |  2 +-
 tests/subversion.nix       |  2 +-
 5 files changed, 49 insertions(+), 31 deletions(-)

diff --git a/lib/test-driver/Machine.pm b/lib/test-driver/Machine.pm
index 76c736b609d..c7e0bc102f1 100644
--- a/lib/test-driver/Machine.pm
+++ b/lib/test-driver/Machine.pm
@@ -352,18 +352,39 @@ sub mustFail {
 }
 
 
-# Wait for an Upstart job to reach the "running" state.
-sub waitForJob {
-    my ($self, $jobName) = @_;
-    $self->nest("waiting for job ‘$jobName’", sub {
+sub getUnitInfo {
+    my ($self, $unit) = @_;
+    my ($status, $lines) = $self->execute("systemctl --no-pager show '$unit'");
+    return undef if $status != 0;
+    my $info = {};
+    foreach my $line (split '\n', $lines) {
+        $line =~ /^([^=]+)=(.*)$/ or next;
+        $info->{$1} = $2;
+    }
+    return $info;
+}
+
+
+# Wait for a systemd unit to reach the "active" state.
+sub waitForUnit {
+    my ($self, $unit) = @_;
+    $self->nest("waiting for unit ‘$unit’", sub {
         retry sub {
-            my ($status, $out) = $self->execute("initctl status $jobName");
-            return 1 if $out =~ /start\/running/;
+            my $info = $self->getUnitInfo($unit);
+            my $state = $info->{ActiveState};
+            die "unit ‘$unit’ reached state ‘$state’\n" if $state eq "failed";
+            return 1 if $state eq "active";
         };
     });
 }
 
 
+sub waitForJob {
+    my ($self, $jobName) = @_;
+    return $self->waitForUnit($jobName . ".service");
+}
+
+
 # Wait until the specified file exists.
 sub waitForFile {
     my ($self, $fileName) = @_;
@@ -377,16 +398,13 @@ sub waitForFile {
 
 sub startJob {
     my ($self, $jobName) = @_;
-    $self->execute("initctl start $jobName");
-    my ($status, $out) = $self->execute("initctl status $jobName");
-    die "failed to start $jobName" unless $out =~ /start\/running/;
+    $self->execute("systemctl stop $jobName.service");
+    # FIXME: check result
 }
 
 sub stopJob {
     my ($self, $jobName) = @_;
-    $self->execute("initctl stop $jobName");
-    my ($status, $out) = $self->execute("initctl status $jobName");
-    die "failed to stop $jobName" unless $out =~ /stop\/waiting/;
+    $self->execute("systemctl stop $jobName.service");
 }
 
 
diff --git a/tests/login.nix b/tests/login.nix
index 90987782f8c..cdd6414744a 100644
--- a/tests/login.nix
+++ b/tests/login.nix
@@ -6,14 +6,23 @@
 
   testScript =
     ''
+      $machine->waitForUnit("default.target");
+      $machine->screenshot("postboot");
+
       subtest "create user", sub {
           $machine->succeed("useradd -m alice");
           $machine->succeed("(echo foobar; echo foobar) | passwd alice");
       };
 
+      # Check whether switching VTs works.
+      subtest "virtual console switching", sub {
+          $machine->sendKeys("alt-f2");
+          $machine->waitUntilSucceeds("[ \$(fgconsole) = 2 ]");
+          $machine->waitForUnit('getty@tty2.service');
+      };
+
       # Log in as alice on a virtual console.
       subtest "virtual console login", sub {
-          $machine->waitForJob("tty1");
           $machine->sleep(2); # urgh: wait for username prompt
           $machine->sendChars("alice\n");
           $machine->waitUntilSucceeds("pgrep login");
@@ -24,28 +33,19 @@
           $machine->waitForFile("/home/alice/done");
       };
 
-      # Check whether switching VTs works.
-      subtest "virtual console switching", sub {
-          $machine->sendKeys("alt-f10");
-          $machine->waitUntilSucceeds("[ \$(fgconsole) = 10 ]");
-          $machine->sleep(2); # allow fbcondecor to catch up (not important)
-          $machine->screenshot("syslog");
-      };
-
-      # Check whether ConsoleKit/udev gives and removes device
-      # ownership as needed.
+      # Check whether systemd gives and removes device ownership as
+      # needed.
       subtest "device permissions", sub {
+          $machine->succeed("getfacl /dev/snd/timer | grep -q alice");
+          $machine->sendKeys("alt-f1");
+          $machine->waitUntilSucceeds("[ \$(fgconsole) = 1 ]");
           $machine->fail("getfacl /dev/snd/timer | grep -q alice");
-          $machine->succeed("chvt 1");
-          $machine->waitUntilSucceeds("getfacl /dev/snd/timer | grep -q alice");
           $machine->succeed("chvt 2");
-          $machine->sleep(2); # urgh
-          $machine->fail("getfacl /dev/snd/timer | grep -q alice");
+          $machine->waitUntilSucceeds("getfacl /dev/snd/timer | grep -q alice");
       };
 
       # Log out.
       subtest "virtual console logout", sub {
-          $machine->succeed("chvt 1");
           $machine->sendChars("exit\n");
           $machine->waitUntilFails("pgrep -u alice bash");
           $machine->screenshot("mingetty");
diff --git a/tests/misc.nix b/tests/misc.nix
index 8501d6a0979..9f85877e8bb 100644
--- a/tests/misc.nix
+++ b/tests/misc.nix
@@ -30,7 +30,7 @@
 
       # Test that the swap file got created.
       subtest "swapfile", sub {
-          $machine->waitUntilSucceeds("cat /proc/swaps | grep /root/swapfile");
+          $machine->waitForUnit("root-swapfile.swap");
           $machine->succeed("ls -l /root/swapfile | grep 134217728");
       };
     '';
diff --git a/tests/openssh.nix b/tests/openssh.nix
index 5818c9d6ceb..7a3d789327a 100644
--- a/tests/openssh.nix
+++ b/tests/openssh.nix
@@ -30,6 +30,6 @@
     $client->mustSucceed("chmod 600 /root/.ssh/id_dsa");
 
     $client->waitForJob("network-interfaces");
-    $client->mustSucceed("ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no server 'echo hello world'");
+    $client->mustSucceed("ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no server 'echo hello world' >&2");
   '';
 }
diff --git a/tests/subversion.nix b/tests/subversion.nix
index fb8bba93806..dc4fe9da470 100644
--- a/tests/subversion.nix
+++ b/tests/subversion.nix
@@ -41,7 +41,7 @@ in
           services.httpd.enable = true;
           services.httpd.adminAddr = "e.dolstra@tudelft.nl";
           services.httpd.extraSubservices =
-            [ { serviceType = "subversion";
+            [ { function = import <services/subversion>;
                 urlPrefix = "";
                 dataDir = "/data/subversion";
                 userCreationDomain = "192.168.0.0/16";
-- 
GitLab


From 8dc4f2c3bee30b079c82cce6ddc9f8df6d61ef91 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 4 Oct 2012 15:27:31 -0400
Subject: [PATCH 4048/5331] Fix the rogue service for systemd

---
 modules/services/misc/rogue.nix | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/modules/services/misc/rogue.nix b/modules/services/misc/rogue.nix
index c313de956fc..059b39cad5e 100644
--- a/modules/services/misc/rogue.nix
+++ b/modules/services/misc/rogue.nix
@@ -40,14 +40,17 @@ in
 
     boot.extraTTYs = [ cfg.tty ];
 
-    jobs.rogue =
+    boot.systemd.services.rogue =
       { description = "Rogue dungeon crawling game";
-
-        startOn = "started udev";
-
-        extraConfig = "chdir /root";
-
-        exec = "${pkgs.rogue}/bin/rogue < /dev/${cfg.tty} > /dev/${cfg.tty} 2>&1";
+        wantedBy = [ "multi-user.target" ];
+        serviceConfig =
+          { ExecStart = "${pkgs.rogue}/bin/rogue";
+            StandardInput = "tty";
+            StandardOutput = "tty";
+            TTYPath = "/dev/${cfg.tty}";
+            TTYReset = true;
+            TTYVTDisallocate = true;
+          };
       };
 
     services.ttyBackgrounds.specificThemes = singleton
-- 
GitLab


From 74be2d9707248ba4c79d86e64f0f5f13868891fd Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 4 Oct 2012 16:14:44 -0400
Subject: [PATCH 4049/5331] ISO image: Fix graphical GRUB menu

---
 modules/installer/cd-dvd/iso-image.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/installer/cd-dvd/iso-image.nix b/modules/installer/cd-dvd/iso-image.nix
index 4f87f29f2e9..be4777356e4 100644
--- a/modules/installer/cd-dvd/iso-image.nix
+++ b/modules/installer/cd-dvd/iso-image.nix
@@ -87,7 +87,7 @@ let
   # The Grub image.
   grubImage = pkgs.runCommand "grub_eltorito" {}
     ''
-      ${pkgs.grub2}/bin/grub-mkimage -O i386-pc -o tmp biosdisk iso9660 help linux linux16 chain vbe png jpeg echo test normal
+      ${pkgs.grub2}/bin/grub-mkimage -O i386-pc -o tmp biosdisk iso9660 help linux linux16 chain png jpeg echo gfxmenu reboot
       cat ${pkgs.grub2}/lib/grub/*/cdboot.img tmp > $out
     ''; # */
 
-- 
GitLab


From 6c6134c2d2f2d5f7a37d99c4ff54ae2a29ec1951 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 4 Oct 2012 16:15:10 -0400
Subject: [PATCH 4050/5331] Fix the manual service on the installation CD

---
 modules/services/misc/nixos-manual.nix | 26 +++++++++++++-------------
 modules/services/misc/rogue.nix        |  1 +
 2 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/modules/services/misc/nixos-manual.nix b/modules/services/misc/nixos-manual.nix
index 84c39101bb6..2e98d50b0ce 100644
--- a/modules/services/misc/nixos-manual.nix
+++ b/modules/services/misc/nixos-manual.nix
@@ -73,19 +73,19 @@ in
 
     boot.extraTTYs = mkIf cfg.showManual ["tty${cfg.ttyNumber}"];
 
-    jobs = mkIf cfg.showManual
-      { nixosManual =
-        { name = "nixos-manual";
-
-          description = "NixOS manual";
-
-          startOn = "started udev";
-
-          exec =
-            ''
-              ${cfg.browser} ${manual.manual}/share/doc/nixos/manual.html \
-                < /dev/tty${toString cfg.ttyNumber} > /dev/tty${toString cfg.ttyNumber} 2>&1
-            '';
+    boot.systemd.services = optionalAttrs cfg.showManual
+      { "nixos-manual" =
+        { description = "NixOS Manual";
+          wantedBy = [ "multi-user.target" ];
+          serviceConfig =
+            { ExecStart = "${cfg.browser} ${manual.manual}/share/doc/nixos/manual.html";
+              StandardInput = "tty";
+              StandardOutput = "tty";
+              TTYPath = "/dev/tty${cfg.ttyNumber}";
+              TTYReset = true;
+              TTYVTDisallocate = true;
+              Restart = "always";
+            };
         };
       };
 
diff --git a/modules/services/misc/rogue.nix b/modules/services/misc/rogue.nix
index 059b39cad5e..12d61a8ea9f 100644
--- a/modules/services/misc/rogue.nix
+++ b/modules/services/misc/rogue.nix
@@ -50,6 +50,7 @@ in
             TTYPath = "/dev/${cfg.tty}";
             TTYReset = true;
             TTYVTDisallocate = true;
+            Restart = "always";
           };
       };
 
-- 
GitLab


From fdea3ac3d26e0131b07f59d656bb5433c2adab0f Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 4 Oct 2012 16:15:30 -0400
Subject: [PATCH 4051/5331] stage-2-init: Don't rely on groups being
 initialised

---
 modules/system/boot/stage-2-init.sh | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/modules/system/boot/stage-2-init.sh b/modules/system/boot/stage-2-init.sh
index f54404ddcce..8f1184a5eb3 100644
--- a/modules/system/boot/stage-2-init.sh
+++ b/modules/system/boot/stage-2-init.sh
@@ -42,8 +42,9 @@ fi
 
 
 # Make /nix/store a read-only bind mount to enforce immutability of
-# the Nix store.
-chown root:nixbld /nix/store
+# the Nix store.  Note that we can't use "chown root:nixbld" here
+# because users/groups might not exist yet.
+chown 0:30000 /nix/store
 chmod 1775 /nix/store
 if [ -n "@readOnlyStore@" ]; then
     if ! mountpoint -q /nix/store; then
-- 
GitLab


From 38229da94069b42d1cc95ab715f6046d9fbcbe07 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 4 Oct 2012 16:38:31 -0400
Subject: [PATCH 4052/5331] upower: Add glib to $PATH

The upower daemon needs the gdbus command (which is weird given that
upower links against dbus_glib, but ah well...).  This fixes suspend
in KDE with systemd.
---
 modules/services/hardware/upower.nix | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/modules/services/hardware/upower.nix b/modules/services/hardware/upower.nix
index d025276ea8e..7cd5cd3ddf8 100644
--- a/modules/services/hardware/upower.nix
+++ b/modules/services/hardware/upower.nix
@@ -35,7 +35,15 @@ with pkgs.lib;
 
     services.udev.packages = [ pkgs.upower ];
 
-    boot.systemd.packages = [ pkgs.upower ];
+    boot.systemd.services.upower =
+      { description = "Power Management Daemon";
+        path = [ pkgs.glib ]; # needed for gdbus
+        serviceConfig =
+          { Type = "dbus";
+            BusName = "org.freedesktop.UPower";
+            ExecStart = "@${pkgs.upower}/libexec/upowerd upowerd";
+          };
+      };
 
     system.activationScripts.upower =
       ''
-- 
GitLab


From c6d12257f1c5ca564dbf71990daa62126e6a17eb Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 4 Oct 2012 17:57:10 -0400
Subject: [PATCH 4053/5331] systemd: Run the powerManagement.* hooks on
 suspend/resume

Also, drop pm-utils. Systemd now takes care of suspend/resume.
---
 modules/config/power-management.nix | 63 ++++++++++++++++++-----------
 1 file changed, 40 insertions(+), 23 deletions(-)

diff --git a/modules/config/power-management.nix b/modules/config/power-management.nix
index c8e1a62749b..18bb4fb4d42 100644
--- a/modules/config/power-management.nix
+++ b/modules/config/power-management.nix
@@ -6,21 +6,6 @@ let
 
   cfg = config.powerManagement;
 
-  sleepHook = pkgs.writeScript "sleep-hook.sh"
-    ''
-      #! ${pkgs.stdenv.shell}
-      action="$1"
-      case "$action" in
-          hibernate|suspend)
-              ${cfg.powerDownCommands}
-              ;;
-          thaw|resume)
-              ${cfg.resumeCommands}
-              ${cfg.powerUpCommands}
-              ;;
-      esac
-    '';
-
 in
 
 {
@@ -79,13 +64,6 @@ in
     # Enable the ACPI daemon.  Not sure whether this is essential.
     services.acpid.enable = true;
 
-    environment.systemPackages = [ pkgs.pmutils ];
-
-    environment.etc = singleton
-      { source = sleepHook;
-        target = "pm/sleep.d/00sleep-hook";
-      };
-
     boot.kernelModules =
       [ "acpi_cpufreq" "cpufreq_performance" "cpufreq_powersave" "cpufreq_ondemand"
         "cpufreq_conservative"
@@ -93,7 +71,46 @@ in
 
     powerManagement.cpuFreqGovernor = mkDefault "ondemand";
     powerManagement.scsiLinkPolicy = mkDefault "min_power";
-    
+
+    # Service executed before suspending/hibernating.
+    boot.systemd.services."pre-sleep" =
+      { description = "Pre-Sleep Actions";
+        wantedBy = [ "sleep.target" ];
+        before = [ "sleep.target" ];
+        script =
+          ''
+            ${cfg.powerDownCommands}
+          '';
+        serviceConfig.Type = "oneshot";
+      };
+
+    # Service executed before suspending/hibernating.  There doesn't
+    # seem to be a good way to hook in a service to be executed after
+    # both suspend *and* hibernate, so have a separate one for each.
+    boot.systemd.services."post-suspend" =
+      { description = "Post-Suspend Actions";
+        wantedBy = [ "suspend.target" ];
+        after = [ "systemd-suspend.service" ];
+        script =
+          ''
+            ${cfg.resumeCommands}
+            ${cfg.powerUpCommands}
+          '';
+        serviceConfig.Type = "oneshot";
+      };
+
+    boot.systemd.services."post-hibernate" =
+      { description = "Post-Hibernate Actions";
+        wantedBy = [ "hibernate.target" ];
+        after = [ "systemd-hibernate.service" ];
+        script =
+          ''
+            ${cfg.resumeCommands}
+            ${cfg.powerUpCommands}
+          '';
+        serviceConfig.Type = "oneshot";
+      };
+
   };
 
 }
-- 
GitLab


From db2a4d144eab5917b95550ca727351cc9bd2c55a Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 4 Oct 2012 21:44:24 -0400
Subject: [PATCH 4054/5331] xsession: Set a inhibitor to prevent systemd from
 handling the power button and lid

---
 modules/services/x11/display-managers/default.nix | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/modules/services/x11/display-managers/default.nix b/modules/services/x11/display-managers/default.nix
index 528b3a6f727..b94278d0b0d 100644
--- a/modules/services/x11/display-managers/default.nix
+++ b/modules/services/x11/display-managers/default.nix
@@ -31,6 +31,13 @@ let
         exec > ~/.xsession-errors 2>&1
       ''}
 
+      # Stop systemd from handling the power button and lid switch,
+      # since presumably the desktop environment will handle these.
+      if [ -z "$_INHIBITION_LOCK_TAKEN" ]; then
+        export _INHIBITION_LOCK_TAKEN=1
+        ${config.system.build.systemd}/bin/systemd-inhibit --what=handle-lid-switch:handle-power-key "$0" "$sessionType"
+      fi
+
       ${optionalString cfg.startOpenSSHAgent ''
         if test -z "$SSH_AUTH_SOCK"; then
             # Restart this script as a child of the SSH agent.  (It is
-- 
GitLab


From 52483c36bb6023cf4c0ff0da559b5d4b0add7d2f Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 4 Oct 2012 21:44:45 -0400
Subject: [PATCH 4055/5331] Lowercase debug output

---
 modules/system/etc/make-etc.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/system/etc/make-etc.sh b/modules/system/etc/make-etc.sh
index 6075bdb2673..7cf68db9ddc 100644
--- a/modules/system/etc/make-etc.sh
+++ b/modules/system/etc/make-etc.sh
@@ -26,9 +26,9 @@ for ((i = 0; i < ${#targets_[@]}; i++)); do
         if ! [ -e $out/etc/$target ]; then
             ln -s $source $out/etc/$target
         else
-            echo "Duplicate entry $target -> $source"
+            echo "duplicate entry $target -> $source"
             if test "$(readlink $out/etc/$target)" != "$source"; then
-                echo "Mismatched duplicate entry $(readlink $out/etc/$target) <-> $source"
+                echo "mismatched duplicate entry $(readlink $out/etc/$target) <-> $source"
                 exit 1
             fi
         fi
-- 
GitLab


From 7d26dde69a48b2e3b15dd25b55cbc579a68e9f4e Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 4 Oct 2012 21:58:20 -0400
Subject: [PATCH 4056/5331] Oops, systemd-inhibit should be exec'ed

---
 modules/services/x11/display-managers/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/services/x11/display-managers/default.nix b/modules/services/x11/display-managers/default.nix
index b94278d0b0d..86a636c27c7 100644
--- a/modules/services/x11/display-managers/default.nix
+++ b/modules/services/x11/display-managers/default.nix
@@ -35,7 +35,7 @@ let
       # since presumably the desktop environment will handle these.
       if [ -z "$_INHIBITION_LOCK_TAKEN" ]; then
         export _INHIBITION_LOCK_TAKEN=1
-        ${config.system.build.systemd}/bin/systemd-inhibit --what=handle-lid-switch:handle-power-key "$0" "$sessionType"
+        exec ${config.system.build.systemd}/bin/systemd-inhibit --what=handle-lid-switch:handle-power-key "$0" "$sessionType"
       fi
 
       ${optionalString cfg.startOpenSSHAgent ''
-- 
GitLab


From 9b431cb24e3de6a601d60b2598014897177f5ab0 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 4 Oct 2012 21:58:40 -0400
Subject: [PATCH 4057/5331] upower: Work around the daemon getting stuck after
 a suspend

---
 modules/services/hardware/upower.nix | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/modules/services/hardware/upower.nix b/modules/services/hardware/upower.nix
index 7cd5cd3ddf8..58f2610ce06 100644
--- a/modules/services/hardware/upower.nix
+++ b/modules/services/hardware/upower.nix
@@ -50,6 +50,15 @@ with pkgs.lib;
         mkdir -m 0755 -p /var/lib/upower
       '';
 
+    # The upower daemon seems to get stuck after doing a suspend
+    # (i.e. subsequent suspend requests will say "Sleep has already
+    # been requested and is pending").  So as a workaround, restart
+    # the daemon.
+    powerManagement.resumeCommands =
+      ''
+        ${config.system.build.systemd}/bin/systemctl try-restart upower
+      '';
+
   };
 
 }
-- 
GitLab


From 8f4d8cf6202ffa8069e4a4a984e904d32b74efa8 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 4 Oct 2012 22:10:35 -0400
Subject: [PATCH 4058/5331] Enable the power management module by default

After all, we don't want NixOS machines to contribute to global
warming more than necessary!
---
 modules/config/power-management.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/config/power-management.nix b/modules/config/power-management.nix
index 18bb4fb4d42..c48451bd5f5 100644
--- a/modules/config/power-management.nix
+++ b/modules/config/power-management.nix
@@ -17,7 +17,7 @@ in
     powerManagement = {
 
       enable = mkOption {
-        default = false;
+        default = true;
         description =
           ''
             Whether to enable power management.  This includes support
-- 
GitLab


From 5d9b3ed12b48bad5bf00ed183bde52a102464ca8 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 4 Oct 2012 23:25:11 -0400
Subject: [PATCH 4059/5331] scsi-link-pm: Don't fail if there are no matching
 SCSI hosts

---
 modules/tasks/scsi-link-power-management.nix | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/modules/tasks/scsi-link-power-management.nix b/modules/tasks/scsi-link-power-management.nix
index 263acb8f321..13ffbc7a51a 100644
--- a/modules/tasks/scsi-link-power-management.nix
+++ b/modules/tasks/scsi-link-power-management.nix
@@ -6,7 +6,7 @@ with pkgs.lib;
   ###### interface
 
   options = {
-  
+
     powerManagement.scsiLinkPolicy = mkOption {
       default = "";
       example = "min_power";
@@ -16,7 +16,7 @@ with pkgs.lib;
         the kernel configures "max_performance".
       '';
     };
-    
+
   };
 
 
@@ -25,19 +25,20 @@ with pkgs.lib;
   config = mkIf (config.powerManagement.scsiLinkPolicy != "") {
 
     jobs."scsi-link-pm" =
-      { description = "Set SCSI link power management policy";
+      { description = "SCSI Link Power Management Policy";
 
-        startOn = "started udev";
+        startOn = "stopped udevtrigger";
 
         task = true;
 
         script = ''
+          shopt -s nullglob
           for x in /sys/class/scsi_host/host*/link_power_management_policy; do
             echo ${config.powerManagement.scsiLinkPolicy} > $x
           done
         '';
       };
-      
+
   };
 
 }
-- 
GitLab


From 0ddd147cfc26d84cb2ff70c3de20c5ece0d2abc2 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 4 Oct 2012 23:25:33 -0400
Subject: [PATCH 4060/5331] headless.nix: Mountall is gone

---
 modules/profiles/headless.nix | 11 -----------
 1 file changed, 11 deletions(-)

diff --git a/modules/profiles/headless.nix b/modules/profiles/headless.nix
index 204980e9211..ac0c4059634 100644
--- a/modules/profiles/headless.nix
+++ b/modules/profiles/headless.nix
@@ -14,15 +14,4 @@ with pkgs.lib;
 
   # Since we can't manually respond to a panic, just reboot.
   boot.kernelParams = [ "panic=1" "stage1panic=1" ];
-
-  # Since we don't have an (interactive) console, disable the
-  # emergency shell (started if mountall fails).
-  jobs."mount-failed".script = mkOverride 50
-    ''
-      ${pkgs.utillinux}/bin/logger -p user.emerg -t mountall "filesystem ‘$DEVICE’ could not be mounted on ‘$MOUNTPOINT’"
-    '';
-
-  # Likewise, redirect mountall output from the console to the default
-  # Upstart job log file.
-  jobs."mountall".console = mkOverride 50 "";
 }
-- 
GitLab


From 892b3f6ad622e536d75050fd2a3ae5243f4c4bf5 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 4 Oct 2012 23:26:01 -0400
Subject: [PATCH 4061/5331] acpid: Skip (rather than fail) if /proc/acpi
 doesn't exist

E.g. EC2 instances don't have ACPI.
---
 modules/services/hardware/acpid.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/modules/services/hardware/acpid.nix b/modules/services/hardware/acpid.nix
index 2002df6a303..57dc799ca8c 100644
--- a/modules/services/hardware/acpid.nix
+++ b/modules/services/hardware/acpid.nix
@@ -105,6 +105,8 @@ in
         daemonType = "fork";
 
         exec = "acpid --confdir ${acpiConfDir}";
+
+        unitConfig.ConditionPathExists = [ "/proc/acpi" ];
       };
 
   };
-- 
GitLab


From 98c6c5b730d8b66052b21283c73b1da2429c68fe Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 4 Oct 2012 23:26:19 -0400
Subject: [PATCH 4062/5331] fetch-ec2-data: Update for systemd

---
 modules/virtualisation/ec2-data.nix | 30 ++++++++++++++---------------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/modules/virtualisation/ec2-data.nix b/modules/virtualisation/ec2-data.nix
index 65f40826225..2f58a969492 100644
--- a/modules/virtualisation/ec2-data.nix
+++ b/modules/virtualisation/ec2-data.nix
@@ -8,21 +8,20 @@ with pkgs.lib;
 
 {
 
-  jobs.fetchEC2Data =
-    { name = "fetch-ec2-data";
+  boot.systemd.services."fetch-ec2-data" =
+    { description = "Fetch EC2 Data";
 
-      startOn = "ip-up";
-
-      task = true;
+      wantedBy = [ "multi-user.target" ];
+      before = [ "sshd.service" ];
 
       path = [ pkgs.curl pkgs.iproute ];
 
       script =
         ''
           ip route del blackhole 169.254.169.254/32 || true
-          
+
           curl="curl --retry 3 --retry-delay 0 --fail"
-        
+
           echo "setting host name..."
           ${optionalString (config.networking.hostName == "") ''
             ${pkgs.nettools}/bin/hostname $($curl http://169.254.169.254/1.0/meta-data/hostname)
@@ -60,12 +59,15 @@ with pkgs.lib;
           # accessed from now on.
           ip route add blackhole 169.254.169.254/32
         '';
+
+      serviceConfig.Type = "oneshot";
+      serviceConfig.RemainAfterExit = true;
     };
 
-  jobs.printHostKey =
-    { name = "print-host-key";
-      task = true;
-      startOn = "started sshd";
+  boot.systemd.services."print-host-key" =
+    { description = "Print SSH Host Key";
+      wantedBy = [ "multi-user.target" ];
+      after = [ "sshd.service" ];
       script =
         ''
           # Print the host public key on the console so that the user
@@ -75,10 +77,8 @@ with pkgs.lib;
           ${pkgs.openssh}/bin/ssh-keygen -l -f /etc/ssh/ssh_host_dsa_key.pub > /dev/console
           echo "-----END SSH HOST KEY FINGERPRINTS-----" > /dev/console
         '';
+      serviceConfig.Type = "oneshot";
+      serviceConfig.RemainAfterExit = true;
     };
 
-  # Only start sshd after we've obtained the host key (if given in the
-  # user data), otherwise the sshd job will generate one itself.
-  jobs.sshd.startOn = mkOverride 90 "stopped fetch-ec2-data";
-
 }
-- 
GitLab


From a5969634f4da94f85ffbce2ce81f760fd73c67e5 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 4 Oct 2012 23:38:27 -0400
Subject: [PATCH 4063/5331] sshd: Do detach into the background

This is necessary to ensure that jobs that need to start after sshd
work properly.

This reverts 03f13a49392b90cdc54d8ff057cef76bf0379913.
---
 modules/services/networking/ssh/sshd.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/services/networking/ssh/sshd.nix b/modules/services/networking/ssh/sshd.nix
index 83b7b5372ec..163616fdd18 100644
--- a/modules/services/networking/ssh/sshd.nix
+++ b/modules/services/networking/ssh/sshd.nix
@@ -347,10 +347,10 @@ in
 
         serviceConfig =
           { ExecStart =
-              "${pkgs.openssh}/sbin/sshd -D -h ${cfg.hostKeyPath} " +
+              "${pkgs.openssh}/sbin/sshd -h ${cfg.hostKeyPath} " +
               "-f ${pkgs.writeText "sshd_config" cfg.extraConfig}";
             Restart = "always";
-            Type = "simple";
+            Type = "forking";
             KillMode = "process";
             PIDFile = "/run/sshd.pid";
           };
-- 
GitLab


From dd1770bf0bb7590635244369ac36c771237aa813 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 5 Oct 2012 13:44:15 -0400
Subject: [PATCH 4064/5331] Enable klogd on Linux < 3.5

On Linux >= 3.5, systemd takes care of logging kernel messages.
---
 modules/module-list.nix            |  2 +-
 modules/services/logging/klogd.nix | 41 +++++++++++++++++++++++-------
 2 files changed, 33 insertions(+), 10 deletions(-)

diff --git a/modules/module-list.nix b/modules/module-list.nix
index c1ab8edce40..06c9f8efca7 100644
--- a/modules/module-list.nix
+++ b/modules/module-list.nix
@@ -77,7 +77,7 @@
   ./services/hardware/udev.nix
   ./services/hardware/udisks.nix
   ./services/hardware/upower.nix
-  #./services/logging/klogd.nix
+  ./services/logging/klogd.nix
   ./services/logging/logcheck.nix
   ./services/logging/logrotate.nix
   ./services/logging/logstash.nix
diff --git a/modules/services/logging/klogd.nix b/modules/services/logging/klogd.nix
index 907d83c7a6a..d7d0bbf89a5 100644
--- a/modules/services/logging/klogd.nix
+++ b/modules/services/logging/klogd.nix
@@ -1,19 +1,42 @@
 { config, pkgs, ... }:
 
-###### implementation
+with pkgs.lib;
 
 {
+  ###### interface
 
-  jobs.klogd =
-    { description = "Kernel log daemon";
+  options = {
 
-      startOn = "started syslogd";
+    services.klogd.enable = mkOption {
+      type = types.bool;
+      default = versionOlder (getVersion config.boot.kernelPackages.kernel) "3.5";
+      description = ''
+        Whether to enable klogd, the kernel log message processing
+        daemon.  Since systemd handles logging of kernel messages on
+        Linux 3.5 and later, this is only useful if you're running an
+        older kernel.
+      '';
+    };
 
-      path = [ pkgs.sysklogd ];
+  };
 
-      exec =
-        "klogd -c 1 -2 -n " +
-        "-k $(dirname $(readlink -f /run/booted-system/kernel))/System.map";
-    };
+
+  ###### implementation
+
+  config = mkIf config.services.klogd.enable {
+
+    jobs.klogd =
+      { description = "Kernel Log Daemon";
+
+        wantedBy = [ "multi-user.target" ];
+
+        path = [ pkgs.sysklogd ];
+
+        exec =
+          "klogd -c 1 -2 -n " +
+          "-k $(dirname $(readlink -f /run/booted-system/kernel))/System.map";
+      };
+
+  };
 
 }
-- 
GitLab


From 33754edb3e7cae6e54d85bb01fa0b5e228b283cf Mon Sep 17 00:00:00 2001
From: Jack Cummings <jack@mudshark.org>
Date: Fri, 5 Oct 2012 21:39:56 -0700
Subject: [PATCH 4065/5331]  - add a hostapd module

---
 modules/module-list.nix                 |   1 +
 modules/services/networking/hostapd.nix | 154 ++++++++++++++++++++++++
 2 files changed, 155 insertions(+)
 create mode 100644 modules/services/networking/hostapd.nix

diff --git a/modules/module-list.nix b/modules/module-list.nix
index e480ee9767e..0cca6a95544 100644
--- a/modules/module-list.nix
+++ b/modules/module-list.nix
@@ -129,6 +129,7 @@
   ./services/networking/gnunet.nix
   ./services/networking/gogoclient.nix
   ./services/networking/gvpe.nix
+  ./services/networking/hostapd.nix
   ./services/networking/ifplugd.nix
   ./services/networking/ircd-hybrid/default.nix
   ./services/networking/nat.nix
diff --git a/modules/services/networking/hostapd.nix b/modules/services/networking/hostapd.nix
new file mode 100644
index 00000000000..712b1a6824c
--- /dev/null
+++ b/modules/services/networking/hostapd.nix
@@ -0,0 +1,154 @@
+{ config, pkgs, ... }:
+
+# TODO:
+#
+# asserts 
+#   ensure that the nl80211 module is loaded/compiled in the kernel
+#   hwMode must be a/b/g
+#   channel must be between 1 and 13 (maybe)
+#   wpa_supplicant and hostapd on the same wireless interface doesn't make any sense
+#   perhaps an assertion that there is a dhcp server and a dns server on the IP address serviced by the hostapd?
+
+with pkgs.lib;
+
+let
+
+  cfg = config.services.hostapd;
+  
+  configFile = pkgs.writeText "hostapd.conf"  
+    ''
+    interface=${cfg.interface}
+    driver=${cfg.driver}
+    ssid=${cfg.ssid}
+    hw_mode=${cfg.hwMode}
+    channel=${toString cfg.channel}
+
+    # logging (debug level)
+    logger_syslog=-1
+    logger_syslog_level=2
+    logger_stdout=-1
+    logger_stdout_level=2
+
+    ctrl_interface=/var/run/hostapd
+    ctrl_interface_group=${cfg.group}
+
+    ${if cfg.wpa then ''
+      wpa=1
+      wpa_passphrase=${cfg.wpaPassphrase}
+      '' else ""}
+
+    ${cfg.extraCfg}
+    '' ;
+
+in
+
+{
+  ###### interface
+
+  options = {
+
+    services.hostapd = {
+
+      enable = mkOption {
+        default = false;
+        description = ''
+          enable putting a wireless interface into infrastructure mode,
+          allowing other wireless devices to associate with the wireless interface and do
+          wireless networking. A simple access point will enable hostapd.wpa, and
+          hostapd.wpa_passphrase, hostapd.ssid, dhcpd on the wireless interface to
+          provide IP addresses to the associated stations, and nat (from the wireless
+          interface to an upstream interface). 
+        '';
+      };
+
+      interface = mkOption {
+        default = "";
+        example = "wlan0";
+        description = ''
+          The interfaces <command>hostapd</command> will use. 
+        '';
+      };
+
+      driver = mkOption {
+        default = "nl80211";
+        example = "hostapd";
+        type = types.string;
+        description = "Which driver hostapd will use. Most things will probably use the default.";
+      };
+
+      ssid = mkOption {
+        default = "nixos";
+        example = "mySpecialSSID";
+        type = types.string;
+        description = "SSID to be used in IEEE 802.11 management frames.";
+      };
+
+      hwMode = mkOption {
+        default = "b";
+        example = "g";
+        type = types.string;
+        description = "Operation mode (a = IEEE 802.11a, b = IEEE 802.11b, g = IEEE 802.11g";
+      };
+
+      channel = mkOption { 
+        default = 7;
+        example = 11;
+        type = types.int;
+        description = 
+          ''
+          Channel number (IEEE 802.11)
+          Please note that some drivers do not use this value from hostapd and the
+          channel will need to be configured separately with iwconfig.
+          '';
+      };
+
+      group = mkOption {
+        default = "wheel";
+        example = "network";
+        type = types.string;
+        description = "members of this group can control hostapd";
+        };
+
+      wpa = mkOption {
+        default = true;
+        description = "enable WPA (IEEE 802.11i/D3.0) to authenticate to the access point";
+        };
+
+      wpaPassphrase = mkOption {
+        default = "my_sekret";
+        example = "any_64_char_string";
+        type = types.string;
+        description = "WPA-PSK (pre-shared-key) passphrase. Clients will need this passphrase to associate with this access point";
+        };
+
+      extraCfg = mkOption {
+        default = "";
+        example = ''
+          auth_algo=0
+          ieee80211n=1
+          ht_capab=[HT40-][SHORT-GI-40][DSSS_CCK-40]
+          '';
+        type = types.string;
+        description = "Extra configuration options to put in the hostapd.conf";
+        };
+      };
+    };
+
+
+  ###### implementation
+
+  config = mkIf cfg.enable {
+
+    environment.systemPackages =  [ pkgs.hostapd ];
+
+    jobs.hostapd =
+      { startOn = "started network-interfaces";
+        stopOn = "stopping network-interfaces";
+
+        script =
+          ''
+            exec ${pkgs.hostapd}/bin/hostapd ${configFile}
+          '';
+      };
+  };
+}
-- 
GitLab


From a24e4b4af20a0b95c13edfbf4b5705a27ff8f045 Mon Sep 17 00:00:00 2001
From: Jack Cummings <jack@mudshark.org>
Date: Fri, 5 Oct 2012 22:10:38 -0700
Subject: [PATCH 4066/5331]  nat: enable NAT for multiple networks

---
 modules/services/networking/nat.nix | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/modules/services/networking/nat.nix b/modules/services/networking/nat.nix
index c51eeb54be7..ff6ff02f7e9 100644
--- a/modules/services/networking/nat.nix
+++ b/modules/services/networking/nat.nix
@@ -1,4 +1,6 @@
 # This module enables Network Address Translation (NAT).
+# XXX: todo: support multiple upstream links
+# see http://yesican.chsoft.biz/lartc/MultihomedLinuxNetworking.html
 
 { config, pkgs, ... }:
 
@@ -25,11 +27,11 @@ in
     };
 
     networking.nat.internalIPs = mkOption {
-      example = "192.168.1.0/24";
+      example = [ "192.168.1.0/24" ] ;
       description =
         ''
-          The IP address range for which to perform NAT.  Packets
-          coming from these addresses and destined for the external
+          The IP address ranges for which to perform NAT.  Packets
+          coming from these networks and destined for the external
           interface will be rewritten.
         '';
     };
@@ -76,13 +78,17 @@ in
           ''
             iptables -t nat -F POSTROUTING
             iptables -t nat -X
-
+          '' 
+          + (concatMapStrings (network: 
+            ''
             iptables -t nat -A POSTROUTING \
-              -s ${cfg.internalIPs} -o ${cfg.externalInterface} \
+              -s ${network} -o ${cfg.externalInterface} \
               ${if cfg.externalIP == ""
                 then "-j MASQUERADE"
                 else "-j SNAT --to-source ${cfg.externalIP}"}
-
+            ''
+          ) cfg.internalIPs) +
+          ''
             echo 1 > /proc/sys/net/ipv4/ip_forward
           '';
 
@@ -91,7 +97,5 @@ in
             iptables -t nat -F POSTROUTING
           '';
       };
-
   };
-
 }
-- 
GitLab


From be3e8124394e3c2a452e168fc3cb18411eb56ecd Mon Sep 17 00:00:00 2001
From: Jack Cummings <jack@mudshark.org>
Date: Fri, 5 Oct 2012 22:11:16 -0700
Subject: [PATCH 4067/5331] Wrong branch.

Revert " nat: enable NAT for multiple networks"

This reverts commit a24e4b4af20a0b95c13edfbf4b5705a27ff8f045.
---
 modules/services/networking/nat.nix | 20 ++++++++------------
 1 file changed, 8 insertions(+), 12 deletions(-)

diff --git a/modules/services/networking/nat.nix b/modules/services/networking/nat.nix
index ff6ff02f7e9..c51eeb54be7 100644
--- a/modules/services/networking/nat.nix
+++ b/modules/services/networking/nat.nix
@@ -1,6 +1,4 @@
 # This module enables Network Address Translation (NAT).
-# XXX: todo: support multiple upstream links
-# see http://yesican.chsoft.biz/lartc/MultihomedLinuxNetworking.html
 
 { config, pkgs, ... }:
 
@@ -27,11 +25,11 @@ in
     };
 
     networking.nat.internalIPs = mkOption {
-      example = [ "192.168.1.0/24" ] ;
+      example = "192.168.1.0/24";
       description =
         ''
-          The IP address ranges for which to perform NAT.  Packets
-          coming from these networks and destined for the external
+          The IP address range for which to perform NAT.  Packets
+          coming from these addresses and destined for the external
           interface will be rewritten.
         '';
     };
@@ -78,17 +76,13 @@ in
           ''
             iptables -t nat -F POSTROUTING
             iptables -t nat -X
-          '' 
-          + (concatMapStrings (network: 
-            ''
+
             iptables -t nat -A POSTROUTING \
-              -s ${network} -o ${cfg.externalInterface} \
+              -s ${cfg.internalIPs} -o ${cfg.externalInterface} \
               ${if cfg.externalIP == ""
                 then "-j MASQUERADE"
                 else "-j SNAT --to-source ${cfg.externalIP}"}
-            ''
-          ) cfg.internalIPs) +
-          ''
+
             echo 1 > /proc/sys/net/ipv4/ip_forward
           '';
 
@@ -97,5 +91,7 @@ in
             iptables -t nat -F POSTROUTING
           '';
       };
+
   };
+
 }
-- 
GitLab


From 757ab7f6d3399cae3c76e1b744eae692db6c8559 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sat, 6 Oct 2012 20:58:46 -0400
Subject: [PATCH 4068/5331] Generate nsswitch.conf properly

---
 modules/config/nsswitch-mdns.conf | 11 -----------
 modules/config/nsswitch.conf      | 10 ----------
 modules/config/nsswitch.nix       | 33 ++++++++++++++++++++-----------
 3 files changed, 22 insertions(+), 32 deletions(-)
 delete mode 100644 modules/config/nsswitch-mdns.conf
 delete mode 100644 modules/config/nsswitch.conf

diff --git a/modules/config/nsswitch-mdns.conf b/modules/config/nsswitch-mdns.conf
deleted file mode 100644
index 61dd436682d..00000000000
--- a/modules/config/nsswitch-mdns.conf
+++ /dev/null
@@ -1,11 +0,0 @@
-# NSS configuration files with mDNS enabled (requires running Avahi daemon).
-
-passwd:         ldap files
-group:          ldap files
-shadow:         ldap files
-
-hosts:          files mdns_minimal [NOTFOUND=return] dns mdns
-networks:       files dns
-
-services:       files
-protocols:      files
diff --git a/modules/config/nsswitch.conf b/modules/config/nsswitch.conf
deleted file mode 100644
index 44beaf5b44c..00000000000
--- a/modules/config/nsswitch.conf
+++ /dev/null
@@ -1,10 +0,0 @@
-passwd:         files ldap
-group:          files ldap
-shadow:         files ldap
-
-hosts:          files dns
-networks:       files dns
-ethers:         files
-
-services:       files
-protocols:      files
diff --git a/modules/config/nsswitch.nix b/modules/config/nsswitch.nix
index cac6ff382a4..7c969320b3d 100644
--- a/modules/config/nsswitch.nix
+++ b/modules/config/nsswitch.nix
@@ -1,13 +1,15 @@
 # Configuration for the Name Service Switch (/etc/nsswitch.conf).
 
-{config, pkgs, ...}:
+{ config, pkgs, ... }:
+
+with pkgs.lib;
 
 let
 
   options = {
 
     # NSS modules.  Hacky!
-    system.nssModules = pkgs.lib.mkOption {
+    system.nssModules = mkOption {
       internal = true;
       default = [];
       description = "
@@ -15,34 +17,43 @@ let
         several DNS resolution methods to be specified via
         <filename>/etc/nsswitch.conf</filename>.
       ";
-      merge = pkgs.lib.mergeListOption;
+      merge = mergeListOption;
       apply = list:
         let
           list2 =
             list
             # !!! this should be in the LDAP module
-            ++ pkgs.lib.optional config.users.ldap.enable pkgs.nss_ldap;
+            ++ optional config.users.ldap.enable pkgs.nss_ldap;
         in {
           list = list2;
-          path = pkgs.lib.makeLibraryPath list2;
+          path = makeLibraryPath list2;
         };
     };
 
   };
 
+  inherit (config.services.avahi) nssmdns;
+
 in
 
 {
-  require = [options];
+  require = [ options ];
 
   environment.etc =
     [ # Name Service Switch configuration file.  Required by the C library.
       # !!! Factor out the mdns stuff.  The avahi module should define
       # an option used by this module.
-      { source =
-          if config.services.avahi.nssmdns
-          then ./nsswitch-mdns.conf
-          else ./nsswitch.conf;
+      { source = pkgs.writeText "nsswitch.conf"
+          ''
+            passwd:    files ldap
+            group:     files ldap
+            shadow:    files ldap
+            hosts:     files ${optionalString nssmdns "mdns_minimal [NOTFOUND=return]"} dns ${optionalString nssmdns "mdns"}
+            networks:  files dns
+            ethers:    files
+            services:  files
+            protocols: files
+          '';
         target = "nsswitch.conf";
       }
     ];
@@ -58,5 +69,5 @@ in
   # chroot gets to seem them, and (ii) applications can benefit from
   # changes in the list of NSS modules at run-time, without requiring
   # a reboot.
-  environment.systemPackages = [config.system.nssModules.list];
+  environment.systemPackages = [ config.system.nssModules.list ];
 }
-- 
GitLab


From 13841d6e47a54a6ec5c0c501a9d19d23fc081b2d Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sat, 6 Oct 2012 21:00:26 -0400
Subject: [PATCH 4069/5331] Use nss-myhostname to ensure that the hostname
 resolves to something sensible

---
 modules/config/nsswitch.nix | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/modules/config/nsswitch.nix b/modules/config/nsswitch.nix
index 7c969320b3d..4c46e8ec87d 100644
--- a/modules/config/nsswitch.nix
+++ b/modules/config/nsswitch.nix
@@ -48,7 +48,7 @@ in
             passwd:    files ldap
             group:     files ldap
             shadow:    files ldap
-            hosts:     files ${optionalString nssmdns "mdns_minimal [NOTFOUND=return]"} dns ${optionalString nssmdns "mdns"}
+            hosts:     files ${optionalString nssmdns "mdns_minimal [NOTFOUND=return]"} dns ${optionalString nssmdns "mdns"} myhostname
             networks:  files dns
             ethers:    files
             services:  files
@@ -58,6 +58,11 @@ in
       }
     ];
 
+  # Use nss-myhostname to ensure that our hostname always resolves to
+  # a valid IP address.  It returns all locally configured IP
+  # addresses, or ::1 and 127.0.0.2 as fallbacks.
+  system.nssModules = [ pkgs.nss_myhostname ];
+
   environment.shellInit =
     if config.system.nssModules.path != "" then
       ''
-- 
GitLab


From 74295866f511a76199e7ab74aa995403c6f40954 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sun, 7 Oct 2012 00:37:36 -0400
Subject: [PATCH 4070/5331] Don't include NSS modules in $LD_LIBRARY_PATH

This is broken because it requires restarting applications to see new
NSS modules.  The proper way to handle NSS modules is through nscd.
See commit 554ae9908b4abd45c9769da023470ae2c12ebdfd.
---
 modules/config/nsswitch.nix | 13 -------------
 1 file changed, 13 deletions(-)

diff --git a/modules/config/nsswitch.nix b/modules/config/nsswitch.nix
index 4c46e8ec87d..806ff876303 100644
--- a/modules/config/nsswitch.nix
+++ b/modules/config/nsswitch.nix
@@ -62,17 +62,4 @@ in
   # a valid IP address.  It returns all locally configured IP
   # addresses, or ::1 and 127.0.0.2 as fallbacks.
   system.nssModules = [ pkgs.nss_myhostname ];
-
-  environment.shellInit =
-    if config.system.nssModules.path != "" then
-      ''
-        LD_LIBRARY_PATH=${config.system.nssModules.path}:$LD_LIBRARY_PATH
-      ''
-    else "";
-
-  # NSS modules need to be in `systemPath' so that (i) the builder
-  # chroot gets to seem them, and (ii) applications can benefit from
-  # changes in the list of NSS modules at run-time, without requiring
-  # a reboot.
-  environment.systemPackages = [ config.system.nssModules.list ];
 }
-- 
GitLab


From 570e523a88eebf9e20343608a153a41dbfa8375f Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sun, 7 Oct 2012 00:40:00 -0400
Subject: [PATCH 4071/5331] Remove 127.0.0.1 mapping for the system's hostname

Also remove the <hostname>.<domain> mapping.
---
 modules/config/networking.nix | 11 +----------
 1 file changed, 1 insertion(+), 10 deletions(-)

diff --git a/modules/config/networking.nix b/modules/config/networking.nix
index 2b4be69cc51..f0aafc6b404 100644
--- a/modules/config/networking.nix
+++ b/modules/config/networking.nix
@@ -18,13 +18,6 @@ let
 
   };
 
-  localhostWithDomain = optionalString (cfg.domain != "")
-    "localhost.${cfg.domain}";
-
-  hostnameWithDomain = optionalString
-    (cfg.domain != "" && cfg.hostName != "")
-    "${cfg.hostName}.${cfg.domain}";
-
 in
 
 {
@@ -49,9 +42,7 @@ in
       { # /etc/hosts: Hostname-to-IP mappings.
         source = pkgs.writeText "hosts"
           ''
-            ${optionalString (cfg.hostName != "")
-              "127.0.0.1 ${hostnameWithDomain} ${cfg.hostName}"}
-            127.0.0.1 localhost ${localhostWithDomain}
+            127.0.0.1 localhost
             ${cfg.extraHosts}
           '';
         target = "hosts";
-- 
GitLab


From 2b2f0067b838c3032458f3fafdc1f6190ed9176f Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sun, 7 Oct 2012 00:46:24 -0400
Subject: [PATCH 4072/5331] Add an /etc/hosts entry mapping localhost to ::1

---
 modules/config/networking.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/modules/config/networking.nix b/modules/config/networking.nix
index f0aafc6b404..c6ea171bf3d 100644
--- a/modules/config/networking.nix
+++ b/modules/config/networking.nix
@@ -43,6 +43,7 @@ in
         source = pkgs.writeText "hosts"
           ''
             127.0.0.1 localhost
+            ::1 localhost
             ${cfg.extraHosts}
           '';
         target = "hosts";
-- 
GitLab


From 87bb6b1c6dbfbe128b8181e5c55ffa7c36de4771 Mon Sep 17 00:00:00 2001
From: Marc Weber <marco-oweber@gmx.de>
Date: Sun, 7 Oct 2012 17:24:42 +0200
Subject: [PATCH 4073/5331] making ati proprietary drivers work again

However SLIM is still broken and you have to create a
/usr/lib/dri/fglrx_dri.so symlink pointing to
/run/opengl-driver/lib/fglrx_dri.so

At least fgl_glxgears shows 10 times more frames per second now
---
 modules/services/x11/xserver.nix | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/modules/services/x11/xserver.nix b/modules/services/x11/xserver.nix
index 97424308c27..1aa432afdfc 100644
--- a/modules/services/x11/xserver.nix
+++ b/modules/services/x11/xserver.nix
@@ -343,7 +343,8 @@ in
       optional (elem "virtualbox" driverNames) kernelPackages.virtualboxGuestAdditions ++
       optional (elem "ati_unfree" driverNames) kernelPackages.ati_drivers_x11;
 
-    environment.etc = optionals cfg.exportConfiguration
+    environment.etc =
+    (optionals cfg.exportConfiguration
       [ { source = "${configFile}";
           target = "X11/xorg.conf";
         }
@@ -351,7 +352,15 @@ in
         { source = "${pkgs.xkeyboard_config}/etc/X11/xkb";
           target = "X11/xkb";
         }
-      ];
+      ])
+    ++ (optionals (elem "ati_unfree" driverNames) [
+
+        # according toiive on #ati you don't need the pcs, it is like registry... keeps old stuff to make your
+        # life harder ;) Still it seems to be required
+        { source = "${kernelPackages.ati_drivers_x11}/etc/ati";
+          target = "ati";
+        }
+    ]);
 
     environment.x11Packages =
       [ xorg.xorgserver
@@ -420,6 +429,8 @@ in
                 "ln -sf ${kernelPackages.nvidia_x11_legacy96} /run/opengl-driver"
               else if elem "nvidiaLegacy173" driverNames then
                 "ln -sf ${kernelPackages.nvidia_x11_legacy173} /run/opengl-driver"
+              else if elem "ati_unfree" driverNames then
+                "ln -sf ${kernelPackages.ati_drivers_x11} /run/opengl-driver"
               else if cfg.driSupport then
                 "ln -sf ${pkgs.mesa} /run/opengl-driver"
               else ""
-- 
GitLab


From f451afea8f3c25913cff1cfb53f046edbf91ee90 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 8 Oct 2012 10:51:17 -0400
Subject: [PATCH 4074/5331] =?UTF-8?q?Remove=20=E2=80=98services.journald.l?=
 =?UTF-8?q?ogKernelMessages=E2=80=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This option no longer exists in systemd.
---
 modules/system/boot/systemd.nix | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/modules/system/boot/systemd.nix b/modules/system/boot/systemd.nix
index 23751e2104a..991e09058e8 100644
--- a/modules/system/boot/systemd.nix
+++ b/modules/system/boot/systemd.nix
@@ -378,12 +378,6 @@ in
       description = "Default unit started when the system boots.";
     };
 
-    services.journald.logKernelMessages = mkOption {
-      default = true;
-      type = types.bool;
-      description = "Whether to log kernel messages.";
-    };
-
     services.journald.console = mkOption {
       default = "";
       type = types.uniq types.string;
@@ -420,9 +414,6 @@ in
                 ForwardToConsole=yes
                 TTYPath=${config.services.journald.console}
               ''}
-              ${optionalString config.services.journald.logKernelMessages ''
-                ImportKernel=yes
-              ''}
             '';
           target = "systemd/journald.conf";
         }
-- 
GitLab


From 01b8c48c3288243e17cfe1d4b298f4fc2c8bceb5 Mon Sep 17 00:00:00 2001
From: Mathijs Kwik <mathijs@bluescreen303.nl>
Date: Mon, 8 Oct 2012 16:00:05 +0200
Subject: [PATCH 4075/5331] logcheck: add some options to ease setting up
 ignore-rules

The special handling for cronjobs should probably move to the cron
module (logcheckIgnore = bool option) in the future, as it's more
natural to just declare a cronjob, and mark it as "log-ignored",
instead of adding cronjobs through logcheck.

But as systemCronjobs is not an attrset yet (just simple strings),
this would require adding an attrset for cronjobs or parsing strings
in the nix language to get hold of the cron-user and command.

So for now, I keep the interface within logcheck's module.
---
 modules/services/logging/logcheck.nix | 124 ++++++++++++++++++++++----
 1 file changed, 108 insertions(+), 16 deletions(-)

diff --git a/modules/services/logging/logcheck.nix b/modules/services/logging/logcheck.nix
index 40d736255ec..23f21b6a754 100644
--- a/modules/services/logging/logcheck.nix
+++ b/modules/services/logging/logcheck.nix
@@ -5,16 +5,13 @@ with pkgs.lib;
 let
   cfg = config.services.logcheck;
 
-  rulesDir = pkgs.runCommand "logcheck-rules-dir"
-    {} (
-    ''
-      mkdir $out
-      cp -prd ${pkgs.logcheck}/etc/logcheck/* $out/
-      rm $out/logcheck.*
-      chmod u+w $out/*
-    '' + optionalString (! builtins.isNull cfg.extraRulesDir) ''
-      cp -prd ${cfg.extraRulesDir}/* $out/
-    '' );
+  defaultRules = pkgs.runCommand "logcheck-default-rules" {} ''
+                   cp -prd ${pkgs.logcheck}/etc/logcheck $out
+                   chmod u+w $out
+                   rm $out/logcheck.*
+                 '';
+
+  rulesDir = pkgs.symlinkJoin "logcheck-rules-dir" ([ defaultRules ] ++ cfg.extraRulesDirs);
 
   configFile = pkgs.writeText "logcheck.conf" cfg.config;
 
@@ -33,6 +30,74 @@ let
     2 ${cfg.timeOfDay} * * * logcheck env PATH=/var/setuid-wrappers:$PATH nice -n10 ${pkgs.logcheck}/sbin/logcheck ${flags}
   '';
 
+  writeIgnoreRule = name: {level, regex, ...}:
+    pkgs.writeTextFile
+      { inherit name;
+        destination = "/ignore.d.${level}/${name}";
+        text = ''
+          ^\w{3} [ :[:digit:]]{11} [._[:alnum:]-]+ ${regex}
+        '';
+      };
+
+  writeIgnoreCronRule = name: {level, user, regex, cmdline, ...}:
+    let escapeRegex = escape (stringToCharacters "\\[]{}()^$?*+|.");
+        cmdline_ = builtins.unsafeDiscardStringContext cmdline;
+        re = if regex != "" then regex else if cmdline_ == "" then ".*" else escapeRegex cmdline_;
+    in writeIgnoreRule "cron-${name}" {
+      inherit level;
+      regex = ''
+        (/usr/bin/)?cron\[[0-9]+\]: \(${user}\) CMD \(${re}\)$
+      '';
+    };
+
+  levelOption = mkOption {
+    default = "server";
+    type = types.uniq types.string;
+    description = ''
+      Set the logcheck level. Either "workstation", "server", or "paranoid".
+    '';
+  };
+
+  ignoreOptions = {
+    level = levelOption;
+
+    regex = mkOption {
+      default = "";
+      type = types.uniq types.string;
+      description = ''
+        Regex specifying which log lines to ignore.
+      '';
+    };
+  };
+
+  ignoreCronOptions = {
+    user = mkOption {
+      default = "root";
+      type = types.uniq types.string;
+      description = ''
+        User that runs the cronjob.
+      '';
+    };
+
+    cmdline = mkOption {
+      default = "";
+      type = types.uniq types.string;
+      description = ''
+        Command line for the cron job. Will be turned into a regex for the logcheck ignore rule.
+      '';
+    };
+
+    timeArgs = mkOption {
+      default = null;
+      type = types.nullOr (types.uniq types.string);
+      example = "02 06 * * *";
+      description = ''
+        "min hr dom mon dow" crontab time args, to auto-create a cronjob too.
+        Leave at null to not do this and just add a logcheck ignore rule.
+      '';
+    };
+  };
+
 in
 {
   options = {
@@ -98,16 +163,33 @@ in
         '';
       };
 
-      extraRulesDir = mkOption {
-        default = null;
+      extraRulesDirs = mkOption {
+        default = [];
         example = "/etc/logcheck";
-        type = types.nullOr types.path;
+        type = types.listOf types.path;
         description = ''
-          Directory with extra rules.
-          Will be merged with bundled rules, so it's possible to override certain behaviour.
+          Directories with extra rules.
         '';
       };
 
+      ignore = mkOption {
+        default = {};
+        description = ''
+          This option defines extra ignore rules.
+        '';
+        type = types.loaOf types.optionSet;
+        options = [ ignoreOptions ];
+      };
+
+      ignoreCron = mkOption {
+        default = {};
+        description = ''
+          This option defines extra ignore rules for cronjobs.
+        '';
+        type = types.loaOf types.optionSet;
+        options = [ ignoreOptions ignoreCronOptions ];
+      };
+
       extraGroups = mkOption {
         default = [];
         type = types.listOf types.string;
@@ -122,6 +204,10 @@ in
   };
 
   config = mkIf cfg.enable {
+    services.logcheck.extraRulesDirs =
+        mapAttrsToList writeIgnoreRule cfg.ignore
+        ++ mapAttrsToList writeIgnoreCronRule cfg.ignoreCron;
+
     users.extraUsers = singleton
       { name = cfg.user;
         shell = "/bin/sh";
@@ -134,6 +220,12 @@ in
       chown ${cfg.user} /var/{lib,lock}/logcheck
     '';
 
-    services.cron.systemCronJobs = [ cronJob ];
+    services.cron.systemCronJobs =
+        let withTime = name: {timeArgs, ...}: ! (builtins.isNull timeArgs);
+            mkCron = name: {user, cmdline, timeArgs, ...}: ''
+              ${timeArgs} ${user} ${cmdline}
+            '';
+        in mapAttrsToList mkCron (filterAttrs withTime cfg.ignoreCron)
+           ++ [ cronJob ];
   };
 }
-- 
GitLab


From e8d8b6b39997fdd9b0796fd79fffad9750c37774 Mon Sep 17 00:00:00 2001
From: Jack Cummings <jack@mudshark.org>
Date: Fri, 5 Oct 2012 22:02:47 -0700
Subject: [PATCH 4076/5331] smartd: Add options for each device being monitored

---
 modules/services/monitoring/smartd.nix | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/modules/services/monitoring/smartd.nix b/modules/services/monitoring/smartd.nix
index 2427f29020e..7ca5625bfe7 100644
--- a/modules/services/monitoring/smartd.nix
+++ b/modules/services/monitoring/smartd.nix
@@ -24,7 +24,7 @@ let
 
   smartdConf = pkgs.writeText "smartd.conf" (concatMapStrings (device:
     ''
-      ${device} -a -m root -M exec ${smartdMail}
+      ${device} -a -m root -M exec ${smartdMail} ${cfg.deviceOpts}
     ''
     ) cfg.devices);
 
@@ -50,6 +50,17 @@ in
         '';
       };
 
+      deviceOpts = mkOption {
+        default = "";
+        type = types.string;
+        example = "-o on -s (S/../.././02|L/../../7/04)";
+        description = ''
+          Additional options for each device that is monitored. The example
+          turns on SMART Automatic Offline Testing on startup, and schedules short
+          self-tests daily, and long self-tests weekly. 
+        '';
+      };
+
       devices = mkOption {
         default = [];
         example = ["/dev/sda" "/dev/sdb"];
-- 
GitLab


From e40146de16a8edf5e63b92057d0a7abca745182d Mon Sep 17 00:00:00 2001
From: Jack Cummings <jack@mudshark.org>
Date: Fri, 5 Oct 2012 22:11:57 -0700
Subject: [PATCH 4077/5331] nat: enable NAT for multiple networks

---
 modules/services/networking/nat.nix | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/modules/services/networking/nat.nix b/modules/services/networking/nat.nix
index c51eeb54be7..ff6ff02f7e9 100644
--- a/modules/services/networking/nat.nix
+++ b/modules/services/networking/nat.nix
@@ -1,4 +1,6 @@
 # This module enables Network Address Translation (NAT).
+# XXX: todo: support multiple upstream links
+# see http://yesican.chsoft.biz/lartc/MultihomedLinuxNetworking.html
 
 { config, pkgs, ... }:
 
@@ -25,11 +27,11 @@ in
     };
 
     networking.nat.internalIPs = mkOption {
-      example = "192.168.1.0/24";
+      example = [ "192.168.1.0/24" ] ;
       description =
         ''
-          The IP address range for which to perform NAT.  Packets
-          coming from these addresses and destined for the external
+          The IP address ranges for which to perform NAT.  Packets
+          coming from these networks and destined for the external
           interface will be rewritten.
         '';
     };
@@ -76,13 +78,17 @@ in
           ''
             iptables -t nat -F POSTROUTING
             iptables -t nat -X
-
+          '' 
+          + (concatMapStrings (network: 
+            ''
             iptables -t nat -A POSTROUTING \
-              -s ${cfg.internalIPs} -o ${cfg.externalInterface} \
+              -s ${network} -o ${cfg.externalInterface} \
               ${if cfg.externalIP == ""
                 then "-j MASQUERADE"
                 else "-j SNAT --to-source ${cfg.externalIP}"}
-
+            ''
+          ) cfg.internalIPs) +
+          ''
             echo 1 > /proc/sys/net/ipv4/ip_forward
           '';
 
@@ -91,7 +97,5 @@ in
             iptables -t nat -F POSTROUTING
           '';
       };
-
   };
-
 }
-- 
GitLab


From d71c0bb83436d931436f1ce7c5684e8676678b48 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 9 Oct 2012 15:14:15 -0400
Subject: [PATCH 4078/5331] Respect partOf etc. for socket and target units

---
 modules/system/boot/systemd-unit-options.nix | 18 +++++++++
 modules/system/boot/systemd.nix              | 41 ++++++++------------
 2 files changed, 35 insertions(+), 24 deletions(-)

diff --git a/modules/system/boot/systemd-unit-options.nix b/modules/system/boot/systemd-unit-options.nix
index 276197d24d8..127ab7be3b9 100644
--- a/modules/system/boot/systemd-unit-options.nix
+++ b/modules/system/boot/systemd-unit-options.nix
@@ -76,6 +76,7 @@ rec {
 
   };
 
+
   serviceOptions = unitOptions // {
 
     environment = mkOption {
@@ -146,4 +147,21 @@ rec {
 
   };
 
+
+  socketOptions = unitOptions // {
+
+    socketConfig = mkOption {
+      default = {};
+      example = { ListenStream = "/run/my-socket"; };
+      type = types.attrs;
+      description = ''
+        Each attribute in this set specifies an option in the
+        <literal>[Socket]</literal> section of the unit.  See
+        <citerefentry><refentrytitle>systemd.socket</refentrytitle>
+        <manvolnum>5</manvolnum></citerefentry> for details.
+      '';
+    };
+
+  };
+
 }
\ No newline at end of file
diff --git a/modules/system/boot/systemd.nix b/modules/system/boot/systemd.nix
index 991e09058e8..6603d6126b4 100644
--- a/modules/system/boot/systemd.nix
+++ b/modules/system/boot/systemd.nix
@@ -167,6 +167,20 @@ let
 
   makeJobScript = name: content: "${pkgs.writeScriptBin name content}/bin/${name}";
 
+  unitConfig = { name, config, ... }: {
+    config = {
+      unitConfig =
+        { Requires = concatStringsSep " " config.requires;
+          Wants = concatStringsSep " " config.wants;
+          After = concatStringsSep " " config.after;
+          Before = concatStringsSep " " config.before;
+          PartOf = concatStringsSep " " config.partOf;
+        } // optionalAttrs (config.description != "") {
+          Description = config.description;
+        };
+    };
+  };
+
   serviceConfig = { name, config, ... }: {
     config = {
       # Default path for systemd services.  Should be quite minimal.
@@ -177,15 +191,6 @@ let
           pkgs.gnused
           systemd
         ];
-      unitConfig =
-        { Requires = concatStringsSep " " config.requires;
-          Wants = concatStringsSep " " config.wants;
-          After = concatStringsSep " " config.after;
-          Before = concatStringsSep " " config.before;
-          PartOf = concatStringsSep " " config.partOf;
-        } // optionalAttrs (config.description != "")
-          { Description = config.description;
-          };
     };
   };
 
@@ -342,33 +347,21 @@ in
     boot.systemd.targets = mkOption {
       default = {};
       type = types.attrsOf types.optionSet;
-      options = unitOptions;
+      options = [ unitOptions unitConfig ];
       description = "Definition of systemd target units.";
     };
 
     boot.systemd.services = mkOption {
       default = {};
       type = types.attrsOf types.optionSet;
-      options = [ serviceOptions serviceConfig ];
+      options = [ serviceOptions unitConfig serviceConfig ];
       description = "Definition of systemd service units.";
     };
 
     boot.systemd.sockets = mkOption {
       default = {};
       type = types.attrsOf types.optionSet;
-      options = unitOptions // {
-        socketConfig = mkOption {
-          default = {};
-          example = { ListenStream = "/run/my-socket"; };
-          type = types.attrs;
-          description = ''
-            Each attribute in this set specifies an option in the
-            <literal>[Socket]</literal> section of the unit.  See
-            <citerefentry><refentrytitle>systemd.socket</refentrytitle>
-            <manvolnum>5</manvolnum></citerefentry> for details.
-          '';
-        };
-      };
+      options = [ socketOptions unitConfig ];
       description = "Definition of systemd socket units.";
     };
 
-- 
GitLab


From 69024529011d21a18441eb05d9d3671fab10614a Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 9 Oct 2012 15:14:32 -0400
Subject: [PATCH 4079/5331] Whitespace

---
 modules/services/audio/alsa.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/modules/services/audio/alsa.nix b/modules/services/audio/alsa.nix
index ff08f21a485..92d0cdd26f3 100644
--- a/modules/services/audio/alsa.nix
+++ b/modules/services/audio/alsa.nix
@@ -58,6 +58,7 @@ in
         serviceConfig.Type = "oneshot";
         serviceConfig.ExecStart = "${alsaUtils}/sbin/alsactl store --ignore";
       };
+
   };
 
 }
-- 
GitLab


From 71e6eca5675a9a32d245ace3b29154409a4700bf Mon Sep 17 00:00:00 2001
From: Jack Cummings <jack@mudshark.org>
Date: Tue, 9 Oct 2012 12:19:09 -0700
Subject: [PATCH 4080/5331]  - fix indention, clarify parameter descriptions,
 and use 'exec' instead of 'script' in the hostapd job

---
 modules/services/networking/hostapd.nix | 23 ++++++++++++-----------
 1 file changed, 12 insertions(+), 11 deletions(-)

diff --git a/modules/services/networking/hostapd.nix b/modules/services/networking/hostapd.nix
index 712b1a6824c..42779494b4b 100644
--- a/modules/services/networking/hostapd.nix
+++ b/modules/services/networking/hostapd.nix
@@ -52,7 +52,7 @@ in
       enable = mkOption {
         default = false;
         description = ''
-          enable putting a wireless interface into infrastructure mode,
+          Enable putting a wireless interface into infrastructure mode,
           allowing other wireless devices to associate with the wireless interface and do
           wireless networking. A simple access point will enable hostapd.wpa, and
           hostapd.wpa_passphrase, hostapd.ssid, dhcpd on the wireless interface to
@@ -107,19 +107,24 @@ in
         example = "network";
         type = types.string;
         description = "members of this group can control hostapd";
-        };
+      };
 
       wpa = mkOption {
         default = true;
         description = "enable WPA (IEEE 802.11i/D3.0) to authenticate to the access point";
-        };
+      };
 
       wpaPassphrase = mkOption {
         default = "my_sekret";
         example = "any_64_char_string";
         type = types.string;
-        description = "WPA-PSK (pre-shared-key) passphrase. Clients will need this passphrase to associate with this access point";
-        };
+        description = 
+          ''
+          WPA-PSK (pre-shared-key) passphrase. Clients will need this
+          passphrase to associate with this access point. Warning: This passphrase will
+          get put into a world-readable file in the nix store. 
+          '';
+      };
 
       extraCfg = mkOption {
         default = "";
@@ -130,9 +135,9 @@ in
           '';
         type = types.string;
         description = "Extra configuration options to put in the hostapd.conf";
-        };
       };
     };
+  };
 
 
   ###### implementation
@@ -144,11 +149,7 @@ in
     jobs.hostapd =
       { startOn = "started network-interfaces";
         stopOn = "stopping network-interfaces";
-
-        script =
-          ''
-            exec ${pkgs.hostapd}/bin/hostapd ${configFile}
-          '';
+        exec = "${pkgs.hostapd}/bin/hostapd ${configFile}";
       };
   };
 }
-- 
GitLab


From 5181ca4a3f980c504e2a368ebd7ae87995985f64 Mon Sep 17 00:00:00 2001
From: James Cook <jcook@cs.berkeley.edu>
Date: Tue, 9 Oct 2012 23:21:45 -0700
Subject: [PATCH 4081/5331] Change the default value of programs.ssh.forwardX11
 to false.

Forwarding X11 to untrusted servers is extremely insecure; see for example
http://www.hackinglinuxexposed.com/articles/20040705.html
---
 modules/programs/ssh.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/modules/programs/ssh.nix b/modules/programs/ssh.nix
index 5c4b8c3a9a1..45d518e73f7 100644
--- a/modules/programs/ssh.nix
+++ b/modules/programs/ssh.nix
@@ -16,11 +16,13 @@ in
     programs.ssh = {
 
       forwardX11 = mkOption {
-        default = cfgd.forwardX11;
+        default = false;
         description = ''
           Whether to request X11 forwarding on outgoing connections by default.
           This is useful for running graphical programs on the remote machine and have them display to your local X11 server.
           Historically, this value has depended on the value used by the local sshd daemon, but there really isn't a relation between the two.
+          Warning: never enable X11 forwarding unless you are connecting to a machine you trust!
+          To enable or disable forwarding on a per-connection basis, see the -X and -x options to ssh.
         '';
       };
 
-- 
GitLab


From ad94b9e50eeeaf7a70cf49e58c0ee6b8e0413e9f Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 10 Oct 2012 16:49:47 -0400
Subject: [PATCH 4082/5331] Use optionalAttrs

---
 modules/virtualisation/virtualbox-guest.nix | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/modules/virtualisation/virtualbox-guest.nix b/modules/virtualisation/virtualbox-guest.nix
index 03234fbb82f..410a48152a9 100644
--- a/modules/virtualisation/virtualbox-guest.nix
+++ b/modules/virtualisation/virtualbox-guest.nix
@@ -11,7 +11,7 @@ let
 
 in
 
-if (pkgs.stdenv.isi686 || pkgs.stdenv.isx86_64) then
+optionalAttrs (pkgs.stdenv.isi686 || pkgs.stdenv.isx86_64) # ugly...
 {
 
   ###### interface
@@ -85,4 +85,3 @@ if (pkgs.stdenv.isi686 || pkgs.stdenv.isx86_64) then
   };
 
 }
-else {}
-- 
GitLab


From 6b185a131fe589af7fa4a721e170b91a3f279116 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 10 Oct 2012 16:49:59 -0400
Subject: [PATCH 4083/5331] Use config.system.build.systemd in the toplevel
 derivation

---
 modules/system/activation/top-level.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/modules/system/activation/top-level.nix b/modules/system/activation/top-level.nix
index 4e79375ba1c..48c1c0be189 100644
--- a/modules/system/activation/top-level.nix
+++ b/modules/system/activation/top-level.nix
@@ -148,7 +148,8 @@ let
     preferLocalBuild = true;
     buildCommand = systemBuilder;
 
-    inherit (pkgs) systemd utillinux;
+    inherit (pkgs) utillinux;
+    inherit (config.system.build) systemd;
 
     inherit children;
     kernelParams =
-- 
GitLab


From 17a7f483641db44e456181ddd430604eb5360f7f Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 10 Oct 2012 16:50:41 -0400
Subject: [PATCH 4084/5331] Add an option for BindsTo dependencies

---
 modules/system/boot/systemd-unit-options.nix | 9 +++++++++
 modules/system/boot/systemd.nix              | 1 +
 2 files changed, 10 insertions(+)

diff --git a/modules/system/boot/systemd-unit-options.nix b/modules/system/boot/systemd-unit-options.nix
index 127ab7be3b9..46f2a705df8 100644
--- a/modules/system/boot/systemd-unit-options.nix
+++ b/modules/system/boot/systemd-unit-options.nix
@@ -47,6 +47,15 @@ rec {
       '';
     };
 
+    bindsTo = mkOption {
+      default = [];
+      types = types.listOf types.string;
+      description = ''
+        Like ‘requires’, but in addition, if the specified units
+        unexpectedly disappear, this unit will be stopped as well.
+      '';
+    };
+
     partOf = mkOption {
       default = [];
       types = types.listOf types.string;
diff --git a/modules/system/boot/systemd.nix b/modules/system/boot/systemd.nix
index 6603d6126b4..268e81b1091 100644
--- a/modules/system/boot/systemd.nix
+++ b/modules/system/boot/systemd.nix
@@ -174,6 +174,7 @@ let
           Wants = concatStringsSep " " config.wants;
           After = concatStringsSep " " config.after;
           Before = concatStringsSep " " config.before;
+          BindsTo = concatStringsSep " " config.bindsTo;
           PartOf = concatStringsSep " " config.partOf;
         } // optionalAttrs (config.description != "") {
           Description = config.description;
-- 
GitLab


From e9b221c2ff08b7b941298c4a17c090442f72c5ed Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 10 Oct 2012 16:51:05 -0400
Subject: [PATCH 4085/5331] firewall.nix: Don't spam the log

---
 modules/services/networking/firewall.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/modules/services/networking/firewall.nix b/modules/services/networking/firewall.nix
index e6ae725f85f..7601fd1be43 100644
--- a/modules/services/networking/firewall.nix
+++ b/modules/services/networking/firewall.nix
@@ -178,7 +178,6 @@ in
         preStart =
           ''
             ${helpers}
-            set -x
 
             # Flush the old firewall rules.  !!! Ideally, updating the
             # firewall would be atomic.  Apparently that's possible
-- 
GitLab


From 62b707de07c4aae4a415bc186bda943c70edd3ac Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 10 Oct 2012 17:55:13 -0400
Subject: [PATCH 4086/5331] Add support for postStop scripts

---
 modules/system/boot/systemd-unit-options.nix | 9 +++++++++
 modules/system/boot/systemd.nix              | 7 +++++++
 2 files changed, 16 insertions(+)

diff --git a/modules/system/boot/systemd-unit-options.nix b/modules/system/boot/systemd-unit-options.nix
index 46f2a705df8..2efea2fb9e1 100644
--- a/modules/system/boot/systemd-unit-options.nix
+++ b/modules/system/boot/systemd-unit-options.nix
@@ -145,6 +145,15 @@ rec {
       '';
     };
 
+    postStop = mkOption {
+      type = types.string;
+      default = "";
+      description = ''
+        Shell commands executed after the service's main process
+        has exited.
+      '';
+    };
+
     restartIfChanged = mkOption {
       type = types.bool;
       default = true;
diff --git a/modules/system/boot/systemd.nix b/modules/system/boot/systemd.nix
index 268e81b1091..c166c1cbf03 100644
--- a/modules/system/boot/systemd.nix
+++ b/modules/system/boot/systemd.nix
@@ -250,6 +250,13 @@ let
             ''}
           ''}
 
+          ${optionalString (def.postStop != "") ''
+            ExecStopPost=${makeJobScript "${name}-poststop.sh" ''
+              #! ${pkgs.stdenv.shell} -e
+              ${def.postStop}
+            ''}
+          ''}
+
           ${attrsToSection def.serviceConfig}
         '';
     };
-- 
GitLab


From d7458b5fc21676f2b1176a416687aa9e5a902c9e Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 10 Oct 2012 17:55:42 -0400
Subject: [PATCH 4087/5331] Split the monolithic network-interface service into
 multiple units
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

For each statically configured interface, we now create a unit
‘<interface>-cfg.service’ which gets started as soon as the network
device comes up.  Similarly, each bridge defined in
‘networking.bridges’ and virtual interface in ‘networking.interfaces’
is created by a service ‘<interface>.service’.

So if we have

  networking.bridges.br0.interfaces = [ "eth0" "eth1" ];
  networking.interfaces =
    [ { name = "br0";
        ipAddress = "192.168.1.1";
      }
    ];

then there will be a unit ‘br0.service’ that depends on
‘sys-subsystem-net-devices-eth0.device’ and
‘sys-subsystem-net-devices-eth1.device’, and a unit ‘br0-cfg.service’
that depends on ‘sys-subsystem-net-devices-br0.device’.
---
 modules/services/printing/cupsd.nix  |   2 +-
 modules/system/boot/systemd.nix      |   2 +-
 modules/tasks/network-interfaces.nix | 165 ++++++++++++++++-----------
 3 files changed, 102 insertions(+), 67 deletions(-)

diff --git a/modules/services/printing/cupsd.nix b/modules/services/printing/cupsd.nix
index 6d31c0050aa..1e532f578a2 100644
--- a/modules/services/printing/cupsd.nix
+++ b/modules/services/printing/cupsd.nix
@@ -138,7 +138,7 @@ in
       };
 
     services.printing.drivers =
-      [ pkgs.cups pkgs.cups_pdf_filter pkgs.ghostscript additionalBackends pkgs.perl pkgs.coreutils pkgs.gnused ];
+      [ pkgs.cups /* pkgs.cups_pdf_filter */ pkgs.ghostscript additionalBackends pkgs.perl pkgs.coreutils pkgs.gnused ];
 
     services.printing.cupsdConf =
       ''
diff --git a/modules/system/boot/systemd.nix b/modules/system/boot/systemd.nix
index c166c1cbf03..31560a4dc17 100644
--- a/modules/system/boot/systemd.nix
+++ b/modules/system/boot/systemd.nix
@@ -7,7 +7,7 @@ let
 
   cfg = config.boot.systemd;
 
-  systemd = pkgs.systemd;
+  systemd = pkgs.systemd_tmp;
 
   makeUnit = name: unit:
     pkgs.writeTextFile { name = "unit"; inherit (unit) text; destination = "/${name}"; };
diff --git a/modules/tasks/network-interfaces.nix b/modules/tasks/network-interfaces.nix
index a6fffce5bf4..c0499c9f94c 100644
--- a/modules/tasks/network-interfaces.nix
+++ b/modules/tasks/network-interfaces.nix
@@ -248,64 +248,6 @@ in
           ''
             set +e # continue in case of errors
 
-            # Create virtual network interfaces
-            ${flip concatMapStrings cfg.interfaces (i:
-              optionalString i.virtual
-                ''
-                  echo "Creating virtual network interface ${i.name}..."
-                  ${pkgs.tunctl}/bin/tunctl -t "${i.name}" -u "${i.virtualOwner}"
-                '')
-            }
-
-            # Set MAC addresses of interfaces, if desired.
-            ${flip concatMapStrings cfg.interfaces (i:
-              optionalString (i.macAddress != "")
-                ''
-                  echo "Setting MAC address of ${i.name} to ${i.macAddress}..."
-                  ip link set "${i.name}" address "${i.macAddress}"
-                '')
-            }
-
-            for i in $(cd /sys/class/net && ls -d *); do
-                echo "Bringing up network device $i..."
-                ip link set "$i" up
-            done
-
-            # Create bridge devices.
-            ${concatStrings (attrValues (flip mapAttrs cfg.bridges (n: v: ''
-                echo "Creating bridge ${n}..."
-                ${pkgs.bridge_utils}/sbin/brctl addbr "${n}"
-
-                # Set bridge's hello time to 0 to avoid startup delays.
-                ${pkgs.bridge_utils}/sbin/brctl setfd "${n}" 0
-
-                ${flip concatMapStrings v.interfaces (i: ''
-                  ${pkgs.bridge_utils}/sbin/brctl addif "${n}" "${i}"
-                  ip addr flush dev "${i}"
-                '')}
-
-                # !!! Should delete (brctl delif) any interfaces that
-                # no longer belong to the bridge.
-            '')))}
-
-            # Configure the manually specified interfaces.
-            ${flip concatMapStrings cfg.interfaces (i:
-              optionalString (i.ipAddress != "")
-                ''
-                  echo "Configuring interface ${i.name}..."
-                  ip addr add "${i.ipAddress}""${optionalString (i.subnetMask != "") ("/" + i.subnetMask)}" \
-                    dev "${i.name}"
-                '' +
-              optionalString i.proxyARP
-                ''
-                  echo 1 > /proc/sys/net/ipv4/conf/${i.name}/proxy_arp
-                '' +
-              optionalString (i.proxyARP && cfg.enableIPv6)
-                ''
-                  echo 1 > /proc/sys/net/ipv6/conf/${i.name}/proxy_ndp
-                '')
-            }
-
             # Set the static DNS configuration, if given.
             cat | ${pkgs.openresolv}/sbin/resolvconf -a static <<EOF
             ${optionalString (cfg.nameservers != [] && cfg.domain != "") ''
@@ -318,24 +260,117 @@ in
 
             # Set the default gateway.
             ${optionalString (cfg.defaultGateway != "") ''
-                ip route add default via "${cfg.defaultGateway}"
+              ip route add default via "${cfg.defaultGateway}"
             ''}
 
-            # turn on forwarding if any interface has enabled proxy_arp
+            # Turn on forwarding if any interface has enabled proxy_arp.
             ${optionalString (any (i: i.proxyARP) cfg.interfaces) ''
               echo 1 > /proc/sys/net/ipv4/ip_forward
             ''}
 
             # Run any user-specified commands.
             ${pkgs.stdenv.shell} ${pkgs.writeText "local-net-cmds" cfg.localCommands}
-
-            ${optionalString (cfg.interfaces != [] || cfg.localCommands != "") ''
-              # Start the ip-up target (e.g. to start ntpd).
-              ${config.system.build.systemd}/bin/systemctl start ip-up.target
-            ''}
           '';
       };
 
+    boot.systemd.services =
+      let
+
+        # For each interface <foo>, create a job ‘<foo>-cfg.service"
+        # that performs static configuration.  It has a "wants"
+        # dependency on ‘<foo>.service’, which is supposed to create
+        # the interface and need not exist (i.e. for hardware
+        # interfaces).  It has a binds-to dependency on the actual
+        # network device, so it only gets started after the interface
+        # has appeared, and it's stopped when the interface
+        # disappears.
+        configureInterface = i: nameValuePair "${i.name}-cfg"
+          { description = "Configuration of ${i.name}";
+            wantedBy = [ "network.target" ];
+            wants = [ "${i.name}.service" ];
+            bindsTo = [ "sys-subsystem-net-devices-${i.name}.device" ];
+            after = [ "${i.name}.service" "sys-subsystem-net-devices-${i.name}.device" ];
+            serviceConfig.Type = "oneshot";
+            serviceConfig.RemainAfterExit = true;
+            path = [ pkgs.iproute ];
+            script =
+              ''
+                echo "bringing up interface..."
+                ip link set "${i.name}" up
+              ''
+              + optionalString (i.macAddress != "")
+                ''
+                  echo "setting MAC address to ${i.macAddress}..."
+                  ip link set "${i.name}" address "${i.macAddress}"
+                ''
+              + optionalString (i.ipAddress != "")
+                ''
+                  echo "configuring interface..."
+                  ip addr flush dev "${i.name}"
+                  ip addr add "${i.ipAddress}""${optionalString (i.subnetMask != "") ("/" + i.subnetMask)}" \
+                    dev "${i.name}"
+                  ${config.system.build.systemd}/bin/systemctl start ip-up.target
+                ''
+              + optionalString i.proxyARP
+                ''
+                  echo 1 > /proc/sys/net/ipv4/conf/${i.name}/proxy_arp
+                ''
+              + optionalString (i.proxyARP && cfg.enableIPv6)
+                ''
+                  echo 1 > /proc/sys/net/ipv6/conf/${i.name}/proxy_ndp
+                '';
+          };
+
+        createTunDevice = i: nameValuePair "${i.name}"
+          { description = "Virtual Network Interface ${i.name}";
+            wantedBy = [ "network.target" ];
+            serviceConfig =
+              { Type = "oneshot";
+                RemainAfterExit = true;
+                ExecStart = "${pkgs.tunctl}/bin/tunctl -t '${i.name}' -u '${i.virtualOwner}'";
+                ExecStop = "${pkgs.tunctl}/bin/tunctl -d '${i.name}'";
+              };
+          };
+
+        createBridgeDevice = n: v:
+          let
+            deps = map (i: "sys-subsystem-net-devices-${i}.device") v.interfaces;
+          in
+          { description = "Bridge Interface ${n}";
+            wantedBy = [ "network.target" ];
+            wants = map (i: "${i}.service") v.interfaces;
+            bindsTo = deps;
+            after = deps;
+            serviceConfig.Type = "oneshot";
+            serviceConfig.RemainAfterExit = true;
+            path = [ pkgs.bridge_utils pkgs.iproute ];
+            script =
+              ''
+                brctl addbr "${n}"
+
+                # Set bridge's hello time to 0 to avoid startup delays.
+                brctl setfd "${n}" 0
+
+                ${flip concatMapStrings v.interfaces (i: ''
+                  brctl addif "${n}" "${i}"
+                  ip addr flush dev "${i}"
+                '')}
+
+                # !!! Should delete (brctl delif) any interfaces that
+                # no longer belong to the bridge.
+              '';
+            postStop =
+              ''
+                ip link set "${n}" down
+                brctl delbr "${n}"
+              '';
+          };
+
+      in listToAttrs (
+           map configureInterface cfg.interfaces ++
+           map createTunDevice (filter (i: i.virtual) cfg.interfaces))
+         // mapAttrs createBridgeDevice cfg.bridges;
+
     # Set the host name in the activation script.  Don't clear it if
     # it's not configured in the NixOS configuration, since it may
     # have been set by dhclient in the meantime.
-- 
GitLab


From bd1071d02bfa422c8137a666c47fa3b7b1ec7ce9 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 10 Oct 2012 22:47:50 -0400
Subject: [PATCH 4088/5331] Remove "wants" dependencies on <interface>.service

Instead it's enough to depend on
sys-subsystem-net-devices-<interface>.device, which in turn has a
"wants" dependency on the service (if any) that creates the interface.
---
 modules/programs/virtualbox.nix      | 2 +-
 modules/tasks/network-interfaces.nix | 8 +++-----
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/modules/programs/virtualbox.nix b/modules/programs/virtualbox.nix
index 27e4ac400da..e62b05bd896 100644
--- a/modules/programs/virtualbox.nix
+++ b/modules/programs/virtualbox.nix
@@ -24,7 +24,7 @@ let virtualbox = config.boot.kernelPackages.virtualbox; in
       requires = [ "dev-vboxnetctl.device" ];
       after = [ "dev-vboxnetctl.device" ];
       before = [ "network-interfaces.service" ];
-      wantedBy = [ "multi-user.target" ];
+      wantedBy = [ "network.target" "sys-subsystem-net-devices-vboxnet0.device" ];
       path = [ virtualbox ];
       preStart =
         ''
diff --git a/modules/tasks/network-interfaces.nix b/modules/tasks/network-interfaces.nix
index c0499c9f94c..65da0610b8f 100644
--- a/modules/tasks/network-interfaces.nix
+++ b/modules/tasks/network-interfaces.nix
@@ -287,9 +287,8 @@ in
         configureInterface = i: nameValuePair "${i.name}-cfg"
           { description = "Configuration of ${i.name}";
             wantedBy = [ "network.target" ];
-            wants = [ "${i.name}.service" ];
             bindsTo = [ "sys-subsystem-net-devices-${i.name}.device" ];
-            after = [ "${i.name}.service" "sys-subsystem-net-devices-${i.name}.device" ];
+            after = [ "sys-subsystem-net-devices-${i.name}.device" ];
             serviceConfig.Type = "oneshot";
             serviceConfig.RemainAfterExit = true;
             path = [ pkgs.iproute ];
@@ -323,7 +322,7 @@ in
 
         createTunDevice = i: nameValuePair "${i.name}"
           { description = "Virtual Network Interface ${i.name}";
-            wantedBy = [ "network.target" ];
+            wantedBy = [ "network.target" "sys-subsystem-net-devices-${i.name}.device" ];
             serviceConfig =
               { Type = "oneshot";
                 RemainAfterExit = true;
@@ -337,8 +336,7 @@ in
             deps = map (i: "sys-subsystem-net-devices-${i}.device") v.interfaces;
           in
           { description = "Bridge Interface ${n}";
-            wantedBy = [ "network.target" ];
-            wants = map (i: "${i}.service") v.interfaces;
+            wantedBy = [ "network.target" "sys-subsystem-net-devices-${n}.device" ];
             bindsTo = deps;
             after = deps;
             serviceConfig.Type = "oneshot";
-- 
GitLab


From 4104f60800d0ec5ff5041b7666bd30d49936d10f Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 11 Oct 2012 12:43:08 -0400
Subject: [PATCH 4089/5331] Fix accidental commit

---
 modules/system/boot/systemd.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/system/boot/systemd.nix b/modules/system/boot/systemd.nix
index 31560a4dc17..c166c1cbf03 100644
--- a/modules/system/boot/systemd.nix
+++ b/modules/system/boot/systemd.nix
@@ -7,7 +7,7 @@ let
 
   cfg = config.boot.systemd;
 
-  systemd = pkgs.systemd_tmp;
+  systemd = pkgs.systemd;
 
   makeUnit = name: unit:
     pkgs.writeTextFile { name = "unit"; inherit (unit) text; destination = "/${name}"; };
-- 
GitLab


From 1c53b2e29986ff399033ef975f22939e93104139 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 11 Oct 2012 15:36:52 -0400
Subject: [PATCH 4090/5331] Don't flush addresses unless necessary
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Flushing is bad if the Nix store is on a remote filesystem accessed
over that interface.

http://hydra.nixos.org/build/3184162

Also added a interface option ‘prefixLength’ as a better alternative
to ‘subnetMask’.
---
 modules/programs/virtualbox.nix      |  2 +-
 modules/tasks/network-interfaces.nix | 38 ++++++++++++++++++++++------
 modules/virtualisation/qemu-vm.nix   |  1 +
 3 files changed, 32 insertions(+), 9 deletions(-)

diff --git a/modules/programs/virtualbox.nix b/modules/programs/virtualbox.nix
index e62b05bd896..0fb4a95d30b 100644
--- a/modules/programs/virtualbox.nix
+++ b/modules/programs/virtualbox.nix
@@ -38,5 +38,5 @@ let virtualbox = config.boot.kernelPackages.virtualbox; in
         '';
     };
 
-  networking.interfaces = [ { name = "vboxnet0"; ipAddress = "192.168.56.1"; subnetMask = "255.255.255.0"; } ];
+  networking.interfaces = [ { name = "vboxnet0"; ipAddress = "192.168.56.1"; prefixLength = 24; } ];
 }
diff --git a/modules/tasks/network-interfaces.nix b/modules/tasks/network-interfaces.nix
index 65da0610b8f..20e1a006675 100644
--- a/modules/tasks/network-interfaces.nix
+++ b/modules/tasks/network-interfaces.nix
@@ -101,13 +101,24 @@ in
           '';
         };
 
+        prefixLength = mkOption {
+          default = null;
+          example = 24;
+          type = types.nullOr types.int;
+          description = ''
+            Subnet mask of the interface, specified as the number of
+            bits in the prefix (<literal>24</literal>).
+          '';
+        };
+
         subnetMask = mkOption {
           default = "";
           example = "255.255.255.0";
           type = types.string;
           description = ''
-            Subnet mask of the interface.  Leave empty to use the
-            default subnet mask.
+            Subnet mask of the interface, specified as a bitmask.
+            This is deprecated; use <option>prefixLength</option>
+            instead.
           '';
         };
 
@@ -285,13 +296,17 @@ in
         # has appeared, and it's stopped when the interface
         # disappears.
         configureInterface = i: nameValuePair "${i.name}-cfg"
+          (let mask =
+                if i.prefixLength != null then toString i.prefixLength else
+                if i.subnetMask != "" then i.subnetMask else "32";
+          in
           { description = "Configuration of ${i.name}";
             wantedBy = [ "network.target" ];
             bindsTo = [ "sys-subsystem-net-devices-${i.name}.device" ];
             after = [ "sys-subsystem-net-devices-${i.name}.device" ];
             serviceConfig.Type = "oneshot";
             serviceConfig.RemainAfterExit = true;
-            path = [ pkgs.iproute ];
+            path = [ pkgs.iproute pkgs.gawk ];
             script =
               ''
                 echo "bringing up interface..."
@@ -304,10 +319,17 @@ in
                 ''
               + optionalString (i.ipAddress != "")
                 ''
-                  echo "configuring interface..."
-                  ip addr flush dev "${i.name}"
-                  ip addr add "${i.ipAddress}""${optionalString (i.subnetMask != "") ("/" + i.subnetMask)}" \
-                    dev "${i.name}"
+                  cur=$(ip -4 -o a show dev "${i.name}" | awk '{print $4}')
+                  # Only do a flush/add if it's necessary.  This is
+                  # useful when the Nix store is accessed via this
+                  # interface (e.g. in a QEMU VM test).
+                  if [ "$cur" != "${i.ipAddress}/${mask}" ]; then
+                    echo "configuring interface..."
+                    ip -4 addr flush dev "${i.name}"
+                    ip -4 addr add "${i.ipAddress}/${mask}" dev "${i.name}"
+                  else
+                    echo "skipping configuring interface"
+                  fi
                   ${config.system.build.systemd}/bin/systemctl start ip-up.target
                 ''
               + optionalString i.proxyARP
@@ -318,7 +340,7 @@ in
                 ''
                   echo 1 > /proc/sys/net/ipv6/conf/${i.name}/proxy_ndp
                 '';
-          };
+          });
 
         createTunDevice = i: nameValuePair "${i.name}"
           { description = "Virtual Network Interface ${i.name}";
diff --git a/modules/virtualisation/qemu-vm.nix b/modules/virtualisation/qemu-vm.nix
index f71e0ba5112..ec11f3604e7 100644
--- a/modules/virtualisation/qemu-vm.nix
+++ b/modules/virtualisation/qemu-vm.nix
@@ -363,6 +363,7 @@ in
   networking.interfaces = singleton
     { name = "eth0";
       ipAddress = "10.0.2.15";
+      prefixLength = 24;
     };
 
   # Don't run ntpd in the guest.  It should get the correct time from KVM.
-- 
GitLab


From 2cf9bb929bb577738bf83c950da384b607fc6ff1 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 11 Oct 2012 16:18:34 -0400
Subject: [PATCH 4091/5331] =?UTF-8?q?Add=20a=20=E2=80=98restart=E2=80=99?=
 =?UTF-8?q?=20alias?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 modules/programs/bash/bashrc.sh | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/modules/programs/bash/bashrc.sh b/modules/programs/bash/bashrc.sh
index e2526c398c7..5e68eb9e6b6 100644
--- a/modules/programs/bash/bashrc.sh
+++ b/modules/programs/bash/bashrc.sh
@@ -42,6 +42,9 @@ alias ls="ls --color=tty"
 alias ll="ls -l"
 alias l="ls -alh"
 alias which="type -P"
+
+# Convenience for people used to Upstart.
 alias start="systemctl start"
 alias stop="systemctl stop"
+alias restart="systemctl restart"
 alias status="systemctl status"
-- 
GitLab


From 285f58702599d4784b21c2a087a7b2c09ecdbce4 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 11 Oct 2012 16:18:48 -0400
Subject: [PATCH 4092/5331] =?UTF-8?q?Move=20non-interface=20specific=20ini?=
 =?UTF-8?q?tialisation=20to=20=E2=80=98network-setup.service=E2=80=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The unit ‘network-interface.service’ has been replaced by
‘network-interfaces.target’.
---
 modules/programs/virtualbox.nix        |  1 -
 modules/services/networking/dhcpcd.nix |  2 +-
 modules/system/upstart/upstart.nix     |  2 +-
 modules/tasks/network-interfaces.nix   | 82 ++++++++++++++------------
 4 files changed, 47 insertions(+), 40 deletions(-)

diff --git a/modules/programs/virtualbox.nix b/modules/programs/virtualbox.nix
index 0fb4a95d30b..7bce11ab855 100644
--- a/modules/programs/virtualbox.nix
+++ b/modules/programs/virtualbox.nix
@@ -23,7 +23,6 @@ let virtualbox = config.boot.kernelPackages.virtualbox; in
     { description = "VirtualBox vboxnet0 Interface";
       requires = [ "dev-vboxnetctl.device" ];
       after = [ "dev-vboxnetctl.device" ];
-      before = [ "network-interfaces.service" ];
       wantedBy = [ "network.target" "sys-subsystem-net-devices-vboxnet0.device" ];
       path = [ virtualbox ];
       preStart =
diff --git a/modules/services/networking/dhcpcd.nix b/modules/services/networking/dhcpcd.nix
index cfbc7ba3679..4f89f77b12b 100644
--- a/modules/services/networking/dhcpcd.nix
+++ b/modules/services/networking/dhcpcd.nix
@@ -95,7 +95,7 @@ in
       { description = "DHCP Client";
 
         wantedBy = [ "multi-user.target" ];
-        after = [ "network-interfaces.service" ];
+        after = [ "network-interfaces.target" ];
 
         path = [ dhcpcd pkgs.nettools pkgs.openresolv ];
 
diff --git a/modules/system/upstart/upstart.nix b/modules/system/upstart/upstart.nix
index d6362a0e4ca..9d17b352dc8 100644
--- a/modules/system/upstart/upstart.nix
+++ b/modules/system/upstart/upstart.nix
@@ -59,7 +59,7 @@ let
       after =
         (if job.startOn == "stopped udevtrigger" then [ "systemd-udev-settle.service" ] else
          if job.startOn == "started udev" then [ "systemd-udev.service" ] else
-         if job.startOn == "started network-interfaces" then [ "network-interfaces.service" ] else
+         if job.startOn == "started network-interfaces" then [ "network-interfaces.target" ] else
          if job.startOn == "started networking" then [ "network.target" ] else
          if job.startOn == "ip-up" then [] else
          if job.startOn == "" || job.startOn == "startup" then [] else
diff --git a/modules/tasks/network-interfaces.nix b/modules/tasks/network-interfaces.nix
index 20e1a006675..8c2a3215f2a 100644
--- a/modules/tasks/network-interfaces.nix
+++ b/modules/tasks/network-interfaces.nix
@@ -246,47 +246,54 @@ in
 
     security.setuidPrograms = [ "ping" "ping6" ];
 
-    jobs."network-interfaces" =
-      { description = "Static Network Interfaces";
-
-        after = [ "systemd-udev-settle.service" ];
-        before = [ "network.target" ];
+    boot.systemd.targets."network-interfaces" =
+      { description = "All Network Interfaces";
         wantedBy = [ "network.target" ];
-
-        path = [ pkgs.iproute ];
-
-        preStart =
-          ''
-            set +e # continue in case of errors
-
-            # Set the static DNS configuration, if given.
-            cat | ${pkgs.openresolv}/sbin/resolvconf -a static <<EOF
-            ${optionalString (cfg.nameservers != [] && cfg.domain != "") ''
-              domain ${cfg.domain}
-            ''}
-            ${flip concatMapStrings cfg.nameservers (ns: ''
-              nameserver ${ns}
-            '')}
-            EOF
-
-            # Set the default gateway.
-            ${optionalString (cfg.defaultGateway != "") ''
-              ip route add default via "${cfg.defaultGateway}"
-            ''}
-
-            # Turn on forwarding if any interface has enabled proxy_arp.
-            ${optionalString (any (i: i.proxyARP) cfg.interfaces) ''
-              echo 1 > /proc/sys/net/ipv4/ip_forward
-            ''}
-
-            # Run any user-specified commands.
-            ${pkgs.stdenv.shell} ${pkgs.writeText "local-net-cmds" cfg.localCommands}
-          '';
       };
 
     boot.systemd.services =
       let
 
+        networkSetup =
+          { description = "Networking Setup";
+
+            after = [ "network-interfaces.target" ];
+            before = [ "network.target" ];
+            wantedBy = [ "network.target" ];
+
+            path = [ pkgs.iproute ];
+
+            serviceConfig.Type = "oneshot";
+            serviceConfig.RemainAfterExit = true;
+
+            script =
+              ''
+                # Set the static DNS configuration, if given.
+                cat | ${pkgs.openresolv}/sbin/resolvconf -a static <<EOF
+                ${optionalString (cfg.nameservers != [] && cfg.domain != "") ''
+                  domain ${cfg.domain}
+                ''}
+                ${flip concatMapStrings cfg.nameservers (ns: ''
+                  nameserver ${ns}
+                '')}
+                EOF
+
+                # Set the default gateway.
+                ${optionalString (cfg.defaultGateway != "") ''
+                  # FIXME: get rid of "|| true" (necessary to make it idempotent).
+                  ip route add default via "${cfg.defaultGateway}" || true
+                ''}
+
+                # Turn on forwarding if any interface has enabled proxy_arp.
+                ${optionalString (any (i: i.proxyARP) cfg.interfaces) ''
+                  echo 1 > /proc/sys/net/ipv4/ip_forward
+                ''}
+
+                # Run any user-specified commands.
+                ${cfg.localCommands}
+              '';
+          };
+
         # For each interface <foo>, create a job ‘<foo>-cfg.service"
         # that performs static configuration.  It has a "wants"
         # dependency on ‘<foo>.service’, which is supposed to create
@@ -301,7 +308,7 @@ in
                 if i.subnetMask != "" then i.subnetMask else "32";
           in
           { description = "Configuration of ${i.name}";
-            wantedBy = [ "network.target" ];
+            wantedBy = [ "network-interfaces.target" ];
             bindsTo = [ "sys-subsystem-net-devices-${i.name}.device" ];
             after = [ "sys-subsystem-net-devices-${i.name}.device" ];
             serviceConfig.Type = "oneshot";
@@ -389,7 +396,8 @@ in
       in listToAttrs (
            map configureInterface cfg.interfaces ++
            map createTunDevice (filter (i: i.virtual) cfg.interfaces))
-         // mapAttrs createBridgeDevice cfg.bridges;
+         // mapAttrs createBridgeDevice cfg.bridges
+         // { "network-setup" = networkSetup; };
 
     # Set the host name in the activation script.  Don't clear it if
     # it's not configured in the NixOS configuration, since it may
-- 
GitLab


From b606165bd9d4c8a1f82160f67bd541f064ed1ddc Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 11 Oct 2012 17:54:43 -0400
Subject: [PATCH 4093/5331] Allow a unit to declare "triggers" that force a
 restart
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The triggers are just arbitrary strings that are included in the unit
under X-Restart-Triggers.  The idea is that if they change between
reconfigurations, switch-to-configuration will restart the unit
because its store path changed.  This is mostly useful for services
that implicitly depend on generated files in /etc.  Thus you can say

  restartTriggers = [ confFile ];

where ‘confFile’ is the derivation that generated the /etc file in
question.
---
 modules/system/boot/systemd-unit-options.nix | 9 +++++++++
 modules/system/boot/systemd.nix              | 1 +
 2 files changed, 10 insertions(+)

diff --git a/modules/system/boot/systemd-unit-options.nix b/modules/system/boot/systemd-unit-options.nix
index 2efea2fb9e1..239c837c676 100644
--- a/modules/system/boot/systemd-unit-options.nix
+++ b/modules/system/boot/systemd-unit-options.nix
@@ -83,6 +83,15 @@ rec {
       '';
     };
 
+    restartTriggers = mkOption {
+      default = [];
+      description = ''
+        An arbitrary list of items such as derivations.  If any item
+        in the list changes between reconfigurations, the service will
+        be restarted.
+      '';
+    };
+
   };
 
 
diff --git a/modules/system/boot/systemd.nix b/modules/system/boot/systemd.nix
index c166c1cbf03..d88ac652ae0 100644
--- a/modules/system/boot/systemd.nix
+++ b/modules/system/boot/systemd.nix
@@ -176,6 +176,7 @@ let
           Before = concatStringsSep " " config.before;
           BindsTo = concatStringsSep " " config.bindsTo;
           PartOf = concatStringsSep " " config.partOf;
+          "X-Restart-Triggers" = toString config.restartTriggers;
         } // optionalAttrs (config.description != "") {
           Description = config.description;
         };
-- 
GitLab


From 71a541afb6cb83b896396f7b6e563abd0c8af4f5 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 11 Oct 2012 17:57:54 -0400
Subject: [PATCH 4094/5331] dhcpcd: Don't depend on network-interfaces.target

Dhcpcd automatically detects new interfaces, so we can start it right
away.
---
 modules/services/networking/dhcpcd.nix | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/modules/services/networking/dhcpcd.nix b/modules/services/networking/dhcpcd.nix
index 4f89f77b12b..f2300a9529d 100644
--- a/modules/services/networking/dhcpcd.nix
+++ b/modules/services/networking/dhcpcd.nix
@@ -94,8 +94,7 @@ in
     boot.systemd.services.dhcpcd =
       { description = "DHCP Client";
 
-        wantedBy = [ "multi-user.target" ];
-        after = [ "network-interfaces.target" ];
+        wantedBy = [ "network.target" ];
 
         path = [ dhcpcd pkgs.nettools pkgs.openresolv ];
 
-- 
GitLab


From d63da5892cf79df5d66cdc76430ccd371bd5fb71 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 11 Oct 2012 17:58:46 -0400
Subject: [PATCH 4095/5331] Ensure that systemd-modules-load is restarted when
 boot.kernelModules changes

---
 modules/system/boot/kernel.nix  | 36 ++++++++++++++++++++++++++++-----
 modules/system/boot/systemd.nix |  2 +-
 2 files changed, 32 insertions(+), 6 deletions(-)

diff --git a/modules/system/boot/kernel.nix b/modules/system/boot/kernel.nix
index 8a660b90581..130adb1110a 100644
--- a/modules/system/boot/kernel.nix
+++ b/modules/system/boot/kernel.nix
@@ -2,7 +2,16 @@
 
 with pkgs.lib;
 
-let kernel = config.boot.kernelPackages.kernel; in
+let
+
+  kernel = config.boot.kernelPackages.kernel;
+
+  kernelModulesConf = pkgs.writeText "nixos.conf"
+    ''
+      ${concatStringsSep "\n" config.boot.kernelModules}
+    '';
+
+in
 
 {
 
@@ -197,10 +206,27 @@ let kernel = config.boot.kernelPackages.kernel; in
     # this file changes.
     environment.etc = singleton
       { target = "modules-load.d/nixos.conf";
-        source = pkgs.writeText "nixos.conf"
-          ''
-            ${concatStringsSep "\n" config.boot.kernelModules}
-          '';
+        source = kernelModulesConf;
+      };
+
+    # Sigh.  This overrides systemd's systemd-modules-load.service
+    # just so we can set a restart trigger.  Also make
+    # multi-user.target pull it in so that it gets started if it
+    # failed earlier.
+    boot.systemd.services."systemd-modules-load" =
+      { description = "Load Kernel Modules";
+        wantedBy = [ "sysinit.target" "multi-user.target" ];
+        before = [ "sysinit.target" "shutdown.target" ];
+        unitConfig =
+          { DefaultDependencies = "no";
+            Conflicts = "shutdown.target";
+          };
+        serviceConfig =
+          { Type = "oneshot";
+            RemainAfterExit = true;
+            ExecStart = "${config.system.build.systemd}/lib/systemd/systemd-modules-load";
+          };
+        restartTriggers = [ kernelModulesConf ];
       };
 
     lib.kernelConfig = {
diff --git a/modules/system/boot/systemd.nix b/modules/system/boot/systemd.nix
index d88ac652ae0..0ccb30eb92f 100644
--- a/modules/system/boot/systemd.nix
+++ b/modules/system/boot/systemd.nix
@@ -76,7 +76,7 @@ let
       "systemd-update-utmp-shutdown.service"
 
       # Kernel module loading.
-      "systemd-modules-load.service"
+      #"systemd-modules-load.service"
 
       # Filesystems.
       "systemd-fsck@.service"
-- 
GitLab


From e3c1865067b5517f6264083863f92bc5beedcd28 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 11 Oct 2012 17:59:41 -0400
Subject: [PATCH 4096/5331] Let the tun services depend on /dev/net/tun

---
 modules/tasks/network-interfaces.nix | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/modules/tasks/network-interfaces.nix b/modules/tasks/network-interfaces.nix
index 8c2a3215f2a..7ef548a36b4 100644
--- a/modules/tasks/network-interfaces.nix
+++ b/modules/tasks/network-interfaces.nix
@@ -351,6 +351,8 @@ in
 
         createTunDevice = i: nameValuePair "${i.name}"
           { description = "Virtual Network Interface ${i.name}";
+            requires = [ "dev-net-tun.device" ];
+            after = [ "dev-net-tun.device" ];
             wantedBy = [ "network.target" "sys-subsystem-net-devices-${i.name}.device" ];
             serviceConfig =
               { Type = "oneshot";
@@ -407,6 +409,11 @@ in
         hostname "${config.networking.hostName}"
       '';
 
+    services.udev.extraRules =
+      ''
+        KERNEL=="tun", TAG+="systemd"
+      '';
+
   };
 
 }
-- 
GitLab


From 7ce9893bef53b9bb3c37042557593457fbf3a6b3 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 12 Oct 2012 18:14:39 +0200
Subject: [PATCH 4097/5331] network-interfaces.nix: interfaces that are part of
 a bridge must be brought 'up' for the bridge to function

---
 modules/tasks/network-interfaces.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/modules/tasks/network-interfaces.nix b/modules/tasks/network-interfaces.nix
index 7ef548a36b4..5c984b9e59c 100644
--- a/modules/tasks/network-interfaces.nix
+++ b/modules/tasks/network-interfaces.nix
@@ -382,6 +382,7 @@ in
 
                 ${flip concatMapStrings v.interfaces (i: ''
                   brctl addif "${n}" "${i}"
+                  ip link set "${i}" up
                   ip addr flush dev "${i}"
                 '')}
 
-- 
GitLab


From b968244aa16b0456b4e57f67a8c71e9dad788a2d Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 12 Oct 2012 15:08:44 -0400
Subject: [PATCH 4098/5331] Move fs.target to filesystems.nix

---
 modules/system/boot/systemd.nix | 8 --------
 modules/tasks/filesystems.nix   | 6 ++++++
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/modules/system/boot/systemd.nix b/modules/system/boot/systemd.nix
index 0ccb30eb92f..248dda60f59 100644
--- a/modules/system/boot/systemd.nix
+++ b/modules/system/boot/systemd.nix
@@ -158,13 +158,6 @@ let
       KillSignal=SIGHUP
     '';
 
-  fsTarget =
-    ''
-      [Unit]
-      Description=All File Systems
-      Wants=local-fs.target remote-fs.target
-    '';
-
   makeJobScript = name: content: "${pkgs.writeScriptBin name content}/bin/${name}";
 
   unitConfig = { name, config, ... }: {
@@ -423,7 +416,6 @@ in
 
     boot.systemd.units =
       { "rescue.service".text = rescueService; }
-      // { "fs.target" = { text = fsTarget; wantedBy = [ "multi-user.target" ]; }; }
       // mapAttrs' (n: v: nameValuePair "${n}.target" (targetToUnit n v)) cfg.targets
       // mapAttrs' (n: v: nameValuePair "${n}.service" (serviceToUnit n v)) cfg.services
       // mapAttrs' (n: v: nameValuePair "${n}.socket" (socketToUnit n v)) cfg.sockets;
diff --git a/modules/tasks/filesystems.nix b/modules/tasks/filesystems.nix
index 14abe22a2da..8bc0b7531c0 100644
--- a/modules/tasks/filesystems.nix
+++ b/modules/tasks/filesystems.nix
@@ -180,6 +180,12 @@ in
         target = "fstab";
       };
 
+    # Provide a target that pulls in all filesystems.
+    boot.systemd.targets.fs =
+      { description = "All File Systems";
+        wants = [ "local-fs.target" "remote-fs.target" ];
+      };
+
     /*
     jobs.mountall =
       { startOn = "started udev or config-changed";
-- 
GitLab


From fd7dbc99ab36915769db8c7311abdbd287555d6e Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 12 Oct 2012 16:37:14 -0400
Subject: [PATCH 4099/5331] switch-to-configuration: Handle multiple swap
 devices properly

---
 .../activation/switch-to-configuration.pl     | 55 +++++++++++--------
 1 file changed, 33 insertions(+), 22 deletions(-)

diff --git a/modules/system/activation/switch-to-configuration.pl b/modules/system/activation/switch-to-configuration.pl
index 6542b48c54e..2b26801f35f 100644
--- a/modules/system/activation/switch-to-configuration.pl
+++ b/modules/system/activation/switch-to-configuration.pl
@@ -64,15 +64,19 @@ sub getActiveUnits {
 
 sub parseFstab {
     my ($filename) = @_;
-    my %res;
+    my ($fss, $swaps);
     foreach my $line (read_file($filename, err_mode => 'quiet')) {
         chomp $line;
         $line =~ s/#.*//;
         next if $line =~ /^\s*$/;
         my @xs = split / /, $line;
-        $res{$xs[1]} = { device => $xs[0], fsType => $xs[2], options => $xs[3] // "" };
+        if ($xs[2] eq "swap") {
+            $swaps->{$xs[0]} = { options => $xs[3] // "" };
+        } else {
+            $fss->{$xs[1]} = { device => $xs[0], fsType => $xs[2], options => $xs[3] // "" };
+        }
     }
-    return %res;
+    return ($fss, $swaps);
 }
 
 sub parseUnit {
@@ -187,26 +191,18 @@ sub unique {
 
 # Compare the previous and new fstab to figure out which filesystems
 # need a remount or need to be unmounted.  New filesystems are mounted
-# automatically by starting local-fs.target.  Also handles swap
-# devices.  FIXME: might be nicer if we generated units for all
-# mounts; then we could unify this with the unit checking code above.
-my %prevFstab = parseFstab "/etc/fstab";
-my %newFstab = parseFstab "@out@/etc/fstab";
-foreach my $mountPoint (keys %prevFstab) {
-    my $prev = $prevFstab{$mountPoint};
-    my $new = $newFstab{$mountPoint};
-    my $unit = pathToUnitName($mountPoint). ".mount" if $prev->{fsType} ne "swap";
+# automatically by starting local-fs.target.  FIXME: might be nicer if
+# we generated units for all mounts; then we could unify this with the
+# unit checking code above.
+my ($prevFss, $prevSwaps) = parseFstab "/etc/fstab";
+my ($newFss, $newSwaps) = parseFstab "@out@/etc/fstab";
+foreach my $mountPoint (keys ${prevFss}) {
+    my $prev = $prevFss->{$mountPoint};
+    my $new = $newFss->{$mountPoint};
+    my $unit = pathToUnitName($mountPoint) . ".mount";
     if (!defined $new) {
-        if ($prev->{fsType} eq "swap") {
-            # Swap entry disappeared, so turn it off.  Can't use
-            # "systemctl stop" here because systemd has lots of alias
-            # units that prevent a stop from actually calling
-            # "swapoff".
-            system("@utillinux@/sbin/swapoff", $prev->{device});
-        } else {
-            # Filesystem entry disappeared, so unmount it.
-            push @unitsToStop, $unit;
-        }
+        # Filesystem entry disappeared, so unmount it.
+        push @unitsToStop, $unit;
     } elsif ($prev->{fsType} ne $new->{fsType} || $prev->{device} ne $new->{device}) {
         # Filesystem type or device changed, so unmount and mount it.
         write_file($restartListFile, { append => 1 }, "$unit\n");
@@ -217,6 +213,21 @@ foreach my $mountPoint (keys %prevFstab) {
     }
 }
 
+# Also handles swap devices.
+foreach my $device (keys ${prevSwaps}) {
+    my $prev = $prevSwaps->{$device};
+    my $new = $newSwaps->{$device};
+    if (!defined $new) {
+        # Swap entry disappeared, so turn it off.  Can't use
+        # "systemctl stop" here because systemd has lots of alias
+        # units that prevent a stop from actually calling
+        # "swapoff".
+        print STDERR "stopping swap device: $device\n";
+        system("@utillinux@/sbin/swapoff", $device);
+    }
+    # FIXME: update swap options (i.e. its priority).
+}
+
 if (scalar @unitsToStop > 0) {
     @unitsToStop = unique(@unitsToStop);
     print STDERR "stopping the following units: ", join(", ", sort(@unitsToStop)), "\n";
-- 
GitLab


From 97a2de983bb53c29520b2b125e70d2fb07fba3b8 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 12 Oct 2012 16:38:00 -0400
Subject: [PATCH 4100/5331] Ensure that swap.target is pulled in by
 switch-to-configuration even if it failed earlier

---
 modules/system/boot/systemd.nix | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/modules/system/boot/systemd.nix b/modules/system/boot/systemd.nix
index 248dda60f59..3de6220e6b9 100644
--- a/modules/system/boot/systemd.nix
+++ b/modules/system/boot/systemd.nix
@@ -311,8 +311,7 @@ let
       ln -s ${cfg.defaultUnit} $out/default.target
 
       #ln -s ../getty@tty1.service $out/multi-user.target.wants/
-      ln -s ../remote-fs.target $out/multi-user.target.wants/
-      ln -s ../network.target $out/multi-user.target.wants/
+      ln -s ../remote-fs.target ../network.target ../swap.target $out/multi-user.target.wants/
     ''; # */
 
 in
-- 
GitLab


From e8de4455ab0230d88b39a580a934ace69f5110ca Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 12 Oct 2012 16:47:11 -0400
Subject: [PATCH 4101/5331] Update automatic swapfile creation for systemd

---
 modules/config/swap.nix       | 31 +++++++++++++++++++++++++++++++
 modules/tasks/filesystems.nix | 10 ----------
 2 files changed, 31 insertions(+), 10 deletions(-)

diff --git a/modules/config/swap.nix b/modules/config/swap.nix
index 5b20f657e12..776574bc016 100644
--- a/modules/config/swap.nix
+++ b/modules/config/swap.nix
@@ -74,9 +74,40 @@ with pkgs.lib;
   };
 
   config = mkIf ((length config.swapDevices) != 0) {
+
     system.requiredKernelConfig = with config.lib.kernelConfig; [
       (isYes "SWAP")
     ];
+
+    # Create missing swapfiles.
+    # FIXME: support changing the size of existing swapfiles.
+    boot.systemd.services =
+      let
+
+        escapePath = s: # FIXME: slow
+          replaceChars ["/" "-"] ["-" "\\x2d"] (substring 1 (stringLength s) s);
+
+        createSwapDevice = sw: assert sw.device != ""; nameValuePair "mkswap-${escapePath sw.device}"
+          { description = "Initialisation of Swapfile ${sw.device}";
+            wantedBy = [ "${escapePath sw.device}.swap" ];
+            before = [ "${escapePath sw.device}.swap" ];
+            path = [ pkgs.utillinux ];
+            script =
+              ''
+                if [ ! -e "${sw.device}" ]; then
+                  fallocate -l ${toString sw.size}M "${sw.device}" ||
+                    dd if=/dev/zero of="${sw.device}" bs=1M count=${toString sw.size}
+                  mkswap ${sw.device}
+                fi
+              '';
+            unitConfig.RequiresMountsFor = "${dirOf sw.device}";
+            unitConfig.DefaultDependencies = false; # needed to prevent a cycle
+            serviceConfig.Type = "oneshot";
+            serviceConfig.RemainAfterExit = true;
+          };
+
+      in listToAttrs (map createSwapDevice (filter (sw: sw.size != null) config.swapDevices));
+
   };
 
 }
diff --git a/modules/tasks/filesystems.nix b/modules/tasks/filesystems.nix
index 8bc0b7531c0..6c321b23c7e 100644
--- a/modules/tasks/filesystems.nix
+++ b/modules/tasks/filesystems.nix
@@ -213,16 +213,6 @@ in
               fi
             '')}
 
-            # Create missing swapfiles.
-            # FIXME: support changing the size of existing swapfiles.
-            ${flip concatMapStrings config.swapDevices (sw: optionalString (sw.size != null) ''
-              if [ ! -e "${sw.device}" -a -e "$(dirname "${sw.device}")" ]; then
-                # FIXME: use ‘fallocate’ on filesystems that support it.
-                dd if=/dev/zero of="${sw.device}" bs=1M count=${toString sw.size}
-                mkswap ${sw.device}
-              fi
-            '')}
-            
           '';
 
         daemonType = "daemon";
-- 
GitLab


From 3f6d53cc972fe8bf34b5cb0184087d95c1130c1d Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 12 Oct 2012 17:01:49 -0400
Subject: [PATCH 4102/5331] Move escapeSystemdPath to lib/utils.nix
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The new file ‘utils.nix’ is intended for NixOS-specific library
functions (i.e. stuff that shouldn't go into Nixpkgs' lib/).
---
 lib/eval-config.nix     |  1 +
 lib/utils.nix           | 10 ++++++++++
 modules/config/swap.nix | 15 ++++++++-------
 3 files changed, 19 insertions(+), 7 deletions(-)
 create mode 100644 lib/utils.nix

diff --git a/lib/eval-config.nix b/lib/eval-config.nix
index ffc0db1c7ea..c2bbf036af0 100644
--- a/lib/eval-config.nix
+++ b/lib/eval-config.nix
@@ -31,6 +31,7 @@ rec {
     inherit pkgs modules baseModules;
     modulesPath = ../modules;
     pkgs_i686 = import <nixpkgs> { system = "i686-linux"; };
+    utils = import ./utils.nix pkgs;
   };
 
   # Import Nixpkgs, allowing the NixOS option nixpkgs.config to
diff --git a/lib/utils.nix b/lib/utils.nix
new file mode 100644
index 00000000000..b75e063eaa9
--- /dev/null
+++ b/lib/utils.nix
@@ -0,0 +1,10 @@
+pkgs: with pkgs.lib;
+
+rec {
+
+  # Escape a path according to the systemd rules, e.g. /dev/xyzzy
+  # becomes dev-xyzzy.  FIXME: slow.
+  escapeSystemdPath = s:
+   replaceChars ["/" "-"] ["-" "\\x2d"] (substring 1 (stringLength s) s);
+
+}
diff --git a/modules/config/swap.nix b/modules/config/swap.nix
index 776574bc016..84185ff3bbd 100644
--- a/modules/config/swap.nix
+++ b/modules/config/swap.nix
@@ -1,6 +1,7 @@
-{ config, pkgs, ... }:
+{ config, pkgs, utils, ... }:
 
 with pkgs.lib;
+with utils;
 
 {
 
@@ -84,13 +85,13 @@ with pkgs.lib;
     boot.systemd.services =
       let
 
-        escapePath = s: # FIXME: slow
-          replaceChars ["/" "-"] ["-" "\\x2d"] (substring 1 (stringLength s) s);
-
-        createSwapDevice = sw: assert sw.device != ""; nameValuePair "mkswap-${escapePath sw.device}"
+        createSwapDevice = sw:
+          assert sw.device != "";
+          let device' = escapeSystemdPath sw.device; in
+          nameValuePair "mkswap-${escapeSystemdPath sw.device}"
           { description = "Initialisation of Swapfile ${sw.device}";
-            wantedBy = [ "${escapePath sw.device}.swap" ];
-            before = [ "${escapePath sw.device}.swap" ];
+            wantedBy = [ "${device'}.swap" ];
+            before = [ "${device'}.swap" ];
             path = [ pkgs.utillinux ];
             script =
               ''
-- 
GitLab


From 12d1cd87ce34095b400c7e8fd62082a743f96a53 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 12 Oct 2012 17:32:05 -0400
Subject: [PATCH 4103/5331] Systemd unit names can contain Nix-illegal
 characters, so don't include them

---
 modules/system/boot/systemd.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/modules/system/boot/systemd.nix b/modules/system/boot/systemd.nix
index 3de6220e6b9..2545eaf7393 100644
--- a/modules/system/boot/systemd.nix
+++ b/modules/system/boot/systemd.nix
@@ -224,28 +224,28 @@ let
           ${optionalString (!def.restartIfChanged) "X-RestartIfChanged=false"}
 
           ${optionalString (def.preStart != "") ''
-            ExecStartPre=${makeJobScript "${name}-prestart.sh" ''
+            ExecStartPre=${makeJobScript "prestart.sh" ''
               #! ${pkgs.stdenv.shell} -e
               ${def.preStart}
             ''}
           ''}
 
           ${optionalString (def.script != "") ''
-            ExecStart=${makeJobScript "${name}.sh" ''
+            ExecStart=${makeJobScript "start.sh" ''
               #! ${pkgs.stdenv.shell} -e
               ${def.script}
             ''}
           ''}
 
           ${optionalString (def.postStart != "") ''
-            ExecStartPost=${makeJobScript "${name}-poststart.sh" ''
+            ExecStartPost=${makeJobScript "poststart.sh" ''
               #! ${pkgs.stdenv.shell} -e
               ${def.postStart}
             ''}
           ''}
 
           ${optionalString (def.postStop != "") ''
-            ExecStopPost=${makeJobScript "${name}-poststop.sh" ''
+            ExecStopPost=${makeJobScript "poststop.sh" ''
               #! ${pkgs.stdenv.shell} -e
               ${def.postStop}
             ''}
@@ -311,7 +311,7 @@ let
       ln -s ${cfg.defaultUnit} $out/default.target
 
       #ln -s ../getty@tty1.service $out/multi-user.target.wants/
-      ln -s ../remote-fs.target ../network.target ../swap.target $out/multi-user.target.wants/
+      ln -s ../local-fs.target ../remote-fs.target ../network.target ../swap.target $out/multi-user.target.wants/
     ''; # */
 
 in
-- 
GitLab


From 161c837c49fdaed2c59738f466a265b85bbd0f19 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 12 Oct 2012 17:32:36 -0400
Subject: [PATCH 4104/5331] Port automatic filesystem creation to systemd

---
 modules/config/swap.nix       |   3 +-
 modules/tasks/filesystems.nix | 139 +++++++---------------------------
 2 files changed, 30 insertions(+), 112 deletions(-)

diff --git a/modules/config/swap.nix b/modules/config/swap.nix
index 84185ff3bbd..8a2f58d7dcd 100644
--- a/modules/config/swap.nix
+++ b/modules/config/swap.nix
@@ -101,10 +101,9 @@ with utils;
                   mkswap ${sw.device}
                 fi
               '';
-            unitConfig.RequiresMountsFor = "${dirOf sw.device}";
+            unitConfig.RequiresMountsFor = [ "${dirOf sw.device}" ];
             unitConfig.DefaultDependencies = false; # needed to prevent a cycle
             serviceConfig.Type = "oneshot";
-            serviceConfig.RemainAfterExit = true;
           };
 
       in listToAttrs (map createSwapDevice (filter (sw: sw.size != null) config.swapDevices));
diff --git a/modules/tasks/filesystems.nix b/modules/tasks/filesystems.nix
index 6c321b23c7e..77a43ed15db 100644
--- a/modules/tasks/filesystems.nix
+++ b/modules/tasks/filesystems.nix
@@ -1,6 +1,7 @@
-{ config, pkgs, ... }:
+{ config, pkgs, utils, ... }:
 
 with pkgs.lib;
+with utils;
 
 let
 
@@ -27,7 +28,7 @@ let
     '';
 
 in
-    
+
 {
 
   ###### interface
@@ -170,7 +171,7 @@ in
 
     # Add the mount helpers to the system path so that `mount' can find them.
     system.fsPackages = [ pkgs.dosfstools ];
-    
+
     environment.systemPackages =
       [ pkgs.ntfs3g pkgs.cifs_utils ]
       ++ config.system.fsPackages;
@@ -186,119 +187,37 @@ in
         wants = [ "local-fs.target" "remote-fs.target" ];
       };
 
-    /*
-    jobs.mountall =
-      { startOn = "started udev or config-changed";
-
-        task = true;
-
-        path = [ pkgs.utillinux pkgs.mountall ] ++ config.system.fsPackages;
-
-        console = "output";
-
-        preStart =
-          ''
-            # Ensure that this job is restarted when fstab changed:
-            # ${fstab}
-            echo "mounting filesystems..."
-
-            # Format devices.
-            ${flip concatMapStrings config.fileSystems (fs: optionalString fs.autoFormat ''
-              if [ -e "${fs.device}" ]; then
+    # Emit systemd services to format requested filesystems.
+    boot.systemd.services =
+      let
+
+        formatDevice = fs:
+          let
+            mountPoint' = escapeSystemdPath fs.mountPoint;
+            device' = escapeSystemdPath fs.device;
+          in nameValuePair "mkfs-${device'}"
+          { description = "Initialisation of Filesystem ${fs.device}";
+            wantedBy = [ "${mountPoint'}.mount" ];
+            before = [ "${mountPoint'}.mount" ];
+            require = [ "${device'}.device" ];
+            after = [ "${device'}.device" ];
+            path = [ pkgs.utillinux ] ++ config.system.fsPackages;
+            script =
+              ''
+                if ! [ -e "${fs.device}" ]; then exit 1; fi
+                # FIXME: this is scary.  The test could be more robust.
                 type=$(blkid -p -s TYPE -o value "${fs.device}" || true)
                 if [ -z "$type" ]; then
                   echo "creating ${fs.fsType} filesystem on ${fs.device}..."
                   mkfs.${fs.fsType} "${fs.device}"
                 fi
-              fi
-            '')}
-
-          '';
-
-        daemonType = "daemon";
-          
-        exec = "mountall --daemon";
-      };
-
-    # The `mount-failed' event is emitted synchronously, but we don't
-    # want `mountall' to wait for the emergency shell.  So use this
-    # intermediate job to make the event asynchronous.
-    jobs."mount-failed" =
-      { task = true;
-        startOn = "mount-failed";
-        restartIfChanged = false;
-        script =
-          ''
-            # Don't start the emergency shell if the X server is
-            # running.  The user won't see it, and the "console owner"
-            # stanza breaks VT switching and causes the X server to go
-            # to 100% CPU time.
-            status="$(status xserver || true)"
-            [[ "$status" =~ start/ ]] && exit 0
-
-            stop ${config.boot.ttyEmergency} || true
-            
-            start --no-wait emergency-shell \
-              DEVICE="$DEVICE" MOUNTPOINT="$MOUNTPOINT"
-          '';
-      };
+              '';
+            unitConfig.RequiresMountsFor = [ "${dirOf fs.device}" ];
+            unitConfig.DefaultDependencies = false; # needed to prevent a cycle
+            serviceConfig.Type = "oneshot";
+          };
 
-    # On an `ip-up' event, notify mountall so that it retries mounting
-    # remote filesystems.
-    jobs."mountall-ip-up" =
-      {
-        task = true;
-        startOn = "ip-up";
-        restartIfChanged = false;
-        script =
-          ''
-            # Send USR1 to the mountall process.  Can't use "pkill
-            # mountall" here because that has a race condition: we may
-            # accidentally send USR1 to children of mountall (such as
-            # fsck) just before they do execve().
-            status="$(status mountall)"
-            if [[ "$status" =~ "start/running, process "([0-9]+) ]]; then
-                pid=''${BASH_REMATCH[1]}
-                echo "sending USR1 to $pid..."
-                kill -USR1 "$pid"
-            fi
-          '';
-      };
-
-    jobs."emergency-shell" =
-      { task = true;
-
-        restartIfChanged = false;
-
-        console = "owner";
-
-        script =
-          ''
-            cat <<EOF
-
-            <<< Emergency shell >>>
-
-            The filesystem \`$DEVICE' could not be mounted on \`$MOUNTPOINT'.
-
-            Please do one of the following:
-
-            - Repair the filesystem (\`fsck $DEVICE') and exit the emergency
-              shell to resume booting.
-
-            - Ignore any failed filesystems and continue booting by running
-              \`initctl emit filesystem'.
-
-            - Remove the failed filesystem from the system configuration in
-              /etc/nixos/configuration.nix and run \`nixos-rebuild switch'.
-
-            EOF
-
-            ${pkgs.shadow}/bin/login root || false
-
-            initctl start --no-wait mountall
-          '';
-      };
-    */
+      in listToAttrs (map formatDevice (filter (fs: fs.autoFormat) config.fileSystems));
 
   };
 
-- 
GitLab


From 53f216885faf480ad4d1e2c57fce2335bda30958 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 12 Oct 2012 17:39:06 -0400
Subject: [PATCH 4105/5331] Ignore systemd-modules-load errors
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

On NixOS, ‘boot.kernelModules’ has historically contained modules that
may not exist or load everywhere, so don't barf on those.
---
 modules/system/boot/kernel.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/modules/system/boot/kernel.nix b/modules/system/boot/kernel.nix
index 130adb1110a..4b6436a77f7 100644
--- a/modules/system/boot/kernel.nix
+++ b/modules/system/boot/kernel.nix
@@ -225,6 +225,11 @@ in
           { Type = "oneshot";
             RemainAfterExit = true;
             ExecStart = "${config.system.build.systemd}/lib/systemd/systemd-modules-load";
+            # Ignore failed module loads.  Typically some of the
+            # modules in ‘boot.kernelModules’ are "nice to have but
+            # not required" (e.g. acpi-cpufreq), so we don't want to
+            # barf on those.
+            SuccessExitStatus = "0 1";
           };
         restartTriggers = [ kernelModulesConf ];
       };
-- 
GitLab


From 6c62de6a31a17951d06981a2f6e21d8324c07786 Mon Sep 17 00:00:00 2001
From: Mathijs Kwik <mathijs@bluescreen303.nl>
Date: Fri, 12 Oct 2012 13:09:19 +0200
Subject: [PATCH 4106/5331] firewall: option to enable the rpfilter netfilter
 module

This is meant to replace /proc/sys/net/ipv4/conf/*/rp_filter, which
only works for ipv4. Furthermore, it's nicer to handle this kind of
filtering in the firewall.

There are some more subtle differences, please see:
https://home.regit.org/netfilter-en/secure-use-of-helpers/

I chose to enable this by default (when the firewall is enabled) as
it's a good idea in general. Only people with advanced routing needs
might not want this, but I guess they don't use the nixos firewall
anyway and use a custom solution. Furthermore, the option only becomes
available in kernel 3.3+, so conservative nixos users that just stick
to the default kernel will not need to act now just yet.
---
 modules/services/networking/firewall.nix | 30 ++++++++++++++++++++++++
 1 file changed, 30 insertions(+)

diff --git a/modules/services/networking/firewall.nix b/modules/services/networking/firewall.nix
index e6ae725f85f..7ea4e593cd1 100644
--- a/modules/services/networking/firewall.nix
+++ b/modules/services/networking/firewall.nix
@@ -39,6 +39,11 @@ let
       }
     '';
 
+  kernelPackages = config.boot.kernelPackages;
+  kernelHasRPFilter = kernelPackages.kernel ? features
+                   && kernelPackages.kernel.features ? netfilterRPFilter
+                   && kernelPackages.kernel.features.netfilterRPFilter;
+
 in
 
 {
@@ -140,6 +145,22 @@ in
         '';
     };
 
+    networking.firewall.checkReversePath = mkOption {
+      default = kernelHasRPFilter;
+      type = types.bool;
+      description =
+        ''
+          Performs a reverse path filter test on a packet.
+          If a reply to the packet would not be sent via the same interface
+          that the packet arrived on, it is refused.
+
+          If using asymmetric routing or other complicated routing,
+          disable this setting and setup your own counter-measures.
+
+          (needs kernel 3.3+)
+        '';
+    };
+
     networking.firewall.extraCommands = mkOption {
       default = "";
       example = "iptables -A INPUT -p icmp -j ACCEPT";
@@ -170,6 +191,9 @@ in
 
     boot.kernelModules = [ "nf_conntrack_ftp" ];
 
+    assertions = [ { assertion = ! cfg.checkReversePath || kernelHasRPFilter;
+                     message = "This kernel does not support rpfilter"; } ];
+
     jobs.firewall =
       { startOn = "started network-interfaces";
 
@@ -233,6 +257,12 @@ in
             # The "nixos-fw" chain does the actual work.
             ip46tables -N nixos-fw
 
+            # Perform a reverse-path test to refuse spoofers
+            # For now, we just drop, as the raw table doesn't have a log-refuse yet
+            ${optionalString (kernelHasRPFilter && cfg.checkReversePath) ''
+              ip46tables -A PREROUTING -t raw -m rpfilter --invert -j DROP
+            ''}
+
             # Accept all traffic on the trusted interfaces.
             ${flip concatMapStrings cfg.trustedInterfaces (iface: ''
               ip46tables -A nixos-fw -i ${iface} -j nixos-fw-accept
-- 
GitLab


From 97a3a99b40a2f3183f6c87af4c27664cbd030065 Mon Sep 17 00:00:00 2001
From: Mathijs Kwik <mathijs@bluescreen303.nl>
Date: Fri, 12 Oct 2012 13:16:33 +0200
Subject: [PATCH 4107/5331] firewall: options to select connection-tracking
 helpers

My main reason for adding this is the ability to turn off helpers
altogether. If you are not using any of the special protocols, keeping
them turned off is safest, and in case you do want to use them, it's
best to configure them through the new CT target for your network
topology. Perhaps some sane defaults for nixos can be examined in the
future.

This change has no impact if you don't touch the added options, so no
need to adapt.
---
 modules/services/networking/firewall.nix | 45 ++++++++++++++++++++++--
 1 file changed, 43 insertions(+), 2 deletions(-)

diff --git a/modules/services/networking/firewall.nix b/modules/services/networking/firewall.nix
index 7ea4e593cd1..8ddeacf1a0f 100644
--- a/modules/services/networking/firewall.nix
+++ b/modules/services/networking/firewall.nix
@@ -44,6 +44,10 @@ let
                    && kernelPackages.kernel.features ? netfilterRPFilter
                    && kernelPackages.kernel.features.netfilterRPFilter;
 
+  kernelCanDisableHelpers = kernelPackages.kernel ? features
+                   && kernelPackages.kernel.features ? canDisableNetfilterConntrackHelpers
+                   && kernelPackages.kernel.features.canDisableNetfilterConntrackHelpers;
+
 in
 
 {
@@ -161,6 +165,37 @@ in
         '';
     };
 
+    networking.firewall.connectionTrackingModules = mkOption {
+      default = [ "ftp" ];
+      example = [ "ftp" "irc" "sane" "sip" "tftp" "amanda" "h323" "netbios_sn" "pptp" "snmp" ];
+      type = types.list types.string;
+      description =
+        ''
+          List of connection-tracking helpers that are auto-loaded.
+          The complete list of possible values is given in the example.
+
+          As helpers can pose as a security risk, it is adviced to
+          set this to an empty list and disable the setting
+          networking.firewall.autoLoadConntrackHelpers
+
+          Loading of helpers is recommended to be done through the new
+          CT target. More info:
+          https://home.regit.org/netfilter-en/secure-use-of-helpers/
+        '';
+    };
+
+    networking.firewall.autoLoadConntrackHelpers = mkOption {
+      default = true;
+      type = types.bool;
+      description =
+        ''
+          Whether to auto-load connection-tracking helpers.
+          See the description at networking.firewall.connectionTrackingModules
+
+          (needs kernel 3.5+)
+        '';
+    };
+
     networking.firewall.extraCommands = mkOption {
       default = "";
       example = "iptables -A INPUT -p icmp -j ACCEPT";
@@ -189,10 +224,16 @@ in
 
     environment.systemPackages = [ pkgs.iptables ];
 
-    boot.kernelModules = [ "nf_conntrack_ftp" ];
+    boot.kernelModules = map (x: "nf_conntrack_${x}") cfg.connectionTrackingModules;
+    boot.extraModprobeConfig = optionalString (!cfg.autoLoadConntrackHelpers) ''
+      options nf_conntrack nf_conntrack_helper=0
+    '';
 
     assertions = [ { assertion = ! cfg.checkReversePath || kernelHasRPFilter;
-                     message = "This kernel does not support rpfilter"; } ];
+                     message = "This kernel does not support rpfilter"; }
+                   { assertion = cfg.autoLoadConntrackHelpers || kernelCanDisableHelpers;
+                     message = "This kernel does not support disabling conntrack helpers"; }
+                 ];
 
     jobs.firewall =
       { startOn = "started network-interfaces";
-- 
GitLab


From 10ac80115b9c2c760dcd3f1c1beb1390b5cd2e21 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sun, 14 Oct 2012 21:12:11 -0400
Subject: [PATCH 4108/5331] switch-to-configuration: Fix bad Perl

---
 modules/system/activation/switch-to-configuration.pl | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/system/activation/switch-to-configuration.pl b/modules/system/activation/switch-to-configuration.pl
index 2b26801f35f..41487de9745 100644
--- a/modules/system/activation/switch-to-configuration.pl
+++ b/modules/system/activation/switch-to-configuration.pl
@@ -196,7 +196,7 @@ sub unique {
 # unit checking code above.
 my ($prevFss, $prevSwaps) = parseFstab "/etc/fstab";
 my ($newFss, $newSwaps) = parseFstab "@out@/etc/fstab";
-foreach my $mountPoint (keys ${prevFss}) {
+foreach my $mountPoint (keys %$prevFss) {
     my $prev = $prevFss->{$mountPoint};
     my $new = $newFss->{$mountPoint};
     my $unit = pathToUnitName($mountPoint) . ".mount";
@@ -214,7 +214,7 @@ foreach my $mountPoint (keys ${prevFss}) {
 }
 
 # Also handles swap devices.
-foreach my $device (keys ${prevSwaps}) {
+foreach my $device (keys %$prevSwaps) {
     my $prev = $prevSwaps->{$device};
     my $new = $newSwaps->{$device};
     if (!defined $new) {
-- 
GitLab


From f4329320ab39f43f6ec4a9eeec3d06eda881df6b Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sun, 14 Oct 2012 22:07:15 -0400
Subject: [PATCH 4109/5331] Forward compatibility with the systemd branch

---
 lib/eval-config.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lib/eval-config.nix b/lib/eval-config.nix
index ffc0db1c7ea..f99f3fbedbb 100644
--- a/lib/eval-config.nix
+++ b/lib/eval-config.nix
@@ -31,6 +31,7 @@ rec {
     inherit pkgs modules baseModules;
     modulesPath = ../modules;
     pkgs_i686 = import <nixpkgs> { system = "i686-linux"; };
+    utils = {}; # forward compatibility
   };
 
   # Import Nixpkgs, allowing the NixOS option nixpkgs.config to
-- 
GitLab


From 8499d7555fff04594f58267858258d714fe5c6e5 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 16 Oct 2012 11:28:30 -0400
Subject: [PATCH 4110/5331] =?UTF-8?q?Backward=20compatibility=20hack=20for?=
 =?UTF-8?q?=20=E2=80=98networking.nat.internalIPs=E2=80=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 modules/services/networking/nat.nix | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/modules/services/networking/nat.nix b/modules/services/networking/nat.nix
index ff6ff02f7e9..9d62a764f06 100644
--- a/modules/services/networking/nat.nix
+++ b/modules/services/networking/nat.nix
@@ -34,6 +34,9 @@ in
           coming from these networks and destined for the external
           interface will be rewritten.
         '';
+      # Backward compatibility: this used to be a single range instead
+      # of a list.
+      apply = x: if isList x then x else [x];
     };
 
     networking.nat.externalInterface = mkOption {
@@ -78,8 +81,8 @@ in
           ''
             iptables -t nat -F POSTROUTING
             iptables -t nat -X
-          '' 
-          + (concatMapStrings (network: 
+          ''
+          + (concatMapStrings (network:
             ''
             iptables -t nat -A POSTROUTING \
               -s ${network} -o ${cfg.externalInterface} \
-- 
GitLab


From 4ca0617f4a4664eff5936179eaa18a37a0453816 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 16 Oct 2012 18:23:28 +0200
Subject: [PATCH 4111/5331] modules/programs/bash: improve bash completion
 support

The new configuration.nix option 'environment.enableBashCompletion'
determines whether bash completion is automatically enabled system-wide
for all interactive shells or not. The default setting is 'off'.
---
 modules/programs/bash/bash.nix  | 31 ++++++++++++++++++++++++++++++-
 modules/programs/bash/bashrc.sh | 10 +---------
 2 files changed, 31 insertions(+), 10 deletions(-)

diff --git a/modules/programs/bash/bash.nix b/modules/programs/bash/bash.nix
index 51654b164a0..9eefb8e686f 100644
--- a/modules/programs/bash/bash.nix
+++ b/modules/programs/bash/bash.nix
@@ -7,6 +7,25 @@ with pkgs.lib;
 
 let
 
+  initBashCompletion = optionalString config.environment.enableBashCompletion ''
+    # Check whether we're running a version of Bash that has support for
+    # programmable completion. If we do, enable all modules installed in
+    # the system (and user profile).
+    if shopt -q progcomp &>/dev/null; then
+      . "${pkgs.bashCompletion}/etc/profile.d/bash_completion.sh"
+      nullglobStatus=$(shopt -p nullglob)
+      shopt -s nullglob
+      for p in $NIX_PROFILES /run/current-system/sw; do
+        for m in "$p/etc/bash_completion.d/"*; do
+          echo enable bash completion module $m
+          . $m
+        done
+      done
+      eval "$nullglobStatus"
+    fi
+  '';
+
+
   options = {
 
     environment.shellInit = mkOption {
@@ -18,6 +37,12 @@ let
         type = with pkgs.lib.types; string;
       };
 
+    environment.enableBashCompletion = mkOption {
+        default = false;
+        description = "Enable bash-completion for all interactive shells.";
+        type = with pkgs.lib.types; bool;
+      };
+
   };
 
 in
@@ -38,7 +63,10 @@ in
       { # /etc/bashrc: executed every time a bash starts. Sources
         # /etc/profile to ensure that the system environment is
         # configured properly.
-         source = ./bashrc.sh;
+         source = pkgs.substituteAll {
+           src = ./bashrc.sh;
+           inherit initBashCompletion;
+         };
          target = "bashrc";
       }
 
@@ -59,4 +87,5 @@ in
       mv /bin/.sh.tmp /bin/sh # atomically replace /bin/sh
     '';
 
+  environment.pathsToLink = optional config.environment.enableBashCompletion "/etc/bash_completion.d";
 }
diff --git a/modules/programs/bash/bashrc.sh b/modules/programs/bash/bashrc.sh
index 5e68eb9e6b6..10a36ede2a3 100644
--- a/modules/programs/bash/bashrc.sh
+++ b/modules/programs/bash/bashrc.sh
@@ -27,15 +27,7 @@ if test "$TERM" = "xterm"; then
     PS1="\[\033]2;\h:\u:\w\007\]$PS1"
 fi
 
-# Check whether we're running a version of Bash that has support for
-# programmable completion. If we do, and if the current user has
-# installed the package 'bash-completion' in her $HOME/.nix-profile,
-# then completion is enabled automatically.
-if [ -f "$HOME/.nix-profile/etc/profile.d/bash_completion.sh" ]; then
-    if shopt -q progcomp &>/dev/null; then
-        . "$HOME/.nix-profile/etc/profile.d/bash_completion.sh"
-    fi
-fi
+@initBashCompletion@
 
 # Some aliases.
 alias ls="ls --color=tty"
-- 
GitLab


From c7fb0defe678c1a160d9d0f8a2d25800b95ae7b5 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 16 Oct 2012 18:41:20 +0200
Subject: [PATCH 4112/5331] modules/programs/bash: clean-up variables used in
 initialization of bash-completion

---
 modules/programs/bash/bash.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/programs/bash/bash.nix b/modules/programs/bash/bash.nix
index 9eefb8e686f..ca825d7ab94 100644
--- a/modules/programs/bash/bash.nix
+++ b/modules/programs/bash/bash.nix
@@ -17,11 +17,11 @@ let
       shopt -s nullglob
       for p in $NIX_PROFILES /run/current-system/sw; do
         for m in "$p/etc/bash_completion.d/"*; do
-          echo enable bash completion module $m
           . $m
         done
       done
       eval "$nullglobStatus"
+      unset nullglobStatus p m
     fi
   '';
 
-- 
GitLab


From efc104c4c8dd8eb0f2eb2de13d36a2d0c47012df Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 16 Oct 2012 18:23:28 +0200
Subject: [PATCH 4113/5331] modules/programs/bash: improve bash completion
 support

The new configuration.nix option 'environment.enableBashCompletion'
determines whether bash completion is automatically enabled system-wide
for all interactive shells or not. The default setting is 'off'.
---
 modules/programs/bash/bash.nix  | 31 ++++++++++++++++++++++++++++++-
 modules/programs/bash/bashrc.sh | 10 +---------
 2 files changed, 31 insertions(+), 10 deletions(-)

diff --git a/modules/programs/bash/bash.nix b/modules/programs/bash/bash.nix
index 51654b164a0..9eefb8e686f 100644
--- a/modules/programs/bash/bash.nix
+++ b/modules/programs/bash/bash.nix
@@ -7,6 +7,25 @@ with pkgs.lib;
 
 let
 
+  initBashCompletion = optionalString config.environment.enableBashCompletion ''
+    # Check whether we're running a version of Bash that has support for
+    # programmable completion. If we do, enable all modules installed in
+    # the system (and user profile).
+    if shopt -q progcomp &>/dev/null; then
+      . "${pkgs.bashCompletion}/etc/profile.d/bash_completion.sh"
+      nullglobStatus=$(shopt -p nullglob)
+      shopt -s nullglob
+      for p in $NIX_PROFILES /run/current-system/sw; do
+        for m in "$p/etc/bash_completion.d/"*; do
+          echo enable bash completion module $m
+          . $m
+        done
+      done
+      eval "$nullglobStatus"
+    fi
+  '';
+
+
   options = {
 
     environment.shellInit = mkOption {
@@ -18,6 +37,12 @@ let
         type = with pkgs.lib.types; string;
       };
 
+    environment.enableBashCompletion = mkOption {
+        default = false;
+        description = "Enable bash-completion for all interactive shells.";
+        type = with pkgs.lib.types; bool;
+      };
+
   };
 
 in
@@ -38,7 +63,10 @@ in
       { # /etc/bashrc: executed every time a bash starts. Sources
         # /etc/profile to ensure that the system environment is
         # configured properly.
-         source = ./bashrc.sh;
+         source = pkgs.substituteAll {
+           src = ./bashrc.sh;
+           inherit initBashCompletion;
+         };
          target = "bashrc";
       }
 
@@ -59,4 +87,5 @@ in
       mv /bin/.sh.tmp /bin/sh # atomically replace /bin/sh
     '';
 
+  environment.pathsToLink = optional config.environment.enableBashCompletion "/etc/bash_completion.d";
 }
diff --git a/modules/programs/bash/bashrc.sh b/modules/programs/bash/bashrc.sh
index 74550656151..4382e7ee9d8 100644
--- a/modules/programs/bash/bashrc.sh
+++ b/modules/programs/bash/bashrc.sh
@@ -27,15 +27,7 @@ if test "$TERM" = "xterm"; then
     PS1="\[\033]2;\h:\u:\w\007\]$PS1"
 fi
 
-# Check whether we're running a version of Bash that has support for
-# programmable completion. If we do, and if the current user has
-# installed the package 'bash-completion' in her $HOME/.nix-profile,
-# then completion is enabled automatically.
-if [ -f "$HOME/.nix-profile/etc/profile.d/bash_completion.sh" ]; then
-    if shopt -q progcomp &>/dev/null; then
-        . "$HOME/.nix-profile/etc/profile.d/bash_completion.sh"
-    fi
-fi
+@initBashCompletion@
 
 # Some aliases.
 alias ls="ls --color=tty"
-- 
GitLab


From 04a8642b4bf4bb998a6218275e19dd8970c03914 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 16 Oct 2012 18:41:20 +0200
Subject: [PATCH 4114/5331] modules/programs/bash: clean-up variables used in
 initialization of bash-completion

---
 modules/programs/bash/bash.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/programs/bash/bash.nix b/modules/programs/bash/bash.nix
index 9eefb8e686f..ca825d7ab94 100644
--- a/modules/programs/bash/bash.nix
+++ b/modules/programs/bash/bash.nix
@@ -17,11 +17,11 @@ let
       shopt -s nullglob
       for p in $NIX_PROFILES /run/current-system/sw; do
         for m in "$p/etc/bash_completion.d/"*; do
-          echo enable bash completion module $m
           . $m
         done
       done
       eval "$nullglobStatus"
+      unset nullglobStatus p m
     fi
   '';
 
-- 
GitLab


From 6a9b85541200fb9691693f4a8c2a017b8b449cd5 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 16 Oct 2012 19:07:19 +0200
Subject: [PATCH 4115/5331] modules/programs/bash: '/run/current-system/sw' is
 already a part of $NIX_PROFILES

---
 modules/programs/bash/bash.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/programs/bash/bash.nix b/modules/programs/bash/bash.nix
index ca825d7ab94..441d30f1e9f 100644
--- a/modules/programs/bash/bash.nix
+++ b/modules/programs/bash/bash.nix
@@ -15,7 +15,7 @@ let
       . "${pkgs.bashCompletion}/etc/profile.d/bash_completion.sh"
       nullglobStatus=$(shopt -p nullglob)
       shopt -s nullglob
-      for p in $NIX_PROFILES /run/current-system/sw; do
+      for p in $NIX_PROFILES; do
         for m in "$p/etc/bash_completion.d/"*; do
           . $m
         done
-- 
GitLab


From 56f90da276b93b6af16c6ac94f0e452a2da94927 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 16 Oct 2012 19:07:19 +0200
Subject: [PATCH 4116/5331] modules/programs/bash: '/run/current-system/sw' is
 already a part of $NIX_PROFILES

---
 modules/programs/bash/bash.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/programs/bash/bash.nix b/modules/programs/bash/bash.nix
index ca825d7ab94..441d30f1e9f 100644
--- a/modules/programs/bash/bash.nix
+++ b/modules/programs/bash/bash.nix
@@ -15,7 +15,7 @@ let
       . "${pkgs.bashCompletion}/etc/profile.d/bash_completion.sh"
       nullglobStatus=$(shopt -p nullglob)
       shopt -s nullglob
-      for p in $NIX_PROFILES /run/current-system/sw; do
+      for p in $NIX_PROFILES; do
         for m in "$p/etc/bash_completion.d/"*; do
           . $m
         done
-- 
GitLab


From 18076e001a54c86c42a3a74a2ef45e1f1dbb4c91 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Wed, 17 Oct 2012 15:11:53 +0200
Subject: [PATCH 4117/5331] apache-httpd: Use authn_core for version >= 2.3.

Beginning with version 2.3, the authn were refactored. As a result, authn_alias
is now part of the new module authn_core, so let's use authn_core instead of
authn_alias.

For details please see: http://httpd.apache.org/docs/2.4/upgrading.html#misc

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 modules/services/web-servers/apache-httpd/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/modules/services/web-servers/apache-httpd/default.nix b/modules/services/web-servers/apache-httpd/default.nix
index 9ceb66a85a0..4a5362436b0 100644
--- a/modules/services/web-servers/apache-httpd/default.nix
+++ b/modules/services/web-servers/apache-httpd/default.nix
@@ -101,7 +101,8 @@ let
       "auth_basic" "auth_digest"
 
       # Authentication: is the user who he claims to be?
-      "authn_file" "authn_dbm" "authn_anon" "authn_alias"
+      "authn_file" "authn_dbm" "authn_anon"
+      (if versionOlder httpd.version "2.3" then "authn_alias" else "authn_core")
 
       # Authorization: is the user allowed access?
       "authz_user" "authz_groupfile" "authz_host"
-- 
GitLab


From 3ad8fac5a25b549bd28d5bc5c4f461a52f109c6a Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Wed, 17 Oct 2012 15:17:48 +0200
Subject: [PATCH 4118/5331] apache-httpd: Dynamically load MPM module in v2.4.

Now, MPMs can be loaded at runtime and it's no longer required to compile in one
of the MPM modules statically. So, if version is >= 2.4, load the MPM module
corresponding to the multiProcessingModule value of the service module.

For details, please see: http://httpd.apache.org/docs/2.4/mpm.html

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 modules/services/web-servers/apache-httpd/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/modules/services/web-servers/apache-httpd/default.nix b/modules/services/web-servers/apache-httpd/default.nix
index 4a5362436b0..b70ed3933aa 100644
--- a/modules/services/web-servers/apache-httpd/default.nix
+++ b/modules/services/web-servers/apache-httpd/default.nix
@@ -114,6 +114,7 @@ let
       "vhost_alias" "negotiation" "dir" "imagemap" "actions" "speling"
       "userdir" "alias" "rewrite" "proxy" "proxy_http"
     ]
+    ++ optional (!versionOlder httpd.version "2.4") "mpm_${mainCfg.multiProcessingModule}"
     ++ (if mainCfg.multiProcessingModule == "prefork" then [ "cgi" ] else [ "cgid" ])
     ++ optional enableSSL "ssl"
     ++ extraApacheModules;
-- 
GitLab


From 3acd98b040517cae680c8ca4273c0613f8af82ce Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Wed, 17 Oct 2012 15:21:32 +0200
Subject: [PATCH 4119/5331] apache-httpd: Add unixd for 2.4, needed by "User".

Beginning with 2.4 mod_unixd is needed to supply Unix usernames and groups for
the web server. For details please have a look at:

http://httpd.apache.org/docs/2.4/upgrading.html#commonproblems

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 modules/services/web-servers/apache-httpd/default.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/modules/services/web-servers/apache-httpd/default.nix b/modules/services/web-servers/apache-httpd/default.nix
index b70ed3933aa..05fada720ba 100644
--- a/modules/services/web-servers/apache-httpd/default.nix
+++ b/modules/services/web-servers/apache-httpd/default.nix
@@ -114,7 +114,10 @@ let
       "vhost_alias" "negotiation" "dir" "imagemap" "actions" "speling"
       "userdir" "alias" "rewrite" "proxy" "proxy_http"
     ]
-    ++ optional (!versionOlder httpd.version "2.4") "mpm_${mainCfg.multiProcessingModule}"
+    ++ optionals (!versionOlder httpd.version "2.4") [
+      "mpm_${mainCfg.multiProcessingModule}"
+      "unixd"
+    ]
     ++ (if mainCfg.multiProcessingModule == "prefork" then [ "cgi" ] else [ "cgid" ])
     ++ optional enableSSL "ssl"
     ++ extraApacheModules;
-- 
GitLab


From a88453fbaa8104502975d40c1b53738f71168b70 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Wed, 17 Oct 2012 16:57:18 +0200
Subject: [PATCH 4120/5331] apache-httpd: Properly wrap access directives.

The Order/Deny directives are deprecated in version 2.4, so we're going to
define two wrappers for allDenied and allGranted in order to properly generate
configurations for both version 2.2 and 2.4.

For more information an access control changes, see:

http://httpd.apache.org/docs/2.4/upgrading.html#access

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 .../web-servers/apache-httpd/default.nix      | 37 ++++++++++++-------
 1 file changed, 23 insertions(+), 14 deletions(-)

diff --git a/modules/services/web-servers/apache-httpd/default.nix b/modules/services/web-servers/apache-httpd/default.nix
index 05fada720ba..29a20cae162 100644
--- a/modules/services/web-servers/apache-httpd/default.nix
+++ b/modules/services/web-servers/apache-httpd/default.nix
@@ -116,6 +116,7 @@ let
     ]
     ++ optionals (!versionOlder httpd.version "2.4") [
       "mpm_${mainCfg.multiProcessingModule}"
+      "authz_core"
       "unixd"
     ]
     ++ (if mainCfg.multiProcessingModule == "prefork" then [ "cgi" ] else [ "cgid" ])
@@ -123,6 +124,21 @@ let
     ++ extraApacheModules;
 
 
+  allDenied = if versionOlder httpd.version "2.4" then ''
+    Order deny,allow
+    Deny from all
+  '' else ''
+    Require all denied
+  '';
+
+  allGranted = if versionOlder httpd.version "2.4" then ''
+    Order allow,deny
+    Allow from all
+  '' else ''
+    Require all granted
+  '';
+
+
   loggingConf = ''
     ErrorLog ${mainCfg.logDir}/error_log
 
@@ -191,8 +207,7 @@ let
       <Directory "${documentRoot}">
           Options Indexes FollowSymLinks
           AllowOverride None
-          Order allow,deny
-          Allow from all
+          ${allGranted}
       </Directory>
     '';
 
@@ -246,12 +261,10 @@ let
           AllowOverride FileInfo AuthConfig Limit Indexes
           Options MultiViews Indexes SymLinksIfOwnerMatch IncludesNoExec
           <Limit GET POST OPTIONS>
-              Order allow,deny
-              Allow from all
+              ${allGranted}
           </Limit>
           <LimitExcept GET POST OPTIONS>
-              Order deny,allow
-              Deny from all
+              ${allDenied}
           </LimitExcept>
       </Directory>
 
@@ -273,8 +286,7 @@ let
             Alias ${elem.urlPath} ${elem.dir}/
             <Directory ${elem.dir}>
                 Options +Indexes
-                Order allow,deny
-                Allow from all
+                ${allGranted}
                 AllowOverride All
             </Directory>
           '';
@@ -326,8 +338,7 @@ let
     AddHandler type-map var
 
     <Files ~ "^\.ht">
-        Order allow,deny
-        Deny from all
+        ${allDenied}
     </Files>
 
     ${mimeConf}
@@ -345,16 +356,14 @@ let
     <Directory />
         Options FollowSymLinks
         AllowOverride None
-        Order deny,allow
-        Deny from all
+        ${allDenied}
     </Directory>
 
     # But do allow access to files in the store so that we don't have
     # to generate <Directory> clauses for every generated file that we
     # want to serve.
     <Directory /nix/store>
-        Order allow,deny
-        Allow from all
+        ${allGranted}
     </Directory>
 
     # Generate directives for the main server.
-- 
GitLab


From 5655ec0efa3839217dae12742d585c11d25dd693 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Wed, 17 Oct 2012 17:03:50 +0200
Subject: [PATCH 4121/5331] apache-httpd: Avoid NameVirtualHost in >= v2.4.

NameVirtualHost no longer has any effect on version 2.4 and just emits ugly
warnings, so let's not use it if we use 2.4.

More information: http://httpd.apache.org/docs/2.4/upgrading.html#misc

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 modules/services/web-servers/apache-httpd/default.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/modules/services/web-servers/apache-httpd/default.nix b/modules/services/web-servers/apache-httpd/default.nix
index 29a20cae162..9a3a3a10541 100644
--- a/modules/services/web-servers/apache-httpd/default.nix
+++ b/modules/services/web-servers/apache-httpd/default.nix
@@ -373,7 +373,9 @@ let
     ${let
         ports = map getPort allHosts;
         uniquePorts = uniqList {inputList = ports;};
-      in concatMapStrings (port: "NameVirtualHost *:${toString port}\n") uniquePorts
+        isNeeded = versionOlder httpd.version "2.4";
+        directives = concatMapStrings (port: "NameVirtualHost *:${toString port}\n") uniquePorts;
+      in optionalString isNeeded directives
     }
 
     ${let
-- 
GitLab


From 919e6e55a9c6c98fe408831905a8b91587af0503 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Wed, 17 Oct 2012 17:38:43 +0200
Subject: [PATCH 4122/5331] apache-httpd: Create runtime dir for version 2.4.

By default the path is determined related to ServerRoot. Unfortunately
ServerRoot is pointing to the Nix store and the web server can't write to it.

We now create a directory called "runtime" withen the stateDir and point
DefaultRuntimeDir to it.

For more information on the DefaultRuntimeDir directive, please see:

http://httpd.apache.org/docs/2.4/mod/core.html#defaultruntimedir

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 modules/services/web-servers/apache-httpd/default.nix | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/modules/services/web-servers/apache-httpd/default.nix b/modules/services/web-servers/apache-httpd/default.nix
index 9a3a3a10541..89fd491fd22 100644
--- a/modules/services/web-servers/apache-httpd/default.nix
+++ b/modules/services/web-servers/apache-httpd/default.nix
@@ -303,6 +303,10 @@ let
 
     ServerRoot ${httpd}
 
+    ${optionalString (!versionOlder httpd.version "2.4") ''
+      DefaultRuntimeDir ${mainCfg.stateDir}/runtime
+    ''}
+
     PidFile ${mainCfg.stateDir}/httpd.pid
 
     ${optionalString (mainCfg.multiProcessingModule != "prefork") ''
@@ -636,6 +640,10 @@ in
           ''
             mkdir -m 0750 -p ${mainCfg.stateDir}
             chown root.${mainCfg.group} ${mainCfg.stateDir}
+            ${optionalString (!versionOlder httpd.version "2.4") ''
+              mkdir -m 0750 -p "${mainCfg.stateDir}/runtime"
+              chown root.${mainCfg.group} "${mainCfg.stateDir}/runtime"
+            ''}
             mkdir -m 0700 -p ${mainCfg.logDir}
 
             ${optionalString (mainCfg.documentRoot != null)
-- 
GitLab


From f9831a94c984b1bfdff598299a1b66341a1f9cd2 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Wed, 17 Oct 2012 17:47:30 +0200
Subject: [PATCH 4123/5331] apache-httpd: Simplify all versionOlder calls.

We now just have a simple attribute called "version24" which replaces all those
pesky versionOlder that were spreading throughout the file and makes things way
more readable.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 .../web-servers/apache-httpd/default.nix      | 25 ++++++++++---------
 1 file changed, 13 insertions(+), 12 deletions(-)

diff --git a/modules/services/web-servers/apache-httpd/default.nix b/modules/services/web-servers/apache-httpd/default.nix
index 89fd491fd22..1729850421a 100644
--- a/modules/services/web-servers/apache-httpd/default.nix
+++ b/modules/services/web-servers/apache-httpd/default.nix
@@ -8,6 +8,8 @@ let
 
   httpd = mainCfg.package;
 
+  version24 = !versionOlder httpd.version "2.4";
+
   httpdConf = mainCfg.configFile;
 
   php = pkgs.php.override { apacheHttpd = httpd; };
@@ -102,7 +104,7 @@ let
 
       # Authentication: is the user who he claims to be?
       "authn_file" "authn_dbm" "authn_anon"
-      (if versionOlder httpd.version "2.3" then "authn_alias" else "authn_core")
+      (if version24 then "authn_core" else "authn_alias")
 
       # Authorization: is the user allowed access?
       "authz_user" "authz_groupfile" "authz_host"
@@ -114,7 +116,7 @@ let
       "vhost_alias" "negotiation" "dir" "imagemap" "actions" "speling"
       "userdir" "alias" "rewrite" "proxy" "proxy_http"
     ]
-    ++ optionals (!versionOlder httpd.version "2.4") [
+    ++ optionals version24 [
       "mpm_${mainCfg.multiProcessingModule}"
       "authz_core"
       "unixd"
@@ -124,18 +126,18 @@ let
     ++ extraApacheModules;
 
 
-  allDenied = if versionOlder httpd.version "2.4" then ''
+  allDenied = if version24 then ''
+    Require all denied
+  '' else ''
     Order deny,allow
     Deny from all
-  '' else ''
-    Require all denied
   '';
 
-  allGranted = if versionOlder httpd.version "2.4" then ''
+  allGranted = if version24 then ''
+    Require all granted
+  '' else ''
     Order allow,deny
     Allow from all
-  '' else ''
-    Require all granted
   '';
 
 
@@ -303,7 +305,7 @@ let
 
     ServerRoot ${httpd}
 
-    ${optionalString (!versionOlder httpd.version "2.4") ''
+    ${optionalString version24 ''
       DefaultRuntimeDir ${mainCfg.stateDir}/runtime
     ''}
 
@@ -377,9 +379,8 @@ let
     ${let
         ports = map getPort allHosts;
         uniquePorts = uniqList {inputList = ports;};
-        isNeeded = versionOlder httpd.version "2.4";
         directives = concatMapStrings (port: "NameVirtualHost *:${toString port}\n") uniquePorts;
-      in optionalString isNeeded directives
+      in optionalString (!version24) directives
     }
 
     ${let
@@ -640,7 +641,7 @@ in
           ''
             mkdir -m 0750 -p ${mainCfg.stateDir}
             chown root.${mainCfg.group} ${mainCfg.stateDir}
-            ${optionalString (!versionOlder httpd.version "2.4") ''
+            ${optionalString version24 ''
               mkdir -m 0750 -p "${mainCfg.stateDir}/runtime"
               chown root.${mainCfg.group} "${mainCfg.stateDir}/runtime"
             ''}
-- 
GitLab


From a4cad32c3d13908303f480677b189844a70705bf Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 15 Oct 2012 16:01:30 -0400
Subject: [PATCH 4124/5331] Generate more user-friendly script filenames

This is primarily important in journal entries.
---
 modules/system/boot/systemd.nix    | 12 +++++++-----
 modules/system/upstart/upstart.nix | 10 +++++-----
 2 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/modules/system/boot/systemd.nix b/modules/system/boot/systemd.nix
index 2545eaf7393..66cc048d9c0 100644
--- a/modules/system/boot/systemd.nix
+++ b/modules/system/boot/systemd.nix
@@ -158,7 +158,9 @@ let
       KillSignal=SIGHUP
     '';
 
-  makeJobScript = name: content: "${pkgs.writeScriptBin name content}/bin/${name}";
+  makeJobScript = name: text:
+    let x = pkgs.writeTextFile { name = "unit-script"; executable = true; destination = "/bin/${name}"; inherit text; };
+    in "${x}/bin/${name}";
 
   unitConfig = { name, config, ... }: {
     config = {
@@ -224,28 +226,28 @@ let
           ${optionalString (!def.restartIfChanged) "X-RestartIfChanged=false"}
 
           ${optionalString (def.preStart != "") ''
-            ExecStartPre=${makeJobScript "prestart.sh" ''
+            ExecStartPre=${makeJobScript "${name}-pre-start" ''
               #! ${pkgs.stdenv.shell} -e
               ${def.preStart}
             ''}
           ''}
 
           ${optionalString (def.script != "") ''
-            ExecStart=${makeJobScript "start.sh" ''
+            ExecStart=${makeJobScript "${name}-start" ''
               #! ${pkgs.stdenv.shell} -e
               ${def.script}
             ''}
           ''}
 
           ${optionalString (def.postStart != "") ''
-            ExecStartPost=${makeJobScript "poststart.sh" ''
+            ExecStartPost=${makeJobScript "${name}-post-start" ''
               #! ${pkgs.stdenv.shell} -e
               ${def.postStart}
             ''}
           ''}
 
           ${optionalString (def.postStop != "") ''
-            ExecStopPost=${makeJobScript "poststop.sh" ''
+            ExecStopPost=${makeJobScript "${name}-post-stop" ''
               #! ${pkgs.stdenv.shell} -e
               ${def.postStop}
             ''}
diff --git a/modules/system/upstart/upstart.nix b/modules/system/upstart/upstart.nix
index 9d17b352dc8..5761ed4c5a4 100644
--- a/modules/system/upstart/upstart.nix
+++ b/modules/system/upstart/upstart.nix
@@ -21,13 +21,13 @@ let
 
       env = config.system.upstartEnvironment // job.environment;
 
-      preStartScript = makeJobScript "${job.name}-pre-start.sh"
+      preStartScript = makeJobScript "${job.name}-pre-start"
         ''
           #! ${pkgs.stdenv.shell} -e
           ${job.preStart}
         '';
 
-      startScript = makeJobScript "${job.name}-start.sh"
+      startScript = makeJobScript "${job.name}-start"
         ''
           #! ${pkgs.stdenv.shell} -e
           ${if job.script != "" then job.script else ''
@@ -35,19 +35,19 @@ let
           ''}
         '';
 
-      postStartScript = makeJobScript "${job.name}-post-start.sh"
+      postStartScript = makeJobScript "${job.name}-post-start"
         ''
           #! ${pkgs.stdenv.shell} -e
           ${job.postStart}
         '';
 
-      preStopScript = makeJobScript "${job.name}-pre-stop.sh"
+      preStopScript = makeJobScript "${job.name}-pre-stop"
         ''
           #! ${pkgs.stdenv.shell} -e
           ${job.preStop}
         '';
 
-      postStopScript = makeJobScript "${job.name}-post-stop.sh"
+      postStopScript = makeJobScript "${job.name}-post-stop"
         ''
           #! ${pkgs.stdenv.shell} -e
           ${job.postStop}
-- 
GitLab


From b4a1893cddcad7cc406b388a2ef4d5888ffb0971 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 18 Oct 2012 11:54:07 -0400
Subject: [PATCH 4125/5331] systemd-vconsole-setup: Don't put the X server in
 non-raw mode
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

‘systemd-vconsole-setup’ by default operates on /dev/tty0, the
currently active tty.  Since it puts /dev/tty0 in Unicode or ASCII
mode, if the X server is currently active when it runs, keys such as
Alt-F4 won't reach the X server anymore.  So use /dev/tty1 instead.
---
 modules/config/i18n.nix         |  6 +++---
 modules/system/boot/systemd.nix |  2 +-
 modules/tasks/kbd.nix           | 32 +++++++++++++++++++++++++++-----
 3 files changed, 31 insertions(+), 9 deletions(-)

diff --git a/modules/config/i18n.nix b/modules/config/i18n.nix
index dd435d481b7..e964b9bfb1d 100644
--- a/modules/config/i18n.nix
+++ b/modules/config/i18n.nix
@@ -47,11 +47,11 @@ let
           The keyboard mapping table for the virtual consoles.
         ";
       };
-      
+
     };
-    
+
   };
-  
+
 ###### implementation
 
   glibcLocales = pkgs.glibcLocales.override {
diff --git a/modules/system/boot/systemd.nix b/modules/system/boot/systemd.nix
index 66cc048d9c0..dc0c2ba4504 100644
--- a/modules/system/boot/systemd.nix
+++ b/modules/system/boot/systemd.nix
@@ -45,7 +45,7 @@ let
       # Login stuff.
       "systemd-logind.service"
       "autovt@.service"
-      "systemd-vconsole-setup.service"
+      #"systemd-vconsole-setup.service"
       "systemd-user-sessions.service"
       "dbus-org.freedesktop.login1.service"
       "user@.service"
diff --git a/modules/tasks/kbd.nix b/modules/tasks/kbd.nix
index aa708fb6019..7867b3c1912 100644
--- a/modules/tasks/kbd.nix
+++ b/modules/tasks/kbd.nix
@@ -13,6 +13,12 @@ let
   consoleFont = config.i18n.consoleFont;
   consoleKeyMap = config.i18n.consoleKeyMap;
 
+  vconsoleConf = pkgs.writeText "vconsole.conf"
+    ''
+      KEYMAP=${consoleKeyMap}
+      FONT=${consoleFont}
+    '';
+
 in
 
 {
@@ -61,11 +67,27 @@ in
     # systemd-vconsole-setup.service if /etc/vconsole.conf changes.
     environment.etc = singleton
       { target = "vconsole.conf";
-        source = pkgs.writeText "vconsole.conf"
-          ''
-            KEYMAP=${consoleKeyMap}
-            FONT=${consoleFont}
-          '';
+        source = vconsoleConf;
+      };
+
+    # This is identical to the systemd-vconsole-setup.service unit
+    # shipped with systemd, except that it uses /dev/tty1 instead of
+    # /dev/tty0 to prevent putting the X server in non-raw mode, and
+    # it has a restart trigger.
+    boot.systemd.services."systemd-vconsole-setup" =
+      { description = "Setup Virtual Console";
+        before = [ "sysinit.target" "shutdown.target" ];
+        unitConfig =
+          { DefaultDependencies = "no";
+            Conflicts = "shutdown.target";
+            ConditionPathExists = "/dev/tty1";
+          };
+        serviceConfig =
+          { Type = "oneshot";
+            RemainAfterExit = true;
+            ExecStart = "${config.system.build.systemd}/lib/systemd/systemd-vconsole-setup /dev/tty1";
+          };
+        restartTriggers = [ vconsoleConf ];
       };
 
   };
-- 
GitLab


From 06cbe6253788b4be2d5a3f2b3d36820cfc1b2b1b Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 18 Oct 2012 13:26:47 -0400
Subject: [PATCH 4126/5331] switch-to-configuration: Support services activated
 by multiple sockets

---
 .../activation/switch-to-configuration.pl     | 31 +++++++++++++------
 1 file changed, 21 insertions(+), 10 deletions(-)

diff --git a/modules/system/activation/switch-to-configuration.pl b/modules/system/activation/switch-to-configuration.pl
index 41487de9745..b085778f099 100644
--- a/modules/system/activation/switch-to-configuration.pl
+++ b/modules/system/activation/switch-to-configuration.pl
@@ -146,18 +146,29 @@ while (my ($unit, $state) = each %{$activePrev}) {
                 {
                     push @unitsToSkip, $unit;
                 } else {
-                    # If this unit has a corresponding socket unit,
-                    # then stop the socket unit as well, and restart
-                    # the socket instead of the service.
-                    if ($unit =~ /\.service$/ && defined $activePrev->{"$baseName.socket"}) {
-                        push @unitsToStop, "$baseName.socket";
-                        write_file($restartListFile, { append => 1 }, "$baseName.socket\n");
+                    # If this unit is socket-activated, then stop the
+                    # socket unit(s) as well, and restart the
+                    # socket(s) instead of the service.
+                    my $socketActivated = 0;
+                    if ($unit =~ /\.service$/) {
+                        my @sockets = split / /, ($unitInfo->{Sockets} // "");
+                        if (scalar @sockets == 0) {
+                            @sockets = ("$baseName.socket");
+                        }
+                        foreach my $socket (@sockets) {
+                            if (defined $activePrev->{$socket}) {
+                                push @unitsToStop, $socket;
+                                write_file($restartListFile, { append => 1 }, "$socket\n");
+                                $socketActivated = 1;
+                            }
+                        }
                     }
 
-                    # Record that this unit needs to be started below.  We
-                    # write this to a file to ensure that the service gets
-                    # restarted if we're interrupted.
-                    else {
+                    # Otherwise, record that this unit needs to be
+                    # started below.  We write this to a file to
+                    # ensure that the service gets restarted if we're
+                    # interrupted.
+                    if (!$socketActivated) {
                         write_file($restartListFile, { append => 1 }, "$unit\n");
                     }
 
-- 
GitLab


From 3d6824feaa90bebf9fa2b378e52e340584e3bd84 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 19 Oct 2012 10:32:09 -0400
Subject: [PATCH 4127/5331] Machine.pm: Don't add .service implicitly

Systemd will add .service anyway if no unit type is given.
---
 lib/test-driver/Machine.pm | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib/test-driver/Machine.pm b/lib/test-driver/Machine.pm
index c7e0bc102f1..d376bd404b9 100644
--- a/lib/test-driver/Machine.pm
+++ b/lib/test-driver/Machine.pm
@@ -381,7 +381,7 @@ sub waitForUnit {
 
 sub waitForJob {
     my ($self, $jobName) = @_;
-    return $self->waitForUnit($jobName . ".service");
+    return $self->waitForUnit($jobName);
 }
 
 
@@ -398,13 +398,13 @@ sub waitForFile {
 
 sub startJob {
     my ($self, $jobName) = @_;
-    $self->execute("systemctl stop $jobName.service");
+    $self->execute("systemctl stop $jobName");
     # FIXME: check result
 }
 
 sub stopJob {
     my ($self, $jobName) = @_;
-    $self->execute("systemctl stop $jobName.service");
+    $self->execute("systemctl stop $jobName");
 }
 
 
-- 
GitLab


From ac8db6fd339fa50d5ad189e305c8e1647cbc934b Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 19 Oct 2012 15:21:06 -0400
Subject: [PATCH 4128/5331] firewall.nix: Don't fail if IPv6 is disabled

---
 modules/services/networking/firewall.nix | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/modules/services/networking/firewall.nix b/modules/services/networking/firewall.nix
index 7601fd1be43..d0119c56fce 100644
--- a/modules/services/networking/firewall.nix
+++ b/modules/services/networking/firewall.nix
@@ -268,9 +268,11 @@ in
             # Accept all ICMPv6 messages except redirects and node
             # information queries (type 139).  See RFC 4890, section
             # 4.4.
-            ip6tables -A nixos-fw -p icmpv6 --icmpv6-type redirect -j DROP
-            ip6tables -A nixos-fw -p icmpv6 --icmpv6-type 139 -j DROP
-            ip6tables -A nixos-fw -p icmpv6 -j nixos-fw-accept
+            ${optionalString config.networking.enableIPv6 ''
+              ip6tables -A nixos-fw -p icmpv6 --icmpv6-type redirect -j DROP
+              ip6tables -A nixos-fw -p icmpv6 --icmpv6-type 139 -j DROP
+              ip6tables -A nixos-fw -p icmpv6 -j nixos-fw-accept
+            ''}
 
             ${cfg.extraCommands}
 
-- 
GitLab


From c8628e0293a5fcd1e705f658a9a4d7a4861dcc05 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 19 Oct 2012 15:41:01 -0400
Subject: [PATCH 4129/5331] Don't let interfaces get IPv6 addresses if
 networking.enableIPv6 is false

---
 modules/config/networking.nix        | 6 +++++-
 modules/tasks/network-interfaces.nix | 3 +++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/modules/config/networking.nix b/modules/config/networking.nix
index 3ea86d2f9cf..5fc06c341ad 100644
--- a/modules/config/networking.nix
+++ b/modules/config/networking.nix
@@ -3,7 +3,9 @@
 {config, pkgs, ...}:
 
 with pkgs.lib;
+
 let
+
   cfg = config.networking;
 
   options = {
@@ -43,7 +45,9 @@ in
         source = pkgs.writeText "hosts"
           ''
             127.0.0.1 localhost
-            ::1 localhost
+            ${optionalString cfg.enableIPv6 ''
+              ::1 localhost
+            ''}
             ${cfg.extraHosts}
           '';
         target = "hosts";
diff --git a/modules/tasks/network-interfaces.nix b/modules/tasks/network-interfaces.nix
index 5c984b9e59c..d36a1081de5 100644
--- a/modules/tasks/network-interfaces.nix
+++ b/modules/tasks/network-interfaces.nix
@@ -278,6 +278,9 @@ in
                 '')}
                 EOF
 
+                # Disable or enable IPv6.
+                echo ${if cfg.enableIPv6 then "0" else "1"} > /proc/sys/net/ipv6/conf/all/disable_ipv6
+
                 # Set the default gateway.
                 ${optionalString (cfg.defaultGateway != "") ''
                   # FIXME: get rid of "|| true" (necessary to make it idempotent).
-- 
GitLab


From 1cbad692c3156163b01268270a4efa261e479206 Mon Sep 17 00:00:00 2001
From: Jack Cummings <jack@mudshark.org>
Date: Sun, 21 Oct 2012 21:46:05 -0700
Subject: [PATCH 4130/5331] Add an option to add 'option=single-request' to
 /etc/resolv.conf.

---
 modules/config/networking.nix | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/modules/config/networking.nix b/modules/config/networking.nix
index c6ea171bf3d..3905f28b610 100644
--- a/modules/config/networking.nix
+++ b/modules/config/networking.nix
@@ -16,6 +16,18 @@ let
       '';
     };
 
+    networking.dnsSingleRequest = pkgs.lib.mkOption {
+      default = false;
+      description = ''
+        Recent versions of glibc will issue both ipv4 (A) and ipv6 (AAAA)
+        address queries at the same time, from the same port. Sometimes upstream
+        routers will systemically drop the ipv4 queries. The symptom of this problem is
+        that 'getent hosts example.com' only returns ipv6 (or perhaps only ipv4) addresses. The
+        workaround for this is to specify the option 'single-request' in
+        /etc/resolve.conf. This option enables that. 
+      '';
+    };
+
   };
 
 in
@@ -60,6 +72,9 @@ in
             # Invalidate the nscd cache whenever resolv.conf is
             # regenerated.
             libc_restart='${pkgs.upstart}/sbin/start invalidate-nscd'
+          '' + optionalString cfg.dnsSingleRequest ''
+            # only send one DNS request at a time
+            resolv_conf_options='single-request'
           '' + optionalString config.services.bind.enable ''
             # This hosts runs a full-blown DNS resolver.
             name_servers='127.0.0.1'
-- 
GitLab


From 7efde0740e1c86e2c7d68c413ff2adc1087dfe2d Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 23 Oct 2012 13:35:06 +0200
Subject: [PATCH 4131/5331] =?UTF-8?q?Add=20user=20option=20=E2=80=98isAlia?=
 =?UTF-8?q?s=E2=80=99=20to=20allow=20one=20user=20account=20to=20alias=20a?=
 =?UTF-8?q?nother?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 modules/config/users-groups.nix | 58 +++++++++++++++++++--------------
 1 file changed, 33 insertions(+), 25 deletions(-)

diff --git a/modules/config/users-groups.nix b/modules/config/users-groups.nix
index ee65991ed52..92839106762 100644
--- a/modules/config/users-groups.nix
+++ b/modules/config/users-groups.nix
@@ -8,74 +8,74 @@ let
   users = config.users;
 
   userOpts = { name, config, ... }: {
-  
+
     options = {
-    
+
       name = mkOption {
         type = with types; uniq string;
         description = "The name of the user account. If undefined, the name of the attribute set will be used.";
       };
-      
+
       description = mkOption {
         type = with types; uniq string;
         default = "";
         description = "A short description of the user account.";
       };
-      
+
       uid = mkOption {
         type = with types; uniq (nullOr int);
         default = null;
         description = "The account UID. If undefined, NixOS will select a free UID.";
       };
-      
+
       group = mkOption {
         type = with types; uniq string;
         default = "nogroup";
         description = "The user's primary group.";
       };
-      
+
       extraGroups = mkOption {
         type = types.listOf types.string;
         default = [];
         description = "The user's auxiliary groups.";
       };
-      
+
       home = mkOption {
         type = with types; uniq string;
         default = "/var/empty";
         description = "The user's home directory.";
       };
-      
+
       shell = mkOption {
         type = with types; uniq string;
         default = "/run/current-system/sw/sbin/nologin";
         description = "The path to the user's shell.";
       };
-      
+
       createHome = mkOption {
         type = types.bool;
         default = false;
         description = "If true, the home directory will be created automatically.";
       };
-      
+
       useDefaultShell = mkOption {
         type = types.bool;
         default = false;
         description = "If true, the user's shell will be set to <literal>users.defaultUserShell</literal>.";
       };
-      
+
       password = mkOption {
         type = with types; uniq (nullOr string);
         default = null;
         description = "The user's password. If undefined, no password is set for the user.  Warning: do not set confidential information here because this data would be readable by all.  This option should only be used for public account such as guest.";
       };
-      
+
       isSystemUser = mkOption {
         type = types.bool;
         default = true;
         description = "Indicates if the user is a system user or not.";
       };
-      
+
       createUser = mkOption {
         type = types.bool;
         default = true;
@@ -85,7 +85,13 @@ let
           then not modify any of the basic properties for the user account.
         ";
       };
-      
+
+      isAlias = mkOption {
+        type = types.bool;
+        default = false;
+        description = "If true, the UID of this user is not required to be unique and can thus alias another user.";
+      };
+
     };
 
     config = {
@@ -93,41 +99,41 @@ let
       uid = mkDefault (attrByPath [name] null ids.uids);
       shell = mkIf config.useDefaultShell (mkDefault users.defaultUserShell);
     };
-    
+
   };
 
   groupOpts = { name, config, ... }: {
-  
+
     options = {
-    
+
       name = mkOption {
         type = with types; uniq string;
         description = "The name of the group. If undefined, the name of the attribute set will be used.";
       };
-      
+
       gid = mkOption {
         type = with types; uniq (nullOr int);
         default = null;
         description = "The GID of the group. If undefined, NixOS will select a free GID.";
       };
-      
+
     };
 
     config = {
       name = mkDefault name;
       gid = mkDefault (attrByPath [name] null ids.gids);
     };
-    
+
   };
 
   # Note: the 'X' in front of the password is to distinguish between
   # having an empty password, and not having a password.
-  serializedUser = userName: let u = getAttr userName config.users.extraUsers; in "${u.name}\n${u.description}\n${if u.uid != null then toString u.uid else ""}\n${u.group}\n${toString (concatStringsSep "," u.extraGroups)}\n${u.home}\n${u.shell}\n${toString u.createHome}\n${if u.password != null then "X" + u.password else ""}\n${toString u.isSystemUser}\n${if u.createUser then "yes" else "no"}\n";
+  serializedUser = u: "${u.name}\n${u.description}\n${if u.uid != null then toString u.uid else ""}\n${u.group}\n${toString (concatStringsSep "," u.extraGroups)}\n${u.home}\n${u.shell}\n${toString u.createHome}\n${if u.password != null then "X" + u.password else ""}\n${toString u.isSystemUser}\n${toString u.createUser}\n${toString u.isAlias}\n";
 
-  # keep this extra file so that cat can be used to pass special chars such as "`" which is used in the avahi daemon
   usersFile = pkgs.writeText "users" (
-    concatMapStrings serializedUser (attrNames config.users.extraUsers)
-  );
+    let
+      p = partition (u: u.isAlias) (attrValues config.users.extraUsers);
+    in concatStrings (map serializedUser p.wrong ++ map serializedUser p.right));
 
 in
 
@@ -243,8 +249,9 @@ in
             read password
             read isSystemUser
             read createUser
+            read isAlias
 
-            if ! test "$createUser" = "yes"; then
+            if [ -z "$createUser" ]; then
                 continue
             fi
 
@@ -257,6 +264,7 @@ in
                     --home "$home" \
                     --shell "$shell" \
                     ''${createHome:+--create-home} \
+                    ''${isAlias:+--non-unique} \
                     "$name"
                 if test "''${password:0:1}" = 'X'; then
                     (echo "''${password:1}"; echo "''${password:1}") | ${pkgs.shadow}/bin/passwd "$name"
-- 
GitLab


From e5fa3f108efa10c585c3c91fbe39b96066fc4d6d Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 23 Oct 2012 07:50:23 -0400
Subject: [PATCH 4132/5331] Set uniqueness constraint on boot.devShmSize etc.

---
 modules/system/boot/stage-2.nix | 21 ++++++++++++++-------
 1 file changed, 14 insertions(+), 7 deletions(-)

diff --git a/modules/system/boot/stage-2.nix b/modules/system/boot/stage-2.nix
index 3569cfa8113..c8ea322eb17 100644
--- a/modules/system/boot/stage-2.nix
+++ b/modules/system/boot/stage-2.nix
@@ -1,53 +1,60 @@
 { config, pkgs, ... }:
 
+with pkgs.lib;
+
 let
 
   options = {
 
     boot = {
-      postBootCommands = pkgs.lib.mkOption {
+
+      postBootCommands = mkOption {
         default = "";
         example = "rm -f /var/log/messages";
-        type = with pkgs.lib.types; string;
+        type = types.string;
         description = ''
           Shell commands to be executed just before Upstart is started.
         '';
       };
 
-      devSize = pkgs.lib.mkOption {
+      devSize = mkOption {
         default = "5%";
         example = "32m";
+        type = types.uniq types.string;
         description = ''
           Size limit for the /dev tmpfs. Look at mount(8), tmpfs size option,
           for the accepted syntax.
         '';
       };
 
-      devShmSize = pkgs.lib.mkOption {
+      devShmSize = mkOption {
         default = "50%";
         example = "256m";
+        type = types.uniq types.string;
         description = ''
           Size limit for the /dev/shm tmpfs. Look at mount(8), tmpfs size option,
           for the accepted syntax.
         '';
       };
 
-      runSize = pkgs.lib.mkOption {
+      runSize = mkOption {
         default = "25%";
         example = "256m";
+        type = types.uniq types.string;
         description = ''
           Size limit for the /run tmpfs. Look at mount(8), tmpfs size option,
           for the accepted syntax.
         '';
       };
 
-      cleanTmpDir = pkgs.lib.mkOption {
+      cleanTmpDir = mkOption {
         default = false;
         example = true;
         description = ''
           Delete all files in /tmp/ during boot.
         '';
       };
+
     };
 
   };
@@ -66,7 +73,7 @@ let
       [ pkgs.coreutils
         pkgs.utillinux
         pkgs.sysvtools
-      ] ++ pkgs.lib.optional config.boot.cleanTmpDir pkgs.findutils;
+      ] ++ optional config.boot.cleanTmpDir pkgs.findutils;
     postBootCommands = pkgs.writeText "local-cmds"
       ''
         ${config.boot.postBootCommands}
-- 
GitLab


From c980faebe2cb7592fad47aa2684d10c4ee0a509c Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 23 Oct 2012 08:30:50 -0400
Subject: [PATCH 4133/5331] =?UTF-8?q?upstart.nix:=20Set=20=E2=80=98Type?=
 =?UTF-8?q?=E2=80=99=20to=20=E2=80=98oneshot=E2=80=99=20for=20Upstart=20ta?=
 =?UTF-8?q?sks?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This way the service will only reach the "started" state when the task
has finished.
---
 modules/system/upstart/upstart.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/modules/system/upstart/upstart.nix b/modules/system/upstart/upstart.nix
index 5761ed4c5a4..33f2775b496 100644
--- a/modules/system/upstart/upstart.nix
+++ b/modules/system/upstart/upstart.nix
@@ -94,7 +94,9 @@ let
             if job.daemonType == "none" then { } else
             throw "invalid daemon type `${job.daemonType}'")
         // optionalAttrs (!job.task && job.respawn)
-          { Restart = "always"; };
+          { Restart = "always"; }
+        // optionalAttrs job.task
+          { Type = "oneshot"; RemainAfterExit = false; };
     };
 
 
-- 
GitLab


From 224c825a36bf8fb161c25845b1cc0bae6866f075 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 23 Oct 2012 09:10:48 -0400
Subject: [PATCH 4134/5331] =?UTF-8?q?Add=20option=20=E2=80=98users.motd?=
 =?UTF-8?q?=E2=80=99=20for=20setting=20a=20message=20of=20the=20day=20show?=
 =?UTF-8?q?n=20on=20login?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Note that this uses pam_motd.
---
 modules/programs/shadow.nix              |  5 +++--
 modules/security/pam.nix                 | 13 +++++++++++++
 modules/services/networking/ssh/sshd.nix |  5 ++++-
 3 files changed, 20 insertions(+), 3 deletions(-)

diff --git a/modules/programs/shadow.nix b/modules/programs/shadow.nix
index 4b9be460548..39359ac4293 100644
--- a/modules/programs/shadow.nix
+++ b/modules/programs/shadow.nix
@@ -1,6 +1,6 @@
 # Configuration for the pwdutils suite of tools: passwd, useradd, etc.
 
-{config, pkgs, ...}:
+{ config, pkgs, ... }:
 
 let
 
@@ -27,6 +27,7 @@ let
       # Uncomment this to allow non-root users to change their account
       #information.  This should be made configurable.
       #CHFN_RESTRICT frwh
+
     '';
 
 in
@@ -90,7 +91,7 @@ in
         { name = "groupmod"; rootOK = true; }
         { name = "groupmems"; rootOK = true; }
         { name = "groupdel"; rootOK = true; }
-        { name = "login"; startSession = true; allowNullPassword = true; }
+        { name = "login"; startSession = true; allowNullPassword = true; showMotd = true; }
       ];
 
     security.setuidPrograms = [ "passwd" "chfn" "su" "newgrp" ];
diff --git a/modules/security/pam.nix b/modules/security/pam.nix
index 049df0f9958..7293f207ed0 100644
--- a/modules/security/pam.nix
+++ b/modules/security/pam.nix
@@ -29,6 +29,8 @@ let
                  concatStringsSep " " [ domain type item value ])
                 limits));
 
+  motd = pkgs.writeText "motd" config.users.motd;
+
   makePAMService =
     { name
     , # If set, root doesn't need to authenticate (e.g. for the "chsh"
@@ -58,6 +60,8 @@ let
       allowNullPassword ? false
     , # The limits, as per limits.conf(5).
       limits ? config.security.pam.loginLimits
+    , # Whether to show the message of the day.
+      showMotd ? false
     }:
 
     { source = pkgs.writeText "${name}.pam"
@@ -110,6 +114,8 @@ let
               "session optional pam_xauth.so xauthpath=${pkgs.xorg.xauth}/bin/xauth systemuser=99"}
           ${optionalString (limits != [])
               "session required ${pkgs.pam}/lib/security/pam_limits.so conf=${makeLimitsConf limits}"}
+          ${optionalString (showMotd && config.users.motd != null)
+              "session optional ${pkgs.pam}/lib/security/pam_motd.so motd=${motd}"}
         '';
       target = "pam.d/${name}";
     };
@@ -201,6 +207,13 @@ in
         '';
     };
 
+    users.motd = mkOption {
+      default = null;
+      example = "Today is Sweetmorn, the 4th day of The Aftermath in the YOLD 3178.";
+      type = types.nullOr types.string;
+      description = "Message of the day shown to users when they log in.";
+    };
+
   };
 
 
diff --git a/modules/services/networking/ssh/sshd.nix b/modules/services/networking/ssh/sshd.nix
index 163616fdd18..90e0ea2f029 100644
--- a/modules/services/networking/ssh/sshd.nix
+++ b/modules/services/networking/ssh/sshd.nix
@@ -358,7 +358,7 @@ in
 
     networking.firewall.allowedTCPPorts = cfg.ports;
 
-    security.pam.services = optional cfg.usePAM { name = "sshd"; startSession = true; };
+    security.pam.services = optional cfg.usePAM { name = "sshd"; startSession = true; showMotd = true; };
 
     services.openssh.extraConfig =
       ''
@@ -390,10 +390,13 @@ in
         GatewayPorts ${cfg.gatewayPorts}
         PasswordAuthentication ${if cfg.passwordAuthentication then "yes" else "no"}
         ChallengeResponseAuthentication ${if cfg.challengeResponseAuthentication then "yes" else "no"}
+
+        PrintMotd no # handled by pam_motd
       '';
 
     assertions = [{ assertion = if cfg.forwardX11 then cfgc.setXAuthLocation else true;
                     message = "cannot enable X11 forwarding without setting xauth location";}];
+
   };
 
 }
-- 
GitLab


From 2d9258da6705182388fc8e6472a49d2b0fee7b90 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 24 Oct 2012 12:31:02 +0200
Subject: [PATCH 4135/5331] auto.nix: Use SLiM to implement auto-logins

---
 modules/services/x11/display-managers/auto.nix | 15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)

diff --git a/modules/services/x11/display-managers/auto.nix b/modules/services/x11/display-managers/auto.nix
index cccc6e62a15..33d97e0e07a 100644
--- a/modules/services/x11/display-managers/auto.nix
+++ b/modules/services/x11/display-managers/auto.nix
@@ -41,16 +41,11 @@ in
 
   config = mkIf cfg.enable {
 
-    services.xserver.displayManager.slim.enable = false;
-
-    services.xserver.displayManager.job =
-      { execCmd =
-          ''
-            exec ${pkgs.xorg.xinit}/bin/xinit \
-              ${pkgs.su}/bin/su -c ${dmcfg.session.script} ${cfg.user} \
-              -- ${dmcfg.xserverBin} ${dmcfg.xserverArgs}
-          '';
-      };
+    services.xserver.displayManager.slim = {
+      enable = true;
+      autoLogin = true;
+      defaultUser = cfg.user;
+    };
 
   };
 
-- 
GitLab


From 719aeb36caf764eb969dc2cc6fbee8fd14eb47cc Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 24 Oct 2012 12:58:58 +0200
Subject: [PATCH 4136/5331] =?UTF-8?q?Tests:=20Depend=20on=20=E2=80=98netwo?=
 =?UTF-8?q?rk.target=E2=80=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 tests/avahi.nix      |  4 ++--
 tests/bittorrent.nix |  6 +++---
 tests/firewall.nix   |  2 +-
 tests/installer.nix  | 11 +++++------
 tests/ipv6.nix       |  4 ++--
 tests/nat.nix        |  4 ++--
 tests/openssh.nix    |  2 +-
 tests/tomcat.nix     |  2 +-
 8 files changed, 17 insertions(+), 18 deletions(-)

diff --git a/tests/avahi.nix b/tests/avahi.nix
index d29e0ff77c6..f1536f2eafa 100644
--- a/tests/avahi.nix
+++ b/tests/avahi.nix
@@ -22,13 +22,13 @@ with pkgs;
     '' startAll;
 
        # mDNS.
-       $one->waitForJob("network-interfaces");
+       $one->waitForJob("network.target");
        $one->mustSucceed("avahi-resolve-host-name one.local | tee out >&2");
        $one->mustSucceed("test \"`cut -f1 < out`\" = one.local");
        $one->mustSucceed("avahi-resolve-host-name two.local | tee out >&2");
        $one->mustSucceed("test \"`cut -f1 < out`\" = two.local");
 
-       $two->waitForJob("network-interfaces");
+       $two->waitForJob("network.target");
        $two->mustSucceed("avahi-resolve-host-name one.local | tee out >&2");
        $two->mustSucceed("test \"`cut -f1 < out`\" = one.local");
        $two->mustSucceed("avahi-resolve-host-name two.local | tee out >&2");
diff --git a/tests/bittorrent.nix b/tests/bittorrent.nix
index 8951e5bad1b..c0cd7cd1843 100644
--- a/tests/bittorrent.nix
+++ b/tests/bittorrent.nix
@@ -79,7 +79,7 @@ in
       $tracker->succeed("chmod 644 /tmp/test.torrent");
 
       # Start the tracker.  !!! use a less crappy tracker
-      $tracker->waitForJob("network-interfaces");
+      $tracker->waitForJob("network.target");
       $tracker->succeed("bittorrent-tracker --port 6969 --dfile /tmp/dstate >&2 &");
       $tracker->waitForOpenPort(6969);
 
@@ -88,7 +88,7 @@ in
 
       # Now we should be able to download from the client behind the NAT.
       $tracker->waitForJob("httpd");
-      $client1->waitForJob("network-interfaces");
+      $client1->waitForJob("network.target");
       $client1->succeed("transmission-cli http://tracker/test.torrent -w /tmp >&2 &");
       $client1->waitForFile("/tmp/test.tar.bz2");
       $client1->succeed("cmp /tmp/test.tar.bz2 ${file}");
@@ -98,7 +98,7 @@ in
 
       # Now download from the second client.  This can only succeed if
       # the first client created a NAT hole in the router.
-      $client2->waitForJob("network-interfaces");
+      $client2->waitForJob("network.target");
       $client2->succeed("transmission-cli http://tracker/test.torrent -M -w /tmp >&2 &");
       $client2->waitForFile("/tmp/test.tar.bz2");
       $client2->succeed("cmp /tmp/test.tar.bz2 ${file}");
diff --git a/tests/firewall.nix b/tests/firewall.nix
index b38cd988b76..060dbb6082c 100644
--- a/tests/firewall.nix
+++ b/tests/firewall.nix
@@ -27,7 +27,7 @@
 
       $walled->waitForJob("firewall");
       $walled->waitForJob("httpd");
-      $attacker->waitForJob("network-interfaces");
+      $attacker->waitForJob("network.target");
 
       # Local connections should still work.
       $walled->succeed("curl -v http://localhost/ >&2");
diff --git a/tests/installer.nix b/tests/installer.nix
index 65542ae862e..09c51c1e19e 100644
--- a/tests/installer.nix
+++ b/tests/installer.nix
@@ -169,13 +169,12 @@ let
       my $machine = createMachine({ hda => "harddisk", hdaInterface => "${iface}" });
 
       # Did /boot get mounted, if appropriate?
-      # !!! There is currently no good way to wait for the
-      # `filesystems' task to finish.
-      $machine->waitForFile("/boot/grub");
+      $machine->waitForUnit("local-fs.target");
+      $machine->succeed("test -e /boot/grub");
 
       # Did the swap device get activated?
-      # !!! Idem.
-      $machine->waitUntilSucceeds("cat /proc/swaps | grep -q /dev");
+      $machine->waitForUnit("swap.target");
+      $machine->succeed("cat /proc/swaps | grep -q /dev");
 
       $machine->mustSucceed("nix-env -i coreutils >&2");
       $machine->mustSucceed("type -tP ls | tee /dev/stderr") =~ /.nix-profile/
@@ -188,7 +187,7 @@ let
       # And just to be sure, check that the machine still boots after
       # "nixos-rebuild switch".
       my $machine = createMachine({ hda => "harddisk", hdaInterface => "${iface}" });
-      $machine->waitForJob("network-interfaces");
+      $machine->waitForJob("network.target");
       $machine->shutdown;
     '';
 
diff --git a/tests/ipv6.nix b/tests/ipv6.nix
index 4a308416aef..a5f1a65a73d 100644
--- a/tests/ipv6.nix
+++ b/tests/ipv6.nix
@@ -35,8 +35,8 @@
 
       startAll;
 
-      $client->waitForJob("network-interfaces");
-      $server->waitForJob("network-interfaces");
+      $client->waitForJob("network.target");
+      $server->waitForJob("network.target");
 
       # Wait until the given interface has a non-tentative address of
       # the desired scope (i.e. has completed Duplicate Address
diff --git a/tests/nat.nix b/tests/nat.nix
index 5adbf3ce57d..24f390f24cb 100644
--- a/tests/nat.nix
+++ b/tests/nat.nix
@@ -41,12 +41,12 @@
 
       # The router should have access to the server.
       $server->waitForJob("httpd");
-      $router->waitForJob("network-interfaces");
+      $router->waitForJob("network.target");
       $router->succeed("curl --fail http://server/ >&2");
 
       # The client should be also able to connect via the NAT router.
       $router->waitForJob("nat");
-      $client->waitForJob("network-interfaces");
+      $client->waitForJob("network.target");
       $client->succeed("curl --fail http://server/ >&2");
       $client->succeed("ping -c 1 server >&2");
 
diff --git a/tests/openssh.nix b/tests/openssh.nix
index 7a3d789327a..734925989a3 100644
--- a/tests/openssh.nix
+++ b/tests/openssh.nix
@@ -29,7 +29,7 @@
     $client->copyFileFromHost("key", "/root/.ssh/id_dsa");
     $client->mustSucceed("chmod 600 /root/.ssh/id_dsa");
 
-    $client->waitForJob("network-interfaces");
+    $client->waitForJob("network.target");
     $client->mustSucceed("ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no server 'echo hello world' >&2");
   '';
 }
diff --git a/tests/tomcat.nix b/tests/tomcat.nix
index 0726a782250..3fd99da413c 100644
--- a/tests/tomcat.nix
+++ b/tests/tomcat.nix
@@ -25,7 +25,7 @@
 
     $server->waitForJob("tomcat");
     $server->sleep(30); # Dirty, but it takes a while before Tomcat handles to requests properly
-    $client->waitForJob("network-interfaces");
+    $client->waitForJob("network.target");
     $client->succeed("curl --fail http://server/examples/servlets/servlet/HelloWorldExample");
     $client->succeed("curl --fail http://server/examples/jsp/jsp2/simpletag/hello.jsp");
   '';
-- 
GitLab


From c6abc572e8ce4572b6f4aa5306c3487d76147a02 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 24 Oct 2012 12:59:19 +0200
Subject: [PATCH 4137/5331] Run all tests on both 32 and 64 bit

---
 release.nix | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/release.nix b/release.nix
index b32ce233ec0..4c29fce29f2 100644
--- a/release.nix
+++ b/release.nix
@@ -193,10 +193,9 @@ let
     */
 
 
-    tests =
+    tests = { system ? "x86_64-linux" }:
       let
-        t = import ./tests { system = "i686-linux"; };
-        t_64 = import ./tests { system = "x86_64-linux"; };
+        t = import ./tests { inherit system; };
       in {
         avahi = t.avahi.test;
         bittorrent = t.bittorrent.test;
@@ -207,7 +206,6 @@ let
         installer.rebuildCD = t.installer.rebuildCD.test;
         installer.separateBoot = t.installer.separateBoot.test;
         installer.simple = t.installer.simple.test;
-        installer.simple_64 = t_64.installer.simple.test;
         installer.swraid = t.installer.swraid.test;
         ipv6 = t.ipv6.test;
         kde4 = t.kde4.test;
-- 
GitLab


From b6f9e0526995d3d571cb4ee0819fb51a23571019 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 24 Oct 2012 18:10:58 +0200
Subject: [PATCH 4138/5331] Update NFS client/server modules for systemd

---
 modules/services/network-filesystems/nfsd.nix | 40 ++++++++---------
 modules/services/networking/rpcbind.nix       | 22 ++++-----
 modules/tasks/filesystems/nfs.nix             | 45 +++++++++----------
 tests/nfs.nix                                 | 11 ++---
 tests/trac.nix                                |  3 +-
 5 files changed, 61 insertions(+), 60 deletions(-)

diff --git a/modules/services/network-filesystems/nfsd.nix b/modules/services/network-filesystems/nfsd.nix
index b4dc014d68e..995e9bba603 100644
--- a/modules/services/network-filesystems/nfsd.nix
+++ b/modules/services/network-filesystems/nfsd.nix
@@ -80,44 +80,44 @@ in
 
     boot.kernelModules = [ "nfsd" ];
 
-    jobs.nfsd =
-      { description = "Kernel NFS server";
+    boot.systemd.services.nfsd =
+      { description = "NFS Server";
 
-        startOn = "started networking";
+        wantedBy = [ "multi-user.target" ];
+
+        requires = [ "rpcbind.service" "mountd.service" ];
+        after = [ "rpcbind.service" "mountd.service" "statd.service" ];
 
         path = [ pkgs.nfsUtils ];
 
-        preStart =
+        script =
           ''
-            ensure rpcbind
-            ensure mountd
-
             # Create a state directory required by NFSv4.
             mkdir -p /var/lib/nfs/v4recovery
 
             rpc.nfsd \
               ${if cfg.hostName != null then "-H ${cfg.hostName}" else ""} \
               ${builtins.toString cfg.nproc}
+
+            sm-notify -d
           '';
 
         postStop = "rpc.nfsd 0";
 
-        postStart =
-          ''
-            ensure statd
-            ensure idmapd
-          '';
+        serviceConfig.Type = "oneshot";
+        serviceConfig.RemainAfterExit = true;
       };
 
-    jobs.mountd =
-      { description = "Kernel NFS server - mount daemon";
+    boot.systemd.services.mountd =
+      { description = "NFSv3 Mount Daemon";
+
+        requires = [ "rpcbind.service" ];
+        after = [ "rpcbind.service" ];
 
         path = [ pkgs.nfsUtils pkgs.sysvtools pkgs.utillinux ];
 
         preStart =
           ''
-            ensure rpcbind
-
             mkdir -p /var/lib/nfs
             touch /var/lib/nfs/rmtab
 
@@ -133,14 +133,14 @@ in
               ''
             }
 
-            # exports file is ${exports}
-            # keep this comment so that this job is restarted whenever exports changes!
             exportfs -ra
           '';
 
-        daemonType = "fork";
+        restartTriggers = [ exports ];
 
-        exec = "rpc.mountd -f /etc/exports";
+        serviceConfig.Type = "forking";
+        serviceConfig.ExecStart = "@${pkgs.nfsUtils}/sbin/rpc.mountd rpc.mountd -f /etc/exports";
+        serviceConfig.Restart = "always";
       };
 
   };
diff --git a/modules/services/networking/rpcbind.nix b/modules/services/networking/rpcbind.nix
index 5437d221c1e..8e3e86a515c 100644
--- a/modules/services/networking/rpcbind.nix
+++ b/modules/services/networking/rpcbind.nix
@@ -59,20 +59,22 @@ in
 
   config = mkIf config.services.rpcbind.enable {
 
-    environment.etc = [netconfigFile];
+    environment.systemPackages = [ pkgs.rpcbind ];
 
-    jobs.rpcbind =
-      { description = "ONC RPC rpcbind";
+    environment.etc = [ netconfigFile ];
 
-        startOn = "started network-interfaces";
-        stopOn = "";
+    boot.systemd.services.rpcbind =
+      { description = "ONC RPC Directory Service";
 
-        daemonType = "fork";
+        wantedBy = [ "multi-user.target" ];
 
-        exec =
-          ''
-            ${pkgs.rpcbind}/bin/rpcbind
-          '';
+        requires = [ "basic.target" ];
+        after = [ "basic.target" ];
+
+        unitConfig.DefaultDependencies = false; # don't stop during shutdown
+
+        serviceConfig.Type = "forking";
+        serviceConfig.ExecStart = "@${pkgs.rpcbind}/bin/rpcbind rpcbind";
       };
 
   };
diff --git a/modules/tasks/filesystems/nfs.nix b/modules/tasks/filesystems/nfs.nix
index 491d2de8f24..055733e456a 100644
--- a/modules/tasks/filesystems/nfs.nix
+++ b/modules/tasks/filesystems/nfs.nix
@@ -33,50 +33,49 @@ in
   config = mkIf (any (fs: fs == "nfs" || fs == "nfs4") config.boot.supportedFilesystems) {
 
     services.rpcbind.enable = true;
-    
+
     system.fsPackages = [ pkgs.nfsUtils ];
 
     boot.kernelModules = [ "sunrpc" ];
 
     boot.initrd.kernelModules = mkIf inInitrd [ "nfs" ];
 
-    # Ensure that statd and idmapd are started before mountall.
-    jobs.mountall.preStart =
-      ''
-        ensure statd || true
-        ensure idmapd || true
-      '';
-
-    jobs.statd =
-      { description = "Kernel NFS server - Network Status Monitor";
+    boot.systemd.services.statd =
+      { description = "NFSv3 Network Status Monitor";
 
         path = [ pkgs.nfsUtils pkgs.sysvtools pkgs.utillinux ];
 
-        stopOn = ""; # needed during shutdown
+        wantedBy = [ "remote-fs-pre.target" "multi-user.target" ];
+        before = [ "remote-fs-pre.target" ];
+        requires = [ "basic.target" "rpcbind.service" ];
+        after = [ "basic.target" "rpcbind.service" "network.target" ];
+
+        unitConfig.DefaultDependencies = false; # don't stop during shutdown
 
         preStart =
           ''
-            ensure rpcbind
             mkdir -p ${nfsStateDir}/sm
             mkdir -p ${nfsStateDir}/sm.bak
             sm-notify -d
           '';
 
-        daemonType = "fork";
-
-        exec = "rpc.statd --no-notify";
+        serviceConfig.Type = "forking";
+        serviceConfig.ExecStart = "@${pkgs.nfsUtils}/sbin/rpc.statd rpc.statd --no-notify";
+        serviceConfig.Restart = "always";
       };
 
-    jobs.idmapd =
-      { description = "NFS ID mapping daemon";
+    boot.systemd.services.idmapd =
+      { description = "NFSv4 ID Mapping Daemon";
 
-        path = [ pkgs.nfsUtils pkgs.sysvtools pkgs.utillinux ];
+        path = [ pkgs.sysvtools pkgs.utillinux ];
 
-        startOn = "started udev";
+        wantedBy = [ "remote-fs-pre.target" "multi-user.target" ];
+        before = [ "remote-fs-pre.target" ];
+        requires = [ "rpcbind.service" ];
+        after = [ "rpcbind.service" ];
 
         preStart =
           ''
-            ensure rpcbind
             mkdir -p ${rpcMountpoint}
             mount -t rpc_pipefs rpc_pipefs ${rpcMountpoint}
           '';
@@ -86,9 +85,9 @@ in
             umount ${rpcMountpoint}
           '';
 
-        daemonType = "fork";
-
-        exec = "rpc.idmapd -v -c ${idmapdConfFile}";
+        serviceConfig.Type = "forking";
+        serviceConfig.ExecStart = "@${pkgs.nfsUtils}/sbin/rpc.idmapd rpc.idmapd -c ${idmapdConfFile}";
+        serviceConfig.Restart = "always";
       };
 
   };
diff --git a/tests/nfs.nix b/tests/nfs.nix
index 7c1ff5e9212..d5b6fc0a692 100644
--- a/tests/nfs.nix
+++ b/tests/nfs.nix
@@ -8,7 +8,7 @@ let
         [ { mountPoint = "/data";
             device = "server:/data";
             fsType = "nfs";
-            options = "bootwait,vers=3";
+            options = "vers=3";
           }
         ];
     };
@@ -35,19 +35,20 @@ in
   testScript =
     ''
       $server->waitForJob("nfsd");
+      $server->waitForJob("network.target");
 
       startAll;
 
-      $client1->waitForJob("tty1"); # depends on filesystems
+      $client1->waitForJob("data.mount");
       $client1->succeed("echo bla > /data/foo");
       $server->succeed("test -e /data/foo");
 
-      $client2->waitForJob("tty1"); # depends on filesystems
+      $client2->waitForJob("data.mount");
       $client2->succeed("echo bla > /data/bar");
       $server->succeed("test -e /data/bar");
 
       # Test whether restarting ‘nfsd’ works correctly.
-      $server->succeed("stop nfsd; start nfsd");
+      $server->succeed("systemctl restart nfsd");
       $client2->succeed("echo bla >> /data/bar"); # will take 90 seconds due to the NFS grace period
 
       # Test whether we can get a lock.
@@ -66,7 +67,7 @@ in
       $client2->waitForFile("locked");
 
       # Test whether locks survive a reboot of the server.
-      $client1->waitForJob("tty1"); # depends on filesystems
+      $client1->waitForJob("data.mount");
       $server->shutdown;
       $server->start;
       $client1->succeed("touch /data/xyzzy");
diff --git a/tests/trac.nix b/tests/trac.nix
index 254996c2440..a35058a1992 100644
--- a/tests/trac.nix
+++ b/tests/trac.nix
@@ -33,8 +33,7 @@
         fileSystems = pkgs.lib.mkOverride 50
           [ { mountPoint = "/repos";
               device = "storage:/repos";
-	      fsType = "nfs";
-	      options = "bootwait";
+              fsType = "nfs";
             }
           ];
 
-- 
GitLab


From d380152f39450070d9cd7e7a8272b2b1b8bd6b12 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 24 Oct 2012 18:11:21 +0200
Subject: [PATCH 4139/5331] Update some tests for systemd

---
 tests/firewall.nix | 2 +-
 tests/nat.nix      | 2 +-
 tests/quake3.nix   | 7 +++----
 3 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/tests/firewall.nix b/tests/firewall.nix
index 060dbb6082c..316ee439b45 100644
--- a/tests/firewall.nix
+++ b/tests/firewall.nix
@@ -41,7 +41,7 @@
       $walled->succeed("ping -c 1 attacker >&2");
 
       # If we stop the firewall, then connections should succeed.
-      $walled->succeed("stop firewall");
+      $walled->stopJob("firewall");
       $attacker->succeed("curl -v http://walled/ >&2");
     '';
 
diff --git a/tests/nat.nix b/tests/nat.nix
index 24f390f24cb..ca02fa137d4 100644
--- a/tests/nat.nix
+++ b/tests/nat.nix
@@ -63,7 +63,7 @@
       $router->succeed("ping -c 1 client >&2");
 
       # If we turn off NAT, the client shouldn't be able to reach the server.
-      $router->succeed("stop nat");
+      $router->stopJob("nat");
       $client->fail("curl --fail --connect-timeout 5 http://server/ >&2");
       $client->fail("ping -c 1 server >&2");
 
diff --git a/tests/quake3.nix b/tests/quake3.nix
index fbd0adab2fa..796c300423d 100644
--- a/tests/quake3.nix
+++ b/tests/quake3.nix
@@ -28,9 +28,8 @@ rec {
     { server =
         { config, pkgs, ... }:
 
-        { jobs.quake3Server =
-            { name = "quake3-server";
-              startOn = "startup";
+        { jobs."quake3-server" =
+            { startOn = "startup";
               exec =
                 "${pkgs.quake3demo}/bin/quake3-server '+set g_gametype 0' " +
                 "'+map q3dm7' '+addbot grunt' '+addbot daemia' 2> /tmp/log";
@@ -74,7 +73,7 @@ rec {
 
       $client1->shutdown();
       $client2->shutdown();
-      $server->succeed("stop quake3-server");
+      $server->stopJob("quake3-server");
     '';
 
 }
-- 
GitLab


From ecd7bc931002fca2ea6508765a548dff382ebc10 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 24 Oct 2012 18:22:53 +0200
Subject: [PATCH 4140/5331] Tests: global search/replace of obsolete functions

---
 tests/avahi.nix             | 42 +++++++++++++-------------
 tests/bittorrent.nix        | 10 +++----
 tests/check-filesystems.nix | 20 ++++++-------
 tests/firewall.nix          |  6 ++--
 tests/installer.nix         | 60 ++++++++++++++++++-------------------
 tests/ipv6.nix              |  6 ++--
 tests/kde4.nix              |  2 +-
 tests/mpich.nix             | 18 +++++------
 tests/mysql-replication.nix |  8 ++---
 tests/mysql.nix             |  4 +--
 tests/nat.nix               | 10 +++----
 tests/nfs.nix               | 10 +++----
 tests/openssh.nix           | 12 ++++----
 tests/portmap.nix           |  2 +-
 tests/proxy.nix             | 18 +++++------
 tests/quake3.nix            |  2 +-
 tests/subversion.nix        | 34 ++++++++++-----------
 tests/tomcat.nix            |  4 +--
 tests/trac.nix              | 12 ++++----
 19 files changed, 140 insertions(+), 140 deletions(-)

diff --git a/tests/avahi.nix b/tests/avahi.nix
index f1536f2eafa..d95361dcd83 100644
--- a/tests/avahi.nix
+++ b/tests/avahi.nix
@@ -22,34 +22,34 @@ with pkgs;
     '' startAll;
 
        # mDNS.
-       $one->waitForJob("network.target");
-       $one->mustSucceed("avahi-resolve-host-name one.local | tee out >&2");
-       $one->mustSucceed("test \"`cut -f1 < out`\" = one.local");
-       $one->mustSucceed("avahi-resolve-host-name two.local | tee out >&2");
-       $one->mustSucceed("test \"`cut -f1 < out`\" = two.local");
-
-       $two->waitForJob("network.target");
-       $two->mustSucceed("avahi-resolve-host-name one.local | tee out >&2");
-       $two->mustSucceed("test \"`cut -f1 < out`\" = one.local");
-       $two->mustSucceed("avahi-resolve-host-name two.local | tee out >&2");
-       $two->mustSucceed("test \"`cut -f1 < out`\" = two.local");
+       $one->waitForUnit("network.target");
+       $one->succeed("avahi-resolve-host-name one.local | tee out >&2");
+       $one->succeed("test \"`cut -f1 < out`\" = one.local");
+       $one->succeed("avahi-resolve-host-name two.local | tee out >&2");
+       $one->succeed("test \"`cut -f1 < out`\" = two.local");
+
+       $two->waitForUnit("network.target");
+       $two->succeed("avahi-resolve-host-name one.local | tee out >&2");
+       $two->succeed("test \"`cut -f1 < out`\" = one.local");
+       $two->succeed("avahi-resolve-host-name two.local | tee out >&2");
+       $two->succeed("test \"`cut -f1 < out`\" = two.local");
 
        # Basic DNS-SD.
-       $one->mustSucceed("avahi-browse -r -t _workstation._tcp | tee out >&2");
-       $one->mustSucceed("test `wc -l < out` -gt 0");
-       $two->mustSucceed("avahi-browse -r -t _workstation._tcp | tee out >&2");
-       $two->mustSucceed("test `wc -l < out` -gt 0");
+       $one->succeed("avahi-browse -r -t _workstation._tcp | tee out >&2");
+       $one->succeed("test `wc -l < out` -gt 0");
+       $two->succeed("avahi-browse -r -t _workstation._tcp | tee out >&2");
+       $two->succeed("test `wc -l < out` -gt 0");
 
        # More DNS-SD.
        $one->execute("avahi-publish -s \"This is a test\" _test._tcp 123 one=1 &");
        $one->sleep(5);
-       $two->mustSucceed("avahi-browse -r -t _test._tcp | tee out >&2");
-       $two->mustSucceed("test `wc -l < out` -gt 0");
+       $two->succeed("avahi-browse -r -t _test._tcp | tee out >&2");
+       $two->succeed("test `wc -l < out` -gt 0");
 
        # NSS-mDNS.
-       $one->mustSucceed("getent hosts one.local >&2");
-       $one->mustSucceed("getent hosts two.local >&2");
-       $two->mustSucceed("getent hosts one.local >&2");
-       $two->mustSucceed("getent hosts two.local >&2");
+       $one->succeed("getent hosts one.local >&2");
+       $one->succeed("getent hosts two.local >&2");
+       $two->succeed("getent hosts one.local >&2");
+       $two->succeed("getent hosts two.local >&2");
     '';
 }
diff --git a/tests/bittorrent.nix b/tests/bittorrent.nix
index c0cd7cd1843..9e4ee2e0635 100644
--- a/tests/bittorrent.nix
+++ b/tests/bittorrent.nix
@@ -64,7 +64,7 @@ in
       startAll;
 
       # Enable NAT on the router and start miniupnpd.
-      $router->waitForJob("nat");
+      $router->waitForUnit("nat");
       $router->succeed(
           "iptables -t nat -N MINIUPNPD",
           "iptables -t nat -A PREROUTING -i eth1 -j MINIUPNPD",
@@ -79,7 +79,7 @@ in
       $tracker->succeed("chmod 644 /tmp/test.torrent");
 
       # Start the tracker.  !!! use a less crappy tracker
-      $tracker->waitForJob("network.target");
+      $tracker->waitForUnit("network.target");
       $tracker->succeed("bittorrent-tracker --port 6969 --dfile /tmp/dstate >&2 &");
       $tracker->waitForOpenPort(6969);
 
@@ -87,8 +87,8 @@ in
       my $pid = $tracker->succeed("transmission-cli /tmp/test.torrent -M -w /tmp/data >&2 & echo \$!");
 
       # Now we should be able to download from the client behind the NAT.
-      $tracker->waitForJob("httpd");
-      $client1->waitForJob("network.target");
+      $tracker->waitForUnit("httpd");
+      $client1->waitForUnit("network.target");
       $client1->succeed("transmission-cli http://tracker/test.torrent -w /tmp >&2 &");
       $client1->waitForFile("/tmp/test.tar.bz2");
       $client1->succeed("cmp /tmp/test.tar.bz2 ${file}");
@@ -98,7 +98,7 @@ in
 
       # Now download from the second client.  This can only succeed if
       # the first client created a NAT hole in the router.
-      $client2->waitForJob("network.target");
+      $client2->waitForUnit("network.target");
       $client2->succeed("transmission-cli http://tracker/test.torrent -M -w /tmp >&2 &");
       $client2->waitForFile("/tmp/test.tar.bz2");
       $client2->succeed("cmp /tmp/test.tar.bz2 ${file}");
diff --git a/tests/check-filesystems.nix b/tests/check-filesystems.nix
index ed4b365b901..39e8883ee59 100644
--- a/tests/check-filesystems.nix
+++ b/tests/check-filesystems.nix
@@ -59,22 +59,22 @@ rec {
     ''
       startAll;
 
-      $share->waitForJob("checkable");
-      $fsCheck->waitForJob("checkable");
+      $share->waitForUnit("checkable");
+      $fsCheck->waitForUnit("checkable");
 
       # check repos1
-      $fsCheck->mustSucceed("test -d /repos1");
-      $share->mustSucceed("touch /repos1/test1");
-      $fsCheck->mustSucceed("test -e /repos1/test1");
+      $fsCheck->succeed("test -d /repos1");
+      $share->succeed("touch /repos1/test1");
+      $fsCheck->succeed("test -e /repos1/test1");
 
       # check repos2 (check after remount)
-      $fsCheck->mustSucceed("test -d /repos2");
-      $share->mustSucceed("touch /repos2/test2");
-      $fsCheck->mustSucceed("test -e /repos2/test2");
+      $fsCheck->succeed("test -d /repos2");
+      $share->succeed("touch /repos2/test2");
+      $fsCheck->succeed("test -e /repos2/test2");
 
       # check without network
       $share->block();
-      $fsCheck->mustFail("test -e /repos1/test1");
-      $fsCheck->mustFail("test -e /repos2/test2");
+      $fsCheck->fail("test -e /repos1/test1");
+      $fsCheck->fail("test -e /repos2/test2");
     '';
 }
diff --git a/tests/firewall.nix b/tests/firewall.nix
index 316ee439b45..de32b98e5d2 100644
--- a/tests/firewall.nix
+++ b/tests/firewall.nix
@@ -25,9 +25,9 @@
     ''
       startAll;
 
-      $walled->waitForJob("firewall");
-      $walled->waitForJob("httpd");
-      $attacker->waitForJob("network.target");
+      $walled->waitForUnit("firewall");
+      $walled->waitForUnit("httpd");
+      $attacker->waitForUnit("network.target");
 
       # Local connections should still work.
       $walled->succeed("curl -v http://localhost/ >&2");
diff --git a/tests/installer.nix b/tests/installer.nix
index 09c51c1e19e..7e63454dd70 100644
--- a/tests/installer.nix
+++ b/tests/installer.nix
@@ -110,24 +110,24 @@ let
         # Create a channel on the web server containing a few packages
         # to simulate the Nixpkgs channel.
         $webserver->start;
-        $webserver->waitForJob("httpd");
-        $webserver->mustSucceed("mkdir /tmp/channel");
-        $webserver->mustSucceed(
+        $webserver->waitForUnit("httpd");
+        $webserver->succeed("mkdir /tmp/channel");
+        $webserver->succeed(
             "nix-push file:///tmp/channel " .
             "http://nixos.org/releases/nixos/channels/nixos-unstable " .
             "file:///tmp/channel/MANIFEST ${toString channelContents} >&2");
       ''}
 
       # Make sure that we get a login prompt etc.
-      $machine->mustSucceed("echo hello");
-      $machine->waitForJob("tty1");
-      $machine->waitForJob("rogue");
-      $machine->waitForJob("nixos-manual");
-      $machine->waitForJob("dhcpcd");
+      $machine->succeed("echo hello");
+      $machine->waitForUnit("tty1");
+      $machine->waitForUnit("rogue");
+      $machine->waitForUnit("nixos-manual");
+      $machine->waitForUnit("dhcpcd");
 
       ${optionalString testChannel ''
         # Allow the machine to talk to the fake nixos.org.
-        $machine->mustSucceed(
+        $machine->succeed(
             "rm /etc/hosts",
             "echo 192.168.1.1 nixos.org > /etc/hosts",
             "ifconfig eth1 up 192.168.1.2",
@@ -135,9 +135,9 @@ let
         );
 
         # Test nix-env.
-        $machine->mustFail("hello");
-        $machine->mustSucceed("nix-env -i hello");
-        $machine->mustSucceed("hello") =~ /Hello, world/
+        $machine->fail("hello");
+        $machine->succeed("nix-env -i hello");
+        $machine->succeed("hello") =~ /Hello, world/
             or die "bad `hello' output";
       ''}
 
@@ -145,12 +145,12 @@ let
       ${createPartitions}
 
       # Create the NixOS configuration.
-      $machine->mustSucceed(
+      $machine->succeed(
           "mkdir -p /mnt/etc/nixos",
           "nixos-hardware-scan > /mnt/etc/nixos/hardware.nix",
       );
 
-      my $cfg = $machine->mustSucceed("cat /mnt/etc/nixos/hardware.nix");
+      my $cfg = $machine->succeed("cat /mnt/etc/nixos/hardware.nix");
       print STDERR "Result of the hardware scan:\n$cfg\n";
 
       $machine->copyFileFromHost(
@@ -158,10 +158,10 @@ let
           "/mnt/etc/nixos/configuration.nix");
 
       # Perform the installation.
-      $machine->mustSucceed("nixos-install >&2");
+      $machine->succeed("nixos-install >&2");
 
       # Do it again to make sure it's idempotent.
-      $machine->mustSucceed("nixos-install >&2");
+      $machine->succeed("nixos-install >&2");
 
       $machine->shutdown;
 
@@ -176,18 +176,18 @@ let
       $machine->waitForUnit("swap.target");
       $machine->succeed("cat /proc/swaps | grep -q /dev");
 
-      $machine->mustSucceed("nix-env -i coreutils >&2");
-      $machine->mustSucceed("type -tP ls | tee /dev/stderr") =~ /.nix-profile/
+      $machine->succeed("nix-env -i coreutils >&2");
+      $machine->succeed("type -tP ls | tee /dev/stderr") =~ /.nix-profile/
           or die "nix-env failed";
 
-      $machine->mustSucceed("nixos-rebuild switch >&2");
+      $machine->succeed("nixos-rebuild switch >&2");
 
       $machine->shutdown;
 
       # And just to be sure, check that the machine still boots after
       # "nixos-rebuild switch".
       my $machine = createMachine({ hda => "harddisk", hdaInterface => "${iface}" });
-      $machine->waitForJob("network.target");
+      $machine->waitForUnit("network.target");
       $machine->shutdown;
     '';
 
@@ -211,7 +211,7 @@ in {
   simple = makeTest
     { createPartitions =
         ''
-          $machine->mustSucceed(
+          $machine->succeed(
               "parted /dev/vda mklabel msdos",
               "parted /dev/vda -- mkpart primary linux-swap 1M 1024M",
               "parted /dev/vda -- mkpart primary ext2 1024M -1s",
@@ -230,7 +230,7 @@ in {
   separateBoot = makeTest
     { createPartitions =
         ''
-          $machine->mustSucceed(
+          $machine->succeed(
               "parted /dev/vda mklabel msdos",
               "parted /dev/vda -- mkpart primary ext2 1M 50MB", # /boot
               "parted /dev/vda -- mkpart primary linux-swap 50MB 1024M",
@@ -253,7 +253,7 @@ in {
   lvm = makeTest
     { createPartitions =
         ''
-          $machine->mustSucceed(
+          $machine->succeed(
               "parted /dev/vda mklabel msdos",
               "parted /dev/vda -- mkpart primary 1M 2048M", # first PV
               "parted /dev/vda -- set 1 lvm on",
@@ -276,7 +276,7 @@ in {
   swraid = makeTest
     { createPartitions =
         ''
-          $machine->mustSucceed(
+          $machine->succeed(
               "parted /dev/vda --"
               . " mklabel msdos"
               . " mkpart primary ext2 1M 30MB" # /boot
@@ -310,7 +310,7 @@ in {
   grub1 = makeTest
     { createPartitions =
         ''
-          $machine->mustSucceed(
+          $machine->succeed(
               "parted /dev/sda mklabel msdos",
               "parted /dev/sda -- mkpart primary linux-swap 1M 1024M",
               "parted /dev/sda -- mkpart primary ext2 1024M -1s",
@@ -337,19 +337,19 @@ in {
           $machine->start;
 
           # Enable sshd service.
-          $machine->mustSucceed(
+          $machine->succeed(
             "sed -i 's,^}\$,jobs.sshd.startOn = pkgs.lib.mkOverride 0 \"startup\"; },' /etc/nixos/configuration.nix"
           );
 
-          my $cfg = $machine->mustSucceed("cat /etc/nixos/configuration.nix");
+          my $cfg = $machine->succeed("cat /etc/nixos/configuration.nix");
           print STDERR "New CD config:\n$cfg\n";
 
           # Apply the new CD configuration.
-          $machine->mustSucceed("nixos-rebuild test");
+          $machine->succeed("nixos-rebuild test");
 
           # Connect to it-self.
-          #$machine->waitForJob("sshd");
-          #$machine->mustSucceed("ssh root@127.0.0.1 echo hello");
+          #$machine->waitForUnit("sshd");
+          #$machine->succeed("ssh root@127.0.0.1 echo hello");
 
           $machine->shutdown;
         '';
diff --git a/tests/ipv6.nix b/tests/ipv6.nix
index a5f1a65a73d..29d675e180a 100644
--- a/tests/ipv6.nix
+++ b/tests/ipv6.nix
@@ -31,12 +31,12 @@
   testScript =
     ''
       # Start the router first so that it respond to router solicitations.
-      $router->waitForJob("radvd");
+      $router->waitForUnit("radvd");
 
       startAll;
 
-      $client->waitForJob("network.target");
-      $server->waitForJob("network.target");
+      $client->waitForUnit("network.target");
+      $server->waitForUnit("network.target");
 
       # Wait until the given interface has a non-tentative address of
       # the desired scope (i.e. has completed Duplicate Address
diff --git a/tests/kde4.nix b/tests/kde4.nix
index afdf1754942..f435d983791 100644
--- a/tests/kde4.nix
+++ b/tests/kde4.nix
@@ -31,7 +31,7 @@
       $machine->waitForWindow(qr/plasma-desktop/);
 
       # Check that logging in has given the user ownership of devices.
-      $machine->mustSucceed("getfacl /dev/snd/timer | grep -q alice");
+      $machine->succeed("getfacl /dev/snd/timer | grep -q alice");
 
       $machine->execute("su - alice -c 'DISPLAY=:0.0 kwrite /var/log/messages &'");
       $machine->execute("su - alice -c 'DISPLAY=:0.0 konqueror http://localhost/ &'");
diff --git a/tests/mpich.nix b/tests/mpich.nix
index 0b81bc1d0de..d57512ebdfe 100644
--- a/tests/mpich.nix
+++ b/tests/mpich.nix
@@ -24,17 +24,17 @@ with pkgs;
     ''
        startAll;
 
-       $master->mustSucceed("echo 'MPD_SECRETWORD=secret' > /etc/mpd.conf");
-       $master->mustSucceed("chmod 600 /etc/mpd.conf");
-       $master->mustSucceed("mpd --daemon --ifhn=master --listenport=4444");
+       $master->succeed("echo 'MPD_SECRETWORD=secret' > /etc/mpd.conf");
+       $master->succeed("chmod 600 /etc/mpd.conf");
+       $master->succeed("mpd --daemon --ifhn=master --listenport=4444");
 
-       $slave->mustSucceed("echo 'MPD_SECRETWORD=secret' > /etc/mpd.conf");
-       $slave->mustSucceed("chmod 600 /etc/mpd.conf");
-       $slave->mustSucceed("mpd --daemon --host=master --port=4444");
+       $slave->succeed("echo 'MPD_SECRETWORD=secret' > /etc/mpd.conf");
+       $slave->succeed("chmod 600 /etc/mpd.conf");
+       $slave->succeed("mpd --daemon --host=master --port=4444");
 
-       $master->mustSucceed("mpicc -o example -Wall ${./mpich-example.c}");
-       $slave->mustSucceed("mpicc -o example -Wall ${./mpich-example.c}");
+       $master->succeed("mpicc -o example -Wall ${./mpich-example.c}");
+       $slave->succeed("mpicc -o example -Wall ${./mpich-example.c}");
 
-       $master->mustSucceed("mpiexec -n 2 ./example >&2");
+       $master->succeed("mpiexec -n 2 ./example >&2");
     '';
 }
diff --git a/tests/mysql-replication.nix b/tests/mysql-replication.nix
index 5ac7f0a5097..28a1187dd18 100644
--- a/tests/mysql-replication.nix
+++ b/tests/mysql-replication.nix
@@ -48,10 +48,10 @@ in
   testScript = ''
     startAll;
 
-    $master->waitForJob("mysql");
-    $master->waitForJob("mysql");
-    $slave2->waitForJob("mysql");
+    $master->waitForUnit("mysql");
+    $master->waitForUnit("mysql");
+    $slave2->waitForUnit("mysql");
     $slave2->sleep(100); # Hopefully this is long enough!!
-    $slave2->mustSucceed("echo 'use testdb; select * from tests' | mysql -u root -N | grep 4");
+    $slave2->succeed("echo 'use testdb; select * from tests' | mysql -u root -N | grep 4");
   '';
 }
diff --git a/tests/mysql.nix b/tests/mysql.nix
index 65785c8fdb5..b48850738b7 100644
--- a/tests/mysql.nix
+++ b/tests/mysql.nix
@@ -15,8 +15,8 @@
   testScript = ''
     startAll;
 
-    $master->waitForJob("mysql");
+    $master->waitForUnit("mysql");
     $master->sleep(10); # Hopefully this is long enough!!
-    $master->mustSucceed("echo 'use testdb; select * from tests' | mysql -u root -N | grep 4");
+    $master->succeed("echo 'use testdb; select * from tests' | mysql -u root -N | grep 4");
   '';
 }
diff --git a/tests/nat.nix b/tests/nat.nix
index ca02fa137d4..e2f01e71b26 100644
--- a/tests/nat.nix
+++ b/tests/nat.nix
@@ -40,18 +40,18 @@
       startAll;
 
       # The router should have access to the server.
-      $server->waitForJob("httpd");
-      $router->waitForJob("network.target");
+      $server->waitForUnit("httpd");
+      $router->waitForUnit("network.target");
       $router->succeed("curl --fail http://server/ >&2");
 
       # The client should be also able to connect via the NAT router.
-      $router->waitForJob("nat");
-      $client->waitForJob("network.target");
+      $router->waitForUnit("nat");
+      $client->waitForUnit("network.target");
       $client->succeed("curl --fail http://server/ >&2");
       $client->succeed("ping -c 1 server >&2");
 
       # Test whether passive FTP works.
-      $server->waitForJob("vsftpd");
+      $server->waitForUnit("vsftpd");
       $server->succeed("echo Hello World > /home/ftp/foo.txt");
       $client->succeed("curl -v ftp://server/foo.txt >&2");
 
diff --git a/tests/nfs.nix b/tests/nfs.nix
index d5b6fc0a692..7c10eec310c 100644
--- a/tests/nfs.nix
+++ b/tests/nfs.nix
@@ -34,16 +34,16 @@ in
 
   testScript =
     ''
-      $server->waitForJob("nfsd");
-      $server->waitForJob("network.target");
+      $server->waitForUnit("nfsd");
+      $server->waitForUnit("network.target");
 
       startAll;
 
-      $client1->waitForJob("data.mount");
+      $client1->waitForUnit("data.mount");
       $client1->succeed("echo bla > /data/foo");
       $server->succeed("test -e /data/foo");
 
-      $client2->waitForJob("data.mount");
+      $client2->waitForUnit("data.mount");
       $client2->succeed("echo bla > /data/bar");
       $server->succeed("test -e /data/bar");
 
@@ -67,7 +67,7 @@ in
       $client2->waitForFile("locked");
 
       # Test whether locks survive a reboot of the server.
-      $client1->waitForJob("data.mount");
+      $client1->waitForUnit("data.mount");
       $server->shutdown;
       $server->start;
       $client1->succeed("touch /data/xyzzy");
diff --git a/tests/openssh.nix b/tests/openssh.nix
index 734925989a3..16757cf9098 100644
--- a/tests/openssh.nix
+++ b/tests/openssh.nix
@@ -20,16 +20,16 @@
 
     my $key=`${pkgs.openssh}/bin/ssh-keygen -t dsa -f key -N ""`;
 
-    $server->waitForJob("sshd");
+    $server->waitForUnit("sshd");
 
-    $server->mustSucceed("mkdir -m 700 /root/.ssh");
+    $server->succeed("mkdir -m 700 /root/.ssh");
     $server->copyFileFromHost("key.pub", "/root/.ssh/authorized_keys");
 
-    $client->mustSucceed("mkdir -m 700 /root/.ssh");
+    $client->succeed("mkdir -m 700 /root/.ssh");
     $client->copyFileFromHost("key", "/root/.ssh/id_dsa");
-    $client->mustSucceed("chmod 600 /root/.ssh/id_dsa");
+    $client->succeed("chmod 600 /root/.ssh/id_dsa");
 
-    $client->waitForJob("network.target");
-    $client->mustSucceed("ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no server 'echo hello world' >&2");
+    $client->waitForUnit("network.target");
+    $client->succeed("ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no server 'echo hello world' >&2");
   '';
 }
diff --git a/tests/portmap.nix b/tests/portmap.nix
index 4ee4eb02890..0d2bf153685 100644
--- a/tests/portmap.nix
+++ b/tests/portmap.nix
@@ -11,7 +11,7 @@
     ''
        # The `portmap' service must be registered once for TCP and once for
        # UDP.
-       $machine->mustSucceed("test `rpcinfo -p | grep portmapper | wc -l` -eq 2");
+       $machine->succeed("test `rpcinfo -p | grep portmapper | wc -l` -eq 2");
     '';
 
 }
diff --git a/tests/proxy.nix b/tests/proxy.nix
index 323b548de74..3b79c16ea2c 100644
--- a/tests/proxy.nix
+++ b/tests/proxy.nix
@@ -62,33 +62,33 @@ in
     ''
       startAll;
 
-      $proxy->waitForJob("httpd");
-      $backend1->waitForJob("httpd");
-      $backend2->waitForJob("httpd");
+      $proxy->waitForUnit("httpd");
+      $backend1->waitForUnit("httpd");
+      $backend2->waitForUnit("httpd");
 
       # With the back-ends up, the proxy should work.
-      $client->mustSucceed("curl --fail http://proxy/");
+      $client->succeed("curl --fail http://proxy/");
 
-      $client->mustSucceed("curl --fail http://proxy/server-status");
+      $client->succeed("curl --fail http://proxy/server-status");
 
       # Block the first back-end.
       $backend1->block;
 
       # The proxy should still work.
-      $client->mustSucceed("curl --fail http://proxy/");
+      $client->succeed("curl --fail http://proxy/");
 
-      $client->mustSucceed("curl --fail http://proxy/");
+      $client->succeed("curl --fail http://proxy/");
 
       # Block the second back-end.
       $backend2->block;
 
       # Now the proxy should fail as well.
-      $client->mustFail("curl --fail http://proxy/");
+      $client->fail("curl --fail http://proxy/");
 
       # But if the second back-end comes back, the proxy should start
       # working again.
       $backend2->unblock;
-      $client->mustSucceed("curl --fail http://proxy/");
+      $client->succeed("curl --fail http://proxy/");
     '';
 
 }
diff --git a/tests/quake3.nix b/tests/quake3.nix
index 796c300423d..041cfdb29ae 100644
--- a/tests/quake3.nix
+++ b/tests/quake3.nix
@@ -45,7 +45,7 @@ rec {
     ''
       startAll;
 
-      $server->waitForJob("quake3-server");
+      $server->waitForUnit("quake3-server");
       $client1->waitForX;
       $client2->waitForX;
 
diff --git a/tests/subversion.nix b/tests/subversion.nix
index dc4fe9da470..309da90c5df 100644
--- a/tests/subversion.nix
+++ b/tests/subversion.nix
@@ -66,33 +66,33 @@ in
 
       $webserver->waitForOpenPort(80);
 
-      print STDERR $client->mustSucceed("svn --version");
+      print STDERR $client->succeed("svn --version");
 
-      print STDERR $client->mustSucceed("curl --fail http://webserver/");
+      print STDERR $client->succeed("curl --fail http://webserver/");
 
       # Create a new user through the web interface.
-      $client->mustSucceed("curl --fail -F username=alice -F fullname='Alice Lastname' -F address=alice\@example.org -F password=foobar -F password_again=foobar http://webserver/repoman/adduser");
+      $client->succeed("curl --fail -F username=alice -F fullname='Alice Lastname' -F address=alice\@example.org -F password=foobar -F password_again=foobar http://webserver/repoman/adduser");
 
       # Let Alice create a new repository.
-      $client->mustSucceed("curl --fail -u alice:foobar --form repo=xyzzy --form description=Xyzzy http://webserver/repoman/create");
+      $client->succeed("curl --fail -u alice:foobar --form repo=xyzzy --form description=Xyzzy http://webserver/repoman/create");
 
-      $client->mustSucceed("curl --fail http://webserver/") =~ /alice/ or die;
+      $client->succeed("curl --fail http://webserver/") =~ /alice/ or die;
 
       # Let Alice do a checkout.
       my $svnFlags = "--non-interactive --username alice --password foobar";
-      $client->mustSucceed("svn co $svnFlags http://webserver/repos/xyzzy wc");
-      $client->mustSucceed("echo hello > wc/world");
-      $client->mustSucceed("svn add wc/world");
-      $client->mustSucceed("svn ci $svnFlags -m 'Added world.' wc/world");
+      $client->succeed("svn co $svnFlags http://webserver/repos/xyzzy wc");
+      $client->succeed("echo hello > wc/world");
+      $client->succeed("svn add wc/world");
+      $client->succeed("svn ci $svnFlags -m 'Added world.' wc/world");
 
       # Create a new user on the server through the create-user.pl script.
       $webserver->execute("svn-server-create-user.pl bob bob\@example.org Bob");
-      $webserver->mustSucceed("svn-server-resetpw.pl bob fnord");
-      $client->mustSucceed("curl --fail http://webserver/") =~ /bob/ or die;
+      $webserver->succeed("svn-server-resetpw.pl bob fnord");
+      $client->succeed("curl --fail http://webserver/") =~ /bob/ or die;
 
       # Bob should not have access to the repo.
       my $svnFlagsBob = "--non-interactive --username bob --password fnord";
-      $client->mustFail("svn co $svnFlagsBob http://webserver/repos/xyzzy wc2");
+      $client->fail("svn co $svnFlagsBob http://webserver/repos/xyzzy wc2");
 
       # Bob should not be able change the ACLs of the repo.
       # !!! Repoman should really return a 403 here.
@@ -100,15 +100,15 @@ in
           =~ /not authorised/ or die;
 
       # Give Bob access.
-      $client->mustSucceed("curl --fail -u alice:foobar -F description=Xyzzy -F readers=alice,bob -F writers=alice -F watchers= -F tardirs= http://webserver/repoman/update/xyzzy");
+      $client->succeed("curl --fail -u alice:foobar -F description=Xyzzy -F readers=alice,bob -F writers=alice -F watchers= -F tardirs= http://webserver/repoman/update/xyzzy");
 
       # So now his checkout should succeed.
-      $client->mustSucceed("svn co $svnFlagsBob http://webserver/repos/xyzzy wc2");
+      $client->succeed("svn co $svnFlagsBob http://webserver/repos/xyzzy wc2");
 
       # Test ViewVC and WebSVN
-      $client->mustSucceed("curl --fail -u alice:foobar http://webserver/viewvc/xyzzy");
-      $client->mustSucceed("curl --fail -u alice:foobar http://webserver/websvn/xyzzy");
-      $client->mustSucceed("curl --fail -u alice:foobar http://webserver/repos-xml/xyzzy");
+      $client->succeed("curl --fail -u alice:foobar http://webserver/viewvc/xyzzy");
+      $client->succeed("curl --fail -u alice:foobar http://webserver/websvn/xyzzy");
+      $client->succeed("curl --fail -u alice:foobar http://webserver/repos-xml/xyzzy");
 
       # Stop Apache to gather all the coverage data.
       $webserver->stopJob("httpd");
diff --git a/tests/tomcat.nix b/tests/tomcat.nix
index 3fd99da413c..c25276aa424 100644
--- a/tests/tomcat.nix
+++ b/tests/tomcat.nix
@@ -23,9 +23,9 @@
   testScript = ''
     startAll;
 
-    $server->waitForJob("tomcat");
+    $server->waitForUnit("tomcat");
     $server->sleep(30); # Dirty, but it takes a while before Tomcat handles to requests properly
-    $client->waitForJob("network.target");
+    $client->waitForUnit("network.target");
     $client->succeed("curl --fail http://server/examples/servlets/servlet/HelloWorldExample");
     $client->succeed("curl --fail http://server/examples/jsp/jsp2/simpletag/hello.jsp");
   '';
diff --git a/tests/trac.nix b/tests/trac.nix
index a35058a1992..335d9473704 100644
--- a/tests/trac.nix
+++ b/tests/trac.nix
@@ -55,15 +55,15 @@
     ''
       startAll;
 
-      $postgresql->waitForJob("postgresql");
-      $postgresql->mustSucceed("createdb trac");
+      $postgresql->waitForUnit("postgresql");
+      $postgresql->succeed("createdb trac");
 
-      $webserver->mustSucceed("mkdir -p /repos/trac");
-      $webserver->mustSucceed("svnadmin create /repos/trac");
+      $webserver->succeed("mkdir -p /repos/trac");
+      $webserver->succeed("svnadmin create /repos/trac");
 
       $webserver->waitForFile("/var/trac");
-      $webserver->mustSucceed("mkdir -p /var/trac/projects/test");
-      $webserver->mustSucceed("PYTHONPATH=${pkgs.pythonPackages.psycopg2}/lib/${pkgs.python.libPrefix}/site-packages trac-admin /var/trac/projects/test initenv Test postgres://root\@postgresql/trac svn /repos/trac");
+      $webserver->succeed("mkdir -p /var/trac/projects/test");
+      $webserver->succeed("PYTHONPATH=${pkgs.pythonPackages.psycopg2}/lib/${pkgs.python.libPrefix}/site-packages trac-admin /var/trac/projects/test initenv Test postgres://root\@postgresql/trac svn /repos/trac");
 
       $client->waitForX;
       $client->execute("konqueror http://webserver/projects/test &");
-- 
GitLab


From b43e219aeb42266571797f980c4120ec8960ab1a Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 24 Oct 2012 19:01:27 +0200
Subject: [PATCH 4141/5331] modules/services/networking/ssh/sshd.nix: configure
 AddressFamily properly

Explicitly restrict sshd to use of IPv4 addresses if IPv6 support is not enabled.
---
 modules/services/networking/ssh/sshd.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/modules/services/networking/ssh/sshd.nix b/modules/services/networking/ssh/sshd.nix
index 90e0ea2f029..858261bd33e 100644
--- a/modules/services/networking/ssh/sshd.nix
+++ b/modules/services/networking/ssh/sshd.nix
@@ -368,6 +368,7 @@ in
 
         UsePAM ${if cfg.usePAM then "yes" else "no"}
 
+        AddressFamily ${if config.networking.enableIPv6 then "any" else "inet"}
         ${concatMapStrings (port: ''
           Port ${toString port}
         '') cfg.ports}
-- 
GitLab


From c76fc27afffb60e9a744d70a9caf1f2e6b47afea Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= <viric@viric.name>
Date: Mon, 1 Oct 2012 23:16:12 +0200
Subject: [PATCH 4142/5331] dnsmasq: Setting fixed order in DNS name
 resolution.

That fits better my setup; if anyone doesn't need this, we can write an option
for the fixed order queries.
---
 modules/services/networking/dnsmasq.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/services/networking/dnsmasq.nix b/modules/services/networking/dnsmasq.nix
index 389d5c22e82..0d786add881 100644
--- a/modules/services/networking/dnsmasq.nix
+++ b/modules/services/networking/dnsmasq.nix
@@ -49,7 +49,7 @@ in
 
         daemonType = "daemon";
 
-        exec = "${dnsmasq}/bin/dnsmasq -R ${serversParam}";
+        exec = "${dnsmasq}/bin/dnsmasq -R ${serversParam} -o";
       };
 
   };
-- 
GitLab


From 82d39c9ca4162d2d88a6a6596e5ca30acddad6ac Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= <viric@viric.name>
Date: Wed, 24 Oct 2012 21:49:10 +0200
Subject: [PATCH 4143/5331] Fixing stage1 about getting a shell with job
 control in case of error

It's a busybox faq:
http://www.busybox.net/FAQ.html#job_control
---
 modules/system/boot/stage-1-init.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/system/boot/stage-1-init.sh b/modules/system/boot/stage-1-init.sh
index 53d528fcd56..c6fc87bf32a 100644
--- a/modules/system/boot/stage-1-init.sh
+++ b/modules/system/boot/stage-1-init.sh
@@ -40,10 +40,10 @@ EOF
 
     case $reply in
         f)
-            exec setsid @shell@ < /dev/$console >/dev/$console 2>/dev/$console ;;
+            exec setsid @shell@ -c "@shell@ < /dev/$console >/dev/$console 2>/dev/$console" ;;
         i)
             echo "Starting interactive shell..."
-            setsid @shell@ < /dev/$console >/dev/$console 2>/dev/$console || fail
+            setsid @shell@ -c "@shell@ < /dev/$console >/dev/$console 2>/dev/$console" || fail
             ;;
         *)
             echo "Continuing...";;
-- 
GitLab


From b3c5d42b1d9881ac9d30aacf2f3a335b60146f48 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 26 Oct 2012 15:15:08 +0200
Subject: [PATCH 4144/5331] Don't create /var/log/upstart

---
 modules/system/activation/activation-script.nix | 3 +--
 modules/system/boot/stage-2-init.sh             | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/modules/system/activation/activation-script.nix b/modules/system/activation/activation-script.nix
index 41c3ced1bc2..8d9dcaa17c1 100644
--- a/modules/system/activation/activation-script.nix
+++ b/modules/system/activation/activation-script.nix
@@ -116,9 +116,8 @@ in
         # jobs.  Used to determine which jobs need to be restarted
         # when switching to a new configuration.
         mkdir -m 0700 -p /var/run/upstart-jobs
-        
+
         mkdir -m 0755 -p /var/log
-        mkdir -m 0755 -p /var/log/upstart
 
         touch /var/log/wtmp # must exist
         chmod 644 /var/log/wtmp
diff --git a/modules/system/boot/stage-2-init.sh b/modules/system/boot/stage-2-init.sh
index 8f1184a5eb3..5168028c119 100644
--- a/modules/system/boot/stage-2-init.sh
+++ b/modules/system/boot/stage-2-init.sh
@@ -101,7 +101,7 @@ mkdir -m 0700 -p /var/log/journal
 
 
 # Miscellaneous boot time cleanup.
-rm -rf /var/run /var/lock /var/log/upstart
+rm -rf /var/run /var/lock
 rm -f /etc/resolv.conf
 
 if test -n "@cleanTmpDir@"; then
-- 
GitLab


From 6705358edecde94b14f5bcd0b7ef78dc66daf3bf Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 26 Oct 2012 15:15:26 +0200
Subject: [PATCH 4145/5331] Convert Zabbix agent/server to systemd

Note all the crap systemd doesn't need :-)
---
 modules/services/monitoring/zabbix-agent.nix  | 39 ++++---------------
 modules/services/monitoring/zabbix-server.nix | 38 +++++-------------
 2 files changed, 17 insertions(+), 60 deletions(-)

diff --git a/modules/services/monitoring/zabbix-agent.nix b/modules/services/monitoring/zabbix-agent.nix
index ce8e1843d4c..e5e27bb0c9a 100644
--- a/modules/services/monitoring/zabbix-agent.nix
+++ b/modules/services/monitoring/zabbix-agent.nix
@@ -73,15 +73,12 @@ in
         description = "Zabbix daemon user";
       };
 
-    jobs.zabbix_agent =
-      { name = "zabbix-agent";
+    boot.systemd.services."zabbix-agent" =
+      { description = "Zabbix Agent";
 
-        description = "Zabbix agent daemon";
+        wantedBy = [ "multi-user.target" ];
 
-        startOn = "ip-up";
-        stopOn = "stopping network-interfaces";
-
-        path = [ pkgs.zabbix.agent ];
+        path = [ pkgs.nettools ];
 
         preStart =
           ''
@@ -89,30 +86,10 @@ in
             chown zabbix ${stateDir} ${logDir}
           '';
 
-        # Zabbix doesn't have an option not to daemonize, and doesn't
-        # daemonize in a way that allows Upstart to track it.  So to
-        # make sure that we notice when it goes down, we start Zabbix
-        # with an open connection to a fifo, with a `cat' on the other
-        # side.  If Zabbix dies, then `cat' will exit as well, so we
-        # just monitor `cat'.
-        script =
-          ''
-            export PATH=${pkgs.nettools}/bin:$PATH
-            rm -f ${stateDir}/dummy2
-            mkfifo ${stateDir}/dummy2
-            cat ${stateDir}/dummy2 &
-            pid=$!
-            zabbix_agentd --config ${configFile} 100>${stateDir}/dummy2
-            wait "$pid"
-          '';
-
-        postStop =
-          ''
-            pid=$(cat ${pidFile} 2> /dev/null || true)
-            (test -n "$pid" && kill "$pid") || true
-            # Wait until they're really gone.
-            while ${pkgs.procps}/bin/pgrep -u zabbix zabbix_agentd > /dev/null; do sleep 1; done
-          '';
+        serviceConfig.ExecStart = "@${pkgs.zabbix.agent}/sbin/zabbix_agentd zabbix_agentd --config ${configFile}";
+        serviceConfig.Type = "forking";
+        serviceConfig.Restart = "always";
+        serviceConfig.RestartSec = 2;
       };
 
     environment.systemPackages = [ pkgs.zabbix.agent ];
diff --git a/modules/services/monitoring/zabbix-server.nix b/modules/services/monitoring/zabbix-server.nix
index 57fc69b3270..085fb022c1c 100644
--- a/modules/services/monitoring/zabbix-server.nix
+++ b/modules/services/monitoring/zabbix-server.nix
@@ -73,12 +73,11 @@ in
         description = "Zabbix daemon user";
       };
 
-    jobs.zabbix_server =
-      { name = "zabbix-server";
+    boot.systemd.services."zabbix-server" =
+      { description = "Zabbix Server";
 
-        description = "Zabbix server daemon";
-
-        startOn = "filesystem";
+        wantedBy = [ "multi-user.target" ];
+        after = optional (cfg.dbServer == "localhost") "postgresql.service";
 
         preStart =
           ''
@@ -95,31 +94,12 @@ in
             fi
           '';
 
-        path = [ pkgs.nettools pkgs.zabbix.server ];
-
-        # Zabbix doesn't have an option not to daemonize, and doesn't
-        # daemonize in a way that allows Upstart to track it.  So to
-        # make sure that we notice when it goes down, we start Zabbix
-        # with an open connection to a fifo, with a `cat' on the other
-        # side.  If Zabbix dies, then `cat' will exit as well, so we
-        # just monitor `cat'.
-        script =
-          ''
-            rm -f ${stateDir}/dummy
-            mkfifo ${stateDir}/dummy
-            cat ${stateDir}/dummy &
-            pid=$!
-            zabbix_server --config ${configFile} 100>${stateDir}/dummy
-            wait "$pid"
-          '';
+        path = [ pkgs.nettools ];
 
-        postStop =
-          ''
-            pid=$(cat ${pidFile} 2> /dev/null || true)
-            (test -n "$pid" && kill "$pid") || true
-            # Wait until they're really gone.
-            while ${pkgs.procps}/bin/pkill -u zabbix zabbix_server; do true; done
-          '';
+        serviceConfig.ExecStart = "@${pkgs.zabbix.server}/sbin/zabbix_server zabbix_server --config ${configFile}";
+        serviceConfig.Type = "forking";
+        serviceConfig.Restart = "always";
+        serviceConfig.RestartSec = 2;
       };
 
   };
-- 
GitLab


From 23390147ea77f30fd4181a48eaca5fb4400bab74 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 26 Oct 2012 16:21:01 +0200
Subject: [PATCH 4146/5331] upstart.nix: Treat "daemon" as "forking"

---
 modules/system/upstart/upstart.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/system/upstart/upstart.nix b/modules/system/upstart/upstart.nix
index 33f2775b496..cfde1cc0753 100644
--- a/modules/system/upstart/upstart.nix
+++ b/modules/system/upstart/upstart.nix
@@ -90,7 +90,7 @@ let
         // optionalAttrs (job.postStop != "")
           { ExecStopPost = postStopScript; }
         // (if job.script == "" && job.exec == "" then { Type = "oneshot"; RemainAfterExit = true; } else
-            if job.daemonType == "fork" then { Type = "forking"; GuessMainPID = true; } else
+            if job.daemonType == "fork" || job.daemonType == "daemon" then { Type = "forking"; GuessMainPID = true; } else
             if job.daemonType == "none" then { } else
             throw "invalid daemon type `${job.daemonType}'")
         // optionalAttrs (!job.task && job.respawn)
-- 
GitLab


From 65eae4dd34a397237885f7239432297e3ddcd9dc Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 26 Oct 2012 16:21:35 +0200
Subject: [PATCH 4147/5331] Update libvirt for systemd

---
 modules/virtualisation/libvirtd.nix | 38 +++++++++++------------------
 1 file changed, 14 insertions(+), 24 deletions(-)

diff --git a/modules/virtualisation/libvirtd.nix b/modules/virtualisation/libvirtd.nix
index 66bbb757c70..89c4512095d 100644
--- a/modules/virtualisation/libvirtd.nix
+++ b/modules/virtualisation/libvirtd.nix
@@ -49,11 +49,11 @@ in
 
     boot.kernelModules = [ "tun" ];
 
-    jobs.libvirtd =
-      { description = "Libvirtd virtual machine management daemon";
+    boot.systemd.services.libvirtd =
+      { description = "Libvirt Virtual Machine Management Daemon";
 
-        startOn = "stopped udevtrigger";
-        stopOn = "";
+        wantedBy = [ "multi-user.target" ];
+        after = [ "systemd-udev-settle.service" ];
 
         path =
           [ pkgs.bridge_utils pkgs.dmidecode pkgs.dnsmasq
@@ -83,7 +83,9 @@ in
             done
           ''; # */
 
-        exec = "${pkgs.libvirt}/sbin/libvirtd --daemon --verbose";
+        serviceConfig.ExecStart = "@${pkgs.libvirt}/sbin/libvirtd libvirtd --daemon --verbose";
+        serviceConfig.Type = "forking";
+        serviceConfig.KillMode = "process"; # when stopping, leave the VMs alone
 
         # Wait until libvirtd is ready to accept requests.
         postStart =
@@ -94,18 +96,17 @@ in
             done
             exit 1 # !!! seems to be ignored
           '';
-
-        daemonType = "daemon";
       };
 
-    # !!! Split this into save and restore tasks.
     jobs."libvirt-guests" =
-      { description = "Job to save/restore libvirtd VMs";
+      { description = "Libvirt Virtual Machines";
 
-        startOn = "started libvirtd";
+        wantedBy = [ "multi-user.target" ];
+        wants = [ "libvirtd.service" ];
+        after = [ "libvirtd.service" ];
 
         # We want to suspend VMs only on shutdown, but Upstart is broken.
-        stopOn = "";
+        #stopOn = "";
 
         restartIfChanged = false;
 
@@ -119,19 +120,8 @@ in
 
         postStop = "${pkgs.libvirt}/etc/rc.d/init.d/libvirt-guests stop";
 
-        respawn = false;
-      };
-
-    jobs."stop-libvirt" =
-      { description = "Helper task to stop libvirtd and libvirt-guests on shutdown";
-        task = true;
-        restartIfChanged = false;
-        startOn = "starting shutdown";
-        script =
-          ''
-            stop libvirt-guests || true
-            stop libvirtd || true
-          '';
+        serviceConfig.Type = "oneshot";
+        serviceConfig.RemainAfterExit = true;
       };
 
   };
-- 
GitLab


From 390f5f7376cad5551f99963bfca1159712e81501 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 26 Oct 2012 19:36:59 +0200
Subject: [PATCH 4148/5331] Remove the cgroups module

Cgroups are handled by systemd now.  Systemd's cgroup support does not
do all the things that cgrulesengd does, but they're likely to
interact poorly with each other.
---
 modules/module-list.nix             |   1 -
 modules/services/system/cgroups.nix | 146 ----------------------------
 2 files changed, 147 deletions(-)
 delete mode 100644 modules/services/system/cgroups.nix

diff --git a/modules/module-list.nix b/modules/module-list.nix
index 06c9f8efca7..1f25f2aa1e0 100644
--- a/modules/module-list.nix
+++ b/modules/module-list.nix
@@ -160,7 +160,6 @@
   ./services/security/frandom.nix
   ./services/security/tor.nix
   ./services/security/torsocks.nix
-  ./services/system/cgroups.nix
   ./services/system/dbus.nix
   ./services/system/kerberos.nix
   ./services/system/nscd.nix
diff --git a/modules/services/system/cgroups.nix b/modules/services/system/cgroups.nix
deleted file mode 100644
index 5d5777909e9..00000000000
--- a/modules/services/system/cgroups.nix
+++ /dev/null
@@ -1,146 +0,0 @@
-{ config, pkgs, ... }:
-
-with pkgs.lib;
-
-let
-
-  cfg = config.services.cgroups;
-
-  cgconfigConf = pkgs.writeText "cgconfig.conf" cfg.groups;
-
-  cgrulesConf = pkgs.writeText "cgrules.conf" cfg.rules;
-
-in
-
-{
-
-  ###### interface
-
-  options = {
-
-    services.cgroups.enable = mkOption {
-      type = types.bool;
-      default = false;
-      description = ''
-        Whether to enable support for control groups, a Linux kernel
-        feature for resource management.  It allows you to assign
-        processes to groups that share certain resource limits (e.g.,
-        CPU or memory).  The <command>cgrulesengd</command> daemon
-        automatically assigns processes to the right cgroup depending
-        on the rules defined in
-        <option>services.cgroups.rules</option>.
-      '';
-    };
-
-    services.cgroups.groups = mkOption {
-      type = types.string;
-      default =
-        ''
-          mount {
-            cpu = /sys/fs/cgroup/cpu;
-          }
-        '';
-      example =
-        ''
-          mount {
-            cpu = /sys/fs/cgroup/cpu;
-            cpuacct = /sys/fs/cgroup/cpuacct;
-          }
-
-          # Create a "www" cgroup with a lower share of the CPU (the
-          # default is 1024).
-          group www {
-            cpu {
-              cpu.shares = "500";
-            }
-          }
-        '';
-      description = ''
-        The contents of the <filename>cgconfig.conf</filename>
-        configuration file, which defines the cgroups.
-      '';
-    };
-
-    services.cgroups.rules = mkOption {
-      type = types.string;
-      default = "";
-      example =
-        ''
-          # All processes executed by the "wwwrun" uid should be
-          # assigned to the "www" CPU cgroup.
-          wwwrun cpu www
-        '';
-      description = ''
-        The contents of the <filename>cgrules.conf</filename>
-        configuration file, which determines to which cgroups
-        processes should be assigned by the
-        <command>cgrulesengd</command> daemon.
-      '';
-    };
-
-  };
-
-  
-  ###### implementation
-
-  config = mkIf cfg.enable {
-
-    environment.systemPackages = [ pkgs.libcgroup ];
-
-    environment.etc =
-      [ { source = cgconfigConf;
-          target = "cgconfig.conf";
-        }
-        { source = cgrulesConf;
-          target = "cgrules.conf";
-        }
-      ];
-
-    # The daemon requires the userspace<->kernelspace netlink
-    # connector.
-    boot.kernelModules = [ "cn" ];
-    
-    jobs.cgroups =
-      { startOn = "startup";
-
-        description = "Control groups daemon";
-
-        path = [ pkgs.libcgroup pkgs.procps pkgs.utillinux ];
-      
-        preStart =
-          ''
-            if [ -d /sys/fs/cgroup ]; then
-              if ! mountpoint -q /sys/fs/cgroup; then
-                mount -t tmpfs -o mode=755 /dev/cgroup /sys/fs/cgroup
-              fi
-            fi
-          
-            cgclear || true
-
-            # Mount the cgroup hierarchies.  Note: we refer to the
-            # store path of cgconfig.conf here to ensure that the job
-            # gets reloaded if the configuration changes.
-            cgconfigparser -l ${cgconfigConf}
-
-            # Move existing processes to the right cgroup.
-            cgclassify --cancel-sticky $(ps --no-headers -eL o tid) || true
-
-            # Force a restart if the rules change:
-            # ${cgrulesConf}
-          '';
-
-        # Run the daemon that moves new processes to the right cgroup.
-        exec = "cgrulesengd";
-
-        daemonType = "fork";
-
-        postStop =
-          ''
-            cgclear
-          '';
-      };
-      
-
-  };
-
-}
-- 
GitLab


From ae861c8e336cb7b4e1bb696e95be35c8835c81e4 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 29 Oct 2012 12:44:38 +0100
Subject: [PATCH 4149/5331] Undo accidental commit

---
 modules/services/printing/cupsd.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/services/printing/cupsd.nix b/modules/services/printing/cupsd.nix
index 1e532f578a2..6d31c0050aa 100644
--- a/modules/services/printing/cupsd.nix
+++ b/modules/services/printing/cupsd.nix
@@ -138,7 +138,7 @@ in
       };
 
     services.printing.drivers =
-      [ pkgs.cups /* pkgs.cups_pdf_filter */ pkgs.ghostscript additionalBackends pkgs.perl pkgs.coreutils pkgs.gnused ];
+      [ pkgs.cups pkgs.cups_pdf_filter pkgs.ghostscript additionalBackends pkgs.perl pkgs.coreutils pkgs.gnused ];
 
     services.printing.cupsdConf =
       ''
-- 
GitLab


From cd372c62eabe6cefebbe74bc25f5b91775b7357c Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 24 Oct 2012 19:01:27 +0200
Subject: [PATCH 4150/5331] modules/services/networking/ssh/sshd.nix: configure
 AddressFamily properly

Explicitly restrict sshd to use of IPv4 addresses if IPv6 support is not enabled.
---
 modules/services/networking/ssh/sshd.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/modules/services/networking/ssh/sshd.nix b/modules/services/networking/ssh/sshd.nix
index ea60e591c14..830559f3e9d 100644
--- a/modules/services/networking/ssh/sshd.nix
+++ b/modules/services/networking/ssh/sshd.nix
@@ -356,6 +356,7 @@ in
 
         UsePAM ${if cfg.usePAM then "yes" else "no"}
 
+        AddressFamily ${if config.networking.enableIPv6 then "any" else "inet"}
         ${concatMapStrings (port: ''
           Port ${toString port}
         '') cfg.ports}
-- 
GitLab


From 9c74f9a51ba8dbd27de4d36453950997ff551dec Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 29 Oct 2012 17:10:17 +0100
Subject: [PATCH 4151/5331] modules/programs/ssh.nix: configure AddressFamily
 properly

Explicitly restrict ssh clients to use of IPv4 addresses if IPv6 support is not enabled.
---
 modules/programs/ssh.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/modules/programs/ssh.nix b/modules/programs/ssh.nix
index 5c4b8c3a9a1..123ef3c0256 100644
--- a/modules/programs/ssh.nix
+++ b/modules/programs/ssh.nix
@@ -42,6 +42,7 @@ in
       [ { # SSH configuration.  Slight duplication of the sshd_config
           # generation in the sshd service.
           source = pkgs.writeText "ssh_config" ''
+            AddressFamily ${if config.networking.enableIPv6 then "any" else "inet"}
             ${optionalString cfg.setXAuthLocation ''
               XAuthLocation ${pkgs.xorg.xauth}/bin/xauth
             ''}
-- 
GitLab


From 307644e3b0987cd747fa7869a3f26dfabd642b15 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 29 Oct 2012 17:10:37 +0100
Subject: [PATCH 4152/5331] modules/programs/ssh.nix: simplify expression that
 generates 'ForwardX11' entry

---
 modules/programs/ssh.nix | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/modules/programs/ssh.nix b/modules/programs/ssh.nix
index 123ef3c0256..5bbe3a00016 100644
--- a/modules/programs/ssh.nix
+++ b/modules/programs/ssh.nix
@@ -46,11 +46,7 @@ in
             ${optionalString cfg.setXAuthLocation ''
               XAuthLocation ${pkgs.xorg.xauth}/bin/xauth
             ''}
-            ${if cfg.forwardX11 then ''
-              ForwardX11 yes
-            '' else ''
-              ForwardX11 no
-            ''}
+            ForwardX11 ${if cfg.forwardX11 then "yes" else "no"}
           '';
           target = "ssh/ssh_config";
         }
-- 
GitLab


From b1fefb8834f94132106423298079ff66775c1278 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 29 Oct 2012 17:10:46 +0100
Subject: [PATCH 4153/5331] modules/programs/ssh.nix: strip trailing whitespace

---
 modules/programs/ssh.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/programs/ssh.nix b/modules/programs/ssh.nix
index 5bbe3a00016..fc9ba9a9280 100644
--- a/modules/programs/ssh.nix
+++ b/modules/programs/ssh.nix
@@ -34,7 +34,7 @@ in
     };
   };
 
-  assertions = [{ assertion = if cfg.forwardX11 then cfg.setXAuthLocation else true; 
+  assertions = [{ assertion = if cfg.forwardX11 then cfg.setXAuthLocation else true;
                   message = "cannot enable X11 forwarding without setting xauth location";}];
 
   config = {
-- 
GitLab


From 47648483141c16efb9887d8af27871cee20d25ad Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 29 Oct 2012 20:29:25 +0100
Subject: [PATCH 4154/5331] Remove some obsolete options

---
 modules/services/ttys/agetty.nix   | 22 ----------------------
 modules/tasks/filesystems.nix      | 10 ----------
 modules/virtualisation/qemu-vm.nix |  2 --
 3 files changed, 34 deletions(-)

diff --git a/modules/services/ttys/agetty.nix b/modules/services/ttys/agetty.nix
index f79962c1365..444d04564a9 100644
--- a/modules/services/ttys/agetty.nix
+++ b/modules/services/ttys/agetty.nix
@@ -10,28 +10,6 @@ with pkgs.lib;
 
     services.mingetty = {
 
-      # FIXME
-      ttys = mkOption {
-        default =
-          if pkgs.stdenv.isArm
-          then [ "ttyS0" ] # presumably an embedded platform such as a plug
-          else [ "tty1" "tty2" "tty3" "tty4" "tty5" "tty6" ];
-        description = ''
-          The list of tty devices on which to start a login prompt.
-        '';
-      };
-
-      # FIXME: not implemented with systemd
-      waitOnMounts = mkOption {
-        default = false;
-        description = ''
-          Whether the login prompts on the virtual consoles will be
-          started before or after all file systems have been mounted.  By
-          default we don't wait, but if for example your /home is on a
-          separate partition, you may want to turn this on.
-        '';
-      };
-
       greetingLine = mkOption {
         default = ''<<< Welcome to NixOS ${config.system.nixosVersion} (\m) - \l >>>'';
         description = ''
diff --git a/modules/tasks/filesystems.nix b/modules/tasks/filesystems.nix
index 77a43ed15db..774021d0d86 100644
--- a/modules/tasks/filesystems.nix
+++ b/modules/tasks/filesystems.nix
@@ -145,16 +145,6 @@ in
       description = "Names of supported filesystem types in the initial ramdisk.";
     };
 
-    boot.ttyEmergency = mkOption {
-      default =
-        if pkgs.stdenv.isArm
-          then "ttyS0" # presumably an embedded platform such as a plug
-        else "tty1";
-      description = ''
-        The tty that will be stopped in case an emergency shell is spawned
-        at boot.
-        '';
-    };
   };
 
 
diff --git a/modules/virtualisation/qemu-vm.nix b/modules/virtualisation/qemu-vm.nix
index ec11f3604e7..e3927442821 100644
--- a/modules/virtualisation/qemu-vm.nix
+++ b/modules/virtualisation/qemu-vm.nix
@@ -396,8 +396,6 @@ in
       VertRefresh 50-160
     '';
 
-  services.mingetty.ttys = ttys ++ optional (!cfg.graphics) "ttyS0";
-
   # Wireless won't work in the VM.
   networking.wireless.enable = mkOverride 50 false;
 
-- 
GitLab


From 1a82024dd868970143a85e3148d3504dfd8dce61 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 29 Oct 2012 21:01:36 +0100
Subject: [PATCH 4155/5331] In the tests, don't start agetty on /dev/ttyS0

Running agetty on ttyS0 interferes with the backdoor, which uses ttyS0
as its standard error.  After agetty starts, writes to the stderr file
descriptor will return EIO (though doing "exec 2>/proc/self/fd/2" will
miracuously fix this).

http://hydra.nixos.org/build/3252782
---
 modules/system/boot/systemd-unit-options.nix | 11 +++++++++
 modules/system/boot/systemd.nix              | 25 ++++++++++++++++----
 modules/testing/test-instrumentation.nix     | 12 ++++++----
 tests/nat.nix                                |  3 ++-
 4 files changed, 42 insertions(+), 9 deletions(-)

diff --git a/modules/system/boot/systemd-unit-options.nix b/modules/system/boot/systemd-unit-options.nix
index 239c837c676..5707fb6f87e 100644
--- a/modules/system/boot/systemd-unit-options.nix
+++ b/modules/system/boot/systemd-unit-options.nix
@@ -6,6 +6,17 @@ rec {
 
   unitOptions = {
 
+    enable = mkOption {
+      default = true;
+      types = types.bool;
+      description = ''
+        If set to false, this unit will be a symlink to
+        /dev/null. This is primarily useful to prevent specific
+        template instances (e.g. <literal>serial-getty@ttyS0</literal>)
+        from being started.
+      '';
+    };
+
     description = mkOption {
       default = "";
       types = types.uniq types.string;
diff --git a/modules/system/boot/systemd.nix b/modules/system/boot/systemd.nix
index dc0c2ba4504..aa0b679ea2f 100644
--- a/modules/system/boot/systemd.nix
+++ b/modules/system/boot/systemd.nix
@@ -10,7 +10,14 @@ let
   systemd = pkgs.systemd;
 
   makeUnit = name: unit:
-    pkgs.writeTextFile { name = "unit"; inherit (unit) text; destination = "/${name}"; };
+    pkgs.runCommand "unit" { inherit (unit) text; }
+      (if unit.enable then  ''
+        mkdir -p $out
+        echo -n "$text" > $out/${name}
+      '' else ''
+        mkdir -p $out
+        ln -s /dev/null $out/${name}
+      '');
 
   upstreamUnits =
     [ # Targets.
@@ -205,7 +212,7 @@ let
         as));
 
   targetToUnit = name: def:
-    { inherit (def) wantedBy;
+    { inherit (def) wantedBy enable;
       text =
         ''
           [Unit]
@@ -214,7 +221,7 @@ let
     };
 
   serviceToUnit = name: def:
-    { inherit (def) wantedBy;
+    { inherit (def) wantedBy enable;
       text =
         ''
           [Unit]
@@ -258,7 +265,7 @@ let
     };
 
   socketToUnit = name: def:
-    { inherit (def) wantedBy;
+    { inherit (def) wantedBy enable;
       text =
         ''
           [Unit]
@@ -333,6 +340,16 @@ in
           types = types.uniq types.string;
           description = "Text of this systemd unit.";
         };
+        enable = mkOption {
+          default = true;
+          types = types.bool;
+          description = ''
+            If set to false, this unit will be a symlink to
+            /dev/null. This is primarily useful to prevent specific
+            template instances (e.g. <literal>serial-getty@ttyS0</literal>)
+            from being started.
+          '';
+        };
         wantedBy = mkOption {
           default = [];
           types = types.listOf types.string;
diff --git a/modules/testing/test-instrumentation.nix b/modules/testing/test-instrumentation.nix
index efce3153c88..222a10a0043 100644
--- a/modules/testing/test-instrumentation.nix
+++ b/modules/testing/test-instrumentation.nix
@@ -13,9 +13,8 @@ let kernel = config.boot.kernelPackages.kernel; in
 
     boot.systemd.services.backdoor =
       { wantedBy = [ "multi-user.target" ];
-        requires = [ "dev-hvc0.device" ];
-        after = [ "dev-hvc0.device" ];
-
+        requires = [ "dev-hvc0.device" "dev-ttyS0.device" ];
+        after = [ "dev-hvc0.device" "dev-ttyS0.device" ];
         script =
           ''
             export USER=root
@@ -27,10 +26,15 @@ let kernel = config.boot.kernelPackages.kernel; in
             echo "connecting to host..." >&2
             stty -F /dev/hvc0 raw -echo # prevent nl -> cr/nl conversion
             echo
-            PS1= /bin/sh
+            PS1= exec /bin/sh
           '';
       };
 
+    # Prevent agetty from being instantiated on ttyS0, since it
+    # interferes with the backdoor (writes to ttyS0 will randomly fail
+    # with EIO).
+    boot.systemd.services."serial-getty@ttyS0".enable = false;
+
     boot.initrd.postDeviceCommands =
       ''
         # Using acpi_pm as a clock source causes the guest clock to
diff --git a/tests/nat.nix b/tests/nat.nix
index e2f01e71b26..7b03739a9bc 100644
--- a/tests/nat.nix
+++ b/tests/nat.nix
@@ -40,6 +40,7 @@
       startAll;
 
       # The router should have access to the server.
+      $server->waitForUnit("network.target");
       $server->waitForUnit("httpd");
       $router->waitForUnit("network.target");
       $router->succeed("curl --fail http://server/ >&2");
@@ -68,7 +69,7 @@
       $client->fail("ping -c 1 server >&2");
 
       # And make sure that restarting the NAT job works.
-      $router->succeed("start nat");
+      $router->succeed("systemctl start nat");
       $client->succeed("curl --fail http://server/ >&2");
       $client->succeed("ping -c 1 server >&2");
     '';
-- 
GitLab


From 88a9d7a9ca476ba8d686a6e7427d0f176ebf13b1 Mon Sep 17 00:00:00 2001
From: Rob Vermaas <rob.vermaas@gmail.com>
Date: Tue, 30 Oct 2012 13:33:37 +0100
Subject: [PATCH 4156/5331] Added environment.promptInit to allow PS1
 overriding. Would be nicer to be able to allow overriding via shellInit,
 however could not get that to work. For now this is a temporary solution
 which will not break anything.

---
 modules/programs/bash/bash.nix  | 18 +++++++++++++++++-
 modules/programs/bash/bashrc.sh |  9 +--------
 2 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/modules/programs/bash/bash.nix b/modules/programs/bash/bash.nix
index 441d30f1e9f..135d99ec437 100644
--- a/modules/programs/bash/bash.nix
+++ b/modules/programs/bash/bash.nix
@@ -25,9 +25,24 @@ let
     fi
   '';
 
-
   options = {
 
+    environment.promptInit =  mkOption {
+        default = ''
+          # Provide a nice prompt.
+          PROMPT_COLOR="1;31m"
+          let $UID && PROMPT_COLOR="1;32m"
+          PS1="\n\[\033[$PROMPT_COLOR\][\u@\h:\w]\\$\[\033[0m\] "
+          if test "$TERM" = "xterm"; then
+            PS1="\[\033]2;\h:\u:\w\007\]$PS1"
+          fi
+        '';
+        description = "
+          Script used to initialized shell prompt.
+        ";
+        type = with pkgs.lib.types; string;
+      };
+
     environment.shellInit = mkOption {
         default = "";
         example = ''export PATH=/godi/bin/:$PATH'';
@@ -65,6 +80,7 @@ in
         # configured properly.
          source = pkgs.substituteAll {
            src = ./bashrc.sh;
+           inherit (config.environment) promptInit;
            inherit initBashCompletion;
          };
          target = "bashrc";
diff --git a/modules/programs/bash/bashrc.sh b/modules/programs/bash/bashrc.sh
index 10a36ede2a3..3542b5f9fd4 100644
--- a/modules/programs/bash/bashrc.sh
+++ b/modules/programs/bash/bashrc.sh
@@ -19,14 +19,7 @@ if [ -z "$PS1" ]; then return; fi
 # Check the window size after every command.
 shopt -s checkwinsize
 
-# Provide a nice prompt.
-PROMPT_COLOR="1;31m"
-let $UID && PROMPT_COLOR="1;32m"
-PS1="\n\[\033[$PROMPT_COLOR\][\u@\h:\w]\\$\[\033[0m\] "
-if test "$TERM" = "xterm"; then
-    PS1="\[\033]2;\h:\u:\w\007\]$PS1"
-fi
-
+@promptInit@
 @initBashCompletion@
 
 # Some aliases.
-- 
GitLab


From 4143ff228055022289b837a42ac50ccbff0d18c4 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 30 Oct 2012 13:52:12 +0100
Subject: [PATCH 4157/5331] In headless deployments, don't start agetty on the
 console

---
 modules/profiles/headless.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/modules/profiles/headless.nix b/modules/profiles/headless.nix
index ac0c4059634..3446654bc6f 100644
--- a/modules/profiles/headless.nix
+++ b/modules/profiles/headless.nix
@@ -10,7 +10,10 @@ with pkgs.lib;
   boot.vesa = false;
   boot.initrd.enableSplashScreen = false;
   services.ttyBackgrounds.enable = false;
-  services.mingetty.ttys = [ ];
+
+  # Don't start a tty on the serial consoles.
+  boot.systemd.services."serial-getty@ttyS0".enable = false;
+  boot.systemd.services."serial-getty@hvc0".enable = false;
 
   # Since we can't manually respond to a panic, just reboot.
   boot.kernelParams = [ "panic=1" "stage1panic=1" ];
-- 
GitLab


From 2b19856f40917b6a14f9f03aed7f2ae92ffdf99a Mon Sep 17 00:00:00 2001
From: Rob Vermaas <rob.vermaas@gmail.com>
Date: Tue, 30 Oct 2012 14:09:30 +0100
Subject: [PATCH 4158/5331] Logstash: do not always log to stdout

---
 modules/services/logging/logstash.nix | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/modules/services/logging/logstash.nix b/modules/services/logging/logstash.nix
index f4c226ac349..641520ad98d 100644
--- a/modules/services/logging/logstash.nix
+++ b/modules/services/logging/logstash.nix
@@ -136,9 +136,6 @@ in
       mkNameValuePairs = mergeConfigs;
     };
   } ( mkIf cfg.enable {
-    # Always log to stdout
-    services.logstash.outputConfig = { stdout = {}; };
-
     jobs.logstash = with pkgs; {
       description = "Logstash daemon";
       startOn = "started networking and filesystem";
-- 
GitLab


From 631fce3c6f46a3fbc8ed69e01cb45a3197f220cd Mon Sep 17 00:00:00 2001
From: Rob Vermaas <rob.vermaas@gmail.com>
Date: Tue, 30 Oct 2012 14:18:51 +0100
Subject: [PATCH 4159/5331] Logstash: pass TZ, redirect log output to prevent
 recursion when using syslogd.

---
 modules/services/logging/logstash.nix | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/modules/services/logging/logstash.nix b/modules/services/logging/logstash.nix
index 641520ad98d..2f6c6dba943 100644
--- a/modules/services/logging/logstash.nix
+++ b/modules/services/logging/logstash.nix
@@ -136,13 +136,15 @@ in
       mkNameValuePairs = mergeConfigs;
     };
   } ( mkIf cfg.enable {
-    jobs.logstash = with pkgs; {
+    boot.systemd.services.logstash = with pkgs; {
       description = "Logstash daemon";
-      startOn = "started networking and filesystem";
+
+      wantedBy = [ "multi-user.target" ];
+      environment.TZ = config.time.timeZone;
 
       path = [ jre ];
 
-      script = "cd /tmp && exec java -jar ${logstash} agent -f ${writeText "logstash.conf" ''
+      script = "cd /tmp && exec java -jar ${logstash} agent -f ${writeText "logstash.conf" &> /var/log/logstash.log ''
         input {
           ${exprToConfig cfg.inputConfig}
         }
-- 
GitLab


From 8caceffae8b09d07b88ef1fb9e3f47235b2ff524 Mon Sep 17 00:00:00 2001
From: Rob Vermaas <rob.vermaas@gmail.com>
Date: Tue, 30 Oct 2012 14:22:14 +0100
Subject: [PATCH 4160/5331] Logstash: fix typo, should have tested.

---
 modules/services/logging/logstash.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/services/logging/logstash.nix b/modules/services/logging/logstash.nix
index 2f6c6dba943..bc44620d644 100644
--- a/modules/services/logging/logstash.nix
+++ b/modules/services/logging/logstash.nix
@@ -144,7 +144,7 @@ in
 
       path = [ jre ];
 
-      script = "cd /tmp && exec java -jar ${logstash} agent -f ${writeText "logstash.conf" &> /var/log/logstash.log ''
+      script = "cd /tmp && exec java -jar ${logstash} agent -f ${writeText "logstash.conf" ''
         input {
           ${exprToConfig cfg.inputConfig}
         }
@@ -156,7 +156,7 @@ in
         output {
           ${exprToConfig cfg.outputConfig}
         }
-      ''}";
+      ''} &> /var/log/logstash.log";
     };
   })];
 }
-- 
GitLab


From 7a76bcd72aa078680e8890269d7d29603b250988 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 30 Oct 2012 14:39:00 +0100
Subject: [PATCH 4161/5331] Fix the installer test

http://hydra.nixos.org/build/3253038
---
 tests/installer.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/installer.nix b/tests/installer.nix
index 7e63454dd70..7952e295794 100644
--- a/tests/installer.nix
+++ b/tests/installer.nix
@@ -120,7 +120,7 @@ let
 
       # Make sure that we get a login prompt etc.
       $machine->succeed("echo hello");
-      $machine->waitForUnit("tty1");
+      $machine->waitForUnit('getty@tty2');
       $machine->waitForUnit("rogue");
       $machine->waitForUnit("nixos-manual");
       $machine->waitForUnit("dhcpcd");
-- 
GitLab


From bcdc71ddaed97c2b7e627c7c9d601c262bce9e4e Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 30 Oct 2012 16:42:05 +0100
Subject: [PATCH 4162/5331] Kill the backdoor more forcefully

Otherwise it hangs until the 90 second timeout expires.

http://hydra.nixos.org/build/3253068
---
 modules/testing/test-instrumentation.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/modules/testing/test-instrumentation.nix b/modules/testing/test-instrumentation.nix
index 222a10a0043..c6c95e63af1 100644
--- a/modules/testing/test-instrumentation.nix
+++ b/modules/testing/test-instrumentation.nix
@@ -28,6 +28,7 @@ let kernel = config.boot.kernelPackages.kernel; in
             echo
             PS1= exec /bin/sh
           '';
+        serviceConfig.KillSignal = "SIGHUP";
       };
 
     # Prevent agetty from being instantiated on ttyS0, since it
-- 
GitLab


From e5d4524dda10b50f42c0c3350567170dcd67f3aa Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 30 Oct 2012 17:01:21 +0100
Subject: [PATCH 4163/5331] Test driver: Don't wait for a reply after issuing
 "poweroff"

---
 lib/test-driver/Machine.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/test-driver/Machine.pm b/lib/test-driver/Machine.pm
index d376bd404b9..1f7533f22f8 100644
--- a/lib/test-driver/Machine.pm
+++ b/lib/test-driver/Machine.pm
@@ -434,7 +434,7 @@ sub shutdown {
     my ($self) = @_;
     return unless $self->{booted};
 
-    $self->execute("poweroff");
+    print { $self->{socket} } ("poweroff\n");
 
     $self->waitForShutdown;
 }
-- 
GitLab


From 1da362b34b0dbe3245273a56a3152230484089b0 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 30 Oct 2012 17:27:14 +0100
Subject: [PATCH 4164/5331] Fix coverage data collection

http://hydra.nixos.org/build/3253046
---
 modules/system/boot/systemd.nix          | 12 +++++++++++-
 modules/system/upstart/upstart.nix       | 11 +----------
 modules/testing/test-instrumentation.nix |  6 +-----
 3 files changed, 13 insertions(+), 16 deletions(-)

diff --git a/modules/system/boot/systemd.nix b/modules/system/boot/systemd.nix
index aa0b679ea2f..2413509790d 100644
--- a/modules/system/boot/systemd.nix
+++ b/modules/system/boot/systemd.nix
@@ -229,7 +229,8 @@ let
 
           [Service]
           Environment=PATH=${def.path}
-          ${concatMapStrings (n: "Environment=${n}=${getAttr n def.environment}\n") (attrNames def.environment)}
+          ${let env = cfg.globalEnvironment // def.environment;
+            in concatMapStrings (n: "Environment=${n}=${getAttr n env}\n") (attrNames env)}
           ${optionalString (!def.restartIfChanged) "X-RestartIfChanged=false"}
 
           ${optionalString (def.preStart != "") ''
@@ -391,6 +392,15 @@ in
       description = "Default unit started when the system boots.";
     };
 
+    boot.systemd.globalEnvironment = mkOption {
+      type = types.attrs;
+      default = {};
+      example = { TZ = "CET"; };
+      description = ''
+        Environment variables passed to <emphasis>all</emphasis> systemd units.
+      '';
+    };
+
     services.journald.console = mkOption {
       default = "";
       type = types.uniq types.string;
diff --git a/modules/system/upstart/upstart.nix b/modules/system/upstart/upstart.nix
index cfde1cc0753..44e6e8bb63b 100644
--- a/modules/system/upstart/upstart.nix
+++ b/modules/system/upstart/upstart.nix
@@ -19,7 +19,7 @@ let
     let
       hasMain = job.script != "" || job.exec != "";
 
-      env = config.system.upstartEnvironment // job.environment;
+      env = job.environment;
 
       preStartScript = makeJobScript "${job.name}-pre-start"
         ''
@@ -270,15 +270,6 @@ in
       options = [ jobOptions upstartJob ];
     };
 
-    system.upstartEnvironment = mkOption {
-      type = types.attrs;
-      default = {};
-      example = { TZ = "CET"; };
-      description = ''
-        Environment variables passed to <emphasis>all</emphasis> Upstart jobs.
-      '';
-    };
-
   };
 
 
diff --git a/modules/testing/test-instrumentation.nix b/modules/testing/test-instrumentation.nix
index c6c95e63af1..8ceffbcb9ec 100644
--- a/modules/testing/test-instrumentation.nix
+++ b/modules/testing/test-instrumentation.nix
@@ -55,10 +55,6 @@ let kernel = config.boot.kernelPackages.kernel; in
 
         # Coverage data is written into /tmp/coverage-data.
         mkdir -p /tmp/xchg/coverage-data
-
-        # Mount debugfs to gain access to the kernel coverage data (if
-        # available).
-        mount -t debugfs none /sys/kernel/debug || true
       '';
 
     # If the kernel has been built with coverage instrumentation, make
@@ -80,7 +76,7 @@ let kernel = config.boot.kernelPackages.kernel; in
     networking.defaultGateway = mkOverride 150 "";
     networking.nameservers = mkOverride 150 [ ];
 
-    system.upstartEnvironment.GCOV_PREFIX = "/tmp/xchg/coverage-data";
+    boot.systemd.globalEnvironment.GCOV_PREFIX = "/tmp/xchg/coverage-data";
 
     system.requiredKernelConfig = with config.lib.kernelConfig; [
       (isYes "SERIAL_8250_CONSOLE")
-- 
GitLab


From f293455474b0144cf9821244cc44a550670aea01 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 31 Oct 2012 14:24:22 +0100
Subject: [PATCH 4165/5331] dhcpcd: Don't duplicate log messages

Dhcpcd writes log messages to both syslog and stderr.  So ignore
stderr.
---
 modules/services/networking/dhcpcd.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/modules/services/networking/dhcpcd.nix b/modules/services/networking/dhcpcd.nix
index f2300a9529d..3abd77c8eeb 100644
--- a/modules/services/networking/dhcpcd.nix
+++ b/modules/services/networking/dhcpcd.nix
@@ -103,6 +103,7 @@ in
             PIDFile = "/run/dhcpcd.pid";
             ExecStart = "@${dhcpcd}/sbin/dhcpcd dhcpcd --config ${dhcpcdConf}";
             ExecReload = "${dhcpcd}/sbin/dhcpcd --rebind";
+            StandardError = "null";
           };
       };
 
-- 
GitLab


From 1860badbebe7b230f0bff78ecd2ddddb39daecf8 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 31 Oct 2012 14:24:51 +0100
Subject: [PATCH 4166/5331] dhcpcd: Go into the background immediately

---
 modules/services/networking/dhcpcd.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/services/networking/dhcpcd.nix b/modules/services/networking/dhcpcd.nix
index 3abd77c8eeb..f9d588ea548 100644
--- a/modules/services/networking/dhcpcd.nix
+++ b/modules/services/networking/dhcpcd.nix
@@ -101,7 +101,7 @@ in
         serviceConfig =
           { Type = "forking";
             PIDFile = "/run/dhcpcd.pid";
-            ExecStart = "@${dhcpcd}/sbin/dhcpcd dhcpcd --config ${dhcpcdConf}";
+            ExecStart = "@${dhcpcd}/sbin/dhcpcd dhcpcd --config ${dhcpcdConf} --background";
             ExecReload = "${dhcpcd}/sbin/dhcpcd --rebind";
             StandardError = "null";
           };
-- 
GitLab


From dd7edefb2ce74ce6543b183f22ecb803600e33d5 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 31 Oct 2012 14:49:09 +0100
Subject: [PATCH 4167/5331] Order mkfs services before the corresponding fsck
 services

---
 modules/tasks/filesystems.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/tasks/filesystems.nix b/modules/tasks/filesystems.nix
index 774021d0d86..66c97c5fd11 100644
--- a/modules/tasks/filesystems.nix
+++ b/modules/tasks/filesystems.nix
@@ -188,7 +188,7 @@ in
           in nameValuePair "mkfs-${device'}"
           { description = "Initialisation of Filesystem ${fs.device}";
             wantedBy = [ "${mountPoint'}.mount" ];
-            before = [ "${mountPoint'}.mount" ];
+            before = [ "${mountPoint'}.mount" "systemd-fsck@${device'}.service" ];
             require = [ "${device'}.device" ];
             after = [ "${device'}.device" ];
             path = [ pkgs.utillinux ] ++ config.system.fsPackages;
-- 
GitLab


From 48a0ea0513146b8696fa9ef2fd65752336bf1a7c Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 1 Nov 2012 23:32:12 +0100
Subject: [PATCH 4168/5331] =?UTF-8?q?Make=20Apache=20wait=20for=20?=
 =?UTF-8?q?=E2=80=98charon=20send-keys=E2=80=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

(This is a no-op on non-Charon deployments since the ‘keys.target’
unit won't have any dependencies.)
---
 .../web-servers/apache-httpd/default.nix         | 16 ++++++----------
 modules/system/boot/systemd.nix                  |  5 +++++
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/modules/services/web-servers/apache-httpd/default.nix b/modules/services/web-servers/apache-httpd/default.nix
index ab55e43405b..8e4a516ea13 100644
--- a/modules/services/web-servers/apache-httpd/default.nix
+++ b/modules/services/web-servers/apache-httpd/default.nix
@@ -580,11 +580,12 @@ in
         date.timezone = "${config.time.timeZone}"
       '';
 
-    jobs.httpd =
+    boot.systemd.services.httpd =
       { description = "Apache HTTPD";
 
         wantedBy = [ "multi-user.target" ];
-        after = [ "network.target" "fs.target" "postgresql.service" ];
+        requires = [ "keys.target" ];
+        after = [ "network.target" "fs.target" "postgresql.service" "keys.target" ];
 
         path =
           [ httpd pkgs.coreutils pkgs.gnugrep ]
@@ -596,9 +597,7 @@ in
 
         environment =
           { PHPRC = if enablePHP then phpIni else "";
-
             TZ = config.time.timeZone;
-
           } // (listToAttrs (concatMap (svc: svc.globalEnvVars) allSubservices));
 
         preStart =
@@ -628,12 +627,9 @@ in
             done
           '';
 
-        exec = "httpd -f ${httpdConf} -DNO_DETACH";
-
-        preStop =
-          ''
-            ${httpd}/bin/httpd -f ${httpdConf} -k graceful-stop
-          '';
+        serviceConfig.ExecStart = "@${httpd}/bin/httpd httpd -f ${httpdConf} -DNO_DETACH";
+        serviceConfig.ExecStop = "${httpd}/bin/httpd -f ${httpdConf} -k graceful-stop";
+        serviceConfig.Restart = "always";
       };
 
   };
diff --git a/modules/system/boot/systemd.nix b/modules/system/boot/systemd.nix
index 2413509790d..6992299cc88 100644
--- a/modules/system/boot/systemd.nix
+++ b/modules/system/boot/systemd.nix
@@ -442,6 +442,11 @@ in
         }
       ];
 
+    # Target for ‘charon send-keys’ to hook into.
+    boot.systemd.targets.keys =
+      { description = "Security Keys";
+      };
+
     boot.systemd.units =
       { "rescue.service".text = rescueService; }
       // mapAttrs' (n: v: nameValuePair "${n}.target" (targetToUnit n v)) cfg.targets
-- 
GitLab


From af4e176c12f62a88bddc880b770a67d861af243a Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 2 Nov 2012 14:10:06 +0100
Subject: [PATCH 4169/5331] Fix description

---
 modules/system/boot/systemd.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/system/boot/systemd.nix b/modules/system/boot/systemd.nix
index 6992299cc88..340a6d80c1c 100644
--- a/modules/system/boot/systemd.nix
+++ b/modules/system/boot/systemd.nix
@@ -404,7 +404,7 @@ in
     services.journald.console = mkOption {
       default = "";
       type = types.uniq types.string;
-      description = "If non-empty, write log messages to the specified TTY device.  Defaults to /dev/console.";
+      description = "If non-empty, write log messages to the specified TTY device.";
     };
 
   };
-- 
GitLab


From 6ae0b3beed250f014d0d499d04ab59fa2ea3eb76 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 2 Nov 2012 14:20:05 +0100
Subject: [PATCH 4170/5331] dhcpcd: Don't use --background so that
 fetch-ec2-data can be ordered after it

---
 modules/services/networking/dhcpcd.nix | 2 +-
 modules/virtualisation/ec2-data.nix    | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/modules/services/networking/dhcpcd.nix b/modules/services/networking/dhcpcd.nix
index f9d588ea548..3abd77c8eeb 100644
--- a/modules/services/networking/dhcpcd.nix
+++ b/modules/services/networking/dhcpcd.nix
@@ -101,7 +101,7 @@ in
         serviceConfig =
           { Type = "forking";
             PIDFile = "/run/dhcpcd.pid";
-            ExecStart = "@${dhcpcd}/sbin/dhcpcd dhcpcd --config ${dhcpcdConf} --background";
+            ExecStart = "@${dhcpcd}/sbin/dhcpcd dhcpcd --config ${dhcpcdConf}";
             ExecReload = "${dhcpcd}/sbin/dhcpcd --rebind";
             StandardError = "null";
           };
diff --git a/modules/virtualisation/ec2-data.nix b/modules/virtualisation/ec2-data.nix
index 2f58a969492..3f005d6eb2d 100644
--- a/modules/virtualisation/ec2-data.nix
+++ b/modules/virtualisation/ec2-data.nix
@@ -13,6 +13,7 @@ with pkgs.lib;
 
       wantedBy = [ "multi-user.target" ];
       before = [ "sshd.service" ];
+      after = [ "dhcpcd.service" ];
 
       path = [ pkgs.curl pkgs.iproute ];
 
-- 
GitLab


From 67de234e1ca96eda70114a90b399230837363548 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 2 Nov 2012 17:05:30 +0100
Subject: [PATCH 4171/5331] wpa_supplicant.nix: Slightly improve descriptions

---
 modules/services/networking/wpa_supplicant.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/modules/services/networking/wpa_supplicant.nix b/modules/services/networking/wpa_supplicant.nix
index c6b7df38fcf..b338e08113e 100644
--- a/modules/services/networking/wpa_supplicant.nix
+++ b/modules/services/networking/wpa_supplicant.nix
@@ -53,7 +53,7 @@ in
       driver = mkOption {
         default = "";
         example = "nl80211";
-        description = "force a specific wpa_supplicant driver";
+        description = "Force a specific wpa_supplicant driver.";
       };
 
       userControlled = {
@@ -66,7 +66,7 @@ in
             When you want to use this, make sure ${configFile} doesn't exist.
             It will be created for you.
 
-            Currently it is also necesarry to explicitly specify networking.wireless.interfaces
+            Currently it is also necessary to explicitly specify networking.wireless.interfaces.
           '';
         };
 
@@ -74,7 +74,7 @@ in
           default = "wheel";
           example = "network";
           type = types.string;
-          description = "members of this group can control wpa_supplicant";
+          description = "Members of this group can control wpa_supplicant.";
         };
       };
     };
-- 
GitLab


From 93f82dfeefe2d13d83acd4a70f1c7c1f20054931 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 2 Nov 2012 17:07:53 +0100
Subject: [PATCH 4172/5331] Remove outdated comment about EC2 booting into
 stage-2 directly

---
 modules/system/boot/stage-2-init.sh | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/modules/system/boot/stage-2-init.sh b/modules/system/boot/stage-2-init.sh
index 5168028c119..67a4e0ed16d 100644
--- a/modules/system/boot/stage-2-init.sh
+++ b/modules/system/boot/stage-2-init.sh
@@ -25,9 +25,8 @@ setPath "@path@"
 
 
 # Normally, stage 1 mounts the root filesystem read/writable.
-# However, in some environments (such as Amazon EC2), stage 2 is
-# executed directly, and the root is read-only.  So make it writable
-# here.
+# However, in some environments, stage 2 is executed directly, and the
+# root is read-only.  So make it writable here.
 mount -n -o remount,rw /
 
 
-- 
GitLab


From 97f087cd447ef773cd15c6750df5aa24c633ea25 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 2 Nov 2012 17:08:11 +0100
Subject: [PATCH 4173/5331] Turn networking.interfaces into an attribute set

Thus

  networking.interfaces = [ { name = "eth0"; ipAddress = "192.168.15.1"; } ];

can now be written as

  networking.interfaces.eth0.ipAddress = "192.168.15.1";

The old notation still works though.
---
 lib/build-vms.nix                      |  40 +++--
 modules/programs/virtualbox.nix        |   2 +-
 modules/services/networking/dhcpcd.nix |   3 +-
 modules/tasks/network-interfaces.nix   | 228 ++++++++++++-------------
 modules/virtualisation/ec2-data.nix    |   2 +-
 tests/bittorrent.nix                   |   4 +-
 tests/nat.nix                          |   2 +-
 7 files changed, 138 insertions(+), 143 deletions(-)

diff --git a/lib/build-vms.nix b/lib/build-vms.nix
index aacd0e99cb1..59f05bfd104 100644
--- a/lib/build-vms.nix
+++ b/lib/build-vms.nix
@@ -2,7 +2,7 @@
 
 let pkgs = import <nixpkgs> { config = {}; inherit system; }; in
 
-with pkgs;
+with pkgs.lib;
 with import ../lib/qemu-flags.nix;
 
 rec {
@@ -15,7 +15,7 @@ rec {
   # hostname and `configX' is a NixOS system configuration.  Each
   # machine is given an arbitrary IP address in the virtual network.
   buildVirtualNetwork =
-    nodes: let nodesOut = lib.mapAttrs (n: buildVM nodesOut) (assignIPAddresses nodes); in nodesOut;
+    nodes: let nodesOut = mapAttrs (n: buildVM nodesOut) (assignIPAddresses nodes); in nodesOut;
 
 
   buildVM =
@@ -27,7 +27,7 @@ rec {
         [ ../modules/virtualisation/qemu-vm.nix
           ../modules/testing/test-instrumentation.nix # !!! should only get added for automated test runs
           { key = "no-manual"; services.nixosManual.enable = false; }
-        ] ++ lib.optional minimal ../modules/testing/minimal-kernel.nix;
+        ] ++ optional minimal ../modules/testing/minimal-kernel.nix;
       extraArgs = { inherit nodes; };
     };
 
@@ -39,51 +39,49 @@ rec {
 
     let
 
-      machines = lib.attrNames nodes;
+      machines = attrNames nodes;
 
-      machinesNumbered = lib.zipTwoLists machines (lib.range 1 254);
+      machinesNumbered = zipTwoLists machines (range 1 254);
 
-      nodes_ = lib.flip map machinesNumbered (m: lib.nameValuePair m.first
+      nodes_ = flip map machinesNumbered (m: nameValuePair m.first
         [ ( { config, pkgs, nodes, ... }:
             let
-              interfacesNumbered = lib.zipTwoLists config.virtualisation.vlans (lib.range 1 255);
-              interfaces =
-                lib.flip map interfacesNumbered ({ first, second }:
-                  { name = "eth${toString second}";
-                    ipAddress = "192.168.${toString first}.${toString m.second}";
+              interfacesNumbered = zipTwoLists config.virtualisation.vlans (range 1 255);
+              interfaces = flip map interfacesNumbered ({ first, second }:
+                nameValuePair "eth${toString second}"
+                  { ipAddress = "192.168.${toString first}.${toString m.second}";
                     subnetMask = "255.255.255.0";
-                  }
-                );
+                  });
             in
             { key = "ip-address";
               config =
                 { networking.hostName = m.first;
 
-                  networking.interfaces = interfaces;
+                  networking.interfaces = listToAttrs interfaces;
 
                   networking.primaryIPAddress =
-                    lib.optionalString (interfaces != []) (lib.head interfaces).ipAddress;
+                    optionalString (interfaces != []) (head interfaces).value.ipAddress;
 
                   # Put the IP addresses of all VMs in this machine's
                   # /etc/hosts file.  If a machine has multiple
                   # interfaces, use the IP address corresponding to
                   # the first interface (i.e. the first network in its
                   # virtualisation.vlans option).
-                  networking.extraHosts = lib.flip lib.concatMapStrings machines
-                    (m: let config = (lib.getAttr m nodes).config; in
-                      lib.optionalString (config.networking.primaryIPAddress != "")
+                  networking.extraHosts = flip concatMapStrings machines
+                    (m: let config = (getAttr m nodes).config; in
+                      optionalString (config.networking.primaryIPAddress != "")
                         ("${config.networking.primaryIPAddress} " +
                          "${config.networking.hostName}\n"));
 
                   virtualisation.qemu.options =
-                    lib.flip map interfacesNumbered
+                    flip map interfacesNumbered
                       ({ first, second }: qemuNICFlags second first m.second);
                 };
             }
           )
-          (lib.getAttr m.first nodes)
+          (getAttr m.first nodes)
         ] );
 
-    in lib.listToAttrs nodes_;
+    in listToAttrs nodes_;
 
 }
diff --git a/modules/programs/virtualbox.nix b/modules/programs/virtualbox.nix
index 7bce11ab855..a7c41d915ec 100644
--- a/modules/programs/virtualbox.nix
+++ b/modules/programs/virtualbox.nix
@@ -37,5 +37,5 @@ let virtualbox = config.boot.kernelPackages.virtualbox; in
         '';
     };
 
-  networking.interfaces = [ { name = "vboxnet0"; ipAddress = "192.168.56.1"; prefixLength = 24; } ];
+  networking.interfaces.vboxnet0 = { ipAddress = "192.168.56.1"; prefixLength = 24; };
 }
diff --git a/modules/services/networking/dhcpcd.nix b/modules/services/networking/dhcpcd.nix
index 3abd77c8eeb..6c8194f0971 100644
--- a/modules/services/networking/dhcpcd.nix
+++ b/modules/services/networking/dhcpcd.nix
@@ -9,7 +9,7 @@ let
   # Don't start dhclient on explicitly configured interfaces or on
   # interfaces that are part of a bridge.
   ignoredInterfaces =
-    map (i: i.name) (filter (i: i ? ipAddress && i.ipAddress != "" ) config.networking.interfaces)
+    map (i: i.name) (filter (i: i.ipAddress != null) (attrValues config.networking.interfaces))
     ++ concatLists (attrValues (mapAttrs (n: v: v.interfaces) config.networking.bridges))
     ++ config.networking.dhcpcd.denyInterfaces;
 
@@ -104,6 +104,7 @@ in
             ExecStart = "@${dhcpcd}/sbin/dhcpcd dhcpcd --config ${dhcpcdConf}";
             ExecReload = "${dhcpcd}/sbin/dhcpcd --rebind";
             StandardError = "null";
+            Restart = "always";
           };
       };
 
diff --git a/modules/tasks/network-interfaces.nix b/modules/tasks/network-interfaces.nix
index d36a1081de5..412e62bfe80 100644
--- a/modules/tasks/network-interfaces.nix
+++ b/modules/tasks/network-interfaces.nix
@@ -5,7 +5,104 @@ with pkgs.lib;
 let
 
   cfg = config.networking;
-  hasVirtuals = any (i: i.virtual) cfg.interfaces;
+  interfaces = attrValues cfg.interfaces;
+  hasVirtuals = any (i: i.virtual) interfaces;
+
+  interfaceOpts = { name, ... }: {
+
+    options = {
+
+      name = mkOption {
+        example = "eth0";
+        type = types.string;
+        description = "Name of the interface.";
+      };
+
+      ipAddress = mkOption {
+        default = null;
+        example = "10.0.0.1";
+        type = types.nullOr types.string;
+        description = ''
+          IP address of the interface.  Leave empty to configure the
+          interface using DHCP.
+        '';
+      };
+
+      prefixLength = mkOption {
+        default = null;
+        example = 24;
+        type = types.nullOr types.int;
+        description = ''
+          Subnet mask of the interface, specified as the number of
+          bits in the prefix (<literal>24</literal>).
+        '';
+      };
+
+      subnetMask = mkOption {
+        default = "";
+        example = "255.255.255.0";
+        type = types.string;
+        description = ''
+          Subnet mask of the interface, specified as a bitmask.
+          This is deprecated; use <option>prefixLength</option>
+          instead.
+        '';
+      };
+
+      macAddress = mkOption {
+        default = null;
+        example = "00:11:22:33:44:55";
+        type = types.nullOr types.string;
+        description = ''
+          MAC address of the interface. Leave empty to use the default.
+        '';
+      };
+
+      virtual = mkOption {
+        default = false;
+        type = types.bool;
+        description = ''
+          Whether this interface is virtual and should be created by tunctl.
+          This is mainly useful for creating bridges between a host a virtual
+          network such as VPN or a virtual machine.
+
+          Defaults to tap device, unless interface contains "tun" in its name.
+        '';
+      };
+
+      virtualOwner = mkOption {
+        default = "root";
+        type = types.uniq types.string;
+        description = ''
+          In case of a virtual device, the user who owns it.
+        '';
+      };
+
+      proxyARP = mkOption {
+        default = false;
+        type = types.bool;
+        description = ''
+          Turn on proxy_arp for this device (and proxy_ndp for ipv6).
+          This is mainly useful for creating pseudo-bridges between a real
+          interface and a virtual network such as VPN or a virtual machine for
+          interfaces that don't support real bridging (most wlan interfaces).
+          As ARP proxying acts slightly above the link-layer, below-ip traffic
+          isn't bridged, so things like DHCP won't work. The advantage above
+          using NAT lies in the fact that no IP addresses are shared, so all
+          hosts are reachable/routeable.
+
+          WARNING: turns on ip-routing, so if you have multiple interfaces, you
+          should think of the consequence and setup firewall rules to limit this.
+        '';
+      };
+
+    };
+
+    config = {
+      name = mkDefault name;
+    };
+
+  };
 
 in
 
@@ -66,121 +163,20 @@ in
     };
 
     networking.interfaces = mkOption {
-      default = [];
-      example = [
-        { name = "eth0";
-          ipAddress = "131.211.84.78";
-          subnetMask = "255.255.255.128";
-        }
-      ];
+      default = {};
+      example =
+        { eth0 = {
+            ipAddress = "131.211.84.78";
+            subnetMask = "255.255.255.128";
+          };
+        };
       description = ''
         The configuration for each network interface.  If
         <option>networking.useDHCP</option> is true, then every
         interface not listed here will be configured using DHCP.
       '';
-
-      type = types.list types.optionSet;
-
-      options = {
-
-        name = mkOption {
-          example = "eth0";
-          type = types.string;
-          description = ''
-            Name of the interface.
-          '';
-        };
-
-        ipAddress = mkOption {
-          default = "";
-          example = "10.0.0.1";
-          type = types.string;
-          description = ''
-            IP address of the interface.  Leave empty to configure the
-            interface using DHCP.
-          '';
-        };
-
-        prefixLength = mkOption {
-          default = null;
-          example = 24;
-          type = types.nullOr types.int;
-          description = ''
-            Subnet mask of the interface, specified as the number of
-            bits in the prefix (<literal>24</literal>).
-          '';
-        };
-
-        subnetMask = mkOption {
-          default = "";
-          example = "255.255.255.0";
-          type = types.string;
-          description = ''
-            Subnet mask of the interface, specified as a bitmask.
-            This is deprecated; use <option>prefixLength</option>
-            instead.
-          '';
-        };
-
-        macAddress = mkOption {
-          default = "";
-          example = "00:11:22:33:44:55";
-          type = types.string;
-          description = ''
-            MAC address of the interface. Leave empty to use the default.
-          '';
-        };
-
-        virtual = mkOption {
-          default = false;
-          type = types.bool;
-          description = ''
-            Whether this interface is virtual and should be created by tunctl.
-            This is mainly useful for creating bridges between a host a virtual
-            network such as VPN or a virtual machine.
-
-            Defaults to tap device, unless interface contains "tun" in its name.
-          '';
-        };
-
-        virtualOwner = mkOption {
-          default = "root";
-          type = types.uniq types.string;
-          description = ''
-            In case of a virtual device, the user who owns it.
-          '';
-        };
-
-        proxyARP = mkOption {
-          default = false;
-          type = types.bool;
-          description = ''
-            Turn on proxy_arp for this device (and proxy_ndp for ipv6).
-            This is mainly useful for creating pseudo-bridges between a real
-            interface and a virtual network such as VPN or a virtual machine for
-            interfaces that don't support real bridging (most wlan interfaces).
-            As ARP proxying acts slightly above the link-layer, below-ip traffic
-            isn't bridged, so things like DHCP won't work. The advantage above
-            using NAT lies in the fact that no IP addresses are shared, so all
-            hosts are reachable/routeable.
-
-            WARNING: turns on ip-routing, so if you have multiple interfaces, you
-            should think of the consequence and setup firewall rules to limit this.
-          '';
-        };
-
-      };
-
-    };
-
-    networking.ifaces = mkOption {
-      default = listToAttrs
-        (map (iface: { name = iface.name; value = iface; }) config.networking.interfaces);
-      internal = true;
-      description = ''
-        The network interfaces in <option>networking.interfaces</option>
-        as an attribute set keyed on the interface name.
-      '';
+      type = types.loaOf types.optionSet;
+      options = [ interfaceOpts ];
     };
 
     networking.bridges = mkOption {
@@ -288,7 +284,7 @@ in
                 ''}
 
                 # Turn on forwarding if any interface has enabled proxy_arp.
-                ${optionalString (any (i: i.proxyARP) cfg.interfaces) ''
+                ${optionalString (any (i: i.proxyARP) interfaces) ''
                   echo 1 > /proc/sys/net/ipv4/ip_forward
                 ''}
 
@@ -322,12 +318,12 @@ in
                 echo "bringing up interface..."
                 ip link set "${i.name}" up
               ''
-              + optionalString (i.macAddress != "")
+              + optionalString (i.macAddress != null)
                 ''
                   echo "setting MAC address to ${i.macAddress}..."
                   ip link set "${i.name}" address "${i.macAddress}"
                 ''
-              + optionalString (i.ipAddress != "")
+              + optionalString (i.ipAddress != null)
                 ''
                   cur=$(ip -4 -o a show dev "${i.name}" | awk '{print $4}')
                   # Only do a flush/add if it's necessary.  This is
@@ -400,8 +396,8 @@ in
           };
 
       in listToAttrs (
-           map configureInterface cfg.interfaces ++
-           map createTunDevice (filter (i: i.virtual) cfg.interfaces))
+           map configureInterface interfaces ++
+           map createTunDevice (filter (i: i.virtual) interfaces))
          // mapAttrs createBridgeDevice cfg.bridges
          // { "network-setup" = networkSetup; };
 
diff --git a/modules/virtualisation/ec2-data.nix b/modules/virtualisation/ec2-data.nix
index 3f005d6eb2d..6ca89dd7ac5 100644
--- a/modules/virtualisation/ec2-data.nix
+++ b/modules/virtualisation/ec2-data.nix
@@ -13,7 +13,7 @@ with pkgs.lib;
 
       wantedBy = [ "multi-user.target" ];
       before = [ "sshd.service" ];
-      after = [ "dhcpcd.service" ];
+      after = [ "network.target" ];
 
       path = [ pkgs.curl pkgs.iproute ];
 
diff --git a/tests/bittorrent.nix b/tests/bittorrent.nix
index 9e4ee2e0635..180da8267e0 100644
--- a/tests/bittorrent.nix
+++ b/tests/bittorrent.nix
@@ -16,7 +16,7 @@ let
   miniupnpdConf = nodes: pkgs.writeText "miniupnpd.conf"
     ''
       ext_ifname=eth1
-      listening_ip=${nodes.router.config.networking.ifaces.eth2.ipAddress}/24
+      listening_ip=${nodes.router.config.networking.interfaces.eth2.ipAddress}/24
       allow 1024-65535 192.168.2.0/24 1024-65535
     '';
 
@@ -49,7 +49,7 @@ in
         { environment.systemPackages = [ pkgs.transmission ];
           virtualisation.vlans = [ 2 ];
           networking.defaultGateway =
-            nodes.router.config.networking.ifaces.eth2.ipAddress;
+            nodes.router.config.networking.interfaces.eth2.ipAddress;
         };
 
       client2 =
diff --git a/tests/nat.nix b/tests/nat.nix
index 7b03739a9bc..55d87ed4fa1 100644
--- a/tests/nat.nix
+++ b/tests/nat.nix
@@ -13,7 +13,7 @@
         { config, pkgs, nodes, ... }:
         { virtualisation.vlans = [ 1 ];
           networking.defaultGateway =
-            nodes.router.config.networking.ifaces.eth2.ipAddress;
+            nodes.router.config.networking.interfaces.eth2.ipAddress;
         };
 
       router =
-- 
GitLab


From 458f36f5f11170dead59ad4adda8146784d98208 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 2 Nov 2012 18:02:12 +0100
Subject: [PATCH 4174/5331] Turn fileSystems into an attribute set

So now you can write

  fileSystems =
    [ { mountPoint = "/";
        device = "/dev/sda1";
      }
    ];

as

  fileSystems."/".device = "/dev/sda1";
---
 doc/manual/installation.xml                 |   6 +-
 modules/installer/cd-dvd/iso-image.nix      |  18 +--
 modules/installer/tools/nixos-option.sh     |  19 ++-
 modules/system/boot/stage-1.nix             |  13 +-
 modules/tasks/filesystems.nix               | 151 ++++++++++----------
 modules/virtualisation/amazon-image.nix     |   6 +-
 modules/virtualisation/nova-image.nix       |   6 +-
 modules/virtualisation/qemu-vm.nix          |  56 ++++----
 modules/virtualisation/virtualbox-image.nix |   6 +-
 9 files changed, 132 insertions(+), 149 deletions(-)

diff --git a/doc/manual/installation.xml b/doc/manual/installation.xml
index 0a69ce0ecba..ed5348829c8 100644
--- a/doc/manual/installation.xml
+++ b/doc/manual/installation.xml
@@ -230,11 +230,7 @@ $ reboot</screen>
 {
   boot.loader.grub.device = "/dev/sda";
 
-  fileSystems =
-    [ { mountPoint = "/";
-        device = "/dev/disk/by-label/nixos";
-      }
-    ];
+  fileSystems."/".device = "/dev/disk/by-label/nixos";
 
   swapDevices =
     [ { device = "/dev/disk/by-label/swap"; } ];
diff --git a/modules/installer/cd-dvd/iso-image.nix b/modules/installer/cd-dvd/iso-image.nix
index be4777356e4..96fc8a31dca 100644
--- a/modules/installer/cd-dvd/iso-image.nix
+++ b/modules/installer/cd-dvd/iso-image.nix
@@ -184,17 +184,13 @@ in
   # Note that /dev/root is a symlink to the actual root device
   # specified on the kernel command line, created in the stage 1 init
   # script.
-  fileSystems =
-    [ { mountPoint = "/";
-        device = "/dev/root";
-      }
-      { mountPoint = "/nix/store";
-        fsType = "squashfs";
-        device = "/nix-store.squashfs";
-        options = "loop";
-        neededForBoot = true;
-      }
-    ];
+  fileSystems."/".device = "/dev/root";
+
+  fileSystems."/nix/store" =
+    { fsType = "squashfs";
+      device = "/nix-store.squashfs";
+      options = "loop";
+    };
 
   # We need squashfs in the initrd to mount the compressed Nix store,
   # and aufs to make the root filesystem appear writable.
diff --git a/modules/installer/tools/nixos-option.sh b/modules/installer/tools/nixos-option.sh
index 656f2a87403..47abac7fddd 100644
--- a/modules/installer/tools/nixos-option.sh
+++ b/modules/installer/tools/nixos-option.sh
@@ -239,17 +239,14 @@ if $generate; then
   # Add filesystem entries for each partition that you want to see
   # mounted at boot time.  This should include at least the root
   # filesystem.
-  fileSystems =
-    [ # { mountPoint = "/";
-      #   device = "/dev/disk/by-label/nixos";
-      # }
-
-      # { mountPoint = "/data"; # where you want to mount the device
-      #   device = "/dev/sdb";  # the device
-      #   fsType = "ext3";      # the type of the partition
-      #   options = "data=journal";
-      # }
-    ];
+
+  # fileSystems."/".device = "/dev/disk/by-label/nixos";
+
+  # fileSystems."/data" =     # where you want to mount the device
+  #   { device = "/dev/sdb";  # the device
+  #     fsType = "ext3";      # the type of the partition
+  #     options = "data=journal";
+  #   };
 
   # List swap partitions activated at boot time.
   swapDevices =
diff --git a/modules/system/boot/stage-1.nix b/modules/system/boot/stage-1.nix
index 18d11e2d402..ac8a3ccc238 100644
--- a/modules/system/boot/stage-1.nix
+++ b/modules/system/boot/stage-1.nix
@@ -99,9 +99,12 @@ let
       options.neededForBoot = mkOption {
         default = false;
         type = types.bool;
-        description = "
-          Mount this file system to boot on NixOS.
-        ";
+        description = ''
+          If set, this file system will be mounted in the initial
+          ramdisk.  By default, this applies to the root file system
+          and to the file system containing
+          <filename>/nix/store</filename>.
+        '';
       };
     };
 
@@ -236,8 +239,8 @@ let
   # booting (such as the FS containing /nix/store, or an FS needed for
   # mounting /, like / on a loopback).
   fileSystems = filter
-    (fs: fs.mountPoint == "/" || fs.neededForBoot)
-    config.fileSystems;
+    (fs: fs.mountPoint == "/" || fs.mountPoint == "/nix" || fs.mountPoint == "/nix/store" || fs.neededForBoot)
+    (attrValues config.fileSystems);
 
 
   udevRules = pkgs.stdenv.mkDerivation {
diff --git a/modules/tasks/filesystems.nix b/modules/tasks/filesystems.nix
index 66c97c5fd11..00d711eecd3 100644
--- a/modules/tasks/filesystems.nix
+++ b/modules/tasks/filesystems.nix
@@ -5,12 +5,14 @@ with utils;
 
 let
 
+  fileSystems = attrValues config.fileSystems;
+
   fstab = pkgs.writeText "fstab"
     ''
       # This is a generated file.  Do not edit!
 
       # Filesystems.
-      ${flip concatMapStrings config.fileSystems (fs:
+      ${flip concatMapStrings fileSystems (fs:
           (if fs.device != null then fs.device else "/dev/disk/by-label/${fs.label}")
           + " " + fs.mountPoint
           + " " + fs.fsType
@@ -27,6 +29,70 @@ let
       )}
     '';
 
+  fileSystemOpts = { name, ... }: {
+
+    options = {
+
+      mountPoint = mkOption {
+        example = "/mnt/usb";
+        type = types.uniq types.string;
+        description = "Location of the mounted the file system.";
+      };
+
+      device = mkOption {
+        default = null;
+        example = "/dev/sda";
+        type = types.uniq (types.nullOr types.string);
+        description = "Location of the device.";
+      };
+
+      label = mkOption {
+        default = null;
+        example = "root-partition";
+        type = types.uniq (types.nullOr types.string);
+        description = "Label of the device (if any).";
+      };
+
+      fsType = mkOption {
+        default = "auto";
+        example = "ext3";
+        type = types.uniq types.string;
+        description = "Type of the file system.";
+      };
+
+      options = mkOption {
+        default = "defaults,relatime";
+        example = "data=journal";
+        type = types.string;
+        merge = pkgs.lib.concatStringsSep ",";
+        description = "Options used to mount the file system.";
+      };
+
+      autoFormat = mkOption {
+        default = false;
+        type = types.bool;
+        description = ''
+          If the device does not currently contain a filesystem (as
+          determined by <command>blkid</command>, then automatically
+          format it with the filesystem type specified in
+          <option>fsType</option>.  Use with caution.
+        '';
+      };
+
+      noCheck = mkOption {
+        default = false;
+        type = types.bool;
+        description = "Disable running fsck on this filesystem.";
+      };
+
+    };
+
+    config = {
+      mountPoint = mkDefault name;
+    };
+
+  };
+
 in
 
 {
@@ -36,20 +102,17 @@ in
   options = {
 
     fileSystems = mkOption {
-      example = [
-        { mountPoint = "/";
-          device = "/dev/hda1";
-        }
-        { mountPoint = "/data";
+      example = {
+        "/".device = "/dev/hda1";
+        "/data" = {
           device = "/dev/hda2";
           fsType = "ext3";
           options = "data=journal";
-        }
-        { mountPoint = "/bigdisk";
-          label = "bigdisk";
-        }
-      ];
-
+        };
+        "/bigdisk".label = "bigdisk";
+      };
+      type = types.loaOf types.optionSet;
+      options = [ fileSystemOpts ];
       description = ''
         The file systems to be mounted.  It must include an entry for
         the root directory (<literal>mountPoint = \"/\"</literal>).  Each
@@ -66,63 +129,6 @@ in
         systems that support it, such as ext2/ext3 (see <command>mke2fs
         -L</command>).
       '';
-
-      type = types.list types.optionSet;
-
-      options = {
-
-        mountPoint = mkOption {
-          example = "/mnt/usb";
-          type = types.uniq types.string;
-          description = "Location of the mounted the file system.";
-        };
-
-        device = mkOption {
-          default = null;
-          example = "/dev/sda";
-          type = types.uniq (types.nullOr types.string);
-          description = "Location of the device.";
-        };
-
-        label = mkOption {
-          default = null;
-          example = "root-partition";
-          type = types.uniq (types.nullOr types.string);
-          description = "Label of the device (if any).";
-        };
-
-        fsType = mkOption {
-          default = "auto";
-          example = "ext3";
-          type = types.uniq types.string;
-          description = "Type of the file system.";
-        };
-
-        options = mkOption {
-          default = "defaults,relatime";
-          example = "data=journal";
-          type = types.string;
-          merge = pkgs.lib.concatStringsSep ",";
-          description = "Options used to mount the file system.";
-        };
-
-        autoFormat = mkOption {
-          default = false;
-          type = types.bool;
-          description = ''
-            If the device does not currently contain a filesystem (as
-            determined by <command>blkid</command>, then automatically
-            format it with the filesystem type specified in
-            <option>fsType</option>.  Use with caution.
-          '';
-        };
-
-        noCheck = mkOption {
-          default = false;
-          type = types.bool;
-          description = "Disable running fsck on this filesystem.";
-        };
-      };
     };
 
     system.fsPackages = mkOption {
@@ -152,12 +158,11 @@ in
 
   config = {
 
-    boot.supportedFilesystems =
-      map (fs: fs.fsType) config.fileSystems;
+    boot.supportedFilesystems = map (fs: fs.fsType) fileSystems;
 
     boot.initrd.supportedFilesystems =
       map (fs: fs.fsType)
-        (filter (fs: fs.mountPoint == "/" || fs.neededForBoot) config.fileSystems);
+        (filter (fs: fs.mountPoint == "/" || fs.neededForBoot) fileSystems);
 
     # Add the mount helpers to the system path so that `mount' can find them.
     system.fsPackages = [ pkgs.dosfstools ];
@@ -207,7 +212,7 @@ in
             serviceConfig.Type = "oneshot";
           };
 
-      in listToAttrs (map formatDevice (filter (fs: fs.autoFormat) config.fileSystems));
+      in listToAttrs (map formatDevice (filter (fs: fs.autoFormat) fileSystems));
 
   };
 
diff --git a/modules/virtualisation/amazon-image.nix b/modules/virtualisation/amazon-image.nix
index 9ada2b176fe..da6f6d3afc9 100644
--- a/modules/virtualisation/amazon-image.nix
+++ b/modules/virtualisation/amazon-image.nix
@@ -62,11 +62,7 @@ with pkgs.lib;
         ''
     );
 
-  fileSystems =
-    [ { mountPoint = "/";
-        device = "/dev/disk/by-label/nixos";
-      }
-    ];
+  fileSystems."/".device = "/dev/disk/by-label/nixos";
 
   boot.initrd.kernelModules = [ "xen-blkfront" "aufs" ];
   boot.kernelModules = [ "xen-netfront" ];
diff --git a/modules/virtualisation/nova-image.nix b/modules/virtualisation/nova-image.nix
index ea4dbcc4dd4..2aa78aeadda 100644
--- a/modules/virtualisation/nova-image.nix
+++ b/modules/virtualisation/nova-image.nix
@@ -68,11 +68,7 @@ with pkgs.lib;
         ''
     );
 
-  fileSystems =
-    [ { mountPoint = "/";
-        device = "/dev/disk/by-label/nixos";
-      }
-    ];
+  fileSystems."/".device = "/dev/disk/by-label/nixos";
 
   boot.kernelParams = [ "console=ttyS0" ];
 
diff --git a/modules/virtualisation/qemu-vm.nix b/modules/virtualisation/qemu-vm.nix
index e3927442821..22e5017d7c0 100644
--- a/modules/virtualisation/qemu-vm.nix
+++ b/modules/virtualisation/qemu-vm.nix
@@ -320,35 +320,33 @@ in
   # where the regular value for the `fileSystems' attribute should be
   # disregarded for the purpose of building a VM test image (since
   # those filesystems don't exist in the VM).
-  fileSystems = mkOverride 50 (
-    [ { mountPoint = "/";
-        device = "/dev/vda";
-      }
-      { mountPoint = "/nix/store";
-        device = "//10.0.2.4/store";
-        fsType = "cifs";
-        options = "guest,sec=none,noperm,noacl";
-        neededForBoot = true;
-      }
-      { mountPoint = "/tmp/xchg";
-        device = "//10.0.2.4/xchg";
-        fsType = "cifs";
-        options = "guest,sec=none,noperm,noacl";
-        neededForBoot = true;
-      }
-      { mountPoint = "/tmp/shared";
-        device = "//10.0.2.4/shared";
-        fsType = "cifs";
-        options = "guest,sec=none,noperm,noacl";
-        neededForBoot = true;
-      }
-    ] ++ optional cfg.useBootLoader
-      { mountPoint = "/boot";
-        device = "/dev/disk/by-label/boot";
-        fsType = "ext4";
-        options = "ro";
-        noCheck = true; # fsck fails on a r/o filesystem
-      });
+  fileSystems =
+    { "/".device = "/dev/vda";
+      "/nix/store" =
+        { device = "//10.0.2.4/store";
+          fsType = "cifs";
+          options = "guest,sec=none,noperm,noacl";
+        };
+      "/tmp/xchg" =
+        { device = "//10.0.2.4/xchg";
+          fsType = "cifs";
+          options = "guest,sec=none,noperm,noacl";
+          neededForBoot = true;
+        };
+      "/tmp/shared" =
+        { device = "//10.0.2.4/shared";
+          fsType = "cifs";
+          options = "guest,sec=none,noperm,noacl";
+          neededForBoot = true;
+        };
+    } // optionalAttrs cfg.useBootLoader
+    { "/boot" =
+        { device = "/dev/disk/by-label/boot";
+          fsType = "ext4";
+          options = "ro";
+          noCheck = true; # fsck fails on a r/o filesystem
+        };
+    };
 
   swapDevices = mkOverride 50 [ ];
 
diff --git a/modules/virtualisation/virtualbox-image.nix b/modules/virtualisation/virtualbox-image.nix
index f049c5eb348..8fe0030946a 100644
--- a/modules/virtualisation/virtualbox-image.nix
+++ b/modules/virtualisation/virtualbox-image.nix
@@ -71,11 +71,7 @@ with pkgs.lib;
         ''
     );
 
-  fileSystems =
-    [ { mountPoint = "/";
-        device = "/dev/disk/by-label/nixos";
-      }
-    ];
+  fileSystems."/".device = "/dev/disk/by-label/nixos";
 
   boot.loader.grub.version = 2;
   boot.loader.grub.device = "/dev/sda";
-- 
GitLab


From 64540fb4534245fbca58b0918f85e80274ff74dc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= <viric@viric.name>
Date: Sun, 4 Nov 2012 22:13:19 +0100
Subject: [PATCH 4175/5331] Adding quick instructions in system-tarball-pc to
 use it as chroot.

I also split the readme into a file apart.
---
 .../cd-dvd/system-tarball-pc-readme.txt       | 89 +++++++++++++++++++
 .../installer/cd-dvd/system-tarball-pc.nix    | 49 +---------
 2 files changed, 90 insertions(+), 48 deletions(-)
 create mode 100644 modules/installer/cd-dvd/system-tarball-pc-readme.txt

diff --git a/modules/installer/cd-dvd/system-tarball-pc-readme.txt b/modules/installer/cd-dvd/system-tarball-pc-readme.txt
new file mode 100644
index 00000000000..c4a0a111cd3
--- /dev/null
+++ b/modules/installer/cd-dvd/system-tarball-pc-readme.txt
@@ -0,0 +1,89 @@
+Let all the files in the system tarball sit in a directory served by NFS (the
+NFS root) like this in exportfs:
+  /home/pcroot    192.168.1.0/24(rw,no_root_squash,no_all_squash)
+
+Run "exportfs -a" after editing /etc/exportfs, for the nfs server to be aware
+of the changes.
+
+Use a tftp server serving the root of boot/ (from the system tarball).
+
+In order to have PXE boot, use the boot/dhcpd.conf-example file for your dhcpd
+server, as it will point your PXE clients to pxelinux.0 from the tftp server.
+Adapt the configuration to your network.
+
+Adapt the pxelinux configuration (boot/pxelinux.cfg/default) to set the path to
+your nfrroot. If you use ip=dhcp in the kernel, the nfs server ip will be taken
+from dhcp and so you don't have to specify it.
+
+The linux in bzImage includes network drivers for some usual cards.
+
+
+QEMU Testing
+---------------
+
+You can test qemu pxe boot without having a DHCP server adapted, but having
+nfsroot, like this:
+  qemu-system-x86_64 -tftp /home/pcroot/boot -net nic -net user,bootfile=pxelinux.0 -boot n
+
+I don't know how to use NFS through the qemu '-net user' though.
+
+
+QEMU Testing with NFS root and bridged network
+-------------------------------------------------
+
+This allows testing with qemu as any other host in your LAN.
+
+Testing with the real dhcpd server requires setting up a bridge and having a
+tap device.
+  tunctl -t tap0
+  brctl addbr br0
+  brctl addif br0 eth0
+  brctl addif tap0 eth0
+  ifconfig eth0 0.0.0.0 up
+  ifconfig tap0 0.0.0.0 up
+  ifconfig br0 up # With your ip configuration
+
+Then you can run qemu:
+  qemu-system-x86_64 -boot n -net tap,ifname=tap0,script=no -net nic,model=e1000
+
+
+Using the system-tarball-pc in a chroot
+--------------------------------------------------
+
+Installation:
+  mkdir nixos-chroot && cd nixos-chroot
+  tar xf your-system-tarball.tar.xz
+  mkdir sys dev proc tmp root var run
+  mount --bind /sys sys
+  mount --bind /dev dev
+  mount --bind /proc proc
+
+Activate the system: look for a directory in nix/store similar to:
+    "/nix/store/y0d1lcj9fppli0hl3x0m0ba5g1ndjv2j-nixos-feb97bx-53f008"
+Having found it, activate that nixos system *twice*:
+  chroot . /nix/store/SOMETHING-nixos-SOMETHING/activate
+  chroot . /nix/store/SOMETHING-nixos-SOMETHING/activate
+  
+This runs a 'hostname' command. Restore your old hostname with:
+  hostname OLDHOSTNAME
+
+Copy your system resolv.conf to the /etc/resolv.conf inside the chroot:
+  cp /etc/resolv.conf etc
+
+Then you can get an interactive shell in the nixos chroot. '*' means
+to run inside the chroot interactive shell
+  chroot . /bin/sh
+*  source /etc/profile
+
+Populate the nix database: that should be done in the init script if you
+had booted this nixos. Run:
+*  `grep local-cmds run/current-system/init`
+
+Then you can proceed normally subscribing to a nixos channel:
+  nix-channel --add http://nixos.org/releases/nixos/channels/nixos-unstable
+  nix-channel --update
+
+Testing:
+  nix-env -i hello
+  which hello
+  hello
diff --git a/modules/installer/cd-dvd/system-tarball-pc.nix b/modules/installer/cd-dvd/system-tarball-pc.nix
index 2bc6ce78d94..e98a8c215f9 100644
--- a/modules/installer/cd-dvd/system-tarball-pc.nix
+++ b/modules/installer/cd-dvd/system-tarball-pc.nix
@@ -60,54 +60,7 @@ let
     }
   '';
 
-  readme = pkgs.writeText "readme.txt" ''
-    Let all the files in the system tarball sit in a directory served by NFS (the NFS root)
-    like this in exportfs:
-      /home/pcroot    192.168.1.0/24(rw,no_root_squash,no_all_squash)
-
-    Run "exportfs -a" after editing /etc/exportfs, for the nfs server to be aware of the
-    changes.
-
-    Use a tftp server serving the root of boot/ (from the system tarball).
-
-    In order to have PXE boot, use the boot/dhcpd.conf-example file for your dhcpd server,
-    as it will point your PXE clients to pxelinux.0 from the tftp server. Adapt the
-    configuration to your network.
-
-    Adapt the pxelinux configuration (boot/pxelinux.cfg/default) to set the path to your
-    nfrroot. If you use ip=dhcp in the kernel, the nfs server ip will be taken from
-    dhcp and so you don't have to specify it.
-
-    The linux in bzImage includes network drivers for some usual cards.
-
-
-    QEMU Testing
-    ---------------
-
-    You can test qemu pxe boot without having a DHCP server adapted, but having nfsroot,
-    like this:
-      qemu-system-x86_64 -tftp /home/pcroot/boot -net nic -net user,bootfile=pxelinux.0 -boot n
-
-    I don't know how to use NFS through the qemu '-net user' though.
-
-
-    QEMU Testing with NFS root and bridged network
-    -------------------------------------------------
-
-    This allows testing with qemu as any other host in your LAN.
-
-    Testing with the real dhcpd server requires setting up a bridge and having a tap device.
-      tunctl -t tap0
-      brctl addbr br0
-      brctl addif br0 eth0
-      brctl addif tap0 eth0
-      ifconfig eth0 0.0.0.0 up
-      ifconfig tap0 0.0.0.0 up
-      ifconfig br0 up # With your ip configuration
-
-    Then you can run qemu:
-      qemu-system-x86_64 -boot n -net tap,ifname=tap0,script=no -net nic,model=e1000
-  '';
+  readme = builtins.readFile ./system-tarball-pc-readme.txt;
 
 in
 
-- 
GitLab


From 6e6ee3278c132818ce85963a68ec43069af488d1 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Mon, 5 Nov 2012 09:35:01 +0100
Subject: [PATCH 4176/5331] pam: Add default configuration for GNU screen.

This is needed in order to properly lock your screen using the C-a C-x
(lockscreen) command _and_ being back to re-login, because the "other" PAM
service/fallback is to deny authentication.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 modules/security/pam.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/modules/security/pam.nix b/modules/security/pam.nix
index dc18ffd7d02..4aab32e1dec 100644
--- a/modules/security/pam.nix
+++ b/modules/security/pam.nix
@@ -239,6 +239,7 @@ in
         { name = "vlock"; }
         { name = "xlock"; }
         { name = "xscreensaver"; }
+        { name = "screen"; }
       ];
 
   };
-- 
GitLab


From 1c28b8674935e173c8179316f131d11948b70227 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Mon, 5 Nov 2012 09:41:24 +0100
Subject: [PATCH 4177/5331] pam: Douchebag commit, fix alphabetical order.

Yes, I'm going to get back to school and learn the alphabet. I promise!

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 modules/security/pam.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/security/pam.nix b/modules/security/pam.nix
index 4aab32e1dec..a77b7697379 100644
--- a/modules/security/pam.nix
+++ b/modules/security/pam.nix
@@ -235,11 +235,11 @@ in
         { name = "i3lock"; }
         { name = "lshd"; }
         { name = "samba"; }
+        { name = "screen"; }
         { name = "sshd"; }
         { name = "vlock"; }
         { name = "xlock"; }
         { name = "xscreensaver"; }
-        { name = "screen"; }
       ];
 
   };
-- 
GitLab


From 70e6e19f545244a1a5cb55efb6b396e80cb435d8 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 5 Nov 2012 23:07:53 +0100
Subject: [PATCH 4178/5331] xsession: source /etc/profile at the beginning of
 the script

The xsession script runs services that depend on a sane environment. Gpg-agent, for
example, runs the program "pinentry-gtk-2" to obtain the password to unlock GnuPG
and SSH keys. That program will display only gibberish unless $FONTCONFIG_FILE is
configured properly. Instead of configuring these variables explicitly one by one,
we just source /etc/profile, which contains the appropriate @shellInit@ code.
---
 modules/services/x11/display-managers/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/modules/services/x11/display-managers/default.nix b/modules/services/x11/display-managers/default.nix
index 86a636c27c7..396311be49e 100644
--- a/modules/services/x11/display-managers/default.nix
+++ b/modules/services/x11/display-managers/default.nix
@@ -21,6 +21,7 @@ let
     ''
       #! /bin/sh
 
+      . /etc/profile
       cd "$HOME"
 
       # The first argument of this script is the session type.
-- 
GitLab


From a333f7212e4a079a5c6d26bfcb7c933e02ce01b1 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Sat, 3 Nov 2012 05:41:46 +0100
Subject: [PATCH 4179/5331] systemd: Fail if kernel features are missing.

This has rendered my system unbootable, because I forgot to enable AUTOFS4 in my
custom kernel. In addition to AUTOFS4, this includes (hopefully) all other
kernel features needed by systemd, as listed in the README:

REQUIREMENTS:
  Linux kernel >= 2.6.39
    with devtmpfs
    with cgroups (but it's OK to disable all controllers)
    optional but strongly recommended: autofs4, ipv6

Autofs4 is not a requirement here, but in our case it turns out that the system
is not able to boot properly with a LUKS-enabled system (or at least not on _my_
system).

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 modules/system/boot/systemd.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/modules/system/boot/systemd.nix b/modules/system/boot/systemd.nix
index 340a6d80c1c..e76d35fa9f2 100644
--- a/modules/system/boot/systemd.nix
+++ b/modules/system/boot/systemd.nix
@@ -453,6 +453,8 @@ in
       // mapAttrs' (n: v: nameValuePair "${n}.service" (serviceToUnit n v)) cfg.services
       // mapAttrs' (n: v: nameValuePair "${n}.socket" (socketToUnit n v)) cfg.sockets;
 
+    system.requiredKernelConfig = map config.lib.kernelConfig.isEnabled [
+      "CGROUPS" "AUTOFS4_FS" "DEVTMPFS"
+    ];
   };
-
 }
-- 
GitLab


From e078117c726b9840b053ff3e90b2ce0801b43497 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 19 Oct 2012 15:21:06 -0400
Subject: [PATCH 4180/5331] firewall.nix: Don't fail if IPv6 is disabled

---
 modules/services/networking/firewall.nix | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/modules/services/networking/firewall.nix b/modules/services/networking/firewall.nix
index 8ddeacf1a0f..9f7db27c738 100644
--- a/modules/services/networking/firewall.nix
+++ b/modules/services/networking/firewall.nix
@@ -340,9 +340,11 @@ in
             # Accept all ICMPv6 messages except redirects and node
             # information queries (type 139).  See RFC 4890, section
             # 4.4.
-            ip6tables -A nixos-fw -p icmpv6 --icmpv6-type redirect -j DROP
-            ip6tables -A nixos-fw -p icmpv6 --icmpv6-type 139 -j DROP
-            ip6tables -A nixos-fw -p icmpv6 -j nixos-fw-accept
+            ${optionalString config.networking.enableIPv6 ''
+              ip6tables -A nixos-fw -p icmpv6 --icmpv6-type redirect -j DROP
+              ip6tables -A nixos-fw -p icmpv6 --icmpv6-type 139 -j DROP
+              ip6tables -A nixos-fw -p icmpv6 -j nixos-fw-accept
+            ''}
 
             ${cfg.extraCommands}
 
-- 
GitLab


From 2f833bc88dc8c1111bdedf1355a0920c9d5fb823 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Thu, 8 Nov 2012 13:04:20 -0500
Subject: [PATCH 4181/5331] Remove unnecessary toPath that breaks with recent
 nixUnstable

---
 modules/services/hardware/pommed.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/services/hardware/pommed.nix b/modules/services/hardware/pommed.nix
index 63c783f5c6d..32599554fc1 100644
--- a/modules/services/hardware/pommed.nix
+++ b/modules/services/hardware/pommed.nix
@@ -13,7 +13,7 @@ with pkgs.lib;
     };
 
     configFile = mkOption {
-      default = builtins.toPath "${pkgs.pommed}/etc/pommed.conf";
+      default = "${pkgs.pommed}/etc/pommed.conf";
       description = ''
         The contents of the pommed.conf file.
       '';
-- 
GitLab


From 04ba5de70a6ec3746fdcc74919587a024b553a3c Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 11 Nov 2012 21:29:33 +0100
Subject: [PATCH 4182/5331] modules/programs/bash/bash.nix: cosmetic indention
 fix

---
 modules/programs/bash/bash.nix | 50 +++++++++++++++++-----------------
 1 file changed, 25 insertions(+), 25 deletions(-)

diff --git a/modules/programs/bash/bash.nix b/modules/programs/bash/bash.nix
index 135d99ec437..f2b0ac46b06 100644
--- a/modules/programs/bash/bash.nix
+++ b/modules/programs/bash/bash.nix
@@ -28,35 +28,35 @@ let
   options = {
 
     environment.promptInit =  mkOption {
-        default = ''
-          # Provide a nice prompt.
-          PROMPT_COLOR="1;31m"
-          let $UID && PROMPT_COLOR="1;32m"
-          PS1="\n\[\033[$PROMPT_COLOR\][\u@\h:\w]\\$\[\033[0m\] "
-          if test "$TERM" = "xterm"; then
-            PS1="\[\033]2;\h:\u:\w\007\]$PS1"
-          fi
-        '';
-        description = "
-          Script used to initialized shell prompt.
-        ";
-        type = with pkgs.lib.types; string;
-      };
+      default = ''
+        # Provide a nice prompt.
+        PROMPT_COLOR="1;31m"
+        let $UID && PROMPT_COLOR="1;32m"
+        PS1="\n\[\033[$PROMPT_COLOR\][\u@\h:\w]\\$\[\033[0m\] "
+        if test "$TERM" = "xterm"; then
+          PS1="\[\033]2;\h:\u:\w\007\]$PS1"
+        fi
+      '';
+      description = "
+        Script used to initialized shell prompt.
+      ";
+      type = with pkgs.lib.types; string;
+    };
 
     environment.shellInit = mkOption {
-        default = "";
-        example = ''export PATH=/godi/bin/:$PATH'';
-        description = "
-          Script used to initialized user shell environments.
-        ";
-        type = with pkgs.lib.types; string;
-      };
+      default = "";
+      example = ''export PATH=/godi/bin/:$PATH'';
+      description = "
+        Script used to initialized user shell environments.
+      ";
+      type = with pkgs.lib.types; string;
+    };
 
     environment.enableBashCompletion = mkOption {
-        default = false;
-        description = "Enable bash-completion for all interactive shells.";
-        type = with pkgs.lib.types; bool;
-      };
+      default = false;
+      description = "Enable bash-completion for all interactive shells.";
+      type = with pkgs.lib.types; bool;
+    };
 
   };
 
-- 
GitLab


From 622a652411bd5d0c611416adcf60b6eb8e8ce04b Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 11 Nov 2012 21:46:25 +0100
Subject: [PATCH 4183/5331] Add option "environment.binsh" to configure the
 shell executable used to create the global /bin/sh symlink.

---
 modules/programs/bash/bash.nix | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/modules/programs/bash/bash.nix b/modules/programs/bash/bash.nix
index f2b0ac46b06..9d52eeebf8e 100644
--- a/modules/programs/bash/bash.nix
+++ b/modules/programs/bash/bash.nix
@@ -58,6 +58,18 @@ let
       type = with pkgs.lib.types; bool;
     };
 
+    environment.binsh = mkOption {
+      default = "${config.system.build.binsh}/bin/sh";
+      example = "\${pkgs.dash}/bin/dash";
+      type = with pkgs.lib.types; path;
+      description = ''
+        Select the shell executable that is linked system-wide to
+        <literal>/bin/sh</literal>. Please note that NixOS assumes all
+        over the place that shell to be Bash, so override the default
+        setting only if you know exactly what you're doing.
+      '';
+    };
+
   };
 
 in
@@ -99,7 +111,7 @@ in
       # Create the required /bin/sh symlink; otherwise lots of things
       # (notably the system() function) won't work.
       mkdir -m 0755 -p /bin
-      ln -sfn ${config.system.build.binsh}/bin/sh /bin/.sh.tmp
+      ln -sfn "${config.environment.binsh}" /bin/.sh.tmp
       mv /bin/.sh.tmp /bin/sh # atomically replace /bin/sh
     '';
 
-- 
GitLab


From 1350816199b95927273ca17b3ec867a16382d0ee Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 9 Nov 2012 11:45:37 +0100
Subject: [PATCH 4184/5331] test-instrumentation.nix: Don't start agetty on
 hvc0

---
 modules/testing/test-instrumentation.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/modules/testing/test-instrumentation.nix b/modules/testing/test-instrumentation.nix
index 8ceffbcb9ec..0ee3ad65a3d 100644
--- a/modules/testing/test-instrumentation.nix
+++ b/modules/testing/test-instrumentation.nix
@@ -33,8 +33,9 @@ let kernel = config.boot.kernelPackages.kernel; in
 
     # Prevent agetty from being instantiated on ttyS0, since it
     # interferes with the backdoor (writes to ttyS0 will randomly fail
-    # with EIO).
+    # with EIO).  Likewise for hvc0.
     boot.systemd.services."serial-getty@ttyS0".enable = false;
+    boot.systemd.services."serial-getty@hvc0".enable = false;
 
     boot.initrd.postDeviceCommands =
       ''
-- 
GitLab


From d5aae18587efe15d278e45c38029b6be7cccad12 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 9 Nov 2012 11:45:57 +0100
Subject: [PATCH 4185/5331] installer test: Don't wait for getty@tty2 because
 it's started lazily

---
 tests/installer.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/installer.nix b/tests/installer.nix
index 7952e295794..ad126c128b5 100644
--- a/tests/installer.nix
+++ b/tests/installer.nix
@@ -120,7 +120,7 @@ let
 
       # Make sure that we get a login prompt etc.
       $machine->succeed("echo hello");
-      $machine->waitForUnit('getty@tty2');
+      #$machine->waitForUnit('getty@tty2');
       $machine->waitForUnit("rogue");
       $machine->waitForUnit("nixos-manual");
       $machine->waitForUnit("dhcpcd");
-- 
GitLab


From 08e6c0cb7ca1ecaca67567dbf4eddbccd2d4a621 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 12 Nov 2012 09:18:59 +0100
Subject: [PATCH 4186/5331] Update channel URLs

---
 doc/manual/installation.xml                |  2 +-
 maintainers/scripts/ec2/create-ebs-amis.py |  2 +-
 modules/installer/tools/tools.nix          | 10 ++++++----
 modules/programs/bash/profile.sh           |  2 +-
 tests/installer.nix                        |  4 ++--
 5 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/doc/manual/installation.xml b/doc/manual/installation.xml
index ed5348829c8..8bde2f6e053 100644
--- a/doc/manual/installation.xml
+++ b/doc/manual/installation.xml
@@ -322,7 +322,7 @@ packages.</para>
 some reason this is not the case, just do
 
 <screen>
-$ nix-channel --add http://nixos.org/releases/nixos/channels/nixos-unstable
+$ nix-channel --add http://nixos.org/channels/nixos-unstable
 </screen>
 
 You can then upgrade NixOS to the latest version in the channel by
diff --git a/maintainers/scripts/ec2/create-ebs-amis.py b/maintainers/scripts/ec2/create-ebs-amis.py
index 939bd30942d..4dfaa9f3b12 100755
--- a/maintainers/scripts/ec2/create-ebs-amis.py
+++ b/maintainers/scripts/ec2/create-ebs-amis.py
@@ -52,7 +52,7 @@ m.run_command("mkdir -p /mnt")
 m.run_command("mount {0} /mnt".format(device))
 m.run_command("touch /mnt/.ebs")
 m.run_command("mkdir -p /mnt/etc/nixos")
-m.run_command("nix-channel --add http://nixos.org/releases/nixos/channels/nixos-unstable")
+m.run_command("nix-channel --add http://nixos.org/channels/nixos-unstable")
 m.run_command("nix-channel --update")
 m.run_command("nixos-rebuild switch")
 version = m.run_command("nixos-version", capture_stdout=True).replace('"', '').rstrip()
diff --git a/modules/installer/tools/tools.nix b/modules/installer/tools/tools.nix
index d7b8766143a..c3bbfd953f3 100644
--- a/modules/installer/tools/tools.nix
+++ b/modules/installer/tools/tools.nix
@@ -84,8 +84,9 @@ in
 {
   options = {
 
+    # FIXME: remove this option once we're using Nix 1.2.
     installer.nixosURL = pkgs.lib.mkOption {
-      default = http://nixos.org/releases/nixos/channels/nixos-unstable;
+      default = http://nixos.org/channels/nixos-unstable;
       example = http://nixos.org/releases/nixos/nixos-0.1pre1234;
       description = ''
         URL of the Nixpkgs distribution to use when building the
@@ -93,11 +94,12 @@ in
       '';
     };
 
+    # FIXME: idem.
     installer.manifests = pkgs.lib.mkOption {
-      default = [ http://nixos.org/releases/nixos/channels/nixos-unstable/MANIFEST ];
+      default = [ http://nixos.org/channels/nixos-unstable/MANIFEST ];
       example =
-        [ http://nixos.org/releases/nixpkgs/channels/nixpkgs-unstable/MANIFEST
-          http://nixos.org/releases/nixos/channels/nixos-stable/MANIFEST
+        [ http://nixos.org/channels/nixpkgs-unstable/MANIFEST
+          http://nixos.org/channels/nixos-stable/MANIFEST
         ];
       description = ''
         URLs of manifests to be downloaded when you run
diff --git a/modules/programs/bash/profile.sh b/modules/programs/bash/profile.sh
index 1eef2a9e84a..5393a88d5ff 100644
--- a/modules/programs/bash/profile.sh
+++ b/modules/programs/bash/profile.sh
@@ -87,7 +87,7 @@ fi
 
 # Subscribe the root user to the NixOS channel by default.
 if [ "$USER" = root -a ! -e $HOME/.nix-channels ]; then
-    echo "http://nixos.org/releases/nixos/channels/nixos-unstable nixos" > $HOME/.nix-channels
+    echo "http://nixos.org/channels/nixos-unstable nixos" > $HOME/.nix-channels
 fi
 
 # Create the per-user garbage collector roots directory.
diff --git a/tests/installer.nix b/tests/installer.nix
index ad126c128b5..8b695ae5a18 100644
--- a/tests/installer.nix
+++ b/tests/installer.nix
@@ -79,7 +79,7 @@ let
     { services.httpd.enable = true;
       services.httpd.adminAddr = "foo@example.org";
       services.httpd.servedDirs = singleton
-        { urlPath = "/releases/nixos/channels/nixos-unstable";
+        { urlPath = "/channels/nixos-unstable";
           dir = "/tmp/channel";
         };
 
@@ -114,7 +114,7 @@ let
         $webserver->succeed("mkdir /tmp/channel");
         $webserver->succeed(
             "nix-push file:///tmp/channel " .
-            "http://nixos.org/releases/nixos/channels/nixos-unstable " .
+            "http://nixos.org/channels/nixos-unstable " .
             "file:///tmp/channel/MANIFEST ${toString channelContents} >&2");
       ''}
 
-- 
GitLab


From 02e0d7dbc349e8d59a58f1cc23497b1c1d3ff3c4 Mon Sep 17 00:00:00 2001
From: Rickard Nilsson <rickynils@gmail.com>
Date: Mon, 12 Nov 2012 17:58:48 +0100
Subject: [PATCH 4187/5331] dnsmasq: Add extraConfig option

---
 modules/services/networking/dnsmasq.nix | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/modules/services/networking/dnsmasq.nix b/modules/services/networking/dnsmasq.nix
index 0d786add881..b726493d421 100644
--- a/modules/services/networking/dnsmasq.nix
+++ b/modules/services/networking/dnsmasq.nix
@@ -8,6 +8,10 @@ let
 
   serversParam = concatMapStrings (s: "-S ${s} ") cfg.servers;
 
+  dnsmasqConf = pkgs.writeText "dnsmasq.conf" ''
+    ${cfg.extraConfig}
+  '';
+
 in
 
 {
@@ -33,6 +37,15 @@ in
         '';
       };
 
+      extraConfig = mkOption {
+        type = types.string;
+        default = "";
+        description = ''
+          Extra configuration directives that should be added to
+          <literal>dnsmasq.conf</literal>
+        '';
+      };
+
     };
 
   };
@@ -49,7 +62,7 @@ in
 
         daemonType = "daemon";
 
-        exec = "${dnsmasq}/bin/dnsmasq -R ${serversParam} -o";
+        exec = "${dnsmasq}/bin/dnsmasq -R ${serversParam} -o -C ${dnsmasqConf}";
       };
 
   };
-- 
GitLab


From f44d27a96c6ff7c12a6c85a2d7d2069070f550c1 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 15 Nov 2012 22:53:57 +0100
Subject: [PATCH 4188/5331] Make the installer work on systemd

Systemd mounts the root filesystem as a shared subtree, which breaks
recursive bind mounts.
---
 modules/installer/tools/nixos-install.sh | 37 +++++++++++++++---------
 1 file changed, 23 insertions(+), 14 deletions(-)

diff --git a/modules/installer/tools/nixos-install.sh b/modules/installer/tools/nixos-install.sh
index 4e89770cce5..4d3d3db0861 100644
--- a/modules/installer/tools/nixos-install.sh
+++ b/modules/installer/tools/nixos-install.sh
@@ -17,7 +17,7 @@ if test -z "$mountPoint"; then
 fi
 
 if test -z "$NIXOS_CONFIG"; then
-    NIXOS_CONFIG=/mnt/etc/nixos/configuration.nix
+    NIXOS_CONFIG=/etc/nixos/configuration.nix
 fi
 
 if ! test -e "$mountPoint"; then
@@ -30,7 +30,7 @@ if ! grep -F -q " $mountPoint " /proc/mounts; then
     exit 1
 fi
     
-if ! test -e "$NIXOS_CONFIG"; then
+if ! test -e "$mountPoint/$NIXOS_CONFIG"; then
     echo "configuration file $NIXOS_CONFIG doesn't exist"
     exit 1
 fi
@@ -47,21 +47,30 @@ fi
 # Mount some stuff in the target root directory.  We bind-mount /etc
 # into the chroot because we need networking and the nixbld user
 # accounts in /etc/passwd.  But we do need the target's /etc/nixos.
-mkdir -m 0755 -p $mountPoint/dev $mountPoint/proc $mountPoint/sys $mountPoint/mnt $mountPoint/etc
-mount --rbind /dev $mountPoint/dev
-mount --rbind /proc $mountPoint/proc
-mount --rbind /sys $mountPoint/sys
-mount --rbind / $mountPoint/mnt
+mkdir -m 0755 -p $mountPoint/dev $mountPoint/proc $mountPoint/sys $mountPoint/mnt $mountPoint/mnt2 $mountPoint/etc /etc/nixos
+mount --make-private / # systemd makes / shared, which is annoying
+mount --bind / $mountPoint/mnt
+mount --bind /nix/store $mountPoint/mnt/nix/store
+mount --bind /dev $mountPoint/dev
+mount --bind /dev/shm $mountPoint/dev/shm
+mount --bind /proc $mountPoint/proc
+mount --bind /sys $mountPoint/sys
+mount --bind $mountPoint/etc/nixos $mountPoint/mnt2
 mount --bind /etc $mountPoint/etc
-mount --bind $mountPoint/mnt/$mountPoint/etc/nixos $mountPoint/etc/nixos
+mount --bind $mountPoint/mnt2 $mountPoint/etc/nixos
 
 cleanup() {
     set +e
-    umount -l $mountPoint/mnt
-    umount -l $mountPoint/dev
-    umount -l $mountPoint/proc
-    umount -l $mountPoint/sys
-    mountpoint -q $mountPoint/etc && umount -l $mountPoint/etc
+    mountpoint -q $mountPoint/etc/nixos && umount $mountPoint/etc/nixos
+    mountpoint -q $mountPoint/etc && umount $mountPoint/etc
+    umount $mountPoint/mnt2
+    umount $mountPoint/sys
+    umount $mountPoint/proc
+    umount $mountPoint/dev/shm
+    umount $mountPoint/dev
+    umount $mountPoint/mnt/nix/store
+    umount $mountPoint/mnt
+    rmdir $mountPoint/mnt $mountPoint/mnt2
 }
 
 trap "cleanup" EXIT
@@ -151,7 +160,7 @@ srcs=$(nix-env -p /nix/var/nix/profiles/per-user/root/channels -q nixos --no-nam
 # Build the specified Nix expression in the target store and install
 # it into the system configuration profile.
 echo "building the system configuration..."
-NIX_PATH="/mnt$srcs/nixos:nixos-config=/mnt$NIXOS_CONFIG" NIXOS_CONFIG= \
+NIX_PATH="/mnt$srcs/nixos:nixos-config=$NIXOS_CONFIG" NIXOS_CONFIG= \
     chroot $mountPoint @nix@/bin/nix-env \
     -p /nix/var/nix/profiles/system -f '<nixos>' --set -A system --show-trace
 
-- 
GitLab


From 1f401a0e353f88595f06265c09cac2f1983cdacb Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 15 Nov 2012 22:54:43 +0100
Subject: [PATCH 4189/5331] Make install-grub.pl work when $PATH is empty

---
 modules/system/boot/loader/grub/grub.nix        | 1 +
 modules/system/boot/loader/grub/install-grub.pl | 1 +
 2 files changed, 2 insertions(+)

diff --git a/modules/system/boot/loader/grub/grub.nix b/modules/system/boot/loader/grub/grub.nix
index 0a9b374cc60..384865b867b 100644
--- a/modules/system/boot/loader/grub/grub.nix
+++ b/modules/system/boot/loader/grub/grub.nix
@@ -18,6 +18,7 @@ let
         version extraConfig extraPerEntryConfig extraEntries
         extraEntriesBeforeNixOS configurationLimit copyKernels timeout
         default devices;
+      path = makeSearchPath "bin" [ pkgs.coreutils pkgs.gnused pkgs.findutils pkgs.gnugrep ];
     });
 
 in
diff --git a/modules/system/boot/loader/grub/install-grub.pl b/modules/system/boot/loader/grub/install-grub.pl
index 5e9f3b4efda..1d1958a8fe6 100644
--- a/modules/system/boot/loader/grub/install-grub.pl
+++ b/modules/system/boot/loader/grub/install-grub.pl
@@ -38,6 +38,7 @@ my $configurationLimit = int(get("configurationLimit"));
 my $copyKernels = get("copyKernels") eq "true";
 my $timeout = int(get("timeout"));
 my $defaultEntry = int(get("default"));
+$ENV{'PATH'} = get("path");
 
 die "unsupported GRUB version\n" if $grubVersion != 1 && $grubVersion != 2;
 
-- 
GitLab


From 074af5906e7d71e53fe6db5023f17fb3e4d3bda8 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 15 Nov 2012 22:55:00 +0100
Subject: [PATCH 4190/5331] Use new-style fileSystems

---
 tests/installer.nix | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/tests/installer.nix b/tests/installer.nix
index 8b695ae5a18..dd52e817c1d 100644
--- a/tests/installer.nix
+++ b/tests/installer.nix
@@ -49,7 +49,7 @@ let
         boot.loader.grub.extraConfig = "serial; terminal_output.serial";
         boot.initrd.kernelModules = [ "ext3" "ext4" "xfs" "virtio_console" ];
 
-        fileSystems = [ ${fileSystems} ];
+        ${fileSystems}
         swapDevices = [ { label = "swap"; } ];
 
         environment.systemPackages = [ ${optionalString testChannel "pkgs.rlwrap"} ];
@@ -58,16 +58,12 @@ let
 
   rootFS =
     ''
-      { mountPoint = "/";
-        device = "/dev/disk/by-label/nixos";
-      }
+      fileSystems."/".device = "/dev/disk/by-label/nixos";
     '';
 
   bootFS =
     ''
-      { mountPoint = "/boot";
-        device = "/dev/disk/by-label/boot";
-      }
+      fileSystems."/boot".device = "/dev/disk/by-label/boot";
     '';
 
 
-- 
GitLab


From 35922e61d901676f910b71ffd3e2d662fc62339c Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 15 Nov 2012 22:55:36 +0100
Subject: [PATCH 4191/5331] Systemd requires the latest Nix

---
 modules/misc/nixpkgs.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/modules/misc/nixpkgs.nix b/modules/misc/nixpkgs.nix
index 021986bc895..aa4066347b5 100644
--- a/modules/misc/nixpkgs.nix
+++ b/modules/misc/nixpkgs.nix
@@ -81,6 +81,7 @@ in
       upower = pkgs.upower.override { useSystemd = true; };
       polkit = pkgs.polkit.override { useSystemd = true; };
       consolekit = null;
+      nix = pkgs.nixUnstable;
     };
 
   };
-- 
GitLab


From 722a3a7147a3f714b2e2584370fab215733a42a5 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 15 Nov 2012 23:07:05 +0100
Subject: [PATCH 4192/5331] Remove unnecessary (AFAICT) call to toPath

---
 modules/services/hardware/pommed.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/services/hardware/pommed.nix b/modules/services/hardware/pommed.nix
index 63c783f5c6d..32599554fc1 100644
--- a/modules/services/hardware/pommed.nix
+++ b/modules/services/hardware/pommed.nix
@@ -13,7 +13,7 @@ with pkgs.lib;
     };
 
     configFile = mkOption {
-      default = builtins.toPath "${pkgs.pommed}/etc/pommed.conf";
+      default = "${pkgs.pommed}/etc/pommed.conf";
       description = ''
         The contents of the pommed.conf file.
       '';
-- 
GitLab


From fe7b3b7f9bdfcc73cd3c3365751ba0d8d5dc08c3 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 16 Nov 2012 16:34:22 +0100
Subject: [PATCH 4193/5331] Installer test: fix nix-push call

http://hydra.nixos.org/build/3331147
---
 tests/installer.nix | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/tests/installer.nix b/tests/installer.nix
index dd52e817c1d..9f89ad10021 100644
--- a/tests/installer.nix
+++ b/tests/installer.nix
@@ -107,11 +107,9 @@ let
         # to simulate the Nixpkgs channel.
         $webserver->start;
         $webserver->waitForUnit("httpd");
-        $webserver->succeed("mkdir /tmp/channel");
         $webserver->succeed(
-            "nix-push file:///tmp/channel " .
-            "http://nixos.org/channels/nixos-unstable " .
-            "file:///tmp/channel/MANIFEST ${toString channelContents} >&2");
+            "nix-push --bzip2 --dest /tmp/channel --manifest --url-prefix http://nixos.org/channels/nixos-unstable " .
+            "${toString channelContents} >&2");
       ''}
 
       # Make sure that we get a login prompt etc.
-- 
GitLab


From 60bf4c3cd7489f5b627dcd22a4657be8a9eb1cae Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 16 Nov 2012 16:42:45 +0100
Subject: [PATCH 4194/5331] Add a GRUB 1 dependency

http://hydra.nixos.org/build/3331139
---
 modules/system/boot/loader/grub/grub.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/system/boot/loader/grub/grub.nix b/modules/system/boot/loader/grub/grub.nix
index 384865b867b..70cfc87220c 100644
--- a/modules/system/boot/loader/grub/grub.nix
+++ b/modules/system/boot/loader/grub/grub.nix
@@ -18,7 +18,7 @@ let
         version extraConfig extraPerEntryConfig extraEntries
         extraEntriesBeforeNixOS configurationLimit copyKernels timeout
         default devices;
-      path = makeSearchPath "bin" [ pkgs.coreutils pkgs.gnused pkgs.findutils pkgs.gnugrep ];
+      path = makeSearchPath "bin" [ pkgs.coreutils pkgs.gnused pkgs.gnugrep pkgs.findutils pkgs.diffutils ];
     });
 
 in
-- 
GitLab


From 3afa5f86c172acf28bc439bfcb7c585a0e10750c Mon Sep 17 00:00:00 2001
From: James Cook <james.cook@utoronto.ca>
Date: Sun, 18 Nov 2012 11:05:18 -0800
Subject: [PATCH 4195/5331] Fixed the documentation for programs.ssh.forwardX11
 to account for the X11 SECURITY extension.

---
 modules/programs/ssh.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/modules/programs/ssh.nix b/modules/programs/ssh.nix
index 45d518e73f7..6f607c43368 100644
--- a/modules/programs/ssh.nix
+++ b/modules/programs/ssh.nix
@@ -21,8 +21,10 @@ in
           Whether to request X11 forwarding on outgoing connections by default.
           This is useful for running graphical programs on the remote machine and have them display to your local X11 server.
           Historically, this value has depended on the value used by the local sshd daemon, but there really isn't a relation between the two.
-          Warning: never enable X11 forwarding unless you are connecting to a machine you trust!
+          Note: there are some security risks to forwarding an X11 connection.
+          NixOS's X server is built with the SECURITY extension, which prevents some obvious attacks.
           To enable or disable forwarding on a per-connection basis, see the -X and -x options to ssh.
+          The -Y option to ssh enables trusted forwarding, which bypasses the SECURITY extension.
         '';
       };
 
-- 
GitLab


From a22c3621555137a39ffe3e40b836c65baaa79001 Mon Sep 17 00:00:00 2001
From: Rickard Nilsson <rickynils@gmail.com>
Date: Wed, 25 Jul 2012 16:53:46 +0200
Subject: [PATCH 4196/5331] Add option for specifying shell aliases,
 environment.shellAliases.

---
 modules/module-list.nix         |  1 +
 modules/programs/bash/bash.nix  | 20 +++++++++++++++-----
 modules/programs/bash/bashrc.sh |  6 +-----
 modules/programs/shell.nix      | 25 +++++++++++++++++++++++++
 4 files changed, 42 insertions(+), 10 deletions(-)
 create mode 100644 modules/programs/shell.nix

diff --git a/modules/module-list.nix b/modules/module-list.nix
index 0cca6a95544..f2811fd2f5f 100644
--- a/modules/module-list.nix
+++ b/modules/module-list.nix
@@ -39,6 +39,7 @@
   ./programs/blcr.nix
   ./programs/info.nix
   ./programs/shadow.nix
+  ./programs/shell.nix
   ./programs/ssh.nix
   ./programs/ssmtp.nix
   ./programs/wvdial.nix
diff --git a/modules/programs/bash/bash.nix b/modules/programs/bash/bash.nix
index 441d30f1e9f..2ba275c7409 100644
--- a/modules/programs/bash/bash.nix
+++ b/modules/programs/bash/bash.nix
@@ -25,6 +25,9 @@ let
     fi
   '';
 
+  shellAliases = concatStringsSep "\n" (
+    mapAttrsFlatten (k: v: "alias ${k}='${v}'") config.environment.shellAliases
+  );
 
   options = {
 
@@ -63,11 +66,11 @@ in
       { # /etc/bashrc: executed every time a bash starts. Sources
         # /etc/profile to ensure that the system environment is
         # configured properly.
-         source = pkgs.substituteAll {
-           src = ./bashrc.sh;
-           inherit initBashCompletion;
-         };
-         target = "bashrc";
+        source = pkgs.substituteAll {
+          src = ./bashrc.sh;
+          inherit initBashCompletion shellAliases;
+        };
+        target = "bashrc";
       }
 
       { # Configuration for readline in bash.
@@ -76,6 +79,13 @@ in
       }
     ];
 
+  environment.shellAliases = {
+    ls = "ls --color=tty";
+    ll = "ls -l";
+    l = "ls -alh";
+    which = "type -P";
+  };
+
   system.build.binsh = pkgs.bashInteractive;
 
   system.activationScripts.binsh = stringAfter [ "stdio" ]
diff --git a/modules/programs/bash/bashrc.sh b/modules/programs/bash/bashrc.sh
index 4382e7ee9d8..b1ecb278b93 100644
--- a/modules/programs/bash/bashrc.sh
+++ b/modules/programs/bash/bashrc.sh
@@ -29,8 +29,4 @@ fi
 
 @initBashCompletion@
 
-# Some aliases.
-alias ls="ls --color=tty"
-alias ll="ls -l"
-alias l="ls -alh"
-alias which="type -P"
+@shellAliases@
diff --git a/modules/programs/shell.nix b/modules/programs/shell.nix
new file mode 100644
index 00000000000..8348c4c25a1
--- /dev/null
+++ b/modules/programs/shell.nix
@@ -0,0 +1,25 @@
+# This module defines global configuration for the shells.
+
+{ config, pkgs, ... }:
+
+with pkgs.lib;
+
+{
+  options = {
+    environment.shellAliases = mkOption {
+      type = types.attrs; # types.attrsOf types.stringOrPath;
+      default = {};
+      example = {
+        ll = "ls -lh";
+      };
+      description = ''
+        An attribute set that maps aliases (the top level attribute names in
+        this option) to command strings or directly to build outputs. The
+        aliases are added to all users' shells.
+      '';
+    };
+  };
+
+  config = {
+  };
+}
-- 
GitLab


From 611ebeb1d0531a607b14bb10aadcafcfbc8c884d Mon Sep 17 00:00:00 2001
From: Rickard Nilsson <rickynils@gmail.com>
Date: Sun, 16 Sep 2012 18:43:25 +0200
Subject: [PATCH 4197/5331] Add nslcd (nss-pam-ldapd) uid and gid

---
 modules/misc/ids.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/modules/misc/ids.nix b/modules/misc/ids.nix
index f26501105b1..92e9bb90893 100644
--- a/modules/misc/ids.nix
+++ b/modules/misc/ids.nix
@@ -74,6 +74,7 @@ in
     bind = 53;
     wwwrun = 54;
     spamd = 56;
+    nslcd = 58;
 
     # When adding a uid, make sure it doesn't match an existing gid.
 
@@ -129,6 +130,7 @@ in
     adm = 55;
     spamd = 56;
     networkmanager = 57;
+    nslcd = 58;
 
     # When adding a gid, make sure it doesn't match an existing uid.
 
-- 
GitLab


From 6099451662ae156676b4969b0e665ea5b9e045d5 Mon Sep 17 00:00:00 2001
From: Rickard Nilsson <rickynils@gmail.com>
Date: Sun, 16 Sep 2012 19:14:19 +0200
Subject: [PATCH 4198/5331] Add support for nslcd (nss-pam-ldapd) as
 users.ldap.daemon option

---
 modules/config/ldap.nix     | 177 +++++++++++++++++++++++++++---------
 modules/config/nsswitch.nix |  11 +--
 modules/security/pam.nix    |   4 +-
 3 files changed, 142 insertions(+), 50 deletions(-)

diff --git a/modules/config/ldap.nix b/modules/config/ldap.nix
index 3821482361f..1e115943f23 100644
--- a/modules/config/ldap.nix
+++ b/modules/config/ldap.nix
@@ -1,8 +1,13 @@
 {pkgs, config, ...}:
 
+with pkgs.lib;
+with pkgs;
+
 ###### interface
 let
-  inherit (pkgs.lib) mkOption mkIf optionalString stringAfter;
+  inherit mkOption mkIf optionalString stringAfter singleton;
+
+  cfg = config.users.ldap;
 
   options = {
     users = {
@@ -41,7 +46,7 @@ let
 
         timeLimit = mkOption {
           default = 0;
-          type = with pkgs.lib.types; int;
+          type = types.int;
           description = "
             Specifies the time limit (in seconds) to use when performing
             searches. A value of zero (0), which is the default, is to
@@ -49,11 +54,36 @@ let
           ";
         };
 
+        daemon = {
+          enable = mkOption {
+            default = false;
+            description = ''
+              Whether to let the nslcd daemon (nss-pam-ldapd) handle the
+              LDAP lookups for NSS and PAM. This can improve performance,
+              and if you need to bind to the LDAP server with a password,
+              it increases security, since only the nslcd user needs to
+              have access to the bindpw file, not everyone that uses NSS
+              and/or PAM. If this option is enabled, a local nscd user is
+              created automatically, and the nslcd service is started
+              automatically when the network get up.
+            '';
+          };
+
+          extraConfig = mkOption { 
+            default =  ""; 
+            type = types.string;
+            description = '' 
+              Extra configuration options that will be added verbatim at
+              the end of the nslcd configuration file (nslcd.conf).
+            '' ;
+          } ; 
+        };
+
         bind = {
           distinguishedName = mkOption {
             default = "";
             example = "cn=admin,dc=example,dc=com";
-            type = with pkgs.lib.types; string;
+            type = types.string;
             description = "
               The distinguished name to bind to the LDAP server with. If this
               is not specified, an anonymous bind will be done.
@@ -62,7 +92,7 @@ let
 
           password = mkOption {
             default = "/etc/ldap/bind.password";
-            type = with pkgs.lib.types; string;
+            type = types.string;
             description = "
               The path to a file containing the credentials to use when binding
               to the LDAP server (if not binding anonymously).
@@ -71,7 +101,7 @@ let
 
           timeLimit = mkOption {
             default = 30;
-            type = with pkgs.lib.types; int;
+            type = types.int;
             description = "
               Specifies the time limit (in seconds) to use when connecting
               to the directory server. This is distinct from the time limit
@@ -82,7 +112,7 @@ let
 
           policy = mkOption {
             default = "hard_open";
-            type = with pkgs.lib.types; string;
+            type = types.string;
             description = "
               Specifies the policy to use for reconnecting to an unavailable
               LDAP server. The default is <literal>hard_open</literal>, which
@@ -99,55 +129,120 @@ let
           };
         };
 
+        extraConfig = mkOption { 
+          default = "" ; 
+          type = types.string ;
+          description = ''
+            Extra configuration options that will be added verbatim at
+            the end of the ldap configuration file (ldap.conf).
+            If <literal>users.ldap.daemon</literal> is enabled, this
+            configuration will not be used. In that case, use
+            <literal>users.ldap.daemon.extraConfig</literal> instead.
+          '' ;
+        };
+
       };
     };
   };
+
+  # Careful: OpenLDAP seems to be very picky about the indentation of
+  # this file.  Directives HAVE to start in the first column!
+  ldapConfig = {
+    target = "ldap.conf";
+    source = writeText "ldap.conf" ''
+      uri ${config.users.ldap.server}
+      base ${config.users.ldap.base}
+      timelimit ${toString config.users.ldap.timeLimit}
+      bind_timelimit ${toString config.users.ldap.bind.timeLimit}
+      bind_policy ${config.users.ldap.bind.policy}
+      ${optionalString config.users.ldap.useTLS ''
+        ssl start_tls
+        tls_checkpeer no
+      ''}
+      ${optionalString (config.users.ldap.bind.distinguishedName != "") ''
+        binddn ${config.users.ldap.bind.distinguishedName}
+      ''}
+      ${optionalString (cfg.extraConfig != "") cfg.extraConfig }
+    '';
+  };
+
+  nslcdConfig = {
+    target = "nslcd.conf";
+    source = writeText "nslcd.conf" ''
+      uid nslcd
+      gid nslcd
+      uri ${cfg.server}
+      base ${cfg.base}
+      timelimit ${toString cfg.timeLimit}
+      bind_timelimit ${toString cfg.bind.timeLimit}
+      ${optionalString (cfg.bind.distinguishedName != "")
+        "binddn ${cfg.bind.distinguishedName}" }
+      ${optionalString (cfg.daemon.extraConfig != "") cfg.daemon.extraConfig }
+    '';
+  };
+
+  insertLdapPassword = !config.users.ldap.daemon.enable &&
+    config.users.ldap.bind.distinguishedName != "";
+
 in
 
 ###### implementation
-
-mkIf config.users.ldap.enable {
+mkIf cfg.enable {
   require = [
     options
   ];
 
-  # LDAP configuration.
-  environment = {
-    etc = [
-
-      # Careful: OpenLDAP seems to be very picky about the indentation of
-      # this file.  Directives HAVE to start in the first column!
-      { source = pkgs.writeText "ldap.conf"
-          ''
-            uri ${config.users.ldap.server}
-            base ${config.users.ldap.base}
-            timelimit ${toString config.users.ldap.timeLimit}
-            bind_timelimit ${toString config.users.ldap.bind.timeLimit}
-            bind_policy ${config.users.ldap.bind.policy}
-
-            ${optionalString config.users.ldap.useTLS ''
-              ssl start_tls
-              tls_checkpeer no
-            ''}
-
-            ${optionalString (config.users.ldap.bind.distinguishedName != "") ''
-              binddn ${config.users.ldap.bind.distinguishedName}
-            ''}
-          '';
-        target = "ldap.conf";
-      }
-
-    ];
-  };
+  environment.etc = if cfg.daemon.enable then [nslcdConfig] else [ldapConfig];
 
-  system.activationScripts.ldap = stringAfter [ "etc" ] (
-    optionalString (config.users.ldap.bind.distinguishedName != "") ''
-      if test -f "${config.users.ldap.bind.password}" ; then
-        echo "bindpw $(cat ${config.users.ldap.bind.password})" | cat /etc/ldap.conf - > /etc/ldap.conf.bindpw
+  system.activationScripts = mkIf insertLdapPassword {
+    ldap = stringAfter [ "etc" "groups" "users" ] ''
+      if test -f "${cfg.bind.password}" ; then
+        echo "bindpw "$(cat ${cfg.bind.password})"" | cat ${ldapConfig} - > /etc/ldap.conf.bindpw
         mv -fT /etc/ldap.conf.bindpw /etc/ldap.conf
         chmod 600 /etc/ldap.conf
       fi
-    ''
+    '';
+  };
+
+  system.nssModules = singleton (
+    if cfg.daemon.enable then nss_pam_ldapd else nss_ldap
   );
 
+  users = mkIf cfg.daemon.enable {
+    extraGroups.nslcd = {
+      gid = config.ids.gids.nslcd;
+    };
+
+    extraUsers.nslcd = {
+      uid = config.ids.uids.nslcd;
+      description = "nslcd user.";
+      group = "nslcd";
+    };
+  };
+
+  jobs = mkIf cfg.daemon.enable {
+    nslcd = {
+      startOn = "filesystem";
+  
+      stopOn = "stopping network-interfaces";
+  
+      daemonType = "fork";
+  
+      path = [ nss_pam_ldapd ];
+  
+      preStart = ''
+        mkdir -p /run/nslcd
+        chown nslcd.nslcd /run/nslcd
+        ${optionalString (cfg.bind.distinguishedName != "") ''
+          if test -s "${cfg.bind.password}" ; then
+            ln -sfT "${cfg.bind.password}" /run/nslcd/bindpw
+          fi
+        ''}
+      '';
+  
+      postStop = "rm -f /run/nslcd/nslcd.pid";
+  
+      exec = "nslcd";
+    };
+  };
 }
diff --git a/modules/config/nsswitch.nix b/modules/config/nsswitch.nix
index 806ff876303..4660bf7c92d 100644
--- a/modules/config/nsswitch.nix
+++ b/modules/config/nsswitch.nix
@@ -19,14 +19,9 @@ let
       ";
       merge = mergeListOption;
       apply = list:
-        let
-          list2 =
-            list
-            # !!! this should be in the LDAP module
-            ++ optional config.users.ldap.enable pkgs.nss_ldap;
-        in {
-          list = list2;
-          path = makeLibraryPath list2;
+        {
+          inherit list;
+          path = makeLibraryPath list;
         };
     };
 
diff --git a/modules/security/pam.nix b/modules/security/pam.nix
index a77b7697379..d3dd4ef9ac0 100644
--- a/modules/security/pam.nix
+++ b/modules/security/pam.nix
@@ -7,7 +7,9 @@ with pkgs.lib;
 
 let
 
-  inherit (pkgs) pam_ldap pam_krb5 pam_ccreds;
+  inherit (pkgs) pam_krb5 pam_ccreds;
+
+  pam_ldap = if config.users.ldap.daemon.enable then pkgs.nss_pam_ldapd else pkgs.pam_ldap;
 
   otherService = pkgs.writeText "other.pam"
     ''
-- 
GitLab


From f0a6911929ad15054e27e471274e0c304d690670 Mon Sep 17 00:00:00 2001
From: Rob Vermaas <rob.vermaas@gmail.com>
Date: Wed, 21 Nov 2012 12:19:38 -0500
Subject: [PATCH 4199/5331] Add ec2.metadata (default false) option whether to
 allow access to EC2 metadata API.

---
 modules/virtualisation/ec2-data.nix | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/modules/virtualisation/ec2-data.nix b/modules/virtualisation/ec2-data.nix
index 65f40826225..e094ae54093 100644
--- a/modules/virtualisation/ec2-data.nix
+++ b/modules/virtualisation/ec2-data.nix
@@ -5,8 +5,19 @@
 { config, pkgs, ... }:
 
 with pkgs.lib;
-
+let
+  options = {
+    ec2.metadata = mkOption {
+      type = types.bool;
+      default = false;
+      description = ''
+        Whether to allow access to EC2 metadata.
+      '';
+    };
+  };
+in
 {
+  require = [options];
 
   jobs.fetchEC2Data =
     { name = "fetch-ec2-data";
@@ -56,9 +67,11 @@ with pkgs.lib;
               echo "$key_pub" > /etc/ssh/ssh_host_dsa_key.pub
           fi
 
+          ${optionalString (! config.ec2.metadata) ''
           # Since the user data is sensitive, prevent it from being
           # accessed from now on.
           ip route add blackhole 169.254.169.254/32
+          ''}
         '';
     };
 
-- 
GitLab


From cd513482d46c41243934ef5835cda30ca228c474 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Thu, 22 Nov 2012 02:07:25 -0500
Subject: [PATCH 4200/5331] Add rngd service.

Inspired by http://pkgs.fedoraproject.org/cgit/rng-tools.git/tree/rngd.service?id=27b1912b2d9659b6934fd4c887e46c13958e7e3c
---
 modules/module-list.nix   |  1 +
 modules/security/rngd.nix | 26 ++++++++++++++++++++++++++
 2 files changed, 27 insertions(+)
 create mode 100644 modules/security/rngd.nix

diff --git a/modules/module-list.nix b/modules/module-list.nix
index 1f25f2aa1e0..3f66ff917fd 100644
--- a/modules/module-list.nix
+++ b/modules/module-list.nix
@@ -48,6 +48,7 @@
   ./security/pam.nix
   ./security/pam_usb.nix
   ./security/polkit.nix
+  ./security/rngd.nix
   ./security/rtkit.nix
   ./security/setuid-wrappers.nix
   ./security/sudo.nix
diff --git a/modules/security/rngd.nix b/modules/security/rngd.nix
new file mode 100644
index 00000000000..1dfea8ce96f
--- /dev/null
+++ b/modules/security/rngd.nix
@@ -0,0 +1,26 @@
+{ config, pkgs, ... }:
+
+with pkgs.lib;
+
+{
+  options = {
+    security.rngd.enable = mkOption {
+      default = true;
+      description = ''
+        Whether tho enable the rng daemon, which adds entropy from
+        hardware sources of randomness to the kernel entropy pool when
+        available. It is strongly recommended to keep this enabled!
+      '';
+    };
+  };
+
+  config = mkIf config.security.rngd.enable {
+    boot.systemd.services.rngd = {
+      wantedBy = [ config.boot.systemd.defaultUnit ];
+
+      description = "Hardware RNG Entropy Gatherer Daemon";
+
+      serviceConfig.ExecStart = "${pkgs.rng_tools}/sbin/rngd -f";
+    };
+  };
+}
-- 
GitLab


From 77891f8d59adc901eeb64401369c3691db8ed994 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 22 Nov 2012 10:41:54 +0100
Subject: [PATCH 4201/5331] Typo

---
 modules/security/rngd.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/security/rngd.nix b/modules/security/rngd.nix
index 1dfea8ce96f..79f16f68c5c 100644
--- a/modules/security/rngd.nix
+++ b/modules/security/rngd.nix
@@ -7,7 +7,7 @@ with pkgs.lib;
     security.rngd.enable = mkOption {
       default = true;
       description = ''
-        Whether tho enable the rng daemon, which adds entropy from
+        Whether to enable the rng daemon, which adds entropy from
         hardware sources of randomness to the kernel entropy pool when
         available. It is strongly recommended to keep this enabled!
       '';
@@ -16,7 +16,7 @@ with pkgs.lib;
 
   config = mkIf config.security.rngd.enable {
     boot.systemd.services.rngd = {
-      wantedBy = [ config.boot.systemd.defaultUnit ];
+      wantedBy = [ "multi-user.target" ];
 
       description = "Hardware RNG Entropy Gatherer Daemon";
 
-- 
GitLab


From a4bcb26b1a3894022b08381079c2c402d49d611f Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 22 Nov 2012 11:49:47 +0100
Subject: [PATCH 4202/5331] Add options for specifying binary caches

---
 modules/services/misc/nix-daemon.nix | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/modules/services/misc/nix-daemon.nix b/modules/services/misc/nix-daemon.nix
index eeb26ee5e15..5af2d19a839 100644
--- a/modules/services/misc/nix-daemon.nix
+++ b/modules/services/misc/nix-daemon.nix
@@ -194,7 +194,29 @@ in
         '';
       };
 
+      binaryCaches = mkOption {
+        default = [ http://nixos.org/binary-cache ];
+        type = types.list types.string;
+        description = ''
+          List of binary cache URLs used to obtain pre-built binaries
+          of Nix packages.
+        '';
+      };
+
+      trustedBinaryCaches = mkOption {
+        default = [ ];
+        example = [ http://hydra.nixos.org/ ];
+        type = types.list types.string;
+        description = ''
+          List of binary cache URLs that non-root users can use (in
+          addition to those specified using
+          <option>nix.binaryCaches</option> by passing
+          <literal>--option binary-caches</literal> to Nix commands.
+        '';
+      };
+
     };
+
   };
 
 
@@ -225,6 +247,8 @@ in
                 build-max-jobs = ${toString (cfg.maxJobs)}
                 build-use-chroot = ${if cfg.useChroot then "true" else "false"}
                 build-chroot-dirs = ${toString cfg.chrootDirs} $(echo $extraPaths)
+                binary-caches = ${toString config.nix.binaryCaches}
+                trusted-binary-caches = ${toString config.nix.trustedBinaryCaches}
                 $extraOptions
                 END
               '';
-- 
GitLab


From 994a15bc25d4f63c20a3f8929dbe8950e3390429 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 22 Nov 2012 12:04:00 +0100
Subject: [PATCH 4203/5331] nixos-rebuild: Handle options with spaces in them
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Like ‘--option binary-caches "http://foo http://bar"’
---
 modules/installer/tools/nixos-install.sh |  4 ++--
 modules/installer/tools/nixos-rebuild.sh | 26 ++++++++++++------------
 2 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/modules/installer/tools/nixos-install.sh b/modules/installer/tools/nixos-install.sh
index 4d3d3db0861..d1fdc5820b1 100644
--- a/modules/installer/tools/nixos-install.sh
+++ b/modules/installer/tools/nixos-install.sh
@@ -29,12 +29,12 @@ if ! grep -F -q " $mountPoint " /proc/mounts; then
     echo "$mountPoint doesn't appear to be a mount point"
     exit 1
 fi
-    
+
 if ! test -e "$mountPoint/$NIXOS_CONFIG"; then
     echo "configuration file $NIXOS_CONFIG doesn't exist"
     exit 1
 fi
-    
+
 
 # Do a nix-pull to speed up building.
 if test -n "@nixosURL@" -a ${NIXOS_PULL:-1} != 0; then
diff --git a/modules/installer/tools/nixos-rebuild.sh b/modules/installer/tools/nixos-rebuild.sh
index e21a34f996c..f7c22b98dd7 100644
--- a/modules/installer/tools/nixos-rebuild.sh
+++ b/modules/installer/tools/nixos-rebuild.sh
@@ -47,7 +47,7 @@ EOF
 
 
 # Parse the command line.
-extraBuildFlags=
+extraBuildFlags=()
 action=
 pullManifest=
 buildNix=1
@@ -79,20 +79,20 @@ while test "$#" -gt 0; do
         upgrade=1
         ;;
       --show-trace|--no-build-hook|--keep-failed|-K|--keep-going|-k|--verbose|-v|--fallback)
-        extraBuildFlags="$extraBuildFlags $i"
+        extraBuildFlags+=("$i")
         ;;
       --max-jobs|-j|--cores|-I)
         j="$1"; shift 1
-        extraBuildFlags="$extraBuildFlags $i $j"
+        extraBuildFlags+=("$i" "$j")
         ;;
       --option)
         j="$1"; shift 1
         k="$1"; shift 1
-        extraBuildFlags="$extraBuildFlags $i $j $k"
+        extraBuildFlags+=("$i" "$j" "$k")
         ;;
       --fast)
         buildNix=
-        extraBuildFlags="$extraBuildFlags --show-trace"
+        extraBuildFlags+=(--show-trace)
         ;;
       *)
         echo "$0: unknown option \`$i'"
@@ -104,7 +104,7 @@ done
 if test -z "$action"; then showSyntax; fi
 
 if test "$action" = dry-run; then
-    extraBuildFlags="$extraBuildFlags --dry-run"
+    extraBuildFlags+=(--dry-run)
 fi
 
 if test -n "$rollback"; then
@@ -156,9 +156,9 @@ fi
 # more conservative.
 if [ -n "$buildNix" ]; then
     echo "building Nix..." >&2
-    if ! nix-build '<nixos>' -A config.environment.nix -o $tmpDir/nix $extraBuildFlags > /dev/null; then
-        if ! nix-build '<nixos>' -A nixFallback -o $tmpDir/nix $extraBuildFlags > /dev/null; then
-            nix-build '<nixpkgs>' -A nixUnstable -o $tmpDir/nix $extraBuildFlags > /dev/null
+    if ! nix-build '<nixos>' -A config.environment.nix -o $tmpDir/nix "${extraBuildFlags[@]}" > /dev/null; then
+        if ! nix-build '<nixos>' -A nixFallback -o $tmpDir/nix "${extraBuildFlags[@]}" > /dev/null; then
+            nix-build '<nixpkgs>' -A nixUnstable -o $tmpDir/nix "${extraBuildFlags[@]}" > /dev/null
         fi
     fi
     PATH=$tmpDir/nix/bin:$PATH
@@ -171,16 +171,16 @@ fi
 if test -z "$rollback"; then
     echo "building the system configuration..." >&2
     if test "$action" = switch -o "$action" = boot; then
-        nix-env $extraBuildFlags -p /nix/var/nix/profiles/system -f '<nixos>' --set -A system
+        nix-env "${extraBuildFlags[@]}" -p /nix/var/nix/profiles/system -f '<nixos>' --set -A system
         pathToConfig=/nix/var/nix/profiles/system
     elif test "$action" = test -o "$action" = build -o "$action" = dry-run; then
-        nix-build '<nixos>' -A system -K -k $extraBuildFlags > /dev/null
+        nix-build '<nixos>' -A system -K -k "${extraBuildFlags[@]}" > /dev/null
         pathToConfig=./result
     elif [ "$action" = build-vm ]; then
-        nix-build '<nixos>' -A vm -K -k $extraBuildFlags > /dev/null
+        nix-build '<nixos>' -A vm -K -k "${extraBuildFlags[@]}" > /dev/null
         pathToConfig=./result
     elif [ "$action" = build-vm-with-bootloader ]; then
-        nix-build '<nixos>' -A vmWithBootLoader -K -k $extraBuildFlags > /dev/null
+        nix-build '<nixos>' -A vmWithBootLoader -K -k "${extraBuildFlags[@]}" > /dev/null
         pathToConfig=./result
     else
         showSyntax
-- 
GitLab


From e76eb7f1a7864ed36130a6cb8a5d8d98c7d2e40e Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Thu, 22 Nov 2012 10:14:41 -0500
Subject: [PATCH 4204/5331] Disable rngd by default while I work on some
 patches to make it more systemd-friendly

---
 modules/security/rngd.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/security/rngd.nix b/modules/security/rngd.nix
index 79f16f68c5c..a4bf0d1eb2a 100644
--- a/modules/security/rngd.nix
+++ b/modules/security/rngd.nix
@@ -5,11 +5,11 @@ with pkgs.lib;
 {
   options = {
     security.rngd.enable = mkOption {
-      default = true;
+      default = false;
       description = ''
         Whether to enable the rng daemon, which adds entropy from
         hardware sources of randomness to the kernel entropy pool when
-        available. It is strongly recommended to keep this enabled!
+        available.
       '';
     };
   };
-- 
GitLab


From f3c9c83e040135c0b3a42c9b570729c2c01d35ae Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 23 Nov 2012 15:14:16 +0100
Subject: [PATCH 4205/5331] Make it easier to append to the default sudo
 configuration

---
 modules/security/sudo.nix | 39 ++++++++++++++++++++-------------------
 1 file changed, 20 insertions(+), 19 deletions(-)

diff --git a/modules/security/sudo.nix b/modules/security/sudo.nix
index 211ff8a9609..d2db9ee993f 100644
--- a/modules/security/sudo.nix
+++ b/modules/security/sudo.nix
@@ -37,25 +37,6 @@ in
     security.sudo.configFile = mkOption {
       # Note: if syntax errors are detected in this file, the NixOS
       # configuration will fail to build.
-      default =
-        ''
-          # Don't edit this file. Set the NixOS option ‘security.sudo.configFile’ instead.
-
-          # Environment variables to keep for root and %wheel.
-          Defaults:root,%wheel env_keep+=LOCALE_ARCHIVE
-          Defaults:root,%wheel env_keep+=NIX_CONF_DIR
-          Defaults:root,%wheel env_keep+=NIX_PATH
-          Defaults:root,%wheel env_keep+=TERMINFO_DIRS
-
-          # Keep SSH_AUTH_SOCK so that pam_ssh_agent_auth.so can do its magic.
-          Defaults env_keep+=SSH_AUTH_SOCK
-
-          # "root" is allowed to do anything.
-          root        ALL=(ALL) SETENV: ALL
-
-          # Users in the "wheel" group can do anything.
-          %wheel      ALL=(ALL) ${if cfg.wheelNeedsPassword then "" else "NOPASSWD: ALL, "}SETENV: ALL
-        '';
       description =
         ''
           This string contains the contents of the
@@ -69,6 +50,26 @@ in
 
   config = mkIf cfg.enable {
 
+    security.sudo.configFile =
+      ''
+        # Don't edit this file. Set the NixOS option ‘security.sudo.configFile’ instead.
+
+        # Environment variables to keep for root and %wheel.
+        Defaults:root,%wheel env_keep+=LOCALE_ARCHIVE
+        Defaults:root,%wheel env_keep+=NIX_CONF_DIR
+        Defaults:root,%wheel env_keep+=NIX_PATH
+        Defaults:root,%wheel env_keep+=TERMINFO_DIRS
+
+        # Keep SSH_AUTH_SOCK so that pam_ssh_agent_auth.so can do its magic.
+        Defaults env_keep+=SSH_AUTH_SOCK
+
+        # "root" is allowed to do anything.
+        root        ALL=(ALL) SETENV: ALL
+
+        # Users in the "wheel" group can do anything.
+        %wheel      ALL=(ALL) ${if cfg.wheelNeedsPassword then "" else "NOPASSWD: ALL, "}SETENV: ALL
+      '';
+
     security.setuidPrograms = [ "sudo" ];
 
     environment.systemPackages = [ sudo ];
-- 
GitLab


From a5ef0ffe120c58ac0ec38ac3d0ec61181e8071e2 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Mon, 26 Nov 2012 08:45:23 -0500
Subject: [PATCH 4206/5331] rngd: Require /dev/random, only start when a
 hardware randomness source becomes available

---
 modules/security/rngd.nix | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/modules/security/rngd.nix b/modules/security/rngd.nix
index a4bf0d1eb2a..519fb62133c 100644
--- a/modules/security/rngd.nix
+++ b/modules/security/rngd.nix
@@ -5,7 +5,7 @@ with pkgs.lib;
 {
   options = {
     security.rngd.enable = mkOption {
-      default = false;
+      default = true;
       description = ''
         Whether to enable the rng daemon, which adds entropy from
         hardware sources of randomness to the kernel entropy pool when
@@ -15,12 +15,23 @@ with pkgs.lib;
   };
 
   config = mkIf config.security.rngd.enable {
+    services.udev.extraRules = ''
+      KERNEL=="random", TAG+="systemd"
+      SUBSYSTEM=="cpu", ENV{MODALIAS}=="x86cpu:*feature:*009E*", TAG+="systemd", ENV{SYSTEMD_WANTS}+="rngd.service"
+      KERNEL=="hw_random", TAG+="systemd", ENV{SYSTEMD_WANTS}+="rngd.service"
+      KERNEL=="tmp0", TAG+="systemd", ENV{SYSTEMD_WANTS}+="rngd.service"
+    '';
+
     boot.systemd.services.rngd = {
-      wantedBy = [ "multi-user.target" ];
+      bindsTo = [ "dev-random.device" ];
+
+      after = [ "dev-random.device" ];
 
       description = "Hardware RNG Entropy Gatherer Daemon";
 
       serviceConfig.ExecStart = "${pkgs.rng_tools}/sbin/rngd -f";
+
+      restartTriggers = [ pkgs.rng_tools ];
     };
   };
 }
-- 
GitLab


From 403dc16c51343b70172ae2f1aa85f78235918c9a Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 26 Nov 2012 16:19:45 +0100
Subject: [PATCH 4207/5331] sane: update name of the snapshot version of the
 backends

---
 modules/services/hardware/sane.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/services/hardware/sane.nix b/modules/services/hardware/sane.nix
index e9f32a2662c..6849b3a7bc8 100644
--- a/modules/services/hardware/sane.nix
+++ b/modules/services/hardware/sane.nix
@@ -24,7 +24,7 @@ with pkgs.lib;
   ###### implementation
 
     config = let pkg = if config.hardware.sane.snapshot
-                          then pkgs.saneBackendsSnapshot
+                          then pkgs.saneBackendsGit
                           else pkgs.saneBackends;
       in mkIf config.hardware.sane.enable {
            environment.systemPackages = [ pkg ];
-- 
GitLab


From 6b6b245693365ddf3bf255e7b814773c4ce0775f Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 26 Nov 2012 16:19:45 +0100
Subject: [PATCH 4208/5331] sane: update name of the snapshot version of the
 backends

---
 modules/services/hardware/sane.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/services/hardware/sane.nix b/modules/services/hardware/sane.nix
index e9f32a2662c..6849b3a7bc8 100644
--- a/modules/services/hardware/sane.nix
+++ b/modules/services/hardware/sane.nix
@@ -24,7 +24,7 @@ with pkgs.lib;
   ###### implementation
 
     config = let pkg = if config.hardware.sane.snapshot
-                          then pkgs.saneBackendsSnapshot
+                          then pkgs.saneBackendsGit
                           else pkgs.saneBackends;
       in mkIf config.hardware.sane.enable {
            environment.systemPackages = [ pkg ];
-- 
GitLab


From a9e5d1ab50451bbd6cedc6391b7b56df1fdc7fc7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= <viric@viric.name>
Date: Wed, 5 Sep 2012 09:55:02 +0200
Subject: [PATCH 4209/5331] Changing the kernel parameters for crashump

I think that these enable more checks, and make more NMIs happen.
---
 modules/misc/crashdump.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/modules/misc/crashdump.nix b/modules/misc/crashdump.nix
index 98b2140a23d..6e6bc9dec0f 100644
--- a/modules/misc/crashdump.nix
+++ b/modules/misc/crashdump.nix
@@ -6,6 +6,7 @@ let
   crashdump = config.boot.crashDump;
 
   kernelParams = concatStringsSep " " crashdump.kernelParams;
+
 in
 ###### interface
 {
@@ -55,6 +56,8 @@ in
       kernelParams = [
        "crashkernel=64M"
        "nmi_watchdog=panic"
+       "softlockup_panic=1"
+       "idle=poll"
       ];
       kernelPackages = mkOverride 50 (crashdump.kernelPackages // {
         kernel = crashdump.kernelPackages.kernel.override 
-- 
GitLab


From 04963cf80261c7e6c3280c0332ae332840f4b124 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= <viric@viric.name>
Date: Thu, 29 Nov 2012 11:29:15 +0100
Subject: [PATCH 4210/5331] system-tarball-pc: fixing the readme inclusion

---
 modules/installer/cd-dvd/system-tarball-pc.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/installer/cd-dvd/system-tarball-pc.nix b/modules/installer/cd-dvd/system-tarball-pc.nix
index e98a8c215f9..1046786c6df 100644
--- a/modules/installer/cd-dvd/system-tarball-pc.nix
+++ b/modules/installer/cd-dvd/system-tarball-pc.nix
@@ -60,7 +60,7 @@ let
     }
   '';
 
-  readme = builtins.readFile ./system-tarball-pc-readme.txt;
+  readme = ./system-tarball-pc-readme.txt;
 
 in
 
-- 
GitLab


From 9eb81d2578c96dd0408dd2b90c4092c0d6561e67 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 29 Nov 2012 15:16:30 +0100
Subject: [PATCH 4211/5331] Renamed tcpWrapper -> tcp_wrappers

---
 modules/services/system/kerberos.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/services/system/kerberos.nix b/modules/services/system/kerberos.nix
index 2a47b904589..8fb5debd20e 100644
--- a/modules/services/system/kerberos.nix
+++ b/modules/services/system/kerberos.nix
@@ -41,7 +41,7 @@ in
         flags = "REUSE NAMEINARGS";
         protocol = "tcp";
         user = "root";
-        server = "${pkgs.tcpWrapper}/sbin/tcpd";
+        server = "${pkgs.tcp_wrappers}/sbin/tcpd";
         serverArgs = "${pkgs.heimdal}/sbin/kadmind";
       };
 
-- 
GitLab


From 3c6e0fd594801617d77ce78e01d8b066aeb5982e Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 29 Nov 2012 18:51:44 +0100
Subject: [PATCH 4212/5331] Generate the binary hardware database required by
 systemd 196

---
 modules/system/boot/systemd.nix | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/modules/system/boot/systemd.nix b/modules/system/boot/systemd.nix
index e76d35fa9f2..86e269e0763 100644
--- a/modules/system/boot/systemd.nix
+++ b/modules/system/boot/systemd.nix
@@ -442,6 +442,18 @@ in
         }
       ];
 
+    system.activationScripts.systemd =
+      ''
+        mkdir -p /var/lib/udev -m 0755
+
+        # Regenerate the hardware database /var/lib/udev/hwdb.bin
+        # whenever systemd changes.
+        if [ ! -e /var/lib/udev/prev-systemd -o "$(readlink /var/lib/udev/prev-systemd)" != ${systemd} ]; then
+          echo "regenerating udev hardware database..."
+          ${systemd}/bin/udevadm hwdb --update && ln -sfn ${systemd} /var/lib/udev/prev-systemd
+        fi
+      '';
+
     # Target for ‘charon send-keys’ to hook into.
     boot.systemd.targets.keys =
       { description = "Security Keys";
@@ -456,5 +468,6 @@ in
     system.requiredKernelConfig = map config.lib.kernelConfig.isEnabled [
       "CGROUPS" "AUTOFS4_FS" "DEVTMPFS"
     ];
+
   };
 }
-- 
GitLab


From 7435db4f898233f9615b7818c07bbbcf30d44d63 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 30 Nov 2012 15:07:39 +0100
Subject: [PATCH 4213/5331] Get rid of the last uses of mkAlways

mkAlways is an insane function, mkMerge is much saner.
---
 doc/manual/development.xml                    |  21 +---
 modules/config/pulseaudio.nix                 | 119 +++++++++---------
 .../services/network-filesystems/samba.nix    |  82 ++++++------
 3 files changed, 106 insertions(+), 116 deletions(-)

diff --git a/doc/manual/development.xml b/doc/manual/development.xml
index 017a0f007fa..0b02c7f60c6 100644
--- a/doc/manual/development.xml
+++ b/doc/manual/development.xml
@@ -150,7 +150,7 @@ $ nixos-rebuild switch -I <replaceable>/my/sources</replaceable>
   definitions.  This conditional values can be distinguished in two
   categories.  The condition which are local to the current configuration
   and conditions which are dependent on others configurations.  Local
-  properties are <varname>mkIf</varname>, <varname>mkAlways</varname>
+  properties are <varname>mkIf</varname>
   and <varname>mkAssert</varname>.  Global properties
   are <varname>mkOverride</varname>, <varname>mkDefault</varname>
   and <varname>mkOrder</varname>.</para>
@@ -158,12 +158,7 @@ $ nixos-rebuild switch -I <replaceable>/my/sources</replaceable>
 <para><varname>mkIf</varname> is used to remove the option definitions which
   are below it if the condition is evaluated to
   false.  <varname>mkAssert</varname> expects the condition to be evaluated
-  to true otherwise it raises an error message.  <varname>mkAlways</varname>
-  is used to ignore all the <varname>mkIf</varname>
-  and <varname>mkAssert</varname> which have been made
-  previously.  <varname>mkAlways</varname> and <varname>mkAssert</varname>
-  are often used together to set an option value and to ensure that it has
-  not been masked by another one.</para>
+  to true otherwise it raises an error message.</para>
 
 <para><varname>mkOverride</varname> is used to mask previous definitions if
   the current value has a lower mask number.  The mask value is 100 (default)
@@ -223,14 +218,6 @@ let
   locatedb = "/var/cache/locatedb";
   logfile = "/var/log/updatedb";
   cmd =''root  updatedb --localuser=nobody --output=${locatedb} > ${logfile}'';
-
-  mkCheck = x:
-    mkIf cfg.enable (
-      mkAssert config.services.cron.enable ''
-        The cron daemon is not enabled, required by services.locate.enable.
-      ''
-      x
-    )
 in
 
 {
@@ -260,9 +247,9 @@ in
     };
   };
 
-  config = mkCheck {
+  config = mkIf cfg.enable {
     services.cron = {
-      enable = mkAlways cfg.enable;
+      enable = true;
       systemCronJobs = "${cfg.period}  root ${cmd}";
     };
   };
diff --git a/modules/config/pulseaudio.nix b/modules/config/pulseaudio.nix
index 71bf0081e4e..5dffd9d3afb 100644
--- a/modules/config/pulseaudio.nix
+++ b/modules/config/pulseaudio.nix
@@ -28,64 +28,65 @@ let cfg = config.hardware.pulseaudio; in
   };
 
 
-  config = mkIf cfg.enable {
-
-    environment.systemPackages =
-      [ cfg.package ];
-
-    environment.etc = mkAlways (
-      [ # Create pulse/client.conf even if PulseAudio is disabled so
-        # that we can disable the autospawn feature in programs that
-        # are built with PulseAudio support (like KDE).
-        { target = "pulse/client.conf";
-          source = pkgs.writeText "client.conf"
-            ''
-              autospawn=${if cfg.enable then "yes" else "no"}
-              ${optionalString cfg.enable ''
-                daemon-binary=${cfg.package}/bin/pulseaudio
-              ''}
-            '';
-        }
-
-      ] ++ optionals cfg.enable
-      [ # Write an /etc/asound.conf that causes all ALSA applications to
-        # be re-routed to the PulseAudio server through ALSA's Pulse
-        # plugin.
-        { target = "asound.conf";
-          source = pkgs.writeText "asound.conf"
-            ''
-              pcm_type.pulse {
-                lib ${pkgs.alsaPlugins}/lib/alsa-lib/libasound_module_pcm_pulse.so
-              }
-
-              pcm.!default {
-                type pulse
-                hint.description "Default Audio Device (via PulseAudio)"
-              }
-
-              ctl_type.pulse {
-                lib ${pkgs.alsaPlugins}/lib/alsa-lib/libasound_module_ctl_pulse.so
-              }
-
-              ctl.!default {
-                type pulse
-              }
-            '';
-        }
-
-        { target = "pulse/default.pa";
-          source = "${cfg.package}/etc/pulse/default.pa";
-        }
-
-        { target = "pulse/system.pa";
-          source = "${cfg.package}/etc/pulse/system.pa";
-        }
-
-      ]);
-
-    # Allow PulseAudio to get realtime priority using rtkit.
-    security.rtkit.enable = true;
-
-  };
+  config = mkMerge
+    [ # Create pulse/client.conf even if PulseAudio is disabled so
+      # that we can disable the autospawn feature in programs that
+      # are built with PulseAudio support (like KDE).
+      { environment.etc = singleton
+          { target = "pulse/client.conf";
+            source = pkgs.writeText "client.conf"
+              ''
+                autospawn=${if cfg.enable then "yes" else "no"}
+                ${optionalString cfg.enable ''
+                  daemon-binary=${cfg.package}/bin/pulseaudio
+                ''}
+              '';
+          };
+      }
+
+      (mkIf cfg.enable {
+
+        environment.systemPackages = [ cfg.package ];
+
+        environment.etc =
+          [ # Write an /etc/asound.conf that causes all ALSA applications to
+            # be re-routed to the PulseAudio server through ALSA's Pulse
+            # plugin.
+            { target = "asound.conf";
+              source = pkgs.writeText "asound.conf"
+                ''
+                  pcm_type.pulse {
+                    lib ${pkgs.alsaPlugins}/lib/alsa-lib/libasound_module_pcm_pulse.so
+                  }
+
+                  pcm.!default {
+                    type pulse
+                    hint.description "Default Audio Device (via PulseAudio)"
+                  }
+
+                  ctl_type.pulse {
+                    lib ${pkgs.alsaPlugins}/lib/alsa-lib/libasound_module_ctl_pulse.so
+                  }
+
+                  ctl.!default {
+                    type pulse
+                  }
+                '';
+            }
+
+            { target = "pulse/default.pa";
+              source = "${cfg.package}/etc/pulse/default.pa";
+            }
+
+            { target = "pulse/system.pa";
+              source = "${cfg.package}/etc/pulse/system.pa";
+            }
+          ];
+
+        # Allow PulseAudio to get realtime priority using rtkit.
+        security.rtkit.enable = true;
+
+      })
+    ];
 
 }
diff --git a/modules/services/network-filesystems/samba.nix b/modules/services/network-filesystems/samba.nix
index 2cf4e8c11ff..93c07df7cc6 100644
--- a/modules/services/network-filesystems/samba.nix
+++ b/modules/services/network-filesystems/samba.nix
@@ -154,23 +154,23 @@ in
 
       defaultShare = {
         enable = mkOption {
-	  description = "Whether to share /home/smbd as 'default'.";
-	  default = false;
-	};
+          description = "Whether to share /home/smbd as 'default'.";
+          default = false;
+        };
         writeable = mkOption {
-	  description = "Whether to allow write access to default share.";
-	  default = false;
-	};
+          description = "Whether to allow write access to default share.";
+          default = false;
+        };
         guest = mkOption {
-	  description = "Whether to allow guest access to default share.";
-	  default = true;
-	};
+          description = "Whether to allow guest access to default share.";
+          default = true;
+        };
       };
 
       securityType = mkOption {
         description = "Samba security type";
-	default = "user";
-	example = "share";
+        default = "user";
+        example = "share";
       };
 
     };
@@ -180,43 +180,45 @@ in
 
   ###### implementation
 
-  config = mkIf config.services.samba.enable {
+  config = mkMerge
+    [ { # Always provide a smb.conf to shut up programs like smbclient and smbspool.
+        environment.etc = singleton
+          { source =
+              if cfg.enable then configFile
+              else pkgs.writeText "smb-dummy.conf" "# Samba is disabled.";
+            target = "samba/smb.conf";
+          };
+      }
 
-    users.extraUsers = singleton
-      { name = user;
-        description = "Samba service user";
-        group = group;
-      };
+      (mkIf config.services.samba.enable {
+        users.extraUsers = singleton
+          { name = user;
+            description = "Samba service user";
+            group = group;
+          };
 
-    users.extraGroups = singleton
-      { name = group;
-      };
+        users.extraGroups = singleton
+          { name = group;
+          };
 
-    # always provide a smb.conf to shut up programs like smbclient and smbspool.
-    environment.etc = mkAlways (singleton
-      { source =
-          if cfg.enable then configFile
-          else pkgs.writeText "smb-dummy.conf" "# Samba is disabled.";
-        target = "samba/smb.conf";
-      });
 
-    # Dummy job to start the real Samba daemons (nmbd, smbd, winbindd).
-    jobs.sambaControl =
-      { name = "samba";
-        description = "Samba server";
+        # Dummy job to start the real Samba daemons (nmbd, smbd, winbindd).
+        jobs.sambaControl =
+          { name = "samba";
+            description = "Samba server";
 
-        startOn = "started network-interfaces";
-        stopOn = "stopping network-interfaces";
+            startOn = "started network-interfaces";
+            stopOn = "stopping network-interfaces";
 
-        preStart = setupScript;
-      };
+            preStart = setupScript;
+          };
 
-    jobs.nmbd = daemonJob "nmbd" "-D";
+        jobs.nmbd = daemonJob "nmbd" "-D";
 
-    jobs.smbd = daemonJob "smbd" "-D";
+        jobs.smbd = daemonJob "smbd" "-D";
 
-    jobs.winbindd = daemonJob "winbindd" "-D";
-
-  };
+        jobs.winbindd = daemonJob "winbindd" "-D";
+      })
+    ];
 
 }
-- 
GitLab


From a832ce7be1ef16e0847bc2b4689c21101482713a Mon Sep 17 00:00:00 2001
From: Jack Cummings <jack@mudshark.org>
Date: Tue, 4 Dec 2012 10:17:54 -0800
Subject: [PATCH 4214/5331] Add zfs module.

---
 modules/module-list.nix           |  1 +
 modules/tasks/filesystems/zfs.nix | 40 +++++++++++++++++++++++++++++++
 2 files changed, 41 insertions(+)
 create mode 100644 modules/tasks/filesystems/zfs.nix

diff --git a/modules/module-list.nix b/modules/module-list.nix
index f2811fd2f5f..929941fd8ed 100644
--- a/modules/module-list.nix
+++ b/modules/module-list.nix
@@ -220,6 +220,7 @@
   ./tasks/filesystems/reiserfs.nix
   ./tasks/filesystems/vfat.nix
   ./tasks/filesystems/xfs.nix
+  ./tasks/filesystems/zfs.nix
   ./tasks/kbd.nix
   ./tasks/lvm.nix
   ./tasks/network-interfaces.nix
diff --git a/modules/tasks/filesystems/zfs.nix b/modules/tasks/filesystems/zfs.nix
new file mode 100644
index 00000000000..b5742d92248
--- /dev/null
+++ b/modules/tasks/filesystems/zfs.nix
@@ -0,0 +1,40 @@
+{ config, pkgs, ... }:
+
+with pkgs.lib;
+
+let
+
+  inInitrd = any (fs: fs == "zfs") config.boot.initrd.supportedFilesystems;
+  kernel = config.boot.kernelPackages;
+
+in
+
+{
+  ###### implementation
+
+  config = mkIf (any (fs: fs == "zfs") config.boot.supportedFilesystems) {
+
+    boot.kernelModules = [ "spl" "zavl" "zcommon" "zfs" "zlib_deflate" "znvpair" "zunicode" ] ;
+
+    boot.initrd.kernelModules = mkIf inInitrd [ "spl" "zavl" "zcommon" "zfs" "zlib_deflate" "znvpair" "zunicode" ] ;
+
+    boot.initrd.extraUtilsCommands = mkIf inInitrd
+      ''
+        cp -v ${kernel.zfs}/sbin/zfs $out/sbin
+        cp -v ${kernel.zfs}/sbin/zdb $out/sbin
+        cp -v ${kernel.zfs}/sbin/zpool $out/sbin
+      '';
+
+    boot.initrd.postDeviceCommands = mkIf inInitrd
+      ''
+        zpool import -f -a -d /dev
+        zfs mount -a
+      '';
+
+    system.fsPackages = [ kernel.zfs ];
+
+    environment.systemPackages = [ kernel.zfs ];
+
+    services.udev.packages = [ kernel.zfs ];
+  };
+}
-- 
GitLab


From d2789791eeb8923440ba30afd7d9d64d8425b923 Mon Sep 17 00:00:00 2001
From: Jack Cummings <jack@mudshark.org>
Date: Tue, 4 Dec 2012 11:28:05 -0800
Subject: [PATCH 4215/5331] Need extraModulePackages for spl and zfs modules.

---
 modules/tasks/filesystems/zfs.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/modules/tasks/filesystems/zfs.nix b/modules/tasks/filesystems/zfs.nix
index b5742d92248..b0e30d494ec 100644
--- a/modules/tasks/filesystems/zfs.nix
+++ b/modules/tasks/filesystems/zfs.nix
@@ -14,9 +14,10 @@ in
 
   config = mkIf (any (fs: fs == "zfs") config.boot.supportedFilesystems) {
 
-    boot.kernelModules = [ "spl" "zavl" "zcommon" "zfs" "zlib_deflate" "znvpair" "zunicode" ] ;
+    boot.kernelModules = [ "spl" "zfs" ] ;
+    boot.extraModulePackages = [ kernel.zfs kernel.spl ];
 
-    boot.initrd.kernelModules = mkIf inInitrd [ "spl" "zavl" "zcommon" "zfs" "zlib_deflate" "znvpair" "zunicode" ] ;
+    boot.initrd.kernelModules = mkIf inInitrd [ "spl" "zfs" ] ;
 
     boot.initrd.extraUtilsCommands = mkIf inInitrd
       ''
-- 
GitLab


From b42d52eeb0159e716190ea1c96b1fae9c9b619c5 Mon Sep 17 00:00:00 2001
From: Jack Cummings <jack@mudshark.org>
Date: Tue, 4 Dec 2012 11:57:59 -0800
Subject: [PATCH 4216/5331] Add the hostid option. Refactor code a bit better
 for initrd(untested) and system operation.

---
 modules/tasks/filesystems/zfs.nix | 67 ++++++++++++++++++++++---------
 1 file changed, 47 insertions(+), 20 deletions(-)

diff --git a/modules/tasks/filesystems/zfs.nix b/modules/tasks/filesystems/zfs.nix
index b0e30d494ec..d8ea66f2cd4 100644
--- a/modules/tasks/filesystems/zfs.nix
+++ b/modules/tasks/filesystems/zfs.nix
@@ -1,41 +1,68 @@
 { config, pkgs, ... }:
+#
+# todo:
+#   - crontab for scrubs, etc
+#   - zfs tunables
+#   - /etc/zfs/zpool.cache handling
+
 
 with pkgs.lib;
 
 let
 
+  cfgSpl = config.environment.spl;
   inInitrd = any (fs: fs == "zfs") config.boot.initrd.supportedFilesystems;
+  inSystem = any (fs: fs == "zfs") config.boot.supportedFilesystems;
   kernel = config.boot.kernelPackages;
 
 in
 
 {
-  ###### implementation
-
-  config = mkIf (any (fs: fs == "zfs") config.boot.supportedFilesystems) {
 
-    boot.kernelModules = [ "spl" "zfs" ] ;
-    boot.extraModulePackages = [ kernel.zfs kernel.spl ];
+  ###### interface
+  
+  options = { 
+    environment.spl.hostid = mkOption { 
+      default = "";
+      example = "0xdeadbeef";
+      description = ''
+        ZFS uses a system's hostid to determine if a storage pool (zpool) is
+        native to this system, and should thus be imported automatically.
+        Unfortunately, this hostid can change under linux from boot to boot (by
+        changing network adapaters, for instance). Specify a unique 32 bit hostid in
+        hex here for zfs to prevent getting a random hostid between boots and having to
+        manually import pools.
+      '';
+    };
+  };
 
-    boot.initrd.kernelModules = mkIf inInitrd [ "spl" "zfs" ] ;
+  ###### implementation
 
-    boot.initrd.extraUtilsCommands = mkIf inInitrd
-      ''
-        cp -v ${kernel.zfs}/sbin/zfs $out/sbin
-        cp -v ${kernel.zfs}/sbin/zdb $out/sbin
-        cp -v ${kernel.zfs}/sbin/zpool $out/sbin
-      '';
+  config = mkIf ( inInitrd || inSystem ) {
 
-    boot.initrd.postDeviceCommands = mkIf inInitrd
-      ''
-        zpool import -f -a -d /dev
-        zfs mount -a
-      '';
+    boot = { 
+      kernelModules = [ "spl" "zfs" ] ;
+      extraModulePackages = [ kernel.zfs kernel.spl ];
+      extraModprobeConfig = mkIf (cfgSpl.hostid != "") "options spl spl_hostid=${cfgSpl.hostid}";
+    };
 
-    system.fsPackages = [ kernel.zfs ];
+    boot.initrd = mkIf inInitrd { 
+      kernelModules = [ "spl" "zfs" ] ;
+      extraUtilsCommands =
+        ''
+          cp -v ${kernel.zfs}/sbin/zfs $out/sbin
+          cp -v ${kernel.zfs}/sbin/zdb $out/sbin
+          cp -v ${kernel.zfs}/sbin/zpool $out/sbin
+        '';
+      postDeviceCommands =
+        ''
+          zpool import -f -a -d /dev
+          zfs mount -a
+        '';
+    };
 
+    system.fsPackages = [ kernel.zfs ];                  # XXX: needed? zfs doesn't have a fsck
     environment.systemPackages = [ kernel.zfs ];
-
-    services.udev.packages = [ kernel.zfs ];
+    services.udev.packages = [ kernel.zfs ];             # to hook zvol naming, etc. 
   };
 }
-- 
GitLab


From 15a15be2f67391b7cacc526173f7546ae4f30304 Mon Sep 17 00:00:00 2001
From: Evgeny Egorochkin <phreedom.stdin@gmail.com>
Date: Wed, 5 Dec 2012 23:52:24 +0200
Subject: [PATCH 4217/5331] dhcpcd: disable "require dhcp_server_identifier"
 because of so many non-compliant DHCP servers

---
 modules/services/networking/dhcpcd.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/modules/services/networking/dhcpcd.nix b/modules/services/networking/dhcpcd.nix
index 122faf98136..a6c4ca5433d 100644
--- a/modules/services/networking/dhcpcd.nix
+++ b/modules/services/networking/dhcpcd.nix
@@ -24,7 +24,8 @@ let
       option classless_static_routes, ntp_servers, interface_mtu
 
       # A ServerID is required by RFC2131.
-      require dhcp_server_identifier
+      # Commented out because of many non-compliant DHCP servers in the wild :(
+      #require dhcp_server_identifier
 
       # A hook script is provided to lookup the hostname if not set by
       # the DHCP server, but it should not be run by default.
-- 
GitLab


From 860cbf7890a303b35b97e6c5c2c77d8d7bd609d9 Mon Sep 17 00:00:00 2001
From: Evgeny Egorochkin <phreedom.stdin@gmail.com>
Date: Thu, 6 Dec 2012 02:57:19 +0200
Subject: [PATCH 4218/5331] scanner support: create scanner group. Users need
 to be in this group to access scanners.

---
 modules/misc/ids.nix               | 1 +
 modules/services/hardware/sane.nix | 6 ++++++
 2 files changed, 7 insertions(+)

diff --git a/modules/misc/ids.nix b/modules/misc/ids.nix
index 92e9bb90893..218bd0ed47a 100644
--- a/modules/misc/ids.nix
+++ b/modules/misc/ids.nix
@@ -131,6 +131,7 @@ in
     spamd = 56;
     networkmanager = 57;
     nslcd = 58;
+    scanner = 59;
 
     # When adding a gid, make sure it doesn't match an existing uid.
 
diff --git a/modules/services/hardware/sane.nix b/modules/services/hardware/sane.nix
index 6849b3a7bc8..905445f22c1 100644
--- a/modules/services/hardware/sane.nix
+++ b/modules/services/hardware/sane.nix
@@ -29,6 +29,12 @@ with pkgs.lib;
       in mkIf config.hardware.sane.enable {
            environment.systemPackages = [ pkg ];
            services.udev.packages = [ pkg ];
+           
+           users.extraGroups = singleton {
+             name = "scanner";
+             gid = config.ids.gids.scanner;
+           };
+
       };
 
 }
-- 
GitLab


From bdee7f502c737a8fd99e51d170bf9ee77475cd1f Mon Sep 17 00:00:00 2001
From: Jack Cummings <jack@mudshark.org>
Date: Thu, 6 Dec 2012 15:12:10 -0800
Subject: [PATCH 4219/5331] spl module params in boot.spl.*

---
 modules/tasks/filesystems/zfs.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/tasks/filesystems/zfs.nix b/modules/tasks/filesystems/zfs.nix
index d8ea66f2cd4..8c643511724 100644
--- a/modules/tasks/filesystems/zfs.nix
+++ b/modules/tasks/filesystems/zfs.nix
@@ -10,7 +10,7 @@ with pkgs.lib;
 
 let
 
-  cfgSpl = config.environment.spl;
+  cfgSpl = config.boot.spl;
   inInitrd = any (fs: fs == "zfs") config.boot.initrd.supportedFilesystems;
   inSystem = any (fs: fs == "zfs") config.boot.supportedFilesystems;
   kernel = config.boot.kernelPackages;
@@ -22,7 +22,7 @@ in
   ###### interface
   
   options = { 
-    environment.spl.hostid = mkOption { 
+    boot.spl.hostid = mkOption { 
       default = "";
       example = "0xdeadbeef";
       description = ''
-- 
GitLab


From 2b4715d3efad02ceb0d1959822cf928c50dfefd2 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 16 Nov 2012 16:34:22 +0100
Subject: [PATCH 4220/5331] Installer test: fix nix-push call

http://hydra.nixos.org/build/3331147
---
 tests/installer.nix | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/tests/installer.nix b/tests/installer.nix
index 65542ae862e..e5b47c73005 100644
--- a/tests/installer.nix
+++ b/tests/installer.nix
@@ -111,11 +111,9 @@ let
         # to simulate the Nixpkgs channel.
         $webserver->start;
         $webserver->waitForJob("httpd");
-        $webserver->mustSucceed("mkdir /tmp/channel");
-        $webserver->mustSucceed(
-            "nix-push file:///tmp/channel " .
-            "http://nixos.org/releases/nixos/channels/nixos-unstable " .
-            "file:///tmp/channel/MANIFEST ${toString channelContents} >&2");
+        $webserver->succeed(
+            "nix-push --bzip2 --dest /tmp/channel --manifest --url-prefix http://nixos.org/channels/nixos-unstable " .
+            "${toString channelContents} >&2");
       ''}
 
       # Make sure that we get a login prompt etc.
-- 
GitLab


From ef3199f782e536c598c99d6211359b9750c56054 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 22 Nov 2012 11:49:47 +0100
Subject: [PATCH 4221/5331] Add options for specifying binary caches

Cherry-picked a4bcb26b1a3894022b08381079c2c402d49d611f.
---
 modules/services/misc/nix-daemon.nix | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)

diff --git a/modules/services/misc/nix-daemon.nix b/modules/services/misc/nix-daemon.nix
index a955fdd8d35..92e3b627f85 100644
--- a/modules/services/misc/nix-daemon.nix
+++ b/modules/services/misc/nix-daemon.nix
@@ -185,7 +185,30 @@ in
           you should increase this value.
         '';
       };
+
+      binaryCaches = mkOption {
+        default = [ http://nixos.org/binary-cache ];
+        type = types.list types.string;
+        description = ''
+          List of binary cache URLs used to obtain pre-built binaries
+          of Nix packages.
+        '';
+      };
+
+      trustedBinaryCaches = mkOption {
+        default = [ ];
+        example = [ http://hydra.nixos.org/ ];
+        type = types.list types.string;
+        description = ''
+          List of binary cache URLs that non-root users can use (in
+          addition to those specified using
+          <option>nix.binaryCaches</option> by passing
+          <literal>--option binary-caches</literal> to Nix commands.
+        '';
+      };
+
     };
+
   };
 
 
@@ -216,6 +239,8 @@ in
                 build-max-jobs = ${toString (config.nix.maxJobs)}
                 build-use-chroot = ${if config.nix.useChroot then "true" else "false"}
                 build-chroot-dirs = ${toString config.nix.chrootDirs} $(echo $extraPaths)
+                binary-caches = ${toString config.nix.binaryCaches}
+                trusted-binary-caches = ${toString config.nix.trustedBinaryCaches}
                 $extraOptions
                 END
               '';
-- 
GitLab


From 13617b803b274af23dff428012f937b1677e64f6 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sat, 8 Dec 2012 19:00:06 +0100
Subject: [PATCH 4222/5331] Use the binary cache in the installer

Also remove "nixos-rebuild pull".
---
 default.nix                                   |  1 -
 doc/manual/man-nixos-rebuild.xml              | 13 ---------
 .../installer/cd-dvd/installation-cd-base.nix |  2 --
 modules/installer/tools/nixos-install.sh      |  9 +------
 modules/installer/tools/nixos-rebuild.sh      | 27 +------------------
 modules/installer/tools/tools.nix             | 24 +----------------
 tests/installer.nix                           |  3 +--
 7 files changed, 4 insertions(+), 75 deletions(-)

diff --git a/default.nix b/default.nix
index fda19c3a149..9d1475b6961 100644
--- a/default.nix
+++ b/default.nix
@@ -40,7 +40,6 @@ in
 
   # The following are used by nixos-rebuild.
   nixFallback = pkgs.nixUnstable;
-  manifests = config.installer.manifests;
 
   tests = config.tests;
 }
diff --git a/doc/manual/man-nixos-rebuild.xml b/doc/manual/man-nixos-rebuild.xml
index ddf4e40be0c..4828215977e 100644
--- a/doc/manual/man-nixos-rebuild.xml
+++ b/doc/manual/man-nixos-rebuild.xml
@@ -25,12 +25,10 @@
       <arg choice='plain'><option>dry-run</option></arg>
       <arg choice='plain'><option>build-vm</option></arg>
       <arg choice='plain'><option>build-vm-with-bootloader</option></arg>
-      <arg choice='plain'><option>pull</option></arg>
     </group>
     <sbr />
     <arg><option>--upgrade</option></arg>
     <arg><option>--install-grub</option></arg>
-    <arg><option>--no-pull</option></arg>
     <arg><option>--no-build-nix</option></arg>
     <arg><option>--fast</option></arg>
     <arg><option>--rollback</option></arg>
@@ -170,17 +168,6 @@ $ ./result/bin/run-*-vm
       partition, which is mounted read-only in the VM.</para>
     </listitem>
   </varlistentry>
-  
-  <varlistentry>
-    <term><option>pull</option></term>
-    <listitem>
-      <para>This operation fetches the latest manifest in the Nixpkgs
-      channel to speed up subsequent <command>nix-env</command>
-      operations.  This is useful if you are not using
-      <command>nix-channel</command> but still want to use pre-built
-      binary packages.  It doesn’t reconfigure the system</para>
-    </listitem>
-  </varlistentry>
 
 </variablelist>
 
diff --git a/modules/installer/cd-dvd/installation-cd-base.nix b/modules/installer/cd-dvd/installation-cd-base.nix
index 375941d2447..1edb2a45236 100644
--- a/modules/installer/cd-dvd/installation-cd-base.nix
+++ b/modules/installer/cd-dvd/installation-cd-base.nix
@@ -42,8 +42,6 @@ in
 
   isoImage.volumeID = "NIXOS_${config.system.nixosVersion}";
 
-  installer.nixosURL = "http://nixos.org/releases/nixos/nixos-${config.system.nixosVersion}";
-
   boot.postBootCommands =
     ''
       # Provide the NixOS/Nixpkgs sources in /etc/nixos.  This is required
diff --git a/modules/installer/tools/nixos-install.sh b/modules/installer/tools/nixos-install.sh
index 4e89770cce5..a968369198e 100644
--- a/modules/installer/tools/nixos-install.sh
+++ b/modules/installer/tools/nixos-install.sh
@@ -5,7 +5,6 @@
 # - copy closure of Nix to target device
 # - register validity
 # - with a chroot to the target device:
-#   * do a nix-pull
 #   * nix-env -p /nix/var/nix/profiles/system -i <nix-expr for the configuration>
 #   * run the activation script of the configuration (also installs Grub)
 
@@ -36,13 +35,6 @@ if ! test -e "$NIXOS_CONFIG"; then
 fi
     
 
-# Do a nix-pull to speed up building.
-if test -n "@nixosURL@" -a ${NIXOS_PULL:-1} != 0; then
-    mkdir -p /nix/var/nix/channel-cache -m 0755
-    NIX_DOWNLOAD_CACHE=/nix/var/nix/channel-cache \
-        @nix@/bin/nix-pull @nixosURL@/MANIFEST || true
-fi
-
 
 # Mount some stuff in the target root directory.  We bind-mount /etc
 # into the chroot because we need networking and the nixbld user
@@ -107,6 +99,7 @@ export LC_TIME=
 # Create a temporary Nix config file that causes the nixbld users to
 # be used.
 echo "build-users-group = nixbld" > $mountPoint/tmp/nix.conf
+grep binary-caches /etc/nix/nix.conf >> $mountPoint/tmp/nix.conf
 export NIX_CONF_DIR=/tmp
 
 
diff --git a/modules/installer/tools/nixos-rebuild.sh b/modules/installer/tools/nixos-rebuild.sh
index e21a34f996c..dba4b731f7c 100644
--- a/modules/installer/tools/nixos-rebuild.sh
+++ b/modules/installer/tools/nixos-rebuild.sh
@@ -18,14 +18,11 @@ The operation is one of the following:
   build-vm-with-bootloader:
             like build-vm, but include a boot loader in the VM
   dry-run:  just show what store paths would be built/downloaded
-  pull:     just pull the NixOS channel manifest and exit
 
 Options:
 
   --upgrade              fetch the latest version of NixOS before rebuilding
   --install-grub         (re-)install the Grub bootloader
-  --pull                 do a nix-pull to get the latest NixOS channel
-                         manifest
   --no-build-nix         don't build the latest Nix from Nixpkgs before
                          building NixOS
   --rollback             restore the previous NixOS configuration (only
@@ -49,7 +46,6 @@ EOF
 # Parse the command line.
 extraBuildFlags=
 action=
-pullManifest=
 buildNix=1
 rollback=
 upgrade=
@@ -60,15 +56,12 @@ while test "$#" -gt 0; do
       --help)
         showSyntax
         ;;
-      switch|boot|test|build|dry-run|build-vm|build-vm-with-bootloader|pull)
+      switch|boot|test|build|dry-run|build-vm|build-vm-with-bootloader)
         action="$i"
         ;;
       --install-grub)
         export NIXOS_INSTALL_GRUB=1
         ;;
-      --pull)
-        pullManifest=1
-        ;;
       --no-build-nix)
         buildNix=
         ;;
@@ -127,24 +120,6 @@ if initctl status nix-daemon 2>&1 | grep -q 'running'; then
 fi
 
 
-# Pull the manifests defined in the configuration (the "manifests"
-# attribute).  Wonderfully hacky.
-if [ -n "$pullManifest" -o "$action" = pull ]; then
-    set -o pipefail
-    manifests=$(nix-instantiate --eval-only --xml --strict '<nixos>' -A manifests \
-        | grep '<string'  | sed 's^.*"\(.*\)".*^\1^g')
-    set +o pipefail
-    if [ $? -ne 0 ]; then exit 1; fi
-
-    mkdir -p /nix/var/nix/channel-cache
-    for i in $manifests; do
-        NIX_DOWNLOAD_CACHE=/nix/var/nix/channel-cache nix-pull $i || true
-    done
-fi
-
-if [ "$action" = pull ]; then exit 0; fi
-
-
 # If ‘--upgrade’ is given, run ‘nix-channel --update nixos’.
 if [ -n "$upgrade" ]; then
     nix-channel --update nixos
diff --git a/modules/installer/tools/tools.nix b/modules/installer/tools/tools.nix
index d7b8766143a..4eb63a6d16f 100644
--- a/modules/installer/tools/tools.nix
+++ b/modules/installer/tools/tools.nix
@@ -1,7 +1,7 @@
 # This module generates nixos-install, nixos-rebuild,
 # nixos-hardware-scan, etc.
 
-{config, pkgs, modulesPath, ...}:
+{ config, pkgs, modulesPath, ... }:
 
 let
   ### implementation
@@ -23,7 +23,6 @@ let
 
     inherit (pkgs) perl pathsFromGraph;
     nix = config.environment.nix;
-    nixosURL = cfg.nixosURL;
 
     nixClosure = pkgs.runCommand "closure"
       { exportReferencesGraph = ["refs" config.environment.nix]; }
@@ -84,27 +83,6 @@ in
 {
   options = {
 
-    installer.nixosURL = pkgs.lib.mkOption {
-      default = http://nixos.org/releases/nixos/channels/nixos-unstable;
-      example = http://nixos.org/releases/nixos/nixos-0.1pre1234;
-      description = ''
-        URL of the Nixpkgs distribution to use when building the
-        installation CD.
-      '';
-    };
-
-    installer.manifests = pkgs.lib.mkOption {
-      default = [ http://nixos.org/releases/nixos/channels/nixos-unstable/MANIFEST ];
-      example =
-        [ http://nixos.org/releases/nixpkgs/channels/nixpkgs-unstable/MANIFEST
-          http://nixos.org/releases/nixos/channels/nixos-stable/MANIFEST
-        ];
-      description = ''
-        URLs of manifests to be downloaded when you run
-        <command>nixos-rebuild</command> to speed up builds.
-      '';
-    };
-
     installer.enableGraphicalTools = pkgs.lib.mkOption {
       default = false;
       type = with pkgs.lib.types; bool;
diff --git a/tests/installer.nix b/tests/installer.nix
index e5b47c73005..d57cbb6119e 100644
--- a/tests/installer.nix
+++ b/tests/installer.nix
@@ -79,7 +79,7 @@ let
     { services.httpd.enable = true;
       services.httpd.adminAddr = "foo@example.org";
       services.httpd.servedDirs = singleton
-        { urlPath = "/releases/nixos/channels/nixos-unstable";
+        { urlPath = "/binary-cache";
           dir = "/tmp/channel";
         };
 
@@ -129,7 +129,6 @@ let
             "rm /etc/hosts",
             "echo 192.168.1.1 nixos.org > /etc/hosts",
             "ifconfig eth1 up 192.168.1.2",
-            "nixos-rebuild pull",
         );
 
         # Test nix-env.
-- 
GitLab


From 745a2018147efd1bad16ec41bc7eaa55a1678dba Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 11 Dec 2012 13:14:17 +0100
Subject: [PATCH 4223/5331] Check whether
 /proc/sys/net/ipv6/conf/all/disable_ipv6 exists

---
 modules/tasks/network-interfaces.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/modules/tasks/network-interfaces.nix b/modules/tasks/network-interfaces.nix
index 412e62bfe80..64cb4a6749e 100644
--- a/modules/tasks/network-interfaces.nix
+++ b/modules/tasks/network-interfaces.nix
@@ -275,7 +275,9 @@ in
                 EOF
 
                 # Disable or enable IPv6.
-                echo ${if cfg.enableIPv6 then "0" else "1"} > /proc/sys/net/ipv6/conf/all/disable_ipv6
+                if [ -e /proc/sys/net/ipv6/conf/all/disable_ipv6 ]; then
+                  echo ${if cfg.enableIPv6 then "0" else "1"} > /proc/sys/net/ipv6/conf/all/disable_ipv6
+                fi
 
                 # Set the default gateway.
                 ${optionalString (cfg.defaultGateway != "") ''
-- 
GitLab


From 3224ea8a1e394d9189bed3c073294e20ff1591c9 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 11 Dec 2012 13:14:33 +0100
Subject: [PATCH 4224/5331] Don't require nixUnstable

---
 modules/misc/nixpkgs.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/modules/misc/nixpkgs.nix b/modules/misc/nixpkgs.nix
index aa4066347b5..021986bc895 100644
--- a/modules/misc/nixpkgs.nix
+++ b/modules/misc/nixpkgs.nix
@@ -81,7 +81,6 @@ in
       upower = pkgs.upower.override { useSystemd = true; };
       polkit = pkgs.polkit.override { useSystemd = true; };
       consolekit = null;
-      nix = pkgs.nixUnstable;
     };
 
   };
-- 
GitLab


From 68872f81cf71b85e5e25cb38b47d46f849b47964 Mon Sep 17 00:00:00 2001
From: Rickard Nilsson <rickynils@gmail.com>
Date: Tue, 20 Nov 2012 15:13:17 +0100
Subject: [PATCH 4225/5331] openssh: Change the way authorized keys are added
 to the system.

Instead of the somewhat hacky script that inserted public keys
into the users' .ssh/authorized_keys files, use the AuthorizedKeysFile
configuration directive in sshd_config and generate extra key
files for each user (placed in /etc/authorized_keys.d/).
---
 modules/services/networking/ssh/sshd.nix | 110 ++++++-----------------
 1 file changed, 26 insertions(+), 84 deletions(-)

diff --git a/modules/services/networking/ssh/sshd.nix b/modules/services/networking/ssh/sshd.nix
index 830559f3e9d..01269e3f0d7 100644
--- a/modules/services/networking/ssh/sshd.nix
+++ b/modules/services/networking/ssh/sshd.nix
@@ -40,102 +40,44 @@ let
 
   userOptions = {
     openssh.authorizedKeys = {
-
-      preserveExistingKeys = mkOption {
-        type = types.bool;
-        default = true;
-        description = ''
-          If this option is enabled, the keys specified in
-          <literal>keys</literal> and/or <literal>keyFiles</literal> will be
-          placed in a special section of the user's authorized_keys file
-          and any existing keys will be preserved. That section will be
-          regenerated each time NixOS is activated. However, if
-          <literal>preserveExisting</literal> isn't enabled, the complete file
-          will be generated, and any user modifications will be wiped out.
-        '';
-      };
-
       keys = mkOption {
         type = types.listOf types.string;
         default = [];
         description = ''
-          A list of verbatim OpenSSH public keys that should be inserted into the
-          user's authorized_keys file. You can combine the <literal>keys</literal> and
+          A list of verbatim OpenSSH public keys that should be added to the
+          user's authorized keys. The keys are added to a file that the SSH
+          daemon reads in addition to the the user's authorized_keys file.
+          You can combine the <literal>keys</literal> and
           <literal>keyFiles</literal> options.
         '';
       };
 
       keyFiles = mkOption {
-        #type = types.listOf types.string;
         default = [];
         description = ''
-          A list of files each containing one OpenSSH public keys that should be
-          inserted into the user's authorized_keys file. You can combine
-          the <literal>keyFiles</literal> and
-          <literal>keys</literal> options.
+          A list of files each containing one OpenSSH public key that should be
+          added to the user's authorized keys. The contents of the files are
+          read at build time and added to a file that the SSH daemon reads in
+          addition to the the user's authorized_keys file. You can combine the
+          <literal>keyFiles</literal> and <literal>keys</literal> options.
         '';
       };
-
     };
   };
 
-  mkAuthkeyScript =
-    let
-      marker1 = "### NixOS auto-added key. Do not edit!";
-      marker2 = "### NixOS will regenerate this file. Do not edit!";
-      users = map (userName: getAttr userName config.users.extraUsers) (attrNames config.users.extraUsers);
-      usersWithKeys = flip filter users (u:
-        length u.openssh.authorizedKeys.keys != 0 || length u.openssh.authorizedKeys.keyFiles != 0
-      );
-      userLoop = flip concatMapStrings usersWithKeys (u:
-        let
-          authKeys = concatStringsSep "," u.openssh.authorizedKeys.keys;
-          authKeyFiles = concatStrings (map (x: " ${x}") u.openssh.authorizedKeys.keyFiles);
-          preserveExisting = if u.openssh.authorizedKeys.preserveExistingKeys then "true" else "false";
-        in ''
-          mkAuthKeysFile "${u.name}" "${authKeys}" "${authKeyFiles}" "${preserveExisting}"
-        ''
-      );
-    in ''
-      mkAuthKeysFile() {
-        local userName="$1"
-        local authKeys="$2"
-        local authKeyFiles="$3"
-        local preserveExisting="$4"
-
-        eval homeDir=~$userName
-        if ! [ -d "$homeDir" ]; then
-          echo "User $userName does not exist"
-          return
-        fi
-        if ! [ -d "$homeDir/.ssh" ]; then
-          mkdir -v -m 700 "$homeDir/.ssh"
-          chown "$userName":users "$homeDir/.ssh"
-        fi
-        local authKeysFile="$homeDir/.ssh/authorized_keys"
-        touch "$authKeysFile"
-        if [ "$preserveExisting" == false ]; then
-          rm -f "$authKeysFile"
-          echo "${marker2}" > "$authKeysFile"
-        else
-          sed -i '/${marker1}/ d' "$authKeysFile"
-        fi
-        IFS=,
-        for f in $authKeys; do
-          echo "$f ${marker1}" >> "$authKeysFile"
-        done
-        unset IFS
-        for f in $authKeyFiles; do
-          if [ -f "$f" ]; then
-            echo "$(cat "$f") ${marker1}" >> "$authKeysFile"
-          fi
-        done
-        chown "$userName" "$authKeysFile"
-      }
-
-      ${userLoop}
-    '';
-
+  authKeysFiles = with {
+    mkAuthKeyFile = u: {
+      target = "ssh/authorized_keys.d/${u.name}";
+      mode = "0444";
+      source = pkgs.writeText "${u.name}-authorized_keys" ''
+        ${concatStringsSep "\n" u.openssh.authorizedKeys.keys}
+        ${concatMapStrings (f: builtins.readFile f + "\n") u.openssh.authorizedKeys.keyFiles}
+      '';
+    };
+    usersWithKeys = attrValues (flip filterAttrs config.users.extraUsers (n: u:
+      length u.openssh.authorizedKeys.keys != 0 || length u.openssh.authorizedKeys.keyFiles != 0
+    ));
+  }; map mkAuthKeyFile usersWithKeys;
 
 in
 
@@ -305,7 +247,7 @@ in
         home = "/var/empty";
       };
 
-    environment.etc = [
+    environment.etc = authKeysFiles ++ [
       { source = "${pkgs.openssh}/etc/ssh/moduli";
         target = "ssh/moduli";
       }
@@ -326,12 +268,10 @@ in
           LOCALE_ARCHIVE = "/run/current-system/sw/lib/locale/locale-archive";
         };
 
-        path = [ pkgs.openssh pkgs.gnused ];
+        path = [ pkgs.openssh ];
 
         preStart =
           ''
-            ${mkAuthkeyScript}
-
             mkdir -m 0755 -p /etc/ssh
 
             if ! test -f ${cfg.hostKeyPath}; then
@@ -379,6 +319,8 @@ in
         GatewayPorts ${cfg.gatewayPorts}
         PasswordAuthentication ${if cfg.passwordAuthentication then "yes" else "no"}
         ChallengeResponseAuthentication ${if cfg.challengeResponseAuthentication then "yes" else "no"}
+
+        AuthorizedKeysFile .ssh/authorized_keys .ssh/authorized_keys2 /etc/ssh/authorized_keys.d/%u
       '';
 
     assertions = [{ assertion = if cfg.forwardX11 then cfgc.setXAuthLocation else true;
-- 
GitLab


From eda051cff5fda79181515c0cc65e07c5400d6ab9 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 11 Dec 2012 17:14:52 +0100
Subject: [PATCH 4226/5331] Remove abuse of "with"

---
 modules/services/networking/ssh/sshd.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/modules/services/networking/ssh/sshd.nix b/modules/services/networking/ssh/sshd.nix
index 01269e3f0d7..2bfddb2e986 100644
--- a/modules/services/networking/ssh/sshd.nix
+++ b/modules/services/networking/ssh/sshd.nix
@@ -65,7 +65,7 @@ let
     };
   };
 
-  authKeysFiles = with {
+  authKeysFiles = let
     mkAuthKeyFile = u: {
       target = "ssh/authorized_keys.d/${u.name}";
       mode = "0444";
@@ -77,7 +77,7 @@ let
     usersWithKeys = attrValues (flip filterAttrs config.users.extraUsers (n: u:
       length u.openssh.authorizedKeys.keys != 0 || length u.openssh.authorizedKeys.keyFiles != 0
     ));
-  }; map mkAuthKeyFile usersWithKeys;
+  in map mkAuthKeyFile usersWithKeys;
 
 in
 
@@ -198,11 +198,11 @@ in
           The set of system-wide known SSH hosts.
         '';
         example = [
-          { 
+          {
             hostNames = [ "myhost" "myhost.mydomain.com" "10.10.1.4" ];
             publicKeyFile = ./pubkeys/myhost_ssh_host_dsa_key.pub;
           }
-          { 
+          {
             hostNames = [ "myhost2" ];
             publicKeyFile = ./pubkeys/myhost2_ssh_host_dsa_key.pub;
           }
-- 
GitLab


From 78bd54ca804a3494257c57153520d49025804238 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 11 Dec 2012 17:29:34 +0100
Subject: [PATCH 4227/5331] Allow setting additional AuthorizedKeysFiles

Charon needs this to include the dynamically generated
/root/.vbox-charon-client-key.  (We used
users.extraUsers.root.openssh.authorizedKeys.keyFiles for this, but
that no longer works.)
---
 modules/services/networking/ssh/sshd.nix | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/modules/services/networking/ssh/sshd.nix b/modules/services/networking/ssh/sshd.nix
index 2bfddb2e986..14570b76735 100644
--- a/modules/services/networking/ssh/sshd.nix
+++ b/modules/services/networking/ssh/sshd.nix
@@ -186,6 +186,11 @@ in
         '';
       };
 
+      authorizedKeysFiles = mkOption {
+        default = [];
+        description = "Files from with authorized keys are read.";
+      };
+
       extraConfig = mkOption {
         default = "";
         description = "Verbatim contents of <filename>sshd_config</filename>.";
@@ -290,6 +295,9 @@ in
 
     networking.firewall.allowedTCPPorts = cfg.ports;
 
+    services.openssh.authorizedKeysFiles =
+      [ ".ssh/authorized_keys" ".ssh/authorized_keys2" "/etc/ssh/authorized_keys.d/%u" ];
+
     services.openssh.extraConfig =
       ''
         Protocol 2
@@ -320,7 +328,7 @@ in
         PasswordAuthentication ${if cfg.passwordAuthentication then "yes" else "no"}
         ChallengeResponseAuthentication ${if cfg.challengeResponseAuthentication then "yes" else "no"}
 
-        AuthorizedKeysFile .ssh/authorized_keys .ssh/authorized_keys2 /etc/ssh/authorized_keys.d/%u
+        AuthorizedKeysFile ${toString cfg.authorizedKeysFiles}
       '';
 
     assertions = [{ assertion = if cfg.forwardX11 then cfgc.setXAuthLocation else true;
-- 
GitLab


From 859badc9663240f7d3c4279d9e657134f8395f17 Mon Sep 17 00:00:00 2001
From: Rob Vermaas <rob.vermaas@gmail.com>
Date: Tue, 11 Dec 2012 20:54:19 +0100
Subject: [PATCH 4228/5331] Zabbix agent: RemainAfterExit=true seems to give
 more reliable restarts, cannot completely figure out why, as Type=forking
 should be enough.

---
 modules/services/monitoring/zabbix-agent.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/modules/services/monitoring/zabbix-agent.nix b/modules/services/monitoring/zabbix-agent.nix
index e5e27bb0c9a..9758bc8cb48 100644
--- a/modules/services/monitoring/zabbix-agent.nix
+++ b/modules/services/monitoring/zabbix-agent.nix
@@ -88,6 +88,7 @@ in
 
         serviceConfig.ExecStart = "@${pkgs.zabbix.agent}/sbin/zabbix_agentd zabbix_agentd --config ${configFile}";
         serviceConfig.Type = "forking";
+        serviceConfig.RemainAfterExit = true;
         serviceConfig.Restart = "always";
         serviceConfig.RestartSec = 2;
       };
-- 
GitLab


From e312df06f087a276346228d9dfc16d281fa49b77 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Carles=20Pag=C3=A8s?= <page@cubata.homelinux.net>
Date: Thu, 13 Dec 2012 11:36:18 +0100
Subject: [PATCH 4229/5331] Add support for nvidia 304.xx drivers in xserver.

Those were already in nixpkgs, but not supported in xserver. Since some time
ago the current 310.xx dropped support for some not so new cards.
---
 modules/services/x11/xserver.nix | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/modules/services/x11/xserver.nix b/modules/services/x11/xserver.nix
index 1aa432afdfc..421f80c42bb 100644
--- a/modules/services/x11/xserver.nix
+++ b/modules/services/x11/xserver.nix
@@ -18,6 +18,7 @@ let
     nvidia       = { modules = [ kernelPackages.nvidia_x11 ]; };
     nvidiaLegacy96 = { modules = [ kernelPackages.nvidia_x11_legacy96 ]; driverName = "nvidia"; };
     nvidiaLegacy173 = { modules = [ kernelPackages.nvidia_x11_legacy173 ]; driverName = "nvidia"; };
+    nvidiaLegacy304 = { modules = [ kernelPackages.nvidia_x11_legacy304 ]; driverName = "nvidia"; };
     unichrome    = { modules = [ pkgs.xorgVideoUnichrome ]; };
     virtualbox   = { modules = [ kernelPackages.virtualboxGuestAdditions ]; driverName = "vboxvideo"; };
   };
@@ -340,6 +341,7 @@ in
       optional (elem "nvidia" driverNames) kernelPackages.nvidia_x11 ++
       optional (elem "nvidiaLegacy96" driverNames) kernelPackages.nvidia_x11_legacy96 ++
       optional (elem "nvidiaLegacy173" driverNames) kernelPackages.nvidia_x11_legacy173 ++
+      optional (elem "nvidiaLegacy304" driverNames) kernelPackages.nvidia_x11_legacy304 ++
       optional (elem "virtualbox" driverNames) kernelPackages.virtualboxGuestAdditions ++
       optional (elem "ati_unfree" driverNames) kernelPackages.ati_drivers_x11;
 
@@ -378,6 +380,7 @@ in
       ++ optional (elem "nvidia" driverNames) kernelPackages.nvidia_x11
       ++ optional (elem "nvidiaLegacy96" driverNames) kernelPackages.nvidia_x11_legacy96
       ++ optional (elem "nvidiaLegacy173" driverNames) kernelPackages.nvidia_x11_legacy173
+      ++ optional (elem "nvidiaLegacy304" driverNames) kernelPackages.nvidia_x11_legacy304
       ++ optional (elem "virtualbox" driverNames) xorg.xrefresh
       ++ optional (elem "ati_unfree" driverNames) kernelPackages.ati_drivers_x11;
 
@@ -409,6 +412,8 @@ in
             LD_LIBRARY_PATH = "${xorg.libX11}/lib:${xorg.libXext}/lib:${kernelPackages.nvidia_x11_legacy96}/lib";
           } // optionalAttrs (elem "nvidiaLegacy173" driverNames) {
             LD_LIBRARY_PATH = "${xorg.libX11}/lib:${xorg.libXext}/lib:${kernelPackages.nvidia_x11_legacy173}/lib";
+          } // optionalAttrs (elem "nvidiaLegacy304" driverNames) {
+            LD_LIBRARY_PATH = "${xorg.libX11}/lib:${xorg.libXext}/lib:${kernelPackages.nvidia_x11_legacy304}/lib";
           } // optionalAttrs (elem "ati_unfree" driverNames) {
             LD_LIBRARY_PATH = "${xorg.libX11}/lib:${xorg.libXext}/lib:${kernelPackages.ati_drivers_x11}/lib:${kernelPackages.ati_drivers_x11}/X11R6/lib64/modules/linux";
             XORG_DRI_DRIVER_PATH = "${kernelPackages.ati_drivers_x11}/lib/dri"; # is ignored because ati drivers ship their own unpatched libglx.so !
@@ -429,6 +434,8 @@ in
                 "ln -sf ${kernelPackages.nvidia_x11_legacy96} /run/opengl-driver"
               else if elem "nvidiaLegacy173" driverNames then
                 "ln -sf ${kernelPackages.nvidia_x11_legacy173} /run/opengl-driver"
+              else if elem "nvidiaLegacy304" driverNames then
+                "ln -sf ${kernelPackages.nvidia_x11_legacy304} /run/opengl-driver"
               else if elem "ati_unfree" driverNames then
                 "ln -sf ${kernelPackages.ati_drivers_x11} /run/opengl-driver"
               else if cfg.driSupport then
-- 
GitLab


From 5437424297c067a706081a26146bc1c65590c39a Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 13 Dec 2012 15:02:58 +0100
Subject: [PATCH 4230/5331] Hackery to build against both the nixpkgs master
 and systemd branch

---
 modules/misc/nixpkgs.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/misc/nixpkgs.nix b/modules/misc/nixpkgs.nix
index 021986bc895..03979e259bf 100644
--- a/modules/misc/nixpkgs.nix
+++ b/modules/misc/nixpkgs.nix
@@ -76,7 +76,7 @@ in
     # FIXME
     nixpkgs.config.packageOverrides = pkgs: {
       #udev = pkgs.systemd;
-      slim = pkgs.slim.override { consolekit = null; };
+      slim = pkgs.slim.override (args: if args ? consolekit then { consolekit = null; } else { });
       lvm2 = pkgs.lvm2.override { udev = pkgs.systemd; };
       upower = pkgs.upower.override { useSystemd = true; };
       polkit = pkgs.polkit.override { useSystemd = true; };
-- 
GitLab


From bd7ea9be5895e3545fbd35450f5d0db521684396 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 14 Dec 2012 17:42:54 +0100
Subject: [PATCH 4231/5331] sysinit.target: Drop the dependency on
 local-fs.target and swap.target

Having all services with DefaultDependencies=yes depend on
local-fs.target is annoying, because some of those services might be
necessary to mount local filesystems.  For instance, Charon's
send-keys feature requires sshd to be running in order to receive LUKS
encryption keys, which in turn requires dhcpcd, and so on.  So we drop
this dependency (and swap.target as well for consistency).  If
services require a specific mount, they should use RequiresMountsFor
in any case.
---
 modules/system/boot/systemd.nix | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/modules/system/boot/systemd.nix b/modules/system/boot/systemd.nix
index 720c8efc53f..eee65a3ffe0 100644
--- a/modules/system/boot/systemd.nix
+++ b/modules/system/boot/systemd.nix
@@ -22,7 +22,7 @@ let
   upstreamUnits =
     [ # Targets.
       "basic.target"
-      "sysinit.target"
+      #"sysinit.target"
       "sockets.target"
       "graphical.target"
       "multi-user.target"
@@ -459,6 +459,17 @@ in
       { description = "Security Keys";
       };
 
+    # This is like the upstream sysinit.target, except that it doesn't
+    # depend on local-fs.target and swap.target.  If services need to
+    # be started after some filesystem (local or otherwise) has been
+    # mounted, they should use the RequiresMountsFor option.
+    boot.systemd.targets.sysinit =
+      { description = "System Initialization";
+        after = [ "emergency.service" "emergency.target" ];
+        unitConfig.Conflicts = "emergency.service emergency.target";
+        unitConfig.RefuseManualStart = true;
+      };
+
     boot.systemd.units =
       { "rescue.service".text = rescueService; }
       // mapAttrs' (n: v: nameValuePair "${n}.target" (targetToUnit n v)) cfg.targets
-- 
GitLab


From 14483c0bf9326fda1c592da53b3df43081d3f159 Mon Sep 17 00:00:00 2001
From: Florian Friesdorf <flo@chaoflow.net>
Date: Fri, 14 Dec 2012 18:24:41 +0100
Subject: [PATCH 4232/5331] update nixos channel path

---
 doc/manual/installation.xml                           | 2 +-
 maintainers/scripts/ec2/create-ebs-amis.py            | 2 +-
 modules/installer/cd-dvd/system-tarball-pc-readme.txt | 2 +-
 modules/programs/bash/profile.sh                      | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/doc/manual/installation.xml b/doc/manual/installation.xml
index 0a69ce0ecba..6f19cc1a0b8 100644
--- a/doc/manual/installation.xml
+++ b/doc/manual/installation.xml
@@ -326,7 +326,7 @@ packages.</para>
 some reason this is not the case, just do
 
 <screen>
-$ nix-channel --add http://nixos.org/releases/nixos/channels/nixos-unstable
+$ nix-channel --add http://nixos.org/channels/nixos-unstable
 </screen>
 
 You can then upgrade NixOS to the latest version in the channel by
diff --git a/maintainers/scripts/ec2/create-ebs-amis.py b/maintainers/scripts/ec2/create-ebs-amis.py
index 939bd30942d..4dfaa9f3b12 100755
--- a/maintainers/scripts/ec2/create-ebs-amis.py
+++ b/maintainers/scripts/ec2/create-ebs-amis.py
@@ -52,7 +52,7 @@ m.run_command("mkdir -p /mnt")
 m.run_command("mount {0} /mnt".format(device))
 m.run_command("touch /mnt/.ebs")
 m.run_command("mkdir -p /mnt/etc/nixos")
-m.run_command("nix-channel --add http://nixos.org/releases/nixos/channels/nixos-unstable")
+m.run_command("nix-channel --add http://nixos.org/channels/nixos-unstable")
 m.run_command("nix-channel --update")
 m.run_command("nixos-rebuild switch")
 version = m.run_command("nixos-version", capture_stdout=True).replace('"', '').rstrip()
diff --git a/modules/installer/cd-dvd/system-tarball-pc-readme.txt b/modules/installer/cd-dvd/system-tarball-pc-readme.txt
index c4a0a111cd3..8f0a8d355c6 100644
--- a/modules/installer/cd-dvd/system-tarball-pc-readme.txt
+++ b/modules/installer/cd-dvd/system-tarball-pc-readme.txt
@@ -80,7 +80,7 @@ had booted this nixos. Run:
 *  `grep local-cmds run/current-system/init`
 
 Then you can proceed normally subscribing to a nixos channel:
-  nix-channel --add http://nixos.org/releases/nixos/channels/nixos-unstable
+  nix-channel --add http://nixos.org/channels/nixos-unstable
   nix-channel --update
 
 Testing:
diff --git a/modules/programs/bash/profile.sh b/modules/programs/bash/profile.sh
index 1eef2a9e84a..5393a88d5ff 100644
--- a/modules/programs/bash/profile.sh
+++ b/modules/programs/bash/profile.sh
@@ -87,7 +87,7 @@ fi
 
 # Subscribe the root user to the NixOS channel by default.
 if [ "$USER" = root -a ! -e $HOME/.nix-channels ]; then
-    echo "http://nixos.org/releases/nixos/channels/nixos-unstable nixos" > $HOME/.nix-channels
+    echo "http://nixos.org/channels/nixos-unstable nixos" > $HOME/.nix-channels
 fi
 
 # Create the per-user garbage collector roots directory.
-- 
GitLab


From 1ae44e42ed9aaa9e8b11b410855b0f87d9ca4d4b Mon Sep 17 00:00:00 2001
From: Alexander Inyukhin <shurick@sectorb.msk.ru>
Date: Sat, 15 Dec 2012 22:05:32 +0400
Subject: [PATCH 4233/5331] Use zoneinfo from tzdata

This fixes #50
---
 modules/config/timezone.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/config/timezone.nix b/modules/config/timezone.nix
index 38c698bc21c..e891af344cc 100644
--- a/modules/config/timezone.nix
+++ b/modules/config/timezone.nix
@@ -27,7 +27,7 @@ with pkgs.lib;
     environment.shellInit =
       ''
         export TZ=${config.time.timeZone}
-        export TZDIR=${pkgs.glibc}/share/zoneinfo
+        export TZDIR=${pkgs.tzdata}/share/zoneinfo
       '';
 
     environment.etc = singleton
-- 
GitLab


From 90e825481d42aa88ed0bdb553b3a06b40a3cba22 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Sat, 15 Dec 2012 14:25:25 -0500
Subject: [PATCH 4234/5331] Update create-ebs-amis.py to recent charon

---
 maintainers/scripts/ec2/create-ebs-amis.py | 40 ++++++++++++++++------
 1 file changed, 29 insertions(+), 11 deletions(-)

diff --git a/maintainers/scripts/ec2/create-ebs-amis.py b/maintainers/scripts/ec2/create-ebs-amis.py
index 4dfaa9f3b12..3dd1972c5f2 100755
--- a/maintainers/scripts/ec2/create-ebs-amis.py
+++ b/maintainers/scripts/ec2/create-ebs-amis.py
@@ -32,10 +32,16 @@ f.write('''{{
 '''.format(args.region, key_name, ebs_size))
 f.close()
 
-depl = deployment.Deployment("./ebs-creator.json", create=True, nix_exprs=["./ebs-creator.nix", "./ebs-creator-config.nix"])
-depl.load_state()
-if not args.keep: depl.destroy_vms()
-depl.deploy()
+db = deployment.open_database("./ebs-creator.charon")
+try:
+    depl = deployment.open_deployment(db, "ebs-creator")
+except Exception:
+    depl = deployment.create_deployment(db)
+    depl.name = "ebs-creator"
+depl.auto_response = "y"
+depl.nix_exprs = ["./ebs-creator.nix", "./ebs-creator-config.nix"]
+if not args.keep: depl.destroy_resources()
+depl.deploy(allow_reboot=True)
 
 m = depl.machines['machine']
 
@@ -52,8 +58,16 @@ m.run_command("mkdir -p /mnt")
 m.run_command("mount {0} /mnt".format(device))
 m.run_command("touch /mnt/.ebs")
 m.run_command("mkdir -p /mnt/etc/nixos")
-m.run_command("nix-channel --add http://nixos.org/channels/nixos-unstable")
-m.run_command("nix-channel --update")
+# Kind of hacky until the nixos channel is updated to systemd
+#m.run_command("nix-channel --add http://nixos.org/channels/nixos-unstable")
+#m.run_command("nix-channel --update")
+m.run_command("mkdir unpack")
+m.run_command("cd unpack; (curl -L http://hydra.nixos.org/job/nixos/systemd/channel/latest/download | bzcat | tar xv)")
+m.run_command("mkdir nixos")
+m.run_command("mv unpack/*/* nixos")
+m.run_command("mv nixos unpack/*")
+m.run_command("nix-env -p /nix/var/nix/profiles/per-user/root/channels -i $(nix-store --add unpack/*)")
+m.run_command("rm -fR unpack")
 m.run_command("nixos-rebuild switch")
 version = m.run_command("nixos-version", capture_stdout=True).replace('"', '').rstrip()
 print >> sys.stderr, "NixOS version is {0}".format(version)
@@ -84,7 +98,7 @@ def check():
     return status == '100%'
 
 m.connect()
-volume = m._conn.get_all_volumes([], filters={'attachment.instance-id': m._instance_id, 'attachment.device': "/dev/sdg"})[0]
+volume = m._conn.get_all_volumes([], filters={'attachment.instance-id': m.resource_id, 'attachment.device': "/dev/sdg"})[0]
 if args.hvm:
     instance = m._conn.run_instances( image_id="ami-6a9e4503"
                                     , instance_type=instance_type
@@ -117,7 +131,7 @@ else:
 
     m._conn.create_tags([snapshot.id], {'Name': ami_name})
 
-    if not args.keep: depl.destroy_vms()
+    if not args.keep: depl.destroy_resources()
 
      # Register the image.
     aki = m._conn.get_all_images(filters={'manifest-location': '*pv-grub-hd0_1.03-x86_64*'})[0]
@@ -163,11 +177,15 @@ f.write(
     '''.format(args.region, ami_id, instance_type, key_name))
 f.close()
 
-test_depl = deployment.Deployment("./ebs-test.json", create=True, nix_exprs=["./ebs-test.nix"])
-test_depl.load_state()
+test_depl = deployment.create_deployment(db)
+test_depl.auto_response = "y"
+test_depl.name = "ebs-creator-test"
+test_depl.nix_exprs = [ "./ebs-test.nix" ]
 test_depl.deploy(create_only=True)
 test_depl.machines['machine'].run_command("nixos-version")
-if not args.keep: test_depl.destroy_vms()
+if not args.keep:
+    test_depl.destroy_resources()
+    test_depl.delete()
 
 # Log the AMI ID.
 f = open("{0}.ebs.ami-id".format(args.region), "w")
-- 
GitLab


From cba4d20280d286cdcd8d07bb9b721978d2c6f883 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= <viric@viric.name>
Date: Sun, 16 Dec 2012 16:03:38 +0100
Subject: [PATCH 4235/5331] Setting the system utillinux to be utillinuxCurses.

The live-dvd was set that way already.
I think some utillinux pieces may be nicer, or have more tools. I don't know
the details though.
---
 modules/config/system-path.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/config/system-path.nix b/modules/config/system-path.nix
index 38e5f076bcf..85b16d50406 100644
--- a/modules/config/system-path.nix
+++ b/modules/config/system-path.nix
@@ -55,7 +55,7 @@ let
       pkgs.time
       pkgs.udev
       pkgs.usbutils
-      pkgs.utillinux
+      pkgs.utillinuxCurses
       extraManpages      
     ];
 
-- 
GitLab


From dacd7d5a580dea6f865bea6855eac7c83244c71b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= <viric@viric.name>
Date: Sun, 16 Dec 2012 16:05:50 +0100
Subject: [PATCH 4236/5331] Setting iso_new_kernel to use linux 3.7.

It was using 3.2, the same kernel as the other isos.
---
 modules/installer/cd-dvd/installation-cd-new-kernel.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/installer/cd-dvd/installation-cd-new-kernel.nix b/modules/installer/cd-dvd/installation-cd-new-kernel.nix
index c7ea5ddfb01..2c79b68d0a4 100644
--- a/modules/installer/cd-dvd/installation-cd-new-kernel.nix
+++ b/modules/installer/cd-dvd/installation-cd-new-kernel.nix
@@ -3,6 +3,6 @@
 {
   require = [ ./installation-cd-graphical.nix ];
 
-  boot.kernelPackages = pkgs.linuxPackages_3_2;
+  boot.kernelPackages = pkgs.linuxPackages_3_7;
   boot.vesa = false;
 }
-- 
GitLab


From be4f69519b38e842ad9df58371a483bb73add908 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Sun, 16 Dec 2012 11:31:52 -0500
Subject: [PATCH 4237/5331] iso-image: Use unionfs-fuse instead of aufs

---
 modules/installer/cd-dvd/iso-image.nix | 41 +++++++++++++++-----------
 modules/system/boot/stage-1-init.sh    |  4 +--
 2 files changed, 26 insertions(+), 19 deletions(-)

diff --git a/modules/installer/cd-dvd/iso-image.nix b/modules/installer/cd-dvd/iso-image.nix
index 96fc8a31dca..8c0008771bb 100644
--- a/modules/installer/cd-dvd/iso-image.nix
+++ b/modules/installer/cd-dvd/iso-image.nix
@@ -192,34 +192,41 @@ in
       options = "loop";
     };
 
-  # We need squashfs in the initrd to mount the compressed Nix store,
-  # and aufs to make the root filesystem appear writable.
-  boot.extraModulePackages =
-    if config.boot.kernelPackages.aufs == null then
-      abort "This kernel doesn't have aufs enabled"
-    else
-      [ config.boot.kernelPackages.aufs ];
+  boot.initrd.availableKernelModules = [ "squashfs" "iso9660" ];
 
-  boot.initrd.availableKernelModules = [ "aufs" "squashfs" "iso9660" ];
-
-  boot.initrd.kernelModules = [ "loop" ];
+  boot.initrd.kernelModules = [ "loop" "fuse" ];
 
   boot.kernelModules = pkgs.stdenv.lib.optional config.isoImage.makeEfiBootable "efivars";
 
+  # Need unionfs-fuse
+  boot.initrd.extraUtilsCommands = ''
+    cp -v ${pkgs.fuse}/lib/libfuse* $out/lib
+    cp -v ${pkgs.unionfs-fuse}/bin/unionfs $out/bin
+  '';
+
   # In stage 1, mount a tmpfs on top of / (the ISO image) and
   # /nix/store (the squashfs image) to make this a live CD.
   boot.initrd.postMountCommands =
     ''
-      mkdir /mnt-root-tmpfs
-      mount -t tmpfs -o "mode=755" none /mnt-root-tmpfs
+      # Hacky!!! fuse hard-codes the path to mount
+      mkdir -p /nix/store/eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee-${pkgs.utillinux.name}/bin
+      ln -s $(which mount) /nix/store/eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee-${pkgs.utillinux.name}/bin
+      ln -s $(which umount) /nix/store/eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee-${pkgs.utillinux.name}/bin
+
+      mkdir -p /unionfs-chroot$targetRoot
+      mount --rbind $targetRoot /unionfs-chroot$targetRoot
+
+      mkdir /unionfs-chroot/mnt-root-tmpfs
+      mount -t tmpfs -o "mode=755" none /unionfs-chroot/mnt-root-tmpfs
       mkdir /mnt-root-union
-      mount -t aufs -o dirs=/mnt-root-tmpfs=rw:$targetRoot=ro none /mnt-root-union
+      unionfs -o allow_other,cow,chroot=/unionfs-chroot /mnt-root-tmpfs=RW:$targetRoot=RO /mnt-root-union
+      oldTargetRoot=$targetRoot
       targetRoot=/mnt-root-union
 
-      mkdir /mnt-store-tmpfs
-      mount -t tmpfs -o "mode=755" none /mnt-store-tmpfs
-      mkdir -p $targetRoot/nix/store
-      mount -t aufs -o dirs=/mnt-store-tmpfs=rw:/mnt-root/nix/store=ro none /mnt-root-union/nix/store
+      mkdir /unionfs-chroot/mnt-store-tmpfs
+      mount -t tmpfs -o "mode=755" none /unionfs-chroot/mnt-store-tmpfs
+      mkdir -p $oldTargetRoot/nix/store
+      unionfs -o allow_other,cow,nonempty,chroot=/unionfs-chroot /mnt-store-tmpfs=RW:$oldTargetRoot/nix/store=RO /mnt-root-union/nix/store
     '';
 
   # Closures to be copied to the Nix store on the CD, namely the init
diff --git a/modules/system/boot/stage-1-init.sh b/modules/system/boot/stage-1-init.sh
index 23207babe3f..778e36cfd36 100644
--- a/modules/system/boot/stage-1-init.sh
+++ b/modules/system/boot/stage-1-init.sh
@@ -332,8 +332,8 @@ exec 3>&-
 udevadm control --exit || true
 
 # Kill any remaining processes, just to be sure we're not taking any
-# with us into stage 2.
-pkill -9 -v 1
+# with us into stage 2. unionfs-fuse mounts require the unionfs process.
+pkill -9 -v '(1|unionfs)'
 
 
 if test -n "$debug1mounts"; then fail; fi
-- 
GitLab


From 3eb0faf3178b6b16f2b0dc13480ab9da727bee42 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Sun, 16 Dec 2012 11:56:49 -0500
Subject: [PATCH 4238/5331] qemu-vm: Use unionfs-fuse instead of aufs for
 writableStore

---
 modules/virtualisation/qemu-vm.nix | 26 ++++++++++++++++++--------
 1 file changed, 18 insertions(+), 8 deletions(-)

diff --git a/modules/virtualisation/qemu-vm.nix b/modules/virtualisation/qemu-vm.nix
index 22e5017d7c0..982a6b6db45 100644
--- a/modules/virtualisation/qemu-vm.nix
+++ b/modules/virtualisation/qemu-vm.nix
@@ -95,7 +95,7 @@ let
         description =
           ''
             If enabled, the Nix store in the VM is made writable by
-            layering an AUFS/tmpfs filesystem on top of the host's Nix
+            layering a unionfs-fuse/tmpfs filesystem on top of the host's Nix
             store.
           '';
       };
@@ -250,16 +250,18 @@ in
   # CIFS.  Also use paravirtualised network and block devices for
   # performance.
   boot.initrd.availableKernelModules =
-    [ "cifs" "nls_utf8" "hmac" "md4" "ecb" "des_generic" ]
-    ++ optional cfg.writableStore [ "aufs" ];
+    [ "cifs" "nls_utf8" "hmac" "md4" "ecb" "des_generic" ];
 
-  boot.extraModulePackages =
-    optional cfg.writableStore config.boot.kernelPackages.aufs;
+  # unionfs-fuse expects fuse to be loaded
+  boot.initrd.kernelModules = optional cfg.writableStore [ "fuse" ];
 
   boot.initrd.extraUtilsCommands =
     ''
       # We need mke2fs in the initrd.
       cp ${pkgs.e2fsprogs}/sbin/mke2fs $out/bin
+    '' + optionalString cfg.writableStore ''
+      cp -v ${pkgs.fuse}/lib/libfuse* $out/lib
+      cp -v ${pkgs.unionfs-fuse}/bin/unionfs $out/bin
     '';
 
   boot.initrd.postDeviceCommands =
@@ -288,9 +290,17 @@ in
       mkdir -p $targetRoot/boot
       mount -o remount,ro $targetRoot/nix/store
       ${optionalString cfg.writableStore ''
-        mkdir /mnt-store-tmpfs
-        mount -t tmpfs -o "mode=755" none /mnt-store-tmpfs
-        mount -t aufs -o dirs=/mnt-store-tmpfs=rw:$targetRoot/nix/store=rr none $targetRoot/nix/store
+        # Hacky!!! fuse hard-codes the path to mount
+        mkdir -p /nix/store/eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee-${pkgs.utillinux.name}/bin
+        ln -s $(which mount) /nix/store/eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee-${pkgs.utillinux.name}/bin
+        ln -s $(which umount) /nix/store/eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee-${pkgs.utillinux.name}/bin
+
+        mkdir -p /unionfs-chroot$targetRoot
+        mount --rbind $targetRoot /unionfs-chroot$targetRoot
+
+        mkdir /unionfs-chroot/mnt-store-tmpfs
+        mount -t tmpfs -o "mode=755" none /unionfs-chroot/mnt-store-tmpfs
+        unionfs -o allow_other,cow,nonempty,chroot=/unionfs-chroot /mnt-store-tmpfs=RW:$targetRoot/nix/store=RO $targetRoot/nix/store
       ''}
     '';
 
-- 
GitLab


From 3e734ba695062f0f2bdbbd209c95c56d02e143ab Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= <viric@viric.name>
Date: Sun, 16 Dec 2012 18:07:13 +0100
Subject: [PATCH 4239/5331] Qemu says 'boot=on' is deprecated, so I try a
 half-fix here

I change the 'build-vm' to use '-boot menu=on', so a menu displays and allows
choosing the 2nd hd. Otherwise, I don't know how to boot from a 2nd hd.
---
 modules/virtualisation/qemu-vm.nix | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/modules/virtualisation/qemu-vm.nix b/modules/virtualisation/qemu-vm.nix
index f71e0ba5112..c30086487a7 100644
--- a/modules/virtualisation/qemu-vm.nix
+++ b/modules/virtualisation/qemu-vm.nix
@@ -166,6 +166,7 @@ let
       ${pkgs.vmTools.startSamba}
 
       # Start QEMU.
+      # "-boot menu=on" is there, because I don't know how to make qemu boot from 2nd hd.
       exec ${pkgs.qemu_kvm}/bin/qemu-kvm \
           -name ${vmName} \
           -m ${toString config.virtualisation.memorySize} \
@@ -174,8 +175,9 @@ let
           -chardev socket,id=samba,path=./samba \
           -net user,vlan=0,guestfwd=tcp:10.0.2.4:445-chardev:samba''${QEMU_NET_OPTS:+,$QEMU_NET_OPTS} \
           ${if cfg.useBootLoader then ''
-            -drive index=0,file=$NIX_DISK_IMAGE,if=virtio,cache=writeback,werror=report \
-            -drive index=1,file=${bootDisk}/disk.img,if=virtio,boot=on,readonly \
+            -drive index=0,id=drive1,file=$NIX_DISK_IMAGE,if=virtio,cache=writeback,werror=report \
+            -drive index=1,id=drive2,file=${bootDisk}/disk.img,if=virtio,readonly \
+            -boot menu=on
           '' else ''
             -drive file=$NIX_DISK_IMAGE,if=virtio,cache=writeback,werror=report \
             -kernel ${config.system.build.toplevel}/kernel \
-- 
GitLab


From e34024d998291899f9239ef43c3d74363108417f Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Sun, 16 Dec 2012 12:33:36 -0500
Subject: [PATCH 4240/5331] Refactor common unionfs-fuse initrd prep into a
 separate module

---
 modules/installer/cd-dvd/iso-image.nix     | 17 +++--------------
 modules/module-list.nix                    |  1 +
 modules/tasks/filesystems/unionfs-fuse.nix | 19 +++++++++++++++++++
 modules/virtualisation/qemu-vm.nix         | 11 +----------
 4 files changed, 24 insertions(+), 24 deletions(-)
 create mode 100644 modules/tasks/filesystems/unionfs-fuse.nix

diff --git a/modules/installer/cd-dvd/iso-image.nix b/modules/installer/cd-dvd/iso-image.nix
index 8c0008771bb..c9d443441e3 100644
--- a/modules/installer/cd-dvd/iso-image.nix
+++ b/modules/installer/cd-dvd/iso-image.nix
@@ -194,25 +194,14 @@ in
 
   boot.initrd.availableKernelModules = [ "squashfs" "iso9660" ];
 
-  boot.initrd.kernelModules = [ "loop" "fuse" ];
+  boot.initrd.kernelModules = [ "loop" ];
 
   boot.kernelModules = pkgs.stdenv.lib.optional config.isoImage.makeEfiBootable "efivars";
 
-  # Need unionfs-fuse
-  boot.initrd.extraUtilsCommands = ''
-    cp -v ${pkgs.fuse}/lib/libfuse* $out/lib
-    cp -v ${pkgs.unionfs-fuse}/bin/unionfs $out/bin
-  '';
-
   # In stage 1, mount a tmpfs on top of / (the ISO image) and
   # /nix/store (the squashfs image) to make this a live CD.
   boot.initrd.postMountCommands =
     ''
-      # Hacky!!! fuse hard-codes the path to mount
-      mkdir -p /nix/store/eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee-${pkgs.utillinux.name}/bin
-      ln -s $(which mount) /nix/store/eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee-${pkgs.utillinux.name}/bin
-      ln -s $(which umount) /nix/store/eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee-${pkgs.utillinux.name}/bin
-
       mkdir -p /unionfs-chroot$targetRoot
       mount --rbind $targetRoot /unionfs-chroot$targetRoot
 
@@ -318,7 +307,7 @@ in
     '';
 
   # Add vfat support to the initrd to enable people to copy the
-  # contents of the CD to a bootable USB stick.
-  boot.initrd.supportedFilesystems = [ "vfat" ];
+  # contents of the CD to a bootable USB stick. Need unionfs-fuse for union mounts
+  boot.initrd.supportedFilesystems = [ "vfat" "unionfs-fuse" ];
     
 }
diff --git a/modules/module-list.nix b/modules/module-list.nix
index 467eac6e00e..ae5e5d5c49f 100644
--- a/modules/module-list.nix
+++ b/modules/module-list.nix
@@ -214,6 +214,7 @@
   ./tasks/filesystems/ext.nix
   ./tasks/filesystems/nfs.nix
   ./tasks/filesystems/reiserfs.nix
+  ./tasks/filesystems/unionfs-fuse.nix
   ./tasks/filesystems/vfat.nix
   ./tasks/filesystems/xfs.nix
   ./tasks/kbd.nix
diff --git a/modules/tasks/filesystems/unionfs-fuse.nix b/modules/tasks/filesystems/unionfs-fuse.nix
new file mode 100644
index 00000000000..48cf798c7f0
--- /dev/null
+++ b/modules/tasks/filesystems/unionfs-fuse.nix
@@ -0,0 +1,19 @@
+{ config, pkgs, ... }:
+
+{
+  config = pkgs.lib.mkIf (pkgs.lib.any (fs: fs == "unionfs-fuse") config.boot.initrd.supportedFilesystems) {
+    boot.initrd.kernelModules = [ "fuse" ];
+
+    boot.initrd.extraUtilsCommands = ''
+      cp -v ${pkgs.fuse}/lib/libfuse* $out/lib
+      cp -v ${pkgs.unionfs-fuse}/bin/unionfs $out/bin
+    '';
+
+    boot.initrd.postDeviceCommands = ''
+        # Hacky!!! fuse hard-codes the path to mount
+        mkdir -p /nix/store/eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee-${pkgs.utillinux.name}/bin
+        ln -s $(which mount) /nix/store/eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee-${pkgs.utillinux.name}/bin
+        ln -s $(which umount) /nix/store/eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee-${pkgs.utillinux.name}/bin
+      '';
+  };
+}
diff --git a/modules/virtualisation/qemu-vm.nix b/modules/virtualisation/qemu-vm.nix
index 982a6b6db45..8d50da8296c 100644
--- a/modules/virtualisation/qemu-vm.nix
+++ b/modules/virtualisation/qemu-vm.nix
@@ -252,16 +252,12 @@ in
   boot.initrd.availableKernelModules =
     [ "cifs" "nls_utf8" "hmac" "md4" "ecb" "des_generic" ];
 
-  # unionfs-fuse expects fuse to be loaded
-  boot.initrd.kernelModules = optional cfg.writableStore [ "fuse" ];
+  boot.initrd.supportedFilesystems = optional cfg.writableStore "unionfs-fuse";
 
   boot.initrd.extraUtilsCommands =
     ''
       # We need mke2fs in the initrd.
       cp ${pkgs.e2fsprogs}/sbin/mke2fs $out/bin
-    '' + optionalString cfg.writableStore ''
-      cp -v ${pkgs.fuse}/lib/libfuse* $out/lib
-      cp -v ${pkgs.unionfs-fuse}/bin/unionfs $out/bin
     '';
 
   boot.initrd.postDeviceCommands =
@@ -290,11 +286,6 @@ in
       mkdir -p $targetRoot/boot
       mount -o remount,ro $targetRoot/nix/store
       ${optionalString cfg.writableStore ''
-        # Hacky!!! fuse hard-codes the path to mount
-        mkdir -p /nix/store/eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee-${pkgs.utillinux.name}/bin
-        ln -s $(which mount) /nix/store/eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee-${pkgs.utillinux.name}/bin
-        ln -s $(which umount) /nix/store/eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee-${pkgs.utillinux.name}/bin
-
         mkdir -p /unionfs-chroot$targetRoot
         mount --rbind $targetRoot /unionfs-chroot$targetRoot
 
-- 
GitLab


From d19c223ba6285da363e8bb8022e67a52c7bb9e0a Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Sun, 16 Dec 2012 13:07:42 -0500
Subject: [PATCH 4241/5331] Simplify unionfs-chroot bind-mounting

---
 modules/installer/cd-dvd/iso-image.nix | 16 ++++++++--------
 modules/virtualisation/qemu-vm.nix     | 10 +++++-----
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/modules/installer/cd-dvd/iso-image.nix b/modules/installer/cd-dvd/iso-image.nix
index c9d443441e3..33000a3fbf1 100644
--- a/modules/installer/cd-dvd/iso-image.nix
+++ b/modules/installer/cd-dvd/iso-image.nix
@@ -202,20 +202,20 @@ in
   # /nix/store (the squashfs image) to make this a live CD.
   boot.initrd.postMountCommands =
     ''
-      mkdir -p /unionfs-chroot$targetRoot
-      mount --rbind $targetRoot /unionfs-chroot$targetRoot
+      mkdir -p /unionfs-chroot/ro-root
+      mount --rbind $targetRoot /unionfs-chroot/ro-root
 
-      mkdir /unionfs-chroot/mnt-root-tmpfs
-      mount -t tmpfs -o "mode=755" none /unionfs-chroot/mnt-root-tmpfs
+      mkdir /unionfs-chroot/rw-root
+      mount -t tmpfs -o "mode=755" none /unionfs-chroot/rw-root
       mkdir /mnt-root-union
-      unionfs -o allow_other,cow,chroot=/unionfs-chroot /mnt-root-tmpfs=RW:$targetRoot=RO /mnt-root-union
+      unionfs -o allow_other,cow,chroot=/unionfs-chroot /rw-root=RW:/ro-root=RO /mnt-root-union
       oldTargetRoot=$targetRoot
       targetRoot=/mnt-root-union
 
-      mkdir /unionfs-chroot/mnt-store-tmpfs
-      mount -t tmpfs -o "mode=755" none /unionfs-chroot/mnt-store-tmpfs
+      mkdir /unionfs-chroot/rw-store
+      mount -t tmpfs -o "mode=755" none /unionfs-chroot/rw-store
       mkdir -p $oldTargetRoot/nix/store
-      unionfs -o allow_other,cow,nonempty,chroot=/unionfs-chroot /mnt-store-tmpfs=RW:$oldTargetRoot/nix/store=RO /mnt-root-union/nix/store
+      unionfs -o allow_other,cow,nonempty,chroot=/unionfs-chroot /rw-store=RW:/ro-root/nix/store=RO /mnt-root-union/nix/store
     '';
 
   # Closures to be copied to the Nix store on the CD, namely the init
diff --git a/modules/virtualisation/qemu-vm.nix b/modules/virtualisation/qemu-vm.nix
index 8d50da8296c..0367379b244 100644
--- a/modules/virtualisation/qemu-vm.nix
+++ b/modules/virtualisation/qemu-vm.nix
@@ -286,12 +286,12 @@ in
       mkdir -p $targetRoot/boot
       mount -o remount,ro $targetRoot/nix/store
       ${optionalString cfg.writableStore ''
-        mkdir -p /unionfs-chroot$targetRoot
-        mount --rbind $targetRoot /unionfs-chroot$targetRoot
+        mkdir -p /unionfs-chroot/ro-store
+        mount --rbind $targetRoot/nix/store /unionfs-chroot/ro-store
 
-        mkdir /unionfs-chroot/mnt-store-tmpfs
-        mount -t tmpfs -o "mode=755" none /unionfs-chroot/mnt-store-tmpfs
-        unionfs -o allow_other,cow,nonempty,chroot=/unionfs-chroot /mnt-store-tmpfs=RW:$targetRoot/nix/store=RO $targetRoot/nix/store
+        mkdir /unionfs-chroot/rw-store
+        mount -t tmpfs -o "mode=755" none /unionfs-chroot/rw-store
+        unionfs -o allow_other,cow,nonempty,chroot=/unionfs-chroot /rw-store=RW:/ro-store=RO $targetRoot/nix/store
       ''}
     '';
 
-- 
GitLab


From ac9002ce1845d14dfaa8af0fdb25c9958729b2b2 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Sun, 16 Dec 2012 13:16:17 -0500
Subject: [PATCH 4242/5331] amazon-image: use unionfs-fuse instead of aufs

---
 modules/virtualisation/amazon-image.nix | 34 +++++++++++++++----------
 1 file changed, 20 insertions(+), 14 deletions(-)

diff --git a/modules/virtualisation/amazon-image.nix b/modules/virtualisation/amazon-image.nix
index da6f6d3afc9..79fb435db38 100644
--- a/modules/virtualisation/amazon-image.nix
+++ b/modules/virtualisation/amazon-image.nix
@@ -64,11 +64,9 @@ with pkgs.lib;
 
   fileSystems."/".device = "/dev/disk/by-label/nixos";
 
-  boot.initrd.kernelModules = [ "xen-blkfront" "aufs" ];
+  boot.initrd.kernelModules = [ "xen-blkfront" ];
   boot.kernelModules = [ "xen-netfront" ];
 
-  boot.extraModulePackages = [ config.boot.kernelPackages.aufs ];
-
   # Generate a GRUB menu.  Amazon's pv-grub uses this to boot our kernel/initrd.
   boot.loader.grub.device = "nodev";
   boot.loader.grub.timeout = 0;
@@ -89,12 +87,12 @@ with pkgs.lib;
   # while "m1.large" has two ephemeral filesystems and no swap
   # devices).  Also, put /tmp and /var on /disk0, since it has a lot
   # more space than the root device.  Similarly, "move" /nix to /disk0
-  # by layering an AUFS on top of it so we have a lot more space for
+  # by layering a unionfs-fuse mount on top of it so we have a lot more space for
   # Nix operations.
   boot.initrd.postMountCommands =
     ''
       diskNr=0
-      diskForAufs=
+      diskForUnionfs=
       for device in /dev/xvd[abcde]*; do
           if [ "$device" = /dev/xvda -o "$device" = /dev/xvda1 ]; then continue; fi
           fsType=$(blkid -o value -s TYPE "$device" || true)
@@ -106,25 +104,31 @@ with pkgs.lib;
               diskNr=$((diskNr + 1))
               echo "mounting $device on $mp..."
               if mountFS "$device" "$mp" "" ext3; then
-                  if [ -z "$diskForAufs" ]; then diskForAufs="$mp"; fi
+                  if [ -z "$diskForUnionfs" ]; then diskForUnionfs="$mp"; fi
               fi
           else
               echo "skipping unknown device type $device"
           fi
       done
 
-      if [ -n "$diskForAufs" ]; then
-          mkdir -m 755 -p $targetRoot/$diskForAufs/root
+      if [ -n "$diskForUnionfs" ]; then
+          mkdir -m 755 -p $targetRoot/$diskForUnionfs/root
 
-          mkdir -m 1777 -p $targetRoot/$diskForAufs/root/tmp $targetRoot/tmp
-          mount --bind $targetRoot/$diskForAufs/root/tmp $targetRoot/tmp
+          mkdir -m 1777 -p $targetRoot/$diskForUnionfs/root/tmp $targetRoot/tmp
+          mount --bind $targetRoot/$diskForUnionfs/root/tmp $targetRoot/tmp
 
           if [ ! -e $targetRoot/.ebs ]; then
-              mkdir -m 755 -p $targetRoot/$diskForAufs/root/var $targetRoot/var
-              mount --bind $targetRoot/$diskForAufs/root/var $targetRoot/var
+              mkdir -m 755 -p $targetRoot/$diskForUnionfs/root/var $targetRoot/var
+              mount --bind $targetRoot/$diskForUnionfs/root/var $targetRoot/var
+
+              mkdir -p /unionfs-chroot/ro-nix
+              mount --rbind $targetRoot/nix /unionfs-chroot/ro-nix
 
-              mkdir -m 755 -p $targetRoot/$diskForAufs/root/nix
-              mount -t aufs -o dirs=$targetRoot/$diskForAufs/root/nix=rw:$targetRoot/nix=rr none $targetRoot/nix
+              mkdir -m 755 -p $targetRoot/$diskForUnionfs/root/nix
+              mkdir -p /unionfs-chroot/rw-nix
+              mount --rbind $targetRoot/$diskForUnionfs/root/nix /unionfs-chroot/rw-nix
+
+              unionfs -o allow_other,cow,nonempty,chroot=/unionfs-chroot /rw-nix=RW:/ro-nix=RO $targetRoot/nix
           fi
       fi
     '';
@@ -149,4 +153,6 @@ with pkgs.lib;
 
   # Always include cryptsetup so that Charon can use it.
   environment.systemPackages = [ pkgs.cryptsetup ];
+
+  boot.initrd.supportedFilesystems = [ "unionfs-fuse" ];
 }
-- 
GitLab


From ae4c8e3e0b6218c1cadd7ee360cd92ec613646b9 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Sun, 16 Dec 2012 13:31:44 -0500
Subject: [PATCH 4243/5331] nova-image.nix: Replace the commented-out aufs
 mount with a commented-out unionfs-fuse mount

---
 modules/virtualisation/nova-image.nix | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/modules/virtualisation/nova-image.nix b/modules/virtualisation/nova-image.nix
index 2aa78aeadda..0ce5d218cdb 100644
--- a/modules/virtualisation/nova-image.nix
+++ b/modules/virtualisation/nova-image.nix
@@ -72,10 +72,6 @@ with pkgs.lib;
 
   boot.kernelParams = [ "console=ttyS0" ];
 
-  boot.initrd.kernelModules = [ "aufs" ];
-
-  boot.extraModulePackages = [ config.boot.kernelPackages.aufs ];
-
   boot.loader.grub.version = 2;
   boot.loader.grub.device = "/dev/vda";
   boot.loader.grub.timeout = 0;
@@ -83,8 +79,8 @@ with pkgs.lib;
   # Put /tmp and /var on /ephemeral0, which has a lot more space.
   # Unfortunately we can't do this with the `fileSystems' option
   # because it has no support for creating the source of a bind
-  # mount.  Also, "move" /nix to /ephemeral0 by layering an AUFS
-  # on top of it so we have a lot more space for Nix operations.
+  # mount.  Also, "move" /nix to /ephemeral0 by layering a unionfs-fuse
+  # mount on top of it so we have a lot more space for Nix operations.
   /*
   boot.initrd.postMountCommands =
     ''
@@ -96,9 +92,16 @@ with pkgs.lib;
       mkdir -m 755 -p $targetRoot/var
       mount --bind $targetRoot/ephemeral0/var $targetRoot/var
 
+      mkdir -p /unionfs-chroot/ro-nix
+      mount --rbind $targetRoot/nix /unionfs-chroot/ro-nix
+
+      mkdir -p /unionfs-chroot/rw-nix
       mkdir -m 755 -p $targetRoot/ephemeral0/nix
-      mount -t aufs -o dirs=$targetRoot/ephemeral0/nix=rw:$targetRoot/nix=rr none $targetRoot/nix
+      mount --rbind $targetRoot/ephemeral0/nix /unionfs-chroot/rw-nix
+      unionfs -o allow_other,cow,nonempty,chroot=/unionfs-chroot /rw-nix=RW:/ro-nix=RO $targetRoot/nix
     '';
+
+    boot.initrd.supportedFilesystems = [ "unionfs-fuse" ];
     */
 
   # Since Nova allows VNC access to instances, it's nice to start to
-- 
GitLab


From dfca6b97f1933d41c6e63a0b06eaa3f8dcbf7b88 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Sun, 16 Dec 2012 13:33:23 -0500
Subject: [PATCH 4244/5331] Remove last mention of aufs for completeness

---
 modules/system/boot/kernel.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/system/boot/kernel.nix b/modules/system/boot/kernel.nix
index 4b6436a77f7..3637378d4d1 100644
--- a/modules/system/boot/kernel.nix
+++ b/modules/system/boot/kernel.nix
@@ -64,7 +64,7 @@ in
 
     boot.extraModulePackages = mkOption {
       default = [];
-      # !!! example = [pkgs.aufs pkgs.nvidia_x11];
+      # !!! example = [pkgs.nvidia_x11];
       description = "A list of additional packages supplying kernel modules.";
     };
 
-- 
GitLab


From 39a6143c6636495dc40b1a5434860a895a4142fe Mon Sep 17 00:00:00 2001
From: Rob Vermaas <rob.vermaas@gmail.com>
Date: Sun, 16 Dec 2012 20:28:45 +0100
Subject: [PATCH 4245/5331] Add options to control rate limiting behaviour of
 journald. See 'man journald.conf' for more information.

---
 modules/system/boot/systemd.nix | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)

diff --git a/modules/system/boot/systemd.nix b/modules/system/boot/systemd.nix
index eee65a3ffe0..ecd6b07c0ff 100644
--- a/modules/system/boot/systemd.nix
+++ b/modules/system/boot/systemd.nix
@@ -407,6 +407,30 @@ in
       description = "If non-empty, write log messages to the specified TTY device.";
     };
 
+    services.journald.rateLimitInterval = mkOption {
+      default = "10s";
+      type = types.uniq types.string;
+      description = ''
+        Configures the rate limiting interval that is applied to all
+        messages generated on the system. This rate limiting is applied
+        per-service, so that two services which log do not interfere with
+        each other's limit. The value may be specified in the following
+        units: s, min, h, ms, us. To turn off any kind of rate limiting,
+        set either value to 0.
+      '';
+    };
+
+    services.journald.rateLimitBurst = mkOption {
+      default = 100;
+      type = types.uniq types.int;
+      description = ''
+        Configures the rate limiting burst limit (number of messages per
+        interval) that is applied to all messages generated on the system.
+        This rate limiting is applied per-service, so that two services
+        which log do not interfere with each other's limit.
+      '';
+    };
+
   };
 
 
@@ -433,6 +457,8 @@ in
         { source = pkgs.writeText "journald.conf"
             ''
               [Journal]
+              RateLimitInterval=${config.services.journald.rateLimitInterval}
+              RateLimitBurst=${toString config.services.journald.rateLimitBurst}
               ${optionalString (config.services.journald.console != "") ''
                 ForwardToConsole=yes
                 TTYPath=${config.services.journald.console}
-- 
GitLab


From 358239348aea0f076069fcd60e94aa0610fe777f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= <viric@viric.name>
Date: Sun, 16 Dec 2012 21:41:47 +0100
Subject: [PATCH 4246/5331] making memtest grub entries work again

I'm not any good at perl, and I only came up with this after many
slow attempts. Any review welcome.

But until this, memtest was broken, and extraPrepareConfig as well, in grub.
---
 modules/system/boot/loader/grub/grub.nix        | 3 ++-
 modules/system/boot/loader/grub/install-grub.pl | 7 +++++++
 modules/system/boot/loader/grub/memtest.nix     | 6 +++---
 3 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/modules/system/boot/loader/grub/grub.nix b/modules/system/boot/loader/grub/grub.nix
index 0a9b374cc60..70865c3c933 100644
--- a/modules/system/boot/loader/grub/grub.nix
+++ b/modules/system/boot/loader/grub/grub.nix
@@ -13,10 +13,11 @@ let
   grubConfig = pkgs.writeText "grub-config.xml" (builtins.toXML
     { splashImage = f config.boot.loader.grub.splashImage;
       grub = f grub;
+      shell = "${pkgs.stdenv.shell}";
       fullVersion = (builtins.parseDrvName config.system.build.grub.name).version;
       inherit (config.boot.loader.grub)
         version extraConfig extraPerEntryConfig extraEntries
-        extraEntriesBeforeNixOS configurationLimit copyKernels timeout
+        extraEntriesBeforeNixOS extraPrepareConfig configurationLimit copyKernels timeout
         default devices;
     });
 
diff --git a/modules/system/boot/loader/grub/install-grub.pl b/modules/system/boot/loader/grub/install-grub.pl
index 5e9f3b4efda..0140a711d72 100644
--- a/modules/system/boot/loader/grub/install-grub.pl
+++ b/modules/system/boot/loader/grub/install-grub.pl
@@ -30,6 +30,7 @@ sub writeFile {
 my $grub = get("grub");
 my $grubVersion = int(get("version"));
 my $extraConfig = get("extraConfig");
+my $extraPrepareConfig = get("extraPrepareConfig");
 my $extraPerEntryConfig = get("extraPerEntryConfig");
 my $extraEntries = get("extraEntries");
 my $extraEntriesBeforeNixOS = get("extraEntriesBeforeNixOS") eq "true";
@@ -188,6 +189,8 @@ addEntry("NixOS - Default", $defaultConfig);
 
 $conf .= "$extraEntries\n" unless $extraEntriesBeforeNixOS;
 
+# extraEntries could refer to @bootRoot@, which we have to substitute
+$conf =~ s/\@bootRoot\@/$bootRoot/g;
 
 # Add entries for all previous generations of the system profile.
 $conf .= "submenu \"NixOS - Old configurations\" {\n" if $grubVersion == 2;
@@ -211,6 +214,10 @@ foreach my $link (@links) {
 
 $conf .= "}\n" if $grubVersion == 2;
 
+# Run extraPrepareConfig in sh
+if ($extraPrepareConfig ne "") {
+  system((get("shell"), "-c", $extraPrepareConfig));
+}
 
 # Atomically update the GRUB config.
 my $confFile = $grubVersion == 1 ? "/boot/grub/menu.lst" : "/boot/grub/grub.cfg";
diff --git a/modules/system/boot/loader/grub/memtest.nix b/modules/system/boot/loader/grub/memtest.nix
index 08eb8a1f41c..4bd4b69101c 100644
--- a/modules/system/boot/loader/grub/memtest.nix
+++ b/modules/system/boot/loader/grub/memtest.nix
@@ -22,17 +22,17 @@ in
     extraEntries = if config.boot.loader.grub.version == 2 then
       ''
         menuentry "${memtest86.name}" {
-          linux16 $bootRoot/memtest.bin
+          linux16 @bootRoot@/memtest.bin
         }
       ''
       else
       ''
         menuentry "${memtest86.name}"
-          linux16 $bootRoot/memtest.bin
+          linux16 @bootRoot@/memtest.bin
       '';
     extraPrepareConfig =
       ''
-        cp ${memtest86}/memtest.bin /boot/memtest.bin;
+        ${pkgs.coreutils}/bin/cp ${memtest86}/memtest.bin /boot/memtest.bin;
       '';
   };
 }
-- 
GitLab


From dc7a5e99d5399fbb3469597de9488a33d69614e0 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Sun, 16 Dec 2012 20:12:39 -0500
Subject: [PATCH 4247/5331] create-ebs-amis.py: Fix for latest charon

---
 maintainers/scripts/ec2/create-ebs-amis.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/maintainers/scripts/ec2/create-ebs-amis.py b/maintainers/scripts/ec2/create-ebs-amis.py
index 3dd1972c5f2..31613f08962 100755
--- a/maintainers/scripts/ec2/create-ebs-amis.py
+++ b/maintainers/scripts/ec2/create-ebs-amis.py
@@ -74,7 +74,7 @@ print >> sys.stderr, "NixOS version is {0}".format(version)
 m.run_command("cp -f $(nix-instantiate --find-file nixos/modules/virtualisation/amazon-config.nix) /mnt/etc/nixos/configuration.nix")
 m.run_command("nixos-install")
 if args.hvm:
-    m.run_command('cp /nix/store/*-grub-0.97*/lib/grub/i386-pc/* /mnt/boot/grub')
+    m.run_command('cp /mnt/nix/store/*-grub-0.97*/lib/grub/i386-pc/* /mnt/boot/grub')
     m.run_command('sed -i "s|hd0|hd0,0|" /mnt/boot/grub/menu.lst')
     m.run_command('echo "(hd1) /dev/xvdg" > device.map')
     m.run_command('echo -e "root (hd1,0)\nsetup (hd1)" | grub --device-map=device.map --batch')
@@ -103,7 +103,7 @@ if args.hvm:
     instance = m._conn.run_instances( image_id="ami-6a9e4503"
                                     , instance_type=instance_type
                                     , key_name=key_name
-                                    , placement=m._zone
+                                    , placement=m.zone
                                     , security_groups=["eelco-test"]).instances[0]
     charon.util.check_wait(lambda: instance.update() == 'running', max_tries=120)
     instance.stop()
-- 
GitLab


From dd131a0c093aa533a96923ac7bd22cef59eabd23 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Mon, 17 Dec 2012 13:09:05 -0500
Subject: [PATCH 4248/5331] Revert "Setting the system utillinux to be
 utillinuxCurses."

This reverts commit cba4d20280d286cdcd8d07bb9b721978d2c6f883.
---
 modules/config/system-path.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/config/system-path.nix b/modules/config/system-path.nix
index 32e8717cbd1..3969be68098 100644
--- a/modules/config/system-path.nix
+++ b/modules/config/system-path.nix
@@ -50,7 +50,7 @@ let
       pkgs.sysvtools
       pkgs.time
       pkgs.usbutils
-      pkgs.utillinuxCurses
+      pkgs.utillinux
       extraManpages      
     ];
 
-- 
GitLab


From 251f8546c938e18f6cfa7e073aad32b7f76a11cc Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 17 Dec 2012 21:08:29 +0100
Subject: [PATCH 4249/5331] pam_ssh_agent_auth: Use /etc/ssh/authorized_keys.d

---
 modules/security/pam.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/security/pam.nix b/modules/security/pam.nix
index 940c596e367..32721205b99 100644
--- a/modules/security/pam.nix
+++ b/modules/security/pam.nix
@@ -82,7 +82,7 @@ let
           ${optionalString rootOK
               "auth sufficient pam_rootok.so"}
           ${optionalString (config.security.pam.enableSSHAgentAuth && sshAgentAuth)
-              "auth sufficient ${pkgs.pam_ssh_agent_auth}/libexec/pam_ssh_agent_auth.so file=~/.ssh/authorized_keys"}
+              "auth sufficient ${pkgs.pam_ssh_agent_auth}/libexec/pam_ssh_agent_auth.so file=~/.ssh/authorized_keys:~/.ssh/authorized_keys2:/etc/ssh/authorized_keys.d/%u"}
           ${optionalString usbAuth
               "auth sufficient ${pkgs.pam_usb}/lib/security/pam_usb.so"}
           auth sufficient pam_unix.so ${optionalString allowNullPassword "nullok"} likeauth
-- 
GitLab


From 75c67b01946b53c711e775db766f53f334927d63 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 18 Dec 2012 13:40:04 +0100
Subject: [PATCH 4250/5331] mysql: Port to systemd

---
 modules/services/databases/mysql.nix      | 30 ++++++++++++-----------
 modules/services/databases/postgresql.nix |  4 +--
 2 files changed, 18 insertions(+), 16 deletions(-)

diff --git a/modules/services/databases/mysql.nix b/modules/services/databases/mysql.nix
index 2c35c13255e..ef29d563c72 100644
--- a/modules/services/databases/mysql.nix
+++ b/modules/services/databases/mysql.nix
@@ -91,6 +91,7 @@ in
         description = "A file containing SQL statements to be executed on the first startup. Can be used for granting certain permissions on the database";
       };
 
+      # FIXME: remove this option; it's a really bad idea.
       rootPassword = mkOption {
         default = null;
         description = "Path to a file containing the root password, modified on the first startup. Not specifying a root password will leave the root password empty.";
@@ -140,10 +141,12 @@ in
 
     environment.systemPackages = [mysql];
 
-    jobs.mysql =
-      { description = "MySQL server";
+    boot.systemd.services.mysql =
+      { description = "MySQL Server";
 
-        startOn = "filesystem";
+        wantedBy = [ "multi-user.target" ];
+
+        unitConfig.RequiresMountsFor = "${cfg.dataDir}";
 
         preStart =
           ''
@@ -156,9 +159,12 @@ in
 
             mkdir -m 0700 -p ${cfg.pidDir}
             chown -R ${cfg.user} ${cfg.pidDir}
-            
-            ${mysql}/libexec/mysqld --defaults-extra-file=${myCnf} ${mysqldOptions} &
+          '';
 
+        serviceConfig.ExecStart = "${mysql}/libexec/mysqld --defaults-extra-file=${myCnf} ${mysqldOptions}";
+
+        postStart =
+          ''
             # Wait until the MySQL server is available for use
             count=0
             while [ ! -e /tmp/mysql.sock ]
@@ -183,7 +189,7 @@ in
                         echo "Creating initial database: ${database.name}"
                         ( echo "create database ${database.name};"
                           echo "use ${database.name};"
-                          
+
                           if [ -f "${database.schema}" ]
                           then
                               cat ${database.schema}
@@ -204,7 +210,7 @@ in
                 ${optionalString (cfg.rootPassword != null)
                   ''
                     # Change root password
-                    
+
                     ( echo "use mysql;"
                       echo "update user set Password=password('$(cat ${cfg.rootPassword})') where User='root';"
                       echo "flush privileges;"
@@ -213,14 +219,10 @@ in
 
               rm /tmp/mysql_init
             fi
-          '';
-
-        postStop = "${mysql}/bin/mysqladmin ${optionalString (cfg.rootPassword != null) "--user=root --password=\"$(cat ${cfg.rootPassword})\""} shutdown";
-        
-        # !!! Need a postStart script to wait until mysqld is ready to
-        # accept connections.
+          ''; # */
 
-        extraConfig = "kill timeout 60";
+        serviceConfig.ExecStop =
+          "${mysql}/bin/mysqladmin ${optionalString (cfg.rootPassword != null) "--user=root --password=\"$(cat ${cfg.rootPassword})\""} shutdown";
       };
 
   };
diff --git a/modules/services/databases/postgresql.nix b/modules/services/databases/postgresql.nix
index c34ae9037f2..a013a3ccc3d 100644
--- a/modules/services/databases/postgresql.nix
+++ b/modules/services/databases/postgresql.nix
@@ -156,10 +156,10 @@ in
     environment.systemPackages = [postgresql];
 
     boot.systemd.services.postgresql =
-      { description = "PostgreSQL";
+      { description = "PostgreSQL Server";
 
         wantedBy = [ "multi-user.target" ];
-        after = [ "network.target" "fs.target" ];
+        after = [ "network.target" ];
 
         environment =
           { TZ = config.time.timeZone;
-- 
GitLab


From ab18c03685ca47ee0289e4cef0a1d641cf777b54 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 18 Dec 2012 13:43:01 +0100
Subject: [PATCH 4251/5331] mysql55: Port to systemd

Not tested.  Seriously tempted to delete mysql55.  See issue #47.
---
 modules/services/databases/mysql55.nix | 30 ++++++++++++++------------
 1 file changed, 16 insertions(+), 14 deletions(-)

diff --git a/modules/services/databases/mysql55.nix b/modules/services/databases/mysql55.nix
index a37f1d38831..51fe37b7684 100644
--- a/modules/services/databases/mysql55.nix
+++ b/modules/services/databases/mysql55.nix
@@ -84,6 +84,7 @@ in
         description = "A file containing SQL statements to be executed on the first startup. Can be used for granting certain permissions on the database";
       };
 
+      # FIXME: remove this option; it's a really bad idea.
       rootPassword = mkOption {
         default = null;
         description = "Path to a file containing the root password, modified on the first startup. Not specifying a root password will leave the root password empty.";
@@ -133,10 +134,12 @@ in
 
     environment.systemPackages = [mysql];
 
-    jobs.mysql =
-      { description = "MySQL server";
+    boot.systemd.services.mysql =
+      { description = "MySQL Server";
 
-        startOn = "filesystem";
+        wantedBy = [ "multi-user.target" ];
+
+        unitConfig.RequiresMountsFor = "${cfg.dataDir}";
 
         preStart =
           ''
@@ -149,9 +152,12 @@ in
 
             mkdir -m 0700 -p ${cfg.pidDir}
             chown -R ${cfg.user} ${cfg.pidDir}
-            
-            ${mysql}/bin/mysqld --defaults-extra-file=${myCnf} ${mysqldOptions} &
+          '';
+
+        serviceConfig.ExecStart = "${mysql}/bin/mysqld --defaults-extra-file=${myCnf} ${mysqldOptions}";
 
+        postStart =
+          ''
             # Wait until the MySQL server is available for use
             count=0
             while [ ! -e /tmp/mysql.sock ]
@@ -176,7 +182,7 @@ in
                         echo "Creating initial database: ${database.name}"
                         ( echo "create database ${database.name};"
                           echo "use ${database.name};"
-                          
+
                           if [ -f "${database.schema}" ]
                           then
                               cat ${database.schema}
@@ -207,7 +213,7 @@ in
                 ${optionalString (cfg.rootPassword != null)
                   ''
                     # Change root password
-                    
+
                     ( echo "use mysql;"
                       echo "update user set Password=password('$(cat ${cfg.rootPassword})') where User='root';"
                       echo "flush privileges;"
@@ -216,14 +222,10 @@ in
 
               rm /tmp/mysql_init
             fi
-          '';
-
-        postStop = "${mysql}/bin/mysqladmin ${optionalString (cfg.rootPassword != null) "--user=root --password=\"$(cat ${cfg.rootPassword})\""} shutdown";
-        
-        # !!! Need a postStart script to wait until mysqld is ready to
-        # accept connections.
+          ''; # */
 
-        extraConfig = "kill timeout 60";
+        serviceConfig.ExecStop =
+          "${mysql}/bin/mysqladmin ${optionalString (cfg.rootPassword != null) "--user=root --password=\"$(cat ${cfg.rootPassword})\""} shutdown";
       };
 
   };
-- 
GitLab


From 3ef1432866f7b35adbd4a8b78b25ad0cf61c2fb4 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Tue, 18 Dec 2012 13:44:47 -0500
Subject: [PATCH 4252/5331] Update create-s3-amis and amazon-image.nix to
 recent nixos

---
 maintainers/scripts/ec2/create-s3-amis.sh | 5 +++--
 modules/virtualisation/amazon-image.nix   | 4 ++++
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/maintainers/scripts/ec2/create-s3-amis.sh b/maintainers/scripts/ec2/create-s3-amis.sh
index ac92c69f5bb..767696cfe55 100755
--- a/maintainers/scripts/ec2/create-s3-amis.sh
+++ b/maintainers/scripts/ec2/create-s3-amis.sh
@@ -1,6 +1,7 @@
 #! /bin/sh -e
 
-revision=$(svnversion "$NIXOS")
+nixos=$(nix-instantiate --find-file nixos)
+revision=$(cd $nixos; git rev-parse --short HEAD)
 echo "NixOS revision is $revision"
 
 buildAndUploadFor() {
@@ -8,7 +9,7 @@ buildAndUploadFor() {
     arch="$2"
 
     echo "building $system image..."
-    NIXOS_CONFIG=$NIXOS/modules/virtualisation/amazon-config.nix nix-build "$NIXOS" \
+    NIXOS_CONFIG=$nixos/modules/virtualisation/amazon-config.nix nix-build "$nixos" \
         -A config.system.build.amazonImage --argstr system "$system" -o ec2-ami
 
     ec2-bundle-image -i ./ec2-ami/nixos.img --user "$AWS_ACCOUNT" --arch "$arch" \
diff --git a/modules/virtualisation/amazon-image.nix b/modules/virtualisation/amazon-image.nix
index 79fb435db38..38885d12b35 100644
--- a/modules/virtualisation/amazon-image.nix
+++ b/modules/virtualisation/amazon-image.nix
@@ -50,6 +50,10 @@ with pkgs.lib;
           mkdir -p /mnt/etc
           touch /mnt/etc/NIXOS
 
+          # `switch-to-configuration' requires a /bin/sh
+          mkdir -p /mnt/bin
+          ln -s ${config.system.build.binsh}/bin/sh /mnt/bin/sh
+
           # Install a configuration.nix.
           mkdir -p /mnt/etc/nixos
           cp ${./amazon-config.nix} /mnt/etc/nixos/configuration.nix
-- 
GitLab


From fb8af2f9b6081338b4a2e2b0c850aba108044897 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 19 Dec 2012 12:59:28 +0100
Subject: [PATCH 4253/5331] postgresql: Don't wait for ages in post-start if
 the service has failed

---
 modules/services/databases/postgresql.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/modules/services/databases/postgresql.nix b/modules/services/databases/postgresql.nix
index a013a3ccc3d..c178a84b1b8 100644
--- a/modules/services/databases/postgresql.nix
+++ b/modules/services/databases/postgresql.nix
@@ -199,7 +199,8 @@ in
         # Wait for PostgreSQL to be ready to accept connections.
         postStart =
           ''
-            while ! psql postgres -c ""; do
+            while ! psql postgres -c "" 2> /dev/null; do
+                if ! kill -0 "$MAINPID"; then exit 1; fi
                 sleep 0.1
             done
           '';
-- 
GitLab


From 45f0de21f0118f743e486daa1fa1b311a9355afd Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 21 Dec 2012 00:14:13 +0100
Subject: [PATCH 4254/5331] nixos-rebuild: Fix the check for running nix-daemon

---
 modules/installer/tools/nixos-rebuild.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/installer/tools/nixos-rebuild.sh b/modules/installer/tools/nixos-rebuild.sh
index 01665e277b6..66acf908710 100644
--- a/modules/installer/tools/nixos-rebuild.sh
+++ b/modules/installer/tools/nixos-rebuild.sh
@@ -115,7 +115,7 @@ trap 'rm -rf "$tmpDir"' EXIT
 # This matters if the new Nix in Nixpkgs has a schema change.  It
 # would upgrade the schema, which should only happen once we actually
 # switch to the new configuration.
-if initctl status nix-daemon 2>&1 | grep -q 'running'; then
+if systemctl show nix-daemon.socket nix-daemon.service | grep -q ActiveState=active; then
     export NIX_REMOTE=${NIX_REMOTE:-daemon}
 fi
 
-- 
GitLab


From e9784da0e0e3f51e3fcfa6be39137bb8daad5db1 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 21 Dec 2012 00:17:42 +0100
Subject: [PATCH 4255/5331] Remove obsolete file

---
 tests/test-upstart-job.sh | 20 --------------------
 1 file changed, 20 deletions(-)
 delete mode 100755 tests/test-upstart-job.sh

diff --git a/tests/test-upstart-job.sh b/tests/test-upstart-job.sh
deleted file mode 100755
index d0fba23d625..00000000000
--- a/tests/test-upstart-job.sh
+++ /dev/null
@@ -1,20 +0,0 @@
-#! /bin/sh -e
-
-for i in $*; do
-    echo "building job $i..."
-    nix-build /etc/nixos/nixos -A "config.jobs.$i" -o $tmpDir/.result
-    # !!! Here we assume that the attribute name equals the Upstart
-    # job name.
-    ln -sfn $(readlink -f $tmpDir/.result) /etc/init/"$i".conf
-done
-
-echo "restarting init..."
-initctl reload-configuration
-
-sleep 1
-
-for i in $*; do
-    echo "restarting job $i..."
-    initctl stop "$i" || true
-    initctl start "$i"
-done    
-- 
GitLab


From ceedc50009874323fbea4c22be249d1f76490d71 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= <viric@viric.name>
Date: Sat, 22 Dec 2012 18:45:53 +0100
Subject: [PATCH 4256/5331] Fixing the fuloong2f system tarball

---
 modules/installer/cd-dvd/system-tarball-fuloong2f.nix | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/modules/installer/cd-dvd/system-tarball-fuloong2f.nix b/modules/installer/cd-dvd/system-tarball-fuloong2f.nix
index e988647cf13..6ddaab0206b 100644
--- a/modules/installer/cd-dvd/system-tarball-fuloong2f.nix
+++ b/modules/installer/cd-dvd/system-tarball-fuloong2f.nix
@@ -46,9 +46,8 @@ in
 
 {
   require =
-    [ options
+    [
       ./system-tarball.nix
-      ../../hardware/network/rt73.nix
     ];
 
 
@@ -106,8 +105,8 @@ in
   boot.initrd.availableKernelModules =
     [ "vfat" "reiserfs" ];
 
-  boot.kernelPackages = pkgs.linuxPackages_2_6_35;
-  boot.kernelParams = [ "console=tty" ];
+  boot.kernelPackages = pkgs.linuxPackages_3_6;
+  boot.kernelParams = [ "console=tty1" ];
 
   boot.postBootCommands =
     ''
-- 
GitLab


From 90fa68cf32f5ef9b5668ba222805355a95536277 Mon Sep 17 00:00:00 2001
From: Mathijs Kwik <mathijs@bluescreen303.nl>
Date: Tue, 18 Dec 2012 20:20:50 +0100
Subject: [PATCH 4257/5331] systemd: convert mongodb job to service

---
 modules/services/databases/mongodb.nix | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

diff --git a/modules/services/databases/mongodb.nix b/modules/services/databases/mongodb.nix
index c676d3e96e4..9e9e1c7dd8c 100644
--- a/modules/services/databases/mongodb.nix
+++ b/modules/services/databases/mongodb.nix
@@ -97,17 +97,16 @@ in
 
     users.extraUsers = singleton
       { name = cfg.user;
-        shell = "/bin/sh";
         description = "MongoDB server user";
       };
 
-    environment.systemPackages = [mongodb];
+    environment.systemPackages = [ mongodb ];
 
-    jobs.mongodb =
+    boot.systemd.services.mongodb =
       { description = "MongoDB server";
-        daemonType = "daemon";
 
-        startOn = "filesystem";
+        wantedBy = [ "multi-user.target" ];
+        after = [ "network.target" ];
 
         preStart =
           ''
@@ -117,11 +116,10 @@ in
             fi
           '';
 
-        path = [mongodb];
-        exec = "mongod --config ${mongoCnf} --fork";
-        setuid = cfg.user;
-
-        extraConfig = "kill timeout 10";
+        serviceConfig = {
+          ExecStart = "${mongodb}/bin/mongod --quiet --config ${mongoCnf}";
+          User = cfg.user;
+        };
       };
 
   };
-- 
GitLab


From dc58c2ea3790e449fb6c7ec7932c8a93fe2c4df8 Mon Sep 17 00:00:00 2001
From: Mathijs Kwik <mathijs@bluescreen303.nl>
Date: Thu, 27 Dec 2012 00:54:37 +0100
Subject: [PATCH 4258/5331] systemd: convert samba jobs to systemd services
 (samba.target)

---
 .../services/network-filesystems/samba.nix    | 52 ++++++++++---------
 1 file changed, 27 insertions(+), 25 deletions(-)

diff --git a/modules/services/network-filesystems/samba.nix b/modules/services/network-filesystems/samba.nix
index 93c07df7cc6..aa75c4322a0 100644
--- a/modules/services/network-filesystems/samba.nix
+++ b/modules/services/network-filesystems/samba.nix
@@ -26,18 +26,14 @@ let
         mkdir -p /var/samba/locks /var/samba/cores/nmbd  /var/samba/cores/smbd /var/samba/cores/winbindd
       fi
 
-      passwdFile="$(sed -n 's/^.*smb[ ]\+passwd[ ]\+file[ ]\+=[ ]\+\(.*\)/\1/p' ${configFile})"
+      passwdFile="$(${pkgs.gnused}/bin/sed -n 's/^.*smb[ ]\+passwd[ ]\+file[ ]\+=[ ]\+\(.*\)/\1/p' ${configFile})"
       if [ -n "$passwdFile" ]; then
-        echo 'INFO: creating directory containing passwd file'
+        echo 'INFO: [samba] creating directory containing passwd file'
         mkdir -p "$(dirname "$passwdFile")"
       fi
 
       mkdir -p ${logDir}
       mkdir -p ${privateDir}
-
-      # The following line is to trigger a restart of the daemons when
-      # the configuration changes:
-      # ${configFile}
     '';
 
   configFile = pkgs.writeText "smb.conf"
@@ -60,12 +56,11 @@ let
   # This may include nss_ldap, needed for samba if it has to use ldap.
   nssModulesPath = config.system.nssModules.path;
 
-  daemonJob = appName: args:
-    { name = "samba-${appName}";
-      description = "Samba Service daemon ${appName}";
+  daemonService = appName: args:
+    { description = "Samba Service daemon ${appName}";
 
-      startOn = "started samba";
-      stopOn = "stopping samba";
+      wantedBy = [ "samba.target" ];
+      partOf = [ "samba.target" ];
 
       environment = {
         LD_LIBRARY_PATH = nssModulesPath;
@@ -73,9 +68,12 @@ let
         LOCALE_ARCHIVE = "/run/current-system/sw/lib/locale/locale-archive";
       };
 
-      daemonType = "fork";
+      serviceConfig = {
+        ExecStart = "${samba}/sbin/${appName} ${args}";
+        ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID";
+      };
 
-      exec = "${samba}/sbin/${appName} ${args}";
+      restartTriggers = [ configFile ];
     };
 
 in
@@ -202,22 +200,26 @@ in
           };
 
 
-        # Dummy job to start the real Samba daemons (nmbd, smbd, winbindd).
-        jobs.sambaControl =
-          { name = "samba";
+        boot.systemd = {
+          targets.samba = {
             description = "Samba server";
-
-            startOn = "started network-interfaces";
-            stopOn = "stopping network-interfaces";
-
-            preStart = setupScript;
+            requires = [ "samba-setup.service" ];
+            after = [ "samba-setup.service" "network.target" ];
+            wantedBy = [ "multi-user.target" ];
           };
 
-        jobs.nmbd = daemonJob "nmbd" "-D";
-
-        jobs.smbd = daemonJob "smbd" "-D";
+          services = {
+            "samba-nmbd" = daemonService "nmbd" "-F";
+            "samba-smbd" = daemonService "smbd" "-F";
+            "samba-winbindd" = daemonService "winbindd" "-F";
+            "samba-setup" = {
+              description = "Samba setup task";
+              script = setupScript;
+              unitConfig.RequiresMountsFor = "/home/smbd /var/samba /var/log/samba";
+            };
+          };
+        };
 
-        jobs.winbindd = daemonJob "winbindd" "-D";
       })
     ];
 
-- 
GitLab


From f61f0c139b85766cff6bd40c304cdbf957ea2b27 Mon Sep 17 00:00:00 2001
From: Mathijs Kwik <mathijs@bluescreen303.nl>
Date: Thu, 27 Dec 2012 09:50:40 +0100
Subject: [PATCH 4259/5331] systemd: convert smartd job to service

---
 modules/services/monitoring/smartd.nix | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

diff --git a/modules/services/monitoring/smartd.nix b/modules/services/monitoring/smartd.nix
index 7e57f90398b..72a4495b1f5 100644
--- a/modules/services/monitoring/smartd.nix
+++ b/modules/services/monitoring/smartd.nix
@@ -57,7 +57,7 @@ in
         description = ''
           Additional options for each device that is monitored. The example
           turns on SMART Automatic Offline Testing on startup, and schedules short
-          self-tests daily, and long self-tests weekly. 
+          self-tests daily, and long self-tests weekly.
         '';
       };
 
@@ -81,18 +81,16 @@ in
 
   config = mkIf cfg.enable {
 
-    jobs.smartd = {
-        description = "S.M.A.R.T. Daemon";
+    boot.systemd.services.smartd = {
+      description = "S.M.A.R.T. Daemon";
 
-        environment.TZ = config.time.timeZone;
+      environment.TZ = config.time.timeZone;
 
-        wantedBy = [ "multi-user.target" ];
-        partOf = [ "multi-user.target" ];
+      wantedBy = [ "multi-user.target" ];
+      partOf = [ "multi-user.target" ];
 
-        path = [ pkgs.smartmontools ];
-
-        exec = "smartd --no-fork --pidfile=/var/run/smartd.pid ${smartdFlags}";
-      };
+      serviceConfig.ExecStart = "${pkgs.smartmontools}/sbin/smartd --no-fork ${smartdFlags}";
+    };
 
   };
 
-- 
GitLab


From 3456f3b2328eddee4e34c5807959bdd32efd70da Mon Sep 17 00:00:00 2001
From: Mathijs Kwik <mathijs@bluescreen303.nl>
Date: Wed, 26 Dec 2012 23:49:22 +0100
Subject: [PATCH 4260/5331] systemd: convert gogoclient job to service unit

---
 modules/services/networking/gogoclient.nix | 38 +++++++++++++++-------
 1 file changed, 26 insertions(+), 12 deletions(-)

diff --git a/modules/services/networking/gogoclient.nix b/modules/services/networking/gogoclient.nix
index 593f2436a39..519c45a385a 100644
--- a/modules/services/networking/gogoclient.nix
+++ b/modules/services/networking/gogoclient.nix
@@ -56,22 +56,36 @@ in
   config = mkIf cfg.enable {
     boot.kernelModules = [ "tun" ];
 
-    # environment.systemPackages = [pkgs.gogoclient];
-
     networking.enableIPv6 = true;
 
-    jobs.gogoclient = {
-      name = "gogoclient";
+    boot.systemd.services.gogoclient = {
+
       description = "ipv6 tunnel";
-      startOn = optionalString cfg.autorun "starting networking";
-      stopOn = "stopping network-interfaces";
-      preStart = ''
-        mkdir -p /var/lib/gogoc
-        chmod 700 /var/lib/gogoc
-        cat ${pkgs.gogoclient}/share/${pkgs.gogoclient.name}/gogoc.conf.sample | ${pkgs.gnused}/bin/sed -e "s|^userid=|&${cfg.username}|;s|^passwd=|&${if cfg.password == "" then "" else "$(cat ${cfg.password})"}|;s|^server=.*|server=${cfg.server}|;s|^auth_method=.*|auth_method=${if cfg.password == "" then "anonymous" else "any"}|;s|^#log_file=|log_file=1|" > /var/lib/gogoc/gogoc.conf
+
+      after = [ "network.target" ];
+
+      preStart = let authMethod = if cfg.password == "" then "anonymous" else "any"; in
+      ''
+        mkdir -p -m 700 /var/lib/gogoc
+        cat ${pkgs.gogoclient}/share/${pkgs.gogoclient.name}/gogoc.conf.sample | \
+          ${pkgs.gnused}/bin/sed \
+            -e "s|^userid=|&${cfg.username}|" \
+            -e "s|^passwd=|&${optionalString (cfg.password != "") "$(cat ${cfg.password})"}|" \
+            -e "s|^server=.*|server=${cfg.server}|" \
+            -e "s|^auth_method=.*|auth_method=${authMethod}|" \
+            -e "s|^#log_file=|log_file=1|" > /var/lib/gogoc/gogoc.conf
       '';
-      script = "cd /var/lib/gogoc; exec gogoc -y -f ./gogoc.conf";
-      path = [pkgs.gogoclient];
+
+      serviceConfig.ExecStart = "${pkgs.gogoclient}/bin/gogoc -y -f /var/lib/gogoc/gogoc.conf";
+
+      restartTriggers = attrValues cfg;
+
+    } // optionalAttrs cfg.autorun {
+
+      wantedBy = [ "ip-up.target" ];
+
+      partOf = [ "ip-up.target" ];
+
     };
 
   };
-- 
GitLab


From 244ed6ae710553cb1392b1a5c4538e9e47b44cd6 Mon Sep 17 00:00:00 2001
From: Mathijs Kwik <mathijs@bluescreen303.nl>
Date: Thu, 27 Dec 2012 10:04:05 +0100
Subject: [PATCH 4261/5331] nscd: use proper systemd.special(7) targets

---
 modules/services/system/nscd.nix | 2 +-
 modules/system/boot/systemd.nix  | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/modules/services/system/nscd.nix b/modules/services/system/nscd.nix
index eecb845d547..1843368ba27 100644
--- a/modules/services/system/nscd.nix
+++ b/modules/services/system/nscd.nix
@@ -41,7 +41,7 @@ in
     boot.systemd.services.nscd =
       { description = "Name Service Cache Daemon";
 
-        wantedBy = [ "multi-user.target" ];
+        wantedBy = [ "nss-lookup.target" "nss-user-lookup.target" ];
 
         environment = { LD_LIBRARY_PATH = nssModulesPath; };
 
diff --git a/modules/system/boot/systemd.nix b/modules/system/boot/systemd.nix
index ecd6b07c0ff..a65c95e60f9 100644
--- a/modules/system/boot/systemd.nix
+++ b/modules/system/boot/systemd.nix
@@ -321,7 +321,8 @@ let
       ln -s ${cfg.defaultUnit} $out/default.target
 
       #ln -s ../getty@tty1.service $out/multi-user.target.wants/
-      ln -s ../local-fs.target ../remote-fs.target ../network.target ../swap.target $out/multi-user.target.wants/
+      ln -s ../local-fs.target ../remote-fs.target ../network.target ../nss-lookup.target \
+            ../nss-user-lookup.target ../swap.target $out/multi-user.target.wants/
     ''; # */
 
 in
-- 
GitLab


From 183829cf99b629a43e8f6d1033f627f9082b980e Mon Sep 17 00:00:00 2001
From: Mathijs Kwik <mathijs@bluescreen303.nl>
Date: Thu, 27 Dec 2012 13:38:37 +0100
Subject: [PATCH 4262/5331] gogoclient: change working dir before starting

otherwise state files are placed in /
---
 modules/services/networking/gogoclient.nix | 17 ++++++-----------
 1 file changed, 6 insertions(+), 11 deletions(-)

diff --git a/modules/services/networking/gogoclient.nix b/modules/services/networking/gogoclient.nix
index 519c45a385a..7d742df97b0 100644
--- a/modules/services/networking/gogoclient.nix
+++ b/modules/services/networking/gogoclient.nix
@@ -59,13 +59,14 @@ in
     networking.enableIPv6 = true;
 
     boot.systemd.services.gogoclient = {
-
       description = "ipv6 tunnel";
 
       after = [ "network.target" ];
+      requires = [ "network.target" ];
+
+      unitConfig.RequiresMountsFor = "/var/lib/gogoc";
 
-      preStart = let authMethod = if cfg.password == "" then "anonymous" else "any"; in
-      ''
+      script = let authMethod = if cfg.password == "" then "anonymous" else "any"; in ''
         mkdir -p -m 700 /var/lib/gogoc
         cat ${pkgs.gogoclient}/share/${pkgs.gogoclient.name}/gogoc.conf.sample | \
           ${pkgs.gnused}/bin/sed \
@@ -74,18 +75,12 @@ in
             -e "s|^server=.*|server=${cfg.server}|" \
             -e "s|^auth_method=.*|auth_method=${authMethod}|" \
             -e "s|^#log_file=|log_file=1|" > /var/lib/gogoc/gogoc.conf
+        cd /var/lib/gogoc
+        exec ${pkgs.gogoclient}/bin/gogoc -y -f /var/lib/gogoc/gogoc.conf
       '';
-
-      serviceConfig.ExecStart = "${pkgs.gogoclient}/bin/gogoc -y -f /var/lib/gogoc/gogoc.conf";
-
-      restartTriggers = attrValues cfg;
-
     } // optionalAttrs cfg.autorun {
-
       wantedBy = [ "ip-up.target" ];
-
       partOf = [ "ip-up.target" ];
-
     };
 
   };
-- 
GitLab


From 19e8ffc43f63016b6cdc910f02d99161e9cbe135 Mon Sep 17 00:00:00 2001
From: Rickard Nilsson <rickynils@gmail.com>
Date: Sun, 30 Dec 2012 19:30:06 +0100
Subject: [PATCH 4263/5331] networkmanager: Use systemctl instead of initctl

---
 modules/services/networking/networkmanager.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/services/networking/networkmanager.nix b/modules/services/networking/networkmanager.nix
index 591f34ceee7..d8198dd0329 100644
--- a/modules/services/networking/networkmanager.nix
+++ b/modules/services/networking/networkmanager.nix
@@ -39,7 +39,7 @@ let
   ipUpScript = pkgs.writeScript "01nixos-ip-up" ''
     #!/bin/sh
     if test "$2" = "up"; then
-      ${pkgs.upstart}/sbin/initctl emit ip-up "IFACE=$1"
+      ${config.system.build.systemd}/bin/systemctl start ip-up.target
     fi
   '';
 
-- 
GitLab


From 6961f5048d69f0d512a6e61221791f10e33f3fcf Mon Sep 17 00:00:00 2001
From: Tim Dysinger <tim@dysinger.net>
Date: Mon, 31 Dec 2012 11:00:02 -1000
Subject: [PATCH 4264/5331] add vboxsf group (for automatic mounting of shared
 folders)

---
 modules/virtualisation/virtualbox-guest.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/modules/virtualisation/virtualbox-guest.nix b/modules/virtualisation/virtualbox-guest.nix
index 8e09d79e3a4..a204f56b2ee 100644
--- a/modules/virtualisation/virtualbox-guest.nix
+++ b/modules/virtualisation/virtualbox-guest.nix
@@ -38,6 +38,8 @@ if (pkgs.stdenv.isi686 || pkgs.stdenv.isx86_64) then
 
     boot.extraModulePackages = [ kernel.virtualboxGuestAdditions ];
 
+    users.extraGroups = singleton { name = "vboxsf"; };
+
     jobs.virtualbox =
       { description = "VirtualBox service";
 
-- 
GitLab


From 16a9bcfe815a9fe72c41348b4231c619e11da610 Mon Sep 17 00:00:00 2001
From: Mathijs Kwik <mathijs@bluescreen303.nl>
Date: Fri, 28 Dec 2012 13:29:53 +0100
Subject: [PATCH 4265/5331] add support for systemd mount units

This is mainly useful for specifying mounts that depend on other
units. For example sshfs or davfs need network (and possibly
nameservices).

While systemd makes a distinction between local and remote
filesystems, this only works for in-kernel filesystems such as
nfs and cifs.

fuse-based filesystems (such as sshfs and davs) are classified as
local, so they fail without networking. By explicitly declaring these
mounts as full systemd units (as opposed to having systemd generate
them automatically from /etc/fstab), dependencies can be specified as
on every other unit.

In the future, we can probably port NixOS' filesystems handling to use
these native systemd.mount units and skip /etc/fstab altogether, but
this probably requires additional changes, such as starting systemd
even earlier during boot (stage 1).
---
 modules/system/boot/systemd-unit-options.nix | 47 ++++++++++++++++++
 modules/system/boot/systemd.nix              | 52 +++++++++++++++++++-
 2 files changed, 98 insertions(+), 1 deletion(-)

diff --git a/modules/system/boot/systemd-unit-options.nix b/modules/system/boot/systemd-unit-options.nix
index 5707fb6f87e..e3f0ec6f1d9 100644
--- a/modules/system/boot/systemd-unit-options.nix
+++ b/modules/system/boot/systemd-unit-options.nix
@@ -202,4 +202,51 @@ rec {
 
   };
 
+  mountOptions = unitOptions // {
+
+    what = mkOption {
+      default = "";
+      example = "/dev/sda1";
+      type = types.uniq types.string;
+      description = "Absolute path of device node, file or other resource. (Mandatory)";
+    };
+
+    where = mkOption {
+      default = "";
+      example = "/mnt";
+      type = types.uniq types.string;
+      description = ''
+        Absolute path of a directory of the mount point.
+        Will be created if it doesn't exist. (Mandatory)
+      '';
+    };
+
+    type = mkOption {
+      default = "";
+      example = "ext4";
+      type = types.uniq types.string;
+      description = "File system type.";
+    };
+
+    options = mkOption {
+      default = "";
+      example = "noatime";
+      type = types.string;
+      merge = concatStringsSep ",";
+      description = "Options used to mount the file system.";
+    };
+
+    mountConfig = mkOption {
+      default = {};
+      example = { DirectoryMode = "0775"; };
+      type = types.attrs;
+      description = ''
+        Each attribute in this set specifies an option in the
+        <literal>[Mount]</literal> section of the unit.  See
+        <citerefentry><refentrytitle>systemd.mount</refentrytitle>
+        <manvolnum>5</manvolnum></citerefentry> for details.
+      '';
+    };
+  };
+
 }
\ No newline at end of file
diff --git a/modules/system/boot/systemd.nix b/modules/system/boot/systemd.nix
index a65c95e60f9..fbd28e6e836 100644
--- a/modules/system/boot/systemd.nix
+++ b/modules/system/boot/systemd.nix
@@ -198,6 +198,19 @@ let
     };
   };
 
+  mountConfig = { name, config, ... }: {
+    config = {
+      mountConfig =
+        { What = config.what;
+          Where = config.where;
+        } // optionalAttrs (config.type != "") {
+          Type = config.type;
+        } // optionalAttrs (config.options != "") {
+          Options = config.options;
+        };
+    };
+  };
+
   toOption = x:
     if x == true then "true"
     else if x == false then "false"
@@ -277,6 +290,29 @@ let
         '';
     };
 
+  # this is by no means the full escaping-logic systemd uses
+  # so feel free to extend this further.
+  mountName = path:
+    let escaped = replaceChars [ "-"    " "    "/" ]
+                               [ "\x2d" "\x20" "-" ] (toString path);
+    in if (substring 0 1 escaped == "-")
+       then substring 1 (sub (stringLength escaped) 1) escaped
+       else escaped;
+
+  mountToUnit = name: def:
+    assert def.mountConfig.What != "";
+    assert def.mountConfig.Where != "";
+    { inherit (def) wantedBy enable;
+      text =
+        ''
+          [Unit]
+          ${attrsToSection def.unitConfig}
+
+          [Mount]
+          ${attrsToSection def.mountConfig}
+        '';
+    };
+
   nixosUnits = mapAttrsToList makeUnit cfg.units;
 
   units = pkgs.runCommand "units" { preferLocalBuild = true; }
@@ -387,6 +423,17 @@ in
       description = "Definition of systemd socket units.";
     };
 
+    boot.systemd.mounts = mkOption {
+      default = [];
+      type = types.listOf types.optionSet;
+      options = [ mountOptions unitConfig mountConfig ];
+      description = ''
+        Definition of systemd mount units.
+        This is a list instead of an attrSet, because systemd mandates the names to be derived from
+        the 'where' attribute.
+      '';
+    };
+
     boot.systemd.defaultUnit = mkOption {
       default = "multi-user.target";
       type = types.uniq types.string;
@@ -501,7 +548,10 @@ in
       { "rescue.service".text = rescueService; }
       // mapAttrs' (n: v: nameValuePair "${n}.target" (targetToUnit n v)) cfg.targets
       // mapAttrs' (n: v: nameValuePair "${n}.service" (serviceToUnit n v)) cfg.services
-      // mapAttrs' (n: v: nameValuePair "${n}.socket" (socketToUnit n v)) cfg.sockets;
+      // mapAttrs' (n: v: nameValuePair "${n}.socket" (socketToUnit n v)) cfg.sockets
+      // listToAttrs (map
+                   (v: let n = mountName v.where;
+                       in nameValuePair "${n}.mount" (mountToUnit n v)) cfg.mounts);
 
     system.requiredKernelConfig = map config.lib.kernelConfig.isEnabled [
       "CGROUPS" "AUTOFS4_FS" "DEVTMPFS"
-- 
GitLab


From a3ee9aac982172966d8dae67ce9d248f0b5f2bf2 Mon Sep 17 00:00:00 2001
From: Mathijs Kwik <mathijs@bluescreen303.nl>
Date: Fri, 28 Dec 2012 11:21:39 +0100
Subject: [PATCH 4266/5331] efi-boot-stub: enable hook for running (fixup)
 commands after efibootmgr run

---
 .../loader/efi-boot-stub/efi-boot-stub-builder.sh   |  7 +++++++
 .../boot/loader/efi-boot-stub/efi-boot-stub.nix     | 13 ++++++++++++-
 2 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/modules/system/boot/loader/efi-boot-stub/efi-boot-stub-builder.sh b/modules/system/boot/loader/efi-boot-stub/efi-boot-stub-builder.sh
index 3c55363a44d..2f550c98428 100644
--- a/modules/system/boot/loader/efi-boot-stub/efi-boot-stub-builder.sh
+++ b/modules/system/boot/loader/efi-boot-stub/efi-boot-stub-builder.sh
@@ -122,3 +122,10 @@ for fn in "@efiSysMountPoint@/efi/nixos/"*; do
         rm -vf -- "$fn"
     fi
 done
+
+# Run any extra commands users may need
+if test -n "@runEfibootmgr@"; then
+  set +e
+  @postEfiBootMgrCommands@
+  set -e
+fi
diff --git a/modules/system/boot/loader/efi-boot-stub/efi-boot-stub.nix b/modules/system/boot/loader/efi-boot-stub/efi-boot-stub.nix
index 2b35aadc623..618c8d7737a 100644
--- a/modules/system/boot/loader/efi-boot-stub/efi-boot-stub.nix
+++ b/modules/system/boot/loader/efi-boot-stub/efi-boot-stub.nix
@@ -8,7 +8,7 @@ let
     isExecutable = true;
     inherit (pkgs) bash;
     path = [pkgs.coreutils pkgs.gnused pkgs.gnugrep pkgs.glibc] ++ (pkgs.stdenv.lib.optionals config.boot.loader.efiBootStub.runEfibootmgr [pkgs.efibootmgr pkgs.module_init_tools]);
-    inherit (config.boot.loader.efiBootStub) efiSysMountPoint runEfibootmgr installStartupNsh efiDisk efiPartition;
+    inherit (config.boot.loader.efiBootStub) efiSysMountPoint runEfibootmgr installStartupNsh efiDisk efiPartition postEfiBootMgrCommands;
 
     efiShell = if config.boot.loader.efiBootStub.installShell then
       if pkgs.stdenv.isi686 then
@@ -103,6 +103,17 @@ in
             '';
           };
 
+          postEfiBootMgrCommands = mkOption {
+            default = "";
+            type = types.string;
+            description = ''
+              Shell commands to be executed immediately after efibootmgr has setup the system EFI.
+              Some systems do not follow the EFI specifications properly and insert extra entries.
+              Others will brick (fix by removing battery) on boot when it finds more than X entries.
+              This hook allows for running a few extra efibootmgr commands to combat these issues.
+            '';
+          };
+
         };
       };
     };
-- 
GitLab


From ebf48167174a2f3d80560f9a55750e7f304499a2 Mon Sep 17 00:00:00 2001
From: Mathijs Kwik <mathijs@bluescreen303.nl>
Date: Tue, 1 Jan 2013 14:42:43 +0100
Subject: [PATCH 4267/5331] systemd mount units: use 'escapeSystemdPath' from
 lib/utils

---
 lib/utils.nix                   |  2 +-
 modules/system/boot/systemd.nix | 14 +++-----------
 2 files changed, 4 insertions(+), 12 deletions(-)

diff --git a/lib/utils.nix b/lib/utils.nix
index b75e063eaa9..35c56e8c32b 100644
--- a/lib/utils.nix
+++ b/lib/utils.nix
@@ -5,6 +5,6 @@ rec {
   # Escape a path according to the systemd rules, e.g. /dev/xyzzy
   # becomes dev-xyzzy.  FIXME: slow.
   escapeSystemdPath = s:
-   replaceChars ["/" "-"] ["-" "\\x2d"] (substring 1 (stringLength s) s);
+   replaceChars ["/" "-" " "] ["-" "\\x2d" "\\x20"] (substring 1 (stringLength s) s);
 
 }
diff --git a/modules/system/boot/systemd.nix b/modules/system/boot/systemd.nix
index fbd28e6e836..f0e94266b17 100644
--- a/modules/system/boot/systemd.nix
+++ b/modules/system/boot/systemd.nix
@@ -1,6 +1,7 @@
-{ config, pkgs, ... }:
+{ config, pkgs, utils, ... }:
 
 with pkgs.lib;
+with utils;
 with import ./systemd-unit-options.nix { inherit config pkgs; };
 
 let
@@ -290,15 +291,6 @@ let
         '';
     };
 
-  # this is by no means the full escaping-logic systemd uses
-  # so feel free to extend this further.
-  mountName = path:
-    let escaped = replaceChars [ "-"    " "    "/" ]
-                               [ "\x2d" "\x20" "-" ] (toString path);
-    in if (substring 0 1 escaped == "-")
-       then substring 1 (sub (stringLength escaped) 1) escaped
-       else escaped;
-
   mountToUnit = name: def:
     assert def.mountConfig.What != "";
     assert def.mountConfig.Where != "";
@@ -550,7 +542,7 @@ in
       // mapAttrs' (n: v: nameValuePair "${n}.service" (serviceToUnit n v)) cfg.services
       // mapAttrs' (n: v: nameValuePair "${n}.socket" (socketToUnit n v)) cfg.sockets
       // listToAttrs (map
-                   (v: let n = mountName v.where;
+                   (v: let n = escapeSystemdPath v.where;
                        in nameValuePair "${n}.mount" (mountToUnit n v)) cfg.mounts);
 
     system.requiredKernelConfig = map config.lib.kernelConfig.isEnabled [
-- 
GitLab


From 7e70cffc45644405a95ccfe39b1dbd54ab132a28 Mon Sep 17 00:00:00 2001
From: Mathijs Kwik <mathijs@bluescreen303.nl>
Date: Tue, 1 Jan 2013 14:49:26 +0100
Subject: [PATCH 4268/5331] systemd mount units: better handling of mandatory
 options

---
 modules/system/boot/systemd-unit-options.nix | 2 --
 modules/system/boot/systemd.nix              | 2 --
 2 files changed, 4 deletions(-)

diff --git a/modules/system/boot/systemd-unit-options.nix b/modules/system/boot/systemd-unit-options.nix
index e3f0ec6f1d9..ad9b5da2316 100644
--- a/modules/system/boot/systemd-unit-options.nix
+++ b/modules/system/boot/systemd-unit-options.nix
@@ -205,14 +205,12 @@ rec {
   mountOptions = unitOptions // {
 
     what = mkOption {
-      default = "";
       example = "/dev/sda1";
       type = types.uniq types.string;
       description = "Absolute path of device node, file or other resource. (Mandatory)";
     };
 
     where = mkOption {
-      default = "";
       example = "/mnt";
       type = types.uniq types.string;
       description = ''
diff --git a/modules/system/boot/systemd.nix b/modules/system/boot/systemd.nix
index f0e94266b17..f4d0655118e 100644
--- a/modules/system/boot/systemd.nix
+++ b/modules/system/boot/systemd.nix
@@ -292,8 +292,6 @@ let
     };
 
   mountToUnit = name: def:
-    assert def.mountConfig.What != "";
-    assert def.mountConfig.Where != "";
     { inherit (def) wantedBy enable;
       text =
         ''
-- 
GitLab


From 9aa69885f04969e5d31dcb8265c327adc908954e Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 2 Jan 2013 18:23:19 +0100
Subject: [PATCH 4269/5331] Don't do readlink() on every mount point when
 remounting /dev etc.

Doing so causes the activation script to hang if (say) an NFS mount
point is unreachable.
---
 modules/system/activation/activation-script.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/modules/system/activation/activation-script.nix b/modules/system/activation/activation-script.nix
index 8d9dcaa17c1..dc017563217 100644
--- a/modules/system/activation/activation-script.nix
+++ b/modules/system/activation/activation-script.nix
@@ -145,9 +145,9 @@ in
 
     system.activationScripts.tmpfs =
       ''
-        ${pkgs.utillinux}/bin/mount -o "remount,size=${config.boot.devSize}" /dev
-        ${pkgs.utillinux}/bin/mount -o "remount,size=${config.boot.devShmSize}" /dev/shm
-        ${pkgs.utillinux}/bin/mount -o "remount,size=${config.boot.runSize}" /run
+        ${pkgs.utillinux}/bin/mount -o "remount,size=${config.boot.devSize}" none /dev
+        ${pkgs.utillinux}/bin/mount -o "remount,size=${config.boot.devShmSize}" none /dev/shm
+        ${pkgs.utillinux}/bin/mount -o "remount,size=${config.boot.runSize}" none /run
       '';
 
   };
-- 
GitLab


From 207d30b6f3b7d3fabfbc312ce06b73c1ce3a7a7c Mon Sep 17 00:00:00 2001
From: Rob Vermaas <rob.vermaas@gmail.com>
Date: Fri, 4 Jan 2013 10:58:56 +0100
Subject: [PATCH 4270/5331] Fix VirtualBox image generation:
 switch-to-configuration in chroot needs /bin/sh

---
 modules/virtualisation/virtualbox-image.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/modules/virtualisation/virtualbox-image.nix b/modules/virtualisation/virtualbox-image.nix
index 8fe0030946a..373195a9d68 100644
--- a/modules/virtualisation/virtualbox-image.nix
+++ b/modules/virtualisation/virtualbox-image.nix
@@ -63,6 +63,10 @@ with pkgs.lib;
           mkdir -p /mnt/etc/nixos
           cp ${./nova-config.nix} /mnt/etc/nixos/configuration.nix
 
+          # `switch-to-configuration' requires a /bin/sh
+          mkdir -p /mnt/bin
+          ln -s ${config.system.build.binsh}/bin/sh /mnt/bin/sh
+
           # Generate the GRUB menu.
           chroot /mnt ${config.system.build.toplevel}/bin/switch-to-configuration boot
 
-- 
GitLab


From f701acfac056eb62f227e8a911b30a5bc66a26c9 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 4 Jan 2013 13:50:50 +0100
Subject: [PATCH 4271/5331] nix-daemon: Start "nix-daemon" rather than
 "nix-worker --daemon"

---
 modules/services/misc/nix-daemon.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/services/misc/nix-daemon.nix b/modules/services/misc/nix-daemon.nix
index 49aa8e7931f..eaea8bd653a 100644
--- a/modules/services/misc/nix-daemon.nix
+++ b/modules/services/misc/nix-daemon.nix
@@ -286,7 +286,7 @@ in
         environment = cfg.envVars;
 
         serviceConfig =
-          { ExecStart = "${nix}/bin/nix-worker --daemon";
+          { ExecStart = "@${nix}/bin/nix-daemon nix-daemon";
             KillMode = "process";
             Nice = cfg.daemonNiceLevel;
             IOSchedulingPriority = cfg.daemonIONiceLevel;
-- 
GitLab


From baac242a1f9ea8f39e9bf00b484f77e490956d7e Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 4 Jan 2013 14:04:41 +0100
Subject: [PATCH 4272/5331] Run the garbage collector as a systemd service

Running it from systemd rather than cron has several advantages:
systemd ensures that only one instance runs at a time; the GC can be
manually started/stopped; and logging goes to the journal.

We still need cron to start the service at the right time, but
hopefully soon we can get rid of cron entirely (once systemd supports
starting a unit at a specific time).
---
 modules/services/misc/nix-gc.nix | 19 ++++++++++++++-----
 1 file changed, 14 insertions(+), 5 deletions(-)

diff --git a/modules/services/misc/nix-gc.nix b/modules/services/misc/nix-gc.nix
index 942e7996da0..5322e1ff57d 100644
--- a/modules/services/misc/nix-gc.nix
+++ b/modules/services/misc/nix-gc.nix
@@ -16,7 +16,7 @@ in
 
       automatic = mkOption {
         default = false;
-        example = true;
+        type = types.bool;
         description = "
           Automatically run the garbage collector at specified dates.
         ";
@@ -24,6 +24,7 @@ in
 
       dates = mkOption {
         default = "15 03 * * *";
+        type = types.string;
         description = "
           Run the garbage collector at specified dates to avoid full
           hard-drives.
@@ -33,6 +34,7 @@ in
       options = mkOption {
         default = "";
         example = "--max-freed $((64 * 1024**3))";
+        type = types.string;
         description = "
           Options given to <filename>nix-collect-garbage</filename> when the
           garbage collector is run automatically.
@@ -45,10 +47,17 @@ in
 
   ###### implementation
 
-  config = mkIf cfg.automatic {
-    services.cron.systemCronJobs = [
-      "${cfg.dates} root ${nix}/bin/nix-collect-garbage ${cfg.options} > /var/log/gc.log 2>&1"
-    ];
+  config = {
+
+    services.cron.systemCronJobs = mkIf cfg.automatic (singleton
+      "${cfg.dates} root ${config.system.build.systemd}/bin/systemctl start nix-gc.service");
+
+    boot.systemd.services."nix-gc" =
+      { description = "Nix Garbage Collector";
+        serviceConfig.ExecStart =
+          "@${nix}/bin/nix-collect-garbage nix-collect-garbage ${cfg.options}";
+      };
+
   };
 
 }
-- 
GitLab


From 96ba0ca283607977620d31809d52396232074806 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sat, 5 Jan 2013 01:05:25 +0100
Subject: [PATCH 4273/5331] For some units, use "systemctl restart" rather than
 "systemctl stop/start"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

During a configuration switch, changed units are stopped in the old
configuration, then started in the new configuration (i.e. after
running the activation script and running "systemctl daemon-reload").
This ensures that services are stopped using the ExecStop/ExecStopPost
commands from the old configuration.

However, for some services it's undesirable to stop them; in
particular dhcpcd, which deconfigures its network interfaces when it
stops.  This is dangerous when doing remote upgrades - usually things
go right (especially because the switch script ignores SIGHUP), but
not always (see 9aa69885f04969e5d31dcb8265c327adc908954e).  Likewise,
sshd should be kept running for as long as possible to prevent a
lock-out if the switch fails.

So the new option ‘stopIfChanged = false’ causes "systemctl restart"
to be used instead of "systemctl stop" followed by "systemctl start".
This is only proper for services that don't have stop commands.  (And
it might not handle dependencies properly in some cases, but I'm not
sure.)
---
 modules/services/networking/dhcpcd.nix        |  5 +++
 modules/services/networking/ssh/sshd.nix      |  2 +
 .../activation/switch-to-configuration.pl     | 44 ++++++++++++++-----
 modules/system/boot/systemd-unit-options.nix  | 15 +++++++
 modules/system/boot/systemd.nix               |  1 +
 5 files changed, 55 insertions(+), 12 deletions(-)

diff --git a/modules/services/networking/dhcpcd.nix b/modules/services/networking/dhcpcd.nix
index 2a0d73f6004..cf7f621a85d 100644
--- a/modules/services/networking/dhcpcd.nix
+++ b/modules/services/networking/dhcpcd.nix
@@ -97,6 +97,11 @@ in
 
         wantedBy = [ "network.target" ];
 
+        # Stopping dhcpcd during a reconfiguration is undesirable
+        # because it brings down the network interfaces configured by
+        # dhcpcd.  So do a "systemctl restart" instead.
+        stopIfChanged = false;
+
         path = [ dhcpcd pkgs.nettools pkgs.openresolv ];
 
         serviceConfig =
diff --git a/modules/services/networking/ssh/sshd.nix b/modules/services/networking/ssh/sshd.nix
index 21f81152fa5..8f898ce06a1 100644
--- a/modules/services/networking/ssh/sshd.nix
+++ b/modules/services/networking/ssh/sshd.nix
@@ -267,6 +267,8 @@ in
 
         wantedBy = [ "multi-user.target" ];
 
+        stopIfChanged = false;
+
         path = [ pkgs.openssh ];
 
         environment.LD_LIBRARY_PATH = nssModulesPath;
diff --git a/modules/system/activation/switch-to-configuration.pl b/modules/system/activation/switch-to-configuration.pl
index b085778f099..28ccc158f72 100644
--- a/modules/system/activation/switch-to-configuration.pl
+++ b/modules/system/activation/switch-to-configuration.pl
@@ -6,6 +6,7 @@ use File::Basename;
 use File::Slurp;
 use Cwd 'abs_path';
 
+my $startListFile = "/run/systemd/start-list";
 my $restartListFile = "/run/systemd/restart-list";
 my $reloadListFile = "/run/systemd/reload-list";
 
@@ -125,7 +126,7 @@ while (my ($unit, $state) = each %{$activePrev}) {
             if ($unit ne "suspend.target" && $unit ne "hibernate.target") {
                 my $unitInfo = parseUnit($newUnitFile);
                 unless (boolIsTrue($unitInfo->{'RefuseManualStart'} // "false")) {
-                    write_file($restartListFile, { append => 1 }, "$unit\n");
+                    write_file($startListFile, { append => 1 }, "$unit\n");
                 }
             }
         }
@@ -158,21 +159,31 @@ while (my ($unit, $state) = each %{$activePrev}) {
                         foreach my $socket (@sockets) {
                             if (defined $activePrev->{$socket}) {
                                 push @unitsToStop, $socket;
-                                write_file($restartListFile, { append => 1 }, "$socket\n");
+                                write_file($startListFile, { append => 1 }, "$socket\n");
                                 $socketActivated = 1;
                             }
                         }
                     }
 
-                    # Otherwise, record that this unit needs to be
-                    # started below.  We write this to a file to
-                    # ensure that the service gets restarted if we're
-                    # interrupted.
-                    if (!$socketActivated) {
+                    if (!boolIsTrue($unitInfo->{'X-StopIfChanged'} // "true")) {
+
+                        # This unit should be restarted instead of
+                        # stopped and started.
                         write_file($restartListFile, { append => 1 }, "$unit\n");
-                    }
 
-                    push @unitsToStop, $unit;
+                    } else {
+
+                        # If the unit is not socket-activated, record
+                        # that this unit needs to be started below.
+                        # We write this to a file to ensure that the
+                        # service gets restarted if we're interrupted.
+                        if (!$socketActivated) {
+                            write_file($startListFile, { append => 1 }, "$unit\n");
+                        }
+
+                        push @unitsToStop, $unit;
+
+                    }
                 }
             }
         }
@@ -216,7 +227,7 @@ foreach my $mountPoint (keys %$prevFss) {
         push @unitsToStop, $unit;
     } elsif ($prev->{fsType} ne $new->{fsType} || $prev->{device} ne $new->{device}) {
         # Filesystem type or device changed, so unmount and mount it.
-        write_file($restartListFile, { append => 1 }, "$unit\n");
+        write_file($startListFile, { append => 1 }, "$unit\n");
         push @unitsToStop, $unit;
     } elsif ($prev->{options} ne $new->{options}) {
         # Mount options changes, so remount it.
@@ -266,16 +277,25 @@ system("@systemd@/bin/systemctl", "reset-failed");
 # Make systemd reload its units.
 system("@systemd@/bin/systemctl", "daemon-reload") == 0 or $res = 3;
 
+# Restart changed services (those that have to be restarted rather
+# than stopped and started).
+my @restart = unique(split('\n', read_file($restartListFile, err_mode => 'quiet') // ""));
+if (scalar @restart > 0) {
+    print STDERR "restarting the following units: ", join(", ", sort(@restart)), "\n";
+    system("@systemd@/bin/systemctl", "restart", "--", @restart) == 0 or $res = 4;
+    unlink($restartListFile);
+}
+
 # Start all active targets, as well as changed units we stopped above.
 # The latter is necessary because some may not be dependencies of the
 # targets (i.e., they were manually started).  FIXME: detect units
 # that are symlinks to other units.  We shouldn't start both at the
 # same time because we'll get a "Failed to add path to set" error from
 # systemd.
-my @start = unique("default.target", split('\n', read_file($restartListFile, err_mode => 'quiet') // ""));
+my @start = unique("default.target", split('\n', read_file($startListFile, err_mode => 'quiet') // ""));
 print STDERR "starting the following units: ", join(", ", sort(@start)), "\n";
 system("@systemd@/bin/systemctl", "start", "--", @start) == 0 or $res = 4;
-unlink($restartListFile);
+unlink($startListFile);
 
 # Reload units that need it.  This includes remounting changed mount
 # units.
diff --git a/modules/system/boot/systemd-unit-options.nix b/modules/system/boot/systemd-unit-options.nix
index ad9b5da2316..1f8097ada1c 100644
--- a/modules/system/boot/systemd-unit-options.nix
+++ b/modules/system/boot/systemd-unit-options.nix
@@ -183,6 +183,21 @@ rec {
       '';
     };
 
+    stopIfChanged = mkOption {
+      type = types.bool;
+      default = true;
+      description = ''
+        If set, a changed unit is restarted by calling
+        <command>systemctl stop</command> in the old configuration,
+        then <command>systemctl start</command> in the new one.
+        Otherwise, it is restarted in a single step using
+        <command>systemctl restart</command> in the new configuration.
+        The latter is less correct because it runs the
+        <literal>ExecStop</literal> commands from the new
+        configuration.
+      '';
+    };
+
   };
 
 
diff --git a/modules/system/boot/systemd.nix b/modules/system/boot/systemd.nix
index f4d0655118e..a0462951d00 100644
--- a/modules/system/boot/systemd.nix
+++ b/modules/system/boot/systemd.nix
@@ -246,6 +246,7 @@ let
           ${let env = cfg.globalEnvironment // def.environment;
             in concatMapStrings (n: "Environment=${n}=${getAttr n env}\n") (attrNames env)}
           ${optionalString (!def.restartIfChanged) "X-RestartIfChanged=false"}
+          ${optionalString (!def.stopIfChanged) "X-StopIfChanged=false"}
 
           ${optionalString (def.preStart != "") ''
             ExecStartPre=${makeJobScript "${name}-pre-start" ''
-- 
GitLab


From 1aea92c4ce311e685a5e9c0e7ab2df1562626ac6 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sat, 5 Jan 2013 01:35:26 +0100
Subject: [PATCH 4274/5331] =?UTF-8?q?Ensure=20that=20=E2=80=98nix.gc.optio?=
 =?UTF-8?q?ns=E2=80=99=20is=20subject=20to=20shell=20expansion?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 modules/services/misc/nix-gc.nix | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/modules/services/misc/nix-gc.nix b/modules/services/misc/nix-gc.nix
index 5322e1ff57d..435326e87fb 100644
--- a/modules/services/misc/nix-gc.nix
+++ b/modules/services/misc/nix-gc.nix
@@ -3,7 +3,6 @@
 with pkgs.lib;
 
 let
-  nix = config.environment.nix;
   cfg = config.nix.gc;
 in
 
@@ -54,8 +53,8 @@ in
 
     boot.systemd.services."nix-gc" =
       { description = "Nix Garbage Collector";
-        serviceConfig.ExecStart =
-          "@${nix}/bin/nix-collect-garbage nix-collect-garbage ${cfg.options}";
+        path  = [ config.environment.nix ];
+        script = "exec nix-collect-garbage ${cfg.options}";
       };
 
   };
-- 
GitLab


From 4e64755b9dc49a608c964c8fef31d407d52bd3b3 Mon Sep 17 00:00:00 2001
From: Jan Malakhovski <oxij@oxij.org>
Date: Sat, 5 Jan 2013 19:38:23 +0000
Subject: [PATCH 4275/5331] wacom: add USB tablet support

To be honest, it's more like "be less discriminating against USB tablets".
USB tablets usually get autodetected, device name is not necessary and defaulting to a serial touchscreen is a clear discrimination.
Unconditionally remapping buttons is generally not a good idea either.
Old defaults transformed into examples.
---
 modules/services/x11/hardware/wacom.nix | 54 +++++++++++++++++++------
 1 file changed, 42 insertions(+), 12 deletions(-)

diff --git a/modules/services/x11/hardware/wacom.nix b/modules/services/x11/hardware/wacom.nix
index 98717ce5a5b..1ea928d9c76 100644
--- a/modules/services/x11/hardware/wacom.nix
+++ b/modules/services/x11/hardware/wacom.nix
@@ -16,18 +16,41 @@ in
 
       enable = mkOption {
         default = false;
-        description = "Whether to enable the Wacom touchscreen/digitizer.";
+        description = "Whether to enable the Wacom touchscreen/digitizer/tablet.";
       };
 
       device = mkOption {
-        default = "/dev/ttyS0";
-        description = "Device to use.";
+        default = null;
+        example = "/dev/ttyS0";
+        description = "Device to use. Set to null for autodetect (think USB tablet).";
       };
 
       forceDeviceType = mkOption {
-        default = "ISDV4";
-        example = null;
-        description = "Some models (think touchscreen) require the device type to be specified.";
+        default = null;
+        example = "ISDV4";
+        description = "Some models (think touchscreen) require the device type to be specified. Set to null for autodetect (think USB tablet).";
+      };
+
+      stylusExtraConfig = mkOption {
+        default = "";
+        example = ''
+            Option "Button1" "2"
+          '';
+        description = "Lines to be added to Wacom_stylus InputDevice section.";
+      };
+
+      eraserExtraConfig = mkOption {
+        default = "";
+        example = ''
+            Option "Button2" "3"
+          '';
+        description = "Lines to be added to Wacom_eraser InputDevice section.";
+      };
+
+      cursorExtraConfig = mkOption {
+        default = "";
+        example = "";
+        description = "Lines to be added to Wacom_cursor InputDevice section.";
       };
 
     };
@@ -44,8 +67,8 @@ in
     services.xserver.serverLayoutSection =
       ''
         InputDevice "Wacom_stylus"
-        InputDevice "Wacom_cursor"
         InputDevice "Wacom_eraser"
+        InputDevice "Wacom_cursor"
       '';
 
     services.xserver.config =
@@ -53,33 +76,40 @@ in
         Section "InputDevice"
           Driver "wacom"
           Identifier "Wacom_stylus"
-          Option "Device" "${cfg.device}"
+          ${optionalString (cfg.device != null) ''
+            Option "Device" "${cfg.device}"
+          ''}
           Option "Type" "stylus"
           ${optionalString (cfg.forceDeviceType != null) ''
             Option "ForceDevice" "${cfg.forceDeviceType}"
           ''}
-          Option "Button2" "3"
+          ${cfg.stylusExtraConfig}
         EndSection
 
         Section "InputDevice"
           Driver "wacom"
           Identifier "Wacom_eraser"
-          Option "Device" "${cfg.device}"
+          ${optionalString (cfg.device != null) ''
+            Option "Device" "${cfg.device}"
+          ''}
           Option "Type" "eraser"
           ${optionalString (cfg.forceDeviceType != null) ''
             Option "ForceDevice" "${cfg.forceDeviceType}"
           ''}
-          Option "Button1" "2"
+          ${cfg.eraserExtraConfig}
         EndSection
 
         Section "InputDevice"
           Driver "wacom"
           Identifier "Wacom_cursor"
-          Option "Device" "${cfg.device}"
+          ${optionalString (cfg.device != null) ''
+            Option "Device" "${cfg.device}"
+          ''}
           Option "Type" "cursor"
           ${optionalString (cfg.forceDeviceType != null) ''
             Option "ForceDevice" "${cfg.forceDeviceType}"
           ''}
+          ${cfg.cursorExtraConfig}
         EndSection
       '';
 
-- 
GitLab


From 462a9f9fb05e2cb15103127c81d8266b7efb1a18 Mon Sep 17 00:00:00 2001
From: Alexander Inyukhin <shurick@sectorb.msk.ru>
Date: Sat, 15 Dec 2012 15:31:32 +0400
Subject: [PATCH 4276/5331] Remove .conf extension from acpid config files

This should fix #51
---
 modules/services/hardware/acpid.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/services/hardware/acpid.nix b/modules/services/hardware/acpid.nix
index 303db3816b5..26c600092db 100644
--- a/modules/services/hardware/acpid.nix
+++ b/modules/services/hardware/acpid.nix
@@ -8,11 +8,11 @@ let
     ''
       ensureDir $out
       ${
-        # Generate a .conf file for each event. (You can't have
+        # Generate a configuration file for each event. (You can't have
         # multiple events in one config file...)
         let f = event:
           ''
-            fn=$out/${event.name}.conf
+            fn=$out/${event.name}
             echo "event=${event.event}" > $fn
             echo "action=${pkgs.writeScript "${event.name}.sh" event.action}" >> $fn
           '';
-- 
GitLab


From 9a81748f2044ccea5e5083e3c8b38c4f6f79cda6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= <viric@viric.name>
Date: Sun, 6 Jan 2013 22:31:13 +0100
Subject: [PATCH 4277/5331] Adding defaultGatewayWindowSize

This allows setting the max tcp window size for the route of
the default gateway (usually the internet access).

It works only for non-DHCP configurations by now.
---
 modules/tasks/network-interfaces.nix | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/modules/tasks/network-interfaces.nix b/modules/tasks/network-interfaces.nix
index 64cb4a6749e..740c3b83cda 100644
--- a/modules/tasks/network-interfaces.nix
+++ b/modules/tasks/network-interfaces.nix
@@ -5,6 +5,10 @@ with pkgs.lib;
 let
 
   cfg = config.networking;
+
+  windowSize = if cfg.defaultGatewayWindowSize != "" then 
+    "window ${cfg.defaultGatewayWindowSize}" else "";
+
   interfaces = attrValues cfg.interfaces;
   hasVirtuals = any (i: i.virtual) interfaces;
 
@@ -135,6 +139,15 @@ in
       '';
     };
 
+    networking.defaultGatewayWindowSize = mkOption {
+      default = "";
+      example = "524288";
+      description = ''
+        The window size of the default gateway. It limits maximal data bursts that TCP peers
+        are allowed to send to us.
+      '';
+    };
+
     networking.nameservers = mkOption {
       default = [];
       example = ["130.161.158.4" "130.161.33.17"];
@@ -282,7 +295,7 @@ in
                 # Set the default gateway.
                 ${optionalString (cfg.defaultGateway != "") ''
                   # FIXME: get rid of "|| true" (necessary to make it idempotent).
-                  ip route add default via "${cfg.defaultGateway}" || true
+                  ip route add default via "${cfg.defaultGateway}" ${windowSize} || true
                 ''}
 
                 # Turn on forwarding if any interface has enabled proxy_arp.
-- 
GitLab


From 38af5986584621921c438c8bee08747f202106c1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= <viric@viric.name>
Date: Sun, 6 Jan 2013 23:20:48 +0100
Subject: [PATCH 4278/5331] Simplifying defaultGatewayWindowSize according to
 Eelco suggestions

---
 modules/tasks/network-interfaces.nix | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/modules/tasks/network-interfaces.nix b/modules/tasks/network-interfaces.nix
index 740c3b83cda..bbc357b1b29 100644
--- a/modules/tasks/network-interfaces.nix
+++ b/modules/tasks/network-interfaces.nix
@@ -5,10 +5,6 @@ with pkgs.lib;
 let
 
   cfg = config.networking;
-
-  windowSize = if cfg.defaultGatewayWindowSize != "" then 
-    "window ${cfg.defaultGatewayWindowSize}" else "";
-
   interfaces = attrValues cfg.interfaces;
   hasVirtuals = any (i: i.virtual) interfaces;
 
@@ -140,8 +136,9 @@ in
     };
 
     networking.defaultGatewayWindowSize = mkOption {
-      default = "";
-      example = "524288";
+      default = null;
+      example = 524288;
+      type = types.nullOr types.int;
       description = ''
         The window size of the default gateway. It limits maximal data bursts that TCP peers
         are allowed to send to us.
@@ -295,7 +292,9 @@ in
                 # Set the default gateway.
                 ${optionalString (cfg.defaultGateway != "") ''
                   # FIXME: get rid of "|| true" (necessary to make it idempotent).
-                  ip route add default via "${cfg.defaultGateway}" ${windowSize} || true
+                  ip route add default via "${cfg.defaultGateway}" ${
+                    optionalString (cfg.defaultGatewayWindowSize != null)
+                      "window ${cfg.defaultGatewayWindowSize}"} || true
                 ''}
 
                 # Turn on forwarding if any interface has enabled proxy_arp.
-- 
GitLab


From 2e035ae042ab4557c27953c3a1fd04754c89158a Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 7 Jan 2013 15:04:19 +0100
Subject: [PATCH 4279/5331] Hack to prevent <interface>-cfg.service from
 breaking the default gateway

Restarting <interface>-cfg.service may cause the interface's IP
addresses to be flushed.  If the default gateway goes through that
interface, then the default gateway is deleted.  So we need to
restart network-setup.target.
---
 modules/tasks/network-interfaces.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/modules/tasks/network-interfaces.nix b/modules/tasks/network-interfaces.nix
index bbc357b1b29..82f4d3da4f1 100644
--- a/modules/tasks/network-interfaces.nix
+++ b/modules/tasks/network-interfaces.nix
@@ -347,6 +347,9 @@ in
                     echo "configuring interface..."
                     ip -4 addr flush dev "${i.name}"
                     ip -4 addr add "${i.ipAddress}/${mask}" dev "${i.name}"
+                    # Ensure that the default gateway remains set.
+                    # (Flushing this interface may have removed it.)
+                    ${config.system.build.systemd}/bin/systemctl try-restart --no-block network-setup.service
                   else
                     echo "skipping configuring interface"
                   fi
-- 
GitLab


From da32722ade156ff9b924fb09f1c28792e5d1ecc0 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 7 Jan 2013 16:00:10 +0100
Subject: [PATCH 4280/5331] display-manager: Start after local-fs.target

We don't want users trying to log in while /home is still being
fsck'ed...
---
 modules/services/x11/xserver.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/services/x11/xserver.nix b/modules/services/x11/xserver.nix
index 1c5a3f75039..6eec6f88b97 100644
--- a/modules/services/x11/xserver.nix
+++ b/modules/services/x11/xserver.nix
@@ -389,7 +389,7 @@ in
     boot.systemd.defaultUnit = mkIf cfg.autorun "graphical.target";
 
     boot.systemd.services."display-manager" =
-      { after = [ "systemd-udev-settle.service" ];
+      { after = [ "systemd-udev-settle.service" "local-fs.target" ];
 
         restartIfChanged = false;
 
-- 
GitLab


From 74bae63135455282b8d8467573c4bfef4871c39d Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 7 Jan 2013 16:01:22 +0100
Subject: [PATCH 4281/5331] smartd: Remove unnecessary PartOf dependency

---
 modules/services/monitoring/smartd.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/modules/services/monitoring/smartd.nix b/modules/services/monitoring/smartd.nix
index 72a4495b1f5..48066856625 100644
--- a/modules/services/monitoring/smartd.nix
+++ b/modules/services/monitoring/smartd.nix
@@ -87,7 +87,6 @@ in
       environment.TZ = config.time.timeZone;
 
       wantedBy = [ "multi-user.target" ];
-      partOf = [ "multi-user.target" ];
 
       serviceConfig.ExecStart = "${pkgs.smartmontools}/sbin/smartd --no-fork ${smartdFlags}";
     };
-- 
GitLab


From 1541311f06a0fd148ace46bb0adaa3f968b36d1e Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 7 Jan 2013 16:03:35 +0100
Subject: [PATCH 4282/5331] switch-to-configuration: Stop some target units to
 ensure proper dependency ordering

This is currently only done for network-interfaces.target, but
it should propably be done for most targets.
---
 .../activation/switch-to-configuration.pl      | 18 +++++++++++++++++-
 modules/tasks/network-interfaces.nix           |  1 +
 2 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/modules/system/activation/switch-to-configuration.pl b/modules/system/activation/switch-to-configuration.pl
index 28ccc158f72..44cd261cf98 100644
--- a/modules/system/activation/switch-to-configuration.pl
+++ b/modules/system/activation/switch-to-configuration.pl
@@ -117,6 +117,8 @@ while (my ($unit, $state) = each %{$activePrev}) {
         }
 
         elsif ($unit =~ /\.target$/) {
+            my $unitInfo = parseUnit($newUnitFile);
+
             # Cause all active target units to be restarted below.
             # This should start most changed units we stop here as
             # well as any new dependencies (including new mounts and
@@ -124,11 +126,25 @@ while (my ($unit, $state) = each %{$activePrev}) {
             # active after the system has resumed, which probably
             # should not be the case.  Just ignore it.
             if ($unit ne "suspend.target" && $unit ne "hibernate.target") {
-                my $unitInfo = parseUnit($newUnitFile);
                 unless (boolIsTrue($unitInfo->{'RefuseManualStart'} // "false")) {
                     write_file($startListFile, { append => 1 }, "$unit\n");
                 }
             }
+
+            # Stop targets that have X-StopOnReconfiguration set.
+            # This is necessary to respect dependency orderings
+            # involving targets: if unit X starts after target Y and
+            # target Y starts after unit Z, then if X and Z have both
+            # changed, then X should be restarted after Z.  However,
+            # if target Y is in the "active" state, X and Z will be
+            # restarted at the same time because X's dependency on Y
+            # is already satisfied.  Thus, we need to stop Y first.
+            # Stopping a target generally has no effect on other units
+            # (unless there is a PartOf dependency), so this is just a
+            # bookkeeping thing to get systemd to do the right thing.
+            if (boolIsTrue($unitInfo->{'X-StopOnReconfiguration'} // "false")) {
+                push @unitsToStop, $unit;
+            }
         }
 
         elsif (abs_path($prevUnitFile) ne abs_path($newUnitFile)) {
diff --git a/modules/tasks/network-interfaces.nix b/modules/tasks/network-interfaces.nix
index 82f4d3da4f1..a002e2b68b2 100644
--- a/modules/tasks/network-interfaces.nix
+++ b/modules/tasks/network-interfaces.nix
@@ -255,6 +255,7 @@ in
     boot.systemd.targets."network-interfaces" =
       { description = "All Network Interfaces";
         wantedBy = [ "network.target" ];
+        unitConfig.X-StopOnReconfiguration = true;
       };
 
     boot.systemd.services =
-- 
GitLab


From b79c5dc8781611648c728e3650c4b68bfdce231f Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 8 Jan 2013 00:35:27 +0100
Subject: [PATCH 4283/5331] Add section on network configuration topics

---
 doc/manual/configuration.xml | 169 +++++++++++++++++++++++++++++++++++
 doc/manual/installation.xml  |  20 ++---
 doc/manual/manual.xml        |  11 +--
 3 files changed, 185 insertions(+), 15 deletions(-)
 create mode 100644 doc/manual/configuration.xml

diff --git a/doc/manual/configuration.xml b/doc/manual/configuration.xml
new file mode 100644
index 00000000000..f73018279a5
--- /dev/null
+++ b/doc/manual/configuration.xml
@@ -0,0 +1,169 @@
+<chapter xmlns="http://docbook.org/ns/docbook"
+         xmlns:xlink="http://www.w3.org/1999/xlink"
+         xml:id="ch-configuration">
+
+<title>Configuration</title>
+
+<para>This chapter describes how to configure various aspects of a
+NixOS machine through the configuration file
+<filename>/etc/nixos/configuration.nix</filename>.  As described in
+<xref linkend="sec-changing-config" />, changes to that file only take
+effect after you run <command>nixos-rebuild</command>.</para>
+
+
+<!--===============================================================-->
+
+<section><title>Networking</title>
+
+<section><title>Secure shell access</title>
+
+<para>Secure shell (SSH) access to your machine can be enabled by
+setting:
+
+<programlisting>
+services.openssh.enable = true;
+</programlisting>
+
+By default, root logins using a password are disallowed.  They can be
+disabled entirely by setting
+<literal>services.openssh.permitRootLogin</literal> to
+<literal>"no"</literal>.</para>
+
+<para>You can declaratively specify authorised RSA/DSA public keys for
+a user as follows:
+
+<!-- FIXME: this might not work if the user is unmanaged. -->
+<programlisting>
+users.extraUsers.alice.openssh.authorizedKeys.keys =
+  [ "ssh-dss AAAAB3NzaC1kc3MAAACBAPIkGWVEt4..." ];
+</programlisting>
+
+</para>
+
+</section>
+
+
+<section><title>IPv4 configuration</title>
+
+<para>By default, NixOS uses DHCP (specifically,
+(<command>dhcpcd</command>)) to automatically configure network
+interfaces.  However, you can configure an interface manually as
+follows:
+
+<programlisting>
+networking.interfaces.eth0 = { ipAddress = "192.168.1.2"; prefixLength = 24; };
+</programlisting>
+
+(The network prefix can also be specified using the option
+<literal>subnetMask</literal>,
+e.g. <literal>"255.255.255.0"</literal>, but this is deprecated.)
+Typically you’ll also want to set a default gateway and set of name
+servers:
+
+<programlisting>
+networking.defaultGateway = "192.168.1.1";
+networking.nameservers = [ "8.8.8.8" ];
+</programlisting>
+
+</para>
+
+<note><para>Statically configured interfaces are set up by the systemd
+service
+<replaceable>interface-name</replaceable><literal>-cfg.service</literal>.
+The default gateway and name server configuration is performed by
+<literal>network-setup.service</literal>.</para></note>
+
+<para>The host name is set using <option>networking.hostName</option>:
+
+<programlisting>
+networking.hostName = "cartman";
+</programlisting>
+
+The default host name is <literal>nixos</literal>.  Set it to the
+empty string (<literal>""</literal>) to allow the DHCP server to
+provide the host name.</para>
+
+</section>
+
+
+<section><title>IPv6 configuration</title>
+
+<para>IPv6 is enabled by default.  Stateless address autoconfiguration
+is used to automatically assign IPv6 addresses to all interfaces.  You
+can disable IPv6 support globally by setting:
+
+<programlisting>
+networking.enableIPv6 = false;
+</programlisting>
+
+</para>
+
+</section>
+
+
+<section><title>Firewall</title>
+
+<para>NixOS has a simple stateful firewall that blocks incoming
+connections and other unexpected packets.  The firewall applies to
+both IPv4 and IPv6 traffic.  It can be enabled as follows:
+
+<programlisting>
+networking.firewall.enable = true;
+</programlisting>
+
+You can open specific TCP ports to the outside world:
+
+<programlisting>
+networking.firewall.allowedTCPPorts = [ 80 443 ];
+</programlisting>
+
+Note that TCP port 22 (ssh) is opened automatically if the SSH daemon
+is enabled (<option>services.openssh.enable = true</option>).  UDP
+ports can be opened through
+<option>networking.firewall.allowedUDPPorts</option>.  Also of
+interest is
+
+<programlisting>
+networking.firewall.allowPing = true;
+</programlisting>
+
+to allow the machine to respond to ping requests.  (ICMPv6 pings are
+always allowed.)</para>
+
+</section>
+
+
+<section><title>Wireless networks</title>
+
+<para>TODO</para>
+
+</section>
+
+
+<section><title>Ad-hoc configuration</title>
+
+<para>You can use <option>networking.localCommands</option> to specify
+shell commands to be run at the end of
+<literal>network-setup.service</literal>.  This is useful for doing
+network configuration not covered by the existing NixOS modules.  For
+instance, to statically configure an IPv6 address:
+
+<programlisting>
+networking.localCommands =
+  ''
+    ip -6 addr add 2001:610:685:1::1/64 dev eth0
+  '';
+</programlisting>
+
+</para>
+
+</section>
+
+
+<!-- TODO: OpenVPN, NAT -->
+
+
+</section>
+
+
+</chapter>
diff --git a/doc/manual/installation.xml b/doc/manual/installation.xml
index 8bde2f6e053..55e23691ccb 100644
--- a/doc/manual/installation.xml
+++ b/doc/manual/installation.xml
@@ -58,7 +58,7 @@ Wiki</link>.</para>
 
     <listitem><para>For partitioning:
     <command>fdisk</command>.</para></listitem>
-    
+
     <listitem><para>For initialising Ext4 partitions:
     <command>mkfs.ext4</command>.  It is recommended that you assign a
     unique symbolic label to the file system using the option
@@ -70,13 +70,13 @@ Wiki</link>.</para>
     <command>mkswap</command>.  Again it’s recommended to assign a
     label to the swap partition: <option>-L
     <replaceable>label</replaceable></option>.</para></listitem>
-    
+
     <listitem><para>For creating LVM volumes, the LVM commands, e.g.,
 
 <screen>
 $ pvcreate /dev/sda1 /dev/sdb1
 $ vgcreate MyVolGroup /dev/sda1 /dev/sdb1
-$ lvcreate --size 2G --name bigdisk MyVolGroup 
+$ lvcreate --size 2G --name bigdisk MyVolGroup
 $ lvcreate --size 1G --name smalldisk MyVolGroup</screen>
 
     </para></listitem>
@@ -87,7 +87,7 @@ $ lvcreate --size 1G --name smalldisk MyVolGroup</screen>
   </itemizedlist>
 
   </para></listitem>
-    
+
   <listitem><para>Mount the target file system on which NixOS should
   be installed on <filename>/mnt</filename>.</para></listitem>
 
@@ -138,7 +138,7 @@ $ nixos-option --install</screen>
     xlink:href="https://nixos.org/repos/nix/configurations/trunk/"/>.</para>
 
   </listitem>
-  
+
   <listitem><para>If your machine has a limited amount of memory, you
   may want to activate swap devices now (<command>swapon
   <replaceable>device</replaceable></command>).  The installer (or
@@ -234,7 +234,7 @@ $ reboot</screen>
 
   swapDevices =
     [ { device = "/dev/disk/by-label/swap"; } ];
-  
+
   services.sshd.enable = true;
 }</screen>
 </example>
@@ -260,7 +260,7 @@ to build the new configuration, make it the default configuration for
 booting, and try to realise the configuration in the running system
 (e.g., by restarting system services).</para>
 
-<para>You can also do 
+<para>You can also do
 
 <screen>
 $ nixos-rebuild test</screen>
@@ -270,7 +270,7 @@ without making it the boot default.  So if (say) the configuration
 locks up your machine, you can just reboot to get back to a working
 configuration.</para>
 
-<para>There is also 
+<para>There is also
 
 <screen>
 $ nixos-rebuild boot</screen>
@@ -279,7 +279,7 @@ to build the configuration and make it the boot default, but not
 switch to it now (so it will only take effect after the next
 reboot).</para>
 
-<para>Finally, you can do 
+<para>Finally, you can do
 
 <screen>
 $ nixos-rebuild build</screen>
@@ -329,7 +329,7 @@ You can then upgrade NixOS to the latest version in the channel by
 running
 
 <screen>
-$ nix-channel --update
+$ nix-channel --update nixos
 </screen>
 
 and running the <command>nixos-rebuild</command> command as described
diff --git a/doc/manual/manual.xml b/doc/manual/manual.xml
index b7e4c6315f9..9179911f248 100644
--- a/doc/manual/manual.xml
+++ b/doc/manual/manual.xml
@@ -24,16 +24,16 @@
       <year>2007-2012</year>
       <holder>Eelco Dolstra</holder>
     </copyright>
-    
+
   </info>
 
-  
+
   <preface>
     <title>Preface</title>
 
     <para>This manual describes NixOS, a Linux distribution based on
     the purely functional package management system Nix.</para>
-    
+
     <para>NixOS is rather bleeding edge, and this manual is
     correspondingly sketchy and quite possibly out of date.  It gives
     basic information on how to get NixOS up and running, but since
@@ -45,11 +45,12 @@
     mailing list or on <link
     xlink:href="irc://irc.freenode.net/#nixos">the
     <literal>#nixos</literal> channel on Freenode.</link>.</para>
-    
+
   </preface>
-  
+
 
   <xi:include href="installation.xml" />
+  <xi:include href="configuration.xml" />
   <!-- <xi:include href="userconfiguration.xml" /> -->
   <xi:include href="troubleshooting.xml" />
   <xi:include href="development.xml" />
-- 
GitLab


From f05e5813b556cf8ed5e88f5f605277f893332634 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 8 Jan 2013 02:02:15 +0100
Subject: [PATCH 4284/5331] Add an overview of systemctl/loginctl/journalctl

---
 doc/manual/configuration.xml |   6 +-
 doc/manual/installation.xml  |   2 +-
 doc/manual/manual.xml        |   1 +
 doc/manual/running.xml       | 288 +++++++++++++++++++++++++++++++++++
 4 files changed, 295 insertions(+), 2 deletions(-)
 create mode 100644 doc/manual/running.xml

diff --git a/doc/manual/configuration.xml b/doc/manual/configuration.xml
index f73018279a5..f1f99fb70ed 100644
--- a/doc/manual/configuration.xml
+++ b/doc/manual/configuration.xml
@@ -2,7 +2,7 @@
          xmlns:xlink="http://www.w3.org/1999/xlink"
          xml:id="ch-configuration">
 
-<title>Configuration</title>
+<title>Configuring NixOS</title>
 
 <para>This chapter describes how to configure various aspects of a
 NixOS machine through the configuration file
@@ -166,4 +166,8 @@ networking.localCommands =
 </section>
 
 
+<!-- TODO: declarative package installation; X11; user management;
+     Apache; libvirtd virtualisation -->
+
+
 </chapter>
diff --git a/doc/manual/installation.xml b/doc/manual/installation.xml
index 55e23691ccb..1c00dd37d33 100644
--- a/doc/manual/installation.xml
+++ b/doc/manual/installation.xml
@@ -1,7 +1,7 @@
 <chapter xmlns="http://docbook.org/ns/docbook"
          xmlns:xlink="http://www.w3.org/1999/xlink">
 
-<title>Installation</title>
+<title>Installing NixOS</title>
 
 
 <!--===============================================================-->
diff --git a/doc/manual/manual.xml b/doc/manual/manual.xml
index 9179911f248..ce4055a753c 100644
--- a/doc/manual/manual.xml
+++ b/doc/manual/manual.xml
@@ -51,6 +51,7 @@
 
   <xi:include href="installation.xml" />
   <xi:include href="configuration.xml" />
+  <xi:include href="running.xml" />
   <!-- <xi:include href="userconfiguration.xml" /> -->
   <xi:include href="troubleshooting.xml" />
   <xi:include href="development.xml" />
diff --git a/doc/manual/running.xml b/doc/manual/running.xml
new file mode 100644
index 00000000000..f9feadbc086
--- /dev/null
+++ b/doc/manual/running.xml
@@ -0,0 +1,288 @@
+<chapter xmlns="http://docbook.org/ns/docbook"
+         xmlns:xlink="http://www.w3.org/1999/xlink"
+         xml:id="ch-running">
+
+<title>Running NixOS</title>
+
+<para>This chapter describes various aspects of managing a running
+NixOS system, such as how to use the <command>systemd</command>
+service manager.</para>
+
+
+<!--===============================================================-->
+
+<section><title>Service management</title>
+
+<para>In NixOS, all system services are started and monitored using
+the systemd program.  Systemd is the “init” process of the system
+(i.e. PID 1), the parent of all other processes.  It manages a set of
+so-called “units”, which can be things like system services
+(programs), but also mount points, swap files, devices, targets
+(groups of units) and more.  Units can have complex dependencies; for
+instance, one unit can require that another unit must be succesfully
+started before the first unit can be started.  When the system boots,
+it starts a unit named <literal>default.target</literal>; the
+dependencies of this unit cause all system services to be started,
+filesystems to be mounted, swap files to be activated, and so
+on.</para>
+
+<para>The command <command>systemctl</command> is the main way to
+interact with <command>systemd</command>.  Without any arguments, it
+shows the status of active units:
+
+<screen>
+$ systemctl
+-.mount          loaded active mounted   /
+swapfile.swap    loaded active active    /swapfile
+sshd.service     loaded active running   SSH Daemon
+graphical.target loaded active active    Graphical Interface
+<replaceable>...</replaceable>
+</screen>
+
+</para>
+
+<para>You can ask for detailed status information about a unit, for
+instance, the PostgreSQL database service:
+
+<screen>
+$ systemctl status postgresql.service
+postgresql.service - PostgreSQL Server
+          Loaded: loaded (/nix/store/pn3q73mvh75gsrl8w7fdlfk3fq5qm5mw-unit/postgresql.service)
+          Active: active (running) since Mon, 2013-01-07 15:55:57 CET; 9h ago
+        Main PID: 2390 (postgres)
+          CGroup: name=systemd:/system/postgresql.service
+                  ├─2390 postgres
+                  ├─2418 postgres: writer process
+                  ├─2419 postgres: wal writer process
+                  ├─2420 postgres: autovacuum launcher process
+                  ├─2421 postgres: stats collector process
+                  └─2498 postgres: zabbix zabbix [local] idle
+
+Jan 07 15:55:55 hagbard postgres[2394]: [1-1] LOG:  database system was shut down at 2013-01-07 15:55:05 CET
+Jan 07 15:55:57 hagbard postgres[2390]: [1-1] LOG:  database system is ready to accept connections
+Jan 07 15:55:57 hagbard postgres[2420]: [1-1] LOG:  autovacuum launcher started
+Jan 07 15:55:57 hagbard systemd[1]: Started PostgreSQL Server.
+</screen>
+
+Note that this shows the status of the unit (active and running), all
+the processes belonging to the service, as well as the most recent log
+messages from the service.
+
+</para>
+
+<para>Units can be stopped, started or restarted:
+
+<screen>
+$ systemctl stop postgresql.service
+$ systemctl start postgresql.service
+$ systemctl restart postgresql.service
+</screen>
+
+These operations are synchronous: they wait until the service has
+finished starting or stopping (or has failed).  Starting a unit will
+cause the dependencies of that unit to be started as well (if
+necessary).</para>
+
+<!-- - cgroups: each service and user session is a cgroup
+
+- cgroup resource management -->
+
+</section>
+
+
+<!--===============================================================-->
+
+<section><title>Rebooting and shutting down</title>
+
+<para>The system can be shut down (and automatically powered off) by
+doing:
+
+<screen>
+$ shutdown
+</screen>
+
+This is equivalent to running <command>systemctl poweroff</command>.
+Likewise, <command>reboot</command> (a.k.a. <command>systemctl
+reboot</command>) will reboot the system.</para>
+
+<para>The machine can be suspended to RAM (if supported) using
+<command>systemctl suspend</command>, and suspended to disk using
+<command>systemctl hibernate</command>.</para>
+
+<para>These commands can be run by any user who is logged in locally,
+i.e. on a virtual console or in X11; otherwise, the user is asked for
+authentication.</para>
+
+</section>
+
+
+<!--===============================================================-->
+
+<section><title>User sessions</title>
+
+<para>Systemd keeps track of all users who are logged into the system
+(e.g. on a virtual console or remotely via SSH).  The command
+<command>loginctl</command> allows quering and manipulating user
+sessions.  For instance, to list all user sessions:
+
+<screen>
+$ loginctl
+   SESSION        UID USER             SEAT
+        c1        500 eelco            seat0
+        c3          0 root             seat0
+        c4        500 alice
+</screen>
+
+This shows that two users are logged in locally, while another is
+logged in remotely.  (“Seats” are essentially the combinations of
+displays and input devices attached to the system; usually, there is
+only one seat.)  To get information about a session:
+
+<screen>
+$ loginctl session-status c3
+c3 - root (0)
+           Since: Tue, 2013-01-08 01:17:56 CET; 4min 42s ago
+          Leader: 2536 (login)
+            Seat: seat0; vc3
+             TTY: /dev/tty3
+         Service: login; type tty; class user
+           State: online
+          CGroup: name=systemd:/user/root/c3
+                  ├─ 2536 /nix/store/10mn4xip9n7y9bxqwnsx7xwx2v2g34xn-shadow-4.1.5.1/bin/login --
+                  ├─10339 -bash
+                  └─10355 w3m nixos.org
+</screen>
+
+This shows that the user is logged in on virtual console 3.  It also
+lists the processes belonging to this session.  Since systemd keeps
+track of this, you can terminate a session in a way that ensures that
+all the session’s processes are gone:
+
+<screen>
+$ loginctl terminate-session c3
+</screen>
+
+</para>
+
+</section>
+
+
+<!--===============================================================-->
+
+<section><title>Control groups</title>
+
+<para>To keep track of the processes in a running system, systemd uses
+<emphasis>control groups</emphasis> (cgroups).  A control group is a
+set of processes used to allocate resources such as CPU, memory or I/O
+bandwidth.  There can be multiple control group hierarchies, allowing
+each kind of resource to be managed independently.</para>
+
+<para>The command <command>systemd-cgls</command> lists all control
+groups in the <literal>systemd</literal> hierarchy, which is what
+systemd uses to keep track of the processes belonging to each service
+or user session:
+
+<screen>
+$ systemd-cgls
+├─user
+│ └─eelco
+│   └─c1
+│     ├─ 2567 -:0
+│     ├─ 2682 kdeinit4: kdeinit4 Running...
+│     ├─ <replaceable>...</replaceable>
+│     └─10851 sh -c less -R
+└─system
+  ├─httpd.service
+  │ ├─2444 httpd -f /nix/store/3pyacby5cpr55a03qwbnndizpciwq161-httpd.conf -DNO_DETACH
+  │ └─<replaceable>...</replaceable>
+  ├─dhcpcd.service
+  │ └─2376 dhcpcd --config /nix/store/f8dif8dsi2yaa70n03xir8r653776ka6-dhcpcd.conf
+  └─ <replaceable>...</replaceable>
+</screen>
+
+Similarly, <command>systemd-cgls cpu</command> shows the cgroups in
+the CPU hierarchy, which allows per-cgroup CPU scheduling priorities.
+By default, every systemd service gets its own CPU cgroup, while all
+user sessions are in the top-level CPU cgroup.  This ensures, for
+instance, that a thousand run-away processes in the
+<literal>httpd.service</literal> cgroup cannot starve the CPU for one
+process in the <literal>postgresql.service</literal> cgroup.  (By
+contrast, it they were in the same cgroup, then the PostgreSQL process
+would get 1/1001 of the cgroup’s CPU time.)  You can limit a service’s
+CPU share in <filename>configuration.nix</filename>:
+
+<programlisting>
+boot.systemd.services.httpd.serviceConfig.CPUShares = 512;
+</programlisting>
+
+By default, every cgroup has 1024 CPU shares, so this will halve the
+CPU allocation of the <literal>httpd.service</literal> cgroup.</para>
+
+<para>There also is a <literal>memory</literal> hierarchy that
+controls memory allocation limits; by default, all processes are in
+the top-level cgroup, so any service or session can exhaust all
+available memory.  Per-cgroup memory limits can be specified in
+<filename>configuration.nix</filename>; for instance, to limit
+<literal>httpd.service</literal> to 512 MiB of RAM (excluding swap)
+and 640 MiB of RAM (including swap):
+
+<programlisting>
+boot.systemd.services.httpd.serviceConfig.MemoryLimit = "512M";
+boot.systemd.services.httpd.serviceConfig.ControlGroupAttribute = [ "memory.memsw.limit_in_bytes 640M" ];
+</programlisting>
+
+</para>
+
+<para>The command <command>systemd-cgtop</command> shows a
+continuously updated list of all cgroups with their CPU and memory
+usage.</para>
+
+</section>
+
+
+<!--===============================================================-->
+
+<section><title>Logging</title>
+
+<para>System-wide logging is provided by systemd’s
+<emphasis>journal</emphasis>, which subsumes traditional logging
+daemons such as syslogd and klogd.  Log entries are kept in binary
+files in <filename>/var/log/journal/</filename>.  The command
+<literal>journalctl</literal> allows you to see the contents of the
+journal.  For example,
+
+<screen>
+$ journalctl -b
+</screen>
+
+shows all journal entries since the last reboot.  (The output of
+<command>journalctl</command> is piped into <command>less</command> by
+default.)  You can use various options and match operators to restrict
+output to messages of interest.  For instance, to get all messages
+from PostgreSQL:
+
+<screen>
+$ journalctl _SYSTEMD_UNIT=postgresql.service
+-- Logs begin at Mon, 2013-01-07 13:28:01 CET, end at Tue, 2013-01-08 01:09:57 CET. --
+...
+Jan 07 15:44:14 hagbard postgres[2681]: [2-1] LOG:  database system is shut down
+-- Reboot --
+Jan 07 15:45:10 hagbard postgres[2532]: [1-1] LOG:  database system was shut down at 2013-01-07 15:44:14 CET
+Jan 07 15:45:13 hagbard postgres[2500]: [1-1] LOG:  database system is ready to accept connections
+</screen>
+
+Or to get all messages since the last reboot that have at least a
+“critical” severity level:
+
+<screen>
+$ journalctl -b -p crit
+Dec 17 21:08:06 mandark sudo[3673]: pam_unix(sudo:auth): auth could not identify password for [alice]
+Dec 29 01:30:22 mandark kernel[6131]: [1053513.909444] CPU6: Core temperature above threshold, cpu clock throttled (total events = 1)
+</screen>
+
+</para>
+
+</section>
+
+
+</chapter>
-- 
GitLab


From 81796c5baf6801718c2e55491baf725bd89c1753 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 8 Jan 2013 02:13:33 +0100
Subject: [PATCH 4285/5331] =?UTF-8?q?Add=20a=20command=20=E2=80=98nixos-he?=
 =?UTF-8?q?lp=E2=80=99=20that=20opens=20the=20NixOS=20manual=20in=20a=20br?=
 =?UTF-8?q?owser?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 modules/services/misc/nixos-manual.nix | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/modules/services/misc/nixos-manual.nix b/modules/services/misc/nixos-manual.nix
index 2e98d50b0ce..1a172904c45 100644
--- a/modules/services/misc/nixos-manual.nix
+++ b/modules/services/misc/nixos-manual.nix
@@ -16,6 +16,17 @@ let
     inherit pkgs options;
   };
 
+  entry = "${manual.manual}/share/doc/nixos/manual.html";
+
+  help = pkgs.writeScriptBin "nixos-help"
+    ''
+      #! ${pkgs.stdenv.shell} -e
+      if ! ''${BROWSER:-w3m} ${entry}; then
+        echo "$0: unable to start a web browser; please set \$BROWSER or install ‘w3m’"
+        exit 1
+      fi
+    '';
+
 in
 
 {
@@ -69,7 +80,7 @@ in
 
     system.build.manual = manual;
 
-    environment.systemPackages = [ manual.manpages ];
+    environment.systemPackages = [ manual.manpages help ];
 
     boot.extraTTYs = mkIf cfg.showManual ["tty${cfg.ttyNumber}"];
 
@@ -78,7 +89,7 @@ in
         { description = "NixOS Manual";
           wantedBy = [ "multi-user.target" ];
           serviceConfig =
-            { ExecStart = "${cfg.browser} ${manual.manual}/share/doc/nixos/manual.html";
+            { ExecStart = "${cfg.browser} ${entry}";
               StandardInput = "tty";
               StandardOutput = "tty";
               TTYPath = "/dev/tty${cfg.ttyNumber}";
-- 
GitLab


From 884f58fa8aeb3dc6696810baf161874f4e3306fe Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 8 Jan 2013 15:35:21 +0100
Subject: [PATCH 4286/5331] Include libsystemd-daemon.so.* in the initrd since
 dmsetup needs it

Strangely, this is only case after updating systemd to 197, I didn't
change lvm2...
---
 modules/system/boot/stage-1.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/modules/system/boot/stage-1.nix b/modules/system/boot/stage-1.nix
index ac8a3ccc238..b131867966a 100644
--- a/modules/system/boot/stage-1.nix
+++ b/modules/system/boot/stage-1.nix
@@ -177,6 +177,7 @@ let
       cp -v ${pkgs.lvm2}/sbin/dmsetup $out/bin/dmsetup
       cp -v ${pkgs.lvm2}/sbin/lvm $out/bin/lvm
       cp -v ${pkgs.lvm2}/lib/libdevmapper.so.*.* $out/lib
+      cp -v ${pkgs.systemd}/lib/libsystemd-daemon.so.* $out/lib
 
       # Add RAID mdadm tool.
       cp -v ${pkgs.mdadm}/sbin/mdadm $out/bin/mdadm
-- 
GitLab


From 827e3dadc8abeac591f9e8060ef4da7376079e64 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 8 Jan 2013 17:00:45 +0100
Subject: [PATCH 4287/5331] Don't special-case systemd-journald.service and
 systemd-user-sessions.service

---
 modules/system/activation/switch-to-configuration.pl | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/modules/system/activation/switch-to-configuration.pl b/modules/system/activation/switch-to-configuration.pl
index 44cd261cf98..032947c3c54 100644
--- a/modules/system/activation/switch-to-configuration.pl
+++ b/modules/system/activation/switch-to-configuration.pl
@@ -126,7 +126,7 @@ while (my ($unit, $state) = each %{$activePrev}) {
             # active after the system has resumed, which probably
             # should not be the case.  Just ignore it.
             if ($unit ne "suspend.target" && $unit ne "hibernate.target") {
-                unless (boolIsTrue($unitInfo->{'RefuseManualStart'} // "false")) {
+                unless (boolIsTrue($unitInfo->{'RefuseManualStart'} // "no")) {
                     write_file($startListFile, { append => 1 }, "$unit\n");
                 }
             }
@@ -142,7 +142,7 @@ while (my ($unit, $state) = each %{$activePrev}) {
             # Stopping a target generally has no effect on other units
             # (unless there is a PartOf dependency), so this is just a
             # bookkeeping thing to get systemd to do the right thing.
-            if (boolIsTrue($unitInfo->{'X-StopOnReconfiguration'} // "false")) {
+            if (boolIsTrue($unitInfo->{'X-StopOnReconfiguration'} // "no")) {
                 push @unitsToStop, $unit;
             }
         }
@@ -157,10 +157,7 @@ while (my ($unit, $state) = each %{$activePrev}) {
                 # FIXME: do something?
             } else {
                 my $unitInfo = parseUnit($newUnitFile);
-                if (!boolIsTrue($unitInfo->{'X-RestartIfChanged'} // "true")
-                    || $unit eq "systemd-user-sessions.service"
-                    || $unit eq "systemd-journald.service")
-                {
+                if (!boolIsTrue($unitInfo->{'X-RestartIfChanged'} // "yes")) {
                     push @unitsToSkip, $unit;
                 } else {
                     # If this unit is socket-activated, then stop the
@@ -181,7 +178,7 @@ while (my ($unit, $state) = each %{$activePrev}) {
                         }
                     }
 
-                    if (!boolIsTrue($unitInfo->{'X-StopIfChanged'} // "true")) {
+                    if (!boolIsTrue($unitInfo->{'X-StopIfChanged'} // "yes")) {
 
                         # This unit should be restarted instead of
                         # stopped and started.
-- 
GitLab


From 948dd8dd1a3403b0a873d53980fcf137cca260a2 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 8 Jan 2013 17:26:51 +0100
Subject: [PATCH 4288/5331] Use the upstream (but patched) sysinit.target

---
 modules/system/boot/systemd.nix | 13 +------------
 1 file changed, 1 insertion(+), 12 deletions(-)

diff --git a/modules/system/boot/systemd.nix b/modules/system/boot/systemd.nix
index a0462951d00..f72d15d0129 100644
--- a/modules/system/boot/systemd.nix
+++ b/modules/system/boot/systemd.nix
@@ -23,7 +23,7 @@ let
   upstreamUnits =
     [ # Targets.
       "basic.target"
-      #"sysinit.target"
+      "sysinit.target"
       "sockets.target"
       "graphical.target"
       "multi-user.target"
@@ -524,17 +524,6 @@ in
       { description = "Security Keys";
       };
 
-    # This is like the upstream sysinit.target, except that it doesn't
-    # depend on local-fs.target and swap.target.  If services need to
-    # be started after some filesystem (local or otherwise) has been
-    # mounted, they should use the RequiresMountsFor option.
-    boot.systemd.targets.sysinit =
-      { description = "System Initialization";
-        after = [ "emergency.service" "emergency.target" ];
-        unitConfig.Conflicts = "emergency.service emergency.target";
-        unitConfig.RefuseManualStart = true;
-      };
-
     boot.systemd.units =
       { "rescue.service".text = rescueService; }
       // mapAttrs' (n: v: nameValuePair "${n}.target" (targetToUnit n v)) cfg.targets
-- 
GitLab


From f4a3bdd6afa31671bfc18fd22417b04914dfa0a8 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 8 Jan 2013 18:24:06 +0100
Subject: [PATCH 4289/5331] Install {rescue,emergency}.{target,service}

Also, symlink kbrequest.target to rescue.target as suggested by the
systemd.special manpage.  This way, you can start a sulogin rescue
shell by pressing Alt+Up.
---
 modules/system/boot/systemd.nix | 39 ++++++++-------------------------
 1 file changed, 9 insertions(+), 30 deletions(-)

diff --git a/modules/system/boot/systemd.nix b/modules/system/boot/systemd.nix
index f72d15d0129..83911d179fd 100644
--- a/modules/system/boot/systemd.nix
+++ b/modules/system/boot/systemd.nix
@@ -28,7 +28,6 @@ let
       "graphical.target"
       "multi-user.target"
       "getty.target"
-      "rescue.target"
       "network.target"
       "nss-lookup.target"
       "nss-user-lookup.target"
@@ -37,6 +36,12 @@ let
       #"cryptsetup.target"
       "sigpwr.target"
 
+      # Rescue/emergency.
+      "rescue.target"
+      "rescue.service"
+      "emergency.target"
+      "emergency.service"
+
       # Udev.
       "systemd-udevd-control.socket"
       "systemd-udevd-kernel.socket"
@@ -139,33 +144,6 @@ let
       "shutdown.target.wants"
     ];
 
-  rescueService =
-    ''
-      [Unit]
-      Description=Rescue Shell
-      DefaultDependencies=no
-      Conflicts=shutdown.target
-      After=sysinit.target
-      Before=shutdown.target
-
-      [Service]
-      Environment=HOME=/root
-      WorkingDirectory=/root
-      ExecStartPre=-${pkgs.coreutils}/bin/echo 'Welcome to rescue mode. Use "systemctl default" or ^D to enter default mode.'
-      #ExecStart=-/sbin/sulogin
-      ExecStart=-${pkgs.bashInteractive}/bin/bash --login
-      ExecStopPost=-${systemd}/bin/systemctl --fail --no-block default
-      Type=idle
-      StandardInput=tty-force
-      StandardOutput=inherit
-      StandardError=inherit
-      KillMode=process
-
-      # Bash ignores SIGTERM, so we send SIGHUP instead, to ensure that bash
-      # terminates cleanly.
-      KillSignal=SIGHUP
-    '';
-
   makeJobScript = name: text:
     let x = pkgs.writeTextFile { name = "unit-script"; executable = true; destination = "/bin/${name}"; inherit text; };
     in "${x}/bin/${name}";
@@ -347,6 +325,8 @@ let
 
       ln -s ${cfg.defaultUnit} $out/default.target
 
+      ln -s rescue.target $out/kbrequest.target
+
       #ln -s ../getty@tty1.service $out/multi-user.target.wants/
       ln -s ../local-fs.target ../remote-fs.target ../network.target ../nss-lookup.target \
             ../nss-user-lookup.target ../swap.target $out/multi-user.target.wants/
@@ -525,8 +505,7 @@ in
       };
 
     boot.systemd.units =
-      { "rescue.service".text = rescueService; }
-      // mapAttrs' (n: v: nameValuePair "${n}.target" (targetToUnit n v)) cfg.targets
+      mapAttrs' (n: v: nameValuePair "${n}.target" (targetToUnit n v)) cfg.targets
       // mapAttrs' (n: v: nameValuePair "${n}.service" (serviceToUnit n v)) cfg.services
       // mapAttrs' (n: v: nameValuePair "${n}.socket" (socketToUnit n v)) cfg.sockets
       // listToAttrs (map
-- 
GitLab


From ac53b25f167746cff0885ee28c6a172a43b81984 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 8 Jan 2013 18:31:46 +0100
Subject: [PATCH 4290/5331] Remove handling of "debug2" and "S|s|single" kernel
 command line options

The "S|s|single" option is handled by systemd (starting
rescue.target).  And the rescue target basically removes the need for
a special debug shell.  (Also, there is "systemd.crash_shell=1" for
starting a shell if systemd crashes.)
---
 modules/system/boot/stage-2-init.sh | 28 ----------------------------
 1 file changed, 28 deletions(-)

diff --git a/modules/system/boot/stage-2-init.sh b/modules/system/boot/stage-2-init.sh
index 67a4e0ed16d..0ad9982e430 100644
--- a/modules/system/boot/stage-2-init.sh
+++ b/modules/system/boot/stage-2-init.sh
@@ -62,20 +62,12 @@ ln -s /proc/mounts /etc/mtab
 
 
 # Process the kernel command line.
-debug2=
 for o in $(cat /proc/cmdline); do
     case $o in
         debugtrace)
             # Show each command.
             set -x
             ;;
-        debug2)
-            debug2=1
-            ;;
-        S|s|single)
-            # !!! argh, can't pass a startup event to Upstart yet.
-            exec @shell@
-            ;;
         resume=*)
             set -- $(IFS==; echo $o)
             resumeDevice=$2
@@ -168,26 +160,6 @@ ln -sfn /run/booted-system /nix/var/nix/gcroots/booted-system
 @shell@ @postBootCommands@
 
 
-# For debugging Upstart.
-if [ -n "$debug2" ]; then
-    # Get the console from the kernel cmdline
-    console=tty1
-    for o in $(cat /proc/cmdline); do
-      case $o in
-        console=*)
-          set -- $(IFS==; echo $o)
-          params=$2
-          set -- $(IFS=,; echo $params)
-          console=$1
-          ;;
-      esac
-    done
-
-    echo "Debug shell called from @out@"
-    setsid @shellDebug@ < /dev/$console >/dev/$console 2>/dev/$console
-fi
-
-
 # Start systemd.
 echo "starting systemd..."
 PATH=/run/current-system/systemd/lib/systemd \
-- 
GitLab


From 19127aa4165b8aae6ca29dc7a80d21bd0b40dfe4 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Tue, 8 Jan 2013 16:19:51 -0500
Subject: [PATCH 4291/5331] Add dd-agent module

---
 modules/module-list.nix                  |  1 +
 modules/services/monitoring/dd-agent.nix | 58 ++++++++++++++++++++++++
 2 files changed, 59 insertions(+)
 create mode 100644 modules/services/monitoring/dd-agent.nix

diff --git a/modules/module-list.nix b/modules/module-list.nix
index ae5e5d5c49f..db54f5665a7 100644
--- a/modules/module-list.nix
+++ b/modules/module-list.nix
@@ -100,6 +100,7 @@
   ./services/misc/rogue.nix
   ./services/misc/svnserve.nix
   ./services/misc/synergy.nix
+  ./services/monitoring/dd-agent.nix
   ./services/monitoring/monit.nix
   ./services/monitoring/nagios/default.nix
   ./services/monitoring/smartd.nix
diff --git a/modules/services/monitoring/dd-agent.nix b/modules/services/monitoring/dd-agent.nix
new file mode 100644
index 00000000000..c0493557d56
--- /dev/null
+++ b/modules/services/monitoring/dd-agent.nix
@@ -0,0 +1,58 @@
+{ config, pkgs, ... }:
+
+with pkgs.lib;
+
+let
+  cfg = config.services.dd-agent;
+
+  datadog-conf = pkgs.runCommand "datadog.conf" {} ''
+    sed -e 's|^api_key:|api_key: ${cfg.api_key}|' ${optionalString (cfg.hostname != null)
+      "-e 's|^#hostname: mymachine.mydomain|hostname: ${cfg.hostname}|'"
+    } ${pkgs.dd-agent}/etc/dd-agent/datadog.conf.example > $out
+  '';
+in {
+  options.services.dd-agent = {
+    enable = mkOption {
+      description = "Whether to enable the dd-agent montioring service";
+
+      default = false;
+
+      type = types.bool;
+    };
+
+    # !!! This gets stored in the store (world-readable), wish we had https://github.com/NixOS/nix/issues/8
+    api_key = mkOption {
+      description = "The Datadog API key to associate the agent with your account";
+
+      example = "ae0aa6a8f08efa988ba0a17578f009ab";
+
+      type = types.uniq types.string;
+    };
+
+    hostname = mkOption {
+      description = "The hostname to show in the Datadog dashboard (optional)";
+
+      default = null;
+
+      example = "mymachine.mydomain";
+
+      type = types.uniq (types.nullOr types.string);
+    };
+  };
+
+  config = mkIf cfg.enable {
+    environment.etc = [ { source = datadog-conf; target = "dd-agent/datadog.conf"; } ];
+
+    boot.systemd.services.dd-agent = {
+      description = "Datadog agent monitor";
+
+      path = [ pkgs.sysstat pkgs.procps ];
+
+      wantedBy = [ "multi-user.target" ];
+
+      serviceConfig.ExecStart = "${pkgs.dd-agent}/bin/dd-agent foreground";
+
+      restartTriggers = [ pkgs.dd-agent ];
+    };
+  };
+}
-- 
GitLab


From b5e639dbb10c396e174aa79f5941c727675148d5 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 9 Jan 2013 13:43:57 +0100
Subject: [PATCH 4292/5331] Update the troubleshooting section for systemd

---
 doc/manual/default.nix         |  2 +-
 doc/manual/troubleshooting.xml | 92 +++++++++++++++++++---------------
 2 files changed, 52 insertions(+), 42 deletions(-)

diff --git a/doc/manual/default.nix b/doc/manual/default.nix
index d3f554c099e..e6edb30985c 100644
--- a/doc/manual/default.nix
+++ b/doc/manual/default.nix
@@ -59,7 +59,7 @@ in rec {
 
       mkdir -p $dst/images/callouts
       cp ${pkgs.docbook5_xsl}/xml/xsl/docbook/images/callouts/*.gif $dst/images/callouts/
-      
+
       cp ${./style.css} $dst/style.css
 
       ensureDir $out/nix-support
diff --git a/doc/manual/troubleshooting.xml b/doc/manual/troubleshooting.xml
index ff19607844f..f18ca9f4c5c 100644
--- a/doc/manual/troubleshooting.xml
+++ b/doc/manual/troubleshooting.xml
@@ -4,60 +4,70 @@
 <title>Troubleshooting</title>
 
 
-<section>
-  
-<title>Debugging the boot process</title>
-
-<para>To get a Stage 1 shell (i.e., a shell in the initial ramdisk),
-add <literal>debug1</literal> to the kernel command line.  The shell
-gets started before anything useful has been done.  That is, no
-modules have been loaded and no file systems have been mounted, except
-for <filename>/proc</filename> and <filename>/sys</filename>.</para>
-
-<para>To get a Stage 2 shell (i.e., a shell in the actual root file
-system), add <literal>debug2</literal> to the kernel command
-line.  This shell is started right after stage 1 calls the stage 2
-<literal>init</literal> script, so the root file system is there but
-no services have been started.</para>
+<section><title>Boot problems</title>
+
+<para>If NixOS fails to boot, there are a number of kernel command
+line parameters that may help you to identify or fix the issue.  You
+can add these parameters in the GRUB boot menu by pressing “e” to
+modify the selected boot entry and editing the line starting with
+<literal>linux</literal>.  The following are some useful kernel command
+line parameters that are recognised by the NixOS boot scripts or by
+systemd:
+
+<variablelist>
+
+  <varlistentry><term><literal>debug1</literal></term>
+    <listitem><para>Request an interactive shell in stage 1 of the
+    boot process (the initial ramdisk).  The shell gets started before
+    anything useful has been done.  That is, no modules have been
+    loaded and no file systems have been mounted, except for
+    <filename>/proc</filename> and
+    <filename>/sys</filename>.</para></listitem>
+  </varlistentry>
+
+  <varlistentry><term><literal>single</literal></term>
+    <listitem><para>Boot into rescue mode (a.k.a. single user mode).
+    This will cause systemd to start nothing but the unit
+    <literal>rescue.target</literal>, which runs
+    <command>sulogin</command> to prompt for the root password and
+    start a root login shell.  Exiting the shell causes the system to
+    continue with the normal boot process.</para></listitem>
+  </varlistentry>
+
+  <varlistentry><term><literal>systemd.log_level=debug systemd.log_target=console</literal></term>
+    <listitem><para>Make systemd very verbose and send log messages to
+    the console instead of the journal.</para></listitem>
+  </varlistentry>
+
+</variablelist>
+
+For more parameters recognised by systemd, see
+<citerefentry><refentrytitle>systemd</refentrytitle><manvolnum>1</manvolnum></citerefentry>.</para>
+
+<para>If no login prompts or X11 login screens appear (e.g. due to
+hanging dependencies), you can press Alt+ArrowUp.  If you’re lucky,
+this will start rescue mode (described above).  (Also note that since
+most units have a 90-second timeout before systemd gives up on them,
+the <command>agetty</command> login prompts should appear eventually
+unless something is very wrong.)</para>
 
 </section>
 
 
-
 <section>
-  
-<title>Safe mode</title>
-
-<para>If the hardware autodetection (in
-<filename>upstart-jobs/hardware-scan</filename>) causes problems, add
-<literal>safemode</literal> to the kernel command line.  This will
-disable auto-loading of modules for your PCI devices.  However, you
-will probably need to explicitly add modules to
-<option>boot.kernelModules</option> to get network support etc.</para>
-
-</section>
 
-
-<section>
-  
 <title>Maintenance mode</title>
 
-<para>You can go to maintenance mode by doing
+<para>You can enter rescue mode by running:
 
 <screen>
-$ shutdown now</screen>
+$ systemctl rescue</screen>
 
-This will eventually give you a single-user root shell.
-
-To get out of maintenance mode, do
-
-<screen>
-$ initctl emit startup</screen>
-
-</para>
+This will eventually give you a single-user root shell.  Systemd will
+stop (almost) all system services.  To get out of maintenance mode,
+just exit from the rescue shell.</para>
 
 </section>
 
 
-
 </chapter>
-- 
GitLab


From e4d949ec8801af8662c206d08d95ff41ba640d08 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Wed, 9 Jan 2013 22:19:58 +0100
Subject: [PATCH 4293/5331] xserver: Allow to add extra options to xorg config.

This is especially useful if you want to supply a default XRandR configuration,
where you need multiple "Monitor" sections in order to set properties for
specific CRTCs (if not running in zaphod mode).

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 modules/services/x11/xserver.nix | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/modules/services/x11/xserver.nix b/modules/services/x11/xserver.nix
index 421f80c42bb..bfdeef81f20 100644
--- a/modules/services/x11/xserver.nix
+++ b/modules/services/x11/xserver.nix
@@ -281,6 +281,25 @@ in
         description = "Lines to be added to every Display subsection of the Screen section.";
       };
 
+      extraXorgOptions = mkOption {
+        default = "";
+        example = ''
+          Section "Monitor"
+            Identifier "left monitor"
+          EndSection
+
+          Section "Monitor"
+            Identifier "right monitor"
+            Option "RightOf" "left monitor"
+          EndSection
+        '';
+        type = types.string;
+        description = ''
+          Additional options you want to append to your X server configuration
+          file.
+        '';
+      };
+
       defaultDepth = mkOption {
         default = 0;
         example = 8;
@@ -552,6 +571,8 @@ in
 
           EndSection
         '')}
+
+        ${cfg.extraXorgOptions}
       '';
 
   });
-- 
GitLab


From 91bead9c18416a70651ecb82b26e46d157bd8bb9 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 9 Jan 2013 22:44:50 +0100
Subject: [PATCH 4294/5331] modules/system/boot/loader/grub/memtest.nix: use
 'memtest86plus' instead of 'memtest86'

The 'memtest86' package didn't work on any of my machines. 'memtest86plus', on
the other hand, seems to work just fine. Does anyone know why we keep the
seemingly older version around still?
---
 modules/system/boot/loader/grub/memtest.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/system/boot/loader/grub/memtest.nix b/modules/system/boot/loader/grub/memtest.nix
index 4bd4b69101c..b18ff0512f2 100644
--- a/modules/system/boot/loader/grub/memtest.nix
+++ b/modules/system/boot/loader/grub/memtest.nix
@@ -5,7 +5,7 @@
 with pkgs.lib;
 let
   isEnabled = config.boot.loader.grub.memtest86;
-  memtest86 = pkgs.memtest86;
+  memtest86 = pkgs.memtest86plus;
 in
 {
   options = {
-- 
GitLab


From 93a7a32babe618a8ae69a1085df78329820c1c85 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 9 Jan 2013 22:31:57 +0100
Subject: [PATCH 4295/5331] initrd: Don't enable the root shell by default
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Starting an authenticated root shell is a security hole, so don't do
it by default.  The kernel command line parameter
‘initrd.shell_on_fail’ restores the original.  (Of course, this only
improves security if you have a password on GRUB to prevent the kernel
command line from being edited by unauthorized users.)
---
 doc/manual/troubleshooting.xml      | 15 ++++++-
 modules/system/boot/stage-1-init.sh | 63 ++++++++++++++++-------------
 2 files changed, 48 insertions(+), 30 deletions(-)

diff --git a/doc/manual/troubleshooting.xml b/doc/manual/troubleshooting.xml
index f18ca9f4c5c..4d5c5994fc8 100644
--- a/doc/manual/troubleshooting.xml
+++ b/doc/manual/troubleshooting.xml
@@ -16,15 +16,26 @@ systemd:
 
 <variablelist>
 
+  <varlistentry><term><literal>initrd.shell_on_fail</literal></term>
+    <listitem><para>Start a root shell if something goes wrong in
+    stage 1 of the boot process (the initial ramdisk).  This is
+    disabled by default because there is no authentication for the
+    root shell.</para></listitem>
+  </varlistentry>
+
   <varlistentry><term><literal>debug1</literal></term>
-    <listitem><para>Request an interactive shell in stage 1 of the
-    boot process (the initial ramdisk).  The shell gets started before
+    <listitem><para>Start an interactive shell in stage 1 before
     anything useful has been done.  That is, no modules have been
     loaded and no file systems have been mounted, except for
     <filename>/proc</filename> and
     <filename>/sys</filename>.</para></listitem>
   </varlistentry>
 
+  <varlistentry><term><literal>debugtrace</literal></term>
+    <listitem><para>Print every shell command executed by the stage 1
+    and 2 boot scripts.</para></listitem>
+  </varlistentry>
+
   <varlistentry><term><literal>single</literal></term>
     <listitem><para>Boot into rescue mode (a.k.a. single user mode).
     This will cause systemd to start nothing but the unit
diff --git a/modules/system/boot/stage-1-init.sh b/modules/system/boot/stage-1-init.sh
index 778e36cfd36..c1e46956f6e 100644
--- a/modules/system/boot/stage-1-init.sh
+++ b/modules/system/boot/stage-1-init.sh
@@ -1,6 +1,7 @@
 #! @shell@
 
 targetRoot=/mnt-root
+console=tty1
 
 export LD_LIBRARY_PATH=@extraUtils@/lib
 export PATH=@extraUtils@/bin:@extraUtils@/sbin
@@ -17,37 +18,31 @@ An error occured in stage 1 of the boot process, which must mount the
 root filesystem on \`$targetRoot' and then start stage 2.  Press one
 of the following keys:
 
-  i) to launch an interactive shell;
+EOF
+    if [ -n "$allowShell" ]; then cat <<EOF
+  i) to launch an interactive shell
   f) to start an interactive shell having pid 1 (needed if you want to
-     start stage 2's init manually); or
-  *) to ignore the error and continue.
+     start stage 2's init manually)
+EOF
+    fi
+    cat <<EOF
+  r) to reboot immediately
+  *) to ignore the error and continue
 EOF
 
     read reply
 
-    # Get the console from the kernel cmdline
-    console=tty1
-    for o in $(cat /proc/cmdline); do
-      case $o in
-        console=*)
-          set -- $(IFS==; echo $o)
-          params=$2
-          set -- $(IFS=,; echo $params)
-          console=$1
-          ;;
-      esac
-    done
-
-    case $reply in
-        f)
-            exec setsid @shell@ -c "@shell@ < /dev/$console >/dev/$console 2>/dev/$console" ;;
-        i)
-            echo "Starting interactive shell..."
-            setsid @shell@ -c "@shell@ < /dev/$console >/dev/$console 2>/dev/$console" || fail
-            ;;
-        *)
-            echo "Continuing...";;
-    esac
+    if [ -n "$allowShell" -a "$reply" = f ]; then
+        exec setsid @shell@ -c "@shell@ < /dev/$console >/dev/$console 2>/dev/$console"
+    elif [ -n "$allowShell" -a "$reply" = i ]; then
+        echo "Starting interactive shell..."
+        setsid @shell@ -c "@shell@ < /dev/$console >/dev/$console 2>/dev/$console" || fail
+    elif [ "$reply" = r ]; then
+        echo "Rebooting..."
+        reboot -f
+    else
+        echo "Continuing..."
+    fi
 }
 
 trap 'fail' 0
@@ -76,6 +71,12 @@ mount -t securityfs none /sys/kernel/security
 export stage2Init=/init
 for o in $(cat /proc/cmdline); do
     case $o in
+        console=*)
+            set -- $(IFS==; echo $o)
+            params=$2
+            set -- $(IFS=,; echo $params)
+            console=$1
+            ;;
         init=*)
             set -- $(IFS==; echo $o)
             stage2Init=$2
@@ -84,13 +85,19 @@ for o in $(cat /proc/cmdline); do
             # Show each command.
             set -x
             ;;
+        initrd.shell_on_fail)
+            allowShell=1
+            ;;
         debug1) # stop right away
+            allowShell=1
             fail
             ;;
         debug1devices) # stop after loading modules and creating device nodes
+            allowShell=1
             debug1devices=1
             ;;
         debug1mounts) # stop after mounting file systems
+            allowShell=1
             debug1mounts=1
             ;;
         stage1panic=1)
@@ -180,7 +187,7 @@ onACPower() {
 checkFS() {
     local device="$1"
     local fsType="$2"
-    
+
     # Only check block devices.
     if [ ! -b "$device" ]; then return 0; fi
 
@@ -219,7 +226,7 @@ checkFS() {
     if test $(($fsckResult | 2)) = $fsckResult; then
         echo "fsck finished, rebooting..."
         sleep 3
-        reboot
+        reboot -f
     fi
 
     if test $(($fsckResult | 4)) = $fsckResult; then
-- 
GitLab


From c7b427fbca9f863e25db64538cf2e74e4f74893c Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 9 Jan 2013 22:49:26 +0100
Subject: [PATCH 4296/5331] Give our kernel parameters a common prefix
 ("boot.*")

---
 doc/manual/troubleshooting.xml           |  6 +++---
 modules/profiles/headless.nix            |  2 +-
 modules/system/boot/kernel.nix           |  2 +-
 modules/system/boot/stage-1-init.sh      | 12 ++++++------
 modules/system/boot/stage-2-init.sh      |  2 +-
 modules/testing/test-instrumentation.nix |  2 +-
 6 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/doc/manual/troubleshooting.xml b/doc/manual/troubleshooting.xml
index 4d5c5994fc8..2961f8e1233 100644
--- a/doc/manual/troubleshooting.xml
+++ b/doc/manual/troubleshooting.xml
@@ -16,14 +16,14 @@ systemd:
 
 <variablelist>
 
-  <varlistentry><term><literal>initrd.shell_on_fail</literal></term>
+  <varlistentry><term><literal>boot.shell_on_fail</literal></term>
     <listitem><para>Start a root shell if something goes wrong in
     stage 1 of the boot process (the initial ramdisk).  This is
     disabled by default because there is no authentication for the
     root shell.</para></listitem>
   </varlistentry>
 
-  <varlistentry><term><literal>debug1</literal></term>
+  <varlistentry><term><literal>boot.debug1</literal></term>
     <listitem><para>Start an interactive shell in stage 1 before
     anything useful has been done.  That is, no modules have been
     loaded and no file systems have been mounted, except for
@@ -31,7 +31,7 @@ systemd:
     <filename>/sys</filename>.</para></listitem>
   </varlistentry>
 
-  <varlistentry><term><literal>debugtrace</literal></term>
+  <varlistentry><term><literal>boot.trace</literal></term>
     <listitem><para>Print every shell command executed by the stage 1
     and 2 boot scripts.</para></listitem>
   </varlistentry>
diff --git a/modules/profiles/headless.nix b/modules/profiles/headless.nix
index 3446654bc6f..593bd925b00 100644
--- a/modules/profiles/headless.nix
+++ b/modules/profiles/headless.nix
@@ -16,5 +16,5 @@ with pkgs.lib;
   boot.systemd.services."serial-getty@hvc0".enable = false;
 
   # Since we can't manually respond to a panic, just reboot.
-  boot.kernelParams = [ "panic=1" "stage1panic=1" ];
+  boot.kernelParams = [ "panic=1" "boot.panic_on_fail" ];
 }
diff --git a/modules/system/boot/kernel.nix b/modules/system/boot/kernel.nix
index 3637378d4d1..6cf9311e471 100644
--- a/modules/system/boot/kernel.nix
+++ b/modules/system/boot/kernel.nix
@@ -50,7 +50,7 @@ in
 
     boot.extraKernelParams = mkOption {
       default = [ ];
-      example = [ "debugtrace" ];
+      example = [ "boot.trace" ];
       description = "Additional user-defined kernel parameters.";
     };
 
diff --git a/modules/system/boot/stage-1-init.sh b/modules/system/boot/stage-1-init.sh
index c1e46956f6e..9bcbe291aad 100644
--- a/modules/system/boot/stage-1-init.sh
+++ b/modules/system/boot/stage-1-init.sh
@@ -81,26 +81,26 @@ for o in $(cat /proc/cmdline); do
             set -- $(IFS==; echo $o)
             stage2Init=$2
             ;;
-        debugtrace)
+        boot.trace|debugtrace)
             # Show each command.
             set -x
             ;;
-        initrd.shell_on_fail)
+        boot.shell_on_fail)
             allowShell=1
             ;;
-        debug1) # stop right away
+        boot.debug1|debug1) # stop right away
             allowShell=1
             fail
             ;;
-        debug1devices) # stop after loading modules and creating device nodes
+        boot.debug1devices) # stop after loading modules and creating device nodes
             allowShell=1
             debug1devices=1
             ;;
-        debug1mounts) # stop after mounting file systems
+        boot.debug1mounts) # stop after mounting file systems
             allowShell=1
             debug1mounts=1
             ;;
-        stage1panic=1)
+        boot.panic_on_fail|stage1panic=1)
             panicOnFail=1
             ;;
         root=*)
diff --git a/modules/system/boot/stage-2-init.sh b/modules/system/boot/stage-2-init.sh
index 0ad9982e430..5447ce0c502 100644
--- a/modules/system/boot/stage-2-init.sh
+++ b/modules/system/boot/stage-2-init.sh
@@ -64,7 +64,7 @@ ln -s /proc/mounts /etc/mtab
 # Process the kernel command line.
 for o in $(cat /proc/cmdline); do
     case $o in
-        debugtrace)
+        boot.debugtrace)
             # Show each command.
             set -x
             ;;
diff --git a/modules/testing/test-instrumentation.nix b/modules/testing/test-instrumentation.nix
index 0ee3ad65a3d..108dcb0ab6d 100644
--- a/modules/testing/test-instrumentation.nix
+++ b/modules/testing/test-instrumentation.nix
@@ -65,7 +65,7 @@ let kernel = config.boot.kernelPackages.kernel; in
     # Panic if an error occurs in stage 1 (rather than waiting for
     # user intervention).
     boot.kernelParams =
-      [ "console=tty1" "console=ttyS0" "panic=1" "stage1panic=1" ];
+      [ "console=tty1" "console=ttyS0" "panic=1" "boot.panic_on_fail" ];
 
     # `xwininfo' is used by the test driver to query open windows.
     environment.systemPackages = [ pkgs.xorg.xwininfo ];
-- 
GitLab


From 0b3d54d3cd39c54b9dafb83bbbdd37dc631c1c7b Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 9 Jan 2013 22:53:11 +0100
Subject: [PATCH 4297/5331] Guard against portmap and rpcbind both being
 enabled

---
 modules/services/networking/rpcbind.nix | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/modules/services/networking/rpcbind.nix b/modules/services/networking/rpcbind.nix
index 8e3e86a515c..f82803e7519 100644
--- a/modules/services/networking/rpcbind.nix
+++ b/modules/services/networking/rpcbind.nix
@@ -29,6 +29,8 @@ let
     '';
   };
 
+  check = mkAssert (!(config.services.rpcbind.enable && config.services.portmap.enable))
+    "Portmap and rpcbind cannot both be enabled.";
 
 in
 
@@ -57,7 +59,7 @@ in
 
   ###### implementation
 
-  config = mkIf config.services.rpcbind.enable {
+  config = mkIf config.services.rpcbind.enable (check {
 
     environment.systemPackages = [ pkgs.rpcbind ];
 
@@ -77,6 +79,6 @@ in
         serviceConfig.ExecStart = "@${pkgs.rpcbind}/bin/rpcbind rpcbind";
       };
 
-  };
+  });
 
 }
-- 
GitLab


From 0129717b17e982d714ea93edc9d35898a27275ad Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Thu, 10 Jan 2013 00:31:08 +0100
Subject: [PATCH 4298/5331] xserver: Allow to set XRandR multi head layout.

This is currently only a very simple implementation which just recurses a list
of heads that get chained together to the right of the corresponding previous
item of the list.

If I forgot about something in the already existing configuration options,
please let me know or if this commit is useless or a duplicate, feel free to
revert. But by looking at implementation before this commit, I only see zaphod
and/or quirky xinerama-like configuration options.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 modules/services/x11/xserver.nix | 47 ++++++++++++++++++++++++++++++++
 1 file changed, 47 insertions(+)

diff --git a/modules/services/x11/xserver.nix b/modules/services/x11/xserver.nix
index bfdeef81f20..d78a8787e79 100644
--- a/modules/services/x11/xserver.nix
+++ b/modules/services/x11/xserver.nix
@@ -43,6 +43,36 @@ let
       pkgs.xorg.fontadobe75dpi
     ];
 
+  # Just enumerate all heads without discarding XRandR output information.
+  xrandrHeads = let
+    mkHead = num: output: {
+      name = "multihead${toString num}";
+      inherit output;
+    };
+  in imap mkHead cfg.xrandrHeads;
+
+  xrandrDeviceSection = flip concatMapStrings xrandrHeads (h: ''
+    Option "monitor-${h.output}" "${h.name}"
+  '');
+
+  # Here we chain every monitor from the left to right, so we have:
+  # m4 right of m3 right of m2 right of m1   .----.----.----.----.
+  # Which will end up in reverse ----------> | m1 | m2 | m3 | m4 |
+  #                                          `----^----^----^----'
+  xrandrMonitorSections = let
+    mkMonitor = previous: current: previous ++ singleton {
+      inherit (current) name;
+      value = ''
+        Section "Monitor"
+          Identifier "${current.name}"
+          ${optionalString (previous != []) ''
+          Option "RightOf" "${(head previous).name}"
+          ''}
+        EndSection
+      '';
+    };
+    monitors = foldl mkMonitor [] xrandrHeads;
+  in concatMapStrings (getAttr "value") monitors;
 
   configFile = pkgs.stdenv.mkDerivation {
     name = "xserver.conf";
@@ -256,6 +286,21 @@ in
         description = "Contents of the first Monitor section of the X server configuration file.";
       };
 
+      xrandrHeads = mkOption {
+        default = [];
+        example = [ "HDMI-0" "DVI-0" ];
+        type = with types; listOf string;
+        description = ''
+          Simple multiple monitor configuration, just specify a list of XRandR
+          outputs which will be mapped from left to right in the order of the
+          list.
+
+          Be careful using this option with multiple graphic adapters or with
+          drivers that have poor support for XRandR, unexpected things might
+          happen with those.
+        '';
+      };
+
       moduleSection = mkOption {
         default = "";
         example =
@@ -530,6 +575,7 @@ in
             Identifier "Device-${driver.name}[0]"
             Driver "${driver.driverName}"
             ${cfg.deviceSection}
+            ${xrandrDeviceSection}
           EndSection
 
           Section "Screen"
@@ -572,6 +618,7 @@ in
           EndSection
         '')}
 
+        ${xrandrMonitorSections}
         ${cfg.extraXorgOptions}
       '';
 
-- 
GitLab


From 80a381f521bae87aea47d7657d368167b0b42e91 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Thu, 10 Jan 2013 01:41:22 +0100
Subject: [PATCH 4299/5331] Revert "xserver: Allow to add extra options ...

This reverts commit 1e741f1572b6793b861e2f9820015475ce339ae0 as it is
unnecessary according to @edolstra, because services.xserver.config from another
module will be merged into the configuration.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 modules/services/x11/xserver.nix | 20 --------------------
 1 file changed, 20 deletions(-)

diff --git a/modules/services/x11/xserver.nix b/modules/services/x11/xserver.nix
index d78a8787e79..c1b14940f02 100644
--- a/modules/services/x11/xserver.nix
+++ b/modules/services/x11/xserver.nix
@@ -326,25 +326,6 @@ in
         description = "Lines to be added to every Display subsection of the Screen section.";
       };
 
-      extraXorgOptions = mkOption {
-        default = "";
-        example = ''
-          Section "Monitor"
-            Identifier "left monitor"
-          EndSection
-
-          Section "Monitor"
-            Identifier "right monitor"
-            Option "RightOf" "left monitor"
-          EndSection
-        '';
-        type = types.string;
-        description = ''
-          Additional options you want to append to your X server configuration
-          file.
-        '';
-      };
-
       defaultDepth = mkOption {
         default = 0;
         example = 8;
@@ -619,7 +600,6 @@ in
         '')}
 
         ${xrandrMonitorSections}
-        ${cfg.extraXorgOptions}
       '';
 
   });
-- 
GitLab


From 3bbbd62cbcfca6ba5c907dc6c350ff319037bad9 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 10 Jan 2013 13:46:34 +0100
Subject: [PATCH 4300/5331] Start dhcpcd/wpa_supplicant after
 systemd-udev-settle

This is necessary to prevent a race.  Udev 197 has a new naming scheme
for network devices, so it will rename (say) eth0 to eno0.  This fails
with "error changing net interface name eth0 to eno1: Device or
resource busy" if another process has opened the interface in the
meantime.
---
 modules/services/networking/dhcpcd.nix         | 1 +
 modules/services/networking/wpa_supplicant.nix | 6 ++++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/modules/services/networking/dhcpcd.nix b/modules/services/networking/dhcpcd.nix
index cf7f621a85d..739ba95d5e3 100644
--- a/modules/services/networking/dhcpcd.nix
+++ b/modules/services/networking/dhcpcd.nix
@@ -96,6 +96,7 @@ in
       { description = "DHCP Client";
 
         wantedBy = [ "network.target" ];
+        after = [ "systemd-udev-settle.service" ];
 
         # Stopping dhcpcd during a reconfiguration is undesirable
         # because it brings down the network interfaces configured by
diff --git a/modules/services/networking/wpa_supplicant.nix b/modules/services/networking/wpa_supplicant.nix
index b338e08113e..4f8ae55d209 100644
--- a/modules/services/networking/wpa_supplicant.nix
+++ b/modules/services/networking/wpa_supplicant.nix
@@ -90,8 +90,10 @@ in
     services.dbus.packages = [ pkgs.wpa_supplicant ];
 
     jobs.wpa_supplicant =
-      { startOn = "started network-interfaces";
-        stopOn = "stopping network-interfaces";
+      { description = "WPA Supplicant";
+
+        wantedBy = [ "network.target" ];
+        after = [ "systemd-udev-settle.service" ];
 
         path = [ pkgs.wpa_supplicant ];
 
-- 
GitLab


From 5685ee54461a71f35b64bff62c158b9f129dce95 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 10 Jan 2013 13:59:41 +0100
Subject: [PATCH 4301/5331] Add/fix systemd unit descriptions

---
 modules/services/networking/firewall.nix | 4 +++-
 modules/services/networking/ntpd.nix     | 2 +-
 modules/services/printing/cupsd.nix      | 2 +-
 modules/services/scheduling/atd.nix      | 2 +-
 modules/services/scheduling/cron.nix     | 2 +-
 modules/services/x11/xserver.nix         | 4 +++-
 6 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/modules/services/networking/firewall.nix b/modules/services/networking/firewall.nix
index d262f1f76cb..7bc09a7b404 100644
--- a/modules/services/networking/firewall.nix
+++ b/modules/services/networking/firewall.nix
@@ -236,7 +236,9 @@ in
                  ];
 
     jobs.firewall =
-      { startOn = "started network-interfaces";
+      { description = "Firewall";
+
+        startOn = "started network-interfaces";
 
         path = [ pkgs.iptables ];
 
diff --git a/modules/services/networking/ntpd.nix b/modules/services/networking/ntpd.nix
index e9b27268aa1..be3fcbd6543 100644
--- a/modules/services/networking/ntpd.nix
+++ b/modules/services/networking/ntpd.nix
@@ -66,7 +66,7 @@ in
       };
 
     jobs.ntpd =
-      { description = "NTP daemon";
+      { description = "NTP Daemon";
 
         wantedBy = [ "ip-up.target" ];
         partOf = [ "ip-up.target" ];
diff --git a/modules/services/printing/cupsd.nix b/modules/services/printing/cupsd.nix
index 6d31c0050aa..5a6b85810aa 100644
--- a/modules/services/printing/cupsd.nix
+++ b/modules/services/printing/cupsd.nix
@@ -118,7 +118,7 @@ in
     boot.blacklistedKernelModules = [ "usblp" ];
 
     jobs.cupsd =
-      { description = "CUPS printing daemon";
+      { description = "CUPS Printing Daemon";
 
         startOn = "started network-interfaces";
         stopOn = "stopping network-interfaces";
diff --git a/modules/services/scheduling/atd.nix b/modules/services/scheduling/atd.nix
index 6e6eaec1db9..66266e5b570 100644
--- a/modules/services/scheduling/atd.nix
+++ b/modules/services/scheduling/atd.nix
@@ -64,7 +64,7 @@ in
       };
 
     jobs.atd =
-      { description = "at daemon (atd)";
+      { description = "Job Execution Daemon (atd)";
 
         startOn = "stopped udevtrigger";
 
diff --git a/modules/services/scheduling/cron.nix b/modules/services/scheduling/cron.nix
index 350d65b476a..cf348793a65 100644
--- a/modules/services/scheduling/cron.nix
+++ b/modules/services/scheduling/cron.nix
@@ -86,7 +86,7 @@ in
     environment.systemPackages = [ cronNixosPkg ];
 
     jobs.cron =
-      { description = "Cron daemon";
+      { description = "Cron Daemon";
 
         startOn = "startup";
 
diff --git a/modules/services/x11/xserver.nix b/modules/services/x11/xserver.nix
index 6eec6f88b97..599f8be226d 100644
--- a/modules/services/x11/xserver.nix
+++ b/modules/services/x11/xserver.nix
@@ -389,7 +389,9 @@ in
     boot.systemd.defaultUnit = mkIf cfg.autorun "graphical.target";
 
     boot.systemd.services."display-manager" =
-      { after = [ "systemd-udev-settle.service" "local-fs.target" ];
+      { description = "X11 Server";
+
+        after = [ "systemd-udev-settle.service" "local-fs.target" ];
 
         restartIfChanged = false;
 
-- 
GitLab


From 8c710b4f2329448b648274cf84a61318de270bb9 Mon Sep 17 00:00:00 2001
From: Evgeny Egorochkin <phreedom.stdin@gmail.com>
Date: Sun, 13 Jan 2013 11:04:26 +0200
Subject: [PATCH 4302/5331] LuksRoot: mitigate DMA key recovery attacks by
 default.

---
 modules/system/boot/luksroot.nix | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/modules/system/boot/luksroot.nix b/modules/system/boot/luksroot.nix
index 27c9c85eab3..4620a34cbcb 100644
--- a/modules/system/boot/luksroot.nix
+++ b/modules/system/boot/luksroot.nix
@@ -49,6 +49,18 @@ in
       description = "Obsolete.";
     };
 
+    boot.initrd.luks.mitigateDMAAttacks = mkOption {
+      default = true;
+      description = ''
+	Unless enabled, encryption keys can be easily recovered by an attacker with physical
+	access to any machine with PCMCIA, ExpressCard, ThunderBolt or FireWire port.
+	More information: http://en.wikipedia.org/wiki/DMA_attack
+
+	This option blacklists FireWire drivers, but doesn't remove them. You can manually
+	load the drivers if you need to use a FireWire device, but don't forget to unload them!
+      '';
+    };
+
     boot.initrd.luks.devices = mkOption {
       default = [ ];
       example = [ { name = "luksroot"; device = "/dev/sda3"; preLVM = true; } ];
@@ -123,6 +135,10 @@ in
 
   config = mkIf (luks.devices != []) {
 
+    # actually, sbp2 driver is the one enabling the DMA attack, but this needs to be tested
+    boot.blacklistedKernelModules = optionals luks.mitigateDMAAttacks
+      ["firewire_ohci" "firewire_core" "firewire_sbp2"];
+
     # Some modules that may be needed for mounting anything ciphered
     boot.initrd.kernelModules = [ "aes_generic" "aes_x86_64" "dm_mod" "dm_crypt"
       "sha256_generic" "cbc" "cryptd" ];
-- 
GitLab


From 0f11519d450ac27fb3e32cc720f45b4894994f7c Mon Sep 17 00:00:00 2001
From: Evgeny Egorochkin <phreedom.stdin@gmail.com>
Date: Sun, 13 Jan 2013 12:44:16 +0200
Subject: [PATCH 4303/5331] LuksRoot: add more modules to load by default and
 let users add more or override the list. Added every module mentioned by most
 popular guides, benchmarks and discussions to make things just work.

---
 modules/system/boot/luksroot.nix | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/modules/system/boot/luksroot.nix b/modules/system/boot/luksroot.nix
index 4620a34cbcb..a076a1be6dc 100644
--- a/modules/system/boot/luksroot.nix
+++ b/modules/system/boot/luksroot.nix
@@ -61,6 +61,14 @@ in
       '';
     };
 
+    boot.initrd.luks.cryptoModules = mkOption {
+      default = [ "aes_generic" "aes_x86_64" "blowfish" "twofish" "serpent" "cbc" "xts" "lrw" "sha256" "sha1" "sha2" ];
+      description = ''
+	A list of cryptographic kernel modules needed to decrypt the root device(s).
+	The default includes all common modules.
+      '';
+    };
+
     boot.initrd.luks.devices = mkOption {
       default = [ ];
       example = [ { name = "luksroot"; device = "/dev/sda3"; preLVM = true; } ];
@@ -140,8 +148,7 @@ in
       ["firewire_ohci" "firewire_core" "firewire_sbp2"];
 
     # Some modules that may be needed for mounting anything ciphered
-    boot.initrd.kernelModules = [ "aes_generic" "aes_x86_64" "dm_mod" "dm_crypt"
-      "sha256_generic" "cbc" "cryptd" ];
+    boot.initrd.kernelModules = [ "dm_mod" "dm_crypt" "cryptd" ] ++ luks.cryptoModules; 
 
     # copy the cryptsetup binary and it's dependencies
     boot.initrd.extraUtilsCommands = ''
-- 
GitLab


From 6ecf2c3a2897eb3e170657a0a2b74d7f946aa846 Mon Sep 17 00:00:00 2001
From: Evgeny Egorochkin <phreedom.stdin@gmail.com>
Date: Mon, 14 Jan 2013 05:12:20 +0200
Subject: [PATCH 4304/5331] LuksRoot: use generic aes module which loads
 platform-optimized modules automagically.

---
 modules/system/boot/luksroot.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/system/boot/luksroot.nix b/modules/system/boot/luksroot.nix
index a076a1be6dc..86523c56c6f 100644
--- a/modules/system/boot/luksroot.nix
+++ b/modules/system/boot/luksroot.nix
@@ -62,7 +62,7 @@ in
     };
 
     boot.initrd.luks.cryptoModules = mkOption {
-      default = [ "aes_generic" "aes_x86_64" "blowfish" "twofish" "serpent" "cbc" "xts" "lrw" "sha256" "sha1" "sha2" ];
+      default = [ "aes" "blowfish" "twofish" "serpent" "cbc" "xts" "lrw" "sha256" "sha1" "sha2" ];
       description = ''
 	A list of cryptographic kernel modules needed to decrypt the root device(s).
 	The default includes all common modules.
-- 
GitLab


From 4e2f9c867982c4808938aa4d8e4211a7cd019ecd Mon Sep 17 00:00:00 2001
From: Evgeny Egorochkin <phreedom.stdin@gmail.com>
Date: Mon, 14 Jan 2013 06:38:11 +0200
Subject: [PATCH 4305/5331] TOR: replace deprecated option

---
 modules/services/security/tor.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/services/security/tor.nix b/modules/services/security/tor.nix
index 6df4590b85b..41e2b4c356e 100644
--- a/modules/services/security/tor.nix
+++ b/modules/services/security/tor.nix
@@ -259,7 +259,7 @@ in
         User ${torUser}
       ''
       + optionalString cfg.client.enable  ''
-        SocksListenAddress ${cfg.client.socksListenAddress}
+        SOCKSPort ${cfg.client.socksListenAddress}
         ${opt "SocksPolicy" cfg.client.socksPolicy}
       ''
       + optionalString cfg.relay.enable ''
-- 
GitLab


From 7e82b41220ceb8067c157c779e1a40f0a6d69b99 Mon Sep 17 00:00:00 2001
From: Evgeny Egorochkin <phreedom.stdin@gmail.com>
Date: Mon, 14 Jan 2013 06:46:46 +0200
Subject: [PATCH 4306/5331] LuksRoot: fix crypto module list. This one should
 finally work well.

---
 modules/system/boot/luksroot.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/modules/system/boot/luksroot.nix b/modules/system/boot/luksroot.nix
index 86523c56c6f..a514b08a6a8 100644
--- a/modules/system/boot/luksroot.nix
+++ b/modules/system/boot/luksroot.nix
@@ -62,7 +62,10 @@ in
     };
 
     boot.initrd.luks.cryptoModules = mkOption {
-      default = [ "aes" "blowfish" "twofish" "serpent" "cbc" "xts" "lrw" "sha256" "sha1" "sha2" ];
+      default = [ "aes" "aes_generic" "aes_x86_64" "aes_i586" "blowfish" "twofish" "serpent" "cbc" "xts" "lrw" "sha256" 
+"sha1" 
+"sha2" 
+];
       description = ''
 	A list of cryptographic kernel modules needed to decrypt the root device(s).
 	The default includes all common modules.
-- 
GitLab


From 0aad75fe7082dc46bba21f76fcf640f370febb35 Mon Sep 17 00:00:00 2001
From: Evgeny Egorochkin <phreedom.stdin@gmail.com>
Date: Mon, 14 Jan 2013 07:37:13 +0200
Subject: [PATCH 4307/5331] Tor: improve circuit isolation. By default apps are
 isolated better, with extra port available for web browsers to keep
 performance as it used to be before this commit.

---
 modules/services/security/tor.nix | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/modules/services/security/tor.nix b/modules/services/security/tor.nix
index 41e2b4c356e..bad6be54e89 100644
--- a/modules/services/security/tor.nix
+++ b/modules/services/security/tor.nix
@@ -53,6 +53,14 @@ in
           '';
         };
 
+	socksListenAddressFaster = mkOption {
+          default = "127.0.0.1:9063";
+	  description = ''
+            Same as socksListenAddress but uses weaker circuit isolation to provide
+            performance suitable for a web browser.
+          '';
+        };
+
         socksPolicy = mkOption {
           default = "";
           example = "accept 192.168.0.0/16, reject *";
@@ -259,7 +267,8 @@ in
         User ${torUser}
       ''
       + optionalString cfg.client.enable  ''
-        SOCKSPort ${cfg.client.socksListenAddress}
+        SOCKSPort ${cfg.client.socksListenAddress} IsolateDestAddr
+	SOCKSPort ${cfg.client.socksListenAddressFaster}
         ${opt "SocksPolicy" cfg.client.socksPolicy}
       ''
       + optionalString cfg.relay.enable ''
@@ -276,7 +285,7 @@ in
         # Generally, this file goes in /etc/privoxy/config
         #
         # Tor listens as a SOCKS4a proxy here:
-        forward-socks4a / ${cfg.client.socksListenAddress} .
+        forward-socks4a / ${cfg.client.socksListenAddressFaster} .
         confdir ${privoxy}/etc
         logdir ${privoxyDir}
         # actionsfile standard  # Internal purpose, recommended
-- 
GitLab


From 9437db0d889c356e4b92230f63c1bc24bb35f35d Mon Sep 17 00:00:00 2001
From: Evgeny Egorochkin <phreedom.stdin@gmail.com>
Date: Mon, 14 Jan 2013 09:07:35 +0200
Subject: [PATCH 4308/5331] Power management: add support for AMD CPUs

---
 modules/config/power-management.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/config/power-management.nix b/modules/config/power-management.nix
index c8e1a62749b..553105e83a8 100644
--- a/modules/config/power-management.nix
+++ b/modules/config/power-management.nix
@@ -87,7 +87,7 @@ in
       };
 
     boot.kernelModules =
-      [ "acpi_cpufreq" "cpufreq_performance" "cpufreq_powersave" "cpufreq_ondemand"
+      [ "acpi_cpufreq" "powernow-k8" "cpufreq_performance" "cpufreq_powersave" "cpufreq_ondemand"
         "cpufreq_conservative"
       ];
 
-- 
GitLab


From 123c73caf6390c4e6e7be29bddd7633895f8c9fc Mon Sep 17 00:00:00 2001
From: Evgeny Egorochkin <phreedom.stdin@gmail.com>
Date: Tue, 15 Jan 2013 07:34:53 +0200
Subject: [PATCH 4309/5331] Torify: restore as an alternative to TorSocks due
 to lack of compatibility with apps like Kopete.

---
 modules/module-list.nix              |  1 +
 modules/services/security/torify.nix | 69 ++++++++++++++++++++++++++++
 2 files changed, 70 insertions(+)
 create mode 100644 modules/services/security/torify.nix

diff --git a/modules/module-list.nix b/modules/module-list.nix
index f2811fd2f5f..f4622c84b8c 100644
--- a/modules/module-list.nix
+++ b/modules/module-list.nix
@@ -164,6 +164,7 @@
   ./services/security/fprot.nix
   ./services/security/frandom.nix
   ./services/security/tor.nix
+  ./services/security/torify.nix
   ./services/security/torsocks.nix
   ./services/system/cgroups.nix
   ./services/system/dbus.nix
diff --git a/modules/services/security/torify.nix b/modules/services/security/torify.nix
new file mode 100644
index 00000000000..b91d7d58505
--- /dev/null
+++ b/modules/services/security/torify.nix
@@ -0,0 +1,69 @@
+{ config, pkgs, ... }:
+with pkgs.lib;
+let
+
+  cfg = config.services.tor;
+
+  torify = pkgs.writeTextFile {
+    name = "torify";
+    text = ''
+        #!${pkgs.stdenv.shell}
+        TSOCKS_CONF_FILE=${pkgs.writeText "tsocks.conf" cfg.torify.config} LD_PRELOAD="${pkgs.tsocks}/lib/libtsocks.so $LD_PRELOAD" $@
+    '';
+    executable = true;
+    destination = "/bin/torify";
+  };
+
+in
+
+{
+
+  ###### interface
+  
+  options = {
+  
+    services.tor.torify = {
+
+      enable = mkOption {
+        default = cfg.client.enable;
+        description = ''
+          Whether to build torify scipt to relay application traffic via TOR.
+        '';
+      };
+
+      server = mkOption {
+        default = "localhost:9050";
+        example = "192.168.0.20";
+        description = ''
+          IP address of TOR client to use.
+        '';
+      };
+
+      config = mkOption {
+        default = "";
+        description = ''
+          Extra configuration. Contents will be added verbatim to TSocks
+          configuration file.
+        '';
+      };
+
+    };
+
+  };
+
+  ###### implementation
+
+  config = mkIf cfg.torify.enable {
+
+    environment.systemPackages = [ torify ];  # expose it to the users
+
+    services.tor.torify.config = ''
+      server = ${toString(head (splitString ":" cfg.torify.server))}
+      server_port = ${toString(tail (splitString ":" cfg.torify.server))}
+
+      local = 127.0.0.0/255.128.0.0
+      local = 127.128.0.0/255.192.0.0
+    '';
+  };
+
+}
\ No newline at end of file
-- 
GitLab


From e201da376e510ed96b3b40ac091423a1ea5b5dd4 Mon Sep 17 00:00:00 2001
From: Evgeny Egorochkin <phreedom.stdin@gmail.com>
Date: Tue, 15 Jan 2013 08:59:02 +0200
Subject: [PATCH 4310/5331] torsocks: make 2 wrappers to torify apps with more
 and less circuit isolation.

---
 modules/services/security/torsocks.nix | 45 +++++++++++++++++---------
 1 file changed, 29 insertions(+), 16 deletions(-)

diff --git a/modules/services/security/torsocks.nix b/modules/services/security/torsocks.nix
index e56bd012d04..8c2015e37c1 100644
--- a/modules/services/security/torsocks.nix
+++ b/modules/services/security/torsocks.nix
@@ -4,16 +4,30 @@ let
 
   cfg = config.services.tor;
 
-  torsocks = pkgs.writeTextFile {
-    name = "torsocks";
+  makeConfig = server: ''
+      server = ${toString(head (splitString ":" server))}
+      server_port = ${toString(tail (splitString ":" server))}
+
+      local = 127.0.0.0/255.128.0.0
+      local = 127.128.0.0/255.192.0.0
+      local = 169.254.0.0/255.255.0.0
+      local = 172.16.0.0/255.240.0.0
+      local = 192.168.0.0/255.255.0.0
+
+      ${cfg.torsocks.config}
+    '';
+  makeTorsocks = name: server: pkgs.writeTextFile {
+    name = name;
     text = ''
         #!${pkgs.stdenv.shell}
-        TORSOCKS_CONF_FILE=${pkgs.writeText "torsocks.conf" cfg.torsocks.config} LD_PRELOAD="${pkgs.torsocks}/lib/torsocks/libtorsocks.so $LD_PRELOAD" $@
+        TORSOCKS_CONF_FILE=${pkgs.writeText "torsocks.conf" (makeConfig server)} LD_PRELOAD="${pkgs.torsocks}/lib/torsocks/libtorsocks.so $LD_PRELOAD" $@
     '';
     executable = true;
-    destination = "/bin/torsocks";
+    destination = "/bin/${name}";
   };
 
+  torsocks = makeTorsocks "torsocks" cfg.torsocks.server;
+  torsocksFaster = makeTorsocks "torsocks-faster" cfg.torsocks.serverFaster;
 in
 
 {
@@ -33,12 +47,21 @@ in
 
       server = mkOption {
         default = cfg.client.socksListenAddress;
-        example = "192.168.0.20";
+        example = "192.168.0.20:9050";
         description = ''
           IP address of TOR client to use.
         '';
       };
 
+      serverFaster = mkOption {
+        default = cfg.client.socksListenAddressFaster;
+        example = "192.168.0.20:9063";
+        description = ''
+          IP address of TOR client to use for applications like web browsers which
+	  need less circuit isolation to achive satisfactory performance.
+        '';
+      };
+
       config = mkOption {
         default = "";
         description = ''
@@ -55,18 +78,8 @@ in
 
   config = mkIf cfg.torsocks.enable {
 
-    environment.systemPackages = [ torsocks ];  # expose it to the users
-
-    services.tor.torsocks.config = ''
-      server = ${toString(head (splitString ":" cfg.torsocks.server))}
-      server_port = ${toString(tail (splitString ":" cfg.torsocks.server))}
+    environment.systemPackages = [ torsocks torsocksFaster ];  # expose it to the users
 
-      local = 127.0.0.0/255.128.0.0
-      local = 127.128.0.0/255.192.0.0
-      local = 169.254.0.0/255.255.0.0
-      local = 172.16.0.0/255.240.0.0
-      local = 192.168.0.0/255.255.0.0
-    '';
   };
 
 }
-- 
GitLab


From e32dda4c40db3b2b761b390e1255bbfe6cb500e2 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 15 Jan 2013 14:25:13 +0100
Subject: [PATCH 4311/5331] Bump the NixOS version number to 0.2

A new init system justifies a new version number!
---
 .version | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.version b/.version
index ceab6e11ece..2f4536184bc 100644
--- a/.version
+++ b/.version
@@ -1 +1 @@
-0.1
\ No newline at end of file
+0.2
\ No newline at end of file
-- 
GitLab


From ac8080b83c8bcaaadd35f7430ccc0add0eade15a Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 15 Jan 2013 16:53:17 +0100
Subject: [PATCH 4312/5331] Remove obsolete environment variables

---
 modules/security/ca.nix | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/modules/security/ca.nix b/modules/security/ca.nix
index ef33298f19e..378fe4e691d 100644
--- a/modules/security/ca.nix
+++ b/modules/security/ca.nix
@@ -20,10 +20,6 @@ with pkgs.lib;
     environment.shellInit =
       ''
         export OPENSSL_X509_CERT_FILE=/etc/ssl/certs/ca-bundle.crt
-
-        # !!! Remove the following as soon as OpenSSL 1.0.0e is the default.
-        export CURL_CA_BUNDLE=/etc/ssl/certs/ca-bundle.crt
-        export GIT_SSL_CAINFO=/etc/ssl/certs/ca-bundle.crt
       '';
 
   };
-- 
GitLab


From 0b399d8e49e064842265c0b5f6b4e0346ad097eb Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 15 Jan 2013 17:34:01 +0100
Subject: [PATCH 4313/5331] Revert "Remove obsolete environment variables"

This reverts commit ac8080b83c8bcaaadd35f7430ccc0add0eade15a.
---
 modules/security/ca.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/modules/security/ca.nix b/modules/security/ca.nix
index 378fe4e691d..ef33298f19e 100644
--- a/modules/security/ca.nix
+++ b/modules/security/ca.nix
@@ -20,6 +20,10 @@ with pkgs.lib;
     environment.shellInit =
       ''
         export OPENSSL_X509_CERT_FILE=/etc/ssl/certs/ca-bundle.crt
+
+        # !!! Remove the following as soon as OpenSSL 1.0.0e is the default.
+        export CURL_CA_BUNDLE=/etc/ssl/certs/ca-bundle.crt
+        export GIT_SSL_CAINFO=/etc/ssl/certs/ca-bundle.crt
       '';
 
   };
-- 
GitLab


From 61f1df279ff7af94cb1b6e1888d2651a6f174cc7 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 15 Jan 2013 17:34:24 +0100
Subject: [PATCH 4314/5331] Remove bogus comment

---
 modules/security/ca.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/modules/security/ca.nix b/modules/security/ca.nix
index ef33298f19e..e42f5ffe3b8 100644
--- a/modules/security/ca.nix
+++ b/modules/security/ca.nix
@@ -21,7 +21,6 @@ with pkgs.lib;
       ''
         export OPENSSL_X509_CERT_FILE=/etc/ssl/certs/ca-bundle.crt
 
-        # !!! Remove the following as soon as OpenSSL 1.0.0e is the default.
         export CURL_CA_BUNDLE=/etc/ssl/certs/ca-bundle.crt
         export GIT_SSL_CAINFO=/etc/ssl/certs/ca-bundle.crt
       '';
-- 
GitLab


From ae4e94d9acc510183fab1501bd6e9ed189b31e20 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 16 Jan 2013 12:33:18 +0100
Subject: [PATCH 4315/5331] =?UTF-8?q?Rename=20=E2=80=98boot.systemd?=
 =?UTF-8?q?=E2=80=99=20to=20=E2=80=98systemd=E2=80=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Suggested by Mathijs Kwik.  ‘boot.systemd’ is a misnomer because
systemd affects more than just booting.  And it saves some typing.
---
 doc/manual/running.xml                        |  6 ++---
 modules/config/networking.nix                 |  2 +-
 modules/config/power-management.nix           |  6 ++---
 modules/config/swap.nix                       |  2 +-
 modules/profiles/headless.nix                 |  4 ++--
 modules/rename.nix                            |  5 +++++
 modules/security/rngd.nix                     |  2 +-
 modules/services/audio/alsa.nix               |  2 +-
 modules/services/databases/mongodb.nix        |  2 +-
 modules/services/databases/mysql.nix          |  2 +-
 modules/services/databases/mysql55.nix        |  2 +-
 modules/services/databases/postgresql.nix     |  2 +-
 modules/services/hardware/upower.nix          |  2 +-
 modules/services/logging/logstash.nix         |  2 +-
 modules/services/logging/syslogd.nix          |  2 +-
 modules/services/misc/nix-daemon.nix          |  4 ++--
 modules/services/misc/nix-gc.nix              |  2 +-
 modules/services/misc/nixos-manual.nix        |  2 +-
 modules/services/misc/rogue.nix               |  2 +-
 modules/services/monitoring/dd-agent.nix      |  2 +-
 modules/services/monitoring/smartd.nix        |  2 +-
 modules/services/monitoring/zabbix-agent.nix  |  2 +-
 modules/services/monitoring/zabbix-server.nix |  2 +-
 modules/services/network-filesystems/nfsd.nix |  4 ++--
 .../services/network-filesystems/samba.nix    |  2 +-
 modules/services/networking/dhcpcd.nix        |  2 +-
 modules/services/networking/gogoclient.nix    |  2 +-
 modules/services/networking/openvpn.nix       |  2 +-
 modules/services/networking/rpcbind.nix       |  2 +-
 modules/services/networking/ssh/sshd.nix      |  2 +-
 modules/services/system/dbus.nix              |  4 ++--
 modules/services/system/nscd.nix              |  2 +-
 modules/services/ttys/agetty.nix              |  4 ++--
 .../web-servers/apache-httpd/default.nix      |  2 +-
 modules/services/x11/xserver.nix              |  4 ++--
 modules/system/boot/kernel.nix                |  2 +-
 modules/system/boot/shutdown.nix              |  2 +-
 modules/system/boot/systemd.nix               | 22 +++++++++----------
 modules/system/upstart/upstart.nix            |  2 +-
 modules/tasks/filesystems.nix                 |  4 ++--
 modules/tasks/filesystems/nfs.nix             |  4 ++--
 modules/tasks/kbd.nix                         |  2 +-
 modules/tasks/network-interfaces.nix          |  4 ++--
 modules/testing/test-instrumentation.nix      |  8 +++----
 modules/virtualisation/ec2-data.nix           |  4 ++--
 modules/virtualisation/libvirtd.nix           |  2 +-
 46 files changed, 77 insertions(+), 72 deletions(-)

diff --git a/doc/manual/running.xml b/doc/manual/running.xml
index f9feadbc086..ea4028b6e9b 100644
--- a/doc/manual/running.xml
+++ b/doc/manual/running.xml
@@ -212,7 +212,7 @@ would get 1/1001 of the cgroup’s CPU time.)  You can limit a service’s
 CPU share in <filename>configuration.nix</filename>:
 
 <programlisting>
-boot.systemd.services.httpd.serviceConfig.CPUShares = 512;
+systemd.services.httpd.serviceConfig.CPUShares = 512;
 </programlisting>
 
 By default, every cgroup has 1024 CPU shares, so this will halve the
@@ -227,8 +227,8 @@ available memory.  Per-cgroup memory limits can be specified in
 and 640 MiB of RAM (including swap):
 
 <programlisting>
-boot.systemd.services.httpd.serviceConfig.MemoryLimit = "512M";
-boot.systemd.services.httpd.serviceConfig.ControlGroupAttribute = [ "memory.memsw.limit_in_bytes 640M" ];
+systemd.services.httpd.serviceConfig.MemoryLimit = "512M";
+systemd.services.httpd.serviceConfig.ControlGroupAttribute = [ "memory.memsw.limit_in_bytes 640M" ];
 </programlisting>
 
 </para>
diff --git a/modules/config/networking.nix b/modules/config/networking.nix
index e9d04c49904..6908996db6c 100644
--- a/modules/config/networking.nix
+++ b/modules/config/networking.nix
@@ -87,7 +87,7 @@ in
       }
     ];
 
-  boot.systemd.units."ip-up.target".text =
+  systemd.units."ip-up.target".text =
     ''
       [Unit]
       Description=Services Requiring IP Connectivity
diff --git a/modules/config/power-management.nix b/modules/config/power-management.nix
index c48451bd5f5..4da6cebcb94 100644
--- a/modules/config/power-management.nix
+++ b/modules/config/power-management.nix
@@ -73,7 +73,7 @@ in
     powerManagement.scsiLinkPolicy = mkDefault "min_power";
 
     # Service executed before suspending/hibernating.
-    boot.systemd.services."pre-sleep" =
+    systemd.services."pre-sleep" =
       { description = "Pre-Sleep Actions";
         wantedBy = [ "sleep.target" ];
         before = [ "sleep.target" ];
@@ -87,7 +87,7 @@ in
     # Service executed before suspending/hibernating.  There doesn't
     # seem to be a good way to hook in a service to be executed after
     # both suspend *and* hibernate, so have a separate one for each.
-    boot.systemd.services."post-suspend" =
+    systemd.services."post-suspend" =
       { description = "Post-Suspend Actions";
         wantedBy = [ "suspend.target" ];
         after = [ "systemd-suspend.service" ];
@@ -99,7 +99,7 @@ in
         serviceConfig.Type = "oneshot";
       };
 
-    boot.systemd.services."post-hibernate" =
+    systemd.services."post-hibernate" =
       { description = "Post-Hibernate Actions";
         wantedBy = [ "hibernate.target" ];
         after = [ "systemd-hibernate.service" ];
diff --git a/modules/config/swap.nix b/modules/config/swap.nix
index 8a2f58d7dcd..222c18d3e62 100644
--- a/modules/config/swap.nix
+++ b/modules/config/swap.nix
@@ -82,7 +82,7 @@ with utils;
 
     # Create missing swapfiles.
     # FIXME: support changing the size of existing swapfiles.
-    boot.systemd.services =
+    systemd.services =
       let
 
         createSwapDevice = sw:
diff --git a/modules/profiles/headless.nix b/modules/profiles/headless.nix
index 593bd925b00..0a2bfa80c47 100644
--- a/modules/profiles/headless.nix
+++ b/modules/profiles/headless.nix
@@ -12,8 +12,8 @@ with pkgs.lib;
   services.ttyBackgrounds.enable = false;
 
   # Don't start a tty on the serial consoles.
-  boot.systemd.services."serial-getty@ttyS0".enable = false;
-  boot.systemd.services."serial-getty@hvc0".enable = false;
+  systemd.services."serial-getty@ttyS0".enable = false;
+  systemd.services."serial-getty@hvc0".enable = false;
 
   # Since we can't manually respond to a panic, just reboot.
   boot.kernelParams = [ "panic=1" "boot.panic_on_fail" ];
diff --git a/modules/rename.nix b/modules/rename.nix
index 43566bab22f..534137d4e09 100644
--- a/modules/rename.nix
+++ b/modules/rename.nix
@@ -71,6 +71,11 @@ in zipModules ([]
 ++ rename obsolete "networking.enableWLAN" "networking.wireless.enable"
 ++ rename obsolete "networking.enableRT73Firmware" "networking.enableRalinkFirmware"
 
+# FIXME: Remove these eventually.
+++ rename obsolete "boot.systemd.sockets" "systemd.sockets"
+++ rename obsolete "boot.systemd.targets" "systemd.targets"
+++ rename obsolete "boot.systemd.services" "systemd.services"
+
 # Old Grub-related options.
 ++ rename obsolete "boot.copyKernels" "boot.loader.grub.copyKernels"
 ++ rename obsolete "boot.extraGrubEntries" "boot.loader.grub.extraEntries"
diff --git a/modules/security/rngd.nix b/modules/security/rngd.nix
index 519fb62133c..dd251fe69d3 100644
--- a/modules/security/rngd.nix
+++ b/modules/security/rngd.nix
@@ -22,7 +22,7 @@ with pkgs.lib;
       KERNEL=="tmp0", TAG+="systemd", ENV{SYSTEMD_WANTS}+="rngd.service"
     '';
 
-    boot.systemd.services.rngd = {
+    systemd.services.rngd = {
       bindsTo = [ "dev-random.device" ];
 
       after = [ "dev-random.device" ];
diff --git a/modules/services/audio/alsa.nix b/modules/services/audio/alsa.nix
index 92d0cdd26f3..ead53c3dc3a 100644
--- a/modules/services/audio/alsa.nix
+++ b/modules/services/audio/alsa.nix
@@ -50,7 +50,7 @@ in
 
     boot.kernelModules = optional config.sound.enableOSSEmulation "snd_pcm_oss";
 
-    boot.systemd.services."alsa-store" =
+    systemd.services."alsa-store" =
       { description = "Store Sound Card State";
         wantedBy = [ "shutdown.target" ];
         before = [ "shutdown.target" ];
diff --git a/modules/services/databases/mongodb.nix b/modules/services/databases/mongodb.nix
index 9e9e1c7dd8c..887f1f0529f 100644
--- a/modules/services/databases/mongodb.nix
+++ b/modules/services/databases/mongodb.nix
@@ -102,7 +102,7 @@ in
 
     environment.systemPackages = [ mongodb ];
 
-    boot.systemd.services.mongodb =
+    systemd.services.mongodb =
       { description = "MongoDB server";
 
         wantedBy = [ "multi-user.target" ];
diff --git a/modules/services/databases/mysql.nix b/modules/services/databases/mysql.nix
index ef29d563c72..7bf7a77aa85 100644
--- a/modules/services/databases/mysql.nix
+++ b/modules/services/databases/mysql.nix
@@ -141,7 +141,7 @@ in
 
     environment.systemPackages = [mysql];
 
-    boot.systemd.services.mysql =
+    systemd.services.mysql =
       { description = "MySQL Server";
 
         wantedBy = [ "multi-user.target" ];
diff --git a/modules/services/databases/mysql55.nix b/modules/services/databases/mysql55.nix
index 51fe37b7684..37cab395677 100644
--- a/modules/services/databases/mysql55.nix
+++ b/modules/services/databases/mysql55.nix
@@ -134,7 +134,7 @@ in
 
     environment.systemPackages = [mysql];
 
-    boot.systemd.services.mysql =
+    systemd.services.mysql =
       { description = "MySQL Server";
 
         wantedBy = [ "multi-user.target" ];
diff --git a/modules/services/databases/postgresql.nix b/modules/services/databases/postgresql.nix
index c178a84b1b8..a33fdaab423 100644
--- a/modules/services/databases/postgresql.nix
+++ b/modules/services/databases/postgresql.nix
@@ -155,7 +155,7 @@ in
 
     environment.systemPackages = [postgresql];
 
-    boot.systemd.services.postgresql =
+    systemd.services.postgresql =
       { description = "PostgreSQL Server";
 
         wantedBy = [ "multi-user.target" ];
diff --git a/modules/services/hardware/upower.nix b/modules/services/hardware/upower.nix
index 58f2610ce06..54f5d03de39 100644
--- a/modules/services/hardware/upower.nix
+++ b/modules/services/hardware/upower.nix
@@ -35,7 +35,7 @@ with pkgs.lib;
 
     services.udev.packages = [ pkgs.upower ];
 
-    boot.systemd.services.upower =
+    systemd.services.upower =
       { description = "Power Management Daemon";
         path = [ pkgs.glib ]; # needed for gdbus
         serviceConfig =
diff --git a/modules/services/logging/logstash.nix b/modules/services/logging/logstash.nix
index bc44620d644..b535a942a9e 100644
--- a/modules/services/logging/logstash.nix
+++ b/modules/services/logging/logstash.nix
@@ -136,7 +136,7 @@ in
       mkNameValuePairs = mergeConfigs;
     };
   } ( mkIf cfg.enable {
-    boot.systemd.services.logstash = with pkgs; {
+    systemd.services.logstash = with pkgs; {
       description = "Logstash daemon";
 
       wantedBy = [ "multi-user.target" ];
diff --git a/modules/services/logging/syslogd.nix b/modules/services/logging/syslogd.nix
index 8c815ddf25f..886669606b4 100644
--- a/modules/services/logging/syslogd.nix
+++ b/modules/services/logging/syslogd.nix
@@ -105,7 +105,7 @@ in
     services.syslogd.extraParams = optional cfg.enableNetworkInput "-r";
 
     # FIXME: restarting syslog seems to break journal logging.
-    boot.systemd.services.syslog =
+    systemd.services.syslog =
       { description = "Syslog Daemon";
 
         requires = [ "syslog.socket" ];
diff --git a/modules/services/misc/nix-daemon.nix b/modules/services/misc/nix-daemon.nix
index eaea8bd653a..a2ec899a593 100644
--- a/modules/services/misc/nix-daemon.nix
+++ b/modules/services/misc/nix-daemon.nix
@@ -270,14 +270,14 @@ in
           target = "nix.machines";
         };
 
-    boot.systemd.sockets."nix-daemon" =
+    systemd.sockets."nix-daemon" =
       { description = "Nix Daemon Socket";
         wantedBy = [ "sockets.target" ];
         before = [ "multi-user.target" ];
         socketConfig.ListenStream = "/nix/var/nix/daemon-socket/socket";
       };
 
-    boot.systemd.services."nix-daemon" =
+    systemd.services."nix-daemon" =
       { description = "Nix Daemon";
 
         path = [ nix pkgs.openssl pkgs.utillinux ]
diff --git a/modules/services/misc/nix-gc.nix b/modules/services/misc/nix-gc.nix
index 435326e87fb..dc9fa85cf66 100644
--- a/modules/services/misc/nix-gc.nix
+++ b/modules/services/misc/nix-gc.nix
@@ -51,7 +51,7 @@ in
     services.cron.systemCronJobs = mkIf cfg.automatic (singleton
       "${cfg.dates} root ${config.system.build.systemd}/bin/systemctl start nix-gc.service");
 
-    boot.systemd.services."nix-gc" =
+    systemd.services."nix-gc" =
       { description = "Nix Garbage Collector";
         path  = [ config.environment.nix ];
         script = "exec nix-collect-garbage ${cfg.options}";
diff --git a/modules/services/misc/nixos-manual.nix b/modules/services/misc/nixos-manual.nix
index 1a172904c45..108ed2911ce 100644
--- a/modules/services/misc/nixos-manual.nix
+++ b/modules/services/misc/nixos-manual.nix
@@ -84,7 +84,7 @@ in
 
     boot.extraTTYs = mkIf cfg.showManual ["tty${cfg.ttyNumber}"];
 
-    boot.systemd.services = optionalAttrs cfg.showManual
+    systemd.services = optionalAttrs cfg.showManual
       { "nixos-manual" =
         { description = "NixOS Manual";
           wantedBy = [ "multi-user.target" ];
diff --git a/modules/services/misc/rogue.nix b/modules/services/misc/rogue.nix
index 12d61a8ea9f..c5cc8b4050d 100644
--- a/modules/services/misc/rogue.nix
+++ b/modules/services/misc/rogue.nix
@@ -40,7 +40,7 @@ in
 
     boot.extraTTYs = [ cfg.tty ];
 
-    boot.systemd.services.rogue =
+    systemd.services.rogue =
       { description = "Rogue dungeon crawling game";
         wantedBy = [ "multi-user.target" ];
         serviceConfig =
diff --git a/modules/services/monitoring/dd-agent.nix b/modules/services/monitoring/dd-agent.nix
index c0493557d56..c6ab1ca0a3a 100644
--- a/modules/services/monitoring/dd-agent.nix
+++ b/modules/services/monitoring/dd-agent.nix
@@ -43,7 +43,7 @@ in {
   config = mkIf cfg.enable {
     environment.etc = [ { source = datadog-conf; target = "dd-agent/datadog.conf"; } ];
 
-    boot.systemd.services.dd-agent = {
+    systemd.services.dd-agent = {
       description = "Datadog agent monitor";
 
       path = [ pkgs.sysstat pkgs.procps ];
diff --git a/modules/services/monitoring/smartd.nix b/modules/services/monitoring/smartd.nix
index 48066856625..07acab761d0 100644
--- a/modules/services/monitoring/smartd.nix
+++ b/modules/services/monitoring/smartd.nix
@@ -81,7 +81,7 @@ in
 
   config = mkIf cfg.enable {
 
-    boot.systemd.services.smartd = {
+    systemd.services.smartd = {
       description = "S.M.A.R.T. Daemon";
 
       environment.TZ = config.time.timeZone;
diff --git a/modules/services/monitoring/zabbix-agent.nix b/modules/services/monitoring/zabbix-agent.nix
index 9758bc8cb48..229236c1bbd 100644
--- a/modules/services/monitoring/zabbix-agent.nix
+++ b/modules/services/monitoring/zabbix-agent.nix
@@ -73,7 +73,7 @@ in
         description = "Zabbix daemon user";
       };
 
-    boot.systemd.services."zabbix-agent" =
+    systemd.services."zabbix-agent" =
       { description = "Zabbix Agent";
 
         wantedBy = [ "multi-user.target" ];
diff --git a/modules/services/monitoring/zabbix-server.nix b/modules/services/monitoring/zabbix-server.nix
index 085fb022c1c..df42071ebba 100644
--- a/modules/services/monitoring/zabbix-server.nix
+++ b/modules/services/monitoring/zabbix-server.nix
@@ -73,7 +73,7 @@ in
         description = "Zabbix daemon user";
       };
 
-    boot.systemd.services."zabbix-server" =
+    systemd.services."zabbix-server" =
       { description = "Zabbix Server";
 
         wantedBy = [ "multi-user.target" ];
diff --git a/modules/services/network-filesystems/nfsd.nix b/modules/services/network-filesystems/nfsd.nix
index 995e9bba603..ab8e77e2bad 100644
--- a/modules/services/network-filesystems/nfsd.nix
+++ b/modules/services/network-filesystems/nfsd.nix
@@ -80,7 +80,7 @@ in
 
     boot.kernelModules = [ "nfsd" ];
 
-    boot.systemd.services.nfsd =
+    systemd.services.nfsd =
       { description = "NFS Server";
 
         wantedBy = [ "multi-user.target" ];
@@ -108,7 +108,7 @@ in
         serviceConfig.RemainAfterExit = true;
       };
 
-    boot.systemd.services.mountd =
+    systemd.services.mountd =
       { description = "NFSv3 Mount Daemon";
 
         requires = [ "rpcbind.service" ];
diff --git a/modules/services/network-filesystems/samba.nix b/modules/services/network-filesystems/samba.nix
index aa75c4322a0..c4157c647c6 100644
--- a/modules/services/network-filesystems/samba.nix
+++ b/modules/services/network-filesystems/samba.nix
@@ -200,7 +200,7 @@ in
           };
 
 
-        boot.systemd = {
+        systemd = {
           targets.samba = {
             description = "Samba server";
             requires = [ "samba-setup.service" ];
diff --git a/modules/services/networking/dhcpcd.nix b/modules/services/networking/dhcpcd.nix
index 739ba95d5e3..533b719a667 100644
--- a/modules/services/networking/dhcpcd.nix
+++ b/modules/services/networking/dhcpcd.nix
@@ -92,7 +92,7 @@ in
 
   config = mkIf config.networking.useDHCP {
 
-    boot.systemd.services.dhcpcd =
+    systemd.services.dhcpcd =
       { description = "DHCP Client";
 
         wantedBy = [ "network.target" ];
diff --git a/modules/services/networking/gogoclient.nix b/modules/services/networking/gogoclient.nix
index 7d742df97b0..07c35e3cb3d 100644
--- a/modules/services/networking/gogoclient.nix
+++ b/modules/services/networking/gogoclient.nix
@@ -58,7 +58,7 @@ in
 
     networking.enableIPv6 = true;
 
-    boot.systemd.services.gogoclient = {
+    systemd.services.gogoclient = {
       description = "ipv6 tunnel";
 
       after = [ "network.target" ];
diff --git a/modules/services/networking/openvpn.nix b/modules/services/networking/openvpn.nix
index 12808e2ee27..4ea6fa135b0 100644
--- a/modules/services/networking/openvpn.nix
+++ b/modules/services/networking/openvpn.nix
@@ -11,7 +11,7 @@ let
   makeOpenVPNJob = cfg: name:
     let
 
-      path = (getAttr "openvpn-${name}" config.boot.systemd.services).path;
+      path = (getAttr "openvpn-${name}" config.systemd.services).path;
 
       upScript = ''
         #! /bin/sh
diff --git a/modules/services/networking/rpcbind.nix b/modules/services/networking/rpcbind.nix
index f82803e7519..7180b2cfa14 100644
--- a/modules/services/networking/rpcbind.nix
+++ b/modules/services/networking/rpcbind.nix
@@ -65,7 +65,7 @@ in
 
     environment.etc = [ netconfigFile ];
 
-    boot.systemd.services.rpcbind =
+    systemd.services.rpcbind =
       { description = "ONC RPC Directory Service";
 
         wantedBy = [ "multi-user.target" ];
diff --git a/modules/services/networking/ssh/sshd.nix b/modules/services/networking/ssh/sshd.nix
index 8f898ce06a1..e9df8dd3cf6 100644
--- a/modules/services/networking/ssh/sshd.nix
+++ b/modules/services/networking/ssh/sshd.nix
@@ -262,7 +262,7 @@ in
       }
     ];
 
-    boot.systemd.services.sshd =
+    systemd.services.sshd =
       { description = "SSH Daemon";
 
         wantedBy = [ "multi-user.target" ];
diff --git a/modules/services/system/dbus.nix b/modules/services/system/dbus.nix
index a6544368ea0..4a9d9a77b57 100644
--- a/modules/services/system/dbus.nix
+++ b/modules/services/system/dbus.nix
@@ -118,7 +118,7 @@ in
 
     # FIXME: these are copied verbatim from the dbus source tree.  We
     # should install and use the originals.
-    boot.systemd.units."dbus.socket".text =
+    systemd.units."dbus.socket".text =
       ''
         [Unit]
         Description=D-Bus System Message Bus Socket
@@ -127,7 +127,7 @@ in
         ListenStream=/var/run/dbus/system_bus_socket
       '';
       
-    boot.systemd.units."dbus.service".text =
+    systemd.units."dbus.service".text =
       ''
         [Unit]
         Description=D-Bus System Message Bus
diff --git a/modules/services/system/nscd.nix b/modules/services/system/nscd.nix
index 1843368ba27..22f507f39d7 100644
--- a/modules/services/system/nscd.nix
+++ b/modules/services/system/nscd.nix
@@ -38,7 +38,7 @@ in
         description = "Name service cache daemon user";
       };
 
-    boot.systemd.services.nscd =
+    systemd.services.nscd =
       { description = "Name Service Cache Daemon";
 
         wantedBy = [ "nss-lookup.target" "nss-user-lookup.target" ];
diff --git a/modules/services/ttys/agetty.nix b/modules/services/ttys/agetty.nix
index 444d04564a9..f269de6fc2a 100644
--- a/modules/services/ttys/agetty.nix
+++ b/modules/services/ttys/agetty.nix
@@ -39,7 +39,7 @@ with pkgs.lib;
     # which some small modifications, which is annoying.
 
     # Generate a separate job for each tty.
-    boot.systemd.units."getty@.service".text =
+    systemd.units."getty@.service".text =
       ''
         [Unit]
         Description=Getty on %I
@@ -76,7 +76,7 @@ with pkgs.lib;
         X-RestartIfChanged=false
       '';
     
-    boot.systemd.units."serial-getty@.service".text =
+    systemd.units."serial-getty@.service".text =
       ''
         [Unit]
         Description=Serial Getty on %I
diff --git a/modules/services/web-servers/apache-httpd/default.nix b/modules/services/web-servers/apache-httpd/default.nix
index 17a8c8216ca..35afacefa16 100644
--- a/modules/services/web-servers/apache-httpd/default.nix
+++ b/modules/services/web-servers/apache-httpd/default.nix
@@ -601,7 +601,7 @@ in
         date.timezone = "${config.time.timeZone}"
       '';
 
-    boot.systemd.services.httpd =
+    systemd.services.httpd =
       { description = "Apache HTTPD";
 
         wantedBy = [ "multi-user.target" ];
diff --git a/modules/services/x11/xserver.nix b/modules/services/x11/xserver.nix
index 599f8be226d..2e6158bafa1 100644
--- a/modules/services/x11/xserver.nix
+++ b/modules/services/x11/xserver.nix
@@ -386,9 +386,9 @@ in
     environment.pathsToLink =
       [ "/etc/xdg" "/share/xdg" "/share/applications" "/share/icons" "/share/pixmaps" ];
 
-    boot.systemd.defaultUnit = mkIf cfg.autorun "graphical.target";
+    systemd.defaultUnit = mkIf cfg.autorun "graphical.target";
 
-    boot.systemd.services."display-manager" =
+    systemd.services."display-manager" =
       { description = "X11 Server";
 
         after = [ "systemd-udev-settle.service" "local-fs.target" ];
diff --git a/modules/system/boot/kernel.nix b/modules/system/boot/kernel.nix
index 6cf9311e471..4776f4451f0 100644
--- a/modules/system/boot/kernel.nix
+++ b/modules/system/boot/kernel.nix
@@ -213,7 +213,7 @@ in
     # just so we can set a restart trigger.  Also make
     # multi-user.target pull it in so that it gets started if it
     # failed earlier.
-    boot.systemd.services."systemd-modules-load" =
+    systemd.services."systemd-modules-load" =
       { description = "Load Kernel Modules";
         wantedBy = [ "sysinit.target" "multi-user.target" ];
         before = [ "sysinit.target" "shutdown.target" ];
diff --git a/modules/system/boot/shutdown.nix b/modules/system/boot/shutdown.nix
index 3fb9545b33f..23ddf6d0202 100644
--- a/modules/system/boot/shutdown.nix
+++ b/modules/system/boot/shutdown.nix
@@ -6,7 +6,7 @@ with pkgs.lib;
 
   # This unit saves the value of the system clock to the hardware
   # clock on shutdown.
-  boot.systemd.units."save-hwclock.service" =
+  systemd.units."save-hwclock.service" =
     { wantedBy = [ "shutdown.target" ];
 
       text =
diff --git a/modules/system/boot/systemd.nix b/modules/system/boot/systemd.nix
index 83911d179fd..80957cd1193 100644
--- a/modules/system/boot/systemd.nix
+++ b/modules/system/boot/systemd.nix
@@ -6,7 +6,7 @@ with import ./systemd-unit-options.nix { inherit config pkgs; };
 
 let
 
-  cfg = config.boot.systemd;
+  cfg = config.systemd;
 
   systemd = pkgs.systemd;
 
@@ -340,7 +340,7 @@ in
 
   options = {
 
-    boot.systemd.units = mkOption {
+    systemd.units = mkOption {
       description = "Definition of systemd units.";
       default = {};
       type = types.attrsOf types.optionSet;
@@ -367,34 +367,34 @@ in
       };
     };
 
-    boot.systemd.packages = mkOption {
+    systemd.packages = mkOption {
       default = [];
       type = types.listOf types.package;
       description = "Packages providing systemd units.";
     };
 
-    boot.systemd.targets = mkOption {
+    systemd.targets = mkOption {
       default = {};
       type = types.attrsOf types.optionSet;
       options = [ unitOptions unitConfig ];
       description = "Definition of systemd target units.";
     };
 
-    boot.systemd.services = mkOption {
+    systemd.services = mkOption {
       default = {};
       type = types.attrsOf types.optionSet;
       options = [ serviceOptions unitConfig serviceConfig ];
       description = "Definition of systemd service units.";
     };
 
-    boot.systemd.sockets = mkOption {
+    systemd.sockets = mkOption {
       default = {};
       type = types.attrsOf types.optionSet;
       options = [ socketOptions unitConfig ];
       description = "Definition of systemd socket units.";
     };
 
-    boot.systemd.mounts = mkOption {
+    systemd.mounts = mkOption {
       default = [];
       type = types.listOf types.optionSet;
       options = [ mountOptions unitConfig mountConfig ];
@@ -405,13 +405,13 @@ in
       '';
     };
 
-    boot.systemd.defaultUnit = mkOption {
+    systemd.defaultUnit = mkOption {
       default = "multi-user.target";
       type = types.uniq types.string;
       description = "Default unit started when the system boots.";
     };
 
-    boot.systemd.globalEnvironment = mkOption {
+    systemd.globalEnvironment = mkOption {
       type = types.attrs;
       default = {};
       example = { TZ = "CET"; };
@@ -500,11 +500,11 @@ in
       '';
 
     # Target for ‘charon send-keys’ to hook into.
-    boot.systemd.targets.keys =
+    systemd.targets.keys =
       { description = "Security Keys";
       };
 
-    boot.systemd.units =
+    systemd.units =
       mapAttrs' (n: v: nameValuePair "${n}.target" (targetToUnit n v)) cfg.targets
       // mapAttrs' (n: v: nameValuePair "${n}.service" (serviceToUnit n v)) cfg.services
       // mapAttrs' (n: v: nameValuePair "${n}.socket" (socketToUnit n v)) cfg.sockets
diff --git a/modules/system/upstart/upstart.nix b/modules/system/upstart/upstart.nix
index 44e6e8bb63b..5d5139b7a57 100644
--- a/modules/system/upstart/upstart.nix
+++ b/modules/system/upstart/upstart.nix
@@ -277,7 +277,7 @@ in
 
   config = {
 
-    boot.systemd.services =
+    systemd.services =
       flip mapAttrs' config.jobs (name: job:
         nameValuePair job.name job.unit);
 
diff --git a/modules/tasks/filesystems.nix b/modules/tasks/filesystems.nix
index 00d711eecd3..8efc96f7fe4 100644
--- a/modules/tasks/filesystems.nix
+++ b/modules/tasks/filesystems.nix
@@ -177,13 +177,13 @@ in
       };
 
     # Provide a target that pulls in all filesystems.
-    boot.systemd.targets.fs =
+    systemd.targets.fs =
       { description = "All File Systems";
         wants = [ "local-fs.target" "remote-fs.target" ];
       };
 
     # Emit systemd services to format requested filesystems.
-    boot.systemd.services =
+    systemd.services =
       let
 
         formatDevice = fs:
diff --git a/modules/tasks/filesystems/nfs.nix b/modules/tasks/filesystems/nfs.nix
index 055733e456a..3d5e1dd51f5 100644
--- a/modules/tasks/filesystems/nfs.nix
+++ b/modules/tasks/filesystems/nfs.nix
@@ -40,7 +40,7 @@ in
 
     boot.initrd.kernelModules = mkIf inInitrd [ "nfs" ];
 
-    boot.systemd.services.statd =
+    systemd.services.statd =
       { description = "NFSv3 Network Status Monitor";
 
         path = [ pkgs.nfsUtils pkgs.sysvtools pkgs.utillinux ];
@@ -64,7 +64,7 @@ in
         serviceConfig.Restart = "always";
       };
 
-    boot.systemd.services.idmapd =
+    systemd.services.idmapd =
       { description = "NFSv4 ID Mapping Daemon";
 
         path = [ pkgs.sysvtools pkgs.utillinux ];
diff --git a/modules/tasks/kbd.nix b/modules/tasks/kbd.nix
index 7867b3c1912..b0e222cd05e 100644
--- a/modules/tasks/kbd.nix
+++ b/modules/tasks/kbd.nix
@@ -74,7 +74,7 @@ in
     # shipped with systemd, except that it uses /dev/tty1 instead of
     # /dev/tty0 to prevent putting the X server in non-raw mode, and
     # it has a restart trigger.
-    boot.systemd.services."systemd-vconsole-setup" =
+    systemd.services."systemd-vconsole-setup" =
       { description = "Setup Virtual Console";
         before = [ "sysinit.target" "shutdown.target" ];
         unitConfig =
diff --git a/modules/tasks/network-interfaces.nix b/modules/tasks/network-interfaces.nix
index a002e2b68b2..e8097e418c8 100644
--- a/modules/tasks/network-interfaces.nix
+++ b/modules/tasks/network-interfaces.nix
@@ -252,13 +252,13 @@ in
 
     security.setuidPrograms = [ "ping" "ping6" ];
 
-    boot.systemd.targets."network-interfaces" =
+    systemd.targets."network-interfaces" =
       { description = "All Network Interfaces";
         wantedBy = [ "network.target" ];
         unitConfig.X-StopOnReconfiguration = true;
       };
 
-    boot.systemd.services =
+    systemd.services =
       let
 
         networkSetup =
diff --git a/modules/testing/test-instrumentation.nix b/modules/testing/test-instrumentation.nix
index 108dcb0ab6d..9c36ac2bbdd 100644
--- a/modules/testing/test-instrumentation.nix
+++ b/modules/testing/test-instrumentation.nix
@@ -11,7 +11,7 @@ let kernel = config.boot.kernelPackages.kernel; in
 
   config = {
 
-    boot.systemd.services.backdoor =
+    systemd.services.backdoor =
       { wantedBy = [ "multi-user.target" ];
         requires = [ "dev-hvc0.device" "dev-ttyS0.device" ];
         after = [ "dev-hvc0.device" "dev-ttyS0.device" ];
@@ -34,8 +34,8 @@ let kernel = config.boot.kernelPackages.kernel; in
     # Prevent agetty from being instantiated on ttyS0, since it
     # interferes with the backdoor (writes to ttyS0 will randomly fail
     # with EIO).  Likewise for hvc0.
-    boot.systemd.services."serial-getty@ttyS0".enable = false;
-    boot.systemd.services."serial-getty@hvc0".enable = false;
+    systemd.services."serial-getty@ttyS0".enable = false;
+    systemd.services."serial-getty@hvc0".enable = false;
 
     boot.initrd.postDeviceCommands =
       ''
@@ -77,7 +77,7 @@ let kernel = config.boot.kernelPackages.kernel; in
     networking.defaultGateway = mkOverride 150 "";
     networking.nameservers = mkOverride 150 [ ];
 
-    boot.systemd.globalEnvironment.GCOV_PREFIX = "/tmp/xchg/coverage-data";
+    systemd.globalEnvironment.GCOV_PREFIX = "/tmp/xchg/coverage-data";
 
     system.requiredKernelConfig = with config.lib.kernelConfig; [
       (isYes "SERIAL_8250_CONSOLE")
diff --git a/modules/virtualisation/ec2-data.nix b/modules/virtualisation/ec2-data.nix
index 33b8c1e516d..42c50d857e4 100644
--- a/modules/virtualisation/ec2-data.nix
+++ b/modules/virtualisation/ec2-data.nix
@@ -19,7 +19,7 @@ in
 {
   require = [options];
 
-  boot.systemd.services."fetch-ec2-data" =
+  systemd.services."fetch-ec2-data" =
     { description = "Fetch EC2 Data";
 
       wantedBy = [ "multi-user.target" ];
@@ -78,7 +78,7 @@ in
       serviceConfig.RemainAfterExit = true;
     };
 
-  boot.systemd.services."print-host-key" =
+  systemd.services."print-host-key" =
     { description = "Print SSH Host Key";
       wantedBy = [ "multi-user.target" ];
       after = [ "sshd.service" ];
diff --git a/modules/virtualisation/libvirtd.nix b/modules/virtualisation/libvirtd.nix
index 89c4512095d..757a20f6164 100644
--- a/modules/virtualisation/libvirtd.nix
+++ b/modules/virtualisation/libvirtd.nix
@@ -49,7 +49,7 @@ in
 
     boot.kernelModules = [ "tun" ];
 
-    boot.systemd.services.libvirtd =
+    systemd.services.libvirtd =
       { description = "Libvirt Virtual Machine Management Daemon";
 
         wantedBy = [ "multi-user.target" ];
-- 
GitLab


From 4d983d4955fcb6eb6b633b216ee0e29839b3b4a5 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 16 Jan 2013 13:17:57 +0100
Subject: [PATCH 4316/5331] =?UTF-8?q?Rename=20=E2=80=98system.build.system?=
 =?UTF-8?q?d=E2=80=99=20to=20=E2=80=98systemd.package=E2=80=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This makes it cheaper to test a new systemd and is more consistent
with other modules.
---
 modules/services/hardware/udev.nix                |  2 +-
 modules/services/hardware/upower.nix              |  2 +-
 modules/services/misc/nix-gc.nix                  |  2 +-
 modules/services/networking/dhcpcd.nix            |  8 ++++----
 modules/services/networking/networkmanager.nix    |  2 +-
 modules/services/networking/wpa_supplicant.nix    |  2 +-
 modules/services/x11/display-managers/default.nix |  2 +-
 modules/services/x11/display-managers/kdm.nix     |  4 ++--
 modules/services/x11/display-managers/slim.nix    |  4 ++--
 modules/system/activation/top-level.nix           |  4 ++--
 modules/system/boot/kernel.nix                    |  2 +-
 modules/system/boot/stage-1.nix                   |  2 +-
 modules/system/boot/systemd.nix                   | 10 +++++++---
 modules/tasks/kbd.nix                             |  2 +-
 modules/tasks/network-interfaces.nix              |  4 ++--
 15 files changed, 28 insertions(+), 24 deletions(-)

diff --git a/modules/services/hardware/udev.nix b/modules/services/hardware/udev.nix
index d558d2983cf..e1a338d6ad8 100644
--- a/modules/services/hardware/udev.nix
+++ b/modules/services/hardware/udev.nix
@@ -6,7 +6,7 @@ let
 
   inherit (pkgs) stdenv writeText procps;
 
-  udev = config.system.build.systemd;
+  udev = config.systemd.package;
 
   cfg = config.services.udev;
 
diff --git a/modules/services/hardware/upower.nix b/modules/services/hardware/upower.nix
index 54f5d03de39..5d1658adb75 100644
--- a/modules/services/hardware/upower.nix
+++ b/modules/services/hardware/upower.nix
@@ -56,7 +56,7 @@ with pkgs.lib;
     # the daemon.
     powerManagement.resumeCommands =
       ''
-        ${config.system.build.systemd}/bin/systemctl try-restart upower
+        ${config.systemd.package}/bin/systemctl try-restart upower
       '';
 
   };
diff --git a/modules/services/misc/nix-gc.nix b/modules/services/misc/nix-gc.nix
index dc9fa85cf66..28045044601 100644
--- a/modules/services/misc/nix-gc.nix
+++ b/modules/services/misc/nix-gc.nix
@@ -49,7 +49,7 @@ in
   config = {
 
     services.cron.systemCronJobs = mkIf cfg.automatic (singleton
-      "${cfg.dates} root ${config.system.build.systemd}/bin/systemctl start nix-gc.service");
+      "${cfg.dates} root ${config.systemd.package}/bin/systemctl start nix-gc.service");
 
     systemd.services."nix-gc" =
       { description = "Nix Garbage Collector";
diff --git a/modules/services/networking/dhcpcd.nix b/modules/services/networking/dhcpcd.nix
index 533b719a667..342253bac29 100644
--- a/modules/services/networking/dhcpcd.nix
+++ b/modules/services/networking/dhcpcd.nix
@@ -57,13 +57,13 @@ let
           # server hostnames in its config file, then it will never do
           # anything ever again ("couldn't resolve ..., giving up on
           # it"), so we silently lose time synchronisation.
-          ${config.system.build.systemd}/bin/systemctl try-restart ntpd.service
+          ${config.systemd.package}/bin/systemctl try-restart ntpd.service
 
-          ${config.system.build.systemd}/bin/systemctl start ip-up.target
+          ${config.systemd.package}/bin/systemctl start ip-up.target
       fi
 
       #if [ "$reason" = EXPIRE -o "$reason" = RELEASE -o "$reason" = NOCARRIER ] ; then
-      #    ${config.system.build.systemd}/bin/systemctl start ip-down.target
+      #    ${config.systemd.package}/bin/systemctl start ip-down.target
       #fi
     '';
 
@@ -126,7 +126,7 @@ in
     powerManagement.resumeCommands =
       ''
         # Tell dhcpcd to rebind its interfaces if it's running.
-        ${config.system.build.systemd}/bin/systemctl reload dhcpcd.service
+        ${config.systemd.package}/bin/systemctl reload dhcpcd.service
       '';
 
   };
diff --git a/modules/services/networking/networkmanager.nix b/modules/services/networking/networkmanager.nix
index d8198dd0329..0daa945c14a 100644
--- a/modules/services/networking/networkmanager.nix
+++ b/modules/services/networking/networkmanager.nix
@@ -39,7 +39,7 @@ let
   ipUpScript = pkgs.writeScript "01nixos-ip-up" ''
     #!/bin/sh
     if test "$2" = "up"; then
-      ${config.system.build.systemd}/bin/systemctl start ip-up.target
+      ${config.systemd.package}/bin/systemctl start ip-up.target
     fi
   '';
 
diff --git a/modules/services/networking/wpa_supplicant.nix b/modules/services/networking/wpa_supplicant.nix
index 4f8ae55d209..20752cdee25 100644
--- a/modules/services/networking/wpa_supplicant.nix
+++ b/modules/services/networking/wpa_supplicant.nix
@@ -124,7 +124,7 @@ in
 
     powerManagement.resumeCommands =
       ''
-        ${config.system.build.systemd}/bin/systemctl try-restart wpa_supplicant
+        ${config.systemd.package}/bin/systemctl try-restart wpa_supplicant
       '';
 
     assertions = [{ assertion = !cfg.userControlled.enable || cfg.interfaces != [];
diff --git a/modules/services/x11/display-managers/default.nix b/modules/services/x11/display-managers/default.nix
index 396311be49e..1f842c0c953 100644
--- a/modules/services/x11/display-managers/default.nix
+++ b/modules/services/x11/display-managers/default.nix
@@ -36,7 +36,7 @@ let
       # since presumably the desktop environment will handle these.
       if [ -z "$_INHIBITION_LOCK_TAKEN" ]; then
         export _INHIBITION_LOCK_TAKEN=1
-        exec ${config.system.build.systemd}/bin/systemd-inhibit --what=handle-lid-switch:handle-power-key "$0" "$sessionType"
+        exec ${config.systemd.package}/bin/systemd-inhibit --what=handle-lid-switch:handle-power-key "$0" "$sessionType"
       fi
 
       ${optionalString cfg.startOpenSSHAgent ''
diff --git a/modules/services/x11/display-managers/kdm.nix b/modules/services/x11/display-managers/kdm.nix
index 08ae667211d..6a628ec124f 100644
--- a/modules/services/x11/display-managers/kdm.nix
+++ b/modules/services/x11/display-managers/kdm.nix
@@ -12,8 +12,8 @@ let
   defaultConfig =
     ''
       [Shutdown]
-      HaltCmd=${config.system.build.systemd}/sbin/shutdown -h now
-      RebootCmd=${config.system.build.systemd}/sbin/shutdown -r now
+      HaltCmd=${config.systemd.package}/sbin/shutdown -h now
+      RebootCmd=${config.systemd.package}/sbin/shutdown -r now
       ${optionalString (config.system.boot.loader.id == "grub") ''
         BootManager=${if config.boot.loader.grub.version == 2 then "Grub2" else "Grub"}
       ''}
diff --git a/modules/services/x11/display-managers/slim.nix b/modules/services/x11/display-managers/slim.nix
index bc9aef101c7..9e8b9391f45 100644
--- a/modules/services/x11/display-managers/slim.nix
+++ b/modules/services/x11/display-managers/slim.nix
@@ -14,8 +14,8 @@ let
       xserver_arguments ${dmcfg.xserverArgs}
       sessions ${pkgs.lib.concatStringsSep "," (dmcfg.session.names ++ ["custom"])}
       login_cmd exec ${pkgs.stdenv.shell} ${dmcfg.session.script} "%session"
-      halt_cmd ${config.system.build.systemd}/sbin/shutdown -h now
-      reboot_cmd ${config.system.build.systemd}/sbin/shutdown -r now
+      halt_cmd ${config.systemd.package}/sbin/shutdown -h now
+      reboot_cmd ${config.systemd.package}/sbin/shutdown -r now
       ${optionalString (cfg.defaultUser != "") ("default_user " + cfg.defaultUser)}
       ${optionalString cfg.autoLogin "auto_login yes"}
     '';
diff --git a/modules/system/activation/top-level.nix b/modules/system/activation/top-level.nix
index 48c1c0be189..e99b50a0309 100644
--- a/modules/system/activation/top-level.nix
+++ b/modules/system/activation/top-level.nix
@@ -120,7 +120,7 @@ let
 
       echo -n "$kernelParams" > $out/kernel-params
       echo -n "$configurationName" > $out/configuration-name
-      echo -n "systemd ${toString config.system.build.systemd.interfaceVersion}" > $out/init-interface-version
+      echo -n "systemd ${toString config.systemd.package.interfaceVersion}" > $out/init-interface-version
       echo -n "$nixosVersion" > $out/nixos-version
 
       mkdir $out/fine-tune
@@ -149,7 +149,7 @@ let
     buildCommand = systemBuilder;
 
     inherit (pkgs) utillinux;
-    inherit (config.system.build) systemd;
+    systemd = config.systemd.package;
 
     inherit children;
     kernelParams =
diff --git a/modules/system/boot/kernel.nix b/modules/system/boot/kernel.nix
index 4776f4451f0..7744fd94a2c 100644
--- a/modules/system/boot/kernel.nix
+++ b/modules/system/boot/kernel.nix
@@ -224,7 +224,7 @@ in
         serviceConfig =
           { Type = "oneshot";
             RemainAfterExit = true;
-            ExecStart = "${config.system.build.systemd}/lib/systemd/systemd-modules-load";
+            ExecStart = "${config.systemd.package}/lib/systemd/systemd-modules-load";
             # Ignore failed module loads.  Typically some of the
             # modules in ‘boot.kernelModules’ are "nice to have but
             # not required" (e.g. acpi-cpufreq), so we don't want to
diff --git a/modules/system/boot/stage-1.nix b/modules/system/boot/stage-1.nix
index b131867966a..9743703ffbe 100644
--- a/modules/system/boot/stage-1.nix
+++ b/modules/system/boot/stage-1.nix
@@ -9,7 +9,7 @@ with pkgs.lib;
 
 let
 
-  udev = config.system.build.systemd;
+  udev = config.systemd.package;
 
   options = {
 
diff --git a/modules/system/boot/systemd.nix b/modules/system/boot/systemd.nix
index 80957cd1193..b7636702120 100644
--- a/modules/system/boot/systemd.nix
+++ b/modules/system/boot/systemd.nix
@@ -8,7 +8,7 @@ let
 
   cfg = config.systemd;
 
-  systemd = pkgs.systemd;
+  systemd = cfg.package;
 
   makeUnit = name: unit:
     pkgs.runCommand "unit" { inherit (unit) text; }
@@ -340,6 +340,12 @@ in
 
   options = {
 
+    systemd.package = mkOption {
+      default = pkgs.systemd;
+      type = types.package;
+      description = "The systemd package.";
+    };
+
     systemd.units = mkOption {
       description = "Definition of systemd units.";
       default = {};
@@ -457,8 +463,6 @@ in
 
   config = {
 
-    system.build.systemd = systemd;
-
     system.build.units = units;
 
     environment.systemPackages = [ systemd ];
diff --git a/modules/tasks/kbd.nix b/modules/tasks/kbd.nix
index b0e222cd05e..e4d22e94c80 100644
--- a/modules/tasks/kbd.nix
+++ b/modules/tasks/kbd.nix
@@ -85,7 +85,7 @@ in
         serviceConfig =
           { Type = "oneshot";
             RemainAfterExit = true;
-            ExecStart = "${config.system.build.systemd}/lib/systemd/systemd-vconsole-setup /dev/tty1";
+            ExecStart = "${config.systemd.package}/lib/systemd/systemd-vconsole-setup /dev/tty1";
           };
         restartTriggers = [ vconsoleConf ];
       };
diff --git a/modules/tasks/network-interfaces.nix b/modules/tasks/network-interfaces.nix
index e8097e418c8..49dd47251e5 100644
--- a/modules/tasks/network-interfaces.nix
+++ b/modules/tasks/network-interfaces.nix
@@ -350,11 +350,11 @@ in
                     ip -4 addr add "${i.ipAddress}/${mask}" dev "${i.name}"
                     # Ensure that the default gateway remains set.
                     # (Flushing this interface may have removed it.)
-                    ${config.system.build.systemd}/bin/systemctl try-restart --no-block network-setup.service
+                    ${config.systemd.package}/bin/systemctl try-restart --no-block network-setup.service
                   else
                     echo "skipping configuring interface"
                   fi
-                  ${config.system.build.systemd}/bin/systemctl start ip-up.target
+                  ${config.systemd.package}/bin/systemctl start ip-up.target
                 ''
               + optionalString i.proxyARP
                 ''
-- 
GitLab


From ea358b4eae2509722b849c054fdff69cc31ac8c7 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 16 Jan 2013 13:21:59 +0100
Subject: [PATCH 4317/5331] =?UTF-8?q?nixos-rebuild:=20Use=20=E2=80=98[=20.?=
 =?UTF-8?q?..=20]=E2=80=99=20instead=20of=20=E2=80=98test=E2=80=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 modules/installer/tools/nixos-rebuild.sh | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/modules/installer/tools/nixos-rebuild.sh b/modules/installer/tools/nixos-rebuild.sh
index 66acf908710..0b149610e32 100644
--- a/modules/installer/tools/nixos-rebuild.sh
+++ b/modules/installer/tools/nixos-rebuild.sh
@@ -50,7 +50,7 @@ buildNix=1
 rollback=
 upgrade=
 
-while test "$#" -gt 0; do
+while [ "$#" -gt 0 ]; do
     i="$1"; shift 1
     case "$i" in
       --help)
@@ -94,13 +94,13 @@ while test "$#" -gt 0; do
     esac
 done
 
-if test -z "$action"; then showSyntax; fi
+if [ -z "$action" ]; then showSyntax; fi
 
-if test "$action" = dry-run; then
+if [ "$action" = dry-run ]; then
     extraBuildFlags+=(--dry-run)
 fi
 
-if test -n "$rollback"; then
+if [ -n "$rollback" ]; then
     buildNix=
 fi
 
@@ -143,12 +143,12 @@ fi
 # Either upgrade the configuration in the system profile (for "switch"
 # or "boot"), or just build it and create a symlink "result" in the
 # current directory (for "build" and "test").
-if test -z "$rollback"; then
+if [ -z "$rollback" ]; then
     echo "building the system configuration..." >&2
-    if test "$action" = switch -o "$action" = boot; then
+    if [ "$action" = switch -o "$action" = boot ]; then
         nix-env "${extraBuildFlags[@]}" -p /nix/var/nix/profiles/system -f '<nixos>' --set -A system
         pathToConfig=/nix/var/nix/profiles/system
-    elif test "$action" = test -o "$action" = build -o "$action" = dry-run; then
+    elif [ "$action" = test -o "$action" = build -o "$action" = dry-run ]; then
         nix-build '<nixos>' -A system -K -k "${extraBuildFlags[@]}" > /dev/null
         pathToConfig=./result
     elif [ "$action" = build-vm ]; then
@@ -160,11 +160,11 @@ if test -z "$rollback"; then
     else
         showSyntax
     fi
-else # test -n "$rollback"
-    if test "$action" = switch -o "$action" = boot; then
+else # [ -n "$rollback" ]
+    if [ "$action" = switch -o "$action" = boot ]; then
         nix-env --rollback -p /nix/var/nix/profiles/system
         pathToConfig=/nix/var/nix/profiles/system
-    elif test "$action" = test -o "$action" = build; then
+    elif [ "$action" = test -o "$action" = build ]; then
         systemNumber=$(
             nix-env -p /nix/var/nix/profiles/system --list-generations |
             sed -n '/current/ {g; p;}; s/ *\([0-9]*\).*/\1/; h'
@@ -179,7 +179,7 @@ fi
 
 # If we're not just building, then make the new configuration the boot
 # default and/or activate it now.
-if test "$action" = switch -o "$action" = boot -o "$action" = test; then
+if [ "$action" = switch -o "$action" = boot -o "$action" = test ]; then
     # Just in case the new configuration hangs the system, do a sync now.
     sync
 
@@ -187,7 +187,7 @@ if test "$action" = switch -o "$action" = boot -o "$action" = test; then
 fi
 
 
-if test "$action" = build-vm; then
+if [ "$action" = build-vm ]; then
     cat >&2 <<EOF
 
 Done.  The virtual machine can be started by running $(echo $pathToConfig/bin/run-*-vm).
-- 
GitLab


From b35fe01f025fdbc0c0ca9352583b685ead6e3b10 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 16 Jan 2013 14:40:41 +0100
Subject: [PATCH 4318/5331] Set the NixOS version to something useful when
 building from Git

---
 modules/installer/tools/nixos-rebuild.sh | 10 ++++++++++
 modules/misc/version.nix                 | 17 ++++++++++++-----
 release.nix                              |  4 ++--
 3 files changed, 24 insertions(+), 7 deletions(-)

diff --git a/modules/installer/tools/nixos-rebuild.sh b/modules/installer/tools/nixos-rebuild.sh
index 0b149610e32..28a1d228293 100644
--- a/modules/installer/tools/nixos-rebuild.sh
+++ b/modules/installer/tools/nixos-rebuild.sh
@@ -140,6 +140,16 @@ if [ -n "$buildNix" ]; then
 fi
 
 
+# Update the version suffix if we're building from Git (so that
+# nixos-version shows something useful).
+if nixos=$(nix-instantiate --find-file nixos "${extraBuildFlags[@]}"); then
+    suffix=$($SHELL $nixos/modules/installer/tools/get-version-suffix "${extraBuildFlags[@]}")
+    if [ -n "$suffix" ]; then
+        echo -n "$suffix" > "$nixos/.version-suffix"
+    fi
+fi
+
+
 # Either upgrade the configuration in the system profile (for "switch"
 # or "boot"), or just build it and create a symlink "result" in the
 # current directory (for "build" and "test").
diff --git a/modules/misc/version.nix b/modules/misc/version.nix
index 319cdcb5f98..23e96171d1f 100644
--- a/modules/misc/version.nix
+++ b/modules/misc/version.nix
@@ -5,18 +5,25 @@ with pkgs.lib;
 {
 
   options = {
-  
+
     system.nixosVersion = mkOption {
-      default =
-        builtins.readFile ../../.version
-        + (if builtins.pathExists ../../.version-suffix then builtins.readFile ../../.version-suffix else "pre-git");
       description = "NixOS version.";
     };
 
+    system.nixosVersionSuffix = mkOption {
+      description = "NixOS version suffix.";
+    };
+
   };
 
   config = {
 
+    system.nixosVersion =
+      builtins.readFile ../../.version + config.system.nixosVersionSuffix;
+
+    system.nixosVersionSuffix =
+      if builtins.pathExists ../../.version-suffix then builtins.readFile ../../.version-suffix else "pre-git";
+
     # Generate /etc/os-release.  See
     # http://0pointer.de/public/systemd-man/os-release.html for the
     # format.
@@ -32,7 +39,7 @@ with pkgs.lib;
           '';
         target = "os-release";
       };
-  
+
   };
 
 }
diff --git a/release.nix b/release.nix
index 4c29fce29f2..6caf3b385b1 100644
--- a/release.nix
+++ b/release.nix
@@ -20,7 +20,7 @@ let
     let
 
       versionModule =
-        { system.nixosVersion = version + (lib.optionalString (!officialRelease) versionSuffix);
+        { system.nixosVersionSuffix = lib.optionalString (!officialRelease) versionSuffix;
           isoImage.isoBaseName = "nixos-${type}";
         };
 
@@ -55,7 +55,7 @@ let
 
     with import <nixpkgs> {inherit system;};
     let
-      versionModule = { system.nixosVersion = version + (lib.optionalString (!officialRelease) versionSuffix); };
+      versionModule = { system.nixosVersionSuffix = lib.optionalString (!officialRelease) versionSuffix; };
 
       config = (import lib/eval-config.nix {
         inherit system;
-- 
GitLab


From f2908085099a1ce529843982bfe8cc3d3fd375d6 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 16 Jan 2013 15:03:54 +0100
Subject: [PATCH 4319/5331] Set some missing types

---
 modules/misc/version.nix | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/modules/misc/version.nix b/modules/misc/version.nix
index 23e96171d1f..aa9557d9421 100644
--- a/modules/misc/version.nix
+++ b/modules/misc/version.nix
@@ -7,10 +7,12 @@ with pkgs.lib;
   options = {
 
     system.nixosVersion = mkOption {
+      type = types.uniq types.string;
       description = "NixOS version.";
     };
 
     system.nixosVersionSuffix = mkOption {
+      type = types.uniq types.string;
       description = "NixOS version suffix.";
     };
 
@@ -19,10 +21,10 @@ with pkgs.lib;
   config = {
 
     system.nixosVersion =
-      builtins.readFile ../../.version + config.system.nixosVersionSuffix;
+      mkDefault (builtins.readFile ../../.version + config.system.nixosVersionSuffix);
 
     system.nixosVersionSuffix =
-      if builtins.pathExists ../../.version-suffix then builtins.readFile ../../.version-suffix else "pre-git";
+      mkDefault (if builtins.pathExists ../../.version-suffix then builtins.readFile ../../.version-suffix else "pre-git");
 
     # Generate /etc/os-release.  See
     # http://0pointer.de/public/systemd-man/os-release.html for the
-- 
GitLab


From e65a49f00f0b5da866e326e090cb5b9ff48bec6b Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 16 Jan 2013 16:06:50 +0100
Subject: [PATCH 4320/5331] Add missing file

---
 modules/installer/tools/get-version-suffix | 29 ++++++++++++++++++++++
 1 file changed, 29 insertions(+)
 create mode 100644 modules/installer/tools/get-version-suffix

diff --git a/modules/installer/tools/get-version-suffix b/modules/installer/tools/get-version-suffix
new file mode 100644
index 00000000000..76cec8d5dae
--- /dev/null
+++ b/modules/installer/tools/get-version-suffix
@@ -0,0 +1,29 @@
+getVersion() {
+    local dir="$1"
+    rev=
+    if [ -e "$dir/.git" ]; then
+        if [ -z "$(type -P git)" ]; then
+            echo "warning: Git not found; cannot figure out revision of $dir" >&2
+            return
+        fi
+        cd "$dir"
+        rev=$(git rev-parse --short HEAD)
+        if git describe --always --dirty | grep -q dirty; then
+            rev+=M
+        fi
+    fi
+}
+
+if nixos=$(nix-instantiate --find-file nixos "$@"); then
+    getVersion $nixos
+    if [ -n "$rev" ]; then
+        suffix="pre-$rev"
+        if nixpkgs=$(nix-instantiate --find-file nixpkgs "$@"); then
+            getVersion $nixpkgs
+            if [ -n "$rev" ]; then
+                suffix+="-$rev"
+            fi
+        fi
+        echo $suffix
+    fi
+fi
-- 
GitLab


From 6e7b0a0c0e44256ddc28476d926a638947339daf Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 16 Jan 2013 16:11:51 +0100
Subject: [PATCH 4321/5331] =?UTF-8?q?Fix=20=E2=80=98nixos-rebuikd=20dry-ru?=
 =?UTF-8?q?n=E2=80=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 modules/installer/tools/nixos-rebuild.sh | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/modules/installer/tools/nixos-rebuild.sh b/modules/installer/tools/nixos-rebuild.sh
index 28a1d228293..b9272f31ac6 100644
--- a/modules/installer/tools/nixos-rebuild.sh
+++ b/modules/installer/tools/nixos-rebuild.sh
@@ -96,10 +96,6 @@ done
 
 if [ -z "$action" ]; then showSyntax; fi
 
-if [ "$action" = dry-run ]; then
-    extraBuildFlags+=(--dry-run)
-fi
-
 if [ -n "$rollback" ]; then
     buildNix=
 fi
@@ -129,7 +125,7 @@ fi
 # First build Nix, since NixOS may require a newer version than the
 # current one.  Of course, the same goes for Nixpkgs, but Nixpkgs is
 # more conservative.
-if [ -n "$buildNix" ]; then
+if [ "$action" != dry-run -a -n "$buildNix" ]; then
     echo "building Nix..." >&2
     if ! nix-build '<nixos>' -A config.environment.nix -o $tmpDir/nix "${extraBuildFlags[@]}" > /dev/null; then
         if ! nix-build '<nixos>' -A nixFallback -o $tmpDir/nix "${extraBuildFlags[@]}" > /dev/null; then
@@ -150,6 +146,11 @@ if nixos=$(nix-instantiate --find-file nixos "${extraBuildFlags[@]}"); then
 fi
 
 
+if [ "$action" = dry-run ]; then
+    extraBuildFlags+=(--dry-run)
+fi
+
+
 # Either upgrade the configuration in the system profile (for "switch"
 # or "boot"), or just build it and create a symlink "result" in the
 # current directory (for "build" and "test").
-- 
GitLab


From e89afd7d892fa1b8cff57f1045e27b25366f7475 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Wed, 16 Jan 2013 10:12:15 -0500
Subject: [PATCH 4322/5331] Ignore .version-suffix file created by
 nixos-rebuild

---
 .gitignore | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitignore b/.gitignore
index b25c15b81fa..e75fb319980 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 *~
+.version-suffix
-- 
GitLab


From ab29ea3c3741c51f53ca6447581a6a157abb654f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Carles=20Pag=C3=A8s?= <page@cubata.homelinux.net>
Date: Wed, 16 Jan 2013 22:49:21 +0100
Subject: [PATCH 4323/5331] Support driSupport32Bit for nvidia legacy 304.

I need this for steam to work with some older cards.
---
 modules/services/x11/xserver.nix | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/modules/services/x11/xserver.nix b/modules/services/x11/xserver.nix
index 421f80c42bb..7c9f7552d9c 100644
--- a/modules/services/x11/xserver.nix
+++ b/modules/services/x11/xserver.nix
@@ -435,7 +435,11 @@ in
               else if elem "nvidiaLegacy173" driverNames then
                 "ln -sf ${kernelPackages.nvidia_x11_legacy173} /run/opengl-driver"
               else if elem "nvidiaLegacy304" driverNames then
-                "ln -sf ${kernelPackages.nvidia_x11_legacy304} /run/opengl-driver"
+                ''
+                  ln -sf ${kernelPackages.nvidia_x11_legacy304} /run/opengl-driver
+                  ${optionalString (pkgs.stdenv.system == "x86_64-linux" && cfg.driSupport32Bit)
+                    "ln -sf ${pkgs_i686.linuxPackages.nvidia_x11_legacy304.override { libsOnly = true; kernel = null; } } /run/opengl-driver-32"}
+                ''
               else if elem "ati_unfree" driverNames then
                 "ln -sf ${kernelPackages.ati_drivers_x11} /run/opengl-driver"
               else if cfg.driSupport then
-- 
GitLab


From c6bb091b5bb6989a117149d8d4bfdc533b5cc82c Mon Sep 17 00:00:00 2001
From: Rickard Nilsson <rickynils@gmail.com>
Date: Thu, 3 Jan 2013 18:55:56 +0100
Subject: [PATCH 4324/5331] Rewrite NetworkManager job to systemd service

---
 .../services/networking/networkmanager.nix    | 52 ++++++++++++-------
 1 file changed, 32 insertions(+), 20 deletions(-)

diff --git a/modules/services/networking/networkmanager.nix b/modules/services/networking/networkmanager.nix
index 0daa945c14a..bd5ec4bd8f7 100644
--- a/modules/services/networking/networkmanager.nix
+++ b/modules/services/networking/networkmanager.nix
@@ -1,13 +1,14 @@
 { config, pkgs, ... }:
 
 with pkgs.lib;
+with pkgs;
 
 let
   cfg = config.networking.networkmanager;
 
   stateDirs = "/var/lib/NetworkManager /var/lib/dhclient";
 
-  configFile = pkgs.writeText "NetworkManager.conf" ''
+  configFile = writeText "NetworkManager.conf" ''
     [main]
     plugins=keyfile
 
@@ -36,7 +37,7 @@ let
     ResultActive=yes
   '';
 
-  ipUpScript = pkgs.writeScript "01nixos-ip-up" ''
+  ipUpScript = writeScript "01nixos-ip-up" ''
     #!/bin/sh
     if test "$2" = "up"; then
       ${config.systemd.package}/bin/systemctl start ip-up.target
@@ -67,7 +68,7 @@ in {
         Extra packages that provide NetworkManager plugins.
       '';
       merge = mergeListOption;
-      apply = list: [ pkgs.networkmanager pkgs.modemmanager ] ++ list;
+      apply = list: [ networkmanager modemmanager wpa_supplicant ] ++ list;
     };
   };
 
@@ -76,10 +77,14 @@ in {
 
   config = mkIf cfg.enable {
 
-    environment.etc = singleton {
-      source = ipUpScript;
-      target = "NetworkManager/dispatcher.d/01nixos-ip-up";
-    };
+    environment.etc = [
+      { source = ipUpScript;
+        target = "NetworkManager/dispatcher.d/01nixos-ip-up";
+      }
+      { source = configFile;
+        target = "NetworkManager/NetworkManager.conf";
+      }
+    ];
 
     environment.systemPackages = cfg.packages;
 
@@ -88,24 +93,31 @@ in {
       gid = config.ids.gids.networkmanager;
     };
 
-    jobs.networkmanager = {
-      startOn = "started network-interfaces";
-      stopOn = "stopping network-interfaces";
-
-      path = [ pkgs.networkmanager ];
-
-      preStart = ''
-        mkdir -m 755 -p /etc/NetworkManager
+    systemd.packages = cfg.packages;
+
+    # Create an initialisation service that both starts
+    # NetworkManager when network.target is reached,
+    # and sets up necessary directories for NM.
+    systemd.services."NetworkManager-init" = {
+      description = "NetworkManager initialisation";
+      wantedBy = [ "network.target" ];
+      partOf = [ "NetworkManager.service" ];
+      wants = [ "NetworkManager.service" ];
+      before = [ "NetworkManager.service" ];
+      script = ''
         mkdir -m 700 -p /etc/NetworkManager/system-connections
         mkdir -m 755 -p ${stateDirs}
       '';
-
-       exec = "NetworkManager --config=${configFile} --no-daemon";
+      serviceConfig = {
+        Type = "oneshot";
+      };
     };
 
-    networking.useDHCP = false;
-
-    networking.wireless.enable = true;
+    # Turn off NixOS' network management
+    networking = {
+      useDHCP = false;
+      wireless.enable = false;
+    };
 
     security.polkit.permissions = polkitConf;
 
-- 
GitLab


From 1440e92ae8f7a7c3654307bcbf19ddf4c7f51f40 Mon Sep 17 00:00:00 2001
From: Rickard Nilsson <rickynils@gmail.com>
Date: Thu, 17 Jan 2013 13:37:54 +0100
Subject: [PATCH 4325/5331] Rename NetworkManager-init service to
 networkmanager-init

---
 modules/services/networking/networkmanager.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/services/networking/networkmanager.nix b/modules/services/networking/networkmanager.nix
index bd5ec4bd8f7..74d9992f770 100644
--- a/modules/services/networking/networkmanager.nix
+++ b/modules/services/networking/networkmanager.nix
@@ -98,7 +98,7 @@ in {
     # Create an initialisation service that both starts
     # NetworkManager when network.target is reached,
     # and sets up necessary directories for NM.
-    systemd.services."NetworkManager-init" = {
+    systemd.services."networkmanager-init" = {
       description = "NetworkManager initialisation";
       wantedBy = [ "network.target" ];
       partOf = [ "NetworkManager.service" ];
-- 
GitLab


From c30b65df4b3763a23616d59ffea6c8674b9ab9b3 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sat, 19 Jan 2013 15:57:10 +0100
Subject: [PATCH 4326/5331] Set the versionSuffix on tarballs/channel properly

---
 release.nix | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/release.nix b/release.nix
index b32ce233ec0..bd740af1c42 100644
--- a/release.nix
+++ b/release.nix
@@ -86,7 +86,8 @@ let
 
         src = nixosSrc;
 
-        inherit officialRelease version versionSuffix;
+        inherit officialRelease version;
+        versionSuffix = lib.optionalString (!officialRelease) versionSuffix;
 
         distPhase = ''
           echo -n $VERSION_SUFFIX > .version-suffix
@@ -111,7 +112,8 @@ let
 
         src = nixosSrc;
 
-        inherit officialRelease version versionSuffix;
+        inherit officialRelease version;
+        versionSuffix = lib.optionalString (!officialRelease) versionSuffix;
 
         buildInputs = [ nixUnstable ];
 
-- 
GitLab


From f2c2b7ace9afebbf85fbd7b4dc99c924c97e1041 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 21 Jan 2013 21:01:48 +0100
Subject: [PATCH 4327/5331] Don't start emergency mode on EC2 instances

EC2 instances don't have a console, so it's pointless to start
emergency mode if a mount fails.  (This happened to me with an
encrypted filesystem where the key wasn't sent on time using "charon
send-keys".)  Better to cross fingers and continue booting.
---
 modules/profiles/headless.nix   |  3 +++
 modules/system/boot/systemd.nix | 22 +++++++++++++++++++---
 2 files changed, 22 insertions(+), 3 deletions(-)

diff --git a/modules/profiles/headless.nix b/modules/profiles/headless.nix
index 0a2bfa80c47..9693e36d9eb 100644
--- a/modules/profiles/headless.nix
+++ b/modules/profiles/headless.nix
@@ -17,4 +17,7 @@ with pkgs.lib;
 
   # Since we can't manually respond to a panic, just reboot.
   boot.kernelParams = [ "panic=1" "boot.panic_on_fail" ];
+
+  # Don't allow emergency mode, because we don't have a console.
+  systemd.enableEmergencyMode = false;
 }
diff --git a/modules/system/boot/systemd.nix b/modules/system/boot/systemd.nix
index b7636702120..d3340988092 100644
--- a/modules/system/boot/systemd.nix
+++ b/modules/system/boot/systemd.nix
@@ -36,11 +36,9 @@ let
       #"cryptsetup.target"
       "sigpwr.target"
 
-      # Rescue/emergency.
+      # Rescue mode.
       "rescue.target"
       "rescue.service"
-      "emergency.target"
-      "emergency.service"
 
       # Udev.
       "systemd-udevd-control.socket"
@@ -133,6 +131,11 @@ let
       "systemd-ask-password-console.service"
       "systemd-ask-password-wall.path"
       "systemd-ask-password-wall.service"
+    ]
+
+    ++ optionals cfg.enableEmergencyMode [
+      "emergency.target"
+      "emergency.service"
     ];
 
   upstreamWants =
@@ -456,6 +459,19 @@ in
       '';
     };
 
+    systemd.enableEmergencyMode = mkOption {
+      default = true;
+      type = types.bool;
+      description = ''
+        Whether to enable emergency mode, which is an
+        <command>sulogin</command> shell started on the console if
+        mounting a filesystem fails.  Since some machines (like EC2
+        instances) have no console of any kind, emergency mode doesn't
+        make sense, and it's better to continue with the boot insofar
+        as possible.
+      '';
+    };
+
   };
 
 
-- 
GitLab


From 7ecde297c9a7760f3fd3aec58ce52ece47cc8b38 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 21 Jan 2013 23:49:55 +0100
Subject: [PATCH 4328/5331] Fix building the manual

---
 release.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/release.nix b/release.nix
index 2a78031f9a9..b66c07a037b 100644
--- a/release.nix
+++ b/release.nix
@@ -142,7 +142,10 @@ let
         pkgs = import <nixpkgs> {};
         options =
           (import lib/eval-config.nix {
-            modules = [ { fileSystems = []; } ];
+            modules = [
+              { fileSystems = [];
+                boot.loader.grub.device = "/dev/sda";
+              } ];
           }).options;
         revision = toString nixosSrc.rev;
       }).manual;
-- 
GitLab


From 82fb34f4091192b2f1119a9ff79380b8abf8f095 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Mon, 21 Jan 2013 18:14:09 -0500
Subject: [PATCH 4329/5331] Upstart -> systemd

---
 modules/system/boot/stage-2.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/system/boot/stage-2.nix b/modules/system/boot/stage-2.nix
index c8ea322eb17..e357cab5898 100644
--- a/modules/system/boot/stage-2.nix
+++ b/modules/system/boot/stage-2.nix
@@ -13,7 +13,7 @@ let
         example = "rm -f /var/log/messages";
         type = types.string;
         description = ''
-          Shell commands to be executed just before Upstart is started.
+          Shell commands to be executed just before systemd is started.
         '';
       };
 
-- 
GitLab


From d75fa1fdc13ea4632d036aab9a3cae4b829cced7 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 22 Jan 2013 12:32:19 +0100
Subject: [PATCH 4330/5331] wpa_supplicant: Use the nl80211 and wext drivers by
 default

This should make wpa_supplicant work out of the box on newer and older
kernels.
---
 modules/services/networking/wpa_supplicant.nix | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/modules/services/networking/wpa_supplicant.nix b/modules/services/networking/wpa_supplicant.nix
index 20752cdee25..697e54f91d3 100644
--- a/modules/services/networking/wpa_supplicant.nix
+++ b/modules/services/networking/wpa_supplicant.nix
@@ -51,8 +51,7 @@ in
       };
 
       driver = mkOption {
-        default = "";
-        example = "nl80211";
+        default = "nl80211,wext";
         description = "Force a specific wpa_supplicant driver.";
       };
 
@@ -118,7 +117,7 @@ in
             '' else ''
               ifaces="${concatStringsSep " -N " (map (i: "-i${i}") ifaces)}"
             ''}
-            exec wpa_supplicant -s -u ${optionalString (cfg.driver != "") "-D${cfg.driver}"} -c ${configFile} $ifaces
+            exec wpa_supplicant -s -u -D${cfg.driver} -c ${configFile} $ifaces -dd
           '';
       };
 
-- 
GitLab


From dd760bac9c0337a747ed6a6fcdf95e689818deb6 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 22 Jan 2013 12:52:13 +0100
Subject: [PATCH 4331/5331] Fix help message

---
 modules/profiles/installation-device.nix | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/modules/profiles/installation-device.nix b/modules/profiles/installation-device.nix
index 83416f49d88..2ed5a63887f 100644
--- a/modules/profiles/installation-device.nix
+++ b/modules/profiles/installation-device.nix
@@ -117,10 +117,8 @@ in
       ''
 
         Log in as "root" with an empty password.  ${
-          if config.services.xserver.enable then
-            "Type `start xserver' to start\nthe graphical user interface."
-          else ""
-        }
+          optionalString config.services.xserver.enable
+            "Type `start display-manager' to\nstart the graphical user interface."}
       '';
 
     # Allow sshd to be started manually through "start sshd".  It should
-- 
GitLab


From 40686485631e99788fc2d114e6145fb6ca34a409 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 22 Jan 2013 13:30:45 +0100
Subject: [PATCH 4332/5331] Blacklist the cirrusfb kernel module

---
 modules/system/boot/modprobe.nix | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/modules/system/boot/modprobe.nix b/modules/system/boot/modprobe.nix
index 141be71b920..7babb70eccb 100644
--- a/modules/system/boot/modprobe.nix
+++ b/modules/system/boot/modprobe.nix
@@ -89,9 +89,10 @@ with pkgs.lib;
         # on modern machines.
         "snd_pcsp"
 
-        # !!! Hm, Ubuntu blacklists all framebuffer devices because
-        # they're "buggy" and cause suspend problems.  Maybe we should
-        # too?
+        # The cirrusfb module prevents X11 from starting.  FIXME:
+        # Ubuntu blacklists all framebuffer devices because they're
+        # "buggy" and cause suspend problems.  Maybe we should too?
+        "cirrusfb"
       ];
 
     system.activationScripts.modprobe =
-- 
GitLab


From fc14a31f2c8f11f2af0e8cddbae2edce4ce94eee Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 22 Jan 2013 13:31:08 +0100
Subject: [PATCH 4333/5331] unionfs: Increase the open file limit

The default (1024) is way too low, e.g. to start KDE on the
installation CD.
---
 modules/installer/cd-dvd/iso-image.nix  | 4 ++--
 modules/virtualisation/amazon-image.nix | 2 +-
 modules/virtualisation/nova-image.nix   | 2 +-
 modules/virtualisation/qemu-vm.nix      | 4 ++--
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/modules/installer/cd-dvd/iso-image.nix b/modules/installer/cd-dvd/iso-image.nix
index 33000a3fbf1..27e731d61e8 100644
--- a/modules/installer/cd-dvd/iso-image.nix
+++ b/modules/installer/cd-dvd/iso-image.nix
@@ -208,14 +208,14 @@ in
       mkdir /unionfs-chroot/rw-root
       mount -t tmpfs -o "mode=755" none /unionfs-chroot/rw-root
       mkdir /mnt-root-union
-      unionfs -o allow_other,cow,chroot=/unionfs-chroot /rw-root=RW:/ro-root=RO /mnt-root-union
+      unionfs -o allow_other,cow,chroot=/unionfs-chroot,max_files=32768 /rw-root=RW:/ro-root=RO /mnt-root-union
       oldTargetRoot=$targetRoot
       targetRoot=/mnt-root-union
 
       mkdir /unionfs-chroot/rw-store
       mount -t tmpfs -o "mode=755" none /unionfs-chroot/rw-store
       mkdir -p $oldTargetRoot/nix/store
-      unionfs -o allow_other,cow,nonempty,chroot=/unionfs-chroot /rw-store=RW:/ro-root/nix/store=RO /mnt-root-union/nix/store
+      unionfs -o allow_other,cow,nonempty,chroot=/unionfs-chroot,max_files=32768 /rw-store=RW:/ro-root/nix/store=RO /mnt-root-union/nix/store
     '';
 
   # Closures to be copied to the Nix store on the CD, namely the init
diff --git a/modules/virtualisation/amazon-image.nix b/modules/virtualisation/amazon-image.nix
index 38885d12b35..aa0a97d3aa0 100644
--- a/modules/virtualisation/amazon-image.nix
+++ b/modules/virtualisation/amazon-image.nix
@@ -132,7 +132,7 @@ with pkgs.lib;
               mkdir -p /unionfs-chroot/rw-nix
               mount --rbind $targetRoot/$diskForUnionfs/root/nix /unionfs-chroot/rw-nix
 
-              unionfs -o allow_other,cow,nonempty,chroot=/unionfs-chroot /rw-nix=RW:/ro-nix=RO $targetRoot/nix
+              unionfs -o allow_other,cow,nonempty,chroot=/unionfs-chroot,max_files=32768 /rw-nix=RW:/ro-nix=RO $targetRoot/nix
           fi
       fi
     '';
diff --git a/modules/virtualisation/nova-image.nix b/modules/virtualisation/nova-image.nix
index 0ce5d218cdb..cc012ffc8a3 100644
--- a/modules/virtualisation/nova-image.nix
+++ b/modules/virtualisation/nova-image.nix
@@ -98,7 +98,7 @@ with pkgs.lib;
       mkdir -p /unionfs-chroot/rw-nix
       mkdir -m 755 -p $targetRoot/ephemeral0/nix
       mount --rbind $targetRoot/ephemeral0/nix /unionfs-chroot/rw-nix
-      unionfs -o allow_other,cow,nonempty,chroot=/unionfs-chroot /rw-nix=RW:/ro-nix=RO $targetRoot/nix
+      unionfs -o allow_other,cow,nonempty,chroot=/unionfs-chroot,max_files=32768 /rw-nix=RW:/ro-nix=RO $targetRoot/nix
     '';
 
     boot.initrd.supportedFilesystems = [ "unionfs-fuse" ];
diff --git a/modules/virtualisation/qemu-vm.nix b/modules/virtualisation/qemu-vm.nix
index b35b311819a..9d9581b96c6 100644
--- a/modules/virtualisation/qemu-vm.nix
+++ b/modules/virtualisation/qemu-vm.nix
@@ -281,7 +281,7 @@ in
       # Mark this as a NixOS machinex.
       mkdir -p $targetRoot/etc
       echo -n > $targetRoot/etc/NIXOS
-    
+
       # Fix the permissions on /tmp.
       chmod 1777 $targetRoot/tmp
 
@@ -293,7 +293,7 @@ in
 
         mkdir /unionfs-chroot/rw-store
         mount -t tmpfs -o "mode=755" none /unionfs-chroot/rw-store
-        unionfs -o allow_other,cow,nonempty,chroot=/unionfs-chroot /rw-store=RW:/ro-store=RO $targetRoot/nix/store
+        unionfs -o allow_other,cow,nonempty,chroot=/unionfs-chroot,max_files=32768 /rw-store=RW:/ro-store=RO $targetRoot/nix/store
       ''}
     '';
 
-- 
GitLab


From f30842db06394a5eec5ccb800e5d9fa4a306905a Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 22 Jan 2013 13:32:05 +0100
Subject: [PATCH 4334/5331] Git shortrevs are 7 characters

---
 release.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/release.nix b/release.nix
index b66c07a037b..97e2bec823f 100644
--- a/release.nix
+++ b/release.nix
@@ -1,5 +1,5 @@
-{ nixosSrc ? {outPath = ./.; revCount = 1234; shortRev = "abcdef"; }
-, nixpkgs ? {outPath = <nixpkgs>; revCount = 5678; shortRev = "fedcba"; }
+{ nixosSrc ? {outPath = ./.; revCount = 1234; shortRev = "abcdefg"; }
+, nixpkgs ? {outPath = <nixpkgs>; revCount = 5678; shortRev = "gfedcba"; }
 #, minimal ? false
 }:
 
-- 
GitLab


From 64ffca1e069656f4dee31326520acc5a64dd270b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= <viric@viric.name>
Date: Tue, 18 Dec 2012 10:00:12 +0100
Subject: [PATCH 4335/5331] Fixing the description of memtest86. It's not
 memtest86+.

Noticed by abogani@freenode
---
 modules/system/boot/loader/grub/memtest.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/system/boot/loader/grub/memtest.nix b/modules/system/boot/loader/grub/memtest.nix
index b18ff0512f2..a12bb861899 100644
--- a/modules/system/boot/loader/grub/memtest.nix
+++ b/modules/system/boot/loader/grub/memtest.nix
@@ -13,7 +13,7 @@ in
       default = false;
       type = types.bool;
       description = ''
-        Add a menu entry in grub for memtest86+
+        Add a menu entry in grub for memtest86
       '';
     };
   };
-- 
GitLab


From ca4f93d3ae6cda9ae23e53334af67029fcb48e54 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 22 Jan 2013 16:26:51 +0100
Subject: [PATCH 4336/5331] stage-1: Don't create a log file in $out

---
 modules/system/boot/stage-1.nix | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/modules/system/boot/stage-1.nix b/modules/system/boot/stage-1.nix
index 9743703ffbe..942a5271484 100644
--- a/modules/system/boot/stage-1.nix
+++ b/modules/system/boot/stage-1.nix
@@ -152,8 +152,7 @@ let
       doublePatchelf = (pkgs.stdenv.system == "armv5tel-linux");
     }
     ''
-      ensureDir $out/bin
-      ensureDir $out/lib
+      mkdir -p $out/bin $out/lib
 
       # Copy what we need from Glibc.
       cp -pv ${pkgs.glibc}/lib/ld*.so.? $out/lib
@@ -228,8 +227,8 @@ let
       export LD_LIBRARY_PATH=$out/lib
       $out/bin/mount --help 2>&1 | grep "BusyBox"
       $out/bin/udevadm --version
-      $out/bin/dmsetup --version 2>&1 | tee -a $out/log | grep "version:"
-      LVM_SYSTEM_DIR=$out $out/bin/lvm version 2>&1 | tee -a $out/log | grep "LVM"
+      $out/bin/dmsetup --version 2>&1 | tee -a log | grep "version:"
+      LVM_SYSTEM_DIR=$out $out/bin/lvm version 2>&1 | tee -a log | grep "LVM"
       $out/bin/mdadm --version
 
       ${config.boot.initrd.extraUtilsCommandsTest}
-- 
GitLab


From 434260c772622408b1503a4ff2b65bfd900f3c80 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 22 Jan 2013 18:16:56 +0100
Subject: [PATCH 4337/5331] Work around a bug in unionfs

Unionfs cannot delete directories that contain open deleted files.
This broke a Nix test.

http://hydra.nixos.org/build/3843354
---
 modules/virtualisation/qemu-vm.nix | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/modules/virtualisation/qemu-vm.nix b/modules/virtualisation/qemu-vm.nix
index 9d9581b96c6..eb800e52ab2 100644
--- a/modules/virtualisation/qemu-vm.nix
+++ b/modules/virtualisation/qemu-vm.nix
@@ -293,7 +293,7 @@ in
 
         mkdir /unionfs-chroot/rw-store
         mount -t tmpfs -o "mode=755" none /unionfs-chroot/rw-store
-        unionfs -o allow_other,cow,nonempty,chroot=/unionfs-chroot,max_files=32768 /rw-store=RW:/ro-store=RO $targetRoot/nix/store
+        unionfs -o allow_other,cow,nonempty,chroot=/unionfs-chroot,max_files=32768,hide_meta_files /rw-store=RW:/ro-store=RO $targetRoot/nix/store
       ''}
     '';
 
@@ -313,7 +313,13 @@ in
       )
     '';
 
-  virtualisation.pathsInNixDB = [ config.system.build.toplevel ];
+  virtualisation.pathsInNixDB =
+    [ config.system.build.toplevel
+      # This path from the initrd must be registered as valid because
+      # unionfs uses it from the target Nix store (?).  FIXME: get
+      # unionfs to use the path from the Nix store instead.
+      config.system.build.extraUtils
+    ];
 
   virtualisation.qemu.options = [ "-vga std" "-usbdevice tablet" ];
 
-- 
GitLab


From 2b8cb59399df3934cf2bac1eb93559e32b23ff46 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 22 Jan 2013 19:25:14 +0100
Subject: [PATCH 4338/5331] Fix the fix of the description of the memtest86
 option

---
 modules/system/boot/loader/grub/memtest.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/modules/system/boot/loader/grub/memtest.nix b/modules/system/boot/loader/grub/memtest.nix
index a12bb861899..50c904e1be7 100644
--- a/modules/system/boot/loader/grub/memtest.nix
+++ b/modules/system/boot/loader/grub/memtest.nix
@@ -13,7 +13,8 @@ in
       default = false;
       type = types.bool;
       description = ''
-        Add a menu entry in grub for memtest86
+        Make Memtest86+, a memory testing program, available from the
+        GRUB menu.
       '';
     };
   };
-- 
GitLab


From 4eb2b099e6a46286a1fb31cb1434a3a508a179f7 Mon Sep 17 00:00:00 2001
From: Rickard Nilsson <rickynils@gmail.com>
Date: Thu, 17 Jan 2013 12:52:54 +0100
Subject: [PATCH 4339/5331] Generate share/glib-2.0/schemas/gschemas.compiled
 in system-path.

This is required to create a gschemas.compiled file with content
from all gschemas. Otherwise, gschemas.compiled will be taken
from a random package, and gsettings programs will not find what
they are looking for. I had to add this to get NetworkManager-applet
to work. You'll also have to add share/glib-2.0 to the pathsToLink
list.

Generating this in the activation script (along with gtk icons
etc), is not the nicest solution. But I have no real idea on
how to modularise it.
---
 modules/config/system-path.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/modules/config/system-path.nix b/modules/config/system-path.nix
index 3969be68098..f9f0d11098a 100644
--- a/modules/config/system-path.nix
+++ b/modules/config/system-path.nix
@@ -107,6 +107,10 @@ let
               if [ -x $out/bin/gtk-update-icon-cache -a -f $out/share/icons/hicolor/index.theme ]; then
                   $out/bin/gtk-update-icon-cache $out/share/icons/hicolor
               fi
+
+              if [ -x $out/bin/glib-compile-schemas -a -w $out/share/glib-2.0/schemas ]; then
+                  $out/bin/glib-compile-schemas $out/share/glib-2.0/schemas
+              fi
             '';
         };
 
-- 
GitLab


From 314adf9648bd5019441d0f82c7273b302b6aea66 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 23 Jan 2013 11:31:48 +0100
Subject: [PATCH 4340/5331] nixos-rebuild: Don't rely on $SHELL

Fixes #74.
---
 modules/installer/tools/nixos-rebuild.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/installer/tools/nixos-rebuild.sh b/modules/installer/tools/nixos-rebuild.sh
index b9272f31ac6..255c8150bdd 100644
--- a/modules/installer/tools/nixos-rebuild.sh
+++ b/modules/installer/tools/nixos-rebuild.sh
@@ -139,7 +139,7 @@ fi
 # Update the version suffix if we're building from Git (so that
 # nixos-version shows something useful).
 if nixos=$(nix-instantiate --find-file nixos "${extraBuildFlags[@]}"); then
-    suffix=$($SHELL $nixos/modules/installer/tools/get-version-suffix "${extraBuildFlags[@]}")
+    suffix=$(@shell@ $nixos/modules/installer/tools/get-version-suffix "${extraBuildFlags[@]}")
     if [ -n "$suffix" ]; then
         echo -n "$suffix" > "$nixos/.version-suffix"
     fi
-- 
GitLab


From 37b56574e20755e4c58370bb18a3d373d4ae7cfc Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 23 Jan 2013 11:51:58 +0100
Subject: [PATCH 4341/5331] stage-1: Clear environment before calling stage-2

In particular, stage-1's LD_LIBRARY_PATH should not infect stage-2.
Reported by viric.
---
 modules/system/boot/stage-1-init.sh | 2 +-
 modules/system/boot/systemd.nix     | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/modules/system/boot/stage-1-init.sh b/modules/system/boot/stage-1-init.sh
index 9bcbe291aad..3f34a1ae6a5 100644
--- a/modules/system/boot/stage-1-init.sh
+++ b/modules/system/boot/stage-1-init.sh
@@ -365,6 +365,6 @@ mount --move /sys $targetRoot/sys
 mount --move /dev $targetRoot/dev
 mount --move /run $targetRoot/run
 
-exec switch_root "$targetRoot" "$stage2Init"
+exec env -i $(type -P switch_root) "$targetRoot" "$stage2Init"
 
 fail # should never be reached
diff --git a/modules/system/boot/systemd.nix b/modules/system/boot/systemd.nix
index d3340988092..4024838555d 100644
--- a/modules/system/boot/systemd.nix
+++ b/modules/system/boot/systemd.nix
@@ -224,6 +224,7 @@ let
 
           [Service]
           Environment=PATH=${def.path}
+          Environment=LD_LIBRARY_PATH=
           ${let env = cfg.globalEnvironment // def.environment;
             in concatMapStrings (n: "Environment=${n}=${getAttr n env}\n") (attrNames env)}
           ${optionalString (!def.restartIfChanged) "X-RestartIfChanged=false"}
-- 
GitLab


From ef5108f5603f64f71e1996f146a1334807b834b5 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 23 Jan 2013 14:35:52 +0100
Subject: [PATCH 4342/5331] Fix registering valid paths in VM tests

Commit 37b56574e20755e4c58370bb18a3d373d4ae7cfc revealed that the code
to get regInfo from /proc/cmdline was broken.  It only happened to
work because the kernel passes the command line to stage 1 through the
environment, so $regInfo was set anyway.
---
 modules/virtualisation/qemu-vm.nix | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/modules/virtualisation/qemu-vm.nix b/modules/virtualisation/qemu-vm.nix
index eb800e52ab2..cf7738768e1 100644
--- a/modules/virtualisation/qemu-vm.nix
+++ b/modules/virtualisation/qemu-vm.nix
@@ -306,11 +306,9 @@ in
   # dependency.)
   boot.postBootCommands =
     ''
-      ( source /proc/cmdline
-        if [ -n "$regInfo" ]; then
-            ${config.environment.nix}/bin/nix-store --load-db < $regInfo
-        fi
-      )
+      if [[ "$(cat /proc/cmdline)" =~ regInfo=([^ ]*) ]]; then
+        ${config.environment.nix}/bin/nix-store --load-db < ''${BASH_REMATCH[1]}
+      fi
     '';
 
   virtualisation.pathsInNixDB =
-- 
GitLab


From 7a382679e42db39907d866294396e5dfd1f7b2ea Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 23 Jan 2013 14:46:54 +0100
Subject: [PATCH 4343/5331] Revert 434260c772622408b1503a4ff2b65bfd900f3c80

There is a bug in unionfs, but it only manifested itself because of
our accidental use of stage-1 libraries in stage-2.
---
 modules/virtualisation/qemu-vm.nix | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/modules/virtualisation/qemu-vm.nix b/modules/virtualisation/qemu-vm.nix
index cf7738768e1..e125654e80f 100644
--- a/modules/virtualisation/qemu-vm.nix
+++ b/modules/virtualisation/qemu-vm.nix
@@ -311,13 +311,7 @@ in
       fi
     '';
 
-  virtualisation.pathsInNixDB =
-    [ config.system.build.toplevel
-      # This path from the initrd must be registered as valid because
-      # unionfs uses it from the target Nix store (?).  FIXME: get
-      # unionfs to use the path from the Nix store instead.
-      config.system.build.extraUtils
-    ];
+  virtualisation.pathsInNixDB = [ config.system.build.toplevel ];
 
   virtualisation.qemu.options = [ "-vga std" "-usbdevice tablet" ];
 
-- 
GitLab


From 65805882303fe08bbf49129345c2aa38fb4df16a Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 23 Jan 2013 20:16:33 +0100
Subject: [PATCH 4344/5331] Set $HOME in stage-2

http://hydra.nixos.org/build/3900294
---
 modules/system/boot/stage-2-init.sh | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/modules/system/boot/stage-2-init.sh b/modules/system/boot/stage-2-init.sh
index 5447ce0c502..6c8335dbf3b 100644
--- a/modules/system/boot/stage-2-init.sh
+++ b/modules/system/boot/stage-2-init.sh
@@ -2,6 +2,8 @@
 
 systemConfig=@systemConfig@
 
+export HOME=/root
+
 
 # Print a greeting.
 echo
-- 
GitLab


From 75662a45d6421f878994f13794464e6dbafffb07 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 23 Jan 2013 22:07:40 +0100
Subject: [PATCH 4345/5331] wpa_supplicant: Remove accidentally committed debug
 flag

---
 modules/services/networking/wpa_supplicant.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/services/networking/wpa_supplicant.nix b/modules/services/networking/wpa_supplicant.nix
index 697e54f91d3..11f8778a0ab 100644
--- a/modules/services/networking/wpa_supplicant.nix
+++ b/modules/services/networking/wpa_supplicant.nix
@@ -117,7 +117,7 @@ in
             '' else ''
               ifaces="${concatStringsSep " -N " (map (i: "-i${i}") ifaces)}"
             ''}
-            exec wpa_supplicant -s -u -D${cfg.driver} -c ${configFile} $ifaces -dd
+            exec wpa_supplicant -s -u -D${cfg.driver} -c ${configFile} $ifaces
           '';
       };
 
-- 
GitLab


From 683100666d98f758b4ae3172686633a4840ec1bc Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 23 Jan 2013 23:41:01 +0100
Subject: [PATCH 4346/5331] Enable nix.readOnlyStore by default

---
 modules/services/misc/nix-daemon.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/services/misc/nix-daemon.nix b/modules/services/misc/nix-daemon.nix
index a2ec899a593..bdee1095db6 100644
--- a/modules/services/misc/nix-daemon.nix
+++ b/modules/services/misc/nix-daemon.nix
@@ -185,7 +185,7 @@ in
       };
 
       readOnlyStore = mkOption {
-        default = false;
+        default = true;
         description = ''
           If set, NixOS will enforce the immutability of the Nix store
           by making <filename>/nix/store</filename> a read-only bind
-- 
GitLab


From bd328680ceaee0d546f218d73cea3ec7fefb881c Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 24 Jan 2013 10:28:34 +0100
Subject: [PATCH 4347/5331] Revert "Enable nix.readOnlyStore by default"

This reverts commit 683100666d98f758b4ae3172686633a4840ec1bc.

Seems somebody (systemd? the kernel?) gets confused at power
events and remounts the filesystem containing /nix/store as
read-only.
---
 modules/services/misc/nix-daemon.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/services/misc/nix-daemon.nix b/modules/services/misc/nix-daemon.nix
index bdee1095db6..a2ec899a593 100644
--- a/modules/services/misc/nix-daemon.nix
+++ b/modules/services/misc/nix-daemon.nix
@@ -185,7 +185,7 @@ in
       };
 
       readOnlyStore = mkOption {
-        default = true;
+        default = false;
         description = ''
           If set, NixOS will enforce the immutability of the Nix store
           by making <filename>/nix/store</filename> a read-only bind
-- 
GitLab


From 8e1f243b309f31f3c6605cc7bad17dbd1ccad568 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 24 Jan 2013 13:06:32 +0100
Subject: [PATCH 4348/5331] xserver.nix: Check whether Polkit is enabled

Our X session script requires Polkit because it calls systemd-inhibit.
---
 modules/services/x11/xserver.nix | 23 +++++++++++++++--------
 1 file changed, 15 insertions(+), 8 deletions(-)

diff --git a/modules/services/x11/xserver.nix b/modules/services/x11/xserver.nix
index f71e6ea97c4..d4dc8b761bf 100644
--- a/modules/services/x11/xserver.nix
+++ b/modules/services/x11/xserver.nix
@@ -43,6 +43,7 @@ let
       pkgs.xorg.fontadobe75dpi
     ];
 
+
   # Just enumerate all heads without discarding XRandR output information.
   xrandrHeads = let
     mkHead = num: output: {
@@ -74,6 +75,7 @@ let
     monitors = foldl mkMonitor [] xrandrHeads;
   in concatMapStrings (getAttr "value") monitors;
 
+
   configFile = pkgs.stdenv.mkDerivation {
     name = "xserver.conf";
 
@@ -107,6 +109,17 @@ let
       ''; # */
   };
 
+
+  checkAgent = mkAssert (!(cfg.startOpenSSHAgent && cfg.startGnuPGAgent))
+    ''
+      The OpenSSH agent and GnuPG agent cannot be started both.
+      Choose between `startOpenSSHAgent' and `startGnuPGAgent'.
+    '';
+
+  checkPolkit = mkAssert config.security.polkit.enable
+    "X11 requires Polkit to be enabled (‘security.polkit.enable = true’).";
+
+
 in
 
 {
@@ -374,13 +387,7 @@ in
 
   ###### implementation
 
-  config = mkIf cfg.enable
-    (mkAssert (!(cfg.startOpenSSHAgent && cfg.startGnuPGAgent))
-      ''
-        The OpenSSH agent and GnuPG agent cannot be started both.
-        Choose between `startOpenSSHAgent' and `startGnuPGAgent'.
-      ''
-  {
+  config = mkIf cfg.enable (checkAgent (checkPolkit {
 
     boot.extraModulePackages =
       optional (elem "nvidia" driverNames) kernelPackages.nvidia_x11 ++
@@ -601,6 +608,6 @@ in
         ${xrandrMonitorSections}
       '';
 
-  });
+  }));
 
 }
-- 
GitLab


From 4ac619f6e559b0d93c016895630951dcfa363452 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 24 Jan 2013 13:09:31 +0100
Subject: [PATCH 4349/5331] Turn on nix.readOnlyStore again

---
 modules/services/misc/nix-daemon.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/services/misc/nix-daemon.nix b/modules/services/misc/nix-daemon.nix
index a2ec899a593..bdee1095db6 100644
--- a/modules/services/misc/nix-daemon.nix
+++ b/modules/services/misc/nix-daemon.nix
@@ -185,7 +185,7 @@ in
       };
 
       readOnlyStore = mkOption {
-        default = false;
+        default = true;
         description = ''
           If set, NixOS will enforce the immutability of the Nix store
           by making <filename>/nix/store</filename> a read-only bind
-- 
GitLab


From 0930befd58291d68f92ca486753625d51a7493ed Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 24 Jan 2013 13:34:47 +0100
Subject: [PATCH 4350/5331] nix-daemon: Put back the --daemon flag

That flag doesn't do anything, except that it allows setting the
client PID in the process title of the children.
---
 modules/services/misc/nix-daemon.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/services/misc/nix-daemon.nix b/modules/services/misc/nix-daemon.nix
index bdee1095db6..7175e0376bf 100644
--- a/modules/services/misc/nix-daemon.nix
+++ b/modules/services/misc/nix-daemon.nix
@@ -286,7 +286,7 @@ in
         environment = cfg.envVars;
 
         serviceConfig =
-          { ExecStart = "@${nix}/bin/nix-daemon nix-daemon";
+          { ExecStart = "@${nix}/bin/nix-daemon nix-daemon --daemon";
             KillMode = "process";
             Nice = cfg.daemonNiceLevel;
             IOSchedulingPriority = cfg.daemonIONiceLevel;
-- 
GitLab


From 685a901597a1c51e1d82705eaf510883266b15f2 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 24 Jan 2013 13:55:59 +0100
Subject: [PATCH 4351/5331] Fix description of powerManagement.cpuFreqGovernor

---
 modules/tasks/cpu-freq.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/tasks/cpu-freq.nix b/modules/tasks/cpu-freq.nix
index 59e74fa6660..bcab421f0c7 100644
--- a/modules/tasks/cpu-freq.nix
+++ b/modules/tasks/cpu-freq.nix
@@ -13,8 +13,8 @@ with pkgs.lib;
       type = types.uniq types.string;
       description = ''
         Configure the governor used to regulate the frequence of the
-        available CPUs. By default, the kernel configures the governor
-        "userspace".
+        available CPUs. By default, the kernel configures the
+        on-demand governor.
       '';
     };
 
-- 
GitLab


From 7464d850d3bb99f6489ae23f95200a4d7bfd29f7 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 24 Jan 2013 14:55:55 +0100
Subject: [PATCH 4352/5331] Start a getty on tty1 again

---
 modules/system/boot/systemd.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/modules/system/boot/systemd.nix b/modules/system/boot/systemd.nix
index 4024838555d..215f625467a 100644
--- a/modules/system/boot/systemd.nix
+++ b/modules/system/boot/systemd.nix
@@ -331,7 +331,9 @@ let
 
       ln -s rescue.target $out/kbrequest.target
 
-      #ln -s ../getty@tty1.service $out/multi-user.target.wants/
+      mkdir -p $out/getty.target.wants/
+      ln -s ../getty@tty1.service $out/getty.target.wants/
+
       ln -s ../local-fs.target ../remote-fs.target ../network.target ../nss-lookup.target \
             ../nss-user-lookup.target ../swap.target $out/multi-user.target.wants/
     ''; # */
-- 
GitLab


From f0a1e5e356116dfaa206215fadc586d33b54c6a8 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 24 Jan 2013 15:40:56 +0100
Subject: [PATCH 4353/5331] Use systemd.targets to define ip-up

---
 modules/config/networking.nix | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/modules/config/networking.nix b/modules/config/networking.nix
index 6908996db6c..9e55549ea2e 100644
--- a/modules/config/networking.nix
+++ b/modules/config/networking.nix
@@ -87,9 +87,8 @@ in
       }
     ];
 
-  systemd.units."ip-up.target".text =
-    ''
-      [Unit]
-      Description=Services Requiring IP Connectivity
-    '';
+  # The ‘ip-up’ target is started when we have IP connectivity.  So
+  # services that depend on IP connectivity (like ntpd) should be
+  # pulled in by this target.
+  systemd.targets.ip-up.description = "Services Requiring IP Connectivity";
 }
-- 
GitLab


From 001ddd179986bd76d3cf7ebf68f36a5dd0e47a94 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 24 Jan 2013 16:42:37 +0100
Subject: [PATCH 4354/5331] Get the VirtualBox image generation to work again

---
 modules/virtualisation/virtualbox-image.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/modules/virtualisation/virtualbox-image.nix b/modules/virtualisation/virtualbox-image.nix
index 373195a9d68..5569e2a1fc9 100644
--- a/modules/virtualisation/virtualbox-image.nix
+++ b/modules/virtualisation/virtualbox-image.nix
@@ -68,6 +68,7 @@ with pkgs.lib;
           ln -s ${config.system.build.binsh}/bin/sh /mnt/bin/sh
 
           # Generate the GRUB menu.
+          ln -s vda /dev/sda
           chroot /mnt ${config.system.build.toplevel}/bin/switch-to-configuration boot
 
           umount /mnt/proc /mnt/dev /mnt/sys
-- 
GitLab


From f3ec305c25a47a232d3f5b99dbfec1ab78669fd0 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 24 Jan 2013 18:11:17 +0100
Subject: [PATCH 4355/5331] Update the EBS creation script

---
 maintainers/scripts/ec2/create-ebs-amis.py | 38 ++++++++++------------
 maintainers/scripts/ec2/ebs-creator.nix    |  5 ++-
 2 files changed, 20 insertions(+), 23 deletions(-)

diff --git a/maintainers/scripts/ec2/create-ebs-amis.py b/maintainers/scripts/ec2/create-ebs-amis.py
index 31613f08962..e0f26d2823a 100755
--- a/maintainers/scripts/ec2/create-ebs-amis.py
+++ b/maintainers/scripts/ec2/create-ebs-amis.py
@@ -1,11 +1,12 @@
 #! /usr/bin/env python
 
+import os
 import sys
-from charon import deployment
-from boto.ec2.blockdevicemapping import BlockDeviceMapping, BlockDeviceType
-import charon.util
 import time
 import argparse
+import charon.util
+from charon import deployment
+from boto.ec2.blockdevicemapping import BlockDeviceMapping, BlockDeviceType
 
 parser = argparse.ArgumentParser(description='Create an EBS-backed NixOS AMI')
 parser.add_argument('--region', dest='region', required=True, help='EC2 region')
@@ -18,13 +19,14 @@ instance_type = "cc1.4xlarge" if args.hvm else "m1.small"
 key_name = args.key_name
 ebs_size = 8 if args.hvm else 20
 
+
 # Start a NixOS machine in the given region.
 f = open("ebs-creator-config.nix", "w")
-f.write('''{{ 
-  machine = 
+f.write('''{{
+  machine =
     {{ pkgs, ... }}:
     {{
-      deployment.ec2.region = "{0}"; 
+      deployment.ec2.region = "{0}";
       deployment.ec2.keyPair = pkgs.lib.mkOverride 10 "{1}";
       deployment.ec2.blockDeviceMapping."/dev/xvdg".size = pkgs.lib.mkOverride 10 {2};
     }};
@@ -32,19 +34,20 @@ f.write('''{{
 '''.format(args.region, key_name, ebs_size))
 f.close()
 
-db = deployment.open_database("./ebs-creator.charon")
+db = deployment.open_database(deployment.get_default_state_file())
 try:
     depl = deployment.open_deployment(db, "ebs-creator")
 except Exception:
     depl = deployment.create_deployment(db)
     depl.name = "ebs-creator"
 depl.auto_response = "y"
-depl.nix_exprs = ["./ebs-creator.nix", "./ebs-creator-config.nix"]
+depl.nix_exprs = [os.path.abspath("./ebs-creator.nix"), os.path.abspath("./ebs-creator-config.nix")]
 if not args.keep: depl.destroy_resources()
 depl.deploy(allow_reboot=True)
 
 m = depl.machines['machine']
 
+
 # Do the installation.
 device="/dev/xvdg"
 if args.hvm:
@@ -58,16 +61,8 @@ m.run_command("mkdir -p /mnt")
 m.run_command("mount {0} /mnt".format(device))
 m.run_command("touch /mnt/.ebs")
 m.run_command("mkdir -p /mnt/etc/nixos")
-# Kind of hacky until the nixos channel is updated to systemd
-#m.run_command("nix-channel --add http://nixos.org/channels/nixos-unstable")
-#m.run_command("nix-channel --update")
-m.run_command("mkdir unpack")
-m.run_command("cd unpack; (curl -L http://hydra.nixos.org/job/nixos/systemd/channel/latest/download | bzcat | tar xv)")
-m.run_command("mkdir nixos")
-m.run_command("mv unpack/*/* nixos")
-m.run_command("mv nixos unpack/*")
-m.run_command("nix-env -p /nix/var/nix/profiles/per-user/root/channels -i $(nix-store --add unpack/*)")
-m.run_command("rm -fR unpack")
+m.run_command("nix-channel --add http://nixos.org/channels/nixos-unstable")
+m.run_command("nix-channel --update")
 m.run_command("nixos-rebuild switch")
 version = m.run_command("nixos-version", capture_stdout=True).replace('"', '').rstrip()
 print >> sys.stderr, "NixOS version is {0}".format(version)
@@ -89,7 +84,7 @@ if args.hvm:
 else:
     ami_name = "nixos-{0}-x86_64-ebs".format(version)
     description = "NixOS {0} (x86_64; EBS root)".format(version)
-    
+
 
 # Wait for the snapshot to finish.
 def check():
@@ -161,6 +156,9 @@ image.set_launch_permissions(user_ids=[], group_names=["all"])
 
 m._conn.create_tags([ami_id], {'Name': ami_name})
 
+time.sleep(5)
+
+
 # Do a test deployment to make sure that the AMI works.
 f = open("ebs-test.nix", "w")
 f.write(
@@ -180,7 +178,7 @@ f.close()
 test_depl = deployment.create_deployment(db)
 test_depl.auto_response = "y"
 test_depl.name = "ebs-creator-test"
-test_depl.nix_exprs = [ "./ebs-test.nix" ]
+test_depl.nix_exprs = [os.path.abspath("./ebs-test.nix")]
 test_depl.deploy(create_only=True)
 test_depl.machines['machine'].run_command("nixos-version")
 if not args.keep:
diff --git a/maintainers/scripts/ec2/ebs-creator.nix b/maintainers/scripts/ec2/ebs-creator.nix
index 1bf78c41f12..8524d870d0e 100644
--- a/maintainers/scripts/ec2/ebs-creator.nix
+++ b/maintainers/scripts/ec2/ebs-creator.nix
@@ -1,12 +1,11 @@
 {
   network.description = "NixOS EBS creator";
-  
+
   machine =
     { config, pkgs, ... }:
     { deployment.targetEnv = "ec2";
       deployment.ec2.instanceType = "m1.small";
-      deployment.ec2.keyPair = "eelco";
-      deployment.ec2.securityGroups = [ "eelco-test" ];
+      deployment.ec2.securityGroups = [ "admin" ];
       environment.systemPackages = [ pkgs.parted ];
       fileSystems = [];
     };
-- 
GitLab


From 859d75186ae1a822d75f118fd7515d92d593abc0 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 24 Jan 2013 18:14:13 +0100
Subject: [PATCH 4356/5331] Put the root FS of S3-backed instances on ext4

---
 modules/virtualisation/amazon-image.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/virtualisation/amazon-image.nix b/modules/virtualisation/amazon-image.nix
index aa0a97d3aa0..dad071cc8e9 100644
--- a/modules/virtualisation/amazon-image.nix
+++ b/modules/virtualisation/amazon-image.nix
@@ -21,7 +21,7 @@ with pkgs.lib;
         }
         ''
           # Create an empty filesystem and mount it.
-          ${pkgs.e2fsprogs}/sbin/mkfs.ext3 -L nixos /dev/vda
+          ${pkgs.e2fsprogs}/sbin/mkfs.ext4 -L nixos /dev/vda
           ${pkgs.e2fsprogs}/sbin/tune2fs -c 0 -i 0 /dev/vda
           mkdir /mnt
           mount /dev/vda /mnt
-- 
GitLab


From d241240ba490744a8d17c7a48cc169b8214404c3 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 24 Jan 2013 18:34:13 +0100
Subject: [PATCH 4357/5331] spamassassin: convert module to systemd

---
 modules/services/mail/spamassassin.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/modules/services/mail/spamassassin.nix b/modules/services/mail/spamassassin.nix
index d4dbe8ddbd0..d0029c1256c 100644
--- a/modules/services/mail/spamassassin.nix
+++ b/modules/services/mail/spamassassin.nix
@@ -52,7 +52,10 @@ in
 
     jobs.spamd = {
       description = "Spam Assassin Server";
-      startOn = "started networking and filesystem";
+
+      wantedBy = [ "multi-user.target" ];
+      after = [ "network.target" ];
+
       environment.TZ = config.time.timeZone;
       exec = "${pkgs.spamassassin}/bin/spamd ${optionalString cfg.debug "-D"} --username=spamd --groupname=spamd --nouser-config --virtual-config-dir=/var/lib/spamassassin/user-%u --allow-tell --pidfile=/var/run/spamd.pid";
     };
-- 
GitLab


From 3e4f053eb5d8a1d0e92fd3b8d33127e9dc2d9aa2 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 24 Jan 2013 19:37:42 +0100
Subject: [PATCH 4358/5331] Update the S3 AMI generation script

---
 maintainers/scripts/ec2/create-s3-amis.sh | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/maintainers/scripts/ec2/create-s3-amis.sh b/maintainers/scripts/ec2/create-s3-amis.sh
index 767696cfe55..6608ebd51d6 100755
--- a/maintainers/scripts/ec2/create-s3-amis.sh
+++ b/maintainers/scripts/ec2/create-s3-amis.sh
@@ -1,26 +1,27 @@
 #! /bin/sh -e
 
 nixos=$(nix-instantiate --find-file nixos)
-revision=$(cd $nixos; git rev-parse --short HEAD)
-echo "NixOS revision is $revision"
+export NIXOS_CONFIG=$nixos/modules/virtualisation/amazon-config.nix
+
+version=$(nix-instantiate --eval-only '<nixos>' -A config.system.nixosVersion | sed s/'"'//g)
+echo "NixOS version is $version"
 
 buildAndUploadFor() {
     system="$1"
     arch="$2"
 
     echo "building $system image..."
-    NIXOS_CONFIG=$nixos/modules/virtualisation/amazon-config.nix nix-build "$nixos" \
+    nix-build '<nixos>' \
         -A config.system.build.amazonImage --argstr system "$system" -o ec2-ami
 
     ec2-bundle-image -i ./ec2-ami/nixos.img --user "$AWS_ACCOUNT" --arch "$arch" \
         -c "$EC2_CERT" -k "$EC2_PRIVATE_KEY"
 
-    for region in eu-west-1 us-east-1 us-west-1; do
+    for region in eu-west-1 us-east-1 us-west-1 us-west-2; do
         echo "uploading $system image for $region..."
 
-        name="$(echo nixos-$arch-r$revision | tr '[A-Z]_' '[a-z]-')"
-
-        bucket="$name-$region"
+        name=nixos-$version-$arch-s3
+        bucket="$(echo $name-$region | tr '[A-Z]_' '[a-z]-')"
 
         if [ "$region" = eu-west-1 ]; then s3location=EU;
         elif [ "$region" = us-east-1 ]; then s3location=US;
@@ -28,7 +29,8 @@ buildAndUploadFor() {
         fi
 
         ec2-upload-bundle -b "$bucket" -m /tmp/nixos.img.manifest.xml \
-            -a "$AWS_ACCESS_KEY_ID" -s "$AWS_SECRET_ACCESS_KEY" --location "$s3location"
+            -a "$EC2_ACCESS_KEY" -s "$EC2_SECRET_KEY" --location "$s3location" \
+            --url http://s3.amazonaws.com
 
         kernel=$(ec2-describe-images -o amazon --filter "manifest-location=*pv-grub-hd0_1.03-$arch*" --region "$region" | cut -f 2)
         echo "using PV-GRUB kernel $kernel"
@@ -38,7 +40,7 @@ buildAndUploadFor() {
 
         echo "AMI ID is $ami"
 
-        echo "$system" "$region" "$ami" >> amis
+        echo $ami >> $region.s3.ami-id
 
         ec2-modify-image-attribute --region "$region" "$ami" -l -a all
     done
-- 
GitLab


From f7d6e2940cd9e44e21c15918314ca10ab35f4a6b Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 24 Jan 2013 19:37:56 +0100
Subject: [PATCH 4359/5331] Wait a bit longer after EBS AMI registration

---
 maintainers/scripts/ec2/create-ebs-amis.py | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/maintainers/scripts/ec2/create-ebs-amis.py b/maintainers/scripts/ec2/create-ebs-amis.py
index e0f26d2823a..b3179e6f43c 100755
--- a/maintainers/scripts/ec2/create-ebs-amis.py
+++ b/maintainers/scripts/ec2/create-ebs-amis.py
@@ -149,14 +149,15 @@ else:
 
 print >> sys.stderr, "registered AMI {0}".format(ami_id)
 
-time.sleep(5)
-print >> sys.stderr, "making image public..."
-image = m._conn.get_all_images(image_ids=[ami_id])[0]
-image.set_launch_permissions(user_ids=[], group_names=["all"])
+print >> sys.stderr, "sleeping a bit..."
+time.sleep(30)
 
+print >> sys.stderr, "setting image name..."
 m._conn.create_tags([ami_id], {'Name': ami_name})
 
-time.sleep(5)
+print >> sys.stderr, "making image public..."
+image = m._conn.get_all_images(image_ids=[ami_id])[0]
+image.set_launch_permissions(user_ids=[], group_names=["all"])
 
 
 # Do a test deployment to make sure that the AMI works.
-- 
GitLab


From 28cf26d674fb35b5e29ce2e54d7bb8231e00e8c9 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Thu, 24 Jan 2013 20:50:28 -0500
Subject: [PATCH 4360/5331] Remove unneeded /nix/rw-store creation when using
 readOnlyStore

---
 modules/system/boot/stage-2-init.sh | 1 -
 1 file changed, 1 deletion(-)

diff --git a/modules/system/boot/stage-2-init.sh b/modules/system/boot/stage-2-init.sh
index 6c8335dbf3b..e7c9e2b23d8 100644
--- a/modules/system/boot/stage-2-init.sh
+++ b/modules/system/boot/stage-2-init.sh
@@ -49,7 +49,6 @@ chown 0:30000 /nix/store
 chmod 1775 /nix/store
 if [ -n "@readOnlyStore@" ]; then
     if ! mountpoint -q /nix/store; then
-        mkdir -p /nix/rw-store
         mount --bind /nix/store /nix/store
         mount -o remount,ro,bind /nix/store
     fi
-- 
GitLab


From e32e501435a94293987295f8d10fcf94dd6789dd Mon Sep 17 00:00:00 2001
From: Rickard Nilsson <rickynils@gmail.com>
Date: Fri, 25 Jan 2013 15:47:38 +0100
Subject: [PATCH 4361/5331] activation: Don't use double quotes in boot loader
 warning message, it messes up perl system call

---
 modules/system/activation/top-level.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/system/activation/top-level.nix b/modules/system/activation/top-level.nix
index e99b50a0309..7246271c7b2 100644
--- a/modules/system/activation/top-level.nix
+++ b/modules/system/activation/top-level.nix
@@ -156,7 +156,7 @@ let
       config.boot.kernelParams ++ config.boot.extraKernelParams;
     installBootLoader =
       config.system.build.installBootLoader
-      or "echo \"Warning: don't know how to make this configuration bootable; please enable a boot loader.\" 1>&2; true";
+      or "echo 'Warning: do not know how to make this configuration bootable; please enable a boot loader.' 1>&2; true";
     activationScript = config.system.activationScripts.script;
     nixosVersion = config.system.nixosVersion;
 
-- 
GitLab


From 8fe8ab7097afcc60d7680aa6785c58196f0e5896 Mon Sep 17 00:00:00 2001
From: Rickard Nilsson <rickynils@gmail.com>
Date: Fri, 25 Jan 2013 15:54:45 +0100
Subject: [PATCH 4362/5331] switch-to-configuration.pl: Fix parsing of comments
 in fstab, hash-tokens inside strings are not comments.

---
 modules/system/activation/switch-to-configuration.pl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/system/activation/switch-to-configuration.pl b/modules/system/activation/switch-to-configuration.pl
index 032947c3c54..a5a06454006 100644
--- a/modules/system/activation/switch-to-configuration.pl
+++ b/modules/system/activation/switch-to-configuration.pl
@@ -68,7 +68,7 @@ sub parseFstab {
     my ($fss, $swaps);
     foreach my $line (read_file($filename, err_mode => 'quiet')) {
         chomp $line;
-        $line =~ s/#.*//;
+        $line =~ s/^\s*#.*//;
         next if $line =~ /^\s*$/;
         my @xs = split / /, $line;
         if ($xs[2] eq "swap") {
-- 
GitLab


From 6d1977745528978d38b26b2ad944b34251d47508 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 25 Jan 2013 15:59:53 +0100
Subject: [PATCH 4363/5331] nixos-install: Handle /nix/var/nix/db being on a
 separate filesystem

This is the case on S3-backed EC2 instances.
---
 modules/installer/tools/nixos-install.sh | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/modules/installer/tools/nixos-install.sh b/modules/installer/tools/nixos-install.sh
index 0739c33e857..58fe3e32743 100644
--- a/modules/installer/tools/nixos-install.sh
+++ b/modules/installer/tools/nixos-install.sh
@@ -42,6 +42,7 @@ fi
 mkdir -m 0755 -p $mountPoint/dev $mountPoint/proc $mountPoint/sys $mountPoint/mnt $mountPoint/mnt2 $mountPoint/etc /etc/nixos
 mount --make-private / # systemd makes / shared, which is annoying
 mount --bind / $mountPoint/mnt
+mount --bind /nix $mountPoint/mnt/nix
 mount --bind /nix/store $mountPoint/mnt/nix/store
 mount --bind /dev $mountPoint/dev
 mount --bind /dev/shm $mountPoint/dev/shm
@@ -61,6 +62,7 @@ cleanup() {
     umount $mountPoint/dev/shm
     umount $mountPoint/dev
     umount $mountPoint/mnt/nix/store
+    umount $mountPoint/mnt/nix
     umount $mountPoint/mnt
     rmdir $mountPoint/mnt $mountPoint/mnt2
 }
-- 
GitLab


From e732b84dd5e547799904662197010e33b43502af Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 25 Jan 2013 17:11:49 +0100
Subject: [PATCH 4364/5331] Auto-create a keypair during EBS AMI creation

---
 maintainers/scripts/ec2/create-ebs-amis.py | 38 +++++++++++++---------
 maintainers/scripts/ec2/ebs-creator.nix    |  7 ++--
 2 files changed, 27 insertions(+), 18 deletions(-)

diff --git a/maintainers/scripts/ec2/create-ebs-amis.py b/maintainers/scripts/ec2/create-ebs-amis.py
index b3179e6f43c..f490b03693c 100755
--- a/maintainers/scripts/ec2/create-ebs-amis.py
+++ b/maintainers/scripts/ec2/create-ebs-amis.py
@@ -10,28 +10,29 @@ from boto.ec2.blockdevicemapping import BlockDeviceMapping, BlockDeviceType
 
 parser = argparse.ArgumentParser(description='Create an EBS-backed NixOS AMI')
 parser.add_argument('--region', dest='region', required=True, help='EC2 region')
-parser.add_argument('--key', dest='key_name', default="eelco", help='EC2 keypair')
 parser.add_argument('--keep', dest='keep', action='store_true', help='Keep Charon machine after use')
 parser.add_argument('--hvm', dest='hvm', action='store_true', help='Create HVM image')
 args = parser.parse_args()
 
 instance_type = "cc1.4xlarge" if args.hvm else "m1.small"
-key_name = args.key_name
 ebs_size = 8 if args.hvm else 20
 
 
 # Start a NixOS machine in the given region.
 f = open("ebs-creator-config.nix", "w")
 f.write('''{{
+  resources.ec2KeyPairs.keypair.accessKeyId = "logicblox-dev";
+  resources.ec2KeyPairs.keypair.region = "{0}";
+
   machine =
     {{ pkgs, ... }}:
     {{
+      deployment.ec2.accessKeyId = "logicblox-dev";
       deployment.ec2.region = "{0}";
-      deployment.ec2.keyPair = pkgs.lib.mkOverride 10 "{1}";
-      deployment.ec2.blockDeviceMapping."/dev/xvdg".size = pkgs.lib.mkOverride 10 {2};
+      deployment.ec2.blockDeviceMapping."/dev/xvdg".size = pkgs.lib.mkOverride 10 {1};
     }};
 }}
-'''.format(args.region, key_name, ebs_size))
+'''.format(args.region, ebs_size))
 f.close()
 
 db = deployment.open_database(deployment.get_default_state_file())
@@ -67,7 +68,7 @@ m.run_command("nixos-rebuild switch")
 version = m.run_command("nixos-version", capture_stdout=True).replace('"', '').rstrip()
 print >> sys.stderr, "NixOS version is {0}".format(version)
 m.run_command("cp -f $(nix-instantiate --find-file nixos/modules/virtualisation/amazon-config.nix) /mnt/etc/nixos/configuration.nix")
-m.run_command("nixos-install")
+m.run_command("./nixos-install")
 if args.hvm:
     m.run_command('cp /mnt/nix/store/*-grub-0.97*/lib/grub/i386-pc/* /mnt/boot/grub')
     m.run_command('sed -i "s|hd0|hd0,0|" /mnt/boot/grub/menu.lst')
@@ -164,16 +165,23 @@ image.set_launch_permissions(user_ids=[], group_names=["all"])
 f = open("ebs-test.nix", "w")
 f.write(
     '''
-    {{ network.description = "NixOS EBS test";
-       machine.deployment.targetEnv = "ec2";
-       machine.deployment.ec2.region = "{0}";
-       machine.deployment.ec2.instanceType = "{2}";
-       machine.deployment.ec2.keyPair = "{3}";
-       machine.deployment.ec2.securityGroups = [ "eelco-test" ];
-       machine.deployment.ec2.ami = "{1}";
-       machine.fileSystems = [];
+    {{
+      network.description = "NixOS EBS test";
+
+      resources.ec2KeyPairs.keypair.accessKeyId = "logicblox-dev";
+      resources.ec2KeyPairs.keypair.region = "{0}";
+
+      machine = {{ config, pkgs, resources, ... }}: {{
+        deployment.targetEnv = "ec2";
+        deployment.ec2.accessKeyId = "logicblox-dev";
+        deployment.ec2.region = "{0}";
+        deployment.ec2.instanceType = "{2}";
+        deployment.ec2.keyPair = resources.ec2KeyPairs.keypair.name;
+        deployment.ec2.securityGroups = [ "admin" ];
+        deployment.ec2.ami = "{1}";
+      }};
     }}
-    '''.format(args.region, ami_id, instance_type, key_name))
+    '''.format(args.region, ami_id, instance_type))
 f.close()
 
 test_depl = deployment.create_deployment(db)
diff --git a/maintainers/scripts/ec2/ebs-creator.nix b/maintainers/scripts/ec2/ebs-creator.nix
index 8524d870d0e..43dbd86f675 100644
--- a/maintainers/scripts/ec2/ebs-creator.nix
+++ b/maintainers/scripts/ec2/ebs-creator.nix
@@ -2,11 +2,12 @@
   network.description = "NixOS EBS creator";
 
   machine =
-    { config, pkgs, ... }:
+    { config, pkgs, resources, ... }:
     { deployment.targetEnv = "ec2";
-      deployment.ec2.instanceType = "m1.small";
+      deployment.ec2.instanceType = "m1.large";
       deployment.ec2.securityGroups = [ "admin" ];
+      deployment.ec2.ebsBoot = false;
+      deployment.ec2.keyPair = resources.ec2KeyPairs.keypair.name;
       environment.systemPackages = [ pkgs.parted ];
-      fileSystems = [];
     };
 }
-- 
GitLab


From 5eb6e7a21e7063a6be27283938e7871ed83d5cdf Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 25 Jan 2013 17:12:38 +0100
Subject: [PATCH 4365/5331] Doh

---
 maintainers/scripts/ec2/create-ebs-amis.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/maintainers/scripts/ec2/create-ebs-amis.py b/maintainers/scripts/ec2/create-ebs-amis.py
index f490b03693c..9f5ded30498 100755
--- a/maintainers/scripts/ec2/create-ebs-amis.py
+++ b/maintainers/scripts/ec2/create-ebs-amis.py
@@ -68,7 +68,7 @@ m.run_command("nixos-rebuild switch")
 version = m.run_command("nixos-version", capture_stdout=True).replace('"', '').rstrip()
 print >> sys.stderr, "NixOS version is {0}".format(version)
 m.run_command("cp -f $(nix-instantiate --find-file nixos/modules/virtualisation/amazon-config.nix) /mnt/etc/nixos/configuration.nix")
-m.run_command("./nixos-install")
+m.run_command("nixos-install")
 if args.hvm:
     m.run_command('cp /mnt/nix/store/*-grub-0.97*/lib/grub/i386-pc/* /mnt/boot/grub')
     m.run_command('sed -i "s|hd0|hd0,0|" /mnt/boot/grub/menu.lst')
-- 
GitLab


From 27414c4656cb8bf4afba7c28d868b91869b1201e Mon Sep 17 00:00:00 2001
From: Rickard Nilsson <rickynils@gmail.com>
Date: Sun, 27 Jan 2013 20:07:37 +0100
Subject: [PATCH 4366/5331] nslcd: Adjust service definition to systemd

---
 modules/config/ldap.nix | 23 ++++++++++++-----------
 1 file changed, 12 insertions(+), 11 deletions(-)

diff --git a/modules/config/ldap.nix b/modules/config/ldap.nix
index 1e115943f23..603ad8407cd 100644
--- a/modules/config/ldap.nix
+++ b/modules/config/ldap.nix
@@ -220,18 +220,15 @@ mkIf cfg.enable {
     };
   };
 
-  jobs = mkIf cfg.daemon.enable {
+  systemd.services = mkIf cfg.daemon.enable {
     nslcd = {
-      startOn = "filesystem";
-  
-      stopOn = "stopping network-interfaces";
-  
-      daemonType = "fork";
-  
+      wantedBy = [ "nss-user-lookup.target" ];
+
       path = [ nss_pam_ldapd ];
   
       preStart = ''
         mkdir -p /run/nslcd
+        rm -f /run/nslcd/nslcd.pid;
         chown nslcd.nslcd /run/nslcd
         ${optionalString (cfg.bind.distinguishedName != "") ''
           if test -s "${cfg.bind.password}" ; then
@@ -239,10 +236,14 @@ mkIf cfg.enable {
           fi
         ''}
       '';
-  
-      postStop = "rm -f /run/nslcd/nslcd.pid";
-  
-      exec = "nslcd";
+
+      script = "nslcd";
+
+      serviceConfig = {
+        Type = "forking";
+        PIDFile = "/run/nslcd/nslcd.pid";
+        Restart = "always";
+      };
     };
   };
 }
-- 
GitLab


From 45522d080681fb6382a60be8069998ca468c9146 Mon Sep 17 00:00:00 2001
From: Rickard Nilsson <rickynils@gmail.com>
Date: Sun, 27 Jan 2013 20:21:04 +0100
Subject: [PATCH 4367/5331] mpd: Adjust service definition to systemd

---
 modules/services/audio/mpd.nix | 126 +++++++++++++++------------------
 1 file changed, 59 insertions(+), 67 deletions(-)

diff --git a/modules/services/audio/mpd.nix b/modules/services/audio/mpd.nix
index 4a7ae355e4c..85a87dfe845 100644
--- a/modules/services/audio/mpd.nix
+++ b/modules/services/audio/mpd.nix
@@ -6,93 +6,85 @@ let
 
   uid = config.ids.uids.mpd;
   gid = config.ids.gids.mpd;
+  cfg = config.services.mpd;
 
-in
+  mpdConf = pkgs.writeText "mpd.conf" ''
+    music_directory     "${cfg.musicDirectory}"
+    playlist_directory  "${cfg.dataDir}/playlists"
+    db_file             "${cfg.dataDir}/tag_cache"
+    state_file          "${cfg.dataDir}/state"
+    sticker_file        "${cfg.dataDir}/sticker.sql"
+    log_file            "syslog"
+    user                "mpd"
+    ${cfg.extraConfig}
+  ''; 
 
-{
+in {
 
   ###### interface
 
-  options = {
+  options = { 
 
-    services.mpd = {
+    services.mpd = { 
 
       enable = mkOption {
         default = false;
         description = ''
-          Whether to enable the MPD music player daemon (server).
-        '';
-      };
-
-      conffile = mkOption {
-        default = ''
-          music_directory     "${config.services.mpd.dataDir}/music"
-          playlist_directory  "${config.services.mpd.dataDir}/playlists"
-          db_file             "${config.services.mpd.dataDir}/tag_cache"
-          state_file          "${config.services.mpd.dataDir}/state"
-          sticker_file        "${config.services.mpd.dataDir}/sticker.sql"
-          log_file            "/var/log/mpd.log"
-          pid_file            "/var/run/mpd/mpd.pid"
-          bind_to_address     "localhost"
-          user                "mpd"
-        '';
-        description = ''The contents of the MPD configuration file mpd.conf'';
-      };
+          Whether to enable MPD, the music player daemon.
+        ''; 
+      };  
+
+      musicDirectory = mkOption {
+        default = "${cfg.dataDir}/music";
+        description = ''
+          Extra configuration added to the end of MPD's
+          configuration file, mpd.conf.
+        ''; 
+      };  
+
+      extraConfig = mkOption {
+        default = ""; 
+        description = ''
+          Extra directives added to to the end of MPD's configuration file,
+          mpd.conf. Basic configuration like file location and uid/gid
+          is added automatically to the beginning of the file.
+        ''; 
+      };  
 
       dataDir = mkOption {
         default = "/var/lib/mpd/";
-        example = "debug";
         description = ''
-          The root directory of the MPD data tree. Contains a tag cache,
-	  playlists and a music/ subdirectory that should contain (or
-          symlink to) your music collection.
-        '';
-      };
+          The directory where MPD stores its state, tag cache,
+          playlists etc.
+        ''; 
+      };  
 
-    };
+    };  
 
-  };
+  };  
 
 
   ###### implementation
 
-  config = mkIf config.services.mpd.enable {
-
-    environment.systemPackages = [ pkgs.mpd ];
-
-    users.extraUsers = singleton
-      { name = "mpd";
-        group = "mpd";
-        extraGroups = [ "audio" ];
-        description = "MPD system-wide daemon";
-        home = "${config.services.mpd.dataDir}";
-      };
-
-    users.extraGroups = singleton
-      { name = "mpd";
-        inherit gid;
-      };
-
-    jobs.mpd =
-      { description = "MPD system-wide server";
-
-        startOn = "startup";
-
-        preStart =
-          ''
-            mkdir -p /var/run/mpd && chown mpd /var/run/mpd
-            test -d ${config.services.mpd.dataDir} || \
-            ( mkdir -p --mode 755 ${config.services.mpd.dataDir}/music \
-                                  ${config.services.mpd.dataDir}/playlists && \
-              chown -R mpd:mpd ${config.services.mpd.dataDir} )
-          '';
-
-        daemonType = "fork";
-        exec =
-          ''
-            ${pkgs.mpd}/bin/mpd ${pkgs.writeText "mpd.conf" config.services.mpd.conffile}
-          '';
-      };
+  config = mkIf cfg.enable {
+
+    systemd.services.mpd = {
+      after = [ "network.target" "sound.target" ];
+      description = "Music Player Daemon";
+      wantedBy = [ "multi-user.target" ];
+      path = [ pkgs.mpd ];
+      script = "mpd --no-daemon ${mpdConf}";
+    };
+
+    users.extraUsers.mpd = {
+      inherit uid;
+      group = "mpd";
+      extraGroups = [ "audio" ];
+      description = "Music Player Daemon user";
+      home = "${cfg.dataDir}";
+    };
+
+    users.extraGroups.mpd.gid = gid;
 
   };
 
-- 
GitLab


From 39ccd50896ba4166d7792c5dccf8ae492ac4443f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= <viric@viric.name>
Date: Sun, 27 Jan 2013 20:42:45 +0000
Subject: [PATCH 4368/5331] Fixing the doublePatchelf in initrd; it should be
 for all ARM.

---
 modules/system/boot/stage-1.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/system/boot/stage-1.nix b/modules/system/boot/stage-1.nix
index 942a5271484..a66e609ba7b 100644
--- a/modules/system/boot/stage-1.nix
+++ b/modules/system/boot/stage-1.nix
@@ -149,7 +149,7 @@ let
   extraUtils = pkgs.runCommand "extra-utils"
     { buildInputs = [pkgs.nukeReferences];
       allowedReferences = [ "out" ]; # prevent accidents like glibc being included in the initrd
-      doublePatchelf = (pkgs.stdenv.system == "armv5tel-linux");
+      doublePatchelf = pkgs.stdenv.isArm;
     }
     ''
       mkdir -p $out/bin $out/lib
-- 
GitLab


From f9b05ac1fe3bc2160536d0645a96aa5cc311625a Mon Sep 17 00:00:00 2001
From: Rickard Nilsson <rickynils@gmail.com>
Date: Mon, 28 Jan 2013 16:11:44 +0100
Subject: [PATCH 4369/5331] Parameterise the path to nixpkgs.

This makes it possible to build several NixOS systems that use different
nixpkgs in the same nix-build invocation. Today, you can't do that since
the <nixpkgs> path reference is hard-coded in lib/eval-config.nix.
---
 default.nix         | 7 ++++---
 lib/eval-config.nix | 7 ++++---
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/default.nix b/default.nix
index 9d1475b6961..abdd9d18fdd 100644
--- a/default.nix
+++ b/default.nix
@@ -1,11 +1,12 @@
 { configuration ? import ./lib/from-env.nix "NIXOS_CONFIG" <nixos-config>
 , system ? builtins.currentSystem
+, nixpkgs ? <nixpkgs>
 }:
 
 let
 
   eval = import ./lib/eval-config.nix {
-    inherit system;
+    inherit system nixpkgs;
     modules = [ configuration ];
   };
 
@@ -13,13 +14,13 @@ let
 
   # This is for `nixos-rebuild build-vm'.
   vmConfig = (import ./lib/eval-config.nix {
-    inherit system;
+    inherit system nixpkgs;
     modules = [ configuration ./modules/virtualisation/qemu-vm.nix ];
   }).config;
 
   # This is for `nixos-rebuild build-vm-with-bootloader'.
   vmWithBootLoaderConfig = (import ./lib/eval-config.nix {
-    inherit system;
+    inherit system nixpkgs;
     modules =
       [ configuration
         ./modules/virtualisation/qemu-vm.nix
diff --git a/lib/eval-config.nix b/lib/eval-config.nix
index c2bbf036af0..47e7d1a0eaf 100644
--- a/lib/eval-config.nix
+++ b/lib/eval-config.nix
@@ -7,6 +7,7 @@
 , baseModules ? import ../modules/module-list.nix
 , extraArgs ? {}
 , modules
+, nixpkgs ? <nixpkgs>
 }:
 
 let extraArgs_ = extraArgs; pkgs_ = pkgs; system_ = system; in
@@ -30,7 +31,7 @@ rec {
   extraArgs = extraArgs_ // {
     inherit pkgs modules baseModules;
     modulesPath = ../modules;
-    pkgs_i686 = import <nixpkgs> { system = "i686-linux"; };
+    pkgs_i686 = import nixpkgs { system = "i686-linux"; };
     utils = import ./utils.nix pkgs;
   };
 
@@ -47,7 +48,7 @@ rec {
   pkgs =
     if pkgs_ != null
     then pkgs_
-    else import <nixpkgs> (
+    else import nixpkgs (
       let
         system = if nixpkgsOptions.system != "" then nixpkgsOptions.system else system_;
         nixpkgsOptions = (import ./eval-config.nix {
@@ -55,7 +56,7 @@ rec {
           # For efficiency, leave out most NixOS modules; they don't
           # define nixpkgs.config, so it's pointless to evaluate them.
           baseModules = [ ../modules/misc/nixpkgs.nix ];
-          pkgs = import <nixpkgs> { system = system_; config = {}; };
+          pkgs = import nixpkgs { system = system_; config = {}; };
         }).optionDefinitions.nixpkgs;
       in
       {
-- 
GitLab


From fe85f4be6c3789941677cf796563babc5c5d6123 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= <viric@viric.name>
Date: Mon, 28 Jan 2013 20:58:46 +0000
Subject: [PATCH 4370/5331] Adding an untested bootloader for raspberrypi

---
 modules/module-list.nix                       |   1 +
 .../system/boot/loader/raspberrypi/builder.sh | 109 ++++++++++++++++++
 .../boot/loader/raspberrypi/raspberrypi.nix   |  51 ++++++++
 3 files changed, 161 insertions(+)
 create mode 100644 modules/system/boot/loader/raspberrypi/builder.sh
 create mode 100644 modules/system/boot/loader/raspberrypi/raspberrypi.nix

diff --git a/modules/module-list.nix b/modules/module-list.nix
index 9ad65594f4d..71d828f68d0 100644
--- a/modules/module-list.nix
+++ b/modules/module-list.nix
@@ -199,6 +199,7 @@
   ./system/boot/kernel.nix
   ./system/boot/loader/efi-boot-stub/efi-boot-stub.nix
   ./system/boot/loader/generations-dir/generations-dir.nix
+  ./system/boot/loader/raspberrypi/raspberrypi.nix
   ./system/boot/loader/grub/grub.nix
   ./system/boot/loader/grub/memtest.nix
   ./system/boot/loader/init-script/init-script.nix
diff --git a/modules/system/boot/loader/raspberrypi/builder.sh b/modules/system/boot/loader/raspberrypi/builder.sh
new file mode 100644
index 00000000000..2a32fcd540e
--- /dev/null
+++ b/modules/system/boot/loader/raspberrypi/builder.sh
@@ -0,0 +1,109 @@
+#! @bash@/bin/sh -e
+
+shopt -s nullglob
+
+export PATH=/empty
+for i in @path@; do PATH=$PATH:$i/bin; done
+
+default=$1
+if test -z "$1"; then
+    echo "Syntax: builder.sh <DEFAULT-CONFIG>"
+    exit 1
+fi
+
+echo "updating the boot generations directory..."
+
+mkdir -p /boot/old
+
+# Convert a path to a file in the Nix store such as
+# /nix/store/<hash>-<name>/file to <hash>-<name>-<file>.
+cleanName() {
+    local path="$1"
+    echo "$path" | sed 's|^/nix/store/||' | sed 's|/|-|g'
+}
+
+# Copy a file from the Nix store to /boot/kernels.
+declare -A filesCopied
+
+copyToKernelsDir() {
+    local src="$1"
+    local dst="/boot/old/$(cleanName $src)"
+    # Don't copy the file if $dst already exists.  This means that we
+    # have to create $dst atomically to prevent partially copied
+    # kernels or initrd if this script is ever interrupted.
+    if ! test -e $dst; then
+        local dstTmp=$dst.tmp.$$
+        cp $src $dstTmp
+        mv $dstTmp $dst
+    fi
+    filesCopied[$dst]=1
+    result=$dst
+}
+
+copyForced() {
+    local src="$1"
+    local dst="$2"
+    cp $src $dst.tmp
+    mv $dst.tmp $dst
+}
+
+outdir=/boot/old
+mkdir -p $outdir || true
+
+# Copy its kernel and initrd to /boot/kernels.
+addEntry() {
+    local path="$1"
+    local generation="$2"
+
+    if ! test -e $path/kernel -a -e $path/initrd; then
+        return
+    fi
+
+    local kernel=$(readlink -f $path/kernel)
+    # local initrd=$(readlink -f $path/initrd)
+
+    if test -n "@copyKernels@"; then
+        copyToKernelsDir $kernel; kernel=$result
+        # copyToKernelsDir $initrd; initrd=$result
+    fi
+    
+    echo $(readlink -f $path) > $outdir/$generation-system
+    echo $(readlink -f $path/init) > $outdir/$generation-init
+    cp $path/kernel-params $outdir/$generation-cmdline.txt
+    # echo $initrd > $outdir/$generation-initrd
+    echo $kernel > $outdir/$generation-kernel
+
+    if test $(readlink -f "$path") = "$default"; then
+      copyForced $kernel /boot/kernel.img
+      # copyForced $initrd /boot/initrd
+      cp "$(readlink -f "$path/init")" /boot/nixos-init
+      cp $path/kernel-params /boot/cmdline.txt
+
+      echo "$2" > /boot/defaultgeneration
+    fi
+}
+
+# Add all generations of the system profile to the menu, in reverse
+# (most recent to least recent) order.
+for generation in $(
+    (cd /nix/var/nix/profiles && ls -d system-*-link) \
+    | sed 's/system-\([0-9]\+\)-link/\1/' \
+    | sort -n -r); do
+    link=/nix/var/nix/profiles/system-$generation-link
+    addEntry $link $generation
+done
+
+# Add the firmware files
+fwdir=@firmware@/share/raspberrypi/boot/
+copyForced $fwdir/bootcode.bin  /boot/bootcode.bin
+copyForced $fwdir/fixup.dat     /boot/fixup.dat
+copyForced $fwdir/fixup_cd.dat  /boot/fixup_cd.dat
+copyForced $fwdir/start.elf     /boot/start.elf
+copyForced $fwdir/start_cd.elf  /boot/start_cd.elf
+
+# Remove obsolete files from /boot/old.
+for fn in /boot/old/*linux* /boot/old/*initrd*; do
+    if ! test "${filesCopied[$fn]}" = 1; then
+        rm -vf -- "$fn"
+    fi
+done
diff --git a/modules/system/boot/loader/raspberrypi/raspberrypi.nix b/modules/system/boot/loader/raspberrypi/raspberrypi.nix
new file mode 100644
index 00000000000..f083a002b42
--- /dev/null
+++ b/modules/system/boot/loader/raspberrypi/raspberrypi.nix
@@ -0,0 +1,51 @@
+{pkgs, config, ...}:
+
+###### interface
+let
+  inherit (pkgs.lib) mkOption mkIf;
+
+  options = {
+    boot = {
+      loader = {
+        raspberryPi = {
+          enable = mkOption {
+            default = false;
+            description = ''
+              Whether to create files with the system generations in
+              <literal>/boot</literal>. 
+              <literal>/boot/old</literal> will hold files from old generations.
+            '';
+          };
+        };
+      };
+    };
+  };
+
+in
+
+###### implementation
+let
+  builder = pkgs.substituteAll {
+    src = ./builder.sh;
+    isExecutable = true;
+    inherit (pkgs) bash;
+    path = [pkgs.coreutils pkgs.gnused pkgs.gnugrep];
+    firmware = pkgs.raspberrypifw;
+  };
+
+  platform = pkgs.stdenv.platform;
+in
+{
+  require = [
+    options
+
+    # config.system.build
+    # ../system/system-options.nix
+  ];
+
+  system = mkIf config.boot.loader.raspberryPi.enable {
+    build.installBootLoader = builder;
+    boot.loader.id = "raspberrypi";
+    boot.loader.kernelFile = platform.kernelTarget;
+  };
+}
-- 
GitLab


From 2c27a416864916db3c8e7ed4c6c8a4cf00f47990 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= <viric@viric.name>
Date: Tue, 29 Jan 2013 20:08:38 +0100
Subject: [PATCH 4371/5331] Fixing the init= in raspberrypi loader.

---
 modules/system/boot/loader/raspberrypi/builder.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/system/boot/loader/raspberrypi/builder.sh b/modules/system/boot/loader/raspberrypi/builder.sh
index 2a32fcd540e..f6ccfe493d8 100644
--- a/modules/system/boot/loader/raspberrypi/builder.sh
+++ b/modules/system/boot/loader/raspberrypi/builder.sh
@@ -77,7 +77,7 @@ addEntry() {
       copyForced $kernel /boot/kernel.img
       # copyForced $initrd /boot/initrd
       cp "$(readlink -f "$path/init")" /boot/nixos-init
-      cp $path/kernel-params /boot/cmdline.txt
+      echo "`cat $path/kernel-params` init=$path/init" >/boot/cmdline.txt
 
       echo "$2" > /boot/defaultgeneration
     fi
-- 
GitLab


From 41eaa4615f4916a097731a6a364f19dae81e83b7 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Wed, 30 Jan 2013 02:43:37 -0500
Subject: [PATCH 4372/5331] linuxPackages_2_6_32_xen is gone

---
 modules/virtualisation/xen-dom0.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/virtualisation/xen-dom0.nix b/modules/virtualisation/xen-dom0.nix
index 8e2c066223e..4c24c6a7826 100644
--- a/modules/virtualisation/xen-dom0.nix
+++ b/modules/virtualisation/xen-dom0.nix
@@ -68,7 +68,7 @@ in
     environment.systemPackages = [ xen ];
 
     # Domain 0 requires a pvops-enabled kernel.
-    boot.kernelPackages = pkgs.linuxPackages_2_6_32_xen;
+    boot.kernelPackages = pkgs.linuxPackages_3_2_xen;
 
     boot.kernelModules =
       [ "xen_evtchn" "xen_gntdev" "xen_blkback" "xen_netback" "xen_pciback"
-- 
GitLab


From 0c021be95f6718fc1e544b52248564a5549d9e30 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 30 Jan 2013 12:26:41 +0100
Subject: [PATCH 4373/5331] NixOS channel: Use XZ compression for nixexprs.tar

---
 release.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/release.nix b/release.nix
index 97e2bec823f..2b95b86691c 100644
--- a/release.nix
+++ b/release.nix
@@ -130,7 +130,7 @@ let
           NIX_STATE_DIR=$TMPDIR nix-env -f ../$releaseName/default.nix -qaP --meta --xml \* > /dev/null
           cd ..
           chmod -R u+w $releaseName
-          tar cfj $out/tarballs/$releaseName.tar.bz2 $releaseName
+          tar cfJ $out/tarballs/$releaseName.tar.xz $releaseName
         ''; # */
       };
 
-- 
GitLab


From 2f97304833e5a1348306adc914f33441e169836a Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 30 Jan 2013 14:05:53 +0100
Subject: [PATCH 4374/5331] =?UTF-8?q?Add=20an=20option=20=E2=80=98environm?=
 =?UTF-8?q?ent.interactiveShellInit=E2=80=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This is like ‘environment.shellInit’, but only for interactive shells.
---
 modules/programs/bash/bash.nix  | 48 +++++++++++++++++++++++----------
 modules/programs/bash/bashrc.sh |  7 +----
 2 files changed, 35 insertions(+), 20 deletions(-)

diff --git a/modules/programs/bash/bash.nix b/modules/programs/bash/bash.nix
index a4afb733fa7..4f227ad1a27 100644
--- a/modules/programs/bash/bash.nix
+++ b/modules/programs/bash/bash.nix
@@ -7,7 +7,9 @@ with pkgs.lib;
 
 let
 
-  initBashCompletion = optionalString config.environment.enableBashCompletion ''
+  cfg = config.environment;
+
+  initBashCompletion = optionalString cfg.enableBashCompletion ''
     # Check whether we're running a version of Bash that has support for
     # programmable completion. If we do, enable all modules installed in
     # the system (and user profile).
@@ -26,7 +28,7 @@ let
   '';
 
   shellAliases = concatStringsSep "\n" (
-    mapAttrsFlatten (k: v: "alias ${k}='${v}'") config.environment.shellAliases
+    mapAttrsFlatten (k: v: "alias ${k}='${v}'") cfg.shellAliases
   );
 
   options = {
@@ -41,24 +43,33 @@ let
           PS1="\[\033]2;\h:\u:\w\007\]$PS1"
         fi
       '';
-      description = "
-        Script used to initialized shell prompt.
-      ";
+      description = ''
+        Shell script code used to initialise the shell prompt.
+      '';
       type = with pkgs.lib.types; string;
     };
 
     environment.shellInit = mkOption {
       default = "";
       example = ''export PATH=/godi/bin/:$PATH'';
-      description = "
-        Script used to initialized user shell environments.
-      ";
+      description = ''
+        Shell script code called during login shell initialisation.
+      '';
+      type = with pkgs.lib.types; string;
+    };
+
+    environment.interactiveShellInit = mkOption {
+      default = "";
+      example = ''export PATH=/godi/bin/:$PATH'';
+      description = ''
+        Shell script code called during interactive shell initialisation.
+      '';
       type = with pkgs.lib.types; string;
     };
 
     environment.enableBashCompletion = mkOption {
       default = false;
-      description = "Enable bash-completion for all interactive shells.";
+      description = "Enable Bash completion for all interactive shells.";
       type = with pkgs.lib.types; bool;
     };
 
@@ -86,7 +97,7 @@ in
         source = pkgs.substituteAll {
           src = ./profile.sh;
           wrapperDir = config.security.wrapperDir;
-          shellInit = config.environment.shellInit;
+          inherit (cfg) shellInit;
         };
         target = "profile";
       }
@@ -96,8 +107,7 @@ in
         # configured properly.
         source = pkgs.substituteAll {
           src = ./bashrc.sh;
-          inherit (config.environment) promptInit;
-          inherit initBashCompletion shellAliases;
+          inherit (cfg) interactiveShellInit;
         };
         target = "bashrc";
       }
@@ -115,6 +125,16 @@ in
       which = "type -P";
     };
 
+  environment.interactiveShellInit =
+    ''
+      # Check the window size after every command.
+      shopt -s checkwinsize
+
+      ${cfg.promptInit}
+      ${initBashCompletion}
+      ${shellAliases}
+    '';
+
   system.build.binsh = pkgs.bashInteractive;
 
   system.activationScripts.binsh = stringAfter [ "stdio" ]
@@ -122,9 +142,9 @@ in
       # Create the required /bin/sh symlink; otherwise lots of things
       # (notably the system() function) won't work.
       mkdir -m 0755 -p /bin
-      ln -sfn "${config.environment.binsh}" /bin/.sh.tmp
+      ln -sfn "${cfg.binsh}" /bin/.sh.tmp
       mv /bin/.sh.tmp /bin/sh # atomically replace /bin/sh
     '';
 
-  environment.pathsToLink = optional config.environment.enableBashCompletion "/etc/bash_completion.d";
+  environment.pathsToLink = optional cfg.enableBashCompletion "/etc/bash_completion.d";
 }
diff --git a/modules/programs/bash/bashrc.sh b/modules/programs/bash/bashrc.sh
index 4615004d47c..b7c139416c0 100644
--- a/modules/programs/bash/bashrc.sh
+++ b/modules/programs/bash/bashrc.sh
@@ -16,9 +16,4 @@ fi
 # We are not always an interactive shell.
 if [ -z "$PS1" ]; then return; fi
 
-# Check the window size after every command.
-shopt -s checkwinsize
-
-@promptInit@
-@initBashCompletion@
-@shellAliases@
+@interactiveShellInit@
-- 
GitLab


From b89f941b2074b104be303c3e7e47cf4a97c3128d Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 30 Jan 2013 14:42:30 +0100
Subject: [PATCH 4375/5331] Provide missing command suggestions, Ubuntu style
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

If the user tries to run a program that doesn't exist from Bash, the
program name is looked up in a database that maps to Nix package
names.  If it is found, we print out a message like:

  $ pdflatex
  The program ‘pdflatex’ is currently not installed. It is provided by
  several packages. You can install it by typing one of the following:
    nix-env -i tetex
    nix-env -i texlive-core

If the environment variable $NIX_AUTO_INSTALL is set, the command is
installed and executed automatically:

  $ hello --version
  The program ‘hello’ is currently not installed. It is provided by
  the package ‘hello’, which I will now install for you.
  installing `hello-2.8'
  hello (GNU hello) 2.8
  Copyright (C) 2011 Free Software Foundation, Inc. ...

To use this, you must currently manually put the SQLite programs
database in /var/lib/nixos/programs.sqlite.  In the future, this file
should be provided as part of the NixOS channel so it gets updated
automatically.  To get a test version:

  $ curl http://nixos.org/~eelco/programs.sqlite.xz | xz -d > /var/lib/nixos/programs.sqlite
---
 modules/module-list.nix                     |  1 +
 modules/programs/bash/bash.nix              |  2 +-
 modules/programs/bash/command-not-found.nix | 48 +++++++++++++++++++++
 modules/programs/bash/command-not-found.pl  | 48 +++++++++++++++++++++
 4 files changed, 98 insertions(+), 1 deletion(-)
 create mode 100644 modules/programs/bash/command-not-found.nix
 create mode 100644 modules/programs/bash/command-not-found.pl

diff --git a/modules/module-list.nix b/modules/module-list.nix
index 9ad65594f4d..45facbfd1c7 100644
--- a/modules/module-list.nix
+++ b/modules/module-list.nix
@@ -36,6 +36,7 @@
   ./misc/passthru.nix
   ./misc/version.nix
   ./programs/bash/bash.nix
+  ./programs/bash/command-not-found.nix
   ./programs/blcr.nix
   ./programs/info.nix
   ./programs/shadow.nix
diff --git a/modules/programs/bash/bash.nix b/modules/programs/bash/bash.nix
index 4f227ad1a27..493df762e17 100644
--- a/modules/programs/bash/bash.nix
+++ b/modules/programs/bash/bash.nix
@@ -33,7 +33,7 @@ let
 
   options = {
 
-    environment.promptInit =  mkOption {
+    environment.promptInit = mkOption {
       default = ''
         # Provide a nice prompt.
         PROMPT_COLOR="1;31m"
diff --git a/modules/programs/bash/command-not-found.nix b/modules/programs/bash/command-not-found.nix
new file mode 100644
index 00000000000..1aecd9051e5
--- /dev/null
+++ b/modules/programs/bash/command-not-found.nix
@@ -0,0 +1,48 @@
+# This module provides suggestions of packages to install if the user
+# tries to run a missing command in Bash.  This is implemented using a
+# SQLite database that maps program names to Nix package names (e.g.,
+# "pdflatex" is mapped to "tetex").
+
+{ config, pkgs, ... }:
+
+with pkgs.lib;
+
+let
+
+  commandNotFound = pkgs.substituteAll {
+    name = "command-not-found";
+    dir = "bin";
+    src = ./command-not-found.pl;
+    isExecutable = true;
+    inherit (pkgs) perl;
+    perlFlags = concatStrings (map (path: "-I ${path}/lib/perl5/site_perl ")
+      [ pkgs.perlPackages.DBI pkgs.perlPackages.DBDSQLite ]);
+  };
+
+in
+
+{
+
+  environment.interactiveShellInit =
+    ''
+      # This function is called whenever a command is not found.
+      command_not_found_handle() {
+        local p=/run/current-system/sw/bin/command-not-found
+        if [ -x $p -a -f /var/lib/nixos/programs.sqlite ]; then
+          # Run the helper program.
+          $p "$1"
+          # Retry the command if we just installed it.
+          if [ $? = 126 ]; then
+            "$@"
+          fi
+        else
+          echo "$1: command not found" >&2
+        fi
+      }
+    '';
+
+  environment.systemPackages = [ commandNotFound ];
+
+  # TODO: tab completion for uninstalled commands! :-)
+
+}
diff --git a/modules/programs/bash/command-not-found.pl b/modules/programs/bash/command-not-found.pl
new file mode 100644
index 00000000000..b497b05d33e
--- /dev/null
+++ b/modules/programs/bash/command-not-found.pl
@@ -0,0 +1,48 @@
+#! @perl@/bin/perl -w @perlFlags@
+
+use strict;
+use DBI;
+use DBD::SQLite;
+use Config;
+
+my $program = $ARGV[0];
+
+my $dbPath = "/var/lib/nixos/programs.sqlite";
+
+my $dbh = DBI->connect("dbi:SQLite:dbname=$dbPath", "", "")
+    or die "cannot open database `$dbPath'";
+$dbh->{RaiseError} = 0;
+$dbh->{PrintError} = 0;
+
+my $system = $ENV{"NIX_SYSTEM"} // $Config{myarchname};
+
+my $res = $dbh->selectall_arrayref(
+    "select package from Programs where system = ? and name = ?",
+    { Slice => {} }, $system, $program);
+
+if (!defined $res || scalar @$res == 0) {
+    print STDERR "$program: command not found\n";
+} elsif (scalar @$res == 1) {
+    my $package = @$res[0]->{package};
+    if ($ENV{"NIX_AUTO_INSTALL"} // "") {
+        print STDERR <<EOF;
+The program ‘$program’ is currently not installed. It is provided by
+the package ‘$package’, which I will now install for you.
+EOF
+        ;
+        exit 126 if system("nix-env", "-i", $package) == 0;
+    } else {
+        print STDERR <<EOF;
+The program ‘$program’ is currently not installed. You can install it by typing:
+  nix-env -i $package
+EOF
+    }
+} else {
+    print STDERR <<EOF;
+The program ‘$program’ is currently not installed. It is provided by
+several packages. You can install it by typing one of the following:
+EOF
+    print STDERR "  nix-env -i $_->{package}\n" foreach @$res;
+}
+
+exit 127;
-- 
GitLab


From 37985ad66bf4aa0fa38479cd955c3cca8ba5c801 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 30 Jan 2013 15:01:31 +0100
Subject: [PATCH 4376/5331] Make xz available by default

NixOS depends on xz anyway, so we may as well make it available.
---
 modules/config/system-path.nix | 3 ++-
 modules/profiles/base.nix      | 1 -
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/config/system-path.nix b/modules/config/system-path.nix
index f9f0d11098a..8c36015718c 100644
--- a/modules/config/system-path.nix
+++ b/modules/config/system-path.nix
@@ -34,6 +34,7 @@ let
       pkgs.gnused
       pkgs.gnutar
       pkgs.gzip
+      pkgs.xz
       pkgs.less
       pkgs.libcap
       pkgs.man
@@ -51,7 +52,7 @@ let
       pkgs.time
       pkgs.usbutils
       pkgs.utillinux
-      extraManpages      
+      extraManpages
     ];
 
 
diff --git a/modules/profiles/base.nix b/modules/profiles/base.nix
index 2240311c885..20b808c29e0 100644
--- a/modules/profiles/base.nix
+++ b/modules/profiles/base.nix
@@ -40,7 +40,6 @@
     pkgs.unrar
     pkgs.unzip
     pkgs.zip
-    pkgs.xz
     pkgs.dar # disk archiver
     pkgs.cabextract
 
-- 
GitLab


From d50b22e8823fdef1ae67494221f065a11ac1b937 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= <viric@viric.name>
Date: Wed, 30 Jan 2013 20:22:40 +0100
Subject: [PATCH 4377/5331] Adding vaapi drivers to nixos

Enabling nvidia and intel drivers by default. I tried both,
and they work fine with "vlc --ffmpeg-hw".
---
 modules/services/x11/display-managers/default.nix | 13 +++++++++++++
 modules/services/x11/xserver.nix                  | 10 +++++++++-
 2 files changed, 22 insertions(+), 1 deletion(-)

diff --git a/modules/services/x11/display-managers/default.nix b/modules/services/x11/display-managers/default.nix
index 1f842c0c953..42b5ce4aac5 100644
--- a/modules/services/x11/display-managers/default.nix
+++ b/modules/services/x11/display-managers/default.nix
@@ -16,6 +16,17 @@ let
   cfg = config.services.xserver;
   xorg = pkgs.xorg;
 
+  vaapiDrivers = pkgs.buildEnv {
+    name = "vaapi-drivers";
+    paths = cfg.vaapiDrivers;
+    pathsToLink = "/lib/dri";
+
+    # To admit zero-length 'paths'
+    postBuild = "
+      ensureDir $out/lib/dri
+    ";
+  };
+
   # file provided by services.xserver.displayManager.session.script
   xsession = wm: dm: pkgs.writeScript "xsession"
     ''
@@ -80,6 +91,8 @@ let
           ${xorg.xrdb}/bin/xrdb -merge ~/.Xdefaults
       fi
 
+      export LIBVA_DRIVERS_PATH=${vaapiDrivers}/lib/dri;
+
       source /etc/profile
 
       ${cfg.displayManager.sessionCommands}
diff --git a/modules/services/x11/xserver.nix b/modules/services/x11/xserver.nix
index d4dc8b761bf..c93c443287b 100644
--- a/modules/services/x11/xserver.nix
+++ b/modules/services/x11/xserver.nix
@@ -30,7 +30,6 @@ let
     (name: { inherit name; driverName = name; } //
       attrByPath [name] (if (hasAttr ("xf86video" + name) xorg) then { modules = [(getAttr ("xf86video" + name) xorg) ]; } else throw "unknown video driver `${name}'") knownVideoDrivers);
 
-
   fontsForXServer =
     config.fonts.fonts ++
     # We don't want these fonts in fonts.conf, because then modern,
@@ -204,6 +203,15 @@ in
         '';
       };
 
+      vaapiDrivers = mkOption {
+        default = [ pkgs.vaapiIntel pkgs.vaapiVdpau ];
+        defaultText = "[ pkgs.vaapiIntel pkgs.vaapiVdpau ]";
+        example = "[ pkgs.vaapiIntel pkgs.vaapiVdpau ]";
+        description = ''
+          Names of the packages providing libva acceleration drivers.
+        '';
+      };
+
       driSupport = mkOption {
         default = true;
         description = ''
-- 
GitLab


From a61154c0d4523267d57a5c1e2c13de49e909c39e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= <viric@viric.name>
Date: Wed, 30 Jan 2013 20:51:49 +0100
Subject: [PATCH 4378/5331] Adding support of the Intel 2230 wireless card to
 nixos

It should go to the livecd, added to the all-hardware profile.
Yes, the card is called 2230, the ucode called 2030:
http://wireless.kernel.org/en/users/Drivers/iwlwifi
---
 modules/hardware/network/intel-2030.nix | 5 +++++
 modules/profiles/all-hardware.nix       | 1 +
 2 files changed, 6 insertions(+)
 create mode 100644 modules/hardware/network/intel-2030.nix

diff --git a/modules/hardware/network/intel-2030.nix b/modules/hardware/network/intel-2030.nix
new file mode 100644
index 00000000000..303363eaab2
--- /dev/null
+++ b/modules/hardware/network/intel-2030.nix
@@ -0,0 +1,5 @@
+{pkgs, config, ...}:
+
+{
+  hardware.firmware = [ pkgs.iwlwifi2030ucode ];
+}
diff --git a/modules/profiles/all-hardware.nix b/modules/profiles/all-hardware.nix
index b5e25fffb42..617616ee6cc 100644
--- a/modules/profiles/all-hardware.nix
+++ b/modules/profiles/all-hardware.nix
@@ -53,6 +53,7 @@
       ../hardware/network/intel-6000.nix
       ../hardware/network/intel-6000g2a.nix
       ../hardware/network/intel-6000g2b.nix
+      ../hardware/network/intel-2030.nix
       ../hardware/network/broadcom-43xx.nix
       ../hardware/network/zydas-zd1211.nix
       ../hardware/video/radeon.nix
-- 
GitLab


From d1a9ccbaf412e0dac4726587bab62b2a0baf96ec Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= <viric@viric.name>
Date: Wed, 30 Jan 2013 20:58:00 +0100
Subject: [PATCH 4379/5331] Changing ensureDir -> mkdir -p

(told by shlevy)
---
 modules/services/x11/display-managers/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/services/x11/display-managers/default.nix b/modules/services/x11/display-managers/default.nix
index 42b5ce4aac5..cf4bbedfa27 100644
--- a/modules/services/x11/display-managers/default.nix
+++ b/modules/services/x11/display-managers/default.nix
@@ -23,7 +23,7 @@ let
 
     # To admit zero-length 'paths'
     postBuild = "
-      ensureDir $out/lib/dri
+      mkdir -p $out/lib/dri
     ";
   };
 
-- 
GitLab


From 9e63011176334abbfaf48fab4a42e78739722bef Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= <viric@viric.name>
Date: Sun, 27 Jan 2013 20:42:45 +0000
Subject: [PATCH 4380/5331] Fixing the doublePatchelf in initrd; it should be
 for all ARM.

---
 modules/system/boot/stage-1.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/system/boot/stage-1.nix b/modules/system/boot/stage-1.nix
index 942a5271484..a66e609ba7b 100644
--- a/modules/system/boot/stage-1.nix
+++ b/modules/system/boot/stage-1.nix
@@ -149,7 +149,7 @@ let
   extraUtils = pkgs.runCommand "extra-utils"
     { buildInputs = [pkgs.nukeReferences];
       allowedReferences = [ "out" ]; # prevent accidents like glibc being included in the initrd
-      doublePatchelf = (pkgs.stdenv.system == "armv5tel-linux");
+      doublePatchelf = pkgs.stdenv.isArm;
     }
     ''
       mkdir -p $out/bin $out/lib
-- 
GitLab


From 88e456914784f8d96b4e9894ca560b4549dba4ad Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 1 Feb 2013 13:39:47 +0100
Subject: [PATCH 4381/5331] systemd: Allow whitespace in environment values

---
 modules/system/boot/systemd.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/system/boot/systemd.nix b/modules/system/boot/systemd.nix
index 215f625467a..c958433ff45 100644
--- a/modules/system/boot/systemd.nix
+++ b/modules/system/boot/systemd.nix
@@ -226,7 +226,7 @@ let
           Environment=PATH=${def.path}
           Environment=LD_LIBRARY_PATH=
           ${let env = cfg.globalEnvironment // def.environment;
-            in concatMapStrings (n: "Environment=${n}=${getAttr n env}\n") (attrNames env)}
+            in concatMapStrings (n: "Environment=\"${n}=${getAttr n env}\"\n") (attrNames env)}
           ${optionalString (!def.restartIfChanged) "X-RestartIfChanged=false"}
           ${optionalString (!def.stopIfChanged) "X-StopIfChanged=false"}
 
-- 
GitLab


From 02e209b139822ee64a55a0d8d04770f947a7d411 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Sat, 2 Feb 2013 00:03:45 -0500
Subject: [PATCH 4382/5331] Add gummiboot module.

We should probably eventually get rid of the old direct boot stub approach.
---
 modules/module-list.nix                       |   2 +
 modules/rename.nix                            |   7 +
 .../loader/efi-boot-stub/efi-boot-stub.nix    |  51 +------
 modules/system/boot/loader/efi.nix            |  53 +++++++
 .../loader/gummiboot/gummiboot-builder.py     | 144 ++++++++++++++++++
 .../boot/loader/gummiboot/gummiboot.nix       |  71 +++++++++
 6 files changed, 284 insertions(+), 44 deletions(-)
 create mode 100644 modules/system/boot/loader/efi.nix
 create mode 100644 modules/system/boot/loader/gummiboot/gummiboot-builder.py
 create mode 100644 modules/system/boot/loader/gummiboot/gummiboot.nix

diff --git a/modules/module-list.nix b/modules/module-list.nix
index cf47e42665d..3fa741fa5d9 100644
--- a/modules/module-list.nix
+++ b/modules/module-list.nix
@@ -199,7 +199,9 @@
   ./system/activation/top-level.nix
   ./system/boot/kernel.nix
   ./system/boot/loader/efi-boot-stub/efi-boot-stub.nix
+  ./system/boot/loader/efi.nix
   ./system/boot/loader/generations-dir/generations-dir.nix
+  ./system/boot/loader/gummiboot/gummiboot.nix
   ./system/boot/loader/raspberrypi/raspberrypi.nix
   ./system/boot/loader/grub/grub.nix
   ./system/boot/loader/grub/memtest.nix
diff --git a/modules/rename.nix b/modules/rename.nix
index 534137d4e09..858056732a1 100644
--- a/modules/rename.nix
+++ b/modules/rename.nix
@@ -99,4 +99,11 @@ in zipModules ([]
 ++ rename deprecated "kde.extraPackages" "environment.kdePackages"
 # ++ rename obsolete "environment.kdePackages" "environment.systemPackages" # !!! doesn't work!
 
+# Multiple efi bootloaders now
+++ rename obsolete "boot.loader.efiBootStub.efiSysMountPoint" "boot.loader.efi.efiSysMountPoint"
+++ rename obsolete "boot.loader.efiBootStub.efiDisk" "boot.loader.efi.efibootmgr.efiDisk"
+++ rename obsolete "boot.loader.efiBootStub.efiPartition" "boot.loader.efi.efibootmgr.efiPartition"
+++ rename obsolete "boot.loader.efiBootStub.postEfiBootMgrCommands" "boot.loader.efi.efibootmgr.postEfiBootMgrCommands"
+++ rename obsolete "boot.loader.efiBootStub.runEfibootmgr" "boot.loader.efi.efibootmgr.enable"
+
 ) # do not add renaming after this.
diff --git a/modules/system/boot/loader/efi-boot-stub/efi-boot-stub.nix b/modules/system/boot/loader/efi-boot-stub/efi-boot-stub.nix
index 618c8d7737a..529de0f0e54 100644
--- a/modules/system/boot/loader/efi-boot-stub/efi-boot-stub.nix
+++ b/modules/system/boot/loader/efi-boot-stub/efi-boot-stub.nix
@@ -8,7 +8,13 @@ let
     isExecutable = true;
     inherit (pkgs) bash;
     path = [pkgs.coreutils pkgs.gnused pkgs.gnugrep pkgs.glibc] ++ (pkgs.stdenv.lib.optionals config.boot.loader.efiBootStub.runEfibootmgr [pkgs.efibootmgr pkgs.module_init_tools]);
-    inherit (config.boot.loader.efiBootStub) efiSysMountPoint runEfibootmgr installStartupNsh efiDisk efiPartition postEfiBootMgrCommands;
+    inherit (config.boot.loader.efiBootStub) installStartupNsh;
+
+    inherit (config.boot.loader.efi) efiSysMountPoint;
+
+    inherit (config.boot.loader.efi.efibootmgr) efiDisk efiPartition postEfiBootMgrCommands;
+
+    runEfibootmgr = config.boot.loader.efi.efibootmgr.enable;
 
     efiShell = if config.boot.loader.efiBootStub.installShell then
       if pkgs.stdenv.isi686 then
@@ -51,38 +57,6 @@ in
             '';
           };
 
-          efiDisk = mkOption {
-            default = "/dev/sda";
-            description = ''
-              The disk that contains the EFI system partition. Only used by
-              efibootmgr
-            '';
-          };
-
-          efiPartition = mkOption {
-            default = "1";
-            description = ''
-              The partition number of the EFI system partition. Only used by
-              efibootmgr
-            '';
-          };
-
-          efiSysMountPoint = mkOption {
-            default = "/boot";
-            description = ''
-              Where the EFI System Partition is mounted.
-            '';
-          };
-
-          runEfibootmgr = mkOption {
-            default = false;
-            description = ''
-              Whether to run efibootmgr to add the configuration to the boot options list.
-              WARNING! efibootmgr has been rumored to brick Apple firmware on
-              old kernels! Don't use it on kernels older than 2.6.39!
-            '';
-          };
-
           installStartupNsh = mkOption {
             default = false;
             description = ''
@@ -103,17 +77,6 @@ in
             '';
           };
 
-          postEfiBootMgrCommands = mkOption {
-            default = "";
-            type = types.string;
-            description = ''
-              Shell commands to be executed immediately after efibootmgr has setup the system EFI.
-              Some systems do not follow the EFI specifications properly and insert extra entries.
-              Others will brick (fix by removing battery) on boot when it finds more than X entries.
-              This hook allows for running a few extra efibootmgr commands to combat these issues.
-            '';
-          };
-
         };
       };
     };
diff --git a/modules/system/boot/loader/efi.nix b/modules/system/boot/loader/efi.nix
new file mode 100644
index 00000000000..41074908bff
--- /dev/null
+++ b/modules/system/boot/loader/efi.nix
@@ -0,0 +1,53 @@
+{ pkgs, ... }:
+
+with pkgs.lib;
+
+{
+  options.boot.loader.efi = {
+    efibootmgr = {
+      efiDisk = mkOption {
+        default = "/dev/sda";
+
+        type = types.string;
+
+        description = "The disk that contains the EFI system partition.";
+      };
+
+      enable = mkOption {
+        default = false;
+
+        type = types.bool;
+
+        description = ''
+          Whether to run efibootmgr to add the efi bootloaders configuration to the boot options list.
+          WARNING! efibootmgr has been rumored to brick Apple firmware on
+          old kernels! Don't use it on kernels older than 2.6.39!
+        '';
+      };
+
+      efiPartition = mkOption {
+        default = "1";
+        description = "The partition number of the EFI system partition.";
+      };
+
+      postEfiBootMgrCommands = mkOption {
+        default = "";
+        type = types.string;
+        description = ''
+          Shell commands to be executed immediately after efibootmgr has setup the system EFI.
+          Some systems do not follow the EFI specifications properly and insert extra entries.
+          Others will brick (fix by removing battery) on boot when it finds more than X entries.
+          This hook allows for running a few extra efibootmgr commands to combat these issues.
+        '';
+      };
+    };
+
+    efiSysMountPoint = mkOption {
+      default = "/boot";
+
+      type = types.string;
+
+      description = "Where the EFI System Partition is mounted.";
+    };
+  };
+}
diff --git a/modules/system/boot/loader/gummiboot/gummiboot-builder.py b/modules/system/boot/loader/gummiboot/gummiboot-builder.py
new file mode 100644
index 00000000000..5da9746cdbd
--- /dev/null
+++ b/modules/system/boot/loader/gummiboot/gummiboot-builder.py
@@ -0,0 +1,144 @@
+#! @python@/bin/python
+import argparse
+import shutil
+import os
+import errno
+import subprocess
+import glob
+import tempfile
+
+def copy_if_not_exists(source, dest):
+    known_paths.append(dest)
+    if not os.path.exists(dest):
+        shutil.copyfile(source, dest)
+
+system_dir = lambda generation: "/nix/var/nix/profiles/system-%d-link" % (generation)
+
+def write_entry(generation, kernel, initrd):
+    entry_file = "@efiSysMountPoint@/loader/entries/nixos-generation-%d.conf" % (generation)
+    if os.path.exists(entry_file):
+        return
+    generation_dir = os.readlink(system_dir(generation))
+    tmp_path = "%s.tmp" % (entry_file)
+    kernel_params = "systemConfig=%s init=%s/init " % (generation_dir, generation_dir)
+    with open("%s/kernel-params" % (generation_dir)) as params_file:
+        kernel_params = kernel_params + params_file.read()
+    with open("/etc/machine-id") as machine_file:
+        machine_id = machine_file.readlines()[0]
+    with open(tmp_path, 'w') as f:
+        print >> f, "title NixOS"
+        print >> f, "version Generation %d" % (generation)
+        print >> f, "machine-id %s" % (machine_id)
+        print >> f, "linux %s" % (kernel)
+        print >> f, "initrd %s" % (initrd)
+        print >> f, "options %s" % (kernel_params)
+    os.rename(tmp_path, entry_file)
+
+def write_loader_conf(generation):
+    with open("@efiSysMountPoint@/loader/loader.conf.tmp", 'w') as f:
+        if "@timeout@" != "":
+            print >> f, "timeout @timeout@"
+        print >> f, "default nixos-generation-%d" % (generation)
+    os.rename("@efiSysMountPoint@/loader/loader.conf.tmp", "@efiSysMountPoint@/loader/loader.conf")
+
+def copy_from_profile(generation, name):
+    store_file_path = os.readlink("%s/%s" % (system_dir(generation), name))
+    suffix = os.path.basename(store_file_path)
+    store_dir = os.path.basename(os.path.dirname(store_file_path))
+    efi_file_path = "/efi/nixos/%s-%s.efi" % (store_dir, suffix)
+    copy_if_not_exists(store_file_path, "@efiSysMountPoint@%s" % (efi_file_path))
+    return efi_file_path
+
+def add_entry(generation):
+    efi_kernel_path = copy_from_profile(generation, "kernel")
+    efi_initrd_path = copy_from_profile(generation, "initrd")
+    write_entry(generation, efi_kernel_path, efi_initrd_path)
+
+def mkdir_p(path):
+    try:
+        os.makedirs(path)
+    except OSError as e:
+        if e.errno != errno.EEXIST or not os.path.isdir(path):
+            raise
+
+def get_generations(profile):
+    gen_list = subprocess.check_output([
+        "@nix@/bin/nix-env",
+        "--list-generations",
+        "-p",
+        "/nix/var/nix/profiles/%s" % (profile)
+        ])
+    gen_lines = gen_list.split('\n')
+    gen_lines.pop()
+    return [ int(line.split()[0]) for line in gen_lines ]
+
+def remove_old_entries(gens):
+    slice_start = len("@efiSysMountPoint@/loader/entries/nixos-generation-")
+    slice_end = -1 * len(".conf")
+    for path in glob.iglob("@efiSysMountPoint@/loader/entries/nixos-generation-[1-9][0-9]*.conf"):
+        gen = int(path[slice_start:slice_end])
+        if not gen in gens:
+            os.unlink(path)
+    for path in glob.iglob("@efiSysMountPoint@/efi/nixos/*"):
+        if not path in known_paths:
+            os.unlink(path)
+
+def update_gummiboot():
+    mkdir_p("@efiSysMountPoint@/efi/gummiboot")
+    store_file_path = "@gummiboot@/bin/gummiboot.efi"
+    store_dir = os.path.basename("@gummiboot@")
+    efi_file_path = "/efi/gummiboot/%s-gummiboot.efi" % (store_dir)
+    copy_if_not_exists(store_file_path, "@efiSysMountPoint@%s" % (efi_file_path))
+    return efi_file_path
+
+def update_efibootmgr(path):
+    subprocess.call(["@kmod@/sbin/modprobe", "efivars"])
+    post_efibootmgr = """
+@postEfiBootMgrCommands@
+    """
+    efibootmgr_entries = subprocess.check_output(["@efibootmgr@/sbin/efibootmgr"]).split("\n")
+    for entry in efibootmgr_entries:
+        columns = entry.split()
+        if len(columns) > 2:
+            if ' '.join(columns[1:3]) == "NixOS gummiboot":
+                subprocess.call([
+                    "@efibootmgr@/sbin/efibootmgr",
+                    "-B",
+                    "-b",
+                    columns[0][4:8]
+                    ])
+    subprocess.call([
+        "@efibootmgr@/sbin/efibootmgr",
+        "-c",
+        "-d",
+        "@efiDisk@",
+        "-g",
+        "-l",
+        path.replace("/", "\\"),
+        "-L",
+        "NixOS gummiboot",
+        "-p",
+        "@efiPartition@",
+        ])
+    subprocess.call(post_efibootmgr, shell=True)
+
+parser = argparse.ArgumentParser(description='Update NixOS-related gummiboot files')
+parser.add_argument('default_config', metavar='DEFAULT-CONFIG', help='The default NixOS config to boot')
+args = parser.parse_args()
+
+known_paths = []
+mkdir_p("@efiSysMountPoint@/efi/nixos")
+mkdir_p("@efiSysMountPoint@/loader/entries")
+gens = get_generations("system")
+for gen in gens:
+    add_entry(gen)
+    if os.readlink(system_dir(gen)) == args.default_config:
+        write_loader_conf(gen)
+
+remove_old_entries(gens)
+
+# We deserve our own env var!
+if os.getenv("NIXOS_INSTALL_GRUB") == "1":
+    gummiboot_path = update_gummiboot()
+    if "@runEfibootmgr@" == "1":
+        update_efibootmgr(gummiboot_path)
diff --git a/modules/system/boot/loader/gummiboot/gummiboot.nix b/modules/system/boot/loader/gummiboot/gummiboot.nix
new file mode 100644
index 00000000000..8ae0693923c
--- /dev/null
+++ b/modules/system/boot/loader/gummiboot/gummiboot.nix
@@ -0,0 +1,71 @@
+{ config, pkgs, ... }:
+
+with pkgs.lib;
+
+let
+  cfg = config.boot.loader.gummiboot;
+
+  efi = config.boot.loader.efi;
+
+  gummibootBuilder = pkgs.substituteAll {
+    src = ./gummiboot-builder.py;
+
+    isExecutable = true;
+
+    inherit (pkgs) python gummiboot kmod efibootmgr;
+
+    inherit (config.environment) nix;
+
+    inherit (cfg) timeout;
+
+    inherit (efi) efiSysMountPoint;
+
+    inherit (efi.efibootmgr) postEfiBootMgrCommands efiDisk efiPartition;
+
+    runEfibootmgr = efi.efibootmgr.enable;
+  };
+in {
+  options.boot.loader.gummiboot = {
+    enable = mkOption {
+      default = false;
+
+      type = types.bool;
+
+      description = "Whether to enable the gummiboot UEFI boot manager";
+    };
+
+    timeout = mkOption {
+      default = null;
+
+      example = 4;
+
+      type = types.nullOr types.int;
+
+      description = ''
+        Timeout (in seconds) for how long to show the menu (null if none).
+        Note that even with no timeout the menu can be forced if the space
+        key is pressed during bootup
+      '';
+    };
+  };
+
+  config = mkIf cfg.enable {
+    assertions = [
+      {
+        assertion = (config.boot.kernelPacakges.kernel.features or { efiBootStub = true; }) ? efiBootStub;
+
+        message = "This kernel does not support the EFI boot stub";
+      }
+    ];
+
+    system = {
+      build.installBootLoader = gummibootBuilder;
+
+      boot.loader.id = "gummiboot";
+
+      requiredKernelConfig = with config.lib.kernelConfig; [
+        (isYes "EFI_STUB")
+      ];
+    };
+  };
+}
-- 
GitLab


From c384ea26e4b5a62fe7d29d27cf871edff9df7e03 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Sat, 2 Feb 2013 00:54:05 -0500
Subject: [PATCH 4383/5331] Update iso_efi to use gummiboot

---
 .../installer/cd-dvd/installation-cd-efi.nix  |  2 +-
 modules/installer/cd-dvd/iso-image.nix        | 27 +++++++++----------
 2 files changed, 13 insertions(+), 16 deletions(-)

diff --git a/modules/installer/cd-dvd/installation-cd-efi.nix b/modules/installer/cd-dvd/installation-cd-efi.nix
index bc3e5908916..56308397bf6 100644
--- a/modules/installer/cd-dvd/installation-cd-efi.nix
+++ b/modules/installer/cd-dvd/installation-cd-efi.nix
@@ -3,7 +3,7 @@
 {
   require = [ ./installation-cd-minimal.nix ];
 
-  boot.kernelPackages = pkgs.linuxPackages_3_3;
+  boot.kernelPackages = pkgs.linuxPackages_3_7;
   boot.vesa = false;
 
   # What follows should probably move into base once the base kernel has the
diff --git a/modules/installer/cd-dvd/iso-image.nix b/modules/installer/cd-dvd/iso-image.nix
index 27e731d61e8..3d8c7f6190b 100644
--- a/modules/installer/cd-dvd/iso-image.nix
+++ b/modules/installer/cd-dvd/iso-image.nix
@@ -119,17 +119,6 @@ let
     '';
 
 
-  efiShell = if pkgs.stdenv.isi686 then
-    pkgs.fetchurl {
-      url = "https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2/EdkShellBinPkg/FullShell/Ia32/Shell_Full.efi";
-      sha256 = "1gv6kyaspczdp7x8qnx5x76ilriaygkfs99ay7ihhdi6riclkhfl";
-    }
-  else
-    pkgs.fetchurl {
-      url = "https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2/EdkShellBinPkg/FullShell/X64/Shell_Full.efi";
-      sha256 = "1g18z84rlavxr5gsrh2g942rfr6znv9fs3fqww5m7dhmnysgyv8p";
-    };
-
   # The efi boot image
   efiImg = pkgs.runCommand "efi-image_eltorito" {}
     ''
@@ -139,14 +128,22 @@ let
       ${pkgs.mtools}/bin/mmd -i "$out" efi
       ${pkgs.mtools}/bin/mmd -i "$out" efi/boot
       ${pkgs.mtools}/bin/mmd -i "$out" efi/nixos
+      ${pkgs.mtools}/bin/mmd -i "$out" loader
+      ${pkgs.mtools}/bin/mmd -i "$out" loader/entries
       ${pkgs.mtools}/bin/mcopy -v -i "$out" \
-        ${efiShell} ::efi/boot/boot${targetArch}.efi
+        ${pkgs.gummiboot}/bin/gummiboot.efi ::efi/boot/boot${targetArch}.efi
       ${pkgs.mtools}/bin/mcopy -v -i "$out" \
-        ${config.boot.kernelPackages.kernel + "/bzImage"} ::bzImage.efi
+        ${config.boot.kernelPackages.kernel + "/bzImage"} ::bzImage
       ${pkgs.mtools}/bin/mcopy -v -i "$out" \
         ${config.system.build.initialRamdisk + "/initrd"} ::efi/nixos/initrd
-      echo "bzImage.efi initrd=\\efi\\nixos\\initrd init=${config.system.build.toplevel}/init ${toString config.boot.kernelParams}" > boot-params
-      ${pkgs.mtools}/bin/mcopy -v -i "$out" boot-params ::startup.nsh
+      echo "title NixOS LiveCD" > boot-params
+      echo "linux /bzImage" >> boot-params
+      echo "initrd /efi/nixos/initrd" >> boot-params
+      echo "options init=${config.system.build.toplevel}/init ${toString config.boot.kernelParams}" >> boot-params
+      ${pkgs.mtools}/bin/mcopy -v -i "$out" boot-params ::loader/entries/nixos-livecd.conf
+      echo "default nixos-livecd" > boot-params
+      echo "timeout 5" >> boot-params
+      ${pkgs.mtools}/bin/mcopy -v -i "$out" boot-params ::loader/loader.conf
     '';
 
   targetArch = if pkgs.stdenv.isi686 then
-- 
GitLab


From 2889242ff5ccd03e4464bde1813774fa5b96e000 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Sat, 2 Feb 2013 19:42:56 -0500
Subject: [PATCH 4384/5331] Maintain iso_efi

---
 release.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/release.nix b/release.nix
index 2b95b86691c..8c8851af51e 100644
--- a/release.nix
+++ b/release.nix
@@ -168,11 +168,12 @@ let
       type = "new-kernel";
     };
 
-    # A variant with experimental efi booting support. Currently requires
-    # an RC kernel. Eventually this should probably be merged into cd-minimal
+    # A variant with efi booting support. Once cd-minimal has a newer kernel,
+    # this should be enabled by default.
     iso_efi = makeIso {
       module = ./modules/installer/cd-dvd/installation-cd-efi.nix;
       type = "efi";
+      maintainers = [ "shlevy" ];
     };
 
     # Provide a tarball that can be unpacked into an SD card, and easily
-- 
GitLab


From d57df5556617aa207277283223d0fe793c5badb4 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Sat, 2 Feb 2013 21:10:09 -0500
Subject: [PATCH 4385/5331] gummiboot-builder: When NIXOS_INSTALL_GRUB is set
 and efibootmgr is used, prepend the gummiboot entry to the boot entries list

---
 .../boot/loader/gummiboot/gummiboot-builder.py   | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/modules/system/boot/loader/gummiboot/gummiboot-builder.py b/modules/system/boot/loader/gummiboot/gummiboot-builder.py
index 5da9746cdbd..8729452efbf 100644
--- a/modules/system/boot/loader/gummiboot/gummiboot-builder.py
+++ b/modules/system/boot/loader/gummiboot/gummiboot-builder.py
@@ -120,6 +120,22 @@ def update_efibootmgr(path):
         "-p",
         "@efiPartition@",
         ])
+    efibootmgr_entries = subprocess.check_output(["@efibootmgr@/sbin/efibootmgr"]).split("\n")
+    for entry in efibootmgr_entries:
+        columns = entry.split()
+        if len(columns) > 1 and columns[0] == "BootOrder:":
+            boot_order = columns[1].split(',')
+        if len(columns) > 2:
+            if ' '.join(columns[1:3]) == "NixOS gummiboot":
+                bootnum = columns[0][4:8]
+                if not bootnum in boot_order:
+                    boot_order.insert(0, bootnum)
+                    with open("/dev/null", 'w') as dev_null:
+                        subprocess.call([
+                            "@efibootmgr@/sbin/efibootmgr",
+                            "-o",
+                            ','.join(boot_order)
+                            ], stdout=dev_null)
     subprocess.call(post_efibootmgr, shell=True)
 
 parser = argparse.ArgumentParser(description='Update NixOS-related gummiboot files')
-- 
GitLab


From 36088abb396a43ff1a70f0f42cb41b9579a851de Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Sat, 2 Feb 2013 21:16:12 -0500
Subject: [PATCH 4386/5331] gummiboot-builder: Only read /etc/machine-id once
 per invocation

---
 modules/system/boot/loader/gummiboot/gummiboot-builder.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/system/boot/loader/gummiboot/gummiboot-builder.py b/modules/system/boot/loader/gummiboot/gummiboot-builder.py
index 8729452efbf..d490c4c8e78 100644
--- a/modules/system/boot/loader/gummiboot/gummiboot-builder.py
+++ b/modules/system/boot/loader/gummiboot/gummiboot-builder.py
@@ -23,8 +23,6 @@ def write_entry(generation, kernel, initrd):
     kernel_params = "systemConfig=%s init=%s/init " % (generation_dir, generation_dir)
     with open("%s/kernel-params" % (generation_dir)) as params_file:
         kernel_params = kernel_params + params_file.read()
-    with open("/etc/machine-id") as machine_file:
-        machine_id = machine_file.readlines()[0]
     with open(tmp_path, 'w') as f:
         print >> f, "title NixOS"
         print >> f, "version Generation %d" % (generation)
@@ -145,6 +143,8 @@ args = parser.parse_args()
 known_paths = []
 mkdir_p("@efiSysMountPoint@/efi/nixos")
 mkdir_p("@efiSysMountPoint@/loader/entries")
+with open("/etc/machine-id") as machine_file:
+    machine_id = machine_file.readlines()[0]
 gens = get_generations("system")
 for gen in gens:
     add_entry(gen)
-- 
GitLab


From 73152e1702ee3f32e9811ca4bfa57ccf0c46a48e Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sun, 3 Feb 2013 10:35:11 +0100
Subject: [PATCH 4387/5331] etc.nix: Fix style

---
 modules/system/etc/etc.nix | 62 +++++++++++++++++++++-----------------
 1 file changed, 34 insertions(+), 28 deletions(-)

diff --git a/modules/system/etc/etc.nix b/modules/system/etc/etc.nix
index 7553a569beb..1300562b99c 100644
--- a/modules/system/etc/etc.nix
+++ b/modules/system/etc/etc.nix
@@ -1,12 +1,32 @@
-# Produce a script to generate /etc.
+# Management of static files in /etc.
+
 { config, pkgs, ... }:
 
 with pkgs.lib;
 
-###### interface
 let
 
-  option = {
+  etc = pkgs.stdenv.mkDerivation {
+    name = "etc";
+
+    builder = ./make-etc.sh;
+
+    preferLocalBuild = true;
+
+    /* !!! Use toXML. */
+    sources = map (x: x.source) config.environment.etc;
+    targets = map (x: x.target) config.environment.etc;
+    modes = map (x: x.mode) config.environment.etc;
+  };
+
+in
+
+{
+
+  ###### interface
+
+  options = {
+
     environment.etc = mkOption {
       default = [];
       example = [
@@ -37,37 +57,23 @@ let
         };
       };
     };
+
   };
-in
 
-###### implementation
-let
 
-  etc = pkgs.stdenv.mkDerivation {
-    name = "etc";
+  ###### implementation
 
-    builder = ./make-etc.sh;
+  config = {
 
-    preferLocalBuild = true;
+    system.build.etc = etc;
 
-    /* !!! Use toXML. */
-    sources = map (x: x.source) config.environment.etc;
-    targets = map (x: x.target) config.environment.etc;
-    modes = map (x: x.mode) config.environment.etc;
-  };
-
-in
-
-{
-  require = [option];
-
-  system.build.etc = etc;
+    system.activationScripts.etc = stringAfter [ "stdio" ]
+      ''
+        # Set up the statically computed bits of /etc.
+        echo "setting up /etc..."
+        ${pkgs.perl}/bin/perl ${./setup-etc.pl} ${etc}/etc
+      '';
 
-  system.activationScripts.etc = stringAfter [ "stdio" ]
-    ''
-      # Set up the statically computed bits of /etc.
-      echo "setting up /etc..."
-      ${pkgs.perl}/bin/perl ${./setup-etc.pl} ${etc}/etc
-    '';
+  };
 
 }
-- 
GitLab


From ab238804b8db746783253162dad56df997c5c728 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sun, 3 Feb 2013 13:24:22 +0100
Subject: [PATCH 4388/5331] Turn environment.etc into an attribute set

This provides a more convenient syntax and allows easier overriding.

For example,

  environment.etc = singleton
    { target = "vconsole.conf";
      source = vconsoleConf;
    };

can now be written as

  environment.etc."vconsole.conf".source = vconsoleConf;
---
 modules/config/networking.nix | 54 ++++++++++--------------
 modules/system/etc/etc.nix    | 77 ++++++++++++++++++++++-------------
 modules/tasks/kbd.nix         |  5 +--
 3 files changed, 71 insertions(+), 65 deletions(-)

diff --git a/modules/config/networking.nix b/modules/config/networking.nix
index 9e55549ea2e..4cd74f79198 100644
--- a/modules/config/networking.nix
+++ b/modules/config/networking.nix
@@ -38,35 +38,27 @@ in
   require = [options];
 
   environment.etc =
-    [ { # /etc/services: TCP/UDP port assignments.
-        source = pkgs.iana_etc + "/etc/services";
-        target = "services";
-      }
-
-      { # /etc/protocols: IP protocol numbers.
-        source = pkgs.iana_etc + "/etc/protocols";
-        target = "protocols";
-      }
-
-      { # /etc/rpc: RPC program numbers.
-        source = pkgs.glibc + "/etc/rpc";
-        target = "rpc";
-      }
-
-      { # /etc/hosts: Hostname-to-IP mappings.
-        source = pkgs.writeText "hosts"
-          ''
-            127.0.0.1 localhost
-            ${optionalString cfg.enableIPv6 ''
-              ::1 localhost
-            ''}
-            ${cfg.extraHosts}
-          '';
-        target = "hosts";
-      }
-
-      { # /etc/resolvconf.conf: Configuration for openresolv.
-        source = pkgs.writeText "resolvconf.conf" (
+    { # /etc/services: TCP/UDP port assignments.
+      "services".source = pkgs.iana_etc + "/etc/services";
+
+      # /etc/protocols: IP protocol numbers.
+      "protocols".source  = pkgs.iana_etc + "/etc/protocols";
+
+      # /etc/rpc: RPC program numbers.
+      "rpc".source = pkgs.glibc + "/etc/rpc";
+
+      # /etc/hosts: Hostname-to-IP mappings.
+      "hosts".source = pkgs.writeText "hosts"
+        ''
+          127.0.0.1 localhost
+          ${optionalString cfg.enableIPv6 ''
+            ::1 localhost
+          ''}
+          ${cfg.extraHosts}
+        '';
+
+      # /etc/resolvconf.conf: Configuration for openresolv.
+      "resolvconf.conf".source = pkgs.writeText "resolvconf.conf" (
           ''
             # This is the default, but we must set it here to prevent
             # a collision with an apparently unrelated environment
@@ -83,9 +75,7 @@ in
             # This hosts runs a full-blown DNS resolver.
             name_servers='127.0.0.1'
           '' );
-        target = "resolvconf.conf";
-      }
-    ];
+    };
 
   # The ‘ip-up’ target is started when we have IP connectivity.  So
   # services that depend on IP connectivity (like ntpd) should be
diff --git a/modules/system/etc/etc.nix b/modules/system/etc/etc.nix
index 1300562b99c..6fa50400a7f 100644
--- a/modules/system/etc/etc.nix
+++ b/modules/system/etc/etc.nix
@@ -6,6 +6,8 @@ with pkgs.lib;
 
 let
 
+  etc' = attrValues config.environment.etc;
+
   etc = pkgs.stdenv.mkDerivation {
     name = "etc";
 
@@ -14,9 +16,9 @@ let
     preferLocalBuild = true;
 
     /* !!! Use toXML. */
-    sources = map (x: x.source) config.environment.etc;
-    targets = map (x: x.target) config.environment.etc;
-    modes = map (x: x.mode) config.environment.etc;
+    sources = map (x: x.source) etc';
+    targets = map (x: x.target) etc';
+    modes = map (x: x.mode) etc';
   };
 
 in
@@ -28,34 +30,51 @@ in
   options = {
 
     environment.etc = mkOption {
-      default = [];
-      example = [
-        { source = "/nix/store/.../etc/dir/file.conf.example";
-          target = "dir/file.conf";
-          mode = "0440";
-        }
-      ];
+      type = types.loaOf types.optionSet;
+      default = {};
+      example =
+        { hosts =
+            { source = "/nix/store/.../etc/dir/file.conf.example";
+              mode = "0440";
+            };
+          "default/useradd".text = "GROUP=100 ...";
+        };
       description = ''
-        List of files that have to be linked in <filename>/etc</filename>.
+        Set of files that have to be linked in <filename>/etc</filename>.
       '';
-      type = types.listOf types.optionSet;
-      options = {
-        source = mkOption {
-          description = "Source file.";
-        };
-        target = mkOption {
-          description = "Name of symlink (relative to <filename>/etc</filename>).";
-        };
-        mode = mkOption {
-          default = "symlink";
-          example = "0600";
-          description = ''
-            If set to something else than <literal>symlink</literal>,
-            the file is copied instead of symlinked, with the given
-            file mode.
-          '';
-        };
-      };
+
+      options = singleton ({ name, config, ... }:
+        { options = {
+            source = mkOption {
+              description = "Path of the source file.";
+            };
+
+            target = mkOption {
+              description = ''
+                Name of symlink (relative to
+                <filename>/etc</filename>).  Defaults to the attribute
+                name.
+              '';
+            };
+
+            mode = mkOption {
+              default = "symlink";
+              example = "0600";
+              description = ''
+                If set to something else than <literal>symlink</literal>,
+                the file is copied instead of symlinked, with the given
+                file mode.
+              '';
+            };
+
+          };
+
+          config = {
+            target = mkDefault name;
+          };
+
+        });
+
     };
 
   };
diff --git a/modules/tasks/kbd.nix b/modules/tasks/kbd.nix
index e4d22e94c80..145e43794e5 100644
--- a/modules/tasks/kbd.nix
+++ b/modules/tasks/kbd.nix
@@ -65,10 +65,7 @@ in
     # Let systemd-vconsole-setup.service do the work of setting up the
     # virtual consoles.  FIXME: trigger a restart of
     # systemd-vconsole-setup.service if /etc/vconsole.conf changes.
-    environment.etc = singleton
-      { target = "vconsole.conf";
-        source = vconsoleConf;
-      };
+    environment.etc."vconsole.conf".source = vconsoleConf;
 
     # This is identical to the systemd-vconsole-setup.service unit
     # shipped with systemd, except that it uses /dev/tty1 instead of
-- 
GitLab


From 1daab1ebf5fdcc89030d0216dc3918b7f87f3ac5 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sun, 3 Feb 2013 14:12:49 +0100
Subject: [PATCH 4389/5331] environment.etc: Add convenience option 'text'

This allows writing

  environment.etc.hosts.text = "127.0.0.1 localhost";

instead of

  environment.etc.hosts.source = pkgs.writeText "hosts" "127.0.0.1 localhost";
---
 modules/config/networking.nix |  6 ++---
 modules/system/etc/etc.nix    | 16 +++++++++---
 modules/tasks/filesystems.nix | 47 ++++++++++++++++-------------------
 3 files changed, 37 insertions(+), 32 deletions(-)

diff --git a/modules/config/networking.nix b/modules/config/networking.nix
index 4cd74f79198..dbf67653dad 100644
--- a/modules/config/networking.nix
+++ b/modules/config/networking.nix
@@ -48,7 +48,7 @@ in
       "rpc".source = pkgs.glibc + "/etc/rpc";
 
       # /etc/hosts: Hostname-to-IP mappings.
-      "hosts".source = pkgs.writeText "hosts"
+      "hosts".text =
         ''
           127.0.0.1 localhost
           ${optionalString cfg.enableIPv6 ''
@@ -58,7 +58,7 @@ in
         '';
 
       # /etc/resolvconf.conf: Configuration for openresolv.
-      "resolvconf.conf".source = pkgs.writeText "resolvconf.conf" (
+      "resolvconf.conf".text =
           ''
             # This is the default, but we must set it here to prevent
             # a collision with an apparently unrelated environment
@@ -74,7 +74,7 @@ in
           '' + optionalString config.services.bind.enable ''
             # This hosts runs a full-blown DNS resolver.
             name_servers='127.0.0.1'
-          '' );
+          '';
     };
 
   # The ‘ip-up’ target is started when we have IP connectivity.  So
diff --git a/modules/system/etc/etc.nix b/modules/system/etc/etc.nix
index 6fa50400a7f..ce7fc543536 100644
--- a/modules/system/etc/etc.nix
+++ b/modules/system/etc/etc.nix
@@ -45,9 +45,6 @@ in
 
       options = singleton ({ name, config, ... }:
         { options = {
-            source = mkOption {
-              description = "Path of the source file.";
-            };
 
             target = mkOption {
               description = ''
@@ -57,6 +54,17 @@ in
               '';
             };
 
+            text = mkOption {
+              default = null;
+              type = types.nullOr types.string;
+              description = "Text of the file.";
+            };
+
+            source = mkOption {
+              types = types.path;
+              description = "Path of the source file.";
+            };
+
             mode = mkOption {
               default = "symlink";
               example = "0600";
@@ -71,6 +79,8 @@ in
 
           config = {
             target = mkDefault name;
+            source = mkIf (config.text != null)
+              (mkDefault (pkgs.writeText "etc-file" config.text));
           };
 
         });
diff --git a/modules/tasks/filesystems.nix b/modules/tasks/filesystems.nix
index 8efc96f7fe4..52f8e9b6ddf 100644
--- a/modules/tasks/filesystems.nix
+++ b/modules/tasks/filesystems.nix
@@ -7,28 +7,6 @@ let
 
   fileSystems = attrValues config.fileSystems;
 
-  fstab = pkgs.writeText "fstab"
-    ''
-      # This is a generated file.  Do not edit!
-
-      # Filesystems.
-      ${flip concatMapStrings fileSystems (fs:
-          (if fs.device != null then fs.device else "/dev/disk/by-label/${fs.label}")
-          + " " + fs.mountPoint
-          + " " + fs.fsType
-          + " " + fs.options
-          + " 0"
-          + " " + (if fs.fsType == "none" || fs.device == "none" || fs.fsType == "btrfs" || fs.fsType == "tmpfs" || fs.noCheck then "0" else
-                   if fs.mountPoint == "/" then "1" else "2")
-          + "\n"
-      )}
-
-      # Swap devices.
-      ${flip concatMapStrings config.swapDevices (sw:
-          "${sw.device} none swap\n"
-      )}
-    '';
-
   fileSystemOpts = { name, ... }: {
 
     options = {
@@ -171,10 +149,27 @@ in
       [ pkgs.ntfs3g pkgs.cifs_utils ]
       ++ config.system.fsPackages;
 
-    environment.etc = singleton
-      { source = fstab;
-        target = "fstab";
-      };
+    environment.etc.fstab.text =
+      ''
+        # This is a generated file.  Do not edit!
+
+        # Filesystems.
+        ${flip concatMapStrings fileSystems (fs:
+            (if fs.device != null then fs.device else "/dev/disk/by-label/${fs.label}")
+            + " " + fs.mountPoint
+            + " " + fs.fsType
+            + " " + fs.options
+            + " 0"
+            + " " + (if fs.fsType == "none" || fs.device == "none" || fs.fsType == "btrfs" || fs.fsType == "tmpfs" || fs.noCheck then "0" else
+                     if fs.mountPoint == "/" then "1" else "2")
+            + "\n"
+        )}
+
+        # Swap devices.
+        ${flip concatMapStrings config.swapDevices (sw:
+            "${sw.device} none swap\n"
+        )}
+      '';
 
     # Provide a target that pulls in all filesystems.
     systemd.targets.fs =
-- 
GitLab


From 979117b6b8fb1e630d4a56c040fd8749d2d07b18 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sun, 3 Feb 2013 14:19:05 +0100
Subject: [PATCH 4390/5331] Selectively allow /etc files to be disabled

For instance, if you don't want NixOS to emit /etc/hosts, you
can say:

  environment.etc.hosts.enable = false;
---
 modules/system/etc/etc.nix | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/modules/system/etc/etc.nix b/modules/system/etc/etc.nix
index ce7fc543536..91fcdcf2435 100644
--- a/modules/system/etc/etc.nix
+++ b/modules/system/etc/etc.nix
@@ -6,7 +6,7 @@ with pkgs.lib;
 
 let
 
-  etc' = attrValues config.environment.etc;
+  etc' = filter (f: f.enable) (attrValues config.environment.etc);
 
   etc = pkgs.stdenv.mkDerivation {
     name = "etc";
@@ -46,6 +46,15 @@ in
       options = singleton ({ name, config, ... }:
         { options = {
 
+            enable = mkOption {
+              type = types.bool;
+              default = true;
+              description = ''
+                Whether this /etc file should be generated.  This
+                option allows specific /etc files to be disabled.
+              '';
+            };
+
             target = mkOption {
               description = ''
                 Name of symlink (relative to
-- 
GitLab


From 9db243b4aa1ebd77fb9928e255133173bc716aae Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Mon, 4 Feb 2013 07:29:30 -0500
Subject: [PATCH 4391/5331] nixos-install: Respect host $NIX_CONF_DIR and don't
 assume nix.conf exists

---
 modules/installer/tools/nixos-install.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/installer/tools/nixos-install.sh b/modules/installer/tools/nixos-install.sh
index 58fe3e32743..3cf919fc0ed 100644
--- a/modules/installer/tools/nixos-install.sh
+++ b/modules/installer/tools/nixos-install.sh
@@ -110,7 +110,7 @@ export LC_TIME=
 # Create a temporary Nix config file that causes the nixbld users to
 # be used.
 echo "build-users-group = nixbld" > $mountPoint/tmp/nix.conf
-grep binary-caches /etc/nix/nix.conf >> $mountPoint/tmp/nix.conf
+grep binary-caches "$NIX_CONF_DIR/nix.conf" >> $mountPoint/tmp/nix.conf || true
 export NIX_CONF_DIR=/tmp
 
 
-- 
GitLab


From 722d8497e74b578adae34aeac7aab760988c2c54 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Mon, 4 Feb 2013 07:38:54 -0500
Subject: [PATCH 4392/5331] nixos-install: Respect
 /home/shlevy/src:/nix/var/nix/profiles/per-user/root/channels/nixos:nixpkgs=/etc/nixos/nixpkgs:nixos=/etc/nixos/nixos:nixos-config=/etc/nixos/configuration.nix:services=/etc/nixos/services
 to find the nixos and nixpkgs sources, only copy the nixos channel if it
 exists

---
 modules/installer/tools/nixos-install.sh | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/modules/installer/tools/nixos-install.sh b/modules/installer/tools/nixos-install.sh
index 3cf919fc0ed..13335300743 100644
--- a/modules/installer/tools/nixos-install.sh
+++ b/modules/installer/tools/nixos-install.sh
@@ -149,25 +149,29 @@ done
 
 
 # Get the absolute path to the NixOS/Nixpkgs sources.
-srcs=$(nix-env -p /nix/var/nix/profiles/per-user/root/channels -q nixos --no-name --out-path)
+nixpkgs_src=$(nix-instantiate --find-file nixpkgs)
+nixos_src=$(nix-instantiate --find-file nixos)
 
 
 # Build the specified Nix expression in the target store and install
 # it into the system configuration profile.
 echo "building the system configuration..."
-NIX_PATH="/mnt$srcs/nixos:nixos-config=$NIXOS_CONFIG" NIXOS_CONFIG= \
+NIX_PATH="nixpkgs=/mnt$nixpkgs_src:nixos=/mnt$nixos_src:nixos-config=$NIXOS_CONFIG" NIXOS_CONFIG= \
     chroot $mountPoint @nix@/bin/nix-env \
     -p /nix/var/nix/profiles/system -f '<nixos>' --set -A system --show-trace
 
 
 # Copy the NixOS/Nixpkgs sources to the target as the initial contents
 # of the NixOS channel.
-echo "copying NixOS/Nixpkgs sources..."
 mkdir -m 0755 -p $mountPoint/nix/var/nix/profiles
 mkdir -m 1777 -p $mountPoint/nix/var/nix/profiles/per-user
 mkdir -m 0755 -p $mountPoint/nix/var/nix/profiles/per-user/root
-chroot $mountPoint @nix@/bin/nix-env \
-    -p /nix/var/nix/profiles/per-user/root/channels -i "$srcs" --quiet
+srcs=$(nix-env -p /nix/var/nix/profiles/per-user/root/channels -q nixos --no-name --out-path 2>/dev/null || echo -n "")
+if test -n "$srcs"; then
+    echo "copying NixOS/Nixpkgs sources..."
+    chroot $mountPoint @nix@/bin/nix-env \
+        -p /nix/var/nix/profiles/per-user/root/channels -i "$srcs" --quiet
+fi
 mkdir -m 0700 -p $mountPoint/root/.nix-defexpr
 ln -sfn /nix/var/nix/profiles/per-user/root/channels $mountPoint/root/.nix-defexpr/channels
 
-- 
GitLab


From e83f946f9e1fccd01f0135ac4c3d078b86450dc5 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Mon, 4 Feb 2013 07:46:09 -0500
Subject: [PATCH 4393/5331] nixos-install: Respect the build-users-group of the
 host

---
 modules/installer/tools/nixos-install.sh | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/modules/installer/tools/nixos-install.sh b/modules/installer/tools/nixos-install.sh
index 13335300743..73afc4d2f64 100644
--- a/modules/installer/tools/nixos-install.sh
+++ b/modules/installer/tools/nixos-install.sh
@@ -85,7 +85,12 @@ mkdir -m 0755 -p \
     $mountPoint/nix/var/log/nix/drvs
 
 mkdir -m 1775 -p $mountPoint/nix/store
-chown root:nixbld $mountPoint/nix/store
+build_users_group=$((grep build-users-group "$NIX_CONF_DIR/nix.conf" 2>/dev/null | awk '{ print $3 }') || echo -n "")
+if test -n "$build_users_group"; then
+    chown root:"$build_users_group" $mountPoint/nix/store
+else
+    chown root $mountPoint/nix/store
+fi
 
 
 # Get the store paths to copy from the references graph.
@@ -109,7 +114,9 @@ export LC_TIME=
 
 # Create a temporary Nix config file that causes the nixbld users to
 # be used.
-echo "build-users-group = nixbld" > $mountPoint/tmp/nix.conf
+if test -n "$build_users_group"; then
+    echo "build-users-group = $build_users_group" > $mountPoint/tmp/nix.conf
+fi
 grep binary-caches "$NIX_CONF_DIR/nix.conf" >> $mountPoint/tmp/nix.conf || true
 export NIX_CONF_DIR=/tmp
 
-- 
GitLab


From 99623e9940c7593e9da1c3db8c74d8aad4ff3b5f Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Mon, 4 Feb 2013 09:27:56 -0500
Subject: [PATCH 4394/5331] nixos-install: If NIX_CONF_DIR is unset, use
 /etc/nix

---
 modules/installer/tools/nixos-install.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/installer/tools/nixos-install.sh b/modules/installer/tools/nixos-install.sh
index 73afc4d2f64..714c229b606 100644
--- a/modules/installer/tools/nixos-install.sh
+++ b/modules/installer/tools/nixos-install.sh
@@ -85,7 +85,7 @@ mkdir -m 0755 -p \
     $mountPoint/nix/var/log/nix/drvs
 
 mkdir -m 1775 -p $mountPoint/nix/store
-build_users_group=$((grep build-users-group "$NIX_CONF_DIR/nix.conf" 2>/dev/null | awk '{ print $3 }') || echo -n "")
+build_users_group=$((grep build-users-group "${NIX_CONF_DIR:-/etc/nix}/nix.conf" 2>/dev/null | awk '{ print $3 }') || echo -n "")
 if test -n "$build_users_group"; then
     chown root:"$build_users_group" $mountPoint/nix/store
 else
@@ -117,7 +117,7 @@ export LC_TIME=
 if test -n "$build_users_group"; then
     echo "build-users-group = $build_users_group" > $mountPoint/tmp/nix.conf
 fi
-grep binary-caches "$NIX_CONF_DIR/nix.conf" >> $mountPoint/tmp/nix.conf || true
+grep binary-caches "${NIX_CONF_DIR:-/etc/nix}/nix.conf" >> $mountPoint/tmp/nix.conf || true
 export NIX_CONF_DIR=/tmp
 
 
-- 
GitLab


From 6199d4bb8e51af6b75f1e38194d0349be6df0ff4 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Mon, 4 Feb 2013 09:44:32 -0500
Subject: [PATCH 4395/5331] nixos-install: Don't grep nix.conf directly, use
 nix perl bindings instead

---
 modules/installer/tools/nixos-install.sh | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/modules/installer/tools/nixos-install.sh b/modules/installer/tools/nixos-install.sh
index 714c229b606..aca2cca6a71 100644
--- a/modules/installer/tools/nixos-install.sh
+++ b/modules/installer/tools/nixos-install.sh
@@ -85,7 +85,7 @@ mkdir -m 0755 -p \
     $mountPoint/nix/var/log/nix/drvs
 
 mkdir -m 1775 -p $mountPoint/nix/store
-build_users_group=$((grep build-users-group "${NIX_CONF_DIR:-/etc/nix}/nix.conf" 2>/dev/null | awk '{ print $3 }') || echo -n "")
+build_users_group=$(@perl@/bin/perl -e 'use Nix::Config; Nix::Config::readConfig; print $Nix::Config::config{"build-users-group"};')
 if test -n "$build_users_group"; then
     chown root:"$build_users_group" $mountPoint/nix/store
 else
@@ -117,7 +117,10 @@ export LC_TIME=
 if test -n "$build_users_group"; then
     echo "build-users-group = $build_users_group" > $mountPoint/tmp/nix.conf
 fi
-grep binary-caches "${NIX_CONF_DIR:-/etc/nix}/nix.conf" >> $mountPoint/tmp/nix.conf || true
+binary_caches=$(@perl@/bin/perl -e 'use Nix::Config; Nix::Config::readConfig; print $Nix::Config::config{"binary-caches"};')
+if test -n "$binary_caches"; then
+    echo "binary-caches $binary_caches" >> $mountPoint/tmp/nix.conf
+fi
 export NIX_CONF_DIR=/tmp
 
 
-- 
GitLab


From 8ef4074811d419bf81513608d07c67955a1d9d0b Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 4 Feb 2013 15:48:28 +0100
Subject: [PATCH 4396/5331] Use nss_myhostname from systemd

---
 modules/config/nsswitch.nix                       | 2 +-
 modules/services/x11/display-managers/default.nix | 8 +++-----
 modules/services/x11/xserver.nix                  | 4 ++--
 3 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/modules/config/nsswitch.nix b/modules/config/nsswitch.nix
index 4660bf7c92d..7e989c163e3 100644
--- a/modules/config/nsswitch.nix
+++ b/modules/config/nsswitch.nix
@@ -56,5 +56,5 @@ in
   # Use nss-myhostname to ensure that our hostname always resolves to
   # a valid IP address.  It returns all locally configured IP
   # addresses, or ::1 and 127.0.0.2 as fallbacks.
-  system.nssModules = [ pkgs.nss_myhostname ];
+  system.nssModules = [ pkgs.systemd ];
 }
diff --git a/modules/services/x11/display-managers/default.nix b/modules/services/x11/display-managers/default.nix
index cf4bbedfa27..cfe21c2a500 100644
--- a/modules/services/x11/display-managers/default.nix
+++ b/modules/services/x11/display-managers/default.nix
@@ -22,9 +22,7 @@ let
     pathsToLink = "/lib/dri";
 
     # To admit zero-length 'paths'
-    postBuild = "
-      mkdir -p $out/lib/dri
-    ";
+    postBuild = "mkdir -p $out/lib/dri";
   };
 
   # file provided by services.xserver.displayManager.session.script
@@ -91,7 +89,7 @@ let
           ${xorg.xrdb}/bin/xrdb -merge ~/.Xdefaults
       fi
 
-      export LIBVA_DRIVERS_PATH=${vaapiDrivers}/lib/dri;
+      export LIBVA_DRIVERS_PATH=${vaapiDrivers}/lib/dri
 
       source /etc/profile
 
@@ -139,7 +137,7 @@ let
 
   mkDesktops = names: pkgs.runCommand "desktops" {}
     ''
-      ensureDir $out
+      mkdir -p $out
       ${concatMapStrings (n: ''
         cat - > "$out/${n}.desktop" << EODESKTOP
         [Desktop Entry]
diff --git a/modules/services/x11/xserver.nix b/modules/services/x11/xserver.nix
index c93c443287b..7cc507feb1d 100644
--- a/modules/services/x11/xserver.nix
+++ b/modules/services/x11/xserver.nix
@@ -204,11 +204,11 @@ in
       };
 
       vaapiDrivers = mkOption {
-        default = [ pkgs.vaapiIntel pkgs.vaapiVdpau ];
+        default = [ ];
         defaultText = "[ pkgs.vaapiIntel pkgs.vaapiVdpau ]";
         example = "[ pkgs.vaapiIntel pkgs.vaapiVdpau ]";
         description = ''
-          Names of the packages providing libva acceleration drivers.
+          Packages providing libva acceleration drivers.
         '';
       };
 
-- 
GitLab


From 05f01685a0123f2ddc6cc169aeabb11efc3d6a89 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Tue, 5 Feb 2013 06:39:18 -0500
Subject: [PATCH 4397/5331] D'oh

---
 modules/installer/tools/nixos-install.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/installer/tools/nixos-install.sh b/modules/installer/tools/nixos-install.sh
index aca2cca6a71..51270650429 100644
--- a/modules/installer/tools/nixos-install.sh
+++ b/modules/installer/tools/nixos-install.sh
@@ -119,7 +119,7 @@ if test -n "$build_users_group"; then
 fi
 binary_caches=$(@perl@/bin/perl -e 'use Nix::Config; Nix::Config::readConfig; print $Nix::Config::config{"binary-caches"};')
 if test -n "$binary_caches"; then
-    echo "binary-caches $binary_caches" >> $mountPoint/tmp/nix.conf
+    echo "binary-caches = $binary_caches" >> $mountPoint/tmp/nix.conf
 fi
 export NIX_CONF_DIR=/tmp
 
-- 
GitLab


From 98b7253b29358ff1d89838bd743992d6f413f3da Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Tue, 5 Feb 2013 09:44:00 -0500
Subject: [PATCH 4398/5331] nixos-install: Append the default nixos-channel
 path to $NIX_PATH

---
 modules/installer/tools/nixos-install.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/modules/installer/tools/nixos-install.sh b/modules/installer/tools/nixos-install.sh
index 51270650429..41922652cfb 100644
--- a/modules/installer/tools/nixos-install.sh
+++ b/modules/installer/tools/nixos-install.sh
@@ -159,6 +159,7 @@ done
 
 
 # Get the absolute path to the NixOS/Nixpkgs sources.
+export NIX_PATH=${NIX_PATH+$NIX_PATH:}/nix/var/nix/profiles/per-user/root/channels/nixos
 nixpkgs_src=$(nix-instantiate --find-file nixpkgs)
 nixos_src=$(nix-instantiate --find-file nixos)
 
-- 
GitLab


From 5e88e9b2ff50e2690a57bd44a4b836849f3a9422 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Tue, 5 Feb 2013 10:37:50 -0500
Subject: [PATCH 4399/5331] nixos-install: Fully resolve symlinks in the paths
 to nixos/nixpkgs sources.

---
 modules/installer/tools/nixos-install.sh | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/modules/installer/tools/nixos-install.sh b/modules/installer/tools/nixos-install.sh
index 41922652cfb..470dea940a3 100644
--- a/modules/installer/tools/nixos-install.sh
+++ b/modules/installer/tools/nixos-install.sh
@@ -159,9 +159,8 @@ done
 
 
 # Get the absolute path to the NixOS/Nixpkgs sources.
-export NIX_PATH=${NIX_PATH+$NIX_PATH:}/nix/var/nix/profiles/per-user/root/channels/nixos
-nixpkgs_src=$(nix-instantiate --find-file nixpkgs)
-nixos_src=$(nix-instantiate --find-file nixos)
+nixpkgs_src=$(readlink -f $(nix-instantiate --find-file nixpkgs))
+nixos_src=$(readlink -f $(nix-instantiate --find-file nixos))
 
 
 # Build the specified Nix expression in the target store and install
-- 
GitLab


From 12d77805efd5dd943e80b103d889f14090927eeb Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Wed, 6 Feb 2013 12:20:52 -0500
Subject: [PATCH 4400/5331] nixos-install: Unset NIX_REMOTE

---
 modules/installer/tools/nixos-install.sh | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/modules/installer/tools/nixos-install.sh b/modules/installer/tools/nixos-install.sh
index 470dea940a3..15c10121636 100644
--- a/modules/installer/tools/nixos-install.sh
+++ b/modules/installer/tools/nixos-install.sh
@@ -112,6 +112,10 @@ export LC_ALL=
 export LC_TIME=
 
 
+# There is no daemon in the chroot
+unset NIX_REMOTE
+
+
 # Create a temporary Nix config file that causes the nixbld users to
 # be used.
 if test -n "$build_users_group"; then
-- 
GitLab


From c5930655851dc6f4de5143166ad47b015271cdc4 Mon Sep 17 00:00:00 2001
From: Marco Maggesi <maggesi@math.unifi.it>
Date: Fri, 8 Feb 2013 08:57:42 +0100
Subject: [PATCH 4401/5331] Fix (and simplify) the blcr module.

---
 modules/programs/blcr.nix | 36 +++---------------------------------
 1 file changed, 3 insertions(+), 33 deletions(-)

diff --git a/modules/programs/blcr.nix b/modules/programs/blcr.nix
index c80f46d642e..d1cc40585bb 100644
--- a/modules/programs/blcr.nix
+++ b/modules/programs/blcr.nix
@@ -3,15 +3,7 @@
 let
   inherit (pkgs.lib) mkOption mkIf;
   cfg = config.environment.blcr;
-  kernelPkgs = config.boot.kernelPackages;
-  blcrPkg = kernelPkgs.blcr;
-
-  insmod = "${pkgs.module_init_tools}/sbin/insmod";
-  rmmod  = "${pkgs.module_init_tools}/sbin/rmmod";
-
-  modulesDir      = "${blcrPkg}/lib/modules/${kernelPkgs.kernel.version}";
-  blcr_imports_ko = "${modulesDir}/blcr_imports.ko";
-  blcr_ko         = "${modulesDir}/blcr.ko";
+  blcrPkg = config.boot.kernelPackages.blcr;
 in
 
 {
@@ -23,35 +15,13 @@ in
       description =
         "Wheter to enable support for the BLCR checkpointing tool.";
     };
-
-    environment.blcr.autorun = mkOption {
-      default = true;
-      description =
-        "Whether to load BLCR kernel modules automatically at boot.";
-    };
   };
 
-
   ###### implementation
 
   config = mkIf cfg.enable {
+    boot.kernelModules = [ "blcr" "blcr_imports" ];
+    boot.extraModulePackages = [ blcrPkg ];
     environment.systemPackages = [ blcrPkg ];
-
-    jobs.blcr = {
-        name        = "blcr";
-        description = "Loads BLCR kernel modules";
-	task        = true;
-
-        startOn = if cfg.autorun then "started udev" else null;
-
-	preStart = ''
-          ${insmod} ${blcr_imports_ko}
-          ${insmod} ${blcr_ko}
-	'';
-	postStop = ''
-          ${rmmod} ${blcr_ko}
-          ${rmmod} ${blcr_imports_ko}
-	'';
-      };
   };
 }
-- 
GitLab


From 06f90c6ffcbb96a935363deebd70506dcd274165 Mon Sep 17 00:00:00 2001
From: Evgeny Egorochkin <phreedom.stdin@gmail.com>
Date: Sun, 10 Feb 2013 20:29:17 +0200
Subject: [PATCH 4402/5331] Tor-privoxy: quick and dirty fix for activation
 under systemd

---
 modules/services/security/tor.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/services/security/tor.nix b/modules/services/security/tor.nix
index bad6be54e89..ebbe1569576 100644
--- a/modules/services/security/tor.nix
+++ b/modules/services/security/tor.nix
@@ -252,8 +252,8 @@ in
     // optionalAttrs (cfg.client.privoxy.enable && cfg.client.enable) {
       torPrivoxy = { name = "tor-privoxy";
 
-                     startOn = "starting tor";
-                     stopOn = "stopping tor";
+                     startOn = "started network-interfaces";
+                     stopOn = "stopping network-interfaces";
 
                      preStart = ''
                        mkdir -m 0755 -p ${privoxyDir}
-- 
GitLab


From aaffb21f25098a398564f16daf1ac311c8f1b189 Mon Sep 17 00:00:00 2001
From: Evgeny Egorochkin <phreedom.stdin@gmail.com>
Date: Sun, 10 Feb 2013 20:30:02 +0200
Subject: [PATCH 4403/5331] bluetooth: add the systemd unit needed for
 activation by recent bluez versions

---
 modules/services/hardware/bluetooth.nix | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/modules/services/hardware/bluetooth.nix b/modules/services/hardware/bluetooth.nix
index 06ed9ef70a4..6bc0ad0bf77 100644
--- a/modules/services/hardware/bluetooth.nix
+++ b/modules/services/hardware/bluetooth.nix
@@ -26,6 +26,16 @@ with pkgs.lib;
 
     services.dbus.packages = [ pkgs.bluez ];
 
+    systemd.services."dbus-org.bluez" = {
+      description = "Bluetooth service";
+      serviceConfig = {
+        Type = "dbus";
+        BusName = "org.bluez";
+        ExecStart = "${pkgs.bluez}/sbin/bluetoothd -n";
+      };
+      wantedBy = [ "bluetooth.target" ];
+    };
+
   };
 
 }
-- 
GitLab


From 46b7ddf402dd339c3ca20e4f35e082c4d77b6433 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 11 Feb 2013 16:01:01 +0100
Subject: [PATCH 4404/5331] Add option to disable predictable network interface
 naming

---
 modules/services/hardware/udev.nix   | 26 +++++++++++++++++++++++---
 modules/tasks/network-interfaces.nix |  1 +
 2 files changed, 24 insertions(+), 3 deletions(-)

diff --git a/modules/services/hardware/udev.nix b/modules/services/hardware/udev.nix
index e1a338d6ad8..f793b9387db 100644
--- a/modules/services/hardware/udev.nix
+++ b/modules/services/hardware/udev.nix
@@ -37,8 +37,7 @@ let
         echo "Adding rules for package $i"
         for j in $i/{etc,lib}/udev/rules.d/*; do
           echo "Copying $j to $out/$(basename $j)"
-          echo "# Copied from $j" > $out/$(basename $j)
-          cat $j >> $out/$(basename $j)
+          cat $j > $out/$(basename $j)
         done
       done
 
@@ -83,6 +82,10 @@ let
       for i in ${toString cfg.packages}; do
         grep -l '\(RUN+\|IMPORT{program}\)="\(/usr\)\?/s\?bin' $i/*/udev/rules.d/* || true
       done
+
+      ${optionalString (!config.networking.usePredictableInterfaceNames) ''
+        ln -s /dev/null $out/80-net-name-slot.rules
+      ''}
     ''; # */
   };
 
@@ -141,7 +144,7 @@ in
         example = ''
           KERNEL=="eth*", ATTR{address}=="00:1D:60:B9:6D:4F", NAME="my_fast_network_card"
         '';
-        type = with pkgs.lib.types; string;
+        type = types.lines;
         description = ''
           Additional <command>udev</command> rules. They'll be written
           into file <filename>10-local.rules</filename>. Thus they are
@@ -176,6 +179,23 @@ in
       };
     };
 
+    networking.usePredictableInterfaceNames = mkOption {
+      default = true;
+      type = types.bool;
+      description = ''
+        Whether to assign <link
+        xlink:href='http://www.freedesktop.org/wiki/Software/systemd/PredictableNetworkInterfaceNames'>predictable
+        names to network interfaces</link>.  If enabled, interfaces
+        are assigned names that contain topology information
+        (e.g. <literal>wlp3s0</literal>) and thus should be stable
+        across reboots.  If disabled, names depend on the order in
+        which interfaces are discovered by the kernel, which may
+        change randomly across reboots; for instance, you may find
+        <literal>eth0</literal> and <literal>eth1</literal> flipping
+        unpredictably.
+      '';
+    };
+
   };
 
 
diff --git a/modules/tasks/network-interfaces.nix b/modules/tasks/network-interfaces.nix
index 49dd47251e5..a31253ea4b0 100644
--- a/modules/tasks/network-interfaces.nix
+++ b/modules/tasks/network-interfaces.nix
@@ -228,6 +228,7 @@ in
         configured.
       '';
     };
+
   };
 
 
-- 
GitLab


From b669633d637e1c48dbfa5323344eeede0c3c25fa Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Tue, 12 Feb 2013 10:47:52 -0500
Subject: [PATCH 4405/5331] gummiboot-builder.py: Handle the case where there's
 no /etc/machine-id.

Bug hit by add^_ in IRC when installing from the livecd, as there's no /mnt/etc/machine-id
---
 .../boot/loader/gummiboot/gummiboot-builder.py      | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/modules/system/boot/loader/gummiboot/gummiboot-builder.py b/modules/system/boot/loader/gummiboot/gummiboot-builder.py
index d490c4c8e78..0373695d363 100644
--- a/modules/system/boot/loader/gummiboot/gummiboot-builder.py
+++ b/modules/system/boot/loader/gummiboot/gummiboot-builder.py
@@ -6,6 +6,7 @@ import errno
 import subprocess
 import glob
 import tempfile
+import errno
 
 def copy_if_not_exists(source, dest):
     known_paths.append(dest)
@@ -26,7 +27,7 @@ def write_entry(generation, kernel, initrd):
     with open(tmp_path, 'w') as f:
         print >> f, "title NixOS"
         print >> f, "version Generation %d" % (generation)
-        print >> f, "machine-id %s" % (machine_id)
+        if machine_id is not None: print >> f, "machine-id %s" % (machine_id)
         print >> f, "linux %s" % (kernel)
         print >> f, "initrd %s" % (initrd)
         print >> f, "options %s" % (kernel_params)
@@ -143,8 +144,14 @@ args = parser.parse_args()
 known_paths = []
 mkdir_p("@efiSysMountPoint@/efi/nixos")
 mkdir_p("@efiSysMountPoint@/loader/entries")
-with open("/etc/machine-id") as machine_file:
-    machine_id = machine_file.readlines()[0]
+try:
+    with open("/etc/machine-id") as machine_file:
+        machine_id = machine_file.readlines()[0]
+except IOError as e:
+    if e.errno != errno.ENOENT:
+        raise
+    machine_id = None
+
 gens = get_generations("system")
 for gen in gens:
     add_entry(gen)
-- 
GitLab


From 3ad424632b73652c399735697f51c365094f021a Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Thu, 14 Feb 2013 14:37:00 -0500
Subject: [PATCH 4406/5331] Linux 3.6 has been EOL'd, hopefully 3.7 works for
 the fuloong2f

---
 modules/installer/cd-dvd/system-tarball-fuloong2f.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/installer/cd-dvd/system-tarball-fuloong2f.nix b/modules/installer/cd-dvd/system-tarball-fuloong2f.nix
index 6ddaab0206b..f0c8f3efabd 100644
--- a/modules/installer/cd-dvd/system-tarball-fuloong2f.nix
+++ b/modules/installer/cd-dvd/system-tarball-fuloong2f.nix
@@ -105,7 +105,7 @@ in
   boot.initrd.availableKernelModules =
     [ "vfat" "reiserfs" ];
 
-  boot.kernelPackages = pkgs.linuxPackages_3_6;
+  boot.kernelPackages = pkgs.linuxPackages_3_7;
   boot.kernelParams = [ "console=tty1" ];
 
   boot.postBootCommands =
-- 
GitLab


From 59a4df3159c18cb6fa531ff8e4d19a27044a68a6 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Thu, 14 Feb 2013 21:50:41 -0500
Subject: [PATCH 4407/5331] Add websockify service

---
 modules/module-list.nix                      |  1 +
 modules/services/networking/websockify.nix   | 50 ++++++++++++++++++++
 modules/system/boot/systemd-unit-options.nix |  8 +++-
 modules/system/boot/systemd.nix              |  2 +-
 4 files changed, 59 insertions(+), 2 deletions(-)
 create mode 100644 modules/services/networking/websockify.nix

diff --git a/modules/module-list.nix b/modules/module-list.nix
index 3fa741fa5d9..16ea90bf670 100644
--- a/modules/module-list.nix
+++ b/modules/module-list.nix
@@ -153,6 +153,7 @@
   ./services/networking/unbound.nix
   ./services/networking/vsftpd.nix
   ./services/networking/wakeonlan.nix
+  ./services/networking/websockify.nix
   ./services/networking/wicd.nix
   ./services/networking/wpa_supplicant.nix
   ./services/networking/xinetd.nix
diff --git a/modules/services/networking/websockify.nix b/modules/services/networking/websockify.nix
new file mode 100644
index 00000000000..5e97d2a65cd
--- /dev/null
+++ b/modules/services/networking/websockify.nix
@@ -0,0 +1,50 @@
+{ config, pkgs, ... }:
+
+with pkgs.lib;
+
+let cfg = config.services.networking.websockify; in {
+  options = {
+    services.networking.websockify = {
+      enable = mkOption {  
+        description = "Whether to enable websockify to forward websocket connections to TCP connections";
+
+        default = false;   
+
+        type = types.bool; 
+      };
+
+      sslCert = mkOption {
+        description = "Path to the SSL certificate";
+        type = types.path;
+      };
+
+      sslKey = mkOption {
+        description = "Path to the SSL key";
+        default = cfg.sslCert;
+        type = types.path;
+      };
+
+      portMap = mkOption {
+        description = "Ports to map by default";
+        default = {};
+        type = types.attrsOf types.int;
+      };
+    };
+  };
+
+  config = mkIf cfg.enable {
+    systemd.services."websockify@" = {
+      script = ''
+        IFS=':' read -a array <<< "$1"
+        ${pkgs.pythonPackages.websockify}/bin/websockify --ssl-only \
+          --cert=${cfg.sslCert} --key=${cfg.sslKey} 0.0.0.0:''${array[0]} 0.0.0.0:''${array[1]}
+      '';
+      scriptArgs = "%i";
+    };
+
+    systemd.targets."default-websockify" = {
+      wants = mapAttrsToList (name: value: "websockify@${name}:${toString value}.service") cfg.portMap;
+      wantedBy = [ "multi-user.target" ];
+    };
+  };
+}
diff --git a/modules/system/boot/systemd-unit-options.nix b/modules/system/boot/systemd-unit-options.nix
index 1f8097ada1c..513e9e85708 100644
--- a/modules/system/boot/systemd-unit-options.nix
+++ b/modules/system/boot/systemd-unit-options.nix
@@ -147,6 +147,12 @@ rec {
       description = "Shell commands executed as the service's main process.";
     };
 
+    scriptArgs = mkOption {
+      type = types.uniq types.string;
+      default = "";
+      description = "Arguments passed to the main process script.";
+    };
+
     preStart = mkOption {
       type = types.string;
       default = "";
@@ -262,4 +268,4 @@ rec {
     };
   };
 
-}
\ No newline at end of file
+}
diff --git a/modules/system/boot/systemd.nix b/modules/system/boot/systemd.nix
index c958433ff45..ddb6dd3db26 100644
--- a/modules/system/boot/systemd.nix
+++ b/modules/system/boot/systemd.nix
@@ -241,7 +241,7 @@ let
             ExecStart=${makeJobScript "${name}-start" ''
               #! ${pkgs.stdenv.shell} -e
               ${def.script}
-            ''}
+            ''} ${def.scriptArgs}
           ''}
 
           ${optionalString (def.postStart != "") ''
-- 
GitLab


From 08fdc234c813437a0db04f9f97c8dec5468560d3 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Fri, 15 Feb 2013 14:36:20 -0500
Subject: [PATCH 4408/5331] Fix manual build

---
 modules/services/networking/websockify.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/modules/services/networking/websockify.nix b/modules/services/networking/websockify.nix
index 5e97d2a65cd..8921fc4f6a7 100644
--- a/modules/services/networking/websockify.nix
+++ b/modules/services/networking/websockify.nix
@@ -21,6 +21,7 @@ let cfg = config.services.networking.websockify; in {
       sslKey = mkOption {
         description = "Path to the SSL key";
         default = cfg.sslCert;
+        defaultText = "config.services.networking.websockify.sslCert";
         type = types.path;
       };
 
-- 
GitLab


From 233cc2fdaa1fae2feefb50816aa79b1aae00a8c0 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sat, 16 Feb 2013 23:08:53 +0100
Subject: [PATCH 4409/5331] Add a module for MiniDLNA

Now my NixOS machine can serve videos to my Bluray player!
---
 modules/module-list.nix                  |   1 +
 modules/services/networking/minidlna.nix | 105 +++++++++++++++++++++++
 2 files changed, 106 insertions(+)
 create mode 100644 modules/services/networking/minidlna.nix

diff --git a/modules/module-list.nix b/modules/module-list.nix
index 16ea90bf670..da018d998b8 100644
--- a/modules/module-list.nix
+++ b/modules/module-list.nix
@@ -133,6 +133,7 @@
   ./services/networking/hostapd.nix
   ./services/networking/ifplugd.nix
   ./services/networking/ircd-hybrid/default.nix
+  ./services/networking/minidlna.nix
   ./services/networking/nat.nix
   ./services/networking/networkmanager.nix
   ./services/networking/ntpd.nix
diff --git a/modules/services/networking/minidlna.nix b/modules/services/networking/minidlna.nix
new file mode 100644
index 00000000000..c240e87e059
--- /dev/null
+++ b/modules/services/networking/minidlna.nix
@@ -0,0 +1,105 @@
+# Module for MiniDLNA, a simple DLNA server.
+
+{ config, pkgs, ... }:
+
+with pkgs.lib;
+
+let
+
+  cfg = config.services.minidlna;
+
+  port = 8200;
+
+in
+
+{
+
+  ###### interface
+
+  options = {
+
+    services.minidlna.enable = mkOption {
+      type = types.bool;
+      default = false;
+      description =
+        ''
+          Whether to enable MiniDLNA, a simple DLNA server.  It serves
+          media files such as video and music to DLNA client devices
+          such as televisions and media players.
+        '';
+    };
+
+    services.minidlna.mediaDirs = mkOption {
+      type = types.listOf types.string;
+      default = [];
+      examples = [ "/data/media" "V,/home/alice/video" ];
+      description =
+        ''
+          Directories to be scanned for media files.  The prefixes
+          <literal>A,</literal>, <literal>V,</literal> and
+          <literal>P,</literal> restrict a directory to audio, video
+          or image files.  The directories must be accessible to the
+          <literal>minidlna</literal> user account.
+        '';
+    };
+
+    services.minidlna.config = mkOption {
+      type = types.lines;
+      description = "The contents of MiniDLNA's configuration file.";
+    };
+
+  };
+
+
+  ###### implementation
+
+  config = mkIf cfg.enable {
+
+    # Running minidlna only makes sense for serving files to the
+    # outside, so open up the required ports by default.
+    networking.firewall.allowedTCPPorts = [ port ];
+    networking.firewall.allowedUDPPorts = [ 1900 ]; # SSDP
+
+    services.minidlna.config =
+      ''
+        port=${toString port}
+        friendly_name=NixOS Media Server
+        db_dir=/var/cache/minidlna
+        log_dir=/var/log/minidlna
+        inotify=yes
+        ${concatMapStrings (dir: ''
+          media_dir=${dir}
+        '') cfg.mediaDirs}
+      '';
+
+    users.extraUsers.minidlna.description = "MiniDLNA daemon user";
+
+    systemd.services.minidlna =
+      { description = "MiniDLNA Server";
+
+        wantedBy = [ "multi-user.target" ];
+
+        preStart =
+          ''
+            mkdir -p /var/cache/minidlna /var/log/minidlna /run/minidlna
+            chown minidlna /var/cache/minidlna /var/log/minidlna /run/minidlna
+          '';
+
+        # FIXME: log through the journal rather than
+        # /var/log/minidlna.  The -d flag does that, but also raises
+        # the log level to debug...
+        serviceConfig =
+          { User = "minidlna";
+            Group = "nogroup";
+            PermissionsStartOnly = true;
+            Type = "forking";
+            PIDFile = "/run/minidlna/pid";
+            ExecStart =
+              "@${pkgs.minidlna}/sbin/minidlna minidlna -P /run/minidlna/pid" +
+              " -f ${pkgs.writeText "minidlna.conf" cfg.config}";
+          };
+      };
+
+  };
+
+}
-- 
GitLab


From 4a663316257509e82700f5166aa490db46e93ffe Mon Sep 17 00:00:00 2001
From: Domen Kozar <domen@dev.si>
Date: Sat, 16 Feb 2013 23:19:09 +0100
Subject: [PATCH 4410/5331] add xbmc window manager

---
 .../services/x11/window-managers/default.nix  |  1 +
 modules/services/x11/window-managers/xbmc.nix | 31 +++++++++++++++++++
 2 files changed, 32 insertions(+)
 create mode 100644 modules/services/x11/window-managers/xbmc.nix

diff --git a/modules/services/x11/window-managers/default.nix b/modules/services/x11/window-managers/default.nix
index 8adfca3cca9..de0cbd5c599 100644
--- a/modules/services/x11/window-managers/default.nix
+++ b/modules/services/x11/window-managers/default.nix
@@ -15,6 +15,7 @@ in
     ./wmii.nix
     ./xmonad.nix
     ./i3.nix
+    ./xbmc.nix
   ];
 
   options = {
diff --git a/modules/services/x11/window-managers/xbmc.nix b/modules/services/x11/window-managers/xbmc.nix
new file mode 100644
index 00000000000..ca0e449f12b
--- /dev/null
+++ b/modules/services/x11/window-managers/xbmc.nix
@@ -0,0 +1,31 @@
+{pkgs, config, ...}:
+
+let
+  inherit (pkgs.lib) mkOption mkIf;
+  cfg = config.services.xserver.windowManager.xbmc;
+in
+
+{
+  options = {
+    services.xserver.windowManager.xbmc = {
+      enable = mkOption {
+        default = false;
+        example = true;
+        description = "Enable the xbmc multimedia center.";
+      };
+    };
+  };
+
+  config = mkIf cfg.enable {
+    services.xserver.windowManager = {
+      session = [{
+        name = "xbmc";
+        start = "
+          ${pkgs.xbmc}/bin/xbmc-standalone &
+          waitPID=$!
+        ";
+      }];
+    };
+    environment.systemPackages = [ pkgs.xbmc ];
+  };
+}
-- 
GitLab


From 2802538dc2e2a8923e3d3cc3e144abc4e1561760 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 17 Feb 2013 22:47:08 +0100
Subject: [PATCH 4411/5331] modules/config/fonts.nix: export GDFONTPATH in
 /etc/profile

Set the environment variable GDFONTPATH to the list of directories where fonts
are expected to be installed. This is search path is used by same GD-based
applications, such as Gnuplot.

Alternatively, we could rely on fontconfig to achieve the same thing, i.e. by
running

  for n in $(fc-list | sed -r -e 's|^([^:]+):.*$|\1|'); do echo $(dirname "$n"); done | sort | uniq

to get that list at run-time, but the static approach feels more deterministic.
---
 modules/config/fonts.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/modules/config/fonts.nix b/modules/config/fonts.nix
index 3516ed75ab6..4174a889a1d 100644
--- a/modules/config/fonts.nix
+++ b/modules/config/fonts.nix
@@ -171,6 +171,7 @@ in
   environment.shellInit =
     ''
       export FONTCONFIG_FILE=/etc/fonts/fonts.conf
+      export GDFONTPATH=${concatStringsSep ":" config.fonts.fonts}
     '';
 
   environment.systemPackages =
-- 
GitLab


From 09bfc9a53e1e44faae5df5e846dd199d076525ed Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 17 Feb 2013 23:13:27 +0100
Subject: [PATCH 4412/5331] modules/config/fonts.nix: revert "export GDFONTPATH
 in /etc/profile"

This reverts commit 2802538dc2e2a8923e3d3cc3e144abc4e1561760. The idea
was good, but unfortunately $GDFONTPATH has a different format, i.e.
programs that use this variable don't descend into the directories
listed here like fontconfig does, so we cannot use the same values for
both settings.
---
 modules/config/fonts.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/modules/config/fonts.nix b/modules/config/fonts.nix
index 4174a889a1d..3516ed75ab6 100644
--- a/modules/config/fonts.nix
+++ b/modules/config/fonts.nix
@@ -171,7 +171,6 @@ in
   environment.shellInit =
     ''
       export FONTCONFIG_FILE=/etc/fonts/fonts.conf
-      export GDFONTPATH=${concatStringsSep ":" config.fonts.fonts}
     '';
 
   environment.systemPackages =
-- 
GitLab


From 202340e3f6509a76cbc95e5f9eb1a18a22cc8d9a Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 18 Feb 2013 15:37:46 +0100
Subject: [PATCH 4413/5331] nixos-rebuild build-vm: Override filesystems
 defined in the normal config

---
 modules/virtualisation/qemu-vm.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/virtualisation/qemu-vm.nix b/modules/virtualisation/qemu-vm.nix
index e125654e80f..0383f12b3ab 100644
--- a/modules/virtualisation/qemu-vm.nix
+++ b/modules/virtualisation/qemu-vm.nix
@@ -321,7 +321,7 @@ in
   # where the regular value for the `fileSystems' attribute should be
   # disregarded for the purpose of building a VM test image (since
   # those filesystems don't exist in the VM).
-  fileSystems =
+  fileSystems = mkOverride 10
     { "/".device = "/dev/vda";
       "/nix/store" =
         { device = "//10.0.2.4/store";
-- 
GitLab


From 18e8724e64f5c87e2095023bff2ab0943e3ae23d Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 18 Feb 2013 15:39:02 +0100
Subject: [PATCH 4414/5331] Log the configuration when booting / switching

---
 .../activation/switch-to-configuration.pl     | 23 +++++++++++++++----
 modules/system/boot/stage-2-init.sh           |  3 +++
 2 files changed, 21 insertions(+), 5 deletions(-)

diff --git a/modules/system/activation/switch-to-configuration.pl b/modules/system/activation/switch-to-configuration.pl
index a5a06454006..3db04727e52 100644
--- a/modules/system/activation/switch-to-configuration.pl
+++ b/modules/system/activation/switch-to-configuration.pl
@@ -4,8 +4,11 @@ use strict;
 use warnings;
 use File::Basename;
 use File::Slurp;
+use Sys::Syslog qw(:standard :macros);
 use Cwd 'abs_path';
 
+my $out = "@out@";
+
 my $startListFile = "/run/systemd/start-list";
 my $restartListFile = "/run/systemd/restart-list";
 my $reloadListFile = "/run/systemd/reload-list";
@@ -25,15 +28,17 @@ EOF
 
 die "This is not a NixOS installation (/etc/NIXOS is missing)!\n" unless -f "/etc/NIXOS";
 
+openlog("nixos", "", LOG_USER);
+
 # Install or update the bootloader.
 if ($action eq "switch" || $action eq "boot") {
-    system("@installBootLoader@ @out@") == 0 or exit 1;
+    system("@installBootLoader@ $out") == 0 or exit 1;
     exit 0 if $action eq "boot";
 }
 
 # Check if we can activate the new configuration.
 my $oldVersion = read_file("/run/current-system/init-interface-version", err_mode => 'quiet') // "";
-my $newVersion = read_file("@out@/init-interface-version");
+my $newVersion = read_file("$out/init-interface-version");
 
 if ($newVersion ne $oldVersion) {
     print STDERR <<EOF;
@@ -44,6 +49,8 @@ EOF
     exit 100;
 }
 
+syslog(LOG_NOTICE, "switching to system configuration $out");
+
 # Ignore SIGHUP so that we're not killed if we're running on (say)
 # virtual console 1 and we restart the "tty1" unit.
 $SIG{PIPE} = "IGNORE";
@@ -106,7 +113,7 @@ while (my ($unit, $state) = each %{$activePrev}) {
     # Recognise template instances.
     $baseUnit = "$1\@.$2" if $unit =~ /^(.*)@[^\.]*\.(.*)$/;
     my $prevUnitFile = "/etc/systemd/system/$baseUnit";
-    my $newUnitFile = "@out@/etc/systemd/system/$baseUnit";
+    my $newUnitFile = "$out/etc/systemd/system/$baseUnit";
 
     my $baseName = $baseUnit;
     $baseName =~ s/\.[a-z]*$//;
@@ -230,7 +237,7 @@ sub unique {
 # we generated units for all mounts; then we could unify this with the
 # unit checking code above.
 my ($prevFss, $prevSwaps) = parseFstab "/etc/fstab";
-my ($newFss, $newSwaps) = parseFstab "@out@/etc/fstab";
+my ($newFss, $newSwaps) = parseFstab "$out/etc/fstab";
 foreach my $mountPoint (keys %$prevFss) {
     my $prev = $prevFss->{$mountPoint};
     my $new = $newFss->{$mountPoint};
@@ -276,7 +283,7 @@ print STDERR "NOT restarting the following units: ", join(", ", sort(@unitsToSki
 # and so on).
 my $res = 0;
 print STDERR "activating the configuration...\n";
-system("@out@/activate", "@out@") == 0 or $res = 2;
+system("$out/activate", "$out") == 0 or $res = 2;
 
 # Restart systemd if necessary.
 if (abs_path("/proc/1/exe") ne abs_path("@systemd@/lib/systemd/systemd")) {
@@ -342,4 +349,10 @@ if (scalar @failed > 0) {
     $res = 4;
 }
 
+if ($res == 0) {
+    syslog(LOG_NOTICE, "finished switching to system configuration $out");
+} else {
+    syslog(LOG_ERR, "switching to system configuration $out failed (status $res)");
+}
+
 exit $res;
diff --git a/modules/system/boot/stage-2-init.sh b/modules/system/boot/stage-2-init.sh
index e7c9e2b23d8..e8b3a403020 100644
--- a/modules/system/boot/stage-2-init.sh
+++ b/modules/system/boot/stage-2-init.sh
@@ -42,6 +42,9 @@ if [ ! -e /proc/1 ]; then
 fi
 
 
+echo "booting system configuration $systemConfig" > /dev/kmsg
+
+
 # Make /nix/store a read-only bind mount to enforce immutability of
 # the Nix store.  Note that we can't use "chown root:nixbld" here
 # because users/groups might not exist yet.
-- 
GitLab


From 969fe07be6ce52155e51963cf7026c95fa526789 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Mon, 18 Feb 2013 11:51:33 -0500
Subject: [PATCH 4415/5331] Websockify: End descriptions with a period.

---
 modules/services/networking/websockify.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/modules/services/networking/websockify.nix b/modules/services/networking/websockify.nix
index 8921fc4f6a7..5fb07abf782 100644
--- a/modules/services/networking/websockify.nix
+++ b/modules/services/networking/websockify.nix
@@ -6,7 +6,7 @@ let cfg = config.services.networking.websockify; in {
   options = {
     services.networking.websockify = {
       enable = mkOption {  
-        description = "Whether to enable websockify to forward websocket connections to TCP connections";
+        description = "Whether to enable websockify to forward websocket connections to TCP connections.";
 
         default = false;   
 
@@ -14,19 +14,19 @@ let cfg = config.services.networking.websockify; in {
       };
 
       sslCert = mkOption {
-        description = "Path to the SSL certificate";
+        description = "Path to the SSL certificate.";
         type = types.path;
       };
 
       sslKey = mkOption {
-        description = "Path to the SSL key";
+        description = "Path to the SSL key.";
         default = cfg.sslCert;
         defaultText = "config.services.networking.websockify.sslCert";
         type = types.path;
       };
 
       portMap = mkOption {
-        description = "Ports to map by default";
+        description = "Ports to map by default.";
         default = {};
         type = types.attrsOf types.int;
       };
-- 
GitLab


From 762ea5c578328c61c0ba7110c465c291933d3b04 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Mon, 18 Feb 2013 11:55:10 -0500
Subject: [PATCH 4416/5331] websockify: Add unit descriptions

---
 modules/services/networking/websockify.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/modules/services/networking/websockify.nix b/modules/services/networking/websockify.nix
index 5fb07abf782..864d7bbb978 100644
--- a/modules/services/networking/websockify.nix
+++ b/modules/services/networking/websockify.nix
@@ -35,6 +35,7 @@ let cfg = config.services.networking.websockify; in {
 
   config = mkIf cfg.enable {
     systemd.services."websockify@" = {
+      description = "Service to forward websocket connections to TCP connections (from port:to port %I)";
       script = ''
         IFS=':' read -a array <<< "$1"
         ${pkgs.pythonPackages.websockify}/bin/websockify --ssl-only \
@@ -44,6 +45,7 @@ let cfg = config.services.networking.websockify; in {
     };
 
     systemd.targets."default-websockify" = {
+      description = "Target to start all default websockify@ services";
       wants = mapAttrsToList (name: value: "websockify@${name}:${toString value}.service") cfg.portMap;
       wantedBy = [ "multi-user.target" ];
     };
-- 
GitLab


From b83be79adf1f0534a864e26de3c3a8b1486d9c3d Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Mon, 18 Feb 2013 11:55:46 -0500
Subject: [PATCH 4417/5331] default-websockify: Stop when reconfigured (i.e.
 new ports added/removed)

---
 modules/services/networking/websockify.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/modules/services/networking/websockify.nix b/modules/services/networking/websockify.nix
index 864d7bbb978..12042bbad6c 100644
--- a/modules/services/networking/websockify.nix
+++ b/modules/services/networking/websockify.nix
@@ -46,6 +46,7 @@ let cfg = config.services.networking.websockify; in {
 
     systemd.targets."default-websockify" = {
       description = "Target to start all default websockify@ services";
+      unitConfig."X-StopOnReconfiguration" = true;
       wants = mapAttrsToList (name: value: "websockify@${name}:${toString value}.service") cfg.portMap;
       wantedBy = [ "multi-user.target" ];
     };
-- 
GitLab


From 338ef594c7d7ab14468ead71b2526c17ee5b6e5b Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Tue, 19 Feb 2013 11:55:39 -0500
Subject: [PATCH 4418/5331] Add boot.initrd.compressor option

---
 modules/system/boot/stage-1.nix | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/modules/system/boot/stage-1.nix b/modules/system/boot/stage-1.nix
index a66e609ba7b..f78a5dda2d3 100644
--- a/modules/system/boot/stage-1.nix
+++ b/modules/system/boot/stage-1.nix
@@ -95,6 +95,16 @@ let
       '';
     };
 
+    boot.initrd.compressor = mkOption {
+      default = "gzip -9";
+
+      type = types.string;
+
+      description = "The compressor to use on the initrd";
+
+      example = "xz";
+    };
+
     fileSystems = mkOption {
       options.neededForBoot = mkOption {
         default = false;
@@ -317,6 +327,8 @@ let
   # The closure of the init script of boot stage 1 is what we put in
   # the initial RAM disk.
   initialRamdisk = pkgs.makeInitrd {
+    inherit (config.boot.initrd) compressor;
+
     contents =
       [ { object = bootStage1;
           symlink = "/init";
-- 
GitLab


From 37be1c89822c5a96ee8d308979ce7ec45ba8b9a0 Mon Sep 17 00:00:00 2001
From: Aristid Breitkreuz <aristidb@gmail.com>
Date: Tue, 19 Feb 2013 18:28:25 +0100
Subject: [PATCH 4419/5331] x11/mesa: driSupport32Bit for the mesa
 implementation

---
 modules/services/x11/xserver.nix | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/modules/services/x11/xserver.nix b/modules/services/x11/xserver.nix
index 7cc507feb1d..c4d74201c96 100644
--- a/modules/services/x11/xserver.nix
+++ b/modules/services/x11/xserver.nix
@@ -225,7 +225,8 @@ in
         description = ''
           On 64-bit systems, whether to support Direct Rendering for
           32-bit applications (such as Wine).  This is currently only
-          supported for the <literal>nvidia</literal> driver.
+          supported for the <literal>nvidia</literal> driver and for
+          <literal>mesa</literal>.
         '';
       };
 
@@ -497,9 +498,12 @@ in
                 "ln -sf ${kernelPackages.nvidia_x11_legacy304} /run/opengl-driver"
               else if elem "ati_unfree" driverNames then
                 "ln -sf ${kernelPackages.ati_drivers_x11} /run/opengl-driver"
-              else if cfg.driSupport then
-                "ln -sf ${pkgs.mesa} /run/opengl-driver"
-              else ""
+              else
+                ''
+                  ${optionalString cfg.driSupport "ln -sf ${pkgs.mesa} /run/opengl-driver"}
+                  ${optionalString (pkgs.stdenv.system == "x86_64-linux" && cfg.driSupport32Bit)
+                    "ln -sf ${pkgs_i686.mesa} /run/opengl-driver-32"}
+                ''
             }
 
             ${cfg.displayManager.job.preStart}
-- 
GitLab


From 6c6d40452ff0fc735bc9abd8785cca52f70eebcf Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Tue, 19 Feb 2013 16:34:45 -0500
Subject: [PATCH 4420/5331] Stage 1 mounts securityfs, so require that in the
 kernel

---
 modules/system/boot/stage-1.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/modules/system/boot/stage-1.nix b/modules/system/boot/stage-1.nix
index f78a5dda2d3..92386440dd8 100644
--- a/modules/system/boot/stage-1.nix
+++ b/modules/system/boot/stage-1.nix
@@ -361,5 +361,6 @@ in {
   system.requiredKernelConfig = with config.lib.kernelConfig; [
     (isYes "TMPFS")
     (isYes "BLK_DEV_INITRD")
+    (isYes "SECURITYFS")
   ];
 }
-- 
GitLab


From e80cfe7d2d5cb6593da62dac9d1df09e212c911c Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Tue, 19 Feb 2013 16:35:42 -0500
Subject: [PATCH 4421/5331] gummiboot-builder.py: Not rewriting entries
 probably doesn't save much time, and is problematic in the case where you
 delete the latest generation before your rebuild

---
 modules/system/boot/loader/gummiboot/gummiboot-builder.py | 2 --
 1 file changed, 2 deletions(-)

diff --git a/modules/system/boot/loader/gummiboot/gummiboot-builder.py b/modules/system/boot/loader/gummiboot/gummiboot-builder.py
index 0373695d363..ba4f946fc0f 100644
--- a/modules/system/boot/loader/gummiboot/gummiboot-builder.py
+++ b/modules/system/boot/loader/gummiboot/gummiboot-builder.py
@@ -17,8 +17,6 @@ system_dir = lambda generation: "/nix/var/nix/profiles/system-%d-link" % (genera
 
 def write_entry(generation, kernel, initrd):
     entry_file = "@efiSysMountPoint@/loader/entries/nixos-generation-%d.conf" % (generation)
-    if os.path.exists(entry_file):
-        return
     generation_dir = os.readlink(system_dir(generation))
     tmp_path = "%s.tmp" % (entry_file)
     kernel_params = "systemConfig=%s init=%s/init " % (generation_dir, generation_dir)
-- 
GitLab


From 7b8958b6c57555764aa63b1262d38e37f6820c70 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 21 Feb 2013 11:32:51 +0100
Subject: [PATCH 4422/5331] Fix the boot.hardwareScan option

Fixes #95.
---
 modules/services/hardware/udev.nix | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/modules/services/hardware/udev.nix b/modules/services/hardware/udev.nix
index f793b9387db..0fce84fdd6d 100644
--- a/modules/services/hardware/udev.nix
+++ b/modules/services/hardware/udev.nix
@@ -86,6 +86,13 @@ let
       ${optionalString (!config.networking.usePredictableInterfaceNames) ''
         ln -s /dev/null $out/80-net-name-slot.rules
       ''}
+
+      # If auto-configuration is disabled, then remove
+      # udev's 80-drivers.rules file, which contains rules for
+      # automatically calling modprobe.
+      ${optionalString (!config.boot.hardwareScan) ''
+        ln -s /dev/null $out/80-drivers.rules
+      ''}
     ''; # */
   };
 
-- 
GitLab


From 5f29704861b4a6ea98426d9ff0b5e707f4fe6d8c Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Thu, 21 Feb 2013 12:33:54 -0500
Subject: [PATCH 4423/5331] gummiboot-builder.py: Update to latest gummiboot

---
 modules/rename.nix                            |  3 +-
 .../loader/efi-boot-stub/efi-boot-stub.nix    |  2 +-
 modules/system/boot/loader/efi.nix            | 20 +++---
 .../loader/gummiboot/gummiboot-builder.py     | 68 ++-----------------
 .../boot/loader/gummiboot/gummiboot.nix       |  8 +--
 5 files changed, 20 insertions(+), 81 deletions(-)

diff --git a/modules/rename.nix b/modules/rename.nix
index 858056732a1..3582f72bfd5 100644
--- a/modules/rename.nix
+++ b/modules/rename.nix
@@ -104,6 +104,7 @@ in zipModules ([]
 ++ rename obsolete "boot.loader.efiBootStub.efiDisk" "boot.loader.efi.efibootmgr.efiDisk"
 ++ rename obsolete "boot.loader.efiBootStub.efiPartition" "boot.loader.efi.efibootmgr.efiPartition"
 ++ rename obsolete "boot.loader.efiBootStub.postEfiBootMgrCommands" "boot.loader.efi.efibootmgr.postEfiBootMgrCommands"
-++ rename obsolete "boot.loader.efiBootStub.runEfibootmgr" "boot.loader.efi.efibootmgr.enable"
+++ rename obsolete "boot.loader.efiBootStub.runEfibootmgr" "boot.loader.efi.canTouchEfiVariables"
+++ rename obsolete "boot.loader.efi.efibootmgr.enable" "boot.loader.efi.canTouchEfiVariables"
 
 ) # do not add renaming after this.
diff --git a/modules/system/boot/loader/efi-boot-stub/efi-boot-stub.nix b/modules/system/boot/loader/efi-boot-stub/efi-boot-stub.nix
index 529de0f0e54..7c8deba389b 100644
--- a/modules/system/boot/loader/efi-boot-stub/efi-boot-stub.nix
+++ b/modules/system/boot/loader/efi-boot-stub/efi-boot-stub.nix
@@ -14,7 +14,7 @@ let
 
     inherit (config.boot.loader.efi.efibootmgr) efiDisk efiPartition postEfiBootMgrCommands;
 
-    runEfibootmgr = config.boot.loader.efi.efibootmgr.enable;
+    runEfibootmgr = config.boot.loader.efi.canTouchEfiVariables;
 
     efiShell = if config.boot.loader.efiBootStub.installShell then
       if pkgs.stdenv.isi686 then
diff --git a/modules/system/boot/loader/efi.nix b/modules/system/boot/loader/efi.nix
index 41074908bff..827b3e39122 100644
--- a/modules/system/boot/loader/efi.nix
+++ b/modules/system/boot/loader/efi.nix
@@ -4,6 +4,14 @@ with pkgs.lib;
 
 {
   options.boot.loader.efi = {
+    canTouchEfiVariables = mkOption {
+      default = false;
+
+      type = types.bool;
+
+      description = "Whether or not the installation process should modify efi boot variables.";
+    };
+
     efibootmgr = {
       efiDisk = mkOption {
         default = "/dev/sda";
@@ -13,18 +21,6 @@ with pkgs.lib;
         description = "The disk that contains the EFI system partition.";
       };
 
-      enable = mkOption {
-        default = false;
-
-        type = types.bool;
-
-        description = ''
-          Whether to run efibootmgr to add the efi bootloaders configuration to the boot options list.
-          WARNING! efibootmgr has been rumored to brick Apple firmware on
-          old kernels! Don't use it on kernels older than 2.6.39!
-        '';
-      };
-
       efiPartition = mkOption {
         default = "1";
         description = "The partition number of the EFI system partition.";
diff --git a/modules/system/boot/loader/gummiboot/gummiboot-builder.py b/modules/system/boot/loader/gummiboot/gummiboot-builder.py
index ba4f946fc0f..b8e9e983e79 100644
--- a/modules/system/boot/loader/gummiboot/gummiboot-builder.py
+++ b/modules/system/boot/loader/gummiboot/gummiboot-builder.py
@@ -80,65 +80,17 @@ def remove_old_entries(gens):
         if not path in known_paths:
             os.unlink(path)
 
-def update_gummiboot():
-    mkdir_p("@efiSysMountPoint@/efi/gummiboot")
-    store_file_path = "@gummiboot@/bin/gummiboot.efi"
-    store_dir = os.path.basename("@gummiboot@")
-    efi_file_path = "/efi/gummiboot/%s-gummiboot.efi" % (store_dir)
-    copy_if_not_exists(store_file_path, "@efiSysMountPoint@%s" % (efi_file_path))
-    return efi_file_path
-
-def update_efibootmgr(path):
-    subprocess.call(["@kmod@/sbin/modprobe", "efivars"])
-    post_efibootmgr = """
-@postEfiBootMgrCommands@
-    """
-    efibootmgr_entries = subprocess.check_output(["@efibootmgr@/sbin/efibootmgr"]).split("\n")
-    for entry in efibootmgr_entries:
-        columns = entry.split()
-        if len(columns) > 2:
-            if ' '.join(columns[1:3]) == "NixOS gummiboot":
-                subprocess.call([
-                    "@efibootmgr@/sbin/efibootmgr",
-                    "-B",
-                    "-b",
-                    columns[0][4:8]
-                    ])
-    subprocess.call([
-        "@efibootmgr@/sbin/efibootmgr",
-        "-c",
-        "-d",
-        "@efiDisk@",
-        "-g",
-        "-l",
-        path.replace("/", "\\"),
-        "-L",
-        "NixOS gummiboot",
-        "-p",
-        "@efiPartition@",
-        ])
-    efibootmgr_entries = subprocess.check_output(["@efibootmgr@/sbin/efibootmgr"]).split("\n")
-    for entry in efibootmgr_entries:
-        columns = entry.split()
-        if len(columns) > 1 and columns[0] == "BootOrder:":
-            boot_order = columns[1].split(',')
-        if len(columns) > 2:
-            if ' '.join(columns[1:3]) == "NixOS gummiboot":
-                bootnum = columns[0][4:8]
-                if not bootnum in boot_order:
-                    boot_order.insert(0, bootnum)
-                    with open("/dev/null", 'w') as dev_null:
-                        subprocess.call([
-                            "@efibootmgr@/sbin/efibootmgr",
-                            "-o",
-                            ','.join(boot_order)
-                            ], stdout=dev_null)
-    subprocess.call(post_efibootmgr, shell=True)
-
 parser = argparse.ArgumentParser(description='Update NixOS-related gummiboot files')
 parser.add_argument('default_config', metavar='DEFAULT-CONFIG', help='The default NixOS config to boot')
 args = parser.parse_args()
 
+# We deserve our own env var!
+if os.getenv("NIXOS_INSTALL_GRUB") == "1":
+    if "@canTouchEfiVariables@" == "1":
+        subprocess.check_call(["@gummiboot@/bin/gummiboot", "--path=@efiSysMountPoint@", "install"])
+    else:
+        subprocess.check_call(["@gummiboot@/bin/gummiboot", "--path=@efiSysMountPoint@", "--no-variables", "install"])
+
 known_paths = []
 mkdir_p("@efiSysMountPoint@/efi/nixos")
 mkdir_p("@efiSysMountPoint@/loader/entries")
@@ -157,9 +109,3 @@ for gen in gens:
         write_loader_conf(gen)
 
 remove_old_entries(gens)
-
-# We deserve our own env var!
-if os.getenv("NIXOS_INSTALL_GRUB") == "1":
-    gummiboot_path = update_gummiboot()
-    if "@runEfibootmgr@" == "1":
-        update_efibootmgr(gummiboot_path)
diff --git a/modules/system/boot/loader/gummiboot/gummiboot.nix b/modules/system/boot/loader/gummiboot/gummiboot.nix
index 8ae0693923c..0fd6bbe9c73 100644
--- a/modules/system/boot/loader/gummiboot/gummiboot.nix
+++ b/modules/system/boot/loader/gummiboot/gummiboot.nix
@@ -12,17 +12,13 @@ let
 
     isExecutable = true;
 
-    inherit (pkgs) python gummiboot kmod efibootmgr;
+    inherit (pkgs) python gummiboot;
 
     inherit (config.environment) nix;
 
     inherit (cfg) timeout;
 
-    inherit (efi) efiSysMountPoint;
-
-    inherit (efi.efibootmgr) postEfiBootMgrCommands efiDisk efiPartition;
-
-    runEfibootmgr = efi.efibootmgr.enable;
+    inherit (efi) efiSysMountPoint canTouchEfiVariables;
   };
 in {
   options.boot.loader.gummiboot = {
-- 
GitLab


From fb7b7a28872584a74550b1245e1f5930b70cf8e8 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Thu, 21 Feb 2013 13:30:42 -0500
Subject: [PATCH 4424/5331] Update EFI installation CD to meet the requirements
 of the new gummiboot

---
 modules/installer/cd-dvd/installation-cd-efi.nix | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/modules/installer/cd-dvd/installation-cd-efi.nix b/modules/installer/cd-dvd/installation-cd-efi.nix
index 56308397bf6..669c5eaf6ad 100644
--- a/modules/installer/cd-dvd/installation-cd-efi.nix
+++ b/modules/installer/cd-dvd/installation-cd-efi.nix
@@ -3,17 +3,16 @@
 {
   require = [ ./installation-cd-minimal.nix ];
 
-  boot.kernelPackages = pkgs.linuxPackages_3_7;
+  boot.kernelPackages = pkgs.linuxPackages_3_8;
   boot.vesa = false;
 
   # What follows should probably move into base once the base kernel has the
   # efi boot stub
 
   # Get a console as soon as the initrd loads fbcon on EFI boot
-  boot.initrd.kernelModules = [ "fbcon" ];
-
   # Enable reading EFI variables via sysfs
-  boot.kernelModules = [ "efivars" ];
+  # !!! Needing efivars will only be necessary until http://article.gmane.org/gmane.linux.kernel.efi/773 is merged
+  boot.initrd.kernelModules = [ "fbcon" "efivars" ];
 
   # efi-related tools
   environment.systemPackages = [ pkgs.efibootmgr ];
-- 
GitLab


From 497aeabd2309d8696c131d482b87444acee601d7 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Thu, 21 Feb 2013 14:22:18 -0500
Subject: [PATCH 4425/5331] systemd automatically mounts securityfs (if it's
 enabled)

---
 modules/system/boot/stage-1-init.sh | 1 -
 modules/system/boot/stage-1.nix     | 1 -
 2 files changed, 2 deletions(-)

diff --git a/modules/system/boot/stage-1-init.sh b/modules/system/boot/stage-1-init.sh
index 3f34a1ae6a5..cac7a1ceaa9 100644
--- a/modules/system/boot/stage-1-init.sh
+++ b/modules/system/boot/stage-1-init.sh
@@ -65,7 +65,6 @@ mount -t sysfs none /sys
 mount -t devtmpfs -o "size=@devSize@" none /dev
 mkdir -p /run
 mount -t tmpfs -o "mode=0755,size=@runSize@" none /run
-mount -t securityfs none /sys/kernel/security
 
 # Process the kernel command line.
 export stage2Init=/init
diff --git a/modules/system/boot/stage-1.nix b/modules/system/boot/stage-1.nix
index 92386440dd8..f78a5dda2d3 100644
--- a/modules/system/boot/stage-1.nix
+++ b/modules/system/boot/stage-1.nix
@@ -361,6 +361,5 @@ in {
   system.requiredKernelConfig = with config.lib.kernelConfig; [
     (isYes "TMPFS")
     (isYes "BLK_DEV_INITRD")
-    (isYes "SECURITYFS")
   ];
 }
-- 
GitLab


From e0f35b77d8c19c87f612f1537508f926e7ee412f Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Thu, 21 Feb 2013 14:43:02 -0500
Subject: [PATCH 4426/5331] rename.nix: Remove annoying traces

---
 modules/rename.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/rename.nix b/modules/rename.nix
index 3582f72bfd5..bf6179cf369 100644
--- a/modules/rename.nix
+++ b/modules/rename.nix
@@ -28,8 +28,8 @@ let
   zipModules = list: with pkgs.lib;
     zip (n: v:
       if tail v != [] then
-        if n == "_type" then builtins.trace "Merge _type" (head v)
-        else if n == "extraConfigs" then builtins.trace "Merge extraConfigs" (concatLists v)
+        if n == "_type" then (head v)
+        else if n == "extraConfigs" then (concatLists v)
         else if n == "description" || n == "apply" then
           abort "Cannot rename an option to multiple options."
         else zipModules v
-- 
GitLab


From a953ed57c962a5f304a264e4f651556c849f0d9f Mon Sep 17 00:00:00 2001
From: Domen Kozar <domen@dev.si>
Date: Thu, 21 Feb 2013 23:05:40 +0100
Subject: [PATCH 4427/5331] mkdir musicDirecotry for mpd before startnig the
 service

---
 modules/services/audio/mpd.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/modules/services/audio/mpd.nix b/modules/services/audio/mpd.nix
index 85a87dfe845..c6ae8220626 100644
--- a/modules/services/audio/mpd.nix
+++ b/modules/services/audio/mpd.nix
@@ -74,6 +74,7 @@ in {
       wantedBy = [ "multi-user.target" ];
       path = [ pkgs.mpd ];
       script = "mpd --no-daemon ${mpdConf}";
+      preStart = "mkdir -p ${cfg.dataDir} && chown -R mpd:mpd  ${cfg.dataDir}";
     };
 
     users.extraUsers.mpd = {
-- 
GitLab


From b0f33f2052933eaa8ae51dbd484a5b5c1dc7c2e2 Mon Sep 17 00:00:00 2001
From: Rickard Nilsson <rickynils@gmail.com>
Date: Fri, 15 Feb 2013 13:48:34 +0100
Subject: [PATCH 4428/5331] Add options for setting theme and setup-script in
 KDM

---
 modules/services/x11/display-managers/kdm.nix | 27 +++++++++++++++++++
 1 file changed, 27 insertions(+)

diff --git a/modules/services/x11/display-managers/kdm.nix b/modules/services/x11/display-managers/kdm.nix
index 6a628ec124f..b5b086d0638 100644
--- a/modules/services/x11/display-managers/kdm.nix
+++ b/modules/services/x11/display-managers/kdm.nix
@@ -32,10 +32,20 @@ let
       ServerTimeout=60
       # Needed to prevent the X server from dying on logout and not coming back:
       TerminateServer=true
+      ${optionalString (cfg.setupScript != "")
+      ''
+        Setup=${cfg.setupScript}
+      ''} 
 
       [X-*-Greeter]
       HiddenUsers=root,nixbld1,nixbld2,nixbld3,nixbld4,nixbld5,nixbld6,nixbld7,nixbld8,nixbld9,nixbld10
       PluginsLogin=${kdebase_workspace}/lib/kde4/kgreet_classic.so
+      ${optionalString (cfg.themeDirectory != "")
+      ''
+        UseTheme=true
+        Theme=${cfg.themeDirectory}
+      ''
+      }
 
       ${optionalString (cfg.enableXDMCP)
       ''
@@ -81,6 +91,23 @@ in
         '';
       };
 
+      themeDirectory = mkOption {
+        default = "";
+        description = ''
+          The path to a KDM theme directory. This theme
+          will be used by the KDM greeter.
+        '';
+      };
+
+      setupScript = mkOption {
+        default = "";
+        description = ''
+          The path to a KDM setup script. This script is run as root just
+          before KDM starts. Can be used for setting up
+          monitors with xrandr, for example.
+        '';
+      };
+
       extraConfig = mkOption {
         default = "";
         description = ''
-- 
GitLab


From d5b6456f40fd5f387390295598ee5838e8def00c Mon Sep 17 00:00:00 2001
From: Jack Cummings <jack@mudshark.org>
Date: Sun, 24 Feb 2013 03:11:45 -0800
Subject: [PATCH 4429/5331] proper hostapd dependencies

---
 modules/services/networking/hostapd.nix | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/modules/services/networking/hostapd.nix b/modules/services/networking/hostapd.nix
index 42779494b4b..ca17c92ddc0 100644
--- a/modules/services/networking/hostapd.nix
+++ b/modules/services/networking/hostapd.nix
@@ -146,10 +146,17 @@ in
 
     environment.systemPackages =  [ pkgs.hostapd ];
 
-    jobs.hostapd =
-      { startOn = "started network-interfaces";
-        stopOn = "stopping network-interfaces";
-        exec = "${pkgs.hostapd}/bin/hostapd ${configFile}";
+    systemd.services.hostapd =
+      { description = "hostapd wireless AP";
+
+        path = [ pkgs.hostapd ]; 
+
+        after = [ "${cfg.interface}-cfg.service" "nat.service" "bind.service" "dhcpd.service"];
+
+        serviceConfig = 
+          { ExecStart = "${pkgs.hostapd}/bin/hostapd ${configFile}";
+            Restart = "always";
+          };
       };
   };
 }
-- 
GitLab


From a6f0d984fed1888590c21d33754baec337b3727b Mon Sep 17 00:00:00 2001
From: Domen Kozar <domen@dev.si>
Date: Sun, 24 Feb 2013 17:33:48 +0100
Subject: [PATCH 4430/5331] Add deluge and deluge web services

---
 modules/misc/ids.nix                |  2 +
 modules/module-list.nix             |  1 +
 modules/services/torrent/deluge.nix | 62 +++++++++++++++++++++++++++++
 3 files changed, 65 insertions(+)
 create mode 100644 modules/services/torrent/deluge.nix

diff --git a/modules/misc/ids.nix b/modules/misc/ids.nix
index 218bd0ed47a..998cf59927d 100644
--- a/modules/misc/ids.nix
+++ b/modules/misc/ids.nix
@@ -75,6 +75,7 @@ in
     wwwrun = 54;
     spamd = 56;
     nslcd = 58;
+    deluge = 60;
 
     # When adding a uid, make sure it doesn't match an existing gid.
 
@@ -132,6 +133,7 @@ in
     networkmanager = 57;
     nslcd = 58;
     scanner = 59;
+    deluge = 60;
 
     # When adding a gid, make sure it doesn't match an existing uid.
 
diff --git a/modules/module-list.nix b/modules/module-list.nix
index 208abb4ffaf..ba57c092c1e 100644
--- a/modules/module-list.nix
+++ b/modules/module-list.nix
@@ -172,6 +172,7 @@
   ./services/system/kerberos.nix
   ./services/system/nscd.nix
   ./services/system/uptimed.nix
+  ./services/torrent/deluge.nix
   ./services/ttys/gpm.nix
   ./services/ttys/agetty.nix
   ./services/web-servers/apache-httpd/default.nix
diff --git a/modules/services/torrent/deluge.nix b/modules/services/torrent/deluge.nix
new file mode 100644
index 00000000000..78e352e40e2
--- /dev/null
+++ b/modules/services/torrent/deluge.nix
@@ -0,0 +1,62 @@
+{ config, pkgs, ... }:
+
+with pkgs.lib;
+
+let
+  uid = config.ids.uids.deluge;
+  gid = config.ids.gids.deluge;
+  cfg = config.services.deluge;
+  cfg_web = config.services.deluge.web;
+in {
+  options = {
+    services.deluge = {
+      enable = mkOption {
+        default = false;
+        example = "true";
+        description = ''
+          Start Deluge daemon.
+        ''; 
+      };  
+    };
+
+    services.deluge.web = {
+      enable = mkOption {
+        default = false;
+        example = "true";
+        description = ''
+          Start Deluge Web daemon.
+        ''; 
+      };  
+    };
+  };
+
+  config = mkIf cfg.enable {
+
+    systemd.services.deluged = {
+      after = [ "network.target" ];
+      description = "Deluge Daemon";
+      wantedBy = [ "multi-user.target" ];
+      path = [ pkgs.pythonPackages.deluge ];
+      script = "deluged -d";
+    };
+
+    systemd.services.delugeweb = mkIf cfg_web.enable {
+      after = [ "network.target" "deluged.service" ];
+      description = "Deluge Web";
+      wantedBy = [ "multi-user.target" ];
+      wants = [ "deluged.service" ];
+      path = [ pkgs.pythonPackages.deluge ];
+      script = "deluge --ui web";
+    };
+
+    environment.systemPackages = [ pkgs.pythonPackages.deluge ];
+
+    users.extraUsers.deluge = {
+      inherit uid;
+      group = "deluge";
+      description = "Deluge Daemon user";
+    };
+
+    users.extraGroups.deluge.gid = gid;
+  };
+}
-- 
GitLab


From e44021494c461f52b5060602fb7ecea758e0b313 Mon Sep 17 00:00:00 2001
From: Rickard Nilsson <rickynils@gmail.com>
Date: Mon, 25 Feb 2013 09:04:31 +0100
Subject: [PATCH 4431/5331] mongodb: Add initialisation service

The mongodb service runs as user mongodb, and therefore
the preStart-script has no permissions to set up mongodb
directories. This is solved by adding an initialisation
service that runs as root and just sets up the required
directories.
---
 modules/services/databases/mongodb.nix | 24 ++++++++++++++++--------
 1 file changed, 16 insertions(+), 8 deletions(-)

diff --git a/modules/services/databases/mongodb.nix b/modules/services/databases/mongodb.nix
index 887f1f0529f..bdae728c646 100644
--- a/modules/services/databases/mongodb.nix
+++ b/modules/services/databases/mongodb.nix
@@ -102,20 +102,28 @@ in
 
     environment.systemPackages = [ mongodb ];
 
+    systemd.services.mongodb_init =
+      { description = "MongoDB server initialisation";
+
+        wantedBy = [ "mongodb.service" ];
+        before = [ "mongodb.service" ];
+
+        serviceConfig.Type = "oneshot";
+
+        script = ''
+          if ! test -e ${cfg.dbpath}; then
+              install -d -m0700 -o ${cfg.user} ${cfg.dbpath}
+              install -d -m0755 -o ${cfg.user} `dirname ${cfg.logpath}`
+          fi
+        '';
+      };
+
     systemd.services.mongodb =
       { description = "MongoDB server";
 
         wantedBy = [ "multi-user.target" ];
         after = [ "network.target" ];
 
-        preStart =
-          ''
-            if ! test -e ${cfg.dbpath}; then
-                install -d -m0700 -o ${cfg.user} ${cfg.dbpath}
-                install -d -m0755 -o ${cfg.user} `dirname ${cfg.logpath}`
-            fi
-          '';
-
         serviceConfig = {
           ExecStart = "${mongodb}/bin/mongod --quiet --config ${mongoCnf}";
           User = cfg.user;
-- 
GitLab


From cc3549fa347dce6bad7331a22008d06cd54c1cc1 Mon Sep 17 00:00:00 2001
From: Rickard Nilsson <rickynils@gmail.com>
Date: Mon, 25 Feb 2013 16:50:10 +0100
Subject: [PATCH 4432/5331] Add ActiveMQ service

---
 modules/module-list.nix                       |   1 +
 .../amqp/activemq/ActiveMQBroker.java         |  19 +++
 modules/services/amqp/activemq/default.nix    | 146 ++++++++++++++++++
 3 files changed, 166 insertions(+)
 create mode 100644 modules/services/amqp/activemq/ActiveMQBroker.java
 create mode 100644 modules/services/amqp/activemq/default.nix

diff --git a/modules/module-list.nix b/modules/module-list.nix
index 208abb4ffaf..35da89c8df9 100644
--- a/modules/module-list.nix
+++ b/modules/module-list.nix
@@ -54,6 +54,7 @@
   ./security/rtkit.nix
   ./security/setuid-wrappers.nix
   ./security/sudo.nix
+  ./services/amqp/activemq/default.nix
   ./services/amqp/rabbitmq.nix
   ./services/audio/alsa.nix
   ./services/audio/fuppes.nix
diff --git a/modules/services/amqp/activemq/ActiveMQBroker.java b/modules/services/amqp/activemq/ActiveMQBroker.java
new file mode 100644
index 00000000000..c0f5d16ea11
--- /dev/null
+++ b/modules/services/amqp/activemq/ActiveMQBroker.java
@@ -0,0 +1,19 @@
+import org.apache.activemq.broker.BrokerService;
+import org.apache.activemq.broker.BrokerFactory;
+import java.net.URI;
+
+public class ActiveMQBroker {
+
+  public static void main(String[] args) throws Throwable {
+    URI uri = new URI((args.length > 0) ? args[0] : "xbean:activemq.xml");
+    BrokerService broker = BrokerFactory.createBroker(uri);
+    broker.start();
+    if (broker.waitUntilStarted()) {
+      broker.waitUntilStopped();
+    } else {
+      System.out.println("Failed starting broker");
+      System.exit(-1);
+    };
+  }
+
+}
diff --git a/modules/services/amqp/activemq/default.nix b/modules/services/amqp/activemq/default.nix
new file mode 100644
index 00000000000..0df79205d5a
--- /dev/null
+++ b/modules/services/amqp/activemq/default.nix
@@ -0,0 +1,146 @@
+{ config, pkgs, ... }:
+
+with pkgs.lib;
+with pkgs;
+
+let
+
+  cfg = config.services.activemq;
+
+  activemqBroker = stdenv.mkDerivation {
+    name = "activemq-broker";
+    phases = [ "installPhase" ];
+    buildInputs = [ jdk ];
+    installPhase = ''
+      ensureDir $out/lib
+      source ${activemq}/lib/classpath.env
+      export CLASSPATH
+      ln -s "${./ActiveMQBroker.java}" ActiveMQBroker.java
+      javac -d $out/lib ActiveMQBroker.java
+    '';
+  };
+
+in {
+
+  options = {
+    services.activemq = {
+      enable = mkOption {
+        type = types.bool;
+        default = false;
+        description = ''
+          Enable the Apache ActiveMQ message broker service.
+        '';
+      };
+      configurationDir = mkOption {
+        default = "${activemq}/conf";
+        description = ''
+          The base directory for ActiveMQ's configuration.
+          By default, this directory is searched for a file named activemq.xml,
+          which should contain the configuration for the broker service.
+        '';
+      };
+      configurationURI = mkOption {
+        type = types.string;
+        default = "xbean:activemq.xml";
+        description = ''
+          The URI that is passed along to the BrokerFactory to
+          set up the configuration of the ActiveMQ broker service.
+          You should not need to change this. For custom configuration,
+          set the <literal>configurationDir</literal> instead, and create
+          an activemq.xml configuration file in it.
+        '';
+      };
+      baseDir = mkOption {
+        type = types.string;
+        default = "/var/activemq";
+        description = ''
+          The base directory where ActiveMQ stores its persistent data and logs.
+          This will be overriden if you set "activemq.base" and "activemq.data"
+          in the <literal>javaProperties</literal> option. You can also override
+          this in activemq.xml.
+        '';
+      };
+      javaProperties = mkOption {
+        type = types.attrs;
+        default = { };
+        example = {
+          "java.net.preferIPv4Stack" = "true";
+        };
+        apply = attrs: {
+          "activemq.base" = "${cfg.baseDir}";
+          "activemq.data" = "${cfg.baseDir}/data";
+          "activemq.conf" = "${cfg.configurationDir}";
+          "activemq.home" = "${activemq}";
+        } // attrs;
+        description = ''
+          Specifies Java properties that are sent to the ActiveMQ
+          broker service with the "-D" option. You can set properties
+          here to change the behaviour and configuration of the broker.
+          All essential properties that are not set here are automatically
+          given reasonable defaults.
+        '';
+      };
+      extraJavaOptions = mkOption {
+        type = types.string;
+        default = "";
+        example = "-Xmx2G -Xms2G -XX:MaxPermSize=512M";
+        description = ''
+          Add extra options here that you want to be sent to the
+          Java runtime when the broker service is started.
+        '';
+      };
+      user = {
+        create = mkOption {
+          type = types.bool;
+          default = true;
+          description = ''
+            If true, the a system user with the specified name will be added
+            to the system configuration. If false, a user with the specified
+            name is expected to exist.
+          '';
+        };
+        name = mkOption {
+          type = types.string;
+          default = "activemq";
+          description = ''
+            The name of the user that should run the ActiveMQ process.
+          '';
+        };
+      };
+    };
+  };
+
+  config = mkIf cfg.enable {
+    users.extraUsers = mkIf cfg.user.create (singleton {
+      inherit (cfg.user) name;
+      description = "ActiveMQ server user";
+    });
+
+    systemd.services.activemq_init = {
+      wantedBy = [ "activemq.service" ];
+      partOf = [ "activemq.service" ];
+      before = [ "activemq.service" ];
+      serviceConfig.Type = "oneshot";
+      script = ''
+        mkdir -p "${cfg.javaProperties."activemq.data"}"
+        chown -R activemq "${cfg.javaProperties."activemq.data"}"
+      '';
+    };
+
+    systemd.services.activemq = {
+      wantedBy = [ "multi-user.target" ];
+      after = [ "network.target" ];
+      path = [ jre ];
+      serviceConfig.User = "activemq";
+      script = ''
+        source ${activemq}/lib/classpath.env
+        export CLASSPATH=${activemqBroker}/lib:${cfg.configurationDir}:$CLASSPATH
+        exec java \
+          ${concatStringsSep " \\\n" (mapAttrsToList (name: value: "-D${name}=${value}") cfg.javaProperties)} \
+          ${cfg.extraJavaOptions} ActiveMQBroker "${cfg.configurationURI}"
+      '';
+    };
+
+  };
+
+}
-- 
GitLab


From 259fd8e34ac2992937bd0b6a45792a98f4f8af46 Mon Sep 17 00:00:00 2001
From: Domen Kozar <domen@dev.si>
Date: Mon, 25 Feb 2013 22:39:47 +0100
Subject: [PATCH 4433/5331] don't use quotes when setting example to true

---
 modules/services/torrent/deluge.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/services/torrent/deluge.nix b/modules/services/torrent/deluge.nix
index 78e352e40e2..0a3b5c83ede 100644
--- a/modules/services/torrent/deluge.nix
+++ b/modules/services/torrent/deluge.nix
@@ -12,7 +12,7 @@ in {
     services.deluge = {
       enable = mkOption {
         default = false;
-        example = "true";
+        example = true;
         description = ''
           Start Deluge daemon.
         ''; 
@@ -22,7 +22,7 @@ in {
     services.deluge.web = {
       enable = mkOption {
         default = false;
-        example = "true";
+        example = true;
         description = ''
           Start Deluge Web daemon.
         ''; 
-- 
GitLab


From 85188d19c5c948e35105df5466a74dc80088deac Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 26 Feb 2013 03:15:29 +0100
Subject: [PATCH 4434/5331] nix-daemon: Restart when nix.conf changes

---
 modules/services/misc/nix-daemon.nix | 85 ++++++++++++++--------------
 1 file changed, 42 insertions(+), 43 deletions(-)

diff --git a/modules/services/misc/nix-daemon.nix b/modules/services/misc/nix-daemon.nix
index 7175e0376bf..11d443e4886 100644
--- a/modules/services/misc/nix-daemon.nix
+++ b/modules/services/misc/nix-daemon.nix
@@ -20,6 +20,31 @@ let
       extraGroups = [ "nixbld" ];
     };
 
+  nixConf =
+    let
+      # Tricky: if we're using a chroot for builds, then we need
+      # /bin/sh in the chroot (our own compromise to purity).
+      # However, since /bin/sh is a symlink to some path in the
+      # Nix store, which furthermore has runtime dependencies on
+      # other paths in the store, we need the closure of /bin/sh
+      # in `build-chroot-dirs' - otherwise any builder that uses
+      # /bin/sh won't work.
+      binshDeps = pkgs.writeReferencesToFile config.system.build.binsh;
+    in
+      pkgs.runCommand "nix.conf" {extraOptions = cfg.extraOptions; } ''
+        extraPaths=$(for i in $(cat ${binshDeps}); do if test -d $i; then echo $i; fi; done)
+        cat > $out <<END
+        # WARNING: this file is generated.
+        build-users-group = nixbld
+        build-max-jobs = ${toString (cfg.maxJobs)}
+        build-use-chroot = ${if cfg.useChroot then "true" else "false"}
+        build-chroot-dirs = ${toString cfg.chrootDirs} $(echo $extraPaths)
+        binary-caches = ${toString cfg.binaryCaches}
+        trusted-binary-caches = ${toString cfg.trustedBinaryCaches}
+        $extraOptions
+        END
+      '';
+
 in
 
 {
@@ -226,49 +251,21 @@ in
 
     nix.chrootDirs = [ "/dev" "/dev/pts" "/proc" "/bin" ];
 
-    environment.etc =
-      [ { # Nix configuration.
-          source =
-            let
-              # Tricky: if we're using a chroot for builds, then we need
-              # /bin/sh in the chroot (our own compromise to purity).
-              # However, since /bin/sh is a symlink to some path in the
-              # Nix store, which furthermore has runtime dependencies on
-              # other paths in the store, we need the closure of /bin/sh
-              # in `build-chroot-dirs' - otherwise any builder that uses
-              # /bin/sh won't work.
-              binshDeps = pkgs.writeReferencesToFile config.system.build.binsh;
-            in
-              pkgs.runCommand "nix.conf" {extraOptions = cfg.extraOptions; } ''
-                extraPaths=$(for i in $(cat ${binshDeps}); do if test -d $i; then echo $i; fi; done)
-                cat > $out <<END
-                # WARNING: this file is generated.
-                build-users-group = nixbld
-                build-max-jobs = ${toString (cfg.maxJobs)}
-                build-use-chroot = ${if cfg.useChroot then "true" else "false"}
-                build-chroot-dirs = ${toString cfg.chrootDirs} $(echo $extraPaths)
-                binary-caches = ${toString cfg.binaryCaches}
-                trusted-binary-caches = ${toString cfg.trustedBinaryCaches}
-                $extraOptions
-                END
-              '';
-          target = "nix/nix.conf";
-        }
-      ]
-
-      ++ optional (cfg.distributedBuilds && !cfg.manualNixMachines)
-        { # List of machines for distributed Nix builds in the format expected
-          # by build-remote.pl.
-          source = pkgs.writeText "nix.machines"
-            (concatStrings (map (machine:
-              "${machine.sshUser}@${machine.hostName} "
-              + (if machine ? system then machine.system else concatStringsSep "," machine.systems)
-              + " ${machine.sshKey} ${toString machine.maxJobs} "
-              + (if machine ? speedFactor then toString machine.speedFactor else "1" )
-              + "\n"
-            ) cfg.buildMachines));
-          target = "nix.machines";
-        };
+    environment.etc."nix/nix.conf".source = nixConf;
+
+    # List of machines for distributed Nix builds in the format
+    # expected by build-remote.pl.
+    environment.etc."nix.machines" =
+      { enable = cfg.distributedBuilds && !cfg.manualNixMachines;
+        text =
+          concatMapStrings (machine:
+            "${machine.sshUser}@${machine.hostName} "
+            + (if machine ? system then machine.system else concatStringsSep "," machine.systems)
+            + " ${machine.sshKey} ${toString machine.maxJobs} "
+            + (if machine ? speedFactor then toString machine.speedFactor else "1" )
+            + "\n"
+          ) cfg.buildMachines;
+      };
 
     systemd.sockets."nix-daemon" =
       { description = "Nix Daemon Socket";
@@ -292,6 +289,8 @@ in
             IOSchedulingPriority = cfg.daemonIONiceLevel;
             LimitNOFILE = 4096;
           };
+
+        restartTriggers = [ nixConf ];
       };
 
     nix.envVars =
-- 
GitLab


From 99edd5d575e3dd0305dee0db348a39484669fca4 Mon Sep 17 00:00:00 2001
From: Domen Kozar <domen@dev.si>
Date: Tue, 26 Feb 2013 22:53:52 +0100
Subject: [PATCH 4435/5331] run deluge under deluge user/group

---
 modules/services/torrent/deluge.nix | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/modules/services/torrent/deluge.nix b/modules/services/torrent/deluge.nix
index 0a3b5c83ede..17e4ae69279 100644
--- a/modules/services/torrent/deluge.nix
+++ b/modules/services/torrent/deluge.nix
@@ -34,19 +34,23 @@ in {
 
     systemd.services.deluged = {
       after = [ "network.target" ];
-      description = "Deluge Daemon";
+      description = "Deluge BitTorrent Daemon";
       wantedBy = [ "multi-user.target" ];
       path = [ pkgs.pythonPackages.deluge ];
       script = "deluged -d";
+      serviceConfig.User = "deluge";
+      serviceConfig.Group = "deluge";
     };
 
     systemd.services.delugeweb = mkIf cfg_web.enable {
       after = [ "network.target" "deluged.service" ];
-      description = "Deluge Web";
+      description = "Deluge BitTorrent WebUI";
       wantedBy = [ "multi-user.target" ];
       wants = [ "deluged.service" ];
       path = [ pkgs.pythonPackages.deluge ];
       script = "deluge --ui web";
+      serviceConfig.User = "deluge";
+      serviceConfig.Group = "deluge";
     };
 
     environment.systemPackages = [ pkgs.pythonPackages.deluge ];
@@ -54,6 +58,8 @@ in {
     users.extraUsers.deluge = {
       inherit uid;
       group = "deluge";
+      home = "/var/lib/deluge/";
+      createHome = true;
       description = "Deluge Daemon user";
     };
 
-- 
GitLab


From 71f4330d3fcdebdeff70fbd7a6c1b48ae43111b7 Mon Sep 17 00:00:00 2001
From: Domen Kozar <domen@dev.si>
Date: Wed, 27 Feb 2013 10:58:28 +0100
Subject: [PATCH 4436/5331] use path to deluge script correctly

---
 modules/services/torrent/deluge.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/services/torrent/deluge.nix b/modules/services/torrent/deluge.nix
index 17e4ae69279..87c8029739f 100644
--- a/modules/services/torrent/deluge.nix
+++ b/modules/services/torrent/deluge.nix
@@ -37,7 +37,7 @@ in {
       description = "Deluge BitTorrent Daemon";
       wantedBy = [ "multi-user.target" ];
       path = [ pkgs.pythonPackages.deluge ];
-      script = "deluged -d";
+      script = "${pkgs.pythonPackages.deluge}/bin/deluged -d";
       serviceConfig.User = "deluge";
       serviceConfig.Group = "deluge";
     };
@@ -48,7 +48,7 @@ in {
       wantedBy = [ "multi-user.target" ];
       wants = [ "deluged.service" ];
       path = [ pkgs.pythonPackages.deluge ];
-      script = "deluge --ui web";
+      script = "${pkgs.pythonPackages.deluge}/bin/deluge --ui web";
       serviceConfig.User = "deluge";
       serviceConfig.Group = "deluge";
     };
-- 
GitLab


From f3d4d24d6b205ebbef293bfe4ddba3b9e8372129 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Wed, 27 Feb 2013 09:25:37 -0500
Subject: [PATCH 4437/5331] dd-agent: Run as a separate user

---
 modules/services/monitoring/dd-agent.nix | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/modules/services/monitoring/dd-agent.nix b/modules/services/monitoring/dd-agent.nix
index c6ab1ca0a3a..f2527ea4e39 100644
--- a/modules/services/monitoring/dd-agent.nix
+++ b/modules/services/monitoring/dd-agent.nix
@@ -43,6 +43,14 @@ in {
   config = mkIf cfg.enable {
     environment.etc = [ { source = datadog-conf; target = "dd-agent/datadog.conf"; } ];
 
+    users.extraUsers."dd-agent" = {
+      description = "Datadog Agent User";
+
+      group = "dd-agent";
+    };
+
+    users.extraGroups."dd-agent" = { };
+
     systemd.services.dd-agent = {
       description = "Datadog agent monitor";
 
@@ -50,7 +58,13 @@ in {
 
       wantedBy = [ "multi-user.target" ];
 
-      serviceConfig.ExecStart = "${pkgs.dd-agent}/bin/dd-agent foreground";
+      serviceConfig = {
+        ExecStart = "${pkgs.dd-agent}/bin/dd-agent foreground";
+
+        User = "dd-agent";
+
+        Group = "dd-agent";
+      };
 
       restartTriggers = [ pkgs.dd-agent ];
     };
-- 
GitLab


From bb89f2eb99a2d4357425aa534317e35d1da4db30 Mon Sep 17 00:00:00 2001
From: Domen Kozar <domen@dev.si>
Date: Wed, 27 Feb 2013 20:06:10 +0100
Subject: [PATCH 4438/5331] We don't need an explicit uid/gid. We also don't
 need web to depend on deluged, since it can be started before it.

---
 modules/misc/ids.nix                | 2 --
 modules/services/torrent/deluge.nix | 8 ++------
 2 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/modules/misc/ids.nix b/modules/misc/ids.nix
index 998cf59927d..218bd0ed47a 100644
--- a/modules/misc/ids.nix
+++ b/modules/misc/ids.nix
@@ -75,7 +75,6 @@ in
     wwwrun = 54;
     spamd = 56;
     nslcd = 58;
-    deluge = 60;
 
     # When adding a uid, make sure it doesn't match an existing gid.
 
@@ -133,7 +132,6 @@ in
     networkmanager = 57;
     nslcd = 58;
     scanner = 59;
-    deluge = 60;
 
     # When adding a gid, make sure it doesn't match an existing uid.
 
diff --git a/modules/services/torrent/deluge.nix b/modules/services/torrent/deluge.nix
index 87c8029739f..0ef5c8fe319 100644
--- a/modules/services/torrent/deluge.nix
+++ b/modules/services/torrent/deluge.nix
@@ -3,8 +3,6 @@
 with pkgs.lib;
 
 let
-  uid = config.ids.uids.deluge;
-  gid = config.ids.gids.deluge;
   cfg = config.services.deluge;
   cfg_web = config.services.deluge.web;
 in {
@@ -43,10 +41,9 @@ in {
     };
 
     systemd.services.delugeweb = mkIf cfg_web.enable {
-      after = [ "network.target" "deluged.service" ];
+      after = [ "network.target" ];
       description = "Deluge BitTorrent WebUI";
       wantedBy = [ "multi-user.target" ];
-      wants = [ "deluged.service" ];
       path = [ pkgs.pythonPackages.deluge ];
       script = "${pkgs.pythonPackages.deluge}/bin/deluge --ui web";
       serviceConfig.User = "deluge";
@@ -56,13 +53,12 @@ in {
     environment.systemPackages = [ pkgs.pythonPackages.deluge ];
 
     users.extraUsers.deluge = {
-      inherit uid;
       group = "deluge";
       home = "/var/lib/deluge/";
       createHome = true;
       description = "Deluge Daemon user";
     };
 
-    users.extraGroups.deluge.gid = gid;
+    users.extraGroups.deluge = {};
   };
 }
-- 
GitLab


From c50d7cbc8d63dcfb88295fcf378bf2b6ffd9cba3 Mon Sep 17 00:00:00 2001
From: Domen Kozar <domen@dev.si>
Date: Wed, 27 Feb 2013 20:13:14 +0100
Subject: [PATCH 4439/5331] use ExecStart instead of script, this way we get
 rid of systemd wrapper scripts

---
 modules/services/torrent/deluge.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/services/torrent/deluge.nix b/modules/services/torrent/deluge.nix
index 0ef5c8fe319..12b61d39109 100644
--- a/modules/services/torrent/deluge.nix
+++ b/modules/services/torrent/deluge.nix
@@ -35,7 +35,7 @@ in {
       description = "Deluge BitTorrent Daemon";
       wantedBy = [ "multi-user.target" ];
       path = [ pkgs.pythonPackages.deluge ];
-      script = "${pkgs.pythonPackages.deluge}/bin/deluged -d";
+      serviceConfig.ExecStart = "${pkgs.pythonPackages.deluge}/bin/deluged -d";
       serviceConfig.User = "deluge";
       serviceConfig.Group = "deluge";
     };
@@ -45,7 +45,7 @@ in {
       description = "Deluge BitTorrent WebUI";
       wantedBy = [ "multi-user.target" ];
       path = [ pkgs.pythonPackages.deluge ];
-      script = "${pkgs.pythonPackages.deluge}/bin/deluge --ui web";
+      serviceConfig.ExecStart = "${pkgs.pythonPackages.deluge}/bin/deluge --ui web";
       serviceConfig.User = "deluge";
       serviceConfig.Group = "deluge";
     };
-- 
GitLab


From 8a7b44a5e79ec497007261945ab429466ced8f3e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= <viric@viric.name>
Date: Wed, 27 Feb 2013 22:22:12 +0100
Subject: [PATCH 4440/5331] xfs wants 'crc32c', to be able to mount anything

Like btrfs.
---
 modules/tasks/filesystems/xfs.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/tasks/filesystems/xfs.nix b/modules/tasks/filesystems/xfs.nix
index fbc0fe5ccb1..5f9eb741c2a 100644
--- a/modules/tasks/filesystems/xfs.nix
+++ b/modules/tasks/filesystems/xfs.nix
@@ -13,7 +13,7 @@ in
 
     system.fsPackages = [ pkgs.xfsprogs ];
 
-    boot.initrd.kernelModules = mkIf inInitrd [ "xfs" ];
+    boot.initrd.kernelModules = mkIf inInitrd [ "xfs" "crc32c" ];
 
     boot.initrd.extraUtilsCommands = mkIf inInitrd
       ''
-- 
GitLab


From 568683316b0a3d23bd0623aaffe6342424cf3616 Mon Sep 17 00:00:00 2001
From: Rickard Nilsson <rickynils@gmail.com>
Date: Thu, 28 Feb 2013 19:26:19 +0100
Subject: [PATCH 4441/5331] mpd: Start service with exec

---
 modules/services/audio/mpd.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/services/audio/mpd.nix b/modules/services/audio/mpd.nix
index c6ae8220626..a9880dee20c 100644
--- a/modules/services/audio/mpd.nix
+++ b/modules/services/audio/mpd.nix
@@ -73,8 +73,8 @@ in {
       description = "Music Player Daemon";
       wantedBy = [ "multi-user.target" ];
       path = [ pkgs.mpd ];
-      script = "mpd --no-daemon ${mpdConf}";
       preStart = "mkdir -p ${cfg.dataDir} && chown -R mpd:mpd  ${cfg.dataDir}";
+      script = "exec mpd --no-daemon ${mpdConf}";
     };
 
     users.extraUsers.mpd = {
-- 
GitLab


From ea3eb991b70d95e15080a3852c743b0f1d98f061 Mon Sep 17 00:00:00 2001
From: Patrick John Wheeler <Patrick.John.Wheeler@gmail.com>
Date: Fri, 1 Mar 2013 02:53:08 +0100
Subject: [PATCH 4442/5331] Fix Xorg-server on vmware inconjunction with fix to
 xf86videovmware[1].

Adds "vmware" to list of default options of
services.xerver.videoDrivers.

new default:
 [ "ati" "cirrus" "intel" "vesa" "vmware" ]

old default:
 [ "ati" "cirrus" "intel" "vesa" ]

[1] Pull request for xf86videovmware found at
https://github.com/NixOS/nixpkgs/pull/338.
---
 modules/services/x11/xserver.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/services/x11/xserver.nix b/modules/services/x11/xserver.nix
index 643fc42dc62..2210fea4e72 100644
--- a/modules/services/x11/xserver.nix
+++ b/modules/services/x11/xserver.nix
@@ -194,7 +194,7 @@ in
       videoDrivers = mkOption {
         # !!! We'd like "nv" here, but it segfaults the X server.  Idem for
         # "vmware".
-        default = [ "ati" "cirrus" "intel" "vesa" ];
+        default = [ "ati" "cirrus" "intel" "vesa" "vmware" ];
         example = [ "vesa" ];
         description = ''
           The names of the video drivers that the X server should
-- 
GitLab


From fc7c7ae91a70d426a618bbeabfdbbd4a18f8af15 Mon Sep 17 00:00:00 2001
From: Patrick Wheeler <Patrick.John.Wheeler@gmail.com>
Date: Fri, 1 Mar 2013 11:05:00 -0600
Subject: [PATCH 4443/5331] Remove vmware comment

---
 modules/services/x11/xserver.nix | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/modules/services/x11/xserver.nix b/modules/services/x11/xserver.nix
index 2210fea4e72..82b0d06f1c8 100644
--- a/modules/services/x11/xserver.nix
+++ b/modules/services/x11/xserver.nix
@@ -192,8 +192,7 @@ in
       };
 
       videoDrivers = mkOption {
-        # !!! We'd like "nv" here, but it segfaults the X server.  Idem for
-        # "vmware".
+        # !!! We'd like "nv" here, but it segfaults the X server.
         default = [ "ati" "cirrus" "intel" "vesa" "vmware" ];
         example = [ "vesa" ];
         description = ''
-- 
GitLab


From 08c9a0ad5e1280524b9c391617c386a36a53e94e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Sun, 24 Feb 2013 11:54:01 +0100
Subject: [PATCH 4444/5331] Add service.logind.extraConfig option

So that we can customize systemd-logind in configuration.nix.

Example:
  services.logind.extraConfig = "HandleLidSwitch=ignore";

See man logind.conf for available options.
---
 modules/system/boot/systemd.nix | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/modules/system/boot/systemd.nix b/modules/system/boot/systemd.nix
index ddb6dd3db26..9da3afa5998 100644
--- a/modules/system/boot/systemd.nix
+++ b/modules/system/boot/systemd.nix
@@ -462,6 +462,16 @@ in
       '';
     };
 
+    services.logind.extraConfig = mkOption {
+      default = "";
+      type = types.uniq types.string;
+      example = "HandleLidSwitch=ignore";
+      description = ''
+        Extra config options for systemd-logind. See man logind.conf for
+        available options.
+      '';
+    };
+
     systemd.enableEmergencyMode = mkOption {
       default = true;
       type = types.bool;
@@ -508,6 +518,13 @@ in
             '';
           target = "systemd/journald.conf";
         }
+        { source = pkgs.writeText "logind.conf"
+            ''
+              [Logind]
+              ${config.services.logind.extraConfig}
+            '';
+          target = "systemd/logind.conf";
+        }
       ];
 
     system.activationScripts.systemd =
-- 
GitLab


From ed6e0262e00761396ded379620e0b7ecccaa0a8f Mon Sep 17 00:00:00 2001
From: David Guibert <david.guibert@gmail.com>
Date: Sat, 2 Mar 2013 10:24:46 +0100
Subject: [PATCH 4445/5331] bring bridge interfaces up

The bridge is not becoming operational until it is brought into the UP state.
When the bridge is statically configured, this is mandatory.
---
 modules/tasks/network-interfaces.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/modules/tasks/network-interfaces.nix b/modules/tasks/network-interfaces.nix
index a31253ea4b0..9e48500d177 100644
--- a/modules/tasks/network-interfaces.nix
+++ b/modules/tasks/network-interfaces.nix
@@ -402,6 +402,9 @@ in
                   brctl addif "${n}" "${i}"
                   ip link set "${i}" up
                   ip addr flush dev "${i}"
+
+                  echo "bringing up network device ${n}..."
+                  ip link set "${n}" up
                 '')}
 
                 # !!! Should delete (brctl delif) any interfaces that
-- 
GitLab


From 7e10bcb4fd27098cee71f2ea41b0aac17eede6fc Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Sat, 2 Mar 2013 09:10:58 -0500
Subject: [PATCH 4446/5331] modules/testing/minimal-kernel: linuxPackagesFor no
 longer takes a 'self' argument

---
 modules/testing/minimal-kernel.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/testing/minimal-kernel.nix b/modules/testing/minimal-kernel.nix
index 0ad20bbf75a..0418de800c8 100644
--- a/modules/testing/minimal-kernel.nix
+++ b/modules/testing/minimal-kernel.nix
@@ -22,7 +22,7 @@ let
     '';
   }));
 
-   kernelPackages = pkgs.linuxPackagesFor kernel kernelPackages;
+   kernelPackages = pkgs.linuxPackagesFor kernel;
 in {
   boot.kernelPackages = kernelPackages;
 }
-- 
GitLab


From ec2378f07b68c7b17d7cb64036e1b98747aaad8b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Sat, 2 Mar 2013 19:45:47 +0100
Subject: [PATCH 4447/5331] systemd-logind: fix config file header: [Logind] =>
 [Login]

man logind.conf clearly states that the header is [Login] (no 'd').
Without this fix services.logind.extraConfig does not take effect
because logind ignores the invalidly named section.
---
 modules/system/boot/systemd.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/system/boot/systemd.nix b/modules/system/boot/systemd.nix
index 9da3afa5998..9534e382c92 100644
--- a/modules/system/boot/systemd.nix
+++ b/modules/system/boot/systemd.nix
@@ -520,7 +520,7 @@ in
         }
         { source = pkgs.writeText "logind.conf"
             ''
-              [Logind]
+              [Login]
               ${config.services.logind.extraConfig}
             '';
           target = "systemd/logind.conf";
-- 
GitLab


From 080bf5614f1370069b677d874deb516fbe549ac3 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sat, 2 Mar 2013 19:53:48 +0100
Subject: [PATCH 4448/5331] Add a module for setting sysctl parameters
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This adds an option ‘boot.kernel.sysctl’ and generates a file
/etc/sysctl/nixos.conf read by systemd-sysctl.service.
---
 modules/config/sysctl.nix | 58 +++++++++++++++++++++++++++++++++++++++
 modules/module-list.nix   |  1 +
 2 files changed, 59 insertions(+)
 create mode 100644 modules/config/sysctl.nix

diff --git a/modules/config/sysctl.nix b/modules/config/sysctl.nix
new file mode 100644
index 00000000000..c3d5b8d223b
--- /dev/null
+++ b/modules/config/sysctl.nix
@@ -0,0 +1,58 @@
+{ config, pkgs, ... }:
+
+with pkgs.lib;
+
+let
+
+  sysctlOption = mkOptionType {
+    name = "sysctl option value";
+    check = x: builtins.isBool x || builtins.isString x || builtins.isInt x;
+    merge = xs: last xs; # FIXME: hacky way to allow overriding in configuration.nix.
+  };
+
+in
+
+{
+
+  options = {
+
+    boot.kernel.sysctl = mkOption {
+      default = {};
+      example = {
+        "net.ipv4.tcp_syncookies" = false;
+        "vm.swappiness" = 60;
+      };
+      type = types.attrsOf sysctlOption;
+      description = ''
+        Runtime parameters of the Linux kernel, as set by
+        <citerefentry><refentrytitle>sysctl</refentrytitle>
+        <manvolnum>8</manvolnum></citerefentry>.  Note that sysctl
+        parameters names must be enclosed in quotes
+        (e.g. <literal>"vm.swappiness"</literal> instead of
+        <literal>vm.swappiness</literal>).  The value of each parameter
+        may be a string, integer or Boolean.
+      '';
+    };
+
+  };
+
+  config = {
+
+    environment.etc."sysctl.d/nixos.conf".text =
+      concatStrings (mapAttrsToList (n: v: "${n}=${if v == false then "0" else toString v}\n") config.boot.kernel.sysctl);
+
+    systemd.services.systemd-sysctl =
+      { description = "Apply Kernel Variables";
+        before = [ "sysinit.target" "shutdown.target" ];
+        wantedBy = [ "sysinit.target" "multi-user.target" ];
+        restartTriggers = [ config.environment.etc."sysctl.d/nixos.conf".source ];
+        serviceConfig = {
+          Type = "oneshot";
+          RemainAfterExit = true;
+          ExecStart = "${config.systemd.package}/lib/systemd/systemd-sysctl";
+        };
+      };
+
+  };
+
+}
diff --git a/modules/module-list.nix b/modules/module-list.nix
index 50c74608105..40e9765cd3e 100644
--- a/modules/module-list.nix
+++ b/modules/module-list.nix
@@ -10,6 +10,7 @@
   ./config/pulseaudio.nix
   ./config/shells.nix
   ./config/swap.nix
+  ./config/sysctl.nix
   ./config/system-path.nix
   ./config/timezone.nix
   ./config/unix-odbc-drivers.nix
-- 
GitLab


From 7f7e18cfce8e77f45b4024c979951b97a882e14e Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sat, 2 Mar 2013 19:57:55 +0100
Subject: [PATCH 4449/5331] Enable hardlink and symlink restrictions

This prevents many time-of-check-time-of-use security bugs.  Ubuntu
enables these by default as well so they shouldn't cause many
problems.
---
 modules/config/sysctl.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/modules/config/sysctl.nix b/modules/config/sysctl.nix
index c3d5b8d223b..f3cc2130768 100644
--- a/modules/config/sysctl.nix
+++ b/modules/config/sysctl.nix
@@ -53,6 +53,12 @@ in
         };
       };
 
+    # Enable hardlink and symlink restrictions.  See
+    # https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/commit/?id=800179c9b8a1e796e441674776d11cd4c05d61d7
+    # for details.
+    boot.kernel.sysctl."fs.protected_hardlinks" = true;
+    boot.kernel.sysctl."fs.protected_symlinks" = true;
+
   };
 
 }
-- 
GitLab


From d99fce26312706fa80ee67427bc252b774a6394f Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sat, 2 Mar 2013 20:02:32 +0100
Subject: [PATCH 4450/5331] installation-cd-base.nix: Use boot.kernel.sysctl

---
 .../installer/cd-dvd/installation-cd-base.nix | 32 +++++++++----------
 1 file changed, 15 insertions(+), 17 deletions(-)

diff --git a/modules/installer/cd-dvd/installation-cd-base.nix b/modules/installer/cd-dvd/installation-cd-base.nix
index 1edb2a45236..d9ffbda3660 100644
--- a/modules/installer/cd-dvd/installation-cd-base.nix
+++ b/modules/installer/cd-dvd/installation-cd-base.nix
@@ -42,26 +42,24 @@ in
 
   isoImage.volumeID = "NIXOS_${config.system.nixosVersion}";
 
-  boot.postBootCommands =
+  # Provide the NixOS/Nixpkgs sources in /etc/nixos.  This is required
+  # for nixos-install.
+  boot.postBootCommands = optionalString includeSources
     ''
-      # Provide the NixOS/Nixpkgs sources in /etc/nixos.  This is required
-      # for nixos-install.
-      ${optionalString includeSources ''
-        echo "unpacking the NixOS/Nixpkgs sources..."
-        mkdir -p /nix/var/nix/profiles/per-user/root
-        ${config.environment.nix}/bin/nix-env -p /nix/var/nix/profiles/per-user/root/channels -i ${channelSources} --quiet
-        mkdir -m 0700 -p /root/.nix-defexpr
-        ln -s /nix/var/nix/profiles/per-user/root/channels /root/.nix-defexpr/channels
-     ''}
-
-     # Make the installer more likely to succeed in low memory
-     # environments.  The kernel's overcommit heustistics bite us
-     # fairly often, preventing processes such as nix-worker or
-     # download-using-manifests.pl from forking even if there is
-     # plenty of free memory.
-     echo 1 > /proc/sys/vm/overcommit_memory
+      echo "unpacking the NixOS/Nixpkgs sources..."
+      mkdir -p /nix/var/nix/profiles/per-user/root
+      ${config.environment.nix}/bin/nix-env -p /nix/var/nix/profiles/per-user/root/channels -i ${channelSources} --quiet
+      mkdir -m 0700 -p /root/.nix-defexpr
+      ln -s /nix/var/nix/profiles/per-user/root/channels /root/.nix-defexpr/channels
     '';
 
+  # Make the installer more likely to succeed in low memory
+  # environments.  The kernel's overcommit heustistics bite us
+  # fairly often, preventing processes such as nix-worker or
+  # download-using-manifests.pl from forking even if there is
+  # plenty of free memory.
+  boot.kernel.sysctl."vm.overcommit_memory" = "1";
+
   # To speed up installation a little bit, include the complete stdenv
   # in the Nix store on the CD.
   isoImage.storeContents = [ pkgs.stdenv pkgs.busybox ];
-- 
GitLab


From 854a37aa7e66bf4f3ef4e0e7ad3947a62b80c5e5 Mon Sep 17 00:00:00 2001
From: Domen Kozar <domen@dev.si>
Date: Sat, 2 Mar 2013 23:40:56 +0100
Subject: [PATCH 4451/5331] add most basic nginx service

---
 modules/module-list.nix                       |  1 +
 .../services/web-servers/nginx/default.nix    | 65 +++++++++++++++++++
 2 files changed, 66 insertions(+)
 create mode 100644 modules/services/web-servers/nginx/default.nix

diff --git a/modules/module-list.nix b/modules/module-list.nix
index 40e9765cd3e..b2d81358a90 100644
--- a/modules/module-list.nix
+++ b/modules/module-list.nix
@@ -179,6 +179,7 @@
   ./services/ttys/agetty.nix
   ./services/web-servers/apache-httpd/default.nix
   ./services/web-servers/jboss/default.nix
+  ./services/web-servers/nginx/default.nix
   ./services/web-servers/tomcat.nix
   ./services/x11/desktop-managers/default.nix
   ./services/x11/display-managers/auto.nix
diff --git a/modules/services/web-servers/nginx/default.nix b/modules/services/web-servers/nginx/default.nix
new file mode 100644
index 00000000000..628572f7bf3
--- /dev/null
+++ b/modules/services/web-servers/nginx/default.nix
@@ -0,0 +1,65 @@
+{ config, pkgs, ... }:
+ 
+with pkgs.lib;
+ 
+let
+  cfg = config.services.nginx;
+  configFile = pkgs.writeText "nginx.conf" ''
+    ${cfg.config}
+  '';
+in
+ 
+{
+  options = {
+    services.nginx = {
+      enable = mkOption {
+        default = false;
+        description = "
+          Enable the nginx Web Server.
+        ";
+      };
+ 
+      config = mkOption {
+        default = "";
+        description = "
+          Verbatim nginx.conf configuration.
+        ";
+      };
+
+      stateDir = mkOption {
+        default = "/var/spool/nginx";
+        description = "
+          Directory holding all state for nginx to run.
+        ";
+      };
+    };
+ 
+  };
+ 
+  config = mkIf cfg.enable {
+    environment.systemPackages = [ pkgs.nginx ];
+
+    # TODO: test user supplied config file pases syntax test
+ 
+    systemd.services.nginx = {
+      description = "Nginx Web Server";
+      after = [ "network.target" ];
+      wantedBy = [ "multi-user.target" ];
+      path = [ pkgs.nginx ];
+      preStart =
+        ''
+        mkdir -p ${cfg.stateDir}/logs
+        chown -R nginx:nginx ${cfg.stateDir}
+        '';
+      serviceConfig = {
+        ExecStart = "${pkgs.nginx}/bin/nginx -c ${configFile} -p ${cfg.stateDir}";
+      };
+    };
+ 
+    users.extraUsers.nginx = {
+      group = "nginx";
+    };
+ 
+    users.extraGroups.nginx = {};
+  };
+}
-- 
GitLab


From 61c07244e895c4312759e5dc5585cdfdea37f8d5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Sun, 3 Mar 2013 15:24:44 +0100
Subject: [PATCH 4452/5331] Add lighttpd web server module

---
 modules/module-list.nix                   |  1 +
 modules/services/web-servers/lighttpd.nix | 89 +++++++++++++++++++++++
 2 files changed, 90 insertions(+)
 create mode 100644 modules/services/web-servers/lighttpd.nix

diff --git a/modules/module-list.nix b/modules/module-list.nix
index b2d81358a90..6508a7735c0 100644
--- a/modules/module-list.nix
+++ b/modules/module-list.nix
@@ -179,6 +179,7 @@
   ./services/ttys/agetty.nix
   ./services/web-servers/apache-httpd/default.nix
   ./services/web-servers/jboss/default.nix
+  ./services/web-servers/lighttpd.nix
   ./services/web-servers/nginx/default.nix
   ./services/web-servers/tomcat.nix
   ./services/x11/desktop-managers/default.nix
diff --git a/modules/services/web-servers/lighttpd.nix b/modules/services/web-servers/lighttpd.nix
new file mode 100644
index 00000000000..35a9ca78a59
--- /dev/null
+++ b/modules/services/web-servers/lighttpd.nix
@@ -0,0 +1,89 @@
+# NixOS module for lighttpd web server
+
+{ config, pkgs, ... }:
+
+with pkgs.lib;
+
+let
+
+  cfg = config.services.lighttpd;
+
+in
+
+{
+
+  options = {
+
+    services.lighttpd = {
+
+      enable = mkOption {
+        default = false;
+        type = types.uniq types.bool;
+        description = ''
+          Enable the lighttpd web server. You must configure it with
+          services.lighttpd.configText.
+        '';
+      };
+
+      configText = mkOption {
+        default = "";
+        type = types.string;
+        example = ''
+          server.document-root = "/srv/www/"
+          server.port = 80
+          server.username = "lighttpd"
+          server.groupname = "lighttpd"
+
+          mimetype.assign = (
+            ".html" => "text/html", 
+            ".txt" => "text/plain",
+            ".jpg" => "image/jpeg",
+            ".png" => "image/png" 
+          )
+          
+          static-file.exclude-extensions = ( ".fcgi", ".php", ".rb", "~", ".inc" )
+          index-file.names = ( "index.html" )
+        '';
+        description = ''
+          Contents of lighttpd configuration file. The user and group
+          "lighttpd" is available for privilege separation. See configuration
+          tutorial at
+          http://redmine.lighttpd.net/projects/lighttpd/wiki/TutorialConfiguration
+          or full documentation at
+          http://redmine.lighttpd.net/projects/lighttpd/wiki/Docs
+        '';
+      };
+
+    };
+
+  };
+
+  config = mkIf cfg.enable {
+
+    systemd.services.lighttpd = {
+      description = "Lighttpd Web Server";
+      after = [ "network.target" ];
+      wantedBy = [ "multi-user.target" ];
+      serviceConfig.ExecStart = "${pkgs.lighttpd}/sbin/lighttpd -D -f /etc/lighttpd.conf";
+      # SIGINT => graceful shutdown
+      serviceConfig.KillSignal = "SIGINT";
+    };
+
+    environment.etc =
+      [
+        { source = pkgs.writeText "lighttpd.conf"
+            ''
+            ${cfg.configText}
+            '';
+          target = "lighttpd.conf";
+        }
+      ];
+
+    users.extraUsers.lighttpd = {
+      group = "lighttpd";
+      description = "lighttpd web server privilege separation user";
+    };
+
+    users.extraGroups.lighttpd = {};
+  };
+}
-- 
GitLab


From 5737604b13ce1add83870d085633b5cad132327a Mon Sep 17 00:00:00 2001
From: Rickard Nilsson <rickynils@gmail.com>
Date: Mon, 4 Mar 2013 10:50:11 +0100
Subject: [PATCH 4453/5331] xfce: Set GTK_PATH to system.path/lib/gtk-2.0, so
 xfce can find all theme engines.

---
 modules/services/x11/desktop-managers/xfce.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/services/x11/desktop-managers/xfce.nix b/modules/services/x11/desktop-managers/xfce.nix
index d06eb23b8e9..63926ac1ca6 100644
--- a/modules/services/x11/desktop-managers/xfce.nix
+++ b/modules/services/x11/desktop-managers/xfce.nix
@@ -28,8 +28,8 @@ in
         bgSupport = true;
         start =
           ''
-            # Set GTK_PATH so that GTK+ can find the Xfce theme engine.
-            export GTK_PATH=${pkgs.xfce.gtk_xfce_engine}/lib/gtk-2.0
+            # Set GTK_PATH so that GTK+ can find the theme engines.
+            export GTK_PATH=${config.system.path}/lib/gtk-2.0
 
             # Set GTK_DATA_PREFIX so that GTK+ can find the Xfce themes.
             export GTK_DATA_PREFIX=${config.system.path}
-- 
GitLab


From 70378ad2b7bcc2995e234d6854cfd9790ba5b789 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Mon, 4 Mar 2013 09:42:03 -0500
Subject: [PATCH 4454/5331] Add our firmware path to the in-kernel lookup path

Newer kernels (since torvalds/linux@abb139e75c2cdbb955e840d6331cb5863e409d0e) try to
read firmware directly from the filesystem before falling back to a
userspace helper (udev) if firmware cannot be found (in even newer
kernels, the fallback path can be disabled altogether). By default, only
certain paths in /lib/firmware* are searched, so this was initially not
helpful for NixOS.

Since torvalds/linux@27602842060484b564cd725241b402b0bddfb830 (which,
based on the commit message, was implemented just for NixOS, go us!),
though, an extra path can be dynamically prepended to the search path.
So do that, in three ways:

1. Pass a kernel command line option in case the module is built-in
2. Add a line to modprobe.conf in case the module isn't yet loaded by
activation-time
3. Add an activation script to set the option in /sys in case the module
is already loaded by activation-time.
---
 modules/services/hardware/udev.nix | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/modules/services/hardware/udev.nix b/modules/services/hardware/udev.nix
index 0fce84fdd6d..0921997a5c9 100644
--- a/modules/services/hardware/udev.nix
+++ b/modules/services/hardware/udev.nix
@@ -227,6 +227,12 @@ in
       (isYes "INOTIFY_USER")
       (isYes "NET")
     ];
-  };
 
+    boot.extraKernelParams = [ "firmware_class.path=${config.hardware.firmware}" ];
+
+    boot.extraModprobeConfig = "options firmware_class path=${config.hardware.firmware}";
+
+    system.activationScripts."set-firmware-path" =
+      "echo -n ${config.hardware.firmware} > /sys/module/firmware_class/parameters/path";
+  };
 }
-- 
GitLab


From 0a81724a88778909529dd4facbe73c767584d73b Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Mon, 4 Mar 2013 09:57:24 -0500
Subject: [PATCH 4455/5331] systemd-sysctl.service: Don't depend on
 basic.target

---
 modules/config/sysctl.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/modules/config/sysctl.nix b/modules/config/sysctl.nix
index f3cc2130768..3a42889f428 100644
--- a/modules/config/sysctl.nix
+++ b/modules/config/sysctl.nix
@@ -50,6 +50,7 @@ in
           Type = "oneshot";
           RemainAfterExit = true;
           ExecStart = "${config.systemd.package}/lib/systemd/systemd-sysctl";
+          unitConfig.DefaultDependencies = false; # needed to prevent a cycle
         };
       };
 
-- 
GitLab


From bfe6c13f09d383267693d10a5c0b429a395ad25f Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Mon, 4 Mar 2013 10:02:40 -0500
Subject: [PATCH 4456/5331] D'oh!

---
 modules/config/sysctl.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/config/sysctl.nix b/modules/config/sysctl.nix
index 3a42889f428..b0f3708dbb2 100644
--- a/modules/config/sysctl.nix
+++ b/modules/config/sysctl.nix
@@ -46,11 +46,11 @@ in
         before = [ "sysinit.target" "shutdown.target" ];
         wantedBy = [ "sysinit.target" "multi-user.target" ];
         restartTriggers = [ config.environment.etc."sysctl.d/nixos.conf".source ];
+        unitConfig.DefaultDependencies = false; # needed to prevent a cycle
         serviceConfig = {
           Type = "oneshot";
           RemainAfterExit = true;
           ExecStart = "${config.systemd.package}/lib/systemd/systemd-sysctl";
-          unitConfig.DefaultDependencies = false; # needed to prevent a cycle
         };
       };
 
-- 
GitLab


From a9b3dbf8eacbebb9746ab8d1fb609a1ef2467813 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= <viric@viric.name>
Date: Mon, 4 Mar 2013 22:35:14 +0100
Subject: [PATCH 4457/5331] Fixing the vaapiDrivers; it didn't work, with only
 one driver

---
 modules/services/x11/display-managers/default.nix | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/modules/services/x11/display-managers/default.nix b/modules/services/x11/display-managers/default.nix
index cfe21c2a500..0347d0d26f0 100644
--- a/modules/services/x11/display-managers/default.nix
+++ b/modules/services/x11/display-managers/default.nix
@@ -19,10 +19,8 @@ let
   vaapiDrivers = pkgs.buildEnv {
     name = "vaapi-drivers";
     paths = cfg.vaapiDrivers;
-    pathsToLink = "/lib/dri";
-
-    # To admit zero-length 'paths'
-    postBuild = "mkdir -p $out/lib/dri";
+    # We only want /lib/dri, but with a single input path, we need "/" for it to work
+    pathsToLink = [ "/" ];
   };
 
   # file provided by services.xserver.displayManager.session.script
-- 
GitLab


From e05a37d7368895f488cee77aac5294f43d0a4484 Mon Sep 17 00:00:00 2001
From: Mathijs Kwik <mathijs@bluescreen303.nl>
Date: Sun, 24 Feb 2013 11:58:46 +0100
Subject: [PATCH 4458/5331] rename deprecated option

---
 modules/system/boot/loader/efi-boot-stub/efi-boot-stub.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/system/boot/loader/efi-boot-stub/efi-boot-stub.nix b/modules/system/boot/loader/efi-boot-stub/efi-boot-stub.nix
index 7c8deba389b..735784327bc 100644
--- a/modules/system/boot/loader/efi-boot-stub/efi-boot-stub.nix
+++ b/modules/system/boot/loader/efi-boot-stub/efi-boot-stub.nix
@@ -7,7 +7,7 @@ let
     src = ./efi-boot-stub-builder.sh;
     isExecutable = true;
     inherit (pkgs) bash;
-    path = [pkgs.coreutils pkgs.gnused pkgs.gnugrep pkgs.glibc] ++ (pkgs.stdenv.lib.optionals config.boot.loader.efiBootStub.runEfibootmgr [pkgs.efibootmgr pkgs.module_init_tools]);
+    path = [pkgs.coreutils pkgs.gnused pkgs.gnugrep pkgs.glibc] ++ (pkgs.stdenv.lib.optionals config.boot.loader.efi.canTouchEfiVariables [pkgs.efibootmgr pkgs.module_init_tools]);
     inherit (config.boot.loader.efiBootStub) installStartupNsh;
 
     inherit (config.boot.loader.efi) efiSysMountPoint;
-- 
GitLab


From 134750f6acf7bd60ff243bf55547266f625443e8 Mon Sep 17 00:00:00 2001
From: Mathijs Kwik <mathijs@bluescreen303.nl>
Date: Sun, 3 Mar 2013 23:48:33 +0100
Subject: [PATCH 4459/5331] gummiboot: fix typo

---
 modules/system/boot/loader/gummiboot/gummiboot.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/system/boot/loader/gummiboot/gummiboot.nix b/modules/system/boot/loader/gummiboot/gummiboot.nix
index 0fd6bbe9c73..9193cd3bc53 100644
--- a/modules/system/boot/loader/gummiboot/gummiboot.nix
+++ b/modules/system/boot/loader/gummiboot/gummiboot.nix
@@ -48,7 +48,7 @@ in {
   config = mkIf cfg.enable {
     assertions = [
       {
-        assertion = (config.boot.kernelPacakges.kernel.features or { efiBootStub = true; }) ? efiBootStub;
+        assertion = (config.boot.kernelPackages.kernel.features or { efiBootStub = true; }) ? efiBootStub;
 
         message = "This kernel does not support the EFI boot stub";
       }
-- 
GitLab


From 09680dec6a6e6c4415bda196fa23721d3d376ad0 Mon Sep 17 00:00:00 2001
From: Mathijs Kwik <mathijs@bluescreen303.nl>
Date: Mon, 4 Mar 2013 19:05:07 +0100
Subject: [PATCH 4460/5331] read-only-store functionality should apply even
 when /nix/store is on a separate filesystem

---
 modules/system/boot/stage-2-init.sh | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/modules/system/boot/stage-2-init.sh b/modules/system/boot/stage-2-init.sh
index e8b3a403020..8df7eba5d78 100644
--- a/modules/system/boot/stage-2-init.sh
+++ b/modules/system/boot/stage-2-init.sh
@@ -51,10 +51,8 @@ echo "booting system configuration $systemConfig" > /dev/kmsg
 chown 0:30000 /nix/store
 chmod 1775 /nix/store
 if [ -n "@readOnlyStore@" ]; then
-    if ! mountpoint -q /nix/store; then
-        mount --bind /nix/store /nix/store
-        mount -o remount,ro,bind /nix/store
-    fi
+    mount --bind /nix/store /nix/store
+    mount -o remount,ro,bind /nix/store
 fi
 
 
-- 
GitLab


From af152556e3d23ff0285691b60870ef6ea7813df6 Mon Sep 17 00:00:00 2001
From: Rickard Nilsson <rickynils@gmail.com>
Date: Tue, 5 Mar 2013 19:44:12 +0100
Subject: [PATCH 4461/5331] nslcd: Require network.target

---
 modules/config/ldap.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/modules/config/ldap.nix b/modules/config/ldap.nix
index 603ad8407cd..0054f08d439 100644
--- a/modules/config/ldap.nix
+++ b/modules/config/ldap.nix
@@ -223,6 +223,8 @@ mkIf cfg.enable {
   systemd.services = mkIf cfg.daemon.enable {
     nslcd = {
       wantedBy = [ "nss-user-lookup.target" ];
+      wants = [ "network.target" ];
+      after = [ "network.target" ];
 
       path = [ nss_pam_ldapd ];
   
-- 
GitLab


From 35093b8a28b62c8d6fa7085aa0e0f4c7b7951655 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Tue, 5 Mar 2013 20:33:41 -0500
Subject: [PATCH 4462/5331] Silence a harmless warning on kernels without the
 'path' parameter for firmware_class.

---
 modules/services/hardware/udev.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/services/hardware/udev.nix b/modules/services/hardware/udev.nix
index 0921997a5c9..2ba06b886e4 100644
--- a/modules/services/hardware/udev.nix
+++ b/modules/services/hardware/udev.nix
@@ -233,6 +233,6 @@ in
     boot.extraModprobeConfig = "options firmware_class path=${config.hardware.firmware}";
 
     system.activationScripts."set-firmware-path" =
-      "echo -n ${config.hardware.firmware} > /sys/module/firmware_class/parameters/path";
+      "echo -n ${config.hardware.firmware} 2>/dev/null > /sys/module/firmware_class/parameters/path";
   };
 }
-- 
GitLab


From c948494342581e7c31880c1d3f2a3f9e618bc963 Mon Sep 17 00:00:00 2001
From: Rickard Nilsson <rickynils@gmail.com>
Date: Tue, 5 Mar 2013 17:03:05 +0100
Subject: [PATCH 4463/5331] Add /run/nss to LD_LIBRARY_PATH

This fixes issues with glibc-binaries (getent for example) that can't
find NSS modules that are not distributed with glibc.

See this discussion:
http://comments.gmane.org/gmane.linux.distributions.nixos/9940
---
 modules/config/nsswitch.nix                     | 1 +
 modules/programs/bash/profile.sh                | 2 +-
 modules/system/activation/activation-script.nix | 5 +++++
 3 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/modules/config/nsswitch.nix b/modules/config/nsswitch.nix
index 7e989c163e3..b9838945aa8 100644
--- a/modules/config/nsswitch.nix
+++ b/modules/config/nsswitch.nix
@@ -22,6 +22,7 @@ let
         {
           inherit list;
           path = makeLibraryPath list;
+          dir = pkgs.symlinkJoin "nss-modules" (map (p: "${p}/lib") list);
         };
     };
 
diff --git a/modules/programs/bash/profile.sh b/modules/programs/bash/profile.sh
index 5393a88d5ff..83a2c6ffe9f 100644
--- a/modules/programs/bash/profile.sh
+++ b/modules/programs/bash/profile.sh
@@ -13,7 +13,7 @@ export __ETC_PROFILE_DONE=1
 
 # Initialise a bunch of environment variables.
 export LOCALE_ARCHIVE=/run/current-system/sw/lib/locale/locale-archive
-export LD_LIBRARY_PATH=/run/opengl-driver/lib:/run/opengl-driver-32/lib # !!! only set if needed
+export LD_LIBRARY_PATH=/run/nss:/run/opengl-driver/lib:/run/opengl-driver-32/lib # !!! only set if needed
 export NIXPKGS_CONFIG=/etc/nix/nixpkgs-config.nix
 export NIX_PATH=/nix/var/nix/profiles/per-user/root/channels/nixos:nixpkgs=/etc/nixos/nixpkgs:nixos=/etc/nixos/nixos:nixos-config=/etc/nixos/configuration.nix:services=/etc/nixos/services
 export PAGER="less -R"
diff --git a/modules/system/activation/activation-script.nix b/modules/system/activation/activation-script.nix
index dc017563217..e4bc84b49c0 100644
--- a/modules/system/activation/activation-script.nix
+++ b/modules/system/activation/activation-script.nix
@@ -150,6 +150,11 @@ in
         ${pkgs.utillinux}/bin/mount -o "remount,size=${config.boot.runSize}" none /run
       '';
 
+    system.activationScripts.nss =
+      ''
+        ln -sfn ${config.system.nssModules.dir} /run/nss
+      '';
+
   };
 
 }
-- 
GitLab


From 6d6d3d4228f43695bfd6767c4a7155e25bb499d2 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Thu, 7 Mar 2013 19:00:21 -0500
Subject: [PATCH 4464/5331] readOnlyStore: Don't do a read-only bind-mount of
 an already read-only store.

Signed-off-by: Shea Levy <shea@shealevy.com>
---
 modules/system/boot/readonly-mountpoint.c | 21 +++++++++++++++++++++
 modules/system/boot/stage-2-init.sh       |  6 ++++--
 modules/system/boot/stage-2.nix           |  9 ++++++++-
 3 files changed, 33 insertions(+), 3 deletions(-)
 create mode 100644 modules/system/boot/readonly-mountpoint.c

diff --git a/modules/system/boot/readonly-mountpoint.c b/modules/system/boot/readonly-mountpoint.c
new file mode 100644
index 00000000000..03ec18d4ceb
--- /dev/null
+++ b/modules/system/boot/readonly-mountpoint.c
@@ -0,0 +1,21 @@
+#include <sys/statvfs.h>
+#include <stdio.h>
+#include <stdlib.h>
+
+int main(int argc, char ** argv) {
+	struct statvfs stat;
+	int res;
+	if (argc != 2) {
+		fprintf(stderr, "Usage: %s PATH", argv[0]);
+		exit(2);
+	}
+	if(statvfs(argv[1], &stat) != 0) {
+		perror("statvfs");
+		exit(3);
+	}
+	if (stat.f_flag & ST_RDONLY)
+		exit(0);
+	else
+		exit(1);
+}
+
diff --git a/modules/system/boot/stage-2-init.sh b/modules/system/boot/stage-2-init.sh
index 8df7eba5d78..6e23052e61d 100644
--- a/modules/system/boot/stage-2-init.sh
+++ b/modules/system/boot/stage-2-init.sh
@@ -51,8 +51,10 @@ echo "booting system configuration $systemConfig" > /dev/kmsg
 chown 0:30000 /nix/store
 chmod 1775 /nix/store
 if [ -n "@readOnlyStore@" ]; then
-    mount --bind /nix/store /nix/store
-    mount -o remount,ro,bind /nix/store
+    if ! readonly-mountpoint /nix/store; then
+        mount --bind /nix/store /nix/store
+        mount -o remount,ro,bind /nix/store
+    fi
 fi
 
 
diff --git a/modules/system/boot/stage-2.nix b/modules/system/boot/stage-2.nix
index e357cab5898..efffb89d732 100644
--- a/modules/system/boot/stage-2.nix
+++ b/modules/system/boot/stage-2.nix
@@ -62,6 +62,12 @@ let
   kernel = config.boot.kernelPackages.kernel;
   activateConfiguration = config.system.activationScripts.script;
 
+  readonlyMountpoint = pkgs.runCommand "readonly-mountpoint" {} ''
+    mkdir -p $out/bin
+    cc -O3 ${./readonly-mountpoint.c} -o $out/bin/readonly-mountpoint
+    strip -s $out/bin/readonly-mountpoint
+  '';
+
   bootStage2 = pkgs.substituteAll {
     src = ./stage-2-init.sh;
     shellDebug = "${pkgs.bashInteractive}/bin/bash";
@@ -73,7 +79,8 @@ let
       [ pkgs.coreutils
         pkgs.utillinux
         pkgs.sysvtools
-      ] ++ optional config.boot.cleanTmpDir pkgs.findutils;
+      ] ++ (optional config.boot.cleanTmpDir pkgs.findutils)
+      ++ optional config.nix.readOnlyStore readonlyMountpoint;
     postBootCommands = pkgs.writeText "local-cmds"
       ''
         ${config.boot.postBootCommands}
-- 
GitLab


From bc21ccc981e4f8b30c3e7af6b5e20a36990baba2 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Thu, 7 Mar 2013 19:05:54 -0500
Subject: [PATCH 4465/5331] readonly-mountpoint: Remove unusued variable

---
 modules/system/boot/readonly-mountpoint.c | 1 -
 1 file changed, 1 deletion(-)

diff --git a/modules/system/boot/readonly-mountpoint.c b/modules/system/boot/readonly-mountpoint.c
index 03ec18d4ceb..605adfafabb 100644
--- a/modules/system/boot/readonly-mountpoint.c
+++ b/modules/system/boot/readonly-mountpoint.c
@@ -4,7 +4,6 @@
 
 int main(int argc, char ** argv) {
 	struct statvfs stat;
-	int res;
 	if (argc != 2) {
 		fprintf(stderr, "Usage: %s PATH", argv[0]);
 		exit(2);
-- 
GitLab


From f1d48aec43947e5dddae8ba02e3133ee8d0d0ff9 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Fri, 8 Mar 2013 10:42:34 -0500
Subject: [PATCH 4466/5331] Don't mount /nix/store ro if it's a mountpoint

In principle this could work, but the current remount logic in nix fails
to remount mountpoints that are root in their own filesystem (as would
be the case with bind-mounting a mountpoint over itself). nixos/nix#98
is aimed at fixing this.

Signed-off-by: Shea Levy <shea@shealevy.com>
---
 modules/system/boot/readonly-mountpoint.c | 2 +-
 modules/system/boot/stage-2-init.sh       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/system/boot/readonly-mountpoint.c b/modules/system/boot/readonly-mountpoint.c
index 605adfafabb..27b66687382 100644
--- a/modules/system/boot/readonly-mountpoint.c
+++ b/modules/system/boot/readonly-mountpoint.c
@@ -8,7 +8,7 @@ int main(int argc, char ** argv) {
 		fprintf(stderr, "Usage: %s PATH", argv[0]);
 		exit(2);
 	}
-	if(statvfs(argv[1], &stat) != 0) {
+	if (statvfs(argv[1], &stat) != 0) {
 		perror("statvfs");
 		exit(3);
 	}
diff --git a/modules/system/boot/stage-2-init.sh b/modules/system/boot/stage-2-init.sh
index 6e23052e61d..deacedb18e3 100644
--- a/modules/system/boot/stage-2-init.sh
+++ b/modules/system/boot/stage-2-init.sh
@@ -51,7 +51,7 @@ echo "booting system configuration $systemConfig" > /dev/kmsg
 chown 0:30000 /nix/store
 chmod 1775 /nix/store
 if [ -n "@readOnlyStore@" ]; then
-    if ! readonly-mountpoint /nix/store; then
+    if ! mountpoint /nix/store; then
         mount --bind /nix/store /nix/store
         mount -o remount,ro,bind /nix/store
     fi
-- 
GitLab


From d89ba0697f960f5a316aad419c88ee525827a0a9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Fri, 1 Mar 2013 21:12:38 +0100
Subject: [PATCH 4467/5331] Add Transmission BitTorrent service

Enable it with

  services.transmission.enable = true;

and optionally configure it

  services.transmission.settings =
    {
      download-dir = "/srv/torrents/";
      incomplete-dir = "/srv/torrents/.incomplete/";
      incomplete-dir-enabled = true;
      rpc-whitelist = "127.0.0.1,192.168.*.*";
      # for users in group "transmission" to have access to torrents
      umask = 2;
    };

The above settings are written/merged into settings.json each time the
service is about to start.
---
 modules/module-list.nix                   |   1 +
 modules/services/torrent/transmission.nix | 134 ++++++++++++++++++++++
 2 files changed, 135 insertions(+)
 create mode 100644 modules/services/torrent/transmission.nix

diff --git a/modules/module-list.nix b/modules/module-list.nix
index 6508a7735c0..a899baa6b28 100644
--- a/modules/module-list.nix
+++ b/modules/module-list.nix
@@ -175,6 +175,7 @@
   ./services/system/nscd.nix
   ./services/system/uptimed.nix
   ./services/torrent/deluge.nix
+  ./services/torrent/transmission.nix
   ./services/ttys/gpm.nix
   ./services/ttys/agetty.nix
   ./services/web-servers/apache-httpd/default.nix
diff --git a/modules/services/torrent/transmission.nix b/modules/services/torrent/transmission.nix
new file mode 100644
index 00000000000..c3dc1f80f14
--- /dev/null
+++ b/modules/services/torrent/transmission.nix
@@ -0,0 +1,134 @@
+# NixOS module for Transmission BitTorrent daemon
+
+{ config, pkgs, ... }:
+
+with pkgs.lib;
+
+let
+
+  cfg = config.services.transmission;
+  homeDir = "/var/lib/transmission";
+  settingsDir = "${homeDir}/.config/transmission-daemon";
+  settingsFile = "${settingsDir}/settings.json";
+
+  # Strings must be quoted, ints and bools must not (for settings.json).
+  toOption = x:
+    if x == true then "true"
+    else if x == false then "false"
+    else if builtins.isInt x then toString x
+    else toString ''\"${x}\"'';
+
+  # All lines in settings.json end with a ',' (comma), except for the last
+  # line. This is standard JSON. But a comma can also appear *inside* some
+  # fields, notably the "rpc-whitelist" field. This is difficult to handle in
+  # sed so we simply ignore it and say that if you want to change the option at
+  # the last line of settings.json, you have to do it manually. At this time of
+  # writing, the last option is "utp-enable":true.
+  attrsToSedArgs = as:
+    concatStrings (concatLists (mapAttrsToList (name: value:
+      #map (x: '' -e 's=\(\"${name}\":\)[^,]*\(.*\)=\1 ${toOption x}\2=' '') # breaks if comma inside value field
+      map (x: '' -e 's=\(\"${name}\":\).*=\1 ${toOption x},=' '') # always append ',' (breaks last line in settings.json)
+        (if isList value then value else [value]))
+        as));
+
+in
+
+{
+
+  ### configuration
+
+  options = {
+
+    services.transmission = {
+
+      enable = mkOption {
+        type = types.uniq types.bool;
+        default = false;
+        description = ''
+          Whether or not to enable the headless Transmission BitTorrent daemon.
+
+          Transmission daemon can be controlled via the RPC interface using
+          transmission-remote or the WebUI (http://localhost:9091/ by default).
+
+          Torrents are downloaded to ${homeDir}/Downloads/ by default and are
+          accessible to users in the "transmission" group.
+        '';
+      };
+
+      settings = mkOption {
+        type = types.attrs;
+        default =
+          {
+            # for users in group "transmission" to have access to torrents
+            umask = 2;
+          }
+        ;
+        example =
+          {
+            download-dir = "/srv/torrents/";
+            incomplete-dir = "/srv/torrents/.incomplete/";
+            incomplete-dir-enabled = true;
+            rpc-whitelist = "127.0.0.1,192.168.*.*";
+            # for users in group "transmission" to have access to torrents
+            umask = 2;
+          }
+        ;
+        description = ''
+          Attribute set whos fields overwrites fields in settings.json (each
+          time the service starts). String values must be quoted, integer and
+          boolean values must not.
+
+          See https://trac.transmissionbt.com/wiki/EditConfigFiles for documentation
+          and/or look at ${settingsFile}."
+        '';
+      };
+
+      rpc_port = mkOption {
+        type = types.uniq types.int;
+        default = 9091;
+        description = "TCP port number to run the RPC/web interface.";
+      };
+
+    };
+
+  };
+
+  ### implementation
+
+  config = mkIf cfg.enable {
+
+    systemd.services.transmission = {
+      description = "Transmission BitTorrent Daemon";
+      after = [ "network.target" ];
+      wantedBy = [ "multi-user.target" ];
+      # 1) Only the "transmission" user and group have access to torrents.
+      # 2) Optionally update/force specific fields into the configuration file.
+      serviceConfig.ExecStartPre =
+        if config.services.transmission.settings != {} then ''
+          ${pkgs.stdenv.shell} -c "chmod 770 ${homeDir} && mkdir -p ${settingsDir} && ${pkgs.transmission}/bin/transmission-daemon -d |& sed ${attrsToSedArgs config.services.transmission.settings} > ${settingsFile}.tmp && mv ${settingsFile}.tmp ${settingsFile}"
+        ''
+        else ''
+          ${pkgs.stdenv.shell} -c "chmod 770 ${homeDir}"
+        '';
+      serviceConfig.ExecStart = "${pkgs.transmission}/bin/transmission-daemon -f --port ${toString config.services.transmission.rpc_port}";
+      serviceConfig.ExecReload = "kill -HUP $MAINPID";
+      serviceConfig.User = "transmission";
+      # NOTE: transmission has an internal umask that also must be set (in settings.json)
+      serviceConfig.UMask = "0002";
+    };
+
+    # It's useful to have transmission in path, e.g. for remote control
+    environment.systemPackages = [ pkgs.transmission ];
+
+    users.extraUsers.transmission = {
+      group = "transmission";
+      description = "Transmission BitTorrent user";
+      home = homeDir;
+      createHome = true;
+    };
+
+    users.extraGroups.transmission = {};
+
+  };
+
+}
-- 
GitLab


From a3d8e6eebafe25595b5665ddb50fed3f81bffae1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sat, 9 Mar 2013 10:55:57 +0100
Subject: [PATCH 4468/5331] xfce: update the xinitrc path

---
 modules/services/x11/desktop-managers/xfce.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/services/x11/desktop-managers/xfce.nix b/modules/services/x11/desktop-managers/xfce.nix
index 63926ac1ca6..c7622ddb02f 100644
--- a/modules/services/x11/desktop-managers/xfce.nix
+++ b/modules/services/x11/desktop-managers/xfce.nix
@@ -38,7 +38,7 @@ in
             # Ugly.
             export GST_PLUGIN_PATH=${config.system.path}/lib
 
-            exec ${pkgs.stdenv.shell} ${pkgs.xfce.xfceutils}/etc/xdg/xfce4/xinitrc
+            exec ${pkgs.stdenv.shell} ${pkgs.xfce.xinitrc}
           '';
       };
 
-- 
GitLab


From 763835e77071f5964b622741733157817043821c Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Sat, 9 Mar 2013 06:27:27 -0500
Subject: [PATCH 4469/5331] Console key map: Make option uniq

Signed-off-by: Shea Levy <shea@shealevy.com>
---
 modules/config/i18n.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/modules/config/i18n.nix b/modules/config/i18n.nix
index e964b9bfb1d..0fb91771934 100644
--- a/modules/config/i18n.nix
+++ b/modules/config/i18n.nix
@@ -46,6 +46,7 @@ let
         description = "
           The keyboard mapping table for the virtual consoles.
         ";
+        type = types.uniq types.string;
       };
 
     };
-- 
GitLab


From 415ff3c39a6b39e571ddece06faef0cc84a5c86c Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 10 Mar 2013 01:19:44 +0100
Subject: [PATCH 4470/5331] smartd: change 'devices' option from "list of
 strings" to "list of attribute sets"

The smartd used to expect a list of devices to monitor. After this patch, it
expects a list of attribute sets, which may have two attributes:

 - device: path to the device (required)
 - options: smartd options to apply to this particular device (optional)

A concrete example configuration would be:

  services.smartd = {
    enable = true;
    devices = [ { device = "/dev/sda"; } { device = "/dev/sdb"; options = "-d sat"; } ];
  };

Furthermore, the config option 'deviceOpts' can be used to configure options
that are applied to *every* device.
---
 modules/services/monitoring/smartd.nix | 27 ++++++++++++++++++++++++--
 1 file changed, 25 insertions(+), 2 deletions(-)

diff --git a/modules/services/monitoring/smartd.nix b/modules/services/monitoring/smartd.nix
index 07acab761d0..71eb6b99ed3 100644
--- a/modules/services/monitoring/smartd.nix
+++ b/modules/services/monitoring/smartd.nix
@@ -6,6 +6,27 @@ let
 
   cfg = config.services.smartd;
 
+  smartdOpts = { name, ... }: {
+
+    options = {
+
+      device = mkOption {
+        example = "/dev/sda";
+        type = types.string;
+        description = "Location of the device.";
+      };
+
+      options = mkOption {
+        default = "";
+        example = "-d sat";
+        type = types.string;
+        merge = pkgs.lib.concatStringsSep " ";
+        description = "Options that determine how smartd monitors the device";
+      };
+    };
+
+  };
+
   smartdMail = pkgs.writeScript "smartdmail.sh" ''
     #! ${pkgs.stdenv.shell}
     TMPNAM=/tmp/smartd-message.$$.tmp
@@ -24,7 +45,7 @@ let
 
   smartdConf = pkgs.writeText "smartd.conf" (concatMapStrings (device:
     ''
-      ${device} -a -m root -M exec ${smartdMail} ${cfg.deviceOpts}
+      ${device.device} -a -m root -M exec ${smartdMail} ${device.options} ${cfg.deviceOpts}
     ''
     ) cfg.devices);
 
@@ -63,7 +84,9 @@ in
 
       devices = mkOption {
         default = [];
-        example = ["/dev/sda" "/dev/sdb"];
+        example = [ { device = "/dev/sda"; } { device = "/dev/sdb"; options = "-d sat"; } ];
+        type = types.list types.optionSet;
+        options = [ smartdOpts ];
         description = ''
           List of devices to monitor. By default -- if this list is empty --,
           smartd will monitor all devices connected to the machine at the time
-- 
GitLab


From 60e408dd6bb0118357ae7d4ebed0ea1cd047bca8 Mon Sep 17 00:00:00 2001
From: Jack Cummings <jack@mudshark.org>
Date: Mon, 11 Mar 2013 02:02:10 -0700
Subject: [PATCH 4471/5331] need a newline in extraModprobeConfig

---
 modules/tasks/filesystems/zfs.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/modules/tasks/filesystems/zfs.nix b/modules/tasks/filesystems/zfs.nix
index 8c643511724..44c265b20d2 100644
--- a/modules/tasks/filesystems/zfs.nix
+++ b/modules/tasks/filesystems/zfs.nix
@@ -43,7 +43,9 @@ in
     boot = { 
       kernelModules = [ "spl" "zfs" ] ;
       extraModulePackages = [ kernel.zfs kernel.spl ];
-      extraModprobeConfig = mkIf (cfgSpl.hostid != "") "options spl spl_hostid=${cfgSpl.hostid}";
+      extraModprobeConfig = mkIf (cfgSpl.hostid != "") ''
+        options spl spl_hostid=${cfgSpl.hostid}
+      '';
     };
 
     boot.initrd = mkIf inInitrd { 
-- 
GitLab


From 78f3da65eca4d9bf50f962936cf75bef237b86b4 Mon Sep 17 00:00:00 2001
From: Rickard Nilsson <rickynils@gmail.com>
Date: Tue, 12 Mar 2013 09:38:22 +0100
Subject: [PATCH 4472/5331] Revert "nslcd: Require network.target"

This reverts commit af152556e3d23ff0285691b60870ef6ea7813df6.

The network target is probably not really required, needs
further testing.
---
 modules/config/ldap.nix | 2 --
 1 file changed, 2 deletions(-)

diff --git a/modules/config/ldap.nix b/modules/config/ldap.nix
index 0054f08d439..603ad8407cd 100644
--- a/modules/config/ldap.nix
+++ b/modules/config/ldap.nix
@@ -223,8 +223,6 @@ mkIf cfg.enable {
   systemd.services = mkIf cfg.daemon.enable {
     nslcd = {
       wantedBy = [ "nss-user-lookup.target" ];
-      wants = [ "network.target" ];
-      after = [ "network.target" ];
 
       path = [ nss_pam_ldapd ];
   
-- 
GitLab


From d67d3b5b6a1d176dc055cd7b654f3266933ac830 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Tue, 12 Mar 2013 05:51:45 -0400
Subject: [PATCH 4473/5331] extraModprobeConfig: set type to types.lines

This makes it so multiple definitions are merged by adding a newline
between each entry, to avoid the need to add a newline to the end of
every definition of extraModprobeConfig. See #119 for an example of an
issue this has caused.

Signed-off-by: Shea Levy <shea@shealevy.com>
---
 modules/system/boot/modprobe.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/modules/system/boot/modprobe.nix b/modules/system/boot/modprobe.nix
index 7babb70eccb..62ac3009d10 100644
--- a/modules/system/boot/modprobe.nix
+++ b/modules/system/boot/modprobe.nix
@@ -57,6 +57,7 @@ with pkgs.lib;
         <citerefentry><refentrytitle>modprobe.conf</refentrytitle>
         <manvolnum>5</manvolnum></citerefentry> for details.
       '';
+      type = types.lines;
     };
 
   };
-- 
GitLab


From 28f3d02c29a05df5f64a8dcd4ff1c34dd296cd96 Mon Sep 17 00:00:00 2001
From: Rob Vermaas <rob.vermaas@gmail.com>
Date: Tue, 12 Mar 2013 10:56:43 +0100
Subject: [PATCH 4474/5331] symlink /etc/localtime was broken, /etc/localtime
 now points to a location in tzdata in stead of glibc

---
 modules/config/timezone.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/config/timezone.nix b/modules/config/timezone.nix
index e891af344cc..f21a1ec5d4c 100644
--- a/modules/config/timezone.nix
+++ b/modules/config/timezone.nix
@@ -31,7 +31,7 @@ with pkgs.lib;
       '';
 
     environment.etc = singleton
-      { source = "${pkgs.glibc}/share/zoneinfo/${config.time.timeZone}";
+      { source = "${pkgs.tzdata}/share/zoneinfo/${config.time.timeZone}";
         target = "localtime";
       };
       
-- 
GitLab


From 7bbf034f93a546da3e1672a3275021bcdf119b59 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Wed, 13 Mar 2013 19:48:58 -0400
Subject: [PATCH 4475/5331] alsa-store.service: Ensure /var/lib/alsa exists

Signed-off-by: Shea Levy <shea@shealevy.com>
---
 modules/services/audio/alsa.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/modules/services/audio/alsa.nix b/modules/services/audio/alsa.nix
index ead53c3dc3a..e9f8b88fdc6 100644
--- a/modules/services/audio/alsa.nix
+++ b/modules/services/audio/alsa.nix
@@ -54,6 +54,7 @@ in
       { description = "Store Sound Card State";
         wantedBy = [ "shutdown.target" ];
         before = [ "shutdown.target" ];
+        preStart = "mkdir -p /var/lib/alsa";
         unitConfig.DefaultDependencies = "no";
         serviceConfig.Type = "oneshot";
         serviceConfig.ExecStart = "${alsaUtils}/sbin/alsactl store --ignore";
-- 
GitLab


From 6e20c697cd1a7a32f09aa83725256cf8eff8e9cb Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Wed, 13 Mar 2013 19:58:35 -0400
Subject: [PATCH 4476/5331] alsa-store.service: Avoid unnecessary shell

Signed-off-by: Shea Levy <shea@shealevy.com>
---
 modules/services/audio/alsa.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/services/audio/alsa.nix b/modules/services/audio/alsa.nix
index e9f8b88fdc6..ed08c653f3a 100644
--- a/modules/services/audio/alsa.nix
+++ b/modules/services/audio/alsa.nix
@@ -54,10 +54,10 @@ in
       { description = "Store Sound Card State";
         wantedBy = [ "shutdown.target" ];
         before = [ "shutdown.target" ];
-        preStart = "mkdir -p /var/lib/alsa";
         unitConfig.DefaultDependencies = "no";
         serviceConfig.Type = "oneshot";
         serviceConfig.ExecStart = "${alsaUtils}/sbin/alsactl store --ignore";
+        serviceConfig.ExecStartPre = "${pkgs.coreutils}/bin/mkdir -p /var/lib/alsa";
       };
 
   };
-- 
GitLab


From f3e6b422586a984a58d7b469abe121e686ee7613 Mon Sep 17 00:00:00 2001
From: Marc Weber <marco-oweber@gmx.de>
Date: Thu, 14 Mar 2013 17:09:21 +0100
Subject: [PATCH 4477/5331] replace list by listOf using same style as for
 attrsOf

---
 modules/config/swap.nix                        | 2 +-
 modules/services/misc/nix-daemon.nix           | 4 ++--
 modules/services/monitoring/smartd.nix         | 2 +-
 modules/services/networking/firewall.nix       | 8 ++++----
 modules/services/networking/xinetd.nix         | 2 +-
 modules/services/x11/desktop-managers/kde4.nix | 4 ++--
 modules/services/x11/xserver.nix               | 2 +-
 modules/system/boot/luksroot.nix               | 2 +-
 modules/tasks/filesystems.nix                  | 4 ++--
 9 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/modules/config/swap.nix b/modules/config/swap.nix
index 222c18d3e62..a0287c948af 100644
--- a/modules/config/swap.nix
+++ b/modules/config/swap.nix
@@ -26,7 +26,7 @@ with utils;
         recommended.
       '';
 
-      type = types.list types.optionSet;
+      type = types.listOf types.optionSet;
 
       options = {config, options, ...}: {
 
diff --git a/modules/services/misc/nix-daemon.nix b/modules/services/misc/nix-daemon.nix
index 11d443e4886..f3ebf0a3418 100644
--- a/modules/services/misc/nix-daemon.nix
+++ b/modules/services/misc/nix-daemon.nix
@@ -221,7 +221,7 @@ in
 
       binaryCaches = mkOption {
         default = [ http://nixos.org/binary-cache ];
-        type = types.list types.string;
+        type = types.listOf types.string;
         description = ''
           List of binary cache URLs used to obtain pre-built binaries
           of Nix packages.
@@ -231,7 +231,7 @@ in
       trustedBinaryCaches = mkOption {
         default = [ ];
         example = [ http://hydra.nixos.org/ ];
-        type = types.list types.string;
+        type = types.listOf types.string;
         description = ''
           List of binary cache URLs that non-root users can use (in
           addition to those specified using
diff --git a/modules/services/monitoring/smartd.nix b/modules/services/monitoring/smartd.nix
index 71eb6b99ed3..3f065666ea2 100644
--- a/modules/services/monitoring/smartd.nix
+++ b/modules/services/monitoring/smartd.nix
@@ -85,7 +85,7 @@ in
       devices = mkOption {
         default = [];
         example = [ { device = "/dev/sda"; } { device = "/dev/sdb"; options = "-d sat"; } ];
-        type = types.list types.optionSet;
+        type = types.listOf types.optionSet;
         options = [ smartdOpts ];
         description = ''
           List of devices to monitor. By default -- if this list is empty --,
diff --git a/modules/services/networking/firewall.nix b/modules/services/networking/firewall.nix
index 7bc09a7b404..c47210c7cef 100644
--- a/modules/services/networking/firewall.nix
+++ b/modules/services/networking/firewall.nix
@@ -108,7 +108,7 @@ in
     };
 
     networking.firewall.trustedInterfaces = mkOption {
-      type = types.list types.string;
+      type = types.listOf types.string;
       description =
         ''
           Traffic coming in from these interfaces will be accepted
@@ -119,7 +119,7 @@ in
     networking.firewall.allowedTCPPorts = mkOption {
       default = [];
       example = [ 22 80 ];
-      type = types.list types.int;
+      type = types.listOf types.int;
       description =
         ''
           List of TCP ports on which incoming connections are
@@ -130,7 +130,7 @@ in
     networking.firewall.allowedUDPPorts = mkOption {
       default = [];
       example = [ 53 ];
-      type = types.list types.int;
+      type = types.listOf types.int;
       description =
         ''
           List of open UDP ports.
@@ -168,7 +168,7 @@ in
     networking.firewall.connectionTrackingModules = mkOption {
       default = [ "ftp" ];
       example = [ "ftp" "irc" "sane" "sip" "tftp" "amanda" "h323" "netbios_sn" "pptp" "snmp" ];
-      type = types.list types.string;
+      type = types.listOf types.string;
       description =
         ''
           List of connection-tracking helpers that are auto-loaded.
diff --git a/modules/services/networking/xinetd.nix b/modules/services/networking/xinetd.nix
index 3727e85816c..626183b810f 100644
--- a/modules/services/networking/xinetd.nix
+++ b/modules/services/networking/xinetd.nix
@@ -67,7 +67,7 @@ in
         A list of services provided by xinetd.
       '';
 
-      type = types.list types.optionSet;
+      type = types.listOf types.optionSet;
 
       options = {
 
diff --git a/modules/services/x11/desktop-managers/kde4.nix b/modules/services/x11/desktop-managers/kde4.nix
index f4bf0d3f2c6..58f4d74c20e 100644
--- a/modules/services/x11/desktop-managers/kde4.nix
+++ b/modules/services/x11/desktop-managers/kde4.nix
@@ -55,7 +55,7 @@ in
       };
 
       phononBackends = mkOption {
-        type = types.list types.string;
+        type = types.listOf types.string;
         default = ["gstreamer"];
         example = ["gstreamer" "vlc"];
         description = "Which phonon multimedia backend kde should use";
@@ -65,7 +65,7 @@ in
     environment.kdePackages = mkOption {
       default = [];
       example = "[ pkgs.kde4.kdesdk ]";
-      type = types.list types.package;
+      type = types.listOf types.package;
       description = "This option is obsolete.  Please use <option>environment.systemPackages</option> instead.";
     };
 
diff --git a/modules/services/x11/xserver.nix b/modules/services/x11/xserver.nix
index 643fc42dc62..d5277d3cd03 100644
--- a/modules/services/x11/xserver.nix
+++ b/modules/services/x11/xserver.nix
@@ -384,7 +384,7 @@ in
 
     environment.x11Packages = mkOption {
       default = [];
-      type = types.list types.package;
+      type = types.listOf types.package;
       description = ''
         List of packages added to the system when the X server is
         activated (<option>services.xserver.enable</option>).
diff --git a/modules/system/boot/luksroot.nix b/modules/system/boot/luksroot.nix
index a514b08a6a8..8f48bba880b 100644
--- a/modules/system/boot/luksroot.nix
+++ b/modules/system/boot/luksroot.nix
@@ -84,7 +84,7 @@ in
         Make sure that initrd has the crypto modules needed for decryption.
       '';
 
-      type = types.list types.optionSet;
+      type = types.listOf types.optionSet;
 
       options = {
 
diff --git a/modules/tasks/filesystems.nix b/modules/tasks/filesystems.nix
index 52f8e9b6ddf..a95bb0673a2 100644
--- a/modules/tasks/filesystems.nix
+++ b/modules/tasks/filesystems.nix
@@ -118,14 +118,14 @@ in
     boot.supportedFilesystems = mkOption {
       default = [ ];
       example = [ "btrfs" ];
-      type = types.list types.string;
+      type = types.listOf types.string;
       description = "Names of supported filesystem types.";
     };
 
     boot.initrd.supportedFilesystems = mkOption {
       default = [ ];
       example = [ "btrfs" ];
-      type = types.list types.string;
+      type = types.listOf types.string;
       description = "Names of supported filesystem types in the initial ramdisk.";
     };
 
-- 
GitLab


From be698e93a41ba87816f61ddfebc55f2dba1cda71 Mon Sep 17 00:00:00 2001
From: Rickard Nilsson <rickynils@gmail.com>
Date: Thu, 28 Feb 2013 19:40:07 +0100
Subject: [PATCH 4478/5331] Merge hardware.pulseaudio and services.pulseaudio

More specifically, this removes services.pulseaudio and adds the option
hardware.pulseaudio.systemWide which defaults to false but can be used to turn
on the system-wide PulseAudio server (previously defined in
services.pulseaudio). Since the two PulseAudio modes are mutually exclusive
anyway (maybe not strictly true, but I don't think is a good idea combining
them) its nicer to be able to reuse server and ALSA configuration between them.

Also the system-wide PulseAudio service has been adjusted to systemd, and a few
things has been fixed (there was no alsa.conf before, for example).

The bottomline is that people that was using hardware.pulseaudio before should
be able to keep doing it in exactly the same way, and people that used
services.pulseaudio must switch over to hardware.pulseaudio.systemWide instead.
---
 modules/config/pulseaudio.nix         | 214 ++++++++++++++++----------
 modules/module-list.nix               |   1 -
 modules/services/audio/pulseaudio.nix |  87 -----------
 3 files changed, 135 insertions(+), 167 deletions(-)
 delete mode 100644 modules/services/audio/pulseaudio.nix

diff --git a/modules/config/pulseaudio.nix b/modules/config/pulseaudio.nix
index 5dffd9d3afb..1043cca2be7 100644
--- a/modules/config/pulseaudio.nix
+++ b/modules/config/pulseaudio.nix
@@ -1,92 +1,148 @@
 { config, pkgs, ... }:
 
 with pkgs.lib;
-
-let cfg = config.hardware.pulseaudio; in
-
-{
+with pkgs;
+
+let
+
+  cfg = config.hardware.pulseaudio;
+
+  uid = config.ids.uids.pulseaudio;
+  gid = config.ids.gids.pulseaudio;
+
+  pulseRuntimePath = "/var/run/pulse";
+
+  # Create pulse/client.conf even if PulseAudio is disabled so
+  # that we can disable the autospawn feature in programs that
+  # are built with PulseAudio support (like KDE).
+  clientConf = writeText "client.conf" ''
+    autospawn=${if (cfg.enable && !cfg.systemWide) then "yes" else "no"}
+    ${optionalString (cfg.enable && !cfg.systemWide)
+      "daemon-binary=${cfg.package}/bin/pulseaudio"}
+  '';
+
+  # Write an /etc/asound.conf that causes all ALSA applications to
+  # be re-routed to the PulseAudio server through ALSA's Pulse
+  # plugin.
+  alsaConf = writeText "asound.conf" ''
+    pcm_type.pulse {
+      lib ${alsaPlugins}/lib/alsa-lib/libasound_module_pcm_pulse.so
+    }
+    pcm.!default {
+      type pulse
+      hint.description "Default Audio Device (via PulseAudio)"
+    }
+    ctl_type.pulse {
+      lib ${alsaPlugins}/lib/alsa-lib/libasound_module_ctl_pulse.so
+    }
+    ctl.!default {
+      type pulse
+    }
+  '';
+
+in {
 
   options = {
 
-    hardware.pulseaudio.enable = mkOption {
-      default = false;
-      description = ''
-        Whether to enable the PulseAudio sound server.
-      '';
-    };
-
-    hardware.pulseaudio.package = mkOption {
-      default = pkgs.pulseaudio;
-      example = "pkgs.pulseaudio.override { jackaudioSupport = true; }";
-      description = ''
-        The PulseAudio derivation to use.  This can be used to enable
-        features (such as JACK support) that are not enabled in the
-        default PulseAudio in Nixpkgs.
-      '';
+    hardware.pulseaudio = {
+      enable = mkOption {
+        default = false;
+        description = ''
+          Whether to enable the PulseAudio sound server.
+        '';
+      };
+
+      systemWide = mkOption {
+        type = types.bool;
+        default = false;
+        description = ''
+          If false, a PulseAudio server is launched automatically for
+          each user that tries to use the sound system. The server runs
+          with user priviliges. This is the recommended and most secure
+          way to use PulseAudio. If true, one system-wide PulseAudio
+          server is launched on boot, running as the user "pulse".
+          Please read the PulseAudio documentation for more details.
+        '';
+      };
+
+      configFile = mkOption {
+        type = types.uniq types.path;
+        default = "${pulseaudio}/etc/pulse/default.pa";
+        description = ''
+          The path to the configuration the PulseAudio server
+          should use. By default, the "default.pa" configuration
+          from the PulseAudio distribution is used.
+        ''; 
+      };
+  
+      package = mkOption {
+        default = pulseaudio;
+        example = "pulseaudio.override { jackaudioSupport = true; }";
+        description = ''
+          The PulseAudio derivation to use.  This can be used to enable
+          features (such as JACK support) that are not enabled in the
+          default PulseAudio in Nixpkgs.
+        '';
+      };
     };
 
   };
 
 
-  config = mkMerge
-    [ # Create pulse/client.conf even if PulseAudio is disabled so
-      # that we can disable the autospawn feature in programs that
-      # are built with PulseAudio support (like KDE).
-      { environment.etc = singleton
-          { target = "pulse/client.conf";
-            source = pkgs.writeText "client.conf"
-              ''
-                autospawn=${if cfg.enable then "yes" else "no"}
-                ${optionalString cfg.enable ''
-                  daemon-binary=${cfg.package}/bin/pulseaudio
-                ''}
-              '';
-          };
-      }
-
-      (mkIf cfg.enable {
-
-        environment.systemPackages = [ cfg.package ];
-
-        environment.etc =
-          [ # Write an /etc/asound.conf that causes all ALSA applications to
-            # be re-routed to the PulseAudio server through ALSA's Pulse
-            # plugin.
-            { target = "asound.conf";
-              source = pkgs.writeText "asound.conf"
-                ''
-                  pcm_type.pulse {
-                    lib ${pkgs.alsaPlugins}/lib/alsa-lib/libasound_module_pcm_pulse.so
-                  }
-
-                  pcm.!default {
-                    type pulse
-                    hint.description "Default Audio Device (via PulseAudio)"
-                  }
-
-                  ctl_type.pulse {
-                    lib ${pkgs.alsaPlugins}/lib/alsa-lib/libasound_module_ctl_pulse.so
-                  }
-
-                  ctl.!default {
-                    type pulse
-                  }
-                '';
-            }
-
-            { target = "pulse/default.pa";
-              source = "${cfg.package}/etc/pulse/default.pa";
-            }
-
-            { target = "pulse/system.pa";
-              source = "${cfg.package}/etc/pulse/system.pa";
-            }
-          ];
-
-        # Allow PulseAudio to get realtime priority using rtkit.
-        security.rtkit.enable = true;
-
-      })
-    ];
+  config = mkMerge [
+    {
+      environment.etc = singleton {
+        target = "pulse/client.conf";
+        source = clientConf;
+      };
+    }
+
+    (mkIf cfg.enable {
+      environment.systemPackages = [ cfg.package ];
+
+      environment.etc = singleton {
+        target = "asound.conf";
+        source = alsaConf;
+      };
+
+      # Allow PulseAudio to get realtime priority using rtkit.
+      security.rtkit.enable = true;
+    })
+
+    (mkIf (cfg.enable && !cfg.systemWide) {
+      environment.etc = singleton {
+        target = "pulse/default.pa";
+        source = cfg.configFile;
+      };
+    })
+
+    (mkIf (cfg.enable && cfg.systemWide) {
+      users.extraUsers.pulse = {
+        # For some reason, PulseAudio wants UID == GID.
+        uid = assert uid == gid; uid;
+        group = "pulse";
+        extraGroups = [ "audio" ];
+        description = "PulseAudio system service user";
+        home = pulseRuntimePath;
+      };
+  
+      users.extraGroups.pulse.gid = gid;
+  
+      systemd.services.pulseaudio = {
+        description = "PulseAudio system-wide server";
+        wantedBy = [ "sound.target" ];
+        before = [ "sound.target" ];
+        path = [ pulseaudio ];
+        environment.PULSE_RUNTIME_PATH = pulseRuntimePath;
+        preStart = ''
+          mkdir -p --mode 755 ${pulseRuntimePath}
+          chown -R pulse:pulse ${pulseRuntimePath}
+        '';
+        script = ''
+          exec pulseaudio --system -n --file="${cfg.configFile}"
+        '';
+      };
+    })
+  ];
 
 }
diff --git a/modules/module-list.nix b/modules/module-list.nix
index a899baa6b28..76101dcb7c8 100644
--- a/modules/module-list.nix
+++ b/modules/module-list.nix
@@ -60,7 +60,6 @@
   ./services/audio/alsa.nix
   ./services/audio/fuppes.nix
   ./services/audio/mpd.nix
-  ./services/audio/pulseaudio.nix
   ./services/backup/mysql-backup.nix
   ./services/backup/postgresql-backup.nix
   ./services/backup/sitecopy-backup.nix
diff --git a/modules/services/audio/pulseaudio.nix b/modules/services/audio/pulseaudio.nix
deleted file mode 100644
index 04df2a8e867..00000000000
--- a/modules/services/audio/pulseaudio.nix
+++ /dev/null
@@ -1,87 +0,0 @@
-{ config, pkgs, ... }:
-
-with pkgs.lib;
-
-let
-
-  uid = config.ids.uids.pulseaudio;
-  gid = config.ids.gids.pulseaudio;
-
-in
-
-{
-
-  ###### interface
-
-  options = {
-
-    services.pulseaudio = {
-
-      enable = mkOption {
-        default = false;
-        description = ''
-          Whether to enable the PulseAudio system-wide audio server.
-          Note that the documentation recommends running PulseAudio
-          daemons per-user rather than system-wide on desktop machines.
-        '';
-      };
-
-      logLevel = mkOption {
-        default = "notice";
-        example = "debug";
-        description = ''
-          A string denoting the log level: one of
-          <literal>error</literal>, <literal>warn</literal>,
-          <literal>notice</literal>, <literal>info</literal>,
-          or <literal>debug</literal>.
-        '';
-      };
-
-    };
-
-  };
-
-
-  ###### implementation
-
-  config = mkIf config.services.pulseaudio.enable {
-
-    environment.systemPackages = [ pkgs.pulseaudio ];
-
-    users.extraUsers = singleton
-      { name = "pulse";
-        # For some reason, PulseAudio wants UID == GID.
-        uid = assert uid == gid; uid;
-        group = "pulse";
-        description = "PulseAudio system-wide daemon";
-        home = "/var/run/pulse";
-      };
-
-    users.extraGroups = singleton
-      { name = "pulse";
-        inherit gid;
-      };
-
-    jobs.pulseaudio =
-      { description = "PulseAudio system-wide server";
-
-        startOn = "startup";
-
-        preStart =
-          ''
-            test -d /var/run/pulse ||			\
-            ( mkdir -p --mode 755 /var/run/pulse &&	\
-              chown pulse:pulse /var/run/pulse )
-          '';
-
-        exec =
-          ''
-            ${pkgs.pulseaudio}/bin/pulseaudio           \
-              --system --daemonize                      \
-              --log-level="${config.services.pulseaudio.logLevel}"
-          '';
-      };
-
-  };
-
-}
-- 
GitLab


From 9a9b53aa9f3864211918d80b6c682e1df1bdd705 Mon Sep 17 00:00:00 2001
From: Rob Vermaas <rob.vermaas@gmail.com>
Date: Fri, 15 Mar 2013 12:55:49 +0100
Subject: [PATCH 4479/5331] Add module for rsyslog. Although rsyslog is
 supposed to be a drop-in replacement for sysklogd, it lacks some support for
 certain arguments used in the default syslog module of NixOS.

---
 modules/module-list.nix               |   1 +
 modules/services/logging/rsyslogd.nix | 105 ++++++++++++++++++++++++++
 2 files changed, 106 insertions(+)
 create mode 100644 modules/services/logging/rsyslogd.nix

diff --git a/modules/module-list.nix b/modules/module-list.nix
index 76101dcb7c8..f4cefaebce2 100644
--- a/modules/module-list.nix
+++ b/modules/module-list.nix
@@ -86,6 +86,7 @@
   ./services/logging/logrotate.nix
   ./services/logging/logstash.nix
   ./services/logging/syslogd.nix
+  ./services/logging/rsyslogd.nix
   ./services/mail/dovecot.nix
   ./services/mail/freepops.nix
   ./services/mail/mail.nix
diff --git a/modules/services/logging/rsyslogd.nix b/modules/services/logging/rsyslogd.nix
new file mode 100644
index 00000000000..550156a113e
--- /dev/null
+++ b/modules/services/logging/rsyslogd.nix
@@ -0,0 +1,105 @@
+{ config, pkgs, ... }:
+
+with pkgs.lib;
+
+let
+
+  cfg = config.services.rsyslogd;
+
+  syslogConf = pkgs.writeText "syslog.conf" ''
+    $ModLoad imuxsock
+    $SystemLogSocketName /run/systemd/journal/syslog
+
+    ${cfg.defaultConfig}
+    ${cfg.extraConfig}
+  '';
+
+  defaultConf = ''
+    # "local1" is used for dhcpd messages.
+    local1.*                     -/var/log/dhcpd
+
+    mail.*                       -/var/log/mail
+
+    *.=warning;*.=err            -/var/log/warn
+    *.crit                        /var/log/warn
+
+    *.*;mail.none;local1.none    -/var/log/messages
+  '';
+
+in
+
+{
+  ###### interface
+
+  options = {
+
+    services.rsyslogd = {
+
+      enable = mkOption {
+        type = types.bool;
+        default = false;
+        description = ''
+          Whether to enable syslogd.  Note that systemd also logs
+          syslog messages, so you normally don't need to run syslogd.
+        '';
+      };
+
+      defaultConfig = mkOption {
+        type = types.string;
+        default = defaultConf;
+        description = ''
+          The default <filename>syslog.conf</filename> file configures a
+          fairly standard setup of log files, which can be extended by
+          means of <varname>extraConfig</varname>.
+        '';
+      };
+
+      extraConfig = mkOption {
+        type = types.string;
+        default = "";
+        example = "news.* -/var/log/news";
+        description = ''
+          Additional text appended to <filename>syslog.conf</filename>,
+          i.e. the contents of <varname>defaultConfig</varname>.
+        '';
+      };
+
+      extraParams = mkOption {
+        type = types.listOf types.string;
+        default = [ ];
+        example = [ "-m 0" ];
+        description = ''
+          Additional parameters passed to <command>rsyslogd</command>.
+        '';
+      };
+
+    };
+
+  };
+
+
+  ###### implementation
+
+  config = mkIf cfg.enable {
+
+    environment.systemPackages = [ pkgs.rsyslog ];
+
+    systemd.services.syslog =
+      { description = "Syslog Daemon";
+
+        requires = [ "syslog.socket" ];
+
+        wantedBy = [ "multi-user.target" "syslog.target" ];
+
+        environment.TZ = config.time.timeZone;
+
+        serviceConfig =
+          { ExecStart = "${pkgs.rsyslog}/sbin/rsyslogd ${toString cfg.extraParams} -f ${syslogConf} -n";
+            # Prevent syslogd output looping back through journald.
+            StandardOutput = "null";
+          };
+      };
+
+  };
+
+}
-- 
GitLab


From ef28e8e70e963cc7b2b4a5ff350d9827971e2622 Mon Sep 17 00:00:00 2001
From: Rob Vermaas <rob.vermaas@gmail.com>
Date: Sun, 17 Mar 2013 21:36:25 +0100
Subject: [PATCH 4480/5331] Add WorkingDirectory default configuration value
 for rsyslog.

---
 modules/services/logging/rsyslogd.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/modules/services/logging/rsyslogd.nix b/modules/services/logging/rsyslogd.nix
index 550156a113e..7adc08d1a03 100644
--- a/modules/services/logging/rsyslogd.nix
+++ b/modules/services/logging/rsyslogd.nix
@@ -9,6 +9,7 @@ let
   syslogConf = pkgs.writeText "syslog.conf" ''
     $ModLoad imuxsock
     $SystemLogSocketName /run/systemd/journal/syslog
+    $WorkDirectory /var/spool/rsyslog
 
     ${cfg.defaultConfig}
     ${cfg.extraConfig}
@@ -95,6 +96,7 @@ in
 
         serviceConfig =
           { ExecStart = "${pkgs.rsyslog}/sbin/rsyslogd ${toString cfg.extraParams} -f ${syslogConf} -n";
+            ExecStartPre = "${pkgs.coreutils}/bin/mkdir -p /var/spool/rsyslog";
             # Prevent syslogd output looping back through journald.
             StandardOutput = "null";
           };
-- 
GitLab


From 960bb2bcd374090672c03e357eee861150d3994f Mon Sep 17 00:00:00 2001
From: Rob Vermaas <rob.vermaas@gmail.com>
Date: Wed, 20 Mar 2013 20:45:43 +0100
Subject: [PATCH 4481/5331] Fix nixos test driver startJob function. It was
 stopping the job before.

---
 lib/test-driver/Machine.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/test-driver/Machine.pm b/lib/test-driver/Machine.pm
index 1f7533f22f8..615fe09bdfc 100644
--- a/lib/test-driver/Machine.pm
+++ b/lib/test-driver/Machine.pm
@@ -398,7 +398,7 @@ sub waitForFile {
 
 sub startJob {
     my ($self, $jobName) = @_;
-    $self->execute("systemctl stop $jobName");
+    $self->execute("systemctl start $jobName");
     # FIXME: check result
 }
 
-- 
GitLab


From c5ba92414316ffe65c30a212f7af40f539bb7a53 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 21 Mar 2013 11:25:25 +0100
Subject: [PATCH 4482/5331] Revert "Add /run/nss to LD_LIBRARY_PATH".

Commit c948494342581e7c31880c1d3f2a3f9e618bc963 exports too many shared
objects into the LD_LIBRARY_PATH, which causes problems with mplayer.
---
 modules/config/nsswitch.nix                     | 1 -
 modules/programs/bash/profile.sh                | 2 +-
 modules/system/activation/activation-script.nix | 5 -----
 3 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/modules/config/nsswitch.nix b/modules/config/nsswitch.nix
index b9838945aa8..7e989c163e3 100644
--- a/modules/config/nsswitch.nix
+++ b/modules/config/nsswitch.nix
@@ -22,7 +22,6 @@ let
         {
           inherit list;
           path = makeLibraryPath list;
-          dir = pkgs.symlinkJoin "nss-modules" (map (p: "${p}/lib") list);
         };
     };
 
diff --git a/modules/programs/bash/profile.sh b/modules/programs/bash/profile.sh
index 83a2c6ffe9f..5393a88d5ff 100644
--- a/modules/programs/bash/profile.sh
+++ b/modules/programs/bash/profile.sh
@@ -13,7 +13,7 @@ export __ETC_PROFILE_DONE=1
 
 # Initialise a bunch of environment variables.
 export LOCALE_ARCHIVE=/run/current-system/sw/lib/locale/locale-archive
-export LD_LIBRARY_PATH=/run/nss:/run/opengl-driver/lib:/run/opengl-driver-32/lib # !!! only set if needed
+export LD_LIBRARY_PATH=/run/opengl-driver/lib:/run/opengl-driver-32/lib # !!! only set if needed
 export NIXPKGS_CONFIG=/etc/nix/nixpkgs-config.nix
 export NIX_PATH=/nix/var/nix/profiles/per-user/root/channels/nixos:nixpkgs=/etc/nixos/nixpkgs:nixos=/etc/nixos/nixos:nixos-config=/etc/nixos/configuration.nix:services=/etc/nixos/services
 export PAGER="less -R"
diff --git a/modules/system/activation/activation-script.nix b/modules/system/activation/activation-script.nix
index e4bc84b49c0..dc017563217 100644
--- a/modules/system/activation/activation-script.nix
+++ b/modules/system/activation/activation-script.nix
@@ -150,11 +150,6 @@ in
         ${pkgs.utillinux}/bin/mount -o "remount,size=${config.boot.runSize}" none /run
       '';
 
-    system.activationScripts.nss =
-      ''
-        ln -sfn ${config.system.nssModules.dir} /run/nss
-      '';
-
   };
 
 }
-- 
GitLab


From b8a1ccd16acb815e1d90ed9e013e41bcc98735c2 Mon Sep 17 00:00:00 2001
From: Domen Kozar <domen@dev.si>
Date: Fri, 15 Mar 2013 16:10:21 +0100
Subject: [PATCH 4483/5331] Add bacula service

---
 modules/module-list.nix            |   1 +
 modules/services/backup/bacula.nix | 392 +++++++++++++++++++++++++++++
 2 files changed, 393 insertions(+)
 create mode 100644 modules/services/backup/bacula.nix

diff --git a/modules/module-list.nix b/modules/module-list.nix
index f4cefaebce2..abd12ab9261 100644
--- a/modules/module-list.nix
+++ b/modules/module-list.nix
@@ -60,6 +60,7 @@
   ./services/audio/alsa.nix
   ./services/audio/fuppes.nix
   ./services/audio/mpd.nix
+  ./services/backup/bacula.nix
   ./services/backup/mysql-backup.nix
   ./services/backup/postgresql-backup.nix
   ./services/backup/sitecopy-backup.nix
diff --git a/modules/services/backup/bacula.nix b/modules/services/backup/bacula.nix
new file mode 100644
index 00000000000..05192f797fc
--- /dev/null
+++ b/modules/services/backup/bacula.nix
@@ -0,0 +1,392 @@
+{ config, pkgs, ... }:
+
+# TODO: test configuration when building nixexpr (use -t parameter)
+# TODO: support sqlite3 (it's deprecate?) and mysql
+
+with pkgs.lib;
+
+let
+  libDir = "/var/lib/bacula";
+  fd_cfg = config.services.bacula-fd;
+  fd_conf = pkgs.writeText "bacula-fd.conf"
+    ''
+      Client {
+        Name = "${fd_cfg.name}";
+        FDPort = ${toString fd_cfg.port};
+        WorkingDirectory = "${libDir}";
+        Pid Directory = "/var/run";
+        ${fd_cfg.extraClientConfig}
+      }
+     
+      ${concatStringsSep "\n" (mapAttrsToList (name: value: ''
+      Director {
+        Name = "${name}";
+        Password = "${value.password}";
+        Monitor = "${value.monitor}";
+      }
+      '') fd_cfg.director)}
+     
+      Messages {
+        Name = Standard;
+        syslog = all, !skipped, !restored
+        ${fd_cfg.extraMessagesConfig}
+      }
+    '';
+
+  sd_cfg = config.services.bacula-sd;
+  sd_conf = pkgs.writeText "bacula-sd.conf" 
+    ''
+      Storage {
+        Name = "${sd_cfg.name}";
+        SDPort = ${toString sd_cfg.port};
+        WorkingDirectory = "${libDir}";
+        Pid Directory = "/var/run";
+        ${sd_cfg.extraStorageConfig}
+      }
+ 
+      ${concatStringsSep "\n" (mapAttrsToList (name: value: ''
+      Device {
+        Name = "${name}";
+        Archive Device = "${value.archiveDevice}";
+        Media Type = "${value.mediaType}";
+        ${value.extraDeviceConfig}
+      }
+      '') sd_cfg.device)}
+
+      ${concatStringsSep "\n" (mapAttrsToList (name: value: ''
+      Director {
+        Name = "${name}";
+        Password = "${value.password}";
+        Monitor = "${value.monitor}";
+      }
+      '') sd_cfg.director)}
+
+      Messages {
+        Name = Standard;
+        syslog = all, !skipped, !restored
+        ${sd_cfg.extraMessagesConfig}
+      }
+    '';
+
+  dir_cfg = config.services.bacula-dir;
+  dir_conf = pkgs.writeText "bacula-dir.conf" 
+    ''
+    Director {
+      Name = "${dir_cfg.name}";
+      Password = "${dir_cfg.password}";
+      DirPort = ${toString dir_cfg.port};
+      Working Directory = "${libDir}";
+      Pid Directory = "/var/run/";
+      QueryFile = "${pkgs.bacula}/etc/query.sql";
+      ${dir_cfg.extraDirectorConfig}
+    }
+
+    Catalog {
+      Name = "PostgreSQL";
+      dbname = "bacula";
+      user = "bacula";
+    }
+
+    Messages {
+      Name = Standard;
+      syslog = all, !skipped, !restored
+      ${dir_cfg.extraMessagesConfig}
+    }
+
+    ${dir_cfg.extraConfig}
+    '';
+
+  directorOptions = {name, config, ...}:
+  {
+    options = {
+      password = mkOption {
+        # TODO: required?
+        description = ''
+           Specifies the password that must be supplied for a Director to b
+        '';
+      };
+      
+      monitor = mkOption {
+        default = "no";
+        example = "yes";
+        description = ''
+           If Monitor is set to no (default), this director will have full 
+        '';
+      };
+    };
+  };
+
+  deviceOptions = {name, config, ...}:
+  {
+    options = {
+      archiveDevice = mkOption {
+        # TODO: required?
+        description = ''
+          The specified name-string gives the system file name of the storage device managed by this storage daemon. This will usually be the device file name of a removable storage device (tape drive), for example " /dev/nst0" or "/dev/rmt/0mbn". For a DVD-writer, it will be for example /dev/hdc. It may also be a directory name if you are archiving to disk storage.
+        '';
+      };
+
+      mediaType = mkOption {
+        # TODO: required?
+        description = ''
+          The specified name-string names the type of media supported by this device, for example, "DLT7000". Media type names are arbitrary in that you set them to anything you want, but they must be known to the volume database to keep track of which storage daemons can read which volumes. In general, each different storage type should have a unique Media Type associated with it. The same name-string must appear in the appropriate Storage resource definition in the Director's configuration file.
+        '';
+      };
+
+      extraDeviceConfig = mkOption {
+        default = "";
+        description = ''
+          Extra configuration to be passed in Device directive.
+        '';
+        example = ''
+          LabelMedia = yes
+          Random Access = no
+          AutomaticMount = no
+          RemovableMedia = no
+          MaximumOpenWait = 60
+          AlwaysOpen = no
+        '';
+      };
+    };
+  };
+
+in {
+  options = {
+    services.bacula-fd = {
+      enable = mkOption {
+        type = types.bool;
+        default = false;
+        description = ''
+          Whether to enable Bacula File Daemon.
+        '';
+      };
+ 
+      name = mkOption {
+        default = "${config.networking.hostName}-fd";
+        description = ''
+        	The client name that must be used by the Director when connecting. Generally, it is a good idea to use a name related to the machine so that error messages can be easily identified if you have multiple Clients. This directive is required.
+        '';
+      };
+ 
+      port = mkOption {
+        default = 9102;
+        type = types.uniq types.int;
+        description = ''
+        	This specifies the port number on which the Client listens for Director connections. It must agree with the FDPort specified in the Client resource of the Director's configuration file. The default is 9102.
+        '';
+      };
+ 
+      director = mkOption {
+        default = {};
+        description = ''
+          This option defines director resources in Bacula File Daemon.
+        '';
+        type = types.attrsOf types.optionSet;
+        options = [ directorOptions ];
+      };
+
+      extraClientConfig = mkOption {
+        default = "";
+        description = ''
+          Extra configuration to be passed in Client directive.
+        '';
+        example = ''
+          Maximum Concurrent Jobs = 20;
+          Heartbeat Interval = 30;
+        '';
+      };
+
+      extraMessagesConfig = mkOption {
+        default = "";
+        description = ''
+          Extra configuration to be passed in Messages directive.
+        '';
+        example = ''
+          console = all
+        '';
+      };
+    };
+
+    services.bacula-sd = {
+      enable = mkOption {
+        type = types.bool;
+        default = false;
+        description = ''
+          Whether to enable Bacula Storage Daemon.
+        '';
+      };
+ 
+      name = mkOption {
+        default = "${config.networking.hostName}-sd";
+        description = ''
+          Specifies the Name of the Storage daemon.
+        '';
+      };
+ 
+      port = mkOption {
+        default = 9103;
+        type = types.uniq types.int;
+        description = ''
+          Specifies port number on which the Storage daemon listens for Director connections. The default is 9103.
+        '';
+      };
+
+      director = mkOption {
+        default = {};
+        description = ''
+          This option defines Director resources in Bacula Storage Daemon.
+        '';
+        type = types.attrsOf types.optionSet;
+        options = [ directorOptions ];
+      };
+
+      device = mkOption {
+        default = {};
+        description = ''
+          This option defines Device resources in Bacula Storage Daemon.
+        '';
+        type = types.attrsOf types.optionSet;
+        options = [ deviceOptions ];
+      };
+ 
+      extraStorageConfig = mkOption {
+        default = "";
+        description = ''
+          Extra configuration to be passed in Storage directive.
+        '';
+        example = ''
+          Maximum Concurrent Jobs = 20;
+          Heartbeat Interval = 30;
+        '';
+      };
+
+      extraMessagesConfig = mkOption {
+        default = "";
+        description = ''
+          Extra configuration to be passed in Messages directive.
+        '';
+        example = ''
+          console = all
+        '';
+      };
+ 
+    };
+
+    services.bacula-dir = {
+      enable = mkOption {
+        type = types.bool;
+        default = false;
+        description = ''
+          Whether to enable Bacula Director Daemon.
+        '';
+      };
+
+      name = mkOption {
+        default = "${config.networking.hostName}-dir";
+        description = ''
+          The director name used by the system administrator. This directive is required.
+        '';
+      };
+ 
+      port = mkOption {
+        default = 9101;
+        type = types.uniq types.int;
+        description = ''
+          Specify the port (a positive integer) on which the Director daemon will listen for Bacula Console connections. This same port number must be specified in the Director resource of the Console configuration file. The default is 9101, so normally this directive need not be specified. This directive should not be used if you specify DirAddresses (N.B plural) directive.
+        '';
+      };
+ 
+      password = mkOption {
+        # TODO: required?
+        description = ''
+           Specifies the password that must be supplied for a Director.
+        '';
+      };
+
+      extraMessagesConfig = mkOption {
+        default = "";
+        description = ''
+          Extra configuration to be passed in Messages directive.
+        '';
+        example = ''
+          console = all
+        '';
+      };
+
+      extraDirectorConfig = mkOption {
+        default = "";
+        description = ''
+          Extra configuration to be passed in Director directive.
+        '';
+        example = ''
+          Maximum Concurrent Jobs = 20;
+          Heartbeat Interval = 30;
+        '';
+      };
+
+      extraConfig = mkOption {
+        default = "";
+        description = ''
+          Extra configuration for Bacula Director Daemon.
+        '';
+        example = ''
+          TODO
+        '';
+      };
+    };
+  };
+
+  config = mkIf (fd_cfg.enable || sd_cfg.enable || dir_cfg.enable) {
+    systemd.services.bacula-fd = mkIf fd_cfg.enable {
+      after = [ "network.target" ];
+      description = "Bacula File Daemon";
+      wantedBy = [ "multi-user.target" ];
+      path = [ pkgs.bacula ];
+      serviceConfig.ExecStart = "${pkgs.bacula}/sbin/bacula-fd -f -u bacula -g bacula -c ${fd_conf}";
+    };
+
+    systemd.services.bacula-sd = mkIf sd_cfg.enable {
+      after = [ "network.target" ];
+      description = "Bacula Storage Daemon";
+      wantedBy = [ "multi-user.target" ];
+      path = [ pkgs.bacula ];
+      serviceConfig.ExecStart = "${pkgs.bacula}/sbin/bacula-sd -f -u bacula -g bacula -c ${sd_conf}";
+    };
+
+    services.postgresql.enable = dir_cfg.enable == true;
+
+    systemd.services.bacula-dir = mkIf dir_cfg.enable {
+      after = [ "network.target" "postgresql.service" ];
+      description = "Bacula Director Daemon";
+      wantedBy = [ "multi-user.target" ];
+      path = [ pkgs.bacula ];
+      serviceConfig.ExecStart = "${pkgs.bacula}/sbin/bacula-dir -f -u bacula -g bacula -c ${dir_conf}";
+      preStart = ''
+        if ! test -e "${libDir}/db-created"; then
+            ${pkgs.postgresql}/bin/createuser --no-superuser --no-createdb --no-createrole bacula
+            #${pkgs.postgresql}/bin/createdb --owner bacula bacula
+
+            # populate DB
+            ${pkgs.bacula}/etc/create_bacula_database postgresql
+            ${pkgs.bacula}/etc/make_bacula_tables postgresql
+            ${pkgs.bacula}/etc/grant_bacula_privileges postgresql
+            touch "${libDir}/db-created"
+        else
+            ${pkgs.bacula}/etc/update_bacula_tables postgresql || true
+        fi
+      '';
+    };
+
+    environment.systemPackages = [ pkgs.bacula ];
+
+    users.extraUsers.bacula = {
+      group = "bacula";
+      home = "${libDir}";
+      createHome = true;
+      description = "Bacula Daemons user";
+      shell = "${pkgs.bash}/bin/bash";
+    };
+
+    users.extraGroups.bacula = {};
+  };
+}
-- 
GitLab


From bfc290421dfdc9f2291d07e49ad1a466eb0b7daa Mon Sep 17 00:00:00 2001
From: Marc Weber <marco-oweber@gmx.de>
Date: Sun, 24 Mar 2013 18:31:31 +0100
Subject: [PATCH 4484/5331] When enabling wacom put xsetwacom in PATH.

I know that gnome/kde may have their own way to configure wacom tablets
---
 modules/services/x11/hardware/wacom.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/modules/services/x11/hardware/wacom.nix b/modules/services/x11/hardware/wacom.nix
index 1ea928d9c76..32e29e9b388 100644
--- a/modules/services/x11/hardware/wacom.nix
+++ b/modules/services/x11/hardware/wacom.nix
@@ -60,6 +60,8 @@ in
 
   config = mkIf cfg.enable {
 
+    environment.systemPackages = [ pkgs.xf86_input_wacom ]; # provides xsetwacom
+
     services.xserver.modules = [ pkgs.xf86_input_wacom ];
 
     services.udev.packages = [ pkgs.xf86_input_wacom ];
-- 
GitLab


From 2936e44956e3cc645ac62d80aadfe596c5e449cf Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sun, 24 Mar 2013 22:07:27 +0100
Subject: [PATCH 4485/5331] Manual: xserver -> display-manager

---
 doc/manual/installation.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/manual/installation.xml b/doc/manual/installation.xml
index 1c00dd37d33..b040b4ff164 100644
--- a/doc/manual/installation.xml
+++ b/doc/manual/installation.xml
@@ -48,7 +48,7 @@ Wiki</link>.</para>
   password.</para></listitem>
 
   <listitem><para>If you downloaded the graphical ISO image, you can
-  run <command>start xserver</command> to start KDE.</para></listitem>
+  run <command>start display-manager</command> to start KDE.</para></listitem>
 
   <listitem><para>The NixOS installer doesn’t do any partitioning or
   formatting yet, so you need to that yourself.  Use the following
-- 
GitLab


From cc6bd6d7bb9ede7c453229eb16e2612c1c96ff53 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sun, 24 Mar 2013 22:07:40 +0100
Subject: [PATCH 4486/5331] Fix evaluation if driSupport32Bit is enabled on
 NVIDIA

---
 modules/services/x11/xserver.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/services/x11/xserver.nix b/modules/services/x11/xserver.nix
index 9f0980a4c72..d83d18fe933 100644
--- a/modules/services/x11/xserver.nix
+++ b/modules/services/x11/xserver.nix
@@ -487,7 +487,7 @@ in
                 ''
                   ln -sf ${kernelPackages.nvidia_x11} /run/opengl-driver
                   ${optionalString (pkgs.stdenv.system == "x86_64-linux" && cfg.driSupport32Bit)
-                    "ln -sf ${pkgs_i686.linuxPackages.nvidia_x11.override { libsOnly = true; kernel = null; } } /run/opengl-driver-32"}
+                    "ln -sf ${pkgs_i686.linuxPackages.nvidia_x11.override { libsOnly = true; kernelDev = null; } } /run/opengl-driver-32"}
                 ''
               else if elem "nvidiaLegacy96" driverNames then
                 "ln -sf ${kernelPackages.nvidia_x11_legacy96} /run/opengl-driver"
-- 
GitLab


From b5e2ff4bed63ef48f0f6ea9844b03bd63724e63e Mon Sep 17 00:00:00 2001
From: Mathijs Kwik <mathijs@bluescreen303.nl>
Date: Fri, 22 Mar 2013 21:11:15 +0100
Subject: [PATCH 4487/5331] mongodb: v8 is the default javascript engine now

---
 modules/services/databases/mongodb.nix | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/modules/services/databases/mongodb.nix b/modules/services/databases/mongodb.nix
index bdae728c646..d6299415893 100644
--- a/modules/services/databases/mongodb.nix
+++ b/modules/services/databases/mongodb.nix
@@ -38,7 +38,7 @@ in
       };
 
       package = mkOption {
-        default = pkgs.mongodb.override { useV8 = cfg.useV8; };
+        default = pkgs.mongodb;
         description = "
           Which MongoDB derivation to use.
         ";
@@ -74,11 +74,6 @@ in
         description = "Append logfile instead over overwriting";
       };
 
-      useV8 = mkOption {
-        default = false;
-        description = "Use V8 instead of spidermonkey for js execution";
-      };
-
       replSetName = mkOption {
         default = "";
         description = ''
-- 
GitLab


From 1568b6858d75793279d5bf3565345a33fb95a973 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 25 Mar 2013 14:14:55 +0100
Subject: [PATCH 4488/5331] Use programs.sqlite from the NixOS channel

---
 modules/programs/bash/command-not-found.nix | 2 +-
 modules/programs/bash/command-not-found.pl  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/programs/bash/command-not-found.nix b/modules/programs/bash/command-not-found.nix
index 1aecd9051e5..4eb11d3a172 100644
--- a/modules/programs/bash/command-not-found.nix
+++ b/modules/programs/bash/command-not-found.nix
@@ -28,7 +28,7 @@ in
       # This function is called whenever a command is not found.
       command_not_found_handle() {
         local p=/run/current-system/sw/bin/command-not-found
-        if [ -x $p -a -f /var/lib/nixos/programs.sqlite ]; then
+        if [ -x $p -a -f /nix/var/nix/profiles/per-user/root/channels/nixos/programs.sqlite ]; then
           # Run the helper program.
           $p "$1"
           # Retry the command if we just installed it.
diff --git a/modules/programs/bash/command-not-found.pl b/modules/programs/bash/command-not-found.pl
index b497b05d33e..916649059d3 100644
--- a/modules/programs/bash/command-not-found.pl
+++ b/modules/programs/bash/command-not-found.pl
@@ -7,7 +7,7 @@ use Config;
 
 my $program = $ARGV[0];
 
-my $dbPath = "/var/lib/nixos/programs.sqlite";
+my $dbPath = "/nix/var/nix/profiles/per-user/root/channels/nixos/programs.sqlite";
 
 my $dbh = DBI->connect("dbi:SQLite:dbname=$dbPath", "", "")
     or die "cannot open database `$dbPath'";
-- 
GitLab


From 8881d1a920aa92b095086fe89b645c9d1f5490be Mon Sep 17 00:00:00 2001
From: Lluis Batlle <viriketo@gmail.com>
Date: Mon, 25 Mar 2013 21:56:41 +0100
Subject: [PATCH 4489/5331] Fixing the system tarball for the sheevaplug

---
 modules/installer/cd-dvd/system-tarball-sheevaplug.nix | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/modules/installer/cd-dvd/system-tarball-sheevaplug.nix b/modules/installer/cd-dvd/system-tarball-sheevaplug.nix
index 52df5a56ee7..06a02333062 100644
--- a/modules/installer/cd-dvd/system-tarball-sheevaplug.nix
+++ b/modules/installer/cd-dvd/system-tarball-sheevaplug.nix
@@ -42,7 +42,6 @@ in
   require =
     [
       ./system-tarball.nix
-      ../../hardware/network/rt73.nix
     ];
 
   # Disable some other stuff we don't need.
@@ -87,7 +86,6 @@ in
       pkgs.bvi # binary editor
       pkgs.joe
     ];
-*/
 
   boot.loader.grub.enable = false;
   boot.loader.generationsDir.enable = false;
@@ -134,8 +132,6 @@ in
   ];
 
   services.mingetty = {
-    ttys = [ "ttyS0" ];
-
     # Some more help text.
     helpLine = ''
       Log in as "root" with an empty password.  ${
@@ -177,6 +173,9 @@ in
   services.ttyBackgrounds.enable = false;
   jobs.openssh.startOn = pkgs.lib.mkOverrideTemplate 50 {} "";
 
+  # cpufrequtils fails to build on non-pc
+  powerManagement.enable = false;
+
   nixpkgs.config = {
     platform = pkgs.platforms.sheevaplug;
   };
-- 
GitLab


From 1b0acab1e50048d431644a68ee5c66aaac47d810 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 26 Mar 2013 13:13:52 +0100
Subject: [PATCH 4490/5331] Only include Linux builds in the NixOS channel

---
 release-combined.nix | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/release-combined.nix b/release-combined.nix
index c7eaeac5d17..004dd1b250a 100644
--- a/release-combined.nix
+++ b/release-combined.nix
@@ -1,4 +1,11 @@
+{ nixpkgs, officialRelease }:
+
 {
   nixos = import ./release.nix;
-  nixpkgs = import <nixpkgs/pkgs/top-level/release.nix>;
+  nixpkgs =
+    import <nixpkgs/pkgs/top-level/release.nix> {
+      inherit nixpkgs officialRelease;
+      # Only do Linux builds.
+      supportedSystems = [ "x86_64-linux" "i686-linux" ];
+    };
 }
-- 
GitLab


From f235cc2884e282cf1cfb49d9b2ce1f493c850c50 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 26 Mar 2013 14:00:31 +0100
Subject: [PATCH 4491/5331] Add an aggregated to replace the "tested" NixOS
 view

Also get rid of the "system" jobset input.
---
 release-combined.nix |  58 ++++++--
 release.nix          | 307 +++++++++++++++++++++----------------------
 2 files changed, 199 insertions(+), 166 deletions(-)

diff --git a/release-combined.nix b/release-combined.nix
index 004dd1b250a..b26a2184ddb 100644
--- a/release-combined.nix
+++ b/release-combined.nix
@@ -1,11 +1,49 @@
-{ nixpkgs, officialRelease }:
-
-{
-  nixos = import ./release.nix;
-  nixpkgs =
-    import <nixpkgs/pkgs/top-level/release.nix> {
-      inherit nixpkgs officialRelease;
-      # Only do Linux builds.
-      supportedSystems = [ "x86_64-linux" "i686-linux" ];
-    };
+{ nixosSrc ? { outPath = ./.; revCount = 1234; shortRev = "abcdefg"; }
+, nixpkgsSrc ? { outPath = <nixpkgs>; revCount = 5678; shortRev = "gfedcba"; }
+, officialRelease ? false
+}:
+
+rec {
+
+  nixos = import ./release.nix {
+    inherit nixosSrc nixpkgsSrc officialRelease;
+  };
+
+  nixpkgs = import <nixpkgs/pkgs/top-level/release.nix> {
+    inherit officialRelease;
+    nixpkgs = nixpkgsSrc;
+    # Only do Linux builds.
+    supportedSystems = [ "x86_64-linux" "i686-linux" ];
+  };
+
+  tested = (import <nixpkgs> { }).releaseTools.aggregate {
+    name = "nixos-${nixos.tarball.version}";
+    meta.description = "Release-critical builds for the NixOS unstable channel";
+    members =
+      [ nixos.channel
+        nixos.manual
+
+        nixos.iso_minimal.x86_64-linux
+        nixos.iso_minimal.i686-linux
+        nixos.iso_graphical.x86_64-linux
+        nixos.iso_graphical.i686-linux
+
+        nixos.tests.firefox.x86_64-linux
+        nixos.tests.firewall.x86_64-linux
+        nixos.tests.installer.lvm.x86_64-linux
+        nixos.tests.installer.separateBoot.x86_64-linux
+        nixos.tests.installer.simple.i686-linux
+        nixos.tests.installer.simple.x86_64-linux
+        nixos.tests.kde4.i686-linux
+        nixos.tests.login.i686-linux
+        nixos.tests.login.x86_64-linux
+        nixos.tests.misc.i686-linux
+        nixos.tests.misc.x86_64-linux
+
+        nixpkgs.tarball
+        nixpkgs.emacs.i686-linux
+        nixpkgs.emacs.x86_64-linux
+      ];
+  };
+
 }
diff --git a/release.nix b/release.nix
index 8c8851af51e..c8f144b74b2 100644
--- a/release.nix
+++ b/release.nix
@@ -1,21 +1,22 @@
-{ nixosSrc ? {outPath = ./.; revCount = 1234; shortRev = "abcdefg"; }
-, nixpkgs ? {outPath = <nixpkgs>; revCount = 5678; shortRev = "gfedcba"; }
-#, minimal ? false
+{ nixosSrc ? { outPath = ./.; revCount = 1234; shortRev = "abcdefg"; }
+, nixpkgsSrc ? { outPath = <nixpkgs>; revCount = 5678; shortRev = "gfedcba"; }
+, officialRelease ? false
 }:
 
 let
 
   version = builtins.readFile ./.version;
-  versionSuffix = "pre${toString nixosSrc.revCount}_${nixosSrc.shortRev}-${nixpkgs.shortRev}";
+  versionSuffix = "pre${toString nixosSrc.revCount}_${nixosSrc.shortRev}-${nixpkgsSrc.shortRev}";
+
+  systems = [ "x86_64-linux" "i686-linux" ];
+
+  pkgs = import <nixpkgs> { system = "x86_64-linux"; };
 
 
   makeIso =
-    { module, type, description ? type, maintainers ? ["eelco"] }:
-    { officialRelease ? false
-    , system ? builtins.currentSystem
-    }:
+    { module, type, description ? type, maintainers ? ["eelco"], system }:
 
-    with import <nixpkgs> {inherit system;};
+    with import <nixpkgs> { inherit system; };
 
     let
 
@@ -48,12 +49,10 @@ let
 
 
   makeSystemTarball =
-    { module, maintainers ? ["viric"]}:
-    { officialRelease ? false
-    , system ? builtins.currentSystem
-    }:
+    { module, maintainers ? ["viric"], system }:
+
+    with import <nixpkgs> { inherit system; };
 
-    with import <nixpkgs> {inherit system;};
     let
       versionModule = { system.nixosVersionSuffix = lib.optionalString (!officialRelease) versionSuffix; };
 
@@ -73,165 +72,161 @@ let
         };
 
 
-  jobs = rec {
-
-
-    tarball =
-      { officialRelease ? false }:
+in {
 
-      with import <nixpkgs> {};
-
-      releaseTools.makeSourceTarball {
-        name = "nixos-tarball";
-
-        src = nixosSrc;
-
-        inherit officialRelease version;
-        versionSuffix = lib.optionalString (!officialRelease) versionSuffix;
-
-        distPhase = ''
-          echo -n $VERSION_SUFFIX > .version-suffix
-          releaseName=nixos-$VERSION$VERSION_SUFFIX
-          ensureDir "$out/tarballs"
-          mkdir ../$releaseName
-          cp -prd . ../$releaseName
-          cd ..
-          chmod -R u+w $releaseName
-          tar cfvj $out/tarballs/$releaseName.tar.bz2 $releaseName
-        ''; # */
-      };
+  tarball =
+    pkgs.releaseTools.makeSourceTarball {
+      name = "nixos-tarball";
 
+      src = nixosSrc;
 
-    channel =
-      { officialRelease ? false }:
+      inherit officialRelease version;
+      versionSuffix = pkgs.lib.optionalString (!officialRelease) versionSuffix;
 
-      with import <nixpkgs> {};
-
-      releaseTools.makeSourceTarball {
-        name = "nixos-channel";
-
-        src = nixosSrc;
-
-        inherit officialRelease version;
-        versionSuffix = lib.optionalString (!officialRelease) versionSuffix;
+      distPhase = ''
+        echo -n $VERSION_SUFFIX > .version-suffix
+        releaseName=nixos-$VERSION$VERSION_SUFFIX
+        ensureDir "$out/tarballs"
+        mkdir ../$releaseName
+        cp -prd . ../$releaseName
+        cd ..
+        chmod -R u+w $releaseName
+        tar cfvj $out/tarballs/$releaseName.tar.bz2 $releaseName
+      ''; # */
+    };
 
-        buildInputs = [ nixUnstable ];
 
-        expr = builtins.readFile lib/channel-expr.nix;
+  channel =
+    pkgs.releaseTools.makeSourceTarball {
+      name = "nixos-channel";
 
-        distPhase = ''
-          echo -n $VERSION_SUFFIX > .version-suffix
-          releaseName=nixos-$VERSION$VERSION_SUFFIX
-          ensureDir "$out/tarballs"
-          mkdir ../$releaseName
-          cp -prd . ../$releaseName/nixos
-          cp -prd ${nixpkgs} ../$releaseName/nixpkgs
-          echo "$expr" > ../$releaseName/default.nix
-          NIX_STATE_DIR=$TMPDIR nix-env -f ../$releaseName/default.nix -qaP --meta --xml \* > /dev/null
-          cd ..
-          chmod -R u+w $releaseName
-          tar cfJ $out/tarballs/$releaseName.tar.xz $releaseName
-        ''; # */
-      };
+      src = nixosSrc;
 
+      inherit officialRelease version;
+      versionSuffix = pkgs.lib.optionalString (!officialRelease) versionSuffix;
 
-    manual =
-      { officialRelease ? false }:
+      buildInputs = [ pkgs.nixUnstable ];
 
-      (import "${nixosSrc}/doc/manual" {
-        pkgs = import <nixpkgs> {};
-        options =
-          (import lib/eval-config.nix {
-            modules = [
-              { fileSystems = [];
-                boot.loader.grub.device = "/dev/sda";
-              } ];
-          }).options;
-        revision = toString nixosSrc.rev;
-      }).manual;
+      expr = builtins.readFile lib/channel-expr.nix;
 
-
-    iso_minimal = makeIso {
-      module = ./modules/installer/cd-dvd/installation-cd-minimal.nix;
-      type = "minimal";
+      distPhase = ''
+        echo -n $VERSION_SUFFIX > .version-suffix
+        releaseName=nixos-$VERSION$VERSION_SUFFIX
+        ensureDir "$out/tarballs"
+        mkdir ../$releaseName
+        cp -prd . ../$releaseName/nixos
+        cp -prd ${nixpkgsSrc} ../$releaseName/nixpkgs
+        echo "$expr" > ../$releaseName/default.nix
+        NIX_STATE_DIR=$TMPDIR nix-env -f ../$releaseName/default.nix -qaP --meta --xml \* > /dev/null
+        cd ..
+        chmod -R u+w $releaseName
+        tar cfJ $out/tarballs/$releaseName.tar.xz $releaseName
+      ''; # */
     };
 
-    iso_graphical = makeIso {
-      module = ./modules/installer/cd-dvd/installation-cd-graphical.nix;
-      type = "graphical";
-    };
 
-    # A variant with a more recent (but possibly less stable) kernel
-    # that might support more hardware.
-    iso_new_kernel = makeIso {
-      module = ./modules/installer/cd-dvd/installation-cd-new-kernel.nix;
-      type = "new-kernel";
+  manual =
+    (import "${nixosSrc}/doc/manual" {
+      inherit pkgs;
+      options =
+        (import lib/eval-config.nix {
+          modules = [
+            { fileSystems = [];
+              boot.loader.grub.device = "/dev/sda";
+            } ];
+        }).options;
+      revision = toString (nixosSrc.rev or nixosSrc.shortRev);
+    }).manual;
+
+
+  iso_minimal = pkgs.lib.genAttrs systems (system: makeIso {
+    module = ./modules/installer/cd-dvd/installation-cd-minimal.nix;
+    type = "minimal";
+    inherit system;
+  });
+
+  iso_graphical = pkgs.lib.genAttrs systems (system: makeIso {
+    module = ./modules/installer/cd-dvd/installation-cd-graphical.nix;
+    type = "graphical";
+    inherit system;
+  });
+
+  # A variant with a more recent (but possibly less stable) kernel
+  # that might support more hardware.
+  iso_new_kernel = pkgs.lib.genAttrs systems (system: makeIso {
+    module = ./modules/installer/cd-dvd/installation-cd-new-kernel.nix;
+    type = "new-kernel";
+    inherit system;
+  });
+
+  # A variant with efi booting support. Once cd-minimal has a newer kernel,
+  # this should be enabled by default.
+  iso_efi = pkgs.lib.genAttrs systems (system: makeIso {
+    module = ./modules/installer/cd-dvd/installation-cd-efi.nix;
+    type = "efi";
+    maintainers = [ "shlevy" ];
+    inherit system;
+  });
+
+
+  # Provide a tarball that can be unpacked into an SD card, and easily
+  # boot that system from uboot (like for the sheevaplug).
+  # The pc variant helps preparing the expression for the system tarball
+  # in a machine faster than the sheevpalug
+  system_tarball_pc = pkgs.lib.genAttrs systems (system: makeSystemTarball {
+    module = ./modules/installer/cd-dvd/system-tarball-pc.nix;
+    inherit system;
+  });
+
+  /*
+  system_tarball_fuloong2f =
+    assert builtins.currentSystem == "mips64-linux";
+    makeSystemTarball {
+      module = ./modules/installer/cd-dvd/system-tarball-fuloong2f.nix;
+      system = "mips64-linux";
     };
 
-    # A variant with efi booting support. Once cd-minimal has a newer kernel,
-    # this should be enabled by default.
-    iso_efi = makeIso {
-      module = ./modules/installer/cd-dvd/installation-cd-efi.nix;
-      type = "efi";
-      maintainers = [ "shlevy" ];
+  system_tarball_sheevaplug =
+    assert builtins.currentSystem == "armv5tel-linux";
+    makeSystemTarball {
+      module = ./modules/installer/cd-dvd/system-tarball-sheevaplug.nix;
+      system = "armv5tel-linux";
     };
+  */
 
-    # Provide a tarball that can be unpacked into an SD card, and easily
-    # boot that system from uboot (like for the sheevaplug).
-    # The pc variant helps preparing the expression for the system tarball
-    # in a machine faster than the sheevpalug
-    system_tarball_pc = makeSystemTarball {
-      module = ./modules/installer/cd-dvd/system-tarball-pc.nix;
+
+  tests =
+    let
+      runTest = f: pkgs.lib.genAttrs systems (system:
+        f (import ./tests { inherit system; })
+      );
+    in {
+      avahi = runTest (t: t.avahi.test);
+      bittorrent = runTest (t: t.bittorrent.test);
+      firefox = runTest (t: t.firefox.test);
+      firewall = runTest (t: t.firewall.test);
+      installer.grub1 = runTest (t: t.installer.grub1.test);
+      installer.lvm = runTest (t: t.installer.lvm.test);
+      installer.rebuildCD = runTest (t: t.installer.rebuildCD.test);
+      installer.separateBoot = runTest (t: t.installer.separateBoot.test);
+      installer.simple = runTest (t: t.installer.simple.test);
+      installer.swraid = runTest (t: t.installer.swraid.test);
+      ipv6 = runTest (t: t.ipv6.test);
+      kde4 = runTest (t: t.kde4.test);
+      login = runTest (t: t.login.test);
+      misc = runTest (t: t.misc.test);
+      mpich = runTest (t: t.mpich.test);
+      mysql = runTest (t: t.mysql.test);
+      mysql_replication = runTest (t: t.mysql_replication.test);
+      nat = runTest (t: t.nat.test);
+      nfs = runTest (t: t.nfs.test);
+      openssh = runTest (t: t.openssh.test);
+      proxy = runTest (t: t.proxy.test);
+      quake3 = runTest (t: t.quake3.report);
+      #subversion = runTest (t: t.subversion.report);
+      tomcat = runTest (t: t.tomcat.test);
+      trac = runTest (t: t.trac.test);
+      xfce = runTest (t: t.xfce.test);
     };
 
-    /*
-    system_tarball_fuloong2f =
-      assert builtins.currentSystem == "mips64-linux";
-      makeSystemTarball {
-        module = ./modules/installer/cd-dvd/system-tarball-fuloong2f.nix;
-      } { system = "mips64-linux"; };
-
-    system_tarball_sheevaplug =
-      assert builtins.currentSystem == "armv5tel-linux";
-      makeSystemTarball {
-        module = ./modules/installer/cd-dvd/system-tarball-sheevaplug.nix;
-      } { system = "armv5tel-linux"; };
-    */
-
-
-    tests = { system ? "x86_64-linux" }:
-      let
-        t = import ./tests { inherit system; };
-      in {
-        avahi = t.avahi.test;
-        bittorrent = t.bittorrent.test;
-        firefox = t.firefox.test;
-        firewall = t.firewall.test;
-        installer.grub1 = t.installer.grub1.test;
-        installer.lvm = t.installer.lvm.test;
-        installer.rebuildCD = t.installer.rebuildCD.test;
-        installer.separateBoot = t.installer.separateBoot.test;
-        installer.simple = t.installer.simple.test;
-        installer.swraid = t.installer.swraid.test;
-        ipv6 = t.ipv6.test;
-        kde4 = t.kde4.test;
-        login = t.login.test;
-        misc = t.misc.test;
-        mpich = t.mpich.test;
-        mysql = t.mysql.test;
-        mysql_replication = t.mysql_replication.test;
-        nat = t.nat.test;
-        nfs = t.nfs.test;
-        openssh = t.openssh.test;
-        proxy = t.proxy.test;
-        quake3 = t.quake3.report;
-        #subversion = t.subversion.report;
-        tomcat = t.tomcat.test;
-        trac = t.trac.test;
-        xfce = t.xfce.test;
-      };
-
-  };
-
-
-in jobs
+}
-- 
GitLab


From 2f5576b5392b407b909db871f1308c9af85f2df9 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 26 Mar 2013 14:44:24 +0100
Subject: [PATCH 4492/5331] Grmbl

---
 release-combined.nix | 9 ++++++---
 release.nix          | 6 +++---
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/release-combined.nix b/release-combined.nix
index b26a2184ddb..3a378123d2c 100644
--- a/release-combined.nix
+++ b/release-combined.nix
@@ -1,17 +1,20 @@
 { nixosSrc ? { outPath = ./.; revCount = 1234; shortRev = "abcdefg"; }
-, nixpkgsSrc ? { outPath = <nixpkgs>; revCount = 5678; shortRev = "gfedcba"; }
+, nixpkgs ? { outPath = <nixpkgs>; revCount = 5678; shortRev = "gfedcba"; }
 , officialRelease ? false
 }:
 
+let nixpkgs' = nixpkgs; in # urgh
+
 rec {
 
   nixos = import ./release.nix {
-    inherit nixosSrc nixpkgsSrc officialRelease;
+    inherit nixosSrc officialRelease;
+    nixpkgs = nixpkgs';
   };
 
   nixpkgs = import <nixpkgs/pkgs/top-level/release.nix> {
     inherit officialRelease;
-    nixpkgs = nixpkgsSrc;
+    nixpkgs = nixpkgs';
     # Only do Linux builds.
     supportedSystems = [ "x86_64-linux" "i686-linux" ];
   };
diff --git a/release.nix b/release.nix
index c8f144b74b2..ffaef1f0279 100644
--- a/release.nix
+++ b/release.nix
@@ -1,12 +1,12 @@
 { nixosSrc ? { outPath = ./.; revCount = 1234; shortRev = "abcdefg"; }
-, nixpkgsSrc ? { outPath = <nixpkgs>; revCount = 5678; shortRev = "gfedcba"; }
+, nixpkgs ? { outPath = <nixpkgs>; revCount = 5678; shortRev = "gfedcba"; }
 , officialRelease ? false
 }:
 
 let
 
   version = builtins.readFile ./.version;
-  versionSuffix = "pre${toString nixosSrc.revCount}_${nixosSrc.shortRev}-${nixpkgsSrc.shortRev}";
+  versionSuffix = "pre${toString nixosSrc.revCount}_${nixosSrc.shortRev}-${nixpkgs.shortRev}";
 
   systems = [ "x86_64-linux" "i686-linux" ];
 
@@ -115,7 +115,7 @@ in {
         ensureDir "$out/tarballs"
         mkdir ../$releaseName
         cp -prd . ../$releaseName/nixos
-        cp -prd ${nixpkgsSrc} ../$releaseName/nixpkgs
+        cp -prd ${nixpkgs} ../$releaseName/nixpkgs
         echo "$expr" > ../$releaseName/default.nix
         NIX_STATE_DIR=$TMPDIR nix-env -f ../$releaseName/default.nix -qaP --meta --xml \* > /dev/null
         cd ..
-- 
GitLab


From 991a78dd8b8ca3c9fddc441171e51a9fabd7265d Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 26 Mar 2013 15:58:38 +0100
Subject: [PATCH 4493/5331] Use nixUnstable

---
 modules/services/misc/nix-daemon.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/services/misc/nix-daemon.nix b/modules/services/misc/nix-daemon.nix
index f3ebf0a3418..8f1bfd3ccaa 100644
--- a/modules/services/misc/nix-daemon.nix
+++ b/modules/services/misc/nix-daemon.nix
@@ -54,7 +54,7 @@ in
   options = {
 
     environment.nix = mkOption {
-      default = pkgs.nix;
+      default = pkgs.nixUnstable;
       merge = mergeOneOption;
       description = ''
         This option specifies the Nix package instance to use throughout the system.
-- 
GitLab


From 89dd7b0f6923aee45f14e7dfd863f15482ac4b14 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Tue, 26 Mar 2013 12:18:57 -0400
Subject: [PATCH 4494/5331] Revert "Don't mount /nix/store ro if it's a
 mountpoint"

Now that nixUnstable supports remounting in the "/nix/store is a
mountpoint" case, this is no longer necessary.

This reverts commit f1d48aec43947e5dddae8ba02e3133ee8d0d0ff9.

Signed-off-by: Shea Levy <shea@shealevy.com>
---
 modules/system/boot/readonly-mountpoint.c | 2 +-
 modules/system/boot/stage-2-init.sh       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/system/boot/readonly-mountpoint.c b/modules/system/boot/readonly-mountpoint.c
index 27b66687382..605adfafabb 100644
--- a/modules/system/boot/readonly-mountpoint.c
+++ b/modules/system/boot/readonly-mountpoint.c
@@ -8,7 +8,7 @@ int main(int argc, char ** argv) {
 		fprintf(stderr, "Usage: %s PATH", argv[0]);
 		exit(2);
 	}
-	if (statvfs(argv[1], &stat) != 0) {
+	if(statvfs(argv[1], &stat) != 0) {
 		perror("statvfs");
 		exit(3);
 	}
diff --git a/modules/system/boot/stage-2-init.sh b/modules/system/boot/stage-2-init.sh
index deacedb18e3..6e23052e61d 100644
--- a/modules/system/boot/stage-2-init.sh
+++ b/modules/system/boot/stage-2-init.sh
@@ -51,7 +51,7 @@ echo "booting system configuration $systemConfig" > /dev/kmsg
 chown 0:30000 /nix/store
 chmod 1775 /nix/store
 if [ -n "@readOnlyStore@" ]; then
-    if ! mountpoint /nix/store; then
+    if ! readonly-mountpoint /nix/store; then
         mount --bind /nix/store /nix/store
         mount -o remount,ro,bind /nix/store
     fi
-- 
GitLab


From 652e2ab6105462206c4100a4d0603895a2c4d5d0 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Tue, 26 Mar 2013 12:35:28 -0400
Subject: [PATCH 4495/5331] "Maintain" the tested job so I get notifications
 when it fails

Signed-off-by: Shea Levy <shea@shealevy.com>
---
 modules/system/boot/readonly-mountpoint.c | 2 +-
 release-combined.nix                      | 9 ++++++---
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/modules/system/boot/readonly-mountpoint.c b/modules/system/boot/readonly-mountpoint.c
index 605adfafabb..27b66687382 100644
--- a/modules/system/boot/readonly-mountpoint.c
+++ b/modules/system/boot/readonly-mountpoint.c
@@ -8,7 +8,7 @@ int main(int argc, char ** argv) {
 		fprintf(stderr, "Usage: %s PATH", argv[0]);
 		exit(2);
 	}
-	if(statvfs(argv[1], &stat) != 0) {
+	if (statvfs(argv[1], &stat) != 0) {
 		perror("statvfs");
 		exit(3);
 	}
diff --git a/release-combined.nix b/release-combined.nix
index 3a378123d2c..dbd56b18524 100644
--- a/release-combined.nix
+++ b/release-combined.nix
@@ -3,7 +3,7 @@
 , officialRelease ? false
 }:
 
-let nixpkgs' = nixpkgs; in # urgh
+let nixpkgs' = nixpkgs; pkgs = import <nixpkgs> {}; in # urgh
 
 rec {
 
@@ -19,9 +19,12 @@ rec {
     supportedSystems = [ "x86_64-linux" "i686-linux" ];
   };
 
-  tested = (import <nixpkgs> { }).releaseTools.aggregate {
+  tested = pkgs.releaseTools.aggregate {
     name = "nixos-${nixos.tarball.version}";
-    meta.description = "Release-critical builds for the NixOS unstable channel";
+    meta = {
+      description = "Release-critical builds for the NixOS unstable channel";
+      maintainers = [ pkgs.lib.maintainers.shlevy ];
+    };
     members =
       [ nixos.channel
         nixos.manual
-- 
GitLab


From 6c6b0be503aae8e5f83d5528b78ede0814681628 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Tue, 26 Mar 2013 14:36:53 -0400
Subject: [PATCH 4496/5331] iso_efi: Fix build

Thanks to mwc in irc for pointing it out

Signed-off-by: Shea Levy <shea@shealevy.com>
---
 modules/installer/cd-dvd/iso-image.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/modules/installer/cd-dvd/iso-image.nix b/modules/installer/cd-dvd/iso-image.nix
index 3d8c7f6190b..4a3dc87b4c7 100644
--- a/modules/installer/cd-dvd/iso-image.nix
+++ b/modules/installer/cd-dvd/iso-image.nix
@@ -131,7 +131,8 @@ let
       ${pkgs.mtools}/bin/mmd -i "$out" loader
       ${pkgs.mtools}/bin/mmd -i "$out" loader/entries
       ${pkgs.mtools}/bin/mcopy -v -i "$out" \
-        ${pkgs.gummiboot}/bin/gummiboot.efi ::efi/boot/boot${targetArch}.efi
+        ${pkgs.gummiboot}/lib/gummiboot/gummiboot${targetArch}.efi \
+        ::efi/boot/boot${targetArch}.efi
       ${pkgs.mtools}/bin/mcopy -v -i "$out" \
         ${config.boot.kernelPackages.kernel + "/bzImage"} ::bzImage
       ${pkgs.mtools}/bin/mcopy -v -i "$out" \
-- 
GitLab


From c52cb9bb65570086bdffd5263dc39669a7a1dbcc Mon Sep 17 00:00:00 2001
From: Domen Kozar <domen@dev.si>
Date: Wed, 27 Mar 2013 11:47:28 +0100
Subject: [PATCH 4497/5331] add almir service

---
 modules/module-list.nix           |   1 +
 modules/services/backup/almir.nix | 170 ++++++++++++++++++++++++++++++
 2 files changed, 171 insertions(+)
 create mode 100644 modules/services/backup/almir.nix

diff --git a/modules/module-list.nix b/modules/module-list.nix
index abd12ab9261..7e07ee5ddfe 100644
--- a/modules/module-list.nix
+++ b/modules/module-list.nix
@@ -60,6 +60,7 @@
   ./services/audio/alsa.nix
   ./services/audio/fuppes.nix
   ./services/audio/mpd.nix
+  ./services/backup/almir.nix
   ./services/backup/bacula.nix
   ./services/backup/mysql-backup.nix
   ./services/backup/postgresql-backup.nix
diff --git a/modules/services/backup/almir.nix b/modules/services/backup/almir.nix
new file mode 100644
index 00000000000..a4ebfff2389
--- /dev/null
+++ b/modules/services/backup/almir.nix
@@ -0,0 +1,170 @@
+{ config, pkgs, ... }:
+
+with pkgs.lib;
+
+let
+  cfg = config.services.almir;
+
+  bconsoleconf = pkgs.writeText "bconsole.conf"
+    ''
+      Director {
+        Name = ${cfg.director_name}
+        DIRport = ${toString cfg.director_port}
+        address = ${cfg.director_address}
+        Password = "${cfg.director_password}"
+      }
+    '';
+
+  productionini = pkgs.writeText "production.ini"
+    ''
+[app:main]
+use = egg:almir
+
+pyramid.reload_templates = false
+pyramid.debug_authorization = false
+pyramid.debug_notfound = false
+pyramid.debug_routematch = false
+pyramid.debug_templates = false
+pyramid.default_locale_name = en
+pyramid.includes =
+    pyramid_exclog
+exclog.extra_info = true
+
+sqlalchemy.url = ${cfg.sqlalchemy_engine_url}
+timezone = ${cfg.timezone}
+bconsole_config = ${bconsoleconf}
+
+[server:main]
+use = egg:waitress#main
+host = 127.0.0.1
+port = ${toString cfg.port}
+
+
+# Begin logging configuration
+
+[loggers]
+keys = root, almir, sqlalchemy, exc_logger
+
+[handlers]
+keys = console
+
+[formatters]
+keys = generic
+
+[logger_root]
+level = WARN
+handlers = console
+
+[logger_almir]
+level = WARN
+handlers =
+qualname = almir
+
+[logger_exc_logger]
+level = ERROR
+handlers =
+qualname = exc_logger
+
+[logger_sqlalchemy]
+level = WARN
+handlers =
+qualname = sqlalchemy.engine
+# "level = INFO" logs SQL queries.
+# "level = DEBUG" logs SQL queries and results.
+# "level = WARN" logs neither.  (Recommended for production systems.)
+
+[handler_console]
+class = StreamHandler
+args = (sys.stderr,)
+level = NOTSET
+formatter = generic
+
+[formatter_generic]
+format = %(asctime)s %(levelname)-5.5s [%(name)s][%(threadName)s] %(message)s
+    '';
+in {
+  options = {
+    services.almir = {
+      enable = mkOption {
+        type = types.bool;
+        default = false;
+        description = ''
+          Enable Almir web server. Also configures postgresql database and installs bacula.
+        '';
+      };
+
+      port = mkOption {
+        default = 35000;
+        type = types.uniq types.int;
+        description = ''
+          Port for Almir web server to listen on.
+        '';
+      };
+
+      timezone = mkOption {
+	description = ''
+         Timezone as specified in https://en.wikipedia.org/wiki/List_of_tz_database_time_zones
+        '';
+        example = "Europe/Ljubljana";
+      };
+
+      sqlalchemy_engine_url = mkOption {
+        example = ''
+          postgresql://bacula:bacula@localhost:5432/bacula
+          mysql+mysqlconnector://<user>:<password>@<hostname>/<database>'
+          sqlite:////var/lib/bacula/bacula.db'
+        '';
+	description = ''
+         Define SQL database connection to bacula catalog as specified in http://docs.sqlalchemy.org/en/latest/core/engines.html#database-urls
+        '';
+      };
+
+      director_name = mkOption {
+        description = ''
+          Name of the Director to connect with bconsole.
+        '';
+      };
+
+      director_password = mkOption {
+        description = ''
+          Password for Director to connect with bconsole.
+        '';
+      };
+
+      director_port = mkOption {
+        default = 9101;
+        type = types.int;
+        description = ''
+          Port for Director to connect with bconsole.
+        '';
+      };
+
+      director_address = mkOption {
+        default = "127.0.0.1";
+        description = ''
+          IP/Hostname for Director to connect with bconsole.
+        '';
+      };
+    };
+  };
+
+  config = mkIf cfg.enable {
+    systemd.services.almir = {
+      after = [ "network.target" "postgresql.service" ];
+      description = "Almir web app";
+      wantedBy = [ "multi-user.target" ];
+      path = [ pkgs.pythonPackages.almir ];
+      serviceConfig.ExecStart = "${pkgs.pythonPackages.almir}/bin/pserve ${productionini}";
+    };
+
+    environment.systemPackages = [ pkgs.pythonPackages.almir ];
+
+    users.extraUsers.almir = {
+      group = "almir";
+      createHome = true;
+      shell = "${pkgs.bash}/bin/bash";
+    };
+
+    users.extraGroups.almir = {};
+  };
+}
-- 
GitLab


From 8b9216fdcb132e2101f4bba6dc8b20c7e8a65df9 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 27 Mar 2013 13:56:36 +0100
Subject: [PATCH 4498/5331] Don't set the firmware path in 3 different places

---
 modules/services/hardware/udev.nix | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/modules/services/hardware/udev.nix b/modules/services/hardware/udev.nix
index 2ba06b886e4..a83f99278f4 100644
--- a/modules/services/hardware/udev.nix
+++ b/modules/services/hardware/udev.nix
@@ -228,10 +228,6 @@ in
       (isYes "NET")
     ];
 
-    boot.extraKernelParams = [ "firmware_class.path=${config.hardware.firmware}" ];
-
-    boot.extraModprobeConfig = "options firmware_class path=${config.hardware.firmware}";
-
     system.activationScripts."set-firmware-path" =
       "echo -n ${config.hardware.firmware} 2>/dev/null > /sys/module/firmware_class/parameters/path";
   };
-- 
GitLab


From f3bea050f80dad5c97b8ce84e885d32a4ca8976f Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 27 Mar 2013 13:58:12 +0100
Subject: [PATCH 4499/5331] Updates for systemd 198/199

---
 modules/services/logging/rsyslogd.nix | 2 +-
 modules/services/logging/syslogd.nix  | 2 +-
 modules/services/system/dbus.nix      | 1 -
 modules/system/boot/systemd.nix       | 8 ++++++--
 4 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/modules/services/logging/rsyslogd.nix b/modules/services/logging/rsyslogd.nix
index 7adc08d1a03..03fe50ab915 100644
--- a/modules/services/logging/rsyslogd.nix
+++ b/modules/services/logging/rsyslogd.nix
@@ -90,7 +90,7 @@ in
 
         requires = [ "syslog.socket" ];
 
-        wantedBy = [ "multi-user.target" "syslog.target" ];
+        wantedBy = [ "multi-user.target" ];
 
         environment.TZ = config.time.timeZone;
 
diff --git a/modules/services/logging/syslogd.nix b/modules/services/logging/syslogd.nix
index 886669606b4..c45b533112a 100644
--- a/modules/services/logging/syslogd.nix
+++ b/modules/services/logging/syslogd.nix
@@ -110,7 +110,7 @@ in
 
         requires = [ "syslog.socket" ];
 
-        wantedBy = [ "multi-user.target" "syslog.target" ];
+        wantedBy = [ "multi-user.target" ];
 
         environment.TZ = config.time.timeZone;
 
diff --git a/modules/services/system/dbus.nix b/modules/services/system/dbus.nix
index 4a9d9a77b57..28647004ce4 100644
--- a/modules/services/system/dbus.nix
+++ b/modules/services/system/dbus.nix
@@ -132,7 +132,6 @@ in
         [Unit]
         Description=D-Bus System Message Bus
         Requires=dbus.socket
-        After=syslog.target
 
         [Service]
         ExecStartPre=${pkgs.dbus_tools}/bin/dbus-uuidgen --ensure
diff --git a/modules/system/boot/systemd.nix b/modules/system/boot/systemd.nix
index 9534e382c92..dabb6f6661b 100644
--- a/modules/system/boot/systemd.nix
+++ b/modules/system/boot/systemd.nix
@@ -31,10 +31,11 @@ let
       "network.target"
       "nss-lookup.target"
       "nss-user-lookup.target"
-      "syslog.target"
       "time-sync.target"
       #"cryptsetup.target"
       "sigpwr.target"
+      "timers.target"
+      "paths.target"
 
       # Rescue mode.
       "rescue.target"
@@ -108,8 +109,10 @@ let
       "hibernate.target"
       "suspend.target"
       "sleep.target"
+      "hybrid-sleep.target"
       "systemd-hibernate.service"
       "systemd-suspend.service"
+      "systemd-hybrid-sleep.service"
       "systemd-shutdownd.socket"
       "systemd-shutdownd.service"
 
@@ -139,12 +142,13 @@ let
     ];
 
   upstreamWants =
-    [ "basic.target.wants"
+    [ #"basic.target.wants"
       "sysinit.target.wants"
       "sockets.target.wants"
       "local-fs.target.wants"
       "multi-user.target.wants"
       "shutdown.target.wants"
+      "timers.target.wants"
     ];
 
   makeJobScript = name: text:
-- 
GitLab


From c039e286b9116bcc4c5f4ac9e3fd64a8f667bcc6 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 27 Mar 2013 17:20:41 +0100
Subject: [PATCH 4500/5331] Set the kernel.poweroff_cmd sysctl

This allows Xen (and EC2) to power off an instance properly.  We had
this before (see aeb89fc753c6f95c9d143e6f5346f92e4a02fa67), but it got
lost in the systemd migration.
---
 modules/system/boot/shutdown.nix | 2 ++
 tests/misc.nix                   | 5 +++++
 2 files changed, 7 insertions(+)

diff --git a/modules/system/boot/shutdown.nix b/modules/system/boot/shutdown.nix
index 23ddf6d0202..ad71a2e816e 100644
--- a/modules/system/boot/shutdown.nix
+++ b/modules/system/boot/shutdown.nix
@@ -22,4 +22,6 @@ with pkgs.lib;
         '';
     };
 
+  boot.kernel.sysctl."kernel.poweroff_cmd" = "${config.systemd.package}/sbin/poweroff";
+
 }
diff --git a/tests/misc.nix b/tests/misc.nix
index 9f85877e8bb..118ed8f45cb 100644
--- a/tests/misc.nix
+++ b/tests/misc.nix
@@ -33,6 +33,11 @@
           $machine->waitForUnit("root-swapfile.swap");
           $machine->succeed("ls -l /root/swapfile | grep 134217728");
       };
+
+      # Test whether kernel.poweroff_cmd is set.
+      subtest "poweroff_cmd", sub {
+          $machine->succeed("[ -x \"\$(cat /proc/sys/kernel/poweroff_cmd)\" ]")
+      };
     '';
 
 }
-- 
GitLab


From 9c3a31ff4c5024fcb449c71f423768b6acf2f431 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 27 Mar 2013 22:08:25 +0100
Subject: [PATCH 4501/5331] Clear /proc/sys/kernel/hotplug again

Otherwise the kernel will pointlessly try to invoke /sbin/hotplug all
the time.  Another feature lost in the systemd switch.
---
 modules/services/hardware/udev.nix | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/modules/services/hardware/udev.nix b/modules/services/hardware/udev.nix
index a83f99278f4..3bec396bfe5 100644
--- a/modules/services/hardware/udev.nix
+++ b/modules/services/hardware/udev.nix
@@ -228,7 +228,15 @@ in
       (isYes "NET")
     ];
 
-    system.activationScripts."set-firmware-path" =
-      "echo -n ${config.hardware.firmware} 2>/dev/null > /sys/module/firmware_class/parameters/path";
+    system.activationScripts.setFirmwarePath =
+      ''
+        echo -n ${config.hardware.firmware} 2>/dev/null > /sys/module/firmware_class/parameters/path
+      '';
+
+    system.activationScripts.clearHotplug =
+      ''
+        echo "" > /proc/sys/kernel/hotplug
+      '';
+
   };
 }
-- 
GitLab


From 7ad91f31d6cd6360e1f01e8e5ee3d04872f19e61 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sat, 2 Mar 2013 01:03:13 +0100
Subject: [PATCH 4502/5331] Add support for systemd timers

---
 modules/services/misc/nix-gc.nix             | 33 +++++++++++---------
 modules/system/boot/systemd-unit-options.nix | 20 ++++++++++++
 modules/system/boot/systemd.nix              | 20 ++++++++++++
 3 files changed, 58 insertions(+), 15 deletions(-)

diff --git a/modules/services/misc/nix-gc.nix b/modules/services/misc/nix-gc.nix
index 28045044601..27bcfafa20f 100644
--- a/modules/services/misc/nix-gc.nix
+++ b/modules/services/misc/nix-gc.nix
@@ -11,36 +11,38 @@ in
   ###### interface
 
   options = {
+
     nix.gc = {
 
       automatic = mkOption {
         default = false;
         type = types.bool;
-        description = "
-          Automatically run the garbage collector at specified dates.
-        ";
+        description = "Automatically run the garbage collector at a specific time.";
       };
 
       dates = mkOption {
-        default = "15 03 * * *";
-        type = types.string;
-        description = "
-          Run the garbage collector at specified dates to avoid full
-          hard-drives.
-        ";
+        default = "00:43";
+        type = types.uniq types.string;
+        description = ''
+          Specification (in the format described by
+          <citerefentry><refentrytitle>systemd.time</refentrytitle>
+          <manvolnum>5</manvolnum></citerefentry>) of the time at
+          which the garbage collector will run.
+        '';
       };
 
       options = mkOption {
         default = "";
         example = "--max-freed $((64 * 1024**3))";
-        type = types.string;
-        description = "
+        type = types.uniq types.string;
+        description = ''
           Options given to <filename>nix-collect-garbage</filename> when the
           garbage collector is run automatically.
-        ";
+        '';
       };
 
     };
+
   };
 
 
@@ -48,10 +50,11 @@ in
 
   config = {
 
-    services.cron.systemCronJobs = mkIf cfg.automatic (singleton
-      "${cfg.dates} root ${config.systemd.package}/bin/systemctl start nix-gc.service");
+    #systemd.timers.nix-gc.enable = cfg.automatic;
+    systemd.timers.nix-gc.enable = true;
+    systemd.timers.nix-gc.timerConfig.OnCalendar = cfg.dates;
 
-    systemd.services."nix-gc" =
+    systemd.services.nix-gc =
       { description = "Nix Garbage Collector";
         path  = [ config.environment.nix ];
         script = "exec nix-collect-garbage ${cfg.options}";
diff --git a/modules/system/boot/systemd-unit-options.nix b/modules/system/boot/systemd-unit-options.nix
index 513e9e85708..8f61399465b 100644
--- a/modules/system/boot/systemd-unit-options.nix
+++ b/modules/system/boot/systemd-unit-options.nix
@@ -223,6 +223,26 @@ rec {
 
   };
 
+
+  timerOptions = unitOptions // {
+
+    timerConfig = mkOption {
+      default = {};
+      example = { OnCalendar = "Sun 14:00:00"; Unit = "foo.service"; };
+      type = types.attrs;
+      description = ''
+        Each attribute in this set specifies an option in the
+        <literal>[Timer]</literal> section of the unit.  See
+        <citerefentry><refentrytitle>systemd.timer</refentrytitle>
+        <manvolnum>5</manvolnum></citerefentry> and
+        <citerefentry><refentrytitle>systemd.time</refentrytitle>
+        <manvolnum>5</manvolnum></citerefentry> for details.
+      '';
+    };
+
+  };
+
+
   mountOptions = unitOptions // {
 
     what = mkOption {
diff --git a/modules/system/boot/systemd.nix b/modules/system/boot/systemd.nix
index dabb6f6661b..f99eca91ad5 100644
--- a/modules/system/boot/systemd.nix
+++ b/modules/system/boot/systemd.nix
@@ -278,6 +278,18 @@ let
         '';
     };
 
+  timerToUnit = name: def:
+    { inherit (def) wantedBy enable;
+      text =
+        ''
+          [Unit]
+          ${attrsToSection def.unitConfig}
+
+          [Timer]
+          ${attrsToSection def.timerConfig}
+        '';
+    };
+
   mountToUnit = name: def:
     { inherit (def) wantedBy enable;
       text =
@@ -410,6 +422,13 @@ in
       description = "Definition of systemd socket units.";
     };
 
+    systemd.timers = mkOption {
+      default = {};
+      type = types.attrsOf types.optionSet;
+      options = [ timerOptions unitConfig ];
+      description = "Definition of systemd timer units.";
+    };
+
     systemd.mounts = mkOption {
       default = [];
       type = types.listOf types.optionSet;
@@ -552,6 +571,7 @@ in
       mapAttrs' (n: v: nameValuePair "${n}.target" (targetToUnit n v)) cfg.targets
       // mapAttrs' (n: v: nameValuePair "${n}.service" (serviceToUnit n v)) cfg.services
       // mapAttrs' (n: v: nameValuePair "${n}.socket" (socketToUnit n v)) cfg.sockets
+      // mapAttrs' (n: v: nameValuePair "${n}.timer" (timerToUnit n v)) cfg.timers
       // listToAttrs (map
                    (v: let n = escapeSystemdPath v.where;
                        in nameValuePair "${n}.mount" (mountToUnit n v)) cfg.mounts);
-- 
GitLab


From c2977f134e5f2eb7614bd87ca87df25d76127584 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 28 Mar 2013 13:35:07 +0100
Subject: [PATCH 4503/5331] nix-gc.timer: Fix the start time

---
 modules/services/misc/nix-gc.nix | 26 +++++++++++++++-----------
 1 file changed, 15 insertions(+), 11 deletions(-)

diff --git a/modules/services/misc/nix-gc.nix b/modules/services/misc/nix-gc.nix
index 27bcfafa20f..dfc4fd3c2ff 100644
--- a/modules/services/misc/nix-gc.nix
+++ b/modules/services/misc/nix-gc.nix
@@ -21,7 +21,7 @@ in
       };
 
       dates = mkOption {
-        default = "00:43";
+        default = "03:15";
         type = types.uniq types.string;
         description = ''
           Specification (in the format described by
@@ -48,18 +48,22 @@ in
 
   ###### implementation
 
-  config = {
+  config = mkMerge [
 
-    #systemd.timers.nix-gc.enable = cfg.automatic;
-    systemd.timers.nix-gc.enable = true;
-    systemd.timers.nix-gc.timerConfig.OnCalendar = cfg.dates;
+    { systemd.services.nix-gc =
+        { description = "Nix Garbage Collector";
+          path  = [ config.environment.nix ];
+          script = "exec nix-collect-garbage ${cfg.options}";
+        };
+    }
 
-    systemd.services.nix-gc =
-      { description = "Nix Garbage Collector";
-        path  = [ config.environment.nix ];
-        script = "exec nix-collect-garbage ${cfg.options}";
-      };
+    (mkIf cfg.automatic {
+      systemd.timers.nix-gc =
+        { wantedBy = [ "timers.target" ];
+          timerConfig.OnCalendar = cfg.dates;
+        };
+    })
 
-  };
+  ];
 
 }
-- 
GitLab


From 9000fd81d543210fd916be0b7aa6e11992442a03 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 28 Mar 2013 15:02:11 +0100
Subject: [PATCH 4504/5331] Hack: force timers.target to be started

Usually timers.target is pulled in by basic.target, but we don't
restart basic.target.  So timers.target wouldn't be started when
coming from an older systemd.
---
 modules/system/activation/switch-to-configuration.pl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/system/activation/switch-to-configuration.pl b/modules/system/activation/switch-to-configuration.pl
index 3db04727e52..a95ebcaba24 100644
--- a/modules/system/activation/switch-to-configuration.pl
+++ b/modules/system/activation/switch-to-configuration.pl
@@ -312,7 +312,7 @@ if (scalar @restart > 0) {
 # that are symlinks to other units.  We shouldn't start both at the
 # same time because we'll get a "Failed to add path to set" error from
 # systemd.
-my @start = unique("default.target", split('\n', read_file($startListFile, err_mode => 'quiet') // ""));
+my @start = unique("default.target", "timers.target", split('\n', read_file($startListFile, err_mode => 'quiet') // ""));
 print STDERR "starting the following units: ", join(", ", sort(@start)), "\n";
 system("@systemd@/bin/systemctl", "start", "--", @start) == 0 or $res = 4;
 unlink($startListFile);
-- 
GitLab


From fbde5e027e71f75b47946202951c7a9bd6ffe700 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 28 Mar 2013 16:11:54 +0100
Subject: [PATCH 4505/5331] Sync after installing the boot loader

Previously we synced just before calling switch-to-configuration.
That prevents corruption of the Nix store, but it can leave the boot
loader configuration and kernel files in /boot corrupted.  So do the
sync after installing the boot loader.
---
 modules/installer/tools/nixos-rebuild.sh             | 3 ---
 modules/system/activation/switch-to-configuration.pl | 6 +++++-
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/modules/installer/tools/nixos-rebuild.sh b/modules/installer/tools/nixos-rebuild.sh
index 255c8150bdd..fb26279e7c7 100644
--- a/modules/installer/tools/nixos-rebuild.sh
+++ b/modules/installer/tools/nixos-rebuild.sh
@@ -191,9 +191,6 @@ fi
 # If we're not just building, then make the new configuration the boot
 # default and/or activate it now.
 if [ "$action" = switch -o "$action" = boot -o "$action" = test ]; then
-    # Just in case the new configuration hangs the system, do a sync now.
-    sync
-
     $pathToConfig/bin/switch-to-configuration "$action"
 fi
 
diff --git a/modules/system/activation/switch-to-configuration.pl b/modules/system/activation/switch-to-configuration.pl
index a95ebcaba24..4db53c9043e 100644
--- a/modules/system/activation/switch-to-configuration.pl
+++ b/modules/system/activation/switch-to-configuration.pl
@@ -33,9 +33,13 @@ openlog("nixos", "", LOG_USER);
 # Install or update the bootloader.
 if ($action eq "switch" || $action eq "boot") {
     system("@installBootLoader@ $out") == 0 or exit 1;
-    exit 0 if $action eq "boot";
 }
 
+# Just in case the new configuration hangs the system, do a sync now.
+system("sync") unless ($ENV{"NIXOS_NO_SYNC"} // "") eq "1";
+
+exit 0 if $action eq "boot";
+
 # Check if we can activate the new configuration.
 my $oldVersion = read_file("/run/current-system/init-interface-version", err_mode => 'quiet') // "";
 my $newVersion = read_file("$out/init-interface-version");
-- 
GitLab


From 4af26d582cb50dc5c200bc1674944cec4821ceb5 Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Fri, 29 Mar 2013 10:28:54 +0100
Subject: [PATCH 4506/5331] Bitlbee: updated for systemd; added more options
 like AuthMode

---
 modules/services/networking/bitlbee.nix | 98 +++++++++++++++++++------
 1 file changed, 77 insertions(+), 21 deletions(-)

diff --git a/modules/services/networking/bitlbee.nix b/modules/services/networking/bitlbee.nix
index ffc1dcbad4b..2f67fe5f1e3 100644
--- a/modules/services/networking/bitlbee.nix
+++ b/modules/services/networking/bitlbee.nix
@@ -4,9 +4,13 @@ with pkgs.lib;
 
 let
 
+  cfg = config.services.bitlbee;
   bitlbeeUid = config.ids.uids.bitlbee;
 
-  inherit (config.services.bitlbee) portNumber interface;
+  authModeCheck = v:
+    v == "Open" ||
+    v == "Closed" ||
+    v == "Registered";
 
 in
 
@@ -43,6 +47,45 @@ in
 	'';
       };
 
+      user = mkOption {
+	default = "bitlbee";
+	description = ''
+	  The user that executes the BitlBee daemon.
+	'';	
+      };
+
+      authMode = mkOption {
+	default = "Open";
+	check = authModeCheck;
+	description = ''
+	  The following authentication modes are available:
+	  	Open -- Accept connections from anyone, use NickServ for user authentication.
+	  	Closed -- Require authorization (using the PASS command during login) before allowing the user to connect at all.
+	  	Registered -- Only allow registered users to use this server; this disables the register- and the account command until the user identifies himself.
+	'';	
+      };
+
+      configDir = mkOption {
+	default = "/var/lib/bitlbee";
+	description = ''
+	  Specifyies the directory that stores all the per-user configuration files.
+	'';	
+      };
+
+      extraSettings = mkOption {
+	default = "";
+	description = ''
+	  Will be inserted in the Settings section of the config file.
+	'';	
+      };
+
+      extraDefaults = mkOption {
+	default = "";
+	description = ''
+	  Will be inserted in the Default section of the config file.
+	'';	
+      };
+
     };
 
   };
@@ -53,41 +96,54 @@ in
   config = mkIf config.services.bitlbee.enable {
 
     users.extraUsers = singleton
-      { name = "bitlbee";
+      { name = "${cfg.user}";
 	uid = bitlbeeUid;
 	description = "BitlBee user";
 	home = "/var/empty";
       };
 
     users.extraGroups = singleton
-      { name = "bitlbee";
+      { name = "${cfg.user}";
 	gid = config.ids.gids.bitlbee;
       };
 
-    jobs.bitlbee =
+    systemd.services.bitlbee = 
       { description = "BitlBee IRC to other chat networks gateway";
-	name = "bitlbee";
-
-	startOn = "ip-up";
-
-	preStart =
+        after = [ "network.target" ];
+        wantedBy = [ "multi-user.target" ];
+	preStart = 
 	  ''
-	    if ! test -d /var/lib/bitlbee
-	    then
-		mkdir -p /var/lib/bitlbee
-		chown bitlbee:bitlbee /var/lib/bitlbee
-	    fi
-	  '';
-
-	exec =
-	  ''
-	    ${pkgs.bitlbee}/sbin/bitlbee -F -p ${toString portNumber} \
-	      -i ${interface} -u bitlbee
-	  '';
+   	  if ! test -d ${cfg.configDir}
+   	  then
+		mkdir -p ${cfg.configDir}
+		chown ${cfg.user}:${cfg.user} ${cfg.configDir}
+		chmod 750 ${cfg.configDir}
+   	  fi
+          '';
+	serviceConfig.ExecStart = "${pkgs.bitlbee}/sbin/bitlbee -F -n -c /etc/bitlbee.conf";
       };
 
     environment.systemPackages = [ pkgs.bitlbee ];
 
+    environment.etc =
+      [
+	{ source = pkgs.writeText "bitlbee.conf"
+		''
+		[settings]
+		RunMode = Daemon
+		User = ${cfg.user}	
+		DaemonInterface = ${cfg.interface}
+		DaemonPort = ${toString cfg.portNumber} 
+		AuthMode = ${cfg.authMode}
+		ConfigDir = ${cfg.configDir}			
+		${cfg.extraSettings}
+		[defaults]
+		${cfg.extraDefaults}
+		'';
+          target = "bitlbee.conf";
+        }
+      ];
+
   };
 
 }
-- 
GitLab


From e33af285671d595adaaa259987c9ce13c00bdf17 Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Fri, 29 Mar 2013 12:37:06 +0100
Subject: [PATCH 4507/5331] Bitlbee: hardcode username and configdir; homedir
 == configdir

---
 modules/services/networking/bitlbee.nix | 33 ++++---------------------
 1 file changed, 5 insertions(+), 28 deletions(-)

diff --git a/modules/services/networking/bitlbee.nix b/modules/services/networking/bitlbee.nix
index 2f67fe5f1e3..44434d7ed8c 100644
--- a/modules/services/networking/bitlbee.nix
+++ b/modules/services/networking/bitlbee.nix
@@ -47,13 +47,6 @@ in
 	'';
       };
 
-      user = mkOption {
-	default = "bitlbee";
-	description = ''
-	  The user that executes the BitlBee daemon.
-	'';	
-      };
-
       authMode = mkOption {
 	default = "Open";
 	check = authModeCheck;
@@ -65,13 +58,6 @@ in
 	'';	
       };
 
-      configDir = mkOption {
-	default = "/var/lib/bitlbee";
-	description = ''
-	  Specifyies the directory that stores all the per-user configuration files.
-	'';	
-      };
-
       extraSettings = mkOption {
 	default = "";
 	description = ''
@@ -96,14 +82,14 @@ in
   config = mkIf config.services.bitlbee.enable {
 
     users.extraUsers = singleton
-      { name = "${cfg.user}";
+      { name = "bitlbee";
 	uid = bitlbeeUid;
 	description = "BitlBee user";
-	home = "/var/empty";
+	home = "/var/lib/bitlbee";
       };
 
     users.extraGroups = singleton
-      { name = "${cfg.user}";
+      { name = "bitlbee";
 	gid = config.ids.gids.bitlbee;
       };
 
@@ -111,15 +97,6 @@ in
       { description = "BitlBee IRC to other chat networks gateway";
         after = [ "network.target" ];
         wantedBy = [ "multi-user.target" ];
-	preStart = 
-	  ''
-   	  if ! test -d ${cfg.configDir}
-   	  then
-		mkdir -p ${cfg.configDir}
-		chown ${cfg.user}:${cfg.user} ${cfg.configDir}
-		chmod 750 ${cfg.configDir}
-   	  fi
-          '';
 	serviceConfig.ExecStart = "${pkgs.bitlbee}/sbin/bitlbee -F -n -c /etc/bitlbee.conf";
       };
 
@@ -131,11 +108,11 @@ in
 		''
 		[settings]
 		RunMode = Daemon
-		User = ${cfg.user}	
+		User = bitlbee	
+		ConfigDir = /var/lib/bitlbee			
 		DaemonInterface = ${cfg.interface}
 		DaemonPort = ${toString cfg.portNumber} 
 		AuthMode = ${cfg.authMode}
-		ConfigDir = ${cfg.configDir}			
 		${cfg.extraSettings}
 		[defaults]
 		${cfg.extraDefaults}
-- 
GitLab


From 8d0a7cb6d24900a6c8f8001a6da0029f89179c8c Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Fri, 29 Mar 2013 12:51:47 +0100
Subject: [PATCH 4508/5331] Bitlbee: tabs to spaces

---
 modules/services/networking/bitlbee.nix | 102 ++++++++++++------------
 1 file changed, 50 insertions(+), 52 deletions(-)

diff --git a/modules/services/networking/bitlbee.nix b/modules/services/networking/bitlbee.nix
index 44434d7ed8c..6f2778f669c 100644
--- a/modules/services/networking/bitlbee.nix
+++ b/modules/services/networking/bitlbee.nix
@@ -23,104 +23,102 @@ in
     services.bitlbee = {
 
       enable = mkOption {
-	default = false;
-	description = ''
-	  Whether to run the BitlBee IRC to other chat network gateway.
-	  Running it allows you to access the MSN, Jabber, Yahoo! and ICQ chat
-	  networks via an IRC client.
-	'';
+        default = false;
+        description = ''
+          Whether to run the BitlBee IRC to other chat network gateway.
+          Running it allows you to access the MSN, Jabber, Yahoo! and ICQ chat
+          networks via an IRC client.
+        '';
       };
 
       interface = mkOption {
-	default = "127.0.0.1";
-	description = ''
-	  The interface the BitlBee deamon will be listening to.  If `127.0.0.1',
-	  only clients on the local host can connect to it; if `0.0.0.0', clients
-	  can access it from any network interface.
-	'';
+        default = "127.0.0.1";
+        description = ''
+          The interface the BitlBee deamon will be listening to.  If `127.0.0.1',
+          only clients on the local host can connect to it; if `0.0.0.0', clients
+          can access it from any network interface.
+        '';
       };
 
       portNumber = mkOption {
-	default = 6667;
-	description = ''
-	  Number of the port BitlBee will be listening to.
-	'';
+        default = 6667;
+        description = ''
+          Number of the port BitlBee will be listening to.
+        '';
       };
 
       authMode = mkOption {
-	default = "Open";
-	check = authModeCheck;
-	description = ''
-	  The following authentication modes are available:
-	  	Open -- Accept connections from anyone, use NickServ for user authentication.
-	  	Closed -- Require authorization (using the PASS command during login) before allowing the user to connect at all.
-	  	Registered -- Only allow registered users to use this server; this disables the register- and the account command until the user identifies himself.
-	'';	
+        default = "Open";
+        check = authModeCheck;
+        description = ''
+          The following authentication modes are available:
+            Open -- Accept connections from anyone, use NickServ for user authentication.
+            Closed -- Require authorization (using the PASS command during login) before allowing the user to connect at all.
+            Registered -- Only allow registered users to use this server; this disables the register- and the account command until the user identifies himself.
+        ''; 
       };
 
       extraSettings = mkOption {
-	default = "";
-	description = ''
-	  Will be inserted in the Settings section of the config file.
-	'';	
+        default = "";
+        description = ''
+          Will be inserted in the Settings section of the config file.
+        ''; 
       };
 
       extraDefaults = mkOption {
-	default = "";
-	description = ''
-	  Will be inserted in the Default section of the config file.
-	'';	
+        default = "";
+        description = ''
+          Will be inserted in the Default section of the config file.
+        ''; 
       };
 
     };
 
   };
 
-
   ###### implementation
 
   config = mkIf config.services.bitlbee.enable {
 
     users.extraUsers = singleton
       { name = "bitlbee";
-	uid = bitlbeeUid;
-	description = "BitlBee user";
-	home = "/var/lib/bitlbee";
+        uid = bitlbeeUid;
+        description = "BitlBee user";
+        home = "/var/lib/bitlbee";
       };
 
     users.extraGroups = singleton
       { name = "bitlbee";
-	gid = config.ids.gids.bitlbee;
+        gid = config.ids.gids.bitlbee;
       };
 
     systemd.services.bitlbee = 
       { description = "BitlBee IRC to other chat networks gateway";
         after = [ "network.target" ];
         wantedBy = [ "multi-user.target" ];
-	serviceConfig.ExecStart = "${pkgs.bitlbee}/sbin/bitlbee -F -n -c /etc/bitlbee.conf";
+        serviceConfig.ExecStart = "${pkgs.bitlbee}/sbin/bitlbee -F -n -c /etc/bitlbee.conf";
       };
 
     environment.systemPackages = [ pkgs.bitlbee ];
 
     environment.etc =
       [
-	{ source = pkgs.writeText "bitlbee.conf"
-		''
-		[settings]
-		RunMode = Daemon
-		User = bitlbee	
-		ConfigDir = /var/lib/bitlbee			
-		DaemonInterface = ${cfg.interface}
-		DaemonPort = ${toString cfg.portNumber} 
-		AuthMode = ${cfg.authMode}
-		${cfg.extraSettings}
-		[defaults]
-		${cfg.extraDefaults}
-		'';
+        { source = pkgs.writeText "bitlbee.conf"
+            ''
+            [settings]
+            RunMode = Daemon
+            User = bitlbee  
+            ConfigDir = /var/lib/bitlbee      
+            DaemonInterface = ${cfg.interface}
+            DaemonPort = ${toString cfg.portNumber} 
+            AuthMode = ${cfg.authMode}
+            ${cfg.extraSettings}
+            [defaults]
+            ${cfg.extraDefaults}
+            '';
           target = "bitlbee.conf";
         }
       ];
-
   };
 
 }
-- 
GitLab


From c53bd1b279c33ff95bf1a22948f92206df3aa548 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= <viric@viric.name>
Date: Sat, 30 Mar 2013 21:06:23 +0100
Subject: [PATCH 4509/5331] pam: adding otpw optional, default false

---
 modules/security/pam.nix | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/modules/security/pam.nix b/modules/security/pam.nix
index 32721205b99..6742ec3aaca 100644
--- a/modules/security/pam.nix
+++ b/modules/security/pam.nix
@@ -41,6 +41,8 @@ let
     , # If set, user listed in /etc/pamusb.conf are able to log in with
       # the associated usb key.
       usbAuth ? config.security.pam.usb.enable
+    , # If set, OTPW system will be used (if ~/.otpw exists)
+      otpwAuth ? config.security.pam.enableOTPW
     , # If set, the calling user's SSH agent is used to authenticate
       # against the keys in the calling user's ~/.ssh/authorized_keys.
       # This is useful for "sudo" on password-less remote systems.
@@ -85,6 +87,8 @@ let
               "auth sufficient ${pkgs.pam_ssh_agent_auth}/libexec/pam_ssh_agent_auth.so file=~/.ssh/authorized_keys:~/.ssh/authorized_keys2:/etc/ssh/authorized_keys.d/%u"}
           ${optionalString usbAuth
               "auth sufficient ${pkgs.pam_usb}/lib/security/pam_usb.so"}
+          ${optionalString otpwAuth
+              "auth sufficient ${pkgs.otpw}/lib/security/pam_otpw.so"}
           auth sufficient pam_unix.so ${optionalString allowNullPassword "nullok"} likeauth
           ${optionalString config.users.ldap.enable
               "auth sufficient ${pam_ldap}/lib/security/pam_ldap.so use_first_pass"}
@@ -110,6 +114,8 @@ let
               "session optional ${pam_ldap}/lib/security/pam_ldap.so"}
           ${optionalString config.krb5.enable
               "session optional ${pam_krb5}/lib/security/pam_krb5.so"}
+          ${optionalString otpwAuth
+              "session optional ${pkgs.otpw}/lib/security/pam_otpw.so"}
           ${optionalString startSession
               "session optional ${pkgs.systemd}/lib/security/pam_systemd.so"}
           ${optionalString forwardXAuth
@@ -209,6 +215,13 @@ in
         '';
     };
 
+    security.pam.enableOTPW = mkOption {
+      default = false;
+      description = ''
+        Enable the OTPW (one-time password) PAM module
+      '';
+    };
+
     users.motd = mkOption {
       default = null;
       example = "Today is Sweetmorn, the 4th day of The Aftermath in the YOLD 3178.";
@@ -227,7 +240,8 @@ in
       # Include the PAM modules in the system path mostly for the manpages.
       [ pkgs.pam ]
       ++ optional config.users.ldap.enable pam_ldap
-      ++ optional config.krb5.enable [pam_krb5 pam_ccreds];
+      ++ optionals config.krb5.enable [pam_krb5 pam_ccreds]
+      ++ optionals config.security.pam.enableOTPW [ pkgs.otpw ];
 
     environment.etc =
       map makePAMService config.security.pam.services
-- 
GitLab


From 86c1e10a43c512465ced4b592fdd05d2659eb40e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= <viric@viric.name>
Date: Sat, 30 Mar 2013 22:25:19 +0100
Subject: [PATCH 4510/5331] Setting pam otpw *after* pam_unix, for dovecot
 failed auth messages.

I think it's nice that it first asks the usual password, and then offers the
otpw one if enabled. That enables dovecot to show the last pam prompt.

I also add the dovecot option for that.
---
 modules/security/pam.nix          | 2 +-
 modules/services/mail/dovecot.nix | 6 +++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/modules/security/pam.nix b/modules/security/pam.nix
index 6742ec3aaca..8c0231288ec 100644
--- a/modules/security/pam.nix
+++ b/modules/security/pam.nix
@@ -87,9 +87,9 @@ let
               "auth sufficient ${pkgs.pam_ssh_agent_auth}/libexec/pam_ssh_agent_auth.so file=~/.ssh/authorized_keys:~/.ssh/authorized_keys2:/etc/ssh/authorized_keys.d/%u"}
           ${optionalString usbAuth
               "auth sufficient ${pkgs.pam_usb}/lib/security/pam_usb.so"}
+          auth sufficient pam_unix.so ${optionalString allowNullPassword "nullok"} likeauth
           ${optionalString otpwAuth
               "auth sufficient ${pkgs.otpw}/lib/security/pam_otpw.so"}
-          auth sufficient pam_unix.so ${optionalString allowNullPassword "nullok"} likeauth
           ${optionalString config.users.ldap.enable
               "auth sufficient ${pam_ldap}/lib/security/pam_ldap.so use_first_pass"}
           ${optionalString config.krb5.enable ''
diff --git a/modules/services/mail/dovecot.nix b/modules/services/mail/dovecot.nix
index b4662936b3c..5f8e8e1ade3 100644
--- a/modules/services/mail/dovecot.nix
+++ b/modules/services/mail/dovecot.nix
@@ -39,7 +39,7 @@ let
       }
       passdb {
         driver = pam
-        args = dovecot2
+        args = ${optionalString cfg.showPAMFailure "failure_show_msg=yes"} dovecot2
       }
 
       pop3_uidl_format = %08Xv%08Xu
@@ -111,6 +111,10 @@ in
         description = "Server key.";
       };
 
+      showPAMFailure = mkOption {
+        default = false;
+        description = "Show the PAM failure message on authentication error (useful for OTPW).";
+      };
     };
 
   };
-- 
GitLab


From f40a38b2c8f062c7470b34592861aba8af459699 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 28 Mar 2013 18:40:13 +0100
Subject: [PATCH 4511/5331] Remove /etc lock files at boot time

---
 modules/system/boot/stage-2-init.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/modules/system/boot/stage-2-init.sh b/modules/system/boot/stage-2-init.sh
index 6e23052e61d..fbb8e8d04f2 100644
--- a/modules/system/boot/stage-2-init.sh
+++ b/modules/system/boot/stage-2-init.sh
@@ -98,6 +98,7 @@ mkdir -m 0700 -p /var/log/journal
 # Miscellaneous boot time cleanup.
 rm -rf /var/run /var/lock
 rm -f /etc/resolv.conf
+rm -f /etc/{group,passwd,shadow}.lock
 
 if test -n "@cleanTmpDir@"; then
     echo -n "cleaning \`/tmp'..."
-- 
GitLab


From 395bc5d05c98dcc65ac239540988b83182276c47 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Sun, 31 Mar 2013 16:10:06 +0200
Subject: [PATCH 4512/5331] lighttpd: restart service if config changes

Using /etc/lighttpd.conf "hides" the config file from NixOS so that it
will not automatically restart the service when its config file changes.
So don't do that.
---
 modules/services/web-servers/lighttpd.nix | 15 ++++-----------
 1 file changed, 4 insertions(+), 11 deletions(-)

diff --git a/modules/services/web-servers/lighttpd.nix b/modules/services/web-servers/lighttpd.nix
index 35a9ca78a59..1931fa65e51 100644
--- a/modules/services/web-servers/lighttpd.nix
+++ b/modules/services/web-servers/lighttpd.nix
@@ -7,6 +7,9 @@ with pkgs.lib;
 let
 
   cfg = config.services.lighttpd;
+  configFile = pkgs.writeText "lighttpd.conf" ''
+    ${cfg.configText}
+  '';
 
 in
 
@@ -64,21 +67,11 @@ in
       description = "Lighttpd Web Server";
       after = [ "network.target" ];
       wantedBy = [ "multi-user.target" ];
-      serviceConfig.ExecStart = "${pkgs.lighttpd}/sbin/lighttpd -D -f /etc/lighttpd.conf";
+      serviceConfig.ExecStart = "${pkgs.lighttpd}/sbin/lighttpd -D -f ${configFile}";
       # SIGINT => graceful shutdown
       serviceConfig.KillSignal = "SIGINT";
     };
 
-    environment.etc =
-      [
-        { source = pkgs.writeText "lighttpd.conf"
-            ''
-            ${cfg.configText}
-            '';
-          target = "lighttpd.conf";
-        }
-      ];
-
     users.extraUsers.lighttpd = {
       group = "lighttpd";
       description = "lighttpd web server privilege separation user";
-- 
GitLab


From 969c577173dc09bcd7af878107e733279f43171f Mon Sep 17 00:00:00 2001
From: Domen Kozar <domen@dev.si>
Date: Sun, 31 Mar 2013 21:18:51 +0200
Subject: [PATCH 4513/5331] fixes #127

---
 modules/services/networking/networkmanager.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/modules/services/networking/networkmanager.nix b/modules/services/networking/networkmanager.nix
index 74d9992f770..21d27677837 100644
--- a/modules/services/networking/networkmanager.nix
+++ b/modules/services/networking/networkmanager.nix
@@ -77,6 +77,11 @@ in {
 
   config = mkIf cfg.enable {
 
+    assertions = [{
+      assertion = config.networking.wireless.enable == false;
+      message = "You can not use networking.networkmanager with services.networking.wireless";
+    }];
+
     environment.etc = [
       { source = ipUpScript;
         target = "NetworkManager/dispatcher.d/01nixos-ip-up";
-- 
GitLab


From 863c6f2490b6d0167814f833c76551542b9abbad Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Mon, 1 Apr 2013 06:08:30 -0400
Subject: [PATCH 4514/5331] Fix missed kernel->kernelDev change

Signed-off-by: Shea Levy <shea@shealevy.com>
---
 modules/services/x11/xserver.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/services/x11/xserver.nix b/modules/services/x11/xserver.nix
index d83d18fe933..30e4c5cdc93 100644
--- a/modules/services/x11/xserver.nix
+++ b/modules/services/x11/xserver.nix
@@ -497,7 +497,7 @@ in
                 ''
                   ln -sf ${kernelPackages.nvidia_x11_legacy304} /run/opengl-driver
                   ${optionalString (pkgs.stdenv.system == "x86_64-linux" && cfg.driSupport32Bit)
-                    "ln -sf ${pkgs_i686.linuxPackages.nvidia_x11_legacy304.override { libsOnly = true; kernel = null; } } /run/opengl-driver-32"}
+                    "ln -sf ${pkgs_i686.linuxPackages.nvidia_x11_legacy304.override { libsOnly = true; kernelDev = null; } } /run/opengl-driver-32"}
                 ''
               else if elem "ati_unfree" driverNames then
                 "ln -sf ${kernelPackages.ati_drivers_x11} /run/opengl-driver"
-- 
GitLab


From f7563698dfcc4621cc996142b046c6a4941e68ec Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Mon, 1 Apr 2013 07:03:00 -0400
Subject: [PATCH 4515/5331] Use the new net.ifnames kernel command line flag to
 disable persistent interface names

Signed-off-by: Shea Levy <shea@shealevy.com>
---
 modules/services/hardware/udev.nix | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/modules/services/hardware/udev.nix b/modules/services/hardware/udev.nix
index 3bec396bfe5..90ff26da91f 100644
--- a/modules/services/hardware/udev.nix
+++ b/modules/services/hardware/udev.nix
@@ -83,10 +83,6 @@ let
         grep -l '\(RUN+\|IMPORT{program}\)="\(/usr\)\?/s\?bin' $i/*/udev/rules.d/* || true
       done
 
-      ${optionalString (!config.networking.usePredictableInterfaceNames) ''
-        ln -s /dev/null $out/80-net-name-slot.rules
-      ''}
-
       # If auto-configuration is disabled, then remove
       # udev's 80-drivers.rules file, which contains rules for
       # automatically calling modprobe.
@@ -222,6 +218,8 @@ in
         }
       ];
 
+    boot.extraKernelParams = mkIf (! config.networking.usePredictableInterfaceNames) [ "net.ifnames=0" ];
+
     system.requiredKernelConfig = with config.lib.kernelConfig; [
       (isEnabled "UNIX")
       (isYes "INOTIFY_USER")
-- 
GitLab


From c4b3b719176567b0bae32ee405c3ae570016fa62 Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Mon, 1 Apr 2013 23:26:36 +0200
Subject: [PATCH 4516/5331] Bitlbee: create homedir; do not use
 /etc/bitlbee.conf

---
 modules/services/networking/bitlbee.nix | 37 ++++++++++++-------------
 1 file changed, 18 insertions(+), 19 deletions(-)

diff --git a/modules/services/networking/bitlbee.nix b/modules/services/networking/bitlbee.nix
index 6f2778f669c..82e875f5aae 100644
--- a/modules/services/networking/bitlbee.nix
+++ b/modules/services/networking/bitlbee.nix
@@ -12,6 +12,21 @@ let
     v == "Closed" ||
     v == "Registered";
 
+  bitlbeeConfig = pkgs.writeText "bitlbee.conf"
+    ''
+    [settings]
+    RunMode = Daemon
+    User = bitlbee  
+    ConfigDir = /var/lib/bitlbee      
+    DaemonInterface = ${cfg.interface}
+    DaemonPort = ${toString cfg.portNumber}
+    AuthMode = ${cfg.authMode}
+    ${cfg.extraSettings}
+
+    [defaults]
+    ${cfg.extraDefaults}
+    '';
+
 in
 
 {
@@ -85,6 +100,7 @@ in
         uid = bitlbeeUid;
         description = "BitlBee user";
         home = "/var/lib/bitlbee";
+        createHome = true;
       };
 
     users.extraGroups = singleton
@@ -96,29 +112,12 @@ in
       { description = "BitlBee IRC to other chat networks gateway";
         after = [ "network.target" ];
         wantedBy = [ "multi-user.target" ];
-        serviceConfig.ExecStart = "${pkgs.bitlbee}/sbin/bitlbee -F -n -c /etc/bitlbee.conf";
+        serviceConfig.User = "bitlbee";
+        serviceConfig.ExecStart = "${pkgs.bitlbee}/sbin/bitlbee -F -n -c ${bitlbeeConfig}";
       };
 
     environment.systemPackages = [ pkgs.bitlbee ];
 
-    environment.etc =
-      [
-        { source = pkgs.writeText "bitlbee.conf"
-            ''
-            [settings]
-            RunMode = Daemon
-            User = bitlbee  
-            ConfigDir = /var/lib/bitlbee      
-            DaemonInterface = ${cfg.interface}
-            DaemonPort = ${toString cfg.portNumber} 
-            AuthMode = ${cfg.authMode}
-            ${cfg.extraSettings}
-            [defaults]
-            ${cfg.extraDefaults}
-            '';
-          target = "bitlbee.conf";
-        }
-      ];
   };
 
 }
-- 
GitLab


From e2eaae1155c6eae40751bea53ce671f8aa50dd7f Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 3 Apr 2013 12:48:25 +0200
Subject: [PATCH 4517/5331] Let resolvconf 'restart' the nscd service instead
 of 'reload'ing it.

Sometimes nscd starts up before a /etc/resolv.conf file has been written, and
apparently triggering a cache flush (reload) is not good enough to make it
recover from that problem. To remedy the issue, we restart the service instead.
See <https://github.com/NixOS/nixos/issues/34> for further details.
---
 modules/config/networking.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/config/networking.nix b/modules/config/networking.nix
index dbf67653dad..272f9271ec1 100644
--- a/modules/config/networking.nix
+++ b/modules/config/networking.nix
@@ -67,7 +67,7 @@ in
           '' + optionalString config.services.nscd.enable ''
             # Invalidate the nscd cache whenever resolv.conf is
             # regenerated.
-            libc_restart='${pkgs.systemd}/bin/systemctl reload --no-block nscd.service'
+            libc_restart='${pkgs.systemd}/bin/systemctl restart --no-block nscd.service'
           '' + optionalString cfg.dnsSingleRequest ''
             # only send one DNS request at a time
             resolv_conf_options='single-request'
-- 
GitLab


From 0139f015bef60ee3ae10d12b4bf3d0abb128ddaa Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 3 Apr 2013 12:48:36 +0200
Subject: [PATCH 4518/5331] modules/config/networking.nix: strip trailing
 whitespace

---
 modules/config/networking.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/config/networking.nix b/modules/config/networking.nix
index 272f9271ec1..a3f269476da 100644
--- a/modules/config/networking.nix
+++ b/modules/config/networking.nix
@@ -26,7 +26,7 @@ let
         routers will systemically drop the ipv4 queries. The symptom of this problem is
         that 'getent hosts example.com' only returns ipv6 (or perhaps only ipv4) addresses. The
         workaround for this is to specify the option 'single-request' in
-        /etc/resolve.conf. This option enables that. 
+        /etc/resolve.conf. This option enables that.
       '';
     };
 
-- 
GitLab


From fef5a185870a4eda72c6ffed6bf0a1f10ef0d060 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 3 Apr 2013 12:54:40 +0200
Subject: [PATCH 4519/5331] Enable sudoedit

---
 modules/security/sudo.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/security/sudo.nix b/modules/security/sudo.nix
index d2db9ee993f..cd548f4a4fe 100644
--- a/modules/security/sudo.nix
+++ b/modules/security/sudo.nix
@@ -31,7 +31,7 @@ in
         ''
           Whether users of the <code>wheel</code> group can execute
           commands as super user without entering a password.
-	'';
+        '';
       };
 
     security.sudo.configFile = mkOption {
@@ -70,7 +70,7 @@ in
         %wheel      ALL=(ALL) ${if cfg.wheelNeedsPassword then "" else "NOPASSWD: ALL, "}SETENV: ALL
       '';
 
-    security.setuidPrograms = [ "sudo" ];
+    security.setuidPrograms = [ "sudo" "sudoedit" ];
 
     environment.systemPackages = [ sudo ];
 
-- 
GitLab


From ee29054da1e206095afdf8435306076573488089 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 3 Apr 2013 13:27:22 +0200
Subject: [PATCH 4520/5331] Create an empty /etc/resolv.conf to shut up nscd

---
 modules/system/boot/stage-2-init.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/modules/system/boot/stage-2-init.sh b/modules/system/boot/stage-2-init.sh
index fbb8e8d04f2..ef69dde2fe6 100644
--- a/modules/system/boot/stage-2-init.sh
+++ b/modules/system/boot/stage-2-init.sh
@@ -98,6 +98,7 @@ mkdir -m 0700 -p /var/log/journal
 # Miscellaneous boot time cleanup.
 rm -rf /var/run /var/lock
 rm -f /etc/resolv.conf
+touch /etc/resolv.conf
 rm -f /etc/{group,passwd,shadow}.lock
 
 if test -n "@cleanTmpDir@"; then
-- 
GitLab


From 1def5bad35b45a56d0e21f5c8304df416fbdd7cf Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Wed, 3 Apr 2013 07:35:35 -0400
Subject: [PATCH 4521/5331] Revert "Use the new net.ifnames kernel command line
 flag to disable persistent interface names"

As @edolstra pointed out, this behavior is not equivalent to what we had
before as the kernel command line parameter won't take effect until the
next boot. Probably it's not likely that someone will make this change
and then add a network card before rebooting, but might as well support
that since we can.

This reverts commit f7563698dfcc4621cc996142b046c6a4941e68ec.

Signed-off-by: Shea Levy <shea@shealevy.com>
---
 modules/services/hardware/udev.nix | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/modules/services/hardware/udev.nix b/modules/services/hardware/udev.nix
index 90ff26da91f..3bec396bfe5 100644
--- a/modules/services/hardware/udev.nix
+++ b/modules/services/hardware/udev.nix
@@ -83,6 +83,10 @@ let
         grep -l '\(RUN+\|IMPORT{program}\)="\(/usr\)\?/s\?bin' $i/*/udev/rules.d/* || true
       done
 
+      ${optionalString (!config.networking.usePredictableInterfaceNames) ''
+        ln -s /dev/null $out/80-net-name-slot.rules
+      ''}
+
       # If auto-configuration is disabled, then remove
       # udev's 80-drivers.rules file, which contains rules for
       # automatically calling modprobe.
@@ -218,8 +222,6 @@ in
         }
       ];
 
-    boot.extraKernelParams = mkIf (! config.networking.usePredictableInterfaceNames) [ "net.ifnames=0" ];
-
     system.requiredKernelConfig = with config.lib.kernelConfig; [
       (isEnabled "UNIX")
       (isYes "INOTIFY_USER")
-- 
GitLab


From 3d93fb9243c2673d63fff7b0af7effc7639754e4 Mon Sep 17 00:00:00 2001
From: Rickard Nilsson <rickynils@gmail.com>
Date: Wed, 3 Apr 2013 23:16:27 +0200
Subject: [PATCH 4522/5331] xbmc: Use /var/run/lirc/lircd as lirc socket

The latest version of the lirc daemon uses /var/run/lirc/lircd, not
/dev/lircd that xbmc uses as default.
---
 modules/services/x11/window-managers/xbmc.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/services/x11/window-managers/xbmc.nix b/modules/services/x11/window-managers/xbmc.nix
index ca0e449f12b..46494202b40 100644
--- a/modules/services/x11/window-managers/xbmc.nix
+++ b/modules/services/x11/window-managers/xbmc.nix
@@ -21,7 +21,7 @@ in
       session = [{
         name = "xbmc";
         start = "
-          ${pkgs.xbmc}/bin/xbmc-standalone &
+          ${pkgs.xbmc}/bin/xbmc --lircdev /var/run/lirc/lircd --standalone &
           waitPID=$!
         ";
       }];
-- 
GitLab


From 4b504d8bba6e2753c9acc86988fb1d27293506c6 Mon Sep 17 00:00:00 2001
From: Sergey Mironov <ierton@gmail.com>
Date: Thu, 4 Apr 2013 11:50:16 +0400
Subject: [PATCH 4523/5331] udisks2: add udisks2 service

Udisks2 is a Dbus service started by systemd on demand.
---
 modules/module-list.nix               |  1 +
 modules/services/hardware/udisks2.nix | 53 +++++++++++++++++++++++++++
 2 files changed, 54 insertions(+)
 create mode 100644 modules/services/hardware/udisks2.nix

diff --git a/modules/module-list.nix b/modules/module-list.nix
index 7e07ee5ddfe..919abcbc26c 100644
--- a/modules/module-list.nix
+++ b/modules/module-list.nix
@@ -82,6 +82,7 @@
   ./services/hardware/sane.nix
   ./services/hardware/udev.nix
   ./services/hardware/udisks.nix
+  ./services/hardware/udisks2.nix
   ./services/hardware/upower.nix
   ./services/logging/klogd.nix
   ./services/logging/logcheck.nix
diff --git a/modules/services/hardware/udisks2.nix b/modules/services/hardware/udisks2.nix
new file mode 100644
index 00000000000..eae4172ccb3
--- /dev/null
+++ b/modules/services/hardware/udisks2.nix
@@ -0,0 +1,53 @@
+# Udisks daemon.
+
+{ config, pkgs, ... }:
+
+with pkgs.lib;
+
+{
+
+  ###### interface
+
+  options = {
+
+    services.udisks2 = {
+
+      enable = mkOption {
+        default = false;
+        description = ''
+          Whether to enable Udisks, a DBus service that allows
+          applications to query and manipulate storage devices.
+        '';
+      };
+
+    };
+
+  };
+
+
+  ###### implementation
+
+  config = mkIf config.services.udisks2.enable {
+
+    environment.systemPackages = [ pkgs.udisks2 ];
+
+    services.dbus.packages = [ pkgs.udisks2 ];
+
+    system.activationScripts.udisks2 =
+      ''
+        mkdir -m 0755 -p /var/lib/udisks2
+      '';
+
+    #services.udev.packages = [ pkgs.udisks2 ];
+    
+    systemd.services.udisks2 = {
+      description = "Udisks2 service";
+      serviceConfig = {
+        Type = "dbus";
+        BusName = "org.freedesktop.UDisks2";
+        ExecStart = "${pkgs.udisks2}/lib/udisks2/udisksd --no-debug";
+      };
+    };
+  };
+
+}
-- 
GitLab


From 303794e0d743638d1ccbb8613ed5d4c2439f5b28 Mon Sep 17 00:00:00 2001
From: Sergey Mironov <ierton@gmail.com>
Date: Thu, 4 Apr 2013 11:53:27 +0400
Subject: [PATCH 4524/5331] Xfce: use udisks2 instead of udisks

Enabling udisks2 allows gvfs (which should be built with udisks support) to
perform mount/unmount operations on removable drives. It affects Thunar and
probably other Gtk-based file managers.

Gvfs doesn't supports earlier versions of udisks.
---
 modules/services/x11/desktop-managers/xfce.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/services/x11/desktop-managers/xfce.nix b/modules/services/x11/desktop-managers/xfce.nix
index c7622ddb02f..6c6e4ffce0a 100644
--- a/modules/services/x11/desktop-managers/xfce.nix
+++ b/modules/services/x11/desktop-managers/xfce.nix
@@ -84,7 +84,7 @@ in
       '';
 
     # Enable helpful DBus services.
-    services.udisks.enable = true;
+    services.udisks2.enable = true;
     services.upower.enable = config.powerManagement.enable;
 
   };
-- 
GitLab


From a446fa9099ff120efd08e6d7f7abc2d3c0c51590 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 4 Apr 2013 18:21:51 +0200
Subject: [PATCH 4525/5331] PostgreSQL: Don't specify a default PostgreSQL
 package

The user should specify which major version to use
(e.g. "services.postgresql.package = pkgs.postgresql92").  We can't
really provide a sensible default, because such a default would have
to be updated from time to time, and there is no automated upgrade
procedure.  So leave upgrading to the user.
---
 modules/services/databases/postgresql.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/services/databases/postgresql.nix b/modules/services/databases/postgresql.nix
index a33fdaab423..61f69dfd34a 100644
--- a/modules/services/databases/postgresql.nix
+++ b/modules/services/databases/postgresql.nix
@@ -53,7 +53,7 @@ in
       };
 
       package = mkOption {
-        default = pkgs.postgresql;
+        example = literalExample "pkgs.postgresql92";
         description = ''
           PostgreSQL package to use.
         '';
-- 
GitLab


From 3c8d95f72634e3895901d96a03f87c1a58706f78 Mon Sep 17 00:00:00 2001
From: Mathijs Kwik <mathijs@bluescreen303.nl>
Date: Mon, 1 Apr 2013 10:29:46 +0200
Subject: [PATCH 4526/5331] xsession: remove duplicate sourcing of /etc/profile

---
 modules/services/x11/display-managers/default.nix | 2 --
 1 file changed, 2 deletions(-)

diff --git a/modules/services/x11/display-managers/default.nix b/modules/services/x11/display-managers/default.nix
index 0347d0d26f0..9cc8bf35f70 100644
--- a/modules/services/x11/display-managers/default.nix
+++ b/modules/services/x11/display-managers/default.nix
@@ -89,8 +89,6 @@ let
 
       export LIBVA_DRIVERS_PATH=${vaapiDrivers}/lib/dri
 
-      source /etc/profile
-
       ${cfg.displayManager.sessionCommands}
 
       # Allow the user to setup a custom session type.
-- 
GitLab


From fd6b48783daf9de0c93ae744419cdd7bde501ba1 Mon Sep 17 00:00:00 2001
From: Mathijs Kwik <mathijs@bluescreen303.nl>
Date: Mon, 1 Apr 2013 12:15:36 +0200
Subject: [PATCH 4527/5331] remove redundant if

---
 modules/services/x11/desktop-managers/kde4.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/services/x11/desktop-managers/kde4.nix b/modules/services/x11/desktop-managers/kde4.nix
index 58f4d74c20e..6e0d5057126 100644
--- a/modules/services/x11/desktop-managers/kde4.nix
+++ b/modules/services/x11/desktop-managers/kde4.nix
@@ -16,7 +16,7 @@ let
   nepomukConfig = pkgs.writeTextFile
     { name = "nepomuk-config";
       destination = "/share/config/nepomukserverrc";
-      text = 
+      text =
         ''
           [Basic Settings]
           Start Nepomuk=false
@@ -156,7 +156,7 @@ in
 
     # Enable helpful DBus services.
     services.udisks.enable = true;
-    services.upower = mkIf config.powerManagement.enable { enable = true; };
+    services.upower.enable = config.powerManagement.enable;
 
     security.pam.services = [ { name = "kde"; allowNullPassword = true; startSession = true; } ];
 
-- 
GitLab


From 57dc4b9188ea29f9f22cdd1f7301a2f29dcad052 Mon Sep 17 00:00:00 2001
From: Mathijs Kwik <mathijs@bluescreen303.nl>
Date: Mon, 1 Apr 2013 10:43:46 +0200
Subject: [PATCH 4528/5331] xsession: add config option to let systemd handle
 lid/power events

---
 .../services/x11/display-managers/default.nix | 25 ++++++++++++++-----
 1 file changed, 19 insertions(+), 6 deletions(-)

diff --git a/modules/services/x11/display-managers/default.nix b/modules/services/x11/display-managers/default.nix
index 9cc8bf35f70..84aa899fdcd 100644
--- a/modules/services/x11/display-managers/default.nix
+++ b/modules/services/x11/display-managers/default.nix
@@ -39,12 +39,15 @@ let
         exec > ~/.xsession-errors 2>&1
       ''}
 
-      # Stop systemd from handling the power button and lid switch,
-      # since presumably the desktop environment will handle these.
-      if [ -z "$_INHIBITION_LOCK_TAKEN" ]; then
-        export _INHIBITION_LOCK_TAKEN=1
-        exec ${config.systemd.package}/bin/systemd-inhibit --what=handle-lid-switch:handle-power-key "$0" "$sessionType"
-      fi
+      ${optionalString cfg.displayManager.desktopManagerHandlesLidAndPower ''
+        # Stop systemd from handling the power button and lid switch,
+        # since presumably the desktop environment will handle these.
+        if [ -z "$_INHIBITION_LOCK_TAKEN" ]; then
+          export _INHIBITION_LOCK_TAKEN=1
+          exec ${config.systemd.package}/bin/systemd-inhibit --what=handle-lid-switch:handle-power-key "$0" "$sessionType"
+        fi
+
+      ''}
 
       ${optionalString cfg.startOpenSSHAgent ''
         if test -z "$SSH_AUTH_SOCK"; then
@@ -185,6 +188,16 @@ in
         description = "Shell commands executed just before the window or desktop manager is started.";
       };
 
+      desktopManagerHandlesLidAndPower = mkOption {
+        default = true;
+        description = ''
+          Whether the display manager should prevent systemd from handling
+          lid and power events. This is normally handled by the desktop
+          environment's power manager. Turn this off when using a minimal
+          X11 setup without a full power manager.
+        '';
+      };
+
       session = mkOption {
         default = [];
         example = [
-- 
GitLab


From 58240e2304bad0f1f68d205a2ad46b84fdf46335 Mon Sep 17 00:00:00 2001
From: Mathijs Kwik <mathijs@bluescreen303.nl>
Date: Mon, 1 Apr 2013 11:18:50 +0200
Subject: [PATCH 4529/5331] add e17 desktop manager

desktop-manager is a bit misleading in this case as there is no
session yet and most apps are still missing. This can eventually
grow further once more e17 apps get packaged for nix.

However, for now, I need to initialize some e17 dbus services to
have the "terminology" terminal emulator provide gfx previews.
---
 .../services/x11/desktop-managers/default.nix |  2 +-
 modules/services/x11/desktop-managers/e17.nix | 30 +++++++++++++++++++
 2 files changed, 31 insertions(+), 1 deletion(-)
 create mode 100644 modules/services/x11/desktop-managers/e17.nix

diff --git a/modules/services/x11/desktop-managers/default.nix b/modules/services/x11/desktop-managers/default.nix
index 79d65b19699..0fea74d5ba7 100644
--- a/modules/services/x11/desktop-managers/default.nix
+++ b/modules/services/x11/desktop-managers/default.nix
@@ -17,7 +17,7 @@ in
   # Note: the order in which desktop manager modules are imported here
   # determines the default: later modules (if enabled) are preferred.
   # E.g., if KDE is enabled, it supersedes xterm.
-  imports = [ ./none.nix ./xterm.nix ./xfce.nix ./gnome.nix ./kde4.nix ];
+  imports = [ ./none.nix ./xterm.nix ./xfce.nix ./gnome.nix ./kde4.nix ./e17.nix ];
 
   options = {
 
diff --git a/modules/services/x11/desktop-managers/e17.nix b/modules/services/x11/desktop-managers/e17.nix
new file mode 100644
index 00000000000..3d91617c62a
--- /dev/null
+++ b/modules/services/x11/desktop-managers/e17.nix
@@ -0,0 +1,30 @@
+{ config, pkgs, ... }:
+
+with pkgs.lib;
+
+let
+
+  xcfg = config.services.xserver;
+  cfg = xcfg.desktopManager.e17;
+
+in
+
+{
+  options = {
+
+    services.xserver.desktopManager.e17.enable = mkOption {
+      default = false;
+      example = true;
+      description = "Enable support for the E17 desktop environment.";
+    };
+
+  };
+
+
+  config = mkIf (xcfg.enable && cfg.enable) {
+
+    services.dbus.packages = [ pkgs.e17.ethumb ];
+
+  };
+
+}
-- 
GitLab


From 7f1e728606e99dbf394790bdf6eccca685fe981b Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Fri, 5 Apr 2013 07:55:02 -0400
Subject: [PATCH 4530/5331] postgresql: version the dataDir by default

Among other things, this will make migrating between versions easier

Signed-off-by: Shea Levy <shea@shealevy.com>
---
 modules/services/databases/postgresql.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/services/databases/postgresql.nix b/modules/services/databases/postgresql.nix
index 61f69dfd34a..5054ca8a792 100644
--- a/modules/services/databases/postgresql.nix
+++ b/modules/services/databases/postgresql.nix
@@ -74,7 +74,7 @@ in
       };
 
       dataDir = mkOption {
-        default = "/var/db/postgresql";
+        default = "/var/db/postgresql-${cfg.package.psqlSchema}";
         description = ''
           Data directory for PostgreSQL.
         '';
-- 
GitLab


From 1e543984bcaf5c9e2c26a1b3de86ffa4d9fe7ba3 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Fri, 5 Apr 2013 08:01:06 -0400
Subject: [PATCH 4531/5331] Fix nixos evaluation on systems that haven't set
 postgresql.package

Signed-off-by: Shea Levy <shea@shealevy.com>
---
 modules/services/databases/postgresql.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/modules/services/databases/postgresql.nix b/modules/services/databases/postgresql.nix
index 5054ca8a792..8185f3866ba 100644
--- a/modules/services/databases/postgresql.nix
+++ b/modules/services/databases/postgresql.nix
@@ -75,6 +75,7 @@ in
 
       dataDir = mkOption {
         default = "/var/db/postgresql-${cfg.package.psqlSchema}";
+        defaultText = "/var/db/postgresql-{version}";
         description = ''
           Data directory for PostgreSQL.
         '';
-- 
GitLab


From 56a60c7fe6f4abdb5ab22a7946fd3d36556892c4 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Fri, 5 Apr 2013 09:19:23 -0400
Subject: [PATCH 4532/5331] Revert "Fix nixos evaluation on systems that
 haven't set postgresql.package"

This reverts commit 1e543984bcaf5c9e2c26a1b3de86ffa4d9fe7ba3.

This would have been nice if we had had it from the start, but now it
just breaks things for existing users. Maybe we can add it conditionally
when new postgres versions come out.

Signed-off-by: Shea Levy <shea@shealevy.com>
---
 modules/services/databases/postgresql.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/modules/services/databases/postgresql.nix b/modules/services/databases/postgresql.nix
index 8185f3866ba..5054ca8a792 100644
--- a/modules/services/databases/postgresql.nix
+++ b/modules/services/databases/postgresql.nix
@@ -75,7 +75,6 @@ in
 
       dataDir = mkOption {
         default = "/var/db/postgresql-${cfg.package.psqlSchema}";
-        defaultText = "/var/db/postgresql-{version}";
         description = ''
           Data directory for PostgreSQL.
         '';
-- 
GitLab


From 52fc0872963b52811e6ef7f54518b15c2d87b8dc Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Fri, 5 Apr 2013 09:20:50 -0400
Subject: [PATCH 4533/5331] Revert "postgresql: version the dataDir by default"

This reverts commit 7f1e728606e99dbf394790bdf6eccca685fe981b.

This would have been nice if we had had it from the start, but now it
just breaks things for existing users. Maybe we can add it conditionally
when new postgres versions come out.

Signed-off-by: Shea Levy <shea@shealevy.com>
---
 modules/services/databases/postgresql.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/services/databases/postgresql.nix b/modules/services/databases/postgresql.nix
index 5054ca8a792..61f69dfd34a 100644
--- a/modules/services/databases/postgresql.nix
+++ b/modules/services/databases/postgresql.nix
@@ -74,7 +74,7 @@ in
       };
 
       dataDir = mkOption {
-        default = "/var/db/postgresql-${cfg.package.psqlSchema}";
+        default = "/var/db/postgresql";
         description = ''
           Data directory for PostgreSQL.
         '';
-- 
GitLab


From 0ff2d2755be9e75f678fde2ddb8bb9f0e9da98ae Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Fri, 5 Apr 2013 13:59:43 -0400
Subject: [PATCH 4534/5331] release-combined: Remove maintainers from
 everything but `tested'

This will make it possible to turn on email notifications for the
`tested' job without duplicating emails for all the other jobs

Signed-off-by: Shea Levy <shea@shealevy.com>
---
 release-combined.nix | 23 +++++++++++++++--------
 1 file changed, 15 insertions(+), 8 deletions(-)

diff --git a/release-combined.nix b/release-combined.nix
index dbd56b18524..5efd8f36fa8 100644
--- a/release-combined.nix
+++ b/release-combined.nix
@@ -3,21 +3,28 @@
 , officialRelease ? false
 }:
 
-let nixpkgs' = nixpkgs; pkgs = import <nixpkgs> {}; in # urgh
-
-rec {
-
-  nixos = import ./release.nix {
+let
+  nixpkgs' = nixpkgs; # urgh
+
+  pkgs = import <nixpkgs> {};
+
+  removeMaintainers = set: if builtins.isAttrs set
+    then if (set.type or "") == "derivation"
+      then set // { meta = builtins.removeAttrs (set.meta or {}) [ "maintainers" ]; }
+      else pkgs.lib.mapAttrs (n: v: removeMaintainers v) set
+    else set;
+in rec {
+  nixos = removeMaintainers (import ./release.nix {
     inherit nixosSrc officialRelease;
     nixpkgs = nixpkgs';
-  };
+  });
 
-  nixpkgs = import <nixpkgs/pkgs/top-level/release.nix> {
+  nixpkgs = removeMaintainers (import <nixpkgs/pkgs/top-level/release.nix> {
     inherit officialRelease;
     nixpkgs = nixpkgs';
     # Only do Linux builds.
     supportedSystems = [ "x86_64-linux" "i686-linux" ];
-  };
+  });
 
   tested = pkgs.releaseTools.aggregate {
     name = "nixos-${nixos.tarball.version}";
-- 
GitLab


From 92ad293d028d66fa8d1a25cd43f5db87b160bedb Mon Sep 17 00:00:00 2001
From: Florian Friesdorf <flo@chaoflow.net>
Date: Sat, 6 Apr 2013 18:24:12 +0200
Subject: [PATCH 4535/5331] iso_minimal_new_kernel

---
 .../cd-dvd/installation-cd-minimal-new-kernel.nix         | 8 ++++++++
 release.nix                                               | 6 ++++++
 2 files changed, 14 insertions(+)
 create mode 100644 modules/installer/cd-dvd/installation-cd-minimal-new-kernel.nix

diff --git a/modules/installer/cd-dvd/installation-cd-minimal-new-kernel.nix b/modules/installer/cd-dvd/installation-cd-minimal-new-kernel.nix
new file mode 100644
index 00000000000..203c2d975fd
--- /dev/null
+++ b/modules/installer/cd-dvd/installation-cd-minimal-new-kernel.nix
@@ -0,0 +1,8 @@
+{ config, pkgs, ... }:
+
+{
+  require = [ ./installation-cd-minimal.nix ];
+
+  boot.kernelPackages = pkgs.linuxPackages_3_7;
+  boot.vesa = false;
+}
diff --git a/release.nix b/release.nix
index ffaef1f0279..956ca7e3452 100644
--- a/release.nix
+++ b/release.nix
@@ -145,6 +145,12 @@ in {
     inherit system;
   });
 
+  iso_minimal_new_kernel = pkgs.lib.genAttrs systems (system: makeIso {
+    module = ./modules/installer/cd-dvd/installation-cd-minimal-new-kernel.nix;
+    type = "minimal-new-kernel";
+    inherit system;
+  });
+
   iso_graphical = pkgs.lib.genAttrs systems (system: makeIso {
     module = ./modules/installer/cd-dvd/installation-cd-graphical.nix;
     type = "graphical";
-- 
GitLab


From 8d5c252ae1918b5d5b7bec7436a0bfc7fffcb89f Mon Sep 17 00:00:00 2001
From: Domen Kozar <domen@dev.si>
Date: Sat, 6 Apr 2013 23:35:04 +0200
Subject: [PATCH 4536/5331] add thinkfan service

---
 modules/module-list.nix                |  1 +
 modules/services/hardware/thinkfan.nix | 88 ++++++++++++++++++++++++++
 2 files changed, 89 insertions(+)
 create mode 100644 modules/services/hardware/thinkfan.nix

diff --git a/modules/module-list.nix b/modules/module-list.nix
index 7e07ee5ddfe..40f1d1e8676 100644
--- a/modules/module-list.nix
+++ b/modules/module-list.nix
@@ -83,6 +83,7 @@
   ./services/hardware/udev.nix
   ./services/hardware/udisks.nix
   ./services/hardware/upower.nix
+  ./services/hardware/thinkfan.nix
   ./services/logging/klogd.nix
   ./services/logging/logcheck.nix
   ./services/logging/logrotate.nix
diff --git a/modules/services/hardware/thinkfan.nix b/modules/services/hardware/thinkfan.nix
new file mode 100644
index 00000000000..7961477da85
--- /dev/null
+++ b/modules/services/hardware/thinkfan.nix
@@ -0,0 +1,88 @@
+{ config, pkgs, ... }:
+
+with pkgs.lib;
+
+let
+
+  cfg = config.services.thinkfan;
+  configFile = pkgs.writeText "thinkfan.conf" ''
+    # ATTENTION: There is only very basic sanity checking on the configuration.
+    # That means you can set your temperature limits as insane as you like. You
+    # can do anything stupid, e.g. turn off your fan when your CPU reaches 70°C.
+    #
+    # That's why this program is called THINKfan: You gotta think for yourself.
+    #
+    ######################################################################
+    #
+    # IBM/Lenovo Thinkpads (thinkpad_acpi, /proc/acpi/ibm)
+    # ====================================================
+    #
+    # IMPORTANT:
+    #
+    # To keep your HD from overheating, you have to specify a correction value for
+    # the sensor that has the HD's temperature. You need to do this because
+    # thinkfan uses only the highest temperature it can find in the system, and
+    # that'll most likely never be your HD, as most HDs are already out of spec
+    # when they reach 55 °C.
+    # Correction values are applied from left to right in the same order as the
+    # temperatures are read from the file.
+    #
+    # For example:
+    # sensor /proc/acpi/ibm/thermal (0, 0, 10)
+    # will add a fixed value of 10 °C the 3rd value read from that file. Check out
+    # http://www.thinkwiki.org/wiki/Thermal_Sensors to find out how much you may
+    # want to add to certain temperatures.
+    
+    #  Syntax:
+    #  (LEVEL, LOW, HIGH)
+    #  LEVEL is the fan level to use (0-7 with thinkpad_acpi)
+    #  LOW is the temperature at which to step down to the previous level
+    #  HIGH is the temperature at which to step up to the next level
+    #  All numbers are integers.
+    #
+
+    sensor /proc/acpi/ibm/thermal (0, 10, 15, 2, 10, 5, 0, 3, 0, 3)
+    
+    (0,     0,      55)
+    (1,     48,     60)
+    (2,     50,     61)
+    (3,     52,     63)
+    (6,     56,     65)
+    (7,     60,     85)
+    (127,   80,     32767)
+  '';
+
+in {
+
+  options = {
+
+    services.thinkfan = {
+
+      enable = mkOption {
+        default = false;
+        description = ''
+          Whether to enable thinkfan, fan controller for ibm/lenovo thinkpads.
+        '';
+      };
+
+    };
+
+  };
+
+  config = mkIf cfg.enable {
+
+    environment.systemPackages = [ pkgs.thinkfan ];
+
+    systemd.services.thinkfan = {
+      description = "Thinkfan";
+      after = [ "basic.target" ];
+      wantedBy = [ "multi-user.target" ];
+      path = [ pkgs.thinkfan ];
+      serviceConfig.ExecStart = "${pkgs.thinkfan}/bin/thinkfan -n -c ${configFile}";
+    };
+
+    boot.extraModprobeConfig = "options thinkpad_acpi experimental=1 fan_control=1";
+
+  };
+
+}
-- 
GitLab


From 86f11dadaaf580fcc2a341e8b3ba6e66551cd37d Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 8 Apr 2013 17:34:14 +0200
Subject: [PATCH 4537/5331] switch-to-configuration: Use full path to sync

---
 modules/system/activation/switch-to-configuration.pl | 2 +-
 modules/system/activation/top-level.nix              | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/system/activation/switch-to-configuration.pl b/modules/system/activation/switch-to-configuration.pl
index 4db53c9043e..ea9f8cb5a9a 100644
--- a/modules/system/activation/switch-to-configuration.pl
+++ b/modules/system/activation/switch-to-configuration.pl
@@ -36,7 +36,7 @@ if ($action eq "switch" || $action eq "boot") {
 }
 
 # Just in case the new configuration hangs the system, do a sync now.
-system("sync") unless ($ENV{"NIXOS_NO_SYNC"} // "") eq "1";
+system("@coreutils@/bin/sync") unless ($ENV{"NIXOS_NO_SYNC"} // "") eq "1";
 
 exit 0 if $action eq "boot";
 
diff --git a/modules/system/activation/top-level.nix b/modules/system/activation/top-level.nix
index 7246271c7b2..9f6a8f8583a 100644
--- a/modules/system/activation/top-level.nix
+++ b/modules/system/activation/top-level.nix
@@ -148,7 +148,7 @@ let
     preferLocalBuild = true;
     buildCommand = systemBuilder;
 
-    inherit (pkgs) utillinux;
+    inherit (pkgs) utillinux coreutils;
     systemd = config.systemd.package;
 
     inherit children;
-- 
GitLab


From b2b221d53393453cc36c75c51d2322e5cf10f12e Mon Sep 17 00:00:00 2001
From: Rickard Nilsson <rickynils@gmail.com>
Date: Tue, 9 Apr 2013 16:44:07 +0200
Subject: [PATCH 4538/5331] Add unionfs-fuse to system.fsPackages if needed

---
 modules/tasks/filesystems/unionfs-fuse.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/modules/tasks/filesystems/unionfs-fuse.nix b/modules/tasks/filesystems/unionfs-fuse.nix
index 48cf798c7f0..18f61cad7ab 100644
--- a/modules/tasks/filesystems/unionfs-fuse.nix
+++ b/modules/tasks/filesystems/unionfs-fuse.nix
@@ -15,5 +15,7 @@
         ln -s $(which mount) /nix/store/eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee-${pkgs.utillinux.name}/bin
         ln -s $(which umount) /nix/store/eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee-${pkgs.utillinux.name}/bin
       '';
+  } // pkgs.lib.mkIf (pkgs.lib.any (fs: fs == "unionfs-fuse") config.boot.supportedFilesystems) {
+    system.fsPackages = [ pkgs.unionfs-fuse ];
   };
 }
-- 
GitLab


From 0ccc107300bb9c605a62b2c656cb39c4fc8cd561 Mon Sep 17 00:00:00 2001
From: Rickard Nilsson <rickynils@gmail.com>
Date: Tue, 9 Apr 2013 19:20:09 +0200
Subject: [PATCH 4539/5331] nslcd: Start after network.target (but don't
 require network)

---
 modules/config/ldap.nix | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/modules/config/ldap.nix b/modules/config/ldap.nix
index 603ad8407cd..955d28514ea 100644
--- a/modules/config/ldap.nix
+++ b/modules/config/ldap.nix
@@ -223,9 +223,9 @@ mkIf cfg.enable {
   systemd.services = mkIf cfg.daemon.enable {
     nslcd = {
       wantedBy = [ "nss-user-lookup.target" ];
+      before = [ "nss-user-lookup.target" ];
+      after = [ "network.target" ];
 
-      path = [ nss_pam_ldapd ];
-  
       preStart = ''
         mkdir -p /run/nslcd
         rm -f /run/nslcd/nslcd.pid;
@@ -237,9 +237,8 @@ mkIf cfg.enable {
         ''}
       '';
 
-      script = "nslcd";
-
       serviceConfig = {
+        ExecStart = "${nss_pam_ldapd}/sbin/nslcd";
         Type = "forking";
         PIDFile = "/run/nslcd/nslcd.pid";
         Restart = "always";
-- 
GitLab


From c59761e994e18428a4c7e31d90e36511f11fb302 Mon Sep 17 00:00:00 2001
From: Rickard Nilsson <rickynils@gmail.com>
Date: Tue, 9 Apr 2013 17:50:53 +0200
Subject: [PATCH 4540/5331] openldap: Adjust to systemd

---
 modules/services/databases/openldap.nix | 22 +++++++++-------------
 1 file changed, 9 insertions(+), 13 deletions(-)

diff --git a/modules/services/databases/openldap.nix b/modules/services/databases/openldap.nix
index 33a4a25e213..a4dd30be1fb 100644
--- a/modules/services/databases/openldap.nix
+++ b/modules/services/databases/openldap.nix
@@ -43,19 +43,15 @@ in
 
     environment.systemPackages = [ openldap ];
 
-    jobs.openldap =
-      {
-        description = "LDAP server";
-
-        startOn = "filesystem";
-        daemonType = "fork";
-
-        preStart =
-          ''
-            mkdir -p /var/run/slapd
-          '';
-        exec = "${openldap}/libexec/slapd -f ${configFile}";
-      };
+    systemd.services.openldap = {
+      description = "LDAP server";
+      wantedBy = [ "multi-user.target" ];
+      after = [ "network.target" ];
+      preStart = ''
+        mkdir -p /var/run/slapd
+      '';
+      serviceConfig.ExecStart = "${openldap}/libexec/slapd -d 0 -f ${configFile}";
+    };
 
   };
 
-- 
GitLab


From bf2707d359fe411d98dbbd3432fdedeb5a05752a Mon Sep 17 00:00:00 2001
From: Rickard Nilsson <rickynils@gmail.com>
Date: Wed, 10 Apr 2013 14:06:29 +0200
Subject: [PATCH 4541/5331] unionfs-fuse: Fix conditional expressions

---
 modules/tasks/filesystems/unionfs-fuse.nix | 35 ++++++++++++----------
 1 file changed, 19 insertions(+), 16 deletions(-)

diff --git a/modules/tasks/filesystems/unionfs-fuse.nix b/modules/tasks/filesystems/unionfs-fuse.nix
index 18f61cad7ab..177c97f85c7 100644
--- a/modules/tasks/filesystems/unionfs-fuse.nix
+++ b/modules/tasks/filesystems/unionfs-fuse.nix
@@ -1,21 +1,24 @@
 { config, pkgs, ... }:
 
 {
-  config = pkgs.lib.mkIf (pkgs.lib.any (fs: fs == "unionfs-fuse") config.boot.initrd.supportedFilesystems) {
-    boot.initrd.kernelModules = [ "fuse" ];
-
-    boot.initrd.extraUtilsCommands = ''
-      cp -v ${pkgs.fuse}/lib/libfuse* $out/lib
-      cp -v ${pkgs.unionfs-fuse}/bin/unionfs $out/bin
-    '';
-
-    boot.initrd.postDeviceCommands = ''
-        # Hacky!!! fuse hard-codes the path to mount
-        mkdir -p /nix/store/eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee-${pkgs.utillinux.name}/bin
-        ln -s $(which mount) /nix/store/eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee-${pkgs.utillinux.name}/bin
-        ln -s $(which umount) /nix/store/eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee-${pkgs.utillinux.name}/bin
+  config = pkgs.lib.mkMerge [
+    (pkgs.lib.mkIf (pkgs.lib.any (fs: fs == "unionfs-fuse") config.boot.initrd.supportedFilesystems) {
+      boot.initrd.kernelModules = [ "fuse" ];
+  
+      boot.initrd.extraUtilsCommands = ''
+        cp -v ${pkgs.fuse}/lib/libfuse* $out/lib
+        cp -v ${pkgs.unionfs-fuse}/bin/unionfs $out/bin
       '';
-  } // pkgs.lib.mkIf (pkgs.lib.any (fs: fs == "unionfs-fuse") config.boot.supportedFilesystems) {
-    system.fsPackages = [ pkgs.unionfs-fuse ];
-  };
+  
+      boot.initrd.postDeviceCommands = ''
+          # Hacky!!! fuse hard-codes the path to mount
+          mkdir -p /nix/store/eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee-${pkgs.utillinux.name}/bin
+          ln -s $(which mount) /nix/store/eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee-${pkgs.utillinux.name}/bin
+          ln -s $(which umount) /nix/store/eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee-${pkgs.utillinux.name}/bin
+        '';
+    })
+    (pkgs.lib.mkIf (pkgs.lib.any (fs: fs == "unionfs-fuse") config.boot.supportedFilesystems) {
+      system.fsPackages = [ pkgs.unionfs-fuse ];
+    })
+  ];
 }
-- 
GitLab


From 6a1e1fa108f9ccf0d9ce27cfaa8102288b3504e5 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Wed, 10 Apr 2013 09:15:54 -0400
Subject: [PATCH 4542/5331] nixos-install: Bind-mount efivars if it exists

Signed-off-by: Shea Levy <shea@shealevy.com>
---
 modules/installer/tools/nixos-install.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/modules/installer/tools/nixos-install.sh b/modules/installer/tools/nixos-install.sh
index 15c10121636..de1cd7fb1b6 100644
--- a/modules/installer/tools/nixos-install.sh
+++ b/modules/installer/tools/nixos-install.sh
@@ -48,6 +48,7 @@ mount --bind /dev $mountPoint/dev
 mount --bind /dev/shm $mountPoint/dev/shm
 mount --bind /proc $mountPoint/proc
 mount --bind /sys $mountPoint/sys
+mount --bind /sys/firmware/efi/efivars $mountPoint/sys/firmware/efi/efivars &>/dev/null || true
 mount --bind $mountPoint/etc/nixos $mountPoint/mnt2
 mount --bind /etc $mountPoint/etc
 mount --bind $mountPoint/mnt2 $mountPoint/etc/nixos
-- 
GitLab


From a2156003355a0475161b5ba78ec718214ae7dc7c Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Wed, 10 Apr 2013 15:08:21 -0400
Subject: [PATCH 4543/5331] nixos-install: Unmount efivars if mounted

Signed-off-by: Shea Levy <shea@shealevy.com>
---
 modules/installer/tools/nixos-install.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/modules/installer/tools/nixos-install.sh b/modules/installer/tools/nixos-install.sh
index de1cd7fb1b6..74e9170d1c5 100644
--- a/modules/installer/tools/nixos-install.sh
+++ b/modules/installer/tools/nixos-install.sh
@@ -58,6 +58,7 @@ cleanup() {
     mountpoint -q $mountPoint/etc/nixos && umount $mountPoint/etc/nixos
     mountpoint -q $mountPoint/etc && umount $mountPoint/etc
     umount $mountPoint/mnt2
+    umount $mountPoint/sys/firmware/efi/efivars &>/dev/null || true
     umount $mountPoint/sys
     umount $mountPoint/proc
     umount $mountPoint/dev/shm
-- 
GitLab


From 9bf073b58b10a2bb0588f4e56550867e139b07be Mon Sep 17 00:00:00 2001
From: Marc Weber <marco-oweber@gmx.de>
Date: Wed, 10 Apr 2013 23:49:59 +0200
Subject: [PATCH 4544/5331] s/boot.grubDevice/boot.loader.grub.device/ to shut
 down warnings

---
 doc/config-examples/closed-install-configuration.nix | 2 +-
 doc/config-examples/svn-server.nix                   | 2 +-
 doc/config-examples/x86_64-usbstick.nix              | 2 +-
 doc/manual/installation.xml                          | 2 +-
 modules/system/activation/no-clone.nix               | 2 --
 5 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/doc/config-examples/closed-install-configuration.nix b/doc/config-examples/closed-install-configuration.nix
index fed557ddd0d..0cebacdb0cc 100644
--- a/doc/config-examples/closed-install-configuration.nix
+++ b/doc/config-examples/closed-install-configuration.nix
@@ -1,6 +1,6 @@
 {
   boot = {
-    grubDevice = "/dev/sda";
+    loader.grub.device = "/dev/sda";
     copyKernels = true;
     bootMount = "(hd0,0)";
   };
diff --git a/doc/config-examples/svn-server.nix b/doc/config-examples/svn-server.nix
index 68a3374987f..e727007117b 100644
--- a/doc/config-examples/svn-server.nix
+++ b/doc/config-examples/svn-server.nix
@@ -1,6 +1,6 @@
 {
   boot = {
-    grubDevice = "/dev/sda";
+    loader.grub.device = "/dev/sda";
   };
 
   fileSystems = [
diff --git a/doc/config-examples/x86_64-usbstick.nix b/doc/config-examples/x86_64-usbstick.nix
index b76a07b0d57..492b7a841a1 100644
--- a/doc/config-examples/x86_64-usbstick.nix
+++ b/doc/config-examples/x86_64-usbstick.nix
@@ -2,7 +2,7 @@
 
 {
   boot = {
-    grubDevice = "/dev/sda";
+    loader.grub.device = "/dev/sda";
     initrd = {
       kernelModules = ["usb_storage" "ehci_hcd" "ohci_hcd"];
       enableSplashScreen = false;
diff --git a/doc/manual/installation.xml b/doc/manual/installation.xml
index b040b4ff164..7761fc97245 100644
--- a/doc/manual/installation.xml
+++ b/doc/manual/installation.xml
@@ -118,7 +118,7 @@ $ nixos-option --install</screen>
 
     <para>You need to specify a root file system in
     <option>fileSystems</option> and the target device for the Grub boot
-    loader in <option>boot.grubDevice</option>.  See
+    loader in <option>boot.loader.grub.device</option>.  See
     <xref linkend="ch-options"/> for a list of the available configuration
     options.</para>
 
diff --git a/modules/system/activation/no-clone.nix b/modules/system/activation/no-clone.nix
index d28183d2dc4..f15809e4d8b 100644
--- a/modules/system/activation/no-clone.nix
+++ b/modules/system/activation/no-clone.nix
@@ -6,8 +6,6 @@ with pkgs.lib;
 
 {
   boot.loader.grub.device = mkOverrideTemplate 0 {} "nodev";
-  # undefined the obsolete name of the previous option.
-  boot.grubDevice = mkOverrideTemplate 0 {} pkgs.lib.mkNotdef;
   nesting.children = mkOverrideTemplate 0 {} [];
   nesting.clone = mkOverrideTemplate 0 {} [];
 }
-- 
GitLab


From e627d309fd7adc09173955aae672775d92f6be59 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 10 Apr 2013 17:35:05 +0200
Subject: [PATCH 4545/5331] bash-completion: support the
 "$out/share/bash-completion" location used by modern packages

---
 modules/programs/bash/bash.nix | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/modules/programs/bash/bash.nix b/modules/programs/bash/bash.nix
index 493df762e17..d227ef729db 100644
--- a/modules/programs/bash/bash.nix
+++ b/modules/programs/bash/bash.nix
@@ -18,7 +18,7 @@ let
       nullglobStatus=$(shopt -p nullglob)
       shopt -s nullglob
       for p in $NIX_PROFILES; do
-        for m in "$p/etc/bash_completion.d/"*; do
+        for m in "$p/etc/bash_completion.d/"* "$p/share/bash-completion/completions/"*; do
           . $m
         done
       done
@@ -146,5 +146,8 @@ in
       mv /bin/.sh.tmp /bin/sh # atomically replace /bin/sh
     '';
 
-  environment.pathsToLink = optional cfg.enableBashCompletion "/etc/bash_completion.d";
+  environment.pathsToLink = optionals cfg.enableBashCompletion [
+    "/etc/bash_completion.d"
+    "/share/bash-completion"
+  ];
 }
-- 
GitLab


From 56e678725d0ab538ad56be269f52cb30bb585606 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 11 Apr 2013 14:23:35 +0200
Subject: [PATCH 4546/5331] Remove Upstart reference

---
 modules/tasks/network-interfaces.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/tasks/network-interfaces.nix b/modules/tasks/network-interfaces.nix
index 9e48500d177..93290e3bfdf 100644
--- a/modules/tasks/network-interfaces.nix
+++ b/modules/tasks/network-interfaces.nix
@@ -166,7 +166,7 @@ in
       example = "text=anything; echo You can put $text here.";
       description = ''
         Shell commands to be executed at the end of the
-        <literal>network-interfaces</literal> Upstart job.  Note that if
+        <literal>network-setup</literal> systemd service.  Note that if
         you are using DHCP to obtain the network configuration,
         interfaces may not be fully configured yet.
       '';
-- 
GitLab


From e28b0453bfc6be8f87106960714517fcdb1f3757 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 11 Apr 2013 17:28:16 +0200
Subject: [PATCH 4547/5331] MediaWiki: Update to 1.20.3

---
 modules/services/web-servers/apache-httpd/mediawiki.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/modules/services/web-servers/apache-httpd/mediawiki.nix b/modules/services/web-servers/apache-httpd/mediawiki.nix
index 2941c6d0d5a..04899839b7a 100644
--- a/modules/services/web-servers/apache-httpd/mediawiki.nix
+++ b/modules/services/web-servers/apache-httpd/mediawiki.nix
@@ -72,11 +72,11 @@ let
 
   # Unpack Mediawiki and put the config file in its root directory.
   mediawikiRoot = pkgs.stdenv.mkDerivation rec {
-    name= "mediawiki-1.15.5";
+    name= "mediawiki-1.20.3";
 
     src = pkgs.fetchurl {
-      url = "http://download.wikimedia.org/mediawiki/1.15/${name}.tar.gz";
-      sha256 = "1d8afbdh3lsg54b69mnh6a47psb3lg978xpp277qs08yz15cjf7q";
+      url = "http://download.wikimedia.org/mediawiki/1.20/${name}.tar.gz";
+      sha256 = "046jcq54xla490sx0pn0w169wj74lqj3n87r39s59in6494lwp4a";
     };
 
     skins = config.skins;
@@ -100,7 +100,7 @@ let
     { buildInputs = [ pkgs.makeWrapper ]; }
     ''
       ensureDir $out/bin
-      for i in changePassword.php createAndPromote.php userOptions.php edit.php nukePage.php; do
+      for i in changePassword.php createAndPromote.php userOptions.php edit.php nukePage.php update.php; do
         makeWrapper ${php}/bin/php $out/bin/mediawiki-${config.id}-$(basename $i .php) \
           --add-flags ${mediawikiRoot}/maintenance/$i
       done
-- 
GitLab


From 6e0723bac645aa8e2eb622cc839188e66de25d3e Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Thu, 11 Apr 2013 16:12:43 -0400
Subject: [PATCH 4548/5331] nixos-install: Mound nixos and nixpkgs src directly

Previously nixos-install would fail if nixos and nixpkgs weren't on the same mountpoint as /

Signed-off-by: Shea Levy <shea@shealevy.com>
---
 modules/installer/tools/nixos-install.sh | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/modules/installer/tools/nixos-install.sh b/modules/installer/tools/nixos-install.sh
index 74e9170d1c5..fd8b9b28065 100644
--- a/modules/installer/tools/nixos-install.sh
+++ b/modules/installer/tools/nixos-install.sh
@@ -39,7 +39,7 @@ fi
 # Mount some stuff in the target root directory.  We bind-mount /etc
 # into the chroot because we need networking and the nixbld user
 # accounts in /etc/passwd.  But we do need the target's /etc/nixos.
-mkdir -m 0755 -p $mountPoint/dev $mountPoint/proc $mountPoint/sys $mountPoint/mnt $mountPoint/mnt2 $mountPoint/etc /etc/nixos
+mkdir -m 0755 -p $mountPoint/dev $mountPoint/proc $mountPoint/sys $mountPoint/mnt $mountPoint/mnt2 $mountPoint/mnt-nixos $mountPoint/mnt-nixpkgs $mountPoint/etc /etc/nixos
 mount --make-private / # systemd makes / shared, which is annoying
 mount --bind / $mountPoint/mnt
 mount --bind /nix $mountPoint/mnt/nix
@@ -58,6 +58,8 @@ cleanup() {
     mountpoint -q $mountPoint/etc/nixos && umount $mountPoint/etc/nixos
     mountpoint -q $mountPoint/etc && umount $mountPoint/etc
     umount $mountPoint/mnt2
+    umount $mountPoint/mnt-nixos
+    umount $mountPoint/mnt-nixpkgs
     umount $mountPoint/sys/firmware/efi/efivars &>/dev/null || true
     umount $mountPoint/sys
     umount $mountPoint/proc
@@ -66,7 +68,7 @@ cleanup() {
     umount $mountPoint/mnt/nix/store
     umount $mountPoint/mnt/nix
     umount $mountPoint/mnt
-    rmdir $mountPoint/mnt $mountPoint/mnt2
+    rmdir $mountPoint/mnt $mountPoint/mnt2 $mountPoint/mnt-nixos $mountPoint/mnt-nixpkgs
 }
 
 trap "cleanup" EXIT
@@ -165,14 +167,14 @@ done
 
 
 # Get the absolute path to the NixOS/Nixpkgs sources.
-nixpkgs_src=$(readlink -f $(nix-instantiate --find-file nixpkgs))
-nixos_src=$(readlink -f $(nix-instantiate --find-file nixos))
+mount --bind $(readlink -f $(nix-instantiate --find-file nixpkgs)) $mountPoint/mnt-nixpkgs
+mount --bind $(readlink -f $(nix-instantiate --find-file nixos)) $mountPoint/mnt-nixos
 
 
 # Build the specified Nix expression in the target store and install
 # it into the system configuration profile.
 echo "building the system configuration..."
-NIX_PATH="nixpkgs=/mnt$nixpkgs_src:nixos=/mnt$nixos_src:nixos-config=$NIXOS_CONFIG" NIXOS_CONFIG= \
+NIX_PATH="nixpkgs=/mnt-nixpkgs:nixos=/mnt-nixos:nixos-config=$NIXOS_CONFIG" NIXOS_CONFIG= \
     chroot $mountPoint @nix@/bin/nix-env \
     -p /nix/var/nix/profiles/system -f '<nixos>' --set -A system --show-trace
 
-- 
GitLab


From ce8c145a980f702add65d2b20a548b4ab67a7d24 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Thu, 11 Apr 2013 16:18:24 -0400
Subject: [PATCH 4549/5331] nixos-install: Include nix's perl libs in perl's
 INC

Signed-off-by: Shea Levy <shea@shealevy.com>
---
 modules/installer/tools/nixos-install.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/installer/tools/nixos-install.sh b/modules/installer/tools/nixos-install.sh
index fd8b9b28065..2b7d73c43a5 100644
--- a/modules/installer/tools/nixos-install.sh
+++ b/modules/installer/tools/nixos-install.sh
@@ -89,7 +89,7 @@ mkdir -m 0755 -p \
     $mountPoint/nix/var/log/nix/drvs
 
 mkdir -m 1775 -p $mountPoint/nix/store
-build_users_group=$(@perl@/bin/perl -e 'use Nix::Config; Nix::Config::readConfig; print $Nix::Config::config{"build-users-group"};')
+build_users_group=$(@perl@/bin/perl -I @nix@/lib/perl5/site_perl/*/* -e 'use Nix::Config; Nix::Config::readConfig; print $Nix::Config::config{"build-users-group"};')
 if test -n "$build_users_group"; then
     chown root:"$build_users_group" $mountPoint/nix/store
 else
@@ -125,7 +125,7 @@ unset NIX_REMOTE
 if test -n "$build_users_group"; then
     echo "build-users-group = $build_users_group" > $mountPoint/tmp/nix.conf
 fi
-binary_caches=$(@perl@/bin/perl -e 'use Nix::Config; Nix::Config::readConfig; print $Nix::Config::config{"binary-caches"};')
+binary_caches=$(@perl@/bin/perl -I @nix@/lib/perl5/site_perl/*/* -e 'use Nix::Config; Nix::Config::readConfig; print $Nix::Config::config{"binary-caches"};')
 if test -n "$binary_caches"; then
     echo "binary-caches = $binary_caches" >> $mountPoint/tmp/nix.conf
 fi
-- 
GitLab


From edc12de8c9de9a9ba425d86a9aeea034acd2390e Mon Sep 17 00:00:00 2001
From: Jack Cummings <jack@mudshark.org>
Date: Fri, 12 Apr 2013 23:25:32 -0700
Subject: [PATCH 4550/5331] add wantedBy network.target so that hostapd starts
 by default

---
 modules/services/networking/hostapd.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/modules/services/networking/hostapd.nix b/modules/services/networking/hostapd.nix
index ca17c92ddc0..4edea12b6be 100644
--- a/modules/services/networking/hostapd.nix
+++ b/modules/services/networking/hostapd.nix
@@ -150,6 +150,7 @@ in
       { description = "hostapd wireless AP";
 
         path = [ pkgs.hostapd ]; 
+        wantedBy = [ "network.target" ];
 
         after = [ "${cfg.interface}-cfg.service" "nat.service" "bind.service" "dhcpd.service"];
 
-- 
GitLab


From 8e7bb847c6b1729846b9346432796aa9de92e5e9 Mon Sep 17 00:00:00 2001
From: orbitz <orbitz@gmail.com>
Date: Sun, 14 Apr 2013 11:14:27 +0200
Subject: [PATCH 4551/5331] Cleanup whitespaces

---
 modules/services/web-servers/nginx/default.nix | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/modules/services/web-servers/nginx/default.nix b/modules/services/web-servers/nginx/default.nix
index 628572f7bf3..e567646ea46 100644
--- a/modules/services/web-servers/nginx/default.nix
+++ b/modules/services/web-servers/nginx/default.nix
@@ -1,14 +1,14 @@
 { config, pkgs, ... }:
- 
+
 with pkgs.lib;
- 
+
 let
   cfg = config.services.nginx;
   configFile = pkgs.writeText "nginx.conf" ''
     ${cfg.config}
   '';
 in
- 
+
 {
   options = {
     services.nginx = {
@@ -18,7 +18,7 @@ in
           Enable the nginx Web Server.
         ";
       };
- 
+
       config = mkOption {
         default = "";
         description = "
@@ -33,14 +33,14 @@ in
         ";
       };
     };
- 
+
   };
- 
+
   config = mkIf cfg.enable {
     environment.systemPackages = [ pkgs.nginx ];
 
     # TODO: test user supplied config file pases syntax test
- 
+
     systemd.services.nginx = {
       description = "Nginx Web Server";
       after = [ "network.target" ];
@@ -55,11 +55,11 @@ in
         ExecStart = "${pkgs.nginx}/bin/nginx -c ${configFile} -p ${cfg.stateDir}";
       };
     };
- 
+
     users.extraUsers.nginx = {
       group = "nginx";
     };
- 
+
     users.extraGroups.nginx = {};
   };
 }
-- 
GitLab


From 388d83c5862a21c16879bef7cd53a85c52db723f Mon Sep 17 00:00:00 2001
From: orbitz <orbitz@gmail.com>
Date: Sun, 14 Apr 2013 11:17:16 +0200
Subject: [PATCH 4552/5331] Set required nginx options and sane default

---
 modules/services/web-servers/nginx/default.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/modules/services/web-servers/nginx/default.nix b/modules/services/web-servers/nginx/default.nix
index e567646ea46..c9c242400f7 100644
--- a/modules/services/web-servers/nginx/default.nix
+++ b/modules/services/web-servers/nginx/default.nix
@@ -5,6 +5,8 @@ with pkgs.lib;
 let
   cfg = config.services.nginx;
   configFile = pkgs.writeText "nginx.conf" ''
+    user nginx nginx;
+    daemon off;
     ${cfg.config}
   '';
 in
@@ -20,7 +22,7 @@ in
       };
 
       config = mkOption {
-        default = "";
+        default = "events {}";
         description = "
           Verbatim nginx.conf configuration.
         ";
-- 
GitLab


From 3be4fd3f3899f3dbdee203a00ae068947e2914ef Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= <viric@viric.name>
Date: Tue, 16 Apr 2013 11:09:25 +0200
Subject: [PATCH 4553/5331] Making grub display 'All configurations', not 'Old'

That confused some people, as the first generation shown is
the 'current'.
---
 modules/system/boot/loader/grub/install-grub.pl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/system/boot/loader/grub/install-grub.pl b/modules/system/boot/loader/grub/install-grub.pl
index f06527aaaec..738714ba714 100644
--- a/modules/system/boot/loader/grub/install-grub.pl
+++ b/modules/system/boot/loader/grub/install-grub.pl
@@ -194,7 +194,7 @@ $conf .= "$extraEntries\n" unless $extraEntriesBeforeNixOS;
 $conf =~ s/\@bootRoot\@/$bootRoot/g;
 
 # Add entries for all previous generations of the system profile.
-$conf .= "submenu \"NixOS - Old configurations\" {\n" if $grubVersion == 2;
+$conf .= "submenu \"NixOS - All configurations\" {\n" if $grubVersion == 2;
 
 sub nrFromGen { my ($x) = @_; $x =~ /system-(.*)-link/; return $1; }
 
-- 
GitLab


From 4be036ca648409017fc9a98c9c63a914df79e8b8 Mon Sep 17 00:00:00 2001
From: Moritz Ulrich <moritz@tarn-vedra.de>
Date: Tue, 16 Apr 2013 17:01:35 +0200
Subject: [PATCH 4554/5331] ssmtp: Add AuthUser and AuthPass options.

Signed-off-by: Moritz Ulrich <moritz@tarn-vedra.de>
---
 modules/programs/ssmtp.nix | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/modules/programs/ssmtp.nix b/modules/programs/ssmtp.nix
index 2859f70e6aa..dab5235d4e9 100644
--- a/modules/programs/ssmtp.nix
+++ b/modules/programs/ssmtp.nix
@@ -63,6 +63,22 @@ let
         ";
       };
 
+      authUser = mkOption {
+        default = "";
+        example = "foo@example.org";
+        description = "
+          Username used for SMTP auth. Leave blank to disable.
+        ";
+      };
+
+      authPass = mkOption {
+        default = "";
+        example = "correctHorseBatteryStaple";
+        default = "
+          Password used for SMTP auth.
+        ";
+      }
+
     };
 
   };
@@ -82,6 +98,8 @@ mkIf cfg.directDelivery {
           UseTLS=${if cfg.useTLS then "YES" else "NO"}
           UseSTARTTLS=${if cfg.useSTARTTLS then "YES" else "NO"}
           #Debug=YES
+          ${if cfg.authUser != "" then "AuthUser=${cfg.authUser}" else ""}
+          ${if cfg.authPass != "" then "AuthPass=${cfg.authPass}" else ""}
         '';
         target = "ssmtp/ssmtp.conf";
       }
-- 
GitLab


From 89cf51f2a4c4d96423c610bdf0f6b8174cc20e32 Mon Sep 17 00:00:00 2001
From: Moritz Ulrich <moritz@tarn-vedra.de>
Date: Tue, 16 Apr 2013 17:37:36 +0200
Subject: [PATCH 4555/5331] Forgot semicolon. (M)

Signed-off-by: Moritz Ulrich <moritz@tarn-vedra.de>
---
 modules/programs/ssmtp.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/programs/ssmtp.nix b/modules/programs/ssmtp.nix
index dab5235d4e9..abff4e707a0 100644
--- a/modules/programs/ssmtp.nix
+++ b/modules/programs/ssmtp.nix
@@ -77,7 +77,7 @@ let
         default = "
           Password used for SMTP auth.
         ";
-      }
+      };
 
     };
 
-- 
GitLab


From cc1ae918bd359de73d4b7bdd3b37759ce1fa5d61 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Tue, 16 Apr 2013 13:34:37 -0400
Subject: [PATCH 4556/5331] Fix cut-off comment in generated configuration.nix

Pointed out by Mathnerd626 on irc

Signed-off-by: Shea Levy <shea@shealevy.com>
---
 modules/installer/tools/nixos-option.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/installer/tools/nixos-option.sh b/modules/installer/tools/nixos-option.sh
index 47abac7fddd..4cc6ae64bdc 100644
--- a/modules/installer/tools/nixos-option.sh
+++ b/modules/installer/tools/nixos-option.sh
@@ -207,7 +207,7 @@ if $generate; then
 
   # Generate a template configuration file where the user has to
   # fill the gaps.
-  cat <<EOF > "$NIXOS_CONFIG" \
+  cat <<EOF > "$NIXOS_CONFIG"
 # Edit this configuration file to define what should be installed on
 # the system.  Help is available in the configuration.nix(5) man page
 # or the NixOS manual available on virtual console 8 (Alt+F8).
-- 
GitLab


From 04415eb58208312dd6af8a79a9c7a9f9e73cea5b Mon Sep 17 00:00:00 2001
From: Marco Maggesi <maggesi@math.unifi.it>
Date: Tue, 16 Apr 2013 19:46:12 +0200
Subject: [PATCH 4557/5331] Remove obsolete option in Xen domU module

---
 modules/virtualisation/xen-domU.nix | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/modules/virtualisation/xen-domU.nix b/modules/virtualisation/xen-domU.nix
index 29ab8f8b3af..1a9d67d7204 100644
--- a/modules/virtualisation/xen-domU.nix
+++ b/modules/virtualisation/xen-domU.nix
@@ -17,10 +17,6 @@
   # Send syslog messages to the Xen console.
   services.syslogd.tty = "hvc0";
 
-  # Start a mingetty on the Xen console (so that you can login using
-  # "xm console" in Dom0).
-  services.mingetty.ttys = [ "hvc0" "tty1" "tty2" ];
-
   # Don't run ntpd, since we should get the correct time from Dom0.
   services.ntp.enable = false;
 }
-- 
GitLab


From 927a3e3ff298746ed4d6c2831cf32518f0b8d94c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= <viric@viric.name>
Date: Wed, 17 Apr 2013 00:19:39 +0200
Subject: [PATCH 4558/5331] fcron: fixing the startOn, since upstart times.

---
 modules/services/scheduling/fcron.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/modules/services/scheduling/fcron.nix b/modules/services/scheduling/fcron.nix
index 812af1edfc0..95ff918eb6d 100644
--- a/modules/services/scheduling/fcron.nix
+++ b/modules/services/scheduling/fcron.nix
@@ -101,7 +101,9 @@ in
     jobs.fcron =
       { description = "fcron daemon";
 
-        startOn = "startup and filesystem";
+        startOn = "startup";
+
+        after = [ "local-fs.target" ];
 
         environment =
           { PATH = "/run/current-system/sw/bin";
-- 
GitLab


From 1caa1b96cba67e617b734744e22b5a7422b7bda7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= <viric@viric.name>
Date: Wed, 17 Apr 2013 09:10:18 +0200
Subject: [PATCH 4559/5331] network-interfaces: fixing a cat/EOF piping
 confusion

---
 modules/tasks/network-interfaces.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/tasks/network-interfaces.nix b/modules/tasks/network-interfaces.nix
index 93290e3bfdf..5346d9ad885 100644
--- a/modules/tasks/network-interfaces.nix
+++ b/modules/tasks/network-interfaces.nix
@@ -277,7 +277,7 @@ in
             script =
               ''
                 # Set the static DNS configuration, if given.
-                cat | ${pkgs.openresolv}/sbin/resolvconf -a static <<EOF
+                ${pkgs.openresolv}/sbin/resolvconf -a static <<EOF
                 ${optionalString (cfg.nameservers != [] && cfg.domain != "") ''
                   domain ${cfg.domain}
                 ''}
-- 
GitLab


From e32774c27038183b37c06ca1b5f7269b3db2ab9c Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Fri, 19 Apr 2013 10:49:46 -0400
Subject: [PATCH 4560/5331] rabbitmq.nix: Set SYS_PREFIX empty so files live in
 /var

Signed-off-by: Shea Levy <shea@shealevy.com>
---
 modules/services/amqp/rabbitmq.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/modules/services/amqp/rabbitmq.nix b/modules/services/amqp/rabbitmq.nix
index 88d6dc588d6..4afbafdd085 100644
--- a/modules/services/amqp/rabbitmq.nix
+++ b/modules/services/amqp/rabbitmq.nix
@@ -73,6 +73,7 @@ in
 
         environment.HOME = "/var/lib/rabbitmq";
         environment.RABBITMQ_NODE_IP_ADDRESS = cfg.listenAddress;
+        environment.SYS_PREFIX = "";
 
         exec =
           ''
-- 
GitLab


From 7a71320a9c8d1559badd5ad581b36ff9bb283331 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= <viric@viric.name>
Date: Sun, 21 Apr 2013 11:27:41 +0400
Subject: [PATCH 4561/5331] Adding freenet module

---
 modules/module-list.nix                 |  1 +
 modules/services/networking/freenet.nix | 63 +++++++++++++++++++++++++
 2 files changed, 64 insertions(+)
 create mode 100644 modules/services/networking/freenet.nix

diff --git a/modules/module-list.nix b/modules/module-list.nix
index c4b8fa5a9fe..a61cbbea469 100644
--- a/modules/module-list.nix
+++ b/modules/module-list.nix
@@ -132,6 +132,7 @@
   ./services/networking/ejabberd.nix
   ./services/networking/firewall.nix
   ./services/networking/flashpolicyd.nix
+  ./services/networking/freenet.nix
   ./services/networking/git-daemon.nix
   ./services/networking/gnunet.nix
   ./services/networking/gogoclient.nix
diff --git a/modules/services/networking/freenet.nix b/modules/services/networking/freenet.nix
new file mode 100644
index 00000000000..4087fe524d0
--- /dev/null
+++ b/modules/services/networking/freenet.nix
@@ -0,0 +1,63 @@
+# NixOS module for Transmission BitTorrent daemon
+
+{ config, pkgs, ... }:
+
+with pkgs.lib;
+
+let
+
+  cfg = config.services.freenet;
+  varDir = "/var/lib/freenet";
+
+in
+
+{
+
+  ### configuration
+
+  options = {
+
+    services.freenet = {
+
+      enable = mkOption {
+        type = types.uniq types.bool;
+        default = false;
+        description = "Enable the Freenet daemon";
+      };
+
+      nice = mkOption {
+        type = types.uniq types.int;
+        default = 10;
+        description = "Set the nice level for the Freenet daemon";
+      };
+
+    };
+
+  };
+
+  ### implementation
+
+  config = mkIf cfg.enable {
+
+    systemd.services.freenet = {
+      description = "Freenet daemon";
+      after = [ "network.target" ];
+      wantedBy = [ "multi-user.target" ];
+      serviceConfig.ExecStart = "${pkgs.freenet}/bin/freenet";
+      serviceConfig.User = "freenet";
+      serviceConfig.UMask = "0007";
+      serviceConfig.WorkingDirectory = varDir;
+      serviceConfig.Nice = cfg.nice;
+    };
+
+    users.extraUsers.freenet = {
+      group = "freenet";
+      description = "Psyced daemon user";
+      home = varDir;
+      createHome = true;
+    };
+
+    users.extraGroups.freenet = {};
+  };
+
+}
-- 
GitLab


From 7427639b8433492d79dca5de08ee7d0206a890d7 Mon Sep 17 00:00:00 2001
From: Jaka Hudoklin <jakahudoklin@gmail.com>
Date: Sun, 21 Apr 2013 19:48:15 +0200
Subject: [PATCH 4562/5331] Static nameservers have precedence

---
 modules/tasks/network-interfaces.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/tasks/network-interfaces.nix b/modules/tasks/network-interfaces.nix
index 93290e3bfdf..90ca49cdb1f 100644
--- a/modules/tasks/network-interfaces.nix
+++ b/modules/tasks/network-interfaces.nix
@@ -277,7 +277,7 @@ in
             script =
               ''
                 # Set the static DNS configuration, if given.
-                cat | ${pkgs.openresolv}/sbin/resolvconf -a static <<EOF
+                cat | ${pkgs.openresolv}/sbin/resolvconf -m -1 -a static <<EOF
                 ${optionalString (cfg.nameservers != [] && cfg.domain != "") ''
                   domain ${cfg.domain}
                 ''}
-- 
GitLab


From 8de00c328a3adc4619c85b3b2dbac3474c9e5f88 Mon Sep 17 00:00:00 2001
From: Mathijs Kwik <mathijs@bluescreen303.nl>
Date: Fri, 19 Apr 2013 22:28:00 +0200
Subject: [PATCH 4563/5331] systemd: add "requiredBy" option.

"require" is a stronger version of "want",
and just like wantedBy allows you to specify this relation in reverse,
requiredBy does the same.

It may seem pointless to be able to specify these stronger relations in
reverse, because if something is really required, you would expect the
other unit to specify this himself.

However, this is still useful for virtual/automatic units (like
devices) that are created by systemd on demand and hence have no unit
file you can alter.
---
 modules/system/boot/systemd-unit-options.nix |  6 ++++++
 modules/system/boot/systemd.nix              | 21 +++++++++++++++-----
 2 files changed, 22 insertions(+), 5 deletions(-)

diff --git a/modules/system/boot/systemd-unit-options.nix b/modules/system/boot/systemd-unit-options.nix
index 8f61399465b..9069d03b9f0 100644
--- a/modules/system/boot/systemd-unit-options.nix
+++ b/modules/system/boot/systemd-unit-options.nix
@@ -76,6 +76,12 @@ rec {
       '';
     };
 
+    requiredBy = mkOption {
+      default = [];
+      types = types.listOf types.string;
+      description = "Units that require (i.e. depend on and need to go down with) this unit.";
+    };
+
     wantedBy = mkOption {
       default = [];
       types = types.listOf types.string;
diff --git a/modules/system/boot/systemd.nix b/modules/system/boot/systemd.nix
index f99eca91ad5..44bf89b907a 100644
--- a/modules/system/boot/systemd.nix
+++ b/modules/system/boot/systemd.nix
@@ -211,7 +211,7 @@ let
         as));
 
   targetToUnit = name: def:
-    { inherit (def) wantedBy enable;
+    { inherit (def) wantedBy requiredBy enable;
       text =
         ''
           [Unit]
@@ -220,7 +220,7 @@ let
     };
 
   serviceToUnit = name: def:
-    { inherit (def) wantedBy enable;
+    { inherit (def) wantedBy requiredBy enable;
       text =
         ''
           [Unit]
@@ -267,7 +267,7 @@ let
     };
 
   socketToUnit = name: def:
-    { inherit (def) wantedBy enable;
+    { inherit (def) wantedBy requiredBy enable;
       text =
         ''
           [Unit]
@@ -279,7 +279,7 @@ let
     };
 
   timerToUnit = name: def:
-    { inherit (def) wantedBy enable;
+    { inherit (def) wantedBy requiredBy enable;
       text =
         ''
           [Unit]
@@ -291,7 +291,7 @@ let
     };
 
   mountToUnit = name: def:
-    { inherit (def) wantedBy enable;
+    { inherit (def) wantedBy requiredBy enable;
       text =
         ''
           [Unit]
@@ -343,6 +343,12 @@ let
             ln -sfn ../${name} $out/${name2}.wants/
           '') unit.wantedBy) cfg.units)}
 
+      ${concatStrings (mapAttrsToList (name: unit:
+          concatMapStrings (name2: ''
+            mkdir -p $out/${name2}.requires
+            ln -sfn ../${name} $out/${name2}.requires/
+          '') unit.requiredBy) cfg.units)}
+
       ln -s ${cfg.defaultUnit} $out/default.target
 
       ln -s rescue.target $out/kbrequest.target
@@ -387,6 +393,11 @@ in
             from being started.
           '';
         };
+        requiredBy = mkOption {
+          default = [];
+          types = types.listOf types.string;
+          description = "Units that require (i.e. depend on and need to go down with) this unit.";
+        };
         wantedBy = mkOption {
           default = [];
           types = types.listOf types.string;
-- 
GitLab


From 006f328877d12837a7129459925156c1f8e1e41e Mon Sep 17 00:00:00 2001
From: Mathijs Kwik <mathijs@bluescreen303.nl>
Date: Fri, 19 Apr 2013 22:32:48 +0200
Subject: [PATCH 4564/5331] virtual network interfaces: make systemd aware of
 the relation between device and service

If I want to bring down tap0.service (or systemd wants to do this
during a configuration-change which changes the path to tunctl),
openvpn (or other services using tap0) need to be brought down as
well, otherwise tunctl -d is not able to remove the tap0 device,
leaving it in a failed (but "up") state.
---
 modules/tasks/network-interfaces.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/modules/tasks/network-interfaces.nix b/modules/tasks/network-interfaces.nix
index 7738be28b42..cb0d17459ff 100644
--- a/modules/tasks/network-interfaces.nix
+++ b/modules/tasks/network-interfaces.nix
@@ -371,7 +371,8 @@ in
           { description = "Virtual Network Interface ${i.name}";
             requires = [ "dev-net-tun.device" ];
             after = [ "dev-net-tun.device" ];
-            wantedBy = [ "network.target" "sys-subsystem-net-devices-${i.name}.device" ];
+            wantedBy = [ "network.target" ];
+            requiredBy = [ "sys-subsystem-net-devices-${i.name}.device" ];
             serviceConfig =
               { Type = "oneshot";
                 RemainAfterExit = true;
-- 
GitLab


From ae2f280b674479eaf53138522797d781fc248735 Mon Sep 17 00:00:00 2001
From: Mathijs Kwik <mathijs@bluescreen303.nl>
Date: Thu, 18 Apr 2013 14:22:59 +0200
Subject: [PATCH 4565/5331] cron: set TZDIR so cron is able to find the TZ

---
 modules/services/scheduling/cron.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/modules/services/scheduling/cron.nix b/modules/services/scheduling/cron.nix
index cf348793a65..9aa9213556d 100644
--- a/modules/services/scheduling/cron.nix
+++ b/modules/services/scheduling/cron.nix
@@ -91,7 +91,10 @@ in
         startOn = "startup";
 
         # Needed to interpret times in the local timezone.
-        environment = { TZ = config.time.timeZone; };
+        environment = {
+          TZ = config.time.timeZone;
+          TZDIR = "${pkgs.tzdata}/share/zoneinfo";
+        };
 
         path = [ cronNixosPkg ];
 
-- 
GitLab


From fa0f5bf72f5c0cb0946fa0dbb8de9ee0768f654a Mon Sep 17 00:00:00 2001
From: Evgeny Egorochkin <phreedom@yandex.ru>
Date: Mon, 22 Apr 2013 16:50:58 +0300
Subject: [PATCH 4566/5331] Freenet: fix 2 typos

---
 modules/services/networking/freenet.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/services/networking/freenet.nix b/modules/services/networking/freenet.nix
index 4087fe524d0..314c690d7d4 100644
--- a/modules/services/networking/freenet.nix
+++ b/modules/services/networking/freenet.nix
@@ -1,4 +1,4 @@
-# NixOS module for Transmission BitTorrent daemon
+# NixOS module for Freenet daemon
 
 { config, pkgs, ... }:
 
@@ -52,7 +52,7 @@ in
 
     users.extraUsers.freenet = {
       group = "freenet";
-      description = "Psyced daemon user";
+      description = "Freenet daemon user";
       home = varDir;
       createHome = true;
     };
-- 
GitLab


From 945849b86fe33474da569b307d7e5880877491b6 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 22 Apr 2013 18:56:19 +0200
Subject: [PATCH 4567/5331] Don't set $TZ

We don't need to set $TZ, because we have /etc/localtime.  In fact,
setting $TZ without $TZDIR doesn't work anymore since Glibc no longer
contains zone info.
---
 modules/config/timezone.nix                           | 9 ++++-----
 modules/services/databases/postgresql.nix             | 5 +----
 modules/services/logging/logstash.nix                 | 1 -
 modules/services/logging/rsyslogd.nix                 | 2 --
 modules/services/logging/syslogd.nix                  | 2 --
 modules/services/mail/postfix.nix                     | 2 --
 modules/services/mail/spamassassin.nix                | 1 -
 modules/services/monitoring/smartd.nix                | 2 --
 modules/services/network-filesystems/samba.nix        | 1 -
 modules/services/scheduling/cron.nix                  | 6 ------
 modules/services/web-servers/apache-httpd/default.nix | 1 -
 modules/services/web-servers/tomcat.nix               | 2 --
 modules/services/x11/xserver.nix                      | 1 -
 13 files changed, 5 insertions(+), 30 deletions(-)

diff --git a/modules/config/timezone.nix b/modules/config/timezone.nix
index f21a1ec5d4c..9de19078c10 100644
--- a/modules/config/timezone.nix
+++ b/modules/config/timezone.nix
@@ -6,7 +6,7 @@ with pkgs.lib;
   options = {
 
     time = {
-    
+
       timeZone = mkOption {
         default = "CET";
         type = with types; uniq string;
@@ -18,7 +18,7 @@ with pkgs.lib;
         default = false;
         description = "If set, keep the hardware clock in local time instead of UTC.";
       };
-      
+
     };
   };
 
@@ -26,7 +26,6 @@ with pkgs.lib;
 
     environment.shellInit =
       ''
-        export TZ=${config.time.timeZone}
         export TZDIR=${pkgs.tzdata}/share/zoneinfo
       '';
 
@@ -34,7 +33,7 @@ with pkgs.lib;
       { source = "${pkgs.tzdata}/share/zoneinfo/${config.time.timeZone}";
         target = "localtime";
       };
-      
+
   };
-  
+
 }
diff --git a/modules/services/databases/postgresql.nix b/modules/services/databases/postgresql.nix
index 61f69dfd34a..2926bc62940 100644
--- a/modules/services/databases/postgresql.nix
+++ b/modules/services/databases/postgresql.nix
@@ -161,10 +161,7 @@ in
         wantedBy = [ "multi-user.target" ];
         after = [ "network.target" ];
 
-        environment =
-          { TZ = config.time.timeZone;
-            PGDATA = cfg.dataDir;
-          };
+        environment.PGDATA = cfg.dataDir;
 
         path = [ pkgs.su postgresql ];
 
diff --git a/modules/services/logging/logstash.nix b/modules/services/logging/logstash.nix
index b535a942a9e..2f0eea50526 100644
--- a/modules/services/logging/logstash.nix
+++ b/modules/services/logging/logstash.nix
@@ -140,7 +140,6 @@ in
       description = "Logstash daemon";
 
       wantedBy = [ "multi-user.target" ];
-      environment.TZ = config.time.timeZone;
 
       path = [ jre ];
 
diff --git a/modules/services/logging/rsyslogd.nix b/modules/services/logging/rsyslogd.nix
index 03fe50ab915..680c7a912c1 100644
--- a/modules/services/logging/rsyslogd.nix
+++ b/modules/services/logging/rsyslogd.nix
@@ -92,8 +92,6 @@ in
 
         wantedBy = [ "multi-user.target" ];
 
-        environment.TZ = config.time.timeZone;
-
         serviceConfig =
           { ExecStart = "${pkgs.rsyslog}/sbin/rsyslogd ${toString cfg.extraParams} -f ${syslogConf} -n";
             ExecStartPre = "${pkgs.coreutils}/bin/mkdir -p /var/spool/rsyslog";
diff --git a/modules/services/logging/syslogd.nix b/modules/services/logging/syslogd.nix
index c45b533112a..24cd5c1567e 100644
--- a/modules/services/logging/syslogd.nix
+++ b/modules/services/logging/syslogd.nix
@@ -112,8 +112,6 @@ in
 
         wantedBy = [ "multi-user.target" ];
 
-        environment.TZ = config.time.timeZone;
-
         serviceConfig =
           { ExecStart = "${pkgs.sysklogd}/sbin/syslogd ${toString cfg.extraParams} -f ${syslogConf} -n";
             # Prevent syslogd output looping back through journald.
diff --git a/modules/services/mail/postfix.nix b/modules/services/mail/postfix.nix
index 6b141e7e24e..2633289b46d 100644
--- a/modules/services/mail/postfix.nix
+++ b/modules/services/mail/postfix.nix
@@ -369,8 +369,6 @@ in
 
         daemonType = "fork";
 
-        environment.TZ = config.time.timeZone;
-
         preStart =
           ''
             if ! [ -d /var/spool/postfix ]; then
diff --git a/modules/services/mail/spamassassin.nix b/modules/services/mail/spamassassin.nix
index d0029c1256c..aaf1dfcc210 100644
--- a/modules/services/mail/spamassassin.nix
+++ b/modules/services/mail/spamassassin.nix
@@ -56,7 +56,6 @@ in
       wantedBy = [ "multi-user.target" ];
       after = [ "network.target" ];
 
-      environment.TZ = config.time.timeZone;
       exec = "${pkgs.spamassassin}/bin/spamd ${optionalString cfg.debug "-D"} --username=spamd --groupname=spamd --nouser-config --virtual-config-dir=/var/lib/spamassassin/user-%u --allow-tell --pidfile=/var/run/spamd.pid";
     };
 
diff --git a/modules/services/monitoring/smartd.nix b/modules/services/monitoring/smartd.nix
index 3f065666ea2..de07dc0dbaa 100644
--- a/modules/services/monitoring/smartd.nix
+++ b/modules/services/monitoring/smartd.nix
@@ -107,8 +107,6 @@ in
     systemd.services.smartd = {
       description = "S.M.A.R.T. Daemon";
 
-      environment.TZ = config.time.timeZone;
-
       wantedBy = [ "multi-user.target" ];
 
       serviceConfig.ExecStart = "${pkgs.smartmontools}/sbin/smartd --no-fork ${smartdFlags}";
diff --git a/modules/services/network-filesystems/samba.nix b/modules/services/network-filesystems/samba.nix
index c4157c647c6..903e2c39ae9 100644
--- a/modules/services/network-filesystems/samba.nix
+++ b/modules/services/network-filesystems/samba.nix
@@ -64,7 +64,6 @@ let
 
       environment = {
         LD_LIBRARY_PATH = nssModulesPath;
-        TZ = config.time.timeZone;
         LOCALE_ARCHIVE = "/run/current-system/sw/lib/locale/locale-archive";
       };
 
diff --git a/modules/services/scheduling/cron.nix b/modules/services/scheduling/cron.nix
index 9aa9213556d..e14f03fb1e8 100644
--- a/modules/services/scheduling/cron.nix
+++ b/modules/services/scheduling/cron.nix
@@ -90,12 +90,6 @@ in
 
         startOn = "startup";
 
-        # Needed to interpret times in the local timezone.
-        environment = {
-          TZ = config.time.timeZone;
-          TZDIR = "${pkgs.tzdata}/share/zoneinfo";
-        };
-
         path = [ cronNixosPkg ];
 
         preStart =
diff --git a/modules/services/web-servers/apache-httpd/default.nix b/modules/services/web-servers/apache-httpd/default.nix
index 35afacefa16..b66f6d7cd1d 100644
--- a/modules/services/web-servers/apache-httpd/default.nix
+++ b/modules/services/web-servers/apache-httpd/default.nix
@@ -618,7 +618,6 @@ in
 
         environment =
           { PHPRC = if enablePHP then phpIni else "";
-            TZ = config.time.timeZone;
           } // (listToAttrs (concatMap (svc: svc.globalEnvVars) allSubservices));
 
         preStart =
diff --git a/modules/services/web-servers/tomcat.nix b/modules/services/web-servers/tomcat.nix
index b836b8c5f7d..a68828de5d8 100644
--- a/modules/services/web-servers/tomcat.nix
+++ b/modules/services/web-servers/tomcat.nix
@@ -119,8 +119,6 @@ in
         startOn = "started network-interfaces";
         stopOn = "stopping network-interfaces";
 
-        environment = { TZ = config.time.timeZone; };
-
         preStart =
           ''
             # Create the base directory
diff --git a/modules/services/x11/xserver.nix b/modules/services/x11/xserver.nix
index 30e4c5cdc93..59e8a56982a 100644
--- a/modules/services/x11/xserver.nix
+++ b/modules/services/x11/xserver.nix
@@ -461,7 +461,6 @@ in
         environment =
           { FONTCONFIG_FILE = "/etc/fonts/fonts.conf"; # !!! cleanup
             XKB_BINDIR = "${xorg.xkbcomp}/bin"; # Needed for the Xkb extension.
-            TZ = config.time.timeZone;
           } # !!! Depends on the driver selected at runtime.
             // optionalAttrs (!elem "nvidia" driverNames) {
             XORG_DRI_DRIVER_PATH = "${pkgs.mesa}/lib/dri";
-- 
GitLab


From 447691836abd4d5f3a79492ad5b81f98c5839f8b Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 22 Apr 2013 19:08:16 +0200
Subject: [PATCH 4568/5331] Create a /etc/zoneinfo symlink and use it in $TZDIR

Setting $TZDIR to ${pkgs.tzdata}/share/zoneinfo can cause logged-in
sessions to refer to a garbage-collected zoneinfo directory.  So use
/etc/zoneinfo instead.
---
 modules/config/timezone.nix | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/modules/config/timezone.nix b/modules/config/timezone.nix
index 9de19078c10..b69df4a87ce 100644
--- a/modules/config/timezone.nix
+++ b/modules/config/timezone.nix
@@ -26,13 +26,12 @@ with pkgs.lib;
 
     environment.shellInit =
       ''
-        export TZDIR=${pkgs.tzdata}/share/zoneinfo
+        export TZDIR=/etc/zoneinfo
       '';
 
-    environment.etc = singleton
-      { source = "${pkgs.tzdata}/share/zoneinfo/${config.time.timeZone}";
-        target = "localtime";
-      };
+    environment.etc.localtime.source = "${pkgs.tzdata}/share/zoneinfo/${config.time.timeZone}";
+
+    environment.etc.zoneinfo.source = "${pkgs.tzdata}/share/zoneinfo";
 
   };
 
-- 
GitLab


From ec9dc730ec30deb528640556d639b04826aeba3c Mon Sep 17 00:00:00 2001
From: Domen Kozar <domen@dev.si>
Date: Mon, 22 Apr 2013 19:36:14 +0200
Subject: [PATCH 4569/5331] restart networkmanager on suspend resume

---
 modules/services/networking/networkmanager.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/modules/services/networking/networkmanager.nix b/modules/services/networking/networkmanager.nix
index 21d27677837..f0ead66b53e 100644
--- a/modules/services/networking/networkmanager.nix
+++ b/modules/services/networking/networkmanager.nix
@@ -124,6 +124,10 @@ in {
       wireless.enable = false;
     };
 
+    powerManagement.resumeCommands = ''
+      systemctl restart NetworkManager
+    '';
+
     security.polkit.permissions = polkitConf;
 
     services.dbus.packages = cfg.packages;
-- 
GitLab


From 2e088aa2779a91b787a44fd9e3f44a9ef2f2edd9 Mon Sep 17 00:00:00 2001
From: Oliver Charles <ollie@ocharles.org.uk>
Date: Mon, 25 Mar 2013 19:26:07 +0100
Subject: [PATCH 4570/5331] lightdm: Initial expression for lightdm as the
 display-manager service (using default GTK greeter)

---
 modules/module-list.nix                       |   1 +
 .../services/x11/display-managers/default.nix |   2 +-
 .../services/x11/display-managers/lightdm.nix | 115 ++++++++++++++++++
 3 files changed, 117 insertions(+), 1 deletion(-)
 create mode 100644 modules/services/x11/display-managers/lightdm.nix

diff --git a/modules/module-list.nix b/modules/module-list.nix
index a61cbbea469..526bd67195e 100644
--- a/modules/module-list.nix
+++ b/modules/module-list.nix
@@ -193,6 +193,7 @@
   ./services/x11/display-managers/default.nix
   ./services/x11/display-managers/kdm.nix
   ./services/x11/display-managers/slim.nix
+  ./services/x11/display-managers/lightdm.nix
   ./services/x11/hardware/multitouch.nix
   ./services/x11/hardware/synaptics.nix
   ./services/x11/hardware/wacom.nix
diff --git a/modules/services/x11/display-managers/default.nix b/modules/services/x11/display-managers/default.nix
index 84aa899fdcd..6f1d7202be3 100644
--- a/modules/services/x11/display-managers/default.nix
+++ b/modules/services/x11/display-managers/default.nix
@@ -154,7 +154,7 @@ in
 
 {
 
-  imports = [ ./kdm.nix ./slim.nix ];
+  imports = [ ./kdm.nix ./slim.nix ./lightdm.nix ];
 
 
   options = {
diff --git a/modules/services/x11/display-managers/lightdm.nix b/modules/services/x11/display-managers/lightdm.nix
new file mode 100644
index 00000000000..d2930d47dc0
--- /dev/null
+++ b/modules/services/x11/display-managers/lightdm.nix
@@ -0,0 +1,115 @@
+{ config, pkgs, ... }:
+
+with pkgs.lib;
+
+let
+
+  dmcfg = config.services.xserver.displayManager;
+  cfg = dmcfg.lightdm;
+
+  inherit (pkgs) stdenv lightdm writeScript writeText;
+
+  # lightdm runs with clearenv(), but we need a few things in the enviornment for X to startup
+  xserverWrapper = writeScript "xserver-wrapper"
+    ''
+      #! /bin/sh
+      export XORG_DRI_DRIVER_PATH="${pkgs.mesa}/lib/dri"
+      export XKB_BINDIR="${pkgs.xorg.xkbcomp}/bin"
+      exec ${dmcfg.xserverBin} ${dmcfg.xserverArgs}
+    '';
+
+  # The default greeter provided with this expression is the GTK greeter.
+  # Again, we need a few things in the environment for the greeter to run with
+  # fonts/icons.
+  wrappedGtkGreeter = stdenv.mkDerivation {
+    name = "lightdm-gtk-greeter";
+    buildInputs = [ pkgs.makeWrapper ];
+
+    buildCommand = ''
+      ensureDir $out/gtk-3.0/
+
+      # This wrapper ensures that we actually get fonts
+      makeWrapper ${pkgs.lightdm_gtk_greeter}/sbin/lightdm-gtk-greeter \
+        $out/greeter \
+        --set XDG_DATA_DIRS ${pkgs.gnome2.gnome_icon_theme}/share \
+        --set FONTCONFIG_FILE /etc/fonts/fonts.conf \
+        --set XDG_CONFIG_HOME $out/
+
+      # We need this to ensure that it actually tries to find icons from gnome-icon-theme
+      cat - > $out/gtk-3.0/settings.ini << EOF
+[Settings]
+gtk-icon-theme-name=gnome
+EOF
+
+      cat - > $out/lightdm-gtk-greeter.desktop << EOF
+[Desktop Entry]
+Name=LightDM Greeter
+Comment=This runs the LightDM Greeter
+Exec=$out/greeter
+Type=Application
+EOF
+      '';
+    };
+
+  lightdmConf = writeText "lightdm.conf"
+    ''
+    [LightDM]
+    greeter-user = ${config.users.extraUsers.lightdm.name}
+    xgreeters-directory = ${cfg.greeter.package}
+    xsessions-directory = ${dmcfg.session.desktops}
+
+    [SeatDefaults]
+    xserver-command = ${xserverWrapper}
+    session-wrapper = ${dmcfg.session.script}
+    greeter-session = ${cfg.greeter.name}
+    '';
+
+in
+{
+  options = {
+    services.xserver.displayManager.lightdm = {
+      enable = mkOption {
+        default = false;
+        description = ''
+          Whether to enable lightdm as the display manager.
+        '';
+      };
+
+      greeter = mkOption {
+        description = ''
+          The LightDM greeter to login via. The package should be a directory
+          containing a .desktop file matching the name in the 'name' option.
+        '';
+        default = {
+          name = "lightdm-gtk-greeter";
+          package = wrappedGtkGreeter;
+        };
+      };
+    };
+  };
+
+  config = mkIf cfg.enable {
+    services.xserver.displayManager.job = {
+      logsXsession = true;
+
+      # lightdm relaunches itself via just `lightdm`, so needs to be on the PATH
+      execCmd = ''
+        export PATH=${lightdm}/sbin:$PATH
+        ${lightdm}/sbin/lightdm --log-dir=/var/log --run-dir=/run --config=${lightdmConf}
+      '';
+    };
+
+    services.dbus.enable = true;
+    services.dbus.packages = [ lightdm ];
+
+    security.pam.services = [
+      { name = "lightdm"; allowNullPassword = true; startSession = true; }
+      { name = "lightdm-greeter"; allowNullPassword = true; startSession = true; }
+    ];
+
+    users.extraUsers.lightdm = {
+      createHome = true;
+      home = "/var/lib/lightdm";
+    };
+  };
+}
-- 
GitLab


From b4af56d3766b8b2c24b1377fe88767a81182a6e9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= <viric@viric.name>
Date: Mon, 22 Apr 2013 23:31:29 +0400
Subject: [PATCH 4571/5331] lightdm: improving a bit the indentation.

---
 .../services/x11/display-managers/lightdm.nix | 40 +++++++++----------
 1 file changed, 20 insertions(+), 20 deletions(-)

diff --git a/modules/services/x11/display-managers/lightdm.nix b/modules/services/x11/display-managers/lightdm.nix
index d2930d47dc0..1bce30037dc 100644
--- a/modules/services/x11/display-managers/lightdm.nix
+++ b/modules/services/x11/display-managers/lightdm.nix
@@ -37,31 +37,31 @@ let
 
       # We need this to ensure that it actually tries to find icons from gnome-icon-theme
       cat - > $out/gtk-3.0/settings.ini << EOF
-[Settings]
-gtk-icon-theme-name=gnome
-EOF
+      [Settings]
+      gtk-icon-theme-name=gnome
+      EOF
 
       cat - > $out/lightdm-gtk-greeter.desktop << EOF
-[Desktop Entry]
-Name=LightDM Greeter
-Comment=This runs the LightDM Greeter
-Exec=$out/greeter
-Type=Application
-EOF
-      '';
-    };
+      [Desktop Entry]
+      Name=LightDM Greeter
+      Comment=This runs the LightDM Greeter
+      Exec=$out/greeter
+      Type=Application
+      EOF
+    '';
+  };
 
   lightdmConf = writeText "lightdm.conf"
     ''
-    [LightDM]
-    greeter-user = ${config.users.extraUsers.lightdm.name}
-    xgreeters-directory = ${cfg.greeter.package}
-    xsessions-directory = ${dmcfg.session.desktops}
-
-    [SeatDefaults]
-    xserver-command = ${xserverWrapper}
-    session-wrapper = ${dmcfg.session.script}
-    greeter-session = ${cfg.greeter.name}
+      [LightDM]
+      greeter-user = ${config.users.extraUsers.lightdm.name}
+      xgreeters-directory = ${cfg.greeter.package}
+      xsessions-directory = ${dmcfg.session.desktops}
+
+      [SeatDefaults]
+      xserver-command = ${xserverWrapper}
+      session-wrapper = ${dmcfg.session.script}
+      greeter-session = ${cfg.greeter.name}
     '';
 
 in
-- 
GitLab


From ec13407807a0a5f5d490e20cc8a6764c535b979f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Mon, 22 Apr 2013 22:06:27 +0200
Subject: [PATCH 4572/5331] nixos-install: fix error message consistency

The test is for path A but the error message says path B. Fix it.
---
 modules/installer/tools/nixos-install.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/installer/tools/nixos-install.sh b/modules/installer/tools/nixos-install.sh
index 2b7d73c43a5..5ff28dcfec8 100644
--- a/modules/installer/tools/nixos-install.sh
+++ b/modules/installer/tools/nixos-install.sh
@@ -30,7 +30,7 @@ if ! grep -F -q " $mountPoint " /proc/mounts; then
 fi
 
 if ! test -e "$mountPoint/$NIXOS_CONFIG"; then
-    echo "configuration file $NIXOS_CONFIG doesn't exist"
+    echo "configuration file $mountPoint/$NIXOS_CONFIG doesn't exist"
     exit 1
 fi
 
-- 
GitLab


From f50014339a1496e9dd57399d0b2d5af0cd1ac00c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= <viric@viric.name>
Date: Wed, 24 Apr 2013 19:03:29 +0400
Subject: [PATCH 4573/5331] Putting the gnunet module up to date. It still
 doesn't start gnunet though.

No idea why.
---
 modules/misc/ids.nix                   |   1 -
 modules/services/networking/gnunet.nix | 166 +++++--------------------
 2 files changed, 30 insertions(+), 137 deletions(-)

diff --git a/modules/misc/ids.nix b/modules/misc/ids.nix
index 218bd0ed47a..2cb1ffe4429 100644
--- a/modules/misc/ids.nix
+++ b/modules/misc/ids.nix
@@ -44,7 +44,6 @@ in
     postfix = 14;
     dovecot = 15;
     tomcat = 16;
-    gnunetd = 17;
     pulseaudio = 22; # must match `pulseaudio' GID
     gpsd = 23;
     polkituser = 28;
diff --git a/modules/services/networking/gnunet.nix b/modules/services/networking/gnunet.nix
index a86c3999c2c..9a674ea8c2e 100644
--- a/modules/services/networking/gnunet.nix
+++ b/modules/services/networking/gnunet.nix
@@ -6,37 +6,27 @@ let
 
   cfg = config.services.gnunet;
 
+  homeDir = "/var/lib/gnunet";
+
   configFile = with cfg; pkgs.writeText "gnunetd.conf"
     ''
       [PATHS]
-      GNUNETD_HOME = ${home}
-
-      [GNUNETD]
-      HOSTLISTURL = ${concatStringsSep " " hostLists}
-      APPLICATIONS = ${concatStringsSep " " applications}
-      TRANSPORTS = ${concatStringsSep " " transports}
+      SERVICEHOME = ${homeDir}
 
-      [LOAD]
-      MAXNETDOWNBPSTOTAL = ${toString load.maxNetDownBandwidth}
-      MAXNETUPBPSTOTAL = ${toString load.maxNetUpBandwidth}
-      HARDUPLIMIT = ${toString load.hardNetUpBandwidth}
-      MAXCPULOAD = ${toString load.maxCPULoad}
-      INTERFACES = ${concatStringsSep " " load.interfaces}
+      [ats]
+      WAN_QUOTA_IN = ${toString load.maxNetDownBandwidth} b
+      WAN_QUOTA_OUT = ${toString load.maxNetUpBandwidth} b
 
-      [FS]
-      QUOTA = ${toString fileSharing.quota}
-      ACTIVEMIGRATION = ${if fileSharing.activeMigration then "YES" else "NO"}
+      [datastore]
+      QUOTA = ${toString fileSharing.quota} MB
 
-      [UDP]
+      [transport-udp]
       PORT = ${toString udp.port}
+      ADVERTISED_PORT = ${toString udp.port}
 
-      [TCP]
+      [transport-tcp]
       PORT = ${toString tcp.port}
-
-      [MODULES]
-      sqstore = sqstore_sqlite
-      dstore = dstore_sqlite
-      topology = topology_default
+      ADVERTISED_PORT = ${toString tcp.port}
 
       ${extraOptions}
     '';
@@ -59,58 +49,6 @@ in
         '';
       };
 
-      home = mkOption {
-        default = "/var/lib/gnunet";
-        description = ''
-          Directory where the GNUnet daemon will store its data.
-        '';
-      };
-
-      debug = mkOption {
-        default = false;
-        description = ''
-          When true, run in debug mode; gnunetd will not daemonize and
-          error messages will be written to stderr instead of a
-          logfile.
-        '';
-      };
-
-      logLevel = mkOption {
-        default = "ERROR";
-        example = "INFO";
-        description = ''
-          Log level of the deamon (see `gnunetd(1)' for details).
-        '';
-      };
-
-      hostLists = mkOption {
-        default = [
-          "http://gnunet.org/hostlist.php"
-          "http://gnunet.mine.nu:8081/hostlist"
-          "http://vserver1236.vserver-on.de/hostlist-074"
-        ];
-        description = ''
-          URLs of host lists.
-        '';
-      };
-
-      applications = mkOption {
-        default = [ "advertising" "getoption" "fs" "stats" "traffic" ];
-        example = [ "chat" "fs" ];
-        description = ''
-          List of GNUnet applications supported by the daemon.  Note that
-          `fs', which means "file sharing", is probably the one you want.
-        '';
-      };
-
-      transports = mkOption {
-        default = [ "udp" "tcp" "http" "nat" ];
-        example = [ "smtp" "http" ];
-        description = ''
-          List of transport methods used by the server.
-        '';
-      };
-
       fileSharing = {
         quota = mkOption {
           default = 1024;
@@ -118,14 +56,6 @@ in
             Maximum file system usage (in MiB) for file sharing.
           '';
         };
-
-        activeMigration = mkOption {
-          default = false;
-          description = ''
-            Whether to allow active migration of content originating
-            from other nodes.
-          '';
-        };
       };
 
       udp = {
@@ -170,33 +100,13 @@ in
             data.
           '';
         };
-
-        maxCPULoad = mkOption {
-          default = 100;
-          description = ''
-            Maximum CPU load (percentage) authorized for the GNUnet
-            daemon.
-          '';
-        };
-
-        interfaces = mkOption {
-          default = [ "eth0" ];
-          example = [ "wlan0" "eth1" ];
-          description = ''
-            List of network interfaces to use.
-          '';
-        };
       };
 
       extraOptions = mkOption {
         default = "";
-        example = ''
-          [NETWORK]
-          INTERFACE = eth3
-        '';
         description = ''
-          Additional options that will be copied verbatim in `gnunetd.conf'.
-          See `gnunetd.conf(5)' for details.
+          Additional options that will be copied verbatim in `gnunet.conf'.
+          See `gnunet.conf(5)' for details.
         '';
       };
     };
@@ -209,44 +119,28 @@ in
   config = mkIf config.services.gnunet.enable {
 
     users.extraUsers = singleton
-      { name = "gnunetd";
-        uid = config.ids.uids.gnunetd;
-        description = "GNUnet Daemon User";
-        home = "/var/empty";
+      { name = "gnunet";
+        group = "gnunet";
+        description = "GNUnet User";
+        home = homeDir;
+        createHome = true; 
       };
 
     # The user tools that talk to `gnunetd' should come from the same source,
     # so install them globally.
     environment.systemPackages = [ pkgs.gnunet ];
 
-    environment.etc = [
-      # Tools such as `gnunet-transport-check' expect /etc/gnunetd.conf.
-      { source = configFile;
-        target = "gnunetd.conf";
-      }
-    ];
-
-    jobs.gnunetd =
-      { description = "The GNUnet Daemon";
-
-        startOn = "started network-interfaces";
-        stopOn = "stopping network-interfaces";
-
-        preStart =
-          ''
-            test -d "${cfg.home}" || \
-              ( mkdir -m 755 -p "${cfg.home}" && chown -R gnunetd:users "${cfg.home}")
-          '';
-
-        exec =
-          ''
-            ${pkgs.gnunet}/bin/gnunetd                  \
-              ${if cfg.debug then "--debug" else "" }   \
-              --user="gnunetd"                          \
-              --config="${configFile}"                  \
-              --log="${cfg.logLevel}"
-          '';
-      };
+    systemd.services.gnunet = {
+      description = "GNUnet";
+      after = [ "network.target" ];
+      wantedBy = [ "multi-user.target" ];
+      serviceConfig.ExecStart = "${pkgs.gnunet}/bin/gnunet-arm -L DEBUG -l logfile -s -c ${configFile}";
+      serviceConfig.Type = "simple";
+      serviceConfig.User = "gnunet";
+      serviceConfig.UMask = "0007";
+      serviceConfig.WorkingDirectory = homeDir;
+      path = [ pkgs.gnunet ];
+    };
 
   };
 
-- 
GitLab


From af0e751ee9f3e75278509008129c497716036a66 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= <viric@viric.name>
Date: Wed, 24 Apr 2013 20:17:14 +0400
Subject: [PATCH 4574/5331] Making gnunet start properly (calling
 gnunet-service-arm directly)

---
 modules/services/networking/gnunet.nix | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/modules/services/networking/gnunet.nix b/modules/services/networking/gnunet.nix
index 9a674ea8c2e..e853fd7d685 100644
--- a/modules/services/networking/gnunet.nix
+++ b/modules/services/networking/gnunet.nix
@@ -134,12 +134,10 @@ in
       description = "GNUnet";
       after = [ "network.target" ];
       wantedBy = [ "multi-user.target" ];
-      serviceConfig.ExecStart = "${pkgs.gnunet}/bin/gnunet-arm -L DEBUG -l logfile -s -c ${configFile}";
-      serviceConfig.Type = "simple";
+      serviceConfig.ExecStart = "${pkgs.gnunet}/lib/gnunet/libexec/gnunet-service-arm -c ${configFile}";
       serviceConfig.User = "gnunet";
       serviceConfig.UMask = "0007";
       serviceConfig.WorkingDirectory = homeDir;
-      path = [ pkgs.gnunet ];
     };
 
   };
-- 
GitLab


From 5f612ddfdc4bafc66e6329e3da955081f6e391df Mon Sep 17 00:00:00 2001
From: Marc Weber <marco-oweber@gmx.de>
Date: Sat, 27 Apr 2013 03:30:40 +0200
Subject: [PATCH 4575/5331] fix wacom hotplug and all Intuos 5 issues

- drop custom config:
  (please wacom using folks review this part and think
  about how to get it back if its important to you)

- put default config shipping with  xf86_input_wacom
  into /etc/X11/xorg.conf.d/
  which seems to be interpreted again when
  devices are hot plugged

- when starting x11, also provide xinput
  .. you never know when you need it

This fixes all problems I had:
- device only worked when plugged in, then xorg was started
(an alternative quick fix is switching to terminal by ctrl-alt-F1 and back)
- I had to disable some devices, because eg myaint switched input
device many times a sec rendering it unusable otherwise, some of those devices
configured did not work.

Details:
http://sourceforge.net/apps/mediawiki/linuxwacom/index.php?title=FAQ#Is_hotplugging_supported_for_my_USB_tablet.3F
See 12 -> HAL or xorg.conf.d
---
 modules/services/x11/hardware/wacom.nix | 93 +++----------------------
 modules/services/x11/xserver.nix        |  1 +
 2 files changed, 11 insertions(+), 83 deletions(-)

diff --git a/modules/services/x11/hardware/wacom.nix b/modules/services/x11/hardware/wacom.nix
index 1ea928d9c76..461afa4afcf 100644
--- a/modules/services/x11/hardware/wacom.nix
+++ b/modules/services/x11/hardware/wacom.nix
@@ -16,41 +16,15 @@ in
 
       enable = mkOption {
         default = false;
-        description = "Whether to enable the Wacom touchscreen/digitizer/tablet.";
-      };
-
-      device = mkOption {
-        default = null;
-        example = "/dev/ttyS0";
-        description = "Device to use. Set to null for autodetect (think USB tablet).";
-      };
-
-      forceDeviceType = mkOption {
-        default = null;
-        example = "ISDV4";
-        description = "Some models (think touchscreen) require the device type to be specified. Set to null for autodetect (think USB tablet).";
-      };
-
-      stylusExtraConfig = mkOption {
-        default = "";
-        example = ''
-            Option "Button1" "2"
-          '';
-        description = "Lines to be added to Wacom_stylus InputDevice section.";
-      };
-
-      eraserExtraConfig = mkOption {
-        default = "";
-        example = ''
-            Option "Button2" "3"
-          '';
-        description = "Lines to be added to Wacom_eraser InputDevice section.";
-      };
-
-      cursorExtraConfig = mkOption {
-        default = "";
-        example = "";
-        description = "Lines to be added to Wacom_cursor InputDevice section.";
+        description = ''
+          Whether to enable the Wacom touchscreen/digitizer/tablet.
+          If you ever have any issues such as, try switching to terminal (ctrl-alt-F1) and back
+          which will make Xorg reconfigure the device ?
+
+          If you're not satisfied by the default behaviour you can override
+          <option>environment.etc."X11/xorg.conf.d/50-wacom.conf"</option> in
+          configuration.nix easily.
+        '';
       };
 
     };
@@ -64,54 +38,7 @@ in
 
     services.udev.packages = [ pkgs.xf86_input_wacom ];
 
-    services.xserver.serverLayoutSection =
-      ''
-        InputDevice "Wacom_stylus"
-        InputDevice "Wacom_eraser"
-        InputDevice "Wacom_cursor"
-      '';
-
-    services.xserver.config =
-      ''
-        Section "InputDevice"
-          Driver "wacom"
-          Identifier "Wacom_stylus"
-          ${optionalString (cfg.device != null) ''
-            Option "Device" "${cfg.device}"
-          ''}
-          Option "Type" "stylus"
-          ${optionalString (cfg.forceDeviceType != null) ''
-            Option "ForceDevice" "${cfg.forceDeviceType}"
-          ''}
-          ${cfg.stylusExtraConfig}
-        EndSection
-
-        Section "InputDevice"
-          Driver "wacom"
-          Identifier "Wacom_eraser"
-          ${optionalString (cfg.device != null) ''
-            Option "Device" "${cfg.device}"
-          ''}
-          Option "Type" "eraser"
-          ${optionalString (cfg.forceDeviceType != null) ''
-            Option "ForceDevice" "${cfg.forceDeviceType}"
-          ''}
-          ${cfg.eraserExtraConfig}
-        EndSection
-
-        Section "InputDevice"
-          Driver "wacom"
-          Identifier "Wacom_cursor"
-          ${optionalString (cfg.device != null) ''
-            Option "Device" "${cfg.device}"
-          ''}
-          Option "Type" "cursor"
-          ${optionalString (cfg.forceDeviceType != null) ''
-            Option "ForceDevice" "${cfg.forceDeviceType}"
-          ''}
-          ${cfg.cursorExtraConfig}
-        EndSection
-      '';
+    environment.etc."X11/xorg.conf.d/50-wacom.conf".source = "${pkgs.xf86_input_wacom}/share/X11/xorg.conf.d/50-wacom.conf";
 
   };
 
diff --git a/modules/services/x11/xserver.nix b/modules/services/x11/xserver.nix
index 30e4c5cdc93..915fd79ab6d 100644
--- a/modules/services/x11/xserver.nix
+++ b/modules/services/x11/xserver.nix
@@ -433,6 +433,7 @@ in
         xorg.xlsclients
         xorg.xset
         xorg.xsetroot
+        xorg.xinput
         xorg.xprop
         pkgs.xterm
         pkgs.xdg_utils
-- 
GitLab


From 4637f6d87839935114ec18e5042d335d1898f31e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= <viric@viric.name>
Date: Sun, 28 Apr 2013 00:19:04 +0400
Subject: [PATCH 4576/5331] Removing unneded imports for the display-manager.

Discussed in
https://github.com/NixOS/nixos/commit/2e088aa2779a91b787a44fd9e3f44a9ef2f2edd9#commitcomment-3074283
---
 modules/services/x11/display-managers/default.nix | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/modules/services/x11/display-managers/default.nix b/modules/services/x11/display-managers/default.nix
index 6f1d7202be3..b49507b73ff 100644
--- a/modules/services/x11/display-managers/default.nix
+++ b/modules/services/x11/display-managers/default.nix
@@ -154,9 +154,6 @@ in
 
 {
 
-  imports = [ ./kdm.nix ./slim.nix ./lightdm.nix ];
-
-
   options = {
 
     services.xserver.displayManager = {
-- 
GitLab


From ebb9f0e3fcb6bd2c41d5a4f250e08849b50d60a8 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 27 Apr 2013 22:42:03 +0200
Subject: [PATCH 4577/5331] atd: add "batch" to the list of programs that need
 a setuid wrapper

---
 modules/services/scheduling/atd.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/services/scheduling/atd.nix b/modules/services/scheduling/atd.nix
index 66266e5b570..68bc6f6466f 100644
--- a/modules/services/scheduling/atd.nix
+++ b/modules/services/scheduling/atd.nix
@@ -45,7 +45,7 @@ in
       group = "atd";
       setuid = true;
       setgid = true;
-    }) [ "at" "atq" "atrm" ];
+    }) [ "at" "atq" "atrm" "batch" ];
 
     environment.systemPackages = [ at ];
 
-- 
GitLab


From 9bc021cedaba0ea34d3a344fd1139d3f3068c4d1 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Tue, 30 Apr 2013 11:46:34 -0400
Subject: [PATCH 4578/5331] Set the firmware_class path in modprobe.d

Activation scripts are run before systemd is started, so unless users
are loading firmware in the initrd (which AFAICT we currently have no
support for) the previous /sys-based setting of firmware_class was
ineffective on boot.

Signed-off-by: Shea Levy <shea@shealevy.com>
---
 modules/services/hardware/udev.nix | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/modules/services/hardware/udev.nix b/modules/services/hardware/udev.nix
index 3bec396bfe5..37dba8ce71d 100644
--- a/modules/services/hardware/udev.nix
+++ b/modules/services/hardware/udev.nix
@@ -228,10 +228,7 @@ in
       (isYes "NET")
     ];
 
-    system.activationScripts.setFirmwarePath =
-      ''
-        echo -n ${config.hardware.firmware} 2>/dev/null > /sys/module/firmware_class/parameters/path
-      '';
+    boot.extraModprobeConfig = "options firmware_class path=${config.hardware.firmware}";
 
     system.activationScripts.clearHotplug =
       ''
-- 
GitLab


From 2415787040914e165fc4713d456ae3361fc68735 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Tue, 30 Apr 2013 13:03:14 -0400
Subject: [PATCH 4579/5331] gummiboot: Fix bug where old conf scripts for
 single-digit generations weren't removed

Signed-off-by: Shea Levy <shea@shealevy.com>
---
 .../system/boot/loader/gummiboot/gummiboot-builder.py | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/modules/system/boot/loader/gummiboot/gummiboot-builder.py b/modules/system/boot/loader/gummiboot/gummiboot-builder.py
index b8e9e983e79..9ea224b51f6 100644
--- a/modules/system/boot/loader/gummiboot/gummiboot-builder.py
+++ b/modules/system/boot/loader/gummiboot/gummiboot-builder.py
@@ -72,10 +72,13 @@ def get_generations(profile):
 def remove_old_entries(gens):
     slice_start = len("@efiSysMountPoint@/loader/entries/nixos-generation-")
     slice_end = -1 * len(".conf")
-    for path in glob.iglob("@efiSysMountPoint@/loader/entries/nixos-generation-[1-9][0-9]*.conf"):
-        gen = int(path[slice_start:slice_end])
-        if not gen in gens:
-            os.unlink(path)
+    for path in glob.iglob("@efiSysMountPoint@/loader/entries/nixos-generation-[1-9]*.conf"):
+        try:
+            gen = int(path[slice_start:slice_end])
+            if not gen in gens:
+                os.unlink(path)
+        except ValueError:
+            pass
     for path in glob.iglob("@efiSysMountPoint@/efi/nixos/*"):
         if not path in known_paths:
             os.unlink(path)
-- 
GitLab


From f5e720aba84fd931bbdb90ff39c010a08bc74ab2 Mon Sep 17 00:00:00 2001
From: Rok Garbas <rok@garbas.si>
Date: Fri, 3 May 2013 03:28:04 +0200
Subject: [PATCH 4580/5331] adding sensor option to thinkfan

---
 modules/services/hardware/thinkfan.nix | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/modules/services/hardware/thinkfan.nix b/modules/services/hardware/thinkfan.nix
index 7961477da85..b39c9cb1d9b 100644
--- a/modules/services/hardware/thinkfan.nix
+++ b/modules/services/hardware/thinkfan.nix
@@ -41,7 +41,7 @@ let
     #  All numbers are integers.
     #
 
-    sensor /proc/acpi/ibm/thermal (0, 10, 15, 2, 10, 5, 0, 3, 0, 3)
+    sensor ${cfg.sensor} (0, 10, 15, 2, 10, 5, 0, 3, 0, 3)
     
     (0,     0,      55)
     (1,     48,     60)
@@ -65,6 +65,13 @@ in {
         '';
       };
 
+      sensor = mkOption {
+        default = "/proc/acpi/ibm/thermal";
+        description =''
+          Sensor used by thinkfan
+        '';
+      };
+
     };
 
   };
-- 
GitLab


From 4b69de4a3de9e7120e04ab27c684c571cc4f4c49 Mon Sep 17 00:00:00 2001
From: Evgeny Egorochkin <phreedom@yandex.ru>
Date: Sat, 4 May 2013 12:15:24 +0300
Subject: [PATCH 4581/5331] VirtualBox: udev rule to populate /dev/vboxusb.

After Linux 3.2(?), /proc/bus/usb (and usbfs (or usbdevfs?)) went away,
leaving virtualbox no way to determine what USB devices were connected
to the system. The solution was to add some virtualbox specific udev
rules to populate /dev/vboxusb with what was in /proc/bus/usb before.

Patch contributed by Jack Cummings.
---
 modules/programs/virtualbox.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/modules/programs/virtualbox.nix b/modules/programs/virtualbox.nix
index a7c41d915ec..c2781edffb8 100644
--- a/modules/programs/virtualbox.nix
+++ b/modules/programs/virtualbox.nix
@@ -15,6 +15,10 @@ let virtualbox = config.boot.kernelPackages.virtualbox; in
     ''
       KERNEL=="vboxdrv",    OWNER="root", GROUP="vboxusers", MODE="0660", TAG+="systemd"
       KERNEL=="vboxnetctl", OWNER="root", GROUP="root",      MODE="0600", TAG+="systemd"
+      SUBSYSTEM=="usb_device", ACTION=="add", RUN+="${virtualbox}/libexec/virtualbox/VBoxCreateUSBNode.sh $major $minor $attr{bDeviceClass}"
+      SUBSYSTEM=="usb", ACTION=="add", ENV{DEVTYPE}=="usb_device", RUN+="${virtualbox}/libexec/virtualbox/VBoxCreateUSBNode.sh $major $minor $attr{bDeviceClass}"
+      SUBSYSTEM=="usb_device", ACTION=="remove", RUN+="${virtualbox}/libexec/virtualbox/VBoxCreateUSBNode.sh --remove $major $minor"
+      SUBSYSTEM=="usb", ACTION=="remove", ENV{DEVTYPE}=="usb_device", RUN+="${virtualbox}/libexec/virtualbox/VBoxCreateUSBNode.sh --remove $major $minor"
     '';
 
   # Since we lack the right setuid binaries, set up a host-only network by default.
-- 
GitLab


From bdb22d37f1877d052e5ace0cb2307755ebdcf55d Mon Sep 17 00:00:00 2001
From: modulistic <modulistic@gmail.com>
Date: Sat, 4 May 2013 11:26:56 +0200
Subject: [PATCH 4582/5331] typo in networking.dnsSingleRequest documentation

---
 modules/config/networking.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/config/networking.nix b/modules/config/networking.nix
index a3f269476da..a4eb435ed67 100644
--- a/modules/config/networking.nix
+++ b/modules/config/networking.nix
@@ -26,7 +26,7 @@ let
         routers will systemically drop the ipv4 queries. The symptom of this problem is
         that 'getent hosts example.com' only returns ipv6 (or perhaps only ipv4) addresses. The
         workaround for this is to specify the option 'single-request' in
-        /etc/resolve.conf. This option enables that.
+        /etc/resolv.conf. This option enables that.
       '';
     };
 
-- 
GitLab


From faa064dbc7a8e224057e28f66f7f315fe1896537 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Sat, 4 May 2013 11:26:56 -0400
Subject: [PATCH 4583/5331] 32-bit gummiboot uses lower-case ia32

Thanks to iElectric in the channel for pointing it out

Signed-off-by: Shea Levy <shea@shealevy.com>
---
 modules/installer/cd-dvd/iso-image.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/installer/cd-dvd/iso-image.nix b/modules/installer/cd-dvd/iso-image.nix
index 4a3dc87b4c7..96a4d411d0b 100644
--- a/modules/installer/cd-dvd/iso-image.nix
+++ b/modules/installer/cd-dvd/iso-image.nix
@@ -148,7 +148,7 @@ let
     '';
 
   targetArch = if pkgs.stdenv.isi686 then
-    "IA32"
+    "ia32"
   else if pkgs.stdenv.isx86_64 then
     "x64"
   else
-- 
GitLab


From 17f10f70ad91737061cc94f5d6a9beede1b02f61 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Sat, 4 May 2013 11:35:01 -0400
Subject: [PATCH 4584/5331] Include xhci_hcd in the initrd for usb3 devices

Fixes #158, I don't think there is an `xhci' module

Signed-off-by: Shea Levy <shea@shealevy.com>
---
 modules/system/boot/kernel.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/modules/system/boot/kernel.nix b/modules/system/boot/kernel.nix
index 7744fd94a2c..291dae31a6f 100644
--- a/modules/system/boot/kernel.nix
+++ b/modules/system/boot/kernel.nix
@@ -180,6 +180,7 @@ in
         "uhci_hcd"
         "ehci_hcd"
         "ohci_hcd"
+        "xhci_hcd"
         "usbhid"
 
         # Unix domain sockets (needed by udev).
-- 
GitLab


From d6df27277b97ba6700f6774cdc66fc038e158c56 Mon Sep 17 00:00:00 2001
From: Evgeny Egorochkin <phreedom@yandex.ru>
Date: Sun, 5 May 2013 16:31:10 +0300
Subject: [PATCH 4585/5331] ZFS: automatically import zpools and mount zfs
 filesystems.

Patch contributed by Jack Cummings.
---
 modules/tasks/filesystems/zfs.nix | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/modules/tasks/filesystems/zfs.nix b/modules/tasks/filesystems/zfs.nix
index 44c265b20d2..b76c50f420f 100644
--- a/modules/tasks/filesystems/zfs.nix
+++ b/modules/tasks/filesystems/zfs.nix
@@ -63,6 +63,28 @@ in
         '';
     };
 
+    systemd.services."zpool-import" = {
+      description = "Import zpools";
+      after = [ "systemd-udev-settle.service" ];
+      serviceConfig = {
+        Type = "oneshot";
+        RemainAfterExit = true;
+        ExecStart = "${kernel.zfs}/sbin/zpool import -f -a -d /dev";
+      };
+    };
+
+    systemd.services."zfs-mount" = {
+      description = "Mount zfs volumes";
+      after = [ "zpool-import.service" ];
+      wantedBy = [ "local-fs.target" ];
+      serviceConfig = {
+        Type = "oneshot";
+        RemainAfterExit = true;
+        ExecStart = "${kernel.zfs}/sbin/zfs mount -a";
+        ExecStop = "${kernel.zfs}/sbin/zfs umount -a";
+      };
+    };
+ 
     system.fsPackages = [ kernel.zfs ];                  # XXX: needed? zfs doesn't have a fsck
     environment.systemPackages = [ kernel.zfs ];
     services.udev.packages = [ kernel.zfs ];             # to hook zvol naming, etc. 
-- 
GitLab


From 7c8c1dade5c8a9fedec608679e6bf5e1c0db9418 Mon Sep 17 00:00:00 2001
From: Russell O'Connor <roconnor@theorem.ca>
Date: Sun, 5 May 2013 15:44:06 -0400
Subject: [PATCH 4586/5331] Add options for user and group to run nginx as. Add
 option to compile in full WebDAV support.

---
 .../services/web-servers/nginx/default.nix    | 26 +++++++++++++++----
 1 file changed, 21 insertions(+), 5 deletions(-)

diff --git a/modules/services/web-servers/nginx/default.nix b/modules/services/web-servers/nginx/default.nix
index c9c242400f7..03f37d3518e 100644
--- a/modules/services/web-servers/nginx/default.nix
+++ b/modules/services/web-servers/nginx/default.nix
@@ -4,8 +4,9 @@ with pkgs.lib;
 
 let
   cfg = config.services.nginx;
+  nginx = pkgs.nginx.override { fullWebDAV = cfg.fullWebDAV; };
   configFile = pkgs.writeText "nginx.conf" ''
-    user nginx nginx;
+    user ${cfg.user} ${cfg.group};
     daemon off;
     ${cfg.config}
   '';
@@ -34,12 +35,27 @@ in
           Directory holding all state for nginx to run.
         ";
       };
+
+      user = mkOption {
+        default = "nginx";
+        description = "User account under which nginx runs.";
+      };
+
+      group = mkOption {
+        default = "nginx";
+        description = "Group account under which nginx runs.";
+      };
+
+      fullWebDAV = mkOption {
+        default = false;
+        description = "Compile in a third party module providing full WebDAV support";
+      };
     };
 
   };
 
   config = mkIf cfg.enable {
-    environment.systemPackages = [ pkgs.nginx ];
+    environment.systemPackages = [ nginx ];
 
     # TODO: test user supplied config file pases syntax test
 
@@ -47,14 +63,14 @@ in
       description = "Nginx Web Server";
       after = [ "network.target" ];
       wantedBy = [ "multi-user.target" ];
-      path = [ pkgs.nginx ];
+      path = [ nginx ];
       preStart =
         ''
         mkdir -p ${cfg.stateDir}/logs
-        chown -R nginx:nginx ${cfg.stateDir}
+        chown -R ${cfg.user}:${cfg.group} ${cfg.stateDir}
         '';
       serviceConfig = {
-        ExecStart = "${pkgs.nginx}/bin/nginx -c ${configFile} -p ${cfg.stateDir}";
+        ExecStart = "${nginx}/bin/nginx -c ${configFile} -p ${cfg.stateDir}";
       };
     };
 
-- 
GitLab


From 39ba7558737b2ac58f5391b5d225ff486bf603b9 Mon Sep 17 00:00:00 2001
From: Evgeny Egorochkin <phreedom@yandex.ru>
Date: Mon, 6 May 2013 13:10:28 +0300
Subject: [PATCH 4587/5331] Move lighttpd.nix to lighttpd/default.nix

So that we later can add sub-services for lighttpd without polluting the
web-servers/ directory.
---
 modules/module-list.nix                                         | 2 +-
 .../services/web-servers/{lighttpd.nix => lighttpd/default.nix} | 0
 2 files changed, 1 insertion(+), 1 deletion(-)
 rename modules/services/web-servers/{lighttpd.nix => lighttpd/default.nix} (100%)

diff --git a/modules/module-list.nix b/modules/module-list.nix
index 526bd67195e..60c7909c994 100644
--- a/modules/module-list.nix
+++ b/modules/module-list.nix
@@ -185,7 +185,7 @@
   ./services/ttys/agetty.nix
   ./services/web-servers/apache-httpd/default.nix
   ./services/web-servers/jboss/default.nix
-  ./services/web-servers/lighttpd.nix
+  ./services/web-servers/lighttpd/default.nix
   ./services/web-servers/nginx/default.nix
   ./services/web-servers/tomcat.nix
   ./services/x11/desktop-managers/default.nix
diff --git a/modules/services/web-servers/lighttpd.nix b/modules/services/web-servers/lighttpd/default.nix
similarity index 100%
rename from modules/services/web-servers/lighttpd.nix
rename to modules/services/web-servers/lighttpd/default.nix
-- 
GitLab


From 5e32c9c8ebfb05e7d96968f549e8554e77cff130 Mon Sep 17 00:00:00 2001
From: Evgeny Egorochkin <phreedom@yandex.ru>
Date: Mon, 6 May 2013 13:14:01 +0300
Subject: [PATCH 4588/5331]  lighttpd: generate a default config file
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Instead of forcing users to configure lighttpd manually, make it an
option. The current services.lighttpd.configText option can still be
used for manual configuration, but if it is left blank (default) we'll
use the new generated config file.

The generated config file ensures that the server drops root priveleges
and runs as the "lighttpd" user. It pulls in some new config params that
can be set in configuration.nix (here with default values):

  services.lighttpd.document-root = "/srv/www"
  services.lighttpd.port = 80
  services.lighttpd.extraConfig = ""  # appended to the generated file

And it enables access and error logging to the systemd journal.

Patch contributed by Bjørn Forsman.
---
 .../services/web-servers/lighttpd/default.nix | 86 +++++++++++++------
 1 file changed, 60 insertions(+), 26 deletions(-)

diff --git a/modules/services/web-servers/lighttpd/default.nix b/modules/services/web-servers/lighttpd/default.nix
index 1931fa65e51..326ed76bd40 100644
--- a/modules/services/web-servers/lighttpd/default.nix
+++ b/modules/services/web-servers/lighttpd/default.nix
@@ -7,9 +7,37 @@ with pkgs.lib;
 let
 
   cfg = config.services.lighttpd;
-  configFile = pkgs.writeText "lighttpd.conf" ''
-    ${cfg.configText}
-  '';
+
+  configFile = if cfg.configText != "" then
+    pkgs.writeText "lighttpd.conf" ''
+      ${cfg.configText}
+    ''
+    else
+    pkgs.writeText "lighttpd.conf" ''
+      server.document-root = "${cfg.document-root}"
+      server.port = ${toString cfg.port}
+      server.username = "lighttpd"
+      server.groupname = "lighttpd"
+
+      # Logging (logs end up in systemd journal)
+      server.modules += ("mod_accesslog")
+      accesslog.use-syslog = "enable"
+      server.errorlog-use-syslog = "enable"
+
+      mimetype.assign = (
+          ".html" => "text/html",
+          ".htm" => "text/html",
+          ".txt" => "text/plain",
+          ".jpg" => "image/jpeg",
+          ".png" => "image/png",
+          ".css" => "text/css"
+          )
+
+      static-file.exclude-extensions = ( ".fcgi", ".php", ".rb", "~", ".inc" )
+      index-file.names = ( "index.html" )
+
+      ${cfg.extraConfig}
+    '';
 
 in
 
@@ -23,37 +51,43 @@ in
         default = false;
         type = types.uniq types.bool;
         description = ''
-          Enable the lighttpd web server. You must configure it with
-          services.lighttpd.configText.
+          Enable the lighttpd web server.
+        '';
+      };
+
+      port = mkOption {
+        default = 80;
+        type = types.uniq types.int;
+        description = ''
+          TCP port number for lighttpd to bind to.
+        '';
+      };
+
+      document-root = mkOption {
+        default = "/srv/www";
+        type = types.uniq types.string;
+        description = ''
+          Document-root of the web server. Must be readable by the "lighttpd" user.
         '';
       };
 
       configText = mkOption {
         default = "";
         type = types.string;
-        example = ''
-          server.document-root = "/srv/www/"
-          server.port = 80
-          server.username = "lighttpd"
-          server.groupname = "lighttpd"
-
-          mimetype.assign = (
-            ".html" => "text/html", 
-            ".txt" => "text/plain",
-            ".jpg" => "image/jpeg",
-            ".png" => "image/png" 
-          )
-          
-          static-file.exclude-extensions = ( ".fcgi", ".php", ".rb", "~", ".inc" )
-          index-file.names = ( "index.html" )
+	example = ''...verbatim config file contents...'';
+        description = ''
+          Overridable config file contents to use for lighttpd. By default, use
+          the contents automatically generated by NixOS.
         '';
+      };
+
+      extraConfig = mkOption {
+        default = "";
+        type = types.string;
         description = ''
-          Contents of lighttpd configuration file. The user and group
-          "lighttpd" is available for privilege separation. See configuration
-          tutorial at
-          http://redmine.lighttpd.net/projects/lighttpd/wiki/TutorialConfiguration
-          or full documentation at
-          http://redmine.lighttpd.net/projects/lighttpd/wiki/Docs
+          These configuration lines will be appended to the generated lighttpd
+          config file. Note that this mechanism does not work when the manual
+          <option>configText</option> option is used.
         '';
       };
 
-- 
GitLab


From 4b435b173f658c862e040be56244117ba8c407d4 Mon Sep 17 00:00:00 2001
From: Evgeny Egorochkin <phreedom@yandex.ru>
Date: Mon, 6 May 2013 13:28:30 +0300
Subject: [PATCH 4589/5331] lighttpd: add services.lighttpd.mod_userdir option
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

If true, requests in the form /~user/page.html are rewritten to take
the file public_html/page.html from the home directory of the user.

Default is off.

Patch contributed by Bjørn Forsman.
---
 modules/services/web-servers/lighttpd/default.nix | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/modules/services/web-servers/lighttpd/default.nix b/modules/services/web-servers/lighttpd/default.nix
index 326ed76bd40..588fece257e 100644
--- a/modules/services/web-servers/lighttpd/default.nix
+++ b/modules/services/web-servers/lighttpd/default.nix
@@ -36,6 +36,11 @@ let
       static-file.exclude-extensions = ( ".fcgi", ".php", ".rb", "~", ".inc" )
       index-file.names = ( "index.html" )
 
+      ${if cfg.mod_userdir then ''
+        server.modules += ("mod_userdir")
+        userdir.path = "public_html"
+      '' else ""}
+
       ${cfg.extraConfig}
     '';
 
@@ -71,6 +76,15 @@ in
         '';
       };
 
+      mod_userdir = mkOption {
+        default = false;
+        type = types.uniq types.bool;
+        description = ''
+          If true, requests in the form /~user/page.html are rewritten to take
+          the file public_html/page.html from the home directory of the user.
+        '';
+      };
+
       configText = mkOption {
         default = "";
         type = types.string;
-- 
GitLab


From 161086b205fdd50e29f75d561aa87c87f6f97e5a Mon Sep 17 00:00:00 2001
From: Evgeny Egorochkin <phreedom@yandex.ru>
Date: Mon, 6 May 2013 13:31:17 +0300
Subject: [PATCH 4590/5331] lighttpd: add services.lighttpd.mod_status option
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

If true, show server status overview at /server-status, statistics at
/server-statistics and list of loaded modules at /server-config.

Patch contributed by Bjørn Forsman.
---
 .../services/web-servers/lighttpd/default.nix    | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/modules/services/web-servers/lighttpd/default.nix b/modules/services/web-servers/lighttpd/default.nix
index 588fece257e..1d1cd6fa178 100644
--- a/modules/services/web-servers/lighttpd/default.nix
+++ b/modules/services/web-servers/lighttpd/default.nix
@@ -41,6 +41,13 @@ let
         userdir.path = "public_html"
       '' else ""}
 
+      ${if cfg.mod_status then ''
+        server.modules += ("mod_status")
+        status.status-url = "/server-status"
+        status.statistics-url = "/server-statistics"
+        status.config-url = "/server-config"
+      '' else ""}
+
       ${cfg.extraConfig}
     '';
 
@@ -85,6 +92,15 @@ in
         '';
       };
 
+      mod_status = mkOption {
+        default = false;
+        type = types.uniq types.bool;
+        description = ''
+          Show server status overview at /server-status, statistics at
+          /server-statistics and list of loaded modules at /server-config.
+        '';
+      };
+
       configText = mkOption {
         default = "";
         type = types.string;
-- 
GitLab


From dc389c5d1e51c6817eabfcc6f3cc7786214c3489 Mon Sep 17 00:00:00 2001
From: Evgeny Egorochkin <phreedom@yandex.ru>
Date: Mon, 6 May 2013 13:49:29 +0300
Subject: [PATCH 4591/5331] lighttpd: add gitweb as a sub-service
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Now you can access gitweb at http://yourserver/gitweb by simply adding
this to configuration.nix (assuming services.lighttpd.enable = true);

  services.lighttpd.gitweb.enable = true;

The path to all bare repositories served by gitweb can be set with this
option (default value below):

  services.lighttpd.gitweb.projectroot = "/srv/git";

Based on patch contributed by Bjørn Forsman.
---
 modules/module-list.nix                       |  1 +
 .../services/web-servers/lighttpd/gitweb.nix  | 63 +++++++++++++++++++
 2 files changed, 64 insertions(+)
 create mode 100644 modules/services/web-servers/lighttpd/gitweb.nix

diff --git a/modules/module-list.nix b/modules/module-list.nix
index 60c7909c994..3ce8a6fb969 100644
--- a/modules/module-list.nix
+++ b/modules/module-list.nix
@@ -186,6 +186,7 @@
   ./services/web-servers/apache-httpd/default.nix
   ./services/web-servers/jboss/default.nix
   ./services/web-servers/lighttpd/default.nix
+  ./services/web-servers/lighttpd/gitweb.nix
   ./services/web-servers/nginx/default.nix
   ./services/web-servers/tomcat.nix
   ./services/x11/desktop-managers/default.nix
diff --git a/modules/services/web-servers/lighttpd/gitweb.nix b/modules/services/web-servers/lighttpd/gitweb.nix
new file mode 100644
index 00000000000..88c63064a04
--- /dev/null
+++ b/modules/services/web-servers/lighttpd/gitweb.nix
@@ -0,0 +1,63 @@
+{ config, pkgs, ... }:
+
+with pkgs.lib;
+
+let
+  cfg = config.services.lighttpd.gitweb;
+  gitwebConfigFile = pkgs.writeText "gitweb.conf" ''
+    # path to git projects (<project>.git)
+    $projectroot = "${cfg.projectroot}";
+  '';
+in
+{
+
+  options.services.lighttpd.gitweb = {
+
+    enable = mkOption {
+      default = false;
+      type = types.uniq types.bool;
+      description = ''
+        If true, enable gitweb in lighttpd. Access it at http://yourserver/gitweb
+      '';
+    };
+
+    projectroot = mkOption {
+      default = "/srv/git";
+      type = types.uniq types.string;
+      description = ''
+        Path to git projects (bare repositories) that should be served by
+        gitweb. Must not end with a slash.
+      '';
+    };
+
+  };
+
+  config = mkIf cfg.enable {
+
+    services.lighttpd.extraConfig = ''
+      server.modules += (
+        "mod_alias",
+        "mod_cgi",
+        "mod_redirect",
+        "mod_setenv"
+      )
+      $HTTP["url"] =~ "^/gitweb" {
+          cgi.assign = (
+              ".cgi" => "${pkgs.perl}/bin/perl"
+          )
+          url.redirect = (
+              "^/gitweb$" => "/gitweb/"
+          )
+          alias.url = (
+              "/gitweb/static/" => "${pkgs.git}/share/gitweb/static/",
+              "/gitweb/"        => "${pkgs.git}/share/gitweb/gitweb.cgi"
+          )
+          setenv.add-environment = (
+              "GITWEB_CONFIG" => "${gitwebConfigFile}"
+          )
+      }
+    '';
+
+  };
+
+}
-- 
GitLab


From 76b7dea8059ae9b64a217c98fcade20b84df8445 Mon Sep 17 00:00:00 2001
From: Russell O'Connor <roconnor@theorem.ca>
Date: Mon, 6 May 2013 10:49:23 -0400
Subject: [PATCH 4592/5331] Make nginx uid and gid optional.

---
 modules/misc/ids.nix                           |  2 ++
 modules/services/web-servers/nginx/default.nix | 10 +++++++---
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/modules/misc/ids.nix b/modules/misc/ids.nix
index 2cb1ffe4429..fd76dfc47a1 100644
--- a/modules/misc/ids.nix
+++ b/modules/misc/ids.nix
@@ -74,6 +74,7 @@ in
     wwwrun = 54;
     spamd = 56;
     nslcd = 58;
+    nginx = 60;
 
     # When adding a uid, make sure it doesn't match an existing gid.
 
@@ -131,6 +132,7 @@ in
     networkmanager = 57;
     nslcd = 58;
     scanner = 59;
+    nginx = 60;
 
     # When adding a gid, make sure it doesn't match an existing uid.
 
diff --git a/modules/services/web-servers/nginx/default.nix b/modules/services/web-servers/nginx/default.nix
index 03f37d3518e..da08751d0b5 100644
--- a/modules/services/web-servers/nginx/default.nix
+++ b/modules/services/web-servers/nginx/default.nix
@@ -74,10 +74,14 @@ in
       };
     };
 
-    users.extraUsers.nginx = {
+    users.extraUsers = optionalAttrs (cfg.user == "nginx") singleton
+    { name = "nginx";
       group = "nginx";
+      uid = config.ids.uids.nginx;
     };
 
-    users.extraGroups.nginx = {};
-  };
+    users.extraGroups = optionalAttrs (cfg.group == "nginx") singleton
+    { name = "nginx";
+      gid = config.ids.gids.nginx;
+    };
 }
-- 
GitLab


From 9c6264527337b6065ff0534c2a7b412480e6687b Mon Sep 17 00:00:00 2001
From: Russell O'Connor <roconnor@theorem.ca>
Date: Mon, 6 May 2013 11:11:04 -0400
Subject: [PATCH 4593/5331] Add braces to fix compilation errors. I don't
 understand how Apache gets away without them.

---
 .../services/web-servers/nginx/default.nix    | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/modules/services/web-servers/nginx/default.nix b/modules/services/web-servers/nginx/default.nix
index da08751d0b5..b26af1aa744 100644
--- a/modules/services/web-servers/nginx/default.nix
+++ b/modules/services/web-servers/nginx/default.nix
@@ -74,14 +74,15 @@ in
       };
     };
 
-    users.extraUsers = optionalAttrs (cfg.user == "nginx") singleton
-    { name = "nginx";
-      group = "nginx";
-      uid = config.ids.uids.nginx;
-    };
+    users.extraUsers = optionalAttrs (cfg.user == "nginx") (singleton
+      { name = "nginx";
+        group = "nginx";
+        uid = config.ids.uids.nginx;
+      });
 
-    users.extraGroups = optionalAttrs (cfg.group == "nginx") singleton
-    { name = "nginx";
-      gid = config.ids.gids.nginx;
-    };
+    users.extraGroups = optionalAttrs (cfg.group == "nginx") (singleton
+      { name = "nginx";
+        gid = config.ids.gids.nginx;
+      });
+  };
 }
-- 
GitLab


From e62c0d2e1f331043de976b7d09d9230f9161a25a Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 2 May 2013 11:04:39 +0200
Subject: [PATCH 4594/5331] Manual: _SYSTEMD_UNIT -> -u

---
 doc/manual/running.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/manual/running.xml b/doc/manual/running.xml
index ea4028b6e9b..57206bbce8f 100644
--- a/doc/manual/running.xml
+++ b/doc/manual/running.xml
@@ -262,7 +262,7 @@ output to messages of interest.  For instance, to get all messages
 from PostgreSQL:
 
 <screen>
-$ journalctl _SYSTEMD_UNIT=postgresql.service
+$ journalctl -u postgresql.service
 -- Logs begin at Mon, 2013-01-07 13:28:01 CET, end at Tue, 2013-01-08 01:09:57 CET. --
 ...
 Jan 07 15:44:14 hagbard postgres[2681]: [2-1] LOG:  database system is shut down
-- 
GitLab


From 8af81ad66b066fdaa712a29d2aed25eb3f53036c Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 7 May 2013 14:21:27 +0200
Subject: [PATCH 4595/5331] Don't start nscd if it's not already running

"systemctl restart" will start a service if it's not already
running...
---
 modules/config/networking.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/config/networking.nix b/modules/config/networking.nix
index a4eb435ed67..799d97a089f 100644
--- a/modules/config/networking.nix
+++ b/modules/config/networking.nix
@@ -67,7 +67,7 @@ in
           '' + optionalString config.services.nscd.enable ''
             # Invalidate the nscd cache whenever resolv.conf is
             # regenerated.
-            libc_restart='${pkgs.systemd}/bin/systemctl restart --no-block nscd.service'
+            libc_restart='${pkgs.systemd}/bin/systemctl try-restart --no-block nscd.service'
           '' + optionalString cfg.dnsSingleRequest ''
             # only send one DNS request at a time
             resolv_conf_options='single-request'
-- 
GitLab


From 6089b5b50c767cb1a173b2d2febe001cf2b1bc74 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 7 May 2013 14:59:08 +0200
Subject: [PATCH 4596/5331] Increase PostgreSQL's shutdown timeout to 3 minutes

1 minute is too short, given that the autovacuum launcher often seems
to require exactly 1 minute to shut down.  (This might be a bug
related to autovacuum_naptime.)
---
 modules/services/databases/postgresql.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/services/databases/postgresql.nix b/modules/services/databases/postgresql.nix
index 2926bc62940..28ea4b7dcf0 100644
--- a/modules/services/databases/postgresql.nix
+++ b/modules/services/databases/postgresql.nix
@@ -190,7 +190,7 @@ in
 
             # Give Postgres a decent amount of time to clean up after
             # receiving systemd's SIGINT.
-            TimeoutSec = 60;
+            TimeoutSec = 120;
           };
 
         # Wait for PostgreSQL to be ready to accept connections.
-- 
GitLab


From 4f71bce69150bdea42a9374663e1eaaa5a40b7fe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= <viric@viric.name>
Date: Tue, 7 May 2013 18:53:28 +0200
Subject: [PATCH 4597/5331] Adding miniupnpc to gnunet path, to be able to use
 upnp

---
 modules/services/networking/gnunet.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/modules/services/networking/gnunet.nix b/modules/services/networking/gnunet.nix
index e853fd7d685..37df4acd63d 100644
--- a/modules/services/networking/gnunet.nix
+++ b/modules/services/networking/gnunet.nix
@@ -134,6 +134,7 @@ in
       description = "GNUnet";
       after = [ "network.target" ];
       wantedBy = [ "multi-user.target" ];
+      path = [ pkgs.gnunet pkgs.miniupnpc ];
       serviceConfig.ExecStart = "${pkgs.gnunet}/lib/gnunet/libexec/gnunet-service-arm -c ${configFile}";
       serviceConfig.User = "gnunet";
       serviceConfig.UMask = "0007";
-- 
GitLab


From 4e38d152ed8a6b3177e7a5b8718ece3a110dc580 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= <viric@viric.name>
Date: Thu, 9 May 2013 15:01:16 +0200
Subject: [PATCH 4598/5331] Adding synclient to systemPackages if synaptics is
 enabled.

---
 modules/services/x11/hardware/synaptics.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/modules/services/x11/hardware/synaptics.nix b/modules/services/x11/hardware/synaptics.nix
index e0806499106..d16142a5fdf 100644
--- a/modules/services/x11/hardware/synaptics.nix
+++ b/modules/services/x11/hardware/synaptics.nix
@@ -89,6 +89,8 @@ let cfg = config.services.xserver.synaptics; in
 
     services.xserver.modules = [ pkgs.xorg.xf86inputsynaptics ];
 
+    environment.systemPackages = [ pkgs.xorg.xf86inputsynaptics ];
+
     services.xserver.config =
       ''
         # Automatically enable the synaptics driver for all touchpads.
-- 
GitLab


From ebac0220d1b3aebc46f1de50ffe414fa7ba72fb4 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 9 May 2013 16:21:42 +0200
Subject: [PATCH 4599/5331] systemd.nix: Use environment.etc attribute syntax

---
 modules/system/boot/systemd.nix | 53 ++++++++++++++-------------------
 1 file changed, 23 insertions(+), 30 deletions(-)

diff --git a/modules/system/boot/systemd.nix b/modules/system/boot/systemd.nix
index 44bf89b907a..c44232d7c28 100644
--- a/modules/system/boot/systemd.nix
+++ b/modules/system/boot/systemd.nix
@@ -530,36 +530,29 @@ in
 
     environment.systemPackages = [ systemd ];
 
-    environment.etc =
-      [ { source = units;
-          target = "systemd/system";
-        }
-        { source = pkgs.writeText "systemd.conf"
-            ''
-              [Manager]
-            '';
-          target = "systemd/system.conf";
-        }
-        { source = pkgs.writeText "journald.conf"
-            ''
-              [Journal]
-              RateLimitInterval=${config.services.journald.rateLimitInterval}
-              RateLimitBurst=${toString config.services.journald.rateLimitBurst}
-              ${optionalString (config.services.journald.console != "") ''
-                ForwardToConsole=yes
-                TTYPath=${config.services.journald.console}
-              ''}
-            '';
-          target = "systemd/journald.conf";
-        }
-        { source = pkgs.writeText "logind.conf"
-            ''
-              [Login]
-              ${config.services.logind.extraConfig}
-            '';
-          target = "systemd/logind.conf";
-        }
-      ];
+    environment.etc."systemd/system".source = units;
+
+    environment.etc."systemd/system.conf".text =
+      ''
+        [Manager]
+      '';
+
+    environment.etc."systemd/journald.conf".text =
+      ''
+        [Journal]
+        RateLimitInterval=${config.services.journald.rateLimitInterval}
+        RateLimitBurst=${toString config.services.journald.rateLimitBurst}
+        ${optionalString (config.services.journald.console != "") ''
+          ForwardToConsole=yes
+          TTYPath=${config.services.journald.console}
+        ''}
+      '';
+
+    environment.etc."systemd/logind.conf".text =
+      ''
+        [Login]
+        ${config.services.logind.extraConfig}
+      '';
 
     system.activationScripts.systemd =
       ''
-- 
GitLab


From ffb581c73944fc5221c29c43ac8ff61010f82e73 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 9 May 2013 16:25:24 +0200
Subject: [PATCH 4600/5331] Fix suspend in systemd

Systemd 203 expects the file /etc/systemd/sleep.conf to exist,
otherwise suspend doesn't work.
---
 modules/system/boot/systemd.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/modules/system/boot/systemd.nix b/modules/system/boot/systemd.nix
index c44232d7c28..4957bfeed34 100644
--- a/modules/system/boot/systemd.nix
+++ b/modules/system/boot/systemd.nix
@@ -554,6 +554,11 @@ in
         ${config.services.logind.extraConfig}
       '';
 
+    environment.etc."systemd/sleep.conf".text =
+      ''
+        [Sleep]
+      '';
+
     system.activationScripts.systemd =
       ''
         mkdir -p /var/lib/udev -m 0755
-- 
GitLab


From 44eb1bac65f17806a569ac7c09dbd7c0ad7958a7 Mon Sep 17 00:00:00 2001
From: Evgeny Egorochkin <phreedom@yandex.ru>
Date: Fri, 10 May 2013 14:57:48 +0300
Subject: [PATCH 4601/5331] Apparmor: add a warning

---
 modules/security/apparmor.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/modules/security/apparmor.nix b/modules/security/apparmor.nix
index 2e273bf5343..46bbb5374d9 100644
--- a/modules/security/apparmor.nix
+++ b/modules/security/apparmor.nix
@@ -14,7 +14,8 @@ with pkgs.lib;
       enable = mkOption {
         default = false;
         description = ''
-          Enable AppArmor application security system
+          Enable AppArmor application security system. Enable only if you want to further improve 
+AppArmor.
         '';
       };
 
-- 
GitLab


From a9e4eca8bfc34dee99b0557e04b0f3a0e7cd58ee Mon Sep 17 00:00:00 2001
From: Evgeny Egorochkin <phreedom@yandex.ru>
Date: Fri, 10 May 2013 16:07:56 +0300
Subject: [PATCH 4602/5331] Apparmor: check that we are running an
 AppArmor-enabled kernel.

---
 modules/security/apparmor.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/modules/security/apparmor.nix b/modules/security/apparmor.nix
index 46bbb5374d9..ec371e55423 100644
--- a/modules/security/apparmor.nix
+++ b/modules/security/apparmor.nix
@@ -35,6 +35,11 @@ AppArmor.
 
   config = mkIf (cfg.enable) {
 
+    assertions = [ { assertion = config.boot.kernelPackages.kernel.features ? apparmor
+                               && config.boot.kernelPackages.kernel.features.apparmor;
+                     message = "AppArmor is enabled, but the kernel doesn't have AppArmor support"; }
+                 ];
+
     jobs.apparmor =
       { startOn = "startup";
 
-- 
GitLab


From d7cc2415eaae9d81dbc511bfb9dc9a9626b58b58 Mon Sep 17 00:00:00 2001
From: Evgeny Egorochkin <phreedom@yandex.ru>
Date: Sat, 11 May 2013 08:40:45 +0300
Subject: [PATCH 4603/5331] AppArmor: try converting to a systemd unit

---
 modules/security/apparmor.nix | 27 +++++++++++++++++----------
 1 file changed, 17 insertions(+), 10 deletions(-)

diff --git a/modules/security/apparmor.nix b/modules/security/apparmor.nix
index ec371e55423..51ae40ce326 100644
--- a/modules/security/apparmor.nix
+++ b/modules/security/apparmor.nix
@@ -40,19 +40,26 @@ AppArmor.
                      message = "AppArmor is enabled, but the kernel doesn't have AppArmor support"; }
                  ];
 
-    jobs.apparmor =
-      { startOn = "startup";
-
-	path = [ pkgs.apparmor ];
-
-        preStart = concatMapStrings (profile: ''
-          apparmor_parser -Kv -I ${pkgs.apparmor}/etc/apparmor.d/ "${profile}"
+    environment.systemPackages = [ pkgs.apparmor ];
+
+    systemd.services.apparmor = {
+      #wantedBy = [ "basic.target" ];
+      wantedBy = [ "local-fs.target" ];
+      path = [ pkgs.apparmor ];
+
+      serviceConfig = {
+	Type = "oneshot";
+	RemainAfterExit = "yes";
+        ExecStart = concatMapStrings (profile: ''
+          ${pkgs.apparmor}/sbin/apparmor_parser -rKv -I ${pkgs.apparmor}/etc/apparmor.d/ "${profile}"
+        '') cfg.profiles;
+        ExecStop = concatMapStrings (profile: ''
+          ${pkgs.apparmor}/sbin/apparmor_parser -Rv "${profile}"
         '') cfg.profiles;
-
-	postStop = ''
-	'';
       };
 
+    };
+
   };
 
 }
-- 
GitLab


From 748ab74d1fbad4556d84192819fd7a690d8fee55 Mon Sep 17 00:00:00 2001
From: Evgeny Egorochkin <phreedom@yandex.ru>
Date: Sat, 11 May 2013 08:41:36 +0300
Subject: [PATCH 4604/5331] AppArmor profiles for SUID binaries. At this moment
 only for ping.

---
 modules/module-list.nix            |  1 +
 modules/security/apparmor-suid.nix | 42 ++++++++++++++++++++++++++++++
 2 files changed, 43 insertions(+)
 create mode 100644 modules/security/apparmor-suid.nix

diff --git a/modules/module-list.nix b/modules/module-list.nix
index 3ce8a6fb969..e16e3279f9d 100644
--- a/modules/module-list.nix
+++ b/modules/module-list.nix
@@ -47,6 +47,7 @@
   ./programs/wvdial.nix
   ./rename.nix
   ./security/apparmor.nix
+  ./security/apparmor-suid.nix
   ./security/ca.nix
   ./security/pam.nix
   ./security/pam_usb.nix
diff --git a/modules/security/apparmor-suid.nix b/modules/security/apparmor-suid.nix
new file mode 100644
index 00000000000..4b3d3bbdc00
--- /dev/null
+++ b/modules/security/apparmor-suid.nix
@@ -0,0 +1,42 @@
+{pkgs, config, ...}:
+let
+  cfg = config.security.apparmor;
+in
+with pkgs.lib;
+{
+
+  options.security.apparmor.confineSUIDApplications = mkOption {
+    default = true;
+    description = ''
+      Install AppArmor profiles for commonly-used SUID application
+      to mitigate potential privilege escalation attacks due to bugs
+      in such applications.
+
+      Currently available profiles: ping
+    '';
+  };
+
+  config = mkIf (cfg.confineSUIDApplications) {
+    security.apparmor.profiles = [ (pkgs.writeText "ping" ''
+      #include <tunables/global>
+      /var/setuid-wrappers/ping {
+	#include <abstractions/base>
+	#include <abstractions/consoles>
+	#include <abstractions/nameservice>
+
+	capability net_raw,
+	capability setuid,
+	network inet raw,
+
+	${pkgs.glibc}/lib/*.so mr,
+	/var/setuid-wrappers/ping.real mixr,
+	${pkgs.iputils}/sbin/ping mixr,
+	#/etc/modules.conf r,
+
+	## Site-specific additions and overrides. See local/README for details.
+	##include <local/bin.ping>
+      }
+    '') ];
+  };
+
+}
-- 
GitLab


From 09a7d18cc3330b50f77afb2ce0d66734e9f97b6d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Sat, 11 May 2013 12:15:32 +0200
Subject: [PATCH 4605/5331] transmission.service: fix ignored ExecReload
 setting

This is what currently happens (from the journal log):

  [/nix/store/HASH-unit/transmission.service:27] Executable path is not absolute, ignoring: kill -HUP $MAINPID

Fix it by using absolute path to kill.
---
 modules/services/torrent/transmission.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/services/torrent/transmission.nix b/modules/services/torrent/transmission.nix
index c3dc1f80f14..02ec25d1294 100644
--- a/modules/services/torrent/transmission.nix
+++ b/modules/services/torrent/transmission.nix
@@ -111,7 +111,7 @@ in
           ${pkgs.stdenv.shell} -c "chmod 770 ${homeDir}"
         '';
       serviceConfig.ExecStart = "${pkgs.transmission}/bin/transmission-daemon -f --port ${toString config.services.transmission.rpc_port}";
-      serviceConfig.ExecReload = "kill -HUP $MAINPID";
+      serviceConfig.ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID";
       serviceConfig.User = "transmission";
       # NOTE: transmission has an internal umask that also must be set (in settings.json)
       serviceConfig.UMask = "0002";
-- 
GitLab


From 078130767d2a9057eb7ad85a99e7eb84b00087fe Mon Sep 17 00:00:00 2001
From: Domen Kozar <domen@dev.si>
Date: Sat, 11 May 2013 19:25:14 +0200
Subject: [PATCH 4606/5331] add openvpn plugin to networkmanager

---
 modules/services/networking/networkmanager.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/modules/services/networking/networkmanager.nix b/modules/services/networking/networkmanager.nix
index f0ead66b53e..215dce14b4a 100644
--- a/modules/services/networking/networkmanager.nix
+++ b/modules/services/networking/networkmanager.nix
@@ -130,7 +130,8 @@ in {
 
     security.polkit.permissions = polkitConf;
 
-    services.dbus.packages = cfg.packages;
+    # openvpn plugin has only dbus interface
+    services.dbus.packages = cfg.packages ++ [ networkmanager_openvpn ];
 
     services.udev.packages = cfg.packages;
   };
-- 
GitLab


From b345417bc5f4a30d602512908acf05b04f7b3de4 Mon Sep 17 00:00:00 2001
From: Jaka Hudoklin <jakahudoklin@gmail.com>
Date: Sat, 11 May 2013 19:08:27 +0000
Subject: [PATCH 4607/5331] Fix pxe network boot

---
 modules/installer/cd-dvd/system-tarball-pc.nix | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/modules/installer/cd-dvd/system-tarball-pc.nix b/modules/installer/cd-dvd/system-tarball-pc.nix
index 1046786c6df..91eba4ec852 100644
--- a/modules/installer/cd-dvd/system-tarball-pc.nix
+++ b/modules/installer/cd-dvd/system-tarball-pc.nix
@@ -23,13 +23,13 @@ let
     label nixos
       MENU LABEL ^NixOS using nfsroot
       KERNEL bzImage
-      append ip=dhcp nfsroot=/home/pcroot systemConfig=${config.system.build.toplevel} init=${config.system.build.toplevel}/init
+      append ip=dhcp nfsroot=/home/pcroot systemConfig=${config.system.build.toplevel} init=${config.system.build.toplevel}/init rw
 
     # I don't know how to make this boot with nfsroot (using the initrd)
     label nixos_initrd
       MENU LABEL NixOS booting the poor ^initrd.
       KERNEL bzImage
-      append initrd=initrd ip=dhcp nfsroot=/home/pcroot systemConfig=${config.system.build.toplevel} init=${config.system.build.toplevel}/init
+      append initrd=initrd ip=dhcp nfsroot=/home/pcroot systemConfig=${config.system.build.toplevel} init=${config.system.build.toplevel}/init rw
 
     label memtest
       MENU LABEL ^${pkgs.memtest86.name}
@@ -130,7 +130,7 @@ in
 
   nixpkgs.config = {
     packageOverrides = p: rec {
-      linux_3_2 = p.linux_3_2.override {
+      linux_3_4 = p.linux_3_4.override {
         extraConfig = ''
           # Enable drivers in kernel for most NICs.
           E1000 y
@@ -143,11 +143,15 @@ in
           ATL1C y
           VORTEX y
           VIA_RHINE y
+          R8169 y
 
           # Enable nfs root boot
+          UNIX y # http://www.linux-mips.org/archives/linux-mips/2006-11/msg00113.html
           IP_PNP y
           IP_PNP_DHCP y
+          FSCACHE y
           NFS_FS y
+          NFS_FSCACHE y
           ROOT_NFS y
 
           # Enable devtmpfs
-- 
GitLab


From 0f930a00f8773ffff96db6ecbc2e9664947ace95 Mon Sep 17 00:00:00 2001
From: Rob Vermaas <rob.vermaas@gmail.com>
Date: Sun, 12 May 2013 20:32:25 +0200
Subject: [PATCH 4608/5331] Add varnish module

---
 .../services/web-servers/varnish/default.nix  | 54 +++++++++++++++++++
 1 file changed, 54 insertions(+)
 create mode 100644 modules/services/web-servers/varnish/default.nix

diff --git a/modules/services/web-servers/varnish/default.nix b/modules/services/web-servers/varnish/default.nix
new file mode 100644
index 00000000000..66ec978bac8
--- /dev/null
+++ b/modules/services/web-servers/varnish/default.nix
@@ -0,0 +1,54 @@
+{ config, pkgs, ...}:
+let
+  cfg = config.services.varnish;
+in
+with pkgs.lib;
+{
+  options = {
+    services.varnish = {
+      enable = mkOption {
+        default = false;
+        description = "
+          Enable the Varnish Server.
+        ";
+      };
+
+      config = mkOption {
+        description = "
+          Verbatim default.vcl configuration.
+        ";
+      };
+
+      stateDir = mkOption {
+        default = "/var/spool/varnish";
+        description = "
+          Directory holding all state for Varnish to run.
+        ";
+      };
+    };
+
+  };
+
+  config = mkIf cfg.enable {
+
+    systemd.services.varnish = {
+      description = "Varnish";
+      wantedBy = [ "multi-user.target" ];
+      preStart = ''
+        mkdir -p ${cfg.stateDir}
+        chown -R varnish:varnish ${cfg.stateDir}
+      '';
+      path = [ pkgs.gcc ];
+      serviceConfig.ExecStart = "${pkgs.varnish}/sbin/varnishd -f ${pkgs.writeText "default.vcl" cfg.config} -n ${cfg.stateDir} -u varnish";
+      serviceConfig.Type = "forking";
+    };
+
+    environment.systemPackages = [ pkgs.varnish ];
+
+    users.extraUsers.varnish = {
+      group = "varnish";
+    };
+
+    users.extraGroups.varnish = {};
+  };
+}
-- 
GitLab


From 4e6f6d0215c27d8937b9f42aedf291120ed0e1c1 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 13 May 2013 11:27:21 +0200
Subject: [PATCH 4609/5331] Use pam_loginuid

This set the loginuid property of processes for auditing.
---
 modules/security/pam.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/modules/security/pam.nix b/modules/security/pam.nix
index 8c0231288ec..f97e68a171c 100644
--- a/modules/security/pam.nix
+++ b/modules/security/pam.nix
@@ -51,6 +51,10 @@ let
       # login manager.  If the service is running locally, this will
       # give the user ownership of audio devices etc.
       startSession ? false
+    , # Set the login uid of the process (/proc/self/loginuid) for
+      # auditing purposes.  The login uid is only set by "entry
+      # points" like login and sshd, not by commands like sudo.
+      setLoginUid ? startSession
     , # Whether to forward XAuth keys between users.  Mostly useful
       # for "su".
       forwardXAuth ? false
@@ -118,6 +122,8 @@ let
               "session optional ${pkgs.otpw}/lib/security/pam_otpw.so"}
           ${optionalString startSession
               "session optional ${pkgs.systemd}/lib/security/pam_systemd.so"}
+          ${optionalString setLoginUid
+              "session required pam_loginuid.so"}
           ${optionalString forwardXAuth
               "session optional pam_xauth.so xauthpath=${pkgs.xorg.xauth}/bin/xauth systemuser=99"}
           ${optionalString (limits != [])
-- 
GitLab


From bf2b0aefdd3842c0f4640cc6719f268203522707 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 13 May 2013 11:54:04 +0200
Subject: [PATCH 4610/5331] Manual: "mke2fs -j" -> mkfs.ext4

---
 doc/manual/installation.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/manual/installation.xml b/doc/manual/installation.xml
index 7761fc97245..b85aee972fd 100644
--- a/doc/manual/installation.xml
+++ b/doc/manual/installation.xml
@@ -215,7 +215,7 @@ corresponding configuration Nix expression.</para>
 <example xml:id='ex-install-sequence'><title>Commands for installing NixOS on <filename>/dev/sda</filename></title>
 <screen>
 $ fdisk /dev/sda <lineannotation>(or whatever device you want to install on)</lineannotation>
-$ mke2fs -j -L nixos /dev/sda1 <lineannotation>(idem)</lineannotation>
+$ mkfs.ext4 -L nixos /dev/sda1 <lineannotation>(idem)</lineannotation>
 $ mkswap -L swap /dev/sda2 <lineannotation>(idem)</lineannotation>
 $ mount LABEL=nixos /mnt
 $ nixos-option --install
-- 
GitLab


From edd77af3fe33ccd75115fcf57eaf51cc34c91ffa Mon Sep 17 00:00:00 2001
From: Domen Kozar <domen@dev.si>
Date: Mon, 13 May 2013 17:52:19 +0200
Subject: [PATCH 4611/5331] add openvpn config file to networkmanager service

---
 modules/services/networking/networkmanager.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/modules/services/networking/networkmanager.nix b/modules/services/networking/networkmanager.nix
index 215dce14b4a..b82f34aa901 100644
--- a/modules/services/networking/networkmanager.nix
+++ b/modules/services/networking/networkmanager.nix
@@ -89,6 +89,9 @@ in {
       { source = configFile;
         target = "NetworkManager/NetworkManager.conf";
       }
+      { source = "${networkmanager_openvpn}/etc/NetworkManager/VPN/nm-openvpn-service.name";
+        target = "NetworkManager/VPN/nm-openvpn-service.name";
+      }
     ];
 
     environment.systemPackages = cfg.packages;
-- 
GitLab


From 7f7ada53cff96c5f0c349db62331d96e2a636ded Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Mon, 13 May 2013 14:07:38 -0400
Subject: [PATCH 4612/5331] Add a basic (currently failing) sanity check for
 btrfsProgs-in-initrd

Signed-off-by: Shea Levy <shea@shealevy.com>
---
 modules/tasks/filesystems/btrfs.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/modules/tasks/filesystems/btrfs.nix b/modules/tasks/filesystems/btrfs.nix
index c526b9677cf..d9adcac80b2 100644
--- a/modules/tasks/filesystems/btrfs.nix
+++ b/modules/tasks/filesystems/btrfs.nix
@@ -22,6 +22,11 @@ in
         ln -sv btrfsck $out/bin/fsck.btrfs
       '';
 
+    boot.initrd.extraUtilsCommandsTest = mkIf inInitrd
+      ''
+        $out/bin/btrfs --version
+      '';
+
     boot.initrd.postDeviceCommands = mkIf inInitrd
       ''
         btrfs device scan
-- 
GitLab


From 9b4991d3f465b53c5a9348e71877afb401ca3fb0 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Mon, 13 May 2013 14:16:53 -0400
Subject: [PATCH 4613/5331] Fix btrfs in the initrd.

With NixOS/nixpkgs@7761952d06d3e2c535f00d38796f98228b3946bb , btrfs requires libz and liblzo2

Signed-off-by: Shea Levy <shea@shealevy.com>
---
 modules/tasks/filesystems/btrfs.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/modules/tasks/filesystems/btrfs.nix b/modules/tasks/filesystems/btrfs.nix
index d9adcac80b2..94a7412575d 100644
--- a/modules/tasks/filesystems/btrfs.nix
+++ b/modules/tasks/filesystems/btrfs.nix
@@ -19,6 +19,9 @@ in
       ''
         cp -v ${pkgs.btrfsProgs}/bin/btrfsck $out/bin
         cp -v ${pkgs.btrfsProgs}/bin/btrfs $out/bin
+        # !!! Increases uncompressed initrd by 240k
+        cp -v ${pkgs.zlib}/lib/libz.so.1{,.2.7} $out/lib
+        cp -v ${pkgs.lzo}/lib/liblzo2.so.2{,.0.0} $out/lib
         ln -sv btrfsck $out/bin/fsck.btrfs
       '';
 
-- 
GitLab


From 51bc82960a23d2db786465f2deb709276ee3fbe8 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Mon, 13 May 2013 14:25:48 -0400
Subject: [PATCH 4614/5331] btrfsck doesn't respect any flags

Signed-off-by: Shea Levy <shea@shealevy.com>
---
 modules/system/boot/stage-1-init.sh | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/modules/system/boot/stage-1-init.sh b/modules/system/boot/stage-1-init.sh
index cac7a1ceaa9..4a13578abcd 100644
--- a/modules/system/boot/stage-1-init.sh
+++ b/modules/system/boot/stage-1-init.sh
@@ -219,7 +219,11 @@ checkFS() {
 
     echo "checking $device..."
 
-    fsck -V -a "$device"
+    fsckFlags=
+    if test "$fsType" != "btrfs"; then
+        fsckFlags="-V -a"
+    fi
+    fsck $fsckFlags "$device"
     fsckResult=$?
 
     if test $(($fsckResult | 2)) = $fsckResult; then
-- 
GitLab


From 2c4db1a6cf5cb6ccfb1cc2235335b9b0abaae0ae Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Tue, 14 May 2013 23:35:10 -0400
Subject: [PATCH 4615/5331] Don't copy libz and liblzo2 twice to the initrd

Signed-off-by: Shea Levy <shea@shealevy.com>
---
 modules/tasks/filesystems/btrfs.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/tasks/filesystems/btrfs.nix b/modules/tasks/filesystems/btrfs.nix
index 94a7412575d..57a7e5e302d 100644
--- a/modules/tasks/filesystems/btrfs.nix
+++ b/modules/tasks/filesystems/btrfs.nix
@@ -20,8 +20,8 @@ in
         cp -v ${pkgs.btrfsProgs}/bin/btrfsck $out/bin
         cp -v ${pkgs.btrfsProgs}/bin/btrfs $out/bin
         # !!! Increases uncompressed initrd by 240k
-        cp -v ${pkgs.zlib}/lib/libz.so.1{,.2.7} $out/lib
-        cp -v ${pkgs.lzo}/lib/liblzo2.so.2{,.0.0} $out/lib
+        cp -pv ${pkgs.zlib}/lib/libz.so* $out/lib
+        cp -pv ${pkgs.lzo}/lib/liblzo2.so* $out/lib
         ln -sv btrfsck $out/bin/fsck.btrfs
       '';
 
-- 
GitLab


From f5233bbf82de78a950ef1038f3759287ce79f2e6 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 13 May 2013 15:13:06 +0200
Subject: [PATCH 4616/5331] Remove tabs

---
 modules/security/apparmor-suid.nix | 24 ++++++++++++------------
 modules/security/apparmor.nix      | 17 ++++++++++-------
 2 files changed, 22 insertions(+), 19 deletions(-)

diff --git a/modules/security/apparmor-suid.nix b/modules/security/apparmor-suid.nix
index 4b3d3bbdc00..b03047ac1f1 100644
--- a/modules/security/apparmor-suid.nix
+++ b/modules/security/apparmor-suid.nix
@@ -20,21 +20,21 @@ with pkgs.lib;
     security.apparmor.profiles = [ (pkgs.writeText "ping" ''
       #include <tunables/global>
       /var/setuid-wrappers/ping {
-	#include <abstractions/base>
-	#include <abstractions/consoles>
-	#include <abstractions/nameservice>
+        #include <abstractions/base>
+        #include <abstractions/consoles>
+        #include <abstractions/nameservice>
 
-	capability net_raw,
-	capability setuid,
-	network inet raw,
+        capability net_raw,
+        capability setuid,
+        network inet raw,
 
-	${pkgs.glibc}/lib/*.so mr,
-	/var/setuid-wrappers/ping.real mixr,
-	${pkgs.iputils}/sbin/ping mixr,
-	#/etc/modules.conf r,
+        ${pkgs.glibc}/lib/*.so mr,
+        /var/setuid-wrappers/ping.real mixr,
+        ${pkgs.iputils}/sbin/ping mixr,
+        #/etc/modules.conf r,
 
-	## Site-specific additions and overrides. See local/README for details.
-	##include <local/bin.ping>
+        ## Site-specific additions and overrides. See local/README for details.
+        ##include <local/bin.ping>
       }
     '') ];
   };
diff --git a/modules/security/apparmor.nix b/modules/security/apparmor.nix
index 51ae40ce326..8aa933e2996 100644
--- a/modules/security/apparmor.nix
+++ b/modules/security/apparmor.nix
@@ -1,8 +1,11 @@
 {pkgs, config, ...}:
+
 let
   cfg = config.security.apparmor;
 in
+
 with pkgs.lib;
+
 {
 
   ###### interface
@@ -14,17 +17,17 @@ with pkgs.lib;
       enable = mkOption {
         default = false;
         description = ''
-          Enable AppArmor application security system. Enable only if you want to further improve 
-AppArmor.
+          Enable AppArmor application security system. Enable only if
+          you want to further improve AppArmor.
         '';
       };
 
       profiles = mkOption {
         default = [];
-	merge = mergeListOption;
+        merge = mergeListOption;
         description = ''
-	  List of file names of AppArmor profiles.
-	'';
+          List of file names of AppArmor profiles.
+        '';
       };
 
     };
@@ -48,8 +51,8 @@ AppArmor.
       path = [ pkgs.apparmor ];
 
       serviceConfig = {
-	Type = "oneshot";
-	RemainAfterExit = "yes";
+        Type = "oneshot";
+        RemainAfterExit = "yes";
         ExecStart = concatMapStrings (profile: ''
           ${pkgs.apparmor}/sbin/apparmor_parser -rKv -I ${pkgs.apparmor}/etc/apparmor.d/ "${profile}"
         '') cfg.profiles;
-- 
GitLab


From b3ae70ddb65b2cb58139c4b1a57f9b3f69f9d3ec Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 14 May 2013 14:23:53 +0200
Subject: [PATCH 4617/5331] initrd: Add ehci_pci and hid_generic

These are required to get some (all?) USB keyboards to work in recent
kernels.
---
 modules/system/boot/kernel.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/modules/system/boot/kernel.nix b/modules/system/boot/kernel.nix
index 291dae31a6f..532c198f9d0 100644
--- a/modules/system/boot/kernel.nix
+++ b/modules/system/boot/kernel.nix
@@ -179,9 +179,11 @@ in
         # a USB keyboard.
         "uhci_hcd"
         "ehci_hcd"
+        "ehci_pci"
         "ohci_hcd"
         "xhci_hcd"
         "usbhid"
+        "hid_generic"
 
         # Unix domain sockets (needed by udev).
         "unix"
-- 
GitLab


From 95d02c0c40ae2302eb05fb924ad6c6accf74908c Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 14 May 2013 14:24:29 +0200
Subject: [PATCH 4618/5331] initrd: Remove serio and atkbd

These modules don't exist as far as I can tell.
---
 modules/system/boot/kernel.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/system/boot/kernel.nix b/modules/system/boot/kernel.nix
index 532c198f9d0..0a67e33ce45 100644
--- a/modules/system/boot/kernel.nix
+++ b/modules/system/boot/kernel.nix
@@ -189,7 +189,7 @@ in
         "unix"
 
         # Misc. stuff.
-        "pcips2" "serio" "atkbd" "xtkbd"
+        "pcips2" "xtkbd"
 
         # To wait for SCSI devices to appear.
         "scsi_wait_scan"
-- 
GitLab


From 73a03ab2055c9adea97c3fd112a843b76674ea7d Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 14 May 2013 15:17:58 +0200
Subject: [PATCH 4619/5331] tests/misc.nix: Test nixos-rebuild --help

---
 tests/misc.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/tests/misc.nix b/tests/misc.nix
index 118ed8f45cb..d001ff1e5a9 100644
--- a/tests/misc.nix
+++ b/tests/misc.nix
@@ -16,6 +16,10 @@
           $machine->succeed("[ `nixos-version | wc -w` = 1 ]");
       };
 
+      subtest "nixos-rebuild", sub {
+          $machine->succeed("nixos-rebuild --help | grep 'Usage:'");
+      };
+
       # Sanity check for uid/gid assignment.
       subtest "users-groups", sub {
           $machine->succeed("[ `id -u messagebus` = 4 ]");
-- 
GitLab


From 027712669973008d7330d03a2629483643ba2535 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 15 May 2013 12:47:17 +0200
Subject: [PATCH 4620/5331] Return exit code 127 if a command is not found

---
 modules/programs/bash/command-not-found.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/modules/programs/bash/command-not-found.nix b/modules/programs/bash/command-not-found.nix
index 4eb11d3a172..6549ba86810 100644
--- a/modules/programs/bash/command-not-found.nix
+++ b/modules/programs/bash/command-not-found.nix
@@ -34,9 +34,12 @@ in
           # Retry the command if we just installed it.
           if [ $? = 126 ]; then
             "$@"
+          else
+            return 127
           fi
         else
           echo "$1: command not found" >&2
+          return 127
         fi
       }
     '';
-- 
GitLab


From 3b00eca8e9bf0e999d69009083c21597a1b11ac3 Mon Sep 17 00:00:00 2001
From: Rob Vermaas <rob.vermaas@gmail.com>
Date: Wed, 15 May 2013 14:36:17 +0200
Subject: [PATCH 4621/5331] Add varnish to module-list.nix

---
 modules/module-list.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/modules/module-list.nix b/modules/module-list.nix
index e16e3279f9d..b6193b19131 100644
--- a/modules/module-list.nix
+++ b/modules/module-list.nix
@@ -190,6 +190,7 @@
   ./services/web-servers/lighttpd/gitweb.nix
   ./services/web-servers/nginx/default.nix
   ./services/web-servers/tomcat.nix
+  ./services/web-servers/varnish/default.nix
   ./services/x11/desktop-managers/default.nix
   ./services/x11/display-managers/auto.nix
   ./services/x11/display-managers/default.nix
-- 
GitLab


From 0ad87ab46ea2f707e55a00b75a5de2095e1ddbc2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Thu, 16 May 2013 17:23:31 +0200
Subject: [PATCH 4622/5331] WARNING: history will change from now on (mesa
 updates)

Fix some paths set, drivers in mesa_drivers now, WIP.
---
 .../services/x11/display-managers/lightdm.nix |  2 +-
 modules/services/x11/xserver.nix              | 20 +++++++++----------
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/modules/services/x11/display-managers/lightdm.nix b/modules/services/x11/display-managers/lightdm.nix
index 1bce30037dc..9f1eae5ffb8 100644
--- a/modules/services/x11/display-managers/lightdm.nix
+++ b/modules/services/x11/display-managers/lightdm.nix
@@ -13,7 +13,7 @@ let
   xserverWrapper = writeScript "xserver-wrapper"
     ''
       #! /bin/sh
-      export XORG_DRI_DRIVER_PATH="${pkgs.mesa}/lib/dri"
+      #export XORG_DRI_DRIVER_PATH="${pkgs.mesa_drivers}/lib/dri" # ?? X sets this itself
       export XKB_BINDIR="${pkgs.xorg.xkbcomp}/bin"
       exec ${dmcfg.xserverBin} ${dmcfg.xserverArgs}
     '';
diff --git a/modules/services/x11/xserver.nix b/modules/services/x11/xserver.nix
index 59e8a56982a..6f5e51043e9 100644
--- a/modules/services/x11/xserver.nix
+++ b/modules/services/x11/xserver.nix
@@ -393,6 +393,7 @@ in
   };
 
 
+
   ###### implementation
 
   config = mkIf cfg.enable (checkAgent (checkPolkit {
@@ -461,9 +462,7 @@ in
         environment =
           { FONTCONFIG_FILE = "/etc/fonts/fonts.conf"; # !!! cleanup
             XKB_BINDIR = "${xorg.xkbcomp}/bin"; # Needed for the Xkb extension.
-          } # !!! Depends on the driver selected at runtime.
-            // optionalAttrs (!elem "nvidia" driverNames) {
-            XORG_DRI_DRIVER_PATH = "${pkgs.mesa}/lib/dri";
+            XORG_DRI_DRIVER_PATH = "/run/opengl-driver/lib/dri"; # !!! Depends on the driver selected at runtime.
           } // optionalAttrs (elem "nvidia" driverNames) {
             LD_LIBRARY_PATH = "${xorg.libX11}/lib:${xorg.libXext}/lib:${kernelPackages.nvidia_x11}/lib";
           } // optionalAttrs (elem "nvidiaLegacy96" driverNames) {
@@ -474,18 +473,18 @@ in
             LD_LIBRARY_PATH = "${xorg.libX11}/lib:${xorg.libXext}/lib:${kernelPackages.nvidia_x11_legacy304}/lib";
           } // optionalAttrs (elem "ati_unfree" driverNames) {
             LD_LIBRARY_PATH = "${xorg.libX11}/lib:${xorg.libXext}/lib:${kernelPackages.ati_drivers_x11}/lib:${kernelPackages.ati_drivers_x11}/X11R6/lib64/modules/linux";
-            XORG_DRI_DRIVER_PATH = "${kernelPackages.ati_drivers_x11}/lib/dri"; # is ignored because ati drivers ship their own unpatched libglx.so !
+            #XORG_DRI_DRIVER_PATH = "${kernelPackages.ati_drivers_x11}/lib/dri"; # is ignored because ati drivers ship their own unpatched libglx.so !
           } // cfg.displayManager.job.environment;
 
         preStart =
           ''
             rm -f /run/opengl-driver
-            rm -f /run/opengl-driver-32
+            ln -sf opengl-driver /run/opengl-driver-32
             ${# !!! The OpenGL driver depends on what's detected at runtime.
               if elem "nvidia" driverNames then
                 ''
                   ln -sf ${kernelPackages.nvidia_x11} /run/opengl-driver
-                  ${optionalString (pkgs.stdenv.system == "x86_64-linux" && cfg.driSupport32Bit)
+                  ${optionalString cfg.driSupport32Bit
                     "ln -sf ${pkgs_i686.linuxPackages.nvidia_x11.override { libsOnly = true; kernelDev = null; } } /run/opengl-driver-32"}
                 ''
               else if elem "nvidiaLegacy96" driverNames then
@@ -495,16 +494,16 @@ in
               else if elem "nvidiaLegacy304" driverNames then
                 ''
                   ln -sf ${kernelPackages.nvidia_x11_legacy304} /run/opengl-driver
-                  ${optionalString (pkgs.stdenv.system == "x86_64-linux" && cfg.driSupport32Bit)
+                  ${optionalString cfg.driSupport32Bit
                     "ln -sf ${pkgs_i686.linuxPackages.nvidia_x11_legacy304.override { libsOnly = true; kernelDev = null; } } /run/opengl-driver-32"}
                 ''
               else if elem "ati_unfree" driverNames then
                 "ln -sf ${kernelPackages.ati_drivers_x11} /run/opengl-driver"
               else
                 ''
-                  ${optionalString cfg.driSupport "ln -sf ${pkgs.mesa} /run/opengl-driver"}
-                  ${optionalString (pkgs.stdenv.system == "x86_64-linux" && cfg.driSupport32Bit)
-                    "ln -sf ${pkgs_i686.mesa} /run/opengl-driver-32"}
+                  ${optionalString cfg.driSupport "ln -sf ${pkgs.mesa_drivers} /run/opengl-driver"}
+                  ${optionalString cfg.driSupport32Bit
+                    "ln -sf ${pkgs_i686.mesa_drivers} /run/opengl-driver-32"}
                 ''
             }
 
@@ -625,3 +624,4 @@ in
   }));
 
 }
+
-- 
GitLab


From a649bbea4e2c07b5c10ecc34fc974f8fbe3cda26 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Thu, 16 May 2013 17:24:26 +0200
Subject: [PATCH 4623/5331] networkmanager: clean some attrs missing in nixpkgs
 x-updates

Just temporary hack.
---
 modules/services/networking/networkmanager.nix | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/modules/services/networking/networkmanager.nix b/modules/services/networking/networkmanager.nix
index b82f34aa901..418c6d3ccdb 100644
--- a/modules/services/networking/networkmanager.nix
+++ b/modules/services/networking/networkmanager.nix
@@ -89,9 +89,7 @@ in {
       { source = configFile;
         target = "NetworkManager/NetworkManager.conf";
       }
-      { source = "${networkmanager_openvpn}/etc/NetworkManager/VPN/nm-openvpn-service.name";
-        target = "NetworkManager/VPN/nm-openvpn-service.name";
-      }
+      ##### Just temporary change, old nixpkgs base
     ];
 
     environment.systemPackages = cfg.packages;
@@ -134,7 +132,7 @@ in {
     security.polkit.permissions = polkitConf;
 
     # openvpn plugin has only dbus interface
-    services.dbus.packages = cfg.packages ++ [ networkmanager_openvpn ];
+    services.dbus.packages = cfg.packages;
 
     services.udev.packages = cfg.packages;
   };
-- 
GitLab


From 40fb90a2953bf870bfaa2b941fda744dd39a4878 Mon Sep 17 00:00:00 2001
From: Domen Kozar <domen@dev.si>
Date: Thu, 16 May 2013 21:58:24 +0200
Subject: [PATCH 4624/5331] bacula: generate bconsole config

---
 modules/services/backup/bacula.nix | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/modules/services/backup/bacula.nix b/modules/services/backup/bacula.nix
index 05192f797fc..a5f2c62fa05 100644
--- a/modules/services/backup/bacula.nix
+++ b/modules/services/backup/bacula.nix
@@ -7,6 +7,7 @@ with pkgs.lib;
 
 let
   libDir = "/var/lib/bacula";
+
   fd_cfg = config.services.bacula-fd;
   fd_conf = pkgs.writeText "bacula-fd.conf"
     ''
@@ -96,6 +97,17 @@ let
     ${dir_cfg.extraConfig}
     '';
 
+  # TODO: by default use this config
+  bconsole_conf = pkgs.writeText "bconsole.conf"
+    ''
+    Director {
+      Name = ${dir_cfg.name};
+      Address = "localhost";
+      DirPort = ${toString dir_cfg.port};
+      Password = "${dir_cfg.password}";
+    }
+    '';
+
   directorOptions = {name, config, ...}:
   {
     options = {
-- 
GitLab


From a13d1c3363c52a5a1d6a468884d5ece5a04ed3a5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Thu, 16 May 2013 23:52:17 +0200
Subject: [PATCH 4625/5331] mesa WIP: fix bad symlinking, thanks to jack_c on
 IRC

---
 modules/services/x11/xserver.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/modules/services/x11/xserver.nix b/modules/services/x11/xserver.nix
index 6f5e51043e9..5738a24e69d 100644
--- a/modules/services/x11/xserver.nix
+++ b/modules/services/x11/xserver.nix
@@ -478,8 +478,9 @@ in
 
         preStart =
           ''
-            rm -f /run/opengl-driver
-            ln -sf opengl-driver /run/opengl-driver-32
+            rm -f /run/opengl-driver{,-32}
+            ${optionalString (!cfg.driSupport32Bit) "ln -sf opengl-driver /run/opengl-driver-32"}
+
             ${# !!! The OpenGL driver depends on what's detected at runtime.
               if elem "nvidia" driverNames then
                 ''
-- 
GitLab


From 085ccc81995ab3c73e7a011f7b122b1400f346ee Mon Sep 17 00:00:00 2001
From: Mathijs Kwik <mathijs@bluescreen303.nl>
Date: Mon, 13 May 2013 23:07:58 +0200
Subject: [PATCH 4626/5331] btrfs: btrfsck is now actually the same binary as
 "btrfs" symlinked to save space.

---
 modules/tasks/filesystems/btrfs.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/modules/tasks/filesystems/btrfs.nix b/modules/tasks/filesystems/btrfs.nix
index 57a7e5e302d..d95a32e2e3f 100644
--- a/modules/tasks/filesystems/btrfs.nix
+++ b/modules/tasks/filesystems/btrfs.nix
@@ -17,12 +17,13 @@ in
 
     boot.initrd.extraUtilsCommands = mkIf inInitrd
       ''
-        cp -v ${pkgs.btrfsProgs}/bin/btrfsck $out/bin
+        mkdir -p $out/bin
         cp -v ${pkgs.btrfsProgs}/bin/btrfs $out/bin
+        ln -sv btrfs $out/bin/btrfsck
+        ln -sv btrfsck $out/bin/fsck.btrfs
         # !!! Increases uncompressed initrd by 240k
         cp -pv ${pkgs.zlib}/lib/libz.so* $out/lib
         cp -pv ${pkgs.lzo}/lib/liblzo2.so* $out/lib
-        ln -sv btrfsck $out/bin/fsck.btrfs
       '';
 
     boot.initrd.extraUtilsCommandsTest = mkIf inInitrd
-- 
GitLab


From 4630ad4d26a0b5a8774c9121b2fd42d92bb81eb0 Mon Sep 17 00:00:00 2001
From: Mathijs Kwik <mathijs@bluescreen303.nl>
Date: Mon, 13 May 2013 23:42:55 +0200
Subject: [PATCH 4627/5331] filesystems: add priority option for swap devices.

Useful for setting up raid0-like load balancing for swap.
By giving multiple swap devices the same prio.
---
 modules/config/swap.nix       | 11 +++++++++++
 modules/tasks/filesystems.nix |  4 +++-
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/modules/config/swap.nix b/modules/config/swap.nix
index a0287c948af..7d4654ae287 100644
--- a/modules/config/swap.nix
+++ b/modules/config/swap.nix
@@ -58,6 +58,17 @@ with utils;
             '';
           };
 
+          priority = mkOption {
+            default = null;
+            example = 2048;
+            type = types.nullOr types.int;
+            description = ''
+              Specify the priority of the swap device. Priority is a value between 0 and 32767.
+              Higher numbers indicate higher priority.
+              null lets the kernel choose a priority, which will show up as a negative value.
+            '';
+          };
+
         };
 
         config = {
diff --git a/modules/tasks/filesystems.nix b/modules/tasks/filesystems.nix
index a95bb0673a2..cc7f1f40742 100644
--- a/modules/tasks/filesystems.nix
+++ b/modules/tasks/filesystems.nix
@@ -7,6 +7,8 @@ let
 
   fileSystems = attrValues config.fileSystems;
 
+  prioOption = prio: optionalString (prio !=null) " pri=${toString prio}";
+
   fileSystemOpts = { name, ... }: {
 
     options = {
@@ -167,7 +169,7 @@ in
 
         # Swap devices.
         ${flip concatMapStrings config.swapDevices (sw:
-            "${sw.device} none swap\n"
+            "${sw.device} none swap${prioOption sw.priority}\n"
         )}
       '';
 
-- 
GitLab


From 0e9a963b424257e3a578c1054ab5895ae8b38a19 Mon Sep 17 00:00:00 2001
From: Mathijs Kwik <mathijs@bluescreen303.nl>
Date: Wed, 15 May 2013 00:47:57 +0200
Subject: [PATCH 4628/5331] kde4: use udisks2 for kde versions that support it.

Currently, none do, although kde 4.10 is supposed to be able to use it.
---
 modules/services/x11/desktop-managers/kde4.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/modules/services/x11/desktop-managers/kde4.nix b/modules/services/x11/desktop-managers/kde4.nix
index 6e0d5057126..dcc3859820c 100644
--- a/modules/services/x11/desktop-managers/kde4.nix
+++ b/modules/services/x11/desktop-managers/kde4.nix
@@ -42,6 +42,8 @@ let
 
   phononBackendPackages = flip concatMap cfg.phononBackends
     (name: attrByPath [name] (throw "unknown phonon backend `${name}'") phononBackends);
+
+  wantsUdisks2 = pkgs.kde4.kdelibs.wantsUdisks2 or false;
 in
 
 {
@@ -155,7 +157,8 @@ in
       };
 
     # Enable helpful DBus services.
-    services.udisks.enable = true;
+    services.udisks.enable = ! wantsUdisks2;
+    services.udisks2.enable = wantsUdisks2;
     services.upower.enable = config.powerManagement.enable;
 
     security.pam.services = [ { name = "kde"; allowNullPassword = true; startSession = true; } ];
-- 
GitLab


From 97689f90623557b600744a9e5a8552af9d6eaa60 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 17 May 2013 13:37:58 +0200
Subject: [PATCH 4629/5331] mediawiki: Update to 1.20.5

---
 modules/services/web-servers/apache-httpd/mediawiki.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/services/web-servers/apache-httpd/mediawiki.nix b/modules/services/web-servers/apache-httpd/mediawiki.nix
index 04899839b7a..dcc05b03891 100644
--- a/modules/services/web-servers/apache-httpd/mediawiki.nix
+++ b/modules/services/web-servers/apache-httpd/mediawiki.nix
@@ -72,11 +72,11 @@ let
 
   # Unpack Mediawiki and put the config file in its root directory.
   mediawikiRoot = pkgs.stdenv.mkDerivation rec {
-    name= "mediawiki-1.20.3";
+    name= "mediawiki-1.20.5";
 
     src = pkgs.fetchurl {
       url = "http://download.wikimedia.org/mediawiki/1.20/${name}.tar.gz";
-      sha256 = "046jcq54xla490sx0pn0w169wj74lqj3n87r39s59in6494lwp4a";
+      sha256 = "0ix6khrilfdncjqnh41xjs0bd49i1q0rywycjaixjfpwj6vjbqbl";
     };
 
     skins = config.skins;
-- 
GitLab


From 07406231e3b90b95cf7d683d9a46b5c016520c10 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 17 May 2013 15:32:43 +0200
Subject: [PATCH 4630/5331] zabbix: Don't set the mbstring.func_overload option

This breaks MediaWiki running in the same web server.  Zabbix no
longer seems to need it anyway.
---
 modules/services/web-servers/apache-httpd/zabbix.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/modules/services/web-servers/apache-httpd/zabbix.nix b/modules/services/web-servers/apache-httpd/zabbix.nix
index 385e9ab5644..6191d63584a 100644
--- a/modules/services/web-servers/apache-httpd/zabbix.nix
+++ b/modules/services/web-servers/apache-httpd/zabbix.nix
@@ -27,7 +27,6 @@ in
     ''
       post_max_size = 32M
       max_execution_time = 300
-      mbstring.func_overload = 2
     '';
 
   extraConfig = ''
-- 
GitLab


From 000d5a62aa69114e44af482d3c6788efef58ecc3 Mon Sep 17 00:00:00 2001
From: Domen Kozar <domen@dev.si>
Date: Sat, 18 May 2013 12:29:03 +0200
Subject: [PATCH 4631/5331] bacula: file daemon needs to run as root

---
 modules/services/backup/bacula.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/services/backup/bacula.nix b/modules/services/backup/bacula.nix
index a5f2c62fa05..daece0d1158 100644
--- a/modules/services/backup/bacula.nix
+++ b/modules/services/backup/bacula.nix
@@ -354,7 +354,7 @@ in {
       description = "Bacula File Daemon";
       wantedBy = [ "multi-user.target" ];
       path = [ pkgs.bacula ];
-      serviceConfig.ExecStart = "${pkgs.bacula}/sbin/bacula-fd -f -u bacula -g bacula -c ${fd_conf}";
+      serviceConfig.ExecStart = "${pkgs.bacula}/sbin/bacula-fd -f -u root -g bacula -c ${fd_conf}";
     };
 
     systemd.services.bacula-sd = mkIf sd_cfg.enable {
-- 
GitLab


From a29c30695855a165e131696d83d68a60573f9c3b Mon Sep 17 00:00:00 2001
From: Domen Kozar <domen@dev.si>
Date: Sat, 18 May 2013 13:28:21 +0200
Subject: [PATCH 4632/5331] bacula: add ExecReload

---
 modules/services/backup/bacula.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/modules/services/backup/bacula.nix b/modules/services/backup/bacula.nix
index daece0d1158..525df340048 100644
--- a/modules/services/backup/bacula.nix
+++ b/modules/services/backup/bacula.nix
@@ -355,6 +355,7 @@ in {
       wantedBy = [ "multi-user.target" ];
       path = [ pkgs.bacula ];
       serviceConfig.ExecStart = "${pkgs.bacula}/sbin/bacula-fd -f -u root -g bacula -c ${fd_conf}";
+      serviceConfig.ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID";
     };
 
     systemd.services.bacula-sd = mkIf sd_cfg.enable {
@@ -363,6 +364,7 @@ in {
       wantedBy = [ "multi-user.target" ];
       path = [ pkgs.bacula ];
       serviceConfig.ExecStart = "${pkgs.bacula}/sbin/bacula-sd -f -u bacula -g bacula -c ${sd_conf}";
+      serviceConfig.ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID";
     };
 
     services.postgresql.enable = dir_cfg.enable == true;
@@ -373,6 +375,7 @@ in {
       wantedBy = [ "multi-user.target" ];
       path = [ pkgs.bacula ];
       serviceConfig.ExecStart = "${pkgs.bacula}/sbin/bacula-dir -f -u bacula -g bacula -c ${dir_conf}";
+      serviceConfig.ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID";
       preStart = ''
         if ! test -e "${libDir}/db-created"; then
             ${pkgs.postgresql}/bin/createuser --no-superuser --no-createdb --no-createrole bacula
-- 
GitLab


From 70586f03fe3427faaf800f17726af5b651e2485c Mon Sep 17 00:00:00 2001
From: Rickard Nilsson <rickynils@gmail.com>
Date: Tue, 14 May 2013 16:07:55 +0200
Subject: [PATCH 4633/5331] systemd.sockets: Add listenStreams option for
 specifying several sockets

---
 modules/system/boot/systemd-unit-options.nix | 10 ++++++++++
 modules/system/boot/systemd.nix              |  1 +
 2 files changed, 11 insertions(+)

diff --git a/modules/system/boot/systemd-unit-options.nix b/modules/system/boot/systemd-unit-options.nix
index 9069d03b9f0..f863daf2250 100644
--- a/modules/system/boot/systemd-unit-options.nix
+++ b/modules/system/boot/systemd-unit-options.nix
@@ -215,6 +215,16 @@ rec {
 
   socketOptions = unitOptions // {
 
+    listenStreams = mkOption {
+      default = [];
+      types = types.listOf types.string;
+      example = [ "0.0.0.0:993" "/run/my-socket" ];
+      description = ''
+        For each item in this list, a <literal>ListenStream</literal>
+        option in the <literal>[Socket]</literal> section will be created.
+      '';
+    };
+
     socketConfig = mkOption {
       default = {};
       example = { ListenStream = "/run/my-socket"; };
diff --git a/modules/system/boot/systemd.nix b/modules/system/boot/systemd.nix
index 4957bfeed34..11c2cfc6ace 100644
--- a/modules/system/boot/systemd.nix
+++ b/modules/system/boot/systemd.nix
@@ -275,6 +275,7 @@ let
 
           [Socket]
           ${attrsToSection def.socketConfig}
+          ${concatStringsSep "\n" (map (s: "ListenStream=${s}") def.listenStreams)}
         '';
     };
 
-- 
GitLab


From 02d9a8066a0ad0adbf9d1c3617659a4a00610a88 Mon Sep 17 00:00:00 2001
From: "Ricardo M. Correia" <rcorreia@wizy.org>
Date: Thu, 23 May 2013 02:07:49 +0000
Subject: [PATCH 4634/5331] Add chrony service Also, do not build and add ntp
 to the system unless it is enabled.

---
 modules/config/system-path.nix         |  1 -
 modules/misc/ids.nix                   |  1 +
 modules/module-list.nix                |  1 +
 modules/services/networking/chrony.nix | 88 ++++++++++++++++++++++++++
 modules/services/networking/ntpd.nix   |  3 +
 5 files changed, 93 insertions(+), 1 deletion(-)
 create mode 100644 modules/services/networking/chrony.nix

diff --git a/modules/config/system-path.nix b/modules/config/system-path.nix
index 8c36015718c..6e73118fe08 100644
--- a/modules/config/system-path.nix
+++ b/modules/config/system-path.nix
@@ -41,7 +41,6 @@ let
       pkgs.nano
       pkgs.ncurses
       pkgs.netcat
-      pkgs.ntp
       pkgs.openssh
       pkgs.pciutils
       pkgs.perl
diff --git a/modules/misc/ids.nix b/modules/misc/ids.nix
index fd76dfc47a1..8a23148b028 100644
--- a/modules/misc/ids.nix
+++ b/modules/misc/ids.nix
@@ -75,6 +75,7 @@ in
     spamd = 56;
     nslcd = 58;
     nginx = 60;
+    chrony = 61;
 
     # When adding a uid, make sure it doesn't match an existing gid.
 
diff --git a/modules/module-list.nix b/modules/module-list.nix
index b6193b19131..e6b4fd37c66 100644
--- a/modules/module-list.nix
+++ b/modules/module-list.nix
@@ -125,6 +125,7 @@
   ./services/networking/bind.nix
   ./services/networking/bitlbee.nix
   ./services/networking/cntlm.nix
+  ./services/networking/chrony.nix
   ./services/networking/ddclient.nix
   #./services/networking/dhclient.nix
   ./services/networking/dhcpcd.nix
diff --git a/modules/services/networking/chrony.nix b/modules/services/networking/chrony.nix
new file mode 100644
index 00000000000..5a53744791c
--- /dev/null
+++ b/modules/services/networking/chrony.nix
@@ -0,0 +1,88 @@
+{ config, pkgs, ... }:
+
+with pkgs.lib;
+
+let
+
+  inherit (pkgs) chrony;
+
+  stateDir = "/var/lib/chrony";
+
+  chronyUser = "chrony";
+
+  configFile = pkgs.writeText "chrony.conf" ''
+    ${toString (map (server: "server " + server + "\n") config.services.chrony.servers)}
+
+    driftfile ${stateDir}/chrony.drift
+  '';
+
+  chronyFlags = "-m -f ${configFile} -u ${chronyUser}";
+
+in
+
+{
+
+  ###### interface
+
+  options = {
+
+    services.chrony = {
+
+      enable = mkOption {
+        default = false;
+        description = ''
+          Whether to synchronise your machine's time using chrony.
+          Make sure you disable NTP if you enable this service.
+        '';
+      };
+
+      servers = mkOption {
+        default = [
+          "0.pool.ntp.org"
+          "1.pool.ntp.org"
+          "2.pool.ntp.org"
+        ];
+        description = ''
+          The set of NTP servers from which to synchronise.
+        '';
+      };
+
+    };
+
+  };
+
+
+  ###### implementation
+
+  config = mkIf config.services.chrony.enable {
+
+    # Make chronyc available in the system path
+    environment.systemPackages = [ pkgs.chrony ];
+
+    users.extraUsers = singleton
+      { name = chronyUser;
+        uid = config.ids.uids.chrony;
+        description = "chrony daemon user";
+        home = stateDir;
+      };
+
+    jobs.chronyd =
+      { description = "chrony daemon";
+
+        wantedBy = [ "ip-up.target" ];
+        partOf = [ "ip-up.target" ];
+
+        path = [ chrony ];
+
+        preStart =
+          ''
+            mkdir -m 0755 -p ${stateDir}
+            chown ${chronyUser} ${stateDir}
+          '';
+
+        exec = "chronyd -n ${chronyFlags}";
+      };
+
+  };
+
+}
diff --git a/modules/services/networking/ntpd.nix b/modules/services/networking/ntpd.nix
index be3fcbd6543..e5e164021d3 100644
--- a/modules/services/networking/ntpd.nix
+++ b/modules/services/networking/ntpd.nix
@@ -58,6 +58,9 @@ in
 
   config = mkIf config.services.ntp.enable {
 
+    # Make tools such as ntpq available in the system path
+    environment.systemPackages = [ pkgs.ntp ];
+
     users.extraUsers = singleton
       { name = ntpUser;
         uid = config.ids.uids.ntp;
-- 
GitLab


From 6336048c5843ffcbd9fb010e47386adda2cdb913 Mon Sep 17 00:00:00 2001
From: "Ricardo M. Correia" <rcorreia@wizy.org>
Date: Thu, 23 May 2013 03:00:09 +0000
Subject: [PATCH 4635/5331] chrony: properly set rtconutc option, and add a few
 more options

---
 modules/services/networking/chrony.nix | 32 +++++++++++++++++++++++++-
 1 file changed, 31 insertions(+), 1 deletion(-)

diff --git a/modules/services/networking/chrony.nix b/modules/services/networking/chrony.nix
index 5a53744791c..5e9818858e0 100644
--- a/modules/services/networking/chrony.nix
+++ b/modules/services/networking/chrony.nix
@@ -10,10 +10,20 @@ let
 
   chronyUser = "chrony";
 
+  cfg = config.services.chrony;
+
   configFile = pkgs.writeText "chrony.conf" ''
-    ${toString (map (server: "server " + server + "\n") config.services.chrony.servers)}
+    ${toString (map (server: "server " + server + "\n") cfg.servers)}
+
+    ${optionalString cfg.initstepslew.enabled ''
+      initstepslew ${toString cfg.initstepslew.threshold} ${toString (map (server: server + " ") cfg.initstepslew.servers)}
+    ''}
 
     driftfile ${stateDir}/chrony.drift
+
+    ${optionalString (!config.time.hardwareClockInLocalTime) "rtconutc"}
+
+    ${cfg.extraConfig}
   '';
 
   chronyFlags = "-m -f ${configFile} -u ${chronyUser}";
@@ -47,6 +57,26 @@ in
         '';
       };
 
+      initstepslew = mkOption {
+        default = {
+          enabled = true;
+          threshold = 1000; # by default, same threshold as 'ntpd -g' (1000s)
+          servers = cfg.servers;
+        };
+        description = ''
+          Allow chronyd to make a rapid measurement of the system clock error at
+          boot time, and to correct the system clock by stepping before normal
+          operation begins.
+        '';
+      };
+
+      extraConfig = mkOption {
+        default = "";
+        description = ''
+          Extra configuration directives that should be added to
+          <literal>chrony.conf</literal>
+        '';
+      };
     };
 
   };
-- 
GitLab


From 76046850fe56efde474778db0f04493bee4222e1 Mon Sep 17 00:00:00 2001
From: "Ricardo M. Correia" <rcorreia@wizy.org>
Date: Thu, 23 May 2013 11:04:07 +0000
Subject: [PATCH 4636/5331] atop: Add basic config option for /etc/atoprc

---
 modules/module-list.nix   |  1 +
 modules/programs/atop.nix | 36 ++++++++++++++++++++++++++++++++++++
 2 files changed, 37 insertions(+)
 create mode 100644 modules/programs/atop.nix

diff --git a/modules/module-list.nix b/modules/module-list.nix
index b6193b19131..476983b3304 100644
--- a/modules/module-list.nix
+++ b/modules/module-list.nix
@@ -36,6 +36,7 @@
   ./misc/nixpkgs.nix
   ./misc/passthru.nix
   ./misc/version.nix
+  ./programs/atop.nix
   ./programs/bash/bash.nix
   ./programs/bash/command-not-found.nix
   ./programs/blcr.nix
diff --git a/modules/programs/atop.nix b/modules/programs/atop.nix
new file mode 100644
index 00000000000..7fdaab9d67d
--- /dev/null
+++ b/modules/programs/atop.nix
@@ -0,0 +1,36 @@
+# Global configuration for atop.
+
+{config, pkgs, ...}:
+
+with pkgs.lib;
+
+let cfg = config.programs.atop;
+
+in
+{
+  ###### interface
+
+  options = {
+
+    programs.atop = {
+
+      settings = mkOption {
+        type = types.attrs;
+        default = {};
+        example = {
+          flags = "a1f";
+          interval = 5;
+        };
+        description = ''
+          Parameters to be written to <filename>/etc/atoprc</filename>
+        '';
+      };
+
+    };
+  };
+
+  config = mkIf (cfg.settings != {}) {
+    environment.etc."atoprc".text =
+      concatStrings (mapAttrsToList (n: v: "${n} ${toString v}\n") cfg.settings);
+  };
+}
-- 
GitLab


From f60393975f7c36a5f57330ffa4d1d826706cf64f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= <viric@viric.name>
Date: Tue, 28 May 2013 10:19:59 +0200
Subject: [PATCH 4637/5331] gnunet: it was missing extraGroups

---
 modules/services/networking/gnunet.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/modules/services/networking/gnunet.nix b/modules/services/networking/gnunet.nix
index 37df4acd63d..e0c41dcb188 100644
--- a/modules/services/networking/gnunet.nix
+++ b/modules/services/networking/gnunet.nix
@@ -126,6 +126,10 @@ in
         createHome = true; 
       };
 
+    users.extraGroups = singleton
+      { name = "gnunet";
+      };
+
     # The user tools that talk to `gnunetd' should come from the same source,
     # so install them globally.
     environment.systemPackages = [ pkgs.gnunet ];
-- 
GitLab


From 7f9fc8d817de86084b08b33b001e96fd12f1ff9c Mon Sep 17 00:00:00 2001
From: "Ricardo M. Correia" <rcorreia@wizy.org>
Date: Tue, 21 May 2013 23:30:24 +0000
Subject: [PATCH 4638/5331] Set the domain name of the machine

The domain name was not being set before, even if the administrator
properly configured the networking.domain option in
/etc/nixos/configuration.nix.
---
 modules/tasks/network-interfaces.nix | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/modules/tasks/network-interfaces.nix b/modules/tasks/network-interfaces.nix
index cb0d17459ff..d7b1988fe8d 100644
--- a/modules/tasks/network-interfaces.nix
+++ b/modules/tasks/network-interfaces.nix
@@ -424,13 +424,17 @@ in
          // mapAttrs createBridgeDevice cfg.bridges
          // { "network-setup" = networkSetup; };
 
-    # Set the host name in the activation script.  Don't clear it if
-    # it's not configured in the NixOS configuration, since it may
-    # have been set by dhclient in the meantime.
+    # Set the host and domain names in the activation script.  Don't
+    # clear it if it's not configured in the NixOS configuration,
+    # since it may have been set by dhclient in the meantime.
     system.activationScripts.hostname =
       optionalString (config.networking.hostName != "") ''
         hostname "${config.networking.hostName}"
       '';
+    system.activationScripts.domain =
+      optionalString (config.networking.domain != "") ''
+        domainname "${config.networking.domain}"
+      '';
 
     services.udev.extraRules =
       ''
-- 
GitLab


From 2ec6759f5fade16c6b131a054d220a600635f9a7 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 28 May 2013 14:38:13 +0200
Subject: [PATCH 4639/5331] openvpn.nix: Use systemd.*
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Also add an option ‘autoStart’ to configure whether an OpenVPN
instance should be started automatically.  And don't log to
/var/log/openvpn-* anymore.
---
 modules/services/networking/openvpn.nix | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/modules/services/networking/openvpn.nix b/modules/services/networking/openvpn.nix
index 4ea6fa135b0..63b6cc90f07 100644
--- a/modules/services/networking/openvpn.nix
+++ b/modules/services/networking/openvpn.nix
@@ -15,7 +15,6 @@ let
 
       upScript = ''
         #! /bin/sh
-        exec > /var/log/openvpn-${name}-up 2>&1
         export PATH=${path}
 
         # For convenience in client scripts, extract the remote domain
@@ -34,13 +33,13 @@ let
 
       downScript = ''
         #! /bin/sh
-        exec > /var/log/openvpn-${name}-down 2>&1
         export PATH=${path}
         ${cfg.down}
       '';
 
       configFile = pkgs.writeText "openvpn-config-${name}"
         ''
+          errors-to-stderr
           ${optionalString (cfg.up != "" || cfg.down != "") "script-security 2"}
           ${cfg.config}
           ${optionalString (cfg.up != "") "up ${pkgs.writeScript "openvpn-${name}-up" upScript}"}
@@ -50,12 +49,13 @@ let
     in {
       description = "OpenVPN instance ‘${name}’";
 
-      startOn = mkDefault "started network-interfaces";
-      stopOn = mkDefault "stopping network-interfaces";
+      wantedBy = optional cfg.autoStart [ "multi-user.target" ];
+      after = [ "network-interfaces.target" ];
 
       path = [ pkgs.iptables pkgs.iproute pkgs.nettools ];
 
-      exec = "${openvpn}/sbin/openvpn --config ${configFile}";
+      serviceConfig.ExecStart = "@${openvpn}/sbin/openvpn openvpn --config ${configFile}";
+      serviceConfig.Restart = "always";
     };
 
 in
@@ -144,6 +144,12 @@ in
           '';
         };
 
+        autoStart = mkOption {
+          default = true;
+          type = types.bool;
+          description = "Whether this OpenVPN instance should be started automatically.";
+        };
+
       };
 
     };
@@ -155,7 +161,7 @@ in
 
   config = mkIf (cfg.servers != {}) {
 
-    jobs = listToAttrs (mapAttrsFlatten (name: value: nameValuePair "openvpn-${name}" (makeOpenVPNJob value name)) cfg.servers);
+    systemd.services = listToAttrs (mapAttrsFlatten (name: value: nameValuePair "openvpn-${name}" (makeOpenVPNJob value name)) cfg.servers);
 
     environment.systemPackages = [ openvpn ];
 
-- 
GitLab


From eb01d87b31a85b4446e56deacfe1e63dbca52552 Mon Sep 17 00:00:00 2001
From: "Ricardo M. Correia" <rcorreia@wizy.org>
Date: Tue, 28 May 2013 14:15:10 +0000
Subject: [PATCH 4640/5331] apparmor: Fix broken iputils/ping profile

---
 modules/security/apparmor-suid.nix | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/modules/security/apparmor-suid.nix b/modules/security/apparmor-suid.nix
index b03047ac1f1..bc661164fdc 100644
--- a/modules/security/apparmor-suid.nix
+++ b/modules/security/apparmor-suid.nix
@@ -29,8 +29,12 @@ with pkgs.lib;
         network inet raw,
 
         ${pkgs.glibc}/lib/*.so mr,
-        /var/setuid-wrappers/ping.real mixr,
-        ${pkgs.iputils}/sbin/ping mixr,
+        ${pkgs.libcap}/lib/libcap.so* mr,
+        ${pkgs.attr}/lib/libattr.so* mr,
+
+        ${pkgs.iputils}/bin/ping mixr,
+        /var/setuid-wrappers/ping.real r,
+
         #/etc/modules.conf r,
 
         ## Site-specific additions and overrides. See local/README for details.
-- 
GitLab


From 2e61811284e1116e1700bd505d95161ebf07bb9d Mon Sep 17 00:00:00 2001
From: "Ricardo M. Correia" <rcorreia@wizy.org>
Date: Tue, 28 May 2013 17:19:15 +0000
Subject: [PATCH 4641/5331] transmission: Add apparmor profile

---
 modules/services/torrent/transmission.nix | 40 +++++++++++++++++++++--
 1 file changed, 38 insertions(+), 2 deletions(-)

diff --git a/modules/services/torrent/transmission.nix b/modules/services/torrent/transmission.nix
index 02ec25d1294..742e5bee70c 100644
--- a/modules/services/torrent/transmission.nix
+++ b/modules/services/torrent/transmission.nix
@@ -89,6 +89,11 @@ in
         description = "TCP port number to run the RPC/web interface.";
       };
 
+      apparmor = mkOption {
+        type = types.uniq types.bool;
+        default = true;
+        description = "Generate apparmor profile for transmission-daemon.";
+      };
     };
 
   };
@@ -104,8 +109,8 @@ in
       # 1) Only the "transmission" user and group have access to torrents.
       # 2) Optionally update/force specific fields into the configuration file.
       serviceConfig.ExecStartPre =
-        if config.services.transmission.settings != {} then ''
-          ${pkgs.stdenv.shell} -c "chmod 770 ${homeDir} && mkdir -p ${settingsDir} && ${pkgs.transmission}/bin/transmission-daemon -d |& sed ${attrsToSedArgs config.services.transmission.settings} > ${settingsFile}.tmp && mv ${settingsFile}.tmp ${settingsFile}"
+        if cfg.settings != {} then ''
+          ${pkgs.stdenv.shell} -c "chmod 770 ${homeDir} && mkdir -p ${settingsDir} && ${pkgs.transmission}/bin/transmission-daemon -d |& sed ${attrsToSedArgs cfg.settings} > ${settingsFile}.tmp && mv ${settingsFile}.tmp ${settingsFile}"
         ''
         else ''
           ${pkgs.stdenv.shell} -c "chmod 770 ${homeDir}"
@@ -129,6 +134,37 @@ in
 
     users.extraGroups.transmission = {};
 
+    # AppArmor profile
+    security.apparmor.profiles = mkIf (config.security.apparmor.enable && cfg.apparmor) [
+      (pkgs.writeText "apparmor-transmission-daemon" ''
+        #include <tunables/global>
+
+        ${pkgs.transmission}/bin/transmission-daemon {
+          #include <abstractions/base>
+          #include <abstractions/nameservice>
+
+          ${pkgs.glibc}/lib/*.so             mr,
+          ${pkgs.libevent}/lib/libevent*.so* mr,
+          ${pkgs.curl}/lib/libcurl*.so*      mr,
+          ${pkgs.openssl}/lib/libssl*.so*    mr,
+          ${pkgs.openssl}/lib/libcrypto*.so* mr,
+          ${pkgs.zlib}/lib/libz*.so*         mr,
+          ${pkgs.libssh2}/lib/libssh2*.so*   mr,
+
+          @{PROC}/sys/kernel/random/uuid   r,
+          @{PROC}/sys/vm/overcommit_memory r,
+
+          ${pkgs.transmission}/share/transmission/** r,
+
+          owner ${settingsDir}/** rw,
+
+          ${cfg.settings.download-dir}/** rw,
+          ${optionalString cfg.settings.incomplete-dir-enabled ''
+            ${cfg.settings.incomplete-dir}/** rw,
+          ''}
+        }
+      '')
+    ];
   };
 
 }
-- 
GitLab


From 84c0af80d77348ca9b1d6d3f3ae18e23eb8c5ed5 Mon Sep 17 00:00:00 2001
From: "Ricardo M. Correia" <rcorreia@wizy.org>
Date: Tue, 28 May 2013 16:15:16 +0000
Subject: [PATCH 4642/5331] apparmor: Fix loading multiple profiles

apparmor's systemd service wasn't working when multiple profiles were
defined, due to the ExecStart commands in the service file being
broken into multiple lines, instead of being separated by ';'.
---
 modules/security/apparmor.nix | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/modules/security/apparmor.nix b/modules/security/apparmor.nix
index 8aa933e2996..63098fdc661 100644
--- a/modules/security/apparmor.nix
+++ b/modules/security/apparmor.nix
@@ -53,12 +53,12 @@ with pkgs.lib;
       serviceConfig = {
         Type = "oneshot";
         RemainAfterExit = "yes";
-        ExecStart = concatMapStrings (profile: ''
-          ${pkgs.apparmor}/sbin/apparmor_parser -rKv -I ${pkgs.apparmor}/etc/apparmor.d/ "${profile}"
-        '') cfg.profiles;
-        ExecStop = concatMapStrings (profile: ''
-          ${pkgs.apparmor}/sbin/apparmor_parser -Rv "${profile}"
-        '') cfg.profiles;
+        ExecStart = concatMapStrings (profile:
+          ''${pkgs.apparmor}/sbin/apparmor_parser -rKv -I ${pkgs.apparmor}/etc/apparmor.d/ "${profile}" ; ''
+        ) cfg.profiles;
+        ExecStop = concatMapStrings (profile:
+          ''${pkgs.apparmor}/sbin/apparmor_parser -Rv "${profile}" ; ''
+        ) cfg.profiles;
       };
 
     };
-- 
GitLab


From 531b5816363534fc53f219241ea08a82b310341e Mon Sep 17 00:00:00 2001
From: "Ricardo M. Correia" <rcorreia@wizy.org>
Date: Tue, 28 May 2013 17:49:52 +0000
Subject: [PATCH 4643/5331] apparmor: Fix service stop

When stopping the apparmor service, the profile removal failed with
parsing errors due to not including the
${pkgs.apparmor}/etc/apparmor.d directory.
---
 modules/security/apparmor.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/security/apparmor.nix b/modules/security/apparmor.nix
index 63098fdc661..d4aa0598dd3 100644
--- a/modules/security/apparmor.nix
+++ b/modules/security/apparmor.nix
@@ -57,7 +57,7 @@ with pkgs.lib;
           ''${pkgs.apparmor}/sbin/apparmor_parser -rKv -I ${pkgs.apparmor}/etc/apparmor.d/ "${profile}" ; ''
         ) cfg.profiles;
         ExecStop = concatMapStrings (profile:
-          ''${pkgs.apparmor}/sbin/apparmor_parser -Rv "${profile}" ; ''
+          ''${pkgs.apparmor}/sbin/apparmor_parser -Rv -I ${pkgs.apparmor}/etc/apparmor.d/ "${profile}" ; ''
         ) cfg.profiles;
       };
 
-- 
GitLab


From 0a0beadecd5bce5fca73baae2dc075d15f8dd85e Mon Sep 17 00:00:00 2001
From: "Ricardo M. Correia" <rcorreia@wizy.org>
Date: Tue, 28 May 2013 17:48:08 +0000
Subject: [PATCH 4644/5331] transmission: Add apparmor service dependency

---
 modules/services/torrent/transmission.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/modules/services/torrent/transmission.nix b/modules/services/torrent/transmission.nix
index 742e5bee70c..4c989f09fea 100644
--- a/modules/services/torrent/transmission.nix
+++ b/modules/services/torrent/transmission.nix
@@ -104,8 +104,10 @@ in
 
     systemd.services.transmission = {
       description = "Transmission BitTorrent Daemon";
-      after = [ "network.target" ];
+      after = [ "network.target" ] ++ optional (config.security.apparmor.enable && cfg.apparmor) "apparmor.service";
+      requires = mkIf (config.security.apparmor.enable && cfg.apparmor) [ "apparmor.service" ];
       wantedBy = [ "multi-user.target" ];
+
       # 1) Only the "transmission" user and group have access to torrents.
       # 2) Optionally update/force specific fields into the configuration file.
       serviceConfig.ExecStartPre =
-- 
GitLab


From 53390a2da975032ca0b4ad3e830dfa9b98313cbb Mon Sep 17 00:00:00 2001
From: Domen Kozar <domen@dev.si>
Date: Wed, 29 May 2013 00:38:44 +0200
Subject: [PATCH 4645/5331] add networkmanager_openvpn to systemPackages

---
 modules/services/networking/networkmanager.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/services/networking/networkmanager.nix b/modules/services/networking/networkmanager.nix
index b82f34aa901..88f1e08b377 100644
--- a/modules/services/networking/networkmanager.nix
+++ b/modules/services/networking/networkmanager.nix
@@ -94,7 +94,7 @@ in {
       }
     ];
 
-    environment.systemPackages = cfg.packages;
+    environment.systemPackages = cfg.packages ++ [ networkmanager_openvpn ];
 
     users.extraGroups = singleton {
       name = "networkmanager";
-- 
GitLab


From 40d61bfe36bb83d698bc33e2b189fc85e14a2c7b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Wed, 29 May 2013 23:31:47 +0200
Subject: [PATCH 4646/5331] Revert "networkmanager: clean some attrs missing in
 nixpkgs x-updates"

This reverts commit a649bbea4e2c07b5c10ecc34fc974f8fbe3cda26.
---
 modules/services/networking/networkmanager.nix | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/modules/services/networking/networkmanager.nix b/modules/services/networking/networkmanager.nix
index 418c6d3ccdb..b82f34aa901 100644
--- a/modules/services/networking/networkmanager.nix
+++ b/modules/services/networking/networkmanager.nix
@@ -89,7 +89,9 @@ in {
       { source = configFile;
         target = "NetworkManager/NetworkManager.conf";
       }
-      ##### Just temporary change, old nixpkgs base
+      { source = "${networkmanager_openvpn}/etc/NetworkManager/VPN/nm-openvpn-service.name";
+        target = "NetworkManager/VPN/nm-openvpn-service.name";
+      }
     ];
 
     environment.systemPackages = cfg.packages;
@@ -132,7 +134,7 @@ in {
     security.polkit.permissions = polkitConf;
 
     # openvpn plugin has only dbus interface
-    services.dbus.packages = cfg.packages;
+    services.dbus.packages = cfg.packages ++ [ networkmanager_openvpn ];
 
     services.udev.packages = cfg.packages;
   };
-- 
GitLab


From 08eba4c114871e5f138263aecf0824c90a32a703 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 1 Jun 2013 11:38:49 +0200
Subject: [PATCH 4647/5331] atd: don't enable at daemon by default

The at daemon doesn't work on NixOS [1], so enabling it by default
doesn't seem useful. I'd argue that it shouldn't be enabled by default
even if it worked, actually.

[1] http://lists.science.uu.nl/pipermail/nix-dev/2013-April/011048.html
---
 modules/services/scheduling/atd.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/services/scheduling/atd.nix b/modules/services/scheduling/atd.nix
index 68bc6f6466f..88bec2cb2f3 100644
--- a/modules/services/scheduling/atd.nix
+++ b/modules/services/scheduling/atd.nix
@@ -17,7 +17,7 @@ in
   options = {
 
     services.atd.enable = mkOption {
-      default = true;
+      default = false;
       description = ''
         Whether to enable the `at' daemon, a command scheduler.
       '';
-- 
GitLab


From 70fd5422a7a0d17e1d2236a07fc2ae841f9bc9a5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= <viric@viric.name>
Date: Sun, 2 Jun 2013 14:27:39 +0200
Subject: [PATCH 4648/5331] Adding iw to systemPackages.

---
 modules/tasks/network-interfaces.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/modules/tasks/network-interfaces.nix b/modules/tasks/network-interfaces.nix
index d7b1988fe8d..75f2e1af4be 100644
--- a/modules/tasks/network-interfaces.nix
+++ b/modules/tasks/network-interfaces.nix
@@ -244,6 +244,7 @@ in
         pkgs.iputils
         pkgs.nettools
         pkgs.wirelesstools
+        pkgs.iw
         pkgs.rfkill
         pkgs.openresolv
       ]
-- 
GitLab


From b1f82e428a58ffcb7d0582a2201726d0a1b8c55f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Fri, 31 May 2013 23:53:13 +0200
Subject: [PATCH 4649/5331] lighttpd: add cgit sub-service

(cgit is "a hyperfast web frontend for git repositories written in C")

cgit is enabled like this (assuming lighttpd is already enabled):

  services.lighttpd.cgit.enable = true;

and configured verbatim like this (contents of the cgitrc file):

  services.lighttpd.cgit.configText = ''
    cache-size=1000
    scan-path=/srv/git
  '';

cgit will be available from this URL: http://yourserver/cgit

In lighttpd, I've ensured that the cache dir for cgit is created if cgit
is enabled.
---
 modules/module-list.nix                       |  1 +
 .../services/web-servers/lighttpd/cgit.nix    | 71 +++++++++++++++++++
 .../services/web-servers/lighttpd/default.nix |  6 ++
 3 files changed, 78 insertions(+)
 create mode 100644 modules/services/web-servers/lighttpd/cgit.nix

diff --git a/modules/module-list.nix b/modules/module-list.nix
index 7739f2df6f6..93a868f5f0d 100644
--- a/modules/module-list.nix
+++ b/modules/module-list.nix
@@ -189,6 +189,7 @@
   ./services/web-servers/apache-httpd/default.nix
   ./services/web-servers/jboss/default.nix
   ./services/web-servers/lighttpd/default.nix
+  ./services/web-servers/lighttpd/cgit.nix
   ./services/web-servers/lighttpd/gitweb.nix
   ./services/web-servers/nginx/default.nix
   ./services/web-servers/tomcat.nix
diff --git a/modules/services/web-servers/lighttpd/cgit.nix b/modules/services/web-servers/lighttpd/cgit.nix
new file mode 100644
index 00000000000..b22b05e305b
--- /dev/null
+++ b/modules/services/web-servers/lighttpd/cgit.nix
@@ -0,0 +1,71 @@
+{ config, pkgs, ... }:
+
+with pkgs.lib;
+
+let
+  cfg = config.services.lighttpd.cgit;
+  configFile = pkgs.writeText "cgitrc"
+    ''
+      ${cfg.configText}
+    '';
+in
+{
+
+  options.services.lighttpd.cgit = {
+
+    enable = mkOption {
+      default = false;
+      type = types.uniq types.bool;
+      description = ''
+        If true, enable cgit (fast web interface for git repositories) as a
+        sub-service in lighttpd. cgit will be accessible at
+        http://yourserver/cgit
+      '';
+    };
+
+    configText = mkOption {
+      default = "";
+      example = ''
+        cache-size=1000
+        scan-path=/srv/git
+      '';
+      type = types.string;
+      description = ''
+        Verbatim contents of the cgit runtime configuration file. Documentation
+        (with cgitrc example file) is available in "man cgitrc". Or online:
+        http://git.zx2c4.com/cgit/tree/cgitrc.5.txt
+      '';
+    };
+
+  };
+
+  config = mkIf cfg.enable {
+
+    # make the cgitrc manpage available
+    environment.systemPackages = [ pkgs.cgit ];
+
+    services.lighttpd.extraConfig = ''
+      server.modules += (
+        "mod_cgi",
+        "mod_alias",
+        "mod_setenv"
+      )
+
+      $HTTP["url"] =~ "^/cgit" {
+          cgi.assign = (
+              "cgit.cgi" => "${pkgs.cgit}/cgit/cgit.cgi"
+          )
+          alias.url = (
+              "/cgit.css" => "${pkgs.cgit}/cgit/cgit.css",
+              "/cgit.png" => "${pkgs.cgit}/cgit/cgit.png",
+              "/cgit"     => "${pkgs.cgit}/cgit/cgit.cgi"
+          )
+          setenv.add-environment = (
+              "CGIT_CONFIG" => "${configFile}"
+          )
+      }
+    '';
+
+  };
+
+}
diff --git a/modules/services/web-servers/lighttpd/default.nix b/modules/services/web-servers/lighttpd/default.nix
index 1d1cd6fa178..5ed32d0147c 100644
--- a/modules/services/web-servers/lighttpd/default.nix
+++ b/modules/services/web-servers/lighttpd/default.nix
@@ -131,6 +131,12 @@ in
       description = "Lighttpd Web Server";
       after = [ "network.target" ];
       wantedBy = [ "multi-user.target" ];
+      preStart = ''
+        ${if cfg.cgit.enable then ''
+          mkdir -p /var/cache/cgit
+          chown lighttpd:lighttpd /var/cache/cgit
+        '' else ""}
+      '';
       serviceConfig.ExecStart = "${pkgs.lighttpd}/sbin/lighttpd -D -f ${configFile}";
       # SIGINT => graceful shutdown
       serviceConfig.KillSignal = "SIGINT";
-- 
GitLab


From 3d48da72a99252580db03bf0df4d02c095a46a5e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Sun, 2 Jun 2013 19:26:55 +0200
Subject: [PATCH 4650/5331] lighttpd: gitweb: add extraConfig option

So that we can append custom configuration text to the end of the
generated gitweb.conf file.
---
 modules/services/web-servers/lighttpd/gitweb.nix | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/modules/services/web-servers/lighttpd/gitweb.nix b/modules/services/web-servers/lighttpd/gitweb.nix
index 88c63064a04..3c710e5b09e 100644
--- a/modules/services/web-servers/lighttpd/gitweb.nix
+++ b/modules/services/web-servers/lighttpd/gitweb.nix
@@ -7,7 +7,9 @@ let
   gitwebConfigFile = pkgs.writeText "gitweb.conf" ''
     # path to git projects (<project>.git)
     $projectroot = "${cfg.projectroot}";
+    ${cfg.extraConfig}
   '';
+
 in
 {
 
@@ -30,6 +32,14 @@ in
       '';
     };
 
+    extraConfig = mkOption {
+      default = "";
+      type = types.uniq types.string;
+      description = ''
+        Verbatim configuration text appended to the generated gitweb.conf file.
+      '';
+    };
+
   };
 
   config = mkIf cfg.enable {
-- 
GitLab


From e776c0623d95592256a5a6380113fa989e983541 Mon Sep 17 00:00:00 2001
From: Sander van der Burg <svanderburg@gmail.com>
Date: Mon, 3 Jun 2013 01:34:22 +0200
Subject: [PATCH 4651/5331] Fixed disnix service to use systemd's dependency
 facilities

---
 modules/services/misc/disnix.nix | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/modules/services/misc/disnix.nix b/modules/services/misc/disnix.nix
index 8d04c81ad68..c50af6fb095 100644
--- a/modules/services/misc/disnix.nix
+++ b/modules/services/misc/disnix.nix
@@ -119,12 +119,13 @@ in
     jobs = {
       disnix =
         { description = "Disnix server";
-
-          startOn = "started dbus"
-          + optionalString config.services.httpd.enable " and started httpd"
-          + optionalString config.services.mysql.enable " and started mysql"
-          + optionalString config.services.tomcat.enable " and started tomcat"
-          + optionalString config.services.svnserve.enable " and started svnserve";
+        
+          wantedBy = [ "multi-user.target" ];
+          after = [ "dbus.service" ]
+          ++ optional config.services.httpd.enable "httpd.service"
+          ++ optional config.services.mysql.enable "mysql.service"
+          ++ optional config.services.tomcat.enable "tomcat.service"
+          ++ optional config.services.svnserve.enable "svnserve.service";
 
           restartIfChanged = false;
         
-- 
GitLab


From 824b5b645a3d6cb3d937e7cc25d2fa47e6971df1 Mon Sep 17 00:00:00 2001
From: Mathijs Kwik <mathijs@bluescreen303.nl>
Date: Sun, 2 Jun 2013 10:23:03 +0200
Subject: [PATCH 4652/5331] openvpn: fix type error

either use
- optional cond "target"
or
- optionals cond ["target1" "target2"]
---
 modules/services/networking/openvpn.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/services/networking/openvpn.nix b/modules/services/networking/openvpn.nix
index 63b6cc90f07..1e862591406 100644
--- a/modules/services/networking/openvpn.nix
+++ b/modules/services/networking/openvpn.nix
@@ -49,7 +49,7 @@ let
     in {
       description = "OpenVPN instance ‘${name}’";
 
-      wantedBy = optional cfg.autoStart [ "multi-user.target" ];
+      wantedBy = optional cfg.autoStart "multi-user.target";
       after = [ "network-interfaces.target" ];
 
       path = [ pkgs.iptables pkgs.iproute pkgs.nettools ];
-- 
GitLab


From 6e6061e6b39b59127538f9b926c210d1a1951822 Mon Sep 17 00:00:00 2001
From: Evgeny Egorochkin <phreedom@yandex.ru>
Date: Tue, 4 Jun 2013 13:02:37 +0300
Subject: [PATCH 4653/5331] TOR: add obfsproxy support by default for TOR
 bridges

---
 modules/services/security/tor.nix | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/modules/services/security/tor.nix b/modules/services/security/tor.nix
index ebbe1569576..2dafb4595c6 100644
--- a/modules/services/security/tor.nix
+++ b/modules/services/security/tor.nix
@@ -135,7 +135,9 @@ in
 
             A bridge relay can't be an exit relay.
 
-            You need to set enableRelay to true for this option to take effect.
+            You need to set relay.enable to true for this option to take effect.
+
+            The bridge is set up with an obfuscated transport proxy.
 
             See https://www.torproject.org/bridges.html.en for more info.
           '';
@@ -278,7 +280,10 @@ in
         ${optint "RelayBandwidthRate" cfg.relay.bandwidthRate}
         ${optint "RelayBandwidthBurst" cfg.relay.bandwidthBurst}
         ${if cfg.relay.isExit then opt "ExitPolicy" cfg.relay.exitPolicy else "ExitPolicy reject *:*"}
-        ${if cfg.relay.isBridge then "BridgeRelay 1" else ""}
+        ${if cfg.relay.isBridge then ''
+          BridgeRelay 1
+          ServerTransportPlugin obfs2,obfs3 exec ${pkgs.pythonPackages.obfsproxy}/bin/obfsproxy managed
+        '' else ""}
       '';
 
       services.tor.client.privoxy.config = ''
-- 
GitLab


From d210f30fa75fe6a06d5292f30251b8896d5ba0f6 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 4 Jun 2013 14:05:07 +0200
Subject: [PATCH 4654/5331] Omit GRUB if boot.loader.grub.device is set to
 "nodev"

If we only need to generate a GRUB boot menu, we don't need GRUB
itself.  This cuts 38 MiB from EC2 system closures (in particular
because it gets rid of the need for the 32-bit Glibc).
---
 modules/system/boot/loader/grub/grub.nix | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

diff --git a/modules/system/boot/loader/grub/grub.nix b/modules/system/boot/loader/grub/grub.nix
index 490502c5a36..1552d2cb102 100644
--- a/modules/system/boot/loader/grub/grub.nix
+++ b/modules/system/boot/loader/grub/grub.nix
@@ -6,7 +6,14 @@ let
 
   cfg = config.boot.loader.grub;
 
-  grub = if cfg.version == 1 then pkgs.grub else pkgs.grub2;
+  realGrub = if cfg.version == 1 then pkgs.grub else pkgs.grub2;
+
+  grub =
+    # Don't include GRUB if we're only generating a GRUB menu (e.g.,
+    # in EC2 instances).
+    if cfg.devices == ["nodev"]
+    then null
+    else realGrub;
 
   f = x: if x == null then "" else "" + x;
 
@@ -14,8 +21,8 @@ let
     { splashImage = f config.boot.loader.grub.splashImage;
       grub = f grub;
       shell = "${pkgs.stdenv.shell}";
-      fullVersion = (builtins.parseDrvName config.system.build.grub.name).version;
-      inherit (config.boot.loader.grub)
+      fullVersion = (builtins.parseDrvName realGrub.name).version;
+      inherit (cfg)
         version extraConfig extraPerEntryConfig extraEntries
         extraEntriesBeforeNixOS extraPrepareConfig configurationLimit copyKernels timeout
         default devices;
@@ -141,7 +148,7 @@ in
 
       splashImage = mkOption {
         default =
-          if config.boot.loader.grub.version == 1
+          if cfg.version == 1
           then pkgs.fetchurl {
             url = http://www.gnome-look.org/CONTENT/content-files/36909-soft-tux.xpm.gz;
             sha256 = "14kqdx2lfqvh40h6fjjzqgff1mwk74dmbjvmqphi6azzra7z8d59";
@@ -196,7 +203,7 @@ in
 
   ###### implementation
 
-  config = mkIf config.boot.loader.grub.enable {
+  config = mkIf cfg.enable {
 
     boot.loader.grub.devices = optional (cfg.device != "") cfg.device;
 
@@ -212,7 +219,7 @@ in
     # set at once.
     system.boot.loader.id = "grub";
 
-    environment.systemPackages = mkIf config.boot.loader.grub.enable [ grub ];
+    environment.systemPackages = [ grub ];
 
   };
 
-- 
GitLab


From 365307ada1b6f3fc85b131cdcaaa9fcf19864a31 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 5 Jun 2013 17:09:34 +0200
Subject: [PATCH 4655/5331] nixos-rebuild: Handle .version-suffix not being
 writable

Reported by @vcunat.
---
 modules/installer/tools/nixos-rebuild.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/installer/tools/nixos-rebuild.sh b/modules/installer/tools/nixos-rebuild.sh
index fb26279e7c7..16ec49bde9b 100644
--- a/modules/installer/tools/nixos-rebuild.sh
+++ b/modules/installer/tools/nixos-rebuild.sh
@@ -141,7 +141,7 @@ fi
 if nixos=$(nix-instantiate --find-file nixos "${extraBuildFlags[@]}"); then
     suffix=$(@shell@ $nixos/modules/installer/tools/get-version-suffix "${extraBuildFlags[@]}")
     if [ -n "$suffix" ]; then
-        echo -n "$suffix" > "$nixos/.version-suffix"
+        echo -n "$suffix" > "$nixos/.version-suffix" || true
     fi
 fi
 
-- 
GitLab


From 6d6e8c3a56daf16252f78ede1db277853d33b807 Mon Sep 17 00:00:00 2001
From: Rob Vermaas <rob.vermaas@gmail.com>
Date: Wed, 5 Jun 2013 18:11:19 +0200
Subject: [PATCH 4656/5331] Use same configuration for S3 as for EBS backed
 images.

---
 maintainers/scripts/ec2/create-s3-amis.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/maintainers/scripts/ec2/create-s3-amis.sh b/maintainers/scripts/ec2/create-s3-amis.sh
index 6608ebd51d6..1aaac283239 100755
--- a/maintainers/scripts/ec2/create-s3-amis.sh
+++ b/maintainers/scripts/ec2/create-s3-amis.sh
@@ -1,7 +1,7 @@
 #! /bin/sh -e
 
 nixos=$(nix-instantiate --find-file nixos)
-export NIXOS_CONFIG=$nixos/modules/virtualisation/amazon-config.nix
+export NIXOS_CONFIG=$(dirname $(readlink -f $0))/amazon-base-config.nix
 
 version=$(nix-instantiate --eval-only '<nixos>' -A config.system.nixosVersion | sed s/'"'//g)
 echo "NixOS version is $version"
-- 
GitLab


From 4a40a1f86e6cf40187190d63e33bfbfd1ddc9e7a Mon Sep 17 00:00:00 2001
From: Rob Vermaas <rob.vermaas@gmail.com>
Date: Wed, 5 Jun 2013 18:12:20 +0200
Subject: [PATCH 4657/5331] Update to use NixOps in stead on charon, use
 copy_image method for copying to other regions.

---
 maintainers/scripts/ec2/create-ebs-amis.py | 56 +++++++++++++++-------
 1 file changed, 38 insertions(+), 18 deletions(-)

diff --git a/maintainers/scripts/ec2/create-ebs-amis.py b/maintainers/scripts/ec2/create-ebs-amis.py
index 9f5ded30498..93971ac9504 100755
--- a/maintainers/scripts/ec2/create-ebs-amis.py
+++ b/maintainers/scripts/ec2/create-ebs-amis.py
@@ -4,14 +4,16 @@ import os
 import sys
 import time
 import argparse
-import charon.util
-from charon import deployment
+import nixops.util
+from nixops import deployment
 from boto.ec2.blockdevicemapping import BlockDeviceMapping, BlockDeviceType
+import boto.ec2
 
 parser = argparse.ArgumentParser(description='Create an EBS-backed NixOS AMI')
-parser.add_argument('--region', dest='region', required=True, help='EC2 region')
-parser.add_argument('--keep', dest='keep', action='store_true', help='Keep Charon machine after use')
+parser.add_argument('--region', dest='region', required=True, help='EC2 region to create the image in')
+parser.add_argument('--keep', dest='keep', action='store_true', help='Keep NixOps machine after use')
 parser.add_argument('--hvm', dest='hvm', action='store_true', help='Create HVM image')
+parser.add_argument('--key', dest='key_name', action='store_true', help='Keypair used for HVM instance creation', default="rob")
 args = parser.parse_args()
 
 instance_type = "cc1.4xlarge" if args.hvm else "m1.small"
@@ -67,7 +69,7 @@ m.run_command("nix-channel --update")
 m.run_command("nixos-rebuild switch")
 version = m.run_command("nixos-version", capture_stdout=True).replace('"', '').rstrip()
 print >> sys.stderr, "NixOS version is {0}".format(version)
-m.run_command("cp -f $(nix-instantiate --find-file nixos/modules/virtualisation/amazon-config.nix) /mnt/etc/nixos/configuration.nix")
+m.upload_file("./amazon-base-config.nix", "/mnt/etc/nixos/configuration.nix")
 m.run_command("nixos-install")
 if args.hvm:
     m.run_command('cp /mnt/nix/store/*-grub-0.97*/lib/grub/i386-pc/* /mnt/boot/grub')
@@ -98,24 +100,24 @@ volume = m._conn.get_all_volumes([], filters={'attachment.instance-id': m.resour
 if args.hvm:
     instance = m._conn.run_instances( image_id="ami-6a9e4503"
                                     , instance_type=instance_type
-                                    , key_name=key_name
+                                    , key_name=args.key_name
                                     , placement=m.zone
                                     , security_groups=["eelco-test"]).instances[0]
-    charon.util.check_wait(lambda: instance.update() == 'running', max_tries=120)
+    nixops.util.check_wait(lambda: instance.update() == 'running', max_tries=120)
     instance.stop()
-    charon.util.check_wait(lambda: instance.update() == 'stopped', max_tries=120)
+    nixops.util.check_wait(lambda: instance.update() == 'stopped', max_tries=120)
     old_root_volume = m._conn.get_all_volumes([], filters={'attachment.instance-id': instance.id, 'attachment.device': "/dev/sda1"})[0]
     old_root_volume.detach()
     volume.detach()
-    charon.util.check_wait(lambda: volume.update() == 'available', max_tries=120)
-    charon.util.check_wait(lambda: old_root_volume.update() == 'available', max_tries=120)
+    nixops.util.check_wait(lambda: volume.update() == 'available', max_tries=120)
+    nixops.util.check_wait(lambda: old_root_volume.update() == 'available', max_tries=120)
     volume.attach(instance.id, '/dev/sda1')
-    charon.util.check_wait(lambda: volume.update() == 'in-use', max_tries=120)
+    nixops.util.check_wait(lambda: volume.update() == 'in-use', max_tries=120)
 
     ami_id = m._conn.create_image(instance.id, ami_name, description)
     time.sleep(5)
     image = m._conn.get_all_images([ami_id])[0]
-    charon.util.check_wait(lambda: image.update() == 'available', max_tries=120)
+    nixops.util.check_wait(lambda: image.update() == 'available', max_tries=120)
     instance.terminate()
 
 else:
@@ -123,7 +125,7 @@ else:
     snapshot = volume.create_snapshot(description=description)
     print >> sys.stderr, "created snapshot {0}".format(snapshot.id)
 
-    charon.util.check_wait(check, max_tries=120)
+    nixops.util.check_wait(check, max_tries=120)
 
     m._conn.create_tags([snapshot.id], {'Name': ami_name})
 
@@ -160,7 +162,6 @@ print >> sys.stderr, "making image public..."
 image = m._conn.get_all_images(image_ids=[ami_id])[0]
 image.set_launch_permissions(user_ids=[], group_names=["all"])
 
-
 # Do a test deployment to make sure that the AMI works.
 f = open("ebs-test.nix", "w")
 f.write(
@@ -190,11 +191,30 @@ test_depl.name = "ebs-creator-test"
 test_depl.nix_exprs = [os.path.abspath("./ebs-test.nix")]
 test_depl.deploy(create_only=True)
 test_depl.machines['machine'].run_command("nixos-version")
-if not args.keep:
-    test_depl.destroy_resources()
-    test_depl.delete()
+
+if args.hvm:
+    image_type = 'hvm'
+else:
+    image_type = 'ebs'
 
 # Log the AMI ID.
-f = open("{0}.ebs.ami-id".format(args.region), "w")
+f = open("{0}.{1}.ami-id".format(args.region, image_type), "w")
 f.write("{0}".format(ami_id))
 f.close()
+
+for dest in [ 'us-east-1', 'us-west-1', 'us-west-2', 'eu-west-1']:
+    if args.region != dest:
+        print >> sys.stderr, "copying image from region {0} to {1}".format(args.region, dest)
+        conn = boto.ec2.connect_to_region(dest)
+        copy_image = conn.copy_image(args.region, ami_id, ami_name, description=None, client_token=None)
+
+        # Log the AMI ID.
+        f = open("{0}.{1}.ami-id".format(dest, image_type), "w")
+        f.write("{0}".format(copy_image.image_id))
+        f.close()
+
+
+if not args.keep:
+    test_depl.destroy_resources()
+    test_depl.delete()
+
-- 
GitLab


From 6b4d76c2c217a706baf8006b7f1b3f38049b7a52 Mon Sep 17 00:00:00 2001
From: Zef Hemel <zef@zef.me>
Date: Fri, 7 Jun 2013 11:34:05 +0200
Subject: [PATCH 4658/5331] Added redis service with bunch of documentation.

---
 modules/module-list.nix              |   1 +
 modules/services/databases/redis.nix | 346 +++++++++++++++++++++++++++
 2 files changed, 347 insertions(+)
 create mode 100644 modules/services/databases/redis.nix

diff --git a/modules/module-list.nix b/modules/module-list.nix
index 93a868f5f0d..ae45ba3707e 100644
--- a/modules/module-list.nix
+++ b/modules/module-list.nix
@@ -70,6 +70,7 @@
   ./services/databases/4store-endpoint.nix
   ./services/databases/4store.nix
   ./services/databases/mongodb.nix
+  ./services/databases/redis.nix
   ./services/databases/mysql.nix
   ./services/databases/mysql55.nix
   ./services/databases/openldap.nix
diff --git a/modules/services/databases/redis.nix b/modules/services/databases/redis.nix
new file mode 100644
index 00000000000..e6ce6256576
--- /dev/null
+++ b/modules/services/databases/redis.nix
@@ -0,0 +1,346 @@
+{ config, pkgs, ... }:
+
+with pkgs.lib;
+
+let
+  cfg = config.services.redis;
+  redisBool = b: if b then "yes" else "no";
+  condOption = name: value: if value != null then "${name} ${toString value}" else "";
+
+  redisConfig = pkgs.writeText "redis.conf" ''
+    pidfile ${cfg.pidFile}
+    port ${toString cfg.port}
+    ${condOption "bind" cfg.bind}
+    ${condOption "unixsocket" cfg.unixSocket}
+    ${condOption "unixsocketperm" cfg.unixSocketPerm}
+    timeout ${toString cfg.timeout}
+    tcp-keepalive ${toString cfg.tcpKeepAlive}
+    loglevel ${cfg.logLevel}
+    logfile ${cfg.logfile}
+    databases ${toString cfg.databases}
+    ${concatMapStrings (d: "save ${toString (builtins.elemAt d 0)} ${toString (builtins.elemAt d 1)}\n") cfg.save}
+    stop-writes-on-bgsave-error ${redisBool cfg.stopWritesOnBgSaveError}
+    rdbcompression ${redisBool cfg.rdbCompression}
+    rdbchecksum ${redisBool cfg.rdbChecksum}
+    dbfilename ${cfg.dbFilename}
+    dir ${toString cfg.dbpath}
+    ${if cfg.slaveOf != null then "slaveof ${cfg.slaveOf.ip} ${toString cfg.slaveOf.port}" else ""}
+    ${condOption "masterauth" cfg.masterAuth}
+    slave-serve-stale-data ${redisBool cfg.slaveServeStaleData}
+    slave-read-only ${redisBool cfg.slaveReadOnly}
+    repl-ping-slave-period ${toString cfg.replPingSlavePeriod}
+    repl-timeout ${toString cfg.replTimeout}
+    repl-disable-tcp-nodelay ${redisBool cfg.replDisableTcpNodelay}
+    slave-priority ${toString cfg.slavePriority}
+    ${condOption "requirepass" cfg.requirePass}
+    ${concatMapStrings (c: "rename-command ${c} ${getAttr c cfg.renameCommand}\"\n") (attrNames cfg.renameCommand)}
+    maxclients ${toString cfg.maxClients}
+    ${condOption "maxmemory" cfg.maxMemory}
+    maxmemory-policy ${cfg.maxMemoryPolicy}
+    appendOnly ${redisBool cfg.appendOnly}
+    appendfsync ${cfg.appendFsync}
+    no-appendfsync-on-rewrite ${redisBool cfg.noAppendFsyncOnRewrite}
+    auto-aof-rewrite-percentage ${toString cfg.autoAofRewritePercentage}
+    auto-aof-rewrite-min-size ${toString cfg.autoAofRewriteMinSize}
+    lua-time-limit ${toString cfg.luaTimeLimit}
+    slowlog-log-slower-than ${toString cfg.slowLogLogSlowerThan}
+    slowlog-max-len ${toString cfg.slowLogMaxLen}
+  '';
+in
+{
+
+  ###### interface
+
+  options = {
+
+    services.redis = {
+
+      enable = mkOption {
+        default = false;
+        description = "Whether to enable the Redis server.";
+      };
+
+      package = mkOption {
+        default = pkgs.redis;
+        description = "Which Redis derivation to use.";
+      };
+
+      user = mkOption {
+        default = "redis";
+        description = "User account under which Redis runs";
+      };
+
+      pidFile = mkOption {
+        default = "/var/lib/redis/redis.pid";
+        description = "";
+      };
+
+      port = mkOption {
+        default = 6379;
+        description = "The port for Redis to listen to";
+        type = with types; int;
+      };
+
+      bind = mkOption {
+        default = null; # All interfaces
+        description = "The IP interface to bind to";
+        example = "127.0.0.1";
+      };
+
+      unixSocket = mkOption {
+        default = null;
+        description = "The path to the socket to bind to";
+        example = "/var/run/redis.sock";
+      };
+
+      unixSocketPerm = mkOption {
+        default = null;
+        description = "Permissions for the socket";
+      };
+
+      timeout = mkOption {
+        default = 0;
+        description = "Close the connection after a client is idle for N seconds (0 to disable)";
+        type = with types; int;
+      };
+
+      tcpKeepAlive = mkOption {
+        default = 0;
+        description = "If non-zero, use SO_KEEPALIVE to send TCP ACKs to clients in absence of communication.";
+        example = 60;
+        type = with types; int;
+      };
+
+      logLevel = mkOption {
+        default = "notice"; # debug, verbose, notice, warning
+        example = "debug";
+        description = "Specify the server verbosity level, options: debug, verbose, notice, warning";
+        type = with types; string;
+      };
+
+      logfile = mkOption {
+        default = "stdout";
+        description = "Specify the log file name. Also 'stdout' can be used to force Redis to log on the standard output.";
+        example = "/var/log/redis.log";
+        type = with types; string;
+      };
+
+      databases = mkOption {
+        default = 16;
+        description = "Set the number of databases.";
+        type = with types; int;
+      };
+
+      save = mkOption {
+        default = [ [900 1] [300 10] [60 10000] ];
+        description = "The schedule in which data is persisted to disk, represented as a list of lists where the first element represent the amount of seconds and the second the number of changes.";
+        example = [ [900 1] [300 10] [60 10000] ];
+      };
+
+      stopWritesOnBgSaveError = mkOption {
+        default = true;
+        description = "This will make the user aware (in an hard way) that data is not persisting on disk properly, otherwise chances are that no one will notice and some disaster will happen.";
+      };
+
+      rdbCompression = mkOption {
+        default = true;
+        description = "Compress string objects using LZF when dump .rdb databases";
+        type = with types; bool;
+      };
+
+      rdbChecksum = mkOption {
+        default = true;
+        description = "This makes the format more resistant to corruption but there is a performance hit to pay (around 10%) when saving and loading RDB files";
+        type = with types; bool;
+      };
+
+      dbFilename = mkOption {
+        default = "dump.rdb";
+        description = "The filename where to dump the DB";
+        type = with types; string;
+      };
+
+      dbpath = mkOption {
+        default = "/var/lib/redis";
+        description = "The DB will be written inside this directory, with the filename specified using the 'dbFilename' configuration";
+        type = with types; string;
+      };
+
+      slaveOf = mkOption {
+        default = null; # { ip, port }
+        description = "An attribute set with two attributes: ip and port to which this redis instance acts as a slave";
+        example = { ip = "192.168.1.100"; port = 6379; };
+      };
+
+      masterAuth = mkOption {
+        default = null;
+        description = ''If the master is password protected (using the requirePass configuration)
+        it is possible to tell the slave to authenticate before starting the replication synchronization
+        process, otherwise the master will refuse the slave request.'';
+      };
+
+      slaveServeStaleData = mkOption {
+        default = true;
+        description = "Whether or not to serve data (as a slave) when data is still (not yet in sync)";
+        type = with types; bool;
+      };
+
+      slaveReadOnly = mkOption {
+        default = true;
+        description = "Configure whether this slave instance should accept writes or not";
+        type = with types; bool;
+      };
+
+      replPingSlavePeriod = mkOption {
+        default = 10;
+        description = "Slaves send PINGs to server in a predefined interval, configure the number of seconds that this PING should occur.";
+        type = with types; int;
+      };
+
+      replTimeout = mkOption {
+        default = 60;
+        description = "Sets a timeout for both Bulk transfer I/O timeout and master data or ping response timeout";
+        type = with types; int;
+      };
+
+      replDisableTcpNodelay = mkOption {
+        default = false;
+        description = "Disable TCP_NODELAY on the slave socket after SYNC";
+        type = with types; bool;
+      };
+
+      slavePriority = mkOption {
+        default = 100;
+        description = "Priority to be promoted to new master by Redis sentinel";
+        type = with types; int;
+      };
+
+      requirePass = mkOption {
+        default = null;
+        description = "Password for database";
+        example = "letmein!";
+      };
+
+      renameCommand = mkOption {
+        default = {}; # oldname = newname
+        description = "Attribute set to rename commands e.g. for security reasons.";
+        example = { config = "123haefhahefconfig"; };
+      };
+
+      maxClients = mkOption {
+        default = 10000;
+        description = "Maximum number of concurrent clients.";
+        type = with types; int;
+      };
+
+      maxMemory = mkOption {
+        default = null; # in bytes
+        description = "Maximum number of bytes of memory to use";
+      };
+
+      maxMemoryPolicy = mkOption {
+        default = "volatile-lru";
+        description = "Policy to handle running out of memory, options: allkeys-lru, volatile-random, allkeys-random, volatile-ttl, noeviction";
+        type = with types; string;
+      };
+
+      appendOnly = mkOption {
+        default = false;
+        description = "By default data is only periodically persisted to disk, enable this option to use an append-only file for improved persistence.";
+        type = with types; bool;
+      };
+
+      appendOnlyFilename = mkOption {
+        default = "appendonly.aof";
+        description = "Filename for the append-only file (stored inside of dbpath)";
+        type = with types; string;
+      };
+
+      appendFsync = mkOption {
+        default = "everysec"; # no, always, everysec
+        description = "How often to fsync the append-only log, options: no, always, everysec";
+        type = with types; string;
+      };
+
+      noAppendFsyncOnRewrite = mkOption {
+        default = false;
+        description = "Do not allow fsyncing of append-only log during rewrites";
+        type = with types; bool;
+      };
+
+      autoAofRewritePercentage = mkOption {
+        default = 100;
+        description = "Automatically rewrite (= reduce size) of append-only file when file grows with this percentage.";
+        type = with types; int;
+      };
+
+      autoAofRewriteMinSize = mkOption {
+        default = "64mb";
+        description = "Minimal size to start rewriting.";
+        type = with types; string;
+      };
+
+      luaTimeLimit = mkOption {
+        default = 5000;
+        description = "Maximum execution time for Lua scripts in milliseconds";
+        type = with types; int;
+      };
+
+      slowLogLogSlowerThan = mkOption {
+        default = 10000;
+        description = "Log queries whose execution take longer than X in milliseconds";
+        example = 1000;
+        type = with types; int;
+      };
+
+      slowLogMaxLen = mkOption {
+        default = 128;
+        description = "Maximum number of items to keep in slow log";
+        type = with types; int;
+      };
+    };
+
+  };
+
+
+  ###### implementation
+
+  config = mkIf config.services.redis.enable {
+
+    users.extraUsers = singleton
+      { name = cfg.user;
+        description = "Redis database user";
+      };
+
+    environment.systemPackages = [ pkgs.redis ];
+
+    systemd.services.redis_init =
+      { description = "Redis server initialisation";
+
+        wantedBy = [ "redis.service" ];
+        before = [ "redis.service" ];
+
+        serviceConfig.Type = "oneshot";
+
+        script = ''
+          if ! test -e ${cfg.dbpath}; then
+              install -d -m0700 -o ${cfg.user} ${cfg.dbpath}
+          fi
+        '';
+      };
+
+    systemd.services.redis =
+      { description = "Redis server";
+
+        wantedBy = [ "multi-user.target" ];
+        after = [ "network.target" ];
+
+        serviceConfig = {
+          ExecStart = "${pkgs.redis}/bin/redis-server ${redisConfig}";
+          User = cfg.user;
+        };
+      };
+
+  };
+
+}
-- 
GitLab


From bcf3a7bbf6f3ead73f6b50789c14f4065d99ebc2 Mon Sep 17 00:00:00 2001
From: Zef Hemel <zef@zef.me>
Date: Fri, 7 Jun 2013 11:37:58 +0200
Subject: [PATCH 4659/5331] Fixed: now using the configured redis package.

---
 modules/services/databases/redis.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/services/databases/redis.nix b/modules/services/databases/redis.nix
index e6ce6256576..8de4a9105e5 100644
--- a/modules/services/databases/redis.nix
+++ b/modules/services/databases/redis.nix
@@ -312,7 +312,7 @@ in
         description = "Redis database user";
       };
 
-    environment.systemPackages = [ pkgs.redis ];
+    environment.systemPackages = [ cfg.package ];
 
     systemd.services.redis_init =
       { description = "Redis server initialisation";
@@ -336,7 +336,7 @@ in
         after = [ "network.target" ];
 
         serviceConfig = {
-          ExecStart = "${pkgs.redis}/bin/redis-server ${redisConfig}";
+          ExecStart = "${cfg.package}/bin/redis-server ${redisConfig}";
           User = cfg.user;
         };
       };
-- 
GitLab


From b3f04718cf6a73655997d214944ef0220eb01f5d Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 11 Jun 2013 12:10:58 +0200
Subject: [PATCH 4660/5331] Use stable Nix by default

---
 modules/services/misc/nix-daemon.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/services/misc/nix-daemon.nix b/modules/services/misc/nix-daemon.nix
index 8f1bfd3ccaa..f3ebf0a3418 100644
--- a/modules/services/misc/nix-daemon.nix
+++ b/modules/services/misc/nix-daemon.nix
@@ -54,7 +54,7 @@ in
   options = {
 
     environment.nix = mkOption {
-      default = pkgs.nixUnstable;
+      default = pkgs.nix;
       merge = mergeOneOption;
       description = ''
         This option specifies the Nix package instance to use throughout the system.
-- 
GitLab


From 4b0d6a0759eae6c692b5ed9e7b2262929b4dc8ad Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 11 Jun 2013 16:15:24 +0200
Subject: [PATCH 4661/5331] nscd: Restart if /etc/hosts changes

---
 modules/services/system/nscd.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/modules/services/system/nscd.nix b/modules/services/system/nscd.nix
index 22f507f39d7..e8534b12043 100644
--- a/modules/services/system/nscd.nix
+++ b/modules/services/system/nscd.nix
@@ -52,6 +52,8 @@ in
             mkdir -m 0755 -p /var/db/nscd
           '';
 
+        restartTriggers = [ config.environment.etc.hosts.source ];
+
         serviceConfig =
           { ExecStart = "@${pkgs.glibc}/sbin/nscd nscd -f ${./nscd.conf}";
             Type = "forking";
-- 
GitLab


From 7cf23a740d1aa09b277244f8295141a5a9756b14 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 12 Jun 2013 14:23:33 +0200
Subject: [PATCH 4662/5331] Update the default binary cache URL to
 cache.nixos.org

---
 modules/services/misc/nix-daemon.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/services/misc/nix-daemon.nix b/modules/services/misc/nix-daemon.nix
index f3ebf0a3418..4563336a5bc 100644
--- a/modules/services/misc/nix-daemon.nix
+++ b/modules/services/misc/nix-daemon.nix
@@ -220,7 +220,7 @@ in
       };
 
       binaryCaches = mkOption {
-        default = [ http://nixos.org/binary-cache ];
+        default = [ http://cache.nixos.org/ ];
         type = types.listOf types.string;
         description = ''
           List of binary cache URLs used to obtain pre-built binaries
-- 
GitLab


From bf28d5c109b8ae7dca06c0f01787c23be704ff1e Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Thu, 13 Jun 2013 01:56:09 +0200
Subject: [PATCH 4663/5331] zabbix-server: Add PID file to systemd config.

This is to avoid (in some cases) constant restarting of the Zabbix server, which
causes odds bugs and crashes in the exit handler (if it's too early during
startup).

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 modules/services/monitoring/zabbix-server.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/modules/services/monitoring/zabbix-server.nix b/modules/services/monitoring/zabbix-server.nix
index df42071ebba..806aaf4f90a 100644
--- a/modules/services/monitoring/zabbix-server.nix
+++ b/modules/services/monitoring/zabbix-server.nix
@@ -100,6 +100,7 @@ in
         serviceConfig.Type = "forking";
         serviceConfig.Restart = "always";
         serviceConfig.RestartSec = 2;
+        serviceConfig.PIDFile = pidFile;
       };
 
   };
-- 
GitLab


From 89904709510971003c58bf41a8fd28780fc45da6 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Thu, 13 Jun 2013 02:28:23 +0200
Subject: [PATCH 4664/5331] apache-httpd/zabbix: Allow custom configFile.

If option is left by its default value, behaviour is the same as before, using
the configuration file created by the web interface.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 .../web-servers/apache-httpd/zabbix.nix         | 17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

diff --git a/modules/services/web-servers/apache-httpd/zabbix.nix b/modules/services/web-servers/apache-httpd/zabbix.nix
index 6191d63584a..b485279b371 100644
--- a/modules/services/web-servers/apache-httpd/zabbix.nix
+++ b/modules/services/web-servers/apache-httpd/zabbix.nix
@@ -11,10 +11,11 @@ let
   # we could generate zabbix.conf.php declaratively.
   zabbixPHP = pkgs.runCommand "${pkgs.zabbix.server.name}-php" {}
     ''
-      cp -rs ${pkgs.zabbix.server}/share/zabbix/php $out
+      cp -rs ${pkgs.zabbix.server}/share/zabbix/php "$out"
       chmod -R u+w $out
-      #rm -rf $out/conf
-      ln -s ${config.stateDir}/zabbix.conf.php $out/conf/zabbix.conf.php
+      ln -s "${if config.configFile == null
+               then "${config.stateDir}/zabbix.conf.php"
+               else config.configFile}" "$out/conf/zabbix.conf.php"
     '';
 
 in
@@ -57,6 +58,16 @@ in
       ";
     };
 
+    configFile = pkgs.lib.mkOption {
+      default = null;
+      type = with pkgs.lib.types; nullOr path;
+      description = ''
+        The configuration file (zabbix.conf.php) which contains the database
+        connection settings. If not set, the configuration settings will created
+        by the web installer.
+      '';
+    };
+
     stateDir = pkgs.lib.mkOption {
       default = "/var/lib/zabbix/frontend";
       description = "
-- 
GitLab


From a5c6a36466f6dd65e91aaa56e9b3818bd968b490 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Thu, 13 Jun 2013 02:31:35 +0200
Subject: [PATCH 4665/5331] apache-httpd/zabbix: Set max_input_time.

At least the Zabbix 2.x web installer requires max_input_time to be set to 300
seconds. As it doesn't hurt to set it for the 1.x versions, I'm including it
here.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 modules/services/web-servers/apache-httpd/zabbix.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/modules/services/web-servers/apache-httpd/zabbix.nix b/modules/services/web-servers/apache-httpd/zabbix.nix
index b485279b371..a6e6042fdf6 100644
--- a/modules/services/web-servers/apache-httpd/zabbix.nix
+++ b/modules/services/web-servers/apache-httpd/zabbix.nix
@@ -28,6 +28,7 @@ in
     ''
       post_max_size = 32M
       max_execution_time = 300
+      max_input_time = 300
     '';
 
   extraConfig = ''
-- 
GitLab


From 62d52826021431b2008fb16153ea0bc5f17a325f Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Thu, 13 Jun 2013 02:40:46 +0200
Subject: [PATCH 4666/5331] zabbix-server: Make it easier to use peer auth.

Quoting from the manual about DBHost:

```
In case of MySQL localhost or empty string results in using a socket. In case of
PostgreSQL only empty string results in attempt to use socket.
```
https://www.zabbix.com/documentation/2.0/manual/appendix/config/zabbix_server

With this commit we should avoid some race conditions in systemd, because if the
host is set to "", there is no condition that postgresql has to be started prior
to the Zabbix server.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 modules/services/monitoring/zabbix-server.nix | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/modules/services/monitoring/zabbix-server.nix b/modules/services/monitoring/zabbix-server.nix
index 806aaf4f90a..60c1f914fb7 100644
--- a/modules/services/monitoring/zabbix-server.nix
+++ b/modules/services/monitoring/zabbix-server.nix
@@ -34,6 +34,8 @@ let
       ''}
     '';
 
+  useLocalPostgres = cfg.dbServer == "localhost" || cfg.dbServer == "";
+
 in
 
 {
@@ -51,7 +53,10 @@ in
 
     services.zabbixServer.dbServer = mkOption {
       default = "localhost";
-      description = "Hostname or IP address of the database server.";
+      description = ''
+        Hostname or IP address of the database server.
+        Use an empty string ("") to use peer authentication.
+      '';
     };
 
     services.zabbixServer.dbPassword = mkOption {
@@ -65,7 +70,7 @@ in
 
   config = mkIf cfg.enable {
 
-    services.postgresql.enable = cfg.dbServer == "localhost";
+    services.postgresql.enable = useLocalPostgres;
 
     users.extraUsers = singleton
       { name = "zabbix";
@@ -77,7 +82,7 @@ in
       { description = "Zabbix Server";
 
         wantedBy = [ "multi-user.target" ];
-        after = optional (cfg.dbServer == "localhost") "postgresql.service";
+        after = optional useLocalPostgres "postgresql.service";
 
         preStart =
           ''
-- 
GitLab


From 3bf12106352c86773fc31d4a10a7c58ef39c3f14 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Thu, 13 Jun 2013 03:29:29 +0200
Subject: [PATCH 4667/5331] zabbix-server: Swap order of database population.

Starting with Zabbix 2.0 the order of data imports is important[*] and will lead
to errors if not done in the right order. Zabbix 1.8 works fine with the swapped
order as well, so this change shouldn't affect any pre-2.0 users.

[*] https://www.zabbix.com/documentation/2.0/manual/appendix/install/db_scripts

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 modules/services/monitoring/zabbix-server.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/services/monitoring/zabbix-server.nix b/modules/services/monitoring/zabbix-server.nix
index 60c1f914fb7..6735b4ca327 100644
--- a/modules/services/monitoring/zabbix-server.nix
+++ b/modules/services/monitoring/zabbix-server.nix
@@ -93,8 +93,8 @@ in
                 ${pkgs.postgresql}/bin/createuser --no-superuser --no-createdb --no-createrole zabbix || true
                 ${pkgs.postgresql}/bin/createdb --owner zabbix zabbix || true
                 cat ${pkgs.zabbix.server}/share/zabbix/db/schema/postgresql.sql | ${pkgs.su}/bin/su -s "$SHELL" zabbix -c '${pkgs.postgresql}/bin/psql zabbix'
-                cat ${pkgs.zabbix.server}/share/zabbix/db/data/data.sql | ${pkgs.su}/bin/su -s "$SHELL" zabbix -c '${pkgs.postgresql}/bin/psql zabbix'
                 cat ${pkgs.zabbix.server}/share/zabbix/db/data/images_pgsql.sql | ${pkgs.su}/bin/su -s "$SHELL" zabbix -c '${pkgs.postgresql}/bin/psql zabbix'
+                cat ${pkgs.zabbix.server}/share/zabbix/db/data/data.sql | ${pkgs.su}/bin/su -s "$SHELL" zabbix -c '${pkgs.postgresql}/bin/psql zabbix'
                 touch "${libDir}/db-created"
             fi
           '';
-- 
GitLab


From 80c5b807d29dca9824bd31a21b72bde5283611fa Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 14 Jun 2013 13:49:25 +0200
Subject: [PATCH 4668/5331] Fix tree toggles in VM tests

---
 lib/test-driver/log2html.xsl | 32 ++++++++++++++++----------------
 lib/testing.nix              |  2 --
 2 files changed, 16 insertions(+), 18 deletions(-)

diff --git a/lib/test-driver/log2html.xsl b/lib/test-driver/log2html.xsl
index 0123fc53760..8e907d85ffa 100644
--- a/lib/test-driver/log2html.xsl
+++ b/lib/test-driver/log2html.xsl
@@ -9,8 +9,8 @@
   <xsl:template match="logfile">
     <html>
       <head>
-        <script type="text/javascript" src="jquery.min.js"></script> 
-        <script type="text/javascript" src="jquery-ui.min.js"></script>
+        <script type="text/javascript" src="http://ajax.googleapis.com/ajax/libs/jquery/1.8.3/jquery.min.js"></script>
+        <script type="text/javascript" src="http://ajax.googleapis.com/ajax/libs/jqueryui/1.10.3/jquery-ui.min.js"></script>
         <script type="text/javascript" src="treebits.js" />
         <link rel="stylesheet" href="logfile.css" type="text/css" />
         <title>Log File</title>
@@ -37,18 +37,18 @@
             </xsl:for-each>
           </ul>
         </xsl:if>
-        
+
       </body>
     </html>
   </xsl:template>
 
-  
+
   <xsl:template match="nest">
 
     <!-- The tree should be collapsed by default if all children are
          unimportant or if the header is unimportant. -->
     <xsl:variable name="collapsed" select="not(./head[@expanded]) and count(.//*[@error]) = 0"/>
-                  
+
     <xsl:variable name="style"><xsl:if test="$collapsed">display: none;</xsl:if></xsl:variable>
 
     <xsl:if test="line|nest">
@@ -60,19 +60,19 @@
       </a>
       <xsl:text> </xsl:text>
     </xsl:if>
-    
+
     <xsl:apply-templates select='head'/>
 
     <!-- Be careful to only generate <ul>s if there are <li>s, otherwise it’s malformed. -->
     <xsl:if test="line|nest">
-      
+
       <ul class='nesting' style="{$style}">
         <xsl:for-each select='line|nest'>
 
           <!-- Is this the last line?  If so, mark it as such so that it
                can be rendered differently. -->
           <xsl:variable name="class"><xsl:choose><xsl:when test="position() != last()">line</xsl:when><xsl:otherwise>lastline</xsl:otherwise></xsl:choose></xsl:variable>
-        
+
           <li class='{$class}'>
             <span class='lineconn' />
             <span class='linebody'>
@@ -82,10 +82,10 @@
         </xsl:for-each>
       </ul>
     </xsl:if>
-    
+
   </xsl:template>
 
-  
+
   <xsl:template match="head|line">
     <code>
       <xsl:if test="@error">
@@ -101,7 +101,7 @@
       <xsl:if test="@type = 'serial'">
         <xsl:attribute name="class">serial</xsl:attribute>
       </xsl:if>
-      
+
       <xsl:if test="@machine">
         <xsl:choose>
           <xsl:when test="@type = 'serial'">
@@ -112,7 +112,7 @@
           </xsl:otherwise>
         </xsl:choose>
       </xsl:if>
-      
+
       <xsl:choose>
         <xsl:when test="@image">
           <a href="{@image}"><xsl:apply-templates/></a>
@@ -120,16 +120,16 @@
         <xsl:otherwise>
           <xsl:apply-templates/>
         </xsl:otherwise>
-      </xsl:choose>        
+      </xsl:choose>
     </code>
   </xsl:template>
 
-  
+
   <xsl:template match="storeref">
     <em class='storeref'>
       <span class='popup'><xsl:apply-templates/></span>
       <span class='elided'>/...</span><xsl:apply-templates select='name'/><xsl:apply-templates select='path'/>
     </em>
   </xsl:template>
-  
-</xsl:stylesheet>
\ No newline at end of file
+
+</xsl:stylesheet>
diff --git a/lib/testing.nix b/lib/testing.nix
index 7c5bb5d50f7..9a72e1f4bd5 100644
--- a/lib/testing.nix
+++ b/lib/testing.nix
@@ -53,8 +53,6 @@ rec {
           xsltproc --output $out/log.html ${./test-driver/log2html.xsl} $out/log.xml
           ln -s ${./test-driver/logfile.css} $out/logfile.css
           ln -s ${./test-driver/treebits.js} $out/treebits.js
-          ln -s ${pkgs.jquery_ui}/js/jquery.min.js $out/
-          ln -s ${pkgs.jquery_ui}/js/jquery-ui.min.js $out/
 
           touch $out/nix-support/hydra-build-products
           echo "report testlog $out log.html" >> $out/nix-support/hydra-build-products
-- 
GitLab


From 82de6feba6bb4381a523fcfa041058ce6126b20f Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 14 Jun 2013 14:04:17 +0200
Subject: [PATCH 4669/5331] Fix the installer test

---
 tests/installer.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/installer.nix b/tests/installer.nix
index 477e5c660af..565f1d6a680 100644
--- a/tests/installer.nix
+++ b/tests/installer.nix
@@ -75,7 +75,7 @@ let
     { services.httpd.enable = true;
       services.httpd.adminAddr = "foo@example.org";
       services.httpd.servedDirs = singleton
-        { urlPath = "/binary-cache";
+        { urlPath = "/";
           dir = "/tmp/channel";
         };
 
@@ -123,7 +123,7 @@ let
         # Allow the machine to talk to the fake nixos.org.
         $machine->succeed(
             "rm /etc/hosts",
-            "echo 192.168.1.1 nixos.org > /etc/hosts",
+            "echo 192.168.1.1 nixos.org cache.nixos.org > /etc/hosts",
             "ifconfig eth1 up 192.168.1.2",
         );
 
-- 
GitLab


From 2fa7f63bd07eb4ae8f3d63f5c432f5cd09f4f093 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Fri, 14 Jun 2013 17:51:59 +0200
Subject: [PATCH 4670/5331] agetty: Add 57600 to the baud rate list.

This is because it's quite commonly used in the wild. Especially at some "weird"
server hosters (no names here) which doesn't allow to change the baudrate for
their serial consoles.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 modules/services/ttys/agetty.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/services/ttys/agetty.nix b/modules/services/ttys/agetty.nix
index f269de6fc2a..850f558e4cb 100644
--- a/modules/services/ttys/agetty.nix
+++ b/modules/services/ttys/agetty.nix
@@ -93,7 +93,7 @@ with pkgs.lib;
         [Service]
         Environment=TERM=linux
         Environment=LOCALE_ARCHIVE=/run/current-system/sw/lib/locale/locale-archive
-        ExecStart=@${pkgs.utillinux}/sbin/agetty agetty --login-program ${pkgs.shadow}/bin/login %I 115200,38400,9600
+        ExecStart=@${pkgs.utillinux}/sbin/agetty agetty --login-program ${pkgs.shadow}/bin/login %I 115200,57600,38400,9600
         Type=idle
         Restart=always
         RestartSec=0
-- 
GitLab


From 8c3264466ad902d26c25d9d4c6a734bd54980878 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Fri, 14 Jun 2013 21:01:12 +0200
Subject: [PATCH 4671/5331] lighttpd: improve module handling

lighttpd doesn't support loading a module more than once. If you attempt
to load a module again, lighttpd prints an error message:

  (plugin.c.131) Cannot load plugin mod_cgi more than once, please fix your config (we may not accept such configs in future releases

And it's not just the error message. The module isn't loaded (or is
messed up somehow) so that neither sub-service will work properly after
this.

This is bad news for the current approach to sub-services, where each
sub-service lists the needed modules in a server.modules += (...) block.
When two sub-services need the same module we get the above issue. (And,
AFAIK, there is no way to check if a module is already loaded either.)

First I thought about an approach where each sub-service specifies the
list of plugins it needs, and that a common server.modules = (...) list
is built from the union of those lists. That would loosly couple the
sub-services with the main lighttpd nixos module expression. But I think
this is a bad idea because lighttpd module loading order matters[1], and
the module order in the global server.modules = (...) list would be
somewhat cumbersome to control.

Here is an example:

Sub-service A needs mod_fastcgi. Sub-service B needs mod_auth and
mod_fastcgi. Note that mod_auth must be loaded *before* mod_fastcgi to
take effect. The union of those modules may either be ["mod_auth"
"mod_fastcgi"] or ["mod_fastcgi" "mod_auth"] depending on the evaluation
order. The first order will work, the latter will not.

So instead of the above, this commit moves the modules from
service.modules += (...) snippets in each sub-service to a global
server.modules = (...) list in the main lighttpd module expression. The
module loading order is fixed and each module is included only if any of
the sub-services that needs it is enabled.

The downside to this approach is that sub-services need a (tiny) bit of
change to the main lighttpd nixos module expression. But I think it is
the only sane way to do it (as long as lighttpd is written the way it
is).

References:
  [1] http://redmine.lighttpd.net/projects/1/wiki/Server_modulesDetails
  [2] http://redmine.lighttpd.net/issues/2337
---
 .../services/web-servers/lighttpd/cgit.nix    |  6 ----
 .../services/web-servers/lighttpd/default.nix | 31 +++++++++++++++++--
 .../services/web-servers/lighttpd/gitweb.nix  |  6 ----
 3 files changed, 28 insertions(+), 15 deletions(-)

diff --git a/modules/services/web-servers/lighttpd/cgit.nix b/modules/services/web-servers/lighttpd/cgit.nix
index b22b05e305b..62264f1db45 100644
--- a/modules/services/web-servers/lighttpd/cgit.nix
+++ b/modules/services/web-servers/lighttpd/cgit.nix
@@ -45,12 +45,6 @@ in
     environment.systemPackages = [ pkgs.cgit ];
 
     services.lighttpd.extraConfig = ''
-      server.modules += (
-        "mod_cgi",
-        "mod_alias",
-        "mod_setenv"
-      )
-
       $HTTP["url"] =~ "^/cgit" {
           cgi.assign = (
               "cgit.cgi" => "${pkgs.cgit}/cgit/cgit.cgi"
diff --git a/modules/services/web-servers/lighttpd/default.nix b/modules/services/web-servers/lighttpd/default.nix
index 5ed32d0147c..f1099ef599f 100644
--- a/modules/services/web-servers/lighttpd/default.nix
+++ b/modules/services/web-servers/lighttpd/default.nix
@@ -8,6 +8,13 @@ let
 
   cfg = config.services.lighttpd;
 
+  needModRedirect = cfg.gitweb.enable;
+  needModAlias = cfg.cgit.enable or cfg.gitweb.enable;
+  needModSetenv = cfg.cgit.enable or cfg.gitweb.enable;
+  needModCgi = cfg.cgit.enable or cfg.gitweb.enable;
+  needModStatus = cfg.mod_status;
+  needModUserdir = cfg.mod_userdir;
+
   configFile = if cfg.configText != "" then
     pkgs.writeText "lighttpd.conf" ''
       ${cfg.configText}
@@ -19,8 +26,28 @@ let
       server.username = "lighttpd"
       server.groupname = "lighttpd"
 
+      # As for why all modules are loaded here, instead of having small
+      # server.modules += () entries in each sub-service extraConfig snippet,
+      # read this:
+      #
+      #   http://redmine.lighttpd.net/projects/1/wiki/Server_modulesDetails
+      #   http://redmine.lighttpd.net/issues/2337
+      #
+      # Basically, lighttpd doesn't want to load (or even silently ignore) a
+      # module for a second time, and there is no way to check if a module has
+      # been loaded already. So if two services were to put the same module in
+      # server.modules += (), that would break the lighttpd configuration.
+      server.modules = (
+          ${optionalString needModRedirect ''"mod_redirect",''}
+          ${optionalString needModAlias ''"mod_alias",''}
+          ${optionalString needModSetenv ''"mod_setenv",''}
+          ${optionalString needModCgi ''"mod_cgi",''}
+          ${optionalString needModStatus ''"mod_status",''}
+          ${optionalString needModUserdir ''"mod_userdir",''}
+          "mod_accesslog"
+      )
+
       # Logging (logs end up in systemd journal)
-      server.modules += ("mod_accesslog")
       accesslog.use-syslog = "enable"
       server.errorlog-use-syslog = "enable"
 
@@ -37,12 +64,10 @@ let
       index-file.names = ( "index.html" )
 
       ${if cfg.mod_userdir then ''
-        server.modules += ("mod_userdir")
         userdir.path = "public_html"
       '' else ""}
 
       ${if cfg.mod_status then ''
-        server.modules += ("mod_status")
         status.status-url = "/server-status"
         status.statistics-url = "/server-statistics"
         status.config-url = "/server-config"
diff --git a/modules/services/web-servers/lighttpd/gitweb.nix b/modules/services/web-servers/lighttpd/gitweb.nix
index 3c710e5b09e..d759d8144b6 100644
--- a/modules/services/web-servers/lighttpd/gitweb.nix
+++ b/modules/services/web-servers/lighttpd/gitweb.nix
@@ -45,12 +45,6 @@ in
   config = mkIf cfg.enable {
 
     services.lighttpd.extraConfig = ''
-      server.modules += (
-        "mod_alias",
-        "mod_cgi",
-        "mod_redirect",
-        "mod_setenv"
-      )
       $HTTP["url"] =~ "^/gitweb" {
           cgi.assign = (
               ".cgi" => "${pkgs.perl}/bin/perl"
-- 
GitLab


From 84b53630903c3ab72be5820a92ac2520e223c0e3 Mon Sep 17 00:00:00 2001
From: Jaka Hudoklin <jakahudoklin@gmail.com>
Date: Sun, 16 Jun 2013 16:22:45 +0000
Subject: [PATCH 4672/5331] Tarball should get ip from dhcp even if booting
 from nfs

---
 modules/installer/cd-dvd/system-tarball.nix | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/modules/installer/cd-dvd/system-tarball.nix b/modules/installer/cd-dvd/system-tarball.nix
index e0cbfd6e713..95f7582d0ca 100644
--- a/modules/installer/cd-dvd/system-tarball.nix
+++ b/modules/installer/cd-dvd/system-tarball.nix
@@ -72,9 +72,6 @@ in
     inherit (config.tarball) contents storeContents;
   };
 
-  # Otherwise it will collide with the 'ip=dhcp' kernel autoconfig.
-  networking.useDHCP = false;
-
   boot.postBootCommands =
     ''
       # After booting, register the contents of the Nix store on the
-- 
GitLab


From a1c159bc4c53701aae096cdc216a31dbdca3db0f Mon Sep 17 00:00:00 2001
From: Zef Hemel <zef@zef.me>
Date: Mon, 17 Jun 2013 14:06:02 -0400
Subject: [PATCH 4673/5331] Removed options that are not vital, added an
 `extraConfig` for any additional configuration options for flexibility.

---
 modules/services/databases/redis.nix | 145 ++-------------------------
 1 file changed, 7 insertions(+), 138 deletions(-)

diff --git a/modules/services/databases/redis.nix b/modules/services/databases/redis.nix
index 8de4a9105e5..9472136e17e 100644
--- a/modules/services/databases/redis.nix
+++ b/modules/services/databases/redis.nix
@@ -12,39 +12,20 @@ let
     port ${toString cfg.port}
     ${condOption "bind" cfg.bind}
     ${condOption "unixsocket" cfg.unixSocket}
-    ${condOption "unixsocketperm" cfg.unixSocketPerm}
-    timeout ${toString cfg.timeout}
-    tcp-keepalive ${toString cfg.tcpKeepAlive}
     loglevel ${cfg.logLevel}
     logfile ${cfg.logfile}
     databases ${toString cfg.databases}
     ${concatMapStrings (d: "save ${toString (builtins.elemAt d 0)} ${toString (builtins.elemAt d 1)}\n") cfg.save}
-    stop-writes-on-bgsave-error ${redisBool cfg.stopWritesOnBgSaveError}
-    rdbcompression ${redisBool cfg.rdbCompression}
-    rdbchecksum ${redisBool cfg.rdbChecksum}
     dbfilename ${cfg.dbFilename}
     dir ${toString cfg.dbpath}
     ${if cfg.slaveOf != null then "slaveof ${cfg.slaveOf.ip} ${toString cfg.slaveOf.port}" else ""}
     ${condOption "masterauth" cfg.masterAuth}
-    slave-serve-stale-data ${redisBool cfg.slaveServeStaleData}
-    slave-read-only ${redisBool cfg.slaveReadOnly}
-    repl-ping-slave-period ${toString cfg.replPingSlavePeriod}
-    repl-timeout ${toString cfg.replTimeout}
-    repl-disable-tcp-nodelay ${redisBool cfg.replDisableTcpNodelay}
-    slave-priority ${toString cfg.slavePriority}
     ${condOption "requirepass" cfg.requirePass}
-    ${concatMapStrings (c: "rename-command ${c} ${getAttr c cfg.renameCommand}\"\n") (attrNames cfg.renameCommand)}
-    maxclients ${toString cfg.maxClients}
-    ${condOption "maxmemory" cfg.maxMemory}
-    maxmemory-policy ${cfg.maxMemoryPolicy}
     appendOnly ${redisBool cfg.appendOnly}
     appendfsync ${cfg.appendFsync}
-    no-appendfsync-on-rewrite ${redisBool cfg.noAppendFsyncOnRewrite}
-    auto-aof-rewrite-percentage ${toString cfg.autoAofRewritePercentage}
-    auto-aof-rewrite-min-size ${toString cfg.autoAofRewriteMinSize}
-    lua-time-limit ${toString cfg.luaTimeLimit}
     slowlog-log-slower-than ${toString cfg.slowLogLogSlowerThan}
     slowlog-max-len ${toString cfg.slowLogMaxLen}
+    ${cfg.extraConfig}
   '';
 in
 {
@@ -93,24 +74,6 @@ in
         example = "/var/run/redis.sock";
       };
 
-      unixSocketPerm = mkOption {
-        default = null;
-        description = "Permissions for the socket";
-      };
-
-      timeout = mkOption {
-        default = 0;
-        description = "Close the connection after a client is idle for N seconds (0 to disable)";
-        type = with types; int;
-      };
-
-      tcpKeepAlive = mkOption {
-        default = 0;
-        description = "If non-zero, use SO_KEEPALIVE to send TCP ACKs to clients in absence of communication.";
-        example = 60;
-        type = with types; int;
-      };
-
       logLevel = mkOption {
         default = "notice"; # debug, verbose, notice, warning
         example = "debug";
@@ -137,23 +100,6 @@ in
         example = [ [900 1] [300 10] [60 10000] ];
       };
 
-      stopWritesOnBgSaveError = mkOption {
-        default = true;
-        description = "This will make the user aware (in an hard way) that data is not persisting on disk properly, otherwise chances are that no one will notice and some disaster will happen.";
-      };
-
-      rdbCompression = mkOption {
-        default = true;
-        description = "Compress string objects using LZF when dump .rdb databases";
-        type = with types; bool;
-      };
-
-      rdbChecksum = mkOption {
-        default = true;
-        description = "This makes the format more resistant to corruption but there is a performance hit to pay (around 10%) when saving and loading RDB files";
-        type = with types; bool;
-      };
-
       dbFilename = mkOption {
         default = "dump.rdb";
         description = "The filename where to dump the DB";
@@ -179,71 +125,12 @@ in
         process, otherwise the master will refuse the slave request.'';
       };
 
-      slaveServeStaleData = mkOption {
-        default = true;
-        description = "Whether or not to serve data (as a slave) when data is still (not yet in sync)";
-        type = with types; bool;
-      };
-
-      slaveReadOnly = mkOption {
-        default = true;
-        description = "Configure whether this slave instance should accept writes or not";
-        type = with types; bool;
-      };
-
-      replPingSlavePeriod = mkOption {
-        default = 10;
-        description = "Slaves send PINGs to server in a predefined interval, configure the number of seconds that this PING should occur.";
-        type = with types; int;
-      };
-
-      replTimeout = mkOption {
-        default = 60;
-        description = "Sets a timeout for both Bulk transfer I/O timeout and master data or ping response timeout";
-        type = with types; int;
-      };
-
-      replDisableTcpNodelay = mkOption {
-        default = false;
-        description = "Disable TCP_NODELAY on the slave socket after SYNC";
-        type = with types; bool;
-      };
-
-      slavePriority = mkOption {
-        default = 100;
-        description = "Priority to be promoted to new master by Redis sentinel";
-        type = with types; int;
-      };
-
       requirePass = mkOption {
         default = null;
         description = "Password for database";
         example = "letmein!";
       };
 
-      renameCommand = mkOption {
-        default = {}; # oldname = newname
-        description = "Attribute set to rename commands e.g. for security reasons.";
-        example = { config = "123haefhahefconfig"; };
-      };
-
-      maxClients = mkOption {
-        default = 10000;
-        description = "Maximum number of concurrent clients.";
-        type = with types; int;
-      };
-
-      maxMemory = mkOption {
-        default = null; # in bytes
-        description = "Maximum number of bytes of memory to use";
-      };
-
-      maxMemoryPolicy = mkOption {
-        default = "volatile-lru";
-        description = "Policy to handle running out of memory, options: allkeys-lru, volatile-random, allkeys-random, volatile-ttl, noeviction";
-        type = with types; string;
-      };
-
       appendOnly = mkOption {
         default = false;
         description = "By default data is only periodically persisted to disk, enable this option to use an append-only file for improved persistence.";
@@ -262,30 +149,6 @@ in
         type = with types; string;
       };
 
-      noAppendFsyncOnRewrite = mkOption {
-        default = false;
-        description = "Do not allow fsyncing of append-only log during rewrites";
-        type = with types; bool;
-      };
-
-      autoAofRewritePercentage = mkOption {
-        default = 100;
-        description = "Automatically rewrite (= reduce size) of append-only file when file grows with this percentage.";
-        type = with types; int;
-      };
-
-      autoAofRewriteMinSize = mkOption {
-        default = "64mb";
-        description = "Minimal size to start rewriting.";
-        type = with types; string;
-      };
-
-      luaTimeLimit = mkOption {
-        default = 5000;
-        description = "Maximum execution time for Lua scripts in milliseconds";
-        type = with types; int;
-      };
-
       slowLogLogSlowerThan = mkOption {
         default = 10000;
         description = "Log queries whose execution take longer than X in milliseconds";
@@ -298,6 +161,12 @@ in
         description = "Maximum number of items to keep in slow log";
         type = with types; int;
       };
+
+      extraConfig = mkOption {
+        default = "";
+        description = "Extra configuration options for redis.conf";
+        type = with types; string;
+      };
     };
 
   };
-- 
GitLab


From 2fe2be3bd2dc4c0b9d251df4427df05e5c3302a6 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 18 Jun 2013 09:34:30 +0200
Subject: [PATCH 4674/5331] Manual: charon -> nixops

---
 doc/manual/options-to-docbook.xsl | 44 +++++++++++++++----------------
 1 file changed, 22 insertions(+), 22 deletions(-)

diff --git a/doc/manual/options-to-docbook.xsl b/doc/manual/options-to-docbook.xsl
index 0584081fef1..adc6c93c722 100644
--- a/doc/manual/options-to-docbook.xsl
+++ b/doc/manual/options-to-docbook.xsl
@@ -12,7 +12,7 @@
 
   <xsl:param name="revision" />
 
-  
+
   <xsl:template match="/expr/list">
 
       <variablelist>
@@ -24,7 +24,7 @@
                <option>
                  <xsl:for-each select="attr[@name = 'name']/string">
                    <xsl:value-of select="@value" />
-		   <xsl:if test="position() != last()">.</xsl:if>
+                   <xsl:if test="position() != last()">.</xsl:if>
                  </xsl:for-each>
                </option>
              </term>
@@ -52,7 +52,7 @@
                </para>
 
                <xsl:if test="attr[@name = 'example']">
-                 
+
                  <para>
                    <emphasis>Example:</emphasis>
                    <xsl:text> </xsl:text>
@@ -82,7 +82,7 @@
                  </para>
                  <xsl:apply-templates select="attr[@name = 'definitions']" />
                </xsl:if>
-               
+
              </listitem>
 
           </varlistentry>
@@ -98,23 +98,23 @@
     <!-- !!! escaping -->
     <xsl:text>"</xsl:text><xsl:value-of select="str:replace(str:replace(str:replace(@value, '\', '\\'), '&quot;', '\&quot;'), '&#010;', '\n')" /><xsl:text>"</xsl:text>
   </xsl:template>
-  
-  
+
+
   <xsl:template match="int">
     <xsl:value-of select="@value" />
   </xsl:template>
-  
-  
+
+
   <xsl:template match="bool[@value = 'true']">
     <xsl:text>true</xsl:text>
   </xsl:template>
-  
-  
+
+
   <xsl:template match="bool[@value = 'false']">
     <xsl:text>false</xsl:text>
   </xsl:template>
-  
-  
+
+
   <xsl:template match="list">
     [
     <xsl:for-each select="*">
@@ -123,8 +123,8 @@
     </xsl:for-each>
     ]
   </xsl:template>
-  
-  
+
+
   <xsl:template match="attrs">
     {
     <xsl:for-each select="attr">
@@ -134,8 +134,8 @@
     </xsl:for-each>
     }
   </xsl:template>
-  
-  
+
+
   <xsl:template match="derivation">
     <xsl:choose>
       <xsl:when test="attr[@name = 'url']/string/@value">
@@ -158,8 +158,8 @@
             <xsl:when test="$revision != 'local' and contains(@value, '/modules/')">
               <xsl:attribute name="xlink:href">https://github.com/NixOS/nixos/blob/<xsl:value-of select="$revision"/>/modules/<xsl:value-of select="substring-after(@value, '/modules/')"/></xsl:attribute>
             </xsl:when>
-            <xsl:when test="$revision != 'local' and contains(@value, 'charon') and contains(@value, '/nix/')">
-              <xsl:attribute name="xlink:href">https://github.com/NixOS/charon/blob/<xsl:value-of select="$revision"/>/nix/<xsl:value-of select="substring-after(@value, '/nix/')"/></xsl:attribute>
+            <xsl:when test="$revision != 'local' and contains(@value, 'nixops') and contains(@value, '/nix/')">
+              <xsl:attribute name="xlink:href">https://github.com/NixOS/nixops/blob/<xsl:value-of select="$revision"/>/nix/<xsl:value-of select="substring-after(@value, '/nix/')"/></xsl:attribute>
             </xsl:when>
             <xsl:otherwise>
               <xsl:attribute name="xlink:href">file://<xsl:value-of select="@value"/></xsl:attribute>
@@ -172,8 +172,8 @@
             <xsl:when test="contains(@value, '/modules/')">
               &lt;nixos/modules/<xsl:value-of select="substring-after(@value, '/modules/')"/>&gt;
             </xsl:when>
-            <xsl:when test="contains(@value, 'charon') and contains(@value, '/nix/')">
-              &lt;charon/<xsl:value-of select="substring-after(@value, '/nix/')"/>&gt;
+            <xsl:when test="contains(@value, 'nixops') and contains(@value, '/nix/')">
+              &lt;nixops/<xsl:value-of select="substring-after(@value, '/nix/')"/>&gt;
             </xsl:when>
             <xsl:otherwise>
               <xsl:value-of select="@value" />
@@ -182,6 +182,6 @@
         </filename></member>
       </xsl:for-each>
     </simplelist>
-  </xsl:template>  
-  
+  </xsl:template>
+
 </xsl:stylesheet>
-- 
GitLab


From 0f6e9ba946d13bdfa3abb51ebc21978121530dea Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 19 Jun 2013 13:56:05 +0200
Subject: [PATCH 4675/5331] Unconditionally add ~/bin to $PATH

---
 modules/programs/bash/profile.sh | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/modules/programs/bash/profile.sh b/modules/programs/bash/profile.sh
index 5393a88d5ff..6bcd5cd87cd 100644
--- a/modules/programs/bash/profile.sh
+++ b/modules/programs/bash/profile.sh
@@ -65,9 +65,7 @@ export ASPELL_CONF="dict-dir $HOME/.nix-profile/lib/aspell"
 export PATH=@wrapperDir@:$PATH
 
 # ~/bin if it exists overrides other bin directories.
-if [ -d $HOME/bin ]; then
-    export PATH=$HOME/bin:$PATH
-fi
+export PATH=$HOME/bin:$PATH
 
 # Set up the per-user profile.
 mkdir -m 0755 -p $NIX_USER_PROFILE_DIR
-- 
GitLab


From aa548ef803a72356a66b1dfdafe78c9446ea50bd Mon Sep 17 00:00:00 2001
From: Jaka Hudoklin <jakahudoklin@gmail.com>
Date: Sun, 16 Jun 2013 16:20:22 +0000
Subject: [PATCH 4676/5331] Add cgminer crypto currency miner

---
 modules/module-list.nix           |   1 +
 modules/services/misc/cgminer.nix | 137 ++++++++++++++++++++++++++++++
 2 files changed, 138 insertions(+)
 create mode 100644 modules/services/misc/cgminer.nix

diff --git a/modules/module-list.nix b/modules/module-list.nix
index 93a868f5f0d..6da86c0c669 100644
--- a/modules/module-list.nix
+++ b/modules/module-list.nix
@@ -99,6 +99,7 @@
   ./services/mail/postfix.nix
   ./services/mail/spamassassin.nix
   ./services/misc/autofs.nix
+  ./services/misc/cgminer.nix
   ./services/misc/disnix.nix
   ./services/misc/felix.nix
   ./services/misc/folding-at-home.nix
diff --git a/modules/services/misc/cgminer.nix b/modules/services/misc/cgminer.nix
new file mode 100644
index 00000000000..a6e4ce89bde
--- /dev/null
+++ b/modules/services/misc/cgminer.nix
@@ -0,0 +1,137 @@
+{ config, pkgs, ... }:
+
+with pkgs.lib;
+
+let
+  cfg = config.services.cgminer;
+
+  convType = with builtins;
+    v: if isBool v then (if v then "true" else "false") else toString v;
+  mergedHwConfig =
+    mapAttrsToList (n: v: ''"${n}": "${(concatStringsSep "," (map convType v))}"'')
+      (foldAttrs (n: a: [n] ++ a) [] cfg.hardware);
+  mergedConfig = with builtins;
+    mapAttrsToList (n: v: ''"${n}":  ${if isBool v then "" else ''"''}${convType v}${if isBool v then "" else ''"''}'')
+      cfg.config;
+
+  cgminerConfig = pkgs.writeText "cgminer.conf" ''
+  {
+  ${concatStringsSep ",\n" mergedHwConfig},
+  ${concatStringsSep ",\n" mergedConfig},
+  "pools": [
+  ${concatStringsSep ",\n"
+    (map (v: ''{"url": "${v.url}", "user": "${v.user}", "pass": "${v.pass}"}'')
+          cfg.pools)}]
+  }
+  '';
+in
+{
+  ###### interface
+  options = {
+
+    services.cgminer = {
+
+      enable = mkOption {
+        default = false;
+        description = "Whether to enable the cgminer.";
+      };
+
+      package = mkOption {
+        default = pkgs.cgminer;
+        description = "Which cgminer derivation to use.";
+      };
+
+      user = mkOption {
+        default = "cgminer";
+        description = "User account under which cgminer runs";
+      };
+
+      pools = mkOption {
+        default = [];  # Run benchmark
+        description = "List of pools where to mine";
+        example = [{
+          url = "http://p2pool.org:9332";
+          username = "17EUZxTvs9uRmPsjPZSYUU3zCz9iwstudk";
+          password="X";
+        }];
+      };
+
+      hardware = mkOption {
+        default = []; # Run without options
+        description= "List of config options for every GPU";
+        example = [
+        {
+          intensity = 9;
+          gpu-engine = "0-985";
+          gpu-fan = "0-85";
+          gpu-memclock = 860;
+          gpu-powertune = 20;
+          temp-cutoff = 95;
+          temp-overheat = 85;
+          temp-target = 75;
+        }
+        {
+          intensity = 9;
+          gpu-engine = "0-950";
+          gpu-fan = "0-85";
+          gpu-memclock = 825;
+          gpu-powertune = 20;
+          temp-cutoff = 95;
+          temp-overheat = 85;
+          temp-target = 75;
+        }];
+      };
+
+      config = mkOption {
+        default = {};
+        description = "Additional config";
+        example = {
+          auto-fan = true;
+          auto-gpu = true;
+          expiry = 120;
+          failover-only = true;
+          gpu-threads = 2;
+          log = 5;
+          queue = 1;
+          scan-time = 60;
+          temp-histeresys = 3;
+        };
+      };
+    };
+  };
+
+
+  ###### implementation
+
+  config = mkIf config.services.cgminer.enable {
+
+    users.extraUsers = singleton
+      { name = cfg.user;
+        description = "Cgminer user";
+      };
+
+    environment.systemPackages = [ cfg.package ];
+
+    systemd.services.cgminer = {
+      path = [ pkgs.cgminer ];
+
+      after = [ "display-manager.target" "network.target" ];
+      wantedBy = [ "multi-user.target" ];
+
+      environment = { 
+        LD_LIBRARY_PATH = ''/run/opengl-driver/lib:/run/opengl-driver-32/lib'';
+        DISPLAY = ":0";
+        GPU_MAX_ALLOC_PERCENT = "100";
+        GPU_USE_SYNC_OBJECTS = "1";
+      };
+
+      serviceConfig = {
+        ExecStart = "${pkgs.cgminer}/bin/cgminer -T -c ${cgminerConfig}";
+        User = cfg.user;
+        RestartSec = 10;
+      };
+    };
+
+  };
+
+}
-- 
GitLab


From 7810f7f61afb73b042bf78dd490a3c5edff7dd53 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 20 Jun 2013 19:39:09 +0200
Subject: [PATCH 4677/5331] Build unit files locally

---
 modules/system/boot/systemd.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/system/boot/systemd.nix b/modules/system/boot/systemd.nix
index 11c2cfc6ace..e055296c951 100644
--- a/modules/system/boot/systemd.nix
+++ b/modules/system/boot/systemd.nix
@@ -11,7 +11,7 @@ let
   systemd = cfg.package;
 
   makeUnit = name: unit:
-    pkgs.runCommand "unit" { inherit (unit) text; }
+    pkgs.runCommand "unit" { inherit (unit) text; preferLocalBuild = true; }
       (if unit.enable then  ''
         mkdir -p $out
         echo -n "$text" > $out/${name}
-- 
GitLab


From fde8e002ce3470e58a10518098fa930f5d7f4bdf Mon Sep 17 00:00:00 2001
From: Domen Kozar <domen@dev.si>
Date: Sun, 23 Jun 2013 13:13:03 +0200
Subject: [PATCH 4678/5331] tests.xfce: attempt to fix terminal command

---
 tests/xfce.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/xfce.nix b/tests/xfce.nix
index ce9f0c6b7f1..706456143fb 100644
--- a/tests/xfce.nix
+++ b/tests/xfce.nix
@@ -23,7 +23,7 @@
       # Check that logging in has given the user ownership of devices.
       $machine->succeed("getfacl /dev/snd/timer | grep -q alice");
 
-      $machine->succeed("su - alice -c 'DISPLAY=:0.0 Terminal &'");
+      $machine->succeed("su - alice -c 'DISPLAY=:0.0 xfce4-terminal &'");
       $machine->waitForWindow(qr/Terminal/);
       $machine->sleep(10);
       $machine->screenshot("screen");
-- 
GitLab


From c7f61ee921f648b87a1dc3db57cdaf8507c2ba28 Mon Sep 17 00:00:00 2001
From: Oliver Charles <ollie@ocharles.org.uk>
Date: Mon, 10 Jun 2013 21:45:24 +0100
Subject: [PATCH 4679/5331] memcached: Add NixOS support

---
 modules/module-list.nix                  |  1 +
 modules/services/databases/memcached.nix | 61 ++++++++++++++++++++++++
 2 files changed, 62 insertions(+)
 create mode 100644 modules/services/databases/memcached.nix

diff --git a/modules/module-list.nix b/modules/module-list.nix
index 6da86c0c669..651eed4071f 100644
--- a/modules/module-list.nix
+++ b/modules/module-list.nix
@@ -69,6 +69,7 @@
   ./services/backup/sitecopy-backup.nix
   ./services/databases/4store-endpoint.nix
   ./services/databases/4store.nix
+  ./services/databases/memcached.nix
   ./services/databases/mongodb.nix
   ./services/databases/mysql.nix
   ./services/databases/mysql55.nix
diff --git a/modules/services/databases/memcached.nix b/modules/services/databases/memcached.nix
new file mode 100644
index 00000000000..f5f6be68f7f
--- /dev/null
+++ b/modules/services/databases/memcached.nix
@@ -0,0 +1,61 @@
+{ config, pkgs, ... }:
+
+with pkgs.lib;
+
+let
+
+  cfg = config.services.memcached;
+
+  memcached = pkgs.memcached;
+
+in
+
+{
+
+  ###### interface
+
+  options = {
+
+    services.memcached = {
+
+      enable = mkOption {
+        default = false;
+        description = "
+          Whether to enable Memcached.
+        ";
+      };
+
+      user = mkOption {
+        default = "memcached";
+        description = "The user to run Memcached as";
+      };
+
+    };
+
+  };
+
+  ###### implementation
+
+  config = mkIf config.services.memcached.enable {
+
+    users.extraUsers = singleton
+      { name = cfg.user;
+        description = "Memcached server user";
+      };
+
+    environment.systemPackages = [ memcached ];
+
+    systemd.services.memcached =
+      { description = "Memcached server";
+
+        wantedBy = [ "multi-user.target" ];
+        after = [ "network.target" ];
+
+        serviceConfig = {
+          ExecStart = "${memcached}/bin/memcached";
+          User = cfg.user;
+        };
+      };
+  };
+
+}
-- 
GitLab


From df6312e2cb842bbe1c612b33bac25f6c562e90cc Mon Sep 17 00:00:00 2001
From: Oliver Charles <ollie@ocharles.org.uk>
Date: Sun, 23 Jun 2013 19:07:41 +0100
Subject: [PATCH 4680/5331] memcached: Add more options and extraOptions
 support

---
 modules/services/databases/memcached.nix | 38 +++++++++++++++++++++++-
 1 file changed, 37 insertions(+), 1 deletion(-)

diff --git a/modules/services/databases/memcached.nix b/modules/services/databases/memcached.nix
index f5f6be68f7f..a0e264f2299 100644
--- a/modules/services/databases/memcached.nix
+++ b/modules/services/databases/memcached.nix
@@ -30,6 +30,36 @@ in
         description = "The user to run Memcached as";
       };
 
+      listen = mkOption {
+        default = "127.0.0.1";
+        description = "The IP address to bind to";
+      };
+
+      port = mkOption {
+        default = 11211;
+        description = "The port to bind to";
+      };
+
+      socket = mkOption {
+        default = "";
+        description = "Unix socket path to listen on. Setting this will disable network support";
+        example = "/var/run/memcached";
+      };
+
+      maxMemory = mkOption {
+        default = 64;
+        description = "The maximum amount of memory to use for storage, in megabytes.";
+      };
+
+      maxConnections = mkOption {
+        default = 1024;
+        description = "The maximum number of simultaneous connections";
+      };
+
+      extraOptions = mkOption {
+        default = [];
+        description = "A list of extra options that will be added as a suffix when running memcached";
+      };
     };
 
   };
@@ -52,7 +82,13 @@ in
         after = [ "network.target" ];
 
         serviceConfig = {
-          ExecStart = "${memcached}/bin/memcached";
+          ExecStart =
+            let
+              networking = if cfg.socket != ""
+                then "-s ${cfg.socket}"
+                else "-l ${cfg.listen} -p ${toString cfg.port}";
+            in "${memcached}/bin/memcached ${networking} -m ${toString cfg.maxMemory} -c ${toString cfg.maxConnections} ${concatStringsSep " " cfg.extraOptions}";
+
           User = cfg.user;
         };
       };
-- 
GitLab


From ed6137109d5554e832cc536e377a51daf1c14657 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Tue, 25 Jun 2013 10:46:23 -0400
Subject: [PATCH 4681/5331] Fix filesystem initialization systemd units

Signed-off-by: Shea Levy <shea@shealevy.com>
---
 modules/tasks/filesystems.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/tasks/filesystems.nix b/modules/tasks/filesystems.nix
index cc7f1f40742..4ca309f5a10 100644
--- a/modules/tasks/filesystems.nix
+++ b/modules/tasks/filesystems.nix
@@ -191,7 +191,7 @@ in
           { description = "Initialisation of Filesystem ${fs.device}";
             wantedBy = [ "${mountPoint'}.mount" ];
             before = [ "${mountPoint'}.mount" "systemd-fsck@${device'}.service" ];
-            require = [ "${device'}.device" ];
+            requires = [ "${device'}.device" ];
             after = [ "${device'}.device" ];
             path = [ pkgs.utillinux ] ++ config.system.fsPackages;
             script =
-- 
GitLab


From 85d5366c1078774db9ac898422408694dd3756a3 Mon Sep 17 00:00:00 2001
From: Domen Kozar <domen@dev.si>
Date: Wed, 26 Jun 2013 22:13:57 +0200
Subject: [PATCH 4682/5331] synergy: port to systemd and add autoStart option

---
 modules/services/misc/synergy.nix | 58 +++++++++++++------------------
 1 file changed, 24 insertions(+), 34 deletions(-)

diff --git a/modules/services/misc/synergy.nix b/modules/services/misc/synergy.nix
index 667d0c6de97..a894c68112e 100644
--- a/modules/services/misc/synergy.nix
+++ b/modules/services/misc/synergy.nix
@@ -39,6 +39,11 @@ in
             port overrides the default port, 24800.
           ";
         };
+        autoStart = mkOption {
+          default = true;
+          type = types.bool;
+          description = "Whether synergy-client should be started automatically.";
+        };
       };
 
       server = {
@@ -65,6 +70,11 @@ in
           default = "";
           description = "listen for clients on the given address";
         };
+        autoStart = mkOption {
+          default = true;
+          type = types.bool;
+          description = "Whether synergy-server should be started automatically.";
+        };
       };
     };
 
@@ -75,41 +85,21 @@ in
 
   config = {
 
-    jobs =
-
-      optionalAttrs cfgC.enable
-        { synergyClient =
-          { name = "synergy-client";
-
-            description = "Synergy client";
-
-            startOn = "started network-interfaces";
-            stopOn = "stopping network-interfaces";
-
-            exec = ''${pkgs.synergy}/bin/synergyc \
-              -f ${if cfgC.screenName == "" then "" else "-n ${cfgC.screenName}"} \
-              ${cfgC.serverAddress}
-            '';
-          };
-        }
-
-      // optionalAttrs cfgS.enable
-        { synergyServer =
-          { name = "synergy-server";
-
-            description = "Synergy server";
-
-            startOn = "started network-interfaces";
-            stopOn = "stopping network-interfaces";
+    systemd.services."synergy-client" = mkIf cfgC.enable {
+      after = [ "network.target" ];
+      description = "Synergy client";
+      wantedBy = optional cfgC.autoStart "multi-user.target";
+      path = [ pkgs.synergy ];
+      serviceConfig.ExecStart = ''${pkgs.synergy}/bin/synergyc -f ${optionalString (cfgC.screenName != "") "-n ${cfgC.screenName}"} ${cfgC.serverAddress}'';
+    };
 
-            exec =
-              ''
-                ${pkgs.synergy}/bin/synergys -c ${cfgS.configFile} \
-                  -f ${if cfgS.address == "" then "" else "-a ${cfgS.address}"} \
-                  ${if cfgS.screenName == "" then "" else "-n ${cfgS.screenName}" }
-              '';
-          };
-        };
+    systemd.services."synergy-server" = mkIf cfgS.enable {
+      after = [ "network.target" ];
+      description = "Synergy server";
+      wantedBy = optional cfgS.autoStart "multi-user.target";
+      path = [ pkgs.synergy ];
+      serviceConfig.ExecStart = ''${pkgs.synergy}/bin/synergys -c ${cfgS.configFile} -f ${optionalString (cfgS.address != "") "-a ${cfgS.address}"} ${optionalString (cfgS.screenName != "") "-n ${cfgS.screenName}" }'';
+    };
 
   };
 
-- 
GitLab


From 0cbf0605d2faddba69ff8f897f574680992fd388 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 27 Jun 2013 13:12:45 +0200
Subject: [PATCH 4683/5331] Refactoring: Split fonts.nix into smaller modules

---
 modules/config/fonts.nix             | 179 ---------------------------
 modules/config/fonts/corefonts.nix   |  32 +++++
 modules/config/fonts/fontconfig.nix  |  45 +++++++
 modules/config/fonts/fontdir.nix     |  75 +++++++++++
 modules/config/fonts/fonts.nix       |  49 ++++++++
 modules/config/fonts/ghostscript.nix |  32 +++++
 modules/module-list.nix              |   7 +-
 7 files changed, 239 insertions(+), 180 deletions(-)
 delete mode 100644 modules/config/fonts.nix
 create mode 100644 modules/config/fonts/corefonts.nix
 create mode 100644 modules/config/fonts/fontconfig.nix
 create mode 100644 modules/config/fonts/fontdir.nix
 create mode 100644 modules/config/fonts/fonts.nix
 create mode 100644 modules/config/fonts/ghostscript.nix

diff --git a/modules/config/fonts.nix b/modules/config/fonts.nix
deleted file mode 100644
index 3516ed75ab6..00000000000
--- a/modules/config/fonts.nix
+++ /dev/null
@@ -1,179 +0,0 @@
-{ config, pkgs, ... }:
-
-with pkgs.lib;
-
-###### interface
-
-let
-
-  options = {
-
-    fonts = {
-
-      enableFontConfig = mkOption { # !!! should be enableFontconfig
-        default = true;
-        description = "
-          If enabled, a Fontconfig configuration file will be built
-          pointing to a set of default fonts.  If you don't care about
-          running X11 applications or any other program that uses
-          Fontconfig, you can turn this option off and prevent a
-          dependency on all those fonts.
-        ";
-      };
-
-      # Should be moved elsewhere.
-      enableGhostscriptFonts = mkOption {
-        default = false;
-        description = "
-          Whether to add the fonts provided by Ghostscript (such as
-          various URW fonts and the ``Base-14'' Postscript fonts) to the
-          list of system fonts, making them available to X11
-          applications.
-        ";
-      };
-
-      enableFontDir = mkOption {
-        default = false;
-        description = "
-          Whether to create a directory with links to all fonts in share -
-          so user can configure vncserver script one time (I mean per-user
-          vncserver, so global service is not a good solution).
-        ";
-      };
-
-      # TODO: find another name for it.
-      fonts = mkOption {
-        default = [
-          # - the user's .fonts directory
-          "~/.fonts"
-          # - the user's current profile
-          "~/.nix-profile/lib/X11/fonts"
-          "~/.nix-profile/share/fonts"
-          # - the default profile
-          "/nix/var/nix/profiles/default/lib/X11/fonts"
-          "/nix/var/nix/profiles/default/share/fonts"
-        ];
-        description = "
-          List of primary font paths.
-        ";
-        apply = list: list ++ [
-          # - a few statically built locations
-          pkgs.xorg.fontbhttf
-          pkgs.xorg.fontbhlucidatypewriter100dpi
-          pkgs.xorg.fontbhlucidatypewriter75dpi
-          pkgs.ttf_bitstream_vera
-          pkgs.freefont_ttf
-          pkgs.liberation_ttf
-          pkgs.xorg.fontbh100dpi
-          pkgs.xorg.fontmiscmisc
-          pkgs.xorg.fontcursormisc
-        ]
-        ++ optional config.fonts.enableCoreFonts pkgs.corefonts
-        ++ optional config.fonts.enableGhostscriptFonts "${pkgs.ghostscript}/share/ghostscript/fonts"
-        ++ config.fonts.extraFonts;
-      };
-
-      extraFonts = mkOption {
-        default = [];
-        example = [ pkgs.dejavu_fonts ];
-        description = ''
-          List of packages with additional fonts.
-        '';
-      };
-
-      enableCoreFonts = mkOption {
-        default = false;
-        description = ''
-          Whether to include Microsoft's proprietary Core Fonts.  These fonts
-          are redistributable, but only verbatim, among other restrictions.
-          See <link xlink:href="http://corefonts.sourceforge.net/eula.htm"/>
-          for details.
-       '';
-      };
-
-    };
-
-  };
-in
-
-###### implementation
-let
-  inherit (pkgs) builderDefs;
-  inherit (pkgs.xorg) mkfontdir mkfontscale fontalias;
-
-  fontDirs = config.fonts.fonts;
-
-
-  localDefs = with builderDefs; builderDefs.passthru.function rec {
-    src = "";/* put a fetchurl here */
-
-    buildInputs = [mkfontdir mkfontscale];
-    configureFlags = [];
-    inherit fontDirs;
-    installPhase = fullDepEntry ("
-    list='';
-    for i in ${toString fontDirs} ; do
-      if [ -d \$i/ ]; then
-        list=\"\$list \$i\";
-      fi;
-    done
-    list=\$(find \$list -name fonts.dir -o -name '*.ttf' -o -name '*.otf');
-    fontDirs='';
-    for i in \$list ; do
-      fontDirs=\"\$fontDirs \$(dirname \$i)\";
-    done;
-    mkdir -p \$out/share/X11-fonts/;
-    find \$fontDirs -type f -o -type l | while read i; do
-      j=\"\${i##*/}\"
-      if ! test -e \"\$out/share/X11-fonts/\${j}\"; then
-        ln -s \"\$i\" \"\$out/share/X11-fonts/\${j}\";
-      fi;
-    done;
-    cd \$out/share/X11-fonts/
-    rm fonts.dir
-    rm fonts.scale
-    rm fonts.alias
-    mkfontdir
-    mkfontscale
-    cat \$( find ${fontalias}/ -name fonts.alias) >fonts.alias
-  ") ["minInit" "addInputs"];
-  };
-
-  x11Fonts = with localDefs; stdenv.mkDerivation rec {
-    name = "X11-fonts";
-    builder = writeScript (name + "-builder")
-      (textClosure localDefs
-        [installPhase doForceShare doPropagate]);
-    meta = {
-      description = "
-        Directory to contain all X11 fonts requested.
-      ";
-    };
-  };
-
-in
-
-{
-  require = [options];
-
-  system.build.x11Fonts = x11Fonts;
-
-  environment.etc = mkIf config.fonts.enableFontConfig
-    [ { # Configuration file for fontconfig used to locate
-        # (X11) client-rendered fonts.
-        source = pkgs.makeFontsConf {
-          fontDirectories = config.fonts.fonts;
-        };
-        target = "fonts/fonts.conf";
-      }
-    ];
-
-  environment.shellInit =
-    ''
-      export FONTCONFIG_FILE=/etc/fonts/fonts.conf
-    '';
-
-  environment.systemPackages =
-    optional config.fonts.enableFontDir config.system.build.x11Fonts ++
-    optional config.fonts.enableFontConfig pkgs.fontconfig;
-}
diff --git a/modules/config/fonts/corefonts.nix b/modules/config/fonts/corefonts.nix
new file mode 100644
index 00000000000..7de95200cfa
--- /dev/null
+++ b/modules/config/fonts/corefonts.nix
@@ -0,0 +1,32 @@
+{ config, pkgs, ... }:
+
+with pkgs.lib;
+
+{
+
+  options = {
+
+    fonts = {
+
+      enableCoreFonts = mkOption {
+        default = false;
+        description = ''
+          Whether to include Microsoft's proprietary Core Fonts.  These fonts
+          are redistributable, but only verbatim, among other restrictions.
+          See <link xlink:href="http://corefonts.sourceforge.net/eula.htm"/>
+          for details.
+       '';
+      };
+
+    };
+
+  };
+
+
+  config = mkIf config.fonts.enableCoreFonts {
+
+    fonts.extraFonts = [ pkgs.corefonts ];
+
+  };
+
+}
diff --git a/modules/config/fonts/fontconfig.nix b/modules/config/fonts/fontconfig.nix
new file mode 100644
index 00000000000..ce3ffdffdc9
--- /dev/null
+++ b/modules/config/fonts/fontconfig.nix
@@ -0,0 +1,45 @@
+{ config, pkgs, ... }:
+
+with pkgs.lib;
+
+{
+
+  options = {
+
+    fonts = {
+
+      enableFontConfig = mkOption { # !!! should be enableFontconfig
+        default = true;
+        description = ''
+          If enabled, a Fontconfig configuration file will be built
+          pointing to a set of default fonts.  If you don't care about
+          running X11 applications or any other program that uses
+          Fontconfig, you can turn this option off and prevent a
+          dependency on all those fonts.
+        '';
+      };
+
+    };
+
+  };
+
+
+  config = mkIf config.fonts.enableFontConfig {
+
+    # Bring in the default (upstream) fontconfig configuration.
+    environment.etc."fonts/fonts.conf".source =
+      pkgs.makeFontsConf { fontDirectories = config.fonts.fonts; };
+
+    environment.shellInit =
+      ''
+        # FIXME: This variable is no longer needed, but we'll keep it
+        # around for a while for applications linked against old
+        # fontconfig builds.
+        export FONTCONFIG_FILE=/etc/fonts/fonts.conf
+      '';
+
+    environment.systemPackages = [ pkgs.fontconfig ];
+
+  };
+
+}
diff --git a/modules/config/fonts/fontdir.nix b/modules/config/fonts/fontdir.nix
new file mode 100644
index 00000000000..a4f69809b2a
--- /dev/null
+++ b/modules/config/fonts/fontdir.nix
@@ -0,0 +1,75 @@
+{ config, pkgs, ... }:
+
+with pkgs.lib;
+
+let
+
+  fontDirs = config.fonts.fonts;
+
+  localDefs = with pkgs.builderDefs; pkgs.builderDefs.passthru.function rec {
+    src = "";/* put a fetchurl here */
+    buildInputs = [pkgs.xorg.mkfontdir pkgs.xorg.mkfontscale];
+    inherit fontDirs;
+    installPhase = fullDepEntry ("
+    list='';
+    for i in ${toString fontDirs} ; do
+      if [ -d \$i/ ]; then
+        list=\"\$list \$i\";
+      fi;
+    done
+    list=\$(find \$list -name fonts.dir -o -name '*.ttf' -o -name '*.otf');
+    fontDirs='';
+    for i in \$list ; do
+      fontDirs=\"\$fontDirs \$(dirname \$i)\";
+    done;
+    mkdir -p \$out/share/X11-fonts/;
+    find \$fontDirs -type f -o -type l | while read i; do
+      j=\"\${i##*/}\"
+      if ! test -e \"\$out/share/X11-fonts/\${j}\"; then
+        ln -s \"\$i\" \"\$out/share/X11-fonts/\${j}\";
+      fi;
+    done;
+    cd \$out/share/X11-fonts/
+    rm fonts.dir
+    rm fonts.scale
+    rm fonts.alias
+    mkfontdir
+    mkfontscale
+    cat \$( find ${pkgs.xorg.fontalias}/ -name fonts.alias) >fonts.alias
+  ") ["minInit" "addInputs"];
+  };
+
+  x11Fonts = with localDefs; stdenv.mkDerivation rec {
+    name = "X11-fonts";
+    builder = writeScript (name + "-builder")
+      (textClosure localDefs
+        [installPhase doForceShare doPropagate]);
+  };
+
+in
+
+{
+
+  options = {
+
+    fonts = {
+
+      enableFontDir = mkOption {
+        default = false;
+        description = ''
+          Whether to create a directory with links to all fonts in
+          <filename>/run/current-system/sw/share/X11-fonts</filename>.
+        '';
+      };
+
+    };
+
+  };
+
+  config = mkIf config.fonts.enableFontDir {
+
+    environment.systemPackages = [ x11Fonts ];
+
+  };
+
+}
diff --git a/modules/config/fonts/fonts.nix b/modules/config/fonts/fonts.nix
new file mode 100644
index 00000000000..f43784f6d03
--- /dev/null
+++ b/modules/config/fonts/fonts.nix
@@ -0,0 +1,49 @@
+{ config, pkgs, ... }:
+
+with pkgs.lib;
+
+{
+
+  options = {
+
+    fonts = {
+
+      # TODO: find another name for it.
+      fonts = mkOption {
+        default = [
+          # - the user's .fonts directory
+          "~/.fonts"
+          # - the user's current profile
+          "~/.nix-profile/lib/X11/fonts"
+          "~/.nix-profile/share/fonts"
+          # - the default profile
+          "/nix/var/nix/profiles/default/lib/X11/fonts"
+          "/nix/var/nix/profiles/default/share/fonts"
+        ];
+        description = "List of primary font paths.";
+        apply = list: list ++ [
+          # - a few statically built locations
+          pkgs.xorg.fontbhttf
+          pkgs.xorg.fontbhlucidatypewriter100dpi
+          pkgs.xorg.fontbhlucidatypewriter75dpi
+          pkgs.ttf_bitstream_vera
+          pkgs.freefont_ttf
+          pkgs.liberation_ttf
+          pkgs.xorg.fontbh100dpi
+          pkgs.xorg.fontmiscmisc
+          pkgs.xorg.fontcursormisc
+        ]
+        ++ config.fonts.extraFonts;
+      };
+
+      extraFonts = mkOption {
+        default = [];
+        example = [ pkgs.dejavu_fonts ];
+        description = "List of packages with additional fonts.";
+      };
+
+    };
+
+  };
+
+}
diff --git a/modules/config/fonts/ghostscript.nix b/modules/config/fonts/ghostscript.nix
new file mode 100644
index 00000000000..9ef00396808
--- /dev/null
+++ b/modules/config/fonts/ghostscript.nix
@@ -0,0 +1,32 @@
+{ config, pkgs, ... }:
+
+with pkgs.lib;
+
+{
+
+  options = {
+
+    fonts = {
+
+      enableGhostscriptFonts = mkOption {
+        default = false;
+        description = ''
+          Whether to add the fonts provided by Ghostscript (such as
+          various URW fonts and the “Base-14” Postscript fonts) to the
+          list of system fonts, making them available to X11
+          applications.
+        '';
+      };
+
+    };
+
+  };
+
+
+  config = mkIf config.fonts.enableGhostscriptFonts {
+
+    fonts.extraFonts = [ "${pkgs.ghostscript}/share/ghostscript/fonts" ];
+
+  };
+
+}
diff --git a/modules/module-list.nix b/modules/module-list.nix
index 6da86c0c669..afc24f17c77 100644
--- a/modules/module-list.nix
+++ b/modules/module-list.nix
@@ -1,4 +1,9 @@
-[ ./config/fonts.nix
+[
+  ./config/fonts/corefonts.nix
+  ./config/fonts/fontconfig.nix
+  ./config/fonts/fontdir.nix
+  ./config/fonts/fonts.nix
+  ./config/fonts/ghostscript.nix
   ./config/gnu.nix
   ./config/i18n.nix
   ./config/krb5.nix
-- 
GitLab


From eb110fd3ce7badae2725120031e6019bfa1a6c59 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 27 Jun 2013 13:28:22 +0200
Subject: [PATCH 4684/5331] fontconfig: Set the default hinting style to
 "slight"

This works around a bug in infinality that causes broken rendering in
some cases.  Issue NixOS/nixpkgs#663.

Upstream suggests that "slight" is a better/safer default in any case.
It also looks better, IMHO, YMMV.
---
 modules/config/fonts/fontconfig.nix | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/modules/config/fonts/fontconfig.nix b/modules/config/fonts/fontconfig.nix
index ce3ffdffdc9..d0478083ed3 100644
--- a/modules/config/fonts/fontconfig.nix
+++ b/modules/config/fonts/fontconfig.nix
@@ -30,6 +30,22 @@ with pkgs.lib;
     environment.etc."fonts/fonts.conf".source =
       pkgs.makeFontsConf { fontDirectories = config.fonts.fonts; };
 
+    environment.etc."fonts/conf.d/00-nixos.conf".text =
+      ''
+        <?xml version='1.0'?>
+        <!DOCTYPE fontconfig SYSTEM 'fonts.dtd'>
+        <fontconfig>
+
+          <!-- Set the default hinting style to "slight". -->
+          <match target="font">
+            <edit mode="assign" name="hintstyle">
+              <const>hintslight</const>
+            </edit>
+          </match>
+
+        </fontconfig>
+      '';
+
     environment.shellInit =
       ''
         # FIXME: This variable is no longer needed, but we'll keep it
-- 
GitLab


From 5dd0ce8c15516757ca4c964837cd6843a78ed0a2 Mon Sep 17 00:00:00 2001
From: Sander van der Burg <svanderburg@gmail.com>
Date: Thu, 27 Jun 2013 15:32:49 +0200
Subject: [PATCH 4685/5331] Updated disnix to latest 0.3 release

---
 modules/services/misc/disnix.nix | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/modules/services/misc/disnix.nix b/modules/services/misc/disnix.nix
index c50af6fb095..6419e6f8fc7 100644
--- a/modules/services/misc/disnix.nix
+++ b/modules/services/misc/disnix.nix
@@ -7,7 +7,7 @@ let
 
   cfg = config.services.disnix;
 
-  disnix_activation_scripts = pkgs.disnix_activation_scripts.override (origArgs: {
+  dysnomia = pkgs.dysnomia.override (origArgs: {
     enableApacheWebApplication = config.services.httpd.enable;
     enableAxis2WebService = config.services.tomcat.axis2.enable;
     enableEjabberdDump = config.services.ejabberd.enable;
@@ -95,7 +95,7 @@ in
             name = "supportedtypes";
             buildCommand = ''
               ( echo -n "[ "
-                cd ${disnix_activation_scripts}/libexec/disnix/activation-scripts
+                cd ${dysnomia}/libexec/dysnomia
                 for i in *
                 do
                     echo -n "\"$i\" "
@@ -122,19 +122,19 @@ in
         
           wantedBy = [ "multi-user.target" ];
           after = [ "dbus.service" ]
-          ++ optional config.services.httpd.enable "httpd.service"
-          ++ optional config.services.mysql.enable "mysql.service"
-          ++ optional config.services.tomcat.enable "tomcat.service"
-          ++ optional config.services.svnserve.enable "svnserve.service";
+            ++ optional config.services.httpd.enable "httpd.service"
+            ++ optional config.services.mysql.enable "mysql.service"
+            ++ optional config.services.tomcat.enable "tomcat.service"
+            ++ optional config.services.svnserve.enable "svnserve.service";
 
           restartIfChanged = false;
+          
+          path = [ pkgs.nix pkgs.disnix ];
         
           script =
           ''
-            export PATH=/run/current-system/sw/bin:/run/current-system/sw/sbin
             export HOME=/root
-
-            ${pkgs.disnix}/bin/disnix-service --activation-modules-dir=${disnix_activation_scripts}/libexec/disnix/activation-scripts
+            disnix-service --dysnomia-modules-dir=${dysnomia}/libexec/dysnomia
           '';
         };
     } // optionalAttrs cfg.publishAvahi {
-- 
GitLab


From aba54edf4881a429c0a8074fe1a078b7011d52fc Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Fri, 28 Jun 2013 04:12:06 +0200
Subject: [PATCH 4686/5331] qemu-vm: Add option to create empty disk images.

This allows to add additional raw disk images to the VM, which therein are
available as /dev/vdb, /dev/vdc, /dev/vde and so on. Especially when testing
partitioning, this could be useful.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 modules/virtualisation/qemu-vm.nix | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/modules/virtualisation/qemu-vm.nix b/modules/virtualisation/qemu-vm.nix
index 0383f12b3ab..1958762fa72 100644
--- a/modules/virtualisation/qemu-vm.nix
+++ b/modules/virtualisation/qemu-vm.nix
@@ -49,6 +49,20 @@ let
           '';
       };
 
+    virtualisation.emptyDiskImages =
+      mkOption {
+        default = [];
+        type = types.list types.int;
+        description =
+          ''
+            Additional disk images to provide to the VM, the value is a list of
+            sizes in megabytes the empty disk should be.
+
+            These disks are writeable by the VM and will be thrown away
+            afterwards.
+          '';
+      };
+
     virtualisation.graphics =
       mkOption {
         default = true;
@@ -165,6 +179,14 @@ let
 
       ${pkgs.vmTools.startSamba}
 
+      idx=2
+      extraDisks=""
+      ${flip concatMapStrings cfg.emptyDiskImages (size: ''
+        ${pkgs.qemu_kvm}/bin/qemu-img create -f raw "empty$idx" "${toString size}M"
+        extraDisks="$extraDisks -drive index=$idx,file=$(pwd)/empty$idx,if=virtio,werror=report"
+        idx=$((idx + 1))
+      '')}
+
       # Start QEMU.
       # "-boot menu=on" is there, because I don't know how to make qemu boot from 2nd hd.
       exec ${pkgs.qemu_kvm}/bin/qemu-kvm \
@@ -184,6 +206,7 @@ let
             -initrd ${config.system.build.toplevel}/initrd \
             -append "$(cat ${config.system.build.toplevel}/kernel-params) init=${config.system.build.toplevel}/init regInfo=${regInfo} ${kernelConsole} $QEMU_KERNEL_PARAMS" \
           ''} \
+          $extraDisks \
           ${qemuGraphics} \
           ${toString config.virtualisation.qemu.options} \
           $QEMU_OPTS
-- 
GitLab


From 4ba597aa51a4018286504795027161bfc5d81bbc Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Fri, 28 Jun 2013 04:19:38 +0200
Subject: [PATCH 4687/5331] tests: Add VM test for partitioning using nixpart.

At the moment, we still use kickstart syntax, but this is going to change
soon[TM] to be more NixOS-integrated. The tests use emptyDiskImages option
introduced in the previous commit, so we don't have to create a whole bunch of
duplicate expressions.

Testing itself is done exclusively on /dev/vdb and /dev/vdc. And there is a
check (ensureSanity) to make sure none of the tests are actually mutating
/dev/vda.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 release.nix         |   1 +
 tests/default.nix   |   1 +
 tests/partition.nix | 150 ++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 152 insertions(+)
 create mode 100644 tests/partition.nix

diff --git a/release.nix b/release.nix
index 956ca7e3452..1ae786e58fb 100644
--- a/release.nix
+++ b/release.nix
@@ -227,6 +227,7 @@ in {
       nat = runTest (t: t.nat.test);
       nfs = runTest (t: t.nfs.test);
       openssh = runTest (t: t.openssh.test);
+      partition = runTest (t: t.partition.test);
       proxy = runTest (t: t.proxy.test);
       quake3 = runTest (t: t.quake3.report);
       #subversion = runTest (t: t.subversion.report);
diff --git a/tests/default.nix b/tests/default.nix
index 0d2c3102a64..d2e08a258e9 100644
--- a/tests/default.nix
+++ b/tests/default.nix
@@ -18,6 +18,7 @@ with import ../lib/testing.nix { inherit system minimal; };
   nat = makeTest (import ./nat.nix);
   nfs = makeTest (import ./nfs.nix);
   openssh = makeTest (import ./openssh.nix);
+  partition = makeTest (import ./partition.nix);
   portmap = makeTest (import ./portmap.nix);
   proxy = makeTest (import ./proxy.nix);
   quake3 = makeTest (import ./quake3.nix);
diff --git a/tests/partition.nix b/tests/partition.nix
new file mode 100644
index 00000000000..dabebfe2a02
--- /dev/null
+++ b/tests/partition.nix
@@ -0,0 +1,150 @@
+{ pkgs, system, ... }:
+
+with pkgs.lib;
+
+let
+  ksExt = pkgs.writeText "ks-ext4" ''
+    clearpart --all --initlabel --drives=vdb
+
+    part /boot --recommended --label=boot --fstype=ext2 --ondisk=vdb
+    part swap --recommended --label=swap --fstype=swap --ondisk=vdb
+    part /nix --size=500 --label=nix --fstype=ext3 --ondisk=vdb
+    part / --recommended --label=root --fstype=ext4 --ondisk=vdb
+  '';
+
+  ksBtrfs = pkgs.writeText "ks-btrfs" ''
+    clearpart --all --initlabel --drives=vdb,vdc
+
+    part swap1 --recommended --label=swap1 --fstype=swap --ondisk=vdb
+    part swap2 --recommended --label=swap2 --fstype=swap --ondisk=vdc
+
+    part btrfs.1 --grow --ondisk=vdb
+    part btrfs.2 --grow --ondisk=vdc
+
+    btrfs / --data=0 --metadata=1 --label=root btrfs.1 btrfs.2
+  '';
+
+  ksRaid = pkgs.writeText "ks-raid" ''
+    clearpart --all --initlabel --drives=vdb,vdc
+
+    part raid.01 --size=200 --ondisk=vdb
+    part raid.02 --size=200 --ondisk=vdc
+
+    part swap1 --size=500 --label=swap1 --fstype=swap --ondisk=vdb
+    part swap2 --size=500 --label=swap2 --fstype=swap --ondisk=vdc
+
+    part raid.11 --grow --ondisk=vdb
+    part raid.12 --grow --ondisk=vdc
+
+    raid /boot --level=1 --fstype=ext3 --device=md0 raid.01 raid.02
+    raid / --level=1 --fstype=xfs --device=md1 raid.11 raid.12
+  '';
+
+  ksRaidLvmCrypt = pkgs.writeText "ks-lvm-crypt" ''
+    clearpart --all --initlabel --drives=vdb,vdc
+
+    part raid.1 --grow --ondisk=vdb
+    part raid.2 --grow --ondisk=vdc
+
+    raid pv.0 --level=1 --encrypted --passphrase=x --device=md0 raid.1 raid.2
+
+    volgroup nixos pv.0
+
+    logvol /boot --size=200 --fstype=ext3 --name=boot --vgname=nixos
+    logvol swap --size=500 --fstype=swap --name=swap --vgname=nixos
+    logvol / --size=1000 --grow --fstype=ext4 --name=root --vgname=nixos
+  '';
+in {
+  machine = { config, pkgs, ... }: {
+    environment.systemPackages = [
+      pkgs.pythonPackages.nixpart
+      pkgs.file pkgs.btrfsProgs pkgs.xfsprogs pkgs.lvm2
+    ];
+    virtualisation.emptyDiskImages = [ 4096 4096 ];
+  };
+
+  testScript = ''
+    startAll;
+    $machine->waitForUnit("default.target");
+    my $diskStart = $machine->succeed("dd if=/dev/vda bs=512 count=1");
+
+    sub ensureSanity {
+      # Check whether the filesystem in /dev/vda is still intact
+      my $newDiskStart = $machine->succeed("dd if=/dev/vda bs=512 count=1");
+      if ($diskStart ne $newDiskStart) {
+        $machine->log("Something went wrong, the partitioner wrote " .
+                      "something into the first 512 bytes of /dev/vda!");
+        die;
+      }
+    }
+
+    sub kickstart {
+      $machine->copyFileFromHost($_[0], "/kickstart");
+      $machine->succeed("nixpart -v /kickstart");
+      ensureSanity;
+    }
+
+    sub ensurePartition {
+      my ($name, $match) = @_;
+      my $path = $name =~ /^\// ? $name : "/dev/disk/by-label/$name";
+      my $out = $machine->succeed("file -Ls $path");
+      my @matches = grep(/^$path: .*$match/i, $out);
+      if (!@matches) {
+        $machine->log("Partition on $path was expected to have a " .
+                      "file system that matches $match, but instead has: $out");
+        die;
+      }
+    }
+
+    sub ensureNoPartition {
+      $machine->succeed("test ! -e /dev/$_[0]");
+    }
+
+    subtest "ext2, ext3 and ext4 filesystems", sub {
+      kickstart("${ksExt}");
+      ensurePartition("boot", "ext2");
+      ensurePartition("swap", "swap");
+      ensurePartition("nix", "ext3");
+      ensurePartition("root", "ext4");
+      ensurePartition("/dev/vdb4", "boot sector");
+      ensureNoPartition("vdb6");
+      ensureNoPartition("vdc1");
+    };
+
+    subtest "btrfs filesystem", sub {
+      kickstart("${ksBtrfs}");
+      ensurePartition("swap1", "swap");
+      ensurePartition("swap2", "swap");
+      ensurePartition("/dev/vdb2", "btrfs");
+      ensurePartition("/dev/vdc2", "btrfs");
+      ensureNoPartition("vdb3");
+      ensureNoPartition("vdc3");
+    };
+
+    subtest "RAID1 with XFS", sub {
+      kickstart("${ksRaid}");
+      ensurePartition("swap1", "swap");
+      ensurePartition("swap2", "swap");
+      ensurePartition("/dev/md0", "ext3");
+      ensurePartition("/dev/md1", "xfs");
+      ensureNoPartition("vdb4");
+      ensureNoPartition("vdc4");
+      ensureNoPartition("md2");
+    };
+
+    subtest "RAID1 with LUKS and LVM", sub {
+      kickstart("${ksRaidLvmCrypt}");
+      ensurePartition("/dev/vdb1", "data");
+      ensureNoPartition("vdb2");
+      ensurePartition("/dev/vdc1", "data");
+      ensureNoPartition("vdc2");
+
+      ensurePartition("/dev/md0", "luks");
+      ensureNoPartition("md1");
+
+      ensurePartition("/dev/nixos/boot", "ext3");
+      ensurePartition("/dev/nixos/swap", "swap");
+      ensurePartition("/dev/nixos/root", "ext4");
+    };
+  '';
+}
-- 
GitLab


From d28b42658c27087217ebc50f1ee48ce7a26fde16 Mon Sep 17 00:00:00 2001
From: Domen Kozar <domen@dev.si>
Date: Sat, 29 Jun 2013 16:02:37 +0200
Subject: [PATCH 4688/5331] ssmtp: fix eval

---
 modules/programs/ssmtp.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/programs/ssmtp.nix b/modules/programs/ssmtp.nix
index abff4e707a0..d8a324190f6 100644
--- a/modules/programs/ssmtp.nix
+++ b/modules/programs/ssmtp.nix
@@ -74,7 +74,7 @@ let
       authPass = mkOption {
         default = "";
         example = "correctHorseBatteryStaple";
-        default = "
+        description = "
           Password used for SMTP auth.
         ";
       };
-- 
GitLab


From 279248f6c562eb88227d22b824c9324683980b96 Mon Sep 17 00:00:00 2001
From: Rickard Nilsson <rickynils@gmail.com>
Date: Sat, 29 Jun 2013 18:11:19 +0200
Subject: [PATCH 4689/5331] time.timeZone: Set the TZ environment variable,
 which is used by Java.

---
 modules/config/timezone.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/modules/config/timezone.nix b/modules/config/timezone.nix
index b69df4a87ce..81536725501 100644
--- a/modules/config/timezone.nix
+++ b/modules/config/timezone.nix
@@ -27,6 +27,7 @@ with pkgs.lib;
     environment.shellInit =
       ''
         export TZDIR=/etc/zoneinfo
+        export TZ=${config.time.timeZone}
       '';
 
     environment.etc.localtime.source = "${pkgs.tzdata}/share/zoneinfo/${config.time.timeZone}";
-- 
GitLab


From a20630476f62c602414c0f81f8546beca36cba34 Mon Sep 17 00:00:00 2001
From: Domen Kozar <domen@dev.si>
Date: Sat, 29 Jun 2013 18:45:25 +0200
Subject: [PATCH 4690/5331] cleanup dd-agent

---
 modules/services/monitoring/dd-agent.nix | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/modules/services/monitoring/dd-agent.nix b/modules/services/monitoring/dd-agent.nix
index f2527ea4e39..40ce48aff41 100644
--- a/modules/services/monitoring/dd-agent.nix
+++ b/modules/services/monitoring/dd-agent.nix
@@ -42,30 +42,26 @@ in {
 
   config = mkIf cfg.enable {
     environment.etc = [ { source = datadog-conf; target = "dd-agent/datadog.conf"; } ];
+    environment.systemPackages = [ pkgs."dd-agent" ];
 
     users.extraUsers."dd-agent" = {
       description = "Datadog Agent User";
-
       group = "dd-agent";
+      home = "/var/log/datadog/";
+      createHome = true;
     };
 
     users.extraGroups."dd-agent" = { };
 
     systemd.services.dd-agent = {
       description = "Datadog agent monitor";
-
-      path = [ pkgs.sysstat pkgs.procps ];
-
+      path = [ pkgs."dd-agent" ];
       wantedBy = [ "multi-user.target" ];
-
       serviceConfig = {
         ExecStart = "${pkgs.dd-agent}/bin/dd-agent foreground";
-
         User = "dd-agent";
-
         Group = "dd-agent";
       };
-
       restartTriggers = [ pkgs.dd-agent ];
     };
   };
-- 
GitLab


From 36f2ec84a96c02701ffdca07ce6bd79eda7451fa Mon Sep 17 00:00:00 2001
From: Domen Kozar <domen@dev.si>
Date: Sat, 29 Jun 2013 19:33:44 +0200
Subject: [PATCH 4691/5331] dd-agent: cleanup, add dogstatsd systemd service

---
 modules/services/monitoring/dd-agent.nix | 24 +++++++++++++++++++-----
 1 file changed, 19 insertions(+), 5 deletions(-)

diff --git a/modules/services/monitoring/dd-agent.nix b/modules/services/monitoring/dd-agent.nix
index 40ce48aff41..92e88c68d16 100644
--- a/modules/services/monitoring/dd-agent.nix
+++ b/modules/services/monitoring/dd-agent.nix
@@ -5,7 +5,7 @@ with pkgs.lib;
 let
   cfg = config.services.dd-agent;
 
-  datadog-conf = pkgs.runCommand "datadog.conf" {} ''
+  datadog_conf = pkgs.runCommand "datadog.conf" {} ''
     sed -e 's|^api_key:|api_key: ${cfg.api_key}|' ${optionalString (cfg.hostname != null)
       "-e 's|^#hostname: mymachine.mydomain|hostname: ${cfg.hostname}|'"
     } ${pkgs.dd-agent}/etc/dd-agent/datadog.conf.example > $out
@@ -41,8 +41,8 @@ in {
   };
 
   config = mkIf cfg.enable {
-    environment.etc = [ { source = datadog-conf; target = "dd-agent/datadog.conf"; } ];
-    environment.systemPackages = [ pkgs."dd-agent" ];
+    environment.etc = [ { source = datadog_conf; target = "dd-agent/datadog.conf"; } ];
+    environment.systemPackages = [ pkgs."dd-agent" pkgs.sysstat pkgs.procps ];
 
     users.extraUsers."dd-agent" = {
       description = "Datadog Agent User";
@@ -55,14 +55,28 @@ in {
 
     systemd.services.dd-agent = {
       description = "Datadog agent monitor";
-      path = [ pkgs."dd-agent" ];
+      path = [ pkgs."dd-agent" pkgs.python pkgs.sysstat pkgs.procps];
       wantedBy = [ "multi-user.target" ];
       serviceConfig = {
         ExecStart = "${pkgs.dd-agent}/bin/dd-agent foreground";
         User = "dd-agent";
         Group = "dd-agent";
       };
-      restartTriggers = [ pkgs.dd-agent ];
+      restartTriggers = [ pkgs.dd-agent datadog_conf ];
+    };
+
+    systemd.services.dogstatsd = {
+      description = "Datadog statsd";
+      path = [ pkgs."dd-agent" pkgs.python ];
+      wantedBy = [ "multi-user.target" ];
+      serviceConfig = {
+        ExecStart = "${pkgs.dd-agent}/bin/dogstatsd start";
+        User = "dd-agent";
+        Group = "dd-agent";
+        Type = "forking";
+        PIDFile = "/tmp/dogstatsd.pid";
+      };
+      restartTriggers = [ pkgs.dd-agent datadog_conf ];
     };
   };
 }
-- 
GitLab


From 9dcc4c22628ab6e0e929f25b13b80fe6676ad0c8 Mon Sep 17 00:00:00 2001
From: Domen Kozar <domen@dev.si>
Date: Sat, 29 Jun 2013 20:25:38 +0200
Subject: [PATCH 4692/5331] fix trac tests

---
 tests/trac.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tests/trac.nix b/tests/trac.nix
index 335d9473704..f4f91e6ccf3 100644
--- a/tests/trac.nix
+++ b/tests/trac.nix
@@ -17,6 +17,7 @@
       {
         services.openssh.enable = true;
         services.postgresql.enable = true;
+        services.postgresql.package = pkgs.postgresql92;
         services.postgresql.enableTCPIP = true;
         services.postgresql.authentication = ''
           # Generated file; do not edit!
-- 
GitLab


From 2518521108cb41ea3acc84feb8e8bf188a62f3c4 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Sun, 30 Jun 2013 20:56:21 +0200
Subject: [PATCH 4693/5331] tests/partition: Reboot machine on every subtest.

This will ensure that we don't get errors because the kernel doesn't recognize
the new partitioning scheme on some conditions or architectures, such as i686.

See here for the Hydra build log on i686:

http://hydra.nixos.org/build/5432090/download/1/log.html

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 tests/partition.nix | 21 ++++++++++++++-------
 1 file changed, 14 insertions(+), 7 deletions(-)

diff --git a/tests/partition.nix b/tests/partition.nix
index dabebfe2a02..4cee14e4e5c 100644
--- a/tests/partition.nix
+++ b/tests/partition.nix
@@ -64,9 +64,16 @@ in {
   };
 
   testScript = ''
-    startAll;
-    $machine->waitForUnit("default.target");
-    my $diskStart = $machine->succeed("dd if=/dev/vda bs=512 count=1");
+    my $diskStart;
+
+    sub parttest {
+      my ($desc, $code) = @_;
+      $machine->start;
+      $machine->waitForUnit("default.target");
+      $diskStart = $machine->succeed("dd if=/dev/vda bs=512 count=1");
+      subtest($desc, $code);
+      $machine->shutdown;
+    }
 
     sub ensureSanity {
       # Check whether the filesystem in /dev/vda is still intact
@@ -100,7 +107,7 @@ in {
       $machine->succeed("test ! -e /dev/$_[0]");
     }
 
-    subtest "ext2, ext3 and ext4 filesystems", sub {
+    parttest "ext2, ext3 and ext4 filesystems", sub {
       kickstart("${ksExt}");
       ensurePartition("boot", "ext2");
       ensurePartition("swap", "swap");
@@ -111,7 +118,7 @@ in {
       ensureNoPartition("vdc1");
     };
 
-    subtest "btrfs filesystem", sub {
+    parttest "btrfs filesystem", sub {
       kickstart("${ksBtrfs}");
       ensurePartition("swap1", "swap");
       ensurePartition("swap2", "swap");
@@ -121,7 +128,7 @@ in {
       ensureNoPartition("vdc3");
     };
 
-    subtest "RAID1 with XFS", sub {
+    parttest "RAID1 with XFS", sub {
       kickstart("${ksRaid}");
       ensurePartition("swap1", "swap");
       ensurePartition("swap2", "swap");
@@ -132,7 +139,7 @@ in {
       ensureNoPartition("md2");
     };
 
-    subtest "RAID1 with LUKS and LVM", sub {
+    parttest "RAID1 with LUKS and LVM", sub {
       kickstart("${ksRaidLvmCrypt}");
       ensurePartition("/dev/vdb1", "data");
       ensureNoPartition("vdb2");
-- 
GitLab


From b262225972114023ac3199b5ca8ebcb508bfa828 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Mon, 1 Jul 2013 00:47:56 +0200
Subject: [PATCH 4694/5331] tests/partition: Check if nixpart loses mounts.

As the whole partitioning run is quite an invasive procedure, we want to
especially make sure that it doesn't unmount any filesystems that were mounted
before the partitioner was run.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 tests/partition.nix | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)

diff --git a/tests/partition.nix b/tests/partition.nix
index 4cee14e4e5c..0051b290c92 100644
--- a/tests/partition.nix
+++ b/tests/partition.nix
@@ -65,12 +65,23 @@ in {
 
   testScript = ''
     my $diskStart;
+    my @mtab;
+
+    sub getMtab {
+      my $mounts = $machine->succeed("cat /proc/mounts");
+      chomp $mounts;
+      return map [split], split /\n/, $mounts;
+    }
 
     sub parttest {
       my ($desc, $code) = @_;
       $machine->start;
       $machine->waitForUnit("default.target");
+
+      # Gather mounts and superblock
+      @mtab = getMtab;
       $diskStart = $machine->succeed("dd if=/dev/vda bs=512 count=1");
+
       subtest($desc, $code);
       $machine->shutdown;
     }
@@ -83,6 +94,21 @@ in {
                       "something into the first 512 bytes of /dev/vda!");
         die;
       }
+
+      # Check whether nixpart has unmounted anything
+      my @currentMtab = getMtab;
+      for my $mount (@mtab) {
+        my $path = $mount->[1];
+        unless (grep { $_->[1] eq $path } @currentMtab) {
+          $machine->log("The partitioner seems to have unmounted $path.");
+          die;
+        }
+      }
+    }
+
+    sub checkMount {
+      my $mounts = $machine->succeed("cat /proc/mounts");
+
     }
 
     sub kickstart {
-- 
GitLab


From b414e43d5ad69469d8557aef6447f790ea045327 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Mon, 1 Jul 2013 17:32:48 +0200
Subject: [PATCH 4695/5331] tests/partition: Unmount and check remounting.

This checks if nixpart is able to mount the filesystems from scratch again, just
with the information provided by the kickstart file.

Found an odd issue about findmnt here, because it seems to not show /mnt/boot,
even though it _is_ mounted and even shows up in /proc/self/mountinfo. I'm not
quite sure whether this is a bug or I'm doing something wrong here, but might
need some investigation.

Mountpoints are checked by adding empty canary files, remounting and checking if
the same canaries still exist. If they don't, the partitioner either has
formatted the filesystem or just not mounted the device. Either way, both
shouldn't happen, but that's why we're testing it, no? :-)

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 tests/partition.nix | 33 +++++++++++++++++++++++++++++++++
 1 file changed, 33 insertions(+)

diff --git a/tests/partition.nix b/tests/partition.nix
index 0051b290c92..67c01469dc8 100644
--- a/tests/partition.nix
+++ b/tests/partition.nix
@@ -133,6 +133,35 @@ in {
       $machine->succeed("test ! -e /dev/$_[0]");
     }
 
+    sub remount_and_check {
+      $machine->nest("Remounting partitions:", sub {
+        # XXX: "findmnt -ARunl -oTARGET /mnt" seems to NOT print all mounts!
+        my $getmounts_cmd = "cat /proc/mounts | cut -d' ' -f2 | grep '^/mnt'";
+        # Insert canaries first
+        my $canaries = $machine->succeed($getmounts_cmd . " | while read p;" .
+                                         " do touch \"\$p/canary\";" .
+                                         " echo \"\$p/canary\"; done");
+        # Now unmount manually
+        $machine->succeed($getmounts_cmd . " | tac | xargs -r umount");
+        # /mnt should be empty or non-existing
+        my $found = $machine->succeed("find /mnt -mindepth 1");
+        chomp $found;
+        if ($found) {
+          $machine->log("Cruft found in /mnt:\n$found");
+          die;
+        }
+        # Try to remount with nixpart
+        $machine->succeed("nixpart -vm /kickstart");
+        # Check if our beloved canaries are dead
+        chomp $canaries;
+        $machine->nest("Checking canaries:", sub {
+          for my $canary (split /\n/, $canaries) {
+            $machine->succeed("test -e '$canary'");
+          }
+        });
+      });
+    }
+
     parttest "ext2, ext3 and ext4 filesystems", sub {
       kickstart("${ksExt}");
       ensurePartition("boot", "ext2");
@@ -142,6 +171,7 @@ in {
       ensurePartition("/dev/vdb4", "boot sector");
       ensureNoPartition("vdb6");
       ensureNoPartition("vdc1");
+      remount_and_check;
     };
 
     parttest "btrfs filesystem", sub {
@@ -152,6 +182,7 @@ in {
       ensurePartition("/dev/vdc2", "btrfs");
       ensureNoPartition("vdb3");
       ensureNoPartition("vdc3");
+      remount_and_check;
     };
 
     parttest "RAID1 with XFS", sub {
@@ -163,6 +194,7 @@ in {
       ensureNoPartition("vdb4");
       ensureNoPartition("vdc4");
       ensureNoPartition("md2");
+      remount_and_check;
     };
 
     parttest "RAID1 with LUKS and LVM", sub {
@@ -178,6 +210,7 @@ in {
       ensurePartition("/dev/nixos/boot", "ext3");
       ensurePartition("/dev/nixos/swap", "swap");
       ensurePartition("/dev/nixos/root", "ext4");
+      remount_and_check;
     };
   '';
 }
-- 
GitLab


From 8025bae9b122945301b5e41fad5ba4b0db1e37eb Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Mon, 1 Jul 2013 17:58:05 +0200
Subject: [PATCH 4696/5331] tests/partition: Explicitly check mountpoints.

Don't rely solely on canaries, because mountpoints might not have been created
in the first place.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 tests/partition.nix | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/tests/partition.nix b/tests/partition.nix
index 67c01469dc8..67db16bfbbf 100644
--- a/tests/partition.nix
+++ b/tests/partition.nix
@@ -133,6 +133,10 @@ in {
       $machine->succeed("test ! -e /dev/$_[0]");
     }
 
+    sub ensureMountPoint {
+      $machine->succeed("mountpoint $_[0]");
+    }
+
     sub remount_and_check {
       $machine->nest("Remounting partitions:", sub {
         # XXX: "findmnt -ARunl -oTARGET /mnt" seems to NOT print all mounts!
@@ -152,6 +156,7 @@ in {
         }
         # Try to remount with nixpart
         $machine->succeed("nixpart -vm /kickstart");
+        ensureMountPoint("/mnt");
         # Check if our beloved canaries are dead
         chomp $canaries;
         $machine->nest("Checking canaries:", sub {
@@ -172,6 +177,8 @@ in {
       ensureNoPartition("vdb6");
       ensureNoPartition("vdc1");
       remount_and_check;
+      ensureMountPoint("/mnt/boot");
+      ensureMountPoint("/mnt/nix");
     };
 
     parttest "btrfs filesystem", sub {
@@ -195,6 +202,7 @@ in {
       ensureNoPartition("vdc4");
       ensureNoPartition("md2");
       remount_and_check;
+      ensureMountPoint("/mnt/boot");
     };
 
     parttest "RAID1 with LUKS and LVM", sub {
@@ -211,6 +219,7 @@ in {
       ensurePartition("/dev/nixos/swap", "swap");
       ensurePartition("/dev/nixos/root", "ext4");
       remount_and_check;
+      ensureMountPoint("/mnt/boot");
     };
   '';
 }
-- 
GitLab


From 3d7cc5e2170494fa1844b89737328a7e04f06bc1 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Mon, 1 Jul 2013 18:41:38 +0200
Subject: [PATCH 4697/5331] tests/partition: Load module for btrfs filesystem.

Blivet won't mount filesystems if they don't show up in /proc/filesystems.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 tests/partition.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tests/partition.nix b/tests/partition.nix
index 67db16bfbbf..58a9687b87c 100644
--- a/tests/partition.nix
+++ b/tests/partition.nix
@@ -182,6 +182,7 @@ in {
     };
 
     parttest "btrfs filesystem", sub {
+      $machine->succeed("modprobe btrfs");
       kickstart("${ksBtrfs}");
       ensurePartition("swap1", "swap");
       ensurePartition("swap2", "swap");
-- 
GitLab


From a099f7008b75490ca8dcf569f404777b94a7b2e0 Mon Sep 17 00:00:00 2001
From: Mathijs Kwik <mathijs@bluescreen303.nl>
Date: Tue, 2 Jul 2013 06:03:52 +0200
Subject: [PATCH 4698/5331] provide a warning on password options that do not
 follow the read-from-file convention.

---
 modules/programs/ssmtp.nix           | 2 +-
 modules/services/databases/redis.nix | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/modules/programs/ssmtp.nix b/modules/programs/ssmtp.nix
index d8a324190f6..f61d14c2046 100644
--- a/modules/programs/ssmtp.nix
+++ b/modules/programs/ssmtp.nix
@@ -75,7 +75,7 @@ let
         default = "";
         example = "correctHorseBatteryStaple";
         description = "
-          Password used for SMTP auth.
+          Password used for SMTP auth. (STORED PLAIN TEXT, WORLD-READABLE IN NIX STORE)
         ";
       };
 
diff --git a/modules/services/databases/redis.nix b/modules/services/databases/redis.nix
index 9472136e17e..5bc58c73bd6 100644
--- a/modules/services/databases/redis.nix
+++ b/modules/services/databases/redis.nix
@@ -122,12 +122,13 @@ in
         default = null;
         description = ''If the master is password protected (using the requirePass configuration)
         it is possible to tell the slave to authenticate before starting the replication synchronization
-        process, otherwise the master will refuse the slave request.'';
+        process, otherwise the master will refuse the slave request.
+        (STORED PLAIN TEXT, WORLD-READABLE IN NIX STORE)'';
       };
 
       requirePass = mkOption {
         default = null;
-        description = "Password for database";
+        description = "Password for database (STORED PLAIN TEXT, WORLD-READABLE IN NIX STORE)";
         example = "letmein!";
       };
 
-- 
GitLab


From 59bab9048a8eb238d735920cc27ea31f18ad341d Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 1 Jul 2013 23:13:28 +0200
Subject: [PATCH 4699/5331] Move initial channel generation into a separate
 module

---
 modules/installer/cd-dvd/channel.nix          | 38 +++++++++++++++++++
 .../installer/cd-dvd/installation-cd-base.nix | 33 +---------------
 2 files changed, 39 insertions(+), 32 deletions(-)
 create mode 100644 modules/installer/cd-dvd/channel.nix

diff --git a/modules/installer/cd-dvd/channel.nix b/modules/installer/cd-dvd/channel.nix
new file mode 100644
index 00000000000..4e84e45b736
--- /dev/null
+++ b/modules/installer/cd-dvd/channel.nix
@@ -0,0 +1,38 @@
+# Provide an initial copy of the NixOS channel so that the user
+# doesn't need to run "nix-channel --update" first.
+
+{ config, pkgs, ... }:
+
+with pkgs.lib;
+
+let
+
+  # We need a copy of the Nix expressions for Nixpkgs and NixOS on the
+  # CD.  These are installed into the "nixos" channel of the root
+  # user, as expected by nixos-rebuild/nixos-install.
+  channelSources = pkgs.runCommand "nixos-${config.system.nixosVersion}"
+    { expr = builtins.readFile ../../../lib/channel-expr.nix; }
+    ''
+      mkdir -p $out/nixos
+      cp -prd ${cleanSource ../../..} $out/nixos/nixos
+      cp -prd ${cleanSource <nixpkgs>} $out/nixos/nixpkgs
+      chmod -R u+w $out/nixos/nixos
+      echo -n ${config.system.nixosVersion} > $out/nixos/nixos/.version
+      echo -n "" > $out/nixos/nixos/.version-suffix
+      echo "$expr" > $out/nixos/default.nix
+    '';
+
+in
+
+{
+  # Provide the NixOS/Nixpkgs sources in /etc/nixos.  This is required
+  # for nixos-install.
+  boot.postBootCommands =
+    ''
+      echo "unpacking the NixOS/Nixpkgs sources..."
+      mkdir -p /nix/var/nix/profiles/per-user/root
+      ${config.environment.nix}/bin/nix-env -p /nix/var/nix/profiles/per-user/root/channels -i ${channelSources} --quiet
+      mkdir -m 0700 -p /root/.nix-defexpr
+      ln -s /nix/var/nix/profiles/per-user/root/channels /root/.nix-defexpr/channels
+    '';
+}
diff --git a/modules/installer/cd-dvd/installation-cd-base.nix b/modules/installer/cd-dvd/installation-cd-base.nix
index d9ffbda3660..83bcc262473 100644
--- a/modules/installer/cd-dvd/installation-cd-base.nix
+++ b/modules/installer/cd-dvd/installation-cd-base.nix
@@ -5,31 +5,11 @@
 
 with pkgs.lib;
 
-let
-
-  # We need a copy of the Nix expressions for Nixpkgs and NixOS on the
-  # CD.  These are installed into the "nixos" channel of the root
-  # user, as expected by nixos-rebuild/nixos-install.
-  channelSources = pkgs.runCommand "nixos-${config.system.nixosVersion}"
-    { expr = builtins.readFile ../../../lib/channel-expr.nix; }
-    ''
-      mkdir -p $out/nixos
-      cp -prd ${cleanSource ../../..} $out/nixos/nixos
-      cp -prd ${cleanSource <nixpkgs>} $out/nixos/nixpkgs
-      chmod -R u+w $out/nixos/nixos
-      echo -n ${config.system.nixosVersion} > $out/nixos/nixos/.version
-      echo -n "" > $out/nixos/nixos/.version-suffix
-      echo "$expr" > $out/nixos/default.nix
-    '';
-
-  includeSources = true;
-
-in
-
 {
   require =
     [ ./memtest.nix
       ./iso-image.nix
+      ./channel.nix
 
       # Profiles of this basic installation CD.
       ../../profiles/all-hardware.nix
@@ -42,17 +22,6 @@ in
 
   isoImage.volumeID = "NIXOS_${config.system.nixosVersion}";
 
-  # Provide the NixOS/Nixpkgs sources in /etc/nixos.  This is required
-  # for nixos-install.
-  boot.postBootCommands = optionalString includeSources
-    ''
-      echo "unpacking the NixOS/Nixpkgs sources..."
-      mkdir -p /nix/var/nix/profiles/per-user/root
-      ${config.environment.nix}/bin/nix-env -p /nix/var/nix/profiles/per-user/root/channels -i ${channelSources} --quiet
-      mkdir -m 0700 -p /root/.nix-defexpr
-      ln -s /nix/var/nix/profiles/per-user/root/channels /root/.nix-defexpr/channels
-    '';
-
   # Make the installer more likely to succeed in low memory
   # environments.  The kernel's overcommit heustistics bite us
   # fairly often, preventing processes such as nix-worker or
-- 
GitLab


From db17b68d8118e9b5d5d61ca807c36118d6b052d6 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 2 Jul 2013 00:21:56 +0200
Subject: [PATCH 4700/5331] Unpack the initial channel only once

---
 modules/installer/cd-dvd/channel.nix | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/modules/installer/cd-dvd/channel.nix b/modules/installer/cd-dvd/channel.nix
index 4e84e45b736..bc758e0ad6e 100644
--- a/modules/installer/cd-dvd/channel.nix
+++ b/modules/installer/cd-dvd/channel.nix
@@ -29,10 +29,14 @@ in
   # for nixos-install.
   boot.postBootCommands =
     ''
-      echo "unpacking the NixOS/Nixpkgs sources..."
-      mkdir -p /nix/var/nix/profiles/per-user/root
-      ${config.environment.nix}/bin/nix-env -p /nix/var/nix/profiles/per-user/root/channels -i ${channelSources} --quiet
-      mkdir -m 0700 -p /root/.nix-defexpr
-      ln -s /nix/var/nix/profiles/per-user/root/channels /root/.nix-defexpr/channels
+      if ! [ -e /var/lib/nixos/did-channel-init ]; then
+        echo "unpacking the NixOS/Nixpkgs sources..."
+        mkdir -p /nix/var/nix/profiles/per-user/root
+        ${config.environment.nix}/bin/nix-env -p /nix/var/nix/profiles/per-user/root/channels -i ${channelSources} --quiet
+        mkdir -m 0700 -p /root/.nix-defexpr
+        ln -s /nix/var/nix/profiles/per-user/root/channels /root/.nix-defexpr/channels
+        mkdir -m 0755 -p /var/lib/nixos
+        touch /var/lib/nixos/did-channel-init
+      fi
     '';
 }
-- 
GitLab


From 1a2e4f37d0baa000f1a25bbb20036371ac0f0179 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 2 Jul 2013 00:23:48 +0200
Subject: [PATCH 4701/5331] release.nix: Generate a VirtualBox image

---
 modules/virtualisation/virtualbox-config.nix |  5 +++
 modules/virtualisation/virtualbox-image.nix  |  2 +-
 release.nix                                  | 38 ++++++++++++++++++--
 3 files changed, 41 insertions(+), 4 deletions(-)
 create mode 100644 modules/virtualisation/virtualbox-config.nix

diff --git a/modules/virtualisation/virtualbox-config.nix b/modules/virtualisation/virtualbox-config.nix
new file mode 100644
index 00000000000..72dea0bc222
--- /dev/null
+++ b/modules/virtualisation/virtualbox-config.nix
@@ -0,0 +1,5 @@
+{ config, pkgs, modulesPath, ... }:
+
+{
+  require = [ "${modulesPath}/virtualisation/virtualbox-image.nix" ];
+}
diff --git a/modules/virtualisation/virtualbox-image.nix b/modules/virtualisation/virtualbox-image.nix
index 5569e2a1fc9..32aa2080621 100644
--- a/modules/virtualisation/virtualbox-image.nix
+++ b/modules/virtualisation/virtualbox-image.nix
@@ -61,7 +61,7 @@ with pkgs.lib;
 
           # Install a configuration.nix.
           mkdir -p /mnt/etc/nixos
-          cp ${./nova-config.nix} /mnt/etc/nixos/configuration.nix
+          cp ${./virtualbox-config.nix} /mnt/etc/nixos/configuration.nix
 
           # `switch-to-configuration' requires a /bin/sh
           mkdir -p /mnt/bin
diff --git a/release.nix b/release.nix
index 1ae786e58fb..cda5d4e6152 100644
--- a/release.nix
+++ b/release.nix
@@ -43,7 +43,7 @@ let
           passthru = { inherit config; };
         }
         ''
-          ensureDir $out/nix-support
+          mkdir -p $out/nix-support
           echo "file iso" $iso/iso/*.iso* >> $out/nix-support/hydra-build-products
         ''; # */
 
@@ -86,7 +86,7 @@ in {
       distPhase = ''
         echo -n $VERSION_SUFFIX > .version-suffix
         releaseName=nixos-$VERSION$VERSION_SUFFIX
-        ensureDir "$out/tarballs"
+        mkdir -p $out/tarballs
         mkdir ../$releaseName
         cp -prd . ../$releaseName
         cd ..
@@ -112,7 +112,7 @@ in {
       distPhase = ''
         echo -n $VERSION_SUFFIX > .version-suffix
         releaseName=nixos-$VERSION$VERSION_SUFFIX
-        ensureDir "$out/tarballs"
+        mkdir -p $out/tarballs
         mkdir ../$releaseName
         cp -prd . ../$releaseName/nixos
         cp -prd ${nixpkgs} ../$releaseName/nixpkgs
@@ -175,6 +175,38 @@ in {
   });
 
 
+  # A bootable VirtualBox image.  FIXME: generate a OVF appliance?
+  vdi.x86_64-linux =
+    with import <nixpkgs> { system = "x86_64-linux"; };
+
+    let
+
+      config = (import lib/eval-config.nix {
+        inherit system;
+        modules =
+          [ ./modules/virtualisation/virtualbox-image.nix
+            ./modules/installer/cd-dvd/channel.nix
+            ./modules/profiles/graphical.nix
+          ];
+      }).config;
+
+    in
+      # Declare the VDI as a build product so that it shows up in Hydra.
+      runCommand "nixos-vdi-${config.system.nixosVersion}"
+        { meta = {
+            description = "NixOS VirtualBox disk image (64-bit)";
+            maintainers = lib.maintainers.eelco;
+          };
+          vdi = config.system.build.virtualBoxImage;
+        }
+        ''
+          mkdir -p $out/nix-support
+          fn=$out/nixos-${config.system.nixosVersion}.vdi.xz
+          xz < $vdi/*.vdi > $fn
+          echo "file vdi $fn" >> $out/nix-support/hydra-build-products
+        ''; # */
+
+
   # Provide a tarball that can be unpacked into an SD card, and easily
   # boot that system from uboot (like for the sheevaplug).
   # The pc variant helps preparing the expression for the system tarball
-- 
GitLab


From 725da34c8e63fdbd6b5b8ce4424ff053877c80be Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 2 Jul 2013 00:55:54 +0200
Subject: [PATCH 4702/5331] Add a demo account to the VirtualBox image

---
 modules/profiles/demo.nix | 16 ++++++++++++++++
 release.nix               |  2 +-
 2 files changed, 17 insertions(+), 1 deletion(-)
 create mode 100644 modules/profiles/demo.nix

diff --git a/modules/profiles/demo.nix b/modules/profiles/demo.nix
new file mode 100644
index 00000000000..05652d53475
--- /dev/null
+++ b/modules/profiles/demo.nix
@@ -0,0 +1,16 @@
+{ config, pkgs, ... }:
+
+{
+  #require = [ ./graphical.nix ];
+
+  users.extraUsers.demo =
+    { description = "Demo user account";
+      group = "users";
+      extraGroups = [ "wheel" ];
+      home = "/home/demo";
+      createHome = true;
+      useDefaultShell = true;
+      password = "demo";
+      isSystemUser = false;
+    };
+}
diff --git a/release.nix b/release.nix
index cda5d4e6152..68935356ede 100644
--- a/release.nix
+++ b/release.nix
@@ -186,7 +186,7 @@ in {
         modules =
           [ ./modules/virtualisation/virtualbox-image.nix
             ./modules/installer/cd-dvd/channel.nix
-            ./modules/profiles/graphical.nix
+            ./modules/profiles/demo.nix
           ];
       }).config;
 
-- 
GitLab


From 3a9f908c8b7b8955c9ccde866f9735d0ff55d843 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 2 Jul 2013 13:27:25 +0200
Subject: [PATCH 4703/5331] Oops

---
 modules/profiles/demo.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/profiles/demo.nix b/modules/profiles/demo.nix
index 05652d53475..e0c6744092b 100644
--- a/modules/profiles/demo.nix
+++ b/modules/profiles/demo.nix
@@ -1,7 +1,7 @@
 { config, pkgs, ... }:
 
 {
-  #require = [ ./graphical.nix ];
+  require = [ ./graphical.nix ];
 
   users.extraUsers.demo =
     { description = "Demo user account";
-- 
GitLab


From 5af3a148858d20d96609242f75e8507d587ad9de Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 2 Jul 2013 13:33:27 +0200
Subject: [PATCH 4704/5331] Set the version of the VirtualBox image properly

---
 release.nix | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/release.nix b/release.nix
index 68935356ede..c14e8bc7e60 100644
--- a/release.nix
+++ b/release.nix
@@ -13,6 +13,10 @@ let
   pkgs = import <nixpkgs> { system = "x86_64-linux"; };
 
 
+  versionModule =
+    { system.nixosVersionSuffix = pkgs.lib.optionalString (!officialRelease) versionSuffix;  };
+
+
   makeIso =
     { module, type, description ? type, maintainers ? ["eelco"], system }:
 
@@ -20,14 +24,9 @@ let
 
     let
 
-      versionModule =
-        { system.nixosVersionSuffix = lib.optionalString (!officialRelease) versionSuffix;
-          isoImage.isoBaseName = "nixos-${type}";
-        };
-
       config = (import lib/eval-config.nix {
         inherit system;
-        modules = [ module versionModule ];
+        modules = [ module versionModule { isoImage.isoBaseName = "nixos-${type}"; } ];
       }).config;
 
       iso = config.system.build.isoImage;
@@ -54,7 +53,6 @@ let
     with import <nixpkgs> { inherit system; };
 
     let
-      versionModule = { system.nixosVersionSuffix = lib.optionalString (!officialRelease) versionSuffix; };
 
       config = (import lib/eval-config.nix {
         inherit system;
@@ -62,6 +60,7 @@ let
       }).config;
 
       tarball = config.system.build.tarball;
+
     in
       tarball //
         { meta = {
@@ -184,7 +183,8 @@ in {
       config = (import lib/eval-config.nix {
         inherit system;
         modules =
-          [ ./modules/virtualisation/virtualbox-image.nix
+          [ versionModule
+            ./modules/virtualisation/virtualbox-image.nix
             ./modules/installer/cd-dvd/channel.nix
             ./modules/profiles/demo.nix
           ];
-- 
GitLab


From 2572879a627c4b17e2749d0894ab51a3943036c2 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 2 Jul 2013 13:43:47 +0200
Subject: [PATCH 4705/5331] Don't use substitutes when unpacking the channel
 sources

---
 modules/installer/cd-dvd/channel.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/modules/installer/cd-dvd/channel.nix b/modules/installer/cd-dvd/channel.nix
index bc758e0ad6e..8126ce46dd9 100644
--- a/modules/installer/cd-dvd/channel.nix
+++ b/modules/installer/cd-dvd/channel.nix
@@ -32,7 +32,8 @@ in
       if ! [ -e /var/lib/nixos/did-channel-init ]; then
         echo "unpacking the NixOS/Nixpkgs sources..."
         mkdir -p /nix/var/nix/profiles/per-user/root
-        ${config.environment.nix}/bin/nix-env -p /nix/var/nix/profiles/per-user/root/channels -i ${channelSources} --quiet
+        ${config.environment.nix}/bin/nix-env -p /nix/var/nix/profiles/per-user/root/channels \
+          -i ${channelSources} --quiet --option use-substitutes false
         mkdir -m 0700 -p /root/.nix-defexpr
         ln -s /nix/var/nix/profiles/per-user/root/channels /root/.nix-defexpr/channels
         mkdir -m 0755 -p /var/lib/nixos
-- 
GitLab


From bd99966902dd289141aa3ec3a1cabc0dd8e49786 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 2 Jul 2013 13:52:43 +0200
Subject: [PATCH 4706/5331] Fix postBootCommands ordering

Should use explicit ordering...
---
 modules/installer/cd-dvd/installation-cd-base.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/installer/cd-dvd/installation-cd-base.nix b/modules/installer/cd-dvd/installation-cd-base.nix
index 83bcc262473..888ea5203b3 100644
--- a/modules/installer/cd-dvd/installation-cd-base.nix
+++ b/modules/installer/cd-dvd/installation-cd-base.nix
@@ -8,8 +8,8 @@ with pkgs.lib;
 {
   require =
     [ ./memtest.nix
-      ./iso-image.nix
       ./channel.nix
+      ./iso-image.nix
 
       # Profiles of this basic installation CD.
       ../../profiles/all-hardware.nix
-- 
GitLab


From 84bb988256763feec2bb62b4f5e171079f8e8dd4 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 2 Jul 2013 17:04:51 +0200
Subject: [PATCH 4707/5331] Fix VM test booting with kernels <= 3.9

---
 modules/virtualisation/qemu-vm.nix | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/modules/virtualisation/qemu-vm.nix b/modules/virtualisation/qemu-vm.nix
index 1958762fa72..ae086141eee 100644
--- a/modules/virtualisation/qemu-vm.nix
+++ b/modules/virtualisation/qemu-vm.nix
@@ -275,7 +275,7 @@ in
   # CIFS.  Also use paravirtualised network and block devices for
   # performance.
   boot.initrd.availableKernelModules =
-    [ "cifs" "nls_utf8" "hmac" "md4" "ecb" "des_generic" ];
+    [ "cifs" "nls_utf8" "hmac" "md4" "ecb" "des_generic" "sha256" ];
 
   boot.initrd.supportedFilesystems = optional cfg.writableStore "unionfs-fuse";
 
@@ -345,22 +345,23 @@ in
   # disregarded for the purpose of building a VM test image (since
   # those filesystems don't exist in the VM).
   fileSystems = mkOverride 10
+    (let mode = if builtins.compareVersions "3.5" config.boot.kernelPackages.kernel.version == 1 then "none" else "ntlm"; in
     { "/".device = "/dev/vda";
       "/nix/store" =
         { device = "//10.0.2.4/store";
           fsType = "cifs";
-          options = "guest,sec=none,noperm,noacl";
+          options = "guest,sec=${mode},noperm,noacl";
         };
       "/tmp/xchg" =
         { device = "//10.0.2.4/xchg";
           fsType = "cifs";
-          options = "guest,sec=none,noperm,noacl";
+          options = "guest,sec=${mode},noperm,noacl";
           neededForBoot = true;
         };
       "/tmp/shared" =
         { device = "//10.0.2.4/shared";
           fsType = "cifs";
-          options = "guest,sec=none,noperm,noacl";
+          options = "guest,sec=${mode},noperm,noacl";
           neededForBoot = true;
         };
     } // optionalAttrs cfg.useBootLoader
@@ -370,7 +371,7 @@ in
           options = "ro";
           noCheck = true; # fsck fails on a r/o filesystem
         };
-    };
+    });
 
   swapDevices = mkOverride 50 [ ];
 
-- 
GitLab


From 7f16abf749e0b8ed5e15ed76f09b414b6ee25c2f Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 2 Jul 2013 17:12:51 +0200
Subject: [PATCH 4708/5331] Add a basic test for the latest kernel (currently
 3.10)

---
 release.nix       | 1 +
 tests/default.nix | 3 ++-
 tests/login.nix   | 4 ++--
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/release.nix b/release.nix
index c14e8bc7e60..f4decf594dc 100644
--- a/release.nix
+++ b/release.nix
@@ -252,6 +252,7 @@ in {
       ipv6 = runTest (t: t.ipv6.test);
       kde4 = runTest (t: t.kde4.test);
       login = runTest (t: t.login.test);
+      latestKernel.login = runTest (t: t.latestKernel.login.test);
       misc = runTest (t: t.misc.test);
       mpich = runTest (t: t.mpich.test);
       mysql = runTest (t: t.mysql.test);
diff --git a/tests/default.nix b/tests/default.nix
index d2e08a258e9..798fdf9817a 100644
--- a/tests/default.nix
+++ b/tests/default.nix
@@ -10,7 +10,8 @@ with import ../lib/testing.nix { inherit system minimal; };
   installer = makeTests (import ./installer.nix);
   ipv6 = makeTest (import ./ipv6.nix);
   kde4 = makeTest (import ./kde4.nix);
-  login = makeTest (import ./login.nix);
+  login = makeTest (import ./login.nix {});
+  latestKernel.login = makeTest (import ./login.nix ({ config, pkgs, ... }: { boot.kernelPackages = pkgs.linuxPackages_latest; }));
   misc = makeTest (import ./misc.nix);
   mpich = makeTest (import ./mpich.nix);
   mysql = makeTest (import ./mysql.nix);
diff --git a/tests/login.nix b/tests/login.nix
index cdd6414744a..ed7d9786717 100644
--- a/tests/login.nix
+++ b/tests/login.nix
@@ -1,8 +1,8 @@
-{ pkgs, ... }:
+config: { pkgs, ... }:
 
 {
 
-  machine = { config, pkgs, ... }: { };
+  machine = config;
 
   testScript =
     ''
-- 
GitLab


From d312695d781d49310053a064a3017bb2382b12c7 Mon Sep 17 00:00:00 2001
From: Sander van der Burg <svanderburg@gmail.com>
Date: Wed, 3 Jul 2013 11:13:58 +0200
Subject: [PATCH 4709/5331] Fixed minor issue with unary operator expected

---
 modules/installer/tools/nixos-build-vms/nixos-build-vms.sh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/modules/installer/tools/nixos-build-vms/nixos-build-vms.sh b/modules/installer/tools/nixos-build-vms/nixos-build-vms.sh
index d24a1ccb70d..0a6e8b920a1 100644
--- a/modules/installer/tools/nixos-build-vms/nixos-build-vms.sh
+++ b/modules/installer/tools/nixos-build-vms/nixos-build-vms.sh
@@ -48,15 +48,15 @@ shift
 
 # Validate the given options
 
-if [ "$@" = "" ]
+if [ "$1" = "" ]
 then
     echo "ERROR: A network expression must be specified!" >&2
     exit 1
 else
-    networkExpr=$(readlink -f $@)
+    networkExpr=$(readlink -f $1)
 fi
 
 # Build a network of VMs
 
 nix-build '<nixos/modules/installer/tools/nixos-build-vms/build-vms.nix>' \
-    --argstr networkExpr $networkExpr  $noOutLinkArg $showTraceArg
+    --argstr networkExpr $networkExpr $noOutLinkArg $showTraceArg
-- 
GitLab


From 5c668542f5a65b8badbc1953ef84c33569d08d61 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 3 Jul 2013 13:22:33 +0200
Subject: [PATCH 4710/5331] Remove virtualbox-config.nix, it's actually not
 useful

---
 modules/virtualisation/virtualbox-config.nix | 5 -----
 modules/virtualisation/virtualbox-image.nix  | 6 +-----
 2 files changed, 1 insertion(+), 10 deletions(-)
 delete mode 100644 modules/virtualisation/virtualbox-config.nix

diff --git a/modules/virtualisation/virtualbox-config.nix b/modules/virtualisation/virtualbox-config.nix
deleted file mode 100644
index 72dea0bc222..00000000000
--- a/modules/virtualisation/virtualbox-config.nix
+++ /dev/null
@@ -1,5 +0,0 @@
-{ config, pkgs, modulesPath, ... }:
-
-{
-  require = [ "${modulesPath}/virtualisation/virtualbox-image.nix" ];
-}
diff --git a/modules/virtualisation/virtualbox-image.nix b/modules/virtualisation/virtualbox-image.nix
index 32aa2080621..77177f7a46c 100644
--- a/modules/virtualisation/virtualbox-image.nix
+++ b/modules/virtualisation/virtualbox-image.nix
@@ -56,12 +56,8 @@ with pkgs.lib;
               -p /nix/var/nix/profiles/system --set ${config.system.build.toplevel}
 
           # `nixos-rebuild' requires an /etc/NIXOS.
-          mkdir -p /mnt/etc
-          touch /mnt/etc/NIXOS
-
-          # Install a configuration.nix.
           mkdir -p /mnt/etc/nixos
-          cp ${./virtualbox-config.nix} /mnt/etc/nixos/configuration.nix
+          touch /mnt/etc/NIXOS
 
           # `switch-to-configuration' requires a /bin/sh
           mkdir -p /mnt/bin
-- 
GitLab


From 6fa447006fbfcc132b4fc2caff8220592b651432 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 3 Jul 2013 13:58:38 +0200
Subject: [PATCH 4711/5331] Move cloneConfig into a separate module

---
 modules/profiles/clone-config.nix        | 100 +++++++++++++++++++++++
 modules/profiles/installation-device.nix | 100 ++---------------------
 2 files changed, 109 insertions(+), 91 deletions(-)
 create mode 100644 modules/profiles/clone-config.nix

diff --git a/modules/profiles/clone-config.nix b/modules/profiles/clone-config.nix
new file mode 100644
index 00000000000..69f8537e133
--- /dev/null
+++ b/modules/profiles/clone-config.nix
@@ -0,0 +1,100 @@
+{ config, pkgs, modules, ... }:
+
+with pkgs.lib;
+
+let
+
+  # Location of the repository on the harddrive
+  nixosPath = toString ../..;
+
+  # Check if the path is from the NixOS repository
+  isNixOSFile = path:
+    let s = toString path; in
+      removePrefix nixosPath s != s;
+
+  # Copy modules given as extra configuration files.  Unfortunately, we
+  # cannot serialized attribute set given in the list of modules (that's why
+  # you should use files).
+  moduleFiles =
+    filter isPath modules;
+
+  # Partition module files because between NixOS and non-NixOS files.  NixOS
+  # files may change if the repository is updated.
+  partitionedModuleFiles =
+    let p = partition isNixOSFile moduleFiles; in
+    { nixos = p.right; others = p.wrong; };
+
+  # Path transformed to be valid on the installation device.  Thus the
+  # device configuration could be rebuild.
+  relocatedModuleFiles =
+    let
+      relocateNixOS = path:
+        "<nixos" + removePrefix nixosPath (toString path) + ">";
+      relocateOthers = null;
+    in
+      { nixos = map relocateNixOS partitionedModuleFiles.nixos;
+        others = []; # TODO: copy the modules to the install-device repository.
+      };
+
+  # A dummy /etc/nixos/configuration.nix in the booted CD that
+  # rebuilds the CD's configuration (and allows the configuration to
+  # be modified, of course, providing a true live CD).  Problem is
+  # that we don't really know how the CD was built - the Nix
+  # expression language doesn't allow us to query the expression being
+  # evaluated.  So we'll just hope for the best.
+  configClone = pkgs.writeText "configuration.nix"
+    ''
+      { config, pkgs, ... }:
+
+      {
+        require = [ ${toString config.installer.cloneConfigIncludes} ];
+      }
+    '';
+
+in
+
+{
+
+  options = {
+
+    installer.cloneConfig = mkOption {
+      default = true;
+      description = ''
+        Try to clone the installation-device configuration by re-using it's
+        profile from the list of imported modules.
+      '';
+    };
+
+    installer.cloneConfigIncludes = mkOption {
+      default = [];
+      example = [ "./nixos/modules/hardware/network/rt73.nix" ];
+      description = ''
+        List of modules used to re-build this installation device profile.
+      '';
+    };
+
+  };
+
+  config = {
+
+    installer.cloneConfigIncludes =
+      relocatedModuleFiles.nixos ++ relocatedModuleFiles.others;
+
+    boot.postBootCommands =
+      ''
+        # Provide a mount point for nixos-install.
+        mkdir -p /mnt
+
+        ${optionalString config.installer.cloneConfig ''
+          # Provide a configuration for the CD/DVD itself, to allow users
+          # to run nixos-rebuild to change the configuration of the
+          # running system on the CD/DVD.
+          if ! [ -e /etc/nixos/configuration.nix ]; then
+            cp ${configClone} /etc/nixos/configuration.nix
+          fi
+       ''}
+      '';
+
+  };
+
+}
diff --git a/modules/profiles/installation-device.nix b/modules/profiles/installation-device.nix
index 2ed5a63887f..28c6b09670b 100644
--- a/modules/profiles/installation-device.nix
+++ b/modules/profiles/installation-device.nix
@@ -3,88 +3,19 @@
 
 with pkgs.lib;
 
-let
-  # Location of the repository on the harddrive
-  nixosPath = toString ../..;
-
-  # Check if the path is from the NixOS repository
-  isNixOSFile = path:
-    let s = toString path; in
-      removePrefix nixosPath s != s;
-
-  # Copy modules given as extra configuration files.  Unfortunately, we
-  # cannot serialized attribute set given in the list of modules (that's why
-  # you should use files).
-  moduleFiles =
-    filter isPath modules;
-
-  # Partition module files because between NixOS and non-NixOS files.  NixOS
-  # files may change if the repository is updated.
-  partitionedModuleFiles =
-    let p = partition isNixOSFile moduleFiles; in
-    { nixos = p.right; others = p.wrong; };
-
-  # Path transformed to be valid on the installation device.  Thus the
-  # device configuration could be rebuild.
-  relocatedModuleFiles =
-    let
-      relocateNixOS = path:
-        "<nixos" + removePrefix nixosPath (toString path) + ">";
-      relocateOthers = null;
-    in
-      { nixos = map relocateNixOS partitionedModuleFiles.nixos;
-        others = []; # TODO: copy the modules to the install-device repository.
-      };
-
-  # A dummy /etc/nixos/configuration.nix in the booted CD that
-  # rebuilds the CD's configuration (and allows the configuration to
-  # be modified, of course, providing a true live CD).  Problem is
-  # that we don't really know how the CD was built - the Nix
-  # expression language doesn't allow us to query the expression being
-  # evaluated.  So we'll just hope for the best.
-  configClone = pkgs.writeText "configuration.nix"
-    ''
-      { config, pkgs, ... }:
-
-      {
-        require = [
-          ${toString config.installer.cloneConfigIncludes}
-        ];
-      }
-    '';
-in
-
 {
-  imports = [
-    # Enable devices which are usually scanned, because we don't know the
-    # target system.
-    ../installer/scan/detected.nix
-    ../installer/scan/not-detected.nix
-  ];
-
-  options = {
-  
-    installer.cloneConfig = mkOption {
-      default = true;
-      description = ''
-        Try to clone the installation-device configuration by re-using it's
-        profile from the list of imported modules.
-      '';
-    };
-
-    installer.cloneConfigIncludes = mkOption {
-      default = [];
-      example = [ "./nixos/modules/hardware/network/rt73.nix" ];
-      description = ''
-        List of modules used to re-build this installation device profile.
-      '';
-    };
+  imports =
+    [ # Enable devices which are usually scanned, because we don't know the
+      # target system.
+      ../installer/scan/detected.nix
+      ../installer/scan/not-detected.nix
 
-  };
+      # Allow "nixos-rebuild" to work properly by providing
+      # /etc/nixos/configuration.nix.
+      ./clone-config.nix
+    ];
 
   config = {
-    installer.cloneConfigIncludes =
-      relocatedModuleFiles.nixos ++ relocatedModuleFiles.others;
 
     # Show the manual.
     services.nixosManual.showManual = true;
@@ -99,19 +30,6 @@ in
     # the full glibcLocales package.
     i18n.supportedLocales = ["en_US.UTF-8/UTF-8" "en_US/ISO-8859-1"];
 
-    boot.postBootCommands =
-      ''
-        # Provide a mount point for nixos-install.
-        mkdir -p /mnt
-
-        ${optionalString config.installer.cloneConfig ''
-          # Provide a configuration for the CD/DVD itself, to allow users
-          # to run nixos-rebuild to change the configuration of the
-          # running system on the CD/DVD.
-          cp ${configClone} /etc/nixos/configuration.nix
-       ''}
-      '';
-
     # Some more help text.
     services.mingetty.helpLine =
       ''
-- 
GitLab


From edab9e49760445482896618992d8b8e0d2bafdf0 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 3 Jul 2013 13:59:00 +0200
Subject: [PATCH 4712/5331] Ensure that "nixos-rebuild" works in the VirtualBox
 VM

---
 modules/installer/virtualbox-demo.nix | 10 ++++++++++
 release.nix                           |  4 +---
 2 files changed, 11 insertions(+), 3 deletions(-)
 create mode 100644 modules/installer/virtualbox-demo.nix

diff --git a/modules/installer/virtualbox-demo.nix b/modules/installer/virtualbox-demo.nix
new file mode 100644
index 00000000000..3b4238858bd
--- /dev/null
+++ b/modules/installer/virtualbox-demo.nix
@@ -0,0 +1,10 @@
+{ config, pkgs, ... }:
+
+{
+  require =
+    [ ../virtualisation/virtualbox-image.nix
+      ../installer/cd-dvd/channel.nix
+      ../profiles/demo.nix
+      ../profiles/clone-config.nix
+    ];
+}
diff --git a/release.nix b/release.nix
index f4decf594dc..06f1a447084 100644
--- a/release.nix
+++ b/release.nix
@@ -184,9 +184,7 @@ in {
         inherit system;
         modules =
           [ versionModule
-            ./modules/virtualisation/virtualbox-image.nix
-            ./modules/installer/cd-dvd/channel.nix
-            ./modules/profiles/demo.nix
+            ./modules/installer/virtualbox-demo.nix
           ];
       }).config;
 
-- 
GitLab


From c8fca8c8fc4ffaf92f5eabab22d47ecacf731bba Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 5 Jul 2013 17:24:49 +0200
Subject: [PATCH 4713/5331] NixOS VM tests: Use 9p instead of CIFS

---
 modules/profiles/qemu-guest.nix    |  2 +-
 modules/virtualisation/qemu-vm.nix | 84 ++++++++----------------------
 2 files changed, 23 insertions(+), 63 deletions(-)

diff --git a/modules/profiles/qemu-guest.nix b/modules/profiles/qemu-guest.nix
index 548cc58732e..c8e6fd4aa76 100644
--- a/modules/profiles/qemu-guest.nix
+++ b/modules/profiles/qemu-guest.nix
@@ -4,6 +4,6 @@
 { config, pkgs, ... }:
 
 {
-  boot.initrd.availableKernelModules = [ "virtio_net" "virtio_pci" "virtio_blk" ];
+  boot.initrd.availableKernelModules = [ "virtio_net" "virtio_pci" "virtio_blk" "9p" "9pnet_virtio" ];
   boot.kernelModules = [ "virtio_balloon" "virtio_console" ];
 }
diff --git a/modules/virtualisation/qemu-vm.nix b/modules/virtualisation/qemu-vm.nix
index ae086141eee..a54d8e1d172 100644
--- a/modules/virtualisation/qemu-vm.nix
+++ b/modules/virtualisation/qemu-vm.nix
@@ -162,23 +162,13 @@ let
             ${toString config.virtualisation.diskSize}M || exit 1
       fi
 
-      # Start Samba (which wants to put its socket and config files in TMPDIR).
+      # Create a directory for exchanging data with the VM.
       if [ -z "$TMPDIR" -o -z "$USE_TMPDIR" ]; then
-          TMPDIR=$(mktemp -d nix-vm-smbd.XXXXXXXXXX --tmpdir)
+          TMPDIR=$(mktemp -d nix-vm.XXXXXXXXXX --tmpdir)
       fi
       cd $TMPDIR
       mkdir -p $TMPDIR/xchg
 
-      EXTRA_SAMBA_CONF="
-        [shared]
-          force user = $WHO
-          path = ''${SHARED_DIR:-$TMPDIR/xchg}
-          read only = no
-          guest ok = yes
-      "
-
-      ${pkgs.vmTools.startSamba}
-
       idx=2
       extraDisks=""
       ${flip concatMapStrings cfg.emptyDiskImages (size: ''
@@ -189,13 +179,16 @@ let
 
       # Start QEMU.
       # "-boot menu=on" is there, because I don't know how to make qemu boot from 2nd hd.
-      exec ${pkgs.qemu_kvm}/bin/qemu-kvm \
+      exec ${pkgs.qemu}/bin/qemu-system-${if pkgs.stdenv.system == "x86_64-linux" then "x86_64" else "i386"} \
+          -enable-kvm \
           -name ${vmName} \
           -m ${toString config.virtualisation.memorySize} \
           ${optionalString (pkgs.stdenv.system == "x86_64-linux") "-cpu kvm64"} \
           -net nic,vlan=0,model=virtio \
-          -chardev socket,id=samba,path=./samba \
-          -net user,vlan=0,guestfwd=tcp:10.0.2.4:445-chardev:samba''${QEMU_NET_OPTS:+,$QEMU_NET_OPTS} \
+          -net user,vlan=0''${QEMU_NET_OPTS:+,$QEMU_NET_OPTS} \
+          -virtfs local,path=/nix/store,security_model=none,mount_tag=store \
+          -virtfs local,path=$TMPDIR/xchg,security_model=none,mount_tag=xchg \
+          -virtfs local,path=''${SHARED_DIR:-$TMPDIR/xchg},security_model=none,mount_tag=shared \
           ${if cfg.useBootLoader then ''
             -drive index=0,id=drive1,file=$NIX_DISK_IMAGE,if=virtio,cache=writeback,werror=report \
             -drive index=1,id=drive2,file=${bootDisk}/disk.img,if=virtio,readonly \
@@ -271,12 +264,6 @@ in
 
   boot.loader.grub.device = mkOverride 50 "/dev/vda";
 
-  # All the modules the initrd needs to mount the host filesystem via
-  # CIFS.  Also use paravirtualised network and block devices for
-  # performance.
-  boot.initrd.availableKernelModules =
-    [ "cifs" "nls_utf8" "hmac" "md4" "ecb" "des_generic" "sha256" ];
-
   boot.initrd.supportedFilesystems = optional cfg.writableStore "unionfs-fuse";
 
   boot.initrd.extraUtilsCommands =
@@ -287,10 +274,6 @@ in
 
   boot.initrd.postDeviceCommands =
     ''
-      # Set up networking.  Needed for CIFS mounting.
-      ip link set eth0 up
-      ip addr add 10.0.2.15/24 dev eth0
-
       # If the disk image appears to be empty, run mke2fs to
       # initialise.
       FSTYPE=$(blkid -o value -s TYPE /dev/vda || true)
@@ -338,30 +321,29 @@ in
 
   virtualisation.qemu.options = [ "-vga std" "-usbdevice tablet" ];
 
-  # Mount the host filesystem via CIFS, and bind-mount the Nix store
-  # of the host into our own filesystem.  We use mkOverride to allow
-  # this module to be applied to "normal" NixOS system configuration,
-  # where the regular value for the `fileSystems' attribute should be
+  # Mount the host filesystem via 9P, and bind-mount the Nix store of
+  # the host into our own filesystem.  We use mkOverride to allow this
+  # module to be applied to "normal" NixOS system configuration, where
+  # the regular value for the `fileSystems' attribute should be
   # disregarded for the purpose of building a VM test image (since
   # those filesystems don't exist in the VM).
   fileSystems = mkOverride 10
-    (let mode = if builtins.compareVersions "3.5" config.boot.kernelPackages.kernel.version == 1 then "none" else "ntlm"; in
     { "/".device = "/dev/vda";
       "/nix/store" =
-        { device = "//10.0.2.4/store";
-          fsType = "cifs";
-          options = "guest,sec=${mode},noperm,noacl";
+        { device = "store";
+          fsType = "9p";
+          options = "trans=virtio,version=9p2000.L,msize=1048576,cache=loose";
         };
       "/tmp/xchg" =
-        { device = "//10.0.2.4/xchg";
-          fsType = "cifs";
-          options = "guest,sec=${mode},noperm,noacl";
+        { device = "xchg";
+          fsType = "9p";
+          options = "trans=virtio,version=9p2000.L,msize=1048576,cache=loose";
           neededForBoot = true;
         };
       "/tmp/shared" =
-        { device = "//10.0.2.4/shared";
-          fsType = "cifs";
-          options = "guest,sec=${mode},noperm,noacl";
+        { device = "shared";
+          fsType = "9p";
+          options = "trans=virtio,version=9p2000.L,msize=1048576";
           neededForBoot = true;
         };
     } // optionalAttrs cfg.useBootLoader
@@ -371,24 +353,10 @@ in
           options = "ro";
           noCheck = true; # fsck fails on a r/o filesystem
         };
-    });
+    };
 
   swapDevices = mkOverride 50 [ ];
 
-  # Starting DHCP brings down eth0, which kills the connection to the
-  # host filesystem and thus deadlocks the system.
-  networking.useDHCP = false;
-
-  networking.defaultGateway = mkOverride 200 "10.0.2.2";
-
-  networking.nameservers = [ "10.0.2.3" ];
-
-  networking.interfaces = singleton
-    { name = "eth0";
-      ipAddress = "10.0.2.15";
-      prefixLength = 24;
-    };
-
   # Don't run ntpd in the guest.  It should get the correct time from KVM.
   services.ntp.enable = false;
 
@@ -399,13 +367,6 @@ in
       ln -s ${pkgs.writeScript "run-nixos-vm" startVM} $out/bin/run-${vmName}-vm
     '';
 
-  # sendfile() is currently broken over CIFS, so fix it here for all
-  # configurations that use Apache.
-  services.httpd.extraConfig =
-    ''
-      EnableSendFile Off
-    '';
-
   # When building a regular system configuration, override whatever
   # video driver the host uses.
   services.xserver.videoDriver = mkOverride 50 null;
@@ -427,7 +388,6 @@ in
       (isEnabled "VIRTIO_PCI")
       (isEnabled "VIRTIO_NET")
       (isEnabled "EXT4_FS")
-      (isEnabled "CIFS")
       (isYes "BLK_DEV")
       (isYes "PCI")
       (isYes "EXPERIMENTAL")
-- 
GitLab


From 769b74c463cfafb86594fe1abad188ed71dc3013 Mon Sep 17 00:00:00 2001
From: Mathijs Kwik <mathijs@bluescreen303.nl>
Date: Sun, 7 Jul 2013 22:21:36 +0200
Subject: [PATCH 4714/5331] nixos-vm: switch to qemu for disk images too :)

---
 modules/virtualisation/qemu-vm.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/virtualisation/qemu-vm.nix b/modules/virtualisation/qemu-vm.nix
index a54d8e1d172..70487c329a8 100644
--- a/modules/virtualisation/qemu-vm.nix
+++ b/modules/virtualisation/qemu-vm.nix
@@ -158,7 +158,7 @@ let
       NIX_DISK_IMAGE=$(readlink -f ''${NIX_DISK_IMAGE:-${config.virtualisation.diskImage}})
 
       if ! test -e "$NIX_DISK_IMAGE"; then
-          ${pkgs.qemu_kvm}/bin/qemu-img create -f qcow2 "$NIX_DISK_IMAGE" \
+          ${pkgs.qemu}/bin/qemu-img create -f qcow2 "$NIX_DISK_IMAGE" \
             ${toString config.virtualisation.diskSize}M || exit 1
       fi
 
@@ -172,7 +172,7 @@ let
       idx=2
       extraDisks=""
       ${flip concatMapStrings cfg.emptyDiskImages (size: ''
-        ${pkgs.qemu_kvm}/bin/qemu-img create -f raw "empty$idx" "${toString size}M"
+        ${pkgs.qemu}/bin/qemu-img create -f raw "empty$idx" "${toString size}M"
         extraDisks="$extraDisks -drive index=$idx,file=$(pwd)/empty$idx,if=virtio,werror=report"
         idx=$((idx + 1))
       '')}
-- 
GitLab


From ff84facca3508e263048ec2d3171e4db5d06f3d6 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Mon, 8 Jul 2013 01:44:48 +0200
Subject: [PATCH 4715/5331] grub: Add mdadm to search path.

Grub uses mdadm to find out the device it is on, especially when mdadm itself
resides in a separate boot partition. When bootstrapping from a NixOS
installation CD, it's not a big issue because usually the paths from the Nix
store of the installation CD are matching with the ones in the chrooted
environment.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 modules/system/boot/loader/grub/grub.nix | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/modules/system/boot/loader/grub/grub.nix b/modules/system/boot/loader/grub/grub.nix
index 1552d2cb102..4208465d590 100644
--- a/modules/system/boot/loader/grub/grub.nix
+++ b/modules/system/boot/loader/grub/grub.nix
@@ -26,7 +26,11 @@ let
         version extraConfig extraPerEntryConfig extraEntries
         extraEntriesBeforeNixOS extraPrepareConfig configurationLimit copyKernels timeout
         default devices;
-      path = makeSearchPath "bin" [ pkgs.coreutils pkgs.gnused pkgs.gnugrep pkgs.findutils pkgs.diffutils ];
+      path = (makeSearchPath "bin" [
+        pkgs.coreutils pkgs.gnused pkgs.gnugrep pkgs.findutils pkgs.diffutils
+      ]) + ":" + (makeSearchPath "sbin" [
+        pkgs.mdadm
+      ]);
     });
 
 in
-- 
GitLab


From b26f3141db38d19418e9027a9bb24796a665dcb3 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 9 Jul 2013 15:08:48 +0200
Subject: [PATCH 4716/5331] Start httpd synchronously

This ensures that when "start httpd" returns, Apache is actually
listening.

http://hydra.nixos.org/build/5499393
---
 modules/services/web-servers/apache-httpd/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/modules/services/web-servers/apache-httpd/default.nix b/modules/services/web-servers/apache-httpd/default.nix
index b66f6d7cd1d..c7b9ec27737 100644
--- a/modules/services/web-servers/apache-httpd/default.nix
+++ b/modules/services/web-servers/apache-httpd/default.nix
@@ -651,8 +651,9 @@ in
             done
           '';
 
-        serviceConfig.ExecStart = "@${httpd}/bin/httpd httpd -f ${httpdConf} -DNO_DETACH";
+        serviceConfig.ExecStart = "@${httpd}/bin/httpd httpd -f ${httpdConf}";
         serviceConfig.ExecStop = "${httpd}/bin/httpd -f ${httpdConf} -k graceful-stop";
+        serviceConfig.Type = "forking";
         serviceConfig.Restart = "always";
       };
 
-- 
GitLab


From e962c62162f402326cff64a9ee2c6d581803d8ba Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 9 Jul 2013 15:16:04 +0200
Subject: [PATCH 4717/5331] Give more memory to the KDE test

http://hydra.nixos.org/build/5499387
---
 tests/kde4.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/tests/kde4.nix b/tests/kde4.nix
index f435d983791..71c41847673 100644
--- a/tests/kde4.nix
+++ b/tests/kde4.nix
@@ -7,6 +7,8 @@
 
     { require = [ ./common/user-account.nix ];
 
+      virtualisation.memorySize = 768;
+
       services.xserver.enable = true;
 
       services.httpd.enable = true;
-- 
GitLab


From 60f1424cde14d620229ded4ea41ac23ef1a63359 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 9 Jul 2013 15:29:29 +0200
Subject: [PATCH 4718/5331] Fix the rebuildCD test

http://hydra.nixos.org/build/5500743
---
 tests/installer.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/installer.nix b/tests/installer.nix
index 565f1d6a680..f75965f5d12 100644
--- a/tests/installer.nix
+++ b/tests/installer.nix
@@ -25,6 +25,7 @@ let
                 pkgs.docbook5_xsl
                 pkgs.grub
                 pkgs.perlPackages.XMLLibXML
+                pkgs.unionfs-fuse
               ];
           }
         ];
@@ -334,8 +335,7 @@ in {
             "sed -i 's,^}\$,jobs.sshd.startOn = pkgs.lib.mkOverride 0 \"startup\"; },' /etc/nixos/configuration.nix"
           );
 
-          my $cfg = $machine->succeed("cat /etc/nixos/configuration.nix");
-          print STDERR "New CD config:\n$cfg\n";
+          $machine->succeed("cat /etc/nixos/configuration.nix >&2");
 
           # Apply the new CD configuration.
           $machine->succeed("nixos-rebuild test");
-- 
GitLab


From 5000d99149a982e5219065a408060820aa8fc426 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 9 Jul 2013 15:59:57 +0200
Subject: [PATCH 4719/5331] Remove outdated comment

Password-based remote root logins are not allowed anyway.
---
 modules/profiles/installation-device.nix | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/modules/profiles/installation-device.nix b/modules/profiles/installation-device.nix
index 28c6b09670b..34f1b1b05b4 100644
--- a/modules/profiles/installation-device.nix
+++ b/modules/profiles/installation-device.nix
@@ -39,9 +39,7 @@ with pkgs.lib;
             "Type `start display-manager' to\nstart the graphical user interface."}
       '';
 
-    # Allow sshd to be started manually through "start sshd".  It should
-    # not be started by default on the installation CD because the
-    # default root password is empty.
+    # Allow sshd to be started manually through "start sshd".
     services.openssh.enable = true;
     jobs.sshd.startOn = pkgs.lib.mkOverride 50 "";
 
-- 
GitLab


From fd14641ef586265693a2f1e70910b0816d5832c7 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 9 Jul 2013 16:12:34 +0200
Subject: [PATCH 4720/5331] Fix the sshd check in the rebuildCD test

Also reduce the amount of memory.
---
 modules/profiles/installation-device.nix | 2 +-
 tests/installer.nix                      | 9 ++++-----
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/modules/profiles/installation-device.nix b/modules/profiles/installation-device.nix
index 34f1b1b05b4..5a92789e5d9 100644
--- a/modules/profiles/installation-device.nix
+++ b/modules/profiles/installation-device.nix
@@ -41,7 +41,7 @@ with pkgs.lib;
 
     # Allow sshd to be started manually through "start sshd".
     services.openssh.enable = true;
-    jobs.sshd.startOn = pkgs.lib.mkOverride 50 "";
+    systemd.services.sshd.wantedBy = mkOverride 50 [];
 
     # Enable wpa_supplicant, but don't start it by default.
     networking.wireless.enable = true;
diff --git a/tests/installer.nix b/tests/installer.nix
index f75965f5d12..a07beaeb1e6 100644
--- a/tests/installer.nix
+++ b/tests/installer.nix
@@ -326,13 +326,12 @@ in {
       nodes = { };
       testScript =
         ''
-          # damn, it's costly to evaluate nixos-rebuild (1G of ram)
-          my $machine = createMachine({ cdrom => glob("${iso}/iso/*.iso"), qemuFlags => '-m 1024' });
+          my $machine = createMachine({ cdrom => glob("${iso}/iso/*.iso"), qemuFlags => '-m 768' });
           $machine->start;
 
           # Enable sshd service.
           $machine->succeed(
-            "sed -i 's,^}\$,jobs.sshd.startOn = pkgs.lib.mkOverride 0 \"startup\"; },' /etc/nixos/configuration.nix"
+            "sed -i 's,^}\$,systemd.services.sshd.wantedBy = pkgs.lib.mkOverride 0 [\"multi-user.target\"]; },' /etc/nixos/configuration.nix"
           );
 
           $machine->succeed("cat /etc/nixos/configuration.nix >&2");
@@ -341,8 +340,8 @@ in {
           $machine->succeed("nixos-rebuild test");
 
           # Connect to it-self.
-          #$machine->waitForUnit("sshd");
-          #$machine->succeed("ssh root@127.0.0.1 echo hello");
+          $machine->waitForUnit("sshd");
+          $machine->waitForOpenPort(22);
 
           $machine->shutdown;
         '';
-- 
GitLab


From cc5421106942ce82473f4afd74d156d8d1e303bd Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 9 Jul 2013 17:23:27 +0200
Subject: [PATCH 4721/5331] systemd-vconsole-setup: Add missing wantedBy

Reported by Kirill Elagin.
---
 modules/tasks/kbd.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/modules/tasks/kbd.nix b/modules/tasks/kbd.nix
index 145e43794e5..8de5f43edac 100644
--- a/modules/tasks/kbd.nix
+++ b/modules/tasks/kbd.nix
@@ -73,6 +73,7 @@ in
     # it has a restart trigger.
     systemd.services."systemd-vconsole-setup" =
       { description = "Setup Virtual Console";
+        wantedBy = [ "sysinit.target" "multi-user.target" ];
         before = [ "sysinit.target" "shutdown.target" ];
         unitConfig =
           { DefaultDependencies = "no";
-- 
GitLab


From fb5a616b020b9a769021add02379a431ea507a83 Mon Sep 17 00:00:00 2001
From: Rok Garbas <rok@garbas.si>
Date: Wed, 10 Jul 2013 16:43:26 +0200
Subject: [PATCH 4722/5331] openconnect and vpnc NetworkManager plugins added

---
 modules/services/networking/networkmanager.nix | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

diff --git a/modules/services/networking/networkmanager.nix b/modules/services/networking/networkmanager.nix
index 88f1e08b377..bbc4d1f8cea 100644
--- a/modules/services/networking/networkmanager.nix
+++ b/modules/services/networking/networkmanager.nix
@@ -92,9 +92,19 @@ in {
       { source = "${networkmanager_openvpn}/etc/NetworkManager/VPN/nm-openvpn-service.name";
         target = "NetworkManager/VPN/nm-openvpn-service.name";
       }
+      { source = "${networkmanager_vpnc}/etc/NetworkManager/VPN/nm-vpnc-service.name";
+        target = "NetworkManager/VPN/nm-vpnc-service.name";
+      }
+      { source = "${networkmanager_openconnect}/etc/NetworkManager/VPN/nm-openconnect-service.name";
+        target = "NetworkManager/VPN/nm-openconnect-service.name";
+      }
     ];
 
-    environment.systemPackages = cfg.packages ++ [ networkmanager_openvpn ];
+    environment.systemPackages = cfg.packages ++ [
+        networkmanager_openvpn
+        networkmanager_vpnc
+        networkmanager_openconnect
+        ];
 
     users.extraGroups = singleton {
       name = "networkmanager";
@@ -134,7 +144,11 @@ in {
     security.polkit.permissions = polkitConf;
 
     # openvpn plugin has only dbus interface
-    services.dbus.packages = cfg.packages ++ [ networkmanager_openvpn ];
+    services.dbus.packages = cfg.packages ++ [
+        networkmanager_openvpn
+        networkmanager_vpnc
+        networkmanager_openconnect
+        ];
 
     services.udev.packages = cfg.packages;
   };
-- 
GitLab


From c75c5399534c958c52f6067c0495fbcd1cd5553f Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 11 Jul 2013 11:55:42 +0200
Subject: [PATCH 4723/5331] Installer test: Give the webserver more memory

Otherwise its unionfs may run into allocation failures.

http://hydra.nixos.org/build/5508805
---
 tests/installer.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tests/installer.nix b/tests/installer.nix
index a07beaeb1e6..74e0149feec 100644
--- a/tests/installer.nix
+++ b/tests/installer.nix
@@ -82,6 +82,7 @@ let
 
       virtualisation.writableStore = true;
       virtualisation.pathsInNixDB = channelContents;
+      virtualisation.memorySize = 512;
     };
 
   channelContents = [ pkgs.hello.src pkgs.rlwrap ];
-- 
GitLab


From 6d6fb43498f6049ef103d31a0ad24eb0717851e7 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 11 Jul 2013 13:18:51 +0200
Subject: [PATCH 4724/5331] Bump the amount of memory for VirtualBox image
 generation

http://hydra.nixos.org/build/5509519
---
 modules/virtualisation/virtualbox-image.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/modules/virtualisation/virtualbox-image.nix b/modules/virtualisation/virtualbox-image.nix
index 77177f7a46c..ff00ba7aee4 100644
--- a/modules/virtualisation/virtualbox-image.nix
+++ b/modules/virtualisation/virtualbox-image.nix
@@ -6,7 +6,8 @@ with pkgs.lib;
   system.build.virtualBoxImage =
     pkgs.vmTools.runInLinuxVM (
       pkgs.runCommand "virtualbox-image"
-        { preVM =
+        { memSize = 1024;
+          preVM =
             ''
               mkdir $out
               diskImage=$out/image
-- 
GitLab


From 8499959c4a79e129f5073b32bc550b65a68f2c35 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 12 Jul 2013 15:17:35 +0200
Subject: [PATCH 4725/5331] Give the webserver in the installer test still more
 memory

http://hydra.nixos.org/build/5510269
---
 tests/installer.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/installer.nix b/tests/installer.nix
index 74e0149feec..8488726efe0 100644
--- a/tests/installer.nix
+++ b/tests/installer.nix
@@ -82,7 +82,7 @@ let
 
       virtualisation.writableStore = true;
       virtualisation.pathsInNixDB = channelContents;
-      virtualisation.memorySize = 512;
+      virtualisation.memorySize = 768;
     };
 
   channelContents = [ pkgs.hello.src pkgs.rlwrap ];
-- 
GitLab


From 916d39f5ce36964a5b62f20d4c5ae3d18cfdea51 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Sun, 14 Jul 2013 01:47:40 +0200
Subject: [PATCH 4726/5331] mysql/mysql55: Log to stderr instead of logfile.

This should integrate the logging more tightly into systemd, so for
example "systemctl status mysql" actually gives an overview about what's
actually going on.

This removes the logError option attribute, so in case you still want to
write into a logfile, I've introduced an option called extraOptions, so
you can use something like:

services.mysql*.extraOptions = ''
  log-error = /var/log/mysql_err.log
'';

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 modules/services/databases/mysql.nix   | 24 ++++++++++++++++++------
 modules/services/databases/mysql55.nix | 24 ++++++++++++++++++------
 2 files changed, 36 insertions(+), 12 deletions(-)

diff --git a/modules/services/databases/mysql.nix b/modules/services/databases/mysql.nix
index 7bf7a77aa85..ed9d03dc60f 100644
--- a/modules/services/databases/mysql.nix
+++ b/modules/services/databases/mysql.nix
@@ -12,7 +12,7 @@ let
 
   mysqldOptions =
     "--user=${cfg.user} --datadir=${cfg.dataDir} " +
-    "--log-error=${cfg.logError} --pid-file=${pidFile}";
+    "--pid-file=${pidFile}";
 
   myCnf = pkgs.writeText "my.cnf"
   ''
@@ -26,6 +26,7 @@ let
       master-password = ${cfg.replication.masterPassword}
       master-port = ${toString cfg.replication.masterPort}
     ''}
+    ${cfg.extraOptions}
   '';
 
 in
@@ -67,16 +68,27 @@ in
         description = "Location where MySQL stores its table files";
       };
 
-      logError = mkOption {
-        default = "/var/log/mysql_err.log";
-        description = "Location of the MySQL error logfile";
-      };
-
       pidDir = mkOption {
         default = "/var/run/mysql";
         description = "Location of the file which stores the PID of the MySQL server";
       };
 
+      extraOptions = mkOption {
+        default = "";
+        example = ''
+          key_buffer_size = 6G
+          table_cache = 1600
+          log-error = /var/log/mysql_err.log
+        '';
+        description = ''
+          Provide extra options to the MySQL configuration file.
+
+          Please note, that these options are added to the
+          <literal>[mysqld]</literal> section so you don't need to explicitly
+          state it again.
+        '';
+      };
+
       initialDatabases = mkOption {
         default = [];
         description = "List of database names and their initial schemas that should be used to create databases on the first startup of MySQL";
diff --git a/modules/services/databases/mysql55.nix b/modules/services/databases/mysql55.nix
index 37cab395677..1da182a0e59 100644
--- a/modules/services/databases/mysql55.nix
+++ b/modules/services/databases/mysql55.nix
@@ -12,13 +12,14 @@ let
 
   mysqldOptions =
     "--user=${cfg.user} --datadir=${cfg.dataDir} " +
-    "--log-error=${cfg.logError} --pid-file=${pidFile}";
+    "--pid-file=${pidFile}";
 
   myCnf = pkgs.writeText "my.cnf"
   ''
     [mysqld]
     ${optionalString (cfg.replication.role == "master" || cfg.replication.role == "slave") "log-bin=mysql-bin"}
     ${optionalString (cfg.replication.role == "master" || cfg.replication.role == "slave") "server-id = ${toString cfg.replication.serverId}"}
+    ${cfg.extraOptions}
   '';
 
 in
@@ -60,16 +61,27 @@ in
         description = "Location where MySQL stores its table files";
       };
 
-      logError = mkOption {
-        default = "/var/log/mysql_err.log";
-        description = "Location of the MySQL error logfile";
-      };
-
       pidDir = mkOption {
         default = "/var/run/mysql";
         description = "Location of the file which stores the PID of the MySQL server";
       };
 
+      extraOptions = mkOption {
+        default = "";
+        example = ''
+          key_buffer_size = 6G
+          table_cache = 1600
+          log-error = /var/log/mysql_err.log
+        '';
+        description = ''
+          Provide extra options to the MySQL configuration file.
+
+          Please note, that these options are added to the
+          <literal>[mysqld]</literal> section so you don't need to explicitly
+          state it again.
+        '';
+      };
+
       initialDatabases = mkOption {
         default = [];
         description = "List of database names and their initial schemas that should be used to create databases on the first startup of MySQL";
-- 
GitLab


From ec1f3e78322eefbc16321ee55a5594b97e7131bb Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Sun, 14 Jul 2013 04:57:50 +0200
Subject: [PATCH 4727/5331] postgresql: Log to stderr by default.

Now systemctl status will properly pick up the right logs.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 modules/services/databases/postgresql.nix | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/modules/services/databases/postgresql.nix b/modules/services/databases/postgresql.nix
index 28ea4b7dcf0..bac32626254 100644
--- a/modules/services/databases/postgresql.nix
+++ b/modules/services/databases/postgresql.nix
@@ -29,7 +29,7 @@ let
     ''
       hba_file = '${pkgs.writeText "pg_hba.conf" cfg.authentication}'
       ident_file = '${pkgs.writeText "pg_ident.conf" cfg.identMap}'
-      log_destination = 'syslog'
+      log_destination = 'stderr'
       ${cfg.extraConfig}
     '';
 
@@ -66,13 +66,6 @@ in
         '';
       };
 
-      logDir = mkOption {
-        default = "/var/log/postgresql";
-        description = ''
-          Log directory for PostgreSQL.
-        '';
-      };
-
       dataDir = mkOption {
         default = "/var/db/postgresql";
         description = ''
-- 
GitLab


From d5f0183153f85432a7d95dfe24708340bcfddd0b Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Sun, 14 Jul 2013 05:01:48 +0200
Subject: [PATCH 4728/5331] postgresql: Add initialScript for initial SQL.

Just like in the MySQL service module it really makes sense to provide a
way to inject SQL on the first start of the database cluster.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 modules/services/databases/postgresql.nix | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/modules/services/databases/postgresql.nix b/modules/services/databases/postgresql.nix
index bac32626254..bd1eaa5e6bd 100644
--- a/modules/services/databases/postgresql.nix
+++ b/modules/services/databases/postgresql.nix
@@ -87,6 +87,14 @@ in
         '';
       };
 
+      initialScript = mkOption {
+        default = null;
+        type = types.nullOr types.path;
+        description = ''
+          A file containing SQL statements to execute on first startup.
+        '';
+      };
+
       authMethod = mkOption {
         default = " ident sameuser ";
         description = ''
@@ -166,6 +174,7 @@ in
                 chown -R postgres ${cfg.dataDir}
                 su -s ${pkgs.stdenv.shell} postgres -c 'initdb -U root'
                 rm -f ${cfg.dataDir}/*.conf
+                touch "${cfg.dataDir}/.first_startup"
             fi
 
             ln -sfn ${configFile} ${cfg.dataDir}/postgresql.conf
@@ -193,6 +202,13 @@ in
                 if ! kill -0 "$MAINPID"; then exit 1; fi
                 sleep 0.1
             done
+
+            if test -e "${cfg.dataDir}/.first_startup"; then
+              ${optionalString (cfg.initialScript != null) ''
+                cat "${cfg.initialScript}" | psql postgres
+              ''}
+              rm -f "${cfg.dataDir}/.first_startup"
+            fi
           '';
 
         unitConfig.RequiresMountsFor = "${cfg.dataDir}";
-- 
GitLab


From ab08c8a1bb745b71aabfc8f79f3882987c9f9811 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Sun, 14 Jul 2013 05:04:10 +0200
Subject: [PATCH 4729/5331] postgresql: Allow to specify recoveryConfig.

This is needed for streaming replication in PostgreSQL 9.0 and higher.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 modules/services/databases/postgresql.nix | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/modules/services/databases/postgresql.nix b/modules/services/databases/postgresql.nix
index bd1eaa5e6bd..de03fe1e46e 100644
--- a/modules/services/databases/postgresql.nix
+++ b/modules/services/databases/postgresql.nix
@@ -129,6 +129,14 @@ in
         default = "";
         description = "Additional text to be appended to <filename>postgresql.conf</filename>.";
       };
+
+      recoveryConfig = mkOption {
+        default = null;
+        type = types.nullOr types.string;
+        description = ''
+          Values to put into recovery.conf file.
+        '';
+      };
     };
 
   };
@@ -177,7 +185,11 @@ in
                 touch "${cfg.dataDir}/.first_startup"
             fi
 
-            ln -sfn ${configFile} ${cfg.dataDir}/postgresql.conf
+            ln -sfn "${configFile}" "${cfg.dataDir}/postgresql.conf"
+            ${optionalString (cfg.recoveryConfig != null) ''
+              ln -sfn "${pkgs.writeText "recovery.conf" cfg.recoveryConfig}" \
+                "${cfg.dataDir}/recovery.conf"
+            ''}
           ''; # */
 
         serviceConfig =
-- 
GitLab


From 69eeb830394ab3059a66f876dd9ff92caa356bbd Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 12 Jul 2013 16:02:52 +0200
Subject: [PATCH 4730/5331] Use "or"

---
 modules/services/networking/firewall.nix | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/modules/services/networking/firewall.nix b/modules/services/networking/firewall.nix
index c47210c7cef..40fbbabed3f 100644
--- a/modules/services/networking/firewall.nix
+++ b/modules/services/networking/firewall.nix
@@ -40,13 +40,9 @@ let
     '';
 
   kernelPackages = config.boot.kernelPackages;
-  kernelHasRPFilter = kernelPackages.kernel ? features
-                   && kernelPackages.kernel.features ? netfilterRPFilter
-                   && kernelPackages.kernel.features.netfilterRPFilter;
 
-  kernelCanDisableHelpers = kernelPackages.kernel ? features
-                   && kernelPackages.kernel.features ? canDisableNetfilterConntrackHelpers
-                   && kernelPackages.kernel.features.canDisableNetfilterConntrackHelpers;
+  kernelHasRPFilter = kernelPackages.kernel.features.netfilterRPFilter or false;
+  kernelCanDisableHelpers = kernelPackages.kernel.features.canDisableNetfilterConntrackHelpers or false;
 
 in
 
-- 
GitLab


From 986e236068c9d823c7477caade10252b817dea17 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 15 Jul 2013 13:06:21 +0200
Subject: [PATCH 4731/5331] nixos-rebuild: Support Nix's --repair flag

---
 modules/installer/tools/nixos-rebuild.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/installer/tools/nixos-rebuild.sh b/modules/installer/tools/nixos-rebuild.sh
index 16ec49bde9b..7fd0908a935 100644
--- a/modules/installer/tools/nixos-rebuild.sh
+++ b/modules/installer/tools/nixos-rebuild.sh
@@ -71,7 +71,7 @@ while [ "$#" -gt 0 ]; do
       --upgrade)
         upgrade=1
         ;;
-      --show-trace|--no-build-hook|--keep-failed|-K|--keep-going|-k|--verbose|-v|--fallback)
+      --show-trace|--no-build-hook|--keep-failed|-K|--keep-going|-k|--verbose|-v|--fallback|--repair)
         extraBuildFlags+=("$i")
         ;;
       --max-jobs|-j|--cores|-I)
-- 
GitLab


From 002ffea364331adcb5dccd87dddf69d5f5912271 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 15 Jul 2013 13:52:46 +0200
Subject: [PATCH 4732/5331] wpa_supplicant: Fix wlan interface detection on
 Linux 3.4

Linux 3.4 apparently doesn't have the "wireless" file.
---
 modules/services/networking/wpa_supplicant.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/modules/services/networking/wpa_supplicant.nix b/modules/services/networking/wpa_supplicant.nix
index 11f8778a0ab..dca398dd8be 100644
--- a/modules/services/networking/wpa_supplicant.nix
+++ b/modules/services/networking/wpa_supplicant.nix
@@ -110,7 +110,9 @@ in
           ''
             ${if ifaces == [] then ''
               for i in $(cd /sys/class/net && echo *); do
-                if [ -e /sys/class/net/$i/wireless ]; then
+                DEVTYPE=
+                source /sys/class/net/$i/uevent
+                if [ "$DEVTYPE" = "wlan" -o -e /sys/class/net/$i/wireless ]; then
                   ifaces="$ifaces''${ifaces:+ -N} -i$i"
                 fi
               done
-- 
GitLab


From b703aee0ec0fc9ba5212c1986a3458ba473526e7 Mon Sep 17 00:00:00 2001
From: Andraz Brodnik <brodul@brodul.org>
Date: Sun, 7 Jul 2013 15:49:50 +0200
Subject: [PATCH 4733/5331] Initial wireless configuration docs

---
 doc/manual/configuration.xml | 28 +++++++++++++++++++++++++++-
 1 file changed, 27 insertions(+), 1 deletion(-)

diff --git a/doc/manual/configuration.xml b/doc/manual/configuration.xml
index f1f99fb70ed..84a92872d0b 100644
--- a/doc/manual/configuration.xml
+++ b/doc/manual/configuration.xml
@@ -135,7 +135,33 @@ always allowed.)</para>
 
 <section><title>Wireless networks</title>
 
-<para>TODO</para>
+<para>
+NixOS will start wpa_supplicant for you if you enable this setting:
+
+<programlisting>
+networking.wireless.enable = true;
+</programlisting>
+
+NixOS currently does not generate wpa_supplicant's
+configuration file, <literal>/etc/wpa_supplicant.conf</literal>. You should edit this file
+ourself to define wireless networks, WPA keys and so on (see
+wpa_supplicant.conf(5)).
+</para>
+
+<para>
+If you are using WPA2 the <command>wpa_passphrase</command> tool might be useful
+to generate the <literal>wpa_supplicant.conf</literal>.
+
+<screen>
+$ wpa_passphrase ESSID PSK > /etc/wpa_supplicant.conf</screen>
+
+After you have edited the <literal>wpa_supplicant.conf</literal>,
+you need to restart the wpa_supplicant service.
+
+<screen>
+$ systemctl restart wpa_supplicant.service</screen>
+</para>
+
 
 </section>
 
-- 
GitLab


From deb7c6d35bffd569e137be72312089ad7515f2c4 Mon Sep 17 00:00:00 2001
From: Jack Cummings <jack@mudshark.org>
Date: Fri, 7 Jun 2013 09:34:46 -0700
Subject: [PATCH 4734/5331] don't try to re-import pools on service change

When nixos-rebuild grabs a new kernel, it will build new spl/zfs
modules, which will change the service. On completion nixos will try and
restart the services which will try and import pools again, and
generally will fail.

The pools are already imported, we don't need to do it again..
---
 modules/tasks/filesystems/zfs.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/modules/tasks/filesystems/zfs.nix b/modules/tasks/filesystems/zfs.nix
index b76c50f420f..7fc84bb2ac8 100644
--- a/modules/tasks/filesystems/zfs.nix
+++ b/modules/tasks/filesystems/zfs.nix
@@ -69,6 +69,7 @@ in
       serviceConfig = {
         Type = "oneshot";
         RemainAfterExit = true;
+        restartIfChanged = false;
         ExecStart = "${kernel.zfs}/sbin/zpool import -f -a -d /dev";
       };
     };
@@ -84,8 +85,8 @@ in
         ExecStop = "${kernel.zfs}/sbin/zfs umount -a";
       };
     };
- 
-    system.fsPackages = [ kernel.zfs ];                  # XXX: needed? zfs doesn't have a fsck
+
+    system.fsPackages = [ kernel.zfs ];                  # XXX: needed? zfs doesn't have (need) a fsck
     environment.systemPackages = [ kernel.zfs ];
     services.udev.packages = [ kernel.zfs ];             # to hook zvol naming, etc. 
   };
-- 
GitLab


From e0dfb1e4aeb69bad52c10dbb4a9711c785c2a73d Mon Sep 17 00:00:00 2001
From: Jack Cummings <jack@mudshark.org>
Date: Sun, 9 Jun 2013 22:01:48 -0700
Subject: [PATCH 4735/5331] calling zfs mount -a again doesn't make sense

---
 modules/tasks/filesystems/zfs.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/modules/tasks/filesystems/zfs.nix b/modules/tasks/filesystems/zfs.nix
index 7fc84bb2ac8..077d6a4471a 100644
--- a/modules/tasks/filesystems/zfs.nix
+++ b/modules/tasks/filesystems/zfs.nix
@@ -81,6 +81,7 @@ in
       serviceConfig = {
         Type = "oneshot";
         RemainAfterExit = true;
+        restartIfChanged = false;
         ExecStart = "${kernel.zfs}/sbin/zfs mount -a";
         ExecStop = "${kernel.zfs}/sbin/zfs umount -a";
       };
-- 
GitLab


From 2d57847f16b4c0348fef3af1bb7aed6bed116a3b Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 16 Jul 2013 11:55:12 +0200
Subject: [PATCH 4736/5331] NFS: Use network-online.target instead of
 remote-fs-pre.target

Turns out that remote-fs-pre.target is not actually "wanted" anywhere,
so statd is not started before remote filesystems are mounted.  But
remote filesystems do "want" network-online.target, so we can use that
to pull in statd and idmapd.

Not sure if this is really the right thing to do, but it works for
now.  Background:

  https://bugzilla.redhat.com/show_bug.cgi?id=787314

http://hydra.nixos.org/build/5542230
---
 modules/system/boot/systemd.nix   | 1 +
 modules/tasks/filesystems/nfs.nix | 8 ++++----
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/modules/system/boot/systemd.nix b/modules/system/boot/systemd.nix
index e055296c951..538ceeda2b5 100644
--- a/modules/system/boot/systemd.nix
+++ b/modules/system/boot/systemd.nix
@@ -29,6 +29,7 @@ let
       "multi-user.target"
       "getty.target"
       "network.target"
+      "network-online.target"
       "nss-lookup.target"
       "nss-user-lookup.target"
       "time-sync.target"
diff --git a/modules/tasks/filesystems/nfs.nix b/modules/tasks/filesystems/nfs.nix
index 3d5e1dd51f5..2b720a93b89 100644
--- a/modules/tasks/filesystems/nfs.nix
+++ b/modules/tasks/filesystems/nfs.nix
@@ -45,8 +45,8 @@ in
 
         path = [ pkgs.nfsUtils pkgs.sysvtools pkgs.utillinux ];
 
-        wantedBy = [ "remote-fs-pre.target" "multi-user.target" ];
-        before = [ "remote-fs-pre.target" ];
+        wantedBy = [ "network-online.target" "multi-user.target" ];
+        before = [ "network-online.target" ];
         requires = [ "basic.target" "rpcbind.service" ];
         after = [ "basic.target" "rpcbind.service" "network.target" ];
 
@@ -69,8 +69,8 @@ in
 
         path = [ pkgs.sysvtools pkgs.utillinux ];
 
-        wantedBy = [ "remote-fs-pre.target" "multi-user.target" ];
-        before = [ "remote-fs-pre.target" ];
+        wantedBy = [ "network-online.target" "multi-user.target" ];
+        before = [ "network-online.target" ];
         requires = [ "rpcbind.service" ];
         after = [ "rpcbind.service" ];
 
-- 
GitLab


From 163ed5264b7b52c94b21a6215d04f5743ee706ce Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 16 Jul 2013 13:48:52 +0200
Subject: [PATCH 4737/5331] Start sm-notify/statd atfer nfsd

The README of nfs-utils explains that we must not notify clients
before nfsd is running, otherwise they may fail to reclaim their
locks.  OTOH it's allowed but not required to start "rpc.statd
--no-notify" before nfsd.  So for simplicity we do both after starting
nfsd.
---
 modules/services/network-filesystems/nfsd.nix | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/modules/services/network-filesystems/nfsd.nix b/modules/services/network-filesystems/nfsd.nix
index ab8e77e2bad..4daa5e9d063 100644
--- a/modules/services/network-filesystems/nfsd.nix
+++ b/modules/services/network-filesystems/nfsd.nix
@@ -86,7 +86,8 @@ in
         wantedBy = [ "multi-user.target" ];
 
         requires = [ "rpcbind.service" "mountd.service" ];
-        after = [ "rpcbind.service" "mountd.service" "statd.service" ];
+        after = [ "rpcbind.service" "mountd.service" "idmapd.service" ];
+        before = [ "statd.service" ];
 
         path = [ pkgs.nfsUtils ];
 
@@ -98,8 +99,6 @@ in
             rpc.nfsd \
               ${if cfg.hostName != null then "-H ${cfg.hostName}" else ""} \
               ${builtins.toString cfg.nproc}
-
-            sm-notify -d
           '';
 
         postStop = "rpc.nfsd 0";
@@ -133,13 +132,13 @@ in
               ''
             }
 
-            exportfs -ra
+            exportfs -rav
           '';
 
         restartTriggers = [ exports ];
 
         serviceConfig.Type = "forking";
-        serviceConfig.ExecStart = "@${pkgs.nfsUtils}/sbin/rpc.mountd rpc.mountd -f /etc/exports";
+        serviceConfig.ExecStart = "@${pkgs.nfsUtils}/sbin/rpc.mountd rpc.mountd";
         serviceConfig.Restart = "always";
       };
 
-- 
GitLab


From 99b501a767d4508a64e7e788e5eeca3573adf3a2 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 16 Jul 2013 13:53:54 +0200
Subject: [PATCH 4738/5331] Don't pull in the old qemu-kvm

---
 lib/testing.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/testing.nix b/lib/testing.nix
index 9a72e1f4bd5..280cdf579db 100644
--- a/lib/testing.nix
+++ b/lib/testing.nix
@@ -27,7 +27,7 @@ rec {
         cp ${./test-driver/Logger.pm} $libDir/Logger.pm
 
         wrapProgram $out/bin/nixos-test-driver \
-          --prefix PATH : "${pkgs.qemu_kvm}/bin:${pkgs.vde2}/bin:${imagemagick}/bin:${coreutils}/bin" \
+          --prefix PATH : "${pkgs.qemu}/bin:${pkgs.vde2}/bin:${imagemagick}/bin:${coreutils}/bin" \
           --prefix PERL5LIB : "${lib.makePerlPath [ perlPackages.TermReadLineGnu perlPackages.XMLWriter perlPackages.IOTty ]}:$out/lib/perl5/site_perl"
       '';
   };
-- 
GitLab


From 567fbce9beaf6a126f13cdd2bd5ccd6be18f897e Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 16 Jul 2013 13:59:41 +0200
Subject: [PATCH 4739/5331] NFS test: Set a fixed fsid

Otherwise clients get a "Stale NFS handle" error after the server
reboots.  Not clear why this is the case, since the fsid shouldn't
change across reboots...
---
 tests/nfs.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/nfs.nix b/tests/nfs.nix
index 7c10eec310c..4690b9e67ae 100644
--- a/tests/nfs.nix
+++ b/tests/nfs.nix
@@ -26,7 +26,7 @@ in
         { services.nfs.server.enable = true;
           services.nfs.server.exports =
             ''
-              /data 192.168.1.0/255.255.255.0(rw,no_root_squash)
+              /data 192.168.1.0/255.255.255.0(rw,no_root_squash,no_subtree_check,fsid=0)
             '';
           services.nfs.server.createMountPoints = true;
         };
-- 
GitLab


From 10626bed8b524a3454013c51a848396ee74fef2e Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 16 Jul 2013 14:44:13 +0200
Subject: [PATCH 4740/5331] Add a test for NFSv4

However it currently fails because locking seems to be broken with
NFSv4.
---
 release.nix       | 3 ++-
 tests/default.nix | 3 ++-
 tests/nfs.nix     | 6 ++++--
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/release.nix b/release.nix
index 06f1a447084..ab2122aa02a 100644
--- a/release.nix
+++ b/release.nix
@@ -256,7 +256,8 @@ in {
       mysql = runTest (t: t.mysql.test);
       mysql_replication = runTest (t: t.mysql_replication.test);
       nat = runTest (t: t.nat.test);
-      nfs = runTest (t: t.nfs.test);
+      nfs3 = runTest (t: t.nfs3.test);
+      #nfs4 = runTest (t: t.nfs4.test);
       openssh = runTest (t: t.openssh.test);
       partition = runTest (t: t.partition.test);
       proxy = runTest (t: t.proxy.test);
diff --git a/tests/default.nix b/tests/default.nix
index 798fdf9817a..0822c93e81e 100644
--- a/tests/default.nix
+++ b/tests/default.nix
@@ -17,7 +17,8 @@ with import ../lib/testing.nix { inherit system minimal; };
   mysql = makeTest (import ./mysql.nix);
   mysql_replication = makeTest (import ./mysql-replication.nix);
   nat = makeTest (import ./nat.nix);
-  nfs = makeTest (import ./nfs.nix);
+  nfs3 = makeTest (import ./nfs.nix { version = 3; });
+  nfs4 = makeTest (import ./nfs.nix { version = 4; });
   openssh = makeTest (import ./openssh.nix);
   partition = makeTest (import ./partition.nix);
   portmap = makeTest (import ./portmap.nix);
diff --git a/tests/nfs.nix b/tests/nfs.nix
index 4690b9e67ae..ee65c298dd0 100644
--- a/tests/nfs.nix
+++ b/tests/nfs.nix
@@ -1,3 +1,5 @@
+{ version }:
+
 { pkgs, ... }:
 
 let
@@ -6,9 +8,9 @@ let
     { config, pkgs, ... }:
     { fileSystems = pkgs.lib.mkOverride 50
         [ { mountPoint = "/data";
-            device = "server:/data";
+            device = "server:${if version == 4 then "/" else "/data"}";
             fsType = "nfs";
-            options = "vers=3";
+            options = "vers=${toString version}";
           }
         ];
     };
-- 
GitLab


From 71a197bc6e60c2c35687fc862cec9a0036a3877e Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 16 Jul 2013 14:47:12 +0200
Subject: [PATCH 4741/5331] Disable the installer.swraid test

This fails randomly for unknown reasons,
e.g. http://hydra.nixos.org/build/5542510.
---
 release.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/release.nix b/release.nix
index ab2122aa02a..ef1f091049e 100644
--- a/release.nix
+++ b/release.nix
@@ -246,7 +246,7 @@ in {
       installer.rebuildCD = runTest (t: t.installer.rebuildCD.test);
       installer.separateBoot = runTest (t: t.installer.separateBoot.test);
       installer.simple = runTest (t: t.installer.simple.test);
-      installer.swraid = runTest (t: t.installer.swraid.test);
+      #installer.swraid = runTest (t: t.installer.swraid.test);
       ipv6 = runTest (t: t.ipv6.test);
       kde4 = runTest (t: t.kde4.test);
       login = runTest (t: t.login.test);
-- 
GitLab


From 90148d6fd12b51d842714be86739343d27c00131 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 16 Jul 2013 15:04:32 +0200
Subject: [PATCH 4742/5331] Work around "Input/output error" opening /dev/ttyS0

E.g. http://hydra.nixos.org/build/5541847

This is a random occurence, maybe due to a race with something else.
So just retry until it works.
---
 modules/testing/test-instrumentation.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/modules/testing/test-instrumentation.nix b/modules/testing/test-instrumentation.nix
index 9c36ac2bbdd..28494e1c7b2 100644
--- a/modules/testing/test-instrumentation.nix
+++ b/modules/testing/test-instrumentation.nix
@@ -22,7 +22,8 @@ let kernel = config.boot.kernelPackages.kernel; in
             export DISPLAY=:0.0
             source /etc/profile
             cd /tmp
-            exec < /dev/hvc0 > /dev/hvc0 2> /dev/ttyS0
+            exec < /dev/hvc0 > /dev/hvc0
+            while ! exec 2> /dev/ttyS0; do sleep 0.1; done
             echo "connecting to host..." >&2
             stty -F /dev/hvc0 raw -echo # prevent nl -> cr/nl conversion
             echo
-- 
GitLab


From c044375a0a765a92925a83ba7d78718ffb469512 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 17 Jul 2013 12:42:55 +0200
Subject: [PATCH 4743/5331] Disable the mpich test

It hasn't succeeded in a long time.
---
 release.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/release.nix b/release.nix
index ef1f091049e..cc32395abda 100644
--- a/release.nix
+++ b/release.nix
@@ -252,7 +252,7 @@ in {
       login = runTest (t: t.login.test);
       latestKernel.login = runTest (t: t.latestKernel.login.test);
       misc = runTest (t: t.misc.test);
-      mpich = runTest (t: t.mpich.test);
+      #mpich = runTest (t: t.mpich.test);
       mysql = runTest (t: t.mysql.test);
       mysql_replication = runTest (t: t.mysql_replication.test);
       nat = runTest (t: t.nat.test);
-- 
GitLab


From 6620a0f6797b4cb244486996aced4b1fd954549d Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 17 Jul 2013 13:01:12 +0200
Subject: [PATCH 4744/5331] Fix the installer tests

E.g. http://hydra.nixos.org/build/5561399
---
 doc/manual/man-nixos-rebuild.xml   | 8 ++++----
 lib/test-driver/Machine.pm         | 2 +-
 lib/testing.nix                    | 3 ++-
 modules/virtualisation/qemu-vm.nix | 2 +-
 4 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/doc/manual/man-nixos-rebuild.xml b/doc/manual/man-nixos-rebuild.xml
index 4828215977e..0ed9f22ef99 100644
--- a/doc/manual/man-nixos-rebuild.xml
+++ b/doc/manual/man-nixos-rebuild.xml
@@ -128,10 +128,10 @@ $ nixos-rebuild build-vm
 $ ./result/bin/run-*-vm
 </screen></para>
 
-      <para>The VM is implemented using the
-      <literal>qemu-kvm</literal> package.  For best performance, you
-      should load the <literal>kvm-intel</literal> or
-      <literal>kvm-amd</literal> kernel modules.</para>
+      <para>The VM is implemented using the <literal>qemu</literal>
+      package.  For best performance, you should load the
+      <literal>kvm-intel</literal> or <literal>kvm-amd</literal>
+      kernel modules to get hardware virtualisation.</para>
 
       <para>The VM mounts the Nix store of the host through the CIFS
       filesystem.  (<literal>qemu-kvm</literal> automatically starts a
diff --git a/lib/test-driver/Machine.pm b/lib/test-driver/Machine.pm
index 615fe09bdfc..f5bf40a1868 100644
--- a/lib/test-driver/Machine.pm
+++ b/lib/test-driver/Machine.pm
@@ -30,7 +30,7 @@ sub new {
     if (!$startCommand) {
         # !!! merge with qemu-vm.nix.
         $startCommand =
-            "qemu-kvm -m 384 " .
+            "$ENV{'qemu'} -enable-kvm -m 384 " .
             "-net nic,model=virtio \$QEMU_OPTS ";
         my $iface = $args->{hdaInterface} || "virtio";
         $startCommand .= "-drive file=" . Cwd::abs_path($args->{hda}) . ",if=$iface,boot=on,werror=report "
diff --git a/lib/testing.nix b/lib/testing.nix
index 280cdf579db..653eaf3e9a6 100644
--- a/lib/testing.nix
+++ b/lib/testing.nix
@@ -28,7 +28,8 @@ rec {
 
         wrapProgram $out/bin/nixos-test-driver \
           --prefix PATH : "${pkgs.qemu}/bin:${pkgs.vde2}/bin:${imagemagick}/bin:${coreutils}/bin" \
-          --prefix PERL5LIB : "${lib.makePerlPath [ perlPackages.TermReadLineGnu perlPackages.XMLWriter perlPackages.IOTty ]}:$out/lib/perl5/site_perl"
+          --prefix PERL5LIB : "${lib.makePerlPath [ perlPackages.TermReadLineGnu perlPackages.XMLWriter perlPackages.IOTty ]}:$out/lib/perl5/site_perl" \
+          --set qemu qemu-system-${if pkgs.stdenv.system == "x86_64-linux" then "x86_64" else "i386"}
       '';
   };
 
diff --git a/modules/virtualisation/qemu-vm.nix b/modules/virtualisation/qemu-vm.nix
index 70487c329a8..6715b494dfb 100644
--- a/modules/virtualisation/qemu-vm.nix
+++ b/modules/virtualisation/qemu-vm.nix
@@ -226,7 +226,7 @@ let
             ''
               mkdir $out
               diskImage=$out/disk.img
-              ${pkgs.vmTools.kvm}/bin/qemu-img create -f qcow2 $diskImage "32M"
+              ${pkgs.qemu}/bin/qemu-img create -f qcow2 $diskImage "32M"
             '';
           buildInputs = [ pkgs.utillinux ];
         }
-- 
GitLab


From a6aba08d351675cb654f15656edf748278115724 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 17 Jul 2013 13:34:40 +0200
Subject: [PATCH 4745/5331] Bump the NixOS version number to 13.07

This is in preparation of making a stable release/branch.  The version
number is <YY>.<MM>, Ubuntu style, denoting the intended release
year/month.  It also has a release codename ("Aardvark").
---
 .version                                 |  2 +-
 modules/installer/tools/nixos-version.sh |  2 +-
 modules/installer/tools/tools.nix        |  2 +-
 modules/misc/version.nix                 | 12 ++++++++++--
 4 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/.version b/.version
index 2f4536184bc..40cdb89df34 100644
--- a/.version
+++ b/.version
@@ -1 +1 @@
-0.2
\ No newline at end of file
+13.07
\ No newline at end of file
diff --git a/modules/installer/tools/nixos-version.sh b/modules/installer/tools/nixos-version.sh
index 20f9a7da018..5dbf277fe4c 100644
--- a/modules/installer/tools/nixos-version.sh
+++ b/modules/installer/tools/nixos-version.sh
@@ -1,2 +1,2 @@
 #! @shell@
-echo @nixosVersion@
+echo "@nixosVersion@ (@nixosCodeName@)"
diff --git a/modules/installer/tools/tools.nix b/modules/installer/tools/tools.nix
index 4eb63a6d16f..c761d74a890 100644
--- a/modules/installer/tools/tools.nix
+++ b/modules/installer/tools/tools.nix
@@ -55,7 +55,7 @@ let
   nixosVersion = makeProg {
     name = "nixos-version";
     src = ./nixos-version.sh;
-    inherit (config.system) nixosVersion;
+    inherit (config.system) nixosVersion nixosCodeName;
   };
 
   nixosGui = pkgs.xulrunnerWrapper {
diff --git a/modules/misc/version.nix b/modules/misc/version.nix
index aa9557d9421..20a03b44a2a 100644
--- a/modules/misc/version.nix
+++ b/modules/misc/version.nix
@@ -16,6 +16,11 @@ with pkgs.lib;
       description = "NixOS version suffix.";
     };
 
+    system.nixosCodeName = mkOption {
+      type = types.uniq types.string;
+      description = "NixOS release code name.";
+    };
+
   };
 
   config = {
@@ -26,6 +31,9 @@ with pkgs.lib;
     system.nixosVersionSuffix =
       mkDefault (if builtins.pathExists ../../.version-suffix then builtins.readFile ../../.version-suffix else "pre-git");
 
+    # Note: code names must only increase in alphabetical order.
+    system.nixosCodeName = "Aardvark";
+
     # Generate /etc/os-release.  See
     # http://0pointer.de/public/systemd-man/os-release.html for the
     # format.
@@ -34,9 +42,9 @@ with pkgs.lib;
           ''
             NAME=NixOS
             ID=nixos
-            VERSION="${config.system.nixosVersion}"
+            VERSION="${config.system.nixosVersion} (${config.system.nixosCodeName})"
             VERSION_ID="${config.system.nixosVersion}"
-            PRETTY_NAME="NixOS ${config.system.nixosVersion}"
+            PRETTY_NAME="NixOS ${config.system.nixosVersion} (${config.system.nixosCodeName})"
             HOME_URL="http://nixos.org/"
           '';
         target = "os-release";
-- 
GitLab


From b83a3987c5ec9392f416fdb1b65b166710d03afd Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 17 Jul 2013 14:54:25 +0200
Subject: [PATCH 4746/5331] Include all of KDE in the KDE test

---
 tests/kde4.nix | 24 +++++++++++++++++++++---
 1 file changed, 21 insertions(+), 3 deletions(-)

diff --git a/tests/kde4.nix b/tests/kde4.nix
index 71c41847673..fabad89c342 100644
--- a/tests/kde4.nix
+++ b/tests/kde4.nix
@@ -25,6 +25,21 @@
         '';
 
       services.xserver.desktopManager.kde4.enable = true;
+
+      # Include most of KDE. We don't really test these here, but at
+      # least they should build.
+      environment.systemPackages =
+        [ pkgs.kde4.kdemultimedia
+          pkgs.kde4.kdegraphics
+          pkgs.kde4.kdeutils
+          pkgs.kde4.kdegames
+          pkgs.kde4.kdeedu
+          pkgs.kde4.kdeaccessibility
+          pkgs.kde4.kdeadmin
+          pkgs.kde4.kdenetwork
+          pkgs.kde4.kdetoys
+          pkgs.kde4.kdewebdev
+        ];
     };
 
   testScript =
@@ -36,12 +51,15 @@
       $machine->succeed("getfacl /dev/snd/timer | grep -q alice");
 
       $machine->execute("su - alice -c 'DISPLAY=:0.0 kwrite /var/log/messages &'");
-      $machine->execute("su - alice -c 'DISPLAY=:0.0 konqueror http://localhost/ &'");
-
       $machine->waitForWindow(qr/messages.*KWrite/);
+
+      $machine->execute("su - alice -c 'DISPLAY=:0.0 konqueror http://localhost/ &'");
       $machine->waitForWindow(qr/Valgrind.*Konqueror/);
 
-      $machine->sleep(5);
+      $machine->execute("su - alice -c 'DISPLAY=:0.0 gwenview ${pkgs.kde4.kde_wallpapers}/share/wallpapers/Hanami/contents/images/1280x1024.jpg &'");
+      $machine->waitForWindow(qr/Gwenview/);
+
+      $machine->sleep(10);
 
       $machine->screenshot("screen");
     '';
-- 
GitLab


From cf8f646f34f4c456c72ede610778c90ecc3d1f5b Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 17 Jul 2013 15:28:36 +0200
Subject: [PATCH 4747/5331] Disable the trac test

It hasn't worked in ages.
---
 modules/services/web-servers/apache-httpd/trac.nix | 2 +-
 release.nix                                        | 2 +-
 tests/trac.nix                                     | 1 +
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/modules/services/web-servers/apache-httpd/trac.nix b/modules/services/web-servers/apache-httpd/trac.nix
index 5e31c1f2643..dc82fd34f2f 100644
--- a/modules/services/web-servers/apache-httpd/trac.nix
+++ b/modules/services/web-servers/apache-httpd/trac.nix
@@ -86,8 +86,8 @@ in
         AuthLDAPURL "${config.ldapAuthentication.url}"
         authzldapauthoritative Off
         require valid-user
+      </LocationMatch>
     '' else ""}
-    </LocationMatch>
   '';
 
   globalEnvVars = singleton
diff --git a/release.nix b/release.nix
index cc32395abda..bcbde0508da 100644
--- a/release.nix
+++ b/release.nix
@@ -264,7 +264,7 @@ in {
       quake3 = runTest (t: t.quake3.report);
       #subversion = runTest (t: t.subversion.report);
       tomcat = runTest (t: t.tomcat.test);
-      trac = runTest (t: t.trac.test);
+      #trac = runTest (t: t.trac.test);
       xfce = runTest (t: t.xfce.test);
     };
 
diff --git a/tests/trac.nix b/tests/trac.nix
index f4f91e6ccf3..7f05103d754 100644
--- a/tests/trac.nix
+++ b/tests/trac.nix
@@ -62,6 +62,7 @@
       $webserver->succeed("mkdir -p /repos/trac");
       $webserver->succeed("svnadmin create /repos/trac");
 
+      $webserver->waitForUnit("httpd");
       $webserver->waitForFile("/var/trac");
       $webserver->succeed("mkdir -p /var/trac/projects/test");
       $webserver->succeed("PYTHONPATH=${pkgs.pythonPackages.psycopg2}/lib/${pkgs.python.libPrefix}/site-packages trac-admin /var/trac/projects/test initenv Test postgres://root\@postgresql/trac svn /repos/trac");
-- 
GitLab


From 34628fe92b9511e0ab4742de7c8cad4622374721 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 17 Jul 2013 19:24:27 +0200
Subject: [PATCH 4748/5331] Fix the misc test

---
 tests/misc.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/misc.nix b/tests/misc.nix
index d001ff1e5a9..d52741cab81 100644
--- a/tests/misc.nix
+++ b/tests/misc.nix
@@ -13,7 +13,7 @@
   testScript =
     ''
       subtest "nixos-version", sub {
-          $machine->succeed("[ `nixos-version | wc -w` = 1 ]");
+          $machine->succeed("[ `nixos-version | wc -w` = 2 ]");
       };
 
       subtest "nixos-rebuild", sub {
-- 
GitLab


From 76160c6de7876e45d308d5cf44a4122bdeed7b7f Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 17 Jul 2013 19:34:06 +0200
Subject: [PATCH 4749/5331] Fix ISO generation

The volume label cannot be longer than 32 characters.
---
 modules/installer/cd-dvd/installation-cd-base.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/installer/cd-dvd/installation-cd-base.nix b/modules/installer/cd-dvd/installation-cd-base.nix
index 888ea5203b3..5c67c8e2a9d 100644
--- a/modules/installer/cd-dvd/installation-cd-base.nix
+++ b/modules/installer/cd-dvd/installation-cd-base.nix
@@ -20,7 +20,7 @@ with pkgs.lib;
   # ISO naming.
   isoImage.isoName = "${config.isoImage.isoBaseName}-${config.system.nixosVersion}-${pkgs.stdenv.system}.iso";
 
-  isoImage.volumeID = "NIXOS_${config.system.nixosVersion}";
+  isoImage.volumeID = substring 0 32 "NIXOS_${config.system.nixosVersion}";
 
   # Make the installer more likely to succeed in low memory
   # environments.  The kernel's overcommit heustistics bite us
-- 
GitLab


From 44f1a8d8c75d468aac740f1cf4a5e19ff8c368e8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Wed, 17 Jul 2013 05:19:54 +0200
Subject: [PATCH 4750/5331] Add apcupsd service

apcupsd is a daemon for controlling APC UPSes. It is very simple to
configure. If you have an USB based UPS, the default settings should be
useable without further adjustments:

  services.apcupsd.enable = true;

This will give you autodetection of USB UPSes, network access limited to
localhost (for security) and the shutdown sequence will be started when
the system when the battery level is below 50 percent, or when the UPS
has calculated that it has 5 minutes or less of remaining power-on time.

You can provide your own configuration file contents with this option:

  services.apcupsd.configText = "contents of apcupsd.conf";

Bug/annoyance 1: When apcupsd calls "wall" (on powerfail etc. events),
it prints an error message because stdout is not connected to a tty (it
is connected to the journal):

  wall: cannot get tty name: Inappropriate ioctl for device

The message still gets through though, to ctrl-alt-f[1-6] terminals.

Bug/annoyance 2: apcupsd tries to call "mail" (on powerfail etc.
events), and that fails because I'm not passing in any mail program at
the moment (because that would require more configuration options). A
solution to this would be to simply let the user fully configure the
apcupsd event handling logic in nix.
---
 modules/module-list.nix                 |  1 +
 modules/services/monitoring/apcupsd.nix | 83 +++++++++++++++++++++++++
 2 files changed, 84 insertions(+)
 create mode 100644 modules/services/monitoring/apcupsd.nix

diff --git a/modules/module-list.nix b/modules/module-list.nix
index 52b98e8bc09..fcbedaa9d9d 100644
--- a/modules/module-list.nix
+++ b/modules/module-list.nix
@@ -117,6 +117,7 @@
   ./services/misc/rogue.nix
   ./services/misc/svnserve.nix
   ./services/misc/synergy.nix
+  ./services/monitoring/apcupsd.nix
   ./services/monitoring/dd-agent.nix
   ./services/monitoring/monit.nix
   ./services/monitoring/nagios/default.nix
diff --git a/modules/services/monitoring/apcupsd.nix b/modules/services/monitoring/apcupsd.nix
new file mode 100644
index 00000000000..5541fb92fe1
--- /dev/null
+++ b/modules/services/monitoring/apcupsd.nix
@@ -0,0 +1,83 @@
+{ config, pkgs, ... }:
+
+with pkgs.lib;
+
+let cfg = config.services.apcupsd;
+    configFile = pkgs.writeText "apcupsd.conf" ''
+      ## apcupsd.conf v1.1 ##
+      # apcupsd complains if the first line is not like above.
+      ${cfg.configText}
+    '';
+in
+
+{
+
+  ###### interface
+
+  options = {
+
+    services.apcupsd = {
+
+      enable = mkOption {
+        default = false;
+        type = types.uniq types.bool;
+        description = ''
+          Whether to enable the APC UPS daemon. apcupsd monitors your UPS and
+          permits orderly shutdown of your computer in the event of a power
+          failure. User manual: http://www.apcupsd.com/manual/manual.html.
+          Note that apcupsd runs as root (to allow shutdown of computer).
+          You can check the status of your UPS with the "apcaccess" command.
+        '';
+      };
+
+      configText = mkOption {
+        default = ''
+          UPSTYPE usb
+          NISIP 127.0.0.1
+          BATTERYLEVEL 50
+          MINUTES 5
+        '';
+        type = types.string;
+        description = ''
+          Contents of the runtime configuration file, apcupsd.conf. The default
+          settings makes apcupsd autodetect USB UPSes, limit network access to
+          localhost and shutdown the system when the battery level is below 50
+          percent, or when the UPS has calculated that it has 5 minutes or less
+          of remaining power-on time. See man apcupsd.conf for details.
+        '';
+      };
+
+    };
+
+  };
+
+
+  ###### implementation
+
+  config = mkIf cfg.enable {
+
+    # Give users access to the "apcaccess" tool
+    environment.systemPackages = [ pkgs.apcupsd ];
+
+    # NOTE 1: apcupsd runs as root because it needs permission to run
+    # "shutdown"
+    #
+    # NOTE 2: When apcupsd calls "wall", it prints an error because stdout is
+    # not connected to a tty (it is connected to the journal):
+    #   wall: cannot get tty name: Inappropriate ioctl for device
+    # The message still gets through.
+    #
+    # TODO: apcupsd calls "mail" on powerfail etc. events, how should we
+    # handle that? A configurable mail package or let the event logic be
+    # configured from nix expressions?
+    systemd.services.apcupsd = {
+      description = "UPS daemon";
+      wantedBy = [ "multi-user.target" ];
+      serviceConfig = {
+        ExecStart = "${pkgs.apcupsd}/bin/apcupsd -b -f ${configFile} -d1";
+      };
+    };
+
+  };
+
+}
-- 
GitLab


From 18de9f64ae75e9db8de67d60489a2e1becd1968b Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Thu, 18 Jul 2013 19:25:35 -0400
Subject: [PATCH 4751/5331] Add uptime module

Signed-off-by: Shea Levy <shea@shealevy.com>
---
 modules/module-list.nix                |  1 +
 modules/services/monitoring/uptime.nix | 95 ++++++++++++++++++++++++++
 2 files changed, 96 insertions(+)
 create mode 100644 modules/services/monitoring/uptime.nix

diff --git a/modules/module-list.nix b/modules/module-list.nix
index fcbedaa9d9d..7e64411ece8 100644
--- a/modules/module-list.nix
+++ b/modules/module-list.nix
@@ -124,6 +124,7 @@
   ./services/monitoring/smartd.nix
   ./services/monitoring/systemhealth.nix
   ./services/monitoring/ups.nix
+  ./services/monitoring/uptime.nix
   ./services/monitoring/zabbix-agent.nix
   ./services/monitoring/zabbix-server.nix
   ./services/network-filesystems/drbd.nix
diff --git a/modules/services/monitoring/uptime.nix b/modules/services/monitoring/uptime.nix
new file mode 100644
index 00000000000..c759d4a2b9c
--- /dev/null
+++ b/modules/services/monitoring/uptime.nix
@@ -0,0 +1,95 @@
+{ config, pkgs, ... }:
+let
+  inherit (pkgs.lib) mkOption mkEnableOption mkIf mkMerge types optionalAttrs optional;
+
+  cfg = config.services.uptime;
+
+  configDir = pkgs.runCommand "config" {} (if cfg.configFile != null then ''
+    mkdir $out
+    ext=`echo ${cfg.configFile} | grep -o \\..*`
+    ln -sv ${cfg.configFile} $out/default$ext
+    ln -sv /var/lib/uptime/runtime.json $out/runtime.json
+  '' else ''
+    mkdir $out
+    cat ${pkgs.nodePackages.node-uptime}/node_modules/node-uptime/config/default.yaml > $out/default.yaml
+    cat >> $out/default.yaml <<EOF
+
+    autoStartMonitor: false
+
+    mongodb:
+      connectionString: 'mongodb://localhost/uptime'
+    EOF
+    ln -sv /var/lib/uptime/runtime.json $out/runtime.json
+  '');
+in {
+  options.services.uptime = {
+    configFile = mkOption {
+      description = ''
+        The uptime configuration file
+
+        If mongodb: server != localhost, please set usesRemoteMongo = true
+
+        If you only want to run the monitor, please set enableWebService = false
+        and enableSeparateMonitoringService = true
+
+        If autoStartMonitor: false (recommended) and you want to run both
+        services, please set enableSeparateMonitoringService = true
+      '';
+
+      type = types.nullOr types.path;
+
+      default = null;
+    };
+
+    usesRemoteMongo = mkOption {
+      description = "Whether the configuration file specifies a remote mongo instance";
+
+      default = false;
+
+      type = types.bool;
+    };
+
+    enableWebService = mkEnableOption "the uptime web service";
+
+    enableSeparateMonitoringService = mkEnableOption "the uptime monitoring service (default: enableWebService == true)" // { default = cfg.enableWebService; };
+
+    nodeEnv = mkOption {
+      description = "The node environment to run in (development, production, etc.)";
+
+      type = types.string;
+
+      default = "production";
+    };
+  };
+
+  config = mkMerge [ (mkIf cfg.enableWebService {
+    systemd.services.uptime = {
+      description = "uptime web service";
+      wantedBy = [ "multi-user.target" ];
+      environment = {
+        NODE_CONFIG_DIR = configDir;
+        NODE_ENV = cfg.nodeEnv;
+        NODE_PATH = "${pkgs.nodePackages.node-uptime}/node_modules/node-uptime/node_modules";
+      };
+      preStart = "mkdir -p /var/lib/uptime";
+      serviceConfig.ExecStart = "${pkgs.nodejs}/bin/node ${pkgs.nodePackages.node-uptime}/node_modules/node-uptime/app.js";
+    };
+
+    services.mongodb.enable = mkIf (!cfg.usesRemoteMongo) true;
+  }) (mkIf cfg.enableSeparateMonitoringService {
+    systemd.services.uptime-monitor = {
+      description = "uptime monitoring service";
+      wantedBy = [ "multi-user.target" ];
+      requires = optional cfg.enableWebService "uptime.service";
+      after = optional cfg.enableWebService "uptime.service";
+      environment = {
+        NODE_CONFIG_DIR = configDir;
+        NODE_ENV = cfg.nodeEnv;
+        NODE_PATH = "${pkgs.nodePackages.node-uptime}/node_modules/node-uptime/node_modules";
+      };
+      # Ugh, need to wait for web service to be up
+      preStart = if cfg.enableWebService then "sleep 1s" else "mkdir -p /var/lib/uptime";
+      serviceConfig.ExecStart = "${pkgs.nodejs}/bin/node ${pkgs.nodePackages.node-uptime}/node_modules/node-uptime/monitor.js";
+    };
+  }) ];
+}
-- 
GitLab


From 883d310bac6cc6b7a136786688b6b55079558cb7 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Fri, 19 Jul 2013 11:19:07 -0400
Subject: [PATCH 4752/5331] Only include /bin/sh (not all of /bin) in the
 chroot

Signed-off-by: Shea Levy <shea@shealevy.com>
---
 modules/services/misc/nix-daemon.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/services/misc/nix-daemon.nix b/modules/services/misc/nix-daemon.nix
index 4563336a5bc..f28a793aefc 100644
--- a/modules/services/misc/nix-daemon.nix
+++ b/modules/services/misc/nix-daemon.nix
@@ -54,7 +54,7 @@ in
   options = {
 
     environment.nix = mkOption {
-      default = pkgs.nix;
+      default = pkgs.nixUnstable;
       merge = mergeOneOption;
       description = ''
         This option specifies the Nix package instance to use throughout the system.
@@ -249,7 +249,7 @@ in
 
   config = {
 
-    nix.chrootDirs = [ "/dev" "/dev/pts" "/proc" "/bin" ];
+    nix.chrootDirs = [ "/dev" "/dev/pts" "/proc" "/bin/sh=${config.system.build.binsh}/bin/bash" ];
 
     environment.etc."nix/nix.conf".source = nixConf;
 
-- 
GitLab


From be3d498b1891339ffceb3f54f749d3d5fa343429 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Fri, 19 Jul 2013 11:21:05 -0400
Subject: [PATCH 4753/5331] Allow specifying packages whose closures should be
 in the chroot

Signed-off-by: Shea Levy <shea@shealevy.com>
---
 modules/services/misc/nix-daemon.nix | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/modules/services/misc/nix-daemon.nix b/modules/services/misc/nix-daemon.nix
index f28a793aefc..d3acc625a8b 100644
--- a/modules/services/misc/nix-daemon.nix
+++ b/modules/services/misc/nix-daemon.nix
@@ -29,10 +29,12 @@ let
       # other paths in the store, we need the closure of /bin/sh
       # in `build-chroot-dirs' - otherwise any builder that uses
       # /bin/sh won't work.
-      binshDeps = pkgs.writeReferencesToFile config.system.build.binsh;
+      closureFile = pkgs.runCommand "closure" {
+        exportReferencesGraph = concatMap (pkg: [ "closure${baseNameOf pkg}" pkg ]) cfg.chrootClosures;
+      } "cat closure* | sort | uniq > $out";
     in
       pkgs.runCommand "nix.conf" {extraOptions = cfg.extraOptions; } ''
-        extraPaths=$(for i in $(cat ${binshDeps}); do if test -d $i; then echo $i; fi; done)
+        extraPaths=$(for i in $(cat ${closureFile}); do if test -e $i; then echo $i; fi; done)
         cat > $out <<END
         # WARNING: this file is generated.
         build-users-group = nixbld
@@ -95,6 +97,13 @@ in
           '';
       };
 
+      chrootClosures = mkOption {
+        default = [];
+        example = [ config.system.build.binsh pkgs.coreutils ];
+        description = "Packages whose closures should be included in the chroot";
+        type = types.listOf types.package;
+      };
+
       extraOptions = mkOption {
         default = "";
         example = "
@@ -251,6 +260,8 @@ in
 
     nix.chrootDirs = [ "/dev" "/dev/pts" "/proc" "/bin/sh=${config.system.build.binsh}/bin/bash" ];
 
+    nix.chrootClosures = [ config.system.build.binsh ];
+
     environment.etc."nix/nix.conf".source = nixConf;
 
     # List of machines for distributed Nix builds in the format
-- 
GitLab


From 272d641f0cd98edaba497c81884bb1fbaf1df8e1 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Fri, 19 Jul 2013 11:22:46 -0400
Subject: [PATCH 4754/5331] Documentation improvement

Signed-off-by: Shea Levy <shea@shealevy.com>
---
 modules/services/monitoring/uptime.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/services/monitoring/uptime.nix b/modules/services/monitoring/uptime.nix
index c759d4a2b9c..8479372fab4 100644
--- a/modules/services/monitoring/uptime.nix
+++ b/modules/services/monitoring/uptime.nix
@@ -49,7 +49,7 @@ in {
       type = types.bool;
     };
 
-    enableWebService = mkEnableOption "the uptime web service";
+    enableWebService = mkEnableOption "the uptime monitoring program web service";
 
     enableSeparateMonitoringService = mkEnableOption "the uptime monitoring service (default: enableWebService == true)" // { default = cfg.enableWebService; };
 
-- 
GitLab


From bf21bbcf015c7cb9004c2553ece2529ae165d8a6 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 19 Jul 2013 17:23:27 +0200
Subject: [PATCH 4755/5331] Mount /var and some other filesystems automatically
 in stage 1

Bad things happen if /var is mounted in a late stage.
---
 modules/system/boot/stage-1.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/system/boot/stage-1.nix b/modules/system/boot/stage-1.nix
index f78a5dda2d3..0779ab2c979 100644
--- a/modules/system/boot/stage-1.nix
+++ b/modules/system/boot/stage-1.nix
@@ -249,7 +249,7 @@ let
   # booting (such as the FS containing /nix/store, or an FS needed for
   # mounting /, like / on a loopback).
   fileSystems = filter
-    (fs: fs.mountPoint == "/" || fs.mountPoint == "/nix" || fs.mountPoint == "/nix/store" || fs.neededForBoot)
+    (fs: fs.neededForBoot || elem fs.mountPoint [ "/" "/nix" "/nix/store" "/var" "/var/log" "/var/lib" "/etc" ])
     (attrValues config.fileSystems);
 
 
-- 
GitLab


From c52fd85990a7c0e26b2c08716693772fd75f56b0 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 19 Jul 2013 21:18:44 +0200
Subject: [PATCH 4756/5331] Set permissions on /var/log/journal properly

This makes the system journal readable by users in the
systemd-journal, wheel and adm groups.  It also allows users to read
their own journals.

Note that this doesn't change the permissions of existing journals.
---
 modules/misc/ids.nix                |  1 +
 modules/system/boot/stage-2-init.sh |  1 -
 modules/system/boot/systemd.nix     | 11 +++++++++--
 3 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/modules/misc/ids.nix b/modules/misc/ids.nix
index 8a23148b028..7272c3e7d5d 100644
--- a/modules/misc/ids.nix
+++ b/modules/misc/ids.nix
@@ -134,6 +134,7 @@ in
     nslcd = 58;
     scanner = 59;
     nginx = 60;
+    systemd-journal = 62;
 
     # When adding a gid, make sure it doesn't match an existing uid.
 
diff --git a/modules/system/boot/stage-2-init.sh b/modules/system/boot/stage-2-init.sh
index ef69dde2fe6..78d4ea80049 100644
--- a/modules/system/boot/stage-2-init.sh
+++ b/modules/system/boot/stage-2-init.sh
@@ -92,7 +92,6 @@ mkdir -m 0700 -p /root
 mkdir -m 0755 -p /bin # for the /bin/sh symlink
 mkdir -m 0755 -p /home
 mkdir -m 0755 -p /etc/nixos
-mkdir -m 0700 -p /var/log/journal
 
 
 # Miscellaneous boot time cleanup.
diff --git a/modules/system/boot/systemd.nix b/modules/system/boot/systemd.nix
index 538ceeda2b5..c8289ed3674 100644
--- a/modules/system/boot/systemd.nix
+++ b/modules/system/boot/systemd.nix
@@ -561,9 +561,9 @@ in
         [Sleep]
       '';
 
-    system.activationScripts.systemd =
+    system.activationScripts.systemd = stringAfter [ "groups" ]
       ''
-        mkdir -p /var/lib/udev -m 0755
+        mkdir -m 0755 -p /var/lib/udev /var/log/journal
 
         # Regenerate the hardware database /var/lib/udev/hwdb.bin
         # whenever systemd changes.
@@ -571,6 +571,11 @@ in
           echo "regenerating udev hardware database..."
           ${systemd}/bin/udevadm hwdb --update && ln -sfn ${systemd} /var/lib/udev/prev-systemd
         fi
+
+        # Make all journals readable to users in the wheel and adm
+        # groups, in addition to those in the systemd-journal group.
+        # Users can always read their own journals.
+        ${pkgs.acl}/bin/setfacl -nm g:wheel:rx,d:g:wheel:rx,g:adm:rx,d:g:adm:rx /var/log/journal
       '';
 
     # Target for ‘charon send-keys’ to hook into.
@@ -598,5 +603,7 @@ in
         status = "systemctl status";
       };
 
+    users.extraGroups.systemd-journal.gid = config.ids.gids.systemd-journal;
+
   };
 }
-- 
GitLab


From 6341a1258750fd19647f1a2bcebe7f011f7acae7 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 22 Jul 2013 14:16:13 +0200
Subject: [PATCH 4757/5331] modules/services/networking/dhcpcd.nix: add
 "extraConfig" option

This option allows administrators to add verbatim text to the generated
config file. I use this feature, for instance, to disable the default
route normally added by dhcpcd for certain interfaces.
---
 modules/services/networking/dhcpcd.nix | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/modules/services/networking/dhcpcd.nix b/modules/services/networking/dhcpcd.nix
index 342253bac29..761ddc08bf1 100644
--- a/modules/services/networking/dhcpcd.nix
+++ b/modules/services/networking/dhcpcd.nix
@@ -35,6 +35,8 @@ let
       # Ethernet cards used for bridging.  Likewise for vif* and tap*
       # (Xen) and virbr* and vnet* (libvirt).
       denyinterfaces ${toString ignoredInterfaces} peth* vif* tap* tun* virbr* vnet* vboxnet*
+
+      ${config.networking.dhcpcd.extraConfig}
     '';
 
   # Hook for emitting ip-up/ip-down events.
@@ -85,6 +87,13 @@ in
       '';
     };
 
+    networking.dhcpcd.extraConfig = mkOption {
+      default = "";
+      description = ''
+         Literal string to append to the config file generated for dhcpcd.
+      '';
+    };
+
   };
 
 
-- 
GitLab


From dc61694d013cc7bc65006770b0a5278cd56440a7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Sun, 21 Jul 2013 17:21:06 +0200
Subject: [PATCH 4758/5331] apcupsd-service: add services.apcupsd.hooks option

Each attribute in this option should name an apcupsd event and the
string value it contains will be executed in a shell in response to that
event. See "man apccontrol" for the list of events and what they
represent.

Now it is easy to hook into the apcupsd event system:

  services.apcupsd.hooks = {
    onbattery  = ''# shell commands to run when the onbattery event is emitted'';
    doshutdown = ''# shell commands to notify that the computer is shutting down'';
  };
---
 modules/services/monitoring/apcupsd.nix | 97 ++++++++++++++++++++++---
 1 file changed, 87 insertions(+), 10 deletions(-)

diff --git a/modules/services/monitoring/apcupsd.nix b/modules/services/monitoring/apcupsd.nix
index 5541fb92fe1..053851be398 100644
--- a/modules/services/monitoring/apcupsd.nix
+++ b/modules/services/monitoring/apcupsd.nix
@@ -2,12 +2,66 @@
 
 with pkgs.lib;
 
-let cfg = config.services.apcupsd;
-    configFile = pkgs.writeText "apcupsd.conf" ''
-      ## apcupsd.conf v1.1 ##
-      # apcupsd complains if the first line is not like above.
-      ${cfg.configText}
-    '';
+let
+  cfg = config.services.apcupsd;
+
+  configFile = pkgs.writeText "apcupsd.conf" ''
+    ## apcupsd.conf v1.1 ##
+    # apcupsd complains if the first line is not like above.
+    ${cfg.configText}
+    SCRIPTDIR ${toString scriptDir}
+  '';
+
+  # List of events from "man apccontrol"
+  eventList = [
+    "annoyme"
+    "battattach"
+    "battdetach"
+    "changeme"
+    "commfailure"
+    "commok"
+    "doreboot"
+    "doshutdown"
+    "emergency"
+    "failing"
+    "killpower"
+    "loadlimit"
+    "mainsback"
+    "onbattery"
+    "offbattery"
+    "powerout"
+    "remotedown"
+    "runlimit"
+    "timeout"
+    "startselftest"
+    "endselftest"
+  ];
+
+  shellCmdsForEventScript = eventname: commands: ''
+    echo "#!${pkgs.stdenv.shell}" > "$out/${eventname}"
+    echo "${commands}" >> "$out/${eventname}"
+    chmod a+x "$out/${eventname}"
+  '';
+
+  eventToShellCmds = event: if builtins.hasAttr event cfg.hooks then (shellCmdsForEventScript event (builtins.getAttr event cfg.hooks)) else "";
+
+  scriptDir = pkgs.runCommand "apcupsd-scriptdir" {} (''
+    mkdir "$out"
+    # Copy SCRIPTDIR from apcupsd package
+    cp -r ${pkgs.apcupsd}/etc/apcupsd/* "$out"/
+    # Make the files writeable (nix will unset the write bits afterwards)
+    chmod u+w "$out"/*
+    # Remove the sample event notification scripts, because they don't work
+    # anyways (they try to send mail to "root" with the "mail" command)
+    (cd "$out" && rm changeme commok commfailure onbattery offbattery)
+    # Remove the sample apcupsd.conf file (we're generating our own)
+    rm "$out/apcupsd.conf"
+    # Set the SCRIPTDIR= line in apccontrol to the dir we're creating now
+    sed -i -e "s|^SCRIPTDIR=.*|SCRIPTDIR=$out|" "$out/apccontrol"
+    '' + concatStringsSep "\n" (map eventToShellCmds eventList)
+
+  );
+
 in
 
 {
@@ -47,6 +101,24 @@ in
         '';
       };
 
+      hooks = mkOption {
+        default = {};
+        example = {
+          doshutdown = ''# shell commands to notify that the computer is shutting down'';
+        };
+        type = types.attrsOf types.string;
+        description = ''
+          Each attribute in this option names an apcupsd event and the string
+          value it contains will be executed in a shell, in response to that
+          event (prior to the default action). See "man apccontrol" for the
+          list of events and what they represent.
+
+          A hook script can stop apccontrol from doing its default action by
+          exiting with value 99. Do not do this unless you know what you're
+          doing.
+        '';
+      };
+
     };
 
   };
@@ -56,6 +128,15 @@ in
 
   config = mkIf cfg.enable {
 
+    assertions = [ {
+      assertion = let hooknames = builtins.attrNames cfg.hooks; in all (x: elem x eventList) hooknames;
+      message = ''
+        One (or more) attribute names in services.apcupsd.hooks are invalid.
+        Current attribute names: ${toString (builtins.attrNames cfg.hooks)}
+        Valid attribute names  : ${toString eventList}
+      '';
+    } ];
+
     # Give users access to the "apcaccess" tool
     environment.systemPackages = [ pkgs.apcupsd ];
 
@@ -66,10 +147,6 @@ in
     # not connected to a tty (it is connected to the journal):
     #   wall: cannot get tty name: Inappropriate ioctl for device
     # The message still gets through.
-    #
-    # TODO: apcupsd calls "mail" on powerfail etc. events, how should we
-    # handle that? A configurable mail package or let the event logic be
-    # configured from nix expressions?
     systemd.services.apcupsd = {
       description = "UPS daemon";
       wantedBy = [ "multi-user.target" ];
-- 
GitLab


From d6e5484e2bd7510201a089b48eee2b0c732f408c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Sun, 21 Jul 2013 21:28:54 +0200
Subject: [PATCH 4759/5331] apcupsd-service: create missing /run/apcupsd/
 directory

apcupsd complains about this missing directory when it is starting the
shutdown procedure.
---
 modules/services/monitoring/apcupsd.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/modules/services/monitoring/apcupsd.nix b/modules/services/monitoring/apcupsd.nix
index 053851be398..017c896cf4d 100644
--- a/modules/services/monitoring/apcupsd.nix
+++ b/modules/services/monitoring/apcupsd.nix
@@ -150,6 +150,7 @@ in
     systemd.services.apcupsd = {
       description = "UPS daemon";
       wantedBy = [ "multi-user.target" ];
+      preStart = "mkdir -p /run/apcupsd/";
       serviceConfig = {
         ExecStart = "${pkgs.apcupsd}/bin/apcupsd -b -f ${configFile} -d1";
       };
-- 
GitLab


From 95e2006653fed23045f651c6d35cee7ceb26c07e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Mon, 22 Jul 2013 14:09:13 +0200
Subject: [PATCH 4760/5331] apcupsd-service: put UPS in hibernate mode when
 shutting down

This adds a special systemd service that calls "apcupsd --killpower"
(put UPS in hibernate mode) just before shutting down the system.
Without this command, the UPS will stay on until the battery is
completely empty.
---
 modules/services/monitoring/apcupsd.nix | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/modules/services/monitoring/apcupsd.nix b/modules/services/monitoring/apcupsd.nix
index 017c896cf4d..163ae3ceff6 100644
--- a/modules/services/monitoring/apcupsd.nix
+++ b/modules/services/monitoring/apcupsd.nix
@@ -156,6 +156,28 @@ in
       };
     };
 
+    # A special service to tell the UPS to power down/hibernate just before the
+    # computer shuts down. (The UPS has a built in delay before it actually
+    # shuts off power.) Copied from here:
+    # http://forums.opensuse.org/english/get-technical-help-here/applications/479499-apcupsd-systemd-killpower-issues.html
+    systemd.services.apcupsd-killpower = {
+      after = [ "shutdown.target" ]; # append umount.target?
+      before = [ "final.target" ];
+      wantedBy = [ "shutdown.target" ];
+      unitConfig = {
+        Description = "APC UPS killpower";
+        ConditionPathExists = "/run/apcupsd/powerfail";
+        DefaultDependencies = "no";
+      };
+      serviceConfig = {
+        Type = "oneshot";
+        ExecStart = "${pkgs.apcupsd}/bin/apcupsd --killpower -f ${configFile}";
+        TimeoutSec = 0;
+        StandardOutput = "tty";
+        RemainAfterExit = "yes";
+      };
+    };
+
   };
 
 }
-- 
GitLab


From fe9ac2ca1c4960fcab67a6a7a332ea4876ed3544 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Mon, 22 Jul 2013 14:16:18 +0200
Subject: [PATCH 4761/5331] apcupsd-service: workaround for "A stop job is
 running for UPS daemon"

When apcupsd has initiated a shutdown, systemd always ends up waiting
for it to stop ("A stop job is running for UPS daemon"). This is weird,
because in the journal one can clearly see that apcupsd has received the
SIGTERM signal and has already quit (or so it seems). This reduces the
wait time from 90 seconds (default) to just 5. Then systemd kills it
with SIGKILL.
---
 modules/services/monitoring/apcupsd.nix | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/modules/services/monitoring/apcupsd.nix b/modules/services/monitoring/apcupsd.nix
index 163ae3ceff6..b7da167b187 100644
--- a/modules/services/monitoring/apcupsd.nix
+++ b/modules/services/monitoring/apcupsd.nix
@@ -153,6 +153,13 @@ in
       preStart = "mkdir -p /run/apcupsd/";
       serviceConfig = {
         ExecStart = "${pkgs.apcupsd}/bin/apcupsd -b -f ${configFile} -d1";
+        # TODO: When apcupsd has initiated a shutdown, systemd always ends up
+        # waiting for it to stop ("A stop job is running for UPS daemon"). This
+        # is weird, because in the journal one can clearly see that apcupsd has
+        # received the SIGTERM signal and has already quit (or so it seems).
+        # This reduces the wait time from 90 seconds (default) to just 5. Then
+        # systemd kills it with SIGKILL.
+        TimeoutStopSec = 5;
       };
     };
 
-- 
GitLab


From 38a4d6d6d76d2e17a860a6ebb8355840acb12360 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Mon, 22 Jul 2013 14:26:48 +0200
Subject: [PATCH 4762/5331] apcupsd-service: "UPS daemon" => "APC UPS daemon"
 description update

Sometimes systemd only prints the service description. Then it is nice
to know which UPS daemon we're dealing with.
---
 modules/services/monitoring/apcupsd.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/services/monitoring/apcupsd.nix b/modules/services/monitoring/apcupsd.nix
index b7da167b187..114bad5c947 100644
--- a/modules/services/monitoring/apcupsd.nix
+++ b/modules/services/monitoring/apcupsd.nix
@@ -148,7 +148,7 @@ in
     #   wall: cannot get tty name: Inappropriate ioctl for device
     # The message still gets through.
     systemd.services.apcupsd = {
-      description = "UPS daemon";
+      description = "APC UPS daemon";
       wantedBy = [ "multi-user.target" ];
       preStart = "mkdir -p /run/apcupsd/";
       serviceConfig = {
-- 
GitLab


From 8d596006ddf43b54ba6a9e2589cc67dea8afc4fc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Sat, 20 Jul 2013 17:07:26 +0200
Subject: [PATCH 4763/5331] Ensure /var/log/journal permission bits are set

Ensure permission bits are (re)set on each system activation with
explicit chmod call.

mkdir -m MODE PATH will only set the permission bits if PATH is
*created*, which means users that have old NixOS versions will continue
to have the old 700 permissions on /var/log/journal until they chmod
manually. With this commit the permissions will be set to 755 on system
activation.
---
 modules/system/boot/systemd.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/modules/system/boot/systemd.nix b/modules/system/boot/systemd.nix
index c8289ed3674..900cbfd0cd5 100644
--- a/modules/system/boot/systemd.nix
+++ b/modules/system/boot/systemd.nix
@@ -563,7 +563,9 @@ in
 
     system.activationScripts.systemd = stringAfter [ "groups" ]
       ''
-        mkdir -m 0755 -p /var/lib/udev /var/log/journal
+        mkdir -m 0755 -p /var/lib/udev
+        mkdir -p /var/log/journal
+        chmod 0755 /var/log/journal
 
         # Regenerate the hardware database /var/lib/udev/hwdb.bin
         # whenever systemd changes.
-- 
GitLab


From 7163babe84d08c892aa6ba6d2bbc1a4c137ba3d8 Mon Sep 17 00:00:00 2001
From: Rob Vermaas <rob.vermaas@gmail.com>
Date: Tue, 23 Jul 2013 10:00:43 +0200
Subject: [PATCH 4764/5331] Revert "Allow specifying packages whose closures
 should be in the chroot"

This reverts commit be3d498b1891339ffceb3f54f749d3d5fa343429.
---
 modules/services/misc/nix-daemon.nix | 15 ++-------------
 1 file changed, 2 insertions(+), 13 deletions(-)

diff --git a/modules/services/misc/nix-daemon.nix b/modules/services/misc/nix-daemon.nix
index d3acc625a8b..f28a793aefc 100644
--- a/modules/services/misc/nix-daemon.nix
+++ b/modules/services/misc/nix-daemon.nix
@@ -29,12 +29,10 @@ let
       # other paths in the store, we need the closure of /bin/sh
       # in `build-chroot-dirs' - otherwise any builder that uses
       # /bin/sh won't work.
-      closureFile = pkgs.runCommand "closure" {
-        exportReferencesGraph = concatMap (pkg: [ "closure${baseNameOf pkg}" pkg ]) cfg.chrootClosures;
-      } "cat closure* | sort | uniq > $out";
+      binshDeps = pkgs.writeReferencesToFile config.system.build.binsh;
     in
       pkgs.runCommand "nix.conf" {extraOptions = cfg.extraOptions; } ''
-        extraPaths=$(for i in $(cat ${closureFile}); do if test -e $i; then echo $i; fi; done)
+        extraPaths=$(for i in $(cat ${binshDeps}); do if test -d $i; then echo $i; fi; done)
         cat > $out <<END
         # WARNING: this file is generated.
         build-users-group = nixbld
@@ -97,13 +95,6 @@ in
           '';
       };
 
-      chrootClosures = mkOption {
-        default = [];
-        example = [ config.system.build.binsh pkgs.coreutils ];
-        description = "Packages whose closures should be included in the chroot";
-        type = types.listOf types.package;
-      };
-
       extraOptions = mkOption {
         default = "";
         example = "
@@ -260,8 +251,6 @@ in
 
     nix.chrootDirs = [ "/dev" "/dev/pts" "/proc" "/bin/sh=${config.system.build.binsh}/bin/bash" ];
 
-    nix.chrootClosures = [ config.system.build.binsh ];
-
     environment.etc."nix/nix.conf".source = nixConf;
 
     # List of machines for distributed Nix builds in the format
-- 
GitLab


From 2cb25bd65c28df08070d139d8c9b96b8e6b8b9db Mon Sep 17 00:00:00 2001
From: Rob Vermaas <rob.vermaas@gmail.com>
Date: Tue, 23 Jul 2013 10:00:54 +0200
Subject: [PATCH 4765/5331] Revert "Only include /bin/sh (not all of /bin) in
 the chroot"

This reverts commit 883d310bac6cc6b7a136786688b6b55079558cb7.
---
 modules/services/misc/nix-daemon.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/services/misc/nix-daemon.nix b/modules/services/misc/nix-daemon.nix
index f28a793aefc..4563336a5bc 100644
--- a/modules/services/misc/nix-daemon.nix
+++ b/modules/services/misc/nix-daemon.nix
@@ -54,7 +54,7 @@ in
   options = {
 
     environment.nix = mkOption {
-      default = pkgs.nixUnstable;
+      default = pkgs.nix;
       merge = mergeOneOption;
       description = ''
         This option specifies the Nix package instance to use throughout the system.
@@ -249,7 +249,7 @@ in
 
   config = {
 
-    nix.chrootDirs = [ "/dev" "/dev/pts" "/proc" "/bin/sh=${config.system.build.binsh}/bin/bash" ];
+    nix.chrootDirs = [ "/dev" "/dev/pts" "/proc" "/bin" ];
 
     environment.etc."nix/nix.conf".source = nixConf;
 
-- 
GitLab


From 4a0f707f71c8689de414a91032763a6a45833908 Mon Sep 17 00:00:00 2001
From: Rob Vermaas <rob.vermaas@gmail.com>
Date: Tue, 23 Jul 2013 10:09:41 +0200
Subject: [PATCH 4766/5331] New kernel iso/system_tarball now use 3.10 in stead
 of 3.7, which had been removed.

---
 modules/installer/cd-dvd/installation-cd-minimal-new-kernel.nix | 2 +-
 modules/installer/cd-dvd/installation-cd-new-kernel.nix         | 2 +-
 modules/installer/cd-dvd/system-tarball-fuloong2f.nix           | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/modules/installer/cd-dvd/installation-cd-minimal-new-kernel.nix b/modules/installer/cd-dvd/installation-cd-minimal-new-kernel.nix
index 203c2d975fd..eb4af233c3e 100644
--- a/modules/installer/cd-dvd/installation-cd-minimal-new-kernel.nix
+++ b/modules/installer/cd-dvd/installation-cd-minimal-new-kernel.nix
@@ -3,6 +3,6 @@
 {
   require = [ ./installation-cd-minimal.nix ];
 
-  boot.kernelPackages = pkgs.linuxPackages_3_7;
+  boot.kernelPackages = pkgs.linuxPackages_3_10;
   boot.vesa = false;
 }
diff --git a/modules/installer/cd-dvd/installation-cd-new-kernel.nix b/modules/installer/cd-dvd/installation-cd-new-kernel.nix
index 2c79b68d0a4..058e7ffc899 100644
--- a/modules/installer/cd-dvd/installation-cd-new-kernel.nix
+++ b/modules/installer/cd-dvd/installation-cd-new-kernel.nix
@@ -3,6 +3,6 @@
 {
   require = [ ./installation-cd-graphical.nix ];
 
-  boot.kernelPackages = pkgs.linuxPackages_3_7;
+  boot.kernelPackages = pkgs.linuxPackages_3_10;
   boot.vesa = false;
 }
diff --git a/modules/installer/cd-dvd/system-tarball-fuloong2f.nix b/modules/installer/cd-dvd/system-tarball-fuloong2f.nix
index f0c8f3efabd..9953d08d698 100644
--- a/modules/installer/cd-dvd/system-tarball-fuloong2f.nix
+++ b/modules/installer/cd-dvd/system-tarball-fuloong2f.nix
@@ -105,7 +105,7 @@ in
   boot.initrd.availableKernelModules =
     [ "vfat" "reiserfs" ];
 
-  boot.kernelPackages = pkgs.linuxPackages_3_7;
+  boot.kernelPackages = pkgs.linuxPackages_3_10;
   boot.kernelParams = [ "console=tty1" ];
 
   boot.postBootCommands =
-- 
GitLab


From cd0da98b033febbaacd03f64fbf73fc01fe25d03 Mon Sep 17 00:00:00 2001
From: Rickard Nilsson <rickynils@gmail.com>
Date: Tue, 23 Jul 2013 19:05:26 +0200
Subject: [PATCH 4767/5331] pulseaudio service: Use the configured pulseaudio
 package instead of the default.

---
 modules/config/pulseaudio.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/config/pulseaudio.nix b/modules/config/pulseaudio.nix
index 1043cca2be7..696f0dc1067 100644
--- a/modules/config/pulseaudio.nix
+++ b/modules/config/pulseaudio.nix
@@ -132,7 +132,7 @@ in {
         description = "PulseAudio system-wide server";
         wantedBy = [ "sound.target" ];
         before = [ "sound.target" ];
-        path = [ pulseaudio ];
+        path = [ cfg.package ];
         environment.PULSE_RUNTIME_PATH = pulseRuntimePath;
         preStart = ''
           mkdir -p --mode 755 ${pulseRuntimePath}
-- 
GitLab


From 462e4255fa3238f8766f5a11b461d2c78bbbf3ff Mon Sep 17 00:00:00 2001
From: Rickard Nilsson <rickynils@gmail.com>
Date: Tue, 23 Jul 2013 19:04:40 +0200
Subject: [PATCH 4768/5331] x11 session: Don't start pulseaudio if it already
 is running system-wide

---
 modules/services/x11/display-managers/default.nix | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/modules/services/x11/display-managers/default.nix b/modules/services/x11/display-managers/default.nix
index b49507b73ff..451355d4980 100644
--- a/modules/services/x11/display-managers/default.nix
+++ b/modules/services/x11/display-managers/default.nix
@@ -75,8 +75,10 @@ let
       if test "''${1:0:1}" = /; then eval exec "$1"; fi
 
       # Start PulseAudio if enabled.
-      ${optionalString config.hardware.pulseaudio.enable ''
-        ${pkgs.pulseaudio}/bin/pulseaudio --start
+      ${optionalString (config.hardware.pulseaudio.enable) ''
+        ${optionalString (!config.hardware.pulseaudio.systemWide)
+          "${pkgs.pulseaudio}/bin/pulseaudio --start"
+        }
 
         # Publish access credentials in the root window.
         ${pkgs.pulseaudio}/bin/pactl load-module module-x11-publish "display=$DISPLAY"
-- 
GitLab


From 8dc09be07bb94c5d3ce7baeef9c690868a0c0461 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 23 Jul 2013 18:56:12 +0200
Subject: [PATCH 4769/5331] Fix indentation / tabs

---
 modules/system/boot/luksroot.nix | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/modules/system/boot/luksroot.nix b/modules/system/boot/luksroot.nix
index 8f48bba880b..b9c44ae7078 100644
--- a/modules/system/boot/luksroot.nix
+++ b/modules/system/boot/luksroot.nix
@@ -1,4 +1,4 @@
-{pkgs, config, ...}:
+{ config, pkgs, ... }:
 
 with pkgs.lib;
 
@@ -52,23 +52,23 @@ in
     boot.initrd.luks.mitigateDMAAttacks = mkOption {
       default = true;
       description = ''
-	Unless enabled, encryption keys can be easily recovered by an attacker with physical
-	access to any machine with PCMCIA, ExpressCard, ThunderBolt or FireWire port.
-	More information: http://en.wikipedia.org/wiki/DMA_attack
+        Unless enabled, encryption keys can be easily recovered by an attacker with physical
+        access to any machine with PCMCIA, ExpressCard, ThunderBolt or FireWire port.
+        More information: http://en.wikipedia.org/wiki/DMA_attack
 
-	This option blacklists FireWire drivers, but doesn't remove them. You can manually
-	load the drivers if you need to use a FireWire device, but don't forget to unload them!
+        This option blacklists FireWire drivers, but doesn't remove them. You can manually
+        load the drivers if you need to use a FireWire device, but don't forget to unload them!
       '';
     };
 
     boot.initrd.luks.cryptoModules = mkOption {
-      default = [ "aes" "aes_generic" "aes_x86_64" "aes_i586" "blowfish" "twofish" "serpent" "cbc" "xts" "lrw" "sha256" 
-"sha1" 
-"sha2" 
-];
+      default =
+        [ "aes" "aes_generic" "aes_x86_64" "aes_i586" "blowfish" "twofish"
+          "serpent" "cbc" "xts" "lrw" "sha256" "sha1" "sha2"
+        ];
       description = ''
-	A list of cryptographic kernel modules needed to decrypt the root device(s).
-	The default includes all common modules.
+        A list of cryptographic kernel modules needed to decrypt the root device(s).
+        The default includes all common modules.
       '';
     };
 
@@ -151,7 +151,7 @@ in
       ["firewire_ohci" "firewire_core" "firewire_sbp2"];
 
     # Some modules that may be needed for mounting anything ciphered
-    boot.initrd.kernelModules = [ "dm_mod" "dm_crypt" "cryptd" ] ++ luks.cryptoModules; 
+    boot.initrd.kernelModules = [ "dm_mod" "dm_crypt" "cryptd" ] ++ luks.cryptoModules;
 
     # copy the cryptsetup binary and it's dependencies
     boot.initrd.extraUtilsCommands = ''
-- 
GitLab


From 438b057eb3a7029e8aa93430723de43b4ad304b4 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 23 Jul 2013 20:43:11 +0200
Subject: [PATCH 4770/5331] Lower the default console log level

It used to be set to 7 (debug) so you get lots of crap on the console.
The new value of 4 is also what Ubuntu uses.  Red Hat uses 3.

A nice side effect is that it's more likely that the LUKS passphrase
prompt doesn't get clobbered by kernel log messages.
---
 modules/system/boot/kernel.nix      | 15 +++++++++++++++
 modules/system/boot/stage-1-init.sh |  1 +
 2 files changed, 16 insertions(+)

diff --git a/modules/system/boot/kernel.nix b/modules/system/boot/kernel.nix
index 0a67e33ce45..27da9c86995 100644
--- a/modules/system/boot/kernel.nix
+++ b/modules/system/boot/kernel.nix
@@ -54,6 +54,16 @@ in
       description = "Additional user-defined kernel parameters.";
     };
 
+    boot.consoleLogLevel = mkOption {
+      type = types.int;
+      default = 4;
+      description = ''
+        The kernel console log level.  Only log messages with a
+        priority numerically less than this will appear on the
+        console.
+      '';
+    };
+
     boot.vesa = mkOption {
       default = config.boot.kernelPackages.splashutils != null;
       example = false;
@@ -146,9 +156,14 @@ in
 
     system.modulesTree = [ kernel ] ++ config.boot.extraModulePackages;
 
+    # Implement consoleLogLevel both in early boot and using sysctl
+    # (so you don't need to reboot to have changes take effect).
     boot.kernelParams =
+      [ "loglevel=${toString config.boot.consoleLogLevel}" ] ++
       optionals config.boot.vesa [ "splash=verbose" "vga=0x317" ];
 
+    boot.kernel.sysctl."kernel.printk" = config.boot.consoleLogLevel;
+
     boot.kernelModules = [ "loop" ];
 
     boot.initrd.availableKernelModules =
diff --git a/modules/system/boot/stage-1-init.sh b/modules/system/boot/stage-1-init.sh
index 4a13578abcd..e3e07c08580 100644
--- a/modules/system/boot/stage-1-init.sh
+++ b/modules/system/boot/stage-1-init.sh
@@ -66,6 +66,7 @@ mount -t devtmpfs -o "size=@devSize@" none /dev
 mkdir -p /run
 mount -t tmpfs -o "mode=0755,size=@runSize@" none /run
 
+
 # Process the kernel command line.
 export stage2Init=/init
 for o in $(cat /proc/cmdline); do
-- 
GitLab


From 589b745fc65bf0f3bce560e84c47b26e052596e8 Mon Sep 17 00:00:00 2001
From: Rok Garbas <rok@garbas.si>
Date: Tue, 23 Jul 2013 22:41:52 +0200
Subject: [PATCH 4771/5331] new venus service

---
 modules/module-list.nix    |   1 +
 modules/programs/venus.nix | 155 +++++++++++++++++++++++++++++++++++++
 2 files changed, 156 insertions(+)
 create mode 100644 modules/programs/venus.nix

diff --git a/modules/module-list.nix b/modules/module-list.nix
index 7e64411ece8..ebe66d1fa6e 100644
--- a/modules/module-list.nix
+++ b/modules/module-list.nix
@@ -50,6 +50,7 @@
   ./programs/shell.nix
   ./programs/ssh.nix
   ./programs/ssmtp.nix
+  ./programs/venus.nix
   ./programs/wvdial.nix
   ./rename.nix
   ./security/apparmor.nix
diff --git a/modules/programs/venus.nix b/modules/programs/venus.nix
new file mode 100644
index 00000000000..97dfc3e6d50
--- /dev/null
+++ b/modules/programs/venus.nix
@@ -0,0 +1,155 @@
+{config, pkgs, ...}:
+
+with pkgs.lib;
+let
+  cfg = config.services.venus;
+
+  configFile = pkgs.writeText "venus.ini"
+    ''
+      [Planet]
+      name = ${cfg.name}
+      link = ${cfg.link}
+      owner_name = ${cfg.ownerName}
+      owner_email = ${cfg.ownerEmail}
+      output_theme = ${cfg.cacheDirectory}/theme
+      output_dir = ${cfg.outputDirectory}
+      cache_directory = ${cfg.cacheDirectory}
+      items_per_page = ${toString cfg.itemsPerPage}
+      ${(concatStringsSep "\n\n"
+            (map ({ name, feedUrl, homepageUrl }:
+            ''
+              [${feedUrl}]
+              name = ${name}
+              link = ${homepageUrl}
+            '') cfg.feeds))}
+    '';
+
+  cronJob = ''
+    ${cfg.cronInterval} ${cfg.cronUser} ${pkgs.venus}/bin/venus-planet ${configFile}
+  '';
+
+in
+{
+
+  options = {
+    services.venus = {
+      enable = mkOption {
+        default = false;
+        type = types.bool;
+        description = ''
+          Enable the venus cron job.
+        '';
+      };
+
+      cronInterval = mkOption {
+        default = "*/10 * * * *";
+        type = types.string;
+        description = ''
+          Interval in cron format. Default is every 10 minutes.
+        '';
+      };
+
+      cronUser = mkOption {
+        default = "root";
+        type = types.string;
+        description = ''
+          User for running the cron job.
+        '';
+      };
+
+      name = mkOption {
+        default = "NixOS Planet";
+        type = types.string;
+        description = ''
+          Your planet's name.
+        '';
+      };
+
+      link = mkOption {
+        default = "http://planet.nixos.org";
+        type = types.string;
+        description = ''
+          Link to the main page.
+        '';
+      };
+
+      ownerName = mkOption {
+        default = "Rok Garbas";
+        type = types.string;
+        description = ''
+          Your name.
+        '';
+      };
+
+      ownerEmail = mkOption {
+        default = "some@example.com";
+        type = types.string;
+        description = ''
+          Your e-mail address.
+        '';
+      };
+
+      outputTheme = mkOption {
+        default = "${pkgs.venus}/themes/classic_fancy";
+        type = types.path;
+        description = ''
+          Directory containing a config.ini file which is merged with this one.
+          This is typically used to specify templating and bill of material
+          information.
+        '';
+      };
+
+      outputDirectory = mkOption {
+        type = types.path;
+        description = ''
+          Directory to place output files.
+        '';
+      };
+
+      cacheDirectory = mkOption {
+        default = "/var/cache/venus";
+        type = types.path;
+        description = ''
+            Where cached feeds are stored.
+        '';
+      };
+
+      itemsPerPage = mkOption {
+        default = 15;
+        type = types.int;
+        description = ''
+          How many items to put on each page.
+        '';
+      };
+
+      feeds = mkOption {
+        default = [];
+        example = [
+          {
+            name = "Rok Garbas";
+            feedUrl= "http://url/to/rss/feed.xml";
+            homepageUrl = "http://garbas.si";
+          }
+        ];
+        description = ''
+          List of feeds.
+        '';
+      };
+
+    };
+  };
+
+  config = mkIf cfg.enable {
+    system.activationScripts.venus =
+      ''
+        mkdir -p ${cfg.outputDirectory}
+        chown ${cfg.cronUser} ${cfg.outputDirectory} -R
+        rm -rf ${cfg.cacheDirectory}/themes
+        mkdir -p ${cfg.cacheDirectory}/themes
+        cp -R ${cfg.outputTheme}/* ${cfg.cacheDirectory}/theme
+        chown ${cfg.cronUser} ${cfg.cacheDirectory} -R
+      '';
+    services.cron.systemCronJobs = [ cronJob ];
+
+  };
+}
-- 
GitLab


From f9fbbb5d2fca16c477754b0b0470f7a7956cf112 Mon Sep 17 00:00:00 2001
From: Rok Garbas <rok@garbas.si>
Date: Tue, 23 Jul 2013 23:04:38 +0200
Subject: [PATCH 4772/5331] venus service better description

---
 modules/programs/venus.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/modules/programs/venus.nix b/modules/programs/venus.nix
index 97dfc3e6d50..a3263319304 100644
--- a/modules/programs/venus.nix
+++ b/modules/programs/venus.nix
@@ -37,7 +37,9 @@ in
         default = false;
         type = types.bool;
         description = ''
-          Enable the venus cron job.
+          Planet Venus is an awesome ‘river of news’ feed reader. It downloads
+          news feeds published by web sites and aggregates their content
+          together into a single combined feed, latest news first.
         '';
       };
 
-- 
GitLab


From 73284567cc8d9b6e79c9595351d1840f3781c8df Mon Sep 17 00:00:00 2001
From: Rok Garbas <rok@garbas.si>
Date: Wed, 24 Jul 2013 00:20:37 +0200
Subject: [PATCH 4773/5331] venus service: using systemd timer instead of
 cronjob

---
 modules/programs/venus.nix | 48 +++++++++++++++++++++++++++-----------
 1 file changed, 34 insertions(+), 14 deletions(-)

diff --git a/modules/programs/venus.nix b/modules/programs/venus.nix
index a3263319304..a211fd40ddf 100644
--- a/modules/programs/venus.nix
+++ b/modules/programs/venus.nix
@@ -24,10 +24,6 @@ let
             '') cfg.feeds))}
     '';
 
-  cronJob = ''
-    ${cfg.cronInterval} ${cfg.cronUser} ${pkgs.venus}/bin/venus-planet ${configFile}
-  '';
-
 in
 {
 
@@ -43,19 +39,30 @@ in
         '';
       };
 
-      cronInterval = mkOption {
-        default = "*/10 * * * *";
+      dates = mkOption {
+        default = "*:0,15,30,45";
+        type = types.string;
+        description = ''
+          Specification (in the format described by
+          <citerefentry><refentrytitle>systemd.time</refentrytitle>
+          <manvolnum>5</manvolnum></citerefentry>) of the time at
+          which the Venus will collect feeds.
+        '';
+      };
+
+      user = mkOption {
+        default = "root";
         type = types.string;
         description = ''
-          Interval in cron format. Default is every 10 minutes.
+          User for running venus script.
         '';
       };
 
-      cronUser = mkOption {
+      group = mkOption {
         default = "root";
         type = types.string;
         description = ''
-          User for running the cron job.
+          Group for running venus script.
         '';
       };
 
@@ -142,16 +149,29 @@ in
   };
 
   config = mkIf cfg.enable {
+
     system.activationScripts.venus =
       ''
         mkdir -p ${cfg.outputDirectory}
-        chown ${cfg.cronUser} ${cfg.outputDirectory} -R
-        rm -rf ${cfg.cacheDirectory}/themes
-        mkdir -p ${cfg.cacheDirectory}/themes
+        chown ${cfg.user}:${cfg.group} ${cfg.outputDirectory} -R
+        rm -rf ${cfg.cacheDirectory}/theme
+        mkdir -p ${cfg.cacheDirectory}/theme
         cp -R ${cfg.outputTheme}/* ${cfg.cacheDirectory}/theme
-        chown ${cfg.cronUser} ${cfg.cacheDirectory} -R
+        chown ${cfg.user}:${cfg.group} ${cfg.cacheDirectory} -R
       '';
-    services.cron.systemCronJobs = [ cronJob ];
+
+    systemd.services.venus =
+      { description = "Planet Venus, an awesome ‘river of news’ feed reader";
+        path  = [ pkgs.venus ];
+        script = "exec venus-planet ${configFile}";
+        serviceConfig.User = "${cfg.user}";
+        serviceConfig.Group = "${cfg.group}";
+      };
+
+    systemd.timers.venus =
+      { wantedBy = [ "timers.target" ];
+        timerConfig.OnCalendar = cfg.dates;
+      };
 
   };
 }
-- 
GitLab


From c5f6a0875096c1904d95146767f0f01f521614e8 Mon Sep 17 00:00:00 2001
From: Rob Vermaas <rob.vermaas@gmail.com>
Date: Thu, 25 Jul 2013 15:40:20 +0200
Subject: [PATCH 4774/5331] Make fail2ban a normal systemd service in nixos
 module.

---
 modules/services/security/fail2ban.nix | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/modules/services/security/fail2ban.nix b/modules/services/security/fail2ban.nix
index 3c3519a9db7..d90cf8d4471 100644
--- a/modules/services/security/fail2ban.nix
+++ b/modules/services/security/fail2ban.nix
@@ -98,11 +98,12 @@ in
         }
       ];
 
-    jobs.fail2ban =
+    systemd.services.fail2ban =
       { description = "Fail2ban intrusion prevention system";
+
+        wantedBy = [ "multi-user.target" ];
+        after = [ "network.target" ];
       
-        startOn = "started networking";
-        
         path = [ pkgs.fail2ban pkgs.iptables ];
         
         preStart =
@@ -113,7 +114,7 @@ in
             mkdir -p /var/run/fail2ban -m 0755
           '';
           
-        exec = "fail2ban-server -f";
+        serviceConfig.ExecStart = "${pkgs.fail2ban}/bin/fail2ban-server -f";
 
         postStart =
           ''
-- 
GitLab


From 7e7392b8ad8fcfe15334109a1ccf15b73ed5d779 Mon Sep 17 00:00:00 2001
From: Rob Vermaas <rob.vermaas@gmail.com>
Date: Thu, 25 Jul 2013 15:48:00 +0200
Subject: [PATCH 4775/5331] Limit the location where fail2ban service can write
 to (only /var/run/fail2ban).

---
 modules/services/security/fail2ban.nix | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/modules/services/security/fail2ban.nix b/modules/services/security/fail2ban.nix
index d90cf8d4471..258a2d79163 100644
--- a/modules/services/security/fail2ban.nix
+++ b/modules/services/security/fail2ban.nix
@@ -114,7 +114,11 @@ in
             mkdir -p /var/run/fail2ban -m 0755
           '';
           
-        serviceConfig.ExecStart = "${pkgs.fail2ban}/bin/fail2ban-server -f";
+        serviceConfig =
+          { ExecStart = "${pkgs.fail2ban}/bin/fail2ban-server -f";
+            ReadOnlyDirectories = "/";
+            ReadWriteDirectories = "/var/run/fail2ban";
+          };
 
         postStart =
           ''
-- 
GitLab


From 6adfb647ff3cd3c7bb00b68dafe79eec8786df3e Mon Sep 17 00:00:00 2001
From: Rob Vermaas <rob.vermaas@gmail.com>
Date: Thu, 25 Jul 2013 20:03:29 +0200
Subject: [PATCH 4776/5331] Limit the capabilities of what fail2ban service can
 do. Taken from ArchLinux wiki.

---
 modules/services/security/fail2ban.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/modules/services/security/fail2ban.nix b/modules/services/security/fail2ban.nix
index 258a2d79163..a232d18a572 100644
--- a/modules/services/security/fail2ban.nix
+++ b/modules/services/security/fail2ban.nix
@@ -118,6 +118,7 @@ in
           { ExecStart = "${pkgs.fail2ban}/bin/fail2ban-server -f";
             ReadOnlyDirectories = "/";
             ReadWriteDirectories = "/var/run/fail2ban";
+            CapabilityBoundingSet="CAP_DAC_READ_SEARCH CAP_NET_ADMIN CAP_NET_RAW";
           };
 
         postStart =
-- 
GitLab


From ef5e2be3390a45b90912c95a6db9de93485d322a Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 25 Jul 2013 22:56:58 +0200
Subject: [PATCH 4777/5331] venus: Support https

---
 modules/programs/venus.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/modules/programs/venus.nix b/modules/programs/venus.nix
index a211fd40ddf..c316163c8c7 100644
--- a/modules/programs/venus.nix
+++ b/modules/programs/venus.nix
@@ -166,6 +166,7 @@ in
         script = "exec venus-planet ${configFile}";
         serviceConfig.User = "${cfg.user}";
         serviceConfig.Group = "${cfg.group}";
+        environment.OPENSSL_X509_CERT_FILE = "/etc/ssl/certs/ca-bundle.crt";
       };
 
     systemd.timers.venus =
-- 
GitLab


From 5a2390327dc990145317e34cce87debf1ab59a9e Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Tue, 23 Jul 2013 20:31:03 +0200
Subject: [PATCH 4778/5331] nixos-rebuild: Allow to use --repair.

Unfortunately, the flag only works directly and without the daemon, so
this adds an extra variable $repair, to avoid the daemon. This is to
avoid to iterate through the $extraBuildFlags just to test whether
"--repair" exists.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 modules/installer/tools/nixos-rebuild.sh | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/modules/installer/tools/nixos-rebuild.sh b/modules/installer/tools/nixos-rebuild.sh
index 7fd0908a935..9bb13061ed9 100644
--- a/modules/installer/tools/nixos-rebuild.sh
+++ b/modules/installer/tools/nixos-rebuild.sh
@@ -49,6 +49,7 @@ action=
 buildNix=1
 rollback=
 upgrade=
+repair=
 
 while [ "$#" -gt 0 ]; do
     i="$1"; shift 1
@@ -71,6 +72,10 @@ while [ "$#" -gt 0 ]; do
       --upgrade)
         upgrade=1
         ;;
+      --repair)
+        repair=1
+        extraBuildFlags+=("$i")
+        ;;
       --show-trace|--no-build-hook|--keep-failed|-K|--keep-going|-k|--verbose|-v|--fallback|--repair)
         extraBuildFlags+=("$i")
         ;;
@@ -111,7 +116,9 @@ trap 'rm -rf "$tmpDir"' EXIT
 # This matters if the new Nix in Nixpkgs has a schema change.  It
 # would upgrade the schema, which should only happen once we actually
 # switch to the new configuration.
-if systemctl show nix-daemon.socket nix-daemon.service | grep -q ActiveState=active; then
+# If --repair is given, don't try to use the Nix daemon, because the
+# flag can only be used directly.
+if [ -z "$repair" ] && systemctl show nix-daemon.socket nix-daemon.service | grep -q ActiveState=active; then
     export NIX_REMOTE=${NIX_REMOTE:-daemon}
 fi
 
-- 
GitLab


From 96be2d5a7dd1c3733311e20eb5b41ecb6aeb0086 Mon Sep 17 00:00:00 2001
From: Rob Vermaas <rob.vermaas@gmail.com>
Date: Sun, 28 Jul 2013 18:33:57 +0200
Subject: [PATCH 4779/5331] Fix ReadWriteDirectories for fail2ban, added
 /var/tmp.

---
 modules/services/security/fail2ban.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/services/security/fail2ban.nix b/modules/services/security/fail2ban.nix
index a232d18a572..ee57a41888b 100644
--- a/modules/services/security/fail2ban.nix
+++ b/modules/services/security/fail2ban.nix
@@ -117,7 +117,7 @@ in
         serviceConfig =
           { ExecStart = "${pkgs.fail2ban}/bin/fail2ban-server -f";
             ReadOnlyDirectories = "/";
-            ReadWriteDirectories = "/var/run/fail2ban";
+            ReadWriteDirectories = "/var/run/fail2ban /var/tmp";
             CapabilityBoundingSet="CAP_DAC_READ_SEARCH CAP_NET_ADMIN CAP_NET_RAW";
           };
 
-- 
GitLab


From 3ca7d7b2915d48854856d2a2c1024b268decaa4a Mon Sep 17 00:00:00 2001
From: Rickard Nilsson <rickynils@gmail.com>
Date: Tue, 30 Jul 2013 10:20:56 +0200
Subject: [PATCH 4780/5331] Add OpenSMTPD service option

---
 modules/misc/ids.nix                |  4 ++
 modules/module-list.nix             |  1 +
 modules/services/mail/opensmtpd.nix | 83 +++++++++++++++++++++++++++++
 3 files changed, 88 insertions(+)
 create mode 100644 modules/services/mail/opensmtpd.nix

diff --git a/modules/misc/ids.nix b/modules/misc/ids.nix
index 7272c3e7d5d..915da73d307 100644
--- a/modules/misc/ids.nix
+++ b/modules/misc/ids.nix
@@ -76,6 +76,8 @@ in
     nslcd = 58;
     nginx = 60;
     chrony = 61;
+    smtpd = 63;
+    smtpq = 64;    
 
     # When adding a uid, make sure it doesn't match an existing gid.
 
@@ -135,6 +137,8 @@ in
     scanner = 59;
     nginx = 60;
     systemd-journal = 62;
+    smtpd = 63;
+    smtpq = 64;    
 
     # When adding a gid, make sure it doesn't match an existing uid.
 
diff --git a/modules/module-list.nix b/modules/module-list.nix
index ebe66d1fa6e..13501ba4910 100644
--- a/modules/module-list.nix
+++ b/modules/module-list.nix
@@ -104,6 +104,7 @@
   ./services/mail/dovecot.nix
   ./services/mail/freepops.nix
   ./services/mail/mail.nix
+  ./services/mail/opensmtpd.nix
   ./services/mail/postfix.nix
   ./services/mail/spamassassin.nix
   ./services/misc/autofs.nix
diff --git a/modules/services/mail/opensmtpd.nix b/modules/services/mail/opensmtpd.nix
new file mode 100644
index 00000000000..2732fd60200
--- /dev/null
+++ b/modules/services/mail/opensmtpd.nix
@@ -0,0 +1,83 @@
+{ pkgs, config, ... }:
+
+with pkgs;
+with pkgs.lib;
+
+let
+
+  cfg = config.services.opensmtpd;
+  conf = writeText "smtpd.conf" cfg.serverConfiguration;
+  args = concatStringsSep " " cfg.extraServerArgs;
+
+in {
+
+  ###### interface
+
+  options = {
+
+    services.opensmtpd = {
+
+      enable = mkOption {
+        type = types.bool;
+        default = false;
+        description = "Whether to enable the OpenSMTPD server.";
+      };
+
+      extraServerArgs = mkOption {
+        type = types.listOf types.string;
+        default = [];
+        example = [ "-v" "-P mta" ];
+        description = ''
+          Extra command line arguments provided when the smtpd process
+          is started.
+        '';
+      };
+
+      serverConfiguration = mkOption {
+        type = types.string;
+        default = "";
+        example = ''
+          listen on lo
+          accept for any deliver to lmtp localhost:24
+        ''; 
+        description = ''
+          The contents of the smtpd.conf configuration file. See the
+          OpenSMTPD documentation for syntax information. If this option
+          is left empty, the OpenSMTPD server will not start.
+        '';
+      };
+    };
+
+  };
+
+
+  ###### implementation
+
+  config = mkIf config.services.opensmtpd.enable {
+    users.extraGroups = {
+      smtpd.gid = config.ids.gids.smtpd;
+      smtpq.gid = config.ids.gids.smtpq;
+    };
+
+    users.extraUsers = {
+      smtpd = {
+        description = "OpenSMTPD process user";
+        uid = config.ids.uids.smtpd;
+        group = "smtpd";
+      };
+      smtpq = {
+        description = "OpenSMTPD queue user";
+        uid = config.ids.uids.smtpq;
+        group = "smtpq";
+      };
+    };
+
+    systemd.services.opensmtpd = {
+      wantedBy = [ "multi-user.target" ];
+      wants = [ "network.target" ];
+      after = [ "network.target" ];
+      preStart = "mkdir -p /var/spool";
+      serviceConfig.ExecStart = "${opensmtpd}/sbin/smtpd -d -f ${conf} ${args}";
+    };
+  };
+}
-- 
GitLab


From 9cf0a419251e8dc2234fb940e5f36301eb1fcd09 Mon Sep 17 00:00:00 2001
From: Rob Vermaas <rob.vermaas@gmail.com>
Date: Wed, 31 Jul 2013 11:22:32 +0200
Subject: [PATCH 4781/5331] fail2ban: move /var/run/fail2ban creation to
 activation script to be able to restrict the write locations for the service
 properly, add configuration files to the restartTriggers.

---
 modules/services/security/fail2ban.nix | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/modules/services/security/fail2ban.nix b/modules/services/security/fail2ban.nix
index ee57a41888b..2b2a54ef409 100644
--- a/modules/services/security/fail2ban.nix
+++ b/modules/services/security/fail2ban.nix
@@ -98,22 +98,20 @@ in
         }
       ];
 
+    system.activationScripts.fail2ban =
+      ''
+        mkdir -p /var/run/fail2ban -m 0755
+      '';
+
     systemd.services.fail2ban =
       { description = "Fail2ban intrusion prevention system";
 
         wantedBy = [ "multi-user.target" ];
         after = [ "network.target" ];
       
+        restartTriggers = [ fail2banConf jailConf ];
         path = [ pkgs.fail2ban pkgs.iptables ];
         
-        preStart =
-          ''
-            # FIXME: this won't detect changes to
-            # /etc/fail2ban/{filter.d,action.d}.
-            # ${fail2banConf} ${jailConf}
-            mkdir -p /var/run/fail2ban -m 0755
-          '';
-          
         serviceConfig =
           { ExecStart = "${pkgs.fail2ban}/bin/fail2ban-server -f";
             ReadOnlyDirectories = "/";
-- 
GitLab


From 7a32f2d15abc665d5db2aab4664b5edd6264175e Mon Sep 17 00:00:00 2001
From: Rob Vermaas <rob.vermaas@gmail.com>
Date: Wed, 31 Jul 2013 13:35:21 +0200
Subject: [PATCH 4782/5331] Fix node_modules references in uptime module.

---
 modules/services/monitoring/uptime.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/modules/services/monitoring/uptime.nix b/modules/services/monitoring/uptime.nix
index 8479372fab4..fa3de7d90bc 100644
--- a/modules/services/monitoring/uptime.nix
+++ b/modules/services/monitoring/uptime.nix
@@ -11,7 +11,7 @@ let
     ln -sv /var/lib/uptime/runtime.json $out/runtime.json
   '' else ''
     mkdir $out
-    cat ${pkgs.nodePackages.node-uptime}/node_modules/node-uptime/config/default.yaml > $out/default.yaml
+    cat ${pkgs.nodePackages.node-uptime}/lib/node_modules/node-uptime/config/default.yaml > $out/default.yaml
     cat >> $out/default.yaml <<EOF
 
     autoStartMonitor: false
@@ -69,10 +69,10 @@ in {
       environment = {
         NODE_CONFIG_DIR = configDir;
         NODE_ENV = cfg.nodeEnv;
-        NODE_PATH = "${pkgs.nodePackages.node-uptime}/node_modules/node-uptime/node_modules";
+        NODE_PATH = "${pkgs.nodePackages.node-uptime}/lib/node_modules/node-uptime/node_modules";
       };
       preStart = "mkdir -p /var/lib/uptime";
-      serviceConfig.ExecStart = "${pkgs.nodejs}/bin/node ${pkgs.nodePackages.node-uptime}/node_modules/node-uptime/app.js";
+      serviceConfig.ExecStart = "${pkgs.nodejs}/bin/node ${pkgs.nodePackages.node-uptime}/lib/node_modules/node-uptime/app.js";
     };
 
     services.mongodb.enable = mkIf (!cfg.usesRemoteMongo) true;
@@ -85,11 +85,11 @@ in {
       environment = {
         NODE_CONFIG_DIR = configDir;
         NODE_ENV = cfg.nodeEnv;
-        NODE_PATH = "${pkgs.nodePackages.node-uptime}/node_modules/node-uptime/node_modules";
+        NODE_PATH = "${pkgs.nodePackages.node-uptime}/lib/node_modules/node-uptime/node_modules";
       };
       # Ugh, need to wait for web service to be up
       preStart = if cfg.enableWebService then "sleep 1s" else "mkdir -p /var/lib/uptime";
-      serviceConfig.ExecStart = "${pkgs.nodejs}/bin/node ${pkgs.nodePackages.node-uptime}/node_modules/node-uptime/monitor.js";
+      serviceConfig.ExecStart = "${pkgs.nodejs}/bin/node ${pkgs.nodePackages.node-uptime}/lib/node_modules/node-uptime/monitor.js";
     };
   }) ];
 }
-- 
GitLab


From 57c35c94ca1982a797f37b79b2df0e89c5e9db2d Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 31 Jul 2013 14:53:27 +0200
Subject: [PATCH 4783/5331] Use the qemu-kvm wrapper

---
 lib/test-driver/Machine.pm                  | 2 +-
 lib/testing.nix                             | 5 ++---
 modules/virtualisation/amazon-image.nix     | 2 +-
 modules/virtualisation/nova-image.nix       | 2 +-
 modules/virtualisation/qemu-opts            | 4 ++++
 modules/virtualisation/qemu-vm.nix          | 9 ++++-----
 modules/virtualisation/virtualbox-image.nix | 4 ++--
 7 files changed, 15 insertions(+), 13 deletions(-)
 create mode 100644 modules/virtualisation/qemu-opts

diff --git a/lib/test-driver/Machine.pm b/lib/test-driver/Machine.pm
index f5bf40a1868..615fe09bdfc 100644
--- a/lib/test-driver/Machine.pm
+++ b/lib/test-driver/Machine.pm
@@ -30,7 +30,7 @@ sub new {
     if (!$startCommand) {
         # !!! merge with qemu-vm.nix.
         $startCommand =
-            "$ENV{'qemu'} -enable-kvm -m 384 " .
+            "qemu-kvm -m 384 " .
             "-net nic,model=virtio \$QEMU_OPTS ";
         my $iface = $args->{hdaInterface} || "virtio";
         $startCommand .= "-drive file=" . Cwd::abs_path($args->{hda}) . ",if=$iface,boot=on,werror=report "
diff --git a/lib/testing.nix b/lib/testing.nix
index 653eaf3e9a6..9a72e1f4bd5 100644
--- a/lib/testing.nix
+++ b/lib/testing.nix
@@ -27,9 +27,8 @@ rec {
         cp ${./test-driver/Logger.pm} $libDir/Logger.pm
 
         wrapProgram $out/bin/nixos-test-driver \
-          --prefix PATH : "${pkgs.qemu}/bin:${pkgs.vde2}/bin:${imagemagick}/bin:${coreutils}/bin" \
-          --prefix PERL5LIB : "${lib.makePerlPath [ perlPackages.TermReadLineGnu perlPackages.XMLWriter perlPackages.IOTty ]}:$out/lib/perl5/site_perl" \
-          --set qemu qemu-system-${if pkgs.stdenv.system == "x86_64-linux" then "x86_64" else "i386"}
+          --prefix PATH : "${pkgs.qemu_kvm}/bin:${pkgs.vde2}/bin:${imagemagick}/bin:${coreutils}/bin" \
+          --prefix PERL5LIB : "${lib.makePerlPath [ perlPackages.TermReadLineGnu perlPackages.XMLWriter perlPackages.IOTty ]}:$out/lib/perl5/site_perl"
       '';
   };
 
diff --git a/modules/virtualisation/amazon-image.nix b/modules/virtualisation/amazon-image.nix
index dad071cc8e9..30b06b9ef24 100644
--- a/modules/virtualisation/amazon-image.nix
+++ b/modules/virtualisation/amazon-image.nix
@@ -12,7 +12,7 @@ with pkgs.lib;
             ''
               mkdir $out
               diskImage=$out/nixos.img
-              ${pkgs.vmTools.kvm}/bin/qemu-img create -f raw $diskImage "4G"
+              ${pkgs.vmTools.qemu}/bin/qemu-img create -f raw $diskImage "4G"
               mv closure xchg/
             '';
           buildInputs = [ pkgs.utillinux pkgs.perl ];
diff --git a/modules/virtualisation/nova-image.nix b/modules/virtualisation/nova-image.nix
index cc012ffc8a3..59b88a54367 100644
--- a/modules/virtualisation/nova-image.nix
+++ b/modules/virtualisation/nova-image.nix
@@ -12,7 +12,7 @@ with pkgs.lib;
             ''
               mkdir $out
               diskImage=$out/image
-              ${pkgs.vmTools.kvm}/bin/qemu-img create -f raw $diskImage "4G"
+              ${pkgs.vmTools.qemu}/bin/qemu-img create -f raw $diskImage "4G"
               mv closure xchg/
             '';
           buildInputs = [ pkgs.utillinux pkgs.perl ];
diff --git a/modules/virtualisation/qemu-opts b/modules/virtualisation/qemu-opts
new file mode 100644
index 00000000000..f06a5136608
--- /dev/null
+++ b/modules/virtualisation/qemu-opts
@@ -0,0 +1,4 @@
+          -device virtio-serial \
+          -chardev socket,id=charconsole0,path=/tmp/nixos-socket,server,nowait \
+          #-device virtconsole,chardev=charconsole0,id=console0 \
+          -device virtserialport,chardev=chardev=charconsole0,id=serial0
diff --git a/modules/virtualisation/qemu-vm.nix b/modules/virtualisation/qemu-vm.nix
index 6715b494dfb..240a3e0b2a8 100644
--- a/modules/virtualisation/qemu-vm.nix
+++ b/modules/virtualisation/qemu-vm.nix
@@ -158,7 +158,7 @@ let
       NIX_DISK_IMAGE=$(readlink -f ''${NIX_DISK_IMAGE:-${config.virtualisation.diskImage}})
 
       if ! test -e "$NIX_DISK_IMAGE"; then
-          ${pkgs.qemu}/bin/qemu-img create -f qcow2 "$NIX_DISK_IMAGE" \
+          ${pkgs.qemu_kvm}/bin/qemu-img create -f qcow2 "$NIX_DISK_IMAGE" \
             ${toString config.virtualisation.diskSize}M || exit 1
       fi
 
@@ -172,15 +172,14 @@ let
       idx=2
       extraDisks=""
       ${flip concatMapStrings cfg.emptyDiskImages (size: ''
-        ${pkgs.qemu}/bin/qemu-img create -f raw "empty$idx" "${toString size}M"
+        ${pkgs.qemu_kvm}/bin/qemu-img create -f raw "empty$idx" "${toString size}M"
         extraDisks="$extraDisks -drive index=$idx,file=$(pwd)/empty$idx,if=virtio,werror=report"
         idx=$((idx + 1))
       '')}
 
       # Start QEMU.
       # "-boot menu=on" is there, because I don't know how to make qemu boot from 2nd hd.
-      exec ${pkgs.qemu}/bin/qemu-system-${if pkgs.stdenv.system == "x86_64-linux" then "x86_64" else "i386"} \
-          -enable-kvm \
+      exec ${pkgs.qemu_kvm}/bin/qemu-kvm \
           -name ${vmName} \
           -m ${toString config.virtualisation.memorySize} \
           ${optionalString (pkgs.stdenv.system == "x86_64-linux") "-cpu kvm64"} \
@@ -226,7 +225,7 @@ let
             ''
               mkdir $out
               diskImage=$out/disk.img
-              ${pkgs.qemu}/bin/qemu-img create -f qcow2 $diskImage "32M"
+              ${pkgs.qemu_kvm}/bin/qemu-img create -f qcow2 $diskImage "32M"
             '';
           buildInputs = [ pkgs.utillinux ];
         }
diff --git a/modules/virtualisation/virtualbox-image.nix b/modules/virtualisation/virtualbox-image.nix
index ff00ba7aee4..2243d308c1b 100644
--- a/modules/virtualisation/virtualbox-image.nix
+++ b/modules/virtualisation/virtualbox-image.nix
@@ -11,12 +11,12 @@ with pkgs.lib;
             ''
               mkdir $out
               diskImage=$out/image
-              ${pkgs.vmTools.kvm}/bin/qemu-img create -f raw $diskImage "10G"
+              ${pkgs.vmTools.qemu}/bin/qemu-img create -f raw $diskImage "10G"
               mv closure xchg/
             '';
           postVM =
             ''
-              ${pkgs.vmTools.kvm}/bin/qemu-img convert -f raw -O vdi $diskImage $out/disk.vdi
+              ${pkgs.vmTools.qemu}/bin/qemu-img convert -f raw -O vdi $diskImage $out/disk.vdi
               rm $diskImage
             '';
           buildInputs = [ pkgs.utillinux pkgs.perl ];
-- 
GitLab


From 24a44c98d297c623ac956be7641354b3b0cb3a0c Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 31 Jul 2013 14:55:24 +0200
Subject: [PATCH 4784/5331] bash: Disable hashing of command lookups in
 interactive shells

This just confuses people when (say) using multiple profiles.
Performance benefits for interactive shells are likely to be very
small anyway.
---
 modules/programs/bash/bash.nix | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/modules/programs/bash/bash.nix b/modules/programs/bash/bash.nix
index d227ef729db..a4b71cfc276 100644
--- a/modules/programs/bash/bash.nix
+++ b/modules/programs/bash/bash.nix
@@ -102,9 +102,9 @@ in
         target = "profile";
       }
 
-      { # /etc/bashrc: executed every time a bash starts. Sources
-        # /etc/profile to ensure that the system environment is
-        # configured properly.
+      { # /etc/bashrc: executed every time an interactive bash
+        # starts. Sources /etc/profile to ensure that the system
+        # environment is configured properly.
         source = pkgs.substituteAll {
           src = ./bashrc.sh;
           inherit (cfg) interactiveShellInit;
@@ -133,6 +133,9 @@ in
       ${cfg.promptInit}
       ${initBashCompletion}
       ${shellAliases}
+
+      # Disable hashing (i.e. caching) of command lookups.
+      set +h
     '';
 
   system.build.binsh = pkgs.bashInteractive;
-- 
GitLab


From 7bd50185fff3dbbdb9b011c88deb71e3a1f25858 Mon Sep 17 00:00:00 2001
From: Martin Bravenboer <martin.bravenboer@gmail.com>
Date: Thu, 25 Jul 2013 20:39:44 -0700
Subject: [PATCH 4785/5331] Support Nix's mandatoryFeatures

Extend the buildMachines option to support specification of
supportedFeatures and mandatoryFeatures in order to support all
configuration options of the nix.machines file.
---
 modules/services/misc/nix-daemon.nix | 34 ++++++++++++++++++----------
 1 file changed, 22 insertions(+), 12 deletions(-)

diff --git a/modules/services/misc/nix-daemon.nix b/modules/services/misc/nix-daemon.nix
index 4563336a5bc..3296eff041b 100644
--- a/modules/services/misc/nix-daemon.nix
+++ b/modules/services/misc/nix-daemon.nix
@@ -155,26 +155,32 @@ in
             sshKey = "/root/.ssh/id_buildfarm";
             system = "x86_64-linux";
             maxJobs = 2;
+            supportedFeatures = "kvm";
+            mandatoryFeatures = "perf";
           }
         ];
         description = "
           This option lists the machines to be used if distributed
           builds are enabled (see
           <option>nix.distributedBuilds</option>).  Nix will perform
-          derivations on those machines via SSh by copying the inputs to
-          the Nix store on the remote machine, starting the build, then
-          copying the output back to the local Nix store.  Each element
-          of the list should be an attribute set containing the
-          machine's host name (<varname>hostname</varname>), the user
-          name to be used for the SSH connection
+          derivations on those machines via SSh by copying the inputs
+          to the Nix store on the remote machine, starting the build,
+          then copying the output back to the local Nix store.  Each
+          element of the list should be an attribute set containing
+          the machine's host name (<varname>hostname</varname>), the
+          user name to be used for the SSH connection
           (<varname>sshUser</varname>), the Nix system type
           (<varname>system</varname>, e.g.,
-          <literal>\"i686-linux\"</literal>), the maximum number of jobs
-          to be run in parallel on that machine
-          (<varname>maxJobs</varname>), and the path to the SSH private
-          key to be used to connect (<varname>sshKey</varname>).  The
-          SSH private key should not have a passphrase, and the
-          corresponding public key should be added to
+          <literal>\"i686-linux\"</literal>), the maximum number of
+          jobs to be run in parallel on that machine
+          (<varname>maxJobs</varname>), the path to the SSH private
+          key to be used to connect (<varname>sshKey</varname>), a
+          list of supported features of the machine
+          (<varname>supportedFeatures</varname>) and a list of
+          mandatory features of the machine
+          (<varname>mandatoryFeatures</varname>). The SSH private key
+          should not have a passphrase, and the corresponding public
+          key should be added to
           <filename>~<replaceable>sshUser</replaceable>/authorized_keys</filename>
           on the remote machine.
         ";
@@ -263,6 +269,10 @@ in
             + (if machine ? system then machine.system else concatStringsSep "," machine.systems)
             + " ${machine.sshKey} ${toString machine.maxJobs} "
             + (if machine ? speedFactor then toString machine.speedFactor else "1" )
+            + " "
+            + (if machine ? supportedFeatures then concatStringsSep "," machine.supportedFeatures else "" )
+            + " "
+            + (if machine ? mandatoryFeatures then concatStringsSep "," machine.mandatoryFeatures else "" )
             + "\n"
           ) cfg.buildMachines;
       };
-- 
GitLab


From 39f67d9d3897117ac3afcf40e2e2118fa8f46e22 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 31 Jul 2013 16:10:13 +0200
Subject: [PATCH 4786/5331] Hide kernel pointers for unprivileged users via
 kptr_restrict

---
 modules/config/sysctl.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/modules/config/sysctl.nix b/modules/config/sysctl.nix
index b0f3708dbb2..6b52fd38fde 100644
--- a/modules/config/sysctl.nix
+++ b/modules/config/sysctl.nix
@@ -60,6 +60,10 @@ in
     boot.kernel.sysctl."fs.protected_hardlinks" = true;
     boot.kernel.sysctl."fs.protected_symlinks" = true;
 
+    # Hide kernel pointers (e.g. in /proc/modules) for unprivileged
+    # users as these make it easier to exploit kernel vulnerabilities.
+    boot.kernel.sysctl."kernel.kptr_restrict" = 1;
+
   };
 
 }
-- 
GitLab


From b32ef4dbef492ffd65681813924c247da9ae8ac6 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Wed, 31 Jul 2013 19:31:18 +0200
Subject: [PATCH 4787/5331] test-driver/Machine: Add new allowReboot flag.

This is to actually allow for the target machine to reboot, which could
come in handy for some VM tests in NixOps. Well, actually to be more
specific: We need it for the Hetzner NixOps backend test. :-)

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 lib/test-driver/Machine.pm | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/lib/test-driver/Machine.pm b/lib/test-driver/Machine.pm
index 615fe09bdfc..c56e650ed36 100644
--- a/lib/test-driver/Machine.pm
+++ b/lib/test-driver/Machine.pm
@@ -48,9 +48,13 @@ sub new {
         make_path($sharedDir, { mode => 0700, owner => $< });
     }
 
+    my $allowReboot = 0;
+    $allowReboot = $args->{allowReboot} if defined $args->{allowReboot};
+
     my $self = {
         startCommand => $startCommand,
         name => $name,
+        allowReboot => $allowReboot,
         booted => 0,
         pid => 0,
         connected => 0,
@@ -136,7 +140,8 @@ sub start {
         $ENV{SHARED_DIR} = $sharedDir;
         $ENV{USE_TMPDIR} = 1;
         $ENV{QEMU_OPTS} =
-            "-no-reboot -monitor unix:./monitor -chardev socket,id=shell,path=./shell " .
+            ($self->{allowReboot} ? "" : "-no-reboot ") .
+            "-monitor unix:./monitor -chardev socket,id=shell,path=./shell " .
             "-device virtio-serial -device virtconsole,chardev=shell " .
             ($showGraphics ? "-serial stdio" : "-nographic") . " " . ($ENV{QEMU_OPTS} || "");
         chdir $self->{stateDir} or die;
-- 
GitLab


From 90554a03c72b33d7636ebabe21e7f9d31f9566ef Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cillian=20de=20R=C3=B3iste?= <goibhniu@fsfe.org>
Date: Thu, 1 Aug 2013 00:36:15 +0200
Subject: [PATCH 4788/5331] Supybot/limnoria: add service module

---
 modules/misc/ids.nix                    |  1 +
 modules/module-list.nix                 |  1 +
 modules/services/networking/supybot.nix | 97 +++++++++++++++++++++++++
 3 files changed, 99 insertions(+)
 create mode 100644 modules/services/networking/supybot.nix

diff --git a/modules/misc/ids.nix b/modules/misc/ids.nix
index 7272c3e7d5d..54c9b331ade 100644
--- a/modules/misc/ids.nix
+++ b/modules/misc/ids.nix
@@ -76,6 +76,7 @@ in
     nslcd = 58;
     nginx = 60;
     chrony = 61;
+    supybot = 62;
 
     # When adding a uid, make sure it doesn't match an existing gid.
 
diff --git a/modules/module-list.nix b/modules/module-list.nix
index ebe66d1fa6e..4f014c9d348 100644
--- a/modules/module-list.nix
+++ b/modules/module-list.nix
@@ -169,6 +169,7 @@
   ./services/networking/rdnssd.nix
   ./services/networking/rpcbind.nix
   ./services/networking/sabnzbd.nix
+  ./services/networking/supybot.nix
   ./services/networking/ssh/lshd.nix
   ./services/networking/ssh/sshd.nix
   ./services/networking/tftpd.nix
diff --git a/modules/services/networking/supybot.nix b/modules/services/networking/supybot.nix
new file mode 100644
index 00000000000..f65665e41e4
--- /dev/null
+++ b/modules/services/networking/supybot.nix
@@ -0,0 +1,97 @@
+{ config, pkgs, ... }:
+
+with pkgs.lib;
+
+let
+
+  cfg  = config.services.supybot;
+  configFile = pkgs.writeText "supybot.cfg" cfg.config;
+
+in
+
+{
+
+  ###### interface
+
+  options = {
+
+    services.supybot = {
+
+      enable = mkOption {
+        default = false;
+        description = "Enable the supybot IRC bot";
+      };
+
+      homeDir = mkOption {
+        default = "/home/supybot";
+        description = "
+          Directory holding all state for nginx to run.
+        ";
+      };
+
+      config = mkOption {
+        type = types.lines;
+        default = "";
+        description = ''
+          Verbatim contents of the supybot config, this can be
+          generated by supybot-wizard
+        '';
+      };
+
+      user = mkOption {
+        default = "supybot";
+        description = "User account under which supybot runs.";
+      };
+
+      group = mkOption {
+        default = "supybot";
+        description = "Group account under which supybot runs.";
+      };
+
+    };
+
+  };
+
+
+  ###### implementation
+
+  config = mkIf cfg.enable {
+  
+    environment.systemPackages = [ pkgs.pythonPackages.limnoria ];
+
+    users.extraUsers = singleton
+      { name = cfg.user;
+        uid = config.ids.uids.supybot;
+        group = "supybot";
+        description = "Supybot IRC bot user";
+        home = cfg.homeDir;
+        createHome = true;
+      }; 
+
+    users.extraGroups.supybot = {};
+
+    systemd.services.supybot =
+      { description = "Supybot IRC bot";
+        after = [ "network.target" ];
+        wantedBy = [ "multi-user.target" ];
+        path = [ pkgs.pythonPackages.limnoria ];
+        preStart = ''
+          cd ${cfg.homeDir}
+          mkdir -p logs/plugins backup conf data plugins tmp
+        '';
+        serviceConfig =
+          { ExecStart =
+              "${pkgs.pythonPackages.limnoria}/bin/supybot ${cfg.homeDir}/supybot.cfg";
+            PIDFile = "/run/supybot.pid";
+            User = "${cfg.user}"; 
+            Group = "${cfg.group}";
+            UMask = "0007";
+            Restart = "on-abort";
+            StartLimitInterval = "5m";
+            StartLimitBurst = "1";
+          };
+      };
+
+  };
+
+}
-- 
GitLab


From 6ae87b81cc8254b69f8c7293263ad20e31504f2a Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Thu, 1 Aug 2013 02:10:13 +0200
Subject: [PATCH 4789/5331] qemu-vm: Add new option writableStoreUseTmpfs.

This is to use the VMs own disk image instead of a tmpfs in order to
avoid eating more memory. Of course, by default we still use the tmpfs
in order to not break existing VM tests.

I personally don't like the coding style of the option definition, but
in order to stay consistent, I followed the overall style in this file.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 modules/virtualisation/qemu-vm.nix | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/modules/virtualisation/qemu-vm.nix b/modules/virtualisation/qemu-vm.nix
index 240a3e0b2a8..61d5d20f3be 100644
--- a/modules/virtualisation/qemu-vm.nix
+++ b/modules/virtualisation/qemu-vm.nix
@@ -114,6 +114,16 @@ let
           '';
       };
 
+    virtualisation.writableStoreUseTmpfs =
+      mkOption {
+        default = true;
+        description =
+          ''
+            Use a tmpfs for the writable store instead of writing to the VM's
+            own filesystem.
+          '';
+      };
+
     networking.primaryIPAddress =
       mkOption {
         default = "";
@@ -297,7 +307,13 @@ in
         mount --rbind $targetRoot/nix/store /unionfs-chroot/ro-store
 
         mkdir /unionfs-chroot/rw-store
+        ${if cfg.writableStoreUseTmpfs then ''
         mount -t tmpfs -o "mode=755" none /unionfs-chroot/rw-store
+        '' else ''
+        mkdir $targetRoot/.nix-rw-store
+        mount --bind $targetRoot/.nix-rw-store /unionfs-chroot/rw-store
+        ''}
+
         unionfs -o allow_other,cow,nonempty,chroot=/unionfs-chroot,max_files=32768,hide_meta_files /rw-store=RW:/ro-store=RO $targetRoot/nix/store
       ''}
     '';
-- 
GitLab


From ce54650b512e63a1f40446ef1d5766fbfa912779 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Mon, 8 Jul 2013 18:34:16 +0200
Subject: [PATCH 4790/5331] lightdm: remove unused reference to mesa drivers

I don't need them and llvm at all, for example.
---
 modules/services/x11/display-managers/lightdm.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/modules/services/x11/display-managers/lightdm.nix b/modules/services/x11/display-managers/lightdm.nix
index 9f1eae5ffb8..6659a2dec46 100644
--- a/modules/services/x11/display-managers/lightdm.nix
+++ b/modules/services/x11/display-managers/lightdm.nix
@@ -13,7 +13,6 @@ let
   xserverWrapper = writeScript "xserver-wrapper"
     ''
       #! /bin/sh
-      #export XORG_DRI_DRIVER_PATH="${pkgs.mesa_drivers}/lib/dri" # ?? X sets this itself
       export XKB_BINDIR="${pkgs.xorg.xkbcomp}/bin"
       exec ${dmcfg.xserverBin} ${dmcfg.xserverArgs}
     '';
-- 
GitLab


From 6e093113fe50a55fb055d0819d2bca797c140d64 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cillian=20de=20R=C3=B3iste?= <goibhniu@fsfe.org>
Date: Sun, 4 Aug 2013 00:18:44 +0200
Subject: [PATCH 4791/5331] Supybot service: failing to create stateDir in
 /var/lib

---
 modules/services/networking/supybot.nix | 31 ++++++++++++++-----------
 1 file changed, 17 insertions(+), 14 deletions(-)

diff --git a/modules/services/networking/supybot.nix b/modules/services/networking/supybot.nix
index f65665e41e4..944e5828fe0 100644
--- a/modules/services/networking/supybot.nix
+++ b/modules/services/networking/supybot.nix
@@ -5,7 +5,6 @@ with pkgs.lib;
 let
 
   cfg  = config.services.supybot;
-  configFile = pkgs.writeText "supybot.cfg" cfg.config;
 
 in
 
@@ -19,19 +18,19 @@ in
 
       enable = mkOption {
         default = false;
-        description = "Enable the supybot IRC bot";
+        description = "Enable Supybot, an IRC bot";
       };
 
-      homeDir = mkOption {
-        default = "/home/supybot";
+      stateDir = mkOption {
+        default = "/var/lib/supybot";
         description = "
-          Directory holding all state for nginx to run.
+
         ";
       };
 
-      config = mkOption {
-        type = types.lines;
-        default = "";
+      configFile = mkOption {
+        type = types.path;
+        default = /dev/null;
         description = ''
           Verbatim contents of the supybot config, this can be
           generated by supybot-wizard
@@ -56,7 +55,7 @@ in
   ###### implementation
 
   config = mkIf cfg.enable {
-  
+
     environment.systemPackages = [ pkgs.pythonPackages.limnoria ];
 
     users.extraUsers = singleton
@@ -64,9 +63,9 @@ in
         uid = config.ids.uids.supybot;
         group = "supybot";
         description = "Supybot IRC bot user";
-        home = cfg.homeDir;
+        home = cfg.stateDir;
         createHome = true;
-      }; 
+      };
 
     users.extraGroups.supybot = {};
 
@@ -76,14 +75,18 @@ in
         wantedBy = [ "multi-user.target" ];
         path = [ pkgs.pythonPackages.limnoria ];
         preStart = ''
-          cd ${cfg.homeDir}
+          mkdir -m 0755 -p ${cfg.stateDir}
+          chown ${cfg.user}:${cfg.group} ${cfg.stateDir}
+          cd ${cfg.stateDir}
           mkdir -p logs/plugins backup conf data plugins tmp
+          ln -sf ${cfg.configFile} supybot.cfg
+          rm -f supybot.cfg.bak
         '';
         serviceConfig =
           { ExecStart =
-              "${pkgs.pythonPackages.limnoria}/bin/supybot ${cfg.homeDir}/supybot.cfg";
+              "${pkgs.pythonPackages.limnoria}/bin/supybot ${cfg.stateDir}/supybot.cfg";
             PIDFile = "/run/supybot.pid";
-            User = "${cfg.user}"; 
+            User = "${cfg.user}";
             Group = "${cfg.group}";
             UMask = "0007";
             Restart = "on-abort";
-- 
GitLab


From 5b25c5a18145e47fe27602b4cb721228edd6a1aa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cillian=20de=20R=C3=B3iste?= <goibhniu@fsfe.org>
Date: Sun, 4 Aug 2013 03:56:01 +0200
Subject: [PATCH 4792/5331] supybot.service: tidy up

---
 modules/misc/ids.nix                    |   1 +
 modules/services/networking/supybot.nix | 100 +++++++++++-------------
 2 files changed, 45 insertions(+), 56 deletions(-)

diff --git a/modules/misc/ids.nix b/modules/misc/ids.nix
index 54c9b331ade..f22a06e0c83 100644
--- a/modules/misc/ids.nix
+++ b/modules/misc/ids.nix
@@ -136,6 +136,7 @@ in
     scanner = 59;
     nginx = 60;
     systemd-journal = 62;
+    supybot = 63;
 
     # When adding a gid, make sure it doesn't match an existing uid.
 
diff --git a/modules/services/networking/supybot.nix b/modules/services/networking/supybot.nix
index 944e5828fe0..fa8b7556de5 100644
--- a/modules/services/networking/supybot.nix
+++ b/modules/services/networking/supybot.nix
@@ -10,8 +10,6 @@ in
 
 {
 
-  ###### interface
-
   options = {
 
     services.supybot = {
@@ -22,29 +20,20 @@ in
       };
 
       stateDir = mkOption {
-        default = "/var/lib/supybot";
-        description = "
-
-        ";
+        # Setting this to /var/lib/supybot caused useradd to fail
+        default = "/home/supybot";
+        description = "The root directory, logs and plugins are stored here";
       };
 
       configFile = mkOption {
         type = types.path;
-        default = /dev/null;
         description = ''
-          Verbatim contents of the supybot config, this can be
-          generated by supybot-wizard
-        '';
-      };
+          Path to a supybot config file. This can be generated by
+          running supybot-wizard.
 
-      user = mkOption {
-        default = "supybot";
-        description = "User account under which supybot runs.";
-      };
-
-      group = mkOption {
-        default = "supybot";
-        description = "Group account under which supybot runs.";
+          Note: all paths should include the full path to the stateDir
+          directory (backup conf data logs logs/plugins plugins tmp web).
+        '';
       };
 
     };
@@ -52,49 +41,48 @@ in
   };
 
 
-  ###### implementation
-
   config = mkIf cfg.enable {
 
     environment.systemPackages = [ pkgs.pythonPackages.limnoria ];
 
-    users.extraUsers = singleton
-      { name = cfg.user;
-        uid = config.ids.uids.supybot;
-        group = "supybot";
-        description = "Supybot IRC bot user";
-        home = cfg.stateDir;
-        createHome = true;
-      };
+    users.extraUsers = singleton {
+      name = "supybot";
+      uid = config.ids.uids.supybot;
+      group = "supybot";
+      description = "Supybot IRC bot user";
+      home = cfg.stateDir;
+      createHome = true;
+    };
 
-    users.extraGroups.supybot = {};
-
-    systemd.services.supybot =
-      { description = "Supybot IRC bot";
-        after = [ "network.target" ];
-        wantedBy = [ "multi-user.target" ];
-        path = [ pkgs.pythonPackages.limnoria ];
-        preStart = ''
-          mkdir -m 0755 -p ${cfg.stateDir}
-          chown ${cfg.user}:${cfg.group} ${cfg.stateDir}
-          cd ${cfg.stateDir}
-          mkdir -p logs/plugins backup conf data plugins tmp
-          ln -sf ${cfg.configFile} supybot.cfg
-          rm -f supybot.cfg.bak
-        '';
-        serviceConfig =
-          { ExecStart =
-              "${pkgs.pythonPackages.limnoria}/bin/supybot ${cfg.stateDir}/supybot.cfg";
-            PIDFile = "/run/supybot.pid";
-            User = "${cfg.user}";
-            Group = "${cfg.group}";
-            UMask = "0007";
-            Restart = "on-abort";
-            StartLimitInterval = "5m";
-            StartLimitBurst = "1";
-          };
+    users.extraGroups.supybot = {
+      name = "supybot";
+      gid = config.ids.gids.supybot;
+    };
+
+    systemd.services.supybot = {
+      description = "Supybot, an IRC bot";
+      after = [ "network.target" ];
+      wantedBy = [ "multi-user.target" ];
+      path = [ pkgs.pythonPackages.limnoria ];
+      preStart = ''
+        cd ${cfg.stateDir}
+        mkdir -p backup conf data plugins logs/plugins tmp web
+        ln -sf ${cfg.configFile} supybot.cfg
+        # This needs to be created afresh every time
+        rm -f supybot.cfg.bak
+      '';
+
+      serviceConfig = {
+        ExecStart = "${pkgs.pythonPackages.limnoria}/bin/supybot ${cfg.stateDir}/supybot.cfg";
+        PIDFile = "/run/supybot.pid";
+        User = "supybot";
+        Group = "supybot";
+        UMask = "0007";
+        Restart = "on-abort";
+        StartLimitInterval = "5m";
+        StartLimitBurst = "1";
       };
+    };
 
   };
-
 }
-- 
GitLab


From d0cb70cefb897bd3b89f79fee81dde5d78bb1037 Mon Sep 17 00:00:00 2001
From: Jaka Hudoklin <jakahudoklin@gmail.com>
Date: Mon, 5 Aug 2013 00:03:42 +0200
Subject: [PATCH 4793/5331] Add iodined, ip over dns daemon

---
 modules/misc/ids.nix                    |  6 +-
 modules/module-list.nix                 |  1 +
 modules/services/networking/iodined.nix | 87 +++++++++++++++++++++++++
 3 files changed, 92 insertions(+), 2 deletions(-)
 create mode 100644 modules/services/networking/iodined.nix

diff --git a/modules/misc/ids.nix b/modules/misc/ids.nix
index 23f103a6188..18139b57fdb 100644
--- a/modules/misc/ids.nix
+++ b/modules/misc/ids.nix
@@ -77,8 +77,9 @@ in
     nginx = 60;
     chrony = 61;
     smtpd = 63;
-    smtpq = 64;    
+    smtpq = 64;
     supybot = 65;
+    iodined = 66;
 
     # When adding a uid, make sure it doesn't match an existing gid.
 
@@ -139,8 +140,9 @@ in
     nginx = 60;
     systemd-journal = 62;
     smtpd = 63;
-    smtpq = 64;    
+    smtpq = 64;
     supybot = 65;
+    iodined = 66;
 
     # When adding a gid, make sure it doesn't match an existing uid.
 
diff --git a/modules/module-list.nix b/modules/module-list.nix
index 91b9502d33d..45eee80f694 100644
--- a/modules/module-list.nix
+++ b/modules/module-list.nix
@@ -154,6 +154,7 @@
   ./services/networking/gvpe.nix
   ./services/networking/hostapd.nix
   ./services/networking/ifplugd.nix
+  ./services/networking/iodined.nix
   ./services/networking/ircd-hybrid/default.nix
   ./services/networking/minidlna.nix
   ./services/networking/nat.nix
diff --git a/modules/services/networking/iodined.nix b/modules/services/networking/iodined.nix
new file mode 100644
index 00000000000..1b3473ee0ee
--- /dev/null
+++ b/modules/services/networking/iodined.nix
@@ -0,0 +1,87 @@
+# NixOS module for iodine, ip over dns daemon
+
+{ config, pkgs, ... }:
+
+with pkgs.lib;
+
+let
+  cfg = config.services.iodined;
+
+  iodinedUser = "iodined";
+
+in
+
+{
+
+  ### configuration
+
+  options = {
+
+    services.iodined = {
+
+      enable = mkOption {
+        type = types.uniq types.bool;
+        default = false;
+        description = "Enable iodine, ip over dns daemon";
+      };
+
+      client = mkOption {
+        type = types.uniq types.bool;
+        default = false;
+        description = "Start iodine in client mode";
+      };
+
+      ip = mkOption {
+        type = types.uniq types.string;
+        default = "";
+        description = "Assigned ip address or ip range";
+        example = "172.16.10.1/24";
+      };
+
+      domain = mkOption {
+        type = types.uniq types.string;
+        default = "";
+        description = "Domain or subdomain of which nameservers point to us";
+        example = "tunnel.mydomain.com";
+      };
+
+      extraConfig = mkOption {
+        type = types.uniq types.string;
+        default = "";
+        description = "Additional command line parameters";
+        example = "-P mysecurepassword -l 192.168.1.10 -p 23";
+      };
+
+    };
+
+  };
+
+  ### implementation
+
+  config = mkIf cfg.enable {
+    environment.systemPackages = [ pkgs.iodine ];
+    boot.kernelModules = [ "tun" ];
+
+    systemd.services.iodined = {
+      description = "iodine, ip over dns daemon";
+      after = [ "network.target" ];
+      wantedBy = [ "multi-user.target" ];
+      serviceConfig.ExecStart = "${pkgs.iodine}/sbin/iodined -f -u ${iodinedUser} ${cfg.extraConfig} ${cfg.ip} ${cfg.domain}";
+    };
+
+
+    users.extraUsers = singleton {
+      name = iodinedUser;
+      uid = config.ids.uids.iodined;
+      description = "Iodine daemon user";
+    };
+    users.extraGroups.iodined.gid = config.ids.gids.iodined;
+
+    assertions = [{ assertion = if !cfg.client then cfg.ip != "" else true;
+                    message = "cannot start iodined without ip set";}
+                  { assertion = cfg.domain != "";
+                    message = "cannot start iodined without domain name set";}];
+
+  };
+
+}
-- 
GitLab


From 871126a9a97b5450126c0a27791cc322bc0600fc Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 1 Aug 2013 14:56:19 +0200
Subject: [PATCH 4794/5331] Style fix

---
 tests/partition.nix | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/tests/partition.nix b/tests/partition.nix
index 58a9687b87c..7126e7255ef 100644
--- a/tests/partition.nix
+++ b/tests/partition.nix
@@ -137,7 +137,7 @@ in {
       $machine->succeed("mountpoint $_[0]");
     }
 
-    sub remount_and_check {
+    sub remountAndCheck {
       $machine->nest("Remounting partitions:", sub {
         # XXX: "findmnt -ARunl -oTARGET /mnt" seems to NOT print all mounts!
         my $getmounts_cmd = "cat /proc/mounts | cut -d' ' -f2 | grep '^/mnt'";
@@ -176,7 +176,7 @@ in {
       ensurePartition("/dev/vdb4", "boot sector");
       ensureNoPartition("vdb6");
       ensureNoPartition("vdc1");
-      remount_and_check;
+      remountAndCheck;
       ensureMountPoint("/mnt/boot");
       ensureMountPoint("/mnt/nix");
     };
@@ -190,7 +190,7 @@ in {
       ensurePartition("/dev/vdc2", "btrfs");
       ensureNoPartition("vdb3");
       ensureNoPartition("vdc3");
-      remount_and_check;
+      remountAndCheck;
     };
 
     parttest "RAID1 with XFS", sub {
@@ -202,7 +202,7 @@ in {
       ensureNoPartition("vdb4");
       ensureNoPartition("vdc4");
       ensureNoPartition("md2");
-      remount_and_check;
+      remountAndCheck;
       ensureMountPoint("/mnt/boot");
     };
 
@@ -219,7 +219,8 @@ in {
       ensurePartition("/dev/nixos/boot", "ext3");
       ensurePartition("/dev/nixos/swap", "swap");
       ensurePartition("/dev/nixos/root", "ext4");
-      remount_and_check;
+
+      remountAndCheck;
       ensureMountPoint("/mnt/boot");
     };
   '';
-- 
GitLab


From c7ed6322f6e5997296a04e1a517847801768ff5d Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 5 Aug 2013 14:52:37 +0200
Subject: [PATCH 4795/5331] Increase memory for the VirtualBox image generator

---
 modules/virtualisation/virtualbox-image.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/virtualisation/virtualbox-image.nix b/modules/virtualisation/virtualbox-image.nix
index 2243d308c1b..18f375644f2 100644
--- a/modules/virtualisation/virtualbox-image.nix
+++ b/modules/virtualisation/virtualbox-image.nix
@@ -6,7 +6,7 @@ with pkgs.lib;
   system.build.virtualBoxImage =
     pkgs.vmTools.runInLinuxVM (
       pkgs.runCommand "virtualbox-image"
-        { memSize = 1024;
+        { memSize = 2048;
           preVM =
             ''
               mkdir $out
-- 
GitLab


From aa150f5aea03f1362ddb6158156fc39a902c9278 Mon Sep 17 00:00:00 2001
From: Evgeny Egorochkin <phreedom@yandex.ru>
Date: Tue, 6 Aug 2013 16:13:20 +0300
Subject: [PATCH 4796/5331] KDE: fix config build when grub is used to generate
 boot menu, but isn't used as a loader.

---
 modules/services/x11/display-managers/kdm.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/services/x11/display-managers/kdm.nix b/modules/services/x11/display-managers/kdm.nix
index b5b086d0638..229ab12c6e1 100644
--- a/modules/services/x11/display-managers/kdm.nix
+++ b/modules/services/x11/display-managers/kdm.nix
@@ -132,7 +132,7 @@ in
           ''
             mkdir -m 0755 -p /var/lib/kdm
             chown kdm /var/lib/kdm
-            ${(optionalString (config.system.boot.loader.id == "grub") "PATH=${config.system.build.grub}/sbin:$PATH ") +
+            ${(optionalString (config.system.boot.loader.id == "grub" && config.system.build.grub != null) "PATH=${config.system.build.grub}/sbin:$PATH ") +
               "KDEDIRS=/run/current-system/sw exec ${kdebase_workspace}/bin/kdm -config ${kdmrc} -nodaemon"}
           '';
         logsXsession = true;
-- 
GitLab


From d28c85886f1529012b326444b0ede3476871fb0a Mon Sep 17 00:00:00 2001
From: Evgeny Egorochkin <phreedom@yandex.ru>
Date: Tue, 6 Aug 2013 18:03:50 +0300
Subject: [PATCH 4797/5331] Add NixOS Manual build instructions to itself.

---
 doc/manual/development.xml | 21 ++++++++++++++++++++-
 1 file changed, 20 insertions(+), 1 deletion(-)

diff --git a/doc/manual/development.xml b/doc/manual/development.xml
index 0b02c7f60c6..282bb1a71f4 100644
--- a/doc/manual/development.xml
+++ b/doc/manual/development.xml
@@ -355,13 +355,31 @@ $ mount -o loop -t iso9660 ./result/iso/cd.iso /mnt/iso</screen>
 </section>
 
 
+<!--===============================================================-->
+
+<section>
+
+<title>Testing/building the NixOS Manual</title>
+
+<para>A quick way to see if your documentation improvements
+or option descriptions look good:
+
+<screen>
+$ nix-build -A config.system.build.manual</screen>
+
+</para>
+
+</section>
+
+
 <!--===============================================================-->
 
 <section>
 
 <title>Testing the installer</title>
 
-<para>Building, burning, and booting from an installation CD is rather
+<para>Building, burning, and 
+booting from an installation CD is rather
 tedious, so here is a quick way to see if the installer works
 properly:
 
@@ -378,6 +396,7 @@ $ ./result/bin/nixos-install</screen>
 </section>
 
 
+
 <!--===============================================================-->
 
 <section>
-- 
GitLab


From 0bcabfa886e6aa88f4ba891c35bc30a04e64343f Mon Sep 17 00:00:00 2001
From: Evgeny Egorochkin <phreedom@yandex.ru>
Date: Tue, 6 Aug 2013 18:56:10 +0300
Subject: [PATCH 4798/5331] nixos-checkout: fix output if ran with no options,
 -h and --help. Other options will still trigger mkdir output :(

---
 modules/installer/tools/nixos-checkout.nix | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/modules/installer/tools/nixos-checkout.nix b/modules/installer/tools/nixos-checkout.nix
index 7cf395145d2..4859a454448 100644
--- a/modules/installer/tools/nixos-checkout.nix
+++ b/modules/installer/tools/nixos-checkout.nix
@@ -15,7 +15,12 @@ let
     src = pkgs.writeScript "nixos-checkout"
       ''
         #! ${pkgs.stdenv.shell} -e
-        
+
+        if [ -z "$1" ] || [ "$1" == "-h" ] || [ "$1" == "--help" ]; then
+          echo "Usage: `basename $0` PREFIX. See NixOS Manual for more info."
+          exit 0
+        fi        
+
         prefix="$1"
         if [ -z "$prefix" ]; then prefix=/etc/nixos; fi
         mkdir -p "$prefix"
-- 
GitLab


From 35ac2ad9cab9ad0b3a31876f5298e8924b9ce6d5 Mon Sep 17 00:00:00 2001
From: Evgeny Egorochkin <phreedom@yandex.ru>
Date: Tue, 6 Aug 2013 19:04:21 +0300
Subject: [PATCH 4799/5331] nixos-checkout: let it run without args again.

---
 modules/installer/tools/nixos-checkout.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/installer/tools/nixos-checkout.nix b/modules/installer/tools/nixos-checkout.nix
index 4859a454448..1a734ca5eeb 100644
--- a/modules/installer/tools/nixos-checkout.nix
+++ b/modules/installer/tools/nixos-checkout.nix
@@ -16,8 +16,8 @@ let
       ''
         #! ${pkgs.stdenv.shell} -e
 
-        if [ -z "$1" ] || [ "$1" == "-h" ] || [ "$1" == "--help" ]; then
-          echo "Usage: `basename $0` PREFIX. See NixOS Manual for more info."
+        if [ "$1" == "-h" ] || [ "$1" == "--help" ]; then
+          echo "Usage: `basename $0` [PREFIX]. See NixOS Manual for more info."
           exit 0
         fi        
 
-- 
GitLab


From 49f2d06a2014c7dc0f6948b979272b0007b0c610 Mon Sep 17 00:00:00 2001
From: Evgeny Egorochkin <phreedom@yandex.ru>
Date: Tue, 6 Aug 2013 19:22:20 +0300
Subject: [PATCH 4800/5331] Manual: improve source checkout section

---
 doc/manual/development.xml | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/doc/manual/development.xml b/doc/manual/development.xml
index 282bb1a71f4..95c1848e387 100644
--- a/doc/manual/development.xml
+++ b/doc/manual/development.xml
@@ -18,12 +18,22 @@ uses the NixOS and Nixpkgs sources provided by the
 <literal>nixos-unstable</literal> channel (kept in
 <filename>/nix/var/nix/profiles/per-user/root/channels/nixos</filename>).
 To modify NixOS, however, you should check out the latest sources from
-Subversion.  This is done using the following command:
+Git.  This is done using the following command:
 
 <screen>
 $ nixos-checkout <replaceable>/my/sources</replaceable>
 </screen>
 
+or
+
+<screen>
+$ mkdir -p <replaceable>/my/sources</replaceable>
+$ cd <replaceable>/my/sources</replaceable>
+$ nix-env -i git
+$ git clone git://github.com/NixOS/nixos.git
+$ git clone git://github.com/NixOS/nixpkgs.git
+</screen>
+
 This will check out the latest NixOS sources to
 <filename><replaceable>/my/sources</replaceable>/nixos</filename> and
 the Nixpkgs sources to
-- 
GitLab


From 5827261bef9d7ee8c79159c4f65b222238c32df5 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 6 Aug 2013 18:32:04 +0200
Subject: [PATCH 4801/5331] compiz: Disable

It doesn't currently work.
---
 modules/module-list.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/module-list.nix b/modules/module-list.nix
index 45eee80f694..2d14a143e22 100644
--- a/modules/module-list.nix
+++ b/modules/module-list.nix
@@ -218,7 +218,7 @@
   ./services/x11/hardware/synaptics.nix
   ./services/x11/hardware/wacom.nix
   ./services/x11/window-managers/awesome.nix
-  ./services/x11/window-managers/compiz.nix
+  #./services/x11/window-managers/compiz.nix
   ./services/x11/window-managers/default.nix
   ./services/x11/window-managers/icewm.nix
   ./services/x11/window-managers/kwm.nix
-- 
GitLab


From 168d48a5c93215aab4b5bb23768061e66bd17f02 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 6 Aug 2013 18:32:31 +0200
Subject: [PATCH 4802/5331] nix-daemon: Run under the default nice level

Running at a low priority is generally bad since it runs the risk of
priority inversions, etc.  It's really the builders that should run
under a different priority (e.g. in their own cgroup).
---
 modules/services/misc/nix-daemon.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/services/misc/nix-daemon.nix b/modules/services/misc/nix-daemon.nix
index 3296eff041b..7a7462ecb39 100644
--- a/modules/services/misc/nix-daemon.nix
+++ b/modules/services/misc/nix-daemon.nix
@@ -127,7 +127,7 @@ in
       };
 
       daemonNiceLevel = mkOption {
-        default = 10;
+        default = 0;
         description = "
           Nix daemon process priority. This priority propagates to build processes.
           0 is the default Unix process priority, 20 is the lowest.
@@ -135,7 +135,7 @@ in
       };
 
       daemonIONiceLevel = mkOption {
-        default = 7;
+        default = 0;
         description = "
           Nix daemon process I/O priority. This priority propagates to build processes.
           0 is the default Unix process I/O priority, 7 is the lowest.
-- 
GitLab


From 4a83c97d3d3f376fa2a5ff886504aff4beb365d2 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 7 Aug 2013 18:30:30 +0200
Subject: [PATCH 4803/5331] Stage 1: Use modprobe from kmod instead of
 module-init-tools

The latter is obsolete.

http://hydra.nixos.org/build/5663799
---
 modules/system/boot/stage-1.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/modules/system/boot/stage-1.nix b/modules/system/boot/stage-1.nix
index 0779ab2c979..9efae22fbdf 100644
--- a/modules/system/boot/stage-1.nix
+++ b/modules/system/boot/stage-1.nix
@@ -200,7 +200,8 @@ let
       cp -v ${pkgs.attr}/lib/libattr.so.* $out/lib
 
       # Copy modprobe.
-      cp -v ${pkgs.module_init_tools}/sbin/modprobe $out/bin/modprobe
+      cp -v ${pkgs.kmod}/bin/kmod $out/bin/
+      ln -s kmod $out/bin/modprobe
 
       # Maybe copy splashutils.
       ${optionalString enableSplashScreen ''
-- 
GitLab


From 3b3dc83902a0d1c7735f112a8bd97bd5adaf8efb Mon Sep 17 00:00:00 2001
From: Evgeny Egorochkin <phreedom@yandex.ru>
Date: Thu, 8 Aug 2013 04:44:14 +0300
Subject: [PATCH 4804/5331] Speed up application start

---
 modules/services/x11/desktop-managers/kde4.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/modules/services/x11/desktop-managers/kde4.nix b/modules/services/x11/desktop-managers/kde4.nix
index dcc3859820c..f0c5322386c 100644
--- a/modules/services/x11/desktop-managers/kde4.nix
+++ b/modules/services/x11/desktop-managers/kde4.nix
@@ -97,6 +97,11 @@ in
             # See http://lists-archives.org/kde-devel/26175-what-when-will-icon-cache-refresh.html
             rm -fv $HOME/.kde/cache-*/icon-cache.kcache
 
+            # Speed up application start by 50-150ms according to
+            # http://kdemonkey.blogspot.nl/2008/04/magic-trick.html
+            rm -fv $HOME/.compose-cache
+            mkdir $HOME/.compose-cache
+
             # Qt writes a weird ‘libraryPath’ line to
             # ~/.config/Trolltech.conf that causes the KDE plugin
             # paths of previous KDE invocations to be searched.
-- 
GitLab


From d6303b6068fdec3ecce1c915b529cd31e150cdd9 Mon Sep 17 00:00:00 2001
From: Ivan Kozik <ivan@ludios.org>
Date: Fri, 9 Aug 2013 00:51:45 +0000
Subject: [PATCH 4805/5331] Describe where /etc/nix/nix.conf settings come from

---
 modules/services/misc/nix-daemon.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/modules/services/misc/nix-daemon.nix b/modules/services/misc/nix-daemon.nix
index 7a7462ecb39..4f7518ffb1c 100644
--- a/modules/services/misc/nix-daemon.nix
+++ b/modules/services/misc/nix-daemon.nix
@@ -34,7 +34,8 @@ let
       pkgs.runCommand "nix.conf" {extraOptions = cfg.extraOptions; } ''
         extraPaths=$(for i in $(cat ${binshDeps}); do if test -d $i; then echo $i; fi; done)
         cat > $out <<END
-        # WARNING: this file is generated.
+        # WARNING: this file is generated from the nix.* entries in
+        # ${maybeEnv "NIXOS_CONFIG" "/etc/nixos/configuration.nix"}
         build-users-group = nixbld
         build-max-jobs = ${toString (cfg.maxJobs)}
         build-use-chroot = ${if cfg.useChroot then "true" else "false"}
-- 
GitLab


From 2fc123f148f07dc7c542331c76d5a2d39fbd2428 Mon Sep 17 00:00:00 2001
From: Ivan Kozik <ivan@ludios.org>
Date: Fri, 9 Aug 2013 01:23:22 +0000
Subject: [PATCH 4806/5331] Document that extraUsers options apply to root

---
 modules/config/users-groups.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/modules/config/users-groups.nix b/modules/config/users-groups.nix
index 92839106762..5f32dc350df 100644
--- a/modules/config/users-groups.nix
+++ b/modules/config/users-groups.nix
@@ -160,6 +160,7 @@ in
       };
       description = ''
         Additional user accounts to be created automatically by the system.
+        This can also be used to set options for root.
       '';
       options = [ userOpts ];
     };
-- 
GitLab


From 5a676e463e0dea1a4aef53d3f7e6a93cb7bdd7f5 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 9 Aug 2013 18:45:45 +0200
Subject: [PATCH 4807/5331] Don't load nouveau and nvidiafb when using the
 proprietary nvidia driver

---
 modules/services/x11/xserver.nix | 37 +++++++++++++++++---------------
 1 file changed, 20 insertions(+), 17 deletions(-)

diff --git a/modules/services/x11/xserver.nix b/modules/services/x11/xserver.nix
index 8378e10cc46..40da6a74389 100644
--- a/modules/services/x11/xserver.nix
+++ b/modules/services/x11/xserver.nix
@@ -406,24 +406,27 @@ in
       optional (elem "virtualbox" driverNames) kernelPackages.virtualboxGuestAdditions ++
       optional (elem "ati_unfree" driverNames) kernelPackages.ati_drivers_x11;
 
+    boot.blacklistedKernelModules =
+      optionals (elem "nvidia" driverNames) [ "nouveau" "nvidiafb" ];
+
     environment.etc =
-    (optionals cfg.exportConfiguration
-      [ { source = "${configFile}";
-          target = "X11/xorg.conf";
-        }
-        # -xkbdir command line option does not seems to be passed to xkbcomp.
-        { source = "${pkgs.xkeyboard_config}/etc/X11/xkb";
-          target = "X11/xkb";
-        }
-      ])
-    ++ (optionals (elem "ati_unfree" driverNames) [
-
-        # according toiive on #ati you don't need the pcs, it is like registry... keeps old stuff to make your
-        # life harder ;) Still it seems to be required
-        { source = "${kernelPackages.ati_drivers_x11}/etc/ati";
-          target = "ati";
-        }
-    ]);
+      (optionals cfg.exportConfiguration
+        [ { source = "${configFile}";
+            target = "X11/xorg.conf";
+          }
+          # -xkbdir command line option does not seems to be passed to xkbcomp.
+          { source = "${pkgs.xkeyboard_config}/etc/X11/xkb";
+            target = "X11/xkb";
+          }
+        ])
+      ++ (optionals (elem "ati_unfree" driverNames) [
+
+          # according toiive on #ati you don't need the pcs, it is like registry... keeps old stuff to make your
+          # life harder ;) Still it seems to be required
+          { source = "${kernelPackages.ati_drivers_x11}/etc/ati";
+            target = "ati";
+          }
+      ]);
 
     environment.x11Packages =
       [ xorg.xorgserver
-- 
GitLab


From 390fdb3e604108658259175980187606eae796c1 Mon Sep 17 00:00:00 2001
From: Ivan Kozik <ivan@ludios.org>
Date: Sat, 10 Aug 2013 21:07:13 +0000
Subject: [PATCH 4808/5331] Fix typos, especially those that end up in the
 NixOS manual

---
 doc/manual/configuration.xml                              | 2 +-
 doc/manual/development.xml                                | 6 +++---
 doc/manual/running.xml                                    | 4 ++--
 modules/config/gnu.nix                                    | 2 +-
 modules/config/pulseaudio.nix                             | 2 +-
 modules/hardware/cpu/amd-microcode.nix                    | 2 +-
 modules/misc/ids.nix                                      | 2 +-
 modules/misc/nixpkgs.nix                                  | 2 +-
 modules/programs/bash/bashrc.sh                           | 2 +-
 modules/programs/blcr.nix                                 | 2 +-
 modules/security/polkit.nix                               | 4 ++--
 modules/security/setuid-wrappers.nix                      | 2 +-
 modules/services/amqp/activemq/default.nix                | 4 ++--
 modules/services/hardware/acpid.nix                       | 2 +-
 modules/services/hardware/nvidia-optimus.nix              | 2 +-
 modules/services/misc/nix-daemon.nix                      | 8 ++++----
 modules/services/misc/synergy.nix                         | 2 +-
 modules/services/monitoring/ups.nix                       | 2 +-
 modules/services/networking/dhcpcd.nix                    | 4 ++--
 modules/services/networking/firewall.nix                  | 4 ++--
 modules/services/networking/networkmanager.nix            | 2 +-
 modules/services/web-servers/apache-httpd/default.nix     | 2 +-
 modules/services/x11/desktop-managers/kde4.nix            | 2 +-
 .../boot/loader/generations-dir/generations-dir.nix       | 2 +-
 modules/system/boot/loader/init-script/init-script.nix    | 4 ++--
 modules/system/boot/systemd-unit-options.nix              | 2 +-
 modules/tasks/filesystems/zfs.nix                         | 2 +-
 modules/tasks/network-interfaces.nix                      | 2 +-
 modules/tasks/scsi-link-power-management.nix              | 2 +-
 modules/tasks/tty-backgrounds.nix                         | 4 ++--
 30 files changed, 42 insertions(+), 42 deletions(-)

diff --git a/doc/manual/configuration.xml b/doc/manual/configuration.xml
index 84a92872d0b..41f010d10b3 100644
--- a/doc/manual/configuration.xml
+++ b/doc/manual/configuration.xml
@@ -144,7 +144,7 @@ networking.wireless.enable = true;
 
 NixOS currently does not generate wpa_supplicant's
 configuration file, <literal>/etc/wpa_supplicant.conf</literal>. You should edit this file
-ourself to define wireless networks, WPA keys and so on (see
+yourself to define wireless networks, WPA keys and so on (see
 wpa_supplicant.conf(5)).
 </para>
 
diff --git a/doc/manual/development.xml b/doc/manual/development.xml
index 95c1848e387..50ce2a2dcb7 100644
--- a/doc/manual/development.xml
+++ b/doc/manual/development.xml
@@ -65,7 +65,7 @@ $ nixos-rebuild switch -I <replaceable>/my/sources</replaceable>
   directory</para>
 
 <para>A module is a file which handles one specific part of the
-  configuration.  This part of the configuration could correspond to an
+  configuration.  This part of the configuration could correspond to
   hardware, a service, network settings, or preferences.  A module
   configuration does not have to handle everything from scratch, it can base
   its configuration on other configurations provided by other modules.  Thus
@@ -321,7 +321,7 @@ where <replaceable>attr</replaceable> is an attribute in
 </para>
 
 <para>
-Most parts of NixOS can be build through the <varname>config</varname>
+Most parts of NixOS can be built through the <varname>config</varname>
 attribute set.  This attribute set allows you to have a view of the merged
 option definitions and all its derivations.  Important derivations are store
 inside the option <option>system.build</option> and can be listed with the
@@ -341,7 +341,7 @@ config.system.build</command>
 <para>Building a NixOS CD is as easy as configuring your own computer. The
 idea is to use another module which will replace
 your <filename>configuration.nix</filename> to configure the system that
-would be install on the CD.</para>
+would be installed on the CD.</para>
 
 <para>Default CD/DVD configurations are available
 inside <filename>nixos/modules/installer/cd-dvd</filename>.  To build them
diff --git a/doc/manual/running.xml b/doc/manual/running.xml
index 57206bbce8f..ac3ce40339d 100644
--- a/doc/manual/running.xml
+++ b/doc/manual/running.xml
@@ -19,7 +19,7 @@ the systemd program.  Systemd is the “init” process of the system
 so-called “units”, which can be things like system services
 (programs), but also mount points, swap files, devices, targets
 (groups of units) and more.  Units can have complex dependencies; for
-instance, one unit can require that another unit must be succesfully
+instance, one unit can require that another unit must be successfully
 started before the first unit can be started.  When the system boots,
 it starts a unit named <literal>default.target</literal>; the
 dependencies of this unit cause all system services to be started,
@@ -122,7 +122,7 @@ authentication.</para>
 
 <para>Systemd keeps track of all users who are logged into the system
 (e.g. on a virtual console or remotely via SSH).  The command
-<command>loginctl</command> allows quering and manipulating user
+<command>loginctl</command> allows querying and manipulating user
 sessions.  For instance, to list all user sessions:
 
 <screen>
diff --git a/modules/config/gnu.nix b/modules/config/gnu.nix
index 5c84d90932a..1a69083a206 100644
--- a/modules/config/gnu.nix
+++ b/modules/config/gnu.nix
@@ -7,7 +7,7 @@ with pkgs.lib;
     gnu = mkOption {
       default = false;
       description =
-        '' When enable, GNU software is chosent by default whenever a there is
+        '' When enabled, GNU software is chosen by default whenever a there is
            a choice between GNU and non-GNU software (e.g., GNU lsh
            vs. OpenSSH).
         '';
diff --git a/modules/config/pulseaudio.nix b/modules/config/pulseaudio.nix
index 696f0dc1067..26060f5b2d1 100644
--- a/modules/config/pulseaudio.nix
+++ b/modules/config/pulseaudio.nix
@@ -58,7 +58,7 @@ in {
         description = ''
           If false, a PulseAudio server is launched automatically for
           each user that tries to use the sound system. The server runs
-          with user priviliges. This is the recommended and most secure
+          with user privileges. This is the recommended and most secure
           way to use PulseAudio. If true, one system-wide PulseAudio
           server is launched on boot, running as the user "pulse".
           Please read the PulseAudio documentation for more details.
diff --git a/modules/hardware/cpu/amd-microcode.nix b/modules/hardware/cpu/amd-microcode.nix
index 2b224e04f2d..350bcb74885 100644
--- a/modules/hardware/cpu/amd-microcode.nix
+++ b/modules/hardware/cpu/amd-microcode.nix
@@ -12,7 +12,7 @@ with pkgs.lib;
       default = false;
       type = types.bool;
       description = ''
-        Update the CPU microcode for Amd processors.
+        Update the CPU microcode for AMD processors.
       '';
     };
 
diff --git a/modules/misc/ids.nix b/modules/misc/ids.nix
index 18139b57fdb..922bbb53171 100644
--- a/modules/misc/ids.nix
+++ b/modules/misc/ids.nix
@@ -1,5 +1,5 @@
 # This module defines the global list of uids and gids.  We keep a
-# central list to prevent id collissions.
+# central list to prevent id collisions.
 
 {config, pkgs, ...}:
 
diff --git a/modules/misc/nixpkgs.nix b/modules/misc/nixpkgs.nix
index 03979e259bf..0df0e57c98e 100644
--- a/modules/misc/nixpkgs.nix
+++ b/modules/misc/nixpkgs.nix
@@ -54,7 +54,7 @@ in
         globally through the <varname>packageOverrides</varname>
         option.  The latter is a function that takes as an argument
         the <emphasis>original</emphasis> Nixpkgs, and must evaluate
-        to a set of new or overriden packages.
+        to a set of new or overridden packages.
       '';
     };
 
diff --git a/modules/programs/bash/bashrc.sh b/modules/programs/bash/bashrc.sh
index b7c139416c0..98b0907a06b 100644
--- a/modules/programs/bash/bashrc.sh
+++ b/modules/programs/bash/bashrc.sh
@@ -7,7 +7,7 @@ if [ -n "$__ETC_BASHRC_SOURCED" -o -n "$NOSYSBASHRC" ]; then return; fi
 __ETC_BASHRC_SOURCED=1
 
 # If the profile was not loaded in a parent process, source it.  But
-# otherwise don't do it because we don't want to clobber overriden
+# otherwise don't do it because we don't want to clobber overridden
 # values of $PATH, etc.
 if [ -z "$__ETC_PROFILE_DONE" ]; then
     . /etc/profile
diff --git a/modules/programs/blcr.nix b/modules/programs/blcr.nix
index d1cc40585bb..e1e31b4a56a 100644
--- a/modules/programs/blcr.nix
+++ b/modules/programs/blcr.nix
@@ -13,7 +13,7 @@ in
     environment.blcr.enable = mkOption {
       default = false;
       description =
-        "Wheter to enable support for the BLCR checkpointing tool.";
+        "Whether to enable support for the BLCR checkpointing tool.";
     };
   };
 
diff --git a/modules/security/polkit.nix b/modules/security/polkit.nix
index fef52f1fed6..b9b32496a36 100644
--- a/modules/security/polkit.nix
+++ b/modules/security/polkit.nix
@@ -44,7 +44,7 @@ in
         '';
       description =
         ''
-          Allows the default permissions of privileged actions to be overriden.
+          Allows the default permissions of privileged actions to be overridden.
         '';
     };
 
@@ -55,7 +55,7 @@ in
         ''
           Specifies which users are considered “administrators”, for those
           actions that require the user to authenticate as an
-          administrator (i.e. have a <literal>auth_admin</literal>
+          administrator (i.e. have an <literal>auth_admin</literal>
           value).  By default, this is the <literal>root</literal>
           user and all users in the <literal>wheel</literal> group.
         '';
diff --git a/modules/security/setuid-wrappers.nix b/modules/security/setuid-wrappers.nix
index a81376517eb..e75679e5ff6 100644
--- a/modules/security/setuid-wrappers.nix
+++ b/modules/security/setuid-wrappers.nix
@@ -47,7 +47,7 @@ in
         ];
       description = ''
         This option allows the ownership and permissions on the setuid
-        wrappers for specific programs to be overriden from the
+        wrappers for specific programs to be overridden from the
         default (setuid root, but not setgid root).
       '';
     };
diff --git a/modules/services/amqp/activemq/default.nix b/modules/services/amqp/activemq/default.nix
index 0df79205d5a..44bf8be5878 100644
--- a/modules/services/amqp/activemq/default.nix
+++ b/modules/services/amqp/activemq/default.nix
@@ -55,7 +55,7 @@ in {
         default = "/var/activemq";
         description = ''
           The base directory where ActiveMQ stores its persistent data and logs.
-          This will be overriden if you set "activemq.base" and "activemq.data"
+          This will be overridden if you set "activemq.base" and "activemq.data"
           in the <literal>javaProperties</literal> option. You can also override
           this in activemq.xml.
         '';
@@ -94,7 +94,7 @@ in {
           type = types.bool;
           default = true;
           description = ''
-            If true, the a system user with the specified name will be added
+            If true, a system user with the specified name will be added
             to the system configuration. If false, a user with the specified
             name is expected to exist.
           '';
diff --git a/modules/services/hardware/acpid.nix b/modules/services/hardware/acpid.nix
index b61c8020bca..6a595f8306b 100644
--- a/modules/services/hardware/acpid.nix
+++ b/modules/services/hardware/acpid.nix
@@ -82,7 +82,7 @@ in
 
       acEventCommands = mkOption {
         default = "";
-        description = "Shell commands to execute on a ac_adapter.* event.";
+        description = "Shell commands to execute on an ac_adapter.* event.";
       };
 
     };
diff --git a/modules/services/hardware/nvidia-optimus.nix b/modules/services/hardware/nvidia-optimus.nix
index 0ba4b2327e1..fd58b3d5ad5 100644
--- a/modules/services/hardware/nvidia-optimus.nix
+++ b/modules/services/hardware/nvidia-optimus.nix
@@ -13,7 +13,7 @@ in
       default = false;
       type = pkgs.lib.types.bool;
       description = ''
-        completely disable the nvidia gfx chip (saves power / heat) and just use IGP
+        Completely disable the nvidia gfx chip (saves power / heat) and just use IGP
       '';
     };
 
diff --git a/modules/services/misc/nix-daemon.nix b/modules/services/misc/nix-daemon.nix
index 7a7462ecb39..d8573f30939 100644
--- a/modules/services/misc/nix-daemon.nix
+++ b/modules/services/misc/nix-daemon.nix
@@ -69,7 +69,7 @@ in
         description = "
           This option defines the maximum number of jobs that Nix will try
           to build in parallel.  The default is 1.  You should generally
-          set it to the number of CPUs in your system (e.g., 2 on a Athlon
+          set it to the number of CPUs in your system (e.g., 2 on an Athlon
           64 X2).
         ";
       };
@@ -114,14 +114,14 @@ in
           <command>nixos-rebuild --no-build-hook</command>
           or consider managing <filename>/etc/nix.machines</filename> manually
           by setting <option>manualNixMachines</option>. Then you can comment
-          unavailable buildmachines.
+          unavailable build machines.
         ";
       };
 
       manualNixMachines = mkOption {
         default = false;
         description = "
-          Whether to manually manage the list of buildmachines used in distributed
+          Whether to manually manage the list of build machines used in distributed
           builds in /etc/nix.machines.
         ";
       };
@@ -163,7 +163,7 @@ in
           This option lists the machines to be used if distributed
           builds are enabled (see
           <option>nix.distributedBuilds</option>).  Nix will perform
-          derivations on those machines via SSh by copying the inputs
+          derivations on those machines via SSH by copying the inputs
           to the Nix store on the remote machine, starting the build,
           then copying the output back to the local Nix store.  Each
           element of the list should be an attribute set containing
diff --git a/modules/services/misc/synergy.nix b/modules/services/misc/synergy.nix
index a894c68112e..91c0acb0bc2 100644
--- a/modules/services/misc/synergy.nix
+++ b/modules/services/misc/synergy.nix
@@ -29,7 +29,7 @@ in
           default = "";
           description = "
             use screen-name instead the hostname to identify
-            ourselfs to the server.
+            ourselves to the server.
             ";
         };
         serverAddress = mkOption {
diff --git a/modules/services/monitoring/ups.nix b/modules/services/monitoring/ups.nix
index eedd69ac191..a7b72e53f0a 100644
--- a/modules/services/monitoring/ups.nix
+++ b/modules/services/monitoring/ups.nix
@@ -25,7 +25,7 @@ let
       port = mkOption {
         type = types.uniq types.string;
         description = ''
-          The serial port where your UPS is connected.  /dev/ttyS0 is
+          The serial port to which your UPS is connected.  /dev/ttyS0 is
           usually the first port on Linux boxes, for example.
         '';
       };
diff --git a/modules/services/networking/dhcpcd.nix b/modules/services/networking/dhcpcd.nix
index 761ddc08bf1..48803511a5e 100644
--- a/modules/services/networking/dhcpcd.nix
+++ b/modules/services/networking/dhcpcd.nix
@@ -80,9 +80,9 @@ in
     networking.dhcpcd.denyInterfaces = mkOption {
       default = [];
       description = ''
-         Disable the DHCP client for any interface which's name matches
+         Disable the DHCP client for any interface whose name matches
          any of the shell glob patterns in this list. The purpose of
-         this option is blacklist virtual interfaces such as those
+         this option is to blacklist virtual interfaces such as those
          created by Xen, libvirt, LXC, etc.
       '';
     };
diff --git a/modules/services/networking/firewall.nix b/modules/services/networking/firewall.nix
index 40fbbabed3f..25a832da7a4 100644
--- a/modules/services/networking/firewall.nix
+++ b/modules/services/networking/firewall.nix
@@ -97,7 +97,7 @@ in
       description =
         ''
           If set, forbidden packets are rejected rather than dropped
-          (ignored).  This means that a ICMP "port unreachable" error
+          (ignored).  This means that an ICMP "port unreachable" error
           message is sent back to the client.  Rejecting packets makes
           port scanning somewhat easier.
         '';
@@ -170,7 +170,7 @@ in
           List of connection-tracking helpers that are auto-loaded.
           The complete list of possible values is given in the example.
 
-          As helpers can pose as a security risk, it is adviced to
+          As helpers can pose as a security risk, it is advised to
           set this to an empty list and disable the setting
           networking.firewall.autoLoadConntrackHelpers
 
diff --git a/modules/services/networking/networkmanager.nix b/modules/services/networking/networkmanager.nix
index bbc4d1f8cea..e78e276ff82 100644
--- a/modules/services/networking/networkmanager.nix
+++ b/modules/services/networking/networkmanager.nix
@@ -54,7 +54,7 @@ in {
       default = false;
       merge = mergeEnableOption;
       description = ''
-        Whether to use NetworkManager to obtain an IP adress and other
+        Whether to use NetworkManager to obtain an IP address and other
         configuration for all network interfaces that are not manually
         configured. If enabled, a group <literal>networkmanager</literal>
         will be created. Add all users that should have permission
diff --git a/modules/services/web-servers/apache-httpd/default.nix b/modules/services/web-servers/apache-httpd/default.nix
index c7b9ec27737..e2cfc5cdb26 100644
--- a/modules/services/web-servers/apache-httpd/default.nix
+++ b/modules/services/web-servers/apache-httpd/default.nix
@@ -639,7 +639,7 @@ in
 
             # Get rid of old semaphores.  These tend to accumulate across
             # server restarts, eventually preventing it from restarting
-            # succesfully.
+            # successfully.
             for i in $(${pkgs.utillinux}/bin/ipcs -s | grep ' ${mainCfg.user} ' | cut -f2 -d ' '); do
                 ${pkgs.utillinux}/bin/ipcrm -s $i
             done
diff --git a/modules/services/x11/desktop-managers/kde4.nix b/modules/services/x11/desktop-managers/kde4.nix
index f0c5322386c..6d804c13827 100644
--- a/modules/services/x11/desktop-managers/kde4.nix
+++ b/modules/services/x11/desktop-managers/kde4.nix
@@ -77,7 +77,7 @@ in
   config = mkIf (xcfg.enable && cfg.enable) {
 
     # If KDE 4 is enabled, make it the default desktop manager (unless
-    # overriden by the user's configuration).
+    # overridden by the user's configuration).
     # !!! doesn't work yet ("Multiple definitions. Only one is allowed
     # for this option.")
     # services.xserver.desktopManager.default = mkOverrideTemplate 900 "kde4";
diff --git a/modules/system/boot/loader/generations-dir/generations-dir.nix b/modules/system/boot/loader/generations-dir/generations-dir.nix
index 8184b9c0a98..b14f81552ee 100644
--- a/modules/system/boot/loader/generations-dir/generations-dir.nix
+++ b/modules/system/boot/loader/generations-dir/generations-dir.nix
@@ -31,7 +31,7 @@ let
             default = false;
             description = "
               Whether copy the necessary boot files into /boot, so
-              /nix/store is not needed by the boot loadear.
+              /nix/store is not needed by the boot loader.
             ";
           };
         };
diff --git a/modules/system/boot/loader/init-script/init-script.nix b/modules/system/boot/loader/init-script/init-script.nix
index ef5e97eb2c9..4b0fcd85b4b 100644
--- a/modules/system/boot/loader/init-script/init-script.nix
+++ b/modules/system/boot/loader/init-script/init-script.nix
@@ -28,10 +28,10 @@ in
           Or having it makes starting NixOS easier.
           This applies to some kind of hosting services and user mode linux.
 
-          Additionaly this script will create
+          Additionally this script will create
           /boot/init-other-configurations-contents.txt containing
           contents of remaining configurations. You can copy paste them into
-          /sbin/init manually running a recue system or such.
+          /sbin/init manually running a rescue system or such.
         '';
       };
     };
diff --git a/modules/system/boot/systemd-unit-options.nix b/modules/system/boot/systemd-unit-options.nix
index f863daf2250..fd4d19d1dd0 100644
--- a/modules/system/boot/systemd-unit-options.nix
+++ b/modules/system/boot/systemd-unit-options.nix
@@ -118,7 +118,7 @@ rec {
       default = {};
       type = types.attrs;
       example = { PATH = "/foo/bar/bin"; LANG = "nl_NL.UTF-8"; };
-      description = "Environment variables passed to the services's processes.";
+      description = "Environment variables passed to the service's processes.";
     };
 
     path = mkOption {
diff --git a/modules/tasks/filesystems/zfs.nix b/modules/tasks/filesystems/zfs.nix
index 077d6a4471a..590eb002022 100644
--- a/modules/tasks/filesystems/zfs.nix
+++ b/modules/tasks/filesystems/zfs.nix
@@ -29,7 +29,7 @@ in
         ZFS uses a system's hostid to determine if a storage pool (zpool) is
         native to this system, and should thus be imported automatically.
         Unfortunately, this hostid can change under linux from boot to boot (by
-        changing network adapaters, for instance). Specify a unique 32 bit hostid in
+        changing network adapters, for instance). Specify a unique 32 bit hostid in
         hex here for zfs to prevent getting a random hostid between boots and having to
         manually import pools.
       '';
diff --git a/modules/tasks/network-interfaces.nix b/modules/tasks/network-interfaces.nix
index 75f2e1af4be..0177d6396df 100644
--- a/modules/tasks/network-interfaces.nix
+++ b/modules/tasks/network-interfaces.nix
@@ -223,7 +223,7 @@ in
       default = true;
       merge = mergeEnableOption;
       description = ''
-        Whether to use DHCP to obtain an IP adress and other
+        Whether to use DHCP to obtain an IP address and other
         configuration for all network interfaces that are not manually
         configured.
       '';
diff --git a/modules/tasks/scsi-link-power-management.nix b/modules/tasks/scsi-link-power-management.nix
index 13ffbc7a51a..4ab67aee395 100644
--- a/modules/tasks/scsi-link-power-management.nix
+++ b/modules/tasks/scsi-link-power-management.nix
@@ -12,7 +12,7 @@ with pkgs.lib;
       example = "min_power";
       type = types.uniq types.string;
       description = ''
-        Configure the scsi link power management policy. By default,
+        Configure the SCSI link power management policy. By default,
         the kernel configures "max_performance".
       '';
     };
diff --git a/modules/tasks/tty-backgrounds.nix b/modules/tasks/tty-backgrounds.nix
index 26904c78ae9..aae2c279b1e 100644
--- a/modules/tasks/tty-backgrounds.nix
+++ b/modules/tasks/tty-backgrounds.nix
@@ -15,13 +15,13 @@ let
 
       specificThemes = config.services.ttyBackgrounds.specificThemes;
 
-      overridenTTYs = map (x: x.tty) specificThemes;
+      overriddenTTYs = map (x: x.tty) specificThemes;
 
       # Use the default theme for all the mingetty ttys and for the
       # syslog tty, except those for which a specific theme is
       # specified.
       defaultTTYs =
-        filter (x: !(elem x overridenTTYs)) requiredTTYs;
+        filter (x: !(elem x overriddenTTYs)) requiredTTYs;
 
     in
       (map (tty: { inherit tty; }) defaultTTYs) ++ specificThemes;
-- 
GitLab


From 425b0f0507ebc5ba063e31342f8c14a5be6e2271 Mon Sep 17 00:00:00 2001
From: Ivan Kozik <ivan@ludios.org>
Date: Sat, 10 Aug 2013 21:51:44 +0000
Subject: [PATCH 4809/5331] nixos-rebuild: support -vv, -vvv, -vvvv, and -vvvvv

---
 modules/installer/tools/nixos-rebuild.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/installer/tools/nixos-rebuild.sh b/modules/installer/tools/nixos-rebuild.sh
index 9bb13061ed9..8597cf165b1 100644
--- a/modules/installer/tools/nixos-rebuild.sh
+++ b/modules/installer/tools/nixos-rebuild.sh
@@ -76,7 +76,7 @@ while [ "$#" -gt 0 ]; do
         repair=1
         extraBuildFlags+=("$i")
         ;;
-      --show-trace|--no-build-hook|--keep-failed|-K|--keep-going|-k|--verbose|-v|--fallback|--repair)
+      --show-trace|--no-build-hook|--keep-failed|-K|--keep-going|-k|--verbose|-v|-vv|-vvv|-vvvv|-vvvvv|--fallback|--repair)
         extraBuildFlags+=("$i")
         ;;
       --max-jobs|-j|--cores|-I)
-- 
GitLab


From aca014710e7c9edf6c39b80f9ad4fb34851b7458 Mon Sep 17 00:00:00 2001
From: Ivan Kozik <ivan@ludios.org>
Date: Sun, 11 Aug 2013 07:40:59 +0000
Subject: [PATCH 4810/5331] Subversion repos stopped updating last year

---
 doc/manual/installation.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/doc/manual/installation.xml b/doc/manual/installation.xml
index b85aee972fd..40a2efa1405 100644
--- a/doc/manual/installation.xml
+++ b/doc/manual/installation.xml
@@ -152,7 +152,7 @@ $ nixos-option --install</screen>
 $ nixos-checkout</screen>
 
   to make the installer use the latest NixOS/Nixpkgs sources from the
-  Subversion repository, rather than the sources on CD.</para></listitem>
+  Git repository, rather than the sources on CD.</para></listitem>
   -->
 
   <listitem><para>Do the installation:
@@ -315,7 +315,7 @@ available.</para>
 use the <literal>nixos-unstable</literal> channel.  (A channel is a
 Nix mechanism for distributing Nix expressions and associated
 binaries.)  The NixOS channel is updated automatically from NixOS’s
-Subversion repository after running certain tests and building most
+Git repository after running certain tests and building most
 packages.</para>
 
 <para>NixOS automatically subscribes you to the NixOS channel.  If for
-- 
GitLab


From 78f090c82919d42643a7b3afe63d336461337ff9 Mon Sep 17 00:00:00 2001
From: Ivan Kozik <ivan@ludios.org>
Date: Sun, 11 Aug 2013 07:42:03 +0000
Subject: [PATCH 4811/5331] Explain how to use /my/sources with nix-env, not
 just nixos-rebuild

---
 doc/manual/development.xml | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/doc/manual/development.xml b/doc/manual/development.xml
index 95c1848e387..17d7103e0d4 100644
--- a/doc/manual/development.xml
+++ b/doc/manual/development.xml
@@ -48,6 +48,25 @@ $ nixos-rebuild switch -I <replaceable>/my/sources</replaceable>
 
 </para>
 
+<para><command>nixos-rebuild</command> affects only the system profile.
+To install packages to your user profile from expressions in
+<replaceable>/my/sources</replaceable>, use
+<command>nix-env -f <replaceable>/my/sources</replaceable>/nixpkgs</command>,
+or change the default by replacing the symlink in
+<filename>~/.nix-defexpr</filename>:
+
+<screen>
+$ rm -f ~/.nix-defexpr/channels
+$ ln -s <replaceable>/my/sources</replaceable>/nixpkgs ~/.nix-defexpr/nixpkgs
+</screen>
+
+</para>
+
+<para>You should not pass the base directory
+<filename><replaceable>/my/sources</replaceable></filename>
+to <command>nix-env</command>, as it will break after interpreting expressions
+in <filename>nixos/</filename> as packages.</para>
+
 </section>
 
 
-- 
GitLab


From b244a4718598aa28a5bf6807410354fb2bdb9f08 Mon Sep 17 00:00:00 2001
From: Jaka Hudoklin <jakahudoklin@gmail.com>
Date: Sun, 11 Aug 2013 12:16:19 +0200
Subject: [PATCH 4812/5331] Add graphite, scalable realtime graphing service

---
 modules/misc/ids.nix                     |   2 +
 modules/module-list.nix                  |   1 +
 modules/services/monitoring/graphite.nix | 235 +++++++++++++++++++++++
 3 files changed, 238 insertions(+)
 create mode 100644 modules/services/monitoring/graphite.nix

diff --git a/modules/misc/ids.nix b/modules/misc/ids.nix
index 922bbb53171..66df0b22db4 100644
--- a/modules/misc/ids.nix
+++ b/modules/misc/ids.nix
@@ -80,6 +80,7 @@ in
     smtpq = 64;
     supybot = 65;
     iodined = 66;
+    graphite = 67;
 
     # When adding a uid, make sure it doesn't match an existing gid.
 
@@ -143,6 +144,7 @@ in
     smtpq = 64;
     supybot = 65;
     iodined = 66;
+    graphite = 67;
 
     # When adding a gid, make sure it doesn't match an existing uid.
 
diff --git a/modules/module-list.nix b/modules/module-list.nix
index 2d14a143e22..37e68f06d3a 100644
--- a/modules/module-list.nix
+++ b/modules/module-list.nix
@@ -121,6 +121,7 @@
   ./services/misc/synergy.nix
   ./services/monitoring/apcupsd.nix
   ./services/monitoring/dd-agent.nix
+  ./services/monitoring/graphite.nix
   ./services/monitoring/monit.nix
   ./services/monitoring/nagios/default.nix
   ./services/monitoring/smartd.nix
diff --git a/modules/services/monitoring/graphite.nix b/modules/services/monitoring/graphite.nix
new file mode 100644
index 00000000000..43fc7be0063
--- /dev/null
+++ b/modules/services/monitoring/graphite.nix
@@ -0,0 +1,235 @@
+{ config, pkgs, ... }:
+
+with pkgs.lib;
+
+let
+  cfg = config.services.graphite;
+  writeTextOrNull = f: t: if t == null then null else pkgs.writeText f t;
+
+  dataDir = "/var/db/graphite";
+
+in {
+
+  ###### interface
+
+  options.services.graphite = {
+    carbon = mkOption {
+      description = "Content of carbon configuration file";
+      default = "";
+      type = types.uniq types.string;
+    };
+
+    enableCarbonCache = mkOption {
+      description = "Whether to enable carbon cache, the graphite storage daemon";
+      default = false;
+      type = types.uniq types.bool;
+    };
+
+    storageAggregation = mkOption {
+      description = "Defines how to aggregate data to lower-precision retentions";
+      default = null;
+      type = types.uniq (types.nullOr types.string);
+      example = ''
+        [all_min]
+        pattern = \.min$
+        xFilesFactor = 0.1
+        aggregationMethod = min
+      '';
+    };
+
+    storageSchemas = mkOption {
+      description = "Defines retention rates for storing metrics";
+      default = "";
+      type = types.uniq (types.nullOr types.string);
+      example = ''
+        [apache_busyWorkers]
+        pattern = ^servers\.www.*\.workers\.busyWorkers$
+        retentions = 15s:7d,1m:21d,15m:5y
+      '';
+    };
+
+    blacklist = mkOption {
+      description = "Any metrics received which match one of the experssions will be dropped";
+      default = null;
+      type = types.uniq (types.nullOr types.string);
+      example = "^some\.noisy\.metric\.prefix\..*";
+    };
+
+    whitelist = mkOption {
+      description = "Only metrics received which match one of the experssions will be persisted";
+      default = null;
+      type = types.uniq (types.nullOr types.string);
+      example = ".*";
+    };
+
+    rewriteRules = mkOption {
+      description = "Regular expression patterns that can be used to rewrite metric names in a search and replace fashion";
+      default = null;
+      type = types.uniq (types.nullOr types.string);
+      example = ''
+        [post]
+        _sum$ =
+        _avg$ =
+      '';
+    };
+
+    enableCarbonRelay = mkOption {
+      description = "Whether to enable carbon relay, the carbon replication and sharding service";
+      default = false;
+      type = types.uniq types.bool;
+    };
+
+    relayRules = mkOption {
+      description = "Relay rules are used to send certain metrics to a certain backend.";
+      default = null;
+      type = types.uniq (types.nullOr types.string);
+      example = ''
+        [example]
+        pattern = ^mydata\.foo\..+
+        servers = 10.1.2.3, 10.1.2.4:2004, myserver.mydomain.com
+      '';
+    };
+
+    enableCarbonAggregator = mkOption {
+      description = "Whether to enable carbon agregator, the carbon buffering service";
+      default = false;
+      type = types.uniq types.bool;
+    };
+
+    aggregationRules = mkOption {
+      description = "Defines if and how received metrics will be agregated";
+      default = null;
+      type = types.uniq (types.nullOr types.string);
+      example = ''
+        <env>.applications.<app>.all.requests (60) = sum <env>.applications.<app>.*.requests
+        <env>.applications.<app>.all.latency (60) = avg <env>.applications.<app>.*.latency
+      '';
+    };
+
+    enableGraphiteWeb = mkOption {
+      description = "Whether to enable graphite web frontend";
+      default = false;
+      type = types.uniq types.bool;
+    };
+
+  };
+
+  ###### implementation
+
+  config = mkIf (cfg.enableCarbonAggregator || cfg.enableCarbonCache || cfg.enableCarbonRelay || cfg.enableGraphiteWeb) {
+    environment.etc = lists.filter (el: el.source != null) [
+      { source = writeTextOrNull "carbon.conf" cfg.carbon;
+        target = "graphite/carbon.conf"; }
+      { source = writeTextOrNull "storage-agregation.conf" cfg.storageAggregation;
+        target = "graphite/storage-agregation.conf"; }
+      { source = writeTextOrNull "storage-schemas.conf" cfg.storageSchemas;
+        target = "graphite/storage-schemas.conf"; }
+      { source = writeTextOrNull "blacklist.conf" cfg.blacklist;
+        target = "graphite/blacklist.conf"; }
+      { source = writeTextOrNull "whitelist.conf" cfg.whitelist;
+        target = "graphite/whitelist.conf"; }
+      { source = writeTextOrNull "rewrite-rules.conf" cfg.rewriteRules;
+        target = "graphite/rewrite-rules.conf"; }
+      { source = writeTextOrNull "relay-rules.conf" cfg.relayRules;
+        target = "graphite/relay-rules.conf"; }
+      { source = writeTextOrNull "aggregation-rules.conf" cfg.aggregationRules;
+        target = "graphite/aggregation-rules.conf"; }
+    ];
+
+    systemd.services.carbonCache = mkIf cfg.enableCarbonCache {
+      description = "Graphite data storage backend";
+      wantedBy = [ "multi-user.target" ];
+      after = [ "network-interfaces.target" ];
+      environment = {
+        GRAPHITE_CONF_DIR = "/etc/graphite/";
+        GRAPHITE_STORAGE_DIR = "/var/db/graphite/";
+      };
+      serviceConfig = {
+        ExecStart = "${pkgs.pythonPackages.carbon}/bin/carbon-cache.py --debug --pidfile /tmp/carbonCache.pid start";
+        User = "graphite";
+        Group = "graphite";
+      };
+      restartTriggers = [
+        pkgs.pythonPackages.carbon cfg.carbon
+        cfg.storageAggregation cfg.storageSchemas cfg.rewriteRules
+      ];
+      preStart = ''
+        mkdir -p ${dataDir}/whisper
+      '';
+    };
+
+    systemd.services.carbonAggregator = mkIf cfg.enableCarbonAggregator {
+      description = "Carbon data aggregator";
+      wantedBy = [ "multi-user.target" ];
+      after = [ "network-interfaces.target" ];
+      environment = {
+        GRAPHITE_CONF_DIR = "/etc/graphite/";
+        GRAPHITE_STORAGE_DIR = "${dataDir}";
+      };
+      serviceConfig = {
+        ExecStart = "${pkgs.pythonPackages.carbon}/bin/carbon-aggregator.py --debug --pidfile /tmp/carbonAggregator.pid start";
+        User = "graphite";
+        Group = "graphite";
+      };
+      restartTriggers = [ pkgs.pythonPackages.carbon cfg.carbon cfg.aggregationRules ];
+    };
+
+    systemd.services.carbonRelay = mkIf cfg.enableCarbonRelay {
+      description = "Carbon data relay";
+      wantedBy = [ "multi-user.target" ];
+      after = [ "network-interfaces.target" ];
+      environment = {
+        GRAPHITE_CONF_DIR = "/etc/graphite/";
+        GRAPHITE_STORAGE_DIR = "${dataDir}";
+      };
+      serviceConfig = {
+        ExecStart = "${pkgs.pythonPackages.carbon}/bin/carbon-relay.py --debug --pidfile /tmp/carbonRelay.pid start";
+        User = "graphite";
+        Group = "graphite";
+      };
+      restartTriggers = [ pkgs.pythonPackages.carbon cfg.carbon cfg.relayRules ];
+    };
+
+    systemd.services.graphiteWeb = mkIf cfg.enableGraphiteWeb {
+      description = "Graphite web interface";
+      wantedBy = [ "multi-user.target" ];
+      after = [ "network-interfaces.target" ];
+      environment = {
+        GRAPHITE_CONF_DIR = "/etc/graphite/";
+        GRAPHITE_STORAGE_DIR = "${dataDir}";
+      };
+      serviceConfig = {
+        ExecStart = "${pkgs.pythonPackages.graphite_web}/bin/run-graphite-devel-server.py ${pkgs.pythonPackages.graphite_web}";
+        User = "graphite";
+        Group = "graphite";
+      };
+      preStart = ''
+        if ! test -e ${dataDir}/db-created; then
+          mkdir -p ${dataDir}/{whisper/,log/webapp/}
+
+          # populate database
+          ${pkgs.pythonPackages.graphite_web}/bin/manage-graphite.py syncdb --noinput
+
+          # create index
+          ${pkgs.pythonPackages.graphite_web}/bin/build-index.sh
+
+          touch ${dataDir}/db-created
+        fi
+      '';
+      restartTriggers = [ pkgs.pythonPackages.graphite_web ];
+    };
+
+    environment.systemPackages = [
+      pkgs.pythonPackages.carbon pkgs.pythonPackages.graphite_web pkgs.pythonPackages.django_1_3
+    ];
+
+    users.extraUsers = singleton {
+      name = "graphite";
+      uid = config.ids.uids.graphite;
+      description = "Graphite daemon user";
+      home = "${dataDir}";
+      createHome = true;
+    };
+    users.extraGroups.graphite.gid = config.ids.gids.graphite;
+  };
+}
-- 
GitLab


From 6246d75654ce8df3f6a243535756b05769a78cb3 Mon Sep 17 00:00:00 2001
From: Evgeny Egorochkin <phreedom@yandex.ru>
Date: Mon, 12 Aug 2013 21:42:45 +0300
Subject: [PATCH 4813/5331] Unbreak iso_efi by feeding it a kernel that exists.

---
 modules/installer/cd-dvd/installation-cd-efi.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/installer/cd-dvd/installation-cd-efi.nix b/modules/installer/cd-dvd/installation-cd-efi.nix
index 669c5eaf6ad..d018d6aeaa7 100644
--- a/modules/installer/cd-dvd/installation-cd-efi.nix
+++ b/modules/installer/cd-dvd/installation-cd-efi.nix
@@ -3,7 +3,7 @@
 {
   require = [ ./installation-cd-minimal.nix ];
 
-  boot.kernelPackages = pkgs.linuxPackages_3_8;
+  boot.kernelPackages = pkgs.linuxPackages_3_9;
   boot.vesa = false;
 
   # What follows should probably move into base once the base kernel has the
-- 
GitLab


From fc2fc63f4c0a3fe9dd206b7056538b77aa9e5c11 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 14 Aug 2013 02:27:44 +0200
Subject: [PATCH 4814/5331] Use the Debian firmware package instead of the
 Intel-specific ones
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The intel-*.nix modules are obsolete (since you can just say
‘hardware.enableAllFirmware = true’, or equivalently,
‘hardware.firmware = [ pkgs.firmwareLinuxNonfree ]’).  But we'll keep
them around for compatibility.
---
 modules/hardware/network/intel-2030.nix    |  4 +---
 modules/hardware/network/intel-2100bg.nix  | 10 +++-------
 modules/hardware/network/intel-2200bg.nix  | 10 +++-------
 modules/hardware/network/intel-3945abg.nix |  4 ++--
 modules/hardware/network/intel-4965agn.nix |  4 +---
 modules/hardware/network/intel-5000.nix    |  4 +---
 modules/hardware/network/intel-5150.nix    |  4 +---
 modules/hardware/network/intel-6000.nix    |  4 +---
 modules/hardware/network/intel-6000g2a.nix |  4 +---
 modules/hardware/network/intel-6000g2b.nix |  4 +---
 10 files changed, 15 insertions(+), 37 deletions(-)

diff --git a/modules/hardware/network/intel-2030.nix b/modules/hardware/network/intel-2030.nix
index 303363eaab2..8fecdae36bf 100644
--- a/modules/hardware/network/intel-2030.nix
+++ b/modules/hardware/network/intel-2030.nix
@@ -1,5 +1,3 @@
-{pkgs, config, ...}:
-
 {
-  hardware.firmware = [ pkgs.iwlwifi2030ucode ];
+  hardware.enableAllFirmware = true;
 }
diff --git a/modules/hardware/network/intel-2100bg.nix b/modules/hardware/network/intel-2100bg.nix
index b2eea6c7b90..1e0033eb414 100644
--- a/modules/hardware/network/intel-2100bg.nix
+++ b/modules/hardware/network/intel-2100bg.nix
@@ -1,4 +1,4 @@
-{pkgs, config, ...}:
+{ config, pkgs, ... }:
 
 {
 
@@ -12,9 +12,7 @@
       description = ''
         Turn on this option if you want firmware for the Intel
         PRO/Wireless 2100BG to be loaded automatically.  This is
-        required if you want to use this device.  Intel requires you to
-        accept the license for this firmware, see
-        <link xlink:href='http://ipw2100.sourceforge.net/firmware.php?fid=2'/>.
+        required if you want to use this device.
       '';
     };
 
@@ -25,9 +23,7 @@
 
   config = pkgs.lib.mkIf config.networking.enableIntel2100BGFirmware {
 
-    # Warning: setting this option requires acceptance of the firmware
-    # license, see http://ipw2100.sourceforge.net/firmware.php?fid=2.
-    hardware.firmware = [ pkgs.ipw2100fw ];
+    hardware.enableAllFirmware = true;
 
   };
 
diff --git a/modules/hardware/network/intel-2200bg.nix b/modules/hardware/network/intel-2200bg.nix
index 5804eabded5..ae5b69b7981 100644
--- a/modules/hardware/network/intel-2200bg.nix
+++ b/modules/hardware/network/intel-2200bg.nix
@@ -1,4 +1,4 @@
-{pkgs, config, ...}:
+{ config, pkgs, ... }:
 
 {
 
@@ -12,9 +12,7 @@
       description = ''
         Turn on this option if you want firmware for the Intel
         PRO/Wireless 2200BG to be loaded automatically.  This is
-        required if you want to use this device.  Intel requires you to
-        accept the license for this firmware, see
-        <link xlink:href='http://ipw2200.sourceforge.net/firmware.php?fid=7'/>.
+        required if you want to use this device.
       '';
     };
 
@@ -25,9 +23,7 @@
 
   config = pkgs.lib.mkIf config.networking.enableIntel2200BGFirmware {
 
-    # Warning: setting this option requires acceptance of the firmware
-    # license, see http://ipw2200.sourceforge.net/firmware.php?fid=7.
-    hardware.firmware = [ pkgs.ipw2200fw ];
+    hardware.enableAllFirmware = true;
 
   };
 
diff --git a/modules/hardware/network/intel-3945abg.nix b/modules/hardware/network/intel-3945abg.nix
index 3500fc2ff68..80baf260ab9 100644
--- a/modules/hardware/network/intel-3945abg.nix
+++ b/modules/hardware/network/intel-3945abg.nix
@@ -1,4 +1,4 @@
-{pkgs, config, ...}:
+{ config, pkgs, ... }:
 
 {
 
@@ -22,7 +22,7 @@
 
   config = pkgs.lib.mkIf config.networking.enableIntel3945ABGFirmware {
 
-    hardware.firmware = [ pkgs.iwlwifi3945ucode ];
+    hardware.enableAllFirmware = true;
 
   };
 
diff --git a/modules/hardware/network/intel-4965agn.nix b/modules/hardware/network/intel-4965agn.nix
index d22eea29697..8fecdae36bf 100644
--- a/modules/hardware/network/intel-4965agn.nix
+++ b/modules/hardware/network/intel-4965agn.nix
@@ -1,5 +1,3 @@
-{pkgs, config, ...}:
-
 {
-  hardware.firmware = [ config.boot.kernelPackages.iwlwifi4965ucode ];
+  hardware.enableAllFirmware = true;
 }
diff --git a/modules/hardware/network/intel-5000.nix b/modules/hardware/network/intel-5000.nix
index 19e6499fa99..8fecdae36bf 100644
--- a/modules/hardware/network/intel-5000.nix
+++ b/modules/hardware/network/intel-5000.nix
@@ -1,5 +1,3 @@
-{pkgs, config, ...}:
-
 {
-  hardware.firmware = [ pkgs.iwlwifi5000ucode ];
+  hardware.enableAllFirmware = true;
 }
diff --git a/modules/hardware/network/intel-5150.nix b/modules/hardware/network/intel-5150.nix
index e32b72d5fa4..8fecdae36bf 100644
--- a/modules/hardware/network/intel-5150.nix
+++ b/modules/hardware/network/intel-5150.nix
@@ -1,5 +1,3 @@
-{pkgs, config, ...}:
-
 {
-  hardware.firmware = [ pkgs.iwlwifi5150ucode ];
+  hardware.enableAllFirmware = true;
 }
diff --git a/modules/hardware/network/intel-6000.nix b/modules/hardware/network/intel-6000.nix
index 89dd5ba4b88..8fecdae36bf 100644
--- a/modules/hardware/network/intel-6000.nix
+++ b/modules/hardware/network/intel-6000.nix
@@ -1,5 +1,3 @@
-{pkgs, config, ...}:
-
 {
-  hardware.firmware = [ pkgs.iwlwifi6000ucode ];
+  hardware.enableAllFirmware = true;
 }
diff --git a/modules/hardware/network/intel-6000g2a.nix b/modules/hardware/network/intel-6000g2a.nix
index 37886eac5ae..8fecdae36bf 100644
--- a/modules/hardware/network/intel-6000g2a.nix
+++ b/modules/hardware/network/intel-6000g2a.nix
@@ -1,5 +1,3 @@
-{pkgs, config, ...}:
-
 {
-  hardware.firmware = [ pkgs.iwlwifi6000g2aucode ];
+  hardware.enableAllFirmware = true;
 }
diff --git a/modules/hardware/network/intel-6000g2b.nix b/modules/hardware/network/intel-6000g2b.nix
index f3fcaee7aa7..8fecdae36bf 100644
--- a/modules/hardware/network/intel-6000g2b.nix
+++ b/modules/hardware/network/intel-6000g2b.nix
@@ -1,5 +1,3 @@
-{pkgs, config, ...}:
-
 {
-  hardware.firmware = [ pkgs.iwlwifi6000g2bucode ];
+  hardware.enableAllFirmware = true;
 }
-- 
GitLab


From ce866184c6030417d9ab1e5c3ee64f3e5a44148d Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 14 Aug 2013 02:58:55 +0200
Subject: [PATCH 4815/5331] Update the locate database using a systemd service

This makes it easier to update the database manually ("systemctl start
update-locatedb").

Also, use modern module syntax.
---
 modules/misc/locate.nix | 94 +++++++++++++++++++++--------------------
 1 file changed, 48 insertions(+), 46 deletions(-)

diff --git a/modules/misc/locate.nix b/modules/misc/locate.nix
index e24fa2d078c..c240dfa3865 100644
--- a/modules/misc/locate.nix
+++ b/modules/misc/locate.nix
@@ -1,60 +1,62 @@
-{pkgs, config, ...}:
+{ config, pkgs, ... }:
+
+with pkgs.lib;
 
-###### interface
 let
-  inherit (pkgs.lib) mkOption;
+
+  locatedb = "/var/cache/locatedb";
+
+in
+
+{
+
+  ###### interface
 
   options = {
-    services = {
-      locate = {
-
-        enable = mkOption {
-          default = false;
-          example = true;
-          description = ''
-            If enabled, NixOS will periodically update the database of
-            files used by the <command>locate</command> command.
-          '';
-        };
-
-        period = mkOption {
-          default = "15 02 * * *";
-          description = ''
-            This option defines (in the format used by cron) when the
-            locate database is updated.
-            The default is to update at 02:15 (at night) every day.
-          '';
-        };
 
+    services.locate = {
+
+      enable = mkOption {
+        default = false;
+        example = true;
+        description = ''
+          If enabled, NixOS will periodically update the database of
+          files used by the <command>locate</command> command.
+        '';
+      };
+
+      period = mkOption {
+        default = "15 02 * * *";
+        description = ''
+          This option defines (in the format used by cron) when the
+          locate database is updated.
+          The default is to update at 02:15 (at night) every day.
+        '';
       };
 
     };
+
   };
-in
 
-###### implementation
-let
-  locatedb = "/var/cache/locatedb";
+  ###### implementation
 
-  updatedbCmd =
-    "${config.services.locate.period}  root  " +
-    "mkdir -m 0755 -p $(dirname ${locatedb}) && " +
-    "nice -n 19 ${pkgs.utillinux}/bin/ionice -c 3 " +
-    "updatedb --localuser=nobody --output=${locatedb} > /var/log/updatedb 2>&1";
-in
+  config = {
+
+    systemd.services.update-locatedb =
+      { description = "Update Locate Database";
+        path  = [ pkgs.su ];
+        script =
+          ''
+            mkdir -m 0755 -p $(dirname ${locatedb})
+            exec updatedb --localuser=nobody --output=${locatedb}
+          '';
+        serviceConfig.Nice = 19;
+        serviceConfig.IOSchedulingClass = "idle";
+      };
+
+    services.cron.systemCronJobs = optional config.services.locate.enable
+      "${config.services.locate.period} root ${config.systemd.package}/bin/systemctl start update-locatedb.service";
 
-{
-  require = [
-    # ../../upstart-jobs/cron.nix # config.services.cron
-    options
-  ];
-
-  services = {
-    cron = {
-      systemCronJobs =
-        pkgs.lib.optional
-          config.services.locate.enable
-          updatedbCmd;
-    };
   };
+
 }
-- 
GitLab


From 14315b81b1347554cea9972c4c7a35c62906844e Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 14 Aug 2013 03:07:36 +0200
Subject: [PATCH 4816/5331] Add /media and /run to the filesystems ignored by
 updatedb

---
 modules/misc/locate.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/misc/locate.nix b/modules/misc/locate.nix
index c240dfa3865..02b1ed7b63d 100644
--- a/modules/misc/locate.nix
+++ b/modules/misc/locate.nix
@@ -48,7 +48,7 @@ in
         script =
           ''
             mkdir -m 0755 -p $(dirname ${locatedb})
-            exec updatedb --localuser=nobody --output=${locatedb}
+            exec updatedb --localuser=nobody --output=${locatedb} --prunepaths='/tmp /var/tmp /media /run'
           '';
         serviceConfig.Nice = 19;
         serviceConfig.IOSchedulingClass = "idle";
-- 
GitLab


From 4bc73f3ecedce00c404f7433ed4654c0ef459b4b Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 14 Aug 2013 03:27:02 +0200
Subject: [PATCH 4817/5331] Use the Debian firmware package in more places

---
 modules/hardware/network/broadcom-43xx.nix | 4 +---
 modules/hardware/network/ralink.nix        | 2 +-
 modules/hardware/network/rtl8192c.nix      | 2 +-
 modules/hardware/video/radeon.nix          | 4 +---
 4 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/modules/hardware/network/broadcom-43xx.nix b/modules/hardware/network/broadcom-43xx.nix
index f902babc4f6..8fecdae36bf 100644
--- a/modules/hardware/network/broadcom-43xx.nix
+++ b/modules/hardware/network/broadcom-43xx.nix
@@ -1,5 +1,3 @@
-{ config, pkgs, ... }:
-
 {
-  hardware.firmware = [ pkgs.bcm43xx ];
+  hardware.enableAllFirmware = true;
 }
diff --git a/modules/hardware/network/ralink.nix b/modules/hardware/network/ralink.nix
index 5924a23fe3c..d5e195cc90a 100644
--- a/modules/hardware/network/ralink.nix
+++ b/modules/hardware/network/ralink.nix
@@ -20,7 +20,7 @@
   ###### implementation
 
   config = pkgs.lib.mkIf config.networking.enableRalinkFirmware {
-    hardware.firmware = [ pkgs.ralink_fw ];
+    hardware.enableAllFirmware = true;
   };
 
 }
diff --git a/modules/hardware/network/rtl8192c.nix b/modules/hardware/network/rtl8192c.nix
index aeb573fb0ea..3aefb7bdd60 100644
--- a/modules/hardware/network/rtl8192c.nix
+++ b/modules/hardware/network/rtl8192c.nix
@@ -20,7 +20,7 @@
   ###### implementation
 
   config = pkgs.lib.mkIf config.networking.enableRTL8192cFirmware {
-    hardware.firmware = [ pkgs.rtl8192cfw ];
+    hardware.enableAllFirmware = true;
   };
 
 }
diff --git a/modules/hardware/video/radeon.nix b/modules/hardware/video/radeon.nix
index 8836cff8a84..8fecdae36bf 100644
--- a/modules/hardware/video/radeon.nix
+++ b/modules/hardware/video/radeon.nix
@@ -1,5 +1,3 @@
-{ config, pkgs, ... }:
-
 {
-  hardware.firmware = [ pkgs.radeonR600 pkgs.radeonR700 pkgs.radeonJuniper ];
+  hardware.enableAllFirmware = true;
 }
-- 
GitLab


From 8db22f747d050dc7d48bd2fbba6e070f359ee9d5 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 14 Aug 2013 03:29:16 +0200
Subject: [PATCH 4818/5331] Enable the Debian firmware package on the
 installation CD

It's unfree but we already had such firmware on the CD so we're not
worse off.

Issue #87.
---
 modules/profiles/all-hardware.nix | 18 +++---------------
 1 file changed, 3 insertions(+), 15 deletions(-)

diff --git a/modules/profiles/all-hardware.nix b/modules/profiles/all-hardware.nix
index 617616ee6cc..2635aa8897d 100644
--- a/modules/profiles/all-hardware.nix
+++ b/modules/profiles/all-hardware.nix
@@ -47,21 +47,9 @@
     ];
 
   # Include lots of firmware.
+  hardware.enableAllFirmware = true;
+
   require =
-    [ ../hardware/network/intel-4965agn.nix
-      ../hardware/network/intel-5000.nix
-      ../hardware/network/intel-6000.nix
-      ../hardware/network/intel-6000g2a.nix
-      ../hardware/network/intel-6000g2b.nix
-      ../hardware/network/intel-2030.nix
-      ../hardware/network/broadcom-43xx.nix
-      ../hardware/network/zydas-zd1211.nix
-      ../hardware/video/radeon.nix
-    ];
+    [ ../hardware/network/zydas-zd1211.nix ];
 
-  networking.enableIntel2100BGFirmware = true;
-  networking.enableIntel2200BGFirmware = true;
-  networking.enableIntel3945ABGFirmware = true;
-  #networking.enableRTL8192cFirmware = true; # doesn't build
-  
 }
-- 
GitLab


From 5060160634e565feda706921fb0537b921cffbc4 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 14 Aug 2013 03:32:28 +0200
Subject: [PATCH 4819/5331] not-detected.nix: Enable all firmware

Note that since the configuration produced by nixos-hardware-scan
includes not-detected.nix, you get all firmware when following the
regular installation procedure.

Issue #87.
---
 modules/installer/scan/not-detected.nix | 17 +----------------
 1 file changed, 1 insertion(+), 16 deletions(-)

diff --git a/modules/installer/scan/not-detected.nix b/modules/installer/scan/not-detected.nix
index f79a3f09e05..814858fdffd 100644
--- a/modules/installer/scan/not-detected.nix
+++ b/modules/installer/scan/not-detected.nix
@@ -5,20 +5,5 @@
 with pkgs.lib;
 
 {
-  imports =
-    [
-      ../../hardware/network/intel-4965agn.nix
-      ../../hardware/network/intel-5000.nix
-      ../../hardware/network/intel-5150.nix
-      ../../hardware/network/intel-6000.nix
-      ../../hardware/network/intel-6000g2a.nix
-      ../../hardware/network/intel-6000g2b.nix
-      ../../hardware/network/broadcom-43xx.nix
-    ];
-
-  config = mkDefault {
-    # That wireless card firmware not enabled because the corresponding
-    # build expression 'rt73fw' is broken.
-    networking.enableRalinkFirmware = false;
-  };
+  hardware.enableAllFirmware = true;
 }
-- 
GitLab


From 047b65dd6818da90f2f262d3c27991dd220d00ac Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 14 Aug 2013 03:34:40 +0200
Subject: [PATCH 4820/5331] Typo

---
 modules/hardware/network/ralink.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/hardware/network/ralink.nix b/modules/hardware/network/ralink.nix
index d5e195cc90a..92f34d8643b 100644
--- a/modules/hardware/network/ralink.nix
+++ b/modules/hardware/network/ralink.nix
@@ -10,7 +10,7 @@
       default = false;
       type = pkgs.lib.types.bool;
       description = ''
-        Turn on this option if you want firmware for the RT73 NIC
+        Turn on this option if you want firmware for the RT73 NIC.
       '';
     };
 
-- 
GitLab


From 93923296a916a138f45e604fa377429712540521 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Wed, 14 Aug 2013 17:29:42 +0200
Subject: [PATCH 4821/5331] i3: Allow to pass a configuration file.

With this it's now possible to directly embed a configuration file
using `services.xserver.windowManager.i3.configFile = path`, which then
will be used instead of the one in the users home directory.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 modules/services/x11/window-managers/i3.nix | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

diff --git a/modules/services/x11/window-managers/i3.nix b/modules/services/x11/window-managers/i3.nix
index d688c064c5a..6777a95ddc8 100644
--- a/modules/services/x11/window-managers/i3.nix
+++ b/modules/services/x11/window-managers/i3.nix
@@ -1,7 +1,8 @@
-{pkgs, config, ...}:
+{ pkgs, config, ... }:
+
+with pkgs.lib;
 
 let
-  inherit (pkgs.lib) mkOption mkIf;
   cfg = config.services.xserver.windowManager.i3;
 in
 
@@ -13,6 +14,15 @@ in
         example = true;
         description = "Enable the i3 tiling window manager.";
       };
+
+      configFile = mkOption {
+        default = null;
+        type = types.nullOr types.path;
+        description = ''
+          Path to the i3 configuration file.
+          If left at the default value, $HOME/.i3/config will be used.
+        '';
+      };
     };
   };
 
@@ -21,7 +31,9 @@ in
       session = [{
         name = "i3";
         start = "
-          ${pkgs.i3}/bin/i3 &
+          ${pkgs.i3}/bin/i3 ${optionalString (cfg.configFile != null)
+            "-c \"${cfg.configFile}\""
+          } &
           waitPID=$!
         ";
       }];
-- 
GitLab


From 1cb8c090e744aba1dc5b57381f5bd88fa71e1bf0 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 15 Aug 2013 03:09:43 +0200
Subject: [PATCH 4822/5331] =?UTF-8?q?Rename=20=E2=80=98members=E2=80=99=20?=
 =?UTF-8?q?to=20=E2=80=98constituents=E2=80=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 release-combined.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/release-combined.nix b/release-combined.nix
index 5efd8f36fa8..ffe9d183ce2 100644
--- a/release-combined.nix
+++ b/release-combined.nix
@@ -32,7 +32,7 @@ in rec {
       description = "Release-critical builds for the NixOS unstable channel";
       maintainers = [ pkgs.lib.maintainers.shlevy ];
     };
-    members =
+    constituents =
       [ nixos.channel
         nixos.manual
 
-- 
GitLab


From d97ea69a81a7cadd42893c59d81f6a4f12ba9988 Mon Sep 17 00:00:00 2001
From: Marc Weber <marco-oweber@gmx.de>
Date: Thu, 14 Mar 2013 16:50:13 +0100
Subject: [PATCH 4823/5331] systemd: check service.name.Type and
 service.name.Restart

---
 modules/system/boot/systemd-unit-options.nix | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/modules/system/boot/systemd-unit-options.nix b/modules/system/boot/systemd-unit-options.nix
index fd4d19d1dd0..e3542ce9225 100644
--- a/modules/system/boot/systemd-unit-options.nix
+++ b/modules/system/boot/systemd-unit-options.nix
@@ -145,6 +145,16 @@ rec {
         <citerefentry><refentrytitle>systemd.service</refentrytitle>
         <manvolnum>5</manvolnum></citerefentry> for details.
       '';
+
+      check = v:
+        let assertValueOneOf = name: values: attr:
+              let val = getAttr name attr;
+              in optional ( hasAttr name attr && !elem val values) "${name} ${val} not known to systemd";
+            checkType = assertValueOneOf "Type" ["simple" "forking" "oneshot" "dbus" "notify" "idle"];
+            checkRestart = assertValueOneOf "Restart" ["no" "on-success" "on-failure" "on-abort" "always"];
+            errors = concatMap (c: c v) [checkType checkRestart];
+        in if errors == [] then true
+           else builtins.trace (concatStringsSep "\n" errors) false;
     };
 
     script = mkOption {
-- 
GitLab


From 2fcd1195e650d59b05607f2851c9f100d2f02931 Mon Sep 17 00:00:00 2001
From: Marc Weber <marco-oweber@gmx.de>
Date: Tue, 23 Apr 2013 03:06:59 +0200
Subject: [PATCH 4824/5331] bash: change shell script option types from string
 to lines installation-cd-base: export mountPoint=/mnt. This doesn't change
 the default behavior, but an explicit mount point specification is cleaner.

---
 modules/installer/cd-dvd/installation-cd-base.nix | 2 ++
 modules/programs/bash/bash.nix                    | 6 +++---
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/modules/installer/cd-dvd/installation-cd-base.nix b/modules/installer/cd-dvd/installation-cd-base.nix
index 5c67c8e2a9d..edcbed6e0b9 100644
--- a/modules/installer/cd-dvd/installation-cd-base.nix
+++ b/modules/installer/cd-dvd/installation-cd-base.nix
@@ -32,4 +32,6 @@ with pkgs.lib;
   # To speed up installation a little bit, include the complete stdenv
   # in the Nix store on the CD.
   isoImage.storeContents = [ pkgs.stdenv pkgs.busybox ];
+
+  environment.shellInit = "export mountPoint=/mnt";
 }
diff --git a/modules/programs/bash/bash.nix b/modules/programs/bash/bash.nix
index a4b71cfc276..a41a588a474 100644
--- a/modules/programs/bash/bash.nix
+++ b/modules/programs/bash/bash.nix
@@ -46,7 +46,7 @@ let
       description = ''
         Shell script code used to initialise the shell prompt.
       '';
-      type = with pkgs.lib.types; string;
+      type = with pkgs.lib.types; lines;
     };
 
     environment.shellInit = mkOption {
@@ -55,7 +55,7 @@ let
       description = ''
         Shell script code called during login shell initialisation.
       '';
-      type = with pkgs.lib.types; string;
+      type = with pkgs.lib.types; lines;
     };
 
     environment.interactiveShellInit = mkOption {
@@ -64,7 +64,7 @@ let
       description = ''
         Shell script code called during interactive shell initialisation.
       '';
-      type = with pkgs.lib.types; string;
+      type = with pkgs.lib.types; lines;
     };
 
     environment.enableBashCompletion = mkOption {
-- 
GitLab


From ec9ae91205236bf1687af20fa38c6ca7bce59ef4 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 15 Aug 2013 13:19:27 +0200
Subject: [PATCH 4825/5331] Add more jobs to the "tested" aggregate

---
 release-combined.nix | 38 +++++++++++++++++++-------------------
 1 file changed, 19 insertions(+), 19 deletions(-)

diff --git a/release-combined.nix b/release-combined.nix
index ffe9d183ce2..f038c5be2d5 100644
--- a/release-combined.nix
+++ b/release-combined.nix
@@ -4,6 +4,7 @@
 }:
 
 let
+
   nixpkgs' = nixpkgs; # urgh
 
   pkgs = import <nixpkgs> {};
@@ -13,6 +14,7 @@ let
       then set // { meta = builtins.removeAttrs (set.meta or {}) [ "maintainers" ]; }
       else pkgs.lib.mapAttrs (n: v: removeMaintainers v) set
     else set;
+
 in rec {
   nixos = removeMaintainers (import ./release.nix {
     inherit nixosSrc officialRelease;
@@ -30,32 +32,30 @@ in rec {
     name = "nixos-${nixos.tarball.version}";
     meta = {
       description = "Release-critical builds for the NixOS unstable channel";
-      maintainers = [ pkgs.lib.maintainers.shlevy ];
+      maintainers = [ pkgs.lib.maintainers.eelco pkgs.lib.maintainers.shlevy ];
     };
     constituents =
+      let all = x: [ x.x86_64-linux x.i686-linux ]; in
       [ nixos.channel
         nixos.manual
 
-        nixos.iso_minimal.x86_64-linux
-        nixos.iso_minimal.i686-linux
-        nixos.iso_graphical.x86_64-linux
-        nixos.iso_graphical.i686-linux
-
-        nixos.tests.firefox.x86_64-linux
-        nixos.tests.firewall.x86_64-linux
-        nixos.tests.installer.lvm.x86_64-linux
-        nixos.tests.installer.separateBoot.x86_64-linux
-        nixos.tests.installer.simple.i686-linux
-        nixos.tests.installer.simple.x86_64-linux
-        nixos.tests.kde4.i686-linux
-        nixos.tests.login.i686-linux
-        nixos.tests.login.x86_64-linux
-        nixos.tests.misc.i686-linux
-        nixos.tests.misc.x86_64-linux
+        (all nixos.iso_minimal)
+        (all nixos.iso_graphical)
+        nixos.vdi.x86_64-linux
+
+        (all nixos.tests.firefox)
+        (all nixos.tests.firewall)
+        (all nixos.tests.installer.lvm)
+        (all nixos.tests.installer.separateBoot)
+        (all nixos.tests.installer.simple)
+        (all nixos.tests.kde4)
+        (all nixos.tests.login)
+        (all nixos.tests.misc)
+        (all nixos.tests.openssh)
+        (all nixos.tests.xfce)
 
         nixpkgs.tarball
-        nixpkgs.emacs.i686-linux
-        nixpkgs.emacs.x86_64-linux
+        (all nixpkgs.emacs)
       ];
   };
 
-- 
GitLab


From b22e735d2b2adc302854004f17d80ff83823a9e3 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 15 Aug 2013 13:21:49 +0200
Subject: [PATCH 4826/5331] "with pkgs.lib.types; X" -> types.X

---
 modules/programs/bash/bash.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/modules/programs/bash/bash.nix b/modules/programs/bash/bash.nix
index a41a588a474..b23d004e532 100644
--- a/modules/programs/bash/bash.nix
+++ b/modules/programs/bash/bash.nix
@@ -46,7 +46,7 @@ let
       description = ''
         Shell script code used to initialise the shell prompt.
       '';
-      type = with pkgs.lib.types; lines;
+      type = types.lines;
     };
 
     environment.shellInit = mkOption {
@@ -55,7 +55,7 @@ let
       description = ''
         Shell script code called during login shell initialisation.
       '';
-      type = with pkgs.lib.types; lines;
+      type = types.lines;
     };
 
     environment.interactiveShellInit = mkOption {
@@ -64,19 +64,19 @@ let
       description = ''
         Shell script code called during interactive shell initialisation.
       '';
-      type = with pkgs.lib.types; lines;
+      type = types.lines;
     };
 
     environment.enableBashCompletion = mkOption {
       default = false;
       description = "Enable Bash completion for all interactive shells.";
-      type = with pkgs.lib.types; bool;
+      type = types.bool;
     };
 
     environment.binsh = mkOption {
       default = "${config.system.build.binsh}/bin/sh";
       example = "\${pkgs.dash}/bin/dash";
-      type = with pkgs.lib.types; path;
+      type = types.path;
       description = ''
         Select the shell executable that is linked system-wide to
         <literal>/bin/sh</literal>. Please note that NixOS assumes all
-- 
GitLab


From 35e2bac06939801588ab0445f62f8529a96651f2 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 15 Aug 2013 13:22:41 +0200
Subject: [PATCH 4827/5331] Remove $mountPoint

I just don't see the reason for setting this globally, given that /mnt
is the default.
---
 modules/installer/cd-dvd/installation-cd-base.nix | 2 --
 1 file changed, 2 deletions(-)

diff --git a/modules/installer/cd-dvd/installation-cd-base.nix b/modules/installer/cd-dvd/installation-cd-base.nix
index edcbed6e0b9..5c67c8e2a9d 100644
--- a/modules/installer/cd-dvd/installation-cd-base.nix
+++ b/modules/installer/cd-dvd/installation-cd-base.nix
@@ -32,6 +32,4 @@ with pkgs.lib;
   # To speed up installation a little bit, include the complete stdenv
   # in the Nix store on the CD.
   isoImage.storeContents = [ pkgs.stdenv pkgs.busybox ];
-
-  environment.shellInit = "export mountPoint=/mnt";
 }
-- 
GitLab


From e6fa5cd8f2303b06f54d8cfbbe2c02225d8ad0be Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 15 Aug 2013 16:37:53 +0200
Subject: [PATCH 4828/5331] Fix mousepad

---
 modules/services/x11/desktop-managers/xfce.nix | 2 +-
 release-combined.nix                           | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/modules/services/x11/desktop-managers/xfce.nix b/modules/services/x11/desktop-managers/xfce.nix
index 6c6e4ffce0a..4815d08bc45 100644
--- a/modules/services/x11/desktop-managers/xfce.nix
+++ b/modules/services/x11/desktop-managers/xfce.nix
@@ -76,7 +76,7 @@ in
       ++ optional config.powerManagement.enable pkgs.xfce.xfce4_power_manager;
 
     environment.pathsToLink =
-      [ "/share/xfce4" "/share/themes" "/share/mime" "/share/desktop-directories" ];
+      [ "/share/xfce4" "/share/themes" "/share/mime" "/share/desktop-directories" "/share/gtksourceview-2.0" ];
 
     environment.shellInit =
       ''
diff --git a/release-combined.nix b/release-combined.nix
index f038c5be2d5..853c833cb72 100644
--- a/release-combined.nix
+++ b/release-combined.nix
@@ -16,6 +16,7 @@ let
     else set;
 
 in rec {
+
   nixos = removeMaintainers (import ./release.nix {
     inherit nixosSrc officialRelease;
     nixpkgs = nixpkgs';
-- 
GitLab


From 2dca8421f96e415c1a2dba39cf51673af8501af0 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 15 Aug 2013 18:02:55 +0200
Subject: [PATCH 4829/5331] xfce: Add tango-icon-theme

The Rodent icon theme depends on ("inherits") Tango.
---
 modules/services/x11/desktop-managers/xfce.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/modules/services/x11/desktop-managers/xfce.nix b/modules/services/x11/desktop-managers/xfce.nix
index 4815d08bc45..e22e6a12130 100644
--- a/modules/services/x11/desktop-managers/xfce.nix
+++ b/modules/services/x11/desktop-managers/xfce.nix
@@ -45,6 +45,7 @@ in
     environment.systemPackages =
       [ pkgs.gtk # To get GTK+'s themes.
         pkgs.hicolor_icon_theme
+        pkgs.tango-icon-theme
         pkgs.shared_mime_info
         pkgs.which # Needed by the xfce's xinitrc script.
         pkgs.xfce.exo
-- 
GitLab


From f7d11af98a2a27db655aa2f368099ea34d91ecb7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Thu, 15 Aug 2013 21:50:16 +0200
Subject: [PATCH 4830/5331] libvirtd-service: give access to users in the
 "libvirtd" group

Currently only root has access. But with this patch all users in
"libvirtd" group will have access. This is similar to how it's done on
Ubuntu.

Also, add virtualisation.libvirtd.extraConfig option for further
customization of libvirtd.conf.
---
 modules/virtualisation/libvirtd.nix | 21 ++++++++++++++++++++-
 1 file changed, 20 insertions(+), 1 deletion(-)

diff --git a/modules/virtualisation/libvirtd.nix b/modules/virtualisation/libvirtd.nix
index 757a20f6164..876ce01615a 100644
--- a/modules/virtualisation/libvirtd.nix
+++ b/modules/virtualisation/libvirtd.nix
@@ -7,6 +7,13 @@ with pkgs.lib;
 let
 
   cfg = config.virtualisation.libvirtd;
+  configFile = pkgs.writeText "libvirtd.conf" ''
+    unix_sock_group = "libvirtd"
+    unix_sock_rw_perms = "0770"
+    auth_unix_ro = "none"
+    auth_unix_rw = "none"
+    ${cfg.extraConfig}
+  '';
 
 in
 
@@ -36,6 +43,16 @@ in
           '';
       };
 
+    virtualisation.libvirtd.extraConfig =
+      mkOption {
+        default = "";
+        description =
+          ''
+            Extra contents appended to the libvirtd configuration file,
+            libvirtd.conf.
+          '';
+      };
+
   };
 
 
@@ -83,7 +100,7 @@ in
             done
           ''; # */
 
-        serviceConfig.ExecStart = "@${pkgs.libvirt}/sbin/libvirtd libvirtd --daemon --verbose";
+        serviceConfig.ExecStart = ''@${pkgs.libvirt}/sbin/libvirtd libvirtd --config "${configFile}" --daemon --verbose'';
         serviceConfig.Type = "forking";
         serviceConfig.KillMode = "process"; # when stopping, leave the VMs alone
 
@@ -124,6 +141,8 @@ in
         serviceConfig.RemainAfterExit = true;
       };
 
+    users.extraGroups.libvirtd = {};
+
   };
 
 }
-- 
GitLab


From e36e979d38aac6a418007cbe0d48b84d097a4144 Mon Sep 17 00:00:00 2001
From: Rickard Nilsson <rickynils@gmail.com>
Date: Fri, 16 Aug 2013 00:35:57 +0200
Subject: [PATCH 4831/5331] networkmanager: Add option for overriding DNS
 settings

If the option is enabled, the DNS servers from networking.nameservers
will be inserted in /etc/resolv.con and override any DNS servers that
NetworkManager receieves by DHCP, or that is configured manually
in the connection settings.
---
 .../services/networking/networkmanager.nix    | 60 +++++++++++++------
 1 file changed, 41 insertions(+), 19 deletions(-)

diff --git a/modules/services/networking/networkmanager.nix b/modules/services/networking/networkmanager.nix
index e78e276ff82..75db6bf51ad 100644
--- a/modules/services/networking/networkmanager.nix
+++ b/modules/services/networking/networkmanager.nix
@@ -44,31 +44,50 @@ let
     fi
   '';
 
+  overrideNameserversScript = writeScript "02overridedns" ''
+    #!/bin/sh
+    ${pkgs.gnused}/bin/sed -i '/nameserver /d' /etc/resolv.conf
+    ${pkgs.lib.concatStringsSep ";" (map (s: "echo 'nameserver ${s}' >> /etc/resolv.conf") config.networking.nameservers)}
+  '';
+
 in {
 
   ###### interface
 
   options = {
 
-    networking.networkmanager.enable = mkOption {
-      default = false;
-      merge = mergeEnableOption;
-      description = ''
-        Whether to use NetworkManager to obtain an IP address and other
-        configuration for all network interfaces that are not manually
-        configured. If enabled, a group <literal>networkmanager</literal>
-        will be created. Add all users that should have permission
-        to change network settings to this group.
-      '';
-    };
+    networking.networkmanager = {
+
+      enable = mkOption {
+        default = false;
+        merge = mergeEnableOption;
+        description = ''
+          Whether to use NetworkManager to obtain an IP address and other
+          configuration for all network interfaces that are not manually
+          configured. If enabled, a group <literal>networkmanager</literal>
+          will be created. Add all users that should have permission
+          to change network settings to this group.
+        '';
+      };
+  
+      packages = mkOption {
+        default = [ ];
+        description = ''
+          Extra packages that provide NetworkManager plugins.
+        '';
+        merge = mergeListOption;
+        apply = list: [ networkmanager modemmanager wpa_supplicant ] ++ list;
+      };
+
+      overrideNameservers = mkOption {
+        default = false;
+        description = ''
+          If enabled, any nameservers received by DHCP or configured in
+          NetworkManager will be replaced by the nameservers configured
+          in the <literal>networking.nameservers</literal> option.
+        '';
+      };
 
-    networking.networkmanager.packages = mkOption {
-      default = [ ];
-      description = ''
-        Extra packages that provide NetworkManager plugins.
-      '';
-      merge = mergeListOption;
-      apply = list: [ networkmanager modemmanager wpa_supplicant ] ++ list;
     };
   };
 
@@ -98,7 +117,10 @@ in {
       { source = "${networkmanager_openconnect}/etc/NetworkManager/VPN/nm-openconnect-service.name";
         target = "NetworkManager/VPN/nm-openconnect-service.name";
       }
-    ];
+    ] ++ pkgs.lib.optional cfg.overrideNameservers
+           { source = overrideNameserversScript;
+             target = "NetworkManager/dispatcher.d/02overridedns";
+           };
 
     environment.systemPackages = cfg.packages ++ [
         networkmanager_openvpn
-- 
GitLab


From d1095e1bd40eda71d4238f9d28dd30ff4fc98e40 Mon Sep 17 00:00:00 2001
From: Rickard Nilsson <rickynils@gmail.com>
Date: Fri, 16 Aug 2013 00:47:21 +0200
Subject: [PATCH 4832/5331] Add libvirtd gid

---
 modules/misc/ids.nix                | 1 +
 modules/virtualisation/libvirtd.nix | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/modules/misc/ids.nix b/modules/misc/ids.nix
index 922bbb53171..941bd4303a7 100644
--- a/modules/misc/ids.nix
+++ b/modules/misc/ids.nix
@@ -143,6 +143,7 @@ in
     smtpq = 64;
     supybot = 65;
     iodined = 66;
+    libvirtd = 67;
 
     # When adding a gid, make sure it doesn't match an existing uid.
 
diff --git a/modules/virtualisation/libvirtd.nix b/modules/virtualisation/libvirtd.nix
index 876ce01615a..98d438cd63a 100644
--- a/modules/virtualisation/libvirtd.nix
+++ b/modules/virtualisation/libvirtd.nix
@@ -141,7 +141,7 @@ in
         serviceConfig.RemainAfterExit = true;
       };
 
-    users.extraGroups.libvirtd = {};
+    users.extraGroups.libvirtd.gid = config.ids.gids.libvirtd;
 
   };
 
-- 
GitLab


From 7e7a153cd6d9685488b7a9ae33b8ee8e0a431e72 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Fri, 16 Aug 2013 21:25:00 +0200
Subject: [PATCH 4833/5331] libvirtd-service: document that users in "libvirtd"
 group have access

---
 modules/virtualisation/libvirtd.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/virtualisation/libvirtd.nix b/modules/virtualisation/libvirtd.nix
index 98d438cd63a..52dab153094 100644
--- a/modules/virtualisation/libvirtd.nix
+++ b/modules/virtualisation/libvirtd.nix
@@ -28,8 +28,8 @@ in
         description =
           ''
             This option enables libvirtd, a daemon that manages
-            virtual machines.  You can interact with the daemon
-            (e.g. to start or stop VMs) using the
+            virtual machines. Users in the "libvirtd" group can interact with
+            the daemon (e.g. to start or stop VMs) using the
             <command>virsh</command> command line tool, among others.
           '';
       };
-- 
GitLab


From 10133f0b5b30e4d36a0c66742e1483d126d86f28 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Sat, 17 Aug 2013 10:35:56 +0200
Subject: [PATCH 4834/5331] Add /etc/ssl/certs/ca-certificates.crt symlink for
 Ubuntu compatibility

NixOS and Fedora uses .../ca-bundle.crt. Ubuntu uses
.../ca-certificates.crt. Add .../ca-certificates.crt symlink to be
compatible with Ubuntu.

Example use case: Bob has a ~/.msmtprc file that he brings over from
Ubuntu. It also works on NixOS.
---
 modules/security/ca.nix | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/modules/security/ca.nix b/modules/security/ca.nix
index e42f5ffe3b8..0fcfc446d42 100644
--- a/modules/security/ca.nix
+++ b/modules/security/ca.nix
@@ -7,8 +7,15 @@ with pkgs.lib;
   config = {
 
     environment.etc =
-      [ { source = "${pkgs.cacert}/etc/ca-bundle.crt";
-          target = "ssl/certs/ca-bundle.crt";
+      [
+        # Provide both Fedora and Ubuntu certificate locations for
+        # compatibility.
+        { source = "${pkgs.cacert}/etc/ca-bundle.crt";
+          target = "ssl/certs/ca-bundle.crt"; # Same location as in Fedora
+        }
+
+        { source = "${pkgs.cacert}/etc/ca-bundle.crt";
+          target = "ssl/certs/ca-certificates.crt"; # Same location as in Ubuntu
         }
 
         # Backward compatibility; may remove at some point.
-- 
GitLab


From d17d1636b12f8ef0f8e5039bb78642b3df204657 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Sun, 18 Aug 2013 17:46:07 +0200
Subject: [PATCH 4835/5331] Revert "Add /etc/ssl/certs/ca-certificates.crt
 symlink for Ubuntu compatibility"

This reverts commit 10133f0b5b30e4d36a0c66742e1483d126d86f28.

See discussion at https://github.com/NixOS/nixos/pull/224
---
 modules/security/ca.nix | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

diff --git a/modules/security/ca.nix b/modules/security/ca.nix
index 0fcfc446d42..e42f5ffe3b8 100644
--- a/modules/security/ca.nix
+++ b/modules/security/ca.nix
@@ -7,15 +7,8 @@ with pkgs.lib;
   config = {
 
     environment.etc =
-      [
-        # Provide both Fedora and Ubuntu certificate locations for
-        # compatibility.
-        { source = "${pkgs.cacert}/etc/ca-bundle.crt";
-          target = "ssl/certs/ca-bundle.crt"; # Same location as in Fedora
-        }
-
-        { source = "${pkgs.cacert}/etc/ca-bundle.crt";
-          target = "ssl/certs/ca-certificates.crt"; # Same location as in Ubuntu
+      [ { source = "${pkgs.cacert}/etc/ca-bundle.crt";
+          target = "ssl/certs/ca-bundle.crt";
         }
 
         # Backward compatibility; may remove at some point.
-- 
GitLab


From 4628fd8434582592c3b5929bb8244b07c4007f3f Mon Sep 17 00:00:00 2001
From: Jaka Hudoklin <jakahudoklin@gmail.com>
Date: Mon, 19 Aug 2013 04:14:53 +0200
Subject: [PATCH 4836/5331] graphite: Refactor options, serve with waitress

---
 modules/services/monitoring/graphite.nix | 243 +++++++++++++----------
 1 file changed, 135 insertions(+), 108 deletions(-)

diff --git a/modules/services/monitoring/graphite.nix b/modules/services/monitoring/graphite.nix
index 43fc7be0063..8ed045e5eb5 100644
--- a/modules/services/monitoring/graphite.nix
+++ b/modules/services/monitoring/graphite.nix
@@ -13,130 +13,145 @@ in {
   ###### interface
 
   options.services.graphite = {
-    carbon = mkOption {
-      description = "Content of carbon configuration file";
-      default = "";
-      type = types.uniq types.string;
-    };
+    web = {
+      enable = mkOption {
+        description = "Whether to enable graphite web frontend";
+        default = false;
+        type = types.uniq types.bool;
+      };
 
-    enableCarbonCache = mkOption {
-      description = "Whether to enable carbon cache, the graphite storage daemon";
-      default = false;
-      type = types.uniq types.bool;
-    };
+      host = mkOption {
+        description = "Graphite web frontend listen address";
+        default = "127.0.0.1";
+        types = type.uniq types.string;
+      };
 
-    storageAggregation = mkOption {
-      description = "Defines how to aggregate data to lower-precision retentions";
-      default = null;
-      type = types.uniq (types.nullOr types.string);
-      example = ''
-        [all_min]
-        pattern = \.min$
-        xFilesFactor = 0.1
-        aggregationMethod = min
-      '';
+      port = mkOption {
+        description = "Graphite web frontend port";
+        default = "8080";
+        types = type.uniq types.string;
+      };
     };
 
-    storageSchemas = mkOption {
-      description = "Defines retention rates for storing metrics";
-      default = "";
-      type = types.uniq (types.nullOr types.string);
-      example = ''
-        [apache_busyWorkers]
-        pattern = ^servers\.www.*\.workers\.busyWorkers$
-        retentions = 15s:7d,1m:21d,15m:5y
-      '';
-    };
+    carbon = {
+      config = mkOption {
+        description = "Content of carbon configuration file";
+        default = "";
+        type = types.uniq types.string;
+      };
 
-    blacklist = mkOption {
-      description = "Any metrics received which match one of the experssions will be dropped";
-      default = null;
-      type = types.uniq (types.nullOr types.string);
-      example = "^some\.noisy\.metric\.prefix\..*";
-    };
+      enableCache = mkOption {
+        description = "Whether to enable carbon cache, the graphite storage daemon";
+        default = false;
+        type = types.uniq types.bool;
+      };
 
-    whitelist = mkOption {
-      description = "Only metrics received which match one of the experssions will be persisted";
-      default = null;
-      type = types.uniq (types.nullOr types.string);
-      example = ".*";
-    };
+      storageAggregation = mkOption {
+        description = "Defines how to aggregate data to lower-precision retentions";
+        default = null;
+        type = types.uniq (types.nullOr types.string);
+        example = ''
+          [all_min]
+          pattern = \.min$
+          xFilesFactor = 0.1
+         aggregationMethod = min
+        '';
+      };
 
-    rewriteRules = mkOption {
-      description = "Regular expression patterns that can be used to rewrite metric names in a search and replace fashion";
-      default = null;
-      type = types.uniq (types.nullOr types.string);
-      example = ''
-        [post]
-        _sum$ =
-        _avg$ =
-      '';
-    };
+      storageSchemas = mkOption {
+        description = "Defines retention rates for storing metrics";
+        default = "";
+        type = types.uniq (types.nullOr types.string);
+        example = ''
+          [apache_busyWorkers]
+          pattern = ^servers\.www.*\.workers\.busyWorkers$
+          retentions = 15s:7d,1m:21d,15m:5y
+        '';
+      };
 
-    enableCarbonRelay = mkOption {
-      description = "Whether to enable carbon relay, the carbon replication and sharding service";
-      default = false;
-      type = types.uniq types.bool;
-    };
+      blacklist = mkOption {
+        description = "Any metrics received which match one of the experssions will be dropped";
+        default = null;
+        type = types.uniq (types.nullOr types.string);
+        example = "^some\.noisy\.metric\.prefix\..*";
+      };
 
-    relayRules = mkOption {
-      description = "Relay rules are used to send certain metrics to a certain backend.";
-      default = null;
-      type = types.uniq (types.nullOr types.string);
-      example = ''
-        [example]
-        pattern = ^mydata\.foo\..+
-        servers = 10.1.2.3, 10.1.2.4:2004, myserver.mydomain.com
-      '';
-    };
+      whitelist = mkOption {
+        description = "Only metrics received which match one of the experssions will be persisted";
+        default = null;
+        type = types.uniq (types.nullOr types.string);
+        example = ".*";
+      };
 
-    enableCarbonAggregator = mkOption {
-      description = "Whether to enable carbon agregator, the carbon buffering service";
-      default = false;
-      type = types.uniq types.bool;
-    };
+      rewriteRules = mkOption {
+        description = "Regular expression patterns that can be used to rewrite metric names in a search and replace fashion";
+        default = null;
+        type = types.uniq (types.nullOr types.string);
+        example = ''
+          [post]
+          _sum$ =
+          _avg$ =
+        '';
+      };
 
-    aggregationRules = mkOption {
-      description = "Defines if and how received metrics will be agregated";
-      default = null;
-      type = types.uniq (types.nullOr types.string);
-      example = ''
-        <env>.applications.<app>.all.requests (60) = sum <env>.applications.<app>.*.requests
-        <env>.applications.<app>.all.latency (60) = avg <env>.applications.<app>.*.latency
-      '';
-    };
+      enableRelay = mkOption {
+        description = "Whether to enable carbon relay, the carbon replication and sharding service";
+        default = false;
+        type = types.uniq types.bool;
+      };
 
-    enableGraphiteWeb = mkOption {
-      description = "Whether to enable graphite web frontend";
-      default = false;
-      type = types.uniq types.bool;
-    };
+      relayRules = mkOption {
+        description = "Relay rules are used to send certain metrics to a certain backend.";
+        default = null;
+        type = types.uniq (types.nullOr types.string);
+        example = ''
+          [example]
+          pattern = ^mydata\.foo\..+
+          servers = 10.1.2.3, 10.1.2.4:2004, myserver.mydomain.com
+        '';
+      };
 
+      enableAggregator = mkOption {
+        description = "Whether to enable carbon agregator, the carbon buffering service";
+        default = false;
+        type = types.uniq types.bool;
+      };
+
+      aggregationRules = mkOption {
+        description = "Defines if and how received metrics will be agregated";
+        default = null;
+        type = types.uniq (types.nullOr types.string);
+        example = ''
+          <env>.applications.<app>.all.requests (60) = sum <env>.applications.<app>.*.requests
+          <env>.applications.<app>.all.latency (60) = avg <env>.applications.<app>.*.latency
+        '';
+      };
+    };
   };
 
   ###### implementation
 
-  config = mkIf (cfg.enableCarbonAggregator || cfg.enableCarbonCache || cfg.enableCarbonRelay || cfg.enableGraphiteWeb) {
+  config = mkIf (cfg.carbon.enableAggregator || cfg.carbon.enableCache || cfg.cabon.enableRelay || cfg.web.enable) {
     environment.etc = lists.filter (el: el.source != null) [
-      { source = writeTextOrNull "carbon.conf" cfg.carbon;
+      { source = writeTextOrNull "carbon.conf" cfg.carbon.config;
         target = "graphite/carbon.conf"; }
-      { source = writeTextOrNull "storage-agregation.conf" cfg.storageAggregation;
+      { source = writeTextOrNull "storage-agregation.conf" cfg.carbon.storageAggregation;
         target = "graphite/storage-agregation.conf"; }
-      { source = writeTextOrNull "storage-schemas.conf" cfg.storageSchemas;
+      { source = writeTextOrNull "storage-schemas.conf" cfg.carbon.storageSchemas;
         target = "graphite/storage-schemas.conf"; }
-      { source = writeTextOrNull "blacklist.conf" cfg.blacklist;
+      { source = writeTextOrNull "blacklist.conf" cfg.carbon.blacklist;
         target = "graphite/blacklist.conf"; }
-      { source = writeTextOrNull "whitelist.conf" cfg.whitelist;
+      { source = writeTextOrNull "whitelist.conf" cfg.carbon.whitelist;
         target = "graphite/whitelist.conf"; }
-      { source = writeTextOrNull "rewrite-rules.conf" cfg.rewriteRules;
+      { source = writeTextOrNull "rewrite-rules.conf" cfg.carbon.rewriteRules;
         target = "graphite/rewrite-rules.conf"; }
-      { source = writeTextOrNull "relay-rules.conf" cfg.relayRules;
+      { source = writeTextOrNull "relay-rules.conf" cfg.carbon.relayRules;
         target = "graphite/relay-rules.conf"; }
-      { source = writeTextOrNull "aggregation-rules.conf" cfg.aggregationRules;
+      { source = writeTextOrNull "aggregation-rules.conf" cfg.carbon.aggregationRules;
         target = "graphite/aggregation-rules.conf"; }
     ];
 
-    systemd.services.carbonCache = mkIf cfg.enableCarbonCache {
+    systemd.services.carbonCache = mkIf cfg.carbon.enableCache {
       description = "Graphite data storage backend";
       wantedBy = [ "multi-user.target" ];
       after = [ "network-interfaces.target" ];
@@ -150,15 +165,15 @@ in {
         Group = "graphite";
       };
       restartTriggers = [
-        pkgs.pythonPackages.carbon cfg.carbon
-        cfg.storageAggregation cfg.storageSchemas cfg.rewriteRules
+        pkgs.pythonPackages.carbon cfg.carbon.config cfg.carbon.storageAggregation
+        cfg.carbon.storageSchemas cfg.carbon.rewriteRules
       ];
       preStart = ''
         mkdir -p ${dataDir}/whisper
       '';
     };
 
-    systemd.services.carbonAggregator = mkIf cfg.enableCarbonAggregator {
+    systemd.services.carbonAggregator = mkIf cfg.carbon.enableAggregator {
       description = "Carbon data aggregator";
       wantedBy = [ "multi-user.target" ];
       after = [ "network-interfaces.target" ];
@@ -171,10 +186,12 @@ in {
         User = "graphite";
         Group = "graphite";
       };
-      restartTriggers = [ pkgs.pythonPackages.carbon cfg.carbon cfg.aggregationRules ];
+      restartTriggers = [
+        pkgs.pythonPackages.carbon cfg.carbon.config cfg.carbon.aggregationRules
+      ];
     };
 
-    systemd.services.carbonRelay = mkIf cfg.enableCarbonRelay {
+    systemd.services.carbonRelay = mkIf cfg.carbon.enableRelay {
       description = "Carbon data relay";
       wantedBy = [ "multi-user.target" ];
       after = [ "network-interfaces.target" ];
@@ -187,19 +204,26 @@ in {
         User = "graphite";
         Group = "graphite";
       };
-      restartTriggers = [ pkgs.pythonPackages.carbon cfg.carbon cfg.relayRules ];
+      restartTriggers = [
+        pkgs.pythonPackages.carbon cfg.carbon.config cfg.carbon.relayRules
+      ];
     };
 
-    systemd.services.graphiteWeb = mkIf cfg.enableGraphiteWeb {
+    systemd.services.graphiteWeb = mkIf cfg.web.enable {
       description = "Graphite web interface";
       wantedBy = [ "multi-user.target" ];
       after = [ "network-interfaces.target" ];
       environment = {
+        PYTHONPATH = "${pkgs.python27Packages.graphite_web}/lib/python2.7/site-packages";
+        DJANGO_SETTINGS_MODULE = "graphite.settings";
         GRAPHITE_CONF_DIR = "/etc/graphite/";
         GRAPHITE_STORAGE_DIR = "${dataDir}";
       };
       serviceConfig = {
-        ExecStart = "${pkgs.pythonPackages.graphite_web}/bin/run-graphite-devel-server.py ${pkgs.pythonPackages.graphite_web}";
+        ExecStart = ''
+          ${pkgs.python27Packages.waitress}/bin/waitress-serve \
+          --host=${cfg.web.host} --port=${cfg.web.port} \
+          --call django.core.handlers.wsgi:WSGIHandler'';
         User = "graphite";
         Group = "graphite";
       };
@@ -208,19 +232,22 @@ in {
           mkdir -p ${dataDir}/{whisper/,log/webapp/}
 
           # populate database
-          ${pkgs.pythonPackages.graphite_web}/bin/manage-graphite.py syncdb --noinput
+          ${pkgs.python27Packages.graphite_web}/bin/manage-graphite.py syncdb --noinput
 
           # create index
-          ${pkgs.pythonPackages.graphite_web}/bin/build-index.sh
+          ${pkgs.python27Packages.graphite_web}/bin/build-index.sh
 
           touch ${dataDir}/db-created
         fi
       '';
-      restartTriggers = [ pkgs.pythonPackages.graphite_web ];
+      restartTriggers = [
+        pkgs.python27Packages.graphite_web pkgs.python27Packages.waitress
+      ];
     };
 
     environment.systemPackages = [
-      pkgs.pythonPackages.carbon pkgs.pythonPackages.graphite_web pkgs.pythonPackages.django_1_3
+      pkgs.pythonPackages.carbon pkgs.python27Packages.graphite_web
+      pkgs.python27Packages.waitress
     ];
 
     users.extraUsers = singleton {
-- 
GitLab


From 71a21704dcadbf50eaffb2b80328c93875574d7a Mon Sep 17 00:00:00 2001
From: Rob Vermaas <rob.vermaas@gmail.com>
Date: Mon, 19 Aug 2013 10:21:31 +0200
Subject: [PATCH 4837/5331] Fix typoe in graphite module (cabon -> carbon).

---
 modules/services/monitoring/graphite.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/services/monitoring/graphite.nix b/modules/services/monitoring/graphite.nix
index 8ed045e5eb5..ae03f7f69aa 100644
--- a/modules/services/monitoring/graphite.nix
+++ b/modules/services/monitoring/graphite.nix
@@ -131,7 +131,7 @@ in {
 
   ###### implementation
 
-  config = mkIf (cfg.carbon.enableAggregator || cfg.carbon.enableCache || cfg.cabon.enableRelay || cfg.web.enable) {
+  config = mkIf (cfg.carbon.enableAggregator || cfg.carbon.enableCache || cfg.carbon.enableRelay || cfg.web.enable) {
     environment.etc = lists.filter (el: el.source != null) [
       { source = writeTextOrNull "carbon.conf" cfg.carbon.config;
         target = "graphite/carbon.conf"; }
-- 
GitLab


From 1ff7584a3097d966d2d1ff85f83bd2a872251dd6 Mon Sep 17 00:00:00 2001
From: Rickard Nilsson <rickynils@gmail.com>
Date: Tue, 20 Aug 2013 13:36:01 +0200
Subject: [PATCH 4838/5331] networkmanager: Add option for appending DNS
 settings

If the option is enabled, the DNS servers from networking.nameservers
will be inserted in /etc/resolv.conf after the DNS servers that
NetworkManager receieves by DHCP, or that is configured manually
in the connection settings.
---
 .../services/networking/networkmanager.nix    | 19 +++++++++++++++----
 1 file changed, 15 insertions(+), 4 deletions(-)

diff --git a/modules/services/networking/networkmanager.nix b/modules/services/networking/networkmanager.nix
index 75db6bf51ad..7750f3d06f6 100644
--- a/modules/services/networking/networkmanager.nix
+++ b/modules/services/networking/networkmanager.nix
@@ -46,8 +46,8 @@ let
 
   overrideNameserversScript = writeScript "02overridedns" ''
     #!/bin/sh
-    ${pkgs.gnused}/bin/sed -i '/nameserver /d' /etc/resolv.conf
-    ${pkgs.lib.concatStringsSep ";" (map (s: "echo 'nameserver ${s}' >> /etc/resolv.conf") config.networking.nameservers)}
+    ${optionalString cfg.overrideNameservers "${gnused}/bin/sed -i '/nameserver /d' /etc/resolv.conf"}
+    ${concatStringsSep ";" (map (s: "echo 'nameserver ${s}' >> /etc/resolv.conf") config.networking.nameservers)}
   '';
 
 in {
@@ -84,7 +84,18 @@ in {
         description = ''
           If enabled, any nameservers received by DHCP or configured in
           NetworkManager will be replaced by the nameservers configured
-          in the <literal>networking.nameservers</literal> option.
+          in the <literal>networking.nameservers</literal> option. This
+          option overrides the <literal>appendNameservers</literal> option
+          if both are enabled.
+        '';
+      };
+
+      appendNameservers = mkOption {
+        default = false;
+        description = ''
+          If enabled, the name servers configured in the
+          <literal>networking.nameservers</literal> option will be appended
+          to the ones configured in NetworkManager or received by DHCP.
         '';
       };
 
@@ -117,7 +128,7 @@ in {
       { source = "${networkmanager_openconnect}/etc/NetworkManager/VPN/nm-openconnect-service.name";
         target = "NetworkManager/VPN/nm-openconnect-service.name";
       }
-    ] ++ pkgs.lib.optional cfg.overrideNameservers
+    ] ++ pkgs.lib.optional (cfg.overrideNameservers || cfg.appendNameservers)
            { source = overrideNameserversScript;
              target = "NetworkManager/dispatcher.d/02overridedns";
            };
-- 
GitLab


From 81eebecd1504416f6ac593f14c45fd1910cd6f10 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 19 Aug 2013 17:42:57 +0200
Subject: [PATCH 4839/5331] Manual: Describe NixOS package management styles

---
 doc/manual/configuration.xml | 294 +++++++++++++++++++++++++++++++++++
 doc/manual/installation.xml  |   2 +-
 2 files changed, 295 insertions(+), 1 deletion(-)

diff --git a/doc/manual/configuration.xml b/doc/manual/configuration.xml
index 41f010d10b3..daee0248e88 100644
--- a/doc/manual/configuration.xml
+++ b/doc/manual/configuration.xml
@@ -11,6 +11,300 @@ NixOS machine through the configuration file
 effect after you run <command>nixos-rebuild</command>.</para>
 
 
+<!--===============================================================-->
+
+<section><title>Package management</title>
+
+<para>This section describes how to add additional packages to your
+system.  NixOS has two distinct styles of package management:
+
+<itemizedlist>
+
+  <listitem><para><emphasis>Declarative</emphasis>, where you declare
+  what packages you want in your
+  <filename>configuration.nix</filename>.  Every time you run
+  <command>nixos-rebuild</command>, NixOS will ensure that you get a
+  consistent set of binaries corresponding to your
+  specification.</para></listitem>
+
+  <listitem><para><emphasis>Ad hoc</emphasis>, where you install,
+  upgrade and uninstall packages via the <command>nix-env</command>
+  command.  This style allows mixing packages from different Nixpkgs
+  versions.  It’s the only choice for non-root
+  users.</para></listitem>
+
+</itemizedlist>
+
+</para>
+
+<para>The next two sections describe these two styles.</para>
+
+
+<section><title>Declarative package management</title>
+
+<para>With declarative package management, you specify which packages
+you want on your system by setting the option
+<option>environment.systemPackages</option>.  For instance, adding the
+following line to <filename>configuration.nix</filename> enables the
+Mozilla Thunderbird email application:
+
+<programlisting>
+environment.systemPackages = [ pkgs.thunderbird ];
+</programlisting>
+
+The effect of this specification is that the Thunderbird package from
+Nixpkgs will be built or downloaded as part of the system when you run
+<command>nixos-rebuild switch</command>.</para>
+
+<para>You can get a list of the available packages as follows:
+<screen>
+$ nix-env -qaP '*' --description
+nixos.pkgs.firefox   firefox-23.0   Mozilla Firefox - the browser, reloaded
+<replaceable>...</replaceable>
+</screen>
+
+The first column in the output is the <emphasis>attribute
+name</emphasis>, such as
+<literal>nixos.pkgs.thunderbird</literal>. (The
+<literal>nixos</literal> prefix allows distinguishing between
+different channels that you might have.)</para>
+
+<para>To “uninstall” a package, simply remove it from
+<option>environment.systemPackages</option> and run
+<command>nixos-rebuild switch</command>.</para>
+
+
+<section><title>Customising packages</title>
+
+<para>Some packages in Nixpkgs have options to enable or disable
+optional functionality or change other aspects of the package.  For
+instance, the Firefox wrapper package (which provides Firefox with a
+set of plugins such as the Adobe Flash player) has an option to enable
+the Google Talk plugin.  It can be set in
+<filename>configuration.nix</filename> as follows:
+
+<filename>
+nixpkgs.config.firefox.enableGoogleTalkPlugin = true;
+</filename>
+</para>
+
+<warning><para>Unfortunately, Nixpkgs currently lacks a way to query
+available configuration options.</para></warning>
+
+<para>Apart from high-level options, it’s possible to tweak a package
+in almost arbitrary ways, such as changing or disabling dependencies
+of a package.  For instance, the Emacs package in Nixpkgs by default
+has a dependency on GTK+ 2.  If you want to build it against GTK+ 3,
+you can specify that as follows:
+
+<programlisting>
+environment.systemPackages = [ (pkgs.emacs.override { gtk = pkgs.gtk3; }) ];
+</programlisting>
+
+The function <varname>override</varname> performs the call to the Nix
+function that produces Emacs, with the original arguments amended by
+the set of arguments specified by you.  So here the function argument
+<varname>gtk</varname> gets the value <literal>pkgs.gtk3</literal>,
+causing Emacs to depend on GTK+ 3.  (The parentheses are necessary
+because in Nix, function application binds more weakly than list
+construction, so without them,
+<literal>environment.systemPackages</literal> would be a list with two
+elements.)</para>
+
+<para>Even greater customisation is possible using the function
+<varname>overrideDerivation</varname>.  While the
+<varname>override</varname> mechanism above overrides the arguments of
+a package function, <varname>overrideDerivation</varname> allows
+changing the <emphasis>result</emphasis> of the function.  This
+permits changing any aspect of the package, such as the source code.
+For instance, if you want to override the source code of Emacs, you
+can say:
+
+<programlisting>
+environment.systemPackages =
+  [ (pkgs.lib.overrideDerivation pkgs.emacs (attrs: {
+      name = "emacs-25.0-pre";
+      src = /path/to/my/emacs/tree;
+    }))
+  ];
+</programlisting>
+
+Here, <varname>overrideDerivation</varname> takes the Nix derivation
+specified by <varname>pkgs.emacs</varname> and produces a new
+derivation in which the original’s <literal>name</literal> and
+<literal>src</literal> attribute have been replaced by the given
+values.  The original attributes are accessible via
+<varname>attrs</varname>.</para>
+
+<para>The overrides shown above are not global.  They do not affect
+the original package; other packages in Nixpkgs continue to depend on
+the original rather than the customised package.  This means that if
+another package in your system depends on the original package, you
+end up with two instances of the package.  If you want to have
+everything depend on your customised instance, you can apply a
+<emphasis>global</emphasis> override as follows:
+
+<screen>
+nixpkgs.config.packageOverrides = pkgs:
+  { emacs = pkgs.emacs.override { gtk = pkgs.gtk3; };
+  };
+</screen>
+
+The effect of this definition is essentially equivalent to modifying
+the <literal>emacs</literal> attribute in the Nixpkgs source tree.
+Any package in Nixpkgs that depends on <literal>emacs</literal> will
+be passed your customised instance.  (However, the value
+<literal>pkgs.emacs</literal> in
+<varname>nixpkgs.config.packageOverrides</varname> refers to the
+original rather than overriden instance, to prevent an infinite
+recursion.)</para>
+
+</section>
+
+<section><title>Adding custom packages</title>
+
+<para>It’s possible that a package you need is not available in NixOS.
+In that case, you can do two things.  First, you can clone the Nixpkgs
+repository, add the package to your clone, and (optionally) submit a
+patch or pull request to have it accepted into the main Nixpkgs
+repository.  This is described in detail in the <link
+xlink:href="http://hydra.nixos.org/job/nixpkgs/trunk/tarball/latest/download-by-type/doc/manual">Nixpkgs
+manual</link>.  In short, you clone Nixpkgs:
+
+<screen>
+$ git clone git://github.com/NixOS/nixpkgs.git
+$ cd nixpkgs
+</screen>
+
+Then you write and test the package as described in the Nixpkgs
+manual.  Finally, you add it to
+<literal>environment.systemPackages</literal>, e.g.
+
+<programlisting>
+environment.systemPackages = [ pkgs.my-package ];
+</programlisting>
+
+and you run <command>nixos-rebuild</command>, specifying your own
+Nixpkgs tree:
+
+<screen>
+$ nixos-rebuild switch -I nixpkgs=/path/to/my/nixpkgs</screen>
+
+</para>
+
+<para>The second possibility is to add the package outside of the
+Nixpkgs tree.  For instance, here is how you specify a build of the
+<link xlink:href="http://www.gnu.org/software/hello/">GNU Hello</link>
+package directly in <filename>configuration.nix</filename>:
+
+<programlisting>
+environment.systemPackages =
+  let
+    my-hello = with pkgs; stdenv.mkDerivation rec {
+      name = "hello-2.8";
+      src = fetchurl {
+        url = "mirror://gnu/hello/${name}.tar.gz";
+        sha256 = "0wqd8sjmxfskrflaxywc7gqw7sfawrfvdxd9skxawzfgyy0pzdz6";
+      };
+    };
+  in
+  [ my-hello ];
+</programlisting>
+
+Of course, you can also move the definition of
+<literal>my-hello</literal> into a separate Nix expression, e.g.
+<programlisting>
+environment.systemPackages = [ (import ./my-hello.nix) ];
+</programlisting>
+where <filename>my-hello.nix</filename> contains:
+<programlisting>
+with &lt;nixpkgs> {}; # bring all of Nixpkgs into scope
+
+stdenv.mkDerivation rec {
+  name = "hello-2.8";
+  src = fetchurl {
+    url = "mirror://gnu/hello/${name}.tar.gz";
+    sha256 = "0wqd8sjmxfskrflaxywc7gqw7sfawrfvdxd9skxawzfgyy0pzdz6";
+  };
+}
+</programlisting>
+
+This allows testing the package easily:
+<screen>
+$ nix-build my-hello.nix
+$ ./result/bin/hello
+Hello, world!
+</screen>
+
+</para>
+
+</section>
+
+</section>
+
+
+<section><title>Ad hoc package management</title>
+
+<para>With the command <command>nix-env</command>, you can install and
+uninstall packages from the command line.  For instance, to install
+Mozilla Thunderbird:
+
+<screen>
+$ nix-env -iA nixos.pkgs.thunderbird</screen>
+
+If you invoke this as root, the package is installed in the Nix
+profile <filename>/nix/var/nix/profiles/default</filename> and visible
+to all users of the system; otherwise, the package ends up in
+<filename>/nix/var/nix/profiles/per-user/<replaceable>username</replaceable>/profile</filename>
+and is not visible to other users.  The <option>-A</option> flag
+specifies the package by its attribute name; without it, the package
+is installed by matching against its package name
+(e.g. <literal>thunderbird</literal>).  The latter is slower because
+it requires matching against all available Nix packages, and is
+ambiguous if there are multiple matching packages.</para>
+
+<para>Packages come from the NixOS channel.  You typically upgrade a
+package by updating to the latest version of the NixOS channel:
+<screen>
+$ nix-channel --update nixos
+</screen>
+and then running <literal>nix-env -i</literal> again.  Other packages
+in the profile are <emphasis>not</emphasis> affected; this is the
+crucial difference with the declarative style of package management,
+where running <command>nixos-rebuild switch</command> causes all
+packages to be updated to their current versions in the NixOS channel.
+You can however upgrade all packages for which there is a newer
+version by doing:
+<screen>
+$ nix-env -u '*'
+</screen>
+</para>
+
+<para>A package can be unstalled using the <option>-e</option>
+flag:
+<screen>
+$ nix-env -e thunderbird
+</screen>
+</para>
+
+<para>Finally, you can roll back an undesirable
+<command>nix-env</command> action:
+<screen>
+$ nix-env --rollback
+</screen>
+</para>
+
+<para><command>nix-env</command> has many more flags.  For details,
+see the
+<citerefentry><refentrytitle>nix-env</refentrytitle><manvolnum>1</manvolnum></citerefentry>
+manpage or the Nix manual.</para>
+
+</section>
+
+
+</section>
+
+
 <!--===============================================================-->
 
 <section><title>Networking</title>
diff --git a/doc/manual/installation.xml b/doc/manual/installation.xml
index 40a2efa1405..3068fa5cb94 100644
--- a/doc/manual/installation.xml
+++ b/doc/manual/installation.xml
@@ -307,7 +307,7 @@ available.</para>
 
 <!--===============================================================-->
 
-<section>
+<section xml:id="sec-upgrading">
 
 <title>Upgrading NixOS</title>
 
-- 
GitLab


From 884b4c6137d130d34ee527e6b18032e4f50945dd Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 19 Aug 2013 18:19:52 +0200
Subject: [PATCH 4840/5331] Manual: Document user management

---
 doc/manual/configuration.xml | 87 ++++++++++++++++++++++++++++++++++++
 doc/manual/running.xml       |  5 +++
 2 files changed, 92 insertions(+)

diff --git a/doc/manual/configuration.xml b/doc/manual/configuration.xml
index daee0248e88..6a217243c00 100644
--- a/doc/manual/configuration.xml
+++ b/doc/manual/configuration.xml
@@ -305,6 +305,93 @@ manpage or the Nix manual.</para>
 </section>
 
 
+<!--===============================================================-->
+
+<section><title>User management</title>
+
+<para>NixOS supports both declarative and imperative styles of user
+management.  In the declarative style, users are specified in
+<filename>configuration.nix</filename>.  For instance, the following
+states that a user accound named <literal>alice</literal> shall exist:
+
+<programlisting>
+users.extraUsers.alice =
+  { createHome = true;
+    home = "/home/alice";
+    description = "Alice Foobar";
+    extraGroups = [ "wheel" ];
+    isSystemUser = false;
+    useDefaultShell = true;
+    openssh.authorizedKeys.keys = [ "ssh-dss AAAAB3Nza... alice@foobar" ];
+  };
+</programlisting>
+
+Note that <literal>alice</literal> is a member of the
+<literal>wheel</literal> group, which allows her to use
+<command>sudo</command> to execute commands as
+<literal>root</literal>.  Also note the SSH public key that allows
+remote logins with the corresponding private key.  Users created in
+this way do not have a password by default, so they cannot log in via
+mechanisms that require a password.  However, you can use the
+<command>passwd</command> program to set a password, which is retained
+across invocations of <command>nixos-rebuild</command>.</para>
+
+<para>A user ID (uid) is assigned automatically.  You can also specify
+a uid manually by adding
+
+<programlisting>
+    uid = 1000;
+</programlisting>
+
+to the user specification.</para>
+
+<para>Groups can be specified similarly.  The following states that a
+group named <literal>students</literal> shall exist:
+
+<programlisting>
+users.extraGroups.students.gid = 1000;
+</programlisting>
+
+As with users, the group ID (gid) is optional and will be assigned
+automatically if it’s missing.</para>
+
+<warning><para>Currently declarative user management is not perfect:
+<command>nixos-rebuild</command> does not know how to realise certain
+configuration changes.  This includes removing a user or group, and
+removing group membership from a user.</para></warning>
+
+<para>In the imperative style, users and groups are managed by
+commands such as <command>useradd</command>,
+<command>groupmod</command> and so on.  For instance, to create a user
+account named <literal>alice</literal>:
+
+<screen>
+$ useradd -m alice</screen>
+
+The flag <option>-m</option> causes the creation of a home directory
+for the new user, which is generally what you want.  The user does not
+have an initial password and therefore cannot log in.  A password can
+be set using the <command>passwd</command> utility:
+
+<screen>
+$ passwd alice
+Enter new UNIX password: ***
+Retype new UNIX password: ***
+</screen>
+
+A user can be deleted using <command>userdel</command>:
+
+<screen>
+$ userdel -r alice</screen>
+
+The flag <option>-r</option> deletes the user’s home directory.
+Accounts can be modified using <command>usermod</command>.  Unix
+groups can be managed using <command>groupadd</command>,
+<command>groupmod</command> and <command>groupdel</command>.</para>
+
+</section>
+
+
 <!--===============================================================-->
 
 <section><title>Networking</title>
diff --git a/doc/manual/running.xml b/doc/manual/running.xml
index ac3ce40339d..5799aeec5d0 100644
--- a/doc/manual/running.xml
+++ b/doc/manual/running.xml
@@ -282,6 +282,11 @@ Dec 29 01:30:22 mandark kernel[6131]: [1053513.909444] CPU6: Core temperature ab
 
 </para>
 
+<para>The system journal is readable by root and by users in the
+<literal>wheel</literal> and <literal>systemd-journal</literal>
+groups.  All users have a private journal that can be read using
+<command>journalctl</command>.</para>
+
 </section>
 
 
-- 
GitLab


From b6d9eed8058789c380788b0ec8df2d782e50d3f7 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 20 Aug 2013 11:15:02 +0200
Subject: [PATCH 4841/5331] Manual: Document X11 configuration

---
 doc/manual/configuration.xml | 57 ++++++++++++++++++++++++++++++++++--
 1 file changed, 55 insertions(+), 2 deletions(-)

diff --git a/doc/manual/configuration.xml b/doc/manual/configuration.xml
index 6a217243c00..3ff8ca8f240 100644
--- a/doc/manual/configuration.xml
+++ b/doc/manual/configuration.xml
@@ -392,6 +392,60 @@ groups can be managed using <command>groupadd</command>,
 </section>
 
 
+<!--===============================================================-->
+
+<section><title>X11</title>
+
+<para>The X11 windowing system provides the basis of NixOS’ graphical
+user interface.  It can be enabled as follows:
+<programlisting>
+services.xserver.enable = true;
+</programlisting>
+The X server will automatically detect and use the appropriate video
+driver from a set of X.org drivers (such as <literal>vesa</literal>
+and <literal>intel</literal>).  You can also specify a driver
+manually.  For instance, to enable the proprietary NVIDIA driver, you need
+<programlisting>
+services.xserver.videoDrivers = [ "nvidia" ];
+</programlisting>
+(You may need to reboot after enabling this driver to prevent a clash
+with other kernel modules.)</para>
+
+<para>You also need to enable at least one desktop or window manager.
+Otherwise, you can only log into a plain undecorated
+<command>xterm</command> window.  Thus you should pick one or more of
+the following lines:
+<programlisting>
+services.xserver.desktopManager.kde4.enable = true;
+services.xserver.desktopManager.xfce.enable = true;
+services.xserver.windowManager.xmonad.enable = true;
+services.xserver.windowManager.twm.enable = true;
+services.xserver.windowManager.icewm.enable = true;
+</programlisting>
+</para>
+
+<para>NixOS’s default <emphasis>display manager</emphasis> (the
+program that provides a graphical login prompt and manages the X
+server) is SLiM.  You can select KDE’s <command>kdm</command> instead:
+<programlisting>
+services.xserver.displayManager.kdm.enable = true;
+</programlisting>
+</para>
+
+<para>The X server is started automatically at boot time.  If you
+don’t want this to happen, you can set:
+<programlisting>
+services.xserver.autorun = false;
+</programlisting>
+The X server can then be started manually:
+<screen>
+$ systemctl start display-manager.service
+</screen>
+</para>
+
+</section>
+
+
 <!--===============================================================-->
 
 <section><title>Networking</title>
@@ -573,8 +627,7 @@ networking.localCommands =
 </section>
 
 
-<!-- TODO: declarative package installation; X11; user management;
-     Apache; libvirtd virtualisation -->
+<!-- Apache; libvirtd virtualisation -->
 
 
 </chapter>
-- 
GitLab


From 454e3477b6561e89a6b5cf98be1a6bcf6623e7af Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 20 Aug 2013 12:36:38 +0200
Subject: [PATCH 4842/5331] Manual: Document LUKS encryption

---
 doc/manual/configuration.xml | 77 +++++++++++++++++++++++++++++++++++-
 1 file changed, 75 insertions(+), 2 deletions(-)

diff --git a/doc/manual/configuration.xml b/doc/manual/configuration.xml
index 3ff8ca8f240..a457012b528 100644
--- a/doc/manual/configuration.xml
+++ b/doc/manual/configuration.xml
@@ -394,9 +394,82 @@ groups can be managed using <command>groupadd</command>,
 
 <!--===============================================================-->
 
-<section><title>X11</title>
+<section><title>Filesystems</title>
 
-<para>The X11 windowing system provides the basis of NixOS’ graphical
+<para>You can define filesystems using the
+<option>fileSystems</option> configuration option.  For instance, the
+following definition causes NixOS to mount the Ext4 filesystem on
+device <filename>/dev/disk/by-label/data</filename> onto the mount
+point <filename>/data</filename>:
+
+<programlisting>
+fileSystems."/data" =
+  { device = "/dev/disk/by-label/data";
+    fsType = "ext4";
+  };
+</programlisting>
+
+Mount points are created automatically if they don’t already exist.
+For <option>device</option>, it’s best to use the topology-independent
+device aliases in <filename>/dev/disk/by-label</filename> and
+<filename>/dev/disk/by-uuid</filename>, as these don’t change if the
+topology changes (e.g. if a disk is moved to another IDE
+controller).</para>
+
+<para>You can usually omit the filesystem type
+(<option>fsType</option>), since <command>mount</command> can usually
+detect the type and load the necessary kernel module automatically.
+However, if the filesystem is needed at early boot (in the initial
+ramdisk) and is not <literal>ext2</literal>, <literal>ext3</literal>
+or <literal>ext4</literal>, then it’s best to specify
+<option>fsType</option> to ensure that the kernel module is
+available.</para>
+
+<section><title>LUKS-encrypted filesystems</title>
+
+<para>NixOS supports filesystems that are encrypted using
+<emphasis>LUKS</emphasis> (Linux Unified Key Setup).  For example,
+here is how you create an encrypted Ext4 filesystem on the device
+<filename>/dev/sda2</filename>:
+
+<screen>
+$ cryptsetup luksFormat /dev/sda2
+
+WARNING!
+========
+This will overwrite data on /dev/sda2 irrevocably.
+
+Are you sure? (Type uppercase yes): YES
+Enter LUKS passphrase: ***
+Verify passphrase: ***
+
+$ cryptsetup luksOpen /dev/sda2 crypted
+Enter passphrase for /dev/sda2: ***
+
+$ mkfs.ext4 /dev/mapper/crypted
+</screen>
+
+To ensure that this filesystem is automatically mounted at boot time
+as <filename>/</filename>, add the following to
+<filename>configuration.nix</filename>:
+
+<programlisting>
+boot.initrd.luks.devices = [ { device = "/dev/sda2"; name = "crypted"; } ];
+fileSystems."/".device = "/dev/mapper/crypted";
+</programlisting>
+
+</para>
+
+</section>
+
+</section>
+
+
+<!--===============================================================-->
+
+<section><title>X Window System</title>
+
+<para>The X Window System (X11) provides the basis of NixOS’ graphical
 user interface.  It can be enabled as follows:
 <programlisting>
 services.xserver.enable = true;
-- 
GitLab


From f2480af162b2721708b2e0ea3a6d01889d6058a9 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 20 Aug 2013 13:28:33 +0200
Subject: [PATCH 4843/5331] Manual: Remove "bleeding edge" remark

---
 doc/manual/manual.xml | 23 +++++++++++------------
 1 file changed, 11 insertions(+), 12 deletions(-)

diff --git a/doc/manual/manual.xml b/doc/manual/manual.xml
index ce4055a753c..7d6634bf093 100644
--- a/doc/manual/manual.xml
+++ b/doc/manual/manual.xml
@@ -21,7 +21,7 @@
     </author>
 
     <copyright>
-      <year>2007-2012</year>
+      <year>2007-2013</year>
       <holder>Eelco Dolstra</holder>
     </copyright>
 
@@ -31,20 +31,19 @@
   <preface>
     <title>Preface</title>
 
-    <para>This manual describes NixOS, a Linux distribution based on
-    the purely functional package management system Nix.</para>
+    <para>This manual describes how to install, use and extend NixOS,
+    a Linux distribution based on the purely functional package
+    management system Nix.</para>
 
-    <para>NixOS is rather bleeding edge, and this manual is
-    correspondingly sketchy and quite possibly out of date.  It gives
-    basic information on how to get NixOS up and running, but since
-    NixOS is very much a work in progress, you are likely to encounter
-    problems here and there.  Extensive familiarity with Linux is
-    recommended.  If you encounter problems, please report them on the
+    <para>If you encounter problems, please report them on the
     <literal
     xlink:href="http://lists.science.uu.nl/mailman/listinfo/nix-dev">nix-dev@lists.science.uu.nl</literal>
-    mailing list or on <link
-    xlink:href="irc://irc.freenode.net/#nixos">the
-    <literal>#nixos</literal> channel on Freenode.</link>.</para>
+    mailing list or on the <link
+    xlink:href="irc://irc.freenode.net/#nixos">
+    <literal>#nixos</literal> channel on Freenode</link>.  Bugs should
+    be reported in <link
+    xlink:href="https://github.com/NixOS/nixos/issues">NixOS’ GitHub
+    issue tracker</link>.</para>
 
   </preface>
 
-- 
GitLab


From f4c42695cb0145028e111c60fbe02994287bd825 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 20 Aug 2013 13:30:59 +0200
Subject: [PATCH 4844/5331] Manual: Add section on how to do rollbacks

---
 doc/manual/troubleshooting.xml | 46 ++++++++++++++++++++++++++++++++++
 1 file changed, 46 insertions(+)

diff --git a/doc/manual/troubleshooting.xml b/doc/manual/troubleshooting.xml
index 2961f8e1233..b78c35a35e1 100644
--- a/doc/manual/troubleshooting.xml
+++ b/doc/manual/troubleshooting.xml
@@ -81,4 +81,50 @@ just exit from the rescue shell.</para>
 </section>
 
 
+<section>
+
+<title>Rolling back configuration changes</title>
+
+<para>After running <command>nixos-rebuild</command> to switch to a
+new configuration, you may find that the new configuration doesn’t
+work very well.  In that case, there are several ways to return to a
+previous configuration.</para>
+
+<para>First, the GRUB boot manager allows you to boot into any
+previous configuration that hasn’t been garbage-collected.  These
+configurations can be found under the GRUB submenu “NixOS - All
+configurations”.  This is especially useful if the new configuration
+fails to boot.  After the system has booted, you can make the selected
+configuration the default for subsequent boots:
+
+<screen>
+$ /run/current-system/bin/switch-to-configuration boot</screen>
+
+</para>
+
+<para>Second, you can switch to the previous configuration in a running
+system:
+
+<screen>
+$ nixos-rebuild switch --rollback</screen>
+
+This is equivalent to running:
+
+<screen>
+$ /nix/var/nix/profiles/system-<replaceable>N</replaceable>-link/bin/switch-to-configuration switch</screen>
+
+where <replaceable>N</replaceable> is the number of the NixOS system
+configuration.  To get a list of the available configurations, do:
+
+<screen>
+$ ls -l /nix/var/nix/profiles/system-*-link
+<replaceable>...</replaceable>
+lrwxrwxrwx 1 root root 78 Aug 12 13:54 /nix/var/nix/profiles/system-268-link -> /nix/store/202b...-nixos-13.07pre4932_5a676e4-4be1055
+</screen>
+
+</para>
+
+</section>
+
+
 </chapter>
-- 
GitLab


From eefe0786f98e200845d5cc1811cae2b93f720201 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 20 Aug 2013 13:55:39 +0200
Subject: [PATCH 4845/5331] nixos-help: Use xdg-open if available

---
 modules/services/misc/nixos-manual.nix | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/modules/services/misc/nixos-manual.nix b/modules/services/misc/nixos-manual.nix
index 108ed2911ce..90e596fdc50 100644
--- a/modules/services/misc/nixos-manual.nix
+++ b/modules/services/misc/nixos-manual.nix
@@ -21,10 +21,18 @@ let
   help = pkgs.writeScriptBin "nixos-help"
     ''
       #! ${pkgs.stdenv.shell} -e
-      if ! ''${BROWSER:-w3m} ${entry}; then
-        echo "$0: unable to start a web browser; please set \$BROWSER or install ‘w3m’"
-        exit 1
+      browser="$BROWSER"
+      if [ -z "$browser" ]; then
+        browser="$(type -P xdg-open || true)"
+        if [ -z "$browser" ]; then
+          browser="$(type -P w3m || true)"
+          if [ -z "$browser" ]; then
+            echo "$0: unable to start a web browser; please set \$BROWSER"
+            exit 1
+          fi
+        fi
       fi
+      exec "$browser" ${entry}
     '';
 
 in
-- 
GitLab


From 2d5e83c06726bb1334d427cd46e174ba0335f57b Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 20 Aug 2013 14:20:47 +0200
Subject: [PATCH 4846/5331] Manual: Move NVIDIA stuff into its own subsection

---
 doc/manual/configuration.xml | 29 +++++++++++++++++++++++++----
 1 file changed, 25 insertions(+), 4 deletions(-)

diff --git a/doc/manual/configuration.xml b/doc/manual/configuration.xml
index a457012b528..0758c275316 100644
--- a/doc/manual/configuration.xml
+++ b/doc/manual/configuration.xml
@@ -477,12 +477,11 @@ services.xserver.enable = true;
 The X server will automatically detect and use the appropriate video
 driver from a set of X.org drivers (such as <literal>vesa</literal>
 and <literal>intel</literal>).  You can also specify a driver
-manually.  For instance, to enable the proprietary NVIDIA driver, you need
+manually, e.g.
 <programlisting>
-services.xserver.videoDrivers = [ "nvidia" ];
+services.xserver.videoDrivers = [ "r128" ];
 </programlisting>
-(You may need to reboot after enabling this driver to prevent a clash
-with other kernel modules.)</para>
+to enable X.org’s <literal>xf86-video-r128</literal> driver.</para>
 
 <para>You also need to enable at least one desktop or window manager.
 Otherwise, you can only log into a plain undecorated
@@ -516,6 +515,28 @@ $ systemctl start display-manager.service
 </screen>
 </para>
 
+
+<section><title>NVIDIA graphics cards</title>
+
+<para>NVIDIA provides a proprietary driver for its graphics cards that
+has better 3D performance than the X.org drivers.  It is not enabled
+by default because it’s not free software.  You can enable it as follows:
+<programlisting>
+services.xserver.videoDrivers = [ "nvidia" ];
+</programlisting>
+You may need to reboot after enabling this driver to prevent a clash
+with other kernel modules.</para>
+
+<para>On 64-bit systems, if you want full acceleration for 32-bit
+programs such as Wine, you should also set the following:
+<programlisting>
+service.xserver.driSupport32Bit = true;
+</programlisting>
+</para>
+
+</section>
+
+
 </section>
 
 
-- 
GitLab


From 35bb4da0e5d70a321d4fc591152a6b3129d5cdcd Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 20 Aug 2013 14:21:51 +0200
Subject: [PATCH 4847/5331] Manual: Document synaptics support

---
 doc/manual/configuration.xml | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/doc/manual/configuration.xml b/doc/manual/configuration.xml
index 0758c275316..5bcef8605ae 100644
--- a/doc/manual/configuration.xml
+++ b/doc/manual/configuration.xml
@@ -537,6 +537,23 @@ service.xserver.driSupport32Bit = true;
 </section>
 
 
+<section><title>Touchpads</title>
+
+<para>Support for Synaptics touchpads (found in many laptops such as
+the Dell Latitude series) can be enabled as follows:
+<programlisting>
+services.xserver.synaptics.enable = true;
+</programlisting>
+The driver has many options (see <xref linkend="ch-options"/>).  For
+instance, the following enables two-finger scrolling:
+<programlisting>
+services.xserver.synaptics.twoFingerScroll = true;
+</programlisting>
+</para>
+
+</section>
+
+
 </section>
 
 
-- 
GitLab


From 735ad3f4661a5bc0c4f3bcdb3b0493c785caa2d7 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 20 Aug 2013 14:24:39 +0200
Subject: [PATCH 4848/5331] Manual: "filesystem" -> "file system"

---
 doc/manual/configuration.xml     | 18 +++++++++---------
 doc/manual/man-nixos-rebuild.xml | 25 ++++++++++++-------------
 doc/manual/running.xml           |  2 +-
 3 files changed, 22 insertions(+), 23 deletions(-)

diff --git a/doc/manual/configuration.xml b/doc/manual/configuration.xml
index 5bcef8605ae..4d1ad549f0f 100644
--- a/doc/manual/configuration.xml
+++ b/doc/manual/configuration.xml
@@ -394,11 +394,11 @@ groups can be managed using <command>groupadd</command>,
 
 <!--===============================================================-->
 
-<section><title>Filesystems</title>
+<section><title>File systems</title>
 
-<para>You can define filesystems using the
+<para>You can define file systems using the
 <option>fileSystems</option> configuration option.  For instance, the
-following definition causes NixOS to mount the Ext4 filesystem on
+following definition causes NixOS to mount the Ext4 file system on
 device <filename>/dev/disk/by-label/data</filename> onto the mount
 point <filename>/data</filename>:
 
@@ -416,20 +416,20 @@ device aliases in <filename>/dev/disk/by-label</filename> and
 topology changes (e.g. if a disk is moved to another IDE
 controller).</para>
 
-<para>You can usually omit the filesystem type
+<para>You can usually omit the file system type
 (<option>fsType</option>), since <command>mount</command> can usually
 detect the type and load the necessary kernel module automatically.
-However, if the filesystem is needed at early boot (in the initial
+However, if the file system is needed at early boot (in the initial
 ramdisk) and is not <literal>ext2</literal>, <literal>ext3</literal>
 or <literal>ext4</literal>, then it’s best to specify
 <option>fsType</option> to ensure that the kernel module is
 available.</para>
 
-<section><title>LUKS-encrypted filesystems</title>
+<section><title>LUKS-encrypted file systems</title>
 
-<para>NixOS supports filesystems that are encrypted using
+<para>NixOS supports file systems that are encrypted using
 <emphasis>LUKS</emphasis> (Linux Unified Key Setup).  For example,
-here is how you create an encrypted Ext4 filesystem on the device
+here is how you create an encrypted Ext4 file system on the device
 <filename>/dev/sda2</filename>:
 
 <screen>
@@ -449,7 +449,7 @@ Enter passphrase for /dev/sda2: ***
 $ mkfs.ext4 /dev/mapper/crypted
 </screen>
 
-To ensure that this filesystem is automatically mounted at boot time
+To ensure that this file system is automatically mounted at boot time
 as <filename>/</filename>, add the following to
 <filename>configuration.nix</filename>:
 
diff --git a/doc/manual/man-nixos-rebuild.xml b/doc/manual/man-nixos-rebuild.xml
index 0ed9f22ef99..e43dafd3cfe 100644
--- a/doc/manual/man-nixos-rebuild.xml
+++ b/doc/manual/man-nixos-rebuild.xml
@@ -133,22 +133,21 @@ $ ./result/bin/run-*-vm
       <literal>kvm-intel</literal> or <literal>kvm-amd</literal>
       kernel modules to get hardware virtualisation.</para>
 
-      <para>The VM mounts the Nix store of the host through the CIFS
-      filesystem.  (<literal>qemu-kvm</literal> automatically starts a
-      Samba daemon for this purpose.)  The host Nix store is
-      read-only, so Nix commands that modify the Nix store will not
-      work in the VM.  This includes commands such as
-      <command>nixos-rebuild</command>; to change the VM’s
-      configuration, you must halt the VM and re-run the commands
-      above.
+      <para>The VM mounts the Nix store of the host through the 9P
+      file system.  The host Nix store is read-only, so Nix commands
+      that modify the Nix store will not work in the VM.  This
+      includes commands such as <command>nixos-rebuild</command>; to
+      change the VM’s configuration, you must halt the VM and re-run
+      the commands above.
       </para>
 
-      <para>The VM has its own <literal>ext3</literal> root
-      filesystem, which is automatically created when the VM is first
+      <para>The VM has its own <literal>ext3</literal> root file
+      system, which is automatically created when the VM is first
       started, and is persistent across reboots of the VM.  It is
-      stored in <literal>./<replaceable>hostname</replaceable>.qcow2</literal>.
-      <!-- The entire filesystem hierarchy of the host is available in the
-      VM under <filename>/hostfs</filename>.--></para>
+      stored in
+      <literal>./<replaceable>hostname</replaceable>.qcow2</literal>.
+      <!-- The entire file system hierarchy of the host is available in
+      the VM under <filename>/hostfs</filename>.--></para>
     </listitem>
   </varlistentry>
 
diff --git a/doc/manual/running.xml b/doc/manual/running.xml
index 5799aeec5d0..27b9556c8d9 100644
--- a/doc/manual/running.xml
+++ b/doc/manual/running.xml
@@ -23,7 +23,7 @@ instance, one unit can require that another unit must be successfully
 started before the first unit can be started.  When the system boots,
 it starts a unit named <literal>default.target</literal>; the
 dependencies of this unit cause all system services to be started,
-filesystems to be mounted, swap files to be activated, and so
+file systems to be mounted, swap files to be activated, and so
 on.</para>
 
 <para>The command <command>systemctl</command> is the main way to
-- 
GitLab


From a3eaf81986b32264757e619565f11b005ed17dc3 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 20 Aug 2013 16:14:29 +0200
Subject: [PATCH 4849/5331] Manual: Kernel configuration

---
 doc/manual/configuration.xml | 68 +++++++++++++++++++++++++++++++++++-
 1 file changed, 67 insertions(+), 1 deletion(-)

diff --git a/doc/manual/configuration.xml b/doc/manual/configuration.xml
index 4d1ad549f0f..f631ee68767 100644
--- a/doc/manual/configuration.xml
+++ b/doc/manual/configuration.xml
@@ -74,7 +74,7 @@ different channels that you might have.)</para>
 <command>nixos-rebuild switch</command>.</para>
 
 
-<section><title>Customising packages</title>
+<section xml:id="sec-customising-packages"><title>Customising packages</title>
 
 <para>Some packages in Nixpkgs have options to enable or disable
 optional functionality or change other aspects of the package.  For
@@ -738,6 +738,72 @@ networking.localCommands =
 </section>
 
 
+<!--===============================================================-->
+
+<section><title>Linux kernel</title>
+
+<para>You can override the Linux kernel and associated packages using
+the option <option>boot.kernelPackages</option>.  For instance, this
+selects the Linux 3.10 kernel:
+<programlisting>
+boot.kernelPackages = pkgs.kernelPackages_3_10;
+</programlisting>
+Note that this not only replaces the kernel, but also packages that
+are specific to the kernel version, such as the NVIDIA video drivers.
+This ensures that driver packages are consistent with the
+kernel.</para>
+
+<para>The default Linux kernel configuration should be fine for most
+users.  You can see the configuration of your current kernel in
+<filename>/run/booted-system/kernel-modules/config</filename>.  If you
+want to change the kernel configuration, you can use the
+<option>packageOverrides</option> feature (see <xref
+linkend="sec-customising-packages" />).  For instance, to enable
+support for the kernel debugger KGDB:
+
+<programlisting>
+nixpkgs.config.packageOverrides = pkgs:
+  { linux_3_4 = pkgs.linux_3_4.override {
+      extraConfig =
+        ''
+          KGDB y
+        '';
+    };
+  };
+</programlisting>
+
+<varname>extraConfig</varname> takes a list of Linux kernel
+configuration options, one per line.  The name of the option should
+not include the prefix <literal>CONFIG_</literal>.  The option value
+is typically <literal>y</literal>, <literal>n</literal> or
+<literal>m</literal> (to build something as a kernel module).</para>
+
+<para>Kernel modules for hardware devices are generally loaded
+automatically by <command>udev</command>.  You can force a module to
+be loaded via <option>boot.kernelModules</option>, e.g.
+<programlisting>
+boot.kernelModules = [ "fuse" "kvm-intel" "coretemp" ];
+</programlisting>
+If the module is required early during the boot (e.g. to mount the
+root file system), you can use
+<option>boot.initrd.extraKernelModules</option>:
+<programlisting>
+boot.initrd.extraKernelModules = [ "cifs" ];
+</programlisting>
+This causes the specified modules and their dependencies to be added
+to the initial ramdark.</para>
+
+<para>Kernel runtime parameters can be set through
+<option>boot.kernel.sysctl</option>, e.g.
+<programlisting>
+boot.kernel.sysctl."net.ipv4.tcp_keepalive_time" = 120;
+</programlisting>
+sets the kernel’s TCP keepalive time to 120 seconds.  To see the
+available parameters, run <command>sysctl -a</command>.</para>
+
+</section>
+
+
 <!-- Apache; libvirtd virtualisation -->
 
 
-- 
GitLab


From 8b37dc0352ad44e9be949dbecacf6cb9e6c9b8c9 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 20 Aug 2013 16:34:00 +0200
Subject: [PATCH 4850/5331] Manual: Nix store maintenance

---
 doc/manual/running.xml | 60 ++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 60 insertions(+)

diff --git a/doc/manual/running.xml b/doc/manual/running.xml
index 27b9556c8d9..858372c1aca 100644
--- a/doc/manual/running.xml
+++ b/doc/manual/running.xml
@@ -290,4 +290,64 @@ groups.  All users have a private journal that can be read using
 </section>
 
 
+<!--===============================================================-->
+
+<section><title>Cleaning up the Nix store</title>
+
+<para>Nix has a purely functional model, meaning that packages are
+never upgraded in place.  Instead new versions of packages end up in a
+different location in the Nix store (<filename>/nix/store</filename>).
+You should periodically run Nix’s <emphasis>garbage
+collector</emphasis> to remove old, unreferenced packages.  This is
+easy:
+
+<screen>
+$ nix-collect-garbage
+</screen>
+
+Alternatively, you can use a systemd unit that does the same in the
+background:
+
+<screen>
+$ systemctl start nix-gc.service
+</screen>
+
+You can tell NixOS in <filename>configuration.nix</filename> to run
+this unit automatically at certain points in time, for instance, every
+night at 03:15:
+
+<programlisting>
+nix.gc.automatic = true;
+nix.gc.dates = "03:15";
+</programlisting>
+
+</para>
+
+<para>The commands above do not remove garbage collector roots, such
+as old system configurations.  Thus they do not remove the ability to
+roll back to previous configurations.  The following command deletes
+old roots, removing the ability to roll back to them:
+<screen>
+$ nix-collect-garbage -d
+</screen>
+You can also do this for specific profiles, e.g.
+<screen>
+$ nix-env -p /nix/var/nix/profiles/per-user/eelco/profile --delete-generations old
+</screen>
+Note that NixOS system configurations are stored in the profile
+<filename>/nix/var/nix/profiles/system</filename>.</para>
+
+<para>Another way to reclaim disk space (often as much as 40% of the
+size of the Nix store) is to run Nix’s store optimiser, which seeks
+out identical files in the store and replaces them with hard links to
+a single copy.
+<screen>
+$ nix-store --optimise
+</screen>
+Since this command needs to read the entire Nix store, it can take
+quite a while to finish.</para>
+
+</section>
+
+
 </chapter>
-- 
GitLab


From 97e8a3310f4128d4dbfc5878dc7ba142a859368a Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 20 Aug 2013 16:58:34 +0200
Subject: [PATCH 4851/5331] Manual: Document how to repair a corrupted Nix
 store

---
 doc/manual/troubleshooting.xml | 45 +++++++++++++++++++++++++++++++---
 1 file changed, 41 insertions(+), 4 deletions(-)

diff --git a/doc/manual/troubleshooting.xml b/doc/manual/troubleshooting.xml
index b78c35a35e1..fd43ff6b561 100644
--- a/doc/manual/troubleshooting.xml
+++ b/doc/manual/troubleshooting.xml
@@ -4,6 +4,8 @@
 <title>Troubleshooting</title>
 
 
+<!--===============================================================-->
+
 <section><title>Boot problems</title>
 
 <para>If NixOS fails to boot, there are a number of kernel command
@@ -65,9 +67,9 @@ unless something is very wrong.)</para>
 </section>
 
 
-<section>
+<!--===============================================================-->
 
-<title>Maintenance mode</title>
+<section><title>Maintenance mode</title>
 
 <para>You can enter rescue mode by running:
 
@@ -81,9 +83,9 @@ just exit from the rescue shell.</para>
 </section>
 
 
-<section>
+<!--===============================================================-->
 
-<title>Rolling back configuration changes</title>
+<section><title>Rolling back configuration changes</title>
 
 <para>After running <command>nixos-rebuild</command> to switch to a
 new configuration, you may find that the new configuration doesn’t
@@ -127,4 +129,39 @@ lrwxrwxrwx 1 root root 78 Aug 12 13:54 /nix/var/nix/profiles/system-268-link ->
 </section>
 
 
+<!--===============================================================-->
+
+<section><title>Nix store corruption</title>
+
+<para>After a system crash, it’s possible for files in the Nix store
+to become corrupted.  (For instance, the Ext4 file system has the
+tendency to replace un-synced files with zero bytes.)  NixOS tries
+hard to prevent this from happening: it performs a
+<command>sync</command> before switching to a new configuration, and
+Nix’s database is fully transactional.  If corruption still occurs,
+you may be able to fix it automatically.</para>
+
+<para>If the corruption is in a path in the closure of the NixOS
+system configuration, you can fix it by doing
+
+<screen>
+$ nixos-rebuild switch --repair
+</screen>
+
+This will cause Nix to check every path in the closure, and if its
+cryptographic hash differs from the hash recorded in Nix’s database,
+the path is rebuilt or redownloaded.</para>
+
+<para>You can also scan the entire Nix store for corrupt paths:
+
+<screen>
+$ nix-store --verify --check-contents --repair
+</screen>
+
+Any corrupt paths will be redownloaded if they’re available in a
+binary cache; otherwise, they cannot be repaired.</para>
+
+</section>
+
+
 </chapter>
-- 
GitLab


From d848daad94ea1750f7ec653a38f74c69ca8423d1 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 20 Aug 2013 17:11:22 +0200
Subject: [PATCH 4852/5331] Manual: Document how to deal with binary cache
 issues

---
 doc/manual/troubleshooting.xml | 31 +++++++++++++++++++++++++++++++
 1 file changed, 31 insertions(+)

diff --git a/doc/manual/troubleshooting.xml b/doc/manual/troubleshooting.xml
index fd43ff6b561..c6e0a3a7888 100644
--- a/doc/manual/troubleshooting.xml
+++ b/doc/manual/troubleshooting.xml
@@ -164,4 +164,35 @@ binary cache; otherwise, they cannot be repaired.</para>
 </section>
 
 
+<!--===============================================================-->
+
+<section><title>Nix network issues</title>
+
+<para>Nix uses a so-called <emphasis>binary cache</emphasis> to
+optimise building a package from source into downloading it as a
+pre-built binary.  That is, whenever a command like
+<command>nixos-rebuild</command> needs a path in the Nix store, Nix
+will try to download that path from the Internet rather than build it
+from source.  The default binary cache is
+<uri>http://cache.nixos.org/</uri>.  If this cache is unreachable, Nix
+operations may take a long time due to HTTP connection timeouts.  You
+can disable the use of the binary cache by adding <option>--option
+use-binary-caches false</option>, e.g.
+
+<screen>
+$ nixos-rebuild switch --option use-binary-caches false
+</screen>
+
+If you have an alternative binary cache at your disposal, you can use
+it instead:
+
+<screen>
+$ nixos-rebuild switch --option binary-caches http://my-cache.example.org/
+</screen>
+
+</para>
+
+</section>
+
+
 </chapter>
-- 
GitLab


From 2f0fa22d54283420aef41543168d8300ad1156df Mon Sep 17 00:00:00 2001
From: Jaka Hudoklin <jakahudoklin@gmail.com>
Date: Wed, 21 Aug 2013 11:43:37 +0200
Subject: [PATCH 4853/5331] Add statsd, simple daemon for easy stats
 aggregation

---
 modules/misc/ids.nix                   |  1 +
 modules/module-list.nix                |  1 +
 modules/services/monitoring/statsd.nix | 94 ++++++++++++++++++++++++++
 3 files changed, 96 insertions(+)
 create mode 100644 modules/services/monitoring/statsd.nix

diff --git a/modules/misc/ids.nix b/modules/misc/ids.nix
index d850ccc7276..91cfb88cebd 100644
--- a/modules/misc/ids.nix
+++ b/modules/misc/ids.nix
@@ -81,6 +81,7 @@ in
     supybot = 65;
     iodined = 66;
     graphite = 68;
+    statsd = 69;
 
     # When adding a uid, make sure it doesn't match an existing gid.
 
diff --git a/modules/module-list.nix b/modules/module-list.nix
index 37e68f06d3a..20ad0a014f1 100644
--- a/modules/module-list.nix
+++ b/modules/module-list.nix
@@ -125,6 +125,7 @@
   ./services/monitoring/monit.nix
   ./services/monitoring/nagios/default.nix
   ./services/monitoring/smartd.nix
+  ./services/monitoring/statsd.nix
   ./services/monitoring/systemhealth.nix
   ./services/monitoring/ups.nix
   ./services/monitoring/uptime.nix
diff --git a/modules/services/monitoring/statsd.nix b/modules/services/monitoring/statsd.nix
new file mode 100644
index 00000000000..a3266605671
--- /dev/null
+++ b/modules/services/monitoring/statsd.nix
@@ -0,0 +1,94 @@
+{ config, pkgs, ... }:
+
+with pkgs.lib;
+
+let
+
+  cfg = config.services.statsd;
+
+  configFile = pkgs.writeText "statsd.conf" ''
+    {
+      host: "${cfg.host}",
+      port: "${toString cfg.port}",
+      backends: [${concatMapStrings (el: ''"./backends/${el}",'') cfg.backends}],
+      graphiteHost: "${cfg.graphiteHost}",
+      graphitePort: "${toString cfg.graphitePort}",
+      ${cfg.extraConfig}
+    }
+  '';
+
+in
+
+{
+
+  ###### interface
+
+  options.services.statsd = {
+
+    enable = mkOption {
+      description = "Whether to enable statsd stats aggregation service";
+      default = false;
+      type = types.uniq types.bool;
+    };
+
+    host = mkOption {
+      description = "Address that statsd listens on over UDP";
+      default = "127.0.0.1";
+      type = types.uniq types.string;
+    };
+
+    port = mkOption {
+      description = "Port that stats listens for messages on over UDP";
+      default = 8125;
+      type = types.uniq types.int;
+    };
+
+    backends = mkOption {
+      description = "List of backends statsd will use for data persistance";
+      default = ["graphite"];
+    };
+
+    graphiteHost = mkOption {
+      description = "Hostname or IP of Graphite server";
+      default = "127.0.0.1";
+      type = types.uniq types.string;
+    };
+
+    graphitePort = mkOption {
+      description = "Port of Graphite server";
+      default = 2003;
+      type = types.uniq types.int;
+    };
+
+    extraConfig = mkOption {
+      default = "";
+      description = "Extra configuration options for statsd";
+      type = types.uniq types.string;
+    };
+
+  };
+
+  ###### implementation
+
+  config = mkIf cfg.enable {
+
+    users.extraUsers = singleton {
+      name = "statsd";
+      uid = config.ids.uids.statsd;
+      description = "Statsd daemon user";
+    };
+
+    systemd.services.statsd = {
+      description = "Statsd Server";
+      wantedBy = [ "multi-user.target" ];
+      serviceConfig = {
+        ExecStart = "${pkgs.nodePackages.statsd}/bin/statsd ${configFile}";
+        User = "statsd";
+      };
+    };
+
+    environment.systemPackages = [pkgs.nodePackages.statsd];
+
+  };
+
+}
-- 
GitLab


From 5894f26c81cafe0c81fb35e1b09f3ab45526b6a1 Mon Sep 17 00:00:00 2001
From: Jaka Hudoklin <jakahudoklin@gmail.com>
Date: Wed, 21 Aug 2013 11:43:37 +0200
Subject: [PATCH 4854/5331] Add statsd, simple daemon for easy stats
 aggregation

---
 modules/misc/ids.nix                   |  1 +
 modules/module-list.nix                |  1 +
 modules/services/monitoring/statsd.nix | 94 ++++++++++++++++++++++++++
 3 files changed, 96 insertions(+)
 create mode 100644 modules/services/monitoring/statsd.nix

diff --git a/modules/misc/ids.nix b/modules/misc/ids.nix
index d850ccc7276..91cfb88cebd 100644
--- a/modules/misc/ids.nix
+++ b/modules/misc/ids.nix
@@ -81,6 +81,7 @@ in
     supybot = 65;
     iodined = 66;
     graphite = 68;
+    statsd = 69;
 
     # When adding a uid, make sure it doesn't match an existing gid.
 
diff --git a/modules/module-list.nix b/modules/module-list.nix
index 37e68f06d3a..20ad0a014f1 100644
--- a/modules/module-list.nix
+++ b/modules/module-list.nix
@@ -125,6 +125,7 @@
   ./services/monitoring/monit.nix
   ./services/monitoring/nagios/default.nix
   ./services/monitoring/smartd.nix
+  ./services/monitoring/statsd.nix
   ./services/monitoring/systemhealth.nix
   ./services/monitoring/ups.nix
   ./services/monitoring/uptime.nix
diff --git a/modules/services/monitoring/statsd.nix b/modules/services/monitoring/statsd.nix
new file mode 100644
index 00000000000..a3266605671
--- /dev/null
+++ b/modules/services/monitoring/statsd.nix
@@ -0,0 +1,94 @@
+{ config, pkgs, ... }:
+
+with pkgs.lib;
+
+let
+
+  cfg = config.services.statsd;
+
+  configFile = pkgs.writeText "statsd.conf" ''
+    {
+      host: "${cfg.host}",
+      port: "${toString cfg.port}",
+      backends: [${concatMapStrings (el: ''"./backends/${el}",'') cfg.backends}],
+      graphiteHost: "${cfg.graphiteHost}",
+      graphitePort: "${toString cfg.graphitePort}",
+      ${cfg.extraConfig}
+    }
+  '';
+
+in
+
+{
+
+  ###### interface
+
+  options.services.statsd = {
+
+    enable = mkOption {
+      description = "Whether to enable statsd stats aggregation service";
+      default = false;
+      type = types.uniq types.bool;
+    };
+
+    host = mkOption {
+      description = "Address that statsd listens on over UDP";
+      default = "127.0.0.1";
+      type = types.uniq types.string;
+    };
+
+    port = mkOption {
+      description = "Port that stats listens for messages on over UDP";
+      default = 8125;
+      type = types.uniq types.int;
+    };
+
+    backends = mkOption {
+      description = "List of backends statsd will use for data persistance";
+      default = ["graphite"];
+    };
+
+    graphiteHost = mkOption {
+      description = "Hostname or IP of Graphite server";
+      default = "127.0.0.1";
+      type = types.uniq types.string;
+    };
+
+    graphitePort = mkOption {
+      description = "Port of Graphite server";
+      default = 2003;
+      type = types.uniq types.int;
+    };
+
+    extraConfig = mkOption {
+      default = "";
+      description = "Extra configuration options for statsd";
+      type = types.uniq types.string;
+    };
+
+  };
+
+  ###### implementation
+
+  config = mkIf cfg.enable {
+
+    users.extraUsers = singleton {
+      name = "statsd";
+      uid = config.ids.uids.statsd;
+      description = "Statsd daemon user";
+    };
+
+    systemd.services.statsd = {
+      description = "Statsd Server";
+      wantedBy = [ "multi-user.target" ];
+      serviceConfig = {
+        ExecStart = "${pkgs.nodePackages.statsd}/bin/statsd ${configFile}";
+        User = "statsd";
+      };
+    };
+
+    environment.systemPackages = [pkgs.nodePackages.statsd];
+
+  };
+
+}
-- 
GitLab


From bfc75e73ae4e0b17a373889532e17c5735f2f60d Mon Sep 17 00:00:00 2001
From: Evgeny Egorochkin <phreedom@yandex.ru>
Date: Thu, 22 Aug 2013 09:35:36 +0300
Subject: [PATCH 4855/5331] Update zip to zipAttrsWith since zip is obsolete.

---
 modules/rename.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/rename.nix b/modules/rename.nix
index bf6179cf369..bc0ebf1f091 100644
--- a/modules/rename.nix
+++ b/modules/rename.nix
@@ -26,7 +26,7 @@ let
 
 
   zipModules = list: with pkgs.lib;
-    zip (n: v:
+    zipAttrsWith (n: v:
       if tail v != [] then
         if n == "_type" then (head v)
         else if n == "extraConfigs" then (concatLists v)
-- 
GitLab


From f4207269361d5bdbb929d64ab6ba4a5319ac7056 Mon Sep 17 00:00:00 2001
From: Rickard Nilsson <rickynils@gmail.com>
Date: Fri, 23 Aug 2013 11:33:24 +0200
Subject: [PATCH 4856/5331] Add several missing uids and gids to
 modules/misc/ids.nix

---
 modules/misc/ids.nix                          | 26 +++++++++++++++++++
 modules/programs/virtualbox.nix               |  2 +-
 modules/services/backup/almir.nix             |  3 ++-
 modules/services/backup/bacula.nix            |  3 ++-
 modules/services/databases/postgresql.nix     |  7 ++---
 modules/services/monitoring/dd-agent.nix      |  3 ++-
 .../services/network-filesystems/samba.nix    | 15 +++++------
 modules/services/networking/freenet.nix       |  3 ++-
 .../networking/ircd-hybrid/default.nix        |  5 ++--
 modules/services/system/dbus.nix              | 18 +++++--------
 modules/services/torrent/deluge.nix           |  3 ++-
 modules/services/torrent/transmission.nix     |  3 ++-
 .../services/web-servers/lighttpd/default.nix |  3 ++-
 .../services/web-servers/varnish/default.nix  |  3 ++-
 modules/virtualisation/virtualbox-guest.nix   |  2 +-
 15 files changed, 64 insertions(+), 35 deletions(-)

diff --git a/modules/misc/ids.nix b/modules/misc/ids.nix
index 91cfb88cebd..5b545b799a2 100644
--- a/modules/misc/ids.nix
+++ b/modules/misc/ids.nix
@@ -82,6 +82,18 @@ in
     iodined = 66;
     graphite = 68;
     statsd = 69;
+    transmission = 70;
+    postgres = 71;
+    smbguest = 74;
+    varnish = 75;
+    dd-agent = 76;
+    lighttpd = 77;
+    lightdm = 78;
+    freenet = 79;
+    ircd = 80;
+    bacula = 81;
+    almir = 82;
+    deluge = 83;
 
     # When adding a uid, make sure it doesn't match an existing gid.
 
@@ -147,6 +159,20 @@ in
     iodined = 66;
     libvirtd = 67;
     graphite = 68;
+    transmission = 70;
+    postgres = 71;
+    vboxusers = 72;
+    vboxsf = 73;
+    smbguest = 74;
+    varnish = 75;
+    dd-agent = 76;
+    lighttpd = 77;
+    lightdm = 78;
+    freenet = 79;
+    ircd = 80;
+    bacula = 81;
+    almir = 82;
+    deluge = 83;
 
     # When adding a gid, make sure it doesn't match an existing uid.
 
diff --git a/modules/programs/virtualbox.nix b/modules/programs/virtualbox.nix
index c2781edffb8..2a2ca745e2f 100644
--- a/modules/programs/virtualbox.nix
+++ b/modules/programs/virtualbox.nix
@@ -9,7 +9,7 @@ let virtualbox = config.boot.kernelPackages.virtualbox; in
   boot.extraModulePackages = [ virtualbox ];
   environment.systemPackages = [ virtualbox ];
 
-  users.extraGroups = singleton { name = "vboxusers"; };
+  users.extraGroups.vboxusers.gid = config.ids.gids.vboxusers;
 
   services.udev.extraRules =
     ''
diff --git a/modules/services/backup/almir.nix b/modules/services/backup/almir.nix
index a4ebfff2389..d5bc932c6b9 100644
--- a/modules/services/backup/almir.nix
+++ b/modules/services/backup/almir.nix
@@ -161,10 +161,11 @@ in {
 
     users.extraUsers.almir = {
       group = "almir";
+      uid = config.ids.uids.almir;
       createHome = true;
       shell = "${pkgs.bash}/bin/bash";
     };
 
-    users.extraGroups.almir = {};
+    users.extraGroups.almir.gid = config.ids.gids.almir;
   };
 }
diff --git a/modules/services/backup/bacula.nix b/modules/services/backup/bacula.nix
index 525df340048..272903c99e3 100644
--- a/modules/services/backup/bacula.nix
+++ b/modules/services/backup/bacula.nix
@@ -396,12 +396,13 @@ in {
 
     users.extraUsers.bacula = {
       group = "bacula";
+      uid = config.ids.uids.bacula;
       home = "${libDir}";
       createHome = true;
       description = "Bacula Daemons user";
       shell = "${pkgs.bash}/bin/bash";
     };
 
-    users.extraGroups.bacula = {};
+    users.extraGroups.bacula.gid = config.ids.gids.bacula;
   };
 }
diff --git a/modules/services/databases/postgresql.nix b/modules/services/databases/postgresql.nix
index de03fe1e46e..fc6b5b167b8 100644
--- a/modules/services/databases/postgresql.nix
+++ b/modules/services/databases/postgresql.nix
@@ -154,13 +154,14 @@ in
         host  all all ::1/128      md5
       '';
 
-    users.extraUsers = singleton
+    users.extraUsers.postgres =
       { name = "postgres";
+        uid = config.ids.uids.postgres;
+        group = "postgres";
         description = "PostgreSQL server user";
       };
 
-    users.extraGroups = singleton
-      { name = "postgres"; };
+    users.extraGroups.postgres.gid = config.ids.gids.postgres;
 
     environment.systemPackages = [postgresql];
 
diff --git a/modules/services/monitoring/dd-agent.nix b/modules/services/monitoring/dd-agent.nix
index 92e88c68d16..ef658523c1f 100644
--- a/modules/services/monitoring/dd-agent.nix
+++ b/modules/services/monitoring/dd-agent.nix
@@ -46,12 +46,13 @@ in {
 
     users.extraUsers."dd-agent" = {
       description = "Datadog Agent User";
+      uid = config.ids.uids.dd-agent;
       group = "dd-agent";
       home = "/var/log/datadog/";
       createHome = true;
     };
 
-    users.extraGroups."dd-agent" = { };
+    users.extraGroups.dd-agent.gid = config.ids.gids.dd-agent;
 
     systemd.services.dd-agent = {
       description = "Datadog agent monitor";
diff --git a/modules/services/network-filesystems/samba.nix b/modules/services/network-filesystems/samba.nix
index 903e2c39ae9..518142ba97b 100644
--- a/modules/services/network-filesystems/samba.nix
+++ b/modules/services/network-filesystems/samba.nix
@@ -188,16 +188,13 @@ in
       }
 
       (mkIf config.services.samba.enable {
-        users.extraUsers = singleton
-          { name = user;
-            description = "Samba service user";
-            group = group;
-          };
-
-        users.extraGroups = singleton
-          { name = group;
-          };
+        users.extraUsers.smbguest = {
+          description = "Samba service user";
+          group = group;
+          uid = config.ids.uids.smbguest;
+        };
 
+        users.extraGroups.smbguest.gid = config.ids.uids.smbguest;
 
         systemd = {
           targets.samba = {
diff --git a/modules/services/networking/freenet.nix b/modules/services/networking/freenet.nix
index 314c690d7d4..a4bd2098986 100644
--- a/modules/services/networking/freenet.nix
+++ b/modules/services/networking/freenet.nix
@@ -55,9 +55,10 @@ in
       description = "Freenet daemon user";
       home = varDir;
       createHome = true;
+      uid = config.ids.uids.freenet;
     };
 
-    users.extraGroups.freenet = {};
+    users.extraGroups.freenet.gid = config.ids.gids.freenet;
   };
 
 }
diff --git a/modules/services/networking/ircd-hybrid/default.nix b/modules/services/networking/ircd-hybrid/default.nix
index 99fe02db5db..cd82a41ef7a 100644
--- a/modules/services/networking/ircd-hybrid/default.nix
+++ b/modules/services/networking/ircd-hybrid/default.nix
@@ -115,10 +115,11 @@ in
     users.extraUsers = singleton
       { name = "ircd";
         description = "IRCD owner";
+        group = "ircd";
+        uid = config.ids.uids.ircd;
       };
 
-    users.extraGroups = singleton
-      { name = "ircd"; };
+    users.extraGroups.ircd.gid = config.ids.gids.ircd;
 
     jobs.ircd_hybrid =
       { name = "ircd-hybrid";
diff --git a/modules/services/system/dbus.nix b/modules/services/system/dbus.nix
index 28647004ce4..eab876be76d 100644
--- a/modules/services/system/dbus.nix
+++ b/modules/services/system/dbus.nix
@@ -103,18 +103,14 @@ in
         target = "dbus-1";
       };
 
-    users.extraUsers = singleton
-      { name = "messagebus";
-        uid = config.ids.uids.messagebus;
-        description = "D-Bus system message bus daemon user";
-        home = homeDir;
-        group = "messagebus";
-      };
+    users.extraUsers.messagebus = {
+      uid = config.ids.uids.messagebus;
+      description = "D-Bus system message bus daemon user";
+      home = homeDir;
+      group = "messagebus";
+    };
 
-    users.extraGroups = singleton
-      { name = "messagebus";
-        gid = config.ids.gids.messagebus;
-      };
+    users.extraGroups.messagebus.gid = config.ids.gids.messagebus;
 
     # FIXME: these are copied verbatim from the dbus source tree.  We
     # should install and use the originals.
diff --git a/modules/services/torrent/deluge.nix b/modules/services/torrent/deluge.nix
index 12b61d39109..e0c212e5661 100644
--- a/modules/services/torrent/deluge.nix
+++ b/modules/services/torrent/deluge.nix
@@ -54,11 +54,12 @@ in {
 
     users.extraUsers.deluge = {
       group = "deluge";
+      uid = config.ids.uids.deluge;
       home = "/var/lib/deluge/";
       createHome = true;
       description = "Deluge Daemon user";
     };
 
-    users.extraGroups.deluge = {};
+    users.extraGroups.deluge.gid = config.ids.gids.deluge;
   };
 }
diff --git a/modules/services/torrent/transmission.nix b/modules/services/torrent/transmission.nix
index 4c989f09fea..063332d4862 100644
--- a/modules/services/torrent/transmission.nix
+++ b/modules/services/torrent/transmission.nix
@@ -129,12 +129,13 @@ in
 
     users.extraUsers.transmission = {
       group = "transmission";
+      uid = config.ids.uids.transmission;
       description = "Transmission BitTorrent user";
       home = homeDir;
       createHome = true;
     };
 
-    users.extraGroups.transmission = {};
+    users.extraGroups.transmission.gid = config.ids.gids.transmission;
 
     # AppArmor profile
     security.apparmor.profiles = mkIf (config.security.apparmor.enable && cfg.apparmor) [
diff --git a/modules/services/web-servers/lighttpd/default.nix b/modules/services/web-servers/lighttpd/default.nix
index f1099ef599f..f9e40fc4b54 100644
--- a/modules/services/web-servers/lighttpd/default.nix
+++ b/modules/services/web-servers/lighttpd/default.nix
@@ -170,8 +170,9 @@ in
     users.extraUsers.lighttpd = {
       group = "lighttpd";
       description = "lighttpd web server privilege separation user";
+      uid = config.ids.uids.lighttpd;
     };
 
-    users.extraGroups.lighttpd = {};
+    users.extraGroups.lighttpd.gid = config.ids.gids.lighttpd;
   };
 }
diff --git a/modules/services/web-servers/varnish/default.nix b/modules/services/web-servers/varnish/default.nix
index 66ec978bac8..39de73213ce 100644
--- a/modules/services/web-servers/varnish/default.nix
+++ b/modules/services/web-servers/varnish/default.nix
@@ -47,8 +47,9 @@ with pkgs.lib;
 
     users.extraUsers.varnish = {
       group = "varnish";
+      uid = config.ids.uids.varnish;
     };
 
-    users.extraGroups.varnish = {};
+    users.extraGroups.varnish.gid = config.ids.uids.varnish;
   };
 }
diff --git a/modules/virtualisation/virtualbox-guest.nix b/modules/virtualisation/virtualbox-guest.nix
index 262afae2cf6..75c5349e0c2 100644
--- a/modules/virtualisation/virtualbox-guest.nix
+++ b/modules/virtualisation/virtualbox-guest.nix
@@ -38,7 +38,7 @@ optionalAttrs (pkgs.stdenv.isi686 || pkgs.stdenv.isx86_64) # ugly...
 
     boot.extraModulePackages = [ kernel.virtualboxGuestAdditions ];
 
-    users.extraGroups = singleton { name = "vboxsf"; };
+    users.extraGroups.vboxsf.gid = config.ids.gids.vboxsf;
 
     jobs.virtualbox =
       { description = "VirtualBox Guest Services";
-- 
GitLab


From f8a6fa774e4e0e31c1bfdbd73bffd2d2dfa2e5d2 Mon Sep 17 00:00:00 2001
From: Evgeny Egorochkin <phreedom@yandex.ru>
Date: Fri, 23 Aug 2013 14:47:42 +0300
Subject: [PATCH 4857/5331] SSH daemon: change default key size for RSA, add
 alert for weak keys.

---
 modules/services/networking/ssh/sshd.nix | 29 ++++++++++++++++++------
 1 file changed, 22 insertions(+), 7 deletions(-)

diff --git a/modules/services/networking/ssh/sshd.nix b/modules/services/networking/ssh/sshd.nix
index e9df8dd3cf6..0c70ebd716c 100644
--- a/modules/services/networking/ssh/sshd.nix
+++ b/modules/services/networking/ssh/sshd.nix
@@ -16,19 +16,27 @@ let
     v == "no";
 
   hostKeyTypeNames = {
-    dsa1024  = "dsa";
-    rsa1024  = "rsa";
+    dsa1024  = "dsa"; # DSA has a key size limitation due to standards
+    rsa3072  = "rsa";
     ecdsa521 = "ecdsa";
   };
 
   hostKeyTypeBits = {
-    dsa1024  = 1024;
-    rsa1024  = 1024;
-    ecdsa521 = 521;
+    dsa1024  = 1024; # =80 bits of security
+    rsa3072  = 3072; # =128 bits of security
+    ecdsa521 = 521;  # =256 bits of security
+  };
+
+  # equivalent to 112 bit of security strength. Anything below this is very unsafe.
+  hostKeyTypeSafeBits = {
+    dsa1024  = 2048;
+    rsa3072  = 2048;
+    ecdsa521 = 255;
   };
 
   hktn = attrByPath [cfg.hostKeyType] (throw "unknown host key type `${cfg.hostKeyType}'") hostKeyTypeNames;
   hktb = attrByPath [cfg.hostKeyType] (throw "unknown host key type `${cfg.hostKeyType}'") hostKeyTypeBits;
+  hktsb = attrByPath [cfg.hostKeyType] (throw "unknown host key type `${cfg.hostKeyType}'") hostKeyTypeSafeBits;
 
   knownHosts = map (h: getAttr h cfg.knownHosts) (attrNames cfg.knownHosts);
 
@@ -171,7 +179,7 @@ in
       hostKeyType = mkOption {
         default = "dsa1024";
         description = ''
-          Type of host key to generate (dsa1024/rsa1024/ecdsa521), if
+          Type of host key to generate (dsa1024/rsa3072/ecdsa521), if
           the file specified by <literal>hostKeyPath</literal> does not
           exist when the service starts.
         '';
@@ -269,7 +277,7 @@ in
 
         stopIfChanged = false;
 
-        path = [ pkgs.openssh ];
+        path = [ pkgs.openssh pkgs.gawk ];
 
         environment.LD_LIBRARY_PATH = nssModulesPath;
         environment.LOCALE_ARCHIVE = "/run/current-system/sw/lib/locale/locale-archive";
@@ -281,6 +289,13 @@ in
             if ! test -f ${cfg.hostKeyPath}; then
                 ssh-keygen -t ${hktn} -b ${toString hktb} -f ${cfg.hostKeyPath} -N ""
             fi
+
+            result=$(ssh-keygen -lf ${cfg.hostKeyPath}|awk '{ print ($1>=${toString hktsb}?1:0)}')
+            if [ "$result" -ne "1" ]; then
+              ERROR="SECURITY ALERT: SSH Host Key is too weak. Generate a strong key NOW."
+              echo "$ERROR"
+              echo "$ERROR" > /dev/console
+            fi
           '';
 
         serviceConfig =
-- 
GitLab


From c9b9f7ee1d92985cab28e955b6ece159e80f5afa Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 21 Aug 2013 16:44:14 +0200
Subject: [PATCH 4858/5331] Manual: Fix some links

---
 doc/manual/configuration.xml |  4 ++--
 doc/manual/development.xml   | 33 ++++++++++++++++-----------------
 2 files changed, 18 insertions(+), 19 deletions(-)

diff --git a/doc/manual/configuration.xml b/doc/manual/configuration.xml
index f631ee68767..fdd8ce80778 100644
--- a/doc/manual/configuration.xml
+++ b/doc/manual/configuration.xml
@@ -168,8 +168,8 @@ In that case, you can do two things.  First, you can clone the Nixpkgs
 repository, add the package to your clone, and (optionally) submit a
 patch or pull request to have it accepted into the main Nixpkgs
 repository.  This is described in detail in the <link
-xlink:href="http://hydra.nixos.org/job/nixpkgs/trunk/tarball/latest/download-by-type/doc/manual">Nixpkgs
-manual</link>.  In short, you clone Nixpkgs:
+xlink:href="http://nixos.org/nixpkgs/manual">Nixpkgs manual</link>.
+In short, you clone Nixpkgs:
 
 <screen>
 $ git clone git://github.com/NixOS/nixpkgs.git
diff --git a/doc/manual/development.xml b/doc/manual/development.xml
index 251df4c84c8..cc5af79dd4e 100644
--- a/doc/manual/development.xml
+++ b/doc/manual/development.xml
@@ -407,7 +407,7 @@ $ nix-build -A config.system.build.manual</screen>
 
 <title>Testing the installer</title>
 
-<para>Building, burning, and 
+<para>Building, burning, and
 booting from an installation CD is rather
 tedious, so here is a quick way to see if the installer works
 properly:
@@ -543,10 +543,10 @@ starting VDE switch for network 1
 
   <para>
     This and other tests are continuously run on <link
-    xlink:href="http://hydra.nixos.org/jobset/nixos/trunk/with-status">the
-    Hydra instance at <literal>nixos.org</literal></link>, which
-    allows developers to be notified of any regressions introduced by
-    a NixOS or Nixpkgs change.
+    xlink:href="http://hydra.nixos.org/jobset/nixos/trunk">the Hydra
+    instance at <literal>nixos.org</literal></link>, which allows
+    developers to be notified of any regressions introduced by a NixOS
+    or Nixpkgs change.
   </para>
 
   <para>
@@ -572,28 +572,27 @@ starting VDE switch for network 1
     <variablelist>
 
       <varlistentry>
-	<term><varname>test</varname></term>
-	<listitem><para>A derivation containing the test log as an HTML file,
-	as seen above, suitable for presentation in the Hydra continuous
-	build system.</para></listitem>
+        <term><varname>test</varname></term>
+        <listitem><para>A derivation containing the test log as an HTML file,
+        as seen above, suitable for presentation in the Hydra continuous
+        build system.</para></listitem>
       </varlistentry>
 
       <varlistentry>
-	<term><varname>report</varname></term>
-	<listitem><para>A derivation containing a code coverage report, with
-	meta-data suitable for Hydra.</para></listitem>
+        <term><varname>report</varname></term>
+        <listitem><para>A derivation containing a code coverage report, with
+        meta-data suitable for Hydra.</para></listitem>
       </varlistentry>
 
       <varlistentry>
-	<term><varname>driver</varname></term>
-	<listitem><para>A derivation containing scripts to run the VM test or
-	interact with the VM network interactively, as seen above.</para>
-	</listitem>
+        <term><varname>driver</varname></term>
+        <listitem><para>A derivation containing scripts to run the VM test or
+        interact with the VM network interactively, as seen above.</para>
+        </listitem>
       </varlistentry>
 
     </variablelist>
   </para>
-    
 
 </section>
 
-- 
GitLab


From 9771f0c96c87cf03519033df408ca309696a9469 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sat, 24 Aug 2013 01:01:10 +0200
Subject: [PATCH 4859/5331] sshd: Support multiple host keys

The option services.openssh.hostKeys now allows specifying multiple
host keys.  The default value enables both a DSA and ECDSA key.
(Clients by default will use the ECDSA key, unless known_hosts already
has a DSA key for that host.)  To use only an ECDSA key, you can say:

  services.openssh.hostKeys =
    [ { path = "/etc/ssh/ssh_host_ecdsa_key";
        type = "ecdsa";
        bits = 521;
      }
    ];
---
 modules/services/networking/ssh/sshd.nix | 77 +++++++++---------------
 1 file changed, 27 insertions(+), 50 deletions(-)

diff --git a/modules/services/networking/ssh/sshd.nix b/modules/services/networking/ssh/sshd.nix
index 0c70ebd716c..d57eef860d2 100644
--- a/modules/services/networking/ssh/sshd.nix
+++ b/modules/services/networking/ssh/sshd.nix
@@ -15,29 +15,6 @@ let
     v == "forced-commands-only" ||
     v == "no";
 
-  hostKeyTypeNames = {
-    dsa1024  = "dsa"; # DSA has a key size limitation due to standards
-    rsa3072  = "rsa";
-    ecdsa521 = "ecdsa";
-  };
-
-  hostKeyTypeBits = {
-    dsa1024  = 1024; # =80 bits of security
-    rsa3072  = 3072; # =128 bits of security
-    ecdsa521 = 521;  # =256 bits of security
-  };
-
-  # equivalent to 112 bit of security strength. Anything below this is very unsafe.
-  hostKeyTypeSafeBits = {
-    dsa1024  = 2048;
-    rsa3072  = 2048;
-    ecdsa521 = 255;
-  };
-
-  hktn = attrByPath [cfg.hostKeyType] (throw "unknown host key type `${cfg.hostKeyType}'") hostKeyTypeNames;
-  hktb = attrByPath [cfg.hostKeyType] (throw "unknown host key type `${cfg.hostKeyType}'") hostKeyTypeBits;
-  hktsb = attrByPath [cfg.hostKeyType] (throw "unknown host key type `${cfg.hostKeyType}'") hostKeyTypeSafeBits;
-
   knownHosts = map (h: getAttr h cfg.knownHosts) (attrNames cfg.knownHosts);
 
   knownHostsFile = pkgs.writeText "ssh_known_hosts" (
@@ -176,22 +153,23 @@ in
         '';
       };
 
-      hostKeyType = mkOption {
-        default = "dsa1024";
+      hostKeys = mkOption {
+        default =
+          [ { path = "/etc/ssh/ssh_host_dsa_key";
+              type = "dsa";
+              bits = 1024;
+            }
+            { path = "/etc/ssh/ssh_host_ecdsa_key";
+              type = "ecdsa";
+              bits = 521;
+            }
+          ];
         description = ''
-          Type of host key to generate (dsa1024/rsa3072/ecdsa521), if
-          the file specified by <literal>hostKeyPath</literal> does not
-          exist when the service starts.
-        '';
-      };
-
-      hostKeyPath = mkOption {
-        default = "/etc/ssh/ssh_host_${hktn}_key";
-        description = ''
-          Path to the server's private key. If there is no key file
-          on this path, it will be generated when the service is
-          started for the first time. Otherwise, the ssh daemon will
-          use the specified key directly in-place.
+          NixOS can automatically generate SSH host keys.  This option
+          specifies the path, type and size of each key.  See
+          <citerefentry><refentrytitle>ssh-keygen</refentrytitle>
+          <manvolnum>1</manvolnum></citerefentry> for supported types
+          and sizes.
         '';
       };
 
@@ -252,7 +230,7 @@ in
 
   ###### implementation
 
-  config = mkIf config.services.openssh.enable {
+  config = mkIf cfg.enable {
 
     users.extraUsers = singleton
       { name = "sshd";
@@ -286,21 +264,16 @@ in
           ''
             mkdir -m 0755 -p /etc/ssh
 
-            if ! test -f ${cfg.hostKeyPath}; then
-                ssh-keygen -t ${hktn} -b ${toString hktb} -f ${cfg.hostKeyPath} -N ""
-            fi
-
-            result=$(ssh-keygen -lf ${cfg.hostKeyPath}|awk '{ print ($1>=${toString hktsb}?1:0)}')
-            if [ "$result" -ne "1" ]; then
-              ERROR="SECURITY ALERT: SSH Host Key is too weak. Generate a strong key NOW."
-              echo "$ERROR"
-              echo "$ERROR" > /dev/console
-            fi
+            ${flip concatMapStrings cfg.hostKeys (k: ''
+              if ! [ -f "${k.path}" ]; then
+                  ssh-keygen -t "${k.type}" -b "${toString k.bits}" -f "${k.path}" -N ""
+              fi
+            '')}
           '';
 
         serviceConfig =
           { ExecStart =
-              "${pkgs.openssh}/sbin/sshd -h ${cfg.hostKeyPath} " +
+              "${pkgs.openssh}/sbin/sshd " +
               "-f ${pkgs.writeText "sshd_config" cfg.extraConfig}";
             Restart = "always";
             Type = "forking";
@@ -351,6 +324,10 @@ in
         PrintMotd no # handled by pam_motd
 
         AuthorizedKeysFile ${toString cfg.authorizedKeysFiles}
+
+        ${flip concatMapStrings cfg.hostKeys (k: ''
+          HostKey ${k.path}
+        '')}
       '';
 
     assertions = [{ assertion = if cfg.forwardX11 then cfgc.setXAuthLocation else true;
-- 
GitLab


From 48cdd60e02e33a6eeabaa002e1ac269ed9a2b83e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= <viric@viric.name>
Date: Sat, 24 Aug 2013 23:23:25 +0200
Subject: [PATCH 4860/5331] Fixing handling of parameters with spaces in
 torsocks/torify

---
 modules/services/security/torify.nix   | 4 ++--
 modules/services/security/torsocks.nix | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/modules/services/security/torify.nix b/modules/services/security/torify.nix
index b91d7d58505..1c158906a91 100644
--- a/modules/services/security/torify.nix
+++ b/modules/services/security/torify.nix
@@ -8,7 +8,7 @@ let
     name = "torify";
     text = ''
         #!${pkgs.stdenv.shell}
-        TSOCKS_CONF_FILE=${pkgs.writeText "tsocks.conf" cfg.torify.config} LD_PRELOAD="${pkgs.tsocks}/lib/libtsocks.so $LD_PRELOAD" $@
+        TSOCKS_CONF_FILE=${pkgs.writeText "tsocks.conf" cfg.torify.config} LD_PRELOAD="${pkgs.tsocks}/lib/libtsocks.so $LD_PRELOAD" "$@"
     '';
     executable = true;
     destination = "/bin/torify";
@@ -66,4 +66,4 @@ in
     '';
   };
 
-}
\ No newline at end of file
+}
diff --git a/modules/services/security/torsocks.nix b/modules/services/security/torsocks.nix
index 8c2015e37c1..d6974282a6b 100644
--- a/modules/services/security/torsocks.nix
+++ b/modules/services/security/torsocks.nix
@@ -20,7 +20,7 @@ let
     name = name;
     text = ''
         #!${pkgs.stdenv.shell}
-        TORSOCKS_CONF_FILE=${pkgs.writeText "torsocks.conf" (makeConfig server)} LD_PRELOAD="${pkgs.torsocks}/lib/torsocks/libtorsocks.so $LD_PRELOAD" $@
+        TORSOCKS_CONF_FILE=${pkgs.writeText "torsocks.conf" (makeConfig server)} LD_PRELOAD="${pkgs.torsocks}/lib/torsocks/libtorsocks.so $LD_PRELOAD" "$@"
     '';
     executable = true;
     destination = "/bin/${name}";
-- 
GitLab


From 651686626f7b9b3ab7b2102770c216c5fbb69f8a Mon Sep 17 00:00:00 2001
From: Mathijs Kwik <mathijs@bluescreen303.nl>
Date: Sat, 24 Aug 2013 11:38:32 +0200
Subject: [PATCH 4861/5331] convert bbswitch job to systemd unit

dramatically speeds up my boot time because it was the last
service (for me) that depended on udev-settle.service

udev-settle isn't needed for modern system initialization but some
oldschool services (mdadm/lvm/cryptsetup) depend on it so they can
just enumerate devices instead of having to react to changes
dynamically. In NixOS these things are usually already taken care of
during stage 1 (early ramdisk) if you use them.
---
 modules/services/hardware/nvidia-optimus.nix | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/modules/services/hardware/nvidia-optimus.nix b/modules/services/hardware/nvidia-optimus.nix
index fd58b3d5ad5..79eb92c2f04 100644
--- a/modules/services/hardware/nvidia-optimus.nix
+++ b/modules/services/hardware/nvidia-optimus.nix
@@ -27,13 +27,17 @@ in
     boot.kernelModules = [ "bbswitch" ];
     boot.extraModulePackages = [ kernel.bbswitch ];
 
-    jobs.bbswitch = {
-      name = "bbswitch";
+    systemd.services.bbswitch = {
       description = "turn off nvidia card";
-      startOn = "stopped udevtrigger";
-      exec = "discrete_vga_poweroff";
-      path = [kernel.bbswitch];
-      task = true;
+      after = [ "sysinit.target" ];
+      wantedBy = [ "multi-user.target" ];
+      serviceConfig = {
+        Type = "oneshot";
+        RemainAfterExit = true;
+        ExecStart = "${kernel.bbswitch}/bin/discrete_vga_poweroff";
+        ExecStop = "${kernel.bbswitch}/bin/discrete_vga_poweron";
+      };
+      path = [ kernel.bbswitch ];
     };
   };
 
-- 
GitLab


From d860f9f78e93952dbd1a5a86692a515b1894eaf0 Mon Sep 17 00:00:00 2001
From: Mathijs Kwik <mathijs@bluescreen303.nl>
Date: Sat, 24 Aug 2013 17:47:06 +0200
Subject: [PATCH 4862/5331] power management: provide a post-resume target and
 unify suspend/hibernate/hybrid-sleep handling

---
 modules/config/power-management.nix | 30 +++++++++++------------------
 1 file changed, 11 insertions(+), 19 deletions(-)

diff --git a/modules/config/power-management.nix b/modules/config/power-management.nix
index 50c7482a372..2a0874c929d 100644
--- a/modules/config/power-management.nix
+++ b/modules/config/power-management.nix
@@ -72,6 +72,14 @@ in
     powerManagement.cpuFreqGovernor = mkDefault "ondemand";
     powerManagement.scsiLinkPolicy = mkDefault "min_power";
 
+    systemd.targets.post-resume = {
+      description = "This target is reached after a hibernate/suspend/hybrid-sleep has woken up.";
+      requires = [ "post-resume.service" ];
+      after = [ "post-resume.service" ];
+      wantedBy = [ "sleep.target" ];
+      unitConfig.StopWhenUnneeded = true;
+    };
+
     # Service executed before suspending/hibernating.
     systemd.services."pre-sleep" =
       { description = "Pre-Sleep Actions";
@@ -84,25 +92,9 @@ in
         serviceConfig.Type = "oneshot";
       };
 
-    # Service executed before suspending/hibernating.  There doesn't
-    # seem to be a good way to hook in a service to be executed after
-    # both suspend *and* hibernate, so have a separate one for each.
-    systemd.services."post-suspend" =
-      { description = "Post-Suspend Actions";
-        wantedBy = [ "suspend.target" ];
-        after = [ "systemd-suspend.service" ];
-        script =
-          ''
-            ${cfg.resumeCommands}
-            ${cfg.powerUpCommands}
-          '';
-        serviceConfig.Type = "oneshot";
-      };
-
-    systemd.services."post-hibernate" =
-      { description = "Post-Hibernate Actions";
-        wantedBy = [ "hibernate.target" ];
-        after = [ "systemd-hibernate.service" ];
+    systemd.services."post-resume" =
+      { description = "Post-Resume Actions";
+        after = [ "suspend.target" "hibernate.target" "hybrid-sleep.target" ];
         script =
           ''
             ${cfg.resumeCommands}
-- 
GitLab


From c3931d2e4273c9bf5a610ccd664f56bd05e584cf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Sun, 25 Aug 2013 21:54:21 +0200
Subject: [PATCH 4863/5331] Add programs.ssh.extraConfig option

---
 modules/programs/ssh.nix | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/modules/programs/ssh.nix b/modules/programs/ssh.nix
index f28de02bb4e..5ec32376b60 100644
--- a/modules/programs/ssh.nix
+++ b/modules/programs/ssh.nix
@@ -35,6 +35,14 @@ in
           Pulls in X11 dependency.
         '';
       };
+
+      extraConfig = mkOption {
+        default = "";
+        description = ''
+          Extra configuration text appended to <filename>ssh_config</filename>.
+          See the ssh_config(5) man page for help.
+        '';
+      };
     };
   };
 
@@ -51,6 +59,7 @@ in
               XAuthLocation ${pkgs.xorg.xauth}/bin/xauth
             ''}
             ForwardX11 ${if cfg.forwardX11 then "yes" else "no"}
+            ${cfg.extraConfig}
           '';
           target = "ssh/ssh_config";
         }
-- 
GitLab


From 8bfbe7ef84df37c933fb26a15bb3d3f8212f17cf Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 26 Aug 2013 12:11:17 +0200
Subject: [PATCH 4864/5331] Don't try to guess the location of the NixOS config
 file

The NixOS config need not be $NIXOS_CONFIG, it can also be set through
-I nixos-config=... or not exist in a separate file at all (e.g. in a
NixOps deployment).

Issue #212.
---
 modules/services/misc/nix-daemon.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/modules/services/misc/nix-daemon.nix b/modules/services/misc/nix-daemon.nix
index e77a9dc2e4b..58fb3322c20 100644
--- a/modules/services/misc/nix-daemon.nix
+++ b/modules/services/misc/nix-daemon.nix
@@ -34,8 +34,9 @@ let
       pkgs.runCommand "nix.conf" {extraOptions = cfg.extraOptions; } ''
         extraPaths=$(for i in $(cat ${binshDeps}); do if test -d $i; then echo $i; fi; done)
         cat > $out <<END
-        # WARNING: this file is generated from the nix.* entries in
-        # ${maybeEnv "NIXOS_CONFIG" "/etc/nixos/configuration.nix"}
+        # WARNING: this file is generated from the nix.* options in
+        # your NixOS configuration, typically
+        # /etc/nixos/configuration.nix.  Do not edit it!
         build-users-group = nixbld
         build-max-jobs = ${toString (cfg.maxJobs)}
         build-use-chroot = ${if cfg.useChroot then "true" else "false"}
-- 
GitLab


From 40c6f6252efb31b22d7a8bb2cf510faa0eac7936 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 26 Aug 2013 12:18:26 +0200
Subject: [PATCH 4865/5331] Fix spelling

Also, it's not necessary to order a unit after "sysinit.target" since
that's implied.
---
 modules/services/hardware/nvidia-optimus.nix | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/modules/services/hardware/nvidia-optimus.nix b/modules/services/hardware/nvidia-optimus.nix
index 79eb92c2f04..4c0ce794d4f 100644
--- a/modules/services/hardware/nvidia-optimus.nix
+++ b/modules/services/hardware/nvidia-optimus.nix
@@ -1,7 +1,6 @@
-{pkgs, config, ...}:
+{ config, pkgs, ... }:
 
-let kernel = config.boot.kernelPackages;
-in
+let kernel = config.boot.kernelPackages; in
 
 {
 
@@ -13,7 +12,8 @@ in
       default = false;
       type = pkgs.lib.types.bool;
       description = ''
-        Completely disable the nvidia gfx chip (saves power / heat) and just use IGP
+        Completely disable the NVIDIA graphics card and use the
+        integrated graphics processor instead.
       '';
     };
 
@@ -28,8 +28,7 @@ in
     boot.extraModulePackages = [ kernel.bbswitch ];
 
     systemd.services.bbswitch = {
-      description = "turn off nvidia card";
-      after = [ "sysinit.target" ];
+      description = "Disable NVIDIA Card";
       wantedBy = [ "multi-user.target" ];
       serviceConfig = {
         Type = "oneshot";
-- 
GitLab


From 3395e4398f32022e214e03a54321d199a23455eb Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 26 Aug 2013 14:06:00 +0200
Subject: [PATCH 4866/5331] Build 32-bit VirtualBox image

Issue #200.
---
 modules/virtualisation/virtualbox-image.nix |  2 +-
 release.nix                                 | 15 +++++++++------
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/modules/virtualisation/virtualbox-image.nix b/modules/virtualisation/virtualbox-image.nix
index 18f375644f2..21b2e114340 100644
--- a/modules/virtualisation/virtualbox-image.nix
+++ b/modules/virtualisation/virtualbox-image.nix
@@ -6,7 +6,7 @@ with pkgs.lib;
   system.build.virtualBoxImage =
     pkgs.vmTools.runInLinuxVM (
       pkgs.runCommand "virtualbox-image"
-        { memSize = 2048;
+        { memSize = 2047;
           preVM =
             ''
               mkdir $out
diff --git a/release.nix b/release.nix
index bcbde0508da..a6b80be0ea6 100644
--- a/release.nix
+++ b/release.nix
@@ -175,8 +175,9 @@ in {
 
 
   # A bootable VirtualBox image.  FIXME: generate a OVF appliance?
-  vdi.x86_64-linux =
-    with import <nixpkgs> { system = "x86_64-linux"; };
+  vdi = pkgs.lib.genAttrs systems (system:
+
+    with import <nixpkgs> { inherit system; };
 
     let
 
@@ -190,19 +191,21 @@ in {
 
     in
       # Declare the VDI as a build product so that it shows up in Hydra.
-      runCommand "nixos-vdi-${config.system.nixosVersion}"
+      runCommand "nixos-vdi-${config.system.nixosVersion}-${system}"
         { meta = {
-            description = "NixOS VirtualBox disk image (64-bit)";
+            description = "NixOS VirtualBox disk image (${system})";
             maintainers = lib.maintainers.eelco;
           };
           vdi = config.system.build.virtualBoxImage;
         }
         ''
           mkdir -p $out/nix-support
-          fn=$out/nixos-${config.system.nixosVersion}.vdi.xz
+          fn=$out/nixos-${config.system.nixosVersion}-${system}.vdi.xz
           xz < $vdi/*.vdi > $fn
           echo "file vdi $fn" >> $out/nix-support/hydra-build-products
-        ''; # */
+        '' # */
+
+  );
 
 
   # Provide a tarball that can be unpacked into an SD card, and easily
-- 
GitLab


From 7f7208663d18285838a674bda4eba9184a8f7db8 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 26 Aug 2013 14:11:56 +0200
Subject: [PATCH 4867/5331] Add vdi.i686-linux to the release-critical jobs

---
 release-combined.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/release-combined.nix b/release-combined.nix
index 853c833cb72..07f76547b56 100644
--- a/release-combined.nix
+++ b/release-combined.nix
@@ -42,7 +42,7 @@ in rec {
 
         (all nixos.iso_minimal)
         (all nixos.iso_graphical)
-        nixos.vdi.x86_64-linux
+        (all nixos.vdi)
 
         (all nixos.tests.firefox)
         (all nixos.tests.firewall)
-- 
GitLab


From b0b5e08e8662bf1d76463cd7300bba2f7d20ff7e Mon Sep 17 00:00:00 2001
From: Rickard Nilsson <rickynils@gmail.com>
Date: Mon, 26 Aug 2013 15:20:25 +0200
Subject: [PATCH 4868/5331] Add some more missing uids/gids

---
 modules/misc/ids.nix                          | 16 +++++++++++
 modules/services/amqp/activemq/default.nix    | 27 +++++--------------
 modules/services/amqp/rabbitmq.nix            | 13 +++++----
 modules/services/databases/mysql.nix          | 11 +++++---
 modules/services/databases/mysql55.nix        | 11 +++++---
 modules/services/networking/amuled.nix        |  7 +++++
 modules/services/networking/gnunet.nix        | 18 ++++++-------
 modules/services/networking/minidlna.nix      |  8 +++++-
 modules/services/networking/oidentd.nix       | 11 +++++---
 modules/services/networking/quassel.nix       |  6 +++++
 .../services/x11/display-managers/lightdm.nix |  4 +++
 11 files changed, 83 insertions(+), 49 deletions(-)

diff --git a/modules/misc/ids.nix b/modules/misc/ids.nix
index 5b545b799a2..fd1aca26356 100644
--- a/modules/misc/ids.nix
+++ b/modules/misc/ids.nix
@@ -94,6 +94,14 @@ in
     bacula = 81;
     almir = 82;
     deluge = 83;
+    mysql = 84;
+    rabbitmq = 85;
+    activemq = 86;
+    gnunet = 87;
+    oidentd = 88;
+    quassel = 89;
+    amule = 90;
+    minidlna = 91;
 
     # When adding a uid, make sure it doesn't match an existing gid.
 
@@ -173,6 +181,14 @@ in
     bacula = 81;
     almir = 82;
     deluge = 83;
+    mysql = 84;
+    rabbitmq = 85;
+    activemq = 86;
+    gnunet = 87;
+    oidentd = 88;
+    quassel = 89;
+    amule = 90;
+    minidlna = 91;
 
     # When adding a gid, make sure it doesn't match an existing uid.
 
diff --git a/modules/services/amqp/activemq/default.nix b/modules/services/amqp/activemq/default.nix
index 44bf8be5878..915d179e699 100644
--- a/modules/services/amqp/activemq/default.nix
+++ b/modules/services/amqp/activemq/default.nix
@@ -89,32 +89,17 @@ in {
           Java runtime when the broker service is started.
         '';
       };
-      user = {
-        create = mkOption {
-          type = types.bool;
-          default = true;
-          description = ''
-            If true, a system user with the specified name will be added
-            to the system configuration. If false, a user with the specified
-            name is expected to exist.
-          '';
-        };
-        name = mkOption {
-          type = types.string;
-          default = "activemq";
-          description = ''
-            The name of the user that should run the ActiveMQ process.
-          '';
-        };
-      };
     };
   };
 
   config = mkIf cfg.enable {
-    users.extraUsers = mkIf cfg.user.create (singleton {
-      inherit (cfg.user) name;
+    users.extraUsers.activemq = {
       description = "ActiveMQ server user";
-    });
+      group = "activemq";
+      uid = config.ids.uids.activemq;
+    };
+
+    users.extraGroups.activemq.gid = config.ids.gids.activemq;
 
     systemd.services.activemq_init = {
       wantedBy = [ "activemq.service" ];
diff --git a/modules/services/amqp/rabbitmq.nix b/modules/services/amqp/rabbitmq.nix
index 4afbafdd085..696b5ad4379 100644
--- a/modules/services/amqp/rabbitmq.nix
+++ b/modules/services/amqp/rabbitmq.nix
@@ -51,11 +51,14 @@ in
 
     environment.systemPackages = [ pkgs.rabbitmq_server ];
 
-    users.extraUsers = singleton
-      { name = "rabbitmq";
-        description = "RabbitMQ server user";
-        home = "/var/empty";
-      };
+    users.extraUsers.rabbitmq = {
+      description = "RabbitMQ server user";
+      home = "/var/empty";
+      group = "rabbitmq";
+      uid = config.ids.uids.rabbitmq;
+    };
+
+    users.extraGroups.rabbitmq.gid = config.ids.gids.rabbitmq;
 
     jobs.rabbitmq = {
         description = "RabbitMQ server";
diff --git a/modules/services/databases/mysql.nix b/modules/services/databases/mysql.nix
index ed9d03dc60f..663c2cc4505 100644
--- a/modules/services/databases/mysql.nix
+++ b/modules/services/databases/mysql.nix
@@ -146,10 +146,13 @@ in
 
   config = mkIf config.services.mysql.enable {
 
-    users.extraUsers = singleton
-      { name = "mysql";
-        description = "MySQL server user";
-      };
+    users.extraUsers.mysql = {
+      description = "MySQL server user";
+      group = "mysql";
+      uid = config.ids.uids.mysql;
+    };
+
+    users.extraGroups.mysql.gid = config.ids.gids.mysql;
 
     environment.systemPackages = [mysql];
 
diff --git a/modules/services/databases/mysql55.nix b/modules/services/databases/mysql55.nix
index 1da182a0e59..46148d68f4c 100644
--- a/modules/services/databases/mysql55.nix
+++ b/modules/services/databases/mysql55.nix
@@ -139,10 +139,13 @@ in
 
   config = mkIf config.services.mysql55.enable {
 
-    users.extraUsers = singleton
-      { name = "mysql";
-        description = "MySQL server user";
-      };
+    users.extraUsers.mysql = {
+      description = "MySQL server user";
+      group = "mysql";
+      uid = config.ids.uids.mysql;
+    };
+
+    users.extraGroups.mysql.gid = config.ids.gids.mysql;
 
     environment.systemPackages = [mysql];
 
diff --git a/modules/services/networking/amuled.nix b/modules/services/networking/amuled.nix
index 658d16af006..8652d0daf4c 100644
--- a/modules/services/networking/amuled.nix
+++ b/modules/services/networking/amuled.nix
@@ -48,6 +48,13 @@ in
     users.extraUsers = mkIf (cfg.user == null) [
       { name = "amule";
         description = "AMule daemon";
+        group = "amule";
+        uid = config.ids.uids.amule;
+      } ];
+
+    users.extraGroups = mkIf (cfg.user == null) [
+      { name = "amule";
+        gid = config.ids.gids.amule;
       } ];
 
     jobs.amuled =
diff --git a/modules/services/networking/gnunet.nix b/modules/services/networking/gnunet.nix
index e0c41dcb188..421c0d9bb69 100644
--- a/modules/services/networking/gnunet.nix
+++ b/modules/services/networking/gnunet.nix
@@ -118,17 +118,15 @@ in
 
   config = mkIf config.services.gnunet.enable {
 
-    users.extraUsers = singleton
-      { name = "gnunet";
-        group = "gnunet";
-        description = "GNUnet User";
-        home = homeDir;
-        createHome = true; 
-      };
+    users.extraUsers.gnunet = {
+      group = "gnunet";
+      description = "GNUnet User";
+      home = homeDir;
+      createHome = true; 
+      uid = config.ids.uids.gnunet;
+    };
 
-    users.extraGroups = singleton
-      { name = "gnunet";
-      };
+    users.extraGroups.gnunet.gid = config.ids.gids.gnunet;
 
     # The user tools that talk to `gnunetd' should come from the same source,
     # so install them globally.
diff --git a/modules/services/networking/minidlna.nix b/modules/services/networking/minidlna.nix
index c240e87e059..55b553cafcc 100644
--- a/modules/services/networking/minidlna.nix
+++ b/modules/services/networking/minidlna.nix
@@ -72,7 +72,13 @@ in
         '') cfg.mediaDirs}
       '';
 
-    users.extraUsers.minidlna.description = "MiniDLNA daemon user";
+    users.extraUsers.minidlna = {
+      description = "MiniDLNA daemon user";
+      group = "minidlna";
+      uid = config.ids.uids.minidlna;
+    };
+
+    users.extraGroups.minidlna.gid = config.ids.gids.minidlna;
 
     systemd.services.minidlna =
       { description = "MiniDLNA Server";
diff --git a/modules/services/networking/oidentd.nix b/modules/services/networking/oidentd.nix
index d730e99af89..a2a555a8ad1 100644
--- a/modules/services/networking/oidentd.nix
+++ b/modules/services/networking/oidentd.nix
@@ -31,10 +31,13 @@ with pkgs.lib;
         exec = "${pkgs.oidentd}/sbin/oidentd -u oidentd -g nogroup";
       };
 
-    users.extraUsers = singleton
-      { name = "oidentd";
-        description = "Ident Protocol daemon user";
-      };
+    users.extraUsers.oidentd = {
+      description = "Ident Protocol daemon user";
+      group = "oidentd";
+      uid = config.ids.uids.oidentd;
+    };
+
+    users.extraGroups.oidentd.gid = config.ids.gids.oidentd;
 
   };
 
diff --git a/modules/services/networking/quassel.nix b/modules/services/networking/quassel.nix
index e8af4926f5c..f3a4e457ec8 100644
--- a/modules/services/networking/quassel.nix
+++ b/modules/services/networking/quassel.nix
@@ -65,8 +65,14 @@ in
     users.extraUsers = mkIf (cfg.user == null) [
       { name = "quassel";
         description = "Quassel IRC client daemon";
+        group = "quassel";
+        uid = config.ids.uids.quassel;
       }];
 
+    users.extraGroups = mkIf (cfg.user == null) [
+      { name = "quassel";
+        gid = config.ids.gids.quassel;
+      }];
 
     jobs.quassel =
       { description = "Quassel IRC client daemon";
diff --git a/modules/services/x11/display-managers/lightdm.nix b/modules/services/x11/display-managers/lightdm.nix
index 6659a2dec46..b4f026d8143 100644
--- a/modules/services/x11/display-managers/lightdm.nix
+++ b/modules/services/x11/display-managers/lightdm.nix
@@ -109,6 +109,10 @@ in
     users.extraUsers.lightdm = {
       createHome = true;
       home = "/var/lib/lightdm";
+      group = "lightdm";
+      uid = config.ids.uids.lightdm;
     };
+
+    users.extraGroups.lightdm.gid = config.ids.gids.lightdm;
   };
 }
-- 
GitLab


From 7021b07a8d725220d76585562cc55a6d56670b91 Mon Sep 17 00:00:00 2001
From: Evgeny Egorochkin <phreedom@yandex.ru>
Date: Mon, 26 Aug 2013 17:04:42 +0300
Subject: [PATCH 4869/5331] Move the compose-cache code from kde4 to xsession
 since it is supposedly useful for all X-based stuff.

---
 modules/services/x11/desktop-managers/kde4.nix    | 5 -----
 modules/services/x11/display-managers/default.nix | 5 +++++
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/modules/services/x11/desktop-managers/kde4.nix b/modules/services/x11/desktop-managers/kde4.nix
index 6d804c13827..cf86d2b86be 100644
--- a/modules/services/x11/desktop-managers/kde4.nix
+++ b/modules/services/x11/desktop-managers/kde4.nix
@@ -97,11 +97,6 @@ in
             # See http://lists-archives.org/kde-devel/26175-what-when-will-icon-cache-refresh.html
             rm -fv $HOME/.kde/cache-*/icon-cache.kcache
 
-            # Speed up application start by 50-150ms according to
-            # http://kdemonkey.blogspot.nl/2008/04/magic-trick.html
-            rm -fv $HOME/.compose-cache
-            mkdir $HOME/.compose-cache
-
             # Qt writes a weird ‘libraryPath’ line to
             # ~/.config/Trolltech.conf that causes the KDE plugin
             # paths of previous KDE invocations to be searched.
diff --git a/modules/services/x11/display-managers/default.nix b/modules/services/x11/display-managers/default.nix
index 451355d4980..b6f6f2ec32e 100644
--- a/modules/services/x11/display-managers/default.nix
+++ b/modules/services/x11/display-managers/default.nix
@@ -94,6 +94,11 @@ let
 
       export LIBVA_DRIVERS_PATH=${vaapiDrivers}/lib/dri
 
+      # Speed up application start by 50-150ms according to
+      # http://kdemonkey.blogspot.nl/2008/04/magic-trick.html
+      rm -fv $HOME/.compose-cache
+      mkdir $HOME/.compose-cache
+
       ${cfg.displayManager.sessionCommands}
 
       # Allow the user to setup a custom session type.
-- 
GitLab


From 2dd8b19eacf2fe23a86356306c9b8b1c0c15a21d Mon Sep 17 00:00:00 2001
From: Mathijs Kwik <mathijs@bluescreen303.nl>
Date: Tue, 27 Aug 2013 08:03:49 +0200
Subject: [PATCH 4870/5331] Fix description for PowerManagement units.

---
 modules/config/power-management.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/config/power-management.nix b/modules/config/power-management.nix
index 2a0874c929d..fec2c886818 100644
--- a/modules/config/power-management.nix
+++ b/modules/config/power-management.nix
@@ -73,7 +73,7 @@ in
     powerManagement.scsiLinkPolicy = mkDefault "min_power";
 
     systemd.targets.post-resume = {
-      description = "This target is reached after a hibernate/suspend/hybrid-sleep has woken up.";
+      description = "Post-Resume Actions";
       requires = [ "post-resume.service" ];
       after = [ "post-resume.service" ];
       wantedBy = [ "sleep.target" ];
-- 
GitLab


From c613ae7b829fdbf80c3057445a6a719799fa5404 Mon Sep 17 00:00:00 2001
From: Jaka Hudoklin <jakahudoklin@gmail.com>
Date: Tue, 27 Aug 2013 20:42:59 +0200
Subject: [PATCH 4871/5331] Add elasticsearch, a powerful open source search
 and analytics engine

---
 modules/misc/ids.nix                      |   1 +
 modules/module-list.nix                   |   1 +
 modules/services/search/elasticsearch.nix | 115 ++++++++++++++++++++++
 3 files changed, 117 insertions(+)
 create mode 100644 modules/services/search/elasticsearch.nix

diff --git a/modules/misc/ids.nix b/modules/misc/ids.nix
index 91cfb88cebd..27af51d21e1 100644
--- a/modules/misc/ids.nix
+++ b/modules/misc/ids.nix
@@ -82,6 +82,7 @@ in
     iodined = 66;
     graphite = 68;
     statsd = 69;
+    elasticsearch = 70;
 
     # When adding a uid, make sure it doesn't match an existing gid.
 
diff --git a/modules/module-list.nix b/modules/module-list.nix
index 20ad0a014f1..b50be9c34fa 100644
--- a/modules/module-list.nix
+++ b/modules/module-list.nix
@@ -188,6 +188,7 @@
   ./services/scheduling/atd.nix
   ./services/scheduling/cron.nix
   ./services/scheduling/fcron.nix
+  ./services/search/elasticsearch.nix
   ./services/security/clamav.nix
   ./services/security/fprot.nix
   ./services/security/frandom.nix
diff --git a/modules/services/search/elasticsearch.nix b/modules/services/search/elasticsearch.nix
new file mode 100644
index 00000000000..6dfabc7e305
--- /dev/null
+++ b/modules/services/search/elasticsearch.nix
@@ -0,0 +1,115 @@
+{ config, pkgs, ... }:
+
+with pkgs.lib;
+
+let
+  cfg = config.services.elasticsearch;
+
+  es_home = "/var/lib/elasticsearch";
+
+  configFile = pkgs.writeText "elasticsearch.yml" ''
+    network.host: ${cfg.host}
+    network.port: ${cfg.port}
+    network.tcp.port: ${cfg.tcp_port}
+    cluster.name: ${cfg.cluster_name}
+    ${cfg.extraConf}
+  '';
+
+in {
+
+  ###### interface
+
+  options.services.elasticsearch = {
+    enable = mkOption {
+      description = "Whether to enable elasticsearch";
+      default = false;
+      type = types.uniq types.bool;
+    };
+
+    host = mkOption {
+      description = "Elasticsearch listen address";
+      default = "127.0.0.1";
+      types = type.uniq types.string;
+    };
+
+    port = mkOption {
+      description = "Elasticsearch port to listen for HTTP traffic";
+      default = "9200";
+      types = type.uniq types.string;
+    };
+
+    tcp_port = mkOption {
+      description = "Elasticsearch port for the node to node communication";
+      default = "9300";
+      types = type.uniq types.string;
+    };
+
+    cluster_name = mkOption {
+      description = "Elasticsearch name that identifies your cluster for auto-discovery";
+      default = "elasticsearch";
+      types = type.uniq types.string;
+    };
+
+    extraConf = mkOption {
+      description = "Extra configuration for elasticsearch";
+      default = "";
+      types = type.uniq types.string;
+      example = ''
+        node.name: "elasticsearch"
+        node.master: true
+        node.data: false
+        index.number_of_shards: 5
+        index.number_of_replicas: 1
+      '';
+    };
+
+    logging = mkOption {
+      description = "Elasticsearch logging configuration";
+      default = ''
+        rootLogger: DEBUG, console
+        logger:
+          action: DEBUG
+          com.amazonaws: WARN
+        appender:
+          console:
+            type: console
+            layout:
+              type: consolePattern
+              conversionPattern: "[%d{ISO8601}][%-5p][%-25c] %m%n"
+      '';
+      types = type.uniq types.string;
+    };
+  };
+
+  ###### implementation
+
+  config = mkIf cfg.enable {
+    environment.etc = [
+      { source = configFile;
+        target = "elasticsearch/elasticsearch.yml"; }
+      { source = pkgs.writeText "logging.yml" cfg.logging;
+        target = "elasticsearch/logging.yml"; }
+    ];
+
+    systemd.services.elasticsearch = mkIf cfg.enable {
+      description = "Elasticsearch daemon";
+      wantedBy = [ "multi-user.target" ];
+      after = [ "network-interfaces.target" ];
+      environment = { ES_HOME = es_home; };
+      serviceConfig = {
+        ExecStart = "${pkgs.elasticsearch}/bin/elasticsearch -f -Des.path.conf=/etc/elasticsearch";
+        User = "elasticsearch";
+      };
+    };
+
+    environment.systemPackages = [ pkgs.elasticsearch ];
+
+    users.extraUsers = singleton {
+      name = "elasticsearch";
+      uid = config.ids.uids.elasticsearch;
+      description = "Elasticsearch daemon user";
+      home = es_home;
+      createHome = true;
+    };
+  };
+}
-- 
GitLab


From f8d1aac7d871009b79d46b9276f95c2527a65efd Mon Sep 17 00:00:00 2001
From: Moritz Ulrich <moritz@tarn-vedra.de>
Date: Tue, 27 Aug 2013 20:51:34 +0200
Subject: [PATCH 4872/5331] minidlna: Start after networking.target.

Signed-off-by: Moritz Ulrich <moritz@tarn-vedra.de>
---
 modules/services/networking/minidlna.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/modules/services/networking/minidlna.nix b/modules/services/networking/minidlna.nix
index 55b553cafcc..ea5bc8514f1 100644
--- a/modules/services/networking/minidlna.nix
+++ b/modules/services/networking/minidlna.nix
@@ -84,6 +84,7 @@ in
       { description = "MiniDLNA Server";
 
         wantedBy = [ "multi-user.target" ];
+        after = [ "network.target" ];
 
         preStart =
           ''
-- 
GitLab


From bf4bcd900d4b343345f59dfac3d6bf444fb89a37 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Carles=20Pag=C3=A8s?= <page@cubata.homelinux.net>
Date: Tue, 2 Jul 2013 22:42:47 +0200
Subject: [PATCH 4873/5331] libyaml-cpp: add versions 0.5.1 and 0.3.0

The two versions are actively maintained, and the API changed between them.
---
 .../libraries/libyaml-cpp/0.3.x.nix            | 18 ++++++++++++++++++
 .../libraries/libyaml-cpp/default.nix          | 18 ++++++++++++++++++
 pkgs/top-level/all-packages.nix                |  3 +++
 3 files changed, 39 insertions(+)
 create mode 100644 pkgs/development/libraries/libyaml-cpp/0.3.x.nix
 create mode 100644 pkgs/development/libraries/libyaml-cpp/default.nix

diff --git a/pkgs/development/libraries/libyaml-cpp/0.3.x.nix b/pkgs/development/libraries/libyaml-cpp/0.3.x.nix
new file mode 100644
index 00000000000..4b0acd83fc3
--- /dev/null
+++ b/pkgs/development/libraries/libyaml-cpp/0.3.x.nix
@@ -0,0 +1,18 @@
+{stdenv, fetchurl, cmake, boostHeaders}:
+
+stdenv.mkDerivation {
+  name = "libyaml-cpp-0.3.0";
+
+  src = fetchurl {
+    url = http://yaml-cpp.googlecode.com/files/yaml-cpp-0.3.0.tar.gz;
+    sha256 = "10kv25zgq96ybxc6c19lzpax1xi5lpxrdqa9x52nffsql6skil1c";
+  };
+
+  buildInputs = [ cmake boostHeaders ];
+
+  meta = {
+    homepage = http://code.google.com/p/yaml-cpp/;
+    description = "A YAML parser and emitter for C++";
+    license = "MIT";
+  };
+}
diff --git a/pkgs/development/libraries/libyaml-cpp/default.nix b/pkgs/development/libraries/libyaml-cpp/default.nix
new file mode 100644
index 00000000000..09860522ef4
--- /dev/null
+++ b/pkgs/development/libraries/libyaml-cpp/default.nix
@@ -0,0 +1,18 @@
+{stdenv, fetchurl, cmake, boostHeaders}:
+
+stdenv.mkDerivation {
+  name = "libyaml-cpp-0.5.1";
+
+  src = fetchurl {
+    url = http://yaml-cpp.googlecode.com/files/yaml-cpp-0.5.1.tar.gz;
+    sha256 = "01kg0h8ksp162kdhyzn67vnlxpj5zjbks84sh50pv61xni990z1y";
+  };
+
+  buildInputs = [ cmake boostHeaders ];
+
+  meta = {
+    homepage = http://code.google.com/p/yaml-cpp/;
+    description = "A YAML parser and emitter for C++";
+    license = "MIT";
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 48fc5f68721..8e0753ce5d3 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4993,6 +4993,9 @@ let
 
   libyaml = callPackage ../development/libraries/libyaml { };
 
+  libyamlcpp = callPackage ../development/libraries/libyaml-cpp { };
+  libyamlcpp03 = callPackage ../development/libraries/libyaml-cpp/0.3.x.nix { };
+
   libzip = callPackage ../development/libraries/libzip { };
 
   libzrtpcpp = callPackage ../development/libraries/libzrtpcpp { };
-- 
GitLab


From e87589b2ef32165be9da9ec2a8c0f4baf5d76f3e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Carles=20Pag=C3=A8s?= <page@cubata.homelinux.net>
Date: Tue, 2 Jul 2013 23:06:05 +0200
Subject: [PATCH 4874/5331] SDL2: add release candidate

The tarball is not marked as such, but current 2.0.0 version is still a release
candidate for SDL2.
---
 pkgs/development/libraries/SDL2/default.nix | 56 +++++++++++++++++++++
 pkgs/top-level/all-packages.nix             |  7 +++
 2 files changed, 63 insertions(+)
 create mode 100644 pkgs/development/libraries/SDL2/default.nix

diff --git a/pkgs/development/libraries/SDL2/default.nix b/pkgs/development/libraries/SDL2/default.nix
new file mode 100644
index 00000000000..13f3aef7d26
--- /dev/null
+++ b/pkgs/development/libraries/SDL2/default.nix
@@ -0,0 +1,56 @@
+{ stdenv, fetchurl, pkgconfig, audiofile
+, openglSupport ? false, mesa ? null
+, alsaSupport ? true, alsaLib ? null
+, x11Support ? true, x11 ? null, libXrandr ? null
+, pulseaudioSupport ? true, pulseaudio ? null
+}:
+
+# OSS is no longer supported, for it's much crappier than ALSA and
+# PulseAudio.
+assert alsaSupport || pulseaudioSupport;
+
+assert openglSupport -> (mesa != null && x11Support);
+assert x11Support -> (x11 != null && libXrandr != null);
+assert alsaSupport -> alsaLib != null;
+assert pulseaudioSupport -> pulseaudio != null;
+
+let
+  configureFlagsFun = attrs: ''
+        --disable-oss --disable-video-x11-xme
+        --disable-x11-shared --disable-alsa-shared --enable-rpath --disable-pulseaudio-shared
+        --disable-osmesa-shared --enable-static
+        ${if alsaSupport then "--with-alsa-prefix=${attrs.alsaLib}/lib" else ""}
+      '';
+in
+stdenv.mkDerivation rec {
+  name = "SDL2-2.0.0";
+
+  src = fetchurl {
+    url = "http://www.libsdl.org/tmp/release/${name}.tar.gz";
+    sha256 = "0l2sgpbcacpkv4d9qyhn6k1knc4clrammncvij401hl9mzwrsb6q";
+  };
+
+  # Since `libpulse*.la' contain `-lgdbm', PulseAudio must be propagated.
+  propagatedBuildInputs = stdenv.lib.optionals x11Support [ x11 libXrandr ] ++
+    stdenv.lib.optional pulseaudioSupport pulseaudio;
+
+  buildInputs = [ pkgconfig audiofile ] ++
+    stdenv.lib.optional openglSupport [ mesa ] ++
+    stdenv.lib.optional alsaSupport alsaLib;
+
+  # XXX: By default, SDL wants to dlopen() PulseAudio, in which case
+  # we must arrange to add it to its RPATH; however, `patchelf' seems
+  # to fail at doing this, hence `--disable-pulseaudio-shared'.
+  configureFlags = configureFlagsFun { inherit alsaLib; };
+
+  crossAttrs = {
+      configureFlags = configureFlagsFun { alsaLib = alsaLib.crossDrv; };
+  };
+
+  passthru = {inherit openglSupport;};
+
+  meta = {
+    description = "A cross-platform multimedia library";
+    homepage = http://www.libsdl.org/;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 8e0753ce5d3..14c6e756fe7 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5405,6 +5405,13 @@ let
 
   SDL_ttf = callPackage ../development/libraries/SDL_ttf { };
 
+  SDL2 = callPackage ../development/libraries/SDL2 {
+    openglSupport = mesaSupported;
+    alsaSupport = true;
+    x11Support = true;
+    pulseaudioSupport = false; # better go through ALSA
+  };
+
   serd = callPackage ../development/libraries/serd {};
 
   silgraphite = callPackage ../development/libraries/silgraphite {};
-- 
GitLab


From 0d637ea5e0c4d9e0c085b373fd5979af21c675c7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Carles=20Pag=C3=A8s?= <page@cubata.homelinux.net>
Date: Thu, 4 Jul 2013 19:59:43 +0200
Subject: [PATCH 4875/5331] Add SDL2_image and SDL2_mixer, release candidate.

---
 .../libraries/SDL2_image/default.nix          | 27 +++++++++++++++++++
 .../libraries/SDL2_mixer/default.nix          | 20 ++++++++++++++
 pkgs/top-level/all-packages.nix               |  4 +++
 3 files changed, 51 insertions(+)
 create mode 100644 pkgs/development/libraries/SDL2_image/default.nix
 create mode 100644 pkgs/development/libraries/SDL2_mixer/default.nix

diff --git a/pkgs/development/libraries/SDL2_image/default.nix b/pkgs/development/libraries/SDL2_image/default.nix
new file mode 100644
index 00000000000..01b94c05aaf
--- /dev/null
+++ b/pkgs/development/libraries/SDL2_image/default.nix
@@ -0,0 +1,27 @@
+{ stdenv, fetchurl, SDL2, libpng, libjpeg, libtiff, libungif, libXpm, zlib }:
+
+stdenv.mkDerivation rec {
+  name = "SDL2_image-2.0.0";
+
+  src = fetchurl {
+    url = "http://www.libsdl.org/projects/SDL_image/release/${name}.tar.gz";
+    sha256 = "0cxb4ss2d6d13ivm40cb230cy880v9jwlxkgmnpxkaf498ban54w";
+  };
+
+  buildInputs = [SDL2 libpng libjpeg libtiff libungif libXpm zlib];
+
+  postInstall = ''
+    sed -i -e 's,"SDL.h",<SDL2/SDL.h>,' \
+      -e 's,"SDL_version.h",<SDL2/SDL_version.h>,' \
+      -e 's,"begin_code.h",<SDL2/begin_code.h>,' \
+      -e 's,"close_code.h",<SDL2/close_code.h>,' \
+      $out/include/SDL2/SDL_image.h
+    ln -sv SDL2/SDL_image.h $out/include/SDL_image.h
+  '';
+
+  meta = {
+    description = "SDL image library";
+    homepage = "http://www.libsdl.org/projects/SDL_image/";
+    platforms = stdenv.lib.platforms.linux;
+  };
+}
diff --git a/pkgs/development/libraries/SDL2_mixer/default.nix b/pkgs/development/libraries/SDL2_mixer/default.nix
new file mode 100644
index 00000000000..929b4ca3881
--- /dev/null
+++ b/pkgs/development/libraries/SDL2_mixer/default.nix
@@ -0,0 +1,20 @@
+{ stdenv, fetchurl, SDL2, libogg, libvorbis, enableNativeMidi ? false }:
+
+stdenv.mkDerivation rec {
+  name = "SDL2_mixer-2.0.0";
+
+  src = fetchurl {
+    url = "http://www.libsdl.org/projects/SDL_mixer/release/${name}.tar.gz";
+    sha256 = "0dpqh6ak77wvxwk06ak57vm79n27jbqfxzv5hv2yyzfj0852pmx3";
+  };
+
+  buildInputs = [SDL2 libogg libvorbis];
+
+  configureFlags = "--disable-music-ogg-shared" + stdenv.lib.optionalString enableNativeMidi "--enable-music-native-midi-gpl";
+
+  postInstall = "ln -s $out/include/SDL2/SDL_mixer.h $out/include/";
+
+  meta = {
+    description = "SDL multi-channel audio mixer library";
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 14c6e756fe7..97be81c9071 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5412,6 +5412,10 @@ let
     pulseaudioSupport = false; # better go through ALSA
   };
 
+  SDL2_image = callPackage ../development/libraries/SDL2_image { };
+
+  SDL2_mixer = callPackage ../development/libraries/SDL2_mixer { };
+
   serd = callPackage ../development/libraries/serd {};
 
   silgraphite = callPackage ../development/libraries/silgraphite {};
-- 
GitLab


From 18ecb7c62a86f33c0c423df53a37ed1a6869b215 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Carles=20Pag=C3=A8s?= <page@cubata.homelinux.net>
Date: Sat, 6 Jul 2013 08:40:50 +0200
Subject: [PATCH 4876/5331] Add SDL2_gfx (svn version)

There is no package yet, adding latest revision.
---
 .../libraries/SDL2_gfx/default.nix            | 51 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 +
 2 files changed, 53 insertions(+)
 create mode 100644 pkgs/development/libraries/SDL2_gfx/default.nix

diff --git a/pkgs/development/libraries/SDL2_gfx/default.nix b/pkgs/development/libraries/SDL2_gfx/default.nix
new file mode 100644
index 00000000000..f95dce0ac49
--- /dev/null
+++ b/pkgs/development/libraries/SDL2_gfx/default.nix
@@ -0,0 +1,51 @@
+{stdenv, fetchsvn, SDL2} :
+
+let rev = 5; in
+stdenv.mkDerivation rec {
+  name = "SDL2_gfx-${toString rev}";
+
+  src = fetchsvn {
+    url = http://svn.code.sf.net/p/sdl2gfx/code/trunk;
+    inherit rev;
+    sha256 = "1hzilbn1412m2b44mygrbdfh1gvks4v5p0kmafz248jf9ifsvmzp";
+  };
+
+  buildInputs = [ SDL2 ] ;
+
+  configureFlags = "--disable-mmx";
+
+  postInstall = ''
+    sed -i -e 's,"SDL.h",<SDL2/SDL.h>,' \
+      $out/include/SDL2/*.h
+    
+    ln -s $out/include/SDL2/*.h $out/include/;
+  '';
+
+  meta = {
+    description = "SDL graphics drawing primitives and support functions";
+
+    longDescription =
+      '' The SDL_gfx library evolved out of the SDL_gfxPrimitives code
+	 which provided basic drawing routines such as lines, circles or
+	 polygons and SDL_rotozoom which implemented a interpolating
+	 rotozoomer for SDL surfaces.
+
+	 The current components of the SDL_gfx library are:
+
+	    * Graphic Primitives (SDL_gfxPrimitves.h)
+	    * Rotozoomer (SDL_rotozoom.h)
+	    * Framerate control (SDL_framerate.h)
+	    * MMX image filters (SDL_imageFilter.h)
+	    * Custom Blit functions (SDL_gfxBlitFunc.h)
+
+	 The library is backwards compatible to the above mentioned
+         code. Its is written in plain C and can be used in C++ code.
+       '';
+
+    homepage = https://sourceforge.net/projects/sdlgfx/;
+    license = "LGPLv2+";
+
+    maintainers = [ stdenv.lib.maintainers.bjg ];
+    platforms = stdenv.lib.platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 97be81c9071..8007bb85efb 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5416,6 +5416,8 @@ let
 
   SDL2_mixer = callPackage ../development/libraries/SDL2_mixer { };
 
+  SDL2_gfx = callPackage ../development/libraries/SDL2_gfx { };
+
   serd = callPackage ../development/libraries/serd {};
 
   silgraphite = callPackage ../development/libraries/silgraphite {};
-- 
GitLab


From 1abf35be5bcb8be7a1ebcbf79a5b989671836fa8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Carles=20Pag=C3=A8s?= <page@cubata.homelinux.net>
Date: Wed, 7 Aug 2013 20:27:31 +0200
Subject: [PATCH 4877/5331] SDL2_gfx: add simlinks for headers with SDL_*

All the SDL2 libraries distribute headers with SDL_* names, under SDL2. Do the
same for the gfx one. I told upstream, but no changes so far.
---
 pkgs/development/libraries/SDL2_gfx/default.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/development/libraries/SDL2_gfx/default.nix b/pkgs/development/libraries/SDL2_gfx/default.nix
index f95dce0ac49..693b7bf8fe1 100644
--- a/pkgs/development/libraries/SDL2_gfx/default.nix
+++ b/pkgs/development/libraries/SDL2_gfx/default.nix
@@ -18,6 +18,9 @@ stdenv.mkDerivation rec {
     sed -i -e 's,"SDL.h",<SDL2/SDL.h>,' \
       $out/include/SDL2/*.h
     
+    ln -s $out/include/SDL2/SDL2_framerate.h $out/include/SDL2/SDL_framerate.h;
+    ln -s $out/include/SDL2/SDL2_gfxPrimitives.h $out/include/SDL2/SDL_gfxPrimitives.h;
+    ln -s $out/include/SDL2/SDL2_rotozoom.h $out/include/SDL2/SDL_rotozoom.h;
     ln -s $out/include/SDL2/*.h $out/include/;
   '';
 
-- 
GitLab


From e9a4a91af6ce79883e3a3dfaeca8c9fb17859aca Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Carles=20Pag=C3=A8s?= <page@cubata.homelinux.net>
Date: Tue, 27 Aug 2013 23:34:49 +0200
Subject: [PATCH 4878/5331] SDL2: update hashes for new stable release
 tarballs.

I also had to update the url to the main SDL2 lib.
---
 pkgs/development/libraries/SDL2/default.nix       | 4 ++--
 pkgs/development/libraries/SDL2_image/default.nix | 2 +-
 pkgs/development/libraries/SDL2_mixer/default.nix | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/libraries/SDL2/default.nix b/pkgs/development/libraries/SDL2/default.nix
index 13f3aef7d26..7bc27362a29 100644
--- a/pkgs/development/libraries/SDL2/default.nix
+++ b/pkgs/development/libraries/SDL2/default.nix
@@ -26,8 +26,8 @@ stdenv.mkDerivation rec {
   name = "SDL2-2.0.0";
 
   src = fetchurl {
-    url = "http://www.libsdl.org/tmp/release/${name}.tar.gz";
-    sha256 = "0l2sgpbcacpkv4d9qyhn6k1knc4clrammncvij401hl9mzwrsb6q";
+    url = "http://www.libsdl.org/release/${name}.tar.gz";
+    sha256 = "0y3in99brki7vc2mb4c0w39v70mf4h341mblhh8nmq4h7lawhskg";
   };
 
   # Since `libpulse*.la' contain `-lgdbm', PulseAudio must be propagated.
diff --git a/pkgs/development/libraries/SDL2_image/default.nix b/pkgs/development/libraries/SDL2_image/default.nix
index 01b94c05aaf..73b5ba8d929 100644
--- a/pkgs/development/libraries/SDL2_image/default.nix
+++ b/pkgs/development/libraries/SDL2_image/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "http://www.libsdl.org/projects/SDL_image/release/${name}.tar.gz";
-    sha256 = "0cxb4ss2d6d13ivm40cb230cy880v9jwlxkgmnpxkaf498ban54w";
+    sha256 = "0d3jlhkmr0j5a2dd5h6y29jfcsj7mkl16wghm6n3nqqp7g3ib65j";
   };
 
   buildInputs = [SDL2 libpng libjpeg libtiff libungif libXpm zlib];
diff --git a/pkgs/development/libraries/SDL2_mixer/default.nix b/pkgs/development/libraries/SDL2_mixer/default.nix
index 929b4ca3881..6d29ddf6eea 100644
--- a/pkgs/development/libraries/SDL2_mixer/default.nix
+++ b/pkgs/development/libraries/SDL2_mixer/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "http://www.libsdl.org/projects/SDL_mixer/release/${name}.tar.gz";
-    sha256 = "0dpqh6ak77wvxwk06ak57vm79n27jbqfxzv5hv2yyzfj0852pmx3";
+    sha256 = "0nvjdxjchrajrn0jag877hdx9zb788hsd315zzg1lyck2wb0xkm8";
   };
 
   buildInputs = [SDL2 libogg libvorbis];
-- 
GitLab


From 388f1d48fb09e53e54b7759c1a7fc6ce23b155cd Mon Sep 17 00:00:00 2001
From: Mathijs Kwik <mathijs@bluescreen303.nl>
Date: Thu, 29 Aug 2013 09:08:31 +0200
Subject: [PATCH 4879/5331] do not activate hybrid-sleep during config switches

---
 modules/system/activation/switch-to-configuration.pl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/system/activation/switch-to-configuration.pl b/modules/system/activation/switch-to-configuration.pl
index ea9f8cb5a9a..33ae3aef9fc 100644
--- a/modules/system/activation/switch-to-configuration.pl
+++ b/modules/system/activation/switch-to-configuration.pl
@@ -136,7 +136,7 @@ while (my ($unit, $state) = each %{$activePrev}) {
             # swap devices).  FIXME: the suspend target is sometimes
             # active after the system has resumed, which probably
             # should not be the case.  Just ignore it.
-            if ($unit ne "suspend.target" && $unit ne "hibernate.target") {
+            if ($unit ne "suspend.target" && $unit ne "hibernate.target" && $unit ne "hybrid-sleep.target") {
                 unless (boolIsTrue($unitInfo->{'RefuseManualStart'} // "no")) {
                     write_file($startListFile, { append => 1 }, "$unit\n");
                 }
-- 
GitLab


From 16c0a24cade26ec912e6d47c0035a7c387dd6f6f Mon Sep 17 00:00:00 2001
From: Antono Vasiljev <self@antono.info>
Date: Sun, 1 Sep 2013 21:18:48 +0300
Subject: [PATCH 4880/5331] Openbox

---
 .../services/x11/window-managers/default.nix  |  1 +
 .../services/x11/window-managers/openbox.nix  | 30 +++++++++++++++++++
 2 files changed, 31 insertions(+)
 create mode 100644 modules/services/x11/window-managers/openbox.nix

diff --git a/modules/services/x11/window-managers/default.nix b/modules/services/x11/window-managers/default.nix
index de0cbd5c599..958bf85817e 100644
--- a/modules/services/x11/window-managers/default.nix
+++ b/modules/services/x11/window-managers/default.nix
@@ -8,6 +8,7 @@ in
 {
   imports = [
     ./compiz.nix
+    ./openbox.nix
     ./kwm.nix
     ./metacity.nix
     ./none.nix
diff --git a/modules/services/x11/window-managers/openbox.nix b/modules/services/x11/window-managers/openbox.nix
new file mode 100644
index 00000000000..ae34a938c4a
--- /dev/null
+++ b/modules/services/x11/window-managers/openbox.nix
@@ -0,0 +1,30 @@
+{pkgs, config, ...}:
+
+let
+  inherit (pkgs.lib) mkOption mkIf;
+  cfg = config.services.xserver.windowManager.openbox;
+in
+
+{
+  options = {
+    services.xserver.windowManager.openbox = {
+      enable = mkOption {
+        default = false;
+        example = true;
+        description = "Enable the Openbox window manager.";
+      };
+    };
+  };
+
+  config = mkIf cfg.enable {
+    services.xserver.windowManager = {
+      session = [{
+        name = "openbox";
+        start = "
+          ${pkgs.openbox}/bin/openbox-session
+        ";
+      }];
+    };
+    environment.x11Packages = [ pkgs.openbox ];
+  };
+}
-- 
GitLab


From a7a981879535afc67e45328fc1a0d3eab7914e28 Mon Sep 17 00:00:00 2001
From: Ivan Kozik <ivan@ludios.org>
Date: Mon, 2 Sep 2013 04:50:18 +0000
Subject: [PATCH 4881/5331] Fix typo and incorrect package name

---
 doc/manual/configuration.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/doc/manual/configuration.xml b/doc/manual/configuration.xml
index fdd8ce80778..0a3cb5c8fce 100644
--- a/doc/manual/configuration.xml
+++ b/doc/manual/configuration.xml
@@ -312,7 +312,7 @@ manpage or the Nix manual.</para>
 <para>NixOS supports both declarative and imperative styles of user
 management.  In the declarative style, users are specified in
 <filename>configuration.nix</filename>.  For instance, the following
-states that a user accound named <literal>alice</literal> shall exist:
+states that a user account named <literal>alice</literal> shall exist:
 
 <programlisting>
 users.extraUsers.alice =
@@ -746,7 +746,7 @@ networking.localCommands =
 the option <option>boot.kernelPackages</option>.  For instance, this
 selects the Linux 3.10 kernel:
 <programlisting>
-boot.kernelPackages = pkgs.kernelPackages_3_10;
+boot.kernelPackages = pkgs.linuxPackages_3_10;
 </programlisting>
 Note that this not only replaces the kernel, but also packages that
 are specific to the kernel version, such as the NVIDIA video drivers.
-- 
GitLab


From cf7cbdb67c6c335a7deaa8b6125e72a7e20512e2 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 30 Aug 2013 18:00:32 +0200
Subject: [PATCH 4882/5331] Bump the NixOS version

July was a bit optimistic for a release :-)
---
 .version | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.version b/.version
index 40cdb89df34..eb28f45ff24 100644
--- a/.version
+++ b/.version
@@ -1 +1 @@
-13.07
\ No newline at end of file
+13.09
\ No newline at end of file
-- 
GitLab


From e06cd403b8b713b205c103d4699a48dc93d29c6f Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 2 Sep 2013 11:17:50 +0200
Subject: [PATCH 4883/5331] Execute NixOS VM tests on a separate machine

---
 lib/testing.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/testing.nix b/lib/testing.nix
index 9a72e1f4bd5..7be0903ed3a 100644
--- a/lib/testing.nix
+++ b/lib/testing.nix
@@ -39,7 +39,7 @@ rec {
     stdenv.mkDerivation {
       name = "vm-test-run";
 
-      requiredSystemFeatures = [ "kvm" ];
+      requiredSystemFeatures = [ "kvm" "nixos-test" ];
 
       buildInputs = [ pkgs.libxslt ];
 
-- 
GitLab


From f2523c08e4c118b0a56a48e6ce05b61839850478 Mon Sep 17 00:00:00 2001
From: Jack Cummings <jack@mudshark.org>
Date: Mon, 12 Aug 2013 15:53:57 -0700
Subject: [PATCH 4884/5331] fixiup zfs binaries in initrd

Previously, the zfs binaries were put in $out/sbin where the stage-1
patchelf wouldn't fix them up. This would fail the allowedReferences
test.

Move the zfs binaries to $out/bin.
---
 modules/tasks/filesystems/zfs.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/modules/tasks/filesystems/zfs.nix b/modules/tasks/filesystems/zfs.nix
index 590eb002022..c1955b14691 100644
--- a/modules/tasks/filesystems/zfs.nix
+++ b/modules/tasks/filesystems/zfs.nix
@@ -52,9 +52,9 @@ in
       kernelModules = [ "spl" "zfs" ] ;
       extraUtilsCommands =
         ''
-          cp -v ${kernel.zfs}/sbin/zfs $out/sbin
-          cp -v ${kernel.zfs}/sbin/zdb $out/sbin
-          cp -v ${kernel.zfs}/sbin/zpool $out/sbin
+          cp -v ${kernel.zfs}/sbin/zfs $out/bin
+          cp -v ${kernel.zfs}/sbin/zdb $out/bin
+          cp -v ${kernel.zfs}/sbin/zpool $out/bin
         '';
       postDeviceCommands =
         ''
-- 
GitLab


From 3a23e6dd31d39d0a8ea229661d29855361c143cb Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 3 Sep 2013 15:14:29 +0200
Subject: [PATCH 4885/5331] Remove reference to non-existant config.tests

---
 default.nix | 2 --
 1 file changed, 2 deletions(-)

diff --git a/default.nix b/default.nix
index abdd9d18fdd..d38e70d21f9 100644
--- a/default.nix
+++ b/default.nix
@@ -41,6 +41,4 @@ in
 
   # The following are used by nixos-rebuild.
   nixFallback = pkgs.nixUnstable;
-
-  tests = config.tests;
 }
-- 
GitLab


From 17457297cb05461696cfc36844b88294bd38222d Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 4 Sep 2013 13:05:09 +0200
Subject: [PATCH 4886/5331] Update all legacy-style modules

I.e., modules that use "require = [options]".  Nowadays that should be
written as

  {
    options = { ... };
    config = { ... };
  };

Also, use "imports" instead of "require" in places where we actually
import another module.
---
 modules/config/i18n.nix                       |  50 +-
 modules/config/krb5.nix                       | 331 ++++++-----
 modules/config/ldap.nix                       | 372 +++++++------
 modules/config/networking.nix                 |  96 ++--
 modules/config/nsswitch.nix                   |  64 +--
 modules/config/system-path.nix                |  41 +-
 modules/config/unix-odbc-drivers.nix          |  55 +-
 modules/hardware/pcmcia.nix                   |  90 ++-
 .../installer/cd-dvd/installation-cd-base.nix |   2 +-
 .../installer/cd-dvd/installation-cd-efi.nix  |   2 +-
 .../cd-dvd/installation-cd-graphical.nix      |   5 +-
 .../installation-cd-minimal-new-kernel.nix    |   2 +-
 .../cd-dvd/installation-cd-minimal.nix        |   2 +-
 .../cd-dvd/installation-cd-new-kernel.nix     |   2 +-
 modules/installer/cd-dvd/iso-image.nix        | 404 +++++++-------
 modules/installer/cd-dvd/live-dvd.nix         |   6 +-
 .../cd-dvd/system-tarball-fuloong2f.nix       |  15 +-
 .../installer/cd-dvd/system-tarball-pc.nix    |   2 +-
 .../cd-dvd/system-tarball-sheevaplug.nix      |   9 +-
 modules/installer/cd-dvd/system-tarball.nix   | 105 ++--
 .../installer/tools/nixos-hardware-scan.pl    |   6 +-
 modules/installer/tools/nixos-option.sh       |   2 +-
 modules/installer/virtualbox-demo.nix         |   2 +-
 modules/misc/ids.nix                          | 341 ++++++------
 modules/misc/passthru.nix                     |  24 +-
 modules/module-list.nix                       |   1 -
 modules/profiles/all-hardware.nix             |   2 +-
 modules/profiles/clone-config.nix             |   2 +-
 modules/profiles/demo.nix                     |   2 +-
 modules/programs/bash/bash.nix                | 122 ++---
 modules/programs/ssmtp.nix                    |  74 +--
 .../services/x11/desktop-managers/gnome.nix   |  59 +-
 .../services/x11/desktop-managers/xterm.nix   |  38 +-
 .../services/x11/window-managers/default.nix  |  38 +-
 modules/services/x11/window-managers/kwm.nix  |  46 --
 .../services/x11/window-managers/metacity.nix |  59 +-
 modules/services/x11/window-managers/wmii.nix |  53 +-
 modules/system/activation/top-level.nix       | 140 ++---
 .../generations-dir/generations-dir.nix       |  95 ++--
 .../boot/loader/raspberrypi/raspberrypi.nix   |  53 +-
 modules/system/boot/stage-1.nix               | 257 ++++-----
 modules/system/boot/stage-2.nix               |  67 +--
 modules/virtualisation/amazon-config.nix      |   2 +-
 modules/virtualisation/amazon-image.nix       |   4 +-
 modules/virtualisation/ec2-data.nix           | 159 +++---
 modules/virtualisation/nova-config.nix        |   2 +-
 modules/virtualisation/nova-image.nix         |   2 +-
 modules/virtualisation/qemu-vm.nix            | 514 +++++++++---------
 tests/firefox.nix                             |   2 +-
 tests/installer.nix                           |   2 +-
 tests/kde4.nix                                |   2 +-
 tests/quake3.nix                              |   2 +-
 tests/trac.nix                                |  22 +-
 tests/xfce.nix                                |   2 +-
 54 files changed, 1873 insertions(+), 1980 deletions(-)
 delete mode 100644 modules/services/x11/window-managers/kwm.nix

diff --git a/modules/config/i18n.nix b/modules/config/i18n.nix
index 0fb91771934..62b01c2221e 100644
--- a/modules/config/i18n.nix
+++ b/modules/config/i18n.nix
@@ -2,11 +2,20 @@
 
 with pkgs.lib;
 
-###### interface
-
 let
 
+  glibcLocales = pkgs.glibcLocales.override {
+    allLocales = any (x: x == "all") config.i18n.supportedLocales;
+    locales = config.i18n.supportedLocales;
+  };
+
+in
+
+{
+  ###### interface
+
   options = {
+
     i18n = {
       defaultLocale = mkOption {
         default = "en_US.UTF-8";
@@ -53,31 +62,26 @@ let
 
   };
 
-###### implementation
 
-  glibcLocales = pkgs.glibcLocales.override {
-    allLocales = any (x: x == "all") config.i18n.supportedLocales;
-    locales = config.i18n.supportedLocales;
-  };
+  ###### implementation
 
-in
+  config = {
 
-{
-  require = options;
+    environment.systemPackages = [ glibcLocales ];
 
-  environment.systemPackages = [ glibcLocales ];
+    environment.shellInit =
+      ''
+        export LANG=${config.i18n.defaultLocale}
+      '';
 
-  environment.shellInit =
-    ''
-      export LANG=${config.i18n.defaultLocale}
-    '';
+    # ‘/etc/locale.conf’ is used by systemd.
+    environment.etc = singleton
+      { target = "locale.conf";
+        source = pkgs.writeText "locale.conf"
+          ''
+            LANG=${config.i18n.defaultLocale}
+          '';
+      };
 
-  # ‘/etc/locale.conf’ is used by systemd.
-  environment.etc = singleton
-    { target = "locale.conf";
-      source = pkgs.writeText "locale.conf"
-        ''
-          LANG=${config.i18n.defaultLocale}
-        '';
-    };
+  };
 }
diff --git a/modules/config/krb5.nix b/modules/config/krb5.nix
index 56854603264..3323046ac5b 100644
--- a/modules/config/krb5.nix
+++ b/modules/config/krb5.nix
@@ -1,12 +1,18 @@
-{pkgs, config, ...}:
+{ config, pkgs, ... }:
+
+with pkgs.lib;
 
-###### interface
 let
-  inherit (pkgs.lib) mkOption mkIf;
 
   cfg = config.krb5;
 
+in
+
+{
+  ###### interface
+
   options = {
+
     krb5 = {
 
       enable = mkOption {
@@ -35,171 +41,164 @@ let
       };
 
     };
+
   };
-in
 
-###### implementation
-
-mkIf config.krb5.enable {
-  require = [
-    options
-  ];
-
-  environment = {
-    systemPackages = [ pkgs.krb5 ];
-    etc = [
-      { source = pkgs.writeText "krb5.conf"
-          ''
-[libdefaults]
-    default_realm = ${cfg.defaultRealm}
-    encrypt = true
-
-# The following krb5.conf variables are only for MIT Kerberos.
-    krb4_config = /etc/krb.conf
-    krb4_realms = /etc/krb.realms
-    kdc_timesync = 1
-    ccache_type = 4
-    forwardable = true
-    proxiable = true
-
-# The following encryption type specification will be used by MIT Kerberos
-# if uncommented.  In general, the defaults in the MIT Kerberos code are
-# correct and overriding these specifications only serves to disable new
-# encryption types as they are added, creating interoperability problems.
-
-#   default_tgs_enctypes = aes256-cts arcfour-hmac-md5 des3-hmac-sha1 des-cbc-crc des-cbc-md5
-#   default_tkt_enctypes = aes256-cts arcfour-hmac-md5 des3-hmac-sha1 des-cbc-crc des-cbc-md5
-#   permitted_enctypes = aes256-cts arcfour-hmac-md5 des3-hmac-sha1 des-cbc-crc des-cbc-md5
-
-# The following libdefaults parameters are only for Heimdal Kerberos.
-    v4_instance_resolve = false
-    v4_name_convert = {
-        host = {
-            rcmd = host
-            ftp = ftp
-        }
-        plain = {
-            something = something-else
-        }
-    }
-    fcc-mit-ticketflags = true
-
-[realms]
-    ${cfg.defaultRealm} = {
-        kdc = ${cfg.kdc}
-        admin_server = ${cfg.kerberosAdminServer}
-#        kpasswd_server = ${cfg.kerberosAdminServer}
-    }
-    ATHENA.MIT.EDU = {
-        kdc = kerberos.mit.edu:88
-        kdc = kerberos-1.mit.edu:88
-        kdc = kerberos-2.mit.edu:88
-        admin_server = kerberos.mit.edu
-        default_domain = mit.edu
-    }
-    MEDIA-LAB.MIT.EDU = {
-        kdc = kerberos.media.mit.edu
-        admin_server = kerberos.media.mit.edu
-    }
-    ZONE.MIT.EDU = {
-        kdc = casio.mit.edu
-        kdc = seiko.mit.edu
-        admin_server = casio.mit.edu
-    }
-    MOOF.MIT.EDU = {
-        kdc = three-headed-dogcow.mit.edu:88
-        kdc = three-headed-dogcow-1.mit.edu:88
-        admin_server = three-headed-dogcow.mit.edu
-    }
-    CSAIL.MIT.EDU = {
-        kdc = kerberos-1.csail.mit.edu
-        kdc = kerberos-2.csail.mit.edu
-        admin_server = kerberos.csail.mit.edu
-        default_domain = csail.mit.edu
-        krb524_server = krb524.csail.mit.edu
-    }
-    IHTFP.ORG = {
-        kdc = kerberos.ihtfp.org
-        admin_server = kerberos.ihtfp.org
-    }
-    GNU.ORG = {
-        kdc = kerberos.gnu.org
-        kdc = kerberos-2.gnu.org
-        kdc = kerberos-3.gnu.org
-        admin_server = kerberos.gnu.org
-    }
-    1TS.ORG = {
-        kdc = kerberos.1ts.org
-        admin_server = kerberos.1ts.org
-    }
-    GRATUITOUS.ORG = {
-        kdc = kerberos.gratuitous.org
-        admin_server = kerberos.gratuitous.org
-    }
-    DOOMCOM.ORG = {
-        kdc = kerberos.doomcom.org
-        admin_server = kerberos.doomcom.org
-    }
-    ANDREW.CMU.EDU = {
-        kdc = vice28.fs.andrew.cmu.edu
-        kdc = vice2.fs.andrew.cmu.edu
-        kdc = vice11.fs.andrew.cmu.edu
-        kdc = vice12.fs.andrew.cmu.edu
-        admin_server = vice28.fs.andrew.cmu.edu
-        default_domain = andrew.cmu.edu
-    }
-    CS.CMU.EDU = {
-        kdc = kerberos.cs.cmu.edu
-        kdc = kerberos-2.srv.cs.cmu.edu
-        admin_server = kerberos.cs.cmu.edu
-    }
-    DEMENTIA.ORG = {
-        kdc = kerberos.dementia.org
-        kdc = kerberos2.dementia.org
-        admin_server = kerberos.dementia.org
-    }
-    stanford.edu = {
-        kdc = krb5auth1.stanford.edu
-        kdc = krb5auth2.stanford.edu
-        kdc = krb5auth3.stanford.edu
-        admin_server = krb5-admin.stanford.edu
-        default_domain = stanford.edu
-    }
-
-[domain_realm]
-    .${cfg.domainRealm} = ${cfg.defaultRealm}
-    ${cfg.domainRealm} = ${cfg.defaultRealm}
-    .mit.edu = ATHENA.MIT.EDU
-    mit.edu = ATHENA.MIT.EDU
-    .media.mit.edu = MEDIA-LAB.MIT.EDU
-    media.mit.edu = MEDIA-LAB.MIT.EDU
-    .csail.mit.edu = CSAIL.MIT.EDU
-    csail.mit.edu = CSAIL.MIT.EDU
-    .whoi.edu = ATHENA.MIT.EDU
-    whoi.edu = ATHENA.MIT.EDU
-    .stanford.edu = stanford.edu
-
-[logging]
-    kdc = SYSLOG:INFO:DAEMON
-    admin_server = SYSLOG:INFO:DAEMON
-    default = SYSLOG:INFO:DAEMON
-    krb4_convert = true
-    krb4_get_tickets = false
-
-
-[appdefaults]
-    pam = {
-        debug = false
-        ticket_lifetime = 36000
-        renew_lifetime = 36000
-        max_timeout = 30
-        timeout_shift = 2
-        initial_timeout = 1
-    }
-          '';
-        target = "krb5.conf";
-      }
-    ];
+  ###### implementation
+
+  config = mkIf config.krb5.enable {
+
+    environment.systemPackages = [ pkgs.krb5 ];
+
+    environment.etc."krb5.conf".text =
+      ''
+        [libdefaults]
+            default_realm = ${cfg.defaultRealm}
+            encrypt = true
+
+        # The following krb5.conf variables are only for MIT Kerberos.
+            krb4_config = /etc/krb.conf
+            krb4_realms = /etc/krb.realms
+            kdc_timesync = 1
+            ccache_type = 4
+            forwardable = true
+            proxiable = true
+
+        # The following encryption type specification will be used by MIT Kerberos
+        # if uncommented.  In general, the defaults in the MIT Kerberos code are
+        # correct and overriding these specifications only serves to disable new
+        # encryption types as they are added, creating interoperability problems.
+
+        #   default_tgs_enctypes = aes256-cts arcfour-hmac-md5 des3-hmac-sha1 des-cbc-crc des-cbc-md5
+        #   default_tkt_enctypes = aes256-cts arcfour-hmac-md5 des3-hmac-sha1 des-cbc-crc des-cbc-md5
+        #   permitted_enctypes = aes256-cts arcfour-hmac-md5 des3-hmac-sha1 des-cbc-crc des-cbc-md5
+
+        # The following libdefaults parameters are only for Heimdal Kerberos.
+            v4_instance_resolve = false
+            v4_name_convert = {
+                host = {
+                    rcmd = host
+                    ftp = ftp
+                }
+                plain = {
+                    something = something-else
+                }
+            }
+            fcc-mit-ticketflags = true
+
+        [realms]
+            ${cfg.defaultRealm} = {
+                kdc = ${cfg.kdc}
+                admin_server = ${cfg.kerberosAdminServer}
+                #kpasswd_server = ${cfg.kerberosAdminServer}
+            }
+            ATHENA.MIT.EDU = {
+                kdc = kerberos.mit.edu:88
+                kdc = kerberos-1.mit.edu:88
+                kdc = kerberos-2.mit.edu:88
+                admin_server = kerberos.mit.edu
+                default_domain = mit.edu
+            }
+            MEDIA-LAB.MIT.EDU = {
+                kdc = kerberos.media.mit.edu
+                admin_server = kerberos.media.mit.edu
+            }
+            ZONE.MIT.EDU = {
+                kdc = casio.mit.edu
+                kdc = seiko.mit.edu
+                admin_server = casio.mit.edu
+            }
+            MOOF.MIT.EDU = {
+                kdc = three-headed-dogcow.mit.edu:88
+                kdc = three-headed-dogcow-1.mit.edu:88
+                admin_server = three-headed-dogcow.mit.edu
+            }
+            CSAIL.MIT.EDU = {
+                kdc = kerberos-1.csail.mit.edu
+                kdc = kerberos-2.csail.mit.edu
+                admin_server = kerberos.csail.mit.edu
+                default_domain = csail.mit.edu
+                krb524_server = krb524.csail.mit.edu
+            }
+            IHTFP.ORG = {
+                kdc = kerberos.ihtfp.org
+                admin_server = kerberos.ihtfp.org
+            }
+            GNU.ORG = {
+                kdc = kerberos.gnu.org
+                kdc = kerberos-2.gnu.org
+                kdc = kerberos-3.gnu.org
+                admin_server = kerberos.gnu.org
+            }
+            1TS.ORG = {
+                kdc = kerberos.1ts.org
+                admin_server = kerberos.1ts.org
+            }
+            GRATUITOUS.ORG = {
+                kdc = kerberos.gratuitous.org
+                admin_server = kerberos.gratuitous.org
+            }
+            DOOMCOM.ORG = {
+                kdc = kerberos.doomcom.org
+                admin_server = kerberos.doomcom.org
+            }
+            ANDREW.CMU.EDU = {
+                kdc = vice28.fs.andrew.cmu.edu
+                kdc = vice2.fs.andrew.cmu.edu
+                kdc = vice11.fs.andrew.cmu.edu
+                kdc = vice12.fs.andrew.cmu.edu
+                admin_server = vice28.fs.andrew.cmu.edu
+                default_domain = andrew.cmu.edu
+            }
+            CS.CMU.EDU = {
+                kdc = kerberos.cs.cmu.edu
+                kdc = kerberos-2.srv.cs.cmu.edu
+                admin_server = kerberos.cs.cmu.edu
+            }
+            DEMENTIA.ORG = {
+                kdc = kerberos.dementia.org
+                kdc = kerberos2.dementia.org
+                admin_server = kerberos.dementia.org
+            }
+            stanford.edu = {
+                kdc = krb5auth1.stanford.edu
+                kdc = krb5auth2.stanford.edu
+                kdc = krb5auth3.stanford.edu
+                admin_server = krb5-admin.stanford.edu
+                default_domain = stanford.edu
+            }
+
+        [domain_realm]
+            .${cfg.domainRealm} = ${cfg.defaultRealm}
+            ${cfg.domainRealm} = ${cfg.defaultRealm}
+            .mit.edu = ATHENA.MIT.EDU
+            mit.edu = ATHENA.MIT.EDU
+            .media.mit.edu = MEDIA-LAB.MIT.EDU
+            media.mit.edu = MEDIA-LAB.MIT.EDU
+            .csail.mit.edu = CSAIL.MIT.EDU
+            csail.mit.edu = CSAIL.MIT.EDU
+            .whoi.edu = ATHENA.MIT.EDU
+            whoi.edu = ATHENA.MIT.EDU
+            .stanford.edu = stanford.edu
+
+        [logging]
+            kdc = SYSLOG:INFO:DAEMON
+            admin_server = SYSLOG:INFO:DAEMON
+            default = SYSLOG:INFO:DAEMON
+            krb4_convert = true
+            krb4_get_tickets = false
+
+        [appdefaults]
+            pam = {
+                debug = false
+                ticket_lifetime = 36000
+                renew_lifetime = 36000
+                max_timeout = 30
+                timeout_shift = 2
+                initial_timeout = 1
+            }
+      '';
+
   };
 
 }
diff --git a/modules/config/ldap.nix b/modules/config/ldap.nix
index 955d28514ea..113f5d8bcbd 100644
--- a/modules/config/ldap.nix
+++ b/modules/config/ldap.nix
@@ -1,150 +1,12 @@
-{pkgs, config, ...}:
+{ config, pkgs, ... }:
 
 with pkgs.lib;
 with pkgs;
 
-###### interface
 let
-  inherit mkOption mkIf optionalString stringAfter singleton;
 
   cfg = config.users.ldap;
 
-  options = {
-    users = {
-      ldap = {
-
-        enable = mkOption {
-          default = false;
-          description = "
-            Whether to enable authentication against an LDAP server.
-          ";
-        };
-
-        server = mkOption {
-          example = "ldap://ldap.example.org/";
-          description = "
-            The URL of the LDAP server.
-          ";
-        };
-
-        base = mkOption {
-          example = "dc=example,dc=org";
-          description = "
-            The distinguished name of the search base.
-          ";
-        };
-
-        useTLS = mkOption {
-          default = false;
-          description = "
-            If enabled, use TLS (encryption) over an LDAP (port 389)
-            connection.  The alternative is to specify an LDAPS server (port
-            636) in <option>users.ldap.server</option> or to forego
-            security.
-          ";
-        };
-
-        timeLimit = mkOption {
-          default = 0;
-          type = types.int;
-          description = "
-            Specifies the time limit (in seconds) to use when performing
-            searches. A value of zero (0), which is the default, is to
-            wait indefinitely for searches to be completed.
-          ";
-        };
-
-        daemon = {
-          enable = mkOption {
-            default = false;
-            description = ''
-              Whether to let the nslcd daemon (nss-pam-ldapd) handle the
-              LDAP lookups for NSS and PAM. This can improve performance,
-              and if you need to bind to the LDAP server with a password,
-              it increases security, since only the nslcd user needs to
-              have access to the bindpw file, not everyone that uses NSS
-              and/or PAM. If this option is enabled, a local nscd user is
-              created automatically, and the nslcd service is started
-              automatically when the network get up.
-            '';
-          };
-
-          extraConfig = mkOption { 
-            default =  ""; 
-            type = types.string;
-            description = '' 
-              Extra configuration options that will be added verbatim at
-              the end of the nslcd configuration file (nslcd.conf).
-            '' ;
-          } ; 
-        };
-
-        bind = {
-          distinguishedName = mkOption {
-            default = "";
-            example = "cn=admin,dc=example,dc=com";
-            type = types.string;
-            description = "
-              The distinguished name to bind to the LDAP server with. If this
-              is not specified, an anonymous bind will be done.
-            ";
-          };
-
-          password = mkOption {
-            default = "/etc/ldap/bind.password";
-            type = types.string;
-            description = "
-              The path to a file containing the credentials to use when binding
-              to the LDAP server (if not binding anonymously).
-            ";
-          };
-
-          timeLimit = mkOption {
-            default = 30;
-            type = types.int;
-            description = "
-              Specifies the time limit (in seconds) to use when connecting
-              to the directory server. This is distinct from the time limit
-              specified in <literal>users.ldap.timeLimit</literal> and affects
-              the initial server connection only.
-            ";
-          };
-
-          policy = mkOption {
-            default = "hard_open";
-            type = types.string;
-            description = "
-              Specifies the policy to use for reconnecting to an unavailable
-              LDAP server. The default is <literal>hard_open</literal>, which
-              reconnects if opening the connection to the directory server
-              failed. By contrast, <literal>hard_init</literal> reconnects if
-              initializing the connection failed. Initializing may not
-              actually contact the directory server, and it is possible that
-              a malformed configuration file will trigger reconnection. If
-              <literal>soft</literal> is specified, then
-              <literal>nss_ldap</literal> will return immediately on server
-              failure. All hard reconnect policies block with exponential
-              backoff before retrying.
-            ";
-          };
-        };
-
-        extraConfig = mkOption { 
-          default = "" ; 
-          type = types.string ;
-          description = ''
-            Extra configuration options that will be added verbatim at
-            the end of the ldap configuration file (ldap.conf).
-            If <literal>users.ldap.daemon</literal> is enabled, this
-            configuration will not be used. In that case, use
-            <literal>users.ldap.daemon.extraConfig</literal> instead.
-          '' ;
-        };
-
-      };
-    };
-  };
-
   # Careful: OpenLDAP seems to be very picky about the indentation of
   # this file.  Directives HAVE to start in the first column!
   ldapConfig = {
@@ -186,63 +48,199 @@ let
 
 in
 
-###### implementation
-mkIf cfg.enable {
-  require = [
-    options
-  ];
-
-  environment.etc = if cfg.daemon.enable then [nslcdConfig] else [ldapConfig];
-
-  system.activationScripts = mkIf insertLdapPassword {
-    ldap = stringAfter [ "etc" "groups" "users" ] ''
-      if test -f "${cfg.bind.password}" ; then
-        echo "bindpw "$(cat ${cfg.bind.password})"" | cat ${ldapConfig} - > /etc/ldap.conf.bindpw
-        mv -fT /etc/ldap.conf.bindpw /etc/ldap.conf
-        chmod 600 /etc/ldap.conf
-      fi
-    '';
-  };
+{
 
-  system.nssModules = singleton (
-    if cfg.daemon.enable then nss_pam_ldapd else nss_ldap
-  );
+  ###### interface
 
-  users = mkIf cfg.daemon.enable {
-    extraGroups.nslcd = {
-      gid = config.ids.gids.nslcd;
-    };
+  options = {
+
+    users.ldap = {
+
+      enable = mkOption {
+        default = false;
+        description = "Whether to enable authentication against an LDAP server.";
+      };
+
+      server = mkOption {
+        example = "ldap://ldap.example.org/";
+        description = "The URL of the LDAP server.";
+      };
+
+      base = mkOption {
+        example = "dc=example,dc=org";
+        description = "The distinguished name of the search base.";
+      };
+
+      useTLS = mkOption {
+        default = false;
+        description = ''
+          If enabled, use TLS (encryption) over an LDAP (port 389)
+          connection.  The alternative is to specify an LDAPS server (port
+          636) in <option>users.ldap.server</option> or to forego
+          security.
+        '';
+      };
+
+      timeLimit = mkOption {
+        default = 0;
+        type = types.int;
+        description = ''
+          Specifies the time limit (in seconds) to use when performing
+          searches. A value of zero (0), which is the default, is to
+          wait indefinitely for searches to be completed.
+        '';
+      };
+
+      daemon = {
+        enable = mkOption {
+          default = false;
+          description = ''
+            Whether to let the nslcd daemon (nss-pam-ldapd) handle the
+            LDAP lookups for NSS and PAM. This can improve performance,
+            and if you need to bind to the LDAP server with a password,
+            it increases security, since only the nslcd user needs to
+            have access to the bindpw file, not everyone that uses NSS
+            and/or PAM. If this option is enabled, a local nscd user is
+            created automatically, and the nslcd service is started
+            automatically when the network get up.
+          '';
+        };
+
+        extraConfig = mkOption {
+          default =  "";
+          type = types.string;
+          description = ''
+            Extra configuration options that will be added verbatim at
+            the end of the nslcd configuration file (nslcd.conf).
+          '' ;
+        } ;
+      };
+
+      bind = {
+        distinguishedName = mkOption {
+          default = "";
+          example = "cn=admin,dc=example,dc=com";
+          type = types.string;
+          description = ''
+            The distinguished name to bind to the LDAP server with. If this
+            is not specified, an anonymous bind will be done.
+          '';
+        };
+
+        password = mkOption {
+          default = "/etc/ldap/bind.password";
+          type = types.string;
+          description = ''
+            The path to a file containing the credentials to use when binding
+            to the LDAP server (if not binding anonymously).
+          '';
+        };
+
+        timeLimit = mkOption {
+          default = 30;
+          type = types.int;
+          description = ''
+            Specifies the time limit (in seconds) to use when connecting
+            to the directory server. This is distinct from the time limit
+            specified in <literal>users.ldap.timeLimit</literal> and affects
+            the initial server connection only.
+          '';
+        };
+
+        policy = mkOption {
+          default = "hard_open";
+          type = types.string;
+          description = ''
+            Specifies the policy to use for reconnecting to an unavailable
+            LDAP server. The default is <literal>hard_open</literal>, which
+            reconnects if opening the connection to the directory server
+            failed. By contrast, <literal>hard_init</literal> reconnects if
+            initializing the connection failed. Initializing may not
+            actually contact the directory server, and it is possible that
+            a malformed configuration file will trigger reconnection. If
+            <literal>soft</literal> is specified, then
+            <literal>nss_ldap</literal> will return immediately on server
+            failure. All hard reconnect policies block with exponential
+            backoff before retrying.
+          '';
+        };
+      };
+
+      extraConfig = mkOption {
+        default = "";
+        type = types.string;
+        description = ''
+          Extra configuration options that will be added verbatim at
+          the end of the ldap configuration file (ldap.conf).
+          If <literal>users.ldap.daemon</literal> is enabled, this
+          configuration will not be used. In that case, use
+          <literal>users.ldap.daemon.extraConfig</literal> instead.
+        '' ;
+      };
 
-    extraUsers.nslcd = {
-      uid = config.ids.uids.nslcd;
-      description = "nslcd user.";
-      group = "nslcd";
     };
+
   };
 
-  systemd.services = mkIf cfg.daemon.enable {
-    nslcd = {
-      wantedBy = [ "nss-user-lookup.target" ];
-      before = [ "nss-user-lookup.target" ];
-      after = [ "network.target" ];
-
-      preStart = ''
-        mkdir -p /run/nslcd
-        rm -f /run/nslcd/nslcd.pid;
-        chown nslcd.nslcd /run/nslcd
-        ${optionalString (cfg.bind.distinguishedName != "") ''
-          if test -s "${cfg.bind.password}" ; then
-            ln -sfT "${cfg.bind.password}" /run/nslcd/bindpw
-          fi
-        ''}
+  ###### implementation
+
+  config = mkIf cfg.enable {
+
+    environment.etc = if cfg.daemon.enable then [nslcdConfig] else [ldapConfig];
+
+    system.activationScripts = mkIf insertLdapPassword {
+      ldap = stringAfter [ "etc" "groups" "users" ] ''
+        if test -f "${cfg.bind.password}" ; then
+          echo "bindpw "$(cat ${cfg.bind.password})"" | cat ${ldapConfig} - > /etc/ldap.conf.bindpw
+          mv -fT /etc/ldap.conf.bindpw /etc/ldap.conf
+          chmod 600 /etc/ldap.conf
+        fi
       '';
+    };
+
+    system.nssModules = singleton (
+      if cfg.daemon.enable then nss_pam_ldapd else nss_ldap
+    );
+
+    users = mkIf cfg.daemon.enable {
+      extraGroups.nslcd = {
+        gid = config.ids.gids.nslcd;
+      };
+
+      extraUsers.nslcd = {
+        uid = config.ids.uids.nslcd;
+        description = "nslcd user.";
+        group = "nslcd";
+      };
+    };
 
-      serviceConfig = {
-        ExecStart = "${nss_pam_ldapd}/sbin/nslcd";
-        Type = "forking";
-        PIDFile = "/run/nslcd/nslcd.pid";
-        Restart = "always";
+    systemd.services = mkIf cfg.daemon.enable {
+
+      nslcd = {
+        wantedBy = [ "nss-user-lookup.target" ];
+        before = [ "nss-user-lookup.target" ];
+        after = [ "network.target" ];
+
+        preStart = ''
+          mkdir -p /run/nslcd
+          rm -f /run/nslcd/nslcd.pid;
+          chown nslcd.nslcd /run/nslcd
+          ${optionalString (cfg.bind.distinguishedName != "") ''
+            if test -s "${cfg.bind.password}" ; then
+              ln -sfT "${cfg.bind.password}" /run/nslcd/bindpw
+            fi
+          ''}
+        '';
+
+        serviceConfig = {
+          ExecStart = "${nss_pam_ldapd}/sbin/nslcd";
+          Type = "forking";
+          PIDFile = "/run/nslcd/nslcd.pid";
+          Restart = "always";
+        };
       };
+
     };
+
   };
 }
diff --git a/modules/config/networking.nix b/modules/config/networking.nix
index 799d97a089f..f1bdfd01b24 100644
--- a/modules/config/networking.nix
+++ b/modules/config/networking.nix
@@ -1,6 +1,6 @@
 # /etc files related to networking, such as /etc/services.
 
-{config, pkgs, ...}:
+{ config, pkgs, ... }:
 
 with pkgs.lib;
 
@@ -8,6 +8,10 @@ let
 
   cfg = config.networking;
 
+in
+
+{
+
   options = {
 
     networking.extraHosts = pkgs.lib.mkOption {
@@ -32,53 +36,53 @@ let
 
   };
 
-in
+  config = {
 
-{
-  require = [options];
-
-  environment.etc =
-    { # /etc/services: TCP/UDP port assignments.
-      "services".source = pkgs.iana_etc + "/etc/services";
-
-      # /etc/protocols: IP protocol numbers.
-      "protocols".source  = pkgs.iana_etc + "/etc/protocols";
-
-      # /etc/rpc: RPC program numbers.
-      "rpc".source = pkgs.glibc + "/etc/rpc";
-
-      # /etc/hosts: Hostname-to-IP mappings.
-      "hosts".text =
-        ''
-          127.0.0.1 localhost
-          ${optionalString cfg.enableIPv6 ''
-            ::1 localhost
-          ''}
-          ${cfg.extraHosts}
-        '';
-
-      # /etc/resolvconf.conf: Configuration for openresolv.
-      "resolvconf.conf".text =
+    environment.etc =
+      { # /etc/services: TCP/UDP port assignments.
+        "services".source = pkgs.iana_etc + "/etc/services";
+
+        # /etc/protocols: IP protocol numbers.
+        "protocols".source  = pkgs.iana_etc + "/etc/protocols";
+
+        # /etc/rpc: RPC program numbers.
+        "rpc".source = pkgs.glibc + "/etc/rpc";
+
+        # /etc/hosts: Hostname-to-IP mappings.
+        "hosts".text =
           ''
-            # This is the default, but we must set it here to prevent
-            # a collision with an apparently unrelated environment
-            # variable with the same name exported by dhcpcd.
-            interface_order='lo lo[0-9]*'
-          '' + optionalString config.services.nscd.enable ''
-            # Invalidate the nscd cache whenever resolv.conf is
-            # regenerated.
-            libc_restart='${pkgs.systemd}/bin/systemctl try-restart --no-block nscd.service'
-          '' + optionalString cfg.dnsSingleRequest ''
-            # only send one DNS request at a time
-            resolv_conf_options='single-request'
-          '' + optionalString config.services.bind.enable ''
-            # This hosts runs a full-blown DNS resolver.
-            name_servers='127.0.0.1'
+            127.0.0.1 localhost
+            ${optionalString cfg.enableIPv6 ''
+              ::1 localhost
+            ''}
+            ${cfg.extraHosts}
           '';
-    };
 
-  # The ‘ip-up’ target is started when we have IP connectivity.  So
-  # services that depend on IP connectivity (like ntpd) should be
-  # pulled in by this target.
-  systemd.targets.ip-up.description = "Services Requiring IP Connectivity";
+        # /etc/resolvconf.conf: Configuration for openresolv.
+        "resolvconf.conf".text =
+            ''
+              # This is the default, but we must set it here to prevent
+              # a collision with an apparently unrelated environment
+              # variable with the same name exported by dhcpcd.
+              interface_order='lo lo[0-9]*'
+            '' + optionalString config.services.nscd.enable ''
+              # Invalidate the nscd cache whenever resolv.conf is
+              # regenerated.
+              libc_restart='${pkgs.systemd}/bin/systemctl try-restart --no-block nscd.service'
+            '' + optionalString cfg.dnsSingleRequest ''
+              # only send one DNS request at a time
+              resolv_conf_options='single-request'
+            '' + optionalString config.services.bind.enable ''
+              # This hosts runs a full-blown DNS resolver.
+              name_servers='127.0.0.1'
+            '';
+      };
+
+    # The ‘ip-up’ target is started when we have IP connectivity.  So
+    # services that depend on IP connectivity (like ntpd) should be
+    # pulled in by this target.
+    systemd.targets.ip-up.description = "Services Requiring IP Connectivity";
+
+  };
+
 }
diff --git a/modules/config/nsswitch.nix b/modules/config/nsswitch.nix
index 7e989c163e3..0a922756bf9 100644
--- a/modules/config/nsswitch.nix
+++ b/modules/config/nsswitch.nix
@@ -6,17 +6,22 @@ with pkgs.lib;
 
 let
 
+  inherit (config.services.avahi) nssmdns;
+
+in
+
+{
   options = {
 
     # NSS modules.  Hacky!
     system.nssModules = mkOption {
       internal = true;
       default = [];
-      description = "
+      description = ''
         Search path for NSS (Name Service Switch) modules.  This allows
         several DNS resolution methods to be specified via
         <filename>/etc/nsswitch.conf</filename>.
-      ";
+      '';
       merge = mergeListOption;
       apply = list:
         {
@@ -27,34 +32,31 @@ let
 
   };
 
-  inherit (config.services.avahi) nssmdns;
-
-in
+  config = {
+
+    environment.etc =
+      [ # Name Service Switch configuration file.  Required by the C library.
+        # !!! Factor out the mdns stuff.  The avahi module should define
+        # an option used by this module.
+        { source = pkgs.writeText "nsswitch.conf"
+            ''
+              passwd:    files ldap
+              group:     files ldap
+              shadow:    files ldap
+              hosts:     files ${optionalString nssmdns "mdns_minimal [NOTFOUND=return]"} dns ${optionalString nssmdns "mdns"} myhostname
+              networks:  files dns
+              ethers:    files
+              services:  files
+              protocols: files
+            '';
+          target = "nsswitch.conf";
+        }
+      ];
+
+    # Use nss-myhostname to ensure that our hostname always resolves to
+    # a valid IP address.  It returns all locally configured IP
+    # addresses, or ::1 and 127.0.0.2 as fallbacks.
+    system.nssModules = [ pkgs.systemd ];
 
-{
-  require = [ options ];
-
-  environment.etc =
-    [ # Name Service Switch configuration file.  Required by the C library.
-      # !!! Factor out the mdns stuff.  The avahi module should define
-      # an option used by this module.
-      { source = pkgs.writeText "nsswitch.conf"
-          ''
-            passwd:    files ldap
-            group:     files ldap
-            shadow:    files ldap
-            hosts:     files ${optionalString nssmdns "mdns_minimal [NOTFOUND=return]"} dns ${optionalString nssmdns "mdns"} myhostname
-            networks:  files dns
-            ethers:    files
-            services:  files
-            protocols: files
-          '';
-        target = "nsswitch.conf";
-      }
-    ];
-
-  # Use nss-myhostname to ensure that our hostname always resolves to
-  # a valid IP address.  It returns all locally configured IP
-  # addresses, or ::1 and 127.0.0.2 as fallbacks.
-  system.nssModules = [ pkgs.systemd ];
+  };
 }
diff --git a/modules/config/system-path.nix b/modules/config/system-path.nix
index 6e73118fe08..e65be03afac 100644
--- a/modules/config/system-path.nix
+++ b/modules/config/system-path.nix
@@ -54,7 +54,9 @@ let
       extraManpages
     ];
 
+in
 
+{
   options = {
 
     environment = {
@@ -78,9 +80,7 @@ let
         # to work.
         default = [];
         example = ["/"];
-        description = "
-          Lists directories to be symlinked in `/run/current-system/sw'.
-        ";
+        description = "List of directories to be symlinked in `/run/current-system/sw'.";
       };
     };
 
@@ -120,24 +120,23 @@ let
 
   };
 
+  config = {
 
-in
+    environment.systemPackages = requiredPackages;
 
-{
-  require = [ options ];
-
-  environment.systemPackages = requiredPackages;
-  environment.pathsToLink = [
-    "/bin"
-    "/etc/xdg"
-    "/info"
-    "/lib"
-    "/man"
-    "/sbin"
-    "/share/emacs"
-    "/share/org"
-    "/share/info"
-    "/share/terminfo"
-    "/share/man"
-  ];
+    environment.pathsToLink =
+      [ "/bin"
+        "/etc/xdg"
+        "/info"
+        "/lib"
+        "/man"
+        "/sbin"
+        "/share/emacs"
+        "/share/org"
+        "/share/info"
+        "/share/terminfo"
+        "/share/man"
+      ];
+
+  };
 }
diff --git a/modules/config/unix-odbc-drivers.nix b/modules/config/unix-odbc-drivers.nix
index 8950898e1dd..0f608469058 100644
--- a/modules/config/unix-odbc-drivers.nix
+++ b/modules/config/unix-odbc-drivers.nix
@@ -1,43 +1,34 @@
-{pkgs, config, ...}:
+{ config, pkgs, ... }:
 
-###### interface
-let
-  inherit (pkgs.lib) mkOption mkIf;
+with pkgs.lib;
+
+# unixODBC drivers (this solution is not perfect.. Because the user has to
+# ask the admin to add a driver.. but it's simple and works
+
+{
+  ###### interface
 
   options = {
-    environment = {
-      unixODBCDrivers = mkOption {
-        default = [];
-        example = "map (x : x.ini) (with pkgs.unixODBCDrivers; [ mysql psql psqlng ] )";
-        description = ''
-          specifies unix odbc drivers to be registered at /etc/odbcinst.ini.
-          Maybe you also want to add pkgs.unixODBC to the system path to get a
-          command line client t connnect to odbc databases.
-        '';
-      };
+    environment.unixODBCDrivers = mkOption {
+      default = [];
+      example = literalExample "map (x : x.ini) (with pkgs.unixODBCDrivers; [ mysql psql psqlng ] )";
+      description = ''
+        Specifies Unix ODBC drivers to be registered in
+        <filename>/etc/odbcinst.ini</filename>.  You may also want to
+        add <literal>pkgs.unixODBC</literal> to the system path to get
+        a command line client to connnect to ODBC databases.
+      '';
     };
   };
-in
 
-###### implementation
+  ###### implementation
 
+  config = mkIf (config.environment.unixODBCDrivers != []) {
 
-# unixODBC drivers (this solution is not perfect.. Because the user has to
-# ask the admin to add a driver.. but it's simple and works
-
-mkIf (config.environment.unixODBCDrivers != []) {
+    environment.etc."odbcinst.ini".text =
+      let inis = config.environment.unixODBCDrivers;
+      in pkgs.lib.concatStringsSep "\n" inis;
 
-  require = [
-    options
-  ];
-
-  environment = {
-    etc = [
-      { source =
-          let inis = config.environment.unixODBCDrivers;
-          in pkgs.writeText "odbcinst.ini" (pkgs.lib.concatStringsSep "\n" inis);
-        target = "odbcinst.ini";
-      }
-    ];
   };
+
 }
diff --git a/modules/hardware/pcmcia.nix b/modules/hardware/pcmcia.nix
index 0ab5e35ea80..0dba59734ca 100644
--- a/modules/hardware/pcmcia.nix
+++ b/modules/hardware/pcmcia.nix
@@ -1,61 +1,59 @@
-{pkgs, config, ...}:
+{ config, pkgs, ... }:
+
+with pkgs.lib;
 
-###### interface
 let
-  inherit (pkgs.lib) mkOption
-    mergeEnableOption mergeListOption;
+
+  pcmciaUtils = pkgs.pcmciaUtils.passthru.function {
+    inherit (config.hardware.pcmcia) firmware config;
+  };
+
+in
+
+
+{
+  ###### interface
 
   options = {
-    hardware = {
-      pcmcia = {
-        enable = mkOption {
-          default = false;
-          merge = mergeEnableOption;
-          description = ''
-            Enable this option to support PCMCIA card.
-          '';
-        };
-
-        firmware = mkOption {
-          default = [];
-          merge = mergeListOption;
-          description = ''
-            List of firmware used to handle specific PCMCIA card.
-          '';
-        };
-
-        config = mkOption {
-          default = null;
-          description = ''
-            Path to the configuration file which map the memory, irq
-            and ports used by the PCMCIA hardware.
-          '';
-        };
+
+    hardware.pcmcia = {
+      enable = mkOption {
+        default = false;
+        merge = mergeEnableOption;
+        description = ''
+          Enable this option to support PCMCIA card.
+        '';
+      };
+
+      firmware = mkOption {
+        default = [];
+        merge = mergeListOption;
+        description = ''
+          List of firmware used to handle specific PCMCIA card.
+        '';
+      };
+
+      config = mkOption {
+        default = null;
+        description = ''
+          Path to the configuration file which map the memory, irq
+          and ports used by the PCMCIA hardware.
+        '';
       };
     };
+
   };
-in
 
-###### implementation
-let
-  inherit (pkgs.lib) mkIf;
+  ###### implementation
 
-  pcmciaUtils = pkgs.pcmciaUtils.passthru.function {
-    inherit (config.hardware.pcmcia) firmware config;
-  };
-in
+  config = mkIf config.hardware.pcmcia.enable {
 
+    boot.kernelModules = [ "pcmcia" ];
 
-mkIf config.hardware.pcmcia.enable {
-  require = [
-    # ../upstart-jobs/udev.nix
-    # ? # config.environment.extraPackages
-    options
-  ];
+    services.udev.packages = [ pcmciaUtils ];
 
-  boot.kernelModules = [ "pcmcia" ];
+    environment.systemPackages = [ pcmciaUtils ];
 
-  services.udev.packages = [ pcmciaUtils ];
+  };
 
-  environment.systemPackages = [ pcmciaUtils ];
 }
diff --git a/modules/installer/cd-dvd/installation-cd-base.nix b/modules/installer/cd-dvd/installation-cd-base.nix
index 5c67c8e2a9d..31f803bac32 100644
--- a/modules/installer/cd-dvd/installation-cd-base.nix
+++ b/modules/installer/cd-dvd/installation-cd-base.nix
@@ -6,7 +6,7 @@
 with pkgs.lib;
 
 {
-  require =
+  imports =
     [ ./memtest.nix
       ./channel.nix
       ./iso-image.nix
diff --git a/modules/installer/cd-dvd/installation-cd-efi.nix b/modules/installer/cd-dvd/installation-cd-efi.nix
index d018d6aeaa7..4c15fc76584 100644
--- a/modules/installer/cd-dvd/installation-cd-efi.nix
+++ b/modules/installer/cd-dvd/installation-cd-efi.nix
@@ -1,7 +1,7 @@
 { config, pkgs, ... }:
 
 {
-  require = [ ./installation-cd-minimal.nix ];
+  imports = [ ./installation-cd-minimal.nix ];
 
   boot.kernelPackages = pkgs.linuxPackages_3_9;
   boot.vesa = false;
diff --git a/modules/installer/cd-dvd/installation-cd-graphical.nix b/modules/installer/cd-dvd/installation-cd-graphical.nix
index 2d3ef844f27..debf3e7db90 100644
--- a/modules/installer/cd-dvd/installation-cd-graphical.nix
+++ b/modules/installer/cd-dvd/installation-cd-graphical.nix
@@ -6,10 +6,7 @@
 with pkgs.lib;
 
 {
-  require = [
-    ./installation-cd-base.nix
-    ../../profiles/graphical.nix
-  ];
+  imports = [ ./installation-cd-base.nix ../../profiles/graphical.nix ];
 
   # Provide wicd for easy wireless configuration.
   #networking.wicd.enable = true;
diff --git a/modules/installer/cd-dvd/installation-cd-minimal-new-kernel.nix b/modules/installer/cd-dvd/installation-cd-minimal-new-kernel.nix
index eb4af233c3e..38d02ffd162 100644
--- a/modules/installer/cd-dvd/installation-cd-minimal-new-kernel.nix
+++ b/modules/installer/cd-dvd/installation-cd-minimal-new-kernel.nix
@@ -1,7 +1,7 @@
 { config, pkgs, ... }:
 
 {
-  require = [ ./installation-cd-minimal.nix ];
+  imports = [ ./installation-cd-minimal.nix ];
 
   boot.kernelPackages = pkgs.linuxPackages_3_10;
   boot.vesa = false;
diff --git a/modules/installer/cd-dvd/installation-cd-minimal.nix b/modules/installer/cd-dvd/installation-cd-minimal.nix
index f568f2462a0..a7498906a86 100644
--- a/modules/installer/cd-dvd/installation-cd-minimal.nix
+++ b/modules/installer/cd-dvd/installation-cd-minimal.nix
@@ -4,7 +4,7 @@
 { config, pkgs, ... }:
 
 {
-  require =
+  imports =
     [ ./installation-cd-base.nix
       ../../profiles/minimal.nix
     ];
diff --git a/modules/installer/cd-dvd/installation-cd-new-kernel.nix b/modules/installer/cd-dvd/installation-cd-new-kernel.nix
index 058e7ffc899..93bcbf00b25 100644
--- a/modules/installer/cd-dvd/installation-cd-new-kernel.nix
+++ b/modules/installer/cd-dvd/installation-cd-new-kernel.nix
@@ -1,7 +1,7 @@
 { config, pkgs, ... }:
 
 {
-  require = [ ./installation-cd-graphical.nix ];
+  imports = [ ./installation-cd-graphical.nix ];
 
   boot.kernelPackages = pkgs.linuxPackages_3_10;
   boot.vesa = false;
diff --git a/modules/installer/cd-dvd/iso-image.nix b/modules/installer/cd-dvd/iso-image.nix
index 96a4d411d0b..fdc8e6a6f9f 100644
--- a/modules/installer/cd-dvd/iso-image.nix
+++ b/modules/installer/cd-dvd/iso-image.nix
@@ -8,6 +8,79 @@ with pkgs.lib;
 
 let
 
+  # The Grub image.
+  grubImage = pkgs.runCommand "grub_eltorito" {}
+    ''
+      ${pkgs.grub2}/bin/grub-mkimage -O i386-pc -o tmp biosdisk iso9660 help linux linux16 chain png jpeg echo gfxmenu reboot
+      cat ${pkgs.grub2}/lib/grub/*/cdboot.img tmp > $out
+    ''; # */
+
+
+  # The configuration file for Grub.
+  grubCfg =
+    ''
+      set default=${builtins.toString config.boot.loader.grub.default}
+      set timeout=${builtins.toString config.boot.loader.grub.timeout}
+
+      if loadfont /boot/grub/unicode.pf2; then
+        set gfxmode=640x480
+        insmod gfxterm
+        insmod vbe
+        terminal_output gfxterm
+
+        insmod png
+        if background_image /boot/grub/splash.png; then
+          set color_normal=white/black
+          set color_highlight=black/white
+        else
+          set menu_color_normal=cyan/blue
+          set menu_color_highlight=white/blue
+        fi
+
+      fi
+
+      ${config.boot.loader.grub.extraEntries}
+    '';
+
+
+  # The efi boot image
+  efiImg = pkgs.runCommand "efi-image_eltorito" {}
+    ''
+      #Let's hope 10M is enough
+      dd bs=2048 count=5120 if=/dev/zero of="$out"
+      ${pkgs.dosfstools}/sbin/mkfs.vfat "$out"
+      ${pkgs.mtools}/bin/mmd -i "$out" efi
+      ${pkgs.mtools}/bin/mmd -i "$out" efi/boot
+      ${pkgs.mtools}/bin/mmd -i "$out" efi/nixos
+      ${pkgs.mtools}/bin/mmd -i "$out" loader
+      ${pkgs.mtools}/bin/mmd -i "$out" loader/entries
+      ${pkgs.mtools}/bin/mcopy -v -i "$out" \
+        ${pkgs.gummiboot}/lib/gummiboot/gummiboot${targetArch}.efi \
+        ::efi/boot/boot${targetArch}.efi
+      ${pkgs.mtools}/bin/mcopy -v -i "$out" \
+        ${config.boot.kernelPackages.kernel + "/bzImage"} ::bzImage
+      ${pkgs.mtools}/bin/mcopy -v -i "$out" \
+        ${config.system.build.initialRamdisk + "/initrd"} ::efi/nixos/initrd
+      echo "title NixOS LiveCD" > boot-params
+      echo "linux /bzImage" >> boot-params
+      echo "initrd /efi/nixos/initrd" >> boot-params
+      echo "options init=${config.system.build.toplevel}/init ${toString config.boot.kernelParams}" >> boot-params
+      ${pkgs.mtools}/bin/mcopy -v -i "$out" boot-params ::loader/entries/nixos-livecd.conf
+      echo "default nixos-livecd" > boot-params
+      echo "timeout 5" >> boot-params
+      ${pkgs.mtools}/bin/mcopy -v -i "$out" boot-params ::loader/loader.conf
+    '';
+
+  targetArch = if pkgs.stdenv.isi686 then
+    "ia32"
+  else if pkgs.stdenv.isx86_64 then
+    "x64"
+  else
+    throw "Unsupported architecture";
+
+in
+
+{
   options = {
 
     isoImage.isoName = mkOption {
@@ -84,228 +157,157 @@ let
   };
 
 
-  # The Grub image.
-  grubImage = pkgs.runCommand "grub_eltorito" {}
-    ''
-      ${pkgs.grub2}/bin/grub-mkimage -O i386-pc -o tmp biosdisk iso9660 help linux linux16 chain png jpeg echo gfxmenu reboot
-      cat ${pkgs.grub2}/lib/grub/*/cdboot.img tmp > $out
-    ''; # */
+  config = {
 
+    boot.loader.grub.version = 2;
 
-  # The configuration file for Grub.
-  grubCfg =
-    ''
-      set default=${builtins.toString config.boot.loader.grub.default}
-      set timeout=${builtins.toString config.boot.loader.grub.timeout}
+    # Don't build the GRUB menu builder script, since we don't need it
+    # here and it causes a cyclic dependency.
+    boot.loader.grub.enable = false;
 
-      if loadfont /boot/grub/unicode.pf2; then
-        set gfxmode=640x480
-        insmod gfxterm
-        insmod vbe
-        terminal_output gfxterm
+    # !!! Hack - attributes expected by other modules.
+    system.boot.loader.kernelFile = "bzImage";
+    environment.systemPackages = [ pkgs.grub2 ];
 
-        insmod png
-        if background_image /boot/grub/splash.png; then
-          set color_normal=white/black
-          set color_highlight=black/white
-        else
-          set menu_color_normal=cyan/blue
-          set menu_color_highlight=white/blue
-        fi
+    # In stage 1 of the boot, mount the CD as the root FS by label so
+    # that we don't need to know its device.  We pass the label of the
+    # root filesystem on the kernel command line, rather than in
+    # `fileSystems' below.  This allows CD-to-USB converters such as
+    # UNetbootin to rewrite the kernel command line to pass the label or
+    # UUID of the USB stick.  It would be nicer to write
+    # `root=/dev/disk/by-label/...' here, but UNetbootin doesn't
+    # recognise that.
+    boot.kernelParams = [ "root=LABEL=${config.isoImage.volumeID}" ];
 
-      fi
+    # Note that /dev/root is a symlink to the actual root device
+    # specified on the kernel command line, created in the stage 1 init
+    # script.
+    fileSystems."/".device = "/dev/root";
 
-      ${config.boot.loader.grub.extraEntries}
-    '';
+    fileSystems."/nix/store" =
+      { fsType = "squashfs";
+        device = "/nix-store.squashfs";
+        options = "loop";
+      };
 
+    boot.initrd.availableKernelModules = [ "squashfs" "iso9660" ];
 
-  # The efi boot image
-  efiImg = pkgs.runCommand "efi-image_eltorito" {}
-    ''
-      #Let's hope 10M is enough
-      dd bs=2048 count=5120 if=/dev/zero of="$out"
-      ${pkgs.dosfstools}/sbin/mkfs.vfat "$out"
-      ${pkgs.mtools}/bin/mmd -i "$out" efi
-      ${pkgs.mtools}/bin/mmd -i "$out" efi/boot
-      ${pkgs.mtools}/bin/mmd -i "$out" efi/nixos
-      ${pkgs.mtools}/bin/mmd -i "$out" loader
-      ${pkgs.mtools}/bin/mmd -i "$out" loader/entries
-      ${pkgs.mtools}/bin/mcopy -v -i "$out" \
-        ${pkgs.gummiboot}/lib/gummiboot/gummiboot${targetArch}.efi \
-        ::efi/boot/boot${targetArch}.efi
-      ${pkgs.mtools}/bin/mcopy -v -i "$out" \
-        ${config.boot.kernelPackages.kernel + "/bzImage"} ::bzImage
-      ${pkgs.mtools}/bin/mcopy -v -i "$out" \
-        ${config.system.build.initialRamdisk + "/initrd"} ::efi/nixos/initrd
-      echo "title NixOS LiveCD" > boot-params
-      echo "linux /bzImage" >> boot-params
-      echo "initrd /efi/nixos/initrd" >> boot-params
-      echo "options init=${config.system.build.toplevel}/init ${toString config.boot.kernelParams}" >> boot-params
-      ${pkgs.mtools}/bin/mcopy -v -i "$out" boot-params ::loader/entries/nixos-livecd.conf
-      echo "default nixos-livecd" > boot-params
-      echo "timeout 5" >> boot-params
-      ${pkgs.mtools}/bin/mcopy -v -i "$out" boot-params ::loader/loader.conf
-    '';
+    boot.initrd.kernelModules = [ "loop" ];
 
-  targetArch = if pkgs.stdenv.isi686 then
-    "ia32"
-  else if pkgs.stdenv.isx86_64 then
-    "x64"
-  else
-    throw "Unsupported architecture";
+    boot.kernelModules = pkgs.stdenv.lib.optional config.isoImage.makeEfiBootable "efivars";
 
-in
+    # In stage 1, mount a tmpfs on top of / (the ISO image) and
+    # /nix/store (the squashfs image) to make this a live CD.
+    boot.initrd.postMountCommands =
+      ''
+        mkdir -p /unionfs-chroot/ro-root
+        mount --rbind $targetRoot /unionfs-chroot/ro-root
 
-{
-  require = options;
-
-  boot.loader.grub.version = 2;
-
-  # Don't build the GRUB menu builder script, since we don't need it
-  # here and it causes a cyclic dependency.
-  boot.loader.grub.enable = false;
-
-  # !!! Hack - attributes expected by other modules.
-  system.boot.loader.kernelFile = "bzImage";
-  environment.systemPackages = [ pkgs.grub2 ];
-
-  # In stage 1 of the boot, mount the CD as the root FS by label so
-  # that we don't need to know its device.  We pass the label of the
-  # root filesystem on the kernel command line, rather than in
-  # `fileSystems' below.  This allows CD-to-USB converters such as
-  # UNetbootin to rewrite the kernel command line to pass the label or
-  # UUID of the USB stick.  It would be nicer to write
-  # `root=/dev/disk/by-label/...' here, but UNetbootin doesn't
-  # recognise that.
-  boot.kernelParams = [ "root=LABEL=${config.isoImage.volumeID}" ];
-
-  # Note that /dev/root is a symlink to the actual root device
-  # specified on the kernel command line, created in the stage 1 init
-  # script.
-  fileSystems."/".device = "/dev/root";
-
-  fileSystems."/nix/store" =
-    { fsType = "squashfs";
-      device = "/nix-store.squashfs";
-      options = "loop";
-    };
+        mkdir /unionfs-chroot/rw-root
+        mount -t tmpfs -o "mode=755" none /unionfs-chroot/rw-root
+        mkdir /mnt-root-union
+        unionfs -o allow_other,cow,chroot=/unionfs-chroot,max_files=32768 /rw-root=RW:/ro-root=RO /mnt-root-union
+        oldTargetRoot=$targetRoot
+        targetRoot=/mnt-root-union
 
-  boot.initrd.availableKernelModules = [ "squashfs" "iso9660" ];
+        mkdir /unionfs-chroot/rw-store
+        mount -t tmpfs -o "mode=755" none /unionfs-chroot/rw-store
+        mkdir -p $oldTargetRoot/nix/store
+        unionfs -o allow_other,cow,nonempty,chroot=/unionfs-chroot,max_files=32768 /rw-store=RW:/ro-root/nix/store=RO /mnt-root-union/nix/store
+      '';
 
-  boot.initrd.kernelModules = [ "loop" ];
+    # Closures to be copied to the Nix store on the CD, namely the init
+    # script and the top-level system configuration directory.
+    isoImage.storeContents =
+      [ config.system.build.toplevel ] ++
+      optional config.isoImage.includeSystemBuildDependencies
+        config.system.build.toplevel.drvPath;
+
+    # Create the squashfs image that contains the Nix store.
+    system.build.squashfsStore = import ../../../lib/make-squashfs.nix {
+      inherit (pkgs) stdenv squashfsTools perl pathsFromGraph;
+      storeContents = config.isoImage.storeContents;
+    };
 
-  boot.kernelModules = pkgs.stdenv.lib.optional config.isoImage.makeEfiBootable "efivars";
+    # Individual files to be included on the CD, outside of the Nix
+    # store on the CD.
+    isoImage.contents =
+      [ { source = grubImage;
+          target = "/boot/grub/grub_eltorito";
+        }
+        { source = pkgs.writeText "grub.cfg" grubCfg;
+          target = "/boot/grub/grub.cfg";
+        }
+        { source = config.boot.kernelPackages.kernel + "/bzImage";
+          target = "/boot/bzImage";
+        }
+        { source = config.system.build.initialRamdisk + "/initrd";
+          target = "/boot/initrd";
+        }
+        { source = "${pkgs.grub2}/share/grub/unicode.pf2";
+          target = "/boot/grub/unicode.pf2";
+        }
+        { source = config.boot.loader.grub.splashImage;
+          target = "/boot/grub/splash.png";
+        }
+        { source = config.system.build.squashfsStore;
+          target = "/nix-store.squashfs";
+        }
+        { # Quick hack: need a mount point for the store.
+          source = pkgs.runCommand "empty" {} "ensureDir $out";
+          target = "/nix/store";
+        }
+      ] ++ pkgs.stdenv.lib.optionals config.isoImage.makeEfiBootable [
+        { source = efiImg;
+          target = "/boot/efi.img";
+        }
+      ];
+
+    # The Grub menu.
+    boot.loader.grub.extraEntries =
+      ''
+        menuentry "NixOS Installer / Rescue" {
+          linux /boot/bzImage init=${config.system.build.toplevel}/init ${toString config.boot.kernelParams}
+          initrd /boot/initrd
+        }
+
+        menuentry "Boot from hard disk" {
+          set root=(hd0)
+          chainloader +1
+        }
+      '';
 
-  # In stage 1, mount a tmpfs on top of / (the ISO image) and
-  # /nix/store (the squashfs image) to make this a live CD.
-  boot.initrd.postMountCommands =
-    ''
-      mkdir -p /unionfs-chroot/ro-root
-      mount --rbind $targetRoot /unionfs-chroot/ro-root
-
-      mkdir /unionfs-chroot/rw-root
-      mount -t tmpfs -o "mode=755" none /unionfs-chroot/rw-root
-      mkdir /mnt-root-union
-      unionfs -o allow_other,cow,chroot=/unionfs-chroot,max_files=32768 /rw-root=RW:/ro-root=RO /mnt-root-union
-      oldTargetRoot=$targetRoot
-      targetRoot=/mnt-root-union
-
-      mkdir /unionfs-chroot/rw-store
-      mount -t tmpfs -o "mode=755" none /unionfs-chroot/rw-store
-      mkdir -p $oldTargetRoot/nix/store
-      unionfs -o allow_other,cow,nonempty,chroot=/unionfs-chroot,max_files=32768 /rw-store=RW:/ro-root/nix/store=RO /mnt-root-union/nix/store
-    '';
+    boot.loader.grub.timeout = 10;
 
-  # Closures to be copied to the Nix store on the CD, namely the init
-  # script and the top-level system configuration directory.
-  isoImage.storeContents =
-    [ config.system.build.toplevel ] ++
-    optional config.isoImage.includeSystemBuildDependencies
-      config.system.build.toplevel.drvPath;
-
-  # Create the squashfs image that contains the Nix store.
-  system.build.squashfsStore = import ../../../lib/make-squashfs.nix {
-    inherit (pkgs) stdenv squashfsTools perl pathsFromGraph;
-    storeContents = config.isoImage.storeContents;
-  };
+    # Create the ISO image.
+    system.build.isoImage = import ../../../lib/make-iso9660-image.nix ({
+      inherit (pkgs) stdenv perl cdrkit pathsFromGraph;
 
-  # Individual files to be included on the CD, outside of the Nix
-  # store on the CD.
-  isoImage.contents =
-    [ { source = grubImage;
-        target = "/boot/grub/grub_eltorito";
-      }
-      { source = pkgs.writeText "grub.cfg" grubCfg;
-        target = "/boot/grub/grub.cfg";
-      }
-      { source = config.boot.kernelPackages.kernel + "/bzImage";
-        target = "/boot/bzImage";
-      }
-      { source = config.system.build.initialRamdisk + "/initrd";
-        target = "/boot/initrd";
-      }
-      { source = "${pkgs.grub2}/share/grub/unicode.pf2";
-        target = "/boot/grub/unicode.pf2";
-      }
-      { source = config.boot.loader.grub.splashImage;
-        target = "/boot/grub/splash.png";
-      }
-      { source = config.system.build.squashfsStore;
-        target = "/nix-store.squashfs";
-      }
-      { # Quick hack: need a mount point for the store.
-        source = pkgs.runCommand "empty" {} "ensureDir $out";
-        target = "/nix/store";
-      }
-    ] ++ pkgs.stdenv.lib.optionals config.isoImage.makeEfiBootable [
-      { source = efiImg;
-        target = "/boot/efi.img";
-      }
-    ];
-
-  # The Grub menu.
-  boot.loader.grub.extraEntries =
-    ''
-      menuentry "NixOS Installer / Rescue" {
-        linux /boot/bzImage init=${config.system.build.toplevel}/init ${toString config.boot.kernelParams}
-        initrd /boot/initrd
-      }
-
-      menuentry "Boot from hard disk" {
-        set root=(hd0)
-        chainloader +1
-      }
-    '';
+      inherit (config.isoImage) isoName compressImage volumeID contents;
 
-  boot.loader.grub.timeout = 10;
+      bootable = true;
+      bootImage = "/boot/grub/grub_eltorito";
+    } // pkgs.stdenv.lib.optionalAttrs config.isoImage.makeEfiBootable {
+      efiBootable = true;
+      efiBootImage = "boot/efi.img";
+    });
 
-  # Create the ISO image.
-  system.build.isoImage = import ../../../lib/make-iso9660-image.nix ({
-    inherit (pkgs) stdenv perl cdrkit pathsFromGraph;
+    boot.postBootCommands =
+      ''
+        # After booting, register the contents of the Nix store on the
+        # CD in the Nix database in the tmpfs.
+        ${config.environment.nix}/bin/nix-store --load-db < /nix/store/nix-path-registration
 
-    inherit (config.isoImage) isoName compressImage volumeID contents;
+        # nixos-rebuild also requires a "system" profile and an
+        # /etc/NIXOS tag.
+        touch /etc/NIXOS
+        ${config.environment.nix}/bin/nix-env -p /nix/var/nix/profiles/system --set /run/current-system
+      '';
 
-    bootable = true;
-    bootImage = "/boot/grub/grub_eltorito";
-  } // pkgs.stdenv.lib.optionalAttrs config.isoImage.makeEfiBootable {
-    efiBootable = true;
-    efiBootImage = "boot/efi.img";
-  });
+    # Add vfat support to the initrd to enable people to copy the
+    # contents of the CD to a bootable USB stick. Need unionfs-fuse for union mounts
+    boot.initrd.supportedFilesystems = [ "vfat" "unionfs-fuse" ];
 
-  boot.postBootCommands =
-    ''
-      # After booting, register the contents of the Nix store on the
-      # CD in the Nix database in the tmpfs.
-      ${config.environment.nix}/bin/nix-store --load-db < /nix/store/nix-path-registration
-
-      # nixos-rebuild also requires a "system" profile and an
-      # /etc/NIXOS tag.
-      touch /etc/NIXOS
-      ${config.environment.nix}/bin/nix-env -p /nix/var/nix/profiles/system --set /run/current-system
-    '';
+  };
 
-  # Add vfat support to the initrd to enable people to copy the
-  # contents of the CD to a bootable USB stick. Need unionfs-fuse for union mounts
-  boot.initrd.supportedFilesystems = [ "vfat" "unionfs-fuse" ];
-    
 }
diff --git a/modules/installer/cd-dvd/live-dvd.nix b/modules/installer/cd-dvd/live-dvd.nix
index c5a89a3173e..e57be6d442e 100644
--- a/modules/installer/cd-dvd/live-dvd.nix
+++ b/modules/installer/cd-dvd/live-dvd.nix
@@ -1,11 +1,11 @@
-{config, pkgs, ...}:
+{ config, pkgs, ... }:
 
 {
-  require = [./installation-cd-base.nix];
+  imports = [ ./installation-cd-base.nix ];
 
   # Build the build-time dependencies of this configuration on the DVD
   # to speed up installation.
-  isoImage.storeContents = [config.system.build.toplevel.drvPath];
+  isoImage.storeContents = [ config.system.build.toplevel.drvPath ];
 
   # Include lots of packages.
   environment.systemPackages =
diff --git a/modules/installer/cd-dvd/system-tarball-fuloong2f.nix b/modules/installer/cd-dvd/system-tarball-fuloong2f.nix
index 9953d08d698..968605734a1 100644
--- a/modules/installer/cd-dvd/system-tarball-fuloong2f.nix
+++ b/modules/installer/cd-dvd/system-tarball-fuloong2f.nix
@@ -12,15 +12,10 @@ let
   # evaluated.  So we'll just hope for the best.
   dummyConfiguration = pkgs.writeText "configuration.nix"
     ''
-      {config, pkgs, ...}:
+      { config, pkgs, ... }:
 
-      {
-        require = [ ];
-
-        # Add your own options below
-        # E.g.,
+      { # Add your own options below, e.g.:
         #   services.openssh.enable = true;
-
         nixpkgs.config.platform = pkgs.platforms.fuloong2f_n32;
       }
     '';
@@ -45,11 +40,7 @@ let
 in
 
 {
-  require =
-    [
-      ./system-tarball.nix
-    ];
-
+  imports = [ ./system-tarball.nix ];
 
   # Disable some other stuff we don't need.
   security.sudo.enable = false;
diff --git a/modules/installer/cd-dvd/system-tarball-pc.nix b/modules/installer/cd-dvd/system-tarball-pc.nix
index 91eba4ec852..7619f074b74 100644
--- a/modules/installer/cd-dvd/system-tarball-pc.nix
+++ b/modules/installer/cd-dvd/system-tarball-pc.nix
@@ -65,7 +65,7 @@ let
 in
 
 {
-  require =
+  imports =
     [ ./system-tarball.nix
 
       # Profiles of this basic installation.
diff --git a/modules/installer/cd-dvd/system-tarball-sheevaplug.nix b/modules/installer/cd-dvd/system-tarball-sheevaplug.nix
index 06a02333062..ed78bc2a067 100644
--- a/modules/installer/cd-dvd/system-tarball-sheevaplug.nix
+++ b/modules/installer/cd-dvd/system-tarball-sheevaplug.nix
@@ -15,11 +15,9 @@ let
   # evaluated.  So we'll just hope for the best.
   dummyConfiguration = pkgs.writeText "configuration.nix"
     ''
-      {config, pkgs, ...}:
+      { config, pkgs, ... }:
 
       {
-        require = [ ];
-
         # Add your own options below and run "nixos-rebuild switch".
         # E.g.,
         #   services.openssh.enable = true;
@@ -39,10 +37,7 @@ let
 in
 
 {
-  require =
-    [
-      ./system-tarball.nix
-    ];
+  imports = [ ./system-tarball.nix ];
 
   # Disable some other stuff we don't need.
   security.sudo.enable = false;
diff --git a/modules/installer/cd-dvd/system-tarball.nix b/modules/installer/cd-dvd/system-tarball.nix
index 95f7582d0ca..6bf8eebdac5 100644
--- a/modules/installer/cd-dvd/system-tarball.nix
+++ b/modules/installer/cd-dvd/system-tarball.nix
@@ -8,6 +8,11 @@ with pkgs.lib;
 
 let
 
+  versionFile = pkgs.writeText "nixos-version" config.system.nixosVersion;
+
+in
+
+{
   options = {
     tarball.contents = mkOption {
       example =
@@ -31,59 +36,57 @@ let
 
   };
 
-  versionFile = pkgs.writeText "nixos-version" config.system.nixosVersion;
+  config = {
 
-in
+    # In stage 1 of the boot, mount the CD/DVD as the root FS by label
+    # so that we don't need to know its device.
+    fileSystems = [ ];
+
+    # boot.initrd.availableKernelModules = [ "mvsdio" "mmc_block" "reiserfs" "ext3" "ext4" ];
+
+    # boot.initrd.kernelModules = [ "rtc_mv" ];
+
+    # Closures to be copied to the Nix store on the CD, namely the init
+    # script and the top-level system configuration directory.
+    tarball.storeContents =
+      [ { object = config.system.build.toplevel;
+          symlink = "/run/current-system";
+        }
+      ];
+
+    # Individual files to be included on the CD, outside of the Nix
+    # store on the CD.
+    tarball.contents =
+      [ { source = config.system.build.initialRamdisk + "/initrd";
+          target = "/boot/initrd";
+        }
+        { source = versionFile;
+          target = "/nixos-version.txt";
+        }
+      ];
+
+    # Create the tarball
+    system.build.tarball = import ../../../lib/make-system-tarball.nix {
+      inherit (pkgs) stdenv perl xz pathsFromGraph;
+
+      inherit (config.tarball) contents storeContents;
+    };
+
+    boot.postBootCommands =
+      ''
+        # After booting, register the contents of the Nix store on the
+        # CD in the Nix database in the tmpfs.
+        if [ -f /nix-path-registration ]; then
+          ${config.environment.nix}/bin/nix-store --load-db < /nix-path-registration &&
+          rm /nix-path-registration
+        fi
+
+        # nixos-rebuild also requires a "system" profile and an
+        # /etc/NIXOS tag.
+        touch /etc/NIXOS
+        ${config.environment.nix}/bin/nix-env -p /nix/var/nix/profiles/system --set /run/current-system
+      '';
 
-{
-  require = options;
-
-  # In stage 1 of the boot, mount the CD/DVD as the root FS by label
-  # so that we don't need to know its device.
-  fileSystems = [ ];
-
-  # boot.initrd.availableKernelModules = [ "mvsdio" "mmc_block" "reiserfs" "ext3" "ext4" ];
-
-  # boot.initrd.kernelModules = [ "rtc_mv" ];
-
-  # Closures to be copied to the Nix store on the CD, namely the init
-  # script and the top-level system configuration directory.
-  tarball.storeContents =
-    [ { object = config.system.build.toplevel;
-        symlink = "/run/current-system";
-      }
-    ];
-
-  # Individual files to be included on the CD, outside of the Nix
-  # store on the CD.
-  tarball.contents =
-    [ { source = config.system.build.initialRamdisk + "/initrd";
-        target = "/boot/initrd";
-      }
-      { source = versionFile;
-        target = "/nixos-version.txt";
-      }
-    ];
-
-  # Create the tarball
-  system.build.tarball = import ../../../lib/make-system-tarball.nix {
-    inherit (pkgs) stdenv perl xz pathsFromGraph;
-
-    inherit (config.tarball) contents storeContents;
   };
 
-  boot.postBootCommands =
-    ''
-      # After booting, register the contents of the Nix store on the
-      # CD in the Nix database in the tmpfs.
-      if [ -f /nix-path-registration ]; then
-        ${config.environment.nix}/bin/nix-store --load-db < /nix-path-registration &&
-        rm /nix-path-registration
-      fi
-
-      # nixos-rebuild also requires a "system" profile and an
-      # /etc/NIXOS tag.
-      touch /etc/NIXOS
-      ${config.environment.nix}/bin/nix-env -p /nix/var/nix/profiles/system --set /run/current-system
-    '';
 }
diff --git a/modules/installer/tools/nixos-hardware-scan.pl b/modules/installer/tools/nixos-hardware-scan.pl
index 5b90607f4b0..3204f3d4051 100644
--- a/modules/installer/tools/nixos-hardware-scan.pl
+++ b/modules/installer/tools/nixos-hardware-scan.pl
@@ -8,7 +8,7 @@ my @attrs = ();
 my @kernelModules = ();
 my @initrdKernelModules = ();
 my @modulePackages = ();
-my @requires = ("<nixos/modules/installer/scan/not-detected.nix>");
+my @imports = ("<nixos/modules/installer/scan/not-detected.nix>");
 
 
 sub debug {
@@ -227,7 +227,7 @@ my $initrdKernelModules = toNixExpr(removeDups @initrdKernelModules);
 my $kernelModules = toNixExpr(removeDups @kernelModules);
 my $modulePackages = toNixExpr(removeDups @modulePackages);
 my $attrs = multiLineList("  ", removeDups @attrs);
-my $requires = multiLineList("    ", removeDups @requires);
+my $imports = multiLineList("    ", removeDups @imports);
 
 
 print <<EOF ;
@@ -236,7 +236,7 @@ print <<EOF ;
 { config, pkgs, ... }:
 
 {
-  require = [$requires  ];
+  imports = [$imports  ];
 
   boot.initrd.kernelModules = [$initrdKernelModules ];
   boot.kernelModules = [$kernelModules ];
diff --git a/modules/installer/tools/nixos-option.sh b/modules/installer/tools/nixos-option.sh
index 4cc6ae64bdc..a542601e57d 100644
--- a/modules/installer/tools/nixos-option.sh
+++ b/modules/installer/tools/nixos-option.sh
@@ -215,7 +215,7 @@ if $generate; then
 { config, pkgs, ... }:
 
 {
-  require =
+  imports =
     [ # Include the results of the hardware scan.
       ./hardware-configuration.nix
     ];
diff --git a/modules/installer/virtualbox-demo.nix b/modules/installer/virtualbox-demo.nix
index 3b4238858bd..e3f86edcbf0 100644
--- a/modules/installer/virtualbox-demo.nix
+++ b/modules/installer/virtualbox-demo.nix
@@ -1,7 +1,7 @@
 { config, pkgs, ... }:
 
 {
-  require =
+  imports =
     [ ../virtualisation/virtualbox-image.nix
       ../installer/cd-dvd/channel.nix
       ../profiles/demo.nix
diff --git a/modules/misc/ids.nix b/modules/misc/ids.nix
index 6bb98c354db..ca1cc4dc199 100644
--- a/modules/misc/ids.nix
+++ b/modules/misc/ids.nix
@@ -1,10 +1,9 @@
 # This module defines the global list of uids and gids.  We keep a
 # central list to prevent id collisions.
 
-{config, pkgs, ...}:
-
-let
+{ config, pkgs, ... }:
 
+{
   options = {
 
     ids.uids = pkgs.lib.mkOption {
@@ -21,181 +20,181 @@ let
 
   };
 
-in
 
-{
-  require = options;
+  config = {
 
-  ids.uids = {
-    root = 0;
-    nscd = 1;
-    sshd = 2;
-    ntp = 3;
-    messagebus = 4; # D-Bus
-    haldaemon = 5;
-    nagios = 6;
-    vsftpd = 7;
-    ftp = 8;
-    bitlbee = 9;
-    avahi = 10;
-    portmap = 11;
-    atd = 12;
-    zabbix = 13;
-    postfix = 14;
-    dovecot = 15;
-    tomcat = 16;
-    pulseaudio = 22; # must match `pulseaudio' GID
-    gpsd = 23;
-    polkituser = 28;
-    uptimed = 29;
-    ddclient = 30;
-    davfs2 = 31;
-    privoxy = 32;
-    osgi = 34;
-    tor = 35;
-    cups = 36;
-    foldingAtHome = 37;
-    sabnzbd = 38;
-    kdm = 39;
-    ghostOne = 40;
-    git = 41;
-    fourStore = 42;
-    fourStoreEndpoint = 43;
-    virtuoso = 44;
-    rtkit = 45;
-    dovecot2 = 46;
-    dovenull2 = 47;
-    unbound = 48;
-    prayer = 49;
-    mpd = 50;
-    clamav = 51;
-    fprot = 52;
-    bind = 53;
-    wwwrun = 54;
-    spamd = 56;
-    nslcd = 58;
-    nginx = 60;
-    chrony = 61;
-    smtpd = 63;
-    smtpq = 64;
-    supybot = 65;
-    iodined = 66;
-    graphite = 68;
-    statsd = 69;
-    transmission = 70;
-    postgres = 71;
-    smbguest = 74;
-    varnish = 75;
-    dd-agent = 76;
-    lighttpd = 77;
-    lightdm = 78;
-    freenet = 79;
-    ircd = 80;
-    bacula = 81;
-    almir = 82;
-    deluge = 83;
-    mysql = 84;
-    rabbitmq = 85;
-    activemq = 86;
-    gnunet = 87;
-    oidentd = 88;
-    quassel = 89;
-    amule = 90;
-    minidlna = 91;
-    elasticsearch = 92;
+    ids.uids = {
+      root = 0;
+      nscd = 1;
+      sshd = 2;
+      ntp = 3;
+      messagebus = 4; # D-Bus
+      haldaemon = 5;
+      nagios = 6;
+      vsftpd = 7;
+      ftp = 8;
+      bitlbee = 9;
+      avahi = 10;
+      portmap = 11;
+      atd = 12;
+      zabbix = 13;
+      postfix = 14;
+      dovecot = 15;
+      tomcat = 16;
+      pulseaudio = 22; # must match `pulseaudio' GID
+      gpsd = 23;
+      polkituser = 28;
+      uptimed = 29;
+      ddclient = 30;
+      davfs2 = 31;
+      privoxy = 32;
+      osgi = 34;
+      tor = 35;
+      cups = 36;
+      foldingAtHome = 37;
+      sabnzbd = 38;
+      kdm = 39;
+      ghostOne = 40;
+      git = 41;
+      fourStore = 42;
+      fourStoreEndpoint = 43;
+      virtuoso = 44;
+      rtkit = 45;
+      dovecot2 = 46;
+      dovenull2 = 47;
+      unbound = 48;
+      prayer = 49;
+      mpd = 50;
+      clamav = 51;
+      fprot = 52;
+      bind = 53;
+      wwwrun = 54;
+      spamd = 56;
+      nslcd = 58;
+      nginx = 60;
+      chrony = 61;
+      smtpd = 63;
+      smtpq = 64;
+      supybot = 65;
+      iodined = 66;
+      graphite = 68;
+      statsd = 69;
+      transmission = 70;
+      postgres = 71;
+      smbguest = 74;
+      varnish = 75;
+      dd-agent = 76;
+      lighttpd = 77;
+      lightdm = 78;
+      freenet = 79;
+      ircd = 80;
+      bacula = 81;
+      almir = 82;
+      deluge = 83;
+      mysql = 84;
+      rabbitmq = 85;
+      activemq = 86;
+      gnunet = 87;
+      oidentd = 88;
+      quassel = 89;
+      amule = 90;
+      minidlna = 91;
+      elasticsearch = 92;
 
-    # When adding a uid, make sure it doesn't match an existing gid.
+      # When adding a uid, make sure it doesn't match an existing gid.
 
-    nixbld = 30000; # start of range of uids
-    nobody = 65534;
-  };
+      nixbld = 30000; # start of range of uids
+      nobody = 65534;
+    };
+
+    ids.gids = {
+      root = 0;
+      wheel = 1;
+      kmem = 2;
+      tty = 3;
+      messagebus = 4; # D-Bus
+      haldaemon = 5;
+      disk = 6;
+      vsftpd = 7;
+      ftp = 8;
+      bitlbee = 9;
+      avahi = 10;
+      portmap = 11;
+      atd = 12;
+      postfix = 13;
+      postdrop = 14;
+      dovecot = 15;
+      audio = 17;
+      floppy = 18;
+      uucp = 19;
+      lp = 20;
+      tomcat = 21;
+      pulseaudio = 22; # must match `pulseaudio' UID
+      gpsd = 23;
+      cdrom = 24;
+      tape = 25;
+      video = 26;
+      dialout = 27;
+      polkituser = 28;
+      utmp = 29;
+      davfs2 = 31;
+      privoxy = 32;
+      disnix = 33;
+      osgi = 34;
+      ghostOne = 40;
+      git = 41;
+      fourStore = 42;
+      fourStoreEndpoint = 43;
+      virtuoso = 44;
+      dovecot2 = 46;
+      prayer = 49;
+      mpd = 50;
+      clamav = 51;
+      fprot = 52;
+      wwwrun = 54;
+      adm = 55;
+      spamd = 56;
+      networkmanager = 57;
+      nslcd = 58;
+      scanner = 59;
+      nginx = 60;
+      systemd-journal = 62;
+      smtpd = 63;
+      smtpq = 64;
+      supybot = 65;
+      iodined = 66;
+      libvirtd = 67;
+      graphite = 68;
+      transmission = 70;
+      postgres = 71;
+      vboxusers = 72;
+      vboxsf = 73;
+      smbguest = 74;
+      varnish = 75;
+      dd-agent = 76;
+      lighttpd = 77;
+      lightdm = 78;
+      freenet = 79;
+      ircd = 80;
+      bacula = 81;
+      almir = 82;
+      deluge = 83;
+      mysql = 84;
+      rabbitmq = 85;
+      activemq = 86;
+      gnunet = 87;
+      oidentd = 88;
+      quassel = 89;
+      amule = 90;
+      minidlna = 91;
 
-  ids.gids = {
-    root = 0;
-    wheel = 1;
-    kmem = 2;
-    tty = 3;
-    messagebus = 4; # D-Bus
-    haldaemon = 5;
-    disk = 6;
-    vsftpd = 7;
-    ftp = 8;
-    bitlbee = 9;
-    avahi = 10;
-    portmap = 11;
-    atd = 12;
-    postfix = 13;
-    postdrop = 14;
-    dovecot = 15;
-    audio = 17;
-    floppy = 18;
-    uucp = 19;
-    lp = 20;
-    tomcat = 21;
-    pulseaudio = 22; # must match `pulseaudio' UID
-    gpsd = 23;
-    cdrom = 24;
-    tape = 25;
-    video = 26;
-    dialout = 27;
-    polkituser = 28;
-    utmp = 29;
-    davfs2 = 31;
-    privoxy = 32;
-    disnix = 33;
-    osgi = 34;
-    ghostOne = 40;
-    git = 41;
-    fourStore = 42;
-    fourStoreEndpoint = 43;
-    virtuoso = 44;
-    dovecot2 = 46;
-    prayer = 49;
-    mpd = 50;
-    clamav = 51;
-    fprot = 52;
-    wwwrun = 54;
-    adm = 55;
-    spamd = 56;
-    networkmanager = 57;
-    nslcd = 58;
-    scanner = 59;
-    nginx = 60;
-    systemd-journal = 62;
-    smtpd = 63;
-    smtpq = 64;
-    supybot = 65;
-    iodined = 66;
-    libvirtd = 67;
-    graphite = 68;
-    transmission = 70;
-    postgres = 71;
-    vboxusers = 72;
-    vboxsf = 73;
-    smbguest = 74;
-    varnish = 75;
-    dd-agent = 76;
-    lighttpd = 77;
-    lightdm = 78;
-    freenet = 79;
-    ircd = 80;
-    bacula = 81;
-    almir = 82;
-    deluge = 83;
-    mysql = 84;
-    rabbitmq = 85;
-    activemq = 86;
-    gnunet = 87;
-    oidentd = 88;
-    quassel = 89;
-    amule = 90;
-    minidlna = 91;
+      # When adding a gid, make sure it doesn't match an existing uid.
 
-    # When adding a gid, make sure it doesn't match an existing uid.
+      users = 100;
+      nixbld = 30000;
+      nogroup = 65534;
+    };
 
-    users = 100;
-    nixbld = 30000;
-    nogroup = 65534;
   };
 
 }
diff --git a/modules/misc/passthru.nix b/modules/misc/passthru.nix
index 9962352a40a..f68adc5e843 100644
--- a/modules/misc/passthru.nix
+++ b/modules/misc/passthru.nix
@@ -1,21 +1,15 @@
 # This module allows you to export something from configuration
 # Use case: export kernel source expression for ease of configuring
 
-{config, pkgs, ...}:
-
-let
-
-options = {
-  passthru = pkgs.lib.mkOption {
-    description = ''
-      This attribute set will be exported as a system attribute.
-      You can put whatever you want here.
-    '';
-  };
-};
-
-in
+{ config, pkgs, ... }:
 
 {
-  require = options;
+  options = {
+    passthru = pkgs.lib.mkOption {
+      description = ''
+        This attribute set will be exported as a system attribute.
+        You can put whatever you want here.
+      '';
+    };
+  };
 }
diff --git a/modules/module-list.nix b/modules/module-list.nix
index b50be9c34fa..1c863c3d1d7 100644
--- a/modules/module-list.nix
+++ b/modules/module-list.nix
@@ -224,7 +224,6 @@
   #./services/x11/window-managers/compiz.nix
   ./services/x11/window-managers/default.nix
   ./services/x11/window-managers/icewm.nix
-  ./services/x11/window-managers/kwm.nix
   ./services/x11/window-managers/metacity.nix
   ./services/x11/window-managers/none.nix
   ./services/x11/window-managers/twm.nix
diff --git a/modules/profiles/all-hardware.nix b/modules/profiles/all-hardware.nix
index 2635aa8897d..511c118e2bf 100644
--- a/modules/profiles/all-hardware.nix
+++ b/modules/profiles/all-hardware.nix
@@ -49,7 +49,7 @@
   # Include lots of firmware.
   hardware.enableAllFirmware = true;
 
-  require =
+  imports =
     [ ../hardware/network/zydas-zd1211.nix ];
 
 }
diff --git a/modules/profiles/clone-config.nix b/modules/profiles/clone-config.nix
index 69f8537e133..d7190020e7e 100644
--- a/modules/profiles/clone-config.nix
+++ b/modules/profiles/clone-config.nix
@@ -47,7 +47,7 @@ let
       { config, pkgs, ... }:
 
       {
-        require = [ ${toString config.installer.cloneConfigIncludes} ];
+        imports = [ ${toString config.installer.cloneConfigIncludes} ];
       }
     '';
 
diff --git a/modules/profiles/demo.nix b/modules/profiles/demo.nix
index e0c6744092b..396dcf6c5d3 100644
--- a/modules/profiles/demo.nix
+++ b/modules/profiles/demo.nix
@@ -1,7 +1,7 @@
 { config, pkgs, ... }:
 
 {
-  require = [ ./graphical.nix ];
+  imports = [ ./graphical.nix ];
 
   users.extraUsers.demo =
     { description = "Demo user account";
diff --git a/modules/programs/bash/bash.nix b/modules/programs/bash/bash.nix
index b23d004e532..0d751d1d0d3 100644
--- a/modules/programs/bash/bash.nix
+++ b/modules/programs/bash/bash.nix
@@ -31,6 +31,9 @@ let
     mapAttrsFlatten (k: v: "alias ${k}='${v}'") cfg.shellAliases
   );
 
+in
+
+{
   options = {
 
     environment.promptInit = mkOption {
@@ -87,70 +90,65 @@ let
 
   };
 
-in
 
-{
-  require = [options];
-
-  environment.etc =
-    [ { # Script executed when the shell starts as a login shell.
-        source = pkgs.substituteAll {
-          src = ./profile.sh;
-          wrapperDir = config.security.wrapperDir;
-          inherit (cfg) shellInit;
-        };
-        target = "profile";
-      }
-
-      { # /etc/bashrc: executed every time an interactive bash
-        # starts. Sources /etc/profile to ensure that the system
-        # environment is configured properly.
-        source = pkgs.substituteAll {
-          src = ./bashrc.sh;
-          inherit (cfg) interactiveShellInit;
-        };
-        target = "bashrc";
-      }
-
-      { # Configuration for readline in bash.
-        source = ./inputrc;
-        target = "inputrc";
-      }
+  config = {
+
+    # Script executed when the shell starts as a login shell.
+    environment.etc."profile".source =
+      pkgs.substituteAll {
+        src = ./profile.sh;
+        wrapperDir = config.security.wrapperDir;
+        inherit (cfg) shellInit;
+      };
+
+    # /etc/bashrc: executed every time an interactive bash
+    # starts. Sources /etc/profile to ensure that the system
+    # environment is configured properly.
+    environment.etc."bashrc".source =
+      pkgs.substituteAll {
+        src = ./bashrc.sh;
+        inherit (cfg) interactiveShellInit;
+      };
+
+    # Configuration for readline in bash.
+    environment.etc."inputrc".source = ./inputrc;
+
+    environment.shellAliases =
+      { ls = "ls --color=tty";
+        ll = "ls -l";
+        l = "ls -alh";
+        which = "type -P";
+      };
+
+    environment.interactiveShellInit =
+      ''
+        # Check the window size after every command.
+        shopt -s checkwinsize
+
+        ${cfg.promptInit}
+        ${initBashCompletion}
+        ${shellAliases}
+
+        # Disable hashing (i.e. caching) of command lookups.
+        set +h
+      '';
+
+    system.build.binsh = pkgs.bashInteractive;
+
+    system.activationScripts.binsh = stringAfter [ "stdio" ]
+      ''
+        # Create the required /bin/sh symlink; otherwise lots of things
+        # (notably the system() function) won't work.
+        mkdir -m 0755 -p /bin
+        ln -sfn "${cfg.binsh}" /bin/.sh.tmp
+        mv /bin/.sh.tmp /bin/sh # atomically replace /bin/sh
+      '';
+
+    environment.pathsToLink = optionals cfg.enableBashCompletion [
+      "/etc/bash_completion.d"
+      "/share/bash-completion"
     ];
 
-  environment.shellAliases =
-    { ls = "ls --color=tty";
-      ll = "ls -l";
-      l = "ls -alh";
-      which = "type -P";
-    };
+  };
 
-  environment.interactiveShellInit =
-    ''
-      # Check the window size after every command.
-      shopt -s checkwinsize
-
-      ${cfg.promptInit}
-      ${initBashCompletion}
-      ${shellAliases}
-
-      # Disable hashing (i.e. caching) of command lookups.
-      set +h
-    '';
-
-  system.build.binsh = pkgs.bashInteractive;
-
-  system.activationScripts.binsh = stringAfter [ "stdio" ]
-    ''
-      # Create the required /bin/sh symlink; otherwise lots of things
-      # (notably the system() function) won't work.
-      mkdir -m 0755 -p /bin
-      ln -sfn "${cfg.binsh}" /bin/.sh.tmp
-      mv /bin/.sh.tmp /bin/sh # atomically replace /bin/sh
-    '';
-
-  environment.pathsToLink = optionals cfg.enableBashCompletion [
-    "/etc/bash_completion.d"
-    "/share/bash-completion"
-  ];
 }
diff --git a/modules/programs/ssmtp.nix b/modules/programs/ssmtp.nix
index f61d14c2046..904989d57a0 100644
--- a/modules/programs/ssmtp.nix
+++ b/modules/programs/ssmtp.nix
@@ -3,12 +3,18 @@
 # directly to an SMTP server defined in its configuration file, wihout
 # queueing mail locally.
 
-{config, pkgs, ...}:
+{ config, pkgs, ... }:
 
 with pkgs.lib;
 
 let
 
+  cfg = config.networking.defaultMailServer;
+
+in
+
+{
+
   options = {
 
     networking.defaultMailServer = {
@@ -16,94 +22,90 @@ let
       directDelivery = mkOption {
         default = false;
         example = true;
-        description = "
+        description = ''
           Use the trivial Mail Transfer Agent (MTA)
           <command>ssmtp</command> package to allow programs to send
-          e-mail.  If you don't want to run a ``real'' MTA like
+          e-mail.  If you don't want to run a “real” MTA like
           <command>sendmail</command> or <command>postfix</command> on
           your machine, set this option to <literal>true</literal>, and
           set the option
           <option>networking.defaultMailServer.hostName</option> to the
           host name of your preferred mail server.
-        ";
+        '';
       };
 
       hostName = mkOption {
         example = "mail.example.org";
-        description = "
+        description = ''
           The host name of the default mail server to use to deliver
           e-mail.
-        ";
+        '';
       };
 
       domain = mkOption {
         default = "";
         example = "example.org";
-        description = "
+        description = ''
           The domain from which mail will appear to be sent.
-        ";
+        '';
       };
 
       useTLS = mkOption {
         default = false;
         example = true;
-        description = "
+        description = ''
           Whether TLS should be used to connect to the default mail
           server.
-        ";
+        '';
       };
 
       useSTARTTLS = mkOption {
         default = false;
         example = true;
-        description = "
+        description = ''
           Whether the STARTTLS should be used to connect to the default
           mail server.  (This is needed for TLS-capable mail servers
           running on the default SMTP port 25.)
-        ";
+        '';
       };
 
       authUser = mkOption {
         default = "";
         example = "foo@example.org";
-        description = "
+        description = ''
           Username used for SMTP auth. Leave blank to disable.
-        ";
+        '';
       };
 
       authPass = mkOption {
         default = "";
         example = "correctHorseBatteryStaple";
-        description = "
+        description = ''
           Password used for SMTP auth. (STORED PLAIN TEXT, WORLD-READABLE IN NIX STORE)
-        ";
+        '';
       };
 
     };
 
   };
 
-  cfg = config.networking.defaultMailServer;
 
-in
+  config = mkIf cfg.directDelivery {
 
-mkIf cfg.directDelivery {
-  require = [options];
-
-  environment.etc =
-    [ { source = pkgs.writeText "ssmtp.conf" ''
-          MailHub=${cfg.hostName}
-          FromLineOverride=YES
-          ${if cfg.domain != "" then "rewriteDomain=${cfg.domain}" else ""}
-          UseTLS=${if cfg.useTLS then "YES" else "NO"}
-          UseSTARTTLS=${if cfg.useSTARTTLS then "YES" else "NO"}
-          #Debug=YES
-          ${if cfg.authUser != "" then "AuthUser=${cfg.authUser}" else ""}
-          ${if cfg.authPass != "" then "AuthPass=${cfg.authPass}" else ""}
-        '';
-        target = "ssmtp/ssmtp.conf";
-      }
-    ];
+    environment.etc."ssmtp/ssmtp.conf".text =
+      ''
+        MailHub=${cfg.hostName}
+        FromLineOverride=YES
+        ${if cfg.domain != "" then "rewriteDomain=${cfg.domain}" else ""}
+        UseTLS=${if cfg.useTLS then "YES" else "NO"}
+        UseSTARTTLS=${if cfg.useSTARTTLS then "YES" else "NO"}
+        #Debug=YES
+        ${if cfg.authUser != "" then "AuthUser=${cfg.authUser}" else ""}
+        ${if cfg.authPass != "" then "AuthPass=${cfg.authPass}" else ""}
+      '';
+
+    environment.systemPackages = [pkgs.ssmtp];
+
+  };
 
-  environment.systemPackages = [pkgs.ssmtp];
 }
diff --git a/modules/services/x11/desktop-managers/gnome.nix b/modules/services/x11/desktop-managers/gnome.nix
index 3fa82bae2ba..b0212446ad3 100644
--- a/modules/services/x11/desktop-managers/gnome.nix
+++ b/modules/services/x11/desktop-managers/gnome.nix
@@ -1,47 +1,42 @@
-{pkgs, config, ...}:
+{ config, pkgs, ... }:
+
+with pkgs.lib;
 
 let
-  inherit (pkgs.lib) mkOption mkIf;
+
   cfg = config.services.xserver.desktopManager.gnome;
   gnome = pkgs.gnome;
 
-  options = { services = { xserver = { desktopManager = {
+in
 
-    gnome = {
-      enable = mkOption {
-        default = false;
-        example = true;
-        description = "Enable a gnome terminal as a desktop manager.";
-      };
-    };
+{
 
-  }; }; }; };
-in
+  options = {
 
-mkIf cfg.enable {
-  require = options;
+    services.xserver.desktopManager.gnome.enable = mkOption {
+      default = false;
+      example = true;
+      description = "Enable a gnome terminal as a desktop manager.";
+    };
+
+  };
 
-  services = {
-    xserver = {
+  config = mkIf cfg.enable {
 
-      desktopManager = {
-        session = [{
-          name = "gnome";
-          start = ''
-            ${gnome.gnometerminal}/bin/gnome-terminal -ls &
-            waitPID=$!
-          '';
-        }];
+    services.xserver.desktopManager.session = singleton
+      { name = "gnome";
+        start = ''
+          ${gnome.gnometerminal}/bin/gnome-terminal -ls &
+          waitPID=$!
+        '';
       };
 
-    };
-  };
+    environment.systemPackages =
+      [ gnome.gnometerminal
+        gnome.GConf
+        gnome.gconfeditor
+      ];
 
-  environment = {
-    x11Packages = [
-      gnome.gnometerminal
-      gnome.GConf
-      gnome.gconfeditor
-    ];
   };
+
 }
diff --git a/modules/services/x11/desktop-managers/xterm.nix b/modules/services/x11/desktop-managers/xterm.nix
index 7aa70269dc4..edc61c103ea 100644
--- a/modules/services/x11/desktop-managers/xterm.nix
+++ b/modules/services/x11/desktop-managers/xterm.nix
@@ -1,10 +1,14 @@
-{pkgs, config, ...}:
+{ config, pkgs, ... }:
+
+with pkgs.lib;
 
 let
 
-  inherit (pkgs.lib) mkOption mkIf;
   cfg = config.services.xserver.desktopManager.xterm;
 
+in
+
+{
   options = {
 
     services.xserver.desktopManager.xterm.enable = mkOption {
@@ -15,30 +19,18 @@ let
 
   };
 
-in
-
-mkIf cfg.enable {
-  require = options;
+  config = mkIf cfg.enable {
 
-  services = {
-    xserver = {
-
-      desktopManager = {
-        session = [{
-          name = "xterm";
-          start = ''
-            ${pkgs.xterm}/bin/xterm -ls &
-            waitPID=$!
-          '';
-        }];
+    services.xserver.desktopManager.session = singleton
+      { name = "xterm";
+        start = ''
+          ${pkgs.xterm}/bin/xterm -ls &
+          waitPID=$!
+        '';
       };
 
-    };
-  };
+    environment.systemPackages = [ pkgs.xterm ];
 
-  environment = {
-    x11Packages = [
-      pkgs.xterm
-    ];
   };
+
 }
diff --git a/modules/services/x11/window-managers/default.nix b/modules/services/x11/window-managers/default.nix
index 958bf85817e..c201b789ae4 100644
--- a/modules/services/x11/window-managers/default.nix
+++ b/modules/services/x11/window-managers/default.nix
@@ -1,25 +1,26 @@
-{pkgs, config, ...}:
+{ config, pkgs, ... }:
+
+with pkgs.lib;
 
 let
-  inherit (pkgs.lib) mkOption mergeOneOption any;
   cfg = config.services.xserver.windowManager;
 in
 
 {
-  imports = [
-    ./compiz.nix
-    ./openbox.nix
-    ./kwm.nix
-    ./metacity.nix
-    ./none.nix
-    ./twm.nix
-    ./wmii.nix
-    ./xmonad.nix
-    ./i3.nix
-    ./xbmc.nix
-  ];
+  imports =
+    [ ./compiz.nix
+      ./openbox.nix
+      ./metacity.nix
+      ./none.nix
+      ./twm.nix
+      ./wmii.nix
+      ./xmonad.nix
+      ./i3.nix
+      ./xbmc.nix
+    ];
 
   options = {
+
     services.xserver.windowManager = {
 
       session = mkOption {
@@ -28,11 +29,11 @@ in
           name = "wmii";
           start = "...";
         }];
-        description = "
+        description = ''
           Internal option used to add some common line to window manager
           scripts before forwarding the value to the
           <varname>displayManager</varname>.
-        ";
+        '';
         apply = map (d: d // {
           manage = "window";
         });
@@ -41,9 +42,7 @@ in
       default = mkOption {
         default = "none";
         example = "wmii";
-        description = "
-          Default window manager loaded if none have been chosen.
-        ";
+        description = "Default window manager loaded if none have been chosen.";
         merge = mergeOneOption;
         apply = defaultWM:
           if any (w: w.name == defaultWM) cfg.session then
@@ -53,6 +52,7 @@ in
       };
 
     };
+
   };
 
   config = {
diff --git a/modules/services/x11/window-managers/kwm.nix b/modules/services/x11/window-managers/kwm.nix
deleted file mode 100644
index 6488ce3d324..00000000000
--- a/modules/services/x11/window-managers/kwm.nix
+++ /dev/null
@@ -1,46 +0,0 @@
-{pkgs, config, ...}:
-
-let
-  inherit (pkgs.lib) mkOption mkIf;
-  cfg = config.services.xserver.windowManager.kwm;
-
-  option = { services = { xserver = { windowManager = {
-
-    kwm = {
-      enable = mkOption {
-        default = false;
-        example = true;
-        description = "Enable the kwm window manager.";
-      };
-
-    };
-
-  }; }; }; };
-in
-
-mkIf cfg.enable {
-  require = option;
-
-  services = {
-    xserver = {
-
-      windowManager = {
-        session = [{
-          name = "kwm";
-          start = "
-            ${pkgs.kde3.kdebase}/bin/kwin &
-            waitPID=$!
-          ";
-        }];
-      };
-
-    };
-  };
-
-  environment = {
-    x11Packages = [
-      pkgs.kde3.kdelibs
-      pkgs.kde3.kdebase
-    ];
-  };
-}
diff --git a/modules/services/x11/window-managers/metacity.nix b/modules/services/x11/window-managers/metacity.nix
index ea1dd5a3bde..712e2038594 100644
--- a/modules/services/x11/window-managers/metacity.nix
+++ b/modules/services/x11/window-managers/metacity.nix
@@ -1,49 +1,42 @@
-{pkgs, config, ...}:
+{ config, pkgs, ... }:
+
+with pkgs.lib;
 
 let
-  inherit (pkgs.lib) mkOption mkIf;
+
   cfg = config.services.xserver.windowManager.metacity;
   xorg = config.services.xserver.package;
   gnome = pkgs.gnome;
 
-  option = { services = { xserver = { windowManager = {
+in
 
-    metacity = {
-      enable = mkOption {
-        default = false;
-        example = true;
-        description = "Enable the metacity window manager.";
-      };
+{
+  options = {
 
+    services.xserver.windowManager.metacity.enable = mkOption {
+      default = false;
+      example = true;
+      description = "Enable the metacity window manager.";
     };
 
-  }; }; }; };
-in
+  };
 
-mkIf cfg.enable {
-  require = option;
-
-  services = {
-    xserver = {
-
-      windowManager = {
-        session = [{
-          name = "metacity";
-          start = ''
-            env LD_LIBRARY_PATH=${xorg.libX11}/lib:${xorg.libXext}/lib:/usr/lib/
-            # !!! Hack: load the schemas for Metacity.
-            GCONF_CONFIG_SOURCE=xml::~/.gconf ${gnome.GConf}/bin/gconftool-2 \
-              --makefile-install-rule ${gnome.metacity}/etc/gconf/schemas/*.schemas # */
-            ${gnome.metacity}/bin/metacity &
-            waitPID=$!
-          '';
-        }];
+  config = mkIf cfg.enable {
+
+    services.xserver.windowManager.session = singleton
+      { name = "metacity";
+        start = ''
+          env LD_LIBRARY_PATH=${xorg.libX11}/lib:${xorg.libXext}/lib:/usr/lib/
+          # !!! Hack: load the schemas for Metacity.
+          GCONF_CONFIG_SOURCE=xml::~/.gconf ${gnome.GConf}/bin/gconftool-2 \
+            --makefile-install-rule ${gnome.metacity}/etc/gconf/schemas/*.schemas # */
+          ${gnome.metacity}/bin/metacity &
+          waitPID=$!
+        '';
       };
 
-    };
-  };
+    environment.systemPackages = [ gnome.metacity ];
 
-  environment = {
-    x11Packages = [ gnome.metacity ];
   };
+
 }
diff --git a/modules/services/x11/window-managers/wmii.nix b/modules/services/x11/window-managers/wmii.nix
index d1ff72092f1..b61521274fb 100644
--- a/modules/services/x11/window-managers/wmii.nix
+++ b/modules/services/x11/window-managers/wmii.nix
@@ -1,27 +1,27 @@
-{pkgs, config, ...}:
+{ config, pkgs, ... }:
+
+with pkgs.lib;
 
 let
-  inherit (pkgs.lib) mkOption mkIf;
+
   cfg = config.services.xserver.windowManager.wmii;
 
-  option = { services = { xserver = { windowManager = {
+in
 
-    wmii = {
-      enable = mkOption {
-        default = false;
-        example = true;
-        description = "Enable the wmii window manager.";
-      };
+{
+  options = {
+
+    services.xserver.windowManager.wmii.enable = mkOption {
+      default = false;
+      example = true;
+      description = "Enable the wmii window manager.";
     };
 
-  }; }; }; };
-in
+  };
 
-mkIf cfg.enable {
-  require = option;
+  config = mkIf cfg.enable {
 
-  services = {
-    xserver = {
+    services.xserver.windowManager.session = singleton
       # stop wmii by
       #   $wmiir xwrite /ctl quit
       # this will cause wmii exiting with exit code 0
@@ -32,23 +32,16 @@ mkIf cfg.enable {
       # lost and all applications running on X will terminate.
       # Another use case is kill -9 wmii; after rotating screen.
       # Note: we don't like kill for that purpose. But it works (-> subject "wmii and xrandr" on mailinglist)
-      windowManager = {
-        session = [{
-          name = "wmii";
-          start = "
-            while :; do
-              ${pkgs.wmiiSnap}/bin/wmii && break
-            done
-          ";
-        }];
+      { name = "wmii";
+        start = ''
+          while :; do
+            ${pkgs.wmiiSnap}/bin/wmii && break
+          done
+        '';
       };
 
-    };
-  };
+    environment.systemPackages = [ pkgs.wmiiSnap ];
 
-  environment = {
-    x11Packages = [
-      pkgs.wmiiSnap
-    ];
   };
+
 }
diff --git a/modules/system/activation/top-level.nix b/modules/system/activation/top-level.nix
index 9f6a8f8583a..32157e41985 100644
--- a/modules/system/activation/top-level.nix
+++ b/modules/system/activation/top-level.nix
@@ -4,66 +4,6 @@ with pkgs.lib;
 
 let
 
-  options = {
-
-    system.build = mkOption {
-      default = {};
-      description = ''
-        Attribute set of derivations used to setup the system.
-      '';
-    };
-
-    nesting.children = mkOption {
-      default = [];
-      description = ''
-        Additional configurations to build.
-      '';
-    };
-
-    nesting.clone = mkOption {
-      default = [];
-      description = ''
-        Additional configurations to build based on the current
-        configuration which is has a lower priority.
-      '';
-    };
-
-    system.boot.loader.id = mkOption {
-      default = "";
-      description = ''
-        Id string of the used bootloader.
-      '';
-    };
-
-    system.boot.loader.kernelFile = mkOption {
-      default = pkgs.stdenv.platform.kernelTarget;
-      type = types.uniq types.string;
-      description = ''
-        Name of the kernel file to be passed to the bootloader.
-      '';
-    };
-
-    system.copySystemConfiguration = mkOption {
-      default = false;
-      description = ''
-        If enabled, copies the NixOS configuration file
-        <literal>$NIXOS_CONFIG</literal> (usually
-        <filename>/etc/nixos/configuration.nix</filename>)
-        to the system store path.
-      '';
-    };
-
-    system.extraSystemBuilderCmds = mkOption {
-      default = "";
-      internal = true;
-      merge = concatStringsSep "\n";
-      description = ''
-        This code will be added to the builder creating the system store path.
-      '';
-    };
-
-  };
-
 
   # This attribute is responsible for creating boot entries for
   # child configuration. They are only (directly) accessible
@@ -176,13 +116,79 @@ let
   };
 
 
-in {
-  require = [options];
+in
 
-  system.extraSystemBuilderCmds =
-    optionalString
-      config.system.copySystemConfiguration
-      "cp ${maybeEnv "NIXOS_CONFIG" "/etc/nixos/configuration.nix"} $out";
+{
+  options = {
+
+    system.build = mkOption {
+      default = {};
+      description = ''
+        Attribute set of derivations used to setup the system.
+      '';
+    };
+
+    nesting.children = mkOption {
+      default = [];
+      description = ''
+        Additional configurations to build.
+      '';
+    };
+
+    nesting.clone = mkOption {
+      default = [];
+      description = ''
+        Additional configurations to build based on the current
+        configuration which is has a lower priority.
+      '';
+    };
+
+    system.boot.loader.id = mkOption {
+      default = "";
+      description = ''
+        Id string of the used bootloader.
+      '';
+    };
+
+    system.boot.loader.kernelFile = mkOption {
+      default = pkgs.stdenv.platform.kernelTarget;
+      type = types.uniq types.string;
+      description = ''
+        Name of the kernel file to be passed to the bootloader.
+      '';
+    };
+
+    system.copySystemConfiguration = mkOption {
+      default = false;
+      description = ''
+        If enabled, copies the NixOS configuration file
+        <literal>$NIXOS_CONFIG</literal> (usually
+        <filename>/etc/nixos/configuration.nix</filename>)
+        to the system store path.
+      '';
+    };
+
+    system.extraSystemBuilderCmds = mkOption {
+      default = "";
+      internal = true;
+      merge = concatStringsSep "\n";
+      description = ''
+        This code will be added to the builder creating the system store path.
+      '';
+    };
+
+  };
+
+
+  config = {
+
+    system.extraSystemBuilderCmds =
+      optionalString
+        config.system.copySystemConfiguration
+        "cp ${maybeEnv "NIXOS_CONFIG" "/etc/nixos/configuration.nix"} $out";
+
+    system.build.toplevel = system;
+
+  };
 
-  system.build.toplevel = system;
 }
diff --git a/modules/system/boot/loader/generations-dir/generations-dir.nix b/modules/system/boot/loader/generations-dir/generations-dir.nix
index b14f81552ee..9855c8c19dd 100644
--- a/modules/system/boot/loader/generations-dir/generations-dir.nix
+++ b/modules/system/boot/loader/generations-dir/generations-dir.nix
@@ -1,48 +1,9 @@
-{pkgs, config, ...}:
+{ config, pkgs, ... }:
 
-###### interface
-let
-  inherit (pkgs.lib) mkOption mkIf;
-
-  options = {
-    boot = {
-      loader = {
-        generationsDir = {
-
-          enable = mkOption {
-            default = false;
-            description = ''
-              Whether to create symlinks to the system generations under
-              <literal>/boot</literal>.  When enabled,
-              <literal>/boot/default/kernel</literal>,
-              <literal>/boot/default/initrd</literal>, etc., are updated to
-              point to the current generation's kernel image, initial RAM
-              disk, and other bootstrap files.
-
-              This optional is not necessary with boot loaders such as GNU GRUB
-              for which the menu is updated to point to the latest bootstrap
-              files.  However, it is needed for U-Boot on platforms where the
-              boot command line is stored in flash memory rather than in a
-              menu file.
-            '';
-          };
-
-          copyKernels = mkOption {
-            default = false;
-            description = "
-              Whether copy the necessary boot files into /boot, so
-              /nix/store is not needed by the boot loader.
-            ";
-          };
-        };
-      };
-    };
-  };
+with pkgs.lib;
 
-in
-
-###### implementation
 let
+
   generationsDirBuilder = pkgs.substituteAll {
     src = ./generations-dir-builder.sh;
     isExecutable = true;
@@ -53,18 +14,50 @@ let
 
   # Temporary check, for nixos to cope both with nixpkgs stdenv-updates and trunk
   platform = pkgs.stdenv.platform;
+
 in
+
 {
-  require = [
-    options
+  options = {
+
+    boot.loader.generationsDir = {
+
+      enable = mkOption {
+        default = false;
+        description = ''
+          Whether to create symlinks to the system generations under
+          <literal>/boot</literal>.  When enabled,
+          <literal>/boot/default/kernel</literal>,
+          <literal>/boot/default/initrd</literal>, etc., are updated to
+          point to the current generation's kernel image, initial RAM
+          disk, and other bootstrap files.
+
+          This optional is not necessary with boot loaders such as GNU GRUB
+          for which the menu is updated to point to the latest bootstrap
+          files.  However, it is needed for U-Boot on platforms where the
+          boot command line is stored in flash memory rather than in a
+          menu file.
+        '';
+      };
+
+      copyKernels = mkOption {
+        default = false;
+        description = "
+          Whether copy the necessary boot files into /boot, so
+          /nix/store is not needed by the boot loader.
+        ";
+      };
+
+    };
+
+  };
+
+
+  config = mkIf config.boot.loader.generationsDir.enable {
 
-    # config.system.build
-    # ../system/system-options.nix
-  ];
+    system.build.installBootLoader = generationsDirBuilder;
+    system.boot.loader.id = "generationsDir";
+    system.boot.loader.kernelFile = platform.kernelTarget;
 
-  system = mkIf config.boot.loader.generationsDir.enable {
-    build.installBootLoader = generationsDirBuilder;
-    boot.loader.id = "generationsDir";
-    boot.loader.kernelFile = platform.kernelTarget;
   };
 }
diff --git a/modules/system/boot/loader/raspberrypi/raspberrypi.nix b/modules/system/boot/loader/raspberrypi/raspberrypi.nix
index f083a002b42..5bc856c3df0 100644
--- a/modules/system/boot/loader/raspberrypi/raspberrypi.nix
+++ b/modules/system/boot/loader/raspberrypi/raspberrypi.nix
@@ -1,30 +1,9 @@
-{pkgs, config, ...}:
+{ config, pkgs, ... }:
 
-###### interface
-let
-  inherit (pkgs.lib) mkOption mkIf;
-
-  options = {
-    boot = {
-      loader = {
-        raspberryPi = {
-          enable = mkOption {
-            default = false;
-            description = ''
-              Whether to create files with the system generations in
-              <literal>/boot</literal>. 
-              <literal>/boot/old</literal> will hold files from old generations.
-            '';
-          };
-        };
-      };
-    };
-  };
-
-in
+with pkgs.lib;
 
-###### implementation
 let
+
   builder = pkgs.substituteAll {
     src = ./builder.sh;
     isExecutable = true;
@@ -34,18 +13,26 @@ let
   };
 
   platform = pkgs.stdenv.platform;
+
 in
+
 {
-  require = [
-    options
+  options = {
 
-    # config.system.build
-    # ../system/system-options.nix
-  ];
+    boot.loader.raspberryPi.enable = mkOption {
+      default = false;
+      description = ''
+        Whether to create files with the system generations in
+        <literal>/boot</literal>.
+        <literal>/boot/old</literal> will hold files from old generations.
+      '';
+    };
+
+  };
 
-  system = mkIf config.boot.loader.raspberryPi.enable {
-    build.installBootLoader = builder;
-    boot.loader.id = "raspberrypi";
-    boot.loader.kernelFile = platform.kernelTarget;
+  config = mkIf config.boot.loader.raspberryPi.enable {
+    system.build.installBootLoader = builder;
+    system.boot.loader.id = "raspberrypi";
+    system.boot.loader.kernelFile = platform.kernelTarget;
   };
 }
diff --git a/modules/system/boot/stage-1.nix b/modules/system/boot/stage-1.nix
index 9efae22fbdf..ed06e6a38d0 100644
--- a/modules/system/boot/stage-1.nix
+++ b/modules/system/boot/stage-1.nix
@@ -11,116 +11,6 @@ let
 
   udev = config.systemd.package;
 
-  options = {
-
-    boot.resumeDevice = mkOption {
-      default = "";
-      example = "0:0";
-      description = "
-        Device for manual resume attempt during boot. Looks like
-        major:minor. ls -l /dev/SWAP_PARTION shows them.
-      ";
-    };
-
-    boot.initrd.enableSplashScreen = mkOption {
-      default = true;
-      description = "
-        Whether to show a nice splash screen while booting.
-      ";
-    };
-
-    boot.initrd.checkJournalingFS = mkOption {
-      default = true;
-      type = types.bool;
-      description = ''
-        Whether to run fsck on journaling filesystems such as ext3.
-      '';
-    };
-
-    boot.initrd.mdadmConf = mkOption {
-      default = "";
-      type = with types; string;
-      description = ''
-        Contents of /etc/mdadm.conf at initrd.
-      '';
-    };
-
-    boot.initrd.preLVMCommands = mkOption {
-      default = "";
-      type = with types; string;
-      description = ''
-        Shell commands to be executed immediately before lvm discovery.
-      '';
-    };
-
-    boot.initrd.postDeviceCommands = mkOption {
-      default = "";
-      type = with types; string;
-      description = ''
-        Shell commands to be executed immediately after stage 1 of the
-        boot has loaded kernel modules and created device nodes in
-        /dev.
-      '';
-    };
-
-    boot.initrd.postMountCommands = mkOption {
-      default = "";
-      type = with types; string;
-      description = ''
-        Shell commands to be executed immediately after the stage 1
-        filesystems have been mounted.
-      '';
-    };
-
-    boot.initrd.extraUtilsCommands = mkOption {
-      internal = true;
-      default = "";
-      type = with types; string;
-      description = ''
-        Shell commands to be executed in the builder of the
-        extra-utils derivation.  This can be used to provide
-        additional utilities in the initial ramdisk.
-      '';
-    };
-
-    boot.initrd.extraUtilsCommandsTest = mkOption {
-      internal = true;
-      default = "";
-      type = with types; string;
-      description = ''
-        Shell commands to be executed in the builder of the
-        extra-utils derivation after patchelf has done its
-        job.  This can be used to test additional utilities
-        copied in extraUtilsCommands.
-      '';
-    };
-
-    boot.initrd.compressor = mkOption {
-      default = "gzip -9";
-
-      type = types.string;
-
-      description = "The compressor to use on the initrd";
-
-      example = "xz";
-    };
-
-    fileSystems = mkOption {
-      options.neededForBoot = mkOption {
-        default = false;
-        type = types.bool;
-        description = ''
-          If set, this file system will be mounted in the initial
-          ramdisk.  By default, this applies to the root file system
-          and to the file system containing
-          <filename>/nix/store</filename>.
-        '';
-      };
-    };
-
-  };
-
-
   kernelPackages = config.boot.kernelPackages;
   modulesTree = config.system.modulesTree;
 
@@ -141,14 +31,15 @@ let
                 && kernelPackages.kernel.features.needsCifsUtils
                 && any (fs: fs.fsType == "cifs") fileSystems;
 
-  busybox = if needsCifsUtils
-            then pkgs.busybox.override {
-                   extraConfig = ''
-                     CONFIG_FEATURE_MOUNT_CIFS n
-                     CONFIG_FEATURE_MOUNT_HELPERS y
-                   '';
-                 }
-            else pkgs.busybox;
+  busybox =
+    if needsCifsUtils
+    then pkgs.busybox.override {
+           extraConfig = ''
+             CONFIG_FEATURE_MOUNT_CIFS n
+             CONFIG_FEATURE_MOUNT_HELPERS y
+           '';
+         }
+    else pkgs.busybox;
 
 
   # Some additional utilities needed in stage 1, like mount, lvm, fsck
@@ -351,16 +242,128 @@ let
         ];
   };
 
-in {
+in
 
-  require = [options];
+{
+  options = {
 
-  system.build.bootStage1 = bootStage1;
-  system.build.initialRamdisk = initialRamdisk;
-  system.build.extraUtils = extraUtils;
+    boot.resumeDevice = mkOption {
+      default = "";
+      example = "0:0";
+      description = "
+        Device for manual resume attempt during boot. Looks like
+        major:minor. ls -l /dev/SWAP_PARTION shows them.
+      ";
+    };
+
+    boot.initrd.enableSplashScreen = mkOption {
+      default = true;
+      description = "
+        Whether to show a nice splash screen while booting.
+      ";
+    };
+
+    boot.initrd.checkJournalingFS = mkOption {
+      default = true;
+      type = types.bool;
+      description = ''
+        Whether to run fsck on journaling filesystems such as ext3.
+      '';
+    };
+
+    boot.initrd.mdadmConf = mkOption {
+      default = "";
+      type = with types; string;
+      description = ''
+        Contents of /etc/mdadm.conf at initrd.
+      '';
+    };
+
+    boot.initrd.preLVMCommands = mkOption {
+      default = "";
+      type = with types; string;
+      description = ''
+        Shell commands to be executed immediately before lvm discovery.
+      '';
+    };
+
+    boot.initrd.postDeviceCommands = mkOption {
+      default = "";
+      type = with types; string;
+      description = ''
+        Shell commands to be executed immediately after stage 1 of the
+        boot has loaded kernel modules and created device nodes in
+        /dev.
+      '';
+    };
+
+    boot.initrd.postMountCommands = mkOption {
+      default = "";
+      type = with types; string;
+      description = ''
+        Shell commands to be executed immediately after the stage 1
+        filesystems have been mounted.
+      '';
+    };
+
+    boot.initrd.extraUtilsCommands = mkOption {
+      internal = true;
+      default = "";
+      type = with types; string;
+      description = ''
+        Shell commands to be executed in the builder of the
+        extra-utils derivation.  This can be used to provide
+        additional utilities in the initial ramdisk.
+      '';
+    };
 
-  system.requiredKernelConfig = with config.lib.kernelConfig; [
-    (isYes "TMPFS")
-    (isYes "BLK_DEV_INITRD")
-  ];
+    boot.initrd.extraUtilsCommandsTest = mkOption {
+      internal = true;
+      default = "";
+      type = with types; string;
+      description = ''
+        Shell commands to be executed in the builder of the
+        extra-utils derivation after patchelf has done its
+        job.  This can be used to test additional utilities
+        copied in extraUtilsCommands.
+      '';
+    };
+
+    boot.initrd.compressor = mkOption {
+      default = "gzip -9";
+
+      type = types.string;
+
+      description = "The compressor to use on the initrd";
+
+      example = "xz";
+    };
+
+    fileSystems = mkOption {
+      options.neededForBoot = mkOption {
+        default = false;
+        type = types.bool;
+        description = ''
+          If set, this file system will be mounted in the initial
+          ramdisk.  By default, this applies to the root file system
+          and to the file system containing
+          <filename>/nix/store</filename>.
+        '';
+      };
+    };
+
+  };
+
+  config = {
+
+    system.build.bootStage1 = bootStage1;
+    system.build.initialRamdisk = initialRamdisk;
+    system.build.extraUtils = extraUtils;
+
+    system.requiredKernelConfig = with config.lib.kernelConfig; [
+      (isYes "TMPFS")
+      (isYes "BLK_DEV_INITRD")
+    ];
+
+  };
 }
diff --git a/modules/system/boot/stage-2.nix b/modules/system/boot/stage-2.nix
index efffb89d732..ff17535e418 100644
--- a/modules/system/boot/stage-2.nix
+++ b/modules/system/boot/stage-2.nix
@@ -4,6 +4,38 @@ with pkgs.lib;
 
 let
 
+  kernel = config.boot.kernelPackages.kernel;
+  activateConfiguration = config.system.activationScripts.script;
+
+  readonlyMountpoint = pkgs.runCommand "readonly-mountpoint" {} ''
+    mkdir -p $out/bin
+    cc -O3 ${./readonly-mountpoint.c} -o $out/bin/readonly-mountpoint
+    strip -s $out/bin/readonly-mountpoint
+  '';
+
+  bootStage2 = pkgs.substituteAll {
+    src = ./stage-2-init.sh;
+    shellDebug = "${pkgs.bashInteractive}/bin/bash";
+    isExecutable = true;
+    inherit (config.boot) devShmSize runSize cleanTmpDir;
+    inherit (config.nix) readOnlyStore;
+    ttyGid = config.ids.gids.tty;
+    path =
+      [ pkgs.coreutils
+        pkgs.utillinux
+        pkgs.sysvtools
+      ] ++ (optional config.boot.cleanTmpDir pkgs.findutils)
+      ++ optional config.nix.readOnlyStore readonlyMountpoint;
+    postBootCommands = pkgs.writeText "local-cmds"
+      ''
+        ${config.boot.postBootCommands}
+        ${config.powerManagement.powerUpCommands}
+      '';
+  };
+
+in
+
+{
   options = {
 
     boot = {
@@ -59,39 +91,10 @@ let
 
   };
 
-  kernel = config.boot.kernelPackages.kernel;
-  activateConfiguration = config.system.activationScripts.script;
 
-  readonlyMountpoint = pkgs.runCommand "readonly-mountpoint" {} ''
-    mkdir -p $out/bin
-    cc -O3 ${./readonly-mountpoint.c} -o $out/bin/readonly-mountpoint
-    strip -s $out/bin/readonly-mountpoint
-  '';
+  config = {
 
-  bootStage2 = pkgs.substituteAll {
-    src = ./stage-2-init.sh;
-    shellDebug = "${pkgs.bashInteractive}/bin/bash";
-    isExecutable = true;
-    inherit (config.boot) devShmSize runSize cleanTmpDir;
-    inherit (config.nix) readOnlyStore;
-    ttyGid = config.ids.gids.tty;
-    path =
-      [ pkgs.coreutils
-        pkgs.utillinux
-        pkgs.sysvtools
-      ] ++ (optional config.boot.cleanTmpDir pkgs.findutils)
-      ++ optional config.nix.readOnlyStore readonlyMountpoint;
-    postBootCommands = pkgs.writeText "local-cmds"
-      ''
-        ${config.boot.postBootCommands}
-        ${config.powerManagement.powerUpCommands}
-      '';
-  };
-
-in
+    system.build.bootStage2 = bootStage2;
 
-{
-  require = [options];
-
-  system.build.bootStage2 = bootStage2;
+  };
 }
diff --git a/modules/virtualisation/amazon-config.nix b/modules/virtualisation/amazon-config.nix
index 836c46caae8..e816ed2d183 100644
--- a/modules/virtualisation/amazon-config.nix
+++ b/modules/virtualisation/amazon-config.nix
@@ -1,5 +1,5 @@
 { config, pkgs, modulesPath, ... }:
 
 {
-  require = [ "${modulesPath}/virtualisation/amazon-image.nix" ];
+  imports = [ "${modulesPath}/virtualisation/amazon-image.nix" ];
 }
diff --git a/modules/virtualisation/amazon-image.nix b/modules/virtualisation/amazon-image.nix
index 30b06b9ef24..11939c9ba96 100644
--- a/modules/virtualisation/amazon-image.nix
+++ b/modules/virtualisation/amazon-image.nix
@@ -3,7 +3,7 @@
 with pkgs.lib;
 
 {
-  require = [ ../profiles/headless.nix ./ec2-data.nix ];
+  imports = [ ../profiles/headless.nix ./ec2-data.nix ];
 
   system.build.amazonImage =
     pkgs.vmTools.runInLinuxVM (
@@ -83,7 +83,7 @@ with pkgs.lib;
       udevadm control --exit || true
       kill -9 -1
     '';
-    
+
   # Mount all formatted ephemeral disks and activate all swap devices.
   # We cannot do this with the ‘fileSystems’ and ‘swapDevices’ options
   # because the set of devices is dependent on the instance type
diff --git a/modules/virtualisation/ec2-data.nix b/modules/virtualisation/ec2-data.nix
index 42c50d857e4..fccf45e0e19 100644
--- a/modules/virtualisation/ec2-data.nix
+++ b/modules/virtualisation/ec2-data.nix
@@ -5,7 +5,8 @@
 { config, pkgs, ... }:
 
 with pkgs.lib;
-let
+
+{
   options = {
     ec2.metadata = mkOption {
       type = types.bool;
@@ -15,84 +16,84 @@ let
       '';
     };
   };
-in
-{
-  require = [options];
-
-  systemd.services."fetch-ec2-data" =
-    { description = "Fetch EC2 Data";
-
-      wantedBy = [ "multi-user.target" ];
-      before = [ "sshd.service" ];
-      after = [ "network.target" ];
-
-      path = [ pkgs.curl pkgs.iproute ];
-
-      script =
-        ''
-          ip route del blackhole 169.254.169.254/32 || true
-
-          curl="curl --retry 3 --retry-delay 0 --fail"
-
-          echo "setting host name..."
-          ${optionalString (config.networking.hostName == "") ''
-            ${pkgs.nettools}/bin/hostname $($curl http://169.254.169.254/1.0/meta-data/hostname)
-          ''}
-
-          # Don't download the SSH key if it has already been injected
-          # into the image (a Nova feature).
-          if ! [ -e /root/.ssh/authorized_keys ]; then
-              echo "obtaining SSH key..."
-              mkdir -p /root/.ssh
-              $curl -o /root/key.pub http://169.254.169.254/1.0/meta-data/public-keys/0/openssh-key
-              if [ $? -eq 0 -a -e /root/key.pub ]; then
-                  if ! grep -q -f /root/key.pub /root/.ssh/authorized_keys; then
-                      cat /root/key.pub >> /root/.ssh/authorized_keys
-                      echo "new key added to authorized_keys"
-                  fi
-                  chmod 600 /root/.ssh/authorized_keys
-                  rm -f /root/key.pub
-              fi
-          fi
-
-          # Extract the intended SSH host key for this machine from
-          # the supplied user data, if available.  Otherwise sshd will
-          # generate one normally.
-          $curl http://169.254.169.254/2011-01-01/user-data > /root/user-data || true
-          key="$(sed 's/|/\n/g; s/SSH_HOST_DSA_KEY://; t; d' /root/user-data)"
-          key_pub="$(sed 's/SSH_HOST_DSA_KEY_PUB://; t; d' /root/user-data)"
-          if [ -n "$key" -a -n "$key_pub" -a ! -e /etc/ssh/ssh_host_dsa_key ]; then
-              mkdir -m 0755 -p /etc/ssh
-              (umask 077; echo "$key" > /etc/ssh/ssh_host_dsa_key)
-              echo "$key_pub" > /etc/ssh/ssh_host_dsa_key.pub
-          fi
-
-          ${optionalString (! config.ec2.metadata) ''
-          # Since the user data is sensitive, prevent it from being
-          # accessed from now on.
-          ip route add blackhole 169.254.169.254/32
-          ''}
-        '';
-
-      serviceConfig.Type = "oneshot";
-      serviceConfig.RemainAfterExit = true;
-    };
 
-  systemd.services."print-host-key" =
-    { description = "Print SSH Host Key";
-      wantedBy = [ "multi-user.target" ];
-      after = [ "sshd.service" ];
-      script =
-        ''
-          # Print the host public key on the console so that the user
-          # can obtain it securely by parsing the output of
-          # ec2-get-console-output.
-          echo "-----BEGIN SSH HOST KEY FINGERPRINTS-----" > /dev/console
-          ${pkgs.openssh}/bin/ssh-keygen -l -f /etc/ssh/ssh_host_dsa_key.pub > /dev/console
-          echo "-----END SSH HOST KEY FINGERPRINTS-----" > /dev/console
-        '';
-      serviceConfig.Type = "oneshot";
-      serviceConfig.RemainAfterExit = true;
-    };
+  config = {
+
+    systemd.services."fetch-ec2-data" =
+      { description = "Fetch EC2 Data";
+
+        wantedBy = [ "multi-user.target" ];
+        before = [ "sshd.service" ];
+        after = [ "network.target" ];
+
+        path = [ pkgs.curl pkgs.iproute ];
+
+        script =
+          ''
+            ip route del blackhole 169.254.169.254/32 || true
 
+            curl="curl --retry 3 --retry-delay 0 --fail"
+
+            echo "setting host name..."
+            ${optionalString (config.networking.hostName == "") ''
+              ${pkgs.nettools}/bin/hostname $($curl http://169.254.169.254/1.0/meta-data/hostname)
+            ''}
+
+            # Don't download the SSH key if it has already been injected
+            # into the image (a Nova feature).
+            if ! [ -e /root/.ssh/authorized_keys ]; then
+                echo "obtaining SSH key..."
+                mkdir -p /root/.ssh
+                $curl -o /root/key.pub http://169.254.169.254/1.0/meta-data/public-keys/0/openssh-key
+                if [ $? -eq 0 -a -e /root/key.pub ]; then
+                    if ! grep -q -f /root/key.pub /root/.ssh/authorized_keys; then
+                        cat /root/key.pub >> /root/.ssh/authorized_keys
+                        echo "new key added to authorized_keys"
+                    fi
+                    chmod 600 /root/.ssh/authorized_keys
+                    rm -f /root/key.pub
+                fi
+            fi
+
+            # Extract the intended SSH host key for this machine from
+            # the supplied user data, if available.  Otherwise sshd will
+            # generate one normally.
+            $curl http://169.254.169.254/2011-01-01/user-data > /root/user-data || true
+            key="$(sed 's/|/\n/g; s/SSH_HOST_DSA_KEY://; t; d' /root/user-data)"
+            key_pub="$(sed 's/SSH_HOST_DSA_KEY_PUB://; t; d' /root/user-data)"
+            if [ -n "$key" -a -n "$key_pub" -a ! -e /etc/ssh/ssh_host_dsa_key ]; then
+                mkdir -m 0755 -p /etc/ssh
+                (umask 077; echo "$key" > /etc/ssh/ssh_host_dsa_key)
+                echo "$key_pub" > /etc/ssh/ssh_host_dsa_key.pub
+            fi
+
+            ${optionalString (! config.ec2.metadata) ''
+            # Since the user data is sensitive, prevent it from being
+            # accessed from now on.
+            ip route add blackhole 169.254.169.254/32
+            ''}
+          '';
+
+        serviceConfig.Type = "oneshot";
+        serviceConfig.RemainAfterExit = true;
+      };
+
+    systemd.services."print-host-key" =
+      { description = "Print SSH Host Key";
+        wantedBy = [ "multi-user.target" ];
+        after = [ "sshd.service" ];
+        script =
+          ''
+            # Print the host public key on the console so that the user
+            # can obtain it securely by parsing the output of
+            # ec2-get-console-output.
+            echo "-----BEGIN SSH HOST KEY FINGERPRINTS-----" > /dev/console
+            ${pkgs.openssh}/bin/ssh-keygen -l -f /etc/ssh/ssh_host_dsa_key.pub > /dev/console
+            echo "-----END SSH HOST KEY FINGERPRINTS-----" > /dev/console
+          '';
+        serviceConfig.Type = "oneshot";
+        serviceConfig.RemainAfterExit = true;
+      };
+
+  };
 }
diff --git a/modules/virtualisation/nova-config.nix b/modules/virtualisation/nova-config.nix
index df41f8f88af..f8239cdec51 100644
--- a/modules/virtualisation/nova-config.nix
+++ b/modules/virtualisation/nova-config.nix
@@ -1,5 +1,5 @@
 { config, pkgs, modulesPath, ... }:
 
 {
-  require = [ "${modulesPath}/virtualisation/nova-image.nix" ];
+  imports = [ "${modulesPath}/virtualisation/nova-image.nix" ];
 }
diff --git a/modules/virtualisation/nova-image.nix b/modules/virtualisation/nova-image.nix
index 59b88a54367..ab625dba11d 100644
--- a/modules/virtualisation/nova-image.nix
+++ b/modules/virtualisation/nova-image.nix
@@ -3,7 +3,7 @@
 with pkgs.lib;
 
 {
-  require = [ ../profiles/qemu-guest.nix ../profiles/headless.nix ./ec2-data.nix ];
+  imports = [ ../profiles/qemu-guest.nix ../profiles/headless.nix ./ec2-data.nix ];
 
   system.build.novaImage =
     pkgs.vmTools.runInLinuxVM (
diff --git a/modules/virtualisation/qemu-vm.nix b/modules/virtualisation/qemu-vm.nix
index 61d5d20f3be..9476db8076c 100644
--- a/modules/virtualisation/qemu-vm.nix
+++ b/modules/virtualisation/qemu-vm.nix
@@ -18,6 +18,123 @@ let
     then "noname"
     else config.networking.hostName;
 
+  cfg = config.virtualisation;
+
+  qemuGraphics = if cfg.graphics then "" else "-nographic";
+  kernelConsole = if cfg.graphics then "" else "console=ttyS0";
+  ttys = [ "tty1" "tty2" "tty3" "tty4" "tty5" "tty6" ];
+
+  # Shell script to start the VM.
+  startVM =
+    ''
+      #! ${pkgs.stdenv.shell}
+
+      NIX_DISK_IMAGE=$(readlink -f ''${NIX_DISK_IMAGE:-${config.virtualisation.diskImage}})
+
+      if ! test -e "$NIX_DISK_IMAGE"; then
+          ${pkgs.qemu_kvm}/bin/qemu-img create -f qcow2 "$NIX_DISK_IMAGE" \
+            ${toString config.virtualisation.diskSize}M || exit 1
+      fi
+
+      # Create a directory for exchanging data with the VM.
+      if [ -z "$TMPDIR" -o -z "$USE_TMPDIR" ]; then
+          TMPDIR=$(mktemp -d nix-vm.XXXXXXXXXX --tmpdir)
+      fi
+      cd $TMPDIR
+      mkdir -p $TMPDIR/xchg
+
+      idx=2
+      extraDisks=""
+      ${flip concatMapStrings cfg.emptyDiskImages (size: ''
+        ${pkgs.qemu_kvm}/bin/qemu-img create -f raw "empty$idx" "${toString size}M"
+        extraDisks="$extraDisks -drive index=$idx,file=$(pwd)/empty$idx,if=virtio,werror=report"
+        idx=$((idx + 1))
+      '')}
+
+      # Start QEMU.
+      # "-boot menu=on" is there, because I don't know how to make qemu boot from 2nd hd.
+      exec ${pkgs.qemu_kvm}/bin/qemu-kvm \
+          -name ${vmName} \
+          -m ${toString config.virtualisation.memorySize} \
+          ${optionalString (pkgs.stdenv.system == "x86_64-linux") "-cpu kvm64"} \
+          -net nic,vlan=0,model=virtio \
+          -net user,vlan=0''${QEMU_NET_OPTS:+,$QEMU_NET_OPTS} \
+          -virtfs local,path=/nix/store,security_model=none,mount_tag=store \
+          -virtfs local,path=$TMPDIR/xchg,security_model=none,mount_tag=xchg \
+          -virtfs local,path=''${SHARED_DIR:-$TMPDIR/xchg},security_model=none,mount_tag=shared \
+          ${if cfg.useBootLoader then ''
+            -drive index=0,id=drive1,file=$NIX_DISK_IMAGE,if=virtio,cache=writeback,werror=report \
+            -drive index=1,id=drive2,file=${bootDisk}/disk.img,if=virtio,readonly \
+            -boot menu=on
+          '' else ''
+            -drive file=$NIX_DISK_IMAGE,if=virtio,cache=writeback,werror=report \
+            -kernel ${config.system.build.toplevel}/kernel \
+            -initrd ${config.system.build.toplevel}/initrd \
+            -append "$(cat ${config.system.build.toplevel}/kernel-params) init=${config.system.build.toplevel}/init regInfo=${regInfo} ${kernelConsole} $QEMU_KERNEL_PARAMS" \
+          ''} \
+          $extraDisks \
+          ${qemuGraphics} \
+          ${toString config.virtualisation.qemu.options} \
+          $QEMU_OPTS
+    '';
+
+
+  regInfo = pkgs.runCommand "reginfo"
+    { exportReferencesGraph =
+        map (x: [("closure-" + baseNameOf x) x]) config.virtualisation.pathsInNixDB;
+      buildInputs = [ pkgs.perl ];
+      preferLocalBuild = true;
+    }
+    ''
+      printRegistration=1 perl ${pkgs.pathsFromGraph} closure-* > $out
+    '';
+
+
+  # Generate a hard disk image containing a /boot partition and GRUB
+  # in the MBR.  Used when the `useBootLoader' option is set.
+  bootDisk =
+    pkgs.vmTools.runInLinuxVM (
+      pkgs.runCommand "nixos-boot-disk"
+        { preVM =
+            ''
+              mkdir $out
+              diskImage=$out/disk.img
+              ${pkgs.qemu_kvm}/bin/qemu-img create -f qcow2 $diskImage "32M"
+            '';
+          buildInputs = [ pkgs.utillinux ];
+        }
+        ''
+          # Create a single /boot partition.
+          ${pkgs.parted}/sbin/parted /dev/vda mklabel msdos
+          ${pkgs.parted}/sbin/parted /dev/vda -- mkpart primary ext2 1M -1s
+          . /sys/class/block/vda1/uevent
+          mknod /dev/vda1 b $MAJOR $MINOR
+          . /sys/class/block/vda/uevent
+          ${pkgs.e2fsprogs}/sbin/mkfs.ext4 -L boot /dev/vda1
+          ${pkgs.e2fsprogs}/sbin/tune2fs -c 0 -i 0 /dev/vda1
+
+          # Mount /boot.
+          mkdir /boot
+          mount /dev/vda1 /boot
+
+          # This is needed for GRUB 0.97, which doesn't know about virtio devices.
+          mkdir /boot/grub
+          echo '(hd0) /dev/vda' > /boot/grub/device.map
+
+          # Install GRUB and generate the GRUB boot menu.
+          touch /etc/NIXOS
+          mkdir -p /nix/var/nix/profiles
+          ${config.system.build.toplevel}/bin/switch-to-configuration boot
+
+          umount /boot
+        ''
+    );
+
+in
+
+{
+  imports = [ ../profiles/qemu-guest.nix ];
+
   options = {
 
     virtualisation.memorySize =
@@ -154,264 +271,151 @@ let
 
   };
 
-  cfg = config.virtualisation;
-
-  qemuGraphics = if cfg.graphics then "" else "-nographic";
-  kernelConsole = if cfg.graphics then "" else "console=ttyS0";
-  ttys = [ "tty1" "tty2" "tty3" "tty4" "tty5" "tty6" ];
-
-  # Shell script to start the VM.
-  startVM =
-    ''
-      #! ${pkgs.stdenv.shell}
-
-      NIX_DISK_IMAGE=$(readlink -f ''${NIX_DISK_IMAGE:-${config.virtualisation.diskImage}})
-
-      if ! test -e "$NIX_DISK_IMAGE"; then
-          ${pkgs.qemu_kvm}/bin/qemu-img create -f qcow2 "$NIX_DISK_IMAGE" \
-            ${toString config.virtualisation.diskSize}M || exit 1
-      fi
-
-      # Create a directory for exchanging data with the VM.
-      if [ -z "$TMPDIR" -o -z "$USE_TMPDIR" ]; then
-          TMPDIR=$(mktemp -d nix-vm.XXXXXXXXXX --tmpdir)
-      fi
-      cd $TMPDIR
-      mkdir -p $TMPDIR/xchg
-
-      idx=2
-      extraDisks=""
-      ${flip concatMapStrings cfg.emptyDiskImages (size: ''
-        ${pkgs.qemu_kvm}/bin/qemu-img create -f raw "empty$idx" "${toString size}M"
-        extraDisks="$extraDisks -drive index=$idx,file=$(pwd)/empty$idx,if=virtio,werror=report"
-        idx=$((idx + 1))
-      '')}
-
-      # Start QEMU.
-      # "-boot menu=on" is there, because I don't know how to make qemu boot from 2nd hd.
-      exec ${pkgs.qemu_kvm}/bin/qemu-kvm \
-          -name ${vmName} \
-          -m ${toString config.virtualisation.memorySize} \
-          ${optionalString (pkgs.stdenv.system == "x86_64-linux") "-cpu kvm64"} \
-          -net nic,vlan=0,model=virtio \
-          -net user,vlan=0''${QEMU_NET_OPTS:+,$QEMU_NET_OPTS} \
-          -virtfs local,path=/nix/store,security_model=none,mount_tag=store \
-          -virtfs local,path=$TMPDIR/xchg,security_model=none,mount_tag=xchg \
-          -virtfs local,path=''${SHARED_DIR:-$TMPDIR/xchg},security_model=none,mount_tag=shared \
-          ${if cfg.useBootLoader then ''
-            -drive index=0,id=drive1,file=$NIX_DISK_IMAGE,if=virtio,cache=writeback,werror=report \
-            -drive index=1,id=drive2,file=${bootDisk}/disk.img,if=virtio,readonly \
-            -boot menu=on
+  config = {
+
+    boot.loader.grub.device = mkOverride 50 "/dev/vda";
+
+    boot.initrd.supportedFilesystems = optional cfg.writableStore "unionfs-fuse";
+
+    boot.initrd.extraUtilsCommands =
+      ''
+        # We need mke2fs in the initrd.
+        cp ${pkgs.e2fsprogs}/sbin/mke2fs $out/bin
+      '';
+
+    boot.initrd.postDeviceCommands =
+      ''
+        # If the disk image appears to be empty, run mke2fs to
+        # initialise.
+        FSTYPE=$(blkid -o value -s TYPE /dev/vda || true)
+        if test -z "$FSTYPE"; then
+            mke2fs -t ext4 /dev/vda
+        fi
+      '';
+
+    boot.initrd.postMountCommands =
+      ''
+        # Mark this as a NixOS machinex.
+        mkdir -p $targetRoot/etc
+        echo -n > $targetRoot/etc/NIXOS
+
+        # Fix the permissions on /tmp.
+        chmod 1777 $targetRoot/tmp
+
+        mkdir -p $targetRoot/boot
+        mount -o remount,ro $targetRoot/nix/store
+        ${optionalString cfg.writableStore ''
+          mkdir -p /unionfs-chroot/ro-store
+          mount --rbind $targetRoot/nix/store /unionfs-chroot/ro-store
+
+          mkdir /unionfs-chroot/rw-store
+          ${if cfg.writableStoreUseTmpfs then ''
+          mount -t tmpfs -o "mode=755" none /unionfs-chroot/rw-store
           '' else ''
-            -drive file=$NIX_DISK_IMAGE,if=virtio,cache=writeback,werror=report \
-            -kernel ${config.system.build.toplevel}/kernel \
-            -initrd ${config.system.build.toplevel}/initrd \
-            -append "$(cat ${config.system.build.toplevel}/kernel-params) init=${config.system.build.toplevel}/init regInfo=${regInfo} ${kernelConsole} $QEMU_KERNEL_PARAMS" \
-          ''} \
-          $extraDisks \
-          ${qemuGraphics} \
-          ${toString config.virtualisation.qemu.options} \
-          $QEMU_OPTS
-    '';
-
-
-  regInfo = pkgs.runCommand "reginfo"
-    { exportReferencesGraph =
-        map (x: [("closure-" + baseNameOf x) x]) config.virtualisation.pathsInNixDB;
-      buildInputs = [ pkgs.perl ];
-      preferLocalBuild = true;
-    }
-    ''
-      printRegistration=1 perl ${pkgs.pathsFromGraph} closure-* > $out
-    '';
-
-
-  # Generate a hard disk image containing a /boot partition and GRUB
-  # in the MBR.  Used when the `useBootLoader' option is set.
-  bootDisk =
-    pkgs.vmTools.runInLinuxVM (
-      pkgs.runCommand "nixos-boot-disk"
-        { preVM =
-            ''
-              mkdir $out
-              diskImage=$out/disk.img
-              ${pkgs.qemu_kvm}/bin/qemu-img create -f qcow2 $diskImage "32M"
-            '';
-          buildInputs = [ pkgs.utillinux ];
-        }
-        ''
-          # Create a single /boot partition.
-          ${pkgs.parted}/sbin/parted /dev/vda mklabel msdos
-          ${pkgs.parted}/sbin/parted /dev/vda -- mkpart primary ext2 1M -1s
-          . /sys/class/block/vda1/uevent
-          mknod /dev/vda1 b $MAJOR $MINOR
-          . /sys/class/block/vda/uevent
-          ${pkgs.e2fsprogs}/sbin/mkfs.ext4 -L boot /dev/vda1
-          ${pkgs.e2fsprogs}/sbin/tune2fs -c 0 -i 0 /dev/vda1
-
-          # Mount /boot.
-          mkdir /boot
-          mount /dev/vda1 /boot
-
-          # This is needed for GRUB 0.97, which doesn't know about virtio devices.
-          mkdir /boot/grub
-          echo '(hd0) /dev/vda' > /boot/grub/device.map
-
-          # Install GRUB and generate the GRUB boot menu.
-          touch /etc/NIXOS
-          mkdir -p /nix/var/nix/profiles
-          ${config.system.build.toplevel}/bin/switch-to-configuration boot
+          mkdir $targetRoot/.nix-rw-store
+          mount --bind $targetRoot/.nix-rw-store /unionfs-chroot/rw-store
+          ''}
 
-          umount /boot
-        ''
-    );
-
-in
-
-{
-  require = [ options ../profiles/qemu-guest.nix ];
-
-  boot.loader.grub.device = mkOverride 50 "/dev/vda";
-
-  boot.initrd.supportedFilesystems = optional cfg.writableStore "unionfs-fuse";
-
-  boot.initrd.extraUtilsCommands =
-    ''
-      # We need mke2fs in the initrd.
-      cp ${pkgs.e2fsprogs}/sbin/mke2fs $out/bin
-    '';
-
-  boot.initrd.postDeviceCommands =
-    ''
-      # If the disk image appears to be empty, run mke2fs to
-      # initialise.
-      FSTYPE=$(blkid -o value -s TYPE /dev/vda || true)
-      if test -z "$FSTYPE"; then
-          mke2fs -t ext4 /dev/vda
-      fi
-    '';
-
-  boot.initrd.postMountCommands =
-    ''
-      # Mark this as a NixOS machinex.
-      mkdir -p $targetRoot/etc
-      echo -n > $targetRoot/etc/NIXOS
-
-      # Fix the permissions on /tmp.
-      chmod 1777 $targetRoot/tmp
-
-      mkdir -p $targetRoot/boot
-      mount -o remount,ro $targetRoot/nix/store
-      ${optionalString cfg.writableStore ''
-        mkdir -p /unionfs-chroot/ro-store
-        mount --rbind $targetRoot/nix/store /unionfs-chroot/ro-store
-
-        mkdir /unionfs-chroot/rw-store
-        ${if cfg.writableStoreUseTmpfs then ''
-        mount -t tmpfs -o "mode=755" none /unionfs-chroot/rw-store
-        '' else ''
-        mkdir $targetRoot/.nix-rw-store
-        mount --bind $targetRoot/.nix-rw-store /unionfs-chroot/rw-store
+          unionfs -o allow_other,cow,nonempty,chroot=/unionfs-chroot,max_files=32768,hide_meta_files /rw-store=RW:/ro-store=RO $targetRoot/nix/store
         ''}
+      '';
+
+    # After booting, register the closure of the paths in
+    # `virtualisation.pathsInNixDB' in the Nix database in the VM.  This
+    # allows Nix operations to work in the VM.  The path to the
+    # registration file is passed through the kernel command line to
+    # allow `system.build.toplevel' to be included.  (If we had a direct
+    # reference to ${regInfo} here, then we would get a cyclic
+    # dependency.)
+    boot.postBootCommands =
+      ''
+        if [[ "$(cat /proc/cmdline)" =~ regInfo=([^ ]*) ]]; then
+          ${config.environment.nix}/bin/nix-store --load-db < ''${BASH_REMATCH[1]}
+        fi
+      '';
+
+    virtualisation.pathsInNixDB = [ config.system.build.toplevel ];
+
+    virtualisation.qemu.options = [ "-vga std" "-usbdevice tablet" ];
+
+    # Mount the host filesystem via 9P, and bind-mount the Nix store of
+    # the host into our own filesystem.  We use mkOverride to allow this
+    # module to be applied to "normal" NixOS system configuration, where
+    # the regular value for the `fileSystems' attribute should be
+    # disregarded for the purpose of building a VM test image (since
+    # those filesystems don't exist in the VM).
+    fileSystems = mkOverride 10
+      { "/".device = "/dev/vda";
+        "/nix/store" =
+          { device = "store";
+            fsType = "9p";
+            options = "trans=virtio,version=9p2000.L,msize=1048576,cache=loose";
+          };
+        "/tmp/xchg" =
+          { device = "xchg";
+            fsType = "9p";
+            options = "trans=virtio,version=9p2000.L,msize=1048576,cache=loose";
+            neededForBoot = true;
+          };
+        "/tmp/shared" =
+          { device = "shared";
+            fsType = "9p";
+            options = "trans=virtio,version=9p2000.L,msize=1048576";
+            neededForBoot = true;
+          };
+      } // optionalAttrs cfg.useBootLoader
+      { "/boot" =
+          { device = "/dev/disk/by-label/boot";
+            fsType = "ext4";
+            options = "ro";
+            noCheck = true; # fsck fails on a r/o filesystem
+          };
+      };
 
-        unionfs -o allow_other,cow,nonempty,chroot=/unionfs-chroot,max_files=32768,hide_meta_files /rw-store=RW:/ro-store=RO $targetRoot/nix/store
-      ''}
-    '';
-
-  # After booting, register the closure of the paths in
-  # `virtualisation.pathsInNixDB' in the Nix database in the VM.  This
-  # allows Nix operations to work in the VM.  The path to the
-  # registration file is passed through the kernel command line to
-  # allow `system.build.toplevel' to be included.  (If we had a direct
-  # reference to ${regInfo} here, then we would get a cyclic
-  # dependency.)
-  boot.postBootCommands =
-    ''
-      if [[ "$(cat /proc/cmdline)" =~ regInfo=([^ ]*) ]]; then
-        ${config.environment.nix}/bin/nix-store --load-db < ''${BASH_REMATCH[1]}
-      fi
-    '';
-
-  virtualisation.pathsInNixDB = [ config.system.build.toplevel ];
-
-  virtualisation.qemu.options = [ "-vga std" "-usbdevice tablet" ];
-
-  # Mount the host filesystem via 9P, and bind-mount the Nix store of
-  # the host into our own filesystem.  We use mkOverride to allow this
-  # module to be applied to "normal" NixOS system configuration, where
-  # the regular value for the `fileSystems' attribute should be
-  # disregarded for the purpose of building a VM test image (since
-  # those filesystems don't exist in the VM).
-  fileSystems = mkOverride 10
-    { "/".device = "/dev/vda";
-      "/nix/store" =
-        { device = "store";
-          fsType = "9p";
-          options = "trans=virtio,version=9p2000.L,msize=1048576,cache=loose";
-        };
-      "/tmp/xchg" =
-        { device = "xchg";
-          fsType = "9p";
-          options = "trans=virtio,version=9p2000.L,msize=1048576,cache=loose";
-          neededForBoot = true;
-        };
-      "/tmp/shared" =
-        { device = "shared";
-          fsType = "9p";
-          options = "trans=virtio,version=9p2000.L,msize=1048576";
-          neededForBoot = true;
-        };
-    } // optionalAttrs cfg.useBootLoader
-    { "/boot" =
-        { device = "/dev/disk/by-label/boot";
-          fsType = "ext4";
-          options = "ro";
-          noCheck = true; # fsck fails on a r/o filesystem
-        };
-    };
-
-  swapDevices = mkOverride 50 [ ];
-
-  # Don't run ntpd in the guest.  It should get the correct time from KVM.
-  services.ntp.enable = false;
-
-  system.build.vm = pkgs.runCommand "nixos-vm" { preferLocalBuild = true; }
-    ''
-      ensureDir $out/bin
-      ln -s ${config.system.build.toplevel} $out/system
-      ln -s ${pkgs.writeScript "run-nixos-vm" startVM} $out/bin/run-${vmName}-vm
-    '';
+    swapDevices = mkOverride 50 [ ];
+
+    # Don't run ntpd in the guest.  It should get the correct time from KVM.
+    services.ntp.enable = false;
+
+    system.build.vm = pkgs.runCommand "nixos-vm" { preferLocalBuild = true; }
+      ''
+        ensureDir $out/bin
+        ln -s ${config.system.build.toplevel} $out/system
+        ln -s ${pkgs.writeScript "run-nixos-vm" startVM} $out/bin/run-${vmName}-vm
+      '';
+
+    # When building a regular system configuration, override whatever
+    # video driver the host uses.
+    services.xserver.videoDriver = mkOverride 50 null;
+    services.xserver.videoDrivers = mkOverride 50 [ "vesa" ];
+    services.xserver.defaultDepth = mkOverride 50 0;
+    services.xserver.resolutions = mkOverride 50 [ { x = 1024; y = 768; } ];
+    services.xserver.monitorSection =
+      ''
+        # Set a higher refresh rate so that resolutions > 800x600 work.
+        HorizSync 30-140
+        VertRefresh 50-160
+      '';
+
+    # Wireless won't work in the VM.
+    networking.wireless.enable = mkOverride 50 false;
+
+    system.requiredKernelConfig = with config.lib.kernelConfig;
+      [ (isEnabled "VIRTIO_BLK")
+        (isEnabled "VIRTIO_PCI")
+        (isEnabled "VIRTIO_NET")
+        (isEnabled "EXT4_FS")
+        (isYes "BLK_DEV")
+        (isYes "PCI")
+        (isYes "EXPERIMENTAL")
+        (isYes "NETDEVICES")
+        (isYes "NET_CORE")
+        (isYes "INET")
+        (isYes "NETWORK_FILESYSTEMS")
+      ] ++ optional (!cfg.graphics) [
+        (isYes "SERIAL_8250_CONSOLE")
+        (isYes "SERIAL_8250")
+      ];
 
-  # When building a regular system configuration, override whatever
-  # video driver the host uses.
-  services.xserver.videoDriver = mkOverride 50 null;
-  services.xserver.videoDrivers = mkOverride 50 [ "vesa" ];
-  services.xserver.defaultDepth = mkOverride 50 0;
-  services.xserver.resolutions = mkOverride 50 [ { x = 1024; y = 768; } ];
-  services.xserver.monitorSection =
-    ''
-      # Set a higher refresh rate so that resolutions > 800x600 work.
-      HorizSync 30-140
-      VertRefresh 50-160
-    '';
-
-  # Wireless won't work in the VM.
-  networking.wireless.enable = mkOverride 50 false;
-
-  system.requiredKernelConfig = with config.lib.kernelConfig;
-    [ (isEnabled "VIRTIO_BLK")
-      (isEnabled "VIRTIO_PCI")
-      (isEnabled "VIRTIO_NET")
-      (isEnabled "EXT4_FS")
-      (isYes "BLK_DEV")
-      (isYes "PCI")
-      (isYes "EXPERIMENTAL")
-      (isYes "NETDEVICES")
-      (isYes "NET_CORE")
-      (isYes "INET")
-      (isYes "NETWORK_FILESYSTEMS")
-    ] ++ optional (!cfg.graphics) [
-      (isYes "SERIAL_8250_CONSOLE")
-      (isYes "SERIAL_8250")
-    ];
+  };
 }
diff --git a/tests/firefox.nix b/tests/firefox.nix
index adb936dc1ae..d6599be13c9 100644
--- a/tests/firefox.nix
+++ b/tests/firefox.nix
@@ -5,7 +5,7 @@
   machine =
     { config, pkgs, ... }:
 
-    { require = [ ./common/x11.nix ];
+    { imports = [ ./common/x11.nix ];
       environment.systemPackages = [ pkgs.firefox ];
     };
 
diff --git a/tests/installer.nix b/tests/installer.nix
index 8488726efe0..5c61439248f 100644
--- a/tests/installer.nix
+++ b/tests/installer.nix
@@ -37,7 +37,7 @@ let
     ''
       { config, pkgs, modulesPath, ... }:
 
-      { require =
+      { imports =
           [ ./hardware.nix
             "''${modulesPath}/testing/test-instrumentation.nix"
           ];
diff --git a/tests/kde4.nix b/tests/kde4.nix
index fabad89c342..3fb35bbab09 100644
--- a/tests/kde4.nix
+++ b/tests/kde4.nix
@@ -5,7 +5,7 @@
   machine =
     { config, pkgs, ... }:
 
-    { require = [ ./common/user-account.nix ];
+    { imports = [ ./common/user-account.nix ];
 
       virtualisation.memorySize = 768;
 
diff --git a/tests/quake3.nix b/tests/quake3.nix
index 041cfdb29ae..92501107780 100644
--- a/tests/quake3.nix
+++ b/tests/quake3.nix
@@ -17,7 +17,7 @@ rec {
   client =
     { config, pkgs, ... }:
 
-    { require = [ ./common/x11.nix ];
+    { imports = [ ./common/x11.nix ];
       services.xserver.driSupport = true;
       services.xserver.defaultDepth = pkgs.lib.mkOverride 0 16;
       environment.systemPackages = [ pkgs.quake3demo ];
diff --git a/tests/trac.nix b/tests/trac.nix
index 7f05103d754..72442c885ac 100644
--- a/tests/trac.nix
+++ b/tests/trac.nix
@@ -3,9 +3,8 @@
 {
   nodes = {
     storage =
-      {pkgs, config, ...}:
-      {
-        services.nfs.server.enable = true;
+      { config, pkgs, ... }:
+      { services.nfs.server.enable = true;
         services.nfs.server.exports = ''
           /repos 192.168.1.0/255.255.255.0(rw,no_root_squash)
         '';
@@ -13,10 +12,8 @@
       };
 
     postgresql =
-      {config, pkgs, ...}:
-      {
-        services.openssh.enable = true;
-        services.postgresql.enable = true;
+      { config, pkgs, ... }:
+      { services.postgresql.enable = true;
         services.postgresql.package = pkgs.postgresql92;
         services.postgresql.enableTCPIP = true;
         services.postgresql.authentication = ''
@@ -29,15 +26,13 @@
       };
 
     webserver =
-      {config, pkgs, ...}:
-      {
-        fileSystems = pkgs.lib.mkOverride 50
+      { config, pkgs, ... }:
+      { fileSystems = pkgs.lib.mkOverride 50
           [ { mountPoint = "/repos";
               device = "storage:/repos";
               fsType = "nfs";
             }
           ];
-
         services.httpd.enable = true;
         services.httpd.adminAddr = "root@localhost";
         services.httpd.extraSubservices = [ { serviceType = "trac"; } ];
@@ -45,9 +40,8 @@
       };
 
     client =
-      {config, pkgs, ...}:
-      {
-        require = [ ./common/x11.nix ];
+      { config, pkgs, ... }:
+      { imports = [ ./common/x11.nix ];
         services.xserver.desktopManager.kde4.enable = true;
       };
   };
diff --git a/tests/xfce.nix b/tests/xfce.nix
index 706456143fb..9f9692f8a01 100644
--- a/tests/xfce.nix
+++ b/tests/xfce.nix
@@ -5,7 +5,7 @@
   machine =
     { config, pkgs, ... }:
 
-    { require = [ ./common/user-account.nix ];
+    { imports = [ ./common/user-account.nix ];
 
       services.xserver.enable = true;
 
-- 
GitLab


From 25bd880472ade2532bf9b6af5d40b4361e10bb02 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 4 Sep 2013 14:22:52 +0200
Subject: [PATCH 4887/5331] Get firmware from lib/firmware

---
 modules/hardware/all-firmware.nix        | 2 +-
 modules/hardware/cpu/amd-microcode.nix   | 2 +-
 modules/hardware/cpu/intel-microcode.nix | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/modules/hardware/all-firmware.nix b/modules/hardware/all-firmware.nix
index 9ef7b1523fc..16b6a862593 100644
--- a/modules/hardware/all-firmware.nix
+++ b/modules/hardware/all-firmware.nix
@@ -20,7 +20,7 @@
   ###### implementation
 
   config = pkgs.lib.mkIf config.hardware.enableAllFirmware {
-    hardware.firmware = [ pkgs.firmwareLinuxNonfree ];
+    hardware.firmware = [ "${pkgs.firmwareLinuxNonfree}/lib/firmware" ];
   };
 
 }
diff --git a/modules/hardware/cpu/amd-microcode.nix b/modules/hardware/cpu/amd-microcode.nix
index 350bcb74885..5720a63834f 100644
--- a/modules/hardware/cpu/amd-microcode.nix
+++ b/modules/hardware/cpu/amd-microcode.nix
@@ -22,7 +22,7 @@ with pkgs.lib;
   ###### implementation
 
   config = mkIf config.hardware.cpu.amd.updateMicrocode {
-    hardware.firmware = [ pkgs.amdUcode ];
+    hardware.firmware = [ "${pkgs.amdUcode}/lib/firmware" ];
     boot.kernelModules = [ "microcode" ];
   };
 
diff --git a/modules/hardware/cpu/intel-microcode.nix b/modules/hardware/cpu/intel-microcode.nix
index b8e97b4ca4a..9046ddf83bb 100644
--- a/modules/hardware/cpu/intel-microcode.nix
+++ b/modules/hardware/cpu/intel-microcode.nix
@@ -22,7 +22,7 @@ with pkgs.lib;
   ###### implementation
 
   config = mkIf config.hardware.cpu.intel.updateMicrocode {
-    hardware.firmware = [ pkgs.microcodeIntel ];
+    hardware.firmware = [ "${pkgs.microcodeIntel}/lib/firmware" ];
     boot.kernelModules = [ "microcode" ];
   };
 
-- 
GitLab


From 40342e975d06ef14af296cc31f887fa2e275e0bd Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 4 Sep 2013 15:12:07 +0200
Subject: [PATCH 4888/5331] types.list -> types.listOf

---
 modules/virtualisation/qemu-vm.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/virtualisation/qemu-vm.nix b/modules/virtualisation/qemu-vm.nix
index 9476db8076c..5b521a45547 100644
--- a/modules/virtualisation/qemu-vm.nix
+++ b/modules/virtualisation/qemu-vm.nix
@@ -169,7 +169,7 @@ in
     virtualisation.emptyDiskImages =
       mkOption {
         default = [];
-        type = types.list types.int;
+        type = types.listOf types.int;
         description =
           ''
             Additional disk images to provide to the VM, the value is a list of
-- 
GitLab


From 8a01d244b1abd4e2eec26c19a0db0316b87100f0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Sun, 25 Aug 2013 22:12:14 +0200
Subject: [PATCH 4889/5331] Add services.samba.nsswins option

This option allows for seamless WINS/NetBIOS name lookup, using
nsswitch.
---
 modules/config/nsswitch.nix                    |  3 ++-
 modules/services/network-filesystems/samba.nix | 12 ++++++++++++
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/modules/config/nsswitch.nix b/modules/config/nsswitch.nix
index 0a922756bf9..ad62b5597be 100644
--- a/modules/config/nsswitch.nix
+++ b/modules/config/nsswitch.nix
@@ -7,6 +7,7 @@ with pkgs.lib;
 let
 
   inherit (config.services.avahi) nssmdns;
+  inherit (config.services.samba) nsswins;
 
 in
 
@@ -43,7 +44,7 @@ in
               passwd:    files ldap
               group:     files ldap
               shadow:    files ldap
-              hosts:     files ${optionalString nssmdns "mdns_minimal [NOTFOUND=return]"} dns ${optionalString nssmdns "mdns"} myhostname
+              hosts:     files ${optionalString nssmdns "mdns_minimal [NOTFOUND=return]"} dns ${optionalString nssmdns "mdns"} ${optionalString nsswins "wins"} myhostname
               networks:  files dns
               ethers:    files
               services:  files
diff --git a/modules/services/network-filesystems/samba.nix b/modules/services/network-filesystems/samba.nix
index 518142ba97b..70a14487ea5 100644
--- a/modules/services/network-filesystems/samba.nix
+++ b/modules/services/network-filesystems/samba.nix
@@ -170,6 +170,16 @@ in
         example = "share";
       };
 
+      nsswins = mkOption {
+        default = false;
+        type = types.uniq types.bool;
+        description = ''
+          Whether to enable the WINS NSS (Name Service Switch) plug-in.
+          Enabling it allows applications to resolve WINS/NetBIOS names (a.k.a.
+          Windows machine names) by transparently querying the winbindd daemon.
+        '';
+      };
+
     };
 
   };
@@ -196,6 +206,8 @@ in
 
         users.extraGroups.smbguest.gid = config.ids.uids.smbguest;
 
+        system.nssModules = optional cfg.nsswins samba;
+
         systemd = {
           targets.samba = {
             description = "Samba server";
-- 
GitLab


From 94bb48be78694312cc0002141e4edb39d965b098 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 10 Sep 2013 14:58:12 +0200
Subject: [PATCH 4890/5331] firewall.nix: Don't make missing rpfilter support a
 fatal error

This makes upgrading from Linux 3.2 to 3.4 a bit nicer.
---
 modules/services/networking/firewall.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/modules/services/networking/firewall.nix b/modules/services/networking/firewall.nix
index 25a832da7a4..6261bab94a1 100644
--- a/modules/services/networking/firewall.nix
+++ b/modules/services/networking/firewall.nix
@@ -298,7 +298,9 @@ in
             # Perform a reverse-path test to refuse spoofers
             # For now, we just drop, as the raw table doesn't have a log-refuse yet
             ${optionalString (kernelHasRPFilter && cfg.checkReversePath) ''
-              ip46tables -A PREROUTING -t raw -m rpfilter --invert -j DROP
+              if ! ip46tables -A PREROUTING -t raw -m rpfilter --invert -j DROP; then
+                echo "<2>failed to initialise rpfilter support" >&2
+              fi
             ''}
 
             # Accept all traffic on the trusted interfaces.
-- 
GitLab


From c4092f2a8d0e63102bec1725ad6fc9046b04c687 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 10 Sep 2013 15:06:28 +0200
Subject: [PATCH 4891/5331] firewall.nix: Less verbosity

---
 modules/services/networking/firewall.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/modules/services/networking/firewall.nix b/modules/services/networking/firewall.nix
index 6261bab94a1..b24ac2d7032 100644
--- a/modules/services/networking/firewall.nix
+++ b/modules/services/networking/firewall.nix
@@ -245,10 +245,10 @@ in
             # Flush the old firewall rules.  !!! Ideally, updating the
             # firewall would be atomic.  Apparently that's possible
             # with iptables-restore.
-            ip46tables -D INPUT -j nixos-fw || true
+            ip46tables -D INPUT -j nixos-fw 2> /dev/null || true
             for chain in nixos-fw nixos-fw-accept nixos-fw-log-refuse nixos-fw-refuse FW_REFUSE; do
-              ip46tables -F "$chain" || true
-              ip46tables -X "$chain" || true
+              ip46tables -F "$chain" 2> /dev/null || true
+              ip46tables -X "$chain" 2> /dev/null || true
             done
 
 
-- 
GitLab


From 0afcc637d7c2c2ad2418399c3ed6c831f1292cad Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 10 Sep 2013 23:32:55 +0200
Subject: [PATCH 4892/5331] Add support for opportunistic TCP encryption.

Set "networking.tcpcrypt.enable = true;" to enable opportunistic TCP encryption
based on the user-space tools available from <http://tcpcrypt.org>.

Network attackers come in two varieties: passive and active (man-in-the-middle).
Passive attacks are much simpler to execute because they just require listening
on the network. Active attacks are much harder as they require listening and
modifying network traffic, often requiring very precise timing that can make
some attacks impractical.

Opportunistic encryption cannot protect against active attackers, but it *does*
protect against passive attackers. Furthermore, Tcpcrypt is powerful enough to
stop active attacks, too, if the application using it performs authentication.

A complete description of the protocol extension can be found at
<http://tools.ietf.org/html/draft-bittau-tcp-crypt-00>.
---
 modules/misc/ids.nix                     |  1 +
 modules/module-list.nix                  |  1 +
 modules/services/networking/tcpcrypt.nix | 77 ++++++++++++++++++++++++
 3 files changed, 79 insertions(+)
 create mode 100644 modules/services/networking/tcpcrypt.nix

diff --git a/modules/misc/ids.nix b/modules/misc/ids.nix
index ca1cc4dc199..0dec1c8b167 100644
--- a/modules/misc/ids.nix
+++ b/modules/misc/ids.nix
@@ -100,6 +100,7 @@
       amule = 90;
       minidlna = 91;
       elasticsearch = 92;
+      tcpcryptd = 666;
 
       # When adding a uid, make sure it doesn't match an existing gid.
 
diff --git a/modules/module-list.nix b/modules/module-list.nix
index 1c863c3d1d7..717828fbd70 100644
--- a/modules/module-list.nix
+++ b/modules/module-list.nix
@@ -148,6 +148,7 @@
   ./services/networking/dnsmasq.nix
   ./services/networking/ejabberd.nix
   ./services/networking/firewall.nix
+  ./services/networking/tcpcrypt.nix
   ./services/networking/flashpolicyd.nix
   ./services/networking/freenet.nix
   ./services/networking/git-daemon.nix
diff --git a/modules/services/networking/tcpcrypt.nix b/modules/services/networking/tcpcrypt.nix
new file mode 100644
index 00000000000..3d8eeab155f
--- /dev/null
+++ b/modules/services/networking/tcpcrypt.nix
@@ -0,0 +1,77 @@
+{ config, pkgs, ... }:
+
+with pkgs.lib;
+
+let
+
+  cfg = config.networking.tcpcrypt;
+
+in
+
+{
+
+  ###### interface
+
+  options = {
+
+    networking.tcpcrypt.enable = mkOption {
+      default = false;
+      description = ''
+        Whether to enable opportunistic TCP encryption. If the other end
+        speaks Tcpcrypt, then your traffic will be encrypted; otherwise
+        it will be sent in clear text. Thus, Tcpcrypt alone provides no
+        guarantees -- it is best effort. If, however, a Tcpcrypt
+        connection is successful and any attackers that exist are
+        passive, then Tcpcrypt guarantees privacy.
+      '';
+    };
+  };
+
+  config = mkIf cfg.enable {
+
+    users.extraUsers = singleton {
+      name = "tcpcryptd";
+      uid = config.ids.uids.tcpcryptd;
+      description = "tcpcrypt daemon user";
+    };
+
+    jobs.tcpcrypt = {
+      description = "tcpcrypt";
+
+      startOn = "started network-interfaces";
+
+      path = [ pkgs.iptables pkgs.tcpcrypt pkgs.procps ];
+
+      preStart = ''
+        sysctl -n net.ipv4.tcp_ecn >/run/pre-tcpcrypt-ecn-state
+        sysctl -w net.ipv4.tcp_ecn=0
+
+        iptables -t raw -N nixos-tcpcrypt
+        iptables -t raw -A nixos-tcpcrypt -p tcp -m mark --mark 0x0/0x10 -j NFQUEUE --queue-num 666
+        iptables -t raw -I PREROUTING -j nixos-tcpcrypt
+
+        iptables -t mangle -N nixos-tcpcrypt
+        iptables -t mangle -A nixos-tcpcrypt -p tcp -m mark --mark 0x0/0x10 -j NFQUEUE --queue-num 666
+        iptables -t mangle -I POSTROUTING -j nixos-tcpcrypt
+      '';
+
+      exec = "tcpcryptd -x 0x10";
+
+      postStop = ''
+        if [ -f /run/pre-tcpcrypt-ecn-state ]; then
+          sysctl -w net.ipv4.tcp_ecn=$(cat /run/pre-tcpcrypt-ecn-state)
+        fi
+
+        iptables -t mangle -D POSTROUTING -j nixos-tcpcrypt || true
+        iptables -t raw -D PREROUTING -j nixos-tcpcrypt || true
+
+        iptables -t raw -F nixos-tcpcrypt || true
+        iptables -t raw -X nixos-tcpcrypt || true
+
+        iptables -t mangle -F nixos-tcpcrypt || true
+        iptables -t mangle -X nixos-tcpcrypt || true
+      '';
+    };
+  };
+
+}
-- 
GitLab


From b6501c009798cd6d8c8b02e45e63bfa2fe31d5fc Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 11 Sep 2013 11:09:30 +0200
Subject: [PATCH 4893/5331] modules/misc/ids.nix: add a comment explaining why
 tcpcryptd has uid 666.

---
 modules/misc/ids.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/misc/ids.nix b/modules/misc/ids.nix
index 0dec1c8b167..ce758f2db7f 100644
--- a/modules/misc/ids.nix
+++ b/modules/misc/ids.nix
@@ -100,7 +100,7 @@
       amule = 90;
       minidlna = 91;
       elasticsearch = 92;
-      tcpcryptd = 666;
+      tcpcryptd = 666; # tcpcryptd hard-codes that UID in its source code. :-(
 
       # When adding a uid, make sure it doesn't match an existing gid.
 
-- 
GitLab


From 4a7d8a84bca148ef7f4251f059e5b0d0aacb83fe Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 11 Sep 2013 16:32:22 +0200
Subject: [PATCH 4894/5331] modules/services/networking/tcpcrypt.nix: specify
 start-up dependencies in systemd style

Thanks, Eelco, for pointing this out.
---
 modules/services/networking/tcpcrypt.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/modules/services/networking/tcpcrypt.nix b/modules/services/networking/tcpcrypt.nix
index 3d8eeab155f..48cb884f246 100644
--- a/modules/services/networking/tcpcrypt.nix
+++ b/modules/services/networking/tcpcrypt.nix
@@ -38,7 +38,8 @@ in
     jobs.tcpcrypt = {
       description = "tcpcrypt";
 
-      startOn = "started network-interfaces";
+      wantedBy = ["multi-user.target"];
+      after = ["network-interfaces.target"];
 
       path = [ pkgs.iptables pkgs.tcpcrypt pkgs.procps ];
 
-- 
GitLab


From 1103ba84fde35acef6207ecf40c4a4fc40fd9b39 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 11 Sep 2013 16:34:32 +0200
Subject: [PATCH 4895/5331] modules/misc/ids.nix: patch tcpcrypt to use our uid

The default uid 666 exceeds SYS_UID_MAX (499), so it might not be available
anyway.
---
 modules/misc/ids.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/misc/ids.nix b/modules/misc/ids.nix
index ce758f2db7f..3cccbbac22a 100644
--- a/modules/misc/ids.nix
+++ b/modules/misc/ids.nix
@@ -100,7 +100,7 @@
       amule = 90;
       minidlna = 91;
       elasticsearch = 92;
-      tcpcryptd = 666; # tcpcryptd hard-codes that UID in its source code. :-(
+      tcpcryptd = 93;
 
       # When adding a uid, make sure it doesn't match an existing gid.
 
-- 
GitLab


From 3a1024478a77c8a662ff8d8b55e2f117e9c94e2f Mon Sep 17 00:00:00 2001
From: Oliver Charles <ollie@ocharles.org.uk>
Date: Mon, 9 Sep 2013 09:22:08 +0100
Subject: [PATCH 4896/5331] lightdm: Use xserver.nix environment variables when
 starting X

This reduces code duplication, but more importantly means that the
DRI modules can be found by X enabling hardware acceleration.

Close #249; the PR also refers to more about DRI modules.
---
 modules/services/x11/display-managers/lightdm.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/modules/services/x11/display-managers/lightdm.nix b/modules/services/x11/display-managers/lightdm.nix
index b4f026d8143..c2b90d239ea 100644
--- a/modules/services/x11/display-managers/lightdm.nix
+++ b/modules/services/x11/display-managers/lightdm.nix
@@ -5,6 +5,7 @@ with pkgs.lib;
 let
 
   dmcfg = config.services.xserver.displayManager;
+  xEnv = config.systemd.services."display-manager".environment;
   cfg = dmcfg.lightdm;
 
   inherit (pkgs) stdenv lightdm writeScript writeText;
@@ -13,7 +14,7 @@ let
   xserverWrapper = writeScript "xserver-wrapper"
     ''
       #! /bin/sh
-      export XKB_BINDIR="${pkgs.xorg.xkbcomp}/bin"
+      ${concatMapStrings (n: "export ${n}=\"${getAttr n xEnv}\"\n") (attrNames xEnv)}
       exec ${dmcfg.xserverBin} ${dmcfg.xserverArgs}
     '';
 
-- 
GitLab


From 0192c027203efa9b7b4d6516d8d5ae322e76c6bd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Sat, 14 Sep 2013 13:05:11 +0200
Subject: [PATCH 4897/5331] /etc/profile: try all nix profiles for ASPELL_CONF

Aspell can only handle one dict-dir directive and currently we hardocde
that to
  ASPELL_CONF="dict-dir $HOME/.nix-profile/lib/aspell"

This means that aspell doesn't work if it is installed to the system or
default nix profile -- it only works in the user profile.

With this change, aspell can be installed to any of the nix profiles. If
it is installed in more than one profile, the most "local" profile wins
(i.e. sysadmin can set up a default, users can override it).
---
 modules/programs/bash/profile.sh | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/modules/programs/bash/profile.sh b/modules/programs/bash/profile.sh
index 6bcd5cd87cd..92fb0658189 100644
--- a/modules/programs/bash/profile.sh
+++ b/modules/programs/bash/profile.sh
@@ -56,10 +56,12 @@ for i in $NIX_PROFILES; do # !!! reverse
 
     # Mozilla plugins.
     export MOZ_PLUGIN_PATH=$i/lib/mozilla/plugins${MOZ_PLUGIN_PATH:+:}$MOZ_PLUGIN_PATH
-done
 
-# Search directory for Aspell dictionaries.
-export ASPELL_CONF="dict-dir $HOME/.nix-profile/lib/aspell"
+    # Search directory for Aspell dictionaries.
+    if [ -d "$i/lib/aspell" ]; then
+        export ASPELL_CONF="dict-dir $i/lib/aspell"
+    fi
+done
 
 # The setuid wrappers override other bin directories.
 export PATH=@wrapperDir@:$PATH
-- 
GitLab


From fbb40e0389276556f7282abb6c7452281f7698b2 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 16 Sep 2013 11:31:09 +0200
Subject: [PATCH 4898/5331] release.nix: Automatically include all of
 tests/default.nix

---
 release.nix         | 41 +++++++----------------------------------
 tests/default.nix   |  4 ++--
 tests/installer.nix |  2 ++
 3 files changed, 11 insertions(+), 36 deletions(-)

diff --git a/release.nix b/release.nix
index a6b80be0ea6..6d61b796359 100644
--- a/release.nix
+++ b/release.nix
@@ -234,41 +234,14 @@ in {
   */
 
 
+  # Run the tests in ./tests/default.nix for each platform.  You can
+  # run a test by doing e.g. "nix-build -A tests.login.x86_64-linux".
   tests =
+    with pkgs.lib;
     let
-      runTest = f: pkgs.lib.genAttrs systems (system:
-        f (import ./tests { inherit system; })
-      );
-    in {
-      avahi = runTest (t: t.avahi.test);
-      bittorrent = runTest (t: t.bittorrent.test);
-      firefox = runTest (t: t.firefox.test);
-      firewall = runTest (t: t.firewall.test);
-      installer.grub1 = runTest (t: t.installer.grub1.test);
-      installer.lvm = runTest (t: t.installer.lvm.test);
-      installer.rebuildCD = runTest (t: t.installer.rebuildCD.test);
-      installer.separateBoot = runTest (t: t.installer.separateBoot.test);
-      installer.simple = runTest (t: t.installer.simple.test);
-      #installer.swraid = runTest (t: t.installer.swraid.test);
-      ipv6 = runTest (t: t.ipv6.test);
-      kde4 = runTest (t: t.kde4.test);
-      login = runTest (t: t.login.test);
-      latestKernel.login = runTest (t: t.latestKernel.login.test);
-      misc = runTest (t: t.misc.test);
-      #mpich = runTest (t: t.mpich.test);
-      mysql = runTest (t: t.mysql.test);
-      mysql_replication = runTest (t: t.mysql_replication.test);
-      nat = runTest (t: t.nat.test);
-      nfs3 = runTest (t: t.nfs3.test);
-      #nfs4 = runTest (t: t.nfs4.test);
-      openssh = runTest (t: t.openssh.test);
-      partition = runTest (t: t.partition.test);
-      proxy = runTest (t: t.proxy.test);
-      quake3 = runTest (t: t.quake3.report);
-      #subversion = runTest (t: t.subversion.report);
-      tomcat = runTest (t: t.tomcat.test);
-      #trac = runTest (t: t.trac.test);
-      xfce = runTest (t: t.xfce.test);
-    };
+      testsFor = system:
+        mapAttrsRecursiveCond (x: !x ? test) (n: v: listToAttrs [(nameValuePair system v.test)])
+          (import ./tests { inherit system; });
+    in fold recursiveUpdate {} (map testsFor systems);
 
 }
diff --git a/tests/default.nix b/tests/default.nix
index 0822c93e81e..a94ad069510 100644
--- a/tests/default.nix
+++ b/tests/default.nix
@@ -13,12 +13,12 @@ with import ../lib/testing.nix { inherit system minimal; };
   login = makeTest (import ./login.nix {});
   latestKernel.login = makeTest (import ./login.nix ({ config, pkgs, ... }: { boot.kernelPackages = pkgs.linuxPackages_latest; }));
   misc = makeTest (import ./misc.nix);
-  mpich = makeTest (import ./mpich.nix);
+  #mpich = makeTest (import ./mpich.nix);
   mysql = makeTest (import ./mysql.nix);
   mysql_replication = makeTest (import ./mysql-replication.nix);
   nat = makeTest (import ./nat.nix);
   nfs3 = makeTest (import ./nfs.nix { version = 3; });
-  nfs4 = makeTest (import ./nfs.nix { version = 4; });
+  #nfs4 = makeTest (import ./nfs.nix { version = 4; });
   openssh = makeTest (import ./openssh.nix);
   partition = makeTest (import ./partition.nix);
   portmap = makeTest (import ./portmap.nix);
diff --git a/tests/installer.nix b/tests/installer.nix
index 5c61439248f..74d1650b2ab 100644
--- a/tests/installer.nix
+++ b/tests/installer.nix
@@ -268,6 +268,7 @@ in {
       fileSystems = rootFS;
     };
 
+  /*
   swraid = makeTest
     { createPartitions =
         ''
@@ -300,6 +301,7 @@ in {
         '';
       fileSystems = rootFS + bootFS;
     };
+  */
 
   # Test a basic install using GRUB 1.
   grub1 = makeTest
-- 
GitLab


From 639bb95d0a4f99cc15375ec437a3c0013aaf6194 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 16 Sep 2013 13:24:49 +0200
Subject: [PATCH 4899/5331] Test whether the transparent fetchurl cache
 (tarballs.nixos.org) works

Testing this is useful in any case, but it's necessary now because Nix
1.6 doesn't check the binary cache for fetchurl output anymore.

http://hydra.nixos.org/build/6144188
---
 tests/installer.nix | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/tests/installer.nix b/tests/installer.nix
index 74d1650b2ab..0ce78053171 100644
--- a/tests/installer.nix
+++ b/tests/installer.nix
@@ -81,11 +81,11 @@ let
         };
 
       virtualisation.writableStore = true;
-      virtualisation.pathsInNixDB = channelContents;
+      virtualisation.pathsInNixDB = channelContents ++ [ pkgs.hello.src ];
       virtualisation.memorySize = 768;
     };
 
-  channelContents = [ pkgs.hello.src pkgs.rlwrap ];
+  channelContents = [ pkgs.rlwrap ];
 
 
   # The test script boots the CD, installs NixOS on an empty hard
@@ -112,6 +112,8 @@ let
         $webserver->succeed(
             "nix-push --bzip2 --dest /tmp/channel --manifest --url-prefix http://nixos.org/channels/nixos-unstable " .
             "${toString channelContents} >&2");
+        $webserver->succeed("mkdir /tmp/channel/sha256");
+        $webserver->succeed("cp ${pkgs.hello.src} /tmp/channel/sha256/${pkgs.hello.src.outputHash}");
       ''}
 
       # Make sure that we get a login prompt etc.
@@ -125,7 +127,7 @@ let
         # Allow the machine to talk to the fake nixos.org.
         $machine->succeed(
             "rm /etc/hosts",
-            "echo 192.168.1.1 nixos.org cache.nixos.org > /etc/hosts",
+            "echo 192.168.1.1 nixos.org cache.nixos.org tarballs.nixos.org > /etc/hosts",
             "ifconfig eth1 up 192.168.1.2",
         );
 
-- 
GitLab


From 533248045446ffab4939a7cf8fa3fdd500326abc Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 16 Sep 2013 13:28:59 +0200
Subject: [PATCH 4900/5331] nixos-install: Fix copying from the CD

Nix 1.6 doesn't run the copy-from-other-stores substituter by default
anymore, so turn it on explicitly.

http://hydra.nixos.org/build/6144173
---
 modules/installer/tools/nixos-install.sh | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/modules/installer/tools/nixos-install.sh b/modules/installer/tools/nixos-install.sh
index 5ff28dcfec8..b7efcd2156c 100644
--- a/modules/installer/tools/nixos-install.sh
+++ b/modules/installer/tools/nixos-install.sh
@@ -157,6 +157,9 @@ fi
 # /mnt in the chroot is the root of the CD.
 export NIX_OTHER_STORES=/mnt/nix:$NIX_OTHER_STORES
 
+p=@nix@/libexec/nix/substituters
+export NIX_SUBSTITUTERS=$p/copy-from-other-stores.pl:$p/download-from-binary-cache.pl
+
 
 # Make manifests available in the chroot.
 rm -f $mountPoint/nix/var/nix/manifests/*
-- 
GitLab


From b825169404ecc9c38bcd4ca9a5ad72fc93d04d7b Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 16 Sep 2013 17:15:42 +0200
Subject: [PATCH 4901/5331] Add kexec support
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

You can now do a fast reboot (bypassing the BIOS, which may take
several minutes on servers) by running ‘systemctl kexec’.

Unfortunately the QEMU test for this is unreliable due to a QEMU bug
(it randomly crashes with a message like ‘Guest moved used index from
8 to 0’), so it's commented out.
---
 doc/manual/running.xml          | 22 +++++++++++++++++++---
 lib/test-driver/Machine.pm      |  4 ++--
 modules/module-list.nix         |  1 +
 modules/system/boot/kexec.nix   | 21 +++++++++++++++++++++
 modules/system/boot/systemd.nix |  1 +
 tests/default.nix               |  1 +
 tests/kexec.nix                 | 18 ++++++++++++++++++
 7 files changed, 63 insertions(+), 5 deletions(-)
 create mode 100644 modules/system/boot/kexec.nix
 create mode 100644 tests/kexec.nix

diff --git a/doc/manual/running.xml b/doc/manual/running.xml
index 858372c1aca..e50099707cc 100644
--- a/doc/manual/running.xml
+++ b/doc/manual/running.xml
@@ -101,9 +101,25 @@ doing:
 $ shutdown
 </screen>
 
-This is equivalent to running <command>systemctl poweroff</command>.
-Likewise, <command>reboot</command> (a.k.a. <command>systemctl
-reboot</command>) will reboot the system.</para>
+This is equivalent to running <command>systemctl
+poweroff</command>.</para>
+
+<para>To reboot the system, run
+
+<screen>
+$ reboot
+</screen>
+
+which is equivalent to <command>systemctl reboot</command>.
+Alternatively, you can quickly reboot the system using
+<literal>kexec</literal>, which bypasses the BIOS by directly loading
+the new kernel into memory:
+
+<screen>
+$ systemctl kexec
+</screen>
+
+</para>
 
 <para>The machine can be suspended to RAM (if supported) using
 <command>systemctl suspend</command>, and suspended to disk using
diff --git a/lib/test-driver/Machine.pm b/lib/test-driver/Machine.pm
index c56e650ed36..a28214ea934 100644
--- a/lib/test-driver/Machine.pm
+++ b/lib/test-driver/Machine.pm
@@ -232,9 +232,9 @@ sub connect {
 
         $self->start;
 
-        local $SIG{ALRM} = sub { die "timed out waiting for the guest to connect\n"; };
+        local $SIG{ALRM} = sub { die "timed out waiting for the VM to connect\n"; };
         alarm 300;
-        readline $self->{socket} or die;
+        readline $self->{socket} or die "the VM quit before connecting\n";
         alarm 0;
         
         $self->log("connected to guest root shell");
diff --git a/modules/module-list.nix b/modules/module-list.nix
index 717828fbd70..08acd213355 100644
--- a/modules/module-list.nix
+++ b/modules/module-list.nix
@@ -235,6 +235,7 @@
   ./system/activation/activation-script.nix
   ./system/activation/top-level.nix
   ./system/boot/kernel.nix
+  ./system/boot/kexec.nix
   ./system/boot/loader/efi-boot-stub/efi-boot-stub.nix
   ./system/boot/loader/efi.nix
   ./system/boot/loader/generations-dir/generations-dir.nix
diff --git a/modules/system/boot/kexec.nix b/modules/system/boot/kexec.nix
new file mode 100644
index 00000000000..b7821f9509f
--- /dev/null
+++ b/modules/system/boot/kexec.nix
@@ -0,0 +1,21 @@
+{ config, pkgs, ... }:
+
+{
+  environment.systemPackages = [ pkgs.kexectools ];
+
+  systemd.services."prepare-kexec" =
+    { description = "Preparation for kexec";
+      wantedBy = [ "kexec.target" ];
+      before = [ "systemd-kexec.service" ];
+      unitConfig.DefaultDependencies = false;
+      serviceConfig.Type = "oneshot";
+      path = [ pkgs.kexectools ];
+      script =
+        ''
+          p=$(readlink -f /nix/var/nix/profiles/system)
+          if ! [ -d $p ]; then exit 1; fi
+          exec kexec --load $p/kernel --initrd=$p/initrd --append="$(cat $p/kernel-params) init=$p/init"
+        '';
+    };
+
+}
\ No newline at end of file
diff --git a/modules/system/boot/systemd.nix b/modules/system/boot/systemd.nix
index 900cbfd0cd5..5ad8cdbcb18 100644
--- a/modules/system/boot/systemd.nix
+++ b/modules/system/boot/systemd.nix
@@ -129,6 +129,7 @@ let
       "umount.target"
       "final.target"
       "kexec.target"
+      "systemd-kexec.service"
 
       # Password entry.
       "systemd-ask-password-console.path"
diff --git a/tests/default.nix b/tests/default.nix
index a94ad069510..36a2a2d608b 100644
--- a/tests/default.nix
+++ b/tests/default.nix
@@ -10,6 +10,7 @@ with import ../lib/testing.nix { inherit system minimal; };
   installer = makeTests (import ./installer.nix);
   ipv6 = makeTest (import ./ipv6.nix);
   kde4 = makeTest (import ./kde4.nix);
+  #kexec = makeTest (import ./kexec.nix);
   login = makeTest (import ./login.nix {});
   latestKernel.login = makeTest (import ./login.nix ({ config, pkgs, ... }: { boot.kernelPackages = pkgs.linuxPackages_latest; }));
   misc = makeTest (import ./misc.nix);
diff --git a/tests/kexec.nix b/tests/kexec.nix
new file mode 100644
index 00000000000..b8da332b919
--- /dev/null
+++ b/tests/kexec.nix
@@ -0,0 +1,18 @@
+# Test whether fast reboots via kexec work.
+
+{ pkgs, ... }:
+
+{
+
+  machine = { config, pkgs, ... }:
+    { virtualisation.vlans = [ ]; };
+
+  testScript =
+    ''
+      $machine->waitForUnit("multi-user.target");
+      $machine->execute("systemctl kexec &");
+      $machine->{connected} = 0;
+      $machine->waitForUnit("multi-user.target");
+    '';
+
+}
-- 
GitLab


From 0408858a8a46ee86b934a2bfde276e8e160b5fbf Mon Sep 17 00:00:00 2001
From: Rob Vermaas <rob.vermaas@gmail.com>
Date: Mon, 16 Sep 2013 19:02:20 +0200
Subject: [PATCH 4902/5331] Set CURL_CA_BUNDLE env variable for nix-daemon to
 allow pulling from a binary cache on https. Did not add to nix.envVars to
 avoid being added to shellInit.

---
 modules/services/misc/nix-daemon.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/services/misc/nix-daemon.nix b/modules/services/misc/nix-daemon.nix
index 58fb3322c20..6ae96028979 100644
--- a/modules/services/misc/nix-daemon.nix
+++ b/modules/services/misc/nix-daemon.nix
@@ -292,7 +292,7 @@ in
         path = [ nix pkgs.openssl pkgs.utillinux ]
           ++ optionals cfg.distributedBuilds [ pkgs.openssh pkgs.gzip ];
 
-        environment = cfg.envVars;
+        environment = cfg.envVars // { CURL_CA_BUNDLE = "/etc/ssl/certs/ca-bundle.crt"; };
 
         serviceConfig =
           { ExecStart = "@${nix}/bin/nix-daemon nix-daemon --daemon";
-- 
GitLab


From af2382606cd0fcb9822cdb4df4bb964a11ff7ce6 Mon Sep 17 00:00:00 2001
From: Jan Malakhovski <oxij@oxij.org>
Date: Mon, 26 Aug 2013 19:36:01 +0000
Subject: [PATCH 4903/5331] bind: allow forwarders to differ from nameservers

---
 modules/services/networking/bind.nix | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/modules/services/networking/bind.nix b/modules/services/networking/bind.nix
index a5e4c9d1d02..765dc014dcb 100644
--- a/modules/services/networking/bind.nix
+++ b/modules/services/networking/bind.nix
@@ -19,7 +19,7 @@ let
         allow-query { cachenetworks; };
         blackhole { badnetworks; };
         forward first;
-        forwarders { ${concatMapStrings (entry: " ${entry}; ") config.networking.nameservers} };
+        forwarders { ${concatMapStrings (entry: " ${entry}; ") cfg.forwarders} };
         directory "/var/run/named";
         pid-file "/var/run/named/named.pid";
       };
@@ -83,7 +83,14 @@ in
       ipv4Only = mkOption {
         default = false;
         description = "
-          Only use ipv4, even if the host supports ipv6
+          Only use ipv4, even if the host supports ipv6.
+        ";
+      };
+
+      forwarders = mkOption {
+        default = config.networking.nameservers;
+        description = "
+          List of servers we should forward requests to.
         ";
       };
 
-- 
GitLab


From 9f94a6ffaac11b6d44347949b4b2f6542fb04bd8 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 17 Sep 2013 11:22:31 +0200
Subject: [PATCH 4904/5331] modules/misc/ids.nix: document the fact that the
 uid for tcpcryptd is hard-coded in the daemon

---
 modules/misc/ids.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/misc/ids.nix b/modules/misc/ids.nix
index 3cccbbac22a..315d3e9cd23 100644
--- a/modules/misc/ids.nix
+++ b/modules/misc/ids.nix
@@ -100,7 +100,7 @@
       amule = 90;
       minidlna = 91;
       elasticsearch = 92;
-      tcpcryptd = 93;
+      tcpcryptd = 93; # tcpcryptd uses a hard-coded uid. We patch it in Nixpkgs to match this choice.
 
       # When adding a uid, make sure it doesn't match an existing gid.
 
-- 
GitLab


From 58e40f84e19b9663c40e5de0b387d267d7d2d0d6 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 17 Sep 2013 16:16:59 +0200
Subject: [PATCH 4905/5331] Regression test for blkio functionality

---
 tests/misc.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/tests/misc.nix b/tests/misc.nix
index d52741cab81..41bd2a8686d 100644
--- a/tests/misc.nix
+++ b/tests/misc.nix
@@ -42,6 +42,11 @@
       subtest "poweroff_cmd", sub {
           $machine->succeed("[ -x \"\$(cat /proc/sys/kernel/poweroff_cmd)\" ]")
       };
+
+      # Test whether the blkio controller is properly enabled.
+      subtest "blkio-cgroup", sub {
+          $machine->succeed("[ -n \"\$(cat /sys/fs/cgroup/blkio/blkio.sectors)\" ]")
+      };
     '';
 
 }
-- 
GitLab


From b3d7f2945e43a2487ffd5a9cf785972e3bc69bcc Mon Sep 17 00:00:00 2001
From: Evgeny Egorochkin <phreedom@yandex.ru>
Date: Wed, 18 Sep 2013 10:26:40 +0300
Subject: [PATCH 4906/5331] manual: fix typo, #254.

---
 doc/manual/configuration.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/manual/configuration.xml b/doc/manual/configuration.xml
index 0a3cb5c8fce..965ba73105a 100644
--- a/doc/manual/configuration.xml
+++ b/doc/manual/configuration.xml
@@ -280,7 +280,7 @@ $ nix-env -u '*'
 </screen>
 </para>
 
-<para>A package can be unstalled using the <option>-e</option>
+<para>A package can be uninstalled using the <option>-e</option>
 flag:
 <screen>
 $ nix-env -e thunderbird
-- 
GitLab


From 4be44d011bd24d6a47de810416906f1831b27d82 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Sun, 22 Sep 2013 16:44:00 +0200
Subject: [PATCH 4907/5331] services.cgminer.enable: improve description

So that a search for "bitcoin" in the configuration.nix(5) man page
yields a hit.
---
 modules/services/misc/cgminer.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/modules/services/misc/cgminer.nix b/modules/services/misc/cgminer.nix
index a6e4ce89bde..890d7a4020b 100644
--- a/modules/services/misc/cgminer.nix
+++ b/modules/services/misc/cgminer.nix
@@ -33,7 +33,10 @@ in
 
       enable = mkOption {
         default = false;
-        description = "Whether to enable the cgminer.";
+        description = ''
+          Whether to enable cgminer, an ASIC/FPGA/GPU miner for bitcoin and
+          litecoin.
+        '';
       };
 
       package = mkOption {
-- 
GitLab


From 50d942960e2525bdee04f3f146c5f40503517ca5 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sun, 22 Sep 2013 16:44:41 +0200
Subject: [PATCH 4908/5331] Write a reboot record to /var/log/wtmp

---
 modules/system/boot/systemd.nix | 9 +++++++++
 tests/misc.nix                  | 5 +++++
 2 files changed, 14 insertions(+)

diff --git a/modules/system/boot/systemd.nix b/modules/system/boot/systemd.nix
index 5ad8cdbcb18..c1ca0ca4ca7 100644
--- a/modules/system/boot/systemd.nix
+++ b/modules/system/boot/systemd.nix
@@ -608,5 +608,14 @@ in
 
     users.extraGroups.systemd-journal.gid = config.ids.gids.systemd-journal;
 
+    # FIXME: This should no longer be needed with systemd >= 204.
+    systemd.services."systemd-update-utmp-reboot.service" =
+      { description = "Update UTMP about System Reboot";
+        wantedBy = [ "sysinit.target" ];
+        unitConfig.DefaultDependencies = false;
+        serviceConfig.Type = "oneshot";
+        serviceConfig.ExecStart = "${systemd}/lib/systemd/systemd-update-utmp reboot";
+      };
+
   };
 }
diff --git a/tests/misc.nix b/tests/misc.nix
index 41bd2a8686d..47775ce2a1e 100644
--- a/tests/misc.nix
+++ b/tests/misc.nix
@@ -47,6 +47,11 @@
       subtest "blkio-cgroup", sub {
           $machine->succeed("[ -n \"\$(cat /sys/fs/cgroup/blkio/blkio.sectors)\" ]")
       };
+
+      # Test whether we have a reboot record in wtmp.
+      subtest "reboot-wtmp", sub {
+          $machine->succeed("last | grep reboot >&2");
+      };
     '';
 
 }
-- 
GitLab


From 14f55a2f677e4751c4b1333b5d096a6bc43af40b Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sun, 22 Sep 2013 16:45:10 +0200
Subject: [PATCH 4909/5331] Remove unused runlevel targets

---
 modules/system/boot/systemd.nix | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/modules/system/boot/systemd.nix b/modules/system/boot/systemd.nix
index c1ca0ca4ca7..da34d435a3f 100644
--- a/modules/system/boot/systemd.nix
+++ b/modules/system/boot/systemd.nix
@@ -72,20 +72,12 @@ let
       # SysV init compatibility.
       "systemd-initctl.socket"
       "systemd-initctl.service"
-      "runlevel0.target"
-      "runlevel1.target"
-      "runlevel2.target"
-      "runlevel3.target"
-      "runlevel4.target"
-      "runlevel5.target"
-      "runlevel6.target"
 
       # Random seed.
       "systemd-random-seed-load.service"
       "systemd-random-seed-save.service"
 
       # Utmp maintenance.
-      "systemd-update-utmp-runlevel.service"
       "systemd-update-utmp-shutdown.service"
 
       # Kernel module loading.
-- 
GitLab


From 4be5fae2da1eb9aafdc2982e1e210ef3b6122899 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sun, 22 Sep 2013 18:16:22 +0200
Subject: [PATCH 4910/5331] Log console logins in /var/log/wtmp

---
 modules/programs/shadow.nix | 2 +-
 modules/security/pam.nix    | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/modules/programs/shadow.nix b/modules/programs/shadow.nix
index 39359ac4293..e4310dae986 100644
--- a/modules/programs/shadow.nix
+++ b/modules/programs/shadow.nix
@@ -91,7 +91,7 @@ in
         { name = "groupmod"; rootOK = true; }
         { name = "groupmems"; rootOK = true; }
         { name = "groupdel"; rootOK = true; }
-        { name = "login"; startSession = true; allowNullPassword = true; showMotd = true; }
+        { name = "login"; startSession = true; allowNullPassword = true; showMotd = true; updateWtmp = true; }
       ];
 
     security.setuidPrograms = [ "passwd" "chfn" "su" "newgrp" ];
diff --git a/modules/security/pam.nix b/modules/security/pam.nix
index f97e68a171c..3ef01ea2c17 100644
--- a/modules/security/pam.nix
+++ b/modules/security/pam.nix
@@ -70,6 +70,8 @@ let
       limits ? config.security.pam.loginLimits
     , # Whether to show the message of the day.
       showMotd ? false
+    , # Whether to update /var/log/wtmp.
+      updateWtmp ? false
     }:
 
     { source = pkgs.writeText "${name}.pam"
@@ -114,6 +116,8 @@ let
 
           # Session management.
           session required pam_unix.so
+          ${optionalString updateWtmp
+              "session required ${pkgs.pam}/lib/security/pam_lastlog.so silent"}
           ${optionalString config.users.ldap.enable
               "session optional ${pam_ldap}/lib/security/pam_ldap.so"}
           ${optionalString config.krb5.enable
-- 
GitLab


From f5c4874b05680237d14aaf4a35b87a9aec74d9e3 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sun, 22 Sep 2013 20:49:01 +0200
Subject: [PATCH 4911/5331] Fix service description

---
 modules/tasks/cpu-freq.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/tasks/cpu-freq.nix b/modules/tasks/cpu-freq.nix
index bcab421f0c7..3b21d831087 100644
--- a/modules/tasks/cpu-freq.nix
+++ b/modules/tasks/cpu-freq.nix
@@ -28,7 +28,7 @@ with pkgs.lib;
     environment.systemPackages = [ pkgs.cpufrequtils ];
 
     jobs.cpufreq =
-      { description = "Initialize CPU frequency governor";
+      { description = "CPU Frequency Governor Setup";
 
         after = [ "systemd-modules-load.service" ];
         wantedBy = [ "multi-user.target" ];
-- 
GitLab


From f19065c283f69e44caeddb20fab9051ac52a31ec Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sun, 22 Sep 2013 21:04:54 +0200
Subject: [PATCH 4912/5331] Fix broken systemd shutdown services

The services systemd-random-seed-save.service and
systemd-update-utmp-shutdown.service from systemd 203 don't work,
because they have a RequiresMountFor dependency on /var/lib and
/var/log.  Such a dependency produces a cycle, causing systemd to drop
those services:

  Fixing conflicting jobs by deleting job poweroff.target/stop
  Deleting job systemd-poweroff.service/stop as dependency of job poweroff.target/stop
  Deleting job umount.target/stop as dependency of job systemd-poweroff.service/stop
  Deleting job -.mount/start as dependency of job umount.target/stop
  Deleting job systemd-random-seed-save.service/start as dependency of job -.mount/start
  Deleting job systemd-update-utmp-shutdown.service/start as dependency of job -.mount/start

Dropping the RequiresMountFor doesn't work either, because then
/var/... may have meen unmounted or remounted read-only.

Upstream systemd fixes this by doing the actual work from an ExecStop
action in an already-running service than conflicts with
shutdown.target.  So I backported that here.  The main consequence is
that wtmp shutdown records now get written properly.

The main lesson: shutdown.target is useless for pulling in services
during shutdown if they need to write anywhere.
---
 modules/system/boot/systemd-unit-options.nix |  9 ++++
 modules/system/boot/systemd.nix              | 49 ++++++++++++++------
 2 files changed, 45 insertions(+), 13 deletions(-)

diff --git a/modules/system/boot/systemd-unit-options.nix b/modules/system/boot/systemd-unit-options.nix
index e3542ce9225..be3fbd55674 100644
--- a/modules/system/boot/systemd-unit-options.nix
+++ b/modules/system/boot/systemd-unit-options.nix
@@ -76,6 +76,15 @@ rec {
       '';
     };
 
+    conflicts = mkOption {
+      default = [];
+      types = types.listOf types.string;
+      description = ''
+        If the specified units are started, then this unit is stopped
+        and vice versa.
+      '';
+    };
+
     requiredBy = mkOption {
       default = [];
       types = types.listOf types.string;
diff --git a/modules/system/boot/systemd.nix b/modules/system/boot/systemd.nix
index da34d435a3f..21b3e5e80a0 100644
--- a/modules/system/boot/systemd.nix
+++ b/modules/system/boot/systemd.nix
@@ -73,13 +73,6 @@ let
       "systemd-initctl.socket"
       "systemd-initctl.service"
 
-      # Random seed.
-      "systemd-random-seed-load.service"
-      "systemd-random-seed-save.service"
-
-      # Utmp maintenance.
-      "systemd-update-utmp-shutdown.service"
-
       # Kernel module loading.
       #"systemd-modules-load.service"
 
@@ -158,6 +151,7 @@ let
           Before = concatStringsSep " " config.before;
           BindsTo = concatStringsSep " " config.bindsTo;
           PartOf = concatStringsSep " " config.partOf;
+          Conflicts = concatStringsSep " " config.conflicts;
           "X-Restart-Triggers" = toString config.restartTriggers;
         } // optionalAttrs (config.description != "") {
           Description = config.description;
@@ -600,13 +594,42 @@ in
 
     users.extraGroups.systemd-journal.gid = config.ids.gids.systemd-journal;
 
-    # FIXME: This should no longer be needed with systemd >= 204.
-    systemd.services."systemd-update-utmp-reboot.service" =
-      { description = "Update UTMP about System Reboot";
+    # FIXME: These are borrowed from upstream systemd.
+    systemd.services."systemd-update-utmp" =
+      { description = "Update UTMP about System Reboot/Shutdown";
         wantedBy = [ "sysinit.target" ];
-        unitConfig.DefaultDependencies = false;
-        serviceConfig.Type = "oneshot";
-        serviceConfig.ExecStart = "${systemd}/lib/systemd/systemd-update-utmp reboot";
+        after = [ "systemd-remount-fs.service" ];
+        before = [ "sysinit.target" "shutdown.target" ];
+        conflicts = [ "shutdown.target" ];
+        unitConfig = {
+          DefaultDependencies = false;
+          RequiresMountsFor = "/var/log";
+        };
+        serviceConfig = {
+          Type = "oneshot";
+          RemainAfterExit = true;
+          ExecStart = "${systemd}/lib/systemd/systemd-update-utmp reboot";
+          ExecStop = "${systemd}/lib/systemd/systemd-update-utmp shutdown";
+        };
+        restartIfChanged = false;
+      };
+
+    systemd.services."systemd-random-seed" =
+      { description = "Load/Save Random Seed";
+        wantedBy = [ "sysinit.target" "multi-user.target" ];
+        after = [ "systemd-remount-fs.service" ];
+        before = [ "sysinit.target" "shutdown.target" ];
+        conflicts = [ "shutdown.target" ];
+        unitConfig = {
+          DefaultDependencies = false;
+          RequiresMountsFor = "/var/lib";
+        };
+        serviceConfig = {
+          Type = "oneshot";
+          RemainAfterExit = true;
+          ExecStart = "${systemd}/lib/systemd/systemd-random-seed load";
+          ExecStop = "${systemd}/lib/systemd/systemd-random-seed save";
+        };
       };
 
   };
-- 
GitLab


From d94aa36f1e49ed38a48c7270d4b5a198744a7dcb Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sun, 22 Sep 2013 21:31:38 +0200
Subject: [PATCH 4913/5331] Fix saving the ALSA sound card state

This didn't work reliably because it raced with the remounting of /.
So if you were unlucky, then / was read-only by the time we ran
"alsactl store".  Now the sound card state is saved before anything is
unmounted/remounted.
---
 modules/services/audio/alsa.nix | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/modules/services/audio/alsa.nix b/modules/services/audio/alsa.nix
index ed08c653f3a..6c53ef46ab9 100644
--- a/modules/services/audio/alsa.nix
+++ b/modules/services/audio/alsa.nix
@@ -52,12 +52,14 @@ in
 
     systemd.services."alsa-store" =
       { description = "Store Sound Card State";
-        wantedBy = [ "shutdown.target" ];
-        before = [ "shutdown.target" ];
-        unitConfig.DefaultDependencies = "no";
-        serviceConfig.Type = "oneshot";
-        serviceConfig.ExecStart = "${alsaUtils}/sbin/alsactl store --ignore";
-        serviceConfig.ExecStartPre = "${pkgs.coreutils}/bin/mkdir -p /var/lib/alsa";
+        wantedBy = [ "multi-user.target" ];
+        unitConfig.RequiresMountsFor = "/var/lib/alsa";
+        serviceConfig = {
+          Type = "oneshot";
+          RemainAfterExit = true;
+          ExecStart = "${pkgs.coreutils}/bin/mkdir -p /var/lib/alsa";
+          ExecStop = "${alsaUtils}/sbin/alsactl store --ignore";
+        };
       };
 
   };
-- 
GitLab


From bfd86d4e744861011df558254c5354723c9eb51f Mon Sep 17 00:00:00 2001
From: Rickard Nilsson <rickynils@gmail.com>
Date: Mon, 23 Sep 2013 16:01:56 +0200
Subject: [PATCH 4914/5331] Fix bug in NetworkManager name server configuration

---
 modules/services/networking/networkmanager.nix | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/modules/services/networking/networkmanager.nix b/modules/services/networking/networkmanager.nix
index 7750f3d06f6..1d5682f5f3f 100644
--- a/modules/services/networking/networkmanager.nix
+++ b/modules/services/networking/networkmanager.nix
@@ -47,7 +47,12 @@ let
   overrideNameserversScript = writeScript "02overridedns" ''
     #!/bin/sh
     ${optionalString cfg.overrideNameservers "${gnused}/bin/sed -i '/nameserver /d' /etc/resolv.conf"}
-    ${concatStringsSep ";" (map (s: "echo 'nameserver ${s}' >> /etc/resolv.conf") config.networking.nameservers)}
+    ${concatStrings (map (s: ''
+      ${optionalString cfg.appendNameservers
+        "${gnused}/bin/sed -i '/nameserver ${s}/d' /etc/resolv.conf"
+      }
+      echo 'nameserver ${s}' >> /etc/resolv.conf
+    '') config.networking.nameservers)}
   '';
 
 in {
-- 
GitLab


From b3f4040512b360397bb8989a85776335ff3c2847 Mon Sep 17 00:00:00 2001
From: Jan Malakhovski <oxij@oxij.org>
Date: Wed, 18 Sep 2013 03:18:34 +0000
Subject: [PATCH 4915/5331] Radically change the way NixOS handles environment
 variables and make it possible not to use Bash as the default interactive
 shell.

This change does two things:

* "NixOSizes" environment variables generation. This allows some more
  error-checking and opens possibilities for a modular environment
  configuration. From now on the most of environment variables are
  generated directly by the nix code. Generating sh code that
  generates environment variables is left in a few places where
  nontrivial access to a local environment state is needed.
* By doing the first change this patch untangles bash from the
  environment configuration and makes it trivial to add a support for
  other non bash-compatible shells.

Now to the sad part. This change is quite large (and I'm not sure it's
possible to split it) and yet is not quite complete, it needs some
changes to nixpkgs to be perfect.
See !!! comments in modules/config/shells-environment.nix.

Main principle behind this change is "change environment generation
and nothing else". In particular, shell configuration principles stay
exactly the same as before.
---
 modules/config/fonts/fontconfig.nix           |  11 +-
 modules/config/i18n.nix                       |   5 +-
 modules/config/shells-environment.nix         | 202 +++++++++++++++
 modules/config/shells.nix                     |  24 --
 modules/config/timezone.nix                   |   7 +-
 modules/module-list.nix                       |   3 +-
 modules/profiles/installation-device.nix      |   6 +-
 modules/programs/bash/bash.nix                | 237 +++++++++++-------
 modules/programs/bash/bashrc.sh               |  19 --
 modules/programs/bash/command-not-found.nix   |   2 +-
 modules/programs/bash/profile.sh              | 119 ---------
 modules/programs/environment.nix              |  79 ++++++
 modules/programs/shadow.nix                   |   4 +-
 modules/programs/shell.nix                    |  70 ++++--
 modules/rename.nix                            |   1 +
 modules/security/ca.nix                       |  10 +-
 modules/services/misc/nix-daemon.nix          |  11 +-
 .../services/x11/desktop-managers/xfce.nix    |   5 +-
 modules/services/x11/xserver.nix              |   3 +
 modules/system/boot/modprobe.nix              |   5 +-
 20 files changed, 513 insertions(+), 310 deletions(-)
 create mode 100644 modules/config/shells-environment.nix
 delete mode 100644 modules/config/shells.nix
 delete mode 100644 modules/programs/bash/bashrc.sh
 delete mode 100644 modules/programs/bash/profile.sh
 create mode 100644 modules/programs/environment.nix

diff --git a/modules/config/fonts/fontconfig.nix b/modules/config/fonts/fontconfig.nix
index d0478083ed3..88643b41d83 100644
--- a/modules/config/fonts/fontconfig.nix
+++ b/modules/config/fonts/fontconfig.nix
@@ -46,13 +46,10 @@ with pkgs.lib;
         </fontconfig>
       '';
 
-    environment.shellInit =
-      ''
-        # FIXME: This variable is no longer needed, but we'll keep it
-        # around for a while for applications linked against old
-        # fontconfig builds.
-        export FONTCONFIG_FILE=/etc/fonts/fonts.conf
-      '';
+    # FIXME: This variable is no longer needed, but we'll keep it
+    # around for a while for applications linked against old
+    # fontconfig builds.
+    environment.variables.FONTCONFIG_FILE.value = "/etc/fonts/fonts.conf";
 
     environment.systemPackages = [ pkgs.fontconfig ];
 
diff --git a/modules/config/i18n.nix b/modules/config/i18n.nix
index 62b01c2221e..15df0b3a12a 100644
--- a/modules/config/i18n.nix
+++ b/modules/config/i18n.nix
@@ -69,10 +69,7 @@ in
 
     environment.systemPackages = [ glibcLocales ];
 
-    environment.shellInit =
-      ''
-        export LANG=${config.i18n.defaultLocale}
-      '';
+    environment.variables.LANG.value = config.i18n.defaultLocale;
 
     # ‘/etc/locale.conf’ is used by systemd.
     environment.etc = singleton
diff --git a/modules/config/shells-environment.nix b/modules/config/shells-environment.nix
new file mode 100644
index 00000000000..116c5f11e1f
--- /dev/null
+++ b/modules/config/shells-environment.nix
@@ -0,0 +1,202 @@
+# This module defines a global environment configuration and
+# a common configuration for all shells.
+
+{ config, pkgs, ... }:
+
+with pkgs.lib;
+
+let
+
+  cfg = config.environment;
+
+  environOpts = { name, config, ... }: {
+
+    options = {
+
+      value = mkOption {
+        example = "/foo/bin";
+        description =
+          ''
+            Variable value.
+            Exactly one of this or <option>list</option> must be set.
+          '';
+        type = types.uniq types.string;
+      };
+
+      list = mkOption {
+        default = null;
+        example = [ "/foo/bin" "/bar/bin" ];
+        description =
+          ''
+            Variable value.
+            Exactly one of this or <option>value</option> must be set.
+          '';
+        type = types.nullOr (types.listOf types.string);
+      };
+
+    };
+
+    config = {
+      value = mkIf (config.list != null)
+        (concatStringsSep ":" config.list);
+    };
+
+  };
+
+in
+
+{
+
+  options = {
+
+    environment.variables = mkOption {
+      default = {};
+      description = ''
+        A set of environment variables used in the global environment.
+      '';
+      type = types.attrsOf types.optionSet;
+      options = [ environOpts ];
+    };
+
+    environment.profiles = mkOption {
+      default = [];
+      description = ''
+        A list of profiles used to setup the global environment.
+      '';
+      type = types.listOf types.string;
+    };
+
+    environment.profileVariables = mkOption {
+      default = (p: {});
+      description = ''
+        A function which given a profile path should give back
+        a set of environment variables for that profile.
+      '';
+      # !!! this should be of the following type:
+      #type = types.functionTo (types.attrsOf (types.optionSet envVar));
+      # and envVar should be changed to something more like environOpts.
+      # Having unique `value' _or_ multiple `list' is much more useful
+      # than just sticking everything together with ':' unconditionally.
+      # Anyway, to have this type mentioned above
+      # types.optionSet needs to be transformed into a type constructor
+      # (it has a !!! mark on that in nixpkgs)
+      # for now we hack all this to be
+      type = types.functionTo (types.attrsOf (types.listOf types.string));
+    };
+
+    # !!! isn't there a better way?
+    environment.extraInit = mkOption {
+      default = "";
+      description = ''
+        Shell script code called during global environment initialisation
+        after all variables and profileVariables have been set.
+        This code is asumed to be shell-independent, which means you should
+        stick to pure sh without sh word split.
+      '';
+      type = types.lines;
+    };
+
+    environment.shellInit = mkOption {
+      default = "";
+      description = ''
+        Shell script code called during shell initialisation.
+        This code is asumed to be shell-independent, which means you should
+        stick to pure sh without sh word split.
+      '';
+      type = types.lines;
+    };
+
+    environment.loginShellInit = mkOption {
+      default = "";
+      description = ''
+        Shell script code called during login shell initialisation.
+        This code is asumed to be shell-independent, which means you should
+        stick to pure sh without sh word split.
+      '';
+      type = types.lines;
+    };
+
+    environment.interactiveShellInit = mkOption {
+      default = "";
+      description = ''
+        Shell script code called during interactive shell initialisation.
+        This code is asumed to be shell-independent, which means you should
+        stick to pure sh without sh word split.
+      '';
+      type = types.lines;
+    };
+
+    environment.shellAliases = mkOption {
+      default = {};
+      example = { ll = "ls -l"; };
+      description = ''
+        An attribute set that maps aliases (the top level attribute names in
+        this option) to command strings or directly to build outputs. The
+        aliases are added to all users' shells.
+      '';
+      type = types.attrs; # types.attrsOf types.stringOrPath;
+    };
+
+    environment.binsh = mkOption {
+      default = "${config.system.build.binsh}/bin/sh";
+      example = "\${pkgs.dash}/bin/dash";
+      type = with pkgs.lib.types; path;
+      description = ''
+        The shell executable that is linked system-wide to
+        <literal>/bin/sh</literal>. Please note that NixOS assumes all
+        over the place that shell to be Bash, so override the default
+        setting only if you know exactly what you're doing.
+      '';
+    };
+
+    environment.shells = mkOption {
+      default = [];
+      example = [ "/run/current-system/sw/bin/zsh" ];
+      description = ''
+        A list of permissible login shells for user accounts.
+        No need to mention <literal>/bin/sh</literal>
+        here, it is placed into this list implicitly.
+      '';
+      type = types.listOf types.path;
+    };
+
+  };
+
+  config = {
+
+    system.build.binsh = pkgs.bashInteractive;
+
+    environment.etc."shells".text =
+      ''
+        ${concatStringsSep "\n" cfg.shells}
+        /bin/sh
+      '';
+
+    environment.etc."environment".text =
+       ''
+         ${concatStringsSep "\n" (
+           (mapAttrsToList (n: v: ''export ${n}="${concatStringsSep ":" v}"'')
+             # This line is a kind of a hack because of !!! note above
+             (fold (mergeAttrsWithFunc concat) {} ([ (mapAttrs (n: v: [ v.value ]) cfg.variables) ] ++ map cfg.profileVariables cfg.profiles))))}
+
+         ${cfg.extraInit}
+
+         # The setuid wrappers override other bin directories.
+         export PATH="${config.security.wrapperDir}:$PATH"
+
+         # ~/bin if it exists overrides other bin directories.
+         export PATH="$HOME/bin:$PATH"
+       '';
+
+    system.activationScripts.binsh = stringAfter [ "stdio" ]
+      ''
+        # Create the required /bin/sh symlink; otherwise lots of things
+        # (notably the system() function) won't work.
+        mkdir -m 0755 -p /bin
+        ln -sfn "${cfg.binsh}" /bin/.sh.tmp
+        mv /bin/.sh.tmp /bin/sh # atomically replace /bin/sh
+      '';
+
+  };
+
+}
diff --git a/modules/config/shells.nix b/modules/config/shells.nix
deleted file mode 100644
index b0a946a8e6e..00000000000
--- a/modules/config/shells.nix
+++ /dev/null
@@ -1,24 +0,0 @@
-# This module creates /etc/shells, the file that defines the list of
-# permissible login shells for user accounts.
-
-{ config, pkgs, ... }:
-
-with pkgs.lib;
-
-{
-
-  config = {
-
-    environment.etc = singleton
-      { target = "shells";
-        source = pkgs.writeText "shells"
-          ''
-            /run/current-system/sw/bin/bash
-            /var/run/current-system/sw/bin/bash
-            /bin/sh
-          '';
-      };
-
-  };
-
-}
diff --git a/modules/config/timezone.nix b/modules/config/timezone.nix
index 81536725501..68b785601fa 100644
--- a/modules/config/timezone.nix
+++ b/modules/config/timezone.nix
@@ -24,11 +24,8 @@ with pkgs.lib;
 
   config = {
 
-    environment.shellInit =
-      ''
-        export TZDIR=/etc/zoneinfo
-        export TZ=${config.time.timeZone}
-      '';
+    environment.variables.TZDIR.value = "/etc/zoneinfo";
+    environment.variables.TZ.value = config.time.timeZone;
 
     environment.etc.localtime.source = "${pkgs.tzdata}/share/zoneinfo/${config.time.timeZone}";
 
diff --git a/modules/module-list.nix b/modules/module-list.nix
index 08acd213355..3a7ede02396 100644
--- a/modules/module-list.nix
+++ b/modules/module-list.nix
@@ -13,7 +13,7 @@
   ./config/nsswitch.nix
   ./config/power-management.nix
   ./config/pulseaudio.nix
-  ./config/shells.nix
+  ./config/shells-environment.nix
   ./config/swap.nix
   ./config/sysctl.nix
   ./config/system-path.nix
@@ -45,6 +45,7 @@
   ./programs/bash/bash.nix
   ./programs/bash/command-not-found.nix
   ./programs/blcr.nix
+  ./programs/environment.nix
   ./programs/info.nix
   ./programs/shadow.nix
   ./programs/shell.nix
diff --git a/modules/profiles/installation-device.nix b/modules/profiles/installation-device.nix
index 5a92789e5d9..cfb2eb3f9cb 100644
--- a/modules/profiles/installation-device.nix
+++ b/modules/profiles/installation-device.nix
@@ -50,9 +50,7 @@ with pkgs.lib;
     # Tell the Nix evaluator to garbage collect more aggressively.
     # This is desirable in memory-constrained environments that don't
     # (yet) have swap set up.
-    environment.shellInit =
-      ''
-        export GC_INITIAL_HEAP_SIZE=100000
-      '';
+    environment.variables.GC_INITIAL_HEAP_SIZE.value = "100000";
+
   };
 }
diff --git a/modules/programs/bash/bash.nix b/modules/programs/bash/bash.nix
index 0d751d1d0d3..2324164316d 100644
--- a/modules/programs/bash/bash.nix
+++ b/modules/programs/bash/bash.nix
@@ -7,9 +7,11 @@ with pkgs.lib;
 
 let
 
-  cfg = config.environment;
+  cfge = config.environment;
 
-  initBashCompletion = optionalString cfg.enableBashCompletion ''
+  cfg = config.programs.bash;
+
+  bashCompletion = optionalString cfg.enableCompletion ''
     # Check whether we're running a version of Bash that has support for
     # programmable completion. If we do, enable all modules installed in
     # the system (and user profile).
@@ -27,7 +29,7 @@ let
     fi
   '';
 
-  shellAliases = concatStringsSep "\n" (
+  bashAliases = concatStringsSep "\n" (
     mapAttrsFlatten (k: v: "alias ${k}='${v}'") cfg.shellAliases
   );
 
@@ -36,118 +38,173 @@ in
 {
   options = {
 
-    environment.promptInit = mkOption {
-      default = ''
-        # Provide a nice prompt.
-        PROMPT_COLOR="1;31m"
-        let $UID && PROMPT_COLOR="1;32m"
-        PS1="\n\[\033[$PROMPT_COLOR\][\u@\h:\w]\\$\[\033[0m\] "
-        if test "$TERM" = "xterm"; then
-          PS1="\[\033]2;\h:\u:\w\007\]$PS1"
-        fi
-      '';
-      description = ''
-        Shell script code used to initialise the shell prompt.
-      '';
-      type = types.lines;
-    };
+    programs.bash = {
+
+      enable = mkOption {
+        default = true;
+        description = ''
+          Whenever to configure Bash as an interactive shell.
+          Note that this tries to make Bash the default
+          <option>users.defaultUserShell</option>,
+          which in turn means that you might need to explicitly
+          set this variable if you have another shell configured
+          with NixOS.
+        '';
+        type = types.bool;
+      };
 
-    environment.shellInit = mkOption {
-      default = "";
-      example = ''export PATH=/godi/bin/:$PATH'';
-      description = ''
-        Shell script code called during login shell initialisation.
-      '';
-      type = types.lines;
-    };
+      shellAliases = mkOption {
+        default = config.environment.shellAliases // { which = "type -P"; };
+        description = ''
+          Set of aliases for bash shell. See <option>environment.shellAliases</option>
+          for an option format description.
+        '';
+        type = types.attrs; # types.attrsOf types.stringOrPath;
+      };
 
-    environment.interactiveShellInit = mkOption {
-      default = "";
-      example = ''export PATH=/godi/bin/:$PATH'';
-      description = ''
-        Shell script code called during interactive shell initialisation.
-      '';
-      type = types.lines;
-    };
+      shellInit = mkOption {
+        default = "";
+        description = ''
+          Shell script code called during bash shell initialisation.
+        '';
+        type = types.lines;
+      };
 
-    environment.enableBashCompletion = mkOption {
-      default = false;
-      description = "Enable Bash completion for all interactive shells.";
-      type = types.bool;
-    };
+      loginShellInit = mkOption {
+        default = "";
+        description = ''
+          Shell script code called during login bash shell initialisation.
+        '';
+        type = types.lines;
+      };
+
+      interactiveShellInit = mkOption {
+        default = "";
+        description = ''
+          Shell script code called during interactive bash shell initialisation.
+        '';
+        type = types.lines;
+      };
+
+      promptInit = mkOption {
+        default = ''
+          # Provide a nice prompt.
+          PROMPT_COLOR="1;31m"
+          let $UID && PROMPT_COLOR="1;32m"
+          PS1="\n\[\033[$PROMPT_COLOR\][\u@\h:\w]\\$\[\033[0m\] "
+          if test "$TERM" = "xterm"; then
+            PS1="\[\033]2;\h:\u:\w\007\]$PS1"
+          fi
+        '';
+        description = ''
+          Shell script code used to initialise the bash prompt.
+        '';
+        type = types.lines;
+      };
+
+      enableCompletion = mkOption {
+        default = false;
+        description = ''
+          Enable Bash completion for all interactive bash shells.
+        '';
+        type = types.bool;
+      };
 
-    environment.binsh = mkOption {
-      default = "${config.system.build.binsh}/bin/sh";
-      example = "\${pkgs.dash}/bin/dash";
-      type = types.path;
-      description = ''
-        Select the shell executable that is linked system-wide to
-        <literal>/bin/sh</literal>. Please note that NixOS assumes all
-        over the place that shell to be Bash, so override the default
-        setting only if you know exactly what you're doing.
-      '';
     };
 
   };
 
+  config = mkIf cfg.enable {
 
-  config = {
+    programs.bash = {
 
-    # Script executed when the shell starts as a login shell.
-    environment.etc."profile".source =
-      pkgs.substituteAll {
-        src = ./profile.sh;
-        wrapperDir = config.security.wrapperDir;
-        inherit (cfg) shellInit;
-      };
+      shellInit = ''
+        . /etc/environment
 
-    # /etc/bashrc: executed every time an interactive bash
-    # starts. Sources /etc/profile to ensure that the system
-    # environment is configured properly.
-    environment.etc."bashrc".source =
-      pkgs.substituteAll {
-        src = ./bashrc.sh;
-        inherit (cfg) interactiveShellInit;
-      };
+        ${cfge.shellInit}
+      '';
 
-    # Configuration for readline in bash.
-    environment.etc."inputrc".source = ./inputrc;
+      loginShellInit = cfge.loginShellInit;
 
-    environment.shellAliases =
-      { ls = "ls --color=tty";
-        ll = "ls -l";
-        l = "ls -alh";
-        which = "type -P";
-      };
+      interactiveShellInit = ''
+        ${cfge.interactiveShellInit}
 
-    environment.interactiveShellInit =
-      ''
         # Check the window size after every command.
         shopt -s checkwinsize
 
-        ${cfg.promptInit}
-        ${initBashCompletion}
-        ${shellAliases}
-
         # Disable hashing (i.e. caching) of command lookups.
         set +h
+
+        ${cfg.promptInit}
+        ${bashCompletion}
+        ${bashAliases}
       '';
 
-    system.build.binsh = pkgs.bashInteractive;
+    };
 
-    system.activationScripts.binsh = stringAfter [ "stdio" ]
+    environment.etc."profile".text =
       ''
-        # Create the required /bin/sh symlink; otherwise lots of things
-        # (notably the system() function) won't work.
-        mkdir -m 0755 -p /bin
-        ln -sfn "${cfg.binsh}" /bin/.sh.tmp
-        mv /bin/.sh.tmp /bin/sh # atomically replace /bin/sh
+        # /etc/profile: DO NOT EDIT -- this file has been generated automatically.
+        # This file is read for login shells.
+
+        # Only execute this file once per shell.
+        if [ -n "$__ETC_PROFILE_SOURCED" ]; then return; fi
+        __ETC_PROFILE_SOURCED=1
+
+        if [ -z "$__BASH_SHELL_INIT_DONE" ]; then
+          __BASH_SHELL_INIT_DONE=1
+          ${cfg.shellInit}
+        fi
+
+        ${cfg.loginShellInit}
+
+        # Read system-wide modifications.
+        if test -f /etc/profile.local; then
+          . /etc/profile.local
+        fi
+
+        if [ -n "''${BASH_VERSION:-}" ]; then
+          . /etc/bashrc
+        fi
       '';
 
-    environment.pathsToLink = optionals cfg.enableBashCompletion [
-      "/etc/bash_completion.d"
-      "/share/bash-completion"
-    ];
+    environment.etc."bashrc".text =
+      ''
+        # /etc/bashrc: DO NOT EDIT -- this file has been generated automatically.
+
+        # Only execute this file once per shell.
+        if [ -n "$__ETC_BASHRC_SOURCED" -o -n "$NOSYSBASHRC" ]; then return; fi
+        __ETC_BASHRC_SOURCED=1
+
+        if [ -z "$__BASH_SHELL_INIT_DONE" ]; then
+          __BASH_SHELL_INIT_DONE=1
+          ${cfg.shellInit}
+        fi
+
+        # We are not always an interactive shell.
+        if [ -n "$PS1" ]; then
+          ${cfg.interactiveShellInit}
+        fi
+
+        # Read system-wide modifications.
+        if test -f /etc/bashrc.local; then
+          . /etc/bashrc.local
+        fi
+      '';
+
+    # Configuration for readline in bash.
+    environment.etc."inputrc".source = ./inputrc;
+
+    users.defaultUserShell = mkDefault "/run/current-system/sw/bin/bash";
+
+    environment.shells =
+      [ "/run/current-system/sw/bin/bash"
+        "/var/run/current-system/sw/bin/bash"
+        "/run/current-system/sw/bin/sh"
+        "/var/run/current-system/sw/bin/sh"
+        "${pkgs.bashInteractive}/bin/bash"
+        "${pkgs.bashInteractive}/bin/sh"
+      ];
 
   };
 
diff --git a/modules/programs/bash/bashrc.sh b/modules/programs/bash/bashrc.sh
deleted file mode 100644
index 98b0907a06b..00000000000
--- a/modules/programs/bash/bashrc.sh
+++ /dev/null
@@ -1,19 +0,0 @@
-# /etc/bashrc: DO NOT EDIT -- this file has been generated automatically.
-
-# This file is read for interactive non-login shells.
-
-# Only execute this file once per shell.
-if [ -n "$__ETC_BASHRC_SOURCED" -o -n "$NOSYSBASHRC" ]; then return; fi
-__ETC_BASHRC_SOURCED=1
-
-# If the profile was not loaded in a parent process, source it.  But
-# otherwise don't do it because we don't want to clobber overridden
-# values of $PATH, etc.
-if [ -z "$__ETC_PROFILE_DONE" ]; then
-    . /etc/profile
-fi
-
-# We are not always an interactive shell.
-if [ -z "$PS1" ]; then return; fi
-
-@interactiveShellInit@
diff --git a/modules/programs/bash/command-not-found.nix b/modules/programs/bash/command-not-found.nix
index 6549ba86810..502320446a3 100644
--- a/modules/programs/bash/command-not-found.nix
+++ b/modules/programs/bash/command-not-found.nix
@@ -23,7 +23,7 @@ in
 
 {
 
-  environment.interactiveShellInit =
+  programs.bash.interactiveShellInit =
     ''
       # This function is called whenever a command is not found.
       command_not_found_handle() {
diff --git a/modules/programs/bash/profile.sh b/modules/programs/bash/profile.sh
deleted file mode 100644
index 92fb0658189..00000000000
--- a/modules/programs/bash/profile.sh
+++ /dev/null
@@ -1,119 +0,0 @@
-# /etc/profile: DO NOT EDIT -- this file has been generated automatically.
-
-# This file is read for (interactive) login shells.  Any
-# initialisation specific to interactive shells should be put in
-# /etc/bashrc, which is sourced from here.
-
-# Only execute this file once per shell.
-if [ -n "$__ETC_PROFILE_SOURCED" ]; then return; fi
-__ETC_PROFILE_SOURCED=1
-
-# Prevent this file from being sourced by interactive non-login child shells.
-export __ETC_PROFILE_DONE=1
-
-# Initialise a bunch of environment variables.
-export LOCALE_ARCHIVE=/run/current-system/sw/lib/locale/locale-archive
-export LD_LIBRARY_PATH=/run/opengl-driver/lib:/run/opengl-driver-32/lib # !!! only set if needed
-export NIXPKGS_CONFIG=/etc/nix/nixpkgs-config.nix
-export NIX_PATH=/nix/var/nix/profiles/per-user/root/channels/nixos:nixpkgs=/etc/nixos/nixpkgs:nixos=/etc/nixos/nixos:nixos-config=/etc/nixos/configuration.nix:services=/etc/nixos/services
-export PAGER="less -R"
-export EDITOR=nano
-export LOCATE_PATH=/var/cache/locatedb
-
-# Include the various profiles in the appropriate environment variables.
-export NIX_USER_PROFILE_DIR=/nix/var/nix/profiles/per-user/$USER
-export NIX_PROFILES="/run/current-system/sw /nix/var/nix/profiles/default $HOME/.nix-profile"
-
-unset PATH INFOPATH PKG_CONFIG_PATH PERL5LIB ALSA_PLUGIN_DIRS GST_PLUGIN_PATH KDEDIRS
-unset QT_PLUGIN_PATH QTWEBKIT_PLUGIN_PATH STRIGI_PLUGIN_PATH XDG_CONFIG_DIRS XDG_DATA_DIRS
-unset MOZ_PLUGIN_PATH TERMINFO_DIRS
-
-for i in $NIX_PROFILES; do # !!! reverse
-    # We have to care not leaving an empty PATH element, because that means '.' to Linux
-    export PATH=$i/bin:$i/sbin:$i/lib/kde4/libexec${PATH:+:}$PATH
-    export INFOPATH=$i/info:$i/share/info${INFOPATH:+:}$INFOPATH
-    export PKG_CONFIG_PATH="$i/lib/pkgconfig${PKG_CONFIG_PATH:+:}$PKG_CONFIG_PATH"
-
-    # terminfo and reset TERM with new TERMINFO available
-    export TERMINFO_DIRS=$i/share/terminfo${TERMINFO_DIRS:+:}$TERMINFO_DIRS
-    export TERM=$TERM
-
-    export PERL5LIB="$i/lib/perl5/site_perl${PERL5LIB:+:}$PERL5LIB"
-
-    # ALSA plugins
-    export ALSA_PLUGIN_DIRS="$i/lib/alsa-lib${ALSA_PLUGIN_DIRS:+:}$ALSA_PLUGIN_DIRS"
-
-    # GStreamer.
-    export GST_PLUGIN_PATH="$i/lib/gstreamer-0.10${GST_PLUGIN_PATH:+:}$GST_PLUGIN_PATH"
-
-    # KDE/Gnome stuff.
-    export KDEDIRS=$i${KDEDIRS:+:}$KDEDIRS
-    export STRIGI_PLUGIN_PATH=$i/lib/strigi/${STRIGI_PLUGIN_PATH:+:}$STRIGI_PLUGIN_PATH
-    export QT_PLUGIN_PATH=$i/lib/qt4/plugins:$i/lib/kde4/plugins${QT_PLUGIN_PATH:+:}:$QT_PLUGIN_PATH
-    export QTWEBKIT_PLUGIN_PATH=$i/lib/mozilla/plugins/${QTWEBKIT_PLUGIN_PATH:+:}$QTWEBKIT_PLUGIN_PATH
-    export XDG_CONFIG_DIRS=$i/etc/xdg${XDG_CONFIG_DIRS:+:}$XDG_CONFIG_DIRS
-    export XDG_DATA_DIRS=$i/share${XDG_DATA_DIRS:+:}$XDG_DATA_DIRS
-
-    # Mozilla plugins.
-    export MOZ_PLUGIN_PATH=$i/lib/mozilla/plugins${MOZ_PLUGIN_PATH:+:}$MOZ_PLUGIN_PATH
-
-    # Search directory for Aspell dictionaries.
-    if [ -d "$i/lib/aspell" ]; then
-        export ASPELL_CONF="dict-dir $i/lib/aspell"
-    fi
-done
-
-# The setuid wrappers override other bin directories.
-export PATH=@wrapperDir@:$PATH
-
-# ~/bin if it exists overrides other bin directories.
-export PATH=$HOME/bin:$PATH
-
-# Set up the per-user profile.
-mkdir -m 0755 -p $NIX_USER_PROFILE_DIR
-if test "$(stat --printf '%u' $NIX_USER_PROFILE_DIR)" != "$(id -u)"; then
-    echo "WARNING: bad ownership on $NIX_USER_PROFILE_DIR" >&2
-fi
-
-if ! test -L $HOME/.nix-profile; then
-    echo "creating $HOME/.nix-profile" >&2
-    if test "$USER" != root; then
-        ln -s $NIX_USER_PROFILE_DIR/profile $HOME/.nix-profile
-    else
-        # Root installs in the system-wide profile by default.
-        ln -s /nix/var/nix/profiles/default $HOME/.nix-profile
-    fi
-fi
-
-# Subscribe the root user to the NixOS channel by default.
-if [ "$USER" = root -a ! -e $HOME/.nix-channels ]; then
-    echo "http://nixos.org/channels/nixos-unstable nixos" > $HOME/.nix-channels
-fi
-
-# Create the per-user garbage collector roots directory.
-NIX_USER_GCROOTS_DIR=/nix/var/nix/gcroots/per-user/$USER
-mkdir -m 0755 -p $NIX_USER_GCROOTS_DIR
-if test "$(stat --printf '%u' $NIX_USER_GCROOTS_DIR)" != "$(id -u)"; then
-    echo "WARNING: bad ownership on $NIX_USER_GCROOTS_DIR" >&2
-fi
-
-# Set up a default Nix expression from which to install stuff.
-if [ ! -e $HOME/.nix-defexpr -o -L $HOME/.nix-defexpr ]; then
-    echo "creating $HOME/.nix-defexpr" >&2
-    rm -f $HOME/.nix-defexpr
-    mkdir $HOME/.nix-defexpr
-    if [ "$USER" != root ]; then
-        ln -s /nix/var/nix/profiles/per-user/root/channels $HOME/.nix-defexpr/channels_root
-    fi
-fi
-
-@shellInit@
-
-# Read system-wide modifications.
-if test -f /etc/profile.local; then
-    . /etc/profile.local
-fi
-
-if [ -n "${BASH_VERSION:-}" ]; then
-    . /etc/bashrc
-fi
diff --git a/modules/programs/environment.nix b/modules/programs/environment.nix
new file mode 100644
index 00000000000..8f2df7e4a53
--- /dev/null
+++ b/modules/programs/environment.nix
@@ -0,0 +1,79 @@
+# This module defines a standard configuration for NixOS global environment.
+
+# Most of the stuff here should probably be moved elsewhere sometime.
+
+{ config, pkgs, ... }:
+
+with pkgs.lib;
+
+let
+
+  cfg = config.environment;
+
+in
+
+{
+
+  config = {
+
+    environment.variables =
+      { LOCALE_ARCHIVE.value = "/run/current-system/sw/lib/locale/locale-archive";
+        LOCATE_PATH.value = "/var/cache/locatedb";
+        NIXPKGS_CONFIG.value = "/etc/nix/nixpkgs-config.nix";
+        NIX_PATH.list =
+          [ "/nix/var/nix/profiles/per-user/root/channels/nixos"
+            "nixpkgs=/etc/nixos/nixpkgs"
+            "nixos=/etc/nixos/nixos"
+            "nixos-config=/etc/nixos/configuration.nix"
+            "services=/etc/nixos/services"
+          ];
+        PAGER.value = "less -R";
+        EDITOR.value = "nano";
+      };
+
+    environment.profiles =
+      [ "$HOME/.nix-profile"
+        "/nix/var/nix/profiles/default"
+        "/run/current-system/sw"
+      ];
+
+    # !!! fix environment.profileVariables definition and then move
+    # most of these elsewhere
+    environment.profileVariables = (i:
+      { PATH = [ "${i}/bin" "${i}/sbin" "${i}/lib/kde4/libexec" ];
+        MANPATH = [ "${i}/man" "${i}/share/man" ];
+        INFOPATH = [ "${i}/info" "${i}/share/info" ];
+        PKG_CONFIG_PATH = [ "${i}/lib/pkgconfig" ];
+        TERMINFO_DIRS = [ "${i}/share/terminfo" ];
+        PERL5LIB = [ "${i}/lib/perl5/site_perl" ];
+        ALSA_PLUGIN_DIRS = [ "${i}/lib/alsa-lib" ];
+        GST_PLUGIN_PATH = [ "${i}/lib/gstreamer-0.10" ];
+        KDEDIRS = [ "${i}" ];
+        STRIGI_PLUGIN_PATH = [ "${i}/lib/strigi/" ];
+        QT_PLUGIN_PATH = [ "${i}/lib/qt4/plugins" "${i}/lib/kde4/plugins" ];
+        QTWEBKIT_PLUGIN_PATH = [ "${i}/lib/mozilla/plugins/" ];
+        GTK_PATH = [ "${i}/lib/gtk-2.0" ];
+        XDG_CONFIG_DIRS = [ "${i}/etc/xdg" ];
+        XDG_DATA_DIRS = [ "${i}/share" ];
+        MOZ_PLUGIN_PATH = [ "${i}/lib/mozilla/plugins" ];
+      });
+
+    environment.extraInit =
+      ''
+         # reset TERM with new TERMINFO available (if any)
+         export TERM=$TERM
+
+         unset ASPELL_CONF
+         for i in ${concatStringsSep " " (reverseList cfg.profiles)} ; do
+           if [ -d "$i/lib/aspell" ]; then
+             export ASPELL_CONF="dict-dir $i/lib/aspell"
+           fi
+         done
+
+         export NIX_USER_PROFILE_DIR="/nix/var/nix/profiles/per-user/$USER"
+         export NIX_PROFILES="${concatStringsSep " " (reverseList cfg.profiles)}"
+      '';
+
+  };
+
+}
diff --git a/modules/programs/shadow.nix b/modules/programs/shadow.nix
index 39359ac4293..9f62e62beb1 100644
--- a/modules/programs/shadow.nix
+++ b/modules/programs/shadow.nix
@@ -2,6 +2,8 @@
 
 { config, pkgs, ... }:
 
+with pkgs.lib;
+
 let
 
   loginDefs =
@@ -39,7 +41,6 @@ in
   options = {
 
     users.defaultUserShell = pkgs.lib.mkOption {
-      default = "/run/current-system/sw/bin/bash";
       description = ''
         This option defines the default shell assigned to user
         accounts.  This must not be a store path, since the path is
@@ -47,6 +48,7 @@ in
         Rather, it should be the path of a symlink that points to the
         actual shell in the Nix store.
       '';
+      type = types.uniq types.path;
     };
 
   };
diff --git a/modules/programs/shell.nix b/modules/programs/shell.nix
index 8348c4c25a1..d5f43a86a94 100644
--- a/modules/programs/shell.nix
+++ b/modules/programs/shell.nix
@@ -1,25 +1,67 @@
-# This module defines global configuration for the shells.
+# This module defines a standard configuration for NixOS shells.
 
 { config, pkgs, ... }:
 
 with pkgs.lib;
 
+let
+
+  cfg = config.environment;
+
+in
+
 {
-  options = {
-    environment.shellAliases = mkOption {
-      type = types.attrs; # types.attrsOf types.stringOrPath;
-      default = {};
-      example = {
-        ll = "ls -lh";
+
+  config = {
+
+    environment.shellAliases =
+      { ls = "ls --color=tty";
+        ll = "ls -l";
+        l  = "ls -alh";
       };
-      description = ''
-        An attribute set that maps aliases (the top level attribute names in
-        this option) to command strings or directly to build outputs. The
-        aliases are added to all users' shells.
+
+    environment.shellInit =
+      ''
+        # Set up the per-user profile.
+        mkdir -m 0755 -p $NIX_USER_PROFILE_DIR
+        if test "$(stat --printf '%u' $NIX_USER_PROFILE_DIR)" != "$(id -u)"; then
+            echo "WARNING: bad ownership on $NIX_USER_PROFILE_DIR" >&2
+        fi
+
+        if ! test -L $HOME/.nix-profile; then
+            echo "creating $HOME/.nix-profile" >&2
+            if test "$USER" != root; then
+                ln -s $NIX_USER_PROFILE_DIR/profile $HOME/.nix-profile
+            else
+                # Root installs in the system-wide profile by default.
+                ln -s /nix/var/nix/profiles/default $HOME/.nix-profile
+            fi
+        fi
+
+        # Subscribe the root user to the NixOS channel by default.
+        if [ "$USER" = root -a ! -e $HOME/.nix-channels ]; then
+            echo "creating $HOME/.nix-channels with nixos-unstable subscription" >&2
+            echo "http://nixos.org/channels/nixos-unstable nixos" > $HOME/.nix-channels
+        fi
+
+        # Create the per-user garbage collector roots directory.
+        NIX_USER_GCROOTS_DIR=/nix/var/nix/gcroots/per-user/$USER
+        mkdir -m 0755 -p $NIX_USER_GCROOTS_DIR
+        if test "$(stat --printf '%u' $NIX_USER_GCROOTS_DIR)" != "$(id -u)"; then
+            echo "WARNING: bad ownership on $NIX_USER_GCROOTS_DIR" >&2
+        fi
+
+        # Set up a default Nix expression from which to install stuff.
+        if [ ! -e $HOME/.nix-defexpr -o -L $HOME/.nix-defexpr ]; then
+            echo "creating $HOME/.nix-defexpr" >&2
+            rm -f $HOME/.nix-defexpr
+            mkdir $HOME/.nix-defexpr
+            if [ "$USER" != root ]; then
+                ln -s /nix/var/nix/profiles/per-user/root/channels $HOME/.nix-defexpr/channels_root
+            fi
+        fi
       '';
-    };
-  };
 
-  config = {
   };
+
 }
diff --git a/modules/rename.nix b/modules/rename.nix
index bc0ebf1f091..ef86befe9e7 100644
--- a/modules/rename.nix
+++ b/modules/rename.nix
@@ -66,6 +66,7 @@ in zipModules ([]
 # usage example:
 # ++ rename alias "services.xserver.slim.theme" "services.xserver.displayManager.slim.theme"
 ++ rename obsolete "environment.extraPackages" "environment.systemPackages"
+++ rename obsolete "environment.enableBashCompletion" "programs.bash.enableCompletion"
 
 ++ rename obsolete "security.extraSetuidPrograms" "security.setuidPrograms"
 ++ rename obsolete "networking.enableWLAN" "networking.wireless.enable"
diff --git a/modules/security/ca.nix b/modules/security/ca.nix
index e42f5ffe3b8..f0897630eac 100644
--- a/modules/security/ca.nix
+++ b/modules/security/ca.nix
@@ -17,13 +17,9 @@ with pkgs.lib;
         }
       ];
 
-    environment.shellInit =
-      ''
-        export OPENSSL_X509_CERT_FILE=/etc/ssl/certs/ca-bundle.crt
-
-        export CURL_CA_BUNDLE=/etc/ssl/certs/ca-bundle.crt
-        export GIT_SSL_CAINFO=/etc/ssl/certs/ca-bundle.crt
-      '';
+    environment.variables.OPENSSL_X509_CERT_FILE.value = "/etc/ssl/certs/ca-bundle.crt";
+    environment.variables.CURL_CA_BUNDLE.value = "/etc/ssl/certs/ca-bundle.crt";
+    environment.variables.GIT_SSL_CAINFO.value = "/etc/ssl/certs/ca-bundle.crt";
 
   };
 
diff --git a/modules/services/misc/nix-daemon.nix b/modules/services/misc/nix-daemon.nix
index 6ae96028979..9dd58fbab20 100644
--- a/modules/services/misc/nix-daemon.nix
+++ b/modules/services/misc/nix-daemon.nix
@@ -198,8 +198,7 @@ in
         example = "http://127.0.0.1:3128";
       };
 
-      # Environment variables for running Nix.  !!! Misnomer - it's
-      # actually a shell script.
+      # Environment variables for running Nix.
       envVars = mkOption {
         internal = true;
         default = {};
@@ -328,11 +327,11 @@ in
         ftp_proxy = cfg.proxy;
       };
 
-    environment.shellInit =
-      ''
-        # Set up the environment variables for running Nix.
-        ${concatMapStrings (n: "export ${n}=\"${getAttr n cfg.envVars}\"\n") (attrNames cfg.envVars)}
+    # Set up the environment variables for running Nix.
+    environment.variables = mapAttrs (n: v: { value = v; }) cfg.envVars;
 
+    environment.extraInit =
+      ''
         # Set up secure multi-user builds: non-root users build through the
         # Nix daemon.
         if test "$USER" != root; then
diff --git a/modules/services/x11/desktop-managers/xfce.nix b/modules/services/x11/desktop-managers/xfce.nix
index e22e6a12130..6197a7e10aa 100644
--- a/modules/services/x11/desktop-managers/xfce.nix
+++ b/modules/services/x11/desktop-managers/xfce.nix
@@ -79,10 +79,7 @@ in
     environment.pathsToLink =
       [ "/share/xfce4" "/share/themes" "/share/mime" "/share/desktop-directories" "/share/gtksourceview-2.0" ];
 
-    environment.shellInit =
-      ''
-        export GIO_EXTRA_MODULES=${pkgs.xfce.gvfs}/lib/gio/modules
-      '';
+    environment.variables.GIO_EXTRA_MODULES.value = "${pkgs.xfce.gvfs}/lib/gio/modules";
 
     # Enable helpful DBus services.
     services.udisks2.enable = true;
diff --git a/modules/services/x11/xserver.nix b/modules/services/x11/xserver.nix
index 40da6a74389..2c76361ea4b 100644
--- a/modules/services/x11/xserver.nix
+++ b/modules/services/x11/xserver.nix
@@ -409,6 +409,9 @@ in
     boot.blacklistedKernelModules =
       optionals (elem "nvidia" driverNames) [ "nouveau" "nvidiafb" ];
 
+    environment.variables.LD_LIBRARY_PATH.list =
+      [ "/run/opengl-driver/lib" "/run/opengl-driver-32/lib" ];
+
     environment.etc =
       (optionals cfg.exportConfiguration
         [ { source = "${configFile}";
diff --git a/modules/system/boot/modprobe.nix b/modules/system/boot/modprobe.nix
index 62ac3009d10..c1c65bed64f 100644
--- a/modules/system/boot/modprobe.nix
+++ b/modules/system/boot/modprobe.nix
@@ -105,10 +105,7 @@ with pkgs.lib;
         echo ${config.system.sbin.modprobe}/sbin/modprobe > /proc/sys/kernel/modprobe
       '';
 
-    environment.shellInit =
-      ''
-        export MODULE_DIR=/run/current-system/kernel-modules/lib/modules
-      '';
+    environment.variables.MODULE_DIR.value = "/run/current-system/kernel-modules/lib/modules";
 
   };
 
-- 
GitLab


From ffa4b28dcec622c98c1491a09c9b254dc13b0741 Mon Sep 17 00:00:00 2001
From: Jan Malakhovski <oxij@oxij.org>
Date: Wed, 18 Sep 2013 03:35:58 +0000
Subject: [PATCH 4916/5331] Add support for Zsh as an alternative (or not)
 default (or not) interactive shell.

---
 modules/module-list.nix       |   1 +
 modules/programs/zsh/zinputrc |  42 ++++++++
 modules/programs/zsh/zsh.nix  | 180 ++++++++++++++++++++++++++++++++++
 3 files changed, 223 insertions(+)
 create mode 100644 modules/programs/zsh/zinputrc
 create mode 100644 modules/programs/zsh/zsh.nix

diff --git a/modules/module-list.nix b/modules/module-list.nix
index 3a7ede02396..9f1563c0768 100644
--- a/modules/module-list.nix
+++ b/modules/module-list.nix
@@ -53,6 +53,7 @@
   ./programs/ssmtp.nix
   ./programs/venus.nix
   ./programs/wvdial.nix
+  ./programs/zsh/zsh.nix
   ./rename.nix
   ./security/apparmor.nix
   ./security/apparmor-suid.nix
diff --git a/modules/programs/zsh/zinputrc b/modules/programs/zsh/zinputrc
new file mode 100644
index 00000000000..6121f3e21f1
--- /dev/null
+++ b/modules/programs/zsh/zinputrc
@@ -0,0 +1,42 @@
+# Stolen from ArchWiki
+
+# create a zkbd compatible hash;
+# to add other keys to this hash, see: man 5 terminfo
+typeset -A key
+
+key[Home]=${terminfo[khome]}
+
+key[End]=${terminfo[kend]}
+key[Insert]=${terminfo[kich1]}
+key[Delete]=${terminfo[kdch1]}
+key[Up]=${terminfo[kcuu1]}
+key[Down]=${terminfo[kcud1]}
+key[Left]=${terminfo[kcub1]}
+key[Right]=${terminfo[kcuf1]}
+key[PageUp]=${terminfo[kpp]}
+key[PageDown]=${terminfo[knp]}
+
+# setup key accordingly
+[[ -n "${key[Home]}"     ]]  && bindkey  "${key[Home]}"     beginning-of-line
+[[ -n "${key[End]}"      ]]  && bindkey  "${key[End]}"      end-of-line
+[[ -n "${key[Insert]}"   ]]  && bindkey  "${key[Insert]}"   overwrite-mode
+[[ -n "${key[Delete]}"   ]]  && bindkey  "${key[Delete]}"   delete-char
+[[ -n "${key[Up]}"       ]]  && bindkey  "${key[Up]}"       up-line-or-history
+[[ -n "${key[Down]}"     ]]  && bindkey  "${key[Down]}"     down-line-or-history
+[[ -n "${key[Left]}"     ]]  && bindkey  "${key[Left]}"     backward-char
+[[ -n "${key[Right]}"    ]]  && bindkey  "${key[Right]}"    forward-char
+[[ -n "${key[PageUp]}"   ]]  && bindkey  "${key[PageUp]}"   beginning-of-buffer-or-history
+[[ -n "${key[PageDown]}" ]]  && bindkey  "${key[PageDown]}" end-of-buffer-or-history
+
+# Finally, make sure the terminal is in application mode, when zle is
+# active. Only then are the values from $terminfo valid.
+if (( ${+terminfo[smkx]} )) && (( ${+terminfo[rmkx]} )); then
+    function zle-line-init () {
+        printf '%s' "${terminfo[smkx]}"
+    }
+    function zle-line-finish () {
+        printf '%s' "${terminfo[rmkx]}"
+    }
+    zle -N zle-line-init
+    zle -N zle-line-finish
+fi
diff --git a/modules/programs/zsh/zsh.nix b/modules/programs/zsh/zsh.nix
new file mode 100644
index 00000000000..97e7a49e576
--- /dev/null
+++ b/modules/programs/zsh/zsh.nix
@@ -0,0 +1,180 @@
+# This module defines global configuration for the zshell.
+
+{ config, pkgs, ... }:
+
+with pkgs.lib;
+
+let
+
+  cfge = config.environment;
+
+  cfg = config.programs.zsh;
+
+  zshAliases = concatStringsSep "\n" (
+    mapAttrsFlatten (k: v: "alias ${k}='${v}'") cfg.shellAliases
+  );
+
+in
+
+{
+
+  options = {
+
+    programs.zsh = {
+
+      enable = mkOption {
+        default = false;
+        description = ''
+          Whenever to configure Zsh as an interactive shell.
+          Note that this tries to make Zsh the default
+          <option>users.defaultUserShell</option>,
+          which in turn means that you might need to explicitly
+          set this variable if you have another shell configured
+          with NixOS.
+        '';
+        type = types.bool;
+      };
+
+      shellAliases = mkOption {
+        default = config.environment.shellAliases;
+        description = ''
+          Set of aliases for zsh shell. See <option>environment.shellAliases</option>
+          for an option format description.
+        '';
+        type = types.attrs; # types.attrsOf types.stringOrPath;
+      };
+
+      shellInit = mkOption {
+        default = "";
+        description = ''
+          Shell script code called during zsh shell initialisation.
+        '';
+        type = types.lines;
+      };
+
+      loginShellInit = mkOption {
+        default = "";
+        description = ''
+          Shell script code called during zsh login shell initialisation.
+        '';
+        type = types.lines;
+      };
+
+      interactiveShellInit = mkOption {
+        default = "";
+        description = ''
+          Shell script code called during interactive zsh shell initialisation.
+        '';
+        type = types.lines;
+      };
+
+      promptInit = mkOption {
+        default = ''
+          autoload -U promptinit && promptinit && prompt walters
+        '';
+        description = ''
+          Shell script code used to initialise the zsh prompt.
+        '';
+        type = types.lines;
+      };
+
+    };
+
+  };
+
+  config = mkIf cfg.enable {
+
+    programs.zsh = {
+
+      shellInit = ''
+        . /etc/environment
+
+        ${cfge.shellInit}
+      '';
+
+      loginShellInit = cfge.loginShellInit;
+
+      interactiveShellInit = ''
+        ${cfge.interactiveShellInit}
+
+        ${cfg.promptInit}
+        ${zshAliases}
+
+        # Some sane history defaults
+        export SAVEHIST=2000
+        export HISTSIZE=2000
+        export HISTFILE=$HOME/.zsh_history
+
+        setopt HIST_IGNORE_DUPS SHARE_HISTORY
+      '';
+
+    };
+
+    environment.etc."zshenv".text =
+      ''
+        # /etc/zshenv: DO NOT EDIT -- this file has been generated automatically.
+        # This file is read for all shells.
+
+        # Only execute this file once per shell.
+        if [ -n "$__ETC_ZSHENV_SOURCED" ]; then return; fi
+        __ETC_ZSHENV_SOURCED=1
+
+        ${cfg.shellInit}
+
+        # Read system-wide modifications.
+        if test -f /etc/zshenv.local; then
+          . /etc/zshenv.local
+        fi
+      '';
+
+    environment.etc."zprofile".text =
+      ''
+        # /etc/zprofile: DO NOT EDIT -- this file has been generated automatically.
+        # This file is read for login shells.
+
+        # Only execute this file once per shell.
+        if [ -n "$__ETC_ZPROFILE_SOURCED" ]; then return; fi
+        __ETC_ZPROFILE_SOURCED=1
+
+        ${cfg.loginShellInit}
+
+        # Read system-wide modifications.
+        if test -f /etc/zprofile.local; then
+          . /etc/zprofile.local
+        fi
+      '';
+
+    environment.etc."zshrc".text =
+      ''
+        # /etc/zshrc: DO NOT EDIT -- this file has been generated automatically.
+        # This file is read for interactive shells.
+
+        # Only execute this file once per shell.
+        if [ -n "$__ETC_ZSHRC_SOURCED" -o -n "$NOSYSZSHRC" ]; then return; fi
+        __ETC_ZSHRC_SOURCED=1
+
+        . /etc/zinputrc
+
+        ${cfg.interactiveShellInit}
+
+        # Read system-wide modifications.
+        if test -f /etc/zshrc.local; then
+          . /etc/zshrc.local
+        fi
+      '';
+
+    environment.etc."zinputrc".source = ./zinputrc;
+
+    environment.systemPackages = [ pkgs.zsh ];
+
+    users.defaultUserShell = mkDefault "/run/current-system/sw/bin/zsh";
+
+    environment.shells =
+      [ "/run/current-system/sw/bin/zsh"
+        "/var/run/current-system/sw/bin/zsh"
+        "${pkgs.zsh}/bin/zsh"
+      ];
+
+  };
+
+}
-- 
GitLab


From 9df40867b98ff21af499cb423fd758e351188e6b Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 23 Sep 2013 23:03:21 +0200
Subject: [PATCH 4917/5331] In environment.variables, unify "value" and "list"

---
 modules/config/fonts/fontconfig.nix           |  2 +-
 modules/config/i18n.nix                       |  2 +-
 modules/config/shells-environment.nix         | 48 ++++---------------
 modules/config/timezone.nix                   |  4 +-
 modules/profiles/installation-device.nix      |  2 +-
 modules/programs/environment.nix              | 12 ++---
 modules/security/ca.nix                       |  6 +--
 modules/services/misc/nix-daemon.nix          |  2 +-
 .../services/x11/desktop-managers/xfce.nix    |  2 +-
 modules/services/x11/xserver.nix              |  2 +-
 modules/system/boot/modprobe.nix              |  2 +-
 11 files changed, 28 insertions(+), 56 deletions(-)

diff --git a/modules/config/fonts/fontconfig.nix b/modules/config/fonts/fontconfig.nix
index 88643b41d83..6e0fdaf4b74 100644
--- a/modules/config/fonts/fontconfig.nix
+++ b/modules/config/fonts/fontconfig.nix
@@ -49,7 +49,7 @@ with pkgs.lib;
     # FIXME: This variable is no longer needed, but we'll keep it
     # around for a while for applications linked against old
     # fontconfig builds.
-    environment.variables.FONTCONFIG_FILE.value = "/etc/fonts/fonts.conf";
+    environment.variables.FONTCONFIG_FILE = "/etc/fonts/fonts.conf";
 
     environment.systemPackages = [ pkgs.fontconfig ];
 
diff --git a/modules/config/i18n.nix b/modules/config/i18n.nix
index 15df0b3a12a..c3e39717258 100644
--- a/modules/config/i18n.nix
+++ b/modules/config/i18n.nix
@@ -69,7 +69,7 @@ in
 
     environment.systemPackages = [ glibcLocales ];
 
-    environment.variables.LANG.value = config.i18n.defaultLocale;
+    environment.variables.LANG = config.i18n.defaultLocale;
 
     # ‘/etc/locale.conf’ is used by systemd.
     environment.etc = singleton
diff --git a/modules/config/shells-environment.nix b/modules/config/shells-environment.nix
index 116c5f11e1f..4ee80b39fa3 100644
--- a/modules/config/shells-environment.nix
+++ b/modules/config/shells-environment.nix
@@ -9,40 +9,6 @@ let
 
   cfg = config.environment;
 
-  environOpts = { name, config, ... }: {
-
-    options = {
-
-      value = mkOption {
-        example = "/foo/bin";
-        description =
-          ''
-            Variable value.
-            Exactly one of this or <option>list</option> must be set.
-          '';
-        type = types.uniq types.string;
-      };
-
-      list = mkOption {
-        default = null;
-        example = [ "/foo/bin" "/bar/bin" ];
-        description =
-          ''
-            Variable value.
-            Exactly one of this or <option>value</option> must be set.
-          '';
-        type = types.nullOr (types.listOf types.string);
-      };
-
-    };
-
-    config = {
-      value = mkIf (config.list != null)
-        (concatStringsSep ":" config.list);
-    };
-
-  };
-
 in
 
 {
@@ -53,9 +19,15 @@ in
       default = {};
       description = ''
         A set of environment variables used in the global environment.
+        The value of each variable can be either a string or a list of
+        strings.  The latter is concatenated, interspersed with colon
+        characters.
       '';
-      type = types.attrsOf types.optionSet;
-      options = [ environOpts ];
+      type = types.attrsOf (mkOptionType {
+        name = "a string or a list of strings";
+        check = x: builtins.isString x || isList x;
+      });
+      apply = mapAttrs (n: v: if isList v then concatStringsSep ":" v else v);
     };
 
     environment.profiles = mkOption {
@@ -140,7 +112,7 @@ in
     environment.binsh = mkOption {
       default = "${config.system.build.binsh}/bin/sh";
       example = "\${pkgs.dash}/bin/dash";
-      type = with pkgs.lib.types; path;
+      type = types.path;
       description = ''
         The shell executable that is linked system-wide to
         <literal>/bin/sh</literal>. Please note that NixOS assumes all
@@ -177,7 +149,7 @@ in
          ${concatStringsSep "\n" (
            (mapAttrsToList (n: v: ''export ${n}="${concatStringsSep ":" v}"'')
              # This line is a kind of a hack because of !!! note above
-             (fold (mergeAttrsWithFunc concat) {} ([ (mapAttrs (n: v: [ v.value ]) cfg.variables) ] ++ map cfg.profileVariables cfg.profiles))))}
+             (fold (mergeAttrsWithFunc concat) {} ([ (mapAttrs (n: v: [ v ]) cfg.variables) ] ++ map cfg.profileVariables cfg.profiles))))}
 
          ${cfg.extraInit}
 
diff --git a/modules/config/timezone.nix b/modules/config/timezone.nix
index 68b785601fa..e185584846a 100644
--- a/modules/config/timezone.nix
+++ b/modules/config/timezone.nix
@@ -24,8 +24,8 @@ with pkgs.lib;
 
   config = {
 
-    environment.variables.TZDIR.value = "/etc/zoneinfo";
-    environment.variables.TZ.value = config.time.timeZone;
+    environment.variables.TZDIR = "/etc/zoneinfo";
+    environment.variables.TZ = config.time.timeZone;
 
     environment.etc.localtime.source = "${pkgs.tzdata}/share/zoneinfo/${config.time.timeZone}";
 
diff --git a/modules/profiles/installation-device.nix b/modules/profiles/installation-device.nix
index cfb2eb3f9cb..3b058c6e971 100644
--- a/modules/profiles/installation-device.nix
+++ b/modules/profiles/installation-device.nix
@@ -50,7 +50,7 @@ with pkgs.lib;
     # Tell the Nix evaluator to garbage collect more aggressively.
     # This is desirable in memory-constrained environments that don't
     # (yet) have swap set up.
-    environment.variables.GC_INITIAL_HEAP_SIZE.value = "100000";
+    environment.variables.GC_INITIAL_HEAP_SIZE = "100000";
 
   };
 }
diff --git a/modules/programs/environment.nix b/modules/programs/environment.nix
index 8f2df7e4a53..f42df351422 100644
--- a/modules/programs/environment.nix
+++ b/modules/programs/environment.nix
@@ -17,18 +17,18 @@ in
   config = {
 
     environment.variables =
-      { LOCALE_ARCHIVE.value = "/run/current-system/sw/lib/locale/locale-archive";
-        LOCATE_PATH.value = "/var/cache/locatedb";
-        NIXPKGS_CONFIG.value = "/etc/nix/nixpkgs-config.nix";
-        NIX_PATH.list =
+      { LOCALE_ARCHIVE = "/run/current-system/sw/lib/locale/locale-archive";
+        LOCATE_PATH = "/var/cache/locatedb";
+        NIXPKGS_CONFIG = "/etc/nix/nixpkgs-config.nix";
+        NIX_PATH =
           [ "/nix/var/nix/profiles/per-user/root/channels/nixos"
             "nixpkgs=/etc/nixos/nixpkgs"
             "nixos=/etc/nixos/nixos"
             "nixos-config=/etc/nixos/configuration.nix"
             "services=/etc/nixos/services"
           ];
-        PAGER.value = "less -R";
-        EDITOR.value = "nano";
+        PAGER = "less -R";
+        EDITOR = "nano";
       };
 
     environment.profiles =
diff --git a/modules/security/ca.nix b/modules/security/ca.nix
index f0897630eac..2e93fb36b45 100644
--- a/modules/security/ca.nix
+++ b/modules/security/ca.nix
@@ -17,9 +17,9 @@ with pkgs.lib;
         }
       ];
 
-    environment.variables.OPENSSL_X509_CERT_FILE.value = "/etc/ssl/certs/ca-bundle.crt";
-    environment.variables.CURL_CA_BUNDLE.value = "/etc/ssl/certs/ca-bundle.crt";
-    environment.variables.GIT_SSL_CAINFO.value = "/etc/ssl/certs/ca-bundle.crt";
+    environment.variables.OPENSSL_X509_CERT_FILE = "/etc/ssl/certs/ca-bundle.crt";
+    environment.variables.CURL_CA_BUNDLE = "/etc/ssl/certs/ca-bundle.crt";
+    environment.variables.GIT_SSL_CAINFO = "/etc/ssl/certs/ca-bundle.crt";
 
   };
 
diff --git a/modules/services/misc/nix-daemon.nix b/modules/services/misc/nix-daemon.nix
index 9dd58fbab20..adf4f145f25 100644
--- a/modules/services/misc/nix-daemon.nix
+++ b/modules/services/misc/nix-daemon.nix
@@ -328,7 +328,7 @@ in
       };
 
     # Set up the environment variables for running Nix.
-    environment.variables = mapAttrs (n: v: { value = v; }) cfg.envVars;
+    environment.variables = cfg.envVars;
 
     environment.extraInit =
       ''
diff --git a/modules/services/x11/desktop-managers/xfce.nix b/modules/services/x11/desktop-managers/xfce.nix
index 6197a7e10aa..f5d544ad046 100644
--- a/modules/services/x11/desktop-managers/xfce.nix
+++ b/modules/services/x11/desktop-managers/xfce.nix
@@ -79,7 +79,7 @@ in
     environment.pathsToLink =
       [ "/share/xfce4" "/share/themes" "/share/mime" "/share/desktop-directories" "/share/gtksourceview-2.0" ];
 
-    environment.variables.GIO_EXTRA_MODULES.value = "${pkgs.xfce.gvfs}/lib/gio/modules";
+    environment.variables.GIO_EXTRA_MODULES = "${pkgs.xfce.gvfs}/lib/gio/modules";
 
     # Enable helpful DBus services.
     services.udisks2.enable = true;
diff --git a/modules/services/x11/xserver.nix b/modules/services/x11/xserver.nix
index 2c76361ea4b..5a9a2e8df4d 100644
--- a/modules/services/x11/xserver.nix
+++ b/modules/services/x11/xserver.nix
@@ -409,7 +409,7 @@ in
     boot.blacklistedKernelModules =
       optionals (elem "nvidia" driverNames) [ "nouveau" "nvidiafb" ];
 
-    environment.variables.LD_LIBRARY_PATH.list =
+    environment.variables.LD_LIBRARY_PATH =
       [ "/run/opengl-driver/lib" "/run/opengl-driver-32/lib" ];
 
     environment.etc =
diff --git a/modules/system/boot/modprobe.nix b/modules/system/boot/modprobe.nix
index c1c65bed64f..8b2762e2526 100644
--- a/modules/system/boot/modprobe.nix
+++ b/modules/system/boot/modprobe.nix
@@ -105,7 +105,7 @@ with pkgs.lib;
         echo ${config.system.sbin.modprobe}/sbin/modprobe > /proc/sys/kernel/modprobe
       '';
 
-    environment.variables.MODULE_DIR.value = "/run/current-system/kernel-modules/lib/modules";
+    environment.variables.MODULE_DIR = "/run/current-system/kernel-modules/lib/modules";
 
   };
 
-- 
GitLab


From 3a17c2b30b72f48ed8ccc294ad94e6233d77402b Mon Sep 17 00:00:00 2001
From: Rickard Nilsson <rickynils@gmail.com>
Date: Mon, 23 Sep 2013 22:56:05 +0200
Subject: [PATCH 4918/5331] Add option systemd.automounts, for definining
 automount units

---
 modules/system/boot/systemd-unit-options.nix | 24 +++++++++++++
 modules/system/boot/systemd.nix              | 36 +++++++++++++++++++-
 2 files changed, 59 insertions(+), 1 deletion(-)

diff --git a/modules/system/boot/systemd-unit-options.nix b/modules/system/boot/systemd-unit-options.nix
index be3fbd55674..e6e8d9eb3b0 100644
--- a/modules/system/boot/systemd-unit-options.nix
+++ b/modules/system/boot/systemd-unit-options.nix
@@ -323,4 +323,28 @@ rec {
     };
   };
 
+  automountOptions = unitOptions // {
+
+    where = mkOption {
+      example = "/mnt";
+      type = types.uniq types.string;
+      description = ''
+        Absolute path of a directory of the mount point.
+        Will be created if it doesn't exist. (Mandatory)
+      '';
+    };
+
+    automountConfig = mkOption {
+      default = {};
+      example = { DirectoryMode = "0775"; };
+      type = types.attrs;
+      description = ''
+        Each attribute in this set specifies an option in the
+        <literal>[Automount]</literal> section of the unit.  See
+        <citerefentry><refentrytitle>systemd.automount</refentrytitle>
+        <manvolnum>5</manvolnum></citerefentry> for details.
+      '';
+    };
+  };
+
 }
diff --git a/modules/system/boot/systemd.nix b/modules/system/boot/systemd.nix
index 21b3e5e80a0..35ae6a84024 100644
--- a/modules/system/boot/systemd.nix
+++ b/modules/system/boot/systemd.nix
@@ -185,6 +185,14 @@ let
     };
   };
 
+  automountConfig = { name, config, ... }: {
+    config = {
+      automountConfig =
+        { Where = config.where;
+        };
+    };
+  };
+
   toOption = x:
     if x == true then "true"
     else if x == false then "false"
@@ -291,6 +299,18 @@ let
         '';
     };
 
+  automountToUnit = name: def:
+    { inherit (def) wantedBy requiredBy enable;
+      text =
+        ''
+          [Unit]
+          ${attrsToSection def.unitConfig}
+
+          [Automount]
+          ${attrsToSection def.automountConfig}
+        '';
+    };
+
   nixosUnits = mapAttrsToList makeUnit cfg.units;
 
   units = pkgs.runCommand "units" { preferLocalBuild = true; }
@@ -440,6 +460,17 @@ in
       '';
     };
 
+    systemd.automounts = mkOption {
+      default = [];
+      type = types.listOf types.optionSet;
+      options = [ automountOptions unitConfig automountConfig ];
+      description = ''
+        Definition of systemd automount units.
+        This is a list instead of an attrSet, because systemd mandates the names to be derived from
+        the 'where' attribute.
+      '';
+    };
+
     systemd.defaultUnit = mkOption {
       default = "multi-user.target";
       type = types.uniq types.string;
@@ -579,7 +610,10 @@ in
       // mapAttrs' (n: v: nameValuePair "${n}.timer" (timerToUnit n v)) cfg.timers
       // listToAttrs (map
                    (v: let n = escapeSystemdPath v.where;
-                       in nameValuePair "${n}.mount" (mountToUnit n v)) cfg.mounts);
+                       in nameValuePair "${n}.mount" (mountToUnit n v)) cfg.mounts)
+      // listToAttrs (map
+                   (v: let n = escapeSystemdPath v.where;
+                       in nameValuePair "${n}.automount" (automountToUnit n v)) cfg.automounts);
 
     system.requiredKernelConfig = map config.lib.kernelConfig.isEnabled [
       "CGROUPS" "AUTOFS4_FS" "DEVTMPFS"
-- 
GitLab


From b933b15d728b9fcde45ebe40da9bbe22c4e0cf68 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 24 Sep 2013 10:58:01 +0200
Subject: [PATCH 4919/5331] Don't generate /etc/environment

/etc/environment, if it exists, should be a list of NAME=VALUE pairs,
not a shell script.  See the pam_env manpage.
---
 modules/config/shells-environment.nix | 2 +-
 modules/programs/bash/bash.nix        | 2 +-
 modules/programs/zsh/zsh.nix          | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/modules/config/shells-environment.nix b/modules/config/shells-environment.nix
index 4ee80b39fa3..fe72194a1ab 100644
--- a/modules/config/shells-environment.nix
+++ b/modules/config/shells-environment.nix
@@ -144,7 +144,7 @@ in
         /bin/sh
       '';
 
-    environment.etc."environment".text =
+    system.build.setEnvironment = pkgs.writeText "set-environment"
        ''
          ${concatStringsSep "\n" (
            (mapAttrsToList (n: v: ''export ${n}="${concatStringsSep ":" v}"'')
diff --git a/modules/programs/bash/bash.nix b/modules/programs/bash/bash.nix
index 2324164316d..443c6f570c1 100644
--- a/modules/programs/bash/bash.nix
+++ b/modules/programs/bash/bash.nix
@@ -119,7 +119,7 @@ in
     programs.bash = {
 
       shellInit = ''
-        . /etc/environment
+        . ${config.system.build.setEnvironment}
 
         ${cfge.shellInit}
       '';
diff --git a/modules/programs/zsh/zsh.nix b/modules/programs/zsh/zsh.nix
index 97e7a49e576..cff751934d7 100644
--- a/modules/programs/zsh/zsh.nix
+++ b/modules/programs/zsh/zsh.nix
@@ -87,7 +87,7 @@ in
     programs.zsh = {
 
       shellInit = ''
-        . /etc/environment
+        . ${config.system.build.setEnvironment}
 
         ${cfge.shellInit}
       '';
-- 
GitLab


From ec2266b2e24e546c13e5c100c1f777bb50bcec65 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 24 Sep 2013 11:27:25 +0200
Subject: [PATCH 4920/5331] Make environment variables overridable

---
 modules/config/shells-environment.nix | 7 ++++++-
 tests/misc.nix                        | 6 ++++++
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/modules/config/shells-environment.nix b/modules/config/shells-environment.nix
index fe72194a1ab..0bb7c4e26fe 100644
--- a/modules/config/shells-environment.nix
+++ b/modules/config/shells-environment.nix
@@ -25,7 +25,12 @@ in
       '';
       type = types.attrsOf (mkOptionType {
         name = "a string or a list of strings";
-        check = x: builtins.isString x || isList x;
+        merge = xs:
+          let xs' = evalProperties xs; in
+          if isList (head xs') then concatLists xs'
+          else if length xs' > 1 then abort "variable in ‘environment.variables’ has multiple values"
+          else if !builtins.isString (head xs') then abort "variable in ‘environment.variables’ does not have a string value"
+          else head xs';
       });
       apply = mapAttrs (n: v: if isList v then concatStringsSep ":" v else v);
     };
diff --git a/tests/misc.nix b/tests/misc.nix
index 47775ce2a1e..e18a208fe43 100644
--- a/tests/misc.nix
+++ b/tests/misc.nix
@@ -8,6 +8,7 @@
     { config, pkgs, ... }:
     { swapDevices = pkgs.lib.mkOverride 0
         [ { device = "/root/swapfile"; size = 128; } ];
+      environment.variables.EDITOR = pkgs.lib.mkOverride 0 "emacs";
     };
 
   testScript =
@@ -52,6 +53,11 @@
       subtest "reboot-wtmp", sub {
           $machine->succeed("last | grep reboot >&2");
       };
+
+      # Test whether we can override environment variables.
+      subtest "override-env-var", sub {
+          $machine->succeed('[ "$EDITOR" = emacs ]');
+      };
     '';
 
 }
-- 
GitLab


From 9ce148e738b322899ae650b7eb42ee44af3f56dd Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Tue, 24 Sep 2013 09:40:06 -0400
Subject: [PATCH 4921/5331] Don't break compatibility with pre-1.6 nix

Signed-off-by: Shea Levy <shea@shealevy.com>
---
 modules/config/shells-environment.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/config/shells-environment.nix b/modules/config/shells-environment.nix
index 0bb7c4e26fe..f1ce492d816 100644
--- a/modules/config/shells-environment.nix
+++ b/modules/config/shells-environment.nix
@@ -28,7 +28,7 @@ in
         merge = xs:
           let xs' = evalProperties xs; in
           if isList (head xs') then concatLists xs'
-          else if length xs' > 1 then abort "variable in ‘environment.variables’ has multiple values"
+          else if builtins.lessThan 1 (length xs') then abort "variable in ‘environment.variables’ has multiple values"
           else if !builtins.isString (head xs') then abort "variable in ‘environment.variables’ does not have a string value"
           else head xs';
       });
-- 
GitLab


From 9667a1ef758c8a1c3298dfb6fa8ee06f32af3b0d Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Tue, 24 Sep 2013 09:53:47 -0400
Subject: [PATCH 4922/5331] environment.promptInit is now
 programs.<shell>.promptInit

Signed-off-by: Shea Levy <shea@shealevy.com>
---
 modules/rename.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/modules/rename.nix b/modules/rename.nix
index ef86befe9e7..631283ce219 100644
--- a/modules/rename.nix
+++ b/modules/rename.nix
@@ -108,4 +108,8 @@ in zipModules ([]
 ++ rename obsolete "boot.loader.efiBootStub.runEfibootmgr" "boot.loader.efi.canTouchEfiVariables"
 ++ rename obsolete "boot.loader.efi.efibootmgr.enable" "boot.loader.efi.canTouchEfiVariables"
 
+# NixOS environment changes
+# !!! this hardcodes bash, could we detect from config which shell is actually used?
+++ rename obsolete "environment.promptInit" "programs.bash.promptInit"
+
 ) # do not add renaming after this.
-- 
GitLab


From 78721f57eb96a5fb60e122de67bc72c3c9c528e9 Mon Sep 17 00:00:00 2001
From: Rickard Nilsson <rickynils@gmail.com>
Date: Tue, 24 Sep 2013 20:28:52 +0200
Subject: [PATCH 4923/5331] nvidia-x11: Put nvidia.icd in /etc/OpenCL/vendors

This makes OpenCL work with Nvidia cards (tested with darktable).
---
 modules/services/x11/xserver.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/modules/services/x11/xserver.nix b/modules/services/x11/xserver.nix
index 5a9a2e8df4d..d42d7caaa06 100644
--- a/modules/services/x11/xserver.nix
+++ b/modules/services/x11/xserver.nix
@@ -429,6 +429,12 @@ in
           { source = "${kernelPackages.ati_drivers_x11}/etc/ati";
             target = "ati";
           }
+      ])
+      ++ (optionals (elem "nvidia" driverNames) [
+
+          { source = "${kernelPackages.nvidia_x11}/lib/vendors/nvidia.icd";
+            target = "OpenCL/vendors/nvidia.icd";
+          }
       ]);
 
     environment.x11Packages =
-- 
GitLab


From cd902179db236e3d0ad8326cc08b68f786fc7ab2 Mon Sep 17 00:00:00 2001
From: Jonas Hoersch <coroa@online.de>
Date: Wed, 25 Sep 2013 00:10:59 +0200
Subject: [PATCH 4924/5331] autorandr: add autorandr an automatic display
 configuration selector

---
 pkgs/tools/misc/autorandr/default.nix | 34 +++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix       |  5 ++++
 2 files changed, 39 insertions(+)
 create mode 100644 pkgs/tools/misc/autorandr/default.nix

diff --git a/pkgs/tools/misc/autorandr/default.nix b/pkgs/tools/misc/autorandr/default.nix
new file mode 100644
index 00000000000..5146be248da
--- /dev/null
+++ b/pkgs/tools/misc/autorandr/default.nix
@@ -0,0 +1,34 @@
+{ fetchgit, stdenv, disper ? null, xrandr, xdpyinfo }:
+
+let
+  rev = "4f5e2401ef";
+in
+  stdenv.mkDerivation {
+    name = "autorandr-${rev}";
+
+    src = fetchgit {
+      inherit rev;
+      url = "https://github.com/wertarbyte/autorandr.git";
+    };
+
+    patchPhase = ''
+      substituteInPlace "autorandr" \
+        --replace "/usr/bin/xrandr" "${xrandr}/bin/xrandr" \
+        --replace "/usr/bin/xdpyinfo" "${xdpyinfo}/bin/xdpyinfo"
+    '' + stdenv.lib.optionalString (disper != null) ''
+      substituteInPlace "autorandr"
+        --replace "/usr/bin/disper" "${disper}/bin/disper"
+    '';
+
+    installPhase = ''
+      mkdir -p "$out/etc/bash_completion.d"
+      cp -v bash_completion/autorandr "$out/etc/bash_completion.d"
+      mkdir -p "$out/bin"
+      cp -v autorandr auto-disper $out/bin
+    '';
+
+    meta = {
+      description = "Autorandr, automatic display configuration selector based on connected devices";
+      homepage = https://github.com/wertarbyte/autorandr;
+    };
+  }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d162c0b7cea..4c9b8458179 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -495,6 +495,11 @@ let
 
   autojump = callPackage ../tools/misc/autojump { };
 
+  autorandr = callPackage ../tools/misc/autorandr {
+    inherit (xorg) xrandr xdpyinfo;
+    disper = null;
+  };
+
   avahi = callPackage ../development/libraries/avahi {
     qt4Support = config.avahi.qt4Support or false;
   };
-- 
GitLab


From cfd20debfb0bdd21d9695278350ca8ed4b2d76d0 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 25 Sep 2013 00:25:22 +0200
Subject: [PATCH 4925/5331] Fix bashrc regression

Interactive non-login shells should not source /etc/profile, otherwise
environment variables set by the user will get clobbered.  For
example:

  $ export PERL5LIB=/foo
  $ bash
  $ echo $PERL5LIB
  /home/eelco/.nix-profile/lib/perl5/site_perl:/nix/var/nix/profiles/default/lib/perl5/site_perl:/run/current-system/sw/lib/perl5/site_perl:/home/eelco/.nix-profile/lib/perl5/site_perl:/nix/var/nix/profiles/default/lib/perl5/site_perl:/run/current-system/sw/lib/perl5/site_perl
---
 modules/programs/bash/bash.nix | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/modules/programs/bash/bash.nix b/modules/programs/bash/bash.nix
index 443c6f570c1..c9332c0d9e9 100644
--- a/modules/programs/bash/bash.nix
+++ b/modules/programs/bash/bash.nix
@@ -151,11 +151,10 @@ in
         if [ -n "$__ETC_PROFILE_SOURCED" ]; then return; fi
         __ETC_PROFILE_SOURCED=1
 
-        if [ -z "$__BASH_SHELL_INIT_DONE" ]; then
-          __BASH_SHELL_INIT_DONE=1
-          ${cfg.shellInit}
-        fi
+        # Prevent this file from being sourced by interactive non-login child shells.
+        export __ETC_PROFILE_DONE=1
 
+        ${cfg.shellInit}
         ${cfg.loginShellInit}
 
         # Read system-wide modifications.
@@ -176,9 +175,11 @@ in
         if [ -n "$__ETC_BASHRC_SOURCED" -o -n "$NOSYSBASHRC" ]; then return; fi
         __ETC_BASHRC_SOURCED=1
 
-        if [ -z "$__BASH_SHELL_INIT_DONE" ]; then
-          __BASH_SHELL_INIT_DONE=1
-          ${cfg.shellInit}
+        # If the profile was not loaded in a parent process, source
+        # it.  But otherwise don't do it because we don't want to
+        # clobber overridden values of $PATH, etc.
+        if [ -z "$__ETC_PROFILE_DONE" ]; then
+            . /etc/profile
         fi
 
         # We are not always an interactive shell.
-- 
GitLab


From f70fbb179128e795fcc6d07c52454c1dbcaa196a Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 25 Sep 2013 00:48:28 +0200
Subject: [PATCH 4926/5331] Fix duplicated environment values

All profileVariables listed each profile twice (e.g. $PATH contained
$HOME/.nix-profile/bin twice).  This is because mergeAttrsWithFunc is
broken (and deprecated):

  nix-repl> :p mergeAttrsWithFunc concat { x = [1]; } { y = [2]; }
  { x = [ 1 ]; y = [ 2 2 ]; }

So use zipAttrsWith instead.
---
 modules/config/shells-environment.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/config/shells-environment.nix b/modules/config/shells-environment.nix
index f1ce492d816..4f7447f435b 100644
--- a/modules/config/shells-environment.nix
+++ b/modules/config/shells-environment.nix
@@ -154,7 +154,7 @@ in
          ${concatStringsSep "\n" (
            (mapAttrsToList (n: v: ''export ${n}="${concatStringsSep ":" v}"'')
              # This line is a kind of a hack because of !!! note above
-             (fold (mergeAttrsWithFunc concat) {} ([ (mapAttrs (n: v: [ v ]) cfg.variables) ] ++ map cfg.profileVariables cfg.profiles))))}
+             (zipAttrsWith (const concatLists) ([ (mapAttrs (n: v: [ v ]) cfg.variables) ] ++ map cfg.profileVariables cfg.profiles))))}
 
          ${cfg.extraInit}
 
-- 
GitLab


From 683310e05e7eb9351b24e9a824f1fb3bf5ae0c3a Mon Sep 17 00:00:00 2001
From: Jonas Hoersch <coroa@online.de>
Date: Thu, 26 Sep 2013 13:12:01 +0200
Subject: [PATCH 4927/5331] autorandr: make the dependencies on xrandr and
 disper configurable by enableX params

---
 pkgs/tools/misc/autorandr/default.nix | 15 ++++++++++-----
 pkgs/top-level/all-packages.nix       |  1 -
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/pkgs/tools/misc/autorandr/default.nix b/pkgs/tools/misc/autorandr/default.nix
index 5146be248da..d9a727e8a09 100644
--- a/pkgs/tools/misc/autorandr/default.nix
+++ b/pkgs/tools/misc/autorandr/default.nix
@@ -1,4 +1,11 @@
-{ fetchgit, stdenv, disper ? null, xrandr, xdpyinfo }:
+{ fetchgit
+, stdenv
+, enableXRandr ? true, xrandr ? null
+, enableDisper ? false, disper ? null
+, xdpyinfo }:
+
+assert enableXRandr -> xrandr != null;
+assert enableDisper -> disper != null;
 
 let
   rev = "4f5e2401ef";
@@ -13,11 +20,9 @@ in
 
     patchPhase = ''
       substituteInPlace "autorandr" \
-        --replace "/usr/bin/xrandr" "${xrandr}/bin/xrandr" \
+        --replace "/usr/bin/xrandr" "${if enableXRandr then xrandr else "/nowhere"}/bin/xrandr" \
+        --replace "/usr/bin/disper" "${if enableDisper then disper else "/nowhere"}/bin/disper" \
         --replace "/usr/bin/xdpyinfo" "${xdpyinfo}/bin/xdpyinfo"
-    '' + stdenv.lib.optionalString (disper != null) ''
-      substituteInPlace "autorandr"
-        --replace "/usr/bin/disper" "${disper}/bin/disper"
     '';
 
     installPhase = ''
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 4c9b8458179..b045f212403 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -497,7 +497,6 @@ let
 
   autorandr = callPackage ../tools/misc/autorandr {
     inherit (xorg) xrandr xdpyinfo;
-    disper = null;
   };
 
   avahi = callPackage ../development/libraries/avahi {
-- 
GitLab


From 12dda685eec2a64ddf624e58e398ba997076cfdf Mon Sep 17 00:00:00 2001
From: Jaka Hudoklin <jakahudoklin@gmail.com>
Date: Thu, 26 Sep 2013 16:38:12 +0200
Subject: [PATCH 4928/5331] stage-2-init: create /var/lib and /var/db at boot,
 so some modules that create user home folders here don't fail

---
 modules/system/boot/stage-2-init.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/system/boot/stage-2-init.sh b/modules/system/boot/stage-2-init.sh
index 78d4ea80049..2fadd3de1f0 100644
--- a/modules/system/boot/stage-2-init.sh
+++ b/modules/system/boot/stage-2-init.sh
@@ -86,7 +86,7 @@ mount -t tmpfs -o "rw,nosuid,nodev,size=@devShmSize@" tmpfs /dev/shm
 mkdir -m 0755 -p /dev/pts
 [ -e /proc/bus/usb ] && mount -t usbfs none /proc/bus/usb # UML doesn't have USB by default
 mkdir -m 01777 -p /tmp
-mkdir -m 0755 -p /var /var/log
+mkdir -m 0755 -p /var /var/log /var/lib /var/db
 mkdir -m 0755 -p /nix/var
 mkdir -m 0700 -p /root
 mkdir -m 0755 -p /bin # for the /bin/sh symlink
-- 
GitLab


From b7b2476499fac4ccc63057adfa484df6184ea18d Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 26 Sep 2013 17:04:07 +0200
Subject: [PATCH 4929/5331] Remove the portmap module

It's obsoleted by rpcbind.
---
 modules/misc/ids.nix                    |  2 -
 modules/module-list.nix                 |  1 -
 modules/services/networking/portmap.nix | 99 -------------------------
 modules/services/networking/rpcbind.nix |  7 +-
 tests/default.nix                       |  1 -
 tests/portmap.nix                       | 17 -----
 6 files changed, 2 insertions(+), 125 deletions(-)
 delete mode 100644 modules/services/networking/portmap.nix
 delete mode 100644 tests/portmap.nix

diff --git a/modules/misc/ids.nix b/modules/misc/ids.nix
index 315d3e9cd23..d8ca11158dc 100644
--- a/modules/misc/ids.nix
+++ b/modules/misc/ids.nix
@@ -35,7 +35,6 @@
       ftp = 8;
       bitlbee = 9;
       avahi = 10;
-      portmap = 11;
       atd = 12;
       zabbix = 13;
       postfix = 14;
@@ -120,7 +119,6 @@
       ftp = 8;
       bitlbee = 9;
       avahi = 10;
-      portmap = 11;
       atd = 12;
       postfix = 13;
       postdrop = 14;
diff --git a/modules/module-list.nix b/modules/module-list.nix
index 9f1563c0768..a27febb7bc1 100644
--- a/modules/module-list.nix
+++ b/modules/module-list.nix
@@ -168,7 +168,6 @@
   ./services/networking/oidentd.nix
   ./services/networking/openfire.nix
   ./services/networking/openvpn.nix
-  ./services/networking/portmap.nix
   ./services/networking/prayer.nix
   ./services/networking/privoxy.nix
   ./services/networking/quassel.nix
diff --git a/modules/services/networking/portmap.nix b/modules/services/networking/portmap.nix
deleted file mode 100644
index 474491a4c4b..00000000000
--- a/modules/services/networking/portmap.nix
+++ /dev/null
@@ -1,99 +0,0 @@
-{ config, pkgs, ... }:
-
-with pkgs.lib;
-
-let
-
-  uid = config.ids.uids.portmap;
-  gid = config.ids.gids.portmap;
-
-  portmap = pkgs.portmap.override { daemonUID = uid; daemonGID = gid; };
-
-in
-
-{
-
-  ###### interface
-
-  options = {
-
-    services.portmap = {
-
-      enable = mkOption {
-        default = false;
-        description = ''
-          Whether to enable `portmap', an ONC RPC directory service
-          notably used by NFS and NIS, and which can be queried
-          using the rpcinfo(1) command.
-        '';
-      };
-
-      verbose = mkOption {
-        default = false;
-        description = ''
-          Whether to enable verbose output.
-        '';
-      };
-
-      chroot = mkOption {
-        default = "/var/empty";
-        description = ''
-          If non-empty, a path to change root to.
-        '';
-      };
-
-    };
-
-  };
-
-
-  ###### implementation
-
-  config = mkIf config.services.portmap.enable {
-
-    environment.systemPackages = [ portmap ];
-
-    users.extraUsers = singleton
-      { name = "portmap";
-        inherit uid;
-        description = "Portmap daemon user";
-        home = "/var/empty";
-      };
-
-    users.extraGroups = singleton
-      { name = "portmap";
-        inherit gid;
-      };
-
-    jobs.portmap =
-      { description = "ONC RPC portmap";
-
-        startOn = "started network-interfaces";
-        stopOn = ""; # needed during shutdown
-
-        daemonType = "fork";
-
-        path = [ portmap pkgs.netcat ];
-
-        exec =
-          ''
-            portmap \
-              ${optionalString (config.services.portmap.chroot != "")
-                "-t '${config.services.portmap.chroot}'"} \
-              ${if config.services.portmap.verbose then "-v" else ""}
-          '';
-
-        postStart =
-          ''
-            # Portmap forks into the background before it starts
-            # listening, so wait until its ready.
-            while ! nc -z localhost 111; do
-                stop_check                
-                sleep 1
-            done
-          '';
-      };
-
-  };
-
-}
diff --git a/modules/services/networking/rpcbind.nix b/modules/services/networking/rpcbind.nix
index 7180b2cfa14..00c958c5a4a 100644
--- a/modules/services/networking/rpcbind.nix
+++ b/modules/services/networking/rpcbind.nix
@@ -29,9 +29,6 @@ let
     '';
   };
 
-  check = mkAssert (!(config.services.rpcbind.enable && config.services.portmap.enable))
-    "Portmap and rpcbind cannot both be enabled.";
-
 in
 
 {
@@ -59,7 +56,7 @@ in
 
   ###### implementation
 
-  config = mkIf config.services.rpcbind.enable (check {
+  config = mkIf config.services.rpcbind.enable {
 
     environment.systemPackages = [ pkgs.rpcbind ];
 
@@ -79,6 +76,6 @@ in
         serviceConfig.ExecStart = "@${pkgs.rpcbind}/bin/rpcbind rpcbind";
       };
 
-  });
+  };
 
 }
diff --git a/tests/default.nix b/tests/default.nix
index 36a2a2d608b..bd1aa45fe28 100644
--- a/tests/default.nix
+++ b/tests/default.nix
@@ -22,7 +22,6 @@ with import ../lib/testing.nix { inherit system minimal; };
   #nfs4 = makeTest (import ./nfs.nix { version = 4; });
   openssh = makeTest (import ./openssh.nix);
   partition = makeTest (import ./partition.nix);
-  portmap = makeTest (import ./portmap.nix);
   proxy = makeTest (import ./proxy.nix);
   quake3 = makeTest (import ./quake3.nix);
   simple = makeTest (import ./simple.nix);
diff --git a/tests/portmap.nix b/tests/portmap.nix
deleted file mode 100644
index 0d2bf153685..00000000000
--- a/tests/portmap.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-{ pkgs, ... }:
-
-{
-
-  machine =
-    { config, pkgs, ... }:
-
-    { services.portmap.enable = true; };
-
-  testScript =
-    ''
-       # The `portmap' service must be registered once for TCP and once for
-       # UDP.
-       $machine->succeed("test `rpcinfo -p | grep portmapper | wc -l` -eq 2");
-    '';
-
-}
-- 
GitLab


From 82e1d0c8b1b82345703caaf69afe94a809586e63 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 26 Sep 2013 17:33:52 +0200
Subject: [PATCH 4930/5331] Remove services.ttyBackgrounds

This hasn't worked in a long time.
---
 doc/config-examples/x86_64-usbstick.nix       |   6 -
 lib/unpack-theme.nix                          |   7 -
 lib/unpack-theme.sh                           |  18 ---
 .../cd-dvd/system-tarball-fuloong2f.nix       |   2 -
 .../cd-dvd/system-tarball-sheevaplug.nix      |   1 -
 modules/module-list.nix                       |   1 -
 modules/profiles/headless.nix                 |   1 -
 modules/services/misc/nixos-manual.nix        |   6 -
 modules/services/misc/rogue.nix               |   5 -
 modules/system/boot/kernel.nix                |   5 +-
 modules/system/boot/stage-1.nix               |  28 +---
 modules/tasks/kbd.nix                         |  24 +--
 modules/tasks/tty-backgrounds.nix             | 148 ------------------
 modules/virtualisation/xen-domU.nix           |   3 -
 14 files changed, 5 insertions(+), 250 deletions(-)
 delete mode 100644 lib/unpack-theme.nix
 delete mode 100644 lib/unpack-theme.sh
 delete mode 100644 modules/tasks/tty-backgrounds.nix

diff --git a/doc/config-examples/x86_64-usbstick.nix b/doc/config-examples/x86_64-usbstick.nix
index 492b7a841a1..f7d3f80189d 100644
--- a/doc/config-examples/x86_64-usbstick.nix
+++ b/doc/config-examples/x86_64-usbstick.nix
@@ -15,12 +15,6 @@
     }
   ];
 
-  services = {
-    ttyBackgrounds = {
-      enable = false;
-    };
-  };
-
   fonts = {
     enableFontConfig = false;
   };
diff --git a/lib/unpack-theme.nix b/lib/unpack-theme.nix
deleted file mode 100644
index 69d2eebe530..00000000000
--- a/lib/unpack-theme.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{stdenv, theme}:
-
-stdenv.mkDerivation {
-  name = "theme";
-  builder = ./unpack-theme.sh;
-  inherit theme;
-}
diff --git a/lib/unpack-theme.sh b/lib/unpack-theme.sh
deleted file mode 100644
index ca6e0b88ab9..00000000000
--- a/lib/unpack-theme.sh
+++ /dev/null
@@ -1,18 +0,0 @@
-source $stdenv/setup
-
-ensureDir $out
-
-(cd $out && unpackFile $theme)
-
-themeName=$(cd $out && ls)
-
-for i in $out/$themeName/config/*.cfg; do
-    echo "converting $i"
-    # Rewrite /etc paths.  Also, the file names
-    # config/bootsplash-<RES>.cfg should be <RES>.cfg.
-    sed "s^/etc/bootsplash/themes^$out^g" < $i > $out/$themeName/$(basename $i | sed 's^.*-^^')
-done
-
-rm $out/$themeName/config/*.cfg
-
-ln -s $themeName $out/default
diff --git a/modules/installer/cd-dvd/system-tarball-fuloong2f.nix b/modules/installer/cd-dvd/system-tarball-fuloong2f.nix
index 968605734a1..85356118ce6 100644
--- a/modules/installer/cd-dvd/system-tarball-fuloong2f.nix
+++ b/modules/installer/cd-dvd/system-tarball-fuloong2f.nix
@@ -154,8 +154,6 @@ in
 
   jobs.openssh.startOn = pkgs.lib.mkOverrideTemplate 50 {} "";
 
-  services.ttyBackgrounds.enable = false;
-
   boot.loader.grub.enable = false;
   boot.loader.generationsDir.enable = false;
   system.boot.loader.kernelFile = "vmlinux";
diff --git a/modules/installer/cd-dvd/system-tarball-sheevaplug.nix b/modules/installer/cd-dvd/system-tarball-sheevaplug.nix
index ed78bc2a067..20fe4de2cd8 100644
--- a/modules/installer/cd-dvd/system-tarball-sheevaplug.nix
+++ b/modules/installer/cd-dvd/system-tarball-sheevaplug.nix
@@ -165,7 +165,6 @@ in
   # not be started by default on the installation CD because the
   # default root password is empty.
   services.openssh.enable = true;
-  services.ttyBackgrounds.enable = false;
   jobs.openssh.startOn = pkgs.lib.mkOverrideTemplate 50 {} "";
 
   # cpufrequtils fails to build on non-pc
diff --git a/modules/module-list.nix b/modules/module-list.nix
index a27febb7bc1..931b7988f8d 100644
--- a/modules/module-list.nix
+++ b/modules/module-list.nix
@@ -268,7 +268,6 @@
   ./tasks/network-interfaces.nix
   ./tasks/scsi-link-power-management.nix
   ./tasks/swraid.nix
-  ./tasks/tty-backgrounds.nix
   ./virtualisation/libvirtd.nix
   ./virtualisation/nova.nix
   ./virtualisation/virtualbox-guest.nix
diff --git a/modules/profiles/headless.nix b/modules/profiles/headless.nix
index 9693e36d9eb..e9c48da1913 100644
--- a/modules/profiles/headless.nix
+++ b/modules/profiles/headless.nix
@@ -9,7 +9,6 @@ with pkgs.lib;
   sound.enable = false;
   boot.vesa = false;
   boot.initrd.enableSplashScreen = false;
-  services.ttyBackgrounds.enable = false;
 
   # Don't start a tty on the serial consoles.
   systemd.services."serial-getty@ttyS0".enable = false;
diff --git a/modules/services/misc/nixos-manual.nix b/modules/services/misc/nixos-manual.nix
index 90e596fdc50..38f1917a46a 100644
--- a/modules/services/misc/nixos-manual.nix
+++ b/modules/services/misc/nixos-manual.nix
@@ -108,12 +108,6 @@ in
         };
       };
 
-    services.ttyBackgrounds.specificThemes = mkIf cfg.showManual
-      [ { tty = "tty${cfg.ttyNumber}";
-          theme = pkgs.themes "green";
-        }
-      ];
-
     services.mingetty.helpLine = mkIf cfg.showManual
       "\nPress <Alt-F${toString cfg.ttyNumber}> for the NixOS manual.";
 
diff --git a/modules/services/misc/rogue.nix b/modules/services/misc/rogue.nix
index c5cc8b4050d..94fa8850750 100644
--- a/modules/services/misc/rogue.nix
+++ b/modules/services/misc/rogue.nix
@@ -54,11 +54,6 @@ in
           };
       };
 
-    services.ttyBackgrounds.specificThemes = singleton
-      { tty = cfg.tty;
-        theme = pkgs.themes "theme-gnu";
-      };
-
   };
 
 }
diff --git a/modules/system/boot/kernel.nix b/modules/system/boot/kernel.nix
index 27da9c86995..4ceabb20df5 100644
--- a/modules/system/boot/kernel.nix
+++ b/modules/system/boot/kernel.nix
@@ -65,8 +65,7 @@ in
     };
 
     boot.vesa = mkOption {
-      default = config.boot.kernelPackages.splashutils != null;
-      example = false;
+      default = false;
       description = ''
         Whether to activate VESA video mode on boot.
       '';
@@ -160,7 +159,7 @@ in
     # (so you don't need to reboot to have changes take effect).
     boot.kernelParams =
       [ "loglevel=${toString config.boot.consoleLogLevel}" ] ++
-      optionals config.boot.vesa [ "splash=verbose" "vga=0x317" ];
+      optionals config.boot.vesa [ "vga=0x317" ];
 
     boot.kernel.sysctl."kernel.printk" = config.boot.consoleLogLevel;
 
diff --git a/modules/system/boot/stage-1.nix b/modules/system/boot/stage-1.nix
index ed06e6a38d0..3836d639513 100644
--- a/modules/system/boot/stage-1.nix
+++ b/modules/system/boot/stage-1.nix
@@ -23,9 +23,6 @@ let
   };
 
 
-  enableSplashScreen =
-    config.boot.vesa && config.boot.initrd.enableSplashScreen && kernelPackages.splashutils != null;
-
   needsCifsUtils = kernelPackages.kernel ? features
                 && kernelPackages.kernel.features ? needsCifsUtils
                 && kernelPackages.kernel.features.needsCifsUtils
@@ -94,11 +91,6 @@ let
       cp -v ${pkgs.kmod}/bin/kmod $out/bin/
       ln -s kmod $out/bin/modprobe
 
-      # Maybe copy splashutils.
-      ${optionalString enableSplashScreen ''
-        cp ${kernelPackages.splashutils}/${kernelPackages.splashutils.helperName} $out/bin/splash_helper
-      ''}
-
       # Maybe copy cifs utils
       ${optionalString needsCifsUtils ''
         cp -v ${pkgs.cifs_utils}/sbin/mount.cifs $out/bin
@@ -228,18 +220,7 @@ let
         { object = pkgs.writeText "mdadm.conf" config.boot.initrd.mdadmConf;
           symlink = "/etc/mdadm.conf";
         }
-      ] ++ optionals enableSplashScreen
-        [ { object = extraUtils;
-            suffix = "/bin/splash_helper";
-            symlink = "/${kernelPackages.splashutils.helperName}";
-          }
-          { object = import ../../../lib/unpack-theme.nix {
-              inherit (pkgs) stdenv;
-              theme = config.services.ttyBackgrounds.defaultTheme;
-            };
-            symlink = "/etc/splash";
-          }
-        ];
+      ];
   };
 
 in
@@ -256,13 +237,6 @@ in
       ";
     };
 
-    boot.initrd.enableSplashScreen = mkOption {
-      default = true;
-      description = "
-        Whether to show a nice splash screen while booting.
-      ";
-    };
-
     boot.initrd.checkJournalingFS = mkOption {
       default = true;
       type = types.bool;
diff --git a/modules/tasks/kbd.nix b/modules/tasks/kbd.nix
index 8de5f43edac..9f294a5f93e 100644
--- a/modules/tasks/kbd.nix
+++ b/modules/tasks/kbd.nix
@@ -4,19 +4,10 @@ with pkgs.lib;
 
 let
 
-  # think about where to put this chunk of code!
-  # required by other pieces as well
-  requiredTTYs = config.services.mingetty.ttys
-    ++ config.boot.extraTTYs
-    ++ [ config.services.syslogd.tty ];
-  ttys = map (dev: "/dev/${dev}") requiredTTYs;
-  consoleFont = config.i18n.consoleFont;
-  consoleKeyMap = config.i18n.consoleKeyMap;
-
   vconsoleConf = pkgs.writeText "vconsole.conf"
     ''
-      KEYMAP=${consoleKeyMap}
-      FONT=${consoleFont}
+      KEYMAP=${config.i18n.consoleKeyMap}
+      FONT=${config.i18n.consoleFont}
     '';
 
 in
@@ -42,15 +33,6 @@ in
       '';
     };
 
-    # dummy option so that requiredTTYs can be passed
-    requiredTTYs = mkOption {
-      default = [];
-      description = "
-        FIXME: find another place for this option.
-        FIXME: find a good description.
-      ";
-    };
-
   };
 
 
@@ -58,8 +40,6 @@ in
 
   config = {
 
-    inherit requiredTTYs; # pass it to ./modules/tasks/tty-backgrounds.nix
-
     environment.systemPackages = [ pkgs.kbd ];
 
     # Let systemd-vconsole-setup.service do the work of setting up the
diff --git a/modules/tasks/tty-backgrounds.nix b/modules/tasks/tty-backgrounds.nix
deleted file mode 100644
index aae2c279b1e..00000000000
--- a/modules/tasks/tty-backgrounds.nix
+++ /dev/null
@@ -1,148 +0,0 @@
-{ config, pkgs, ... }:
-
-with pkgs.lib;
-
-let
-
-  inherit (pkgs) stdenv;
-
-  kernelPackages = config.boot.kernelPackages;
-  splashutils = kernelPackages.splashutils;
-  requiredTTYs = config.requiredTTYs;
-
-  backgrounds =
-    let
-
-      specificThemes = config.services.ttyBackgrounds.specificThemes;
-
-      overriddenTTYs = map (x: x.tty) specificThemes;
-
-      # Use the default theme for all the mingetty ttys and for the
-      # syslog tty, except those for which a specific theme is
-      # specified.
-      defaultTTYs =
-        filter (x: !(elem x overriddenTTYs)) requiredTTYs;
-
-    in
-      (map (tty: { inherit tty; }) defaultTTYs) ++ specificThemes;
-
-  themesUnpacked = stdenv.mkDerivation {
-    name = "splash-themes";
-    builder = ./tty-backgrounds-combine.sh;
-    default = unpackTheme config.services.ttyBackgrounds.defaultTheme;
-    # !!! Should use XML here.
-    ttys = map (x: x.tty) backgrounds;
-    themes = map (x: if x ? theme then unpackTheme x.theme else "default") backgrounds;
-  };
-
-  unpackTheme = theme: import ../../lib/unpack-theme.nix {
-    inherit stdenv theme;
-  };
-
-in
-
-{
-
-  ###### interface
-
-  options = {
-
-    services.ttyBackgrounds = {
-
-      enable = mkOption {
-        default = true;
-        description = ''
-          Whether to enable graphical backgrounds for the virtual consoles.
-        '';
-      };
-
-      defaultTheme = mkOption {
-        default = pkgs.fetchurl {
-          #url = http://www.bootsplash.de/files/themes/Theme-BabyTux.tar.bz2;
-          url = mirror://gentoo/distfiles/Theme-BabyTux.tar.bz2;
-          md5 = "a6d89d1c1cff3b6a08e2f526f2eab4e0";
-        };
-        description = ''
-          The default theme for the virtual consoles.  Themes can be found
-          at <link xlink:href='http://www.bootsplash.de/' />.
-        '';
-      };
-
-      specificThemes = mkOption {
-        default = [ ];
-        description = ''
-          This option overrides the theme for specific virtual consoles.
-        '';
-      };
-
-    };
-
-  };
-
-
-  ###### implementation
-
-  config = mkIf (config.boot.vesa && config.services.ttyBackgrounds.enable && splashutils != null) (
-    mkAssert (splashutils != null) ''
-      The kernelPackages does not provide splashutils, as required by ttyBackgrounds.
-      Either provide kernelPackages with splashutils, or disable ttyBackgrounds.
-    '' {
-
-    services.ttyBackgrounds.specificThemes = singleton
-      { tty = config.services.syslogd.tty;
-        theme = pkgs.themes "theme-gnu";
-      };
-
-    environment.etc = singleton
-      { source = themesUnpacked;
-        target = "splash";
-      };
-
-    jobs.ttyBackgrounds =
-      { name = "tty-backgrounds";
-
-        startOn = "started udev";
-
-        # Don't stop tty-backgrounds during shutdown; it's not needed,
-        # and it just causes intrusive blanking of the screen.
-        stopOn = "";
-
-        preStart =
-          ''
-            # Critical: tell the kernel where to find splash_helper.  It calls
-            # this program every time we switch between consoles.
-            helperProcFile=${splashutils.helperProcFile}
-            if test -e /proc/sys/fbcondecor; then helperProcFile=/proc/sys/fbcondecor; fi
-            echo ${splashutils}/${splashutils.helperName} > $helperProcFile
-
-            # For each console...
-            for tty in ${toString (map (x: x.tty) backgrounds)}; do
-                # Make sure that the console exists.
-                echo -n "" > /dev/$tty
-
-                # Set the theme as determined by tty-backgrounds-combine.sh
-                # above.  Note that splashutils needs a TTY number
-                # instead of a device name, hence the ''${tty:3}.
-                theme=$(readlink ${themesUnpacked}/$tty)
-                prevTheme=$(${splashutils}/${splashutils.controlName} --tty ''${tty:3} -c getcfg |
-                    sed 's/theme: *\(.*\)/\1/;t;d' || true)
-                if [ "$theme" != "$prevTheme" ]; then
-                    ${splashutils}/${splashutils.controlName} --tty ''${tty:3} -c setcfg -t $theme || true
-                fi
-                ${splashutils}/${splashutils.controlName} --tty ''${tty:3} -c setpic -t $theme || true
-                ${splashutils}/${splashutils.controlName} --tty ''${tty:3} -c on || true
-            done
-          '';
-
-        postStop =
-          ''
-            # Disable the theme on each console.
-            for tty in ${toString (map (x: x.tty) backgrounds)}; do
-                ${splashutils}/${splashutils.controlName} --tty ''${tty:3} -c off || true
-            done
-          '';
-      };
-
-  });
-
-}
diff --git a/modules/virtualisation/xen-domU.nix b/modules/virtualisation/xen-domU.nix
index 1a9d67d7204..48358966934 100644
--- a/modules/virtualisation/xen-domU.nix
+++ b/modules/virtualisation/xen-domU.nix
@@ -11,9 +11,6 @@
 
   boot.initrd.kernelModules = [ "xen-blkfront" ];
 
-  # Backgrounds don't work, so don't bother.
-  services.ttyBackgrounds.enable = false;
-
   # Send syslog messages to the Xen console.
   services.syslogd.tty = "hvc0";
 
-- 
GitLab


From a26e4a43f3f71e3666a75b09e342bc82dbe5dd4e Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 26 Sep 2013 21:00:30 +0200
Subject: [PATCH 4931/5331] Add a test for CUPS

---
 release-combined.nix |  1 +
 tests/default.nix    |  1 +
 tests/printing.nix   | 90 ++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 92 insertions(+)
 create mode 100644 tests/printing.nix

diff --git a/release-combined.nix b/release-combined.nix
index 07f76547b56..e28f774301d 100644
--- a/release-combined.nix
+++ b/release-combined.nix
@@ -53,6 +53,7 @@ in rec {
         (all nixos.tests.login)
         (all nixos.tests.misc)
         (all nixos.tests.openssh)
+        (all nixos.tests.printing)
         (all nixos.tests.xfce)
 
         nixpkgs.tarball
diff --git a/tests/default.nix b/tests/default.nix
index bd1aa45fe28..3fc31cf0de9 100644
--- a/tests/default.nix
+++ b/tests/default.nix
@@ -22,6 +22,7 @@ with import ../lib/testing.nix { inherit system minimal; };
   #nfs4 = makeTest (import ./nfs.nix { version = 4; });
   openssh = makeTest (import ./openssh.nix);
   partition = makeTest (import ./partition.nix);
+  printing = makeTest (import ./printing.nix);
   proxy = makeTest (import ./proxy.nix);
   quake3 = makeTest (import ./quake3.nix);
   simple = makeTest (import ./simple.nix);
diff --git a/tests/printing.nix b/tests/printing.nix
new file mode 100644
index 00000000000..13cc3115d50
--- /dev/null
+++ b/tests/printing.nix
@@ -0,0 +1,90 @@
+# Test printing via CUPS.
+
+{ pkgs, ... }:
+
+{
+
+  nodes = {
+
+    server =
+      { config, pkgs, ... }:
+      { services.printing.enable = true;
+        services.printing.cupsdConf =
+          ''
+            Listen server:631
+            <Location />
+              Order allow,deny
+              Allow from all
+            </Location>
+          '';
+      };
+
+    client =
+      { config, pkgs, nodes, ... }:
+      { services.printing.enable = true;
+      };
+
+  };
+
+  testScript =
+    ''
+      startAll;
+
+      # Make sure that cups is up on both sides.
+      $server->waitForUnit("cupsd.service");
+      $client->waitForUnit("cupsd.service");
+      $client->succeed("lpstat -r") =~ /scheduler is running/ or die;
+      $client->succeed("lpstat -H") =~ "/var/run/cups/cups.sock" or die;
+      $client->succeed("curl --fail http://localhost:631/");
+      $client->succeed("curl --fail http://server:631/");
+      $server->fail("curl --fail http://client:631/");
+
+      # Add a HP Deskjet printer connected via USB to the server.
+      $server->succeed("lpadmin -p DeskjetLocal -v usb://HP/Deskjet%205400%20series?serial=TH93I152S123XY -m 'drv:///sample.drv/deskjet.ppd' -E");
+
+      # Add it to the client as well via IPP.
+      $client->succeed("lpadmin -p DeskjetRemote -v ipp://server/printers/DeskjetLocal -m 'drv:///sample.drv/deskjet.ppd' -E");
+      $client->succeed("lpadmin -d DeskjetRemote");
+
+      # Do some status checks.
+      $client->succeed("lpstat -a") =~ /DeskjetRemote accepting requests/ or die;
+      $client->succeed("lpstat -h server -a") =~ /DeskjetLocal accepting requests/ or die;
+      $client->succeed("cupsdisable DeskjetRemote");
+      $client->succeed("lpq") =~ /DeskjetRemote is not ready.*no entries/s or die;
+      $client->succeed("cupsenable DeskjetRemote");
+      $client->succeed("lpq") =~ /DeskjetRemote is ready.*no entries/s or die;
+
+      # Test printing various file types.
+      foreach my $file ("${pkgs.groff}/share/doc/*/examples/mom/typesetting.pdf",
+                        "${pkgs.groff}/share/doc/*/meref.ps",
+                        "${pkgs.cups}/share/doc/cups/images/cups.png",
+                        "${pkgs.xz}/share/doc/xz/faq.txt")
+      {
+          $file =~ /([^\/]*)$/; my $fn = $1;
+
+          subtest "print $fn", sub {
+
+              # Print the file on the client.
+              $client->succeed("lp $file");
+              $client->succeed("lpq") =~ /active.*root.*$fn/ or die;
+
+              # Ensure that a raw PCL file appeared in the server's queue
+              # (showing that the right filters have been applied).  Of
+              # course, since there is no actual USB printer attached, the
+              # file will stay in the queue forever.
+              $server->waitForFile("/var/spool/cups/d*-*");
+              $server->succeed("lpq -a") =~ /remroot.*$fn/ or die;
+              $server->succeed("hexdump -C -n2 /var/spool/cups/d*-*") =~ /1b 45/ or die; # 1b 45 = printer reset
+
+              # Delete the job on the client.  It should disappear on the
+              # server as well.
+              $client->succeed("lprm");
+              $client->succeed("lpq -a") =~ /no entries/;
+              Machine::retry sub {
+                return 1 if $server->succeed("lpq -a") =~ /no entries/;
+              };
+          };
+      }
+    '';
+
+}
-- 
GitLab


From e1318e60265b86fd0762261361a4fa21f0cdc773 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 26 Sep 2013 21:04:43 +0200
Subject: [PATCH 4932/5331] cupsd: Log to syslog (and thus the journal)

---
 modules/services/printing/cupsd.nix | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/modules/services/printing/cupsd.nix b/modules/services/printing/cupsd.nix
index 5a6b85810aa..a01aadb760a 100644
--- a/modules/services/printing/cupsd.nix
+++ b/modules/services/printing/cupsd.nix
@@ -6,8 +6,6 @@ let
 
   inherit (pkgs) cups;
 
-  logDir = "/var/log/cups";
-
   cfg = config.services.printing;
 
   additionalBackends = pkgs.runCommand "additional-cups-backends" { }
@@ -128,7 +126,6 @@ in
         preStart =
           ''
             mkdir -m 0755 -p /etc/cups
-            mkdir -m 0755 -p ${logDir}
             mkdir -m 0700 -p /var/cache/cups
             mkdir -m 0700 -p /var/spool/cups
             mkdir -m 0755 -p ${cfg.tempDir}
@@ -159,9 +156,9 @@ in
 
         SetEnv PATH ${bindir}/lib/cups/filter:${bindir}/bin:${bindir}/sbin
 
-        AccessLog ${logDir}/access_log
-        ErrorLog ${logDir}/error_log
-        PageLog ${logDir}/page_log
+        AccessLog syslog
+        ErrorLog syslog
+        PageLog syslog
 
         TempDir ${cfg.tempDir}
 
-- 
GitLab


From df6f5ade4021995aeec9b077b3d208390018ab66 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 26 Sep 2013 23:56:38 +0200
Subject: [PATCH 4933/5331] cupsd: Use Type=forking

http://hydra.nixos.org/build/6291101
---
 modules/services/printing/cupsd.nix | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/modules/services/printing/cupsd.nix b/modules/services/printing/cupsd.nix
index a01aadb760a..c9a4a9087e5 100644
--- a/modules/services/printing/cupsd.nix
+++ b/modules/services/printing/cupsd.nix
@@ -115,11 +115,11 @@ in
     # gets loaded, and then cups cannot access the printers.
     boot.blacklistedKernelModules = [ "usblp" ];
 
-    jobs.cupsd =
+    systemd.services.cupsd =
       { description = "CUPS Printing Daemon";
 
-        startOn = "started network-interfaces";
-        stopOn = "stopping network-interfaces";
+        wantedBy = [ "multi-user.target" ];
+        after = [ "network-interfaces.target" ];
 
         path = [ cups ];
 
@@ -131,7 +131,8 @@ in
             mkdir -m 0755 -p ${cfg.tempDir}
           '';
 
-        exec = "cupsd -c ${pkgs.writeText "cupsd.conf" cfg.cupsdConf} -F";
+        serviceConfig.Type = "forking";
+        serviceConfig.ExecStart = "@${cups}/sbin/cupsd cupsd -c ${pkgs.writeText "cupsd.conf" cfg.cupsdConf}";
       };
 
     services.printing.drivers =
-- 
GitLab


From 5384b04ead1501262b36e81f1bd67696dcbd3626 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Fri, 27 Sep 2013 01:13:20 +0200
Subject: [PATCH 4934/5331] bash: fix broken completion

---
 modules/programs/bash/bash.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/modules/programs/bash/bash.nix b/modules/programs/bash/bash.nix
index c9332c0d9e9..8cfe3f990ad 100644
--- a/modules/programs/bash/bash.nix
+++ b/modules/programs/bash/bash.nix
@@ -198,6 +198,11 @@ in
 
     users.defaultUserShell = mkDefault "/run/current-system/sw/bin/bash";
 
+    environment.pathsToLink = optionals cfg.enableCompletion [
+      "/etc/bash_completion.d"
+      "/share/bash-completion"
+    ];
+
     environment.shells =
       [ "/run/current-system/sw/bin/bash"
         "/var/run/current-system/sw/bin/bash"
-- 
GitLab


From 6e604c87879835842704f369ff98a13130d2048c Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Fri, 27 Sep 2013 10:50:52 -0400
Subject: [PATCH 4935/5331] enableSplashScreen is no longer a valid option

Signed-off-by: Shea Levy <shea@shealevy.com>
---
 doc/config-examples/x86_64-usbstick.nix | 1 -
 modules/profiles/headless.nix           | 1 -
 2 files changed, 2 deletions(-)

diff --git a/doc/config-examples/x86_64-usbstick.nix b/doc/config-examples/x86_64-usbstick.nix
index f7d3f80189d..374d3ba3bc7 100644
--- a/doc/config-examples/x86_64-usbstick.nix
+++ b/doc/config-examples/x86_64-usbstick.nix
@@ -5,7 +5,6 @@
     loader.grub.device = "/dev/sda";
     initrd = {
       kernelModules = ["usb_storage" "ehci_hcd" "ohci_hcd"];
-      enableSplashScreen = false;
     };
   };
 
diff --git a/modules/profiles/headless.nix b/modules/profiles/headless.nix
index e9c48da1913..541c46ca50c 100644
--- a/modules/profiles/headless.nix
+++ b/modules/profiles/headless.nix
@@ -8,7 +8,6 @@ with pkgs.lib;
 {
   sound.enable = false;
   boot.vesa = false;
-  boot.initrd.enableSplashScreen = false;
 
   # Don't start a tty on the serial consoles.
   systemd.services."serial-getty@ttyS0".enable = false;
-- 
GitLab


From f2000007b37fb7bbc3f008179ebb820a2dfb5f8b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Matija=20=C5=A0uklje?= <matija@suklje.name>
Date: Sat, 28 Sep 2013 02:45:20 +0200
Subject: [PATCH 4936/5331] New package started, should not work yet.

---
 .../applications/office/eventlist/default.nix | 28 +++++++++++++++++++
 1 file changed, 28 insertions(+)
 create mode 100644 pkgs/applications/office/eventlist/default.nix

diff --git a/pkgs/applications/office/eventlist/default.nix b/pkgs/applications/office/eventlist/default.nix
new file mode 100644
index 00000000000..26b8fabb549
--- /dev/null
+++ b/pkgs/applications/office/eventlist/default.nix
@@ -0,0 +1,28 @@
+{ stdenv, fetchurl }:
+
+stdenv.mkDerivation rec {
+  name = "eventlist-0.6.95";
+
+  src = fetchurl {
+    url = "http://kde-look.org/CONTENT/content-files/107779-plasmoid-eventlist-0.6.95.tar.bz2";
+    md5 = "67531c52806eee0a6cd911265f1eb9f5";
+  };
+
+  doCheck = true;
+
+  meta = {
+    description = "KDE Plasmoid to show events and todos on the desktop.";
+    longDescription = ''
+      This is a plasmoid to show the events and todos from Akonadi resources (KOrganizer, Birthdays etc.).
+      With a google resource also Google calendar items can be shown.
+      Also possible with a CalDAV resource.
+      A facebook resource is also available.
+
+      Incidences can be filtered, added, edited, deleted via context menu.
+    '';
+    homepage = http://kde-look.org/content/show.php/Eventlist?content=107779;
+    license = "GPLv3+";
+
+    platforms = stdenv.lib.platforms.all;
+  };
+}
-- 
GitLab


From 3abea9036c9321302e940a4c083b3c4341010465 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Matija=20=C5=A0uklje?= <matija@suklje.name>
Date: Sun, 29 Sep 2013 15:30:08 +0200
Subject: [PATCH 4937/5331] Changed the hash checker to sha256 and fixed
 (hopefully) all-packages.nix.

---
 pkgs/applications/office/eventlist/default.nix | 12 +++++++-----
 pkgs/top-level/all-packages.nix                |  2 ++
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/office/eventlist/default.nix b/pkgs/applications/office/eventlist/default.nix
index 26b8fabb549..e8ab602fb56 100644
--- a/pkgs/applications/office/eventlist/default.nix
+++ b/pkgs/applications/office/eventlist/default.nix
@@ -1,16 +1,19 @@
-{ stdenv, fetchurl }:
+{ stdenv, fetchurl, kdelibs }:
 
 stdenv.mkDerivation rec {
   name = "eventlist-0.6.95";
 
   src = fetchurl {
     url = "http://kde-look.org/CONTENT/content-files/107779-plasmoid-eventlist-0.6.95.tar.bz2";
-    md5 = "67531c52806eee0a6cd911265f1eb9f5";
+    sha256 = "29d3ff0b84353c2e563e05f75cd729b9e2971365eed9b8ce9b38d94f51901b94"
   };
 
   doCheck = true;
 
+  buildInputs = [ kdelibs ];
+
   meta = {
+    inherit (kdelibs.meta) platforms;
     description = "KDE Plasmoid to show events and todos on the desktop.";
     longDescription = ''
       This is a plasmoid to show the events and todos from Akonadi resources (KOrganizer, Birthdays etc.).
@@ -20,9 +23,8 @@ stdenv.mkDerivation rec {
 
       Incidences can be filtered, added, edited, deleted via context menu.
     '';
-    homepage = http://kde-look.org/content/show.php/Eventlist?content=107779;
+    homepage = "http://kde-look.org/content/show.php/Eventlist?content=107779";
     license = "GPLv3+";
 
-    platforms = stdenv.lib.platforms.all;
-  };
+	  };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 3e3f9798d5c..efb9aba92b9 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9361,6 +9361,8 @@ let
         else
           callPackage ../applications/graphics/digikam { };
 
+      eventlist = callPackage ../applications/office/eventlist {};
+ 
       k3b = callPackage ../applications/misc/k3b { };
 
       kadu = callPackage ../applications/networking/instant-messengers/kadu { };
-- 
GitLab


From 12470a04997b5254ed7bbf222343ca43d99736af Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Matija=20=C5=A0uklje?= <matija@suklje.name>
Date: Mon, 30 Sep 2013 00:22:31 +0200
Subject: [PATCH 4938/5331] Fixed the sha line.

---
 pkgs/applications/office/eventlist/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/office/eventlist/default.nix b/pkgs/applications/office/eventlist/default.nix
index e8ab602fb56..3a4f1640366 100644
--- a/pkgs/applications/office/eventlist/default.nix
+++ b/pkgs/applications/office/eventlist/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "http://kde-look.org/CONTENT/content-files/107779-plasmoid-eventlist-0.6.95.tar.bz2";
-    sha256 = "29d3ff0b84353c2e563e05f75cd729b9e2971365eed9b8ce9b38d94f51901b94"
+    sha256 = "29d3ff0b84353c2e563e05f75cd729b9e2971365eed9b8ce9b38d94f51901b94";
   };
 
   doCheck = true;
-- 
GitLab


From 869be5611deaa5f09e67e5d2f08394361715af62 Mon Sep 17 00:00:00 2001
From: Alexei Robyn <shados@shados.net>
Date: Mon, 30 Sep 2013 00:38:57 +1000
Subject: [PATCH 4939/5331] Added support for -I flag to nixos-install

---
 modules/installer/tools/nixos-install.sh | 24 +++++++++++++++++++++---
 1 file changed, 21 insertions(+), 3 deletions(-)

diff --git a/modules/installer/tools/nixos-install.sh b/modules/installer/tools/nixos-install.sh
index b7efcd2156c..a4ac5b68dd7 100644
--- a/modules/installer/tools/nixos-install.sh
+++ b/modules/installer/tools/nixos-install.sh
@@ -8,6 +8,24 @@
 #   * nix-env -p /nix/var/nix/profiles/system -i <nix-expr for the configuration>
 #   * run the activation script of the configuration (also installs Grub)
 
+# Parse the command line for the -I flag
+extraBuildFlags=()
+
+while [ "$#" -gt 0 ]; do
+    i="$1"; shift 1
+    case "$i" in
+      -I)
+        given_path="$1"; shift 1
+        absolute_path=$(readlink -m $given_path)
+        extraBuildFlags+=("$i" "/mnt$absolute_path")
+        ;;
+      *)
+        echo "$0: unknown option \`$i'"
+        exit 1
+        ;;
+    esac
+done
+
 set -e
 shopt -s nullglob
 
@@ -179,7 +197,7 @@ mount --bind $(readlink -f $(nix-instantiate --find-file nixos)) $mountPoint/mnt
 echo "building the system configuration..."
 NIX_PATH="nixpkgs=/mnt-nixpkgs:nixos=/mnt-nixos:nixos-config=$NIXOS_CONFIG" NIXOS_CONFIG= \
     chroot $mountPoint @nix@/bin/nix-env \
-    -p /nix/var/nix/profiles/system -f '<nixos>' --set -A system --show-trace
+    "${extraBuildFlags[@]}" -p /nix/var/nix/profiles/system -f '<nixos>' --set -A system --show-trace
 
 
 # Copy the NixOS/Nixpkgs sources to the target as the initial contents
@@ -187,11 +205,11 @@ NIX_PATH="nixpkgs=/mnt-nixpkgs:nixos=/mnt-nixos:nixos-config=$NIXOS_CONFIG" NIXO
 mkdir -m 0755 -p $mountPoint/nix/var/nix/profiles
 mkdir -m 1777 -p $mountPoint/nix/var/nix/profiles/per-user
 mkdir -m 0755 -p $mountPoint/nix/var/nix/profiles/per-user/root
-srcs=$(nix-env -p /nix/var/nix/profiles/per-user/root/channels -q nixos --no-name --out-path 2>/dev/null || echo -n "")
+srcs=$(nix-env "${extraBuildFlags[@]}" -p /nix/var/nix/profiles/per-user/root/channels -q nixos --no-name --out-path 2>/dev/null || echo -n "")
 if test -n "$srcs"; then
     echo "copying NixOS/Nixpkgs sources..."
     chroot $mountPoint @nix@/bin/nix-env \
-        -p /nix/var/nix/profiles/per-user/root/channels -i "$srcs" --quiet
+        "${extraBuildFlags[@]}" -p /nix/var/nix/profiles/per-user/root/channels -i "$srcs" --quiet
 fi
 mkdir -m 0700 -p $mountPoint/root/.nix-defexpr
 ln -sfn /nix/var/nix/profiles/per-user/root/channels $mountPoint/root/.nix-defexpr/channels
-- 
GitLab


From ed5fbf00824bbb1ffa920418a900f1997cc07bf9 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 1 Oct 2013 13:53:56 +0200
Subject: [PATCH 4940/5331] Don't spam the user

---
 modules/programs/shell.nix | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/modules/programs/shell.nix b/modules/programs/shell.nix
index d5f43a86a94..679c4979dfa 100644
--- a/modules/programs/shell.nix
+++ b/modules/programs/shell.nix
@@ -29,7 +29,6 @@ in
         fi
 
         if ! test -L $HOME/.nix-profile; then
-            echo "creating $HOME/.nix-profile" >&2
             if test "$USER" != root; then
                 ln -s $NIX_USER_PROFILE_DIR/profile $HOME/.nix-profile
             else
@@ -40,7 +39,6 @@ in
 
         # Subscribe the root user to the NixOS channel by default.
         if [ "$USER" = root -a ! -e $HOME/.nix-channels ]; then
-            echo "creating $HOME/.nix-channels with nixos-unstable subscription" >&2
             echo "http://nixos.org/channels/nixos-unstable nixos" > $HOME/.nix-channels
         fi
 
@@ -53,7 +51,6 @@ in
 
         # Set up a default Nix expression from which to install stuff.
         if [ ! -e $HOME/.nix-defexpr -o -L $HOME/.nix-defexpr ]; then
-            echo "creating $HOME/.nix-defexpr" >&2
             rm -f $HOME/.nix-defexpr
             mkdir $HOME/.nix-defexpr
             if [ "$USER" != root ]; then
-- 
GitLab


From c9b4e6fda20d5751bfcb1666138fc518f1481aa8 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 1 Oct 2013 14:45:20 +0200
Subject: [PATCH 4941/5331] Don't disable D-Bus if environment.noXlibs is set

D-Bus cannot be disabled since systemd/logind depend on it.
---
 modules/config/no-x-libs.nix | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/modules/config/no-x-libs.nix b/modules/config/no-x-libs.nix
index f270a3fa431..77890b49c67 100644
--- a/modules/config/no-x-libs.nix
+++ b/modules/config/no-x-libs.nix
@@ -1,4 +1,4 @@
-{pkgs, config, ...}:
+{ config, pkgs, ... }:
 
 {
   options = {
@@ -12,11 +12,9 @@
       '';
     };
   };
+
   config = pkgs.lib.mkIf config.environment.noXlibs {
     programs.ssh.setXAuthLocation = false;
-    services = {
-      dbus.enable = false;
-    };
     fonts = {
       enableCoreFonts = false;
       enableFontConfig = false;
-- 
GitLab


From afdae663350377a22a9150101b266472a7332dfc Mon Sep 17 00:00:00 2001
From: Sander van der Burg <svanderburg@gmail.com>
Date: Wed, 2 Oct 2013 11:47:28 +0200
Subject: [PATCH 4942/5331] The testing interface does not take nixpkgs as a
 parameter anymore => fix this

---
 tests/run-in-machine.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/run-in-machine.nix b/tests/run-in-machine.nix
index b36c041d790..d3c3d294b73 100644
--- a/tests/run-in-machine.nix
+++ b/tests/run-in-machine.nix
@@ -1,8 +1,8 @@
-{ nixpkgs ? ../../nixpkgs
+{ nixpkgs ? <nixpkgs>
 , system ? builtins.currentSystem
 }:
 
-with import ../lib/testing.nix { inherit nixpkgs system; };
+with import ../lib/testing.nix { inherit system; };
 
 runInMachine {
   drv = (import nixpkgs { }).aterm;
-- 
GitLab


From 1c58fbe4a9850f03f58afcff12823931b4db881d Mon Sep 17 00:00:00 2001
From: Sander van der Burg <svanderburg@gmail.com>
Date: Wed, 2 Oct 2013 12:06:02 +0200
Subject: [PATCH 4943/5331] Fix run-in-machine testcase + add it to the tests

---
 release.nix              | 2 +-
 tests/default.nix        | 6 +++++-
 tests/run-in-machine.nix | 2 +-
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/release.nix b/release.nix
index 6d61b796359..ef5d9f4923d 100644
--- a/release.nix
+++ b/release.nix
@@ -241,7 +241,7 @@ in {
     let
       testsFor = system:
         mapAttrsRecursiveCond (x: !x ? test) (n: v: listToAttrs [(nameValuePair system v.test)])
-          (import ./tests { inherit system; });
+          (import ./tests { inherit nixpkgs system; });
     in fold recursiveUpdate {} (map testsFor systems);
 
 }
diff --git a/tests/default.nix b/tests/default.nix
index 3fc31cf0de9..35c03a3b708 100644
--- a/tests/default.nix
+++ b/tests/default.nix
@@ -1,4 +1,7 @@
-{ system ? builtins.currentSystem, minimal ? false }:
+{ nixpkgs ? <nixpkgs>
+, system ? builtins.currentSystem
+, minimal ? false
+}:
 
 with import ../lib/testing.nix { inherit system minimal; };
 
@@ -30,4 +33,5 @@ with import ../lib/testing.nix { inherit system minimal; };
   tomcat = makeTest (import ./tomcat.nix);
   trac = makeTest (import ./trac.nix);
   xfce = makeTest (import ./xfce.nix);
+  run-in-machine = import ./run-in-machine.nix { inherit nixpkgs system; };
 }
diff --git a/tests/run-in-machine.nix b/tests/run-in-machine.nix
index d3c3d294b73..75bd161ec9e 100644
--- a/tests/run-in-machine.nix
+++ b/tests/run-in-machine.nix
@@ -5,6 +5,6 @@
 with import ../lib/testing.nix { inherit system; };
 
 runInMachine {
-  drv = (import nixpkgs { }).aterm;
+  drv = (import nixpkgs { inherit system; }).aterm;
   machine = { config, pkgs, ... }: { services.sshd.enable = true; };
 }
-- 
GitLab


From c13041c65cdf9c188aa3ef4ee9f0f7d5e7603dc4 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 2 Oct 2013 12:29:07 +0200
Subject: [PATCH 4944/5331] Unify the two Memtest modules

This means we now have Memtest86+ on the installation CD.
---
 .../installer/cd-dvd/installation-cd-base.nix |  6 ++-
 modules/installer/cd-dvd/iso-image.nix        | 18 ++++----
 modules/installer/cd-dvd/memtest.nix          | 24 -----------
 modules/system/boot/loader/grub/grub.nix      | 18 ++++++++
 modules/system/boot/loader/grub/memtest.nix   | 41 ++++++++++---------
 5 files changed, 55 insertions(+), 52 deletions(-)
 delete mode 100644 modules/installer/cd-dvd/memtest.nix

diff --git a/modules/installer/cd-dvd/installation-cd-base.nix b/modules/installer/cd-dvd/installation-cd-base.nix
index 31f803bac32..999871ab074 100644
--- a/modules/installer/cd-dvd/installation-cd-base.nix
+++ b/modules/installer/cd-dvd/installation-cd-base.nix
@@ -7,8 +7,7 @@ with pkgs.lib;
 
 {
   imports =
-    [ ./memtest.nix
-      ./channel.nix
+    [ ./channel.nix
       ./iso-image.nix
 
       # Profiles of this basic installation CD.
@@ -32,4 +31,7 @@ with pkgs.lib;
   # To speed up installation a little bit, include the complete stdenv
   # in the Nix store on the CD.
   isoImage.storeContents = [ pkgs.stdenv pkgs.busybox ];
+
+  # Add Memtest86+ to the CD.
+  boot.loader.grub.memtest86 = true;
 }
diff --git a/modules/installer/cd-dvd/iso-image.nix b/modules/installer/cd-dvd/iso-image.nix
index fdc8e6a6f9f..9e4352e48bb 100644
--- a/modules/installer/cd-dvd/iso-image.nix
+++ b/modules/installer/cd-dvd/iso-image.nix
@@ -194,7 +194,7 @@ in
 
     boot.initrd.kernelModules = [ "loop" ];
 
-    boot.kernelModules = pkgs.stdenv.lib.optional config.isoImage.makeEfiBootable "efivars";
+    boot.kernelModules = optional config.isoImage.makeEfiBootable "efivars";
 
     # In stage 1, mount a tmpfs on top of / (the ISO image) and
     # /nix/store (the squashfs image) to make this a live CD.
@@ -235,7 +235,11 @@ in
       [ { source = grubImage;
           target = "/boot/grub/grub_eltorito";
         }
-        { source = pkgs.writeText "grub.cfg" grubCfg;
+        { source = pkgs.substituteAll  {
+            name = "grub.cfg";
+            src = pkgs.writeText "grub.cfg-in" grubCfg;
+            bootRoot = "/boot";
+          };
           target = "/boot/grub/grub.cfg";
         }
         { source = config.boot.kernelPackages.kernel + "/bzImage";
@@ -254,19 +258,19 @@ in
           target = "/nix-store.squashfs";
         }
         { # Quick hack: need a mount point for the store.
-          source = pkgs.runCommand "empty" {} "ensureDir $out";
+          source = pkgs.runCommand "empty" {} "mkdir -p $out";
           target = "/nix/store";
         }
-      ] ++ pkgs.stdenv.lib.optionals config.isoImage.makeEfiBootable [
+      ] ++ optionals config.isoImage.makeEfiBootable [
         { source = efiImg;
           target = "/boot/efi.img";
         }
-      ];
+      ] ++ mapAttrsToList (n: v: { source = v; target = "/boot/${n}"; }) config.boot.loader.grub.extraFiles;
 
     # The Grub menu.
     boot.loader.grub.extraEntries =
       ''
-        menuentry "NixOS Installer / Rescue" {
+        menuentry "NixOS ${config.system.nixosVersion} Installer" {
           linux /boot/bzImage init=${config.system.build.toplevel}/init ${toString config.boot.kernelParams}
           initrd /boot/initrd
         }
@@ -287,7 +291,7 @@ in
 
       bootable = true;
       bootImage = "/boot/grub/grub_eltorito";
-    } // pkgs.stdenv.lib.optionalAttrs config.isoImage.makeEfiBootable {
+    } // optionalAttrs config.isoImage.makeEfiBootable {
       efiBootable = true;
       efiBootImage = "boot/efi.img";
     });
diff --git a/modules/installer/cd-dvd/memtest.nix b/modules/installer/cd-dvd/memtest.nix
deleted file mode 100644
index 52b3d8af7c1..00000000000
--- a/modules/installer/cd-dvd/memtest.nix
+++ /dev/null
@@ -1,24 +0,0 @@
-# This module adds Memtest86 to the Grub boot menu on the CD.
-
-{config, pkgs, ...}:
-
-let
-
-  memtestPath = "/boot/memtest.bin";
-
-in
-
-{
-  boot.loader.grub.extraEntries =
-    ''
-      menuentry "Memtest86" {
-        linux16 ${memtestPath}
-      }
-    '';
-
-  isoImage.contents =
-    [ { source = pkgs.memtest86 + "/memtest.bin";
-        target = memtestPath;
-      }
-    ];
-}
diff --git a/modules/system/boot/loader/grub/grub.nix b/modules/system/boot/loader/grub/grub.nix
index 4208465d590..85845cd2cd9 100644
--- a/modules/system/boot/loader/grub/grub.nix
+++ b/modules/system/boot/loader/grub/grub.nix
@@ -150,6 +150,19 @@ in
         '';
       };
 
+      extraFiles = mkOption {
+        default = {};
+        example = literalExample ''
+          { "memtest.bin" = "${pkgs.memtest86plus}/memtest.bin"; }
+        '';
+        description = ''
+          A set of files to be copied to <filename>/boot</filename>.
+          Each attribute name denotes the destination file name in
+          <filename>/boot</filename>, while the corresponding
+          attribute value specifies the source file.
+        '';
+      };
+
       splashImage = mkOption {
         default =
           if cfg.version == 1
@@ -225,6 +238,11 @@ in
 
     environment.systemPackages = [ grub ];
 
+    boot.loader.grub.extraPrepareConfig =
+      concatStrings (mapAttrsToList (n: v: ''
+        ${pkgs.coreutils}/bin/cp -pf "${v}" "/boot/${n}"
+      '') config.boot.loader.grub.extraFiles);
+
   };
 
 }
diff --git a/modules/system/boot/loader/grub/memtest.nix b/modules/system/boot/loader/grub/memtest.nix
index 50c904e1be7..006d777b120 100644
--- a/modules/system/boot/loader/grub/memtest.nix
+++ b/modules/system/boot/loader/grub/memtest.nix
@@ -1,39 +1,42 @@
-# This module allows getting memtest86 in grub menus.
+# This module adds Memtest86+ to the GRUB boot menu.
 
-{config, pkgs, ...}:
+{ config, pkgs, ... }:
 
 with pkgs.lib;
+
 let
-  isEnabled = config.boot.loader.grub.memtest86;
   memtest86 = pkgs.memtest86plus;
 in
+
 {
   options = {
+
     boot.loader.grub.memtest86 = mkOption {
       default = false;
       type = types.bool;
       description = ''
         Make Memtest86+, a memory testing program, available from the
-        GRUB menu.
+        GRUB boot menu.
       '';
     };
   };
 
-  config.boot.loader.grub = mkIf isEnabled {
-    extraEntries = if config.boot.loader.grub.version == 2 then
-      ''
-        menuentry "${memtest86.name}" {
-          linux16 @bootRoot@/memtest.bin
-        }
-      ''
+  config = mkIf config.boot.loader.grub.memtest86 {
+
+    boot.loader.grub.extraEntries =
+      if config.boot.loader.grub.version == 2 then
+        ''
+          menuentry "Memtest86+" {
+            linux16 @bootRoot@/memtest.bin
+          }
+        ''
       else
-      ''
-        menuentry "${memtest86.name}"
-          linux16 @bootRoot@/memtest.bin
-      '';
-    extraPrepareConfig =
-      ''
-        ${pkgs.coreutils}/bin/cp ${memtest86}/memtest.bin /boot/memtest.bin;
-      '';
+        ''
+          menuentry "Memtest86+"
+            linux16 @bootRoot@/memtest.bin
+        '';
+
+    boot.loader.grub.extraFiles."memtest.bin" = "${memtest86}/memtest.bin";
+
   };
 }
-- 
GitLab


From 472aff23b7804d0ec5bd471aec166f686d8aa18d Mon Sep 17 00:00:00 2001
From: Sander van der Burg <svanderburg@gmail.com>
Date: Wed, 2 Oct 2013 13:25:51 +0200
Subject: [PATCH 4945/5331] Move run-in-machine test to a different place,
 because it does not conform to the other testcases' interface

---
 release.nix       | 4 +++-
 tests/default.nix | 1 -
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/release.nix b/release.nix
index ef5d9f4923d..63488d712bb 100644
--- a/release.nix
+++ b/release.nix
@@ -243,5 +243,7 @@ in {
         mapAttrsRecursiveCond (x: !x ? test) (n: v: listToAttrs [(nameValuePair system v.test)])
           (import ./tests { inherit nixpkgs system; });
     in fold recursiveUpdate {} (map testsFor systems);
-
+    
+    
+  run-in-machine-tests = pkgs.lib.genAttrs systems (system: import ./tests/run-in-machine.nix { inherit nixpkgs system; });
 }
diff --git a/tests/default.nix b/tests/default.nix
index 35c03a3b708..1a50d8e7e67 100644
--- a/tests/default.nix
+++ b/tests/default.nix
@@ -33,5 +33,4 @@ with import ../lib/testing.nix { inherit system minimal; };
   tomcat = makeTest (import ./tomcat.nix);
   trac = makeTest (import ./trac.nix);
   xfce = makeTest (import ./xfce.nix);
-  run-in-machine = import ./run-in-machine.nix { inherit nixpkgs system; };
 }
-- 
GitLab


From 17f519e590253bda3fc5a820fd3d6aa8ca5587e7 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 2 Oct 2013 14:11:46 +0200
Subject: [PATCH 4946/5331] Use "cp" instead of "rsync" for VirtualBox image
 generation

Rsync appears to use a lot of memory.  Fixes #266.
---
 modules/virtualisation/virtualbox-image.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/modules/virtualisation/virtualbox-image.nix b/modules/virtualisation/virtualbox-image.nix
index 21b2e114340..073db7b255e 100644
--- a/modules/virtualisation/virtualbox-image.nix
+++ b/modules/virtualisation/virtualbox-image.nix
@@ -6,7 +6,7 @@ with pkgs.lib;
   system.build.virtualBoxImage =
     pkgs.vmTools.runInLinuxVM (
       pkgs.runCommand "virtualbox-image"
-        { memSize = 2047;
+        { memSize = 512;
           preVM =
             ''
               mkdir $out
@@ -45,8 +45,9 @@ with pkgs.lib;
           # Copy all paths in the closure to the filesystem.
           storePaths=$(perl ${pkgs.pathsFromGraph} /tmp/xchg/closure)
 
+          echo "filling Nix store..."
           mkdir -p /mnt/nix/store
-          ${pkgs.rsync}/bin/rsync -av $storePaths /mnt/nix/store/
+          cp -prd $storePaths /mnt/nix/store/
 
           # Register the paths in the Nix database.
           printRegistration=1 perl ${pkgs.pathsFromGraph} /tmp/xchg/closure | \
-- 
GitLab


From 81d28e744c5dd40cfaf933e9d8a32335f3d8ab16 Mon Sep 17 00:00:00 2001
From: Rok Garbas <rok@garbas.si>
Date: Wed, 2 Oct 2013 15:14:35 +0200
Subject: [PATCH 4947/5331] zope2 service (plone)

---
 modules/misc/ids.nix                   |   1 +
 modules/module-list.nix                |   1 +
 modules/services/web-servers/zope2.nix | 241 +++++++++++++++++++++++++
 3 files changed, 243 insertions(+)
 create mode 100644 modules/services/web-servers/zope2.nix

diff --git a/modules/misc/ids.nix b/modules/misc/ids.nix
index d8ca11158dc..621571e1c33 100644
--- a/modules/misc/ids.nix
+++ b/modules/misc/ids.nix
@@ -100,6 +100,7 @@
       minidlna = 91;
       elasticsearch = 92;
       tcpcryptd = 93; # tcpcryptd uses a hard-coded uid. We patch it in Nixpkgs to match this choice.
+      zope2 = 94;
 
       # When adding a uid, make sure it doesn't match an existing gid.
 
diff --git a/modules/module-list.nix b/modules/module-list.nix
index 931b7988f8d..c0aab2e1804 100644
--- a/modules/module-list.nix
+++ b/modules/module-list.nix
@@ -213,6 +213,7 @@
   ./services/web-servers/nginx/default.nix
   ./services/web-servers/tomcat.nix
   ./services/web-servers/varnish/default.nix
+  ./services/web-servers/zope2.nix
   ./services/x11/desktop-managers/default.nix
   ./services/x11/display-managers/auto.nix
   ./services/x11/display-managers/default.nix
diff --git a/modules/services/web-servers/zope2.nix b/modules/services/web-servers/zope2.nix
new file mode 100644
index 00000000000..c92271e4660
--- /dev/null
+++ b/modules/services/web-servers/zope2.nix
@@ -0,0 +1,241 @@
+{ pkgs, config, ... }:
+
+with pkgs.lib;
+
+let
+
+  cfg = config.services.zope2;
+
+  zope2Opts = { name, config, ... }: {
+    options = {
+
+      name = mkOption {
+        default = "${name}";
+        type = types.string;
+        description = "The name of the zope2 instance. If undefined, the name of the attribute set will be used.";
+      };
+
+      threads = mkOption {
+        default = 2;
+        type = types.int;
+        description = "Specify the number of threads that Zope's ZServer web server will use to service requests. ";
+      };
+
+      http_address = mkOption {
+        default = "localhost:8080";
+        type = types.string;
+        description = "Give a port and adress for the HTTP server.";
+      };
+
+      user = mkOption {
+        default = "zope2";
+        type = types.string;
+        description = "The name of the effective user for the Zope process.";
+      };
+
+      extra = mkOption {
+        default =
+          ''
+          <zodb_db main>
+          mount-point /
+          cache-size 30000
+          <blobstorage>
+              blob-dir /var/lib/zope2/${name}/blobstorage
+              <filestorage>
+              path /var/lib/zope2/${name}/filestorage/Data.fs
+              </filestorage>
+          </blobstorage>
+          </zodb_db>
+          '';
+        type = types.string;
+        description = "Extra zope.conf";
+      };
+
+      packages = mkOption {
+        type = types.listOf types.package;
+        description = "The list of packages you want to make available to the zope2 instance.";
+      };
+
+    };
+  };
+
+in
+
+{
+
+  ###### interface
+
+  options = {
+
+    services.zope2.instances = mkOption {
+      default = {};
+      type = types.loaOf types.optionSet;
+      example = {
+        plone01 = {
+          http_address = "127.0.0.1:8080";
+          extra =
+            ''
+            <zodb_db main>
+            mount-point /
+            cache-size 30000
+            <blobstorage>
+                blob-dir /var/lib/zope2/plone01/blobstorage
+                <filestorage>
+                path /var/lib/zope2/plone01/filestorage/Data.fs
+                </filestorage>
+            </blobstorage>
+            </zodb_db>
+            '';
+
+        };
+      };
+      description = "zope2 instances to be created automaticaly by the system.";
+      options = [ zope2Opts ];
+    };
+  };
+
+  ###### implementation
+
+  config = mkIf (cfg.instances != {}) {
+
+    users.extraUsers.zope2.uid = config.ids.uids.zope2;
+
+    systemd.services =
+      let
+
+        createZope2Instance = opts: name:
+          let
+            interpreter = pkgs.writeScript "interpreter"
+              ''
+import sys
+
+_interactive = True
+if len(sys.argv) > 1:
+    _options, _args = __import__("getopt").getopt(sys.argv[1:], 'ic:m:')
+    _interactive = False
+    for (_opt, _val) in _options:
+        if _opt == '-i':
+            _interactive = True
+        elif _opt == '-c':
+            exec _val
+        elif _opt == '-m':
+            sys.argv[1:] = _args
+            _args = []
+            __import__("runpy").run_module(
+                 _val, {}, "__main__", alter_sys=True)
+
+    if _args:
+        sys.argv[:] = _args
+        __file__ = _args[0]
+        del _options, _args
+        execfile(__file__)
+
+if _interactive:
+    del _interactive
+    __import__("code").interact(banner="", local=globals())
+              '';
+            env = pkgs.buildEnv {
+              name = "zope2-${name}-env";
+              paths = [ pyenv pkgs.gnumake ];
+              postBuild =
+                ''
+                echo "#!$out/bin/python" > $out/bin/interpreter
+                cat ${interpreter} >> $out/bin/interpreter
+                '';
+            };
+            pyenv = pkgs.buildEnv {
+              name = "zope2-${name}-pyenv";
+              paths = [
+                pkgs.python27
+                pkgs.python27Packages.recursivePthLoader
+                pkgs.python27Packages."plone.recipe.zope2instance"
+              ] ++ attrValues pkgs.python27.modules
+                ++ opts.packages;
+            };
+            conf = pkgs.writeText "zope2-${name}-conf"
+              ''%define INSTANCEHOME ${env}
+instancehome $INSTANCEHOME
+%define CLIENTHOME /var/lib/zope2/${name}
+clienthome $CLIENTHOME
+
+debug-mode off
+security-policy-implementation C
+verbose-security off
+default-zpublisher-encoding utf-8
+zserver-threads ${toString opts.threads}
+effective-user ${opts.user}
+
+pid-filename /var/run/zope2-${name}.pid
+lock-filename /var/lock/zope2-${name}.lock
+python-check-interval 1000
+enable-product-installation off
+
+<environment>
+  zope_i18n_compile_mo_files false
+</environment>
+
+<eventlog>
+level INFO
+<logfile>
+    path /var/log/zope2/${name}.log
+    level INFO
+</logfile>
+</eventlog>
+
+<logger access>
+level WARN
+<logfile>
+    path /var/log/zope2/${name}-Z2.log
+    format %(message)s
+</logfile>
+</logger>
+
+<http-server>
+address ${opts.http_address}
+</http-server>
+
+<zodb_db temporary>
+<temporarystorage>
+    name temporary storage for sessioning
+</temporarystorage>
+mount-point /temp_folder
+container-class Products.TemporaryFolder.TemporaryContainer
+</zodb_db>
+
+${opts.extra}
+              '';
+            ctl = pkgs.writeScript "zope2-${name}-ctl"
+              ''#!${env}/bin/python
+
+import sys
+import plone.recipe.zope2instance.ctl
+
+if __name__ == '__main__':
+    sys.exit(plone.recipe.zope2instance.ctl.main(
+        ["-C", "${conf}"]
+        + sys.argv[1:]))'';
+          in {
+            description = "zope2 ${name} instance";
+            after = [ "network.target" ];  # with RelStorage also add "postgresql.service"
+            wantedBy = [ "multi-user.target" ];
+            path = opts.packages;
+            preStart =
+              ''
+              mkdir -p /var/log/zope2/
+              mkdir -p /var/lib/zope2/${name}/filestorage /var/lib/zope2/${name}/blobstorage
+              chown ${opts.user} /var/lib/zope2/${name} -R
+
+              ${ctl} adduser admin admin
+              '';
+
+            serviceConfig.Type = "forking";
+            serviceConfig.ExecStart = "${ctl} start";
+            serviceConfig.ExecStop = "${ctl} stop";
+            serviceConfig.ExecReload = "${ctl} restart";
+          };
+
+      in listToAttrs (map (name: { name = "zope2-${name}"; value = createZope2Instance (builtins.getAttr name cfg.instances) name; }) (builtins.attrNames cfg.instances));
+
+  };
+
+}
-- 
GitLab


From 46fd82a793aae484e8af1f8425f2719f4e911e65 Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Wed, 2 Oct 2013 15:13:40 +0200
Subject: [PATCH 4948/5331] Added dwb, a lightweight webbrowser written in C
 based on webkit and gtk.

---
 .../networking/browsers/dwb/default.nix       | 33 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 35 insertions(+)
 create mode 100644 pkgs/applications/networking/browsers/dwb/default.nix

diff --git a/pkgs/applications/networking/browsers/dwb/default.nix b/pkgs/applications/networking/browsers/dwb/default.nix
new file mode 100644
index 00000000000..dd0cbc4eb4e
--- /dev/null
+++ b/pkgs/applications/networking/browsers/dwb/default.nix
@@ -0,0 +1,33 @@
+{ stdenv, fetchgit, pkgconfig, makeWrapper, libsoup, webkit, gtk3, gnutls, json_c,
+  m4, glib_networking, gsettings_desktop_schemas }:
+
+stdenv.mkDerivation {
+  name = "dwb-0.1";
+
+  src = fetchgit {
+    url = "https://bitbucket.org/portix/dwb.git";
+    rev = "4a4c3adb8fbc680a0a2b8c9d3d3a4105c07c2514";
+    sha256 = "93e8f2c82609447d54a3c139c153cc66d37d3c6aa8922cd09717caa95fd8b1d5";
+  };
+
+  buildInputs = [ pkgconfig makeWrapper libsoup webkit gtk3 gnutls json_c m4  ];
+
+  # There are Xlib and gtk warnings therefore I have set Wno-error
+  preBuild=''
+    makeFlagsArray=(CPPFLAGS="-Wno-error" GTK=3 PREFIX=$out);
+  '';
+
+  postInstall=''
+    wrapProgram "$out/bin/dwb" \
+     --prefix GIO_EXTRA_MODULES : "${glib_networking}/lib/gio/modules" \
+     --prefix XDG_DATA_DIRS : "${gsettings_desktop_schemas}/share:$out/share"
+  '';
+
+  meta = {
+    homepage = http://portix.bitbucket.org/dwb/;
+    description = "A lightweight web browser based on the webkit web browser engine and the gtk toolkit";
+    platforms = with stdenv.lib.platforms; all;
+    maintainers = with stdenv.lib.maintainers; [pSub];
+    license = "GPL";
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d28109e7a27..1a377dc25bf 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7462,6 +7462,8 @@ let
 
   dvswitch = callPackage ../applications/video/dvswitch { };
 
+  dwb = callPackage ../applications/networking/browsers/dwb { };
+
   dwm = callPackage ../applications/window-managers/dwm {
     patches = config.dwm.patches or [];
   };
-- 
GitLab


From 742d6597cac218d0a5fe6030fdc270f7a83d70a0 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 15 Aug 2013 09:52:25 +0200
Subject: [PATCH 4949/5331] Re-implement python-wrapper with buildEnv.

The new wrapper creates an environment that contains all files from
Python and the extra libraries that have been specified. All files are
found at run-time by means of the $PYTHONHOME variable; the wrapper no
longer uses $PYTHONPATH.
---
 .../interpreters/python/wrapper.nix           | 26 +++++++++----------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/pkgs/development/interpreters/python/wrapper.nix b/pkgs/development/interpreters/python/wrapper.nix
index d2783ffb085..d928e96dd4b 100644
--- a/pkgs/development/interpreters/python/wrapper.nix
+++ b/pkgs/development/interpreters/python/wrapper.nix
@@ -1,23 +1,23 @@
-# Create a python that knows about additional python packages via
-# PYTHONPATH
+{ stdenv, python, buildEnv, makeWrapper, recursivePthLoader, extraLibs ? [] }:
 
-{ stdenv, python, makeWrapper, recursivePthLoader, extraLibs ? [] }:
+# Create a python executable that knows about additional packages.
 
-stdenv.mkDerivation {
+(buildEnv {
   name = "python-${python.version}-wrapper";
+  paths = extraLibs ++ [ python makeWrapper recursivePthLoader ];
+  ignoreCollisions = false;
 
-  propagatedBuildInputs = extraLibs ++ [ python makeWrapper recursivePthLoader ];
-
-  unpackPhase = "true";
-  installPhase = ''
+  postBuild = ''
+    . "${makeWrapper}/nix-support/setup-hook"
     mkdir -p "$out/bin"
-    for prg in 2to3 idle pdb pdb${python.majorVersion} pydoc python python-config python${python.majorVersion} python${python.majorVersion}-config smtpd.py; do
-      makeWrapper "$python/bin/$prg" "$out/bin/$prg" --suffix PYTHONPATH : "$PYTHONPATH"
+    cd "${python}/bin"
+    for prg in *; do
+      echo "$prg --> $out/bin/$prg"
+      rm -f "$out/bin/$prg"
+      makeWrapper "${python}/bin/$prg" "$out/bin/$prg" --set PYTHONHOME "$out"
     done
-    ensureDir "$out/share"
-    ln -s "$python/share/man" "$out/share/man"
   '';
-
+}) // {
   inherit python;
   inherit (python) meta;
 }
-- 
GitLab


From 35a12fb72c7914e1ed48bf45de793ee6035e990c Mon Sep 17 00:00:00 2001
From: Sander van der Burg <svanderburg@gmail.com>
Date: Thu, 3 Oct 2013 11:45:53 +0200
Subject: [PATCH 4950/5331] Added istanbul and selenium nodejs components +
 update other nodejs packages

---
 pkgs/top-level/node-packages-generated.nix | 427 +++++++++++++++------
 pkgs/top-level/node-packages.json          |   7 +-
 2 files changed, 325 insertions(+), 109 deletions(-)

diff --git a/pkgs/top-level/node-packages-generated.nix b/pkgs/top-level/node-packages-generated.nix
index 4cc473fe29a..4e3898f61b6 100644
--- a/pkgs/top-level/node-packages-generated.nix
+++ b/pkgs/top-level/node-packages-generated.nix
@@ -297,11 +297,11 @@
     passthru.names = [ "apparatus" ];
   };
   full."archiver"."~0.4.6" = lib.makeOverridable self.buildNodePackage {
-    name = "archiver-0.4.9";
+    name = "archiver-0.4.10";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/archiver/-/archiver-0.4.9.tgz";
-        sha1 = "7c8a5c8f186497b430698855b1a827af81ce94f1";
+        url = "http://registry.npmjs.org/archiver/-/archiver-0.4.10.tgz";
+        sha1 = "df0feac8f1d1295e5eceb3a205559072d21f4747";
       })
     ];
     buildInputs =
@@ -432,6 +432,22 @@
     ];
     passthru.names = [ "assert-plus" ];
   };
+  full."assertion-error"."1.0.0" = lib.makeOverridable self.buildNodePackage {
+    name = "assertion-error-1.0.0";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/assertion-error/-/assertion-error-1.0.0.tgz";
+        sha1 = "c7f85438fdd466bc7ca16ab90c81513797a5d23b";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."assertion-error"."1.0.0" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "assertion-error" ];
+  };
   full."async"."*" = lib.makeOverridable self.buildNodePackage {
     name = "async-0.2.9";
     src = [
@@ -610,11 +626,11 @@
     passthru.names = [ "async" ];
   };
   full."aws-sdk"."*" = lib.makeOverridable self.buildNodePackage {
-    name = "aws-sdk-1.6.0";
+    name = "aws-sdk-1.7.0";
     src = [
       (self.patchLatest {
-        url = "http://registry.npmjs.org/aws-sdk/-/aws-sdk-1.6.0.tgz";
-        sha1 = "7541e3057a0a7bf9d749ddf2c10fffc7c24997ed";
+        url = "http://registry.npmjs.org/aws-sdk/-/aws-sdk-1.7.0.tgz";
+        sha1 = "d30b478b04d5faf15c02d17faa9968ec1b5b1149";
       })
     ];
     buildInputs =
@@ -629,11 +645,11 @@
   };
   "aws-sdk" = self.full."aws-sdk"."*";
   full."aws-sdk".">=1.2.0 <2" = lib.makeOverridable self.buildNodePackage {
-    name = "aws-sdk-1.6.0";
+    name = "aws-sdk-1.7.0";
     src = [
       (self.patchLatest {
-        url = "http://registry.npmjs.org/aws-sdk/-/aws-sdk-1.6.0.tgz";
-        sha1 = "7541e3057a0a7bf9d749ddf2c10fffc7c24997ed";
+        url = "http://registry.npmjs.org/aws-sdk/-/aws-sdk-1.7.0.tgz";
+        sha1 = "d30b478b04d5faf15c02d17faa9968ec1b5b1149";
       })
     ];
     buildInputs =
@@ -881,11 +897,11 @@
     passthru.names = [ "boom" ];
   };
   full."bower"."*" = lib.makeOverridable self.buildNodePackage {
-    name = "bower-1.2.6";
+    name = "bower-1.2.7";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/bower/-/bower-1.2.6.tgz";
-        sha1 = "a8b7bd344601554821957b9ab62fb436febc674d";
+        url = "http://registry.npmjs.org/bower/-/bower-1.2.7.tgz";
+        sha1 = "5b0505c8192bd61a752a7cf8b718d1b3054cd554";
       })
     ];
     buildInputs =
@@ -909,7 +925,7 @@
       self.full."inquirer"."~0.3.0"
       self.full."junk"."~0.2.0"
       self.full."mkdirp"."~0.3.5"
-      self.full."mout"."~0.6.0"
+      self.full."mout"."~0.7.0"
       self.full."nopt"."~2.1.1"
       self.full."lru-cache"."~2.3.0"
       self.full."open"."~0.0.3"
@@ -935,11 +951,11 @@
   };
   "bower" = self.full."bower"."*";
   full."bower".">=0.9.0" = lib.makeOverridable self.buildNodePackage {
-    name = "bower-1.2.6";
+    name = "bower-1.2.7";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/bower/-/bower-1.2.6.tgz";
-        sha1 = "a8b7bd344601554821957b9ab62fb436febc674d";
+        url = "http://registry.npmjs.org/bower/-/bower-1.2.7.tgz";
+        sha1 = "5b0505c8192bd61a752a7cf8b718d1b3054cd554";
       })
     ];
     buildInputs =
@@ -963,7 +979,7 @@
       self.full."inquirer"."~0.3.0"
       self.full."junk"."~0.2.0"
       self.full."mkdirp"."~0.3.5"
-      self.full."mout"."~0.6.0"
+      self.full."mout"."~0.7.0"
       self.full."nopt"."~2.1.1"
       self.full."lru-cache"."~2.3.0"
       self.full."open"."~0.0.3"
@@ -1079,11 +1095,11 @@
     passthru.names = [ "bower-logger" ];
   };
   full."bower-registry-client"."~0.1.4" = lib.makeOverridable self.buildNodePackage {
-    name = "bower-registry-client-0.1.4";
+    name = "bower-registry-client-0.1.5";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/bower-registry-client/-/bower-registry-client-0.1.4.tgz";
-        sha1 = "334669747ca0b60fdda24b0de1f4c3057429813c";
+        url = "http://registry.npmjs.org/bower-registry-client/-/bower-registry-client-0.1.5.tgz";
+        sha1 = "1c64d70bfca833c95121ffc23da48a54527912d3";
       })
     ];
     buildInputs =
@@ -1345,6 +1361,25 @@
     ];
     passthru.names = [ "cardinal" ];
   };
+  full."chai"."*" = lib.makeOverridable self.buildNodePackage {
+    name = "chai-1.8.0";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/chai/-/chai-1.8.0.tgz";
+        sha1 = "1f7accbe91e2e71a08d8208b31bbbdc6862699ac";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."chai"."*" or []);
+    deps = [
+      self.full."assertion-error"."1.0.0"
+      self.full."deep-eql"."0.1.2"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "chai" ];
+  };
+  "chai" = self.full."chai"."*";
   full."chainsaw"."~0.1.0" = lib.makeOverridable self.buildNodePackage {
     name = "chainsaw-0.1.0";
     src = [
@@ -1574,11 +1609,11 @@
     passthru.names = [ "chownr" ];
   };
   full."clean-css"."~1.1.1" = lib.makeOverridable self.buildNodePackage {
-    name = "clean-css-1.1.1";
+    name = "clean-css-1.1.2";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/clean-css/-/clean-css-1.1.1.tgz";
-        sha1 = "c52afc4ea34c4f10392f0f350eba101ef17a8c51";
+        url = "http://registry.npmjs.org/clean-css/-/clean-css-1.1.2.tgz";
+        sha1 = "ea0c50151c559956c2364d86077eb30d28ff4e9a";
       })
     ];
     buildInputs =
@@ -2866,6 +2901,23 @@
     ];
     passthru.names = [ "debug" ];
   };
+  full."deep-eql"."0.1.2" = lib.makeOverridable self.buildNodePackage {
+    name = "deep-eql-0.1.2";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/deep-eql/-/deep-eql-0.1.2.tgz";
+        sha1 = "b54feed3473a6448fbc198be6a6eca9b95d9c58a";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."deep-eql"."0.1.2" or []);
+    deps = [
+      self.full."type-detect"."0.1.0"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "deep-eql" ];
+  };
   full."deep-equal"."*" = lib.makeOverridable self.buildNodePackage {
     name = "deep-equal-0.0.0";
     src = [
@@ -2930,22 +2982,6 @@
     ];
     passthru.names = [ "delayed-stream" ];
   };
-  full."dequeue"."1.0.3" = lib.makeOverridable self.buildNodePackage {
-    name = "dequeue-1.0.3";
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/dequeue/-/dequeue-1.0.3.tgz";
-        sha1 = "30b8f4da2fc240951a15d31b35283e29b2de8978";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."dequeue"."1.0.3" or []);
-    deps = [
-    ];
-    peerDependencies = [
-    ];
-    passthru.names = [ "dequeue" ];
-  };
   full."di"."~0.0.1" = lib.makeOverridable self.buildNodePackage {
     name = "di-0.0.1";
     src = [
@@ -3864,6 +3900,23 @@
     ];
     passthru.names = [ "flatiron" ];
   };
+  full."follow-redirects"."0.0.3" = lib.makeOverridable self.buildNodePackage {
+    name = "follow-redirects-0.0.3";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/follow-redirects/-/follow-redirects-0.0.3.tgz";
+        sha1 = "6ce67a24db1fe13f226c1171a72a7ef2b17b8f65";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."follow-redirects"."0.0.3" or []);
+    deps = [
+      self.full."underscore"."*"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "follow-redirects" ];
+  };
   full."forEachAsync"."~2.2" = lib.makeOverridable self.buildNodePackage {
     name = "forEachAsync-2.2.0";
     src = [
@@ -3943,18 +3996,18 @@
     passthru.names = [ "forever-agent" ];
   };
   full."forever-monitor"."*" = lib.makeOverridable self.buildNodePackage {
-    name = "forever-monitor-1.2.2";
+    name = "forever-monitor-1.2.3";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/forever-monitor/-/forever-monitor-1.2.2.tgz";
-        sha1 = "c1ad6c6ab837a89fa2d47bb439727ca968235684";
+        url = "http://registry.npmjs.org/forever-monitor/-/forever-monitor-1.2.3.tgz";
+        sha1 = "b27ac3acb6fdcc7315d6cd85830f2d004733028b";
       })
     ];
     buildInputs =
       (self.nativeDeps."forever-monitor"."*" or []);
     deps = [
       self.full."broadway"."0.2.x"
-      self.full."minimatch"."0.0.x"
+      self.full."minimatch"."0.2.x"
       self.full."pkginfo"."0.x.x"
       self.full."ps-tree"."0.0.x"
       self.full."watch"."0.5.x"
@@ -4412,11 +4465,11 @@
     passthru.names = [ "generator-mocha" ];
   };
   full."generator-webapp"."*" = lib.makeOverridable self.buildNodePackage {
-    name = "generator-webapp-0.4.2";
+    name = "generator-webapp-0.4.3";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/generator-webapp/-/generator-webapp-0.4.2.tgz";
-        sha1 = "41a856064a00ad952f9cbca79b176da9ab0aa969";
+        url = "http://registry.npmjs.org/generator-webapp/-/generator-webapp-0.4.3.tgz";
+        sha1 = "c0ad11753e0f4403d1d7fad1b298e52bfa5e231b";
       })
     ];
     buildInputs =
@@ -5585,7 +5638,7 @@
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/i18next/-/i18next-1.7.1.tgz";
-        sha1 = "642c920e1b1a49d6212715a3d39ee49bf5129f11";
+        sha1 = "39616a1fe88258edbdd0da918b9ee49a1bd1e124";
       })
     ];
     buildInputs =
@@ -5835,11 +5888,11 @@
     passthru.names = [ "inquirer" ];
   };
   full."inquirer"."~0.3.0" = lib.makeOverridable self.buildNodePackage {
-    name = "inquirer-0.3.3";
+    name = "inquirer-0.3.4";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/inquirer/-/inquirer-0.3.3.tgz";
-        sha1 = "476dfc4b32c24010f4fdf5479dc59368264f2896";
+        url = "http://registry.npmjs.org/inquirer/-/inquirer-0.3.4.tgz";
+        sha1 = "af4673b3e1cb746b74d5dafe14ef55c3c1bf7222";
       })
     ];
     buildInputs =
@@ -5855,11 +5908,11 @@
     passthru.names = [ "inquirer" ];
   };
   full."inquirer"."~0.3.1" = lib.makeOverridable self.buildNodePackage {
-    name = "inquirer-0.3.3";
+    name = "inquirer-0.3.4";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/inquirer/-/inquirer-0.3.3.tgz";
-        sha1 = "476dfc4b32c24010f4fdf5479dc59368264f2896";
+        url = "http://registry.npmjs.org/inquirer/-/inquirer-0.3.4.tgz";
+        sha1 = "af4673b3e1cb746b74d5dafe14ef55c3c1bf7222";
       })
     ];
     buildInputs =
@@ -5912,7 +5965,7 @@
     ];
     passthru.names = [ "intersect" ];
   };
-  full."ironhorse"."*" = lib.makeOverridable self.buildNodePackage {
+  full."ironhorse"."0.0.8" = lib.makeOverridable self.buildNodePackage {
     name = "ironhorse-0.0.8";
     src = [
       (fetchurl {
@@ -5921,7 +5974,7 @@
       })
     ];
     buildInputs =
-      (self.nativeDeps."ironhorse"."*" or []);
+      (self.nativeDeps."ironhorse"."0.0.8" or []);
     deps = [
       self.full."underscore"."~1.5.2"
       self.full."winston"."*"
@@ -5944,7 +5997,7 @@
     ];
     passthru.names = [ "ironhorse" ];
   };
-  "ironhorse" = self.full."ironhorse"."*";
+  "ironhorse" = self.full."ironhorse"."0.0.8";
   full."is-promise"."~1" = lib.makeOverridable self.buildNodePackage {
     name = "is-promise-1.0.0";
     src = [
@@ -5977,6 +6030,34 @@
     ];
     passthru.names = [ "isbinaryfile" ];
   };
+  full."istanbul"."*" = lib.makeOverridable self.buildNodePackage {
+    name = "istanbul-0.1.44";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/istanbul/-/istanbul-0.1.44.tgz";
+        sha1 = "7ea1d55e34234e7b7d8f2f61cceb29b59439d983";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."istanbul"."*" or []);
+    deps = [
+      self.full."esprima"."1.0.x"
+      self.full."escodegen"."0.0.23"
+      self.full."handlebars"."1.0.x"
+      self.full."mkdirp"."0.3.x"
+      self.full."nopt"."2.1.x"
+      self.full."fileset"."0.1.x"
+      self.full."which"."1.0.x"
+      self.full."async"."0.2.x"
+      self.full."abbrev"."1.0.x"
+      self.full."wordwrap"."0.0.x"
+      self.full."resolve"."0.5.x"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "istanbul" ];
+  };
+  "istanbul" = self.full."istanbul"."*";
   full."istanbul"."~0.1.41" = lib.makeOverridable self.buildNodePackage {
     name = "istanbul-0.1.44";
     src = [
@@ -6088,11 +6169,11 @@
   };
   "jayschema" = self.full."jayschema"."*";
   full."js-yaml"."*" = lib.makeOverridable self.buildNodePackage {
-    name = "js-yaml-2.1.0";
+    name = "js-yaml-2.1.1";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/js-yaml/-/js-yaml-2.1.0.tgz";
-        sha1 = "a55a6e4706b01d06326259a6f4bfc42e6ae38b1f";
+        url = "http://registry.npmjs.org/js-yaml/-/js-yaml-2.1.1.tgz";
+        sha1 = "574095ef2253694313a6c2b261c7b6929a9603b7";
       })
     ];
     buildInputs =
@@ -6159,11 +6240,11 @@
     passthru.names = [ "js-yaml" ];
   };
   full."js-yaml"."~2.1.0" = lib.makeOverridable self.buildNodePackage {
-    name = "js-yaml-2.1.0";
+    name = "js-yaml-2.1.1";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/js-yaml/-/js-yaml-2.1.0.tgz";
-        sha1 = "a55a6e4706b01d06326259a6f4bfc42e6ae38b1f";
+        url = "http://registry.npmjs.org/js-yaml/-/js-yaml-2.1.1.tgz";
+        sha1 = "574095ef2253694313a6c2b261c7b6929a9603b7";
       })
     ];
     buildInputs =
@@ -7095,18 +7176,17 @@
     passthru.names = [ "log-driver" ];
   };
   full."log4js"."~0.6.3" = lib.makeOverridable self.buildNodePackage {
-    name = "log4js-0.6.8";
+    name = "log4js-0.6.9";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/log4js/-/log4js-0.6.8.tgz";
-        sha1 = "86baebdcaf8ef989295d65a07773f7e32093d0b6";
+        url = "http://registry.npmjs.org/log4js/-/log4js-0.6.9.tgz";
+        sha1 = "2e327189c1c0dec17448ec5255f58cd0fddf4596";
       })
     ];
     buildInputs =
       (self.nativeDeps."log4js"."~0.6.3" or []);
     deps = [
       self.full."async"."0.1.15"
-      self.full."dequeue"."1.0.3"
       self.full."semver"."~1.1.4"
       self.full."readable-stream"."~1.0.2"
     ];
@@ -7227,11 +7307,11 @@
     passthru.names = [ "lru-cache" ];
   };
   full."mailcomposer".">= 0.1.27" = lib.makeOverridable self.buildNodePackage {
-    name = "mailcomposer-0.2.1";
+    name = "mailcomposer-0.2.2";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/mailcomposer/-/mailcomposer-0.2.1.tgz";
-        sha1 = "89e1326147fb2c222feb931b40e98b6be133f14a";
+        url = "http://registry.npmjs.org/mailcomposer/-/mailcomposer-0.2.2.tgz";
+        sha1 = "ce93bdea7cb51e60eb76491b6a64c39f382c20e5";
       })
     ];
     buildInputs =
@@ -7510,6 +7590,24 @@
     ];
     passthru.names = [ "minimatch" ];
   };
+  full."minimatch"."0.2.x" = lib.makeOverridable self.buildNodePackage {
+    name = "minimatch-0.2.12";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/minimatch/-/minimatch-0.2.12.tgz";
+        sha1 = "ea82a012ac662c7ddfaa144f1c147e6946f5dafb";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."minimatch"."0.2.x" or []);
+    deps = [
+      self.full."lru-cache"."2"
+      self.full."sigmund"."~1.0.0"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "minimatch" ];
+  };
   full."minimatch"."0.x" = lib.makeOverridable self.buildNodePackage {
     name = "minimatch-0.2.12";
     src = [
@@ -7889,6 +7987,23 @@
     passthru.names = [ "mocha" ];
   };
   "mocha" = self.full."mocha"."*";
+  full."mocha-unfunk-reporter"."*" = lib.makeOverridable self.buildNodePackage {
+    name = "mocha-unfunk-reporter-0.2.3";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/mocha-unfunk-reporter/-/mocha-unfunk-reporter-0.2.3.tgz";
+        sha1 = "41c2aa001dc44eef80d073404728d2e4d4a09c90";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."mocha-unfunk-reporter"."*" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "mocha-unfunk-reporter" ];
+  };
+  "mocha-unfunk-reporter" = self.full."mocha-unfunk-reporter"."*";
   full."moment"."2.0.0" = lib.makeOverridable self.buildNodePackage {
     name = "moment-2.0.0";
     src = [
@@ -7993,11 +8108,11 @@
     passthru.names = [ "mongodb" ];
   };
   full."mongoose"."*" = lib.makeOverridable self.buildNodePackage {
-    name = "mongoose-3.7.3";
+    name = "mongoose-3.7.4";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/mongoose/-/mongoose-3.7.3.tgz";
-        sha1 = "32c707bd919db3ae534326042be0b9ef9ee7ff57";
+        url = "http://registry.npmjs.org/mongoose/-/mongoose-3.7.4.tgz";
+        sha1 = "5ed8cdbc91c92b18ab49ac3526c7ac5264c7b292";
       })
     ];
     buildInputs =
@@ -8011,7 +8126,7 @@
       self.full."mpromise"."0.3.0"
       self.full."mpath"."0.1.1"
       self.full."regexp-clone"."0.0.1"
-      self.full."mquery"."0.3.1"
+      self.full."mquery"."0.3.2"
     ];
     peerDependencies = [
     ];
@@ -8082,11 +8197,11 @@
     passthru.names = [ "mongoose-lifecycle" ];
   };
   full."mongoose-schema-extend"."*" = lib.makeOverridable self.buildNodePackage {
-    name = "mongoose-schema-extend-0.1.4";
+    name = "mongoose-schema-extend-0.1.5";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/mongoose-schema-extend/-/mongoose-schema-extend-0.1.4.tgz";
-        sha1 = "9f61b2abba5352fcd3d7b1193ee4b4d9f2a83804";
+        url = "http://registry.npmjs.org/mongoose-schema-extend/-/mongoose-schema-extend-0.1.5.tgz";
+        sha1 = "d2ab3d2005033daaa215a806bbd3f6637c9c96c3";
       })
     ];
     buildInputs =
@@ -8132,6 +8247,22 @@
     ];
     passthru.names = [ "mout" ];
   };
+  full."mout"."~0.7.0" = lib.makeOverridable self.buildNodePackage {
+    name = "mout-0.7.1";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/mout/-/mout-0.7.1.tgz";
+        sha1 = "218de2b0880b220d99f4fbaee3fc0c3a5310bda8";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."mout"."~0.7.0" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "mout" ];
+  };
   full."mpath"."0.1.1" = lib.makeOverridable self.buildNodePackage {
     name = "mpath-0.1.1";
     src = [
@@ -8182,16 +8313,16 @@
     ];
     passthru.names = [ "mpromise" ];
   };
-  full."mquery"."0.3.1" = lib.makeOverridable self.buildNodePackage {
-    name = "mquery-0.3.1";
+  full."mquery"."0.3.2" = lib.makeOverridable self.buildNodePackage {
+    name = "mquery-0.3.2";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/mquery/-/mquery-0.3.1.tgz";
-        sha1 = "b67051685b3ec71c9dc6d0ca41385297325c4c45";
+        url = "http://registry.npmjs.org/mquery/-/mquery-0.3.2.tgz";
+        sha1 = "074cb82c51ec1b15897d8afb80a7b3567a2f8eca";
       })
     ];
     buildInputs =
-      (self.nativeDeps."mquery"."0.3.1" or []);
+      (self.nativeDeps."mquery"."0.3.2" or []);
     deps = [
       self.full."sliced"."0.0.5"
       self.full."debug"."0.7.0"
@@ -8919,11 +9050,11 @@
     passthru.names = [ "nopt" ];
   };
   full."normalize-package-data"."~0.2" = lib.makeOverridable self.buildNodePackage {
-    name = "normalize-package-data-0.2.4";
+    name = "normalize-package-data-0.2.6";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/normalize-package-data/-/normalize-package-data-0.2.4.tgz";
-        sha1 = "75e20353f342759e0fa8790c87d9935e7563e528";
+        url = "http://registry.npmjs.org/normalize-package-data/-/normalize-package-data-0.2.6.tgz";
+        sha1 = "830bda1412f7ccae09b903fc080edbcdbb0947c0";
       })
     ];
     buildInputs =
@@ -9910,11 +10041,11 @@
     passthru.names = [ "pause" ];
   };
   full."phantomjs"."~1.9" = lib.makeOverridable self.buildNodePackage {
-    name = "phantomjs-1.9.2-1";
+    name = "phantomjs-1.9.2-2";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/phantomjs/-/phantomjs-1.9.2-1.tgz";
-        sha1 = "698d3fab823320a32516c27a1055c36e8ee25df3";
+        url = "http://registry.npmjs.org/phantomjs/-/phantomjs-1.9.2-2.tgz";
+        sha1 = "256228800bc18292395eb0f54b14cd42c8093889";
       })
     ];
     buildInputs =
@@ -9932,6 +10063,29 @@
     ];
     passthru.names = [ "phantomjs" ];
   };
+  full."phantomjs"."~1.9.1-2" = lib.makeOverridable self.buildNodePackage {
+    name = "phantomjs-1.9.2-2";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/phantomjs/-/phantomjs-1.9.2-2.tgz";
+        sha1 = "256228800bc18292395eb0f54b14cd42c8093889";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."phantomjs"."~1.9.1-2" or []);
+    deps = [
+      self.full."adm-zip"."0.2.1"
+      self.full."kew"."~0.1.7"
+      self.full."ncp"."0.4.2"
+      self.full."npmconf"."0.0.24"
+      self.full."mkdirp"."0.3.5"
+      self.full."rimraf"."~2.0.2"
+      self.full."which"."~1.0.5"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "phantomjs" ];
+  };
   full."pkginfo"."0.2.x" = lib.makeOverridable self.buildNodePackage {
     name = "pkginfo-0.2.3";
     src = [
@@ -10700,11 +10854,11 @@
     passthru.names = [ "redeyed" ];
   };
   full."redis"."*" = lib.makeOverridable self.buildNodePackage {
-    name = "redis-0.8.4";
+    name = "redis-0.8.5";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/redis/-/redis-0.8.4.tgz";
-        sha1 = "14609f26414e211c31e3cd07dc79b04bf9ff1980";
+        url = "http://registry.npmjs.org/redis/-/redis-0.8.5.tgz";
+        sha1 = "ffacd223164fc506b50e5b836133162588691106";
       })
     ];
     buildInputs =
@@ -10750,11 +10904,11 @@
     passthru.names = [ "redis" ];
   };
   full."redis".">= 0.6.6" = lib.makeOverridable self.buildNodePackage {
-    name = "redis-0.8.4";
+    name = "redis-0.8.5";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/redis/-/redis-0.8.4.tgz";
-        sha1 = "14609f26414e211c31e3cd07dc79b04bf9ff1980";
+        url = "http://registry.npmjs.org/redis/-/redis-0.8.5.tgz";
+        sha1 = "ffacd223164fc506b50e5b836133162588691106";
       })
     ];
     buildInputs =
@@ -11536,6 +11690,23 @@
     ];
     passthru.names = [ "sax" ];
   };
+  full."selenium-webdriver"."*" = lib.makeOverridable self.buildNodePackage {
+    name = "selenium-webdriver-2.35.2";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/selenium-webdriver/-/selenium-webdriver-2.35.2.tgz";
+        sha1 = "e6bbb6ff26ea61224173caa006a8eb87d6a94c2d";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."selenium-webdriver"."*" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "selenium-webdriver" ];
+  };
+  "selenium-webdriver" = self.full."selenium-webdriver"."*";
   full."semver"."*" = lib.makeOverridable self.buildNodePackage {
     name = "semver-2.1.0";
     src = [
@@ -12387,11 +12558,11 @@
   };
   "sockjs" = self.full."sockjs"."*";
   full."source-map"."*" = lib.makeOverridable self.buildNodePackage {
-    name = "source-map-0.1.29";
+    name = "source-map-0.1.30";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/source-map/-/source-map-0.1.29.tgz";
-        sha1 = "39d571a0988fb7a548a676c4de72db78914d173c";
+        url = "http://registry.npmjs.org/source-map/-/source-map-0.1.30.tgz";
+        sha1 = "182726b50671d8fccaefc5ec35bf2a65c1956afb";
       })
     ];
     buildInputs =
@@ -12405,11 +12576,11 @@
   };
   "source-map" = self.full."source-map"."*";
   full."source-map".">= 0.1.2" = lib.makeOverridable self.buildNodePackage {
-    name = "source-map-0.1.29";
+    name = "source-map-0.1.30";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/source-map/-/source-map-0.1.29.tgz";
-        sha1 = "39d571a0988fb7a548a676c4de72db78914d173c";
+        url = "http://registry.npmjs.org/source-map/-/source-map-0.1.30.tgz";
+        sha1 = "182726b50671d8fccaefc5ec35bf2a65c1956afb";
       })
     ];
     buildInputs =
@@ -12422,11 +12593,11 @@
     passthru.names = [ "source-map" ];
   };
   full."source-map"."~0.1.7" = lib.makeOverridable self.buildNodePackage {
-    name = "source-map-0.1.29";
+    name = "source-map-0.1.30";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/source-map/-/source-map-0.1.29.tgz";
-        sha1 = "39d571a0988fb7a548a676c4de72db78914d173c";
+        url = "http://registry.npmjs.org/source-map/-/source-map-0.1.30.tgz";
+        sha1 = "182726b50671d8fccaefc5ec35bf2a65c1956afb";
       })
     ];
     buildInputs =
@@ -13114,6 +13285,22 @@
     ];
     passthru.names = [ "tunnel-agent" ];
   };
+  full."type-detect"."0.1.0" = lib.makeOverridable self.buildNodePackage {
+    name = "type-detect-0.1.0";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/type-detect/-/type-detect-0.1.0.tgz";
+        sha1 = "81ed3ab764cd5139388b67d052eb01610edc1a57";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."type-detect"."0.1.0" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "type-detect" ];
+  };
   full."uglify-js"."1.2.5" = lib.makeOverridable self.buildNodePackage {
     name = "uglify-js-1.2.5";
     src = [
@@ -13496,11 +13683,11 @@
     passthru.names = [ "unzip" ];
   };
   full."update-notifier"."~0.1.3" = lib.makeOverridable self.buildNodePackage {
-    name = "update-notifier-0.1.5";
+    name = "update-notifier-0.1.6";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/update-notifier/-/update-notifier-0.1.5.tgz";
-        sha1 = "adf98004c29bf521f242c2970c471f310b353b44";
+        url = "http://registry.npmjs.org/update-notifier/-/update-notifier-0.1.6.tgz";
+        sha1 = "c814e7eabaadaba789f75c3f652366db8efec471";
       })
     ];
     buildInputs =
@@ -13755,11 +13942,11 @@
     passthru.names = [ "verror" ];
   };
   full."view-helpers"."*" = lib.makeOverridable self.buildNodePackage {
-    name = "view-helpers-0.1.2";
+    name = "view-helpers-0.1.3";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/view-helpers/-/view-helpers-0.1.2.tgz";
-        sha1 = "20643e9f50d00cf46da754dc934d791d4f6e3bb2";
+        url = "http://registry.npmjs.org/view-helpers/-/view-helpers-0.1.3.tgz";
+        sha1 = "97b061548a753eff5b432e6c1598cb10417bff02";
       })
     ];
     buildInputs =
@@ -13861,6 +14048,30 @@
     ];
     passthru.names = [ "wd" ];
   };
+  full."webdrvr"."*" = lib.makeOverridable self.buildNodePackage {
+    name = "webdrvr-2.35.0-6";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/webdrvr/-/webdrvr-2.35.0-6.tgz";
+        sha1 = "1dffadb2960c82c7b9baba6512cd6f35f6e8d706";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."webdrvr"."*" or []);
+    deps = [
+      self.full."adm-zip"."~0.4.3"
+      self.full."kew"."~0.1.7"
+      self.full."mkdirp"."~0.3.5"
+      self.full."npmconf"."~0.1.2"
+      self.full."phantomjs"."~1.9.1-2"
+      self.full."tmp"."~0.0.20"
+      self.full."follow-redirects"."0.0.3"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "webdrvr" ];
+  };
+  "webdrvr" = self.full."webdrvr"."*";
   full."websocket-driver".">=0.3.0" = lib.makeOverridable self.buildNodePackage {
     name = "websocket-driver-0.3.0";
     src = [
diff --git a/pkgs/top-level/node-packages.json b/pkgs/top-level/node-packages.json
index b559b56376e..c6b17ae902e 100644
--- a/pkgs/top-level/node-packages.json
+++ b/pkgs/top-level/node-packages.json
@@ -67,7 +67,7 @@
 , "gridfs-stream"
 , "tar"
 , "flatiron"
-, "ironhorse"
+, { "ironhorse": "0.0.8" }
 , "fs-walk"
 , "yo"
 , "generator-webapp"
@@ -97,4 +97,9 @@
 , "coveralls"
 , "js-yaml"
 , "node-inspector"
+, "istanbul"
+, "mocha-unfunk-reporter"
+, "chai"
+, "selenium-webdriver"
+, "webdrvr"
 ]
-- 
GitLab


From 966f244292c3beb321ef0f2ac0cbfe4c97689e7a Mon Sep 17 00:00:00 2001
From: Rok Garbas <rok@garbas.si>
Date: Thu, 3 Oct 2013 13:34:46 +0200
Subject: [PATCH 4951/5331] plone.recipe.zope2instance python package added

---
 pkgs/top-level/python-packages-generated.nix | 934 ++++++++++---------
 pkgs/top-level/python-packages.json          |   4 +
 2 files changed, 502 insertions(+), 436 deletions(-)

diff --git a/pkgs/top-level/python-packages-generated.nix b/pkgs/top-level/python-packages-generated.nix
index fe75ea4098a..e33b57286cd 100644
--- a/pkgs/top-level/python-packages-generated.nix
+++ b/pkgs/top-level/python-packages-generated.nix
@@ -87,21 +87,21 @@ in
   };
 
 
-  "collective.z3cform.datetimewidget-1.2.5" = self.buildPythonPackage {
-    name = "collective.z3cform.datetimewidget-1.2.5";
+  "plone.app.contentlisting-1.0.5" = self.buildPythonPackage {
+    name = "plone.app.contentlisting-1.0.5";
     src = fetchurl {
-        url = "https://pypi.python.org/packages/source/c/collective.z3cform.datetimewidget/collective.z3cform.datetimewidget-1.2.5.zip";
-        md5 = "38fa463ea9b0b3cf5f61540250968214";
+        url = "https://pypi.python.org/packages/source/p/plone.app.contentlisting/plone.app.contentlisting-1.0.5.zip";
+        md5 = "9fc15b8ecad1c918778c3ea9a75bf533";
     };
     doCheck = false;
     buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ self.setuptools self."z3c.form-3.0.2" self."zope.deprecation-3.4.1" self."zope.i18n__zcml-3.7.4" ];
+    propagatedBuildInputs = [ self."plone.uuid-1.0.3" self.setuptools ];
     installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
     meta = {
       description = ''
-        z3c.form date and datetime widgets
+        Listing of content for the Plone CMS
         '';
-      homepage = "https://github.com/collective/collective.z3cform.datetimewidget";
+      homepage = "http://pypi.python.org/pypi/plone.app.contentlisting";
       license = "GPL version 2";
     };
   };
@@ -147,22 +147,22 @@ in
   };
 
 
-  "plone.app.caching-1.1.6" = self.buildPythonPackage {
-    name = "plone.app.caching-1.1.6";
+  "plone.z3cform-0.8.0" = self.buildPythonPackage {
+    name = "plone.z3cform-0.8.0";
     src = fetchurl {
-        url = "https://pypi.python.org/packages/source/p/plone.app.caching/plone.app.caching-1.1.6.zip";
-        md5 = "52f817d67e6da1508bf6f1486e5466d2";
+        url = "https://pypi.python.org/packages/source/p/plone.z3cform/plone.z3cform-0.8.0.zip";
+        md5 = "bdb23dd162544964d2f8f8f5f002e874";
     };
     doCheck = false;
     buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ self."Acquisition-2.13.8" self."plone.app.registry-1.2.3" self."plone.app.z3cform-0.7.4" self."plone.cachepurging-1.0.4" self."plone.caching-1.0" self."plone.memoize-1.1.1" self."plone.protect-2.0.2" self."plone.registry-1.0.1" self."Products.CMFCore-2.2.7" self."Products.CMFDynamicViewFTI-4.0.5" self."Products.GenericSetup-1.7.4" self."Products.statusmessages-4.0" self."python-dateutil-1.5" self.setuptools self."z3c.form-3.0.2" self."z3c.zcmlhook-1.0b1" self."zope.browserresource-3.10.3" self."zope.component__zcml-3.9.5" self."zope.interface-3.6.7" self."zope.pagetemplate-3.6.3" self."zope.publisher-3.12.6" self."Zope2-2.13.21" ];
+    propagatedBuildInputs = [ self."plone.batching-1.0" self.setuptools self."z3c.form-3.0.2" self."zope.browserpage-3.12.2" self."zope.component__zcml-3.9.5" self."zope.i18n__zcml-3.7.4" self."Zope2-2.13.21" ];
     installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
     meta = {
       description = ''
-        Plone UI and default rules for plone.caching/z3c.caching
+        plone.z3cform is a library that allows use of z3c.form with Zope 2 and the CMF.
         '';
-      homepage = "http://pypi.python.org/pypi/plone.app.caching";
-      license = "GPL version 2";
+      homepage = "http://pypi.python.org/pypi/plone.z3cform";
+      license = "ZPL 2.1";
     };
   };
 
@@ -216,7 +216,7 @@ in
     doCheck = false;
     buildInputs = [  ];
     propagatedBuildInputs = [ self.setuptools self."zope.proxy-3.6.1" ];
-    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
+    installCommand = ''easy_install --always-unzip --prefix="$out" .'';
     meta = {
       description = ''
         zope.deferredimport allows you to perform imports names that will only be resolved when used in the code.
@@ -287,22 +287,22 @@ in
   };
 
 
-  "plone.app.textfield-1.2.2" = self.buildPythonPackage {
-    name = "plone.app.textfield-1.2.2";
+  "Products.ExternalMethod-2.13.0" = self.buildPythonPackage {
+    name = "Products.ExternalMethod-2.13.0";
     src = fetchurl {
-        url = "https://pypi.python.org/packages/source/p/plone.app.textfield/plone.app.textfield-1.2.2.zip";
-        md5 = "f832887a40826d6f68c48b48f071fb9c";
+        url = "https://pypi.python.org/packages/source/P/Products.ExternalMethod/Products.ExternalMethod-2.13.0.zip";
+        md5 = "15ba953ef6cb632eb571977651252ea6";
     };
     doCheck = false;
     buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ self.setuptools self."ZODB3-3.10.5" self."zope.component__zcml-3.9.5" self."zope.interface-3.6.7" self."zope.schema-4.2.2" ];
+    propagatedBuildInputs = [ self."AccessControl-3.0.8" self."Acquisition-2.13.8" self."ExtensionClass-2.13.2" self."Persistence-2.13.2" self.setuptools self."ZODB3-3.10.5" ];
     installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
     meta = {
       description = ''
-        Text field with MIME type support
+        This package provides support for external Python methods within a Zope 2 environment.
         '';
-      homepage = "http://pypi.python.org/pypi/plone.app.textfield";
-      license = "GPL";
+      homepage = "http://pypi.python.org/pypi/Products.ExternalMethod";
+      license = "ZPL 2.1";
     };
   };
 
@@ -347,6 +347,28 @@ in
   };
 
 
+  "plone.recipe.zope2instance" = self."plone.recipe.zope2instance-4.2.13";
+
+  "plone.recipe.zope2instance-4.2.13" = self.buildPythonPackage {
+    name = "plone.recipe.zope2instance-4.2.13";
+    src = fetchurl {
+        url = "https://pypi.python.org/packages/source/p/plone.recipe.zope2instance/plone.recipe.zope2instance-4.2.13.zip";
+        md5 = "1ff990a15e77a92a7339b5092bfb9cc3";
+    };
+    doCheck = false;
+    buildInputs = [ pkgs.unzip ];
+    propagatedBuildInputs = [ self."mailinglogger-3.7.0" self.setuptools self."zc.buildout-1.7.1" self."zc.recipe.egg-1.3.2" self."ZODB3-3.10.5" self."Zope2-2.13.21" ];
+    installCommand = ''easy_install --always-unzip --prefix="$out" .'';
+    meta = {
+      description = ''
+        Buildout recipe for creating a Zope 2 instance
+        '';
+      homepage = "http://pypi.python.org/pypi/plone.recipe.zope2instance";
+      license = "ZPL 2.1";
+    };
+  };
+
+
   "Unidecode-0.04.1" = self.buildPythonPackage {
     name = "Unidecode-0.04.1";
     src = fetchurl {
@@ -387,26 +409,6 @@ in
   };
 
 
-  "Products.GenericSetup-1.7.4" = self.buildPythonPackage {
-    name = "Products.GenericSetup-1.7.4";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/P/Products.GenericSetup/Products.GenericSetup-1.7.4.tar.gz";
-        md5 = "f93251ed519e8c4aea0bc001416027b1";
-    };
-    doCheck = false;
-    buildInputs = [  ];
-    propagatedBuildInputs = [ self."five.localsitemanager-2.0.5" self.setuptools self."zope.formlib-4.0.6" self."Zope2-2.13.21" ];
-    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-    meta = {
-      description = ''
-        Read Zope configuration state from profile dirs / tarballs
-        '';
-      homepage = "http://pypi.python.org/pypi/Products.GenericSetup";
-      license = "ZPL 2.1 (http://www.zope.org/Resources/License/ZPL-2.1)";
-    };
-  };
-
-
   "plone.app.redirector-1.2" = self.buildPythonPackage {
     name = "plone.app.redirector-1.2";
     src = fetchurl {
@@ -476,7 +478,7 @@ in
     doCheck = false;
     buildInputs = [  ];
     propagatedBuildInputs = [ self."mechanize-0.2.5" self."pytz-2013b" self.setuptools self."zope.interface-3.6.7" self."zope.schema-4.2.2" ];
-    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
+    installCommand = ''easy_install --always-unzip --prefix="$out" .'';
     meta = {
       description = ''
         Programmable browser for functional black-box tests
@@ -516,7 +518,7 @@ in
     doCheck = false;
     buildInputs = [  ];
     propagatedBuildInputs = [ self.setuptools self."zope.annotation-3.5.0" self."zope.component__zcml-3.9.5" self."zope.container-3.11.2" self."zope.event-3.5.2" self."zope.interface-3.6.7" self."zope.lifecycleevent-3.6.2" self."zope.location-3.9.1" self."zope.security__untrustedpython-3.7.4" ];
-    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
+    installCommand = ''easy_install --always-unzip --prefix="$out" .'';
     meta = {
       description = ''
         Local registries for zope component architecture
@@ -547,26 +549,6 @@ in
   };
 
 
-  "mechanize-0.2.5" = self.buildPythonPackage {
-    name = "mechanize-0.2.5";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/m/mechanize/mechanize-0.2.5.tar.gz";
-        md5 = "32657f139fc2fb75bcf193b63b8c60b2";
-    };
-    doCheck = false;
-    buildInputs = [  ];
-    propagatedBuildInputs = [  ];
-    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-    meta = {
-      description = ''
-        Stateful programmatic web browsing.
-        '';
-      homepage = "http://wwwsearch.sourceforge.net/mechanize/";
-      license = "BSD";
-    };
-  };
-
-
   "Products.PlacelessTranslationService-2.0.4" = self.buildPythonPackage {
     name = "Products.PlacelessTranslationService-2.0.4";
     src = fetchurl {
@@ -624,7 +606,7 @@ in
     doCheck = false;
     buildInputs = [  ];
     propagatedBuildInputs = [  ];
-    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
+    installCommand = ''easy_install --always-unzip --prefix="$out" .'';
     meta = {
       description = ''
         Structured Configuration Library
@@ -744,7 +726,7 @@ in
     doCheck = false;
     buildInputs = [ pkgs.unzip ];
     propagatedBuildInputs = [ self.setuptools self."zope.interface-3.6.7" ];
-    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
+    installCommand = ''easy_install --always-unzip --prefix="$out" .'';
     meta = {
       description = ''
         Generic Transparent Proxies
@@ -864,7 +846,7 @@ in
     doCheck = false;
     buildInputs = [ pkgs.unzip ];
     propagatedBuildInputs = [ self."ExtensionClass-2.13.2" ];
-    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
+    installCommand = ''easy_install --always-unzip --prefix="$out" .'';
     meta = {
       description = ''
         Special MultiMapping objects used in Zope2.
@@ -915,22 +897,22 @@ in
   };
 
 
-  "plone.indexer-1.0.2" = self.buildPythonPackage {
-    name = "plone.indexer-1.0.2";
+  "zope.schema-4.3.2" = self.buildPythonPackage {
+    name = "zope.schema-4.3.2";
     src = fetchurl {
-        url = "https://pypi.python.org/packages/source/p/plone.indexer/plone.indexer-1.0.2.zip";
-        md5 = "538aeee1f9db78bc8c85ae1bcb0153ed";
+        url = "https://pypi.python.org/packages/source/z/zope.schema/zope.schema-4.3.2.zip";
+        md5 = "b63df4a3035f29113f8130c8ae28bb13";
     };
     doCheck = false;
     buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ self."Products.CMFCore-2.2.7" self.setuptools self."zope.component__zcml-3.9.5" self."zope.interface-3.6.7" ];
-    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
+    propagatedBuildInputs = [ self.setuptools self."zope.event-4.0.2" self."zope.interface-4.0.5" ];
+    installCommand = ''easy_install --always-unzip --prefix="$out" .'';
     meta = {
       description = ''
-        Hooks to facilitate managing custom index values in Zope 2/CMF applications
+        zope.interface extension for defining data schemas
         '';
-      homepage = "http://pypi.python.org/pypi/plone.indexer";
-      license = "BSD";
+      homepage = "http://pypi.python.org/pypi/zope.schema";
+      license = "ZPL 2.1";
     };
   };
 
@@ -1044,7 +1026,7 @@ in
     doCheck = false;
     buildInputs = [  ];
     propagatedBuildInputs = [ self.setuptools self."zope.interface-3.6.7" ];
-    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
+    installCommand = ''easy_install --always-unzip --prefix="$out" .'';
     meta = {
       description = ''
         Zope process lifetime events
@@ -1115,22 +1097,22 @@ in
   };
 
 
-  "tempstorage-2.12.2" = self.buildPythonPackage {
-    name = "tempstorage-2.12.2";
+  "plone.stringinterp-1.0.10" = self.buildPythonPackage {
+    name = "plone.stringinterp-1.0.10";
     src = fetchurl {
-        url = "https://pypi.python.org/packages/source/t/tempstorage/tempstorage-2.12.2.zip";
-        md5 = "7a2b76b39839e229249b1bb175604480";
+        url = "https://pypi.python.org/packages/source/p/plone.stringinterp/plone.stringinterp-1.0.10.zip";
+        md5 = "595074e94944ad6860e2105a020a3b9a";
     };
     doCheck = false;
     buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ self.setuptools self."ZODB3-3.10.5" self."zope.testing-3.9.7" ];
+    propagatedBuildInputs = [ self."Products.CMFCore-2.2.7" self.setuptools self."zope.i18n__zcml-3.7.4" ];
     installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
     meta = {
       description = ''
-        A RAM-based storage for ZODB
+        Adaptable string interpolation
         '';
-      homepage = "http://pypi.python.org/pypi/tempstorage";
-      license = "ZPL 2.1";
+      homepage = "http://pypi.python.org/pypi/plone.stringinterp";
+      license = "GPL version 2";
     };
   };
 
@@ -1184,7 +1166,7 @@ in
     doCheck = false;
     buildInputs = [  ];
     propagatedBuildInputs = [ self.setuptools ];
-    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
+    installCommand = ''easy_install --always-unzip --prefix="$out" .'';
     meta = {
       description = ''
         Sequence Sorting
@@ -1215,6 +1197,26 @@ in
   };
 
 
+  "plone.resourceeditor-1.0" = self.buildPythonPackage {
+    name = "plone.resourceeditor-1.0";
+    src = fetchurl {
+        url = "https://pypi.python.org/packages/source/p/plone.resourceeditor/plone.resourceeditor-1.0.zip";
+        md5 = "443ff0a0ad83b94fc08cac46ee3b2ad4";
+    };
+    doCheck = false;
+    buildInputs = [ pkgs.unzip ];
+    propagatedBuildInputs = [ self."plone.resource-1.0.2" self.setuptools self."zope.component__zcml-3.9.5" self."zope.interface-3.6.7" self."zope.publisher-3.12.6" self."zope.schema-4.2.2" self."Zope2-2.13.21" ];
+    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
+    meta = {
+      description = ''
+        UNKNOWN
+        '';
+      homepage = "https://github.com/plone/plone.resourceeditor";
+      license = "GPL";
+    };
+  };
+
+
   "zope.app.publication-3.12.0" = self.buildPythonPackage {
     name = "zope.app.publication-3.12.0";
     src = fetchurl {
@@ -1244,7 +1246,7 @@ in
     doCheck = false;
     buildInputs = [  ];
     propagatedBuildInputs = [ self.setuptools self."zope.event-3.5.2" self."zope.interface-3.6.7" ];
-    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
+    installCommand = ''easy_install --always-unzip --prefix="$out" .'';
     meta = {
       description = ''
         zope.interface extension for defining data schemas
@@ -1335,22 +1337,22 @@ in
   };
 
 
-  "Persistence-2.13.2" = self.buildPythonPackage {
-    name = "Persistence-2.13.2";
+  "plone.dexterity-2.1.3" = self.buildPythonPackage {
+    name = "plone.dexterity-2.1.3";
     src = fetchurl {
-        url = "https://pypi.python.org/packages/source/P/Persistence/Persistence-2.13.2.zip";
-        md5 = "92693648ccdc59c8fc71f7f06b1d228c";
+        url = "https://pypi.python.org/packages/source/p/plone.dexterity/plone.dexterity-2.1.3.zip";
+        md5 = "7f6444a2c26488e4068217266fd243b7";
     };
     doCheck = false;
     buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ self."ExtensionClass-2.13.2" self."ZODB3-3.10.5" ];
+    propagatedBuildInputs = [ self."plone.alterego-1.0" self."plone.autoform-1.5" self."plone.behavior-1.0.2" self."plone.folder-1.0.4" self."plone.memoize-1.1.1" self."plone.rfc822-1.1" self."plone.supermodel-1.2.3" self."plone.synchronize-1.0.1" self."plone.uuid-1.0.3" self."plone.z3cform-0.8.0" self."Products.CMFCore-2.2.7" self."Products.CMFDefault-2.2.3" self."Products.CMFDynamicViewFTI-4.0.5" self."Products.statusmessages-4.0" self.setuptools self."ZODB3-3.10.5" self."zope.annotation-3.5.0" self."zope.browser-1.3" self."zope.component__zcml-3.9.5" self."zope.container-3.11.2" self."zope.dottedname-3.4.6" self."zope.filerepresentation-3.6.1" self."zope.interface-3.6.7" self."zope.lifecycleevent-3.6.2" self."zope.location-3.9.1" self."zope.publisher-3.12.6" self."zope.schema-4.2.2" self."zope.security__untrustedpython-3.7.4" self."zope.size-3.4.1" self."Zope2-2.13.21" ];
     installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
     meta = {
       description = ''
-        Persistent ExtensionClass
+        Flexible CMF content
         '';
-      homepage = "http://pypi.python.org/pypi/Persistence";
-      license = "ZPL 2.1";
+      homepage = "http://code.google.com/p/dexterity";
+      license = "GPL version 2";
     };
   };
 
@@ -1408,7 +1410,7 @@ in
     doCheck = false;
     buildInputs = [  ];
     propagatedBuildInputs = [ self.setuptools ];
-    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
+    installCommand = ''easy_install --always-unzip --prefix="$out" .'';
     meta = {
       description = ''
         Basic inter-process locks
@@ -1428,7 +1430,7 @@ in
     doCheck = false;
     buildInputs = [  ];
     propagatedBuildInputs = [ self.setuptools self."zope.interface-3.6.7" self."zope.tal-3.5.2" ];
-    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
+    installCommand = ''easy_install --always-unzip --prefix="$out" .'';
     meta = {
       description = ''
         Zope Template Application Language Expression Syntax (TALES)
@@ -1448,7 +1450,7 @@ in
     doCheck = false;
     buildInputs = [ pkgs.unzip ];
     propagatedBuildInputs = [ self."pytz-2013b" self."zope.interface-3.6.7" ];
-    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
+    installCommand = ''easy_install --always-unzip --prefix="$out" .'';
     meta = {
       description = ''
         This package provides a DateTime data type, as known from Zope 2.Unless you need to communicate with Zope 2 APIs, you're probablybetter off using Python's built-in datetime module.
@@ -1488,7 +1490,7 @@ in
     doCheck = false;
     buildInputs = [  ];
     propagatedBuildInputs = [  ];
-    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
+    installCommand = ''easy_install --always-unzip --prefix="$out" .'';
     meta = {
       description = ''
         World timezone definitions, modern and historical
@@ -1508,7 +1510,7 @@ in
     doCheck = false;
     buildInputs = [ pkgs.unzip ];
     propagatedBuildInputs = [ self.setuptools self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."zope.schema-4.2.2" ];
-    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
+    installCommand = ''easy_install --always-unzip --prefix="$out" .'';
     meta = {
       description = ''
         Zope Configuration Markup Language (ZCML)
@@ -1519,26 +1521,6 @@ in
   };
 
 
-  "Missing-2.13.1" = self.buildPythonPackage {
-    name = "Missing-2.13.1";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/M/Missing/Missing-2.13.1.zip";
-        md5 = "9823cff54444cbbcaef8fc45d8e42572";
-    };
-    doCheck = false;
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ self."ExtensionClass-2.13.2" ];
-    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-    meta = {
-      description = ''
-        Special Missing objects used in Zope2.
-        '';
-      homepage = "http://pypi.python.org/pypi/Missing";
-      license = "ZPL 2.1";
-    };
-  };
-
-
   "plone.app.iterate-2.1.10" = self.buildPythonPackage {
     name = "plone.app.iterate-2.1.10";
     src = fetchurl {
@@ -1599,6 +1581,26 @@ in
   };
 
 
+  "zope.broken-3.6.0" = self.buildPythonPackage {
+    name = "zope.broken-3.6.0";
+    src = fetchurl {
+        url = "https://pypi.python.org/packages/source/z/zope.broken/zope.broken-3.6.0.zip";
+        md5 = "eff24d7918099a3e899ee63a9c31bee6";
+    };
+    doCheck = false;
+    buildInputs = [ pkgs.unzip ];
+    propagatedBuildInputs = [ self.setuptools self."zope.interface-3.6.7" ];
+    installCommand = ''easy_install --always-unzip --prefix="$out" .'';
+    meta = {
+      description = ''
+        Zope Broken Object Interfaces
+        '';
+      homepage = "http://pypi.python.org/pypi/zope.broken";
+      license = "ZPL 2.1";
+    };
+  };
+
+
   "lxml-3.2.3" = self.buildPythonPackage {
     name = "lxml-3.2.3";
     src = fetchurl {
@@ -1668,7 +1670,7 @@ in
     doCheck = false;
     buildInputs = [  ];
     propagatedBuildInputs = [ self.setuptools self."zope.browserresource-3.10.3" self."zope.interface-3.6.7" self."zope.pagetemplate-3.6.3" self."zope.publisher-3.12.6" self."zope.security__untrustedpython-3.7.4" ];
-    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
+    installCommand = ''easy_install --always-unzip --prefix="$out" .'';
     meta = {
       description = ''
         Page template resource plugin for zope.browserresource
@@ -1688,7 +1690,7 @@ in
     doCheck = false;
     buildInputs = [  ];
     propagatedBuildInputs = [  ];
-    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
+    installCommand = ''easy_install --always-unzip --prefix="$out" .'';
     meta = {
       description = ''
         Docutils -- Python Documentation Utilities
@@ -1699,11 +1701,11 @@ in
   };
 
 
-  "beautifulsoup4-4.3.1" = self.buildPythonPackage {
-    name = "beautifulsoup4-4.3.1";
+  "beautifulsoup4-4.3.2" = self.buildPythonPackage {
+    name = "beautifulsoup4-4.3.2";
     src = fetchurl {
-        url = "https://pypi.python.org/packages/source/b/beautifulsoup4/beautifulsoup4-4.3.1.tar.gz";
-        md5 = "508095f2784c64114e06856edc1dafed";
+        url = "https://pypi.python.org/packages/source/b/beautifulsoup4/beautifulsoup4-4.3.2.tar.gz";
+        md5 = "b8d157a204d56512a4cc196e53e7d8ee";
     };
     doCheck = false;
     buildInputs = [  ];
@@ -1711,7 +1713,7 @@ in
     installCommand = ''easy_install --always-unzip --prefix="$out" .'';
     meta = {
       description = ''
-        UNKNOWN
+        Screen-scraping library
         '';
       homepage = "http://www.crummy.com/software/BeautifulSoup/bs4/";
       license = "MIT";
@@ -1719,22 +1721,22 @@ in
   };
 
 
-  "plone.app.upgrade-1.3.4" = self.buildPythonPackage {
-    name = "plone.app.upgrade-1.3.4";
+  "Products.PloneLanguageTool-3.2.7" = self.buildPythonPackage {
+    name = "Products.PloneLanguageTool-3.2.7";
     src = fetchurl {
-        url = "https://pypi.python.org/packages/source/p/plone.app.upgrade/plone.app.upgrade-1.3.4.zip";
-        md5 = "10c192ee4a2422f901e020fd5b39879a";
+        url = "https://pypi.python.org/packages/source/P/Products.PloneLanguageTool/Products.PloneLanguageTool-3.2.7.zip";
+        md5 = "bd9eb6278bf76e8cbce99437ca362164";
     };
     doCheck = false;
     buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ self."Acquisition-2.13.8" self."borg.localrole-3.0.2" self."five.localsitemanager-2.0.5" self."plone.app.folder-1.0.5" self."plone.app.portlets-2.4.5" self."plone.portlets-2.2" self."plone.session-3.5.3" self."Products.Archetypes-1.9.4" self."Products.CMFActionIcons-2.1.3" self."Products.CMFCalendar-2.2.2" self."Products.CMFCore-2.2.7" self."Products.CMFDefault-2.2.3" self."Products.CMFDiffTool-2.1" self."Products.CMFEditions-2.2.8" self."Products.CMFFormController-3.0.3" self."Products.CMFQuickInstallerTool-3.0.6" self."Products.CMFUid-2.2.1" self."Products.contentmigration-2.1.5" self."Products.DCWorkflow-2.2.4" self."Products.GenericSetup-1.7.4" self."Products.MimetypesRegistry-2.0.5" self."Products.PloneLanguageTool-3.2.7" self."Products.PlonePAS-4.1.1" self."Products.PluggableAuthService-1.10.0" self."Products.PortalTransforms-2.1.2" self."Products.ResourceRegistries-2.2.9" self."Products.SecureMailHost-1.1.2" self."Products.ZCatalog-2.13.23" self.setuptools self."transaction-1.1.1" self."zope.component__zcml-3.9.5" self."zope.interface-3.6.7" self."zope.location-3.9.1" self."zope.ramcache-1.0" self."zope.site-3.9.2" self."Zope2-2.13.21" ];
+    propagatedBuildInputs = [ self.setuptools ];
     installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
     meta = {
       description = ''
-        Upgrade machinery for Plone.
+        PloneLanguageTool allows you to set the available languages in your Plone site, select various fallback mechanisms, and control the use of flags for language selection and translations.
         '';
-      homepage = "http://pypi.python.org/pypi/plone.app.upgrade";
-      license = "GPL version 2";
+      homepage = "http://pypi.python.org/pypi/Products.PloneLanguageTool";
+      license = "GPL";
     };
   };
 
@@ -1819,22 +1821,22 @@ in
   };
 
 
-  "zope.schema-4.3.2" = self.buildPythonPackage {
-    name = "zope.schema-4.3.2";
+  "plone.indexer-1.0.2" = self.buildPythonPackage {
+    name = "plone.indexer-1.0.2";
     src = fetchurl {
-        url = "https://pypi.python.org/packages/source/z/zope.schema/zope.schema-4.3.2.zip";
-        md5 = "b63df4a3035f29113f8130c8ae28bb13";
+        url = "https://pypi.python.org/packages/source/p/plone.indexer/plone.indexer-1.0.2.zip";
+        md5 = "538aeee1f9db78bc8c85ae1bcb0153ed";
     };
     doCheck = false;
     buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ self.setuptools self."zope.event-4.0.2" self."zope.interface-4.0.5" ];
-    installCommand = ''easy_install --always-unzip --prefix="$out" .'';
+    propagatedBuildInputs = [ self."Products.CMFCore-2.2.7" self.setuptools self."zope.component__zcml-3.9.5" self."zope.interface-3.6.7" ];
+    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
     meta = {
       description = ''
-        zope.interface extension for defining data schemas
+        Hooks to facilitate managing custom index values in Zope 2/CMF applications
         '';
-      homepage = "http://pypi.python.org/pypi/zope.schema";
-      license = "ZPL 2.1";
+      homepage = "http://pypi.python.org/pypi/plone.indexer";
+      license = "BSD";
     };
   };
 
@@ -1879,42 +1881,44 @@ in
   };
 
 
-  "Products.PluggableAuthService-1.10.0" = self.buildPythonPackage {
-    name = "Products.PluggableAuthService-1.10.0";
+  "Plone" = self."Plone-4.3.2";
+
+  "Plone-4.3.2" = self.buildPythonPackage {
+    name = "Plone-4.3.2";
     src = fetchurl {
-        url = "https://pypi.python.org/packages/source/P/Products.PluggableAuthService/Products.PluggableAuthService-1.10.0.tar.gz";
-        md5 = "1a1db6b1d9dd34f8b93a8a3104385a37";
+        url = "https://pypi.python.org/packages/source/P/Plone/Plone-4.3.2.zip";
+        md5 = "809f9fe8b8d23b49778e8ce304ea34f6";
     };
     doCheck = false;
-    buildInputs = [  ];
-    propagatedBuildInputs = [ self."Products.GenericSetup-1.7.4" self."Products.PluginRegistry-1.3" self.setuptools self."Zope2-2.13.21" ];
+    buildInputs = [ pkgs.unzip ];
+    propagatedBuildInputs = [ self."plone.app.caching-1.1.6" self."plone.app.dexterity-2.0.9" self."plone.app.iterate-2.1.10" self."plone.app.openid-2.0.2" self."plone.app.theming-1.1.1" self."Products.CMFPlacefulWorkflow-1.5.9" self."Products.CMFPlone-4.3.2" self.setuptools self."wicked-1.1.10" ];
     installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
     meta = {
       description = ''
-        Pluggable Zope2 authentication / authorization framework
+        The Plone Content Management System
         '';
-      homepage = "http://pypi.python.org/pypi/Products.PluggableAuthService";
-      license = "ZPL 2.1 (http://www.zope.org/Resources/License/ZPL-2.1)";
+      homepage = "http://plone.org/";
+      license = "GPL version 2";
     };
   };
 
 
-  "plone.dexterity-2.1.3" = self.buildPythonPackage {
-    name = "plone.dexterity-2.1.3";
+  "Persistence-2.13.2" = self.buildPythonPackage {
+    name = "Persistence-2.13.2";
     src = fetchurl {
-        url = "https://pypi.python.org/packages/source/p/plone.dexterity/plone.dexterity-2.1.3.zip";
-        md5 = "7f6444a2c26488e4068217266fd243b7";
+        url = "https://pypi.python.org/packages/source/P/Persistence/Persistence-2.13.2.zip";
+        md5 = "92693648ccdc59c8fc71f7f06b1d228c";
     };
     doCheck = false;
     buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ self."plone.alterego-1.0" self."plone.autoform-1.5" self."plone.behavior-1.0.2" self."plone.folder-1.0.4" self."plone.memoize-1.1.1" self."plone.rfc822-1.1" self."plone.supermodel-1.2.3" self."plone.synchronize-1.0.1" self."plone.uuid-1.0.3" self."plone.z3cform-0.8.0" self."Products.CMFCore-2.2.7" self."Products.CMFDefault-2.2.3" self."Products.CMFDynamicViewFTI-4.0.5" self."Products.statusmessages-4.0" self.setuptools self."ZODB3-3.10.5" self."zope.annotation-3.5.0" self."zope.browser-1.3" self."zope.component__zcml-3.9.5" self."zope.container-3.11.2" self."zope.dottedname-3.4.6" self."zope.filerepresentation-3.6.1" self."zope.interface-3.6.7" self."zope.lifecycleevent-3.6.2" self."zope.location-3.9.1" self."zope.publisher-3.12.6" self."zope.schema-4.2.2" self."zope.security__untrustedpython-3.7.4" self."zope.size-3.4.1" self."Zope2-2.13.21" ];
-    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
+    propagatedBuildInputs = [ self."ExtensionClass-2.13.2" self."ZODB3-3.10.5" ];
+    installCommand = ''easy_install --always-unzip --prefix="$out" .'';
     meta = {
       description = ''
-        Flexible CMF content
+        Persistent ExtensionClass
         '';
-      homepage = "http://code.google.com/p/dexterity";
-      license = "GPL version 2";
+      homepage = "http://pypi.python.org/pypi/Persistence";
+      license = "ZPL 2.1";
     };
   };
 
@@ -1939,22 +1943,62 @@ in
   };
 
 
-  "wicked-1.1.10" = self.buildPythonPackage {
-    name = "wicked-1.1.10";
+  "zc.recipe.egg-1.3.2" = self.buildPythonPackage {
+    name = "zc.recipe.egg-1.3.2";
     src = fetchurl {
-        url = "https://pypi.python.org/packages/source/w/wicked/wicked-1.1.10.zip";
-        md5 = "f65611f11d547d7dc8e623bf87d3929d";
+        url = "https://pypi.python.org/packages/source/z/zc.recipe.egg/zc.recipe.egg-1.3.2.tar.gz";
+        md5 = "1cb6af73f527490dde461d3614a36475";
+    };
+    doCheck = false;
+    buildInputs = [  ];
+    propagatedBuildInputs = [ self.setuptools self."zc.buildout-1.7.1" ];
+    installCommand = ''easy_install --always-unzip --prefix="$out" .'';
+    meta = {
+      description = ''
+        Recipe for installing Python package distributions as eggs
+        '';
+      homepage = "http://cheeseshop.python.org/pypi/zc.recipe.egg";
+      license = "ZPL 2.1";
+    };
+  };
+
+
+  "mailinglogger-3.7.0" = self.buildPythonPackage {
+    name = "mailinglogger-3.7.0";
+    src = fetchurl {
+        url = "https://pypi.python.org/packages/source/m/mailinglogger/mailinglogger-3.7.0.tar.gz";
+        md5 = "f865f0df6059ce23062b7457d01dbac5";
+    };
+    doCheck = false;
+    buildInputs = [  ];
+    propagatedBuildInputs = [  ];
+    installCommand = ''easy_install --always-unzip --prefix="$out" .'';
+    meta = {
+      description = ''
+        Enhanced emailing handlers for the python logging package.
+        '';
+      homepage = "http://www.simplistix.co.uk/software/python/mailinglogger";
+      license = "MIT";
+    };
+  };
+
+
+  "plone.app.jquerytools-1.5.6" = self.buildPythonPackage {
+    name = "plone.app.jquerytools-1.5.6";
+    src = fetchurl {
+        url = "https://pypi.python.org/packages/source/p/plone.app.jquerytools/plone.app.jquerytools-1.5.6.zip";
+        md5 = "4ae9a72baa8e9899c1706b4fedbb516b";
     };
     doCheck = false;
     buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ self.setuptools self."zope.container-3.11.2" self."zope.lifecycleevent-3.6.2" self."zope.schema-4.2.2" self."zope.traversing-3.13.2" ];
+    propagatedBuildInputs = [ self."Products.CMFCore-2.2.7" self."Products.GenericSetup-1.7.4" self.setuptools self."zope.component__zcml-3.9.5" self."Zope2-2.13.21" ];
     installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
     meta = {
       description = ''
-        wicked is a compact syntax for doing wiki-like content linking and creation in zope and plone
+        jQuery Tools integration for Plone plus overlay and AJAX form helpers.
         '';
-      homepage = "http://pypi.python.org/pypi/wicked";
-      license = "GPL";
+      homepage = "http://pypi.python.org/pypi/plone.app.jquerytools";
+      license = "GPL version 2";
     };
   };
 
@@ -1988,7 +2032,7 @@ in
     doCheck = false;
     buildInputs = [ pkgs.unzip ];
     propagatedBuildInputs = [ self."DocumentTemplate-2.13.2" self.setuptools ];
-    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
+    installCommand = ''easy_install --always-unzip --prefix="$out" .'';
     meta = {
       description = ''
         MIMETools provides the &lt;!--#mime--&gt; tag for DocumentTemplate.
@@ -2028,7 +2072,7 @@ in
     doCheck = false;
     buildInputs = [  ];
     propagatedBuildInputs = [ self.setuptools self."zope.exceptions-3.6.2" self."zope.interface-3.6.7" ];
-    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
+    installCommand = ''easy_install --always-unzip --prefix="$out" .'';
     meta = {
       description = ''
         Zope testing framework, including the testrunner script.
@@ -2048,7 +2092,7 @@ in
     doCheck = false;
     buildInputs = [  ];
     propagatedBuildInputs = [ self.setuptools self."zope.component__zcml-3.9.5" self."zope.event-3.5.2" self."zope.interface-3.6.7" ];
-    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
+    installCommand = ''easy_install --always-unzip --prefix="$out" .'';
     meta = {
       description = ''
         Object life-cycle events
@@ -2059,22 +2103,22 @@ in
   };
 
 
-  "plone.app.viewletmanager-2.0.4" = self.buildPythonPackage {
-    name = "plone.app.viewletmanager-2.0.4";
+  "ExtensionClass-2.13.2" = self.buildPythonPackage {
+    name = "ExtensionClass-2.13.2";
     src = fetchurl {
-        url = "https://pypi.python.org/packages/source/p/plone.app.viewletmanager/plone.app.viewletmanager-2.0.4.zip";
-        md5 = "565a12ac71d20b2823b9e44daebe432f";
+        url = "https://pypi.python.org/packages/source/E/ExtensionClass/ExtensionClass-2.13.2.zip";
+        md5 = "0236e6d7da9e8b87b9ba45f1b8f930b8";
     };
     doCheck = false;
     buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ self."Acquisition-2.13.8" self."plone.app.vocabularies-2.1.11" self."Products.GenericSetup-1.7.4" self.setuptools self."ZODB3-3.10.5" self."zope.component__zcml-3.9.5" self."zope.contentprovider-3.7.2" self."zope.interface-3.6.7" self."zope.site-3.9.2" self."zope.viewlet-3.7.2" self."Zope2-2.13.21" ];
-    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
+    propagatedBuildInputs = [  ];
+    installCommand = ''easy_install --always-unzip --prefix="$out" .'';
     meta = {
       description = ''
-        configurable viewlet manager
+        Metaclass for subclassable extension types
         '';
-      homepage = "http://pypi.python.org/pypi/plone.app.viewletmanager";
-      license = "GPL version 2";
+      homepage = "http://pypi.python.org/pypi/ExtensionClass";
+      license = "ZPL 2.1";
     };
   };
 
@@ -2148,7 +2192,7 @@ in
     doCheck = false;
     buildInputs = [ pkgs.unzip ];
     propagatedBuildInputs = [ self.setuptools self."zope.component__zcml-3.9.5" self."zope.i18n__zcml-3.7.4" self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."zope.security__untrustedpython-3.7.4" self."zope.tal-3.5.2" self."zope.tales-3.5.3" self."zope.traversing-3.13.2" ];
-    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
+    installCommand = ''easy_install --always-unzip --prefix="$out" .'';
     meta = {
       description = ''
         Zope Page Templates
@@ -2188,7 +2232,7 @@ in
     doCheck = false;
     buildInputs = [  ];
     propagatedBuildInputs = [ self.setuptools ];
-    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
+    installCommand = ''easy_install --always-unzip --prefix="$out" .'';
     meta = {
       description = ''
         System for managing development buildouts
@@ -2228,7 +2272,7 @@ in
     doCheck = false;
     buildInputs = [ pkgs.unzip ];
     propagatedBuildInputs = [ self.setuptools self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" ];
-    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
+    installCommand = ''easy_install --always-unzip --prefix="$out" .'';
     meta = {
       description = ''
         Zope 3 Template Application Languate (TAL)
@@ -2308,7 +2352,7 @@ in
     doCheck = false;
     buildInputs = [  ];
     propagatedBuildInputs = [ self.setuptools self."ZODB3-3.10.5" self."zope.broken-3.6.0" self."zope.component__zcml-3.9.5" self."zope.dottedname-3.4.6" self."zope.event-3.5.2" self."zope.filerepresentation-3.6.1" self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."zope.lifecycleevent-3.6.2" self."zope.location-3.9.1" self."zope.publisher-3.12.6" self."zope.schema-4.2.2" self."zope.security__untrustedpython-3.7.4" self."zope.size-3.4.1" self."zope.traversing-3.13.2" ];
-    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
+    installCommand = ''easy_install --always-unzip --prefix="$out" .'';
     meta = {
       description = ''
         Zope Container
@@ -2368,7 +2412,7 @@ in
     doCheck = false;
     buildInputs = [ pkgs.unzip ];
     propagatedBuildInputs = [ self.setuptools self."zope.interface-3.6.7" self."zope.publisher-3.12.6" self."zope.security__untrustedpython-3.7.4" ];
-    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
+    installCommand = ''easy_install --always-unzip --prefix="$out" .'';
     meta = {
       description = ''
         zExceptions contains common exceptions used in Zope2.
@@ -2408,7 +2452,7 @@ in
     doCheck = false;
     buildInputs = [  ];
     propagatedBuildInputs = [ self.setuptools self."zope.browser-1.3" self."zope.component__zcml-3.9.5" self."zope.configuration-3.7.4" self."zope.contenttype-3.5.5" self."zope.event-3.5.2" self."zope.exceptions-3.6.2" self."zope.i18n__zcml-3.7.4" self."zope.interface-3.6.7" self."zope.location-3.9.1" self."zope.proxy-3.6.1" self."zope.security__untrustedpython-3.7.4" ];
-    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
+    installCommand = ''easy_install --always-unzip --prefix="$out" .'';
     meta = {
       description = ''
         The Zope publisher publishes Python objects on the web.
@@ -2468,7 +2512,7 @@ in
     doCheck = false;
     buildInputs = [  ];
     propagatedBuildInputs = [ self.setuptools self."zope.component__zcml-3.9.5" self."zope.configuration-3.7.4" self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."zope.location-3.9.1" self."zope.proxy-3.6.1" self."zope.schema-4.2.2" self."RestrictedPython-3.6.0" ];
-    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
+    installCommand = ''easy_install --always-unzip --prefix="$out" .'';
     meta = {
       description = ''
         Zope Security Framework
@@ -2528,7 +2572,7 @@ in
     doCheck = false;
     buildInputs = [  ];
     propagatedBuildInputs = [ self.setuptools self."zope.event-3.5.2" self."zope.interface-3.6.7" self."zope.configuration-3.7.4" self."zope.i18nmessageid-3.5.3" ];
-    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
+    installCommand = ''easy_install --always-unzip --prefix="$out" .'';
     meta = {
       description = ''
         Zope Component Architecture
@@ -2568,7 +2612,7 @@ in
     doCheck = false;
     buildInputs = [  ];
     propagatedBuildInputs = [ self.setuptools self."zope.browserpage-3.12.2" self."zope.component__zcml-3.9.5" self."zope.configuration-3.7.4" self."zope.contentprovider-3.7.2" self."zope.event-3.5.2" self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."zope.location-3.9.1" self."zope.publisher-3.12.6" self."zope.schema-4.2.2" self."zope.security__untrustedpython-3.7.4" self."zope.traversing-3.13.2" ];
-    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
+    installCommand = ''easy_install --always-unzip --prefix="$out" .'';
     meta = {
       description = ''
         Zope Viewlets
@@ -2588,7 +2632,7 @@ in
     doCheck = false;
     buildInputs = [  ];
     propagatedBuildInputs = [ self."pytz-2013b" self.setuptools self."zope.component__zcml-3.9.5" self."zope.i18nmessageid-3.5.3" self."zope.schema-4.2.2" self."zope.configuration-3.7.4" ];
-    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
+    installCommand = ''easy_install --always-unzip --prefix="$out" .'';
     meta = {
       description = ''
         Zope Internationalization Support
@@ -2648,7 +2692,7 @@ in
     doCheck = false;
     buildInputs = [ pkgs.unzip ];
     propagatedBuildInputs = [ self.setuptools self."zope.component__zcml-3.9.5" self."zope.configuration-3.7.4" self."zope.contenttype-3.5.5" self."zope.i18n__zcml-3.7.4" self."zope.interface-3.6.7" self."zope.location-3.9.1" self."zope.publisher-3.12.6" self."zope.schema-4.2.2" self."zope.traversing-3.13.2" ];
-    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
+    installCommand = ''easy_install --always-unzip --prefix="$out" .'';
     meta = {
       description = ''
         Browser resources implementation for Zope.
@@ -2741,6 +2785,26 @@ in
   };
 
 
+  "Products.contentmigration-2.1.5" = self.buildPythonPackage {
+    name = "Products.contentmigration-2.1.5";
+    src = fetchurl {
+        url = "https://pypi.python.org/packages/source/P/Products.contentmigration/Products.contentmigration-2.1.5.zip";
+        md5 = "f08e5f2572fc6f4c61b930a17f99418f";
+    };
+    doCheck = false;
+    buildInputs = [ pkgs.unzip ];
+    propagatedBuildInputs = [ self.setuptools ];
+    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
+    meta = {
+      description = ''
+        A generic content migration framework for Plone.
+        '';
+      homepage = "http://pypi.python.org/pypi/Products.contentmigration";
+      license = "LGPL";
+    };
+  };
+
+
   "Products.MimetypesRegistry-2.0.5" = self.buildPythonPackage {
     name = "Products.MimetypesRegistry-2.0.5";
     src = fetchurl {
@@ -2781,22 +2845,22 @@ in
   };
 
 
-  "Products.PloneLanguageTool-3.2.7" = self.buildPythonPackage {
-    name = "Products.PloneLanguageTool-3.2.7";
+  "plone.app.upgrade-1.3.4" = self.buildPythonPackage {
+    name = "plone.app.upgrade-1.3.4";
     src = fetchurl {
-        url = "https://pypi.python.org/packages/source/P/Products.PloneLanguageTool/Products.PloneLanguageTool-3.2.7.zip";
-        md5 = "bd9eb6278bf76e8cbce99437ca362164";
+        url = "https://pypi.python.org/packages/source/p/plone.app.upgrade/plone.app.upgrade-1.3.4.zip";
+        md5 = "10c192ee4a2422f901e020fd5b39879a";
     };
     doCheck = false;
     buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ self.setuptools ];
+    propagatedBuildInputs = [ self."Acquisition-2.13.8" self."borg.localrole-3.0.2" self."five.localsitemanager-2.0.5" self."plone.app.folder-1.0.5" self."plone.app.portlets-2.4.5" self."plone.portlets-2.2" self."plone.session-3.5.3" self."Products.Archetypes-1.9.4" self."Products.CMFActionIcons-2.1.3" self."Products.CMFCalendar-2.2.2" self."Products.CMFCore-2.2.7" self."Products.CMFDefault-2.2.3" self."Products.CMFDiffTool-2.1" self."Products.CMFEditions-2.2.8" self."Products.CMFFormController-3.0.3" self."Products.CMFQuickInstallerTool-3.0.6" self."Products.CMFUid-2.2.1" self."Products.contentmigration-2.1.5" self."Products.DCWorkflow-2.2.4" self."Products.GenericSetup-1.7.4" self."Products.MimetypesRegistry-2.0.5" self."Products.PloneLanguageTool-3.2.7" self."Products.PlonePAS-4.1.1" self."Products.PluggableAuthService-1.10.0" self."Products.PortalTransforms-2.1.2" self."Products.ResourceRegistries-2.2.9" self."Products.SecureMailHost-1.1.2" self."Products.ZCatalog-2.13.23" self.setuptools self."transaction-1.1.1" self."zope.component__zcml-3.9.5" self."zope.interface-3.6.7" self."zope.location-3.9.1" self."zope.ramcache-1.0" self."zope.site-3.9.2" self."Zope2-2.13.21" ];
     installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
     meta = {
       description = ''
-        PloneLanguageTool allows you to set the available languages in your Plone site, select various fallback mechanisms, and control the use of flags for language selection and translations.
+        Upgrade machinery for Plone.
         '';
-      homepage = "http://pypi.python.org/pypi/Products.PloneLanguageTool";
-      license = "GPL";
+      homepage = "http://pypi.python.org/pypi/plone.app.upgrade";
+      license = "GPL version 2";
     };
   };
 
@@ -2850,7 +2914,7 @@ in
     doCheck = false;
     buildInputs = [ pkgs.unzip ];
     propagatedBuildInputs = [ self.setuptools ];
-    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
+    installCommand = ''easy_install --always-unzip --prefix="$out" .'';
     meta = {
       description = ''
         Zope contenttype
@@ -2881,26 +2945,6 @@ in
   };
 
 
-  "plone.app.theming-1.1.1" = self.buildPythonPackage {
-    name = "plone.app.theming-1.1.1";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/p/plone.app.theming/plone.app.theming-1.1.1.zip";
-        md5 = "a694b7a050b6e7c25d720d1e99bb73fa";
-    };
-    doCheck = false;
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ self."diazo-1.0.4" self."docutils-0.9.1" self."five.globalrequest-1.0" self."lxml-2.3.6" self."plone.app.registry-1.2.3" self."plone.resource-1.0.2" self."plone.resourceeditor-1.0" self."plone.subrequest-1.6.7" self."plone.transformchain-1.0.3" self."Products.CMFPlone-4.3.2" self."repoze.xmliter-0.5" self."roman-1.4.0" self.setuptools self."zope.traversing-3.13.2" ];
-    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-    meta = {
-      description = ''
-        Integrates the Diazo theming engine with Plone
-        '';
-      homepage = "http://pypi.python.org/pypi/plone.app.theming";
-      license = "GPL";
-    };
-  };
-
-
   "zope.globalrequest-1.0" = self.buildPythonPackage {
     name = "zope.globalrequest-1.0";
     src = fetchurl {
@@ -2930,7 +2974,7 @@ in
     doCheck = false;
     buildInputs = [  ];
     propagatedBuildInputs = [ self.setuptools self."transaction-1.1.1" self."zope.component__zcml-3.9.5" self."zope.configuration-3.7.4" self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."zope.schema-4.2.2" ];
-    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
+    installCommand = ''easy_install --always-unzip --prefix="$out" .'';
     meta = {
       description = ''
         Zope sendmail
@@ -2941,6 +2985,26 @@ in
   };
 
 
+  "plone.locking-2.0.4" = self.buildPythonPackage {
+    name = "plone.locking-2.0.4";
+    src = fetchurl {
+        url = "https://pypi.python.org/packages/source/p/plone.locking/plone.locking-2.0.4.zip";
+        md5 = "a7f8b8db78f57272d351d7fe0d067eb2";
+    };
+    doCheck = false;
+    buildInputs = [ pkgs.unzip ];
+    propagatedBuildInputs = [ self."Acquisition-2.13.8" self."DateTime-3.0.3" self."Products.CMFCore-2.2.7" self.setuptools self."ZODB3-3.10.5" self."zope.annotation-3.5.0" self."zope.component__zcml-3.9.5" self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."zope.schema-4.2.2" self."zope.viewlet-3.7.2" self."Zope2-2.13.21" ];
+    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
+    meta = {
+      description = ''
+        webdav locking support
+        '';
+      homepage = "http://pypi.python.org/pypi/plone.locking";
+      license = "GPL version 2";
+    };
+  };
+
+
   "zope.annotation-3.5.0" = self.buildPythonPackage {
     name = "zope.annotation-3.5.0";
     src = fetchurl {
@@ -2950,7 +3014,7 @@ in
     doCheck = false;
     buildInputs = [  ];
     propagatedBuildInputs = [ self.setuptools self."ZODB3-3.10.5" self."zope.component__zcml-3.9.5" self."zope.interface-3.6.7" self."zope.location-3.9.1" self."zope.proxy-3.6.1" ];
-    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
+    installCommand = ''easy_install --always-unzip --prefix="$out" .'';
     meta = {
       description = ''
         Object annotation mechanism
@@ -3061,26 +3125,6 @@ in
   };
 
 
-  "Products.CMFPlacefulWorkflow-1.5.9" = self.buildPythonPackage {
-    name = "Products.CMFPlacefulWorkflow-1.5.9";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/P/Products.CMFPlacefulWorkflow/Products.CMFPlacefulWorkflow-1.5.9.zip";
-        md5 = "9041e1f52eab5b348c0dfa85be438722";
-    };
-    doCheck = false;
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ self."Products.CMFCore-2.2.7" self."Products.CMFPlone-4.3.2" self."Products.GenericSetup-1.7.4" self."Products.PloneTestCase-0.9.17" self.setuptools self."zope.component__zcml-3.9.5" self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."zope.testing-3.9.7" ];
-    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-    meta = {
-      description = ''
-        Workflow policies for CMF and Plone
-        '';
-      homepage = "http://pypi.python.org/pypi/Products.CMFPlacefulWorkflow";
-      license = "GPL";
-    };
-  };
-
-
   "zope.filerepresentation-3.6.1" = self.buildPythonPackage {
     name = "zope.filerepresentation-3.6.1";
     src = fetchurl {
@@ -3090,7 +3134,7 @@ in
     doCheck = false;
     buildInputs = [  ];
     propagatedBuildInputs = [ self.setuptools self."zope.interface-3.6.7" self."zope.schema-4.2.2" ];
-    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
+    installCommand = ''easy_install --always-unzip --prefix="$out" .'';
     meta = {
       description = ''
         File-system Representation Interfaces
@@ -3130,7 +3174,7 @@ in
     doCheck = false;
     buildInputs = [ pkgs.unzip ];
     propagatedBuildInputs = [ self.setuptools ];
-    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
+    installCommand = ''easy_install --always-unzip --prefix="$out" .'';
     meta = {
       description = ''
         Interfaces for Python
@@ -3150,7 +3194,7 @@ in
     doCheck = false;
     buildInputs = [  ];
     propagatedBuildInputs = [ self.setuptools self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" ];
-    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
+    installCommand = ''easy_install --always-unzip --prefix="$out" .'';
     meta = {
       description = ''
         Interfaces and simple adapter that give the size of an object
@@ -3161,21 +3205,21 @@ in
   };
 
 
-  "archetypes.referencebrowserwidget-2.4.19" = self.buildPythonPackage {
-    name = "archetypes.referencebrowserwidget-2.4.19";
+  "ZODB3-3.10.5" = self.buildPythonPackage {
+    name = "ZODB3-3.10.5";
     src = fetchurl {
-        url = "https://pypi.python.org/packages/source/a/archetypes.referencebrowserwidget/archetypes.referencebrowserwidget-2.4.19.zip";
-        md5 = "b70af6b2da6d8c57c1138a52e94e588c";
+        url = "https://pypi.python.org/packages/source/Z/ZODB3/ZODB3-3.10.5.tar.gz";
+        md5 = "6f180c6897a1820948fee2a6290503cd";
     };
     doCheck = false;
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ self."plone.app.form-2.2.3" self."plone.app.jquerytools-1.5.6" self.setuptools self."zope.component__zcml-3.9.5" self."zope.formlib-4.0.6" self."zope.interface-3.6.7" ];
-    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
+    buildInputs = [  ];
+    propagatedBuildInputs = [ self."transaction-1.1.1" self."zc.lockfile-1.0.2" self."ZConfig-2.9.1" self."zdaemon-2.0.7" self."zope.event-3.5.2" self."zope.interface-3.6.7" ];
+    installCommand = ''easy_install --always-unzip --prefix="$out" .'';
     meta = {
       description = ''
-        A referencebrowser implementation for Archetypes
+        Zope Object Database: object database and persistence
         '';
-      homepage = "http://pypi.python.org/pypi/archetypes.referencebrowserwidget";
+      homepage = "UNKNOWN";
       license = "ZPL 2.1";
     };
   };
@@ -3210,7 +3254,7 @@ in
     doCheck = false;
     buildInputs = [  ];
     propagatedBuildInputs = [ self.setuptools ];
-    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
+    installCommand = ''easy_install --always-unzip --prefix="$out" .'';
     meta = {
       description = ''
         Resolver for Python dotted names.
@@ -3281,21 +3325,21 @@ in
   };
 
 
-  "plone.app.contentlisting-1.0.5" = self.buildPythonPackage {
-    name = "plone.app.contentlisting-1.0.5";
+  "collective.z3cform.datetimewidget-1.2.5" = self.buildPythonPackage {
+    name = "collective.z3cform.datetimewidget-1.2.5";
     src = fetchurl {
-        url = "https://pypi.python.org/packages/source/p/plone.app.contentlisting/plone.app.contentlisting-1.0.5.zip";
-        md5 = "9fc15b8ecad1c918778c3ea9a75bf533";
+        url = "https://pypi.python.org/packages/source/c/collective.z3cform.datetimewidget/collective.z3cform.datetimewidget-1.2.5.zip";
+        md5 = "38fa463ea9b0b3cf5f61540250968214";
     };
     doCheck = false;
     buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ self."plone.uuid-1.0.3" self.setuptools ];
+    propagatedBuildInputs = [ self.setuptools self."z3c.form-3.0.2" self."zope.deprecation-3.4.1" self."zope.i18n__zcml-3.7.4" ];
     installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
     meta = {
       description = ''
-        Listing of content for the Plone CMS
+        z3c.form date and datetime widgets
         '';
-      homepage = "http://pypi.python.org/pypi/plone.app.contentlisting";
+      homepage = "https://github.com/collective/collective.z3cform.datetimewidget";
       license = "GPL version 2";
     };
   };
@@ -3310,7 +3354,7 @@ in
     doCheck = false;
     buildInputs = [ pkgs.unzip ];
     propagatedBuildInputs = [ self."AccessControl-3.0.8" self."Acquisition-2.13.8" self."DateTime-3.0.3" self."DocumentTemplate-2.13.2" self."docutils-0.9.1" self."ExtensionClass-2.13.2" self."initgroups-2.13.0" self."Missing-2.13.1" self."MultiMapping-2.13.0" self."Persistence-2.13.2" self."Products.BTreeFolder2-2.13.3" self."Products.ExternalMethod-2.13.0" self."Products.MailHost-2.13.1" self."Products.MIMETools-2.13.0" self."Products.OFSP-2.13.2" self."Products.PythonScripts-2.13.2" self."Products.StandardCacheManagers-2.13.0" self."Products.ZCatalog-2.13.23" self."Products.ZCTextIndex-2.13.4" self."pytz-2013b" self."Record-2.13.0" self."RestrictedPython-3.6.0" self.setuptools self."tempstorage-2.12.2" self."transaction-1.1.1" self."ZConfig-2.9.1" self."zdaemon-2.0.7" self."zExceptions-2.13.0" self."zLOG-2.11.1" self."ZODB3-3.10.5" self."zope.browser-1.3" self."zope.browsermenu-3.9.1" self."zope.browserpage-3.12.2" self."zope.browserresource-3.10.3" self."zope.component__zcml-3.9.5" self."zope.configuration-3.7.4" self."zope.container-3.11.2" self."zope.contentprovider-3.7.2" self."zope.contenttype-3.5.5" self."zope.deferredimport-3.5.3" self."zope.event-3.5.2" self."zope.exceptions-3.6.2" self."zope.i18n__zcml-3.7.4" self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."zope.lifecycleevent-3.6.2" self."zope.location-3.9.1" self."zope.pagetemplate-3.6.3" self."zope.processlifetime-1.0" self."zope.proxy-3.6.1" self."zope.ptresource-3.9.0" self."zope.publisher-3.12.6" self."zope.schema-4.2.2" self."zope.security__untrustedpython-3.7.4" self."zope.sendmail-3.7.5" self."zope.sequencesort-3.4.0" self."zope.site-3.9.2" self."zope.size-3.4.1" self."zope.structuredtext-3.5.1" self."zope.tal-3.5.2" self."zope.tales-3.5.3" self."zope.testbrowser-3.11.1" self."zope.testing-3.9.7" self."zope.traversing-3.13.2" self."zope.viewlet-3.7.2" self."ZopeUndo-2.12.0" ];
-    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
+    installCommand = ''easy_install --always-unzip --prefix="$out" .'';
     meta = {
       description = ''
         Zope2 application server / web framework
@@ -3321,22 +3365,22 @@ in
   };
 
 
-  "Products.ExternalMethod-2.13.0" = self.buildPythonPackage {
-    name = "Products.ExternalMethod-2.13.0";
+  "plone.app.textfield-1.2.2" = self.buildPythonPackage {
+    name = "plone.app.textfield-1.2.2";
     src = fetchurl {
-        url = "https://pypi.python.org/packages/source/P/Products.ExternalMethod/Products.ExternalMethod-2.13.0.zip";
-        md5 = "15ba953ef6cb632eb571977651252ea6";
+        url = "https://pypi.python.org/packages/source/p/plone.app.textfield/plone.app.textfield-1.2.2.zip";
+        md5 = "f832887a40826d6f68c48b48f071fb9c";
     };
     doCheck = false;
     buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ self."AccessControl-3.0.8" self."Acquisition-2.13.8" self."ExtensionClass-2.13.2" self."Persistence-2.13.2" self.setuptools self."ZODB3-3.10.5" ];
+    propagatedBuildInputs = [ self.setuptools self."ZODB3-3.10.5" self."zope.component__zcml-3.9.5" self."zope.interface-3.6.7" self."zope.schema-4.2.2" ];
     installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
     meta = {
       description = ''
-        This package provides support for external Python methods within a Zope 2 environment.
+        Text field with MIME type support
         '';
-      homepage = "http://pypi.python.org/pypi/Products.ExternalMethod";
-      license = "ZPL 2.1";
+      homepage = "http://pypi.python.org/pypi/plone.app.textfield";
+      license = "GPL";
     };
   };
 
@@ -3450,7 +3494,7 @@ in
     doCheck = false;
     buildInputs = [ pkgs.unzip ];
     propagatedBuildInputs = [ self.setuptools ];
-    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
+    installCommand = ''easy_install --always-unzip --prefix="$out" .'';
     meta = {
       description = ''
         RestrictedPython provides a restricted execution environment for Python, e.g. for running untrusted code.
@@ -3461,22 +3505,22 @@ in
   };
 
 
-  "plone.stringinterp-1.0.10" = self.buildPythonPackage {
-    name = "plone.stringinterp-1.0.10";
+  "tempstorage-2.12.2" = self.buildPythonPackage {
+    name = "tempstorage-2.12.2";
     src = fetchurl {
-        url = "https://pypi.python.org/packages/source/p/plone.stringinterp/plone.stringinterp-1.0.10.zip";
-        md5 = "595074e94944ad6860e2105a020a3b9a";
+        url = "https://pypi.python.org/packages/source/t/tempstorage/tempstorage-2.12.2.zip";
+        md5 = "7a2b76b39839e229249b1bb175604480";
     };
     doCheck = false;
     buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ self."Products.CMFCore-2.2.7" self.setuptools self."zope.i18n__zcml-3.7.4" ];
-    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
+    propagatedBuildInputs = [ self.setuptools self."ZODB3-3.10.5" self."zope.testing-3.9.7" ];
+    installCommand = ''easy_install --always-unzip --prefix="$out" .'';
     meta = {
       description = ''
-        Adaptable string interpolation
+        A RAM-based storage for ZODB
         '';
-      homepage = "http://pypi.python.org/pypi/plone.stringinterp";
-      license = "GPL version 2";
+      homepage = "http://pypi.python.org/pypi/tempstorage";
+      license = "ZPL 2.1";
     };
   };
 
@@ -3501,22 +3545,22 @@ in
   };
 
 
-  "Products.PluginRegistry-1.3" = self.buildPythonPackage {
-    name = "Products.PluginRegistry-1.3";
+  "Acquisition-2.13.8" = self.buildPythonPackage {
+    name = "Acquisition-2.13.8";
     src = fetchurl {
-        url = "https://pypi.python.org/packages/source/P/Products.PluginRegistry/Products.PluginRegistry-1.3.tar.gz";
-        md5 = "5b166193ca1eb84dfb402051f779ebab";
+        url = "https://pypi.python.org/packages/source/A/Acquisition/Acquisition-2.13.8.zip";
+        md5 = "8c33160c157b50649e2b2b3224622579";
     };
     doCheck = false;
-    buildInputs = [  ];
-    propagatedBuildInputs = [ self."Products.GenericSetup-1.7.4" self.setuptools self."Zope2-2.13.21" ];
-    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
+    buildInputs = [ pkgs.unzip ];
+    propagatedBuildInputs = [ self."ExtensionClass-2.13.2" self."zope.interface-3.6.7" ];
+    installCommand = ''easy_install --always-unzip --prefix="$out" .'';
     meta = {
       description = ''
-        Configure application plugins based on interfaces
+        Acquisition is a mechanism that allows objects to obtain attributes from the containment hierarchy they're in.
         '';
-      homepage = "http://pypi.python.org/pypi/Products.PluginRegistry";
-      license = "ZPL 2.1 (http://www.zope.org/Resources/License/ZPL-2.1)";
+      homepage = "http://pypi.python.org/pypi/Acquisition";
+      license = "ZPL 2.1";
     };
   };
 
@@ -3681,22 +3725,22 @@ in
   };
 
 
-  "plone.locking-2.0.4" = self.buildPythonPackage {
-    name = "plone.locking-2.0.4";
+  "mechanize-0.2.5" = self.buildPythonPackage {
+    name = "mechanize-0.2.5";
     src = fetchurl {
-        url = "https://pypi.python.org/packages/source/p/plone.locking/plone.locking-2.0.4.zip";
-        md5 = "a7f8b8db78f57272d351d7fe0d067eb2";
+        url = "https://pypi.python.org/packages/source/m/mechanize/mechanize-0.2.5.tar.gz";
+        md5 = "32657f139fc2fb75bcf193b63b8c60b2";
     };
     doCheck = false;
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ self."Acquisition-2.13.8" self."DateTime-3.0.3" self."Products.CMFCore-2.2.7" self.setuptools self."ZODB3-3.10.5" self."zope.annotation-3.5.0" self."zope.component__zcml-3.9.5" self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."zope.schema-4.2.2" self."zope.viewlet-3.7.2" self."Zope2-2.13.21" ];
-    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
+    buildInputs = [  ];
+    propagatedBuildInputs = [  ];
+    installCommand = ''easy_install --always-unzip --prefix="$out" .'';
     meta = {
       description = ''
-        webdav locking support
+        Stateful programmatic web browsing.
         '';
-      homepage = "http://pypi.python.org/pypi/plone.locking";
-      license = "GPL version 2";
+      homepage = "http://wwwsearch.sourceforge.net/mechanize/";
+      license = "BSD";
     };
   };
 
@@ -3801,6 +3845,26 @@ in
   };
 
 
+  "plone.portlet.static-2.0.2" = self.buildPythonPackage {
+    name = "plone.portlet.static-2.0.2";
+    src = fetchurl {
+        url = "https://pypi.python.org/packages/source/p/plone.portlet.static/plone.portlet.static-2.0.2.zip";
+        md5 = "ec0dc691b4191a41ff97779b117f9985";
+    };
+    doCheck = false;
+    buildInputs = [ pkgs.unzip ];
+    propagatedBuildInputs = [ self."plone.app.form-2.2.3" self."plone.app.portlets-2.4.5" self."plone.i18n-2.0.9" self."plone.portlets-2.2" self.setuptools self."zope.component__zcml-3.9.5" self."zope.formlib-4.0.6" self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."zope.schema-4.2.2" self."Zope2-2.13.21" ];
+    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
+    meta = {
+      description = ''
+        A simple static HTML portlet for Plone.
+        '';
+      homepage = "http://pypi.python.org/pypi/plone.portlet.static";
+      license = "GPL version 2";
+    };
+  };
+
+
   "plone.i18n-2.0.9" = self.buildPythonPackage {
     name = "plone.i18n-2.0.9";
     src = fetchurl {
@@ -3821,11 +3885,31 @@ in
   };
 
 
-  "Products.contentmigration-2.1.5" = self.buildPythonPackage {
-    name = "Products.contentmigration-2.1.5";
+  "Missing-2.13.1" = self.buildPythonPackage {
+    name = "Missing-2.13.1";
     src = fetchurl {
-        url = "https://pypi.python.org/packages/source/P/Products.contentmigration/Products.contentmigration-2.1.5.zip";
-        md5 = "f08e5f2572fc6f4c61b930a17f99418f";
+        url = "https://pypi.python.org/packages/source/M/Missing/Missing-2.13.1.zip";
+        md5 = "9823cff54444cbbcaef8fc45d8e42572";
+    };
+    doCheck = false;
+    buildInputs = [ pkgs.unzip ];
+    propagatedBuildInputs = [ self."ExtensionClass-2.13.2" ];
+    installCommand = ''easy_install --always-unzip --prefix="$out" .'';
+    meta = {
+      description = ''
+        Special Missing objects used in Zope2.
+        '';
+      homepage = "http://pypi.python.org/pypi/Missing";
+      license = "ZPL 2.1";
+    };
+  };
+
+
+  "zope.cachedescriptors-3.5.1" = self.buildPythonPackage {
+    name = "zope.cachedescriptors-3.5.1";
+    src = fetchurl {
+        url = "https://pypi.python.org/packages/source/z/zope.cachedescriptors/zope.cachedescriptors-3.5.1.zip";
+        md5 = "263459a95238fd61d17e815d97ca49ce";
     };
     doCheck = false;
     buildInputs = [ pkgs.unzip ];
@@ -3833,10 +3917,10 @@ in
     installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
     meta = {
       description = ''
-        A generic content migration framework for Plone.
+        Method and property caching decorators
         '';
-      homepage = "http://pypi.python.org/pypi/Products.contentmigration";
-      license = "LGPL";
+      homepage = "http://pypi.python.org/pypi/zope.cachedescriptors";
+      license = "ZPL 2.1";
     };
   };
 
@@ -3850,7 +3934,7 @@ in
     doCheck = false;
     buildInputs = [ pkgs.unzip ];
     propagatedBuildInputs = [ self.setuptools self."zope.browser-1.3" self."zope.component__zcml-3.9.5" self."zope.configuration-3.7.4" self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."zope.pagetemplate-3.6.3" self."zope.publisher-3.12.6" self."zope.schema-4.2.2" self."zope.security__untrustedpython-3.7.4" self."zope.traversing-3.13.2" ];
-    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
+    installCommand = ''easy_install --always-unzip --prefix="$out" .'';
     meta = {
       description = ''
         Browser menu implementation for Zope.
@@ -3861,21 +3945,21 @@ in
   };
 
 
-  "ZODB3-3.10.5" = self.buildPythonPackage {
-    name = "ZODB3-3.10.5";
+  "archetypes.referencebrowserwidget-2.4.19" = self.buildPythonPackage {
+    name = "archetypes.referencebrowserwidget-2.4.19";
     src = fetchurl {
-        url = "https://pypi.python.org/packages/source/Z/ZODB3/ZODB3-3.10.5.tar.gz";
-        md5 = "6f180c6897a1820948fee2a6290503cd";
+        url = "https://pypi.python.org/packages/source/a/archetypes.referencebrowserwidget/archetypes.referencebrowserwidget-2.4.19.zip";
+        md5 = "b70af6b2da6d8c57c1138a52e94e588c";
     };
     doCheck = false;
-    buildInputs = [  ];
-    propagatedBuildInputs = [ self."transaction-1.1.1" self."zc.lockfile-1.0.2" self."ZConfig-2.9.1" self."zdaemon-2.0.7" self."zope.event-3.5.2" self."zope.interface-3.6.7" ];
+    buildInputs = [ pkgs.unzip ];
+    propagatedBuildInputs = [ self."plone.app.form-2.2.3" self."plone.app.jquerytools-1.5.6" self.setuptools self."zope.component__zcml-3.9.5" self."zope.formlib-4.0.6" self."zope.interface-3.6.7" ];
     installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
     meta = {
       description = ''
-        Zope Object Database: object database and persistence
+        A referencebrowser implementation for Archetypes
         '';
-      homepage = "UNKNOWN";
+      homepage = "http://pypi.python.org/pypi/archetypes.referencebrowserwidget";
       license = "ZPL 2.1";
     };
   };
@@ -3929,7 +4013,7 @@ in
     };
     doCheck = true;
     buildInputs = [ self."nose-1.3.0" self."unittest2-0.5.1" self."pyquery-1.2.4" self."WSGIProxy2-0.3" self."PasteDeploy-1.5.0" self."mock-1.0.1" self."coverage-3.6" pkgs.unzip ];
-    propagatedBuildInputs = [ self."beautifulsoup4-4.3.1" self."six-1.4.1" self."waitress-0.8.7" self."WebOb-1.2.3" ];
+    propagatedBuildInputs = [ self."beautifulsoup4-4.3.2" self."six-1.4.1" self."waitress-0.8.7" self."WebOb-1.2.3" ];
     installCommand = ''easy_install --always-unzip --prefix="$out" .'';
     meta = {
       description = ''
@@ -4010,7 +4094,7 @@ in
     doCheck = false;
     buildInputs = [  ];
     propagatedBuildInputs = [ self."zope.interface-3.6.7" ];
-    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
+    installCommand = ''easy_install --always-unzip --prefix="$out" .'';
     meta = {
       description = ''
         Transaction management for Python
@@ -4021,22 +4105,22 @@ in
   };
 
 
-  "zope.cachedescriptors-3.5.1" = self.buildPythonPackage {
-    name = "zope.cachedescriptors-3.5.1";
+  "plone.app.theming-1.1.1" = self.buildPythonPackage {
+    name = "plone.app.theming-1.1.1";
     src = fetchurl {
-        url = "https://pypi.python.org/packages/source/z/zope.cachedescriptors/zope.cachedescriptors-3.5.1.zip";
-        md5 = "263459a95238fd61d17e815d97ca49ce";
+        url = "https://pypi.python.org/packages/source/p/plone.app.theming/plone.app.theming-1.1.1.zip";
+        md5 = "a694b7a050b6e7c25d720d1e99bb73fa";
     };
     doCheck = false;
     buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ self.setuptools ];
+    propagatedBuildInputs = [ self."diazo-1.0.4" self."docutils-0.9.1" self."five.globalrequest-1.0" self."lxml-2.3.6" self."plone.app.registry-1.2.3" self."plone.resource-1.0.2" self."plone.resourceeditor-1.0" self."plone.subrequest-1.6.7" self."plone.transformchain-1.0.3" self."Products.CMFPlone-4.3.2" self."repoze.xmliter-0.5" self."roman-1.4.0" self.setuptools self."zope.traversing-3.13.2" ];
     installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
     meta = {
       description = ''
-        Method and property caching decorators
+        Integrates the Diazo theming engine with Plone
         '';
-      homepage = "http://pypi.python.org/pypi/zope.cachedescriptors";
-      license = "ZPL 2.1";
+      homepage = "http://pypi.python.org/pypi/plone.app.theming";
+      license = "GPL";
     };
   };
 
@@ -4150,7 +4234,7 @@ in
     doCheck = false;
     buildInputs = [  ];
     propagatedBuildInputs = [ self.setuptools self."zope.interface-3.6.7" ];
-    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
+    installCommand = ''easy_install --always-unzip --prefix="$out" .'';
     meta = {
       description = ''
         Zope Exceptions
@@ -4181,22 +4265,22 @@ in
   };
 
 
-  "plone.z3cform-0.8.0" = self.buildPythonPackage {
-    name = "plone.z3cform-0.8.0";
+  "plone.app.caching-1.1.6" = self.buildPythonPackage {
+    name = "plone.app.caching-1.1.6";
     src = fetchurl {
-        url = "https://pypi.python.org/packages/source/p/plone.z3cform/plone.z3cform-0.8.0.zip";
-        md5 = "bdb23dd162544964d2f8f8f5f002e874";
+        url = "https://pypi.python.org/packages/source/p/plone.app.caching/plone.app.caching-1.1.6.zip";
+        md5 = "52f817d67e6da1508bf6f1486e5466d2";
     };
     doCheck = false;
     buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ self."plone.batching-1.0" self.setuptools self."z3c.form-3.0.2" self."zope.browserpage-3.12.2" self."zope.component__zcml-3.9.5" self."zope.i18n__zcml-3.7.4" self."Zope2-2.13.21" ];
+    propagatedBuildInputs = [ self."Acquisition-2.13.8" self."plone.app.registry-1.2.3" self."plone.app.z3cform-0.7.4" self."plone.cachepurging-1.0.4" self."plone.caching-1.0" self."plone.memoize-1.1.1" self."plone.protect-2.0.2" self."plone.registry-1.0.1" self."Products.CMFCore-2.2.7" self."Products.CMFDynamicViewFTI-4.0.5" self."Products.GenericSetup-1.7.4" self."Products.statusmessages-4.0" self."python-dateutil-1.5" self.setuptools self."z3c.form-3.0.2" self."z3c.zcmlhook-1.0b1" self."zope.browserresource-3.10.3" self."zope.component__zcml-3.9.5" self."zope.interface-3.6.7" self."zope.pagetemplate-3.6.3" self."zope.publisher-3.12.6" self."Zope2-2.13.21" ];
     installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
     meta = {
       description = ''
-        plone.z3cform is a library that allows use of z3c.form with Zope 2 and the CMF.
+        Plone UI and default rules for plone.caching/z3c.caching
         '';
-      homepage = "http://pypi.python.org/pypi/plone.z3cform";
-      license = "ZPL 2.1";
+      homepage = "http://pypi.python.org/pypi/plone.app.caching";
+      license = "GPL version 2";
     };
   };
 
@@ -4210,7 +4294,7 @@ in
     doCheck = false;
     buildInputs = [ pkgs.unzip ];
     propagatedBuildInputs = [ self."Acquisition-2.13.8" self."DateTime-3.0.3" self."ExtensionClass-2.13.2" self."Persistence-2.13.2" self."Record-2.13.0" self."RestrictedPython-3.6.0" self."transaction-1.1.1" self."zExceptions-2.13.0" self."ZODB3-3.10.5" self."zope.component__zcml-3.9.5" self."zope.configuration-3.7.4" self."zope.deferredimport-3.5.3" self."zope.interface-3.6.7" self."zope.publisher-3.12.6" self."zope.schema-4.2.2" self."zope.security__untrustedpython-3.7.4" self."zope.testing-3.9.7" ];
-    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
+    installCommand = ''easy_install --always-unzip --prefix="$out" .'';
     meta = {
       description = ''
         Security framework for Zope2.
@@ -4230,7 +4314,7 @@ in
     doCheck = false;
     buildInputs = [ pkgs.unzip ];
     propagatedBuildInputs = [ self."ExtensionClass-2.13.2" ];
-    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
+    installCommand = ''easy_install --always-unzip --prefix="$out" .'';
     meta = {
       description = ''
         Special Record objects used in Zope2.
@@ -4261,21 +4345,21 @@ in
   };
 
 
-  "plone.resourceeditor-1.0" = self.buildPythonPackage {
-    name = "plone.resourceeditor-1.0";
+  "Products.CMFPlacefulWorkflow-1.5.9" = self.buildPythonPackage {
+    name = "Products.CMFPlacefulWorkflow-1.5.9";
     src = fetchurl {
-        url = "https://pypi.python.org/packages/source/p/plone.resourceeditor/plone.resourceeditor-1.0.zip";
-        md5 = "443ff0a0ad83b94fc08cac46ee3b2ad4";
+        url = "https://pypi.python.org/packages/source/P/Products.CMFPlacefulWorkflow/Products.CMFPlacefulWorkflow-1.5.9.zip";
+        md5 = "9041e1f52eab5b348c0dfa85be438722";
     };
     doCheck = false;
     buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ self."plone.resource-1.0.2" self.setuptools self."zope.component__zcml-3.9.5" self."zope.interface-3.6.7" self."zope.publisher-3.12.6" self."zope.schema-4.2.2" self."Zope2-2.13.21" ];
+    propagatedBuildInputs = [ self."Products.CMFCore-2.2.7" self."Products.CMFPlone-4.3.2" self."Products.GenericSetup-1.7.4" self."Products.PloneTestCase-0.9.17" self.setuptools self."zope.component__zcml-3.9.5" self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."zope.testing-3.9.7" ];
     installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
     meta = {
       description = ''
-        UNKNOWN
+        Workflow policies for CMF and Plone
         '';
-      homepage = "https://github.com/plone/plone.resourceeditor";
+      homepage = "http://pypi.python.org/pypi/Products.CMFPlacefulWorkflow";
       license = "GPL";
     };
   };
@@ -4290,7 +4374,7 @@ in
     doCheck = false;
     buildInputs = [  ];
     propagatedBuildInputs = [ self.setuptools ];
-    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
+    installCommand = ''easy_install --always-unzip --prefix="$out" .'';
     meta = {
       description = ''
         Very basic event publishing system
@@ -4330,7 +4414,7 @@ in
     doCheck = false;
     buildInputs = [ pkgs.unzip ];
     propagatedBuildInputs = [  ];
-    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
+    installCommand = ''easy_install --always-unzip --prefix="$out" .'';
     meta = {
       description = ''
         Convenience uid/gid helper function used in Zope2.
@@ -4350,7 +4434,7 @@ in
     doCheck = false;
     buildInputs = [  ];
     propagatedBuildInputs = [ self."ZConfig-2.9.1" ];
-    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
+    installCommand = ''easy_install --always-unzip --prefix="$out" .'';
     meta = {
       description = ''
         Daemon process control library and tools for Unix-based systems
@@ -4470,7 +4554,7 @@ in
     doCheck = false;
     buildInputs = [ pkgs.unzip ];
     propagatedBuildInputs = [ self.setuptools self."zope.interface-3.6.7" ];
-    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
+    installCommand = ''easy_install --always-unzip --prefix="$out" .'';
     meta = {
       description = ''
         Shared Zope Toolkit browser components
@@ -4521,84 +4605,82 @@ in
   };
 
 
-  "Plone" = self."Plone-4.3.2";
-
-  "Plone-4.3.2" = self.buildPythonPackage {
-    name = "Plone-4.3.2";
+  "Products.PluggableAuthService-1.10.0" = self.buildPythonPackage {
+    name = "Products.PluggableAuthService-1.10.0";
     src = fetchurl {
-        url = "https://pypi.python.org/packages/source/P/Plone/Plone-4.3.2.zip";
-        md5 = "809f9fe8b8d23b49778e8ce304ea34f6";
+        url = "https://pypi.python.org/packages/source/P/Products.PluggableAuthService/Products.PluggableAuthService-1.10.0.tar.gz";
+        md5 = "1a1db6b1d9dd34f8b93a8a3104385a37";
     };
     doCheck = false;
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ self."plone.app.caching-1.1.6" self."plone.app.dexterity-2.0.9" self."plone.app.iterate-2.1.10" self."plone.app.openid-2.0.2" self."plone.app.theming-1.1.1" self."Products.CMFPlacefulWorkflow-1.5.9" self."Products.CMFPlone-4.3.2" self.setuptools self."wicked-1.1.10" ];
+    buildInputs = [  ];
+    propagatedBuildInputs = [ self."Products.GenericSetup-1.7.4" self."Products.PluginRegistry-1.3" self.setuptools self."Zope2-2.13.21" ];
     installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
     meta = {
       description = ''
-        The Plone Content Management System
+        Pluggable Zope2 authentication / authorization framework
         '';
-      homepage = "http://plone.org/";
-      license = "GPL version 2";
+      homepage = "http://pypi.python.org/pypi/Products.PluggableAuthService";
+      license = "ZPL 2.1 (http://www.zope.org/Resources/License/ZPL-2.1)";
     };
   };
 
 
-  "plone.app.jquerytools-1.5.6" = self.buildPythonPackage {
-    name = "plone.app.jquerytools-1.5.6";
+  "wicked-1.1.10" = self.buildPythonPackage {
+    name = "wicked-1.1.10";
     src = fetchurl {
-        url = "https://pypi.python.org/packages/source/p/plone.app.jquerytools/plone.app.jquerytools-1.5.6.zip";
-        md5 = "4ae9a72baa8e9899c1706b4fedbb516b";
+        url = "https://pypi.python.org/packages/source/w/wicked/wicked-1.1.10.zip";
+        md5 = "f65611f11d547d7dc8e623bf87d3929d";
     };
     doCheck = false;
     buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ self."Products.CMFCore-2.2.7" self."Products.GenericSetup-1.7.4" self.setuptools self."zope.component__zcml-3.9.5" self."Zope2-2.13.21" ];
+    propagatedBuildInputs = [ self.setuptools self."zope.container-3.11.2" self."zope.lifecycleevent-3.6.2" self."zope.schema-4.2.2" self."zope.traversing-3.13.2" ];
     installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
     meta = {
       description = ''
-        jQuery Tools integration for Plone plus overlay and AJAX form helpers.
+        wicked is a compact syntax for doing wiki-like content linking and creation in zope and plone
         '';
-      homepage = "http://pypi.python.org/pypi/plone.app.jquerytools";
-      license = "GPL version 2";
+      homepage = "http://pypi.python.org/pypi/wicked";
+      license = "GPL";
     };
   };
 
 
-  "zope.broken-3.6.0" = self.buildPythonPackage {
-    name = "zope.broken-3.6.0";
+  "Products.GenericSetup-1.7.4" = self.buildPythonPackage {
+    name = "Products.GenericSetup-1.7.4";
     src = fetchurl {
-        url = "https://pypi.python.org/packages/source/z/zope.broken/zope.broken-3.6.0.zip";
-        md5 = "eff24d7918099a3e899ee63a9c31bee6";
+        url = "https://pypi.python.org/packages/source/P/Products.GenericSetup/Products.GenericSetup-1.7.4.tar.gz";
+        md5 = "f93251ed519e8c4aea0bc001416027b1";
     };
     doCheck = false;
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ self.setuptools self."zope.interface-3.6.7" ];
+    buildInputs = [  ];
+    propagatedBuildInputs = [ self."five.localsitemanager-2.0.5" self.setuptools self."zope.formlib-4.0.6" self."Zope2-2.13.21" ];
     installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
     meta = {
       description = ''
-        Zope Broken Object Interfaces
+        Read Zope configuration state from profile dirs / tarballs
         '';
-      homepage = "http://pypi.python.org/pypi/zope.broken";
-      license = "ZPL 2.1";
+      homepage = "http://pypi.python.org/pypi/Products.GenericSetup";
+      license = "ZPL 2.1 (http://www.zope.org/Resources/License/ZPL-2.1)";
     };
   };
 
 
-  "ExtensionClass-2.13.2" = self.buildPythonPackage {
-    name = "ExtensionClass-2.13.2";
+  "plone.app.viewletmanager-2.0.4" = self.buildPythonPackage {
+    name = "plone.app.viewletmanager-2.0.4";
     src = fetchurl {
-        url = "https://pypi.python.org/packages/source/E/ExtensionClass/ExtensionClass-2.13.2.zip";
-        md5 = "0236e6d7da9e8b87b9ba45f1b8f930b8";
+        url = "https://pypi.python.org/packages/source/p/plone.app.viewletmanager/plone.app.viewletmanager-2.0.4.zip";
+        md5 = "565a12ac71d20b2823b9e44daebe432f";
     };
     doCheck = false;
     buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [  ];
+    propagatedBuildInputs = [ self."Acquisition-2.13.8" self."plone.app.vocabularies-2.1.11" self."Products.GenericSetup-1.7.4" self.setuptools self."ZODB3-3.10.5" self."zope.component__zcml-3.9.5" self."zope.contentprovider-3.7.2" self."zope.interface-3.6.7" self."zope.site-3.9.2" self."zope.viewlet-3.7.2" self."Zope2-2.13.21" ];
     installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
     meta = {
       description = ''
-        Metaclass for subclassable extension types
+        configurable viewlet manager
         '';
-      homepage = "http://pypi.python.org/pypi/ExtensionClass";
-      license = "ZPL 2.1";
+      homepage = "http://pypi.python.org/pypi/plone.app.viewletmanager";
+      license = "GPL version 2";
     };
   };
 
@@ -4623,26 +4705,6 @@ in
   };
 
 
-  "zope.browserpage-3.12.2" = self.buildPythonPackage {
-    name = "zope.browserpage-3.12.2";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/z/zope.browserpage/zope.browserpage-3.12.2.tar.gz";
-        md5 = "a543ef3cb1b42f7233b3fca23dc9ea60";
-    };
-    doCheck = false;
-    buildInputs = [  ];
-    propagatedBuildInputs = [ self.setuptools self."zope.component__zcml-3.9.5" self."zope.configuration-3.7.4" self."zope.interface-3.6.7" self."zope.pagetemplate-3.6.3" self."zope.publisher-3.12.6" self."zope.schema-4.2.2" self."zope.security__untrustedpython-3.7.4" self."zope.traversing-3.13.2" ];
-    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-    meta = {
-      description = ''
-        ZCML directives for configuring browser views for Zope.
-        '';
-      homepage = "http://pypi.python.org/pypi/zope.browserpage/";
-      license = "ZPL 2.1";
-    };
-  };
-
-
   "zope.structuredtext-3.5.1" = self.buildPythonPackage {
     name = "zope.structuredtext-3.5.1";
     src = fetchurl {
@@ -4652,7 +4714,7 @@ in
     doCheck = false;
     buildInputs = [  ];
     propagatedBuildInputs = [ self.setuptools ];
-    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
+    installCommand = ''easy_install --always-unzip --prefix="$out" .'';
     meta = {
       description = ''
         StructuredText parser
@@ -4692,7 +4754,7 @@ in
     doCheck = false;
     buildInputs = [ pkgs.unzip ];
     propagatedBuildInputs = [  ];
-    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
+    installCommand = ''easy_install --always-unzip --prefix="$out" .'';
     meta = {
       description = ''
         ZODB undo support for Zope2.
@@ -4712,7 +4774,7 @@ in
     doCheck = false;
     buildInputs = [ pkgs.unzip ];
     propagatedBuildInputs = [ self.setuptools self."zope.component__zcml-3.9.5" self."zope.i18n__zcml-3.7.4" self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."zope.location-3.9.1" self."zope.proxy-3.6.1" self."zope.publisher-3.12.6" self."zope.security__untrustedpython-3.7.4" ];
-    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
+    installCommand = ''easy_install --always-unzip --prefix="$out" .'';
     meta = {
       description = ''
         Resolving paths in the object hierarchy
@@ -4732,7 +4794,7 @@ in
     doCheck = false;
     buildInputs = [  ];
     propagatedBuildInputs = [ self.setuptools self."zope.component__zcml-3.9.5" self."zope.event-3.5.2" self."zope.interface-3.6.7" self."zope.location-3.9.1" self."zope.publisher-3.12.6" self."zope.schema-4.2.2" self."zope.tales-3.5.3" ];
-    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
+    installCommand = ''easy_install --always-unzip --prefix="$out" .'';
     meta = {
       description = ''
         Content Provider Framework for Zope Templates
@@ -4783,22 +4845,22 @@ in
   };
 
 
-  "plone.portlet.static-2.0.2" = self.buildPythonPackage {
-    name = "plone.portlet.static-2.0.2";
+  "zope.browserpage-3.12.2" = self.buildPythonPackage {
+    name = "zope.browserpage-3.12.2";
     src = fetchurl {
-        url = "https://pypi.python.org/packages/source/p/plone.portlet.static/plone.portlet.static-2.0.2.zip";
-        md5 = "ec0dc691b4191a41ff97779b117f9985";
+        url = "https://pypi.python.org/packages/source/z/zope.browserpage/zope.browserpage-3.12.2.tar.gz";
+        md5 = "a543ef3cb1b42f7233b3fca23dc9ea60";
     };
     doCheck = false;
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ self."plone.app.form-2.2.3" self."plone.app.portlets-2.4.5" self."plone.i18n-2.0.9" self."plone.portlets-2.2" self.setuptools self."zope.component__zcml-3.9.5" self."zope.formlib-4.0.6" self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."zope.schema-4.2.2" self."Zope2-2.13.21" ];
-    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
+    buildInputs = [  ];
+    propagatedBuildInputs = [ self.setuptools self."zope.component__zcml-3.9.5" self."zope.configuration-3.7.4" self."zope.interface-3.6.7" self."zope.pagetemplate-3.6.3" self."zope.publisher-3.12.6" self."zope.schema-4.2.2" self."zope.security__untrustedpython-3.7.4" self."zope.traversing-3.13.2" ];
+    installCommand = ''easy_install --always-unzip --prefix="$out" .'';
     meta = {
       description = ''
-        A simple static HTML portlet for Plone.
+        ZCML directives for configuring browser views for Zope.
         '';
-      homepage = "http://pypi.python.org/pypi/plone.portlet.static";
-      license = "GPL version 2";
+      homepage = "http://pypi.python.org/pypi/zope.browserpage/";
+      license = "ZPL 2.1";
     };
   };
 
@@ -4883,22 +4945,22 @@ in
   };
 
 
-  "Acquisition-2.13.8" = self.buildPythonPackage {
-    name = "Acquisition-2.13.8";
+  "Products.PluginRegistry-1.3" = self.buildPythonPackage {
+    name = "Products.PluginRegistry-1.3";
     src = fetchurl {
-        url = "https://pypi.python.org/packages/source/A/Acquisition/Acquisition-2.13.8.zip";
-        md5 = "8c33160c157b50649e2b2b3224622579";
+        url = "https://pypi.python.org/packages/source/P/Products.PluginRegistry/Products.PluginRegistry-1.3.tar.gz";
+        md5 = "5b166193ca1eb84dfb402051f779ebab";
     };
     doCheck = false;
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ self."ExtensionClass-2.13.2" self."zope.interface-3.6.7" ];
+    buildInputs = [  ];
+    propagatedBuildInputs = [ self."Products.GenericSetup-1.7.4" self.setuptools self."Zope2-2.13.21" ];
     installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
     meta = {
       description = ''
-        Acquisition is a mechanism that allows objects to obtain attributes from the containment hierarchy they're in.
+        Configure application plugins based on interfaces
         '';
-      homepage = "http://pypi.python.org/pypi/Acquisition";
-      license = "ZPL 2.1";
+      homepage = "http://pypi.python.org/pypi/Products.PluginRegistry";
+      license = "ZPL 2.1 (http://www.zope.org/Resources/License/ZPL-2.1)";
     };
   };
 
@@ -4932,7 +4994,7 @@ in
     doCheck = false;
     buildInputs = [  ];
     propagatedBuildInputs = [ self."ZConfig-2.9.1" ];
-    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
+    installCommand = ''easy_install --always-unzip --prefix="$out" .'';
     meta = {
       description = ''
         A general logging facility
@@ -4952,7 +5014,7 @@ in
     doCheck = false;
     buildInputs = [  ];
     propagatedBuildInputs = [ self.setuptools self."zope.component__zcml-3.9.5" self."zope.interface-3.6.7" self."zope.proxy-3.6.1" self."zope.schema-4.2.2" ];
-    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
+    installCommand = ''easy_install --always-unzip --prefix="$out" .'';
     meta = {
       description = ''
         Zope Location
@@ -5072,7 +5134,7 @@ in
     doCheck = false;
     buildInputs = [ pkgs.unzip ];
     propagatedBuildInputs = [ self."AccessControl-3.0.8" self."Acquisition-2.13.8" self."ExtensionClass-2.13.2" self."RestrictedPython-3.6.0" self."zExceptions-2.13.0" self."zope.sequencesort-3.4.0" self."zope.structuredtext-3.5.1" ];
-    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
+    installCommand = ''easy_install --always-unzip --prefix="$out" .'';
     meta = {
       description = ''
         Document Templating Markup Language (DTML)
@@ -5132,7 +5194,7 @@ in
     doCheck = false;
     buildInputs = [  ];
     propagatedBuildInputs = [ self.setuptools ];
-    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
+    installCommand = ''easy_install --always-unzip --prefix="$out" .'';
     meta = {
       description = ''
         Message Identifiers for internationalization
diff --git a/pkgs/top-level/python-packages.json b/pkgs/top-level/python-packages.json
index f6733ace2e8..36975402e24 100644
--- a/pkgs/top-level/python-packages.json
+++ b/pkgs/top-level/python-packages.json
@@ -122,5 +122,9 @@
         ]
       }
     }
+  },
+  { "name": "plone.recipe.zope2instance",
+    "extends": "http://dist.plone.org/release/4.3.2/versions.cfg",
+    "doCheck": false
   }
 ]
-- 
GitLab


From 6d247f81b4f304c0b5de6c8c89817964081353e6 Mon Sep 17 00:00:00 2001
From: Rickard Nilsson <rickynils@gmail.com>
Date: Thu, 3 Oct 2013 14:45:25 +0200
Subject: [PATCH 4952/5331] network-manager: Rename dispatcher service

Rename NetworkManager-dispatcher.service to
dbus-org.freedesktop.nm-dispatcher.service so it is found by systemd (NixOS
doesn't handle the Alias directive in the unit file)
---
 pkgs/tools/networking/network-manager/default.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/tools/networking/network-manager/default.nix b/pkgs/tools/networking/network-manager/default.nix
index adc1cd7481b..25494d75f0d 100644
--- a/pkgs/tools/networking/network-manager/default.nix
+++ b/pkgs/tools/networking/network-manager/default.nix
@@ -59,6 +59,9 @@ stdenv.mkDerivation rec {
       
       # FIXME: Workaround until NixOS' dbus+systemd supports at_console policy
       substituteInPlace $out/etc/dbus-1/system.d/org.freedesktop.NetworkManager.conf --replace 'at_console="true"' 'group="networkmanager"'
+
+      # As NixOS doesn't seem to handle systemd Aliases, we just rename the dispatcher service file
+      mv $out/etc/systemd/system/NetworkManager-dispatcher.service $out/etc/systemd/system/dbus-org.freedesktop.nm-dispatcher.service
     '';
 
   meta = with stdenv.lib; {
-- 
GitLab


From 85e912be63f11c7535bafa3e1ce4dfbe411bd5e3 Mon Sep 17 00:00:00 2001
From: Sander van der Burg <svanderburg@gmail.com>
Date: Thu, 3 Oct 2013 14:59:48 +0200
Subject: [PATCH 4953/5331] Added connect-jade-static, plist-native, x509
 nodejs packages

---
 pkgs/top-level/node-packages-generated.nix | 108 +++++++++++++++++----
 pkgs/top-level/node-packages.json          |   5 +-
 2 files changed, 93 insertions(+), 20 deletions(-)

diff --git a/pkgs/top-level/node-packages-generated.nix b/pkgs/top-level/node-packages-generated.nix
index 4e3898f61b6..c21699fdb6b 100644
--- a/pkgs/top-level/node-packages-generated.nix
+++ b/pkgs/top-level/node-packages-generated.nix
@@ -2390,6 +2390,24 @@
     ];
     passthru.names = [ "connect-flash" ];
   };
+  full."connect-jade-static"."*" = lib.makeOverridable self.buildNodePackage {
+    name = "connect-jade-static-0.1.1";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/connect-jade-static/-/connect-jade-static-0.1.1.tgz";
+        sha1 = "11d16fa00aca28cb004e89cd0a7d6b0fa0342cdb";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."connect-jade-static"."*" or []);
+    deps = [
+      self.full."jade"."*"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "connect-jade-static" ];
+  };
+  "connect-jade-static" = self.full."connect-jade-static"."*";
   full."connect-mongo"."*" = lib.makeOverridable self.buildNodePackage {
     name = "connect-mongo-0.3.3";
     src = [
@@ -4101,11 +4119,11 @@
     passthru.names = [ "form-data" ];
   };
   full."form-data"."~0.1.0" = lib.makeOverridable self.buildNodePackage {
-    name = "form-data-0.1.1";
+    name = "form-data-0.1.2";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/form-data/-/form-data-0.1.1.tgz";
-        sha1 = "0d5f2805647b45533ba10bc8a59cf17d1efa5f12";
+        url = "http://registry.npmjs.org/form-data/-/form-data-0.1.2.tgz";
+        sha1 = "1143c21357911a78dd7913b189b4bab5d5d57445";
       })
     ];
     buildInputs =
@@ -5965,16 +5983,16 @@
     ];
     passthru.names = [ "intersect" ];
   };
-  full."ironhorse"."0.0.8" = lib.makeOverridable self.buildNodePackage {
-    name = "ironhorse-0.0.8";
+  full."ironhorse"."*" = lib.makeOverridable self.buildNodePackage {
+    name = "ironhorse-0.0.9";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/ironhorse/-/ironhorse-0.0.8.tgz";
-        sha1 = "b0c9c0908e6e22f7a48001be48533f12227c7980";
+        url = "http://registry.npmjs.org/ironhorse/-/ironhorse-0.0.9.tgz";
+        sha1 = "9cfaf75e464a0bf394d511a05c0a8b8de080a1d9";
       })
     ];
     buildInputs =
-      (self.nativeDeps."ironhorse"."0.0.8" or []);
+      (self.nativeDeps."ironhorse"."*" or []);
     deps = [
       self.full."underscore"."~1.5.2"
       self.full."winston"."*"
@@ -5985,7 +6003,7 @@
       self.full."jade"."*"
       self.full."passport"."*"
       self.full."passport-http"."*"
-      self.full."libyaml"."*"
+      self.full."js-yaml"."*"
       self.full."mongoose"."3.6.x"
       self.full."gridfs-stream"."*"
       self.full."temp"."*"
@@ -5997,7 +6015,7 @@
     ];
     passthru.names = [ "ironhorse" ];
   };
-  "ironhorse" = self.full."ironhorse"."0.0.8";
+  "ironhorse" = self.full."ironhorse"."*";
   full."is-promise"."~1" = lib.makeOverridable self.buildNodePackage {
     name = "is-promise-1.0.0";
     src = [
@@ -6998,6 +7016,23 @@
     ];
     passthru.names = [ "less" ];
   };
+  full."libxmljs"."~0.8.1" = lib.makeOverridable self.buildNodePackage {
+    name = "libxmljs-0.8.1";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/libxmljs/-/libxmljs-0.8.1.tgz";
+        sha1 = "b8b1d3962a92dbc5be9dc798bac028e09db8d630";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."libxmljs"."~0.8.1" or []);
+    deps = [
+      self.full."bindings"."1.0.0"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "libxmljs" ];
+  };
   full."libyaml"."*" = lib.makeOverridable self.buildNodePackage {
     name = "libyaml-0.2.2";
     src = [
@@ -7538,11 +7573,11 @@
     passthru.names = [ "mime" ];
   };
   full."mimelib"."~0.2" = lib.makeOverridable self.buildNodePackage {
-    name = "mimelib-0.2.12";
+    name = "mimelib-0.2.13";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/mimelib/-/mimelib-0.2.12.tgz";
-        sha1 = "5dcbb99c7369e5d62d7e12e71fa334179aebd748";
+        url = "http://registry.npmjs.org/mimelib/-/mimelib-0.2.13.tgz";
+        sha1 = "0668eb85e870c510be747a67ece43b9bbf8e20b0";
       })
     ];
     buildInputs =
@@ -10150,6 +10185,24 @@
     ];
     passthru.names = [ "pkginfo" ];
   };
+  full."plist-native"."*" = lib.makeOverridable self.buildNodePackage {
+    name = "plist-native-0.2.2";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/plist-native/-/plist-native-0.2.2.tgz";
+        sha1 = "6abde856b07a52f0d6bc027f7750f4d97ff93858";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."plist-native"."*" or []);
+    deps = [
+      self.full."libxmljs"."~0.8.1"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "plist-native" ];
+  };
+  "plist-native" = self.full."plist-native"."*";
   full."policyfile"."0.0.4" = lib.makeOverridable self.buildNodePackage {
     name = "policyfile-0.0.4";
     src = [
@@ -10854,11 +10907,11 @@
     passthru.names = [ "redeyed" ];
   };
   full."redis"."*" = lib.makeOverridable self.buildNodePackage {
-    name = "redis-0.8.5";
+    name = "redis-0.8.6";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/redis/-/redis-0.8.5.tgz";
-        sha1 = "ffacd223164fc506b50e5b836133162588691106";
+        url = "http://registry.npmjs.org/redis/-/redis-0.8.6.tgz";
+        sha1 = "a7ae8f0d6fad24bdeaffe28158d6cd1f1c9d30b8";
       })
     ];
     buildInputs =
@@ -10904,11 +10957,11 @@
     passthru.names = [ "redis" ];
   };
   full."redis".">= 0.6.6" = lib.makeOverridable self.buildNodePackage {
-    name = "redis-0.8.5";
+    name = "redis-0.8.6";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/redis/-/redis-0.8.5.tgz";
-        sha1 = "ffacd223164fc506b50e5b836133162588691106";
+        url = "http://registry.npmjs.org/redis/-/redis-0.8.6.tgz";
+        sha1 = "a7ae8f0d6fad24bdeaffe28158d6cd1f1c9d30b8";
       })
     ];
     buildInputs =
@@ -14365,6 +14418,23 @@
     passthru.names = [ "wu" ];
   };
   "wu" = self.full."wu"."*";
+  full."x509"."*" = lib.makeOverridable self.buildNodePackage {
+    name = "x509-0.0.6";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/x509/-/x509-0.0.6.tgz";
+        sha1 = "b58747854ff33df7ff8f1653756bff6a32a8c838";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."x509"."*" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "x509" ];
+  };
+  "x509" = self.full."x509"."*";
   full."xml2js"."0.2.4" = lib.makeOverridable self.buildNodePackage {
     name = "xml2js-0.2.4";
     src = [
diff --git a/pkgs/top-level/node-packages.json b/pkgs/top-level/node-packages.json
index c6b17ae902e..dd4bec4bc88 100644
--- a/pkgs/top-level/node-packages.json
+++ b/pkgs/top-level/node-packages.json
@@ -67,7 +67,7 @@
 , "gridfs-stream"
 , "tar"
 , "flatiron"
-, { "ironhorse": "0.0.8" }
+, "ironhorse"
 , "fs-walk"
 , "yo"
 , "generator-webapp"
@@ -102,4 +102,7 @@
 , "chai"
 , "selenium-webdriver"
 , "webdrvr"
+, "connect-jade-static"
+, "plist-native"
+, "x509"
 ]
-- 
GitLab


From f295cf2395b8a4e0ca8d75b0414c07adb81aa9a3 Mon Sep 17 00:00:00 2001
From: Jaka Hudoklin <jakahudoklin@gmail.com>
Date: Thu, 3 Oct 2013 15:35:34 +0200
Subject: [PATCH 4954/5331] Add ettercap, a comprehensive suite for man in the
 middle attacks

---
 .../networking/sniffers/ettercap/default.nix  | 33 +++++++++++++++++++
 pkgs/development/libraries/libnet/default.nix | 18 ++++++++++
 pkgs/top-level/all-packages.nix               |  4 +++
 3 files changed, 55 insertions(+)
 create mode 100644 pkgs/applications/networking/sniffers/ettercap/default.nix
 create mode 100644 pkgs/development/libraries/libnet/default.nix

diff --git a/pkgs/applications/networking/sniffers/ettercap/default.nix b/pkgs/applications/networking/sniffers/ettercap/default.nix
new file mode 100644
index 00000000000..d468c69fbeb
--- /dev/null
+++ b/pkgs/applications/networking/sniffers/ettercap/default.nix
@@ -0,0 +1,33 @@
+{ stdenv, fetchurl, cmake, libpcap, libnet, zlib, curl, pcre,
+  openssl, ncurses, glib, gtk, atk, pango, flex, bison }:
+
+stdenv.mkDerivation rec {
+  name = "ettercap-${version}";
+  version = "0.8.0";
+
+  src = fetchurl {
+    url = "https://github.com/Ettercap/ettercap/archive/v${version}.tar.gz";
+    sha256 = "1g69782wk2hag8h76jqy81szw5jhvqqnn3m4v0wjkbv9zjxy44w0";
+  };
+
+  buildInputs = [
+    cmake libpcap libnet zlib curl pcre openssl ncurses
+    glib gtk atk pango flex bison
+  ];
+
+  preConfigure = ''
+    substituteInPlace CMakeLists.txt --replace /etc \$\{INSTALL_PREFIX\}/etc
+  '';
+
+  cmakeFlags = [
+    "-DGTK2_GLIBCONFIG_INCLUDE_DIR=${glib}/lib/glib-2.0/include"
+    "-DGTK2_GDKCONFIG_INCLUDE_DIR=${gtk}/lib/gtk-2.0/include"
+  ];
+
+  meta = {
+    description = "Ettercap is a comprehensive suite for man in the middle attacks.";
+    homepage = http://ettercap.github.io/ettercap/;
+    license = stdenv.lib.licenses.gpl2;
+    platforms = stdenv.lib.platforms.unix;
+  };
+}
diff --git a/pkgs/development/libraries/libnet/default.nix b/pkgs/development/libraries/libnet/default.nix
new file mode 100644
index 00000000000..42ef4d30a12
--- /dev/null
+++ b/pkgs/development/libraries/libnet/default.nix
@@ -0,0 +1,18 @@
+{ stdenv, fetchurl }:
+
+stdenv.mkDerivation rec {
+  name = "libnet-${version}";
+  version = "1.2-rc2";
+
+  src = fetchurl {
+    url = "mirror://sourceforge/libnet-dev/${name}.tar.gz";
+    sha256 = "1pc74p839a7wvhjdgy0scj7c4yarr6mqdqvj56k6sp8pkc763az7";
+  };
+
+  meta = {
+    homepage = http://github.com/sam-github/libnet;
+    description = "Libnet provides a portable framework for low-level network packet construction.";
+    license = stdenv.lib.licenses.bsd3;
+    platforms = stdenv.lib.platforms.unix;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 381231302cb..d287bda30f3 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -821,6 +821,8 @@ let
 
   ethtool = callPackage ../tools/misc/ethtool { };
 
+  ettercap = callPackage ../applications/networking/sniffers/ettercap { };
+
   euca2ools = callPackage ../tools/virtualization/euca2ools { pythonPackages = python26Packages; };
 
   evtest = callPackage ../applications/misc/evtest { };
@@ -4853,6 +4855,8 @@ let
 
   libmusicbrainz = libmusicbrainz3;
 
+  libnet = callPackage ../development/libraries/libnet { };
+
   libnetfilter_conntrack = callPackage ../development/libraries/libnetfilter_conntrack { };
 
   libnetfilter_queue = callPackage ../development/libraries/libnetfilter_queue { };
-- 
GitLab


From fb34754933b6ae4501af119c4eb1f34c431b3e1b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Thu, 3 Oct 2013 16:20:48 +0200
Subject: [PATCH 4955/5331] Prettify graphite service

cc @offlinehacker
---
 modules/services/monitoring/graphite.nix | 21 ++++++++++++---------
 1 file changed, 12 insertions(+), 9 deletions(-)

diff --git a/modules/services/monitoring/graphite.nix b/modules/services/monitoring/graphite.nix
index ae03f7f69aa..ec36db7b21c 100644
--- a/modules/services/monitoring/graphite.nix
+++ b/modules/services/monitoring/graphite.nix
@@ -5,9 +5,7 @@ with pkgs.lib;
 let
   cfg = config.services.graphite;
   writeTextOrNull = f: t: if t == null then null else pkgs.writeText f t;
-
   dataDir = "/var/db/graphite";
-
 in {
 
   ###### interface
@@ -160,13 +158,16 @@ in {
         GRAPHITE_STORAGE_DIR = "/var/db/graphite/";
       };
       serviceConfig = {
-        ExecStart = "${pkgs.pythonPackages.carbon}/bin/carbon-cache.py --debug --pidfile /tmp/carbonCache.pid start";
+        ExecStart = "${pkgs.pythonPackages.carbon}/bin/carbon-cache.py --pidfile /tmp/carbonCache.pid start";
         User = "graphite";
         Group = "graphite";
       };
       restartTriggers = [
-        pkgs.pythonPackages.carbon cfg.carbon.config cfg.carbon.storageAggregation
-        cfg.carbon.storageSchemas cfg.carbon.rewriteRules
+        pkgs.pythonPackages.carbon
+        cfg.carbon.config
+        cfg.carbon.storageAggregation
+        cfg.carbon.storageSchemas
+        cfg.carbon.rewriteRules
       ];
       preStart = ''
         mkdir -p ${dataDir}/whisper
@@ -182,7 +183,7 @@ in {
         GRAPHITE_STORAGE_DIR = "${dataDir}";
       };
       serviceConfig = {
-        ExecStart = "${pkgs.pythonPackages.carbon}/bin/carbon-aggregator.py --debug --pidfile /tmp/carbonAggregator.pid start";
+        ExecStart = "${pkgs.pythonPackages.carbon}/bin/carbon-aggregator.py --pidfile /tmp/carbonAggregator.pid start";
         User = "graphite";
         Group = "graphite";
       };
@@ -200,7 +201,7 @@ in {
         GRAPHITE_STORAGE_DIR = "${dataDir}";
       };
       serviceConfig = {
-        ExecStart = "${pkgs.pythonPackages.carbon}/bin/carbon-relay.py --debug --pidfile /tmp/carbonRelay.pid start";
+        ExecStart = "${pkgs.pythonPackages.carbon}/bin/carbon-relay.py --pidfile /tmp/carbonRelay.pid start";
         User = "graphite";
         Group = "graphite";
       };
@@ -241,12 +242,14 @@ in {
         fi
       '';
       restartTriggers = [
-        pkgs.python27Packages.graphite_web pkgs.python27Packages.waitress
+        pkgs.python27Packages.graphite_web
+        pkgs.python27Packages.waitress
       ];
     };
 
     environment.systemPackages = [
-      pkgs.pythonPackages.carbon pkgs.python27Packages.graphite_web
+      pkgs.pythonPackages.carbon
+      pkgs.python27Packages.graphite_web
       pkgs.python27Packages.waitress
     ];
 
-- 
GitLab


From 6b17f7d9ee2eb2271a5b13b1aa7a7cd7b9f917bf Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 3 Oct 2013 16:19:57 +0200
Subject: [PATCH 4956/5331] pkgs/tools/security/seccure: store the expression
 in a file called "default.nix"

---
 pkgs/tools/security/seccure/{0.4.nix => default.nix} | 0
 pkgs/top-level/all-packages.nix                      | 2 +-
 2 files changed, 1 insertion(+), 1 deletion(-)
 rename pkgs/tools/security/seccure/{0.4.nix => default.nix} (100%)

diff --git a/pkgs/tools/security/seccure/0.4.nix b/pkgs/tools/security/seccure/default.nix
similarity index 100%
rename from pkgs/tools/security/seccure/0.4.nix
rename to pkgs/tools/security/seccure/default.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 047f907a4fb..512ffa8188b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1721,7 +1721,7 @@ let
 
   sdcv = callPackage ../applications/misc/sdcv { };
 
-  seccure = callPackage ../tools/security/seccure/0.4.nix { };
+  seccure = callPackage ../tools/security/seccure { };
 
   setserial = builderDefsPackage (import ../tools/system/setserial) {
     inherit groff;
-- 
GitLab


From 97e0e1985881199dfbc09b426121fff1f6c8cd6c Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 3 Oct 2013 16:20:09 +0200
Subject: [PATCH 4957/5331] all-packages.nix: strip trailing whitespace

---
 pkgs/top-level/all-packages.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 512ffa8188b..19120f5ce71 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -579,7 +579,7 @@ let
   bacula = callPackage ../tools/backup/bacula { };
 
   bgs = callPackage ../tools/X11/bgs { };
-  
+
   bibtextools = callPackage ../tools/typesetting/bibtex-tools {
     inherit (strategoPackages016) strategoxt sdf;
   };
@@ -8231,7 +8231,7 @@ let
   mpg123 = callPackage ../applications/audio/mpg123 { };
 
   mpg321 = callPackage ../applications/audio/mpg321 { };
-  
+
   mpc_cli = callPackage ../applications/audio/mpc { };
 
   ncmpcpp = callPackage ../applications/audio/ncmpcpp { };
-- 
GitLab


From c7ad106209ae6e11d779f65449b07fe98e9af82b Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 3 Oct 2013 16:35:50 +0200
Subject: [PATCH 4958/5331] all-packages.nix: avoid breaking syntax
 highlighting in Emacs

---
 pkgs/top-level/all-packages.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 19120f5ce71..3742eea8928 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6904,7 +6904,7 @@ let
   systemd_with_lvm2 = pkgs.lib.overrideDerivation pkgs.systemd (p: {
       name = p.name + "-with-lvm2";
       postInstall = p.postInstall + ''
-        cp ${pkgs.lvm2}/lib/systemd/system-generators/* $out/lib/systemd/system-generators
+        cp "${pkgs.lvm2}/lib/systemd/system-generators/"* $out/lib/systemd/system-generators
       '';
   });
 
-- 
GitLab


From 9c6e0e584c8b19956897ac949acc925ea4576523 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 3 Oct 2013 17:01:53 +0200
Subject: [PATCH 4959/5331] lua-5.1: fix $prefix in installed pkgconfig file

---
 pkgs/development/interpreters/lua-5/5.1.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/interpreters/lua-5/5.1.nix b/pkgs/development/interpreters/lua-5/5.1.nix
index a6caf0023e3..bdbf2d106bf 100644
--- a/pkgs/development/interpreters/lua-5/5.1.nix
+++ b/pkgs/development/interpreters/lua-5/5.1.nix
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
 
   postInstall = ''
     mkdir -p "$out/share/doc/lua" "$out/lib/pkgconfig"
-    mv "etc/lua.pc" "$out/lib/pkgconfig/"
+    sed <"etc/lua.pc" >"$out/lib/pkgconfig/lua.pc" -e "s|^prefix=.*|prefix=$out|"
     mv "doc/"*.{gif,png,css,html} "$out/share/doc/lua/"
     rmdir $out/{share,lib}/lua/5.1 $out/{share,lib}/lua
   '';
-- 
GitLab


From e857fee7a7314be0ae6a47ed4e2421f800b9f75e Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 3 Oct 2013 17:08:56 +0200
Subject: [PATCH 4960/5331] lxc: update to current git HEAD
 1.0.0.alpha1-92-g8111adf

The developers claim that the new version works on systemd-based hosts.
---
 pkgs/os-specific/linux/lxc/default.nix        | 18 ++++----
 .../linux/lxc/dont-run-ldconfig.patch         | 22 ----------
 .../lxc/install-localstatedir-in-store.patch  | 23 +++--------
 pkgs/os-specific/linux/lxc/support-db2x.patch | 41 +++++++------------
 4 files changed, 27 insertions(+), 77 deletions(-)
 delete mode 100644 pkgs/os-specific/linux/lxc/dont-run-ldconfig.patch

diff --git a/pkgs/os-specific/linux/lxc/default.nix b/pkgs/os-specific/linux/lxc/default.nix
index c1dec8b926a..5a9b3587870 100644
--- a/pkgs/os-specific/linux/lxc/default.nix
+++ b/pkgs/os-specific/linux/lxc/default.nix
@@ -1,20 +1,18 @@
-{ stdenv, fetchurl, libcap, apparmor, perl, docbook2x, docbook_xml_dtd_45 }:
+{ stdenv, autoreconfHook, fetchurl, libcap, apparmor, perl, docbook2x
+, docbook_xml_dtd_45, gnutls, pkgconfig
+}:
 
 stdenv.mkDerivation rec {
-  name = "lxc-0.9.0";
+  name = "lxc-1.0.0.alpha1-92-g8111adf";
 
   src = fetchurl {
-    url = "mirror://sourceforge/lxc/${name}.tar.gz";
-    sha256 = "0821clxymkgp71n720xj5ngs22s2v8jks68f5j4vypycwvm6f5qy";
+    url = "http://github.com/lxc/lxc/archive/${name}.tar.gz";
+    sha256 = "05hjrn79wyjnm4ynf8y0j7pk2hwfrzp4dzwynxq4z2wxlc1ficd5";
   };
 
-  buildInputs = [ libcap apparmor perl docbook2x ];
+  buildInputs = [ libcap apparmor perl docbook2x gnutls autoreconfHook pkgconfig ];
 
-  patches = [
-    ./dont-run-ldconfig.patch
-    ./install-localstatedir-in-store.patch
-    ./support-db2x.patch
-  ];
+  patches = [ ./install-localstatedir-in-store.patch ./support-db2x.patch ];
 
   preConfigure = "export XML_CATALOG_FILES=${docbook_xml_dtd_45}/xml/dtd/docbook/catalog.xml";
 
diff --git a/pkgs/os-specific/linux/lxc/dont-run-ldconfig.patch b/pkgs/os-specific/linux/lxc/dont-run-ldconfig.patch
deleted file mode 100644
index 6904eec5175..00000000000
--- a/pkgs/os-specific/linux/lxc/dont-run-ldconfig.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff -ubr lxc-0.9.0-orig/src/lxc/Makefile.am lxc-0.9.0/src/lxc/Makefile.am
---- lxc-0.9.0-orig/src/lxc/Makefile.am	2013-04-15 10:50:22.898102973 +0200
-+++ lxc-0.9.0/src/lxc/Makefile.am	2013-04-15 10:50:44.264862808 +0200
-@@ -193,7 +193,6 @@
- 	mkdir -p $(DESTDIR)$(datadir)/lxc
- 	install -c -m 644 lxc.functions $(DESTDIR)$(datadir)/lxc
- 	mv $(DESTDIR)$(libdir)/liblxc.so $(DESTDIR)$(libdir)/liblxc.so.$(VERSION)
--	/sbin/ldconfig -l $(DESTDIR)$(libdir)/liblxc.so.$(VERSION)
- 	cd $(DESTDIR)$(libdir); \
- 	ln -sf liblxc.so.$(VERSION) liblxc.so.$(firstword $(subst ., ,$(VERSION))); \
- 	ln -sf liblxc.so.$(firstword $(subst ., ,$(VERSION))) liblxc.so
-diff -ubr lxc-0.9.0-orig/src/lxc/Makefile.in lxc-0.9.0/src/lxc/Makefile.in
---- lxc-0.9.0-orig/src/lxc/Makefile.in	2013-04-15 10:50:22.898102973 +0200
-+++ lxc-0.9.0/src/lxc/Makefile.in	2013-04-15 10:51:08.755810177 +0200
-@@ -1519,7 +1519,6 @@
- 	mkdir -p $(DESTDIR)$(datadir)/lxc
- 	install -c -m 644 lxc.functions $(DESTDIR)$(datadir)/lxc
- 	mv $(DESTDIR)$(libdir)/liblxc.so $(DESTDIR)$(libdir)/liblxc.so.$(VERSION)
--	/sbin/ldconfig -l $(DESTDIR)$(libdir)/liblxc.so.$(VERSION)
- 	cd $(DESTDIR)$(libdir); \
- 	ln -sf liblxc.so.$(VERSION) liblxc.so.$(firstword $(subst ., ,$(VERSION))); \
- 	ln -sf liblxc.so.$(firstword $(subst ., ,$(VERSION))) liblxc.so
diff --git a/pkgs/os-specific/linux/lxc/install-localstatedir-in-store.patch b/pkgs/os-specific/linux/lxc/install-localstatedir-in-store.patch
index 061875aa3b6..d45335a0232 100644
--- a/pkgs/os-specific/linux/lxc/install-localstatedir-in-store.patch
+++ b/pkgs/os-specific/linux/lxc/install-localstatedir-in-store.patch
@@ -1,23 +1,10 @@
-diff -ubr lxc-0.9.0-orig/Makefile.am lxc-0.9.0/Makefile.am
---- lxc-0.9.0-orig/Makefile.am	2013-04-15 10:50:22.899103057 +0200
-+++ lxc-0.9.0/Makefile.am	2013-04-15 10:58:41.189504254 +0200
-@@ -25,8 +25,8 @@
+diff --git a/Makefile.am b/Makefile.am
+index eac2bfd..8f040d3 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -25,8 +25,8 @@ pcdatadir = $(libdir)/pkgconfig
  pcdata_DATA = lxc.pc
  
- install-data-local:
--	$(MKDIR_P) $(DESTDIR)$(LXCPATH)
--	$(MKDIR_P) $(DESTDIR)$(localstatedir)/cache/lxc
-+	$(MKDIR_P) $(out)$(LXCPATH)
-+	$(MKDIR_P) $(out)$(localstatedir)/cache/lxc
- 
- ChangeLog::
- 	@touch ChangeLog
-diff -ubr lxc-0.9.0-orig/Makefile.in lxc-0.9.0/Makefile.in
---- lxc-0.9.0-orig/Makefile.in	2013-04-15 10:50:22.899103057 +0200
-+++ lxc-0.9.0/Makefile.in	2013-04-15 10:58:58.817870957 +0200
-@@ -805,8 +805,8 @@
- 
- 
  install-data-local:
 -	$(MKDIR_P) $(DESTDIR)$(LXCPATH)
 -	$(MKDIR_P) $(DESTDIR)$(localstatedir)/cache/lxc
diff --git a/pkgs/os-specific/linux/lxc/support-db2x.patch b/pkgs/os-specific/linux/lxc/support-db2x.patch
index 8be7f5f0a92..4662ca2e504 100644
--- a/pkgs/os-specific/linux/lxc/support-db2x.patch
+++ b/pkgs/os-specific/linux/lxc/support-db2x.patch
@@ -1,29 +1,16 @@
-diff -ubr lxc-0.9.0-orig/configure lxc-0.9.0/configure
---- lxc-0.9.0-orig/configure	2013-04-15 10:50:22.899103057 +0200
-+++ lxc-0.9.0/configure	2013-04-15 11:08:08.696539776 +0200
-@@ -4792,7 +4792,7 @@
- 
- 	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for docbook2x-man" >&5
- $as_echo_n "checking for docbook2x-man... " >&6; }
--	for name in docbook2x-man db2x_docbook2man; do
-+	for name in docbook2x-man db2x_docbook2man docbook2man; do
- 		if "$name" --help >/dev/null 2>&1; then
- 			db2xman="$name"
- 			break;
-@@ -8353,4 +8353,3 @@
-   { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5
- $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;}
+diff --git a/configure.ac b/configure.ac
+index 92a4690..4dd341b 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -91,9 +91,9 @@ if test "x$enable_doc" = "xyes" -o "x$enable_doc" = "xauto"; then
+ 	AC_SUBST(db2xman)
  fi
--
-diff -ubr lxc-0.9.0-orig/configure.ac lxc-0.9.0/configure.ac
---- lxc-0.9.0-orig/configure.ac	2013-04-15 10:50:22.896102806 +0200
-+++ lxc-0.9.0/configure.ac	2013-04-15 11:07:52.399582819 +0200
-@@ -67,7 +67,7 @@
- 	db2xman=""
+ AM_CONDITIONAL([ENABLE_DOCBOOK], [test "x$db2xman" != "x"])
+-AM_CONDITIONAL([USE_DOCBOOK2X], [test "x$db2xman" != "xdocbook2man"])
++AM_CONDITIONAL([USE_DOCBOOK2X], [test "x$db2xman" != "no-no-no"])
  
- 	AC_MSG_CHECKING(for docbook2x-man)
--	for name in docbook2x-man db2x_docbook2man; do
-+	for name in docbook2x-man db2x_docbook2man docbook2man; do
- 		if "$name" --help >/dev/null 2>&1; then
- 			db2xman="$name"
- 			break;
+-if test "x$db2xman" = "xdocbook2man"; then
++if test "x$db2xman" = "no-no-no"; then
+ 	docdtd="\"-//Davenport//DTD DocBook V3.0//EN\""
+ else
+ 	docdtd="\"-//OASIS//DTD DocBook XML\" \"http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd\""
-- 
GitLab


From da17bd1352bf2ebc6c1990d73cb468c58be9a4c6 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 3 Oct 2013 14:31:50 +0200
Subject: [PATCH 4961/5331] git-annex: make sure the man page is installed

---
 .../version-management/git-and-tools/git-annex/default.nix       | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/applications/version-management/git-and-tools/git-annex/default.nix b/pkgs/applications/version-management/git-and-tools/git-annex/default.nix
index d71c1dff209..2249cf20ce6 100644
--- a/pkgs/applications/version-management/git-and-tools/git-annex/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git-annex/default.nix
@@ -42,6 +42,7 @@ cabal.mkDerivation (self: {
                     -fProduction
                     -fTDFA";
   preConfigure = "patchShebangs .";
+  installPhase = "./Setup install";
   checkPhase = ''
     export HOME="$NIX_BUILD_TOP/tmp"
     mkdir "$HOME"
-- 
GitLab


From be67ab572ced2e0d563a1e21e41d0edba2d76f02 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 3 Oct 2013 17:55:28 +0200
Subject: [PATCH 4962/5331] haskell-regex-compat-tdfa: work around broken
 release tarball on Hackage

---
 pkgs/development/libraries/haskell/regex-compat-tdfa/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/libraries/haskell/regex-compat-tdfa/default.nix b/pkgs/development/libraries/haskell/regex-compat-tdfa/default.nix
index c7ed906b908..df62233b7bf 100644
--- a/pkgs/development/libraries/haskell/regex-compat-tdfa/default.nix
+++ b/pkgs/development/libraries/haskell/regex-compat-tdfa/default.nix
@@ -5,6 +5,7 @@ cabal.mkDerivation (self: {
   version = "0.95.1.3";
   sha256 = "0wl5sqbb3rl5dai3qni8w09wlipc4n1mn9kh5zgb9xl0lcd59pjx";
   buildDepends = [ regexBase regexTdfa ];
+  patchPhase = "find . -type f -exec touch {} ';'";
   meta = {
     homepage = "http://hub.darcs.net/shelarcy/regex-compat-tdfa";
     description = "Unicode Support version of Text.Regex, using regex-tdfa";
-- 
GitLab


From 4ff36cb1377369f96233a1404236fb9db184c913 Mon Sep 17 00:00:00 2001
From: Rok Garbas <rok@garbas.si>
Date: Thu, 3 Oct 2013 20:01:58 +0200
Subject: [PATCH 4963/5331] zope2 service fixes

---
 modules/services/web-servers/zope2.nix | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/modules/services/web-servers/zope2.nix b/modules/services/web-servers/zope2.nix
index c92271e4660..5d7b369b2ad 100644
--- a/modules/services/web-servers/zope2.nix
+++ b/modules/services/web-servers/zope2.nix
@@ -165,8 +165,8 @@ default-zpublisher-encoding utf-8
 zserver-threads ${toString opts.threads}
 effective-user ${opts.user}
 
-pid-filename /var/run/zope2-${name}.pid
-lock-filename /var/lock/zope2-${name}.lock
+pid-filename /var/lib/zope2/${name}/pid
+lock-filename /var/lib/zope2/${name}/lock
 python-check-interval 1000
 enable-product-installation off
 
@@ -222,6 +222,11 @@ if __name__ == '__main__':
             preStart =
               ''
               mkdir -p /var/log/zope2/
+              touch /var/log/zope2/${name}.log
+              touch /var/log/zope2/${name}-Z2.log
+              chown ${opts.user} /var/log/zope2/${name}.log
+              chown ${opts.user} /var/log/zope2/${name}-Z2.log
+
               mkdir -p /var/lib/zope2/${name}/filestorage /var/lib/zope2/${name}/blobstorage
               chown ${opts.user} /var/lib/zope2/${name} -R
 
-- 
GitLab


From f6e835a2c3e6e56aea843164c93d81716fc20ac0 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Thu, 3 Oct 2013 15:25:43 -0400
Subject: [PATCH 4964/5331] Fix pythonWrapper when all of the binaries come
 from python

See discussion in #834

Signed-off-by: Shea Levy <shea@shealevy.com>
---
 pkgs/development/interpreters/python/wrapper.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/development/interpreters/python/wrapper.nix b/pkgs/development/interpreters/python/wrapper.nix
index d928e96dd4b..1699690749f 100644
--- a/pkgs/development/interpreters/python/wrapper.nix
+++ b/pkgs/development/interpreters/python/wrapper.nix
@@ -9,6 +9,9 @@
 
   postBuild = ''
     . "${makeWrapper}/nix-support/setup-hook"
+    if [ -L "$out/bin" ]; then
+        unlink "$out/bin"
+    fi
     mkdir -p "$out/bin"
     cd "${python}/bin"
     for prg in *; do
-- 
GitLab


From 85ecc3f176fabc82b073bf0b5cd795afee83c60e Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 3 Oct 2013 19:54:56 +0200
Subject: [PATCH 4965/5331] haskell-git-annex: update to version 4.20131002

---
 .../version-management/git-and-tools/git-annex/default.nix    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/version-management/git-and-tools/git-annex/default.nix b/pkgs/applications/version-management/git-and-tools/git-annex/default.nix
index 2249cf20ce6..f67fc8553c0 100644
--- a/pkgs/applications/version-management/git-and-tools/git-annex/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git-annex/default.nix
@@ -14,8 +14,8 @@
 
 cabal.mkDerivation (self: {
   pname = "git-annex";
-  version = "4.20130927";
-  sha256 = "0ycfdwqicmqfj5ygrk11z7cz2b28ccvb45ny8h5i0wr6mg3apj38";
+  version = "4.20131002";
+  sha256 = "00pjb0ivcggpx4qdihrarss68c1q5viwfz4jgg7rqjnhslwvk440";
   isLibrary = false;
   isExecutable = true;
   buildDepends = [
-- 
GitLab


From 7b6e26b380a3f1711c3867d2bcb64640db5bfcfc Mon Sep 17 00:00:00 2001
From: Rok Garbas <rok@garbas.si>
Date: Fri, 4 Oct 2013 00:24:18 +0200
Subject: [PATCH 4966/5331] some more zope2 service improvements

---
 modules/services/web-servers/zope2.nix | 25 ++++++++++++++-----------
 1 file changed, 14 insertions(+), 11 deletions(-)

diff --git a/modules/services/web-servers/zope2.nix b/modules/services/web-servers/zope2.nix
index 5d7b369b2ad..19afa55d7fe 100644
--- a/modules/services/web-servers/zope2.nix
+++ b/modules/services/web-servers/zope2.nix
@@ -136,21 +136,17 @@ if _interactive:
               '';
             env = pkgs.buildEnv {
               name = "zope2-${name}-env";
-              paths = [ pyenv pkgs.gnumake ];
-              postBuild =
-                ''
-                echo "#!$out/bin/python" > $out/bin/interpreter
-                cat ${interpreter} >> $out/bin/interpreter
-                '';
-            };
-            pyenv = pkgs.buildEnv {
-              name = "zope2-${name}-pyenv";
               paths = [
                 pkgs.python27
                 pkgs.python27Packages.recursivePthLoader
                 pkgs.python27Packages."plone.recipe.zope2instance"
               ] ++ attrValues pkgs.python27.modules
                 ++ opts.packages;
+              postBuild =
+                ''
+                echo "#!$out/bin/python" > $out/bin/interpreter
+                cat ${interpreter} >> $out/bin/interpreter
+                '';
             };
             conf = pkgs.writeText "zope2-${name}-conf"
               ''%define INSTANCEHOME ${env}
@@ -204,7 +200,7 @@ container-class Products.TemporaryFolder.TemporaryContainer
 
 ${opts.extra}
               '';
-            ctl = pkgs.writeScript "zope2-${name}-ctl"
+            ctlScript = pkgs.writeScript "zope2-${name}-ctl-script"
               ''#!${env}/bin/python
 
 import sys
@@ -213,7 +209,14 @@ import plone.recipe.zope2instance.ctl
 if __name__ == '__main__':
     sys.exit(plone.recipe.zope2instance.ctl.main(
         ["-C", "${conf}"]
-        + sys.argv[1:]))'';
+        + sys.argv[1:]))
+              '';
+
+            ctl = pkgs.writeScript "zope2-${name}-ctl"
+              ''#!${pkgs.bash}/bin/bash -e
+export PYTHONHOME=${env}
+exec ${ctlScript} "$@"
+              '';
           in {
             description = "zope2 ${name} instance";
             after = [ "network.target" ];  # with RelStorage also add "postgresql.service"
-- 
GitLab


From c95d83083984a2d0d68408236e1a8d6d0363baec Mon Sep 17 00:00:00 2001
From: Rok Garbas <rok@garbas.si>
Date: Fri, 4 Oct 2013 00:24:59 +0200
Subject: [PATCH 4967/5331] adding http_address option to varnish service

---
 modules/services/web-servers/varnish/default.nix | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/modules/services/web-servers/varnish/default.nix b/modules/services/web-servers/varnish/default.nix
index 39de73213ce..7e327120c3d 100644
--- a/modules/services/web-servers/varnish/default.nix
+++ b/modules/services/web-servers/varnish/default.nix
@@ -1,6 +1,7 @@
 { config, pkgs, ...}:
 let
   cfg = config.services.varnish;
+
 in
 with pkgs.lib;
 {
@@ -13,6 +14,13 @@ with pkgs.lib;
         ";
       };
 
+      http_address = mkOption {
+        default = "*:6081";
+        description = "
+          HTTP listen address and port.
+        ";
+      };
+
       config = mkOption {
         description = "
           Verbatim default.vcl configuration.
@@ -39,7 +47,7 @@ with pkgs.lib;
         chown -R varnish:varnish ${cfg.stateDir}
       '';
       path = [ pkgs.gcc ];
-      serviceConfig.ExecStart = "${pkgs.varnish}/sbin/varnishd -f ${pkgs.writeText "default.vcl" cfg.config} -n ${cfg.stateDir} -u varnish";
+      serviceConfig.ExecStart = "${pkgs.varnish}/sbin/varnishd -a ${cfg.http_address} -f ${pkgs.writeText "default.vcl" cfg.config} -n ${cfg.stateDir} -u varnish";
       serviceConfig.Type = "forking";
     };
 
-- 
GitLab


From f7a9743574dadec41d24cb08a50dc1892e72d242 Mon Sep 17 00:00:00 2001
From: Mathijs Kwik <mathijs@bluescreen303.nl>
Date: Sun, 29 Sep 2013 22:35:30 +0200
Subject: [PATCH 4968/5331] idris: build with latest llvm-general(-pure)

---
 pkgs/top-level/haskell-packages.nix | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 7cdce8907be..c42e5b18508 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -2430,9 +2430,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
 
   darcs = callPackage ../applications/version-management/darcs {};
 
-  idris_plain = callPackage ../development/compilers/idris {
-    llvmGeneral = self.llvmGeneral_3_3_5;
-  };
+  idris_plain = callPackage ../development/compilers/idris {};
 
   idris = callPackage ../development/compilers/idris/wrapper.nix {};
 
-- 
GitLab


From af2eaf1ef908f76146674d71de41e95297b186bd Mon Sep 17 00:00:00 2001
From: Mathijs Kwik <mathijs@bluescreen303.nl>
Date: Sun, 29 Sep 2013 22:37:33 +0200
Subject: [PATCH 4969/5331] llvm-general: remove version 3.3.5

---
 .../libraries/haskell/llvm-general/3.3.5.nix  | 21 -------------------
 .../llvm-general/{3.3.8.2.nix => default.nix} |  0
 pkgs/top-level/haskell-packages.nix           |  6 +-----
 3 files changed, 1 insertion(+), 26 deletions(-)
 delete mode 100644 pkgs/development/libraries/haskell/llvm-general/3.3.5.nix
 rename pkgs/development/libraries/haskell/llvm-general/{3.3.8.2.nix => default.nix} (100%)

diff --git a/pkgs/development/libraries/haskell/llvm-general/3.3.5.nix b/pkgs/development/libraries/haskell/llvm-general/3.3.5.nix
deleted file mode 100644
index 16d9859aae2..00000000000
--- a/pkgs/development/libraries/haskell/llvm-general/3.3.5.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-{ cabal, HUnit, llvmConfig, mtl, parsec, QuickCheck, setenv
-, testFramework, testFrameworkHunit, testFrameworkQuickcheck2, text
-, transformers
-}:
-
-cabal.mkDerivation (self: {
-  pname = "llvm-general";
-  version = "3.3.5.0";
-  sha256 = "15zrav7339jn6p75g1d7h3qkr1wyal1jzfs8xy73kckw2fzn4nlf";
-  buildDepends = [ mtl parsec setenv text transformers ];
-  testDepends = [
-    HUnit mtl QuickCheck testFramework testFrameworkHunit
-    testFrameworkQuickcheck2
-  ];
-  buildTools = [ llvmConfig ];
-  meta = {
-    description = "General purpose LLVM bindings";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/llvm-general/3.3.8.2.nix b/pkgs/development/libraries/haskell/llvm-general/default.nix
similarity index 100%
rename from pkgs/development/libraries/haskell/llvm-general/3.3.8.2.nix
rename to pkgs/development/libraries/haskell/llvm-general/default.nix
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index c42e5b18508..f3d7f43e85b 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -1406,13 +1406,9 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
 
   ListZipper = callPackage ../development/libraries/haskell/ListZipper {};
 
-  llvmGeneral_3_3_5 = callPackage ../development/libraries/haskell/llvm-general/3.3.5.nix {
+  llvmGeneral = callPackage ../development/libraries/haskell/llvm-general {
     llvmConfig = pkgs.llvm;
   };
-  llvmGeneral_3_3_8_2 = callPackage ../development/libraries/haskell/llvm-general/3.3.8.2.nix {
-    llvmConfig = pkgs.llvm;
-  };
-  llvmGeneral = self.llvmGeneral_3_3_8_2;
 
   llvmGeneralPure = callPackage ../development/libraries/haskell/llvm-general-pure {};
 
-- 
GitLab


From cb537ad44b940000653c4f36b3a68578a6a66980 Mon Sep 17 00:00:00 2001
From: Mathijs Kwik <mathijs@bluescreen303.nl>
Date: Sun, 29 Sep 2013 23:08:31 +0200
Subject: [PATCH 4970/5331] trifecta: override dependency versions

"jailbreak" did not work for this package
Also, I force a downgrade for "hashable" to make stuff work with our current haskell platform. If you don't like running things "below spec", you can add the following to packageOverrides:

haskellPackages_ghc763 = pkgs.haskellPackages_ghc763.override {
  extraPrefs = self: {
    hashable = self.hashable_1_2_1_0;
  };
};
---
 pkgs/development/libraries/haskell/trifecta/default.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/pkgs/development/libraries/haskell/trifecta/default.nix b/pkgs/development/libraries/haskell/trifecta/default.nix
index 417b6102e7e..bf5f2f0d0a7 100644
--- a/pkgs/development/libraries/haskell/trifecta/default.nix
+++ b/pkgs/development/libraries/haskell/trifecta/default.nix
@@ -14,6 +14,12 @@ cabal.mkDerivation (self: {
     reducers semigroups transformers unorderedContainers utf8String
   ];
   testDepends = [ doctest filepath ];
+  postPatch = ''
+    substituteInPlace trifecta.cabal \
+      --replace "blaze-html           >= 0.5     && < 0.6," "blaze-html           >= 0.5     && < 0.7," \
+      --replace "hashable             >= 1.2     && < 1.3," "hashable             >= 1.1     && < 1.3," \
+      --replace "fingertree           >= 0.0.1   && < 0.1," "fingertree           >= 0.0.1   && < 0.2,"
+  '';
   meta = {
     homepage = "http://github.com/ekmett/trifecta/";
     description = "A modern parser combinator library with convenient diagnostics";
-- 
GitLab


From 4d32a074a23741793552d8c329fbecf10ebe1da0 Mon Sep 17 00:00:00 2001
From: Mathijs Kwik <mathijs@bluescreen303.nl>
Date: Wed, 2 Oct 2013 13:54:23 +0200
Subject: [PATCH 4971/5331] org-mode: install to proper dir

---
 pkgs/applications/editors/emacs-modes/org/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/editors/emacs-modes/org/default.nix b/pkgs/applications/editors/emacs-modes/org/default.nix
index df78be6adac..ad2bd2f0ba6 100644
--- a/pkgs/applications/editors/emacs-modes/org/default.nix
+++ b/pkgs/applications/editors/emacs-modes/org/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   name = "org-8.2.1";
-  
+
   src = fetchurl {
     url = "http://orgmode.org/${name}.tar.gz";
     sha256 = "625e2b6786158bcf6c43194075f7638ab8048c68a60025289a051c407e467823";
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
 
   configurePhase =
     '' sed -i mk/default.mk \
-           -e "s|^prefix\t=.*$|prefix=$out|g"
+           -e "s|^prefix\t=.*$|prefix=$out/share|g"
     '';
 
   postBuild =
-- 
GitLab


From 0dfab04ef1196059b47e92f1565ee5adf7bdbab2 Mon Sep 17 00:00:00 2001
From: Mathijs Kwik <mathijs@bluescreen303.nl>
Date: Wed, 2 Oct 2013 14:33:47 +0200
Subject: [PATCH 4972/5331] calibre: upgrade to 1.5.0

---
 pkgs/applications/misc/calibre/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/calibre/default.nix b/pkgs/applications/misc/calibre/default.nix
index 780c96d9ec8..76930646310 100644
--- a/pkgs/applications/misc/calibre/default.nix
+++ b/pkgs/applications/misc/calibre/default.nix
@@ -4,11 +4,11 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "calibre-1.4.0";
+  name = "calibre-1.5.0";
 
   src = fetchurl {
     url = "mirror://sourceforge/calibre/${name}.tar.xz";
-    sha256 = "0hszxjyvw75b75pzr8w5xfgchx3ksw7ziwa3skrjdj500bypmy3y";
+    sha256 = "17jpzj47120ghm584hxl526jdkh9whxrrqfdyn0gv0pb9kag1spn";
   };
 
   inherit python;
-- 
GitLab


From 126403132d9b7394e8b0df8d2584bb641c6ab349 Mon Sep 17 00:00:00 2001
From: Mathijs Kwik <mathijs@bluescreen303.nl>
Date: Wed, 2 Oct 2013 15:37:22 +0200
Subject: [PATCH 4973/5331] linux-3.11: upgrade to 3.11.3

---
 pkgs/os-specific/linux/kernel/linux-3.11.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/linux-3.11.nix b/pkgs/os-specific/linux/kernel/linux-3.11.nix
index 3d332bd2ce2..42e00b5de16 100644
--- a/pkgs/os-specific/linux/kernel/linux-3.11.nix
+++ b/pkgs/os-specific/linux/kernel/linux-3.11.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, ... } @ args:
 
 import ./generic.nix (args // rec {
-  version = "3.11.2";
+  version = "3.11.3";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz";
-    sha256 = "139w8g59fa2kw39kkcpln54mvrl2rq1gv3nqdcrhcy6n1b7r4194";
+    sha256 = "15jk6ak00dmsjqi6snsp6843f2pij6rwrhlg1p14shab3xjp1wxl";
   };
 
   features.iwlwifi = true;
-- 
GitLab


From 6c9a26774561a29542b221b4abb8e48b19cb48c3 Mon Sep 17 00:00:00 2001
From: Mathijs Kwik <mathijs@bluescreen303.nl>
Date: Wed, 2 Oct 2013 15:38:26 +0200
Subject: [PATCH 4974/5331] linux-3.10: upgrade to 3.10.14

---
 pkgs/os-specific/linux/kernel/linux-3.10.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/linux-3.10.nix b/pkgs/os-specific/linux/kernel/linux-3.10.nix
index fa57fdd93dd..d42e4956ed7 100644
--- a/pkgs/os-specific/linux/kernel/linux-3.10.nix
+++ b/pkgs/os-specific/linux/kernel/linux-3.10.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, ... } @ args:
 
 import ./generic.nix (args // rec {
-  version = "3.10.10";
+  version = "3.10.14";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz";
-    sha256 = "01cpg6j1jsjh4vgvmia12y6rci4gqb967gc0gqpz5gcimzg4bb5p";
+    sha256 = "0iqvwjhhmqvb7wbqifczd7bd9a4iq8xwyl61sijbwlarn5ghsm1n";
   };
 
   features.iwlwifi = true;
-- 
GitLab


From 47a05b9aecc7ea7c8efbd554f3e9aa0ea1e5dd98 Mon Sep 17 00:00:00 2001
From: Jonas Hoersch <coroa@online.de>
Date: Wed, 25 Sep 2013 00:10:59 +0200
Subject: [PATCH 4975/5331] autorandr: add coroa as a maintainer

---
 pkgs/tools/misc/autorandr/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/tools/misc/autorandr/default.nix b/pkgs/tools/misc/autorandr/default.nix
index d9a727e8a09..4a95e0890e9 100644
--- a/pkgs/tools/misc/autorandr/default.nix
+++ b/pkgs/tools/misc/autorandr/default.nix
@@ -35,5 +35,6 @@ in
     meta = {
       description = "Autorandr, automatic display configuration selector based on connected devices";
       homepage = https://github.com/wertarbyte/autorandr;
+      maintainer = [ stdenv.lib.maintainers.coroa ];
     };
   }
-- 
GitLab


From e5ebb59e1d4cff48d799bfa89aef0d69a7344c55 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 4 Oct 2013 13:52:49 +0200
Subject: [PATCH 4976/5331] zabbix: Apply fix for a SQL injection bug

https://support.zabbix.com/browse/ZBX-7091

CVE-2013-5743
---
 pkgs/servers/monitoring/zabbix/2.0.nix     | 8 ++++++++
 pkgs/servers/monitoring/zabbix/default.nix | 4 ++--
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/monitoring/zabbix/2.0.nix b/pkgs/servers/monitoring/zabbix/2.0.nix
index 14a4e8bd5a5..8752f54647f 100644
--- a/pkgs/servers/monitoring/zabbix/2.0.nix
+++ b/pkgs/servers/monitoring/zabbix/2.0.nix
@@ -31,6 +31,14 @@ in
 
     inherit src preConfigure;
 
+    patchFlags = "-p0";
+    patches =
+      [ (fetchurl {
+          url = "https://support.zabbix.com/secure/attachment/24449/ZBX-7091-2.0.8.patch";
+          sha256 = "1rlk3812dd12imk29i0fw6bzpgi44a8231kiq3bl5yryx18qh580";
+        })
+      ];
+
     configureFlags = [
       "--enable-agent"
       "--enable-server"
diff --git a/pkgs/servers/monitoring/zabbix/default.nix b/pkgs/servers/monitoring/zabbix/default.nix
index 6ee4712ae65..b106921cdf6 100644
--- a/pkgs/servers/monitoring/zabbix/default.nix
+++ b/pkgs/servers/monitoring/zabbix/default.nix
@@ -2,11 +2,11 @@
 
 let
 
-  version = "1.8.17";
+  version = "1.8.18rc1";
 
   src = fetchurl {
     url = "mirror://sourceforge/zabbix/zabbix-${version}.tar.gz";
-    sha256 = "0c2dpx7ncahp161p6zymrrxwyn3algkfzh6dz7x2j0wsnvb6lrp2";
+    sha256 = "1pa4656dcl5r7r36nwk05zy38z49np6j717wjmmd8sqlz6szw01n";
   };
 
   preConfigure =
-- 
GitLab


From ae60edca0e94f8b1a9a5d6f11bd0aa2ab2499e71 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Fri, 4 Oct 2013 20:31:02 +0200
Subject: [PATCH 4977/5331] transmission: unify versions to the newest, use
 gtk3

Also introduce transmission_gtk attribute and signify gtk client support
in the name (so newbies using package names can see there's a gui version).
---
 .../networking/p2p/transmission/2.60.nix      | 41 -------------------
 .../networking/p2p/transmission/default.nix   | 41 +++++++++++--------
 pkgs/top-level/all-packages.nix               |  4 +-
 3 files changed, 26 insertions(+), 60 deletions(-)
 delete mode 100644 pkgs/applications/networking/p2p/transmission/2.60.nix

diff --git a/pkgs/applications/networking/p2p/transmission/2.60.nix b/pkgs/applications/networking/p2p/transmission/2.60.nix
deleted file mode 100644
index c59fddf6364..00000000000
--- a/pkgs/applications/networking/p2p/transmission/2.60.nix
+++ /dev/null
@@ -1,41 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, openssl, curl, intltool, libevent,
-  file, inotifyTools, gtk ? null }:
-
-stdenv.mkDerivation rec {
-  name = "transmission-2.60"; # transmission >= 2.61 requires gtk3
-
-  src = fetchurl {
-    url = "http://download.transmissionbt.com/files/${name}.tar.xz";
-    sha256 = "1ramdliyy8j7qqpkxg643lda11ynxwfhq6qcs31fr3h9x72l0rg4";
-  };
-
-  buildInputs = [ pkgconfig openssl curl intltool libevent
-                  file inotifyTools gtk ];
-
-  preConfigure = ''
-    sed -i -e 's|/usr/bin/file|${file}/bin/file|g' configure
-  '';
-
-  postInstall = ''
-    rm -f $out/share/icons/hicolor/icon-theme.cache
-  '';
-
-  meta = {
-    description = "A fast, easy and free BitTorrent client";
-    longDescription = ''
-      Transmission is a BitTorrent client which features a simple interface
-      on top of a cross-platform back-end.
-      Feature spotlight:
-        * Uses fewer resources than other clients
-        * Native Mac, GTK+ and Qt GUI clients
-        * Daemon ideal for servers, embedded systems, and headless use
-        * All these can be remote controlled by Web and Terminal clients
-        * Bluetack (PeerGuardian) blocklists with automatic updates
-        * Full encryption, DHT, and PEX support
-    '';
-    homepage = http://www.transmissionbt.com/;
-    license = [ "GPLv2" ];
-    maintainers = [ stdenv.lib.maintainers.astsmtl ];
-    platforms = stdenv.lib.platforms.linux;
-  };
-}
diff --git a/pkgs/applications/networking/p2p/transmission/default.nix b/pkgs/applications/networking/p2p/transmission/default.nix
index 2c6106d1304..b273b567b77 100644
--- a/pkgs/applications/networking/p2p/transmission/default.nix
+++ b/pkgs/applications/networking/p2p/transmission/default.nix
@@ -1,32 +1,40 @@
-{ stdenv, fetchurl, pkgconfig, openssl, curl, intltool, libevent
-, file, inotifyTools
-, enableGtk ? false, gtk ? null }:
+{ stdenv, fetchurl, pkgconfig, intltool, file, makeWrapper
+, openssl, curl, libevent, inotifyTools
+, enableGTK3 ? false, gtk3
+}:
 
-assert enableGtk -> gtk != null;
+let
+  version = "2.82";
+in
+
+with { inherit (stdenv.lib) optional optionals optionalString; };
 
 stdenv.mkDerivation rec {
-  name = "transmission-2.77"; # transmission >= 2.61 requires gtk3
+  name = "transmission-" + optionalString enableGTK3 "gtk-" + version;
 
   src = fetchurl {
-    url = "http://download.transmissionbt.com/files/${name}.tar.xz";
-    sha256 = "1phzhj4wds6r2ziclva1b5l6l9xjsx5ji7s3m4xia44aq4znbcam";
+    url = "http://download.transmissionbt.com/files/transmission-${version}.tar.xz";
+    sha256 = "08imy28hpjxwdzgvhm66hkfyzp8qnnqr4jhv3rgshryzhw86b5ir";
   };
 
-  buildInputs = [ pkgconfig openssl curl intltool libevent
-                  file inotifyTools ]
-    ++ stdenv.lib.optional enableGtk gtk;
+  buildInputs = [ pkgconfig intltool file openssl curl libevent inotifyTools ]
+    ++ optionals enableGTK3 [ gtk3 makeWrapper ];
 
   preConfigure = ''
     sed -i -e 's|/usr/bin/file|${file}/bin/file|g' configure
   '';
 
-  configureFlags = stdenv.lib.optionalString enableGtk "--with-gtk";
+  configureFlags = [ "--with-systemd-daemon" ]
+    ++ optional enableGTK3 "--with-gtk";
 
   postInstall = ''
-    rm -f $out/share/icons/hicolor/icon-theme.cache
+    rm "$out/share/icons/hicolor/icon-theme.cache"
+  '' + optionalString enableGTK3 /* gsettings schemas for file dialogues */ ''
+    wrapProgram "$out/bin/transmission-gtk" \
+      --prefix XDG_DATA_DIRS : "${gtk3}/share"
   '';
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "A fast, easy and free BitTorrent client";
     longDescription = ''
       Transmission is a BitTorrent client which features a simple interface
@@ -40,8 +48,9 @@ stdenv.mkDerivation rec {
         * Full encryption, DHT, and PEX support
     '';
     homepage = http://www.transmissionbt.com/;
-    license = [ "GPLv2" ];
-    maintainers = [ stdenv.lib.maintainers.astsmtl ];
-    platforms = stdenv.lib.platforms.linux;
+    license = licenses.gpl2; # parts are under MIT
+    maintainers = with maintainers; [ astsmtl vcunat ];
+    platforms = platforms.linux;
   };
 }
+
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 3742eea8928..f5af633722f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8701,10 +8701,8 @@ let
     wrapPython = pythonPackages.wrapPython;
   };
 
-  # This builds the gtk client
-  transmission_260 = callPackage ../applications/networking/p2p/transmission/2.60.nix { };
-
   transmission = callPackage ../applications/networking/p2p/transmission { };
+  transmission_gtk = transmission.override { enableGTK3 = true; };
 
   transmission_remote_gtk = callPackage ../applications/networking/p2p/transmission-remote-gtk {};
 
-- 
GitLab


From 4c7796e4a30178037210e90414103ab43c80f36a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Fri, 4 Oct 2013 21:10:54 +0200
Subject: [PATCH 4978/5331] transmission: fix non-gtk builds

I'm sorry, I was incautious.
---
 pkgs/applications/networking/p2p/transmission/default.nix | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/p2p/transmission/default.nix b/pkgs/applications/networking/p2p/transmission/default.nix
index b273b567b77..cb439ddb462 100644
--- a/pkgs/applications/networking/p2p/transmission/default.nix
+++ b/pkgs/applications/networking/p2p/transmission/default.nix
@@ -27,9 +27,8 @@ stdenv.mkDerivation rec {
   configureFlags = [ "--with-systemd-daemon" ]
     ++ optional enableGTK3 "--with-gtk";
 
-  postInstall = ''
+  postInstall = optionalString enableGTK3 /* gsettings schemas for file dialogues */ ''
     rm "$out/share/icons/hicolor/icon-theme.cache"
-  '' + optionalString enableGTK3 /* gsettings schemas for file dialogues */ ''
     wrapProgram "$out/bin/transmission-gtk" \
       --prefix XDG_DATA_DIRS : "${gtk3}/share"
   '';
-- 
GitLab


From f82cfef944df724814c9d9264bc102fd0850ca6e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Sat, 5 Oct 2013 16:45:51 +0200
Subject: [PATCH 4979/5331] add sshuttle: Transparent proxy server that works
 as a poor man's VPN

---
 pkgs/tools/security/sshuttle/default.nix | 34 ++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix          |  2 ++
 2 files changed, 36 insertions(+)
 create mode 100644 pkgs/tools/security/sshuttle/default.nix

diff --git a/pkgs/tools/security/sshuttle/default.nix b/pkgs/tools/security/sshuttle/default.nix
new file mode 100644
index 00000000000..61ba63862af
--- /dev/null
+++ b/pkgs/tools/security/sshuttle/default.nix
@@ -0,0 +1,34 @@
+{ stdenv, fetchurl, iptables, python, pythonPackages }:
+  
+stdenv.mkDerivation rec {
+  name = "sshuttle-${version}";
+  version = "0.61";
+
+  src = fetchurl {
+    url = "https://github.com/apenwarr/sshuttle/archive/sshuttle-0.61.tar.gz";
+    sha256 = "1v2v1kbwnmx6ygzhbgqcmyafx914s2p7vjp7l0pf52sa7qkliy9b";
+  };
+
+  preBuild = ''
+   substituteInPlace Documentation/all.do --replace "/bin/ls" "$(type -tP ls)";
+   substituteInPlace Documentation/md2man.py --replace "/usr/bin/env python" "${python}/bin/python"
+  '';
+
+  phases = "unpackPhase installPhase";
+
+  installPhase = ''
+    mkdir -p $out/bin
+    cp -R . $out
+    ln -s $out/sshuttle $out/bin/sshuttle
+  '';
+  
+
+  buildInputs = [ iptables python pythonPackages.markdown pythonPackages.beautifulsoup ];
+
+  meta = with stdenv.lib; {
+    homepage = https://github.com/apenwarr/sshuttle;
+    description = "Transparent proxy server that works as a poor man's VPN";
+    maintainers = with maintainers; [ iElectric ];
+    platforms = platforms.unix;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f5af633722f..957eadbb8c1 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1789,6 +1789,8 @@ let
 
   sshfsFuse = callPackage ../tools/filesystems/sshfs-fuse { };
 
+  sshuttle = callPackage ../tools/security/sshuttle { };
+
   sudo = callPackage ../tools/security/sudo { };
 
   suidChroot = builderDefsPackage (import ../tools/system/suid-chroot) { };
-- 
GitLab


From 28ac782583d6a959940ece313e3842a97e9340c0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Sat, 5 Oct 2013 16:22:46 +0200
Subject: [PATCH 4980/5331] Some description fixes

There are many more packages to fix, this is just a start.

Rules:
 * Don't repeat the package name (not always that easy...)
 * Start with capital letter
 * Don't end with full stop
 * Don't start with "The ..." or "A ..."

I've also added descriptions to some packages and rewritten others.
---
 pkgs/applications/audio/a2jmidid/default.nix               | 2 +-
 pkgs/applications/audio/abcde/default.nix                  | 2 +-
 pkgs/applications/audio/audacious/default.nix              | 2 +-
 pkgs/applications/audio/aumix/default.nix                  | 2 +-
 pkgs/applications/misc/abook/default.nix                   | 2 +-
 pkgs/applications/networking/bittorrentsync/default.nix    | 2 +-
 pkgs/applications/networking/ids/bro/default.nix           | 2 +-
 .../networking/instant-messengers/amsn/default.nix         | 1 +
 pkgs/applications/office/abiword/default.nix               | 4 ++++
 pkgs/applications/office/antiword/default.nix              | 2 +-
 pkgs/applications/science/biology/arb/default.nix          | 2 +-
 pkgs/applications/science/chemistry/avogadro/default.nix   | 1 +
 pkgs/applications/science/electronics/alliance/default.nix | 2 +-
 pkgs/applications/science/math/R/default.nix               | 2 +-
 pkgs/applications/version-management/bazaar/tools.nix      | 2 +-
 pkgs/data/fonts/anonymous-pro/default.nix                  | 2 +-
 pkgs/data/fonts/arkpandora/default.nix                     | 2 +-
 pkgs/development/compilers/aldor/default.nix               | 2 +-
 pkgs/development/compilers/clean/default.nix               | 2 +-
 pkgs/development/interpreters/angelscript/default.nix      | 2 +-
 pkgs/development/libraries/Xaw3d/default.nix               | 4 ++++
 pkgs/development/libraries/a52dec/default.nix              | 1 +
 pkgs/development/libraries/aalib/default.nix               | 4 ++++
 pkgs/development/libraries/agg/default.nix                 | 2 +-
 pkgs/development/libraries/apache-activemq/default.nix     | 4 +---
 pkgs/development/libraries/aspell/default.nix              | 2 +-
 pkgs/development/libraries/atk/default.nix                 | 2 +-
 pkgs/development/libraries/attica/default.nix              | 2 +-
 pkgs/development/libraries/aubio/default.nix               | 2 +-
 pkgs/development/libraries/audiofile/default.nix           | 2 +-
 pkgs/development/libraries/avahi/default.nix               | 2 +-
 pkgs/development/libraries/bwidget/default.nix             | 2 +-
 pkgs/development/libraries/classads/default.nix            | 2 +-
 pkgs/development/misc/avr-gcc-with-avr-libc/default.nix    | 2 +-
 pkgs/development/tools/analysis/checkstyle/default.nix     | 7 ++++++-
 .../tools/build-managers/apache-ant/default.nix            | 4 ++++
 .../tools/build-managers/apache-ant/from-source.nix        | 2 +-
 pkgs/development/tools/casperjs/default.nix                | 2 +-
 pkgs/development/tools/misc/astyle/default.nix             | 2 +-
 pkgs/development/tools/misc/autobuild/default.nix          | 2 +-
 pkgs/development/tools/misc/autoconf/2.13.nix              | 2 +-
 pkgs/development/tools/misc/autoconf/default.nix           | 2 +-
 pkgs/development/tools/misc/autogen/default.nix            | 2 +-
 pkgs/development/tools/misc/automake/automake-1.10.x.nix   | 2 +-
 pkgs/development/tools/misc/automake/automake-1.11.x.nix   | 2 +-
 pkgs/development/tools/misc/automake/automake-1.12.x.nix   | 2 +-
 pkgs/development/tools/misc/automake/automake-1.13.x.nix   | 2 +-
 pkgs/development/tools/misc/avarice/default.nix            | 2 +-
 pkgs/development/tools/misc/ccache/default.nix             | 2 +-
 pkgs/games/blobby/default.nix                              | 2 +-
 pkgs/os-specific/linux/acpi/default.nix                    | 1 +
 pkgs/os-specific/linux/apparmor/default.nix                | 2 +-
 pkgs/servers/apcupsd/default.nix                           | 2 +-
 pkgs/tools/X11/autocutsel/default.nix                      | 2 +-
 pkgs/tools/X11/bgs/default.nix                             | 2 +-
 pkgs/tools/admin/analog/default.nix                        | 2 +-
 pkgs/tools/filesystems/archivemount/default.nix            | 2 +-
 pkgs/tools/graphics/argyllcms/default.nix                  | 2 +-
 pkgs/tools/misc/autojump/default.nix                       | 2 +-
 pkgs/tools/misc/autorandr/default.nix                      | 2 +-
 pkgs/tools/misc/byobu/default.nix                          | 2 +-
 pkgs/tools/networking/aria/default.nix                     | 2 +-
 pkgs/tools/networking/axel/default.nix                     | 2 +-
 pkgs/tools/networking/bwm-ng/default.nix                   | 2 +-
 pkgs/tools/networking/chrony/default.nix                   | 2 +-
 pkgs/tools/networking/p2p/amule/default.nix                | 2 +-
 pkgs/tools/networking/p2p/bit-tornado/default.nix          | 2 +-
 pkgs/tools/security/apg/default.nix                        | 2 +-
 pkgs/tools/security/clamav/default.nix                     | 2 +-
 pkgs/tools/typesetting/tex/auctex/default.nix              | 2 +-
 70 files changed, 87 insertions(+), 64 deletions(-)

diff --git a/pkgs/applications/audio/a2jmidid/default.nix b/pkgs/applications/audio/a2jmidid/default.nix
index ca8565ac323..f6c17e6d8ed 100644
--- a/pkgs/applications/audio/a2jmidid/default.nix
+++ b/pkgs/applications/audio/a2jmidid/default.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     homepage = http://home.gna.org/a2jmidid;
-    description = "daemon for exposing legacy ALSA sequencer applications in JACK MIDI system";
+    description = "Daemon for exposing legacy ALSA sequencer applications in JACK MIDI system";
     license = licenses.gpl2;
     maintainers = [ maintainers.goibhniu ];
 
diff --git a/pkgs/applications/audio/abcde/default.nix b/pkgs/applications/audio/abcde/default.nix
index c6b5e9da0dd..031b0fe93b5 100644
--- a/pkgs/applications/audio/abcde/default.nix
+++ b/pkgs/applications/audio/abcde/default.nix
@@ -62,7 +62,7 @@ in
     meta = {
       homepage = "http://lly.org/~rcw/abcde/page/";
       license = "GPLv2+";
-      description = "A Better CD Encoder (ABCDE)";
+      description = "Command-line audio CD ripper";
 
       longDescription = ''
         abcde is a front-end command-line utility (actually, a shell
diff --git a/pkgs/applications/audio/audacious/default.nix b/pkgs/applications/audio/audacious/default.nix
index 9ae2fcdd20e..6846607d61d 100644
--- a/pkgs/applications/audio/audacious/default.nix
+++ b/pkgs/applications/audio/audacious/default.nix
@@ -49,7 +49,7 @@ stdenv.mkDerivation {
   enableParallelBuilding = true;
 
   meta = {
-    description = "Audacious, a media player forked from the Beep Media Player, which was itself an XMMS fork";
+    description = "Audio player";
     homepage = http://audacious-media-player.org/;
     maintainers = with stdenv.lib.maintainers; [ eelco simons ];
     platforms = stdenv.lib.platforms.linux;
diff --git a/pkgs/applications/audio/aumix/default.nix b/pkgs/applications/audio/aumix/default.nix
index d69d9d47133..1e19a3ac5c3 100644
--- a/pkgs/applications/audio/aumix/default.nix
+++ b/pkgs/applications/audio/aumix/default.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
     ++ (if gtkGUI then [pkgconfig gtk] else []);
 
   meta = {
-    description = "Aumix, an audio mixer for X and the console";
+    description = "Audio mixer for X and the console";
     longDescription = ''
       Aumix adjusts an audio mixer from X, the console, a terminal,
       the command line or a script.
diff --git a/pkgs/applications/misc/abook/default.nix b/pkgs/applications/misc/abook/default.nix
index 09345576487..3d187d92f5c 100644
--- a/pkgs/applications/misc/abook/default.nix
+++ b/pkgs/applications/misc/abook/default.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     homepage = "http://abook.sourceforge.net/";
-    description = "Abook is a text-based addressbook program designed to use with mutt mail client.";
+    description = "Text-based addressbook program designed to use with mutt mail client";
     license = "GPLv2";
     maintainers = [ stdenv.lib.maintainers.edwtjo ];
     platforms = with stdenv.lib.platforms; linux;
diff --git a/pkgs/applications/networking/bittorrentsync/default.nix b/pkgs/applications/networking/bittorrentsync/default.nix
index 25a23b019d8..c2d2f28751a 100644
--- a/pkgs/applications/networking/bittorrentsync/default.nix
+++ b/pkgs/applications/networking/bittorrentsync/default.nix
@@ -40,7 +40,7 @@ in stdenv.mkDerivation {
 
   meta = {
     homepage = "http://labs.bittorrent.com/experiments/sync.html";
-    description = "Automatically sync files via secure, distributed technology.";
+    description = "Automatically sync files via secure, distributed technology";
     license = stdenv.lib.licenses.unfree;
     maintainers = [ stdenv.lib.maintainers.iElectric ];
   };
diff --git a/pkgs/applications/networking/ids/bro/default.nix b/pkgs/applications/networking/ids/bro/default.nix
index 6e70e106d26..d60d39ac028 100644
--- a/pkgs/applications/networking/ids/bro/default.nix
+++ b/pkgs/applications/networking/ids/bro/default.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   enableParallelBuilding = true;
   
   meta = {
-    description = "Bro is a powerful network analysis framework that is much different from the typical IDS you may know.";
+    description = "Powerful network analysis framework that is much different from the typical IDS you may know";
     homepage = http://www.bro.org/;
     license = "BSD";
   };
diff --git a/pkgs/applications/networking/instant-messengers/amsn/default.nix b/pkgs/applications/networking/instant-messengers/amsn/default.nix
index 07aa20ff1f3..fc7906b3e40 100644
--- a/pkgs/applications/networking/instant-messengers/amsn/default.nix
+++ b/pkgs/applications/networking/instant-messengers/amsn/default.nix
@@ -16,6 +16,7 @@ stdenv.mkDerivation {
   '';
 
   meta = {
+    description = "Instant messaging (MSN Messenger clone)";
     homepage = http://amsn-project.net;
   };
 }
diff --git a/pkgs/applications/office/abiword/default.nix b/pkgs/applications/office/abiword/default.nix
index a500bbaa240..0e5a6afcdc5 100644
--- a/pkgs/applications/office/abiword/default.nix
+++ b/pkgs/applications/office/abiword/default.nix
@@ -26,4 +26,8 @@ stdenv.mkDerivation {
     [ pkgconfig gtk libglade librsvg bzip2 libgnomecanvas fribidi libpng popt
       libgsf enchant wv libjpeg
     ];
+
+  meta = {
+    description = "Word processing program, similar to Microsof Word";
+  };
 }
diff --git a/pkgs/applications/office/antiword/default.nix b/pkgs/applications/office/antiword/default.nix
index c4da2b609ce..f889490a862 100644
--- a/pkgs/applications/office/antiword/default.nix
+++ b/pkgs/applications/office/antiword/default.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation {
 
   meta = {
     homepage = "http://www.winfield.demon.nl/";
-    description = "convert MS Word documents to plain text or PostScript";
+    description = "Convert MS Word documents to plain text or PostScript";
     license = stdenv.lib.licenses.gpl2;
 
     maintainers = [ stdenv.lib.maintainers.simons ];
diff --git a/pkgs/applications/science/biology/arb/default.nix b/pkgs/applications/science/biology/arb/default.nix
index 1b4563555c4..279091f21bd 100644
--- a/pkgs/applications/science/biology/arb/default.nix
+++ b/pkgs/applications/science/biology/arb/default.nix
@@ -75,7 +75,7 @@ stdenv.mkDerivation {
   '';
 
   meta = {
-    description     = "ARB software for sequence database handling and analysis";
+    description     = "Software for sequence database handling and analysis";
     longDescription = ''The ARB software is a graphically oriented package comprising various tools for sequence database handling and data analysis. A central database of processed (aligned) sequences and any type of additional data linked to the respective sequence entries is structured according to phylogeny or other user defined criteria. Note that this package includes its own older versions of clustal etc.''; 
     license     = "non-free";
     pkgMaintainer = "http://BioLib.open-bio.org/";
diff --git a/pkgs/applications/science/chemistry/avogadro/default.nix b/pkgs/applications/science/chemistry/avogadro/default.nix
index f4b353296fd..dd6c0eaa376 100644
--- a/pkgs/applications/science/chemistry/avogadro/default.nix
+++ b/pkgs/applications/science/chemistry/avogadro/default.nix
@@ -15,6 +15,7 @@ stdenv.mkDerivation rec {
   NIX_CFLAGS_COMPILE = "-include ${mesa}/include/GL/glu.h";
 
   meta = {
+    description = "Molecule editor and visualizer";
     maintainers = [ stdenv.lib.maintainers.urkud ];
     inherit (qt4.meta) platforms;
   };
diff --git a/pkgs/applications/science/electronics/alliance/default.nix b/pkgs/applications/science/electronics/alliance/default.nix
index 90fd5901cac..ee22c66dfec 100644
--- a/pkgs/applications/science/electronics/alliance/default.nix
+++ b/pkgs/applications/science/electronics/alliance/default.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation {
   '';
 
   meta = {
-      description = "Complete set of free CAD tools and portable libraries for VLSI design.";
+      description = "Complete set of free CAD tools and portable libraries for VLSI design";
       homepage = http://www-asim.lip6.fr/recherche/alliance/;
   };
 }
diff --git a/pkgs/applications/science/math/R/default.nix b/pkgs/applications/science/math/R/default.nix
index 51505d61439..6c8ec9e68c5 100644
--- a/pkgs/applications/science/math/R/default.nix
+++ b/pkgs/applications/science/math/R/default.nix
@@ -59,7 +59,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     homepage = "http://www.r-project.org/";
-    description = "a free software environment for statistical computing and graphics";
+    description = "Free software environment for statistical computing and graphics";
     license = stdenv.lib.licenses.gpl2Plus;
 
     longDescription = ''
diff --git a/pkgs/applications/version-management/bazaar/tools.nix b/pkgs/applications/version-management/bazaar/tools.nix
index 5a4b706f418..19a00d2b841 100644
--- a/pkgs/applications/version-management/bazaar/tools.nix
+++ b/pkgs/applications/version-management/bazaar/tools.nix
@@ -15,6 +15,6 @@ rec {
       
   name = "bzr-tools-${version}";
   meta = {
-    description = "Bazaar plugins.";
+    description = "Bazaar plugins";
   };
 }
diff --git a/pkgs/data/fonts/anonymous-pro/default.nix b/pkgs/data/fonts/anonymous-pro/default.nix
index df98d8197f5..21a1c9bf5c8 100644
--- a/pkgs/data/fonts/anonymous-pro/default.nix
+++ b/pkgs/data/fonts/anonymous-pro/default.nix
@@ -33,7 +33,7 @@ rec {
   '') ["addInputs"];
       
   meta = {
-    description = "A TrueType font set intended for source code";
+    description = "TrueType font set intended for source code";
     maintainers = with a.lib.maintainers;
     [
       raskin
diff --git a/pkgs/data/fonts/arkpandora/default.nix b/pkgs/data/fonts/arkpandora/default.nix
index be1292204ad..7394dce551b 100644
--- a/pkgs/data/fonts/arkpandora/default.nix
+++ b/pkgs/data/fonts/arkpandora/default.nix
@@ -17,6 +17,6 @@ rec {
       
   name = "arkpandora-" + version;
   meta = {
-    description = "ArkPandora fonts, metrically identical to Arial and Times New Roman.";
+    description = "Font, metrically identical to Arial and Times New Roman";
   };
 }
diff --git a/pkgs/development/compilers/aldor/default.nix b/pkgs/development/compilers/aldor/default.nix
index fcd0c9fd453..57d1bf74154 100644
--- a/pkgs/development/compilers/aldor/default.nix
+++ b/pkgs/development/compilers/aldor/default.nix
@@ -29,7 +29,7 @@ stdenv.mkDerivation {
 
   meta = {
     homepage = "http://www.aldor.org/";
-    description = "Aldor is a programming language with an expressive type system";
+    description = "Programming language with an expressive type system";
     license = stdenv.lib.licenses.asl20;
 
     longDescription = ''
diff --git a/pkgs/development/compilers/clean/default.nix b/pkgs/development/compilers/clean/default.nix
index bd051a95699..7f3e679e847 100644
--- a/pkgs/development/compilers/clean/default.nix
+++ b/pkgs/development/compilers/clean/default.nix
@@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = {
-    description = "Clean is a general purpose, state-of-the-art, pure and lazy functional programming language.";
+    description = "General purpose, state-of-the-art, pure and lazy functional programming language";
     longDescription = ''
       Clean is a general purpose, state-of-the-art, pure and lazy functional
       programming language designed for making real-world applications. Some
diff --git a/pkgs/development/interpreters/angelscript/default.nix b/pkgs/development/interpreters/angelscript/default.nix
index a092172c8ca..22f92f40183 100644
--- a/pkgs/development/interpreters/angelscript/default.nix
+++ b/pkgs/development/interpreters/angelscript/default.nix
@@ -47,7 +47,7 @@ rec {
   '' ["defEnsureDir" "prepareBuild"];
       
   meta = {
-    description = "A light-weight scripting library";
+    description = "Light-weight scripting library";
     maintainers = with a.lib.maintainers;
     [
       raskin
diff --git a/pkgs/development/libraries/Xaw3d/default.nix b/pkgs/development/libraries/Xaw3d/default.nix
index a0603b546cf..454c4e882f5 100644
--- a/pkgs/development/libraries/Xaw3d/default.nix
+++ b/pkgs/development/libraries/Xaw3d/default.nix
@@ -10,4 +10,8 @@ stdenv.mkDerivation {
   patches = [./config.patch ./laylex.patch];
   buildInputs = [x11 imake gccmakedep libXmu libXpm libXp bison flex];
   propagatedBuildInputs = [x11 libXmu];
+
+  meta = {
+    description = "3D widget set based on the Athena Widget set";
+  };
 }
diff --git a/pkgs/development/libraries/a52dec/default.nix b/pkgs/development/libraries/a52dec/default.nix
index 82fef49cfc1..84a87df03e4 100644
--- a/pkgs/development/libraries/a52dec/default.nix
+++ b/pkgs/development/libraries/a52dec/default.nix
@@ -11,6 +11,7 @@ stdenv.mkDerivation rec {
   NIX_CFLAGS_COMPILE = "-fpic";
 
   meta = {
+    description = "ATSC A/52 stream decoder";
     homepage = http://liba52.sourceforge.net/;
   };
 }
diff --git a/pkgs/development/libraries/aalib/default.nix b/pkgs/development/libraries/aalib/default.nix
index 2da006a6ceb..897fc9db8de 100644
--- a/pkgs/development/libraries/aalib/default.nix
+++ b/pkgs/development/libraries/aalib/default.nix
@@ -15,4 +15,8 @@ stdenv.mkDerivation {
 
   buildInputs = [ncurses];
   inherit ncurses;
+
+  meta = {
+    description = "ASCII art graphics library";
+  };
 }
diff --git a/pkgs/development/libraries/agg/default.nix b/pkgs/development/libraries/agg/default.nix
index 8c24ae6fdbe..59124f011dd 100644
--- a/pkgs/development/libraries/agg/default.nix
+++ b/pkgs/development/libraries/agg/default.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   configureFlags = "--x-includes=${libX11}/include --x-libraries=${libX11}/lib";
 
   meta = {
-    description = "The Anti-Grain Geometry (AGG) library, a high quality rendering engine for C++";
+    description = "High quality rendering engine for C++";
 
     longDescription = ''
       Anti-Grain Geometry (AGG) is an Open Source, free of charge
diff --git a/pkgs/development/libraries/apache-activemq/default.nix b/pkgs/development/libraries/apache-activemq/default.nix
index 90d0dafdd95..d55ff9049ed 100644
--- a/pkgs/development/libraries/apache-activemq/default.nix
+++ b/pkgs/development/libraries/apache-activemq/default.nix
@@ -22,9 +22,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     homepage = http://activemq.apache.org/;
-    description = ''
-      Messaging and Integration Patterns server written in Java.
-    '';
+    description = "Messaging and Integration Patterns server written in Java";
     license = stdenv.lib.licenses.asl20;
   };
 
diff --git a/pkgs/development/libraries/aspell/default.nix b/pkgs/development/libraries/aspell/default.nix
index dd8b68717aa..a69cee99b2b 100644
--- a/pkgs/development/libraries/aspell/default.nix
+++ b/pkgs/development/libraries/aspell/default.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
   # doesn't expand environment variables such as `$HOME'.
 
   meta = {
-    description = "GNU Aspell, A spell checker for many languages";
+    description = "Spell checker for many languages";
     homepage = http://aspell.net/;
     license = "LGPLv2+";
     maintainers = [ ];
diff --git a/pkgs/development/libraries/atk/default.nix b/pkgs/development/libraries/atk/default.nix
index f4c33c86911..0c9e998ed2e 100644
--- a/pkgs/development/libraries/atk/default.nix
+++ b/pkgs/development/libraries/atk/default.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   postInstall = "rm -rf $out/share/gtk-doc";
 
   meta = {
-    description = "ATK, the accessibility toolkit";
+    description = "Accessibility toolkit";
 
     longDescription = ''
       ATK is the Accessibility Toolkit.  It provides a set of generic
diff --git a/pkgs/development/libraries/attica/default.nix b/pkgs/development/libraries/attica/default.nix
index 87f6c019fb7..3174dc57667 100644
--- a/pkgs/development/libraries/attica/default.nix
+++ b/pkgs/development/libraries/attica/default.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ cmake ];
   
   meta = with stdenv.lib; {
-    description = "A library to access Open Collaboration Service providers";
+    description = "Library to access Open Collaboration Service providers";
     license = "LGPL";
     maintainers = [ maintainers.sander maintainers.urkud maintainers.phreedom ];
     inherit (qt4.meta) platforms;
diff --git a/pkgs/development/libraries/aubio/default.nix b/pkgs/development/libraries/aubio/default.nix
index 91d27254aed..abfb3985f26 100644
--- a/pkgs/development/libraries/aubio/default.nix
+++ b/pkgs/development/libraries/aubio/default.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
     ];
 
   meta = { 
-    description = "A library for audio labelling";
+    description = "Library for audio labelling";
     homepage = http://aubio.org/;
     license = "GPLv2";
     maintainers = [ stdenv.lib.maintainers.marcweber ];
diff --git a/pkgs/development/libraries/audiofile/default.nix b/pkgs/development/libraries/audiofile/default.nix
index 2f4de88c94c..73f38f02814 100644
--- a/pkgs/development/libraries/audiofile/default.nix
+++ b/pkgs/development/libraries/audiofile/default.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   };
 
   meta = with stdenv.lib; {
-    description = "A library for reading and writing audio files in various formats";
+    description = "Library for reading and writing audio files in various formats";
     homepage    = http://www.68k.org/~michael/audiofile/; 
     license     = licenses.lgpl21Plus;
     maintainers = with maintainers; [ lovek323 shlevy ];
diff --git a/pkgs/development/libraries/avahi/default.nix b/pkgs/development/libraries/avahi/default.nix
index f62dc200447..f4795286e09 100644
--- a/pkgs/development/libraries/avahi/default.nix
+++ b/pkgs/development/libraries/avahi/default.nix
@@ -38,7 +38,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = with stdenv.lib; {
-    description = "Avahi, an mDNS/DNS-SD implementation";
+    description = "mDNS/DNS-SD implementation";
     homepage    = http://avahi.org;
     license     = licenses.lgpl2Plus;
     platforms   = platforms.unix;
diff --git a/pkgs/development/libraries/bwidget/default.nix b/pkgs/development/libraries/bwidget/default.nix
index 31dc885bc43..17f2b545168 100644
--- a/pkgs/development/libraries/bwidget/default.nix
+++ b/pkgs/development/libraries/bwidget/default.nix
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     homepage = "http://tcl.activestate.com/software/tcllib/";
-    description = "The BWidget toolkit is a high-level widget set for Tcl/Tk.";
+    description = "High-level widget set for Tcl/Tk";
     license = stdenv.lib.licenses.tcltk;
   };
 }
diff --git a/pkgs/development/libraries/classads/default.nix b/pkgs/development/libraries/classads/default.nix
index 5739690e59a..080e854315d 100644
--- a/pkgs/development/libraries/classads/default.nix
+++ b/pkgs/development/libraries/classads/default.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation {
   
   meta = {
     homepage = http://www.cs.wisc.edu/condor/classad/;
-    description = "The Classified Advertisements library provides a generic means for matching resources.";
+    description = "The Classified Advertisements library provides a generic means for matching resources";
     license = "Apache-2.0";
   };
 }
diff --git a/pkgs/development/misc/avr-gcc-with-avr-libc/default.nix b/pkgs/development/misc/avr-gcc-with-avr-libc/default.nix
index 3c28ed04dba..5218f5b7744 100644
--- a/pkgs/development/misc/avr-gcc-with-avr-libc/default.nix
+++ b/pkgs/development/misc/avr-gcc-with-avr-libc/default.nix
@@ -79,7 +79,7 @@ stdenv.mkDerivation {
   };
 
   meta = { 
-      description = "avr gcc developement environment including binutils, avr-gcc and avr-libc";
+      description = "AVR developement environment including binutils, avr-gcc and avr-libc";
       # I've tried compiling the packages separately.. too much hassle. This just works. Fine.
       license =  ["GPL" "LGPL"]; # see single packages ..
       homepage = []; # dito
diff --git a/pkgs/development/tools/analysis/checkstyle/default.nix b/pkgs/development/tools/analysis/checkstyle/default.nix
index 09656dc520a..1dfaa5cf875 100644
--- a/pkgs/development/tools/analysis/checkstyle/default.nix
+++ b/pkgs/development/tools/analysis/checkstyle/default.nix
@@ -15,7 +15,12 @@ stdenv.mkDerivation {
   '';
 
   meta = {
-    description = "A development tool to help programmers write Java code that adheres to a coding standard. By default it supports the Sun Code Conventions, but is highly configurable." ;
+    description = "Checks Java source against a coding standard";
+    longDescription = ''
+      checkstyle is a development tool to help programmers write Java code that
+      adheres to a coding standard. By default it supports the Sun Code
+      Conventions, but is highly configurable.
+    '';
     homepage = http://checkstyle.sourceforge.net/;
   };
 }
diff --git a/pkgs/development/tools/build-managers/apache-ant/default.nix b/pkgs/development/tools/build-managers/apache-ant/default.nix
index 03428552229..c14e09e25b7 100644
--- a/pkgs/development/tools/build-managers/apache-ant/default.nix
+++ b/pkgs/development/tools/build-managers/apache-ant/default.nix
@@ -23,4 +23,8 @@ stdenv.mkDerivation {
     url = "mirror://apache/ant/binaries/apache-ant-${version}-bin.tar.bz2";
     sha1 = "d9e3e83dd9664cfe1dcd4841c082db3f559af922";
   };
+
+  meta = {
+    description = "Java-based build tool";
+  };
 }
diff --git a/pkgs/development/tools/build-managers/apache-ant/from-source.nix b/pkgs/development/tools/build-managers/apache-ant/from-source.nix
index 01fdd5541ec..14213415ff8 100644
--- a/pkgs/development/tools/build-managers/apache-ant/from-source.nix
+++ b/pkgs/development/tools/build-managers/apache-ant/from-source.nix
@@ -57,7 +57,7 @@ EOF
   '';
 
   meta = {
-    description = "Apache Ant, a Java-based build tool";
+    description = "Java-based build tool";
 
     longDescription = ''
       Apache Ant is a Java-based build tool.  In theory, it is kind of like
diff --git a/pkgs/development/tools/casperjs/default.nix b/pkgs/development/tools/casperjs/default.nix
index f140f0d7862..60e680a60fc 100644
--- a/pkgs/development/tools/casperjs/default.nix
+++ b/pkgs/development/tools/casperjs/default.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = {
-    description = "Navigation scripting & testing utility for PhantomJS.";
+    description = "Navigation scripting & testing utility for PhantomJS";
     longDescription = ''
       CasperJS is a navigation scripting & testing utility for PhantomJS.
       It eases the process of defining a full navigation scenario and provides useful high-level
diff --git a/pkgs/development/tools/misc/astyle/default.nix b/pkgs/development/tools/misc/astyle/default.nix
index 9b1e9955732..6128406bbe5 100644
--- a/pkgs/development/tools/misc/astyle/default.nix
+++ b/pkgs/development/tools/misc/astyle/default.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation {
 
   meta = {
     homepage = "http://astyle.sourceforge.net/";
-    description = "source code reformatter";
+    description = "Source code indenter, formatter, and beautifier for C, C++, C# and Java";
     license = "LGPL";
 
     platforms = stdenv.lib.platforms.linux;
diff --git a/pkgs/development/tools/misc/autobuild/default.nix b/pkgs/development/tools/misc/autobuild/default.nix
index f8497b5dece..88246e4bb6e 100644
--- a/pkgs/development/tools/misc/autobuild/default.nix
+++ b/pkgs/development/tools/misc/autobuild/default.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = {
-    description = "Simon Josefsson's Autobuild, a continuous integration tool";
+    description = "Continuous integration tool";
 
     longDescription = ''
       Autobuild is a package that process output from building
diff --git a/pkgs/development/tools/misc/autoconf/2.13.nix b/pkgs/development/tools/misc/autoconf/2.13.nix
index 1dfe4d4a0a7..2d8169d408f 100644
--- a/pkgs/development/tools/misc/autoconf/2.13.nix
+++ b/pkgs/development/tools/misc/autoconf/2.13.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     homepage = http://www.gnu.org/software/autoconf/;
-    description = "GNU Autoconf, a part of the GNU Build System";
+    description = "Part of the GNU Build System";
 
     longDescription = ''
       GNU Autoconf is an extensible package of M4 macros that produce
diff --git a/pkgs/development/tools/misc/autoconf/default.nix b/pkgs/development/tools/misc/autoconf/default.nix
index b4de66d9baf..08fcd95afb5 100644
--- a/pkgs/development/tools/misc/autoconf/default.nix
+++ b/pkgs/development/tools/misc/autoconf/default.nix
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     homepage = http://www.gnu.org/software/autoconf/;
-    description = "GNU Autoconf, a part of the GNU Build System";
+    description = "Part of the GNU Build System";
 
     longDescription = ''
       GNU Autoconf is an extensible package of M4 macros that produce
diff --git a/pkgs/development/tools/misc/autogen/default.nix b/pkgs/development/tools/misc/autogen/default.nix
index 25fa29526c9..cd4f19694b2 100644
--- a/pkgs/development/tools/misc/autogen/default.nix
+++ b/pkgs/development/tools/misc/autogen/default.nix
@@ -25,7 +25,7 @@ let version = "5.17"; in
     #doCheck = true; # 2 tests fail because of missing /dev/tty
 
     meta = {
-      description = "GNU AutoGen, an automated text and program generation tool";
+      description = "Automated text and program generation tool";
 
       longDescription = ''
         AutoGen is a tool designed to simplify the creation and maintenance
diff --git a/pkgs/development/tools/misc/automake/automake-1.10.x.nix b/pkgs/development/tools/misc/automake/automake-1.10.x.nix
index c015c0115fe..80b033425a1 100644
--- a/pkgs/development/tools/misc/automake/automake-1.10.x.nix
+++ b/pkgs/development/tools/misc/automake/automake-1.10.x.nix
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     homepage = http://www.gnu.org/software/automake/;
-    description = "GNU Automake, a GNU standard-compliant makefile generator";
+    description = "GNU standard-compliant makefile generator";
 
     longDescription = ''
       GNU Automake is a tool for automatically generating
diff --git a/pkgs/development/tools/misc/automake/automake-1.11.x.nix b/pkgs/development/tools/misc/automake/automake-1.11.x.nix
index 91c27deb8b8..0af9877c935 100644
--- a/pkgs/development/tools/misc/automake/automake-1.11.x.nix
+++ b/pkgs/development/tools/misc/automake/automake-1.11.x.nix
@@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     homepage = http://www.gnu.org/software/automake/;
-    description = "GNU Automake, a GNU standard-compliant makefile generator";
+    description = "GNU standard-compliant makefile generator";
 
     longDescription = ''
       GNU Automake is a tool for automatically generating
diff --git a/pkgs/development/tools/misc/automake/automake-1.12.x.nix b/pkgs/development/tools/misc/automake/automake-1.12.x.nix
index bd609c4a40d..8bee4790bcb 100644
--- a/pkgs/development/tools/misc/automake/automake-1.12.x.nix
+++ b/pkgs/development/tools/misc/automake/automake-1.12.x.nix
@@ -38,7 +38,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     homepage = http://www.gnu.org/software/automake/;
-    description = "GNU Automake, a GNU standard-compliant makefile generator";
+    description = "GNU standard-compliant makefile generator";
 
     longDescription = ''
       GNU Automake is a tool for automatically generating
diff --git a/pkgs/development/tools/misc/automake/automake-1.13.x.nix b/pkgs/development/tools/misc/automake/automake-1.13.x.nix
index 400d554b65e..96a93e8d60b 100644
--- a/pkgs/development/tools/misc/automake/automake-1.13.x.nix
+++ b/pkgs/development/tools/misc/automake/automake-1.13.x.nix
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     homepage = "http://www.gnu.org/software/automake/";
-    description = "GNU Automake, a GNU standard-compliant makefile generator";
+    description = "GNU standard-compliant makefile generator";
     license = "GPLv2+";
 
     longDescription = ''
diff --git a/pkgs/development/tools/misc/avarice/default.nix b/pkgs/development/tools/misc/avarice/default.nix
index bc3785181a8..e2c4c89e998 100644
--- a/pkgs/development/tools/misc/avarice/default.nix
+++ b/pkgs/development/tools/misc/avarice/default.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     license = stdenv.lib.licenses.gpl2;
-    description = "AVaRICE translates between GDB's remote debug protocol and the AVR JTAG ICE protocol";
+    description = "Translator between GDB's remote debug protocol and the AVR JTAG ICE protocol";
     homepage = http://sourceforge.net/projects/avarice/files/avarice/;
     maintainers = [ stdenv.lib.maintainers.smironov ];
     platforms = stdenv.lib.platforms.linux;
diff --git a/pkgs/development/tools/misc/ccache/default.nix b/pkgs/development/tools/misc/ccache/default.nix
index 2cd00f51d9d..05a0d9bbeb5 100644
--- a/pkgs/development/tools/misc/ccache/default.nix
+++ b/pkgs/development/tools/misc/ccache/default.nix
@@ -38,7 +38,7 @@ stdenv.mkDerivation {
   };
 
   meta = {
-    description = "ccache, a tool that caches compilation results.";
+    description = "Compiler cache for fast recompilation of C/C++ code";
     homepage = http://ccache.samba.org/;
     license = "GPL";
   };
diff --git a/pkgs/games/blobby/default.nix b/pkgs/games/blobby/default.nix
index 7e4f6b00587..faf7366f249 100644
--- a/pkgs/games/blobby/default.nix
+++ b/pkgs/games/blobby/default.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = {
-    description = ''A blobby volleyball game.'';
+    description = ''A blobby volleyball game'';
     license = with stdenv.lib.licenses; bsd3;
     platforms = with stdenv.lib.platforms; linux;
     maintainers = with stdenv.lib.maintainers; [raskin];
diff --git a/pkgs/os-specific/linux/acpi/default.nix b/pkgs/os-specific/linux/acpi/default.nix
index 6bb44d7db44..d694a9e5ed2 100644
--- a/pkgs/os-specific/linux/acpi/default.nix
+++ b/pkgs/os-specific/linux/acpi/default.nix
@@ -10,6 +10,7 @@ stdenv.mkDerivation rec {
   };
 
   meta = {
+    description = "Show battery status and other ACPI information";
     longDescription = ''
       Linux ACPI client is a small command-line
       program that attempts to replicate the functionality of
diff --git a/pkgs/os-specific/linux/apparmor/default.nix b/pkgs/os-specific/linux/apparmor/default.nix
index da71eb8c709..858be431a91 100644
--- a/pkgs/os-specific/linux/apparmor/default.nix
+++ b/pkgs/os-specific/linux/apparmor/default.nix
@@ -85,7 +85,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     homepage = http://apparmor.net/;
-    description = "A Linux application security system";
+    description = "Linux application security system";
     license = licenses.gpl2;
     maintainers = [ maintainers.phreedom ];
     platforms = platforms.linux;
diff --git a/pkgs/servers/apcupsd/default.nix b/pkgs/servers/apcupsd/default.nix
index 877be1d74b8..4ccb1b069c9 100644
--- a/pkgs/servers/apcupsd/default.nix
+++ b/pkgs/servers/apcupsd/default.nix
@@ -45,7 +45,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = with stdenv.lib; {
-    description = "A daemon for controlling APC UPSes";
+    description = "Daemon for controlling APC UPSes";
     homepage = http://www.apcupsd.com/;
     license = licenses.gpl2;
     platforms = platforms.linux;
diff --git a/pkgs/tools/X11/autocutsel/default.nix b/pkgs/tools/X11/autocutsel/default.nix
index f4776933e53..bc7679b1670 100644
--- a/pkgs/tools/X11/autocutsel/default.nix
+++ b/pkgs/tools/X11/autocutsel/default.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation {
 
   meta = {
     homepage = "http://www.nongnu.org/autocutsel/";
-    description = "Autocutsel tracks changes in the server's cutbuffer and CLIPBOARD selection.";
+    description = "Tracks changes in the server's cutbuffer and CLIPBOARD selection";
     license = "GPLv2+";
     platforms = with stdenv.lib.platforms; all;
   };
diff --git a/pkgs/tools/X11/bgs/default.nix b/pkgs/tools/X11/bgs/default.nix
index a3fff2bc50b..0c6951aa3e7 100644
--- a/pkgs/tools/X11/bgs/default.nix
+++ b/pkgs/tools/X11/bgs/default.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   preConfigure = ''sed -i "s@PREFIX = /usr/local@PREFIX = $out@g" config.mk'';
 
   meta = { 
-      description = "bgs is an extremely fast and small background setter for X.";
+      description = "Extremely fast and small background setter for X";
       license = "MIT";
       platforms = with stdenv.lib.platforms; all;
       maintainers = with stdenv.lib.maintainers; [pSub]; 
diff --git a/pkgs/tools/admin/analog/default.nix b/pkgs/tools/admin/analog/default.nix
index debd6e4c2b7..ec139e7240d 100644
--- a/pkgs/tools/admin/analog/default.nix
+++ b/pkgs/tools/admin/analog/default.nix
@@ -30,7 +30,7 @@ stdenv.mkDerivation {
   meta = {
     homepage = "http://www.analog.cx/";
     license = "GPL";
-    description = "a powerful tool to generate web server statistics";
+    description = "Powerful tool to generate web server statistics";
     maintainers = [ stdenv.lib.maintainers.simons ];
     platforms = stdenv.lib.platforms.linux;
   };
diff --git a/pkgs/tools/filesystems/archivemount/default.nix b/pkgs/tools/filesystems/archivemount/default.nix
index c05d2e98af3..8c7593121bb 100644
--- a/pkgs/tools/filesystems/archivemount/default.nix
+++ b/pkgs/tools/filesystems/archivemount/default.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation {
   buildInputs = [ pkgconfig fuse libarchive ];
 
   meta = {
-    description = "Gateway between FUSE and libarchive: allows mounting of cpio, .tar.gz, .tar.bz2 archives.";
+    description = "Gateway between FUSE and libarchive: allows mounting of cpio, .tar.gz, .tar.bz2 archives";
     license = "GPL2";
 
     platforms = stdenv.lib.platforms.linux;
diff --git a/pkgs/tools/graphics/argyllcms/default.nix b/pkgs/tools/graphics/argyllcms/default.nix
index 934a27ef25b..d9eed4df224 100644
--- a/pkgs/tools/graphics/argyllcms/default.nix
+++ b/pkgs/tools/graphics/argyllcms/default.nix
@@ -77,7 +77,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     homepage = http://www.argyllcms.com;
-    description = "An ICC compatible color management system";
+    description = "Color management system (compatible with ICC)";
     license = licenses.gpl3;
     maintainers = [ maintainers.rickynils ];
     platforms = platforms.linux;
diff --git a/pkgs/tools/misc/autojump/default.nix b/pkgs/tools/misc/autojump/default.nix
index 5371ac55adb..a92b4ae3b1b 100644
--- a/pkgs/tools/misc/autojump/default.nix
+++ b/pkgs/tools/misc/autojump/default.nix
@@ -29,7 +29,7 @@ in
     '';
 
     meta = {
-      description = "Autojump, a `cd' command that learns";
+      description = "A `cd' command that learns";
       longDescription = ''
         One of the most used shell commands is “cd”.  A quick survey
         among my friends revealed that between 10 and 20% of all
diff --git a/pkgs/tools/misc/autorandr/default.nix b/pkgs/tools/misc/autorandr/default.nix
index 4a95e0890e9..2c7505260a6 100644
--- a/pkgs/tools/misc/autorandr/default.nix
+++ b/pkgs/tools/misc/autorandr/default.nix
@@ -33,7 +33,7 @@ in
     '';
 
     meta = {
-      description = "Autorandr, automatic display configuration selector based on connected devices";
+      description = "Automatic display configuration selector based on connected devices";
       homepage = https://github.com/wertarbyte/autorandr;
       maintainer = [ stdenv.lib.maintainers.coroa ];
     };
diff --git a/pkgs/tools/misc/byobu/default.nix b/pkgs/tools/misc/byobu/default.nix
index 6766e0bb474..03b3719c9f0 100644
--- a/pkgs/tools/misc/byobu/default.nix
+++ b/pkgs/tools/misc/byobu/default.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     homepage = https://launchpad.net/byobu/;
-    description = "Byobu is a GPLv3 open source text-based window manager and terminal multiplexer.";
+    description = "Text-based window manager and terminal multiplexer";
 
     longDescription =
       ''Byobu is a GPLv3 open source text-based window manager and terminal multiplexer. 
diff --git a/pkgs/tools/networking/aria/default.nix b/pkgs/tools/networking/aria/default.nix
index 4f58463ecf9..f6432f8aa22 100644
--- a/pkgs/tools/networking/aria/default.nix
+++ b/pkgs/tools/networking/aria/default.nix
@@ -16,6 +16,6 @@ rec {
       
   name = "aria-" + version;
   meta = {
-    description = "aria - multiprotocol DL manager";
+    description = "Multiprotocol download manager";
   };
 }
diff --git a/pkgs/tools/networking/axel/default.nix b/pkgs/tools/networking/axel/default.nix
index 0ee01850940..8a6d63d164c 100644
--- a/pkgs/tools/networking/axel/default.nix
+++ b/pkgs/tools/networking/axel/default.nix
@@ -8,6 +8,6 @@ stdenv.mkDerivation {
   };
 
   meta = {
-    description = "A console downloading program. Has some features for parallel connections for faster downloading.";
+    description = "Console downloading program with some features for parallel connections for faster downloading";
   };
 }
diff --git a/pkgs/tools/networking/bwm-ng/default.nix b/pkgs/tools/networking/bwm-ng/default.nix
index 88460d86730..4d18c4adb37 100644
--- a/pkgs/tools/networking/bwm-ng/default.nix
+++ b/pkgs/tools/networking/bwm-ng/default.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   buildInputs = [ ncurses ];
 
   meta = with stdenv.lib; {
-    description = "Bandwidth Monitor NG is a small and simple console-based live network and disk io bandwidth monitor.";
+    description = "Bandwidth Monitor NG is a small and simple console-based live network and disk io bandwidth monitor";
     homepage = "http://www.gropp.org/?id=projects&sub=bwm-ng";
     license = licenses.gpl2;
     platforms = platforms.unix;
diff --git a/pkgs/tools/networking/chrony/default.nix b/pkgs/tools/networking/chrony/default.nix
index d7fe0757057..d15559961f6 100644
--- a/pkgs/tools/networking/chrony/default.nix
+++ b/pkgs/tools/networking/chrony/default.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   buildInputs = [ readline ] ++ stdenv.lib.optional stdenv.isLinux libcap;
 
   meta = with stdenv.lib; {
-    description = "A pair of programs which are used to maintain the accuracy of the system clock on a computer.";
+    description = "Sets your computer's clock from time servers on the Net";
     homepage = "http://chrony.tuxfamily.org/";
     license = licenses.gpl2;
     platforms = platforms.unix;
diff --git a/pkgs/tools/networking/p2p/amule/default.nix b/pkgs/tools/networking/p2p/amule/default.nix
index 43de92afe9a..44384507a79 100644
--- a/pkgs/tools/networking/p2p/amule/default.nix
+++ b/pkgs/tools/networking/p2p/amule/default.nix
@@ -46,7 +46,7 @@ mkDerivation rec {
 
   meta = {
     homepage = http://amule.org/;
-    description = "aMule, a peer-to-peer client for the eD2K and Kademlia networks";
+    description = "Peer-to-peer client for the eD2K and Kademlia networks";
 
     longDescription = ''
       aMule is an eMule-like client for the eD2k and Kademlia
diff --git a/pkgs/tools/networking/p2p/bit-tornado/default.nix b/pkgs/tools/networking/p2p/bit-tornado/default.nix
index 14e13a17559..92458b3d145 100644
--- a/pkgs/tools/networking/p2p/bit-tornado/default.nix
+++ b/pkgs/tools/networking/p2p/bit-tornado/default.nix
@@ -19,6 +19,6 @@ stdenv.mkDerivation {
   '';
 
   meta = {
-    description = "Bittorrent client with IPv6 support.";
+    description = "Bittorrent client with IPv6 support";
   };
 }
diff --git a/pkgs/tools/security/apg/default.nix b/pkgs/tools/security/apg/default.nix
index 28f66e1e492..2190a1ffbe6 100644
--- a/pkgs/tools/security/apg/default.nix
+++ b/pkgs/tools/security/apg/default.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   patches = [ ./apg.patch ];
 
   meta = {
-    description = "A tool set for random password generation.";
+    description = "Tools for random password generation";
     longDescription = ''
       APG (Automated Password Generator) is the tool set for random
       password generation.
diff --git a/pkgs/tools/security/clamav/default.nix b/pkgs/tools/security/clamav/default.nix
index cb32085a8cf..ec00137b36f 100644
--- a/pkgs/tools/security/clamav/default.nix
+++ b/pkgs/tools/security/clamav/default.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     homepage = http://www.clamav.net;
-    description = "an open source (GPL) antivirus engine designed for detecting Trojans, viruses, malware and other malicious threats.";
+    description = "Antivirus engine designed for detecting Trojans, viruses, malware and other malicious threats";
     license = licenses.gpl2;
     maintainers = [ maintainers.phreedom ];
     platforms = platforms.linux;
diff --git a/pkgs/tools/typesetting/tex/auctex/default.nix b/pkgs/tools/typesetting/tex/auctex/default.nix
index 9774d7d1a94..3a8b41da660 100644
--- a/pkgs/tools/typesetting/tex/auctex/default.nix
+++ b/pkgs/tools/typesetting/tex/auctex/default.nix
@@ -6,7 +6,7 @@ stdenv.mkDerivation ( rec {
   name = "${pname}-${version}";
 
   meta = {
-    description = "AUCTeX is an extensible package for writing and formatting TeX files in GNU Emacs and XEmacs.";
+    description = "Extensible package for writing and formatting TeX files in GNU Emacs and XEmacs";
     homepage = http://www.gnu.org/software/auctex;
   };
 
-- 
GitLab


From 80924c8f3cc4c2c39ac6b57e6fad00269e4f69f6 Mon Sep 17 00:00:00 2001
From: Aristid Breitkreuz <aristidb@gmail.com>
Date: Sat, 5 Oct 2013 19:40:47 +0200
Subject: [PATCH 4981/5331] rsnapshot: configurable configuration file path

default value: /etc/rsnapshot.conf
---
 pkgs/tools/backup/rsnapshot/default.nix | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

diff --git a/pkgs/tools/backup/rsnapshot/default.nix b/pkgs/tools/backup/rsnapshot/default.nix
index 3da2fad21f2..3a18596aa46 100644
--- a/pkgs/tools/backup/rsnapshot/default.nix
+++ b/pkgs/tools/backup/rsnapshot/default.nix
@@ -1,5 +1,20 @@
-{fetchurl, stdenv, perl, openssh, rsync, logger}:
+{ fetchurl, stdenv, writeText, perl, openssh, rsync, logger,
+  configFile ? "/etc/rsnapshot.conf" }:
 
+let patch = writeText "rsnapshot-config.patch" ''
+--- rsnapshot-program.pl	2013-10-05 20:31:08.715991442 +0200
++++ rsnapshot-program.pl	2013-10-05 20:31:42.496193633 +0200
+@@ -383,7 +383,7 @@
+ 	}
+ 	
+ 	# set global variable
+-	$config_file = $default_config_file;
++	$config_file = '${configFile}';
+ }
+ 
+ # accepts no args
+'';
+in
 stdenv.mkDerivation rec {
   name = "rsnapshot-1.3.0";
   src = fetchurl {
@@ -12,6 +27,7 @@ stdenv.mkDerivation rec {
   patchPhase = ''
     substituteInPlace "Makefile.in" --replace \
       "/usr/bin/pod2man" "${perl}/bin/pod2man"
+    patch -p0 <${patch}
   '';
 
   meta = {
-- 
GitLab


From 89964dd2418854b9465043484b8d6e1b477a2b1e Mon Sep 17 00:00:00 2001
From: Dries Van Daele <dries_van_daele@telenet.be>
Date: Sat, 5 Oct 2013 20:59:34 +0200
Subject: [PATCH 4982/5331] add tabling to yap

---
 pkgs/development/compilers/yap/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/development/compilers/yap/default.nix b/pkgs/development/compilers/yap/default.nix
index 44e40710569..a29c0de65b8 100644
--- a/pkgs/development/compilers/yap/default.nix
+++ b/pkgs/development/compilers/yap/default.nix
@@ -11,6 +11,8 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ readline gmp zlib ];
 
+  configureFlags = "--enable-tabling=yes";
+
   meta = {
     homepage = "http://www.dcc.fc.up.pt/~vsc/Yap/";
     description = "Yap Prolog System is a ISO-compatible high-performance Prolog compiler";
-- 
GitLab


From 5dbc5f120c14671ca202eccbfedef7eb704b5a4a Mon Sep 17 00:00:00 2001
From: Marc Weber <marco-oweber@gmx.de>
Date: Sat, 5 Oct 2013 23:07:22 +0200
Subject: [PATCH 4983/5331] firebird service many suggestions contributed by
 bjornfor and edolstra

---
 modules/misc/ids.nix                    |   1 +
 modules/module-list.nix                 |   1 +
 modules/services/databases/firebird.nix | 149 ++++++++++++++++++++++++
 3 files changed, 151 insertions(+)
 create mode 100644 modules/services/databases/firebird.nix

diff --git a/modules/misc/ids.nix b/modules/misc/ids.nix
index 621571e1c33..adaa2b0d9ae 100644
--- a/modules/misc/ids.nix
+++ b/modules/misc/ids.nix
@@ -101,6 +101,7 @@
       elasticsearch = 92;
       tcpcryptd = 93; # tcpcryptd uses a hard-coded uid. We patch it in Nixpkgs to match this choice.
       zope2 = 94;
+      firebird = 95;
 
       # When adding a uid, make sure it doesn't match an existing gid.
 
diff --git a/modules/module-list.nix b/modules/module-list.nix
index c0aab2e1804..76f5e0a4657 100644
--- a/modules/module-list.nix
+++ b/modules/module-list.nix
@@ -77,6 +77,7 @@
   ./services/backup/sitecopy-backup.nix
   ./services/databases/4store-endpoint.nix
   ./services/databases/4store.nix
+  ./services/databases/firebird.nix
   ./services/databases/memcached.nix
   ./services/databases/mongodb.nix
   ./services/databases/redis.nix
diff --git a/modules/services/databases/firebird.nix b/modules/services/databases/firebird.nix
new file mode 100644
index 00000000000..aca0d58900b
--- /dev/null
+++ b/modules/services/databases/firebird.nix
@@ -0,0 +1,149 @@
+{ config, pkgs, ... }:
+
+# TODO: this file needs some additional work - at least you can connect to
+# firebird ..
+# Example how to connect:
+# isql /var/db/firebird/data/your-db.fdb -u sysdba -p <default password>
+
+# There are at least two ways to run firebird. superserver has been choosen
+# however there are no strong reasons to prefer this or the other one AFAIK
+# Eg superserver is said to be most efficiently using resources according to
+# http://www.firebirdsql.org/manual/qsg25-classic-or-super.html
+
+with pkgs.lib;
+
+let
+
+  cfg = config.services.firebird;
+
+  firebird = cfg.package;
+
+  pidFile = "${cfg.pidDir}/firebirdd.pid";
+
+in
+
+{
+
+  ###### interface
+
+  options = {
+
+    services.firebird = {
+
+      enable = mkOption {
+        default = false;
+        description = "
+          Whether to enable the firebird super server.
+        ";
+      };
+
+      package = mkOption {
+        default = pkgs.firebirdSuper;
+        /*
+          Example: <code>package = pkgs.firebirdSuper.override { icu =
+            pkgs.icu; };</code> which is not recommended for compatibility
+            reasons. See comments at the firebirdSuper derivation
+        */
+
+        description = "
+          Which firebird derivation to use.
+        ";
+      };
+
+      port = mkOption {
+        default = "3050";
+        description = "Port of Firebird.";
+      };
+
+      user = mkOption {
+        default = "firebird";
+        description = "User account under which firebird runs.";
+      };
+
+      dataDir = mkOption {
+        default = "/var/db/firebird/data"; # ubuntu is using /var/lib/firebird/2.1/data/.. ?
+        description = "Location where firebird databases are stored.";
+      };
+
+      pidDir = mkOption {
+        default = "/run/firebird";
+        description = "Location of the file which stores the PID of the firebird server.";
+      };
+
+    };
+
+  };
+
+
+  ###### implementation
+
+  config = mkIf config.services.firebird.enable {
+
+    users.extraUsers.firebird.description =  "Firebird server user";
+
+    environment.systemPackages = [firebird];
+
+    systemd.services.firebird =
+      { description = "firebird super server";
+
+        wantedBy = [ "multi-user.target" ];
+
+        # TODO: moving security2.fdb into the data directory works, maybe there
+        # is a better way
+        preStart =
+          ''
+            secureDir="${cfg.dataDir}/../system"
+
+            mkdir -m 0700 -p \
+              "${cfg.dataDir}" \
+              "${cfg.pidDir}" \
+              /var/log/firebird \
+              "$secureDir"
+
+            if ! test -e "$secureDir/security2.fdb"; then
+                cp ${firebird}/security2.fdb "$secureDir"
+            fi
+
+            chown -R ${cfg.user} "${cfg.pidDir}" "${cfg.dataDir}" "$secureDir" /var/log/firebird
+            chmod -R 700 "${cfg.pidDir}" "${cfg.dataDir}" "$secureDir" /var/log/firebird
+          '';
+
+        serviceConfig.PermissionsStartOnly = true; # preStart must be run as root
+        serviceConfig.User = cfg.user;
+        serviceConfig.ExecStart = ''${firebird}/bin/fbserver -d'';
+
+        # TODO think about shutdown
+      };
+
+    environment.etc."firebird/firebird.msg".source = "${firebird}/firebird.msg";
+
+    # think about this again - and eventually make it an option
+    environment.etc."firebird/firebird.conf".text = ''
+      # RootDirectory = Restrict ${cfg.dataDir}
+      DatabaseAccess = Restrict ${cfg.dataDir}
+      ExternalFileAccess = Restrict ${cfg.dataDir}
+      # what is this? is None allowed?
+      UdfAccess = None
+      # "Native" =  traditional interbase/firebird, "mixed" is windows only
+      Authentication = Native
+
+      # defaults to -1 on non Win32
+      #MaxUnflushedWrites = 100
+      #MaxUnflushedWriteTime = 100
+
+      # show trace if trouble occurs (does this require debug build?)
+      # BugcheckAbort = 0
+      # ConnectionTimeout = 180
+
+      #RemoteServiceName = gds_db
+      RemoteServicePort = ${cfg.port}
+
+      # randomly choose port for server Event Notification
+      #RemoteAuxPort = 0
+      # rsetrict connections to a network card:
+      #RemoteBindAddress =
+      # there are some more settings ..
+    '';
+    };
+
+}
-- 
GitLab


From c80556f630214656ea4565e5a0ad45b474b77ed3 Mon Sep 17 00:00:00 2001
From: Aristid Breitkreuz <aristidb@gmail.com>
Date: Sat, 5 Oct 2013 23:07:52 +0200
Subject: [PATCH 4984/5331] rsnapshot 1.3.1

---
 pkgs/tools/backup/rsnapshot/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/backup/rsnapshot/default.nix b/pkgs/tools/backup/rsnapshot/default.nix
index 3a18596aa46..9b147d68230 100644
--- a/pkgs/tools/backup/rsnapshot/default.nix
+++ b/pkgs/tools/backup/rsnapshot/default.nix
@@ -16,10 +16,10 @@ let patch = writeText "rsnapshot-config.patch" ''
 '';
 in
 stdenv.mkDerivation rec {
-  name = "rsnapshot-1.3.0";
+  name = "rsnapshot-1.3.1";
   src = fetchurl {
     url = "mirror://sourceforge/rsnapshot/${name}.tar.gz";
-    sha256 = "19p35ycm73a8vd4ccjpah18h5jagvcr11rqca6ya87sg8k0a5h9z";
+    sha256 = "0pn7vlg3yxl7xrvfwmp4zlrg3cckmlldq6qr5bs3b2b281zcgdll";
   };
 
   propagatedBuildInputs = [perl openssh rsync logger];
-- 
GitLab


From 2a5098384eef11c61e68d7a73ebd509f7c04d98b Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sun, 6 Oct 2013 00:03:14 +0200
Subject: [PATCH 4985/5331] Make eval-release.nix less picky

It now only checks that each derivation's drvPath attribute evaluates.
Previously it checked everything (via toXML) but that causes
derivations with dubious passthru attribute to fail (see commit
70fee5da112b8a0093d59ac16cdead4d0a72f357).
---
 maintainers/scripts/eval-release.nix | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/maintainers/scripts/eval-release.nix b/maintainers/scripts/eval-release.nix
index 4bd2b0f1fa8..eccd77009a1 100644
--- a/maintainers/scripts/eval-release.nix
+++ b/maintainers/scripts/eval-release.nix
@@ -10,14 +10,15 @@ let
 
   # Add the ‘recurseForDerivations’ attribute to ensure that
   # nix-instantiate recurses into nested attribute sets.
-  recurse = attrs:
+  recurse = path: attrs:
     if (builtins.tryEval attrs).success then
-      if isDerivation attrs 
+      if isDerivation attrs
       then
-        if (builtins.tryEval attrs.outPath).success
-        then attrs
-        else { }
-      else { recurseForDerivations = true; } // mapAttrs (n: v: recurse v) attrs
+        if (builtins.tryEval attrs.drvPath).success
+        then { inherit (attrs) name drvPath; }
+        else { failed = true; }
+      else { recurseForDerivations = true; } //
+           mapAttrs (n: v: let path' = path ++ [n]; in trace path' (recurse path' v)) attrs
     else { };
 
-in recurse rel
+in recurse [] rel
-- 
GitLab


From 2ae2b0bca3ef4c8a84ca5f887ff42b2577faa0a7 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sun, 6 Oct 2013 00:20:22 +0200
Subject: [PATCH 4986/5331] Drop --xml, it's no longer needed

---
 pkgs/top-level/make-tarball.nix | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/pkgs/top-level/make-tarball.nix b/pkgs/top-level/make-tarball.nix
index ab15c201d92..cea7e6539b0 100644
--- a/pkgs/top-level/make-tarball.nix
+++ b/pkgs/top-level/make-tarball.nix
@@ -63,8 +63,7 @@ releaseTools.sourceTarball {
     done
 
     header "checking eval-release.nix"
-    nix-instantiate --eval-only --strict --xml --show-trace ./maintainers/scripts/eval-release.nix > $TMPDIR/out.xml
-    xmllint --noout $TMPDIR/out.xml
+    nix-instantiate --eval-only --strict --show-trace ./maintainers/scripts/eval-release.nix > /dev/null
     stopNest
   '';
 
-- 
GitLab


From 9db68de9e616bbc64182847eae79a398ccc3e885 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sun, 6 Oct 2013 00:20:34 +0200
Subject: [PATCH 4987/5331] polkit, pulseaudio: Drop some Linux-specific
 dependencies

---
 pkgs/desktops/gnome-2/platform/libgnome/default.nix | 2 +-
 pkgs/development/libraries/polkit/default.nix       | 2 +-
 pkgs/servers/pulseaudio/default.nix                 | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/desktops/gnome-2/platform/libgnome/default.nix b/pkgs/desktops/gnome-2/platform/libgnome/default.nix
index 5ab6d5e813d..c190b9578e9 100644
--- a/pkgs/desktops/gnome-2/platform/libgnome/default.nix
+++ b/pkgs/desktops/gnome-2/platform/libgnome/default.nix
@@ -3,7 +3,7 @@
 
 stdenv.mkDerivation rec {
   name = src.pkgname;
-  
+
   src = fetchurl_gnome {
     project = "libgnome";
     major = "2"; minor = "32"; patchlevel = "1";
diff --git a/pkgs/development/libraries/polkit/default.nix b/pkgs/development/libraries/polkit/default.nix
index 788b6d6d32b..9d1f0d18c1a 100644
--- a/pkgs/development/libraries/polkit/default.nix
+++ b/pkgs/development/libraries/polkit/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl, pkgconfig, glib, expat, pam, intltool, gettext
 , gobjectIntrospection
-, useSystemd ? true, systemd }:
+, useSystemd ? stdenv.isLinux, systemd }:
 
 let
 
diff --git a/pkgs/servers/pulseaudio/default.nix b/pkgs/servers/pulseaudio/default.nix
index 629dcb5bbce..4b23cb4173c 100644
--- a/pkgs/servers/pulseaudio/default.nix
+++ b/pkgs/servers/pulseaudio/default.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
 
   # Since `libpulse*.la' contain `-lgdbm' and `-lcap', it must be propagated.
   propagatedBuildInputs
-    = [ gdbm ] ++ stdenv.lib.optionals (!stdenv.isDarwin) [ libcap ];
+    = [ gdbm ] ++ stdenv.lib.optionals stdenv.isLinux [ libcap ];
 
   buildInputs =
     [ pkgconfig gnum4 libtool intltool glib dbus avahi libsamplerate libsndfile
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
     ++ stdenv.lib.optional jackaudioSupport jackaudio
     ++ stdenv.lib.optionals x11Support [ xlibs.xlibs xlibs.libXtst xlibs.libXi ]
     ++ stdenv.lib.optional useSystemd systemd
-    ++ stdenv.lib.optionals (!stdenv.isDarwin) [ alsaLib bluez sbc udev ];
+    ++ stdenv.lib.optionals stdenv.isLinux [ alsaLib bluez sbc udev ];
 
   preConfigure = ''
     # Move the udev rules under $(prefix).
-- 
GitLab


From 7808044ba7217f6271172901304422b265ac801e Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sat, 5 Oct 2013 22:52:29 +0200
Subject: [PATCH 4988/5331] Remove the nixos.unstable job from the
 trunk-combined jobset

---
 release-combined.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/release-combined.nix b/release-combined.nix
index e28f774301d..07c0a677722 100644
--- a/release-combined.nix
+++ b/release-combined.nix
@@ -22,12 +22,12 @@ in rec {
     nixpkgs = nixpkgs';
   });
 
-  nixpkgs = removeMaintainers (import <nixpkgs/pkgs/top-level/release.nix> {
+  nixpkgs = builtins.removeAttrs (removeMaintainers (import <nixpkgs/pkgs/top-level/release.nix> {
     inherit officialRelease;
     nixpkgs = nixpkgs';
     # Only do Linux builds.
     supportedSystems = [ "x86_64-linux" "i686-linux" ];
-  });
+  })) [ "unstable" ];
 
   tested = pkgs.releaseTools.aggregate {
     name = "nixos-${nixos.tarball.version}";
-- 
GitLab


From b0d4b8bcaa665894ddf5fa0aab64672cf6a89ef7 Mon Sep 17 00:00:00 2001
From: James Cook <james.cook@utoronto.ca>
Date: Sat, 5 Oct 2013 21:07:42 -0700
Subject: [PATCH 4989/5331] firefox: add an option to build with debugging
 enabled.

---
 pkgs/applications/networking/browsers/firefox/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/networking/browsers/firefox/default.nix b/pkgs/applications/networking/browsers/firefox/default.nix
index 7b0f2a36797..8375bcdad3d 100644
--- a/pkgs/applications/networking/browsers/firefox/default.nix
+++ b/pkgs/applications/networking/browsers/firefox/default.nix
@@ -4,6 +4,7 @@
 , yasm, mesa, sqlite, unzip, makeWrapper, pysqlite
 , hunspell, libevent, libstartup_notification, libvpx
 , cairo, gstreamer, gst_plugins_base
+, debugBuild ? false
 , # If you want the resulting program to call itself "Firefox" instead
   # of "Shiretoko" or whatever, enable this option.  However, those
   # binaries may not be distributed without permission from the
@@ -35,7 +36,7 @@ in rec {
   commonConfigureFlags =
     [ "--enable-optimize"
       #"--enable-profiling"
-      "--disable-debug"
+      (if debugBuild then "--enable-debug" else "--disable-debug")
       "--enable-strip"
       "--with-system-jpeg"
       "--with-system-zlib"
-- 
GitLab


From 56e5b35f2e75925612268a2ee3fe6169abcf8517 Mon Sep 17 00:00:00 2001
From: Evgeny Egorochkin <phreedom@yandex.ru>
Date: Sun, 6 Oct 2013 10:53:05 +0300
Subject: [PATCH 4990/5331] Properly wipe .compose-cache. Fixes #267.

---
 modules/services/x11/display-managers/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/services/x11/display-managers/default.nix b/modules/services/x11/display-managers/default.nix
index b6f6f2ec32e..c7599e245b0 100644
--- a/modules/services/x11/display-managers/default.nix
+++ b/modules/services/x11/display-managers/default.nix
@@ -96,7 +96,7 @@ let
 
       # Speed up application start by 50-150ms according to
       # http://kdemonkey.blogspot.nl/2008/04/magic-trick.html
-      rm -fv $HOME/.compose-cache
+      rm -rf $HOME/.compose-cache
       mkdir $HOME/.compose-cache
 
       ${cfg.displayManager.sessionCommands}
-- 
GitLab


From 083d0890f50c7bff87419b88465af6589faffa2e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Sun, 6 Oct 2013 11:49:53 +0200
Subject: [PATCH 4991/5331] More description fixes

* Remove package name
* Start with upper case letter
* Remove trailing period

Also reword some descriptions and move some long descriptions to
longDescription.

I'm not touching generated packages.
---
 pkgs/applications/audio/quodlibet/default.nix    |  2 +-
 pkgs/applications/audio/snd/default.nix          |  2 +-
 .../editors/emacs-modes/coffee/default.nix       |  2 +-
 .../editors/emacs-modes/color-theme/default.nix  |  2 +-
 .../emacs-modes/flymake-cursor/default.nix       |  2 +-
 .../editors/emacs-modes/htmlize/default.nix      |  2 +-
 .../editors/emacs-modes/jade/default.nix         |  2 +-
 .../editors/emacs-modes/lorem-ipsum/default.nix  |  2 +-
 .../editors/emacs-modes/org2blog/default.nix     |  2 +-
 .../editors/emacs-modes/rect-mark/default.nix    |  2 +-
 .../emacs-modes/sunrise-commander/default.nix    |  2 +-
 .../editors/emacs-modes/xml-rpc/default.nix      |  2 +-
 pkgs/applications/editors/flpsed/default.nix     |  2 +-
 pkgs/applications/editors/geany/default.nix      |  2 +-
 pkgs/applications/editors/mg/default.nix         |  2 +-
 pkgs/applications/editors/sublime/default.nix    |  2 +-
 pkgs/applications/misc/gkrellm/default.nix       |  2 +-
 pkgs/applications/misc/gmrun/default.nix         |  2 +-
 .../misc/gnome_terminator/default.nix            |  2 +-
 pkgs/applications/misc/lyx/default.nix           |  2 +-
 .../misc/mysql-workbench/default.nix             |  2 +-
 pkgs/applications/misc/surf/default.nix          | 14 ++++++++++----
 pkgs/applications/misc/taskjuggler/default.nix   |  2 +-
 pkgs/applications/misc/xfe/default.nix           |  2 +-
 .../networking/browsers/midori/default.nix       |  2 +-
 .../pidgin-plugins/msn-pecan/default.nix         |  2 +-
 .../pidgin-plugins/sipe/default.nix              |  2 +-
 .../instant-messengers/pidgin/default.nix        |  2 +-
 .../networking/sniffers/ettercap/default.nix     |  2 +-
 .../science/electronics/ngspice/default.nix      |  2 +-
 pkgs/applications/science/logic/hol/default.nix  |  4 +---
 .../science/logic/hol_light/default.nix          | 16 ++++++++--------
 .../science/logic/logisim/default.nix            |  2 +-
 .../science/logic/prover9/default.nix            |  4 +---
 .../science/math/wxmaxima/default.nix            |  2 +-
 .../version-management/codeville/0.8.0.nix       |  2 +-
 .../version-management/fossil/default.nix        |  2 +-
 pkgs/applications/video/ogmtools/default.nix     |  9 ++++++---
 pkgs/applications/video/quvi/library.nix         |  2 +-
 pkgs/applications/video/quvi/scripts.nix         |  2 +-
 pkgs/applications/video/quvi/tool.nix            |  2 +-
 .../virtualization/virt-manager/default.nix      |  7 ++++++-
 .../virtualization/virtinst/default.nix          |  2 +-
 .../window-managers/ion-3/default.nix            |  2 +-
 .../window-managers/stumpwm/default.nix          |  2 +-
 .../window-managers/wmii31/default.nix           |  2 +-
 .../fonts/redhat-liberation-fonts/default.nix    |  2 +-
 pkgs/data/fonts/unifont/default.nix              |  2 +-
 pkgs/development/compilers/gwt/2.4.0.nix         |  2 +-
 pkgs/development/compilers/julia/default.nix     |  2 +-
 pkgs/development/compilers/mlton/default.nix     |  2 +-
 pkgs/development/compilers/urweb/default.nix     |  2 +-
 pkgs/development/interpreters/falcon/default.nix |  2 +-
 .../interpreters/hiphopvm/default.nix            |  2 +-
 pkgs/development/interpreters/lua-4/default.nix  |  2 +-
 pkgs/development/interpreters/lua-5/5.0.3.nix    |  2 +-
 pkgs/development/interpreters/lua-5/5.1.nix      |  2 +-
 pkgs/development/interpreters/lua-5/5.2.nix      |  2 +-
 pkgs/development/interpreters/racket/default.nix |  2 +-
 pkgs/development/libraries/clucene-core/2.x.nix  | 12 +++++++++++-
 .../libraries/clucene-core/default.nix           | 12 +++++++++++-
 pkgs/development/libraries/coin3d/default.nix    |  3 +--
 pkgs/development/libraries/eventlog/default.nix  | 10 +++++++++-
 pkgs/development/libraries/gssdp/default.nix     |  2 +-
 .../libraries/haskell/RSA/default.nix            |  2 +-
 .../libraries/haskell/arithmoi/default.nix       |  2 +-
 .../libraries/haskell/datetime/default.nix       |  2 +-
 .../libraries/haskell/dotgen/default.nix         |  2 +-
 .../libraries/haskell/feed/default.nix           |  2 +-
 .../libraries/haskell/hoauth/default.nix         |  2 +-
 .../libraries/haskell/hsyslog/default.nix        |  2 +-
 .../libraries/haskell/skein/default.nix          |  2 +-
 .../libraries/haskell/tar/default.nix            |  2 +-
 .../haskell/transformers-compat/default.nix      |  2 +-
 pkgs/development/libraries/hunspell/default.nix  |  8 +++++++-
 pkgs/development/libraries/jansson/default.nix   |  2 +-
 pkgs/development/libraries/leveldb/default.nix   |  2 +-
 pkgs/development/libraries/libid3tag/default.nix |  2 +-
 .../libraries/liblockfile/default.nix            |  2 +-
 pkgs/development/libraries/libmcrypt/default.nix |  2 +-
 .../libraries/libmemcached/default.nix           |  2 +-
 pkgs/development/libraries/libnet/default.nix    |  2 +-
 .../libraries/libnetfilter_conntrack/default.nix |  2 +-
 .../libraries/libnfnetlink/default.nix           |  2 +-
 pkgs/development/libraries/liboop/default.nix    |  2 +-
 pkgs/development/libraries/librdf/default.nix    |  2 +-
 pkgs/development/libraries/oniguruma/default.nix |  2 +-
 pkgs/development/libraries/qhull/default.nix     |  2 +-
 pkgs/development/libraries/sfml/default.nix      |  7 ++++++-
 .../libraries/spice-protocol/default.nix         |  2 +-
 pkgs/development/libraries/tinyxml/2.6.2.nix     |  2 +-
 pkgs/development/libraries/vcdimager/default.nix |  2 +-
 .../ocaml-modules/ocamlgraph/default.nix         |  2 +-
 .../ocaml-modules/sexplib/default.nix            |  2 +-
 .../development/perl-modules/maatkit/default.nix | 10 +++++++++-
 .../python-modules/pyside/default.nix            |  2 +-
 pkgs/development/python-modules/pyside/tools.nix |  2 +-
 pkgs/development/qtcreator/default.nix           | 10 +++++-----
 .../tools/analysis/cppcheck/default.nix          |  2 +-
 .../tools/analysis/jdepend/default.nix           |  2 +-
 pkgs/development/tools/analysis/pmd/default.nix  |  2 +-
 .../tools/build-managers/colormake/default.nix   |  2 +-
 pkgs/development/tools/misc/sysbench/default.nix |  2 +-
 pkgs/development/tools/parsing/re2c/default.nix  |  2 +-
 pkgs/games/extremetuxracer/default.nix           |  5 ++++-
 pkgs/games/freeciv/default.nix                   |  2 +-
 pkgs/games/gtypist/default.nix                   |  2 +-
 pkgs/games/minetest/default.nix                  |  2 +-
 pkgs/games/spring/springlobby.nix                |  2 +-
 pkgs/games/super-tux/default.nix                 |  2 +-
 pkgs/games/unvanquished/default.nix              |  2 +-
 pkgs/games/warsow/default.nix                    |  2 +-
 pkgs/misc/emulators/hatari/default.nix           |  2 +-
 pkgs/misc/screensavers/xlockmore/default.nix     |  2 +-
 pkgs/os-specific/linux/dstat/default.nix         |  2 +-
 pkgs/os-specific/linux/pam_ccreds/default.nix    |  2 +-
 pkgs/os-specific/linux/pam_krb5/default.nix      |  6 +++++-
 pkgs/os-specific/linux/x86info/default.nix       |  2 +-
 pkgs/servers/computing/storm/default.nix         |  2 +-
 .../http/apache-modules/mod_evasive/default.nix  |  3 +--
 pkgs/servers/icecast/default.nix                 |  2 +-
 pkgs/servers/mail/dovecot-pigeonhole/default.nix |  2 +-
 pkgs/servers/sabnzbd/default.nix                 |  2 +-
 pkgs/servers/varnish/default.nix                 |  2 +-
 pkgs/tools/X11/keynav/default.nix                |  2 +-
 pkgs/tools/X11/x2x/default.nix                   |  2 +-
 pkgs/tools/backup/httrack/default.nix            |  2 +-
 pkgs/tools/backup/obnam/default.nix              |  2 +-
 pkgs/tools/graphics/dmtx/default.nix             |  2 +-
 pkgs/tools/misc/detox/default.nix                |  2 +-
 pkgs/tools/misc/disper/default.nix               |  2 +-
 pkgs/tools/misc/fdupes/default.nix               |  2 +-
 pkgs/tools/misc/gnuvd/default.nix                |  2 +-
 pkgs/tools/misc/grc/default.nix                  |  2 +-
 pkgs/tools/misc/gsmartcontrol/default.nix        | 11 ++++++++++-
 pkgs/tools/misc/hdf5/default.nix                 |  4 ++--
 pkgs/tools/misc/mcrypt/default.nix               |  7 ++++++-
 pkgs/tools/misc/ncdu/default.nix                 |  2 +-
 pkgs/tools/misc/ponysay/default.nix              |  2 +-
 pkgs/tools/misc/ttmkfdir/default.nix             |  2 +-
 pkgs/tools/misc/unclutter/default.nix            |  2 +-
 pkgs/tools/misc/units/default.nix                |  2 +-
 pkgs/tools/misc/venus/default.nix                |  7 ++++++-
 pkgs/tools/networking/connect/default.nix        |  2 +-
 pkgs/tools/networking/fping/default.nix          |  2 +-
 pkgs/tools/networking/gmvault/default.nix        |  2 +-
 pkgs/tools/networking/haproxy/default.nix        | 10 +++++++++-
 pkgs/tools/networking/mosh/default.nix           | 10 +++++++++-
 pkgs/tools/networking/netrw/default.nix          |  2 +-
 pkgs/tools/networking/nylon/default.nix          |  2 +-
 pkgs/tools/networking/offlineimap/default.nix    |  2 +-
 pkgs/tools/networking/pdsh/default.nix           |  2 +-
 pkgs/tools/networking/proxychains/default.nix    |  2 +-
 pkgs/tools/networking/trickle/default.nix        |  2 +-
 pkgs/tools/networking/unbound/default.nix        |  2 +-
 pkgs/tools/security/pwgen/default.nix            |  4 ++--
 pkgs/tools/security/torbutton/default.nix        |  7 ++++++-
 pkgs/tools/system/logcheck/default.nix           |  2 +-
 pkgs/tools/system/lshw/default.nix               |  2 +-
 pkgs/tools/system/rsyslog/default.nix            |  3 +--
 pkgs/tools/system/syslog-ng/default.nix          |  3 +--
 pkgs/tools/system/vboot_reference/default.nix    |  2 +-
 162 files changed, 288 insertions(+), 188 deletions(-)

diff --git a/pkgs/applications/audio/quodlibet/default.nix b/pkgs/applications/audio/quodlibet/default.nix
index d9554d5f724..9f4859d6e07 100644
--- a/pkgs/applications/audio/quodlibet/default.nix
+++ b/pkgs/applications/audio/quodlibet/default.nix
@@ -46,7 +46,7 @@ buildPythonPackage {
   '';
 
   meta = {
-    description = "Quod Libet is a GTK+-based audio player written in Python, using the Mutagen tagging library.";
+    description = "GTK+-based audio player written in Python, using the Mutagen tagging library";
 
     longDescription = ''
       Quod Libet is a GTK+-based audio player written in Python, using
diff --git a/pkgs/applications/audio/snd/default.nix b/pkgs/applications/audio/snd/default.nix
index fe32aca029b..a49bfd9cccf 100644
--- a/pkgs/applications/audio/snd/default.nix
+++ b/pkgs/applications/audio/snd/default.nix
@@ -51,7 +51,7 @@ rec {
 
   name = "snd-" + version;
   meta = {
-    description = "Snd sound editor.";
+    description = "Sound editor";
     homepage = http://ccrma.stanford.edu/software/snd;
     inherit src;
   };
diff --git a/pkgs/applications/editors/emacs-modes/coffee/default.nix b/pkgs/applications/editors/emacs-modes/coffee/default.nix
index c40b3d4cd65..a0ba6143165 100644
--- a/pkgs/applications/editors/emacs-modes/coffee/default.nix
+++ b/pkgs/applications/editors/emacs-modes/coffee/default.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = {
-    description = "An Emacs major mode for CoffeeScript, unfancy JavaScript.";
+    description = "Emacs major mode for CoffeeScript, unfancy JavaScript";
     homepage = https://github.com/defunkt/coffee-mode;
     license = "GPLv2+";
 
diff --git a/pkgs/applications/editors/emacs-modes/color-theme/default.nix b/pkgs/applications/editors/emacs-modes/color-theme/default.nix
index 327e11bf086..bad277d61ce 100644
--- a/pkgs/applications/editors/emacs-modes/color-theme/default.nix
+++ b/pkgs/applications/editors/emacs-modes/color-theme/default.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   installTargets = "install-bin";
 
   meta = {
-    description = "An emacs-lisp mode for skinning your emacs.";
+    description = "Emacs-lisp mode for skinning your Emacs";
     homepage = http://www.nongnu.org/color-theme;
     license = "GPLv2+";
 
diff --git a/pkgs/applications/editors/emacs-modes/flymake-cursor/default.nix b/pkgs/applications/editors/emacs-modes/flymake-cursor/default.nix
index 0a26e8fd43d..4b2692a5e22 100644
--- a/pkgs/applications/editors/emacs-modes/flymake-cursor/default.nix
+++ b/pkgs/applications/editors/emacs-modes/flymake-cursor/default.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = {
-    description = "Displays flymake error msg in minibuffer after delay.";
+    description = "Displays flymake error msg in minibuffer after delay";
     homepage = http://www.emacswiki.org/emacs/flymake-cursor.el;
     license = stdenv.lib.licenses.publicDomain;
 
diff --git a/pkgs/applications/editors/emacs-modes/htmlize/default.nix b/pkgs/applications/editors/emacs-modes/htmlize/default.nix
index d4c428e5a1e..96cc4e040c4 100644
--- a/pkgs/applications/editors/emacs-modes/htmlize/default.nix
+++ b/pkgs/applications/editors/emacs-modes/htmlize/default.nix
@@ -11,6 +11,6 @@ stdenv.mkDerivation {
   };
 
   meta = {
-    description = "Convert buffer text and decorations to HTML.";
+    description = "Convert buffer text and decorations to HTML";
   };
 }
diff --git a/pkgs/applications/editors/emacs-modes/jade/default.nix b/pkgs/applications/editors/emacs-modes/jade/default.nix
index 0c99ceaca22..ab0e3512ef2 100644
--- a/pkgs/applications/editors/emacs-modes/jade/default.nix
+++ b/pkgs/applications/editors/emacs-modes/jade/default.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation {
   '';
 
   meta = {
-    description = "Emacs major mode for jade and stylus.";
+    description = "Emacs major mode for jade and stylus";
     homepage = https://github.com/brianc/jade-mode;
     license = "GPLv2+";
 
diff --git a/pkgs/applications/editors/emacs-modes/lorem-ipsum/default.nix b/pkgs/applications/editors/emacs-modes/lorem-ipsum/default.nix
index 94427537003..72086e54fec 100644
--- a/pkgs/applications/editors/emacs-modes/lorem-ipsum/default.nix
+++ b/pkgs/applications/editors/emacs-modes/lorem-ipsum/default.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = {
-    description = "Insert dummy pseudo Latin text for emacs.";
+    description = "Insert dummy pseudo Latin text for Emacs";
     homepage = http://www.emacswiki.org/emacs/LoremIpsum;
     license = "GPLv2+";
 
diff --git a/pkgs/applications/editors/emacs-modes/org2blog/default.nix b/pkgs/applications/editors/emacs-modes/org2blog/default.nix
index c8c538c5cb7..e72560be8f4 100644
--- a/pkgs/applications/editors/emacs-modes/org2blog/default.nix
+++ b/pkgs/applications/editors/emacs-modes/org2blog/default.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = {
-    description = "A tool to publish directly from Emacs’ org-mode to WordPress blogs.";
+    description = "Publish directly from Emacs’ org-mode to WordPress blogs";
     homepage = https://github.com/punchagan/org2blog;
     license = "GPLv3+";
 
diff --git a/pkgs/applications/editors/emacs-modes/rect-mark/default.nix b/pkgs/applications/editors/emacs-modes/rect-mark/default.nix
index ac01e02b433..896dbdac71b 100644
--- a/pkgs/applications/editors/emacs-modes/rect-mark/default.nix
+++ b/pkgs/applications/editors/emacs-modes/rect-mark/default.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = {
-    description = "Mark a rectangle of text with highlighting.";
+    description = "Mark a rectangle of text with highlighting";
     homepage = http://emacswiki.org/emacs/RectangleMark;
     license = "GPLv2+";
 
diff --git a/pkgs/applications/editors/emacs-modes/sunrise-commander/default.nix b/pkgs/applications/editors/emacs-modes/sunrise-commander/default.nix
index a253e25cad4..e942189714e 100644
--- a/pkgs/applications/editors/emacs-modes/sunrise-commander/default.nix
+++ b/pkgs/applications/editors/emacs-modes/sunrise-commander/default.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = {
-    description = "Two-pane file manager for Emacs based on Dired and inspired by MC.";
+    description = "Two-pane file manager for Emacs based on Dired and inspired by MC";
     homepage = http://www.emacswiki.org/emacs/Sunrise_Commander;
     license = "GPLv3+";
 
diff --git a/pkgs/applications/editors/emacs-modes/xml-rpc/default.nix b/pkgs/applications/editors/emacs-modes/xml-rpc/default.nix
index 87a732b5b4c..cee0f0ca553 100644
--- a/pkgs/applications/editors/emacs-modes/xml-rpc/default.nix
+++ b/pkgs/applications/editors/emacs-modes/xml-rpc/default.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = {
-    description = "An elisp implementation of clientside XML-RPC.";
+    description = "Elisp implementation of clientside XML-RPC";
     homepage = https://launchpad.net/xml-rpc-el;
     license = "GPLv3+";
 
diff --git a/pkgs/applications/editors/flpsed/default.nix b/pkgs/applications/editors/flpsed/default.nix
index ca481f1081d..1bae58cfaae 100644
--- a/pkgs/applications/editors/flpsed/default.nix
+++ b/pkgs/applications/editors/flpsed/default.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation {
   buildInputs = [ fltk13 ghostscript ];
 
   meta = {
-    description = "A WYSIWYG PostScript annotator.";
+    description = "WYSIWYG PostScript annotator";
     homepage = "http://http://flpsed.org/flpsed.html";
     license = "GPLv3";
     platforms = stdenv.lib.platforms.all;
diff --git a/pkgs/applications/editors/geany/default.nix b/pkgs/applications/editors/geany/default.nix
index 6d43cc27997..e7c8e276d27 100644
--- a/pkgs/applications/editors/geany/default.nix
+++ b/pkgs/applications/editors/geany/default.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
   postInstall = "rm $out/share/icons/hicolor/icon-theme.cache";
 
   meta = {
-    description = "A GTK2 small and ligthweight IDE.";
+    description = "Small and lightweight IDE";
     longDescription = ''
       Geany is a small and lightweight Integrated Development Environment.
       It was developed to provide a small and fast IDE, which has only a few dependencies from other packages.
diff --git a/pkgs/applications/editors/mg/default.nix b/pkgs/applications/editors/mg/default.nix
index ce69b5c0b5a..058a54c45a7 100644
--- a/pkgs/applications/editors/mg/default.nix
+++ b/pkgs/applications/editors/mg/default.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     homepage = http://homepage.boetes.org/software/mg/;
-    description = "mg is Micro GNU/emacs, this is a portable version of the mg maintained by the OpenBSD team.";
+    description = "mg is Micro GNU/emacs, this is a portable version of the mg maintained by the OpenBSD team";
     license = "public domain";
     platforms = stdenv.lib.platforms.all;
   };
diff --git a/pkgs/applications/editors/sublime/default.nix b/pkgs/applications/editors/sublime/default.nix
index 6aa0b34314a..cfa44d9285c 100644
--- a/pkgs/applications/editors/sublime/default.nix
+++ b/pkgs/applications/editors/sublime/default.nix
@@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = {
-    description = "Sublime Text is a sophisticated text editor for code, markup and prose.";
+    description = "Sophisticated text editor for code, markup and prose";
     license = "unfree";
   };
 }
diff --git a/pkgs/applications/misc/gkrellm/default.nix b/pkgs/applications/misc/gkrellm/default.nix
index f1c26b27262..af10ca9800d 100644
--- a/pkgs/applications/misc/gkrellm/default.nix
+++ b/pkgs/applications/misc/gkrellm/default.nix
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
      make install PREFIX="$out" '';
 
   meta = {
-    description = "GKrellM, a themeable process stack of system monitors.";
+    description = "Themeable process stack of system monitors";
     longDescription =
       '' GKrellM is a single process stack of system monitors which supports
          applying themes to match its appearance to your window manager, Gtk,
diff --git a/pkgs/applications/misc/gmrun/default.nix b/pkgs/applications/misc/gmrun/default.nix
index 0b19eef3c8c..dbff65d3651 100644
--- a/pkgs/applications/misc/gmrun/default.nix
+++ b/pkgs/applications/misc/gmrun/default.nix
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
     ];
 
   meta = {
-    description = "Gnome Completion-Run Utility.";
+    description = "Gnome Completion-Run Utility";
     longDescription = ''
       A simple program which provides a "run program" window, featuring a bash-like TAB completion.
       It uses GTK+ interface.
diff --git a/pkgs/applications/misc/gnome_terminator/default.nix b/pkgs/applications/misc/gnome_terminator/default.nix
index cbd0819e240..b394719611d 100644
--- a/pkgs/applications/misc/gnome_terminator/default.nix
+++ b/pkgs/applications/misc/gnome_terminator/default.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = {
-    description = "Gnome terminal emulator with support for tiling and tabs.";
+    description = "Gnome terminal emulator with support for tiling and tabs";
     homepage = http://www.tenshu.net/p/terminator.html;
     license = "GPLv2";
   };
diff --git a/pkgs/applications/misc/lyx/default.nix b/pkgs/applications/misc/lyx/default.nix
index 31c00626847..fd2e7c3ac42 100644
--- a/pkgs/applications/misc/lyx/default.nix
+++ b/pkgs/applications/misc/lyx/default.nix
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
   doCheck = true;
 
   meta = {
-    description = "WYSIWYM frontend for LaTeX, DocBook, etc.";
+    description = "WYSIWYM frontend for LaTeX, DocBook";
     homepage = "http://www.lyx.org";
     license = "GPL2";
     maintainers = [ stdenv.lib.maintainers.vcunat ];
diff --git a/pkgs/applications/misc/mysql-workbench/default.nix b/pkgs/applications/misc/mysql-workbench/default.nix
index c2f80570673..91fd1da1014 100644
--- a/pkgs/applications/misc/mysql-workbench/default.nix
+++ b/pkgs/applications/misc/mysql-workbench/default.nix
@@ -66,7 +66,7 @@ exec 19> $FIFOCTL
   '';
 
   meta = with stdenv.lib; {
-    description = "A MySQL visual database modeling, administration and querying tool.";
+    description = "Visual MySQL database modeling, administration and querying tool";
     longDescription = ''
       MySQL Workbench is a modeling tool that allows you to design
       and generate MySQL databases graphically. It also has administration
diff --git a/pkgs/applications/misc/surf/default.nix b/pkgs/applications/misc/surf/default.nix
index d6083da5ce4..42792ba8f91 100644
--- a/pkgs/applications/misc/surf/default.nix
+++ b/pkgs/applications/misc/surf/default.nix
@@ -27,9 +27,15 @@ stdenv.mkDerivation rec {
   '';
 
   meta = {
-      description = "surf is a simple web browser based on WebKit/GTK+. It is able to display websites and follow links. It supports the XEmbed protocol which makes it possible to embed it in another application. Furthermore, one can point surf to another URI by setting its XProperties.";
-      homepage = http://surf.suckless.org;
-      license = "MIT";
-      platforms = stdenv.lib.platforms.linux;
+    description = "Simple web browser";
+    longDescription = ''
+      Surf is a simple web browser based on WebKit/GTK+. It is able to display
+      websites and follow links. It supports the XEmbed protocol which makes it
+      possible to embed it in another application. Furthermore, one can point
+      surf to another URI by setting its XProperties.
+      '';
+    homepage = http://surf.suckless.org;
+    license = "MIT";
+    platforms = stdenv.lib.platforms.linux;
   };
 }
diff --git a/pkgs/applications/misc/taskjuggler/default.nix b/pkgs/applications/misc/taskjuggler/default.nix
index b8edd93455d..77acc511fe4 100644
--- a/pkgs/applications/misc/taskjuggler/default.nix
+++ b/pkgs/applications/misc/taskjuggler/default.nix
@@ -63,7 +63,7 @@ stdenv.mkDerivation rec {
   meta = {
     homepage = "http://www.taskjuggler.org";
     license = "GPLv2";
-    description = "Project management tool.";
+    description = "Project management tool";
     longDescription = ''
       TaskJuggler is a modern and powerful, Open Source project management
       tool. Its new approach to project planing and tracking is more
diff --git a/pkgs/applications/misc/xfe/default.nix b/pkgs/applications/misc/xfe/default.nix
index bd00d91e23d..ce10b879199 100644
--- a/pkgs/applications/misc/xfe/default.nix
+++ b/pkgs/applications/misc/xfe/default.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   enableParallelBuilding = true;
 
   meta = {
-    description = "X File Explorer (Xfe) is an MS-Explorer like file manager for X.";
+    description = "X File Explorer (Xfe) is an MS-Explorer like file manager for X";
     longDescription = ''
       X File Explorer (Xfe) is an MS-Explorer like file manager for X.
       It is based on the popular, but discontinued, X Win Commander, which was developed by Maxim Baranov.
diff --git a/pkgs/applications/networking/browsers/midori/default.nix b/pkgs/applications/networking/browsers/midori/default.nix
index 4d561737d27..e39e377147a 100644
--- a/pkgs/applications/networking/browsers/midori/default.nix
+++ b/pkgs/applications/networking/browsers/midori/default.nix
@@ -43,7 +43,7 @@ rec {
 
   name = "midori-${version}.${release}";
   meta = {
-    description = "Light WebKit-based web browser with GTK GUI.";
+    description = "Light WebKit-based web browser with GTK GUI";
     maintainers = [args.lib.maintainers.raskin];
     platforms = with args.lib.platforms;
       linux;
diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/msn-pecan/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/msn-pecan/default.nix
index cdbf63dbd9f..2e1b745790a 100644
--- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/msn-pecan/default.nix
+++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/msn-pecan/default.nix
@@ -8,7 +8,7 @@ stdenv.mkDerivation {
   };
 
   meta = {
-    description = "Alternative MSN protocol plug-in for Pidgin IM.";
+    description = "Alternative MSN protocol plug-in for Pidgin IM";
     homepage = http://code.google.com/p/msn-pecan/;
   };
 
diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/sipe/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/sipe/default.nix
index e8afdb37cbc..9c787867e5a 100644
--- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/sipe/default.nix
+++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/sipe/default.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation {
   };
 
   meta = {
-    description = "SIPE plugin for Pidgin IM.";
+    description = "SIPE plugin for Pidgin IM";
     homepage = http://sipe.sourceforge.net/;
     license = "GPLv2";
   };
diff --git a/pkgs/applications/networking/instant-messengers/pidgin/default.nix b/pkgs/applications/networking/instant-messengers/pidgin/default.nix
index 00fba657d8a..d0652adcb0d 100644
--- a/pkgs/applications/networking/instant-messengers/pidgin/default.nix
+++ b/pkgs/applications/networking/instant-messengers/pidgin/default.nix
@@ -52,7 +52,7 @@ stdenv.mkDerivation rec {
   + (lib.optionalString (gnutls != null) " --enable-gnutls=yes --enable-nss=no")
   ;
   meta = {
-    description = "Pidgin IM - XMPP(Jabber), AIM/ICQ, IRC, SIP etc client.";
+    description = "Pidgin IM - XMPP(Jabber), AIM/ICQ, IRC, SIP etc client";
     homepage = http://pidgin.im;
   };
 }
diff --git a/pkgs/applications/networking/sniffers/ettercap/default.nix b/pkgs/applications/networking/sniffers/ettercap/default.nix
index d468c69fbeb..3994563cf3e 100644
--- a/pkgs/applications/networking/sniffers/ettercap/default.nix
+++ b/pkgs/applications/networking/sniffers/ettercap/default.nix
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
   ];
 
   meta = {
-    description = "Ettercap is a comprehensive suite for man in the middle attacks.";
+    description = "Comprehensive suite for man in the middle attacks";
     homepage = http://ettercap.github.io/ettercap/;
     license = stdenv.lib.licenses.gpl2;
     platforms = stdenv.lib.platforms.unix;
diff --git a/pkgs/applications/science/electronics/ngspice/default.nix b/pkgs/applications/science/electronics/ngspice/default.nix
index 70153eee61b..579492248ea 100644
--- a/pkgs/applications/science/electronics/ngspice/default.nix
+++ b/pkgs/applications/science/electronics/ngspice/default.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation {
   configureFlags = [ "--enable-x" "--with-x" "--with-readline" ];
 
   meta = {
-    description = "The Next Generation Spice (Electronic Circuit Simulator).";
+    description = "The Next Generation Spice (Electronic Circuit Simulator)";
     homepage = "http://ngspice.sourceforge.net";
     license = ["BSD" "GPLv2"];
     maintainers = with stdenv.lib.maintainers; [viric];
diff --git a/pkgs/applications/science/logic/hol/default.nix b/pkgs/applications/science/logic/hol/default.nix
index 18a16114c50..4223c52b7d4 100644
--- a/pkgs/applications/science/logic/hol/default.nix
+++ b/pkgs/applications/science/logic/hol/default.nix
@@ -39,9 +39,8 @@ stdenv.mkDerivation {
   '';
 
   meta = {
-    description = "HOL4, an interactive theorem prover based on Higher-Order Logic.";
+    description = "Interactive theorem prover based on Higher-Order Logic";
     longDescription = ''
-
       HOL4 is the latest version of the HOL interactive proof
       assistant for higher order logic: a programming environment in
       which theorems can be proved and proof tools
@@ -52,7 +51,6 @@ stdenv.mkDerivation {
       engines. HOL4 is particularly suitable as a platform for
       implementing combinations of deduction, execution and property
       checking.
-
     '';
     homepage = "http://hol.sourceforge.net/";
     license = "BSD";
diff --git a/pkgs/applications/science/logic/hol_light/default.nix b/pkgs/applications/science/logic/hol_light/default.nix
index f9549241a45..d6c1c0c1878 100644
--- a/pkgs/applications/science/logic/hol_light/default.nix
+++ b/pkgs/applications/science/logic/hol_light/default.nix
@@ -26,15 +26,15 @@ stdenv.mkDerivation {
   '';
 
   meta = {
-    description = "An interactive theorem prover based on Higher-Order Logic.";
+    description = "Interactive theorem prover based on Higher-Order Logic";
     longDescription = ''
-HOL Light is a computer program to help users prove interesting mathematical
-theorems completely formally in Higher-Order Logic.  It sets a very exacting
-standard of correctness, but provides a number of automated tools and
-pre-proved mathematical theorems (e.g., about arithmetic, basic set theory and
-real analysis) to save the user work.  It is also fully programmable, so users
-can extend it with new theorems and inference rules without compromising its
-soundness.
+      HOL Light is a computer program to help users prove interesting
+      mathematical theorems completely formally in Higher-Order Logic.  It sets
+      a very exacting standard of correctness, but provides a number of
+      automated tools and pre-proved mathematical theorems (e.g., about
+      arithmetic, basic set theory and real analysis) to save the user work.
+      It is also fully programmable, so users can extend it with new theorems
+      and inference rules without compromising its soundness.
     '';
     homepage = http://www.cl.cam.ac.uk/~jrh13/hol-light/;
     license = stdenv.lib.licenses.bsd2;
diff --git a/pkgs/applications/science/logic/logisim/default.nix b/pkgs/applications/science/logic/logisim/default.nix
index 009bed3ffe2..ab46efa9a96 100644
--- a/pkgs/applications/science/logic/logisim/default.nix
+++ b/pkgs/applications/science/logic/logisim/default.nix
@@ -26,7 +26,7 @@ stdenv.mkDerivation {
   
   meta = {
     homepage = "http://ozark.hendrix.edu/~burch/logisim";
-    description = "Logisim is an educational tool for designing and simulating digital logic circuits.";
+    description = "Educational tool for designing and simulating digital logic circuits";
     license = "GPLv2+";
   };
 }
diff --git a/pkgs/applications/science/logic/prover9/default.nix b/pkgs/applications/science/logic/prover9/default.nix
index 93b1657aa14..d92c7887210 100644
--- a/pkgs/applications/science/logic/prover9/default.nix
+++ b/pkgs/applications/science/logic/prover9/default.nix
@@ -31,14 +31,12 @@ stdenv.mkDerivation {
   meta = {
     homepage = "http://www.cs.unm.edu/~mccune/mace4/";
     license = "GPL";
-    description = "Prover9 is an automated theorem prover for first-order and equational logic.";
-
+    description = "Automated theorem prover for first-order and equational logic";
     longDescription = ''
       Prover9 is a resolution/paramodulation automated theorem prover
       for first-order and equational logic. Prover9 is a successor of
       the Otter Prover. This is the LADR command-line version.
     '';
-
     platforms = stdenv.lib.platforms.unix;
     maintainers = [];
   };
diff --git a/pkgs/applications/science/math/wxmaxima/default.nix b/pkgs/applications/science/math/wxmaxima/default.nix
index e9e6ca7bead..47baf446d0a 100644
--- a/pkgs/applications/science/math/wxmaxima/default.nix
+++ b/pkgs/applications/science/math/wxmaxima/default.nix
@@ -26,7 +26,7 @@ stdenv.mkDerivation {
   enableParallelBuilding = true;
 
   meta = {
-    description = "Cross platform GUI for the computer algebra system Maxima.";
+    description = "Cross platform GUI for the computer algebra system Maxima";
     license = "GPL2";
     homepage = http://wxmaxima.sourceforge.net;
     platforms = stdenv.lib.platforms.linux;
diff --git a/pkgs/applications/version-management/codeville/0.8.0.nix b/pkgs/applications/version-management/codeville/0.8.0.nix
index d72f753a26e..5c1910d6c6f 100644
--- a/pkgs/applications/version-management/codeville/0.8.0.nix
+++ b/pkgs/applications/version-management/codeville/0.8.0.nix
@@ -18,6 +18,6 @@ rec {
       
   name = "codeville-0.8.0";
   meta = {
-    description = "Codeville - RCS with powerful merge.";
+    description = "RCS with powerful merge";
   };
 }
diff --git a/pkgs/applications/version-management/fossil/default.nix b/pkgs/applications/version-management/fossil/default.nix
index 368557e3c2c..a1959eedba2 100644
--- a/pkgs/applications/version-management/fossil/default.nix
+++ b/pkgs/applications/version-management/fossil/default.nix
@@ -30,7 +30,7 @@ stdenv.mkDerivation {
   };
 
   meta = {
-    description = "Simple, high-reliability, distributed software configuration management.";
+    description = "Simple, high-reliability, distributed software configuration management";
     longDescription = ''
       Fossil is a software configuration management system.  Fossil is
       software that is designed to control and track the development of a
diff --git a/pkgs/applications/video/ogmtools/default.nix b/pkgs/applications/video/ogmtools/default.nix
index 1a6bc662999..11a16e3a79d 100644
--- a/pkgs/applications/video/ogmtools/default.nix
+++ b/pkgs/applications/video/ogmtools/default.nix
@@ -11,11 +11,14 @@ stdenv.mkDerivation rec {
   buildInputs = [libogg libvorbis libdvdread];
 
   meta = {
-    description = "Tools for modifying and inspecting OGG media streams. Includes dvdxchap tool for extracting chapter information from DVD.";
-    longDescription = "These tools allow information about (ogminfo) or extraction from (ogmdemux) or creation of (ogmmerge) OGG media streams.";
+    description = "Tools for modifying and inspecting OGG media streams";
+    longDescription = ''
+      These tools allow information about (ogminfo) or extraction from
+      (ogmdemux) or creation of (ogmmerge) OGG media streams. Includes dvdxchap
+      tool for extracting chapter information from DVD.
+    '';
     homepage = http://www.bunkus.org/videotools/ogmtools/;
     license = "GPLv2";
-
     platforms = stdenv.lib.platforms.all;
   };
 }
diff --git a/pkgs/applications/video/quvi/library.nix b/pkgs/applications/video/quvi/library.nix
index bef755afed4..49207ad0661 100644
--- a/pkgs/applications/video/quvi/library.nix
+++ b/pkgs/applications/video/quvi/library.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   buildInputs = [ pkgconfig lua5 curl quvi_scripts ];
 
   meta = { 
-    description = "Quvi is a web video downloader.";
+    description = "Web video downloader";
     homepage = http://quvi.sf.net;
     license = "LGPLv2.1+";
     platforms = stdenv.lib.platforms.linux;
diff --git a/pkgs/applications/video/quvi/scripts.nix b/pkgs/applications/video/quvi/scripts.nix
index 9c6cd9d3137..cc82158ae82 100644
--- a/pkgs/applications/video/quvi/scripts.nix
+++ b/pkgs/applications/video/quvi/scripts.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   buildInputs = [ pkgconfig ];
 
   meta = { 
-    description = "Quvi is a web video downloader.";
+    description = "Web video downloader";
     homepage = http://quvi.sf.net;
     license = "LGPLv2.1+";
     platforms = stdenv.lib.platforms.linux;
diff --git a/pkgs/applications/video/quvi/tool.nix b/pkgs/applications/video/quvi/tool.nix
index b2ddabfa6a8..f8b6aad4310 100644
--- a/pkgs/applications/video/quvi/tool.nix
+++ b/pkgs/applications/video/quvi/tool.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   buildInputs = [ pkgconfig lua5 curl quvi_scripts libquvi ];
 
   meta = { 
-    description = "Quvi is a web video downloader.";
+    description = "Web video downloader";
     homepage = http://quvi.sf.net;
     license = "LGPLv2.1+";
     platforms = stdenv.lib.platforms.linux;
diff --git a/pkgs/applications/virtualization/virt-manager/default.nix b/pkgs/applications/virtualization/virt-manager/default.nix
index 195ee5d45c0..d1e2a8b7883 100644
--- a/pkgs/applications/virtualization/virt-manager/default.nix
+++ b/pkgs/applications/virtualization/virt-manager/default.nix
@@ -78,7 +78,12 @@ stdenv.mkDerivation rec {
 
   meta = {
     homepage = http://virt-manager.org;
-    description = "The 'Virtual Machine Manager' application (virt-manager for short package name) is a desktop user interface for managing virtual machines.";
+    description = "Desktop user interface for managing virtual machines";
+    longDescription = ''
+      The virt-manager application is a desktop user interface for managing
+      virtual machines through libvirt. It primarily targets KVM VMs, but also
+      manages Xen and LXC (linux containers).
+    '';
     license = "GPLv2";
     maintainers = with stdenv.lib.maintainers; [qknight];
   };
diff --git a/pkgs/applications/virtualization/virtinst/default.nix b/pkgs/applications/virtualization/virtinst/default.nix
index 26b16375e65..bb8b7a1d0d9 100644
--- a/pkgs/applications/virtualization/virtinst/default.nix
+++ b/pkgs/applications/virtualization/virtinst/default.nix
@@ -40,6 +40,6 @@ stdenv.mkDerivation rec {
     homepage = http://virt-manager.org;
     license = "GPLv2+";
     maintainers = with stdenv.lib.maintainers; [qknight];
-    description = "The Virt Install tool (virt-install for short command name, virtinst for package name) is a command line tool which provides an easy way to provision operating systems into virtual machines.";
+    description = "Command line tool which provides an easy way to provision operating systems into virtual machines";
   };
 }
diff --git a/pkgs/applications/window-managers/ion-3/default.nix b/pkgs/applications/window-managers/ion-3/default.nix
index b4dabb300c1..7a467b1fcdb 100644
--- a/pkgs/applications/window-managers/ion-3/default.nix
+++ b/pkgs/applications/window-managers/ion-3/default.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation {
   name = "ion-3-20090110";
   meta = {
-    description = "Ion is a tiling tabbed window manager designed with keyboard users in mind.";
+    description = "Tiling tabbed window manager designed with keyboard users in mind";
     homepage = http://modeemi.fi/~tuomov/ion;
   };
   src = fetchurl {
diff --git a/pkgs/applications/window-managers/stumpwm/default.nix b/pkgs/applications/window-managers/stumpwm/default.nix
index ab261a78fb0..721adf41326 100644
--- a/pkgs/applications/window-managers/stumpwm/default.nix
+++ b/pkgs/applications/window-managers/stumpwm/default.nix
@@ -53,7 +53,7 @@ rec {
       
   name = "${pkgName}-" + version;
   meta = {
-    description = "Common Lisp-based ratpoison-like window manager.";
+    description = "Common Lisp-based ratpoison-like window manager";
     maintainers = [args.lib.maintainers.raskin];
     platforms = with args.lib.platforms;
       linux ++ freebsd;
diff --git a/pkgs/applications/window-managers/wmii31/default.nix b/pkgs/applications/window-managers/wmii31/default.nix
index 50655a851e2..dd49cf5ec43 100644
--- a/pkgs/applications/window-managers/wmii31/default.nix
+++ b/pkgs/applications/window-managers/wmii31/default.nix
@@ -29,7 +29,7 @@ args: with args; stdenv.mkDerivation {
      cp cmd/wmiimenu \$out/bin
   ";
   meta = { homepage = "www.suckless.org";
-           description = "one small tool of the wmii window manger to let the user select an item from a list by filtering..";
+           description = "One small tool of the wmii window manger to let the user select an item from a list by filtering";
            license="MIT";
          };
 }
diff --git a/pkgs/data/fonts/redhat-liberation-fonts/default.nix b/pkgs/data/fonts/redhat-liberation-fonts/default.nix
index c331b85029d..08faeafc619 100644
--- a/pkgs/data/fonts/redhat-liberation-fonts/default.nix
+++ b/pkgs/data/fonts/redhat-liberation-fonts/default.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = {
-    description = "Liberation Fonts, replacements for Times New Roman, Arial, and Courier New.";
+    description = "Liberation Fonts, replacements for Times New Roman, Arial, and Courier New";
 
     longDescription = ''
       The Liberation Fonts are intended to be replacements for the three most
diff --git a/pkgs/data/fonts/unifont/default.nix b/pkgs/data/fonts/unifont/default.nix
index 79d1a090905..893659bc763 100644
--- a/pkgs/data/fonts/unifont/default.nix
+++ b/pkgs/data/fonts/unifont/default.nix
@@ -32,6 +32,6 @@ stdenv.mkDerivation {
     '';
     
   meta = {
-    description = "Unicode font for Base Multilingual Plane.";
+    description = "Unicode font for Base Multilingual Plane";
   };
 }
diff --git a/pkgs/development/compilers/gwt/2.4.0.nix b/pkgs/development/compilers/gwt/2.4.0.nix
index c5c7841d72a..65208b062c2 100644
--- a/pkgs/development/compilers/gwt/2.4.0.nix
+++ b/pkgs/development/compilers/gwt/2.4.0.nix
@@ -18,6 +18,6 @@ stdenv.mkDerivation {
 
   meta = {
     homepage = http://code.google.com/webtoolkit/;
-    description = "Google Web Toolkit (GWT) is a development toolkit for building and optimizing complex browser-based applications.";
+    description = "Google Web Toolkit (GWT) is a development toolkit for building and optimizing complex browser-based applications";
   };
 }
diff --git a/pkgs/development/compilers/julia/default.nix b/pkgs/development/compilers/julia/default.nix
index 3e45fc6d5e3..e2384b08e5b 100644
--- a/pkgs/development/compilers/julia/default.nix
+++ b/pkgs/development/compilers/julia/default.nix
@@ -131,7 +131,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = {
-    description = "High-level performance-oriented dynamical language for technical computing.";
+    description = "High-level performance-oriented dynamical language for technical computing";
     homepage = "http://julialang.org/";
     license = stdenv.lib.licenses.mit;
     maintainers = [ stdenv.lib.maintainers.raskin ];
diff --git a/pkgs/development/compilers/mlton/default.nix b/pkgs/development/compilers/mlton/default.nix
index 770a6b17b15..a5ff613a9b4 100644
--- a/pkgs/development/compilers/mlton/default.nix
+++ b/pkgs/development/compilers/mlton/default.nix
@@ -77,7 +77,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = {
-    description = "MLton is an open-source, whole-program, optimizing Standard ML compiler.";
+    description = "Open-source, whole-program, optimizing Standard ML compiler";
     longDescription = ''
       MLton is an open source, whole-program optimizing compiler for the Standard ML programming language.
       MLton aims to produce fast executables, and to encourage rapid prototyping and modular programming
diff --git a/pkgs/development/compilers/urweb/default.nix b/pkgs/development/compilers/urweb/default.nix
index 66b15e3499d..a2423bee9b9 100644
--- a/pkgs/development/compilers/urweb/default.nix
+++ b/pkgs/development/compilers/urweb/default.nix
@@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
   dontDisableStatic = true;
 
   meta = {
-    description = "Ur/Web supports construction of dynamic web applications backed by SQL databases.";
+    description = "Construct dynamic web applications backed by SQL databases";
     longDescription = ''
       Ur is a programming language in the tradition of ML and Haskell, but
       featuring a significantly richer type system. Ur is functional, pure,
diff --git a/pkgs/development/interpreters/falcon/default.nix b/pkgs/development/interpreters/falcon/default.nix
index 9800e895400..0b4bfacb6de 100644
--- a/pkgs/development/interpreters/falcon/default.nix
+++ b/pkgs/development/interpreters/falcon/default.nix
@@ -29,6 +29,6 @@ rec {
 
   name = "falcon-" + version;
   meta = {
-    description = "A programming language. Has macros and syntax at once.";
+    description = "Programming language with macros and syntax at once";
   };
 }
diff --git a/pkgs/development/interpreters/hiphopvm/default.nix b/pkgs/development/interpreters/hiphopvm/default.nix
index 57e3e93c646..c18c81caff0 100644
--- a/pkgs/development/interpreters/hiphopvm/default.nix
+++ b/pkgs/development/interpreters/hiphopvm/default.nix
@@ -56,7 +56,7 @@ stdenv.mkDerivation {
   patches = [./tbb.patch];
 
   meta = {
-    description = "HipHop is a high performance PHP toolchain.";
+    description = "High performance PHP toolchain";
     homepage = https://github.com/facebook/hiphop-php;
     platforms = ["x86_64-linux"];
   };
diff --git a/pkgs/development/interpreters/lua-4/default.nix b/pkgs/development/interpreters/lua-4/default.nix
index a95e4e4c35e..13f7964769c 100644
--- a/pkgs/development/interpreters/lua-4/default.nix
+++ b/pkgs/development/interpreters/lua-4/default.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation {
 
   meta = {
     homepage = "http://www.lua.org";
-    description = "Lua is a powerful, fast, lightweight, embeddable scripting language.";
+    description = "Powerful, fast, lightweight, embeddable scripting language";
     longDescription = ''
       Lua combines simple procedural syntax with powerful data
       description constructs based on associative arrays and extensible
diff --git a/pkgs/development/interpreters/lua-5/5.0.3.nix b/pkgs/development/interpreters/lua-5/5.0.3.nix
index ff2a8140191..eae2d82d5d0 100644
--- a/pkgs/development/interpreters/lua-5/5.0.3.nix
+++ b/pkgs/development/interpreters/lua-5/5.0.3.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation {
 
   meta = {
     homepage = "http://www.lua.org";
-    description = "Lua is a powerful, fast, lightweight, embeddable scripting language.";
+    description = "Powerful, fast, lightweight, embeddable scripting language";
     longDescription = ''
       Lua combines simple procedural syntax with powerful data
       description constructs based on associative arrays and extensible
diff --git a/pkgs/development/interpreters/lua-5/5.1.nix b/pkgs/development/interpreters/lua-5/5.1.nix
index bdbf2d106bf..2923a8f960d 100644
--- a/pkgs/development/interpreters/lua-5/5.1.nix
+++ b/pkgs/development/interpreters/lua-5/5.1.nix
@@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     homepage = "http://www.lua.org";
-    description = "Lua is a powerful, fast, lightweight, embeddable scripting language.";
+    description = "Powerful, fast, lightweight, embeddable scripting language";
     longDescription = ''
       Lua combines simple procedural syntax with powerful data
       description constructs based on associative arrays and extensible
diff --git a/pkgs/development/interpreters/lua-5/5.2.nix b/pkgs/development/interpreters/lua-5/5.2.nix
index bd5a868c2d5..5b4c2459872 100644
--- a/pkgs/development/interpreters/lua-5/5.2.nix
+++ b/pkgs/development/interpreters/lua-5/5.2.nix
@@ -51,7 +51,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     homepage = "http://www.lua.org";
-    description = "Lua is a powerful, fast, lightweight, embeddable scripting language.";
+    description = "Powerful, fast, lightweight, embeddable scripting language";
     longDescription = ''
       Lua combines simple procedural syntax with powerful data
       description constructs based on associative arrays and extensible
diff --git a/pkgs/development/interpreters/racket/default.nix b/pkgs/development/interpreters/racket/default.nix
index ddcf2634039..f45c96d2805 100644
--- a/pkgs/development/interpreters/racket/default.nix
+++ b/pkgs/development/interpreters/racket/default.nix
@@ -44,7 +44,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = {
-    description = "A programming language derived from Scheme (formerly called PLT Scheme).";
+    description = "Programming language derived from Scheme (formerly called PLT Scheme)";
     longDescription = ''
       Racket (formerly called PLT Scheme) is a programming language derived
       from Scheme. The Racket project has four primary components: the
diff --git a/pkgs/development/libraries/clucene-core/2.x.nix b/pkgs/development/libraries/clucene-core/2.x.nix
index 97c7a4c9f53..60e8da9c3fc 100644
--- a/pkgs/development/libraries/clucene-core/2.x.nix
+++ b/pkgs/development/libraries/clucene-core/2.x.nix
@@ -21,7 +21,17 @@ stdenv.mkDerivation rec {
     ];
 
   meta = {
-    description = "CLucene is a port of the very popular Java Lucene text search engine API. Core package, 2.x branch.";
+    description = "Core library for full-featured text search engine";
+    longDescription = ''
+      CLucene is a high-performance, scalable, cross platform, full-featured,
+      open-source indexing and searching API. Specifically, CLucene is the guts
+      of a search engine, the hard stuff. You write the easy stuff: the UI and
+      the process of selecting and parsing your data files to pump them into
+      the search engine yourself, and any specialized queries to pull it back
+      for display or further processing.
+
+      CLucene is a port of the very popular Java Lucene text search engine API.
+    '';
     homepage = http://clucene.sourceforge.net;
   };
 }
diff --git a/pkgs/development/libraries/clucene-core/default.nix b/pkgs/development/libraries/clucene-core/default.nix
index abd6712736f..33a789266d4 100644
--- a/pkgs/development/libraries/clucene-core/default.nix
+++ b/pkgs/development/libraries/clucene-core/default.nix
@@ -9,7 +9,17 @@ stdenv.mkDerivation rec {
   };
   
   meta = {
-    description = "CLucene is a port of the very popular Java Lucene text search engine API. Core package.";
+    description = "Core library for full-featured text search engine";
+    longDescription = ''
+      CLucene is a high-performance, scalable, cross platform, full-featured,
+      open-source indexing and searching API. Specifically, CLucene is the guts
+      of a search engine, the hard stuff. You write the easy stuff: the UI and
+      the process of selecting and parsing your data files to pump them into
+      the search engine yourself, and any specialized queries to pull it back
+      for display or further processing.
+
+      CLucene is a port of the very popular Java Lucene text search engine API.
+    '';
     homepage = http://clucene.sourceforge.net;
   };
 }
diff --git a/pkgs/development/libraries/coin3d/default.nix b/pkgs/development/libraries/coin3d/default.nix
index b477a88ed53..2ada0244149 100644
--- a/pkgs/development/libraries/coin3d/default.nix
+++ b/pkgs/development/libraries/coin3d/default.nix
@@ -14,8 +14,7 @@ stdenv.mkDerivation rec {
   meta = {
     homepage = http://www.coin3d.org/;
     license = "GPLv2+";
-    description = "High-level, retained-mode toolkit for effective 3D graphics development.";
-
+    description = "High-level, retained-mode toolkit for effective 3D graphics development";
     maintainers = [ stdenv.lib.maintainers.viric ];
     platforms = stdenv.lib.platforms.linux;
   };
diff --git a/pkgs/development/libraries/eventlog/default.nix b/pkgs/development/libraries/eventlog/default.nix
index b1239d6f4cf..7a8ab8e464b 100644
--- a/pkgs/development/libraries/eventlog/default.nix
+++ b/pkgs/development/libraries/eventlog/default.nix
@@ -9,7 +9,15 @@ stdenv.mkDerivation {
   };
 
   meta = {
-    description = "A new API to format and send structured log messages.";
+    description = "Syslog event logger library";
+    longDescription = ''
+      The EventLog library aims to be a replacement of the simple syslog() API
+      provided on UNIX systems. The major difference between EventLog and
+      syslog is that EventLog tries to add structure to messages.
+
+      Where you had a simple non-structrured string in syslog() you have a
+      combination of description and tag/value pairs.
+    '';
     homepage = "http://www.balabit.com/support/community/products/";
     license = "BSD";
   };
diff --git a/pkgs/development/libraries/gssdp/default.nix b/pkgs/development/libraries/gssdp/default.nix
index 28bad546084..c33457544f5 100644
--- a/pkgs/development/libraries/gssdp/default.nix
+++ b/pkgs/development/libraries/gssdp/default.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation {
   buildInputs = [pkgconfig libsoup glib libxml2];
 
   meta = {
-    description = "A GObject-based API for handling resource discovery and announcement over SSDP.";
+    description = "GObject-based API for handling resource discovery and announcement over SSDP";
     homepage = http://www.gupnp.org/;
     license = "LGPL v2";
     platforms = stdenv.lib.platforms.all;
diff --git a/pkgs/development/libraries/haskell/RSA/default.nix b/pkgs/development/libraries/haskell/RSA/default.nix
index c5257c5b262..17f4c516a54 100644
--- a/pkgs/development/libraries/haskell/RSA/default.nix
+++ b/pkgs/development/libraries/haskell/RSA/default.nix
@@ -12,7 +12,7 @@ cabal.mkDerivation (self: {
     binary cryptoApi cryptoPubkeyTypes monadcryptorandom pureMD5 SHA
   ];
   meta = {
-    description = "Implementation of RSA, using the padding schemes of PKCS#1 v2.1.";
+    description = "Implementation of RSA, using the padding schemes of PKCS#1 v2.1";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
     maintainers = [ self.stdenv.lib.maintainers.andres ];
diff --git a/pkgs/development/libraries/haskell/arithmoi/default.nix b/pkgs/development/libraries/haskell/arithmoi/default.nix
index 181937fdd80..22707c04e83 100644
--- a/pkgs/development/libraries/haskell/arithmoi/default.nix
+++ b/pkgs/development/libraries/haskell/arithmoi/default.nix
@@ -7,7 +7,7 @@ cabal.mkDerivation (self: {
   buildDepends = [ mtl random ];
   meta = {
     homepage = "https://bitbucket.org/dafis/arithmoi";
-    description = "Efficient basic number-theoretic functions. Primes, powers, integer logarithms.";
+    description = "Basic number theoretic functions and utilities";
     license = self.stdenv.lib.licenses.mit;
     platforms = self.ghc.meta.platforms;
   };
diff --git a/pkgs/development/libraries/haskell/datetime/default.nix b/pkgs/development/libraries/haskell/datetime/default.nix
index faf0b40b94d..669bace3366 100644
--- a/pkgs/development/libraries/haskell/datetime/default.nix
+++ b/pkgs/development/libraries/haskell/datetime/default.nix
@@ -7,7 +7,7 @@ cabal.mkDerivation (self: {
   buildDepends = [ QuickCheck time ];
   meta = {
     homepage = "http://github.com/esessoms/datetime";
-    description = "Utilities to make Data.Time.* easier to use.";
+    description = "Utilities to make Data.Time.* easier to use";
     license = "GPL";
     platforms = self.ghc.meta.platforms;
     maintainers = [ self.stdenv.lib.maintainers.andres ];
diff --git a/pkgs/development/libraries/haskell/dotgen/default.nix b/pkgs/development/libraries/haskell/dotgen/default.nix
index a7fe5b791f0..f56db8f8c5f 100644
--- a/pkgs/development/libraries/haskell/dotgen/default.nix
+++ b/pkgs/development/libraries/haskell/dotgen/default.nix
@@ -7,7 +7,7 @@ cabal.mkDerivation (self: {
   isLibrary = true;
   isExecutable = true;
   meta = {
-    description = "A simple interface for building .dot graph files.";
+    description = "A simple interface for building .dot graph files";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
     maintainers = [ self.stdenv.lib.maintainers.andres ];
diff --git a/pkgs/development/libraries/haskell/feed/default.nix b/pkgs/development/libraries/haskell/feed/default.nix
index a2c1ccde86b..ec4251d7cb1 100644
--- a/pkgs/development/libraries/haskell/feed/default.nix
+++ b/pkgs/development/libraries/haskell/feed/default.nix
@@ -7,7 +7,7 @@ cabal.mkDerivation (self: {
   buildDepends = [ utf8String xml ];
   meta = {
     homepage = "https://github.com/sof/feed";
-    description = "Interfacing with RSS (v 0.9x, 2.x, 1.0) + Atom feeds.";
+    description = "Interfacing with RSS (v 0.9x, 2.x, 1.0) + Atom feeds";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
     maintainers = [ self.stdenv.lib.maintainers.andres ];
diff --git a/pkgs/development/libraries/haskell/hoauth/default.nix b/pkgs/development/libraries/haskell/hoauth/default.nix
index c568b292c3c..0486ee72f3b 100644
--- a/pkgs/development/libraries/haskell/hoauth/default.nix
+++ b/pkgs/development/libraries/haskell/hoauth/default.nix
@@ -11,7 +11,7 @@ cabal.mkDerivation (self: {
     time utf8String
   ];
   meta = {
-    description = "A Haskell implementation of OAuth 1.0a protocol.";
+    description = "A Haskell implementation of OAuth 1.0a protocol";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
     maintainers = [ self.stdenv.lib.maintainers.andres ];
diff --git a/pkgs/development/libraries/haskell/hsyslog/default.nix b/pkgs/development/libraries/haskell/hsyslog/default.nix
index 3f475425659..2a531875e0b 100644
--- a/pkgs/development/libraries/haskell/hsyslog/default.nix
+++ b/pkgs/development/libraries/haskell/hsyslog/default.nix
@@ -6,7 +6,7 @@ cabal.mkDerivation (self: {
   sha256 = "1dpcawnl3a5lw2w8gc9920sjrw43qmq1k2zws8rx2q0r6ps7nhgp";
   meta = {
     homepage = "http://github.com/peti/hsyslog";
-    description = "FFI interface to syslog(3) from POSIX.1-2001.";
+    description = "FFI interface to syslog(3) from POSIX.1-2001";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
     maintainers = [
diff --git a/pkgs/development/libraries/haskell/skein/default.nix b/pkgs/development/libraries/haskell/skein/default.nix
index 7acc60e3601..4d96ea19373 100644
--- a/pkgs/development/libraries/haskell/skein/default.nix
+++ b/pkgs/development/libraries/haskell/skein/default.nix
@@ -9,7 +9,7 @@ cabal.mkDerivation (self: {
   jailbreak = true;
   meta = {
     homepage = "https://github.com/meteficha/skein";
-    description = "Skein, a family of cryptographic hash functions. Includes Skein-MAC as well.";
+    description = "Family of cryptographic hash functions (includes Skein-MAC)";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
     maintainers = [ self.stdenv.lib.maintainers.andres ];
diff --git a/pkgs/development/libraries/haskell/tar/default.nix b/pkgs/development/libraries/haskell/tar/default.nix
index 04257960a64..7ee52e79e03 100644
--- a/pkgs/development/libraries/haskell/tar/default.nix
+++ b/pkgs/development/libraries/haskell/tar/default.nix
@@ -6,7 +6,7 @@ cabal.mkDerivation (self: {
   sha256 = "0vbsv7h3zgp30mlgsw156jkv1rqy5zbm98as9haf7x15hd6jf254";
   buildDepends = [ filepath time ];
   meta = {
-    description = "Reading, writing and manipulating \".tar\" archive files.";
+    description = "Reading, writing and manipulating \".tar\" archive files";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
     maintainers = [ self.stdenv.lib.maintainers.andres ];
diff --git a/pkgs/development/libraries/haskell/transformers-compat/default.nix b/pkgs/development/libraries/haskell/transformers-compat/default.nix
index 2abd6efa0ce..3eda20cec05 100644
--- a/pkgs/development/libraries/haskell/transformers-compat/default.nix
+++ b/pkgs/development/libraries/haskell/transformers-compat/default.nix
@@ -7,7 +7,7 @@ cabal.mkDerivation (self: {
   buildDepends = [ transformers ];
   meta = {
     homepage = "http://github.com/ekmett/transformers-compat/";
-    description = "A small compatibility shim exposing the new types from transformers 0.3 to older Haskell platforms.";
+    description = "Small compatibility shim exposing the new types from transformers 0.3 to older Haskell platforms";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
   };
diff --git a/pkgs/development/libraries/hunspell/default.nix b/pkgs/development/libraries/hunspell/default.nix
index 04be58eb50a..95516dadacf 100644
--- a/pkgs/development/libraries/hunspell/default.nix
+++ b/pkgs/development/libraries/hunspell/default.nix
@@ -13,9 +13,15 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     homepage = http://hunspell.sourceforge.net;
-    description = "The spell checker of OpenOffice.org and Mozilla Firefox 3 & Thunderbird, Google Chrome etc.";
+    description = "Spell checker";
     longDescription = ''
+      Hunspell is the spell checker of LibreOffice, OpenOffice.org, Mozilla
+      Firefox 3 & Thunderbird, Google Chrome, and it is also used by
+      proprietary software packages, like Mac OS X, InDesign, memoQ, Opera and
+      SDL Trados.
+
       Main features:
+
       * Extended support for language peculiarities; Unicode character encoding, compounding and complex morphology.
       * Improved suggestion using n-gram similarity, rule and dictionary based pronounciation data.
       * Morphological analysis, stemming and generation.
diff --git a/pkgs/development/libraries/jansson/default.nix b/pkgs/development/libraries/jansson/default.nix
index a1f9983abe2..4908c737ece 100644
--- a/pkgs/development/libraries/jansson/default.nix
+++ b/pkgs/development/libraries/jansson/default.nix
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     homepage = "http://www.digip.org/jansson/";
-    description = "Jansson is a C library for encoding, decoding and manipulating JSON data.";
+    description = "C library for encoding, decoding and manipulating JSON data";
     license = "MIT";
   };
 }
diff --git a/pkgs/development/libraries/leveldb/default.nix b/pkgs/development/libraries/leveldb/default.nix
index 12846dfbe8b..7c990e99c33 100644
--- a/pkgs/development/libraries/leveldb/default.nix
+++ b/pkgs/development/libraries/leveldb/default.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     homepage = "https://code.google.com/p/leveldb/";
-    description = "A fast and lightweight key/value database library by Google.";
+    description = "Fast and lightweight key/value database library by Google";
     license = "BSD";
   };
 }
diff --git a/pkgs/development/libraries/libid3tag/default.nix b/pkgs/development/libraries/libid3tag/default.nix
index e137c939771..3b701b703c1 100644
--- a/pkgs/development/libraries/libid3tag/default.nix
+++ b/pkgs/development/libraries/libid3tag/default.nix
@@ -10,7 +10,7 @@ stdenv.mkDerivation {
   propagatedBuildInputs = [zlib];
 
   meta = {
-    description = "An ID3 tag manipulation library.";
+    description = "ID3 tag manipulation library";
     homepage = http://mad.sourceforge.net/;
     license = "GPL";
   };
diff --git a/pkgs/development/libraries/liblockfile/default.nix b/pkgs/development/libraries/liblockfile/default.nix
index 2db90845f69..f991fdc2f29 100644
--- a/pkgs/development/libraries/liblockfile/default.nix
+++ b/pkgs/development/libraries/liblockfile/default.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
 
 
   meta = {
-    description = "Liblockfile is a shared library with NFS-safe locking functions.";
+    description = "Shared library with NFS-safe locking functions";
     homepage = http://packages.debian.org/unstable/libs/liblockfile1;
     license = "GPLv2+";
 
diff --git a/pkgs/development/libraries/libmcrypt/default.nix b/pkgs/development/libraries/libmcrypt/default.nix
index 79019cbc489..afa66161731 100644
--- a/pkgs/development/libraries/libmcrypt/default.nix
+++ b/pkgs/development/libraries/libmcrypt/default.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
     [ "--disable-posix-threads" ];
 
   meta = {
-    description = "MCrypt is a replacement for the old crypt() package and crypt(1) command, with extensions.";
+    description = "Replacement for the old crypt() package and crypt(1) command, with extensions";
     homepage = http://mcrypt.sourceforge.net;
     license = "GPL";
   };
diff --git a/pkgs/development/libraries/libmemcached/default.nix b/pkgs/development/libraries/libmemcached/default.nix
index 487b4de6cb7..b724f915150 100644
--- a/pkgs/development/libraries/libmemcached/default.nix
+++ b/pkgs/development/libraries/libmemcached/default.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     homepage = http://libmemcached.org;
-    description = "libMemcached is an open source C/C++ client library and tools for the memcached server.";
+    description = "Open source C/C++ client library and tools for the memcached server";
     license = "BSD";
   };
 }
diff --git a/pkgs/development/libraries/libnet/default.nix b/pkgs/development/libraries/libnet/default.nix
index 42ef4d30a12..783739dda71 100644
--- a/pkgs/development/libraries/libnet/default.nix
+++ b/pkgs/development/libraries/libnet/default.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     homepage = http://github.com/sam-github/libnet;
-    description = "Libnet provides a portable framework for low-level network packet construction.";
+    description = "Portable framework for low-level network packet construction";
     license = stdenv.lib.licenses.bsd3;
     platforms = stdenv.lib.platforms.unix;
   };
diff --git a/pkgs/development/libraries/libnetfilter_conntrack/default.nix b/pkgs/development/libraries/libnetfilter_conntrack/default.nix
index 99624911077..8e689ed2568 100644
--- a/pkgs/development/libraries/libnetfilter_conntrack/default.nix
+++ b/pkgs/development/libraries/libnetfilter_conntrack/default.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   buildInputs = [ pkgconfig libnfnetlink libmnl ];
 
   meta = {
-    description = "userspace library providing an API to the in-kernel connection tracking state table.";
+    description = "Userspace library providing an API to the in-kernel connection tracking state table";
     longDescription = ''
       libnetfilter_conntrack is a userspace library providing a programming interface (API) to the
       in-kernel connection tracking state table. The library libnetfilter_conntrack has been
diff --git a/pkgs/development/libraries/libnfnetlink/default.nix b/pkgs/development/libraries/libnfnetlink/default.nix
index 07a182dff10..3bb698e9bf6 100644
--- a/pkgs/development/libraries/libnfnetlink/default.nix
+++ b/pkgs/development/libraries/libnfnetlink/default.nix
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
   };
 
   meta = {
-    description = "low-level library for netfilter related kernel/userspace communication.";
+    description = "Low-level library for netfilter related kernel/userspace communication";
     longDescription = ''
       libnfnetlink is the low-level library for netfilter related kernel/userspace communication.
       It provides a generic messaging infrastructure for in-kernel netfilter subsystems
diff --git a/pkgs/development/libraries/liboop/default.nix b/pkgs/development/libraries/liboop/default.nix
index 20793eb3140..a963288e869 100644
--- a/pkgs/development/libraries/liboop/default.nix
+++ b/pkgs/development/libraries/liboop/default.nix
@@ -9,7 +9,7 @@ stdenv.mkDerivation {
   };
 
   meta = {
-    description = "`liboop', an event loop library.";
+    description = "Event loop library";
     homepage = http://liboop.ofb.net/;
     license = "LGPL";
   };
diff --git a/pkgs/development/libraries/librdf/default.nix b/pkgs/development/libraries/librdf/default.nix
index 21c952b7fb8..9b51f694ab3 100644
--- a/pkgs/development/libraries/librdf/default.nix
+++ b/pkgs/development/libraries/librdf/default.nix
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
   #doCheck = true; # would need swh_lv2 and some path patching
 
   meta = {
-    description = "A lightweight RDF library with special support for LADSPA plugins.";
+    description = "Lightweight RDF library with special support for LADSPA plugins";
     homepage = http://sourceforge.net/projects/lrdf/;
     license = "GPLv2";
     maintainers = [ stdenv.lib.maintainers.marcweber ];
diff --git a/pkgs/development/libraries/oniguruma/default.nix b/pkgs/development/libraries/oniguruma/default.nix
index 984b84085fe..684d6475c63 100644
--- a/pkgs/development/libraries/oniguruma/default.nix
+++ b/pkgs/development/libraries/oniguruma/default.nix
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
   
   meta = {
     homepage = http://www.geocities.jp/kosako3/oniguruma/;
-    description = "Oniguruma is a regular expressions library.";
+    description = "Oniguruma regular expressions library";
     license = "BSD";
   };
 }
diff --git a/pkgs/development/libraries/qhull/default.nix b/pkgs/development/libraries/qhull/default.nix
index b81dbda1586..a82acd2745d 100644
--- a/pkgs/development/libraries/qhull/default.nix
+++ b/pkgs/development/libraries/qhull/default.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     homepage = http://www.qhull.org/;
-    description = "Computes the convex hull, Delaunay triangulation, ...";
+    description = "Computes the convex hull, Delaunay triangulation, Voronoi diagram and more";
     license = "free";
   };
 }
diff --git a/pkgs/development/libraries/sfml/default.nix b/pkgs/development/libraries/sfml/default.nix
index 99b0f2e725c..844505cb359 100644
--- a/pkgs/development/libraries/sfml/default.nix
+++ b/pkgs/development/libraries/sfml/default.nix
@@ -16,7 +16,12 @@ stdenv.mkDerivation rec {
   ";
   meta = with stdenv.lib; {
     homepage = http://www.sfml-dev.org/;
-    description = "A multimedia C++ API that provides access to graphics, input, audio, etc.";
+    description = "Simple and fast multimedia library";
+    longDescription = ''
+      SFML provides a simple interface to the various components of your PC, to
+      ease the development of games and multimedia applications. It is composed
+      of five modules: system, window, graphics, audio and network.
+    '';
     license = licenses.zlib;
     maintainers = [ maintainers.astsmtl ];
   };
diff --git a/pkgs/development/libraries/spice-protocol/default.nix b/pkgs/development/libraries/spice-protocol/default.nix
index e281b1fcf9d..162a832c93a 100644
--- a/pkgs/development/libraries/spice-protocol/default.nix
+++ b/pkgs/development/libraries/spice-protocol/default.nix
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
   };
 
   meta = {
-    description = "Protocol headers for the SPICE protocol.";
+    description = "Protocol headers for the SPICE protocol";
     homepage = http://www.spice-space.org;
     license = stdenv.lib.licenses.bsd3;
 
diff --git a/pkgs/development/libraries/tinyxml/2.6.2.nix b/pkgs/development/libraries/tinyxml/2.6.2.nix
index fde30a98fe9..e1cc1f27c1d 100644
--- a/pkgs/development/libraries/tinyxml/2.6.2.nix
+++ b/pkgs/development/libraries/tinyxml/2.6.2.nix
@@ -58,7 +58,7 @@ in stdenv.mkDerivation {
   '';
   
   meta = {
-    description = "TinyXML is a simple, small, C++ XML parser that can be easily integrating into other programs.";
+    description = "Simple, small, C++ XML parser that can be easily integrating into other programs";
     homepage = "http://www.grinninglizard.com/tinyxml/index.html";
     license = "free-non-copyleft";
   };
diff --git a/pkgs/development/libraries/vcdimager/default.nix b/pkgs/development/libraries/vcdimager/default.nix
index 58b9d2f2573..e93f071aefa 100644
--- a/pkgs/development/libraries/vcdimager/default.nix
+++ b/pkgs/development/libraries/vcdimager/default.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation {
 
   meta = {
     homepage = http://www.gnu.org/software/vcdimager/;
-    description = "GNU VCDImager is a full-featured mastering suite for authoring, disassembling and analyzing Video CDs and Super Video CDs.";
+    description = "Full-featured mastering suite for authoring, disassembling and analyzing Video CDs and Super Video CDs";
     platforms = stdenv.lib.platforms.gnu; # random choice
   };
 }
diff --git a/pkgs/development/ocaml-modules/ocamlgraph/default.nix b/pkgs/development/ocaml-modules/ocamlgraph/default.nix
index 2e109f1d621..997ca220610 100644
--- a/pkgs/development/ocaml-modules/ocamlgraph/default.nix
+++ b/pkgs/development/ocaml-modules/ocamlgraph/default.nix
@@ -36,7 +36,7 @@ stdenv.mkDerivation {
 
   meta = {
     homepage = http://ocamlgraph.lri.fr/;
-    description = "ocamlgraph is a graph library for Objective Caml.";
+    description = "Graph library for Objective Caml";
     license = "GNU Library General Public License version 2, with the special exception on linking described in file LICENSE";
     platforms = ocaml.meta.platforms;
     maintainers = [
diff --git a/pkgs/development/ocaml-modules/sexplib/default.nix b/pkgs/development/ocaml-modules/sexplib/default.nix
index 32d5c842dc8..7c40b5e6cfb 100644
--- a/pkgs/development/ocaml-modules/sexplib/default.nix
+++ b/pkgs/development/ocaml-modules/sexplib/default.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation {
 
   meta = {
     homepage = "http://forge.ocamlcore.org/projects/sexplib/";
-    description = "Library for serializing OCaml values to and from S-expressions.";
+    description = "Library for serializing OCaml values to and from S-expressions";
     license = "LGPL";
     platforms = ocaml.meta.platforms;
   };
diff --git a/pkgs/development/perl-modules/maatkit/default.nix b/pkgs/development/perl-modules/maatkit/default.nix
index d560a5d8e41..d9a1f777f3a 100644
--- a/pkgs/development/perl-modules/maatkit/default.nix
+++ b/pkgs/development/perl-modules/maatkit/default.nix
@@ -25,7 +25,15 @@ buildPerlPackage rec {
   '' ;
 
   meta = {
-    description = "Maatkit makes MySQL easier and safer to manage. It provides simple, predictable ways to do things you cannot otherwise do.";
+    description = "Database toolkit";
+    longDescription = ''
+      You can use Maatkit to prove replication is working correctly, fix
+      corrupted data, automate repetitive tasks, speed up your servers, and
+      much more.
+
+      In addition to MySQL, there is support for PostgreSQL, Memcached, and a
+      growing variety of other databases and technologies.
+    '';
     license = "GPLv2+";
     homepage = http://www.maatkit.org/;
   };
diff --git a/pkgs/development/python-modules/pyside/default.nix b/pkgs/development/python-modules/pyside/default.nix
index 791d5e83d3c..dc4f733a4cf 100644
--- a/pkgs/development/python-modules/pyside/default.nix
+++ b/pkgs/development/python-modules/pyside/default.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation {
   makeFlags = "QT_PLUGIN_PATH=" + pysideShiboken + "/lib/generatorrunner";
 
   meta = {
-    description = "LGPL-licensed Python bindings for the Qt cross-platform application and UI framework.";
+    description = "LGPL-licensed Python bindings for the Qt cross-platform application and UI framework";
     license = stdenv.lib.licenses.lgpl21;
     homepage = "http://www.pyside.org";
     maintainers = [ stdenv.lib.maintainers.chaoflow ];
diff --git a/pkgs/development/python-modules/pyside/tools.nix b/pkgs/development/python-modules/pyside/tools.nix
index 0b5e6851761..a3153bed217 100644
--- a/pkgs/development/python-modules/pyside/tools.nix
+++ b/pkgs/development/python-modules/pyside/tools.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation {
   buildInputs = [ cmake pyside python27 qt4 pysideShiboken ];
 
   meta = {
-    description = "Tools for pyside, the LGPL-licensed Python bindings for the Qt cross-platform application and UI framework.";
+    description = "Tools for pyside, the LGPL-licensed Python bindings for the Qt cross-platform application and UI framework";
     license = stdenv.lib.licenses.gpl2;
     homepage = "http://www.pyside.org";
     maintainers = [ stdenv.lib.maintainers.chaoflow ];
diff --git a/pkgs/development/qtcreator/default.nix b/pkgs/development/qtcreator/default.nix
index 97f238302ec..55e33c45ca9 100644
--- a/pkgs/development/qtcreator/default.nix
+++ b/pkgs/development/qtcreator/default.nix
@@ -30,14 +30,14 @@ stdenv.mkDerivation rec {
   installFlags = "INSTALL_ROOT=$(out)";
 
   meta = {
-    description = "Qt Creator is a cross-platform IDE tailored to the needs of Qt developers.";
+    description = "Cross-platform IDE tailored to the needs of Qt developers";
     longDescription = ''
-        Qt Creator is a cross-platform IDE (integrated development environment) tailored to the needs of Qt developers.
-        It includes features such as an advanced code editor, a visual debugger and a GUI designer.
-      '';
+      Qt Creator is a cross-platform IDE (integrated development environment)
+      tailored to the needs of Qt developers. It includes features such as an
+      advanced code editor, a visual debugger and a GUI designer.
+    '';
     homepage = "http://qt-project.org/wiki/Category:Tools::QtCreator";
     license = "LGPL";
-
     maintainers = [ stdenv.lib.maintainers.bbenoist ];
     platforms = stdenv.lib.platforms.all;
   };
diff --git a/pkgs/development/tools/analysis/cppcheck/default.nix b/pkgs/development/tools/analysis/cppcheck/default.nix
index b152f0537e3..8aea7bc8aa8 100644
--- a/pkgs/development/tools/analysis/cppcheck/default.nix
+++ b/pkgs/development/tools/analysis/cppcheck/default.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation {
   configurePhase = "makeFlags=PREFIX=$out";
 
   meta = {
-    description = "check C/C++ code for memory leaks, mismatching allocation-deallocation, buffer overrun, etc.";
+    description = "Check C/C++ code for memory leaks, mismatching allocation-deallocation, buffer overrun and more";
     homepage = "http://sourceforge.net/apps/mediawiki/cppcheck/";
     license = "GPL";
     platforms = stdenv.lib.platforms.unix;
diff --git a/pkgs/development/tools/analysis/jdepend/default.nix b/pkgs/development/tools/analysis/jdepend/default.nix
index 7498d3b652a..586e9d5cd5d 100644
--- a/pkgs/development/tools/analysis/jdepend/default.nix
+++ b/pkgs/development/tools/analysis/jdepend/default.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation {
   '';
 
   meta = {
-    description = "Depend traverses Java class file directories and generates design quality metrics for each Java package." ;
+    description = "Traverses Java class file directories and generates design quality metrics for each Java package";
     homepage = http://www.clarkware.com/software/JDepend.html ;
   };
 }
diff --git a/pkgs/development/tools/analysis/pmd/default.nix b/pkgs/development/tools/analysis/pmd/default.nix
index b830ee00838..14007d80b0f 100644
--- a/pkgs/development/tools/analysis/pmd/default.nix
+++ b/pkgs/development/tools/analysis/pmd/default.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation {
   '';
 
   meta = {
-    description = "PMD scans Java source code and looks for potential problems." ;
+    description = "Scans Java source code and looks for potential problems";
     homepage = http://pmd.sourceforge.net/;
   };
 }
diff --git a/pkgs/development/tools/build-managers/colormake/default.nix b/pkgs/development/tools/build-managers/colormake/default.nix
index 9d62b4e187b..25ef7ef0b24 100644
--- a/pkgs/development/tools/build-managers/colormake/default.nix
+++ b/pkgs/development/tools/build-managers/colormake/default.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = {
-    description = "A simple wrapper around make to colorize the output.";
+    description = "Simple wrapper around make to colorize the output";
     license = "GPLv2";
   };
 }
diff --git a/pkgs/development/tools/misc/sysbench/default.nix b/pkgs/development/tools/misc/sysbench/default.nix
index f09ab2af7d1..e3acf620c73 100644
--- a/pkgs/development/tools/misc/sysbench/default.nix
+++ b/pkgs/development/tools/misc/sysbench/default.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = {
-    description = "SysBench is a modular, cross-platform and multi-threaded benchmark tool.";
+    description = "Modular, cross-platform and multi-threaded benchmark tool";
     license = "GPLv2";
     platforms = stdenv.lib.platforms.linux;
   };
diff --git a/pkgs/development/tools/parsing/re2c/default.nix b/pkgs/development/tools/parsing/re2c/default.nix
index b7ed4fb8934..e603768b8cc 100644
--- a/pkgs/development/tools/parsing/re2c/default.nix
+++ b/pkgs/development/tools/parsing/re2c/default.nix
@@ -8,6 +8,6 @@ stdenv.mkDerivation {
   };
 
   meta = {
-    description = "Re2c is a tool for writing very fast and very flexible scanners.";
+    description = "Tool for writing very fast and very flexible scanners";
   };
 }
diff --git a/pkgs/games/extremetuxracer/default.nix b/pkgs/games/extremetuxracer/default.nix
index 898334a1d4a..e35eb3266c2 100644
--- a/pkgs/games/extremetuxracer/default.nix
+++ b/pkgs/games/extremetuxracer/default.nix
@@ -26,6 +26,9 @@ rec {
 
   name = "extremetuxracer-" + version;
   meta = {
-    description = "ExtremeTuxRacer - Tux lies on his belly and accelerates down ice slopes..";
+    description = "High speed arctic racing game based on Tux Racer";
+    longDescription = ''
+      ExtremeTuxRacer - Tux lies on his belly and accelerates down ice slopes.
+    '';
   };
 }
diff --git a/pkgs/games/freeciv/default.nix b/pkgs/games/freeciv/default.nix
index 049f10ad15b..de62b4a669a 100644
--- a/pkgs/games/freeciv/default.nix
+++ b/pkgs/games/freeciv/default.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
     ++ optional server readline;
 
   meta = with stdenv.lib; {
-    description = "multiplayer (or single player), turn-based strategy game.";
+    description = "Multiplayer (or single player), turn-based strategy game";
 
     longDescription = ''
       Freeciv is a Free and Open Source empire-building strategy game
diff --git a/pkgs/games/gtypist/default.nix b/pkgs/games/gtypist/default.nix
index 3dded927ba1..19567918377 100644
--- a/pkgs/games/gtypist/default.nix
+++ b/pkgs/games/gtypist/default.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation {
 
   meta = {
     homepage = http://www.gnu.org/software/gtypist;
-    description = "GNU Typist (also called gtypist) is a universal typing tutor.";
+    description = "Universal typing tutor";
     license = stdenv.lib.licenses.gpl3Plus;
   };
 }
diff --git a/pkgs/games/minetest/default.nix b/pkgs/games/minetest/default.nix
index 6c860d42925..f2ac737486c 100644
--- a/pkgs/games/minetest/default.nix
+++ b/pkgs/games/minetest/default.nix
@@ -34,7 +34,7 @@ in stdenv.mkDerivation {
 
   meta = {
     homepage = "http://minetest.net/";
-    description = "Minetest is an infinite-world block sandbox game.";
+    description = "Infinite-world block sandbox game";
     license = "LGPLv2.1+";
   };
 }
diff --git a/pkgs/games/spring/springlobby.nix b/pkgs/games/spring/springlobby.nix
index e6051a12a26..b78fd7d7788 100644
--- a/pkgs/games/spring/springlobby.nix
+++ b/pkgs/games/spring/springlobby.nix
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     homepage = http://springlobby.info/;
-    description = "A free cross-platform lobby client for the Spring RTS project.";
+    description = "Cross-platform lobby client for the Spring RTS project";
     license = licenses.gpl2;
     maintainers = [ maintainers.phreedom maintainers.qknight];
     platforms = platforms.linux;
diff --git a/pkgs/games/super-tux/default.nix b/pkgs/games/super-tux/default.nix
index 60e9cc537bf..945eaa7fbf8 100644
--- a/pkgs/games/super-tux/default.nix
+++ b/pkgs/games/super-tux/default.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation {
   patches = [ ./g++4.patch ];
 
   meta = {
-    description = "SuperTux is a classic 2D jump'n run sidescroller game in a style similar to the original Super Mario games covered under the GPL.";
+    description = "Classic 2D jump'n run sidescroller game";
 
     homepage = http://supertux.lethargik.org/index.html;
 
diff --git a/pkgs/games/unvanquished/default.nix b/pkgs/games/unvanquished/default.nix
index 6d1c8e5607c..2768d2fad9e 100644
--- a/pkgs/games/unvanquished/default.nix
+++ b/pkgs/games/unvanquished/default.nix
@@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = {
-    description = "A FLOSS FPS combining RTS elements with a futuristic, sci-fi setting.";
+    description = "FPS game set in a futuristic, sci-fi setting";
     longDescription = ''
       Unvanquished is a free, open-source first-person shooter
       combining real-time strategy elements with a futuristic, sci-fi
diff --git a/pkgs/games/warsow/default.nix b/pkgs/games/warsow/default.nix
index aeb7e37cd7e..84d15efb810 100644
--- a/pkgs/games/warsow/default.nix
+++ b/pkgs/games/warsow/default.nix
@@ -47,7 +47,7 @@ stdenv.mkDerivation rec {
     patchelf --set-rpath $cur_rpath:${mesa}/lib $p
   '';
   meta = {
-    description = "A multiplayer FPS designed for competitive gaming.";
+    description = "Multiplayer FPS game designed for competitive gaming";
     longDescription = ''
       Set in a futuristic cartoon-like world where rocketlauncher-wielding
       pigs and lasergun-carrying cyberpunks roam the streets, Warsow is a
diff --git a/pkgs/misc/emulators/hatari/default.nix b/pkgs/misc/emulators/hatari/default.nix
index e4eeff9cd54..150b45dd727 100644
--- a/pkgs/misc/emulators/hatari/default.nix
+++ b/pkgs/misc/emulators/hatari/default.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     homepage = "http://hatari.tuxfamily.org/";
-    description = "Hatari is an Atari ST/STE/TT/Falcon emulator.";
+    description = "Atari ST/STE/TT/Falcon emulator";
     license = "GPLv2+";
     platforms = with stdenv.lib.platforms; all;
   };
diff --git a/pkgs/misc/screensavers/xlockmore/default.nix b/pkgs/misc/screensavers/xlockmore/default.nix
index 2df8f2fd97a..b3c71c89191 100644
--- a/pkgs/misc/screensavers/xlockmore/default.nix
+++ b/pkgs/misc/screensavers/xlockmore/default.nix
@@ -39,7 +39,7 @@ stdenv.mkDerivation rec {
     + (if pam != null then " --enable-pam --enable-bad-pam" else " --disable-pam");
 
   meta = {
-    description = "Xlockmore, a screen locker for the X Window System.";
+    description = "Screen locker for the X Window System";
     homepage = "http://www.tux.org/~bagleyd/xlockmore.html";
     license = "GPL";
   };
diff --git a/pkgs/os-specific/linux/dstat/default.nix b/pkgs/os-specific/linux/dstat/default.nix
index fb454c78788..138b4ff468f 100644
--- a/pkgs/os-specific/linux/dstat/default.nix
+++ b/pkgs/os-specific/linux/dstat/default.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     homepage = http://dag.wieers.com/home-made/dstat/;
-    description = "Versatile resource statistics tool.";
+    description = "Versatile resource statistics tool";
     license = "GPLv2";
     platforms = stdenv.lib.platforms.linux;
     maintainers = [ ];
diff --git a/pkgs/os-specific/linux/pam_ccreds/default.nix b/pkgs/os-specific/linux/pam_ccreds/default.nix
index 4d48c86dd14..7f84918156c 100644
--- a/pkgs/os-specific/linux/pam_ccreds/default.nix
+++ b/pkgs/os-specific/linux/pam_ccreds/default.nix
@@ -14,6 +14,6 @@ stdenv.mkDerivation {
   buildInputs = [pam openssl db];
   meta = {
     homepage = "http://www.padl.com/OSS/pam_ccreds.html";
-    description = "The pam_ccreds module provides the means for Linux workstations to locally authenticate using an enterprise identity when the network is unavailable.";
+    description = "PAM module to locally authenticate using an enterprise identity when the network is unavailable";
   };
 }
diff --git a/pkgs/os-specific/linux/pam_krb5/default.nix b/pkgs/os-specific/linux/pam_krb5/default.nix
index 62f9b5c119b..5f95811e0f6 100644
--- a/pkgs/os-specific/linux/pam_krb5/default.nix
+++ b/pkgs/os-specific/linux/pam_krb5/default.nix
@@ -14,6 +14,10 @@ stdenv.mkDerivation {
   meta = {
 #    homepage = "http://www.eyrie.org/~eagle/software/pam-krb5";
     homepage = "https://fedorahosted.org/pam_krb5/";
-    description = "The pam_krb5 module allows PAM-aware applications to authenticate users by performing an AS exchange with a Kerberos KDC. It can optionally convert Kerberos 5 credentials to Kerberos IV credentials and/or use them to set up AFS tokens for a user's session.";
+    description = "PAM module allowing PAM-aware applications to authenticate users by performing an AS exchange with a Kerberos KDC";
+    longDescription = ''
+      pam_krb5 can optionally convert Kerberos 5 credentials to Kerberos IV
+      credentials and/or use them to set up AFS tokens for a user's session.
+    '';
   };
 }
diff --git a/pkgs/os-specific/linux/x86info/default.nix b/pkgs/os-specific/linux/x86info/default.nix
index 297991ff4d9..6cd2a431a60 100644
--- a/pkgs/os-specific/linux/x86info/default.nix
+++ b/pkgs/os-specific/linux/x86info/default.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = {
-    description = "An identification utility for the x86 series of processors.";
+    description = "Identification utility for the x86 series of processors";
     longDescription =
     ''
       x86info will identify all Intel/AMD/Centaur/Cyrix/VIA CPUs. It leverages
diff --git a/pkgs/servers/computing/storm/default.nix b/pkgs/servers/computing/storm/default.nix
index ca3f5333b30..88837f9bb42 100644
--- a/pkgs/servers/computing/storm/default.nix
+++ b/pkgs/servers/computing/storm/default.nix
@@ -42,7 +42,7 @@ stdenv.mkDerivation {
 
   meta = {
     homepage = "http://storm-project.net";
-    description = "Storm, free and open source distributed realtime computation system.";
+    description = "Distributed realtime computation system";
     license = "Eclipse Public License 1.0";
     maintainers = [ lib.maintainers.vizanto ];
   };
diff --git a/pkgs/servers/http/apache-modules/mod_evasive/default.nix b/pkgs/servers/http/apache-modules/mod_evasive/default.nix
index d796d0a6dc5..129f44ab502 100644
--- a/pkgs/servers/http/apache-modules/mod_evasive/default.nix
+++ b/pkgs/servers/http/apache-modules/mod_evasive/default.nix
@@ -23,8 +23,7 @@ stdenv.mkDerivation {
 
   meta = {
     homepage = "http://www.zdziarski.com/blog/?page_id=442";
-    description = "mod_evasive is an evasive maneuvers module for Apache to provide evasive action in the event of an HTTP DoS or DDoS attack or brute force attack.";
-
+    description = "Evasive maneuvers module for Apache to provide evasive action in the event of an HTTP DoS or DDoS attack or brute force attack";
     platforms = stdenv.lib.platforms.linux;
   };
 }
diff --git a/pkgs/servers/icecast/default.nix b/pkgs/servers/icecast/default.nix
index 24ae245a8a0..8b940fdb0cf 100644
--- a/pkgs/servers/icecast/default.nix
+++ b/pkgs/servers/icecast/default.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   buildInputs = [ libxml2 libxslt curl libvorbis libtheora speex libkate ];
 
   meta = {
-    description = "icecast is free server software for streaming multimedia.";
+    description = "Server software for streaming multimedia";
 
     longDescription = ''
       Icecast is a streaming media server which currently supports Ogg Vorbis and MP3
diff --git a/pkgs/servers/mail/dovecot-pigeonhole/default.nix b/pkgs/servers/mail/dovecot-pigeonhole/default.nix
index c4204113ae0..5c0f39ca135 100644
--- a/pkgs/servers/mail/dovecot-pigeonhole/default.nix
+++ b/pkgs/servers/mail/dovecot-pigeonhole/default.nix
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     homepage = http://pigeonhole.dovecot.org/;
-    description = "A sieve plugin for the Dovecot IMAP server.";
+    description = "A sieve plugin for the Dovecot IMAP server";
     license = licenses.lgpl21;
     maintainers = [ maintainers.rickynils ];
   };  
diff --git a/pkgs/servers/sabnzbd/default.nix b/pkgs/servers/sabnzbd/default.nix
index 599f6ee31f3..ace96fbed63 100644
--- a/pkgs/servers/sabnzbd/default.nix
+++ b/pkgs/servers/sabnzbd/default.nix
@@ -14,6 +14,6 @@ stdenv.mkDerivation {
   builder = ./builder.sh;
   
   meta = {
-    description = "Usenet NZB downloader, par2 repairer and auto extracting server.";
+    description = "Usenet NZB downloader, par2 repairer and auto extracting server";
   };
 }
diff --git a/pkgs/servers/varnish/default.nix b/pkgs/servers/varnish/default.nix
index 528c03e3aa3..8d0f3b306f2 100644
--- a/pkgs/servers/varnish/default.nix
+++ b/pkgs/servers/varnish/default.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   buildInputs = [ pcre libxslt groff ncurses pkgconfig ];
 
   meta = {
-    description = "Varnish Cache is a web application accelerator also known as a caching HTTP reverse proxy.";
+    description = "Web application accelerator also known as a caching HTTP reverse proxy";
     homepage = "https://www.varnish-cache.org";
     license = stdenv.lib.licenses.bsd2;
     maintainers = [ stdenv.lib.maintainers.garbas ];
diff --git a/pkgs/tools/X11/keynav/default.nix b/pkgs/tools/X11/keynav/default.nix
index 19de62990e2..02b6321d18c 100644
--- a/pkgs/tools/X11/keynav/default.nix
+++ b/pkgs/tools/X11/keynav/default.nix
@@ -20,6 +20,6 @@ stdenv.mkDerivation rec {
     '';
 
   meta = {
-    description = "A tool to generate X11 mouse clicks from keyboard.";
+    description = "Generate X11 mouse clicks from keyboard";
   };
 }
diff --git a/pkgs/tools/X11/x2x/default.nix b/pkgs/tools/X11/x2x/default.nix
index 5d68e1da1ba..237ea614059 100644
--- a/pkgs/tools/X11/x2x/default.nix
+++ b/pkgs/tools/X11/x2x/default.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation {
   '';
 
   meta = {
-    description = "x2x allows the keyboard, mouse on one X display to be used to control another X display.";
+    description = "Allows the keyboard, mouse on one X display to be used to control another X display";
     homepage = http://x2x.dottedmag.net;
     license = "BSD";
   };
diff --git a/pkgs/tools/backup/httrack/default.nix b/pkgs/tools/backup/httrack/default.nix
index ecdf40be0a5..c02a16d821a 100644
--- a/pkgs/tools/backup/httrack/default.nix
+++ b/pkgs/tools/backup/httrack/default.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     homepage = "http://www.httrack.com";
-    description = "HTTrack is a free (GPL, libre/free software) and easy-to-use offline browser utility.";
+    description = "Easy-to-use offline browser utility";
     license = "GPL";
   };
 }
diff --git a/pkgs/tools/backup/obnam/default.nix b/pkgs/tools/backup/obnam/default.nix
index 69927e01582..6d550e95a9d 100644
--- a/pkgs/tools/backup/obnam/default.nix
+++ b/pkgs/tools/backup/obnam/default.nix
@@ -18,7 +18,7 @@ pythonPackages.buildPythonPackage rec {
 
   meta = {
     homepage = http://liw.fi/obnam/;
-    description = "A backup program supporting deduplication, compression and encryption.";
+    description = "Backup program supporting deduplication, compression and encryption";
     maintainers = [ stdenv.lib.maintainers.rickynils ];
     platforms = stdenv.lib.platforms.linux;
   };
diff --git a/pkgs/tools/graphics/dmtx/default.nix b/pkgs/tools/graphics/dmtx/default.nix
index 29c6b5ebf79..74b1a2bf4ed 100644
--- a/pkgs/tools/graphics/dmtx/default.nix
+++ b/pkgs/tools/graphics/dmtx/default.nix
@@ -24,7 +24,7 @@ rec {
       
   name = "dmtx-" + version;
   meta = {
-    description = "DataMatrix (2D bar code) processing tools.";
+    description = "DataMatrix (2D bar code) processing tools";
     maintainers = [args.lib.maintainers.raskin];
     platforms = args.lib.platforms.linux;
   };
diff --git a/pkgs/tools/misc/detox/default.nix b/pkgs/tools/misc/detox/default.nix
index ade13382033..435115ffc59 100644
--- a/pkgs/tools/misc/detox/default.nix
+++ b/pkgs/tools/misc/detox/default.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation {
   buildInputs = [flex];
 
   meta = {
-    description = "Detox is a utility designed to clean up filenames.";
+    description = "Utility designed to clean up filenames";
     longDescription = ''
       Detox is a utility designed to clean up filenames. It replaces
       difficult to work with characters, such as spaces, with standard
diff --git a/pkgs/tools/misc/disper/default.nix b/pkgs/tools/misc/disper/default.nix
index cc11427f65a..b4a159745d4 100644
--- a/pkgs/tools/misc/disper/default.nix
+++ b/pkgs/tools/misc/disper/default.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   };
 
   meta = {
-    description = "Disper is an on-the-fly display switch utility.";
+    description = "On-the-fly display switch utility";
     homepage = http://willem.engen.nl/projects/disper/;
   };
 
diff --git a/pkgs/tools/misc/fdupes/default.nix b/pkgs/tools/misc/fdupes/default.nix
index 2de9efdac58..14e6a2f6681 100644
--- a/pkgs/tools/misc/fdupes/default.nix
+++ b/pkgs/tools/misc/fdupes/default.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation {
   makeFlags = "PREFIX=\${out}";
 
   meta = {
-    description = "identifies duplicate files residing within specified directories.";
+    description = "Identifies duplicate files residing within specified directories";
     longDescription = ''
       FDUPES uses md5sums and then a byte by byte comparison to finde duplicate
       files within a set of directories.
diff --git a/pkgs/tools/misc/gnuvd/default.nix b/pkgs/tools/misc/gnuvd/default.nix
index 6436a14047a..122694af456 100644
--- a/pkgs/tools/misc/gnuvd/default.nix
+++ b/pkgs/tools/misc/gnuvd/default.nix
@@ -9,7 +9,7 @@ stdenv.mkDerivation {
   };
 
   meta = {
-    description = "gnuvd is a command-line dutch dictionary application.";
+    description = "Command-line dutch dictionary application";
     homepage = http://www.djcbsoftware.nl/code/gnuvd/;
   };
 }
diff --git a/pkgs/tools/misc/grc/default.nix b/pkgs/tools/misc/grc/default.nix
index ea54ab4a543..cd3ea6eda6f 100644
--- a/pkgs/tools/misc/grc/default.nix
+++ b/pkgs/tools/misc/grc/default.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = with stdenv.lib; {
-    description = "Yet another colouriser for beautifying your logfiles or output of commands.";
+    description = "Yet another colouriser for beautifying your logfiles or output of commands";
     homepage    = http://korpus.juls.savba.sk/~garabik/software/grc.html;
     license     = licenses.gpl2;
     maintainers = with maintainers; [ lovek323 ];
diff --git a/pkgs/tools/misc/gsmartcontrol/default.nix b/pkgs/tools/misc/gsmartcontrol/default.nix
index abbd8f20fd0..6cb528cca1d 100644
--- a/pkgs/tools/misc/gsmartcontrol/default.nix
+++ b/pkgs/tools/misc/gsmartcontrol/default.nix
@@ -14,7 +14,16 @@ stdenv.mkDerivation rec {
   #installTargets = "install datainstall";
 
   meta = {
-    description = "GSmartControl is a graphical user interface for smartctl (from smartmontools package), which is a tool for querying and controlling SMART (Self-Monitoring, Analysis, and Reporting Technology) data on modern hard disk drives.";
+    description = "Hard disk drive health inspection tool";
+    longDescription = ''
+      GSmartControl is a graphical user interface for smartctl (from
+      smartmontools package), which is a tool for querying and controlling
+      SMART (Self-Monitoring, Analysis, and Reporting Technology) data on
+      modern hard disk drives.
+
+      It allows you to inspect the drive's SMART data to determine its health,
+      as well as run various tests on it.
+    '';
     homepage = http://gsmartcontrol.berlios.de;
     license = "GPLv2+";
     maintainers = with stdenv.lib.maintainers; [qknight];
diff --git a/pkgs/tools/misc/hdf5/default.nix b/pkgs/tools/misc/hdf5/default.nix
index 0aacf744b1a..01820aaf778 100644
--- a/pkgs/tools/misc/hdf5/default.nix
+++ b/pkgs/tools/misc/hdf5/default.nix
@@ -13,9 +13,9 @@ stdenv.mkDerivation {
   patches = [./bin-mv.patch];
   
   meta = {
-    description = "HDF5 is a data model, library, and file format for storing and managing data.";
+    description = "Data model, library, and file format for storing and managing data";
     longDescription = ''
-      It supports an unlimited variety of datatypes, and is designed for flexible and efficient 
+      HDF5 supports an unlimited variety of datatypes, and is designed for flexible and efficient
       I/O and for high volume and complex data. HDF5 is portable and is extensible, allowing 
       applications to evolve in their use of HDF5. The HDF5 Technology suite includes tools and 
       applications for managing, manipulating, viewing, and analyzing data in the HDF5 format.
diff --git a/pkgs/tools/misc/mcrypt/default.nix b/pkgs/tools/misc/mcrypt/default.nix
index 7701f0e2059..761b2c5bdbf 100644
--- a/pkgs/tools/misc/mcrypt/default.nix
+++ b/pkgs/tools/misc/mcrypt/default.nix
@@ -12,7 +12,12 @@ stdenv.mkDerivation rec {
   buildInputs = [libmcrypt libmhash];
  
   meta = {
-    description = "mcrypt, and the accompanying libmcrypt, are intended to be replacements for the old Unix crypt, except that they are under the GPL and support an ever-wider range of algorithms and modes.";
+    description = "Replacement for old UNIX crypt(1)";
+    longDescription = ''
+      mcrypt, and the accompanying libmcrypt, are intended to be replacements
+      for the old Unix crypt, except that they are under the GPL and support an
+      ever-wider range of algorithms and modes.
+    '';
     homepage = http://mcrypt.sourceforge.net;
     license = "GPLv2";
     platforms = stdenv.lib.platforms.all;
diff --git a/pkgs/tools/misc/ncdu/default.nix b/pkgs/tools/misc/ncdu/default.nix
index 2d3a67db8c5..47b96023ce0 100644
--- a/pkgs/tools/misc/ncdu/default.nix
+++ b/pkgs/tools/misc/ncdu/default.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   buildInputs = [ ncurses ];
 
   meta = {
-    description = "An ncurses disk usage analyzer.";
+    description = "Ncurses disk usage analyzer";
     homepage = http://dev.yorhel.nl/ncdu;
     license = stdenv.lib.licenses.mit;
     platforms = stdenv.lib.platforms.all;
diff --git a/pkgs/tools/misc/ponysay/default.nix b/pkgs/tools/misc/ponysay/default.nix
index 17be93dda8f..1da0d70a14f 100644
--- a/pkgs/tools/misc/ponysay/default.nix
+++ b/pkgs/tools/misc/ponysay/default.nix
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = {
-    description = "cowsay reimplemention for ponies.";
+    description = "Cowsay reimplemention for ponies";
     homepage = http://terse.tk/ponysay/;
     license = "GPLv3";
     maintainers = with stdenv.lib.maintainers; [ bodil ];
diff --git a/pkgs/tools/misc/ttmkfdir/default.nix b/pkgs/tools/misc/ttmkfdir/default.nix
index 3f05d600944..12adb5318a8 100644
--- a/pkgs/tools/misc/ttmkfdir/default.nix
+++ b/pkgs/tools/misc/ttmkfdir/default.nix
@@ -26,6 +26,6 @@ stdenv.mkDerivation {
   buildInputs = [freetype fontconfig libunwind libtool flex bison];
 
   meta = {
-    description = "Create fonts.dir for TTF font directory.";
+    description = "Create fonts.dir for TTF font directory";
   };
 }
diff --git a/pkgs/tools/misc/unclutter/default.nix b/pkgs/tools/misc/unclutter/default.nix
index b267074e77f..542530532de 100644
--- a/pkgs/tools/misc/unclutter/default.nix
+++ b/pkgs/tools/misc/unclutter/default.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation {
   '';
 
   meta = with stdenv.lib; {
-    description = "Hides mouse pointer while not in use.";
+    description = "Hides mouse pointer while not in use";
     longDescription = ''
       Unclutter hides your X mouse cursor when you do not need it, to prevent
       it from getting in the way. You have only to move the mouse to restore
diff --git a/pkgs/tools/misc/units/default.nix b/pkgs/tools/misc/units/default.nix
index d4cd07aa4c6..c609d2275da 100644
--- a/pkgs/tools/misc/units/default.nix
+++ b/pkgs/tools/misc/units/default.nix
@@ -8,6 +8,6 @@ stdenv.mkDerivation {
   };
 
   meta = {
-    description = "Unit conversion tool.";
+    description = "Unit conversion tool";
   };
 }
diff --git a/pkgs/tools/misc/venus/default.nix b/pkgs/tools/misc/venus/default.nix
index b4f9732dec6..b7f2be179c4 100644
--- a/pkgs/tools/misc/venus/default.nix
+++ b/pkgs/tools/misc/venus/default.nix
@@ -41,7 +41,12 @@ stdenv.mkDerivation rec {
   '';
 
   meta = {
-    description = "Planet Venus is an awesome ‘river of news’ feed reader. It downloads news feeds published by web sites and aggregates their content together into a single combined feed, latest news first.";
+    description = "News feed reader";
+    longDescription = ''
+      Planet Venus is an awesome ‘river of news’ feed reader. It downloads news
+      feeds published by web sites and aggregates their content together into a
+      single combined feed, latest news first.
+    '';
     homepage = "http://intertwingly.net/code/venus/docs/index.html";
     license = stdenv.lib.licenses.psfl;
     platforms = stdenv.lib.platforms.all;
diff --git a/pkgs/tools/networking/connect/default.nix b/pkgs/tools/networking/connect/default.nix
index 67f2b63c292..c6291efad31 100644
--- a/pkgs/tools/networking/connect/default.nix
+++ b/pkgs/tools/networking/connect/default.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = {
-    description = "make network connection via SOCKS and https proxy.";
+    description = "Make network connection via SOCKS and https proxy";
     longDescription = ''
       This proxy traversal tool is intended to assist OpenSSH (via ProxyCommand
       in ~/.ssh/config) and GIT (via $GIT_PROXY_COMMAND) utilize SOCKS and https proxies. 
diff --git a/pkgs/tools/networking/fping/default.nix b/pkgs/tools/networking/fping/default.nix
index c51c8f59ff7..4bda944c68a 100644
--- a/pkgs/tools/networking/fping/default.nix
+++ b/pkgs/tools/networking/fping/default.nix
@@ -10,6 +10,6 @@ stdenv.mkDerivation rec {
 
   meta = {
     homepage = "http://fping.org/";
-    description = "A program to send ICMP echo probes to network hosts.";
+    description = "Send ICMP echo probes to network hosts";
   };
 }
diff --git a/pkgs/tools/networking/gmvault/default.nix b/pkgs/tools/networking/gmvault/default.nix
index 8ab93948191..e78dfa5b2ca 100644
--- a/pkgs/tools/networking/gmvault/default.nix
+++ b/pkgs/tools/networking/gmvault/default.nix
@@ -28,7 +28,7 @@ buildPythonPackage rec {
   '';
 
   meta = {
-    description = "Gmvault Gmail Backup - Backup and restore your gmail account at will.";
+    description = "Backup and restore your gmail account";
     homepage = "http://gmvault.org";
     license = pkgs.lib.licenses.agpl3Plus;
   };
diff --git a/pkgs/tools/networking/haproxy/default.nix b/pkgs/tools/networking/haproxy/default.nix
index d44c9f831f3..3946f1eef0f 100644
--- a/pkgs/tools/networking/haproxy/default.nix
+++ b/pkgs/tools/networking/haproxy/default.nix
@@ -17,7 +17,15 @@ stdenv.mkDerivation rec {
   '';
 
   meta = {
-    description = "HAProxy is a free, very fast and reliable solution offering high availability, load balancing, and proxying for TCP and HTTP-based applications.";
+    description = "Reliable, high performance TCP/HTTP load balancer";
+    longDescription = ''
+      HAProxy is a free, very fast and reliable solution offering high
+      availability, load balancing, and proxying for TCP and HTTP-based
+      applications. It is particularly suited for web sites crawling under very
+      high loads while needing persistence or Layer7 processing. Supporting
+      tens of thousands of connections is clearly realistic with todays
+      hardware.
+    '';
     homepage = http://haproxy.1wt.eu;
     maintainers = [ stdenv.lib.maintainers.garbas ];
     platforms = stdenv.lib.platforms.linux;
diff --git a/pkgs/tools/networking/mosh/default.nix b/pkgs/tools/networking/mosh/default.nix
index f9562f7eff6..2708210af80 100644
--- a/pkgs/tools/networking/mosh/default.nix
+++ b/pkgs/tools/networking/mosh/default.nix
@@ -17,7 +17,15 @@ stdenv.mkDerivation rec {
 
   meta = {
     homepage = http://mosh.mit.edu/;
-    description = "Remote terminal application that allows roaming, local echo, etc.";
+    description = "Mobile shell (ssh replacement)";
+    longDescription = ''
+      Remote terminal application that allows roaming, supports intermittent
+      connectivity, and provides intelligent local echo and line editing of
+      user keystrokes.
+
+      Mosh is a replacement for SSH. It's more robust and responsive,
+      especially over Wi-Fi, cellular, and long-distance links.
+    '';
     license = "GPLv3+";
     maintainers = with stdenv.lib.maintainers; [viric];
     platforms = with stdenv.lib.platforms; linux;
diff --git a/pkgs/tools/networking/netrw/default.nix b/pkgs/tools/networking/netrw/default.nix
index 23ff6ddba55..77ef6e0ad30 100644
--- a/pkgs/tools/networking/netrw/default.nix
+++ b/pkgs/tools/networking/netrw/default.nix
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
   };
 
   meta = {
-    description = "A simple tool for transporting data over the network.";
+    description = "Simple tool for transporting data over the network";
     license = stdenv.lib.licenses.gpl2;
     homepage = "http://mamuti.net/netrw/index.en.html";
   };
diff --git a/pkgs/tools/networking/nylon/default.nix b/pkgs/tools/networking/nylon/default.nix
index 3d1563f9520..9050423cfaf 100644
--- a/pkgs/tools/networking/nylon/default.nix
+++ b/pkgs/tools/networking/nylon/default.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation {
 
   meta = {
     homepage = http://monkey.org/~marius/nylon;
-    description = "Proxy server, supporting SOCKS 4 and 5, as well as a mirror mode.";
+    description = "Proxy server, supporting SOCKS 4 and 5, as well as a mirror mode";
     license = "free";
   };
 }
diff --git a/pkgs/tools/networking/offlineimap/default.nix b/pkgs/tools/networking/offlineimap/default.nix
index a5b46ebbc3c..fa1d2fb805a 100644
--- a/pkgs/tools/networking/offlineimap/default.nix
+++ b/pkgs/tools/networking/offlineimap/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   ];
 
   meta = {
-    description = "OfflineImap synchronizes emails between two repositories, so that you can read the same mailbox from multiple computers.";
+    description = "Synchronize emails between two repositories, so that you can read the same mailbox from multiple computers";
     homepage = "http://offlineimap.org";
     license = pkgs.lib.licenses.gpl2Plus;
     maintainers = [ pkgs.lib.maintainers.garbas ];
diff --git a/pkgs/tools/networking/pdsh/default.nix b/pkgs/tools/networking/pdsh/default.nix
index ec0b7c6f60b..80fc075107c 100644
--- a/pkgs/tools/networking/pdsh/default.nix
+++ b/pkgs/tools/networking/pdsh/default.nix
@@ -35,7 +35,7 @@ stdenv.mkDerivation {
 
   meta = {
     homepage = "http://code.google.com/p/pdsh/";
-    description = "A high-performance, parallel remote shell utility.";
+    description = "High-performance, parallel remote shell utility";
     license = "GPLv2";
 
     longDescription = ''
diff --git a/pkgs/tools/networking/proxychains/default.nix b/pkgs/tools/networking/proxychains/default.nix
index e2eeb73fc64..6778cf94907 100644
--- a/pkgs/tools/networking/proxychains/default.nix
+++ b/pkgs/tools/networking/proxychains/default.nix
@@ -8,7 +8,7 @@ stdenv.mkDerivation {
   };
 
   meta = {
-    description = "Proxifier for SOCKS proxies.";
+    description = "Proxifier for SOCKS proxies";
     homepage = http://proxychains.sourceforge.net;
     license = "GPLv2+";
   };
diff --git a/pkgs/tools/networking/trickle/default.nix b/pkgs/tools/networking/trickle/default.nix
index 646108525d3..254dc168ec8 100644
--- a/pkgs/tools/networking/trickle/default.nix
+++ b/pkgs/tools/networking/trickle/default.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
   configureFlags = "--with-libevent";
 
   meta = {
-    description = "Trickle, a portable lightweight userspace bandwidth shaper.";
+    description = "Lightweight userspace bandwidth shaper";
     license = "BSD";
     homepage = http://monkey.org/~marius/pages/?page=trickle;
     platforms = stdenv.lib.platforms.linux;
diff --git a/pkgs/tools/networking/unbound/default.nix b/pkgs/tools/networking/unbound/default.nix
index 98fc8e4d145..ea9719dd9b2 100644
--- a/pkgs/tools/networking/unbound/default.nix
+++ b/pkgs/tools/networking/unbound/default.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
     "--localstatedir=/var" ];
 
   meta = {
-    description = "Unbound, a validating, recursive, and caching DNS resolver.";
+    description = "Validating, recursive, and caching DNS resolver";
     license = "BSD";
     homepage = http://www.unbound.net;
     platforms = with stdenv.lib.platforms; linux;
diff --git a/pkgs/tools/security/pwgen/default.nix b/pkgs/tools/security/pwgen/default.nix
index aaa3b577657..ef91e69428a 100644
--- a/pkgs/tools/security/pwgen/default.nix
+++ b/pkgs/tools/security/pwgen/default.nix
@@ -7,7 +7,7 @@ stdenv.mkDerivation {
     sha256 = "1afxbkdl9b81760pyb972k18dmidrciy3vzcnspp3jg0aa316yn8";
   };
   meta = {
-	description = "Small, GPL'ed password generator which creates passwords which can be easily memorized by a human.";
-        platforms = stdenv.lib.platforms.all;
+    description = "Password generator which creates passwords which can be easily memorized by a human";
+    platforms = stdenv.lib.platforms.all;
   };
 }
diff --git a/pkgs/tools/security/torbutton/default.nix b/pkgs/tools/security/torbutton/default.nix
index 348d96b0024..05bab06d382 100644
--- a/pkgs/tools/security/torbutton/default.nix
+++ b/pkgs/tools/security/torbutton/default.nix
@@ -21,7 +21,12 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     homepage = https://www.torproject.org/torbutton/;
-    description = "the component in Tor Browser Bundle that takes care of application-level security and privacy concerns in Firefox. To keep you safe, Torbutton disables many types of active content.";
+    description = "Part of the Tor Browser Bundle";
+    longDescription = ''
+      The component in Tor Browser Bundle that takes care of application-level
+      security and privacy concerns in Firefox. To keep you safe, Torbutton
+      disables many types of active content.
+    '';
     license = licenses.mit;
     maintainers = [ maintainers.phreedom ];
     platforms = platforms.linux;
diff --git a/pkgs/tools/system/logcheck/default.nix b/pkgs/tools/system/logcheck/default.nix
index 1c57711940b..7d15ade348c 100644
--- a/pkgs/tools/system/logcheck/default.nix
+++ b/pkgs/tools/system/logcheck/default.nix
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
  ];
 
   meta = {
-    description = "Mails anomalies in the system logfiles to the administrator.";
+    description = "Mails anomalies in the system logfiles to the administrator";
     longDescription = ''
       Mails anomalies in the system logfiles to the administrator.
 
diff --git a/pkgs/tools/system/lshw/default.nix b/pkgs/tools/system/lshw/default.nix
index a0f838cfcf9..930cb7b7bff 100644
--- a/pkgs/tools/system/lshw/default.nix
+++ b/pkgs/tools/system/lshw/default.nix
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     homepage = http://ezix.org/project/wiki/HardwareLiSter;
-    description = "A small tool to provide detailed information on the hardware configuration of the machine.";
+    description = "Provide detailed information on the hardware configuration of the machine";
     license = licenses.gpl2;
     maintainers = [ maintainers.phreedom ];
     platforms = platforms.linux;
diff --git a/pkgs/tools/system/rsyslog/default.nix b/pkgs/tools/system/rsyslog/default.nix
index 0189d04902a..3b5c0648384 100644
--- a/pkgs/tools/system/rsyslog/default.nix
+++ b/pkgs/tools/system/rsyslog/default.nix
@@ -14,9 +14,8 @@ stdenv.mkDerivation {
 
   meta = {
     homepage = "http://www.rsyslog.com/";
-    description = "Rsyslog is an enhanced syslogd. It can be used as a drop-in replacement for stock sysklogd.";
+    description = "Enhanced syslog implementation";
     license = "GPLv3";
-
     platforms = stdenv.lib.platforms.linux;
   };
 }
diff --git a/pkgs/tools/system/syslog-ng/default.nix b/pkgs/tools/system/syslog-ng/default.nix
index f5ee2f1bcbb..f2cb221cb32 100644
--- a/pkgs/tools/system/syslog-ng/default.nix
+++ b/pkgs/tools/system/syslog-ng/default.nix
@@ -13,9 +13,8 @@ stdenv.mkDerivation {
 
   meta = {
     homepage = "http://www.balabit.com/network-security/syslog-ng/";
-    description = "Next-generation syslogd with advanced networking and filtering capabilities.";
+    description = "Next-generation syslogd with advanced networking and filtering capabilities";
     license = "GPLv2";
-
     platforms = stdenv.lib.platforms.linux;
     maintainers = [ stdenv.lib.maintainers.simons ];
   };
diff --git a/pkgs/tools/system/vboot_reference/default.nix b/pkgs/tools/system/vboot_reference/default.nix
index ed48a9976d4..e1c4734bbda 100644
--- a/pkgs/tools/system/vboot_reference/default.nix
+++ b/pkgs/tools/system/vboot_reference/default.nix
@@ -40,7 +40,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = {
-    description = "Chrome OS partitioning and kernel signing tools.";
+    description = "Chrome OS partitioning and kernel signing tools";
     license = stdenv.lib.licenses.bsd3;
     platforms = stdenv.lib.platforms.linux;
   };
-- 
GitLab


From 83c9a264bff56c56bcf8c7ca0ba3a5d4e13e7dc1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Sat, 28 Sep 2013 00:38:28 +0200
Subject: [PATCH 4992/5331] dblatex: purify and add dblatexFull attribute

imagemagick, transfig, inkscape, fontconfig and ghostscript are missing
dependencies of dblatex. Instead of adding all those dependencies to the
existing dblatex attribute, make a new dblatexFull attribute for that.

Also pass --use-python-path at install time so that script shebangs end
up with #!/path/to/python instead of #!/path/to/env python (which is
impure when not run in a wrapper).
---
 .../tools/typesetting/tex/dblatex/default.nix | 45 ++++++++++++++++---
 pkgs/top-level/all-packages.nix               |  8 +++-
 2 files changed, 47 insertions(+), 6 deletions(-)

diff --git a/pkgs/tools/typesetting/tex/dblatex/default.nix b/pkgs/tools/typesetting/tex/dblatex/default.nix
index fa4746a562e..6993158291c 100644
--- a/pkgs/tools/typesetting/tex/dblatex/default.nix
+++ b/pkgs/tools/typesetting/tex/dblatex/default.nix
@@ -1,4 +1,15 @@
-{ stdenv, fetchurl, python, libxslt, tetex }:
+{ stdenv, fetchurl, python, libxslt, tetex
+, enableAllFeatures ? false, imagemagick ? null, transfig ? null, inkscape ? null, fontconfig ? null, ghostscript ? null }:
+
+# NOTE: enableAllFeatures just purifies the expression, it doesn't actually
+# enable any extra features.
+
+assert enableAllFeatures ->
+  imagemagick != null &&
+  transfig != null &&
+  inkscape != null &&
+  fontconfig != null &&
+  ghostscript != null;
 
 stdenv.mkDerivation rec {
   name = "dblatex-0.3.4";
@@ -8,15 +19,39 @@ stdenv.mkDerivation rec {
     sha256 = "120w3wm07qx0k1grgdhjwm2vpwil71icshjvqznskp1f6ggch290";
   };
 
+  buildInputs = [ python libxslt tetex ]
+    ++ stdenv.lib.optionals enableAllFeatures [ imagemagick transfig ];
+
+  # TODO: dblatex tries to execute texindy command, but nixpkgs doesn't have
+  # that yet. In Ubuntu, texindy is a part of the xindy package.
+  preConfigure = ''
+    sed -i 's|self.install_layout == "deb"|False|' setup.py
+  '' + stdenv.lib.optionalString enableAllFeatures ''
+    for file in $(find -name "*.py"); do
+        sed -e 's|cmd = \["xsltproc|cmd = \["${libxslt}/bin/xsltproc|g' \
+            -e 's|Popen(\["xsltproc|Popen(\["${libxslt}/bin/xsltproc|g' \
+            -e 's|cmd = \["texindy|cmd = ["nixpkgs_is_missing_texindy|g' \
+            -e 's|cmd = "epstopdf|cmd = "${tetex}/bin/epstopdf|g' \
+            -e 's|cmd = \["makeindex|cmd = ["${tetex}/bin/makeindex|g' \
+            -e 's|doc.program = "pdflatex"|doc.program = "${tetex}/bin/pdflatex"|g' \
+            -e 's|self.program = "latex"|self.program = "${tetex}/bin/latex"|g' \
+            -e 's|Popen("pdflatex|Popen("${tetex}/bin/pdflatex|g' \
+            -e 's|"fc-match"|"${fontconfig}/bin/fc-match"|g' \
+            -e 's|"fc-list"|"${fontconfig}/bin/fc-list"|g' \
+            -e 's|cmd = "inkscape|cmd = "${inkscape}/bin/inkscape|g' \
+            -e 's|cmd = "fig2dev|cmd = "${transfig}/bin/fig2dev|g' \
+            -e 's|cmd = \["ps2pdf|cmd = ["${ghostscript}/bin/ps2pdf|g' \
+            -e 's|cmd = "convert|cmd = "${imagemagick}/bin/convert|g' \
+            -i "$file"
+    done
+  '';
+
   buildPhase = "true";
   
   installPhase = ''
-    sed -i 's|self.install_layout == "deb"|False|' setup.py
-    python ./setup.py install --prefix=$out
+    python ./setup.py install --prefix="$out" --use-python-path --verbose
   '';
 
-  buildInputs = [ python libxslt tetex ];
-
   meta = {
     description = "A program to convert DocBook to DVI, PostScript or PDF via LaTeX or ConTeXt";
     homepage = http://dblatex.sourceforge.net/;
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 957eadbb8c1..a567c0b88d1 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9784,7 +9784,13 @@ let
 
   dbacl = callPackage ../tools/misc/dbacl { };
 
-  dblatex = callPackage ../tools/typesetting/tex/dblatex { };
+  dblatex = callPackage ../tools/typesetting/tex/dblatex {
+    enableAllFeatures = false;
+  };
+
+  dblatexFull = appendToName "full" (dblatex.override {
+    enableAllFeatures = true;
+  });
 
   dosbox = callPackage ../misc/emulators/dosbox { };
 
-- 
GitLab


From 9d7086f173754aa3ba8cc8bcbeedbb01afca223e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Mon, 23 Sep 2013 21:26:44 +0200
Subject: [PATCH 4993/5331] asciidoc: purify and add asciidocFull attribute

The current asciidoc expression is impure; it relies on several tools to
be found in PATH at runtime. This commit adds a enableStandardFeatures
parameter that, if true, pulls in all dependencies and patches asciidoc
to contain full paths to the tools.

I've set enableStandardFeatures = false for the existing asciidoc
attribute so that the closure size stays unchanged, at 255 MiB. The new
asciidocFull attribute (with enableStandardFeatures = true) has a
closure size of 1.5 GiB.
---
 pkgs/tools/typesetting/asciidoc/default.nix | 80 ++++++++++++++++++++-
 pkgs/top-level/all-packages.nix             |  6 ++
 2 files changed, 85 insertions(+), 1 deletion(-)

diff --git a/pkgs/tools/typesetting/asciidoc/default.nix b/pkgs/tools/typesetting/asciidoc/default.nix
index 986d0d7a69c..cd3e651801f 100644
--- a/pkgs/tools/typesetting/asciidoc/default.nix
+++ b/pkgs/tools/typesetting/asciidoc/default.nix
@@ -1,4 +1,25 @@
 { fetchurl, stdenv, python
+
+, enableStandardFeatures ? false
+, sourceHighlight ? null
+, highlight ? null
+, pygments ? null
+, graphviz ? null
+, tetex ? null
+, dblatexFull ? null
+, libxslt ? null
+, w3m ? null
+, lynx ? null
+, imagemagick ? null
+, lilypond ? null
+, libxml2 ? null
+, docbook_xml_dtd_45 ? null
+, docbook5_xsl ? null
+, docbook_xsl ? null
+, fop ? null
+# TODO: Package this:
+#, epubcheck ? null
+
 , unzip ? null
 # filters
 , enableDitaaFilter ? false, jre ? null
@@ -12,6 +33,26 @@
 , enableOdfBackend ? false
 }:
 
+assert enableStandardFeatures ->
+  sourceHighlight != null &&
+  highlight != null &&
+  pygments != null &&
+  graphviz != null &&
+  tetex != null &&
+  dblatexFull != null &&
+  libxslt != null &&
+  w3m != null &&
+  lynx != null &&
+  imagemagick != null &&
+  lilypond != null &&
+  libxml2 != null &&
+  docbook_xml_dtd_45 != null &&
+  docbook5_xsl != null &&
+  docbook_xsl != null &&
+  fop != null;
+# TODO: Package this:
+#  epubcheck != null;
+
 # filters
 assert (enableDitaaFilter || enableMscgenFilter || enableDiagFilter || enableQrcodeFilter || enableAafigureFilter) -> unzip != null;
 assert enableDitaaFilter -> jre != null;
@@ -49,7 +90,7 @@ let
     sha256 = "0h4bql1nb4y4fmg2yvlpfjhvy22ln8jsaxdr10f8bfcg5lr0zkxs";
   };
 
-  # latest commit in master branch as per 2013-09-22
+  # there are no archives or tags, using latest commit in master branch as per 2013-09-22
   matplotlibFilterSrc = let commit = "75f0d009629f93f33fab04b83faca20cc35dd358"; in fetchurl rec {
     name = "mplw-${commit}.tar.gz";
     url = "https://api.github.com/repos/lvv/mplw/tarball/${commit}";
@@ -151,11 +192,48 @@ stdenv.mkDerivation rec {
     # the odp backend already has that fix. Copy it here until fixed upstream.
     sed -i "s|'/etc/asciidoc/backends/odt/asciidoc.ott'|os.path.dirname(__file__),'asciidoc.ott'|" \
         "$out/etc/asciidoc/backends/odt/a2x-backend.py"
+  '' + optionalString enableStandardFeatures ''
+    sed -e "s|dot|${graphviz}/bin/dot|g" \
+        -e "s|neato|${graphviz}/bin/neato|g" \
+        -e "s|twopi|${graphviz}/bin/circo|g" \
+        -e "s|circo|${graphviz}/bin/circo|g" \
+        -e "s|fdp|${graphviz}/bin/fdp|g" \
+        -i "filters/graphviz/graphviz2png.py"
+
+    sed -e "s|run('latex|run('${tetex}/bin/latex|g" \
+        -e "s|cmd = 'dvipng'|cmd = '${tetex}/bin/dvipng'|g" \
+        -i "filters/latex/latex2png.py"
+
+    sed -e "s|run('abc2ly|run('${lilypond}/bin/abc2ly|g" \
+        -e "s|run('lilypond|run('${lilypond}/bin/lilypond|g" \
+        -e "s|run('convert|run('${imagemagick}/bin/convert|g" \
+        -i "filters/music/music2png.py"
+
+    sed -e 's|filter="source-highlight|filter="${sourceHighlight}/bin/source-highlight|' \
+        -e 's|filter="highlight|filter="${highlight}/bin/highlight|' \
+        -e 's|filter="pygmentize|filter="${pygments}/bin/pygmentize|' \
+        -i "filters/source/source-highlight-filter.conf"
+
+    # ENV is custom environment passed to programs that a2x invokes. Here we
+    # use it to work around an impurity in the tetex package; tetex tools
+    # cannot find their neighbours (e.g. pdflatex doesn't find mktextfm).
+    # We can remove PATH= when those impurities are fixed.
+    sed -e "s|^ENV =.*|ENV = dict(XML_CATALOG_FILES='${docbook_xml_dtd_45}/xml/dtd/docbook/catalog.xml ${docbook5_xsl}/xml/xsl/docbook/catalog.xml ${docbook_xsl}/xml/xsl/docbook/catalog.xml', PATH='${tetex}/bin')|" \
+        -e "s|^ASCIIDOC =.*|ASCIIDOC = '$out/bin/asciidoc'|" \
+        -e "s|^XSLTPROC =.*|XSLTPROC = '${libxslt}/bin/xsltproc'|" \
+        -e "s|^DBLATEX =.*|DBLATEX = '${dblatexFull}/bin/dblatex'|" \
+        -e "s|^FOP =.*|FOP = '${fop}/bin/fop'|" \
+        -e "s|^W3M =.*|W3M = '${w3m}/bin/w3m'|" \
+        -e "s|^LYNX =.*|LYNX = '${lynx}/bin/lynx'|" \
+        -e "s|^XMLLINT =.*|XMLLINT = '${libxml2}/bin/xmllint'|" \
+        -e "s|^EPUBCHECK =.*|EPUBCHECK = 'nixpkgs_is_missing_epubcheck'|" \
+        -i a2x.py
   '' + ''
     for n in $(find "$out" . -name \*.py); do
       sed -i -e "s,^#![[:space:]]*.*/bin/env python,#!${python}/bin/python,g" "$n"
       chmod +x "$n"
     done
+
     sed -i -e "s,/etc/vim,,g" Makefile.in
   '';
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a567c0b88d1..b64dbc92753 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -572,8 +572,14 @@ let
 
   asciidoc = callPackage ../tools/typesetting/asciidoc {
     inherit (pythonPackages) matplotlib numpy aafigure recursivePthLoader;
+    enableStandardFeatures = false;
   };
 
+  asciidocFull = appendToName "full" (asciidoc.override {
+    inherit (pythonPackages) pygments;
+    enableStandardFeatures = true;
+  });
+
   autossh = callPackage ../tools/networking/autossh { };
 
   bacula = callPackage ../tools/backup/bacula { };
-- 
GitLab


From 81fc2301f3529f46fa47509eabd0ff9a623a3c66 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Sun, 6 Oct 2013 17:18:44 +0200
Subject: [PATCH 4994/5331] add haveged: A simple entropy daemon

---
 pkgs/tools/security/haveged/default.nix | 27 +++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix         |  2 ++
 2 files changed, 29 insertions(+)
 create mode 100644 pkgs/tools/security/haveged/default.nix

diff --git a/pkgs/tools/security/haveged/default.nix b/pkgs/tools/security/haveged/default.nix
new file mode 100644
index 00000000000..48f9727b3c0
--- /dev/null
+++ b/pkgs/tools/security/haveged/default.nix
@@ -0,0 +1,27 @@
+{ stdenv, fetchurl }:
+
+stdenv.mkDerivation rec {
+  name = "haveged-${version}";
+  version = "1.7c";
+
+  src = fetchurl {
+    url = "http://www.issihosts.com/haveged/haveged-${version}.tar.gz";
+    sha256 = "08gi3d9lbrllk5lyxw8l65py88xhia48w758lqjddh3gv7g7wfa0";
+  };
+
+  meta = {
+    description = "A simple entropy daemon";
+    longDescription = ''
+      The haveged project is an attempt to provide an easy-to-use, unpredictable
+      random number generator based upon an adaptation of the HAVEGE algorithm.
+      Haveged was created to remedy low-entropy conditions in the Linux random device
+      that can occur under some workloads, especially on headless servers. Current development
+      of haveged is directed towards improving overall reliablity and adaptability while minimizing
+      the barriers to using haveged for other tasks.
+    '';
+    homepage = http://www.issihosts.com/haveged/;
+    license = stdenv.lib.licenses.gpl3;
+    maintainers = stdenv.lib.maintainers.iElectric;
+    platforms = stdenv.lib.platforms.unix;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 957eadbb8c1..eed32e33ba2 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1063,6 +1063,8 @@ let
   pigz = callPackage ../tools/compression/pigz { };
 
   haproxy = callPackage ../tools/networking/haproxy { };
+ 
+  haveged = callPackage ../tools/security/haveged { };
 
   hardlink = callPackage ../tools/system/hardlink { };
 
-- 
GitLab


From dc44195b95c142f2ba1ee150ce1875e815a2d293 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Sun, 6 Oct 2013 18:40:41 +0200
Subject: [PATCH 4995/5331] pv: 1.3.4 -> 1.4.12

See changelog in the "NEWS" section at
http://www.ivarch.com/programs/pv.shtml
---
 pkgs/tools/misc/pv/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/misc/pv/default.nix b/pkgs/tools/misc/pv/default.nix
index 444408fec41..bf0c44de141 100644
--- a/pkgs/tools/misc/pv/default.nix
+++ b/pkgs/tools/misc/pv/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl } :
 
 stdenv.mkDerivation rec {
-  name = "pv-1.3.4";
+  name = "pv-1.4.12";
 
   src = fetchurl {
     url = "http://www.ivarch.com/programs/sources/${name}.tar.bz2";
-    sha256 = "114b730pghgg4gv9d798817n3am88p2b0xgdavch1vhklzh33c16";
+    sha256 = "0hnpv4l5kidfwxzba7ibm9wjs71ing9gzx0m80bgr3ia8k4s8nka";
   };
 
   meta = {
-- 
GitLab


From 40826e309fff5b2a8421c83c49e24e0b0bb24636 Mon Sep 17 00:00:00 2001
From: Mathijs Kwik <mathijs@bluescreen303.nl>
Date: Sun, 6 Oct 2013 20:15:17 +0200
Subject: [PATCH 4996/5331] linux-3.12: upgrade to 3.12-rc3

---
 pkgs/os-specific/linux/kernel/linux-3.12.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/linux-3.12.nix b/pkgs/os-specific/linux/kernel/linux-3.12.nix
index dc77c55696a..f7cd2892051 100644
--- a/pkgs/os-specific/linux/kernel/linux-3.12.nix
+++ b/pkgs/os-specific/linux/kernel/linux-3.12.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, ... } @ args:
 
 import ./generic.nix (args // rec {
-  version = "3.12-rc2";
+  version = "3.12-rc3";
 
   src = fetchurl {
     url = "https://www.kernel.org/pub/linux/kernel/v3.0/testing/linux-${version}.tar.gz";
-    sha256 = "1m24fh3cwmkb1scn3sl7gbc50jl53v357kjpgda9avi3ljxmyq5z";
+    sha256 = "1rayb0f4n81yp9ghcws0v36dpqyl9ks3naf37p2qy7jvrwagmj28";
   };
 
   features.iwlwifi = true;
-- 
GitLab


From 2af2f26034a4b216355b27fb01ec807f95be66e8 Mon Sep 17 00:00:00 2001
From: Mathijs Kwik <mathijs@bluescreen303.nl>
Date: Sun, 6 Oct 2013 20:15:41 +0200
Subject: [PATCH 4997/5331] linux-3.11: upgrade to 3.11.4

---
 pkgs/os-specific/linux/kernel/linux-3.11.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/linux-3.11.nix b/pkgs/os-specific/linux/kernel/linux-3.11.nix
index 42e00b5de16..6a3320669a5 100644
--- a/pkgs/os-specific/linux/kernel/linux-3.11.nix
+++ b/pkgs/os-specific/linux/kernel/linux-3.11.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, ... } @ args:
 
 import ./generic.nix (args // rec {
-  version = "3.11.3";
+  version = "3.11.4";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz";
-    sha256 = "15jk6ak00dmsjqi6snsp6843f2pij6rwrhlg1p14shab3xjp1wxl";
+    sha256 = "1kv6j7mc5r5qw43kirc0fv83khpnwy8m7158qf8ar08p3r01i3mi";
   };
 
   features.iwlwifi = true;
-- 
GitLab


From 07fd8c87ab30970fce6139feb087c9ff331b2f48 Mon Sep 17 00:00:00 2001
From: Mathijs Kwik <mathijs@bluescreen303.nl>
Date: Sun, 6 Oct 2013 20:15:54 +0200
Subject: [PATCH 4998/5331] linux-3.10: upgrade to 3.10.15

---
 pkgs/os-specific/linux/kernel/linux-3.10.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/linux-3.10.nix b/pkgs/os-specific/linux/kernel/linux-3.10.nix
index d42e4956ed7..65660619857 100644
--- a/pkgs/os-specific/linux/kernel/linux-3.10.nix
+++ b/pkgs/os-specific/linux/kernel/linux-3.10.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, ... } @ args:
 
 import ./generic.nix (args // rec {
-  version = "3.10.14";
+  version = "3.10.15";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz";
-    sha256 = "0iqvwjhhmqvb7wbqifczd7bd9a4iq8xwyl61sijbwlarn5ghsm1n";
+    sha256 = "07wjh58sylbbw9hwxd5xvbz3dxd05iar8ahzk90lki38m5157ffk";
   };
 
   features.iwlwifi = true;
-- 
GitLab


From c242863da8f1125f5f16b4739c5808320cebc196 Mon Sep 17 00:00:00 2001
From: Mathijs Kwik <mathijs@bluescreen303.nl>
Date: Sun, 6 Oct 2013 20:16:06 +0200
Subject: [PATCH 4999/5331] linux-3.4: upgrade to 3.4.65

---
 pkgs/os-specific/linux/kernel/linux-3.4.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/linux-3.4.nix b/pkgs/os-specific/linux/kernel/linux-3.4.nix
index 953f7d69157..79f53b22216 100644
--- a/pkgs/os-specific/linux/kernel/linux-3.4.nix
+++ b/pkgs/os-specific/linux/kernel/linux-3.4.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, ... } @ args:
 
 import ./generic.nix (args // rec {
-  version = "3.4.63";
+  version = "3.4.65";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz";
-    sha256 = "0wphxk0lzbcd7vplvnx4b2h446pmdv2gxc0gnjbrzfl0v4lgz1y3";
+    sha256 = "1amy6gdqnk0klqmghkdfn2fv1rd30pqvqwx6ix27gf3hmn4s823z";
   };
 
   features.iwlwifi = true;
-- 
GitLab


From ab94b3b863095689895fb1c4ccdcc676739f83b3 Mon Sep 17 00:00:00 2001
From: Mathijs Kwik <mathijs@bluescreen303.nl>
Date: Sun, 6 Oct 2013 20:16:17 +0200
Subject: [PATCH 5000/5331] linux-3.0: upgrade to 3.0.99

---
 pkgs/os-specific/linux/kernel/linux-3.0.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/linux-3.0.nix b/pkgs/os-specific/linux/kernel/linux-3.0.nix
index 48197ae14ca..30b70035dfa 100644
--- a/pkgs/os-specific/linux/kernel/linux-3.0.nix
+++ b/pkgs/os-specific/linux/kernel/linux-3.0.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, ... } @ args:
 
 import ./generic.nix (args // rec {
-  version = "3.0.88";
+  version = "3.0.99";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz";
-    sha256 = "1icfkbn9a5cpwiax1xklvpqyjcvqij3dwib009fipp53z4pn5bz4";
+    sha256 = "1p31gq9kzwfks980y6rb2mjyagj8lrh6y156a550v7mk0bd4fzdi";
   };
 
   features.iwlwifi = true;
-- 
GitLab


From 866d57d93de5034c6895042a28571fcf0f036115 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Sun, 6 Oct 2013 21:19:27 +0200
Subject: [PATCH 5001/5331] wgetpaste: better package description

---
 pkgs/tools/text/wgetpaste/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/tools/text/wgetpaste/default.nix b/pkgs/tools/text/wgetpaste/default.nix
index 04102093aae..a47eb2ddf9f 100644
--- a/pkgs/tools/text/wgetpaste/default.nix
+++ b/pkgs/tools/text/wgetpaste/default.nix
@@ -19,7 +19,7 @@
     '';
 
     meta = {
-      description = "wgetpaste";
+      description = "Command-line interface to various pastebins";
       homepage = http://wgetpaste.zlin.dk/;
       license = "publicDomain";
       maintainers = with stdenv.lib.maintainers; [qknight];
-- 
GitLab


From 28a1e45ec74594902f82b167b56f638e79ac017f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Matija=20=C5=A0uklje?= <matija@suklje.name>
Date: Sun, 6 Oct 2013 21:20:24 +0200
Subject: [PATCH 5002/5331] Added proper dependencies.

---
 pkgs/applications/office/eventlist/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/office/eventlist/default.nix b/pkgs/applications/office/eventlist/default.nix
index 3a4f1640366..8879e828abd 100644
--- a/pkgs/applications/office/eventlist/default.nix
+++ b/pkgs/applications/office/eventlist/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, kdelibs }:
+{ stdenv, fetchurl, kdelibs, kdepimlibs, akonadi }:
 
 stdenv.mkDerivation rec {
   name = "eventlist-0.6.95";
-- 
GitLab


From 5b4a8ff6ccf9d440fd1eeb7a451717303ca8b860 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Matija=20=C5=A0uklje?= <matija@suklje.name>
Date: Sun, 6 Oct 2013 21:27:23 +0200
Subject: [PATCH 5003/5331] Eventlist: Updated version to 0.6.96.

---
 pkgs/applications/office/eventlist/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/office/eventlist/default.nix b/pkgs/applications/office/eventlist/default.nix
index 8879e828abd..8ad12576796 100644
--- a/pkgs/applications/office/eventlist/default.nix
+++ b/pkgs/applications/office/eventlist/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, kdelibs, kdepimlibs, akonadi }:
 
 stdenv.mkDerivation rec {
-  name = "eventlist-0.6.95";
+  name = "eventlist-0.6.96";
 
   src = fetchurl {
-    url = "http://kde-look.org/CONTENT/content-files/107779-plasmoid-eventlist-0.6.95.tar.bz2";
-    sha256 = "29d3ff0b84353c2e563e05f75cd729b9e2971365eed9b8ce9b38d94f51901b94";
+    url = "http://kde-look.org/CONTENT/content-files/107779-plasmoid-eventlist-0.6.96.tar.bz2";
+    sha256 = "26cc7bd1c465bf1379fd0ba1fa8592eaa62f2553734d1b283e17359103908eea";
   };
 
   doCheck = true;
-- 
GitLab


From 525a6fc8a820d2b1fce2a22b25b9cb99be31773d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Matija=20=C5=A0uklje?= <matija@suklje.name>
Date: Sun, 6 Oct 2013 22:09:35 +0200
Subject: [PATCH 5004/5331] Eventlist: Added more dependencies.

---
 pkgs/applications/office/eventlist/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/office/eventlist/default.nix b/pkgs/applications/office/eventlist/default.nix
index 8ad12576796..5a8d761bb50 100644
--- a/pkgs/applications/office/eventlist/default.nix
+++ b/pkgs/applications/office/eventlist/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, kdelibs, kdepimlibs, akonadi }:
+{ stdenv, fetchurl, kdelibs, kdepimlibs, akonadi, gettext }:
 
 stdenv.mkDerivation rec {
   name = "eventlist-0.6.96";
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
 
   doCheck = true;
 
-  buildInputs = [ kdelibs ];
+  buildInputs = [ kdelibs kdepimlibs akonadi gettext ];
 
   meta = {
     inherit (kdelibs.meta) platforms;
-- 
GitLab


From cd98acd3a721e48b82f277af5a00235cb77dc4a0 Mon Sep 17 00:00:00 2001
From: Aristid Breitkreuz <aristidb@gmail.com>
Date: Sun, 6 Oct 2013 22:22:25 +0200
Subject: [PATCH 5005/5331] add simple rsnapshot module

---
 modules/module-list.nix               |  1 +
 modules/services/backup/rsnapshot.nix | 56 +++++++++++++++++++++++++++
 2 files changed, 57 insertions(+)
 create mode 100644 modules/services/backup/rsnapshot.nix

diff --git a/modules/module-list.nix b/modules/module-list.nix
index 76f5e0a4657..c186968f059 100644
--- a/modules/module-list.nix
+++ b/modules/module-list.nix
@@ -75,6 +75,7 @@
   ./services/backup/mysql-backup.nix
   ./services/backup/postgresql-backup.nix
   ./services/backup/sitecopy-backup.nix
+  ./services/backup/rsnapshot.nix
   ./services/databases/4store-endpoint.nix
   ./services/databases/4store.nix
   ./services/databases/firebird.nix
diff --git a/modules/services/backup/rsnapshot.nix b/modules/services/backup/rsnapshot.nix
new file mode 100644
index 00000000000..678296a3e3d
--- /dev/null
+++ b/modules/services/backup/rsnapshot.nix
@@ -0,0 +1,56 @@
+{ config, pkgs, ... }:
+
+with pkgs.lib;
+
+let cfg = config.services.rsnapshot;
+in
+{
+  options = {
+    services.rsnapshot = {
+      enable = mkEnableOption "rsnapshot backups";
+
+      configuration = mkOption {
+        default = "";
+        example = ''
+          retain hourly 24
+          retain daily 365
+          backup /home/ localhost/
+        '';
+        type = types.lines;
+        description = ''
+        rsnapshot configuration option in addition to the defaults from rsnapshot and this module.
+        '';
+      };
+
+      cronIntervals = mkOption {
+        default = {};
+        example = { "hourly" = "0 * * * *"; "daily" = "50 21 * * *"; };
+        type = types.attrsOf types.string;
+        description = ''
+        Periodicity at which intervals should be run by cron.
+        Note that the intervals also have to exist in configuration
+        as retain options.
+        '';
+      };
+    };
+  };
+
+  config = mkIf cfg.enable {
+    environment.systemPackages = [ pkgs.rsnapshot ];
+
+    services.cron.systemCronJobs =
+      mapAttrsToList (interval: time: "${time} root ${pkgs.rsnapshot}/bin/rsnapshot ${interval}") cfg.cronIntervals;
+
+    environment.etc."rsnapshot.conf".source = with pkgs; writeText "gen-rsnapshot.conf" (''
+        config_version	1.2
+        cmd_cp	${coreutils}/bin/cp
+        cmd_rsync	${rsync}/bin/rsync
+        cmd_ssh	${openssh}/bin/ssh
+        cmd_logger	${inetutils}/bin/logger
+        cmd_du	${coreutils}/bin/du
+        cmd_rsnapshot_diff	${rsnapshot}/bin/rsnapshot-diff
+        lockfile	/run/rsnapshot.pid
+
+      '' + cfg.configuration);
+  };
+}
-- 
GitLab


From fa1f5e5b7507533476b7cb4e6fc0013c8cecbd23 Mon Sep 17 00:00:00 2001
From: Aristid Breitkreuz <aristidb@gmail.com>
Date: Sun, 6 Oct 2013 23:02:41 +0200
Subject: [PATCH 5006/5331] implement bjornfors comments

---
 modules/services/backup/rsnapshot.nix | 25 ++++++++++++++++---------
 1 file changed, 16 insertions(+), 9 deletions(-)

diff --git a/modules/services/backup/rsnapshot.nix b/modules/services/backup/rsnapshot.nix
index 678296a3e3d..c4c67ebe35a 100644
--- a/modules/services/backup/rsnapshot.nix
+++ b/modules/services/backup/rsnapshot.nix
@@ -9,16 +9,23 @@ in
     services.rsnapshot = {
       enable = mkEnableOption "rsnapshot backups";
 
-      configuration = mkOption {
+      extraConfiguration = mkOption {
         default = "";
         example = ''
-          retain hourly 24
-          retain daily 365
-          backup /home/ localhost/
+          retains	hourly	24
+          retain	daily	365
+          backup	/home/	localhost/
         '';
         type = types.lines;
         description = ''
-        rsnapshot configuration option in addition to the defaults from rsnapshot and this module.
+          rsnapshot configuration option in addition to the defaults from
+          rsnapshot and this module.
+
+          Note that tabs are required to separate option arguments, and
+          directory names require trailing slashes.
+
+          The "extra" in the option name might be a little misleading right
+          now, as it is required to get a functional configuration.
         '';
       };
 
@@ -27,9 +34,9 @@ in
         example = { "hourly" = "0 * * * *"; "daily" = "50 21 * * *"; };
         type = types.attrsOf types.string;
         description = ''
-        Periodicity at which intervals should be run by cron.
-        Note that the intervals also have to exist in configuration
-        as retain options.
+          Periodicity at which intervals should be run by cron.
+          Note that the intervals also have to exist in configuration
+          as retain options.
         '';
       };
     };
@@ -51,6 +58,6 @@ in
         cmd_rsnapshot_diff	${rsnapshot}/bin/rsnapshot-diff
         lockfile	/run/rsnapshot.pid
 
-      '' + cfg.configuration);
+      '' + cfg.extraConfiguration);
   };
 }
-- 
GitLab


From 2700a13596178dd6af8e4f26afafce78f3b9f2d9 Mon Sep 17 00:00:00 2001
From: Aristid Breitkreuz <aristidb@gmail.com>
Date: Sun, 6 Oct 2013 23:05:30 +0200
Subject: [PATCH 5007/5331] rsnapshot: extraConfiguration -> extraConfig

---
 modules/services/backup/rsnapshot.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/services/backup/rsnapshot.nix b/modules/services/backup/rsnapshot.nix
index c4c67ebe35a..e0ce97257a5 100644
--- a/modules/services/backup/rsnapshot.nix
+++ b/modules/services/backup/rsnapshot.nix
@@ -9,7 +9,7 @@ in
     services.rsnapshot = {
       enable = mkEnableOption "rsnapshot backups";
 
-      extraConfiguration = mkOption {
+      extraConfig = mkOption {
         default = "";
         example = ''
           retains	hourly	24
@@ -58,6 +58,6 @@ in
         cmd_rsnapshot_diff	${rsnapshot}/bin/rsnapshot-diff
         lockfile	/run/rsnapshot.pid
 
-      '' + cfg.extraConfiguration);
+      '' + cfg.extraConfig);
   };
 }
-- 
GitLab


From f0830dbb9c47a57fe4ef6aad2760738c7015a206 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Sun, 6 Oct 2013 23:31:31 +0200
Subject: [PATCH 5008/5331] gnupg1: 1.4.13 -> 1.4.15 (CVE-2013-4402)

---
 pkgs/tools/security/gnupg1/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/security/gnupg1/default.nix b/pkgs/tools/security/gnupg1/default.nix
index f9b959061da..353e0de5ff7 100644
--- a/pkgs/tools/security/gnupg1/default.nix
+++ b/pkgs/tools/security/gnupg1/default.nix
@@ -15,11 +15,11 @@ let
 in
 
 stdenv.mkDerivation rec {
-  name = "gnupg-1.4.13";
+  name = "gnupg-1.4.15";
 
   src = fetchurl {
     url = "mirror://gnupg/gnupg/${name}.tar.bz2";
-    sha1 = "17a75c54d292bd0923f0a1817a1b02ded37d1de1";
+    sha1 = "63ebf0ab375150903c65738070e4105200197fd4";
   };
 
   buildInputs = [ readline bzip2 ];
-- 
GitLab


From 5e07af062d55dbeb86a29696488dfbb58a8c7344 Mon Sep 17 00:00:00 2001
From: Aristid Breitkreuz <aristidb@gmail.com>
Date: Sun, 6 Oct 2013 23:36:07 +0200
Subject: [PATCH 5009/5331] rsnapshot: do not use /etc/rsnapshot.conf

---
 modules/services/backup/rsnapshot.nix | 22 ++++++++++++----------
 1 file changed, 12 insertions(+), 10 deletions(-)

diff --git a/modules/services/backup/rsnapshot.nix b/modules/services/backup/rsnapshot.nix
index e0ce97257a5..178ba3ec720 100644
--- a/modules/services/backup/rsnapshot.nix
+++ b/modules/services/backup/rsnapshot.nix
@@ -42,22 +42,24 @@ in
     };
   };
 
-  config = mkIf cfg.enable {
-    environment.systemPackages = [ pkgs.rsnapshot ];
-
-    services.cron.systemCronJobs =
-      mapAttrsToList (interval: time: "${time} root ${pkgs.rsnapshot}/bin/rsnapshot ${interval}") cfg.cronIntervals;
-
-    environment.etc."rsnapshot.conf".source = with pkgs; writeText "gen-rsnapshot.conf" (''
+  config = mkIf cfg.enable (let
+    myRsnapshot = pkgs.rsnapshot.override { configFile = rsnapshotCfg; };
+    rsnapshotCfg = with pkgs; writeText "gen-rsnapshot.conf" (''
         config_version	1.2
         cmd_cp	${coreutils}/bin/cp
         cmd_rsync	${rsync}/bin/rsync
         cmd_ssh	${openssh}/bin/ssh
         cmd_logger	${inetutils}/bin/logger
         cmd_du	${coreutils}/bin/du
-        cmd_rsnapshot_diff	${rsnapshot}/bin/rsnapshot-diff
         lockfile	/run/rsnapshot.pid
 
-      '' + cfg.extraConfig);
-  };
+        ${cfg.extraConfig}
+      '');
+    in {
+      environment.systemPackages = [ myRsnapshot ];
+
+      services.cron.systemCronJobs =
+        mapAttrsToList (interval: time: "${time} root ${myRsnapshot}/bin/rsnapshot ${interval}") cfg.cronIntervals;
+    }
+  );
 }
-- 
GitLab


From 4f74888a9f8dd6310a3b5a3b00cbc5cbaa05538c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Matija=20=C5=A0uklje?= <matija@suklje.name>
Date: Sun, 6 Oct 2013 23:57:16 +0200
Subject: [PATCH 5010/5331] Eventlist: First working package 0.6.96.

Added boost as buildInputs.
Removed uneeded doCheck.
---
 pkgs/applications/office/eventlist/default.nix | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/office/eventlist/default.nix b/pkgs/applications/office/eventlist/default.nix
index 5a8d761bb50..d10133efb55 100644
--- a/pkgs/applications/office/eventlist/default.nix
+++ b/pkgs/applications/office/eventlist/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, kdelibs, kdepimlibs, akonadi, gettext }:
+{ stdenv, fetchurl, kdelibs, kdepimlibs, akonadi, gettext, boost }:
 
 stdenv.mkDerivation rec {
   name = "eventlist-0.6.96";
@@ -8,9 +8,7 @@ stdenv.mkDerivation rec {
     sha256 = "26cc7bd1c465bf1379fd0ba1fa8592eaa62f2553734d1b283e17359103908eea";
   };
 
-  doCheck = true;
-
-  buildInputs = [ kdelibs kdepimlibs akonadi gettext ];
+  buildInputs = [ kdelibs kdepimlibs akonadi gettext boost ];
 
   meta = {
     inherit (kdelibs.meta) platforms;
-- 
GitLab


From c8a9b0069fdb487d5b021de582213312612d56e0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Matija=20=C5=A0uklje?= <matija@suklje.name>
Date: Mon, 7 Oct 2013 00:26:27 +0200
Subject: [PATCH 5011/5331] Eventlist: Renamed accordingly and fixed the
 description.

---
 pkgs/applications/office/eventlist/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/office/eventlist/default.nix b/pkgs/applications/office/eventlist/default.nix
index d10133efb55..f126d6bfba6 100644
--- a/pkgs/applications/office/eventlist/default.nix
+++ b/pkgs/applications/office/eventlist/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, kdelibs, kdepimlibs, akonadi, gettext, boost }:
 
 stdenv.mkDerivation rec {
-  name = "eventlist-0.6.96";
+  name = "plasmoid-eventlist-0.6.96";
 
   src = fetchurl {
     url = "http://kde-look.org/CONTENT/content-files/107779-plasmoid-eventlist-0.6.96.tar.bz2";
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     inherit (kdelibs.meta) platforms;
-    description = "KDE Plasmoid to show events and todos on the desktop.";
+    description = "KDE Plasmoid to show events and todos on the desktop";
     longDescription = ''
       This is a plasmoid to show the events and todos from Akonadi resources (KOrganizer, Birthdays etc.).
       With a google resource also Google calendar items can be shown.
-- 
GitLab


From 1b794c098b2ab7f761b91805505e131a9ec20312 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= <viric@viric.name>
Date: Mon, 7 Oct 2013 09:31:50 +0200
Subject: [PATCH 5012/5331] filegive update to 0.7.1

---
 pkgs/tools/networking/filegive/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/networking/filegive/default.nix b/pkgs/tools/networking/filegive/default.nix
index 275c4967980..443feee2ea0 100644
--- a/pkgs/tools/networking/filegive/default.nix
+++ b/pkgs/tools/networking/filegive/default.nix
@@ -11,7 +11,7 @@ let
     sha256 = "1swwfyzaj3l40yh9np3x4fcracgs79nwryc85sxbdakx8wwxs2xb";
   };
 
-  version = "0.7";
+  version = "0.7.1";
 
 in
 stdenv.mkDerivation rec {
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
   src = fetchurl {
     url = "http://viric.name/cgi-bin/filegive/tarball/${name}.tar.gz?uuid=v${version}";
     name = "${name}.tar.gz";
-    sha256 = "0wj6vjfqfzqb75ii0djczdbcwilr05ahil5sqm65kimv11hc4j9n";
+    sha256 = "14yyif6q89ihn28kliszaf19vywjg9f7192q1ak8823da1svbq8a";
   };
 
   buildInputs = [ go ];
-- 
GitLab


From 7459f6fa38e30ebb1f040c114c98ac2b6715eed3 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sun, 6 Oct 2013 13:55:26 +0200
Subject: [PATCH 5013/5331] Disallow Memtest86+ with GRUB 1

The GRUB entry as given is syntactically invalid.
---
 modules/system/boot/loader/grub/memtest.nix | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/modules/system/boot/loader/grub/memtest.nix b/modules/system/boot/loader/grub/memtest.nix
index 006d777b120..80c1a160cfd 100644
--- a/modules/system/boot/loader/grub/memtest.nix
+++ b/modules/system/boot/loader/grub/memtest.nix
@@ -31,10 +31,7 @@ in
           }
         ''
       else
-        ''
-          menuentry "Memtest86+"
-            linux16 @bootRoot@/memtest.bin
-        '';
+        throw "Memtest86+ is not supported with GRUB 1.";
 
     boot.loader.grub.extraFiles."memtest.bin" = "${memtest86}/memtest.bin";
 
-- 
GitLab


From 8ec44f343d0d865bf0c8aad5dac4b5aec1092b0b Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 7 Oct 2013 11:05:33 +0200
Subject: [PATCH 5014/5331] Add some missing option types

---
 modules/system/boot/loader/grub/grub.nix | 20 ++++++++++++++++----
 1 file changed, 16 insertions(+), 4 deletions(-)

diff --git a/modules/system/boot/loader/grub/grub.nix b/modules/system/boot/loader/grub/grub.nix
index 85845cd2cd9..b643fa6b5bf 100644
--- a/modules/system/boot/loader/grub/grub.nix
+++ b/modules/system/boot/loader/grub/grub.nix
@@ -45,6 +45,7 @@ in
 
       enable = mkOption {
         default = true;
+        type = types.bool;
         description = ''
           Whether to enable the GNU GRUB boot loader.
         '';
@@ -53,16 +54,17 @@ in
       version = mkOption {
         default = 1;
         example = 2;
+        type = types.int;
         description = ''
-          The version of GRUB to use: <literal>1</literal> for GRUB Legacy
-          (versions 0.9x), or <literal>2</literal> for GRUB 2.
+          The version of GRUB to use: <literal>1</literal> for GRUB
+          Legacy (versions 0.9x), or <literal>2</literal> for GRUB 2.
         '';
       };
 
       device = mkOption {
         default = "";
         example = "/dev/hda";
-        type = with pkgs.lib.types; uniq string;
+        type = types.uniq types.string;
         description = ''
           The device on which the GRUB boot loader will be installed.
           The special value <literal>nodev</literal> means that a GRUB
@@ -75,7 +77,7 @@ in
       devices = mkOption {
         default = [];
         example = [ "/dev/hda" ];
-        type = with pkgs.lib.types; listOf string;
+        type = types.listOf types.string;
         description = ''
           The devices on which the boot loader, GRUB, will be
           installed. Can be used instead of <literal>device</literal> to
@@ -92,6 +94,7 @@ in
       configurationName = mkOption {
         default = "";
         example = "Stable 2.6.21";
+        type = types.uniq types.string;
         description = ''
           GRUB entry name instead of default.
         '';
@@ -99,6 +102,7 @@ in
 
       extraPrepareConfig = mkOption {
         default = "";
+        type = types.lines;
         description = ''
           Additional bash commands to be run at the script that
           prepares the grub menu entries.
@@ -108,6 +112,7 @@ in
       extraConfig = mkOption {
         default = "";
         example = "serial; terminal_output.serial";
+        type = types.lines;
         description = ''
           Additional GRUB commands inserted in the configuration file
           just before the menu entries.
@@ -117,6 +122,7 @@ in
       extraPerEntryConfig = mkOption {
         default = "";
         example = "root (hd0)";
+        type = types.lines;
         description = ''
           Additional GRUB commands inserted in the configuration file
           at the start of each NixOS menu entry.
@@ -125,6 +131,7 @@ in
 
       extraEntries = mkOption {
         default = "";
+        type = types.lines;
         example = ''
           # GRUB 1 example (not GRUB 2 compatible)
           title Windows
@@ -145,6 +152,7 @@ in
 
       extraEntriesBeforeNixOS = mkOption {
         default = false;
+        type = types.bool;
         description = ''
           Whether extraEntries are included before the default option.
         '';
@@ -184,6 +192,7 @@ in
       configurationLimit = mkOption {
         default = 100;
         example = 120;
+        type = types.int;
         description = ''
           Maximum of configurations in boot menu. GRUB has problems when
           there are too many entries.
@@ -192,6 +201,7 @@ in
 
       copyKernels = mkOption {
         default = false;
+        type = types.bool;
         description = ''
           Whether the GRUB menu builder should copy kernels and initial
           ramdisks to /boot.  This is done automatically if /boot is
@@ -201,6 +211,7 @@ in
 
       timeout = mkOption {
         default = 5;
+        type = types.int;
         description = ''
           Timeout (in seconds) until GRUB boots the default menu item.
         '';
@@ -208,6 +219,7 @@ in
 
       default = mkOption {
         default = 0;
+        type = types.int;
         description = ''
           Index of the default menu item to be booted.
         '';
-- 
GitLab


From 3ba15358bc0044c9b6ffbe981c28d7e7aaa6ba8e Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 7 Oct 2013 11:06:08 +0200
Subject: [PATCH 5015/5331] Make GRUB 2 the default

Fixes #269.
---
 modules/system/boot/loader/grub/grub.nix | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/modules/system/boot/loader/grub/grub.nix b/modules/system/boot/loader/grub/grub.nix
index b643fa6b5bf..8e9f3253f87 100644
--- a/modules/system/boot/loader/grub/grub.nix
+++ b/modules/system/boot/loader/grub/grub.nix
@@ -52,12 +52,13 @@ in
       };
 
       version = mkOption {
-        default = 1;
-        example = 2;
+        default = 2;
+        example = 1;
         type = types.int;
         description = ''
           The version of GRUB to use: <literal>1</literal> for GRUB
-          Legacy (versions 0.9x), or <literal>2</literal> for GRUB 2.
+          Legacy (versions 0.9x), or <literal>2</literal> (the
+          default) for GRUB 2.
         '';
       };
 
-- 
GitLab


From 316326e4e67102122657291bab2c6386be992dd1 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 7 Oct 2013 11:08:01 +0200
Subject: [PATCH 5016/5331] Give the VDI generator more memory

These out of memory conditions are highly unpredictable, which is very
annoying.

http://hydra.nixos.org/build/6411393
---
 modules/virtualisation/virtualbox-image.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/virtualisation/virtualbox-image.nix b/modules/virtualisation/virtualbox-image.nix
index 073db7b255e..bd14a7ffda0 100644
--- a/modules/virtualisation/virtualbox-image.nix
+++ b/modules/virtualisation/virtualbox-image.nix
@@ -6,7 +6,7 @@ with pkgs.lib;
   system.build.virtualBoxImage =
     pkgs.vmTools.runInLinuxVM (
       pkgs.runCommand "virtualbox-image"
-        { memSize = 512;
+        { memSize = 768;
           preVM =
             ''
               mkdir $out
-- 
GitLab


From a8fa59aa73ec27ddf0230435d684fdb0564f0b5e Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 7 Oct 2013 11:13:58 +0200
Subject: [PATCH 5017/5331] Amazon's pv-grub is GRUB 1

---
 modules/virtualisation/amazon-image.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/modules/virtualisation/amazon-image.nix b/modules/virtualisation/amazon-image.nix
index 11939c9ba96..7e04f0d2911 100644
--- a/modules/virtualisation/amazon-image.nix
+++ b/modules/virtualisation/amazon-image.nix
@@ -72,6 +72,7 @@ with pkgs.lib;
   boot.kernelModules = [ "xen-netfront" ];
 
   # Generate a GRUB menu.  Amazon's pv-grub uses this to boot our kernel/initrd.
+  boot.loader.grub.version = 1;
   boot.loader.grub.device = "nodev";
   boot.loader.grub.timeout = 0;
   boot.loader.grub.extraPerEntryConfig = "root (hd0)";
-- 
GitLab


From 5c17d7d2a6485e4134def39334328396c5c12424 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 7 Oct 2013 11:32:28 +0200
Subject: [PATCH 5018/5331] Lack of laziness strikes again...

---
 modules/system/boot/loader/grub/memtest.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/system/boot/loader/grub/memtest.nix b/modules/system/boot/loader/grub/memtest.nix
index 80c1a160cfd..a0726c01e20 100644
--- a/modules/system/boot/loader/grub/memtest.nix
+++ b/modules/system/boot/loader/grub/memtest.nix
@@ -23,7 +23,7 @@ in
 
   config = mkIf config.boot.loader.grub.memtest86 {
 
-    boot.loader.grub.extraEntries =
+    boot.loader.grub.extraEntries = mkFixStrictness (
       if config.boot.loader.grub.version == 2 then
         ''
           menuentry "Memtest86+" {
@@ -31,7 +31,7 @@ in
           }
         ''
       else
-        throw "Memtest86+ is not supported with GRUB 1.";
+        throw "Memtest86+ is not supported with GRUB 1.");
 
     boot.loader.grub.extraFiles."memtest.bin" = "${memtest86}/memtest.bin";
 
-- 
GitLab


From c8b16f172a01baad400aa7a738b14f8483302b87 Mon Sep 17 00:00:00 2001
From: Moritz Ulrich <moritz@tarn-vedra.de>
Date: Mon, 7 Oct 2013 13:24:54 +0200
Subject: [PATCH 5019/5331] weechat: 0.4.2 and fix segfault on /exit.

Signed-off-by: Moritz Ulrich <moritz@tarn-vedra.de>
---
 pkgs/applications/networking/irc/weechat/default.nix | 11 +++++------
 pkgs/top-level/all-packages.nix                      |  5 ++++-
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/pkgs/applications/networking/irc/weechat/default.nix b/pkgs/applications/networking/irc/weechat/default.nix
index a523089e0ed..01ba8c97d98 100644
--- a/pkgs/applications/networking/irc/weechat/default.nix
+++ b/pkgs/applications/networking/irc/weechat/default.nix
@@ -3,12 +3,12 @@
 , pythonPackages, cacert, cmake, makeWrapper }:
 
 stdenv.mkDerivation rec {
-  version = "0.4.1";
+  version = "0.4.2";
   name = "weechat-${version}";
 
   src = fetchurl {
     url = "http://weechat.org/files/src/${name}.tar.gz";
-    sha256 = "0gsn0mp921j7jpvrxc74h0gs0bn0w808j2zqghm1w7xbjw9hl49w";
+    sha256 = "03ypji34kb5yrxqyn8dbrjm3j00pc8v7wfsip7d3l63nyx79df9v";
   };
 
   buildInputs = 
@@ -18,17 +18,16 @@ stdenv.mkDerivation rec {
     ];
 
   postInstall = ''
-       wrapProgram "$out/bin/weechat-curses" \
+       wrapProgram "$out/bin/weechat" \
          --prefix PYTHONPATH : "$PYTHONPATH" \
          --prefix PYTHONPATH : "$out/lib/${python.libPrefix}/site-packages"
   '';
 
   meta = {
-    homepage = http://http://www.weechat.org/;
+    homepage = http://www.weechat.org/;
     description = "A fast, light and extensible chat client";
     license = stdenv.lib.licenses.gpl3;
-    maintainers = [ stdenv.lib.maintainers.garbas ];
+    maintainers = with stdenv.lib.maintainers; [ garbas the-kenny ];
     platforms = stdenv.lib.platforms.linux;
   };
 }
-
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e8d9a73ed9d..99229cdda93 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8826,7 +8826,10 @@ let
     graphicsSupport = false;
   };
 
-  weechat = callPackage ../applications/networking/irc/weechat { };
+  weechat = callPackage ../applications/networking/irc/weechat {
+    # weechat crashes on /exit when using gnutls 3.1.x. gnutls2 works.
+    gnutls = gnutls2;
+  };
 
   weston = callPackage ../applications/window-managers/weston {
     cairo = cairo.override {
-- 
GitLab


From 3ee5c50cdaf55a81436695643c1cd39b61452c93 Mon Sep 17 00:00:00 2001
From: Moritz Ulrich <moritz@tarn-vedra.de>
Date: Mon, 7 Oct 2013 13:44:19 +0200
Subject: [PATCH 5020/5331] Add gnutls 3.2.4 (as pkgs.gnutls32) & make weechat
 use it.

Signed-off-by: Moritz Ulrich <moritz@tarn-vedra.de>
---
 pkgs/development/libraries/gnutls/3.2.nix | 73 +++++++++++++++++++++++
 pkgs/top-level/all-packages.nix           |  8 ++-
 2 files changed, 79 insertions(+), 2 deletions(-)
 create mode 100644 pkgs/development/libraries/gnutls/3.2.nix

diff --git a/pkgs/development/libraries/gnutls/3.2.nix b/pkgs/development/libraries/gnutls/3.2.nix
new file mode 100644
index 00000000000..5a5b6aa94e2
--- /dev/null
+++ b/pkgs/development/libraries/gnutls/3.2.nix
@@ -0,0 +1,73 @@
+{ fetchurl, stdenv, zlib, lzo, libtasn1, nettle, pkgconfig, lzip
+, guileBindings, guile, perl, gmp }:
+
+assert guileBindings -> guile != null;
+
+stdenv.mkDerivation (rec {
+
+  name = "gnutls-3.2.4";
+
+  src = fetchurl {
+    url = "ftp://ftp.gnutls.org/gcrypt/gnutls/v3.2/${name}.tar.lz";
+    sha256 = "0zl4h37g51xyaalv3qp2hvn1m6z7xzfw4yvpvi6mby4x5sqrrp8i";
+  };
+
+  # Note: GMP is a dependency of Nettle, whose public headers include
+  # GMP headers, hence the hack.
+  configurePhase = ''
+    ./configure --prefix="$out"                                 \
+      --disable-dependency-tracking --enable-fast-install       \
+      --without-p11-kit                                         \
+      --with-lzo --with-libtasn1-prefix="${libtasn1}"           \
+      --with-libnettle-prefix="${nettle}"                       \
+      CPPFLAGS="-I${gmp}/include"                               \
+      ${if guileBindings
+        then "--enable-guile --with-guile-site-dir=\"$out/share/guile/site\""
+        else ""}
+  '';
+
+  # Build of the Guile bindings is not parallel-safe.  See
+  # <http://git.savannah.gnu.org/cgit/gnutls.git/commit/?id=330995a920037b6030ec0282b51dde3f8b493cad>
+  # for the actual fix.
+  enableParallelBuilding = false;
+
+  buildInputs = [ zlib lzo lzip ]
+    ++ stdenv.lib.optional guileBindings guile;
+
+  nativeBuildInputs = [ perl pkgconfig ];
+
+  propagatedBuildInputs = [ nettle libtasn1 ];
+
+  # XXX: Gnulib's `test-select' fails on FreeBSD:
+  # http://hydra.nixos.org/build/2962084/nixlog/1/raw .
+  doCheck = (!stdenv.isFreeBSD && !stdenv.isDarwin);
+
+  meta = with stdenv.lib; {
+    description = "The GNU Transport Layer Security Library";
+
+    longDescription = ''
+       GnuTLS is a project that aims to develop a library which
+       provides a secure layer, over a reliable transport
+       layer. Currently the GnuTLS library implements the proposed
+       standards by the IETF's TLS working group.
+
+       Quoting from the TLS protocol specification:
+
+       "The TLS protocol provides communications privacy over the
+       Internet. The protocol allows client/server applications to
+       communicate in a way that is designed to prevent eavesdropping,
+       tampering, or message forgery."
+    '';
+
+    homepage = http://www.gnu.org/software/gnutls/;
+    license = "LGPLv2.1+";
+    maintainers = [ ];
+  };
+}
+
+//
+
+(stdenv.lib.optionalAttrs stdenv.isFreeBSD {
+  # FreeBSD doesn't have <alloca.h>, and Gnulib's `alloca' module isn't used.
+  patches = [ ./guile-gnulib-includes.patch ];
+}))
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 99229cdda93..3fe6e56bdb7 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4330,6 +4330,10 @@ let
     guileBindings = config.gnutls.guile or true;
   };
 
+  gnutls32 = callPackage ../development/libraries/gnutls/3.2.nix {
+    guileBindings = config.gnutls.guile or true;
+  };
+
   gnutls_without_guile = lowPrio (gnutls.override { guileBindings = false; });
   gnutls2_without_guile = lowPrio (gnutls2.override { guileBindings = false; });
 
@@ -8827,8 +8831,8 @@ let
   };
 
   weechat = callPackage ../applications/networking/irc/weechat {
-    # weechat crashes on /exit when using gnutls 3.1.x. gnutls2 works.
-    gnutls = gnutls2;
+    # weechat crashes on /exit when using gnutls 3.1.x. gnutls 3.2.x works.
+    gnutls = gnutls32;
   };
 
   weston = callPackage ../applications/window-managers/weston {
-- 
GitLab


From db091a66621fcb4a93760c8ad8e58f61cd482836 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 7 Oct 2013 17:11:22 +0200
Subject: [PATCH 5021/5331] quassel: Fix evaluation on non-Linux platforms

---
 pkgs/applications/networking/irc/quassel/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/networking/irc/quassel/default.nix b/pkgs/applications/networking/irc/quassel/default.nix
index f7dc270251c..67ff1ca02c4 100644
--- a/pkgs/applications/networking/irc/quassel/default.nix
+++ b/pkgs/applications/networking/irc/quassel/default.nix
@@ -1,7 +1,7 @@
 { monolithic ? true # build monolithic Quassel
 , daemon ? false # build Quassel daemon
 , client ? false # build Quassel client
-, withKDE ? true # enable KDE integration
+, withKDE ? stdenv.isLinux # enable KDE integration
 , ssl ? true # enable SSL support
 , previews ? false # enable webpage previews on hovering over URLs
 , stdenv, fetchurl, cmake, qt4, kdelibs, automoc4, phonon }:
-- 
GitLab


From 9faba5f073211f3ebc47fd896f0c27e0c4c7b597 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 7 Oct 2013 17:12:50 +0200
Subject: [PATCH 5022/5331] Remove KDE 4.8

4.10 has been the default for a while.
---
 pkgs/desktops/kde-4.8/default.nix             |  60 ---
 .../files/kde-wallpapers-buildsystem.patch    |  17 -
 .../kde-4.8/files/polkit-install.patch        |  12 -
 pkgs/desktops/kde-4.8/kactivities.nix         |   9 -
 pkgs/desktops/kde-4.8/kde-baseapps/kate.nix   |  10 -
 .../kde-4.8/kde-baseapps/kde-baseapps.nix     |  10 -
 .../desktops/kde-4.8/kde-baseapps/konsole.nix |  11 -
 pkgs/desktops/kde-4.8/kde-package/4.8.4.nix   | 299 ------------
 pkgs/desktops/kde-4.8/kde-package/default.nix | 128 -----
 .../kde-4.8/kde-package/kde-manifest.sh       | 146 ------
 .../kde-4.8/kde-package/kde-submodules.xslt   |  22 -
 pkgs/desktops/kde-4.8/kde-runtime.nix         |  19 -
 pkgs/desktops/kde-4.8/kde-wallpapers.nix      |  17 -
 pkgs/desktops/kde-4.8/kde-workspace.nix       |  37 --
 .../kde-4.8/kdeaccessibility/jovie.nix        |   9 -
 .../kde-4.8/kdeaccessibility/kaccessible.nix  |   9 -
 .../kde-4.8/kdeaccessibility/kmag.nix         |   9 -
 .../kde-4.8/kdeaccessibility/kmousetool.nix   |   9 -
 .../kde-4.8/kdeaccessibility/kmouth.nix       |   9 -
 pkgs/desktops/kde-4.8/kdeadmin/kcron.nix      |   5 -
 pkgs/desktops/kde-4.8/kdeadmin/ksystemlog.nix |   5 -
 pkgs/desktops/kde-4.8/kdeadmin/kuser.nix      |   5 -
 .../kdeadmin/system-config-printer-kde.nix    |  33 --
 .../kde-4.8/kdeartwork/ColorSchemes.nix       |  11 -
 .../kde-4.8/kdeartwork/FindXscreensaver.cmake |  73 ---
 .../kdeartwork/HighResolutionWallpapers.nix   |  11 -
 .../kde-4.8/kdeartwork/IconThemes.nix         |  13 -
 .../kde-4.8/kdeartwork/WeatherWallpapers.nix  |  11 -
 pkgs/desktops/kde-4.8/kdeartwork/aurorae.nix  |   7 -
 .../kde-4.8/kdeartwork/desktopthemes.nix      |  11 -
 .../desktops/kde-4.8/kdeartwork/emoticons.nix |  11 -
 .../kde-4.8/kdeartwork/kscreensaver.nix       |  15 -
 .../kde-4.8/kdeartwork/kwin-styles.nix        |   9 -
 pkgs/desktops/kde-4.8/kdeartwork/sounds.nix   |  11 -
 pkgs/desktops/kde-4.8/kdeartwork/styles.nix   |  11 -
 .../kde-4.8/kdeartwork/wallpapers.nix         |  11 -
 .../kdebindings/perlqt-include-smokeqt.patch  |  19 -
 .../perlqt-rewrite-FindPerlMore.patch         | 118 -----
 .../perlqt-use-site-arch-install-dir.patch    | 454 ------------------
 pkgs/desktops/kde-4.8/kdebindings/perlqt.nix  |  16 -
 .../pykde4-hardcode-lib-python.patch          |  18 -
 .../kde-4.8/kdebindings/pykde4-new-sip.patch  |  91 ----
 pkgs/desktops/kde-4.8/kdebindings/pykde4.nix  |  29 --
 .../kdebindings/qtruby-include-smokeqt.patch  |  13 -
 .../kdebindings/qtruby-install-prefix.patch   |  15 -
 pkgs/desktops/kde-4.8/kdebindings/qtruby.nix  |  16 -
 .../kde-4.8/kdebindings/smokegen-nix.patch    |  46 --
 .../desktops/kde-4.8/kdebindings/smokegen.nix |  13 -
 .../desktops/kde-4.8/kdebindings/smokekde.nix |  12 -
 pkgs/desktops/kde-4.8/kdebindings/smokeqt.nix |  12 -
 pkgs/desktops/kde-4.8/kdeedu/analitza.nix     |   8 -
 pkgs/desktops/kde-4.8/kdeedu/blinken.nix      |   8 -
 pkgs/desktops/kde-4.8/kdeedu/cantor.nix       |   8 -
 pkgs/desktops/kde-4.8/kdeedu/kalgebra.nix     |   8 -
 pkgs/desktops/kde-4.8/kdeedu/kalzium.nix      |   8 -
 pkgs/desktops/kde-4.8/kdeedu/kanagram.nix     |   8 -
 pkgs/desktops/kde-4.8/kdeedu/kbruch.nix       |   8 -
 pkgs/desktops/kde-4.8/kdeedu/kgeography.nix   |   8 -
 pkgs/desktops/kde-4.8/kdeedu/khangman.nix     |   8 -
 pkgs/desktops/kde-4.8/kdeedu/kig.nix          |  12 -
 pkgs/desktops/kde-4.8/kdeedu/kiten.nix        |   9 -
 pkgs/desktops/kde-4.8/kdeedu/klettres.nix     |   9 -
 pkgs/desktops/kde-4.8/kdeedu/kmplot.nix       |  12 -
 pkgs/desktops/kde-4.8/kdeedu/kstars.nix       |   9 -
 pkgs/desktops/kde-4.8/kdeedu/ktouch.nix       |   9 -
 pkgs/desktops/kde-4.8/kdeedu/kturtle.nix      |   9 -
 pkgs/desktops/kde-4.8/kdeedu/kwordquiz.nix    |   9 -
 pkgs/desktops/kde-4.8/kdeedu/libkdeedu.nix    |   8 -
 pkgs/desktops/kde-4.8/kdeedu/marble.nix       |   9 -
 pkgs/desktops/kde-4.8/kdeedu/parley.nix       |   9 -
 pkgs/desktops/kde-4.8/kdeedu/rocs.nix         |  14 -
 pkgs/desktops/kde-4.8/kdeedu/step.nix         |  12 -
 pkgs/desktops/kde-4.8/kdegames.nix            |  20 -
 .../desktops/kde-4.8/kdegraphics/gwenview.nix |  15 -
 pkgs/desktops/kde-4.8/kdegraphics/kamera.nix  |  10 -
 .../kde-4.8/kdegraphics/kcolorchooser.nix     |  10 -
 .../kdegraphics/kdegraphics-mobipocket.nix    |  10 -
 .../kdegraphics-strigi-analyzer.nix           |  10 -
 .../kdegraphics/kdegraphics-thumbnailers.nix  |  10 -
 pkgs/desktops/kde-4.8/kdegraphics/kgamma.nix  |  10 -
 .../kde-4.8/kdegraphics/kolourpaint.nix       |  10 -
 pkgs/desktops/kde-4.8/kdegraphics/kruler.nix  |  10 -
 .../kde-4.8/kdegraphics/ksaneplugin.nix       |  10 -
 .../kde-4.8/kdegraphics/ksnapshot.nix         |  10 -
 .../kde-4.8/kdegraphics/libkdcraw.nix         |  10 -
 .../kde-4.8/kdegraphics/libkexiv2.nix         |  10 -
 pkgs/desktops/kde-4.8/kdegraphics/libkipi.nix |  10 -
 .../desktops/kde-4.8/kdegraphics/libksane.nix |  10 -
 pkgs/desktops/kde-4.8/kdegraphics/okular.nix  |  12 -
 pkgs/desktops/kde-4.8/kdegraphics/svgpart.nix |  10 -
 pkgs/desktops/kde-4.8/kdelibs.nix             |  38 --
 pkgs/desktops/kde-4.8/kdemultimedia.nix       |  15 -
 .../kde-4.8/kdenetwork/FindmsiLBC.cmake       |  19 -
 .../kde-4.8/kdenetwork/filesharing.nix        |   7 -
 .../kde-4.8/kdenetwork/kdenetwork.patch       |  24 -
 pkgs/desktops/kde-4.8/kdenetwork/kdnssd.nix   |   7 -
 .../kde-4.8/kdenetwork/kfile-plugins.nix      |  11 -
 pkgs/desktops/kde-4.8/kdenetwork/kget.nix     |  13 -
 pkgs/desktops/kde-4.8/kdenetwork/kopete.nix   |  24 -
 pkgs/desktops/kde-4.8/kdenetwork/kppp.nix     |   7 -
 pkgs/desktops/kde-4.8/kdenetwork/krdc.nix     |   7 -
 pkgs/desktops/kde-4.8/kdenetwork/krfb.nix     |   7 -
 pkgs/desktops/kde-4.8/kdepim-runtime.nix      |  12 -
 pkgs/desktops/kde-4.8/kdepim.nix              |  21 -
 pkgs/desktops/kde-4.8/kdepimlibs.nix          |  16 -
 pkgs/desktops/kde-4.8/kdeplasma-addons.nix    |  20 -
 pkgs/desktops/kde-4.8/kdesdk/cervisia.nix     |   9 -
 .../kde-4.8/kdesdk/dolphin-plugins-bazaar.nix |  10 -
 .../kde-4.8/kdesdk/dolphin-plugins-git.nix    |  10 -
 .../kde-4.8/kdesdk/dolphin-plugins-hg.nix     |  10 -
 .../kde-4.8/kdesdk/dolphin-plugins-svn.nix    |  10 -
 pkgs/desktops/kde-4.8/kdesdk/find-svn.patch   |  57 ---
 pkgs/desktops/kde-4.8/kdesdk/kapptemplate.nix |   9 -
 pkgs/desktops/kde-4.8/kdesdk/kcachegrind.nix  |   9 -
 .../kde-4.8/kdesdk/kdeaccounts-plugin.nix     |   9 -
 .../kde-4.8/kdesdk/kioslave-perldoc.nix       |  11 -
 pkgs/desktops/kde-4.8/kdesdk/kioslave-svn.nix |  11 -
 pkgs/desktops/kde-4.8/kdesdk/kmtrace.nix      |  11 -
 pkgs/desktops/kde-4.8/kdesdk/kompare.nix      |   9 -
 pkgs/desktops/kde-4.8/kdesdk/kpartloader.nix  |   9 -
 .../kde-4.8/kdesdk/kprofilemethod.nix         |   9 -
 pkgs/desktops/kde-4.8/kdesdk/kstartperf.nix   |   9 -
 pkgs/desktops/kde-4.8/kdesdk/kuiviewer.nix    |   9 -
 pkgs/desktops/kde-4.8/kdesdk/lokalize.nix     |  13 -
 pkgs/desktops/kde-4.8/kdesdk/okteta.nix       |  13 -
 pkgs/desktops/kde-4.8/kdesdk/poxml.nix        |   9 -
 pkgs/desktops/kde-4.8/kdesdk/scripts.nix      |   9 -
 .../kde-4.8/kdesdk/strigi-analyzer.nix        |  13 -
 pkgs/desktops/kde-4.8/kdesdk/umbrello.nix     |   9 -
 pkgs/desktops/kde-4.8/kdetoys/amor.nix        |   9 -
 pkgs/desktops/kde-4.8/kdetoys/kteatime.nix    |   9 -
 pkgs/desktops/kde-4.8/kdetoys/ktux.nix        |   9 -
 pkgs/desktops/kde-4.8/kdeutils/ark.nix        |   9 -
 pkgs/desktops/kde-4.8/kdeutils/filelight.nix  |   9 -
 pkgs/desktops/kde-4.8/kdeutils/kcalc.nix      |   9 -
 .../desktops/kde-4.8/kdeutils/kcharselect.nix |   9 -
 pkgs/desktops/kde-4.8/kdeutils/kdf.nix        |   9 -
 pkgs/desktops/kde-4.8/kdeutils/kfloppy.nix    |   9 -
 pkgs/desktops/kde-4.8/kdeutils/kgpg.nix       |   9 -
 .../kde-4.8/kdeutils/kremotecontrol.nix       |   9 -
 pkgs/desktops/kde-4.8/kdeutils/ktimer.nix     |   9 -
 pkgs/desktops/kde-4.8/kdeutils/kwallet.nix    |   9 -
 .../kde-4.8/kdeutils/printer-applet.nix       |  28 --
 .../kde-4.8/kdeutils/superkaramba.nix         |  11 -
 pkgs/desktops/kde-4.8/kdeutils/sweeper.nix    |   9 -
 .../kde-4.8/kdewebdev/kfilereplace.nix        |  10 -
 .../kde-4.8/kdewebdev/kimagemapeditor.nix     |  10 -
 .../kde-4.8/kdewebdev/klinkstatus.nix         |  12 -
 pkgs/desktops/kde-4.8/kdewebdev/kommander.nix |   9 -
 pkgs/desktops/kde-4.8/l10n/default.nix        |  45 --
 pkgs/desktops/kde-4.8/l10n/l10n-manifest.sh   |  32 --
 pkgs/desktops/kde-4.8/l10n/manifest-4.8.4.nix | 277 -----------
 pkgs/desktops/kde-4.8/oxygen-icons.nix        |  15 -
 .../kde-4.8/support/akonadi/default.nix       |  24 -
 pkgs/top-level/all-packages.nix               |   8 -
 155 files changed, 3498 deletions(-)
 delete mode 100644 pkgs/desktops/kde-4.8/default.nix
 delete mode 100644 pkgs/desktops/kde-4.8/files/kde-wallpapers-buildsystem.patch
 delete mode 100644 pkgs/desktops/kde-4.8/files/polkit-install.patch
 delete mode 100644 pkgs/desktops/kde-4.8/kactivities.nix
 delete mode 100644 pkgs/desktops/kde-4.8/kde-baseapps/kate.nix
 delete mode 100644 pkgs/desktops/kde-4.8/kde-baseapps/kde-baseapps.nix
 delete mode 100644 pkgs/desktops/kde-4.8/kde-baseapps/konsole.nix
 delete mode 100644 pkgs/desktops/kde-4.8/kde-package/4.8.4.nix
 delete mode 100644 pkgs/desktops/kde-4.8/kde-package/default.nix
 delete mode 100755 pkgs/desktops/kde-4.8/kde-package/kde-manifest.sh
 delete mode 100644 pkgs/desktops/kde-4.8/kde-package/kde-submodules.xslt
 delete mode 100644 pkgs/desktops/kde-4.8/kde-runtime.nix
 delete mode 100644 pkgs/desktops/kde-4.8/kde-wallpapers.nix
 delete mode 100644 pkgs/desktops/kde-4.8/kde-workspace.nix
 delete mode 100644 pkgs/desktops/kde-4.8/kdeaccessibility/jovie.nix
 delete mode 100644 pkgs/desktops/kde-4.8/kdeaccessibility/kaccessible.nix
 delete mode 100644 pkgs/desktops/kde-4.8/kdeaccessibility/kmag.nix
 delete mode 100644 pkgs/desktops/kde-4.8/kdeaccessibility/kmousetool.nix
 delete mode 100644 pkgs/desktops/kde-4.8/kdeaccessibility/kmouth.nix
 delete mode 100644 pkgs/desktops/kde-4.8/kdeadmin/kcron.nix
 delete mode 100644 pkgs/desktops/kde-4.8/kdeadmin/ksystemlog.nix
 delete mode 100644 pkgs/desktops/kde-4.8/kdeadmin/kuser.nix
 delete mode 100644 pkgs/desktops/kde-4.8/kdeadmin/system-config-printer-kde.nix
 delete mode 100644 pkgs/desktops/kde-4.8/kdeartwork/ColorSchemes.nix
 delete mode 100644 pkgs/desktops/kde-4.8/kdeartwork/FindXscreensaver.cmake
 delete mode 100644 pkgs/desktops/kde-4.8/kdeartwork/HighResolutionWallpapers.nix
 delete mode 100644 pkgs/desktops/kde-4.8/kdeartwork/IconThemes.nix
 delete mode 100644 pkgs/desktops/kde-4.8/kdeartwork/WeatherWallpapers.nix
 delete mode 100644 pkgs/desktops/kde-4.8/kdeartwork/aurorae.nix
 delete mode 100644 pkgs/desktops/kde-4.8/kdeartwork/desktopthemes.nix
 delete mode 100644 pkgs/desktops/kde-4.8/kdeartwork/emoticons.nix
 delete mode 100644 pkgs/desktops/kde-4.8/kdeartwork/kscreensaver.nix
 delete mode 100644 pkgs/desktops/kde-4.8/kdeartwork/kwin-styles.nix
 delete mode 100644 pkgs/desktops/kde-4.8/kdeartwork/sounds.nix
 delete mode 100644 pkgs/desktops/kde-4.8/kdeartwork/styles.nix
 delete mode 100644 pkgs/desktops/kde-4.8/kdeartwork/wallpapers.nix
 delete mode 100644 pkgs/desktops/kde-4.8/kdebindings/perlqt-include-smokeqt.patch
 delete mode 100644 pkgs/desktops/kde-4.8/kdebindings/perlqt-rewrite-FindPerlMore.patch
 delete mode 100644 pkgs/desktops/kde-4.8/kdebindings/perlqt-use-site-arch-install-dir.patch
 delete mode 100644 pkgs/desktops/kde-4.8/kdebindings/perlqt.nix
 delete mode 100644 pkgs/desktops/kde-4.8/kdebindings/pykde4-hardcode-lib-python.patch
 delete mode 100644 pkgs/desktops/kde-4.8/kdebindings/pykde4-new-sip.patch
 delete mode 100644 pkgs/desktops/kde-4.8/kdebindings/pykde4.nix
 delete mode 100644 pkgs/desktops/kde-4.8/kdebindings/qtruby-include-smokeqt.patch
 delete mode 100644 pkgs/desktops/kde-4.8/kdebindings/qtruby-install-prefix.patch
 delete mode 100644 pkgs/desktops/kde-4.8/kdebindings/qtruby.nix
 delete mode 100644 pkgs/desktops/kde-4.8/kdebindings/smokegen-nix.patch
 delete mode 100644 pkgs/desktops/kde-4.8/kdebindings/smokegen.nix
 delete mode 100644 pkgs/desktops/kde-4.8/kdebindings/smokekde.nix
 delete mode 100644 pkgs/desktops/kde-4.8/kdebindings/smokeqt.nix
 delete mode 100644 pkgs/desktops/kde-4.8/kdeedu/analitza.nix
 delete mode 100644 pkgs/desktops/kde-4.8/kdeedu/blinken.nix
 delete mode 100644 pkgs/desktops/kde-4.8/kdeedu/cantor.nix
 delete mode 100644 pkgs/desktops/kde-4.8/kdeedu/kalgebra.nix
 delete mode 100644 pkgs/desktops/kde-4.8/kdeedu/kalzium.nix
 delete mode 100644 pkgs/desktops/kde-4.8/kdeedu/kanagram.nix
 delete mode 100644 pkgs/desktops/kde-4.8/kdeedu/kbruch.nix
 delete mode 100644 pkgs/desktops/kde-4.8/kdeedu/kgeography.nix
 delete mode 100644 pkgs/desktops/kde-4.8/kdeedu/khangman.nix
 delete mode 100644 pkgs/desktops/kde-4.8/kdeedu/kig.nix
 delete mode 100644 pkgs/desktops/kde-4.8/kdeedu/kiten.nix
 delete mode 100644 pkgs/desktops/kde-4.8/kdeedu/klettres.nix
 delete mode 100644 pkgs/desktops/kde-4.8/kdeedu/kmplot.nix
 delete mode 100644 pkgs/desktops/kde-4.8/kdeedu/kstars.nix
 delete mode 100644 pkgs/desktops/kde-4.8/kdeedu/ktouch.nix
 delete mode 100644 pkgs/desktops/kde-4.8/kdeedu/kturtle.nix
 delete mode 100644 pkgs/desktops/kde-4.8/kdeedu/kwordquiz.nix
 delete mode 100644 pkgs/desktops/kde-4.8/kdeedu/libkdeedu.nix
 delete mode 100644 pkgs/desktops/kde-4.8/kdeedu/marble.nix
 delete mode 100644 pkgs/desktops/kde-4.8/kdeedu/parley.nix
 delete mode 100644 pkgs/desktops/kde-4.8/kdeedu/rocs.nix
 delete mode 100644 pkgs/desktops/kde-4.8/kdeedu/step.nix
 delete mode 100644 pkgs/desktops/kde-4.8/kdegames.nix
 delete mode 100644 pkgs/desktops/kde-4.8/kdegraphics/gwenview.nix
 delete mode 100644 pkgs/desktops/kde-4.8/kdegraphics/kamera.nix
 delete mode 100644 pkgs/desktops/kde-4.8/kdegraphics/kcolorchooser.nix
 delete mode 100644 pkgs/desktops/kde-4.8/kdegraphics/kdegraphics-mobipocket.nix
 delete mode 100644 pkgs/desktops/kde-4.8/kdegraphics/kdegraphics-strigi-analyzer.nix
 delete mode 100644 pkgs/desktops/kde-4.8/kdegraphics/kdegraphics-thumbnailers.nix
 delete mode 100644 pkgs/desktops/kde-4.8/kdegraphics/kgamma.nix
 delete mode 100644 pkgs/desktops/kde-4.8/kdegraphics/kolourpaint.nix
 delete mode 100644 pkgs/desktops/kde-4.8/kdegraphics/kruler.nix
 delete mode 100644 pkgs/desktops/kde-4.8/kdegraphics/ksaneplugin.nix
 delete mode 100644 pkgs/desktops/kde-4.8/kdegraphics/ksnapshot.nix
 delete mode 100644 pkgs/desktops/kde-4.8/kdegraphics/libkdcraw.nix
 delete mode 100644 pkgs/desktops/kde-4.8/kdegraphics/libkexiv2.nix
 delete mode 100644 pkgs/desktops/kde-4.8/kdegraphics/libkipi.nix
 delete mode 100644 pkgs/desktops/kde-4.8/kdegraphics/libksane.nix
 delete mode 100644 pkgs/desktops/kde-4.8/kdegraphics/okular.nix
 delete mode 100644 pkgs/desktops/kde-4.8/kdegraphics/svgpart.nix
 delete mode 100644 pkgs/desktops/kde-4.8/kdelibs.nix
 delete mode 100644 pkgs/desktops/kde-4.8/kdemultimedia.nix
 delete mode 100644 pkgs/desktops/kde-4.8/kdenetwork/FindmsiLBC.cmake
 delete mode 100644 pkgs/desktops/kde-4.8/kdenetwork/filesharing.nix
 delete mode 100644 pkgs/desktops/kde-4.8/kdenetwork/kdenetwork.patch
 delete mode 100644 pkgs/desktops/kde-4.8/kdenetwork/kdnssd.nix
 delete mode 100644 pkgs/desktops/kde-4.8/kdenetwork/kfile-plugins.nix
 delete mode 100644 pkgs/desktops/kde-4.8/kdenetwork/kget.nix
 delete mode 100644 pkgs/desktops/kde-4.8/kdenetwork/kopete.nix
 delete mode 100644 pkgs/desktops/kde-4.8/kdenetwork/kppp.nix
 delete mode 100644 pkgs/desktops/kde-4.8/kdenetwork/krdc.nix
 delete mode 100644 pkgs/desktops/kde-4.8/kdenetwork/krfb.nix
 delete mode 100644 pkgs/desktops/kde-4.8/kdepim-runtime.nix
 delete mode 100644 pkgs/desktops/kde-4.8/kdepim.nix
 delete mode 100644 pkgs/desktops/kde-4.8/kdepimlibs.nix
 delete mode 100644 pkgs/desktops/kde-4.8/kdeplasma-addons.nix
 delete mode 100644 pkgs/desktops/kde-4.8/kdesdk/cervisia.nix
 delete mode 100644 pkgs/desktops/kde-4.8/kdesdk/dolphin-plugins-bazaar.nix
 delete mode 100644 pkgs/desktops/kde-4.8/kdesdk/dolphin-plugins-git.nix
 delete mode 100644 pkgs/desktops/kde-4.8/kdesdk/dolphin-plugins-hg.nix
 delete mode 100644 pkgs/desktops/kde-4.8/kdesdk/dolphin-plugins-svn.nix
 delete mode 100644 pkgs/desktops/kde-4.8/kdesdk/find-svn.patch
 delete mode 100644 pkgs/desktops/kde-4.8/kdesdk/kapptemplate.nix
 delete mode 100644 pkgs/desktops/kde-4.8/kdesdk/kcachegrind.nix
 delete mode 100644 pkgs/desktops/kde-4.8/kdesdk/kdeaccounts-plugin.nix
 delete mode 100644 pkgs/desktops/kde-4.8/kdesdk/kioslave-perldoc.nix
 delete mode 100644 pkgs/desktops/kde-4.8/kdesdk/kioslave-svn.nix
 delete mode 100644 pkgs/desktops/kde-4.8/kdesdk/kmtrace.nix
 delete mode 100644 pkgs/desktops/kde-4.8/kdesdk/kompare.nix
 delete mode 100644 pkgs/desktops/kde-4.8/kdesdk/kpartloader.nix
 delete mode 100644 pkgs/desktops/kde-4.8/kdesdk/kprofilemethod.nix
 delete mode 100644 pkgs/desktops/kde-4.8/kdesdk/kstartperf.nix
 delete mode 100644 pkgs/desktops/kde-4.8/kdesdk/kuiviewer.nix
 delete mode 100644 pkgs/desktops/kde-4.8/kdesdk/lokalize.nix
 delete mode 100644 pkgs/desktops/kde-4.8/kdesdk/okteta.nix
 delete mode 100644 pkgs/desktops/kde-4.8/kdesdk/poxml.nix
 delete mode 100644 pkgs/desktops/kde-4.8/kdesdk/scripts.nix
 delete mode 100644 pkgs/desktops/kde-4.8/kdesdk/strigi-analyzer.nix
 delete mode 100644 pkgs/desktops/kde-4.8/kdesdk/umbrello.nix
 delete mode 100644 pkgs/desktops/kde-4.8/kdetoys/amor.nix
 delete mode 100644 pkgs/desktops/kde-4.8/kdetoys/kteatime.nix
 delete mode 100644 pkgs/desktops/kde-4.8/kdetoys/ktux.nix
 delete mode 100644 pkgs/desktops/kde-4.8/kdeutils/ark.nix
 delete mode 100644 pkgs/desktops/kde-4.8/kdeutils/filelight.nix
 delete mode 100644 pkgs/desktops/kde-4.8/kdeutils/kcalc.nix
 delete mode 100644 pkgs/desktops/kde-4.8/kdeutils/kcharselect.nix
 delete mode 100644 pkgs/desktops/kde-4.8/kdeutils/kdf.nix
 delete mode 100644 pkgs/desktops/kde-4.8/kdeutils/kfloppy.nix
 delete mode 100644 pkgs/desktops/kde-4.8/kdeutils/kgpg.nix
 delete mode 100644 pkgs/desktops/kde-4.8/kdeutils/kremotecontrol.nix
 delete mode 100644 pkgs/desktops/kde-4.8/kdeutils/ktimer.nix
 delete mode 100644 pkgs/desktops/kde-4.8/kdeutils/kwallet.nix
 delete mode 100644 pkgs/desktops/kde-4.8/kdeutils/printer-applet.nix
 delete mode 100644 pkgs/desktops/kde-4.8/kdeutils/superkaramba.nix
 delete mode 100644 pkgs/desktops/kde-4.8/kdeutils/sweeper.nix
 delete mode 100644 pkgs/desktops/kde-4.8/kdewebdev/kfilereplace.nix
 delete mode 100644 pkgs/desktops/kde-4.8/kdewebdev/kimagemapeditor.nix
 delete mode 100644 pkgs/desktops/kde-4.8/kdewebdev/klinkstatus.nix
 delete mode 100644 pkgs/desktops/kde-4.8/kdewebdev/kommander.nix
 delete mode 100644 pkgs/desktops/kde-4.8/l10n/default.nix
 delete mode 100755 pkgs/desktops/kde-4.8/l10n/l10n-manifest.sh
 delete mode 100644 pkgs/desktops/kde-4.8/l10n/manifest-4.8.4.nix
 delete mode 100644 pkgs/desktops/kde-4.8/oxygen-icons.nix
 delete mode 100644 pkgs/desktops/kde-4.8/support/akonadi/default.nix

diff --git a/pkgs/desktops/kde-4.8/default.nix b/pkgs/desktops/kde-4.8/default.nix
deleted file mode 100644
index b77a9e4bfec..00000000000
--- a/pkgs/desktops/kde-4.8/default.nix
+++ /dev/null
@@ -1,60 +0,0 @@
-{ callPackage, callPackageOrig, stdenv, qt48 }:
-
-let
-  release = "4.8.4";
-
-  # Need callPackageOrig to avoid infinite cycle
-  kde = callPackageOrig ./kde-package {
-    inherit release ignoreList extraSubpkgs callPackage;
-  };
-
-  # The list of igored individual modules
-  ignoreList = {
-    # Doesn't work yet
-    kdeutils = [ "ksecrets" ];
-    # kdeadmin/strigi-analyzer has no real code
-    kdeadmin = [ "strigi-analyzer" ];
-    # kdesdk/kioslave is splitted into kioslave-svn and kioslave-git
-    kdesdk = [ "kioslave" ];
-    # Most of kdebindings do not compile due to a bug in the buildsystem
-    kdebindings = [ "kimono" "korundum" "kross-interpreters" "perlkde" "qyoto" ];
-  };
-
-  # Extra subpackages in the manifest format
-  extraSubpkgs = {
-    kdesdk =
-      [
-      {
-        name = "kioslave-svn";
-        sane = "kioslave_svn";
-        subdir = "kioslave";
-      }
-      {
-        name = "kioslave-perldoc";
-        sane = "kioslave_perldoc";
-        subdir = "kioslave";
-      }
-      ];
-  };
-
-in
-
-kde.modules // kde.individual //
-{
-  inherit (kde) manifest modules individual splittedModuleList;
-
-  akonadi = callPackage ./support/akonadi { };
-
-  qt4 = qt48;
-
-  kdebase_workspace = kde.modules.kde_workspace;
-
-  inherit release;
-
-  full = stdenv.lib.attrValues kde.modules;
-
-  l10n = callPackage ./l10n {
-    inherit release;
-    inherit (kde.manifest) stable;
-  };
-}
diff --git a/pkgs/desktops/kde-4.8/files/kde-wallpapers-buildsystem.patch b/pkgs/desktops/kde-4.8/files/kde-wallpapers-buildsystem.patch
deleted file mode 100644
index 378cdb64694..00000000000
--- a/pkgs/desktops/kde-4.8/files/kde-wallpapers-buildsystem.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 3d3e247..f78db67 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -1,5 +1,10 @@
--find_package(KDE4 REQUIRED)
--include(KDE4Defaults)
-+project(kde-wallpapers NONE)
-+if( WALLPAPER_INSTALL_DIR )
-+  message(STATUS "Installing wallpapers to user-supplied directory ${WALLPAPER_INSTALL_DIR}")
-+else()
-+  find_package(KDE4 REQUIRED)
-+  include(KDE4Defaults)
-+endif()
- 
- install(DIRECTORY Air DESTINATION ${WALLPAPER_INSTALL_DIR} PATTERN .svn EXCLUDE)
- 
diff --git a/pkgs/desktops/kde-4.8/files/polkit-install.patch b/pkgs/desktops/kde-4.8/files/polkit-install.patch
deleted file mode 100644
index d2ecac663ec..00000000000
--- a/pkgs/desktops/kde-4.8/files/polkit-install.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ru -x '*~' kdelibs-4.6.90-orig/kdecore/auth/ConfigureChecks.cmake kdelibs-4.6.90/kdecore/auth/ConfigureChecks.cmake
---- kdelibs-4.6.90-orig/kdecore/auth/ConfigureChecks.cmake	2011-05-20 22:24:54.000000000 +0200
-+++ kdelibs-4.6.90/kdecore/auth/ConfigureChecks.cmake	2011-07-12 14:03:00.000000000 +0200
-@@ -139,7 +139,7 @@
-         ${CMAKE_INSTALL_PREFIX} _KDE4_AUTH_POLICY_FILES_INSTALL_DIR
-         ${POLKITQT-1_POLICY_FILES_INSTALL_DIR})
- 
--    set(KDE4_AUTH_POLICY_FILES_INSTALL_DIR ${_KDE4_AUTH_POLICY_FILES_INSTALL_DIR} CACHE STRING 
-+    set(KDE4_AUTH_POLICY_FILES_INSTALL_DIR "\${CMAKE_INSTALL_PREFIX}/share/polkit-1/actions" CACHE STRING 
-         "Where policy files generated by KAuth will be installed" FORCE)
- elseif(KDE4_AUTH_BACKEND_NAME STREQUAL "FAKE")
-     set (KAUTH_COMPILING_FAKE_BACKEND TRUE)
diff --git a/pkgs/desktops/kde-4.8/kactivities.nix b/pkgs/desktops/kde-4.8/kactivities.nix
deleted file mode 100644
index 8f726577ef8..00000000000
--- a/pkgs/desktops/kde-4.8/kactivities.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ kde, kdelibs, shared_desktop_ontologies }:
-
-kde {
-  propagatedBuildInputs = [ kdelibs shared_desktop_ontologies ];
-
-  meta = {
-    description = "KDE activities library and daemon";
-  };
-}
diff --git a/pkgs/desktops/kde-4.8/kde-baseapps/kate.nix b/pkgs/desktops/kde-4.8/kde-baseapps/kate.nix
deleted file mode 100644
index 1ffbcf9ebf9..00000000000
--- a/pkgs/desktops/kde-4.8/kde-baseapps/kate.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-{ kde, kdelibs }:
-
-kde {
-  buildInputs = [ kdelibs ];
-
-  meta = {
-    description = "Kate, the KDE Advanced Text Editor, as well as KWrite";
-    license = "GPLv2";
-  };
-}
diff --git a/pkgs/desktops/kde-4.8/kde-baseapps/kde-baseapps.nix b/pkgs/desktops/kde-4.8/kde-baseapps/kde-baseapps.nix
deleted file mode 100644
index 45192e0c460..00000000000
--- a/pkgs/desktops/kde-4.8/kde-baseapps/kde-baseapps.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-{ kde, kdelibs, shared_desktop_ontologies, glib, htmlTidy }:
-
-kde {
-  buildInputs = [ kdelibs shared_desktop_ontologies glib htmlTidy ];
-
-  meta = {
-    description = "Base KDE applications, including the Dolphin file manager and Konqueror web browser";
-    license = "GPLv2";
-  };
-}
diff --git a/pkgs/desktops/kde-4.8/kde-baseapps/konsole.nix b/pkgs/desktops/kde-4.8/kde-baseapps/konsole.nix
deleted file mode 100644
index 0db47fb2d7c..00000000000
--- a/pkgs/desktops/kde-4.8/kde-baseapps/konsole.nix
+++ /dev/null
@@ -1,11 +0,0 @@
-{ kde, kdelibs, kde_baseapps }:
-
-kde {
-
-  buildInputs = [ kdelibs kde_baseapps ];
-
-  meta = {
-    description = "Konsole, the KDE terminal emulator";
-    license = "GPLv2";
-  };
-}
diff --git a/pkgs/desktops/kde-4.8/kde-package/4.8.4.nix b/pkgs/desktops/kde-4.8/kde-package/4.8.4.nix
deleted file mode 100644
index 6fbaf097be0..00000000000
--- a/pkgs/desktops/kde-4.8/kde-package/4.8.4.nix
+++ /dev/null
@@ -1,299 +0,0 @@
-{stable=true;
-hashes=builtins.listToAttrs[
-  {name="analitza";value="0g3k6i9ncl8m8xr85wz6k0vbmjq7jwmygm0353jq2lj2hy5i2ipg";}
-  {name="ark";value="10m6bmiz4ylgbmxx03q0zfayy1zinxx696jczmllxn557z75nzn5";}
-  {name="blinken";value="1n0m70by3wd5d4nqlgqrm6bg0nplc3b92cn74xq5adi1dfi63ggr";}
-  {name="cantor";value="1grjxbzyshc9jlmx9gvxfsxdhcgrn391s3bh0mmprnk0kcsi4s5i";}
-  {name="filelight";value="1fpkwyz74nqm0szfylbjqfxwv25rgfdg03ghq5mncs2ys8mh4rn1";}
-  {name="gwenview";value="1xxkhq4psl3zq0ah6fp42s5ih1xik0kxq4sb2r2mhkimrsj11rvz";}
-  {name="jovie";value="103d7c1h3qfqsh6phyxm4g712kykkpd1vls26kypn3d6linc9p1s";}
-  {name="kaccessible";value="0s772i8nc1lx6c8sjsy3m928dcyackd8pay44b8nlp8k8hzh5x62";}
-  {name="kactivities";value="0kxpg0bwr9ph3bzndc5vqgfqkxy443chyg3rbrdvgbgb0xm54r5f";}
-  {name="kalgebra";value="0p5qhxwd6h8kvfd8n81ah0pszaa550z7y2zlzvrgypmfcgx8a802";}
-  {name="kalzium";value="17sxslsg5pi1xh7l0h6y0rmjhb6nshq9psjjjqwhfl7id6ansb24";}
-  {name="kamera";value="0r8rr4lq3jrvfz2fw4in83vsxqjm02x16h842r4hnn3k5svaqs49";}
-  {name="kanagram";value="02wp2rkm5m6920rvs6iyalvv4xczgh21w1mrf4a694j14fna4m1n";}
-  {name="kate";value="0530rq6pfrim2mfjkvpl9qxv56fykml7aq3awchyda3xbkq7vk3y";}
-  {name="kbruch";value="1znm2dmsib7svyfqpyhblip5ic4y2xdylax1kxx7ssmjgsi3bw54";}
-  {name="kcalc";value="1dv3d833ksz9bqrwhq9pbsqk0a8hv3jlqlxbqccwgkx840hmpclz";}
-  {name="kcharselect";value="015pj1zmlnjr8ys3arks3b1yqf8rh9fc02p0xfq1fkp11ing0lfg";}
-  {name="kcolorchooser";value="04360b4pjsdl0ckdwipn3y407fmsx2bimkzqqm01hz4vdyb41d9k";}
-  {name="kdeadmin";value="0qvynvim50xsv060598bhv6pwxd578sg25g1z2dzdi4ih021nlr0";}
-  {name="kdeartwork";value="1v5an8385d9zjb29ps94xgvpazpvqffxnlvfp4940pj5imdg98nm";}
-  {name="kde-baseapps";value="0z2jasna2d8i3iy8w4grylfml9a510imhl0bxnsw6whar409rzki";}
-  {name="kdegames";value="1jji5dw9qllhv7zh7a456iwwsb5vqrvjd0p871s2qi8lcd54fs1a";}
-  {name="kdegraphics-mobipocket";value="1ya4jzj864ikw6ysp9ip1ha2n6a8im380k4yhmca9agp5f21zvva";}
-  {name="kdegraphics-strigi-analyzer";value="1cwvaszjawzdbvggxzzaxvxdjpxmr9x4p4fqy4wq38qzx06lnsd1";}
-  {name="kdegraphics-thumbnailers";value="1zxvqzadmcsy5ydxx617gpfh3vswcrnyjwn19scy1cv7nwdpxnqj";}
-  {name="kdelibs";value="1wr0kadmc33kqbr93h05g6yxqwp66cgs9ab32danvqbfns0qgb15";}
-  {name="kdemultimedia";value="0h56vy27kb1s4p3vpa42gj3xjbpwl38n97bbjq7g1vj8dq2k0pl4";}
-  {name="kdenetwork";value="10lyrygi3avfiyaqxgw9g6dc3pmsbggawjvnkxhm8f2j2gy7sbbc";}
-  {name="kdepim";value="0q4fq26gg3hfmvxzfbizsa1ffk88a994k31ybbv72b7xcdjz68ff";}
-  {name="kdepimlibs";value="1wqi7dh1w3cinkd8sgc0zx9qf7fyvizli4asbimxh5faal1b10bb";}
-  {name="kdepim-runtime";value="1v1klgcfa0hwi7bxqn0nphd7hlbxwh3v6apghra0b8f7qqnzxysp";}
-  {name="kdeplasma-addons";value="1f4bpgrjqa9c1ikngc9wn3a0y0hw39icswc77ys4j04b9zazg8qn";}
-  {name="kde-runtime";value="0g2jlxfxm4flx1pr920hbmqaq433y8bdglk08vnhycychppkacmc";}
-  {name="kdesdk";value="15zg649sm851ig7yxcsv9cx54x36k94y83q1wvm1kf84jb1vl1yg";}
-  {name="kdetoys";value="038h6fmqfy7mh2i7kg3510w0jwji9hac94dpzfmfgk36i461dbnn";}
-  {name="kde-wallpapers";value="18hbd9d19yf48vs4vmxrrxvr87baxxlf3z417f69kgvjpvmpl905";}
-  {name="kdewebdev";value="1mv5nq8ayz5np1vmgk58dsai6wmqdl1kvq96pvi5awmhxxla2f5x";}
-  {name="kde-workspace";value="12vn117nbqxipvb58v7swc4prfddijz7m0c03xn5wi1kbzq5xj9n";}
-  {name="kdf";value="0alc9a7x75f8dx5gbhdqwn0xfx7kr5q7dl9qfmcmrgm9vn6agxpw";}
-  {name="kfloppy";value="0ajc3yq86n4q7hxjgibvkrbbagg7xnlbd6g7mx3cvmq9l7na105b";}
-  {name="kgamma";value="1yviy8xz8cqlbpvjj7sp9jylq4lk98r3mpp6lxl95ypkjqbjx8w3";}
-  {name="kgeography";value="0wklqqprg7d7mxjlwfyv4n5d2igkr6b2i174vxzdhj9dbsh9r67f";}
-  {name="kgpg";value="034mg0s5v0vqq59x1fwddslg6r2dx3v70icka6j2r9lhi8635j5m";}
-  {name="khangman";value="0b64pqywvxdxrbp3xcscimdlsn44hwlvm6ydxiwx2salm2rn9xxa";}
-  {name="kig";value="0cblkm71j78dq4r90r9fladn8nxq3xq75w40f85jl9dkmm1y3yiv";}
-  {name="kimono";value="1ij7bcvxv8zkfzcrmjasq6x0nf41104x5bj6ksfc8mibml182bq7";}
-  {name="kiten";value="1c3rdagddk0xd0j6vnp0bj16in78879niakvq1s35s7grgxh31ia";}
-  {name="klettres";value="0sxd3hwpzyzvjrvly0w2fwrssg4a9rs35fp9yi6in19x7x8rbsxl";}
-  {name="kmag";value="0fgddhsf9f5n4crzp4z2ii5p1asyvpbmsiqgb61kswqbpsr96mv8";}
-  {name="kmousetool";value="0f4ym6dihq9wmwaassap0ixam46lqjvf6jqkr6ib0y87myj3h9mi";}
-  {name="kmouth";value="1hpphlav8ip4kx3787p3dkfddkzpgg4mj25ripjcpy0xpbfvc2lw";}
-  {name="kmplot";value="19sab4hmdv8kwipgjzg4v3gq4lv1i17yh4hdq3y6lcyf7wjkxjpd";}
-  {name="kolourpaint";value="0mr4f1vbhg3vhap92f8jj5lkpfr8cjphn863vda49rfdydhv1x6w";}
-  {name="konsole";value="10fgjsq2dj56ifnzxy3dz87s92m2zfcmpqa751b5ar0wp3pil045";}
-  {name="korundum";value="0vkhf40ghbqgs9vxl7zpfq21r7sc9z4rm0iyl9cab04wvi9r2nsk";}
-  {name="kremotecontrol";value="11z0wc9yvpk72yrx9ic3zpky2z346wdkvs8qcik9nfbbxxpk4vnx";}
-  {name="kross-interpreters";value="0afqwxxsysd7wwl5xgwdw58q7hjr8y5sdvsfrz8sfkirinfdmp9s";}
-  {name="kruler";value="19xppbxvyw6qzgxz4y1yzz9g104464z1i7dvsd3919njqhsrm628";}
-  {name="ksaneplugin";value="0z2gkc0997s79haf2nxgg5xgvmpk5iz2s33147qhhy12hys6jq9m";}
-  {name="ksecrets";value="1f4n3x5rmc0l16q3bripk49mj0nyak6s3vf3v7j4g89qz8rr4c87";}
-  {name="ksnapshot";value="069v2qs4nl8514kdgcp6y03n1n4d6ymm5j5yq1wwrgij6iqc7a78";}
-  {name="kstars";value="1hl0z77cl317pm442lcd2hk6rb83hvch904a0jgflcxcd2w0gg54";}
-  {name="ktimer";value="1hf0sbl9y0a9w2xdxdl88lmv55skz7fp1kl9sgnsyj8gzjyv3nwa";}
-  {name="ktouch";value="00hij38zk469ja3ns9d7qpj91kyndwrnmf0v2fqd2nicv9mqxdih";}
-  {name="kturtle";value="0wvskx6cif0gsgvsc072i33jl58bp2n74vyl2qgbw4bibckp9aq8";}
-  {name="kwallet";value="1n4vl0gvr8sqh8ld0bmz3qdz8lws19vzndrp10xl5fmb40cibdsz";}
-  {name="kwordquiz";value="1w2xwfqz3bjmm0rg4pn08vgm7f0m1wr2bc8cwgjayc8105xy572h";}
-  {name="libkdcraw";value="0fpx8yprgrk6sg03xms8swgqb7b41ia2rnf9n5phm5hvbpwwbw9f";}
-  {name="libkdeedu";value="1nz53vjmd48x9vk73wrfz6k94drxv0w2nsa0nnh68q1mphxm8cz3";}
-  {name="libkexiv2";value="1w7h8ckq2b7pi6qdf8p7rk6jzpn5caxflzdczlaxa7jn84k4rsjn";}
-  {name="libkipi";value="02cdmqjky5sfwpz9m85yixkmcsh9ybjdspsi8dwhypndpq3pgj3w";}
-  {name="libksane";value="11wgzdccwix4whfdj8f7fyapxk9yp8jfra56s9gyn7a4sfgp40sp";}
-  {name="marble";value="09ph1lg3y6bzkxdnpwbhlysj9s56fbaxwsxpn2ydwg4vnsspspiy";}
-  {name="okular";value="06xd3xpm1hp2dk382p4sd2dj2gdwb1f4d97hkh67riddwwzlcdal";}
-  {name="oxygen-icons";value="0zw6kv456gf955ip28iykx8nmd4h0scpqdj4f035yqiyxms9p4g1";}
-  {name="parley";value="1mg5mkxlzrb1clnclsfcl4vpd8yn97asgcazlq9wmgr077z0f9yd";}
-  {name="perlkde";value="1k94rfchpi7nvzvwz2flx49ni92aw6x8cc6qnq1vr98j9hangjg4";}
-  {name="perlqt";value="0rjwd2d2jlqlsjvw6w198jb79kjib89p3gbslj4dfgblrq1cgrdq";}
-  {name="printer-applet";value="1y8r39dyc04bkqm33s65m77c6y4y19bi32v2cx5bl67w5377hvh0";}
-  {name="pykde4";value="0gnzqw2xj1swm2jr728fxb7l48ll8whvc4ranwcvx8920jdd8vk7";}
-  {name="qtruby";value="1ixb8kav1pxpkwar99p3cgwi6nql1dfjwmyq7ai2h8ls7g075gz8";}
-  {name="qyoto";value="07m64n9xlnpgmw6jj91vwyzzjnmwn9px3ckfi93qs4mgnsj263zi";}
-  {name="rocs";value="0zxdskps9ifc8yhrk6lngjsh4abp98pv7d9y48lw830jhy78bm57";}
-  {name="smokegen";value="08yzxg6x3bdpza7hld1bd1ils5ipav2laazcar811vsn70lr8rqy";}
-  {name="smokekde";value="1k8r7d82mbmilg2x565w9nwxb5x6xfznscqwv9vmsgync56nk982";}
-  {name="smokeqt";value="036128q7mz5701ikw7fjc22ygkmnlscckmlgv3nb8d914maa1cl0";}
-  {name="step";value="1i1334p7qlc84m8xjc4sp20pmnqal26y8854pcv7lh8r3xzyscd6";}
-  {name="superkaramba";value="05xgflb9ramhrqb6avqagxp1kcdax6qwdf1k6wm85l8ys6vjimry";}
-  {name="svgpart";value="0xrs93njmp5322m4dh3ycvwgl9p618kzsi5xmrnlksb9n0hi91gw";}
-  {name="sweeper";value="1gcyffzzap2gdxk3js43bllf87795f97i0lmykgyllhp364czv6x";}
-];
-modules=[
-{
-  module="kdegraphics";
-  split=true;
-  pkgs=[
-    { name="gwenview";  }
-    { name="kamera";  }
-    { name="kcolorchooser";  }
-    { name="kdegraphics-mobipocket"; sane="kdegraphics_mobipocket"; }
-    { name="kdegraphics-strigi-analyzer"; sane="kdegraphics_strigi_analyzer"; }
-    { name="kdegraphics-thumbnailers"; sane="kdegraphics_thumbnailers"; }
-    { name="kgamma";  }
-    { name="kolourpaint";  }
-    { name="kruler";  }
-    { name="ksaneplugin";  }
-    { name="ksnapshot";  }
-    { name="libkdcraw";  }
-    { name="libkexiv2";  }
-    { name="libkipi";  }
-    { name="libksane";  }
-    { name="okular";  }
-    { name="svgpart";  }
-  ];
-}
-{
-  module="kdeutils";
-  split=true;
-  pkgs=[
-    { name="ark";  }
-    { name="filelight";  }
-    { name="kcalc";  }
-    { name="kcharselect";  }
-    { name="kdf";  }
-    { name="kfloppy";  }
-    { name="kgpg";  }
-    { name="kremotecontrol";  }
-    { name="ksecrets";  }
-    { name="ktimer";  }
-    { name="kwallet";  }
-    { name="printer-applet"; sane="printer_applet"; }
-    { name="superkaramba";  }
-    { name="sweeper";  }
-  ];
-}
-{
-  module="kdeedu";
-  split=true;
-  pkgs=[
-    { name="analitza";  }
-    { name="blinken";  }
-    { name="cantor";  }
-    { name="kalgebra";  }
-    { name="kalzium";  }
-    { name="kanagram";  }
-    { name="kbruch";  }
-    { name="kgeography";  }
-    { name="khangman";  }
-    { name="kig";  }
-    { name="kiten";  }
-    { name="klettres";  }
-    { name="kmplot";  }
-    { name="kstars";  }
-    { name="ktouch";  }
-    { name="kturtle";  }
-    { name="kwordquiz";  }
-    { name="libkdeedu";  }
-    { name="marble";  }
-    { name="parley";  }
-    { name="rocs";  }
-    { name="step";  }
-  ];
-}
-{
-  module="kdebindings";
-  split=true;
-  pkgs=[
-    { name="kimono";  }
-    { name="korundum";  }
-    { name="kross-interpreters"; sane="kross_interpreters"; }
-    { name="perlkde";  }
-    { name="perlqt";  }
-    { name="pykde4";  }
-    { name="qtruby";  }
-    { name="qyoto";  }
-    { name="smokegen";  }
-    { name="smokekde";  }
-    { name="smokeqt";  }
-  ];
-}
-{
-  module="kdeaccessibility";
-  split=true;
-  pkgs=[
-    { name="jovie";  }
-    { name="kaccessible";  }
-    { name="kmag";  }
-    { name="kmousetool";  }
-    { name="kmouth";  }
-  ];
-}
-{
-  module="kde-baseapps";
-sane="kde_baseapps";  split=true;
-  pkgs=[
-    { name="kate";  }
-    { name="kde-baseapps"; sane="kde_baseapps"; }
-    { name="konsole";  }
-  ];
-}
-{ module="kactivities";  split=false;}
-{ module="kdeadmin";  split=false;
-  pkgs=[
-    { name="strigi-analyzer"; sane="strigi_analyzer";}
-    { name="kuser"; }
-    { name="kcron"; }
-    { name="ksystemlog"; }
-    { name="system-config-printer-kde"; sane="system_config_printer_kde";}
-  ];
-
-}
-{ module="kdeartwork";  split=false;
-  pkgs=[
-    { name="ColorSchemes"; }
-    { name="IconThemes"; }
-    { name="emoticons"; }
-    { name="kscreensaver"; }
-    { name="kwin-styles"; sane="kwin_styles";}
-    { name="sounds"; }
-    { name="styles"; }
-    { name="wallpapers"; }
-    { name="HighResolutionWallpapers"; }
-    { name="WeatherWallpapers"; }
-    { name="desktopthemes"; }
-    { name="aurorae"; }
-  ];
-
-}
-{ module="kdegames";  split=false;}
-{ module="kdelibs";  split=false;}
-{ module="kdemultimedia";  split=false;}
-{ module="kdenetwork";  split=false;
-  pkgs=[
-    { name="kfile-plugins"; sane="kfile_plugins";}
-    { name="kget"; }
-    { name="kopete"; }
-    { name="krdc"; }
-    { name="kppp"; }
-    { name="krfb"; }
-    { name="kdnssd"; }
-    { name="filesharing"; }
-  ];
-
-}
-{ module="kdepim";  split=false;}
-{ module="kdepimlibs";  split=false;}
-{ module="kdepim-runtime"; sane="kdepim_runtime"; split=false;}
-{ module="kdeplasma-addons"; sane="kdeplasma_addons"; split=false;}
-{ module="kde-runtime"; sane="kde_runtime"; split=false;}
-{ module="kdesdk";  split=false;
-  pkgs=[
-    { name="cervisia"; }
-    { name="lokalize"; }
-    { name="kdeaccounts-plugin"; sane="kdeaccounts_plugin";}
-    { name="dolphin-plugins-svn"; sane="dolphin_plugins_svn";subdir="dolphin-plugins/svn"; }
-    { name="dolphin-plugins-git"; sane="dolphin_plugins_git";subdir="dolphin-plugins/git"; }
-    { name="dolphin-plugins-hg"; sane="dolphin_plugins_hg";subdir="dolphin-plugins/hg"; }
-    { name="dolphin-plugins-bazaar"; sane="dolphin_plugins_bazaar";subdir="dolphin-plugins/bazaar"; }
-    { name="kcachegrind"; }
-    { name="kapptemplate"; }
-    { name="kpartloader"; }
-    { name="strigi-analyzer"; sane="strigi_analyzer";}
-    { name="kioslave"; }
-    { name="okteta"; }
-    { name="kmtrace"; }
-    { name="kompare"; }
-    { name="kprofilemethod"; }
-    { name="kstartperf"; }
-    { name="kuiviewer"; }
-    { name="poxml"; }
-    { name="scripts"; }
-    { name="umbrello"; }
-  ];
-
-}
-{ module="kdetoys";  split=false;
-  pkgs=[
-    { name="kteatime"; }
-    { name="ktux"; }
-    { name="amor"; }
-  ];
-
-}
-{ module="kde-wallpapers"; sane="kde_wallpapers"; split=false;}
-{ module="kdewebdev";  split=false;
-  pkgs=[
-    { name="klinkstatus"; }
-    { name="kfilereplace"; }
-    { name="kimagemapeditor"; }
-    { name="kommander"; }
-  ];
-
-}
-{ module="kde-workspace"; sane="kde_workspace"; split=false;}
-{ module="oxygen-icons"; sane="oxygen_icons"; split=false;}
-];
-}
diff --git a/pkgs/desktops/kde-4.8/kde-package/default.nix b/pkgs/desktops/kde-4.8/kde-package/default.nix
deleted file mode 100644
index 8a6e8e16751..00000000000
--- a/pkgs/desktops/kde-4.8/kde-package/default.nix
+++ /dev/null
@@ -1,128 +0,0 @@
-{ callPackage, runCommand, stdenv, fetchurl, qt4, cmake, automoc4
-, release, ignoreList, extraSubpkgs
-}:
-
-let
-  inherit (stdenv.lib) filter fold;
-  inherit (builtins) getAttr hasAttr remoteAttrs listToAttrs tail head;
-in
-rec {
-  manifest = import (./. + "/${release}.nix");
-
-  # src attribute for $name tarball
-  kdesrc = name: fetchurl {
-    url = "mirror://kde/" + (if manifest.stable then "" else "un")
-      + "stable/${release}/src/${name}-${release}.tar.xz";
-    sha256 = getAttr name manifest.hashes;
-  };
-
-  # Default meta attribute
-  defMeta = {
-    homepage = http://www.kde.org;
-    platforms = stdenv.lib.platforms.linux;
-    inherit (qt4.meta) maintainers;
-  };
-
-  # KDE package built from the whole tarball
-  # This function is used both for monolithic modules and modules which are
-  # released as individual tarballs
-  kdeMonoPkg = name: let n_ = name; in a@{meta, name ? n_, ...}:
-    stdenv.mkDerivation ({
-      name = "${name}-${release}";
-      src = kdesrc name;
-      meta = defMeta // meta;
-      enableParallelBuilding = true;
-    } // (removeAttrs a [ "meta" "name" ]));
-
-  # kdeMonoPkg wrapper for modules splitted upstream compatible with combinePkgs
-  # API.
-  kdeSplittedPkg = module: {name, sane ? name}: kdeMonoPkg name;
-
-  # Build subdirectory ${subdir} of tarball ${module}-${release}.tar.xz
-  kdeSubdirPkg = module:
-    {name, subdir ? name, sane ? name}:
-    let name_ = name; in
-    a@{cmakeFlags ? [], name ? name_, meta ? {}, ...}:
-    stdenv.mkDerivation ({
-      name = "${name}-${release}";
-      src = kdesrc module;
-      cmakeFlags =
-        [ "-DDISABLE_ALL_OPTIONAL_SUBDIRECTORIES=TRUE"
-          "-DBUILD_doc=TRUE"
-          "-DBUILD_${subdir}=TRUE"
-        ] ++ cmakeFlags;
-      meta = defMeta // meta;
-      enableParallelBuilding = module.enableParallelBuilding or true;
-    } // (removeAttrs a [ "meta" "name" "cmakeFlags" ]));
-
-  # A KDE monolithic module
-  kdeMonoModule = name: path: callPackage path { kde = kdeMonoPkg name; };
-
-  # Combine packages in one module.
-  # Arguments:
-  #  * pkgFun --- a function of the following signature:
-  #               module: manifest_attrs: manual_attrs: derivation;
-  #  * module --- name of the module
-  #  * pkgs --- list of packages in manifest format
-  combinePkgs = pkgFun: module: pkgs:
-    let
-      f = p@{name, ...}:
-        callPackage (./.. + "/${module}/${name}.nix") { kde = pkgFun module p; };
-      list = map f pkgs;
-      attrs = listToAttrs (map
-        ({name, sane ? name, ...}@p: { name = sane; value = f p; })
-        pkgs);
-    in
-      runCommand "${module}-${release}"
-      ({passthru = attrs // {
-         propagatedUserEnvPackages = list;
-         projects = attrs;
-       };})
-        ''
-          mkdir -pv $out/nix-support
-          echo "${toString list}" | tee $out/nix-support/propagated-user-env-packages
-        '';
-
-  # Given manifest module data, return the module
-  kdeModule = { module, sane ? module, split, pkgs ? [] }:
-    let
-      pkgs_ = filterPkgs module pkgs;
-    in
-    # Module is splitted by upstream
-    if split then combinePkgs kdeSplittedPkg module pkgs_
-    # Monolithic module
-    else if pkgs == [] then kdeMonoModule module (./.. + "/${module}.nix")
-    # Module is splitted by us
-    else combinePkgs kdeSubdirPkg module pkgs_;
-
-  # The same, as nameValuePair with sane name
-  kdeModuleNV = a@{ module, sane ? module, ... }:
-    { name = sane; value = kdeModule a; };
-
-  filterPkgs = module: (p:
-      removeNames (stdenv.lib.attrByPath [module] [] ignoreList) p
-      ++ (stdenv.lib.attrByPath [module] [] extraSubpkgs));
-
-  # Remove attrsets with x.name in subst. Optimized for empty subst.
-  removeNames = subst: big:
-    fold (s: out: filter (x: x.name != s) out) big subst;
-
-  modules = listToAttrs (map kdeModuleNV manifest.modules);
-
-  splittedModuleList =
-    let
-      splitted = filter (a: a ? pkgs) manifest.modules;
-      names = map ({module, sane ? module, ...}: sane) splitted;
-    in
-    map (m: m.projects) (stdenv.lib.attrVals names modules);
-
-  individual =
-    stdenv.lib.zipAttrsWith
-    (
-      name: list:
-      if tail list == []
-      then head list
-      else abort "Multiple modules define ${name}"
-    )
-    splittedModuleList;
-}
diff --git a/pkgs/desktops/kde-4.8/kde-package/kde-manifest.sh b/pkgs/desktops/kde-4.8/kde-package/kde-manifest.sh
deleted file mode 100755
index e964ce3ddc1..00000000000
--- a/pkgs/desktops/kde-4.8/kde-package/kde-manifest.sh
+++ /dev/null
@@ -1,146 +0,0 @@
-#! /bin/sh
-
-# Usage: download kde release to $dir, then run
-# $0 $dir
-
-dir="$1"
-
-# Detect release number & whether it is a stable release
-if [[ ! -d "${dir}" ]]; then
-  echo "${dir} is not a directory (or doesn't exist)!" >&2
-  exit 1
-fi
-
-release=$(ls "${dir}"/kdelibs-*.tar.xz | \
-  sed -e 's/.*kdelibs-//' -e 's/\.tar\.xz//')
-
-if [[ ${release##*.} -gt 50 ]]; then
-  stable="false"
-else
-  stable="true"
-fi
-
-echo "Detected release ${release}" >&2
-
-declare -A hash
-declare -A modules
-declare -a packages
-declare -a top_level
-
-# xsltproc output declares -A module
-if [[ ! -f kde_projects.xml ]]; then
-  curl -O -J http://projects.kde.org/kde_projects.xml
-fi
-eval `xsltproc kde-submodules.xslt kde_projects.xml`
-
-module[kde-baseapps]=kde-baseapps
-unset module[kactivities]
-
-print_sane() {
-  echo "Called print_sane $1" >&2
-  sane="${1//[^a-z0-9_]/_}"
-  if [[ "$sane" != "$1" ]]; then
-    echo "Sane version is $sane" >&2
-    echo -n "sane=\"$sane\";"
-  fi
-}
-
-for i in `cd "${dir}"; ls *-${release}.tar.xz`; do
-  package=${i%-${release}.tar.xz}
-  packages+=( "$package" )
-  echo -n "${package}.. " >&2
-  hash[$package]=$(nix-hash --type sha256 --flat --base32 "${dir}/${i}")
-  echo -n ${hash[$package]} >&2
-
-  if [ -n "${module[$package]}" ]; then
-    m="${module[$package]}"
-    echo " (${m})" >&2
-    modules[$m]=1
-  else
-    top_level+=( "$package" )
-    echo " (top-level)" >&2
-  fi
-  #nix-store --add-fixed sha256 "${dir}/${i}" >&2
-done
-
-
-print_pkg_hash() {
-  echo "  {name=\"${1}\";value=\"${hash[$1]}\";}"
-}
-
-print_hashes(){
-  echo "hashes=builtins.listToAttrs["
-  for p in "${packages[@]}"; do print_pkg_hash "$p"; done
-  echo "];"
-}
-
-print_split_module(){
-  echo -n "$1:" >&2
-  echo -e "{\n  module=\"$1\";"
-  print_sane "$1"
-  echo "  split=true;"
-  echo "  pkgs=["
-  for p in "${packages[@]}"; do
-    if [[ "${module[$p]}" == "$1" ]]; then
-      echo -n "    { name=\"$p\"; "
-      print_sane "$p"
-      echo " }"
-      echo -n " $p" >&2
-    fi
-  done
-  echo "  ];"
-  echo "}"
-  echo >&2
-}
-
-print_mono_module(){
-  echo -en "{ module=\"$1\"; "
-  print_sane "$1"
-  echo -n "$1 ... " >&2
-  echo -n " split=false;"
-  cml="$1-$release/CMakeLists.txt"
-  tar -xf "${dir}/$1-${release}.tar.xz" "$cml"
-  if grep '^[^#]*add_subdirectory' $cml >/dev/null; then
-    if grep '^[^#]*add_subdirectory' $cml | grep -v macro_optional_add_subdirectory >/dev/null; then
-      echo " is monolithic (has unconditionally added subdirs)" >&2
-    else
-      subdirs=( `grep '^[^#]*add_subdirectory' $cml |
-        sed -e 's/[^#]*add_subdirectory *( *\(.*\) *)/\1/' |
-        grep -v '\(doc\|cmake\)'` )
-      echo " seems splittable, subdirs: ${subdirs[*]}" >&2
-      echo -e "\n  pkgs=["
-      for s in "${subdirs[@]}"; do
-        echo -en "    {"
-		echo -n " name=\"${s//\//-}\"; "
-        print_sane "$s"
-        if [[ $s != "${s//\//-}" ]]; then
-          echo -n "subdir=\"$s\"; "
-        fi
-        echo "}"
-      done
-      echo -e "  ];\n"
-    fi
-  else
-    echo " is monolithic (has no subdirs)" >&2
-  fi
-  rm $cml
-  rmdir $1-$release
-  echo "}"
-}
-
-print_modules(){
-  echo "modules=["
-  echo "Printing modules splitted by upstream" >&2
-  for m in "${!modules[@]}"; do print_split_module "$m"; done
-  echo >&2
-  echo "Printing modules not splitted by upstream (${top_level[*]})" >&2
-  for m in "${top_level[@]}"; do print_mono_module "$m"; done
-  echo "];"
-}
-
-echo "Writing ${release}.nix" >&2
-exec > "${release}.nix"
-echo "{stable=${stable};"
-print_hashes
-print_modules
-echo "}"
diff --git a/pkgs/desktops/kde-4.8/kde-package/kde-submodules.xslt b/pkgs/desktops/kde-4.8/kde-package/kde-submodules.xslt
deleted file mode 100644
index 952a05a9d27..00000000000
--- a/pkgs/desktops/kde-4.8/kde-package/kde-submodules.xslt
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- xslt file for http://projects.kde.org/kde_projects.xml -->
-
-<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
-
-	<xsl:output method="text" />
-	<xsl:template match="/">
-		<xsl:for-each select="kdeprojects/component[@identifier='kde']">
-			<xsl:text>declare -A module
</xsl:text>
-			<xsl:for-each select="module">
-				<xsl:variable name="module" select='@identifier' />
-				<xsl:for-each select=".//project[repo]">
-					<xsl:text>module["</xsl:text>
-					<xsl:value-of select='@identifier' />
-					<xsl:text>"]="</xsl:text>
-					<xsl:value-of select="$module" />
-					<xsl:text>"
</xsl:text>
-				</xsl:for-each>
-			</xsl:for-each>
-		</xsl:for-each>
-	</xsl:template>
-</xsl:stylesheet>
diff --git a/pkgs/desktops/kde-4.8/kde-runtime.nix b/pkgs/desktops/kde-4.8/kde-runtime.nix
deleted file mode 100644
index b8f9afff7b3..00000000000
--- a/pkgs/desktops/kde-4.8/kde-runtime.nix
+++ /dev/null
@@ -1,19 +0,0 @@
-{ kde, kdelibs, shared_desktop_ontologies, bzip2, libssh, exiv2, attica
-, libcanberra, virtuoso, samba, libjpeg, ntrack, pkgconfig, qca2, xz, pulseaudio
-, networkmanager
-}:
-
-kde {
-  buildInputs =
-    [ kdelibs shared_desktop_ontologies bzip2 libssh exiv2 attica xz networkmanager
-      samba libcanberra ntrack libjpeg qca2 pulseaudio
-    ];
-
-  nativeBuildInputs = [ pkgconfig ];
-
-  passthru.propagatedUserEnvPackages = [ virtuoso ];
-
-  meta = {
-    license = "LGPL";
-  };
-}
diff --git a/pkgs/desktops/kde-4.8/kde-wallpapers.nix b/pkgs/desktops/kde-4.8/kde-wallpapers.nix
deleted file mode 100644
index ad4c22c632d..00000000000
--- a/pkgs/desktops/kde-4.8/kde-wallpapers.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-{ kde, cmake }:
-
-kde {
-  nativeBuildInputs = [ cmake ];
-
-  patches = [ ./files/kde-wallpapers-buildsystem.patch ];
-
-  cmakeFlags = "-DWALLPAPER_INSTALL_DIR=share/wallpapers";
-
-  outputHashAlgo = "sha256";
-  outputHashMode = "recursive";
-  outputHash = "b8dfcc905abc46eebac2dd07267879d6a27e6e77f5253eb9c65fe594766770c4";
-
-  meta = {
-    description = "Wallpapers for KDE";
-  };
-}
diff --git a/pkgs/desktops/kde-4.8/kde-workspace.nix b/pkgs/desktops/kde-4.8/kde-workspace.nix
deleted file mode 100644
index 394cd550b96..00000000000
--- a/pkgs/desktops/kde-4.8/kde-workspace.nix
+++ /dev/null
@@ -1,37 +0,0 @@
-{ kde, kdelibs, qimageblitz, libdbusmenu_qt, xorg, shared_desktop_ontologies,
-  lm_sensors, pciutils, libraw1394, libusb, libxklavier, python, libqalculate,
-  xkeyboard_config, kdepimlibs, pam, boost, gpsd, prison, akonadi,
-  pykde4, libjpeg, pkgconfig, libXft, libXxf86misc, kactivities
-}:
-
-kde {
-
-  buildInputs =
-    [ kdelibs qimageblitz libdbusmenu_qt pykde4 libjpeg libXft libXxf86misc
-      xorg.libxkbfile xorg.libXcomposite xorg.libXScrnSaver xorg.libXtst
-      xorg.libXcomposite xorg.libXdamage xorg.libXau xorg.libXdmcp
-      xorg.libpthreadstubs
-      boost gpsd shared_desktop_ontologies lm_sensors pciutils libraw1394
-      libusb python libqalculate kdepimlibs pam prison akonadi
-      kactivities
-    ];
-
-  nativeBuildInputs = [ pkgconfig ];
-
-  preConfigure =
-   ''
-     # Fix incorrect path to kde4-config.
-     substituteInPlace startkde.cmake --replace '$bindir/kde4-config' ${kdelibs}/bin/kde4-config
-
-     # Fix the path to the keyboard configuration files.
-     substituteInPlace kcontrol/keyboard/xkb_rules.cpp \
-       --replace /usr/share/X11 ${xkeyboard_config}/etc/X11
-   '';
-
-  enableParallelBuilding = false; # frequent problems on Hydra
-
-  meta = {
-    description = "KDE workspace components such as Plasma, Kwin and System Settings";
-    license = "GPLv2";
-  };
-}
diff --git a/pkgs/desktops/kde-4.8/kdeaccessibility/jovie.nix b/pkgs/desktops/kde-4.8/kdeaccessibility/jovie.nix
deleted file mode 100644
index d38c80c4c36..00000000000
--- a/pkgs/desktops/kde-4.8/kdeaccessibility/jovie.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ kde, kdelibs, speechd }:
-
-kde {
-  buildInputs = [ kdelibs speechd ];
-
-  meta = {
-    description = "Text-to-speech synthesis daemon";
-  };
-}
diff --git a/pkgs/desktops/kde-4.8/kdeaccessibility/kaccessible.nix b/pkgs/desktops/kde-4.8/kdeaccessibility/kaccessible.nix
deleted file mode 100644
index 98fae7c983f..00000000000
--- a/pkgs/desktops/kde-4.8/kdeaccessibility/kaccessible.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ kde, kdelibs, speechd }:
-
-kde {
-  buildInputs = [ kdelibs speechd ];
-
-  meta = {
-    description = "Bridge that provides accessibility services to applications";
-  };
-}
diff --git a/pkgs/desktops/kde-4.8/kdeaccessibility/kmag.nix b/pkgs/desktops/kde-4.8/kdeaccessibility/kmag.nix
deleted file mode 100644
index f3b27dacf67..00000000000
--- a/pkgs/desktops/kde-4.8/kdeaccessibility/kmag.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ kde, kdelibs }:
-
-kde {
-  buildInputs = [ kdelibs ];
-
-  meta = {
-    description = "Screen magnifier for KDE";
-  };
-}
diff --git a/pkgs/desktops/kde-4.8/kdeaccessibility/kmousetool.nix b/pkgs/desktops/kde-4.8/kdeaccessibility/kmousetool.nix
deleted file mode 100644
index 8e0caa76ed9..00000000000
--- a/pkgs/desktops/kde-4.8/kdeaccessibility/kmousetool.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ kde, kdelibs, libXtst, libXt }:
-
-kde {
-  buildInputs = [ kdelibs libXtst libXt ];
-
-  meta = {
-    description = "A program that clicks the mouse for you";
-  };
-}
diff --git a/pkgs/desktops/kde-4.8/kdeaccessibility/kmouth.nix b/pkgs/desktops/kde-4.8/kdeaccessibility/kmouth.nix
deleted file mode 100644
index 4159501967c..00000000000
--- a/pkgs/desktops/kde-4.8/kdeaccessibility/kmouth.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ kde, kdelibs }:
-
-kde {
-  buildInputs = [ kdelibs ];
-
-  meta = {
-    description = "A type-and-say front end for speech synthesizers";
-  };
-}
diff --git a/pkgs/desktops/kde-4.8/kdeadmin/kcron.nix b/pkgs/desktops/kde-4.8/kdeadmin/kcron.nix
deleted file mode 100644
index bada0c1cb10..00000000000
--- a/pkgs/desktops/kde-4.8/kdeadmin/kcron.nix
+++ /dev/null
@@ -1,5 +0,0 @@
-{ kde, kdelibs }:
-
-kde {
-  buildInputs = [ kdelibs ];
-}
diff --git a/pkgs/desktops/kde-4.8/kdeadmin/ksystemlog.nix b/pkgs/desktops/kde-4.8/kdeadmin/ksystemlog.nix
deleted file mode 100644
index bada0c1cb10..00000000000
--- a/pkgs/desktops/kde-4.8/kdeadmin/ksystemlog.nix
+++ /dev/null
@@ -1,5 +0,0 @@
-{ kde, kdelibs }:
-
-kde {
-  buildInputs = [ kdelibs ];
-}
diff --git a/pkgs/desktops/kde-4.8/kdeadmin/kuser.nix b/pkgs/desktops/kde-4.8/kdeadmin/kuser.nix
deleted file mode 100644
index 571674a461a..00000000000
--- a/pkgs/desktops/kde-4.8/kdeadmin/kuser.nix
+++ /dev/null
@@ -1,5 +0,0 @@
-{ kde, kdelibs, kdepimlibs }:
-
-kde {
-  buildInputs = [ kdelibs kdepimlibs ];
-}
diff --git a/pkgs/desktops/kde-4.8/kdeadmin/system-config-printer-kde.nix b/pkgs/desktops/kde-4.8/kdeadmin/system-config-printer-kde.nix
deleted file mode 100644
index 2c462f67c15..00000000000
--- a/pkgs/desktops/kde-4.8/kdeadmin/system-config-printer-kde.nix
+++ /dev/null
@@ -1,33 +0,0 @@
-{ kde, pkgconfig, pythonPackages, sip, pycups, pygobject, system_config_printer,
-  kdelibs, kdepimlibs, pykde4, cups, nettools }:
-
-let s_c_p = system_config_printer.override { withGUI = false; }; in
-kde {
-  buildInputs = [ kdelibs kdepimlibs pythonPackages.python pycups pykde4 sip
-    pygobject s_c_p ];
-
-  passthru = { system_config_printer = s_c_p; };
-
-  preConfigure =
-    ''
-      for i in system-config-printer-kde/cmake-modules/FindSystemConfigPrinter.py system-config-printer-kde/system-config-printer-kde.py; do
-        substituteInPlace $i \
-          --replace /usr/share/system-config-printer ${s_c_p}/share/system-config-printer \
-          --replace /usr/bin/cupstestppd ${cups}/bin/cupstestppd \
-          --replace /bin/hostname ${nettools}/bin/hostname
-      done
-    '';
-
-  postInstall =
-    ''
-      # Bake the required Python path into the printer configuration program.
-      res=
-      for i in $(IFS=:; echo $PYTHONPATH); do res="$res''${res:+,} '$i'"; done
-
-      sed -i $out/share/apps/system-config-printer-kde/system-config-printer-kde.py \
-          -e "1 a import sys\nsys.path = [$res] + sys.path"
-
-      mkdir -p $out/nix-support
-      echo ${pykde4} > $out/nix-support/propagated-user-env-packages
-    '';
-}
diff --git a/pkgs/desktops/kde-4.8/kdeartwork/ColorSchemes.nix b/pkgs/desktops/kde-4.8/kdeartwork/ColorSchemes.nix
deleted file mode 100644
index acccf66976f..00000000000
--- a/pkgs/desktops/kde-4.8/kdeartwork/ColorSchemes.nix
+++ /dev/null
@@ -1,11 +0,0 @@
-{ kde, kdelibs }:
-
-kde {
-  name = "kde-color-schemes";
-
-  buildInputs = [ kdelibs ];
-
-  meta = {
-    description = "Additional KDE color schemes";
-  };
-}
diff --git a/pkgs/desktops/kde-4.8/kdeartwork/FindXscreensaver.cmake b/pkgs/desktops/kde-4.8/kdeartwork/FindXscreensaver.cmake
deleted file mode 100644
index 499ed75268e..00000000000
--- a/pkgs/desktops/kde-4.8/kdeartwork/FindXscreensaver.cmake
+++ /dev/null
@@ -1,73 +0,0 @@
-#Macro to find xscreensaver directory
-
-# Copyright (c) 2006, Laurent Montel, <montel@kde.org>
-#
-# Redistribution and use is allowed according to the terms of the BSD license.
-# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
-
-if (NOT XSCREENSAVER_FOUND)
-  FIND_PATH(XSCREENSAVER_DIR deco
-    HINTS
-      ${KDE4_INCLUDE_DIR}
-    PATHS
-      /usr
-      /usr/local
-      /opt/local
-      /usr/X11R6
-      /opt/kde
-      /opt/kde3
-      /usr/kde
-      /usr/local/kde
-      /usr/local/xscreensaver
-      /usr/openwin/lib/xscreensaver
-      /etc
-    PATH_SUFFIXES
-      lib${LIB_SUFFIX}/xscreensaver
-      lib${LIB_SUFFIX}/misc/xscreensaver
-      lib/xscreensaver
-      lib64/xscreensaver
-      lib/misc/xscreensaver
-      libexec/xscreensaver
-      bin/xscreensaver-hacks
-      hacks)
-  message(STATUS "XSCREENSAVER_DIR <${XSCREENSAVER_DIR}>")
-
-  FIND_PATH(XSCREENSAVER_CONFIG_DIR deco.xml
-    PATHS
-    ${KDE4_INCLUDE_DIR}
-    /usr/
-    /usr/local/
-    /opt/local/
-    /usr/X11R6/
-    /opt/kde/
-    /opt/kde3/
-    /usr/kde/
-    /usr/local/kde/
-    /usr/openwin/lib/xscreensaver/
-    /etc/
-    PATH_SUFFIXES xscreensaver xscreensaver/config share/xscreensaver/config
-  )
-  MESSAGE(STATUS "XSCREENSAVER_CONFIG_DIR :<${XSCREENSAVER_CONFIG_DIR}>")
-
-endif(NOT XSCREENSAVER_FOUND)
-
-#MESSAGE(STATUS "XSCREENSAVER_CONFIG_DIR :<${XSCREENSAVER_CONFIG_DIR}>")
-#MESSAGE(STATUS "XSCREENSAVER_DIR :<${XSCREENSAVER_DIR}>")
-
-# Need to fix hack
-if(XSCREENSAVER_DIR AND XSCREENSAVER_CONFIG_DIR)
-    set(XSCREENSAVER_FOUND TRUE)
-endif(XSCREENSAVER_DIR AND XSCREENSAVER_CONFIG_DIR)
-
-if (XSCREENSAVER_FOUND)
-  if (NOT Xscreensaver_FIND_QUIETLY)
-    message(STATUS "Found XSCREENSAVER_CONFIG_DIR <${XSCREENSAVER_CONFIG_DIR}>")
-  endif (NOT Xscreensaver_FIND_QUIETLY)
-else (XSCREENSAVER_FOUND)
-  if (Xscreensaver_FIND_REQUIRED)
-    message(FATAL_ERROR "XScreenSaver not found")
-  endif (Xscreensaver_FIND_REQUIRED)
-endif (XSCREENSAVER_FOUND)
-
-
-MARK_AS_ADVANCED(XSCREENSAVER_DIR XSCREENSAVER_CONFIG_DIR)
diff --git a/pkgs/desktops/kde-4.8/kdeartwork/HighResolutionWallpapers.nix b/pkgs/desktops/kde-4.8/kdeartwork/HighResolutionWallpapers.nix
deleted file mode 100644
index edffca1562e..00000000000
--- a/pkgs/desktops/kde-4.8/kdeartwork/HighResolutionWallpapers.nix
+++ /dev/null
@@ -1,11 +0,0 @@
-{ kde, kdelibs }:
-
-kde rec {
-  name = "kde-wallpapers-high-resolution";
-
-  buildInputs = [ kdelibs ];
-
-  meta = {
-    description = "KDE wallpapers in high resolution";
-  };
-}
diff --git a/pkgs/desktops/kde-4.8/kdeartwork/IconThemes.nix b/pkgs/desktops/kde-4.8/kdeartwork/IconThemes.nix
deleted file mode 100644
index 43071e8bd14..00000000000
--- a/pkgs/desktops/kde-4.8/kdeartwork/IconThemes.nix
+++ /dev/null
@@ -1,13 +0,0 @@
-{ kde, kdelibs }:
-
-kde {
-  name = "kdeartwork-icon-themes";
-
-  # Sources contain primary and kdeclassic as well but they're not installed
-
-  buildInputs = [ kdelibs ];
-
-  meta = {
-    description = "KDE nuvola and mono icon themes";
-  };
-}
diff --git a/pkgs/desktops/kde-4.8/kdeartwork/WeatherWallpapers.nix b/pkgs/desktops/kde-4.8/kdeartwork/WeatherWallpapers.nix
deleted file mode 100644
index 947e5e17ab0..00000000000
--- a/pkgs/desktops/kde-4.8/kdeartwork/WeatherWallpapers.nix
+++ /dev/null
@@ -1,11 +0,0 @@
-{ kde, kdelibs }:
-
-kde rec {
-  name = "kde-weather-wallpapers";
-
-  buildInputs = [ kdelibs ];
-
-  meta = {
-    description = "Additional KDE wallpapers (weather)";
-  };
-}
diff --git a/pkgs/desktops/kde-4.8/kdeartwork/aurorae.nix b/pkgs/desktops/kde-4.8/kdeartwork/aurorae.nix
deleted file mode 100644
index 4bce95217cc..00000000000
--- a/pkgs/desktops/kde-4.8/kdeartwork/aurorae.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{ kde, kdelibs }:
-
-kde {
-  name = "aurorae-themes";
-
-  buildInputs = [ kdelibs ];
-}
diff --git a/pkgs/desktops/kde-4.8/kdeartwork/desktopthemes.nix b/pkgs/desktops/kde-4.8/kdeartwork/desktopthemes.nix
deleted file mode 100644
index 93dd361af73..00000000000
--- a/pkgs/desktops/kde-4.8/kdeartwork/desktopthemes.nix
+++ /dev/null
@@ -1,11 +0,0 @@
-{ kde, kdelibs }:
-
-kde {
-  name = "kde-desktop-themes";
-
-  buildInputs = [ kdelibs ];
-
-  meta = {
-    description = "Additional KDE desktop themes";
-  };
-}
diff --git a/pkgs/desktops/kde-4.8/kdeartwork/emoticons.nix b/pkgs/desktops/kde-4.8/kdeartwork/emoticons.nix
deleted file mode 100644
index 5ef9f78a719..00000000000
--- a/pkgs/desktops/kde-4.8/kdeartwork/emoticons.nix
+++ /dev/null
@@ -1,11 +0,0 @@
-{ kde, kdelibs }:
-
-kde {
-  name = "kde-emotion-icons";
-
-  buildInputs = [ kdelibs ];
-
-  meta = {
-    description = "Additional KDE emotion icons (smiles)";
-  };
-}
diff --git a/pkgs/desktops/kde-4.8/kdeartwork/kscreensaver.nix b/pkgs/desktops/kde-4.8/kdeartwork/kscreensaver.nix
deleted file mode 100644
index 7028b9db228..00000000000
--- a/pkgs/desktops/kde-4.8/kdeartwork/kscreensaver.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-{ kde, kdelibs, xscreensaver, kde_workspace, eigen, libkexiv2, libXt, pkgconfig }:
-
-kde {
-  buildInputs = [ kdelibs xscreensaver kde_workspace eigen libkexiv2 libXt ];
-
-  nativeBuildInputs = [ pkgconfig ];
-
-  preConfigure = "cp -v ${./FindXscreensaver.cmake} cmake/modules/FindXscreensaver.cmake";
-
-  cmakeFlags = [ "-DBUILD_asciiquarium:BOOL=ON" ];
-
-  meta = {
-    description = "KDE screensavers";
-  };
-}
diff --git a/pkgs/desktops/kde-4.8/kdeartwork/kwin-styles.nix b/pkgs/desktops/kde-4.8/kdeartwork/kwin-styles.nix
deleted file mode 100644
index b5d769b216d..00000000000
--- a/pkgs/desktops/kde-4.8/kdeartwork/kwin-styles.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ kde, kdelibs, kde_workspace }:
-
-kde {
-  buildInputs = [ kdelibs kde_workspace ];
-
-  meta = {
-    description = "Styles for KWin";
-  };
-}
diff --git a/pkgs/desktops/kde-4.8/kdeartwork/sounds.nix b/pkgs/desktops/kde-4.8/kdeartwork/sounds.nix
deleted file mode 100644
index e98705da889..00000000000
--- a/pkgs/desktops/kde-4.8/kdeartwork/sounds.nix
+++ /dev/null
@@ -1,11 +0,0 @@
-{ kde, kdelibs }:
-
-kde rec {
-  name = "kde-sounds";
-
-  buildInputs = [ kdelibs ];
-
-  meta = {
-    description = "New login/logout sounds";
-  };
-}
diff --git a/pkgs/desktops/kde-4.8/kdeartwork/styles.nix b/pkgs/desktops/kde-4.8/kdeartwork/styles.nix
deleted file mode 100644
index 6a1306c3710..00000000000
--- a/pkgs/desktops/kde-4.8/kdeartwork/styles.nix
+++ /dev/null
@@ -1,11 +0,0 @@
-{ kde, kdelibs }:
-
-kde rec {
-  name = "kde-style-phase";
-
-  buildInputs = [ kdelibs ];
-
-  meta = {
-    description = "Phase, a widget style for KDE";
-  };
-}
diff --git a/pkgs/desktops/kde-4.8/kdeartwork/wallpapers.nix b/pkgs/desktops/kde-4.8/kdeartwork/wallpapers.nix
deleted file mode 100644
index 611c6a70f6b..00000000000
--- a/pkgs/desktops/kde-4.8/kdeartwork/wallpapers.nix
+++ /dev/null
@@ -1,11 +0,0 @@
-{ kde, kdelibs }:
-
-kde rec {
-  name = "kde-wallpapers";
-
-  buildInputs = [ kdelibs ];
-
-  meta = {
-    description = "Additional KDE wallpapers";
-  };
-}
diff --git a/pkgs/desktops/kde-4.8/kdebindings/perlqt-include-smokeqt.patch b/pkgs/desktops/kde-4.8/kdebindings/perlqt-include-smokeqt.patch
deleted file mode 100644
index fd67860283b..00000000000
--- a/pkgs/desktops/kde-4.8/kdebindings/perlqt-include-smokeqt.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-commit 48b92b74bc6fd270c33a726257e2879203cf5064
-Author: Yury G. Kudryashov [diff odt] <urkud.urkud@gmail.com>
-Date:   Wed Mar 21 00:47:43 2012 +0400
-
-    Include SMOKE_QTCORE_INCLUDE_DIR
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 48020a1..2263a73 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -14,7 +14,7 @@ find_package(Smoke COMPONENTS QtCore QtGui QtNetwork Qt3Support QtDeclarative Qt
-                               QtOpenGl QtScript QtSql QtSvg QtTest QtUiTools QtWebKit QtXml QtXmlPatterns
-                               Phonon Qwt QSci QImageBlitz)
-                               
--include_directories(${SMOKE_INCLUDE_DIR} ${QT_INCLUDES} ${CMAKE_CURRENT_SOURCE_DIR}/src)
-+include_directories(${SMOKE_INCLUDE_DIR} ${SMOKE_QTCORE_INCLUDE_DIR} ${QT_INCLUDES} ${CMAKE_CURRENT_SOURCE_DIR}/src)
- set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_CURRENT_SOURCE_DIR}/cmake ${SMOKE_CMAKE_MODULE_DIR})
- include(MacroOptionalFindPackage)
- include(MacroOptionalAddBindings)
diff --git a/pkgs/desktops/kde-4.8/kdebindings/perlqt-rewrite-FindPerlMore.patch b/pkgs/desktops/kde-4.8/kdebindings/perlqt-rewrite-FindPerlMore.patch
deleted file mode 100644
index c7f73815f54..00000000000
--- a/pkgs/desktops/kde-4.8/kdebindings/perlqt-rewrite-FindPerlMore.patch
+++ /dev/null
@@ -1,118 +0,0 @@
-commit e702abfd16f610e773fb0310d8c6512991794c63
-Author: Yury G. Kudryashov [diff odt] <urkud.urkud@gmail.com>
-Date:   Wed Mar 21 00:50:02 2012 +0400
-
-    Rewrite FindPerlMore.cmake
-    
-    * Ask perl for expanded paths
-    * Move execute_process to a macro
-    * Add PERL_*_INSTALL_DIR variables that point to CMAKE_INSTALL_PREFIX
-    
-    The last change makes it easy to install a file into CMAKE_INSTALL_PREFIX
-    instead of perl install prefix.Add debug message
-
-diff --git a/cmake/FindPerlMore.cmake b/cmake/FindPerlMore.cmake
-index 6412a47..cc8faf8 100644
---- a/cmake/FindPerlMore.cmake
-+++ b/cmake/FindPerlMore.cmake
-@@ -5,54 +5,52 @@
- #
- #  PERL_INCLUDE_PATH = path to where perl.h can be found
- 
--if(PERL_INCLUDE_PATH)
--   # Already in cache, be silent
--   SET(PERL_HEADERS_FOUND TRUE)
--endif (PERL_INCLUDE_PATH)		
--
--IF(PERL_EXECUTABLE)
--	EXECUTE_PROCESS(COMMAND ${PERL_EXECUTABLE} -MConfig -e "print \$Config{archlib}"
--   		OUTPUT_VARIABLE PERL_ARCH_LIB_DIR)
--
--	EXECUTE_PROCESS(COMMAND ${PERL_EXECUTABLE} -MConfig -e "print \$Config{sitearch}"
--   		OUTPUT_VARIABLE PERL_SITE_ARCH_DIR)
--
--	EXECUTE_PROCESS(COMMAND ${PERL_EXECUTABLE} -MConfig -e "print \$Config{vendorarch}"
--   		OUTPUT_VARIABLE PERL_VENDOR_ARCH_DIR)
--
--	EXECUTE_PROCESS(COMMAND ${PERL_EXECUTABLE} -MConfig -e "print \$Config{sitelib}"
--   		OUTPUT_VARIABLE PERL_SITE_LIB_DIR)
--
--	EXECUTE_PROCESS(COMMAND ${PERL_EXECUTABLE} -MConfig -e "print \$Config{vendorlib}"
--   		OUTPUT_VARIABLE PERL_VENDOR_LIB_DIR)
--
--	EXECUTE_PROCESS(COMMAND ${PERL_EXECUTABLE} -MConfig -e "print \$Config{version}"
--   		OUTPUT_VARIABLE PERL_VERSION)
--
--	EXECUTE_PROCESS(COMMAND ${PERL_EXECUTABLE} -MConfig -e "print \$Config{ccflags}"
--   		OUTPUT_VARIABLE PERL_CXX_FLAGS)
--
--	EXECUTE_PROCESS(COMMAND ${PERL_EXECUTABLE} -MConfig -e "print \$Config{ccdlflags}"
--   		OUTPUT_VARIABLE PERL_CCDL_FLAGS)
--
--	EXECUTE_PROCESS(COMMAND ${PERL_EXECUTABLE} -MConfig -MFile::Spec -e "print '-L' . File::Spec->catdir(\$Config{archlibexp}, 'CORE')"
--   		OUTPUT_VARIABLE PERL_EXTRA_LIB_PATHS)
--
--	EXECUTE_PROCESS(COMMAND ${PERL_EXECUTABLE} -MConfig -e "print \$Config{perllibs}"
--   		OUTPUT_VARIABLE PERL_LIBS)
--
--	FIND_PATH(PERL_INCLUDE_PATH 
--  		NAMES perl.h
--  		PATHS ${PERL_ARCH_LIB_DIR}/CORE
--  	)
--
--	if(PERL_INCLUDE_PATH)
--		SET(PERL_HEADERS_FOUND TRUE)
--	endif (PERL_INCLUDE_PATH)
--
--	MARK_AS_ADVANCED(
--	  PERL_INCLUDE_PATH
--	  )
-+if(FIND_PERLMORE_REQUIRED)
-+  find_package(Perl REQUIRED)
-+else()
-+ find_package(Perl)
-+endif()
-+
-+macro(_perl_get_config_var name output)
-+  execute_process(COMMAND ${PERL_EXECUTABLE} -MConfig -e "print \$Config{${name}}"
-+                  OUTPUT_VARIABLE PERL_${output})
-+endmacro()
-+
-+macro(_perl_get_config_dir name)
-+  string(TOLOWER ${name} _tmp)
-+  string(REPLACE "_" "" _tmp ${_tmp})
-+  _perl_get_config_var(${_tmp}exp ${name}_DIR)
-+  string(REPLACE "${PERL_ROOT_DIR}" "${CMAKE_INSTALL_PREFIX}" PERL_${name}_INSTALL_DIR "${PERL_${name}_DIR}")
-+endmacro()
-+
-+if(PERL_EXECUTABLE)
-+  _perl_get_config_var(prefixexp ROOT_DIR)
-+
-+  _perl_get_config_dir(ARCH_LIB)
-+  _perl_get_config_dir(SITE_ARCH)
-+  _perl_get_config_dir(VENDOR_ARCH)
-+  _perl_get_config_dir(SITE_LIB)
-+  _perl_get_config_dir(VENDOR_LIB)
-+
-+  _perl_get_config_var(version VERSION)
-+  _perl_get_config_var(ccflags CXX_FLAGS)
-+  _perl_get_config_var(ccdlflags CCDL_FLAGS)
-+
-+  EXECUTE_PROCESS(COMMAND ${PERL_EXECUTABLE} -MConfig -MFile::Spec -e "print '-L' . File::Spec->catdir(\$Config{archlibexp}, 'CORE')"
-+                  OUTPUT_VARIABLE PERL_EXTRA_LIB_PATHS)
-+
-+  _perl_get_config_var(perllibs LIBS)
-+
-+  FIND_PATH(PERL_INCLUDE_PATH
-+            NAMES perl.h
-+            HINTS ${PERL_ARCH_LIB_DIR}/CORE
-+  )
-+
-+  if(PERL_INCLUDE_PATH)
-+    SET(PERL_HEADERS_FOUND TRUE)
-+  endif (PERL_INCLUDE_PATH)
-+
-+  MARK_AS_ADVANCED(PERL_INCLUDE_PATH)
- ENDIF(PERL_EXECUTABLE)
- 
- IF(PERL_HEADERS_FOUND)
diff --git a/pkgs/desktops/kde-4.8/kdebindings/perlqt-use-site-arch-install-dir.patch b/pkgs/desktops/kde-4.8/kdebindings/perlqt-use-site-arch-install-dir.patch
deleted file mode 100644
index 04f0c558677..00000000000
--- a/pkgs/desktops/kde-4.8/kdebindings/perlqt-use-site-arch-install-dir.patch
+++ /dev/null
@@ -1,454 +0,0 @@
-commit c78779fcaff587818ee37bec3ded5e0617625b95
-Author: Yury G. Kudryashov [diff odt] <urkud.urkud@gmail.com>
-Date:   Wed Mar 21 01:01:27 2012 +0400
-
-    Install to PERL_SITE_ARCH_INSTALL_DIR
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 48020a1..16188df 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -36,7 +36,6 @@ macro_log_feature(Qwt5_Qt4_FOUND "Qwt5 for Qt4" "Qwt5 libraries for Qt4" "http:/
- add_definitions(-DDEBUG)
- 
- include (FindPerlMore)
--set(CUSTOM_PERL_SITE_ARCH_DIR ${PERL_SITE_ARCH_DIR} CACHE DIR "Custom installation directory for perl binary extension")
- 
- # the RPATH to be used when installing, but only if it's not a system directory
- GET_FILENAME_COMPONENT(SMOKE_LIB_DIR ${SMOKE_BASE_LIBRARY} PATH)
-diff --git a/INSTALL b/INSTALL
-index d19f97e..97cc9f1 100644
---- a/INSTALL
-+++ b/INSTALL
-@@ -36,7 +36,6 @@ ccmake step.
- The standard options are:
-     CMAKE_BUILD_TYPE = The type of build ('Debug', 'Release', etc)
-     CMAKE_INSTALL_PREFIX = The location for any executables ( e.g. puic4 )
--    CUSTOM_PERL_SITE_ARCH_DIR = The location for the perl modules themselves.
-     QT_QMAKE_EXECUTABLE = The path to your system's qmake.
- 
- cmake looks in your path for a qmake executable.  If it can't find it, it will
-diff --git a/Makefile.PL b/Makefile.PL
-index df9a13c..31dd912 100755
---- a/Makefile.PL
-+++ b/Makefile.PL
-@@ -3,7 +3,7 @@
- use strict;
- use Config;
- 
--my ($prefix, $sitearch, $qmake) = ($Config{prefix}, $Config{sitearch});
-+my ($prefix, $qmake) = ($Config{prefix});
- my @cmakeArgs;
- foreach my $arg (@ARGV) {
-     my $key = $arg;
-@@ -12,7 +12,6 @@ foreach my $arg (@ARGV) {
-     $value =~ s/^[^=]*=//g;
-     if ($key eq 'PREFIX' or $key eq 'INSTALL_BASE') {
-         $prefix = $value;
--        $sitearch = "$prefix";
-     }
-     elsif ($key eq 'QMAKE') {
-         $qmake = $value;
-@@ -34,7 +33,6 @@ if($^O =~ /win/i){
- }
- push @args, "-DCMAKE_INSTALL_PREFIX=$prefix" if $prefix;
- push @args, "-DQT_QMAKE_EXECUTABLE=$qmake" if $qmake;
--push @args, "-DCUSTOM_PERL_SITE_ARCH_DIR=$sitearch" if $sitearch;
- push @args, @cmakeArgs;
- 
- if ( eval "require Alien::SmokeQt" ) {
-diff --git a/phonon/lib/CMakeLists.txt b/phonon/lib/CMakeLists.txt
-index f2857c3..78674ea 100644
---- a/phonon/lib/CMakeLists.txt
-+++ b/phonon/lib/CMakeLists.txt
-@@ -1,2 +1,2 @@
- add_custom_target(phononpm ALL ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/Phonon.pm ${CMAKE_BINARY_DIR}/blib/lib/Phonon.pm)
--install(FILES Phonon.pm DESTINATION ${CUSTOM_PERL_SITE_ARCH_DIR}/)
-+install(FILES Phonon.pm DESTINATION ${PERL_SITE_ARCH_INSTALL_DIR}/)
-diff --git a/phonon/src/CMakeLists.txt b/phonon/src/CMakeLists.txt
-index a04db11..9933dfd 100644
---- a/phonon/src/CMakeLists.txt
-+++ b/phonon/src/CMakeLists.txt
-@@ -37,4 +37,4 @@ target_link_libraries(perl_phonon
- set_target_properties(perl_phonon PROPERTIES OUTPUT_NAME ${libraryName})
- set_target_properties(perl_phonon PROPERTIES PREFIX "")
- 
--install(TARGETS perl_phonon DESTINATION ${CUSTOM_PERL_SITE_ARCH_DIR}/auto/${libraryName}/)
-+install(TARGETS perl_phonon DESTINATION ${PERL_SITE_ARCH_INSTALL_DIR}/auto/${libraryName}/)
-diff --git a/qimageblitz/lib/CMakeLists.txt b/qimageblitz/lib/CMakeLists.txt
-index 0809ba8..22fc1c0 100644
---- a/qimageblitz/lib/CMakeLists.txt
-+++ b/qimageblitz/lib/CMakeLists.txt
-@@ -1,2 +1,2 @@
- add_custom_target(qimageblitzpm ALL ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/QImageBlitz.pm ${CMAKE_BINARY_DIR}/blib/lib/QImageBlitz.pm)
--install(FILES QImageBlitz.pm DESTINATION ${CUSTOM_PERL_SITE_ARCH_DIR}/)
-+install(FILES QImageBlitz.pm DESTINATION ${PERL_SITE_ARCH_INSTALL_DIR}/)
-diff --git a/qimageblitz/src/CMakeLists.txt b/qimageblitz/src/CMakeLists.txt
-index 02ef494..4f02c1b 100644
---- a/qimageblitz/src/CMakeLists.txt
-+++ b/qimageblitz/src/CMakeLists.txt
-@@ -37,4 +37,4 @@ target_link_libraries(perl_qimageblitz
- set_target_properties(perl_qimageblitz PROPERTIES OUTPUT_NAME ${libraryName})
- set_target_properties(perl_qimageblitz PROPERTIES PREFIX "")
- 
--install(TARGETS perl_qimageblitz DESTINATION ${CUSTOM_PERL_SITE_ARCH_DIR}/auto/${libraryName}/)
-+install(TARGETS perl_qimageblitz DESTINATION ${PERL_SITE_ARCH_INSTALL_DIR}/auto/${libraryName}/)
-diff --git a/qsci/lib/CMakeLists.txt b/qsci/lib/CMakeLists.txt
-index 63b451f..d22869f 100644
---- a/qsci/lib/CMakeLists.txt
-+++ b/qsci/lib/CMakeLists.txt
-@@ -1,2 +1,2 @@
- add_custom_target(qscipm ALL ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/Qsci.pm ${CMAKE_BINARY_DIR}/blib/lib/Qsci.pm)
--install(FILES Qsci.pm DESTINATION ${CUSTOM_PERL_SITE_ARCH_DIR}/)
-+install(FILES Qsci.pm DESTINATION ${PERL_SITE_ARCH_INSTALL_DIR}/)
-diff --git a/qsci/src/CMakeLists.txt b/qsci/src/CMakeLists.txt
-index 8c1659b..bdcb5a8 100644
---- a/qsci/src/CMakeLists.txt
-+++ b/qsci/src/CMakeLists.txt
-@@ -37,4 +37,4 @@ target_link_libraries(perl_qsci
- set_target_properties(perl_qsci PROPERTIES OUTPUT_NAME ${libraryName})
- set_target_properties(perl_qsci PROPERTIES PREFIX "")
- 
--install(TARGETS perl_qsci DESTINATION ${CUSTOM_PERL_SITE_ARCH_DIR}/auto/${libraryName}/)
-+install(TARGETS perl_qsci DESTINATION ${PERL_SITE_ARCH_INSTALL_DIR}/auto/${libraryName}/)
-diff --git a/qt3support/lib/CMakeLists.txt b/qt3support/lib/CMakeLists.txt
-index 2f04cfa..dda5afa 100644
---- a/qt3support/lib/CMakeLists.txt
-+++ b/qt3support/lib/CMakeLists.txt
-@@ -1,2 +1,2 @@
- add_custom_target(qt3support4pm ALL ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/Qt3Support4.pm ${CMAKE_BINARY_DIR}/blib/lib/Qt3Support4.pm)
--install(FILES Qt3Support4.pm DESTINATION ${CUSTOM_PERL_SITE_ARCH_DIR}/)
-+install(FILES Qt3Support4.pm DESTINATION ${PERL_SITE_ARCH_INSTALL_DIR}/)
-diff --git a/qt3support/src/CMakeLists.txt b/qt3support/src/CMakeLists.txt
-index b24532e..bed99aa 100644
---- a/qt3support/src/CMakeLists.txt
-+++ b/qt3support/src/CMakeLists.txt
-@@ -37,4 +37,4 @@ target_link_libraries(perl_qt3support4
- set_target_properties(perl_qt3support4 PROPERTIES OUTPUT_NAME ${libraryName})
- set_target_properties(perl_qt3support4 PROPERTIES PREFIX "")
- 
--install(TARGETS perl_qt3support4 DESTINATION ${CUSTOM_PERL_SITE_ARCH_DIR}/auto/${libraryName}/)
-+install(TARGETS perl_qt3support4 DESTINATION ${PERL_SITE_ARCH_INSTALL_DIR}/auto/${libraryName}/)
-diff --git a/qtcore/lib/CMakeLists.txt b/qtcore/lib/CMakeLists.txt
-index ef07d10..1d78196 100644
---- a/qtcore/lib/CMakeLists.txt
-+++ b/qtcore/lib/CMakeLists.txt
-@@ -1,3 +1,3 @@
- add_subdirectory( QtCore4 )
- add_custom_target(perlqtcore4pm ALL ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/QtCore4.pm ${CMAKE_BINARY_DIR}/blib/lib/QtCore4.pm)
--install( FILES QtCore4.pm DESTINATION ${CUSTOM_PERL_SITE_ARCH_DIR} )
-+install( FILES QtCore4.pm DESTINATION ${PERL_SITE_ARCH_INSTALL_DIR} )
-diff --git a/qtcore/lib/QtCore4/CMakeLists.txt b/qtcore/lib/QtCore4/CMakeLists.txt
-index 44c7893..06aef20 100644
---- a/qtcore/lib/QtCore4/CMakeLists.txt
-+++ b/qtcore/lib/QtCore4/CMakeLists.txt
-@@ -1,3 +1,3 @@
--install( FILES signals.pm slots.pm isa.pm debug.pm classinfo.pm DESTINATION ${CUSTOM_PERL_SITE_ARCH_DIR}/QtCore4 )
-+install( FILES signals.pm slots.pm isa.pm debug.pm classinfo.pm DESTINATION ${PERL_SITE_ARCH_INSTALL_DIR}/QtCore4 )
- add_custom_target(perlqt4pmlibmkdir ALL ${CMAKE_COMMAND} -E make_directory ${CMAKE_BINARY_DIR}/blib/lib/QtCore4)
- add_custom_target(perlqt4pmlibsubdir ALL ${CMAKE_COMMAND} -E copy_directory ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_BINARY_DIR}/blib/lib/QtCore4)
-diff --git a/qtcore/src/CMakeLists.txt b/qtcore/src/CMakeLists.txt
-index 3910636..b5e645c 100644
---- a/qtcore/src/CMakeLists.txt
-+++ b/qtcore/src/CMakeLists.txt
-@@ -53,10 +53,10 @@ target_link_libraries(perlqtcore4
- set_target_properties(perlqtcore4 PROPERTIES
-     OUTPUT_NAME ${libraryName}
-     PREFIX ""
--    INSTALL_NAME_DIR ${CUSTOM_PERL_SITE_ARCH_DIR}/auto/${libraryName}/
-+    INSTALL_NAME_DIR ${PERL_SITE_ARCH_INSTALL_DIR}/auto/${libraryName}/
- )
- 
--install(TARGETS perlqtcore4 EXPORT PerlQtExport DESTINATION ${CUSTOM_PERL_SITE_ARCH_DIR}/auto/${libraryName}/)
-+install(TARGETS perlqtcore4 EXPORT PerlQtExport DESTINATION ${PERL_SITE_ARCH_INSTALL_DIR}/auto/${libraryName}/)
- install(FILES binding.h handlers.h listclass_macros.h marshall_basetypes.h marshall_complex.h
-               marshall.h marshall_macros.h marshall_primitives.h marshall_types.h perlqt.h ppport.h
-               QtCore4.h smokehelp.h smokeperl.h util.h
-diff --git a/qtdbus/lib/CMakeLists.txt b/qtdbus/lib/CMakeLists.txt
-index d03a672..a60d603 100644
---- a/qtdbus/lib/CMakeLists.txt
-+++ b/qtdbus/lib/CMakeLists.txt
-@@ -1,2 +1,2 @@
- add_custom_target(qtdbus4pm ALL ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/QtDBus4.pm ${CMAKE_BINARY_DIR}/blib/lib/QtDBus4.pm)
--install(FILES QtDBus4.pm DESTINATION ${CUSTOM_PERL_SITE_ARCH_DIR}/)
-+install(FILES QtDBus4.pm DESTINATION ${PERL_SITE_ARCH_INSTALL_DIR}/)
-diff --git a/qtdbus/src/CMakeLists.txt b/qtdbus/src/CMakeLists.txt
-index 9aa05a0..5786ea2 100644
---- a/qtdbus/src/CMakeLists.txt
-+++ b/qtdbus/src/CMakeLists.txt
-@@ -31,4 +31,4 @@ target_link_libraries(perl_qtdbus4
- set_target_properties(perl_qtdbus4 PROPERTIES OUTPUT_NAME "QtDBus4")
- set_target_properties(perl_qtdbus4 PROPERTIES PREFIX "")
- 
--install(TARGETS perl_qtdbus4 DESTINATION ${CUSTOM_PERL_SITE_ARCH_DIR}/auto/QtDBus4/)
-+install(TARGETS perl_qtdbus4 DESTINATION ${PERL_SITE_ARCH_INSTALL_DIR}/auto/QtDBus4/)
-diff --git a/qtdeclarative/lib/CMakeLists.txt b/qtdeclarative/lib/CMakeLists.txt
-index e8d2847..b458858 100644
---- a/qtdeclarative/lib/CMakeLists.txt
-+++ b/qtdeclarative/lib/CMakeLists.txt
-@@ -1,2 +1,2 @@
- add_custom_target(qtdeclarative4pm ALL ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/QtDeclarative4.pm ${CMAKE_BINARY_DIR}/blib/lib/QtDeclarative4.pm)
--install(FILES QtDeclarative4.pm DESTINATION ${CUSTOM_PERL_SITE_ARCH_DIR}/)
-+install(FILES QtDeclarative4.pm DESTINATION ${PERL_SITE_ARCH_INSTALL_DIR}/)
-diff --git a/qtdeclarative/src/CMakeLists.txt b/qtdeclarative/src/CMakeLists.txt
-index 1662167..ec2a8fc 100644
---- a/qtdeclarative/src/CMakeLists.txt
-+++ b/qtdeclarative/src/CMakeLists.txt
-@@ -37,4 +37,4 @@ target_link_libraries(perl_qtdeclarative4
- set_target_properties(perl_qtdeclarative4 PROPERTIES OUTPUT_NAME ${libraryName})
- set_target_properties(perl_qtdeclarative4 PROPERTIES PREFIX "")
- 
--install(TARGETS perl_qtdeclarative4 DESTINATION ${CUSTOM_PERL_SITE_ARCH_DIR}/auto/${libraryName}/)
-+install(TARGETS perl_qtdeclarative4 DESTINATION ${PERL_SITE_ARCH_INSTALL_DIR}/auto/${libraryName}/)
-diff --git a/qtgui/lib/CMakeLists.txt b/qtgui/lib/CMakeLists.txt
-index 82626c8..e62a4ac 100644
---- a/qtgui/lib/CMakeLists.txt
-+++ b/qtgui/lib/CMakeLists.txt
-@@ -1,2 +1,2 @@
- add_custom_target(qtgui4pm ALL ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/QtGui4.pm ${CMAKE_BINARY_DIR}/blib/lib/QtGui4.pm)
--install(FILES QtGui4.pm DESTINATION ${CUSTOM_PERL_SITE_ARCH_DIR}/)
-+install(FILES QtGui4.pm DESTINATION ${PERL_SITE_ARCH_INSTALL_DIR}/)
-diff --git a/qtgui/src/CMakeLists.txt b/qtgui/src/CMakeLists.txt
-index 4cc8b36..44041b6 100644
---- a/qtgui/src/CMakeLists.txt
-+++ b/qtgui/src/CMakeLists.txt
-@@ -38,4 +38,4 @@ target_link_libraries(perl_qtgui4
- set_target_properties(perl_qtgui4 PROPERTIES OUTPUT_NAME ${libraryName})
- set_target_properties(perl_qtgui4 PROPERTIES PREFIX "")
- 
--install(TARGETS perl_qtgui4 DESTINATION ${CUSTOM_PERL_SITE_ARCH_DIR}/auto/${libraryName}/)
-+install(TARGETS perl_qtgui4 DESTINATION ${PERL_SITE_ARCH_INSTALL_DIR}/auto/${libraryName}/)
-diff --git a/qthelp/lib/CMakeLists.txt b/qthelp/lib/CMakeLists.txt
-index dcf5ebe..da817d4 100644
---- a/qthelp/lib/CMakeLists.txt
-+++ b/qthelp/lib/CMakeLists.txt
-@@ -1,2 +1,2 @@
- add_custom_target(qthelp4pm ALL ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/QtHelp4.pm ${CMAKE_BINARY_DIR}/blib/lib/QtHelp4.pm)
--install(FILES QtHelp4.pm DESTINATION ${CUSTOM_PERL_SITE_ARCH_DIR}/)
-+install(FILES QtHelp4.pm DESTINATION ${PERL_SITE_ARCH_INSTALL_DIR}/)
-diff --git a/qthelp/src/CMakeLists.txt b/qthelp/src/CMakeLists.txt
-index c00359d..689cb29 100644
---- a/qthelp/src/CMakeLists.txt
-+++ b/qthelp/src/CMakeLists.txt
-@@ -37,4 +37,4 @@ target_link_libraries(perl_qthelp4
- set_target_properties(perl_qthelp4 PROPERTIES OUTPUT_NAME ${libraryName})
- set_target_properties(perl_qthelp4 PROPERTIES PREFIX "")
- 
--install(TARGETS perl_qthelp4 DESTINATION ${CUSTOM_PERL_SITE_ARCH_DIR}/auto/${libraryName}/)
-+install(TARGETS perl_qthelp4 DESTINATION ${PERL_SITE_ARCH_INSTALL_DIR}/auto/${libraryName}/)
-diff --git a/qtmultimedia/lib/CMakeLists.txt b/qtmultimedia/lib/CMakeLists.txt
-index e55f697..5384539 100644
---- a/qtmultimedia/lib/CMakeLists.txt
-+++ b/qtmultimedia/lib/CMakeLists.txt
-@@ -1,2 +1,2 @@
- add_custom_target(qtmultimedia4pm ALL ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/QtMultimedia4.pm ${CMAKE_BINARY_DIR}/blib/lib/QtMultimedia4.pm)
--install(FILES QtMultimedia4.pm DESTINATION ${CUSTOM_PERL_SITE_ARCH_DIR}/)
-+install(FILES QtMultimedia4.pm DESTINATION ${PERL_SITE_ARCH_INSTALL_DIR}/)
-diff --git a/qtmultimedia/src/CMakeLists.txt b/qtmultimedia/src/CMakeLists.txt
-index 0728aba..df8e552 100644
---- a/qtmultimedia/src/CMakeLists.txt
-+++ b/qtmultimedia/src/CMakeLists.txt
-@@ -37,4 +37,4 @@ target_link_libraries(perl_qtmultimedia4
- set_target_properties(perl_qtmultimedia4 PROPERTIES OUTPUT_NAME ${libraryName})
- set_target_properties(perl_qtmultimedia4 PROPERTIES PREFIX "")
- 
--install(TARGETS perl_qtmultimedia4 DESTINATION ${CUSTOM_PERL_SITE_ARCH_DIR}/auto/${libraryName}/)
-+install(TARGETS perl_qtmultimedia4 DESTINATION ${PERL_SITE_ARCH_INSTALL_DIR}/auto/${libraryName}/)
-diff --git a/qtnetwork/lib/CMakeLists.txt b/qtnetwork/lib/CMakeLists.txt
-index 12cd5dd..d1fb0e6 100644
---- a/qtnetwork/lib/CMakeLists.txt
-+++ b/qtnetwork/lib/CMakeLists.txt
-@@ -1,2 +1,2 @@
- add_custom_target(qtnetwork4pm ALL ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/QtNetwork4.pm ${CMAKE_BINARY_DIR}/blib/lib/QtNetwork4.pm)
--install(FILES QtNetwork4.pm DESTINATION ${CUSTOM_PERL_SITE_ARCH_DIR}/)
-+install(FILES QtNetwork4.pm DESTINATION ${PERL_SITE_ARCH_INSTALL_DIR}/)
-diff --git a/qtnetwork/src/CMakeLists.txt b/qtnetwork/src/CMakeLists.txt
-index caf8327..0994d57 100644
---- a/qtnetwork/src/CMakeLists.txt
-+++ b/qtnetwork/src/CMakeLists.txt
-@@ -39,4 +39,4 @@ target_link_libraries(perl_qtnetwork4
- set_target_properties(perl_qtnetwork4 PROPERTIES OUTPUT_NAME ${libraryName})
- set_target_properties(perl_qtnetwork4 PROPERTIES PREFIX "")
- 
--install(TARGETS perl_qtnetwork4 DESTINATION ${CUSTOM_PERL_SITE_ARCH_DIR}/auto/${libraryName}/)
-+install(TARGETS perl_qtnetwork4 DESTINATION ${PERL_SITE_ARCH_INSTALL_DIR}/auto/${libraryName}/)
-diff --git a/qtopengl/lib/CMakeLists.txt b/qtopengl/lib/CMakeLists.txt
-index f3b5640..d8dc9e4 100644
---- a/qtopengl/lib/CMakeLists.txt
-+++ b/qtopengl/lib/CMakeLists.txt
-@@ -1,2 +1,2 @@
- add_custom_target(qtopengl4pm ALL ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/QtOpenGL4.pm ${CMAKE_BINARY_DIR}/blib/lib/QtOpenGL4.pm)
--install(FILES QtOpenGL4.pm DESTINATION ${CUSTOM_PERL_SITE_ARCH_DIR}/)
-+install(FILES QtOpenGL4.pm DESTINATION ${PERL_SITE_ARCH_INSTALL_DIR}/)
-diff --git a/qtopengl/src/CMakeLists.txt b/qtopengl/src/CMakeLists.txt
-index 20493a9..777af89 100644
---- a/qtopengl/src/CMakeLists.txt
-+++ b/qtopengl/src/CMakeLists.txt
-@@ -37,4 +37,4 @@ target_link_libraries(perl_qtopengl4
- set_target_properties(perl_qtopengl4 PROPERTIES OUTPUT_NAME ${libraryName})
- set_target_properties(perl_qtopengl4 PROPERTIES PREFIX "")
- 
--install(TARGETS perl_qtopengl4 DESTINATION ${CUSTOM_PERL_SITE_ARCH_DIR}/auto/${libraryName}/)
-+install(TARGETS perl_qtopengl4 DESTINATION ${PERL_SITE_ARCH_INSTALL_DIR}/auto/${libraryName}/)
-diff --git a/qtscript/lib/CMakeLists.txt b/qtscript/lib/CMakeLists.txt
-index d21dbe5..320ff93 100644
---- a/qtscript/lib/CMakeLists.txt
-+++ b/qtscript/lib/CMakeLists.txt
-@@ -1,2 +1,2 @@
- add_custom_target(qtscript4pm ALL ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/QtScript4.pm ${CMAKE_BINARY_DIR}/blib/lib/QtScript4.pm)
--install(FILES QtScript4.pm DESTINATION ${CUSTOM_PERL_SITE_ARCH_DIR}/)
-+install(FILES QtScript4.pm DESTINATION ${PERL_SITE_ARCH_INSTALL_DIR}/)
-diff --git a/qtscript/src/CMakeLists.txt b/qtscript/src/CMakeLists.txt
-index dd395be..6ff47d8 100644
---- a/qtscript/src/CMakeLists.txt
-+++ b/qtscript/src/CMakeLists.txt
-@@ -37,4 +37,4 @@ target_link_libraries(perl_qtscript4
- set_target_properties(perl_qtscript4 PROPERTIES OUTPUT_NAME ${libraryName})
- set_target_properties(perl_qtscript4 PROPERTIES PREFIX "")
- 
--install(TARGETS perl_qtscript4 DESTINATION ${CUSTOM_PERL_SITE_ARCH_DIR}/auto/${libraryName}/)
-+install(TARGETS perl_qtscript4 DESTINATION ${PERL_SITE_ARCH_INSTALL_DIR}/auto/${libraryName}/)
-diff --git a/qtsql/lib/CMakeLists.txt b/qtsql/lib/CMakeLists.txt
-index 59336d3..d9dd4d5 100644
---- a/qtsql/lib/CMakeLists.txt
-+++ b/qtsql/lib/CMakeLists.txt
-@@ -1,2 +1,2 @@
- add_custom_target(qtsql4pm ALL ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/QtSql4.pm ${CMAKE_BINARY_DIR}/blib/lib/QtSql4.pm)
--install(FILES QtSql4.pm DESTINATION ${CUSTOM_PERL_SITE_ARCH_DIR}/)
-+install(FILES QtSql4.pm DESTINATION ${PERL_SITE_ARCH_INSTALL_DIR}/)
-diff --git a/qtsql/src/CMakeLists.txt b/qtsql/src/CMakeLists.txt
-index 3ec2028..59096ba 100644
---- a/qtsql/src/CMakeLists.txt
-+++ b/qtsql/src/CMakeLists.txt
-@@ -37,4 +37,4 @@ target_link_libraries(perl_qtsql4
- set_target_properties(perl_qtsql4 PROPERTIES OUTPUT_NAME ${libraryName})
- set_target_properties(perl_qtsql4 PROPERTIES PREFIX "")
- 
--install(TARGETS perl_qtsql4 DESTINATION ${CUSTOM_PERL_SITE_ARCH_DIR}/auto/${libraryName}/)
-+install(TARGETS perl_qtsql4 DESTINATION ${PERL_SITE_ARCH_INSTALL_DIR}/auto/${libraryName}/)
-diff --git a/qtsvg/lib/CMakeLists.txt b/qtsvg/lib/CMakeLists.txt
-index 33f6deb..bf1dc1f 100644
---- a/qtsvg/lib/CMakeLists.txt
-+++ b/qtsvg/lib/CMakeLists.txt
-@@ -1,2 +1,2 @@
- add_custom_target(qtsvg4pm ALL ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/QtSvg4.pm ${CMAKE_BINARY_DIR}/blib/lib/QtSvg4.pm)
--install(FILES QtSvg4.pm DESTINATION ${CUSTOM_PERL_SITE_ARCH_DIR}/)
-+install(FILES QtSvg4.pm DESTINATION ${PERL_SITE_ARCH_INSTALL_DIR}/)
-diff --git a/qtsvg/src/CMakeLists.txt b/qtsvg/src/CMakeLists.txt
-index 11eccd2..449bf0f 100644
---- a/qtsvg/src/CMakeLists.txt
-+++ b/qtsvg/src/CMakeLists.txt
-@@ -37,4 +37,4 @@ target_link_libraries(perl_qtsvg4
- set_target_properties(perl_qtsvg4 PROPERTIES OUTPUT_NAME ${libraryName})
- set_target_properties(perl_qtsvg4 PROPERTIES PREFIX "")
- 
--install(TARGETS perl_qtsvg4 DESTINATION ${CUSTOM_PERL_SITE_ARCH_DIR}/auto/${libraryName}/)
-+install(TARGETS perl_qtsvg4 DESTINATION ${PERL_SITE_ARCH_INSTALL_DIR}/auto/${libraryName}/)
-diff --git a/qttest/lib/CMakeLists.txt b/qttest/lib/CMakeLists.txt
-index 3bfa78c..5a8d8da 100644
---- a/qttest/lib/CMakeLists.txt
-+++ b/qttest/lib/CMakeLists.txt
-@@ -1,2 +1,2 @@
- add_custom_target(qttest4pm ALL ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/QtTest4.pm ${CMAKE_BINARY_DIR}/blib/lib/QtTest4.pm)
--install(FILES QtTest4.pm DESTINATION ${CUSTOM_PERL_SITE_ARCH_DIR}/)
-+install(FILES QtTest4.pm DESTINATION ${PERL_SITE_ARCH_INSTALL_DIR}/)
-diff --git a/qttest/src/CMakeLists.txt b/qttest/src/CMakeLists.txt
-index 5492e55..d4662b1 100644
---- a/qttest/src/CMakeLists.txt
-+++ b/qttest/src/CMakeLists.txt
-@@ -38,4 +38,4 @@ target_link_libraries(perl_qttest4
- set_target_properties(perl_qttest4 PROPERTIES OUTPUT_NAME ${libraryName})
- set_target_properties(perl_qttest4 PROPERTIES PREFIX "")
- 
--install(TARGETS perl_qttest4 DESTINATION ${CUSTOM_PERL_SITE_ARCH_DIR}/auto/${libraryName}/)
-+install(TARGETS perl_qttest4 DESTINATION ${PERL_SITE_ARCH_INSTALL_DIR}/auto/${libraryName}/)
-diff --git a/qtuitools/lib/CMakeLists.txt b/qtuitools/lib/CMakeLists.txt
-index 119e40e..3a5f472 100644
---- a/qtuitools/lib/CMakeLists.txt
-+++ b/qtuitools/lib/CMakeLists.txt
-@@ -1,2 +1,2 @@
- add_custom_target(qtuitools4pm ALL ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/QtUiTools4.pm ${CMAKE_BINARY_DIR}/blib/lib/QtUiTools4.pm)
--install(FILES QtUiTools4.pm DESTINATION ${CUSTOM_PERL_SITE_ARCH_DIR}/)
-+install(FILES QtUiTools4.pm DESTINATION ${PERL_SITE_ARCH_INSTALL_DIR}/)
-diff --git a/qtuitools/src/CMakeLists.txt b/qtuitools/src/CMakeLists.txt
-index a8ae4a2..ecc079f 100644
---- a/qtuitools/src/CMakeLists.txt
-+++ b/qtuitools/src/CMakeLists.txt
-@@ -37,4 +37,4 @@ target_link_libraries(perl_qtuitools4
- set_target_properties(perl_qtuitools4 PROPERTIES OUTPUT_NAME ${libraryName})
- set_target_properties(perl_qtuitools4 PROPERTIES PREFIX "")
- 
--install(TARGETS perl_qtuitools4 DESTINATION ${CUSTOM_PERL_SITE_ARCH_DIR}/auto/${libraryName}/)
-+install(TARGETS perl_qtuitools4 DESTINATION ${PERL_SITE_ARCH_INSTALL_DIR}/auto/${libraryName}/)
-diff --git a/qtwebkit/lib/CMakeLists.txt b/qtwebkit/lib/CMakeLists.txt
-index a02f7ee..3846227 100644
---- a/qtwebkit/lib/CMakeLists.txt
-+++ b/qtwebkit/lib/CMakeLists.txt
-@@ -1,2 +1,2 @@
- add_custom_target(qtwebkit4pm ALL ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/QtWebKit4.pm ${CMAKE_BINARY_DIR}/blib/lib/QtWebKit4.pm)
--install(FILES QtWebKit4.pm DESTINATION ${CUSTOM_PERL_SITE_ARCH_DIR}/)
-+install(FILES QtWebKit4.pm DESTINATION ${PERL_SITE_ARCH_INSTALL_DIR}/)
-diff --git a/qtwebkit/src/CMakeLists.txt b/qtwebkit/src/CMakeLists.txt
-index a6e00f8..dbebc44 100644
---- a/qtwebkit/src/CMakeLists.txt
-+++ b/qtwebkit/src/CMakeLists.txt
-@@ -37,4 +37,4 @@ target_link_libraries(perl_qtwebkit4
- set_target_properties(perl_qtwebkit4 PROPERTIES OUTPUT_NAME ${libraryName})
- set_target_properties(perl_qtwebkit4 PROPERTIES PREFIX "")
- 
--install(TARGETS perl_qtwebkit4 DESTINATION ${CUSTOM_PERL_SITE_ARCH_DIR}/auto/${libraryName}/)
-+install(TARGETS perl_qtwebkit4 DESTINATION ${PERL_SITE_ARCH_INSTALL_DIR}/auto/${libraryName}/)
-diff --git a/qtxml/lib/CMakeLists.txt b/qtxml/lib/CMakeLists.txt
-index 5505bc4..7db743c 100644
---- a/qtxml/lib/CMakeLists.txt
-+++ b/qtxml/lib/CMakeLists.txt
-@@ -1,2 +1,2 @@
- add_custom_target(qtxml4pm ALL ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/QtXml4.pm ${CMAKE_BINARY_DIR}/blib/lib/QtXml4.pm)
--install(FILES QtXml4.pm DESTINATION ${CUSTOM_PERL_SITE_ARCH_DIR}/)
-+install(FILES QtXml4.pm DESTINATION ${PERL_SITE_ARCH_INSTALL_DIR}/)
-diff --git a/qtxml/src/CMakeLists.txt b/qtxml/src/CMakeLists.txt
-index 018508c..a351609 100644
---- a/qtxml/src/CMakeLists.txt
-+++ b/qtxml/src/CMakeLists.txt
-@@ -37,4 +37,4 @@ target_link_libraries(perl_qtxml4
- set_target_properties(perl_qtxml4 PROPERTIES OUTPUT_NAME ${libraryName})
- set_target_properties(perl_qtxml4 PROPERTIES PREFIX "")
- 
--install(TARGETS perl_qtxml4 DESTINATION ${CUSTOM_PERL_SITE_ARCH_DIR}/auto/${libraryName}/)
-+install(TARGETS perl_qtxml4 DESTINATION ${PERL_SITE_ARCH_INSTALL_DIR}/auto/${libraryName}/)
-diff --git a/qtxmlpatterns/lib/CMakeLists.txt b/qtxmlpatterns/lib/CMakeLists.txt
-index a35f3df..3d86103 100644
---- a/qtxmlpatterns/lib/CMakeLists.txt
-+++ b/qtxmlpatterns/lib/CMakeLists.txt
-@@ -1,2 +1,2 @@
- add_custom_target(qtxmlpatterns4pm ALL ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/QtXmlPatterns4.pm ${CMAKE_BINARY_DIR}/blib/lib/QtXmlPatterns4.pm)
--install(FILES QtXmlPatterns4.pm DESTINATION ${CUSTOM_PERL_SITE_ARCH_DIR}/)
-+install(FILES QtXmlPatterns4.pm DESTINATION ${PERL_SITE_ARCH_INSTALL_DIR}/)
-diff --git a/qtxmlpatterns/src/CMakeLists.txt b/qtxmlpatterns/src/CMakeLists.txt
-index 9970a98..563e922 100644
---- a/qtxmlpatterns/src/CMakeLists.txt
-+++ b/qtxmlpatterns/src/CMakeLists.txt
-@@ -37,4 +37,4 @@ target_link_libraries(perl_qtxmlpatterns4
- set_target_properties(perl_qtxmlpatterns4 PROPERTIES OUTPUT_NAME ${libraryName})
- set_target_properties(perl_qtxmlpatterns4 PROPERTIES PREFIX "")
- 
--install(TARGETS perl_qtxmlpatterns4 DESTINATION ${CUSTOM_PERL_SITE_ARCH_DIR}/auto/${libraryName}/)
-+install(TARGETS perl_qtxmlpatterns4 DESTINATION ${PERL_SITE_ARCH_INSTALL_DIR}/auto/${libraryName}/)
-diff --git a/qwt/lib/CMakeLists.txt b/qwt/lib/CMakeLists.txt
-index 0013c4d..d67ffbf 100644
---- a/qwt/lib/CMakeLists.txt
-+++ b/qwt/lib/CMakeLists.txt
-@@ -1,2 +1,2 @@
- add_custom_target(qwtpm ALL ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/Qwt.pm ${CMAKE_BINARY_DIR}/blib/lib/Qwt.pm)
--install(FILES Qwt.pm DESTINATION ${CUSTOM_PERL_SITE_ARCH_DIR}/)
-+install(FILES Qwt.pm DESTINATION ${PERL_SITE_ARCH_INSTALL_DIR}/)
-diff --git a/qwt/src/CMakeLists.txt b/qwt/src/CMakeLists.txt
-index 869d818..b644e80 100644
---- a/qwt/src/CMakeLists.txt
-+++ b/qwt/src/CMakeLists.txt
-@@ -37,4 +37,4 @@ target_link_libraries(perl_qwt
- set_target_properties(perl_qwt PROPERTIES OUTPUT_NAME ${libraryName})
- set_target_properties(perl_qwt PROPERTIES PREFIX "")
- 
--install(TARGETS perl_qwt DESTINATION ${CUSTOM_PERL_SITE_ARCH_DIR}/auto/${libraryName}/)
-+install(TARGETS perl_qwt DESTINATION ${PERL_SITE_ARCH_INSTALL_DIR}/auto/${libraryName}/)
diff --git a/pkgs/desktops/kde-4.8/kdebindings/perlqt.nix b/pkgs/desktops/kde-4.8/kdebindings/perlqt.nix
deleted file mode 100644
index f2b5462f33e..00000000000
--- a/pkgs/desktops/kde-4.8/kdebindings/perlqt.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-{ kde, cmake, smokeqt, perl }:
-
-kde {
-  buildInputs = [ smokeqt perl ];
-  nativeBuildInputs = [ cmake ];
-
-  patches =
-    # The order is important
-    [ ./perlqt-include-smokeqt.patch ./perlqt-rewrite-FindPerlMore.patch
-      ./perlqt-use-site-arch-install-dir.patch
-    ];
-
-  meta = {
-    description = "Perl bindings for Qt library";
-  };
-}
diff --git a/pkgs/desktops/kde-4.8/kdebindings/pykde4-hardcode-lib-python.patch b/pkgs/desktops/kde-4.8/kdebindings/pykde4-hardcode-lib-python.patch
deleted file mode 100644
index e7a7cb4c661..00000000000
--- a/pkgs/desktops/kde-4.8/kdebindings/pykde4-hardcode-lib-python.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-diff --git a/kpythonpluginfactory/CMakeLists.txt b/kpythonpluginfactory/CMakeLists.txt
-index 41fa0fe..642d867 100644
---- a/kpythonpluginfactory/CMakeLists.txt
-+++ b/kpythonpluginfactory/CMakeLists.txt
-@@ -3,7 +3,12 @@
- set(kpythonpluginfactory_SRCS
-     kpythonpluginfactory.cpp)
- 
--GET_FILENAME_COMPONENT(LIB_PYTHON ${PYTHON_LIBRARY} NAME)
-+option(HARDCODE_LIB_PYTHON_PATH "Whether the path to libpython.so should be hardcoded" OFF)
-+if(HARDCODE_LIB_PYTHON_PATH)
-+	get_filename_component(LIB_PYTHON ${PYTHON_LIBRARY} REALPATH)
-+else(HARDCODE_LIB_PYTHON_PATH)
-+    get_filename_component(LIB_PYTHON ${PYTHON_LIBRARY} NAME)
-+endif(HARDCODE_LIB_PYTHON_PATH)
- ADD_DEFINITIONS(-DLIB_PYTHON=\\"${LIB_PYTHON}\\")
- ADD_DEFINITIONS(-DKDE_DEFAULT_DEBUG_AREA=15000)
- 
diff --git a/pkgs/desktops/kde-4.8/kdebindings/pykde4-new-sip.patch b/pkgs/desktops/kde-4.8/kdebindings/pykde4-new-sip.patch
deleted file mode 100644
index 96b3b887a8d..00000000000
--- a/pkgs/desktops/kde-4.8/kdebindings/pykde4-new-sip.patch
+++ /dev/null
@@ -1,91 +0,0 @@
-commit 017822bd0dfc83fe9a7a483ecc33f4aab839a3c6
-Author: Luca Beltrame <lbeltrame@kde.org>
-Date:   Mon Oct 1 20:47:56 2012 +0200
-
-    Remove duplicated QVector<int> definition, since it's in PyQt now.
-    Simon, if you have time, please review if everything is OK.
-    
-    CCMAIL: simon@simonzone.com
-
-diff --git a/sip/kdecore/typedefs.sip b/sip/kdecore/typedefs.sip
-index 5a0a080..73dad01 100644
---- a/sip/kdecore/typedefs.sip
-+++ b/sip/kdecore/typedefs.sip
-@@ -951,77 +951,3 @@ template <TYPE1>
- %End
- };
- 
--%MappedType QVector<int>
--{
--%TypeHeaderCode
--#include <qvector.h>
--%End
--
--%ConvertFromTypeCode
--    // Create the list.
--    PyObject *l;
--
--    if ((l = PyList_New(sipCpp->size())) == NULL)
--        return NULL;
--
--    // Set the list elements.
--    for (int i = 0; i < sipCpp->size(); ++i)
--    {
--        int t = (sipCpp->at(i));
--
--#if PY_MAJOR_VERSION >= 3        
--        PyObject *tobj = PyLong_FromLong(t);
--#else
--        PyObject *tobj = PyInt_FromLong(t);
--#endif
--
--        PyList_SET_ITEM(l, i, tobj);
--    }
--
--    return l;
--%End
--
--%ConvertToTypeCode
--    // Check the type if that is all that is required.
--    if (sipIsErr == NULL)
--    {
--        if (!PyList_Check(sipPy))
--            return 0;
--
--        for (int i = 0; i < PyList_GET_SIZE(sipPy); ++i) {
--            PyObject *tobj = PyList_GET_ITEM(sipPy, i);
--#if PY_MAJOR_VERSION >= 3
--            if (!PyNumber_Check(tobj))
--#else
--            if (!PyInt_Check(tobj))
--#endif
--                return 0;
--        }
--        return 1;
--    }
--
--    QVector<int> *qv = new QVector<int>;
-- 
--    for (int i = 0; i < PyList_GET_SIZE(sipPy); ++i)
--    {
--        PyObject *tobj = PyList_GET_ITEM(sipPy, i);
-- #if PY_MAJOR_VERSION >= 3
--        int t = PyLong_AsLong (tobj);
--#else
--        int t = PyInt_AS_LONG (tobj);
--#endif
--
--        if (*sipIsErr)
--        {
--            delete qv;
--            return 0;
--        }
--
--        qv->append(t);
--    }
-- 
--    *sipCppPtr = qv;
-- 
--    return sipGetState(sipTransferObj);
--%End
--};
diff --git a/pkgs/desktops/kde-4.8/kdebindings/pykde4.nix b/pkgs/desktops/kde-4.8/kdebindings/pykde4.nix
deleted file mode 100644
index eb4d49616c4..00000000000
--- a/pkgs/desktops/kde-4.8/kdebindings/pykde4.nix
+++ /dev/null
@@ -1,29 +0,0 @@
-{ kde, kdelibs, python, sip, pyqt4, kdepimlibs, shared_desktop_ontologies,
-  boost, lndir }:
-
-let pydir = "lib/python${python.majorVersion}"; in
-
-kde {
-  buildInputs = [ python kdepimlibs shared_desktop_ontologies boost ];
-
-  propagatedBuildInputs = [ pyqt4 sip ];
-
-  patches = [ ./pykde4-hardcode-lib-python.patch ./pykde4-new-sip.patch ];
-
-  cmakeFlags = "-DHARDCODE_LIB_PYTHON_PATH=ON ";
-
-  preConfigure =
-    ''
-      # Symlink PyQt into PyKDE.  This is necessary because PyQt looks
-      # in its PyQt4/uic/widget-plugins directory for plugins, and KDE
-      # needs to install a plugin.
-      mkdir -pv $out/${pydir}
-      ${lndir}/bin/lndir ${pyqt4}/${pydir} $out/${pydir}
-      cmakeFlagsArray=( "-DSIP_DEFAULT_SIP_DIR=$prefix/share/sip" )
-    '';
-
-  meta = {
-    description = "Python bindings for KDE";
-    kde.name = "pykde4";
-  };
-}
diff --git a/pkgs/desktops/kde-4.8/kdebindings/qtruby-include-smokeqt.patch b/pkgs/desktops/kde-4.8/kdebindings/qtruby-include-smokeqt.patch
deleted file mode 100644
index 7d20a3c1c0b..00000000000
--- a/pkgs/desktops/kde-4.8/kdebindings/qtruby-include-smokeqt.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 33078b4..1a6ad2e 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -5,7 +5,7 @@ set(COMPILE_RUBY FALSE CACHE INTERNAL "")
- find_package(Ruby REQUIRED)
- find_package(Qt4 REQUIRED)
- find_package(Smoke COMPONENTS QtCore QtGui QtXml QtOpenGl QtSql QtNetwork QtDbus QtSvg Phonon QSci QtDeclarative QtScript QtWebkit QtUiTools QtTest Qwt)
--include_directories(${SMOKE_INCLUDE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/src ${QT_INCLUDES})
-+include_directories(${SMOKE_INCLUDE_DIR} ${SMOKE_QTCORE_INCLUDE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/src ${QT_INCLUDES})
- 
- set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${SMOKE_CMAKE_MODULE_DIR})
- include(MacroOptionalFindPackage)
diff --git a/pkgs/desktops/kde-4.8/kdebindings/qtruby-install-prefix.patch b/pkgs/desktops/kde-4.8/kdebindings/qtruby-install-prefix.patch
deleted file mode 100644
index bd95a0d8bd3..00000000000
--- a/pkgs/desktops/kde-4.8/kdebindings/qtruby-install-prefix.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 33078b4..30aec0e 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -31,8 +31,8 @@ if (NOT COMPILE_RUBY)
-     return()
- endif (NOT COMPILE_RUBY)
- 
--SET(CUSTOM_RUBY_SITE_ARCH_DIR ${RUBY_SITEARCH_DIR} CACHE DIR "custom installation directory for ruby binary extension" )
--SET(CUSTOM_RUBY_SITE_LIB_DIR ${RUBY_SITELIB_DIR} CACHE DIR "custom installation directory for ruby extension" )
-+string(REPLACE "${RUBY_ROOT_DIR}" "${CMAKE_INSTALL_PREFIX}" CUSTOM_RUBY_SITE_ARCH_DIR ${RUBY_SITEARCH_DIR})
-+string(REPLACE "${RUBY_ROOT_DIR}" "${CMAKE_INSTALL_PREFIX}" CUSTOM_RUBY_SITE_LIB_DIR ${RUBY_SITELIB_DIR})
- 
- # compute an overall version number which can be compared at once
- MATH(EXPR RUBY_VERSION_NUMBER "${RUBY_VERSION_MAJOR}*10000 + ${RUBY_VERSION_MINOR}*100 + ${RUBY_VERSION_PATCH}")
diff --git a/pkgs/desktops/kde-4.8/kdebindings/qtruby.nix b/pkgs/desktops/kde-4.8/kdebindings/qtruby.nix
deleted file mode 100644
index 723732f6104..00000000000
--- a/pkgs/desktops/kde-4.8/kdebindings/qtruby.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-{ kde, cmake, smokeqt, ruby }:
-
-kde {
-  buildInputs = [ smokeqt ruby ];
-  nativeBuildInputs = [ cmake ];
-
-  # The second patch is not ready for upstream submmission. I should add an
-  # option() instead.
-  patches = [ ./qtruby-include-smokeqt.patch ./qtruby-install-prefix.patch ];
-
-  cmakeFlags="-DRUBY_ROOT_DIR=${ruby}";
-
-  meta = {
-    description = "Ruby bindings for Qt library";
-  };
-}
diff --git a/pkgs/desktops/kde-4.8/kdebindings/smokegen-nix.patch b/pkgs/desktops/kde-4.8/kdebindings/smokegen-nix.patch
deleted file mode 100644
index 03df484b63e..00000000000
--- a/pkgs/desktops/kde-4.8/kdebindings/smokegen-nix.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 79945c4..a244d0f 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -32,10 +32,6 @@ set(generator_SRC
-     type.cpp
- )
- 
--# force RPATH so that the binary is usable from within the build tree
--set (CMAKE_SKIP_BUILD_RPATH FALSE)
--set (CMAKE_SKIP_RPATH FALSE)
--
- configure_file( ${CMAKE_CURRENT_SOURCE_DIR}/config.h.in config.h @ONLY )
- 
- add_executable(smokegen ${generator_SRC})
-diff --git a/cmake/SmokeConfig.cmake.in b/cmake/SmokeConfig.cmake.in
-index 947315c..de8d66c 100644
---- a/cmake/SmokeConfig.cmake.in
-+++ b/cmake/SmokeConfig.cmake.in
-@@ -44,21 +44,19 @@ macro (find_smoke_component name)
-         set (SMOKE_${uppercase}_FOUND FALSE CACHE INTERNAL "")
- 
-         find_path(SMOKE_${uppercase}_INCLUDE_DIR 
--            ${lowercase}_smoke.h 
--            PATH ${SMOKE_INCLUDE_DIR}
--            NO_DEFAULT_PATH
-+            ${lowercase}_smoke.h
-+            HINTS ${SMOKE_INCLUDE_DIR}
-+            PATH_SUFFIXES smoke
-             )
-         if(WIN32)
- 		    # DLLs are in the bin directory.
-             find_library(SMOKE_${uppercase}_LIBRARY
-                 smoke${lowercase}
--                PATHS "@CMAKE_INSTALL_PREFIX@/bin"
--                NO_DEFAULT_PATH)
-+                PATHS "@CMAKE_INSTALL_PREFIX@/bin")
-         else(WIN32)
-             find_library(SMOKE_${uppercase}_LIBRARY
-                 smoke${lowercase}
--                PATHS "@SMOKE_LIBRARY_PREFIX@"
--                NO_DEFAULT_PATH)
-+                PATHS "@SMOKE_LIBRARY_PREFIX@")
-         endif(WIN32)
- 
-         if (NOT SMOKE_${uppercase}_INCLUDE_DIR OR NOT SMOKE_${uppercase}_LIBRARY)
diff --git a/pkgs/desktops/kde-4.8/kdebindings/smokegen.nix b/pkgs/desktops/kde-4.8/kdebindings/smokegen.nix
deleted file mode 100644
index 8b5da2a641d..00000000000
--- a/pkgs/desktops/kde-4.8/kdebindings/smokegen.nix
+++ /dev/null
@@ -1,13 +0,0 @@
-{ kde, qt4, cmake }:
-
-kde {
-  buildInputs = [ qt4 ];
-  nativeBuildInputs = [ cmake ];
-
-  patches = [ ./smokegen-nix.patch ];
-
-  meta = {
-    description = "C++ parser used to generate language bindings for Qt/KDE";
-    license = "GPLv2";
-  };
-}
diff --git a/pkgs/desktops/kde-4.8/kdebindings/smokekde.nix b/pkgs/desktops/kde-4.8/kdebindings/smokekde.nix
deleted file mode 100644
index 0e823a95e3b..00000000000
--- a/pkgs/desktops/kde-4.8/kdebindings/smokekde.nix
+++ /dev/null
@@ -1,12 +0,0 @@
-{ kde, cmake, smokeqt, kdelibs, akonadi, kdepimlibs, shared_desktop_ontologies, attica }:
-
-kde {
-  # attica, akonadi and kdepimlibs are disabled due to smokegen crash
-  buildInputs = [ smokeqt kdelibs shared_desktop_ontologies ];
-  nativeBuildInputs = [ cmake ];
-
-  cmakeFlags = "-DQTDEFINES_FILE=${smokeqt}/share/smokegen/qtdefines";
-  meta = {
-    description = "SMOKE bindings for kdelibs";
-  };
-}
diff --git a/pkgs/desktops/kde-4.8/kdebindings/smokeqt.nix b/pkgs/desktops/kde-4.8/kdebindings/smokeqt.nix
deleted file mode 100644
index 29e25093d11..00000000000
--- a/pkgs/desktops/kde-4.8/kdebindings/smokeqt.nix
+++ /dev/null
@@ -1,12 +0,0 @@
-{ kde, qt4, cmake, phonon, qimageblitz, smokegen }:
-
-kde {
-  propagatedBuildInputs = [ qt4 phonon qimageblitz ];
-  nativeBuildInputs = [ cmake ];
-  propagatedNativeBuildInputs = [ smokegen ];
-
-  meta = {
-    description = "C++ parser used to generate language bindings for Qt/KDE";
-    license = "GPLv2";
-  };
-}
diff --git a/pkgs/desktops/kde-4.8/kdeedu/analitza.nix b/pkgs/desktops/kde-4.8/kdeedu/analitza.nix
deleted file mode 100644
index 74c3a1ebb20..00000000000
--- a/pkgs/desktops/kde-4.8/kdeedu/analitza.nix
+++ /dev/null
@@ -1,8 +0,0 @@
-{ kde, kdelibs, readline }:
-kde {
-  buildInputs = [ kdelibs readline ];
-
-  meta = {
-    description = "Library part of KAlgebra";
-  };
-}
diff --git a/pkgs/desktops/kde-4.8/kdeedu/blinken.nix b/pkgs/desktops/kde-4.8/kdeedu/blinken.nix
deleted file mode 100644
index cdf9728833c..00000000000
--- a/pkgs/desktops/kde-4.8/kdeedu/blinken.nix
+++ /dev/null
@@ -1,8 +0,0 @@
-{ kde, kdelibs }:
-kde {
-  buildInputs = [ kdelibs ];
-
-  meta = {
-    description = "Memory Enhancement Game";
-  };
-}
diff --git a/pkgs/desktops/kde-4.8/kdeedu/cantor.nix b/pkgs/desktops/kde-4.8/kdeedu/cantor.nix
deleted file mode 100644
index 8b8bbc210c7..00000000000
--- a/pkgs/desktops/kde-4.8/kdeedu/cantor.nix
+++ /dev/null
@@ -1,8 +0,0 @@
-{ kde, kdelibs, libspectre }:
-kde {
-  buildInputs = [ kdelibs libspectre ];
-
-  meta = {
-    description = "KDE Frontend to Mathematical Software";
-  };
-}
diff --git a/pkgs/desktops/kde-4.8/kdeedu/kalgebra.nix b/pkgs/desktops/kde-4.8/kdeedu/kalgebra.nix
deleted file mode 100644
index 3675c3a225f..00000000000
--- a/pkgs/desktops/kde-4.8/kdeedu/kalgebra.nix
+++ /dev/null
@@ -1,8 +0,0 @@
-{ kde, kdelibs, libkdeedu, analitza }:
-kde {
-  buildInputs = [ kdelibs libkdeedu analitza ];
-
-  meta = {
-    description = "2D and 3D Graph Calculator";
-  };
-}
diff --git a/pkgs/desktops/kde-4.8/kdeedu/kalzium.nix b/pkgs/desktops/kde-4.8/kdeedu/kalzium.nix
deleted file mode 100644
index 69ab5dfc473..00000000000
--- a/pkgs/desktops/kde-4.8/kdeedu/kalzium.nix
+++ /dev/null
@@ -1,8 +0,0 @@
-{ kde, kdelibs, facile, ocaml, eigen, openbabel, avogadro }:
-kde {
-  buildInputs = [ kdelibs facile ocaml eigen openbabel avogadro ];
-
-  meta = {
-    description = "Periodic Table of Elements";
-  };
-}
diff --git a/pkgs/desktops/kde-4.8/kdeedu/kanagram.nix b/pkgs/desktops/kde-4.8/kdeedu/kanagram.nix
deleted file mode 100644
index 8759c96d78c..00000000000
--- a/pkgs/desktops/kde-4.8/kdeedu/kanagram.nix
+++ /dev/null
@@ -1,8 +0,0 @@
-{ kde, kdelibs, libkdeedu }:
-kde {
-  buildInputs = [ kdelibs libkdeedu ];
-
-  meta = {
-    description = "Letter Order Game";
-  };
-}
diff --git a/pkgs/desktops/kde-4.8/kdeedu/kbruch.nix b/pkgs/desktops/kde-4.8/kdeedu/kbruch.nix
deleted file mode 100644
index dc50f1e85a3..00000000000
--- a/pkgs/desktops/kde-4.8/kdeedu/kbruch.nix
+++ /dev/null
@@ -1,8 +0,0 @@
-{ kde, kdelibs }:
-kde {
-  buildInputs = [ kdelibs ];
-
-  meta = {
-    description = "Practice Fractions";
-  };
-}
diff --git a/pkgs/desktops/kde-4.8/kdeedu/kgeography.nix b/pkgs/desktops/kde-4.8/kdeedu/kgeography.nix
deleted file mode 100644
index bd8d27c8d6e..00000000000
--- a/pkgs/desktops/kde-4.8/kdeedu/kgeography.nix
+++ /dev/null
@@ -1,8 +0,0 @@
-{ kde, kdelibs }:
-kde {
-  buildInputs = [ kdelibs ];
-
-  meta = {
-    description = "Geography Trainer";
-  };
-}
diff --git a/pkgs/desktops/kde-4.8/kdeedu/khangman.nix b/pkgs/desktops/kde-4.8/kdeedu/khangman.nix
deleted file mode 100644
index 997b50e906a..00000000000
--- a/pkgs/desktops/kde-4.8/kdeedu/khangman.nix
+++ /dev/null
@@ -1,8 +0,0 @@
-{ kde, kdelibs, libkdeedu }:
-kde {
-  buildInputs = [ kdelibs libkdeedu ];
-
-  meta = {
-    description = "KDE hangman game";
-  };
-}
diff --git a/pkgs/desktops/kde-4.8/kdeedu/kig.nix b/pkgs/desktops/kde-4.8/kdeedu/kig.nix
deleted file mode 100644
index bd5ef67529c..00000000000
--- a/pkgs/desktops/kde-4.8/kdeedu/kig.nix
+++ /dev/null
@@ -1,12 +0,0 @@
-{ kde, kdelibs, boost, python}:
-kde {
-  buildInputs = [ kdelibs boost python ];
-
-  cmakeFlags = ''
-    -DBOOST_PYTHON_INCLUDES:PATH=${boost}/include;${python}/include/${python.libPrefix}
-    -DBOOST_PYTHON_LIBS=boost_python;${python.libPrefix} -DKIG_ENABLE_PYTHON_SCRIPTING=1
-    '';
-  meta = {
-    description = "KDE Interactive Geometry";
-  };
-}
diff --git a/pkgs/desktops/kde-4.8/kdeedu/kiten.nix b/pkgs/desktops/kde-4.8/kdeedu/kiten.nix
deleted file mode 100644
index 939b7a9f77a..00000000000
--- a/pkgs/desktops/kde-4.8/kdeedu/kiten.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ kde, kdelibs }:
-
-kde {
-  buildInputs = [ kdelibs ];
-
-  meta = {
-    description = "Japanese Reference/Study Tool";
-  };
-}
diff --git a/pkgs/desktops/kde-4.8/kdeedu/klettres.nix b/pkgs/desktops/kde-4.8/kdeedu/klettres.nix
deleted file mode 100644
index 7a0fa83078e..00000000000
--- a/pkgs/desktops/kde-4.8/kdeedu/klettres.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ kde, kdelibs }:
-
-kde {
-  buildInputs = [ kdelibs ];
-
-  meta = {
-    description = "A KDE alphabet tutorial";
-  };
-}
diff --git a/pkgs/desktops/kde-4.8/kdeedu/kmplot.nix b/pkgs/desktops/kde-4.8/kdeedu/kmplot.nix
deleted file mode 100644
index 18458cf6f0b..00000000000
--- a/pkgs/desktops/kde-4.8/kdeedu/kmplot.nix
+++ /dev/null
@@ -1,12 +0,0 @@
-{ kde, kdelibs }:
-
-kde {
-  buildInputs = [ kdelibs ];
-
-  meta = {
-    description = "A KDE mathematical function plotter";
-    kde = {
-      name = "kmplot";
-    };
-  };
-}
diff --git a/pkgs/desktops/kde-4.8/kdeedu/kstars.nix b/pkgs/desktops/kde-4.8/kdeedu/kstars.nix
deleted file mode 100644
index 5b5a2d621de..00000000000
--- a/pkgs/desktops/kde-4.8/kdeedu/kstars.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ kde, kdelibs, eigen, xplanet, indilib }:
-
-kde {
-  buildInputs = [ kdelibs eigen xplanet indilib ];
-
-  meta = {
-    description = "A KDE graphical desktop planetarium";
-  };
-}
diff --git a/pkgs/desktops/kde-4.8/kdeedu/ktouch.nix b/pkgs/desktops/kde-4.8/kdeedu/ktouch.nix
deleted file mode 100644
index 768be6f4367..00000000000
--- a/pkgs/desktops/kde-4.8/kdeedu/ktouch.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ kde, kdelibs }:
-
-kde {
-  buildInputs = [ kdelibs ];
-
-  meta = {
-    description = "Touch Typing Tutor";
-  };
-}
diff --git a/pkgs/desktops/kde-4.8/kdeedu/kturtle.nix b/pkgs/desktops/kde-4.8/kdeedu/kturtle.nix
deleted file mode 100644
index 1e1922b1410..00000000000
--- a/pkgs/desktops/kde-4.8/kdeedu/kturtle.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ kde, kdelibs }:
-
-kde {
-  buildInputs = [ kdelibs ];
-
-  meta = {
-    description = "Educational Programming Environment";
-  };
-}
diff --git a/pkgs/desktops/kde-4.8/kdeedu/kwordquiz.nix b/pkgs/desktops/kde-4.8/kdeedu/kwordquiz.nix
deleted file mode 100644
index 1b33ba2e469..00000000000
--- a/pkgs/desktops/kde-4.8/kdeedu/kwordquiz.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ kde, kdelibs, libkdeedu }:
-
-kde {
-  buildInputs = [ kdelibs libkdeedu ];
-
-  meta = {
-    description = "Flash Card Trainer";
-  };
-}
diff --git a/pkgs/desktops/kde-4.8/kdeedu/libkdeedu.nix b/pkgs/desktops/kde-4.8/kdeedu/libkdeedu.nix
deleted file mode 100644
index def6c85fefe..00000000000
--- a/pkgs/desktops/kde-4.8/kdeedu/libkdeedu.nix
+++ /dev/null
@@ -1,8 +0,0 @@
-{ kde, kdelibs }:
-kde {
-  buildInputs = [ kdelibs ];
-
-  meta = {
-    description = "Libraries used by KDE Education applications";
-  };
-}
diff --git a/pkgs/desktops/kde-4.8/kdeedu/marble.nix b/pkgs/desktops/kde-4.8/kdeedu/marble.nix
deleted file mode 100644
index 8bd86c91094..00000000000
--- a/pkgs/desktops/kde-4.8/kdeedu/marble.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ kde, kdelibs, gpsd }:
-
-kde {
-  buildInputs = [ kdelibs gpsd ];
-
-  meta = {
-    description = "Marble Virtual Globe";
-  };
-}
diff --git a/pkgs/desktops/kde-4.8/kdeedu/parley.nix b/pkgs/desktops/kde-4.8/kdeedu/parley.nix
deleted file mode 100644
index eccd40a598f..00000000000
--- a/pkgs/desktops/kde-4.8/kdeedu/parley.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ kde, kdelibs, libkdeedu, libxml2, attica }:
-
-kde {
-  buildInputs = [ kdelibs libkdeedu libxml2 attica ];
-
-  meta = {
-    description = "Vocabulary Trainer";
-  };
-}
diff --git a/pkgs/desktops/kde-4.8/kdeedu/rocs.nix b/pkgs/desktops/kde-4.8/kdeedu/rocs.nix
deleted file mode 100644
index 91976b84001..00000000000
--- a/pkgs/desktops/kde-4.8/kdeedu/rocs.nix
+++ /dev/null
@@ -1,14 +0,0 @@
-{ kde, kdelibs, boost }:
-
-kde {
-  buildInputs = [ kdelibs (boost.override { enableExceptions = true; }) ];
-
-  NIX_CFLAGS_COMPILE = "-fexceptions";
-
-  meta = {
-    description = "A KDE graph theory viewer";
-    kde = {
-      name = "rocs";
-    };
-  };
-}
diff --git a/pkgs/desktops/kde-4.8/kdeedu/step.nix b/pkgs/desktops/kde-4.8/kdeedu/step.nix
deleted file mode 100644
index fac9974baf1..00000000000
--- a/pkgs/desktops/kde-4.8/kdeedu/step.nix
+++ /dev/null
@@ -1,12 +0,0 @@
-{ kde, kdelibs, gsl, libqalculate, eigen }:
-
-kde {
-  buildInputs = [ kdelibs gsl libqalculate eigen ];
-
-  meta = {
-    description = "A KDE interactive physical simulator";
-    kde = {
-      name = "step";
-    };
-  };
-}
diff --git a/pkgs/desktops/kde-4.8/kdegames.nix b/pkgs/desktops/kde-4.8/kdegames.nix
deleted file mode 100644
index dfca49be12f..00000000000
--- a/pkgs/desktops/kde-4.8/kdegames.nix
+++ /dev/null
@@ -1,20 +0,0 @@
-{ kde, kdelibs, qca2, twisted, pythonPackages, sip, makeWrapper, pykde4,
-  openal, libsndfile, qhull, sqlite, pkgconfig }:
-
-kde rec {
-  buildInputs = [ kdelibs qca2 pythonPackages.python pythonPackages.wrapPython
-    openal libsndfile qhull sqlite ] ++ pythonPath;
-
-  pythonPath = [ pythonPackages.twisted pykde4 ];
-
-  nativeBuildInputs = [ pkgconfig ];
-
-  # TODO: ggz
-
-  postInstall = "wrapPythonPrograms";
-
-  meta = {
-    description = "KDE Games";
-    license = "GPL";
-  };
-}
diff --git a/pkgs/desktops/kde-4.8/kdegraphics/gwenview.nix b/pkgs/desktops/kde-4.8/kdegraphics/gwenview.nix
deleted file mode 100644
index c03c82469e6..00000000000
--- a/pkgs/desktops/kde-4.8/kdegraphics/gwenview.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-{ kde, kdelibs, exiv2, shared_desktop_ontologies, kde_baseapps, libkipi
-, libjpeg, pkgconfig }:
-
-kde {
-
-  buildInputs =
-    [ kdelibs exiv2 shared_desktop_ontologies kde_baseapps libkipi libjpeg ];
-
-  nativeBuildInputs = [ pkgconfig ];
-
-  meta = {
-    description = "Gwenview, the KDE image viewer";
-    license = "GPLv2";
-  };
-}
diff --git a/pkgs/desktops/kde-4.8/kdegraphics/kamera.nix b/pkgs/desktops/kde-4.8/kdegraphics/kamera.nix
deleted file mode 100644
index 70904b17c23..00000000000
--- a/pkgs/desktops/kde-4.8/kdegraphics/kamera.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-{ kde, kdelibs, libgphoto2 }:
-
-kde {
-  buildInputs = [ kdelibs libgphoto2 ];
-
-  meta = {
-    description = "KDE camera interface library";
-    license = "GPLv2";
-  };
-}
diff --git a/pkgs/desktops/kde-4.8/kdegraphics/kcolorchooser.nix b/pkgs/desktops/kde-4.8/kdegraphics/kcolorchooser.nix
deleted file mode 100644
index 58528cb186b..00000000000
--- a/pkgs/desktops/kde-4.8/kdegraphics/kcolorchooser.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-{ kde, kdelibs }:
-
-kde {
-  buildInputs = [ kdelibs ];
-
-  meta = {
-    description = "A small utility to select a color";
-    license = "GPLv2";
-  };
-}
diff --git a/pkgs/desktops/kde-4.8/kdegraphics/kdegraphics-mobipocket.nix b/pkgs/desktops/kde-4.8/kdegraphics/kdegraphics-mobipocket.nix
deleted file mode 100644
index 2c2ba3796a2..00000000000
--- a/pkgs/desktops/kde-4.8/kdegraphics/kdegraphics-mobipocket.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-{ kde, kdelibs, okular }:
-
-kde {
-  buildInputs = [ kdelibs okular ];
-
-  meta = {
-    description = "A collection of plugins to handle mobipocket files";
-    license = "GPLv2";
-  };
-}
diff --git a/pkgs/desktops/kde-4.8/kdegraphics/kdegraphics-strigi-analyzer.nix b/pkgs/desktops/kde-4.8/kdegraphics/kdegraphics-strigi-analyzer.nix
deleted file mode 100644
index 6001a5f363d..00000000000
--- a/pkgs/desktops/kde-4.8/kdegraphics/kdegraphics-strigi-analyzer.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-{ kde, kdelibs }:
-
-kde {
-  buildInputs = [ kdelibs ];
-
-  meta = {
-    description = "Strigi analyzers for various graphics file formats";
-    license = "GPLv2";
-  };
-}
diff --git a/pkgs/desktops/kde-4.8/kdegraphics/kdegraphics-thumbnailers.nix b/pkgs/desktops/kde-4.8/kdegraphics/kdegraphics-thumbnailers.nix
deleted file mode 100644
index 55bf8309b2a..00000000000
--- a/pkgs/desktops/kde-4.8/kdegraphics/kdegraphics-thumbnailers.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-{ kde, kdelibs, libkexiv2, libkdcraw }:
-
-kde {
-  buildInputs = [ kdelibs libkexiv2 libkdcraw ];
-
-  meta = {
-    description = "Thumbnailers for various graphics file formats";
-    license = "GPLv2";
-  };
-}
diff --git a/pkgs/desktops/kde-4.8/kdegraphics/kgamma.nix b/pkgs/desktops/kde-4.8/kdegraphics/kgamma.nix
deleted file mode 100644
index 28d9252187e..00000000000
--- a/pkgs/desktops/kde-4.8/kdegraphics/kgamma.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-{ kde, kdelibs, libXxf86vm }:
-
-kde {
-  buildInputs = [ kdelibs libXxf86vm ];
-
-  meta = {
-    description = "KDE monitor calibration tool";
-    license = "GPLv2";
-  };
-}
diff --git a/pkgs/desktops/kde-4.8/kdegraphics/kolourpaint.nix b/pkgs/desktops/kde-4.8/kdegraphics/kolourpaint.nix
deleted file mode 100644
index 5276ec09f46..00000000000
--- a/pkgs/desktops/kde-4.8/kdegraphics/kolourpaint.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-{ kde, kdelibs, qimageblitz }:
-
-kde {
-  buildInputs = [ kdelibs qimageblitz ];
-
-  meta = {
-    description = "KDE paint program";
-    license = "GPLv2";
-  };
-}
diff --git a/pkgs/desktops/kde-4.8/kdegraphics/kruler.nix b/pkgs/desktops/kde-4.8/kdegraphics/kruler.nix
deleted file mode 100644
index c5c2c6e05d7..00000000000
--- a/pkgs/desktops/kde-4.8/kdegraphics/kruler.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-{ kde, kdelibs }:
-
-kde {
-  buildInputs = [ kdelibs ];
-
-  meta = {
-    description = "KDE screen ruler";
-    license = "GPLv2";
-  };
-}
diff --git a/pkgs/desktops/kde-4.8/kdegraphics/ksaneplugin.nix b/pkgs/desktops/kde-4.8/kdegraphics/ksaneplugin.nix
deleted file mode 100644
index 1381ed7dd26..00000000000
--- a/pkgs/desktops/kde-4.8/kdegraphics/ksaneplugin.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-{ kde, kdelibs, libksane }:
-
-kde {
-  buildInputs = [ kdelibs libksane ];
-
-  meta = {
-    description = "A KScan plugin that implements the scanning through libksane";
-    license = "GPLv2";
-  };
-}
diff --git a/pkgs/desktops/kde-4.8/kdegraphics/ksnapshot.nix b/pkgs/desktops/kde-4.8/kdegraphics/ksnapshot.nix
deleted file mode 100644
index f01a609e20d..00000000000
--- a/pkgs/desktops/kde-4.8/kdegraphics/ksnapshot.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-{ kde, kdelibs, libkipi }:
-
-kde {
-  buildInputs = [ kdelibs libkipi ];
-
-  meta = {
-    description = "KDE screenshot utility";
-    license = "GPLv2";
-  };
-}
diff --git a/pkgs/desktops/kde-4.8/kdegraphics/libkdcraw.nix b/pkgs/desktops/kde-4.8/kdegraphics/libkdcraw.nix
deleted file mode 100644
index 9810a98551e..00000000000
--- a/pkgs/desktops/kde-4.8/kdegraphics/libkdcraw.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-{ kde, kdelibs, libjpeg, lcms1 }:
-
-kde {
-  buildInputs = [ kdelibs libjpeg lcms1 ];
-
-  meta = {
-    description = "Library for decoding RAW images";
-    license = "GPLv2";
-  };
-}
diff --git a/pkgs/desktops/kde-4.8/kdegraphics/libkexiv2.nix b/pkgs/desktops/kde-4.8/kdegraphics/libkexiv2.nix
deleted file mode 100644
index 096b0a6e957..00000000000
--- a/pkgs/desktops/kde-4.8/kdegraphics/libkexiv2.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-{ kde, kdelibs, exiv2 }:
-
-kde {
-  buildInputs = [ kdelibs exiv2 ];
-
-  meta = {
-    description = "Exiv2 support library";
-    license = "GPLv2";
-  };
-}
diff --git a/pkgs/desktops/kde-4.8/kdegraphics/libkipi.nix b/pkgs/desktops/kde-4.8/kdegraphics/libkipi.nix
deleted file mode 100644
index 6b16265e7a3..00000000000
--- a/pkgs/desktops/kde-4.8/kdegraphics/libkipi.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-{ kde, kdelibs }:
-
-kde {
-  buildInputs = [ kdelibs ];
-
-  meta = {
-    description = "Interface library to kipi-plugins";
-    license = "GPLv2";
-  };
-}
diff --git a/pkgs/desktops/kde-4.8/kdegraphics/libksane.nix b/pkgs/desktops/kde-4.8/kdegraphics/libksane.nix
deleted file mode 100644
index b539eab3899..00000000000
--- a/pkgs/desktops/kde-4.8/kdegraphics/libksane.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-{ kde, kdelibs, saneBackends }:
-
-kde {
-  buildInputs = [ kdelibs saneBackends ];
-
-  meta = {
-    description = "An image scanning library that provides a QWidget that contains all the logic needed to interface a sacanner";
-    license = "GPLv2";
-  };
-}
diff --git a/pkgs/desktops/kde-4.8/kdegraphics/okular.nix b/pkgs/desktops/kde-4.8/kdegraphics/okular.nix
deleted file mode 100644
index 0c5c7b49b17..00000000000
--- a/pkgs/desktops/kde-4.8/kdegraphics/okular.nix
+++ /dev/null
@@ -1,12 +0,0 @@
-{ chmlib, djvulibre, ebook_tools, kde, kdelibs, libspectre, popplerQt4, qca2
-, qimageblitz, pkgconfig }:
-
-kde {
-  buildInputs =
-    [ chmlib djvulibre ebook_tools kdelibs libspectre popplerQt4 qca2 qimageblitz pkgconfig ];
-
-  meta = {
-    description = "Okular, the KDE document viewer";
-    license = "GPLv2";
-  };
-}
diff --git a/pkgs/desktops/kde-4.8/kdegraphics/svgpart.nix b/pkgs/desktops/kde-4.8/kdegraphics/svgpart.nix
deleted file mode 100644
index a344cc4b4b4..00000000000
--- a/pkgs/desktops/kde-4.8/kdegraphics/svgpart.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-{ kde, kdelibs }:
-
-kde {
-  buildInputs = [ kdelibs ];
-
-  meta = {
-    description = "SVG KPart";
-    license = "GPLv2";
-  };
-}
diff --git a/pkgs/desktops/kde-4.8/kdelibs.nix b/pkgs/desktops/kde-4.8/kdelibs.nix
deleted file mode 100644
index 0e7c9cfdbea..00000000000
--- a/pkgs/desktops/kde-4.8/kdelibs.nix
+++ /dev/null
@@ -1,38 +0,0 @@
-{ kde, gcc, cmake, perl
-, qt4, bzip2, pcre, fam, libxml2, libxslt, shared_mime_info, giflib, jasper
-, openexr, avahi, kerberos, acl, attr, shared_desktop_ontologies, libXScrnSaver
-, automoc4, strigi, soprano, qca2, attica, enchant, libdbusmenu_qt
-, docbook_xml_dtd_42, docbook_xsl, polkit_qt_1
-, getopt, udev, herqq, phonon, libjpeg, xz
-}:
-
-kde {
-  buildInputs =
-    [ acl attr attica avahi bzip2 enchant fam getopt giflib herqq jasper
-      libdbusmenu_qt libXScrnSaver libxslt pcre polkit_qt_1 qca2
-      shared_desktop_ontologies xz udev libxml2 libjpeg kerberos
-    ];
-
-  propagatedBuildInputs = [ qt4 soprano strigi phonon ];
-
-  propagatedNativeBuildInputs = [ automoc4 cmake perl shared_mime_info ];
-
-  # TODO: make sonnet plugins (dictionaries) really work.
-  # There are a few hardcoded paths.
-  # Let kdelibs find openexr
-  # Split plugins from libs?
-
-  patches = [ ./files/polkit-install.patch ];
-
-  # cmake fails to find acl.h because of C++-style comment
-  # TODO: OpenEXR
-  cmakeFlags = [
-    "-DDOCBOOKXML_CURRENTDTD_DIR=${docbook_xml_dtd_42}/xml/dtd/docbook"
-    "-DDOCBOOKXSL_DIR=${docbook_xsl}/xml/xsl/docbook"
-  ];
-
-  meta = {
-    description = "KDE libraries";
-    license = "LGPL";
-  };
-}
diff --git a/pkgs/desktops/kde-4.8/kdemultimedia.nix b/pkgs/desktops/kde-4.8/kdemultimedia.nix
deleted file mode 100644
index 09efeb336dc..00000000000
--- a/pkgs/desktops/kde-4.8/kdemultimedia.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-{ kde, alsaLib, libvorbis, taglib, flac, cdparanoia, lame, kdelibs, ffmpeg,
-  libmusicbrainz3, libtunepimp, pulseaudio }:
-
-kde {
-
-  buildInputs =
-    [ kdelibs cdparanoia taglib libvorbis libmusicbrainz3 libtunepimp ffmpeg
-      flac lame pulseaudio
-    ];
-
-  meta = {
-    description = "KDE multimedia programs such as a movie player and volume utility";
-    license = "GPL";
-  };
-}
diff --git a/pkgs/desktops/kde-4.8/kdenetwork/FindmsiLBC.cmake b/pkgs/desktops/kde-4.8/kdenetwork/FindmsiLBC.cmake
deleted file mode 100644
index c40b0bed310..00000000000
--- a/pkgs/desktops/kde-4.8/kdenetwork/FindmsiLBC.cmake
+++ /dev/null
@@ -1,19 +0,0 @@
-# cmake macro to test msiLBC
-
-# Copyright (c) 2009-2010 Pali Rohár <pali.rohar@gmail.com>
-#
-# MSILBC_FOUND
-# MSILBC_LIBRARY
-
-include ( FindPackageHandleStandardArgs )
-
-if ( MSILBC_LIBRARY )
-	set ( MSILBC_FOUND true )
-	set ( msiLBC_FIND_QUIETLY true )
-else ( MSILBC_LIBRARY )
-	find_library ( MSILBC_LIBRARY NAMES msilbc
-		PATH_SUFFIXES mediastreamer/plugins)
-endif ( MSILBC_LIBRARY )
-
-find_package_handle_standard_args ( msiLBC DEFAULT_MSG MSILBC_LIBRARY )
-mark_as_advanced ( MSILBC_LIBRARY )
diff --git a/pkgs/desktops/kde-4.8/kdenetwork/filesharing.nix b/pkgs/desktops/kde-4.8/kdenetwork/filesharing.nix
deleted file mode 100644
index 2f32f4d6b2c..00000000000
--- a/pkgs/desktops/kde-4.8/kdenetwork/filesharing.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{ kde, kdelibs }:
-
-kde {
-  buildInputs = [ kdelibs ];
-
-  patches = [ ./kdenetwork.patch ];
-}
diff --git a/pkgs/desktops/kde-4.8/kdenetwork/kdenetwork.patch b/pkgs/desktops/kde-4.8/kdenetwork/kdenetwork.patch
deleted file mode 100644
index ebadbfad9ba..00000000000
--- a/pkgs/desktops/kde-4.8/kdenetwork/kdenetwork.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -r -u kdenetwork-4.7.1.orig/CMakeLists.txt kdenetwork-4.7.1/CMakeLists.txt
---- kdenetwork-4.7.1.orig/CMakeLists.txt	2011-03-29 15:25:42.174521812 +0400
-+++ kdenetwork-4.7.1/CMakeLists.txt	2011-03-29 15:27:43.268140322 +0400
-@@ -28,7 +28,8 @@
-    set(CMAKE_REQUIRED_INCLUDES  ${KDEWIN_INCLUDES} )
- endif (WIN32)
- 
--find_package(KdepimLibs REQUIRED)
-+macro_optional_find_package(KdepimLibs)
-+macro_log_feature(KDEPIMLIBS_FOUND "KDEPimLibs" "KDE pim-related libraries" "http://pim.kde.org.org/" FALSE "" "Required for Kopete")
- # find_package(X11VidMode) not used at this time
- 
- # NX support is not ready for KDE 4.2; disabled (uwolfer)
-@@ -79,7 +80,9 @@
- macro_optional_add_subdirectory(kfile-plugins)
- macro_optional_add_subdirectory(kget)
- 
--macro_optional_add_subdirectory(kopete)
-+if(KDEPIMLIBS_FOUND)
-+  macro_optional_add_subdirectory(kopete)
-+endif(KDEPIMLIBS_FOUND)
- 
- if(Q_WS_X11)
-   macro_optional_add_subdirectory(krdc)
diff --git a/pkgs/desktops/kde-4.8/kdenetwork/kdnssd.nix b/pkgs/desktops/kde-4.8/kdenetwork/kdnssd.nix
deleted file mode 100644
index 2f32f4d6b2c..00000000000
--- a/pkgs/desktops/kde-4.8/kdenetwork/kdnssd.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{ kde, kdelibs }:
-
-kde {
-  buildInputs = [ kdelibs ];
-
-  patches = [ ./kdenetwork.patch ];
-}
diff --git a/pkgs/desktops/kde-4.8/kdenetwork/kfile-plugins.nix b/pkgs/desktops/kde-4.8/kdenetwork/kfile-plugins.nix
deleted file mode 100644
index f90fd356079..00000000000
--- a/pkgs/desktops/kde-4.8/kdenetwork/kfile-plugins.nix
+++ /dev/null
@@ -1,11 +0,0 @@
-{ kde, kdelibs, boost }:
-
-kde {
-  name = "strigi-analyzer-torrent";
-
-  buildInputs = [ kdelibs boost ];
-
-  preConfigure = "mv -v strigi-analyzer kfile-plugins";
-
-  patches = [ ./kdenetwork.patch ];
-}
diff --git a/pkgs/desktops/kde-4.8/kdenetwork/kget.nix b/pkgs/desktops/kde-4.8/kdenetwork/kget.nix
deleted file mode 100644
index 2381a2459e6..00000000000
--- a/pkgs/desktops/kde-4.8/kdenetwork/kget.nix
+++ /dev/null
@@ -1,13 +0,0 @@
-{ kde, kdelibs, libktorrent, kde_workspace, kdepimlibs, sqlite
-, shared_desktop_ontologies, kde_baseapps, gpgme, boost, libmms, qca2 }:
-
-kde {
-  buildInputs =
-    [ kdelibs libktorrent kde_workspace shared_desktop_ontologies kdepimlibs
-      kde_baseapps gpgme boost libmms qca2 sqlite
-    ];
-
-  KDEDIRS = libktorrent;
-
-  patches = [ ./kdenetwork.patch ];
-}
diff --git a/pkgs/desktops/kde-4.8/kdenetwork/kopete.nix b/pkgs/desktops/kde-4.8/kdenetwork/kopete.nix
deleted file mode 100644
index d1d9f0c8e03..00000000000
--- a/pkgs/desktops/kde-4.8/kdenetwork/kopete.nix
+++ /dev/null
@@ -1,24 +0,0 @@
-{ kde, kdelibs, speex, libmsn, libotr, kdepimlibs, qimageblitz, libktorrent,
-  jasper, libidn, mediastreamer, msilbc, pkgconfig, libxml2, libxslt, giflib,
-  libgadu, boost, qca2, gpgme, sqlite }:
-
-kde {
-  buildInputs = [ kdelibs speex libmsn libotr kdepimlibs qimageblitz libktorrent
-    jasper libidn mediastreamer msilbc libxml2 libxslt giflib libgadu boost qca2
-    gpgme sqlite ];
-
-  nativeBuildInputs = [ pkgconfig ];
-
-  KDEDIRS = libktorrent;
-
-  patchPhase =
-    ''
-      cp -v ${./FindmsiLBC.cmake} kopete/cmake/modules/FindmsiLBC.cmake
-    '';
-
-  cmakeFlags = [ "-DBUILD_skypebuttons=TRUE" ];
-
-  meta = {
-    description = "A KDE multi-protocol IM client";
-  };
-}
diff --git a/pkgs/desktops/kde-4.8/kdenetwork/kppp.nix b/pkgs/desktops/kde-4.8/kdenetwork/kppp.nix
deleted file mode 100644
index 2f32f4d6b2c..00000000000
--- a/pkgs/desktops/kde-4.8/kdenetwork/kppp.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{ kde, kdelibs }:
-
-kde {
-  buildInputs = [ kdelibs ];
-
-  patches = [ ./kdenetwork.patch ];
-}
diff --git a/pkgs/desktops/kde-4.8/kdenetwork/krdc.nix b/pkgs/desktops/kde-4.8/kdenetwork/krdc.nix
deleted file mode 100644
index 40ef91d5433..00000000000
--- a/pkgs/desktops/kde-4.8/kdenetwork/krdc.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{ kde, kdelibs, libvncserver, libjpeg }:
-
-kde {
-  buildInputs = [ kdelibs libvncserver libjpeg ];
-
-  patches = [ ./kdenetwork.patch ];
-}
diff --git a/pkgs/desktops/kde-4.8/kdenetwork/krfb.nix b/pkgs/desktops/kde-4.8/kdenetwork/krfb.nix
deleted file mode 100644
index 80013f430d3..00000000000
--- a/pkgs/desktops/kde-4.8/kdenetwork/krfb.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{ kde, kdelibs, libvncserver, libXdamage, libXtst }:
-
-kde {
-  buildInputs = [ kdelibs libvncserver libXdamage libXtst];
-
-  patches = [ ./kdenetwork.patch ];
-}
diff --git a/pkgs/desktops/kde-4.8/kdepim-runtime.nix b/pkgs/desktops/kde-4.8/kdepim-runtime.nix
deleted file mode 100644
index ef637f3f075..00000000000
--- a/pkgs/desktops/kde-4.8/kdepim-runtime.nix
+++ /dev/null
@@ -1,12 +0,0 @@
-{ kde, fetchurl, cmake, kdelibs, libxml2, libxslt, boost, kdepimlibs, akonadi
-, shared_desktop_ontologies }:
-
-kde {
-  buildInputs = [ kdepimlibs akonadi boost shared_desktop_ontologies libxml2
-    libxslt ];
-
-  meta = {
-    description = "KDE PIM runtime";
-    license = "GPL";
-  };
-}
diff --git a/pkgs/desktops/kde-4.8/kdepim.nix b/pkgs/desktops/kde-4.8/kdepim.nix
deleted file mode 100644
index 6d99a801d1c..00000000000
--- a/pkgs/desktops/kde-4.8/kdepim.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-{ kde, boost, gpgme, libassuan, libxml2, libxslt, kdepimlibs, kdepim_runtime
-, akonadi, shared_desktop_ontologies, cyrus_sasl, grantlee, prison }:
-
-kde {
-
-  buildInputs =
-    [ kdepimlibs boost akonadi shared_desktop_ontologies libxml2
-      libxslt cyrus_sasl gpgme libassuan grantlee prison
-    ];
-
-  passthru.propagatedUserEnvPackages = [ akonadi kdepimlibs kdepim_runtime ];
-
-  meta = {
-    description = "KDE PIM tools";
-    longDescription = ''
-      Contains various personal information management tools for KDE, such as an organizer.
-    '';
-    license = "GPL";
-    homepage = http://pim.kde.org;
-  };
-}
diff --git a/pkgs/desktops/kde-4.8/kdepimlibs.nix b/pkgs/desktops/kde-4.8/kdepimlibs.nix
deleted file mode 100644
index 736508eaf0f..00000000000
--- a/pkgs/desktops/kde-4.8/kdepimlibs.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-{ kde, boost, cyrus_sasl, gpgme, libical, openldap, shared_mime_info
-, kdelibs, akonadi, shared_desktop_ontologies, libxml2, libxslt, prison }:
-
-kde {
-  buildInputs =
-    [ boost gpgme shared_desktop_ontologies libical libxml2 libxslt
-      openldap cyrus_sasl akonadi prison
-    ];
-
-  propagatedBuildInputs = [ kdelibs ];
-
-  meta = {
-    description = "KDE PIM libraries";
-    license = "LGPL";
-  };
-}
diff --git a/pkgs/desktops/kde-4.8/kdeplasma-addons.nix b/pkgs/desktops/kde-4.8/kdeplasma-addons.nix
deleted file mode 100644
index a69002bff28..00000000000
--- a/pkgs/desktops/kde-4.8/kdeplasma-addons.nix
+++ /dev/null
@@ -1,20 +0,0 @@
-{ kde, kdelibs, marble, shared_desktop_ontologies, pkgconfig
-, boost, eigen, kde_workspace, attica, python, qca2, qimageblitz
-, kdepimlibs, libkexiv2, libqalculate, libXtst, libdbusmenu_qt }:
-# TODO: qwt, scim
-
-kde {
-
-  KDEDIRS=marble;
-
-  buildInputs = [ kdelibs boost eigen kde_workspace
-    attica python qca2 qimageblitz kdepimlibs libdbusmenu_qt
-    libqalculate libXtst shared_desktop_ontologies marble libkexiv2];
-
-  nativeBuildInputs = [ pkgconfig ];
-
-  meta = {
-    description = "KDE Plasma Addons";
-    license = "GPL";
-  };
-}
diff --git a/pkgs/desktops/kde-4.8/kdesdk/cervisia.nix b/pkgs/desktops/kde-4.8/kdesdk/cervisia.nix
deleted file mode 100644
index 1dabe46cd42..00000000000
--- a/pkgs/desktops/kde-4.8/kdesdk/cervisia.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ kde, kdelibs }:
-
-kde {
-  buildInputs = [ kdelibs ];
-
-  meta = {
-    description = "A KDE CVS frontend";
-  };
-}
diff --git a/pkgs/desktops/kde-4.8/kdesdk/dolphin-plugins-bazaar.nix b/pkgs/desktops/kde-4.8/kdesdk/dolphin-plugins-bazaar.nix
deleted file mode 100644
index 8032b89ff54..00000000000
--- a/pkgs/desktops/kde-4.8/kdesdk/dolphin-plugins-bazaar.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-{ kde, kdelibs, kde_baseapps }:
-
-kde {
-  # Needs kdebase for libkonq
-  buildInputs = [ kdelibs kde_baseapps ];
-
-  meta = {
-    description = "Svn plugin for dolphin";
-  };
-}
diff --git a/pkgs/desktops/kde-4.8/kdesdk/dolphin-plugins-git.nix b/pkgs/desktops/kde-4.8/kdesdk/dolphin-plugins-git.nix
deleted file mode 100644
index df4a0856c6b..00000000000
--- a/pkgs/desktops/kde-4.8/kdesdk/dolphin-plugins-git.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-{ kde, kdelibs, kde_baseapps }:
-
-kde {
-  # Needs kdebase for libkonq
-  buildInputs = [ kdelibs kde_baseapps ];
-
-  meta = {
-    description = "Git plugin for dolphin";
-  };
-}
diff --git a/pkgs/desktops/kde-4.8/kdesdk/dolphin-plugins-hg.nix b/pkgs/desktops/kde-4.8/kdesdk/dolphin-plugins-hg.nix
deleted file mode 100644
index 8032b89ff54..00000000000
--- a/pkgs/desktops/kde-4.8/kdesdk/dolphin-plugins-hg.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-{ kde, kdelibs, kde_baseapps }:
-
-kde {
-  # Needs kdebase for libkonq
-  buildInputs = [ kdelibs kde_baseapps ];
-
-  meta = {
-    description = "Svn plugin for dolphin";
-  };
-}
diff --git a/pkgs/desktops/kde-4.8/kdesdk/dolphin-plugins-svn.nix b/pkgs/desktops/kde-4.8/kdesdk/dolphin-plugins-svn.nix
deleted file mode 100644
index 8032b89ff54..00000000000
--- a/pkgs/desktops/kde-4.8/kdesdk/dolphin-plugins-svn.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-{ kde, kdelibs, kde_baseapps }:
-
-kde {
-  # Needs kdebase for libkonq
-  buildInputs = [ kdelibs kde_baseapps ];
-
-  meta = {
-    description = "Svn plugin for dolphin";
-  };
-}
diff --git a/pkgs/desktops/kde-4.8/kdesdk/find-svn.patch b/pkgs/desktops/kde-4.8/kdesdk/find-svn.patch
deleted file mode 100644
index f6f4df942dd..00000000000
--- a/pkgs/desktops/kde-4.8/kdesdk/find-svn.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-diff --git a/cmake/modules/FindSVN.cmake b/cmake/modules/FindSVN.cmake
-index 59bcb96..2eac05d 100644
---- a/cmake/modules/FindSVN.cmake
-+++ b/cmake/modules/FindSVN.cmake
-@@ -17,6 +17,9 @@ FIND_PROGRAM(SVNCONFIG_EXECUTABLE NAMES svn-config PATHS
- FIND_PROGRAM(APRCONFIG_EXECUTABLE NAMES apr-1-config apr-config PATHS
-    /usr/local/apr/bin
- )
-+find_program(APUCONFIG_EXECUTABLE NAMES apu-1-config apu-config PATHS
-+   /usr/local/apr/bin
-+)
- 
- if(SVNCONFIG_EXECUTABLE)
- 
-@@ -56,15 +59,8 @@ else(SVNCONFIG_EXECUTABLE)
-       set(SVN_INCLUDES ${SVN_INCLUDES} ${_INCLUDES})
-    else(APRCONFIG_EXECUTABLE)
-       FIND_PATH(_INCLUDES apr_pools.h
--         ${SVN_INCLUDES}/apr-0/
--         ${SVN_INCLUDES}/apr-1/
--         ${SVN_INCLUDES}/apr-1.0/
--         /usr/include/apr-0/
--         /usr/include/apr-1/
--         /usr/include/apr-1.0/
--         /usr/local/include/apr-0/
--         /usr/local/include/apr-1/
--         /usr/local/include/apr-1.0/
-+         HINTS ${SVN_INCLUDES}
-+         SUFFIXES apr-0 apr-1 apr-1.0
-       )
-       if(_INCLUDES)
-          set(SVN_INCLUDES ${SVN_INCLUDES} ${_INCLUDES})
-@@ -72,6 +69,24 @@ else(SVNCONFIG_EXECUTABLE)
-          set(SVN_FOUND FALSE) # no apr == can't compile!
-       endif(_INCLUDES)
-    endif(APRCONFIG_EXECUTABLE)
-+
-+   # Use apu-config if it exists
-+   if(APUCONFIG_EXECUTABLE)
-+      EXEC_PROGRAM(${APUCONFIG_EXECUTABLE} ARGS --includes RETURN_VALUE _return_VALUE OUTPUT_VARIABLE _INCLUDES)
-+      string(REPLACE "-I" "" _INCLUDES ${_INCLUDES})
-+      string(REPLACE " " ";" _INCLUDES ${_INCLUDES})
-+      set(SVN_INCLUDES ${SVN_INCLUDES} ${_INCLUDES})
-+   else(APUCONFIG_EXECUTABLE)
-+      FIND_PATH(_INCLUDES apu.h
-+         HINTS ${SVN_INCLUDES}
-+         SUFFIXES apr-0 apr-1 apr-1.0
-+      )
-+      if(_INCLUDES)
-+         set(SVN_INCLUDES ${SVN_INCLUDES} ${_INCLUDES})
-+      else(_INCLUDES)
-+         set(SVN_FOUND FALSE) # no apr == can't compile!
-+      endif(_INCLUDES)
-+   endif(APUCONFIG_EXECUTABLE)
-    FIND_LIBRARY(SVN_LIBRARIES NAMES svn_client-1)
-    if(SVN_LIBRARIES)
-       FIND_LIBRARY(_LIBRARIES NAMES svn_subr-1)
diff --git a/pkgs/desktops/kde-4.8/kdesdk/kapptemplate.nix b/pkgs/desktops/kde-4.8/kdesdk/kapptemplate.nix
deleted file mode 100644
index 391536248dd..00000000000
--- a/pkgs/desktops/kde-4.8/kdesdk/kapptemplate.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ kde, kdelibs }:
-
-kde {
-  buildInputs = [ kdelibs ];
-
-  meta = {
-    description = "A KDE 4 project template generator";
-  };
-}
diff --git a/pkgs/desktops/kde-4.8/kdesdk/kcachegrind.nix b/pkgs/desktops/kde-4.8/kdesdk/kcachegrind.nix
deleted file mode 100644
index 65d410cca48..00000000000
--- a/pkgs/desktops/kde-4.8/kdesdk/kcachegrind.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ kde, kdelibs }:
-
-kde {
-  buildInputs = [ kdelibs ];
-
-  meta = {
-    description = "KDE Frontend for Callgrind/Cachegrind";
-  };
-}
diff --git a/pkgs/desktops/kde-4.8/kdesdk/kdeaccounts-plugin.nix b/pkgs/desktops/kde-4.8/kdesdk/kdeaccounts-plugin.nix
deleted file mode 100644
index 7e170ca2a2c..00000000000
--- a/pkgs/desktops/kde-4.8/kdesdk/kdeaccounts-plugin.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ kde, kdelibs, kdepimlibs }:
-
-kde {
-  buildInputs = [ kdelibs kdepimlibs ];
-
-  meta = {
-    description = "KDE accounts akonadi agent";
-  };
-}
diff --git a/pkgs/desktops/kde-4.8/kdesdk/kioslave-perldoc.nix b/pkgs/desktops/kde-4.8/kdesdk/kioslave-perldoc.nix
deleted file mode 100644
index 6a10bdf7c4b..00000000000
--- a/pkgs/desktops/kde-4.8/kdesdk/kioslave-perldoc.nix
+++ /dev/null
@@ -1,11 +0,0 @@
-{ kde, kdelibs, perl }:
-
-kde {
-  buildInputs = [ kdelibs perl ];
-
-  cmakeFlags = [ "-DBUILD_perldoc=ON" ];
-
-  meta = {
-    description = "perldoc: kioslave";
-  };
-}
diff --git a/pkgs/desktops/kde-4.8/kdesdk/kioslave-svn.nix b/pkgs/desktops/kde-4.8/kdesdk/kioslave-svn.nix
deleted file mode 100644
index db0bd27094b..00000000000
--- a/pkgs/desktops/kde-4.8/kdesdk/kioslave-svn.nix
+++ /dev/null
@@ -1,11 +0,0 @@
-{ kde, kdelibs, subversionClient, apr, aprutil }:
-
-kde {
-  buildInputs = [ kdelibs subversionClient apr aprutil ];
-
-  patches = [ ./find-svn.patch ];
-
-  meta = {
-    description = "Subversion kioslave";
-  };
-}
diff --git a/pkgs/desktops/kde-4.8/kdesdk/kmtrace.nix b/pkgs/desktops/kde-4.8/kdesdk/kmtrace.nix
deleted file mode 100644
index d580f7fb691..00000000000
--- a/pkgs/desktops/kde-4.8/kdesdk/kmtrace.nix
+++ /dev/null
@@ -1,11 +0,0 @@
-{ kde, kdelibs, gcc }:
-
-kde {
-  buildInputs = [ kdelibs ];
-
-  preConfigure = "export CMAKE_PREFIX_PATH=$CMAKE_PREFIX_PATH:${gcc}:${gcc.gcc}";
-
-  meta = {
-    description = "KDE mtrace-based malloc debugger";
-  };
-}
diff --git a/pkgs/desktops/kde-4.8/kdesdk/kompare.nix b/pkgs/desktops/kde-4.8/kdesdk/kompare.nix
deleted file mode 100644
index 1ddb4b8ea5b..00000000000
--- a/pkgs/desktops/kde-4.8/kdesdk/kompare.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ kde, kdelibs }:
-
-kde {
-  buildInputs = [ kdelibs ];
-
-  meta = {
-    description = "A program to view the differences between files and optionally generate a diff";
-  };
-}
diff --git a/pkgs/desktops/kde-4.8/kdesdk/kpartloader.nix b/pkgs/desktops/kde-4.8/kdesdk/kpartloader.nix
deleted file mode 100644
index e7790d33c90..00000000000
--- a/pkgs/desktops/kde-4.8/kdesdk/kpartloader.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ kde, kdelibs }:
-
-kde {
-  buildInputs = [ kdelibs ];
-
-  meta = {
-    description = "A test application for KParts";
-  };
-}
diff --git a/pkgs/desktops/kde-4.8/kdesdk/kprofilemethod.nix b/pkgs/desktops/kde-4.8/kdesdk/kprofilemethod.nix
deleted file mode 100644
index 5a6693f2f5d..00000000000
--- a/pkgs/desktops/kde-4.8/kdesdk/kprofilemethod.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ kde, kdelibs }:
-
-kde {
-  buildInputs = [ kdelibs ];
-
-  meta = {
-    description = "A macro for profiling using QTime";
-  };
-}
diff --git a/pkgs/desktops/kde-4.8/kdesdk/kstartperf.nix b/pkgs/desktops/kde-4.8/kdesdk/kstartperf.nix
deleted file mode 100644
index 0c8259cd31f..00000000000
--- a/pkgs/desktops/kde-4.8/kdesdk/kstartperf.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ kde, kdelibs, libtool }:
-
-kde {
-  buildInputs = [ kdelibs libtool ];
-
-  meta = {
-    description = "Measures start up time of a KDE application";
-  };
-}
diff --git a/pkgs/desktops/kde-4.8/kdesdk/kuiviewer.nix b/pkgs/desktops/kde-4.8/kdesdk/kuiviewer.nix
deleted file mode 100644
index 7c5089dcd37..00000000000
--- a/pkgs/desktops/kde-4.8/kdesdk/kuiviewer.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ kde, kdelibs }:
-
-kde {
-  buildInputs = [ kdelibs ];
-
-  meta = {
-    description = "Displays Qt Designer's UI files";
-  };
-}
diff --git a/pkgs/desktops/kde-4.8/kdesdk/lokalize.nix b/pkgs/desktops/kde-4.8/kdesdk/lokalize.nix
deleted file mode 100644
index 1565426eb1f..00000000000
--- a/pkgs/desktops/kde-4.8/kdesdk/lokalize.nix
+++ /dev/null
@@ -1,13 +0,0 @@
-{ kde, kdelibs, hunspell }:
-
-kde {
-  buildInputs = [ kdelibs hunspell ];
-
-  meta = {
-    description = "KDE 4 Computer-aided translation system";
-    longDescription = ''
-      Computer-aided translation system.
-      Do not translate what had already been translated.
-    '';
-  };
-}
diff --git a/pkgs/desktops/kde-4.8/kdesdk/okteta.nix b/pkgs/desktops/kde-4.8/kdesdk/okteta.nix
deleted file mode 100644
index 058636596ad..00000000000
--- a/pkgs/desktops/kde-4.8/kdesdk/okteta.nix
+++ /dev/null
@@ -1,13 +0,0 @@
-{ kde, kdelibs, qca2 }:
-
-kde {
-  buildInputs = [ kdelibs qca2 ];
-
-# TODO: Look what does -DBUILD_mobile add
-
-  enableParallelBuilding = false;
-
-  meta = {
-    description = "KDE byte editor";
-  };
-}
diff --git a/pkgs/desktops/kde-4.8/kdesdk/poxml.nix b/pkgs/desktops/kde-4.8/kdesdk/poxml.nix
deleted file mode 100644
index 1ab9ed49df5..00000000000
--- a/pkgs/desktops/kde-4.8/kdesdk/poxml.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ kde, kdelibs, antlr }:
-
-kde {
-  buildInputs = [ kdelibs antlr ];
-
-  meta = {
-    description = "Po<->xml tools";
-  };
-}
diff --git a/pkgs/desktops/kde-4.8/kdesdk/scripts.nix b/pkgs/desktops/kde-4.8/kdesdk/scripts.nix
deleted file mode 100644
index df81145e5d6..00000000000
--- a/pkgs/desktops/kde-4.8/kdesdk/scripts.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ kde, kdelibs }:
-
-kde {
-  buildInputs = [ kdelibs ];
-
-  meta = {
-    description = "Various scripts to ease KDE development";
-  };
-}
diff --git a/pkgs/desktops/kde-4.8/kdesdk/strigi-analyzer.nix b/pkgs/desktops/kde-4.8/kdesdk/strigi-analyzer.nix
deleted file mode 100644
index 0ad48c8cfde..00000000000
--- a/pkgs/desktops/kde-4.8/kdesdk/strigi-analyzer.nix
+++ /dev/null
@@ -1,13 +0,0 @@
-{ kde, kdelibs }:
-
-kde {
-  buildInputs = [ kdelibs ];
-
-  meta = {
-    description = "Strigi analyzers for diff, po and ts";
-    kde = {
-      name = "strigi-analyzer";
-      module = "kdesdk";
-    };
-  };
-}
diff --git a/pkgs/desktops/kde-4.8/kdesdk/umbrello.nix b/pkgs/desktops/kde-4.8/kdesdk/umbrello.nix
deleted file mode 100644
index e83a2d9a901..00000000000
--- a/pkgs/desktops/kde-4.8/kdesdk/umbrello.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ kde, kdelibs, libxml2, libxslt, boost }:
-
-kde {
-  buildInputs = [ kdelibs libxml2 libxslt boost ];
-
-  meta = {
-    description = "Umbrello UML modeller";
-  };
-}
diff --git a/pkgs/desktops/kde-4.8/kdetoys/amor.nix b/pkgs/desktops/kde-4.8/kdetoys/amor.nix
deleted file mode 100644
index 936d63d544a..00000000000
--- a/pkgs/desktops/kde-4.8/kdetoys/amor.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ kde, kdelibs }:
-
-kde {
-  buildInputs = [ kdelibs ];
-
-  meta = {
-    description = "KDE creature for your desktop";
-  };
-}
diff --git a/pkgs/desktops/kde-4.8/kdetoys/kteatime.nix b/pkgs/desktops/kde-4.8/kdetoys/kteatime.nix
deleted file mode 100644
index dacf54def4b..00000000000
--- a/pkgs/desktops/kde-4.8/kdetoys/kteatime.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ kde, kdelibs }:
-
-kde {
-  buildInputs = [ kdelibs ];
-
-  meta = {
-    description = "KDE utility for making a fine cup of tea";
-  };
-}
diff --git a/pkgs/desktops/kde-4.8/kdetoys/ktux.nix b/pkgs/desktops/kde-4.8/kdetoys/ktux.nix
deleted file mode 100644
index 108f9be7c72..00000000000
--- a/pkgs/desktops/kde-4.8/kdetoys/ktux.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ kde, kdelibs, kde_workspace }:
-
-kde {
-  buildInputs = [ kdelibs kde_workspace ];
-
-  meta = {
-    description = "Tux Screen Saver";
-  };
-}
diff --git a/pkgs/desktops/kde-4.8/kdeutils/ark.nix b/pkgs/desktops/kde-4.8/kdeutils/ark.nix
deleted file mode 100644
index 7fbdaf586d6..00000000000
--- a/pkgs/desktops/kde-4.8/kdeutils/ark.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ kde, kdelibs, libarchive, bzip2, kde_baseapps }:
-
-kde {
-  buildInputs = [ kdelibs kde_baseapps libarchive bzip2 ];
-
-  meta = {
-    description = "KDE Archiving Tool";
-  };
-}
diff --git a/pkgs/desktops/kde-4.8/kdeutils/filelight.nix b/pkgs/desktops/kde-4.8/kdeutils/filelight.nix
deleted file mode 100644
index 25ecabed27c..00000000000
--- a/pkgs/desktops/kde-4.8/kdeutils/filelight.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ kde, kdelibs }:
-
-kde {
-  buildInputs = [ kdelibs ];
-
-  meta = {
-    description = "Tool to visualise file and directory sizes";
-  };
-}
diff --git a/pkgs/desktops/kde-4.8/kdeutils/kcalc.nix b/pkgs/desktops/kde-4.8/kdeutils/kcalc.nix
deleted file mode 100644
index 08b202e8f0e..00000000000
--- a/pkgs/desktops/kde-4.8/kdeutils/kcalc.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ kde, kdelibs, gmp }:
-
-kde {
-  buildInputs = [ kdelibs gmp ];
-
-  meta = {
-    description = "KDE Calculator";
-  };
-}
diff --git a/pkgs/desktops/kde-4.8/kdeutils/kcharselect.nix b/pkgs/desktops/kde-4.8/kdeutils/kcharselect.nix
deleted file mode 100644
index d4c9c06f483..00000000000
--- a/pkgs/desktops/kde-4.8/kdeutils/kcharselect.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ kde, kdelibs }:
-
-kde {
-  buildInputs = [ kdelibs ];
-
-  meta = {
-    description = "KDE character selection utility";
-  };
-}
diff --git a/pkgs/desktops/kde-4.8/kdeutils/kdf.nix b/pkgs/desktops/kde-4.8/kdeutils/kdf.nix
deleted file mode 100644
index 3f9da58d0a6..00000000000
--- a/pkgs/desktops/kde-4.8/kdeutils/kdf.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ kde, kdelibs }:
-
-kde {
-  buildInputs = [ kdelibs ];
-
-  meta = {
-    description = "KDE free disk space utility";
-  };
-}
diff --git a/pkgs/desktops/kde-4.8/kdeutils/kfloppy.nix b/pkgs/desktops/kde-4.8/kdeutils/kfloppy.nix
deleted file mode 100644
index 2434a4fa671..00000000000
--- a/pkgs/desktops/kde-4.8/kdeutils/kfloppy.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ kde, kdelibs }:
-
-kde {
-  buildInputs = [ kdelibs ];
-
-  meta = {
-    description = "Floppy disk formatting utility";
-  };
-}
diff --git a/pkgs/desktops/kde-4.8/kdeutils/kgpg.nix b/pkgs/desktops/kde-4.8/kdeutils/kgpg.nix
deleted file mode 100644
index f3b00a5b968..00000000000
--- a/pkgs/desktops/kde-4.8/kdeutils/kgpg.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ kde, kdelibs, kdepimlibs }:
-
-kde {
-  buildInputs = [ kdelibs kdepimlibs ];
-
-  meta = {
-    description = "Simple KDE GUI for GPG";
-  };
-}
diff --git a/pkgs/desktops/kde-4.8/kdeutils/kremotecontrol.nix b/pkgs/desktops/kde-4.8/kdeutils/kremotecontrol.nix
deleted file mode 100644
index fef516e478d..00000000000
--- a/pkgs/desktops/kde-4.8/kdeutils/kremotecontrol.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ kde, kdelibs, kde_workspace, libXtst }:
-
-kde {
-  buildInputs = [ kdelibs kde_workspace libXtst ];
-
-  meta = {
-    description = "KDE remote control";
-  };
-}
diff --git a/pkgs/desktops/kde-4.8/kdeutils/ktimer.nix b/pkgs/desktops/kde-4.8/kdeutils/ktimer.nix
deleted file mode 100644
index 5700977349e..00000000000
--- a/pkgs/desktops/kde-4.8/kdeutils/ktimer.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ kde, kdelibs }:
-
-kde {
-  buildInputs = [ kdelibs ];
-
-  meta = {
-    description = "KDE Timer";
-  };
-}
diff --git a/pkgs/desktops/kde-4.8/kdeutils/kwallet.nix b/pkgs/desktops/kde-4.8/kdeutils/kwallet.nix
deleted file mode 100644
index 9ec0e6c0396..00000000000
--- a/pkgs/desktops/kde-4.8/kdeutils/kwallet.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ kde, kdelibs }:
-
-kde {
-  buildInputs = [ kdelibs ];
-
-  meta = {
-    description = "KDE Wallet (password storage) management tool";
-  };
-}
diff --git a/pkgs/desktops/kde-4.8/kdeutils/printer-applet.nix b/pkgs/desktops/kde-4.8/kdeutils/printer-applet.nix
deleted file mode 100644
index 2d937b3a4db..00000000000
--- a/pkgs/desktops/kde-4.8/kdeutils/printer-applet.nix
+++ /dev/null
@@ -1,28 +0,0 @@
-{ kde, kdelibs
-, pythonPackages, sip, pyqt4, pykde4, pycups, rhpl, system_config_printer
-, pythonDBus, makeWrapper }:
-
-let s_c_p = system_config_printer.override { withGUI = false; }; in
-
-kde rec {
-  buildInputs = [ kdelibs pythonPackages.python pythonPackages.wrapPython
-    ] ++ pythonPath;
-
-  pythonPath = [ pyqt4 pykde4 pycups s_c_p ];
-
-  passthru.propagatedUserEnvPackages = [ s_c_p ];
-
-  postInstall =
-    ''
-      wrapPythonPrograms
-
-      # ‘system-config-printer’ supplies some D-Bus policy that we need.
-      mkdir -p $out/nix-support
-      echo ${s_c_p} > $out/nix-support/propagated-user-env-packages
-    '';
-
-  meta = {
-    description = "KDE printer applet";
-    longDescription = "Applet to view current print jobs and configure new printers";
-  };
-}
diff --git a/pkgs/desktops/kde-4.8/kdeutils/superkaramba.nix b/pkgs/desktops/kde-4.8/kdeutils/superkaramba.nix
deleted file mode 100644
index 4dce768078b..00000000000
--- a/pkgs/desktops/kde-4.8/kdeutils/superkaramba.nix
+++ /dev/null
@@ -1,11 +0,0 @@
-{ kde, kdelibs, qimageblitz }:
-
-kde {
-  buildInputs = [ kdelibs qimageblitz ];
-
-  cmakeFlags = [ "-DBUILD_icons=TRUE" "-DBUILD_plasma=TRUE" ];
-
-  meta = {
-    description = "A KDE Eye-candy Application";
-  };
-}
diff --git a/pkgs/desktops/kde-4.8/kdeutils/sweeper.nix b/pkgs/desktops/kde-4.8/kdeutils/sweeper.nix
deleted file mode 100644
index 78d56c7df30..00000000000
--- a/pkgs/desktops/kde-4.8/kdeutils/sweeper.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ kde, kdelibs }:
-
-kde {
-  buildInputs = [ kdelibs ];
-
-  meta = {
-    description = "Helps clean unwanted traces the user leaves on the system";
-  };
-}
diff --git a/pkgs/desktops/kde-4.8/kdewebdev/kfilereplace.nix b/pkgs/desktops/kde-4.8/kdewebdev/kfilereplace.nix
deleted file mode 100644
index c3f6129d7e5..00000000000
--- a/pkgs/desktops/kde-4.8/kdewebdev/kfilereplace.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-{ kde, kdelibs, libxml2, libxslt }:
-
-kde {
-  buildInputs = [ kdelibs libxml2 libxslt ];
-
-  meta = {
-    description = "Batch search and replace tool";
-    homepage = http://www.kdewebdev.org;
-  };
-}
diff --git a/pkgs/desktops/kde-4.8/kdewebdev/kimagemapeditor.nix b/pkgs/desktops/kde-4.8/kdewebdev/kimagemapeditor.nix
deleted file mode 100644
index bececea7797..00000000000
--- a/pkgs/desktops/kde-4.8/kdewebdev/kimagemapeditor.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-{ kde, kdelibs, libxml2, libxslt }:
-
-kde {
-  buildInputs = [ kdelibs libxml2 libxslt ];
-
-  meta = {
-    description = "An HTML imagemap editor";
-    homepage = http://www.nongnu.org/kimagemap/;
-  };
-}
diff --git a/pkgs/desktops/kde-4.8/kdewebdev/klinkstatus.nix b/pkgs/desktops/kde-4.8/kdewebdev/klinkstatus.nix
deleted file mode 100644
index 94adbb7fd6e..00000000000
--- a/pkgs/desktops/kde-4.8/kdewebdev/klinkstatus.nix
+++ /dev/null
@@ -1,12 +0,0 @@
-{ kde, kdelibs, libxml2, libxslt, kdepimlibs
-, boost, htmlTidy }:
-
-kde {
-  buildInputs =
-    [ kdelibs libxml2 libxslt kdepimlibs boost htmlTidy ];
-
-  meta = {
-    description = "A KDE link checker";
-    homepage = http://klinkstatus.kdewebdev.org;
-  };
-}
diff --git a/pkgs/desktops/kde-4.8/kdewebdev/kommander.nix b/pkgs/desktops/kde-4.8/kdewebdev/kommander.nix
deleted file mode 100644
index 6a870e56303..00000000000
--- a/pkgs/desktops/kde-4.8/kdewebdev/kommander.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ kde, kdelibs, libxml2, libxslt }:
-
-kde {
-  buildInputs = [ kdelibs libxml2 libxslt ];
-
-  meta = {
-    description = "A graphical editor of scripted dialogs";
-  };
-}
diff --git a/pkgs/desktops/kde-4.8/l10n/default.nix b/pkgs/desktops/kde-4.8/l10n/default.nix
deleted file mode 100644
index c9fab80bffb..00000000000
--- a/pkgs/desktops/kde-4.8/l10n/default.nix
+++ /dev/null
@@ -1,45 +0,0 @@
-{ stdenv, fetchurl, kdelibs, gettext, release, stable }:
-
-let
-
-  inherit (stdenv.lib) attrByPath singleton;
-
-  kdeL10nDerivation =
-    { lang, saneName, sha256 }:
-
-    stdenv.mkDerivation rec {
-      name = "kde-l10n-${saneName}-${release}";
-
-      src = fetchurl {
-        url = "mirror://kde/${if stable then "" else "un"}stable/${release}/src/kde-l10n/kde-l10n-${lang}-${release}.tar.xz";
-        name = "${name}.tar.xz";
-        inherit sha256;
-      };
-
-      buildInputs = [ gettext kdelibs ];
-
-      cmakeFlags = "-Wno-dev";
-
-      meta = {
-        description = "KDE translation for ${lang}";
-        license = "GPL";
-        platforms = stdenv.lib.platforms.linux;
-        inherit (kdelibs.meta) maintainers homepage;
-      };
-    };
-
-  kdeL10nRelease =
-    builtins.listToAttrs (
-      map ({lang, saneName, sha256}:
-        {
-          name = saneName;
-          value = kdeL10nDerivation { inherit lang saneName sha256; };
-        }
-      ) (import (./manifest + "-${release}.nix"))
-    );
-
-in
-{
-  inherit kdeL10nDerivation;
-  recurseForDerivations = true;
-} // kdeL10nRelease
diff --git a/pkgs/desktops/kde-4.8/l10n/l10n-manifest.sh b/pkgs/desktops/kde-4.8/l10n/l10n-manifest.sh
deleted file mode 100755
index ec159a1e204..00000000000
--- a/pkgs/desktops/kde-4.8/l10n/l10n-manifest.sh
+++ /dev/null
@@ -1,32 +0,0 @@
-#!/bin/sh
-
-# Usage: download kde-l10n to $dir, then run
-# $0 $dir
-
-dir=$1
-
-if [[ ! -d "${dir}" ]]; then
-  echo "${dir} is not a directory (or doesn't exist)!" >&2
-  exit 1
-fi
-
-release=$(ls "${dir}"/kde-l10n-en_GB-*.tar.xz | \
-	sed -e 's/.*en_GB-//' -e 's/\.tar\.xz//')
-
-echo "Detected release ${release}" >&2
-
-exec > "manifest-${release}.nix"
-echo "["
-for i in `cd "${dir}"; ls kde-l10n-*-${release}.tar.xz`; do
-  lang=${i%-${release}.tar.xz}
-  lang=${lang#kde-l10n-}
-  echo -n "${lang}.. " >&2
-  hash=$(nix-hash --type sha256 --flat --base32 "${dir}/${i}")
-  echo "{"
-  echo "  lang = \"${lang}\";"
-  echo "  saneName = \"$(echo $lang | sed s^@^_^g)\";"
-  echo "  sha256 = \"${hash}\";"
-  echo "}"
-  echo $hash >&2
-done
-echo "]"
diff --git a/pkgs/desktops/kde-4.8/l10n/manifest-4.8.4.nix b/pkgs/desktops/kde-4.8/l10n/manifest-4.8.4.nix
deleted file mode 100644
index fb823440abd..00000000000
--- a/pkgs/desktops/kde-4.8/l10n/manifest-4.8.4.nix
+++ /dev/null
@@ -1,277 +0,0 @@
-[
-{
-  lang = "ar";
-  saneName = "ar";
-  sha256 = "1s17fypvwbr7v2jz1cdmxcgyav8ggj6sjiamvxdb9c6waahhmpjv";
-}
-{
-  lang = "bg";
-  saneName = "bg";
-  sha256 = "1lpdd4h9xgssvd5srkiyfzl7ngiyq7pipjm896qfmz03j3yzbwnz";
-}
-{
-  lang = "bs";
-  saneName = "bs";
-  sha256 = "0g6f5nihxizixc17y92453b4gj6w0bfwk4kndg2z60in9m4cswz5";
-}
-{
-  lang = "ca";
-  saneName = "ca";
-  sha256 = "02har0kybcj2jj51lxkrm6akr9dmv0afrxmzggbrbhfglhln8221";
-}
-{
-  lang = "ca@valencia";
-  saneName = "ca_valencia";
-  sha256 = "06wcfrbq1yh1vmzcyn7klym9cvmk8p56b23k9nbgw129z0ylhqxx";
-}
-{
-  lang = "cs";
-  saneName = "cs";
-  sha256 = "14kn3xq62fxn138gkc63icmngl97vb1bkmqv93cscbr4zc5sfkvw";
-}
-{
-  lang = "da";
-  saneName = "da";
-  sha256 = "10h3crypajdrxghn3hwprsgm09dblwsr17pg99c03zs4cd3gyv6s";
-}
-{
-  lang = "de";
-  saneName = "de";
-  sha256 = "1pp5d3s1450wf1kwawj9n3gv4pgr32dh3nnvkl5n58wjq07b9ah7";
-}
-{
-  lang = "el";
-  saneName = "el";
-  sha256 = "1wkp2v8yspgyixyki962vb3y8qdkdlp9mkrvfbw8lr6w2ivhkd90";
-}
-{
-  lang = "en_GB";
-  saneName = "en_GB";
-  sha256 = "07qw1qinlndfdkz2dzdr9bbb9kqxqhq3ya1qmcz999bw3ggjyi25";
-}
-{
-  lang = "es";
-  saneName = "es";
-  sha256 = "0wfl76s3zdb29dckbds63cfi96v2v59f6cm9yzjhwn87kyicq7k1";
-}
-{
-  lang = "et";
-  saneName = "et";
-  sha256 = "04ip1493m35qdv9f42590r1zqf9g6cksqzp6n7xcfzi1lr0cipyv";
-}
-{
-  lang = "eu";
-  saneName = "eu";
-  sha256 = "1pisn8myphk38jym2i8rp60rnvh3jn8lxnjghf5ng7h6ac1ydki3";
-}
-{
-  lang = "fa";
-  saneName = "fa";
-  sha256 = "1vx01f0i8mcxzbizn32hpl737bgih73qnsysvzl6cdv06ckvxrmm";
-}
-{
-  lang = "fi";
-  saneName = "fi";
-  sha256 = "1gx78cc294xnq2n96br2ahr2p6jzgv9d7bbaf9rm4nsamzbdd5m6";
-}
-{
-  lang = "fr";
-  saneName = "fr";
-  sha256 = "0skvnga1xavx10l3hhyqdr0mfapnjnbh75pbjvibg96d7wzxxi23";
-}
-{
-  lang = "ga";
-  saneName = "ga";
-  sha256 = "1pqcxhsgca3c5h9i9jpx67b572r3nhxrd6zmpkhidp3b476j2fx4";
-}
-{
-  lang = "gl";
-  saneName = "gl";
-  sha256 = "03k0w0byra36krrm8gbfmfv7am74y85zy6n01nl3j4xgiy41yqy4";
-}
-{
-  lang = "he";
-  saneName = "he";
-  sha256 = "0llqgsp9nw92px54lidsgdx5mk6z5nivshs4p193iplypa1pcfck";
-}
-{
-  lang = "hr";
-  saneName = "hr";
-  sha256 = "0w8l6msbxmjg889kpprh3bfzbgks2abp30b0m6xn43jkrghghxsj";
-}
-{
-  lang = "hu";
-  saneName = "hu";
-  sha256 = "0j63m00ilk9k5dy12bp3ndrwk5vcz79pwqhj9znp9l077lr1ah5n";
-}
-{
-  lang = "ia";
-  saneName = "ia";
-  sha256 = "0d3nkv9kbh6rdaf46psy2iia1phkj49xf67cdmnhr8kqgh557vh6";
-}
-{
-  lang = "id";
-  saneName = "id";
-  sha256 = "1gq4asqwsayd7wgkyqqg93lhqa8m0ac35as4dlrbqph4rk56k54y";
-}
-{
-  lang = "is";
-  saneName = "is";
-  sha256 = "05l9d9xmf08nr14gjsl8qbqyn8xc3qji4wc4zsqnmnp2fk8l3ndd";
-}
-{
-  lang = "it";
-  saneName = "it";
-  sha256 = "0hhl7pdfs1kcmz18k08961xq7y5vvjkwwzibkg238xagjq6wh1wl";
-}
-{
-  lang = "ja";
-  saneName = "ja";
-  sha256 = "1ipf5y1vy5accxbxs74641iqs785n2nkgxy31lgcm0ay0s6y3kx4";
-}
-{
-  lang = "kk";
-  saneName = "kk";
-  sha256 = "1arhyqn4yarcff3zhpi7a0c26b0rr1k3dwds9r6vq383vmv5la4a";
-}
-{
-  lang = "km";
-  saneName = "km";
-  sha256 = "1ny008qwxpdl9l4a56y664hxb3y0c9i5rpbbwnpcmynm6fmnm1ik";
-}
-{
-  lang = "ko";
-  saneName = "ko";
-  sha256 = "0aimxflnbx716bdph6snfzw17kkqqsbxrxawgjwmdp69h02pj5zh";
-}
-{
-  lang = "lt";
-  saneName = "lt";
-  sha256 = "14np3z28z946mf1g93ci202mqmg3qlgi1wlv8yp7949lq36psfx2";
-}
-{
-  lang = "lv";
-  saneName = "lv";
-  sha256 = "1jqxyih3m9p0km610dmpv9c3nzxjfm2aga1lm7nz3akgb8n6lhdi";
-}
-{
-  lang = "nb";
-  saneName = "nb";
-  sha256 = "000lmksgcinsxr5ny607b2q4h108pk4jzyygrf38zpw02crsa0i5";
-}
-{
-  lang = "nds";
-  saneName = "nds";
-  sha256 = "0spg23ngm8lj7bkbcj0s62i22flqzwvnhg12ghkiyqrdg8v725hq";
-}
-{
-  lang = "nl";
-  saneName = "nl";
-  sha256 = "1qpdabq9clbb6r59gs7s0k3l1rb5fxvbhsasxsw1r7m4l32gnlib";
-}
-{
-  lang = "nn";
-  saneName = "nn";
-  sha256 = "1nfkwmic4vs287ywi0mrqw95fvy42xdaxrsafxhjwdxqiynq6z66";
-}
-{
-  lang = "pa";
-  saneName = "pa";
-  sha256 = "078m4ph7kcjvkbivhaa54wdqr8fz8qa8r8db76w1wlynwgqy4qfs";
-}
-{
-  lang = "pl";
-  saneName = "pl";
-  sha256 = "1vcgkikbq48kxcgpi0vp95gj3wgfmghrvr6gqhlfql19wp5mjvm8";
-}
-{
-  lang = "pt";
-  saneName = "pt";
-  sha256 = "04pjxaxllhhccwinn33ild0xjjn05wqb3a660xhf3cgr6wkgx02f";
-}
-{
-  lang = "pt_BR";
-  saneName = "pt_BR";
-  sha256 = "1bb2f14h73ba35ysl3snnbiawx2ciz8h80f80k76qnyxix6zk885";
-}
-{
-  lang = "ro";
-  saneName = "ro";
-  sha256 = "1gm22h89j0s91gdnpn8nf0zw761ddwj5wg5i58v8aza45dh026rx";
-}
-{
-  lang = "ru";
-  saneName = "ru";
-  sha256 = "13hmbpsvzxiz4ci29388crr8xwhqmbrgs3yn12ay6z8fcwi3v528";
-}
-{
-  lang = "si";
-  saneName = "si";
-  sha256 = "0557m5r07xdqc0ambzw7b5kqnjaxyx6si2w2zi804gx89cjkjzyn";
-}
-{
-  lang = "sk";
-  saneName = "sk";
-  sha256 = "0yy379i8hy37sq61xz3n9309srjgm46n8jhj5dqf120jfc4knp2m";
-}
-{
-  lang = "sl";
-  saneName = "sl";
-  sha256 = "03qk82hz3zdaj1rcpfyrzks4ss6rrqfwz1wkjqp1rrm5g7kl835w";
-}
-{
-  lang = "sr";
-  saneName = "sr";
-  sha256 = "1dz2ckc7h7sm8ac66ajpypfifkpnx94d5d24hsm9gnp271x3134a";
-}
-{
-  lang = "sv";
-  saneName = "sv";
-  sha256 = "0rynj1db0yijlb2ilwzia53h2xqaj5prz4ap0y06vpw5i84xf6f5";
-}
-{
-  lang = "tg";
-  saneName = "tg";
-  sha256 = "0s78pb4b6fkqwvn9hp0n2mb6jkdwnx3hfh7vs9dxdx3m7zpgjq9z";
-}
-{
-  lang = "th";
-  saneName = "th";
-  sha256 = "0xf646xnyjkwa5m32chsnsbb5ndfvbrzgc7i76g2fwp843wrn4rq";
-}
-{
-  lang = "tr";
-  saneName = "tr";
-  sha256 = "0bfawc1cp9f7q1cq69y0w9bwawh2f4bhl1795f0i171pvfmmwq9g";
-}
-{
-  lang = "ug";
-  saneName = "ug";
-  sha256 = "1lj7kjmfjk6micrspkpzx4jhskw33zi7jyshfz8i8234vzzn9j6d";
-}
-{
-  lang = "uk";
-  saneName = "uk";
-  sha256 = "09ssi2zx24cfwc4bm039i9p6si8cx22fqwisi356ijjclrb3k7sh";
-}
-{
-  lang = "vi";
-  saneName = "vi";
-  sha256 = "0sc3mjbi7gsyllgkqck75qgnfdmrlqh5ffmxl2p4q8m1whkgxqr1";
-}
-{
-  lang = "wa";
-  saneName = "wa";
-  sha256 = "06rfw2l812gf3zyw7kl500lxda751q3bhrl7dh67zsc4s18gy9cb";
-}
-{
-  lang = "zh_CN";
-  saneName = "zh_CN";
-  sha256 = "1zaxjza3q5ana63kqm9mbqssz73my07iikfq2w0i29naqx570p0y";
-}
-{
-  lang = "zh_TW";
-  saneName = "zh_TW";
-  sha256 = "1svp8ykbcssl028hn6vxb6yb5agkbzlzvxnm6imkillsvmqlchdj";
-}
-]
diff --git a/pkgs/desktops/kde-4.8/oxygen-icons.nix b/pkgs/desktops/kde-4.8/oxygen-icons.nix
deleted file mode 100644
index 52e5e5f6bb0..00000000000
--- a/pkgs/desktops/kde-4.8/oxygen-icons.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-{ kde, cmake }:
-
-kde {
-  outputHashAlgo = "sha256";
-  outputHashMode = "recursive";
-  outputHash = "3984dac79aa7398578bcd9d69d74988bd992807518d46cd1dabc03867044c8a4";
-
-  nativeBuildInputs = [ cmake ];
-
-  meta = {
-    description = "KDE Oxygen theme icons";
-    longDescription = "Icons for KDE's default theme";
-    license = "GPL";
-  };
-}
diff --git a/pkgs/desktops/kde-4.8/support/akonadi/default.nix b/pkgs/desktops/kde-4.8/support/akonadi/default.nix
deleted file mode 100644
index 9a9e8a87066..00000000000
--- a/pkgs/desktops/kde-4.8/support/akonadi/default.nix
+++ /dev/null
@@ -1,24 +0,0 @@
-{ stdenv, fetchurl, cmake, qt4, shared_mime_info, libxslt, boost, automoc4, soprano }:
-
-stdenv.mkDerivation rec {
-  name = "akonadi-1.7.2";
-  
-  src = fetchurl {
-    url = "mirror://kde/stable/akonadi/src/${name}.tar.bz2";
-    sha256 = "07rbhc8aa3d896j2r64ljv3amd6s4xhlbgq7kx99m1f68yl1fwjb";
-  };
-
-  buildInputs = [ qt4 soprano libxslt boost ];
-
-  nativeBuildInputs = [ cmake automoc4 shared_mime_info ];
-
-  enableParallelBuilding = true;
-  
-  meta = with stdenv.lib; {
-    description = "KDE PIM Storage Service";
-    license = "LGPL";
-    homepage = http://pim.kde.org/akonadi;
-    maintainers = [ maintainers.sander maintainers.urkud ];
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 3fe6e56bdb7..e26eac4a5f7 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9353,14 +9353,6 @@ let
 
   kde4 = recurseIntoAttrs pkgs.kde410;
 
-  kde48 = kdePackagesFor (pkgs.kde48 // {
-      boost = boost149;
-      eigen = eigen2;
-      libotr = libotr_3_2;
-      libgphoto2 = libgphoto2_4;
-      libcanberra = libcanberra_kde;
-    }) ../desktops/kde-4.8;
-
   kde410 = kdePackagesFor (pkgs.kde410 // {
       boost = boost149;
       eigen = eigen2;
-- 
GitLab


From 2147a07938751a5cd0ea69b9be31f53d4dd21eed Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 7 Oct 2013 17:36:47 +0200
Subject: [PATCH 5023/5331] Fix a bunch of Hydra evaluation errors

---
 pkgs/applications/editors/flpsed/default.nix              | 3 +--
 pkgs/applications/misc/xfe/default.nix                    | 2 +-
 pkgs/applications/networking/browsers/dwb/default.nix     | 4 ++--
 pkgs/applications/science/chemistry/avogadro/default.nix  | 2 +-
 pkgs/development/libraries/cogl/default.nix               | 2 +-
 pkgs/development/libraries/fox/fox-1.6.nix                | 2 +-
 pkgs/development/libraries/libdevil/default.nix           | 2 +-
 pkgs/development/libraries/phonon-backend-vlc/default.nix | 2 +-
 pkgs/development/python-modules/blivet/default.nix        | 1 +
 pkgs/games/anki/default.nix                               | 2 +-
 pkgs/games/spring/default.nix                             | 4 ++--
 pkgs/tools/X11/winswitch/default.nix                      | 2 ++
 pkgs/tools/X11/xpra/default.nix                           | 1 +
 pkgs/tools/filesystems/nixpart/default.nix                | 1 +
 pkgs/tools/networking/mu/default.nix                      | 2 +-
 pkgs/top-level/python-packages.nix                        | 7 ++++++-
 16 files changed, 24 insertions(+), 15 deletions(-)

diff --git a/pkgs/applications/editors/flpsed/default.nix b/pkgs/applications/editors/flpsed/default.nix
index 1bae58cfaae..15605218b74 100644
--- a/pkgs/applications/editors/flpsed/default.nix
+++ b/pkgs/applications/editors/flpsed/default.nix
@@ -14,7 +14,6 @@ stdenv.mkDerivation {
     description = "WYSIWYG PostScript annotator";
     homepage = "http://http://flpsed.org/flpsed.html";
     license = "GPLv3";
-    platforms = stdenv.lib.platforms.all;
+    platforms = stdenv.lib.platforms.mesaPlatforms;
   };
-
 }
diff --git a/pkgs/applications/misc/xfe/default.nix b/pkgs/applications/misc/xfe/default.nix
index ce10b879199..9b1385d9d6a 100644
--- a/pkgs/applications/misc/xfe/default.nix
+++ b/pkgs/applications/misc/xfe/default.nix
@@ -26,6 +26,6 @@ stdenv.mkDerivation rec {
     homepage = "http://sourceforge.net/projects/xfe/";
     license = "GPLv2";
     maintainers = [ stdenv.lib.maintainers.bbenoist ];
-    platforms = stdenv.lib.platforms.all;
+    platforms = stdenv.lib.platforms.mesaPlatforms;
   };
 }
diff --git a/pkgs/applications/networking/browsers/dwb/default.nix b/pkgs/applications/networking/browsers/dwb/default.nix
index dd0cbc4eb4e..b120ebcac54 100644
--- a/pkgs/applications/networking/browsers/dwb/default.nix
+++ b/pkgs/applications/networking/browsers/dwb/default.nix
@@ -26,8 +26,8 @@ stdenv.mkDerivation {
   meta = {
     homepage = http://portix.bitbucket.org/dwb/;
     description = "A lightweight web browser based on the webkit web browser engine and the gtk toolkit";
-    platforms = with stdenv.lib.platforms; all;
-    maintainers = with stdenv.lib.maintainers; [pSub];
+    platforms = stdenv.lib.platforms.mesaPlatforms;
+    maintainers = [ stdenv.lib.maintainers.pSub ];
     license = "GPL";
   };
 }
diff --git a/pkgs/applications/science/chemistry/avogadro/default.nix b/pkgs/applications/science/chemistry/avogadro/default.nix
index dd6c0eaa376..e45f5b645fd 100644
--- a/pkgs/applications/science/chemistry/avogadro/default.nix
+++ b/pkgs/applications/science/chemistry/avogadro/default.nix
@@ -17,6 +17,6 @@ stdenv.mkDerivation rec {
   meta = {
     description = "Molecule editor and visualizer";
     maintainers = [ stdenv.lib.maintainers.urkud ];
-    inherit (qt4.meta) platforms;
+    platforms = stdenv.lib.platforms.mesaPlatforms;
   };
 }
diff --git a/pkgs/development/libraries/cogl/default.nix b/pkgs/development/libraries/cogl/default.nix
index 9c3a1a4d674..abb92f7b08b 100644
--- a/pkgs/development/libraries/cogl/default.nix
+++ b/pkgs/development/libraries/cogl/default.nix
@@ -35,6 +35,6 @@ stdenv.mkDerivation rec {
       render without stepping on each other's toes.
     '';
 
-    inherit (glib.meta) platforms;
+    platforms = stdenv.lib.platforms.mesaPlatforms;
   };
 }
diff --git a/pkgs/development/libraries/fox/fox-1.6.nix b/pkgs/development/libraries/fox/fox-1.6.nix
index 540c2c61d94..2a7bb1dc31a 100644
--- a/pkgs/development/libraries/fox/fox-1.6.nix
+++ b/pkgs/development/libraries/fox/fox-1.6.nix
@@ -31,6 +31,6 @@ stdenv.mkDerivation rec {
     homepage = "http://fox-toolkit.org";
     license = "LGPLv3";
     maintainers = [ stdenv.lib.maintainers.bbenoist ];
-    platforms = stdenv.lib.platforms.all;
+    platforms = stdenv.lib.platforms.mesaPlatforms;
   };
 }
diff --git a/pkgs/development/libraries/libdevil/default.nix b/pkgs/development/libraries/libdevil/default.nix
index 6efb785b657..d3053b4d2a5 100644
--- a/pkgs/development/libraries/libdevil/default.nix
+++ b/pkgs/development/libraries/libdevil/default.nix
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
     homepage = http://openil.sourceforge.net/;
     description = "An image library which can can load, save, convert, manipulate, filter and display a wide variety of image formats";
     license = licenses.lgpl2;
-    platforms = platforms.all;
+    platforms = platforms.mesaPlatforms;
     maintainers = [ maintainers.phreedom maintainers.urkud ];
   };
 }
diff --git a/pkgs/development/libraries/phonon-backend-vlc/default.nix b/pkgs/development/libraries/phonon-backend-vlc/default.nix
index 97e778cc1f5..257c80f0b11 100644
--- a/pkgs/development/libraries/phonon-backend-vlc/default.nix
+++ b/pkgs/development/libraries/phonon-backend-vlc/default.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation {
 
   meta = {
     description = "VideoLAN backend for Phonon multimedia framework";
-    inherit (qt4.meta) platforms;
+    platforms = stdenv.lib.platforms.linux;
     maintainers = [ stdenv.lib.maintainers.urkud ];
   };
 }
diff --git a/pkgs/development/python-modules/blivet/default.nix b/pkgs/development/python-modules/blivet/default.nix
index 922594bc3dc..c1b36bf909d 100644
--- a/pkgs/development/python-modules/blivet/default.nix
+++ b/pkgs/development/python-modules/blivet/default.nix
@@ -53,5 +53,6 @@ in buildPythonPackage rec {
     homepage = "https://fedoraproject.org/wiki/Blivet";
     description = "Module for management of a system's storage configuration";
     license = [ "GPLv2+" "LGPLv2.1+" ];
+    platforms = stdenv.lib.platforms.linux;
   };
 }
diff --git a/pkgs/games/anki/default.nix b/pkgs/games/anki/default.nix
index b904a6b5dcd..7437e2e2262 100644
--- a/pkgs/games/anki/default.nix
+++ b/pkgs/games/anki/default.nix
@@ -66,6 +66,6 @@ stdenv.mkDerivation rec {
         * even practicing guitar chords!
       '';
       license = "GPLv3";
-      platforms = stdenv.lib.platforms.all;
+      platforms = stdenv.lib.platforms.mesaPlatforms;
     };
 }
diff --git a/pkgs/games/spring/default.nix b/pkgs/games/spring/default.nix
index ba45360ccb6..109cb239d2b 100644
--- a/pkgs/games/spring/default.nix
+++ b/pkgs/games/spring/default.nix
@@ -27,9 +27,9 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     homepage = http://springrts.com/;
-    description = "A powerful real-time strategy(RTS) game engine";
+    description = "A powerful real-time strategy (RTS) game engine";
     license = licenses.gpl2;
     maintainers = [ maintainers.phreedom maintainers.qknight ];
-    platforms = platforms.unix;
+    platforms = platforms.mesaPlatforms;
   };
 }
diff --git a/pkgs/tools/X11/winswitch/default.nix b/pkgs/tools/X11/winswitch/default.nix
index b53db509daf..bd160940b57 100644
--- a/pkgs/tools/X11/winswitch/default.nix
+++ b/pkgs/tools/X11/winswitch/default.nix
@@ -38,6 +38,8 @@ let
     '';
 
     doCheck = false;
+
+    meta.platforms = stdenv.lib.platforms.mesaPlatforms;
   };
 in stdenv.lib.overrideDerivation base (b: {
   postFixup = b.postFixup + ''
diff --git a/pkgs/tools/X11/xpra/default.nix b/pkgs/tools/X11/xpra/default.nix
index 71c5d5f3a44..b8995430f92 100644
--- a/pkgs/tools/X11/xpra/default.nix
+++ b/pkgs/tools/X11/xpra/default.nix
@@ -40,5 +40,6 @@ buildPythonPackage rec {
   meta = {
     homepage = http://xpra.org/;
     description = "Persistent remote applications for X";
+    platforms = stdenv.lib.platforms.mesaPlatforms;
   };
 }
diff --git a/pkgs/tools/filesystems/nixpart/default.nix b/pkgs/tools/filesystems/nixpart/default.nix
index 2cd40bb0867..633f04320c3 100644
--- a/pkgs/tools/filesystems/nixpart/default.nix
+++ b/pkgs/tools/filesystems/nixpart/default.nix
@@ -24,5 +24,6 @@ in buildPythonPackage rec {
     description = "NixOS storage manager/partitioner";
     license = stdenv.lib.licenses.gpl2Plus;
     maintainers = [ stdenv.lib.maintainers.aszlig ];
+    platforms = stdenv.lib.platforms.linux;
   };
 }
diff --git a/pkgs/tools/networking/mu/default.nix b/pkgs/tools/networking/mu/default.nix
index 6b316321afd..e42dfee7cae 100644
--- a/pkgs/tools/networking/mu/default.nix
+++ b/pkgs/tools/networking/mu/default.nix
@@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
     description = "A collection of utilties for indexing and searching Maildirs";
     license = "GPLv3+";
     homepage = "http://www.djcbsoftware.nl/code/mu/";
-    platforms = stdenv.lib.platforms.all;
+    platforms = stdenv.lib.platforms.mesaPlatforms;
     maintainers = with stdenv.lib.maintainers; [ antono the-kenny ];
   };
 }
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 9d0b7d80f76..a33103cccb8 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -1347,6 +1347,7 @@ pythonPackages = modules // import ./python-packages-generated.nix {
       homepage = http://pythonhosted.org/evdev;
       license = licenses.bsd3;
       maintainers = [ maintainers.goibhniu ];
+      platforms = stdenv.lib.platforms.linux;
     };
   };
 
@@ -4628,6 +4629,7 @@ pythonPackages = modules // import ./python-packages-generated.nix {
       homepage = "http://www.pyglet.org/";
       description = "A cross-platform windowing and multimedia library";
       license = stdenv.lib.licenses.bsd3;
+      platforms = stdenv.lib.platforms.mesaPlatforms;
     };
   };
 
@@ -4795,7 +4797,8 @@ pythonPackages = modules // import ./python-packages-generated.nix {
     meta = {
       homepage = "https://fedorahosted.org/pyparted/";
       description = "Python interface for libparted";
-      license = pkgs.lib.licenses.gpl2Plus;
+      license = stdenv.lib.licenses.gpl2Plus;
+      platforms = stdenv.lib.platforms.linux;
     };
   };
 
@@ -4851,6 +4854,7 @@ pythonPackages = modules // import ./python-packages-generated.nix {
       homepage = "http://pyudev.readthedocs.org/";
       description = "Pure Python libudev binding";
       license = stdenv.lib.licenses.lgpl21Plus;
+      platforms = stdenv.lib.platforms.linux;
     };
   };
 
@@ -4974,6 +4978,7 @@ pythonPackages = modules // import ./python-packages-generated.nix {
           '';
 
           license = "BSD-style";
+          platforms = stdenv.lib.platforms.mesaPlatforms;
         };
       };
 
-- 
GitLab


From d269a8c91dd825718c15f4e205390cf532c3d818 Mon Sep 17 00:00:00 2001
From: Rok Garbas <rok@garbas.si>
Date: Mon, 7 Oct 2013 03:57:44 +0200
Subject: [PATCH 5024/5331] adding RelStorage and psycopg2 python packages

---
 pkgs/top-level/python-packages-generated.nix | 222 +++++++++++--------
 pkgs/top-level/python-packages.json          |   9 +
 2 files changed, 142 insertions(+), 89 deletions(-)

diff --git a/pkgs/top-level/python-packages-generated.nix b/pkgs/top-level/python-packages-generated.nix
index e33b57286cd..5ed553224d2 100644
--- a/pkgs/top-level/python-packages-generated.nix
+++ b/pkgs/top-level/python-packages-generated.nix
@@ -267,11 +267,11 @@ in
   };
 
 
-  "coverage-3.6" = self.buildPythonPackage {
-    name = "coverage-3.6";
+  "coverage-3.7" = self.buildPythonPackage {
+    name = "coverage-3.7";
     src = fetchurl {
-        url = "https://pypi.python.org/packages/source/c/coverage/coverage-3.6.tar.gz";
-        md5 = "67d4e393f4c6a5ffc18605409d2aa1ac";
+        url = "https://pypi.python.org/packages/source/c/coverage/coverage-3.7.tar.gz";
+        md5 = "055d82e6849d882ec6cf2ae1faca8e56";
     };
     doCheck = true;
     buildInputs = [  ];
@@ -287,26 +287,6 @@ in
   };
 
 
-  "Products.ExternalMethod-2.13.0" = self.buildPythonPackage {
-    name = "Products.ExternalMethod-2.13.0";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/P/Products.ExternalMethod/Products.ExternalMethod-2.13.0.zip";
-        md5 = "15ba953ef6cb632eb571977651252ea6";
-    };
-    doCheck = false;
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ self."AccessControl-3.0.8" self."Acquisition-2.13.8" self."ExtensionClass-2.13.2" self."Persistence-2.13.2" self.setuptools self."ZODB3-3.10.5" ];
-    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-    meta = {
-      description = ''
-        This package provides support for external Python methods within a Zope 2 environment.
-        '';
-      homepage = "http://pypi.python.org/pypi/Products.ExternalMethod";
-      license = "ZPL 2.1";
-    };
-  };
-
-
   "Products.CMFUid-2.2.1" = self.buildPythonPackage {
     name = "Products.CMFUid-2.2.1";
     src = fetchurl {
@@ -347,28 +327,6 @@ in
   };
 
 
-  "plone.recipe.zope2instance" = self."plone.recipe.zope2instance-4.2.13";
-
-  "plone.recipe.zope2instance-4.2.13" = self.buildPythonPackage {
-    name = "plone.recipe.zope2instance-4.2.13";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/p/plone.recipe.zope2instance/plone.recipe.zope2instance-4.2.13.zip";
-        md5 = "1ff990a15e77a92a7339b5092bfb9cc3";
-    };
-    doCheck = false;
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ self."mailinglogger-3.7.0" self.setuptools self."zc.buildout-1.7.1" self."zc.recipe.egg-1.3.2" self."ZODB3-3.10.5" self."Zope2-2.13.21" ];
-    installCommand = ''easy_install --always-unzip --prefix="$out" .'';
-    meta = {
-      description = ''
-        Buildout recipe for creating a Zope 2 instance
-        '';
-      homepage = "http://pypi.python.org/pypi/plone.recipe.zope2instance";
-      license = "ZPL 2.1";
-    };
-  };
-
-
   "Unidecode-0.04.1" = self.buildPythonPackage {
     name = "Unidecode-0.04.1";
     src = fetchurl {
@@ -897,21 +855,23 @@ in
   };
 
 
-  "zope.schema-4.3.2" = self.buildPythonPackage {
-    name = "zope.schema-4.3.2";
+  "plone.recipe.zope2instance" = self."plone.recipe.zope2instance-4.2.13";
+
+  "plone.recipe.zope2instance-4.2.13" = self.buildPythonPackage {
+    name = "plone.recipe.zope2instance-4.2.13";
     src = fetchurl {
-        url = "https://pypi.python.org/packages/source/z/zope.schema/zope.schema-4.3.2.zip";
-        md5 = "b63df4a3035f29113f8130c8ae28bb13";
+        url = "https://pypi.python.org/packages/source/p/plone.recipe.zope2instance/plone.recipe.zope2instance-4.2.13.zip";
+        md5 = "1ff990a15e77a92a7339b5092bfb9cc3";
     };
     doCheck = false;
     buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ self.setuptools self."zope.event-4.0.2" self."zope.interface-4.0.5" ];
+    propagatedBuildInputs = [ self."mailinglogger-3.7.0" self.setuptools self."zc.buildout-1.7.1" self."zc.recipe.egg-1.3.2" self."ZODB3-3.10.5" self."Zope2-2.13.21" ];
     installCommand = ''easy_install --always-unzip --prefix="$out" .'';
     meta = {
       description = ''
-        zope.interface extension for defining data schemas
+        Buildout recipe for creating a Zope 2 instance
         '';
-      homepage = "http://pypi.python.org/pypi/zope.schema";
+      homepage = "http://pypi.python.org/pypi/plone.recipe.zope2instance";
       license = "ZPL 2.1";
     };
   };
@@ -1821,22 +1781,22 @@ in
   };
 
 
-  "plone.indexer-1.0.2" = self.buildPythonPackage {
-    name = "plone.indexer-1.0.2";
+  "zope.schema-4.3.2" = self.buildPythonPackage {
+    name = "zope.schema-4.3.2";
     src = fetchurl {
-        url = "https://pypi.python.org/packages/source/p/plone.indexer/plone.indexer-1.0.2.zip";
-        md5 = "538aeee1f9db78bc8c85ae1bcb0153ed";
+        url = "https://pypi.python.org/packages/source/z/zope.schema/zope.schema-4.3.2.zip";
+        md5 = "b63df4a3035f29113f8130c8ae28bb13";
     };
     doCheck = false;
     buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ self."Products.CMFCore-2.2.7" self.setuptools self."zope.component__zcml-3.9.5" self."zope.interface-3.6.7" ];
-    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
+    propagatedBuildInputs = [ self.setuptools self."zope.event-4.0.2" self."zope.interface-4.0.5" ];
+    installCommand = ''easy_install --always-unzip --prefix="$out" .'';
     meta = {
       description = ''
-        Hooks to facilitate managing custom index values in Zope 2/CMF applications
+        zope.interface extension for defining data schemas
         '';
-      homepage = "http://pypi.python.org/pypi/plone.indexer";
-      license = "BSD";
+      homepage = "http://pypi.python.org/pypi/zope.schema";
+      license = "ZPL 2.1";
     };
   };
 
@@ -2023,22 +1983,22 @@ in
   };
 
 
-  "Products.MIMETools-2.13.0" = self.buildPythonPackage {
-    name = "Products.MIMETools-2.13.0";
+  "plone.locking-2.0.4" = self.buildPythonPackage {
+    name = "plone.locking-2.0.4";
     src = fetchurl {
-        url = "https://pypi.python.org/packages/source/P/Products.MIMETools/Products.MIMETools-2.13.0.zip";
-        md5 = "ad5372fc1190599a19493db0864448ec";
+        url = "https://pypi.python.org/packages/source/p/plone.locking/plone.locking-2.0.4.zip";
+        md5 = "a7f8b8db78f57272d351d7fe0d067eb2";
     };
     doCheck = false;
     buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ self."DocumentTemplate-2.13.2" self.setuptools ];
-    installCommand = ''easy_install --always-unzip --prefix="$out" .'';
+    propagatedBuildInputs = [ self."Acquisition-2.13.8" self."DateTime-3.0.3" self."Products.CMFCore-2.2.7" self.setuptools self."ZODB3-3.10.5" self."zope.annotation-3.5.0" self."zope.component__zcml-3.9.5" self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."zope.schema-4.2.2" self."zope.viewlet-3.7.2" self."Zope2-2.13.21" ];
+    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
     meta = {
       description = ''
-        MIMETools provides the &lt;!--#mime--&gt; tag for DocumentTemplate.
+        webdav locking support
         '';
-      homepage = "http://pypi.python.org/pypi/Products.MIMETools";
-      license = "ZPL 2.1";
+      homepage = "http://pypi.python.org/pypi/plone.locking";
+      license = "GPL version 2";
     };
   };
 
@@ -2583,6 +2543,28 @@ in
   };
 
 
+  "psycopg2" = self."psycopg2-2.5.1";
+
+  "psycopg2-2.5.1" = self.buildPythonPackage {
+    name = "psycopg2-2.5.1";
+    src = fetchurl {
+        url = "https://pypi.python.org/packages/source/p/psycopg2/psycopg2-2.5.1.tar.gz";
+        md5 = "1b433f83d50d1bc61e09026e906d84c7";
+    };
+    doCheck = false;
+    buildInputs = [  ];
+    propagatedBuildInputs = [  ];
+    installCommand = ''easy_install --always-unzip --prefix="$out" .'';
+    meta = {
+      description = ''
+        Python-PostgreSQL Database Adapter
+        '';
+      homepage = "http://initd.org/psycopg/";
+      license = "GPL with exceptions or ZPL";
+    };
+  };
+
+
   "plone.rfc822-1.1" = self.buildPythonPackage {
     name = "plone.rfc822-1.1";
     src = fetchurl {
@@ -2703,6 +2685,28 @@ in
   };
 
 
+  "RelStorage" = self."RelStorage-1.5.1";
+
+  "RelStorage-1.5.1" = self.buildPythonPackage {
+    name = "RelStorage-1.5.1";
+    src = fetchurl {
+        url = "https://pypi.python.org/packages/source/R/RelStorage/RelStorage-1.5.1.tar.gz";
+        md5 = "2454211d086ac02a4af10f7292e260ec";
+    };
+    doCheck = false;
+    buildInputs = [  ];
+    propagatedBuildInputs = [ self."zc.lockfile-1.0.2" self."ZODB3-3.10.5" self."zope.interface-3.6.7" ];
+    installCommand = ''easy_install --always-unzip --prefix="$out" .'';
+    meta = {
+      description = ''
+        A backend for ZODB that stores pickles in a relational database.
+        '';
+      homepage = "http://pypi.python.org/pypi/RelStorage";
+      license = "ZPL 2.1";
+    };
+  };
+
+
   "Products.ResourceRegistries-2.2.9" = self.buildPythonPackage {
     name = "Products.ResourceRegistries-2.2.9";
     src = fetchurl {
@@ -2985,22 +2989,22 @@ in
   };
 
 
-  "plone.locking-2.0.4" = self.buildPythonPackage {
-    name = "plone.locking-2.0.4";
+  "Products.MIMETools-2.13.0" = self.buildPythonPackage {
+    name = "Products.MIMETools-2.13.0";
     src = fetchurl {
-        url = "https://pypi.python.org/packages/source/p/plone.locking/plone.locking-2.0.4.zip";
-        md5 = "a7f8b8db78f57272d351d7fe0d067eb2";
+        url = "https://pypi.python.org/packages/source/P/Products.MIMETools/Products.MIMETools-2.13.0.zip";
+        md5 = "ad5372fc1190599a19493db0864448ec";
     };
     doCheck = false;
     buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ self."Acquisition-2.13.8" self."DateTime-3.0.3" self."Products.CMFCore-2.2.7" self.setuptools self."ZODB3-3.10.5" self."zope.annotation-3.5.0" self."zope.component__zcml-3.9.5" self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."zope.schema-4.2.2" self."zope.viewlet-3.7.2" self."Zope2-2.13.21" ];
-    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
+    propagatedBuildInputs = [ self."DocumentTemplate-2.13.2" self.setuptools ];
+    installCommand = ''easy_install --always-unzip --prefix="$out" .'';
     meta = {
       description = ''
-        webdav locking support
+        MIMETools provides the &lt;!--#mime--&gt; tag for DocumentTemplate.
         '';
-      homepage = "http://pypi.python.org/pypi/plone.locking";
-      license = "GPL version 2";
+      homepage = "http://pypi.python.org/pypi/Products.MIMETools";
+      license = "ZPL 2.1";
     };
   };
 
@@ -3365,22 +3369,22 @@ in
   };
 
 
-  "plone.app.textfield-1.2.2" = self.buildPythonPackage {
-    name = "plone.app.textfield-1.2.2";
+  "Products.ExternalMethod-2.13.0" = self.buildPythonPackage {
+    name = "Products.ExternalMethod-2.13.0";
     src = fetchurl {
-        url = "https://pypi.python.org/packages/source/p/plone.app.textfield/plone.app.textfield-1.2.2.zip";
-        md5 = "f832887a40826d6f68c48b48f071fb9c";
+        url = "https://pypi.python.org/packages/source/P/Products.ExternalMethod/Products.ExternalMethod-2.13.0.zip";
+        md5 = "15ba953ef6cb632eb571977651252ea6";
     };
     doCheck = false;
     buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ self.setuptools self."ZODB3-3.10.5" self."zope.component__zcml-3.9.5" self."zope.interface-3.6.7" self."zope.schema-4.2.2" ];
+    propagatedBuildInputs = [ self."AccessControl-3.0.8" self."Acquisition-2.13.8" self."ExtensionClass-2.13.2" self."Persistence-2.13.2" self.setuptools self."ZODB3-3.10.5" ];
     installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
     meta = {
       description = ''
-        Text field with MIME type support
+        This package provides support for external Python methods within a Zope 2 environment.
         '';
-      homepage = "http://pypi.python.org/pypi/plone.app.textfield";
-      license = "GPL";
+      homepage = "http://pypi.python.org/pypi/Products.ExternalMethod";
+      license = "ZPL 2.1";
     };
   };
 
@@ -3685,6 +3689,26 @@ in
   };
 
 
+  "plone.indexer-1.0.2" = self.buildPythonPackage {
+    name = "plone.indexer-1.0.2";
+    src = fetchurl {
+        url = "https://pypi.python.org/packages/source/p/plone.indexer/plone.indexer-1.0.2.zip";
+        md5 = "538aeee1f9db78bc8c85ae1bcb0153ed";
+    };
+    doCheck = false;
+    buildInputs = [ pkgs.unzip ];
+    propagatedBuildInputs = [ self."Products.CMFCore-2.2.7" self.setuptools self."zope.component__zcml-3.9.5" self."zope.interface-3.6.7" ];
+    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
+    meta = {
+      description = ''
+        Hooks to facilitate managing custom index values in Zope 2/CMF applications
+        '';
+      homepage = "http://pypi.python.org/pypi/plone.indexer";
+      license = "BSD";
+    };
+  };
+
+
   "plone.app.layout-2.3.7" = self.buildPythonPackage {
     name = "plone.app.layout-2.3.7";
     src = fetchurl {
@@ -4012,7 +4036,7 @@ in
         md5 = "bf0a04fcf8b2cdcaa13b04324cefb53d";
     };
     doCheck = true;
-    buildInputs = [ self."nose-1.3.0" self."unittest2-0.5.1" self."pyquery-1.2.4" self."WSGIProxy2-0.3" self."PasteDeploy-1.5.0" self."mock-1.0.1" self."coverage-3.6" pkgs.unzip ];
+    buildInputs = [ self."nose-1.3.0" self."unittest2-0.5.1" self."pyquery-1.2.4" self."WSGIProxy2-0.3" self."PasteDeploy-1.5.0" self."mock-1.0.1" self."coverage-3.7" pkgs.unzip ];
     propagatedBuildInputs = [ self."beautifulsoup4-4.3.2" self."six-1.4.1" self."waitress-0.8.7" self."WebOb-1.2.3" ];
     installCommand = ''easy_install --always-unzip --prefix="$out" .'';
     meta = {
@@ -4365,6 +4389,26 @@ in
   };
 
 
+  "plone.app.textfield-1.2.2" = self.buildPythonPackage {
+    name = "plone.app.textfield-1.2.2";
+    src = fetchurl {
+        url = "https://pypi.python.org/packages/source/p/plone.app.textfield/plone.app.textfield-1.2.2.zip";
+        md5 = "f832887a40826d6f68c48b48f071fb9c";
+    };
+    doCheck = false;
+    buildInputs = [ pkgs.unzip ];
+    propagatedBuildInputs = [ self.setuptools self."ZODB3-3.10.5" self."zope.component__zcml-3.9.5" self."zope.interface-3.6.7" self."zope.schema-4.2.2" ];
+    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
+    meta = {
+      description = ''
+        Text field with MIME type support
+        '';
+      homepage = "http://pypi.python.org/pypi/plone.app.textfield";
+      license = "GPL";
+    };
+  };
+
+
   "zope.event-3.5.2" = self.buildPythonPackage {
     name = "zope.event-3.5.2";
     src = fetchurl {
diff --git a/pkgs/top-level/python-packages.json b/pkgs/top-level/python-packages.json
index 36975402e24..aefd911a558 100644
--- a/pkgs/top-level/python-packages.json
+++ b/pkgs/top-level/python-packages.json
@@ -126,5 +126,14 @@
   { "name": "plone.recipe.zope2instance",
     "extends": "http://dist.plone.org/release/4.3.2/versions.cfg",
     "doCheck": false
+  },
+  { "name": "RelStorage",
+    "extends": "http://dist.plone.org/release/4.3.2/versions.cfg",
+    "doCheck": false
+  },
+  { "name": "psycopg2",
+    "buildInputs": [ "pkgs.postgresql" ],
+    "doCheck": false
   }
+
 ]
-- 
GitLab


From 5aa323660c12a583e0483919ba60298efdf0c4ec Mon Sep 17 00:00:00 2001
From: Rok Garbas <rok@garbas.si>
Date: Mon, 7 Oct 2013 03:58:24 +0200
Subject: [PATCH 5025/5331] adding jmeter

---
 .../networking/jmeter/default.nix             | 27 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 29 insertions(+)
 create mode 100644 pkgs/applications/networking/jmeter/default.nix

diff --git a/pkgs/applications/networking/jmeter/default.nix b/pkgs/applications/networking/jmeter/default.nix
new file mode 100644
index 00000000000..c3212f6aa56
--- /dev/null
+++ b/pkgs/applications/networking/jmeter/default.nix
@@ -0,0 +1,27 @@
+{ fetchurl, stdenv, ant }:
+
+stdenv.mkDerivation rec {
+  name = "jmeter-2.9";
+  src = fetchurl {
+    url = "http://ftp.unicamp.br/pub/apache//jmeter/binaries/apache-jmeter-2.9.tgz";
+    sha256 = "14r3zn910m97jqrf6k5c4lwy214snaap2242qg76h65zk9qr20ni";
+  };
+
+  installPhase = ''
+    mkdir $out
+    cp ./* $out/ -R
+  '';
+
+  meta = {
+    description = "Apache JMeter is a 100% pure Java desktop application designed to load test functional behavior and measure performance.";
+    longDescription = ''
+      The Apache JMeter desktop application is open source software, a 100%
+      pure Java application designed to load test functional behavior and
+      measure performance. It was originally designed for testing Web
+      Applications but has since expanded to other test functions.
+    '';
+    license = stdenv.lib.licenses.asl20;
+    maintainers = [ stdenv.lib.maintainers.garbas ];
+    priority = 1;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e26eac4a5f7..664a19d76c9 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3147,6 +3147,8 @@ let
 
   j = callPackage ../development/interpreters/j {};
 
+  jmeter = callPackage ../applications/networking/jmeter {};
+
   kaffe = callPackage ../development/interpreters/kaffe { };
 
   kona = callPackage ../development/interpreters/kona {};
-- 
GitLab


From fd05af8bc0c6e17590c10d0693125d808968c219 Mon Sep 17 00:00:00 2001
From: Evgeny Egorochkin <phreedom@yandex.ru>
Date: Mon, 7 Oct 2013 22:31:34 +0300
Subject: [PATCH 5026/5331] KDE4.11: update to 4.11.2. Add missing xslt file.

---
 pkgs/desktops/kde-4.11/default.nix            |   2 +-
 pkgs/desktops/kde-4.11/kde-package/4.11.2.nix | 444 ++++++++++++++++++
 .../kde-4.11/kde-package/kde-submodules.xslt  |  22 +
 .../kde-4.11/l10n/manifest-4.11.2.nix         | 272 +++++++++++
 pkgs/desktops/kde-4.11/oxygen-icons.nix       |   2 +-
 5 files changed, 740 insertions(+), 2 deletions(-)
 create mode 100644 pkgs/desktops/kde-4.11/kde-package/4.11.2.nix
 create mode 100644 pkgs/desktops/kde-4.11/kde-package/kde-submodules.xslt
 create mode 100644 pkgs/desktops/kde-4.11/l10n/manifest-4.11.2.nix

diff --git a/pkgs/desktops/kde-4.11/default.nix b/pkgs/desktops/kde-4.11/default.nix
index b1cd9e919fb..d3840120a65 100644
--- a/pkgs/desktops/kde-4.11/default.nix
+++ b/pkgs/desktops/kde-4.11/default.nix
@@ -1,4 +1,4 @@
-{ callPackage, callPackageOrig, stdenv, qt48, release ? "4.11.0" }:
+{ callPackage, callPackageOrig, stdenv, qt48, release ? "4.11.2" }:
 
 let
   # Need callPackageOrig to avoid infinite cycle
diff --git a/pkgs/desktops/kde-4.11/kde-package/4.11.2.nix b/pkgs/desktops/kde-4.11/kde-package/4.11.2.nix
new file mode 100644
index 00000000000..04a65cc08c6
--- /dev/null
+++ b/pkgs/desktops/kde-4.11/kde-package/4.11.2.nix
@@ -0,0 +1,444 @@
+{stable=true;
+hashes=builtins.listToAttrs[
+  {name="amor";value="1p31vayk12pfgrx5bi0c7kiwzyk1j84b9cssrir63amfxa0gfqm5";}
+  {name="analitza";value="11bwyfqah01riilrl73b9aymd8jqkprch60fi7ya5jvz385ngxzk";}
+  {name="ark";value="0cygijr642xhrrd1a74nzgidqlb244xnp9na3ry7n49rxni3bm1n";}
+  {name="audiocd-kio";value="0a52wp0hfnw24asyy6akfnyyb1hfkkzfiy2fml7zs9pqr1knxbq1";}
+  {name="blinken";value="0wc72gx141id6h35z2lhc762yp2mi4j3bdrhlsg05f42cz0dyzv6";}
+  {name="bomber";value="1zszxy94gbzdq1jddfglxcpk3d7ly3cn2hmllblhqywx9d2s8app";}
+  {name="bovo";value="1fr1hwpcqazh5y39wgahydr91fnd0rbrnwv2ajaq8zzaqbqqkgqv";}
+  {name="cantor";value="01i2w42x606yrcrr4zacalw8rhwjczij0vfdmkqsr27dvnpl64fa";}
+  {name="cervisia";value="1iln0p690kd40anpq26snyhb1d2ql3kz89y05lbgq14n9v4iriij";}
+  {name="dolphin-plugins";value="0d386hfynxqgmcizqqspzi7lzhlm2nwz0agm7iaw6xl26xm0h5bg";}
+  {name="dragon";value="0jnqnskf4g93fd6mw5b11mp5006yk7p0lshbnglrsnybznh6q2k5";}
+  {name="ffmpegthumbs";value="15hcsglcwqmwhdnp0i8d3slr4k0j94m57baiv7axn4wpbsss5k5n";}
+  {name="filelight";value="1npwgsngqk01akzyny2x7f9c7j092c4vjfmdnm2g7hm36q2gy823";}
+  {name="granatier";value="0bclrsi6999xcsmksbg280mvhszxdsr3f5cyzsn5yahs3k6isf2j";}
+  {name="gwenview";value="1qq827b1dfqx5xybr8bjs9ch7407ix6w47iryrbs8vs3k08qw8jw";}
+  {name="jovie";value="1fq8vihh7v19wmwfgxg3m6qi4730wj12m9sv41c7nwdqz3c0gzs2";}
+  {name="juk";value="18lyw6w7z2f72j9madg9rksafj1dpz8pdc09fby9gvkwacd7qsab";}
+  {name="kaccessible";value="0swzpk3kfrc4a3bf9gf40kh8y6nyd2qhvnxxsv6m00m701cj73ar";}
+  {name="kactivities";value="13iz2d2l7rn2d9q5c3mg4836mxgnds83cy2ll18r82bpp59qj4nx";}
+  {name="kajongg";value="0wvdf9lkkiy07dhwvmamz4gginq6ljy57swp4j4z2mm8m3x9i071";}
+  {name="kalgebra";value="0p2k1c710j5nsvb218h3mkbymsd48y0yw09ijx16cbdwvka7mpag";}
+  {name="kalzium";value="0mflvnb3nrrgh6h172lkhh0mxwrpdwcji74f8g6kb7xpr45ms21k";}
+  {name="kamera";value="1rybwccq3q6q0xk9p7f4clx1gf73fqzl69dx99q19wfc5y23pmg9";}
+  {name="kanagram";value="10vdkva83kb8rk6xaxcv5lgdil5wnz6i2bphz2c029s4vm8d2i2n";}
+  {name="kapman";value="0m5mawy3bjp2zd3jkylxsw4ccwzqg8lqd2v9i07zzf6f9ihjqs6r";}
+  {name="kapptemplate";value="16w8lrq2an4iwrss81fp0jisd52v2lwbvyam93cwxfcp4bsbzs9y";}
+  {name="kate";value="0n6jnfwprd5xjyja1dmja785swxgxnpz769xbg5aylnr1rsldzv2";}
+  {name="katomic";value="14rrnm6qf5lf05lj9d2zalrv5npj4hkng4i68y1svkgjl8p98j52";}
+  {name="kblackbox";value="00n3n011cnspdh606aa3scxj388vs3j1bamhk6bxnhmc26gbi54b";}
+  {name="kblocks";value="0l080dqdkqqqn1927gnjzbp3jqwladw1qmkx171291qxa0x364x0";}
+  {name="kbounce";value="10q1821wcnh4xggrndgvsm4dx6hyx4nll3f7blz77cga8fvz8lbw";}
+  {name="kbreakout";value="1xhnmlp2f8a0pmsabsw0yc53i5hcxf1bgid1ffbbgsr014xgqmmi";}
+  {name="kbruch";value="1rridi7lv1izmq68ymjmmm7mvyl3bdnkxj84dxg97yv91yqjx6ys";}
+  {name="kcachegrind";value="0crsb236nay9c0r49hgmiysa9bqwy89aj1avh3sxh82b7dsqmplp";}
+  {name="kcalc";value="0mw77vw8py0xnvkx43lvfzkghwd974chiszxck78iks2m12vgnpz";}
+  {name="kcharselect";value="1ys31fx7g85xmhia05s0i30k1jf1in83hnwc568lsbzvw37adbim";}
+  {name="kcolorchooser";value="0cn9n82kk08c55sy1hncpg5pjzlinkgvmii2p5gyp28fx4yphh45";}
+  {name="kcron";value="05bgwijfcpk56fkmnfjgcrmvkr50j1p524xg8s7zjxsdgib4p9xs";}
+  {name="kdeartwork";value="166fm27iby4gjk8f8zbdamwzkjh5wbvhfj9wn0pkp2dm8l9h8lq2";}
+  {name="kde-baseapps";value="1kgwgrn73x89zipkhq1irs09ka9wi8hk22daf16c4a6hbpinl24x";}
+  {name="kde-base-artwork";value="076h9sl1gyn6c2lmslig9p7w7m049bna9l8wv5jllwssm8i83ccg";}
+  {name="kde-dev-scripts";value="0dpdpc24kcyihgqqypqrxhmfwsmhl9ffim80n2rsdp3aka4y10vv";}
+  {name="kde-dev-utils";value="1j77v0d706ic9m008apqwc1287ma47qmpbv07xv770i0wjh90pl6";}
+  {name="kdegraphics-mobipocket";value="02dzr5lm75p6rw7k30aj5m296h8whxg1shrv8s1pm7ari2660d50";}
+  {name="kdegraphics-strigi-analyzer";value="09cnwvmkjyxagpb5sqgcj69fr496wb0pn4xns65yzynv0540hkkd";}
+  {name="kdegraphics-thumbnailers";value="1fs69zih92dlm8l60br0c0nwy095hsnszdyspdkmz52ycznmzk28";}
+  {name="kdelibs";value="01nzkrmvv8pa4x7mq5nw0z6dasm668q37mhdgvkg1hk7i57w98z5";}
+  {name="kdenetwork-filesharing";value="0ah9v7vvpg8v8nn59h168zn2gaajf39ha2617dyicknc4gn9rsgk";}
+  {name="kdenetwork-strigi-analyzers";value="1iwhr1ckn06z50j1fq9ah15gni3am91gyhyi0f21jaqdigxpi3my";}
+  {name="kdepim";value="0gs06h182m74fgdp20z3w4h8ib5xm1h0i1asnwy1s61gvpkcm63h";}
+  {name="kdepimlibs";value="0kxnczl97wavm3c75wmy4yjw3vbq4x0jdkbk611jn8hqj32c3fl7";}
+  {name="kdepim-runtime";value="13j39qbb6vgsfhypby994pgwlmmyimmqvfri92m15l0ir7rqgfwm";}
+  {name="kdeplasma-addons";value="1dy3gw8z18acs3dmw375jv9qnxjrdwzzgj2p164icid7l2041n8l";}
+  {name="kde-runtime";value="1w4xav8abgqfj943iz2gjzfdmlnk25r5xj3g79sw1ip1bcvkhpq4";}
+  {name="kdesdk-kioslaves";value="1npqa9wwbgjwlnr24dgprdndygmvsixf19hjbplcnp41dn2q14nz";}
+  {name="kdesdk-strigi-analyzers";value="1b4anyzl3xd8pfhia8s0mbrhlyr086gic1as766ynddjpr6a4a94";}
+  {name="kdesdk-thumbnailers";value="0jmkgmabbip7ymjmvyxdrji7xbplrhcrq4vlq8z0jbnyh9b9yngx";}
+  {name="kde-wallpapers";value="1l4hr5nxvf10yv2n76znrz1s0v7xqppipisc1ffbfdnf2l4wrw11";}
+  {name="kdewebdev";value="0gp1vm905p0a0j4h1lakj2zxfm4c78898rl05yf04g9x25yj3mbg";}
+  {name="kde-workspace";value="05yr52xq6w1j2kc4n5wan5f5c7xbcnaad7sdhfns3alg1grlc3i6";}
+  {name="kdf";value="0nblxiav3rw9zggqxpawvknadxbr601m55535k3gzpg3a4slk7nc";}
+  {name="kdiamond";value="0w0fzlpvj98ykvvgyzp8hhkn20pyhxc1c8krlagaqxncv1b7mhcf";}
+  {name="kdnssd";value="0q74myd7shrp43ny2vm7hadr2aix1v35v0hg6i99z7rif9ai8yjh";}
+  {name="kfloppy";value="1w1qiplcnbq10qv4lyjx521adkcg9w7z372w7fi18hjv93ryliis";}
+  {name="kfourinline";value="0irghbp7hsrl7bhi2ggf6rb0p62vck47rmmy6zb30wv32xk9gz9k";}
+  {name="kgamma";value="1cbdxbh57jcz9anawvwybi1s4skcyq84f2r5mjs1xyg2s2fv1l8b";}
+  {name="kgeography";value="00g544kc7hkabk5xbkl07k3h515ac84l4a49853pj2ryrdrikmvx";}
+  {name="kget";value="1mdfrwdf6lm94vcc5m4l7q14b70x2pkd0ham194acd60np8bk5s4";}
+  {name="kgoldrunner";value="0dbhvqxryilixv7ak0b79g8d8a2mbgkp440sxkl31xjak05c1qmv";}
+  {name="kgpg";value="10py9c1z8i1p0acp2lbi6c95gsfhfv1cw5544xp31v5iccrv2izn";}
+  {name="khangman";value="0j13zzplvrgrq8gsn7xfbf19xclc6kvsrzbnbgp83ji1dg168z6c";}
+  {name="kig";value="0ld9g522n361q0h7yvb3zljllbddyglxiamw2hs2svsm7k98klz9";}
+  {name="kigo";value="1rn8pw4jw7ia3dhwx3jwfzylfd4l067qp1kp01lixddfd0ivh42r";}
+  {name="killbots";value="0c0hx61by8n10j3wcpwi6pzbq7bnmpylamj0c1r5pbxm69ljsaiv";}
+  {name="kimono";value="1p40q61p98vz9s4dkwm51p36yk2qx2s00fpiyi1pi73qg4klbc4j";}
+  {name="kiriki";value="0f01zdlpzwlkriv48p13wlg7j2b0dwzhd7hrq35kyb3jzwx1pc5n";}
+  {name="kiten";value="0kk5s3idg5vz59drc65w53fd1l2x4vh593crc7by2dgzsf6x40sd";}
+  {name="kjumpingcube";value="1gdbjv42dryyap3dln7wy3pysbyy9d10vbpb1asxbpn1kzlzlf96";}
+  {name="klettres";value="08h3b70nj4d4cb71fvm3wkgy27vm1aqx8xzkqdgzs2snzb8ra983";}
+  {name="klickety";value="1vmnbfjd620g2xibxfpb18cfdfcksny7rjah4j90cvadcsbg8x3x";}
+  {name="klines";value="10sk0fn6aavdf0df1xw3p0nbwv22ccpdg00xv7h8m4fk43j04dvp";}
+  {name="kmag";value="062kl6j150f579npfkv7jm2b9zih0ahfpzbpl635fz2av2aimm8j";}
+  {name="kmahjongg";value="1xikbz840dh57rf83af0jnmjb9q4ggd5801kiqkq6lkp413iij23";}
+  {name="kmines";value="0ijibp21f6s5l55m2zrcdz2a8xqjk22na79rc0wsdps7pmvf5sfj";}
+  {name="kmix";value="0md4fqv047g3s9bhr8jz2fcwq1vsld2jfi8j7cg8b8bh73kd2fbq";}
+  {name="kmousetool";value="1x8vb0hjmx6xac2602iaab93ha2nfk8i0y67z48p6i7s2n3zni06";}
+  {name="kmouth";value="10ibhgz7mv4kaiyl779h0qlpwgx4s8flsh0850if06mhdxjxld2y";}
+  {name="kmplot";value="1cy9qi53ivb3zy1lcb35ivh42yvj0gikr8m7j4nlrg4xy93gjrhd";}
+  {name="knavalbattle";value="1nd2z8ylmqcj515l3llbq2crdlds7qidni8ja24nk1wf5h4k9amp";}
+  {name="knetwalk";value="01jjal03srn55mlb11vkimgh1mixdwxqi0vh1s56hd894ssn0hgh";}
+  {name="kolf";value="0nsy2wp3fwing3hkwspjm4d8swhzamaaj5x7k0jyvcqcj93sgp1g";}
+  {name="kollision";value="1vz313lr1bp7crfnkdfvz5c7dynsyaqhv1pm6fyjv6ribv3dh48q";}
+  {name="kolourpaint";value="1k8kggx9ljkms4q70m38xd8a364nkynhkqiz2h1znr779sfqy5vp";}
+  {name="kompare";value="0kp6xzgbbhxxspmlx86f7vhn34iknvspjpniaxqvadrfi6xn4801";}
+  {name="konquest";value="072nvaxa1yjaq16095xkla3lndyfq2p801wc0r0m2imc62f30cbd";}
+  {name="konsole";value="17m68zq97whybvixgjdaz45d91x48aw7ijkzfapml7fldpf32bqw";}
+  {name="kopete";value="1q3825fl5pbim3rfi9s8k5sscvbwdacy00rkww4jdw8z3xxsriqj";}
+  {name="korundum";value="1iam31q7cf7a9yxx1i0gnqhnm0262ns8qpr6h2n7cmzkns8bckal";}
+  {name="kpat";value="00mlmqbm0f3yjm89vs91l0rc4r9lsvh0qq59za43rkg8j2rg5nmz";}
+  {name="kppp";value="0gxnd0p48waz0nz4inalyk52xvbhyd3w5m08p1q2a7ssczvza2wp";}
+  {name="krdc";value="1s8qm8s6gxfpdgvh4zi7svs48fnrngj7hxkyp1fjmksaczffrfx1";}
+  {name="kremotecontrol";value="1zjpagr0kcmqsjg4sswqhannc1rix242zbikwzs7jsbq34qy9fg2";}
+  {name="kreversi";value="1ylimga3wqdam1207c6zp1r0aqmqnndldd6y2pazqgk7wcr5z8lf";}
+  {name="krfb";value="0gq6rnkprk98ylnrispd66101jb040p8m9fcab9n5v2g4lvxzcia";}
+  {name="kross-interpreters";value="1njhlscnsd0v7jzzdknsc8nljc2xz7mbxscymhdafbpmjd655sdg";}
+  {name="kruler";value="0z8krqp9gy1n6kqk5slig9f4f07ddqrsbn6p7xqadrrs5a7g4baa";}
+  {name="ksaneplugin";value="1crry96ca3pk25xwnpm73004srf85yq3xpbwc1rr3a7xmniqglr7";}
+  {name="kscd";value="1ix0zdqk2bfmb05j3cwf55kz4sp4krx75wpfzsz2yf3dz047ylqp";}
+  {name="kshisen";value="1hmv7w2mb6v9rqhifns0js592m2m7ys9fsnrdxiv1nzkcbl3xll7";}
+  {name="ksirk";value="1pjrq3v1c0sk5r5hdk4rlbs47wwmsrds43ascp6p4rxvbagki99w";}
+  {name="ksnakeduel";value="09rl2j6pwdhc8lcb2dxh5l3zb0l0iz29b76svb727sga2y7b85qk";}
+  {name="ksnapshot";value="0n2xbqkm34bq8mgpycfyda82v3c4h07lcqvs747aw95kkydb71yk";}
+  {name="kspaceduel";value="01dshprsrwjgb7pgxz2razyxi8yi1cmnalyxflwxqh2zd4xx300y";}
+  {name="ksquares";value="195c1wywm70zwd4z5cqv4xk315xrpkkbwq2myiyxa0wshhiz31bb";}
+  {name="kstars";value="0xl2vpkxa66gd3ycl092lvnk07fw3phlcp4jmpcby650xvp7h6bn";}
+  {name="ksudoku";value="1gi5xr0x9w13skvs8dj4lflib7w9xqn2xr6h90mbncg5c54wmlqc";}
+  {name="ksystemlog";value="148i90y6gc1bw2128xmb56lprmx80s0024dsd4xknm7fw8mpycdm";}
+  {name="kteatime";value="0cgqz9py80grv7sf8k5mixfl5vzx58g93flv409f7nbpia3fjr26";}
+  {name="ktimer";value="1ph38xw1yhqg65y9dhgpgzls4yx1y025v1wv5wflmcranx68a589";}
+  {name="ktouch";value="0n70611cccp09dy8r0q4n7k3l68938hz0xkvp9ik58bnfkn57fvh";}
+  {name="ktuberling";value="0zfp8ynxxdys819gw7dnq6rl9l62dpfz0hvcm2fd8bvjwxrqzxrm";}
+  {name="kturtle";value="1ciwmgd7x0223d22jzqgr7ginaf8c9hi4zlcsl3s7i87hd46878g";}
+  {name="ktux";value="0njz3icalh644kfcnlr4nmdsavkvsp492ig6w0ryr43namqbi0fw";}
+  {name="kubrick";value="07rkhb4ms8wdcny163z0ffavx3i1z13kxmj8xfbv3jx3nbcr33p5";}
+  {name="kuser";value="0avxd71zw0v8qirflpws1g7dqvs6hkpqxi89zfrvcsb8fgcqqvx2";}
+  {name="kwallet";value="0lnv7yd1ig18dmkxanmkwnz6w28p8ak8sg1rxic07g50qni4yk8g";}
+  {name="kwordquiz";value="03qxjm445jynw41wva8b86kigda2q828p0vkz58ymk8ibds74jfm";}
+  {name="libkcddb";value="0hz4300q0hhmrjd2ackaxbvdg9j51bc2fkcndw2d7wwvqz4a1am6";}
+  {name="libkcompactdisc";value="1jf0ivcy7mv3p7xcbigffmx2sby37ainjw29cp8yv0qgdwws5pm3";}
+  {name="libkdcraw";value="1y75rm55s8407q4qglndf28gix0niq0ypa9g1jwf2c8fpmf7ffph";}
+  {name="libkdeedu";value="1gd0jp85qnml2nlnf554mm9yszjkxgs9jqyi77vrhhp50bxkwdbv";}
+  {name="libkdegames";value="12590b023cjjix7mbd6flhm419w4j4zbs83ar9sihlwj6l3fzs9z";}
+  {name="libkexiv2";value="16jsd5ip4179cs2hvwqvb1cbrl5z06zyr9prr269rg11i8rjfjai";}
+  {name="libkipi";value="1wsmci2rfrg8jw3scl14cjx4q616lbmvlzjs6lv2dza4cya4jqvy";}
+  {name="libkmahjongg";value="1s4gzdygrpzjg4rxkn9ndgaj0gzj4ss0ywpd1rv5nv8iaig42cah";}
+  {name="libksane";value="1hylj10pqr82drw9b9r10rwbjf85fx225az2ha7zcm9j1k170n8d";}
+  {name="lokalize";value="0d3sym5waf1nivwksqpclwj9hxl1fva3h0hzgsmgg39qbnanqg4d";}
+  {name="lskat";value="0m47kb9l830d5798xkx9h6fx3ng59zlbji8pnaj6m53q0yj7n5am";}
+  {name="marble";value="0r27nmbvgxx4w00ii926gkxz2ilaa1sja02q62jhxvm01rp1kvka";}
+  {name="mplayerthumbs";value="1a58f66mpzngd558336h13vzl0paj3pbl4fna1vk34fzjz0ldsrm";}
+  {name="nepomuk-core";value="1l14a7hdbz7ap3lidj8acjvkxiycld4wspcw5xnd85pjhks8fcil";}
+  {name="nepomuk-widgets";value="19g752h1f4gz3208ynprxp7nxnbjgis99016lik8f9179n6mjygb";}
+  {name="okteta";value="1hwpyb9g1fwcsl713g84za62qjissmjfjhw2jvd2x08lrjablvvk";}
+  {name="okular";value="03jw7c3h6708aisk301nvfnp0vih3c5wz928zmh54h1aslfi4c3k";}
+  {name="oxygen-icons";value="01f9xkpk8fgj2ccmbrbjx9z1gxqnj4rrvasxh575lcvknnbsf6vz";}
+  {name="pairs";value="1zp89sp5qmllbm9qqzcwf90cy5vqvywki2yjgz0gn2svp1629mmg";}
+  {name="palapeli";value="0kbi61jxxyg2zzjxhjr0m14p1k04jfv212gkj6ic81hrwzjfffzc";}
+  {name="parley";value="1f266kvb0fzy3gxv9fzq59aikz0g540ydbzvr51hlvlra88sjj47";}
+  {name="perlkde";value="0gm9wim2llyglnzxqbgy0jzj9ji3p683zbrhlglpxpd6wh3ady1w";}
+  {name="perlqt";value="0qxad4m6iqc26yn8nsa3g24xr84ncrmhwhz95i2jzzrbqawwas3m";}
+  {name="picmi";value="0nlw3lqfck3fp77n56qmvlj3p6rr60drsq5qxyrrl3scw2dlipq7";}
+  {name="poxml";value="0vjmd1r90l85xs9sv2wzd1vdml6a6fh0ipzz7zyixy600lqgxy13";}
+  {name="print-manager";value="1bw5w8n4wwggib1yrgai2723fwnjrr3wbnnxn85j7bpy3b84cqfh";}
+  {name="pykde4";value="1ziq3nms0bvpnsl21pw37bkimi817jx0mmqsvf5xkxppx7f622cy";}
+  {name="qtruby";value="1pyz2zimw9qz8b5nfmzvp0kzsq6rvbwv0s9kxgh7i2xxnh2mj4gp";}
+  {name="qyoto";value="0jnchp7kdskm9nc533p7bk8shy0i57dcivrmprnwyiy4sfhd4ldj";}
+  {name="rocs";value="0markia51c5a8ggxaiy6vccpdzlamy7md5jfx4jb79qp8hlv2dlc";}
+  {name="smokegen";value="1fgh5z2gwyjkgk8290nx747bj1iaj7224nx3ad8qra9v8y6d0w3d";}
+  {name="smokekde";value="15ci2bs141nbkk2f209rbdacxfdxx6ncp5cc9gv7if8sm708vjy1";}
+  {name="smokeqt";value="0wmzrr4fslam8mxvl90iyikyyipqlqf7zdynxyqr7zxlc421clyz";}
+  {name="step";value="1a2v99k3v0ry5iwvl4cza5g7sqhib78nx0p5r369fqvcbn9mn0wz";}
+  {name="superkaramba";value="1mwa1ggagl8z2422gyilcvb85sgw5db58k0fkv3jcgfi6mx3sv3a";}
+  {name="svgpart";value="1ma4msnky3civhnx0by6hy4ysi8nhzssrsabnj6hg96d7mpnjvqw";}
+  {name="sweeper";value="1vgg21ndqbba0il96x01kcy8z242g0f0lwfqgzs9cd17qx05056s";}
+  {name="umbrello";value="10q4lar55ad58cl4wnmmvmyywm5xi7gcggrfblll8j76mw4dkyda";}
+];
+modules=[
+{
+  module="kdemultimedia";
+  split=true;
+  pkgs=[
+    { name="audiocd-kio"; sane="audiocd_kio"; }
+    { name="dragon";  }
+    { name="ffmpegthumbs";  }
+    { name="juk";  }
+    { name="kmix";  }
+    { name="kscd";  }
+    { name="libkcddb";  }
+    { name="libkcompactdisc";  }
+    { name="mplayerthumbs";  }
+  ];
+}
+{
+  module="kdegraphics";
+  split=true;
+  pkgs=[
+    { name="gwenview";  }
+    { name="kamera";  }
+    { name="kcolorchooser";  }
+    { name="kdegraphics-mobipocket"; sane="kdegraphics_mobipocket"; }
+    { name="kdegraphics-strigi-analyzer"; sane="kdegraphics_strigi_analyzer"; }
+    { name="kdegraphics-thumbnailers"; sane="kdegraphics_thumbnailers"; }
+    { name="kgamma";  }
+    { name="kolourpaint";  }
+    { name="kruler";  }
+    { name="ksaneplugin";  }
+    { name="ksnapshot";  }
+    { name="libkdcraw";  }
+    { name="libkexiv2";  }
+    { name="libkipi";  }
+    { name="libksane";  }
+    { name="okular";  }
+    { name="svgpart";  }
+  ];
+}
+{
+  module="kdelibs";
+  split=true;
+  pkgs=[
+    { name="kdelibs";  }
+    { name="nepomuk-core"; sane="nepomuk_core"; }
+    { name="nepomuk-widgets"; sane="nepomuk_widgets"; }
+  ];
+}
+{
+  module="kdenetwork";
+  split=true;
+  pkgs=[
+    { name="kdenetwork-filesharing"; sane="kdenetwork_filesharing"; }
+    { name="kdenetwork-strigi-analyzers"; sane="kdenetwork_strigi_analyzers"; }
+    { name="kdnssd";  }
+    { name="kget";  }
+    { name="kopete";  }
+    { name="kppp";  }
+    { name="krdc";  }
+    { name="krfb";  }
+  ];
+}
+{
+  module="kdeutils";
+  split=true;
+  pkgs=[
+    { name="ark";  }
+    { name="filelight";  }
+    { name="kcalc";  }
+    { name="kcharselect";  }
+    { name="kdf";  }
+    { name="kfloppy";  }
+    { name="kgpg";  }
+    { name="kremotecontrol";  }
+    { name="ktimer";  }
+    { name="kwallet";  }
+    { name="print-manager"; sane="print_manager"; }
+    { name="superkaramba";  }
+    { name="sweeper";  }
+  ];
+}
+{
+  module="applications";
+  split=true;
+  pkgs=[
+    { name="kate";  }
+    { name="konsole";  }
+  ];
+}
+{
+  module="kdetoys";
+  split=true;
+  pkgs=[
+    { name="amor";  }
+    { name="kteatime";  }
+    { name="ktux";  }
+  ];
+}
+{
+  module="kdesdk";
+  split=true;
+  pkgs=[
+    { name="cervisia";  }
+    { name="dolphin-plugins"; sane="dolphin_plugins"; }
+    { name="kapptemplate";  }
+    { name="kcachegrind";  }
+    { name="kde-dev-scripts"; sane="kde_dev_scripts"; }
+    { name="kde-dev-utils"; sane="kde_dev_utils"; }
+    { name="kdesdk-kioslaves"; sane="kdesdk_kioslaves"; }
+    { name="kdesdk-strigi-analyzers"; sane="kdesdk_strigi_analyzers"; }
+    { name="kdesdk-thumbnailers"; sane="kdesdk_thumbnailers"; }
+    { name="kompare";  }
+    { name="lokalize";  }
+    { name="okteta";  }
+    { name="poxml";  }
+    { name="umbrello";  }
+  ];
+}
+{
+  module="kdegames";
+  split=true;
+  pkgs=[
+    { name="bomber";  }
+    { name="bovo";  }
+    { name="granatier";  }
+    { name="kajongg";  }
+    { name="kapman";  }
+    { name="katomic";  }
+    { name="kblackbox";  }
+    { name="kblocks";  }
+    { name="kbounce";  }
+    { name="kbreakout";  }
+    { name="kdiamond";  }
+    { name="kfourinline";  }
+    { name="kgoldrunner";  }
+    { name="kigo";  }
+    { name="killbots";  }
+    { name="kiriki";  }
+    { name="kjumpingcube";  }
+    { name="klickety";  }
+    { name="klines";  }
+    { name="kmahjongg";  }
+    { name="kmines";  }
+    { name="knavalbattle";  }
+    { name="knetwalk";  }
+    { name="kolf";  }
+    { name="kollision";  }
+    { name="konquest";  }
+    { name="kpat";  }
+    { name="kreversi";  }
+    { name="kshisen";  }
+    { name="ksirk";  }
+    { name="ksnakeduel";  }
+    { name="kspaceduel";  }
+    { name="ksquares";  }
+    { name="ksudoku";  }
+    { name="ktuberling";  }
+    { name="kubrick";  }
+    { name="libkdegames";  }
+    { name="libkmahjongg";  }
+    { name="lskat";  }
+    { name="palapeli";  }
+    { name="picmi";  }
+  ];
+}
+{
+  module="kdeedu";
+  split=true;
+  pkgs=[
+    { name="analitza";  }
+    { name="blinken";  }
+    { name="cantor";  }
+    { name="kalgebra";  }
+    { name="kalzium";  }
+    { name="kanagram";  }
+    { name="kbruch";  }
+    { name="kgeography";  }
+    { name="khangman";  }
+    { name="kig";  }
+    { name="kiten";  }
+    { name="klettres";  }
+    { name="kmplot";  }
+    { name="kstars";  }
+    { name="ktouch";  }
+    { name="kturtle";  }
+    { name="kwordquiz";  }
+    { name="libkdeedu";  }
+    { name="marble";  }
+    { name="pairs";  }
+    { name="parley";  }
+    { name="rocs";  }
+    { name="step";  }
+  ];
+}
+{
+  module="kdeadmin";
+  split=true;
+  pkgs=[
+    { name="kcron";  }
+    { name="ksystemlog";  }
+    { name="kuser";  }
+  ];
+}
+{
+  module="kdebindings";
+  split=true;
+  pkgs=[
+    { name="kimono";  }
+    { name="korundum";  }
+    { name="kross-interpreters"; sane="kross_interpreters"; }
+    { name="perlkde";  }
+    { name="perlqt";  }
+    { name="pykde4";  }
+    { name="qtruby";  }
+    { name="qyoto";  }
+    { name="smokegen";  }
+    { name="smokekde";  }
+    { name="smokeqt";  }
+  ];
+}
+{
+  module="kdeaccessibility";
+  split=true;
+  pkgs=[
+    { name="jovie";  }
+    { name="kaccessible";  }
+    { name="kmag";  }
+    { name="kmousetool";  }
+    { name="kmouth";  }
+  ];
+}
+{
+  module="kde-baseapps";
+sane="kde_baseapps";  split=true;
+  pkgs=[
+    { name="kde-baseapps"; sane="kde_baseapps"; }
+  ];
+}
+{ module="kactivities";  split=false;}
+{ module="kdeartwork";  split=false;
+  pkgs=[
+    { name="ColorSchemes"; }
+    { name="IconThemes"; }
+    { name="emoticons"; }
+    { name="kscreensaver"; }
+    { name="kwin-styles"; sane="kwin_styles";}
+    { name="sounds"; }
+    { name="styles"; }
+    { name="wallpapers"; }
+    { name="HighResolutionWallpapers"; }
+    { name="WeatherWallpapers"; }
+    { name="desktopthemes"; }
+  ];
+
+}
+{ module="kde-base-artwork"; sane="kde_base_artwork"; split=false;}
+{ module="kdelibs";  split=false;}
+{ module="kdepim";  split=false;}
+{ module="kdepimlibs";  split=false;}
+{ module="kdepim-runtime"; sane="kdepim_runtime"; split=false;}
+{ module="kdeplasma-addons"; sane="kdeplasma_addons"; split=false;}
+{ module="kde-runtime"; sane="kde_runtime"; split=false;}
+{ module="kde-wallpapers"; sane="kde_wallpapers"; split=false;}
+{ module="kdewebdev";  split=false;
+  pkgs=[
+    { name="klinkstatus"; }
+    { name="kfilereplace"; }
+    { name="kimagemapeditor"; }
+    { name="kommander"; }
+  ];
+
+}
+{ module="kde-workspace"; sane="kde_workspace"; split=false;}
+{ module="oxygen-icons"; sane="oxygen_icons"; split=false;}
+];
+}
diff --git a/pkgs/desktops/kde-4.11/kde-package/kde-submodules.xslt b/pkgs/desktops/kde-4.11/kde-package/kde-submodules.xslt
new file mode 100644
index 00000000000..952a05a9d27
--- /dev/null
+++ b/pkgs/desktops/kde-4.11/kde-package/kde-submodules.xslt
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- xslt file for http://projects.kde.org/kde_projects.xml -->
+
+<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
+
+	<xsl:output method="text" />
+	<xsl:template match="/">
+		<xsl:for-each select="kdeprojects/component[@identifier='kde']">
+			<xsl:text>declare -A module
</xsl:text>
+			<xsl:for-each select="module">
+				<xsl:variable name="module" select='@identifier' />
+				<xsl:for-each select=".//project[repo]">
+					<xsl:text>module["</xsl:text>
+					<xsl:value-of select='@identifier' />
+					<xsl:text>"]="</xsl:text>
+					<xsl:value-of select="$module" />
+					<xsl:text>"
</xsl:text>
+				</xsl:for-each>
+			</xsl:for-each>
+		</xsl:for-each>
+	</xsl:template>
+</xsl:stylesheet>
diff --git a/pkgs/desktops/kde-4.11/l10n/manifest-4.11.2.nix b/pkgs/desktops/kde-4.11/l10n/manifest-4.11.2.nix
new file mode 100644
index 00000000000..42591369aea
--- /dev/null
+++ b/pkgs/desktops/kde-4.11/l10n/manifest-4.11.2.nix
@@ -0,0 +1,272 @@
+[
+{
+  lang = "ar";
+  saneName = "ar";
+  sha256 = "0w0p0ahh6xjk3i545vmkkaxb92s1liv8z0cgnpdh13y0i8gislzs";
+}
+{
+  lang = "bg";
+  saneName = "bg";
+  sha256 = "0wghv6q8mgj5cd2n56137zfxjw1jfy4y1d6x3wi0cjjjf61al4yj";
+}
+{
+  lang = "bs";
+  saneName = "bs";
+  sha256 = "0g14kvfbzf9p9w5279ny1ziygn2zw0z4rpsm8b6msia9afa3vscp";
+}
+{
+  lang = "ca";
+  saneName = "ca";
+  sha256 = "0kcbzwmk9dy0nwfjhrpmp97aqnpdrmy7lya16sikj98fwbd2d7i0";
+}
+{
+  lang = "ca@valencia";
+  saneName = "ca_valencia";
+  sha256 = "0p3g5bwqwvr7mmwz583km498cb9jl4yr6s4v3jdx2w1pv0iqfbfx";
+}
+{
+  lang = "cs";
+  saneName = "cs";
+  sha256 = "03310xg8v5hdydi5najijni4nmkycarz2n7764vdl8h3wjlxs101";
+}
+{
+  lang = "da";
+  saneName = "da";
+  sha256 = "06h19xbbkhmmaicmkjzpa6w1hp5gq3bfblvdjdb4qwm3jbp09kz0";
+}
+{
+  lang = "de";
+  saneName = "de";
+  sha256 = "08wbgb4brgihpa7sk29lzihaqg8zv024cdd4fr6s5zvrpchx3s8s";
+}
+{
+  lang = "el";
+  saneName = "el";
+  sha256 = "0a3cakngqampvczhgn52y942d131cqd68yjsr71adcgmm5r5iv7s";
+}
+{
+  lang = "en_GB";
+  saneName = "en_GB";
+  sha256 = "12pl1sm44bi2d07qliaazniy1a9h9jp7slvwn8l11pgfh7ygiyxn";
+}
+{
+  lang = "es";
+  saneName = "es";
+  sha256 = "1b7jd6clbwjyivpy94wz148gapdzvlggg38lv0a9zl6fkfpa6xbi";
+}
+{
+  lang = "et";
+  saneName = "et";
+  sha256 = "133wf25qhnls7a2i3s99kk8va21d2cg7v3khvgscpm1im8gi81nz";
+}
+{
+  lang = "eu";
+  saneName = "eu";
+  sha256 = "11szsx11vnwi3l41nsvk013nwx0gs8vdilr1jm8qz3zfbm14v7a7";
+}
+{
+  lang = "fa";
+  saneName = "fa";
+  sha256 = "0fi443pcrjvnivi76llfssw52nzddvxrabqcqxr0czfak2r6nlf5";
+}
+{
+  lang = "fi";
+  saneName = "fi";
+  sha256 = "0lqzaprzd7az7aslaswhdriwhcdsx9abxq90jwkpq2vliz7gxjp5";
+}
+{
+  lang = "fr";
+  saneName = "fr";
+  sha256 = "0c32hmg7ns4z585bysq8iqjhbfp33a5wi6r0p1hqrh5y1sc3wjj9";
+}
+{
+  lang = "ga";
+  saneName = "ga";
+  sha256 = "060lk2l1q9p39z90qajhiqdsiiwk1qf221087mx5xny1z5ngnnim";
+}
+{
+  lang = "gl";
+  saneName = "gl";
+  sha256 = "17a9xpqbqgnhlfhr85v4n3ll88dzn3z4jk6nilq149c7dg8ilnma";
+}
+{
+  lang = "he";
+  saneName = "he";
+  sha256 = "0k97r2j0iv017qrn9yh08cqji2pkrx5vy51jypr305ffmxy1dgn9";
+}
+{
+  lang = "hi";
+  saneName = "hi";
+  sha256 = "15vgih10aa11d048cazh1zjr6s08w34hp4xxp8cgcmpm11px460g";
+}
+{
+  lang = "hr";
+  saneName = "hr";
+  sha256 = "05x0bjn6dfn0k2v822sc6f45jk196sf1xj7ikn7ws7rm3nkc3sgp";
+}
+{
+  lang = "hu";
+  saneName = "hu";
+  sha256 = "00g7x922zxkscrkk8n9xc123qfzbmf7kkyavdsnz4jkx4msrlav3";
+}
+{
+  lang = "ia";
+  saneName = "ia";
+  sha256 = "0zaxa42sgscbnb8zbp878qk9d5lwdm08szr9xda287jpvzw3asss";
+}
+{
+  lang = "is";
+  saneName = "is";
+  sha256 = "00l1rh7z8fapmb3ngxnp91xz1qz110r995jk42gw77hvmf0gabb6";
+}
+{
+  lang = "it";
+  saneName = "it";
+  sha256 = "0d0b44vmiaazjsc4d7wlwg36n3ig87xj3m89hlhkhvwrisg5ccv8";
+}
+{
+  lang = "ja";
+  saneName = "ja";
+  sha256 = "04qrj66qd65yqv1zrwi1pspmwdj129m9kkmpa3rdfgml37ign7q8";
+}
+{
+  lang = "kk";
+  saneName = "kk";
+  sha256 = "1zywlhg1yr2llr8cvn4gm4ap7kqgc2lff6yi75dd782whsphqm67";
+}
+{
+  lang = "km";
+  saneName = "km";
+  sha256 = "16s126qw8kvsvidrhh02y12y8wln3skg0cn6ri658mz2ld9iicvd";
+}
+{
+  lang = "ko";
+  saneName = "ko";
+  sha256 = "1lrh3bly0hvzxa0zxibb45v2711fvv81i3ca9d628m68mzxim13q";
+}
+{
+  lang = "lt";
+  saneName = "lt";
+  sha256 = "0hf9156vi0y17hlvrn18fsdfzpaq5ylprvv55i42idxfdjr1plmq";
+}
+{
+  lang = "lv";
+  saneName = "lv";
+  sha256 = "1zrwwglpyw8qlqw9xyhz6pwjyrasdgfclaz2hicsgv1300nxjv4h";
+}
+{
+  lang = "mr";
+  saneName = "mr";
+  sha256 = "0nagjxn4pmmcz6762jz9dx42sarkjm7fpkblw9w42znx8zvn5nmw";
+}
+{
+  lang = "nb";
+  saneName = "nb";
+  sha256 = "0lb58d2vhpcnnnqnplq2i2fapkygyb47yq0rc7c93rsf10cw9n0v";
+}
+{
+  lang = "nds";
+  saneName = "nds";
+  sha256 = "08l4s3gwnz84sg5mlrj52wdclkm4yhj0a03jxwcfpgfypi3v0n84";
+}
+{
+  lang = "nl";
+  saneName = "nl";
+  sha256 = "0m6c9dxcdqgcxlx4k160nra0g11im0c2f0hf1fyk1hkb6fdq2li9";
+}
+{
+  lang = "nn";
+  saneName = "nn";
+  sha256 = "1kp8m2cc131arkhj7z6dsq69mh6abws7963avszbkf0zq31nnxp4";
+}
+{
+  lang = "pa";
+  saneName = "pa";
+  sha256 = "01ay3q7swf1vh72wrjlhpi0id7sa2a8pj8n79xn583mlzwcbmzwv";
+}
+{
+  lang = "pl";
+  saneName = "pl";
+  sha256 = "1rf288q1c412y161sk2y3yvy3pq159avih4d90k0laphfhhisjnv";
+}
+{
+  lang = "pt";
+  saneName = "pt";
+  sha256 = "0mld9dmvj9c8xay587hm7dvrbx964zdhysyi4fldad54imc61rdc";
+}
+{
+  lang = "pt_BR";
+  saneName = "pt_BR";
+  sha256 = "18c3bws8fakii5qjm0vpni6fmzw6118ndmjz4v83nk6nmy6ww0i1";
+}
+{
+  lang = "ro";
+  saneName = "ro";
+  sha256 = "16q3jahvpw3lpxlwqxhhd8xc9qfra2chc6g5cik8dw011sqg0zaa";
+}
+{
+  lang = "ru";
+  saneName = "ru";
+  sha256 = "0c62msjf34hz5f0il3x7wk4flpjk2w5f4vdpz43vr245qds2vxrl";
+}
+{
+  lang = "sk";
+  saneName = "sk";
+  sha256 = "0vl8y4z60nxgkgkxkzqkak7gcyc2295nxm6hghmrhfn5zyfpp99k";
+}
+{
+  lang = "sl";
+  saneName = "sl";
+  sha256 = "0wdv1lya8s4b97933dv72cvq7qa19ndp1knb0270pg5y74y2vq2s";
+}
+{
+  lang = "sr";
+  saneName = "sr";
+  sha256 = "1lafrmz16j8kzs9nvrn6j84c7wyxzwpvnn0z6ic22bzg646m276y";
+}
+{
+  lang = "sv";
+  saneName = "sv";
+  sha256 = "1cxy79ya3i2fm7b6w0ilpri0qrhm4bgkx3qwvgqz13lgw1p716qv";
+}
+{
+  lang = "tg";
+  saneName = "tg";
+  sha256 = "1jww7nfz8ssgqrldc11agnwv4plcr9vr4fv5q7bspa33hgm94r47";
+}
+{
+  lang = "tr";
+  saneName = "tr";
+  sha256 = "0kflzm80pg8l5ing3xzp1g0n9hm1sky8201s2z05aahj2rcw4bws";
+}
+{
+  lang = "ug";
+  saneName = "ug";
+  sha256 = "15szx7r75d0iw21hwggp96zm9s5i7svsvmqfncvd79mdmnhr2x5i";
+}
+{
+  lang = "uk";
+  saneName = "uk";
+  sha256 = "16l7rkxw5am90dqrkjjdvih1dvchgkggf5rinv7bpfk5z65f0ccy";
+}
+{
+  lang = "vi";
+  saneName = "vi";
+  sha256 = "08phva4y5982qvrb050n4pl7gnr2yg4zvazfg9lh38ba63l6d2g8";
+}
+{
+  lang = "wa";
+  saneName = "wa";
+  sha256 = "0byfyav76m7igwix5vj69bvl2rpaxmv8ncz1xc2azyrdxjba9ggd";
+}
+{
+  lang = "zh_CN";
+  saneName = "zh_CN";
+  sha256 = "176xnyxl7in1b3igy7vh6g2pz8ch32g0n6kddkkj0a13h69s5vyz";
+}
+{
+  lang = "zh_TW";
+  saneName = "zh_TW";
+  sha256 = "0i71xxxpb6p95pa69frhxqb27i935bb1vxjb3i51yms95x3gbpjs";
+}
+]
diff --git a/pkgs/desktops/kde-4.11/oxygen-icons.nix b/pkgs/desktops/kde-4.11/oxygen-icons.nix
index bdc3c581371..d7679cc3d01 100644
--- a/pkgs/desktops/kde-4.11/oxygen-icons.nix
+++ b/pkgs/desktops/kde-4.11/oxygen-icons.nix
@@ -3,7 +3,7 @@
 kde {
   outputHashAlgo = "sha256";
   outputHashMode = "recursive";
-  outputHash = "03wzq5b9yn7x7qjl6vypsa4jh2km0vz122wyg0pfk6nfl1frgnjf";
+  outputHash = "1y765lfsy63kc4h1g1f3fc42aqlhn7svmidrkxm12nia4jazj6db";
 
   nativeBuildInputs = [ cmake ];
 
-- 
GitLab


From bfac9f828efcde0c0ecb8846ce43286158b26757 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cillian=20de=20R=C3=B3iste?= <goibhniu@fsfe.org>
Date: Tue, 8 Oct 2013 01:51:24 +0200
Subject: [PATCH 5027/5331] Bugfix: zc_buildout_nix, replace links to eggs in
 the store which have been gc-ed

---
 .../python-modules/buildout-nix/nix.patch     | 25 +++++++++++++++----
 1 file changed, 20 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/python-modules/buildout-nix/nix.patch b/pkgs/development/python-modules/buildout-nix/nix.patch
index a09163518a9..dd3b8e12aa8 100644
--- a/pkgs/development/python-modules/buildout-nix/nix.patch
+++ b/pkgs/development/python-modules/buildout-nix/nix.patch
@@ -1,21 +1,36 @@
 --- a/src/zc/buildout/easy_install.py	2013-08-27 22:28:40.233718116 +0200
-+++ b/src/zc/buildout/easy_install.py	2013-08-27 22:31:07.967871186 +0200
-@@ -508,16 +508,15 @@
++++ b/src/zc/buildout/easy_install.py   2013-10-07 00:29:31.077413935 +0200
+@@ -508,16 +508,31 @@
                          self._dest, os.path.basename(dist.location))
  
                      if os.path.isdir(dist.location):
 -                        # we got a directory. It must have been
 -                        # obtained locally.  Just copy it.
 -                        shutil.copytree(dist.location, newloc)
-+                        # Symlink to dists in /nix/store
-+                        if not os.path.exists(newloc):
++                        # Replace links to garbage collected eggs in
++                        # /nix/store
++                        if os.path.islink(newloc):
++                            # It seems necessary to jump through these
++                            # hoops, otherwise we end up in an
++                            # infinite loop because
++                            # self._env.best_match fails to find the dist
++                            os.remove(newloc)
++                            dist = self._fetch(avail, tmp, self._download_cache)
 +                            os.symlink(dist.location, newloc)
++                            newdist = pkg_resources.Distribution.from_filename(
++                                newloc)
++                            self._env.add(newdist)
++                            logger.info("Updated link to %s" %dist.location)
++                        # Symlink to the egg in /nix/store
++                        elif not os.path.exists(newloc):
++                            os.symlink(dist.location, newloc)
++                            logger.info("Created link to %s" %dist.location)
                      else:
  
  
                          setuptools.archive_util.unpack_archive(
                              dist.location, newloc)
--
+ 
 -                    redo_pyc(newloc)
 +                        redo_pyc(newloc)
  
-- 
GitLab


From a19bbd49b79da8bed5db6b4b756e407effb1ecac Mon Sep 17 00:00:00 2001
From: Jaka Hudoklin <jakahudoklin@gmail.com>
Date: Mon, 7 Oct 2013 12:57:09 +0200
Subject: [PATCH 5028/5331] Add xca, interface for managing keys like RSA or
 DSA

---
 pkgs/applications/misc/xca/default.nix | 27 ++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix        |  2 ++
 2 files changed, 29 insertions(+)
 create mode 100644 pkgs/applications/misc/xca/default.nix

diff --git a/pkgs/applications/misc/xca/default.nix b/pkgs/applications/misc/xca/default.nix
new file mode 100644
index 00000000000..fb6b011f30a
--- /dev/null
+++ b/pkgs/applications/misc/xca/default.nix
@@ -0,0 +1,27 @@
+{ stdenv, fetchurl, pkgconfig, which, openssl, qt4, libtool }:
+
+stdenv.mkDerivation rec {
+  name = "xca-${version}";
+  version = "0.9.3";
+
+  src = fetchurl {
+    url = "mirror://sourceforge/xca/${name}.tar.gz";
+    sha256 = "1fn6kh8mdy65rrgjif7j9wn3mxg1mrrcnhzpi86hfy24ic6bahk8";
+  };
+
+  configurePhase = ''
+    export PATH=$PATH:${which}/bin
+    export QTDIR=${qt4}
+    prefix=$out ./configure ${openssl} ${libtool}
+  '';
+
+  buildInputs = [ openssl qt4 libtool ];
+  nativeBuildInputs = [ pkgconfig ];
+
+  meta = with stdenv.lib; {
+    description = "Interface for managing asymetric keys like RSA or DSA";
+    homepage = http://xca.sourceforge.net/;
+    platforms = platforms.all;
+    license = licenses.bsd3;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 957eadbb8c1..97c96792dc7 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8908,6 +8908,8 @@ let
 
   xbmc = callPackage ../applications/video/xbmc { };
 
+  xca = callPackage ../applications/misc/xca { };
+
   xcalib = callPackage ../tools/X11/xcalib { };
 
   xcape = callPackage ../tools/X11/xcape { };
-- 
GitLab


From df0d362f31ecbc5ace8d6eb97e1b99adc936061f Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 8 Oct 2013 11:05:19 +0200
Subject: [PATCH 5029/5331] Fix some more Hydra evaluation errors

---
 pkgs/applications/audio/mopidy/default.nix                  | 1 +
 pkgs/applications/graphics/jbrout/default.nix               | 1 +
 pkgs/development/arduino/ino/default.nix                    | 3 ++-
 .../libraries/haskell/accelerate-fft/default.nix            | 2 +-
 pkgs/development/libraries/haskell/cufft/default.nix        | 2 +-
 pkgs/development/libraries/v8/default.nix                   | 2 +-
 pkgs/development/tools/build-managers/leiningen/default.nix | 2 +-
 pkgs/development/tools/casperjs/default.nix                 | 2 +-
 pkgs/servers/mpd/default.nix                                | 6 +++---
 9 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/pkgs/applications/audio/mopidy/default.nix b/pkgs/applications/audio/mopidy/default.nix
index 089751947cc..611d9f4226d 100644
--- a/pkgs/applications/audio/mopidy/default.nix
+++ b/pkgs/applications/audio/mopidy/default.nix
@@ -39,5 +39,6 @@ pythonPackages.buildPythonPackage rec {
       local hard drive.
     '';
     maintainers = [ stdenv.lib.maintainers.rickynils ];
+    platforms = [];
   };
 }
diff --git a/pkgs/applications/graphics/jbrout/default.nix b/pkgs/applications/graphics/jbrout/default.nix
index dc397a614d3..2207e8884f0 100644
--- a/pkgs/applications/graphics/jbrout/default.nix
+++ b/pkgs/applications/graphics/jbrout/default.nix
@@ -34,5 +34,6 @@ buildPythonPackage {
   meta = {
     homepage = "http://code.google.com/p/jbrout";
     description = "jBrout is a photo manager";
+    platforms = stdenv.lib.platforms.linux;
   };
 }
diff --git a/pkgs/development/arduino/ino/default.nix b/pkgs/development/arduino/ino/default.nix
index e77c2251b36..89501f11269 100644
--- a/pkgs/development/arduino/ino/default.nix
+++ b/pkgs/development/arduino/ino/default.nix
@@ -29,11 +29,12 @@ buildPythonPackage rec {
       --replace "self.e['avrdude']" "'${avrdude}/bin/avrdude'" \
       --replace "'-C', self.e['avrdude.conf']," ""
   '';
- 
+
   meta = {
     description = "Command line toolkit for working with Arduino hardware";
     homepage = http://inotool.org/;
     license = stdenv.lib.licenses.mit;
     maintainers = with stdenv.lib.maintainers; [ antono the-kenny ];
+    platforms = stdenv.lib.platforms.linux;
   };
 }
diff --git a/pkgs/development/libraries/haskell/accelerate-fft/default.nix b/pkgs/development/libraries/haskell/accelerate-fft/default.nix
index 523e5ae1504..4e9a75f64ee 100644
--- a/pkgs/development/libraries/haskell/accelerate-fft/default.nix
+++ b/pkgs/development/libraries/haskell/accelerate-fft/default.nix
@@ -9,6 +9,6 @@ cabal.mkDerivation (self: {
     homepage = "https://github.com/AccelerateHS/accelerate-fft";
     description = "FFT using the Accelerate library";
     license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
+    platforms = self.stdenv.lib.platforms.linux;
   };
 })
diff --git a/pkgs/development/libraries/haskell/cufft/default.nix b/pkgs/development/libraries/haskell/cufft/default.nix
index 76039f06548..213072b5cdf 100644
--- a/pkgs/development/libraries/haskell/cufft/default.nix
+++ b/pkgs/development/libraries/haskell/cufft/default.nix
@@ -10,6 +10,6 @@ cabal.mkDerivation (self: {
     homepage = "http://github.com/robeverest/cufft";
     description = "Haskell bindings for the CUFFT library";
     license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
+    platforms = self.stdenv.lib.platforms.linux;
   };
 })
diff --git a/pkgs/development/libraries/v8/default.nix b/pkgs/development/libraries/v8/default.nix
index 3fc3138ef52..5ac2487c9ed 100644
--- a/pkgs/development/libraries/v8/default.nix
+++ b/pkgs/development/libraries/v8/default.nix
@@ -56,7 +56,7 @@ stdenv.mkDerivation {
 
     meta = with stdenv.lib; {
       description = "V8 is Google's open source JavaScript engine";
-      platforms = platforms.unix; 
+      platforms = platforms.linux ++ platforms.darwin;
       license = licenses.bsd3;
     };
 }
diff --git a/pkgs/development/tools/build-managers/leiningen/default.nix b/pkgs/development/tools/build-managers/leiningen/default.nix
index 779b84d0ca8..b1664010550 100644
--- a/pkgs/development/tools/build-managers/leiningen/default.nix
+++ b/pkgs/development/tools/build-managers/leiningen/default.nix
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
     homepage = http://leiningen.org/;
     description = "Project automation for Clojure";
     license = "EPL";
-    platforms = stdenv.lib.platforms.unix;
+    platforms = stdenv.lib.platforms.linux;
     maintainer = with stdenv.lib.maintainers; [ the-kenny ];
   };
 }
diff --git a/pkgs/development/tools/casperjs/default.nix b/pkgs/development/tools/casperjs/default.nix
index 60e680a60fc..bd63a0e68ee 100644
--- a/pkgs/development/tools/casperjs/default.nix
+++ b/pkgs/development/tools/casperjs/default.nix
@@ -41,6 +41,6 @@ stdenv.mkDerivation rec {
     license = stdenv.lib.licenses.mit;
 
     maintainers = [ stdenv.lib.maintainers.bluescreen303 ];
-    platforms = stdenv.lib.platforms.all;
+    platforms = stdenv.lib.platforms.linux;
   };
 }
diff --git a/pkgs/servers/mpd/default.nix b/pkgs/servers/mpd/default.nix
index 43da84dcb81..238176aadff 100644
--- a/pkgs/servers/mpd/default.nix
+++ b/pkgs/servers/mpd/default.nix
@@ -34,8 +34,8 @@ in stdenv.mkDerivation rec {
   };
 
   buildInputs = [ pkgconfig glib ]
-    ++ opt (!stdenv.isDarwin) systemd
-    ++ opt (!stdenv.isDarwin && alsaSupport) alsaLib
+    ++ opt stdenv.isLinux systemd
+    ++ opt (stdenv.isLinux && alsaSupport) alsaLib
     ++ opt flacSupport flac
     ++ opt vorbisSupport libvorbis
     # using libmad to decode mp3 files on darwin is causing a segfault -- there
@@ -81,7 +81,7 @@ in stdenv.mkDerivation rec {
       (mkFlag mpg123Support "mpg123")
       (mkFlag aacSupport "aac")
       "--enable-debugging" ]
-    ++ opt (!stdenv.isDarwin)
+    ++ opt stdenv.isLinux
       "--with-systemdsystemunitdir=$(out)/etc/systemd/system";
 
   NIX_LDFLAGS = ''
-- 
GitLab


From 21cfef0beb2ebb5763420325e3abf45ba5e820aa Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 8 Oct 2013 11:12:44 +0200
Subject: [PATCH 5030/5331] Disable some packages that don't build

---
 .../networking/instant-messengers/oneteam/default.nix           | 2 --
 pkgs/games/worldofgoo/default.nix                               | 1 -
 2 files changed, 3 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/oneteam/default.nix b/pkgs/applications/networking/instant-messengers/oneteam/default.nix
index 3549d7f1499..14d01de3245 100644
--- a/pkgs/applications/networking/instant-messengers/oneteam/default.nix
+++ b/pkgs/applications/networking/instant-messengers/oneteam/default.nix
@@ -76,8 +76,6 @@ rec {
     [
       raskin
     ];
-    platforms = with a.lib.platforms;
-      linux;
     license = a.lib.licenses.gpl2;
     homepage="http://oneteam.im";
   };
diff --git a/pkgs/games/worldofgoo/default.nix b/pkgs/games/worldofgoo/default.nix
index 216ec0d8041..13e7e487c8f 100644
--- a/pkgs/games/worldofgoo/default.nix
+++ b/pkgs/games/worldofgoo/default.nix
@@ -77,7 +77,6 @@ stdenv.mkDerivation rec {
     homepage = http://worldofgoo.com;
     license = [ "unfree" ];
     maintainers = with stdenv.lib.maintainers; [ jcumming ];
-    platforms = [ "x86_64-linux"] ;
   };
 
 }
-- 
GitLab


From 206650813118dc3b6f008fc03284abeeed2a953a Mon Sep 17 00:00:00 2001
From: Rob Vermaas <rob.vermaas@gmail.com>
Date: Tue, 8 Oct 2013 11:30:54 +0200
Subject: [PATCH 5031/5331] Add argument to oraclejdk to allow installation of
 Java Cryptography Extension with unlimited strength. User needs to download
 these themselves, and need to accept a license agreement (Java SE BCL License
 Agreement)

---
 pkgs/development/compilers/jdk/dlj-bundle-builder.sh |  5 +++++
 pkgs/development/compilers/jdk/jdk6-linux.nix        | 12 +++++++++++-
 2 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/compilers/jdk/dlj-bundle-builder.sh b/pkgs/development/compilers/jdk/dlj-bundle-builder.sh
index cf59a28164b..028164ac395 100644
--- a/pkgs/development/compilers/jdk/dlj-bundle-builder.sh
+++ b/pkgs/development/compilers/jdk/dlj-bundle-builder.sh
@@ -37,6 +37,11 @@ else
   jrePath=$out/jre
 fi
 
+if test -n "$jce"; then
+  unzip $jce
+  cp -v jce/*.jar $jrePath/lib/security
+fi
+
 rpath=$rpath${rpath:+:}$jrePath/lib/$architecture/jli
 
 # set all the dynamic linkers
diff --git a/pkgs/development/compilers/jdk/jdk6-linux.nix b/pkgs/development/compilers/jdk/jdk6-linux.nix
index 340bbdf91ac..97ec6b56305 100644
--- a/pkgs/development/compilers/jdk/jdk6-linux.nix
+++ b/pkgs/development/compilers/jdk/jdk6-linux.nix
@@ -6,6 +6,7 @@
 , xlibs ? null
 , installjdk ? true
 , pluginSupport ? true
+, installjce ? false
 }:
 
 assert stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux";
@@ -24,6 +25,15 @@ let
     else
       abort "jdk requires i686-linux or x86_64 linux";
 
+  jce =
+    if installjce then
+      requireFile {
+        name = "jce_policy-6.zip";
+        url = http://www.oracle.com/technetwork/java/javase/downloads/jce-6-download-429243.html;
+        sha256 = "0qljzfxbikm8br5k7rkamibp1vkyjrf6blbxpx6hn4k46f62bhnh";
+      }
+    else
+      null;
 in
 
 stdenv.mkDerivation {
@@ -65,7 +75,7 @@ stdenv.mkDerivation {
     [stdenv.gcc.libc] ++
     (if swingSupport then [xlibs.libX11 xlibs.libXext xlibs.libXtst xlibs.libXi xlibs.libXp xlibs.libXt] else []);
 
-  inherit swingSupport pluginSupport architecture;
+  inherit swingSupport pluginSupport architecture jce;
   inherit (xlibs) libX11;
 
   mozillaPlugin = if installjdk then "/jre/lib/${architecture}/plugins" else "/lib/${architecture}/plugins";
-- 
GitLab


From 661e5a8f1abe1ee3342526646238a5ec0bfdc581 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Tue, 8 Oct 2013 14:09:18 +0200
Subject: [PATCH 5032/5331] asciidocFull: add missing sed + coreutils for a2x
 wrapper

When making a PDF file I got an error because dblatex couldn't find
sed/uname/mkdir etc. This fixes it.
---
 pkgs/tools/typesetting/asciidoc/default.nix | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/typesetting/asciidoc/default.nix b/pkgs/tools/typesetting/asciidoc/default.nix
index cd3e651801f..aeeaf04e7ba 100644
--- a/pkgs/tools/typesetting/asciidoc/default.nix
+++ b/pkgs/tools/typesetting/asciidoc/default.nix
@@ -19,6 +19,8 @@
 , fop ? null
 # TODO: Package this:
 #, epubcheck ? null
+, gnused ? null
+, coreutils ? null
 
 , unzip ? null
 # filters
@@ -49,9 +51,11 @@ assert enableStandardFeatures ->
   docbook_xml_dtd_45 != null &&
   docbook5_xsl != null &&
   docbook_xsl != null &&
-  fop != null;
+  fop != null &&
 # TODO: Package this:
-#  epubcheck != null;
+#  epubcheck != null &&
+  gnused != null &&
+  coreutils != null;
 
 # filters
 assert (enableDitaaFilter || enableMscgenFilter || enableDiagFilter || enableQrcodeFilter || enableAafigureFilter) -> unzip != null;
@@ -218,7 +222,7 @@ stdenv.mkDerivation rec {
     # use it to work around an impurity in the tetex package; tetex tools
     # cannot find their neighbours (e.g. pdflatex doesn't find mktextfm).
     # We can remove PATH= when those impurities are fixed.
-    sed -e "s|^ENV =.*|ENV = dict(XML_CATALOG_FILES='${docbook_xml_dtd_45}/xml/dtd/docbook/catalog.xml ${docbook5_xsl}/xml/xsl/docbook/catalog.xml ${docbook_xsl}/xml/xsl/docbook/catalog.xml', PATH='${tetex}/bin')|" \
+    sed -e "s|^ENV =.*|ENV = dict(XML_CATALOG_FILES='${docbook_xml_dtd_45}/xml/dtd/docbook/catalog.xml ${docbook5_xsl}/xml/xsl/docbook/catalog.xml ${docbook_xsl}/xml/xsl/docbook/catalog.xml', PATH='${tetex}/bin:${coreutils}/bin:${gnused}/bin')|" \
         -e "s|^ASCIIDOC =.*|ASCIIDOC = '$out/bin/asciidoc'|" \
         -e "s|^XSLTPROC =.*|XSLTPROC = '${libxslt}/bin/xsltproc'|" \
         -e "s|^DBLATEX =.*|DBLATEX = '${dblatexFull}/bin/dblatex'|" \
-- 
GitLab


From 687e0059d552d39b5bd3cf1218026ed96c2c4adc Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 8 Oct 2013 15:40:48 +0200
Subject: [PATCH 5033/5331] Generate a VirtualBox appliance (in OVF format)
 instead of a disk image

---
 modules/virtualisation/virtualbox-image.nix | 26 +++++++++++++++++++++
 release-combined.nix                        |  2 +-
 release.nix                                 | 17 +++++++-------
 3 files changed, 35 insertions(+), 10 deletions(-)

diff --git a/modules/virtualisation/virtualbox-image.nix b/modules/virtualisation/virtualbox-image.nix
index bd14a7ffda0..306367d0ef5 100644
--- a/modules/virtualisation/virtualbox-image.nix
+++ b/modules/virtualisation/virtualbox-image.nix
@@ -16,6 +16,7 @@ with pkgs.lib;
             '';
           postVM =
             ''
+              echo "creating VirtualBox disk image..."
               ${pkgs.vmTools.qemu}/bin/qemu-img convert -f raw -O vdi $diskImage $out/disk.vdi
               rm $diskImage
             '';
@@ -74,6 +75,31 @@ with pkgs.lib;
         ''
     );
 
+  system.build.virtualBoxOVA = pkgs.runCommand "virtualbox-ova"
+    { buildInputs = [ pkgs.linuxPackages.virtualbox ];
+      vmName = "NixOS ${config.system.nixosVersion} (${pkgs.stdenv.system})";
+      fileName = "nixos-${config.system.nixosVersion}-${pkgs.stdenv.system}.ova";
+    }
+    ''
+      echo "creating VirtualBox VM..."
+      export HOME=$PWD
+      VBoxManage createvm --name "$vmName" --register \
+        --ostype ${if pkgs.stdenv.system == "x86_64-linux" then "Linux26_64" else "Linux26"}
+      VBoxManage modifyvm "$vmName" \
+        --memory 1536 --acpi on --vram 10 \
+        --nictype1 virtio --nic1 nat \
+        --audiocontroller ac97 --audio alsa \
+        --rtcuseutc on \
+        --usb on --mouse usbtablet
+      VBoxManage storagectl "$vmName" --name SATA --add sata --sataportcount 4 --bootable on --hostiocache on
+      VBoxManage storageattach "$vmName" --storagectl SATA --port 0 --device 0 --type hdd \
+        --medium ${config.system.build.virtualBoxImage}/disk.vdi
+
+      echo "exporting VirtualBox VM..."
+      mkdir -p $out
+      VBoxManage export "$vmName" --output "$out/$fileName"
+    '';
+
   fileSystems."/".device = "/dev/disk/by-label/nixos";
 
   boot.loader.grub.version = 2;
diff --git a/release-combined.nix b/release-combined.nix
index 07c0a677722..9b914506215 100644
--- a/release-combined.nix
+++ b/release-combined.nix
@@ -42,7 +42,7 @@ in rec {
 
         (all nixos.iso_minimal)
         (all nixos.iso_graphical)
-        (all nixos.vdi)
+        (all nixos.ova)
 
         (all nixos.tests.firefox)
         (all nixos.tests.firewall)
diff --git a/release.nix b/release.nix
index 63488d712bb..06fb43bf6d6 100644
--- a/release.nix
+++ b/release.nix
@@ -174,8 +174,8 @@ in {
   });
 
 
-  # A bootable VirtualBox image.  FIXME: generate a OVF appliance?
-  vdi = pkgs.lib.genAttrs systems (system:
+  # A bootable VirtualBox virtual appliance as an OVA file (i.e. packaged OVF).
+  ova = pkgs.lib.genAttrs systems (system:
 
     with import <nixpkgs> { inherit system; };
 
@@ -190,19 +190,18 @@ in {
       }).config;
 
     in
-      # Declare the VDI as a build product so that it shows up in Hydra.
-      runCommand "nixos-vdi-${config.system.nixosVersion}-${system}"
+      # Declare the OVA as a build product so that it shows up in Hydra.
+      runCommand "nixos-ova-${config.system.nixosVersion}-${system}"
         { meta = {
-            description = "NixOS VirtualBox disk image (${system})";
+            description = "NixOS VirtualBox appliance (${system})";
             maintainers = lib.maintainers.eelco;
           };
-          vdi = config.system.build.virtualBoxImage;
+          ova = config.system.build.virtualBoxOVA;
         }
         ''
           mkdir -p $out/nix-support
-          fn=$out/nixos-${config.system.nixosVersion}-${system}.vdi.xz
-          xz < $vdi/*.vdi > $fn
-          echo "file vdi $fn" >> $out/nix-support/hydra-build-products
+          fn=$(echo $ova/*.ova)
+          echo "file ova $fn" >> $out/nix-support/hydra-build-products
         '' # */
 
   );
-- 
GitLab


From d07d2eb13731e15c94d082848d3f6eed0db90866 Mon Sep 17 00:00:00 2001
From: Evgeny Egorochkin <phreedom@yandex.ru>
Date: Tue, 8 Oct 2013 16:57:48 +0300
Subject: [PATCH 5034/5331] torsocks: update to 1.3

---
 pkgs/tools/security/tor/torsocks.nix | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/pkgs/tools/security/tor/torsocks.nix b/pkgs/tools/security/tor/torsocks.nix
index ac60ccb16a1..0254b143edf 100644
--- a/pkgs/tools/security/tor/torsocks.nix
+++ b/pkgs/tools/security/tor/torsocks.nix
@@ -1,14 +1,16 @@
-{ stdenv, fetchurl }:
+{ stdenv, fetchgit, autoreconfHook }:
 stdenv.mkDerivation rec {
   pname = "torsocks";
   name = "${pname}-${version}";
-  version = "1.2";
+  version = "1.3";
   
-  src = fetchurl {
-    url = "http://${pname}.googlecode.com/files/${name}.tar.gz";
-    sha256 = "1m0is5q24sf7jjlkl0icfkdc0m53nbkg0q72s57p48yp4hv7v9dy";
+  src = fetchgit {
+    url = meta.repositories.git;
+    rev = "refs/tags/${version}";
+    sha256 = "1cqplb36fkdb81kzf48xlxclf64wnp8r56x1gjayax1h6x4aal1w";
   };
 
+  buildInputs = [ autoreconfHook ];
   preConfigure = ''
       export configureFlags="$configureFlags --libdir=$out/lib"
   '';
@@ -16,6 +18,7 @@ stdenv.mkDerivation rec {
   meta = {
     description = "use socks-friendly applications with Tor";
     homepage = http://code.google.com/p/torsocks/;
+    repositories.git = https://git.torproject.org/torsocks.git;
     license = "GPLv2";
   };
 }
-- 
GitLab


From 4b65d6e7a3b77862e8dba8833e24d086c92148fd Mon Sep 17 00:00:00 2001
From: Rob Vermaas <rob.vermaas@gmail.com>
Date: Tue, 8 Oct 2013 16:21:15 +0200
Subject: [PATCH 5035/5331] Update nixops to 1.1.1

---
 pkgs/tools/package-management/nixops/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/package-management/nixops/default.nix b/pkgs/tools/package-management/nixops/default.nix
index 3381e3644fe..18144b41d91 100644
--- a/pkgs/tools/package-management/nixops/default.nix
+++ b/pkgs/tools/package-management/nixops/default.nix
@@ -1,12 +1,12 @@
 { lib, pythonPackages, fetchurl, libxslt, docbook5_xsl, openssh }:
 
 pythonPackages.buildPythonPackage rec {
-  name = "nixops-1.1";
+  name = "nixops-1.1.1";
   namePrefix = "";
 
   src = fetchurl {
     url = "http://nixos.org/releases/nixops/${name}/${name}.tar.bz2";
-    sha256 = "1i0v4v83s663izw6al63avhs0378rp3nxchy8nkb1zam5rj097z2";
+    sha256 = "0hb77cf9l8qcjp6a1gzkzv7k10j5zvp23ilxgx5x6j93602d5jwb";
   };
 
   buildInputs = [ libxslt ];
-- 
GitLab


From 3767eecd99e709db5e2a540efb2bdfc8b28d5513 Mon Sep 17 00:00:00 2001
From: Evgeny Egorochkin <phreedom@yandex.ru>
Date: Tue, 8 Oct 2013 17:46:25 +0300
Subject: [PATCH 5036/5331] kde4: install mysql by default since it's used by
 akonadi

---
 modules/services/x11/desktop-managers/kde4.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/modules/services/x11/desktop-managers/kde4.nix b/modules/services/x11/desktop-managers/kde4.nix
index cf86d2b86be..c76acfbcd4e 100644
--- a/modules/services/x11/desktop-managers/kde4.nix
+++ b/modules/services/x11/desktop-managers/kde4.nix
@@ -145,6 +145,7 @@ in
           xorg.xauth # used by kdesu
           pkgs.shared_desktop_ontologies # used by nepomuk
           pkgs.strigi # used by nepomuk
+          pkgs.mysql # used by akonadi
         ]
       ++ [ nepomukConfig ] ++ phononBackendPackages
       ++ config.environment.kdePackages;
-- 
GitLab


From 174503945f327899ab774f7cff6740c7c0de11aa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= <viric@viric.name>
Date: Wed, 9 Oct 2013 08:55:16 +0200
Subject: [PATCH 5037/5331] Updating paraview to 4.0.1.

---
 pkgs/applications/graphics/paraview/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/graphics/paraview/default.nix b/pkgs/applications/graphics/paraview/default.nix
index b647c07368e..cc42e1c4046 100644
--- a/pkgs/applications/graphics/paraview/default.nix
+++ b/pkgs/applications/graphics/paraview/default.nix
@@ -7,10 +7,10 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "paraview-3.98.1";
+  name = "paraview-4.0.1";
   src = fetchurl {
-    url = "http://paraview.org/files/v3.98/ParaView-3.98.1-source.tar.gz";
-    sha256 = "0i7q3jc4lc40l1zw3fdzv108rpxxfmg3dmmq855fpqyp2g2w9nxp";
+    url = "http://paraview.org/files/v4.0/ParaView-v4.0.1-source.tgz";
+    sha256 = "1qj8dq8gqpsw75sv4sdc7xm1xcpv0ilsddnrcfhha0zfhp0gq10y";
   };
 
   # [  5%] Generating vtkGLSLShaderLibrary.h
-- 
GitLab


From 04ca15d840f93932dd0169f1c2ed1744e759d76a Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 8 Oct 2013 17:53:34 +0200
Subject: [PATCH 5038/5331] Don't expand paths during VirtualBox image
 generation

---
 modules/virtualisation/virtualbox-image.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/modules/virtualisation/virtualbox-image.nix b/modules/virtualisation/virtualbox-image.nix
index 306367d0ef5..e1b6def8edb 100644
--- a/modules/virtualisation/virtualbox-image.nix
+++ b/modules/virtualisation/virtualbox-image.nix
@@ -48,7 +48,8 @@ with pkgs.lib;
 
           echo "filling Nix store..."
           mkdir -p /mnt/nix/store
-          cp -prd $storePaths /mnt/nix/store/
+          set -f
+          cp -prvd $storePaths /mnt/nix/store/
 
           # Register the paths in the Nix database.
           printRegistration=1 perl ${pkgs.pathsFromGraph} /tmp/xchg/closure | \
-- 
GitLab


From d40629ad6d872d4e491526a473b932cad2c3ae95 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 9 Oct 2013 13:30:31 +0200
Subject: [PATCH 5039/5331] Add the demo user to the vboxsf group to allow
 mounting of shared folders

---
 modules/installer/virtualbox-demo.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/modules/installer/virtualbox-demo.nix b/modules/installer/virtualbox-demo.nix
index e3f86edcbf0..1efb84317ab 100644
--- a/modules/installer/virtualbox-demo.nix
+++ b/modules/installer/virtualbox-demo.nix
@@ -7,4 +7,7 @@
       ../profiles/demo.nix
       ../profiles/clone-config.nix
     ];
+
+  # Allow mounting of shared folders.
+  users.extraUsers.demo.extraGroups = [ "vboxsf" ];
 }
-- 
GitLab


From 3472992188241fa44f4dec0eb3b88ca5ca550ce0 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 9 Oct 2013 13:30:57 +0200
Subject: [PATCH 5040/5331] Only start the VirtualBox guest services if we're
 in a VirtualBox VM

---
 modules/virtualisation/virtualbox-guest.nix | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/modules/virtualisation/virtualbox-guest.nix b/modules/virtualisation/virtualbox-guest.nix
index 75c5349e0c2..e1a83cdecc2 100644
--- a/modules/virtualisation/virtualbox-guest.nix
+++ b/modules/virtualisation/virtualbox-guest.nix
@@ -40,14 +40,16 @@ optionalAttrs (pkgs.stdenv.isi686 || pkgs.stdenv.isx86_64) # ugly...
 
     users.extraGroups.vboxsf.gid = config.ids.gids.vboxsf;
 
-    jobs.virtualbox =
+    systemd.services.virtualbox =
       { description = "VirtualBox Guest Services";
 
         wantedBy = [ "multi-user.target" ];
         requires = [ "dev-vboxguest.device" ];
         after = [ "dev-vboxguest.device" ];
 
-        exec = "${kernel.virtualboxGuestAdditions}/sbin/VBoxService --foreground";
+        unitConfig.ConditionVirtualization = "oracle";
+
+        serviceConfig.ExecStart = "@${kernel.virtualboxGuestAdditions}/sbin/VBoxService VBoxService --foreground";
       };
 
     services.xserver.videoDrivers = mkOverride 50 [ "virtualbox" ];
-- 
GitLab


From 87bea0b09eaa99a663c4d8a32b6b3da1c5352bfc Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 9 Oct 2013 13:33:43 +0200
Subject: [PATCH 5041/5331] Add more video drivers to the VM image

This might allow it to work in VMware and QEMU.
---
 modules/installer/virtualbox-demo.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/modules/installer/virtualbox-demo.nix b/modules/installer/virtualbox-demo.nix
index 1efb84317ab..c965be2ad85 100644
--- a/modules/installer/virtualbox-demo.nix
+++ b/modules/installer/virtualbox-demo.nix
@@ -10,4 +10,8 @@
 
   # Allow mounting of shared folders.
   users.extraUsers.demo.extraGroups = [ "vboxsf" ];
+
+  # Add some more video drivers to give X11 a shot at working in
+  # VMware and QEMU.
+  services.xserver.videoDrivers = mkOverride 40 [ "virtualbox" "vmware" "cirrus" "vesa" ];
 }
-- 
GitLab


From 36079454e5456d43a36aa75194265bda72f75f5d Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 9 Oct 2013 14:28:35 +0200
Subject: [PATCH 5042/5331] Make it easier to define timer units for services

Systemd services now have a startAt attribute.  If set, NixOS will
automatically emit a timer unit that causes the service to start at
the specified time.  For example:

  systemd.services.foo =
    { script = "... bla bla ...";
      startAt = "02:15";
    };

causes the given script to be started at 02:15 every day.
---
 modules/programs/venus.nix                   |  6 +----
 modules/services/misc/nix-gc.nix             | 26 +++++++-------------
 modules/system/boot/systemd-unit-options.nix | 14 +++++++++++
 modules/system/boot/systemd.nix              |  8 ++++++
 4 files changed, 32 insertions(+), 22 deletions(-)

diff --git a/modules/programs/venus.nix b/modules/programs/venus.nix
index c316163c8c7..2b3bfbc6c18 100644
--- a/modules/programs/venus.nix
+++ b/modules/programs/venus.nix
@@ -167,11 +167,7 @@ in
         serviceConfig.User = "${cfg.user}";
         serviceConfig.Group = "${cfg.group}";
         environment.OPENSSL_X509_CERT_FILE = "/etc/ssl/certs/ca-bundle.crt";
-      };
-
-    systemd.timers.venus =
-      { wantedBy = [ "timers.target" ];
-        timerConfig.OnCalendar = cfg.dates;
+        startOn = cfg.dates;
       };
 
   };
diff --git a/modules/services/misc/nix-gc.nix b/modules/services/misc/nix-gc.nix
index dfc4fd3c2ff..dfdc4db65d5 100644
--- a/modules/services/misc/nix-gc.nix
+++ b/modules/services/misc/nix-gc.nix
@@ -48,22 +48,14 @@ in
 
   ###### implementation
 
-  config = mkMerge [
-
-    { systemd.services.nix-gc =
-        { description = "Nix Garbage Collector";
-          path  = [ config.environment.nix ];
-          script = "exec nix-collect-garbage ${cfg.options}";
-        };
-    }
-
-    (mkIf cfg.automatic {
-      systemd.timers.nix-gc =
-        { wantedBy = [ "timers.target" ];
-          timerConfig.OnCalendar = cfg.dates;
-        };
-    })
-
-  ];
+  config = {
+
+    systemd.services.nix-gc =
+      { description = "Nix Garbage Collector";
+        serviceConfig.ExecStart = "${config.environment.nix}/bin/nix-collect-garbage ${cfg.options}";
+        startAt = optionalString cfg.automatic cfg.dates;
+      };
+
+  };
 
 }
diff --git a/modules/system/boot/systemd-unit-options.nix b/modules/system/boot/systemd-unit-options.nix
index e6e8d9eb3b0..dfb9036ab4d 100644
--- a/modules/system/boot/systemd-unit-options.nix
+++ b/modules/system/boot/systemd-unit-options.nix
@@ -229,6 +229,20 @@ rec {
       '';
     };
 
+    startAt = mkOption {
+      type = types.uniq types.string;
+      default = "";
+      example = "Sun 14:00:00";
+      description = ''
+        Automatically start this unit at the given date/time, which
+        must be in the format described in
+        <citerefentry><refentrytitle>systemd.time</refentrytitle>
+        <manvolnum>5</manvolnum></citerefentry>.  This is equivalent
+        to adding a corresponding timer unit with
+        <option>OnCalendar</option> set to the value given here.
+      '';
+    };
+
   };
 
 
diff --git a/modules/system/boot/systemd.nix b/modules/system/boot/systemd.nix
index 35ae6a84024..a5e1165574c 100644
--- a/modules/system/boot/systemd.nix
+++ b/modules/system/boot/systemd.nix
@@ -628,6 +628,14 @@ in
 
     users.extraGroups.systemd-journal.gid = config.ids.gids.systemd-journal;
 
+    # Generate timer units for all services that have a ‘startAt’ value.
+    systemd.timers =
+      mapAttrs (name: service:
+        { wantedBy = [ "timers.target" ];
+          timerConfig.OnCalendar = service.startAt;
+        })
+        (filterAttrs (name: service: service.startAt != "") cfg.services);
+
     # FIXME: These are borrowed from upstream systemd.
     systemd.services."systemd-update-utmp" =
       { description = "Update UTMP about System Reboot/Shutdown";
-- 
GitLab


From 58fbf0f18b438a073574b35429e6a6975af3b64b Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 9 Oct 2013 14:30:45 +0200
Subject: [PATCH 5043/5331] Fix eval error

---
 modules/installer/virtualbox-demo.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/modules/installer/virtualbox-demo.nix b/modules/installer/virtualbox-demo.nix
index c965be2ad85..76cc29a1fac 100644
--- a/modules/installer/virtualbox-demo.nix
+++ b/modules/installer/virtualbox-demo.nix
@@ -1,5 +1,7 @@
 { config, pkgs, ... }:
 
+with pkgs.lib;
+
 {
   imports =
     [ ../virtualisation/virtualbox-image.nix
-- 
GitLab


From de579ba40b3b0a66508deedbf759c0744dda15f7 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 9 Oct 2013 15:33:23 +0200
Subject: [PATCH 5044/5331] Manual: icecat -> firefox

---
 doc/manual/development.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/manual/development.xml b/doc/manual/development.xml
index cc5af79dd4e..d8b5f6f571c 100644
--- a/doc/manual/development.xml
+++ b/doc/manual/development.xml
@@ -490,7 +490,7 @@ $ nix-build tests/ -A nfs.test
     browser like this:
 
 <screen>
-$ icecat result/log.html
+$ firefox result/log.html
 </screen>
   </para>
 
-- 
GitLab


From e521757f21fcb7a97d649076d3c542a062d7667a Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Wed, 9 Oct 2013 09:52:08 -0400
Subject: [PATCH 5045/5331] Update gummiboot

Signed-off-by: Shea Levy <shea@shealevy.com>
---
 pkgs/tools/misc/gummiboot/default.nix  | 21 +++----
 pkgs/tools/misc/gummiboot/no-usr.patch | 79 --------------------------
 pkgs/top-level/all-packages.nix        |  4 +-
 3 files changed, 13 insertions(+), 91 deletions(-)
 delete mode 100644 pkgs/tools/misc/gummiboot/no-usr.patch

diff --git a/pkgs/tools/misc/gummiboot/default.nix b/pkgs/tools/misc/gummiboot/default.nix
index cf2fe713461..1098e9d0920 100644
--- a/pkgs/tools/misc/gummiboot/default.nix
+++ b/pkgs/tools/misc/gummiboot/default.nix
@@ -1,19 +1,20 @@
-{ stdenv, fetchurl, gnu_efi, unzip, pkgconfig, utillinux, libxslt, docbook_xsl, docbook_xml_dtd_42 }:
+{ stdenv, fetchurl, gnu-efi, unzip, pkgconfig, utillinux, libxslt, docbook_xsl, docbook_xml_dtd_42 }:
 
 stdenv.mkDerivation rec {
-  name = "gummiboot-23";
+  name = "gummiboot-38";
 
-  buildInputs = [ unzip pkgconfig utillinux libxslt docbook_xsl docbook_xml_dtd_42 ];
+  buildInputs = [ gnu-efi pkgconfig libxslt utillinux ];
 
-  patches = [ ./no-usr.patch ];
-
-  buildFlags = [ "GNU_EFI=${gnu_efi}" ];
-
-  makeFlags = [ "PREFIX=$(out)" ];
+  # Sigh, gummiboot should be able to find this in buildInputs
+  configureFlags = [
+    "--with-efi-includedir=${gnu-efi}/include"
+    "--with-efi-libdir=${gnu-efi}/lib"
+    "--with-efi-ldsdir=${gnu-efi}/lib"
+  ];
 
   src = fetchurl {
-    url = "http://cgit.freedesktop.org/gummiboot/snapshot/${name}.zip";
-    sha256 = "1lmfk4k52ha00ppna5g7h51vhd27i9fipf5k7mc2d9jkm2480z4j";
+    url = http://pkgs.fedoraproject.org/repo/pkgs/gummiboot/gummiboot-38.tar.xz/0504791387e1998bf2075728c237f27e/gummiboot-38.tar.xz;
+    sha256 = "1aid2a29ym8dqldxpcihnrls7vrr9ijbla3dad0r8qwkca43d4lm";
   };
 
   meta = {
diff --git a/pkgs/tools/misc/gummiboot/no-usr.patch b/pkgs/tools/misc/gummiboot/no-usr.patch
deleted file mode 100644
index db906894740..00000000000
--- a/pkgs/tools/misc/gummiboot/no-usr.patch
+++ /dev/null
@@ -1,79 +0,0 @@
-diff -Naur gummiboot-23-orig/Makefile gummiboot-23/Makefile
---- gummiboot-23-orig/Makefile	2013-02-20 00:55:44.000000000 -0500
-+++ gummiboot-23/Makefile	2013-02-21 12:00:35.783637645 -0500
-@@ -10,7 +10,8 @@
- export E Q
- 
- ARCH=$(shell $(CC) -dumpmachine | sed "s/\(-\).*$$//")
--LIBDIR=$(shell echo $$(cd /usr/lib/$$(gcc -print-multi-os-directory); pwd))
-+PREFIX=/usr
-+LIBDIR=$(GNU_EFI)/lib
- LIBEFIDIR=$(or $(wildcard $(LIBDIR)/gnuefi), $(LIBDIR))
- 
- ifeq ($(ARCH),i686)
-@@ -25,13 +26,13 @@
- 		-mno-red-zone
- endif
- 
--all: gummiboot$(MACHINE_TYPE_NAME).efi gummiboot
-+all: gummiboot$(MACHINE_TYPE_NAME).efi gummiboot man
- 
- # ------------------------------------------------------------------------------
- CPPFLAGS = \
- 	-I. \
--	-I/usr/include/efi \
--	-I/usr/include/efi/$(ARCH)
-+	-I$(GNU_EFI)/include/efi \
-+	-I$(GNU_EFI)/include/efi/$(ARCH)
- 
- CFLAGS = \
- 	-DVERSION=$(VERSION) \
-@@ -82,6 +83,7 @@
- 	  `pkg-config --cflags --libs blkid` \
- 	  src/setup/setup.c \
- 	  src/setup/efivars.c \
-+	  -DPREFIX=\"$(PREFIX)\" \
- 	  -o $@
- 
- # ------------------------------------------------------------------------------
-@@ -101,11 +103,11 @@
- 	rm -f src/efi/gummiboot.o src/efi/gummiboot.so gummiboot gummiboot$(MACHINE_TYPE_NAME).efi
- 
- install: all
--	mkdir -p $(DESTDIR)/usr/bin/
--	cp gummiboot $(DESTDIR)/usr/bin
--	mkdir -p $(DESTDIR)/usr/lib/gummiboot/
--	cp gummiboot$(MACHINE_TYPE_NAME).efi $(DESTDIR)/usr/lib/gummiboot/
--	[ -e gummiboot.1 ] && mkdir -p $(DESTDIR)/usr/share/man/man1/ && cp gummiboot.1 $(DESTDIR)/usr/share/man/man1/ || :
-+	mkdir -p $(DESTDIR)$(PREFIX)/bin/
-+	cp gummiboot $(DESTDIR)$(PREFIX)/bin
-+	mkdir -p $(DESTDIR)$(PREFIX)/lib/gummiboot/
-+	cp gummiboot$(MACHINE_TYPE_NAME).efi $(DESTDIR)$(PREFIX)/lib/gummiboot/
-+	[ -e gummiboot.1 ] && mkdir -p $(DESTDIR)$(PREFIX)/share/man/man1/ && cp gummiboot.1 $(DESTDIR)$(PREFIX)/share/man/man1/ || :
- 
- tar:
- 	git archive --format=tar --prefix=gummiboot-$(VERSION)/ $(VERSION) | xz > gummiboot-$(VERSION).tar.xz
-diff -Naur gummiboot-23-orig/src/setup/setup.c gummiboot-23/src/setup/setup.c
---- gummiboot-23-orig/src/setup/setup.c	2013-02-20 00:55:44.000000000 -0500
-+++ gummiboot-23/src/setup/setup.c	2013-02-21 11:57:43.295324700 -0500
-@@ -736,7 +736,7 @@
-         char *p = NULL, *q = NULL, *v = NULL;
-         int r;
- 
--        if (asprintf(&p, "/usr/lib/gummiboot/%s", name) < 0) {
-+        if (asprintf(&p, PREFIX "/lib/gummiboot/%s", name) < 0) {
-                 fprintf(stderr, "Out of memory.\n");
-                 r = -ENOMEM;
-                 goto finish;
-@@ -791,9 +791,9 @@
-                         return r;
-         }
- 
--        d = opendir("/usr/lib/gummiboot");
-+        d = opendir(PREFIX "/lib/gummiboot");
-         if (!d) {
--                fprintf(stderr, "Failed to open /usr/lib/gummiboot: %m\n");
-+                fprintf(stderr, "Failed to open " PREFIX "/lib/gummiboot: %m\n");
-                 return -errno;
-         }
- 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index bf133b47437..64f9c29a5a4 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1044,7 +1044,7 @@ let
 
   gtmess = callPackage ../applications/networking/instant-messengers/gtmess { };
 
-  gummiboot = callPackage ../tools/misc/gummiboot { };
+  gummiboot = callPackage ../tools/misc/gummiboot { stdenv = overrideGCC stdenv gcc47; };
 
   gupnp = callPackage ../development/libraries/gupnp {
     inherit (gnome) libsoup;
@@ -4320,7 +4320,7 @@ let
 
   gnet = callPackage ../development/libraries/gnet { };
 
-  gnu_efi = callPackage ../development/libraries/gnu-efi {
+  gnu-efi = callPackage ../development/libraries/gnu-efi {
     stdenv = overrideInStdenv stdenv [gnumake381];
   };
 
-- 
GitLab


From 19c7b847995db9ce87a568a1fc06950dd957227c Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Wed, 9 Oct 2013 10:07:02 -0400
Subject: [PATCH 5046/5331] gnu-efi: Update to 3.0u

Signed-off-by: Shea Levy <shea@shealevy.com>
---
 pkgs/development/libraries/gnu-efi/default.nix | 6 +++---
 pkgs/top-level/all-packages.nix                | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/libraries/gnu-efi/default.nix b/pkgs/development/libraries/gnu-efi/default.nix
index ca24db94cd0..f741a0b4f34 100644
--- a/pkgs/development/libraries/gnu-efi/default.nix
+++ b/pkgs/development/libraries/gnu-efi/default.nix
@@ -2,13 +2,13 @@
 , fetchurl
 }:
 
-let version = "3.0s"; in stdenv.mkDerivation {
+let version = "3.0u"; in stdenv.mkDerivation {
 
   name = "gnu-efi-${version}";
 
   src = fetchurl {
     url = "mirror://sourceforge/gnu-efi/gnu-efi_${version}.orig.tar.gz";
-    sha256 = "18bpswzkj81dadq1b7n2s9g0cz60l34ggzxlq21mb8va10j9zmhh";
+    sha256 = "0klkdxh1aqwwfm393q67nxww6liffyp2lfybbnh4q819b06la39w";
   };
 
   meta = {
@@ -34,7 +34,7 @@ let version = "3.0s"; in stdenv.mkDerivation {
   '';
 
   installPhase = ''
-    make INSTALLROOT="$out" install
+    make PREFIX="$out" install
     mkdir -pv $out/share/gnu-efi
     install -D -m644 apps/*.efi $out/share/gnu-efi
   '';
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 64f9c29a5a4..99a489a5df2 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4321,7 +4321,7 @@ let
   gnet = callPackage ../development/libraries/gnet { };
 
   gnu-efi = callPackage ../development/libraries/gnu-efi {
-    stdenv = overrideInStdenv stdenv [gnumake381];
+    stdenv = overrideGCC stdenv gcc47;
   };
 
   gnutls = callPackage ../development/libraries/gnutls {
-- 
GitLab


From 74d72d89eae5521a9ca5e276a08a219c9ec65689 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Wed, 9 Oct 2013 10:30:44 -0400
Subject: [PATCH 5047/5331] Update edk2 and OVMF

Signed-off-by: Shea Levy <shea@shealevy.com>
---
 pkgs/applications/virtualization/OVMF/default.nix |  2 +-
 pkgs/development/compilers/edk2/default.nix       | 12 ++++++------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkgs/applications/virtualization/OVMF/default.nix b/pkgs/applications/virtualization/OVMF/default.nix
index 7d101aac790..e6d0b7cb40d 100644
--- a/pkgs/applications/virtualization/OVMF/default.nix
+++ b/pkgs/applications/virtualization/OVMF/default.nix
@@ -12,7 +12,7 @@ let
 in
 
 stdenv.mkDerivation (edk2.setup "OvmfPkg/OvmfPkg${targetArch}.dsc" {
-  name = "OVMF-2012-03-13";
+  name = "OVMF-2012-10-09";
 
   unpackPhase = ''
     for file in \
diff --git a/pkgs/development/compilers/edk2/default.nix b/pkgs/development/compilers/edk2/default.nix
index 949324ba8b1..3c2a4f779fd 100644
--- a/pkgs/development/compilers/edk2/default.nix
+++ b/pkgs/development/compilers/edk2/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchsvn, libuuid, pythonFull, iasl }:
+{ stdenv, fetchgit, libuuid, pythonFull, iasl }:
 
 let
 
@@ -10,12 +10,12 @@ else
   throw "Unsupported architecture";
 
 edk2 = stdenv.mkDerivation {
-  name = "edk2-2013-03-19";
+  name = "edk2-2013-10-09";
   
-  src = fetchsvn {
-    url = https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2;
-    rev = "14211";
-    sha256 = "1rhrv7cyazb1d4gw3s8fv0c245iankvb9pqx6nngbkkxkcswvnw7";
+  src = fetchgit {
+    url = git://github.com/tianocore/edk2;
+    rev = "5bcb62a4098c9bde9be6af0833a025adc768e08d";
+    sha256 = "3e2958877061bf6bbfb28b150743d7244486929c1c320bdb1ff2586774aa042a";
   };
 
   buildInputs = [ libuuid pythonFull ];
-- 
GitLab


From f5886feb1e1466123ba4c2aff6f42a2542fa4dec Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Wed, 9 Oct 2013 10:42:05 -0400
Subject: [PATCH 5048/5331] gptfdisk: Update to 0.8.6

Signed-off-by: Shea Levy <shea@shealevy.com>
---
 pkgs/tools/system/gptfdisk/default.nix | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/pkgs/tools/system/gptfdisk/default.nix b/pkgs/tools/system/gptfdisk/default.nix
index 9db39411854..7c8c2ec09ed 100644
--- a/pkgs/tools/system/gptfdisk/default.nix
+++ b/pkgs/tools/system/gptfdisk/default.nix
@@ -1,11 +1,11 @@
 { fetchurl, stdenv, libuuid, popt, icu, ncurses }:
 
 stdenv.mkDerivation rec {
-  name = "gptfdisk-0.8.5";
+  name = "gptfdisk-0.8.6";
 
   src = fetchurl {
     url = "mirror://sourceforge/gptfdisk/${name}.tar.gz";
-    sha256 = "1yaax2mga7n847x1ihbgvv4drzvndgnn4mii0mz1ab1150gnkk0m";
+    sha256 = "1cj7lribq8f3i4q6463q08bs42pvlzfj0iz2f2cnjn94hiacsya5";
   };
 
   buildInputs = [ libuuid popt icu ncurses ];
@@ -13,9 +13,11 @@ stdenv.mkDerivation rec {
   installPhase = ''
     mkdir -p $out/sbin
     mkdir -p $out/share/man/man8
-    install -v -m755 gdisk sgdisk fixparts $out/sbin
-    install -v -m644 gdisk.8 sgdisk.8 fixparts.8 \
-        $out/share/man/man8
+    for prog in gdisk sgdisk fixparts cgdisk
+    do
+        install -v -m755 $prog $out/sbin
+        install -v -m644 $prog.8 $out/share/man/man8
+    done
   '';
 
   meta = {
@@ -26,6 +28,7 @@ stdenv.mkDerivation rec {
     homepage = http://www.rodsbooks.com/gdisk/;
 
     maintainers = stdenv.lib.maintainers.shlevy;
+
     platforms = stdenv.lib.platforms.linux;
   };
 }
-- 
GitLab


From b79c8e64c1891d481626907932e71de5eae1240b Mon Sep 17 00:00:00 2001
From: Sander van der Burg <svanderburg@gmail.com>
Date: Wed, 9 Oct 2013 18:12:09 +0200
Subject: [PATCH 5049/5331] Added owl-deepcopy nodejs package + update other
 node packages

---
 pkgs/top-level/node-packages-generated.nix | 759 +++++++++++++++++++--
 pkgs/top-level/node-packages.json          |   1 +
 2 files changed, 710 insertions(+), 50 deletions(-)

diff --git a/pkgs/top-level/node-packages-generated.nix b/pkgs/top-level/node-packages-generated.nix
index c21699fdb6b..52a9f33cafa 100644
--- a/pkgs/top-level/node-packages-generated.nix
+++ b/pkgs/top-level/node-packages-generated.nix
@@ -165,6 +165,23 @@
     passthru.names = [ "almond" ];
   };
   "almond" = self.full."almond"."*";
+  full."ambi"."~2.1.4" = lib.makeOverridable self.buildNodePackage {
+    name = "ambi-2.1.4";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/ambi/-/ambi-2.1.4.tgz";
+        sha1 = "1c0bafb3b1058754e1c3f9d7383948fc1b7c6926";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."ambi"."~2.1.4" or []);
+    deps = [
+      self.full."typechecker"."~2.0.6"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "ambi" ];
+  };
   full."amdefine"."*" = lib.makeOverridable self.buildNodePackage {
     name = "amdefine-0.0.8";
     src = [
@@ -626,11 +643,11 @@
     passthru.names = [ "async" ];
   };
   full."aws-sdk"."*" = lib.makeOverridable self.buildNodePackage {
-    name = "aws-sdk-1.7.0";
+    name = "aws-sdk-1.7.1";
     src = [
       (self.patchLatest {
-        url = "http://registry.npmjs.org/aws-sdk/-/aws-sdk-1.7.0.tgz";
-        sha1 = "d30b478b04d5faf15c02d17faa9968ec1b5b1149";
+        url = "http://registry.npmjs.org/aws-sdk/-/aws-sdk-1.7.1.tgz";
+        sha1 = "802748ea85a6c508b8665bbf22050c879af17695";
       })
     ];
     buildInputs =
@@ -645,11 +662,11 @@
   };
   "aws-sdk" = self.full."aws-sdk"."*";
   full."aws-sdk".">=1.2.0 <2" = lib.makeOverridable self.buildNodePackage {
-    name = "aws-sdk-1.7.0";
+    name = "aws-sdk-1.7.1";
     src = [
       (self.patchLatest {
-        url = "http://registry.npmjs.org/aws-sdk/-/aws-sdk-1.7.0.tgz";
-        sha1 = "d30b478b04d5faf15c02d17faa9968ec1b5b1149";
+        url = "http://registry.npmjs.org/aws-sdk/-/aws-sdk-1.7.1.tgz";
+        sha1 = "802748ea85a6c508b8665bbf22050c879af17695";
       })
     ];
     buildInputs =
@@ -1488,11 +1505,11 @@
     passthru.names = [ "cheerio" ];
   };
   full."cheerio"."~0.12.0" = lib.makeOverridable self.buildNodePackage {
-    name = "cheerio-0.12.2";
+    name = "cheerio-0.12.3";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/cheerio/-/cheerio-0.12.2.tgz";
-        sha1 = "d9908e29679e6d1b501c2cfe0e4ada330ea278c7";
+        url = "http://registry.npmjs.org/cheerio/-/cheerio-0.12.3.tgz";
+        sha1 = "8eb05ace0a3fc72d9d9ce0b5d364fe8bb565d7fa";
       })
     ];
     buildInputs =
@@ -1508,11 +1525,11 @@
     passthru.names = [ "cheerio" ];
   };
   full."cheerio"."~0.12.1" = lib.makeOverridable self.buildNodePackage {
-    name = "cheerio-0.12.2";
+    name = "cheerio-0.12.3";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/cheerio/-/cheerio-0.12.2.tgz";
-        sha1 = "d9908e29679e6d1b501c2cfe0e4ada330ea278c7";
+        url = "http://registry.npmjs.org/cheerio/-/cheerio-0.12.3.tgz";
+        sha1 = "8eb05ace0a3fc72d9d9ce0b5d364fe8bb565d7fa";
       })
     ];
     buildInputs =
@@ -1609,11 +1626,11 @@
     passthru.names = [ "chownr" ];
   };
   full."clean-css"."~1.1.1" = lib.makeOverridable self.buildNodePackage {
-    name = "clean-css-1.1.2";
+    name = "clean-css-1.1.3";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/clean-css/-/clean-css-1.1.2.tgz";
-        sha1 = "ea0c50151c559956c2364d86077eb30d28ff4e9a";
+        url = "http://registry.npmjs.org/clean-css/-/clean-css-1.1.3.tgz";
+        sha1 = "5442cbf45643e09bdcfae25f2b5d8eb36e168ae1";
       })
     ];
     buildInputs =
@@ -2984,6 +3001,22 @@
     ];
     passthru.names = [ "deep-extend" ];
   };
+  full."deep-extend"."~0.2.6" = lib.makeOverridable self.buildNodePackage {
+    name = "deep-extend-0.2.6";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/deep-extend/-/deep-extend-0.2.6.tgz";
+        sha1 = "1f767e02b46d88d0a4087affa4b11b1b0b804250";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."deep-extend"."~0.2.6" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "deep-extend" ];
+  };
   full."delayed-stream"."0.0.5" = lib.makeOverridable self.buildNodePackage {
     name = "delayed-stream-0.0.5";
     src = [
@@ -3723,6 +3756,23 @@
     passthru.names = [ "extend" ];
   };
   "extend" = self.full."extend"."*";
+  full."extract-opts"."~2.2.0" = lib.makeOverridable self.buildNodePackage {
+    name = "extract-opts-2.2.0";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/extract-opts/-/extract-opts-2.2.0.tgz";
+        sha1 = "1fa28eba7352c6db480f885ceb71a46810be6d7d";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."extract-opts"."~2.2.0" or []);
+    deps = [
+      self.full."typechecker"."~2.0.1"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "extract-opts" ];
+  };
   full."extsprintf"."1.0.0" = lib.makeOverridable self.buildNodePackage {
     name = "extsprintf-1.0.0";
     src = [
@@ -4503,6 +4553,25 @@
     passthru.names = [ "generator-webapp" ];
   };
   "generator-webapp" = self.full."generator-webapp"."*";
+  full."getmac"."~1.0.5" = lib.makeOverridable self.buildNodePackage {
+    name = "getmac-1.0.5";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/getmac/-/getmac-1.0.5.tgz";
+        sha1 = "4ce0468a83e5fc2f2d337fc0c3c9be2c94a6344f";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."getmac"."~1.0.5" or []);
+    deps = [
+      self.full."extract-opts"."~2.2.0"
+      self.full."joe".">=1.0.0-0 >=1.3.0-0 <1.4.0-0"
+      self.full."joe-reporter-console"."~1.2.1"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "getmac" ];
+  };
   full."github-url-from-git"."1.1.1" = lib.makeOverridable self.buildNodePackage {
     name = "github-url-from-git-1.1.1";
     src = [
@@ -6186,12 +6255,81 @@
     passthru.names = [ "jayschema" ];
   };
   "jayschema" = self.full."jayschema"."*";
+  full."joe"."1.x" = lib.makeOverridable self.buildNodePackage {
+    name = "joe-1.3.0";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/joe/-/joe-1.3.0.tgz";
+        sha1 = "dbde3133917f5f1683b67ba9dd5ca4d561306efa";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."joe"."1.x" or []);
+    deps = [
+      self.full."taskgroup"."~3.2.0"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "joe" ];
+  };
+  full."joe".">=1.0.0-0 >=1.3.0-0 <1.4.0-0" = lib.makeOverridable self.buildNodePackage {
+    name = "joe-1.3.0";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/joe/-/joe-1.3.0.tgz";
+        sha1 = "dbde3133917f5f1683b67ba9dd5ca4d561306efa";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."joe".">=1.0.0-0 >=1.3.0-0 <1.4.0-0" or []);
+    deps = [
+      self.full."taskgroup"."~3.2.0"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "joe" ];
+  };
+  full."joe"."~1.3.0" = lib.makeOverridable self.buildNodePackage {
+    name = "joe-1.3.0";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/joe/-/joe-1.3.0.tgz";
+        sha1 = "dbde3133917f5f1683b67ba9dd5ca4d561306efa";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."joe"."~1.3.0" or []);
+    deps = [
+      self.full."taskgroup"."~3.2.0"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "joe" ];
+  };
+  full."joe-reporter-console"."~1.2.1" = lib.makeOverridable self.buildNodePackage {
+    name = "joe-reporter-console-1.2.1";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/joe-reporter-console/-/joe-reporter-console-1.2.1.tgz";
+        sha1 = "6887fa067121b0e67b571672aa63b358055eddc1";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."joe-reporter-console"."~1.2.1" or []);
+    deps = [
+      self.full."cli-color"."~0.2.2"
+    ];
+    peerDependencies = [
+      self.full."joe"."1.x"
+    ];
+    passthru.names = [ "joe-reporter-console" ];
+  };
   full."js-yaml"."*" = lib.makeOverridable self.buildNodePackage {
-    name = "js-yaml-2.1.1";
+    name = "js-yaml-2.1.2";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/js-yaml/-/js-yaml-2.1.1.tgz";
-        sha1 = "574095ef2253694313a6c2b261c7b6929a9603b7";
+        url = "http://registry.npmjs.org/js-yaml/-/js-yaml-2.1.2.tgz";
+        sha1 = "5404d58972f70112763e0b7e97ced20c39138bbd";
       })
     ];
     buildInputs =
@@ -6258,11 +6396,11 @@
     passthru.names = [ "js-yaml" ];
   };
   full."js-yaml"."~2.1.0" = lib.makeOverridable self.buildNodePackage {
-    name = "js-yaml-2.1.1";
+    name = "js-yaml-2.1.2";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/js-yaml/-/js-yaml-2.1.1.tgz";
-        sha1 = "574095ef2253694313a6c2b261c7b6929a9603b7";
+        url = "http://registry.npmjs.org/js-yaml/-/js-yaml-2.1.2.tgz";
+        sha1 = "5404d58972f70112763e0b7e97ced20c39138bbd";
       })
     ];
     buildInputs =
@@ -7194,6 +7332,473 @@
     ];
     passthru.names = [ "lodash" ];
   };
+  full."lodash._arraypool"."~2.2.1" = lib.makeOverridable self.buildNodePackage {
+    name = "lodash._arraypool-2.2.1";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/lodash._arraypool/-/lodash._arraypool-2.2.1.tgz";
+        sha1 = "09c741461dde7a7bc467d826ee50c8b1216427f4";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."lodash._arraypool"."~2.2.1" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "lodash._arraypool" ];
+  };
+  full."lodash._basecreatecallback"."~2.2.1" = lib.makeOverridable self.buildNodePackage {
+    name = "lodash._basecreatecallback-2.2.1";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/lodash._basecreatecallback/-/lodash._basecreatecallback-2.2.1.tgz";
+        sha1 = "486940419a6f195996cb0f7644af71341c608ce4";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."lodash._basecreatecallback"."~2.2.1" or []);
+    deps = [
+      self.full."lodash.bind"."~2.2.1"
+      self.full."lodash.identity"."~2.2.1"
+      self.full."lodash._setbinddata"."~2.2.1"
+      self.full."lodash.support"."~2.2.1"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "lodash._basecreatecallback" ];
+  };
+  full."lodash._baseisequal"."~2.2.1" = lib.makeOverridable self.buildNodePackage {
+    name = "lodash._baseisequal-2.2.1";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/lodash._baseisequal/-/lodash._baseisequal-2.2.1.tgz";
+        sha1 = "8bd0156ad5c47d927b58d54456329922b24ce0e7";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."lodash._baseisequal"."~2.2.1" or []);
+    deps = [
+      self.full."lodash.forin"."~2.2.1"
+      self.full."lodash._getarray"."~2.2.1"
+      self.full."lodash.isfunction"."~2.2.1"
+      self.full."lodash._objecttypes"."~2.2.1"
+      self.full."lodash._releasearray"."~2.2.1"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "lodash._baseisequal" ];
+  };
+  full."lodash._createbound"."~2.2.1" = lib.makeOverridable self.buildNodePackage {
+    name = "lodash._createbound-2.2.1";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/lodash._createbound/-/lodash._createbound-2.2.1.tgz";
+        sha1 = "27218a40dc73eaf7a1bc90c3f86b0bf79c272ccc";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."lodash._createbound"."~2.2.1" or []);
+    deps = [
+      self.full."lodash._createobject"."~2.2.1"
+      self.full."lodash.isfunction"."~2.2.1"
+      self.full."lodash.isobject"."~2.2.1"
+      self.full."lodash._renative"."~2.2.1"
+      self.full."lodash._setbinddata"."~2.2.1"
+      self.full."lodash.support"."~2.2.1"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "lodash._createbound" ];
+  };
+  full."lodash._createobject"."~2.2.1" = lib.makeOverridable self.buildNodePackage {
+    name = "lodash._createobject-2.2.1";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/lodash._createobject/-/lodash._createobject-2.2.1.tgz";
+        sha1 = "8c38ad5d83de703537c863330b97059417fbfee9";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."lodash._createobject"."~2.2.1" or []);
+    deps = [
+      self.full."lodash.isobject"."~2.2.1"
+      self.full."lodash._noop"."~2.2.1"
+      self.full."lodash._renative"."~2.2.1"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "lodash._createobject" ];
+  };
+  full."lodash._getarray"."~2.2.1" = lib.makeOverridable self.buildNodePackage {
+    name = "lodash._getarray-2.2.1";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/lodash._getarray/-/lodash._getarray-2.2.1.tgz";
+        sha1 = "aa5caa269f1649a186811d5be4a78e56e70e9699";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."lodash._getarray"."~2.2.1" or []);
+    deps = [
+      self.full."lodash._arraypool"."~2.2.1"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "lodash._getarray" ];
+  };
+  full."lodash._maxpoolsize"."~2.2.1" = lib.makeOverridable self.buildNodePackage {
+    name = "lodash._maxpoolsize-2.2.1";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/lodash._maxpoolsize/-/lodash._maxpoolsize-2.2.1.tgz";
+        sha1 = "1e8b6d433271db7c12ec953d49604ea098542fa7";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."lodash._maxpoolsize"."~2.2.1" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "lodash._maxpoolsize" ];
+  };
+  full."lodash._noop"."~2.2.1" = lib.makeOverridable self.buildNodePackage {
+    name = "lodash._noop-2.2.1";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/lodash._noop/-/lodash._noop-2.2.1.tgz";
+        sha1 = "f790734f9f683c9fda8da9f4d8a8000a2201c6e9";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."lodash._noop"."~2.2.1" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "lodash._noop" ];
+  };
+  full."lodash._objecttypes"."~2.2.1" = lib.makeOverridable self.buildNodePackage {
+    name = "lodash._objecttypes-2.2.1";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/lodash._objecttypes/-/lodash._objecttypes-2.2.1.tgz";
+        sha1 = "c72d42a5dec0b55664f82162ed74c5f3f94942ba";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."lodash._objecttypes"."~2.2.1" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "lodash._objecttypes" ];
+  };
+  full."lodash._releasearray"."~2.2.1" = lib.makeOverridable self.buildNodePackage {
+    name = "lodash._releasearray-2.2.1";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/lodash._releasearray/-/lodash._releasearray-2.2.1.tgz";
+        sha1 = "81626c89e26ce2fbc90a11ce8f6ef26ea15c4b28";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."lodash._releasearray"."~2.2.1" or []);
+    deps = [
+      self.full."lodash._arraypool"."~2.2.1"
+      self.full."lodash._maxpoolsize"."~2.2.1"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "lodash._releasearray" ];
+  };
+  full."lodash._renative"."~2.2.1" = lib.makeOverridable self.buildNodePackage {
+    name = "lodash._renative-2.2.1";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/lodash._renative/-/lodash._renative-2.2.1.tgz";
+        sha1 = "ab77d711371ebae8ffdcf5c83b576d558d6bb522";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."lodash._renative"."~2.2.1" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "lodash._renative" ];
+  };
+  full."lodash._setbinddata"."~2.2.1" = lib.makeOverridable self.buildNodePackage {
+    name = "lodash._setbinddata-2.2.1";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/lodash._setbinddata/-/lodash._setbinddata-2.2.1.tgz";
+        sha1 = "df1d5228229c71e28185aae4f828f3b5e78f0904";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."lodash._setbinddata"."~2.2.1" or []);
+    deps = [
+      self.full."lodash._noop"."~2.2.1"
+      self.full."lodash._renative"."~2.2.1"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "lodash._setbinddata" ];
+  };
+  full."lodash._shimkeys"."~2.2.1" = lib.makeOverridable self.buildNodePackage {
+    name = "lodash._shimkeys-2.2.1";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/lodash._shimkeys/-/lodash._shimkeys-2.2.1.tgz";
+        sha1 = "ed4e4b5d61214b2685400b185a59fabf59343455";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."lodash._shimkeys"."~2.2.1" or []);
+    deps = [
+      self.full."lodash._objecttypes"."~2.2.1"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "lodash._shimkeys" ];
+  };
+  full."lodash.bind"."~2.2.1" = lib.makeOverridable self.buildNodePackage {
+    name = "lodash.bind-2.2.1";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/lodash.bind/-/lodash.bind-2.2.1.tgz";
+        sha1 = "4c24fe00b4c6fa277e4058d353edcf399b3755c2";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."lodash.bind"."~2.2.1" or []);
+    deps = [
+      self.full."lodash._createbound"."~2.2.1"
+      self.full."lodash._renative"."~2.2.1"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "lodash.bind" ];
+  };
+  full."lodash.createcallback"."~2.2.1" = lib.makeOverridable self.buildNodePackage {
+    name = "lodash.createcallback-2.2.1";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/lodash.createcallback/-/lodash.createcallback-2.2.1.tgz";
+        sha1 = "bb5291c473202a391c1a495a0806bf4b1d1842d2";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."lodash.createcallback"."~2.2.1" or []);
+    deps = [
+      self.full."lodash._basecreatecallback"."~2.2.1"
+      self.full."lodash._baseisequal"."~2.2.1"
+      self.full."lodash.isobject"."~2.2.1"
+      self.full."lodash.keys"."~2.2.1"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "lodash.createcallback" ];
+  };
+  full."lodash.debounce"."~2.2.0" = lib.makeOverridable self.buildNodePackage {
+    name = "lodash.debounce-2.2.1";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/lodash.debounce/-/lodash.debounce-2.2.1.tgz";
+        sha1 = "46e0ded9b392afa45a8fb54efac564a17fe78be0";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."lodash.debounce"."~2.2.0" or []);
+    deps = [
+      self.full."lodash.isfunction"."~2.2.1"
+      self.full."lodash.isobject"."~2.2.1"
+      self.full."lodash._renative"."~2.2.1"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "lodash.debounce" ];
+  };
+  full."lodash.debounce"."~2.2.1" = lib.makeOverridable self.buildNodePackage {
+    name = "lodash.debounce-2.2.1";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/lodash.debounce/-/lodash.debounce-2.2.1.tgz";
+        sha1 = "46e0ded9b392afa45a8fb54efac564a17fe78be0";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."lodash.debounce"."~2.2.1" or []);
+    deps = [
+      self.full."lodash.isfunction"."~2.2.1"
+      self.full."lodash.isobject"."~2.2.1"
+      self.full."lodash._renative"."~2.2.1"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "lodash.debounce" ];
+  };
+  full."lodash.find"."~2.2.0" = lib.makeOverridable self.buildNodePackage {
+    name = "lodash.find-2.2.1";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/lodash.find/-/lodash.find-2.2.1.tgz";
+        sha1 = "768cc2149a589d2fd7b7203c6abe34bcb724d01a";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."lodash.find"."~2.2.0" or []);
+    deps = [
+      self.full."lodash.createcallback"."~2.2.1"
+      self.full."lodash.forown"."~2.2.1"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "lodash.find" ];
+  };
+  full."lodash.forin"."~2.2.1" = lib.makeOverridable self.buildNodePackage {
+    name = "lodash.forin-2.2.1";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/lodash.forin/-/lodash.forin-2.2.1.tgz";
+        sha1 = "d96a47f547002f322dcdc533b0f9e914cba7d050";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."lodash.forin"."~2.2.1" or []);
+    deps = [
+      self.full."lodash._basecreatecallback"."~2.2.1"
+      self.full."lodash._objecttypes"."~2.2.1"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "lodash.forin" ];
+  };
+  full."lodash.forown"."~2.2.1" = lib.makeOverridable self.buildNodePackage {
+    name = "lodash.forown-2.2.1";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/lodash.forown/-/lodash.forown-2.2.1.tgz";
+        sha1 = "77ee0877c135b603dafe8f2d9ceff215b16458ea";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."lodash.forown"."~2.2.1" or []);
+    deps = [
+      self.full."lodash._basecreatecallback"."~2.2.1"
+      self.full."lodash.keys"."~2.2.1"
+      self.full."lodash._objecttypes"."~2.2.1"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "lodash.forown" ];
+  };
+  full."lodash.identity"."~2.2.1" = lib.makeOverridable self.buildNodePackage {
+    name = "lodash.identity-2.2.1";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/lodash.identity/-/lodash.identity-2.2.1.tgz";
+        sha1 = "63518772143d450a772511f6671e23038c67bcae";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."lodash.identity"."~2.2.1" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "lodash.identity" ];
+  };
+  full."lodash.isfunction"."~2.2.1" = lib.makeOverridable self.buildNodePackage {
+    name = "lodash.isfunction-2.2.1";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/lodash.isfunction/-/lodash.isfunction-2.2.1.tgz";
+        sha1 = "fcfa79b7b2c072b320468ecdc0244bbbac5e49c0";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."lodash.isfunction"."~2.2.1" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "lodash.isfunction" ];
+  };
+  full."lodash.isobject"."~2.2.1" = lib.makeOverridable self.buildNodePackage {
+    name = "lodash.isobject-2.2.1";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/lodash.isobject/-/lodash.isobject-2.2.1.tgz";
+        sha1 = "cbce101e3e3b718cb51b1113e4597d6e8e038831";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."lodash.isobject"."~2.2.1" or []);
+    deps = [
+      self.full."lodash._objecttypes"."~2.2.1"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "lodash.isobject" ];
+  };
+  full."lodash.keys"."~2.2.1" = lib.makeOverridable self.buildNodePackage {
+    name = "lodash.keys-2.2.1";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/lodash.keys/-/lodash.keys-2.2.1.tgz";
+        sha1 = "f372597e6f411d7537e32ba0efc85b5f874d5cca";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."lodash.keys"."~2.2.1" or []);
+    deps = [
+      self.full."lodash.isobject"."~2.2.1"
+      self.full."lodash._renative"."~2.2.1"
+      self.full."lodash._shimkeys"."~2.2.1"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "lodash.keys" ];
+  };
+  full."lodash.support"."~2.2.1" = lib.makeOverridable self.buildNodePackage {
+    name = "lodash.support-2.2.1";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/lodash.support/-/lodash.support-2.2.1.tgz";
+        sha1 = "5b6c267c6fc5302011f0c14e4529c7fbc08e94ce";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."lodash.support"."~2.2.1" or []);
+    deps = [
+      self.full."lodash._renative"."~2.2.1"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "lodash.support" ];
+  };
+  full."lodash.throttle"."~2.2.0" = lib.makeOverridable self.buildNodePackage {
+    name = "lodash.throttle-2.2.1";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/lodash.throttle/-/lodash.throttle-2.2.1.tgz";
+        sha1 = "ae49bd6173b0cfb4e09d9645fdac507db77211f0";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."lodash.throttle"."~2.2.0" or []);
+    deps = [
+      self.full."lodash.debounce"."~2.2.1"
+      self.full."lodash.isfunction"."~2.2.1"
+      self.full."lodash.isobject"."~2.2.1"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "lodash.throttle" ];
+  };
   full."log-driver"."1.2.1" = lib.makeOverridable self.buildNodePackage {
     name = "log-driver-1.2.1";
     src = [
@@ -9914,6 +10519,23 @@
     ];
     passthru.names = [ "over" ];
   };
+  full."owl-deepcopy"."*" = lib.makeOverridable self.buildNodePackage {
+    name = "owl-deepcopy-0.0.2";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/owl-deepcopy/-/owl-deepcopy-0.0.2.tgz";
+        sha1 = "056c40e1af73dff6e2c7afae983d2a7760fdff88";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."owl-deepcopy"."*" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "owl-deepcopy" ];
+  };
+  "owl-deepcopy" = self.full."owl-deepcopy"."*";
   full."owl-deepcopy"."~0.0.1" = lib.makeOverridable self.buildNodePackage {
     name = "owl-deepcopy-0.0.2";
     src = [
@@ -12393,11 +13015,11 @@
     passthru.names = [ "slide" ];
   };
   full."smartdc"."*" = lib.makeOverridable self.buildNodePackage {
-    name = "smartdc-7.1.0";
+    name = "smartdc-7.1.1";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/smartdc/-/smartdc-7.1.0.tgz";
-        sha1 = "8c6e5ac34501d6997dcf0e1c49aff4655053ad0f";
+        url = "http://registry.npmjs.org/smartdc/-/smartdc-7.1.1.tgz";
+        sha1 = "acc4378e0967b43dd8ded8c67f99e6508277bfb9";
       })
     ];
     buildInputs =
@@ -12409,23 +13031,23 @@
       self.full."restify"."2.4.1"
       self.full."bunyan"."0.21.1"
       self.full."clone"."0.1.6"
-      self.full."smartdc-auth"."1.0.0"
+      self.full."smartdc-auth"."1.0.1"
     ];
     peerDependencies = [
     ];
     passthru.names = [ "smartdc" ];
   };
   "smartdc" = self.full."smartdc"."*";
-  full."smartdc-auth"."1.0.0" = lib.makeOverridable self.buildNodePackage {
-    name = "smartdc-auth-1.0.0";
+  full."smartdc-auth"."1.0.1" = lib.makeOverridable self.buildNodePackage {
+    name = "smartdc-auth-1.0.1";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/smartdc-auth/-/smartdc-auth-1.0.0.tgz";
-        sha1 = "9b8569b914f25da53816fe158f80b6571470f270";
+        url = "http://registry.npmjs.org/smartdc-auth/-/smartdc-auth-1.0.1.tgz";
+        sha1 = "520bbf918313bdf2da372927d33756d46356b87b";
       })
     ];
     buildInputs =
-      (self.nativeDeps."smartdc-auth"."1.0.0" or []);
+      (self.nativeDeps."smartdc-auth"."1.0.1" or []);
     deps = [
       self.full."assert-plus"."0.1.2"
       self.full."clone"."0.1.5"
@@ -13121,6 +13743,23 @@
     ];
     passthru.names = [ "tar" ];
   };
+  full."taskgroup"."~3.2.0" = lib.makeOverridable self.buildNodePackage {
+    name = "taskgroup-3.2.3";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/taskgroup/-/taskgroup-3.2.3.tgz";
+        sha1 = "5bbfa9fb0312f04251140f2f858f8f4ee0086958";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."taskgroup"."~3.2.0" or []);
+    deps = [
+      self.full."ambi"."~2.1.4"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "taskgroup" ];
+  };
   full."temp"."*" = lib.makeOverridable self.buildNodePackage {
     name = "temp-0.6.0";
     src = [
@@ -13354,6 +13993,38 @@
     ];
     passthru.names = [ "type-detect" ];
   };
+  full."typechecker"."~2.0.1" = lib.makeOverridable self.buildNodePackage {
+    name = "typechecker-2.0.6";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/typechecker/-/typechecker-2.0.6.tgz";
+        sha1 = "f9dc9a161d05957c5e8225b7470261e16a8409cb";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."typechecker"."~2.0.1" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "typechecker" ];
+  };
+  full."typechecker"."~2.0.6" = lib.makeOverridable self.buildNodePackage {
+    name = "typechecker-2.0.6";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/typechecker/-/typechecker-2.0.6.tgz";
+        sha1 = "f9dc9a161d05957c5e8225b7470261e16a8409cb";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."typechecker"."~2.0.6" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "typechecker" ];
+  };
   full."uglify-js"."1.2.5" = lib.makeOverridable self.buildNodePackage {
     name = "uglify-js-1.2.5";
     src = [
@@ -13512,22 +14183,6 @@
     passthru.names = [ "underscore" ];
   };
   "underscore" = self.full."underscore"."*";
-  full."underscore"."1.4.4" = lib.makeOverridable self.buildNodePackage {
-    name = "underscore-1.4.4";
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/underscore/-/underscore-1.4.4.tgz";
-        sha1 = "61a6a32010622afa07963bf325203cf12239d604";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."underscore"."1.4.4" or []);
-    deps = [
-    ];
-    peerDependencies = [
-    ];
-    passthru.names = [ "underscore" ];
-  };
   full."underscore"."1.4.x" = lib.makeOverridable self.buildNodePackage {
     name = "underscore-1.4.4";
     src = [
@@ -13673,11 +14328,11 @@
     passthru.names = [ "underscore.string" ];
   };
   full."ungit"."*" = lib.makeOverridable self.buildNodePackage {
-    name = "ungit-0.2.1";
+    name = "ungit-0.3.1";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/ungit/-/ungit-0.2.1.tgz";
-        sha1 = "1aa4af1cbe881e6200fbd1726fc66341c3595f01";
+        url = "http://registry.npmjs.org/ungit/-/ungit-0.3.1.tgz";
+        sha1 = "9541d6ba8545ea4a914cf05a413890da61bdd7ff";
       })
     ];
     buildInputs =
@@ -13685,7 +14340,9 @@
     deps = [
       self.full."express"."3.2.6"
       self.full."superagent"."0.14.7"
-      self.full."underscore"."1.4.4"
+      self.full."lodash.debounce"."~2.2.0"
+      self.full."lodash.find"."~2.2.0"
+      self.full."lodash.throttle"."~2.2.0"
       self.full."temp"."0.6.0"
       self.full."socket.io"."0.9.16"
       self.full."moment"."2.0.0"
@@ -13707,6 +14364,8 @@
       self.full."blueimp-md5"."~1.0.3"
       self.full."color"."~0.4.4"
       self.full."keen.io"."0.0.3"
+      self.full."getmac"."~1.0.5"
+      self.full."deep-extend"."~0.2.6"
     ];
     peerDependencies = [
     ];
diff --git a/pkgs/top-level/node-packages.json b/pkgs/top-level/node-packages.json
index dd4bec4bc88..3e16f4e3df4 100644
--- a/pkgs/top-level/node-packages.json
+++ b/pkgs/top-level/node-packages.json
@@ -105,4 +105,5 @@
 , "connect-jade-static"
 , "plist-native"
 , "x509"
+, "owl-deepcopy"
 ]
-- 
GitLab


From 05d2d19311edb490929dddd3629fe0d44953eea5 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 9 Oct 2013 19:11:47 +0200
Subject: [PATCH 5050/5331] Load LUKS-related kernel modules on demand

---
 modules/system/boot/luksroot.nix | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/modules/system/boot/luksroot.nix b/modules/system/boot/luksroot.nix
index b9c44ae7078..29f5eb4fd77 100644
--- a/modules/system/boot/luksroot.nix
+++ b/modules/system/boot/luksroot.nix
@@ -63,8 +63,9 @@ in
 
     boot.initrd.luks.cryptoModules = mkOption {
       default =
-        [ "aes" "aes_generic" "aes_x86_64" "aes_i586" "blowfish" "twofish"
-          "serpent" "cbc" "xts" "lrw" "sha256" "sha1" "sha2"
+        [ "aes" "aes_generic" "blowfish" "twofish"
+          "serpent" "cbc" "xts" "lrw" "sha1" "sha256" "sha512"
+          (if pkgs.stdenv.system == "x86_64-linux" then "aes_x86_64" else "aes_i586")
         ];
       description = ''
         A list of cryptographic kernel modules needed to decrypt the root device(s).
@@ -151,7 +152,7 @@ in
       ["firewire_ohci" "firewire_core" "firewire_sbp2"];
 
     # Some modules that may be needed for mounting anything ciphered
-    boot.initrd.kernelModules = [ "dm_mod" "dm_crypt" "cryptd" ] ++ luks.cryptoModules;
+    boot.initrd.availableKernelModules = [ "dm_mod" "dm_crypt" "cryptd" ] ++ luks.cryptoModules;
 
     # copy the cryptsetup binary and it's dependencies
     boot.initrd.extraUtilsCommands = ''
-- 
GitLab


From 08f8d9507a8ae6958543929965f928164ad789b7 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 9 Oct 2013 19:11:58 +0200
Subject: [PATCH 5051/5331] Load ext2/ext3/ext on demand in the initrd

---
 modules/tasks/filesystems/ext.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/tasks/filesystems/ext.nix b/modules/tasks/filesystems/ext.nix
index 93cdef4c664..24592e9d588 100644
--- a/modules/tasks/filesystems/ext.nix
+++ b/modules/tasks/filesystems/ext.nix
@@ -5,7 +5,7 @@
 
     system.fsPackages = [ pkgs.e2fsprogs ];
 
-    boot.initrd.kernelModules = [ "ext2" "ext3" "ext4" ];
+    boot.initrd.availableKernelModules = [ "ext2" "ext3" "ext4" ];
 
     boot.initrd.extraUtilsCommands =
       ''
-- 
GitLab


From e5bcb378fae0e38379b0b365ab2a2431ae5d6c07 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 9 Oct 2013 19:13:26 +0200
Subject: [PATCH 5052/5331] Add support for multiple system profiles
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

‘nixos-rebuild’ now accepts an argument ‘--profile-name’ (or ‘-p’),
denoting the name of a system profile to use.  The default is
‘system’, which maps to /nix/var/nix/profiles/system.  Any other value
maps to /nix/var/nix/profiles/system-profiles/<name>.  The GRUB menu
generator makes all system profiles available as submenus.  For
instance, doing

  $ nixos-rebuild boot -p test

will cause a menu named ‘NixOS - Profile 'test'’ to be added to the
GRUB boot menu, leaving the default system profile unaffected.

This is only supported for GRUB 2.
---
 modules/installer/tools/nixos-rebuild.sh      | 30 +++++++----
 .../system/boot/loader/grub/install-grub.pl   | 53 ++++++++++++-------
 2 files changed, 55 insertions(+), 28 deletions(-)

diff --git a/modules/installer/tools/nixos-rebuild.sh b/modules/installer/tools/nixos-rebuild.sh
index 8597cf165b1..8734cb273d4 100644
--- a/modules/installer/tools/nixos-rebuild.sh
+++ b/modules/installer/tools/nixos-rebuild.sh
@@ -24,10 +24,10 @@ Options:
   --upgrade              fetch the latest version of NixOS before rebuilding
   --install-grub         (re-)install the Grub bootloader
   --no-build-nix         don't build the latest Nix from Nixpkgs before
-                         building NixOS
+                           building NixOS
   --rollback             restore the previous NixOS configuration (only
-                         with switch, boot, test, build)
-
+                           with switch, boot, test, build)
+  --profile-name / -p    install in the specified system profile
   --fast                 same as --no-build-nix --show-trace
 
 Various nix-build options are also accepted, in particular:
@@ -50,6 +50,7 @@ buildNix=1
 rollback=
 upgrade=
 repair=
+profile=/nix/var/nix/profiles/system
 
 while [ "$#" -gt 0 ]; do
     i="$1"; shift 1
@@ -92,6 +93,17 @@ while [ "$#" -gt 0 ]; do
         buildNix=
         extraBuildFlags+=(--show-trace)
         ;;
+      --profile-name|-p)
+        if [ -z "$1" ]; then
+            echo "$0: ‘--profile-name’ requires an argument"
+            exit 1
+        fi
+        if [ "$1" != system ]; then
+            profile="/nix/var/nix/profiles/system-profiles/$1"
+            mkdir -p -m 0755 "$(dirname "$profile")"
+        fi
+        shift 1
+        ;;
       *)
         echo "$0: unknown option \`$i'"
         exit 1
@@ -164,8 +176,8 @@ fi
 if [ -z "$rollback" ]; then
     echo "building the system configuration..." >&2
     if [ "$action" = switch -o "$action" = boot ]; then
-        nix-env "${extraBuildFlags[@]}" -p /nix/var/nix/profiles/system -f '<nixos>' --set -A system
-        pathToConfig=/nix/var/nix/profiles/system
+        nix-env "${extraBuildFlags[@]}" -p "$profile" -f '<nixos>' --set -A system
+        pathToConfig="$profile"
     elif [ "$action" = test -o "$action" = build -o "$action" = dry-run ]; then
         nix-build '<nixos>' -A system -K -k "${extraBuildFlags[@]}" > /dev/null
         pathToConfig=./result
@@ -180,14 +192,14 @@ if [ -z "$rollback" ]; then
     fi
 else # [ -n "$rollback" ]
     if [ "$action" = switch -o "$action" = boot ]; then
-        nix-env --rollback -p /nix/var/nix/profiles/system
-        pathToConfig=/nix/var/nix/profiles/system
+        nix-env --rollback -p "$profile"
+        pathToConfig="$profile"
     elif [ "$action" = test -o "$action" = build ]; then
         systemNumber=$(
-            nix-env -p /nix/var/nix/profiles/system --list-generations |
+            nix-env -p "$profile" --list-generations |
             sed -n '/current/ {g; p;}; s/ *\([0-9]*\).*/\1/; h'
         )
-        ln -sT /nix/var/nix/profiles/system-${systemNumber}-link ./result
+        ln -sT "$profile"-${systemNumber}-link ./result
         pathToConfig=./result
     else
         showSyntax
diff --git a/modules/system/boot/loader/grub/install-grub.pl b/modules/system/boot/loader/grub/install-grub.pl
index 738714ba714..a83733db63b 100644
--- a/modules/system/boot/loader/grub/install-grub.pl
+++ b/modules/system/boot/loader/grub/install-grub.pl
@@ -193,27 +193,42 @@ $conf .= "$extraEntries\n" unless $extraEntriesBeforeNixOS;
 # extraEntries could refer to @bootRoot@, which we have to substitute
 $conf =~ s/\@bootRoot\@/$bootRoot/g;
 
-# Add entries for all previous generations of the system profile.
-$conf .= "submenu \"NixOS - All configurations\" {\n" if $grubVersion == 2;
-
-sub nrFromGen { my ($x) = @_; $x =~ /system-(.*)-link/; return $1; }
-
-my @links = sort
-    { nrFromGen($b) <=> nrFromGen($a) }
-    (glob "/nix/var/nix/profiles/system-*-link");
-
-my $curEntry = 0;
-foreach my $link (@links) {
-    last if $curEntry++ >= $configurationLimit;
-    my $date = strftime("%F", localtime(lstat($link)->mtime));
-    my $version =
-        -e "$link/nixos-version"
-        ? readFile("$link/nixos-version")
-        : basename((glob(dirname(Cwd::abs_path("$link/kernel")) . "/lib/modules/*"))[0]);
-    addEntry("NixOS - Configuration " . nrFromGen($link) . " ($date - $version)", $link);
+# Emit submenus for all system profiles.
+sub addProfile {
+    my ($profile, $description) = @_;
+
+    # Add entries for all generations of this profile.
+    $conf .= "submenu \"$description\" {\n" if $grubVersion == 2;
+
+    sub nrFromGen { my ($x) = @_; $x =~ /\/\w+-(\d+)-link/; return $1; }
+
+    my @links = sort
+        { nrFromGen($b) <=> nrFromGen($a) }
+        (glob "$profile-*-link");
+
+    my $curEntry = 0;
+    foreach my $link (@links) {
+        last if $curEntry++ >= $configurationLimit;
+        my $date = strftime("%F", localtime(lstat($link)->mtime));
+        my $version =
+            -e "$link/nixos-version"
+            ? readFile("$link/nixos-version")
+            : basename((glob(dirname(Cwd::abs_path("$link/kernel")) . "/lib/modules/*"))[0]);
+        addEntry("NixOS - Configuration " . nrFromGen($link) . " ($date - $version)", $link);
+    }
+
+    $conf .= "}\n" if $grubVersion == 2;
 }
 
-$conf .= "}\n" if $grubVersion == 2;
+addProfile "/nix/var/nix/profiles/system", "NixOS - All configurations";
+
+if ($grubVersion == 2) {
+    for my $profile (glob "/nix/var/nix/profiles/system-profiles/*") {
+        my $name = basename($profile);
+        next unless $name =~ /^\w+$/;
+        addProfile $profile, "NixOS - Profile '$name'";
+    }
+}
 
 # Run extraPrepareConfig in sh
 if ($extraPrepareConfig ne "") {
-- 
GitLab


From 596a7cbb6d760d2ea1850d903f85011b61039332 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 9 Oct 2013 19:33:12 +0200
Subject: [PATCH 5053/5331] Improve the vboxnet0 service

---
 modules/programs/virtualbox.nix | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/modules/programs/virtualbox.nix b/modules/programs/virtualbox.nix
index 2a2ca745e2f..340fec0496a 100644
--- a/modules/programs/virtualbox.nix
+++ b/modules/programs/virtualbox.nix
@@ -23,13 +23,15 @@ let virtualbox = config.boot.kernelPackages.virtualbox; in
 
   # Since we lack the right setuid binaries, set up a host-only network by default.
 
-  jobs."vboxnet0" =
+  systemd.services."vboxnet0" =
     { description = "VirtualBox vboxnet0 Interface";
       requires = [ "dev-vboxnetctl.device" ];
       after = [ "dev-vboxnetctl.device" ];
       wantedBy = [ "network.target" "sys-subsystem-net-devices-vboxnet0.device" ];
       path = [ virtualbox ];
-      preStart =
+      serviceConfig.RemainAfterExit = true;
+      serviceConfig.Type = "oneshot";
+      script =
         ''
           if ! [ -e /sys/class/net/vboxnet0 ]; then
             VBoxManage hostonlyif create
-- 
GitLab


From f7a1c8c2f52970989ac70bcd520d502b981da021 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Wed, 9 Oct 2013 14:01:36 -0400
Subject: [PATCH 5054/5331] s/gnu_efi/gnu-efi

Signed-off-by: Shea Levy <shea@shealevy.com>
---
 pkgs/tools/misc/refind/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/misc/refind/default.nix b/pkgs/tools/misc/refind/default.nix
index 1fbb177afa0..6f4e031e441 100644
--- a/pkgs/tools/misc/refind/default.nix
+++ b/pkgs/tools/misc/refind/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, gnu_efi, unzip }:
+{ stdenv, fetchurl, gnu-efi, unzip }:
 
 let version = "0.4.5"; in
 
@@ -12,7 +12,7 @@ stdenv.mkDerivation {
 
   buildInputs = [ unzip ];
 
-  buildFlags = [ "prefix=" "EFIINC=${gnu_efi}/include/efi" "GNUEFILIB=${gnu_efi}/lib" "EFILIB=${gnu_efi}/lib" "EFICRT0=${gnu_efi}/lib" "LOCAL_CFLAGS=-I${gnu_efi}/include" ];
+  buildFlags = [ "prefix=" "EFIINC=${gnu-efi}/include/efi" "GNUEFILIB=${gnu-efi}/lib" "EFILIB=${gnu-efi}/lib" "EFICRT0=${gnu-efi}/lib" "LOCAL_CFLAGS=-I${gnu-efi}/include" ];
 
   installPhase = ''
     mkdir -pv $out
-- 
GitLab


From 7f5e4f5eb80f31cc7e1885002e271b0c08fad915 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Wed, 9 Oct 2013 11:44:50 -0400
Subject: [PATCH 5055/5331] Update efi install cd

Signed-off-by: Shea Levy <shea@shealevy.com>
---
 .../installer/cd-dvd/installation-cd-efi.nix  | 15 +++-------
 modules/installer/cd-dvd/iso-image.nix        | 28 +++++++++----------
 2 files changed, 17 insertions(+), 26 deletions(-)

diff --git a/modules/installer/cd-dvd/installation-cd-efi.nix b/modules/installer/cd-dvd/installation-cd-efi.nix
index 4c15fc76584..4aa788feeae 100644
--- a/modules/installer/cd-dvd/installation-cd-efi.nix
+++ b/modules/installer/cd-dvd/installation-cd-efi.nix
@@ -1,21 +1,14 @@
 { config, pkgs, ... }:
 
 {
-  imports = [ ./installation-cd-minimal.nix ];
+  # Move into base image once using 3.10 or later
 
-  boot.kernelPackages = pkgs.linuxPackages_3_9;
-  boot.vesa = false;
+  require = [ ./installation-cd-minimal.nix ];
 
-  # What follows should probably move into base once the base kernel has the
-  # efi boot stub
+  boot.kernelPackages = pkgs.linuxPackages_3_10;
 
   # Get a console as soon as the initrd loads fbcon on EFI boot
-  # Enable reading EFI variables via sysfs
-  # !!! Needing efivars will only be necessary until http://article.gmane.org/gmane.linux.kernel.efi/773 is merged
-  boot.initrd.kernelModules = [ "fbcon" "efivars" ];
-
-  # efi-related tools
-  environment.systemPackages = [ pkgs.efibootmgr ];
+  boot.initrd.kernelModules = [ "fbcon" ];
 
   isoImage.makeEfiBootable = true;
 }
diff --git a/modules/installer/cd-dvd/iso-image.nix b/modules/installer/cd-dvd/iso-image.nix
index 9e4352e48bb..de9728d677c 100644
--- a/modules/installer/cd-dvd/iso-image.nix
+++ b/modules/installer/cd-dvd/iso-image.nix
@@ -44,31 +44,31 @@ let
 
 
   # The efi boot image
-  efiImg = pkgs.runCommand "efi-image_eltorito" {}
+  efiImg = pkgs.runCommand "efi-image_eltorito" { buildInputs = [ pkgs.mtools ]; }
     ''
       #Let's hope 10M is enough
       dd bs=2048 count=5120 if=/dev/zero of="$out"
       ${pkgs.dosfstools}/sbin/mkfs.vfat "$out"
-      ${pkgs.mtools}/bin/mmd -i "$out" efi
-      ${pkgs.mtools}/bin/mmd -i "$out" efi/boot
-      ${pkgs.mtools}/bin/mmd -i "$out" efi/nixos
-      ${pkgs.mtools}/bin/mmd -i "$out" loader
-      ${pkgs.mtools}/bin/mmd -i "$out" loader/entries
-      ${pkgs.mtools}/bin/mcopy -v -i "$out" \
+      mmd -i "$out" efi
+      mmd -i "$out" efi/boot
+      mmd -i "$out" efi/nixos
+      mmd -i "$out" loader
+      mmd -i "$out" loader/entries
+      mcopy -v -i "$out" \
         ${pkgs.gummiboot}/lib/gummiboot/gummiboot${targetArch}.efi \
         ::efi/boot/boot${targetArch}.efi
-      ${pkgs.mtools}/bin/mcopy -v -i "$out" \
-        ${config.boot.kernelPackages.kernel + "/bzImage"} ::bzImage
-      ${pkgs.mtools}/bin/mcopy -v -i "$out" \
-        ${config.system.build.initialRamdisk + "/initrd"} ::efi/nixos/initrd
+      mcopy -v -i "$out" \
+        ${config.boot.kernelPackages.kernel}/bzImage ::bzImage
+      mcopy -v -i "$out" \
+        ${config.system.build.initialRamdisk}/initrd ::efi/nixos/initrd
       echo "title NixOS LiveCD" > boot-params
       echo "linux /bzImage" >> boot-params
       echo "initrd /efi/nixos/initrd" >> boot-params
       echo "options init=${config.system.build.toplevel}/init ${toString config.boot.kernelParams}" >> boot-params
-      ${pkgs.mtools}/bin/mcopy -v -i "$out" boot-params ::loader/entries/nixos-livecd.conf
+      mcopy -v -i "$out" boot-params ::loader/entries/nixos-livecd.conf
       echo "default nixos-livecd" > boot-params
       echo "timeout 5" >> boot-params
-      ${pkgs.mtools}/bin/mcopy -v -i "$out" boot-params ::loader/loader.conf
+      mcopy -v -i "$out" boot-params ::loader/loader.conf
     '';
 
   targetArch = if pkgs.stdenv.isi686 then
@@ -194,8 +194,6 @@ in
 
     boot.initrd.kernelModules = [ "loop" ];
 
-    boot.kernelModules = optional config.isoImage.makeEfiBootable "efivars";
-
     # In stage 1, mount a tmpfs on top of / (the ISO image) and
     # /nix/store (the squashfs image) to make this a live CD.
     boot.initrd.postMountCommands =
-- 
GitLab


From 9a008dc4fd370a57f1815587172bfb15a6b0288c Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Wed, 9 Oct 2013 14:54:09 -0400
Subject: [PATCH 5056/5331] Add test for efi installation

Signed-off-by: Shea Levy <shea@shealevy.com>
---
 tests/default.nix       |   1 +
 tests/efi-installer.nix | 131 ++++++++++++++++++++++++++++++++++++++++
 2 files changed, 132 insertions(+)
 create mode 100644 tests/efi-installer.nix

diff --git a/tests/default.nix b/tests/default.nix
index 1a50d8e7e67..17fe6a6d045 100644
--- a/tests/default.nix
+++ b/tests/default.nix
@@ -11,6 +11,7 @@ with import ../lib/testing.nix { inherit system minimal; };
   firefox = makeTest (import ./firefox.nix);
   firewall = makeTest (import ./firewall.nix);
   installer = makeTests (import ./installer.nix);
+  efi-installer = makeTests (import ./efi-installer.nix);
   ipv6 = makeTest (import ./ipv6.nix);
   kde4 = makeTest (import ./kde4.nix);
   #kexec = makeTest (import ./kexec.nix);
diff --git a/tests/efi-installer.nix b/tests/efi-installer.nix
new file mode 100644
index 00000000000..a9c5d719030
--- /dev/null
+++ b/tests/efi-installer.nix
@@ -0,0 +1,131 @@
+# !!! Merge into normal install tests once all livecds are EFIable
+{ pkgs, system, ... }:
+
+with pkgs.lib;
+with import ../lib/qemu-flags.nix;
+
+let
+
+  # Build the ISO.  This is the regular installation CD but with test
+  # instrumentation.
+  iso =
+    (import ../lib/eval-config.nix {
+      inherit system;
+      modules =
+        [ ../modules/installer/cd-dvd/installation-cd-efi.nix
+          ../modules/testing/test-instrumentation.nix
+          { key = "serial";
+
+            # The test cannot access the network, so any sources we
+            # need must be included in the ISO.
+            isoImage.storeContents =
+              [ pkgs.glibcLocales
+                pkgs.sudo
+                pkgs.docbook5
+                pkgs.docbook5_xsl
+                pkgs.grub
+                pkgs.perlPackages.XMLLibXML
+                pkgs.unionfs-fuse
+                pkgs.gummiboot
+                pkgs.libxslt
+              ];
+          }
+        ];
+    }).config.system.build.isoImage;
+
+
+  # The config to install
+  config = builtins.toFile "configuration.nix" ''
+    { pkgs, ... }: {
+      imports = [ ./hardware.nix <nixos/modules/testing/test-instrumentation.nix> ];
+      boot.kernelPackages = pkgs.linuxPackages_3_10;
+      boot.loader.grub.enable = false;
+      boot.loader.efi.canTouchEfiVariables = true;
+      boot.loader.gummiboot.enable = true;
+      fonts.enableFontConfig = false;
+      fileSystems."/".label = "nixos";
+    }
+  '';
+
+  biosDir = pkgs.runCommand "ovmf-bios" {} ''
+    mkdir $out
+    ln -s ${pkgs.OVMF}/FV/OVMF.fd $out/bios.bin
+  '';
+
+in {
+  simple = {
+    inherit iso;
+    nodes = {};
+    testScript = ''
+      createDisk("harddisk", 4 * 1024);
+
+      my $machine = createMachine({ hda => "harddisk",
+        hdaInterface => "virtio",
+        cdrom => glob("${iso}/iso/*.iso"),
+        qemuFlags => '-L ${biosDir} ${optionalString (pkgs.stdenv.system == "x86_64-linux") "-cpu kvm64"}'});
+      $machine->start;
+
+      # Make sure that we get a login prompt etc.
+      $machine->succeed("echo hello");
+      $machine->waitForUnit("rogue");
+      $machine->waitForUnit("nixos-manual");
+      $machine->waitForUnit("dhcpcd");
+
+      # Partition the disk.
+      $machine->succeed(
+          "sgdisk -Z /dev/vda",
+          "sgdisk -n 1:0:+256M -N 2 -t 1:ef00 -t 2:8300 -c 1:boot -c 2:root /dev/vda",
+          "mkfs.vfat -n BOOT /dev/vda1",
+          "mkfs.ext3 -L nixos /dev/vda2",
+          "mount LABEL=nixos /mnt",
+          "mkdir /mnt/boot",
+          "mount LABEL=BOOT /mnt/boot",
+      );
+
+      # Create the NixOS configuration.
+      $machine->succeed(
+          "mkdir -p /mnt/etc/nixos",
+          "nixos-hardware-scan > /mnt/etc/nixos/hardware.nix",
+      );
+
+      my $cfg = $machine->succeed("cat /mnt/etc/nixos/hardware.nix");
+      print STDERR "Result of the hardware scan:\n$cfg\n";
+
+      $machine->copyFileFromHost(
+          "${config}",
+          "/mnt/etc/nixos/configuration.nix");
+
+      # Perform the installation.
+      $machine->succeed("nixos-install >&2");
+
+      # Do it again to make sure it's idempotent.
+      $machine->succeed("nixos-install >&2");
+
+      $machine->shutdown;
+
+      # Now see if we can boot the installation.
+      my $machine = createMachine({ #hda => "harddisk",
+#       hdaInterface => "virtio",
+#       !!! OVMF doesn't boot from virtio http://www.mail-archive.com/edk2-devel@lists.sourceforge.net/msg01501.html
+        qemuFlags => '-L ${biosDir} ${optionalString (pkgs.stdenv.system == "x86_64-linux") "-cpu kvm64"} -m 512 -hda ' . Cwd::abs_path('harddisk')});
+
+      # Did /boot get mounted, if appropriate?
+      $machine->waitForUnit("local-fs.target");
+      $machine->succeed("test -e /boot/efi");
+
+      $machine->succeed("nix-env -i coreutils >&2");
+      $machine->succeed("type -tP ls | tee /dev/stderr") =~ /.nix-profile/
+          or die "nix-env failed";
+
+      $machine->succeed("nixos-rebuild switch >&2");
+
+      $machine->shutdown;
+
+      my $machine = createMachine({ #hda => "harddisk",
+#       hdaInterface => "virtio",
+        qemuFlags => '-L ${biosDir} ${optionalString (pkgs.stdenv.system == "x86_64-linux") "-cpu kvm64"} -hda ' . Cwd::abs_path('harddisk')});
+      $machine->waitForUnit("network.target");
+      $machine->shutdown;
+    '';
+  };
+}
-- 
GitLab


From 32ebe90fa1deb61be1193bc5ad4b23805d2743e6 Mon Sep 17 00:00:00 2001
From: Karn Kallio <tierpluspluslists@gmail.com>
Date: Wed, 9 Oct 2013 21:23:37 +0200
Subject: [PATCH 5057/5331] pure: fix build with llvm 3.3

---
 .../development/interpreters/pure/default.nix | 14 ++---
 .../interpreters/pure/new-gcc.patch           | 62 -------------------
 2 files changed, 7 insertions(+), 69 deletions(-)
 delete mode 100644 pkgs/development/interpreters/pure/new-gcc.patch

diff --git a/pkgs/development/interpreters/pure/default.nix b/pkgs/development/interpreters/pure/default.nix
index 83a1c0ac500..84ae789150d 100644
--- a/pkgs/development/interpreters/pure/default.nix
+++ b/pkgs/development/interpreters/pure/default.nix
@@ -1,5 +1,5 @@
 x@{builderDefsPackage
-  , llvm, gmp, mpfr, readline, bison, flex
+  , llvm, gmp, mpfr, readline, bison, flex, makeWrapper
   , ...}:
 builderDefsPackage
 (a :  
@@ -12,11 +12,11 @@ let
   sourceInfo = rec {
     baseName="pure";
     project="pure-lang";
-    version="0.56";
+    version="0.58";
     name="${baseName}-${version}";
     extension="tar.gz";
-    url="http://${project}.googlecode.com/files/${name}.${extension}";
-    hash="1ll29j31lp7ymp1kq57328q8md7pkp8jmwsadp67j4cdlzc3zdhj";
+    url="https://bitbucket.org/purelang/${project}/downloads/${name}.${extension}";
+    hash="180ygv8nmfy8v4696km8jdahn5cnr454sc8i1av7s6z4ss7mrxmi";
   };
 in
 rec {
@@ -29,9 +29,9 @@ rec {
   inherit buildInputs;
 
   /* doConfigure should be removed if not needed */
-  phaseNames = ["doPatch" "doConfigure" "doMakeInstall"];
+  phaseNames = ["doConfigure" "doMakeInstall" "doWrap"];
 
-  patches = [ ./new-gcc.patch ];
+  doWrap = a.makeManyWrappers ''$out/bin/pure'' ''--prefix LD_LIBRARY_PATH : "${llvm}/lib"'';
 
   meta = {
     description = "A purely functional programming language based on term rewriting";
@@ -45,7 +45,7 @@ rec {
   };
   passthru = {
     updateInfo = {
-      downloadPage = "http://code.google.com/p/pure-lang/downloads/list";
+      downloadPage = "https://bitbucket.org/purelang/pure-lang/downloads";
     };
   };
 }) x
diff --git a/pkgs/development/interpreters/pure/new-gcc.patch b/pkgs/development/interpreters/pure/new-gcc.patch
deleted file mode 100644
index ea2cd845059..00000000000
--- a/pkgs/development/interpreters/pure/new-gcc.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-diff --git a/runtime.cc b/runtime.cc
-index 04cbc40..54a0b43 100644
---- a/runtime.cc
-+++ b/runtime.cc
-@@ -13121,39 +13121,6 @@ unsigned int sleep(unsigned int secs)
- }
- #endif
- 
--/* Horrible kludge to get round, trunc and the inverse hyperbolic functions
--   from libmingwex.a (these are in C99, but not in the Windows system
--   libraries, and LLVM doesn't know how to get them either). */
--
--extern "C"
--double __round(double x)
--{
--  return round(x);
--}
--
--extern "C"
--double __trunc(double x)
--{
--  return trunc(x);
--}
--
--extern "C"
--double __asinh(double x)
--{
--  return asinh(x);
--}
--
--extern "C"
--double __acosh(double x)
--{
--  return acosh(x);
--}
--
--extern "C"
--double __atanh(double x)
--{
--  return atanh(x);
--}
- 
- /* File type bits. */
- 
-diff --git a/util.hh b/util.hh
-index ae95b79..eab3330 100644
---- a/util.hh
-+++ b/util.hh
-@@ -58,13 +58,6 @@ char *default_encoding();
- double my_strtod(const char  *nptr, char **endptr);
- char *my_formatd(char *buffer, const char  *format, double d);
- 
--/* Windows doesn't have strptime, so we provide a suitable replacement from
--   GNU libc (see strptime.c). */
--
--#ifndef HAVE_STRPTIME
--extern "C"
--char *strptime(const char *s, const char *format, struct tm *tm);
--#endif
- 
- /* Windows doesn't have mkstemp, so we provide a suitable replacement. */
- 
-- 
GitLab


From 6070bc016bd2fd945b04347e25cfd3738622d2ac Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Wed, 9 Oct 2013 15:34:27 -0400
Subject: [PATCH 5058/5331] nixos-option --install: Use gummiboot if we're
 efi-booted

Signed-off-by: Shea Levy <shea@shealevy.com>
---
 modules/installer/tools/nixos-option.sh | 28 +++++++++++++++++++------
 1 file changed, 22 insertions(+), 6 deletions(-)

diff --git a/modules/installer/tools/nixos-option.sh b/modules/installer/tools/nixos-option.sh
index a542601e57d..7f008d62c24 100644
--- a/modules/installer/tools/nixos-option.sh
+++ b/modules/installer/tools/nixos-option.sh
@@ -203,6 +203,26 @@ if $generate; then
     exit 1
   fi
 
+  nl="
+"
+  if test -e /sys/firmware/efi/efivars; then
+    l1="  # Use the gummiboot efi boot loader."
+    l2="  boot.loader.grub.enable = false;"
+    l3="  boot.loader.gummiboot.enable = true;"
+    l4="  boot.loader.efi.canTouchEfiVariables = true;"
+    # !!! Remove me when nixos is on 3.10 or greater by default
+    l5="  # EFI booting requires kernel >= 3.10"
+    l6="  boot.kernelPackages = pkgs.linuxPackages_3_10;"
+    bootloader_config="$l1$nl$l2$nl$l3$nl$l4$nl$nl$l5$nl$l6"
+  else
+    l1="  # Use the Grub2 boot loader."
+    l2="  boot.loader.grub.enable = true;"
+    l3="  boot.loader.grub.version = 2;"
+    l4="  # Define on which hard drive you want to install Grub."
+    l5='  # boot.loader.grub.device = "/dev/sda";'
+    bootloader_config="$l1$nl$l2$nl$l3$nl$nl$l4$nl$l5"
+  fi
+
   echo "Generating a basic configuration file in $NIXOS_CONFIG..."
 
   # Generate a template configuration file where the user has to
@@ -224,14 +244,10 @@ if $generate; then
     [ # Specify all kernel modules that are necessary for mounting the root
       # filesystem.
       # "xfs" "ata_piix"
+      # fbcon # Uncomment this when EFI booting to see the console before the root partition is mounted
     ];
     
-  # Use the GRUB 2 boot loader.
-  boot.loader.grub.enable = true;
-  boot.loader.grub.version = 2;
-
-  # Define on which hard drive you want to install Grub.
-  # boot.loader.grub.device = "/dev/sda";
+$bootloader_config
 
   # networking.hostName = "nixos"; # Define your hostname.
   # networking.wireless.enable = true;  # Enables Wireless.
-- 
GitLab


From b98ae36d321399d3c0163ee78fa956d5592ac201 Mon Sep 17 00:00:00 2001
From: Moritz Ulrich <moritz@tarn-vedra.de>
Date: Wed, 1 May 2013 14:29:57 +0200
Subject: [PATCH 5059/5331] dwarf-fortress: Update to 0.34.11.

Somehow Dwarf Fortress suddenly started failing to use our libpng (or
zlib). I tried all possible combinations (supplying them via
LD_LIBRARY_PATH in the script) but it just won't work.

This solution was found in the Archlinux bug tracker: It just symlinks
all problematic .png files to their .bmp counterparts. It's ugly and
*sadly* breaks tileset support (unless you convert them to bmp) but I
think it's acceptable, as the whole expression is pretty problematic
in terms of purity.

Let's hope the next release of Dwarf Fortress will be easier to
support.

(fixes #710)
---
 pkgs/games/dwarf-fortress/default.nix | 88 +++++++++++++++------------
 pkgs/top-level/all-packages.nix       | 10 ++-
 2 files changed, 58 insertions(+), 40 deletions(-)

diff --git a/pkgs/games/dwarf-fortress/default.nix b/pkgs/games/dwarf-fortress/default.nix
index 24c0b40edb3..6e53aff65a5 100644
--- a/pkgs/games/dwarf-fortress/default.nix
+++ b/pkgs/games/dwarf-fortress/default.nix
@@ -1,13 +1,14 @@
-{stdenv, fetchurl, SDL, SDL_image, SDL_ttf, gtk, glib, mesa, openal, glibc, libsndfile}:
+{ stdenv, fetchurl, SDL, SDL_image, SDL_ttf, gtk, glib, mesa, openal, glibc, libsndfile
+, copyDataDirectory ? false }:
 
 assert stdenv.system == "i686-linux";
 
 stdenv.mkDerivation rec {
-  name = "dwarf-fortress-0.31.25";
+  name = "dwarf-fortress-0.34.11";
 
   src = fetchurl {
-    url = "http://www.bay12games.com/dwarves/df_31_25_linux.tar.bz2";
-    sha256 = "0d3klvf5n99j38pdhx9mak78px65aw47smck82jb92la97drmcg3";
+    url = "http://www.bay12games.com/dwarves/df_34_11_linux.tar.bz2";
+    sha256 = "1qk9vmdxzs0li81c8bglpj3m7aw9k71x1slf58hv2bz7hdndl3kj";
   };
 
   phases = "unpackPhase patchPhase installPhase";
@@ -22,10 +23,10 @@ stdenv.mkDerivation rec {
     mkdir -p $out/share/df_linux
     cp -r * $out/share/df_linux
     cp $permission $out/share/df_linux/nix_permission
- 
+
     patchelf --set-interpreter ${glibc}/lib/ld-linux.so.2 $out/share/df_linux/libs/Dwarf_Fortress
     ln -s ${libsndfile}/lib/libsndfile.so $out/share/df_linux/libs/
-          
+
     cat > $out/bin/dwarf-fortress << EOF
     #!${stdenv.shell}
     export DF_DIR="\$HOME/.config/df_linux"
@@ -33,39 +34,48 @@ stdenv.mkDerivation rec {
      then export DF_DIR="\$XDG_DATA_HOME/df_linux"
     fi
 
-    # Recreate a directory sturctor reflecting the original distribution in the user directory
-
-    # Link in the static stuff
-    mkdir -p \$DF_DIR
-    ln -sf $out/share/df_linux/libs \$DF_DIR/
-    ln -sf $out/share/df_linux/raw \$DF_DIR/
-    ln -sf $out/share/df_linux/df \$DF_DIR/
-
-    # Delete old data directory
-    rm -rf \$DF_DIR/data
-    
-    # Link in the static data directory
-    mkdir \$DF_DIR/data
-    for i in $out/share/df_linux/data/*
-    do
-     ln -s \$i \$DF_DIR/data/
-    done
-
-    # index initial_movies, announcement, dipscript and help files are as of 0.31.16 opened in read/write mode instead of read-only mode
-    # this is a hack to work around this
-    # Should I just apply this to the whole data directory?
-    for i in index initial_movies announcement dipscript help
-    do
-     rm \$DF_DIR/data/\$i
-     cp -rf $out/share/df_linux/data/\$i \$DF_DIR/data/
-     chmod -R u+w \$DF_DIR/data/\$i
-    done
-
-    # link in persistant data
-    mkdir -p \$DF_DIR/save
-    ln -s \$DF_DIR/save \$DF_DIR/data/
-
-    # now run Dwarf Fortress! 
+    # Recreate a directory structure reflecting the original
+    # distribution in the user directory (for modding support)
+    ${if copyDataDirectory then ''
+      if [ ! -d "\$DF_DIR" ];
+      then
+        mkdir -p \$DF_DIR
+        cp -r $out/share/df_linux/* \$DF_DIR/
+        chmod -R u+rw \$DF_DIR/
+      fi
+    '' else ''
+      # Link in the static stuff
+      mkdir -p \$DF_DIR
+      ln -sf $out/share/df_linux/libs \$DF_DIR/
+      ln -sf $out/share/df_linux/raw \$DF_DIR/
+      ln -sf $out/share/df_linux/df \$DF_DIR/
+
+      # Delete old data directory
+      rm -rf \$DF_DIR/data
+
+      # Link in the static data directory
+      mkdir \$DF_DIR/data
+      for i in $out/share/df_linux/data/*
+      do
+       ln -s \$i \$DF_DIR/data/
+      done
+
+      # index initial_movies, announcement, dipscript and help files are as of 0.31.16 opened in read/write mode instead of read-only mode
+      # this is a hack to work around this
+      # Should I just apply this to the whole data directory?
+      for i in index initial_movies announcement dipscript help
+      do
+       rm \$DF_DIR/data/\$i
+       cp -rf $out/share/df_linux/data/\$i \$DF_DIR/data/
+       chmod -R u+w \$DF_DIR/data/\$i
+      done
+
+      # link in persistant data
+      mkdir -p \$DF_DIR/save
+      ln -s \$DF_DIR/save \$DF_DIR/data/
+    ''}
+
+    # now run Dwarf Fortress!
     export LD_LIBRARY_PATH=\$DF_DIR/df_linux/libs/:${SDL}/lib:${SDL_image}/lib/:${SDL_ttf}/lib/:${gtk}/lib/:${glib}/lib/:${mesa}/lib/:${openal}/lib/
     \$DF_DIR/df "\$@"
     EOF
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 99a489a5df2..88a58b9fdf1 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9086,7 +9086,15 @@ let
 
   drumkv1 = callPackage ../applications/audio/drumkv1 { };
 
-  dwarf_fortress = callPackage_i686 ../games/dwarf-fortress { };
+  dwarf_fortress = callPackage_i686 ../games/dwarf-fortress {
+    SDL_image = pkgsi686Linux.SDL_image.override {
+      libpng = pkgsi686Linux.libpng12;
+    };
+  };
+
+  dwarf_fortress_modable = appendToName "moddable" (dwarf_fortress.override {
+    copyDataDirectory = true;
+  });
 
   d1x_rebirth = callPackage ../games/d1x-rebirth { };
 
-- 
GitLab


From 282b5ac5f0c3928defcad02e04c4a6c592dd6a80 Mon Sep 17 00:00:00 2001
From: Moritz Ulrich <moritz@tarn-vedra.de>
Date: Thu, 10 Oct 2013 01:15:16 +0200
Subject: [PATCH 5060/5331] dwarf-therapist: New package

Dwarf Therapist is a tool to manage your Dwarves' work orders and
other management stuff.

Signed-off-by: Moritz Ulrich <moritz@tarn-vedra.de>
---
 pkgs/games/dwarf-therapist/default.nix | 60 ++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix        |  2 +
 2 files changed, 62 insertions(+)
 create mode 100644 pkgs/games/dwarf-therapist/default.nix

diff --git a/pkgs/games/dwarf-therapist/default.nix b/pkgs/games/dwarf-therapist/default.nix
new file mode 100644
index 00000000000..8ac84a96aeb
--- /dev/null
+++ b/pkgs/games/dwarf-therapist/default.nix
@@ -0,0 +1,60 @@
+{ stdenv, coreutils, fetchhg, qt4, dwarf_fortress, bash, makeWrapper }:
+
+stdenv.mkDerivation rec {
+  name = "dwarf-therapist-${rev}";
+  rev = "eeeac8544d94";
+
+  src = fetchhg {
+    url = "https://code.google.com/r/splintermind-attributes/";
+    tag = rev;
+    sha256 = "0a9m967q6p2q3plrl6qysg1xrdmg65jzil6awjh2wr3g10x2x15z";
+  };
+
+  # Needed for hashing
+  dwarfBinary = "${dwarf_fortress}/share/df_linux/libs/Dwarf_Fortress";
+
+  buildInputs = [ coreutils qt4 dwarf_fortress makeWrapper ];
+  enableParallelBuilding = false;
+
+  preConfigure = ''
+    substituteInPlace dwarftherapist.pro \
+      --replace /usr/bin $out/bin     \
+      --replace /usr/share $out/share \
+      --replace "INSTALLS += doc" ""
+  '';
+
+  preBuild = ''
+    # Log to current directory, otherwise it crashes if log/ doesn't
+    # exist Note: Whis is broken because we cd to the nix store in the
+    # wrapper-script
+    substituteInPlace src/dwarftherapist.cpp \
+      --replace "log/run.log" "dwarf-therapist.log"
+  '';
+
+  buildPhase = ''
+    qmake INSTALL_PREFIX=$out;
+    make;
+  '';
+
+  postInstall = ''
+    # DwarfTherapist assumes it's run in $out/share/dwarftherapist and
+    # therefore uses many relative paths.
+    rm $out/bin/dwarftherapist
+    wrapProgram $out/bin/DwarfTherapist \
+      --run "cd $out/share/dwarftherapist"
+  '';
+
+  postFixup = ''
+    # Fix checksum of memory access directives
+    substituteInPlace $out/share/dwarftherapist/etc/memory_layouts/linux/v034.11.ini \
+      --replace "e966ee88" $(md5sum ${dwarfBinary} | cut -c1-8)
+  '';
+
+  meta = {
+    description = "Tool to manage dwarves in in a running game of Dwarf Fortress";
+    maintainers = with stdenv.lib.maintainers; [ the-kenny ];
+    license = "MIT";
+    platforms = stdenv.lib.platforms.linux;
+    homepage = https://code.google.com/r/splintermind-attributes/;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 88a58b9fdf1..616e8c7d7cc 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9096,6 +9096,8 @@ let
     copyDataDirectory = true;
   });
 
+  dwarf-therapist = callPackage ../games/dwarf-therapist { };
+
   d1x_rebirth = callPackage ../games/d1x-rebirth { };
 
   d2x_rebirth = callPackage ../games/d2x-rebirth { };
-- 
GitLab


From 6a6310618590788b253f585619aa7290772fa1c5 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 10 Oct 2013 11:38:23 +0200
Subject: [PATCH 5061/5331] gnupg1: support for IDEA is now included by default
 (the patent has expired)

---
 pkgs/tools/security/gnupg1/default.nix | 23 ++---------------------
 pkgs/top-level/all-packages.nix        |  4 +---
 2 files changed, 3 insertions(+), 24 deletions(-)

diff --git a/pkgs/tools/security/gnupg1/default.nix b/pkgs/tools/security/gnupg1/default.nix
index 353e0de5ff7..192970b5cae 100644
--- a/pkgs/tools/security/gnupg1/default.nix
+++ b/pkgs/tools/security/gnupg1/default.nix
@@ -1,18 +1,4 @@
-{ # Support for the IDEA cipher (used by the old PGP) should only be
-  # enabled if it is legal for you to do so.
-  ideaSupport ? false
-
-, stdenv, fetchurl, readline, bzip2
-}:
-
-let
-
-  idea = fetchurl {
-    url = http://tarballs.nixos.org/idea.c.gz;
-    md5 = "9dc3bc086824a8c7a331f35e09a3e57f";
-  };
-
-in
+{ stdenv, fetchurl, readline, bzip2 }:
 
 stdenv.mkDerivation rec {
   name = "gnupg-1.4.15";
@@ -24,15 +10,10 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ readline bzip2 ];
 
-  preConfigure = stdenv.lib.optionalString ideaSupport
-    ''
-      gunzip < ${idea} > ./cipher/idea.c
-    '';
-
   doCheck = true;
 
   meta = {
-    description = "GnuPG, a free implementation of the OpenPGP standard for encrypting and signing data";
+    description = "free implementation of the OpenPGP standard for encrypting and signing data";
     homepage = http://www.gnupg.org/;
     license = "GPLv3+";
     platforms = stdenv.lib.platforms.gnu; # arbitrary choice
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 616e8c7d7cc..912136bf859 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -971,9 +971,7 @@ let
 
   gnupatch = callPackage ../tools/text/gnupatch { };
 
-  gnupg1orig = callPackage ../tools/security/gnupg1 {
-    ideaSupport = false;
-  };
+  gnupg1orig = callPackage ../tools/security/gnupg1 { };
 
   gnupg1compat = callPackage ../tools/security/gnupg1compat { };
 
-- 
GitLab


From 0cd06279890ef41d4e374608216e05544585f19b Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 10 Oct 2013 11:39:55 +0200
Subject: [PATCH 5062/5331] gnupg: update to version 2.0.22 (fixes
 CVE-2013-4402)

---
 pkgs/tools/security/gnupg/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/security/gnupg/default.nix b/pkgs/tools/security/gnupg/default.nix
index baa8dd87ec1..dec9fc6a618 100644
--- a/pkgs/tools/security/gnupg/default.nix
+++ b/pkgs/tools/security/gnupg/default.nix
@@ -13,11 +13,11 @@ assert useUsb -> (libusb != null);
 assert useCurl -> (curl != null);
 
 stdenv.mkDerivation rec {
-  name = "gnupg-2.0.21";
+  name = "gnupg-2.0.22";
 
   src = fetchurl {
     url = "mirror://gnupg/gnupg/${name}.tar.bz2";
-    sha256 = "1xgf1q1phdawk6y66haaqcvfnlsqk12jmjin1m2d5x6fqw18kpq0";
+    sha256 = "0lg210acj2rxq291q4cwamg9gx6gh2prb1xa93y5jhw5b6r0lza3";
   };
 
   buildInputs
-- 
GitLab


From 9f65946e5f2a689ce2fa454e2e6d83b0315f26e1 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 10 Oct 2013 11:40:06 +0200
Subject: [PATCH 5063/5331] all-packages.nix: strip trailing whitespace

---
 pkgs/top-level/all-packages.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 912136bf859..394ef116928 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1067,7 +1067,7 @@ let
   pigz = callPackage ../tools/compression/pigz { };
 
   haproxy = callPackage ../tools/networking/haproxy { };
- 
+
   haveged = callPackage ../tools/security/haveged { };
 
   hardlink = callPackage ../tools/system/hardlink { };
@@ -9415,7 +9415,7 @@ let
           callPackage ../applications/graphics/digikam { };
 
       eventlist = callPackage ../applications/office/eventlist {};
- 
+
       k3b = callPackage ../applications/misc/k3b { };
 
       kadu = callPackage ../applications/networking/instant-messengers/kadu { };
-- 
GitLab


From 60f9e092e348bc64dfc8d57744fc7b7858c2432c Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 10 Oct 2013 11:41:21 +0200
Subject: [PATCH 5064/5331] gnupg: improve conformance of meta.description to
 Nixpkgs guidelines

---
 pkgs/tools/security/gnupg/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/tools/security/gnupg/default.nix b/pkgs/tools/security/gnupg/default.nix
index dec9fc6a618..f242c3f323a 100644
--- a/pkgs/tools/security/gnupg/default.nix
+++ b/pkgs/tools/security/gnupg/default.nix
@@ -39,7 +39,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     homepage = "http://gnupg.org/";
-    description = "GNU Privacy Guard (GnuPG), GNU Project's implementation of the OpenPGP standard";
+    description = "free implementation of the OpenPGP standard for encrypting and signing data";
     license = stdenv.lib.licenses.gpl3Plus;
 
     longDescription = ''
-- 
GitLab


From 0ae1a8b8478c742be43b79a1a2543f30584626f8 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 10 Oct 2013 12:00:12 +0200
Subject: [PATCH 5065/5331] hol: update to version k.8

Committing on behalf of Tom Ridge <tom.j.ridge@googlemail.com>.
---
 .../science/logic/hol/default.nix             | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/pkgs/applications/science/logic/hol/default.nix b/pkgs/applications/science/logic/hol/default.nix
index 4223c52b7d4..5abee674c47 100644
--- a/pkgs/applications/science/logic/hol/default.nix
+++ b/pkgs/applications/science/logic/hol/default.nix
@@ -1,8 +1,9 @@
-{stdenv, fetchurl, polyml, experimentalKernel ? false}:
+{stdenv, fetchurl, polyml, graphviz, experimentalKernel ? true}:
 
 let
   pname = "hol4";
-  version = "k.7";
+  version = "k.8";
+  holsubdir = "hol-kananaskis-8";
   kernelFlag = if experimentalKernel then "-expk" else "-stdknl";
 in
 
@@ -10,31 +11,33 @@ stdenv.mkDerivation {
   name = "${pname}-${version}";
 
   src = fetchurl {
-    url = mirror://sourceforge/hol/hol/kananaskis-7/kananaskis-7.tar.gz;
-    sha256 = "0gs1nmjvsjhnndama9v7gids2g86iip53v7d7dm3sfq6jxmqkwkl";
+    url = mirror://sourceforge/hol/hol/kananaskis-8/kananaskis-8.tar.gz;
+    sha256 = "5ce4c1e37301dbc38772694e98f1c7eabf69255908de204b280d8b2b1709e9d0";
   };
 
-  buildInputs = [polyml];
+  buildInputs = [polyml graphviz];
 
   buildCommand = ''
     mkdir -p "$out/src"
     cd  "$out/src"
 
     tar -xzf "$src"
-    cd hol4.${version}
+    cd ${holsubdir}
 
     substituteInPlace tools/Holmake/Holmake_types.sml \
       --replace "\"/bin/mv\"" "\"mv\"" \
       --replace "\"/bin/cp\"" "\"cp\""
 
+    substituteInPlace tools/buildutils.sml --replace "\"/usr/bin/dot\"" "\"dot\""
+
     #sed -ie "/compute/,999 d" tools/build-sequence # for testing
 
     poly < tools/smart-configure.sml
-    
+
     bin/build ${kernelFlag} -symlink
 
     mkdir -p "$out/bin"
-    ln -st $out/bin  $out/src/hol4.${version}/bin/*
+    ln -st $out/bin  "$out/src/${holsubdir}/bin/"*
     # ln -s $out/src/hol4.${version}/bin $out/bin
   '';
 
-- 
GitLab


From 5c1f8cbc70cd5e6867ef6a2a06d27a40daa07010 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 10 Oct 2013 13:28:20 +0200
Subject: [PATCH 5066/5331] Move all of NixOS to nixos/ in preparation of the
 repository merge

---
 .gitignore => nixos/.gitignore                      |   0
 .version => nixos/.version                          |   0
 COPYING => nixos/COPYING                            |   0
 README => nixos/README                              |   0
 default.nix => nixos/default.nix                    |   0
 {doc => nixos/doc}/config-examples/basic.nix        |   0
 .../closed-install-configuration.nix                |   0
 {doc => nixos/doc}/config-examples/root-on-lvm.nix  |   0
 {doc => nixos/doc}/config-examples/svn-server.nix   |   0
 .../doc}/config-examples/x86_64-usbstick.nix        |   0
 {doc => nixos/doc}/manual/configuration.xml         |   0
 {doc => nixos/doc}/manual/default.nix               |   0
 {doc => nixos/doc}/manual/development.xml           |   0
 {doc => nixos/doc}/manual/installation.xml          |   0
 {doc => nixos/doc}/manual/man-configuration.xml     |   0
 {doc => nixos/doc}/manual/man-nixos-build-vms.xml   |   0
 {doc => nixos/doc}/manual/man-nixos-option.xml      |   0
 {doc => nixos/doc}/manual/man-nixos-rebuild.xml     |   0
 {doc => nixos/doc}/manual/man-pages.xml             |   0
 {doc => nixos/doc}/manual/manual.xml                |   0
 {doc => nixos/doc}/manual/options-to-docbook.xsl    |   0
 {doc => nixos/doc}/manual/running.xml               |   0
 {doc => nixos/doc}/manual/style.css                 |   0
 {doc => nixos/doc}/manual/troubleshooting.xml       |   0
 {doc => nixos/doc}/manual/userconfiguration.xml     |   0
 {gui => nixos/gui}/README                           |   0
 {gui => nixos/gui}/application.ini                  |   0
 {gui => nixos/gui}/chrome.manifest                  |   0
 {gui => nixos/gui}/chrome/chrome.manifest           |   0
 {gui => nixos/gui}/chrome/content/io.js             |   0
 {gui => nixos/gui}/chrome/content/main.js           |   0
 {gui => nixos/gui}/chrome/content/myviewer.xul      |   0
 {gui => nixos/gui}/chrome/content/nixos.js          |   0
 {gui => nixos/gui}/chrome/content/optionView.js     |   0
 {gui => nixos/gui}/components/clh.js                |   0
 .../gui}/defaults/preferences/myviewer-prefs.js     |   0
 {lib => nixos/lib}/build-vms.nix                    |   0
 {lib => nixos/lib}/channel-expr.nix                 |   0
 {lib => nixos/lib}/eval-config.nix                  |   0
 {lib => nixos/lib}/from-env.nix                     |   0
 {lib => nixos/lib}/make-iso9660-image.nix           |   0
 {lib => nixos/lib}/make-iso9660-image.sh            |   0
 {lib => nixos/lib}/make-squashfs.nix                |   0
 {lib => nixos/lib}/make-system-tarball.nix          |   0
 {lib => nixos/lib}/make-system-tarball.sh           |   0
 {lib => nixos/lib}/qemu-flags.nix                   |   0
 {lib => nixos/lib}/test-driver/Logger.pm            |   0
 {lib => nixos/lib}/test-driver/Machine.pm           |   0
 {lib => nixos/lib}/test-driver/log2html.xsl         |   0
 {lib => nixos/lib}/test-driver/logfile.css          |   0
 {lib => nixos/lib}/test-driver/test-driver.pl       |   0
 {lib => nixos/lib}/test-driver/treebits.js          |   0
 {lib => nixos/lib}/testing.nix                      |   0
 {lib => nixos/lib}/utils.nix                        |   0
 .../maintainers}/option-usages.nix                  |   0
 .../maintainers}/scripts/ec2/create-ebs-amis.py     |   0
 .../maintainers}/scripts/ec2/create-s3-amis.sh      |   0
 .../maintainers}/scripts/ec2/ebs-creator.nix        |   0
 .../modules}/config/fonts/corefonts.nix             |   0
 .../modules}/config/fonts/fontconfig.nix            |   0
 {modules => nixos/modules}/config/fonts/fontdir.nix |   0
 {modules => nixos/modules}/config/fonts/fonts.nix   |   0
 .../modules}/config/fonts/ghostscript.nix           |   0
 {modules => nixos/modules}/config/gnu.nix           |   0
 {modules => nixos/modules}/config/i18n.nix          |   0
 {modules => nixos/modules}/config/krb5.nix          |   0
 {modules => nixos/modules}/config/ldap.nix          |   0
 {modules => nixos/modules}/config/networking.nix    |   0
 {modules => nixos/modules}/config/no-x-libs.nix     |   0
 {modules => nixos/modules}/config/nsswitch.nix      |   0
 .../modules}/config/power-management.nix            |   0
 {modules => nixos/modules}/config/pulseaudio.nix    |   0
 .../modules}/config/shells-environment.nix          |   0
 {modules => nixos/modules}/config/swap.nix          |   0
 {modules => nixos/modules}/config/sysctl.nix        |   0
 {modules => nixos/modules}/config/system-path.nix   |   0
 {modules => nixos/modules}/config/timezone.nix      |   0
 .../modules}/config/unix-odbc-drivers.nix           |   0
 {modules => nixos/modules}/config/users-groups.nix  |   0
 .../modules}/hardware/all-firmware.nix              |   0
 .../modules}/hardware/cpu/amd-microcode.nix         |   0
 .../modules}/hardware/cpu/intel-microcode.nix       |   0
 {modules => nixos/modules}/hardware/network/b43.nix |   0
 .../modules}/hardware/network/broadcom-43xx.nix     |   0
 .../modules}/hardware/network/intel-2030.nix        |   0
 .../modules}/hardware/network/intel-2100bg.nix      |   0
 .../modules}/hardware/network/intel-2200bg.nix      |   0
 .../modules}/hardware/network/intel-3945abg.nix     |   0
 .../modules}/hardware/network/intel-4965agn.nix     |   0
 .../modules}/hardware/network/intel-5000.nix        |   0
 .../modules}/hardware/network/intel-5150.nix        |   0
 .../modules}/hardware/network/intel-6000.nix        |   0
 .../modules}/hardware/network/intel-6000g2a.nix     |   0
 .../modules}/hardware/network/intel-6000g2b.nix     |   0
 .../modules}/hardware/network/ralink.nix            |   0
 .../modules}/hardware/network/rtl8192c.nix          |   0
 .../modules}/hardware/network/smc-2632w/default.nix |   0
 .../smc-2632w/firmware/cis/SMC2632W-v1.02.cis       |   0
 .../modules}/hardware/network/zydas-zd1211.nix      |   0
 {modules => nixos/modules}/hardware/pcmcia.nix      |   0
 .../modules}/hardware/video/encoder/wis-go7007.nix  |   0
 .../modules}/hardware/video/radeon.nix              |   0
 .../modules}/installer/cd-dvd/channel.nix           |   0
 .../installer/cd-dvd/installation-cd-base.nix       |   0
 .../installer/cd-dvd/installation-cd-efi.nix        |   0
 .../installer/cd-dvd/installation-cd-graphical.nix  |   0
 .../cd-dvd/installation-cd-minimal-new-kernel.nix   |   0
 .../installer/cd-dvd/installation-cd-minimal.nix    |   0
 .../installer/cd-dvd/installation-cd-new-kernel.nix |   0
 .../modules}/installer/cd-dvd/iso-image.nix         |   0
 .../modules}/installer/cd-dvd/live-dvd.nix          |   0
 .../installer/cd-dvd/system-tarball-fuloong2f.nix   |   0
 .../installer/cd-dvd/system-tarball-pc-readme.txt   |   0
 .../modules}/installer/cd-dvd/system-tarball-pc.nix |   0
 .../installer/cd-dvd/system-tarball-sheevaplug.nix  |   0
 .../modules}/installer/cd-dvd/system-tarball.nix    |   0
 .../modules}/installer/scan/detected.nix            |   0
 .../modules}/installer/scan/not-detected.nix        |   0
 .../modules}/installer/tools/get-version-suffix     |   0
 .../installer/tools/nixos-build-vms/build-vms.nix   |   0
 .../tools/nixos-build-vms/nixos-build-vms.sh        |   0
 .../modules}/installer/tools/nixos-checkout.nix     |   0
 .../installer/tools/nixos-gen-seccure-keys.sh       |   0
 .../modules}/installer/tools/nixos-hardware-scan.pl |   0
 .../modules}/installer/tools/nixos-install.sh       |   0
 .../modules}/installer/tools/nixos-option.sh        |   0
 .../modules}/installer/tools/nixos-rebuild.sh       |   0
 .../modules}/installer/tools/nixos-version.sh       |   0
 .../modules}/installer/tools/tools.nix              |   0
 .../modules}/installer/virtualbox-demo.nix          |   0
 {modules => nixos/modules}/misc/assertions.nix      |   0
 {modules => nixos/modules}/misc/check-config.nix    |   0
 {modules => nixos/modules}/misc/crashdump.nix       |   0
 {modules => nixos/modules}/misc/ids.nix             |   0
 {modules => nixos/modules}/misc/lib.nix             |   0
 {modules => nixos/modules}/misc/locate.nix          |   0
 {modules => nixos/modules}/misc/nixpkgs.nix         |   0
 {modules => nixos/modules}/misc/passthru.nix        |   0
 {modules => nixos/modules}/misc/version.nix         |   0
 {modules => nixos/modules}/module-list.nix          |   0
 .../modules}/profiles/all-hardware.nix              |   0
 {modules => nixos/modules}/profiles/base.nix        |   0
 .../modules}/profiles/clone-config.nix              |   0
 {modules => nixos/modules}/profiles/demo.nix        |   0
 {modules => nixos/modules}/profiles/graphical.nix   |   0
 {modules => nixos/modules}/profiles/headless.nix    |   0
 .../modules}/profiles/installation-device.nix       |   0
 {modules => nixos/modules}/profiles/minimal.nix     |   0
 {modules => nixos/modules}/profiles/qemu-guest.nix  |   0
 {modules => nixos/modules}/programs/atop.nix        |   0
 {modules => nixos/modules}/programs/bash/bash.nix   |   0
 .../modules}/programs/bash/command-not-found.nix    |   0
 .../modules}/programs/bash/command-not-found.pl     |   0
 {modules => nixos/modules}/programs/bash/inputrc    |   0
 {modules => nixos/modules}/programs/blcr.nix        |   0
 {modules => nixos/modules}/programs/environment.nix |   0
 {modules => nixos/modules}/programs/info.nix        |   0
 {modules => nixos/modules}/programs/shadow.nix      |   0
 {modules => nixos/modules}/programs/shell.nix       |   0
 {modules => nixos/modules}/programs/ssh.nix         |   0
 {modules => nixos/modules}/programs/ssmtp.nix       |   0
 {modules => nixos/modules}/programs/venus.nix       |   0
 {modules => nixos/modules}/programs/virtualbox.nix  |   0
 {modules => nixos/modules}/programs/wvdial.nix      |   0
 {modules => nixos/modules}/programs/zsh/zinputrc    |   0
 {modules => nixos/modules}/programs/zsh/zsh.nix     |   0
 {modules => nixos/modules}/rename.nix               |   0
 .../modules}/security/apparmor-suid.nix             |   0
 {modules => nixos/modules}/security/apparmor.nix    |   0
 {modules => nixos/modules}/security/ca.nix          |   0
 {modules => nixos/modules}/security/pam.nix         |   0
 {modules => nixos/modules}/security/pam_usb.nix     |   0
 {modules => nixos/modules}/security/polkit.nix      |   0
 {modules => nixos/modules}/security/rngd.nix        |   0
 {modules => nixos/modules}/security/rtkit.nix       |   0
 .../modules}/security/setuid-wrapper.c              |   0
 .../modules}/security/setuid-wrappers.nix           |   0
 {modules => nixos/modules}/security/sudo.nix        |   0
 .../services/amqp/activemq/ActiveMQBroker.java      |   0
 .../modules}/services/amqp/activemq/default.nix     |   0
 .../modules}/services/amqp/rabbitmq.nix             |   0
 {modules => nixos/modules}/services/audio/alsa.nix  |   0
 .../modules}/services/audio/fuppes.nix              |   0
 .../modules}/services/audio/fuppes/vfolder.cfg      |   0
 {modules => nixos/modules}/services/audio/mpd.nix   |   0
 .../modules}/services/backup/almir.nix              |   0
 .../modules}/services/backup/bacula.nix             |   0
 .../modules}/services/backup/mysql-backup.nix       |   0
 .../modules}/services/backup/postgresql-backup.nix  |   0
 .../modules}/services/backup/rsnapshot.nix          |   0
 .../modules}/services/backup/sitecopy-backup.nix    |   0
 .../modules}/services/databases/4store-endpoint.nix |   0
 .../modules}/services/databases/4store.nix          |   0
 .../modules}/services/databases/firebird.nix        |   0
 .../modules}/services/databases/memcached.nix       |   0
 .../modules}/services/databases/mongodb.nix         |   0
 .../modules}/services/databases/mysql.nix           |   0
 .../modules}/services/databases/mysql55.nix         |   0
 .../modules}/services/databases/openldap.nix        |   0
 .../modules}/services/databases/postgresql.nix      |   0
 .../modules}/services/databases/redis.nix           |   0
 .../modules}/services/databases/virtuoso.nix        |   0
 .../modules}/services/games/ghost-one.nix           |   0
 .../modules}/services/hardware/acpid.nix            |   0
 .../modules}/services/hardware/bluetooth.nix        |   0
 .../modules}/services/hardware/nvidia-optimus.nix   |   0
 .../modules}/services/hardware/pcscd.nix            |   0
 .../modules}/services/hardware/pommed.nix           |   0
 .../modules}/services/hardware/sane.nix             |   0
 .../modules}/services/hardware/thinkfan.nix         |   0
 .../modules}/services/hardware/udev.nix             |   0
 .../modules}/services/hardware/udisks.nix           |   0
 .../modules}/services/hardware/udisks2.nix          |   0
 .../modules}/services/hardware/upower.nix           |   0
 .../modules}/services/logging/klogd.nix             |   0
 .../modules}/services/logging/logcheck.nix          |   0
 .../modules}/services/logging/logrotate.nix         |   0
 .../modules}/services/logging/logstash.nix          |   0
 .../modules}/services/logging/rsyslogd.nix          |   0
 .../modules}/services/logging/syslogd.nix           |   0
 .../modules}/services/mail/dovecot.nix              |   0
 .../modules}/services/mail/freepops.nix             |   0
 {modules => nixos/modules}/services/mail/mail.nix   |   0
 .../modules}/services/mail/opensmtpd.nix            |   0
 .../modules}/services/mail/postfix.nix              |   0
 .../modules}/services/mail/spamassassin.nix         |   0
 {modules => nixos/modules}/services/misc/autofs.nix |   0
 .../modules}/services/misc/cgminer.nix              |   0
 {modules => nixos/modules}/services/misc/disnix.nix |   0
 {modules => nixos/modules}/services/misc/felix.nix  |   0
 .../modules}/services/misc/folding-at-home.nix      |   0
 {modules => nixos/modules}/services/misc/gpsd.nix   |   0
 .../modules}/services/misc/nix-daemon.nix           |   0
 {modules => nixos/modules}/services/misc/nix-gc.nix |   0
 .../modules}/services/misc/nixos-manual.nix         |   0
 {modules => nixos/modules}/services/misc/rogue.nix  |   0
 .../modules}/services/misc/svnserve.nix             |   0
 .../modules}/services/misc/synergy.nix              |   0
 .../modules}/services/monitoring/apcupsd.nix        |   0
 .../modules}/services/monitoring/dd-agent.nix       |   0
 .../modules}/services/monitoring/graphite.nix       |   0
 .../modules}/services/monitoring/monit.nix          |   0
 .../services/monitoring/nagios/commands.cfg         |   0
 .../modules}/services/monitoring/nagios/default.nix |   0
 .../services/monitoring/nagios/host-templates.cfg   |   0
 .../monitoring/nagios/service-templates.cfg         |   0
 .../services/monitoring/nagios/timeperiods.cfg      |   0
 .../modules}/services/monitoring/smartd.nix         |   0
 .../modules}/services/monitoring/statsd.nix         |   0
 .../modules}/services/monitoring/systemhealth.nix   |   0
 .../modules}/services/monitoring/ups.nix            |   0
 .../modules}/services/monitoring/uptime.nix         |   0
 .../modules}/services/monitoring/zabbix-agent.nix   |   0
 .../modules}/services/monitoring/zabbix-server.nix  |   0
 .../modules}/services/network-filesystems/drbd.nix  |   0
 .../modules}/services/network-filesystems/nfsd.nix  |   0
 .../network-filesystems/openafs-client/default.nix  |   0
 .../modules}/services/network-filesystems/samba.nix |   0
 .../modules}/services/networking/amuled.nix         |   0
 .../modules}/services/networking/avahi-daemon.nix   |   0
 .../modules}/services/networking/bind.nix           |   0
 .../modules}/services/networking/bitlbee.nix        |   0
 .../modules}/services/networking/chrony.nix         |   0
 .../modules}/services/networking/cntlm.nix          |   0
 .../modules}/services/networking/ddclient.nix       |   0
 .../modules}/services/networking/dhclient.nix       |   0
 .../modules}/services/networking/dhcpcd.nix         |   0
 .../modules}/services/networking/dhcpd.nix          |   0
 .../modules}/services/networking/dnsmasq.nix        |   0
 .../modules}/services/networking/ejabberd.nix       |   0
 .../modules}/services/networking/firewall.nix       |   0
 .../modules}/services/networking/flashpolicyd.nix   |   0
 .../modules}/services/networking/freenet.nix        |   0
 .../modules}/services/networking/git-daemon.nix     |   0
 .../modules}/services/networking/gnunet.nix         |   0
 .../modules}/services/networking/gogoclient.nix     |   0
 .../modules}/services/networking/gvpe.nix           |   0
 .../modules}/services/networking/hostapd.nix        |   0
 .../modules}/services/networking/ifplugd.nix        |   0
 .../modules}/services/networking/iodined.nix        |   0
 .../services/networking/ircd-hybrid/builder.sh      |   0
 .../services/networking/ircd-hybrid/control.in      |   0
 .../services/networking/ircd-hybrid/default.nix     |   0
 .../services/networking/ircd-hybrid/ircd.conf       |   0
 .../modules}/services/networking/minidlna.nix       |   0
 .../modules}/services/networking/nat.nix            |   0
 .../modules}/services/networking/networkmanager.nix |   0
 .../modules}/services/networking/ntpd.nix           |   0
 .../modules}/services/networking/oidentd.nix        |   0
 .../modules}/services/networking/openfire.nix       |   0
 .../modules}/services/networking/openvpn.nix        |   0
 .../modules}/services/networking/prayer.nix         |   0
 .../modules}/services/networking/privoxy.nix        |   0
 .../modules}/services/networking/quassel.nix        |   0
 .../modules}/services/networking/radvd.nix          |   0
 .../modules}/services/networking/rdnssd.nix         |   0
 .../modules}/services/networking/rpcbind.nix        |   0
 .../modules}/services/networking/sabnzbd.nix        |   0
 .../modules}/services/networking/ssh/lshd.nix       |   0
 .../modules}/services/networking/ssh/sshd.nix       |   0
 .../modules}/services/networking/supybot.nix        |   0
 .../modules}/services/networking/tcpcrypt.nix       |   0
 .../modules}/services/networking/tftpd.nix          |   0
 .../modules}/services/networking/unbound.nix        |   0
 .../modules}/services/networking/vsftpd.nix         |   0
 .../modules}/services/networking/wakeonlan.nix      |   0
 .../modules}/services/networking/websockify.nix     |   0
 .../modules}/services/networking/wicd.nix           |   0
 .../modules}/services/networking/wpa_supplicant.nix |   0
 .../modules}/services/networking/xinetd.nix         |   0
 .../modules}/services/printing/cupsd.nix            |   0
 .../modules}/services/scheduling/atd.nix            |   0
 .../modules}/services/scheduling/cron.nix           |   0
 .../modules}/services/scheduling/fcron.nix          |   0
 .../modules}/services/search/elasticsearch.nix      |   0
 .../modules}/services/security/clamav.nix           |   0
 .../modules}/services/security/fail2ban.nix         |   0
 .../modules}/services/security/fprot.nix            |   0
 .../modules}/services/security/frandom.nix          |   0
 .../modules}/services/security/tor.nix              |   0
 .../modules}/services/security/torify.nix           |   0
 .../modules}/services/security/torsocks.nix         |   0
 {modules => nixos/modules}/services/system/dbus.nix |   0
 .../modules}/services/system/kerberos.nix           |   0
 .../modules}/services/system/nscd.conf              |   0
 {modules => nixos/modules}/services/system/nscd.nix |   0
 .../modules}/services/system/uptimed.nix            |   0
 .../modules}/services/torrent/deluge.nix            |   0
 .../modules}/services/torrent/transmission.nix      |   0
 {modules => nixos/modules}/services/ttys/agetty.nix |   0
 {modules => nixos/modules}/services/ttys/gpm.nix    |   0
 .../services/web-servers/apache-httpd/default.nix   |   0
 .../services/web-servers/apache-httpd/mediawiki.nix |   0
 .../services/web-servers/apache-httpd/mercurial.nix |   0
 .../web-servers/apache-httpd/per-server-options.nix |   0
 .../web-servers/apache-httpd/tomcat-connector.nix   |   0
 .../services/web-servers/apache-httpd/trac.nix      |   0
 .../services/web-servers/apache-httpd/zabbix.nix    |   0
 .../modules}/services/web-servers/jboss/builder.sh  |   0
 .../modules}/services/web-servers/jboss/default.nix |   0
 .../modules}/services/web-servers/lighttpd/cgit.nix |   0
 .../services/web-servers/lighttpd/default.nix       |   0
 .../services/web-servers/lighttpd/gitweb.nix        |   0
 .../modules}/services/web-servers/nginx/default.nix |   0
 .../modules}/services/web-servers/tomcat.nix        |   0
 .../services/web-servers/varnish/default.nix        |   0
 .../modules}/services/web-servers/zope2.nix         |   0
 .../services/x11/desktop-managers/default.nix       |   0
 .../modules}/services/x11/desktop-managers/e17.nix  |   0
 .../services/x11/desktop-managers/gnome.nix         |   0
 .../modules}/services/x11/desktop-managers/kde4.nix |   0
 .../modules}/services/x11/desktop-managers/none.nix |   0
 .../modules}/services/x11/desktop-managers/xfce.nix |   0
 .../services/x11/desktop-managers/xterm.nix         |   0
 .../modules}/services/x11/display-managers/auto.nix |   0
 .../services/x11/display-managers/default.nix       |   0
 .../modules}/services/x11/display-managers/kdm.nix  |   0
 .../services/x11/display-managers/lightdm.nix       |   0
 .../modules}/services/x11/display-managers/slim.nix |   0
 .../modules}/services/x11/hardware/multitouch.nix   |   0
 .../modules}/services/x11/hardware/synaptics.nix    |   0
 .../modules}/services/x11/hardware/wacom.nix        |   0
 .../modules}/services/x11/terminal-server.nix       |   0
 .../services/x11/window-managers/awesome.nix        |   0
 .../services/x11/window-managers/compiz.nix         |   0
 .../services/x11/window-managers/default.nix        |   0
 .../modules}/services/x11/window-managers/i3.nix    |   0
 .../modules}/services/x11/window-managers/icewm.nix |   0
 .../services/x11/window-managers/metacity.nix       |   0
 .../modules}/services/x11/window-managers/none.nix  |   0
 .../services/x11/window-managers/openbox.nix        |   0
 .../modules}/services/x11/window-managers/twm.nix   |   0
 .../modules}/services/x11/window-managers/wmii.nix  |   0
 .../modules}/services/x11/window-managers/xbmc.nix  |   0
 .../services/x11/window-managers/xmonad.nix         |   0
 {modules => nixos/modules}/services/x11/xfs.conf    |   0
 {modules => nixos/modules}/services/x11/xfs.nix     |   0
 {modules => nixos/modules}/services/x11/xserver.nix |   0
 .../system/activation/activation-script.nix         |   0
 .../modules}/system/activation/no-clone.nix         |   0
 .../system/activation/switch-to-configuration.pl    |   0
 .../modules}/system/activation/top-level.nix        |   0
 {modules => nixos/modules}/system/boot/kernel.nix   |   0
 {modules => nixos/modules}/system/boot/kexec.nix    |   0
 .../loader/efi-boot-stub/efi-boot-stub-builder.sh   |   0
 .../boot/loader/efi-boot-stub/efi-boot-stub.nix     |   0
 .../modules}/system/boot/loader/efi.nix             |   0
 .../generations-dir/generations-dir-builder.sh      |   0
 .../boot/loader/generations-dir/generations-dir.nix |   0
 .../modules}/system/boot/loader/grub/grub.nix       |   0
 .../system/boot/loader/grub/install-grub.pl         |   0
 .../modules}/system/boot/loader/grub/memtest.nix    |   0
 .../boot/loader/grub/winkler-gnu-blue-640x480.png   | Bin
 .../system/boot/loader/grub/winkler-gnu-blue.README |   0
 .../boot/loader/gummiboot/gummiboot-builder.py      |   0
 .../system/boot/loader/gummiboot/gummiboot.nix      |   0
 .../boot/loader/init-script/init-script-builder.sh  |   0
 .../system/boot/loader/init-script/init-script.nix  |   0
 .../system/boot/loader/raspberrypi/builder.sh       |   0
 .../system/boot/loader/raspberrypi/raspberrypi.nix  |   0
 {modules => nixos/modules}/system/boot/luksroot.nix |   0
 {modules => nixos/modules}/system/boot/modprobe.nix |   0
 .../modules}/system/boot/readonly-mountpoint.c      |   0
 {modules => nixos/modules}/system/boot/shutdown.nix |   0
 .../modules}/system/boot/stage-1-init.sh            |   0
 {modules => nixos/modules}/system/boot/stage-1.nix  |   0
 .../modules}/system/boot/stage-2-init.sh            |   0
 {modules => nixos/modules}/system/boot/stage-2.nix  |   0
 .../modules}/system/boot/systemd-unit-options.nix   |   0
 {modules => nixos/modules}/system/boot/systemd.nix  |   0
 {modules => nixos/modules}/system/etc/etc.nix       |   0
 {modules => nixos/modules}/system/etc/make-etc.sh   |   0
 {modules => nixos/modules}/system/etc/setup-etc.pl  |   0
 .../modules}/system/upstart/upstart.nix             |   0
 {modules => nixos/modules}/tasks/cpu-freq.nix       |   0
 {modules => nixos/modules}/tasks/filesystems.nix    |   0
 .../modules}/tasks/filesystems/btrfs.nix            |   0
 .../modules}/tasks/filesystems/ext.nix              |   0
 .../modules}/tasks/filesystems/nfs.nix              |   0
 .../modules}/tasks/filesystems/reiserfs.nix         |   0
 .../modules}/tasks/filesystems/unionfs-fuse.nix     |   0
 .../modules}/tasks/filesystems/vfat.nix             |   0
 .../modules}/tasks/filesystems/xfs.nix              |   0
 .../modules}/tasks/filesystems/zfs.nix              |   0
 {modules => nixos/modules}/tasks/kbd.nix            |   0
 {modules => nixos/modules}/tasks/lvm.nix            |   0
 .../modules}/tasks/network-interfaces.nix           |   0
 .../modules}/tasks/scsi-link-power-management.nix   |   0
 {modules => nixos/modules}/tasks/swraid.nix         |   0
 .../modules}/tasks/tty-backgrounds-combine.sh       |   0
 .../modules}/testing/minimal-kernel.nix             |   0
 .../modules}/testing/test-instrumentation.nix       |   0
 .../modules}/virtualisation/amazon-config.nix       |   0
 .../modules}/virtualisation/amazon-image.nix        |   0
 .../modules}/virtualisation/ec2-data.nix            |   0
 .../modules}/virtualisation/libvirtd.nix            |   0
 .../modules}/virtualisation/nova-config.nix         |   0
 .../modules}/virtualisation/nova-image.nix          |   0
 {modules => nixos/modules}/virtualisation/nova.nix  |   0
 {modules => nixos/modules}/virtualisation/qemu-opts |   0
 .../modules}/virtualisation/qemu-vm.nix             |   0
 .../modules}/virtualisation/virtualbox-guest.nix    |   0
 .../modules}/virtualisation/virtualbox-image.nix    |   0
 .../modules}/virtualisation/xen-dom0.nix            |   0
 .../modules}/virtualisation/xen-domU.nix            |   0
 release-combined.nix => nixos/release-combined.nix  |   0
 release.nix => nixos/release.nix                    |   0
 {tests => nixos/tests}/avahi.nix                    |   0
 {tests => nixos/tests}/bittorrent.nix               |   0
 {tests => nixos/tests}/check-filesystems.nix        |   0
 {tests => nixos/tests}/common/user-account.nix      |   0
 {tests => nixos/tests}/common/x11.nix               |   0
 {tests => nixos/tests}/default.nix                  |   0
 {tests => nixos/tests}/efi-installer.nix            |   0
 {tests => nixos/tests}/firefox.nix                  |   0
 {tests => nixos/tests}/firewall.nix                 |   0
 {tests => nixos/tests}/installer.nix                |   0
 {tests => nixos/tests}/ipv6.nix                     |   0
 {tests => nixos/tests}/kde4.nix                     |   0
 {tests => nixos/tests}/kexec.nix                    |   0
 {tests => nixos/tests}/login.nix                    |   0
 {tests => nixos/tests}/misc.nix                     |   0
 {tests => nixos/tests}/mpich-example.c              |   0
 {tests => nixos/tests}/mpich.nix                    |   0
 {tests => nixos/tests}/mysql-replication.nix        |   0
 {tests => nixos/tests}/mysql.nix                    |   0
 {tests => nixos/tests}/nat.nix                      |   0
 {tests => nixos/tests}/nfs.nix                      |   0
 {tests => nixos/tests}/openssh.nix                  |   0
 {tests => nixos/tests}/partition.nix                |   0
 {tests => nixos/tests}/printing.nix                 |   0
 {tests => nixos/tests}/proxy.nix                    |   0
 {tests => nixos/tests}/quake3.nix                   |   0
 {tests => nixos/tests}/run-in-machine.nix           |   0
 {tests => nixos/tests}/simple.nix                   |   0
 {tests => nixos/tests}/subversion.nix               |   0
 {tests => nixos/tests}/test-config-examples.sh      |   0
 {tests => nixos/tests}/testdb.sql                   |   0
 {tests => nixos/tests}/tomcat.nix                   |   0
 {tests => nixos/tests}/trac.nix                     |   0
 {tests => nixos/tests}/xfce.nix                     |   0
 481 files changed, 0 insertions(+), 0 deletions(-)
 rename .gitignore => nixos/.gitignore (100%)
 rename .version => nixos/.version (100%)
 rename COPYING => nixos/COPYING (100%)
 rename README => nixos/README (100%)
 rename default.nix => nixos/default.nix (100%)
 rename {doc => nixos/doc}/config-examples/basic.nix (100%)
 rename {doc => nixos/doc}/config-examples/closed-install-configuration.nix (100%)
 rename {doc => nixos/doc}/config-examples/root-on-lvm.nix (100%)
 rename {doc => nixos/doc}/config-examples/svn-server.nix (100%)
 rename {doc => nixos/doc}/config-examples/x86_64-usbstick.nix (100%)
 rename {doc => nixos/doc}/manual/configuration.xml (100%)
 rename {doc => nixos/doc}/manual/default.nix (100%)
 rename {doc => nixos/doc}/manual/development.xml (100%)
 rename {doc => nixos/doc}/manual/installation.xml (100%)
 rename {doc => nixos/doc}/manual/man-configuration.xml (100%)
 rename {doc => nixos/doc}/manual/man-nixos-build-vms.xml (100%)
 rename {doc => nixos/doc}/manual/man-nixos-option.xml (100%)
 rename {doc => nixos/doc}/manual/man-nixos-rebuild.xml (100%)
 rename {doc => nixos/doc}/manual/man-pages.xml (100%)
 rename {doc => nixos/doc}/manual/manual.xml (100%)
 rename {doc => nixos/doc}/manual/options-to-docbook.xsl (100%)
 rename {doc => nixos/doc}/manual/running.xml (100%)
 rename {doc => nixos/doc}/manual/style.css (100%)
 rename {doc => nixos/doc}/manual/troubleshooting.xml (100%)
 rename {doc => nixos/doc}/manual/userconfiguration.xml (100%)
 rename {gui => nixos/gui}/README (100%)
 rename {gui => nixos/gui}/application.ini (100%)
 rename {gui => nixos/gui}/chrome.manifest (100%)
 rename {gui => nixos/gui}/chrome/chrome.manifest (100%)
 rename {gui => nixos/gui}/chrome/content/io.js (100%)
 rename {gui => nixos/gui}/chrome/content/main.js (100%)
 rename {gui => nixos/gui}/chrome/content/myviewer.xul (100%)
 rename {gui => nixos/gui}/chrome/content/nixos.js (100%)
 rename {gui => nixos/gui}/chrome/content/optionView.js (100%)
 rename {gui => nixos/gui}/components/clh.js (100%)
 rename {gui => nixos/gui}/defaults/preferences/myviewer-prefs.js (100%)
 rename {lib => nixos/lib}/build-vms.nix (100%)
 rename {lib => nixos/lib}/channel-expr.nix (100%)
 rename {lib => nixos/lib}/eval-config.nix (100%)
 rename {lib => nixos/lib}/from-env.nix (100%)
 rename {lib => nixos/lib}/make-iso9660-image.nix (100%)
 rename {lib => nixos/lib}/make-iso9660-image.sh (100%)
 rename {lib => nixos/lib}/make-squashfs.nix (100%)
 rename {lib => nixos/lib}/make-system-tarball.nix (100%)
 rename {lib => nixos/lib}/make-system-tarball.sh (100%)
 rename {lib => nixos/lib}/qemu-flags.nix (100%)
 rename {lib => nixos/lib}/test-driver/Logger.pm (100%)
 rename {lib => nixos/lib}/test-driver/Machine.pm (100%)
 rename {lib => nixos/lib}/test-driver/log2html.xsl (100%)
 rename {lib => nixos/lib}/test-driver/logfile.css (100%)
 rename {lib => nixos/lib}/test-driver/test-driver.pl (100%)
 rename {lib => nixos/lib}/test-driver/treebits.js (100%)
 rename {lib => nixos/lib}/testing.nix (100%)
 rename {lib => nixos/lib}/utils.nix (100%)
 rename {maintainers => nixos/maintainers}/option-usages.nix (100%)
 rename {maintainers => nixos/maintainers}/scripts/ec2/create-ebs-amis.py (100%)
 rename {maintainers => nixos/maintainers}/scripts/ec2/create-s3-amis.sh (100%)
 rename {maintainers => nixos/maintainers}/scripts/ec2/ebs-creator.nix (100%)
 rename {modules => nixos/modules}/config/fonts/corefonts.nix (100%)
 rename {modules => nixos/modules}/config/fonts/fontconfig.nix (100%)
 rename {modules => nixos/modules}/config/fonts/fontdir.nix (100%)
 rename {modules => nixos/modules}/config/fonts/fonts.nix (100%)
 rename {modules => nixos/modules}/config/fonts/ghostscript.nix (100%)
 rename {modules => nixos/modules}/config/gnu.nix (100%)
 rename {modules => nixos/modules}/config/i18n.nix (100%)
 rename {modules => nixos/modules}/config/krb5.nix (100%)
 rename {modules => nixos/modules}/config/ldap.nix (100%)
 rename {modules => nixos/modules}/config/networking.nix (100%)
 rename {modules => nixos/modules}/config/no-x-libs.nix (100%)
 rename {modules => nixos/modules}/config/nsswitch.nix (100%)
 rename {modules => nixos/modules}/config/power-management.nix (100%)
 rename {modules => nixos/modules}/config/pulseaudio.nix (100%)
 rename {modules => nixos/modules}/config/shells-environment.nix (100%)
 rename {modules => nixos/modules}/config/swap.nix (100%)
 rename {modules => nixos/modules}/config/sysctl.nix (100%)
 rename {modules => nixos/modules}/config/system-path.nix (100%)
 rename {modules => nixos/modules}/config/timezone.nix (100%)
 rename {modules => nixos/modules}/config/unix-odbc-drivers.nix (100%)
 rename {modules => nixos/modules}/config/users-groups.nix (100%)
 rename {modules => nixos/modules}/hardware/all-firmware.nix (100%)
 rename {modules => nixos/modules}/hardware/cpu/amd-microcode.nix (100%)
 rename {modules => nixos/modules}/hardware/cpu/intel-microcode.nix (100%)
 rename {modules => nixos/modules}/hardware/network/b43.nix (100%)
 rename {modules => nixos/modules}/hardware/network/broadcom-43xx.nix (100%)
 rename {modules => nixos/modules}/hardware/network/intel-2030.nix (100%)
 rename {modules => nixos/modules}/hardware/network/intel-2100bg.nix (100%)
 rename {modules => nixos/modules}/hardware/network/intel-2200bg.nix (100%)
 rename {modules => nixos/modules}/hardware/network/intel-3945abg.nix (100%)
 rename {modules => nixos/modules}/hardware/network/intel-4965agn.nix (100%)
 rename {modules => nixos/modules}/hardware/network/intel-5000.nix (100%)
 rename {modules => nixos/modules}/hardware/network/intel-5150.nix (100%)
 rename {modules => nixos/modules}/hardware/network/intel-6000.nix (100%)
 rename {modules => nixos/modules}/hardware/network/intel-6000g2a.nix (100%)
 rename {modules => nixos/modules}/hardware/network/intel-6000g2b.nix (100%)
 rename {modules => nixos/modules}/hardware/network/ralink.nix (100%)
 rename {modules => nixos/modules}/hardware/network/rtl8192c.nix (100%)
 rename {modules => nixos/modules}/hardware/network/smc-2632w/default.nix (100%)
 rename {modules => nixos/modules}/hardware/network/smc-2632w/firmware/cis/SMC2632W-v1.02.cis (100%)
 rename {modules => nixos/modules}/hardware/network/zydas-zd1211.nix (100%)
 rename {modules => nixos/modules}/hardware/pcmcia.nix (100%)
 rename {modules => nixos/modules}/hardware/video/encoder/wis-go7007.nix (100%)
 rename {modules => nixos/modules}/hardware/video/radeon.nix (100%)
 rename {modules => nixos/modules}/installer/cd-dvd/channel.nix (100%)
 rename {modules => nixos/modules}/installer/cd-dvd/installation-cd-base.nix (100%)
 rename {modules => nixos/modules}/installer/cd-dvd/installation-cd-efi.nix (100%)
 rename {modules => nixos/modules}/installer/cd-dvd/installation-cd-graphical.nix (100%)
 rename {modules => nixos/modules}/installer/cd-dvd/installation-cd-minimal-new-kernel.nix (100%)
 rename {modules => nixos/modules}/installer/cd-dvd/installation-cd-minimal.nix (100%)
 rename {modules => nixos/modules}/installer/cd-dvd/installation-cd-new-kernel.nix (100%)
 rename {modules => nixos/modules}/installer/cd-dvd/iso-image.nix (100%)
 rename {modules => nixos/modules}/installer/cd-dvd/live-dvd.nix (100%)
 rename {modules => nixos/modules}/installer/cd-dvd/system-tarball-fuloong2f.nix (100%)
 rename {modules => nixos/modules}/installer/cd-dvd/system-tarball-pc-readme.txt (100%)
 rename {modules => nixos/modules}/installer/cd-dvd/system-tarball-pc.nix (100%)
 rename {modules => nixos/modules}/installer/cd-dvd/system-tarball-sheevaplug.nix (100%)
 rename {modules => nixos/modules}/installer/cd-dvd/system-tarball.nix (100%)
 rename {modules => nixos/modules}/installer/scan/detected.nix (100%)
 rename {modules => nixos/modules}/installer/scan/not-detected.nix (100%)
 rename {modules => nixos/modules}/installer/tools/get-version-suffix (100%)
 rename {modules => nixos/modules}/installer/tools/nixos-build-vms/build-vms.nix (100%)
 rename {modules => nixos/modules}/installer/tools/nixos-build-vms/nixos-build-vms.sh (100%)
 rename {modules => nixos/modules}/installer/tools/nixos-checkout.nix (100%)
 rename {modules => nixos/modules}/installer/tools/nixos-gen-seccure-keys.sh (100%)
 rename {modules => nixos/modules}/installer/tools/nixos-hardware-scan.pl (100%)
 rename {modules => nixos/modules}/installer/tools/nixos-install.sh (100%)
 rename {modules => nixos/modules}/installer/tools/nixos-option.sh (100%)
 rename {modules => nixos/modules}/installer/tools/nixos-rebuild.sh (100%)
 rename {modules => nixos/modules}/installer/tools/nixos-version.sh (100%)
 rename {modules => nixos/modules}/installer/tools/tools.nix (100%)
 rename {modules => nixos/modules}/installer/virtualbox-demo.nix (100%)
 rename {modules => nixos/modules}/misc/assertions.nix (100%)
 rename {modules => nixos/modules}/misc/check-config.nix (100%)
 rename {modules => nixos/modules}/misc/crashdump.nix (100%)
 rename {modules => nixos/modules}/misc/ids.nix (100%)
 rename {modules => nixos/modules}/misc/lib.nix (100%)
 rename {modules => nixos/modules}/misc/locate.nix (100%)
 rename {modules => nixos/modules}/misc/nixpkgs.nix (100%)
 rename {modules => nixos/modules}/misc/passthru.nix (100%)
 rename {modules => nixos/modules}/misc/version.nix (100%)
 rename {modules => nixos/modules}/module-list.nix (100%)
 rename {modules => nixos/modules}/profiles/all-hardware.nix (100%)
 rename {modules => nixos/modules}/profiles/base.nix (100%)
 rename {modules => nixos/modules}/profiles/clone-config.nix (100%)
 rename {modules => nixos/modules}/profiles/demo.nix (100%)
 rename {modules => nixos/modules}/profiles/graphical.nix (100%)
 rename {modules => nixos/modules}/profiles/headless.nix (100%)
 rename {modules => nixos/modules}/profiles/installation-device.nix (100%)
 rename {modules => nixos/modules}/profiles/minimal.nix (100%)
 rename {modules => nixos/modules}/profiles/qemu-guest.nix (100%)
 rename {modules => nixos/modules}/programs/atop.nix (100%)
 rename {modules => nixos/modules}/programs/bash/bash.nix (100%)
 rename {modules => nixos/modules}/programs/bash/command-not-found.nix (100%)
 rename {modules => nixos/modules}/programs/bash/command-not-found.pl (100%)
 rename {modules => nixos/modules}/programs/bash/inputrc (100%)
 rename {modules => nixos/modules}/programs/blcr.nix (100%)
 rename {modules => nixos/modules}/programs/environment.nix (100%)
 rename {modules => nixos/modules}/programs/info.nix (100%)
 rename {modules => nixos/modules}/programs/shadow.nix (100%)
 rename {modules => nixos/modules}/programs/shell.nix (100%)
 rename {modules => nixos/modules}/programs/ssh.nix (100%)
 rename {modules => nixos/modules}/programs/ssmtp.nix (100%)
 rename {modules => nixos/modules}/programs/venus.nix (100%)
 rename {modules => nixos/modules}/programs/virtualbox.nix (100%)
 rename {modules => nixos/modules}/programs/wvdial.nix (100%)
 rename {modules => nixos/modules}/programs/zsh/zinputrc (100%)
 rename {modules => nixos/modules}/programs/zsh/zsh.nix (100%)
 rename {modules => nixos/modules}/rename.nix (100%)
 rename {modules => nixos/modules}/security/apparmor-suid.nix (100%)
 rename {modules => nixos/modules}/security/apparmor.nix (100%)
 rename {modules => nixos/modules}/security/ca.nix (100%)
 rename {modules => nixos/modules}/security/pam.nix (100%)
 rename {modules => nixos/modules}/security/pam_usb.nix (100%)
 rename {modules => nixos/modules}/security/polkit.nix (100%)
 rename {modules => nixos/modules}/security/rngd.nix (100%)
 rename {modules => nixos/modules}/security/rtkit.nix (100%)
 rename {modules => nixos/modules}/security/setuid-wrapper.c (100%)
 rename {modules => nixos/modules}/security/setuid-wrappers.nix (100%)
 rename {modules => nixos/modules}/security/sudo.nix (100%)
 rename {modules => nixos/modules}/services/amqp/activemq/ActiveMQBroker.java (100%)
 rename {modules => nixos/modules}/services/amqp/activemq/default.nix (100%)
 rename {modules => nixos/modules}/services/amqp/rabbitmq.nix (100%)
 rename {modules => nixos/modules}/services/audio/alsa.nix (100%)
 rename {modules => nixos/modules}/services/audio/fuppes.nix (100%)
 rename {modules => nixos/modules}/services/audio/fuppes/vfolder.cfg (100%)
 rename {modules => nixos/modules}/services/audio/mpd.nix (100%)
 rename {modules => nixos/modules}/services/backup/almir.nix (100%)
 rename {modules => nixos/modules}/services/backup/bacula.nix (100%)
 rename {modules => nixos/modules}/services/backup/mysql-backup.nix (100%)
 rename {modules => nixos/modules}/services/backup/postgresql-backup.nix (100%)
 rename {modules => nixos/modules}/services/backup/rsnapshot.nix (100%)
 rename {modules => nixos/modules}/services/backup/sitecopy-backup.nix (100%)
 rename {modules => nixos/modules}/services/databases/4store-endpoint.nix (100%)
 rename {modules => nixos/modules}/services/databases/4store.nix (100%)
 rename {modules => nixos/modules}/services/databases/firebird.nix (100%)
 rename {modules => nixos/modules}/services/databases/memcached.nix (100%)
 rename {modules => nixos/modules}/services/databases/mongodb.nix (100%)
 rename {modules => nixos/modules}/services/databases/mysql.nix (100%)
 rename {modules => nixos/modules}/services/databases/mysql55.nix (100%)
 rename {modules => nixos/modules}/services/databases/openldap.nix (100%)
 rename {modules => nixos/modules}/services/databases/postgresql.nix (100%)
 rename {modules => nixos/modules}/services/databases/redis.nix (100%)
 rename {modules => nixos/modules}/services/databases/virtuoso.nix (100%)
 rename {modules => nixos/modules}/services/games/ghost-one.nix (100%)
 rename {modules => nixos/modules}/services/hardware/acpid.nix (100%)
 rename {modules => nixos/modules}/services/hardware/bluetooth.nix (100%)
 rename {modules => nixos/modules}/services/hardware/nvidia-optimus.nix (100%)
 rename {modules => nixos/modules}/services/hardware/pcscd.nix (100%)
 rename {modules => nixos/modules}/services/hardware/pommed.nix (100%)
 rename {modules => nixos/modules}/services/hardware/sane.nix (100%)
 rename {modules => nixos/modules}/services/hardware/thinkfan.nix (100%)
 rename {modules => nixos/modules}/services/hardware/udev.nix (100%)
 rename {modules => nixos/modules}/services/hardware/udisks.nix (100%)
 rename {modules => nixos/modules}/services/hardware/udisks2.nix (100%)
 rename {modules => nixos/modules}/services/hardware/upower.nix (100%)
 rename {modules => nixos/modules}/services/logging/klogd.nix (100%)
 rename {modules => nixos/modules}/services/logging/logcheck.nix (100%)
 rename {modules => nixos/modules}/services/logging/logrotate.nix (100%)
 rename {modules => nixos/modules}/services/logging/logstash.nix (100%)
 rename {modules => nixos/modules}/services/logging/rsyslogd.nix (100%)
 rename {modules => nixos/modules}/services/logging/syslogd.nix (100%)
 rename {modules => nixos/modules}/services/mail/dovecot.nix (100%)
 rename {modules => nixos/modules}/services/mail/freepops.nix (100%)
 rename {modules => nixos/modules}/services/mail/mail.nix (100%)
 rename {modules => nixos/modules}/services/mail/opensmtpd.nix (100%)
 rename {modules => nixos/modules}/services/mail/postfix.nix (100%)
 rename {modules => nixos/modules}/services/mail/spamassassin.nix (100%)
 rename {modules => nixos/modules}/services/misc/autofs.nix (100%)
 rename {modules => nixos/modules}/services/misc/cgminer.nix (100%)
 rename {modules => nixos/modules}/services/misc/disnix.nix (100%)
 rename {modules => nixos/modules}/services/misc/felix.nix (100%)
 rename {modules => nixos/modules}/services/misc/folding-at-home.nix (100%)
 rename {modules => nixos/modules}/services/misc/gpsd.nix (100%)
 rename {modules => nixos/modules}/services/misc/nix-daemon.nix (100%)
 rename {modules => nixos/modules}/services/misc/nix-gc.nix (100%)
 rename {modules => nixos/modules}/services/misc/nixos-manual.nix (100%)
 rename {modules => nixos/modules}/services/misc/rogue.nix (100%)
 rename {modules => nixos/modules}/services/misc/svnserve.nix (100%)
 rename {modules => nixos/modules}/services/misc/synergy.nix (100%)
 rename {modules => nixos/modules}/services/monitoring/apcupsd.nix (100%)
 rename {modules => nixos/modules}/services/monitoring/dd-agent.nix (100%)
 rename {modules => nixos/modules}/services/monitoring/graphite.nix (100%)
 rename {modules => nixos/modules}/services/monitoring/monit.nix (100%)
 rename {modules => nixos/modules}/services/monitoring/nagios/commands.cfg (100%)
 rename {modules => nixos/modules}/services/monitoring/nagios/default.nix (100%)
 rename {modules => nixos/modules}/services/monitoring/nagios/host-templates.cfg (100%)
 rename {modules => nixos/modules}/services/monitoring/nagios/service-templates.cfg (100%)
 rename {modules => nixos/modules}/services/monitoring/nagios/timeperiods.cfg (100%)
 rename {modules => nixos/modules}/services/monitoring/smartd.nix (100%)
 rename {modules => nixos/modules}/services/monitoring/statsd.nix (100%)
 rename {modules => nixos/modules}/services/monitoring/systemhealth.nix (100%)
 rename {modules => nixos/modules}/services/monitoring/ups.nix (100%)
 rename {modules => nixos/modules}/services/monitoring/uptime.nix (100%)
 rename {modules => nixos/modules}/services/monitoring/zabbix-agent.nix (100%)
 rename {modules => nixos/modules}/services/monitoring/zabbix-server.nix (100%)
 rename {modules => nixos/modules}/services/network-filesystems/drbd.nix (100%)
 rename {modules => nixos/modules}/services/network-filesystems/nfsd.nix (100%)
 rename {modules => nixos/modules}/services/network-filesystems/openafs-client/default.nix (100%)
 rename {modules => nixos/modules}/services/network-filesystems/samba.nix (100%)
 rename {modules => nixos/modules}/services/networking/amuled.nix (100%)
 rename {modules => nixos/modules}/services/networking/avahi-daemon.nix (100%)
 rename {modules => nixos/modules}/services/networking/bind.nix (100%)
 rename {modules => nixos/modules}/services/networking/bitlbee.nix (100%)
 rename {modules => nixos/modules}/services/networking/chrony.nix (100%)
 rename {modules => nixos/modules}/services/networking/cntlm.nix (100%)
 rename {modules => nixos/modules}/services/networking/ddclient.nix (100%)
 rename {modules => nixos/modules}/services/networking/dhclient.nix (100%)
 rename {modules => nixos/modules}/services/networking/dhcpcd.nix (100%)
 rename {modules => nixos/modules}/services/networking/dhcpd.nix (100%)
 rename {modules => nixos/modules}/services/networking/dnsmasq.nix (100%)
 rename {modules => nixos/modules}/services/networking/ejabberd.nix (100%)
 rename {modules => nixos/modules}/services/networking/firewall.nix (100%)
 rename {modules => nixos/modules}/services/networking/flashpolicyd.nix (100%)
 rename {modules => nixos/modules}/services/networking/freenet.nix (100%)
 rename {modules => nixos/modules}/services/networking/git-daemon.nix (100%)
 rename {modules => nixos/modules}/services/networking/gnunet.nix (100%)
 rename {modules => nixos/modules}/services/networking/gogoclient.nix (100%)
 rename {modules => nixos/modules}/services/networking/gvpe.nix (100%)
 rename {modules => nixos/modules}/services/networking/hostapd.nix (100%)
 rename {modules => nixos/modules}/services/networking/ifplugd.nix (100%)
 rename {modules => nixos/modules}/services/networking/iodined.nix (100%)
 rename {modules => nixos/modules}/services/networking/ircd-hybrid/builder.sh (100%)
 rename {modules => nixos/modules}/services/networking/ircd-hybrid/control.in (100%)
 rename {modules => nixos/modules}/services/networking/ircd-hybrid/default.nix (100%)
 rename {modules => nixos/modules}/services/networking/ircd-hybrid/ircd.conf (100%)
 rename {modules => nixos/modules}/services/networking/minidlna.nix (100%)
 rename {modules => nixos/modules}/services/networking/nat.nix (100%)
 rename {modules => nixos/modules}/services/networking/networkmanager.nix (100%)
 rename {modules => nixos/modules}/services/networking/ntpd.nix (100%)
 rename {modules => nixos/modules}/services/networking/oidentd.nix (100%)
 rename {modules => nixos/modules}/services/networking/openfire.nix (100%)
 rename {modules => nixos/modules}/services/networking/openvpn.nix (100%)
 rename {modules => nixos/modules}/services/networking/prayer.nix (100%)
 rename {modules => nixos/modules}/services/networking/privoxy.nix (100%)
 rename {modules => nixos/modules}/services/networking/quassel.nix (100%)
 rename {modules => nixos/modules}/services/networking/radvd.nix (100%)
 rename {modules => nixos/modules}/services/networking/rdnssd.nix (100%)
 rename {modules => nixos/modules}/services/networking/rpcbind.nix (100%)
 rename {modules => nixos/modules}/services/networking/sabnzbd.nix (100%)
 rename {modules => nixos/modules}/services/networking/ssh/lshd.nix (100%)
 rename {modules => nixos/modules}/services/networking/ssh/sshd.nix (100%)
 rename {modules => nixos/modules}/services/networking/supybot.nix (100%)
 rename {modules => nixos/modules}/services/networking/tcpcrypt.nix (100%)
 rename {modules => nixos/modules}/services/networking/tftpd.nix (100%)
 rename {modules => nixos/modules}/services/networking/unbound.nix (100%)
 rename {modules => nixos/modules}/services/networking/vsftpd.nix (100%)
 rename {modules => nixos/modules}/services/networking/wakeonlan.nix (100%)
 rename {modules => nixos/modules}/services/networking/websockify.nix (100%)
 rename {modules => nixos/modules}/services/networking/wicd.nix (100%)
 rename {modules => nixos/modules}/services/networking/wpa_supplicant.nix (100%)
 rename {modules => nixos/modules}/services/networking/xinetd.nix (100%)
 rename {modules => nixos/modules}/services/printing/cupsd.nix (100%)
 rename {modules => nixos/modules}/services/scheduling/atd.nix (100%)
 rename {modules => nixos/modules}/services/scheduling/cron.nix (100%)
 rename {modules => nixos/modules}/services/scheduling/fcron.nix (100%)
 rename {modules => nixos/modules}/services/search/elasticsearch.nix (100%)
 rename {modules => nixos/modules}/services/security/clamav.nix (100%)
 rename {modules => nixos/modules}/services/security/fail2ban.nix (100%)
 rename {modules => nixos/modules}/services/security/fprot.nix (100%)
 rename {modules => nixos/modules}/services/security/frandom.nix (100%)
 rename {modules => nixos/modules}/services/security/tor.nix (100%)
 rename {modules => nixos/modules}/services/security/torify.nix (100%)
 rename {modules => nixos/modules}/services/security/torsocks.nix (100%)
 rename {modules => nixos/modules}/services/system/dbus.nix (100%)
 rename {modules => nixos/modules}/services/system/kerberos.nix (100%)
 rename {modules => nixos/modules}/services/system/nscd.conf (100%)
 rename {modules => nixos/modules}/services/system/nscd.nix (100%)
 rename {modules => nixos/modules}/services/system/uptimed.nix (100%)
 rename {modules => nixos/modules}/services/torrent/deluge.nix (100%)
 rename {modules => nixos/modules}/services/torrent/transmission.nix (100%)
 rename {modules => nixos/modules}/services/ttys/agetty.nix (100%)
 rename {modules => nixos/modules}/services/ttys/gpm.nix (100%)
 rename {modules => nixos/modules}/services/web-servers/apache-httpd/default.nix (100%)
 rename {modules => nixos/modules}/services/web-servers/apache-httpd/mediawiki.nix (100%)
 rename {modules => nixos/modules}/services/web-servers/apache-httpd/mercurial.nix (100%)
 rename {modules => nixos/modules}/services/web-servers/apache-httpd/per-server-options.nix (100%)
 rename {modules => nixos/modules}/services/web-servers/apache-httpd/tomcat-connector.nix (100%)
 rename {modules => nixos/modules}/services/web-servers/apache-httpd/trac.nix (100%)
 rename {modules => nixos/modules}/services/web-servers/apache-httpd/zabbix.nix (100%)
 rename {modules => nixos/modules}/services/web-servers/jboss/builder.sh (100%)
 rename {modules => nixos/modules}/services/web-servers/jboss/default.nix (100%)
 rename {modules => nixos/modules}/services/web-servers/lighttpd/cgit.nix (100%)
 rename {modules => nixos/modules}/services/web-servers/lighttpd/default.nix (100%)
 rename {modules => nixos/modules}/services/web-servers/lighttpd/gitweb.nix (100%)
 rename {modules => nixos/modules}/services/web-servers/nginx/default.nix (100%)
 rename {modules => nixos/modules}/services/web-servers/tomcat.nix (100%)
 rename {modules => nixos/modules}/services/web-servers/varnish/default.nix (100%)
 rename {modules => nixos/modules}/services/web-servers/zope2.nix (100%)
 rename {modules => nixos/modules}/services/x11/desktop-managers/default.nix (100%)
 rename {modules => nixos/modules}/services/x11/desktop-managers/e17.nix (100%)
 rename {modules => nixos/modules}/services/x11/desktop-managers/gnome.nix (100%)
 rename {modules => nixos/modules}/services/x11/desktop-managers/kde4.nix (100%)
 rename {modules => nixos/modules}/services/x11/desktop-managers/none.nix (100%)
 rename {modules => nixos/modules}/services/x11/desktop-managers/xfce.nix (100%)
 rename {modules => nixos/modules}/services/x11/desktop-managers/xterm.nix (100%)
 rename {modules => nixos/modules}/services/x11/display-managers/auto.nix (100%)
 rename {modules => nixos/modules}/services/x11/display-managers/default.nix (100%)
 rename {modules => nixos/modules}/services/x11/display-managers/kdm.nix (100%)
 rename {modules => nixos/modules}/services/x11/display-managers/lightdm.nix (100%)
 rename {modules => nixos/modules}/services/x11/display-managers/slim.nix (100%)
 rename {modules => nixos/modules}/services/x11/hardware/multitouch.nix (100%)
 rename {modules => nixos/modules}/services/x11/hardware/synaptics.nix (100%)
 rename {modules => nixos/modules}/services/x11/hardware/wacom.nix (100%)
 rename {modules => nixos/modules}/services/x11/terminal-server.nix (100%)
 rename {modules => nixos/modules}/services/x11/window-managers/awesome.nix (100%)
 rename {modules => nixos/modules}/services/x11/window-managers/compiz.nix (100%)
 rename {modules => nixos/modules}/services/x11/window-managers/default.nix (100%)
 rename {modules => nixos/modules}/services/x11/window-managers/i3.nix (100%)
 rename {modules => nixos/modules}/services/x11/window-managers/icewm.nix (100%)
 rename {modules => nixos/modules}/services/x11/window-managers/metacity.nix (100%)
 rename {modules => nixos/modules}/services/x11/window-managers/none.nix (100%)
 rename {modules => nixos/modules}/services/x11/window-managers/openbox.nix (100%)
 rename {modules => nixos/modules}/services/x11/window-managers/twm.nix (100%)
 rename {modules => nixos/modules}/services/x11/window-managers/wmii.nix (100%)
 rename {modules => nixos/modules}/services/x11/window-managers/xbmc.nix (100%)
 rename {modules => nixos/modules}/services/x11/window-managers/xmonad.nix (100%)
 rename {modules => nixos/modules}/services/x11/xfs.conf (100%)
 rename {modules => nixos/modules}/services/x11/xfs.nix (100%)
 rename {modules => nixos/modules}/services/x11/xserver.nix (100%)
 rename {modules => nixos/modules}/system/activation/activation-script.nix (100%)
 rename {modules => nixos/modules}/system/activation/no-clone.nix (100%)
 rename {modules => nixos/modules}/system/activation/switch-to-configuration.pl (100%)
 rename {modules => nixos/modules}/system/activation/top-level.nix (100%)
 rename {modules => nixos/modules}/system/boot/kernel.nix (100%)
 rename {modules => nixos/modules}/system/boot/kexec.nix (100%)
 rename {modules => nixos/modules}/system/boot/loader/efi-boot-stub/efi-boot-stub-builder.sh (100%)
 rename {modules => nixos/modules}/system/boot/loader/efi-boot-stub/efi-boot-stub.nix (100%)
 rename {modules => nixos/modules}/system/boot/loader/efi.nix (100%)
 rename {modules => nixos/modules}/system/boot/loader/generations-dir/generations-dir-builder.sh (100%)
 rename {modules => nixos/modules}/system/boot/loader/generations-dir/generations-dir.nix (100%)
 rename {modules => nixos/modules}/system/boot/loader/grub/grub.nix (100%)
 rename {modules => nixos/modules}/system/boot/loader/grub/install-grub.pl (100%)
 rename {modules => nixos/modules}/system/boot/loader/grub/memtest.nix (100%)
 rename {modules => nixos/modules}/system/boot/loader/grub/winkler-gnu-blue-640x480.png (100%)
 rename {modules => nixos/modules}/system/boot/loader/grub/winkler-gnu-blue.README (100%)
 rename {modules => nixos/modules}/system/boot/loader/gummiboot/gummiboot-builder.py (100%)
 rename {modules => nixos/modules}/system/boot/loader/gummiboot/gummiboot.nix (100%)
 rename {modules => nixos/modules}/system/boot/loader/init-script/init-script-builder.sh (100%)
 rename {modules => nixos/modules}/system/boot/loader/init-script/init-script.nix (100%)
 rename {modules => nixos/modules}/system/boot/loader/raspberrypi/builder.sh (100%)
 rename {modules => nixos/modules}/system/boot/loader/raspberrypi/raspberrypi.nix (100%)
 rename {modules => nixos/modules}/system/boot/luksroot.nix (100%)
 rename {modules => nixos/modules}/system/boot/modprobe.nix (100%)
 rename {modules => nixos/modules}/system/boot/readonly-mountpoint.c (100%)
 rename {modules => nixos/modules}/system/boot/shutdown.nix (100%)
 rename {modules => nixos/modules}/system/boot/stage-1-init.sh (100%)
 rename {modules => nixos/modules}/system/boot/stage-1.nix (100%)
 rename {modules => nixos/modules}/system/boot/stage-2-init.sh (100%)
 rename {modules => nixos/modules}/system/boot/stage-2.nix (100%)
 rename {modules => nixos/modules}/system/boot/systemd-unit-options.nix (100%)
 rename {modules => nixos/modules}/system/boot/systemd.nix (100%)
 rename {modules => nixos/modules}/system/etc/etc.nix (100%)
 rename {modules => nixos/modules}/system/etc/make-etc.sh (100%)
 rename {modules => nixos/modules}/system/etc/setup-etc.pl (100%)
 rename {modules => nixos/modules}/system/upstart/upstart.nix (100%)
 rename {modules => nixos/modules}/tasks/cpu-freq.nix (100%)
 rename {modules => nixos/modules}/tasks/filesystems.nix (100%)
 rename {modules => nixos/modules}/tasks/filesystems/btrfs.nix (100%)
 rename {modules => nixos/modules}/tasks/filesystems/ext.nix (100%)
 rename {modules => nixos/modules}/tasks/filesystems/nfs.nix (100%)
 rename {modules => nixos/modules}/tasks/filesystems/reiserfs.nix (100%)
 rename {modules => nixos/modules}/tasks/filesystems/unionfs-fuse.nix (100%)
 rename {modules => nixos/modules}/tasks/filesystems/vfat.nix (100%)
 rename {modules => nixos/modules}/tasks/filesystems/xfs.nix (100%)
 rename {modules => nixos/modules}/tasks/filesystems/zfs.nix (100%)
 rename {modules => nixos/modules}/tasks/kbd.nix (100%)
 rename {modules => nixos/modules}/tasks/lvm.nix (100%)
 rename {modules => nixos/modules}/tasks/network-interfaces.nix (100%)
 rename {modules => nixos/modules}/tasks/scsi-link-power-management.nix (100%)
 rename {modules => nixos/modules}/tasks/swraid.nix (100%)
 rename {modules => nixos/modules}/tasks/tty-backgrounds-combine.sh (100%)
 rename {modules => nixos/modules}/testing/minimal-kernel.nix (100%)
 rename {modules => nixos/modules}/testing/test-instrumentation.nix (100%)
 rename {modules => nixos/modules}/virtualisation/amazon-config.nix (100%)
 rename {modules => nixos/modules}/virtualisation/amazon-image.nix (100%)
 rename {modules => nixos/modules}/virtualisation/ec2-data.nix (100%)
 rename {modules => nixos/modules}/virtualisation/libvirtd.nix (100%)
 rename {modules => nixos/modules}/virtualisation/nova-config.nix (100%)
 rename {modules => nixos/modules}/virtualisation/nova-image.nix (100%)
 rename {modules => nixos/modules}/virtualisation/nova.nix (100%)
 rename {modules => nixos/modules}/virtualisation/qemu-opts (100%)
 rename {modules => nixos/modules}/virtualisation/qemu-vm.nix (100%)
 rename {modules => nixos/modules}/virtualisation/virtualbox-guest.nix (100%)
 rename {modules => nixos/modules}/virtualisation/virtualbox-image.nix (100%)
 rename {modules => nixos/modules}/virtualisation/xen-dom0.nix (100%)
 rename {modules => nixos/modules}/virtualisation/xen-domU.nix (100%)
 rename release-combined.nix => nixos/release-combined.nix (100%)
 rename release.nix => nixos/release.nix (100%)
 rename {tests => nixos/tests}/avahi.nix (100%)
 rename {tests => nixos/tests}/bittorrent.nix (100%)
 rename {tests => nixos/tests}/check-filesystems.nix (100%)
 rename {tests => nixos/tests}/common/user-account.nix (100%)
 rename {tests => nixos/tests}/common/x11.nix (100%)
 rename {tests => nixos/tests}/default.nix (100%)
 rename {tests => nixos/tests}/efi-installer.nix (100%)
 rename {tests => nixos/tests}/firefox.nix (100%)
 rename {tests => nixos/tests}/firewall.nix (100%)
 rename {tests => nixos/tests}/installer.nix (100%)
 rename {tests => nixos/tests}/ipv6.nix (100%)
 rename {tests => nixos/tests}/kde4.nix (100%)
 rename {tests => nixos/tests}/kexec.nix (100%)
 rename {tests => nixos/tests}/login.nix (100%)
 rename {tests => nixos/tests}/misc.nix (100%)
 rename {tests => nixos/tests}/mpich-example.c (100%)
 rename {tests => nixos/tests}/mpich.nix (100%)
 rename {tests => nixos/tests}/mysql-replication.nix (100%)
 rename {tests => nixos/tests}/mysql.nix (100%)
 rename {tests => nixos/tests}/nat.nix (100%)
 rename {tests => nixos/tests}/nfs.nix (100%)
 rename {tests => nixos/tests}/openssh.nix (100%)
 rename {tests => nixos/tests}/partition.nix (100%)
 rename {tests => nixos/tests}/printing.nix (100%)
 rename {tests => nixos/tests}/proxy.nix (100%)
 rename {tests => nixos/tests}/quake3.nix (100%)
 rename {tests => nixos/tests}/run-in-machine.nix (100%)
 rename {tests => nixos/tests}/simple.nix (100%)
 rename {tests => nixos/tests}/subversion.nix (100%)
 rename {tests => nixos/tests}/test-config-examples.sh (100%)
 rename {tests => nixos/tests}/testdb.sql (100%)
 rename {tests => nixos/tests}/tomcat.nix (100%)
 rename {tests => nixos/tests}/trac.nix (100%)
 rename {tests => nixos/tests}/xfce.nix (100%)

diff --git a/.gitignore b/nixos/.gitignore
similarity index 100%
rename from .gitignore
rename to nixos/.gitignore
diff --git a/.version b/nixos/.version
similarity index 100%
rename from .version
rename to nixos/.version
diff --git a/COPYING b/nixos/COPYING
similarity index 100%
rename from COPYING
rename to nixos/COPYING
diff --git a/README b/nixos/README
similarity index 100%
rename from README
rename to nixos/README
diff --git a/default.nix b/nixos/default.nix
similarity index 100%
rename from default.nix
rename to nixos/default.nix
diff --git a/doc/config-examples/basic.nix b/nixos/doc/config-examples/basic.nix
similarity index 100%
rename from doc/config-examples/basic.nix
rename to nixos/doc/config-examples/basic.nix
diff --git a/doc/config-examples/closed-install-configuration.nix b/nixos/doc/config-examples/closed-install-configuration.nix
similarity index 100%
rename from doc/config-examples/closed-install-configuration.nix
rename to nixos/doc/config-examples/closed-install-configuration.nix
diff --git a/doc/config-examples/root-on-lvm.nix b/nixos/doc/config-examples/root-on-lvm.nix
similarity index 100%
rename from doc/config-examples/root-on-lvm.nix
rename to nixos/doc/config-examples/root-on-lvm.nix
diff --git a/doc/config-examples/svn-server.nix b/nixos/doc/config-examples/svn-server.nix
similarity index 100%
rename from doc/config-examples/svn-server.nix
rename to nixos/doc/config-examples/svn-server.nix
diff --git a/doc/config-examples/x86_64-usbstick.nix b/nixos/doc/config-examples/x86_64-usbstick.nix
similarity index 100%
rename from doc/config-examples/x86_64-usbstick.nix
rename to nixos/doc/config-examples/x86_64-usbstick.nix
diff --git a/doc/manual/configuration.xml b/nixos/doc/manual/configuration.xml
similarity index 100%
rename from doc/manual/configuration.xml
rename to nixos/doc/manual/configuration.xml
diff --git a/doc/manual/default.nix b/nixos/doc/manual/default.nix
similarity index 100%
rename from doc/manual/default.nix
rename to nixos/doc/manual/default.nix
diff --git a/doc/manual/development.xml b/nixos/doc/manual/development.xml
similarity index 100%
rename from doc/manual/development.xml
rename to nixos/doc/manual/development.xml
diff --git a/doc/manual/installation.xml b/nixos/doc/manual/installation.xml
similarity index 100%
rename from doc/manual/installation.xml
rename to nixos/doc/manual/installation.xml
diff --git a/doc/manual/man-configuration.xml b/nixos/doc/manual/man-configuration.xml
similarity index 100%
rename from doc/manual/man-configuration.xml
rename to nixos/doc/manual/man-configuration.xml
diff --git a/doc/manual/man-nixos-build-vms.xml b/nixos/doc/manual/man-nixos-build-vms.xml
similarity index 100%
rename from doc/manual/man-nixos-build-vms.xml
rename to nixos/doc/manual/man-nixos-build-vms.xml
diff --git a/doc/manual/man-nixos-option.xml b/nixos/doc/manual/man-nixos-option.xml
similarity index 100%
rename from doc/manual/man-nixos-option.xml
rename to nixos/doc/manual/man-nixos-option.xml
diff --git a/doc/manual/man-nixos-rebuild.xml b/nixos/doc/manual/man-nixos-rebuild.xml
similarity index 100%
rename from doc/manual/man-nixos-rebuild.xml
rename to nixos/doc/manual/man-nixos-rebuild.xml
diff --git a/doc/manual/man-pages.xml b/nixos/doc/manual/man-pages.xml
similarity index 100%
rename from doc/manual/man-pages.xml
rename to nixos/doc/manual/man-pages.xml
diff --git a/doc/manual/manual.xml b/nixos/doc/manual/manual.xml
similarity index 100%
rename from doc/manual/manual.xml
rename to nixos/doc/manual/manual.xml
diff --git a/doc/manual/options-to-docbook.xsl b/nixos/doc/manual/options-to-docbook.xsl
similarity index 100%
rename from doc/manual/options-to-docbook.xsl
rename to nixos/doc/manual/options-to-docbook.xsl
diff --git a/doc/manual/running.xml b/nixos/doc/manual/running.xml
similarity index 100%
rename from doc/manual/running.xml
rename to nixos/doc/manual/running.xml
diff --git a/doc/manual/style.css b/nixos/doc/manual/style.css
similarity index 100%
rename from doc/manual/style.css
rename to nixos/doc/manual/style.css
diff --git a/doc/manual/troubleshooting.xml b/nixos/doc/manual/troubleshooting.xml
similarity index 100%
rename from doc/manual/troubleshooting.xml
rename to nixos/doc/manual/troubleshooting.xml
diff --git a/doc/manual/userconfiguration.xml b/nixos/doc/manual/userconfiguration.xml
similarity index 100%
rename from doc/manual/userconfiguration.xml
rename to nixos/doc/manual/userconfiguration.xml
diff --git a/gui/README b/nixos/gui/README
similarity index 100%
rename from gui/README
rename to nixos/gui/README
diff --git a/gui/application.ini b/nixos/gui/application.ini
similarity index 100%
rename from gui/application.ini
rename to nixos/gui/application.ini
diff --git a/gui/chrome.manifest b/nixos/gui/chrome.manifest
similarity index 100%
rename from gui/chrome.manifest
rename to nixos/gui/chrome.manifest
diff --git a/gui/chrome/chrome.manifest b/nixos/gui/chrome/chrome.manifest
similarity index 100%
rename from gui/chrome/chrome.manifest
rename to nixos/gui/chrome/chrome.manifest
diff --git a/gui/chrome/content/io.js b/nixos/gui/chrome/content/io.js
similarity index 100%
rename from gui/chrome/content/io.js
rename to nixos/gui/chrome/content/io.js
diff --git a/gui/chrome/content/main.js b/nixos/gui/chrome/content/main.js
similarity index 100%
rename from gui/chrome/content/main.js
rename to nixos/gui/chrome/content/main.js
diff --git a/gui/chrome/content/myviewer.xul b/nixos/gui/chrome/content/myviewer.xul
similarity index 100%
rename from gui/chrome/content/myviewer.xul
rename to nixos/gui/chrome/content/myviewer.xul
diff --git a/gui/chrome/content/nixos.js b/nixos/gui/chrome/content/nixos.js
similarity index 100%
rename from gui/chrome/content/nixos.js
rename to nixos/gui/chrome/content/nixos.js
diff --git a/gui/chrome/content/optionView.js b/nixos/gui/chrome/content/optionView.js
similarity index 100%
rename from gui/chrome/content/optionView.js
rename to nixos/gui/chrome/content/optionView.js
diff --git a/gui/components/clh.js b/nixos/gui/components/clh.js
similarity index 100%
rename from gui/components/clh.js
rename to nixos/gui/components/clh.js
diff --git a/gui/defaults/preferences/myviewer-prefs.js b/nixos/gui/defaults/preferences/myviewer-prefs.js
similarity index 100%
rename from gui/defaults/preferences/myviewer-prefs.js
rename to nixos/gui/defaults/preferences/myviewer-prefs.js
diff --git a/lib/build-vms.nix b/nixos/lib/build-vms.nix
similarity index 100%
rename from lib/build-vms.nix
rename to nixos/lib/build-vms.nix
diff --git a/lib/channel-expr.nix b/nixos/lib/channel-expr.nix
similarity index 100%
rename from lib/channel-expr.nix
rename to nixos/lib/channel-expr.nix
diff --git a/lib/eval-config.nix b/nixos/lib/eval-config.nix
similarity index 100%
rename from lib/eval-config.nix
rename to nixos/lib/eval-config.nix
diff --git a/lib/from-env.nix b/nixos/lib/from-env.nix
similarity index 100%
rename from lib/from-env.nix
rename to nixos/lib/from-env.nix
diff --git a/lib/make-iso9660-image.nix b/nixos/lib/make-iso9660-image.nix
similarity index 100%
rename from lib/make-iso9660-image.nix
rename to nixos/lib/make-iso9660-image.nix
diff --git a/lib/make-iso9660-image.sh b/nixos/lib/make-iso9660-image.sh
similarity index 100%
rename from lib/make-iso9660-image.sh
rename to nixos/lib/make-iso9660-image.sh
diff --git a/lib/make-squashfs.nix b/nixos/lib/make-squashfs.nix
similarity index 100%
rename from lib/make-squashfs.nix
rename to nixos/lib/make-squashfs.nix
diff --git a/lib/make-system-tarball.nix b/nixos/lib/make-system-tarball.nix
similarity index 100%
rename from lib/make-system-tarball.nix
rename to nixos/lib/make-system-tarball.nix
diff --git a/lib/make-system-tarball.sh b/nixos/lib/make-system-tarball.sh
similarity index 100%
rename from lib/make-system-tarball.sh
rename to nixos/lib/make-system-tarball.sh
diff --git a/lib/qemu-flags.nix b/nixos/lib/qemu-flags.nix
similarity index 100%
rename from lib/qemu-flags.nix
rename to nixos/lib/qemu-flags.nix
diff --git a/lib/test-driver/Logger.pm b/nixos/lib/test-driver/Logger.pm
similarity index 100%
rename from lib/test-driver/Logger.pm
rename to nixos/lib/test-driver/Logger.pm
diff --git a/lib/test-driver/Machine.pm b/nixos/lib/test-driver/Machine.pm
similarity index 100%
rename from lib/test-driver/Machine.pm
rename to nixos/lib/test-driver/Machine.pm
diff --git a/lib/test-driver/log2html.xsl b/nixos/lib/test-driver/log2html.xsl
similarity index 100%
rename from lib/test-driver/log2html.xsl
rename to nixos/lib/test-driver/log2html.xsl
diff --git a/lib/test-driver/logfile.css b/nixos/lib/test-driver/logfile.css
similarity index 100%
rename from lib/test-driver/logfile.css
rename to nixos/lib/test-driver/logfile.css
diff --git a/lib/test-driver/test-driver.pl b/nixos/lib/test-driver/test-driver.pl
similarity index 100%
rename from lib/test-driver/test-driver.pl
rename to nixos/lib/test-driver/test-driver.pl
diff --git a/lib/test-driver/treebits.js b/nixos/lib/test-driver/treebits.js
similarity index 100%
rename from lib/test-driver/treebits.js
rename to nixos/lib/test-driver/treebits.js
diff --git a/lib/testing.nix b/nixos/lib/testing.nix
similarity index 100%
rename from lib/testing.nix
rename to nixos/lib/testing.nix
diff --git a/lib/utils.nix b/nixos/lib/utils.nix
similarity index 100%
rename from lib/utils.nix
rename to nixos/lib/utils.nix
diff --git a/maintainers/option-usages.nix b/nixos/maintainers/option-usages.nix
similarity index 100%
rename from maintainers/option-usages.nix
rename to nixos/maintainers/option-usages.nix
diff --git a/maintainers/scripts/ec2/create-ebs-amis.py b/nixos/maintainers/scripts/ec2/create-ebs-amis.py
similarity index 100%
rename from maintainers/scripts/ec2/create-ebs-amis.py
rename to nixos/maintainers/scripts/ec2/create-ebs-amis.py
diff --git a/maintainers/scripts/ec2/create-s3-amis.sh b/nixos/maintainers/scripts/ec2/create-s3-amis.sh
similarity index 100%
rename from maintainers/scripts/ec2/create-s3-amis.sh
rename to nixos/maintainers/scripts/ec2/create-s3-amis.sh
diff --git a/maintainers/scripts/ec2/ebs-creator.nix b/nixos/maintainers/scripts/ec2/ebs-creator.nix
similarity index 100%
rename from maintainers/scripts/ec2/ebs-creator.nix
rename to nixos/maintainers/scripts/ec2/ebs-creator.nix
diff --git a/modules/config/fonts/corefonts.nix b/nixos/modules/config/fonts/corefonts.nix
similarity index 100%
rename from modules/config/fonts/corefonts.nix
rename to nixos/modules/config/fonts/corefonts.nix
diff --git a/modules/config/fonts/fontconfig.nix b/nixos/modules/config/fonts/fontconfig.nix
similarity index 100%
rename from modules/config/fonts/fontconfig.nix
rename to nixos/modules/config/fonts/fontconfig.nix
diff --git a/modules/config/fonts/fontdir.nix b/nixos/modules/config/fonts/fontdir.nix
similarity index 100%
rename from modules/config/fonts/fontdir.nix
rename to nixos/modules/config/fonts/fontdir.nix
diff --git a/modules/config/fonts/fonts.nix b/nixos/modules/config/fonts/fonts.nix
similarity index 100%
rename from modules/config/fonts/fonts.nix
rename to nixos/modules/config/fonts/fonts.nix
diff --git a/modules/config/fonts/ghostscript.nix b/nixos/modules/config/fonts/ghostscript.nix
similarity index 100%
rename from modules/config/fonts/ghostscript.nix
rename to nixos/modules/config/fonts/ghostscript.nix
diff --git a/modules/config/gnu.nix b/nixos/modules/config/gnu.nix
similarity index 100%
rename from modules/config/gnu.nix
rename to nixos/modules/config/gnu.nix
diff --git a/modules/config/i18n.nix b/nixos/modules/config/i18n.nix
similarity index 100%
rename from modules/config/i18n.nix
rename to nixos/modules/config/i18n.nix
diff --git a/modules/config/krb5.nix b/nixos/modules/config/krb5.nix
similarity index 100%
rename from modules/config/krb5.nix
rename to nixos/modules/config/krb5.nix
diff --git a/modules/config/ldap.nix b/nixos/modules/config/ldap.nix
similarity index 100%
rename from modules/config/ldap.nix
rename to nixos/modules/config/ldap.nix
diff --git a/modules/config/networking.nix b/nixos/modules/config/networking.nix
similarity index 100%
rename from modules/config/networking.nix
rename to nixos/modules/config/networking.nix
diff --git a/modules/config/no-x-libs.nix b/nixos/modules/config/no-x-libs.nix
similarity index 100%
rename from modules/config/no-x-libs.nix
rename to nixos/modules/config/no-x-libs.nix
diff --git a/modules/config/nsswitch.nix b/nixos/modules/config/nsswitch.nix
similarity index 100%
rename from modules/config/nsswitch.nix
rename to nixos/modules/config/nsswitch.nix
diff --git a/modules/config/power-management.nix b/nixos/modules/config/power-management.nix
similarity index 100%
rename from modules/config/power-management.nix
rename to nixos/modules/config/power-management.nix
diff --git a/modules/config/pulseaudio.nix b/nixos/modules/config/pulseaudio.nix
similarity index 100%
rename from modules/config/pulseaudio.nix
rename to nixos/modules/config/pulseaudio.nix
diff --git a/modules/config/shells-environment.nix b/nixos/modules/config/shells-environment.nix
similarity index 100%
rename from modules/config/shells-environment.nix
rename to nixos/modules/config/shells-environment.nix
diff --git a/modules/config/swap.nix b/nixos/modules/config/swap.nix
similarity index 100%
rename from modules/config/swap.nix
rename to nixos/modules/config/swap.nix
diff --git a/modules/config/sysctl.nix b/nixos/modules/config/sysctl.nix
similarity index 100%
rename from modules/config/sysctl.nix
rename to nixos/modules/config/sysctl.nix
diff --git a/modules/config/system-path.nix b/nixos/modules/config/system-path.nix
similarity index 100%
rename from modules/config/system-path.nix
rename to nixos/modules/config/system-path.nix
diff --git a/modules/config/timezone.nix b/nixos/modules/config/timezone.nix
similarity index 100%
rename from modules/config/timezone.nix
rename to nixos/modules/config/timezone.nix
diff --git a/modules/config/unix-odbc-drivers.nix b/nixos/modules/config/unix-odbc-drivers.nix
similarity index 100%
rename from modules/config/unix-odbc-drivers.nix
rename to nixos/modules/config/unix-odbc-drivers.nix
diff --git a/modules/config/users-groups.nix b/nixos/modules/config/users-groups.nix
similarity index 100%
rename from modules/config/users-groups.nix
rename to nixos/modules/config/users-groups.nix
diff --git a/modules/hardware/all-firmware.nix b/nixos/modules/hardware/all-firmware.nix
similarity index 100%
rename from modules/hardware/all-firmware.nix
rename to nixos/modules/hardware/all-firmware.nix
diff --git a/modules/hardware/cpu/amd-microcode.nix b/nixos/modules/hardware/cpu/amd-microcode.nix
similarity index 100%
rename from modules/hardware/cpu/amd-microcode.nix
rename to nixos/modules/hardware/cpu/amd-microcode.nix
diff --git a/modules/hardware/cpu/intel-microcode.nix b/nixos/modules/hardware/cpu/intel-microcode.nix
similarity index 100%
rename from modules/hardware/cpu/intel-microcode.nix
rename to nixos/modules/hardware/cpu/intel-microcode.nix
diff --git a/modules/hardware/network/b43.nix b/nixos/modules/hardware/network/b43.nix
similarity index 100%
rename from modules/hardware/network/b43.nix
rename to nixos/modules/hardware/network/b43.nix
diff --git a/modules/hardware/network/broadcom-43xx.nix b/nixos/modules/hardware/network/broadcom-43xx.nix
similarity index 100%
rename from modules/hardware/network/broadcom-43xx.nix
rename to nixos/modules/hardware/network/broadcom-43xx.nix
diff --git a/modules/hardware/network/intel-2030.nix b/nixos/modules/hardware/network/intel-2030.nix
similarity index 100%
rename from modules/hardware/network/intel-2030.nix
rename to nixos/modules/hardware/network/intel-2030.nix
diff --git a/modules/hardware/network/intel-2100bg.nix b/nixos/modules/hardware/network/intel-2100bg.nix
similarity index 100%
rename from modules/hardware/network/intel-2100bg.nix
rename to nixos/modules/hardware/network/intel-2100bg.nix
diff --git a/modules/hardware/network/intel-2200bg.nix b/nixos/modules/hardware/network/intel-2200bg.nix
similarity index 100%
rename from modules/hardware/network/intel-2200bg.nix
rename to nixos/modules/hardware/network/intel-2200bg.nix
diff --git a/modules/hardware/network/intel-3945abg.nix b/nixos/modules/hardware/network/intel-3945abg.nix
similarity index 100%
rename from modules/hardware/network/intel-3945abg.nix
rename to nixos/modules/hardware/network/intel-3945abg.nix
diff --git a/modules/hardware/network/intel-4965agn.nix b/nixos/modules/hardware/network/intel-4965agn.nix
similarity index 100%
rename from modules/hardware/network/intel-4965agn.nix
rename to nixos/modules/hardware/network/intel-4965agn.nix
diff --git a/modules/hardware/network/intel-5000.nix b/nixos/modules/hardware/network/intel-5000.nix
similarity index 100%
rename from modules/hardware/network/intel-5000.nix
rename to nixos/modules/hardware/network/intel-5000.nix
diff --git a/modules/hardware/network/intel-5150.nix b/nixos/modules/hardware/network/intel-5150.nix
similarity index 100%
rename from modules/hardware/network/intel-5150.nix
rename to nixos/modules/hardware/network/intel-5150.nix
diff --git a/modules/hardware/network/intel-6000.nix b/nixos/modules/hardware/network/intel-6000.nix
similarity index 100%
rename from modules/hardware/network/intel-6000.nix
rename to nixos/modules/hardware/network/intel-6000.nix
diff --git a/modules/hardware/network/intel-6000g2a.nix b/nixos/modules/hardware/network/intel-6000g2a.nix
similarity index 100%
rename from modules/hardware/network/intel-6000g2a.nix
rename to nixos/modules/hardware/network/intel-6000g2a.nix
diff --git a/modules/hardware/network/intel-6000g2b.nix b/nixos/modules/hardware/network/intel-6000g2b.nix
similarity index 100%
rename from modules/hardware/network/intel-6000g2b.nix
rename to nixos/modules/hardware/network/intel-6000g2b.nix
diff --git a/modules/hardware/network/ralink.nix b/nixos/modules/hardware/network/ralink.nix
similarity index 100%
rename from modules/hardware/network/ralink.nix
rename to nixos/modules/hardware/network/ralink.nix
diff --git a/modules/hardware/network/rtl8192c.nix b/nixos/modules/hardware/network/rtl8192c.nix
similarity index 100%
rename from modules/hardware/network/rtl8192c.nix
rename to nixos/modules/hardware/network/rtl8192c.nix
diff --git a/modules/hardware/network/smc-2632w/default.nix b/nixos/modules/hardware/network/smc-2632w/default.nix
similarity index 100%
rename from modules/hardware/network/smc-2632w/default.nix
rename to nixos/modules/hardware/network/smc-2632w/default.nix
diff --git a/modules/hardware/network/smc-2632w/firmware/cis/SMC2632W-v1.02.cis b/nixos/modules/hardware/network/smc-2632w/firmware/cis/SMC2632W-v1.02.cis
similarity index 100%
rename from modules/hardware/network/smc-2632w/firmware/cis/SMC2632W-v1.02.cis
rename to nixos/modules/hardware/network/smc-2632w/firmware/cis/SMC2632W-v1.02.cis
diff --git a/modules/hardware/network/zydas-zd1211.nix b/nixos/modules/hardware/network/zydas-zd1211.nix
similarity index 100%
rename from modules/hardware/network/zydas-zd1211.nix
rename to nixos/modules/hardware/network/zydas-zd1211.nix
diff --git a/modules/hardware/pcmcia.nix b/nixos/modules/hardware/pcmcia.nix
similarity index 100%
rename from modules/hardware/pcmcia.nix
rename to nixos/modules/hardware/pcmcia.nix
diff --git a/modules/hardware/video/encoder/wis-go7007.nix b/nixos/modules/hardware/video/encoder/wis-go7007.nix
similarity index 100%
rename from modules/hardware/video/encoder/wis-go7007.nix
rename to nixos/modules/hardware/video/encoder/wis-go7007.nix
diff --git a/modules/hardware/video/radeon.nix b/nixos/modules/hardware/video/radeon.nix
similarity index 100%
rename from modules/hardware/video/radeon.nix
rename to nixos/modules/hardware/video/radeon.nix
diff --git a/modules/installer/cd-dvd/channel.nix b/nixos/modules/installer/cd-dvd/channel.nix
similarity index 100%
rename from modules/installer/cd-dvd/channel.nix
rename to nixos/modules/installer/cd-dvd/channel.nix
diff --git a/modules/installer/cd-dvd/installation-cd-base.nix b/nixos/modules/installer/cd-dvd/installation-cd-base.nix
similarity index 100%
rename from modules/installer/cd-dvd/installation-cd-base.nix
rename to nixos/modules/installer/cd-dvd/installation-cd-base.nix
diff --git a/modules/installer/cd-dvd/installation-cd-efi.nix b/nixos/modules/installer/cd-dvd/installation-cd-efi.nix
similarity index 100%
rename from modules/installer/cd-dvd/installation-cd-efi.nix
rename to nixos/modules/installer/cd-dvd/installation-cd-efi.nix
diff --git a/modules/installer/cd-dvd/installation-cd-graphical.nix b/nixos/modules/installer/cd-dvd/installation-cd-graphical.nix
similarity index 100%
rename from modules/installer/cd-dvd/installation-cd-graphical.nix
rename to nixos/modules/installer/cd-dvd/installation-cd-graphical.nix
diff --git a/modules/installer/cd-dvd/installation-cd-minimal-new-kernel.nix b/nixos/modules/installer/cd-dvd/installation-cd-minimal-new-kernel.nix
similarity index 100%
rename from modules/installer/cd-dvd/installation-cd-minimal-new-kernel.nix
rename to nixos/modules/installer/cd-dvd/installation-cd-minimal-new-kernel.nix
diff --git a/modules/installer/cd-dvd/installation-cd-minimal.nix b/nixos/modules/installer/cd-dvd/installation-cd-minimal.nix
similarity index 100%
rename from modules/installer/cd-dvd/installation-cd-minimal.nix
rename to nixos/modules/installer/cd-dvd/installation-cd-minimal.nix
diff --git a/modules/installer/cd-dvd/installation-cd-new-kernel.nix b/nixos/modules/installer/cd-dvd/installation-cd-new-kernel.nix
similarity index 100%
rename from modules/installer/cd-dvd/installation-cd-new-kernel.nix
rename to nixos/modules/installer/cd-dvd/installation-cd-new-kernel.nix
diff --git a/modules/installer/cd-dvd/iso-image.nix b/nixos/modules/installer/cd-dvd/iso-image.nix
similarity index 100%
rename from modules/installer/cd-dvd/iso-image.nix
rename to nixos/modules/installer/cd-dvd/iso-image.nix
diff --git a/modules/installer/cd-dvd/live-dvd.nix b/nixos/modules/installer/cd-dvd/live-dvd.nix
similarity index 100%
rename from modules/installer/cd-dvd/live-dvd.nix
rename to nixos/modules/installer/cd-dvd/live-dvd.nix
diff --git a/modules/installer/cd-dvd/system-tarball-fuloong2f.nix b/nixos/modules/installer/cd-dvd/system-tarball-fuloong2f.nix
similarity index 100%
rename from modules/installer/cd-dvd/system-tarball-fuloong2f.nix
rename to nixos/modules/installer/cd-dvd/system-tarball-fuloong2f.nix
diff --git a/modules/installer/cd-dvd/system-tarball-pc-readme.txt b/nixos/modules/installer/cd-dvd/system-tarball-pc-readme.txt
similarity index 100%
rename from modules/installer/cd-dvd/system-tarball-pc-readme.txt
rename to nixos/modules/installer/cd-dvd/system-tarball-pc-readme.txt
diff --git a/modules/installer/cd-dvd/system-tarball-pc.nix b/nixos/modules/installer/cd-dvd/system-tarball-pc.nix
similarity index 100%
rename from modules/installer/cd-dvd/system-tarball-pc.nix
rename to nixos/modules/installer/cd-dvd/system-tarball-pc.nix
diff --git a/modules/installer/cd-dvd/system-tarball-sheevaplug.nix b/nixos/modules/installer/cd-dvd/system-tarball-sheevaplug.nix
similarity index 100%
rename from modules/installer/cd-dvd/system-tarball-sheevaplug.nix
rename to nixos/modules/installer/cd-dvd/system-tarball-sheevaplug.nix
diff --git a/modules/installer/cd-dvd/system-tarball.nix b/nixos/modules/installer/cd-dvd/system-tarball.nix
similarity index 100%
rename from modules/installer/cd-dvd/system-tarball.nix
rename to nixos/modules/installer/cd-dvd/system-tarball.nix
diff --git a/modules/installer/scan/detected.nix b/nixos/modules/installer/scan/detected.nix
similarity index 100%
rename from modules/installer/scan/detected.nix
rename to nixos/modules/installer/scan/detected.nix
diff --git a/modules/installer/scan/not-detected.nix b/nixos/modules/installer/scan/not-detected.nix
similarity index 100%
rename from modules/installer/scan/not-detected.nix
rename to nixos/modules/installer/scan/not-detected.nix
diff --git a/modules/installer/tools/get-version-suffix b/nixos/modules/installer/tools/get-version-suffix
similarity index 100%
rename from modules/installer/tools/get-version-suffix
rename to nixos/modules/installer/tools/get-version-suffix
diff --git a/modules/installer/tools/nixos-build-vms/build-vms.nix b/nixos/modules/installer/tools/nixos-build-vms/build-vms.nix
similarity index 100%
rename from modules/installer/tools/nixos-build-vms/build-vms.nix
rename to nixos/modules/installer/tools/nixos-build-vms/build-vms.nix
diff --git a/modules/installer/tools/nixos-build-vms/nixos-build-vms.sh b/nixos/modules/installer/tools/nixos-build-vms/nixos-build-vms.sh
similarity index 100%
rename from modules/installer/tools/nixos-build-vms/nixos-build-vms.sh
rename to nixos/modules/installer/tools/nixos-build-vms/nixos-build-vms.sh
diff --git a/modules/installer/tools/nixos-checkout.nix b/nixos/modules/installer/tools/nixos-checkout.nix
similarity index 100%
rename from modules/installer/tools/nixos-checkout.nix
rename to nixos/modules/installer/tools/nixos-checkout.nix
diff --git a/modules/installer/tools/nixos-gen-seccure-keys.sh b/nixos/modules/installer/tools/nixos-gen-seccure-keys.sh
similarity index 100%
rename from modules/installer/tools/nixos-gen-seccure-keys.sh
rename to nixos/modules/installer/tools/nixos-gen-seccure-keys.sh
diff --git a/modules/installer/tools/nixos-hardware-scan.pl b/nixos/modules/installer/tools/nixos-hardware-scan.pl
similarity index 100%
rename from modules/installer/tools/nixos-hardware-scan.pl
rename to nixos/modules/installer/tools/nixos-hardware-scan.pl
diff --git a/modules/installer/tools/nixos-install.sh b/nixos/modules/installer/tools/nixos-install.sh
similarity index 100%
rename from modules/installer/tools/nixos-install.sh
rename to nixos/modules/installer/tools/nixos-install.sh
diff --git a/modules/installer/tools/nixos-option.sh b/nixos/modules/installer/tools/nixos-option.sh
similarity index 100%
rename from modules/installer/tools/nixos-option.sh
rename to nixos/modules/installer/tools/nixos-option.sh
diff --git a/modules/installer/tools/nixos-rebuild.sh b/nixos/modules/installer/tools/nixos-rebuild.sh
similarity index 100%
rename from modules/installer/tools/nixos-rebuild.sh
rename to nixos/modules/installer/tools/nixos-rebuild.sh
diff --git a/modules/installer/tools/nixos-version.sh b/nixos/modules/installer/tools/nixos-version.sh
similarity index 100%
rename from modules/installer/tools/nixos-version.sh
rename to nixos/modules/installer/tools/nixos-version.sh
diff --git a/modules/installer/tools/tools.nix b/nixos/modules/installer/tools/tools.nix
similarity index 100%
rename from modules/installer/tools/tools.nix
rename to nixos/modules/installer/tools/tools.nix
diff --git a/modules/installer/virtualbox-demo.nix b/nixos/modules/installer/virtualbox-demo.nix
similarity index 100%
rename from modules/installer/virtualbox-demo.nix
rename to nixos/modules/installer/virtualbox-demo.nix
diff --git a/modules/misc/assertions.nix b/nixos/modules/misc/assertions.nix
similarity index 100%
rename from modules/misc/assertions.nix
rename to nixos/modules/misc/assertions.nix
diff --git a/modules/misc/check-config.nix b/nixos/modules/misc/check-config.nix
similarity index 100%
rename from modules/misc/check-config.nix
rename to nixos/modules/misc/check-config.nix
diff --git a/modules/misc/crashdump.nix b/nixos/modules/misc/crashdump.nix
similarity index 100%
rename from modules/misc/crashdump.nix
rename to nixos/modules/misc/crashdump.nix
diff --git a/modules/misc/ids.nix b/nixos/modules/misc/ids.nix
similarity index 100%
rename from modules/misc/ids.nix
rename to nixos/modules/misc/ids.nix
diff --git a/modules/misc/lib.nix b/nixos/modules/misc/lib.nix
similarity index 100%
rename from modules/misc/lib.nix
rename to nixos/modules/misc/lib.nix
diff --git a/modules/misc/locate.nix b/nixos/modules/misc/locate.nix
similarity index 100%
rename from modules/misc/locate.nix
rename to nixos/modules/misc/locate.nix
diff --git a/modules/misc/nixpkgs.nix b/nixos/modules/misc/nixpkgs.nix
similarity index 100%
rename from modules/misc/nixpkgs.nix
rename to nixos/modules/misc/nixpkgs.nix
diff --git a/modules/misc/passthru.nix b/nixos/modules/misc/passthru.nix
similarity index 100%
rename from modules/misc/passthru.nix
rename to nixos/modules/misc/passthru.nix
diff --git a/modules/misc/version.nix b/nixos/modules/misc/version.nix
similarity index 100%
rename from modules/misc/version.nix
rename to nixos/modules/misc/version.nix
diff --git a/modules/module-list.nix b/nixos/modules/module-list.nix
similarity index 100%
rename from modules/module-list.nix
rename to nixos/modules/module-list.nix
diff --git a/modules/profiles/all-hardware.nix b/nixos/modules/profiles/all-hardware.nix
similarity index 100%
rename from modules/profiles/all-hardware.nix
rename to nixos/modules/profiles/all-hardware.nix
diff --git a/modules/profiles/base.nix b/nixos/modules/profiles/base.nix
similarity index 100%
rename from modules/profiles/base.nix
rename to nixos/modules/profiles/base.nix
diff --git a/modules/profiles/clone-config.nix b/nixos/modules/profiles/clone-config.nix
similarity index 100%
rename from modules/profiles/clone-config.nix
rename to nixos/modules/profiles/clone-config.nix
diff --git a/modules/profiles/demo.nix b/nixos/modules/profiles/demo.nix
similarity index 100%
rename from modules/profiles/demo.nix
rename to nixos/modules/profiles/demo.nix
diff --git a/modules/profiles/graphical.nix b/nixos/modules/profiles/graphical.nix
similarity index 100%
rename from modules/profiles/graphical.nix
rename to nixos/modules/profiles/graphical.nix
diff --git a/modules/profiles/headless.nix b/nixos/modules/profiles/headless.nix
similarity index 100%
rename from modules/profiles/headless.nix
rename to nixos/modules/profiles/headless.nix
diff --git a/modules/profiles/installation-device.nix b/nixos/modules/profiles/installation-device.nix
similarity index 100%
rename from modules/profiles/installation-device.nix
rename to nixos/modules/profiles/installation-device.nix
diff --git a/modules/profiles/minimal.nix b/nixos/modules/profiles/minimal.nix
similarity index 100%
rename from modules/profiles/minimal.nix
rename to nixos/modules/profiles/minimal.nix
diff --git a/modules/profiles/qemu-guest.nix b/nixos/modules/profiles/qemu-guest.nix
similarity index 100%
rename from modules/profiles/qemu-guest.nix
rename to nixos/modules/profiles/qemu-guest.nix
diff --git a/modules/programs/atop.nix b/nixos/modules/programs/atop.nix
similarity index 100%
rename from modules/programs/atop.nix
rename to nixos/modules/programs/atop.nix
diff --git a/modules/programs/bash/bash.nix b/nixos/modules/programs/bash/bash.nix
similarity index 100%
rename from modules/programs/bash/bash.nix
rename to nixos/modules/programs/bash/bash.nix
diff --git a/modules/programs/bash/command-not-found.nix b/nixos/modules/programs/bash/command-not-found.nix
similarity index 100%
rename from modules/programs/bash/command-not-found.nix
rename to nixos/modules/programs/bash/command-not-found.nix
diff --git a/modules/programs/bash/command-not-found.pl b/nixos/modules/programs/bash/command-not-found.pl
similarity index 100%
rename from modules/programs/bash/command-not-found.pl
rename to nixos/modules/programs/bash/command-not-found.pl
diff --git a/modules/programs/bash/inputrc b/nixos/modules/programs/bash/inputrc
similarity index 100%
rename from modules/programs/bash/inputrc
rename to nixos/modules/programs/bash/inputrc
diff --git a/modules/programs/blcr.nix b/nixos/modules/programs/blcr.nix
similarity index 100%
rename from modules/programs/blcr.nix
rename to nixos/modules/programs/blcr.nix
diff --git a/modules/programs/environment.nix b/nixos/modules/programs/environment.nix
similarity index 100%
rename from modules/programs/environment.nix
rename to nixos/modules/programs/environment.nix
diff --git a/modules/programs/info.nix b/nixos/modules/programs/info.nix
similarity index 100%
rename from modules/programs/info.nix
rename to nixos/modules/programs/info.nix
diff --git a/modules/programs/shadow.nix b/nixos/modules/programs/shadow.nix
similarity index 100%
rename from modules/programs/shadow.nix
rename to nixos/modules/programs/shadow.nix
diff --git a/modules/programs/shell.nix b/nixos/modules/programs/shell.nix
similarity index 100%
rename from modules/programs/shell.nix
rename to nixos/modules/programs/shell.nix
diff --git a/modules/programs/ssh.nix b/nixos/modules/programs/ssh.nix
similarity index 100%
rename from modules/programs/ssh.nix
rename to nixos/modules/programs/ssh.nix
diff --git a/modules/programs/ssmtp.nix b/nixos/modules/programs/ssmtp.nix
similarity index 100%
rename from modules/programs/ssmtp.nix
rename to nixos/modules/programs/ssmtp.nix
diff --git a/modules/programs/venus.nix b/nixos/modules/programs/venus.nix
similarity index 100%
rename from modules/programs/venus.nix
rename to nixos/modules/programs/venus.nix
diff --git a/modules/programs/virtualbox.nix b/nixos/modules/programs/virtualbox.nix
similarity index 100%
rename from modules/programs/virtualbox.nix
rename to nixos/modules/programs/virtualbox.nix
diff --git a/modules/programs/wvdial.nix b/nixos/modules/programs/wvdial.nix
similarity index 100%
rename from modules/programs/wvdial.nix
rename to nixos/modules/programs/wvdial.nix
diff --git a/modules/programs/zsh/zinputrc b/nixos/modules/programs/zsh/zinputrc
similarity index 100%
rename from modules/programs/zsh/zinputrc
rename to nixos/modules/programs/zsh/zinputrc
diff --git a/modules/programs/zsh/zsh.nix b/nixos/modules/programs/zsh/zsh.nix
similarity index 100%
rename from modules/programs/zsh/zsh.nix
rename to nixos/modules/programs/zsh/zsh.nix
diff --git a/modules/rename.nix b/nixos/modules/rename.nix
similarity index 100%
rename from modules/rename.nix
rename to nixos/modules/rename.nix
diff --git a/modules/security/apparmor-suid.nix b/nixos/modules/security/apparmor-suid.nix
similarity index 100%
rename from modules/security/apparmor-suid.nix
rename to nixos/modules/security/apparmor-suid.nix
diff --git a/modules/security/apparmor.nix b/nixos/modules/security/apparmor.nix
similarity index 100%
rename from modules/security/apparmor.nix
rename to nixos/modules/security/apparmor.nix
diff --git a/modules/security/ca.nix b/nixos/modules/security/ca.nix
similarity index 100%
rename from modules/security/ca.nix
rename to nixos/modules/security/ca.nix
diff --git a/modules/security/pam.nix b/nixos/modules/security/pam.nix
similarity index 100%
rename from modules/security/pam.nix
rename to nixos/modules/security/pam.nix
diff --git a/modules/security/pam_usb.nix b/nixos/modules/security/pam_usb.nix
similarity index 100%
rename from modules/security/pam_usb.nix
rename to nixos/modules/security/pam_usb.nix
diff --git a/modules/security/polkit.nix b/nixos/modules/security/polkit.nix
similarity index 100%
rename from modules/security/polkit.nix
rename to nixos/modules/security/polkit.nix
diff --git a/modules/security/rngd.nix b/nixos/modules/security/rngd.nix
similarity index 100%
rename from modules/security/rngd.nix
rename to nixos/modules/security/rngd.nix
diff --git a/modules/security/rtkit.nix b/nixos/modules/security/rtkit.nix
similarity index 100%
rename from modules/security/rtkit.nix
rename to nixos/modules/security/rtkit.nix
diff --git a/modules/security/setuid-wrapper.c b/nixos/modules/security/setuid-wrapper.c
similarity index 100%
rename from modules/security/setuid-wrapper.c
rename to nixos/modules/security/setuid-wrapper.c
diff --git a/modules/security/setuid-wrappers.nix b/nixos/modules/security/setuid-wrappers.nix
similarity index 100%
rename from modules/security/setuid-wrappers.nix
rename to nixos/modules/security/setuid-wrappers.nix
diff --git a/modules/security/sudo.nix b/nixos/modules/security/sudo.nix
similarity index 100%
rename from modules/security/sudo.nix
rename to nixos/modules/security/sudo.nix
diff --git a/modules/services/amqp/activemq/ActiveMQBroker.java b/nixos/modules/services/amqp/activemq/ActiveMQBroker.java
similarity index 100%
rename from modules/services/amqp/activemq/ActiveMQBroker.java
rename to nixos/modules/services/amqp/activemq/ActiveMQBroker.java
diff --git a/modules/services/amqp/activemq/default.nix b/nixos/modules/services/amqp/activemq/default.nix
similarity index 100%
rename from modules/services/amqp/activemq/default.nix
rename to nixos/modules/services/amqp/activemq/default.nix
diff --git a/modules/services/amqp/rabbitmq.nix b/nixos/modules/services/amqp/rabbitmq.nix
similarity index 100%
rename from modules/services/amqp/rabbitmq.nix
rename to nixos/modules/services/amqp/rabbitmq.nix
diff --git a/modules/services/audio/alsa.nix b/nixos/modules/services/audio/alsa.nix
similarity index 100%
rename from modules/services/audio/alsa.nix
rename to nixos/modules/services/audio/alsa.nix
diff --git a/modules/services/audio/fuppes.nix b/nixos/modules/services/audio/fuppes.nix
similarity index 100%
rename from modules/services/audio/fuppes.nix
rename to nixos/modules/services/audio/fuppes.nix
diff --git a/modules/services/audio/fuppes/vfolder.cfg b/nixos/modules/services/audio/fuppes/vfolder.cfg
similarity index 100%
rename from modules/services/audio/fuppes/vfolder.cfg
rename to nixos/modules/services/audio/fuppes/vfolder.cfg
diff --git a/modules/services/audio/mpd.nix b/nixos/modules/services/audio/mpd.nix
similarity index 100%
rename from modules/services/audio/mpd.nix
rename to nixos/modules/services/audio/mpd.nix
diff --git a/modules/services/backup/almir.nix b/nixos/modules/services/backup/almir.nix
similarity index 100%
rename from modules/services/backup/almir.nix
rename to nixos/modules/services/backup/almir.nix
diff --git a/modules/services/backup/bacula.nix b/nixos/modules/services/backup/bacula.nix
similarity index 100%
rename from modules/services/backup/bacula.nix
rename to nixos/modules/services/backup/bacula.nix
diff --git a/modules/services/backup/mysql-backup.nix b/nixos/modules/services/backup/mysql-backup.nix
similarity index 100%
rename from modules/services/backup/mysql-backup.nix
rename to nixos/modules/services/backup/mysql-backup.nix
diff --git a/modules/services/backup/postgresql-backup.nix b/nixos/modules/services/backup/postgresql-backup.nix
similarity index 100%
rename from modules/services/backup/postgresql-backup.nix
rename to nixos/modules/services/backup/postgresql-backup.nix
diff --git a/modules/services/backup/rsnapshot.nix b/nixos/modules/services/backup/rsnapshot.nix
similarity index 100%
rename from modules/services/backup/rsnapshot.nix
rename to nixos/modules/services/backup/rsnapshot.nix
diff --git a/modules/services/backup/sitecopy-backup.nix b/nixos/modules/services/backup/sitecopy-backup.nix
similarity index 100%
rename from modules/services/backup/sitecopy-backup.nix
rename to nixos/modules/services/backup/sitecopy-backup.nix
diff --git a/modules/services/databases/4store-endpoint.nix b/nixos/modules/services/databases/4store-endpoint.nix
similarity index 100%
rename from modules/services/databases/4store-endpoint.nix
rename to nixos/modules/services/databases/4store-endpoint.nix
diff --git a/modules/services/databases/4store.nix b/nixos/modules/services/databases/4store.nix
similarity index 100%
rename from modules/services/databases/4store.nix
rename to nixos/modules/services/databases/4store.nix
diff --git a/modules/services/databases/firebird.nix b/nixos/modules/services/databases/firebird.nix
similarity index 100%
rename from modules/services/databases/firebird.nix
rename to nixos/modules/services/databases/firebird.nix
diff --git a/modules/services/databases/memcached.nix b/nixos/modules/services/databases/memcached.nix
similarity index 100%
rename from modules/services/databases/memcached.nix
rename to nixos/modules/services/databases/memcached.nix
diff --git a/modules/services/databases/mongodb.nix b/nixos/modules/services/databases/mongodb.nix
similarity index 100%
rename from modules/services/databases/mongodb.nix
rename to nixos/modules/services/databases/mongodb.nix
diff --git a/modules/services/databases/mysql.nix b/nixos/modules/services/databases/mysql.nix
similarity index 100%
rename from modules/services/databases/mysql.nix
rename to nixos/modules/services/databases/mysql.nix
diff --git a/modules/services/databases/mysql55.nix b/nixos/modules/services/databases/mysql55.nix
similarity index 100%
rename from modules/services/databases/mysql55.nix
rename to nixos/modules/services/databases/mysql55.nix
diff --git a/modules/services/databases/openldap.nix b/nixos/modules/services/databases/openldap.nix
similarity index 100%
rename from modules/services/databases/openldap.nix
rename to nixos/modules/services/databases/openldap.nix
diff --git a/modules/services/databases/postgresql.nix b/nixos/modules/services/databases/postgresql.nix
similarity index 100%
rename from modules/services/databases/postgresql.nix
rename to nixos/modules/services/databases/postgresql.nix
diff --git a/modules/services/databases/redis.nix b/nixos/modules/services/databases/redis.nix
similarity index 100%
rename from modules/services/databases/redis.nix
rename to nixos/modules/services/databases/redis.nix
diff --git a/modules/services/databases/virtuoso.nix b/nixos/modules/services/databases/virtuoso.nix
similarity index 100%
rename from modules/services/databases/virtuoso.nix
rename to nixos/modules/services/databases/virtuoso.nix
diff --git a/modules/services/games/ghost-one.nix b/nixos/modules/services/games/ghost-one.nix
similarity index 100%
rename from modules/services/games/ghost-one.nix
rename to nixos/modules/services/games/ghost-one.nix
diff --git a/modules/services/hardware/acpid.nix b/nixos/modules/services/hardware/acpid.nix
similarity index 100%
rename from modules/services/hardware/acpid.nix
rename to nixos/modules/services/hardware/acpid.nix
diff --git a/modules/services/hardware/bluetooth.nix b/nixos/modules/services/hardware/bluetooth.nix
similarity index 100%
rename from modules/services/hardware/bluetooth.nix
rename to nixos/modules/services/hardware/bluetooth.nix
diff --git a/modules/services/hardware/nvidia-optimus.nix b/nixos/modules/services/hardware/nvidia-optimus.nix
similarity index 100%
rename from modules/services/hardware/nvidia-optimus.nix
rename to nixos/modules/services/hardware/nvidia-optimus.nix
diff --git a/modules/services/hardware/pcscd.nix b/nixos/modules/services/hardware/pcscd.nix
similarity index 100%
rename from modules/services/hardware/pcscd.nix
rename to nixos/modules/services/hardware/pcscd.nix
diff --git a/modules/services/hardware/pommed.nix b/nixos/modules/services/hardware/pommed.nix
similarity index 100%
rename from modules/services/hardware/pommed.nix
rename to nixos/modules/services/hardware/pommed.nix
diff --git a/modules/services/hardware/sane.nix b/nixos/modules/services/hardware/sane.nix
similarity index 100%
rename from modules/services/hardware/sane.nix
rename to nixos/modules/services/hardware/sane.nix
diff --git a/modules/services/hardware/thinkfan.nix b/nixos/modules/services/hardware/thinkfan.nix
similarity index 100%
rename from modules/services/hardware/thinkfan.nix
rename to nixos/modules/services/hardware/thinkfan.nix
diff --git a/modules/services/hardware/udev.nix b/nixos/modules/services/hardware/udev.nix
similarity index 100%
rename from modules/services/hardware/udev.nix
rename to nixos/modules/services/hardware/udev.nix
diff --git a/modules/services/hardware/udisks.nix b/nixos/modules/services/hardware/udisks.nix
similarity index 100%
rename from modules/services/hardware/udisks.nix
rename to nixos/modules/services/hardware/udisks.nix
diff --git a/modules/services/hardware/udisks2.nix b/nixos/modules/services/hardware/udisks2.nix
similarity index 100%
rename from modules/services/hardware/udisks2.nix
rename to nixos/modules/services/hardware/udisks2.nix
diff --git a/modules/services/hardware/upower.nix b/nixos/modules/services/hardware/upower.nix
similarity index 100%
rename from modules/services/hardware/upower.nix
rename to nixos/modules/services/hardware/upower.nix
diff --git a/modules/services/logging/klogd.nix b/nixos/modules/services/logging/klogd.nix
similarity index 100%
rename from modules/services/logging/klogd.nix
rename to nixos/modules/services/logging/klogd.nix
diff --git a/modules/services/logging/logcheck.nix b/nixos/modules/services/logging/logcheck.nix
similarity index 100%
rename from modules/services/logging/logcheck.nix
rename to nixos/modules/services/logging/logcheck.nix
diff --git a/modules/services/logging/logrotate.nix b/nixos/modules/services/logging/logrotate.nix
similarity index 100%
rename from modules/services/logging/logrotate.nix
rename to nixos/modules/services/logging/logrotate.nix
diff --git a/modules/services/logging/logstash.nix b/nixos/modules/services/logging/logstash.nix
similarity index 100%
rename from modules/services/logging/logstash.nix
rename to nixos/modules/services/logging/logstash.nix
diff --git a/modules/services/logging/rsyslogd.nix b/nixos/modules/services/logging/rsyslogd.nix
similarity index 100%
rename from modules/services/logging/rsyslogd.nix
rename to nixos/modules/services/logging/rsyslogd.nix
diff --git a/modules/services/logging/syslogd.nix b/nixos/modules/services/logging/syslogd.nix
similarity index 100%
rename from modules/services/logging/syslogd.nix
rename to nixos/modules/services/logging/syslogd.nix
diff --git a/modules/services/mail/dovecot.nix b/nixos/modules/services/mail/dovecot.nix
similarity index 100%
rename from modules/services/mail/dovecot.nix
rename to nixos/modules/services/mail/dovecot.nix
diff --git a/modules/services/mail/freepops.nix b/nixos/modules/services/mail/freepops.nix
similarity index 100%
rename from modules/services/mail/freepops.nix
rename to nixos/modules/services/mail/freepops.nix
diff --git a/modules/services/mail/mail.nix b/nixos/modules/services/mail/mail.nix
similarity index 100%
rename from modules/services/mail/mail.nix
rename to nixos/modules/services/mail/mail.nix
diff --git a/modules/services/mail/opensmtpd.nix b/nixos/modules/services/mail/opensmtpd.nix
similarity index 100%
rename from modules/services/mail/opensmtpd.nix
rename to nixos/modules/services/mail/opensmtpd.nix
diff --git a/modules/services/mail/postfix.nix b/nixos/modules/services/mail/postfix.nix
similarity index 100%
rename from modules/services/mail/postfix.nix
rename to nixos/modules/services/mail/postfix.nix
diff --git a/modules/services/mail/spamassassin.nix b/nixos/modules/services/mail/spamassassin.nix
similarity index 100%
rename from modules/services/mail/spamassassin.nix
rename to nixos/modules/services/mail/spamassassin.nix
diff --git a/modules/services/misc/autofs.nix b/nixos/modules/services/misc/autofs.nix
similarity index 100%
rename from modules/services/misc/autofs.nix
rename to nixos/modules/services/misc/autofs.nix
diff --git a/modules/services/misc/cgminer.nix b/nixos/modules/services/misc/cgminer.nix
similarity index 100%
rename from modules/services/misc/cgminer.nix
rename to nixos/modules/services/misc/cgminer.nix
diff --git a/modules/services/misc/disnix.nix b/nixos/modules/services/misc/disnix.nix
similarity index 100%
rename from modules/services/misc/disnix.nix
rename to nixos/modules/services/misc/disnix.nix
diff --git a/modules/services/misc/felix.nix b/nixos/modules/services/misc/felix.nix
similarity index 100%
rename from modules/services/misc/felix.nix
rename to nixos/modules/services/misc/felix.nix
diff --git a/modules/services/misc/folding-at-home.nix b/nixos/modules/services/misc/folding-at-home.nix
similarity index 100%
rename from modules/services/misc/folding-at-home.nix
rename to nixos/modules/services/misc/folding-at-home.nix
diff --git a/modules/services/misc/gpsd.nix b/nixos/modules/services/misc/gpsd.nix
similarity index 100%
rename from modules/services/misc/gpsd.nix
rename to nixos/modules/services/misc/gpsd.nix
diff --git a/modules/services/misc/nix-daemon.nix b/nixos/modules/services/misc/nix-daemon.nix
similarity index 100%
rename from modules/services/misc/nix-daemon.nix
rename to nixos/modules/services/misc/nix-daemon.nix
diff --git a/modules/services/misc/nix-gc.nix b/nixos/modules/services/misc/nix-gc.nix
similarity index 100%
rename from modules/services/misc/nix-gc.nix
rename to nixos/modules/services/misc/nix-gc.nix
diff --git a/modules/services/misc/nixos-manual.nix b/nixos/modules/services/misc/nixos-manual.nix
similarity index 100%
rename from modules/services/misc/nixos-manual.nix
rename to nixos/modules/services/misc/nixos-manual.nix
diff --git a/modules/services/misc/rogue.nix b/nixos/modules/services/misc/rogue.nix
similarity index 100%
rename from modules/services/misc/rogue.nix
rename to nixos/modules/services/misc/rogue.nix
diff --git a/modules/services/misc/svnserve.nix b/nixos/modules/services/misc/svnserve.nix
similarity index 100%
rename from modules/services/misc/svnserve.nix
rename to nixos/modules/services/misc/svnserve.nix
diff --git a/modules/services/misc/synergy.nix b/nixos/modules/services/misc/synergy.nix
similarity index 100%
rename from modules/services/misc/synergy.nix
rename to nixos/modules/services/misc/synergy.nix
diff --git a/modules/services/monitoring/apcupsd.nix b/nixos/modules/services/monitoring/apcupsd.nix
similarity index 100%
rename from modules/services/monitoring/apcupsd.nix
rename to nixos/modules/services/monitoring/apcupsd.nix
diff --git a/modules/services/monitoring/dd-agent.nix b/nixos/modules/services/monitoring/dd-agent.nix
similarity index 100%
rename from modules/services/monitoring/dd-agent.nix
rename to nixos/modules/services/monitoring/dd-agent.nix
diff --git a/modules/services/monitoring/graphite.nix b/nixos/modules/services/monitoring/graphite.nix
similarity index 100%
rename from modules/services/monitoring/graphite.nix
rename to nixos/modules/services/monitoring/graphite.nix
diff --git a/modules/services/monitoring/monit.nix b/nixos/modules/services/monitoring/monit.nix
similarity index 100%
rename from modules/services/monitoring/monit.nix
rename to nixos/modules/services/monitoring/monit.nix
diff --git a/modules/services/monitoring/nagios/commands.cfg b/nixos/modules/services/monitoring/nagios/commands.cfg
similarity index 100%
rename from modules/services/monitoring/nagios/commands.cfg
rename to nixos/modules/services/monitoring/nagios/commands.cfg
diff --git a/modules/services/monitoring/nagios/default.nix b/nixos/modules/services/monitoring/nagios/default.nix
similarity index 100%
rename from modules/services/monitoring/nagios/default.nix
rename to nixos/modules/services/monitoring/nagios/default.nix
diff --git a/modules/services/monitoring/nagios/host-templates.cfg b/nixos/modules/services/monitoring/nagios/host-templates.cfg
similarity index 100%
rename from modules/services/monitoring/nagios/host-templates.cfg
rename to nixos/modules/services/monitoring/nagios/host-templates.cfg
diff --git a/modules/services/monitoring/nagios/service-templates.cfg b/nixos/modules/services/monitoring/nagios/service-templates.cfg
similarity index 100%
rename from modules/services/monitoring/nagios/service-templates.cfg
rename to nixos/modules/services/monitoring/nagios/service-templates.cfg
diff --git a/modules/services/monitoring/nagios/timeperiods.cfg b/nixos/modules/services/monitoring/nagios/timeperiods.cfg
similarity index 100%
rename from modules/services/monitoring/nagios/timeperiods.cfg
rename to nixos/modules/services/monitoring/nagios/timeperiods.cfg
diff --git a/modules/services/monitoring/smartd.nix b/nixos/modules/services/monitoring/smartd.nix
similarity index 100%
rename from modules/services/monitoring/smartd.nix
rename to nixos/modules/services/monitoring/smartd.nix
diff --git a/modules/services/monitoring/statsd.nix b/nixos/modules/services/monitoring/statsd.nix
similarity index 100%
rename from modules/services/monitoring/statsd.nix
rename to nixos/modules/services/monitoring/statsd.nix
diff --git a/modules/services/monitoring/systemhealth.nix b/nixos/modules/services/monitoring/systemhealth.nix
similarity index 100%
rename from modules/services/monitoring/systemhealth.nix
rename to nixos/modules/services/monitoring/systemhealth.nix
diff --git a/modules/services/monitoring/ups.nix b/nixos/modules/services/monitoring/ups.nix
similarity index 100%
rename from modules/services/monitoring/ups.nix
rename to nixos/modules/services/monitoring/ups.nix
diff --git a/modules/services/monitoring/uptime.nix b/nixos/modules/services/monitoring/uptime.nix
similarity index 100%
rename from modules/services/monitoring/uptime.nix
rename to nixos/modules/services/monitoring/uptime.nix
diff --git a/modules/services/monitoring/zabbix-agent.nix b/nixos/modules/services/monitoring/zabbix-agent.nix
similarity index 100%
rename from modules/services/monitoring/zabbix-agent.nix
rename to nixos/modules/services/monitoring/zabbix-agent.nix
diff --git a/modules/services/monitoring/zabbix-server.nix b/nixos/modules/services/monitoring/zabbix-server.nix
similarity index 100%
rename from modules/services/monitoring/zabbix-server.nix
rename to nixos/modules/services/monitoring/zabbix-server.nix
diff --git a/modules/services/network-filesystems/drbd.nix b/nixos/modules/services/network-filesystems/drbd.nix
similarity index 100%
rename from modules/services/network-filesystems/drbd.nix
rename to nixos/modules/services/network-filesystems/drbd.nix
diff --git a/modules/services/network-filesystems/nfsd.nix b/nixos/modules/services/network-filesystems/nfsd.nix
similarity index 100%
rename from modules/services/network-filesystems/nfsd.nix
rename to nixos/modules/services/network-filesystems/nfsd.nix
diff --git a/modules/services/network-filesystems/openafs-client/default.nix b/nixos/modules/services/network-filesystems/openafs-client/default.nix
similarity index 100%
rename from modules/services/network-filesystems/openafs-client/default.nix
rename to nixos/modules/services/network-filesystems/openafs-client/default.nix
diff --git a/modules/services/network-filesystems/samba.nix b/nixos/modules/services/network-filesystems/samba.nix
similarity index 100%
rename from modules/services/network-filesystems/samba.nix
rename to nixos/modules/services/network-filesystems/samba.nix
diff --git a/modules/services/networking/amuled.nix b/nixos/modules/services/networking/amuled.nix
similarity index 100%
rename from modules/services/networking/amuled.nix
rename to nixos/modules/services/networking/amuled.nix
diff --git a/modules/services/networking/avahi-daemon.nix b/nixos/modules/services/networking/avahi-daemon.nix
similarity index 100%
rename from modules/services/networking/avahi-daemon.nix
rename to nixos/modules/services/networking/avahi-daemon.nix
diff --git a/modules/services/networking/bind.nix b/nixos/modules/services/networking/bind.nix
similarity index 100%
rename from modules/services/networking/bind.nix
rename to nixos/modules/services/networking/bind.nix
diff --git a/modules/services/networking/bitlbee.nix b/nixos/modules/services/networking/bitlbee.nix
similarity index 100%
rename from modules/services/networking/bitlbee.nix
rename to nixos/modules/services/networking/bitlbee.nix
diff --git a/modules/services/networking/chrony.nix b/nixos/modules/services/networking/chrony.nix
similarity index 100%
rename from modules/services/networking/chrony.nix
rename to nixos/modules/services/networking/chrony.nix
diff --git a/modules/services/networking/cntlm.nix b/nixos/modules/services/networking/cntlm.nix
similarity index 100%
rename from modules/services/networking/cntlm.nix
rename to nixos/modules/services/networking/cntlm.nix
diff --git a/modules/services/networking/ddclient.nix b/nixos/modules/services/networking/ddclient.nix
similarity index 100%
rename from modules/services/networking/ddclient.nix
rename to nixos/modules/services/networking/ddclient.nix
diff --git a/modules/services/networking/dhclient.nix b/nixos/modules/services/networking/dhclient.nix
similarity index 100%
rename from modules/services/networking/dhclient.nix
rename to nixos/modules/services/networking/dhclient.nix
diff --git a/modules/services/networking/dhcpcd.nix b/nixos/modules/services/networking/dhcpcd.nix
similarity index 100%
rename from modules/services/networking/dhcpcd.nix
rename to nixos/modules/services/networking/dhcpcd.nix
diff --git a/modules/services/networking/dhcpd.nix b/nixos/modules/services/networking/dhcpd.nix
similarity index 100%
rename from modules/services/networking/dhcpd.nix
rename to nixos/modules/services/networking/dhcpd.nix
diff --git a/modules/services/networking/dnsmasq.nix b/nixos/modules/services/networking/dnsmasq.nix
similarity index 100%
rename from modules/services/networking/dnsmasq.nix
rename to nixos/modules/services/networking/dnsmasq.nix
diff --git a/modules/services/networking/ejabberd.nix b/nixos/modules/services/networking/ejabberd.nix
similarity index 100%
rename from modules/services/networking/ejabberd.nix
rename to nixos/modules/services/networking/ejabberd.nix
diff --git a/modules/services/networking/firewall.nix b/nixos/modules/services/networking/firewall.nix
similarity index 100%
rename from modules/services/networking/firewall.nix
rename to nixos/modules/services/networking/firewall.nix
diff --git a/modules/services/networking/flashpolicyd.nix b/nixos/modules/services/networking/flashpolicyd.nix
similarity index 100%
rename from modules/services/networking/flashpolicyd.nix
rename to nixos/modules/services/networking/flashpolicyd.nix
diff --git a/modules/services/networking/freenet.nix b/nixos/modules/services/networking/freenet.nix
similarity index 100%
rename from modules/services/networking/freenet.nix
rename to nixos/modules/services/networking/freenet.nix
diff --git a/modules/services/networking/git-daemon.nix b/nixos/modules/services/networking/git-daemon.nix
similarity index 100%
rename from modules/services/networking/git-daemon.nix
rename to nixos/modules/services/networking/git-daemon.nix
diff --git a/modules/services/networking/gnunet.nix b/nixos/modules/services/networking/gnunet.nix
similarity index 100%
rename from modules/services/networking/gnunet.nix
rename to nixos/modules/services/networking/gnunet.nix
diff --git a/modules/services/networking/gogoclient.nix b/nixos/modules/services/networking/gogoclient.nix
similarity index 100%
rename from modules/services/networking/gogoclient.nix
rename to nixos/modules/services/networking/gogoclient.nix
diff --git a/modules/services/networking/gvpe.nix b/nixos/modules/services/networking/gvpe.nix
similarity index 100%
rename from modules/services/networking/gvpe.nix
rename to nixos/modules/services/networking/gvpe.nix
diff --git a/modules/services/networking/hostapd.nix b/nixos/modules/services/networking/hostapd.nix
similarity index 100%
rename from modules/services/networking/hostapd.nix
rename to nixos/modules/services/networking/hostapd.nix
diff --git a/modules/services/networking/ifplugd.nix b/nixos/modules/services/networking/ifplugd.nix
similarity index 100%
rename from modules/services/networking/ifplugd.nix
rename to nixos/modules/services/networking/ifplugd.nix
diff --git a/modules/services/networking/iodined.nix b/nixos/modules/services/networking/iodined.nix
similarity index 100%
rename from modules/services/networking/iodined.nix
rename to nixos/modules/services/networking/iodined.nix
diff --git a/modules/services/networking/ircd-hybrid/builder.sh b/nixos/modules/services/networking/ircd-hybrid/builder.sh
similarity index 100%
rename from modules/services/networking/ircd-hybrid/builder.sh
rename to nixos/modules/services/networking/ircd-hybrid/builder.sh
diff --git a/modules/services/networking/ircd-hybrid/control.in b/nixos/modules/services/networking/ircd-hybrid/control.in
similarity index 100%
rename from modules/services/networking/ircd-hybrid/control.in
rename to nixos/modules/services/networking/ircd-hybrid/control.in
diff --git a/modules/services/networking/ircd-hybrid/default.nix b/nixos/modules/services/networking/ircd-hybrid/default.nix
similarity index 100%
rename from modules/services/networking/ircd-hybrid/default.nix
rename to nixos/modules/services/networking/ircd-hybrid/default.nix
diff --git a/modules/services/networking/ircd-hybrid/ircd.conf b/nixos/modules/services/networking/ircd-hybrid/ircd.conf
similarity index 100%
rename from modules/services/networking/ircd-hybrid/ircd.conf
rename to nixos/modules/services/networking/ircd-hybrid/ircd.conf
diff --git a/modules/services/networking/minidlna.nix b/nixos/modules/services/networking/minidlna.nix
similarity index 100%
rename from modules/services/networking/minidlna.nix
rename to nixos/modules/services/networking/minidlna.nix
diff --git a/modules/services/networking/nat.nix b/nixos/modules/services/networking/nat.nix
similarity index 100%
rename from modules/services/networking/nat.nix
rename to nixos/modules/services/networking/nat.nix
diff --git a/modules/services/networking/networkmanager.nix b/nixos/modules/services/networking/networkmanager.nix
similarity index 100%
rename from modules/services/networking/networkmanager.nix
rename to nixos/modules/services/networking/networkmanager.nix
diff --git a/modules/services/networking/ntpd.nix b/nixos/modules/services/networking/ntpd.nix
similarity index 100%
rename from modules/services/networking/ntpd.nix
rename to nixos/modules/services/networking/ntpd.nix
diff --git a/modules/services/networking/oidentd.nix b/nixos/modules/services/networking/oidentd.nix
similarity index 100%
rename from modules/services/networking/oidentd.nix
rename to nixos/modules/services/networking/oidentd.nix
diff --git a/modules/services/networking/openfire.nix b/nixos/modules/services/networking/openfire.nix
similarity index 100%
rename from modules/services/networking/openfire.nix
rename to nixos/modules/services/networking/openfire.nix
diff --git a/modules/services/networking/openvpn.nix b/nixos/modules/services/networking/openvpn.nix
similarity index 100%
rename from modules/services/networking/openvpn.nix
rename to nixos/modules/services/networking/openvpn.nix
diff --git a/modules/services/networking/prayer.nix b/nixos/modules/services/networking/prayer.nix
similarity index 100%
rename from modules/services/networking/prayer.nix
rename to nixos/modules/services/networking/prayer.nix
diff --git a/modules/services/networking/privoxy.nix b/nixos/modules/services/networking/privoxy.nix
similarity index 100%
rename from modules/services/networking/privoxy.nix
rename to nixos/modules/services/networking/privoxy.nix
diff --git a/modules/services/networking/quassel.nix b/nixos/modules/services/networking/quassel.nix
similarity index 100%
rename from modules/services/networking/quassel.nix
rename to nixos/modules/services/networking/quassel.nix
diff --git a/modules/services/networking/radvd.nix b/nixos/modules/services/networking/radvd.nix
similarity index 100%
rename from modules/services/networking/radvd.nix
rename to nixos/modules/services/networking/radvd.nix
diff --git a/modules/services/networking/rdnssd.nix b/nixos/modules/services/networking/rdnssd.nix
similarity index 100%
rename from modules/services/networking/rdnssd.nix
rename to nixos/modules/services/networking/rdnssd.nix
diff --git a/modules/services/networking/rpcbind.nix b/nixos/modules/services/networking/rpcbind.nix
similarity index 100%
rename from modules/services/networking/rpcbind.nix
rename to nixos/modules/services/networking/rpcbind.nix
diff --git a/modules/services/networking/sabnzbd.nix b/nixos/modules/services/networking/sabnzbd.nix
similarity index 100%
rename from modules/services/networking/sabnzbd.nix
rename to nixos/modules/services/networking/sabnzbd.nix
diff --git a/modules/services/networking/ssh/lshd.nix b/nixos/modules/services/networking/ssh/lshd.nix
similarity index 100%
rename from modules/services/networking/ssh/lshd.nix
rename to nixos/modules/services/networking/ssh/lshd.nix
diff --git a/modules/services/networking/ssh/sshd.nix b/nixos/modules/services/networking/ssh/sshd.nix
similarity index 100%
rename from modules/services/networking/ssh/sshd.nix
rename to nixos/modules/services/networking/ssh/sshd.nix
diff --git a/modules/services/networking/supybot.nix b/nixos/modules/services/networking/supybot.nix
similarity index 100%
rename from modules/services/networking/supybot.nix
rename to nixos/modules/services/networking/supybot.nix
diff --git a/modules/services/networking/tcpcrypt.nix b/nixos/modules/services/networking/tcpcrypt.nix
similarity index 100%
rename from modules/services/networking/tcpcrypt.nix
rename to nixos/modules/services/networking/tcpcrypt.nix
diff --git a/modules/services/networking/tftpd.nix b/nixos/modules/services/networking/tftpd.nix
similarity index 100%
rename from modules/services/networking/tftpd.nix
rename to nixos/modules/services/networking/tftpd.nix
diff --git a/modules/services/networking/unbound.nix b/nixos/modules/services/networking/unbound.nix
similarity index 100%
rename from modules/services/networking/unbound.nix
rename to nixos/modules/services/networking/unbound.nix
diff --git a/modules/services/networking/vsftpd.nix b/nixos/modules/services/networking/vsftpd.nix
similarity index 100%
rename from modules/services/networking/vsftpd.nix
rename to nixos/modules/services/networking/vsftpd.nix
diff --git a/modules/services/networking/wakeonlan.nix b/nixos/modules/services/networking/wakeonlan.nix
similarity index 100%
rename from modules/services/networking/wakeonlan.nix
rename to nixos/modules/services/networking/wakeonlan.nix
diff --git a/modules/services/networking/websockify.nix b/nixos/modules/services/networking/websockify.nix
similarity index 100%
rename from modules/services/networking/websockify.nix
rename to nixos/modules/services/networking/websockify.nix
diff --git a/modules/services/networking/wicd.nix b/nixos/modules/services/networking/wicd.nix
similarity index 100%
rename from modules/services/networking/wicd.nix
rename to nixos/modules/services/networking/wicd.nix
diff --git a/modules/services/networking/wpa_supplicant.nix b/nixos/modules/services/networking/wpa_supplicant.nix
similarity index 100%
rename from modules/services/networking/wpa_supplicant.nix
rename to nixos/modules/services/networking/wpa_supplicant.nix
diff --git a/modules/services/networking/xinetd.nix b/nixos/modules/services/networking/xinetd.nix
similarity index 100%
rename from modules/services/networking/xinetd.nix
rename to nixos/modules/services/networking/xinetd.nix
diff --git a/modules/services/printing/cupsd.nix b/nixos/modules/services/printing/cupsd.nix
similarity index 100%
rename from modules/services/printing/cupsd.nix
rename to nixos/modules/services/printing/cupsd.nix
diff --git a/modules/services/scheduling/atd.nix b/nixos/modules/services/scheduling/atd.nix
similarity index 100%
rename from modules/services/scheduling/atd.nix
rename to nixos/modules/services/scheduling/atd.nix
diff --git a/modules/services/scheduling/cron.nix b/nixos/modules/services/scheduling/cron.nix
similarity index 100%
rename from modules/services/scheduling/cron.nix
rename to nixos/modules/services/scheduling/cron.nix
diff --git a/modules/services/scheduling/fcron.nix b/nixos/modules/services/scheduling/fcron.nix
similarity index 100%
rename from modules/services/scheduling/fcron.nix
rename to nixos/modules/services/scheduling/fcron.nix
diff --git a/modules/services/search/elasticsearch.nix b/nixos/modules/services/search/elasticsearch.nix
similarity index 100%
rename from modules/services/search/elasticsearch.nix
rename to nixos/modules/services/search/elasticsearch.nix
diff --git a/modules/services/security/clamav.nix b/nixos/modules/services/security/clamav.nix
similarity index 100%
rename from modules/services/security/clamav.nix
rename to nixos/modules/services/security/clamav.nix
diff --git a/modules/services/security/fail2ban.nix b/nixos/modules/services/security/fail2ban.nix
similarity index 100%
rename from modules/services/security/fail2ban.nix
rename to nixos/modules/services/security/fail2ban.nix
diff --git a/modules/services/security/fprot.nix b/nixos/modules/services/security/fprot.nix
similarity index 100%
rename from modules/services/security/fprot.nix
rename to nixos/modules/services/security/fprot.nix
diff --git a/modules/services/security/frandom.nix b/nixos/modules/services/security/frandom.nix
similarity index 100%
rename from modules/services/security/frandom.nix
rename to nixos/modules/services/security/frandom.nix
diff --git a/modules/services/security/tor.nix b/nixos/modules/services/security/tor.nix
similarity index 100%
rename from modules/services/security/tor.nix
rename to nixos/modules/services/security/tor.nix
diff --git a/modules/services/security/torify.nix b/nixos/modules/services/security/torify.nix
similarity index 100%
rename from modules/services/security/torify.nix
rename to nixos/modules/services/security/torify.nix
diff --git a/modules/services/security/torsocks.nix b/nixos/modules/services/security/torsocks.nix
similarity index 100%
rename from modules/services/security/torsocks.nix
rename to nixos/modules/services/security/torsocks.nix
diff --git a/modules/services/system/dbus.nix b/nixos/modules/services/system/dbus.nix
similarity index 100%
rename from modules/services/system/dbus.nix
rename to nixos/modules/services/system/dbus.nix
diff --git a/modules/services/system/kerberos.nix b/nixos/modules/services/system/kerberos.nix
similarity index 100%
rename from modules/services/system/kerberos.nix
rename to nixos/modules/services/system/kerberos.nix
diff --git a/modules/services/system/nscd.conf b/nixos/modules/services/system/nscd.conf
similarity index 100%
rename from modules/services/system/nscd.conf
rename to nixos/modules/services/system/nscd.conf
diff --git a/modules/services/system/nscd.nix b/nixos/modules/services/system/nscd.nix
similarity index 100%
rename from modules/services/system/nscd.nix
rename to nixos/modules/services/system/nscd.nix
diff --git a/modules/services/system/uptimed.nix b/nixos/modules/services/system/uptimed.nix
similarity index 100%
rename from modules/services/system/uptimed.nix
rename to nixos/modules/services/system/uptimed.nix
diff --git a/modules/services/torrent/deluge.nix b/nixos/modules/services/torrent/deluge.nix
similarity index 100%
rename from modules/services/torrent/deluge.nix
rename to nixos/modules/services/torrent/deluge.nix
diff --git a/modules/services/torrent/transmission.nix b/nixos/modules/services/torrent/transmission.nix
similarity index 100%
rename from modules/services/torrent/transmission.nix
rename to nixos/modules/services/torrent/transmission.nix
diff --git a/modules/services/ttys/agetty.nix b/nixos/modules/services/ttys/agetty.nix
similarity index 100%
rename from modules/services/ttys/agetty.nix
rename to nixos/modules/services/ttys/agetty.nix
diff --git a/modules/services/ttys/gpm.nix b/nixos/modules/services/ttys/gpm.nix
similarity index 100%
rename from modules/services/ttys/gpm.nix
rename to nixos/modules/services/ttys/gpm.nix
diff --git a/modules/services/web-servers/apache-httpd/default.nix b/nixos/modules/services/web-servers/apache-httpd/default.nix
similarity index 100%
rename from modules/services/web-servers/apache-httpd/default.nix
rename to nixos/modules/services/web-servers/apache-httpd/default.nix
diff --git a/modules/services/web-servers/apache-httpd/mediawiki.nix b/nixos/modules/services/web-servers/apache-httpd/mediawiki.nix
similarity index 100%
rename from modules/services/web-servers/apache-httpd/mediawiki.nix
rename to nixos/modules/services/web-servers/apache-httpd/mediawiki.nix
diff --git a/modules/services/web-servers/apache-httpd/mercurial.nix b/nixos/modules/services/web-servers/apache-httpd/mercurial.nix
similarity index 100%
rename from modules/services/web-servers/apache-httpd/mercurial.nix
rename to nixos/modules/services/web-servers/apache-httpd/mercurial.nix
diff --git a/modules/services/web-servers/apache-httpd/per-server-options.nix b/nixos/modules/services/web-servers/apache-httpd/per-server-options.nix
similarity index 100%
rename from modules/services/web-servers/apache-httpd/per-server-options.nix
rename to nixos/modules/services/web-servers/apache-httpd/per-server-options.nix
diff --git a/modules/services/web-servers/apache-httpd/tomcat-connector.nix b/nixos/modules/services/web-servers/apache-httpd/tomcat-connector.nix
similarity index 100%
rename from modules/services/web-servers/apache-httpd/tomcat-connector.nix
rename to nixos/modules/services/web-servers/apache-httpd/tomcat-connector.nix
diff --git a/modules/services/web-servers/apache-httpd/trac.nix b/nixos/modules/services/web-servers/apache-httpd/trac.nix
similarity index 100%
rename from modules/services/web-servers/apache-httpd/trac.nix
rename to nixos/modules/services/web-servers/apache-httpd/trac.nix
diff --git a/modules/services/web-servers/apache-httpd/zabbix.nix b/nixos/modules/services/web-servers/apache-httpd/zabbix.nix
similarity index 100%
rename from modules/services/web-servers/apache-httpd/zabbix.nix
rename to nixos/modules/services/web-servers/apache-httpd/zabbix.nix
diff --git a/modules/services/web-servers/jboss/builder.sh b/nixos/modules/services/web-servers/jboss/builder.sh
similarity index 100%
rename from modules/services/web-servers/jboss/builder.sh
rename to nixos/modules/services/web-servers/jboss/builder.sh
diff --git a/modules/services/web-servers/jboss/default.nix b/nixos/modules/services/web-servers/jboss/default.nix
similarity index 100%
rename from modules/services/web-servers/jboss/default.nix
rename to nixos/modules/services/web-servers/jboss/default.nix
diff --git a/modules/services/web-servers/lighttpd/cgit.nix b/nixos/modules/services/web-servers/lighttpd/cgit.nix
similarity index 100%
rename from modules/services/web-servers/lighttpd/cgit.nix
rename to nixos/modules/services/web-servers/lighttpd/cgit.nix
diff --git a/modules/services/web-servers/lighttpd/default.nix b/nixos/modules/services/web-servers/lighttpd/default.nix
similarity index 100%
rename from modules/services/web-servers/lighttpd/default.nix
rename to nixos/modules/services/web-servers/lighttpd/default.nix
diff --git a/modules/services/web-servers/lighttpd/gitweb.nix b/nixos/modules/services/web-servers/lighttpd/gitweb.nix
similarity index 100%
rename from modules/services/web-servers/lighttpd/gitweb.nix
rename to nixos/modules/services/web-servers/lighttpd/gitweb.nix
diff --git a/modules/services/web-servers/nginx/default.nix b/nixos/modules/services/web-servers/nginx/default.nix
similarity index 100%
rename from modules/services/web-servers/nginx/default.nix
rename to nixos/modules/services/web-servers/nginx/default.nix
diff --git a/modules/services/web-servers/tomcat.nix b/nixos/modules/services/web-servers/tomcat.nix
similarity index 100%
rename from modules/services/web-servers/tomcat.nix
rename to nixos/modules/services/web-servers/tomcat.nix
diff --git a/modules/services/web-servers/varnish/default.nix b/nixos/modules/services/web-servers/varnish/default.nix
similarity index 100%
rename from modules/services/web-servers/varnish/default.nix
rename to nixos/modules/services/web-servers/varnish/default.nix
diff --git a/modules/services/web-servers/zope2.nix b/nixos/modules/services/web-servers/zope2.nix
similarity index 100%
rename from modules/services/web-servers/zope2.nix
rename to nixos/modules/services/web-servers/zope2.nix
diff --git a/modules/services/x11/desktop-managers/default.nix b/nixos/modules/services/x11/desktop-managers/default.nix
similarity index 100%
rename from modules/services/x11/desktop-managers/default.nix
rename to nixos/modules/services/x11/desktop-managers/default.nix
diff --git a/modules/services/x11/desktop-managers/e17.nix b/nixos/modules/services/x11/desktop-managers/e17.nix
similarity index 100%
rename from modules/services/x11/desktop-managers/e17.nix
rename to nixos/modules/services/x11/desktop-managers/e17.nix
diff --git a/modules/services/x11/desktop-managers/gnome.nix b/nixos/modules/services/x11/desktop-managers/gnome.nix
similarity index 100%
rename from modules/services/x11/desktop-managers/gnome.nix
rename to nixos/modules/services/x11/desktop-managers/gnome.nix
diff --git a/modules/services/x11/desktop-managers/kde4.nix b/nixos/modules/services/x11/desktop-managers/kde4.nix
similarity index 100%
rename from modules/services/x11/desktop-managers/kde4.nix
rename to nixos/modules/services/x11/desktop-managers/kde4.nix
diff --git a/modules/services/x11/desktop-managers/none.nix b/nixos/modules/services/x11/desktop-managers/none.nix
similarity index 100%
rename from modules/services/x11/desktop-managers/none.nix
rename to nixos/modules/services/x11/desktop-managers/none.nix
diff --git a/modules/services/x11/desktop-managers/xfce.nix b/nixos/modules/services/x11/desktop-managers/xfce.nix
similarity index 100%
rename from modules/services/x11/desktop-managers/xfce.nix
rename to nixos/modules/services/x11/desktop-managers/xfce.nix
diff --git a/modules/services/x11/desktop-managers/xterm.nix b/nixos/modules/services/x11/desktop-managers/xterm.nix
similarity index 100%
rename from modules/services/x11/desktop-managers/xterm.nix
rename to nixos/modules/services/x11/desktop-managers/xterm.nix
diff --git a/modules/services/x11/display-managers/auto.nix b/nixos/modules/services/x11/display-managers/auto.nix
similarity index 100%
rename from modules/services/x11/display-managers/auto.nix
rename to nixos/modules/services/x11/display-managers/auto.nix
diff --git a/modules/services/x11/display-managers/default.nix b/nixos/modules/services/x11/display-managers/default.nix
similarity index 100%
rename from modules/services/x11/display-managers/default.nix
rename to nixos/modules/services/x11/display-managers/default.nix
diff --git a/modules/services/x11/display-managers/kdm.nix b/nixos/modules/services/x11/display-managers/kdm.nix
similarity index 100%
rename from modules/services/x11/display-managers/kdm.nix
rename to nixos/modules/services/x11/display-managers/kdm.nix
diff --git a/modules/services/x11/display-managers/lightdm.nix b/nixos/modules/services/x11/display-managers/lightdm.nix
similarity index 100%
rename from modules/services/x11/display-managers/lightdm.nix
rename to nixos/modules/services/x11/display-managers/lightdm.nix
diff --git a/modules/services/x11/display-managers/slim.nix b/nixos/modules/services/x11/display-managers/slim.nix
similarity index 100%
rename from modules/services/x11/display-managers/slim.nix
rename to nixos/modules/services/x11/display-managers/slim.nix
diff --git a/modules/services/x11/hardware/multitouch.nix b/nixos/modules/services/x11/hardware/multitouch.nix
similarity index 100%
rename from modules/services/x11/hardware/multitouch.nix
rename to nixos/modules/services/x11/hardware/multitouch.nix
diff --git a/modules/services/x11/hardware/synaptics.nix b/nixos/modules/services/x11/hardware/synaptics.nix
similarity index 100%
rename from modules/services/x11/hardware/synaptics.nix
rename to nixos/modules/services/x11/hardware/synaptics.nix
diff --git a/modules/services/x11/hardware/wacom.nix b/nixos/modules/services/x11/hardware/wacom.nix
similarity index 100%
rename from modules/services/x11/hardware/wacom.nix
rename to nixos/modules/services/x11/hardware/wacom.nix
diff --git a/modules/services/x11/terminal-server.nix b/nixos/modules/services/x11/terminal-server.nix
similarity index 100%
rename from modules/services/x11/terminal-server.nix
rename to nixos/modules/services/x11/terminal-server.nix
diff --git a/modules/services/x11/window-managers/awesome.nix b/nixos/modules/services/x11/window-managers/awesome.nix
similarity index 100%
rename from modules/services/x11/window-managers/awesome.nix
rename to nixos/modules/services/x11/window-managers/awesome.nix
diff --git a/modules/services/x11/window-managers/compiz.nix b/nixos/modules/services/x11/window-managers/compiz.nix
similarity index 100%
rename from modules/services/x11/window-managers/compiz.nix
rename to nixos/modules/services/x11/window-managers/compiz.nix
diff --git a/modules/services/x11/window-managers/default.nix b/nixos/modules/services/x11/window-managers/default.nix
similarity index 100%
rename from modules/services/x11/window-managers/default.nix
rename to nixos/modules/services/x11/window-managers/default.nix
diff --git a/modules/services/x11/window-managers/i3.nix b/nixos/modules/services/x11/window-managers/i3.nix
similarity index 100%
rename from modules/services/x11/window-managers/i3.nix
rename to nixos/modules/services/x11/window-managers/i3.nix
diff --git a/modules/services/x11/window-managers/icewm.nix b/nixos/modules/services/x11/window-managers/icewm.nix
similarity index 100%
rename from modules/services/x11/window-managers/icewm.nix
rename to nixos/modules/services/x11/window-managers/icewm.nix
diff --git a/modules/services/x11/window-managers/metacity.nix b/nixos/modules/services/x11/window-managers/metacity.nix
similarity index 100%
rename from modules/services/x11/window-managers/metacity.nix
rename to nixos/modules/services/x11/window-managers/metacity.nix
diff --git a/modules/services/x11/window-managers/none.nix b/nixos/modules/services/x11/window-managers/none.nix
similarity index 100%
rename from modules/services/x11/window-managers/none.nix
rename to nixos/modules/services/x11/window-managers/none.nix
diff --git a/modules/services/x11/window-managers/openbox.nix b/nixos/modules/services/x11/window-managers/openbox.nix
similarity index 100%
rename from modules/services/x11/window-managers/openbox.nix
rename to nixos/modules/services/x11/window-managers/openbox.nix
diff --git a/modules/services/x11/window-managers/twm.nix b/nixos/modules/services/x11/window-managers/twm.nix
similarity index 100%
rename from modules/services/x11/window-managers/twm.nix
rename to nixos/modules/services/x11/window-managers/twm.nix
diff --git a/modules/services/x11/window-managers/wmii.nix b/nixos/modules/services/x11/window-managers/wmii.nix
similarity index 100%
rename from modules/services/x11/window-managers/wmii.nix
rename to nixos/modules/services/x11/window-managers/wmii.nix
diff --git a/modules/services/x11/window-managers/xbmc.nix b/nixos/modules/services/x11/window-managers/xbmc.nix
similarity index 100%
rename from modules/services/x11/window-managers/xbmc.nix
rename to nixos/modules/services/x11/window-managers/xbmc.nix
diff --git a/modules/services/x11/window-managers/xmonad.nix b/nixos/modules/services/x11/window-managers/xmonad.nix
similarity index 100%
rename from modules/services/x11/window-managers/xmonad.nix
rename to nixos/modules/services/x11/window-managers/xmonad.nix
diff --git a/modules/services/x11/xfs.conf b/nixos/modules/services/x11/xfs.conf
similarity index 100%
rename from modules/services/x11/xfs.conf
rename to nixos/modules/services/x11/xfs.conf
diff --git a/modules/services/x11/xfs.nix b/nixos/modules/services/x11/xfs.nix
similarity index 100%
rename from modules/services/x11/xfs.nix
rename to nixos/modules/services/x11/xfs.nix
diff --git a/modules/services/x11/xserver.nix b/nixos/modules/services/x11/xserver.nix
similarity index 100%
rename from modules/services/x11/xserver.nix
rename to nixos/modules/services/x11/xserver.nix
diff --git a/modules/system/activation/activation-script.nix b/nixos/modules/system/activation/activation-script.nix
similarity index 100%
rename from modules/system/activation/activation-script.nix
rename to nixos/modules/system/activation/activation-script.nix
diff --git a/modules/system/activation/no-clone.nix b/nixos/modules/system/activation/no-clone.nix
similarity index 100%
rename from modules/system/activation/no-clone.nix
rename to nixos/modules/system/activation/no-clone.nix
diff --git a/modules/system/activation/switch-to-configuration.pl b/nixos/modules/system/activation/switch-to-configuration.pl
similarity index 100%
rename from modules/system/activation/switch-to-configuration.pl
rename to nixos/modules/system/activation/switch-to-configuration.pl
diff --git a/modules/system/activation/top-level.nix b/nixos/modules/system/activation/top-level.nix
similarity index 100%
rename from modules/system/activation/top-level.nix
rename to nixos/modules/system/activation/top-level.nix
diff --git a/modules/system/boot/kernel.nix b/nixos/modules/system/boot/kernel.nix
similarity index 100%
rename from modules/system/boot/kernel.nix
rename to nixos/modules/system/boot/kernel.nix
diff --git a/modules/system/boot/kexec.nix b/nixos/modules/system/boot/kexec.nix
similarity index 100%
rename from modules/system/boot/kexec.nix
rename to nixos/modules/system/boot/kexec.nix
diff --git a/modules/system/boot/loader/efi-boot-stub/efi-boot-stub-builder.sh b/nixos/modules/system/boot/loader/efi-boot-stub/efi-boot-stub-builder.sh
similarity index 100%
rename from modules/system/boot/loader/efi-boot-stub/efi-boot-stub-builder.sh
rename to nixos/modules/system/boot/loader/efi-boot-stub/efi-boot-stub-builder.sh
diff --git a/modules/system/boot/loader/efi-boot-stub/efi-boot-stub.nix b/nixos/modules/system/boot/loader/efi-boot-stub/efi-boot-stub.nix
similarity index 100%
rename from modules/system/boot/loader/efi-boot-stub/efi-boot-stub.nix
rename to nixos/modules/system/boot/loader/efi-boot-stub/efi-boot-stub.nix
diff --git a/modules/system/boot/loader/efi.nix b/nixos/modules/system/boot/loader/efi.nix
similarity index 100%
rename from modules/system/boot/loader/efi.nix
rename to nixos/modules/system/boot/loader/efi.nix
diff --git a/modules/system/boot/loader/generations-dir/generations-dir-builder.sh b/nixos/modules/system/boot/loader/generations-dir/generations-dir-builder.sh
similarity index 100%
rename from modules/system/boot/loader/generations-dir/generations-dir-builder.sh
rename to nixos/modules/system/boot/loader/generations-dir/generations-dir-builder.sh
diff --git a/modules/system/boot/loader/generations-dir/generations-dir.nix b/nixos/modules/system/boot/loader/generations-dir/generations-dir.nix
similarity index 100%
rename from modules/system/boot/loader/generations-dir/generations-dir.nix
rename to nixos/modules/system/boot/loader/generations-dir/generations-dir.nix
diff --git a/modules/system/boot/loader/grub/grub.nix b/nixos/modules/system/boot/loader/grub/grub.nix
similarity index 100%
rename from modules/system/boot/loader/grub/grub.nix
rename to nixos/modules/system/boot/loader/grub/grub.nix
diff --git a/modules/system/boot/loader/grub/install-grub.pl b/nixos/modules/system/boot/loader/grub/install-grub.pl
similarity index 100%
rename from modules/system/boot/loader/grub/install-grub.pl
rename to nixos/modules/system/boot/loader/grub/install-grub.pl
diff --git a/modules/system/boot/loader/grub/memtest.nix b/nixos/modules/system/boot/loader/grub/memtest.nix
similarity index 100%
rename from modules/system/boot/loader/grub/memtest.nix
rename to nixos/modules/system/boot/loader/grub/memtest.nix
diff --git a/modules/system/boot/loader/grub/winkler-gnu-blue-640x480.png b/nixos/modules/system/boot/loader/grub/winkler-gnu-blue-640x480.png
similarity index 100%
rename from modules/system/boot/loader/grub/winkler-gnu-blue-640x480.png
rename to nixos/modules/system/boot/loader/grub/winkler-gnu-blue-640x480.png
diff --git a/modules/system/boot/loader/grub/winkler-gnu-blue.README b/nixos/modules/system/boot/loader/grub/winkler-gnu-blue.README
similarity index 100%
rename from modules/system/boot/loader/grub/winkler-gnu-blue.README
rename to nixos/modules/system/boot/loader/grub/winkler-gnu-blue.README
diff --git a/modules/system/boot/loader/gummiboot/gummiboot-builder.py b/nixos/modules/system/boot/loader/gummiboot/gummiboot-builder.py
similarity index 100%
rename from modules/system/boot/loader/gummiboot/gummiboot-builder.py
rename to nixos/modules/system/boot/loader/gummiboot/gummiboot-builder.py
diff --git a/modules/system/boot/loader/gummiboot/gummiboot.nix b/nixos/modules/system/boot/loader/gummiboot/gummiboot.nix
similarity index 100%
rename from modules/system/boot/loader/gummiboot/gummiboot.nix
rename to nixos/modules/system/boot/loader/gummiboot/gummiboot.nix
diff --git a/modules/system/boot/loader/init-script/init-script-builder.sh b/nixos/modules/system/boot/loader/init-script/init-script-builder.sh
similarity index 100%
rename from modules/system/boot/loader/init-script/init-script-builder.sh
rename to nixos/modules/system/boot/loader/init-script/init-script-builder.sh
diff --git a/modules/system/boot/loader/init-script/init-script.nix b/nixos/modules/system/boot/loader/init-script/init-script.nix
similarity index 100%
rename from modules/system/boot/loader/init-script/init-script.nix
rename to nixos/modules/system/boot/loader/init-script/init-script.nix
diff --git a/modules/system/boot/loader/raspberrypi/builder.sh b/nixos/modules/system/boot/loader/raspberrypi/builder.sh
similarity index 100%
rename from modules/system/boot/loader/raspberrypi/builder.sh
rename to nixos/modules/system/boot/loader/raspberrypi/builder.sh
diff --git a/modules/system/boot/loader/raspberrypi/raspberrypi.nix b/nixos/modules/system/boot/loader/raspberrypi/raspberrypi.nix
similarity index 100%
rename from modules/system/boot/loader/raspberrypi/raspberrypi.nix
rename to nixos/modules/system/boot/loader/raspberrypi/raspberrypi.nix
diff --git a/modules/system/boot/luksroot.nix b/nixos/modules/system/boot/luksroot.nix
similarity index 100%
rename from modules/system/boot/luksroot.nix
rename to nixos/modules/system/boot/luksroot.nix
diff --git a/modules/system/boot/modprobe.nix b/nixos/modules/system/boot/modprobe.nix
similarity index 100%
rename from modules/system/boot/modprobe.nix
rename to nixos/modules/system/boot/modprobe.nix
diff --git a/modules/system/boot/readonly-mountpoint.c b/nixos/modules/system/boot/readonly-mountpoint.c
similarity index 100%
rename from modules/system/boot/readonly-mountpoint.c
rename to nixos/modules/system/boot/readonly-mountpoint.c
diff --git a/modules/system/boot/shutdown.nix b/nixos/modules/system/boot/shutdown.nix
similarity index 100%
rename from modules/system/boot/shutdown.nix
rename to nixos/modules/system/boot/shutdown.nix
diff --git a/modules/system/boot/stage-1-init.sh b/nixos/modules/system/boot/stage-1-init.sh
similarity index 100%
rename from modules/system/boot/stage-1-init.sh
rename to nixos/modules/system/boot/stage-1-init.sh
diff --git a/modules/system/boot/stage-1.nix b/nixos/modules/system/boot/stage-1.nix
similarity index 100%
rename from modules/system/boot/stage-1.nix
rename to nixos/modules/system/boot/stage-1.nix
diff --git a/modules/system/boot/stage-2-init.sh b/nixos/modules/system/boot/stage-2-init.sh
similarity index 100%
rename from modules/system/boot/stage-2-init.sh
rename to nixos/modules/system/boot/stage-2-init.sh
diff --git a/modules/system/boot/stage-2.nix b/nixos/modules/system/boot/stage-2.nix
similarity index 100%
rename from modules/system/boot/stage-2.nix
rename to nixos/modules/system/boot/stage-2.nix
diff --git a/modules/system/boot/systemd-unit-options.nix b/nixos/modules/system/boot/systemd-unit-options.nix
similarity index 100%
rename from modules/system/boot/systemd-unit-options.nix
rename to nixos/modules/system/boot/systemd-unit-options.nix
diff --git a/modules/system/boot/systemd.nix b/nixos/modules/system/boot/systemd.nix
similarity index 100%
rename from modules/system/boot/systemd.nix
rename to nixos/modules/system/boot/systemd.nix
diff --git a/modules/system/etc/etc.nix b/nixos/modules/system/etc/etc.nix
similarity index 100%
rename from modules/system/etc/etc.nix
rename to nixos/modules/system/etc/etc.nix
diff --git a/modules/system/etc/make-etc.sh b/nixos/modules/system/etc/make-etc.sh
similarity index 100%
rename from modules/system/etc/make-etc.sh
rename to nixos/modules/system/etc/make-etc.sh
diff --git a/modules/system/etc/setup-etc.pl b/nixos/modules/system/etc/setup-etc.pl
similarity index 100%
rename from modules/system/etc/setup-etc.pl
rename to nixos/modules/system/etc/setup-etc.pl
diff --git a/modules/system/upstart/upstart.nix b/nixos/modules/system/upstart/upstart.nix
similarity index 100%
rename from modules/system/upstart/upstart.nix
rename to nixos/modules/system/upstart/upstart.nix
diff --git a/modules/tasks/cpu-freq.nix b/nixos/modules/tasks/cpu-freq.nix
similarity index 100%
rename from modules/tasks/cpu-freq.nix
rename to nixos/modules/tasks/cpu-freq.nix
diff --git a/modules/tasks/filesystems.nix b/nixos/modules/tasks/filesystems.nix
similarity index 100%
rename from modules/tasks/filesystems.nix
rename to nixos/modules/tasks/filesystems.nix
diff --git a/modules/tasks/filesystems/btrfs.nix b/nixos/modules/tasks/filesystems/btrfs.nix
similarity index 100%
rename from modules/tasks/filesystems/btrfs.nix
rename to nixos/modules/tasks/filesystems/btrfs.nix
diff --git a/modules/tasks/filesystems/ext.nix b/nixos/modules/tasks/filesystems/ext.nix
similarity index 100%
rename from modules/tasks/filesystems/ext.nix
rename to nixos/modules/tasks/filesystems/ext.nix
diff --git a/modules/tasks/filesystems/nfs.nix b/nixos/modules/tasks/filesystems/nfs.nix
similarity index 100%
rename from modules/tasks/filesystems/nfs.nix
rename to nixos/modules/tasks/filesystems/nfs.nix
diff --git a/modules/tasks/filesystems/reiserfs.nix b/nixos/modules/tasks/filesystems/reiserfs.nix
similarity index 100%
rename from modules/tasks/filesystems/reiserfs.nix
rename to nixos/modules/tasks/filesystems/reiserfs.nix
diff --git a/modules/tasks/filesystems/unionfs-fuse.nix b/nixos/modules/tasks/filesystems/unionfs-fuse.nix
similarity index 100%
rename from modules/tasks/filesystems/unionfs-fuse.nix
rename to nixos/modules/tasks/filesystems/unionfs-fuse.nix
diff --git a/modules/tasks/filesystems/vfat.nix b/nixos/modules/tasks/filesystems/vfat.nix
similarity index 100%
rename from modules/tasks/filesystems/vfat.nix
rename to nixos/modules/tasks/filesystems/vfat.nix
diff --git a/modules/tasks/filesystems/xfs.nix b/nixos/modules/tasks/filesystems/xfs.nix
similarity index 100%
rename from modules/tasks/filesystems/xfs.nix
rename to nixos/modules/tasks/filesystems/xfs.nix
diff --git a/modules/tasks/filesystems/zfs.nix b/nixos/modules/tasks/filesystems/zfs.nix
similarity index 100%
rename from modules/tasks/filesystems/zfs.nix
rename to nixos/modules/tasks/filesystems/zfs.nix
diff --git a/modules/tasks/kbd.nix b/nixos/modules/tasks/kbd.nix
similarity index 100%
rename from modules/tasks/kbd.nix
rename to nixos/modules/tasks/kbd.nix
diff --git a/modules/tasks/lvm.nix b/nixos/modules/tasks/lvm.nix
similarity index 100%
rename from modules/tasks/lvm.nix
rename to nixos/modules/tasks/lvm.nix
diff --git a/modules/tasks/network-interfaces.nix b/nixos/modules/tasks/network-interfaces.nix
similarity index 100%
rename from modules/tasks/network-interfaces.nix
rename to nixos/modules/tasks/network-interfaces.nix
diff --git a/modules/tasks/scsi-link-power-management.nix b/nixos/modules/tasks/scsi-link-power-management.nix
similarity index 100%
rename from modules/tasks/scsi-link-power-management.nix
rename to nixos/modules/tasks/scsi-link-power-management.nix
diff --git a/modules/tasks/swraid.nix b/nixos/modules/tasks/swraid.nix
similarity index 100%
rename from modules/tasks/swraid.nix
rename to nixos/modules/tasks/swraid.nix
diff --git a/modules/tasks/tty-backgrounds-combine.sh b/nixos/modules/tasks/tty-backgrounds-combine.sh
similarity index 100%
rename from modules/tasks/tty-backgrounds-combine.sh
rename to nixos/modules/tasks/tty-backgrounds-combine.sh
diff --git a/modules/testing/minimal-kernel.nix b/nixos/modules/testing/minimal-kernel.nix
similarity index 100%
rename from modules/testing/minimal-kernel.nix
rename to nixos/modules/testing/minimal-kernel.nix
diff --git a/modules/testing/test-instrumentation.nix b/nixos/modules/testing/test-instrumentation.nix
similarity index 100%
rename from modules/testing/test-instrumentation.nix
rename to nixos/modules/testing/test-instrumentation.nix
diff --git a/modules/virtualisation/amazon-config.nix b/nixos/modules/virtualisation/amazon-config.nix
similarity index 100%
rename from modules/virtualisation/amazon-config.nix
rename to nixos/modules/virtualisation/amazon-config.nix
diff --git a/modules/virtualisation/amazon-image.nix b/nixos/modules/virtualisation/amazon-image.nix
similarity index 100%
rename from modules/virtualisation/amazon-image.nix
rename to nixos/modules/virtualisation/amazon-image.nix
diff --git a/modules/virtualisation/ec2-data.nix b/nixos/modules/virtualisation/ec2-data.nix
similarity index 100%
rename from modules/virtualisation/ec2-data.nix
rename to nixos/modules/virtualisation/ec2-data.nix
diff --git a/modules/virtualisation/libvirtd.nix b/nixos/modules/virtualisation/libvirtd.nix
similarity index 100%
rename from modules/virtualisation/libvirtd.nix
rename to nixos/modules/virtualisation/libvirtd.nix
diff --git a/modules/virtualisation/nova-config.nix b/nixos/modules/virtualisation/nova-config.nix
similarity index 100%
rename from modules/virtualisation/nova-config.nix
rename to nixos/modules/virtualisation/nova-config.nix
diff --git a/modules/virtualisation/nova-image.nix b/nixos/modules/virtualisation/nova-image.nix
similarity index 100%
rename from modules/virtualisation/nova-image.nix
rename to nixos/modules/virtualisation/nova-image.nix
diff --git a/modules/virtualisation/nova.nix b/nixos/modules/virtualisation/nova.nix
similarity index 100%
rename from modules/virtualisation/nova.nix
rename to nixos/modules/virtualisation/nova.nix
diff --git a/modules/virtualisation/qemu-opts b/nixos/modules/virtualisation/qemu-opts
similarity index 100%
rename from modules/virtualisation/qemu-opts
rename to nixos/modules/virtualisation/qemu-opts
diff --git a/modules/virtualisation/qemu-vm.nix b/nixos/modules/virtualisation/qemu-vm.nix
similarity index 100%
rename from modules/virtualisation/qemu-vm.nix
rename to nixos/modules/virtualisation/qemu-vm.nix
diff --git a/modules/virtualisation/virtualbox-guest.nix b/nixos/modules/virtualisation/virtualbox-guest.nix
similarity index 100%
rename from modules/virtualisation/virtualbox-guest.nix
rename to nixos/modules/virtualisation/virtualbox-guest.nix
diff --git a/modules/virtualisation/virtualbox-image.nix b/nixos/modules/virtualisation/virtualbox-image.nix
similarity index 100%
rename from modules/virtualisation/virtualbox-image.nix
rename to nixos/modules/virtualisation/virtualbox-image.nix
diff --git a/modules/virtualisation/xen-dom0.nix b/nixos/modules/virtualisation/xen-dom0.nix
similarity index 100%
rename from modules/virtualisation/xen-dom0.nix
rename to nixos/modules/virtualisation/xen-dom0.nix
diff --git a/modules/virtualisation/xen-domU.nix b/nixos/modules/virtualisation/xen-domU.nix
similarity index 100%
rename from modules/virtualisation/xen-domU.nix
rename to nixos/modules/virtualisation/xen-domU.nix
diff --git a/release-combined.nix b/nixos/release-combined.nix
similarity index 100%
rename from release-combined.nix
rename to nixos/release-combined.nix
diff --git a/release.nix b/nixos/release.nix
similarity index 100%
rename from release.nix
rename to nixos/release.nix
diff --git a/tests/avahi.nix b/nixos/tests/avahi.nix
similarity index 100%
rename from tests/avahi.nix
rename to nixos/tests/avahi.nix
diff --git a/tests/bittorrent.nix b/nixos/tests/bittorrent.nix
similarity index 100%
rename from tests/bittorrent.nix
rename to nixos/tests/bittorrent.nix
diff --git a/tests/check-filesystems.nix b/nixos/tests/check-filesystems.nix
similarity index 100%
rename from tests/check-filesystems.nix
rename to nixos/tests/check-filesystems.nix
diff --git a/tests/common/user-account.nix b/nixos/tests/common/user-account.nix
similarity index 100%
rename from tests/common/user-account.nix
rename to nixos/tests/common/user-account.nix
diff --git a/tests/common/x11.nix b/nixos/tests/common/x11.nix
similarity index 100%
rename from tests/common/x11.nix
rename to nixos/tests/common/x11.nix
diff --git a/tests/default.nix b/nixos/tests/default.nix
similarity index 100%
rename from tests/default.nix
rename to nixos/tests/default.nix
diff --git a/tests/efi-installer.nix b/nixos/tests/efi-installer.nix
similarity index 100%
rename from tests/efi-installer.nix
rename to nixos/tests/efi-installer.nix
diff --git a/tests/firefox.nix b/nixos/tests/firefox.nix
similarity index 100%
rename from tests/firefox.nix
rename to nixos/tests/firefox.nix
diff --git a/tests/firewall.nix b/nixos/tests/firewall.nix
similarity index 100%
rename from tests/firewall.nix
rename to nixos/tests/firewall.nix
diff --git a/tests/installer.nix b/nixos/tests/installer.nix
similarity index 100%
rename from tests/installer.nix
rename to nixos/tests/installer.nix
diff --git a/tests/ipv6.nix b/nixos/tests/ipv6.nix
similarity index 100%
rename from tests/ipv6.nix
rename to nixos/tests/ipv6.nix
diff --git a/tests/kde4.nix b/nixos/tests/kde4.nix
similarity index 100%
rename from tests/kde4.nix
rename to nixos/tests/kde4.nix
diff --git a/tests/kexec.nix b/nixos/tests/kexec.nix
similarity index 100%
rename from tests/kexec.nix
rename to nixos/tests/kexec.nix
diff --git a/tests/login.nix b/nixos/tests/login.nix
similarity index 100%
rename from tests/login.nix
rename to nixos/tests/login.nix
diff --git a/tests/misc.nix b/nixos/tests/misc.nix
similarity index 100%
rename from tests/misc.nix
rename to nixos/tests/misc.nix
diff --git a/tests/mpich-example.c b/nixos/tests/mpich-example.c
similarity index 100%
rename from tests/mpich-example.c
rename to nixos/tests/mpich-example.c
diff --git a/tests/mpich.nix b/nixos/tests/mpich.nix
similarity index 100%
rename from tests/mpich.nix
rename to nixos/tests/mpich.nix
diff --git a/tests/mysql-replication.nix b/nixos/tests/mysql-replication.nix
similarity index 100%
rename from tests/mysql-replication.nix
rename to nixos/tests/mysql-replication.nix
diff --git a/tests/mysql.nix b/nixos/tests/mysql.nix
similarity index 100%
rename from tests/mysql.nix
rename to nixos/tests/mysql.nix
diff --git a/tests/nat.nix b/nixos/tests/nat.nix
similarity index 100%
rename from tests/nat.nix
rename to nixos/tests/nat.nix
diff --git a/tests/nfs.nix b/nixos/tests/nfs.nix
similarity index 100%
rename from tests/nfs.nix
rename to nixos/tests/nfs.nix
diff --git a/tests/openssh.nix b/nixos/tests/openssh.nix
similarity index 100%
rename from tests/openssh.nix
rename to nixos/tests/openssh.nix
diff --git a/tests/partition.nix b/nixos/tests/partition.nix
similarity index 100%
rename from tests/partition.nix
rename to nixos/tests/partition.nix
diff --git a/tests/printing.nix b/nixos/tests/printing.nix
similarity index 100%
rename from tests/printing.nix
rename to nixos/tests/printing.nix
diff --git a/tests/proxy.nix b/nixos/tests/proxy.nix
similarity index 100%
rename from tests/proxy.nix
rename to nixos/tests/proxy.nix
diff --git a/tests/quake3.nix b/nixos/tests/quake3.nix
similarity index 100%
rename from tests/quake3.nix
rename to nixos/tests/quake3.nix
diff --git a/tests/run-in-machine.nix b/nixos/tests/run-in-machine.nix
similarity index 100%
rename from tests/run-in-machine.nix
rename to nixos/tests/run-in-machine.nix
diff --git a/tests/simple.nix b/nixos/tests/simple.nix
similarity index 100%
rename from tests/simple.nix
rename to nixos/tests/simple.nix
diff --git a/tests/subversion.nix b/nixos/tests/subversion.nix
similarity index 100%
rename from tests/subversion.nix
rename to nixos/tests/subversion.nix
diff --git a/tests/test-config-examples.sh b/nixos/tests/test-config-examples.sh
similarity index 100%
rename from tests/test-config-examples.sh
rename to nixos/tests/test-config-examples.sh
diff --git a/tests/testdb.sql b/nixos/tests/testdb.sql
similarity index 100%
rename from tests/testdb.sql
rename to nixos/tests/testdb.sql
diff --git a/tests/tomcat.nix b/nixos/tests/tomcat.nix
similarity index 100%
rename from tests/tomcat.nix
rename to nixos/tests/tomcat.nix
diff --git a/tests/trac.nix b/nixos/tests/trac.nix
similarity index 100%
rename from tests/trac.nix
rename to nixos/tests/trac.nix
diff --git a/tests/xfce.nix b/nixos/tests/xfce.nix
similarity index 100%
rename from tests/xfce.nix
rename to nixos/tests/xfce.nix
-- 
GitLab


From 5fef92c4a0c91153e3edac3a61a232581765074a Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 10 Oct 2013 13:28:21 +0200
Subject: [PATCH 5067/5331] Move pkgs/lib/ to lib/

---
 {pkgs/lib => lib}/attrsets.nix              | 0
 {pkgs/lib => lib}/composable-derivation.nix | 0
 {pkgs/lib => lib}/customisation.nix         | 0
 {pkgs/lib => lib}/debug.nix                 | 0
 {pkgs/lib => lib}/default.nix               | 0
 {pkgs/lib => lib}/licenses.nix              | 0
 {pkgs/lib => lib}/lists.nix                 | 0
 {pkgs/lib => lib}/maintainers.nix           | 0
 {pkgs/lib => lib}/meta.nix                  | 0
 {pkgs/lib => lib}/misc.nix                  | 0
 {pkgs/lib => lib}/modules.nix               | 0
 {pkgs/lib => lib}/options.nix               | 0
 {pkgs/lib => lib}/platforms.nix             | 0
 {pkgs/lib => lib}/properties.nix            | 0
 {pkgs/lib => lib}/sources.nix               | 0
 {pkgs/lib => lib}/strings-with-deps.nix     | 0
 {pkgs/lib => lib}/strings.nix               | 0
 {pkgs/lib => lib}/systems.nix               | 0
 {pkgs/lib => lib}/tests.nix                 | 0
 {pkgs/lib => lib}/trivial.nix               | 0
 {pkgs/lib => lib}/types.nix                 | 0
 21 files changed, 0 insertions(+), 0 deletions(-)
 rename {pkgs/lib => lib}/attrsets.nix (100%)
 rename {pkgs/lib => lib}/composable-derivation.nix (100%)
 rename {pkgs/lib => lib}/customisation.nix (100%)
 rename {pkgs/lib => lib}/debug.nix (100%)
 rename {pkgs/lib => lib}/default.nix (100%)
 rename {pkgs/lib => lib}/licenses.nix (100%)
 rename {pkgs/lib => lib}/lists.nix (100%)
 rename {pkgs/lib => lib}/maintainers.nix (100%)
 rename {pkgs/lib => lib}/meta.nix (100%)
 rename {pkgs/lib => lib}/misc.nix (100%)
 rename {pkgs/lib => lib}/modules.nix (100%)
 rename {pkgs/lib => lib}/options.nix (100%)
 rename {pkgs/lib => lib}/platforms.nix (100%)
 rename {pkgs/lib => lib}/properties.nix (100%)
 rename {pkgs/lib => lib}/sources.nix (100%)
 rename {pkgs/lib => lib}/strings-with-deps.nix (100%)
 rename {pkgs/lib => lib}/strings.nix (100%)
 rename {pkgs/lib => lib}/systems.nix (100%)
 rename {pkgs/lib => lib}/tests.nix (100%)
 rename {pkgs/lib => lib}/trivial.nix (100%)
 rename {pkgs/lib => lib}/types.nix (100%)

diff --git a/pkgs/lib/attrsets.nix b/lib/attrsets.nix
similarity index 100%
rename from pkgs/lib/attrsets.nix
rename to lib/attrsets.nix
diff --git a/pkgs/lib/composable-derivation.nix b/lib/composable-derivation.nix
similarity index 100%
rename from pkgs/lib/composable-derivation.nix
rename to lib/composable-derivation.nix
diff --git a/pkgs/lib/customisation.nix b/lib/customisation.nix
similarity index 100%
rename from pkgs/lib/customisation.nix
rename to lib/customisation.nix
diff --git a/pkgs/lib/debug.nix b/lib/debug.nix
similarity index 100%
rename from pkgs/lib/debug.nix
rename to lib/debug.nix
diff --git a/pkgs/lib/default.nix b/lib/default.nix
similarity index 100%
rename from pkgs/lib/default.nix
rename to lib/default.nix
diff --git a/pkgs/lib/licenses.nix b/lib/licenses.nix
similarity index 100%
rename from pkgs/lib/licenses.nix
rename to lib/licenses.nix
diff --git a/pkgs/lib/lists.nix b/lib/lists.nix
similarity index 100%
rename from pkgs/lib/lists.nix
rename to lib/lists.nix
diff --git a/pkgs/lib/maintainers.nix b/lib/maintainers.nix
similarity index 100%
rename from pkgs/lib/maintainers.nix
rename to lib/maintainers.nix
diff --git a/pkgs/lib/meta.nix b/lib/meta.nix
similarity index 100%
rename from pkgs/lib/meta.nix
rename to lib/meta.nix
diff --git a/pkgs/lib/misc.nix b/lib/misc.nix
similarity index 100%
rename from pkgs/lib/misc.nix
rename to lib/misc.nix
diff --git a/pkgs/lib/modules.nix b/lib/modules.nix
similarity index 100%
rename from pkgs/lib/modules.nix
rename to lib/modules.nix
diff --git a/pkgs/lib/options.nix b/lib/options.nix
similarity index 100%
rename from pkgs/lib/options.nix
rename to lib/options.nix
diff --git a/pkgs/lib/platforms.nix b/lib/platforms.nix
similarity index 100%
rename from pkgs/lib/platforms.nix
rename to lib/platforms.nix
diff --git a/pkgs/lib/properties.nix b/lib/properties.nix
similarity index 100%
rename from pkgs/lib/properties.nix
rename to lib/properties.nix
diff --git a/pkgs/lib/sources.nix b/lib/sources.nix
similarity index 100%
rename from pkgs/lib/sources.nix
rename to lib/sources.nix
diff --git a/pkgs/lib/strings-with-deps.nix b/lib/strings-with-deps.nix
similarity index 100%
rename from pkgs/lib/strings-with-deps.nix
rename to lib/strings-with-deps.nix
diff --git a/pkgs/lib/strings.nix b/lib/strings.nix
similarity index 100%
rename from pkgs/lib/strings.nix
rename to lib/strings.nix
diff --git a/pkgs/lib/systems.nix b/lib/systems.nix
similarity index 100%
rename from pkgs/lib/systems.nix
rename to lib/systems.nix
diff --git a/pkgs/lib/tests.nix b/lib/tests.nix
similarity index 100%
rename from pkgs/lib/tests.nix
rename to lib/tests.nix
diff --git a/pkgs/lib/trivial.nix b/lib/trivial.nix
similarity index 100%
rename from pkgs/lib/trivial.nix
rename to lib/trivial.nix
diff --git a/pkgs/lib/types.nix b/lib/types.nix
similarity index 100%
rename from pkgs/lib/types.nix
rename to lib/types.nix
-- 
GitLab


From 3293421dd3434cd84d660f3c4c3c81baf88bbd3d Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 30 Sep 2013 22:43:34 +0200
Subject: [PATCH 5068/5331] Fix references to pkgs/lib

---
 maintainers/scripts/eval-release.nix                      | 2 +-
 pkgs/applications/networking/browsers/firefox/wrapper.nix | 5 ++---
 pkgs/stdenv/generic/default.nix                           | 2 +-
 pkgs/top-level/all-packages.nix                           | 6 +++---
 4 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/maintainers/scripts/eval-release.nix b/maintainers/scripts/eval-release.nix
index eccd77009a1..bb9572cbc79 100644
--- a/maintainers/scripts/eval-release.nix
+++ b/maintainers/scripts/eval-release.nix
@@ -1,7 +1,7 @@
 # Evaluate `release.nix' like Hydra would.  Too bad nix-instantiate
 # can't to do this.
 
-with import ../../pkgs/lib;
+with import ../../lib;
 
 let
   trace = if builtins.getEnv "VERBOSE" == "1" then builtins.trace else (x: y: y);
diff --git a/pkgs/applications/networking/browsers/firefox/wrapper.nix b/pkgs/applications/networking/browsers/firefox/wrapper.nix
index f8d2c2d0e8c..bf4c7f3e7d2 100644
--- a/pkgs/applications/networking/browsers/firefox/wrapper.nix
+++ b/pkgs/applications/networking/browsers/firefox/wrapper.nix
@@ -1,4 +1,4 @@
-{ stdenv, browser, makeDesktopItem, makeWrapper, plugins, libs, gtk_modules
+{ stdenv, lib, browser, makeDesktopItem, makeWrapper, plugins, libs, gtk_modules
 , browserName, desktopName, nameSuffix, icon
 }:
 
@@ -50,8 +50,7 @@ stdenv.mkDerivation {
     description =
       browser.meta.description
       + " (with plugins: "
-      + (let lib = import ../../../../lib;
-        in lib.concatStrings (lib.intersperse ", " (map (x: x.name) plugins)))
+      + lib.concatStrings (lib.intersperse ", " (map (x: x.name) plugins))
       + ")";
   };
 }
diff --git a/pkgs/stdenv/generic/default.nix b/pkgs/stdenv/generic/default.nix
index 9b8fd5615e7..0b1003a7392 100644
--- a/pkgs/stdenv/generic/default.nix
+++ b/pkgs/stdenv/generic/default.nix
@@ -14,7 +14,7 @@ else
 
 let
 
-  lib = import ../../lib;
+  lib = import ../../../lib;
 
   allowUnfree = config.allowUnfree or true && builtins.getEnv "HYDRA_DISALLOW_UNFREE" != "1";
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 394ef116928..219add96e10 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -46,7 +46,7 @@ let config_ = config; platform_ = platform; in # rename the function arguments
 
 let
 
-  lib = import ../lib;
+  lib = import ../../lib;
 
   # The contents of the configuration file found at $NIXPKGS_CONFIG or
   # $HOME/.nixpkgs/config.nix.
@@ -381,7 +381,7 @@ let
     inherit pkgs;
   };
 
-  composableDerivation = (import ../lib/composable-derivation.nix) {
+  composableDerivation = (import ../../lib/composable-derivation.nix) {
     inherit pkgs lib;
   };
 
@@ -8886,7 +8886,7 @@ let
       enableGnash = cfg.enableGnash or false;
     in
     import ../applications/networking/browsers/firefox/wrapper.nix {
-      inherit stdenv makeWrapper makeDesktopItem browser browserName desktopName nameSuffix icon;
+      inherit stdenv lib makeWrapper makeDesktopItem browser browserName desktopName nameSuffix icon;
       plugins =
          assert !(enableGnash && enableAdobeFlash);
          ([ ]
-- 
GitLab


From 041da5a6f9dfa39b20a8b4f9743e57c15a131d36 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 1 Oct 2013 13:45:14 +0200
Subject: [PATCH 5069/5331] Unify the Nixpkgs and NixOS version numbers

---
 .version                                         |  1 +
 VERSION                                          |  1 -
 doc/manual.xml                                   |  2 +-
 nixos/.version                                   |  1 -
 nixos/modules/installer/tools/get-version-suffix | 13 +++----------
 nixos/modules/misc/version.nix                   |  4 ++--
 nixos/release.nix                                |  4 ++--
 pkgs/top-level/make-tarball.nix                  | 14 +++++++-------
 8 files changed, 16 insertions(+), 24 deletions(-)
 create mode 100644 .version
 delete mode 100644 VERSION
 delete mode 100644 nixos/.version

diff --git a/.version b/.version
new file mode 100644
index 00000000000..381796ec8b7
--- /dev/null
+++ b/.version
@@ -0,0 +1 @@
+13.10
\ No newline at end of file
diff --git a/VERSION b/VERSION
deleted file mode 100644
index 9f8e9b69a33..00000000000
--- a/VERSION
+++ /dev/null
@@ -1 +0,0 @@
-1.0
\ No newline at end of file
diff --git a/doc/manual.xml b/doc/manual.xml
index 927361ba5c8..d2c07859b28 100644
--- a/doc/manual.xml
+++ b/doc/manual.xml
@@ -5,7 +5,7 @@
 
     <title>Nixpkgs Manual</title>
 
-    <subtitle>Draft (Version <xi:include href="../VERSION"
+    <subtitle>Draft (Version <xi:include href="../.version"
     parse="text" />)</subtitle>
 
     <author>
diff --git a/nixos/.version b/nixos/.version
deleted file mode 100644
index eb28f45ff24..00000000000
--- a/nixos/.version
+++ /dev/null
@@ -1 +0,0 @@
-13.09
\ No newline at end of file
diff --git a/nixos/modules/installer/tools/get-version-suffix b/nixos/modules/installer/tools/get-version-suffix
index 76cec8d5dae..461fbf4d3d8 100644
--- a/nixos/modules/installer/tools/get-version-suffix
+++ b/nixos/modules/installer/tools/get-version-suffix
@@ -14,16 +14,9 @@ getVersion() {
     fi
 }
 
-if nixos=$(nix-instantiate --find-file nixos "$@"); then
-    getVersion $nixos
+if nixpkgs=$(nix-instantiate --find-file nixpkgs "$@"); then
+    getVersion $nixpkgs
     if [ -n "$rev" ]; then
-        suffix="pre-$rev"
-        if nixpkgs=$(nix-instantiate --find-file nixpkgs "$@"); then
-            getVersion $nixpkgs
-            if [ -n "$rev" ]; then
-                suffix+="-$rev"
-            fi
-        fi
-        echo $suffix
+        echo "pre-$rev"
     fi
 fi
diff --git a/nixos/modules/misc/version.nix b/nixos/modules/misc/version.nix
index 20a03b44a2a..fa7baf36fb9 100644
--- a/nixos/modules/misc/version.nix
+++ b/nixos/modules/misc/version.nix
@@ -26,10 +26,10 @@ with pkgs.lib;
   config = {
 
     system.nixosVersion =
-      mkDefault (builtins.readFile ../../.version + config.system.nixosVersionSuffix);
+      mkDefault (builtins.readFile ../../../.version + config.system.nixosVersionSuffix);
 
     system.nixosVersionSuffix =
-      mkDefault (if builtins.pathExists ../../.version-suffix then builtins.readFile ../../.version-suffix else "pre-git");
+      mkDefault (if builtins.pathExists ../../../.version-suffix then builtins.readFile ../../../.version-suffix else "pre-git");
 
     # Note: code names must only increase in alphabetical order.
     system.nixosCodeName = "Aardvark";
diff --git a/nixos/release.nix b/nixos/release.nix
index 06fb43bf6d6..458e17aef46 100644
--- a/nixos/release.nix
+++ b/nixos/release.nix
@@ -5,8 +5,8 @@
 
 let
 
-  version = builtins.readFile ./.version;
-  versionSuffix = "pre${toString nixosSrc.revCount}_${nixosSrc.shortRev}-${nixpkgs.shortRev}";
+  version = builtins.readFile ../.version;
+  versionSuffix = "pre${toString nixpkgs.revCount}_${nixpkgs.shortRev}";
 
   systems = [ "x86_64-linux" "i686-linux" ];
 
diff --git a/pkgs/top-level/make-tarball.nix b/pkgs/top-level/make-tarball.nix
index cea7e6539b0..62317df4163 100644
--- a/pkgs/top-level/make-tarball.nix
+++ b/pkgs/top-level/make-tarball.nix
@@ -1,4 +1,4 @@
-/* Hydra job to build a tarball for Nixpkgs from a SVN checkout.  It
+/* Hydra job to build a tarball for Nixpkgs from a Git checkout.  It
    also builds the documentation and tests whether the Nix expressions
    evaluate correctly. */
 
@@ -6,13 +6,13 @@
 
 with import nixpkgs.outPath {};
 
-releaseTools.sourceTarball {
+releaseTools.sourceTarball rec {
   name = "nixpkgs-tarball";
   src = nixpkgs;
-  inherit officialRelease;
 
-  version = builtins.readFile ../../VERSION;
-  versionSuffix = if officialRelease then "" else "pre${toString nixpkgs.revCount}_${nixpkgs.shortRev}";
+  inherit officialRelease;
+  version = builtins.readFile ../../.version;
+  versionSuffix = "pre${toString nixpkgs.revCount}_${nixpkgs.shortRev}";
 
   buildInputs = [
     lzma
@@ -26,8 +26,8 @@ releaseTools.sourceTarball {
   configurePhase = ''
     eval "$preConfigure"
     releaseName=nixpkgs-$VERSION$VERSION_SUFFIX
+    echo -n $VERSION_SUFFIX > .version-suffix
     echo "release name is $releaseName"
-    echo $releaseName > relname
   '';
 
   dontBuild = false;
@@ -47,7 +47,7 @@ releaseTools.sourceTarball {
     nix-store --init
 
     # Run the regression tests in `lib'.
-    res="$(nix-instantiate --eval-only --strict --show-trace pkgs/lib/tests.nix)"
+    res="$(nix-instantiate --eval-only --strict --show-trace lib/tests.nix)"
     if test "$res" != "[ ]"; then
         echo "regression tests for lib failed, got: $res"
         exit 1
-- 
GitLab


From 31203732b3104125e107a3141578399cab5d478f Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 1 Oct 2013 15:48:39 +0200
Subject: [PATCH 5070/5331] Update the release expressions and the channel
 generators

---
 nixos/default.nix                             |  7 ++-
 nixos/lib/build-vms.nix                       |  2 +-
 nixos/lib/eval-config.nix                     |  7 ++-
 nixos/modules/installer/cd-dvd/channel.nix    | 14 ++++--
 .../modules/installer/tools/nixos-install.sh  |  8 ++--
 nixos/modules/programs/environment.nix        |  1 -
 nixos/release-combined.nix                    | 17 ++++---
 nixos/release.nix                             | 46 +++++--------------
 8 files changed, 39 insertions(+), 63 deletions(-)

diff --git a/nixos/default.nix b/nixos/default.nix
index d38e70d21f9..88f82a82482 100644
--- a/nixos/default.nix
+++ b/nixos/default.nix
@@ -1,12 +1,11 @@
 { configuration ? import ./lib/from-env.nix "NIXOS_CONFIG" <nixos-config>
 , system ? builtins.currentSystem
-, nixpkgs ? <nixpkgs>
 }:
 
 let
 
   eval = import ./lib/eval-config.nix {
-    inherit system nixpkgs;
+    inherit system;
     modules = [ configuration ];
   };
 
@@ -14,13 +13,13 @@ let
 
   # This is for `nixos-rebuild build-vm'.
   vmConfig = (import ./lib/eval-config.nix {
-    inherit system nixpkgs;
+    inherit system;
     modules = [ configuration ./modules/virtualisation/qemu-vm.nix ];
   }).config;
 
   # This is for `nixos-rebuild build-vm-with-bootloader'.
   vmWithBootLoaderConfig = (import ./lib/eval-config.nix {
-    inherit system nixpkgs;
+    inherit system;
     modules =
       [ configuration
         ./modules/virtualisation/qemu-vm.nix
diff --git a/nixos/lib/build-vms.nix b/nixos/lib/build-vms.nix
index 59f05bfd104..aad85aedc48 100644
--- a/nixos/lib/build-vms.nix
+++ b/nixos/lib/build-vms.nix
@@ -1,6 +1,6 @@
 { system, minimal ? false }:
 
-let pkgs = import <nixpkgs> { config = {}; inherit system; }; in
+let pkgs = import ../.. { config = {}; inherit system; }; in
 
 with pkgs.lib;
 with import ../lib/qemu-flags.nix;
diff --git a/nixos/lib/eval-config.nix b/nixos/lib/eval-config.nix
index 47e7d1a0eaf..89f81cf70bd 100644
--- a/nixos/lib/eval-config.nix
+++ b/nixos/lib/eval-config.nix
@@ -7,7 +7,6 @@
 , baseModules ? import ../modules/module-list.nix
 , extraArgs ? {}
 , modules
-, nixpkgs ? <nixpkgs>
 }:
 
 let extraArgs_ = extraArgs; pkgs_ = pkgs; system_ = system; in
@@ -31,7 +30,7 @@ rec {
   extraArgs = extraArgs_ // {
     inherit pkgs modules baseModules;
     modulesPath = ../modules;
-    pkgs_i686 = import nixpkgs { system = "i686-linux"; };
+    pkgs_i686 = import ../.. { system = "i686-linux"; };
     utils = import ./utils.nix pkgs;
   };
 
@@ -48,7 +47,7 @@ rec {
   pkgs =
     if pkgs_ != null
     then pkgs_
-    else import nixpkgs (
+    else import ../.. (
       let
         system = if nixpkgsOptions.system != "" then nixpkgsOptions.system else system_;
         nixpkgsOptions = (import ./eval-config.nix {
@@ -56,7 +55,7 @@ rec {
           # For efficiency, leave out most NixOS modules; they don't
           # define nixpkgs.config, so it's pointless to evaluate them.
           baseModules = [ ../modules/misc/nixpkgs.nix ];
-          pkgs = import nixpkgs { system = system_; config = {}; };
+          pkgs = import ../.. { system = system_; config = {}; };
         }).optionDefinitions.nixpkgs;
       in
       {
diff --git a/nixos/modules/installer/cd-dvd/channel.nix b/nixos/modules/installer/cd-dvd/channel.nix
index 8126ce46dd9..987b85d6165 100644
--- a/nixos/modules/installer/cd-dvd/channel.nix
+++ b/nixos/modules/installer/cd-dvd/channel.nix
@@ -14,11 +14,15 @@ let
     { expr = builtins.readFile ../../../lib/channel-expr.nix; }
     ''
       mkdir -p $out/nixos
-      cp -prd ${cleanSource ../../..} $out/nixos/nixos
-      cp -prd ${cleanSource <nixpkgs>} $out/nixos/nixpkgs
-      chmod -R u+w $out/nixos/nixos
-      echo -n ${config.system.nixosVersion} > $out/nixos/nixos/.version
-      echo -n "" > $out/nixos/nixos/.version-suffix
+      # FIXME: should use ../../../.. instead of <nixpkgs>, but that
+      # doesn't work properly if <nixos> is a symlink to
+      # nixpkgs/nixos.
+      cp -prd ${<nixpkgs>} $out/nixos/nixpkgs
+      ln -s nixpkgs/nixos $out/nixos/nixos
+      chmod -R u+w $out/nixos
+      rm -rf $out/nixos/nixpkgs/.git
+      echo -n ${config.system.nixosVersion} > $out/nixos/nixpkgs/.version
+      echo -n "" > $out/nixos/nixpkgs/.version-suffix
       echo "$expr" > $out/nixos/default.nix
     '';
 
diff --git a/nixos/modules/installer/tools/nixos-install.sh b/nixos/modules/installer/tools/nixos-install.sh
index a4ac5b68dd7..19ce81983f1 100644
--- a/nixos/modules/installer/tools/nixos-install.sh
+++ b/nixos/modules/installer/tools/nixos-install.sh
@@ -57,7 +57,7 @@ fi
 # Mount some stuff in the target root directory.  We bind-mount /etc
 # into the chroot because we need networking and the nixbld user
 # accounts in /etc/passwd.  But we do need the target's /etc/nixos.
-mkdir -m 0755 -p $mountPoint/dev $mountPoint/proc $mountPoint/sys $mountPoint/mnt $mountPoint/mnt2 $mountPoint/mnt-nixos $mountPoint/mnt-nixpkgs $mountPoint/etc /etc/nixos
+mkdir -m 0755 -p $mountPoint/dev $mountPoint/proc $mountPoint/sys $mountPoint/mnt $mountPoint/mnt2 $mountPoint/mnt-nixpkgs $mountPoint/etc /etc/nixos
 mount --make-private / # systemd makes / shared, which is annoying
 mount --bind / $mountPoint/mnt
 mount --bind /nix $mountPoint/mnt/nix
@@ -76,7 +76,6 @@ cleanup() {
     mountpoint -q $mountPoint/etc/nixos && umount $mountPoint/etc/nixos
     mountpoint -q $mountPoint/etc && umount $mountPoint/etc
     umount $mountPoint/mnt2
-    umount $mountPoint/mnt-nixos
     umount $mountPoint/mnt-nixpkgs
     umount $mountPoint/sys/firmware/efi/efivars &>/dev/null || true
     umount $mountPoint/sys
@@ -86,7 +85,7 @@ cleanup() {
     umount $mountPoint/mnt/nix/store
     umount $mountPoint/mnt/nix
     umount $mountPoint/mnt
-    rmdir $mountPoint/mnt $mountPoint/mnt2 $mountPoint/mnt-nixos $mountPoint/mnt-nixpkgs
+    rmdir $mountPoint/mnt $mountPoint/mnt2 $mountPoint/mnt-nixpkgs
 }
 
 trap "cleanup" EXIT
@@ -189,13 +188,12 @@ done
 
 # Get the absolute path to the NixOS/Nixpkgs sources.
 mount --bind $(readlink -f $(nix-instantiate --find-file nixpkgs)) $mountPoint/mnt-nixpkgs
-mount --bind $(readlink -f $(nix-instantiate --find-file nixos)) $mountPoint/mnt-nixos
 
 
 # Build the specified Nix expression in the target store and install
 # it into the system configuration profile.
 echo "building the system configuration..."
-NIX_PATH="nixpkgs=/mnt-nixpkgs:nixos=/mnt-nixos:nixos-config=$NIXOS_CONFIG" NIXOS_CONFIG= \
+NIX_PATH="nixpkgs=/mnt-nixpkgs:nixos=/mnt-nixpkgs/nixos:nixos-config=$NIXOS_CONFIG" NIXOS_CONFIG= \
     chroot $mountPoint @nix@/bin/nix-env \
     "${extraBuildFlags[@]}" -p /nix/var/nix/profiles/system -f '<nixos>' --set -A system --show-trace
 
diff --git a/nixos/modules/programs/environment.nix b/nixos/modules/programs/environment.nix
index f42df351422..683f6b54b10 100644
--- a/nixos/modules/programs/environment.nix
+++ b/nixos/modules/programs/environment.nix
@@ -23,7 +23,6 @@ in
         NIX_PATH =
           [ "/nix/var/nix/profiles/per-user/root/channels/nixos"
             "nixpkgs=/etc/nixos/nixpkgs"
-            "nixos=/etc/nixos/nixos"
             "nixos-config=/etc/nixos/configuration.nix"
             "services=/etc/nixos/services"
           ];
diff --git a/nixos/release-combined.nix b/nixos/release-combined.nix
index 9b914506215..f36f3fd9aba 100644
--- a/nixos/release-combined.nix
+++ b/nixos/release-combined.nix
@@ -1,13 +1,12 @@
-{ nixosSrc ? { outPath = ./.; revCount = 1234; shortRev = "abcdefg"; }
-, nixpkgs ? { outPath = <nixpkgs>; revCount = 5678; shortRev = "gfedcba"; }
+{ nixpkgs ? { outPath = ./..; revCount = 5678; shortRev = "gfedcba"; }
 , officialRelease ? false
 }:
 
 let
 
-  nixpkgs' = nixpkgs; # urgh
+  nixpkgsSrc = nixpkgs; # urgh
 
-  pkgs = import <nixpkgs> {};
+  pkgs = import ./.. {};
 
   removeMaintainers = set: if builtins.isAttrs set
     then if (set.type or "") == "derivation"
@@ -18,19 +17,19 @@ let
 in rec {
 
   nixos = removeMaintainers (import ./release.nix {
-    inherit nixosSrc officialRelease;
-    nixpkgs = nixpkgs';
+    inherit officialRelease;
+    nixpkgs = nixpkgsSrc;
   });
 
-  nixpkgs = builtins.removeAttrs (removeMaintainers (import <nixpkgs/pkgs/top-level/release.nix> {
+  nixpkgs = builtins.removeAttrs (removeMaintainers (import ../pkgs/top-level/release.nix {
     inherit officialRelease;
-    nixpkgs = nixpkgs';
+    nixpkgs = nixpkgsSrc;
     # Only do Linux builds.
     supportedSystems = [ "x86_64-linux" "i686-linux" ];
   })) [ "unstable" ];
 
   tested = pkgs.releaseTools.aggregate {
-    name = "nixos-${nixos.tarball.version}";
+    name = "nixos-${nixos.channel.version}";
     meta = {
       description = "Release-critical builds for the NixOS unstable channel";
       maintainers = [ pkgs.lib.maintainers.eelco pkgs.lib.maintainers.shlevy ];
diff --git a/nixos/release.nix b/nixos/release.nix
index 458e17aef46..2af43ab5b87 100644
--- a/nixos/release.nix
+++ b/nixos/release.nix
@@ -1,5 +1,4 @@
-{ nixosSrc ? { outPath = ./.; revCount = 1234; shortRev = "abcdefg"; }
-, nixpkgs ? { outPath = <nixpkgs>; revCount = 5678; shortRev = "gfedcba"; }
+{ nixpkgs ? { outPath = ./..; revCount = 5678; shortRev = "gfedcba"; }
 , officialRelease ? false
 }:
 
@@ -10,7 +9,7 @@ let
 
   systems = [ "x86_64-linux" "i686-linux" ];
 
-  pkgs = import <nixpkgs> { system = "x86_64-linux"; };
+  pkgs = import nixpkgs { system = "x86_64-linux"; };
 
 
   versionModule =
@@ -20,7 +19,7 @@ let
   makeIso =
     { module, type, description ? type, maintainers ? ["eelco"], system }:
 
-    with import <nixpkgs> { inherit system; };
+    with import nixpkgs { inherit system; };
 
     let
 
@@ -50,7 +49,7 @@ let
   makeSystemTarball =
     { module, maintainers ? ["viric"], system }:
 
-    with import <nixpkgs> { inherit system; };
+    with import nixpkgs { inherit system; };
 
     let
 
@@ -73,36 +72,13 @@ let
 
 in {
 
-  tarball =
-    pkgs.releaseTools.makeSourceTarball {
-      name = "nixos-tarball";
-
-      src = nixosSrc;
-
-      inherit officialRelease version;
-      versionSuffix = pkgs.lib.optionalString (!officialRelease) versionSuffix;
-
-      distPhase = ''
-        echo -n $VERSION_SUFFIX > .version-suffix
-        releaseName=nixos-$VERSION$VERSION_SUFFIX
-        mkdir -p $out/tarballs
-        mkdir ../$releaseName
-        cp -prd . ../$releaseName
-        cd ..
-        chmod -R u+w $releaseName
-        tar cfvj $out/tarballs/$releaseName.tar.bz2 $releaseName
-      ''; # */
-    };
-
-
   channel =
     pkgs.releaseTools.makeSourceTarball {
       name = "nixos-channel";
 
-      src = nixosSrc;
+      src = nixpkgs;
 
-      inherit officialRelease version;
-      versionSuffix = pkgs.lib.optionalString (!officialRelease) versionSuffix;
+      inherit officialRelease version versionSuffix;
 
       buildInputs = [ pkgs.nixUnstable ];
 
@@ -113,8 +89,10 @@ in {
         releaseName=nixos-$VERSION$VERSION_SUFFIX
         mkdir -p $out/tarballs
         mkdir ../$releaseName
-        cp -prd . ../$releaseName/nixos
         cp -prd ${nixpkgs} ../$releaseName/nixpkgs
+        chmod -R u+w ../$releaseName
+        rm -rf .git
+        ln -s nixpkgs/nixos ../$releaseName/nixos
         echo "$expr" > ../$releaseName/default.nix
         NIX_STATE_DIR=$TMPDIR nix-env -f ../$releaseName/default.nix -qaP --meta --xml \* > /dev/null
         cd ..
@@ -125,7 +103,7 @@ in {
 
 
   manual =
-    (import "${nixosSrc}/doc/manual" {
+    (import ./doc/manual {
       inherit pkgs;
       options =
         (import lib/eval-config.nix {
@@ -134,7 +112,7 @@ in {
               boot.loader.grub.device = "/dev/sda";
             } ];
         }).options;
-      revision = toString (nixosSrc.rev or nixosSrc.shortRev);
+      revision = toString (nixpkgs.rev or nixpkgs.shortRev);
     }).manual;
 
 
@@ -177,7 +155,7 @@ in {
   # A bootable VirtualBox virtual appliance as an OVA file (i.e. packaged OVF).
   ova = pkgs.lib.genAttrs systems (system:
 
-    with import <nixpkgs> { inherit system; };
+    with import nixpkgs { inherit system; };
 
     let
 
-- 
GitLab


From c8628e09892acde58e5f4e6e2b1e317e248e9f10 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 1 Oct 2013 16:02:08 +0200
Subject: [PATCH 5071/5331] nixos-checkout: Only fetch the Nixpkgs repo

---
 nixos/modules/installer/tools/nixos-checkout.nix | 14 ++++----------
 1 file changed, 4 insertions(+), 10 deletions(-)

diff --git a/nixos/modules/installer/tools/nixos-checkout.nix b/nixos/modules/installer/tools/nixos-checkout.nix
index 1a734ca5eeb..41899855686 100644
--- a/nixos/modules/installer/tools/nixos-checkout.nix
+++ b/nixos/modules/installer/tools/nixos-checkout.nix
@@ -1,8 +1,7 @@
 # This module generates the nixos-checkout script, which replaces the
-# NixOS and Nixpkgs source trees in /etc/nixos/{nixos,nixpkgs} with
-# Git checkouts.
+# Nixpkgs source trees in /etc/nixos/nixpkgs with a Git checkout.
 
-{config, pkgs, ...}:
+{ config, pkgs, ... }:
 
 with pkgs.lib;
 
@@ -19,7 +18,7 @@ let
         if [ "$1" == "-h" ] || [ "$1" == "--help" ]; then
           echo "Usage: `basename $0` [PREFIX]. See NixOS Manual for more info."
           exit 0
-        fi        
+        fi
 
         prefix="$1"
         if [ -z "$prefix" ]; then prefix=/etc/nixos; fi
@@ -31,19 +30,14 @@ let
             nix-env -iA nixos.pkgs.git || nix-env -i git
         fi
 
-        # Move any old nixos or nixpkgs directories out of the way.
+        # Move any old nixpkgs directories out of the way.
         backupTimestamp=$(date "+%Y%m%d%H%M%S")
 
-        if [ -e nixos -a ! -e nixos/.git ]; then
-            mv nixos nixos-$backupTimestamp
-        fi
-
         if [ -e nixpkgs -a ! -e nixpkgs/.git ]; then
             mv nixpkgs nixpkgs-$backupTimestamp
         fi
 
         # Check out the NixOS and Nixpkgs sources.
-        git clone git://github.com/NixOS/nixos.git nixos
         git clone git://github.com/NixOS/nixpkgs.git nixpkgs
       '';
    };
-- 
GitLab


From 95c98166ec15fa57ad62f1298c4afc9d8d98fc23 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 1 Oct 2013 16:45:25 +0200
Subject: [PATCH 5072/5331] Merge .gitignore files

---
 .gitignore       | 1 +
 nixos/.gitignore | 2 --
 2 files changed, 1 insertion(+), 2 deletions(-)
 delete mode 100644 nixos/.gitignore

diff --git a/.gitignore b/.gitignore
index 165e92c7fc3..105e621d702 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,3 +7,4 @@ doc/NEWS.html
 doc/NEWS.txt
 doc/manual.html
 doc/manual.pdf
+.version-suffix
diff --git a/nixos/.gitignore b/nixos/.gitignore
deleted file mode 100644
index e75fb319980..00000000000
--- a/nixos/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-*~
-.version-suffix
-- 
GitLab


From a7824368c26ae1809a36495f870ea7a625c55206 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 9 Oct 2013 15:00:45 +0200
Subject: [PATCH 5073/5331] Fix setting of .version-suffix

---
 nixos/release.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/nixos/release.nix b/nixos/release.nix
index 2af43ab5b87..8409ca87717 100644
--- a/nixos/release.nix
+++ b/nixos/release.nix
@@ -85,13 +85,13 @@ in {
       expr = builtins.readFile lib/channel-expr.nix;
 
       distPhase = ''
+        rm -rf .git
         echo -n $VERSION_SUFFIX > .version-suffix
         releaseName=nixos-$VERSION$VERSION_SUFFIX
         mkdir -p $out/tarballs
         mkdir ../$releaseName
-        cp -prd ${nixpkgs} ../$releaseName/nixpkgs
+        cp -prd . ../$releaseName/nixpkgs
         chmod -R u+w ../$releaseName
-        rm -rf .git
         ln -s nixpkgs/nixos ../$releaseName/nixos
         echo "$expr" > ../$releaseName/default.nix
         NIX_STATE_DIR=$TMPDIR nix-env -f ../$releaseName/default.nix -qaP --meta --xml \* > /dev/null
-- 
GitLab


From a5357e80cd885ad9b36109f7a5369e67f649ee9e Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 10 Oct 2013 12:16:20 +0200
Subject: [PATCH 5074/5331] Tweak the version string

It's now "<yy>.<mm>pre<commit-count>.<short-hash>"
(e.g. "13.10pre5678.gfedcba") for the unstable branch, and
"<yy>.<mm>.<commit-count>.<short-hash>" (e.g. "13.10.5678.gfedcba")
for stable branches.
---
 nixos/release.nix | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/nixos/release.nix b/nixos/release.nix
index 8409ca87717..094eacf7059 100644
--- a/nixos/release.nix
+++ b/nixos/release.nix
@@ -1,11 +1,14 @@
 { nixpkgs ? { outPath = ./..; revCount = 5678; shortRev = "gfedcba"; }
 , officialRelease ? false
+, stableBranch ? false
 }:
 
 let
 
   version = builtins.readFile ../.version;
-  versionSuffix = "pre${toString nixpkgs.revCount}_${nixpkgs.shortRev}";
+  versionSuffix =
+    if officialRelease then ""
+    else (if stableBranch then "." else "pre") + "${toString nixpkgs.revCount}.${nixpkgs.shortRev}";
 
   systems = [ "x86_64-linux" "i686-linux" ];
 
@@ -13,7 +16,7 @@ let
 
 
   versionModule =
-    { system.nixosVersionSuffix = pkgs.lib.optionalString (!officialRelease) versionSuffix;  };
+    { system.nixosVersionSuffix = versionSuffix;  };
 
 
   makeIso =
@@ -78,7 +81,8 @@ in {
 
       src = nixpkgs;
 
-      inherit officialRelease version versionSuffix;
+      officialRelease = false; # FIXME: fix this in makeSourceTarball
+      inherit version versionSuffix;
 
       buildInputs = [ pkgs.nixUnstable ];
 
-- 
GitLab


From 762164c8a73864d6989f50fd87fb24aec9f9ff90 Mon Sep 17 00:00:00 2001
From: Rok Garbas <rok@garbas.si>
Date: Thu, 10 Oct 2013 15:18:50 +0200
Subject: [PATCH 5075/5331] pythonPackage.psycopg2: fix

---
 pkgs/top-level/python-packages-generated.nix |  2 +-
 pkgs/top-level/python-packages.json          |  7 ++++++-
 pkgs/top-level/python-packages.nix           | 22 +-------------------
 3 files changed, 8 insertions(+), 23 deletions(-)

diff --git a/pkgs/top-level/python-packages-generated.nix b/pkgs/top-level/python-packages-generated.nix
index 5ed553224d2..4e72b12ffcc 100644
--- a/pkgs/top-level/python-packages-generated.nix
+++ b/pkgs/top-level/python-packages-generated.nix
@@ -2552,7 +2552,7 @@ in
         md5 = "1b433f83d50d1bc61e09026e906d84c7";
     };
     doCheck = false;
-    buildInputs = [  ];
+    buildInputs = [ pkgs.postgresql ];
     propagatedBuildInputs = [  ];
     installCommand = ''easy_install --always-unzip --prefix="$out" .'';
     meta = {
diff --git a/pkgs/top-level/python-packages.json b/pkgs/top-level/python-packages.json
index aefd911a558..065e9340e7d 100644
--- a/pkgs/top-level/python-packages.json
+++ b/pkgs/top-level/python-packages.json
@@ -133,7 +133,12 @@
   },
   { "name": "psycopg2",
     "buildInputs": [ "pkgs.postgresql" ],
-    "doCheck": false
+    "doCheck": false,
+    "override": {
+      "psycopg2": {
+        "buildInputs": [ "pkgs.postgresql" ]
+      }
+    }
   }
 
 ]
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index a33103cccb8..94c8c1ba66e 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -4320,26 +4320,6 @@ pythonPackages = modules // import ./python-packages-generated.nix {
   };
 
 
-  psycopg2 = buildPythonPackage rec {
-    name = "psycopg2-2.5.1";
-
-    # error: invalid command 'test'
-    doCheck = false;
-
-    src = fetchurl {
-      url = "https://pypi.python.org/packages/source/p/psycopg2/psycopg2-2.5.1.tar.gz";
-      sha256 = "1v7glzzzykbaqj7dhpr0qds9cf4maxmn7f5aazpqnbg0ly40r9v5";
-    };
-
-    propagatedBuildInputs = [ pkgs.postgresql ];
-
-    meta = {
-      description = "PostgreSQL database adapter for the Python programming language";
-      license = "GPLv2/ZPL";
-    };
-  };
-
-
   publicsuffix = buildPythonPackage rec {
     name = "publicsuffix-${version}";
     version = "1.0.2";
@@ -5347,7 +5327,7 @@ pythonPackages = modules // import ./python-packages-generated.nix {
     propagatedBuildInputs =
       [ recaptcha_client pytz memcached dateutil_1_5 paramiko flup pygments
         djblets django_1_3 django_evolution pycrypto modules.sqlite3
-        pysvn pil psycopg2
+        pysvn pil pythonPackages.psycopg2
       ];
   };
 
-- 
GitLab


From a63b4dc555e71fd211a17720f87266d9c673a067 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Thu, 10 Oct 2013 10:54:30 -0400
Subject: [PATCH 5076/5331] Remove old efi boot stub bootloader

Signed-off-by: Shea Levy <shea@shealevy.com>
---
 nixos/modules/module-list.nix                 |   1 -
 nixos/modules/rename.nix                      |   5 -
 .../efi-boot-stub/efi-boot-stub-builder.sh    | 131 ------------------
 .../loader/efi-boot-stub/efi-boot-stub.nix    |  98 -------------
 nixos/modules/system/boot/loader/efi.nix      |  26 ----
 5 files changed, 261 deletions(-)
 delete mode 100644 nixos/modules/system/boot/loader/efi-boot-stub/efi-boot-stub-builder.sh
 delete mode 100644 nixos/modules/system/boot/loader/efi-boot-stub/efi-boot-stub.nix

diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index c186968f059..977ca2518ec 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -240,7 +240,6 @@
   ./system/activation/top-level.nix
   ./system/boot/kernel.nix
   ./system/boot/kexec.nix
-  ./system/boot/loader/efi-boot-stub/efi-boot-stub.nix
   ./system/boot/loader/efi.nix
   ./system/boot/loader/generations-dir/generations-dir.nix
   ./system/boot/loader/gummiboot/gummiboot.nix
diff --git a/nixos/modules/rename.nix b/nixos/modules/rename.nix
index 631283ce219..27b6f01c71f 100644
--- a/nixos/modules/rename.nix
+++ b/nixos/modules/rename.nix
@@ -101,11 +101,6 @@ in zipModules ([]
 # ++ rename obsolete "environment.kdePackages" "environment.systemPackages" # !!! doesn't work!
 
 # Multiple efi bootloaders now
-++ rename obsolete "boot.loader.efiBootStub.efiSysMountPoint" "boot.loader.efi.efiSysMountPoint"
-++ rename obsolete "boot.loader.efiBootStub.efiDisk" "boot.loader.efi.efibootmgr.efiDisk"
-++ rename obsolete "boot.loader.efiBootStub.efiPartition" "boot.loader.efi.efibootmgr.efiPartition"
-++ rename obsolete "boot.loader.efiBootStub.postEfiBootMgrCommands" "boot.loader.efi.efibootmgr.postEfiBootMgrCommands"
-++ rename obsolete "boot.loader.efiBootStub.runEfibootmgr" "boot.loader.efi.canTouchEfiVariables"
 ++ rename obsolete "boot.loader.efi.efibootmgr.enable" "boot.loader.efi.canTouchEfiVariables"
 
 # NixOS environment changes
diff --git a/nixos/modules/system/boot/loader/efi-boot-stub/efi-boot-stub-builder.sh b/nixos/modules/system/boot/loader/efi-boot-stub/efi-boot-stub-builder.sh
deleted file mode 100644
index 2f550c98428..00000000000
--- a/nixos/modules/system/boot/loader/efi-boot-stub/efi-boot-stub-builder.sh
+++ /dev/null
@@ -1,131 +0,0 @@
-#! @bash@/bin/sh -e
-
-shopt -s nullglob
-
-export PATH=/empty
-for i in @path@; do PATH=$PATH:$i/bin:$i/sbin; done
-
-default=$1
-if test -z "$1"; then
-    echo "Syntax: efi-boot-stub-builder.sh <DEFAULT-CONFIG>"
-    exit 1
-fi
-
-echo "updating the efi system partition..."
-
-# Convert a path to a file in the Nix store such as
-# /nix/store/<hash>-<name>/file to <hash>-<name>-<file>.
-# Also, efi executables need the .efi extension
-cleanName() {
-    local path="$1"
-    echo "$path" | sed 's|^/nix/store/||' | sed 's|/|-|g' | sed 's|@kernelFile@$|@kernelFile@.efi|'
-}
-
-# Copy a file from the Nix store to the EFI system partition
-declare -A filesCopied
-
-copyToKernelsDir() {
-    local src="$1"
-    local dst="@efiSysMountPoint@/efi/nixos/$(cleanName $src)"
-    # Don't copy the file if $dst already exists.  This means that we
-    # have to create $dst atomically to prevent partially copied
-    # kernels or initrd if this script is ever interrupted.
-    if ! test -e $dst; then
-        local dstTmp=$dst.tmp.$$
-        cp $src $dstTmp
-        mv $dstTmp $dst
-    fi
-    filesCopied[$dst]=1
-    result=$dst
-}
-
-# Copy its kernel, initrd, and startup script to the efi system partition
-# Add the efibootmgr entry if requested
-addEntry() {
-    local path="$1"
-    local generation="$2"
-
-    if ! test -e $path/kernel -a -e $path/initrd; then
-        return
-    fi
-
-    local kernel=$(readlink -f $path/kernel)
-    local initrd=$(readlink -f $path/initrd)
-    copyToKernelsDir $kernel; kernel=$result
-    copyToKernelsDir $initrd; initrd=$result
-
-    local startup="@efiSysMountPoint@/efi/nixos/generation-$generation-startup.nsh"
-    if ! test -e $startup; then
-        local dstTmp=$startup.tmp.$$
-	echo "$(echo $kernel | sed 's|@efiSysMountPoint@||' | sed 's|/|\\|g') systemConfig=$(readlink -f $path) init=$(readlink -f $path/init) initrd=$(echo $initrd | sed 's|@efiSysMountPoint@||' | sed 's|/|\\|g') $(cat $path/kernel-params)" > $dstTmp
-        mv $dstTmp $startup
-    fi
-    filesCopied[$startup]=1
-
-    if test -n "@runEfibootmgr@"; then
-      set +e
-      efibootmgr -c -d "@efiDisk@" -g -l $(echo $kernel | sed 's|@efiSysMountPoint@||' | sed 's|/|\\|g') -L "NixOS $generation Generation" -p "@efiPartition@" \
-        -u systemConfig=$(readlink -f $path) init=$(readlink -f $path/init) initrd=$(echo $initrd | sed 's|@efiSysMountPoint@||' | sed 's|/|\\|g') $(cat $path/kernel-params) > /dev/null 2>&1
-      set -e
-    fi
-
-    if test $(readlink -f "$path") = "$default"; then
-      if test -n "@runEfibootmgr@"; then
-        set +e
-        defaultbootnum=$(efibootmgr | grep "NixOS $generation Generation" | sed 's/Boot//' | sed 's/\*.*//')
-	set -e
-      fi
-
-      if test -n "@installStartupNsh@"; then
-        sed 's|.*@kernelFile@.efi|@kernelFile@.efi|' < $startup > "@efiSysMountPoint@/startup.nsh"
-        cp $kernel "@efiSysMountPoint@/@kernelFile@.efi"
-      fi
-    fi
-}
-
-mkdir -p "@efiSysMountPoint@/efi/nixos/"
-
-# Remove all old boot manager entries
-if test -n "@runEfibootmgr@"; then
-  set +e
-  modprobe efivars > /dev/null 2>&1
-  for bootnum in $(efibootmgr | grep "NixOS" | grep "Generation" | sed 's/Boot//' | sed 's/\*.*//'); do
-    efibootmgr -B -b "$bootnum" > /dev/null 2>&1
-  done
-  set -e
-fi
-
-# Add all generations of the system profile to the system partition, in reverse
-# (most recent to least recent) order.
-for generation in $(
-    (cd /nix/var/nix/profiles && ls -d system-*-link) \
-    | sed 's/system-\([0-9]\+\)-link/\1/' \
-    | sort -n -r); do
-    link=/nix/var/nix/profiles/system-$generation-link
-    addEntry $link $generation
-done
-
-if test -n "@runEfibootmgr@"; then
-  set +e
-  efibootmgr -o $defaultbootnum > /dev/null 2>&1
-  set -e
-fi
-
-if test -n "@efiShell@"; then
-  mkdir -pv "@efiSysMountPoint@"/efi/boot
-  cp "@efiShell@" "@efiSysMountPoint@"/efi/boot/boot"@targetArch@".efi
-fi
-
-# Remove obsolete files from the EFI system partition
-for fn in "@efiSysMountPoint@/efi/nixos/"*; do
-    if ! test "${filesCopied[$fn]}" = 1; then
-        rm -vf -- "$fn"
-    fi
-done
-
-# Run any extra commands users may need
-if test -n "@runEfibootmgr@"; then
-  set +e
-  @postEfiBootMgrCommands@
-  set -e
-fi
diff --git a/nixos/modules/system/boot/loader/efi-boot-stub/efi-boot-stub.nix b/nixos/modules/system/boot/loader/efi-boot-stub/efi-boot-stub.nix
deleted file mode 100644
index 735784327bc..00000000000
--- a/nixos/modules/system/boot/loader/efi-boot-stub/efi-boot-stub.nix
+++ /dev/null
@@ -1,98 +0,0 @@
-{pkgs, config, ...}:
-
-with pkgs.lib;
-
-let
-  efiBootStubBuilder = pkgs.substituteAll {
-    src = ./efi-boot-stub-builder.sh;
-    isExecutable = true;
-    inherit (pkgs) bash;
-    path = [pkgs.coreutils pkgs.gnused pkgs.gnugrep pkgs.glibc] ++ (pkgs.stdenv.lib.optionals config.boot.loader.efi.canTouchEfiVariables [pkgs.efibootmgr pkgs.module_init_tools]);
-    inherit (config.boot.loader.efiBootStub) installStartupNsh;
-
-    inherit (config.boot.loader.efi) efiSysMountPoint;
-
-    inherit (config.boot.loader.efi.efibootmgr) efiDisk efiPartition postEfiBootMgrCommands;
-
-    runEfibootmgr = config.boot.loader.efi.canTouchEfiVariables;
-
-    efiShell = if config.boot.loader.efiBootStub.installShell then
-      if pkgs.stdenv.isi686 then
-        pkgs.fetchurl {
-          url = "https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2/EdkShellBinPkg/FullShell/Ia32/Shell_Full.efi";
-          sha256 = "1gv6kyaspczdp7x8qnx5x76ilriaygkfs99ay7ihhdi6riclkhfl";
-        }
-      else
-        pkgs.fetchurl {
-          url = "https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2/EdkShellBinPkg/FullShell/X64/Shell_Full.efi";
-          sha256 = "1g18z84rlavxr5gsrh2g942rfr6znv9fs3fqww5m7dhmnysgyv8p";
-        }
-    else
-      null;
-
-    kernelFile = platform.kernelTarget;
-    targetArch = if pkgs.stdenv.isi686 then
-      "IA32"
-    else if pkgs.stdenv.isx86_64 then
-      "X64"
-    else
-      throw "Unsupported architecture";
-  };
-
-  # Temporary check, for nixos to cope both with nixpkgs stdenv-updates and trunk
-  platform = pkgs.stdenv.platform;
-in
-{
-  options = {
-    boot = {
-      loader = {
-        efiBootStub = {
-
-          enable = mkOption {
-            default = false;
-            description = ''
-              Whether to use the linux kernel as an EFI bootloader.
-              When enabled, the kernel, initrd, and an EFI shell script
-              to boot the system are copied to the EFI system partition.
-            '';
-          };
-
-          installStartupNsh = mkOption {
-            default = false;
-            description = ''
-              Whether to install a startup.nsh in the root of the EFI system partition.
-              For now, it will just boot the latest version when run, the eventual goal
-              is to have a basic menu-type interface.
-            '';
-          };
-
-          installShell = mkOption {
-            default = false;
-            description = ''
-              Whether to install an EFI shell in \EFI\BOOT.
-              This _should_ only be needed for removable devices
-              (CDs, usb sticks, etc.), but it may be an option for broken
-              systems where efibootmgr doesn't work. Particularly useful in
-              conjunction with installStartupNsh
-            '';
-          };
-
-        };
-      };
-    };
-  };
-
-  config = mkIf config.boot.loader.efiBootStub.enable {
-    assertions = [ { assertion = ! config.boot.kernelPackages.kernel ? features || config.boot.kernelPackages.kernel.features ? efiBootStub; message = "This kernel does not support the EFI boot stub"; } ];
-  
-    system = {
-      build.installBootLoader = efiBootStubBuilder;
-      boot.loader.id = "efiBootStub";
-      boot.loader.kernelFile = platform.kernelTarget;
-      requiredKernelConfig = with config.lib.kernelConfig; [
-        (isYes "EFI_STUB")
-      ];
-    };
-  };
-
-}
diff --git a/nixos/modules/system/boot/loader/efi.nix b/nixos/modules/system/boot/loader/efi.nix
index 827b3e39122..7e739173f9a 100644
--- a/nixos/modules/system/boot/loader/efi.nix
+++ b/nixos/modules/system/boot/loader/efi.nix
@@ -12,32 +12,6 @@ with pkgs.lib;
       description = "Whether or not the installation process should modify efi boot variables.";
     };
 
-    efibootmgr = {
-      efiDisk = mkOption {
-        default = "/dev/sda";
-
-        type = types.string;
-
-        description = "The disk that contains the EFI system partition.";
-      };
-
-      efiPartition = mkOption {
-        default = "1";
-        description = "The partition number of the EFI system partition.";
-      };
-
-      postEfiBootMgrCommands = mkOption {
-        default = "";
-        type = types.string;
-        description = ''
-          Shell commands to be executed immediately after efibootmgr has setup the system EFI.
-          Some systems do not follow the EFI specifications properly and insert extra entries.
-          Others will brick (fix by removing battery) on boot when it finds more than X entries.
-          This hook allows for running a few extra efibootmgr commands to combat these issues.
-        '';
-      };
-    };
-
     efiSysMountPoint = mkOption {
       default = "/boot";
 
-- 
GitLab


From 0a24aa4d2935b62c21cf18f7213e8bb59018b8df Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 10 Oct 2013 11:46:45 +0200
Subject: [PATCH 5077/5331] haskell-network: add version 2.4.2.0

---
 .../libraries/haskell/network/2.4.2.0.nix     | 20 +++++++++++++++++++
 pkgs/top-level/haskell-packages.nix           |  5 +++--
 2 files changed, 23 insertions(+), 2 deletions(-)
 create mode 100644 pkgs/development/libraries/haskell/network/2.4.2.0.nix

diff --git a/pkgs/development/libraries/haskell/network/2.4.2.0.nix b/pkgs/development/libraries/haskell/network/2.4.2.0.nix
new file mode 100644
index 00000000000..2912138daf7
--- /dev/null
+++ b/pkgs/development/libraries/haskell/network/2.4.2.0.nix
@@ -0,0 +1,20 @@
+{ cabal, HUnit, parsec, testFramework, testFrameworkHunit
+, testFrameworkQuickcheck2
+}:
+
+cabal.mkDerivation (self: {
+  pname = "network";
+  version = "2.4.2.0";
+  sha256 = "1v6iwww8xym0sr2593ri0aa6gcs6n2975fi9gaz9n7rizbqm88qs";
+  buildDepends = [ parsec ];
+  testDepends = [
+    HUnit testFramework testFrameworkHunit testFrameworkQuickcheck2
+  ];
+  meta = {
+    homepage = "https://github.com/haskell/network";
+    description = "Low-level networking interface";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
+  };
+})
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index f3d7f43e85b..2439c427741 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -154,7 +154,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
     HTTP         = self.HTTP_4000_2_8;
     HUnit        = self.HUnit_1_2_5_2;
     mtl          = self.mtl_2_1_2;
-    network      = self.network_2_4_1_2;
+    network      = self.network_2_4_2_0;
     OpenGL       = self.OpenGL_2_8_0_0;
     OpenGLRaw    = self.OpenGLRaw_1_4_0_0;
     parallel     = self.parallel_3_2_0_3;
@@ -1548,7 +1548,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
   network_2_3_0_13 = callPackage ../development/libraries/haskell/network/2.3.0.13.nix {};
   network_2_3_1_0 = callPackage ../development/libraries/haskell/network/2.3.1.0.nix {};
   network_2_4_1_2 = callPackage ../development/libraries/haskell/network/2.4.1.2.nix {};
-  network = self.network_2_4_1_2;
+  network_2_4_2_0 = callPackage ../development/libraries/haskell/network/2.4.2.0.nix {};
+  network = self.network_2_4_2_0;
 
   networkConduit = callPackage ../development/libraries/haskell/network-conduit {};
   networkConduitTls = callPackage ../development/libraries/haskell/network-conduit-tls {};
-- 
GitLab


From b224e751c051db1687a57d73f92d633f104b8ef7 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 10 Oct 2013 11:50:46 +0200
Subject: [PATCH 5078/5331] haskell-github-backup: update to version 1.20131006

---
 .../git-and-tools/github-backup/default.nix           | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/version-management/git-and-tools/github-backup/default.nix b/pkgs/applications/version-management/git-and-tools/github-backup/default.nix
index 5f0df6c8ead..557886a4deb 100644
--- a/pkgs/applications/version-management/git-and-tools/github-backup/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/github-backup/default.nix
@@ -1,17 +1,18 @@
-{ cabal, extensibleExceptions, filepath, github, hslogger, IfElse
-, MissingH, mtl, network, prettyShow, text
+{ cabal, extensibleExceptions, filepath, git, github, hslogger
+, IfElse, MissingH, mtl, network, prettyShow, text, unixCompat
 }:
 
 cabal.mkDerivation (self: {
   pname = "github-backup";
-  version = "1.20130414";
-  sha256 = "1s8s1kv4kj086kzq8iq28zyrlg65hrzg3563fw3dazfik73cmlcp";
+  version = "1.20131006";
+  sha256 = "0yc2hszi509mc0d6245dc8cq20mjjmr8mgrd8571dy9sgda532pf";
   isLibrary = false;
   isExecutable = true;
   buildDepends = [
     extensibleExceptions filepath github hslogger IfElse MissingH mtl
-    network prettyShow text
+    network prettyShow text unixCompat
   ];
+  buildTools = [ git ];
   meta = {
     homepage = "https://github.com/joeyh/github-backup";
     description = "backs up everything github knows about a repository, to the repository";
-- 
GitLab


From f3aa6c02b92fb7738c7f184d339a757d2698686a Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 10 Oct 2013 11:50:46 +0200
Subject: [PATCH 5079/5331] haskell-GLFW: update to version 0.5.2.0

---
 pkgs/development/libraries/haskell/GLFW/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/GLFW/default.nix b/pkgs/development/libraries/haskell/GLFW/default.nix
index f204bcdf655..26a132ae028 100644
--- a/pkgs/development/libraries/haskell/GLFW/default.nix
+++ b/pkgs/development/libraries/haskell/GLFW/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "GLFW";
-  version = "0.5.1.0";
-  sha256 = "190d75w84y9gayxvdz13dnzpyflc5qy4vdg5iv9p2dpcamcih3km";
+  version = "0.5.2.0";
+  sha256 = "06vps929dmk9yimfv7jj12m0p0bf4ih0ssf6rbcq2j6i9wbhpxq3";
   buildDepends = [ OpenGL ];
   extraLibraries = [ libX11 mesa ];
   meta = {
-- 
GitLab


From b3a5735df64817a80f614233b91e3ab566e57751 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 10 Oct 2013 11:50:46 +0200
Subject: [PATCH 5080/5331] haskell-JuicyPixels: update to version 3.1.1

---
 .../libraries/haskell/JuicyPixels/default.nix          | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/libraries/haskell/JuicyPixels/default.nix b/pkgs/development/libraries/haskell/JuicyPixels/default.nix
index 2a7bc888c48..4dba89d9925 100644
--- a/pkgs/development/libraries/haskell/JuicyPixels/default.nix
+++ b/pkgs/development/libraries/haskell/JuicyPixels/default.nix
@@ -1,13 +1,13 @@
-{ cabal, binary, deepseq, mmap, mtl, primitive, transformers
-, vector, zlib
+{ cabal, binary, deepseq, mtl, primitive, transformers, vector
+, zlib
 }:
 
 cabal.mkDerivation (self: {
   pname = "JuicyPixels";
-  version = "3.1";
-  sha256 = "1z3adva85qgdyx85hldqi99lnb3pg7a42q44zxil4gxwi62pw4xr";
+  version = "3.1.1";
+  sha256 = "0bprga2lh7bjlmfm4p6vyzhjrhqw9ix0wnzc6f1q4a7skwhq0z92";
   buildDepends = [
-    binary deepseq mmap mtl primitive transformers vector zlib
+    binary deepseq mtl primitive transformers vector zlib
   ];
   meta = {
     homepage = "https://github.com/Twinside/Juicy.Pixels";
-- 
GitLab


From 6cba0e6085b38fbc97fa83673cebb2182498ecac Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 10 Oct 2013 11:50:46 +0200
Subject: [PATCH 5081/5331] haskell-certificate: update to version 1.3.9

---
 pkgs/development/libraries/haskell/certificate/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/certificate/default.nix b/pkgs/development/libraries/haskell/certificate/default.nix
index 0a284cd9ba5..95b990b464b 100644
--- a/pkgs/development/libraries/haskell/certificate/default.nix
+++ b/pkgs/development/libraries/haskell/certificate/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "certificate";
-  version = "1.3.8";
-  sha256 = "1id3jfaisl04n1mjj9lbq3gyz8hyn3r9p9chzmfbra0pcj3vf1m0";
+  version = "1.3.9";
+  sha256 = "18g5rq7lpxmvmlnz610537w6mix6z6kxjrfj2ylbhkc81r5pn9g6";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [
-- 
GitLab


From ff8fc2a3dcf9e3417f51fee48c214fa77ddcad01 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 10 Oct 2013 11:50:46 +0200
Subject: [PATCH 5082/5331] haskell-cipher-aes: update to version 0.2.6

---
 pkgs/development/libraries/haskell/cipher-aes/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/cipher-aes/default.nix b/pkgs/development/libraries/haskell/cipher-aes/default.nix
index 5fc5905ebb9..d68d2389e0e 100644
--- a/pkgs/development/libraries/haskell/cipher-aes/default.nix
+++ b/pkgs/development/libraries/haskell/cipher-aes/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "cipher-aes";
-  version = "0.2.5";
-  sha256 = "1ayypdfn2nnxp595dpyivmzw2jc4iyjz2in3z7ldccx36gn5j6b3";
+  version = "0.2.6";
+  sha256 = "0ys5a1w5pwwr74k9wzcsh1flb2jdcvnp1zz7sjs14jpxclpd8x3i";
   buildDepends = [ byteable cryptoCipherTypes securemem ];
   testDepends = [
     byteable cryptoCipherTests cryptoCipherTypes QuickCheck
-- 
GitLab


From 24dfe9bd79a131562d5dbffcb33f8f2c268db00c Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 10 Oct 2013 11:50:46 +0200
Subject: [PATCH 5083/5331] haskell-cipher-blowfish: update to version 0.0.3

---
 .../development/libraries/haskell/cipher-blowfish/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/cipher-blowfish/default.nix b/pkgs/development/libraries/haskell/cipher-blowfish/default.nix
index 535a4b97fca..44a7d96907a 100644
--- a/pkgs/development/libraries/haskell/cipher-blowfish/default.nix
+++ b/pkgs/development/libraries/haskell/cipher-blowfish/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "cipher-blowfish";
-  version = "0.0.2";
-  sha256 = "08jc1qsvnyk7zm7bp0nibkc6lx3bkid79cn1r6fidmccf716r3sp";
+  version = "0.0.3";
+  sha256 = "0hb67gmiyqrknynz5am8nada1b1v47rqla87dw5nvfhxhl51fhcg";
   buildDepends = [ byteable cryptoCipherTypes securemem vector ];
   testDepends = [
     byteable cryptoCipherTests cryptoCipherTypes QuickCheck
-- 
GitLab


From 0e4d71d7816aca3130e6576365cae0dcd875cf5b Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 10 Oct 2013 11:50:46 +0200
Subject: [PATCH 5084/5331] haskell-cipher-camellia: update to version 0.0.2

---
 .../development/libraries/haskell/cipher-camellia/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/cipher-camellia/default.nix b/pkgs/development/libraries/haskell/cipher-camellia/default.nix
index 6d29792ea33..52217751d27 100644
--- a/pkgs/development/libraries/haskell/cipher-camellia/default.nix
+++ b/pkgs/development/libraries/haskell/cipher-camellia/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "cipher-camellia";
-  version = "0.0.1";
-  sha256 = "11narl4h77v7317hdqy8zxhym3k7xrmw97yfwh0vr8k1y5dkiqh3";
+  version = "0.0.2";
+  sha256 = "19z2mi1rvp8fsqjdbmrm1hdlxmx61yr55fyknmmn945qrlvx234d";
   buildDepends = [ byteable cryptoCipherTypes securemem vector ];
   testDepends = [
     byteable cryptoCipherTests cryptoCipherTypes QuickCheck
-- 
GitLab


From e8509b1cf75c9c1a9fa92a30df680cdcf86bba42 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 10 Oct 2013 11:50:46 +0200
Subject: [PATCH 5085/5331] haskell-cipher-des: update to version 0.0.5

---
 pkgs/development/libraries/haskell/cipher-des/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/cipher-des/default.nix b/pkgs/development/libraries/haskell/cipher-des/default.nix
index 0340372d54b..16b953c10bd 100644
--- a/pkgs/development/libraries/haskell/cipher-des/default.nix
+++ b/pkgs/development/libraries/haskell/cipher-des/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "cipher-des";
-  version = "0.0.4";
-  sha256 = "18xpc7v0xyh0qb7p03ail1lyh376h1vg000xn22b5shpgp5kxiqq";
+  version = "0.0.5";
+  sha256 = "1j4nbmxdc3nb5q9gqmwp40dj7pdy71135kvhvl7dfh6mb18bk22v";
   buildDepends = [ byteable cryptoCipherTypes securemem ];
   testDepends = [
     byteable cryptoCipherTests cryptoCipherTypes QuickCheck
-- 
GitLab


From 3b36ea9ebb3a7ce4fb4b62a986612267570cc367 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 10 Oct 2013 11:50:46 +0200
Subject: [PATCH 5086/5331] haskell-cipher-rc4: update to version 0.1.4

---
 pkgs/development/libraries/haskell/cipher-rc4/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/cipher-rc4/default.nix b/pkgs/development/libraries/haskell/cipher-rc4/default.nix
index 038e0dd3292..6485487a0e5 100644
--- a/pkgs/development/libraries/haskell/cipher-rc4/default.nix
+++ b/pkgs/development/libraries/haskell/cipher-rc4/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "cipher-rc4";
-  version = "0.1.3";
-  sha256 = "1pdkm7m3v8c7wks7asvqixxjk9jixf78n489ckmw10p77wrqby78";
+  version = "0.1.4";
+  sha256 = "0k9qf0cn5yxc4qlqikcm5yyrnkkvr6g3v7306cp8iwz7r4dp6zn6";
   buildDepends = [ byteable cryptoCipherTypes ];
   testDepends = [
     cryptoCipherTests cryptoCipherTypes QuickCheck testFramework
-- 
GitLab


From c628bb466c4f172091fd85308f283f2708138c0d Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 10 Oct 2013 11:50:46 +0200
Subject: [PATCH 5087/5331] haskell-citeproc-hs: update to version 0.3.9

---
 pkgs/development/libraries/haskell/citeproc-hs/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/citeproc-hs/default.nix b/pkgs/development/libraries/haskell/citeproc-hs/default.nix
index 573c5085b10..bdc78984c7b 100644
--- a/pkgs/development/libraries/haskell/citeproc-hs/default.nix
+++ b/pkgs/development/libraries/haskell/citeproc-hs/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "citeproc-hs";
-  version = "0.3.8";
-  sha256 = "0wlfwjxg852qcgx54m99xm7hxsmcw8c8r7fyrsxyxl3054xnfwz8";
+  version = "0.3.9";
+  sha256 = "0f3l33a3rcp8lm8nkbda42lijjpaqa7cxszswhjryy1inywpsssg";
   buildDepends = [
     filepath hexpat hsBibutils HTTP json mtl network pandocTypes parsec
     syb time utf8String
-- 
GitLab


From f9162c54ed18d19baebcc18a0780237e8b8c6cdb Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 10 Oct 2013 11:50:46 +0200
Subject: [PATCH 5088/5331] haskell-crypto-cipher-tests: update to version
 0.0.10

---
 .../libraries/haskell/crypto-cipher-tests/default.nix         | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/crypto-cipher-tests/default.nix b/pkgs/development/libraries/haskell/crypto-cipher-tests/default.nix
index 752ef8fdf9e..ed071bbc92a 100644
--- a/pkgs/development/libraries/haskell/crypto-cipher-tests/default.nix
+++ b/pkgs/development/libraries/haskell/crypto-cipher-tests/default.nix
@@ -5,8 +5,8 @@
 
 cabal.mkDerivation (self: {
   pname = "crypto-cipher-tests";
-  version = "0.0.8";
-  sha256 = "0bprv2pj3acq97482wsz1pp76rrdvvy5scv4na8aqfsdsglbjq47";
+  version = "0.0.10";
+  sha256 = "1gmhpk1pdc9axkmpw9fyr1zgv6pskyzzlsq8icp2w4fc83l61smb";
   buildDepends = [
     byteable cryptoCipherTypes HUnit mtl QuickCheck securemem
     testFramework testFrameworkHunit testFrameworkQuickcheck2
-- 
GitLab


From e1729d6aca918d1bc309464cb3753a51da7600e1 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 10 Oct 2013 11:50:46 +0200
Subject: [PATCH 5089/5331] haskell-crypto-cipher-types: update to version
 0.0.7

---
 .../libraries/haskell/crypto-cipher-types/default.nix         | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/crypto-cipher-types/default.nix b/pkgs/development/libraries/haskell/crypto-cipher-types/default.nix
index 2dc86360241..70e61054137 100644
--- a/pkgs/development/libraries/haskell/crypto-cipher-types/default.nix
+++ b/pkgs/development/libraries/haskell/crypto-cipher-types/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "crypto-cipher-types";
-  version = "0.0.6";
-  sha256 = "1gw3nmf242fbmwhpwk1v1sxhvw1dcy9l06aj6ag0wqb12qn2bqmg";
+  version = "0.0.7";
+  sha256 = "1zvlc88c4w4rhj1imx3w3j3f4b6im9sj78fgwwyzwmn14mn1y6l8";
   buildDepends = [ byteable securemem ];
   meta = {
     homepage = "http://github.com/vincenthz/hs-crypto-cipher";
-- 
GitLab


From a5f8ca839f3c5559406e66c1dfc0513867799b80 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 10 Oct 2013 11:50:47 +0200
Subject: [PATCH 5090/5331] haskell-cryptohash: update to version 0.11.0

---
 pkgs/development/libraries/haskell/cryptohash/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/haskell/cryptohash/default.nix b/pkgs/development/libraries/haskell/cryptohash/default.nix
index d598b363933..5a99fbef80f 100644
--- a/pkgs/development/libraries/haskell/cryptohash/default.nix
+++ b/pkgs/development/libraries/haskell/cryptohash/default.nix
@@ -4,11 +4,11 @@
 
 cabal.mkDerivation (self: {
   pname = "cryptohash";
-  version = "0.10.0";
-  sha256 = "0szvx1dxf16chlksmp08g9qxy7f87w6hspigwbw78aygc3q9mzaq";
+  version = "0.11.0";
+  sha256 = "03v85lb866lbyd0bykjihiqf948asbgxp3c1dzpjc9mvg22pbmlg";
   buildDepends = [ byteable ];
   testDepends = [
-    HUnit QuickCheck testFramework testFrameworkHunit
+    byteable HUnit QuickCheck testFramework testFrameworkHunit
     testFrameworkQuickcheck2
   ];
   meta = {
-- 
GitLab


From eebdbaf3ac5c584fb0ab51cc74fec8b4da19d44d Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 10 Oct 2013 11:50:47 +0200
Subject: [PATCH 5091/5331] haskell-fclabels: update to version 2.0

---
 pkgs/development/libraries/haskell/fclabels/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/haskell/fclabels/default.nix b/pkgs/development/libraries/haskell/fclabels/default.nix
index 71a3fe8d0c2..cea3302cf58 100644
--- a/pkgs/development/libraries/haskell/fclabels/default.nix
+++ b/pkgs/development/libraries/haskell/fclabels/default.nix
@@ -2,12 +2,12 @@
 
 cabal.mkDerivation (self: {
   pname = "fclabels";
-  version = "1.1.7.1";
-  sha256 = "1f34r3bzn1cbba8d5d1j3wxrlrrj5vf09hpgd6ppina91wyj4dyn";
+  version = "2.0";
+  sha256 = "1zh8hr0nq7vnp0q5yf0qd4sbxpaq67l15gs1rvssxfj6n738kngq";
   buildDepends = [ mtl transformers ];
   meta = {
     homepage = "https://github.com/sebastiaanvisser/fclabels";
-    description = "First class accessor labels";
+    description = "First class accessor labels implemented as lenses";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
     maintainers = [ self.stdenv.lib.maintainers.andres ];
-- 
GitLab


From 04440788ad6fb74cd69afd2f32122481d8e94b55 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 10 Oct 2013 11:50:47 +0200
Subject: [PATCH 5092/5331] haskell-ghc-mod: update to version 3.1.3

---
 pkgs/development/libraries/haskell/ghc-mod/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/ghc-mod/default.nix b/pkgs/development/libraries/haskell/ghc-mod/default.nix
index 3504e79d54b..977a15d28e0 100644
--- a/pkgs/development/libraries/haskell/ghc-mod/default.nix
+++ b/pkgs/development/libraries/haskell/ghc-mod/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "ghc-mod";
-  version = "3.1.2";
-  sha256 = "164ldbdvr2qrnb9sq0d9y35la4fzwn6x43xqdsi1s10dppckczlm";
+  version = "3.1.3";
+  sha256 = "0g12cj8yn2znhqi7wiz5jayzh4g5jdcj1qwy5g3pz456hcpb0jig";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [
-- 
GitLab


From 308420d64de7f4fb810eed97f024f6f822f56861 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 10 Oct 2013 11:50:47 +0200
Subject: [PATCH 5093/5331] haskell-hakyll: update to version 4.4.1.0

---
 .../libraries/haskell/hakyll/default.nix      | 34 ++++++++-----------
 1 file changed, 15 insertions(+), 19 deletions(-)

diff --git a/pkgs/development/libraries/haskell/hakyll/default.nix b/pkgs/development/libraries/haskell/hakyll/default.nix
index 0197bc4d142..9ee06ec5326 100644
--- a/pkgs/development/libraries/haskell/hakyll/default.nix
+++ b/pkgs/development/libraries/haskell/hakyll/default.nix
@@ -1,38 +1,34 @@
-{ cabal, binary, blazeHtml, blazeMarkup, pandocCiteproc, cmdargs
-, cryptohash, dataDefault, deepseq, filepath, fsnotify, httpConduit
-, httpTypes, HUnit, lrucache, mtl, network, pandoc, parsec
+{ cabal, binary, blazeHtml, blazeMarkup, cmdargs, cryptohash
+, dataDefault, deepseq, filepath, fsnotify, httpConduit, httpTypes
+, HUnit, lrucache, mtl, network, pandoc, pandocCiteproc, parsec
 , QuickCheck, random, regexBase, regexTdfa, snapCore, snapServer
 , systemFilepath, tagsoup, testFramework, testFrameworkHunit
-, testFrameworkQuickcheck2, text, time, fetchurl
+, testFrameworkQuickcheck2, text, time
 }:
 
 cabal.mkDerivation (self: {
   pname = "hakyll";
-  version = "4.3.3.0";
-  sha256 = "11zfz55a7dr5l7xzknphqninyrb2pw2qmrs7v7ajq2gvbl0lf37n";
+  version = "4.4.1.0";
+  sha256 = "17bns61l5d0h8qyhbz5gnc4j9yjjajk57whp0j4gfshaq0s2aif9";
   isLibrary = true;
   isExecutable = true;
-  patches = [ (fetchurl { url = "https://github.com/jaspervdj/hakyll/pull/183.patch";
-                          sha256 = "0vjrxvgyc05nnshapjhk65pcamj9rigqff5q6wjbssx3ggqggrz9";
-                          name = "hakyll-pandoc-fix.patch";
-                        }) ];
   buildDepends = [
-    binary blazeHtml blazeMarkup pandocCiteproc cmdargs cryptohash
-    dataDefault deepseq filepath fsnotify httpConduit httpTypes
-    lrucache mtl network pandoc parsec random regexBase regexTdfa
-    snapCore snapServer systemFilepath tagsoup text time
+    binary blazeHtml blazeMarkup cmdargs cryptohash dataDefault deepseq
+    filepath fsnotify httpConduit httpTypes lrucache mtl network pandoc
+    pandocCiteproc parsec random regexBase regexTdfa snapCore
+    snapServer systemFilepath tagsoup text time
   ];
   testDepends = [
-    binary blazeHtml blazeMarkup pandocCiteproc cmdargs cryptohash
-    dataDefault deepseq filepath fsnotify httpConduit httpTypes HUnit
-    lrucache mtl network pandoc parsec QuickCheck random regexBase
-    regexTdfa snapCore snapServer systemFilepath tagsoup testFramework
+    binary blazeHtml blazeMarkup cmdargs cryptohash dataDefault deepseq
+    filepath fsnotify httpConduit httpTypes HUnit lrucache mtl network
+    pandoc pandocCiteproc parsec QuickCheck random regexBase regexTdfa
+    snapCore snapServer systemFilepath tagsoup testFramework
     testFrameworkHunit testFrameworkQuickcheck2 text time
   ];
-  doCheck = false;
   postPatch = ''
     sed -i -e 's|cryptohash.*,|cryptohash,|' -e 's|tagsoup.*,|tagsoup,|' hakyll.cabal
   '';
+  doCheck = false;
   meta = {
     homepage = "http://jaspervdj.be/hakyll";
     description = "A static website compiler library";
-- 
GitLab


From 2a5f6a57390c9e0dedebeeb4e7ff258908032b45 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 10 Oct 2013 11:50:47 +0200
Subject: [PATCH 5094/5331] haskell-happstack-server: update to version 7.3.1

---
 .../libraries/haskell/happstack/happstack-server.nix          | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/happstack/happstack-server.nix b/pkgs/development/libraries/haskell/happstack/happstack-server.nix
index f58e4ba2d3d..e12d848f00f 100644
--- a/pkgs/development/libraries/haskell/happstack/happstack-server.nix
+++ b/pkgs/development/libraries/haskell/happstack/happstack-server.nix
@@ -7,8 +7,8 @@
 
 cabal.mkDerivation (self: {
   pname = "happstack-server";
-  version = "7.3.0";
-  sha256 = "094q6m6a4cxwmmw9hin2pphiq8gi0y4ma4vkvqv7rwqnn3mf9n0q";
+  version = "7.3.1";
+  sha256 = "0yk4ylyyc8pz7j5lxibah356f986w932ncxp4y612rqcd0abzrq4";
   buildDepends = [
     base64Bytestring blazeHtml extensibleExceptions filepath hslogger
     html monadControl mtl network parsec sendfile syb systemFilepath
-- 
GitLab


From 37d97d04e032afeac4f69dbd9c076388d784b384 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 10 Oct 2013 11:50:47 +0200
Subject: [PATCH 5095/5331] haskell-hashtables: update to version 1.1.2.0

---
 pkgs/development/libraries/haskell/hashtables/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/hashtables/default.nix b/pkgs/development/libraries/haskell/hashtables/default.nix
index ae62c051ec5..4fdff950809 100644
--- a/pkgs/development/libraries/haskell/hashtables/default.nix
+++ b/pkgs/development/libraries/haskell/hashtables/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "hashtables";
-  version = "1.1.0.2";
-  sha256 = "0d103cvr168hgyghm6fp67r4lz1p592x45igwld6xq3nyxjxnbp9";
+  version = "1.1.2.0";
+  sha256 = "1q0nzsc4x317r7b93b4sj4yfpsdjmqkvc54q62n56kgq9cy4y7qh";
   buildDepends = [ hashable primitive vector ];
   meta = {
     homepage = "http://github.com/gregorycollins/hashtables";
-- 
GitLab


From 8bb21217b1c03b9f34f939a5367966546b694113 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 10 Oct 2013 11:50:47 +0200
Subject: [PATCH 5096/5331] haskell-hflags: update to version 0.4

---
 pkgs/development/libraries/haskell/hflags/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/hflags/default.nix b/pkgs/development/libraries/haskell/hflags/default.nix
index f65520da532..04e70183781 100644
--- a/pkgs/development/libraries/haskell/hflags/default.nix
+++ b/pkgs/development/libraries/haskell/hflags/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "hflags";
-  version = "0.3";
-  sha256 = "113pqdjnxfhkk95969ia393n1jvbbnfljsz42vfapgzvd8f1fci2";
+  version = "0.4";
+  sha256 = "17zzx273kmnwwazmmns78cllz3l7wad1gi7hizgcxi68j04blhd4";
   buildDepends = [ text ];
   meta = {
     homepage = "http://github.com/errge/hflags";
-- 
GitLab


From 91397f66867aaa797127fe6861417c32c0605e2d Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 10 Oct 2013 11:50:47 +0200
Subject: [PATCH 5097/5331] haskell-hjsmin: update to version 0.1.4.3

---
 pkgs/development/libraries/haskell/hjsmin/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/hjsmin/default.nix b/pkgs/development/libraries/haskell/hjsmin/default.nix
index 9551581dadf..5980141526b 100644
--- a/pkgs/development/libraries/haskell/hjsmin/default.nix
+++ b/pkgs/development/libraries/haskell/hjsmin/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "hjsmin";
-  version = "0.1.4.1";
-  sha256 = "0r73hd6kn37mdbm2i3g6v3qqm696kyflqs6ajq68qr5sr62sjb1a";
+  version = "0.1.4.3";
+  sha256 = "1jhpqfvwvzik41i4mi9fr9w1jlrlc1lj2illlbbwg7r3fwr5hnnl";
   buildDepends = [ blazeBuilder languageJavascript text ];
   testDepends = [
     blazeBuilder Cabal HUnit languageJavascript QuickCheck
-- 
GitLab


From d8993dd96c184833c91e96f617881837054ab191 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 10 Oct 2013 11:50:47 +0200
Subject: [PATCH 5098/5331] haskell-hslua: update to version 0.3.7

---
 pkgs/development/libraries/haskell/hslua/default.nix | 8 +++++---
 pkgs/top-level/haskell-packages.nix                  | 4 +++-
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/libraries/haskell/hslua/default.nix b/pkgs/development/libraries/haskell/hslua/default.nix
index e953eb74711..ebccbf963fe 100644
--- a/pkgs/development/libraries/haskell/hslua/default.nix
+++ b/pkgs/development/libraries/haskell/hslua/default.nix
@@ -1,10 +1,12 @@
-{ cabal, mtl }:
+{ cabal, lua, mtl }:
 
 cabal.mkDerivation (self: {
   pname = "hslua";
-  version = "0.3.6.1";
-  sha256 = "0c60gnf0mp6kx2z2149icl7hdwvigibvxd091a3vc6zkl5c5r41p";
+  version = "0.3.7";
+  sha256 = "1q5s2b7x9idvdvp31yl86mmy476gfq6rg8f0r8faqxrm45jwgv2q";
   buildDepends = [ mtl ];
+  pkgconfigDepends = [ lua ];
+  configureFlags = "-fsystem-lua";
   meta = {
     description = "A Lua language interpreter embedding in Haskell";
     license = self.stdenv.lib.licenses.bsd3;
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 2439c427741..8af2c0818f2 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -1251,7 +1251,9 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
 
   hsemail = callPackage ../development/libraries/haskell/hsemail {};
 
-  hslua = callPackage ../development/libraries/haskell/hslua {};
+  hslua = callPackage ../development/libraries/haskell/hslua {
+    lua = pkgs.lua5_1;
+  };
 
   HSH = callPackage ../development/libraries/haskell/HSH {};
 
-- 
GitLab


From e68e87ac4a995b0931b7c8c810fca347b0db35c2 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 10 Oct 2013 11:50:47 +0200
Subject: [PATCH 5099/5331] haskell-math-functions: update to version 0.1.4.0

---
 pkgs/development/libraries/haskell/math-functions/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/math-functions/default.nix b/pkgs/development/libraries/haskell/math-functions/default.nix
index 2e29269a9fd..8180c8bce75 100644
--- a/pkgs/development/libraries/haskell/math-functions/default.nix
+++ b/pkgs/development/libraries/haskell/math-functions/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "math-functions";
-  version = "0.1.3.0";
-  sha256 = "06wxr8fbhmsgkpyx2vimx9l6apk0p27mwrxrvbjk0b7m9vsg3ay5";
+  version = "0.1.4.0";
+  sha256 = "1cijm224gfvd7rvrrndcks8d7aj89c9qv0m4wx2qqngr7rk78kav";
   buildDepends = [ erf vector ];
   testDepends = [
     HUnit ieee754 QuickCheck testFramework testFrameworkHunit
-- 
GitLab


From d7831932ce06ccb2a2906c7473e1d7d7cddc2af6 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 10 Oct 2013 11:50:47 +0200
Subject: [PATCH 5100/5331] haskell-pandoc-citeproc: update to version 0.1.1.2

---
 .../libraries/haskell/pandoc-citeproc/default.nix         | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/libraries/haskell/pandoc-citeproc/default.nix b/pkgs/development/libraries/haskell/pandoc-citeproc/default.nix
index 2c477687096..4ae06d59724 100644
--- a/pkgs/development/libraries/haskell/pandoc-citeproc/default.nix
+++ b/pkgs/development/libraries/haskell/pandoc-citeproc/default.nix
@@ -1,13 +1,13 @@
 { cabal, aeson, aesonPretty, attoparsec, Diff, filepath, hexpat
-, hsBibutils, HTTP, json, mtl, network, pandocTypes, parsec
+, hsBibutils, HTTP, json, mtl, network, pandoc, pandocTypes, parsec
 , rfc5051, syb, tagsoup, texmath, text, time, utf8String, vector
 , yaml
 }:
 
 cabal.mkDerivation (self: {
   pname = "pandoc-citeproc";
-  version = "0.1.1.1";
-  sha256 = "07h277cz5wzc2dsfqfh9lasz7ypb4pspvqljs9maj6lx5rkk5fq1";
+  version = "0.1.1.2";
+  sha256 = "02bs9wb3x1p9fs4kixchmvyyrhrkmx0qkwv22qmy4gsp90sc8q8i";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [
@@ -15,7 +15,7 @@ cabal.mkDerivation (self: {
     pandocTypes parsec rfc5051 syb tagsoup texmath text time utf8String
     vector yaml
   ];
-  testDepends = [ aeson aesonPretty Diff pandocTypes utf8String ];
+  testDepends = [ aeson aesonPretty Diff pandoc pandocTypes ];
   doCheck = false;
   meta = {
     description = "Supports using pandoc with citeproc";
-- 
GitLab


From c147c72a1fa6a81cabc05dcdac9971aae641519f Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 10 Oct 2013 11:50:47 +0200
Subject: [PATCH 5101/5331] haskell-pandoc-types: update to version 1.12.2.3

---
 pkgs/development/libraries/haskell/pandoc-types/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/pandoc-types/default.nix b/pkgs/development/libraries/haskell/pandoc-types/default.nix
index 686c07949be..e1e7ac54d4c 100644
--- a/pkgs/development/libraries/haskell/pandoc-types/default.nix
+++ b/pkgs/development/libraries/haskell/pandoc-types/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "pandoc-types";
-  version = "1.12.2.2";
-  sha256 = "1ax92rxynrp42032d0i4wnv700cszm6qsvna8f9hqcfxvc2cbp36";
+  version = "1.12.2.3";
+  sha256 = "05xbpsx44sys0rkf2aqs4fcv4bg02ffhicp49jgnjyw9jiynhzzj";
   buildDepends = [ aeson syb ];
   meta = {
     homepage = "http://johnmacfarlane.net/pandoc";
-- 
GitLab


From 304b837c4156fa78e9af4e45f36c12b4160ec14c Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 10 Oct 2013 11:50:47 +0200
Subject: [PATCH 5102/5331] haskell-persistent-template: update to version
 1.2.0.3

---
 .../libraries/haskell/persistent-template/default.nix    | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/libraries/haskell/persistent-template/default.nix b/pkgs/development/libraries/haskell/persistent-template/default.nix
index 2afc416cb52..b9e0e72928f 100644
--- a/pkgs/development/libraries/haskell/persistent-template/default.nix
+++ b/pkgs/development/libraries/haskell/persistent-template/default.nix
@@ -1,13 +1,14 @@
 { cabal, aeson, hspec, monadControl, monadLogger, persistent
-, QuickCheck, text, transformers
+, QuickCheck, text, thOrphans, transformers
 }:
 
 cabal.mkDerivation (self: {
   pname = "persistent-template";
-  version = "1.2.0.2";
-  sha256 = "0zj35mg7fzyk4b98s3s8m5i064s0wznz9aixgxa4kzm4xps7hj4z";
+  version = "1.2.0.3";
+  sha256 = "10scyrfa8g79v8ra79bp0bg7q6iwqjw6jpm06g11pngv4x9zx880";
   buildDepends = [
-    aeson monadControl monadLogger persistent text transformers
+    aeson monadControl monadLogger persistent text thOrphans
+    transformers
   ];
   testDepends = [ aeson hspec persistent QuickCheck text ];
   meta = {
-- 
GitLab


From d2f719644baaa37605550c546efa03d5f58720ef Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 10 Oct 2013 11:50:47 +0200
Subject: [PATCH 5103/5331] haskell-regex-compat-tdfa: update to version
 0.95.1.4

---
 .../libraries/haskell/regex-compat-tdfa/default.nix          | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/haskell/regex-compat-tdfa/default.nix b/pkgs/development/libraries/haskell/regex-compat-tdfa/default.nix
index df62233b7bf..6a45c87d9a6 100644
--- a/pkgs/development/libraries/haskell/regex-compat-tdfa/default.nix
+++ b/pkgs/development/libraries/haskell/regex-compat-tdfa/default.nix
@@ -2,10 +2,9 @@
 
 cabal.mkDerivation (self: {
   pname = "regex-compat-tdfa";
-  version = "0.95.1.3";
-  sha256 = "0wl5sqbb3rl5dai3qni8w09wlipc4n1mn9kh5zgb9xl0lcd59pjx";
+  version = "0.95.1.4";
+  sha256 = "1p90fn90yhp7fvljjdqjp41cszidcfz4pw7fwvzyx4739b98x8sg";
   buildDepends = [ regexBase regexTdfa ];
-  patchPhase = "find . -type f -exec touch {} ';'";
   meta = {
     homepage = "http://hub.darcs.net/shelarcy/regex-compat-tdfa";
     description = "Unicode Support version of Text.Regex, using regex-tdfa";
-- 
GitLab


From bc86211c2d8152bf19b6735431c6acf5be342e87 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 10 Oct 2013 11:50:47 +0200
Subject: [PATCH 5104/5331] haskell-setenv: update to version 0.1.1

---
 pkgs/development/libraries/haskell/setenv/default.nix | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/libraries/haskell/setenv/default.nix b/pkgs/development/libraries/haskell/setenv/default.nix
index b19728820aa..b00480279e1 100644
--- a/pkgs/development/libraries/haskell/setenv/default.nix
+++ b/pkgs/development/libraries/haskell/setenv/default.nix
@@ -1,10 +1,9 @@
-{ cabal, hspec, QuickCheck }:
+{ cabal }:
 
 cabal.mkDerivation (self: {
   pname = "setenv";
-  version = "0.1.0";
-  sha256 = "04w42bpfbrs5crjp19zzi9dg61xpz4wvmjs2vc7q7qxblyhdfdsy";
-  testDepends = [ hspec QuickCheck ];
+  version = "0.1.1";
+  sha256 = "1j0fj8nrx9z90kghasxjx5jycz9y9xdi7mrxmgnsc14csa65rhb8";
   doCheck = false;
   meta = {
     description = "A cross-platform library for setting environment variables";
-- 
GitLab


From 05c56d583d9897e7e5073799362577b8782b796b Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 10 Oct 2013 11:50:47 +0200
Subject: [PATCH 5105/5331] haskell-socks: update to version 0.5.3

---
 pkgs/development/libraries/haskell/socks/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/socks/default.nix b/pkgs/development/libraries/haskell/socks/default.nix
index 22b9a415123..f939708c16a 100644
--- a/pkgs/development/libraries/haskell/socks/default.nix
+++ b/pkgs/development/libraries/haskell/socks/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "socks";
-  version = "0.5.2";
-  sha256 = "1bvvrc0lzjspab7jn31d45za8g6n9jr52mcf7rs5zci99f5jgpsv";
+  version = "0.5.3";
+  sha256 = "0cajbl7vrljawaxl3vbbf0sq92ry3cj925sww4nw70lhpz96ay4x";
   buildDepends = [ cereal network ];
   meta = {
     homepage = "http://github.com/vincenthz/hs-socks";
-- 
GitLab


From 9a7fc0ea6477adabdeafae26faea89ff16c76596 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 10 Oct 2013 11:50:48 +0200
Subject: [PATCH 5106/5331] haskell-statistics: update to version 0.10.5.0

---
 pkgs/development/libraries/haskell/statistics/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/statistics/default.nix b/pkgs/development/libraries/haskell/statistics/default.nix
index 54876a879fc..5db264d3c7b 100644
--- a/pkgs/development/libraries/haskell/statistics/default.nix
+++ b/pkgs/development/libraries/haskell/statistics/default.nix
@@ -6,8 +6,8 @@
 
 cabal.mkDerivation (self: {
   pname = "statistics";
-  version = "0.10.4.1";
-  sha256 = "0kd3zn8ckz3h9dnighmfviacw5cy6czsj90ryn8c0h6yb2s3gqi1";
+  version = "0.10.5.0";
+  sha256 = "0yn0bqvh922zi0cg2nyb9vn5jk9k4j4vz96fl0h3ayxhfds08m6v";
   buildDepends = [
     binary deepseq erf mathFunctions monadPar mwcRandom primitive
     vector vectorAlgorithms vectorBinaryInstances
-- 
GitLab


From 445f80e6e46ba2ffca11230cdc58dcdd2bf708a1 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 10 Oct 2013 11:50:48 +0200
Subject: [PATCH 5107/5331] haskell-test-framework-hunit: update to version
 0.3.0.1

---
 .../libraries/haskell/test-framework-hunit/default.nix      | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/haskell/test-framework-hunit/default.nix b/pkgs/development/libraries/haskell/test-framework-hunit/default.nix
index 011d791643c..9efcff9a6d1 100644
--- a/pkgs/development/libraries/haskell/test-framework-hunit/default.nix
+++ b/pkgs/development/libraries/haskell/test-framework-hunit/default.nix
@@ -2,11 +2,11 @@
 
 cabal.mkDerivation (self: {
   pname = "test-framework-hunit";
-  version = "0.3.0";
-  sha256 = "1jwbpbf9q3g936gk71632h830l2wsiic8h6ms1jlmw209mpm7c84";
+  version = "0.3.0.1";
+  sha256 = "1h0h55kf6ff25nbfx1mhliwyknc0glwv3zi78wpzllbjbs7gvyfk";
   buildDepends = [ extensibleExceptions HUnit testFramework ];
   meta = {
-    homepage = "http://batterseapower.github.com/test-framework/";
+    homepage = "https://batterseapower.github.io/test-framework/";
     description = "HUnit support for the test-framework package";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-- 
GitLab


From fae99f8e7860b779af6ca7bf50145f1bc0c0e079 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 10 Oct 2013 11:50:48 +0200
Subject: [PATCH 5108/5331] haskell-test-framework-quickcheck2: update to
 version 0.3.0.2

---
 .../haskell/test-framework-quickcheck2/default.nix          | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/haskell/test-framework-quickcheck2/default.nix b/pkgs/development/libraries/haskell/test-framework-quickcheck2/default.nix
index b944c1e104c..627c9f6347a 100644
--- a/pkgs/development/libraries/haskell/test-framework-quickcheck2/default.nix
+++ b/pkgs/development/libraries/haskell/test-framework-quickcheck2/default.nix
@@ -2,14 +2,14 @@
 
 cabal.mkDerivation (self: {
   pname = "test-framework-quickcheck2";
-  version = "0.3.0.1";
-  sha256 = "1177cvlb4qsa5x2k12dd60y7b14dyd3jr1ygb49aackhjx52c41s";
+  version = "0.3.0.2";
+  sha256 = "0zgsbmxidyv735jbgajczn25pnhwq66haaadhh6lxj2jsq5fnqpy";
   buildDepends = [
     extensibleExceptions QuickCheck random testFramework
   ];
   jailbreak = true;
   meta = {
-    homepage = "http://batterseapower.github.com/test-framework/";
+    homepage = "https://batterseapower.github.io/test-framework/";
     description = "QuickCheck2 support for the test-framework package";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-- 
GitLab


From 30d9b33460408870e6e45698313a78b8537cfd59 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 10 Oct 2013 11:50:48 +0200
Subject: [PATCH 5109/5331] haskell-test-framework: update to version 0.8.0.3

---
 .../libraries/haskell/test-framework/default.nix    | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/libraries/haskell/test-framework/default.nix b/pkgs/development/libraries/haskell/test-framework/default.nix
index b9f335e1a5a..735666734e3 100644
--- a/pkgs/development/libraries/haskell/test-framework/default.nix
+++ b/pkgs/development/libraries/haskell/test-framework/default.nix
@@ -1,19 +1,18 @@
-{ cabal, ansiTerminal, ansiWlPprint, extensibleExceptions, hostname
-, random, regexPosix, time, xml
+{ cabal, ansiTerminal, ansiWlPprint, hostname, random, regexPosix
+, time, xml
 }:
 
 cabal.mkDerivation (self: {
   pname = "test-framework";
-  version = "0.8";
-  sha256 = "1w895nq357zpc4v6vr5nbszyrw7cpsjq5bj38vdd10bfpjjmijcl";
+  version = "0.8.0.3";
+  sha256 = "136nw5dapsz3jrnw1pdfkjgplxigpr2mrf6i85154vx342zvw5ar";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [
-    ansiTerminal ansiWlPprint extensibleExceptions hostname random
-    regexPosix time xml
+    ansiTerminal ansiWlPprint hostname random regexPosix time xml
   ];
   meta = {
-    homepage = "http://batterseapower.github.com/test-framework/";
+    homepage = "https://batterseapower.github.io/test-framework/";
     description = "Framework for running and organising tests, with HUnit and QuickCheck support";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-- 
GitLab


From 01ba6468b76d020b06b72a476770d885f99f30d3 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 10 Oct 2013 11:50:48 +0200
Subject: [PATCH 5110/5331] haskell-tls-extra: update to version 0.6.6

---
 pkgs/development/libraries/haskell/tls-extra/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/tls-extra/default.nix b/pkgs/development/libraries/haskell/tls-extra/default.nix
index 8c2a50255b1..6d63c267c61 100644
--- a/pkgs/development/libraries/haskell/tls-extra/default.nix
+++ b/pkgs/development/libraries/haskell/tls-extra/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "tls-extra";
-  version = "0.6.5";
-  sha256 = "09b8wxg4k88gdzpbxhd2apf0x5y51zh2zbw2cvraffjnnfkgvzqc";
+  version = "0.6.6";
+  sha256 = "0k0sj3nq1lrvbmd582mjj8cxbxigivz1hm8hhij1ncl2pgnq5xyv";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [
-- 
GitLab


From 1f7957329cfac6ef5bd1a4843f6dfa1f09321007 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 10 Oct 2013 11:50:48 +0200
Subject: [PATCH 5111/5331] haskell-trifecta: update to version 1.2.1

---
 pkgs/development/libraries/haskell/trifecta/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/trifecta/default.nix b/pkgs/development/libraries/haskell/trifecta/default.nix
index bf5f2f0d0a7..2ce40a0672e 100644
--- a/pkgs/development/libraries/haskell/trifecta/default.nix
+++ b/pkgs/development/libraries/haskell/trifecta/default.nix
@@ -6,8 +6,8 @@
 
 cabal.mkDerivation (self: {
   pname = "trifecta";
-  version = "1.1";
-  sha256 = "19wnblpn31hvdi5dc8ir24s0hfjj4vvzr43gg9ydl2qdjq6s166w";
+  version = "1.2.1";
+  sha256 = "0l7q6id3l9km7vrqald87d6l03k5w5zxfh44w425kxmm8fwj2j0j";
   buildDepends = [
     ansiTerminal ansiWlPprint blazeBuilder blazeHtml blazeMarkup
     charset comonad deepseq fingertree hashable lens mtl parsers
-- 
GitLab


From f3e8d77ebfe202d74465b6cd347a1d64029b5c8c Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 10 Oct 2013 14:26:14 +0200
Subject: [PATCH 5112/5331] haskell-cryptohash: disable test suite to avoid
 build errors

https://github.com/vincenthz/hs-cryptohash/issues/17
---
 pkgs/development/libraries/haskell/cryptohash/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/libraries/haskell/cryptohash/default.nix b/pkgs/development/libraries/haskell/cryptohash/default.nix
index 5a99fbef80f..5ad655eb613 100644
--- a/pkgs/development/libraries/haskell/cryptohash/default.nix
+++ b/pkgs/development/libraries/haskell/cryptohash/default.nix
@@ -11,6 +11,7 @@ cabal.mkDerivation (self: {
     byteable HUnit QuickCheck testFramework testFrameworkHunit
     testFrameworkQuickcheck2
   ];
+  doCheck = false;
   meta = {
     homepage = "http://github.com/vincenthz/hs-cryptohash";
     description = "collection of crypto hashes, fast, pure and practical";
-- 
GitLab


From 4cd27713452fa90cdc5f58917b580d823d771898 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 10 Oct 2013 19:51:02 +0200
Subject: [PATCH 5113/5331] haskell-uuid: jailbreak to fix build with recent
 cryptohash

---
 pkgs/development/libraries/haskell/uuid/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/libraries/haskell/uuid/default.nix b/pkgs/development/libraries/haskell/uuid/default.nix
index 65115ef9a98..0e90ce3ace6 100644
--- a/pkgs/development/libraries/haskell/uuid/default.nix
+++ b/pkgs/development/libraries/haskell/uuid/default.nix
@@ -13,6 +13,7 @@ cabal.mkDerivation (self: {
     testFramework testFrameworkHunit testFrameworkQuickcheck2
   ];
   doCheck = false;
+  jailbreak = true;
   meta = {
     homepage = "http://projects.haskell.org/uuid/";
     description = "For creating, comparing, parsing and printing Universally Unique Identifiers";
-- 
GitLab


From 5b0af38347179b1a264816879a444886a3d9eb00 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 10 Oct 2013 20:55:55 +0200
Subject: [PATCH 5114/5331] haskell-shakespeare-css: update to version 1.0.6.4

---
 .../development/libraries/haskell/shakespeare-css/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/shakespeare-css/default.nix b/pkgs/development/libraries/haskell/shakespeare-css/default.nix
index f24d60612d6..03b6b057cd1 100644
--- a/pkgs/development/libraries/haskell/shakespeare-css/default.nix
+++ b/pkgs/development/libraries/haskell/shakespeare-css/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "shakespeare-css";
-  version = "1.0.6.3";
-  sha256 = "1zwvrdb8kgknp2ri3ws6m0jg41d8kdprvjdimwxh98san7vmk744";
+  version = "1.0.6.4";
+  sha256 = "12f2b69grxpwk56b2d7idlg8axqfgzn0rn3m56r1hcpvkjbynlc4";
   buildDepends = [ parsec shakespeare text transformers ];
   testDepends = [ hspec HUnit shakespeare text ];
   meta = {
-- 
GitLab


From 79b7f8dc4516ae0167f9d0c2fd644c7013cba18d Mon Sep 17 00:00:00 2001
From: Mathijs Kwik <mathijs@bluescreen303.nl>
Date: Wed, 9 Oct 2013 09:02:13 +0200
Subject: [PATCH 5115/5331] rxvt-unicode: use multiple outputs for terminfo

this is useful for installing the terminfo files to headless/Xless
machines, which currently produce warnings when ssh'ing to them with
urxvt.
---
 pkgs/applications/misc/rxvt_unicode/default.nix | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/rxvt_unicode/default.nix b/pkgs/applications/misc/rxvt_unicode/default.nix
index 8c16d290f86..c05dd028eb3 100644
--- a/pkgs/applications/misc/rxvt_unicode/default.nix
+++ b/pkgs/applications/misc/rxvt_unicode/default.nix
@@ -22,10 +22,13 @@ stdenv.mkDerivation (rec {
     ++ stdenv.lib.optional perlSupport perl
     ++ stdenv.lib.optional gdkPixbufSupport gdk_pixbuf;
 
+  outputs = [ "out" "terminfo" ];
+
   preConfigure =
     ''
-      configureFlags="--with-terminfo=$out/share/terminfo --enable-256-color ${if perlSupport then "--enable-perl" else "--disable-perl"}";
-      export TERMINFO=$out/share/terminfo # without this the terminfo won't be compiled by tic, see man tic
+      mkdir -p $terminfo/share/terminfo
+      configureFlags="--with-terminfo=$terminfo/share/terminfo --enable-256-color ${if perlSupport then "--enable-perl" else "--disable-perl"}";
+      export TERMINFO=$terminfo/share/terminfo # without this the terminfo won't be compiled by tic, see man tic
       NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${freetype}/include/freetype2"
       NIX_LDFLAGS="$NIX_LDFLAGS -lfontconfig -lXrender "
     ''
@@ -35,6 +38,13 @@ stdenv.mkDerivation (rec {
       ln -s $out/{lib/urxvt,lib/perl5/site_perl}
     '';
 
+  # we link the separate terminfo output to the main output
+  # as I don't think there's a usecase for wanting urxvt without its terminfo files
+  # and we don't want users to install them separately
+  postInstall = ''
+    ln -s $terminfo/share/terminfo $out/share
+  '';
+
   meta = {
     description = "A clone of the well-known terminal emulator rxvt";
     homepage = "http://software.schmorp.de/pkg/rxvt-unicode.html";
-- 
GitLab


From 254c153b625c1faf1e260801dea453d26671306b Mon Sep 17 00:00:00 2001
From: danbst <abcz2.uprola@gmail.com>
Date: Tue, 8 Oct 2013 09:35:05 +0200
Subject: [PATCH 5116/5331] Add `usb` haskell package

---
 .../libraries/haskell/bindings-libusb/default.nix | 15 +++++++++++++++
 .../development/libraries/haskell/usb/default.nix | 14 ++++++++++++++
 pkgs/top-level/haskell-packages.nix               |  6 ++++++
 3 files changed, 35 insertions(+)
 create mode 100644 pkgs/development/libraries/haskell/bindings-libusb/default.nix
 create mode 100644 pkgs/development/libraries/haskell/usb/default.nix

diff --git a/pkgs/development/libraries/haskell/bindings-libusb/default.nix b/pkgs/development/libraries/haskell/bindings-libusb/default.nix
new file mode 100644
index 00000000000..aeea654577a
--- /dev/null
+++ b/pkgs/development/libraries/haskell/bindings-libusb/default.nix
@@ -0,0 +1,15 @@
+{ cabal, bindingsDSL, libusb }:
+
+cabal.mkDerivation (self: {
+  pname = "bindings-libusb";
+  version = "1.4.4.1";
+  sha256 = "1cip5a0n8svjkzawpx3wi9z7nywmn9bl3k2w559b3awy0wixybrx";
+  buildDepends = [ bindingsDSL ];
+  pkgconfigDepends = [ libusb ];
+  meta = {
+    homepage = "https://github.com/basvandijk/bindings-libusb";
+    description = "Low level bindings to libusb";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/development/libraries/haskell/usb/default.nix b/pkgs/development/libraries/haskell/usb/default.nix
new file mode 100644
index 00000000000..41a71618546
--- /dev/null
+++ b/pkgs/development/libraries/haskell/usb/default.nix
@@ -0,0 +1,14 @@
+{ cabal, baseUnicodeSymbols, bindingsLibusb, text, vector }:
+
+cabal.mkDerivation (self: {
+  pname = "usb";
+  version = "1.2";
+  sha256 = "1k73avkmpbmg6iq2kmwhg2ifibni5c1yp202afdb6v7w5akvmc0b";
+  buildDepends = [ baseUnicodeSymbols bindingsLibusb text vector ];
+  meta = {
+    homepage = "http://basvandijk.github.com/usb";
+    description = "Communicate with USB devices";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 8af2c0818f2..334c52109cd 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -599,6 +599,10 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
 
   bindingsDSL = callPackage ../development/libraries/haskell/bindings-DSL {};
 
+  bindingsLibusb = callPackage ../development/libraries/haskell/bindings-libusb {
+    libusb = pkgs.libusb1;
+  };
+
   bindingsPosix = callPackage ../development/libraries/haskell/bindings-posix {};
 
   bitarray = callPackage ../development/libraries/haskell/bitarray {};
@@ -2143,6 +2147,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
 
   urlencoded = callPackage ../development/libraries/haskell/urlencoded {};
 
+  usb = callPackage ../development/libraries/haskell/usb {};
+
   utf8Light = callPackage ../development/libraries/haskell/utf8-light {};
 
   utf8String = callPackage ../development/libraries/haskell/utf8-string {};
-- 
GitLab


From 7e065226451a06bedd6398b9f3f17f384659eae2 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 11 Oct 2013 10:20:37 +0200
Subject: [PATCH 5117/5331] hol: fix access to dot

Committing on behalf of Karn Kallio <tierpluspluslists@skami.org>.
---
 .../science/logic/hol/default.nix             | 19 ++++++++++++++++---
 1 file changed, 16 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/science/logic/hol/default.nix b/pkgs/applications/science/logic/hol/default.nix
index 5abee674c47..2e1647b6c71 100644
--- a/pkgs/applications/science/logic/hol/default.nix
+++ b/pkgs/applications/science/logic/hol/default.nix
@@ -1,4 +1,5 @@
-{stdenv, fetchurl, polyml, graphviz, experimentalKernel ? true}:
+{stdenv, fetchurl, polyml, graphviz, fontconfig, liberation_ttf,
+ experimentalKernel ? true}:
 
 let
   pname = "hol4";
@@ -15,9 +16,18 @@ stdenv.mkDerivation {
     sha256 = "5ce4c1e37301dbc38772694e98f1c7eabf69255908de204b280d8b2b1709e9d0";
   };
 
-  buildInputs = [polyml graphviz];
+  buildInputs = [polyml graphviz fontconfig liberation_ttf];
 
   buildCommand = ''
+
+    mkdir chroot-fontconfig
+    cat ${fontconfig}/etc/fonts/fonts.conf > chroot-fontconfig/fonts.conf
+    sed -e 's@</fontconfig>@@' -i chroot-fontconfig/fonts.conf
+    echo "<dir>${liberation_ttf}</dir>" >> chroot-fontconfig/fonts.conf
+    echo "</fontconfig>" >> chroot-fontconfig/fonts.conf
+
+    export FONTCONFIG_FILE=$(pwd)/chroot-fontconfig/fonts.conf
+
     mkdir -p "$out/src"
     cd  "$out/src"
 
@@ -28,7 +38,10 @@ stdenv.mkDerivation {
       --replace "\"/bin/mv\"" "\"mv\"" \
       --replace "\"/bin/cp\"" "\"cp\""
 
-    substituteInPlace tools/buildutils.sml --replace "\"/usr/bin/dot\"" "\"dot\""
+    for f in tools/buildutils.sml help/src-sml/DOT;
+    do
+      substituteInPlace $f --replace "\"/usr/bin/dot\"" "\"${graphviz}/bin/dot\""
+    done
 
     #sed -ie "/compute/,999 d" tools/build-sequence # for testing
 
-- 
GitLab


From 29b99ed9fa6c50ac7bef28ac41f8c82a1762ee8b Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 11 Oct 2013 10:44:18 +0200
Subject: [PATCH 5118/5331] Revert "pythonPackage.psycopg2: fix"

This reverts commit 762164c8a73864d6989f50fd87fb24aec9f9ff90 since it
breaks Nixpkgs evaluation: http://hydra.nixos.org/build/6471883
---
 pkgs/top-level/python-packages-generated.nix |  2 +-
 pkgs/top-level/python-packages.json          |  7 +------
 pkgs/top-level/python-packages.nix           | 22 +++++++++++++++++++-
 3 files changed, 23 insertions(+), 8 deletions(-)

diff --git a/pkgs/top-level/python-packages-generated.nix b/pkgs/top-level/python-packages-generated.nix
index 4e72b12ffcc..5ed553224d2 100644
--- a/pkgs/top-level/python-packages-generated.nix
+++ b/pkgs/top-level/python-packages-generated.nix
@@ -2552,7 +2552,7 @@ in
         md5 = "1b433f83d50d1bc61e09026e906d84c7";
     };
     doCheck = false;
-    buildInputs = [ pkgs.postgresql ];
+    buildInputs = [  ];
     propagatedBuildInputs = [  ];
     installCommand = ''easy_install --always-unzip --prefix="$out" .'';
     meta = {
diff --git a/pkgs/top-level/python-packages.json b/pkgs/top-level/python-packages.json
index 065e9340e7d..aefd911a558 100644
--- a/pkgs/top-level/python-packages.json
+++ b/pkgs/top-level/python-packages.json
@@ -133,12 +133,7 @@
   },
   { "name": "psycopg2",
     "buildInputs": [ "pkgs.postgresql" ],
-    "doCheck": false,
-    "override": {
-      "psycopg2": {
-        "buildInputs": [ "pkgs.postgresql" ]
-      }
-    }
+    "doCheck": false
   }
 
 ]
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 94c8c1ba66e..a33103cccb8 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -4320,6 +4320,26 @@ pythonPackages = modules // import ./python-packages-generated.nix {
   };
 
 
+  psycopg2 = buildPythonPackage rec {
+    name = "psycopg2-2.5.1";
+
+    # error: invalid command 'test'
+    doCheck = false;
+
+    src = fetchurl {
+      url = "https://pypi.python.org/packages/source/p/psycopg2/psycopg2-2.5.1.tar.gz";
+      sha256 = "1v7glzzzykbaqj7dhpr0qds9cf4maxmn7f5aazpqnbg0ly40r9v5";
+    };
+
+    propagatedBuildInputs = [ pkgs.postgresql ];
+
+    meta = {
+      description = "PostgreSQL database adapter for the Python programming language";
+      license = "GPLv2/ZPL";
+    };
+  };
+
+
   publicsuffix = buildPythonPackage rec {
     name = "publicsuffix-${version}";
     version = "1.0.2";
@@ -5327,7 +5347,7 @@ pythonPackages = modules // import ./python-packages-generated.nix {
     propagatedBuildInputs =
       [ recaptcha_client pytz memcached dateutil_1_5 paramiko flup pygments
         djblets django_1_3 django_evolution pycrypto modules.sqlite3
-        pysvn pil pythonPackages.psycopg2
+        pysvn pil psycopg2
       ];
   };
 
-- 
GitLab


From cf3e36a3b947f5053fa23197d145ecd5ecc4c89d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Fri, 11 Oct 2013 11:55:58 +0200
Subject: [PATCH 5119/5331] bash: place interactiveShellInit at the end to be
 able to override existing settings

---
 nixos/modules/programs/bash/bash.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/programs/bash/bash.nix b/nixos/modules/programs/bash/bash.nix
index 8cfe3f990ad..9d33e26c495 100644
--- a/nixos/modules/programs/bash/bash.nix
+++ b/nixos/modules/programs/bash/bash.nix
@@ -127,8 +127,6 @@ in
       loginShellInit = cfge.loginShellInit;
 
       interactiveShellInit = ''
-        ${cfge.interactiveShellInit}
-
         # Check the window size after every command.
         shopt -s checkwinsize
 
@@ -138,6 +136,8 @@ in
         ${cfg.promptInit}
         ${bashCompletion}
         ${bashAliases}
+
+        ${cfge.interactiveShellInit}
       '';
 
     };
-- 
GitLab


From d374bff41ed463b611cb31b2db2e7c9116f4475b Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 11 Oct 2013 11:29:24 +0200
Subject: [PATCH 5120/5331] Tarball: Match the NixOS version

---
 pkgs/top-level/make-tarball.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/top-level/make-tarball.nix b/pkgs/top-level/make-tarball.nix
index 62317df4163..b50f064af0c 100644
--- a/pkgs/top-level/make-tarball.nix
+++ b/pkgs/top-level/make-tarball.nix
@@ -12,7 +12,7 @@ releaseTools.sourceTarball rec {
 
   inherit officialRelease;
   version = builtins.readFile ../../.version;
-  versionSuffix = "pre${toString nixpkgs.revCount}_${nixpkgs.shortRev}";
+  versionSuffix = "pre${toString nixpkgs.revCount}.${nixpkgs.shortRev}";
 
   buildInputs = [
     lzma
-- 
GitLab


From a2600b7bc391a4bba7863abb66b219d3b6318d7c Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 11 Oct 2013 13:33:44 +0200
Subject: [PATCH 5121/5331] Terrible backward compatibility hack

---
 nixos/lib/build-vms.nix   | 2 +-
 nixos/lib/eval-config.nix | 6 +++---
 nixos/lib/nixpkgs.nix     | 8 ++++++++
 3 files changed, 12 insertions(+), 4 deletions(-)
 create mode 100644 nixos/lib/nixpkgs.nix

diff --git a/nixos/lib/build-vms.nix b/nixos/lib/build-vms.nix
index aad85aedc48..d20fbc1cc66 100644
--- a/nixos/lib/build-vms.nix
+++ b/nixos/lib/build-vms.nix
@@ -1,6 +1,6 @@
 { system, minimal ? false }:
 
-let pkgs = import ../.. { config = {}; inherit system; }; in
+let pkgs = import ./nixpkgs.nix { config = {}; inherit system; }; in
 
 with pkgs.lib;
 with import ../lib/qemu-flags.nix;
diff --git a/nixos/lib/eval-config.nix b/nixos/lib/eval-config.nix
index 89f81cf70bd..72ba66cdbac 100644
--- a/nixos/lib/eval-config.nix
+++ b/nixos/lib/eval-config.nix
@@ -30,7 +30,7 @@ rec {
   extraArgs = extraArgs_ // {
     inherit pkgs modules baseModules;
     modulesPath = ../modules;
-    pkgs_i686 = import ../.. { system = "i686-linux"; };
+    pkgs_i686 = import ./nixpkgs.nix { system = "i686-linux"; };
     utils = import ./utils.nix pkgs;
   };
 
@@ -47,7 +47,7 @@ rec {
   pkgs =
     if pkgs_ != null
     then pkgs_
-    else import ../.. (
+    else import ./nixpkgs.nix (
       let
         system = if nixpkgsOptions.system != "" then nixpkgsOptions.system else system_;
         nixpkgsOptions = (import ./eval-config.nix {
@@ -55,7 +55,7 @@ rec {
           # For efficiency, leave out most NixOS modules; they don't
           # define nixpkgs.config, so it's pointless to evaluate them.
           baseModules = [ ../modules/misc/nixpkgs.nix ];
-          pkgs = import ../.. { system = system_; config = {}; };
+          pkgs = import ./nixpkgs.nix { system = system_; config = {}; };
         }).optionDefinitions.nixpkgs;
       in
       {
diff --git a/nixos/lib/nixpkgs.nix b/nixos/lib/nixpkgs.nix
new file mode 100644
index 00000000000..10096f58c79
--- /dev/null
+++ b/nixos/lib/nixpkgs.nix
@@ -0,0 +1,8 @@
+/* Terrible backward compatibility hack to get the path to Nixpkgs
+   from here.  Usually, that's the relative path ‘../..’.  However,
+   when using the NixOS channel, <nixos> resolves to a symlink to
+   nixpkgs/nixos, so ‘../..’ doesn't resolve to the top-level Nixpkgs
+   directory but one above it.  So check for that situation. */
+if builtins.pathExists ../../.version then import ../..
+else if builtins.pathExists ../../nixpkgs then import ../../nixpkgs
+else abort "Can't find Nixpkgs, please set ‘NIX_PATH=nixpkgs=/path/to/nixpkgs’."
-- 
GitLab


From 42ee481f5df5866d31cf27259a0dde571c2c1bd6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= <viric@viric.name>
Date: Mon, 8 Jul 2013 21:38:08 +0200
Subject: [PATCH 5122/5331] Adding verboseness option to gnunet

---
 pkgs/applications/networking/p2p/gnunet/svn.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/networking/p2p/gnunet/svn.nix b/pkgs/applications/networking/p2p/gnunet/svn.nix
index b6b9db99f90..cb776201a1d 100644
--- a/pkgs/applications/networking/p2p/gnunet/svn.nix
+++ b/pkgs/applications/networking/p2p/gnunet/svn.nix
@@ -1,7 +1,8 @@
 { stdenv, fetchsvn, libextractor, libmicrohttpd, libgcrypt
 , zlib, gmp, curl, libtool, adns, sqlite, pkgconfig
 , libxml2, ncurses, gettext, libunistring, libidn
-, makeWrapper, autoconf, automake }:
+, makeWrapper, autoconf, automake
+, withVerbose ? false }:
 
 let
   rev = "27775";
@@ -22,6 +23,8 @@ stdenv.mkDerivation rec {
     autoconf automake
   ];
 
+  configureFlags = stdenv.lib.optional withVerbose "--enable-logging=verbose ";
+
   preConfigure = ''
     # Brute force: since nix-worker chroots don't provide
     # /etc/{resolv.conf,hosts}, replace all references to `localhost'
-- 
GitLab


From 2c06488a9fcaaf4477cd7ebc47e50bab15e24262 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= <viric@viric.name>
Date: Mon, 15 Jul 2013 22:17:47 +0200
Subject: [PATCH 5123/5331] gnunet_svn: update to 27840

---
 pkgs/applications/networking/p2p/gnunet/svn.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/p2p/gnunet/svn.nix b/pkgs/applications/networking/p2p/gnunet/svn.nix
index cb776201a1d..ed6c348706b 100644
--- a/pkgs/applications/networking/p2p/gnunet/svn.nix
+++ b/pkgs/applications/networking/p2p/gnunet/svn.nix
@@ -5,7 +5,7 @@
 , withVerbose ? false }:
 
 let
-  rev = "27775";
+  rev = "27840";
 in
 stdenv.mkDerivation rec {
   name = "gnunet-svn-${rev}";
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchsvn {
     url =  https://gnunet.org/svn/gnunet;
     inherit rev;
-    sha256 = "1fa2g63rrn0mmim9v62gnm2hqr556mbcafb7cs7afycbinix4spf";
+    sha256 = "0zhxvvj5rbhca2ykfx3g93dv94xyhqsnj011a6gql7zd5vfhaf6v";
   };
 
   buildInputs = [
-- 
GitLab


From 3ba1970cfdb5124185d3a0c53c04b7f4dff5b51a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= <viric@viric.name>
Date: Fri, 11 Oct 2013 19:35:38 +0200
Subject: [PATCH 5124/5331] Updating torchat to 0.9.9.553.

---
 .../instant-messengers/torchat/default.nix          | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/torchat/default.nix b/pkgs/applications/networking/instant-messengers/torchat/default.nix
index 5a82cf9d640..06bcd7a0400 100644
--- a/pkgs/applications/networking/instant-messengers/torchat/default.nix
+++ b/pkgs/applications/networking/instant-messengers/torchat/default.nix
@@ -2,18 +2,17 @@
 stdenv.mkDerivation rec {
 
   name = "torchat-${version}";
-  version = "0.9.9.550";
+  version = "0.9.9.553";
 
   src = fetchurl {
-    url = "http://torchat.googlecode.com/files/torchat-source-${version}.zip";
-    sha256 = "01z0vrmflcmb146m04b66zihkd22aqnxz2vr4x23z1q5mlwylmq2";
+    url = "https://github.com/prof7bit/TorChat/archive/${version}.tar.gz";
+    sha256 = "0rb4lvv40pz6ab5kxq40ycvh7kh1yxn7swzgv2ff2nbhi62xnzp0";
   };
 
   buildInputs = [ python unzip wxPython wrapPython ];
   pythonPath = [ wxPython ];
 
-  preConfigure = "rm portable.txt";
-  preUnpack = "sourceRoot=`pwd`/src";
+  preConfigure = "cd torchat/src; rm portable.txt";
 
   installPhase = ''
     substituteInPlace "Tor/tor.sh" --replace "tor -f" "${tor}/bin/tor -f"
@@ -29,8 +28,8 @@ stdenv.mkDerivation rec {
   '';
 
   meta = with stdenv.lib; {
-    homepage = http://code.google.com/p/torchat/;
-    description = "instant messaging application on top of the Tor network and it's location hidden services";
+    homepage = https://github.com/prof7bit/TorChat;
+    description = "Instant messaging application on top of the Tor network and it's location hidden services";
     license = licenses.gpl3;
     maintainers = [ maintainers.phreedom ];
     platforms = platforms.unix;
-- 
GitLab


From 2cf008345e144bb05493d232f585f39e22f6686e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= <viric@viric.name>
Date: Fri, 11 Oct 2013 20:37:47 +0200
Subject: [PATCH 5125/5331] Adding libsodium 0.4.3.

---
 .../libraries/libsodium/default.nix           | 30 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 32 insertions(+)
 create mode 100644 pkgs/development/libraries/libsodium/default.nix

diff --git a/pkgs/development/libraries/libsodium/default.nix b/pkgs/development/libraries/libsodium/default.nix
new file mode 100644
index 00000000000..1514f128424
--- /dev/null
+++ b/pkgs/development/libraries/libsodium/default.nix
@@ -0,0 +1,30 @@
+{ stdenv, fetchurl, autoconf, libtool, automake }:
+
+let
+  version = "0.4.3";
+in
+stdenv.mkDerivation rec {
+  name = "libsodium-${version}";
+
+  src = fetchurl {
+    url = "https://github.com/jedisct1/libsodium/tarball/${version}";
+    name = "${name}.tar.gz";
+    sha256 = "0vammhvkz6masnwyacqkzkah05bgv3syb97jvg2y49vb67pwmspn";
+  };
+
+  preConfigure = ''
+    ACLOCAL_PATH=$ACLOCAL_PATH:`pwd`/m4
+    ./autogen.sh
+  '';
+
+  buildInputs = [ autoconf libtool automake ];
+
+  doCheck = true;
+
+  meta = {
+    description = "Version of NaCl with harwdare tests at runtime, not build time";
+    license = "ISC";
+    maintainers = with stdenv.lib.maintainers; [ viric ];
+    platforms = stdenv.lib.platforms.all;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 219add96e10..23c02100115 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4953,6 +4953,8 @@ let
       else stdenv;
   };
 
+  libsodium = callPackage ../development/libraries/libsodium { };
+
   libsoup = callPackage ../development/libraries/libsoup { };
 
   libssh = callPackage ../development/libraries/libssh { };
-- 
GitLab


From c28d1169ec0b02826dea8ae277bdddf586183fcf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= <viric@viric.name>
Date: Fri, 11 Oct 2013 21:23:10 +0200
Subject: [PATCH 5126/5331] Fixing the libsodium expression to use the release
 tarball.

---
 .../libraries/libsodium/default.nix           | 19 +++++--------------
 1 file changed, 5 insertions(+), 14 deletions(-)

diff --git a/pkgs/development/libraries/libsodium/default.nix b/pkgs/development/libraries/libsodium/default.nix
index 1514f128424..e8124c2643a 100644
--- a/pkgs/development/libraries/libsodium/default.nix
+++ b/pkgs/development/libraries/libsodium/default.nix
@@ -1,23 +1,14 @@
-{ stdenv, fetchurl, autoconf, libtool, automake }:
+{ stdenv, fetchurl }:
 
-let
-  version = "0.4.3";
-in
 stdenv.mkDerivation rec {
-  name = "libsodium-${version}";
+  name = "libsodium-0.4.3";
 
   src = fetchurl {
-    url = "https://github.com/jedisct1/libsodium/tarball/${version}";
-    name = "${name}.tar.gz";
-    sha256 = "0vammhvkz6masnwyacqkzkah05bgv3syb97jvg2y49vb67pwmspn";
+    url = "https://download.libsodium.org/libsodium/releases/${name}.tar.gz";
+    sha256 = "0hk0zca1kpj6xlc2j2qx9qy7287pi0896frmxq5d7qmcwsdf372r";
   };
 
-  preConfigure = ''
-    ACLOCAL_PATH=$ACLOCAL_PATH:`pwd`/m4
-    ./autogen.sh
-  '';
-
-  buildInputs = [ autoconf libtool automake ];
+  NIX_LDFLAGS = "-lssp";
 
   doCheck = true;
 
-- 
GitLab


From 218fa0fc5d5ffa8acd21bfbaec32ac933ad1df02 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= <viric@viric.name>
Date: Fri, 11 Oct 2013 21:32:36 +0200
Subject: [PATCH 5127/5331] Adding tox-core

---
 .../instant-messengers/toxcore/default.nix    | 36 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 38 insertions(+)
 create mode 100644 pkgs/applications/networking/instant-messengers/toxcore/default.nix

diff --git a/pkgs/applications/networking/instant-messengers/toxcore/default.nix b/pkgs/applications/networking/instant-messengers/toxcore/default.nix
new file mode 100644
index 00000000000..0098ddb9d77
--- /dev/null
+++ b/pkgs/applications/networking/instant-messengers/toxcore/default.nix
@@ -0,0 +1,36 @@
+{ stdenv, fetchurl, autoconf, libtool, automake, libsodium, ncurses
+, libconfig, pkgconfig }:
+
+let
+  version = "31f5d7a8ab";
+  date = "20131011";
+in
+stdenv.mkDerivation rec {
+  name = "tox-core-${date}-${version}";
+
+  src = fetchurl {
+    url = "https://github.com/irungentoo/ProjectTox-Core/tarball/${version}";
+    name = "${name}.tar.gz";
+    sha256 = "0frz8ylvi33i7zkiz3hp28ylqg4c3ffrbc2m3ibb4zv9rwfzf77r";
+  };
+
+  preConfigure = ''
+    autoreconf -i
+  '';
+
+  configureFlags = [ "--with-libsodium-headers=${libsodium}/include"
+    "--with-libsodium-libs=${libsodium}/lib" 
+    "--enable-ntox" ];
+
+  buildInputs = [ autoconf libtool automake libsodium ncurses libconfig
+    pkgconfig ];
+
+  doCheck = true;
+
+  meta = {
+    description = "P2P FOSS instant messaging application aimed to replace Skype with crypto";
+    license = "GPLv3+";
+    maintainers = with stdenv.lib.maintainers; [ viric ];
+    platforms = stdenv.lib.platforms.all;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 23c02100115..b24a4b2dc89 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8717,6 +8717,8 @@ let
     wrapPython = pythonPackages.wrapPython;
   };
 
+  tox_core = callPackage ../applications/networking/instant-messengers/toxcore { };
+
   transmission = callPackage ../applications/networking/p2p/transmission { };
   transmission_gtk = transmission.override { enableGTK3 = true; };
 
-- 
GitLab


From fb8494b18bb5818e7ff1e913e095b46ddd94c449 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= <viric@viric.name>
Date: Fri, 11 Oct 2013 21:42:42 +0200
Subject: [PATCH 5128/5331] Adding toxic, the reference CLI for Tox

---
 .../instant-messengers/toxic/default.nix      | 40 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 +
 2 files changed, 42 insertions(+)
 create mode 100644 pkgs/applications/networking/instant-messengers/toxic/default.nix

diff --git a/pkgs/applications/networking/instant-messengers/toxic/default.nix b/pkgs/applications/networking/instant-messengers/toxic/default.nix
new file mode 100644
index 00000000000..a87bcc651d6
--- /dev/null
+++ b/pkgs/applications/networking/instant-messengers/toxic/default.nix
@@ -0,0 +1,40 @@
+{ stdenv, fetchurl, autoconf, libtool, automake, libsodium, ncurses
+, tox_core, pkgconfig }:
+
+let
+  version = "75d356e52a";
+  date = "20131011";
+in
+stdenv.mkDerivation rec {
+  name = "toxic-${date}-${version}";
+
+  src = fetchurl {
+    url = "https://github.com/Tox/toxic/tarball/${version}";
+    name = "${name}.tar.gz";
+    sha256 = "14wyvms8l07sl88g8y6g2jv95sq7cnhbaqf4n32xxilch8rymq47";
+  };
+
+  preConfigure = ''
+    autoreconf -i
+  '';
+
+  NIX_LDFLAGS = "-lsodium";
+
+  configureFlags = [
+    "--with-libtoxcore-headers=${tox_core}/include"
+    "--with-libtoxcore-libs=${tox_core}/lib" 
+    "--with-libsodium-headers=${tox_core}/include"
+    "--with-libsodium-libs=${tox_core}/lib" 
+  ];
+
+  buildInputs = [ autoconf libtool automake tox_core libsodium ncurses pkgconfig ];
+
+  doCheck = true;
+
+  meta = {
+    description = "Reference CLI for Tox";
+    license = "GPLv3+";
+    maintainers = with stdenv.lib.maintainers; [ viric ];
+    platforms = stdenv.lib.platforms.all;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b24a4b2dc89..b80e83b1dc1 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8719,6 +8719,8 @@ let
 
   tox_core = callPackage ../applications/networking/instant-messengers/toxcore { };
 
+  toxic = callPackage ../applications/networking/instant-messengers/toxic { };
+
   transmission = callPackage ../applications/networking/p2p/transmission { };
   transmission_gtk = transmission.override { enableGTK3 = true; };
 
-- 
GitLab


From 8a3652544b76ee95fe3c392abef3f093b0351aa1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= <viric@viric.name>
Date: Fri, 11 Oct 2013 21:44:15 +0200
Subject: [PATCH 5129/5331] Moving the attribute tox_core to libtoxcore. It
 seems more appropiate.

---
 .../networking/instant-messengers/toxic/default.nix  | 12 ++++++------
 .../libraries/libtoxcore}/default.nix                |  0
 pkgs/top-level/all-packages.nix                      |  4 ++--
 3 files changed, 8 insertions(+), 8 deletions(-)
 rename pkgs/{applications/networking/instant-messengers/toxcore => development/libraries/libtoxcore}/default.nix (100%)

diff --git a/pkgs/applications/networking/instant-messengers/toxic/default.nix b/pkgs/applications/networking/instant-messengers/toxic/default.nix
index a87bcc651d6..c2af1274a24 100644
--- a/pkgs/applications/networking/instant-messengers/toxic/default.nix
+++ b/pkgs/applications/networking/instant-messengers/toxic/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, autoconf, libtool, automake, libsodium, ncurses
-, tox_core, pkgconfig }:
+, libtoxcore, pkgconfig }:
 
 let
   version = "75d356e52a";
@@ -21,13 +21,13 @@ stdenv.mkDerivation rec {
   NIX_LDFLAGS = "-lsodium";
 
   configureFlags = [
-    "--with-libtoxcore-headers=${tox_core}/include"
-    "--with-libtoxcore-libs=${tox_core}/lib" 
-    "--with-libsodium-headers=${tox_core}/include"
-    "--with-libsodium-libs=${tox_core}/lib" 
+    "--with-libtoxcore-headers=${libtoxcore}/include"
+    "--with-libtoxcore-libs=${libtoxcore}/lib" 
+    "--with-libsodium-headers=${libtoxcore}/include"
+    "--with-libsodium-libs=${libtoxcore}/lib" 
   ];
 
-  buildInputs = [ autoconf libtool automake tox_core libsodium ncurses pkgconfig ];
+  buildInputs = [ autoconf libtool automake libtoxcore libsodium ncurses pkgconfig ];
 
   doCheck = true;
 
diff --git a/pkgs/applications/networking/instant-messengers/toxcore/default.nix b/pkgs/development/libraries/libtoxcore/default.nix
similarity index 100%
rename from pkgs/applications/networking/instant-messengers/toxcore/default.nix
rename to pkgs/development/libraries/libtoxcore/default.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b80e83b1dc1..f5e66473907 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4984,6 +4984,8 @@ let
       else stdenv;
   };
 
+  libtoxcore = callPackage ../development/libraries/libtoxcore { };
+
   libtunepimp = callPackage ../development/libraries/libtunepimp { };
 
   libtxc_dxtn = callPackage ../development/libraries/libtxc_dxtn { };
@@ -8717,8 +8719,6 @@ let
     wrapPython = pythonPackages.wrapPython;
   };
 
-  tox_core = callPackage ../applications/networking/instant-messengers/toxcore { };
-
   toxic = callPackage ../applications/networking/instant-messengers/toxic { };
 
   transmission = callPackage ../applications/networking/p2p/transmission { };
-- 
GitLab


From 08e327b2848b69040b8a4b3bae4bea8f1390007c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= <viric@viric.name>
Date: Fri, 11 Oct 2013 21:53:48 +0200
Subject: [PATCH 5130/5331] Updating freicoin to 0.8.3-1.

---
 pkgs/applications/misc/freicoin/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/freicoin/default.nix b/pkgs/applications/misc/freicoin/default.nix
index bce6d1f639c..d5ed057f56b 100644
--- a/pkgs/applications/misc/freicoin/default.nix
+++ b/pkgs/applications/misc/freicoin/default.nix
@@ -1,12 +1,12 @@
 { fetchurl, stdenv, db4, boost, gmp, mpfr, miniupnpc, qt4, unzip }:
 
 stdenv.mkDerivation rec {
-  version = "0.0.2";
+  version = "0.8.3-1";
   name = "freicoin-${version}";
 
   src = fetchurl {
     url = "https://github.com/freicoin/freicoin/archive/v${version}.zip";
-    sha256 = "09izmm85rb64d5hd0hz9hkfvv3qag55sb3mdyp8z4103icqwd6d7";
+    sha256 = "0v3mh8a96nnb86mkyaylyjj7qfdrl7i9gvybh7f8w2hrl9paszfh";
   };
 
   # I think that openssl and zlib are required, but come through other
-- 
GitLab


From c51e6c75a6b43e99e00d308986dfc1acfebe7aec Mon Sep 17 00:00:00 2001
From: Karn Kallio <kkallio@skami.org>
Date: Fri, 11 Oct 2013 00:07:08 -0430
Subject: [PATCH 5131/5331] eclipse: add Eclipse Classic version 4.3.1
 (codename Kepler).

---
 pkgs/applications/editors/eclipse/default.nix | 19 ++++++++++++++++++-
 1 file changed, 18 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/editors/eclipse/default.nix b/pkgs/applications/editors/eclipse/default.nix
index 21dad42ea46..fe3c7424907 100644
--- a/pkgs/applications/editors/eclipse/default.nix
+++ b/pkgs/applications/editors/eclipse/default.nix
@@ -32,8 +32,9 @@ let
 
         # Patch binaries.
         interpreter=$(echo ${stdenv.glibc}/lib/ld-linux*.so.2)
+        libCairo=$out/eclipse/libcairo-swt.so
         patchelf --set-interpreter $interpreter $out/eclipse/eclipse
-        patchelf --set-rpath ${freetype}/lib:${fontconfig}/lib:${libX11}/lib:${libXrender}/lib:${zlib}/lib $out/eclipse/libcairo-swt.so
+        [ -f $libCairo ] && patchelf --set-rpath ${freetype}/lib:${fontconfig}/lib:${libX11}/lib:${libXrender}/lib:${zlib}/lib $libCairo
 
         # Create wrapper script.  Pass -configuration to store
         # settings in ~/.eclipse/org.eclipse.platform_<version> rather
@@ -205,4 +206,20 @@ in {
         };
     };
   };
+
+  eclipse_sdk_431 = buildEclipse {
+    name = "eclipse-sdk-4.3.1";
+    description = "Eclipse Classic";
+    sources = {
+      "x86_64-linux" = fetchurl {
+          url = http://download.eclipse.org/eclipse/downloads/drops4/R-4.3.1-201309111000/eclipse-SDK-4.3.1-linux-gtk-x86_64.tar.gz;
+          sha256 = "0ncm56ylwxw9z8rk8ccgva68c2yr9yrf1kcr1zkgw6p87xh1yczd";
+        };
+      "i686-linux" = fetchurl {
+          url = http://download.eclipse.org/eclipse/downloads/drops4/R-4.3.1-201309111000/eclipse-SDK-4.3.1-linux-gtk.tar.gz;
+          sha256 = "1zxsh838khny7mvl01h28xna6xdh01yi4mvls28zj22v0340lgsg";
+        };
+    };
+  };
+
 }
-- 
GitLab


From a3d9f41aadae9c2aca31266e8824441b953800ca Mon Sep 17 00:00:00 2001
From: "Jason \"Don\" O'Conal" <lovek323@gmail.com>
Date: Sat, 12 Oct 2013 00:31:46 +0000
Subject: [PATCH 5132/5331] sdlmame: add expression

---
 pkgs/games/sdlmame/default.nix  | 44 +++++++++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix |  2 ++
 2 files changed, 46 insertions(+)
 create mode 100644 pkgs/games/sdlmame/default.nix

diff --git a/pkgs/games/sdlmame/default.nix b/pkgs/games/sdlmame/default.nix
new file mode 100644
index 00000000000..bd6e9011178
--- /dev/null
+++ b/pkgs/games/sdlmame/default.nix
@@ -0,0 +1,44 @@
+{ stdenv, fetchurl, alsaLib, qt48, SDL, fontconfig, freetype, SDL_ttf, xlibs }:
+
+assert stdenv.system == "x86_64-linux" || stdenv.system == "1686-linux";
+
+stdenv.mkDerivation rec {
+  version = "0.150.u0-1";
+  name    = "sdlmame-${version}";
+
+  src = if stdenv.system == "x86_64-linux"
+    then fetchurl {
+      url    = "ftp://ftp.archlinux.org/community/os/x86_64/${name}-x86_64.pkg.tar.xz";
+      sha256 = "0393xnzrzq53szmicn96lvapm66wmlykdxaa1n7smx8a0mcz0kah";
+    }
+    else fetchurl {
+      url    = "ftp://ftp.archlinux.org/community/os/i686/${name}-i686.pkg.tar.xz";
+      sha256 = "0js67w2szd0qs7ycgxb3bbmcdziv1fywyd9ihra2f6bq5rhcs2jp";
+    };
+
+  buildPhase = ''
+    sed -i "s|/usr|$out|" bin/sdlmame
+  '';
+
+  installPhase = ''
+    patchelf \
+      --set-interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" \
+      --set-rpath "${alsaLib}/lib:${qt48}/lib:${SDL}/lib:${fontconfig}/lib:${freetype}/lib:${SDL_ttf}/lib:${xlibs.libX11}/lib:${xlibs.libXinerama}/lib:${stdenv.gcc.gcc}/lib" \
+      share/sdlmame/sdlmame
+
+    mkdir -p "$out/bin"
+    cp -r bin/sdlmame "$out/bin"
+    cp -r share "$out"
+  '';
+
+  dontPatchELF = true;
+  dontStrip    = true;
+
+  meta = with stdenv.lib; {
+    homepage    = http://sdlmame.lngn.net;
+    description = "A port of the popular Multiple Arcade Machine Emulator using SDL with OpenGL support.";
+    license     = "MAME";
+    maintainers = with maintainers; [ lovek323 ];
+    platforms   = platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f5e66473907..9a4bdd0e267 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9222,6 +9222,8 @@ let
 
   scorched3d = callPackage ../games/scorched3d { };
 
+  sdlmame = callPackage ../games/sdlmame { };
+
   sgtpuzzles = builderDefsPackage (import ../games/sgt-puzzles) {
     inherit pkgconfig fetchsvn perl gtk;
     inherit (xlibs) libX11;
-- 
GitLab


From 677ecf4868f6a15d494de9367ffc598ce060212f Mon Sep 17 00:00:00 2001
From: Jaka Hudoklin <jakahudoklin@gmail.com>
Date: Fri, 11 Oct 2013 11:44:26 +0200
Subject: [PATCH 5133/5331] nixos/graphite: listen on localhost by default

---
 nixos/modules/services/monitoring/graphite.nix | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/services/monitoring/graphite.nix b/nixos/modules/services/monitoring/graphite.nix
index ec36db7b21c..b1ff561a5fd 100644
--- a/nixos/modules/services/monitoring/graphite.nix
+++ b/nixos/modules/services/monitoring/graphite.nix
@@ -34,7 +34,14 @@ in {
     carbon = {
       config = mkOption {
         description = "Content of carbon configuration file";
-        default = "";
+        default = ''
+          [cache]
+          # Listen on localhost by default for security reasons
+          UDP_RECEIVER_INTERFACE = 127.0.0.1
+          PICKLE_RECEIVER_INTERFACE = 127.0.0.1
+          LINE_RECEIVER_INTERFACE = 127.0.0.1
+          CACHE_QUERY_INTERFACE = 127.0.0.1
+        '';
         type = types.uniq types.string;
       };
 
-- 
GitLab


From 285f447c498fe0720862382fec8c78ccd6030256 Mon Sep 17 00:00:00 2001
From: Jaka Hudoklin <jakahudoklin@gmail.com>
Date: Sat, 12 Oct 2013 12:37:52 +0200
Subject: [PATCH 5134/5331] nixos/statsd: Add support to specify managment
 ip/port

---
 nixos/modules/services/monitoring/statsd.nix | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/nixos/modules/services/monitoring/statsd.nix b/nixos/modules/services/monitoring/statsd.nix
index a3266605671..120c8860d57 100644
--- a/nixos/modules/services/monitoring/statsd.nix
+++ b/nixos/modules/services/monitoring/statsd.nix
@@ -10,6 +10,8 @@ let
     {
       host: "${cfg.host}",
       port: "${toString cfg.port}",
+      mgmt_address: "${cfg.mgmt_address}",
+      mgmt_port: "${toString cfg.mgmt_port}",
       backends: [${concatMapStrings (el: ''"./backends/${el}",'') cfg.backends}],
       graphiteHost: "${cfg.graphiteHost}",
       graphitePort: "${toString cfg.graphitePort}",
@@ -43,6 +45,18 @@ in
       type = types.uniq types.int;
     };
 
+    mgmt_address = mkOption {
+      description = "Address to run managment TCP interface on";
+      default = "127.0.0.1";
+      type = types.uniq types.string;
+    };
+
+    mgmt_port = mkOption {
+      description = "Port to run the management TCP interface on";
+      default = 8126;
+      type = types.uniq types.int;
+    };
+
     backends = mkOption {
       description = "List of backends statsd will use for data persistance";
       default = ["graphite"];
-- 
GitLab


From fd0d2872a49dfe94a8848ede0b40f0d7402ad948 Mon Sep 17 00:00:00 2001
From: Jaka Hudoklin <jakahudoklin@gmail.com>
Date: Sat, 12 Oct 2013 12:42:10 +0200
Subject: [PATCH 5135/5331] nixos/elasticsearch: change loglevel from DEBUG to
 INFO

---
 nixos/modules/services/search/elasticsearch.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/services/search/elasticsearch.nix b/nixos/modules/services/search/elasticsearch.nix
index 6dfabc7e305..3c27c1400f9 100644
--- a/nixos/modules/services/search/elasticsearch.nix
+++ b/nixos/modules/services/search/elasticsearch.nix
@@ -66,9 +66,9 @@ in {
     logging = mkOption {
       description = "Elasticsearch logging configuration";
       default = ''
-        rootLogger: DEBUG, console
+        rootLogger: INFO, console
         logger:
-          action: DEBUG
+          action: INFO
           com.amazonaws: WARN
         appender:
           console:
-- 
GitLab


From 3ecba5afd1c04d53e7c5b9962db23166cfc14864 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= <viric@viric.name>
Date: Sat, 12 Oct 2013 15:32:09 +0200
Subject: [PATCH 5136/5331] Adding tox-prpl, a pidgin plugin for tox.

I use the current master, because the release 0.2.0 doesn't match the
libtoxcore expression.
---
 .../pidgin-plugins/tox-prpl/default.nix       | 25 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 27 insertions(+)
 create mode 100644 pkgs/applications/networking/instant-messengers/pidgin-plugins/tox-prpl/default.nix

diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/tox-prpl/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/tox-prpl/default.nix
new file mode 100644
index 00000000000..56920d04e1e
--- /dev/null
+++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/tox-prpl/default.nix
@@ -0,0 +1,25 @@
+{ stdenv, fetchurl, libtoxcore, pidgin, autoconf, automake, libtool } :
+
+let
+  version = "17a3fd9199";
+  date = "20131012";
+in
+stdenv.mkDerivation rec {
+  name = "tox-prpl-${date}-${version}";
+
+  src = fetchurl {
+    url = "https://github.com/jin-eld/tox-prpl/tarball/${version}";
+    name = "${name}.tar.gz";
+    sha256 = "0sz5wkyfwmhaj652xpsxq4p252cmmfa1vy6mp3jfyn145c758v9n";
+  };
+
+  preConfigure = "autoreconf -vfi";
+
+  buildInputs = [ libtoxcore pidgin autoconf automake libtool];
+
+  meta = {
+    homepage = http://tox.dhs.org/;
+    description = "Tox plugin for Pidgin / libpurple";
+    license = "GPLv3";
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f5e66473907..68f780996fc 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8436,6 +8436,8 @@ let
 
   pidginsipe = callPackage ../applications/networking/instant-messengers/pidgin-plugins/sipe { };
 
+  toxprpl = callPackage ../applications/networking/instant-messengers/pidgin-plugins/tox-prpl { };
+
   pinfo = callPackage ../applications/misc/pinfo { };
 
   pinta = callPackage ../applications/graphics/pinta {
-- 
GitLab


From 5355ab63b9ac6de0b74d124ed2e396dd3e2ab8b5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= <viric@viric.name>
Date: Sat, 12 Oct 2013 18:53:59 +0200
Subject: [PATCH 5137/5331] Fixes for torprpl, until making it work.

---
 .../pidgin-plugins/tox-prpl/default.nix                   | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/tox-prpl/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/tox-prpl/default.nix
index 56920d04e1e..b87db662f45 100644
--- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/tox-prpl/default.nix
+++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/tox-prpl/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, libtoxcore, pidgin, autoconf, automake, libtool } :
+{ stdenv, fetchurl, libtoxcore, pidgin, autoconf, automake, libtool, libsodium } :
 
 let
   version = "17a3fd9199";
@@ -13,9 +13,13 @@ stdenv.mkDerivation rec {
     sha256 = "0sz5wkyfwmhaj652xpsxq4p252cmmfa1vy6mp3jfyn145c758v9n";
   };
 
+  NIX_LDFLAGS = "-lssp -lsodium";
+
   preConfigure = "autoreconf -vfi";
 
-  buildInputs = [ libtoxcore pidgin autoconf automake libtool];
+  postInstall = "mv $out/lib/purple-2 $out/lib/pidgin";
+
+  buildInputs = [ libtoxcore pidgin autoconf automake libtool libsodium ];
 
   meta = {
     homepage = http://tox.dhs.org/;
-- 
GitLab


From 7f628804685d480a76765c82b4b5359a6596974b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= <viric@viric.name>
Date: Sat, 12 Oct 2013 19:06:42 +0200
Subject: [PATCH 5138/5331] Updating bitcoin to 0.8.5

---
 pkgs/applications/misc/bitcoin/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/bitcoin/default.nix b/pkgs/applications/misc/bitcoin/default.nix
index a4048e6f40b..a6a289168c4 100644
--- a/pkgs/applications/misc/bitcoin/default.nix
+++ b/pkgs/applications/misc/bitcoin/default.nix
@@ -1,12 +1,12 @@
 { fetchurl, stdenv, openssl, db4, boost, zlib, miniupnpc, qt4 }:
 
 stdenv.mkDerivation rec {
-  version = "0.8.1";
+  version = "0.8.5";
   name = "bitcoin-${version}";
 
   src = fetchurl {
     url = "mirror://sourceforge/bitcoin/${name}-linux.tar.gz";
-    sha256 = "161arfkzpya5anh6vh5i9ydvwqpia7bpqgz83p2kd97iklx04zvd";
+    sha256 = "0qqzwx1lihlrj7r08alsyznjfqvwncfm0nnxi1pcx0jyvq83ym44";
   };
 
   buildInputs = [ openssl db4 boost zlib miniupnpc qt4 ];
-- 
GitLab


From d269ab1579f2ff5503456a725b44743f587d2258 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sat, 12 Oct 2013 19:37:01 +0200
Subject: [PATCH 5139/5331] libav: maintenance update 9.9 -> 9.10

---
 pkgs/development/libraries/libav/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/libav/default.nix b/pkgs/development/libraries/libav/default.nix
index ea45902b749..287ac32fff5 100644
--- a/pkgs/development/libraries/libav/default.nix
+++ b/pkgs/development/libraries/libav/default.nix
@@ -26,7 +26,7 @@ with { inherit (stdenv.lib) optional optionals; };
 
 let
   result = {
-    libav_9   = libavFun   "9.9" "1rwphyqb2c4zyp20y4ywxjiddmd46vd4dbpdm1lxqm3q63rmmdk9";
+    libav_9   = libavFun  "9.10" "039hx7z8lmsiljy4wj87hk8lkxspbxbrjv43v3lc38cxfx0fdnw3";
     libav_0_8 = libavFun "0.8.8" "1wnbmbs0z4f55y8r9bwb63l04zn383l1avy4c9x1ffb2xccgcp79";
   };
 
-- 
GitLab


From c74b044be1f87fc6d0379484f1cfae6c5afc975b Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 12 Oct 2013 22:55:14 +0200
Subject: [PATCH 5140/5331] asymptote: update to version 2.24

---
 pkgs/tools/graphics/asymptote/default.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/tools/graphics/asymptote/default.nix b/pkgs/tools/graphics/asymptote/default.nix
index e32a3901a92..e9f61228bed 100644
--- a/pkgs/tools/graphics/asymptote/default.nix
+++ b/pkgs/tools/graphics/asymptote/default.nix
@@ -11,11 +11,11 @@ let
   s = # Generated upstream information
   rec {
     baseName="asymptote";
-    version="2.21";
-    name="asymptote-2.21";
-    hash="07lkj0xnxpanfscmbm30lw6j9484rlmmqpnl0mhs7nx9h2lczrjz";
-    url="mirror://sourceforge/project/asymptote/2.21/asymptote-2.21.src.tgz";
-    sha256="07lkj0xnxpanfscmbm30lw6j9484rlmmqpnl0mhs7nx9h2lczrjz";
+    version="2.24";
+    name="asymptote-2.24";
+    hash="0iypv3n89h8mx46b0c3msl0ldmg7fxf8v9fl4zy4sxfszazrvivl";
+    url="mirror://sourceforge/project/asymptote/2.24/asymptote-2.24.src.tgz";
+    sha256="0iypv3n89h8mx46b0c3msl0ldmg7fxf8v9fl4zy4sxfszazrvivl";
   };
   buildInputs = with a; [
     freeglut ghostscriptX imagemagick fftw boehmgc
-- 
GitLab


From 568b39c67235275bbdb9a7396f1f7292dfe9a69b Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 13 Oct 2013 00:37:58 +0200
Subject: [PATCH 5141/5331] maxima: update to version 5.31.2

---
 pkgs/applications/science/math/maxima/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/science/math/maxima/default.nix b/pkgs/applications/science/math/maxima/default.nix
index f5fec36756d..b8f7f2e65b6 100644
--- a/pkgs/applications/science/math/maxima/default.nix
+++ b/pkgs/applications/science/math/maxima/default.nix
@@ -2,7 +2,7 @@
 
 let
   name    = "maxima";
-  version = "5.30.0";
+  version = "5.31.2";
 
   searchPath =
     stdenv.lib.makeSearchPath "bin"
@@ -13,7 +13,7 @@ stdenv.mkDerivation {
 
   src = fetchurl {
     url = "mirror://sourceforge/${name}/${name}-${version}.tar.gz";
-    sha256 = "1mhx7g0kzpiagg97s2zhaplsq1li9ya2764mhwl7jgfw2vp3jlm0";
+    sha256 = "12j5irwfckl5583h7lwh0wrp0c65q7mqzcsri2v086j50xvvv398";
   };
 
   buildInputs = [sbcl texinfo perl makeWrapper];
-- 
GitLab


From bf3e2d86cbd493b93cce3de2ccaf3978ac3ca72a Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 13 Oct 2013 00:39:06 +0200
Subject: [PATCH 5142/5331] wxmaxima: update to version 13.04.2

---
 pkgs/applications/science/math/wxmaxima/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/science/math/wxmaxima/default.nix b/pkgs/applications/science/math/wxmaxima/default.nix
index 47baf446d0a..01be4ba7e6c 100644
--- a/pkgs/applications/science/math/wxmaxima/default.nix
+++ b/pkgs/applications/science/math/wxmaxima/default.nix
@@ -2,14 +2,14 @@
 
 let
   name    = "wxmaxima";
-  version = "13.04.1";
+  version = "13.04.2";
 in
 stdenv.mkDerivation {
   name = "${name}-${version}";
 
   src = fetchurl {
     url = "mirror://sourceforge/${name}/wxMaxima/${version}/wxMaxima-${version}.tar.gz";
-    sha256 = "0irp1m9vr50ym7wfj1c1vbrzd2pip1vmvn9ykqsdf04afkkwkran";
+    sha256 = "1sylvr0kfdzxxc3qsb0c6ff3lg0bzm1ib5xh78wjgzykbnvjsd99";
   };
 
   buildInputs = [wxGTK maxima makeWrapper];
-- 
GitLab


From dbc9d7f8620bc76384ad6447b46ddcd7f44b6ee3 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Sun, 13 Oct 2013 10:34:22 +0400
Subject: [PATCH 5143/5331] Add full linking-set to clisp 2.49

---
 pkgs/development/interpreters/clisp/default.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/development/interpreters/clisp/default.nix b/pkgs/development/interpreters/clisp/default.nix
index bd19d738860..b8af3f6d747 100644
--- a/pkgs/development/interpreters/clisp/default.nix
+++ b/pkgs/development/interpreters/clisp/default.nix
@@ -48,6 +48,11 @@ stdenv.mkDerivation rec {
     cd builddir
   '';
 
+  postInstall = ''
+    ./clisp-link add "$out"/lib/clisp*/base "$(dirname "$out"/lib/clisp*/base)"/full \
+        clx/new-clx bindings/glibc pcre rawsock wildcard zlib
+  '';
+
   NIX_CFLAGS_COMPILE="-O0";
 
   # TODO : make mod-check fails
-- 
GitLab


From 6be28d142f9b4c9f6b12ed18f1c688fc0297cfa1 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Sun, 13 Oct 2013 10:34:55 +0400
Subject: [PATCH 5144/5331] Update SBCL to 1.1.12

---
 pkgs/development/compilers/sbcl/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/compilers/sbcl/default.nix b/pkgs/development/compilers/sbcl/default.nix
index 1e4feff1107..288fdb33454 100644
--- a/pkgs/development/compilers/sbcl/default.nix
+++ b/pkgs/development/compilers/sbcl/default.nix
@@ -4,11 +4,11 @@ let
   s= # Generated upstream information
   rec {
     baseName="sbcl";
-    version="1.1.8";
+    version="1.1.12";
     name="${baseName}-${version}";
-    hash="1fmcpsi2bddfpz3impm9i62y9p15r3mc4xgm1dg0k77l33859jip";
-    url="mirror://sourceforge/project/sbcl/sbcl/1.1.8/sbcl-1.1.8-source.tar.bz2";
-    sha256="1fmcpsi2bddfpz3impm9i62y9p15r3mc4xgm1dg0k77l33859jip";
+    hash="0mvl6lpi44yv6jv3xhyyzvf9g7bdlj691iz3ydpn66v0vg5i554c";
+    url="mirror://sourceforge/project/sbcl/sbcl/1.1.12/sbcl-1.1.12-source.tar.bz2";
+    sha256="0mvl6lpi44yv6jv3xhyyzvf9g7bdlj691iz3ydpn66v0vg5i554c";
   };
   buildInputs = with a; [
     clisp makeWrapper
-- 
GitLab


From f1dd61d353b47b511654162f09a11d09aa8dbf35 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Sun, 13 Oct 2013 10:40:25 +0400
Subject: [PATCH 5145/5331] Adding ASDF package definition system for Common
 Lisp

---
 .../development/lisp-modules/asdf/default.nix | 40 +++++++++++++++++++
 .../lisp-modules/asdf/default.upstream        |  2 +
 pkgs/top-level/all-packages.nix               |  3 ++
 3 files changed, 45 insertions(+)
 create mode 100644 pkgs/development/lisp-modules/asdf/default.nix
 create mode 100644 pkgs/development/lisp-modules/asdf/default.upstream

diff --git a/pkgs/development/lisp-modules/asdf/default.nix b/pkgs/development/lisp-modules/asdf/default.nix
new file mode 100644
index 00000000000..c615573ae3e
--- /dev/null
+++ b/pkgs/development/lisp-modules/asdf/default.nix
@@ -0,0 +1,40 @@
+{stdenv, fetchurl, texinfo, texLive}:
+let
+  s = # Generated upstream information
+  rec {
+    baseName="asdf";
+    version="3.0.2.1";
+    name="${baseName}-${version}";
+    hash="1npd4dxsgk06ayhln56mwwky0vdpf7i77mkxfh105pld8w5xs4r4";
+    url="http://common-lisp.net/project/asdf/archives/asdf-3.0.2.1.tar.gz";
+    sha256="1npd4dxsgk06ayhln56mwwky0vdpf7i77mkxfh105pld8w5xs4r4";
+  };
+  buildInputs = [
+    texinfo texLive
+  ];
+in
+stdenv.mkDerivation {
+  inherit (s) name version;
+  inherit buildInputs;
+  src = fetchurl {
+    inherit (s) url sha256;
+  };
+  buildPhase = ''
+    make build/asdf.lisp
+    make -C doc asdf.info asdf.html
+  '';
+  installPhase = ''
+    mkdir -p "$out"/lib/common-lisp/asdf/
+    mkdir -p "$out"/share/doc/asdf/
+    cp -r ./* "$out"/lib/common-lisp/asdf/
+    cp -r doc/* "$out"/share/doc/asdf/
+  '';
+  sourceRoot=".";
+  meta = {
+    inherit (s) version;
+    description = ''Standard software-system definition library for Common Lisp'';
+    license = stdenv.lib.licenses.mit ;
+    maintainers = [stdenv.lib.maintainers.raskin];
+    platforms = stdenv.lib.platforms.linux;
+  };
+}
diff --git a/pkgs/development/lisp-modules/asdf/default.upstream b/pkgs/development/lisp-modules/asdf/default.upstream
new file mode 100644
index 00000000000..d8625182352
--- /dev/null
+++ b/pkgs/development/lisp-modules/asdf/default.upstream
@@ -0,0 +1,2 @@
+url http://common-lisp.net/project/asdf/archives/
+version_link asdf-[0-9].*[.]tar[.].*
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 8d727a37260..81f181b3817 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5878,6 +5878,9 @@ let
 
   jquery_ui = callPackage ../development/libraries/javascript/jquery-ui { };
 
+  ### DEVELOPMENT / LISP MODULES
+
+  asdf = callPackage ../development/lisp-modules/asdf {};
 
   ### DEVELOPMENT / PERL MODULES
 
-- 
GitLab


From d44439d03ed0880c322736dd4afdebe916a437c6 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Sun, 13 Oct 2013 10:45:07 +0400
Subject: [PATCH 5146/5331] Adding a Common Lisp wrapper.

Features:
  + configurable via environment variables
  + can skip the actual launching of the lisp implementation (source it
  with NIX_LISP_SKIP_CODE=1 to get all the settings)
  + currently supports SBCL, CLisp, ECL
  + determines lisp implementation from NIX_LISP_COMMAND variable or
  from buildInputs
  + sets ASDF search path for packages using buildInputs
---
 .../lisp-modules/clwrapper/cl-wrapper.sh      | 44 +++++++++++++++++++
 .../lisp-modules/clwrapper/common-lisp.sh     |  3 ++
 .../lisp-modules/clwrapper/default.nix        | 28 ++++++++++++
 .../lisp-modules/clwrapper/setup-hook.sh      | 33 ++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 +
 5 files changed, 110 insertions(+)
 create mode 100755 pkgs/development/lisp-modules/clwrapper/cl-wrapper.sh
 create mode 100755 pkgs/development/lisp-modules/clwrapper/common-lisp.sh
 create mode 100644 pkgs/development/lisp-modules/clwrapper/default.nix
 create mode 100644 pkgs/development/lisp-modules/clwrapper/setup-hook.sh

diff --git a/pkgs/development/lisp-modules/clwrapper/cl-wrapper.sh b/pkgs/development/lisp-modules/clwrapper/cl-wrapper.sh
new file mode 100755
index 00000000000..91b8a0c2bb0
--- /dev/null
+++ b/pkgs/development/lisp-modules/clwrapper/cl-wrapper.sh
@@ -0,0 +1,44 @@
+#! /bin/sh
+# Part of NixPkgs package collection
+# This script can be used at your option under the same license as NixPkgs or 
+# under MIT/X11 license
+
+eval "$NIX_LISP_PREHOOK"
+
+NIX_LISP_COMMAND="$1"
+shift
+
+[ -z "$NIX_LISP" ] && NIX_LISP="${NIX_LISP_COMMAND##*/}"
+
+export NIX_LISP NIX_LISP_LOAD_FILE NIX_LISP_EXEC_CODE NIX_LISP_COMMAND NIX_LISP_FINAL_PARAMETERS
+
+case "$NIX_LISP" in
+	sbcl)
+		NIX_LISP_LOAD_FILE="--load"
+		NIX_LISP_EXEC_CODE="--eval"
+		NIX_LISP_FINAL_PARAMETERS=
+		;;
+	ecl)
+		NIX_LISP_LOAD_FILE="-load"
+		NIX_LISP_EXEC_CODE="-eval"
+		NIX_LISP_FINAL_PARAMETERS=
+		;;
+	clisp)
+		NIX_LISP_LOAD_FILE="-c -l"
+		NIX_LISP_EXEC_CODE="-x"
+		NIX_LISP_FINAL_PARAMETERS="-repl"
+		;;
+esac
+
+NIX_LISP_ASDF_REGISTRY_CODE="
+  (progn
+    (setf asdf:*default-source-registries* '(asdf/source-registry:environment-source-registry))
+    (asdf:initialize-source-registry)
+    )
+"
+
+[ -z "$NIX_LISP_SKIP_CODE" ] && "$NIX_LISP_COMMAND" $NIX_LISP_EARLY_OPTIONS \
+	$NIX_LISP_EXEC_CODE "(load \"$NIX_LISP_ASDF/lib/common-lisp/asdf/build/asdf.lisp\")" \
+	$NIX_LISP_EXEC_CODE "$NIX_LISP_ASDF_REGISTRY_CODE" \
+	$NIX_LISP_FINAL_PARAMETERS \
+	"$@"
diff --git a/pkgs/development/lisp-modules/clwrapper/common-lisp.sh b/pkgs/development/lisp-modules/clwrapper/common-lisp.sh
new file mode 100755
index 00000000000..b22ca016128
--- /dev/null
+++ b/pkgs/development/lisp-modules/clwrapper/common-lisp.sh
@@ -0,0 +1,3 @@
+#! /bin/sh
+
+"$(dirname "$0")"/cl-wrapper.sh "${NIX_LISP_COMMAND:-sbcl}" "$@"
diff --git a/pkgs/development/lisp-modules/clwrapper/default.nix b/pkgs/development/lisp-modules/clwrapper/default.nix
new file mode 100644
index 00000000000..0ae4ce13064
--- /dev/null
+++ b/pkgs/development/lisp-modules/clwrapper/default.nix
@@ -0,0 +1,28 @@
+{stdenv, fetchurl, asdf, lisp ? null}:
+stdenv.mkDerivation {
+  name = "cl-wrapper-script";
+
+  buildPhase="";
+
+  installPhase=''
+    mkdir -p "$out"/bin
+    cp ${./cl-wrapper.sh} "$out"/bin/cl-wrapper.sh
+    cp ${./common-lisp.sh} "$out"/bin/common-lisp.sh
+    chmod a+x "$out"/bin/*
+  '';
+
+  inherit asdf lisp;
+
+  setupHook = ./setup-hook.sh;
+
+  phases="installPhase fixupPhase";
+
+  passthru = {
+    inherit lisp;
+  };
+
+  meta = {
+    description = ''Script used to wrap Common Lisp implementations'';
+    maintainers = [stdenv.lib.maintainers.raskin];
+  };
+}
diff --git a/pkgs/development/lisp-modules/clwrapper/setup-hook.sh b/pkgs/development/lisp-modules/clwrapper/setup-hook.sh
new file mode 100644
index 00000000000..5de43dc0e9a
--- /dev/null
+++ b/pkgs/development/lisp-modules/clwrapper/setup-hook.sh
@@ -0,0 +1,33 @@
+NIX_LISP_ASDF="@asdf@"
+
+CL_SOURCE_REGISTRY="@asdf@/lib/common-lisp/asdf/:@asdf@/lib/common-lisp/asdf/uiop/"
+
+addASDFPaths () {
+    for j in "$1"/lib/common-lisp/*; do
+	if [ -d "$j" ]; then
+            CL_SOURCE_REGISTRY="$CL_SOURCE_REGISTRY:$j/"
+	fi
+    done
+}
+
+setLisp () {
+    if [ -z "$NIX_LISP_COMMAND" ]; then 
+      for j in "$1"/bin/*; do
+          case "$(basename "$j")" in
+              sbcl) NIX_LISP_COMMAND="$j" ;;
+              ecl) NIX_LISP_COMMAND="$j" ;;
+              clisp) NIX_LISP_COMMAND="$j" ;;
+          esac
+      done
+    fi
+    if [ -z "$NIX_LISP" ]; then 
+        NIX_LISP="${NIX_LISP_COMMAND##*/}"
+    fi
+}
+
+export NIX_LISP_COMMAND NIX_LISP CL_SOURCE_REGISTRY NIX_LISP_ASDF
+
+envHooks=(envHooks[@] addASDFPaths setLisp)
+
+mkdir -p "$HOME"/.cache/common-lisp || HOME="$TMP/.temp-$USER-home"
+mkdir -p "$HOME"/.cache/common-lisp
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 81f181b3817..d14d84ea2c1 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5881,6 +5881,8 @@ let
   ### DEVELOPMENT / LISP MODULES
 
   asdf = callPackage ../development/lisp-modules/asdf {};
+  clwrapperFunction = callPackage ../development/lisp-modules/clwrapper;
+  wrapLisp = lisp: clwrapperFunction {lisp=lisp;};
 
   ### DEVELOPMENT / PERL MODULES
 
-- 
GitLab


From 56f0be1ba13293cced0bd6ebd19f15f82f42fb1f Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Sun, 13 Oct 2013 10:57:30 +0400
Subject: [PATCH 5147/5331] Adding lisp-packages subset. Adding a few test
 packages without dependencies.

---
 .../lisp-modules/define-package.nix           | 45 ++++++++++++++++++
 .../lisp-modules/lisp-packages.nix            | 47 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  6 +++
 3 files changed, 98 insertions(+)
 create mode 100644 pkgs/development/lisp-modules/define-package.nix
 create mode 100644 pkgs/development/lisp-modules/lisp-packages.nix

diff --git a/pkgs/development/lisp-modules/define-package.nix b/pkgs/development/lisp-modules/define-package.nix
new file mode 100644
index 00000000000..4fe3bb68373
--- /dev/null
+++ b/pkgs/development/lisp-modules/define-package.nix
@@ -0,0 +1,45 @@
+args @ {stdenv, clwrapper, baseName, version ? "latest", src, description, deps, 
+  buildInputs ? [], meta ? {}, overrides?(x: {})}:
+let 
+  deployConfigScript = ''
+    config_script="$out"/lib/common-lisp-settings/${args.baseName}-shell-config.sh
+    mkdir -p "$(dirname "$config_script")"
+    touch "$config_script"
+    chmod a+x "$config_script"
+    echo "export NIX_LISP_COMMAND='$NIX_LISP_COMMAND'" >> "$config_script"
+    echo "export NIX_LISP_ASDF='$NIX_LISP_ASDF'" >> "$config_script"
+    echo "export CL_SOURCE_REGISTRY="\$CL_SOURCE_REGISTRY\''${CL_SOURCE_REGISTRY:+:}"'$CL_SOURCE_REGISTRY:$out/lib/common-lisp/${args.baseName}/'" >> "$config_script"
+  '';
+  deployLaunchScript = ''
+    launch_script="$out"/bin/${args.baseName}-lisp-launcher.sh
+    mkdir -p "$(dirname "$launch_script")"
+    touch "$launch_script"
+    chmod a+x "$launch_script"
+    echo "#! /bin/sh" >> "$launch_script"
+    echo "source '$config_script'" >> "$launch_script"
+    echo '"${clwrapper}/bin/common-lisp.sh" "$@"' >> "$launch_script" 
+  '';
+basePackage = {
+  name = "lisp-${baseName}-${version}";
+  inherit src;
+
+  inherit deployConfigScript deployLaunchScript;
+  installPhase = ''
+    mkdir -p "$out"/share/doc/${args.baseName};
+    mkdir -p "$out"/lib/common-lisp/${args.baseName};
+    cp -r . "$out"/lib/common-lisp/${args.baseName};
+    cp -rf doc/* LICENCE LICENSE COPYING README README.html README.md readme.html "$out"/share/doc/${args.baseName} || true
+
+    ${deployConfigScript}
+    ${deployLaunchScript}
+  '';
+  propagatedBuildInputs = args.deps ++ [clwrapper clwrapper.lisp];
+  buildInputs = buildInputs;
+  dontStrip=true;
+  meta = {
+    inherit description version;
+  } // meta;
+};
+package = basePackage // (overrides basePackage);
+in
+stdenv.mkDerivation package
diff --git a/pkgs/development/lisp-modules/lisp-packages.nix b/pkgs/development/lisp-modules/lisp-packages.nix
new file mode 100644
index 00000000000..e6270784b25
--- /dev/null
+++ b/pkgs/development/lisp-modules/lisp-packages.nix
@@ -0,0 +1,47 @@
+{stdenv, clwrapper, pkgs}:
+let lispPackages = rec {
+  inherit pkgs clwrapper stdenv;
+  nixLib = pkgs.lib;
+  callPackage = nixLib.callPackageWith lispPackages;
+
+  buildLispPackage =  callPackage ./define-package.nix;
+
+  cl-ppcre = buildLispPackage rec {
+    baseName = "cl-ppcre";
+    version = "2.0.4";
+    description = "Regular expression library for Common Lisp";
+    deps = [];
+    src = pkgs.fetchurl {
+      url = "https://github.com/edicl/cl-ppcre/archive/v${version}.tar.gz";
+      sha256 = "16nkfg6j7nn8qkzxn462kqpdlbajpz2p55pdl12sia6yqkj3lh97";
+    };
+  };
+
+  clx = buildLispPackage rec {
+    baseName = "clx";
+    version = "2013-09";
+    description = "X11 bindings for Common Lisp";
+    deps = [];
+    src = pkgs.fetchgit {
+      url = "https://github.com/sharplispers/clx/";
+      rev = "e2b762ac93d78d6eeca4f36698c8dfd1537ce998";
+      sha256 = "0jcrmlaayz7m8ixgriq7id3pdklyk785qvpcxdpcp4aqnfiiqhij";
+    };
+  };
+
+  iterate = buildLispPackage rec {
+    baseName = "iterate";
+    version = "1.4.3";
+    description = "Iteration package for Common Lisp";
+    deps = [];
+    src = pkgs.fetchdarcs {
+      url = "http://common-lisp.net/project/iterate/darcs/iterate";
+      sha256 = "0m3q0s7h5s8varwx584m2akgdslj14df7kg4w1bj1fbgzsag5m1w";
+      tag=version;
+    };
+    overrides = x: {
+      configurePhase="buildPhase(){ true; }";
+    };
+  };
+};
+in lispPackages
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d14d84ea2c1..b2e5b21b4de 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5883,6 +5883,12 @@ let
   asdf = callPackage ../development/lisp-modules/asdf {};
   clwrapperFunction = callPackage ../development/lisp-modules/clwrapper;
   wrapLisp = lisp: clwrapperFunction {lisp=lisp;};
+  lispPackagesFor = clwrapper: callPackage ../development/lisp-modules/lisp-packages.nix{
+    inherit clwrapper;
+  };
+  lispPackagesClisp = lispPackagesFor (wrapLisp clisp);
+  lispPackagesSBCL = lispPackagesFor (wrapLisp sbcl);
+  lispPackages = recurseIntoAttrs lispPackagesSBCL;
 
   ### DEVELOPMENT / PERL MODULES
 
-- 
GitLab


From 4129c4e7358d363575567f3d768cffcf732195d9 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Sun, 13 Oct 2013 10:58:48 +0400
Subject: [PATCH 5148/5331] Adding fresh StumpWM built via lisp-packages

---
 .../lisp-modules/lisp-packages.nix            |  2 ++
 .../lisp-modules/stumpwm/default.nix          | 33 +++++++++++++++++++
 2 files changed, 35 insertions(+)
 create mode 100644 pkgs/development/lisp-modules/stumpwm/default.nix

diff --git a/pkgs/development/lisp-modules/lisp-packages.nix b/pkgs/development/lisp-modules/lisp-packages.nix
index e6270784b25..8eaaf151fa7 100644
--- a/pkgs/development/lisp-modules/lisp-packages.nix
+++ b/pkgs/development/lisp-modules/lisp-packages.nix
@@ -43,5 +43,7 @@ let lispPackages = rec {
       configurePhase="buildPhase(){ true; }";
     };
   };
+
+  stumpwm = callPackage ./stumpwm {};
 };
 in lispPackages
diff --git a/pkgs/development/lisp-modules/stumpwm/default.nix b/pkgs/development/lisp-modules/stumpwm/default.nix
new file mode 100644
index 00000000000..f6ef41dda1d
--- /dev/null
+++ b/pkgs/development/lisp-modules/stumpwm/default.nix
@@ -0,0 +1,33 @@
+{pkgs, nixLib, clwrapper, cl-ppcre, clx, buildLispPackage}: 
+buildLispPackage rec {
+  baseName = "stumpwm";
+  version = "2013-09";
+  src = pkgs.fetchgit {
+    url = "https://github.com/sabetts/stumpwm";
+    sha256 = "0dd69myssfn2bsdx3xdp65mjrvs9x81dl3y3659pyf1avnjlir7h";
+    rev = "565ef58f04f59e1667ec1da4087f1a43a32cd67f";
+  };
+  description = "Tiling window manager for X11";
+  deps = [cl-ppcre clx];
+  buildInputs = with pkgs; [texinfo autoconf which makeWrapper];
+  meta = {
+    maintainers = [nixLib.maintainers.raskin];
+    platforms = nixLib.platforms.linux;
+  };
+  overrides = x: {
+    preConfigure = ''
+      ${x.deployConfigScript}
+      export CL_SOURCE_REGISTRY="$CL_SOURCE_REGISTRY:$PWD/"
+      ./autogen.sh 
+      configureFlags=" --with-lisp=$NIX_LISP --with-$NIX_LISP=$(which common-lisp.sh) "
+    '';
+    installPhase=x.installPhase + ''
+      make install 
+
+      if [ "$NIX_LISP" = "sbcl" ]; then
+        wrapProgram "$out"/bin/stumpwm --set SBCL_HOME "${clwrapper.lisp}/lib/sbcl"
+      fi;
+    '';
+    postInstall = ''false'';
+  };
+}
-- 
GitLab


From a1394551d2d95a7ab60dd4e1a7b25c95d55ca8d3 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Sun, 13 Oct 2013 11:00:18 +0400
Subject: [PATCH 5149/5331] Replacing StumpWM with a fresh lisp-packages
 version

---
 .../window-managers/stumpwm/default.nix       | 61 -------------------
 pkgs/top-level/all-packages.nix               |  5 +-
 2 files changed, 1 insertion(+), 65 deletions(-)
 delete mode 100644 pkgs/applications/window-managers/stumpwm/default.nix

diff --git a/pkgs/applications/window-managers/stumpwm/default.nix b/pkgs/applications/window-managers/stumpwm/default.nix
deleted file mode 100644
index 721adf41326..00000000000
--- a/pkgs/applications/window-managers/stumpwm/default.nix
+++ /dev/null
@@ -1,61 +0,0 @@
-args : 
-let 
-  lib = args.lib;
-  fetchurl = args.fetchurl;
-  noDepEntry = args.noDepEntry;
-  fullDepEntry = args.fullDepEntry;
-
-  buildInputs = lib.attrVals ["clisp" "texinfo"] args;
-  version = lib.attrByPath ["version"] "0.9.7" args; 
-
-  pkgName = "stumpwm";
-in
-rec {
-  src = fetchurl {
-    url = "mirror://savannah/stumpwm/${pkgName}-${version}.tgz";
-    sha256 = "a0793d22ef90731d34f84e51deafb4bc2095a357c70b9505dc57516f481cdf78";
-  };
-
-  inherit buildInputs;
-  configureFlags = ["--with-lisp=clisp"];
-  envVars = noDepEntry (''
-    export HOME="$NIX_BUILD_TOP";
-  '');
-
-  installation = fullDepEntry (''
-    mkdir -p $out/bin 
-    mkdir -p $out/share/stumpwm/doc
-    mkdir -p $out/share/info 
-    mkdir -p $out/share/stumpwm/lisp
-
-    cp stumpwm $out/bin
-    cp contrib/stumpish $out/bin || true
-    cp sample-stumpwmrc.lisp  $out/share/stumpwm/doc
-    cp stumpwm.info $out/share/info
-
-    cp -r {.,cl-ppcre}/*.{lisp,fas,lib,asd} contrib $out/share/stumpwm/lisp
-    cd $out/share/stumpwm/lisp
-    cat << EOF >init-stumpwm.lisp
-      (require "asdf") 
-      (asdf:operate 'asdf:load-op :cl-ppcre) 
-      (asdf:operate 'asdf:load-op :stumpwm)
-    EOF
-    clisp -K full -i init-stumpwm.lisp
-    cat << EOF >init-stumpwm.lisp
-      (require "asdf") 
-      (asdf:operate 'asdf:load-source-op :cl-ppcre) 
-      (asdf:operate 'asdf:load-source-op :stumpwm)
-    EOF
-    '') ["minInit" "defEnsureDir" "addInputs" "doMake"];
-
-  /* doConfigure should be specified separately */
-  phaseNames = ["envVars" "doConfigure" "doMake" "installation"];
-      
-  name = "${pkgName}-" + version;
-  meta = {
-    description = "Common Lisp-based ratpoison-like window manager";
-    maintainers = [args.lib.maintainers.raskin];
-    platforms = with args.lib.platforms;
-      linux ++ freebsd;
-  };
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b2e5b21b4de..0a8e5e038dc 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8648,10 +8648,7 @@ let
 
   stalonetray = callPackage ../applications/window-managers/stalonetray {};
 
-  stumpwm = builderDefsPackage (import ../applications/window-managers/stumpwm) {
-    inherit texinfo;
-    clisp = clisp_2_44_1;
-  };
+  stumpwm = lispPackages.stumpwm;
 
   sublime = callPackage ../applications/editors/sublime { };
 
-- 
GitLab


From a02e5a7fb25b456b7c284d5830dbea3a2b34e5d5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cillian=20de=20R=C3=B3iste?= <cillian.deroiste@gmail.com>
Date: Sun, 13 Oct 2013 12:04:38 +0200
Subject: [PATCH 5150/5331] Update python packages

---
 pkgs/top-level/python-packages-generated.nix | 48 ++++++++++----------
 1 file changed, 24 insertions(+), 24 deletions(-)

diff --git a/pkgs/top-level/python-packages-generated.nix b/pkgs/top-level/python-packages-generated.nix
index 5ed553224d2..e7308e2b816 100644
--- a/pkgs/top-level/python-packages-generated.nix
+++ b/pkgs/top-level/python-packages-generated.nix
@@ -2263,11 +2263,11 @@ in
   };
 
 
-  "cssselect-0.8" = self.buildPythonPackage {
-    name = "cssselect-0.8";
+  "cssselect-0.9" = self.buildPythonPackage {
+    name = "cssselect-0.9";
     src = fetchurl {
-        url = "https://pypi.python.org/packages/source/c/cssselect/cssselect-0.8.tar.gz";
-        md5 = "c4683e050351abcbbd5990b01f5344e2";
+        url = "https://pypi.python.org/packages/source/c/cssselect/cssselect-0.9.tar.gz";
+        md5 = "3aba1e431787da957a9cd1e2c2e0bf1c";
     };
     doCheck = false;
     buildInputs = [  ];
@@ -4036,7 +4036,7 @@ in
         md5 = "bf0a04fcf8b2cdcaa13b04324cefb53d";
     };
     doCheck = true;
-    buildInputs = [ self."nose-1.3.0" self."unittest2-0.5.1" self."pyquery-1.2.4" self."WSGIProxy2-0.3" self."PasteDeploy-1.5.0" self."mock-1.0.1" self."coverage-3.7" pkgs.unzip ];
+    buildInputs = [ self."nose-1.3.0" self."unittest2-0.5.1" self."pyquery-1.2.6" self."WSGIProxy2-0.3" self."PasteDeploy-1.5.0" self."mock-1.0.1" self."coverage-3.7" pkgs.unzip ];
     propagatedBuildInputs = [ self."beautifulsoup4-4.3.2" self."six-1.4.1" self."waitress-0.8.7" self."WebOb-1.2.3" ];
     installCommand = ''easy_install --always-unzip --prefix="$out" .'';
     meta = {
@@ -4409,42 +4409,42 @@ in
   };
 
 
-  "zope.event-3.5.2" = self.buildPythonPackage {
-    name = "zope.event-3.5.2";
+  "pyquery-1.2.6" = self.buildPythonPackage {
+    name = "pyquery-1.2.6";
     src = fetchurl {
-        url = "https://pypi.python.org/packages/source/z/zope.event/zope.event-3.5.2.tar.gz";
-        md5 = "6e8af2a16157a74885d4f0d88137cefb";
+        url = "https://pypi.python.org/packages/source/p/pyquery/pyquery-1.2.6.zip";
+        md5 = "af51aa835f24eef06175c48dc1218029";
     };
-    doCheck = false;
-    buildInputs = [  ];
-    propagatedBuildInputs = [ self.setuptools ];
+    doCheck = true;
+    buildInputs = [ pkgs.unzip ];
+    propagatedBuildInputs = [ self."cssselect-0.9" self."lxml-3.2.3" ];
     installCommand = ''easy_install --always-unzip --prefix="$out" .'';
     meta = {
       description = ''
-        Very basic event publishing system
+        A jquery-like library for python
         '';
-      homepage = "http://pypi.python.org/pypi/zope.event";
-      license = "ZPL 2.1";
+      homepage = "https://github.com/gawel/pyquery";
+      license = "BSD";
     };
   };
 
 
-  "pyquery-1.2.4" = self.buildPythonPackage {
-    name = "pyquery-1.2.4";
+  "zope.event-3.5.2" = self.buildPythonPackage {
+    name = "zope.event-3.5.2";
     src = fetchurl {
-        url = "https://pypi.python.org/packages/source/p/pyquery/pyquery-1.2.4.tar.gz";
-        md5 = "268f08258738d21bc1920d7522f2a63b";
+        url = "https://pypi.python.org/packages/source/z/zope.event/zope.event-3.5.2.tar.gz";
+        md5 = "6e8af2a16157a74885d4f0d88137cefb";
     };
-    doCheck = true;
+    doCheck = false;
     buildInputs = [  ];
-    propagatedBuildInputs = [ self."cssselect-0.8" self."lxml-3.2.3" ];
+    propagatedBuildInputs = [ self.setuptools ];
     installCommand = ''easy_install --always-unzip --prefix="$out" .'';
     meta = {
       description = ''
-        A jquery-like library for python
+        Very basic event publishing system
         '';
-      homepage = "https://github.com/gawel/pyquery";
-      license = "BSD";
+      homepage = "http://pypi.python.org/pypi/zope.event";
+      license = "ZPL 2.1";
     };
   };
 
-- 
GitLab


From 2be774ccfa90696e6e798928c5cf253de38e9e00 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 11 Oct 2013 14:05:34 +0200
Subject: [PATCH 5151/5331] Set .version-suffix properly when building from Git

---
 nixos/modules/installer/tools/nixos-rebuild.sh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/nixos/modules/installer/tools/nixos-rebuild.sh b/nixos/modules/installer/tools/nixos-rebuild.sh
index 8734cb273d4..0a199fb1542 100644
--- a/nixos/modules/installer/tools/nixos-rebuild.sh
+++ b/nixos/modules/installer/tools/nixos-rebuild.sh
@@ -157,10 +157,10 @@ fi
 
 # Update the version suffix if we're building from Git (so that
 # nixos-version shows something useful).
-if nixos=$(nix-instantiate --find-file nixos "${extraBuildFlags[@]}"); then
-    suffix=$(@shell@ $nixos/modules/installer/tools/get-version-suffix "${extraBuildFlags[@]}")
+if nixpkgs=$(nix-instantiate --find-file nixpkgs "${extraBuildFlags[@]}"); then
+    suffix=$(@shell@ $nixpkgs/nixos/modules/installer/tools/get-version-suffix "${extraBuildFlags[@]}")
     if [ -n "$suffix" ]; then
-        echo -n "$suffix" > "$nixos/.version-suffix" || true
+        echo -n "$suffix" > "$nixpkgs/.version-suffix" || true
     fi
 fi
 
-- 
GitLab


From f1a03addae88d985cbf9894377d429eab57c04bf Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 11 Oct 2013 14:05:53 +0200
Subject: [PATCH 5152/5331] nixos-rebuild: Let --help invoke "man
 nixos-rebuild"

---
 .../modules/installer/tools/nixos-rebuild.sh  | 39 +------------------
 1 file changed, 1 insertion(+), 38 deletions(-)

diff --git a/nixos/modules/installer/tools/nixos-rebuild.sh b/nixos/modules/installer/tools/nixos-rebuild.sh
index 0a199fb1542..6b747bc1a2b 100644
--- a/nixos/modules/installer/tools/nixos-rebuild.sh
+++ b/nixos/modules/installer/tools/nixos-rebuild.sh
@@ -1,44 +1,7 @@
 #! @shell@ -e
 
 showSyntax() {
-    # !!! more or less cut&paste from
-    # system/switch-to-configuration.sh (which we call, of course).
-    cat <<EOF
-Usage: $0 [OPTIONS...] OPERATION
-
-The operation is one of the following:
-
-  switch:   make the configuration the boot default and activate now
-  boot:     make the configuration the boot default
-  test:     activate the configuration, but don't make it the boot default
-  build:    build the configuration, but don't make it the default or
-            activate it
-  build-vm: build a virtual machine containing the configuration
-            (useful for testing)
-  build-vm-with-bootloader:
-            like build-vm, but include a boot loader in the VM
-  dry-run:  just show what store paths would be built/downloaded
-
-Options:
-
-  --upgrade              fetch the latest version of NixOS before rebuilding
-  --install-grub         (re-)install the Grub bootloader
-  --no-build-nix         don't build the latest Nix from Nixpkgs before
-                           building NixOS
-  --rollback             restore the previous NixOS configuration (only
-                           with switch, boot, test, build)
-  --profile-name / -p    install in the specified system profile
-  --fast                 same as --no-build-nix --show-trace
-
-Various nix-build options are also accepted, in particular:
-
-  --show-trace           show a detailed stack trace for evaluation errors
-
-Environment variables affecting nixos-rebuild:
-
-  \$NIX_PATH              Nix expression search path
-  \$NIXOS_CONFIG          path to the NixOS system configuration specification
-EOF
+    exec man nixos-rebuild
     exit 1
 }
 
-- 
GitLab


From a042d9129008d0a929d2541e70b5553d9dad2588 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 11 Oct 2013 14:07:53 +0200
Subject: [PATCH 5153/5331] nixos-rebuild: Document --profile-name

---
 nixos/doc/manual/man-nixos-rebuild.xml | 37 +++++++++++++++++++++++++-
 1 file changed, 36 insertions(+), 1 deletion(-)

diff --git a/nixos/doc/manual/man-nixos-rebuild.xml b/nixos/doc/manual/man-nixos-rebuild.xml
index e43dafd3cfe..e08153c723d 100644
--- a/nixos/doc/manual/man-nixos-rebuild.xml
+++ b/nixos/doc/manual/man-nixos-rebuild.xml
@@ -33,6 +33,14 @@
     <arg><option>--fast</option></arg>
     <arg><option>--rollback</option></arg>
     <sbr />
+    <arg>
+      <group choice='req'>
+        <arg choice='plain'><option>--profile-name</option></arg>
+        <arg choice='plain'><option>-p</option></arg>
+      </group>
+      <replaceable>name</replaceable>
+    </arg>
+    <sbr />
     <arg><option>--show-trace</option></arg>
   </cmdsynopsis>
 </refsynopsisdiv>
@@ -229,7 +237,34 @@ $ ./result/bin/run-*-vm
       <filename>/etc/nixos/configuration.nix</filename>, roll back to
       the previous configuration.  (The previous configuration is
       defined as the one before the “current” generation of the
-      profile <filename>/nix/var/nix/profiles/system</filename>.)</para>
+      Nix profile <filename>/nix/var/nix/profiles/system</filename>.)</para>
+    </listitem>
+  </varlistentry>
+
+  <varlistentry>
+    <term><option>--profile-name</option></term>
+    <term><option>-p</option></term>
+    <listitem>
+      <para>Instead of using the Nix profile
+      <filename>/nix/var/nix/profiles/system</filename> to keep track
+      of the current and previous system configurations, use
+      <filename>/nix/var/nix/profiles/system-profiles/<replaceable>name</replaceable></filename>.
+      When you use GRUB 2, for every system profile created with this
+      flag, NixOS will create a submenu named “NixOS - Profile
+      '<replaceable>name</replaceable>'” in GRUB’s boot menu,
+      containing the current and previous configurations of this
+      profile.</para>
+
+      <para>For instance, if you want to test a configuration file
+      named <filename>test.nix</filename> without affecting the
+      default system profile, you would do:
+
+<screen>
+$ nixos-rebuild switch -p test -I nixos-config=./test.nix
+</screen>
+
+      The new configuration will appear in the GRUB 2 submenu “NixOS - Profile
+      'test'”.</para>
     </listitem>
   </varlistentry>
 
-- 
GitLab


From ef72fcc2aa099fad9020c2bb95118e8eea2e9153 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 11 Oct 2013 14:12:36 +0200
Subject: [PATCH 5154/5331] Map --help flag to "man <command>" for more NixOS
 commands

---
 .../tools/nixos-build-vms/nixos-build-vms.sh  | 11 ++-----
 .../modules/installer/tools/nixos-install.sh  | 22 +++++++------
 nixos/modules/installer/tools/nixos-option.sh | 32 ++-----------------
 3 files changed, 18 insertions(+), 47 deletions(-)

diff --git a/nixos/modules/installer/tools/nixos-build-vms/nixos-build-vms.sh b/nixos/modules/installer/tools/nixos-build-vms/nixos-build-vms.sh
index 0a6e8b920a1..f9cbfffde70 100644
--- a/nixos/modules/installer/tools/nixos-build-vms/nixos-build-vms.sh
+++ b/nixos/modules/installer/tools/nixos-build-vms/nixos-build-vms.sh
@@ -2,14 +2,9 @@
 
 # Shows the usage of this command to the user
 
-showUsage()
-{
-    echo "Usage: $0 network_expr"
-    echo "Options:"
-    echo
-    echo "--no-out-link   Do not create a 'result' symlink"
-    echo "--show-trace    Shows the output trace"
-    echo "-h,--help       Shows the usage of this command"
+showUsage() {
+    exec man nixos-build-vms
+    exit 1
 }
 
 # Parse valid argument options
diff --git a/nixos/modules/installer/tools/nixos-install.sh b/nixos/modules/installer/tools/nixos-install.sh
index 19ce81983f1..126d5b185e8 100644
--- a/nixos/modules/installer/tools/nixos-install.sh
+++ b/nixos/modules/installer/tools/nixos-install.sh
@@ -14,15 +14,19 @@ extraBuildFlags=()
 while [ "$#" -gt 0 ]; do
     i="$1"; shift 1
     case "$i" in
-      -I)
-        given_path="$1"; shift 1
-        absolute_path=$(readlink -m $given_path)
-        extraBuildFlags+=("$i" "/mnt$absolute_path")
-        ;;
-      *)
-        echo "$0: unknown option \`$i'"
-        exit 1
-        ;;
+        -I)
+            given_path="$1"; shift 1
+            absolute_path=$(readlink -m $given_path)
+            extraBuildFlags+=("$i" "/mnt$absolute_path")
+            ;;
+        --help)
+            exec man nixos-install
+            exit 1
+            ;;
+        *)
+            echo "$0: unknown option \`$i'"
+            exit 1
+            ;;
     esac
 done
 
diff --git a/nixos/modules/installer/tools/nixos-option.sh b/nixos/modules/installer/tools/nixos-option.sh
index 7f008d62c24..45499988f26 100644
--- a/nixos/modules/installer/tools/nixos-option.sh
+++ b/nixos/modules/installer/tools/nixos-option.sh
@@ -8,36 +8,8 @@
 export NIXOS_CONFIG
 
 usage () {
-  echo 1>&2 "
-Usage: $0 [-v] [-d] [-l] [--xml] OPTION_NAME
-       $0 --install
-
-This program allows you to inspect the current value of NixOS
-configuration options.  It can also generate a basic NixOS
-configuration file.
-
-Options:
-
-  -i | --install        Write a template NixOS configuration file to
-                        ${mountPoint:+$mountPoint/}$NIXOS_CONFIG.
-  -v | --value          Display the current value, based on your
-                        configuration.
-  -d | --description    Display the default value, the example and the
-                        description.
-  -l | --lookup         Display where the option is defined and where it
-                        is declared.
-  --xml                 Print an XML representation of the result.
-                        Implies -vdl options.
-  --help                Show this message.
-
-Environment variables affecting $0:
-
-  \$mountPoint          Path to the target file system.
-  \$NIXOS_CONFIG        Path to your configuration file.
-
-"
-
-  exit 1;
+    exec man nixos-rebuild
+    exit 1
 }
 
 #####################
-- 
GitLab


From 57ec8424e469bc80614fa472c27bc0b278b905c3 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 11 Oct 2013 14:13:40 +0200
Subject: [PATCH 5155/5331] Drop <services> from $NIX_PATH

---
 nixos/modules/programs/environment.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/nixos/modules/programs/environment.nix b/nixos/modules/programs/environment.nix
index 683f6b54b10..7c1922cdfd8 100644
--- a/nixos/modules/programs/environment.nix
+++ b/nixos/modules/programs/environment.nix
@@ -24,7 +24,6 @@ in
           [ "/nix/var/nix/profiles/per-user/root/channels/nixos"
             "nixpkgs=/etc/nixos/nixpkgs"
             "nixos-config=/etc/nixos/configuration.nix"
-            "services=/etc/nixos/services"
           ];
         PAGER = "less -R";
         EDITOR = "nano";
-- 
GitLab


From f42d494355dd71200ac62cba3b4e2a9f95af3be6 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 11 Oct 2013 14:17:59 +0200
Subject: [PATCH 5156/5331] Refactor variable names

---
 nixos/doc/manual/development.xml        |  2 +-
 nixos/modules/installer/tools/tools.nix | 32 ++++++++++++-------------
 2 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/nixos/doc/manual/development.xml b/nixos/doc/manual/development.xml
index d8b5f6f571c..7b4e6df5f87 100644
--- a/nixos/doc/manual/development.xml
+++ b/nixos/doc/manual/development.xml
@@ -414,7 +414,7 @@ properly:
 
 <screen>
 $ export NIXOS_CONFIG=/etc/nixos/nixos/modules/installer/cd-dvd/installation-cd-minimal.nix
-$ nix-build /etc/nixos/nixos -A config.system.build.nixosInstall
+$ nix-build /etc/nixos/nixos -A config.system.build.nixos-install
 $ dd if=/dev/zero of=diskimage seek=2G count=0 bs=1
 $ yes | mke2fs -j diskimage
 $ mount -o loop diskimage /mnt
diff --git a/nixos/modules/installer/tools/tools.nix b/nixos/modules/installer/tools/tools.nix
index c761d74a890..1c1b109c147 100644
--- a/nixos/modules/installer/tools/tools.nix
+++ b/nixos/modules/installer/tools/tools.nix
@@ -4,7 +4,7 @@
 { config, pkgs, modulesPath, ... }:
 
 let
-  ### implementation
+
   cfg = config.installer;
 
   makeProg = args: pkgs.substituteAll (args // {
@@ -12,12 +12,12 @@ let
     isExecutable = true;
   });
 
-  nixosBuildVMS = makeProg {
+  nixos-build-vms = makeProg {
     name = "nixos-build-vms";
     src = ./nixos-build-vms/nixos-build-vms.sh;
   };
 
-  nixosInstall = makeProg {
+  nixos-install = makeProg {
     name = "nixos-install";
     src = ./nixos-install.sh;
 
@@ -29,7 +29,7 @@ let
       "cp refs $out";
   };
 
-  nixosRebuild = makeProg {
+  nixos-rebuild = makeProg {
     name = "nixos-rebuild";
     src = ./nixos-rebuild.sh;
   };
@@ -41,24 +41,24 @@ let
   };
   */
 
-  nixosHardwareScan = makeProg {
+  nixos-hardware-scan = makeProg {
     name = "nixos-hardware-scan";
     src = ./nixos-hardware-scan.pl;
     inherit (pkgs) perl dmidecode;
   };
 
-  nixosOption = makeProg {
+  nixos-option = makeProg {
     name = "nixos-option";
     src = ./nixos-option.sh;
   };
 
-  nixosVersion = makeProg {
+  nixos-version = makeProg {
     name = "nixos-version";
     src = ./nixos-version.sh;
     inherit (config.system) nixosVersion nixosCodeName;
   };
 
-  nixosGui = pkgs.xulrunnerWrapper {
+  nixos-gui = pkgs.xulrunnerWrapper {
     launcher = "nixos-gui";
     application = pkgs.stdenv.mkDerivation {
       name = "nixos-gui";
@@ -96,17 +96,17 @@ in
 
   config = {
     environment.systemPackages =
-      [ nixosBuildVMS
-        nixosInstall
-        nixosRebuild
-        nixosHardwareScan
+      [ nixos-build-vms
+        nixos-install
+        nixos-rebuild
+        nixos-hardware-scan
         #nixosGenSeccureKeys
-        nixosOption
-        nixosVersion
-      ] ++ pkgs.lib.optional cfg.enableGraphicalTools nixosGui;
+        nixos-option
+        nixos-version
+      ] ++ pkgs.lib.optional cfg.enableGraphicalTools nixos-gui;
 
     system.build = {
-      inherit nixosInstall nixosHardwareScan nixosOption;
+      inherit nixos-install nixos-hardware-scan nixos-option;
     };
   };
 }
-- 
GitLab


From 4b28f2802868d73cae81be54bdfa9fb4ac362b05 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 11 Oct 2013 14:18:53 +0200
Subject: [PATCH 5157/5331] Remove unused file

---
 .../installer/tools/nixos-gen-seccure-keys.sh       | 13 -------------
 nixos/modules/installer/tools/tools.nix             |  7 -------
 2 files changed, 20 deletions(-)
 delete mode 100644 nixos/modules/installer/tools/nixos-gen-seccure-keys.sh

diff --git a/nixos/modules/installer/tools/nixos-gen-seccure-keys.sh b/nixos/modules/installer/tools/nixos-gen-seccure-keys.sh
deleted file mode 100644
index a97eef672f7..00000000000
--- a/nixos/modules/installer/tools/nixos-gen-seccure-keys.sh
+++ /dev/null
@@ -1,13 +0,0 @@
-#! @shell@ -e
-
-mkdir -p /var/elliptic-keys
-chmod 0755 /var/elliptic-keys
-cd /var/elliptic-keys
-touch private
-chmod 0700 private
-dd if=/dev/urandom bs=128 count=1 of=private
-chmod 0500 private
-public=$(seccure-key -F private 2>&1)
-echo ${public#*The public key is: } > public
-chmod 0555 public
-
diff --git a/nixos/modules/installer/tools/tools.nix b/nixos/modules/installer/tools/tools.nix
index 1c1b109c147..0799aadf949 100644
--- a/nixos/modules/installer/tools/tools.nix
+++ b/nixos/modules/installer/tools/tools.nix
@@ -34,13 +34,6 @@ let
     src = ./nixos-rebuild.sh;
   };
 
-  /*
-  nixosGenSeccureKeys = makeProg {
-    name = "nixos-gen-seccure-keys";
-    src = ./nixos-gen-seccure-keys.sh;
-  };
-  */
-
   nixos-hardware-scan = makeProg {
     name = "nixos-hardware-scan";
     src = ./nixos-hardware-scan.pl;
-- 
GitLab


From 3ed41735b84c44d30435b5a828b428419571d42e Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 11 Oct 2013 14:22:22 +0200
Subject: [PATCH 5158/5331] Rename nixos-hardware-scan to nixos-generate-config

---
 ...ixos-hardware-scan.pl => nixos-generate-config.pl} |  0
 nixos/modules/installer/tools/tools.nix               | 11 +++++------
 2 files changed, 5 insertions(+), 6 deletions(-)
 rename nixos/modules/installer/tools/{nixos-hardware-scan.pl => nixos-generate-config.pl} (100%)

diff --git a/nixos/modules/installer/tools/nixos-hardware-scan.pl b/nixos/modules/installer/tools/nixos-generate-config.pl
similarity index 100%
rename from nixos/modules/installer/tools/nixos-hardware-scan.pl
rename to nixos/modules/installer/tools/nixos-generate-config.pl
diff --git a/nixos/modules/installer/tools/tools.nix b/nixos/modules/installer/tools/tools.nix
index 0799aadf949..dd680f0f6fc 100644
--- a/nixos/modules/installer/tools/tools.nix
+++ b/nixos/modules/installer/tools/tools.nix
@@ -34,9 +34,9 @@ let
     src = ./nixos-rebuild.sh;
   };
 
-  nixos-hardware-scan = makeProg {
-    name = "nixos-hardware-scan";
-    src = ./nixos-hardware-scan.pl;
+  nixos-generate-config = makeProg {
+    name = "nixos-generate-config";
+    src = ./nixos-generate-config.pl;
     inherit (pkgs) perl dmidecode;
   };
 
@@ -92,14 +92,13 @@ in
       [ nixos-build-vms
         nixos-install
         nixos-rebuild
-        nixos-hardware-scan
-        #nixosGenSeccureKeys
+        nixos-generate-config
         nixos-option
         nixos-version
       ] ++ pkgs.lib.optional cfg.enableGraphicalTools nixos-gui;
 
     system.build = {
-      inherit nixos-install nixos-hardware-scan nixos-option;
+      inherit nixos-install nixos-generate-config nixos-option;
     };
   };
 }
-- 
GitLab


From fd0fd49d36bc713b3783686a4a41f4680f874c4d Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 11 Oct 2013 14:44:32 +0200
Subject: [PATCH 5159/5331] nixos-generate-config: Write to
 /etc/nixos/hardware.nix rather than stdout

---
 .../installer/tools/nixos-generate-config.pl  | 44 +++++++++++++++----
 nixos/modules/installer/tools/tools.nix       |  5 ++-
 2 files changed, 38 insertions(+), 11 deletions(-)

diff --git a/nixos/modules/installer/tools/nixos-generate-config.pl b/nixos/modules/installer/tools/nixos-generate-config.pl
index 3204f3d4051..58508560b8e 100644
--- a/nixos/modules/installer/tools/nixos-generate-config.pl
+++ b/nixos/modules/installer/tools/nixos-generate-config.pl
@@ -1,7 +1,28 @@
-#! @perl@/bin/perl -w
+#! @perl@
 
 use File::Spec;
+use File::Path;
 use File::Basename;
+use File::Slurp;
+
+
+# Process the command line.
+my $outDir = "/etc/nixos";
+
+for (my $n = 0; $n < scalar @ARGV; $n++) {
+    my $arg = $ARGV[$n];
+    if ($arg eq "--help") {
+        exec "man nixos-generate-config" or die;
+    }
+    elsif ($arg eq "--dir") {
+        $n++;
+        $outDir = $ARGV[$n];
+        die "$0: ‘--dir’ requires an argument\n" unless defined $outDir;
+    }
+    else {
+        die "$0: unrecognized argument ‘$arg’\n";
+    }
+}
 
 
 my @attrs = ();
@@ -62,13 +83,13 @@ sub pciCheck {
     my $vendor = readFile "$path/vendor";
     my $device = readFile "$path/device";
     my $class = readFile "$path/class";
-    
+
     my $module;
     if (-e "$path/driver/module") {
         $module = basename `readlink -f $path/driver/module`;
         chomp $module;
     }
-    
+
     debug "$path: $vendor $device $class";
     debug " $module" if defined $module;
     debug "\n";
@@ -140,11 +161,11 @@ sub usbCheck {
         $module = basename `readlink -f $path/driver/module`;
         chomp $module;
     }
-    
+
     debug "$path: $class $subclass $protocol";
     debug " $module" if defined $module;
     debug "\n";
- 
+
     if (defined $module) {
         if (# Mass-storage controller.  Definitely important.
             $class eq "08" ||
@@ -191,7 +212,7 @@ if ($dmi =~ /Manufacturer: innotek/) {
 }
 
 
-# Generate the configuration file.
+# Generate the hardware configuration file.
 
 sub removeDups {
     my %seen;
@@ -229,10 +250,14 @@ my $modulePackages = toNixExpr(removeDups @modulePackages);
 my $attrs = multiLineList("  ", removeDups @attrs);
 my $imports = multiLineList("    ", removeDups @imports);
 
+my $fn = "$outDir/hardware.nix";
+print STDERR "writing $fn...\n";
+mkpath($outDir, 0, 0755);
 
-print <<EOF ;
-# This is a generated file.  Do not modify!
-# Make changes to /etc/nixos/configuration.nix instead.
+write_file($fn, <<EOF);
+# Do not modify this file!  It was generated by ‘nixos-generate-config’
+# and may be overwritten by future invocations.  Please make changes
+# to /etc/nixos/configuration.nix instead.
 { config, pkgs, ... }:
 
 {
@@ -245,4 +270,5 @@ print <<EOF ;
   nix.maxJobs = $cpus;
 $attrs}
 EOF
+
 # workaround for a bug in substituteAll
diff --git a/nixos/modules/installer/tools/tools.nix b/nixos/modules/installer/tools/tools.nix
index dd680f0f6fc..074c77b5146 100644
--- a/nixos/modules/installer/tools/tools.nix
+++ b/nixos/modules/installer/tools/tools.nix
@@ -1,5 +1,5 @@
 # This module generates nixos-install, nixos-rebuild,
-# nixos-hardware-scan, etc.
+# nixos-generate-config, etc.
 
 { config, pkgs, modulesPath, ... }:
 
@@ -37,7 +37,8 @@ let
   nixos-generate-config = makeProg {
     name = "nixos-generate-config";
     src = ./nixos-generate-config.pl;
-    inherit (pkgs) perl dmidecode;
+    perl = "${pkgs.perl}/bin/perl -I${pkgs.perlPackages.FileSlurp}/lib/perl5/site_perl";
+    inherit (pkgs) dmidecode;
   };
 
   nixos-option = makeProg {
-- 
GitLab


From 0f550596c9d4bfc207fc7ec100e6e1165ac746a0 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 11 Oct 2013 15:35:33 +0200
Subject: [PATCH 5160/5331] Typo

---
 nixos/doc/manual/configuration.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/doc/manual/configuration.xml b/nixos/doc/manual/configuration.xml
index 965ba73105a..e93c49d1cce 100644
--- a/nixos/doc/manual/configuration.xml
+++ b/nixos/doc/manual/configuration.xml
@@ -592,7 +592,7 @@ users.extraUsers.alice.openssh.authorizedKeys.keys =
 <section><title>IPv4 configuration</title>
 
 <para>By default, NixOS uses DHCP (specifically,
-(<command>dhcpcd</command>)) to automatically configure network
+<command>dhcpcd</command>) to automatically configure network
 interfaces.  However, you can configure an interface manually as
 follows:
 
-- 
GitLab


From ac13bd2575843d0bc3f0eeb88600d1bb039cd5ba Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 11 Oct 2013 15:35:41 +0200
Subject: [PATCH 5161/5331] Merge "nixos-option --install" into
 nixos-generate-config

Having configuration.nix generation hidden underneath nixos-option
never made sense, also given that there was another command to
generate part of the configuration (nixos-hardware-scan).  Now
nixos-generate-config produces both configuration.nix and
hardware-configuration.nix.  The latter is overwritten while the
former is not.
---
 nixos/doc/manual/man-nixos-option.xml         |  40 +----
 .../installer/tools/nixos-generate-config.pl  |  98 ++++++++++++-
 nixos/modules/installer/tools/nixos-option.sh | 138 +-----------------
 3 files changed, 102 insertions(+), 174 deletions(-)

diff --git a/nixos/doc/manual/man-nixos-option.xml b/nixos/doc/manual/man-nixos-option.xml
index f7a8ce403dc..bd180363e70 100644
--- a/nixos/doc/manual/man-nixos-option.xml
+++ b/nixos/doc/manual/man-nixos-option.xml
@@ -18,17 +18,12 @@
   <cmdsynopsis>
     <command>nixos-option</command>
     <group choice="opt">
-      <option>-i</option>
-      <option>v</option>
-      <option>d</option>
-      <option>l</option>
+      <option>-v</option>
+      <option>-d</option>
+      <option>-l</option>
     </group>
     <arg choice='plain'><replaceable>option.name</replaceable></arg>
   </cmdsynopsis>
-  <cmdsynopsis>
-    <command>nixos-option</command>
-    <arg choice='plain'><option>--install</option></arg>
-  </cmdsynopsis>
 </refsynopsisdiv>
 
 
@@ -40,16 +35,7 @@ of the option name given as argument.  By default, it returns the value of
 the option.</para>
 
 <para>When the option name is not an option, the command prints the list of
-attributes in contained in the attribute set.  This could used to provide
-completion in some editors.</para>
-
-<para>When the option <option>--install</option> (or <option>-i</option>) is
-used with no option name, this command generates a template configuration
-with a scan of the target system.  It produces a template configuration
-in <filename>/etc/nixos/configuration.nix</filename>, and a scan of the
-machine in <filename>/etc/nixos/hardware-configuration.nix</filename>.  The
-scan of the machine is produced
-by <command>nixos-hardware-scan</command>.</para>
+attributes contained in the attribute set.</para>
 
 </refsection>
 
@@ -59,15 +45,6 @@ by <command>nixos-hardware-scan</command>.</para>
 
 <variablelist>
 
-  <varlistentry>
-    <term><option>--install</option>, <option>-i</option></term>
-    <listitem>
-      <para>Use the installation configuration instead of current system
-      configuration.  Generate a template configuration if no option name is
-      specified.</para>
-    </listitem>
-  </varlistentry>
-
   <varlistentry>
     <term><option>--value</option>, <option>-v</option></term>
     <listitem>
@@ -102,15 +79,6 @@ by <command>nixos-hardware-scan</command>.</para>
 
 <variablelist>
 
-  <varlistentry>
-    <term><envar>mountPoint</envar></term>
-    <listitem>
-      <para>Location of the target file system.  Defaults to
-      <filename>/mnt</filename>.  This environment variable is only used in
-      combinaison with <option>--install</option> option.</para>
-    </listitem>
-  </varlistentry>
-
   <varlistentry>
     <term><envar>NIXOS_CONFIG</envar></term>
     <listitem>
diff --git a/nixos/modules/installer/tools/nixos-generate-config.pl b/nixos/modules/installer/tools/nixos-generate-config.pl
index 58508560b8e..e6d8eda016d 100644
--- a/nixos/modules/installer/tools/nixos-generate-config.pl
+++ b/nixos/modules/installer/tools/nixos-generate-config.pl
@@ -250,7 +250,7 @@ my $modulePackages = toNixExpr(removeDups @modulePackages);
 my $attrs = multiLineList("  ", removeDups @attrs);
 my $imports = multiLineList("    ", removeDups @imports);
 
-my $fn = "$outDir/hardware.nix";
+my $fn = "$outDir/hardware-configuration.nix";
 print STDERR "writing $fn...\n";
 mkpath($outDir, 0, 0755);
 
@@ -271,4 +271,100 @@ write_file($fn, <<EOF);
 $attrs}
 EOF
 
+# Generate a basic configuration.nix, unless one already exists.
+$fn = "$outDir/configuration.nix";
+if (! -e $fn) {
+    print STDERR "writing $fn...\n";
+
+    my $bootloaderConfig;
+    if (-e "/sys/firmware/efi/efivars") {
+        $bootLoaderConfig = <<EOF;
+  # Use the gummiboot efi boot loader.
+  boot.loader.grub.enable = false;
+  boot.loader.gummiboot.enable = true;
+  boot.loader.efi.canTouchEfiVariables = true;
+  # !!! Remove me when nixos is on 3.10 or greater by default
+  # EFI booting requires kernel >= 3.10
+  boot.kernelPackages = pkgs.linuxPackages_3_10;
+EOF
+    } else {
+        $bootLoaderConfig = <<EOF;
+  # Use the GRUB 2 boot loader.
+  boot.loader.grub.enable = true;
+  boot.loader.grub.version = 2;
+  # Define on which hard drive you want to install Grub.
+  # boot.loader.grub.device = "/dev/sda";
+EOF
+    }
+
+    write_file($fn, <<EOF);
+# Edit this configuration file to define what should be installed on
+# your system.  Help is available in the configuration.nix(5) man page
+# and in the NixOS manual (accessible by running ‘nixos-help’).
+
+{ config, pkgs, ... }:
+
+{
+  imports =
+    [ # Include the results of the hardware scan.
+      ./hardware-configuration.nix
+    ];
+
+  boot.initrd.kernelModules =
+    [ # Specify all kernel modules that are necessary for mounting the root
+      # filesystem.
+      # "xfs" "ata_piix"
+      # fbcon # Uncomment this when EFI booting to see the console before the root partition is mounted
+    ];
+
+$bootLoaderConfig
+  # networking.hostName = "nixos"; # Define your hostname.
+  # networking.wireless.enable = true;  # Enables wireless.
+
+  # Add filesystem entries for each partition that you want to see
+  # mounted at boot time.  This should include at least the root
+  # filesystem.
+
+  # fileSystems."/".device = "/dev/disk/by-label/nixos";
+
+  # fileSystems."/data" =     # where you want to mount the device
+  #   { device = "/dev/sdb";  # the device
+  #     fsType = "ext3";      # the type of the partition
+  #     options = "data=journal";
+  #   };
+
+  # List swap partitions activated at boot time.
+  swapDevices =
+    [ # { device = "/dev/disk/by-label/swap"; }
+    ];
+
+  # Select internationalisation properties.
+  # i18n = {
+  #   consoleFont = "lat9w-16";
+  #   consoleKeyMap = "us";
+  #   defaultLocale = "en_US.UTF-8";
+  # };
+
+  # List services that you want to enable:
+
+  # Enable the OpenSSH daemon.
+  # services.openssh.enable = true;
+
+  # Enable CUPS to print documents.
+  # services.printing.enable = true;
+
+  # Enable the X11 windowing system.
+  # services.xserver.enable = true;
+  # services.xserver.layout = "us";
+  # services.xserver.xkbOptions = "eurosign:e";
+
+  # Enable the KDE Desktop Environment.
+  # services.xserver.displayManager.kdm.enable = true;
+  # services.xserver.desktopManager.kde4.enable = true;
+}
+EOF
+} else {
+    print STDERR "warning: not overwriting existing $fn\n";
+}
+
 # workaround for a bug in substituteAll
diff --git a/nixos/modules/installer/tools/nixos-option.sh b/nixos/modules/installer/tools/nixos-option.sh
index 45499988f26..69dd513f95c 100644
--- a/nixos/modules/installer/tools/nixos-option.sh
+++ b/nixos/modules/installer/tools/nixos-option.sh
@@ -1,14 +1,7 @@
 #! @shell@ -e
 
-# Allow the location of NixOS sources and the system configuration
-# file to be overridden.
-
-: ${mountPoint=/mnt}
-: ${NIXOS_CONFIG=/etc/nixos/configuration.nix}
-export NIXOS_CONFIG
-
 usage () {
-    exec man nixos-rebuild
+    exec man nixos-option
     exit 1
 }
 
@@ -20,7 +13,6 @@ desc=false
 defs=false
 value=false
 xml=false
-install=false
 verbose=false
 
 option=""
@@ -38,7 +30,6 @@ for arg; do
             -d*) longarg="$longarg --description";;
             -v*) longarg="$longarg --value";;
             -l*) longarg="$longarg --lookup";;
-            -i*) longarg="$longarg --install";;
             -*) usage;;
           esac
           # remove the first letter option
@@ -53,7 +44,6 @@ for arg; do
         --value) value=true;;
         --lookup) defs=true;;
         --xml) xml=true;;
-        --install) install=true;;
         --verbose) verbose=true;;
         --help) usage;;
         -*) usage;;
@@ -81,16 +71,6 @@ if $xml; then
   defs=true
 fi
 
-# --install cannot be used with -d -v -l without option name.
-if $value || $desc || $defs && $install && test -z "$option"; then
-  usage
-fi
-
-generate=false
-if ! $defs && ! $desc && ! $value && $install && test -z "$option"; then
-  generate=true
-fi
-
 if ! $defs && ! $desc; then
   value=true
 fi
@@ -154,122 +134,6 @@ nixMap() {
   done
 }
 
-if $install; then
-  NIXOS_CONFIG="$mountPoint$NIXOS_CONFIG"
-fi
-
-if $generate; then
-  mkdir -p $(dirname "$NIXOS_CONFIG")
-
-  # Scan the hardware and add the result to /etc/nixos/hardware-scan.nix.
-  hardware_config="${NIXOS_CONFIG%/configuration.nix}/hardware-configuration.nix"
-  if test -e "$hardware_config"; then
-    echo "A hardware configuration file exists, generation skipped."
-  else
-    echo "Generating a hardware configuration file in $hardware_config..."
-    nixos-hardware-scan > "$hardware_config"
-  fi
-
-  if test -e "$NIXOS_CONFIG"; then
-    echo 1>&2 "error: Cannot generate a template configuration because a configuration file exists."
-    exit 1
-  fi
-
-  nl="
-"
-  if test -e /sys/firmware/efi/efivars; then
-    l1="  # Use the gummiboot efi boot loader."
-    l2="  boot.loader.grub.enable = false;"
-    l3="  boot.loader.gummiboot.enable = true;"
-    l4="  boot.loader.efi.canTouchEfiVariables = true;"
-    # !!! Remove me when nixos is on 3.10 or greater by default
-    l5="  # EFI booting requires kernel >= 3.10"
-    l6="  boot.kernelPackages = pkgs.linuxPackages_3_10;"
-    bootloader_config="$l1$nl$l2$nl$l3$nl$l4$nl$nl$l5$nl$l6"
-  else
-    l1="  # Use the Grub2 boot loader."
-    l2="  boot.loader.grub.enable = true;"
-    l3="  boot.loader.grub.version = 2;"
-    l4="  # Define on which hard drive you want to install Grub."
-    l5='  # boot.loader.grub.device = "/dev/sda";'
-    bootloader_config="$l1$nl$l2$nl$l3$nl$nl$l4$nl$l5"
-  fi
-
-  echo "Generating a basic configuration file in $NIXOS_CONFIG..."
-
-  # Generate a template configuration file where the user has to
-  # fill the gaps.
-  cat <<EOF > "$NIXOS_CONFIG"
-# Edit this configuration file to define what should be installed on
-# the system.  Help is available in the configuration.nix(5) man page
-# or the NixOS manual available on virtual console 8 (Alt+F8).
-
-{ config, pkgs, ... }:
-
-{
-  imports =
-    [ # Include the results of the hardware scan.
-      ./hardware-configuration.nix
-    ];
-
-  boot.initrd.kernelModules =
-    [ # Specify all kernel modules that are necessary for mounting the root
-      # filesystem.
-      # "xfs" "ata_piix"
-      # fbcon # Uncomment this when EFI booting to see the console before the root partition is mounted
-    ];
-    
-$bootloader_config
-
-  # networking.hostName = "nixos"; # Define your hostname.
-  # networking.wireless.enable = true;  # Enables Wireless.
-
-  # Add filesystem entries for each partition that you want to see
-  # mounted at boot time.  This should include at least the root
-  # filesystem.
-
-  # fileSystems."/".device = "/dev/disk/by-label/nixos";
-
-  # fileSystems."/data" =     # where you want to mount the device
-  #   { device = "/dev/sdb";  # the device
-  #     fsType = "ext3";      # the type of the partition
-  #     options = "data=journal";
-  #   };
-
-  # List swap partitions activated at boot time.
-  swapDevices =
-    [ # { device = "/dev/disk/by-label/swap"; }
-    ];
-
-  # Select internationalisation properties.
-  # i18n = {
-  #   consoleFont = "lat9w-16";
-  #   consoleKeyMap = "us";
-  #   defaultLocale = "en_US.UTF-8";
-  # };
-
-  # List services that you want to enable:
-
-  # Enable the OpenSSH daemon.
-  # services.openssh.enable = true;
-
-  # Enable CUPS to print documents.
-  # services.printing.enable = true;
-
-  # Enable the X11 windowing system.
-  # services.xserver.enable = true;
-  # services.xserver.layout = "us";
-  # services.xserver.xkbOptions = "eurosign:e";
-
-  # Enable the KDE Desktop Environment.
-  # services.xserver.displayManager.kdm.enable = true;
-  # services.xserver.desktopManager.kde4.enable = true;
-}
-EOF
-
-  exit 0
-fi;
-
 # This duplicates the work made below, but it is useful for processing
 # the output of nixos-option with other tools such as nixos-gui.
 if $xml; then
-- 
GitLab


From 440fe8f05da84c37262ce4459d63febdded44f95 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 11 Oct 2013 15:43:04 +0200
Subject: [PATCH 5162/5331] Use read_file from File::Slurp

---
 .../installer/tools/nixos-generate-config.pl  | 32 +++++--------------
 1 file changed, 8 insertions(+), 24 deletions(-)

diff --git a/nixos/modules/installer/tools/nixos-generate-config.pl b/nixos/modules/installer/tools/nixos-generate-config.pl
index e6d8eda016d..a70c9daff23 100644
--- a/nixos/modules/installer/tools/nixos-generate-config.pl
+++ b/nixos/modules/installer/tools/nixos-generate-config.pl
@@ -38,23 +38,7 @@ sub debug {
 }
 
 
-# Read a file, returning undef if the file cannot be opened.
-sub readFile {
-    my $filename = shift;
-    my $res;
-    if (open FILE, "<$filename") {
-        my $prev = $/;
-        undef $/;
-        $res = <FILE>;
-        $/ = $prev;
-        close FILE;
-        chomp $res;
-    }
-    return $res;
-}
-
-
-my $cpuinfo = readFile "/proc/cpuinfo";
+my $cpuinfo = read_file "/proc/cpuinfo";
 
 
 sub hasCPUFeature {
@@ -80,9 +64,9 @@ my $videoDriver;
 
 sub pciCheck {
     my $path = shift;
-    my $vendor = readFile "$path/vendor";
-    my $device = readFile "$path/device";
-    my $class = readFile "$path/class";
+    my $vendor = read_file "$path/vendor";
+    my $device = read_file "$path/device";
+    my $class = read_file "$path/class";
 
     my $module;
     if (-e "$path/driver/module") {
@@ -152,9 +136,9 @@ foreach my $path (glob "/sys/bus/pci/devices/*") {
 
 sub usbCheck {
     my $path = shift;
-    my $class = readFile "$path/bInterfaceClass";
-    my $subclass = readFile "$path/bInterfaceSubClass";
-    my $protocol = readFile "$path/bInterfaceProtocol";
+    my $class = read_file "$path/bInterfaceClass";
+    my $subclass = read_file "$path/bInterfaceSubClass";
+    my $protocol = read_file "$path/bInterfaceProtocol";
 
     my $module;
     if (-e "$path/driver/module") {
@@ -283,7 +267,7 @@ if (! -e $fn) {
   boot.loader.grub.enable = false;
   boot.loader.gummiboot.enable = true;
   boot.loader.efi.canTouchEfiVariables = true;
-  # !!! Remove me when nixos is on 3.10 or greater by default
+  # !!! Remove this when nixos is on 3.10 or greater by default
   # EFI booting requires kernel >= 3.10
   boot.kernelPackages = pkgs.linuxPackages_3_10;
 EOF
-- 
GitLab


From 677d9882b0e3eedc116b6fc77d93717ac7918907 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 11 Oct 2013 16:05:31 +0200
Subject: [PATCH 5163/5331] nixos-generate-config: Generate swapDevices

---
 .../installer/tools/nixos-generate-config.pl  | 42 +++++++++++--------
 1 file changed, 24 insertions(+), 18 deletions(-)

diff --git a/nixos/modules/installer/tools/nixos-generate-config.pl b/nixos/modules/installer/tools/nixos-generate-config.pl
index a70c9daff23..efb250c081d 100644
--- a/nixos/modules/installer/tools/nixos-generate-config.pl
+++ b/nixos/modules/installer/tools/nixos-generate-config.pl
@@ -131,6 +131,8 @@ foreach my $path (glob "/sys/bus/pci/devices/*") {
     pciCheck $path;
 }
 
+push @attrs, "services.xserver.videoDrivers = [ \"$videoDriver\" ];" if $videoDriver;
+
 
 # Idem for USB devices.
 
@@ -172,7 +174,6 @@ foreach my $path (glob "/sys/bus/usb/devices/*") {
 
 
 # Add the modules for all block devices.
-
 foreach my $path (glob "/sys/class/block/*") {
     my $module;
     if (-e "$path/device/driver/module") {
@@ -183,11 +184,6 @@ foreach my $path (glob "/sys/class/block/*") {
 }
 
 
-if ($videoDriver) {
-    push @attrs, "services.xserver.videoDrivers = [ \"$videoDriver\" ];";
-}
-
-
 # Check if we're a VirtualBox guest.  If so, enable the guest
 # additions.
 my $dmi = `@dmidecode@/sbin/dmidecode`;
@@ -196,6 +192,16 @@ if ($dmi =~ /Manufacturer: innotek/) {
 }
 
 
+# Generate the list of swap devices.
+my @swaps = read_file("/proc/swaps");
+shift @swaps;
+my @swapDevices;
+foreach my $swap (@swaps) {
+    $swap =~ /^(\S+)\s/;
+    push @swapDevices, "{ device = \"$1\"; }";
+}
+
+
 # Generate the hardware configuration file.
 
 sub removeDups {
@@ -220,19 +226,21 @@ sub toNixExpr {
 
 sub multiLineList {
     my $indent = shift;
-    my $res = "";
-    $res = "\n" if scalar @_ > 0;
+    return "[ ]" if !@_;
+    $res = "\n${indent}[ ";
+    my $first = 1;
     foreach my $s (@_) {
-        $res .= "$indent$s\n";
+        $res .= "$indent  " if !$first;
+        $first = 0;
+        $res .= "$s\n";
     }
+    $res .= "$indent]";
     return $res;
 }
 
 my $initrdKernelModules = toNixExpr(removeDups @initrdKernelModules);
 my $kernelModules = toNixExpr(removeDups @kernelModules);
 my $modulePackages = toNixExpr(removeDups @modulePackages);
-my $attrs = multiLineList("  ", removeDups @attrs);
-my $imports = multiLineList("    ", removeDups @imports);
 
 my $fn = "$outDir/hardware-configuration.nix";
 print STDERR "writing $fn...\n";
@@ -245,16 +253,19 @@ write_file($fn, <<EOF);
 { config, pkgs, ... }:
 
 {
-  imports = [$imports  ];
+  imports = ${\multiLineList("    ", @imports)};
 
   boot.initrd.kernelModules = [$initrdKernelModules ];
   boot.kernelModules = [$kernelModules ];
   boot.extraModulePackages = [$modulePackages ];
 
+  swapDevices = ${\multiLineList("    ", @swapDevices)};
+
   nix.maxJobs = $cpus;
-$attrs}
+${\join "", (map { "  $_\n" } (removeDups @attrs))}}
 EOF
 
+
 # Generate a basic configuration.nix, unless one already exists.
 $fn = "$outDir/configuration.nix";
 if (! -e $fn) {
@@ -317,11 +328,6 @@ $bootLoaderConfig
   #     options = "data=journal";
   #   };
 
-  # List swap partitions activated at boot time.
-  swapDevices =
-    [ # { device = "/dev/disk/by-label/swap"; }
-    ];
-
   # Select internationalisation properties.
   # i18n = {
   #   consoleFont = "lat9w-16";
-- 
GitLab


From 984921e657e4e7b0bde19a7b9c4c32e291399839 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 11 Oct 2013 17:17:26 +0200
Subject: [PATCH 5164/5331] nixos-generate-config: Emit fileSystems
 automatically

---
 .../installer/tools/nixos-generate-config.pl  | 99 ++++++++++++++++---
 1 file changed, 84 insertions(+), 15 deletions(-)

diff --git a/nixos/modules/installer/tools/nixos-generate-config.pl b/nixos/modules/installer/tools/nixos-generate-config.pl
index efb250c081d..0f72f94fd35 100644
--- a/nixos/modules/installer/tools/nixos-generate-config.pl
+++ b/nixos/modules/installer/tools/nixos-generate-config.pl
@@ -6,6 +6,19 @@ use File::Basename;
 use File::Slurp;
 
 
+sub uniq {
+    my %seen;
+    my @res = ();
+    foreach my $s (@_) {
+        if (!defined $seen{$s}) {
+            $seen{$s} = 1;
+            push @res, $s;
+        }
+    }
+    return @res;
+}
+
+
 # Process the command line.
 my $outDir = "/etc/nixos";
 
@@ -192,7 +205,8 @@ if ($dmi =~ /Manufacturer: innotek/) {
 }
 
 
-# Generate the list of swap devices.
+# Generate the swapDevices option from the currently activated swap
+# devices.
 my @swaps = read_file("/proc/swaps");
 shift @swaps;
 my @swapDevices;
@@ -202,20 +216,75 @@ foreach my $swap (@swaps) {
 }
 
 
-# Generate the hardware configuration file.
+# Generate the fileSystems option from the currently mounted
+# filesystems.
+sub in {
+    my ($d1, $d2) = @_;
+    return $d1 eq $d2 || substr($d1, 0, length($d2) + 1) eq "$d2/";
+}
 
-sub removeDups {
-    my %seen;
-    my @res = ();
-    foreach my $s (@_) {
-        if (!defined $seen{$s}) {
-            $seen{$s} = "";
-            push @res, $s;
+my $fileSystems;
+my %fsByDev;
+foreach my $fs (read_file("/proc/self/mountinfo")) {
+    chomp $fs;
+    my @fields = split / /, $fs;
+    my $mountPoint = $fields[4];
+    next unless -d $mountPoint;
+    my @mountOptions = split /,/, $fields[5];
+
+    # Skip special filesystems.
+    next if in($mountPoint, "/proc") || in($mountPoint, "/dev") || in($mountPoint, "/sys") || in($mountPoint, "/run");
+
+    # Skip the optional fields.
+    my $n = 6; $n++ while $fields[$n] ne "-"; $n++;
+    my $fsType = $fields[$n];
+    my $device = $fields[$n + 1];
+    my @superOptions = split /,/, $fields[$n + 2];
+
+    # Skip the read-only bind-mount on /nix/store.
+    next if $mountPoint eq "/nix/store" && (grep { $_ eq "rw" } @superOptions) && (grep { $_ eq "ro" } @mountOptions);
+
+    # Maybe this is a bind-mount of a filesystem we saw earlier?
+    if (defined $fsByDev{$fields[2]}) {
+        my $path = $fields[3]; $path = "" if $path eq "/";
+        $fileSystems .= <<EOF;
+  fileSystems.\"$mountPoint\" = {
+    device = \"$fsByDev{$fields[2]}$path\";
+    fsType = \"none\";
+    options = \"bind\";
+  };
+
+EOF
+        next;
+    }
+
+    # Is this a mount of a loopback device?
+    my @extraOptions;
+    if ($device =~ /\/dev\/loop(\d+)/) {
+        my $loopnr = $1;
+        my $backer = read_file "/sys/block/loop$loopnr/loop/backing_file";
+        if (defined $backer) {
+            chomp $backer;
+            $device = $backer;
+            push @extraOptions, "loop";
         }
     }
-    return @res;
+
+    # Emit the filesystem.
+    $fsByDev{$fields[2]} = $mountPoint;
+    $fileSystems .= <<EOF;
+  fileSystems.\"$mountPoint\" = {
+    device = \"$device\";
+    fsType = \"$fsType\";
+    options = \"${\join ",", uniq(@extraOptions, @superOptions, @mountOptions)}\";
+  };
+
+EOF
 }
 
+
+# Generate the hardware configuration file.
+
 sub toNixExpr {
     my $res = "";
     foreach my $s (@_) {
@@ -238,9 +307,9 @@ sub multiLineList {
     return $res;
 }
 
-my $initrdKernelModules = toNixExpr(removeDups @initrdKernelModules);
-my $kernelModules = toNixExpr(removeDups @kernelModules);
-my $modulePackages = toNixExpr(removeDups @modulePackages);
+my $initrdKernelModules = toNixExpr(uniq @initrdKernelModules);
+my $kernelModules = toNixExpr(uniq @kernelModules);
+my $modulePackages = toNixExpr(uniq @modulePackages);
 
 my $fn = "$outDir/hardware-configuration.nix";
 print STDERR "writing $fn...\n";
@@ -259,10 +328,10 @@ write_file($fn, <<EOF);
   boot.kernelModules = [$kernelModules ];
   boot.extraModulePackages = [$modulePackages ];
 
-  swapDevices = ${\multiLineList("    ", @swapDevices)};
+${fileSystems}  swapDevices = ${\multiLineList("    ", @swapDevices)};
 
   nix.maxJobs = $cpus;
-${\join "", (map { "  $_\n" } (removeDups @attrs))}}
+${\join "", (map { "  $_\n" } (uniq @attrs))}}
 EOF
 
 
-- 
GitLab


From 57804f44ec2068f74f0b79a090adce99a75a92fc Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 11 Oct 2013 17:24:30 +0200
Subject: [PATCH 5165/5331] nixos-generate-config: Skip FUSE filesystems

I don't know how to recover that a FUSE filesystem is (say) ntfs-3g.
---
 .../installer/tools/nixos-generate-config.pl  | 28 +++++++++++--------
 1 file changed, 17 insertions(+), 11 deletions(-)

diff --git a/nixos/modules/installer/tools/nixos-generate-config.pl b/nixos/modules/installer/tools/nixos-generate-config.pl
index 0f72f94fd35..9ce2cab79b0 100644
--- a/nixos/modules/installer/tools/nixos-generate-config.pl
+++ b/nixos/modules/installer/tools/nixos-generate-config.pl
@@ -248,15 +248,22 @@ foreach my $fs (read_file("/proc/self/mountinfo")) {
     if (defined $fsByDev{$fields[2]}) {
         my $path = $fields[3]; $path = "" if $path eq "/";
         $fileSystems .= <<EOF;
-  fileSystems.\"$mountPoint\" = {
-    device = \"$fsByDev{$fields[2]}$path\";
-    fsType = \"none\";
-    options = \"bind\";
-  };
+  fileSystems.\"$mountPoint\" =
+    { device = \"$fsByDev{$fields[2]}$path\";
+      fsType = \"none\";
+      options = \"bind\";
+    };
 
 EOF
         next;
     }
+    $fsByDev{$fields[2]} = $mountPoint;
+
+    # We don't know how to handle FUSE filesystems.
+    if ($fsType eq "fuseblk" || $fsType eq "fuse") {
+        print STDERR "warning: don't know how to emit ‘fileSystem’ option for FUSE filesystem ‘$mountPoint’\n";
+        next;
+    }
 
     # Is this a mount of a loopback device?
     my @extraOptions;
@@ -271,13 +278,12 @@ EOF
     }
 
     # Emit the filesystem.
-    $fsByDev{$fields[2]} = $mountPoint;
     $fileSystems .= <<EOF;
-  fileSystems.\"$mountPoint\" = {
-    device = \"$device\";
-    fsType = \"$fsType\";
-    options = \"${\join ",", uniq(@extraOptions, @superOptions, @mountOptions)}\";
-  };
+  fileSystems.\"$mountPoint\" =
+    { device = \"$device\";
+      fsType = \"$fsType\";
+      options = \"${\join ",", uniq(@extraOptions, @superOptions, @mountOptions)}\";
+    };
 
 EOF
 }
-- 
GitLab


From 3875dcdfeba0d120bf88ac42e3e863c5cf0223d4 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sun, 13 Oct 2013 15:41:58 +0200
Subject: [PATCH 5166/5331] nixos-generate-config: Emit
 boot.initrd.availableKernelModules instead of kerneLmodules

---
 nixos/modules/installer/tools/nixos-generate-config.pl | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/nixos/modules/installer/tools/nixos-generate-config.pl b/nixos/modules/installer/tools/nixos-generate-config.pl
index 9ce2cab79b0..ff9bdcdbc00 100644
--- a/nixos/modules/installer/tools/nixos-generate-config.pl
+++ b/nixos/modules/installer/tools/nixos-generate-config.pl
@@ -105,7 +105,7 @@ sub pciCheck {
             $class =~ /^0x0c03/
             )
         {
-            push @initrdKernelModules, $module;
+            push @initrdAvailableKernelModules, $module;
         }
     }
 
@@ -174,7 +174,7 @@ sub usbCheck {
             ($class eq "03" && $protocol eq "01")
             )
         {
-            push @initrdKernelModules, $module;
+            push @initrdAvailableKernelModules, $module;
         }
     }
 }
@@ -192,7 +192,7 @@ foreach my $path (glob "/sys/class/block/*") {
     if (-e "$path/device/driver/module") {
         $module = basename `readlink -f $path/device/driver/module`;
         chomp $module;
-        push @initrdKernelModules, $module;
+        push @initrdAvailableKernelModules, $module;
     }
 }
 
@@ -313,7 +313,7 @@ sub multiLineList {
     return $res;
 }
 
-my $initrdKernelModules = toNixExpr(uniq @initrdKernelModules);
+my $initrdAvailableKernelModules = toNixExpr(uniq @initrdAvailableKernelModules);
 my $kernelModules = toNixExpr(uniq @kernelModules);
 my $modulePackages = toNixExpr(uniq @modulePackages);
 
@@ -330,7 +330,7 @@ write_file($fn, <<EOF);
 {
   imports = ${\multiLineList("    ", @imports)};
 
-  boot.initrd.kernelModules = [$initrdKernelModules ];
+  boot.initrd.availableKernelModules = [$initrdAvailableKernelModules ];
   boot.kernelModules = [$kernelModules ];
   boot.extraModulePackages = [$modulePackages ];
 
-- 
GitLab


From ca3725bfc96ebc7c8c5580805998135039319265 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sun, 13 Oct 2013 15:44:50 +0200
Subject: [PATCH 5167/5331] nixos-generate-config: Add --root option

If this option is given, nixos-generate-config will write the
configuration to /etc/nixos under the given root, and only emit
fileSystems attributes for filesystems under the given root directory.

The typically use case is at installation time, where you can say:

  $ nixos-generate-config --root /mnt

which will create /mnt/etc/nixos/{configuration.nix,hardware-configuration.nix}.

Also add a --force flag to force overwriting configuration.nix.
---
 .../installer/tools/nixos-generate-config.pl  | 19 ++++++++++++++++++-
 1 file changed, 18 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/installer/tools/nixos-generate-config.pl b/nixos/modules/installer/tools/nixos-generate-config.pl
index ff9bdcdbc00..3418b0122de 100644
--- a/nixos/modules/installer/tools/nixos-generate-config.pl
+++ b/nixos/modules/installer/tools/nixos-generate-config.pl
@@ -21,6 +21,8 @@ sub uniq {
 
 # Process the command line.
 my $outDir = "/etc/nixos";
+my $rootDir = ""; # = /
+my $force = 0;
 
 for (my $n = 0; $n < scalar @ARGV; $n++) {
     my $arg = $ARGV[$n];
@@ -32,6 +34,15 @@ for (my $n = 0; $n < scalar @ARGV; $n++) {
         $outDir = $ARGV[$n];
         die "$0: ‘--dir’ requires an argument\n" unless defined $outDir;
     }
+    elsif ($arg eq "--root") {
+        $n++;
+        $rootDir = $ARGV[$n];
+        die "$0: ‘--root’ requires an argument\n" unless defined $rootDir;
+        $rootDir =~ s/\/*$//; # remove trailing slashes
+    }
+    elsif ($arg eq "--force") {
+        $force = 1;
+    }
     else {
         die "$0: unrecognized argument ‘$arg’\n";
     }
@@ -232,6 +243,10 @@ foreach my $fs (read_file("/proc/self/mountinfo")) {
     next unless -d $mountPoint;
     my @mountOptions = split /,/, $fields[5];
 
+    next if !in($mountPoint, $rootDir);
+    $mountPoint = substr($mountPoint, length($rootDir)); # strip the root directory (e.g. /mnt)
+    $mountPoint = "/" if $mountPoint eq "";
+
     # Skip special filesystems.
     next if in($mountPoint, "/proc") || in($mountPoint, "/dev") || in($mountPoint, "/sys") || in($mountPoint, "/run");
 
@@ -317,6 +332,8 @@ my $initrdAvailableKernelModules = toNixExpr(uniq @initrdAvailableKernelModules)
 my $kernelModules = toNixExpr(uniq @kernelModules);
 my $modulePackages = toNixExpr(uniq @modulePackages);
 
+$outDir = "$rootDir$outDir";
+
 my $fn = "$outDir/hardware-configuration.nix";
 print STDERR "writing $fn...\n";
 mkpath($outDir, 0, 0755);
@@ -343,7 +360,7 @@ EOF
 
 # Generate a basic configuration.nix, unless one already exists.
 $fn = "$outDir/configuration.nix";
-if (! -e $fn) {
+if ($force || ! -e $fn) {
     print STDERR "writing $fn...\n";
 
     my $bootloaderConfig;
-- 
GitLab


From 00f380dee5c395704b8b83c462d0d735ff0e810e Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sun, 13 Oct 2013 16:20:49 +0200
Subject: [PATCH 5168/5331] Document nixos-generate-config

---
 .../doc/manual/man-nixos-generate-config.xml  | 191 ++++++++++++++++++
 nixos/doc/manual/man-pages.xml                |  11 +-
 2 files changed, 196 insertions(+), 6 deletions(-)
 create mode 100644 nixos/doc/manual/man-nixos-generate-config.xml

diff --git a/nixos/doc/manual/man-nixos-generate-config.xml b/nixos/doc/manual/man-nixos-generate-config.xml
new file mode 100644
index 00000000000..ff69d8d9170
--- /dev/null
+++ b/nixos/doc/manual/man-nixos-generate-config.xml
@@ -0,0 +1,191 @@
+<refentry xmlns="http://docbook.org/ns/docbook"
+          xmlns:xlink="http://www.w3.org/1999/xlink"
+          xmlns:xi="http://www.w3.org/2001/XInclude">
+
+<refmeta>
+  <refentrytitle><command>nixos-generate-config</command></refentrytitle>
+  <manvolnum>8</manvolnum>
+  <refmiscinfo class="source">NixOS</refmiscinfo>
+  <!-- <refmiscinfo class="version"><xi:include href="version.txt" parse="text"/></refmiscinfo> -->
+</refmeta>
+
+<refnamediv>
+  <refname><command>nixos-generate-config</command></refname>
+  <refpurpose>generate NixOS configuration modules</refpurpose>
+</refnamediv>
+
+<refsynopsisdiv>
+  <cmdsynopsis>
+    <command>nixos-generate-config</command>
+    <arg><option>--force</option></arg>
+    <arg>
+      <arg choice='plain'><option>--root</option></arg>
+      <replaceable>root</replaceable>
+    </arg>
+    <arg>
+      <arg choice='plain'><option>--dir</option></arg>
+      <replaceable>dir</replaceable>
+    </arg>
+  </cmdsynopsis>
+</refsynopsisdiv>
+
+
+<refsection><title>Description</title>
+
+<para>This command writes two NixOS configuration modules:
+
+<variablelist>
+
+  <varlistentry>
+    <term><option>/etc/nixos/hardware-configuration.nix</option></term>
+    <listitem>
+      <para>This module sets NixOS configuration options based on your
+      current hardware configuration.  In particular, it sets the
+      <option>fileSystem</option> option to reflect all currently
+      mounted file systems, the <option>swapDevices</option> option to
+      reflect active swap devices, and the
+      <option>boot.initrd.*</option> options to ensure that the
+      initial ramdisk contains any kernel modules necessary for
+      mounting the root file system.</para>
+
+      <para>If this file already exists, it is overwritten.  Thus, you
+      should not modify it manually.  Rather, you should include it
+      from your <filename>/etc/nixos/configuration.nix</filename>, and
+      re-run <command>nixos-generate-config</command> to update it
+      whenever your hardware configuration changes.</para>
+    </listitem>
+  </varlistentry>
+
+  <varlistentry>
+    <term><option>/etc/nixos/configuration.nix</option></term>
+    <listitem>
+      <para>This is the main NixOS system configuration module.  If it
+      already exists, it’s left unchanged.  Otherwise,
+      <command>nixos-generate-config</command> will write a template
+      for you to customise.</para>
+    </listitem>
+  </varlistentry>
+
+</variablelist>
+
+</para>
+
+</refsection>
+
+
+<refsection><title>Options</title>
+
+<para>This command accepts the following options:</para>
+
+<variablelist>
+
+  <varlistentry>
+    <term><option>--root</option></term>
+    <listitem>
+      <para>If this option is given, treat the directory
+      <replaceable>root</replaceable> as the root of the file system.
+      This means that configuration files will be written to
+      <filename><replaceable>root</replaceable>/etc/nixos</filename>,
+      and that any file systems outside of
+      <replaceable>root</replaceable> are ignored for the purpose of
+      generating the <option>fileSystems</option> option.</para>
+    </listitem>
+  </varlistentry>
+
+  <varlistentry>
+    <term><option>--dir</option></term>
+    <listitem>
+      <para>If this option is given, write the configuration files to
+      the directory <replaceable>dir</replaceable> instead of
+      <filename>/etc/nixos</filename>.</para>
+    </listitem>
+  </varlistentry>
+
+  <varlistentry>
+    <term><option>--force</option></term>
+    <listitem>
+      <para>Overwrite
+      <filename>/etc/nixos/configuration.nix</filename> if it already
+      exists.</para>
+    </listitem>
+  </varlistentry>
+
+</variablelist>
+
+</refsection>
+
+
+<refsection><title>Examples</title>
+
+<para>This command is typically used during NixOS installation to
+write initial configuration modules.  For example, if you created and
+mounted the target file systems on <filename>/mnt</filename> and
+<filename>/mnt/boot</filename>, you would run:
+
+<screen>
+$ nixos-generate-config --root /mnt
+</screen>
+
+The resulting file
+<filename>/mnt/etc/nixos/hardware-configuration.nix</filename> might
+look like this:
+
+<programlisting>
+# Do not modify this file!  It was generated by ‘nixos-generate-config’
+# and may be overwritten by future invocations.  Please make changes
+# to /etc/nixos/configuration.nix instead.
+{ config, pkgs, ... }:
+
+{
+  imports =
+    [ &lt;nixos/modules/installer/scan/not-detected.nix>
+    ];
+
+  boot.initrd.availableKernelModules = [ "ehci_hcd" "ahci" ];
+  boot.kernelModules = [ "kvm-intel" ];
+  boot.extraModulePackages = [ ];
+
+  fileSystems."/" =
+    { device = "/dev/disk/by-label/nixos";
+      fsType = "ext3";
+      options = "rw,data=ordered,relatime";
+    };
+
+  fileSystems."/boot" =
+    { device = "/dev/sda1";
+      fsType = "ext3";
+      options = "rw,errors=continue,user_xattr,acl,barrier=1,data=writeback,relatime";
+    };
+
+  swapDevices =
+    [ { device = "/dev/sda2"; }
+    ];
+
+  nix.maxJobs = 8;
+}
+</programlisting>
+
+It will also create a basic
+<filename>/mnt/etc/nixos/configuration.nix</filename>, which you
+should edit to customise the logical configuration of your system.
+This file includes the result of the hardware scan as follows:
+
+<programlisting>
+  imports = [ ./hardware-configuration.nix ];
+</programlisting>
+</para>
+
+<para>After installation, if your hardware configuration changes, you
+can run:
+
+<screen>
+$ nixos-generate-config
+</screen>
+
+to update <filename>/etc/nixos/hardware-configuration.nix</filename>.
+Your <filename>/etc/nixos/configuration.nix</filename> will
+<emphasis>not</emphasis> be overwritten.</para>
+
+</refsection>
+
+</refentry>
diff --git a/nixos/doc/manual/man-pages.xml b/nixos/doc/manual/man-pages.xml
index 7840e1b897b..5178d595fda 100644
--- a/nixos/doc/manual/man-pages.xml
+++ b/nixos/doc/manual/man-pages.xml
@@ -15,17 +15,16 @@
     </author>
 
     <copyright>
-      <year>2007</year>
-      <year>2008</year>
-      <year>2009</year>
+      <year>2007-2013</year>
       <holder>Eelco Dolstra</holder>
     </copyright>
-    
+
   </info>
-  
+
   <xi:include href="man-configuration.xml" />
   <xi:include href="man-nixos-rebuild.xml" />
+  <xi:include href="man-nixos-generate-config.xml" />
   <xi:include href="man-nixos-option.xml" />
   <xi:include href="man-nixos-build-vms.xml" />
-  
+
 </reference>
-- 
GitLab


From 9b8847eb91bb8f610ac1b2b4c28bafdae875e963 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sun, 13 Oct 2013 16:57:09 +0200
Subject: [PATCH 5169/5331] Document nixos-install

---
 nixos/doc/manual/man-nixos-install.xml | 78 ++++++++++++++++++++++++++
 nixos/doc/manual/man-pages.xml         |  5 +-
 2 files changed, 81 insertions(+), 2 deletions(-)
 create mode 100644 nixos/doc/manual/man-nixos-install.xml

diff --git a/nixos/doc/manual/man-nixos-install.xml b/nixos/doc/manual/man-nixos-install.xml
new file mode 100644
index 00000000000..d5157859857
--- /dev/null
+++ b/nixos/doc/manual/man-nixos-install.xml
@@ -0,0 +1,78 @@
+<refentry xmlns="http://docbook.org/ns/docbook"
+          xmlns:xlink="http://www.w3.org/1999/xlink"
+          xmlns:xi="http://www.w3.org/2001/XInclude">
+
+<refmeta>
+  <refentrytitle><command>nixos-install</command></refentrytitle>
+  <manvolnum>8</manvolnum>
+  <refmiscinfo class="source">NixOS</refmiscinfo>
+  <!-- <refmiscinfo class="version"><xi:include href="version.txt" parse="text"/></refmiscinfo> -->
+</refmeta>
+
+<refnamediv>
+  <refname><command>nixos-install</command></refname>
+  <refpurpose>install NixOS</refpurpose>
+</refnamediv>
+
+<refsynopsisdiv>
+  <cmdsynopsis>
+    <command>nixos-install</command>
+  </cmdsynopsis>
+</refsynopsisdiv>
+
+
+<refsection><title>Description</title>
+
+<para>This command installs NixOS in the file system mounted on
+<filename>/mnt</filename>, based on the NixOS configuration specified
+in <filename>/mnt/etc/nixos/configuration.nix</filename>.  It performs
+the following steps:
+
+<itemizedlist>
+
+  <listitem><para>It copies Nix and its dependencies to
+  <filename>/mnt/nix/store</filename>.</para></listitem>
+
+  <listitem><para>It runs Nix in <filename>/mnt</filename> to build
+  the NixOS configuration specified in
+  <filename>/mnt/etc/nixos/configuration.nix</filename>.</para></listitem>
+
+  <listitem><para>It installs the GRUB boot loader on the device
+  specified in the option <option>boot.loader.grub.device</option>,
+  and generates a GRUB configuration file that boots into the NixOS
+  configuration just installed.</para></listitem>
+
+</itemizedlist>
+
+</para>
+
+<para>This command is idempotent: if it is interrupted or fails due to
+a temporary problem (e.g. a network issue), you can safely re-run
+it.</para>
+
+</refsection>
+
+
+<refsection><title>Examples</title>
+
+<para>A typical NixOS installation is done by creating and mounting a
+file system on <filename>/mnt</filename>, generating a NixOS
+configuration in
+<filename>/mnt/etc/nixos/configuration.nix</filename>, and running
+<command>nixos-install</command>.  For instance, if we want to install
+NixOS on an <literal>ext4</literal> file system created in
+<filename>/dev/sda1</filename>:
+
+<screen>
+$ mkfs.ext4 /dev/sda1
+$ mount /dev/sda1 /mnt
+$ nixos-generate-config --root /mnt
+$ # edit /mnt/etc/nixos/configuration.nix
+$ nixos-install
+</screen>
+
+</para>
+
+</refsection>
+
+</refentry>
diff --git a/nixos/doc/manual/man-pages.xml b/nixos/doc/manual/man-pages.xml
index 5178d595fda..467864e208b 100644
--- a/nixos/doc/manual/man-pages.xml
+++ b/nixos/doc/manual/man-pages.xml
@@ -22,9 +22,10 @@
   </info>
 
   <xi:include href="man-configuration.xml" />
-  <xi:include href="man-nixos-rebuild.xml" />
+  <xi:include href="man-nixos-build-vms.xml" />
   <xi:include href="man-nixos-generate-config.xml" />
+  <xi:include href="man-nixos-install.xml" />
   <xi:include href="man-nixos-option.xml" />
-  <xi:include href="man-nixos-build-vms.xml" />
+  <xi:include href="man-nixos-rebuild.xml" />
 
 </reference>
-- 
GitLab


From 3e001244e4c53b6351ffe4f634fc545a05d626d7 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sun, 13 Oct 2013 17:18:42 +0200
Subject: [PATCH 5170/5331] Load the xfs kernel module on demand

---
 nixos/modules/tasks/filesystems/xfs.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/tasks/filesystems/xfs.nix b/nixos/modules/tasks/filesystems/xfs.nix
index 5f9eb741c2a..6800696a05a 100644
--- a/nixos/modules/tasks/filesystems/xfs.nix
+++ b/nixos/modules/tasks/filesystems/xfs.nix
@@ -13,7 +13,7 @@ in
 
     system.fsPackages = [ pkgs.xfsprogs ];
 
-    boot.initrd.kernelModules = mkIf inInitrd [ "xfs" "crc32c" ];
+    boot.initrd.availableKernelModules = mkIf inInitrd [ "xfs" "crc32c" ];
 
     boot.initrd.extraUtilsCommands = mkIf inInitrd
       ''
-- 
GitLab


From 647b0f5f5c0ae88e515d9415b1d0b0e4e13937b7 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sun, 13 Oct 2013 17:24:11 +0200
Subject: [PATCH 5171/5331] Update the installer tests for
 nixos-generate-config

---
 nixos/tests/efi-installer.nix |  9 +++------
 nixos/tests/installer.nix     | 13 ++++---------
 2 files changed, 7 insertions(+), 15 deletions(-)

diff --git a/nixos/tests/efi-installer.nix b/nixos/tests/efi-installer.nix
index a9c5d719030..f1a7d42f833 100644
--- a/nixos/tests/efi-installer.nix
+++ b/nixos/tests/efi-installer.nix
@@ -37,13 +37,12 @@ let
   # The config to install
   config = builtins.toFile "configuration.nix" ''
     { pkgs, ... }: {
-      imports = [ ./hardware.nix <nixos/modules/testing/test-instrumentation.nix> ];
+      imports = [ ./hardware-configuration.nix <nixos/modules/testing/test-instrumentation.nix> ];
       boot.kernelPackages = pkgs.linuxPackages_3_10;
       boot.loader.grub.enable = false;
       boot.loader.efi.canTouchEfiVariables = true;
       boot.loader.gummiboot.enable = true;
       fonts.enableFontConfig = false;
-      fileSystems."/".label = "nixos";
     }
   '';
 
@@ -84,12 +83,10 @@ in {
 
       # Create the NixOS configuration.
       $machine->succeed(
-          "mkdir -p /mnt/etc/nixos",
-          "nixos-hardware-scan > /mnt/etc/nixos/hardware.nix",
+          "nixos-generate-config --root /mnt",
       );
 
-      my $cfg = $machine->succeed("cat /mnt/etc/nixos/hardware.nix");
-      print STDERR "Result of the hardware scan:\n$cfg\n";
+      $machine->succeed("cat /mnt/etc/nixos/hardware-configuration.nix >&2");
 
       $machine->copyFileFromHost(
           "${config}",
diff --git a/nixos/tests/installer.nix b/nixos/tests/installer.nix
index 0ce78053171..6e06b544d25 100644
--- a/nixos/tests/installer.nix
+++ b/nixos/tests/installer.nix
@@ -38,7 +38,7 @@ let
       { config, pkgs, modulesPath, ... }:
 
       { imports =
-          [ ./hardware.nix
+          [ ./hardware-configuration.nix
             "''${modulesPath}/testing/test-instrumentation.nix"
           ];
 
@@ -48,10 +48,7 @@ let
         ''}
         boot.loader.grub.device = "${grubDevice}";
         boot.loader.grub.extraConfig = "serial; terminal_output.serial";
-        boot.initrd.kernelModules = [ "ext3" "ext4" "xfs" "virtio_console" ];
-
-        ${fileSystems}
-        swapDevices = [ { label = "swap"; } ];
+        boot.initrd.kernelModules = [ "virtio_console" ];
 
         environment.systemPackages = [ ${optionalString testChannel "pkgs.rlwrap"} ];
       }
@@ -143,12 +140,10 @@ let
 
       # Create the NixOS configuration.
       $machine->succeed(
-          "mkdir -p /mnt/etc/nixos",
-          "nixos-hardware-scan > /mnt/etc/nixos/hardware.nix",
+          "nixos-generate-config --root /mnt",
       );
 
-      my $cfg = $machine->succeed("cat /mnt/etc/nixos/hardware.nix");
-      print STDERR "Result of the hardware scan:\n$cfg\n";
+      $machine->succeed("cat /mnt/etc/nixos/hardware-configuration.nix >&2");
 
       $machine->copyFileFromHost(
           "${ config { inherit fileSystems testChannel grubVersion grubDevice; } }",
-- 
GitLab


From de7083a495d905495da0beb174c5f05cf6bcdf46 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sun, 13 Oct 2013 22:17:12 +0200
Subject: [PATCH 5172/5331] Fix the misc test

http://hydra.nixos.org/build/6480163
---
 nixos/tests/misc.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/nixos/tests/misc.nix b/nixos/tests/misc.nix
index e18a208fe43..12ac6f6f9a6 100644
--- a/nixos/tests/misc.nix
+++ b/nixos/tests/misc.nix
@@ -9,6 +9,7 @@
     { swapDevices = pkgs.lib.mkOverride 0
         [ { device = "/root/swapfile"; size = 128; } ];
       environment.variables.EDITOR = pkgs.lib.mkOverride 0 "emacs";
+      services.nixosManual.enable = pkgs.lib.mkOverride 0 true;
     };
 
   testScript =
@@ -18,7 +19,7 @@
       };
 
       subtest "nixos-rebuild", sub {
-          $machine->succeed("nixos-rebuild --help | grep 'Usage:'");
+          $machine->succeed("nixos-rebuild --help | grep SYNOPSIS");
       };
 
       # Sanity check for uid/gid assignment.
-- 
GitLab


From 903c5d4df9b8175e70b4ad3d74525b09626f5b7d Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sun, 13 Oct 2013 22:36:04 +0200
Subject: [PATCH 5173/5331] Test nixos-option

---
 nixos/tests/installer.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/nixos/tests/installer.nix b/nixos/tests/installer.nix
index 6e06b544d25..bebd6c04374 100644
--- a/nixos/tests/installer.nix
+++ b/nixos/tests/installer.nix
@@ -174,6 +174,11 @@ let
 
       $machine->succeed("nixos-rebuild switch >&2");
 
+      # Test nixos-option.
+      $machine->succeed("nixos-option boot.initrd.kernelModules | grep virtio_console");
+      $machine->succeed("nixos-option -d boot.initrd.kernelModules | grep 'List of modules'");
+      $machine->succeed("nixos-option -l boot.initrd.kernelModules | grep /etc/nixos/configuration.nix");
+
       $machine->shutdown;
 
       # And just to be sure, check that the machine still boots after
-- 
GitLab


From 63539b2844fc62fa004854807d205be9847fe638 Mon Sep 17 00:00:00 2001
From: Jaka Hudoklin <jakahudoklin@gmail.com>
Date: Sun, 13 Oct 2013 23:10:29 +0200
Subject: [PATCH 5174/5331] nixos/graphite: carbon, use syslog for logging

Twisted provides option to log with syslog, this enables nicer logging.
Imagine what happens in a case of exception. If logs are written to stdout,
traceback won't be merged thus giving ugly logs. This commit fixes that.
This is also one of the official ways of starting carbon, so no worries.
---
 .../modules/services/monitoring/graphite.nix  | 50 ++++++++-----------
 1 file changed, 20 insertions(+), 30 deletions(-)

diff --git a/nixos/modules/services/monitoring/graphite.nix b/nixos/modules/services/monitoring/graphite.nix
index ec36db7b21c..7326f1e73a0 100644
--- a/nixos/modules/services/monitoring/graphite.nix
+++ b/nixos/modules/services/monitoring/graphite.nix
@@ -5,7 +5,18 @@ with pkgs.lib;
 let
   cfg = config.services.graphite;
   writeTextOrNull = f: t: if t == null then null else pkgs.writeText f t;
+
   dataDir = "/var/db/graphite";
+  carbonOpts = name: with config.ids; ''
+    --nodaemon --syslog --prefix=${name} \
+    --uid ${toString uids.graphite} --gid ${toString uids.graphite} ${name}
+  '';
+  carbonEnv = {
+    PYTHONPATH = "${pkgs.python27Packages.carbon}/lib/python2.7/site-packages";
+    GRAPHITE_ROOT = dataDir;
+    GRAPHITE_CONF_DIR = "/etc/graphite/";
+  };
+
 in {
 
   ###### interface
@@ -52,7 +63,7 @@ in {
           [all_min]
           pattern = \.min$
           xFilesFactor = 0.1
-         aggregationMethod = min
+          aggregationMethod = min
         '';
       };
 
@@ -153,15 +164,8 @@ in {
       description = "Graphite data storage backend";
       wantedBy = [ "multi-user.target" ];
       after = [ "network-interfaces.target" ];
-      environment = {
-        GRAPHITE_CONF_DIR = "/etc/graphite/";
-        GRAPHITE_STORAGE_DIR = "/var/db/graphite/";
-      };
-      serviceConfig = {
-        ExecStart = "${pkgs.pythonPackages.carbon}/bin/carbon-cache.py --pidfile /tmp/carbonCache.pid start";
-        User = "graphite";
-        Group = "graphite";
-      };
+      environment = carbonEnv;
+      serviceConfig.ExecStart = "${pkgs.twisted}/bin/twistd ${carbonOpts "carbon-cache"}";
       restartTriggers = [
         pkgs.pythonPackages.carbon
         cfg.carbon.config
@@ -178,15 +182,8 @@ in {
       description = "Carbon data aggregator";
       wantedBy = [ "multi-user.target" ];
       after = [ "network-interfaces.target" ];
-      environment = {
-        GRAPHITE_CONF_DIR = "/etc/graphite/";
-        GRAPHITE_STORAGE_DIR = "${dataDir}";
-      };
-      serviceConfig = {
-        ExecStart = "${pkgs.pythonPackages.carbon}/bin/carbon-aggregator.py --pidfile /tmp/carbonAggregator.pid start";
-        User = "graphite";
-        Group = "graphite";
-      };
+      environment = carbonEnv;
+      serviceConfig.ExecStart = "${pkgs.twisted}/bin/twistd ${carbonOpts "carbon-aggregator"}";
       restartTriggers = [
         pkgs.pythonPackages.carbon cfg.carbon.config cfg.carbon.aggregationRules
       ];
@@ -196,15 +193,8 @@ in {
       description = "Carbon data relay";
       wantedBy = [ "multi-user.target" ];
       after = [ "network-interfaces.target" ];
-      environment = {
-        GRAPHITE_CONF_DIR = "/etc/graphite/";
-        GRAPHITE_STORAGE_DIR = "${dataDir}";
-      };
-      serviceConfig = {
-        ExecStart = "${pkgs.pythonPackages.carbon}/bin/carbon-relay.py --pidfile /tmp/carbonRelay.pid start";
-        User = "graphite";
-        Group = "graphite";
-      };
+      environment = carbonEnv;
+      serviceConfig.ExecStart = "${pkgs.twisted}/bin/twistd ${carbonOpts "carbon-relay"}";
       restartTriggers = [
         pkgs.pythonPackages.carbon cfg.carbon.config cfg.carbon.relayRules
       ];
@@ -218,7 +208,7 @@ in {
         PYTHONPATH = "${pkgs.python27Packages.graphite_web}/lib/python2.7/site-packages";
         DJANGO_SETTINGS_MODULE = "graphite.settings";
         GRAPHITE_CONF_DIR = "/etc/graphite/";
-        GRAPHITE_STORAGE_DIR = "${dataDir}";
+        GRAPHITE_STORAGE_DIR = dataDir;
       };
       serviceConfig = {
         ExecStart = ''
@@ -257,7 +247,7 @@ in {
       name = "graphite";
       uid = config.ids.uids.graphite;
       description = "Graphite daemon user";
-      home = "${dataDir}";
+      home = dataDir;
       createHome = true;
     };
     users.extraGroups.graphite.gid = config.ids.gids.graphite;
-- 
GitLab


From f19f16b6f1cf6289c435a5f8e30e6afbedce7e97 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 13 Oct 2013 10:14:30 +0200
Subject: [PATCH 5175/5331] haskell-conduit: update to version 1.0.8

---
 pkgs/development/libraries/haskell/conduit/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/conduit/default.nix b/pkgs/development/libraries/haskell/conduit/default.nix
index 0e1757f7b50..ab41f5a5621 100644
--- a/pkgs/development/libraries/haskell/conduit/default.nix
+++ b/pkgs/development/libraries/haskell/conduit/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "conduit";
-  version = "1.0.7.4";
-  sha256 = "1bvi9gw9sfi1fml339rn3cfq4i3yd9j9vw41p5cpz5pnv3gw225x";
+  version = "1.0.8";
+  sha256 = "0qsi9p7hwzaw1ridgydfmaagjjpkbgq755b1r9xm4apdy6fikcz5";
   buildDepends = [
     liftedBase mmorph monadControl mtl resourcet text transformers
     transformersBase void
-- 
GitLab


From 1df8a24935eb02e40682ee9f649626bcafb94304 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 13 Oct 2013 10:14:30 +0200
Subject: [PATCH 5176/5331] haskell-constraints: update to version 0.3.4.1

---
 pkgs/development/libraries/haskell/constraints/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/constraints/default.nix b/pkgs/development/libraries/haskell/constraints/default.nix
index 87ec5d82724..e57b4e6c085 100644
--- a/pkgs/development/libraries/haskell/constraints/default.nix
+++ b/pkgs/development/libraries/haskell/constraints/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "constraints";
-  version = "0.3.3";
-  sha256 = "0mglqd6l6bc333i7gymbm8q037hj5fny6jzyg1zmw5kg6r3xcwdi";
+  version = "0.3.4.1";
+  sha256 = "13jxh2cgcfyiqhx7j5063k8k60wz9h4hd5lf2mw2skbcryg6csmb";
   buildDepends = [ newtype ];
   meta = {
     homepage = "http://github.com/ekmett/constraints/";
-- 
GitLab


From fce3c4fb1b5c8329cc96ef9f1cd8c22ffb5b9ab1 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 13 Oct 2013 10:14:30 +0200
Subject: [PATCH 5177/5331] haskell-either: update to version 3.4.2

---
 pkgs/development/libraries/haskell/either/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/either/default.nix b/pkgs/development/libraries/haskell/either/default.nix
index 67c1962cbe9..bfc0f4c593b 100644
--- a/pkgs/development/libraries/haskell/either/default.nix
+++ b/pkgs/development/libraries/haskell/either/default.nix
@@ -3,8 +3,8 @@
 
 cabal.mkDerivation (self: {
   pname = "either";
-  version = "3.4.1";
-  sha256 = "1cq4glqhxz9k8fxf0dc8b6hcxxfn4yci6h7wmfkmkfq5ca61ax1b";
+  version = "3.4.2";
+  sha256 = "0h5hrjvcbgyn0fpn6xlm2a4447xl4qyhiadq2vlywqvkvgnh3x3k";
   buildDepends = [
     MonadRandom mtl semigroupoids semigroups transformers
   ];
-- 
GitLab


From ca7c270278e06511a160c101306d4904c3a94660 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 13 Oct 2013 10:14:30 +0200
Subject: [PATCH 5178/5331] haskell-entropy: update to version 0.2.2.3

---
 pkgs/development/libraries/haskell/entropy/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/entropy/default.nix b/pkgs/development/libraries/haskell/entropy/default.nix
index 17409f05eed..3c0f97dfdc6 100644
--- a/pkgs/development/libraries/haskell/entropy/default.nix
+++ b/pkgs/development/libraries/haskell/entropy/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "entropy";
-  version = "0.2.2.2";
-  sha256 = "1xkpfi6njj5iqwn5wa6npyzxksj9hr0xqbxrslg646whxrkd8718";
+  version = "0.2.2.3";
+  sha256 = "04kzl7j73g5ibbc28b4llmnrvhg7q2fji1akx5ii81sfxdpnxy45";
   meta = {
     homepage = "https://github.com/TomMD/entropy";
     description = "A platform independent entropy source";
-- 
GitLab


From 7bfb168b8a7d2ea61d5177d688fea0f48a0477f3 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 13 Oct 2013 10:14:30 +0200
Subject: [PATCH 5179/5331] haskell-enumerator: update to version 0.4.20

---
 pkgs/development/libraries/haskell/enumerator/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/enumerator/default.nix b/pkgs/development/libraries/haskell/enumerator/default.nix
index 5b44c9efc62..4dfa4e573dd 100644
--- a/pkgs/development/libraries/haskell/enumerator/default.nix
+++ b/pkgs/development/libraries/haskell/enumerator/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "enumerator";
-  version = "0.4.19";
-  sha256 = "1avxy55vbvkz6yj512bkb2b986y3m0b28c9c5lfc3wd2na7w1s5g";
+  version = "0.4.20";
+  sha256 = "02a75dggj295zkhgjry5cb43s6y6ydpjb5w6vgl7kd9b6ma11qik";
   buildDepends = [ text transformers ];
   meta = {
     homepage = "https://john-millikin.com/software/enumerator/";
-- 
GitLab


From bac50a537206dc7281f62513284b05d4606f358b Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 13 Oct 2013 10:14:30 +0200
Subject: [PATCH 5180/5331] haskell-hashtables: update to version 1.1.2.1

---
 pkgs/development/libraries/haskell/hashtables/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/hashtables/default.nix b/pkgs/development/libraries/haskell/hashtables/default.nix
index 4fdff950809..ca0e2e529c5 100644
--- a/pkgs/development/libraries/haskell/hashtables/default.nix
+++ b/pkgs/development/libraries/haskell/hashtables/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "hashtables";
-  version = "1.1.2.0";
-  sha256 = "1q0nzsc4x317r7b93b4sj4yfpsdjmqkvc54q62n56kgq9cy4y7qh";
+  version = "1.1.2.1";
+  sha256 = "1166baqalpp9v735821drjvyasr44p4znbcs7njyr09fx87r23f5";
   buildDepends = [ hashable primitive vector ];
   meta = {
     homepage = "http://github.com/gregorycollins/hashtables";
-- 
GitLab


From d247d7bb6cd6b2424081fd870ae8c916134a68e6 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 13 Oct 2013 10:14:30 +0200
Subject: [PATCH 5181/5331] haskell-haskell-src-meta: update to version 0.6.0.4

---
 .../libraries/haskell/haskell-src-meta/default.nix           | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/haskell/haskell-src-meta/default.nix b/pkgs/development/libraries/haskell/haskell-src-meta/default.nix
index 7c9e7694046..edcb39ebe9d 100644
--- a/pkgs/development/libraries/haskell/haskell-src-meta/default.nix
+++ b/pkgs/development/libraries/haskell/haskell-src-meta/default.nix
@@ -2,10 +2,9 @@
 
 cabal.mkDerivation (self: {
   pname = "haskell-src-meta";
-  version = "0.6.0.3";
-  sha256 = "1ag26pzppvqw9ch6jz1p0bhsld7fz0b01k7h9516hnmy215h7xai";
+  version = "0.6.0.4";
+  sha256 = "10dixf2abk0canwikf3wdp1ahc51400wxa7x4g59pygv8a3c1c1x";
   buildDepends = [ haskellSrcExts syb thOrphans uniplate ];
-  jailbreak = true;
   meta = {
     description = "Parse source to template-haskell abstract syntax";
     license = self.stdenv.lib.licenses.bsd3;
-- 
GitLab


From 4b9d4600e1af73b54aab9c1cc3f5a1a84ba271f4 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 13 Oct 2013 10:14:30 +0200
Subject: [PATCH 5182/5331] haskell-haxr: update to version 3000.10.1.1

---
 pkgs/development/libraries/haskell/haxr/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/haxr/default.nix b/pkgs/development/libraries/haskell/haxr/default.nix
index a5aaf44c392..26ebbb9f8b0 100644
--- a/pkgs/development/libraries/haskell/haxr/default.nix
+++ b/pkgs/development/libraries/haskell/haxr/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "haxr";
-  version = "3000.9.3";
-  sha256 = "1jg7abgbykxjjpmakmfm6zcwxn0hf9q53430ibr4m9n6alh7nglq";
+  version = "3000.10.1.1";
+  sha256 = "0qvbl3bms2mf650w9j3r0pnl151vzkggy2if3f4rj34qwb2sxmvp";
   buildDepends = [
     base64Bytestring blazeBuilder HaXml HTTP mtl network time
     utf8String
-- 
GitLab


From ace869c15b31ea1db5a48303f95652700e823bd0 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 13 Oct 2013 10:14:30 +0200
Subject: [PATCH 5183/5331] haskell-mwc-random: update to version 0.13.1.0

---
 pkgs/development/libraries/haskell/mwc-random/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/mwc-random/default.nix b/pkgs/development/libraries/haskell/mwc-random/default.nix
index 2d6b846e706..d26980994e7 100644
--- a/pkgs/development/libraries/haskell/mwc-random/default.nix
+++ b/pkgs/development/libraries/haskell/mwc-random/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "mwc-random";
-  version = "0.13.0.0";
-  sha256 = "16f8dd81wj81h0jcqnrlr2d6mjc7q2r436qf8z320d6wpzih2djy";
+  version = "0.13.1.0";
+  sha256 = "16g6b1pphr4p36nn5qjj62iwf47rq8kfmpjgfvd35r3cz9qqb8cb";
   buildDepends = [ primitive time vector ];
   testDepends = [
     HUnit QuickCheck statistics testFramework testFrameworkHunit
-- 
GitLab


From 25a3c855fe55ed1ba0e01322b0e509c89aa92acc Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 13 Oct 2013 10:14:30 +0200
Subject: [PATCH 5184/5331] haskell-network-conduit-tls: update to version
 1.0.2

---
 .../haskell/network-conduit-tls/default.nix     | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/libraries/haskell/network-conduit-tls/default.nix b/pkgs/development/libraries/haskell/network-conduit-tls/default.nix
index bfb96e30480..415c047a2f5 100644
--- a/pkgs/development/libraries/haskell/network-conduit-tls/default.nix
+++ b/pkgs/development/libraries/haskell/network-conduit-tls/default.nix
@@ -1,16 +1,17 @@
-{ cabal, aeson, certificate, conduit, cprngAes, cryptoApi
-, cryptoRandomApi, network, networkConduit, pem, systemFileio
-, systemFilepath, tls, tlsExtra, transformers
+{ cabal, aeson, certificate, conduit, connection, cprngAes
+, cryptoApi, cryptoRandomApi, dataDefault, monadControl, network
+, networkConduit, pem, systemFileio, systemFilepath, tls, tlsExtra
+, transformers
 }:
 
 cabal.mkDerivation (self: {
   pname = "network-conduit-tls";
-  version = "1.0.1.1";
-  sha256 = "0v5rspcjhd2vid5i74dy1sdcvci7dlr88sgr0v9vjp4gcyb29qlj";
+  version = "1.0.2";
+  sha256 = "0m3sbb4vpsjf568zaaxri8x7x46wngf5y2s5chgjzfmbj0amkl51";
   buildDepends = [
-    aeson certificate conduit cprngAes cryptoApi cryptoRandomApi
-    network networkConduit pem systemFileio systemFilepath tls tlsExtra
-    transformers
+    aeson certificate conduit connection cprngAes cryptoApi
+    cryptoRandomApi dataDefault monadControl network networkConduit pem
+    systemFileio systemFilepath tls tlsExtra transformers
   ];
   meta = {
     homepage = "https://github.com/snoyberg/conduit";
-- 
GitLab


From d0c56466e0d59653fa6d1a043b9b00bb9672cbf7 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 13 Oct 2013 10:14:30 +0200
Subject: [PATCH 5185/5331] haskell-optparse-applicative: update to version
 0.6.0

---
 .../libraries/haskell/optparse-applicative/default.nix        | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/optparse-applicative/default.nix b/pkgs/development/libraries/haskell/optparse-applicative/default.nix
index a3ab241b28c..44917d01c00 100644
--- a/pkgs/development/libraries/haskell/optparse-applicative/default.nix
+++ b/pkgs/development/libraries/haskell/optparse-applicative/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "optparse-applicative";
-  version = "0.5.2.1";
-  sha256 = "0w4mk851mx8dch8lnck0g82asmzrsc47xrf34jygh0f6v4kbj40i";
+  version = "0.6.0";
+  sha256 = "07wzsgwym0g6qd39jvgp6ndpqdn2w0c4sn9mcz19rqlb2am24ip8";
   buildDepends = [ transformers ];
   testDepends = [
     HUnit testFramework testFrameworkHunit testFrameworkThPrime
-- 
GitLab


From 1dc9738c340e5d5478d2bb474742f9a63212b3ba Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 13 Oct 2013 10:14:31 +0200
Subject: [PATCH 5186/5331] haskell-pandoc-citeproc: update to version 0.1.2

---
 .../libraries/haskell/pandoc-citeproc/default.nix    | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/libraries/haskell/pandoc-citeproc/default.nix b/pkgs/development/libraries/haskell/pandoc-citeproc/default.nix
index 4ae06d59724..4960e16202e 100644
--- a/pkgs/development/libraries/haskell/pandoc-citeproc/default.nix
+++ b/pkgs/development/libraries/haskell/pandoc-citeproc/default.nix
@@ -1,19 +1,19 @@
 { cabal, aeson, aesonPretty, attoparsec, Diff, filepath, hexpat
 , hsBibutils, HTTP, json, mtl, network, pandoc, pandocTypes, parsec
-, rfc5051, syb, tagsoup, texmath, text, time, utf8String, vector
-, yaml
+, rfc5051, split, syb, tagsoup, texmath, text, time, utf8String
+, vector, yaml
 }:
 
 cabal.mkDerivation (self: {
   pname = "pandoc-citeproc";
-  version = "0.1.1.2";
-  sha256 = "02bs9wb3x1p9fs4kixchmvyyrhrkmx0qkwv22qmy4gsp90sc8q8i";
+  version = "0.1.2";
+  sha256 = "055msvrcqjkijkhzws48scpc4z90g0qjjsdcd0fhy309da6vax57";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [
     aeson attoparsec filepath hexpat hsBibutils HTTP json mtl network
-    pandocTypes parsec rfc5051 syb tagsoup texmath text time utf8String
-    vector yaml
+    pandoc pandocTypes parsec rfc5051 split syb tagsoup texmath text
+    time utf8String vector yaml
   ];
   testDepends = [ aeson aesonPretty Diff pandoc pandocTypes ];
   doCheck = false;
-- 
GitLab


From f925c182e8750ec4289f19bbc51cfdfe08e4753d Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 13 Oct 2013 10:14:31 +0200
Subject: [PATCH 5187/5331] haskell-postgresql-simple: update to version
 0.3.8.0

---
 .../libraries/haskell/postgresql-simple/default.nix           | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/postgresql-simple/default.nix b/pkgs/development/libraries/haskell/postgresql-simple/default.nix
index 9f89ae83ec6..a6412006e8f 100644
--- a/pkgs/development/libraries/haskell/postgresql-simple/default.nix
+++ b/pkgs/development/libraries/haskell/postgresql-simple/default.nix
@@ -5,8 +5,8 @@
 
 cabal.mkDerivation (self: {
   pname = "postgresql-simple";
-  version = "0.3.7.1";
-  sha256 = "1xrgwpg58srmzv1d0jdknyh5vwdq2c40fyqy0wvgppisxzq469wh";
+  version = "0.3.8.0";
+  sha256 = "1p1cxp7mjrxyxxqrq2skm3kqrnmb3k6fb8kwr2aj9cnbqfhwl1qf";
   buildDepends = [
     aeson attoparsec blazeBuilder blazeTextual postgresqlLibpq text
     time transformers vector
-- 
GitLab


From 60116c5c2c5f76fd8791410d71ad19917c211b32 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 13 Oct 2013 10:14:31 +0200
Subject: [PATCH 5188/5331] haskell-resourcet: update to version 0.4.9

---
 pkgs/development/libraries/haskell/resourcet/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/resourcet/default.nix b/pkgs/development/libraries/haskell/resourcet/default.nix
index b0953cf9f7c..b4d0fccd8a0 100644
--- a/pkgs/development/libraries/haskell/resourcet/default.nix
+++ b/pkgs/development/libraries/haskell/resourcet/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "resourcet";
-  version = "0.4.8";
-  sha256 = "10pp4hm5c2k2fqzqpagy03gmr526ac2ji8h7k0mcypf4v0ga620m";
+  version = "0.4.9";
+  sha256 = "1jpaphmwvykjshjqwmmyfx64w1j99f6dphy9ygrzc32fjffk5laz";
   buildDepends = [
     liftedBase mmorph monadControl mtl transformers transformersBase
   ];
-- 
GitLab


From 2bb93a3bcc5d78ff864036537f6accb3f944ab0e Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 13 Oct 2013 10:14:31 +0200
Subject: [PATCH 5189/5331] haskell-simple-sendfile: update to version 0.2.13

---
 .../development/libraries/haskell/simple-sendfile/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/simple-sendfile/default.nix b/pkgs/development/libraries/haskell/simple-sendfile/default.nix
index b8c527daf1a..806feee295f 100644
--- a/pkgs/development/libraries/haskell/simple-sendfile/default.nix
+++ b/pkgs/development/libraries/haskell/simple-sendfile/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "simple-sendfile";
-  version = "0.2.12";
-  sha256 = "019n82700fbhsqxgn1cwfqii27r436gljis7yl02zjnzy7xlvrha";
+  version = "0.2.13";
+  sha256 = "03cgbzfhkih1ln1xb78r1hfh6zzjjj6763n9nzr9cj6bxs0fiqd3";
   buildDepends = [ network ];
   testDepends = [ conduit hspec HUnit network networkConduit ];
   doCheck = false;
-- 
GitLab


From 51a88b28b9ccea898e08ede8834771d8416308f8 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 13 Oct 2013 10:14:31 +0200
Subject: [PATCH 5190/5331] haskell-yaml: update to version 0.8.5.1

---
 pkgs/development/libraries/haskell/yaml/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/yaml/default.nix b/pkgs/development/libraries/haskell/yaml/default.nix
index 7e2bd368c7e..8d06099b77e 100644
--- a/pkgs/development/libraries/haskell/yaml/default.nix
+++ b/pkgs/development/libraries/haskell/yaml/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "yaml";
-  version = "0.8.5";
-  sha256 = "12jj785gzcnrif460cx2k69pc2h9h956g0w1gp8pcr5hawrvd6rg";
+  version = "0.8.5.1";
+  sha256 = "0vbampykc5a027q5fh5w6i1bxblyxx7s3nzhpzaa4c1yz8nz3k57";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [
-- 
GitLab


From db2d2968271ace0824cc97a4de8a73071b64bdd5 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 13 Oct 2013 10:14:31 +0200
Subject: [PATCH 5191/5331] haskell-yesod-platform: update to version 1.2.4.3

---
 pkgs/development/libraries/haskell/yesod-platform/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/yesod-platform/default.nix b/pkgs/development/libraries/haskell/yesod-platform/default.nix
index 9fe24ca4a74..f75b5706f6a 100644
--- a/pkgs/development/libraries/haskell/yesod-platform/default.nix
+++ b/pkgs/development/libraries/haskell/yesod-platform/default.nix
@@ -30,8 +30,8 @@
 
 cabal.mkDerivation (self: {
   pname = "yesod-platform";
-  version = "1.2.4.2";
-  sha256 = "1hmzdwjqi3cxdmyvcr48kprrsa8h548z272mif07114d0qh48x4w";
+  version = "1.2.4.3";
+  sha256 = "1ilkfmg4sdrz45hc2m8b8rqz242phgxzgizrnd41d5g04jib3hl3";
   buildDepends = [
     aeson ansiTerminal asn1Data asn1Types attoparsec attoparsecConduit
     authenticate base64Bytestring baseUnicodeSymbols blazeBuilder
-- 
GitLab


From ba36baee34160e996c7e1a37f2faddb6ecc02f9c Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 13 Oct 2013 10:42:20 +0200
Subject: [PATCH 5192/5331] haskell-connection: add version 0.1.3

---
 .../libraries/haskell/connection/default.nix   | 18 ++++++++++++++++++
 pkgs/top-level/haskell-packages.nix            |  2 ++
 2 files changed, 20 insertions(+)
 create mode 100644 pkgs/development/libraries/haskell/connection/default.nix

diff --git a/pkgs/development/libraries/haskell/connection/default.nix b/pkgs/development/libraries/haskell/connection/default.nix
new file mode 100644
index 00000000000..a7930cab08b
--- /dev/null
+++ b/pkgs/development/libraries/haskell/connection/default.nix
@@ -0,0 +1,18 @@
+{ cabal, certificate, cprngAes, dataDefault, network, socks, tls
+, tlsExtra
+}:
+
+cabal.mkDerivation (self: {
+  pname = "connection";
+  version = "0.1.3";
+  sha256 = "13bwlbga612kc7g3m3rrdzbdv4w0glp4af9r6crwgjsmxgimrgs9";
+  buildDepends = [
+    certificate cprngAes dataDefault network socks tls tlsExtra
+  ];
+  meta = {
+    homepage = "http://github.com/vincenthz/hs-connection";
+    description = "Simple and easy network connections API";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 334c52109cd..44d5355f3da 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -754,6 +754,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
 
   configurator = callPackage ../development/libraries/haskell/configurator {};
 
+  connection = callPackage ../development/libraries/haskell/connection {};
+
   constraints = callPackage ../development/libraries/haskell/constraints {};
 
   convertible = callPackage ../development/libraries/haskell/convertible {};
-- 
GitLab


From 182e352ccfa49ed00f70e6902cdb2d71365b0509 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 13 Oct 2013 10:44:44 +0200
Subject: [PATCH 5193/5331] haskell-src-exts: switch default to version 1.14.0

---
 pkgs/top-level/haskell-packages.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 44d5355f3da..eae5b1660ed 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -1162,7 +1162,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
 
   haskellSrcExts_1_13_5 = callPackage ../development/libraries/haskell/haskell-src-exts/1.13.5.nix {};
   haskellSrcExts_1_14_0 = callPackage ../development/libraries/haskell/haskell-src-exts/1.14.0.nix {};
-  haskellSrcExts = self.haskellSrcExts_1_13_5;
+  haskellSrcExts = self.haskellSrcExts_1_14_0;
 
   haskellSrcMeta = callPackage ../development/libraries/haskell/haskell-src-meta {};
 
-- 
GitLab


From 4dee7de246e6037d494d798efd2a383d9fccc8cc Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 13 Oct 2013 12:41:31 +0200
Subject: [PATCH 5194/5331] haskell-packunused: update to version 0.1.0.1

---
 pkgs/development/tools/haskell/packunused/default.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/haskell/packunused/default.nix b/pkgs/development/tools/haskell/packunused/default.nix
index 814c2774cb2..35d318d36ba 100644
--- a/pkgs/development/tools/haskell/packunused/default.nix
+++ b/pkgs/development/tools/haskell/packunused/default.nix
@@ -2,11 +2,12 @@
 
 cabal.mkDerivation (self: {
   pname = "packunused";
-  version = "0.1.0.0";
-  sha256 = "131x99id3jcxglj24p5sjb6mnhphj925pp4jdjy09y6ai7wss3rs";
+  version = "0.1.0.1";
+  sha256 = "130717k4rknj5jl904cmb4h09msp4xjj84w6iwzc10lz736dk3jd";
   isLibrary = false;
   isExecutable = true;
   buildDepends = [ Cabal cmdargs filepath haskellSrcExts ];
+  jailbreak = true;
   meta = {
     homepage = "https://github.com/hvr/packunused";
     description = "Tool for detecting redundant Cabal package dependencies";
-- 
GitLab


From 776adb5704262ecc884fc2d003988ffb23f4df0a Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Mon, 14 Oct 2013 10:36:39 +0400
Subject: [PATCH 5195/5331] Updating TeXLive to 2013 using updated Debian
 snapshots.

Kept the old hacks where they don't break the build in case they things
they fix are still relevant.

I checked that the upgrade doesn't break:
1) Asymptote and EProver builds.
2) My XeLaTeX demo from configurations/ repository.
3) Some of my own files.

The upgrade fixes problems with simultaneous use of 3D and LaTeX labels
in Asymptote.

Please provide a test that worked previously and is broken now if you
need to revert this update or its parts.
---
 .../builder-defs/builder-defs.nix             |  4 +-
 pkgs/data/fonts/lmodern/default.nix           |  4 +-
 pkgs/data/fonts/tipa/default.nix              |  2 +-
 .../libraries/harfbuzz/default.nix            | 10 +++-
 .../libraries/silgraphite/graphite2.nix       | 21 ++++++++
 .../typesetting/tex/texlive/aggregate.nix     | 17 +++---
 .../typesetting/tex/texlive/cm-super.nix      | 20 +++----
 .../tools/typesetting/tex/texlive/context.nix |  4 +-
 .../tools/typesetting/tex/texlive/default.nix | 52 ++++++++++++-------
 pkgs/tools/typesetting/tex/texlive/extra.nix  |  6 +--
 .../typesetting/tex/texlive/moderncv.nix      |  6 +--
 .../tex/texlive/moderntimeline.nix            |  6 +--
 pkgs/tools/typesetting/tex/texlive/pgf.nix    |  4 +-
 pkgs/tools/typesetting/tex/texlive/xcolor.nix | 12 ++---
 pkgs/top-level/all-packages.nix               | 15 ++++--
 15 files changed, 120 insertions(+), 63 deletions(-)
 create mode 100644 pkgs/development/libraries/silgraphite/graphite2.nix

diff --git a/pkgs/build-support/builder-defs/builder-defs.nix b/pkgs/build-support/builder-defs/builder-defs.nix
index 3c5d7af621c..e22aa6bc66e 100644
--- a/pkgs/build-support/builder-defs/builder-defs.nix
+++ b/pkgs/build-support/builder-defs/builder-defs.nix
@@ -565,13 +565,15 @@ let inherit (builtins) head tail trace; in
      # Interpreters that are already in the store are left untouched.
          echo "patching script interpreter paths"
          local f
-         for f in $(find "${dir}" -type f -perm +0100); do
+         for f in $(find "${dir}" -xtype f -perm +0100); do
              local oldPath=$(sed -ne '1 s,^#![ ]*\([^ ]*\).*$,\1,p' "$f")
              if test -n "$oldPath" -a "''${oldPath:0:''${#NIX_STORE}}" != "$NIX_STORE"; then
                  local newPath=$(type -P $(basename $oldPath) || true)
                  if test -n "$newPath" -a "$newPath" != "$oldPath"; then
                      echo "$f: interpreter changed from $oldPath to $newPath"
                      sed -i "1 s,$oldPath,$newPath," "$f"
+		 else
+		     echo "$f: not changing interpreter from $oldPath"
                  fi
              fi
          done
diff --git a/pkgs/data/fonts/lmodern/default.nix b/pkgs/data/fonts/lmodern/default.nix
index 831a3ddbd09..1368537c2a1 100644
--- a/pkgs/data/fonts/lmodern/default.nix
+++ b/pkgs/data/fonts/lmodern/default.nix
@@ -9,10 +9,10 @@ stdenv.mkDerivation {
   };
 
   installPhase = ''
-    mkdir -p $out/texmf/
+    mkdir -p $out/texmf-dist/
     mkdir -p $out/share/fonts/
 
-    cp -r ./* $out/texmf/
+    cp -r ./* $out/texmf-dist/
     cp -r fonts/{opentype,type1} $out/share/fonts/
 
     ln -s $out/texmf* $out/share/
diff --git a/pkgs/data/fonts/tipa/default.nix b/pkgs/data/fonts/tipa/default.nix
index 47e98f7c53a..1049e6924bd 100644
--- a/pkgs/data/fonts/tipa/default.nix
+++ b/pkgs/data/fonts/tipa/default.nix
@@ -9,7 +9,7 @@ stdenv.mkDerivation {
   };
 
   installPhase = ''
-    export PREFIX="$out/texmf"
+    export PREFIX="$out/texmf-dist"
     mkdir -p "$PREFIX" "$out/share"
     make install PREFIX="$PREFIX"
 
diff --git a/pkgs/development/libraries/harfbuzz/default.nix b/pkgs/development/libraries/harfbuzz/default.nix
index 4fb024db0e1..1202ab5825d 100644
--- a/pkgs/development/libraries/harfbuzz/default.nix
+++ b/pkgs/development/libraries/harfbuzz/default.nix
@@ -1,4 +1,5 @@
-{ stdenv, fetchurl, pkgconfig, glib, freetype, libintlOrEmpty }:
+{ stdenv, fetchurl, pkgconfig, glib, freetype,
+  icu ? null, graphite2 ? null, libintlOrEmpty }:
 
 stdenv.mkDerivation rec {
   name = "harfbuzz-0.9.12";
@@ -8,7 +9,12 @@ stdenv.mkDerivation rec {
     sha256 = "19cx5y2m20rp7z5j7mwqfb4ph2g8lrri69zim44x362y4w5gfly6";
   };
 
-  buildInputs = [ pkgconfig glib freetype ] ++ libintlOrEmpty;
+  buildInputs = [ pkgconfig glib freetype ]
+    ++ libintlOrEmpty;
+  propagatedBuildInputs = []
+    ++ (stdenv.lib.optionals (icu != null) [icu])
+    ++ (stdenv.lib.optionals (graphite2 != null) [graphite2])
+    ;
 
   meta = {
     description = "An OpenType text shaping engine";
diff --git a/pkgs/development/libraries/silgraphite/graphite2.nix b/pkgs/development/libraries/silgraphite/graphite2.nix
new file mode 100644
index 00000000000..0a36efbc982
--- /dev/null
+++ b/pkgs/development/libraries/silgraphite/graphite2.nix
@@ -0,0 +1,21 @@
+{ stdenv, fetchurl, pkgconfig, freetype, libXft, pango, fontconfig, cmake }:
+
+stdenv.mkDerivation rec {
+  version = "1.2.3";
+  name = "graphite2-${version}";
+  
+  src = fetchurl {
+    url = "mirror://sourceforge/silgraphite/graphite2/${name}.tgz";
+    sha256 = "1xgwnd81gm6p293x8paxb3yisnvpj5qnv1dzr7bjdi7b7h00ls7g";
+  };
+
+  buildInputs = [pkgconfig freetype libXft pango fontconfig cmake];
+
+  NIX_CFLAGS_COMPILE = "-I${freetype}/include/freetype2";
+
+  meta = {
+    description = "An advanced font engine";
+    maintainers = [ stdenv.lib.maintainers.raskin ];
+    platforms = stdenv.lib.platforms.linux;
+  };
+}
diff --git a/pkgs/tools/typesetting/tex/texlive/aggregate.nix b/pkgs/tools/typesetting/tex/texlive/aggregate.nix
index 84fa1cfab75..2d1de93fed8 100644
--- a/pkgs/tools/typesetting/tex/texlive/aggregate.nix
+++ b/pkgs/tools/typesetting/tex/texlive/aggregate.nix
@@ -3,6 +3,7 @@ rec {
   name = "TeXLive-linkdir";
 
   buildInputs = lib.closePropagation paths
+    ++ [perl]
     ++ stdenv.lib.optional stdenv.isDarwin makeWrapper;
 
   phaseNames = [ "doAggregate" ];
@@ -11,12 +12,15 @@ rec {
     mkdir -p $out/bin
     for currentPath in ${lib.concatStringsSep " " buildInputs}; do
         echo Symlinking "$currentPath"
+        find $currentPath/share/info $currentPath/share/man $(echo $currentPath/texmf*/) -type d | while read; do
+            REPLY="''${REPLY#$currentPath}"
+            mkdir -p $out/"$REPLY"
+	done
         find $currentPath/share/info $currentPath/share/man $(echo $currentPath/texmf*/) ! -type d | while read; do
             REPLY="''${REPLY#$currentPath}"
-            mkdir -p $out/"$(dirname "$REPLY")"
             ln -fs $currentPath/"$REPLY" $out/"$REPLY"
             echo
-        done | while read; do head -n 99 >/dev/null; echo -n .; done
+        done | while read; do head -n 999 >/dev/null; echo -n .; done
 
         for i in "$currentPath/bin/"* :; do
             test "$i" != : || continue
@@ -31,8 +35,8 @@ rec {
 
     ln -s $out/texmf* $out/share/
 
-    rm -r $out/texmf-config
-    find $out/texmf/ -type d | while read; do
+    rm -rf $out/texmf-config
+    find $out/texmf*/ -type d | while read; do
       REPLY="''${REPLY#$out/texmf}"
       mkdir -p $out/texmf-config/"$REPLY"
     done
@@ -45,9 +49,10 @@ rec {
         chmod a+x $out/bin/$(basename $i)
     done
 
-    rm $out/texmf*/ls-R
+    rm -f $out/texmf*/ls-R
     for i in web2c texconfig fonts/map; do
-        cp -Lr $out/texmf/$i/* $out/texmf-config/$i || true
+        mkdir -p $out/texmf-config/$i 
+        cp -Lr $out/texmf*/$i/* $out/texmf-config/$i || true
     done
     chmod -R u+w $out/texmf-config
 
diff --git a/pkgs/tools/typesetting/tex/texlive/cm-super.nix b/pkgs/tools/typesetting/tex/texlive/cm-super.nix
index e23b3936850..4d161c3e053 100644
--- a/pkgs/tools/typesetting/tex/texlive/cm-super.nix
+++ b/pkgs/tools/typesetting/tex/texlive/cm-super.nix
@@ -10,16 +10,16 @@ rec {
   doCopy = fullDepEntry (''
     mkdir -p $out/share/
 
-    mkdir -p $out/texmf/fonts/enc
-    mkdir -p $out/texmf/fonts/map
-    mkdir -p $out/texmf/fonts/type1/public/cm-super
-    cp pfb/*.pfb $out/texmf/fonts/type1/public/cm-super
-    mkdir -p $out/texmf/dvips/cm-super
-    cp dvips/*.{map,enc}  $out/texmf/dvips/cm-super
-    cp dvips/*.enc  $out/texmf/fonts/enc
-    cp dvips/*.map  $out/texmf/fonts/map
-    mkdir -p $out/texmf/dvipdfm/config
-    cp dvipdfm/*.map  $out/texmf/dvipdfm/config
+    mkdir -p $out/texmf-dist/fonts/enc
+    mkdir -p $out/texmf-dist/fonts/map
+    mkdir -p $out/texmf-dist/fonts/type1/public/cm-super
+    cp pfb/*.pfb $out/texmf-dist/fonts/type1/public/cm-super
+    mkdir -p $out/texmf-dist/dvips/cm-super
+    cp dvips/*.{map,enc}  $out/texmf-dist/dvips/cm-super
+    cp dvips/*.enc  $out/texmf-dist/fonts/enc
+    cp dvips/*.map  $out/texmf-dist/fonts/map
+    mkdir -p $out/texmf-dist/dvipdfm/config
+    cp dvipdfm/*.map  $out/texmf-dist/dvipdfm/config
 
     ln -s $out/texmf* $out/share/
   '') ["minInit" "doUnpack" "defEnsureDir" "addInputs"];
diff --git a/pkgs/tools/typesetting/tex/texlive/context.nix b/pkgs/tools/typesetting/tex/texlive/context.nix
index a7161cea4c1..c0c702cd418 100644
--- a/pkgs/tools/typesetting/tex/texlive/context.nix
+++ b/pkgs/tools/typesetting/tex/texlive/context.nix
@@ -11,8 +11,8 @@ rec {
   doCopy = fullDepEntry (''
     mkdir -p $out/share/
 
-    mkdir -p $out/texmf
-    cp -r * $out/texmf
+    mkdir -p $out/texmf-dist
+    cp -r * $out/texmf-dist
 
     ln -s $out/texmf* $out/share/
   '') ["minInit" "doUnpack" "defEnsureDir" "addInputs"];
diff --git a/pkgs/tools/typesetting/tex/texlive/default.nix b/pkgs/tools/typesetting/tex/texlive/default.nix
index f119dbd1e4a..57f7424dc2d 100644
--- a/pkgs/tools/typesetting/tex/texlive/default.nix
+++ b/pkgs/tools/typesetting/tex/texlive/default.nix
@@ -1,18 +1,18 @@
 args : with args;
 rec {
   src = fetchurl {
-    url = mirror://debian/pool/main/t/texlive-bin/texlive-bin_2012.20120628.orig.tar.xz;
-    sha256 = "0k94df3lfvghngzdzi2d4fz2z0gs8iglz7h3w2lxvlhiwwpmx601";
+    url = mirror://debian/pool/main/t/texlive-bin/texlive-bin_2013.20130729.30972.orig.tar.xz;
+    sha256 = "1idgyim6r4bi3id245k616qrdarfh65xv3gi2psarqqmsw504yhd";
   };
 
   texmfSrc = fetchurl {
-    url = mirror://debian/pool/main/t/texlive-base/texlive-base_2012.20120611.orig.tar.xz;
-    sha256 = "116zm0qdq9rd4vakhd2py9q7lq3ihspc7hy33bh8wy5v1rgiqsm6";
+    url = mirror://debian/pool/main/t/texlive-base/texlive-base_2013.20130918.orig.tar.xz;
+    sha256 = "0h7x49zsd2gs8fr28f4h04dv5m8p2mpgqxk2vvl5xlf4wwxxbm2p";
   };
 
   langTexmfSrc = fetchurl {
-    url = mirror://debian/pool/main/t/texlive-lang/texlive-lang_2012.20120611.orig.tar.xz;
-    sha256 = "0zh9svszfkbjx72i7sa9gg0gak93wf05845mxpjv56h8qwk4bffv";
+    url = mirror://debian/pool/main/t/texlive-lang/texlive-lang_2013.20131010.orig.tar.xz;
+    sha256 = "17wfd2qmyafv74ac3ssy9aga12g09l2q0r1p19fb4vvs0wrkwzbz";
   };
 
   setupHook = ./setup-hook.sh;
@@ -34,6 +34,8 @@ rec {
     sed -e 's@\<env python@${python}/bin/python@' -i $(grep 'env python' -rl . )
 
     sed -e '/ubidi_open/i#include <unicode/urename.h>' -i $(find . -name configure)
+    sed -e 's/-lttf/-lfreetype/' -i $(find . -name configure)
+
     sed -e s@ncurses/curses.h@curses.h@g -i $(grep ncurses/curses.h -rl . )
     sed -e '1i\#include <string.h>\n\#include <stdlib.h>' -i $( find libs/teckit -name '*.cpp' -o -name '*.c' )
 
@@ -44,7 +46,7 @@ rec {
     cd Work
   '' ) [ "minInit" "doUnpack" "addInputs" "defEnsureDir" ];
 
-  doPostInstall = fullDepEntry( ''
+  promoteLibexec = fullDepEntry (''
     mkdir -p $out/libexec/
     mv $out/bin $out/libexec/$(uname -m)
     mkdir -p $out/bin
@@ -61,13 +63,15 @@ rec {
           rm "$out/libexec/$(basename "$i")"
       fi;
     done
+  '') ["doMakeInstall"];
 
-    [ -d $out/texmf-config ] || ln -s $out/texmf $out/texmf-config
-    ln -s -v "$out/"*texmf* "$out/share/" || true
-
-    sed -e 's/.*pyhyph.*/=&/' -i $out/texmf-config/tex/generic/config/language.dat
+  doPostInstall = fullDepEntry( ''
+    cp -r "$out/"texmf* "$out/share/" || true
+    rm -rf "$out"/texmf*
+    [ -d $out/share/texmf-config ] || ln -s $out/share/texmf-dist $out/share/texmf-config
+    ln -s "$out"/share/texmf* "$out"/
 
-    PATH=$PATH:$out/bin mktexlsr $out/texmf*
+    PATH=$PATH:$out/bin mktexlsr $out/share/texmf*
 
     HOME=. PATH=$PATH:$out/bin updmap-sys --syncwithtrees
 
@@ -80,25 +84,37 @@ rec {
     #
     # I find it acceptable, hence the "|| true".
     echo "building format files..."
-    mkdir -p "$out/texmf-var/web2c"
+    mkdir -p "$out/share/texmf-var/web2c"
+    ln -sf "$out"/out/share/texmf* "$out"/
     PATH="$PATH:$out/bin" fmtutil-sys --all || true
 
-    PATH=$PATH:$out/bin mktexlsr $out/texmf*
+    PATH=$PATH:$out/bin mktexlsr $out/share/texmf*
   '' + stdenv.lib.optionalString stdenv.isDarwin ''
     for prog in $out/bin/*; do
       wrapProgram "$prog" --prefix DYLD_LIBRARY_PATH : "${poppler}/lib"
     done
-  '' ) [ "minInit" "defEnsureDir" "doUnpack" "doMakeInstall" ];
+  '' ) [ "minInit" "defEnsureDir" "doUnpack" "doMakeInstall" "promoteLibexec" "patchShebangsInterim"];
+
+  patchShebangsInterimBin = doPatchShebangs ''$out/bin/'';
+  patchShebangsInterimLibexec = doPatchShebangs ''$out/libexec/'';
+  patchShebangsInterimShareTexmfDist = doPatchShebangs ''$out/share/texmf-dist/scripts/'';
+  patchShebangsInterimTexmfDist = doPatchShebangs ''$out/texmf-dist/scripts/'';
+
+  patchShebangsInterim = fullDepEntry ("") ["patchShebangsInterimBin" 
+    "patchShebangsInterimLibexec" "patchShebangsInterimTexmfDist" 
+    "patchShebangsInterimShareTexmfDist"];
 
   buildInputs = [ zlib bzip2 ncurses libpng flex bison libX11 libICE xproto
     freetype t1lib gd libXaw icu ghostscript ed libXt libXpm libXmu libXext
     xextproto perl libSM ruby expat curl libjpeg python fontconfig xz pkgconfig
-    poppler silgraphite lesstif zziplib ]
+    poppler graphite2 lesstif zziplib harfbuzz texinfo ]
     ++ stdenv.lib.optionals stdenv.isDarwin [ makeWrapper ];
 
   configureFlags = [ "--with-x11" "--enable-ipc" "--with-mktexfmt"
     "--enable-shared" "--disable-native-texlive-build" "--with-system-zziplib"
-    "--with-system-libgs" "--with-system-t1lib" "--with-system-freetype2" ]
+    "--with-system-libgs" "--with-system-t1lib" "--with-system-freetype2" 
+    "--with-system-freetype=no" "--disable-ttf2pk" "--enable-ttf2pk2"
+    ]
     ++ ( if stdenv.isDarwin
          # ironically, couldn't get xetex compiling on darwin
          then [ "--disable-xetex" "--disable-xdv2pdf" "--disable-xdvipdfmx" ]
@@ -107,7 +123,7 @@ rec {
 
   phaseNames = [ "addInputs" "doMainBuild" "doMakeInstall" "doPostInstall" ];
 
-  name = "texlive-core-2012";
+  name = "texlive-core-2013";
 
   meta = with stdenv.lib; {
     description = "A TeX distribution";
diff --git a/pkgs/tools/typesetting/tex/texlive/extra.nix b/pkgs/tools/typesetting/tex/texlive/extra.nix
index 180019bb205..6613578e2c6 100644
--- a/pkgs/tools/typesetting/tex/texlive/extra.nix
+++ b/pkgs/tools/typesetting/tex/texlive/extra.nix
@@ -1,9 +1,9 @@
 args: with args;
 rec {
-  name = "texlive-extra-2012";
+  name = "texlive-extra-2013";
   src = fetchurl {
-    url = mirror://debian/pool/main/t/texlive-extra/texlive-extra_2012.20120611.orig.tar.xz;
-    sha256 = "1wn2gwifb5ww6nb15zdbkk5yz5spynvwqscvrgxzb84p0z3hy8dq";
+    url = mirror://debian/pool/main/t/texlive-extra/texlive-extra_2013.20131010.orig.tar.xz;
+    sha256 = "1wciyjwp0swny22amwcnr6vvdwjy423856q7c3l1sd5b31xfbc18";
   };
 
   buildInputs = [texLive xz];
diff --git a/pkgs/tools/typesetting/tex/texlive/moderncv.nix b/pkgs/tools/typesetting/tex/texlive/moderncv.nix
index 28329cff916..0ce1afbb41b 100644
--- a/pkgs/tools/typesetting/tex/texlive/moderncv.nix
+++ b/pkgs/tools/typesetting/tex/texlive/moderncv.nix
@@ -10,9 +10,9 @@ rec {
   buildInputs = [texLive unzip];
   phaseNames = ["doCopy"];
   doCopy = fullDepEntry (''
-    mkdir -p $out/texmf/tex/latex/moderncv $out/texmf/doc $out/share
-    mv *.cls *.sty $out/texmf/tex/latex/moderncv/
-    mv examples $out/texmf/doc/moderncv
+    mkdir -p $out/texmf-dist/tex/latex/moderncv $out/texmf-dist/doc $out/share
+    mv *.cls *.sty $out/texmf-dist/tex/latex/moderncv/
+    mv examples $out/texmf-dist/doc/moderncv
     ln -s $out/texmf* $out/share/
   '') ["minInit" "addInputs" "doUnpack" "defEnsureDir"];
 
diff --git a/pkgs/tools/typesetting/tex/texlive/moderntimeline.nix b/pkgs/tools/typesetting/tex/texlive/moderntimeline.nix
index d129cc62020..4cb93794edf 100644
--- a/pkgs/tools/typesetting/tex/texlive/moderntimeline.nix
+++ b/pkgs/tools/typesetting/tex/texlive/moderntimeline.nix
@@ -13,9 +13,9 @@ rec {
   buildInputs = [texLive unzip];
   phaseNames = ["doCopy"];
   doCopy = fullDepEntry (''
-    mkdir -p $out/texmf/tex/latex/moderntimeline $out/texmf/doc/moderntimeline $out/share
-    mv *.dtx *.ins $out/texmf/tex/latex/moderntimeline/
-    mv *.pdf $out/texmf/doc/moderntimeline/
+    mkdir -p $out/texmf-dist/tex/latex/moderntimeline $out/texmf-dist/doc/moderntimeline $out/share
+    mv *.dtx *.ins $out/texmf-dist/tex/latex/moderntimeline/
+    mv *.pdf $out/texmf-dist/doc/moderntimeline/
     ln -s $out/texmf* $out/share/
   '') ["minInit" "addInputs" "doUnpack" "defEnsureDir"];
 
diff --git a/pkgs/tools/typesetting/tex/texlive/pgf.nix b/pkgs/tools/typesetting/tex/texlive/pgf.nix
index 1f7abc126c3..b46229e9828 100644
--- a/pkgs/tools/typesetting/tex/texlive/pgf.nix
+++ b/pkgs/tools/typesetting/tex/texlive/pgf.nix
@@ -14,8 +14,8 @@ rec {
   phaseNames = ["doCopy"];
   doCopy = fullDepEntry (''
     mkdir -p $out/share/
-    mkdir -p $out/texmf/tex/generic/pgf
-    cp -r * $out/texmf/tex/generic/pgf
+    mkdir -p $out/texmf-dist/tex/generic/pgf
+    cp -r * $out/texmf-dist/tex/generic/pgf
     ln -s $out/texmf* $out/share/
   '') ["minInit" "doUnpack" "defEnsureDir" "addInputs"];
 
diff --git a/pkgs/tools/typesetting/tex/texlive/xcolor.nix b/pkgs/tools/typesetting/tex/texlive/xcolor.nix
index e59a58ce9b2..892734afe46 100644
--- a/pkgs/tools/typesetting/tex/texlive/xcolor.nix
+++ b/pkgs/tools/typesetting/tex/texlive/xcolor.nix
@@ -12,11 +12,11 @@ rec {
     export HOME=$PWD
     mkdir -p $out/share/
 
-    mkdir -p $out/texmf/tex/latex/xcolor
-    mkdir -p $out/texmf/dvips/xcolor
+    mkdir -p $out/texmf-dist/tex/latex/xcolor
+    mkdir -p $out/texmf-dist/dvips/xcolor
     latex xcolor.ins 
-    cp *.sty *.def $out/texmf/tex/latex/xcolor
-    cp *.pro $out/texmf/dvips/xcolor
+    cp *.sty *.def $out/texmf-dist/tex/latex/xcolor
+    cp *.pro $out/texmf-dist/dvips/xcolor
 
     #latex xcolor.dtx
     #latex xcolor.dtx
@@ -25,8 +25,8 @@ rec {
     #latex xcolor.dtx
 
     rm *.sty *.pro *.ins *.def *.dtx
-    mkdir -p $out/texmf/doc/latex-xcolor
-    cp *  $out/texmf/doc/latex-xcolor
+    mkdir -p $out/texmf-dist/doc/latex-xcolor
+    cp *  $out/texmf-dist/doc/latex-xcolor
 
     ln -s $out/texmf* $out/share/
   '') ["minInit" "doUnpack" "defEnsureDir" "addInputs"];
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 0a8e5e038dc..df0f1a38aa4 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4442,7 +4442,10 @@ let
 
   heimdal = callPackage ../development/libraries/kerberos/heimdal.nix { };
 
-  harfbuzz = callPackage ../development/libraries/harfbuzz { };
+  harfbuzz = callPackage ../development/libraries/harfbuzz { 
+    icu = null;
+    graphite2 = null;
+  };
 
   hawknl = callPackage ../development/libraries/hawknl { };
 
@@ -5530,6 +5533,7 @@ let
   serd = callPackage ../development/libraries/serd {};
 
   silgraphite = callPackage ../development/libraries/silgraphite {};
+  graphite2 = callPackage ../development/libraries/silgraphite/graphite2.nix {};
 
   simgear = callPackage ../development/libraries/simgear { };
 
@@ -10028,11 +10032,14 @@ let
 
   texLive = builderDefsPackage (import ../tools/typesetting/tex/texlive) {
     inherit builderDefs zlib bzip2 ncurses libpng ed lesstif ruby
-      gd t1lib freetype icu perl expat curl xz pkgconfig zziplib
-      libjpeg bison python fontconfig flex poppler silgraphite makeWrapper;
+      gd t1lib freetype icu perl expat curl xz pkgconfig zziplib texinfo
+      libjpeg bison python fontconfig flex poppler graphite2 makeWrapper;
     inherit (xlibs) libXaw libX11 xproto libXt libXpm
       libXmu libXext xextproto libSM libICE;
     ghostscript = ghostscriptX;
+    harfbuzz = harfbuzz.override {
+      inherit icu graphite2;
+    };
   };
 
   texLiveFull = lib.setName "texlive-full" (texLiveAggregationFun {
@@ -10055,7 +10062,7 @@ let
   */
   texLiveAggregationFun = params:
     builderDefsPackage (import ../tools/typesetting/tex/texlive/aggregate.nix)
-      ({inherit poppler makeWrapper;} // params);
+      ({inherit poppler perl makeWrapper;} // params);
 
   texDisser = callPackage ../tools/typesetting/tex/disser {};
 
-- 
GitLab


From 75bb09986754fbc5d7a5fb856eaa7aec7dc4e829 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Mon, 14 Oct 2013 11:55:59 +0400
Subject: [PATCH 5196/5331] Update Julia

---
 pkgs/development/compilers/julia/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/compilers/julia/default.nix b/pkgs/development/compilers/julia/default.nix
index e2384b08e5b..ae550f5692d 100644
--- a/pkgs/development/compilers/julia/default.nix
+++ b/pkgs/development/compilers/julia/default.nix
@@ -8,7 +8,7 @@ let
 in
 stdenv.mkDerivation rec {
   pname = "julia";
-  date = "20130611";
+  date = "20131013";
   name = "${pname}-git-${date}";
 
   grisu_ver = "1.1.1";
@@ -65,8 +65,8 @@ stdenv.mkDerivation rec {
 
   src = fetchgit {
     url = "git://github.com/JuliaLang/julia.git";
-    rev = "60cc4e44bf415dcda90f2bbe22300f842fe44098";
-    sha256 = "018s0zyvdkxjldbvcdv40q3v2gcjznyyql5pv3zhhy1iq11jddfz";
+    rev = "76d2b87a45fff637473c4c342c9f5f9387675fda";
+    sha256 = "079g44r27lv0wsfbg84ihrmgzl73djjjr41xjiaqdph55zqfbn4f";
   };
 
   buildInputs = [ gfortran perl m4 gmp pcre llvm readline zlib
-- 
GitLab


From 30933abb97616a4e48362c786e0b6e4c7b4cc2f4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Mon, 14 Oct 2013 11:57:40 +0200
Subject: [PATCH 5197/5331] add prey: Proven tracking software that helps you
 find, lock and recover your devices when stolen or missing

---
 nixos/modules/module-list.nix        |  1 +
 nixos/modules/security/prey.nix      | 42 +++++++++++++++++++++++++
 pkgs/tools/security/prey/default.nix | 46 ++++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix      |  2 ++
 4 files changed, 91 insertions(+)
 create mode 100644 nixos/modules/security/prey.nix
 create mode 100644 pkgs/tools/security/prey/default.nix

diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index 977ca2518ec..b835907c82f 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -61,6 +61,7 @@
   ./security/pam.nix
   ./security/pam_usb.nix
   ./security/polkit.nix
+  ./security/prey.nix
   ./security/rngd.nix
   ./security/rtkit.nix
   ./security/setuid-wrappers.nix
diff --git a/nixos/modules/security/prey.nix b/nixos/modules/security/prey.nix
new file mode 100644
index 00000000000..75b95d5fbb0
--- /dev/null
+++ b/nixos/modules/security/prey.nix
@@ -0,0 +1,42 @@
+{config, pkgs, ...}:
+
+with pkgs.lib;
+
+let
+  cfg = config.services.prey;
+  myPrey = pkgs."prey-bash-client".override {
+    apiKey = cfg.apiKey;
+    deviceKey = cfg.deviceKey;
+  };
+in {
+  options = {
+
+    services.prey = {
+      enable = mkOption {
+        default = false;
+        type = types.bool;
+        description = ''
+          Enables http://preyproject.com/ bash client. Be sure to specify api and device keys.
+          Once setup, cronjob will run evert 15 minutes and report status.
+        '';
+      };
+
+      deviceKey = mkOption {
+        type = types.string;
+        description = "Device Key obtained from https://panel.preyproject.com/devices (and clicking on the device)";
+      };
+
+      apiKey = mkOption {
+        type = types.string;
+        description = "API key obtained from https://panel.preyproject.com/profile";
+      };
+    };
+
+  };
+
+  config = mkIf cfg.enable {
+      environment.systemPackages = [ myPrey ];
+      services.cron.systemCronJobs = [ "*/15 * * * * root ${myPrey}/prey.sh" ];
+  };
+
+}
diff --git a/pkgs/tools/security/prey/default.nix b/pkgs/tools/security/prey/default.nix
new file mode 100644
index 00000000000..37416b4da1a
--- /dev/null
+++ b/pkgs/tools/security/prey/default.nix
@@ -0,0 +1,46 @@
+{ stdenv, fetchurl, fetchgit, curl, scrot, imagemagick, xawtv, inetutils, makeWrapper, coreutils
+, apiKey ? null
+, deviceKey ? null }:
+
+# TODO: this should assert keys are set, somehow if set through .override assertion fails
+#assert apiKey != null;
+#assert deviceKey != null;
+
+let
+  modulesSrc = fetchgit {
+    url = "git://github.com/prey/prey-bash-client-modules.git";
+    rev = "aba260ef110834cb2e92923a31f50c15970639ee";
+  };
+in stdenv.mkDerivation rec {
+  name = "prey-bash-client-${version}";
+  version = "0.6.0";
+
+  src = fetchurl {
+    url = "https://github.com/prey/prey-bash-client/archive/v${version}.tar.gz";
+    sha256 = "09cb15jh4jdwvix9nx048ajkw2r5jaflk68y3rkha541n8n0qwh0";
+  };
+
+  buildInputs = [ curl scrot imagemagick xawtv makeWrapper ];
+
+  phases = "unpackPhase installPhase";
+
+  installPhase = ''
+    substituteInPlace config --replace api_key=\'\' "api_key='${apiKey}'"
+    substituteInPlace config --replace device_key=\'\' "device_key='${deviceKey}'"
+
+    substituteInPlace prey.sh --replace /bin/bash $(type -Pp bash)
+    mkdir -p $out/modules
+    cp -R . $out
+    cp -R ${modulesSrc}/* $out/modules/
+    wrapProgram "$out/prey.sh" \
+      --prefix PATH ":" "${xawtv}/bin:${imagemagick}/bin:${curl}/bin:${scrot}/bin:${inetutils}/bin:${coreutils}/bin" \
+      --set CURL_CA_BUNDLE "/etc/ssl/certs/ca-bundle.crt"
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = http://preyproject.com;
+    description = "Proven tracking software that helps you find, lock and recover your devices when stolen or missing";
+    maintainers = with maintainers; [ iElectric ];
+    license = licenses.gpl3;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index df0f1a38aa4..bdef89202b7 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1597,6 +1597,8 @@ let
 
   pptp = callPackage ../tools/networking/pptp {};
 
+  "prey-bash-client" = callPackage ../tools/security/prey { };
+
   proxychains = callPackage ../tools/networking/proxychains { };
 
   proxytunnel = callPackage ../tools/misc/proxytunnel { };
-- 
GitLab


From d9be549a4c3523935437d6167a16c387e1c6d4ff Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 8 Oct 2013 13:17:55 +0200
Subject: [PATCH 5198/5331] libusb1: Fix "libgcc_s.so.1 must be installed for
 pthread_cancel to work" error

---
 pkgs/development/libraries/libusb1/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/development/libraries/libusb1/default.nix b/pkgs/development/libraries/libusb1/default.nix
index c01baa2fd0f..d4504a26b7f 100644
--- a/pkgs/development/libraries/libusb1/default.nix
+++ b/pkgs/development/libraries/libusb1/default.nix
@@ -11,6 +11,8 @@ stdenv.mkDerivation rec {
   buildInputs = [ pkgconfig ];
   propagatedBuildInputs = stdenv.lib.optional (stdenv.isLinux) udev;
 
+  NIX_LDFLAGS = "-lgcc_s";
+
   meta = {
     homepage = http://www.libusb.org;
     description = "User-space USB library";
-- 
GitLab


From 15f293e0e6ede5c04c940aef7840fe2ad0d1e7e9 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 8 Oct 2013 13:24:50 +0200
Subject: [PATCH 5199/5331] usbutils: Update USB IDs

Also, don't install update-usbids.sh (doesn't make sense) and fix
lsusb.py.
---
 pkgs/os-specific/linux/usbutils/default.nix | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/pkgs/os-specific/linux/usbutils/default.nix b/pkgs/os-specific/linux/usbutils/default.nix
index b7d139a534f..aff730e387a 100644
--- a/pkgs/os-specific/linux/usbutils/default.nix
+++ b/pkgs/os-specific/linux/usbutils/default.nix
@@ -4,8 +4,8 @@ let
 
   # Obtained from http://www.linux-usb.org/usb.ids.bz2.
   usbids = fetchurl {
-    url = http://tarballs.nixos.org/usb.ids.20120920.bz2;
-    sha256 = "0sz860g7grf6kx22p49s6j8h85c69ymcw16a8110klzfl9hl9hli";
+    url = http://tarballs.nixos.org/usb.ids.20130821.bz2;
+    sha256 = "0x7mf4h5h5wjzhygfr4lc8yz0cwm7mahxrnp5nkxcmawmyxwsg53";
   };
 
 in
@@ -20,8 +20,14 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ pkgconfig libusb1 ];
 
-  # currently up-to-date
-  #preBuild = "bunzip2 < ${usbids} > usb.ids";
+  preBuild = "bunzip2 < ${usbids} > usb.ids";
+
+  postInstall =
+    ''
+      rm $out/sbin/update-usbids.sh
+      substituteInPlace $out/bin/lsusb.py \
+        --replace /usr/share/usb.ids $out/share/usb.ids
+    '';
 
   meta = {
     homepage = http://www.linux-usb.org/;
-- 
GitLab


From 3ae18ebcad3ef285f258dae3c9e90ae013fe2526 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 8 Oct 2013 13:28:50 +0200
Subject: [PATCH 5200/5331] pciutils: Update PCI IDs

---
 pkgs/tools/system/pciutils/default.nix | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/pkgs/tools/system/pciutils/default.nix b/pkgs/tools/system/pciutils/default.nix
index 3f63d077c7f..93486d3decf 100644
--- a/pkgs/tools/system/pciutils/default.nix
+++ b/pkgs/tools/system/pciutils/default.nix
@@ -3,8 +3,8 @@
 let
   pciids = fetchurl {
     # Obtained from http://pciids.sourceforge.net/v2.2/pci.ids.bz2.
-    url = http://tarballs.nixos.org/pci.ids.20120929.bz2;
-    sha256 = "1q3i479ay88wam1zz1vbgkbqb2axg8av9qjxaigrqbnw2pv0srmb";
+    url = http://tarballs.nixos.org/pci.ids.20131006.bz2;
+    sha256 = "1vmshcgxqminiyh52pdcak24lm24qlic49py9cmkp96y1s48lvsc";
   };
 in
 stdenv.mkDerivation rec {
@@ -17,8 +17,7 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ pkgconfig zlib kmod which ];
 
-  # currently up-to-date
-  #preBuild = "bunzip2 < ${pciids} > pci.ids";
+  preBuild = "bunzip2 < ${pciids} > pci.ids";
 
   makeFlags = "SHARED=yes PREFIX=\${out}";
 
-- 
GitLab


From d55b8a10ee4c76f7372a94c3a4fea64510c3c97d Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 14 Oct 2013 11:53:17 +0200
Subject: [PATCH 5201/5331] systemd: Apply a bunch of upstream fixes

For all changes relative to v203, see
https://github.com/edolstra/systemd/tree/nixos-v203.

Fixes #1072.
---
 ...aemon-reexec-do-the-right-thing-on-N.patch |  26 -
 ...e-duplicate-paths-in-systemctl-start.patch |  25 -
 ...ts-for-uninitialised-encrypted-devic.patch |  32 -
 ...o-configuration-hints-for-some-units.patch |  74 --
 ...rop-the-dependency-on-local-fs.targe.patch |  33 -
 .../0006-Don-t-call-plymouth-quit.patch       |  38 -
 ...007-Ignore-IPv6-link-local-addresses.patch |  37 -
 ...on-t-try-to-unmount-nix-or-nix-store.patch |  28 -
 ...art-ctrl-alt-del.target-irreversibly.patch |  27 -
 ...0-Fix-CPUShares-configuration-option.patch |  27 -
 ...void-race-condition-in-scraping-proc.patch |  75 --
 pkgs/os-specific/linux/systemd/default.nix    |  17 +-
 .../linux/systemd/fix-tests-1.patch           |  68 --
 pkgs/os-specific/linux/systemd/fixes.patch    | 757 ++++++++++++++++++
 .../linux/systemd/no-global-install.patch     |  26 -
 15 files changed, 762 insertions(+), 528 deletions(-)
 delete mode 100644 pkgs/os-specific/linux/systemd/0001-Make-systemctl-daemon-reexec-do-the-right-thing-on-N.patch
 delete mode 100644 pkgs/os-specific/linux/systemd/0002-Ignore-duplicate-paths-in-systemctl-start.patch
 delete mode 100644 pkgs/os-specific/linux/systemd/0003-Start-device-units-for-uninitialised-encrypted-devic.patch
 delete mode 100644 pkgs/os-specific/linux/systemd/0004-Set-switch-to-configuration-hints-for-some-units.patch
 delete mode 100644 pkgs/os-specific/linux/systemd/0005-sysinit.target-Drop-the-dependency-on-local-fs.targe.patch
 delete mode 100644 pkgs/os-specific/linux/systemd/0006-Don-t-call-plymouth-quit.patch
 delete mode 100644 pkgs/os-specific/linux/systemd/0007-Ignore-IPv6-link-local-addresses.patch
 delete mode 100644 pkgs/os-specific/linux/systemd/0008-Don-t-try-to-unmount-nix-or-nix-store.patch
 delete mode 100644 pkgs/os-specific/linux/systemd/0009-Start-ctrl-alt-del.target-irreversibly.patch
 delete mode 100644 pkgs/os-specific/linux/systemd/0010-Fix-CPUShares-configuration-option.patch
 delete mode 100644 pkgs/os-specific/linux/systemd/0011-polkit-Avoid-race-condition-in-scraping-proc.patch
 delete mode 100644 pkgs/os-specific/linux/systemd/fix-tests-1.patch
 create mode 100644 pkgs/os-specific/linux/systemd/fixes.patch
 delete mode 100644 pkgs/os-specific/linux/systemd/no-global-install.patch

diff --git a/pkgs/os-specific/linux/systemd/0001-Make-systemctl-daemon-reexec-do-the-right-thing-on-N.patch b/pkgs/os-specific/linux/systemd/0001-Make-systemctl-daemon-reexec-do-the-right-thing-on-N.patch
deleted file mode 100644
index 84a03dd9733..00000000000
--- a/pkgs/os-specific/linux/systemd/0001-Make-systemctl-daemon-reexec-do-the-right-thing-on-N.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 8f861550827e750fb56954c3f91a2f565abb42bb Mon Sep 17 00:00:00 2001
-From: Eelco Dolstra <eelco.dolstra@logicblox.com>
-Date: Tue, 8 Jan 2013 15:44:33 +0100
-Subject: [PATCH 01/11] Make "systemctl daemon-reexec" do the right thing on
- NixOS
-
----
- src/core/main.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/core/main.c b/src/core/main.c
-index 7fc06be..7575223 100644
---- a/src/core/main.c
-+++ b/src/core/main.c
-@@ -1857,7 +1857,7 @@ finish:
-                         char_array_0(sfd);
- 
-                         i = 0;
--                        args[i++] = SYSTEMD_BINARY_PATH;
-+                        args[i++] = "/run/current-system/systemd/lib/systemd/systemd";
-                         if (switch_root_dir)
-                                 args[i++] = "--switched-root";
-                         args[i++] = arg_running_as == SYSTEMD_SYSTEM ? "--system" : "--user";
--- 
-1.8.3.4
-
diff --git a/pkgs/os-specific/linux/systemd/0002-Ignore-duplicate-paths-in-systemctl-start.patch b/pkgs/os-specific/linux/systemd/0002-Ignore-duplicate-paths-in-systemctl-start.patch
deleted file mode 100644
index 15946506ac1..00000000000
--- a/pkgs/os-specific/linux/systemd/0002-Ignore-duplicate-paths-in-systemctl-start.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 2afcee0b4da066fb5f8fc00b749d88f5bd9df3d3 Mon Sep 17 00:00:00 2001
-From: Eelco Dolstra <eelco.dolstra@logicblox.com>
-Date: Tue, 8 Jan 2013 15:45:01 +0100
-Subject: [PATCH 02/11] Ignore duplicate paths in "systemctl start"
-
----
- src/systemctl/systemctl.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/systemctl/systemctl.c b/src/systemctl/systemctl.c
-index 3cca861..16791a2 100644
---- a/src/systemctl/systemctl.c
-+++ b/src/systemctl/systemctl.c
-@@ -1867,7 +1867,7 @@ static int start_unit_one(
-                         return log_oom();
- 
-                 r = set_consume(s, p);
--                if (r < 0) {
-+                if (r < 0 && r != -EEXIST) {
-                         log_error("Failed to add path to set.");
-                         return r;
-                 }
--- 
-1.8.3.4
-
diff --git a/pkgs/os-specific/linux/systemd/0003-Start-device-units-for-uninitialised-encrypted-devic.patch b/pkgs/os-specific/linux/systemd/0003-Start-device-units-for-uninitialised-encrypted-devic.patch
deleted file mode 100644
index 2927d6e4dc6..00000000000
--- a/pkgs/os-specific/linux/systemd/0003-Start-device-units-for-uninitialised-encrypted-devic.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From b288ca7d376e3a78368a2b59529ebe5ba812babf Mon Sep 17 00:00:00 2001
-From: Eelco Dolstra <eelco.dolstra@logicblox.com>
-Date: Tue, 8 Jan 2013 15:46:30 +0100
-Subject: [PATCH 03/11] Start device units for uninitialised encrypted devices
-
-This is necessary because the NixOS service that initialises the
-filesystem depends on the appearance of the device unit.  Also, this
-makes more sense to me: the device is ready; it's the filesystem
-that's not, but taking care of that is the responsibility of the mount
-unit.  (However, this ignores the fsck unit, so it's not perfect...)
----
- rules/99-systemd.rules.in | 4 ----
- 1 file changed, 4 deletions(-)
-
-diff --git a/rules/99-systemd.rules.in b/rules/99-systemd.rules.in
-index d17bdd9..040b10e 100644
---- a/rules/99-systemd.rules.in
-+++ b/rules/99-systemd.rules.in
-@@ -14,10 +14,6 @@ KERNEL=="vport*", TAG+="systemd"
- SUBSYSTEM=="block", KERNEL!="ram*|loop*", TAG+="systemd"
- SUBSYSTEM=="block", KERNEL!="ram*|loop*", ENV{DM_UDEV_DISABLE_OTHER_RULES_FLAG}=="1", ENV{SYSTEMD_READY}="0"
- 
--# Ignore encrypted devices with no identified superblock on it, since
--# we are probably still calling mke2fs or mkswap on it.
--SUBSYSTEM=="block", KERNEL!="ram*|loop*", ENV{DM_UUID}=="CRYPT-*", ENV{ID_PART_TABLE_TYPE}=="", ENV{ID_FS_USAGE}=="", ENV{SYSTEMD_READY}="0"
--
- # Ignore raid devices that are not yet assembled and started
- SUBSYSTEM=="block", ENV{DEVTYPE}=="disk", KERNEL=="md*", TEST!="md/array_state", ENV{SYSTEMD_READY}="0"
- SUBSYSTEM=="block", ENV{DEVTYPE}=="disk", KERNEL=="md*", ATTR{md/array_state}=="|clear|inactive", ENV{SYSTEMD_READY}="0"
--- 
-1.8.3.4
-
diff --git a/pkgs/os-specific/linux/systemd/0004-Set-switch-to-configuration-hints-for-some-units.patch b/pkgs/os-specific/linux/systemd/0004-Set-switch-to-configuration-hints-for-some-units.patch
deleted file mode 100644
index 54fcf9c3e1e..00000000000
--- a/pkgs/os-specific/linux/systemd/0004-Set-switch-to-configuration-hints-for-some-units.patch
+++ /dev/null
@@ -1,74 +0,0 @@
-From 7a498e661f3d111fa09700a6cfa62cfd6733b1cc Mon Sep 17 00:00:00 2001
-From: Eelco Dolstra <eelco.dolstra@logicblox.com>
-Date: Tue, 8 Jan 2013 15:48:19 +0100
-Subject: [PATCH 04/11] Set switch-to-configuration hints for some units
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Target units like local-fs.target need ‘X-StopOnReconfiguration=yes’
-to ensure dependencies *on* that target properly take into account the
-dependencies *of* the target.
-
-‘X-RestartIfChanged=no’ is necessary for systemd-journald.service
-because restarting it causes services connected to journald to stop
-logging.
-
-‘X-RestartIfChanged=no’ is necessary for systemd-user-sessions.service
-to prevent all user sessions from being killed when this unit changes.
----
- units/local-fs.target                  | 2 ++
- units/remote-fs.target                 | 2 ++
- units/systemd-journald.service.in      | 5 +++++
- units/systemd-user-sessions.service.in | 3 +++
- 4 files changed, 12 insertions(+)
-
-diff --git a/units/local-fs.target b/units/local-fs.target
-index 18c3d74..a09054c 100644
---- a/units/local-fs.target
-+++ b/units/local-fs.target
-@@ -11,3 +11,5 @@ Documentation=man:systemd.special(7)
- After=local-fs-pre.target
- OnFailure=emergency.target
- OnFailureIsolate=no
-+
-+X-StopOnReconfiguration=yes
-diff --git a/units/remote-fs.target b/units/remote-fs.target
-index 09213e8..47b4cf5 100644
---- a/units/remote-fs.target
-+++ b/units/remote-fs.target
-@@ -10,5 +10,7 @@ Description=Remote File Systems
- Documentation=man:systemd.special(7)
- After=remote-fs-pre.target
- 
-+X-StopOnReconfiguration=yes
-+
- [Install]
- WantedBy=multi-user.target
-diff --git a/units/systemd-journald.service.in b/units/systemd-journald.service.in
-index ab2e50c..9563a7d 100644
---- a/units/systemd-journald.service.in
-+++ b/units/systemd-journald.service.in
-@@ -24,3 +24,8 @@ CapabilityBoundingSet=CAP_SYS_ADMIN CAP_DAC_OVERRIDE CAP_SYS_PTRACE CAP_SYSLOG C
- # Increase the default a bit in order to allow many simultaneous
- # services being run since we keep one fd open per service.
- LimitNOFILE=16384
-+
-+# Don't restart journald, since that causes services connected to
-+# journald to stop logging (see
-+# https://bugs.freedesktop.org/show_bug.cgi?id=56043).
-+X-RestartIfChanged=no
-diff --git a/units/systemd-user-sessions.service.in b/units/systemd-user-sessions.service.in
-index 0869e73..b6ed958 100644
---- a/units/systemd-user-sessions.service.in
-+++ b/units/systemd-user-sessions.service.in
-@@ -15,3 +15,6 @@ Type=oneshot
- RemainAfterExit=yes
- ExecStart=@rootlibexecdir@/systemd-user-sessions start
- ExecStop=@rootlibexecdir@/systemd-user-sessions stop
-+
-+# Restart kills all active sessions.
-+X-RestartIfChanged=no
--- 
-1.8.3.4
-
diff --git a/pkgs/os-specific/linux/systemd/0005-sysinit.target-Drop-the-dependency-on-local-fs.targe.patch b/pkgs/os-specific/linux/systemd/0005-sysinit.target-Drop-the-dependency-on-local-fs.targe.patch
deleted file mode 100644
index 9cbb2f716a8..00000000000
--- a/pkgs/os-specific/linux/systemd/0005-sysinit.target-Drop-the-dependency-on-local-fs.targe.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From e6bbe5fa858bd8196c8e1f264904679e6bda426d Mon Sep 17 00:00:00 2001
-From: Eelco Dolstra <eelco.dolstra@logicblox.com>
-Date: Tue, 8 Jan 2013 15:56:03 +0100
-Subject: [PATCH 05/11] sysinit.target: Drop the dependency on local-fs.target
- and swap.target
-
-Having all services with DefaultDependencies=yes depend on
-local-fs.target is annoying, because some of those services might be
-necessary to mount local filesystems.  For instance, Charon's
-send-keys feature requires sshd to be running in order to receive LUKS
-encryption keys, which in turn requires dhcpcd, and so on.  So we drop
-this dependency (and swap.target as well for consistency).  If
-services require a specific mount, they should use RequiresMountsFor
-in any case.
----
- units/sysinit.target | 3 +--
- 1 file changed, 1 insertion(+), 2 deletions(-)
-
-diff --git a/units/sysinit.target b/units/sysinit.target
-index 8f4fb8f..e0f0147 100644
---- a/units/sysinit.target
-+++ b/units/sysinit.target
-@@ -9,6 +9,5 @@
- Description=System Initialization
- Documentation=man:systemd.special(7)
- Conflicts=emergency.service emergency.target
--Wants=local-fs.target swap.target
--After=local-fs.target swap.target emergency.service emergency.target
-+After=emergency.service emergency.target
- RefuseManualStart=yes
--- 
-1.8.3.4
-
diff --git a/pkgs/os-specific/linux/systemd/0006-Don-t-call-plymouth-quit.patch b/pkgs/os-specific/linux/systemd/0006-Don-t-call-plymouth-quit.patch
deleted file mode 100644
index d73733a68b0..00000000000
--- a/pkgs/os-specific/linux/systemd/0006-Don-t-call-plymouth-quit.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From 4731a9074538e9e24d2b81fc737917b064e194e6 Mon Sep 17 00:00:00 2001
-From: Eelco Dolstra <eelco.dolstra@logicblox.com>
-Date: Tue, 8 Jan 2013 18:36:28 +0100
-Subject: [PATCH 06/11] Don't call "plymouth quit"
-
-NixOS doesn't use Plymouth (yet).
----
- units/emergency.service.in | 1 -
- units/rescue.service.m4.in | 1 -
- 2 files changed, 2 deletions(-)
-
-diff --git a/units/emergency.service.in b/units/emergency.service.in
-index 442f0e0..6b7eafd 100644
---- a/units/emergency.service.in
-+++ b/units/emergency.service.in
-@@ -15,7 +15,6 @@ Before=shutdown.target
- [Service]
- Environment=HOME=/root
- WorkingDirectory=/root
--ExecStartPre=-/bin/plymouth quit
- ExecStartPre=-/bin/echo -e 'Welcome to emergency mode! After logging in, type "journalctl -xb" to view\\nsystem logs, "systemctl reboot" to reboot, "systemctl default" to try again\\nto boot into default mode.'
- ExecStart=-/sbin/sulogin
- ExecStopPost=@SYSTEMCTL@ --fail --no-block default
-diff --git a/units/rescue.service.m4.in b/units/rescue.service.m4.in
-index 269797a..2c640f4 100644
---- a/units/rescue.service.m4.in
-+++ b/units/rescue.service.m4.in
-@@ -16,7 +16,6 @@ Before=shutdown.target
- [Service]
- Environment=HOME=/root
- WorkingDirectory=/root
--ExecStartPre=-/bin/plymouth quit
- ExecStartPre=-/bin/echo -e 'Welcome to rescue mode! Type "systemctl default" or ^D to enter default mode.\\nType "journalctl -xb" to view system logs. Type "systemctl reboot" to reboot.'
- ExecStart=-/sbin/sulogin
- ExecStopPost=-@SYSTEMCTL@ --fail --no-block default
--- 
-1.8.3.4
-
diff --git a/pkgs/os-specific/linux/systemd/0007-Ignore-IPv6-link-local-addresses.patch b/pkgs/os-specific/linux/systemd/0007-Ignore-IPv6-link-local-addresses.patch
deleted file mode 100644
index f3b3103fe68..00000000000
--- a/pkgs/os-specific/linux/systemd/0007-Ignore-IPv6-link-local-addresses.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From f0c362873860526579bf9bda216005fd5a0936dd Mon Sep 17 00:00:00 2001
-From: Eelco Dolstra <eelco.dolstra@logicblox.com>
-Date: Mon, 4 Feb 2013 12:41:14 +0100
-Subject: [PATCH 07/11] Ignore IPv6 link-local addresses
-
-Returning IPv6 link-local addresses is a bad idea, because they only
-work if an application connects specifically over the corresponding
-interface.  So you get errors like:
-
-  $ curl -6 http://my-machine/
-  curl: (7) Failed to connect to fe80::d6be:d9ff:fe1b:8477: Invalid argument
-
-To prevent this, this patch filters out link-local addresses.  So if
-you don't have a routable IPv6 address, nss-myhostname will fall back
-to returning ::1.
----
- src/nss-myhostname/netlink.c | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/src/nss-myhostname/netlink.c b/src/nss-myhostname/netlink.c
-index b1ef912..4f2ab5c 100644
---- a/src/nss-myhostname/netlink.c
-+++ b/src/nss-myhostname/netlink.c
-@@ -113,6 +113,10 @@ static int read_reply(int fd, struct address **list, unsigned *n_list) {
-                     ifaddrmsg->ifa_scope == RT_SCOPE_NOWHERE)
-                         continue;
- 
-+                if (ifaddrmsg->ifa_family == AF_INET6 &&
-+                    ifaddrmsg->ifa_scope == RT_SCOPE_LINK)
-+                        continue;
-+
-                 if (ifaddrmsg->ifa_flags & IFA_F_DEPRECATED)
-                         continue;
- 
--- 
-1.8.3.4
-
diff --git a/pkgs/os-specific/linux/systemd/0008-Don-t-try-to-unmount-nix-or-nix-store.patch b/pkgs/os-specific/linux/systemd/0008-Don-t-try-to-unmount-nix-or-nix-store.patch
deleted file mode 100644
index 252f1cde79a..00000000000
--- a/pkgs/os-specific/linux/systemd/0008-Don-t-try-to-unmount-nix-or-nix-store.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 0112df74e576dd683c132ec33861b7099dc94454 Mon Sep 17 00:00:00 2001
-From: Eelco Dolstra <eelco.dolstra@logicblox.com>
-Date: Fri, 12 Apr 2013 13:16:57 +0200
-Subject: [PATCH 08/11] Don't try to unmount /nix or /nix/store
-
-They'll still be remounted read-only.
-
-https://github.com/NixOS/nixos/issues/126
----
- src/core/umount.c | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/src/core/umount.c b/src/core/umount.c
-index 1e95ad7..9f0e471 100644
---- a/src/core/umount.c
-+++ b/src/core/umount.c
-@@ -435,6 +435,8 @@ static int mount_points_list_umount(MountPoint **head, bool *changed, bool log_e
-                  * anyway, since we are running from it. They have
-                  * already been remounted ro. */
-                 if (path_equal(m->path, "/")
-+                    || path_equal(m->path, "/nix")
-+                    || path_equal(m->path, "/nix/store")
- #ifndef HAVE_SPLIT_USR
-                     || path_equal(m->path, "/usr")
- #endif
--- 
-1.8.3.4
-
diff --git a/pkgs/os-specific/linux/systemd/0009-Start-ctrl-alt-del.target-irreversibly.patch b/pkgs/os-specific/linux/systemd/0009-Start-ctrl-alt-del.target-irreversibly.patch
deleted file mode 100644
index 8a78ded4b0d..00000000000
--- a/pkgs/os-specific/linux/systemd/0009-Start-ctrl-alt-del.target-irreversibly.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From ed7c22c76e1399861ec8e0216f08a7f9419eea50 Mon Sep 17 00:00:00 2001
-From: Eelco Dolstra <eelco.dolstra@logicblox.com>
-Date: Tue, 7 May 2013 14:03:13 +0200
-Subject: [PATCH 09/11] Start ctrl-alt-del.target irreversibly
-
-This makes ctrl-alt-del reboots more robust, just like "systemctl
-reboot".
----
- src/core/manager.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/core/manager.c b/src/core/manager.c
-index c7f8f20..0508628 100644
---- a/src/core/manager.c
-+++ b/src/core/manager.c
-@@ -1372,7 +1372,7 @@ static int manager_process_signal_fd(Manager *m) {
- 
-                 case SIGINT:
-                         if (m->running_as == SYSTEMD_SYSTEM) {
--                                manager_start_target(m, SPECIAL_CTRL_ALT_DEL_TARGET, JOB_REPLACE);
-+                                manager_start_target(m, SPECIAL_CTRL_ALT_DEL_TARGET, JOB_REPLACE_IRREVERSIBLY);
-                                 break;
-                         }
- 
--- 
-1.8.3.4
-
diff --git a/pkgs/os-specific/linux/systemd/0010-Fix-CPUShares-configuration-option.patch b/pkgs/os-specific/linux/systemd/0010-Fix-CPUShares-configuration-option.patch
deleted file mode 100644
index 1f4852e6bfa..00000000000
--- a/pkgs/os-specific/linux/systemd/0010-Fix-CPUShares-configuration-option.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 687e657cd320cb4d4ae442e3529ae9571108bb6e Mon Sep 17 00:00:00 2001
-From: Eelco Dolstra <eelco.dolstra@logicblox.com>
-Date: Fri, 24 May 2013 13:34:53 -0400
-Subject: [PATCH 10/11] Fix CPUShares configuration option
-
-This fixes the error message "Unknown or unsupported cgroup attribute
-CPUShares".
----
- src/core/cgroup-semantics.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/core/cgroup-semantics.c b/src/core/cgroup-semantics.c
-index 82b02bb..7df9d01 100644
---- a/src/core/cgroup-semantics.c
-+++ b/src/core/cgroup-semantics.c
-@@ -255,7 +255,7 @@ static int map_blkio(const CGroupSemantics *s, const char *value, char **ret) {
- }
- 
- static const CGroupSemantics semantics[] = {
--        { "cpu",     "cpu.shares",                 "CPUShare",              false, parse_cpu_shares,          NULL,       NULL },
-+        { "cpu",     "cpu.shares",                 "CPUShares",             false, parse_cpu_shares,          NULL,       NULL },
-         { "memory",  "memory.soft_limit_in_bytes", "MemorySoftLimit",       false, parse_memory_limit,        NULL,       NULL },
-         { "memory",  "memory.limit_in_bytes",      "MemoryLimit",           false, parse_memory_limit,        NULL,       NULL },
-         { "devices", "devices.allow",              "DeviceAllow",           true,  parse_device,              map_device, NULL },
--- 
-1.8.3.4
-
diff --git a/pkgs/os-specific/linux/systemd/0011-polkit-Avoid-race-condition-in-scraping-proc.patch b/pkgs/os-specific/linux/systemd/0011-polkit-Avoid-race-condition-in-scraping-proc.patch
deleted file mode 100644
index 08446db72c5..00000000000
--- a/pkgs/os-specific/linux/systemd/0011-polkit-Avoid-race-condition-in-scraping-proc.patch
+++ /dev/null
@@ -1,75 +0,0 @@
-From ab7707b4a9b1b7615bfe2e30e4a2bc9cb5261766 Mon Sep 17 00:00:00 2001
-From: Colin Walters <walters@verbum.org>
-Date: Thu, 22 Aug 2013 13:55:21 -0400
-Subject: [PATCH 11/11] polkit: Avoid race condition in scraping /proc
-
-If a calling process execve()s a setuid program, it can appear to be
-uid 0.  Since we're receiving requests over DBus, avoid this by simply
-passing system-bus-name as a subject.
----
- src/shared/polkit.c | 31 +++++--------------------------
- 1 file changed, 5 insertions(+), 26 deletions(-)
-
-diff --git a/src/shared/polkit.c b/src/shared/polkit.c
-index cea7074..1c5e9e3 100644
---- a/src/shared/polkit.c
-+++ b/src/shared/polkit.c
-@@ -38,12 +38,8 @@ int verify_polkit(
- 
- #ifdef ENABLE_POLKIT
-         DBusMessage *m = NULL, *reply = NULL;
--        const char *unix_process = "unix-process", *pid = "pid", *starttime = "start-time", *cancel_id = "";
-+        const char *system_bus_name = "system-bus-name", *name = "name", *cancel_id = "";
-         uint32_t flags = interactive ? 1 : 0;
--        pid_t pid_raw;
--        uint32_t pid_u32;
--        unsigned long long starttime_raw;
--        uint64_t starttime_u64;
-         DBusMessageIter iter_msg, iter_struct, iter_array, iter_dict, iter_variant;
-         int r;
-         dbus_bool_t authorized = FALSE, challenge = FALSE;
-@@ -68,14 +64,6 @@ int verify_polkit(
- 
- #ifdef ENABLE_POLKIT
- 
--        pid_raw = bus_get_unix_process_id(c, sender, error);
--        if (pid_raw == 0)
--                return -EINVAL;
--
--        r = get_starttime_of_pid(pid_raw, &starttime_raw);
--        if (r < 0)
--                return r;
--
-         m = dbus_message_new_method_call(
-                         "org.freedesktop.PolicyKit1",
-                         "/org/freedesktop/PolicyKit1/Authority",
-@@ -86,22 +74,13 @@ int verify_polkit(
- 
-         dbus_message_iter_init_append(m, &iter_msg);
- 
--        pid_u32 = (uint32_t) pid_raw;
--        starttime_u64 = (uint64_t) starttime_raw;
--
-         if (!dbus_message_iter_open_container(&iter_msg, DBUS_TYPE_STRUCT, NULL, &iter_struct) ||
--            !dbus_message_iter_append_basic(&iter_struct, DBUS_TYPE_STRING, &unix_process) ||
-+            !dbus_message_iter_append_basic(&iter_struct, DBUS_TYPE_STRING, &system_bus_name) ||
-             !dbus_message_iter_open_container(&iter_struct, DBUS_TYPE_ARRAY, "{sv}", &iter_array) ||
-             !dbus_message_iter_open_container(&iter_array, DBUS_TYPE_DICT_ENTRY, NULL, &iter_dict) ||
--            !dbus_message_iter_append_basic(&iter_dict, DBUS_TYPE_STRING, &pid) ||
--            !dbus_message_iter_open_container(&iter_dict, DBUS_TYPE_VARIANT, "u", &iter_variant) ||
--            !dbus_message_iter_append_basic(&iter_variant, DBUS_TYPE_UINT32, &pid_u32) ||
--            !dbus_message_iter_close_container(&iter_dict, &iter_variant) ||
--            !dbus_message_iter_close_container(&iter_array, &iter_dict) ||
--            !dbus_message_iter_open_container(&iter_array, DBUS_TYPE_DICT_ENTRY, NULL, &iter_dict) ||
--            !dbus_message_iter_append_basic(&iter_dict, DBUS_TYPE_STRING, &starttime) ||
--            !dbus_message_iter_open_container(&iter_dict, DBUS_TYPE_VARIANT, "t", &iter_variant) ||
--            !dbus_message_iter_append_basic(&iter_variant, DBUS_TYPE_UINT64, &starttime_u64) ||
-+            !dbus_message_iter_append_basic(&iter_dict, DBUS_TYPE_STRING, &name) ||
-+            !dbus_message_iter_open_container(&iter_dict, DBUS_TYPE_VARIANT, "s", &iter_variant) ||
-+            !dbus_message_iter_append_basic(&iter_variant, DBUS_TYPE_STRING, &sender) ||
-             !dbus_message_iter_close_container(&iter_dict, &iter_variant) ||
-             !dbus_message_iter_close_container(&iter_array, &iter_dict) ||
-             !dbus_message_iter_close_container(&iter_struct, &iter_array) ||
--- 
-1.8.3.4
-
diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix
index 3215032011a..2c2ed582083 100644
--- a/pkgs/os-specific/linux/systemd/default.nix
+++ b/pkgs/os-specific/linux/systemd/default.nix
@@ -16,18 +16,11 @@ stdenv.mkDerivation rec {
   };
 
   patches =
-    [ ./0001-Make-systemctl-daemon-reexec-do-the-right-thing-on-N.patch
-      ./0002-Ignore-duplicate-paths-in-systemctl-start.patch
-      ./0003-Start-device-units-for-uninitialised-encrypted-devic.patch
-      ./0004-Set-switch-to-configuration-hints-for-some-units.patch
-      ./0005-sysinit.target-Drop-the-dependency-on-local-fs.targe.patch
-      ./0006-Don-t-call-plymouth-quit.patch
-      ./0007-Ignore-IPv6-link-local-addresses.patch
-      ./0008-Don-t-try-to-unmount-nix-or-nix-store.patch
-      ./0009-Start-ctrl-alt-del.target-irreversibly.patch
-      ./0010-Fix-CPUShares-configuration-option.patch
-      ./0011-polkit-Avoid-race-condition-in-scraping-proc.patch
-    ] ++ stdenv.lib.optional stdenv.isArm ./libc-bug-accept4-arm.patch;
+    [ # These are all changes between upstream and
+      # https://github.com/edolstra/systemd/tree/nixos-v203.
+      ./fixes.patch
+    ]
+    ++ stdenv.lib.optional stdenv.isArm ./libc-bug-accept4-arm.patch;
 
   buildInputs =
     [ pkgconfig intltool gperf libcap dbus.libs kmod xz pam acl
diff --git a/pkgs/os-specific/linux/systemd/fix-tests-1.patch b/pkgs/os-specific/linux/systemd/fix-tests-1.patch
deleted file mode 100644
index 14bb0fa2708..00000000000
--- a/pkgs/os-specific/linux/systemd/fix-tests-1.patch
+++ /dev/null
@@ -1,68 +0,0 @@
-Signed-off-by: Ramkumar Ramachandra <artag...@gmail.com>
----
- Ramkumar Ramachandra wrote:
- > $ ./test-id128
- > random: a08ea8ed34594d4bbd953dd182ec86f9
- > Assertion 'sd_id128_get_machine(&id) == 0' failed at
- > src/test/test-id128.c:41, function main(). Aborting.
- > [1]    8017 abort (core dumped)  ./test-id128
- 
- Okay, this test fails because I don't have a /etc/machine-id -- I
- thought systemd is supposed to create it?  However, from the logic in
- src/core/machine-id-setup.c, it looks like although open() is called
- with O_CREAT on /etc/machine-id, systemd barfs if the file isn't
- present.  How about changing this?
-
- src/core/machine-id-setup.c |   12 +++++-------
- src/test/test-id128.c       |    6 ++++--
- 2 files changed, 9 insertions(+), 9 deletions(-)
-
-diff --git a/src/core/machine-id-setup.c b/src/core/machine-id-setup.c
-index 7f4c23b..3f21d58 100644
---- a/src/core/machine-id-setup.c
-+++ b/src/core/machine-id-setup.c
-@@ -168,12 +168,8 @@ int machine_id_setup(void) {
-                 writable = true;
-         else {
-                 fd = open("/etc/machine-id", O_RDONLY|O_CLOEXEC|O_NOCTTY);
--                if (fd < 0) {
--                        umask(m);
--                        log_error("Cannot open /etc/machine-id: %m");
--                        return -errno;
--                }
--
-+                if (fd < 0)
-+                        goto generate;
-                 writable = false;
-         }
- 
-@@ -192,7 +188,9 @@ int machine_id_setup(void) {
-                 }
-         }
- 
--        /* Hmm, so, the id currently stored is not useful, then let's
-+generate:
-+        /* Hmm, so, either /etc/machine-id doesn't exist, the id
-+         * currently stored is not useful, then let's
-          * generate one */
- 
-         r = generate(id);
-diff --git a/src/test/test-id128.c b/src/test/test-id128.c
-index bfd743e..60902d0 100644
---- a/src/test/test-id128.c
-+++ b/src/test/test-id128.c
-@@ -38,8 +38,10 @@ int main(int argc, char *argv[]) {
-         assert_se(sd_id128_from_string(t, &id2) == 0);
-         assert_se(sd_id128_equal(id, id2));
- 
--        assert_se(sd_id128_get_machine(&id) == 0);
--        printf("machine: %s\n", sd_id128_to_string(id, t));
-+        if (sd_id128_get_machine(&id) < 0)
-+                printf("machine: run systemd-machine-id-setup first\n");
-+        else
-+                printf("machine: %s\n", sd_id128_to_string(id, t));
- 
-         assert_se(sd_id128_get_boot(&id) == 0);
-         printf("boot: %s\n", sd_id128_to_string(id, t));
--- 
-1.7.8.1.362.g5d6df.dirty
diff --git a/pkgs/os-specific/linux/systemd/fixes.patch b/pkgs/os-specific/linux/systemd/fixes.patch
new file mode 100644
index 00000000000..0ad420cd35c
--- /dev/null
+++ b/pkgs/os-specific/linux/systemd/fixes.patch
@@ -0,0 +1,757 @@
+diff --git a/man/systemd.special.xml b/man/systemd.special.xml
+index 7164b1e..29401eb 100644
+--- a/man/systemd.special.xml
++++ b/man/systemd.special.xml
+@@ -381,7 +381,7 @@
+                                         this unit during
+                                         installation. This is best
+                                         configured via
+-                                        <varname>WantedBy=multi-uer.target</varname>
++                                        <varname>WantedBy=multi-user.target</varname>
+                                         in the unit's
+                                         <literal>[Install]</literal>
+                                         section.</para>
+diff --git a/rules/80-net-name-slot.rules b/rules/80-net-name-slot.rules
+index 15b5bc4..c5f1b38 100644
+--- a/rules/80-net-name-slot.rules
++++ b/rules/80-net-name-slot.rules
+@@ -1,6 +1,6 @@
+ # do not edit this file, it will be overwritten on update
+ 
+-ACTION=="remove", GOTO="net_name_slot_end"
++ACTION!="add", GOTO="net_name_slot_end"
+ SUBSYSTEM!="net", GOTO="net_name_slot_end"
+ NAME!="", GOTO="net_name_slot_end"
+ 
+diff --git a/rules/99-systemd.rules.in b/rules/99-systemd.rules.in
+index d17bdd9..040b10e 100644
+--- a/rules/99-systemd.rules.in
++++ b/rules/99-systemd.rules.in
+@@ -14,10 +14,6 @@ KERNEL=="vport*", TAG+="systemd"
+ SUBSYSTEM=="block", KERNEL!="ram*|loop*", TAG+="systemd"
+ SUBSYSTEM=="block", KERNEL!="ram*|loop*", ENV{DM_UDEV_DISABLE_OTHER_RULES_FLAG}=="1", ENV{SYSTEMD_READY}="0"
+ 
+-# Ignore encrypted devices with no identified superblock on it, since
+-# we are probably still calling mke2fs or mkswap on it.
+-SUBSYSTEM=="block", KERNEL!="ram*|loop*", ENV{DM_UUID}=="CRYPT-*", ENV{ID_PART_TABLE_TYPE}=="", ENV{ID_FS_USAGE}=="", ENV{SYSTEMD_READY}="0"
+-
+ # Ignore raid devices that are not yet assembled and started
+ SUBSYSTEM=="block", ENV{DEVTYPE}=="disk", KERNEL=="md*", TEST!="md/array_state", ENV{SYSTEMD_READY}="0"
+ SUBSYSTEM=="block", ENV{DEVTYPE}=="disk", KERNEL=="md*", ATTR{md/array_state}=="|clear|inactive", ENV{SYSTEMD_READY}="0"
+diff --git a/src/core/cgroup-semantics.c b/src/core/cgroup-semantics.c
+index 82b02bb..7df9d01 100644
+--- a/src/core/cgroup-semantics.c
++++ b/src/core/cgroup-semantics.c
+@@ -255,7 +255,7 @@ static int map_blkio(const CGroupSemantics *s, const char *value, char **ret) {
+ }
+ 
+ static const CGroupSemantics semantics[] = {
+-        { "cpu",     "cpu.shares",                 "CPUShare",              false, parse_cpu_shares,          NULL,       NULL },
++        { "cpu",     "cpu.shares",                 "CPUShares",             false, parse_cpu_shares,          NULL,       NULL },
+         { "memory",  "memory.soft_limit_in_bytes", "MemorySoftLimit",       false, parse_memory_limit,        NULL,       NULL },
+         { "memory",  "memory.limit_in_bytes",      "MemoryLimit",           false, parse_memory_limit,        NULL,       NULL },
+         { "devices", "devices.allow",              "DeviceAllow",           true,  parse_device,              map_device, NULL },
+diff --git a/src/core/dbus-execute.h b/src/core/dbus-execute.h
+index 91d70e5..698102f 100644
+--- a/src/core/dbus-execute.h
++++ b/src/core/dbus-execute.h
+@@ -63,7 +63,7 @@
+         "  <property name=\"CPUSchedulingPolicy\" type=\"i\" access=\"read\"/>\n" \
+         "  <property name=\"CPUSchedulingPriority\" type=\"i\" access=\"read\"/>\n" \
+         "  <property name=\"CPUAffinity\" type=\"ay\" access=\"read\"/>\n" \
+-        "  <property name=\"TimerSlackNS\" type=\"t\" access=\"read\"/>\n" \
++        "  <property name=\"TimerSlackNSec\" type=\"t\" access=\"read\"/>\n" \
+         "  <property name=\"CPUSchedulingResetOnFork\" type=\"b\" access=\"read\"/>\n" \
+         "  <property name=\"NonBlocking\" type=\"b\" access=\"read\"/>\n" \
+         "  <property name=\"StandardInput\" type=\"s\" access=\"read\"/>\n" \
+diff --git a/src/core/dbus-manager.c b/src/core/dbus-manager.c
+index 56b02a1..2b6d799 100644
+--- a/src/core/dbus-manager.c
++++ b/src/core/dbus-manager.c
+@@ -1550,7 +1550,7 @@ static DBusHandlerResult bus_manager_message_handler(DBusConnection *connection,
+                 _cleanup_strv_free_ char **l = NULL;
+                 char **e = NULL;
+ 
+-                SELINUX_ACCESS_CHECK(connection, message, "reboot");
++                SELINUX_ACCESS_CHECK(connection, message, "reload");
+ 
+                 r = bus_parse_strv(message, &l);
+                 if (r == -ENOMEM)
+@@ -1577,7 +1577,7 @@ static DBusHandlerResult bus_manager_message_handler(DBusConnection *connection,
+                 _cleanup_strv_free_ char **l = NULL;
+                 char **e = NULL;
+ 
+-                SELINUX_ACCESS_CHECK(connection, message, "reboot");
++                SELINUX_ACCESS_CHECK(connection, message, "reload");
+ 
+                 r = bus_parse_strv(message, &l);
+                 if (r == -ENOMEM)
+@@ -1605,7 +1605,7 @@ static DBusHandlerResult bus_manager_message_handler(DBusConnection *connection,
+                 char **f = NULL;
+                 DBusMessageIter iter;
+ 
+-                SELINUX_ACCESS_CHECK(connection, message, "reboot");
++                SELINUX_ACCESS_CHECK(connection, message, "reload");
+ 
+                 if (!dbus_message_iter_init(message, &iter))
+                         goto oom;
+diff --git a/src/core/dbus-swap.c b/src/core/dbus-swap.c
+index 2e99fba..e72749a 100644
+--- a/src/core/dbus-swap.c
++++ b/src/core/dbus-swap.c
+@@ -93,6 +93,7 @@ static DEFINE_BUS_PROPERTY_APPEND_ENUM(bus_swap_append_swap_result, swap_result,
+ static const BusProperty bus_swap_properties[] = {
+         { "What",       bus_property_append_string, "s", offsetof(Swap, what),  true },
+         { "Priority",   bus_swap_append_priority,   "i", 0 },
++        { "TimeoutUSec",bus_property_append_usec,   "t", offsetof(Swap, timeout_usec)},
+         BUS_EXEC_COMMAND_PROPERTY("ExecActivate",   offsetof(Swap, exec_command[SWAP_EXEC_ACTIVATE]),   false),
+         BUS_EXEC_COMMAND_PROPERTY("ExecDeactivate", offsetof(Swap, exec_command[SWAP_EXEC_DEACTIVATE]), false),
+         { "ControlPID", bus_property_append_pid,    "u", offsetof(Swap, control_pid) },
+diff --git a/src/core/main.c b/src/core/main.c
+index 7fc06be..101ce79 100644
+--- a/src/core/main.c
++++ b/src/core/main.c
+@@ -1590,14 +1590,14 @@ int main(int argc, char *argv[]) {
+                         log_error("Failed to adjust timer slack: %m");
+ 
+         if (arg_capability_bounding_set_drop) {
+-                r = capability_bounding_set_drop(arg_capability_bounding_set_drop, true);
++                r = capability_bounding_set_drop_usermode(arg_capability_bounding_set_drop);
+                 if (r < 0) {
+-                        log_error("Failed to drop capability bounding set: %s", strerror(-r));
++                        log_error("Failed to drop capability bounding set of usermode helpers: %s", strerror(-r));
+                         goto finish;
+                 }
+-                r = capability_bounding_set_drop_usermode(arg_capability_bounding_set_drop);
++                r = capability_bounding_set_drop(arg_capability_bounding_set_drop, true);
+                 if (r < 0) {
+-                        log_error("Failed to drop capability bounding set of usermode helpers: %s", strerror(-r));
++                        log_error("Failed to drop capability bounding set: %s", strerror(-r));
+                         goto finish;
+                 }
+         }
+@@ -1650,6 +1650,7 @@ int main(int argc, char *argv[]) {
+         /* This will close all file descriptors that were opened, but
+          * not claimed by any unit. */
+         fdset_free(fds);
++        fds = NULL;
+ 
+         if (serialization) {
+                 fclose(serialization);
+@@ -1857,7 +1858,7 @@ finish:
+                         char_array_0(sfd);
+ 
+                         i = 0;
+-                        args[i++] = SYSTEMD_BINARY_PATH;
++                        args[i++] = "/run/current-system/systemd/lib/systemd/systemd";
+                         if (switch_root_dir)
+                                 args[i++] = "--switched-root";
+                         args[i++] = arg_running_as == SYSTEMD_SYSTEM ? "--system" : "--user";
+diff --git a/src/core/manager.c b/src/core/manager.c
+index c7f8f20..0508628 100644
+--- a/src/core/manager.c
++++ b/src/core/manager.c
+@@ -1372,7 +1372,7 @@ static int manager_process_signal_fd(Manager *m) {
+ 
+                 case SIGINT:
+                         if (m->running_as == SYSTEMD_SYSTEM) {
+-                                manager_start_target(m, SPECIAL_CTRL_ALT_DEL_TARGET, JOB_REPLACE);
++                                manager_start_target(m, SPECIAL_CTRL_ALT_DEL_TARGET, JOB_REPLACE_IRREVERSIBLY);
+                                 break;
+                         }
+ 
+diff --git a/src/core/service.c b/src/core/service.c
+index 3617c24..4d0e2ad 100644
+--- a/src/core/service.c
++++ b/src/core/service.c
+@@ -2642,6 +2642,9 @@ static int service_serialize(Unit *u, FILE *f, FDSet *fds) {
+         if (s->exec_context.var_tmp_dir)
+                 unit_serialize_item(u, f, "var-tmp-dir", s->exec_context.var_tmp_dir);
+ 
++        if (s->forbid_restart)
++                unit_serialize_item(u, f, "forbid-restart", yes_no(s->forbid_restart));
++
+         return 0;
+ }
+ 
+@@ -2776,6 +2779,14 @@ static int service_deserialize_item(Unit *u, const char *key, const char *value,
+                         return log_oom();
+ 
+                 s->exec_context.var_tmp_dir = t;
++        } else if (streq(key, "forbid-restart")) {
++                int b;
++
++                b = parse_boolean(value);
++                if (b < 0)
++                        log_debug_unit(u->id, "Failed to parse forbid-restart value %s", value);
++                else
++                        s->forbid_restart = b;
+         } else
+                 log_debug_unit(u->id, "Unknown serialization key '%s'", key);
+ 
+diff --git a/src/core/snapshot.c b/src/core/snapshot.c
+index a63eccd..a6807eb 100644
+--- a/src/core/snapshot.c
++++ b/src/core/snapshot.c
+@@ -217,8 +217,10 @@ int snapshot_create(Manager *m, const char *name, bool cleanup, DBusError *e, Sn
+                         if (asprintf(&n, "snapshot-%u.snapshot", ++ m->n_snapshots) < 0)
+                                 return -ENOMEM;
+ 
+-                        if (!manager_get_unit(m, n))
++                        if (!manager_get_unit(m, n)) {
++                                name = n;
+                                 break;
++                        }
+ 
+                         free(n);
+                 }
+diff --git a/src/core/umount.c b/src/core/umount.c
+index 1e95ad7..9f0e471 100644
+--- a/src/core/umount.c
++++ b/src/core/umount.c
+@@ -435,6 +435,8 @@ static int mount_points_list_umount(MountPoint **head, bool *changed, bool log_e
+                  * anyway, since we are running from it. They have
+                  * already been remounted ro. */
+                 if (path_equal(m->path, "/")
++                    || path_equal(m->path, "/nix")
++                    || path_equal(m->path, "/nix/store")
+ #ifndef HAVE_SPLIT_USR
+                     || path_equal(m->path, "/usr")
+ #endif
+diff --git a/src/cryptsetup/cryptsetup-generator.c b/src/cryptsetup/cryptsetup-generator.c
+index 81b7708..edd0b40 100644
+--- a/src/cryptsetup/cryptsetup-generator.c
++++ b/src/cryptsetup/cryptsetup-generator.c
+@@ -111,6 +111,7 @@ static int create_disk(
+                 "Conflicts=umount.target\n"
+                 "DefaultDependencies=no\n"
+                 "BindsTo=dev-mapper-%i.device\n"
++                "IgnoreOnIsolate=true\n"
+                 "After=systemd-readahead-collect.service systemd-readahead-replay.service\n",
+                 f);
+ 
+diff --git a/src/fstab-generator/fstab-generator.c b/src/fstab-generator/fstab-generator.c
+index c17299f..6b3e67e 100644
+--- a/src/fstab-generator/fstab-generator.c
++++ b/src/fstab-generator/fstab-generator.c
+@@ -351,7 +351,7 @@ static int add_mount(
+ 
+         if (automount && !path_equal(where, "/")) {
+                 automount_name = unit_name_from_path(where, ".automount");
+-                if (!name)
++                if (!automount_name)
+                         return log_oom();
+ 
+                 automount_unit = strjoin(arg_dest, "/", automount_name, NULL);
+@@ -596,9 +596,9 @@ static int parse_proc_cmdline(void) {
+                 } else if (startswith(word, "rd.fstab=")) {
+ 
+                         if (in_initrd()) {
+-                                r = parse_boolean(word + 6);
++                                r = parse_boolean(word + 9);
+                                 if (r < 0)
+-                                        log_warning("Failed to parse fstab switch %s. Ignoring.", word + 6);
++                                        log_warning("Failed to parse fstab switch %s. Ignoring.", word + 9);
+                                 else
+                                         arg_enabled = r;
+                         }
+diff --git a/src/journal/journal-file.c b/src/journal/journal-file.c
+index 38499a6..bb80905 100644
+--- a/src/journal/journal-file.c
++++ b/src/journal/journal-file.c
+@@ -907,6 +907,8 @@ static int journal_file_append_field(
+ 
+         osize = offsetof(Object, field.payload) + size;
+         r = journal_file_append_object(f, OBJECT_FIELD, osize, &o, &p);
++        if (r < 0)
++                return r;
+ 
+         o->field.hash = htole64(hash);
+         memcpy(o->field.payload, field, size);
+diff --git a/src/journal/journald-server.c b/src/journal/journald-server.c
+index 88163c0..e09ba4c 100644
+--- a/src/journal/journald-server.c
++++ b/src/journal/journald-server.c
+@@ -333,8 +333,10 @@ void server_rotate(Server *s) {
+                 if (r < 0)
+                         if (f)
+                                 log_error("Failed to rotate %s: %s", f->path, strerror(-r));
+-                        else
++                        else {
+                                 log_error("Failed to create user journal: %s", strerror(-r));
++                                hashmap_remove(s->user_journals, k);
++                        }
+                 else {
+                         hashmap_replace(s->user_journals, k, f);
+                         server_fix_perms(s, f, PTR_TO_UINT32(k));
+@@ -975,7 +977,8 @@ int process_event(Server *s, struct epoll_event *ev) {
+                 ssize_t n;
+ 
+                 if (ev->events != EPOLLIN) {
+-                        log_error("Got invalid event from epoll.");
++                        log_error("Got invalid event from epoll for %s: %"PRIx32,
++                                  "signal fd", ev->events);
+                         return -EIO;
+                 }
+ 
+@@ -1024,8 +1027,12 @@ int process_event(Server *s, struct epoll_event *ev) {
+         } else if (ev->data.fd == s->dev_kmsg_fd) {
+                 int r;
+ 
+-                if (ev->events != EPOLLIN) {
+-                        log_error("Got invalid event from epoll.");
++                if (ev->events & EPOLLERR)
++                        log_warning("/dev/kmsg buffer overrun, some messages lost.");
++
++                if (!(ev->events & EPOLLIN)) {
++                        log_error("Got invalid event from epoll for %s: %"PRIx32,
++                                  "/dev/kmsg", ev->events);
+                         return -EIO;
+                 }
+ 
+@@ -1039,7 +1046,9 @@ int process_event(Server *s, struct epoll_event *ev) {
+                    ev->data.fd == s->syslog_fd) {
+ 
+                 if (ev->events != EPOLLIN) {
+-                        log_error("Got invalid event from epoll.");
++                        log_error("Got invalid event from epoll for %s: %"PRIx32,
++                                  ev->data.fd == s->native_fd ? "native fd" : "syslog fd",
++                                  ev->events);
+                         return -EIO;
+                 }
+ 
+@@ -1140,12 +1149,7 @@ int process_event(Server *s, struct epoll_event *ev) {
+                                 char *e;
+ 
+                                 if (n > 0 && n_fds == 0) {
+-                                        e = memchr(s->buffer, '\n', n);
+-                                        if (e)
+-                                                *e = 0;
+-                                        else
+-                                                s->buffer[n] = 0;
+-
++                                        s->buffer[n] = 0;
+                                         server_process_syslog_message(s, strstrip(s->buffer), ucred, tv, label, label_len);
+                                 } else if (n_fds > 0)
+                                         log_warning("Got file descriptors via syslog socket. Ignoring.");
+@@ -1167,7 +1171,8 @@ int process_event(Server *s, struct epoll_event *ev) {
+         } else if (ev->data.fd == s->stdout_fd) {
+ 
+                 if (ev->events != EPOLLIN) {
+-                        log_error("Got invalid event from epoll.");
++                        log_error("Got invalid event from epoll for %s: %"PRIx32,
++                                  "stdout fd", ev->events);
+                         return -EIO;
+                 }
+ 
+@@ -1178,6 +1183,8 @@ int process_event(Server *s, struct epoll_event *ev) {
+                 StdoutStream *stream;
+ 
+                 if ((ev->events|EPOLLIN|EPOLLHUP) != (EPOLLIN|EPOLLHUP)) {
++                        log_error("Got invalid event from epoll for %s: %"PRIx32,
++                                  "stdout stream", ev->events);
+                         log_error("Got invalid event from epoll.");
+                         return -EIO;
+                 }
+diff --git a/src/journal/mmap-cache.c b/src/journal/mmap-cache.c
+index 54bf114..bd197d0 100644
+--- a/src/journal/mmap-cache.c
++++ b/src/journal/mmap-cache.c
+@@ -308,9 +308,13 @@ static void mmap_cache_free(MMapCache *m) {
+         while ((c = hashmap_first(m->contexts)))
+                 context_free(c);
+ 
++        hashmap_free(m->contexts);
++
+         while ((f = hashmap_first(m->fds)))
+                 fd_free(f);
+ 
++        hashmap_free(m->fds);
++
+         while (m->unused)
+                 window_free(m->unused);
+ 
+diff --git a/src/libsystemd-bus/bus-internal.c b/src/libsystemd-bus/bus-internal.c
+index 0e66f3d..cac948e 100644
+--- a/src/libsystemd-bus/bus-internal.c
++++ b/src/libsystemd-bus/bus-internal.c
+@@ -63,7 +63,7 @@ bool object_path_is_valid(const char *p) {
+ 
+ bool interface_name_is_valid(const char *p) {
+         const char *q;
+-        bool dot, found_dot;
++        bool dot, found_dot = false;
+ 
+         if (isempty(p))
+                 return false;
+@@ -103,7 +103,7 @@ bool interface_name_is_valid(const char *p) {
+ 
+ bool service_name_is_valid(const char *p) {
+         const char *q;
+-        bool dot, found_dot, unique;
++        bool dot, found_dot = false, unique;
+ 
+         if (isempty(p))
+                 return false;
+diff --git a/src/libsystemd-bus/sd-bus.c b/src/libsystemd-bus/sd-bus.c
+index 7d6d848..b0eb2f1 100644
+--- a/src/libsystemd-bus/sd-bus.c
++++ b/src/libsystemd-bus/sd-bus.c
+@@ -1088,11 +1088,11 @@ static int dispatch_rqueue(sd_bus *bus, sd_bus_message **m) {
+                 if (r == 0)
+                         return ret;
+ 
+-                r = 1;
++                ret = 1;
+         } while (!z);
+ 
+         *m = z;
+-        return 1;
++        return ret;
+ }
+ 
+ int sd_bus_send(sd_bus *bus, sd_bus_message *m, uint64_t *serial) {
+diff --git a/src/libudev/libudev-enumerate.c b/src/libudev/libudev-enumerate.c
+index 5ccaabd..100c1fb 100644
+--- a/src/libudev/libudev-enumerate.c
++++ b/src/libudev/libudev-enumerate.c
+@@ -299,7 +299,7 @@ _public_ struct udev_list_entry *udev_enumerate_get_list_entry(struct udev_enume
+                         /* skip to be delayed devices, and move the to
+                          * the point where the prefix changes. We can
+                          * only move one item at a time. */
+-                        if (!move_later) {
++                        if (move_later == -1) {
+                                 move_later_prefix = devices_delay_later(udev_enumerate->udev, entry->syspath);
+ 
+                                 if (move_later_prefix > 0) {
+@@ -718,6 +718,8 @@ static bool match_subsystem(struct udev_enumerate *udev_enumerate, const char *s
+ {
+         struct udev_list_entry *list_entry;
+ 
++        subsystem = subsystem ? : "";
++
+         udev_list_entry_foreach(list_entry, udev_list_get_entry(&udev_enumerate->subsystem_nomatch_list)) {
+                 if (fnmatch(udev_list_entry_get_name(list_entry), subsystem, 0) == 0)
+                         return false;
+@@ -826,23 +828,27 @@ nomatch:
+ static int parent_add_child(struct udev_enumerate *enumerate, const char *path)
+ {
+         struct udev_device *dev;
++        int r = 0;
+ 
+         dev = udev_device_new_from_syspath(enumerate->udev, path);
+         if (dev == NULL)
+                 return -ENODEV;
+ 
+         if (!match_subsystem(enumerate, udev_device_get_subsystem(dev)))
+-                return 0;
++                goto nomatch;
+         if (!match_sysname(enumerate, udev_device_get_sysname(dev)))
+-                return 0;
++                goto nomatch;
+         if (!match_property(enumerate, dev))
+-                return 0;
++                goto nomatch;
+         if (!match_sysattr(enumerate, dev))
+-                return 0;
++                goto nomatch;
+ 
+         syspath_add(enumerate, udev_device_get_syspath(dev));
++        r = 1;
++
++nomatch:
+         udev_device_unref(dev);
+-        return 1;
++        return r;
+ }
+ 
+ static int parent_crawl_children(struct udev_enumerate *enumerate, const char *path, int maxdepth)
+diff --git a/src/libudev/libudev.sym b/src/libudev/libudev.sym
+index 8e09430..1e6f885 100644
+--- a/src/libudev/libudev.sym
++++ b/src/libudev/libudev.sym
+@@ -109,5 +109,6 @@ global:
+ } LIBUDEV_189;
+ 
+ LIBUDEV_199 {
++global:
+         udev_device_set_sysattr_value;
+ } LIBUDEV_196;
+diff --git a/src/modules-load/modules-load.c b/src/modules-load/modules-load.c
+index 7b19ee0..49ee420 100644
+--- a/src/modules-load/modules-load.c
++++ b/src/modules-load/modules-load.c
+@@ -302,8 +302,8 @@ int main(int argc, char *argv[]) {
+ 
+                 STRV_FOREACH(i, arg_proc_cmdline_modules) {
+                         k = load_module(ctx, *i);
+-                        if (k < 0)
+-                                r = EXIT_FAILURE;
++                        if (k < 0 && r == 0)
++                                r = k;
+                 }
+ 
+                 r = conf_files_list_nulstr(&files, ".conf", NULL, conf_file_dirs);
+diff --git a/src/nss-myhostname/netlink.c b/src/nss-myhostname/netlink.c
+index b1ef912..4f2ab5c 100644
+--- a/src/nss-myhostname/netlink.c
++++ b/src/nss-myhostname/netlink.c
+@@ -113,6 +113,10 @@ static int read_reply(int fd, struct address **list, unsigned *n_list) {
+                     ifaddrmsg->ifa_scope == RT_SCOPE_NOWHERE)
+                         continue;
+ 
++                if (ifaddrmsg->ifa_family == AF_INET6 &&
++                    ifaddrmsg->ifa_scope == RT_SCOPE_LINK)
++                        continue;
++
+                 if (ifaddrmsg->ifa_flags & IFA_F_DEPRECATED)
+                         continue;
+ 
+diff --git a/src/shared/efivars.c b/src/shared/efivars.c
+index 8d004ba..99340c9 100644
+--- a/src/shared/efivars.c
++++ b/src/shared/efivars.c
+@@ -383,7 +383,8 @@ int efi_get_boot_options(uint16_t **options) {
+                 list[count ++] = id;
+         }
+ 
+-        qsort(list, count, sizeof(uint16_t), cmp_uint16);
++        if (list)
++                qsort(list, count, sizeof(uint16_t), cmp_uint16);
+ 
+         *options = list;
+         return count;
+diff --git a/src/shared/env-util.c b/src/shared/env-util.c
+index 6a52fb9..598222c 100644
+--- a/src/shared/env-util.c
++++ b/src/shared/env-util.c
+@@ -406,7 +406,9 @@ char **strv_env_clean_log(char **e, const char *message) {
+                 e[k++] = *p;
+         }
+ 
+-        e[k] = NULL;
++        if (e)
++                e[k] = NULL;
++
+         return e;
+ }
+ 
+diff --git a/src/shared/log.c b/src/shared/log.c
+index 27317f7..8f4995a 100644
+--- a/src/shared/log.c
++++ b/src/shared/log.c
+@@ -115,16 +115,20 @@ void log_close_syslog(void) {
+ 
+ static int create_log_socket(int type) {
+         int fd;
++        struct timeval tv;
+ 
+-        /* All output to the syslog/journal fds we do asynchronously,
+-         * and if the buffers are full we just drop the messages */
+-
+-        fd = socket(AF_UNIX, type|SOCK_CLOEXEC|SOCK_NONBLOCK, 0);
++        fd = socket(AF_UNIX, type|SOCK_CLOEXEC, 0);
+         if (fd < 0)
+                 return -errno;
+ 
+         fd_inc_sndbuf(fd, SNDBUF_SIZE);
+ 
++        /* We need a blocking fd here since we'd otherwise lose
++        messages way too early. However, let's not hang forever in the
++        unlikely case of a deadlock. */
++        timeval_store(&tv, 1*USEC_PER_MINUTE);
++        setsockopt(fd, SOL_SOCKET, SO_SNDTIMEO, &tv, sizeof(tv));
++
+         return fd;
+ }
+ 
+diff --git a/src/shared/polkit.c b/src/shared/polkit.c
+index cea7074..1c5e9e3 100644
+--- a/src/shared/polkit.c
++++ b/src/shared/polkit.c
+@@ -38,12 +38,8 @@ int verify_polkit(
+ 
+ #ifdef ENABLE_POLKIT
+         DBusMessage *m = NULL, *reply = NULL;
+-        const char *unix_process = "unix-process", *pid = "pid", *starttime = "start-time", *cancel_id = "";
++        const char *system_bus_name = "system-bus-name", *name = "name", *cancel_id = "";
+         uint32_t flags = interactive ? 1 : 0;
+-        pid_t pid_raw;
+-        uint32_t pid_u32;
+-        unsigned long long starttime_raw;
+-        uint64_t starttime_u64;
+         DBusMessageIter iter_msg, iter_struct, iter_array, iter_dict, iter_variant;
+         int r;
+         dbus_bool_t authorized = FALSE, challenge = FALSE;
+@@ -68,14 +64,6 @@ int verify_polkit(
+ 
+ #ifdef ENABLE_POLKIT
+ 
+-        pid_raw = bus_get_unix_process_id(c, sender, error);
+-        if (pid_raw == 0)
+-                return -EINVAL;
+-
+-        r = get_starttime_of_pid(pid_raw, &starttime_raw);
+-        if (r < 0)
+-                return r;
+-
+         m = dbus_message_new_method_call(
+                         "org.freedesktop.PolicyKit1",
+                         "/org/freedesktop/PolicyKit1/Authority",
+@@ -86,22 +74,13 @@ int verify_polkit(
+ 
+         dbus_message_iter_init_append(m, &iter_msg);
+ 
+-        pid_u32 = (uint32_t) pid_raw;
+-        starttime_u64 = (uint64_t) starttime_raw;
+-
+         if (!dbus_message_iter_open_container(&iter_msg, DBUS_TYPE_STRUCT, NULL, &iter_struct) ||
+-            !dbus_message_iter_append_basic(&iter_struct, DBUS_TYPE_STRING, &unix_process) ||
++            !dbus_message_iter_append_basic(&iter_struct, DBUS_TYPE_STRING, &system_bus_name) ||
+             !dbus_message_iter_open_container(&iter_struct, DBUS_TYPE_ARRAY, "{sv}", &iter_array) ||
+             !dbus_message_iter_open_container(&iter_array, DBUS_TYPE_DICT_ENTRY, NULL, &iter_dict) ||
+-            !dbus_message_iter_append_basic(&iter_dict, DBUS_TYPE_STRING, &pid) ||
+-            !dbus_message_iter_open_container(&iter_dict, DBUS_TYPE_VARIANT, "u", &iter_variant) ||
+-            !dbus_message_iter_append_basic(&iter_variant, DBUS_TYPE_UINT32, &pid_u32) ||
+-            !dbus_message_iter_close_container(&iter_dict, &iter_variant) ||
+-            !dbus_message_iter_close_container(&iter_array, &iter_dict) ||
+-            !dbus_message_iter_open_container(&iter_array, DBUS_TYPE_DICT_ENTRY, NULL, &iter_dict) ||
+-            !dbus_message_iter_append_basic(&iter_dict, DBUS_TYPE_STRING, &starttime) ||
+-            !dbus_message_iter_open_container(&iter_dict, DBUS_TYPE_VARIANT, "t", &iter_variant) ||
+-            !dbus_message_iter_append_basic(&iter_variant, DBUS_TYPE_UINT64, &starttime_u64) ||
++            !dbus_message_iter_append_basic(&iter_dict, DBUS_TYPE_STRING, &name) ||
++            !dbus_message_iter_open_container(&iter_dict, DBUS_TYPE_VARIANT, "s", &iter_variant) ||
++            !dbus_message_iter_append_basic(&iter_variant, DBUS_TYPE_STRING, &sender) ||
+             !dbus_message_iter_close_container(&iter_dict, &iter_variant) ||
+             !dbus_message_iter_close_container(&iter_array, &iter_dict) ||
+             !dbus_message_iter_close_container(&iter_struct, &iter_array) ||
+diff --git a/src/systemctl/systemctl.c b/src/systemctl/systemctl.c
+index 3cca861..f6052dd 100644
+--- a/src/systemctl/systemctl.c
++++ b/src/systemctl/systemctl.c
+@@ -1482,7 +1482,7 @@ static DBusHandlerResult wait_filter(DBusConnection *connection, DBusMessage *me
+ 
+         } else if (dbus_message_is_signal(message, "org.freedesktop.systemd1.Manager", "JobRemoved")) {
+                 uint32_t id;
+-                const char *path, *result, *unit;
++                const char *path, *result, *unit, *r;
+ 
+                 if (dbus_message_get_args(message, &error,
+                                           DBUS_TYPE_UINT32, &id,
+@@ -1491,7 +1491,11 @@ static DBusHandlerResult wait_filter(DBusConnection *connection, DBusMessage *me
+                                           DBUS_TYPE_STRING, &result,
+                                           DBUS_TYPE_INVALID)) {
+ 
+-                        free(set_remove(d->set, (char*) path));
++                        r = set_remove(d->set, (char*) path);
++                        if (!r)
++                                return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
++
++                        free(r);
+ 
+                         if (!isempty(result))
+                                 d->result = strdup(result);
+@@ -1511,7 +1515,11 @@ static DBusHandlerResult wait_filter(DBusConnection *connection, DBusMessage *me
+                         /* Compatibility with older systemd versions <
+                          * 183 during upgrades. This should be dropped
+                          * one day. */
+-                        free(set_remove(d->set, (char*) path));
++                        r = set_remove(d->set, (char*) path);
++                        if (!r)
++                                return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
++
++                        free(r);
+ 
+                         if (*result)
+                                 d->result = strdup(result);
+@@ -1867,7 +1875,7 @@ static int start_unit_one(
+                         return log_oom();
+ 
+                 r = set_consume(s, p);
+-                if (r < 0) {
++                if (r < 0 && r != -EEXIST) {
+                         log_error("Failed to add path to set.");
+                         return r;
+                 }
+diff --git a/units/emergency.service.in b/units/emergency.service.in
+index 442f0e0..6b7eafd 100644
+--- a/units/emergency.service.in
++++ b/units/emergency.service.in
+@@ -15,7 +15,6 @@ Before=shutdown.target
+ [Service]
+ Environment=HOME=/root
+ WorkingDirectory=/root
+-ExecStartPre=-/bin/plymouth quit
+ ExecStartPre=-/bin/echo -e 'Welcome to emergency mode! After logging in, type "journalctl -xb" to view\\nsystem logs, "systemctl reboot" to reboot, "systemctl default" to try again\\nto boot into default mode.'
+ ExecStart=-/sbin/sulogin
+ ExecStopPost=@SYSTEMCTL@ --fail --no-block default
+diff --git a/units/local-fs.target b/units/local-fs.target
+index 18c3d74..a09054c 100644
+--- a/units/local-fs.target
++++ b/units/local-fs.target
+@@ -11,3 +11,5 @@ Documentation=man:systemd.special(7)
+ After=local-fs-pre.target
+ OnFailure=emergency.target
+ OnFailureIsolate=no
++
++X-StopOnReconfiguration=yes
+diff --git a/units/remote-fs.target b/units/remote-fs.target
+index 09213e8..47b4cf5 100644
+--- a/units/remote-fs.target
++++ b/units/remote-fs.target
+@@ -10,5 +10,7 @@ Description=Remote File Systems
+ Documentation=man:systemd.special(7)
+ After=remote-fs-pre.target
+ 
++X-StopOnReconfiguration=yes
++
+ [Install]
+ WantedBy=multi-user.target
+diff --git a/units/rescue.service.m4.in b/units/rescue.service.m4.in
+index 269797a..2c640f4 100644
+--- a/units/rescue.service.m4.in
++++ b/units/rescue.service.m4.in
+@@ -16,7 +16,6 @@ Before=shutdown.target
+ [Service]
+ Environment=HOME=/root
+ WorkingDirectory=/root
+-ExecStartPre=-/bin/plymouth quit
+ ExecStartPre=-/bin/echo -e 'Welcome to rescue mode! Type "systemctl default" or ^D to enter default mode.\\nType "journalctl -xb" to view system logs. Type "systemctl reboot" to reboot.'
+ ExecStart=-/sbin/sulogin
+ ExecStopPost=-@SYSTEMCTL@ --fail --no-block default
+diff --git a/units/sysinit.target b/units/sysinit.target
+index 8f4fb8f..e0f0147 100644
+--- a/units/sysinit.target
++++ b/units/sysinit.target
+@@ -9,6 +9,5 @@
+ Description=System Initialization
+ Documentation=man:systemd.special(7)
+ Conflicts=emergency.service emergency.target
+-Wants=local-fs.target swap.target
+-After=local-fs.target swap.target emergency.service emergency.target
++After=emergency.service emergency.target
+ RefuseManualStart=yes
+diff --git a/units/systemd-journald.service.in b/units/systemd-journald.service.in
+index ab2e50c..9563a7d 100644
+--- a/units/systemd-journald.service.in
++++ b/units/systemd-journald.service.in
+@@ -24,3 +24,8 @@ CapabilityBoundingSet=CAP_SYS_ADMIN CAP_DAC_OVERRIDE CAP_SYS_PTRACE CAP_SYSLOG C
+ # Increase the default a bit in order to allow many simultaneous
+ # services being run since we keep one fd open per service.
+ LimitNOFILE=16384
++
++# Don't restart journald, since that causes services connected to
++# journald to stop logging (see
++# https://bugs.freedesktop.org/show_bug.cgi?id=56043).
++X-RestartIfChanged=no
+diff --git a/units/systemd-user-sessions.service.in b/units/systemd-user-sessions.service.in
+index 0869e73..b6ed958 100644
+--- a/units/systemd-user-sessions.service.in
++++ b/units/systemd-user-sessions.service.in
+@@ -15,3 +15,6 @@ Type=oneshot
+ RemainAfterExit=yes
+ ExecStart=@rootlibexecdir@/systemd-user-sessions start
+ ExecStop=@rootlibexecdir@/systemd-user-sessions stop
++
++# Restart kills all active sessions.
++X-RestartIfChanged=no
diff --git a/pkgs/os-specific/linux/systemd/no-global-install.patch b/pkgs/os-specific/linux/systemd/no-global-install.patch
deleted file mode 100644
index 6567251d57a..00000000000
--- a/pkgs/os-specific/linux/systemd/no-global-install.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff --git a/Makefile.am b/Makefile.am
-index 05bf582..aa16a7c 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -2568,11 +2568,6 @@ endif
- # "adm" and "wheel".
- libsystemd-journal-install-hook:
- 	libname=libsystemd-journal.so && $(move-to-rootlibdir)
--	$(MKDIR_P) $(DESTDIR)/var/log/journal
--	-chown 0:0 $(DESTDIR)/var/log/journal
--	-chmod 755 $(DESTDIR)/var/log/journal
--	-setfacl -nm g:adm:rx,d:g:adm:rx $(DESTDIR)/var/log/journal/
--	-setfacl -nm g:wheel:rx,d:g:wheel:rx $(DESTDIR)/var/log/journal/
- 
- libsystemd-journal-uninstall-hook:
- 	rm -f $(DESTDIR)$(rootlibdir)/libsystemd-journal.so*
-@@ -3676,9 +3671,6 @@ if HAVE_SYSV_COMPAT
- sysvinit_DATA = \
- 	docs/sysvinit/README
- 
--varlog_DATA = \
--	docs/var-log/README
--
- docs/sysvinit/README: docs/sysvinit/README.in
- 	$(SED_PROCESS)
- 
-- 
GitLab


From fc593e719d15b71ecffdc32d174d3cabb7afcc7e Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 14 Oct 2013 12:52:22 +0200
Subject: [PATCH 5202/5331] linux: Update to 3.4.66

CVE-2013-2015
---
 pkgs/os-specific/linux/kernel/linux-3.4.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/linux-3.4.nix b/pkgs/os-specific/linux/kernel/linux-3.4.nix
index 79f53b22216..d37ca172479 100644
--- a/pkgs/os-specific/linux/kernel/linux-3.4.nix
+++ b/pkgs/os-specific/linux/kernel/linux-3.4.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, ... } @ args:
 
 import ./generic.nix (args // rec {
-  version = "3.4.65";
+  version = "3.4.66";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz";
-    sha256 = "1amy6gdqnk0klqmghkdfn2fv1rd30pqvqwx6ix27gf3hmn4s823z";
+    sha256 = "09jrj989mqk76klrg5zq1z8qrx3gif69bqi78ywq3jky8dmrwz3y";
   };
 
   features.iwlwifi = true;
-- 
GitLab


From 582aa9a6f45eb23474b26f75d6af32264e7377e5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Carles=20Pag=C3=A8s?= <page@cubata.homelinux.net>
Date: Mon, 14 Oct 2013 16:11:46 +0200
Subject: [PATCH 5203/5331] Add libjson-rpc-cpp-0.2.1

---
 .../libraries/libjson-rpc-cpp/default.nix     | 28 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 30 insertions(+)
 create mode 100644 pkgs/development/libraries/libjson-rpc-cpp/default.nix

diff --git a/pkgs/development/libraries/libjson-rpc-cpp/default.nix b/pkgs/development/libraries/libjson-rpc-cpp/default.nix
new file mode 100644
index 00000000000..3dca6a04af7
--- /dev/null
+++ b/pkgs/development/libraries/libjson-rpc-cpp/default.nix
@@ -0,0 +1,28 @@
+{ stdenv, fetchurl, cmake, curl }:
+
+let
+  name = "libjson-rpc-cpp";
+  version = "0.2.1";
+in
+
+stdenv.mkDerivation {
+  name = "${name}-${version}";
+
+  src = fetchurl {
+    url = "https://github.com/cinemast/${name}/archive/${version}.tar.gz";
+    sha256 = "1pc9nn4968qkda8vr4f9dijn2fcldm8i0ymwmql29h4cl5ghdnpw";
+  };
+
+  buildInputs = [ cmake curl ];
+
+  NIX_LDFLAGS = "-lpthread";
+  enableParallelBuilding = true;
+  doCheck = true;
+
+  checkPhase = "LD_LIBRARY_PATH=out/ ctest";
+
+  meta = {
+    description = "C++ framework for json-rpc (json remote procedure call)";
+    platforms = stdenv.lib.platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index bdef89202b7..97b3e50b699 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4829,6 +4829,8 @@ let
     libtool = libtool_1_5;
   };
 
+  libjson_rpc_cpp = callPackage ../development/libraries/libjson-rpc-cpp { };
+
   libkate = callPackage ../development/libraries/libkate { };
 
   libksba = callPackage ../development/libraries/libksba { };
-- 
GitLab


From dc68c10e94ab2674a7ae8710538a9e1b0bd944f7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Mon, 14 Oct 2013 17:13:50 +0200
Subject: [PATCH 5204/5331] fix eval

---
 pkgs/tools/security/prey/default.nix | 8 ++++----
 pkgs/top-level/all-packages.nix      | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/tools/security/prey/default.nix b/pkgs/tools/security/prey/default.nix
index 37416b4da1a..fe71806301d 100644
--- a/pkgs/tools/security/prey/default.nix
+++ b/pkgs/tools/security/prey/default.nix
@@ -1,10 +1,10 @@
 { stdenv, fetchurl, fetchgit, curl, scrot, imagemagick, xawtv, inetutils, makeWrapper, coreutils
-, apiKey ? null
-, deviceKey ? null }:
+, apiKey ? ""
+, deviceKey ? "" }:
 
 # TODO: this should assert keys are set, somehow if set through .override assertion fails
-#assert apiKey != null;
-#assert deviceKey != null;
+#assert apiKey != "";
+#assert deviceKey != "";
 
 let
   modulesSrc = fetchgit {
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 97b3e50b699..7677fcc7503 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1597,7 +1597,7 @@ let
 
   pptp = callPackage ../tools/networking/pptp {};
 
-  "prey-bash-client" = callPackage ../tools/security/prey { };
+  prey-bash-client = callPackage ../tools/security/prey { };
 
   proxychains = callPackage ../tools/networking/proxychains { };
 
-- 
GitLab


From dd7ecf5336bd01079b543efac3b2d2fa122dc060 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Mon, 14 Oct 2013 22:07:13 +0400
Subject: [PATCH 5205/5331] Update pdf2djvu

---
 pkgs/tools/typesetting/pdf2djvu/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/typesetting/pdf2djvu/default.nix b/pkgs/tools/typesetting/pdf2djvu/default.nix
index b7204b95784..b97252e74de 100644
--- a/pkgs/tools/typesetting/pdf2djvu/default.nix
+++ b/pkgs/tools/typesetting/pdf2djvu/default.nix
@@ -1,12 +1,12 @@
 {stdenv, fetchurl, pkgconfig, djvulibre, poppler, fontconfig, libjpeg }:
 
 stdenv.mkDerivation rec {
-  version = "0.7.16";
+  version = "0.7.17";
   name = "pdf2djvu-${version}";
 
   src = fetchurl {
     url = "http://pdf2djvu.googlecode.com/files/pdf2djvu_${version}.tar.gz";
-    sha256 = "1yg4ppqxpfda89yi4c3rrq2zhar5dzyqypvqdvdd0r7is2321nnv";
+    sha256 = "1nplcabb8526bs5707k9212pi000wnskq3c9hbq9acgmdlnnwvgy";
   };
 
   buildInputs = [ pkgconfig djvulibre poppler fontconfig libjpeg ];
-- 
GitLab


From 645cdce565bee9df58d40402d74450a51c354294 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Mon, 14 Oct 2013 19:27:11 +0200
Subject: [PATCH 5206/5331] plantuml: new package

PlantUML draws UML diagrams using a simple and human readable text
description.
---
 pkgs/tools/misc/plantuml/default.nix | 37 ++++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix      |  2 ++
 2 files changed, 39 insertions(+)
 create mode 100644 pkgs/tools/misc/plantuml/default.nix

diff --git a/pkgs/tools/misc/plantuml/default.nix b/pkgs/tools/misc/plantuml/default.nix
new file mode 100644
index 00000000000..10886e969a2
--- /dev/null
+++ b/pkgs/tools/misc/plantuml/default.nix
@@ -0,0 +1,37 @@
+{ stdenv, fetchurl, jre, graphviz }:
+
+stdenv.mkDerivation rec {
+  version = "7982";
+  name = "plantuml-${version}";
+
+  src = fetchurl {
+    url = "mirror://sourceforge/project/plantuml/plantuml.${version}.jar";
+    sha256 = "0hxs0whjgx36j5azdcna40rw2c7smhg0qm3kzld9vx88m0c51dgl";
+  };
+
+  # It's only a .jar file and a shell wrapper
+  phases = [ "installPhase" ];
+
+  installPhase = ''
+    mkdir -p "$out/bin"
+    mkdir -p "$out/lib"
+
+    cp "$src" "$out/lib/plantuml.jar"
+
+    cat > "$out/bin/plantuml" << EOF
+    #!${stdenv.shell}
+    export GRAPHVIZ_DOT="${graphviz}/bin/dot"
+    exec "${jre}/bin/java" -jar "$out/lib/plantuml.jar" "\$@"
+    EOF
+    chmod a+x "$out/bin/plantuml"
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Draw UML diagrams using a simple and human readable text description";
+    homepage = http://plantuml.sourceforge.net/;
+    # "java -jar plantuml.jar -license" says GPLv3 or later
+    license = licenses.gpl3Plus;
+    maintainers = [ maintainers.bjornfor ];
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 7677fcc7503..6cfc5820453 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1561,6 +1561,8 @@ let
 
   pk2cmd = callPackage ../tools/misc/pk2cmd { };
 
+  plantuml = callPackage ../tools/misc/plantuml { };
+
   plan9port = callPackage ../tools/system/plan9port { };
 
   ploticus = callPackage ../tools/graphics/ploticus {
-- 
GitLab


From 50f482288857f679acf10cd8a9b3f35a76466730 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Mon, 14 Oct 2013 16:02:29 -0400
Subject: [PATCH 5207/5331] Fix efi installer test

Signed-off-by: Shea Levy <shea@shealevy.com>
---
 nixos/tests/efi-installer.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/tests/efi-installer.nix b/nixos/tests/efi-installer.nix
index f1a7d42f833..e16c402e7f7 100644
--- a/nixos/tests/efi-installer.nix
+++ b/nixos/tests/efi-installer.nix
@@ -59,7 +59,7 @@ in {
       createDisk("harddisk", 4 * 1024);
 
       my $machine = createMachine({ hda => "harddisk",
-        hdaInterface => "virtio",
+        hdaInterface => "scsi",
         cdrom => glob("${iso}/iso/*.iso"),
         qemuFlags => '-L ${biosDir} ${optionalString (pkgs.stdenv.system == "x86_64-linux") "-cpu kvm64"}'});
       $machine->start;
-- 
GitLab


From b3119ba705cea583a9bac75c01dc8626d1dc537b Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 14 Oct 2013 08:47:46 +0200
Subject: [PATCH 5208/5331] haskell-aeson: update to version 0.6.2.1

---
 pkgs/development/libraries/haskell/aeson/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/aeson/default.nix b/pkgs/development/libraries/haskell/aeson/default.nix
index bcb202c64d0..edd2a21040e 100644
--- a/pkgs/development/libraries/haskell/aeson/default.nix
+++ b/pkgs/development/libraries/haskell/aeson/default.nix
@@ -5,8 +5,8 @@
 
 cabal.mkDerivation (self: {
   pname = "aeson";
-  version = "0.6.2.0";
-  sha256 = "1f7bzgwl9pm5a79gr3a8wxh7dyz4k2508d0bw4l0mbjgv6r7s4an";
+  version = "0.6.2.1";
+  sha256 = "00fa13qr38s4c0fwfvpks3x3sb21kh71cv1v0x2zqg0adnaydknb";
   buildDepends = [
     attoparsec blazeBuilder deepseq dlist hashable mtl syb text time
     unorderedContainers vector
-- 
GitLab


From 27c80e7712e796a98a85d377f00cab192078e851 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 14 Oct 2013 08:47:46 +0200
Subject: [PATCH 5209/5331] haskell-bifunctors: update to version 4.1.0.1

---
 pkgs/development/libraries/haskell/bifunctors/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/haskell/bifunctors/default.nix b/pkgs/development/libraries/haskell/bifunctors/default.nix
index c659c3bc3be..d7c8fa6debb 100644
--- a/pkgs/development/libraries/haskell/bifunctors/default.nix
+++ b/pkgs/development/libraries/haskell/bifunctors/default.nix
@@ -2,12 +2,12 @@
 
 cabal.mkDerivation (self: {
   pname = "bifunctors";
-  version = "3.2.0.1";
-  sha256 = "1biicx0zi48wzzi7vkhzvrdyk59hmmm1bqbsga6x5nbrbf3qrkm6";
+  version = "4.1.0.1";
+  sha256 = "1mf1v64g5pr2k1jpc7i4994ki2fp5vkxg4n5v84lfbl2r3kr92yg";
   buildDepends = [ semigroupoids semigroups tagged ];
   meta = {
     homepage = "http://github.com/ekmett/bifunctors/";
-    description = "Haskell 98 bifunctors";
+    description = "Bifunctors";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
   };
-- 
GitLab


From 8090704e3d9be109698c0f10ae098816b745e40d Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 14 Oct 2013 08:47:46 +0200
Subject: [PATCH 5210/5331] haskell-charset: update to version 0.3.5.1

---
 pkgs/development/libraries/haskell/charset/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/charset/default.nix b/pkgs/development/libraries/haskell/charset/default.nix
index 9aee9b97afe..829c35b7563 100644
--- a/pkgs/development/libraries/haskell/charset/default.nix
+++ b/pkgs/development/libraries/haskell/charset/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "charset";
-  version = "0.3.5";
-  sha256 = "0842jdqg7hipgkvax3p4cb2y3znsgcmbj9nfrg2448dg2nanlhsn";
+  version = "0.3.5.1";
+  sha256 = "0bf9s5r2j9bkwmjxzvj5c2c7bhnf5gyh2kkx67lmy8xqalfxgmwn";
   buildDepends = [ semigroups unorderedContainers ];
   meta = {
     homepage = "http://github.com/ekmett/charset";
-- 
GitLab


From 40ad6ff9b382352e57692f75aac6abb6d2600a66 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 14 Oct 2013 08:47:46 +0200
Subject: [PATCH 5211/5331] haskell-comonad-transformers: update to version 4.0

---
 .../haskell/comonad-transformers/default.nix      | 15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)

diff --git a/pkgs/development/libraries/haskell/comonad-transformers/default.nix b/pkgs/development/libraries/haskell/comonad-transformers/default.nix
index ef0ffe06198..912b36057c0 100644
--- a/pkgs/development/libraries/haskell/comonad-transformers/default.nix
+++ b/pkgs/development/libraries/haskell/comonad-transformers/default.nix
@@ -1,18 +1,13 @@
-{ cabal, comonad, contravariant, distributive, semigroupoids
-, semigroups, transformers
-}:
+{ cabal, comonad }:
 
 cabal.mkDerivation (self: {
   pname = "comonad-transformers";
-  version = "3.1";
-  sha256 = "024l437xfi0bkbn3121xi8slwsh9jby9a92qg1m5y0nmxzs9lxda";
-  buildDepends = [
-    comonad contravariant distributive semigroupoids semigroups
-    transformers
-  ];
+  version = "4.0";
+  sha256 = "13zzp6r6s6c80skniphwvzxhpazbyal5854m53139kgcw560rv6z";
+  buildDepends = [ comonad ];
   meta = {
     homepage = "http://github.com/ekmett/comonad-transformers/";
-    description = "Comonad transformers";
+    description = "This package has been merged into comonad 4.0";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
   };
-- 
GitLab


From 48c44876aed5fe309f9d5c4ea4f742fe43d27f94 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 14 Oct 2013 08:47:47 +0200
Subject: [PATCH 5212/5331] haskell-comonad: update to version 4.0

---
 .../libraries/haskell/comonad/default.nix          | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/libraries/haskell/comonad/default.nix b/pkgs/development/libraries/haskell/comonad/default.nix
index 472e4e315c1..9457a2ad44d 100644
--- a/pkgs/development/libraries/haskell/comonad/default.nix
+++ b/pkgs/development/libraries/haskell/comonad/default.nix
@@ -1,14 +1,18 @@
-{ cabal, doctest, filepath, semigroups, tagged, transformers }:
+{ cabal, contravariant, distributive, doctest, filepath, mtl
+, semigroups, tagged, transformers
+}:
 
 cabal.mkDerivation (self: {
   pname = "comonad";
-  version = "3.1";
-  sha256 = "0sl9b3f1vwpjdvnrxv7b8n512w05pv4in6qx3l4sbksdp1zjvcyv";
-  buildDepends = [ semigroups tagged transformers ];
+  version = "4.0";
+  sha256 = "1f57wqxy1la59kippbj924prnj53a5hwc2ppg48n9xx2wfr63iha";
+  buildDepends = [
+    contravariant distributive mtl semigroups tagged transformers
+  ];
   testDepends = [ doctest filepath ];
   meta = {
     homepage = "http://github.com/ekmett/comonad/";
-    description = "Haskell 98 compatible comonads";
+    description = "Comonads";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
   };
-- 
GitLab


From 9274cb0a49591c02ad9eca3573956f5f8e049a8a Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 14 Oct 2013 08:47:47 +0200
Subject: [PATCH 5213/5331] haskell-comonads-fd: update to version 4.0

---
 .../libraries/haskell/comonads-fd/default.nix      | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

diff --git a/pkgs/development/libraries/haskell/comonads-fd/default.nix b/pkgs/development/libraries/haskell/comonads-fd/default.nix
index aac28ff0871..0d7de2817ce 100644
--- a/pkgs/development/libraries/haskell/comonads-fd/default.nix
+++ b/pkgs/development/libraries/haskell/comonads-fd/default.nix
@@ -1,17 +1,13 @@
-{ cabal, comonad, comonadTransformers, mtl, semigroups
-, transformers
-}:
+{ cabal, comonad }:
 
 cabal.mkDerivation (self: {
   pname = "comonads-fd";
-  version = "3.0.3";
-  sha256 = "06x545yq5xc3kphjipkgjrgrfvvkjpy0wji9d5fw44ca91nzglww";
-  buildDepends = [
-    comonad comonadTransformers mtl semigroups transformers
-  ];
+  version = "4.0";
+  sha256 = "19xpv0dsz7w3a1sq1gdxwzglfal45vj2s22zb12g9mpk5rp3hw1s";
+  buildDepends = [ comonad ];
   meta = {
     homepage = "http://github.com/ekmett/comonads-fd/";
-    description = "Comonad transformers using functional dependencies";
+    description = "This package has been merged into comonad 4.0";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
   };
-- 
GitLab


From f572643b4201a66aafd7030023d72605de0688f6 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 14 Oct 2013 08:47:47 +0200
Subject: [PATCH 5214/5331] haskell-cryptohash: update to version 0.11.1

---
 pkgs/development/libraries/haskell/cryptohash/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/cryptohash/default.nix b/pkgs/development/libraries/haskell/cryptohash/default.nix
index 5ad655eb613..ae0950d1152 100644
--- a/pkgs/development/libraries/haskell/cryptohash/default.nix
+++ b/pkgs/development/libraries/haskell/cryptohash/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "cryptohash";
-  version = "0.11.0";
-  sha256 = "03v85lb866lbyd0bykjihiqf948asbgxp3c1dzpjc9mvg22pbmlg";
+  version = "0.11.1";
+  sha256 = "0ww7bikl8i50m1pwkqp145bfsiy07npnjw48j3il4w2ia0b3axmy";
   buildDepends = [ byteable ];
   testDepends = [
     byteable HUnit QuickCheck testFramework testFrameworkHunit
-- 
GitLab


From 502c2eda48215345484f094361bad6b505633141 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 14 Oct 2013 08:47:47 +0200
Subject: [PATCH 5215/5331] haskell-distributive: update to version 0.3.2

---
 pkgs/development/libraries/haskell/distributive/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/distributive/default.nix b/pkgs/development/libraries/haskell/distributive/default.nix
index d40952024ef..d03257f54d3 100644
--- a/pkgs/development/libraries/haskell/distributive/default.nix
+++ b/pkgs/development/libraries/haskell/distributive/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "distributive";
-  version = "0.3.1";
-  sha256 = "0zf3wq1xz9sbb0g6fg852jckrwkffsfkghq3zx03d2q9ginc6jbc";
+  version = "0.3.2";
+  sha256 = "1n2xnjffrbfw736qn9w5fxy4pjl2319yhimkglhbayq85pz51r1h";
   buildDepends = [ transformers transformersCompat ];
   testDepends = [ doctest filepath ];
   meta = {
-- 
GitLab


From b88b7f4986eca386c40504063d3417500f777ee5 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 14 Oct 2013 08:47:47 +0200
Subject: [PATCH 5216/5331] haskell-either: update to version 4.0

---
 pkgs/development/libraries/haskell/either/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/either/default.nix b/pkgs/development/libraries/haskell/either/default.nix
index bfc0f4c593b..93dfd043c90 100644
--- a/pkgs/development/libraries/haskell/either/default.nix
+++ b/pkgs/development/libraries/haskell/either/default.nix
@@ -3,8 +3,8 @@
 
 cabal.mkDerivation (self: {
   pname = "either";
-  version = "3.4.2";
-  sha256 = "0h5hrjvcbgyn0fpn6xlm2a4447xl4qyhiadq2vlywqvkvgnh3x3k";
+  version = "4.0";
+  sha256 = "07axaq43cqyglndr5az7ns4mvkjmybq6z8s32l1jxc5x7532scwr";
   buildDepends = [
     MonadRandom mtl semigroupoids semigroups transformers
   ];
-- 
GitLab


From 9fbc5fd4fb8681f099b06b9e46e5a7d986cc6bcd Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 14 Oct 2013 08:47:47 +0200
Subject: [PATCH 5217/5331] haskell-free: update to version 4.0

---
 pkgs/development/libraries/haskell/free/default.nix | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/libraries/haskell/free/default.nix b/pkgs/development/libraries/haskell/free/default.nix
index 56bf80d71af..624a4be209f 100644
--- a/pkgs/development/libraries/haskell/free/default.nix
+++ b/pkgs/development/libraries/haskell/free/default.nix
@@ -1,15 +1,14 @@
-{ cabal, bifunctors, comonad, comonadsFd, comonadTransformers
-, distributive, mtl, profunctors, semigroupoids, semigroups
-, transformers
+{ cabal, bifunctors, comonad, distributive, mtl, profunctors
+, semigroupoids, semigroups, transformers
 }:
 
 cabal.mkDerivation (self: {
   pname = "free";
-  version = "3.4.2";
-  sha256 = "1x6pdkcxk6z9ndph2yzz5n21afc2330m0ryv4w67jsss5aa69fwb";
+  version = "4.0";
+  sha256 = "0hcswwd3qc9mjxhvrsc4sxgixgh2j6n6rnhrm2s06czh94v9hm1i";
   buildDepends = [
-    bifunctors comonad comonadsFd comonadTransformers distributive mtl
-    profunctors semigroupoids semigroups transformers
+    bifunctors comonad distributive mtl profunctors semigroupoids
+    semigroups transformers
   ];
   meta = {
     homepage = "http://github.com/ekmett/free/";
-- 
GitLab


From 595e1c47e0a59bee796836b412ac1be2e27b759e Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 14 Oct 2013 08:47:47 +0200
Subject: [PATCH 5218/5331] haskell-groupoids: update to version 4.0

---
 pkgs/development/libraries/haskell/groupoids/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/haskell/groupoids/default.nix b/pkgs/development/libraries/haskell/groupoids/default.nix
index 4c085c0ae23..f210d5a1a7b 100644
--- a/pkgs/development/libraries/haskell/groupoids/default.nix
+++ b/pkgs/development/libraries/haskell/groupoids/default.nix
@@ -2,12 +2,12 @@
 
 cabal.mkDerivation (self: {
   pname = "groupoids";
-  version = "3.0.1.1";
-  sha256 = "0r4xjyq7icd52nas27bhr5k8q7li6lba8mlkcipghhsgxsyjfp63";
+  version = "4.0";
+  sha256 = "08la44c19pz2clws5mb939zc1d17cb6qy9qlh2n1634pl0zrawb6";
   buildDepends = [ semigroupoids ];
   meta = {
     homepage = "http://github.com/ekmett/groupoids/";
-    description = "Haskell 98 Groupoids";
+    description = "This package has been absorbed into semigroupoids 4.0";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
   };
-- 
GitLab


From 3323a090c852f3b21fe2ba0c0f08e50f49130f40 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 14 Oct 2013 08:47:48 +0200
Subject: [PATCH 5219/5331] haskell-hamlet: update to version 1.1.7.3

---
 pkgs/development/libraries/haskell/hamlet/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/hamlet/default.nix b/pkgs/development/libraries/haskell/hamlet/default.nix
index c29672767a6..b40025ff716 100644
--- a/pkgs/development/libraries/haskell/hamlet/default.nix
+++ b/pkgs/development/libraries/haskell/hamlet/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "hamlet";
-  version = "1.1.7.2";
-  sha256 = "1pfpygbabfmgx01vjkxhf3p9map2v7x8jys06jd6qgc4j90dnk1c";
+  version = "1.1.7.3";
+  sha256 = "0532gf4xdbjxjpv7gsfv0bapnnb4g81jcfzkn71nwizi8zls3qck";
   buildDepends = [
     blazeBuilder blazeHtml blazeMarkup failure parsec shakespeare text
   ];
-- 
GitLab


From 0e35a09bf4dd84d1e377b37fae0ee60c42cc3049 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 14 Oct 2013 08:47:48 +0200
Subject: [PATCH 5220/5331] haskell-heist: update to version 0.13.0.2

---
 pkgs/development/libraries/haskell/heist/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/heist/default.nix b/pkgs/development/libraries/haskell/heist/default.nix
index c39a1fc24a8..b8f709a402c 100644
--- a/pkgs/development/libraries/haskell/heist/default.nix
+++ b/pkgs/development/libraries/haskell/heist/default.nix
@@ -6,8 +6,8 @@
 
 cabal.mkDerivation (self: {
   pname = "heist";
-  version = "0.13.0.1";
-  sha256 = "1hxf131xhvsqbvmrm8wbjpndy41pz1lq65gqlk3lxr57dhi59s4w";
+  version = "0.13.0.2";
+  sha256 = "0rbzizgrvwj505dk7qyc9ky5vwyaxyj91xz1dsv0mv7cjl9pp17n";
   buildDepends = [
     aeson attoparsec blazeBuilder blazeHtml directoryTree dlist errors
     filepath hashable MonadCatchIOTransformers mtl random text time
-- 
GitLab


From 5a309bd6619d21efcd5ad5d95ae461e929d7d9ee Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 14 Oct 2013 08:47:48 +0200
Subject: [PATCH 5221/5331] haskell-intervals: update to version 0.2.2.1

---
 pkgs/development/libraries/haskell/intervals/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/intervals/default.nix b/pkgs/development/libraries/haskell/intervals/default.nix
index 3cc44b05dbb..9a270574570 100644
--- a/pkgs/development/libraries/haskell/intervals/default.nix
+++ b/pkgs/development/libraries/haskell/intervals/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "intervals";
-  version = "0.2.2";
-  sha256 = "059xmk373xz6nwk61iyhx4d7xd328jxb694qmq9plry3k77mdh5q";
+  version = "0.2.2.1";
+  sha256 = "0kbsms3742ppmzbmrfp94aq4wvwrayx5ppsyk7pd1mj7y47aay0f";
   buildDepends = [ numericExtras ];
   meta = {
     homepage = "http://github.com/ekmett/intervals";
-- 
GitLab


From 358cbd05ac7cbc5711d5c4bf5f6b48f70a4e6342 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 14 Oct 2013 08:47:48 +0200
Subject: [PATCH 5222/5331] haskell-keys: update to version 3.10

---
 pkgs/development/libraries/haskell/keys/default.nix | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/libraries/haskell/keys/default.nix b/pkgs/development/libraries/haskell/keys/default.nix
index 80a61b5b5be..b657f3dd6b9 100644
--- a/pkgs/development/libraries/haskell/keys/default.nix
+++ b/pkgs/development/libraries/haskell/keys/default.nix
@@ -1,14 +1,11 @@
-{ cabal, comonadsFd, comonadTransformers, free, semigroupoids
-, semigroups, transformers
-}:
+{ cabal, comonad, free, semigroupoids, semigroups, transformers }:
 
 cabal.mkDerivation (self: {
   pname = "keys";
-  version = "3.0.3";
-  sha256 = "1fqw0745pj8pzjjlrbg85gdr3acm7gpip5052m9wcz997949ca3r";
+  version = "3.10";
+  sha256 = "1s2xkzvaqk507wrgabpxli8g8n83arflmdhxq40f7qkvyflhhmyh";
   buildDepends = [
-    comonadsFd comonadTransformers free semigroupoids semigroups
-    transformers
+    comonad free semigroupoids semigroups transformers
   ];
   meta = {
     homepage = "http://github.com/ekmett/keys/";
-- 
GitLab


From 343b43297df01d16bb792bc5c72e36351d5a3277 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 14 Oct 2013 08:47:48 +0200
Subject: [PATCH 5223/5331] haskell-lens: update to version 3.10

---
 .../libraries/haskell/lens/default.nix        | 24 +++++++++----------
 1 file changed, 11 insertions(+), 13 deletions(-)

diff --git a/pkgs/development/libraries/haskell/lens/default.nix b/pkgs/development/libraries/haskell/lens/default.nix
index cdccc4768e0..60aa29ac089 100644
--- a/pkgs/development/libraries/haskell/lens/default.nix
+++ b/pkgs/development/libraries/haskell/lens/default.nix
@@ -1,23 +1,21 @@
-{ cabal, bifunctors, comonad, comonadsFd, comonadTransformers
-, contravariant, deepseq, distributive, doctest, filepath
-, genericDeriving, hashable, HUnit, MonadCatchIOTransformers, mtl
-, nats, parallel, profunctorExtras, profunctors, QuickCheck
-, reflection, semigroupoids, semigroups, simpleReflect, split
-, tagged, testFramework, testFrameworkHunit
+{ cabal, bifunctors, comonad, contravariant, deepseq, distributive
+, doctest, filepath, genericDeriving, hashable, HUnit
+, MonadCatchIOTransformers, mtl, nats, parallel, profunctors
+, QuickCheck, reflection, semigroupoids, semigroups, simpleReflect
+, split, tagged, testFramework, testFrameworkHunit
 , testFrameworkQuickcheck2, testFrameworkTh, text, transformers
 , transformersCompat, unorderedContainers, vector, void
 }:
 
 cabal.mkDerivation (self: {
   pname = "lens";
-  version = "3.9.2";
-  sha256 = "17pc0waf3g6dxvmvyxkgh8kz22iscd9z00s67rcn0p604swprj2k";
+  version = "3.10";
+  sha256 = "086kbd59zlx3ldrxilssxd0gr9izwhcfhg5k6bqzm6gwvysrzq3y";
   buildDepends = [
-    bifunctors comonad comonadsFd comonadTransformers contravariant
-    distributive filepath genericDeriving hashable
-    MonadCatchIOTransformers mtl parallel profunctorExtras profunctors
-    reflection semigroupoids semigroups split tagged text transformers
-    transformersCompat unorderedContainers vector void
+    bifunctors comonad contravariant distributive filepath
+    genericDeriving hashable MonadCatchIOTransformers mtl parallel
+    profunctors reflection semigroupoids semigroups split tagged text
+    transformers transformersCompat unorderedContainers vector void
   ];
   testDepends = [
     deepseq doctest filepath genericDeriving HUnit mtl nats parallel
-- 
GitLab


From 0bfd9cd3a1c51690831b572c027c9987c3558c0f Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 14 Oct 2013 08:47:48 +0200
Subject: [PATCH 5224/5331] haskell-numbers: update to version 3000.2.0.0

---
 pkgs/development/libraries/haskell/numbers/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/numbers/default.nix b/pkgs/development/libraries/haskell/numbers/default.nix
index 81a3e866dc0..26ed2d77bd0 100644
--- a/pkgs/development/libraries/haskell/numbers/default.nix
+++ b/pkgs/development/libraries/haskell/numbers/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "numbers";
-  version = "3000.1.0.3";
-  sha256 = "0w2m2m3vp3lpvnc7wkw6pqfz741a68dma4s0asl7cryykwf94xgz";
+  version = "3000.2.0.0";
+  sha256 = "035qc7dgh4nd661z4mm742v8y7xqdyyp0r0vkinxiifciqb1fkbm";
   testDepends = [
     QuickCheck testFramework testFrameworkQuickcheck2
   ];
-- 
GitLab


From a8c81206269bc1a2dc8b5980a20bdf4736e6c26f Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 14 Oct 2013 08:47:48 +0200
Subject: [PATCH 5225/5331] haskell-parsers: update to version 0.10

---
 pkgs/development/libraries/haskell/parsers/default.nix | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/libraries/haskell/parsers/default.nix b/pkgs/development/libraries/haskell/parsers/default.nix
index dc42228df66..529fdf47124 100644
--- a/pkgs/development/libraries/haskell/parsers/default.nix
+++ b/pkgs/development/libraries/haskell/parsers/default.nix
@@ -1,12 +1,14 @@
-{ cabal, charset, doctest, filepath, text, transformers
+{ cabal, charset, doctest, filepath, parsec, text, transformers
 , unorderedContainers
 }:
 
 cabal.mkDerivation (self: {
   pname = "parsers";
-  version = "0.9";
-  sha256 = "04lbayvdv2hax4s9sqlnia7jpzv1sgls41ylql0xbi2zhz5rvyyi";
-  buildDepends = [ charset text transformers unorderedContainers ];
+  version = "0.10";
+  sha256 = "090dvmdb1kmnc3k2x170y9fdifxi16hzkij1gzc51flx3bpx40i1";
+  buildDepends = [
+    charset parsec text transformers unorderedContainers
+  ];
   testDepends = [ doctest filepath ];
   meta = {
     homepage = "http://github.com/ekmett/parsers/";
-- 
GitLab


From 345423eb5d6b4ddd99d4f315c3fc2c98eff97ff4 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 14 Oct 2013 08:47:49 +0200
Subject: [PATCH 5226/5331] haskell-pointed: update to version 4.0

---
 .../libraries/haskell/pointed/default.nix          | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/libraries/haskell/pointed/default.nix b/pkgs/development/libraries/haskell/pointed/default.nix
index e3a8d66be4c..15f4ba59aaa 100644
--- a/pkgs/development/libraries/haskell/pointed/default.nix
+++ b/pkgs/development/libraries/haskell/pointed/default.nix
@@ -1,18 +1,18 @@
-{ cabal, comonad, comonadTransformers, dataDefault, semigroupoids
-, semigroups, stm, tagged, transformers
+{ cabal, comonad, dataDefaultClass, semigroupoids, semigroups, stm
+, tagged, transformers
 }:
 
 cabal.mkDerivation (self: {
   pname = "pointed";
-  version = "3.1";
-  sha256 = "13vx1vy3qfa23145fdfdivdmw01qyl2k6g8ynqxl8pzbj9cbb08n";
+  version = "4.0";
+  sha256 = "02y7ba1pcpmwcp762516p4x75y3ma2kml9mbiv1y8gcnn4ylvir4";
   buildDepends = [
-    comonad comonadTransformers dataDefault semigroupoids semigroups
-    stm tagged transformers
+    comonad dataDefaultClass semigroupoids semigroups stm tagged
+    transformers
   ];
   meta = {
     homepage = "http://github.com/ekmett/pointed/";
-    description = "Haskell 98 pointed and copointed data";
+    description = "Pointed and copointed data";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
   };
-- 
GitLab


From 860175c660765d93506daf70f117258b3e781ae0 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 14 Oct 2013 08:47:49 +0200
Subject: [PATCH 5227/5331] haskell-profunctor-extras: update to version 4.0

---
 .../haskell/profunctor-extras/default.nix         | 15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)

diff --git a/pkgs/development/libraries/haskell/profunctor-extras/default.nix b/pkgs/development/libraries/haskell/profunctor-extras/default.nix
index 6844bcc369a..bf7e6ab7121 100644
--- a/pkgs/development/libraries/haskell/profunctor-extras/default.nix
+++ b/pkgs/development/libraries/haskell/profunctor-extras/default.nix
@@ -1,18 +1,13 @@
-{ cabal, comonad, profunctors, semigroupoidExtras, semigroupoids
-, tagged, transformers
-}:
+{ cabal, profunctors }:
 
 cabal.mkDerivation (self: {
   pname = "profunctor-extras";
-  version = "3.3.3.1";
-  sha256 = "16naa6ksgwy6fh8vwflcc9s0rpamn886as8qhjqrkpjlc8s83h7g";
-  buildDepends = [
-    comonad profunctors semigroupoidExtras semigroupoids tagged
-    transformers
-  ];
+  version = "4.0";
+  sha256 = "10j458liqlyz5s9gkg95c6aq7ap5fa7d8pc7hygy71nn87pm2g4a";
+  buildDepends = [ profunctors ];
   meta = {
     homepage = "http://github.com/ekmett/profunctor-extras/";
-    description = "Profunctor extras";
+    description = "This package has been absorbed into profunctors 4.0";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
   };
-- 
GitLab


From 054a3132219ef35474061ea11ddf83e5f0608a85 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 14 Oct 2013 08:47:49 +0200
Subject: [PATCH 5228/5331] haskell-profunctors: update to version 4.0.1

---
 .../libraries/haskell/profunctors/default.nix          | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/libraries/haskell/profunctors/default.nix b/pkgs/development/libraries/haskell/profunctors/default.nix
index 83398295108..83d06b10ca6 100644
--- a/pkgs/development/libraries/haskell/profunctors/default.nix
+++ b/pkgs/development/libraries/haskell/profunctors/default.nix
@@ -1,13 +1,13 @@
-{ cabal, comonad, tagged }:
+{ cabal, comonad, semigroupoids, tagged, transformers }:
 
 cabal.mkDerivation (self: {
   pname = "profunctors";
-  version = "3.3.0.1";
-  sha256 = "16d7xg929r4smmmcgi54bz7rsjxs6psksrdvzl4336sjpp3dw5h2";
-  buildDepends = [ comonad tagged ];
+  version = "4.0.1";
+  sha256 = "13yr3n7jkhxbk4gk6nd1j8p1a7g5ir8g9xprcy3s1x39cqf4m986";
+  buildDepends = [ comonad semigroupoids tagged transformers ];
   meta = {
     homepage = "http://github.com/ekmett/profunctors/";
-    description = "Haskell 98 Profunctors";
+    description = "Profunctors";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
   };
-- 
GitLab


From d217bfd57119c00c0acf1e31fca3928e65db07e7 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 14 Oct 2013 08:47:49 +0200
Subject: [PATCH 5229/5331] haskell-reducers: update to version 3.10.1

---
 pkgs/development/libraries/haskell/reducers/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/reducers/default.nix b/pkgs/development/libraries/haskell/reducers/default.nix
index 319cd138cce..ea1049d2b40 100644
--- a/pkgs/development/libraries/haskell/reducers/default.nix
+++ b/pkgs/development/libraries/haskell/reducers/default.nix
@@ -5,8 +5,8 @@
 
 cabal.mkDerivation (self: {
   pname = "reducers";
-  version = "3.0.2";
-  sha256 = "0inw5gz3bdrfc6hprjfxssyqjwmclgf09gms14blj24qr027gdqq";
+  version = "3.10.1";
+  sha256 = "0pgywdgq0rqir95n4z3nzmyx5n54a1df9abyanz4qfv0g080fjkz";
   buildDepends = [
     comonad fingertree hashable keys pointed semigroupoids semigroups
     text transformers unorderedContainers
-- 
GitLab


From 271be21f5a2588934801146f161e6f1d41ad1c06 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 14 Oct 2013 08:47:49 +0200
Subject: [PATCH 5230/5331] haskell-semigroupoid-extras: update to version 4.0

---
 .../libraries/haskell/semigroupoid-extras/default.nix  | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/libraries/haskell/semigroupoid-extras/default.nix b/pkgs/development/libraries/haskell/semigroupoid-extras/default.nix
index 263adb42f25..cb8ed865da3 100644
--- a/pkgs/development/libraries/haskell/semigroupoid-extras/default.nix
+++ b/pkgs/development/libraries/haskell/semigroupoid-extras/default.nix
@@ -1,13 +1,13 @@
-{ cabal, comonad, distributive, groupoids, semigroupoids }:
+{ cabal, semigroupoids }:
 
 cabal.mkDerivation (self: {
   pname = "semigroupoid-extras";
-  version = "3.0.1";
-  sha256 = "1b6ix9myjav1h4bbq3jxlan8sn2pjw8x0zhazv3anxfab5n2sxpd";
-  buildDepends = [ comonad distributive groupoids semigroupoids ];
+  version = "4.0";
+  sha256 = "07aa7z4nywcrp9msq83b1pcmryl25yxha89sn5vwlgq40cibcm3g";
+  buildDepends = [ semigroupoids ];
   meta = {
     homepage = "http://github.com/ekmett/semigroupoid-extras";
-    description = "Semigroupoids requiring Haskell extensions";
+    description = "This package has been absorbed into semigroupoids 4.0";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
   };
-- 
GitLab


From e4857cf3c61ae381f442e5b24906a4205c0e4783 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 14 Oct 2013 08:47:49 +0200
Subject: [PATCH 5231/5331] haskell-semigroupoids: update to version 4.0

---
 .../libraries/haskell/semigroupoids/default.nix    | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/libraries/haskell/semigroupoids/default.nix b/pkgs/development/libraries/haskell/semigroupoids/default.nix
index aa7176f7e16..e0dbf456804 100644
--- a/pkgs/development/libraries/haskell/semigroupoids/default.nix
+++ b/pkgs/development/libraries/haskell/semigroupoids/default.nix
@@ -1,13 +1,17 @@
-{ cabal, comonad, contravariant, semigroups, transformers }:
+{ cabal, comonad, contravariant, distributive, semigroups
+, transformers
+}:
 
 cabal.mkDerivation (self: {
   pname = "semigroupoids";
-  version = "3.1";
-  sha256 = "02147y0nnvyc9ykvjbbxa9gzmkk9kgpsmx40ahwnjk9igjkbyp9g";
-  buildDepends = [ comonad contravariant semigroups transformers ];
+  version = "4.0";
+  sha256 = "12h2b9pisy21xca3x9ilj0aix9clni0za35d2dmv55gb8y8df54l";
+  buildDepends = [
+    comonad contravariant distributive semigroups transformers
+  ];
   meta = {
     homepage = "http://github.com/ekmett/semigroupoids";
-    description = "Haskell 98 semigroupoids: Category sans id";
+    description = "Semigroupoids: Category sans id";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
   };
-- 
GitLab


From 1c1f7f7e7f16742a6e285e5bd7c195e98228c069 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 14 Oct 2013 08:47:49 +0200
Subject: [PATCH 5232/5331] haskell-shakespeare-js: update to version 1.2.0.1

---
 pkgs/development/libraries/haskell/shakespeare-js/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/shakespeare-js/default.nix b/pkgs/development/libraries/haskell/shakespeare-js/default.nix
index 6aa34026ce8..873b8622934 100644
--- a/pkgs/development/libraries/haskell/shakespeare-js/default.nix
+++ b/pkgs/development/libraries/haskell/shakespeare-js/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "shakespeare-js";
-  version = "1.2.0";
-  sha256 = "1g37m7shqxfv7i2dk5qhvxldfzh1xipd91vcyqhks1jwa5byarzj";
+  version = "1.2.0.1";
+  sha256 = "0w6dwbn3264bdjmj2hg1bppvhbd3bj8j1dkrlizjifs8g8ax0bx5";
   buildDepends = [ aeson shakespeare text ];
   testDepends = [ aeson hspec HUnit shakespeare text ];
   meta = {
-- 
GitLab


From 7fc3d75dd4c6b69c9df824df0b3eeab70182e3c1 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 14 Oct 2013 08:47:49 +0200
Subject: [PATCH 5233/5331] haskell-tasty: update to version 0.3.1

---
 pkgs/development/libraries/haskell/tasty/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/tasty/default.nix b/pkgs/development/libraries/haskell/tasty/default.nix
index 37030681e34..df14857f9ab 100644
--- a/pkgs/development/libraries/haskell/tasty/default.nix
+++ b/pkgs/development/libraries/haskell/tasty/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "tasty";
-  version = "0.3";
-  sha256 = "0sgc0529sqhj0b75a4mkdw0bkx56ynyl4msmi8hd20jvv5wnzyi6";
+  version = "0.3.1";
+  sha256 = "0ipndrpywzg40s5hiwyyly29mcppcfqbbpwqqp4apma57m8cdpb0";
   buildDepends = [
     ansiTerminal mtl optparseApplicative regexPosix stm tagged
   ];
-- 
GitLab


From 97f39689214141be8365fc63677aaf56b25e98da Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 14 Oct 2013 08:47:50 +0200
Subject: [PATCH 5234/5331] haskell-trifecta: update to version 1.2.1.1

---
 pkgs/development/libraries/haskell/trifecta/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/trifecta/default.nix b/pkgs/development/libraries/haskell/trifecta/default.nix
index 2ce40a0672e..f7b9a7aea81 100644
--- a/pkgs/development/libraries/haskell/trifecta/default.nix
+++ b/pkgs/development/libraries/haskell/trifecta/default.nix
@@ -6,8 +6,8 @@
 
 cabal.mkDerivation (self: {
   pname = "trifecta";
-  version = "1.2.1";
-  sha256 = "0l7q6id3l9km7vrqald87d6l03k5w5zxfh44w425kxmm8fwj2j0j";
+  version = "1.2.1.1";
+  sha256 = "1bv35ip7g0h7r2w0s8pkcbvm0b9hx91vblf5w57q3jr843v9314c";
   buildDepends = [
     ansiTerminal ansiWlPprint blazeBuilder blazeHtml blazeMarkup
     charset comonad deepseq fingertree hashable lens mtl parsers
-- 
GitLab


From c933c3114163a3a9b9b30d6becc1e1e6702101fd Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 14 Oct 2013 08:47:50 +0200
Subject: [PATCH 5235/5331] haskell-wai-app-static: update to version 1.3.3

---
 pkgs/development/libraries/haskell/wai-app-static/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/wai-app-static/default.nix b/pkgs/development/libraries/haskell/wai-app-static/default.nix
index 2d0dd397a08..d88eb2df0bc 100644
--- a/pkgs/development/libraries/haskell/wai-app-static/default.nix
+++ b/pkgs/development/libraries/haskell/wai-app-static/default.nix
@@ -7,8 +7,8 @@
 
 cabal.mkDerivation (self: {
   pname = "wai-app-static";
-  version = "1.3.2.1";
-  sha256 = "1iw2b53p08c38fdh3d0js9j8lyy0i8qszp3jd736kzxxiig6ah79";
+  version = "1.3.3";
+  sha256 = "0lsqfvlh65rggp9z6m5gyx8gv0wk3b44jrk57s8yj2bh74pbr64f";
   buildDepends = [
     base64Bytestring blazeBuilder blazeHtml blazeMarkup cereal
     cryptoApi cryptoConduit cryptohashCryptoapi fileEmbed httpDate
-- 
GitLab


From 1811b175d64aea23fb9b8226193a0ccbb3d5b0dc Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 14 Oct 2013 08:47:50 +0200
Subject: [PATCH 5236/5331] haskell-warp: update to version 1.3.10.1

---
 pkgs/development/libraries/haskell/warp/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/libraries/haskell/warp/default.nix b/pkgs/development/libraries/haskell/warp/default.nix
index c96e7bfd738..100dbbd7024 100644
--- a/pkgs/development/libraries/haskell/warp/default.nix
+++ b/pkgs/development/libraries/haskell/warp/default.nix
@@ -1,13 +1,13 @@
 { cabal, blazeBuilder, blazeBuilderConduit, caseInsensitive
-, conduit, hashable, hspec, httpAttoparsec, httpTypes, HUnit
+, conduit, hashable, hspec, HTTP, httpAttoparsec, httpTypes, HUnit
 , liftedBase, network, networkConduit, QuickCheck, simpleSendfile
 , transformers, unixCompat, void, wai
 }:
 
 cabal.mkDerivation (self: {
   pname = "warp";
-  version = "1.3.9.2";
-  sha256 = "0l4iq7dl7iv9sf0bj52g577x9i84miscfr27b2vm8g8n6306jr77";
+  version = "1.3.10.1";
+  sha256 = "1pi2x0gi4r6qy151a9gmfq223yiy53j7prj2pyn00cprr0m4mk2v";
   buildDepends = [
     blazeBuilder blazeBuilderConduit caseInsensitive conduit hashable
     httpAttoparsec httpTypes liftedBase network networkConduit
@@ -15,7 +15,7 @@ cabal.mkDerivation (self: {
   ];
   testDepends = [
     blazeBuilder blazeBuilderConduit caseInsensitive conduit hashable
-    hspec httpAttoparsec httpTypes HUnit liftedBase network
+    hspec HTTP httpAttoparsec httpTypes HUnit liftedBase network
     networkConduit QuickCheck simpleSendfile transformers unixCompat
     void wai
   ];
-- 
GitLab


From ad55ea940b9df97996f605cea9818373a3cf22c6 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 14 Oct 2013 08:47:50 +0200
Subject: [PATCH 5237/5331] haskell-yesod-bin: update to version 1.2.3.4

---
 pkgs/development/libraries/haskell/yesod-bin/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/yesod-bin/default.nix b/pkgs/development/libraries/haskell/yesod-bin/default.nix
index b260a6e4188..a86417f6b39 100644
--- a/pkgs/development/libraries/haskell/yesod-bin/default.nix
+++ b/pkgs/development/libraries/haskell/yesod-bin/default.nix
@@ -10,8 +10,8 @@
 
 cabal.mkDerivation (self: {
   pname = "yesod-bin";
-  version = "1.2.3.3";
-  sha256 = "13cbahj7kjxvw0p92sza72fyh47by5qna6ym9lsvka0y8fk7jf6w";
+  version = "1.2.3.4";
+  sha256 = "0xwav5ghik0vzg706rcqlzk64gnvr4nn4iikx1bzymzz2p5zyg0z";
   isLibrary = false;
   isExecutable = true;
   buildDepends = [
-- 
GitLab


From c4385c4db7432e22932655b7039769183a16f08a Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 14 Oct 2013 08:47:50 +0200
Subject: [PATCH 5238/5331] haskell-yesod-core: update to version 1.2.4.5

---
 pkgs/development/libraries/haskell/yesod-core/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/yesod-core/default.nix b/pkgs/development/libraries/haskell/yesod-core/default.nix
index 14c8259cddb..0bd73c2ade4 100644
--- a/pkgs/development/libraries/haskell/yesod-core/default.nix
+++ b/pkgs/development/libraries/haskell/yesod-core/default.nix
@@ -10,8 +10,8 @@
 
 cabal.mkDerivation (self: {
   pname = "yesod-core";
-  version = "1.2.4.4";
-  sha256 = "0awz5ijhmd7z292irzz8sp2j3vp3lp57k9rcp4bmgqmxkf826hkj";
+  version = "1.2.4.5";
+  sha256 = "091f89bwjsf2qimivbz74rykjjgzghfvs66sv9cz305pgw6kpjc7";
   buildDepends = [
     aeson attoparsecConduit blazeBuilder blazeHtml blazeMarkup
     caseInsensitive cereal clientsession conduit cookie dataDefault
-- 
GitLab


From 18c9c07bde4f7f4285e942c4667dd411c6fc4c6d Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 14 Oct 2013 08:47:50 +0200
Subject: [PATCH 5239/5331] haskell-yesod-form: update to version 1.3.3

---
 pkgs/development/libraries/haskell/yesod-form/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/yesod-form/default.nix b/pkgs/development/libraries/haskell/yesod-form/default.nix
index 878e3c9ebce..5c0220f1f2a 100644
--- a/pkgs/development/libraries/haskell/yesod-form/default.nix
+++ b/pkgs/development/libraries/haskell/yesod-form/default.nix
@@ -6,8 +6,8 @@
 
 cabal.mkDerivation (self: {
   pname = "yesod-form";
-  version = "1.3.2.2";
-  sha256 = "1dqhpzkhg9wcdd9djynrjixpp28rj8iy9pfipx250bry7yq77rv2";
+  version = "1.3.3";
+  sha256 = "1maf8yczijx8rdjy4abr2jq1ds4g61jg3zbqxjzaaxsbs77gna4a";
   buildDepends = [
     aeson attoparsec blazeBuilder blazeHtml blazeMarkup cryptoApi
     dataDefault emailValidate hamlet network persistent resourcet
-- 
GitLab


From 93727ab86143d8872048403abb54189425804808 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 14 Oct 2013 23:54:21 +0200
Subject: [PATCH 5240/5331] haskell-comonads-fd: don't try to build
 documentation; this package is empty

---
 pkgs/development/libraries/haskell/comonads-fd/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/libraries/haskell/comonads-fd/default.nix b/pkgs/development/libraries/haskell/comonads-fd/default.nix
index 0d7de2817ce..f55123f8fe1 100644
--- a/pkgs/development/libraries/haskell/comonads-fd/default.nix
+++ b/pkgs/development/libraries/haskell/comonads-fd/default.nix
@@ -5,6 +5,7 @@ cabal.mkDerivation (self: {
   version = "4.0";
   sha256 = "19xpv0dsz7w3a1sq1gdxwzglfal45vj2s22zb12g9mpk5rp3hw1s";
   buildDepends = [ comonad ];
+  noHaddock = true;
   meta = {
     homepage = "http://github.com/ekmett/comonads-fd/";
     description = "This package has been merged into comonad 4.0";
-- 
GitLab


From 7eaefcae45877937d09fa385e6654c0e0334b772 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 15 Oct 2013 00:02:47 +0200
Subject: [PATCH 5241/5331] haskell-groupoids: don't try to build
 documentation; this package is empty

---
 pkgs/development/libraries/haskell/groupoids/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/libraries/haskell/groupoids/default.nix b/pkgs/development/libraries/haskell/groupoids/default.nix
index f210d5a1a7b..7697e8e369f 100644
--- a/pkgs/development/libraries/haskell/groupoids/default.nix
+++ b/pkgs/development/libraries/haskell/groupoids/default.nix
@@ -5,6 +5,7 @@ cabal.mkDerivation (self: {
   version = "4.0";
   sha256 = "08la44c19pz2clws5mb939zc1d17cb6qy9qlh2n1634pl0zrawb6";
   buildDepends = [ semigroupoids ];
+  noHaddock = true;
   meta = {
     homepage = "http://github.com/ekmett/groupoids/";
     description = "This package has been absorbed into semigroupoids 4.0";
-- 
GitLab


From 4cdefbb92631f03a46ff63c5a0dad164aee6d0ff Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 15 Oct 2013 00:18:17 +0200
Subject: [PATCH 5242/5331] haskell-errors: jailbreak to fix build with either
 4.x

---
 pkgs/development/libraries/haskell/errors/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/libraries/haskell/errors/default.nix b/pkgs/development/libraries/haskell/errors/default.nix
index d15ac59feba..be061cfb443 100644
--- a/pkgs/development/libraries/haskell/errors/default.nix
+++ b/pkgs/development/libraries/haskell/errors/default.nix
@@ -5,6 +5,7 @@ cabal.mkDerivation (self: {
   version = "1.4.2";
   sha256 = "1csry8bbz7r4gc7x3lf1ih10rvnig2i91nfij227p9744yndl2xw";
   buildDepends = [ either safe transformers ];
+  jailbreak = true;
   meta = {
     description = "Simplified error-handling";
     license = self.stdenv.lib.licenses.bsd3;
-- 
GitLab


From 7edfd67fe00be0963ce8c8d03c8a206f3ac77a92 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 15 Oct 2013 10:53:54 +0200
Subject: [PATCH 5243/5331] haskell-accelerate: jailbreak to fix build with
 recent versions of fclables

---
 pkgs/development/libraries/haskell/accelerate/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/libraries/haskell/accelerate/default.nix b/pkgs/development/libraries/haskell/accelerate/default.nix
index c2484116f46..b7979f6f5f2 100644
--- a/pkgs/development/libraries/haskell/accelerate/default.nix
+++ b/pkgs/development/libraries/haskell/accelerate/default.nix
@@ -5,6 +5,7 @@ cabal.mkDerivation (self: {
   version = "0.13.0.5";
   sha256 = "1vqkv3k0w1zy0111a786npf3hypbcg675lbdkv2cf3zx5hqcnn6j";
   buildDepends = [ fclabels hashable hashtables ];
+  jailbreak = true;
   meta = {
     homepage = "https://github.com/AccelerateHS/accelerate/";
     description = "An embedded language for accelerated array processing";
-- 
GitLab


From 57b5927d6a03696996c4b82715b49e38f774c402 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 15 Oct 2013 11:00:04 +0200
Subject: [PATCH 5244/5331] haskell-cryptohash: re-enable the test suite

---
 pkgs/development/libraries/haskell/cryptohash/default.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pkgs/development/libraries/haskell/cryptohash/default.nix b/pkgs/development/libraries/haskell/cryptohash/default.nix
index ae0950d1152..839bf4518a1 100644
--- a/pkgs/development/libraries/haskell/cryptohash/default.nix
+++ b/pkgs/development/libraries/haskell/cryptohash/default.nix
@@ -11,7 +11,6 @@ cabal.mkDerivation (self: {
     byteable HUnit QuickCheck testFramework testFrameworkHunit
     testFrameworkQuickcheck2
   ];
-  doCheck = false;
   meta = {
     homepage = "http://github.com/vincenthz/hs-cryptohash";
     description = "collection of crypto hashes, fast, pure and practical";
-- 
GitLab


From e7b25c78a596bb5e7aad1b2866a758ae726d9be8 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 15 Oct 2013 11:02:29 +0200
Subject: [PATCH 5245/5331] haskell-snap: jailbreak to fix build with recent
 versions of lens

---
 pkgs/development/libraries/haskell/snap/snap.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/libraries/haskell/snap/snap.nix b/pkgs/development/libraries/haskell/snap/snap.nix
index 94f452f69b8..15fe497b88d 100644
--- a/pkgs/development/libraries/haskell/snap/snap.nix
+++ b/pkgs/development/libraries/haskell/snap/snap.nix
@@ -20,6 +20,7 @@ cabal.mkDerivation (self: {
     unorderedContainers vector vectorAlgorithms xmlhtml
   ];
   jailbreak = true;
+  patchPhase = "sed -i -e 's|lens .*|lens|' snap.cabal";
   meta = {
     homepage = "http://snapframework.com/";
     description = "Top-level package for the Snap Web Framework";
-- 
GitLab


From 347132478b4782b15831c332150542318d9efc0d Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 15 Oct 2013 11:28:36 +0200
Subject: [PATCH 5246/5331] haskell-HTTP: jailbreak to fix build with GHC 7.7

---
 pkgs/development/libraries/haskell/HTTP/4000.2.8.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/libraries/haskell/HTTP/4000.2.8.nix b/pkgs/development/libraries/haskell/HTTP/4000.2.8.nix
index 1b52261dea0..78c79fe3c3d 100644
--- a/pkgs/development/libraries/haskell/HTTP/4000.2.8.nix
+++ b/pkgs/development/libraries/haskell/HTTP/4000.2.8.nix
@@ -13,6 +13,7 @@ cabal.mkDerivation (self: {
     network pureMD5 split testFramework testFrameworkHunit wai warp
   ];
   doCheck = false;
+  jailbreak = true;
   meta = {
     homepage = "https://github.com/haskell/HTTP";
     description = "A library for client-side HTTP";
-- 
GitLab


From 1d634b4388f7431689f6946eb7e97bad37ac2d73 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 15 Oct 2013 12:51:41 +0200
Subject: [PATCH 5247/5331] slim: Update to 1.3.6

---
 .../display-managers/slim/default.nix         | 29 ++++----
 .../display-managers/slim/runtime-paths.patch | 66 +++++++------------
 2 files changed, 41 insertions(+), 54 deletions(-)

diff --git a/pkgs/applications/display-managers/slim/default.nix b/pkgs/applications/display-managers/slim/default.nix
index 9d5c728de26..750efdc6ea4 100644
--- a/pkgs/applications/display-managers/slim/default.nix
+++ b/pkgs/applications/display-managers/slim/default.nix
@@ -1,29 +1,32 @@
-{ stdenv, fetchurl, cmake, pkgconfig, x11, libjpeg, libpng, libXmu
+{ stdenv, fetchurl, cmake, pkgconfig, xorg, libjpeg, libpng
 , fontconfig, freetype, pam, dbus_libs }:
 
 stdenv.mkDerivation rec {
-  name = "slim-1.3.4";
+  name = "slim-1.3.6";
 
   src = fetchurl {
     url = "http://download.berlios.de/slim/${name}.tar.gz";
-    sha256 = "00fmrg2v41jnqhx0yc1kv97xxh5gai18n0i4as9g1fcq1i32cp0m";
+    sha256 = "1pqhk22jb4aja4hkrm7rjgbgzjyh7i4zswdgf5nw862l2znzxpi1";
   };
 
-  patches = [
-    # Allow the paths of the configuration file and theme directory to
-    # be set at runtime.
-    ./runtime-paths.patch
-  ];
-
-  buildInputs =
-    [ cmake pkgconfig x11 libjpeg libpng libXmu fontconfig freetype
-      pam dbus_libs
+  patches =
+    [ # Allow the paths of the configuration file and theme directory to
+      # be set at runtime.
+      ./runtime-paths.patch
     ];
 
-  preConfigure = "substituteInPlace CMakeLists.txt --replace /etc $out/etc";
+  preConfigure = "substituteInPlace CMakeLists.txt --replace /etc $out/etc --replace /lib $out/lib";
 
   cmakeFlags = [ "-DUSE_PAM=1" ];
 
+  enableParallelBuilding = true;
+
+  buildInputs =
+    [ cmake pkgconfig libjpeg libpng fontconfig freetype
+      pam dbus_libs
+      xorg.libX11 xorg.libXext xorg.libXrandr xorg.libXrender xorg.libXmu xorg.libXft
+    ];
+
   NIX_CFLAGS_LINK = "-lXmu";
 
   meta = {
diff --git a/pkgs/applications/display-managers/slim/runtime-paths.patch b/pkgs/applications/display-managers/slim/runtime-paths.patch
index b59b32f3111..f6811dbe668 100644
--- a/pkgs/applications/display-managers/slim/runtime-paths.patch
+++ b/pkgs/applications/display-managers/slim/runtime-paths.patch
@@ -1,41 +1,25 @@
-diff -rc slim-1.2.6-orig/app.cpp slim-1.2.6/app.cpp
-*** slim-1.2.6-orig/app.cpp	Fri Sep 15 23:00:37 2006
---- slim-1.2.6/app.cpp	Sun Feb 25 17:30:50 2007
-***************
-*** 113,119 ****
-  
-      // Read configuration and theme
-      cfg = new Cfg;
-!     cfg->readConf(CFGFILE);
-      string themebase = "";
-      string themefile = "";
-      string themedir = "";
---- 113,121 ----
-  
-      // Read configuration and theme
-      cfg = new Cfg;
-!     char *cfgfile = getenv("SLIM_CFGFILE");
-!     if (!cfgfile) cfgfile = CFGFILE;
-!     cfg->readConf(cfgfile);
-      string themebase = "";
-      string themefile = "";
-      string themedir = "";
-***************
-*** 121,127 ****
-      if (testing) {
-          themeName = testtheme;
-      } else {
-!         themebase = string(THEMESDIR) + "/";
-          themeName = cfg->getOption("current_theme");
-          string::size_type pos;
-          if ((pos = themeName.find(",")) != string::npos) {
---- 123,131 ----
-      if (testing) {
-          themeName = testtheme;
-      } else {
-!         char *themesdir = getenv("SLIM_THEMESDIR");
-!         if (!themesdir) themesdir = THEMESDIR;
-!         themebase = string(themesdir) + "/";
-          themeName = cfg->getOption("current_theme");
-          string::size_type pos;
-          if ((pos = themeName.find(",")) != string::npos) {
+diff -ru -x '*~' slim-1.3.6-orig/app.cpp slim-1.3.6/app.cpp
+--- slim-1.3.6-orig/app.cpp	2013-10-02 00:38:05.000000000 +0200
++++ slim-1.3.6/app.cpp	2013-10-15 11:02:55.629263422 +0200
+@@ -200,7 +200,9 @@
+ 
+ 	/* Read configuration and theme */
+ 	cfg = new Cfg;
+-	cfg->readConf(CFGFILE);
++	char *cfgfile = getenv("SLIM_CFGFILE");
++	if (!cfgfile) cfgfile = CFGFILE;
++	cfg->readConf(cfgfile);
+ 	string themebase = "";
+ 	string themefile = "";
+ 	string themedir = "";
+@@ -208,7 +210,9 @@
+ 	if (testing) {
+ 		themeName = testtheme;
+ 	} else {
+-		themebase = string(THEMESDIR) + "/";
++		char *themesdir = getenv("SLIM_THEMESDIR");
++		if (!themesdir) themesdir = THEMESDIR;
++		themebase = string(themesdir) + "/";
+ 		themeName = cfg->getOption("current_theme");
+ 		string::size_type pos;
+ 		if ((pos = themeName.find(",")) != string::npos) {
-- 
GitLab


From 873662b8addd6d0b1daaa3feaa8766b5d2507563 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 15 Oct 2013 13:15:33 +0200
Subject: [PATCH 5248/5331] slim: Work around broken PAM session handling

Previously logging in via SLiM more than once didn't work because SLiM
doesn't clean up its PAM session properly (that is, in a child rather
than in the parent).  Thus the slim process becomes part of the user
session's cgroup, among other things.  This patch causes SLiM to exit
after the session has finished, after which systemd will restart
display-manager.service.

Fixes NixOS/nixops#137.
---
 nixos/modules/services/x11/xserver.nix               |  5 +++++
 pkgs/applications/display-managers/slim/default.nix  |  5 +++++
 .../display-managers/slim/run-once.patch             | 12 ++++++++++++
 3 files changed, 22 insertions(+)
 create mode 100644 pkgs/applications/display-managers/slim/run-once.patch

diff --git a/nixos/modules/services/x11/xserver.nix b/nixos/modules/services/x11/xserver.nix
index d42d7caaa06..6e470e65e35 100644
--- a/nixos/modules/services/x11/xserver.nix
+++ b/nixos/modules/services/x11/xserver.nix
@@ -527,6 +527,11 @@ in
           '';
 
         script = "${cfg.displayManager.job.execCmd}";
+
+        serviceConfig = {
+          Restart = "always";
+          RestartSec = "200ms";
+        };
       };
 
     services.xserver.displayManager.xserverArgs =
diff --git a/pkgs/applications/display-managers/slim/default.nix b/pkgs/applications/display-managers/slim/default.nix
index 750efdc6ea4..0b5bcccfb21 100644
--- a/pkgs/applications/display-managers/slim/default.nix
+++ b/pkgs/applications/display-managers/slim/default.nix
@@ -13,6 +13,11 @@ stdenv.mkDerivation rec {
     [ # Allow the paths of the configuration file and theme directory to
       # be set at runtime.
       ./runtime-paths.patch
+
+      # Exit after the user's session has finished.  This works around
+      # slim's broken PAM session handling (see
+      # http://developer.berlios.de/bugs/?func=detailbug&bug_id=19102&group_id=2663).
+      ./run-once.patch
     ];
 
   preConfigure = "substituteInPlace CMakeLists.txt --replace /etc $out/etc --replace /lib $out/lib";
diff --git a/pkgs/applications/display-managers/slim/run-once.patch b/pkgs/applications/display-managers/slim/run-once.patch
new file mode 100644
index 00000000000..78f1454a883
--- /dev/null
+++ b/pkgs/applications/display-managers/slim/run-once.patch
@@ -0,0 +1,12 @@
+diff -ru -x '*~' slim-1.3.6-orig/app.cpp slim-1.3.6/app.cpp
+--- slim-1.3.6-orig/app.cpp	2013-10-15 11:02:55.629263422 +0200
++++ slim-1.3.6/app.cpp	2013-10-15 13:00:10.141210784 +0200
+@@ -816,7 +822,7 @@
+ 	StopServer();
+ 	RemoveLock();
+ 	while (waitpid(-1, NULL, WNOHANG) > 0); /* Collects all dead childrens */
+-	Run();
++	exit(OK_EXIT);
+ }
+ 
+ void App::KillAllClients(Bool top) {
-- 
GitLab


From 5b702be29f2cfb9ff876b6c7d8673526f9cfdfbe Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 15 Oct 2013 13:21:58 +0200
Subject: [PATCH 5249/5331] Add support for slimlock, slim's simple screen
 locker

---
 .../modules/services/x11/display-managers/slim.nix  | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/nixos/modules/services/x11/display-managers/slim.nix b/nixos/modules/services/x11/display-managers/slim.nix
index 9e8b9391f45..7ecad3224a9 100644
--- a/nixos/modules/services/x11/display-managers/slim.nix
+++ b/nixos/modules/services/x11/display-managers/slim.nix
@@ -104,9 +104,16 @@ in
         execCmd = "exec ${pkgs.slim}/bin/slim";
       };
 
-    # Allow null passwords so that the user can login as root on the
-    # installation CD.
-    security.pam.services = [ { name = "slim"; allowNullPassword = true; startSession = true; } ];
+    security.pam.services =
+      [ # Allow null passwords so that the user can login as root on the
+        # installation CD.
+        { name = "slim"; allowNullPassword = true; startSession = true; }
+
+        # Allow slimlock to work.
+        { name = "slimlock"; }
+      ];
+
+    environment.systemPackages = [ pkgs.slim ];
 
   };
 
-- 
GitLab


From 3f2c0bf9bde96260276fe487e2f85b1858d61c47 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 15 Oct 2013 13:41:03 +0200
Subject: [PATCH 5250/5331] slim: Fix session handling

---
 nixos/modules/services/x11/display-managers/slim.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/services/x11/display-managers/slim.nix b/nixos/modules/services/x11/display-managers/slim.nix
index 7ecad3224a9..f9b81f8f040 100644
--- a/nixos/modules/services/x11/display-managers/slim.nix
+++ b/nixos/modules/services/x11/display-managers/slim.nix
@@ -12,7 +12,7 @@ let
       xauth_path ${dmcfg.xauthBin}
       default_xserver ${dmcfg.xserverBin}
       xserver_arguments ${dmcfg.xserverArgs}
-      sessions ${pkgs.lib.concatStringsSep "," (dmcfg.session.names ++ ["custom"])}
+      sessiondir ${dmcfg.session.desktops}
       login_cmd exec ${pkgs.stdenv.shell} ${dmcfg.session.script} "%session"
       halt_cmd ${config.systemd.package}/sbin/shutdown -h now
       reboot_cmd ${config.systemd.package}/sbin/shutdown -r now
-- 
GitLab


From a2c820c6786ef8275213838ad0bdd77b970a4168 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 15 Oct 2013 14:47:51 +0200
Subject: [PATCH 5251/5331] Turn security.pam.services into an attribute set

That is, you can say

  security.pam.services.sshd = { options... };

instead of

  security.pam.services = [ { name = "sshd"; options... } ];

making it easier to override PAM settings from other modules.
---
 nixos/modules/programs/shadow.nix             |  26 +-
 nixos/modules/security/pam.nix                | 318 +++++++++++-------
 nixos/modules/security/pam_usb.nix            |   6 +-
 nixos/modules/security/polkit.nix             |   2 +-
 nixos/modules/security/sudo.nix               |   2 +-
 nixos/modules/services/mail/dovecot.nix       |   2 +-
 .../services/network-filesystems/samba.nix    |   3 +
 .../modules/services/networking/ejabberd.nix  |   2 +
 .../modules/services/networking/ssh/lshd.nix  |   2 +
 nixos/modules/services/printing/cupsd.nix     |   2 +
 nixos/modules/services/scheduling/atd.nix     |   2 +-
 .../services/x11/desktop-managers/kde4.nix    |   2 +-
 .../services/x11/display-managers/kdm.nix     |   2 +-
 .../services/x11/display-managers/lightdm.nix |   6 +-
 .../services/x11/display-managers/slim.nix    |  14 +-
 15 files changed, 227 insertions(+), 164 deletions(-)

diff --git a/nixos/modules/programs/shadow.nix b/nixos/modules/programs/shadow.nix
index 695c0b6620f..36c915f755f 100644
--- a/nixos/modules/programs/shadow.nix
+++ b/nixos/modules/programs/shadow.nix
@@ -79,22 +79,22 @@ in
       ];
 
     security.pam.services =
-      [ { name = "chsh"; rootOK = true; }
-        { name = "chfn"; rootOK = true; }
-        { name = "su"; rootOK = true; forwardXAuth = true; }
-        { name = "passwd"; }
+      { chsh = { rootOK = true; };
+        chfn = { rootOK = true; };
+        su = { rootOK = true; forwardXAuth = true; };
+        passwd = {};
         # Note: useradd, groupadd etc. aren't setuid root, so it
         # doesn't really matter what the PAM config says as long as it
         # lets root in.
-        { name = "useradd"; rootOK = true; }
-        { name = "usermod"; rootOK = true; }
-        { name = "userdel"; rootOK = true; }
-        { name = "groupadd"; rootOK = true; }
-        { name = "groupmod"; rootOK = true; }
-        { name = "groupmems"; rootOK = true; }
-        { name = "groupdel"; rootOK = true; }
-        { name = "login"; startSession = true; allowNullPassword = true; showMotd = true; updateWtmp = true; }
-      ];
+        useradd = { rootOK = true; };
+        usermod = { rootOK = true; };
+        userdel = { rootOK = true; };
+        groupadd = { rootOK = true; };
+        groupmod = { rootOK = true; };
+        groupmems = { rootOK = true; };
+        groupdel = { rootOK = true; };
+        login = { startSession = true; allowNullPassword = true; showMotd = true; updateWtmp = true; };
+      };
 
     security.setuidPrograms = [ "passwd" "chfn" "su" "newgrp" ];
 
diff --git a/nixos/modules/security/pam.nix b/nixos/modules/security/pam.nix
index 3ef01ea2c17..d078ed1e1bb 100644
--- a/nixos/modules/security/pam.nix
+++ b/nixos/modules/security/pam.nix
@@ -7,77 +7,138 @@ with pkgs.lib;
 
 let
 
-  inherit (pkgs) pam_krb5 pam_ccreds;
+  pamOpts = args: {
+
+    options = {
+
+      name = mkOption {
+        example = "sshd";
+        type = types.uniq types.string;
+        description = "Name of the PAM service.";
+      };
+
+      rootOK = mkOption {
+        default = false;
+        type = types.bool;
+        description = ''
+          If set, root doesn't need to authenticate (e.g. for the
+          <command>useradd</command> service).
+        '';
+      };
+
+      usbAuth = mkOption {
+        default = config.security.pam.usb.enable;
+        type = types.bool;
+        description = ''
+          If set, users listed in
+          <filename>/etc/pamusb.conf</filename> are able to log in
+          with the associated USB key.
+        '';
+      };
+
+      otpwAuth = mkOption {
+        default = config.security.pam.enableOTPW;
+        type = types.bool;
+        description = ''
+          If set, the OTPW system will be used (if
+          <filename>~/.otpw</filename> exists).
+        '';
+      };
+
+      sshAgentAuth = mkOption {
+        default = false;
+        type = types.bool;
+        description = ''
+          If set, the calling user's SSH agent is used to authenticate
+          against the keys in the calling user's
+          <filename>~/.ssh/authorized_keys</filename>.  This is useful
+          for <command>sudo</command> on password-less remote systems.
+        '';
+      };
+
+      startSession = mkOption {
+        default = false;
+        type = types.bool;
+        description = ''
+          If set, the service will register a new session with
+          systemd's login manager.  For local sessions, this will give
+          the user access to audio devices, CD-ROM drives.  In the
+          default PolicyKit configuration, it also allows the user to
+          reboot the system.
+        '';
+      };
+
+      setLoginUid = mkOption {
+        type = types.bool;
+        description = ''
+          Set the login uid of the process
+          (<filename>/proc/self/loginuid</filename>) for auditing
+          purposes.  The login uid is only set by ‘entry points’ like
+          <command>login</command> and <command>sshd</command>, not by
+          commands like <command>sudo</command>.
+        '';
+      };
+
+      forwardXAuth = mkOption {
+        default = false;
+        type = types.bool;
+        description = ''
+          Whether X authentication keys should be passed from the
+          calling user to the target user (e.g. for
+          <command>su</command>)
+        '';
+      };
+
+      allowNullPassword = mkOption {
+        default = false;
+        type = types.bool;
+        description = ''
+          Whether to allow logging into accounts that have no password
+          set (i.e., have an empty password field in
+          <filename>/etc/passwd</filename> or
+          <filename>/etc/group</filename>).  This does not enable
+          logging into disabled accounts (i.e., that have the password
+          field set to <literal>!</literal>).  Note that regardless of
+          what the pam_unix documentation says, accounts with hashed
+          empty passwords are always allowed to log in.
+        '';
+      };
 
-  pam_ldap = if config.users.ldap.daemon.enable then pkgs.nss_pam_ldapd else pkgs.pam_ldap;
+      limits = mkOption {
+        description = ''
+          Attribute set describing resource limits.  Defaults to the
+          value of <option>security.pam.loginLimits</option>.
+        '';
+      };
 
-  otherService = pkgs.writeText "other.pam"
-    ''
-      auth     required pam_warn.so
-      auth     required pam_deny.so
-      account  required pam_warn.so
-      account  required pam_deny.so
-      password required pam_warn.so
-      password required pam_deny.so
-      session  required pam_warn.so
-      session  required pam_deny.so
-    '';
+      showMotd = mkOption {
+        default = false;
+        type = types.bool;
+        description = "Whether to show the message of the day.";
+      };
 
-  # Create a limits.conf(5) file.
-  makeLimitsConf = limits:
-    pkgs.writeText "limits.conf"
-      (concatStringsSep "\n"
-           (map ({ domain, type, item, value }:
-                 concatStringsSep " " [ domain type item value ])
-                limits));
+      updateWtmp = mkOption {
+        default = false;
+        type = types.bool;
+        description = "Whether to update <filename>/var/log/wtmp</filename>.";
+      };
 
-  motd = pkgs.writeText "motd" config.users.motd;
+      text = mkOption {
+        type = types.nullOr types.string;
+        description = "Contents of the PAM service file.";
+      };
+
+    };
+
+    config = let cfg = args.config; in {
+      name = mkDefault args.name;
+      setLoginUid = mkDefault cfg.startSession;
+      limits = mkDefault config.security.pam.loginLimits;
 
-  makePAMService =
-    { name
-    , # If set, root doesn't need to authenticate (e.g. for the "chsh"
-      # service).
-      rootOK ? false
-    , # If set, user listed in /etc/pamusb.conf are able to log in with
-      # the associated usb key.
-      usbAuth ? config.security.pam.usb.enable
-    , # If set, OTPW system will be used (if ~/.otpw exists)
-      otpwAuth ? config.security.pam.enableOTPW
-    , # If set, the calling user's SSH agent is used to authenticate
-      # against the keys in the calling user's ~/.ssh/authorized_keys.
-      # This is useful for "sudo" on password-less remote systems.
-      sshAgentAuth ? false
-    , # If set, the service will register a new session with systemd's
-      # login manager.  If the service is running locally, this will
-      # give the user ownership of audio devices etc.
-      startSession ? false
-    , # Set the login uid of the process (/proc/self/loginuid) for
-      # auditing purposes.  The login uid is only set by "entry
-      # points" like login and sshd, not by commands like sudo.
-      setLoginUid ? startSession
-    , # Whether to forward XAuth keys between users.  Mostly useful
-      # for "su".
-      forwardXAuth ? false
-    , # Whether to allow logging into accounts that have no password
-      # set (i.e., have an empty password field in /etc/passwd or
-      # /etc/group).  This does not enable logging into disabled
-      # accounts (i.e., that have the password field set to `!').
-      # Note that regardless of what the pam_unix documentation says,
-      # accounts with hashed empty passwords are always allowed to log
-      # in.
-      allowNullPassword ? false
-    , # The limits, as per limits.conf(5).
-      limits ? config.security.pam.loginLimits
-    , # Whether to show the message of the day.
-      showMotd ? false
-    , # Whether to update /var/log/wtmp.
-      updateWtmp ? false
-    }:
-
-    { source = pkgs.writeText "${name}.pam"
-        # !!! TODO: move the LDAP stuff to the LDAP module, and the
-        # Samba stuff to the Samba module.  This requires that the PAM
-        # module provides the right hooks.
+      # !!! TODO: move the LDAP stuff to the LDAP module, and the
+      # Samba stuff to the Samba module.  This requires that the PAM
+      # module provides the right hooks.
+      text = mkDefault
         ''
           # Account management.
           account sufficient pam_unix.so
@@ -87,14 +148,14 @@ let
               "account sufficient ${pam_krb5}/lib/security/pam_krb5.so"}
 
           # Authentication management.
-          ${optionalString rootOK
+          ${optionalString cfg.rootOK
               "auth sufficient pam_rootok.so"}
-          ${optionalString (config.security.pam.enableSSHAgentAuth && sshAgentAuth)
+          ${optionalString (config.security.pam.enableSSHAgentAuth && cfg.sshAgentAuth)
               "auth sufficient ${pkgs.pam_ssh_agent_auth}/libexec/pam_ssh_agent_auth.so file=~/.ssh/authorized_keys:~/.ssh/authorized_keys2:/etc/ssh/authorized_keys.d/%u"}
-          ${optionalString usbAuth
+          ${optionalString cfg.usbAuth
               "auth sufficient ${pkgs.pam_usb}/lib/security/pam_usb.so"}
-          auth sufficient pam_unix.so ${optionalString allowNullPassword "nullok"} likeauth
-          ${optionalString otpwAuth
+          auth sufficient pam_unix.so ${optionalString cfg.allowNullPassword "nullok"} likeauth
+          ${optionalString cfg.otpwAuth
               "auth sufficient ${pkgs.otpw}/lib/security/pam_otpw.so"}
           ${optionalString config.users.ldap.enable
               "auth sufficient ${pam_ldap}/lib/security/pam_ldap.so use_first_pass"}
@@ -116,26 +177,47 @@ let
 
           # Session management.
           session required pam_unix.so
-          ${optionalString updateWtmp
+          ${optionalString cfg.updateWtmp
               "session required ${pkgs.pam}/lib/security/pam_lastlog.so silent"}
           ${optionalString config.users.ldap.enable
               "session optional ${pam_ldap}/lib/security/pam_ldap.so"}
           ${optionalString config.krb5.enable
               "session optional ${pam_krb5}/lib/security/pam_krb5.so"}
-          ${optionalString otpwAuth
+          ${optionalString cfg.otpwAuth
               "session optional ${pkgs.otpw}/lib/security/pam_otpw.so"}
-          ${optionalString startSession
+          ${optionalString cfg.startSession
               "session optional ${pkgs.systemd}/lib/security/pam_systemd.so"}
-          ${optionalString setLoginUid
+          ${optionalString cfg.setLoginUid
               "session required pam_loginuid.so"}
-          ${optionalString forwardXAuth
+          ${optionalString cfg.forwardXAuth
               "session optional pam_xauth.so xauthpath=${pkgs.xorg.xauth}/bin/xauth systemuser=99"}
-          ${optionalString (limits != [])
+          ${optionalString (cfg.limits != [])
               "session required ${pkgs.pam}/lib/security/pam_limits.so conf=${makeLimitsConf limits}"}
-          ${optionalString (showMotd && config.users.motd != null)
+          ${optionalString (cfg.showMotd && config.users.motd != null)
               "session optional ${pkgs.pam}/lib/security/pam_motd.so motd=${motd}"}
         '';
-      target = "pam.d/${name}";
+    };
+
+  };
+
+
+  inherit (pkgs) pam_krb5 pam_ccreds;
+
+  pam_ldap = if config.users.ldap.daemon.enable then pkgs.nss_pam_ldapd else pkgs.pam_ldap;
+
+  # Create a limits.conf(5) file.
+  makeLimitsConf = limits:
+    pkgs.writeText "limits.conf"
+      (concatStringsSep "\n"
+           (map ({ domain, type, item, value }:
+                 concatStringsSep " " [ domain type item value ])
+                limits));
+
+  motd = pkgs.writeText "motd" config.users.motd;
+
+  makePAMService = pamService:
+    { source = pkgs.writeText "${pamService.name}.pam" pamService.text;
+      target = "pam.d/${pamService.name}";
     };
 
 in
@@ -173,44 +255,15 @@ in
 
     security.pam.services = mkOption {
       default = [];
-      example = [
-        { name = "chsh"; rootOK = true; }
-        { name = "login"; startSession = true; allowNullPassword = true;
-          limits = [
-            { domain = "ftp";
-              type   = "hard";
-              item   = "nproc";
-              value  = "0";
-            }
-          ];
-        }
-      ];
-
+      type = types.loaOf types.optionSet;
+      options = [ pamOpts ];
       description =
         ''
           This option defines the PAM services.  A service typically
           corresponds to a program that uses PAM,
           e.g. <command>login</command> or <command>passwd</command>.
-          Each element of this list is an attribute set describing a
-          service.  The attribute <varname>name</varname> specifies
-          the name of the service.  The attribute
-          <varname>rootOK</varname> specifies whether the root user is
-          allowed to use this service without authentication.  The
-          attribute <varname>startSession</varname> specifies whether
-          systemd's PAM connector module should be used to start a new
-          session; for local sessions, this will give the user
-          ownership of devices such as audio and CD-ROM drives.  The
-          attribute <varname>forwardXAuth</varname> specifies whether
-          X authentication keys should be passed from the calling user
-          to the target user (e.g. for <command>su</command>).
-
-          The attribute <varname>limits</varname> defines resource limits
-          that should apply to users or groups for the service.  Each item in
-          the list should be an attribute set with a
-          <varname>domain</varname>, <varname>type</varname>,
-          <varname>item</varname>, and <varname>value</varname> attribute.
-          The syntax and semantics of these attributes must be that described
-          in the limits.conf(5) man page.
+          Each attribute of this set defines a PAM service, with the attribute name
+          defining the name of the service.
         '';
     };
 
@@ -228,7 +281,7 @@ in
     security.pam.enableOTPW = mkOption {
       default = false;
       description = ''
-        Enable the OTPW (one-time password) PAM module
+        Enable the OTPW (one-time password) PAM module.
       '';
     };
 
@@ -254,11 +307,7 @@ in
       ++ optionals config.security.pam.enableOTPW [ pkgs.otpw ];
 
     environment.etc =
-      map makePAMService config.security.pam.services
-      ++ singleton
-        { source = otherService;
-          target = "pam.d/other";
-        };
+      mapAttrsToList (n: v: makePAMService v) config.security.pam.services;
 
     security.setuidOwners = [ {
       program = "unix_chkpwd";
@@ -268,18 +317,27 @@ in
     } ];
 
     security.pam.services =
-      # Most of these should be moved to specific modules.
-      [ { name = "cups"; }
-        { name = "ejabberd"; }
-        { name = "ftp"; }
-        { name = "i3lock"; }
-        { name = "lshd"; }
-        { name = "samba"; }
-        { name = "screen"; }
-        { name = "vlock"; }
-        { name = "xlock"; }
-        { name = "xscreensaver"; }
-      ];
+      { other.text =
+          ''
+            auth     required pam_warn.so
+            auth     required pam_deny.so
+            account  required pam_warn.so
+            account  required pam_deny.so
+            password required pam_warn.so
+            password required pam_deny.so
+            session  required pam_warn.so
+            session  required pam_deny.so
+          '';
+
+        # Most of these should be moved to specific modules.
+        cups = {};
+        ftp = {};
+        i3lock = {};
+        screen = {};
+        vlock = {};
+        xlock = {};
+        xscreensaver = {};
+      };
 
   };
 
diff --git a/nixos/modules/security/pam_usb.nix b/nixos/modules/security/pam_usb.nix
index 1c2a6a05f26..2bd3069ddb1 100644
--- a/nixos/modules/security/pam_usb.nix
+++ b/nixos/modules/security/pam_usb.nix
@@ -8,7 +8,7 @@ let
 
   cfg = config.security.pam.usb;
 
-  anyUsbAuth = any (attrByPath ["usbAuth"] false) config.security.pam.services;
+  anyUsbAuth = any (attrByPath ["usbAuth"] false) (attrValues config.security.pam.services);
 
 in
 
@@ -19,8 +19,8 @@ in
       enable = mkOption {
         default = false;
         description = ''
-          Enable USB login for all login system unless the service disabled
-          it.  For more information, visit <link
+          Enable USB login for all login systems that support it.  For
+          more information, visit <link
           xlink:href="http://pamusb.org/doc/quickstart#setting_up" />.
         '';
       };
diff --git a/nixos/modules/security/polkit.nix b/nixos/modules/security/polkit.nix
index b9b32496a36..8b04f4043bc 100644
--- a/nixos/modules/security/polkit.nix
+++ b/nixos/modules/security/polkit.nix
@@ -94,7 +94,7 @@ in
 
     services.dbus.packages = [ pkgs.polkit ];
 
-    security.pam.services = [ { name = "polkit-1"; } ];
+    security.pam.services.polkit-1 = {};
 
     security.setuidPrograms = [ "pkexec" ];
 
diff --git a/nixos/modules/security/sudo.nix b/nixos/modules/security/sudo.nix
index cd548f4a4fe..77251780198 100644
--- a/nixos/modules/security/sudo.nix
+++ b/nixos/modules/security/sudo.nix
@@ -74,7 +74,7 @@ in
 
     environment.systemPackages = [ sudo ];
 
-    security.pam.services = [ { name = "sudo"; sshAgentAuth = true; } ];
+    security.pam.services.sudo = { sshAgentAuth = true; };
 
     environment.etc = singleton
       { source = pkgs.writeText "sudoers-in" cfg.configFile;
diff --git a/nixos/modules/services/mail/dovecot.nix b/nixos/modules/services/mail/dovecot.nix
index 5f8e8e1ade3..92682d644f4 100644
--- a/nixos/modules/services/mail/dovecot.nix
+++ b/nixos/modules/services/mail/dovecot.nix
@@ -124,7 +124,7 @@ in
 
   config = mkIf config.services.dovecot2.enable {
 
-    security.pam.services = [ { name = "dovecot2"; } ];
+    security.pam.services.dovecot2 = {};
 
     users.extraUsers = [
       { name = cfg.user;
diff --git a/nixos/modules/services/network-filesystems/samba.nix b/nixos/modules/services/network-filesystems/samba.nix
index 70a14487ea5..e18d9d7b67b 100644
--- a/nixos/modules/services/network-filesystems/samba.nix
+++ b/nixos/modules/services/network-filesystems/samba.nix
@@ -198,6 +198,7 @@ in
       }
 
       (mkIf config.services.samba.enable {
+
         users.extraUsers.smbguest = {
           description = "Samba service user";
           group = group;
@@ -228,6 +229,8 @@ in
           };
         };
 
+        security.pam.services.sambda = {};
+
       })
     ];
 
diff --git a/nixos/modules/services/networking/ejabberd.nix b/nixos/modules/services/networking/ejabberd.nix
index 6d233e543e2..05e0aba7d70 100644
--- a/nixos/modules/services/networking/ejabberd.nix
+++ b/nixos/modules/services/networking/ejabberd.nix
@@ -130,6 +130,8 @@ in
           '';
       };
 
+    security.pam.services.ejabberd = {};
+
   };
 
 }
diff --git a/nixos/modules/services/networking/ssh/lshd.nix b/nixos/modules/services/networking/ssh/lshd.nix
index d32fabbde24..04ef76f1e4d 100644
--- a/nixos/modules/services/networking/ssh/lshd.nix
+++ b/nixos/modules/services/networking/ssh/lshd.nix
@@ -170,6 +170,8 @@ in
           '';
       };
 
+    security.pam.services.lshd = {};
+
   };
 
 }
diff --git a/nixos/modules/services/printing/cupsd.nix b/nixos/modules/services/printing/cupsd.nix
index c9a4a9087e5..1c3dc9d90b1 100644
--- a/nixos/modules/services/printing/cupsd.nix
+++ b/nixos/modules/services/printing/cupsd.nix
@@ -219,5 +219,7 @@ in
     # Allow CUPS to receive IPP printer announcements via UDP.
     networking.firewall.allowedUDPPorts = [ 631 ];
 
+    security.pam.services.cups = {};
+
   };
 }
diff --git a/nixos/modules/services/scheduling/atd.nix b/nixos/modules/services/scheduling/atd.nix
index 88bec2cb2f3..8c96252668e 100644
--- a/nixos/modules/services/scheduling/atd.nix
+++ b/nixos/modules/services/scheduling/atd.nix
@@ -49,7 +49,7 @@ in
 
     environment.systemPackages = [ at ];
 
-    security.pam.services = [ { name = "atd"; } ];
+    security.pam.services.atd = {};
 
     users.extraUsers = singleton
       { name = "atd";
diff --git a/nixos/modules/services/x11/desktop-managers/kde4.nix b/nixos/modules/services/x11/desktop-managers/kde4.nix
index c76acfbcd4e..d1eb1799bc8 100644
--- a/nixos/modules/services/x11/desktop-managers/kde4.nix
+++ b/nixos/modules/services/x11/desktop-managers/kde4.nix
@@ -162,7 +162,7 @@ in
     services.udisks2.enable = wantsUdisks2;
     services.upower.enable = config.powerManagement.enable;
 
-    security.pam.services = [ { name = "kde"; allowNullPassword = true; startSession = true; } ];
+    security.pam.services.kde = { allowNullPassword = true; };
 
   };
 
diff --git a/nixos/modules/services/x11/display-managers/kdm.nix b/nixos/modules/services/x11/display-managers/kdm.nix
index 229ab12c6e1..2e84adcb4ce 100644
--- a/nixos/modules/services/x11/display-managers/kdm.nix
+++ b/nixos/modules/services/x11/display-managers/kdm.nix
@@ -138,7 +138,7 @@ in
         logsXsession = true;
       };
 
-    security.pam.services = [ { name = "kde"; allowNullPassword = true; startSession = true; } ];
+    security.pam.services.kde = { allowNullPassword = true; startSession = true; };
 
     users.extraUsers = singleton
       { name = "kdm";
diff --git a/nixos/modules/services/x11/display-managers/lightdm.nix b/nixos/modules/services/x11/display-managers/lightdm.nix
index c2b90d239ea..266f16e18e3 100644
--- a/nixos/modules/services/x11/display-managers/lightdm.nix
+++ b/nixos/modules/services/x11/display-managers/lightdm.nix
@@ -102,10 +102,8 @@ in
     services.dbus.enable = true;
     services.dbus.packages = [ lightdm ];
 
-    security.pam.services = [
-      { name = "lightdm"; allowNullPassword = true; startSession = true; }
-      { name = "lightdm-greeter"; allowNullPassword = true; startSession = true; }
-    ];
+    security.pam.services.lightdm = { allowNullPassword = true; startSession = true; };
+    security.pam.services.lightdm-greeter = { allowNullPassword = true; startSession = true; };
 
     users.extraUsers.lightdm = {
       createHome = true;
diff --git a/nixos/modules/services/x11/display-managers/slim.nix b/nixos/modules/services/x11/display-managers/slim.nix
index f9b81f8f040..7b2c52ca398 100644
--- a/nixos/modules/services/x11/display-managers/slim.nix
+++ b/nixos/modules/services/x11/display-managers/slim.nix
@@ -104,14 +104,12 @@ in
         execCmd = "exec ${pkgs.slim}/bin/slim";
       };
 
-    security.pam.services =
-      [ # Allow null passwords so that the user can login as root on the
-        # installation CD.
-        { name = "slim"; allowNullPassword = true; startSession = true; }
-
-        # Allow slimlock to work.
-        { name = "slimlock"; }
-      ];
+    # Allow null passwords so that the user can login as root on the
+    # installation CD.
+    security.pam.services.slim = { allowNullPassword = true; startSession = true; };
+
+    # Allow slimlock to work.
+    security.pam.services.slimlock = {};
 
     environment.systemPackages = [ pkgs.slim ];
 
-- 
GitLab


From ae74b0ae587df0750843da2d7cfc6e1e24e63bf2 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 15 Oct 2013 15:05:49 +0200
Subject: [PATCH 5252/5331] sshd: Remove the usePAM option

Sshd *must* use PAM because we depend on it for proper session
management.  The original goal of this option (disabling password
logins) can also be implemented by removing pam_auth authentication
from sshd's PAM service.
---
 nixos/modules/security/pam.nix                | 12 ++++++++++-
 .../modules/services/networking/ssh/sshd.nix  | 21 +++++++------------
 2 files changed, 18 insertions(+), 15 deletions(-)

diff --git a/nixos/modules/security/pam.nix b/nixos/modules/security/pam.nix
index d078ed1e1bb..a30945cc923 100644
--- a/nixos/modules/security/pam.nix
+++ b/nixos/modules/security/pam.nix
@@ -17,6 +17,15 @@ let
         description = "Name of the PAM service.";
       };
 
+      unixAuth = mkOption {
+        default = true;
+        type = types.bool;
+        description = ''
+          Whether users can log in with passwords defined in
+          <filename>/etc/shadow</filename>.
+        '';
+      };
+
       rootOK = mkOption {
         default = false;
         type = types.bool;
@@ -154,7 +163,8 @@ let
               "auth sufficient ${pkgs.pam_ssh_agent_auth}/libexec/pam_ssh_agent_auth.so file=~/.ssh/authorized_keys:~/.ssh/authorized_keys2:/etc/ssh/authorized_keys.d/%u"}
           ${optionalString cfg.usbAuth
               "auth sufficient ${pkgs.pam_usb}/lib/security/pam_usb.so"}
-          auth sufficient pam_unix.so ${optionalString cfg.allowNullPassword "nullok"} likeauth
+          ${optionalString cfg.unixAuth
+              "auth sufficient pam_unix.so ${optionalString cfg.allowNullPassword "nullok"} likeauth"}
           ${optionalString cfg.otpwAuth
               "auth sufficient ${pkgs.otpw}/lib/security/pam_otpw.so"}
           ${optionalString config.users.ldap.enable
diff --git a/nixos/modules/services/networking/ssh/sshd.nix b/nixos/modules/services/networking/ssh/sshd.nix
index d57eef860d2..c85c9307e3e 100644
--- a/nixos/modules/services/networking/ssh/sshd.nix
+++ b/nixos/modules/services/networking/ssh/sshd.nix
@@ -128,21 +128,10 @@ in
         '';
       };
 
-      usePAM = mkOption {
-        default = true;
-        description = ''
-          Specifies whether the OpenSSH daemon uses PAM to authenticate
-          login attempts.
-        '';
-      };
-
       passwordAuthentication = mkOption {
         default = true;
         description = ''
-          Specifies whether password authentication is allowed. Note
-          that setting this value to <literal>false</literal> is most
-          probably not going to have the desired effect unless
-          <literal>usePAM</literal> is disabled as well.
+          Specifies whether password authentication is allowed.
         '';
       };
 
@@ -284,7 +273,11 @@ in
 
     networking.firewall.allowedTCPPorts = cfg.ports;
 
-    security.pam.services = optional cfg.usePAM { name = "sshd"; startSession = true; showMotd = true; };
+    security.pam.services.sshd =
+      { startSession = true;
+        showMotd = true;
+        unixAuth = cfg.passwordAuthentication;
+      };
 
     services.openssh.authorizedKeysFiles =
       [ ".ssh/authorized_keys" ".ssh/authorized_keys2" "/etc/ssh/authorized_keys.d/%u" ];
@@ -295,7 +288,7 @@ in
 
         Protocol 2
 
-        UsePAM ${if cfg.usePAM then "yes" else "no"}
+        UsePAM yes
 
         AddressFamily ${if config.networking.enableIPv6 then "any" else "inet"}
         ${concatMapStrings (port: ''
-- 
GitLab


From ce7f235a09402791ffcbae5ce5fd9e93e8296b7e Mon Sep 17 00:00:00 2001
From: Sander van der Burg <svanderburg@gmail.com>
Date: Tue, 15 Oct 2013 16:32:16 +0200
Subject: [PATCH 5253/5331] Make arbitrary arguments to the generic builder
 possible

---
 pkgs/development/mobile/androidenv/build-app.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/mobile/androidenv/build-app.nix b/pkgs/development/mobile/androidenv/build-app.nix
index 2792d364f15..3349cd5b9be 100644
--- a/pkgs/development/mobile/androidenv/build-app.nix
+++ b/pkgs/development/mobile/androidenv/build-app.nix
@@ -1,5 +1,5 @@
 { stdenv, androidsdk, jdk, ant }:
-{ name, src, platformVersions ? [ "8" ], useGoogleAPIs ? false, antFlags ? ""
+args@{ name, src, platformVersions ? [ "8" ], useGoogleAPIs ? false, antFlags ? ""
 , release ? false, keyStore ? null, keyAlias ? null, keyStorePassword ? null, keyAliasPassword ? null
 }:
 
@@ -15,9 +15,8 @@ let
     abiVersions = [];
   };
 in
-stdenv.mkDerivation {
+stdenv.mkDerivation ({
   name = stdenv.lib.replaceChars [" "] [""] name;
-  inherit src;
   
   ANDROID_HOME = "${androidsdkComposition}/libexec/android-sdk-${platformName}";
 
@@ -45,4 +44,5 @@ stdenv.mkDerivation {
     mkdir -p $out/nix-support
     echo "file binary-dist \"$(echo $out/*.apk)\"" > $out/nix-support/hydra-build-products
   '';
-}
+} //
+builtins.removeAttrs args ["name"])
-- 
GitLab


From f24e20f1e32e272b4a8906d6801a316bef0d6041 Mon Sep 17 00:00:00 2001
From: Sander van der Burg <svanderburg@gmail.com>
Date: Tue, 15 Oct 2013 16:32:38 +0200
Subject: [PATCH 5254/5331] Support Xcode 5.0

---
 pkgs/development/mobile/xcodeenv/xcodewrapper.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/mobile/xcodeenv/xcodewrapper.nix b/pkgs/development/mobile/xcodeenv/xcodewrapper.nix
index 1cbab99e365..7515fcdd121 100644
--- a/pkgs/development/mobile/xcodeenv/xcodewrapper.nix
+++ b/pkgs/development/mobile/xcodeenv/xcodewrapper.nix
@@ -1,4 +1,4 @@
-{stdenv, version ? "4.6"}:
+{stdenv, version ? "5.0"}:
 
 stdenv.mkDerivation {
   name = "xcode-wrapper-"+version;
@@ -9,6 +9,7 @@ stdenv.mkDerivation {
     ln -s /usr/bin/xcodebuild
     ln -s /usr/bin/xcrun
     ln -s /usr/bin/security
+    ln -s /usr/bin/codesign
     ln -s "/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/Applications/iPhone Simulator.app/Contents/MacOS/iPhone Simulator"
 
     cd ..
-- 
GitLab


From 521ea15f14f34f83bf76dbc497195e722ef55dfe Mon Sep 17 00:00:00 2001
From: Sander van der Burg <svanderburg@gmail.com>
Date: Tue, 15 Oct 2013 16:48:42 +0200
Subject: [PATCH 5255/5331] We need to use ... to allow other parameters

---
 pkgs/development/mobile/androidenv/build-app.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/mobile/androidenv/build-app.nix b/pkgs/development/mobile/androidenv/build-app.nix
index 3349cd5b9be..db7067c989c 100644
--- a/pkgs/development/mobile/androidenv/build-app.nix
+++ b/pkgs/development/mobile/androidenv/build-app.nix
@@ -1,6 +1,7 @@
 { stdenv, androidsdk, jdk, ant }:
 args@{ name, src, platformVersions ? [ "8" ], useGoogleAPIs ? false, antFlags ? ""
 , release ? false, keyStore ? null, keyAlias ? null, keyStorePassword ? null, keyAliasPassword ? null
+, ...
 }:
 
 assert release -> keyStore != null && keyAlias != null && keyStorePassword != null && keyAliasPassword != null;
-- 
GitLab


From df5eadd283f3f0be7b2287f6f5c310a30d08a655 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 15 Oct 2013 15:59:36 +0200
Subject: [PATCH 5256/5331] nspr: Update to 4.10.1

---
 pkgs/development/libraries/nspr/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/nspr/default.nix b/pkgs/development/libraries/nspr/default.nix
index 1aef55c9b2c..80368031349 100644
--- a/pkgs/development/libraries/nspr/default.nix
+++ b/pkgs/development/libraries/nspr/default.nix
@@ -1,13 +1,13 @@
 { stdenv, fetchurl }:
 
-let version = "4.10"; in
+let version = "4.10.1"; in
 
 stdenv.mkDerivation {
   name = "nspr-${version}";
 
   src = fetchurl {
     url = "http://ftp.mozilla.org/pub/mozilla.org/nspr/releases/v${version}/src/nspr-${version}.tar.gz";
-    sha1 = "10dbf68c07497dab30be09db526931c885d5a7e9";
+    sha1 = "bd1cdf5e7e107846ffe431c5c62b81a560e8c3f7";
   };
 
   preConfigure = "cd nspr";
-- 
GitLab


From 11960d2f475f69da76956fb68248a961a612e29b Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 15 Oct 2013 15:59:45 +0200
Subject: [PATCH 5257/5331] nss: Update to 3.15.2

---
 pkgs/development/libraries/nss/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/nss/default.nix b/pkgs/development/libraries/nss/default.nix
index de980d718f3..49f3754bc14 100644
--- a/pkgs/development/libraries/nss/default.nix
+++ b/pkgs/development/libraries/nss/default.nix
@@ -17,11 +17,11 @@ let
 
 in stdenv.mkDerivation rec {
   name = "nss-${version}";
-  version = "3.15.1";
+  version = "3.15.2";
 
   src = fetchurl {
-    url = "http://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_3_15_1_RTM/src/${name}.tar.gz";
-    sha1 = "1aa7c0ff8af7fb2c8b6e4886ae2291f4bfe0d5c0";
+    url = "http://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_3_15_2_RTM/src/${name}.tar.gz";
+    sha1 = "2d900c296bf11deabbf833ebd6ecdea549c97a5f";
   };
 
   buildInputs = [ nspr perl zlib sqlite ];
-- 
GitLab


From 0c0bc0857ed459a7e4b6b54fe768828fee9737cd Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 15 Oct 2013 16:14:08 +0200
Subject: [PATCH 5258/5331] tzdata: Update to 2013g

---
 pkgs/data/misc/tzdata/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/data/misc/tzdata/default.nix b/pkgs/data/misc/tzdata/default.nix
index c49430935ae..da043da0967 100644
--- a/pkgs/data/misc/tzdata/default.nix
+++ b/pkgs/data/misc/tzdata/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl }:
 
-let version = "2012f"; in
+let version = "2013g"; in
 
 stdenv.mkDerivation rec {
   name = "tzdata-${version}";
@@ -8,11 +8,11 @@ stdenv.mkDerivation rec {
   srcs =
     [ (fetchurl {
         url = "http://www.iana.org/time-zones/repository/releases/tzdata${version}.tar.gz";
-        sha256 = "1k165i8g23rr0z26k02x1l4immp69g6yqjrd3lwmbvj5li4mmsdg";
+        sha256 = "0krsgncjnk64g3xshj5xd3znskcx9wwy20g1wmm2lwycincx7kdn";
       })
       (fetchurl {
         url = "http://www.iana.org/time-zones/repository/releases/tzcode${version}.tar.gz";
-        sha256 = "1m6rg9003mkjyvpv5gg5lcia9fzhy7ndwgs68qlpbipnw5p0k2pk";
+        sha256 = "0ysqm72xm9vcykqg9zgry69w6gr3i6b6mpbvgfmwyrdvb6s5ihy7";
       })
     ];
 
-- 
GitLab


From bbe265e8c291d542f5f5a9ea0217e78b4ba6624e Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 15 Oct 2013 17:22:30 +0200
Subject: [PATCH 5259/5331] slim: Only enable if the X server is enabled

http://hydra.nixos.org/build/6494972

Disabling slim revealed that services.xserver.displayManager.job had
an incorrect type, so fixed that as well.
---
 .../services/x11/display-managers/default.nix | 60 +++++++++----------
 .../services/x11/display-managers/kdm.nix     |  2 +-
 .../services/x11/display-managers/lightdm.nix |  5 +-
 .../services/x11/display-managers/slim.nix    |  2 +-
 4 files changed, 34 insertions(+), 35 deletions(-)

diff --git a/nixos/modules/services/x11/display-managers/default.nix b/nixos/modules/services/x11/display-managers/default.nix
index c7599e245b0..91de910662f 100644
--- a/nixos/modules/services/x11/display-managers/default.nix
+++ b/nixos/modules/services/x11/display-managers/default.nix
@@ -239,39 +239,35 @@ in
         };
       };
 
-      job = mkOption {
-        default = {};
-        type = types.uniq types.optionSet;
-        description = "This option defines how to start the display manager.";
-
-        options = {
-
-          preStart = mkOption {
-            default = "";
-            example = "rm -f /var/log/my-display-manager.log";
-            description = "Script executed before the display manager is started.";
-          };
-
-          execCmd = mkOption {
-            example = "${pkgs.slim}/bin/slim";
-            description = "Command to start the display manager.";
-          };
-
-          environment = mkOption {
-            default = {};
-            example = { SLIM_CFGFILE = /etc/slim.conf; };
-            description = "Additional environment variables needed by the display manager.";
-          };
-
-          logsXsession = mkOption {
-            default = false;
-            description = ''
-              Whether the display manager redirects the
-              output of the session script to
-              <filename>~/.xsession-errors</filename>.
-            '';
-          };
+      job = {
 
+        preStart = mkOption {
+          type = types.lines;
+          default = "";
+          example = "rm -f /var/log/my-display-manager.log";
+          description = "Script executed before the display manager is started.";
+        };
+
+        execCmd = mkOption {
+          type = types.uniq types.string;
+          example = "${pkgs.slim}/bin/slim";
+          description = "Command to start the display manager.";
+        };
+
+        environment = mkOption {
+          default = {};
+          example = { SLIM_CFGFILE = /etc/slim.conf; };
+          description = "Additional environment variables needed by the display manager.";
+        };
+
+        logsXsession = mkOption {
+          type = types.bool;
+          default = false;
+          description = ''
+            Whether the display manager redirects the
+            output of the session script to
+            <filename>~/.xsession-errors</filename>.
+          '';
         };
 
       };
diff --git a/nixos/modules/services/x11/display-managers/kdm.nix b/nixos/modules/services/x11/display-managers/kdm.nix
index 2e84adcb4ce..c03f7116454 100644
--- a/nixos/modules/services/x11/display-managers/kdm.nix
+++ b/nixos/modules/services/x11/display-managers/kdm.nix
@@ -128,7 +128,7 @@ in
     services.xserver.displayManager.slim.enable = false;
 
     services.xserver.displayManager.job =
-      { execCmd =
+      { execCmd = mkFixStrictness
           ''
             mkdir -m 0755 -p /var/lib/kdm
             chown kdm /var/lib/kdm
diff --git a/nixos/modules/services/x11/display-managers/lightdm.nix b/nixos/modules/services/x11/display-managers/lightdm.nix
index 266f16e18e3..f4fb5ee003a 100644
--- a/nixos/modules/services/x11/display-managers/lightdm.nix
+++ b/nixos/modules/services/x11/display-managers/lightdm.nix
@@ -89,11 +89,14 @@ in
   };
 
   config = mkIf cfg.enable {
+
+    services.xserver.displayManager.slim.enable = false;
+
     services.xserver.displayManager.job = {
       logsXsession = true;
 
       # lightdm relaunches itself via just `lightdm`, so needs to be on the PATH
-      execCmd = ''
+      execCmd = mkFixStrictness ''
         export PATH=${lightdm}/sbin:$PATH
         ${lightdm}/sbin/lightdm --log-dir=/var/log --run-dir=/run --config=${lightdmConf}
       '';
diff --git a/nixos/modules/services/x11/display-managers/slim.nix b/nixos/modules/services/x11/display-managers/slim.nix
index 7b2c52ca398..01c9fa96c8c 100644
--- a/nixos/modules/services/x11/display-managers/slim.nix
+++ b/nixos/modules/services/x11/display-managers/slim.nix
@@ -45,7 +45,7 @@ in
     services.xserver.displayManager.slim = {
 
       enable = mkOption {
-        default = true;
+        default = config.services.xserver.enable;
         description = ''
           Whether to enable SLiM as the display manager.
         '';
-- 
GitLab


From ceb8ab7ffa9435a66568bba17d153c82a4e4e824 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 15 Oct 2013 17:43:15 +0200
Subject: [PATCH 5260/5331] Really fix use of NixOps with the merged
 Nixpkgs/NixOS tree

Note that there is a subtle difference in Nix that causes
nixos-rebuild to work and NixOps to fail:

  $ nix-instantiate '<nixos>' -A config.system.nixosVersion --eval-only
  "13.10pre34915.50f4822"

  $ nix-instantiate '<nixos/default.nix>' -A config.system.nixosVersion --eval-only
  error: opening file `/nix/var/nix/profiles/per-user/root/channels/nixos/.version': No such file or directory

Fixes NixOS/nixops#145.
---
 nixos/modules/misc/version.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/misc/version.nix b/nixos/modules/misc/version.nix
index fa7baf36fb9..e9ee476d36a 100644
--- a/nixos/modules/misc/version.nix
+++ b/nixos/modules/misc/version.nix
@@ -26,10 +26,11 @@ with pkgs.lib;
   config = {
 
     system.nixosVersion =
-      mkDefault (builtins.readFile ../../../.version + config.system.nixosVersionSuffix);
+      mkDefault (builtins.readFile "${pkgs.path}/.version" + config.system.nixosVersionSuffix);
 
     system.nixosVersionSuffix =
-      mkDefault (if builtins.pathExists ../../../.version-suffix then builtins.readFile ../../../.version-suffix else "pre-git");
+      let suffixFile = "${pkgs.path}/.version-suffix"; in
+      mkDefault (if builtins.pathExists suffixFile then builtins.readFile suffixFile else "pre-git");
 
     # Note: code names must only increase in alphabetical order.
     system.nixosCodeName = "Aardvark";
-- 
GitLab


From 84854877270823cad9b8be0331c92cc90425d123 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 15 Oct 2013 17:52:02 +0200
Subject: [PATCH 5261/5331] Get rid of <nixpkgs>

---
 nixos/modules/installer/cd-dvd/channel.nix | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/nixos/modules/installer/cd-dvd/channel.nix b/nixos/modules/installer/cd-dvd/channel.nix
index 987b85d6165..c6e0f1577bb 100644
--- a/nixos/modules/installer/cd-dvd/channel.nix
+++ b/nixos/modules/installer/cd-dvd/channel.nix
@@ -14,10 +14,7 @@ let
     { expr = builtins.readFile ../../../lib/channel-expr.nix; }
     ''
       mkdir -p $out/nixos
-      # FIXME: should use ../../../.. instead of <nixpkgs>, but that
-      # doesn't work properly if <nixos> is a symlink to
-      # nixpkgs/nixos.
-      cp -prd ${<nixpkgs>} $out/nixos/nixpkgs
+      cp -prd ${pkgs.path} $out/nixos/nixpkgs
       ln -s nixpkgs/nixos $out/nixos/nixos
       chmod -R u+w $out/nixos
       rm -rf $out/nixos/nixpkgs/.git
-- 
GitLab


From b5c1d1873a02f8f859e3da280362b176f665f5e2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Tue, 15 Oct 2013 22:35:53 +0200
Subject: [PATCH 5262/5331] skype: add workaround for pulseaudio glitches

See http://arunraghavan.net/2013/08/pulseaudio-4-0-and-skype/

Relevant bug reports:
  https://github.com/NixOS/nixpkgs/issues/788
  https://bugs.archlinux.org/task/35690
  https://bugs.freedesktop.org/show_bug.cgi?id=50510

We don't want to disable pulseaudio timer-based scheduling (tsched=0)
because that affects everyone. It seems this is the proper distro fix
for skype + pulseaudio at the moment.
---
 .../applications/networking/instant-messengers/skype/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/applications/networking/instant-messengers/skype/default.nix b/pkgs/applications/networking/instant-messengers/skype/default.nix
index aa90c8e7026..ebd84ff47b8 100644
--- a/pkgs/applications/networking/instant-messengers/skype/default.nix
+++ b/pkgs/applications/networking/instant-messengers/skype/default.nix
@@ -48,6 +48,7 @@ stdenv.mkDerivation rec {
 
     cat > $out/bin/skype << EOF
     #!${stdenv.shell}
+    export PULSE_LATENCY_MSEC=60  # workaround for pulseaudio glitches
     export LD_LIBRARY_PATH=$fullPath:$LD_LIBRARY_PATH
     $dynlinker $out/libexec/skype/skype --resources=$out/libexec/skype "\$@"
     EOF
-- 
GitLab


From 7c7bfa817a046e89e6cd73c0db7314fec4a8ff2b Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 15 Oct 2013 18:36:45 +0200
Subject: [PATCH 5263/5331] fail2ban: Update to 0.8.10

Also fix random start failures due to a race between the fail2ban
server and the postStart script.
---
 nixos/modules/services/security/fail2ban.nix | 56 ++++++++++----------
 pkgs/tools/security/fail2ban/default.nix     |  9 ++--
 2 files changed, 32 insertions(+), 33 deletions(-)

diff --git a/nixos/modules/services/security/fail2ban.nix b/nixos/modules/services/security/fail2ban.nix
index 2b2a54ef409..395a5df8af0 100644
--- a/nixos/modules/services/security/fail2ban.nix
+++ b/nixos/modules/services/security/fail2ban.nix
@@ -10,7 +10,7 @@ let
 
   jailConf = pkgs.writeText "jail.conf"
     (concatStringsSep "\n" (attrValues (flip mapAttrs cfg.jails (name: def:
-      optionalString (def != "") 
+      optionalString (def != "")
         ''
           [${name}]
           ${def}
@@ -32,7 +32,8 @@ in
             [Definition]
             loglevel  = 3
             logtarget = SYSLOG
-            socket    = /var/run/fail2ban/fail2ban.sock
+            socket    = /run/fail2ban/fail2ban.sock
+            pidfile   = /run/fail2ban/fail2ban.pid
           '';
         type = types.string;
         description =
@@ -71,56 +72,53 @@ in
             <filename>/etc/fail2ban/filter.d</filename>.
           '';
       };
-      
+
     };
 
   };
 
-  
+
   ###### implementation
 
   config = {
 
     environment.systemPackages = [ pkgs.fail2ban ];
 
-    environment.etc =
-      [ { source = fail2banConf;
-          target = "fail2ban/fail2ban.conf";
-        }
-        { source = jailConf;
-          target = "fail2ban/jail.conf";
-        }
-        { source = "${pkgs.fail2ban}/etc/fail2ban/action.d/*.conf";
-          target = "fail2ban/action.d";
-        }
-        { source = "${pkgs.fail2ban}/etc/fail2ban/filter.d/*.conf";
-          target = "fail2ban/filter.d";
-        }
-      ];
-
-    system.activationScripts.fail2ban =
-      ''
-        mkdir -p /var/run/fail2ban -m 0755
-      '';
+    environment.etc."fail2ban/fail2ban.conf".source = fail2banConf;
+    environment.etc."fail2ban/jail.conf".source = jailConf;
+    environment.etc."fail2ban/action.d".source = "${pkgs.fail2ban}/etc/fail2ban/action.d/*.conf";
+    environment.etc."fail2ban/filter.d".source = "${pkgs.fail2ban}/etc/fail2ban/filter.d/*.conf";
 
     systemd.services.fail2ban =
       { description = "Fail2ban intrusion prevention system";
 
         wantedBy = [ "multi-user.target" ];
         after = [ "network.target" ];
-      
+
         restartTriggers = [ fail2banConf jailConf ];
         path = [ pkgs.fail2ban pkgs.iptables ];
-        
+
+        preStart =
+          ''
+            mkdir -p /run/fail2ban -m 0755
+          '';
+
         serviceConfig =
           { ExecStart = "${pkgs.fail2ban}/bin/fail2ban-server -f";
             ReadOnlyDirectories = "/";
-            ReadWriteDirectories = "/var/run/fail2ban /var/tmp";
-            CapabilityBoundingSet="CAP_DAC_READ_SEARCH CAP_NET_ADMIN CAP_NET_RAW";
+            ReadWriteDirectories = "/run/fail2ban /var/tmp";
+            CapabilityBoundingSet = "CAP_DAC_READ_SEARCH CAP_NET_ADMIN CAP_NET_RAW";
           };
 
         postStart =
           ''
+            # Wait for the server to start listening.
+            for ((n = 0; n < 20; n++)); do
+              if fail2ban-client ping; then break; fi
+              sleep 0.5
+            done
+
+            # Reload its configuration.
             fail2ban-client reload
           '';
       };
@@ -137,14 +135,14 @@ in
       '';
 
     # Block SSH if there are too many failing connection attempts.
-    services.fail2ban.jails."ssh-iptables" =
+    services.fail2ban.jails.ssh-iptables =
       ''
         filter   = sshd
         action   = iptables[name=SSH, port=ssh, protocol=tcp]
         logpath  = /var/log/warn
         maxretry = 5
       '';
-    
+
   };
 
 }
diff --git a/pkgs/tools/security/fail2ban/default.nix b/pkgs/tools/security/fail2ban/default.nix
index dd869714e05..1a443fc18b6 100644
--- a/pkgs/tools/security/fail2ban/default.nix
+++ b/pkgs/tools/security/fail2ban/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl, pythonPackages, unzip, gamin }:
 
-let version = "0.8.6"; in
+let version = "0.8.10"; in
 
 pythonPackages.buildPythonPackage {
   name = "fail2ban-${version}";
@@ -9,7 +9,7 @@ pythonPackages.buildPythonPackage {
   src = fetchurl {
     url    = "https://github.com/fail2ban/fail2ban/zipball/${version}";
     name   = "fail2ban-${version}.zip";
-    sha256 = "0lbanfshr8kasa1bb7861w3mrm2d0c1bvv4s5703265s8zp5m284";
+    sha256 = "0zbjwnghpdnzan7hn40cjjh2r06p2ph5kblpm0w1r72djwsk67x9";
   };
 
   buildInputs = [ unzip ];
@@ -21,6 +21,7 @@ pythonPackages.buildPythonPackage {
       --replace /usr $out
 
     substituteInPlace setup.py \
+      --replace /usr $out \
       --replace /etc $out/etc \
       --replace /var $TMPDIR/var \
 
@@ -28,7 +29,7 @@ pythonPackages.buildPythonPackage {
       substituteInPlace $i \
         --replace /usr/share/fail2ban $out/share/fail2ban
     done
-    
+
     for i in config/action.d/sendmail*.conf; do
       substituteInPlace $i \
         --replace /usr/sbin/sendmail sendmail \
@@ -37,7 +38,7 @@ pythonPackages.buildPythonPackage {
   '';
 
   doCheck = false;
-  
+
   installCommand = ''
     python setup.py install --prefix=$out
   '';
-- 
GitLab


From 16cd8b039b4ce9d84837861daa1f275e6814d5ed Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 16 Oct 2013 10:53:23 +0200
Subject: [PATCH 5264/5331] Remove nix.manualNixMachines

Suggested by Marc Weber.  Fixes #1059.

Generate /etc/nix.machines only if buildMachines is not empty.  Thus,
if you want to manage /etc/nix.machines in some other way, you can set
nix.distributedBuilds to true but not set nix.buildMachines.
---
 nixos/modules/services/misc/nix-daemon.nix | 25 ++++++----------------
 1 file changed, 6 insertions(+), 19 deletions(-)

diff --git a/nixos/modules/services/misc/nix-daemon.nix b/nixos/modules/services/misc/nix-daemon.nix
index adf4f145f25..f85a46fa60d 100644
--- a/nixos/modules/services/misc/nix-daemon.nix
+++ b/nixos/modules/services/misc/nix-daemon.nix
@@ -108,24 +108,10 @@ in
 
       distributedBuilds = mkOption {
         default = false;
-        description = "
+        description = ''
           Whether to distribute builds to the machines listed in
           <option>nix.buildMachines</option>.
-          If you know that the <option>buildMachines</option> are not
-          always available either use nixos
-          <command>nixos-rebuild --no-build-hook</command>
-          or consider managing <filename>/etc/nix.machines</filename> manually
-          by setting <option>manualNixMachines</option>. Then you can comment
-          unavailable build machines.
-        ";
-      };
-
-      manualNixMachines = mkOption {
-        default = false;
-        description = "
-          Whether to manually manage the list of build machines used in distributed
-          builds in /etc/nix.machines.
-        ";
+        '';
       };
 
       daemonNiceLevel = mkOption {
@@ -145,6 +131,7 @@ in
       };
 
       buildMachines = mkOption {
+        default = [];
         example = [
           { hostName = "voila.labs.cs.uu.nl";
             sshUser = "nix";
@@ -161,7 +148,7 @@ in
             mandatoryFeatures = "perf";
           }
         ];
-        description = "
+        description = ''
           This option lists the machines to be used if distributed
           builds are enabled (see
           <option>nix.distributedBuilds</option>).  Nix will perform
@@ -185,7 +172,7 @@ in
           key should be added to
           <filename>~<replaceable>sshUser</replaceable>/authorized_keys</filename>
           on the remote machine.
-        ";
+        '';
       };
 
       proxy = mkOption {
@@ -263,7 +250,7 @@ in
     # List of machines for distributed Nix builds in the format
     # expected by build-remote.pl.
     environment.etc."nix.machines" =
-      { enable = cfg.distributedBuilds && !cfg.manualNixMachines;
+      { enable = cfg.buildMachines != [];
         text =
           concatMapStrings (machine:
             "${machine.sshUser}@${machine.hostName} "
-- 
GitLab


From e0db0aaa4d4a9169b5e1f4d1d6e23d6dffc5d0ab Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 16 Oct 2013 10:57:25 +0200
Subject: [PATCH 5265/5331] Rename /etc/nix.machines to /etc/nix/machines

Since we have a /etc/nix directory, we should use it and not pollute
/etc.
---
 nixos/modules/services/misc/nix-daemon.nix | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/nixos/modules/services/misc/nix-daemon.nix b/nixos/modules/services/misc/nix-daemon.nix
index f85a46fa60d..ff0bdf65ced 100644
--- a/nixos/modules/services/misc/nix-daemon.nix
+++ b/nixos/modules/services/misc/nix-daemon.nix
@@ -249,7 +249,7 @@ in
 
     # List of machines for distributed Nix builds in the format
     # expected by build-remote.pl.
-    environment.etc."nix.machines" =
+    environment.etc."nix/machines" =
       { enable = cfg.buildMachines != [];
         text =
           concatMapStrings (machine:
@@ -294,17 +294,17 @@ in
     nix.envVars =
       { NIX_CONF_DIR = "/etc/nix";
 
-        # Enable the copy-from-other-stores substituter, which allows builds
-        # to be sped up by copying build results from remote Nix stores.  To
-        # do this, mount the remote file system on a subdirectory of
-        # /var/run/nix/remote-stores.
-        NIX_OTHER_STORES = "/var/run/nix/remote-stores/*/nix";
+        # Enable the copy-from-other-stores substituter, which allows
+        # builds to be sped up by copying build results from remote
+        # Nix stores.  To do this, mount the remote file system on a
+        # subdirectory of /run/nix/remote-stores.
+        NIX_OTHER_STORES = "/run/nix/remote-stores/*/nix";
       }
 
       // optionalAttrs cfg.distributedBuilds {
         NIX_BUILD_HOOK = "${config.environment.nix}/libexec/nix/build-remote.pl";
-        NIX_REMOTE_SYSTEMS = "/etc/nix.machines";
-        NIX_CURRENT_LOAD = "/var/run/nix/current-load";
+        NIX_REMOTE_SYSTEMS = "/etc/nix/machines";
+        NIX_CURRENT_LOAD = "/run/nix/current-load";
       }
 
       # !!! These should not be defined here, but in some general proxy configuration module!
-- 
GitLab


From 6dafee8d6704957e123de1b51d3e406848f4aac8 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 16 Oct 2013 11:36:09 +0200
Subject: [PATCH 5266/5331] Fix runInMachine

It requires a writable /nix/store to store the build result.  Also,
wait until we've reached multi-user.target before doing the build, and
do a sync at the end to ensure all data to $out is properly written.

http://hydra.nixos.org/build/6496716
---
 nixos/lib/testing.nix                    | 7 ++++++-
 nixos/modules/virtualisation/qemu-vm.nix | 3 +--
 nixos/tests/run-in-machine.nix           | 6 ++----
 3 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/nixos/lib/testing.nix b/nixos/lib/testing.nix
index 7be0903ed3a..3407229e921 100644
--- a/nixos/lib/testing.nix
+++ b/nixos/lib/testing.nix
@@ -176,7 +176,10 @@ rec {
     let
       vm = buildVM { }
         [ machine
-          { key = "hostname"; networking.hostName = "client"; }
+          { key = "run-in-machine";
+            networking.hostName = "client";
+            nix.readOnlyStore = false;
+          }
         ];
 
       buildrunner = writeText "vm-build" ''
@@ -192,9 +195,11 @@ rec {
 
       testscript = ''
         startAll;
+        $client->waitForUnit("multi-user.target");
         ${preBuild}
         $client->succeed("env -i ${pkgs.bash}/bin/bash ${buildrunner} /tmp/xchg/saved-env >&2");
         ${postBuild}
+        $client->succeed("sync"); # flush all data before pulling the plug
       '';
 
       vmRunCommand = writeText "vm-run" ''
diff --git a/nixos/modules/virtualisation/qemu-vm.nix b/nixos/modules/virtualisation/qemu-vm.nix
index 5b521a45547..708b462e0e5 100644
--- a/nixos/modules/virtualisation/qemu-vm.nix
+++ b/nixos/modules/virtualisation/qemu-vm.nix
@@ -295,7 +295,7 @@ in
 
     boot.initrd.postMountCommands =
       ''
-        # Mark this as a NixOS machinex.
+        # Mark this as a NixOS machine.
         mkdir -p $targetRoot/etc
         echo -n > $targetRoot/etc/NIXOS
 
@@ -303,7 +303,6 @@ in
         chmod 1777 $targetRoot/tmp
 
         mkdir -p $targetRoot/boot
-        mount -o remount,ro $targetRoot/nix/store
         ${optionalString cfg.writableStore ''
           mkdir -p /unionfs-chroot/ro-store
           mount --rbind $targetRoot/nix/store /unionfs-chroot/ro-store
diff --git a/nixos/tests/run-in-machine.nix b/nixos/tests/run-in-machine.nix
index 75bd161ec9e..8efe26c1708 100644
--- a/nixos/tests/run-in-machine.nix
+++ b/nixos/tests/run-in-machine.nix
@@ -1,10 +1,8 @@
-{ nixpkgs ? <nixpkgs>
-, system ? builtins.currentSystem
-}:
+{ system ? builtins.currentSystem }:
 
 with import ../lib/testing.nix { inherit system; };
 
 runInMachine {
-  drv = (import nixpkgs { inherit system; }).aterm;
+  drv = pkgs.patchelf;
   machine = { config, pkgs, ... }: { services.sshd.enable = true; };
 }
-- 
GitLab


From ee72a0c3864e8fbb4e8a01863f28409d3aa23e44 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 16 Oct 2013 11:49:10 +0200
Subject: [PATCH 5267/5331] Disable the trac test

It's been failing since forever.
---
 nixos/tests/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/tests/default.nix b/nixos/tests/default.nix
index 17fe6a6d045..dc608b12d99 100644
--- a/nixos/tests/default.nix
+++ b/nixos/tests/default.nix
@@ -32,6 +32,6 @@ with import ../lib/testing.nix { inherit system minimal; };
   simple = makeTest (import ./simple.nix);
   #subversion = makeTest (import ./subversion.nix);
   tomcat = makeTest (import ./tomcat.nix);
-  trac = makeTest (import ./trac.nix);
+  #trac = makeTest (import ./trac.nix);
   xfce = makeTest (import ./xfce.nix);
 }
-- 
GitLab


From aeb3169b714fbf777a3c9057ed4556e46f714fd1 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 16 Oct 2013 11:58:08 +0200
Subject: [PATCH 5268/5331] xorg-server: Fix a 20 year old security bug

CVE-2013-4396
---
 pkgs/servers/x11/xorg/overrides.nix           |  6 +-
 .../x11/xorg/xorgserver-cve-2013-4396.patch   | 75 +++++++++++++++++++
 2 files changed, 80 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/servers/x11/xorg/xorgserver-cve-2013-4396.patch

diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix
index 7286f71a8dc..fb8b5856ecb 100644
--- a/pkgs/servers/x11/xorg/overrides.nix
+++ b/pkgs/servers/x11/xorg/overrides.nix
@@ -185,7 +185,11 @@ in
       "--with-default-font-path= "  # there were only paths containing "${prefix}",
                                     # and there are no fonts in this package anyway
     ];
-    patches = [./xorgserver-dri-path.patch ./xorgserver-xkbcomp-path.patch];
+    patches =
+      [ ./xorgserver-dri-path.patch
+        ./xorgserver-xkbcomp-path.patch
+        ./xorgserver-cve-2013-4396.patch
+      ];
     buildInputs = attrs.buildInputs ++ [ xtrans ];
     propagatedBuildInputs =
       [ args.zlib args.udev args.mesa args.dbus.libs
diff --git a/pkgs/servers/x11/xorg/xorgserver-cve-2013-4396.patch b/pkgs/servers/x11/xorg/xorgserver-cve-2013-4396.patch
new file mode 100644
index 00000000000..4b6727e61c0
--- /dev/null
+++ b/pkgs/servers/x11/xorg/xorgserver-cve-2013-4396.patch
@@ -0,0 +1,75 @@
+From 7bddc2ba16a2a15773c2ea8947059afa27727764 Mon Sep 17 00:00:00 2001
+From: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date: Mon, 16 Sep 2013 21:47:16 -0700
+Subject: [PATCH] Avoid use-after-free in dix/dixfonts.c: doImageText()
+ [CVE-2013-4396]
+
+Save a pointer to the passed in closure structure before copying it
+and overwriting the *c pointer to point to our copy instead of the
+original.  If we hit an error, once we free(c), reset c to point to
+the original structure before jumping to the cleanup code that
+references *c.
+
+Since one of the errors being checked for is whether the server was
+able to malloc(c->nChars * itemSize), the client can potentially pass
+a number of characters chosen to cause the malloc to fail and the
+error path to be taken, resulting in the read from freed memory.
+
+Since the memory is accessed almost immediately afterwards, and the
+X server is mostly single threaded, the odds of the free memory having
+invalid contents are low with most malloc implementations when not using
+memory debugging features, but some allocators will definitely overwrite
+the memory there, leading to a likely crash.
+
+Reported-by: Pedro Ribeiro <pedrib@gmail.com>
+Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+Reviewed-by: Julien Cristau <jcristau@debian.org>
+---
+ dix/dixfonts.c |    5 +++++
+ 1 file changed, 5 insertions(+)
+
+diff --git a/dix/dixfonts.c b/dix/dixfonts.c
+index feb765d..2e34d37 100644
+--- a/dix/dixfonts.c
++++ b/dix/dixfonts.c
+@@ -1425,6 +1425,7 @@ doImageText(ClientPtr client, ITclosurePtr c)
+             GC *pGC;
+             unsigned char *data;
+             ITclosurePtr new_closure;
++            ITclosurePtr old_closure;
+ 
+             /* We're putting the client to sleep.  We need to
+                save some state.  Similar problem to that handled
+@@ -1436,12 +1437,14 @@ doImageText(ClientPtr client, ITclosurePtr c)
+                 err = BadAlloc;
+                 goto bail;
+             }
++            old_closure = c;
+             *new_closure = *c;
+             c = new_closure;
+ 
+             data = malloc(c->nChars * itemSize);
+             if (!data) {
+                 free(c);
++                c = old_closure;
+                 err = BadAlloc;
+                 goto bail;
+             }
+@@ -1452,6 +1455,7 @@ doImageText(ClientPtr client, ITclosurePtr c)
+             if (!pGC) {
+                 free(c->data);
+                 free(c);
++                c = old_closure;
+                 err = BadAlloc;
+                 goto bail;
+             }
+@@ -1464,6 +1468,7 @@ doImageText(ClientPtr client, ITclosurePtr c)
+                 FreeScratchGC(pGC);
+                 free(c->data);
+                 free(c);
++                c = old_closure;
+                 err = BadAlloc;
+                 goto bail;
+             }
+-- 
+1.7.9.2
-- 
GitLab


From 756ca94e0c37ed30609243e682b535a2bc040bf1 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 16 Oct 2013 12:16:34 +0200
Subject: [PATCH 5269/5331] Really fix the EFI installer test

http://hydra.nixos.org/build/6497361
---
 nixos/tests/efi-installer.nix | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/nixos/tests/efi-installer.nix b/nixos/tests/efi-installer.nix
index e16c402e7f7..8a05dbf2a61 100644
--- a/nixos/tests/efi-installer.nix
+++ b/nixos/tests/efi-installer.nix
@@ -68,14 +68,13 @@ in {
       $machine->succeed("echo hello");
       $machine->waitForUnit("rogue");
       $machine->waitForUnit("nixos-manual");
-      $machine->waitForUnit("dhcpcd");
 
       # Partition the disk.
       $machine->succeed(
-          "sgdisk -Z /dev/vda",
-          "sgdisk -n 1:0:+256M -N 2 -t 1:ef00 -t 2:8300 -c 1:boot -c 2:root /dev/vda",
-          "mkfs.vfat -n BOOT /dev/vda1",
-          "mkfs.ext3 -L nixos /dev/vda2",
+          "sgdisk -Z /dev/sda",
+          "sgdisk -n 1:0:+256M -N 2 -t 1:ef00 -t 2:8300 -c 1:boot -c 2:root /dev/sda",
+          "mkfs.vfat -n BOOT /dev/sda1",
+          "mkfs.ext3 -L nixos /dev/sda2",
           "mount LABEL=nixos /mnt",
           "mkdir /mnt/boot",
           "mount LABEL=BOOT /mnt/boot",
-- 
GitLab


From b3debdc0468bed5753e52e831c44e3fdb4f0c83c Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 16 Oct 2013 12:47:11 +0200
Subject: [PATCH 5270/5331] Fix test evaluation

---
 nixos/release.nix       | 3 ---
 nixos/tests/default.nix | 1 +
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/nixos/release.nix b/nixos/release.nix
index 094eacf7059..e19403eccb6 100644
--- a/nixos/release.nix
+++ b/nixos/release.nix
@@ -224,7 +224,4 @@ in {
         mapAttrsRecursiveCond (x: !x ? test) (n: v: listToAttrs [(nameValuePair system v.test)])
           (import ./tests { inherit nixpkgs system; });
     in fold recursiveUpdate {} (map testsFor systems);
-    
-    
-  run-in-machine-tests = pkgs.lib.genAttrs systems (system: import ./tests/run-in-machine.nix { inherit nixpkgs system; });
 }
diff --git a/nixos/tests/default.nix b/nixos/tests/default.nix
index dc608b12d99..16d45126de1 100644
--- a/nixos/tests/default.nix
+++ b/nixos/tests/default.nix
@@ -34,4 +34,5 @@ with import ../lib/testing.nix { inherit system minimal; };
   tomcat = makeTest (import ./tomcat.nix);
   #trac = makeTest (import ./trac.nix);
   xfce = makeTest (import ./xfce.nix);
+  runInMachine.test = import ./run-in-machine.nix { inherit system; };
 }
-- 
GitLab


From a9c65b31b9cdc20ad65c52ee357dbe7125a6ca56 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Wed, 16 Oct 2013 10:38:20 -0400
Subject: [PATCH 5271/5331] Add gurobi package

Signed-off-by: Shea Levy <shea@shealevy.com>
---
 pkgs/development/libraries/gurobi/default.nix | 25 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 27 insertions(+)
 create mode 100644 pkgs/development/libraries/gurobi/default.nix

diff --git a/pkgs/development/libraries/gurobi/default.nix b/pkgs/development/libraries/gurobi/default.nix
new file mode 100644
index 00000000000..4bdee56ae99
--- /dev/null
+++ b/pkgs/development/libraries/gurobi/default.nix
@@ -0,0 +1,25 @@
+{ stdenv, requireFile }:
+
+stdenv.mkDerivation {
+  name = "gurobi-5.6.0";
+
+  src = requireFile {
+    name = "gurobi5.6.0_linux64.tar.gz";
+    sha256 = "1qwfjyx5y71x97gkndqnl9h4xc8hl48zwcwss7jagqfj3gxwvnky";
+    url = "http://www.gurobi.com/download/gurobi-optimizer";
+  };
+
+  installPhase = "mv linux64 $out";
+
+  fixupPhase = ''
+    interp=`cat $NIX_GCC/nix-support/dynamic-linker`
+    find $out/bin -type f -executable -exec patchelf --interpreter "$interp" --set-rpath $out/lib {} \;
+  '';
+
+  meta = {
+    description = "State-of-the-art mathematical programming solver";
+    homepage = http://www.gurobi.com/;
+    license = "unfree";
+    maintainers = [ stdenv.lib.maintainers.shlevy ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ad50f491454..c6ce6f7efe6 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4437,6 +4437,8 @@ let
 
   gts = callPackage ../development/libraries/gts { };
 
+  gurobi = callPackage ../development/libraries/gurobi {};
+
   gvfs = callPackage ../development/libraries/gvfs { };
 
   gwenhywfar = callPackage ../development/libraries/gwenhywfar { };
-- 
GitLab


From a5a13c4e437a1c4415741b0c8fb71b85952b33f1 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Wed, 16 Oct 2013 10:58:32 -0400
Subject: [PATCH 5272/5331] Add gurobi token server service

Not yet tested, I don't have a license yet

Signed-off-by: Shea Levy <shea@shealevy.com>
---
 nixos/modules/module-list.nix          |  1 +
 nixos/modules/services/misc/gurobi.nix | 41 ++++++++++++++++++++++++++
 2 files changed, 42 insertions(+)
 create mode 100644 nixos/modules/services/misc/gurobi.nix

diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index b835907c82f..21596ce2269 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -35,6 +35,7 @@
   ./misc/assertions.nix
   ./misc/check-config.nix
   ./misc/crashdump.nix
+  ./misc/gurobi.nix
   ./misc/ids.nix
   ./misc/lib.nix
   ./misc/locate.nix
diff --git a/nixos/modules/services/misc/gurobi.nix b/nixos/modules/services/misc/gurobi.nix
new file mode 100644
index 00000000000..9cd76a1e78f
--- /dev/null
+++ b/nixos/modules/services/misc/gurobi.nix
@@ -0,0 +1,41 @@
+{ config, pkgs, ... }:
+
+with pkgs.lib;
+
+let
+  cfg = config.services.gurobi.tokenServer;
+in {
+  options = {
+    services.gurobi.tokenServer = {
+      enable = mkOption {
+        default = false;
+
+        description = "Whether to enable the Gurobi token server";
+
+        type = types.bool;
+      };
+
+      license = mkOption {
+        description = "Path to the Gurobi license file";
+
+        type = types.path;
+      };
+    };
+  };
+
+  config = mkIf cfg.enable {
+    systemd.services.gurobi-token-server = {
+      description = "Gurobi token server";
+
+      wantedBy = [ "multi-user.target" ];
+
+      environment.GRB_LICENSE_FILE = cfg.license;
+
+      serviceConfig = {
+        ExecStart = "${pkgs.gurobi}/bin/grb_ts";
+
+        Type = "forking";
+      };
+    };
+  };
+}
-- 
GitLab


From 715bee3a0a4aae345e5e12dc02c307b26297a658 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Wed, 16 Oct 2013 11:23:58 -0400
Subject: [PATCH 5273/5331] Add gurobi client module

Not yet tested, no license yet

Signed-off-by: Shea Levy <shea@shealevy.com>
---
 nixos/modules/module-list.nix     |  1 +
 nixos/modules/programs/gurobi.nix | 41 +++++++++++++++++++++++++++++++
 2 files changed, 42 insertions(+)
 create mode 100644 nixos/modules/programs/gurobi.nix

diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index 21596ce2269..ff272ffea9b 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -47,6 +47,7 @@
   ./programs/bash/command-not-found.nix
   ./programs/blcr.nix
   ./programs/environment.nix
+  ./programs/gurobi.nix
   ./programs/info.nix
   ./programs/shadow.nix
   ./programs/shell.nix
diff --git a/nixos/modules/programs/gurobi.nix b/nixos/modules/programs/gurobi.nix
new file mode 100644
index 00000000000..038ead44b4c
--- /dev/null
+++ b/nixos/modules/programs/gurobi.nix
@@ -0,0 +1,41 @@
+{ config, pkgs, ... }:
+
+with pkgs.lib;
+
+let
+  cfg = config.programs.gurobi;
+in {
+  options = {
+    programs.gurobi = {
+      license = mkOption {
+        default = null;
+
+        description = "Path to the Gurobi license file if not using a token server";
+
+        type = types.nullOr types.path;
+      };
+
+      tokenServerAddress = mkOption {
+        default = null;
+
+        description = "Address of the token server";
+
+        type = types.nullOr types.string;
+      };
+    };
+
+    config = mkIf (cfg.license != null || cfg.tokenServerAddress != null) {
+      assertions = [ {
+        assertion = cfg.license == null || cfg.tokenServerAddress == null;
+        message = "Please only set one of a gurobi license file and a gurobi token server address";
+      } ];
+
+      environment.variables.GRB_LICENSE_FILE = if cfg.license != null
+        then cfg.license
+        else pkgs.writeTextFile {
+          name = "gurobi-generated-license";
+          text = "TOKENSERVER=${cfg.tokenServerAddress}";
+        };
+    };
+  };
+}
-- 
GitLab


From 6171f13ed573183516fa3a86ca44e0334501b037 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Wed, 16 Oct 2013 11:26:39 -0400
Subject: [PATCH 5274/5331] Add gurobi to the system packages if the
 configuration specifies a license

Signed-off-by: Shea Levy <shea@shealevy.com>
---
 nixos/modules/programs/gurobi.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/nixos/modules/programs/gurobi.nix b/nixos/modules/programs/gurobi.nix
index 038ead44b4c..4c673a96db0 100644
--- a/nixos/modules/programs/gurobi.nix
+++ b/nixos/modules/programs/gurobi.nix
@@ -36,6 +36,8 @@ in {
           name = "gurobi-generated-license";
           text = "TOKENSERVER=${cfg.tokenServerAddress}";
         };
+
+      environment.systemPackages = [ pkgs.gurobi ];
     };
   };
 }
-- 
GitLab


From 418fa3bb330af527e0d48e3f597a296a7d42c461 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Wed, 16 Oct 2013 16:01:27 -0400
Subject: [PATCH 5275/5331] D'oh

Signed-off-by: Shea Levy <shea@shealevy.com>
---
 nixos/modules/module-list.nix     |  2 +-
 nixos/modules/programs/gurobi.nix | 28 ++++++++++++++--------------
 2 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index ff272ffea9b..a2e1abf036b 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -35,7 +35,6 @@
   ./misc/assertions.nix
   ./misc/check-config.nix
   ./misc/crashdump.nix
-  ./misc/gurobi.nix
   ./misc/ids.nix
   ./misc/lib.nix
   ./misc/locate.nix
@@ -120,6 +119,7 @@
   ./services/misc/felix.nix
   ./services/misc/folding-at-home.nix
   ./services/misc/gpsd.nix
+  ./services/misc/gurobi.nix
   ./services/misc/nix-daemon.nix
   ./services/misc/nix-gc.nix
   ./services/misc/nixos-manual.nix
diff --git a/nixos/modules/programs/gurobi.nix b/nixos/modules/programs/gurobi.nix
index 4c673a96db0..7fa099b0884 100644
--- a/nixos/modules/programs/gurobi.nix
+++ b/nixos/modules/programs/gurobi.nix
@@ -23,21 +23,21 @@ in {
         type = types.nullOr types.string;
       };
     };
+  };
 
-    config = mkIf (cfg.license != null || cfg.tokenServerAddress != null) {
-      assertions = [ {
-        assertion = cfg.license == null || cfg.tokenServerAddress == null;
-        message = "Please only set one of a gurobi license file and a gurobi token server address";
-      } ];
-
-      environment.variables.GRB_LICENSE_FILE = if cfg.license != null
-        then cfg.license
-        else pkgs.writeTextFile {
-          name = "gurobi-generated-license";
-          text = "TOKENSERVER=${cfg.tokenServerAddress}";
-        };
+  config = mkIf (cfg.license != null || cfg.tokenServerAddress != null) {
+    assertions = [ {
+      assertion = cfg.license == null || cfg.tokenServerAddress == null;
+      message = "Please only set one of a gurobi license file and a gurobi token server address";
+    } ];
+
+    environment.variables.GRB_LICENSE_FILE = if cfg.license != null
+      then cfg.license
+      else pkgs.writeTextFile {
+        name = "gurobi-generated-license";
+        text = "TOKENSERVER=${cfg.tokenServerAddress}";
+      };
 
-      environment.systemPackages = [ pkgs.gurobi ];
-    };
+    environment.systemPackages = [ pkgs.gurobi ];
   };
 }
-- 
GitLab


From 84d4358635031c4e86a30f71b5ccd37462a94821 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 16 Oct 2013 23:05:42 +0200
Subject: [PATCH 5276/5331] Fix compatibility with Nix < 1.6

Nix 1.6 (accidentally) changed the semantics of strings like
"${path}/bla", so this happened to work on 1.6 but not before.
---
 nixos/modules/misc/version.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/misc/version.nix b/nixos/modules/misc/version.nix
index e9ee476d36a..1b519d3e6ee 100644
--- a/nixos/modules/misc/version.nix
+++ b/nixos/modules/misc/version.nix
@@ -26,10 +26,10 @@ with pkgs.lib;
   config = {
 
     system.nixosVersion =
-      mkDefault (builtins.readFile "${pkgs.path}/.version" + config.system.nixosVersionSuffix);
+      mkDefault (builtins.readFile "${toString pkgs.path}/.version" + config.system.nixosVersionSuffix);
 
     system.nixosVersionSuffix =
-      let suffixFile = "${pkgs.path}/.version-suffix"; in
+      let suffixFile = "${toString pkgs.path}/.version-suffix"; in
       mkDefault (if builtins.pathExists suffixFile then builtins.readFile suffixFile else "pre-git");
 
     # Note: code names must only increase in alphabetical order.
-- 
GitLab


From 4836a75fe0bf31dc31ff0783dd69f4ad2c6f46f2 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 17 Oct 2013 12:20:07 +0200
Subject: [PATCH 5277/5331] Make more tests release-critical

---
 nixos/release-combined.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/nixos/release-combined.nix b/nixos/release-combined.nix
index f36f3fd9aba..6866c709dd4 100644
--- a/nixos/release-combined.nix
+++ b/nixos/release-combined.nix
@@ -43,16 +43,22 @@ in rec {
         (all nixos.iso_graphical)
         (all nixos.ova)
 
+        (all nixos.tests.efi-installer.simple)
         (all nixos.tests.firefox)
         (all nixos.tests.firewall)
+        (all nixos.tests.installer.grub1)
         (all nixos.tests.installer.lvm)
         (all nixos.tests.installer.separateBoot)
         (all nixos.tests.installer.simple)
+        (all nixos.tests.ipv6)
         (all nixos.tests.kde4)
         (all nixos.tests.login)
         (all nixos.tests.misc)
+        (all nixos.tests.nat)
+        (all nixos.tests.nfs3)
         (all nixos.tests.openssh)
         (all nixos.tests.printing)
+        (all nixos.tests.proxy)
         (all nixos.tests.xfce)
 
         nixpkgs.tarball
-- 
GitLab


From 55ec87a9077575307eef9c789299cf38346bcd88 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 17 Oct 2013 13:20:50 +0200
Subject: [PATCH 5278/5331] mysql: Remove ancient, unsupported versions

---
 pkgs/servers/sql/mysql/default.nix  | 16 --------------
 pkgs/servers/sql/mysql5/default.nix | 34 -----------------------------
 pkgs/top-level/all-packages.nix     | 10 ---------
 3 files changed, 60 deletions(-)
 delete mode 100644 pkgs/servers/sql/mysql/default.nix
 delete mode 100644 pkgs/servers/sql/mysql5/default.nix

diff --git a/pkgs/servers/sql/mysql/default.nix b/pkgs/servers/sql/mysql/default.nix
deleted file mode 100644
index 3a13aa323a1..00000000000
--- a/pkgs/servers/sql/mysql/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-{stdenv, fetchurl, ps, ncurses, zlib ? null, perl}:
-
-# Note: zlib is not required; MySQL can use an internal zlib.
-
-stdenv.mkDerivation {
-  name = "mysql-4.1.18";
-
-  src = fetchurl {
-    url = http://downloads.mysql.com/archives/mysql-4.1/mysql-4.1.18.tar.gz;
-    md5 = "a2db4edb3e1e3b8e0f8c2242225ea513";
-  };
-
-  buildInputs = [ps ncurses zlib perl];
-
-  configureFlags = "--enable-thread-safe-client";
-}
diff --git a/pkgs/servers/sql/mysql5/default.nix b/pkgs/servers/sql/mysql5/default.nix
deleted file mode 100644
index 908ae3fc70c..00000000000
--- a/pkgs/servers/sql/mysql5/default.nix
+++ /dev/null
@@ -1,34 +0,0 @@
-{stdenv, fetchurl, ps, ncurses, zlib, perl, openssl}:
-
-# Note: zlib is not required; MySQL can use an internal zlib.
-
-stdenv.mkDerivation {
-  name = "mysql-5.0.77";
-
-  src = fetchurl {
-    url = http://downloads.mysql.com/archives/mysql-5.0/mysql-5.0.77.tar.gz;
-    sha256 = "1s0m991aynim8ny28cfwhjw0ly8j5d72xi00461w6yc2hlaijcd9";
-  };
-
-  buildInputs = [ps ncurses zlib perl openssl];
-  
-  configureFlags = "--enable-thread-safe-client --with-openssl=${openssl} --with-berkeley-db --with-embedded-server" +
-    (if stdenv.system == "x86_64-linux" then " --with-lib-ccflags=-fPIC" else "");
-
-  NIX_CFLAGS_COMPILE = if stdenv.system == "x86_64-linux" then "-fPIC" else "";
-  
-  NIX_CFLAGS_CXXFLAGS = if stdenv.system == "x86_64-linux" then "-fPIC" else "";
-
-  NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isLinux "-lgcc_s";
-
-  postInstall =
-    ''
-      ln -s mysqld_safe $out/bin/mysqld
-      rm -rf $out/mysql-test $out/sql-bench $out/share/info
-    '';
-
-  meta = {
-    homepage = http://www.mysql.com/;
-    description = "The world's most popular open source database";
-  };
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c6ce6f7efe6..8b425783759 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6202,16 +6202,6 @@ let
 
   riak = callPackage ../servers/nosql/riak/1.3.1.nix { };
 
-  mysql4 = import ../servers/sql/mysql {
-    inherit fetchurl stdenv ncurses zlib perl;
-    ps = procps; /* !!! Linux only */
-  };
-
-  mysql5 = import ../servers/sql/mysql5 {
-    inherit fetchurl stdenv ncurses zlib perl openssl;
-    ps = procps; /* !!! Linux only */
-  };
-
   mysql51 = import ../servers/sql/mysql51 {
     inherit fetchurl ncurses zlib perl openssl stdenv;
     ps = procps; /* !!! Linux only */
-- 
GitLab


From bb67be7739ab93b760139c1c79f9772a55494772 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 17 Oct 2013 13:21:14 +0200
Subject: [PATCH 5279/5331] php: Update to 5.4.20

---
 pkgs/development/interpreters/php/5.4.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/interpreters/php/5.4.nix b/pkgs/development/interpreters/php/5.4.nix
index 394278dea74..eb3d796f229 100644
--- a/pkgs/development/interpreters/php/5.4.nix
+++ b/pkgs/development/interpreters/php/5.4.nix
@@ -9,7 +9,7 @@ in
 
 composableDerivation.composableDerivation {} ( fixed : let inherit (fixed.fixed) version; in {
 
-  version = "5.4.18";
+  version = "5.4.20";
 
   name = "php-${version}";
 
@@ -230,7 +230,7 @@ composableDerivation.composableDerivation {} ( fixed : let inherit (fixed.fixed)
       "http://nl1.php.net/get/php-${version}.tar.bz2/from/this/mirror"
       "http://se1.php.net/get/php-${version}.tar.bz2/from/this/mirror"
     ];
-    sha256 = "1ncizy992nfy3i3lzns7qcinj5376d840hchaqs5jlfn2nz0k50x";
+    sha256 = "1qarcxj46rzkmql3w2dln0hxzs349ph31fxcslizxch1ig7l43nd";
     name = "php-${version}.tar.bz2";
   };
 
-- 
GitLab


From fc9b53c2bc9ec6f8449614e590474a13c3e704a6 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 17 Oct 2013 13:21:58 +0200
Subject: [PATCH 5280/5331] mysql: Update to 5.5.34

CVE-2013-3839
---
 pkgs/servers/sql/mysql55/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/sql/mysql55/default.nix b/pkgs/servers/sql/mysql55/default.nix
index 898acc1ba49..bd30b7db75f 100644
--- a/pkgs/servers/sql/mysql55/default.nix
+++ b/pkgs/servers/sql/mysql55/default.nix
@@ -4,11 +4,11 @@
 
 stdenv.mkDerivation rec {
   name = "mysql-${version}";
-  version = "5.5.31";
+  version = "5.5.34";
 
   src = fetchurl {
     url = "http://cdn.mysql.com/Downloads/MySQL-5.5/${name}.tar.gz";
-    md5 = "bf402cbd52a9af33e5c25b2a4bbc56db";
+    md5 = "930970a42d51e48599deb7fe01778a4a";
   };
 
   buildInputs = [ cmake bison ncurses openssl readline zlib ]
-- 
GitLab


From 9255b5b81ccfc23571d160ed11854f2049766d66 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 17 Oct 2013 13:25:13 +0200
Subject: [PATCH 5281/5331] mysql: Move all versions into the same directory

---
 pkgs/servers/sql/{mysql51/default.nix => mysql/5.1.x.nix} | 0
 pkgs/servers/sql/{mysql55/default.nix => mysql/5.5.x.nix} | 0
 pkgs/servers/sql/{mysql51 => mysql}/abi_check.patch       | 0
 pkgs/top-level/all-packages.nix                           | 4 ++--
 4 files changed, 2 insertions(+), 2 deletions(-)
 rename pkgs/servers/sql/{mysql51/default.nix => mysql/5.1.x.nix} (100%)
 rename pkgs/servers/sql/{mysql55/default.nix => mysql/5.5.x.nix} (100%)
 rename pkgs/servers/sql/{mysql51 => mysql}/abi_check.patch (100%)

diff --git a/pkgs/servers/sql/mysql51/default.nix b/pkgs/servers/sql/mysql/5.1.x.nix
similarity index 100%
rename from pkgs/servers/sql/mysql51/default.nix
rename to pkgs/servers/sql/mysql/5.1.x.nix
diff --git a/pkgs/servers/sql/mysql55/default.nix b/pkgs/servers/sql/mysql/5.5.x.nix
similarity index 100%
rename from pkgs/servers/sql/mysql55/default.nix
rename to pkgs/servers/sql/mysql/5.5.x.nix
diff --git a/pkgs/servers/sql/mysql51/abi_check.patch b/pkgs/servers/sql/mysql/abi_check.patch
similarity index 100%
rename from pkgs/servers/sql/mysql51/abi_check.patch
rename to pkgs/servers/sql/mysql/abi_check.patch
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 8b425783759..2e559871185 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6202,12 +6202,12 @@ let
 
   riak = callPackage ../servers/nosql/riak/1.3.1.nix { };
 
-  mysql51 = import ../servers/sql/mysql51 {
+  mysql51 = import ../servers/sql/mysql/5.1.x.nix {
     inherit fetchurl ncurses zlib perl openssl stdenv;
     ps = procps; /* !!! Linux only */
   };
 
-  mysql55 = callPackage ../servers/sql/mysql55 { };
+  mysql55 = callPackage ../servers/sql/mysql/5.5.x.nix { };
 
   mysql = mysql51;
 
-- 
GitLab


From de10c1b9be3bbc6d7942a0058d062a51db1cf6fb Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 17 Oct 2013 13:25:45 +0200
Subject: [PATCH 5282/5331] mysql: Update to 5.1.72

---
 pkgs/servers/sql/mysql/5.1.x.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/sql/mysql/5.1.x.nix b/pkgs/servers/sql/mysql/5.1.x.nix
index b0f125faef7..c210c996532 100644
--- a/pkgs/servers/sql/mysql/5.1.x.nix
+++ b/pkgs/servers/sql/mysql/5.1.x.nix
@@ -3,11 +3,11 @@
 # Note: zlib is not required; MySQL can use an internal zlib.
 
 stdenv.mkDerivation rec {
-  name = "mysql-5.1.69";
+  name = "mysql-5.1.72";
 
   src = fetchurl {
     url = "http://cdn.mysql.com/Downloads/MySQL-5.1/${name}.tar.gz";
-    md5 = "06bbb6a11a2cbe042f80dbd333ff9f12";
+    md5 = "ed79cd48e3e7402143548917813cdb80";
   };
 
   buildInputs = [ncurses zlib perl openssl] ++ stdenv.lib.optional stdenv.isLinux ps;
-- 
GitLab


From 34d61c53c2c95f9c2a3bf05b3d08504ebbde642c Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 17 Oct 2013 13:29:49 +0200
Subject: [PATCH 5283/5331] postgresql: Update to latest versions

---
 pkgs/servers/sql/postgresql/8.4.x.nix | 4 ++--
 pkgs/servers/sql/postgresql/9.0.x.nix | 4 ++--
 pkgs/servers/sql/postgresql/9.1.x.nix | 4 ++--
 pkgs/servers/sql/postgresql/9.2.x.nix | 4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/pkgs/servers/sql/postgresql/8.4.x.nix b/pkgs/servers/sql/postgresql/8.4.x.nix
index c8597def61e..a99d7536a8a 100644
--- a/pkgs/servers/sql/postgresql/8.4.x.nix
+++ b/pkgs/servers/sql/postgresql/8.4.x.nix
@@ -1,13 +1,13 @@
 { stdenv, fetchurl, zlib, ncurses, readline }:
 
-let version = "8.4.17"; in
+let version = "8.4.18"; in
 
 stdenv.mkDerivation rec {
   name = "postgresql-${version}";
 
   src = fetchurl {
     url = "mirror://postgresql/source/v${version}/${name}.tar.bz2";
-    sha256 = "0dh4rn4q2amqjwmjjiya99bz1ph3lx45j5brnpwdjd9mxhs4r26w";
+    sha256 = "c08e5e93dac9d484019a07ff91db9f224350b90ef4be1543e33282cc20daf872";
   };
 
   buildInputs = [ zlib ncurses readline ];
diff --git a/pkgs/servers/sql/postgresql/9.0.x.nix b/pkgs/servers/sql/postgresql/9.0.x.nix
index ea25cf0d476..3810eeba72c 100644
--- a/pkgs/servers/sql/postgresql/9.0.x.nix
+++ b/pkgs/servers/sql/postgresql/9.0.x.nix
@@ -1,13 +1,13 @@
 { stdenv, fetchurl, zlib, readline }:
 
-let version = "9.0.13"; in
+let version = "9.0.14"; in
 
 stdenv.mkDerivation rec {
   name = "postgresql-${version}";
 
   src = fetchurl {
     url = "mirror://postgresql/source/v${version}/${name}.tar.bz2";
-    sha256 = "0xwrmwrx0pm21w3ifrqcmb8k2sa46w491ff3gqqfxynyk78a9bji";
+    sha256 = "de42b669cb891fc9b925406e71d1669ed5c856aae6d552ac6f14bf6dec0b79f1";
   };
 
   buildInputs = [ zlib readline ];
diff --git a/pkgs/servers/sql/postgresql/9.1.x.nix b/pkgs/servers/sql/postgresql/9.1.x.nix
index b9436cb4b08..65a969b4db0 100644
--- a/pkgs/servers/sql/postgresql/9.1.x.nix
+++ b/pkgs/servers/sql/postgresql/9.1.x.nix
@@ -1,13 +1,13 @@
 { stdenv, fetchurl, zlib, readline }:
 
-let version = "9.1.9"; in
+let version = "9.1.10"; in
 
 stdenv.mkDerivation rec {
   name = "postgresql-${version}";
 
   src = fetchurl {
     url = "mirror://postgresql/source/v${version}/${name}.tar.bz2";
-    sha256 = "1n1dc1kqc487dylc22iq1j8sn93jxbqm2g4b5rr0i4q0h7hk7998";
+    sha256 = "8329bcd160fcb76ee8c79676f6c979a94069ca5c108449fbb365e1ea98f92b77";
   };
 
   buildInputs = [ zlib readline ];
diff --git a/pkgs/servers/sql/postgresql/9.2.x.nix b/pkgs/servers/sql/postgresql/9.2.x.nix
index 46a6aa0c032..46b7e7ff3c5 100644
--- a/pkgs/servers/sql/postgresql/9.2.x.nix
+++ b/pkgs/servers/sql/postgresql/9.2.x.nix
@@ -1,13 +1,13 @@
 { stdenv, fetchurl, zlib, readline }:
 
-let version = "9.2.4"; in
+let version = "9.2.5"; in
 
 stdenv.mkDerivation rec {
   name = "postgresql-${version}";
 
   src = fetchurl {
     url = "mirror://postgresql/source/v${version}/${name}.tar.bz2";
-    sha256 = "14xfzw3hb2fn60c438v3j7wa65jjm2pnmx4qb4i4ji4am0cdjzfr";
+    sha256 = "22c1edfd6a404bb15fba655863e94f09a10716ded1910a8bc98ee85f413007a4";
   };
 
   buildInputs = [ zlib readline ];
-- 
GitLab


From b33657df03e411441625019f1cfe1e1b08135497 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 17 Oct 2013 13:30:49 +0200
Subject: [PATCH 5284/5331] grub: Make assertion lazier

---
 nixos/modules/system/boot/loader/grub/grub.nix | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/nixos/modules/system/boot/loader/grub/grub.nix b/nixos/modules/system/boot/loader/grub/grub.nix
index 8e9f3253f87..c7c1f675c77 100644
--- a/nixos/modules/system/boot/loader/grub/grub.nix
+++ b/nixos/modules/system/boot/loader/grub/grub.nix
@@ -237,13 +237,14 @@ in
 
     boot.loader.grub.devices = optional (cfg.device != "") cfg.device;
 
-    system.build = mkAssert (cfg.devices != [])
-      "You must set the ‘boot.loader.grub.device’ option to make the system bootable."
-      { installBootLoader =
-          "PERL5LIB=${makePerlPath [ pkgs.perlPackages.XMLLibXML pkgs.perlPackages.XMLSAX ]} " +
-          "${pkgs.perl}/bin/perl ${./install-grub.pl} ${grubConfig}";
-        inherit grub;
-      };
+    system.build.installBootLoader =
+      if cfg.devices == [] then
+        throw "You must set the ‘boot.loader.grub.device’ option to make the system bootable."
+      else
+        "PERL5LIB=${makePerlPath [ pkgs.perlPackages.XMLLibXML pkgs.perlPackages.XMLSAX ]} " +
+        "${pkgs.perl}/bin/perl ${./install-grub.pl} ${grubConfig}";
+
+    system.build.grub = grub;
 
     # Common attribute for boot loaders so only one of them can be
     # set at once.
-- 
GitLab


From 82ad8c5ce09fe942efac95c176509f1e13da10b8 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 17 Oct 2013 13:43:40 +0200
Subject: [PATCH 5285/5331] Make manual generation not depend on the user's
 configuration

Previously changing the value of certain options in configuration.nix
would cause the manual to be regenerated, because some option defaults
depend on the configuration.  This is undesirable because rebuilding
the manual is kind of slow.  So now the manual reflects an empty
configuration.

The downside is that this requires another call to fixMergeModules,
which adds about 14% to evaluation time.  Probably worth it.
---
 nixos/modules/services/misc/nixos-manual.nix | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/services/misc/nixos-manual.nix b/nixos/modules/services/misc/nixos-manual.nix
index 38f1917a46a..1260272b68e 100644
--- a/nixos/modules/services/misc/nixos-manual.nix
+++ b/nixos/modules/services/misc/nixos-manual.nix
@@ -3,7 +3,7 @@
 # of the virtual consoles.  The latter is useful for the installation
 # CD.
 
-{ config, pkgs, options, ... }:
+{ config, pkgs, baseModules, ... } @ extraArgs:
 
 with pkgs.lib;
 
@@ -13,7 +13,11 @@ let
 
   manual = import ../../../doc/manual {
     inherit (cfg) revision;
-    inherit pkgs options;
+    inherit pkgs;
+    options = (fixMergeModules baseModules
+      (removeAttrs extraArgs ["config" "options"]) // {
+        modules = [ ];
+      }).options;
   };
 
   entry = "${manual.manual}/share/doc/nixos/manual.html";
-- 
GitLab


From 04690da3bd76c99c4fa549814ff1c7d3a8695c4f Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 17 Oct 2013 14:09:05 +0200
Subject: [PATCH 5286/5331] Rename newOptionAttrSetToDocList ->
 optionAttrSetToDocList

---
 lib/options.nix              | 5 ++---
 nixos/doc/manual/default.nix | 8 +++++---
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/lib/options.nix b/lib/options.nix
index e8e01083a77..8ea9df3cbd6 100644
--- a/lib/options.nix
+++ b/lib/options.nix
@@ -266,8 +266,7 @@ rec {
 
   # Generate documentation template from the list of option declaration like
   # the set generated with filterOptionSets.
-  optionAttrSetToDocList = ignore: newOptionAttrSetToDocList;
-  newOptionAttrSetToDocList = attrs:
+  optionAttrSetToDocList = attrs:
     let options = collect isOption attrs; in
       fold (opt: rest:
         let
@@ -285,7 +284,7 @@ rec {
 
           subOptions =
             if opt ? options then
-              newOptionAttrSetToDocList opt.options
+              optionAttrSetToDocList opt.options
             else
               [];
         in
diff --git a/nixos/doc/manual/default.nix b/nixos/doc/manual/default.nix
index e6edb30985c..56ad652c60e 100644
--- a/nixos/doc/manual/default.nix
+++ b/nixos/doc/manual/default.nix
@@ -3,6 +3,8 @@
 , revision ? "HEAD"
 }:
 
+with pkgs.lib;
+
 let
 
   # To prevent infinite recursion, remove system.path from the
@@ -12,7 +14,7 @@ let
     { system = removeAttrs options.system ["path"]; };
 
   optionsXML = builtins.toFile "options.xml" (builtins.unsafeDiscardStringContext
-    (builtins.toXML (pkgs.lib.optionAttrSetToDocList "" options_)));
+    (builtins.toXML (optionAttrSetToDocList options_)));
 
   optionsDocBook = pkgs.runCommand "options-db.xml" {} ''
     ${pkgs.libxslt}/bin/xsltproc \
@@ -26,7 +28,7 @@ in rec {
   manual = pkgs.stdenv.mkDerivation {
     name = "nixos-manual";
 
-    sources = pkgs.lib.sourceFilesBySuffices ./. [".xml"];
+    sources = sourceFilesBySuffices ./. [".xml"];
 
     buildInputs = [ pkgs.libxml2 pkgs.libxslt ];
 
@@ -71,7 +73,7 @@ in rec {
   manpages = pkgs.stdenv.mkDerivation {
     name = "nixos-manpages";
 
-    sources = pkgs.lib.sourceFilesBySuffices ./. [".xml"];
+    sources = sourceFilesBySuffices ./. [".xml"];
 
     buildInputs = [ pkgs.libxml2 pkgs.libxslt ];
 
-- 
GitLab


From ad0568e64a5a58a1dc6b02e3a62073043a44bbc4 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 17 Oct 2013 14:29:51 +0200
Subject: [PATCH 5287/5331] mkEnableOption: Add a period at the end of the
 description

---
 lib/options.nix                              | 8 +++-----
 nixos/modules/services/monitoring/uptime.nix | 2 +-
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/lib/options.nix b/lib/options.nix
index 8ea9df3cbd6..a91115287e4 100644
--- a/lib/options.nix
+++ b/lib/options.nix
@@ -31,7 +31,7 @@ rec {
   mkEnableOption = name: mkOption {
     default = false;
     example = true;
-    description = "Whether to enable ${name}";
+    description = "Whether to enable ${name}.";
     type = lib.types.bool;
   };
 
@@ -272,9 +272,7 @@ rec {
         let
           docOption = {
             inherit (opt) name;
-            description = if opt ? description then opt.description else
-              throw "Option ${opt.name}: No description.";
-
+            description = opt.description or (throw "Option ${opt.name}: No description.");
             declarations = map (x: toString x.source) opt.declarations;
             #definitions = map (x: toString x.source) opt.definitions;
           }
@@ -297,7 +295,7 @@ rec {
      generation of `options.xml' much more efficient: the XML
      representation of derivations is very large (on the order of
      megabytes) and is not actually used by the manual generator. */
-  scrubOptionValue = x: 
+  scrubOptionValue = x:
     if isDerivation x then { type = "derivation"; drvPath = x.name; outPath = x.name; name = x.name; }
     else if isList x then map scrubOptionValue x
     else if isAttrs x then mapAttrs (n: v: scrubOptionValue v) (removeAttrs x ["_args"])
diff --git a/nixos/modules/services/monitoring/uptime.nix b/nixos/modules/services/monitoring/uptime.nix
index fa3de7d90bc..553110d7b80 100644
--- a/nixos/modules/services/monitoring/uptime.nix
+++ b/nixos/modules/services/monitoring/uptime.nix
@@ -51,7 +51,7 @@ in {
 
     enableWebService = mkEnableOption "the uptime monitoring program web service";
 
-    enableSeparateMonitoringService = mkEnableOption "the uptime monitoring service (default: enableWebService == true)" // { default = cfg.enableWebService; };
+    enableSeparateMonitoringService = mkEnableOption "the uptime monitoring service" // { default = cfg.enableWebService; };
 
     nodeEnv = mkOption {
       description = "The node environment to run in (development, production, etc.)";
-- 
GitLab


From 5f14933c33807c9f39ab74c6b1687feddd4dc949 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 17 Oct 2013 14:40:16 +0200
Subject: [PATCH 5288/5331] Don't enable acpid for VirtualBox guests

It's no longer needed for ACPI shutdown, since logind handles this
now.
---
 nixos/modules/virtualisation/virtualbox-guest.nix | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/nixos/modules/virtualisation/virtualbox-guest.nix b/nixos/modules/virtualisation/virtualbox-guest.nix
index e1a83cdecc2..664fd21781c 100644
--- a/nixos/modules/virtualisation/virtualbox-guest.nix
+++ b/nixos/modules/virtualisation/virtualbox-guest.nix
@@ -82,10 +82,6 @@ optionalAttrs (pkgs.stdenv.isi686 || pkgs.stdenv.isx86_64) # ugly...
         # Allow systemd dependencies on vboxguest.
         KERNEL=="vboxguest", TAG+="systemd"
       '';
-
-    # Make the ACPI Shutdown command to do the right thing.
-    services.acpid.enable = true;
-    services.acpid.powerEventCommands = "poweroff";
   };
 
 }
-- 
GitLab


From b19d8e0fcd121f1eb34feb18553859e9bf3050e8 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 17 Oct 2013 14:57:20 +0200
Subject: [PATCH 5289/5331] Remove obsolete pre-systemd compat stuff

---
 nixos/modules/misc/nixpkgs.nix  | 14 --------------
 pkgs/top-level/all-packages.nix |  2 +-
 2 files changed, 1 insertion(+), 15 deletions(-)

diff --git a/nixos/modules/misc/nixpkgs.nix b/nixos/modules/misc/nixpkgs.nix
index 0df0e57c98e..9eba728c339 100644
--- a/nixos/modules/misc/nixpkgs.nix
+++ b/nixos/modules/misc/nixpkgs.nix
@@ -70,18 +70,4 @@ in
     };
 
   };
-
-  config = {
-
-    # FIXME
-    nixpkgs.config.packageOverrides = pkgs: {
-      #udev = pkgs.systemd;
-      slim = pkgs.slim.override (args: if args ? consolekit then { consolekit = null; } else { });
-      lvm2 = pkgs.lvm2.override { udev = pkgs.systemd; };
-      upower = pkgs.upower.override { useSystemd = true; };
-      polkit = pkgs.polkit.override { useSystemd = true; };
-      consolekit = null;
-    };
-
-  };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 2e559871185..8ab59423da2 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7007,7 +7007,7 @@ let
 
   upower = callPackage ../os-specific/linux/upower {
     libusb1 = callPackage ../development/libraries/libusb1/1_0_9.nix {};
-    };
+  };
 
   upstart = callPackage ../os-specific/linux/upstart { };
 
-- 
GitLab


From af8fc748dd408bc296c346898590cd499d69ffad Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 17 Oct 2013 15:26:48 +0200
Subject: [PATCH 5290/5331] Fix PAM resource limits

---
 nixos/modules/security/pam.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/security/pam.nix b/nixos/modules/security/pam.nix
index a30945cc923..2b99eca7d6b 100644
--- a/nixos/modules/security/pam.nix
+++ b/nixos/modules/security/pam.nix
@@ -202,7 +202,7 @@ let
           ${optionalString cfg.forwardXAuth
               "session optional pam_xauth.so xauthpath=${pkgs.xorg.xauth}/bin/xauth systemuser=99"}
           ${optionalString (cfg.limits != [])
-              "session required ${pkgs.pam}/lib/security/pam_limits.so conf=${makeLimitsConf limits}"}
+              "session required ${pkgs.pam}/lib/security/pam_limits.so conf=${makeLimitsConf cfg.limits}"}
           ${optionalString (cfg.showMotd && config.users.motd != null)
               "session optional ${pkgs.pam}/lib/security/pam_motd.so motd=${motd}"}
         '';
-- 
GitLab


From ff74d78c9d97f39db3a995432e7b3c4b00ce2c61 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 17 Oct 2013 15:36:59 +0200
Subject: [PATCH 5291/5331] Allow PAM resource limits to be integers

---
 nixos/modules/security/pam.nix | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/nixos/modules/security/pam.nix b/nixos/modules/security/pam.nix
index 2b99eca7d6b..1081b41299d 100644
--- a/nixos/modules/security/pam.nix
+++ b/nixos/modules/security/pam.nix
@@ -218,10 +218,9 @@ let
   # Create a limits.conf(5) file.
   makeLimitsConf = limits:
     pkgs.writeText "limits.conf"
-      (concatStringsSep "\n"
-           (map ({ domain, type, item, value }:
-                 concatStringsSep " " [ domain type item value ])
-                limits));
+       (concatMapStrings ({ domain, type, item, value }:
+         "${domain} ${type} ${item} ${toString value}\n")
+         limits);
 
   motd = pkgs.writeText "motd" config.users.motd;
 
-- 
GitLab


From 8c047d4f2cf195152d3435d580ffe740f8f87917 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 17 Oct 2013 15:37:08 +0200
Subject: [PATCH 5292/5331] Test whether PAM resource limits work

---
 nixos/tests/openssh.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/nixos/tests/openssh.nix b/nixos/tests/openssh.nix
index 16757cf9098..49d92fbde90 100644
--- a/nixos/tests/openssh.nix
+++ b/nixos/tests/openssh.nix
@@ -8,6 +8,8 @@
 
       {
         services.openssh.enable = true;
+        security.pam.services.sshd.limits =
+          [ { domain = "*"; item = "memlock"; type = "-"; value = 1024; } ];
       };
 
     client =
@@ -31,5 +33,6 @@
 
     $client->waitForUnit("network.target");
     $client->succeed("ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no server 'echo hello world' >&2");
+    $client->succeed("ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no server 'ulimit -l' | grep 1024");
   '';
 }
-- 
GitLab


From ee330eaedf31a74577de875d63342a7ab6e0132f Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 17 Oct 2013 16:06:58 +0200
Subject: [PATCH 5293/5331] nixUnstable: Update to 1.7pre3252_792fd51

---
 pkgs/tools/package-management/nix/unstable.nix | 6 +++---
 pkgs/top-level/all-packages.nix                | 3 ---
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/pkgs/tools/package-management/nix/unstable.nix b/pkgs/tools/package-management/nix/unstable.nix
index ba0353e4507..a548a9f13bd 100644
--- a/pkgs/tools/package-management/nix/unstable.nix
+++ b/pkgs/tools/package-management/nix/unstable.nix
@@ -5,11 +5,11 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "nix-1.6pre3220_fecad91";
+  name = "nix-1.7pre3252_792fd51";
 
   src = fetchurl {
-    url = "http://hydra.nixos.org/build/6038922/download/5/${name}.tar.xz";
-    sha256 = "0251b8cb7ad2a4974a9c8002c65f1c6e1b334be082d3dd2f085929594637f947";
+    url = "http://hydra.nixos.org/build/6500161/download/5/${name}.tar.xz";
+    sha256 = "f99c1996292ea1a20068f0a6d58d3dc4775f30fdd22cdd756ac4d749acb2c20e";
   };
 
   nativeBuildInputs = [ perl pkgconfig ];
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 8ab59423da2..6e533c02303 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9920,13 +9920,10 @@ let
     stateDir = config.nix.stateDir or "/nix/var";
   };
 
-  nixUnstable = nixStable;
-  /*
   nixUnstable = callPackage ../tools/package-management/nix/unstable.nix {
     storeDir = config.nix.storeDir or "/nix/store";
     stateDir = config.nix.stateDir or "/nix/var";
   };
-  */
 
   nixops = callPackage ../tools/package-management/nixops { };
 
-- 
GitLab


From 9239b6df47a9c5c0708d2516828f8e84fc9bbb31 Mon Sep 17 00:00:00 2001
From: Jaka Hudoklin <jakahudoklin@gmail.com>
Date: Thu, 17 Oct 2013 18:35:24 +0200
Subject: [PATCH 5294/5331] Add gzrt, gzip Recovery Toolkit

---
 pkgs/tools/compression/gzrt/default.nix | 23 +++++++++++++++++++++++
 pkgs/top-level/all-packages.nix         |  2 ++
 2 files changed, 25 insertions(+)
 create mode 100644 pkgs/tools/compression/gzrt/default.nix

diff --git a/pkgs/tools/compression/gzrt/default.nix b/pkgs/tools/compression/gzrt/default.nix
new file mode 100644
index 00000000000..44073f84a5d
--- /dev/null
+++ b/pkgs/tools/compression/gzrt/default.nix
@@ -0,0 +1,23 @@
+{ stdenv, fetchurl, zlib }:
+
+stdenv.mkDerivation rec {
+  name = "gzrt-0.8";
+
+  src = fetchurl {
+    url = "http://www.urbanophile.com/arenn/coding/gzrt/${name}.tar.gz";
+    sha256 = "1vhzazj47xfpbfhzkwalz27cc0n5gazddmj3kynhk0yxv99xrdxh";
+  };
+
+  buildInputs = [ zlib ];
+
+  installPhase = ''
+    mkdir -p $out/bin
+    cp gzrecover $out/bin
+  '';
+
+  meta = {
+    homepage = http://www.urbanophile.com/arenn/hacking/gzrt/;
+    description = "The gzip Recovery Toolkit";
+    license = stdenv.lib.licenses.gpl3;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 2e559871185..568ae53a231 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1060,6 +1060,8 @@ let
 
   gzip = callPackage ../tools/compression/gzip { };
 
+  gzrt = callPackage ../tools/compression/gzrt { };
+
   partclone = callPackage ../tools/backup/partclone { };
 
   partimage = callPackage ../tools/backup/partimage { };
-- 
GitLab


From e1ea4e38002b3aceae8c88a021a1c414ae026851 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Thu, 17 Oct 2013 14:11:15 -0400
Subject: [PATCH 5295/5331] Add htm-xml-utils

Signed-off-by: Shea Levy <shea@shealevy.com>
---
 .../tools/text/xml/html-xml-utils/default.nix | 20 +++++++++++++++++++
 .../xml/html-xml-utils/no-Boolean-type.patch  | 20 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 3 files changed, 42 insertions(+)
 create mode 100644 pkgs/tools/text/xml/html-xml-utils/default.nix
 create mode 100644 pkgs/tools/text/xml/html-xml-utils/no-Boolean-type.patch

diff --git a/pkgs/tools/text/xml/html-xml-utils/default.nix b/pkgs/tools/text/xml/html-xml-utils/default.nix
new file mode 100644
index 00000000000..f52855dfc53
--- /dev/null
+++ b/pkgs/tools/text/xml/html-xml-utils/default.nix
@@ -0,0 +1,20 @@
+{ stdenv, fetchurl }:
+
+stdenv.mkDerivation rec {
+  name = "html-xml-utils-6.4";
+
+  src = fetchurl {
+    url = "http://www.w3.org/Tools/HTML-XML-utils/${name}.tar.gz";
+
+    sha256 = "0dqa8vjk5my728hmb7dhl6nbg7946fh905j0yzlwx7p7rg2zrxcp";
+  };
+
+  patches = [ ./no-Boolean-type.patch ];
+
+  meta = {
+    description = "Utilities for manipulating HTML and XML files";
+    homepage = http://www.w3.org/Tools/HTML-XML-utils/;
+    license = "free-non-copyleft";
+    maintainers = [ stdenv.lib.maintainers.shlevy ];
+  };
+}
diff --git a/pkgs/tools/text/xml/html-xml-utils/no-Boolean-type.patch b/pkgs/tools/text/xml/html-xml-utils/no-Boolean-type.patch
new file mode 100644
index 00000000000..f675c4280e7
--- /dev/null
+++ b/pkgs/tools/text/xml/html-xml-utils/no-Boolean-type.patch
@@ -0,0 +1,20 @@
+diff -Naur html-xml-utils-6.4-orig/openurl.c html-xml-utils-6.4/openurl.c
+--- html-xml-utils-6.4-orig/openurl.c	2012-10-23 09:55:12.000000000 -0400
++++ html-xml-utils-6.4/openurl.c	2013-10-17 14:05:11.424077842 -0400
+@@ -66,6 +66,7 @@
+ #include <stdlib.h>
+ #include <stdarg.h>
+ #include <assert.h>
++#include <stdbool.h>
+ #include "export.h"
+ #if HAVE_LIBCURL && !HAVE_FOPENCOOKIE
+ # include "fopencookie.e"	/* Use our own fopencookie() */
+@@ -505,7 +506,7 @@
+ 			const conststring path, Dictionary request,
+ 			Dictionary response, int maxredirs, int *status)
+ {
+-  Boolean delete_response = !response;
++  bool delete_response = !response;
+   conststring h, v;
+   char buf[BUFLEN];
+   int fd, n, i;
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 6e533c02303..37315659ac5 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1948,6 +1948,8 @@ let
 
   htmlTidy = callPackage ../tools/text/html-tidy { };
 
+  html-xml-utils = callPackage ../tools/text/xml/html-xml-utils { };
+
   tftp_hpa = callPackage ../tools/networking/tftp-hpa {};
 
   tigervnc = callPackage ../tools/admin/tigervnc {
-- 
GitLab


From 9e33bcc54dc4029d3adc769c14dae52310258118 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Thu, 17 Oct 2013 23:36:21 +0200
Subject: [PATCH 5296/5331] nginx: 1.4.1 -> 1.4.3

---
 pkgs/servers/http/nginx/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/http/nginx/default.nix b/pkgs/servers/http/nginx/default.nix
index 083dbc482f0..8e77d07e5c5 100644
--- a/pkgs/servers/http/nginx/default.nix
+++ b/pkgs/servers/http/nginx/default.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "http://nginx.org/download/${name}.tar.gz";
-    sha256 = "06ficmjiya3m8mdlyq3bgqx604h475n77qc5c502kfjijzld39dw";
+    sha256 = "116yfy0k65mwxdkld0w7c3gly77jdqlvga5hpbsw79i3r62kh4mf";
   };
 
   buildInputs = [ openssl zlib pcre libxml2 libxslt ] ++ stdenv.lib.optional fullWebDAV expat;
@@ -41,6 +41,6 @@ stdenv.mkDerivation rec {
     description = "A reverse proxy and lightweight webserver";
     maintainers = [ stdenv.lib.maintainers.raskin];
     platforms = stdenv.lib.platforms.all;
-    version = "1.4.1";
+    version = "1.4.3";
   };
 }
-- 
GitLab


From fb2cb7bc0f52a634fd44e99fd8ec2ed4a43a6812 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Fri, 18 Oct 2013 11:11:47 +0400
Subject: [PATCH 5297/5331] Adding Glances system monitoring tool

---
 .../interpreters/python/2.7/default.nix       |  5 ++++
 pkgs/top-level/python-packages.nix            | 25 +++++++++++++++++++
 2 files changed, 30 insertions(+)

diff --git a/pkgs/development/interpreters/python/2.7/default.nix b/pkgs/development/interpreters/python/2.7/default.nix
index aea2d21fd8d..617be4f29f1 100644
--- a/pkgs/development/interpreters/python/2.7/default.nix
+++ b/pkgs/development/interpreters/python/2.7/default.nix
@@ -164,6 +164,11 @@ let
       deps = [ ncurses ];
     };
 
+    curses_panel = buildInternalPythonModule {
+      moduleName = "curses_panel";
+      deps = [ ncurses modules.curses ];
+    };
+
     crypt = buildInternalPythonModule {
       moduleName = "crypt";
       internalName = "crypt";
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index a33103cccb8..f373b36b816 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -2668,6 +2668,31 @@ pythonPackages = modules // import ./python-packages-generated.nix {
     };
   };
 
+  glances = buildPythonPackage rec {
+    name = "glances-${meta.version}";
+
+    src = fetchurl {
+      url = "https://github.com/nicolargo/glances/archive/v${meta.version}.tar.gz";
+      sha256 = "0g2yg9qf7qgjwv13x0rx51rzhn99pcmjpb3vk0g3gmmdsqyqi0d6";
+    };
+
+    buildInputs = [ pkgs.hddtemp ];
+
+    propagatedBuildInputs = [ psutil jinja2 modules.curses modules.curses_panel];
+
+    doCheck = false;
+
+    preConfigure = ''
+      sed -i -r -e '/data_files.append[(][(](conf|etc)_path/ietc_path="etc/glances"; conf_path="etc/glances"' setup.py;
+    '';
+
+    meta = {
+      version = "1.7.1";
+      homepage = "http://nicolargo.github.io/glances/";
+      description = "Cross-platform curses-based monitoring tool";
+    };
+  };
+
 
   greenlet = buildPythonPackage rec {
     name = "greenlet-0.3.1";
-- 
GitLab


From ebdec6418d9586eadcaf2a8a8d0fb6debed52dcf Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Fri, 18 Oct 2013 12:54:49 +0400
Subject: [PATCH 5298/5331] Reflect addition of curses_panel python module

---
 pkgs/development/interpreters/python/2.6/default.nix | 5 +++++
 pkgs/top-level/python-packages.nix                   | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/interpreters/python/2.6/default.nix b/pkgs/development/interpreters/python/2.6/default.nix
index 4b55f7150d3..6192c9e11e7 100644
--- a/pkgs/development/interpreters/python/2.6/default.nix
+++ b/pkgs/development/interpreters/python/2.6/default.nix
@@ -160,6 +160,11 @@ let
       deps = [ ncurses ];
     };
 
+    curses_panel = buildInternalPythonModule {
+      moduleName = "curses_panel";
+      deps = [ ncurses modules.curses ];
+    };
+
     gdbm = buildInternalPythonModule {
       moduleName = "gdbm";
       internalName = "gdbm";
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index f373b36b816..8baaa25d303 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -5,7 +5,7 @@ isPy26 = python.majorVersion == "2.6";
 isPy27 = python.majorVersion == "2.7";
 optional = pkgs.lib.optional;
 optionals = pkgs.lib.optionals;
-modules = python.modules or { readline = null; sqlite3 = null; curses = null; ssl = null; crypt = null; };
+modules = python.modules or { readline = null; sqlite3 = null; curses = null; curses_panel = null; ssl = null; crypt = null; };
 
 pythonPackages = modules // import ./python-packages-generated.nix {
   inherit pkgs python;
-- 
GitLab


From 47ecc24c4824aeff48cc8347c35f9ecb83beae8e Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 16 Oct 2013 17:05:22 +0200
Subject: [PATCH 5299/5331] haskell-HTTP-4000.2.8: cosmetic

---
 pkgs/development/libraries/haskell/HTTP/4000.2.8.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/haskell/HTTP/4000.2.8.nix b/pkgs/development/libraries/haskell/HTTP/4000.2.8.nix
index 78c79fe3c3d..09f0b25910b 100644
--- a/pkgs/development/libraries/haskell/HTTP/4000.2.8.nix
+++ b/pkgs/development/libraries/haskell/HTTP/4000.2.8.nix
@@ -12,8 +12,8 @@ cabal.mkDerivation (self: {
     caseInsensitive conduit deepseq httpdShed httpTypes HUnit mtl
     network pureMD5 split testFramework testFrameworkHunit wai warp
   ];
-  doCheck = false;
   jailbreak = true;
+  doCheck = false;
   meta = {
     homepage = "https://github.com/haskell/HTTP";
     description = "A library for client-side HTTP";
-- 
GitLab


From 7b73fa38535b643c8edf58b57af9043c3987e029 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 16 Oct 2013 17:05:36 +0200
Subject: [PATCH 5300/5331] haskell-uuid: cosmetic

---
 pkgs/development/libraries/haskell/uuid/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/haskell/uuid/default.nix b/pkgs/development/libraries/haskell/uuid/default.nix
index 0e90ce3ace6..37ef38da4e2 100644
--- a/pkgs/development/libraries/haskell/uuid/default.nix
+++ b/pkgs/development/libraries/haskell/uuid/default.nix
@@ -12,8 +12,8 @@ cabal.mkDerivation (self: {
     criterion deepseq HUnit mersenneRandomPure64 QuickCheck random
     testFramework testFrameworkHunit testFrameworkQuickcheck2
   ];
-  doCheck = false;
   jailbreak = true;
+  doCheck = false;
   meta = {
     homepage = "http://projects.haskell.org/uuid/";
     description = "For creating, comparing, parsing and printing Universally Unique Identifiers";
-- 
GitLab


From 749243496c106323ab84798a610ec0310bbf7a37 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 16 Oct 2013 17:06:44 +0200
Subject: [PATCH 5301/5331] haskell-hakyll: cosmetic

---
 pkgs/development/libraries/haskell/hakyll/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/haskell/hakyll/default.nix b/pkgs/development/libraries/haskell/hakyll/default.nix
index 9ee06ec5326..27f3d6629d5 100644
--- a/pkgs/development/libraries/haskell/hakyll/default.nix
+++ b/pkgs/development/libraries/haskell/hakyll/default.nix
@@ -25,7 +25,7 @@ cabal.mkDerivation (self: {
     snapCore snapServer systemFilepath tagsoup testFramework
     testFrameworkHunit testFrameworkQuickcheck2 text time
   ];
-  postPatch = ''
+  patchPhase = ''
     sed -i -e 's|cryptohash.*,|cryptohash,|' -e 's|tagsoup.*,|tagsoup,|' hakyll.cabal
   '';
   doCheck = false;
-- 
GitLab


From 7af4922a9f778448115c18872fa278cd46df9259 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 16 Oct 2013 17:09:26 +0200
Subject: [PATCH 5302/5331] haskell-RSA: cosmetic

---
 pkgs/development/libraries/haskell/RSA/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/haskell/RSA/default.nix b/pkgs/development/libraries/haskell/RSA/default.nix
index 17f4c516a54..c5257c5b262 100644
--- a/pkgs/development/libraries/haskell/RSA/default.nix
+++ b/pkgs/development/libraries/haskell/RSA/default.nix
@@ -12,7 +12,7 @@ cabal.mkDerivation (self: {
     binary cryptoApi cryptoPubkeyTypes monadcryptorandom pureMD5 SHA
   ];
   meta = {
-    description = "Implementation of RSA, using the padding schemes of PKCS#1 v2.1";
+    description = "Implementation of RSA, using the padding schemes of PKCS#1 v2.1.";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
     maintainers = [ self.stdenv.lib.maintainers.andres ];
-- 
GitLab


From 1a6a91d4fa84a4da115a1bf847aca0e92160dd33 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 16 Oct 2013 17:09:26 +0200
Subject: [PATCH 5303/5331] haskell-arithmoi: cosmetic

---
 pkgs/development/libraries/haskell/arithmoi/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/haskell/arithmoi/default.nix b/pkgs/development/libraries/haskell/arithmoi/default.nix
index 22707c04e83..181937fdd80 100644
--- a/pkgs/development/libraries/haskell/arithmoi/default.nix
+++ b/pkgs/development/libraries/haskell/arithmoi/default.nix
@@ -7,7 +7,7 @@ cabal.mkDerivation (self: {
   buildDepends = [ mtl random ];
   meta = {
     homepage = "https://bitbucket.org/dafis/arithmoi";
-    description = "Basic number theoretic functions and utilities";
+    description = "Efficient basic number-theoretic functions. Primes, powers, integer logarithms.";
     license = self.stdenv.lib.licenses.mit;
     platforms = self.ghc.meta.platforms;
   };
-- 
GitLab


From 66d6ba1b9713bbda40f956c2914aa564dee8524e Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 16 Oct 2013 17:09:26 +0200
Subject: [PATCH 5304/5331] haskell-datetime: cosmetic

---
 pkgs/development/libraries/haskell/datetime/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/haskell/datetime/default.nix b/pkgs/development/libraries/haskell/datetime/default.nix
index 669bace3366..faf0b40b94d 100644
--- a/pkgs/development/libraries/haskell/datetime/default.nix
+++ b/pkgs/development/libraries/haskell/datetime/default.nix
@@ -7,7 +7,7 @@ cabal.mkDerivation (self: {
   buildDepends = [ QuickCheck time ];
   meta = {
     homepage = "http://github.com/esessoms/datetime";
-    description = "Utilities to make Data.Time.* easier to use";
+    description = "Utilities to make Data.Time.* easier to use.";
     license = "GPL";
     platforms = self.ghc.meta.platforms;
     maintainers = [ self.stdenv.lib.maintainers.andres ];
-- 
GitLab


From c3d3097ab25dddcd9aafcc84f5af68db541d794d Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 16 Oct 2013 17:09:26 +0200
Subject: [PATCH 5305/5331] haskell-dotgen: cosmetic

---
 pkgs/development/libraries/haskell/dotgen/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/haskell/dotgen/default.nix b/pkgs/development/libraries/haskell/dotgen/default.nix
index f56db8f8c5f..a7fe5b791f0 100644
--- a/pkgs/development/libraries/haskell/dotgen/default.nix
+++ b/pkgs/development/libraries/haskell/dotgen/default.nix
@@ -7,7 +7,7 @@ cabal.mkDerivation (self: {
   isLibrary = true;
   isExecutable = true;
   meta = {
-    description = "A simple interface for building .dot graph files";
+    description = "A simple interface for building .dot graph files.";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
     maintainers = [ self.stdenv.lib.maintainers.andres ];
-- 
GitLab


From ebe6ff8b47149269c9392b1ef5c4262b44358194 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 16 Oct 2013 17:09:26 +0200
Subject: [PATCH 5306/5331] haskell-feed: cosmetic

---
 pkgs/development/libraries/haskell/feed/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/haskell/feed/default.nix b/pkgs/development/libraries/haskell/feed/default.nix
index ec4251d7cb1..a2c1ccde86b 100644
--- a/pkgs/development/libraries/haskell/feed/default.nix
+++ b/pkgs/development/libraries/haskell/feed/default.nix
@@ -7,7 +7,7 @@ cabal.mkDerivation (self: {
   buildDepends = [ utf8String xml ];
   meta = {
     homepage = "https://github.com/sof/feed";
-    description = "Interfacing with RSS (v 0.9x, 2.x, 1.0) + Atom feeds";
+    description = "Interfacing with RSS (v 0.9x, 2.x, 1.0) + Atom feeds.";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
     maintainers = [ self.stdenv.lib.maintainers.andres ];
-- 
GitLab


From 86b9c3d60a2b0301cde33c156673ad2fb91e07b5 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 16 Oct 2013 17:09:26 +0200
Subject: [PATCH 5307/5331] haskell-hoauth: cosmetic

---
 pkgs/development/libraries/haskell/hoauth/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/haskell/hoauth/default.nix b/pkgs/development/libraries/haskell/hoauth/default.nix
index 0486ee72f3b..c568b292c3c 100644
--- a/pkgs/development/libraries/haskell/hoauth/default.nix
+++ b/pkgs/development/libraries/haskell/hoauth/default.nix
@@ -11,7 +11,7 @@ cabal.mkDerivation (self: {
     time utf8String
   ];
   meta = {
-    description = "A Haskell implementation of OAuth 1.0a protocol";
+    description = "A Haskell implementation of OAuth 1.0a protocol.";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
     maintainers = [ self.stdenv.lib.maintainers.andres ];
-- 
GitLab


From 5dd8d6e1f3112ff17636b764e7c00e6dcdc92968 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 16 Oct 2013 17:09:26 +0200
Subject: [PATCH 5308/5331] haskell-hsyslog: cosmetic

---
 pkgs/development/libraries/haskell/hsyslog/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/haskell/hsyslog/default.nix b/pkgs/development/libraries/haskell/hsyslog/default.nix
index 2a531875e0b..3f475425659 100644
--- a/pkgs/development/libraries/haskell/hsyslog/default.nix
+++ b/pkgs/development/libraries/haskell/hsyslog/default.nix
@@ -6,7 +6,7 @@ cabal.mkDerivation (self: {
   sha256 = "1dpcawnl3a5lw2w8gc9920sjrw43qmq1k2zws8rx2q0r6ps7nhgp";
   meta = {
     homepage = "http://github.com/peti/hsyslog";
-    description = "FFI interface to syslog(3) from POSIX.1-2001";
+    description = "FFI interface to syslog(3) from POSIX.1-2001.";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
     maintainers = [
-- 
GitLab


From d36382193b657ac539ff00f27c59c44f3da48f3a Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 16 Oct 2013 17:09:26 +0200
Subject: [PATCH 5309/5331] haskell-skein: cosmetic

---
 pkgs/development/libraries/haskell/skein/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/haskell/skein/default.nix b/pkgs/development/libraries/haskell/skein/default.nix
index 4d96ea19373..7acc60e3601 100644
--- a/pkgs/development/libraries/haskell/skein/default.nix
+++ b/pkgs/development/libraries/haskell/skein/default.nix
@@ -9,7 +9,7 @@ cabal.mkDerivation (self: {
   jailbreak = true;
   meta = {
     homepage = "https://github.com/meteficha/skein";
-    description = "Family of cryptographic hash functions (includes Skein-MAC)";
+    description = "Skein, a family of cryptographic hash functions. Includes Skein-MAC as well.";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
     maintainers = [ self.stdenv.lib.maintainers.andres ];
-- 
GitLab


From b9136ed171ef3689311f20723699646d82e26abb Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 16 Oct 2013 17:09:26 +0200
Subject: [PATCH 5310/5331] haskell-tar: cosmetic

---
 pkgs/development/libraries/haskell/tar/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/haskell/tar/default.nix b/pkgs/development/libraries/haskell/tar/default.nix
index 7ee52e79e03..04257960a64 100644
--- a/pkgs/development/libraries/haskell/tar/default.nix
+++ b/pkgs/development/libraries/haskell/tar/default.nix
@@ -6,7 +6,7 @@ cabal.mkDerivation (self: {
   sha256 = "0vbsv7h3zgp30mlgsw156jkv1rqy5zbm98as9haf7x15hd6jf254";
   buildDepends = [ filepath time ];
   meta = {
-    description = "Reading, writing and manipulating \".tar\" archive files";
+    description = "Reading, writing and manipulating \".tar\" archive files.";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
     maintainers = [ self.stdenv.lib.maintainers.andres ];
-- 
GitLab


From c829e67198bb152f3b8393c0e0a18eec3de850d8 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 16 Oct 2013 17:09:27 +0200
Subject: [PATCH 5311/5331] haskell-transformers-compat: cosmetic

---
 .../libraries/haskell/transformers-compat/default.nix           | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/haskell/transformers-compat/default.nix b/pkgs/development/libraries/haskell/transformers-compat/default.nix
index 3eda20cec05..2abd6efa0ce 100644
--- a/pkgs/development/libraries/haskell/transformers-compat/default.nix
+++ b/pkgs/development/libraries/haskell/transformers-compat/default.nix
@@ -7,7 +7,7 @@ cabal.mkDerivation (self: {
   buildDepends = [ transformers ];
   meta = {
     homepage = "http://github.com/ekmett/transformers-compat/";
-    description = "Small compatibility shim exposing the new types from transformers 0.3 to older Haskell platforms";
+    description = "A small compatibility shim exposing the new types from transformers 0.3 to older Haskell platforms.";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
   };
-- 
GitLab


From ad44474f4983888749fba0b5dabc17c6c3d24a05 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 16 Oct 2013 17:12:20 +0200
Subject: [PATCH 5312/5331] haskell-Cabal: add version 1.18.1.1

---
 .../libraries/haskell/Cabal/{1.18.1.nix => 1.18.1.1.nix}      | 4 ++--
 pkgs/top-level/haskell-packages.nix                           | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)
 rename pkgs/development/libraries/haskell/Cabal/{1.18.1.nix => 1.18.1.1.nix} (89%)

diff --git a/pkgs/development/libraries/haskell/Cabal/1.18.1.nix b/pkgs/development/libraries/haskell/Cabal/1.18.1.1.nix
similarity index 89%
rename from pkgs/development/libraries/haskell/Cabal/1.18.1.nix
rename to pkgs/development/libraries/haskell/Cabal/1.18.1.1.nix
index f0792be6ec9..431c62b85e0 100644
--- a/pkgs/development/libraries/haskell/Cabal/1.18.1.nix
+++ b/pkgs/development/libraries/haskell/Cabal/1.18.1.1.nix
@@ -5,8 +5,8 @@
 
 cabal.mkDerivation (self: {
   pname = "Cabal";
-  version = "1.18.1";
-  sha256 = "041m3xr8v0bbw0016lnzmnv9xpj15z5pd272j3sbsrwpmcyds3a0";
+  version = "1.18.1.1";
+  sha256 = "1qa6z9kb46hmix15fdjw80jqd69v4rxr52mfq25m8c60l3kxbiny";
   buildDepends = [ deepseq filepath time ];
   testDepends = [
     extensibleExceptions filepath HUnit QuickCheck regexPosix
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index eae5b1660ed..5eec652a6fe 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -661,7 +661,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
 
   Cabal_1_14_0 = callPackage ../development/libraries/haskell/Cabal/1.14.0.nix { cabal = self.cabal.override { Cabal = null; }; };
   Cabal_1_16_0_3 = callPackage ../development/libraries/haskell/Cabal/1.16.0.3.nix { cabal = self.cabal.override { Cabal = null; }; };
-  Cabal_1_18_1 = callPackage ../development/libraries/haskell/Cabal/1.18.1.nix {
+  Cabal_1_18_1_1 = callPackage ../development/libraries/haskell/Cabal/1.18.1.1.nix {
     cabal = self.cabal.override { Cabal = null; };
     deepseq = self.deepseq_1_3_0_1;
   };
-- 
GitLab


From b258b45a4f2c9034ac8458e428601f81387d028e Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 16 Oct 2013 17:16:32 +0200
Subject: [PATCH 5313/5331] haskell-idris: update to version 0.9.9.3

---
 pkgs/development/compilers/idris/default.nix | 21 ++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/pkgs/development/compilers/idris/default.nix b/pkgs/development/compilers/idris/default.nix
index 7252343aa55..30ef18a1ef9 100644
--- a/pkgs/development/compilers/idris/default.nix
+++ b/pkgs/development/compilers/idris/default.nix
@@ -1,20 +1,21 @@
-{ cabal, ansiTerminal, binary, boehmgc, Cabal, filepath, gmp, happy
-, haskeline, languageJava, libffi, llvmGeneral, llvmGeneralPure
-, mtl, parsec, parsers, split, text, time, transformers, trifecta
-, unorderedContainers, utf8String, vector, vectorBinaryInstances
+{ cabal, ansiTerminal, ansiWlPprint, binary, boehmgc, Cabal
+, filepath, gmp, happy, haskeline, languageJava, libffi
+, llvmGeneral, llvmGeneralPure, mtl, parsec, parsers, split, text
+, time, transformers, trifecta, unorderedContainers, utf8String
+, vector, vectorBinaryInstances
 }:
 
 cabal.mkDerivation (self: {
   pname = "idris";
-  version = "0.9.9.2";
-  sha256 = "0xfwnlf3jca64i4piyx9scmk4z8f6rak2cvrcjwji505a9vaa0rw";
+  version = "0.9.9.3";
+  sha256 = "1l19xx0xbcwlnnh2w0rmri7wwixffzfrafpbji64nwyx1awz4iab";
   isLibrary = false;
   isExecutable = true;
   buildDepends = [
-    ansiTerminal binary Cabal filepath haskeline languageJava libffi
-    llvmGeneral llvmGeneralPure mtl parsec parsers split text time
-    transformers trifecta unorderedContainers utf8String vector
-    vectorBinaryInstances
+    ansiTerminal ansiWlPprint binary Cabal filepath haskeline
+    languageJava libffi llvmGeneral llvmGeneralPure mtl parsec parsers
+    split text time transformers trifecta unorderedContainers
+    utf8String vector vectorBinaryInstances
   ];
   buildTools = [ happy ];
   extraLibraries = [ boehmgc gmp ];
-- 
GitLab


From c72d4a105ae6d3995006b7cb80c5a19d94765b31 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 16 Oct 2013 17:16:32 +0200
Subject: [PATCH 5314/5331] haskell-ChasingBottoms: update to version 1.3.0.7

---
 pkgs/development/libraries/haskell/ChasingBottoms/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/ChasingBottoms/default.nix b/pkgs/development/libraries/haskell/ChasingBottoms/default.nix
index 719e5eb2cee..b22272a7703 100644
--- a/pkgs/development/libraries/haskell/ChasingBottoms/default.nix
+++ b/pkgs/development/libraries/haskell/ChasingBottoms/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "ChasingBottoms";
-  version = "1.3.0.6";
-  sha256 = "1l40n1ylzrbp0lhm80q9djl8mf39zvmw7zzlg0gzxsqbzwbsggx8";
+  version = "1.3.0.7";
+  sha256 = "0g1bx6d2mi27qsb4bxvby50g39fm56gyi2658fyjiq1gamy50ypa";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [ mtl QuickCheck random syb ];
-- 
GitLab


From a6be5411530762f22347673be158950a1534e5b7 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 16 Oct 2013 17:16:33 +0200
Subject: [PATCH 5315/5331] haskell-JuicyPixels: update to version 3.1.1.1

---
 pkgs/development/libraries/haskell/JuicyPixels/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/JuicyPixels/default.nix b/pkgs/development/libraries/haskell/JuicyPixels/default.nix
index 4dba89d9925..b2947318a1f 100644
--- a/pkgs/development/libraries/haskell/JuicyPixels/default.nix
+++ b/pkgs/development/libraries/haskell/JuicyPixels/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "JuicyPixels";
-  version = "3.1.1";
-  sha256 = "0bprga2lh7bjlmfm4p6vyzhjrhqw9ix0wnzc6f1q4a7skwhq0z92";
+  version = "3.1.1.1";
+  sha256 = "0lvhaa8pqknkcsfps5gcbwiqx0y1rhasiw9hwy7975vgpsh58dph";
   buildDepends = [
     binary deepseq mtl primitive transformers vector zlib
   ];
-- 
GitLab


From 7026921a04f9af2219ffde48fc5a173a9fabbc90 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 16 Oct 2013 17:16:33 +0200
Subject: [PATCH 5316/5331] haskell-bindings-DSL: update to version 1.0.20

---
 pkgs/development/libraries/haskell/bindings-DSL/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/bindings-DSL/default.nix b/pkgs/development/libraries/haskell/bindings-DSL/default.nix
index 5e4e5d79379..ed2a631419a 100644
--- a/pkgs/development/libraries/haskell/bindings-DSL/default.nix
+++ b/pkgs/development/libraries/haskell/bindings-DSL/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "bindings-DSL";
-  version = "1.0.19";
-  sha256 = "0mjlv2ld1qdd83pv7khrk3f0g4ypk8a8z79ykp3nwbvlhhi7bp2h";
+  version = "1.0.20";
+  sha256 = "11qc02fkmrpy6c1a85lwlz06m4fpvfpbpbxgv5rkyb1amg2cnklq";
   meta = {
     homepage = "http://bitbucket.org/mauricio/bindings-dsl";
     description = "FFI domain specific language, on top of hsc2hs";
-- 
GitLab


From b2868afaa42b5e3a4f3f513537a9ce47f9a24776 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 16 Oct 2013 17:16:33 +0200
Subject: [PATCH 5317/5331] haskell-entropy: update to version 0.2.2.4

---
 pkgs/development/libraries/haskell/entropy/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/entropy/default.nix b/pkgs/development/libraries/haskell/entropy/default.nix
index 3c0f97dfdc6..f2154ddddf7 100644
--- a/pkgs/development/libraries/haskell/entropy/default.nix
+++ b/pkgs/development/libraries/haskell/entropy/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "entropy";
-  version = "0.2.2.3";
-  sha256 = "04kzl7j73g5ibbc28b4llmnrvhg7q2fji1akx5ii81sfxdpnxy45";
+  version = "0.2.2.4";
+  sha256 = "1cjmpb0rh1ib4j9mwmf1irn401vmjawxkshxdmmb4643rmcgx1gm";
   meta = {
     homepage = "https://github.com/TomMD/entropy";
     description = "A platform independent entropy source";
-- 
GitLab


From 62f701dc2ec2b8203c834366a5f943ed7b797dd6 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 16 Oct 2013 17:16:33 +0200
Subject: [PATCH 5318/5331] haskell-file-embed: update to version 0.0.5

---
 pkgs/development/libraries/haskell/file-embed/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/file-embed/default.nix b/pkgs/development/libraries/haskell/file-embed/default.nix
index 2eb9ac94d8c..3d7015d7ec2 100644
--- a/pkgs/development/libraries/haskell/file-embed/default.nix
+++ b/pkgs/development/libraries/haskell/file-embed/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "file-embed";
-  version = "0.0.4.9";
-  sha256 = "128z3jwxn6d13dkrfjx7maxgmax8bfgr8n2jfhqg3rvv4ryjnqv2";
+  version = "0.0.5";
+  sha256 = "0s77g7azw73f7d07hvwwps8sx79jpwj8ap9iqzcglyjw1sw4l1n1";
   buildDepends = [ filepath ];
   testDepends = [ filepath HUnit ];
   meta = {
-- 
GitLab


From 82cf1828a4cf84b968d4e348d6d7d1fc520aebfb Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 16 Oct 2013 17:16:33 +0200
Subject: [PATCH 5319/5331] haskell-free: update to version 4.1

---
 pkgs/development/libraries/haskell/free/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/free/default.nix b/pkgs/development/libraries/haskell/free/default.nix
index 624a4be209f..64d9541f401 100644
--- a/pkgs/development/libraries/haskell/free/default.nix
+++ b/pkgs/development/libraries/haskell/free/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "free";
-  version = "4.0";
-  sha256 = "0hcswwd3qc9mjxhvrsc4sxgixgh2j6n6rnhrm2s06czh94v9hm1i";
+  version = "4.1";
+  sha256 = "16951r4f7ggvcw2qgjwdrmaxxnrmrm69c67nixs77lm1d31nks4w";
   buildDepends = [
     bifunctors comonad distributive mtl profunctors semigroupoids
     semigroups transformers
-- 
GitLab


From 75ac9e057685f260018e9082a5e3810c383093fd Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 16 Oct 2013 17:16:33 +0200
Subject: [PATCH 5320/5331] haskell-persistent-template: update to version
 1.2.0.4

---
 .../libraries/haskell/persistent-template/default.nix    | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/libraries/haskell/persistent-template/default.nix b/pkgs/development/libraries/haskell/persistent-template/default.nix
index b9e0e72928f..c3bb228933d 100644
--- a/pkgs/development/libraries/haskell/persistent-template/default.nix
+++ b/pkgs/development/libraries/haskell/persistent-template/default.nix
@@ -1,14 +1,13 @@
 { cabal, aeson, hspec, monadControl, monadLogger, persistent
-, QuickCheck, text, thOrphans, transformers
+, QuickCheck, text, transformers
 }:
 
 cabal.mkDerivation (self: {
   pname = "persistent-template";
-  version = "1.2.0.3";
-  sha256 = "10scyrfa8g79v8ra79bp0bg7q6iwqjw6jpm06g11pngv4x9zx880";
+  version = "1.2.0.4";
+  sha256 = "0lhqv4mcai9r5mzj5h6fsd1hd8mv1458id0rb6q157192gywxhzf";
   buildDepends = [
-    aeson monadControl monadLogger persistent text thOrphans
-    transformers
+    aeson monadControl monadLogger persistent text transformers
   ];
   testDepends = [ aeson hspec persistent QuickCheck text ];
   meta = {
-- 
GitLab


From 35c78fe23c8be6b57257d736f1ab94dae447997e Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 16 Oct 2013 17:16:33 +0200
Subject: [PATCH 5321/5331] haskell-shake: update to version 0.10.8

---
 pkgs/development/libraries/haskell/shake/default.nix | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/shake/default.nix b/pkgs/development/libraries/haskell/shake/default.nix
index 2588b11ae78..12887ec79bc 100644
--- a/pkgs/development/libraries/haskell/shake/default.nix
+++ b/pkgs/development/libraries/haskell/shake/default.nix
@@ -4,14 +4,18 @@
 
 cabal.mkDerivation (self: {
   pname = "shake";
-  version = "0.10.7";
-  sha256 = "0r48kzldbgixr1c83sd7frvygqyjx32n67nri1nnamcwpvlv8hgv";
+  version = "0.10.8";
+  sha256 = "15r392b18nis9p0ys95kbj79hki19wid2gyrpy0z9zm2l5d1m3ya";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [
     binary deepseq filepath hashable random time transformers
     unorderedContainers utf8String
   ];
+  testDepends = [
+    binary deepseq filepath hashable random time transformers
+    unorderedContainers utf8String
+  ];
   meta = {
     homepage = "http://community.haskell.org/~ndm/shake/";
     description = "Build system library, like Make, but more accurate dependencies";
-- 
GitLab


From 469e7aef650d1a42b3cd4fce4ef07686229f2978 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 16 Oct 2013 17:16:33 +0200
Subject: [PATCH 5322/5331] haskell-shakespeare-js: update to version 1.2.0.2

---
 pkgs/development/libraries/haskell/shakespeare-js/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/shakespeare-js/default.nix b/pkgs/development/libraries/haskell/shakespeare-js/default.nix
index 873b8622934..ed743d87832 100644
--- a/pkgs/development/libraries/haskell/shakespeare-js/default.nix
+++ b/pkgs/development/libraries/haskell/shakespeare-js/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "shakespeare-js";
-  version = "1.2.0.1";
-  sha256 = "0w6dwbn3264bdjmj2hg1bppvhbd3bj8j1dkrlizjifs8g8ax0bx5";
+  version = "1.2.0.2";
+  sha256 = "1d7fmw2295ycjipaj9fjgw02y1088h2gxxk1d6sy4c165x95r6vx";
   buildDepends = [ aeson shakespeare text ];
   testDepends = [ aeson hspec HUnit shakespeare text ];
   meta = {
-- 
GitLab


From 9f43183c61ebd0508d83e1a8cbdc9f2d56b1a661 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 16 Oct 2013 17:16:33 +0200
Subject: [PATCH 5323/5331] haskell-shakespeare-text: update to version 1.0.0.8

---
 .../libraries/haskell/shakespeare-text/default.nix            | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/shakespeare-text/default.nix b/pkgs/development/libraries/haskell/shakespeare-text/default.nix
index d05e2247710..d5e91da61b1 100644
--- a/pkgs/development/libraries/haskell/shakespeare-text/default.nix
+++ b/pkgs/development/libraries/haskell/shakespeare-text/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "shakespeare-text";
-  version = "1.0.0.7";
-  sha256 = "0vl8884a0x927svvkza5xzjn4g1rip8dak1zh9wkm4d0q7lhv2px";
+  version = "1.0.0.8";
+  sha256 = "0gf4gsdfjz9c15wvxz886gjzzifgzanfhblgab15inl2rblirv7l";
   buildDepends = [ shakespeare text ];
   testDepends = [ hspec HUnit text ];
   meta = {
-- 
GitLab


From d201a6e2246e3bfa8f7edc2e026411ce68888cad Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 16 Oct 2013 17:16:33 +0200
Subject: [PATCH 5324/5331] haskell-shakespeare: update to version 1.2.0.1

---
 pkgs/development/libraries/haskell/shakespeare/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/shakespeare/default.nix b/pkgs/development/libraries/haskell/shakespeare/default.nix
index 231470dca5a..a5428b0ee3c 100644
--- a/pkgs/development/libraries/haskell/shakespeare/default.nix
+++ b/pkgs/development/libraries/haskell/shakespeare/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "shakespeare";
-  version = "1.2.0";
-  sha256 = "0lzzdkry3sm5i5hhdygsikpnaps66k1sfdxi2mp0ly5aqi1n1blz";
+  version = "1.2.0.1";
+  sha256 = "07qfbqvq8fqbf7y43h0qq2gk9brpf4g0k7gghrjzyjrd57v5zygp";
   buildDepends = [ parsec systemFileio systemFilepath text time ];
   testDepends = [
     hspec parsec systemFileio systemFilepath text time
-- 
GitLab


From 45a91132d98d03020b90fefc0b7f9fcc9612f68a Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 16 Oct 2013 17:16:33 +0200
Subject: [PATCH 5325/5331] haskell-system-filepath: update to version 0.4.8

---
 .../development/libraries/haskell/system-filepath/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/system-filepath/default.nix b/pkgs/development/libraries/haskell/system-filepath/default.nix
index 851b28baafe..84ca453c6c1 100644
--- a/pkgs/development/libraries/haskell/system-filepath/default.nix
+++ b/pkgs/development/libraries/haskell/system-filepath/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "system-filepath";
-  version = "0.4.7";
-  sha256 = "108bmgz6rynkyabr4pws07smdh31syqvzry9cshrw3zd07c3mn89";
+  version = "0.4.8";
+  sha256 = "15x0yxakqqrdqvghr0l4pzvy5a68xxdv1c75d3qwx604665j3xkw";
   buildDepends = [ deepseq text ];
   meta = {
     homepage = "https://john-millikin.com/software/haskell-filesystem/";
-- 
GitLab


From fd18714fdb4fe2764baa9192712ab318af12ef91 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 16 Oct 2013 17:16:33 +0200
Subject: [PATCH 5326/5331] haskell-th-lift: update to version 0.5.6

---
 pkgs/development/libraries/haskell/th-lift/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/th-lift/default.nix b/pkgs/development/libraries/haskell/th-lift/default.nix
index b8a118b56a6..c479955db64 100644
--- a/pkgs/development/libraries/haskell/th-lift/default.nix
+++ b/pkgs/development/libraries/haskell/th-lift/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "th-lift";
-  version = "0.5.5";
-  sha256 = "1zp9alv3nbvra1rscddak3i33c2jnv6g6806h94qbfkq3zbimfi0";
+  version = "0.5.6";
+  sha256 = "128rbpqbm4fgn1glbv8bvlqnvn2wvca7wj08xri25w3bikmfy2z4";
   meta = {
     description = "Derive Template Haskell's Lift class for datatypes";
     license = "unknown";
-- 
GitLab


From 486d2d9e9b803534fec9b332f5267f4717db21a5 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 16 Oct 2013 17:16:33 +0200
Subject: [PATCH 5327/5331] haskell-th-orphans: update to version 0.8

---
 pkgs/development/libraries/haskell/th-orphans/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/th-orphans/default.nix b/pkgs/development/libraries/haskell/th-orphans/default.nix
index 8fb51c77dbf..9196e9ef76b 100644
--- a/pkgs/development/libraries/haskell/th-orphans/default.nix
+++ b/pkgs/development/libraries/haskell/th-orphans/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "th-orphans";
-  version = "0.7.0.1";
-  sha256 = "19lfq2m7c6n2z8gz4n57wc92x5x5rkgv4chbfq7w4n531qya4bgr";
+  version = "0.8";
+  sha256 = "0kzzcicn6pggvvblhbrs3vh0bf71izlb99lb0f5qww7ymi4smldr";
   buildDepends = [ thLift ];
   meta = {
     description = "Orphan instances for TH datatypes";
-- 
GitLab


From d269c575858c46e85783ab8de2de1caa5f557ca5 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 16 Oct 2013 17:16:33 +0200
Subject: [PATCH 5328/5331] haskell-utf8-light: update to version 0.4.2

---
 pkgs/development/libraries/haskell/utf8-light/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/utf8-light/default.nix b/pkgs/development/libraries/haskell/utf8-light/default.nix
index 42591158cd7..1c2e1f5c116 100644
--- a/pkgs/development/libraries/haskell/utf8-light/default.nix
+++ b/pkgs/development/libraries/haskell/utf8-light/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "utf8-light";
-  version = "0.4.0.1";
-  sha256 = "1y2vfxjgq8r90bpaxhha0s837vklpwdj4cj3h61bimc0lcx22905";
+  version = "0.4.2";
+  sha256 = "0rwyc5z331yfnm4hpx0sph6i1zvkd1z10vvglhnp0vc9wy644k0q";
   meta = {
     description = "Unicode";
     license = self.stdenv.lib.licenses.bsd3;
-- 
GitLab


From 04d81472197cf6cb143ed1a4c1a4d6c469a82cbc Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 16 Oct 2013 17:36:08 +0200
Subject: [PATCH 5329/5331] haskell-packages.nix: fix evaluation of
 cabal-install

---
 pkgs/top-level/haskell-packages.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 5eec652a6fe..f46a9bca774 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -2470,7 +2470,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
   cabalInstall_0_14_0 = callPackage ../tools/package-management/cabal-install/0.14.0.nix {};
   cabalInstall_1_16_0_2 = callPackage ../tools/package-management/cabal-install/1.16.0.2.nix {};
   cabalInstall_1_18_0_2 = callPackage ../tools/package-management/cabal-install/1.18.0.2.nix {
-    Cabal = self.Cabal_1_18_1;
+    Cabal = self.Cabal_1_18_1_1;
   };
   cabalInstall = self.cabalInstall_1_18_0_2;
 
-- 
GitLab


From b36e648722651cb6c75c9db41720f17b7dd5c058 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 18 Oct 2013 10:47:59 +0200
Subject: [PATCH 5330/5331] haskell-shake: test suite fails in LANG=C
 environment

https://github.com/ndmitchell/shake/issues/73
---
 pkgs/development/libraries/haskell/shake/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/libraries/haskell/shake/default.nix b/pkgs/development/libraries/haskell/shake/default.nix
index 12887ec79bc..ef7a6d69905 100644
--- a/pkgs/development/libraries/haskell/shake/default.nix
+++ b/pkgs/development/libraries/haskell/shake/default.nix
@@ -16,6 +16,7 @@ cabal.mkDerivation (self: {
     binary deepseq filepath hashable random time transformers
     unorderedContainers utf8String
   ];
+  doCheck = false;
   meta = {
     homepage = "http://community.haskell.org/~ndm/shake/";
     description = "Build system library, like Make, but more accurate dependencies";
-- 
GitLab


From 06d6c3ed5d061e95d1db92f7eff08d5c1a2181d8 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 18 Oct 2013 10:53:59 +0200
Subject: [PATCH 5331/5331] haskell-src-meta: jailbreak to fix build with
 latest th-orphans

---
 pkgs/development/libraries/haskell/haskell-src-meta/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/libraries/haskell/haskell-src-meta/default.nix b/pkgs/development/libraries/haskell/haskell-src-meta/default.nix
index edcb39ebe9d..6ce8f9e72ba 100644
--- a/pkgs/development/libraries/haskell/haskell-src-meta/default.nix
+++ b/pkgs/development/libraries/haskell/haskell-src-meta/default.nix
@@ -5,6 +5,7 @@ cabal.mkDerivation (self: {
   version = "0.6.0.4";
   sha256 = "10dixf2abk0canwikf3wdp1ahc51400wxa7x4g59pygv8a3c1c1x";
   buildDepends = [ haskellSrcExts syb thOrphans uniplate ];
+  jailbreak = true;
   meta = {
     description = "Parse source to template-haskell abstract syntax";
     license = self.stdenv.lib.licenses.bsd3;
-- 
GitLab